Request 2093 (accepted)

Overview

Request 2093 (accepted)

No description set

Created by awissu about 9 years ago
In state accepted
Package maintainers: awissu, enzokiel, and pbleser

Submit LiVES

Submit package home:awissu:branches:Multimedia / LiVES to package Multimedia / LiVES

LiVES.changes Changed

LiVES.spec Changed

@@ -1,5 +1,7 @@
-# vim: set ts=4 sw=4 et:
-
+#
+# spec file for package LiVES
+#
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 # Copyright (c) 2010-2012 Pascal Bleser <pascal.bleser@opensuse.org>
 # Copyright (c) 2007-2010 Andrea Florio <andrea@links2linux.de>
 #
@@ -13,51 +15,70 @@
 # published by the Open Source Initiative.
 
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
+#
+
 
+%define soname  0
 Name:           LiVES
-Version:        2.2.8
-%define         soname 0
-Release:        1
+Version:        2.4.1
+Release:        0
 Summary:        Video Editor and VJ Tool
 License:        GPL-2.0+
 Group:          Productivity/Multimedia/Video/Editors and Convertors
-Source0:        http://www.xs4all.nl/%7Esalsaman/lives/current/LiVES-%{version}.tar.bz2
+Url:            http://lives.sourceforge.net
+Source0:        http://lives-video.com/releases/%{name}-%{version}.tar.bz2
 Source99:       LiVES-rpmlintrc
 Patch0:         LiVES-redefinition_of_typedef.patch
-Url:            http://lives.sourceforge.net
-BuildRoot:      %{_tmppath}/%{name}-%{version}-root
-
-BuildRequires:  freetype2-devel SDL-devel pango-devel 
-BuildRequires:  libffmpeg-devel frei0r-plugins-devel update-desktop-files
-BuildRequires:  libaal-devel
-BuildRequires:  libavc1394-devel >= 0.5.3
+BuildRequires:  autoconf
+BuildRequires:  automake
+BuildRequires:  bison
 BuildRequires:  gcc-c++
-BuildRequires:  automake autoconf libtool
-BuildRequires:  perl bison libvisual libvisual-devel slang-devel atk-devel
+BuildRequires:  perl
 BuildRequires:  ImageMagick
+BuildRequires:  ladspa-devel
+BuildRequires:  libGLee-devel
+BuildRequires:  libaal-devel
+BuildRequires:  libtool
+BuildRequires:  libvisual
+BuildRequires:  libvisual-devel
+BuildRequires:  pkgconfig(alsa)
+BuildRequires:  pkgconfig(atk)
+BuildRequires:  pkgconfig(dirac)
+BuildRequires:  pkgconfig(freetype2)
+BuildRequires:  pkgconfig(frei0r)
+BuildRequires:  pkgconfig(jack)
+BuildRequires:  pkgconfig(libavc1394) >= 0.5.3
+BuildRequires:  pkgconfig(libavcodec)
+BuildRequires:  pkgconfig(libavformat)
+BuildRequires:  pkgconfig(libavutil)
+BuildRequires:  pkgconfig(libdv)
+BuildRequires:  pkgconfig(liboil-0.3)
+BuildRequires:  pkgconfig(libpulse)
+BuildRequires:  pkgconfig(libswscale)
+BuildRequires:  pkgconfig(libv4l1)
 BuildRequires:  pkgconfig(mjpegtools) >= 1.6.2
-BuildRequires:  alsa-devel
-BuildRequires:  liboil-devel
-BuildRequires:  libogg-devel libvorbis-devel
-BuildRequires:  libtheora-devel
-BuildRequires:  libdv-devel
-BuildRequires:  schroedinger-devel
-BuildRequires:  dirac-devel
-BuildRequires:  libpulse-devel
+BuildRequires:  pkgconfig(ogg)
+BuildRequires:  pkgconfig(pango)
+BuildRequires:  pkgconfig(schroedinger-1.0)
+BuildRequires:  pkgconfig(sdl)
+BuildRequires:  pkgconfig(slang)
+BuildRequires:  pkgconfig(theora)
+BuildRequires:  pkgconfig(vorbis)
+BuildRequires:  update-desktop-files
+Requires:       MPlayer
+Requires:       cdrkit-cdrtools-compat
+Requires:       dvgrab
+Requires:       ladspa
+Requires:       libvisual-plugins
+Requires:       libweed%{soname} = %{version}
+Requires:       sox
+Provides:       lives
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if 0%{?suse_version} >= 1230
-BuildRequires:  gtk3-devel
+BuildRequires:  pkgconfig(gtk+-3.0)
 %else
 BuildRequires:  gtk2-devel
 %endif
-BuildRequires:  libv4l-devel
-BuildRequires:  sox MPlayer cdrkit-cdrtools-compat dvgrab
-BuildRequires:  jack-devel
-BuildRequires:  libGLee-devel
-BuildRequires:  ladspa-devel
-Requires:       libvisual-plugins
-Requires:       ladspa
-Requires:       sox MPlayer cdrkit-cdrtools-compat dvgrab
-Requires:       libweed%{soname} = %{version}
 %if 0%{?suse_version} < 1200
 BuildRequires:  xmms2
 Requires:       xmms2
@@ -68,7 +89,7 @@
 content, the video editor who wants to produce professional looking video, and
 the VJ who wants to captivate with spectacular images.
 
-%package -n libweed%{soname}
+%package -n     libweed%{soname}
 Summary:        Libweed library
 Group:          Development/Libraries/C and C++
 
@@ -77,7 +98,7 @@
 content, the video editor who wants to produce professional looking video, and
 the VJ who wants to captivate with spectacular images.
 
-%package -n libweed-devel
+%package -n     libweed-devel
 Summary:        Libweed devel package
 Group:          Development/Libraries/C and C++
 Requires:       libweed%{soname} = %{version}
@@ -87,22 +108,51 @@
 content, the video editor who wants to produce professional looking video, and
 the VJ who wants to captivate with spectacular images.
 
+This package contains header files and libraries needed to develop
+application that use libweed.
+
+%package -n     libOSC%{soname}
+Summary:        Libweed library
+Group:          Development/Libraries/C and C++
+
+%description -n libOSC%{soname}
+LiVES is aimed at the digital video artist who wants to create their own
+content, the video editor who wants to produce professional looking video, and
+the VJ who wants to captivate with spectacular images.
+
+This is NOT the full libOSC SDK, it is a highly hacked version for testing 
+with LiVES.
+
+Use of this hacked package is not recommended.
+
+%package -n     libOSC-devel
+Summary:        Libweed devel package
+Group:          Development/Libraries/C and C++
+Requires:       libOSC%{soname} = %{version}
+
+%description -n libOSC-devel
+LiVES is aimed at the digital video artist who wants to create their own
+content, the video editor who wants to produce professional looking video, and
+the VJ who wants to captivate with spectacular images.
+
+This package contains header files and libraries needed to develop
+application that use libOSC.
+
 %prep
 %setup -q -n lives-%{version}
-%patch0 -p0
+#%patch0 -p1
 
 # fix wrong EOL
-%__sed -i 's/\r$//' weed-docs/*.txt
+sed -i 's/\r$//' weed-docs/*.txt
 
-find . -type d -name .svn | while read d; do %__rm -rf "$d"; done
+find . -type d -name .svn | while read d; do rm -rf "$d"; done
 
 pushd libweed
-%__ln_s . weed
+ln -s . weed
 popd #libweed
 
 %build
 
-
 export CFLAGS="%{optflags} -fno-strict-aliasing -I$PWD/libweed/"
 export CPPFLAGS="$CFLAGS"
 export CXXFLAGS="$CFLAGS"
@@ -110,41 +160,44 @@
     --libdir="%{_libdir}" \
     --disable-doxygen
 
-make %{?jobs:-j%{jobs}}
+make %{?_smp_mflags}
 
 %install
-%makeinstall
-%__rm -f "%{buildroot}%{_libdir}"/*.la
+make DESTDIR=%{buildroot} install
 
-%__mv "%{buildroot}%{_datadir}/app-install/icons/lives.png" \
+find %{buildroot} $ -name \*.la -o -name \*.a $ -exec rm {} \;
+
+mv "%{buildroot}%{_datadir}/app-install/icons/lives.png" \
     "%{buildroot}%{_datadir}/pixmaps/lives.png"
-%__rm -rf "%{buildroot}%{_datadir}/app-install"
+rm -rf "%{buildroot}%{_datadir}/app-install"
 
 for l in de_DE nl_NL; do
     sl="${l%%_*}"
     if [ -e "%{buildroot}%{_datadir}/locale/$sl" ]; then
-        %__rm -rf "%{buildroot}%{_datadir}/locale/$l"
+        rm -rf "%{buildroot}%{_datadir}/locale/$l"
     else
-        %__mv "%{buildroot}%{_datadir}/locale/$l" "%{buildroot}%{_datadir}/locale/$sl"
+        mv "%{buildroot}%{_datadir}/locale/$l" "%{buildroot}%{_datadir}/locale/$sl"
     fi
 done
 
-%__rm %buildroot/%{_bindir}/lives
-%__ln_s %{_bindir}/lives-exe %{buildroot}/%{_bindir}/lives
+rm %{buildroot}/%{_bindir}/lives
+ln -s %{_bindir}/lives-exe %{buildroot}/%{_bindir}/lives
 
 find %{buildroot}%{_libdir} \
 -name \*.txt -type f -executable -exec chmod 644 {} \; || :
 
-%suse_update_desktop_file -r LiVES AudioVideo AudioVideoEditing
+%suse_update_desktop_file -r %{name} AudioVideo AudioVideoEditing
 
 %find_lang lives
 
-%clean
-%{?buildroot:%__rm -rf "%{buildroot}"}
-
 %post   -n libweed%{soname} -p /sbin/ldconfig
+
 %postun -n libweed%{soname} -p /sbin/ldconfig
 
+%post   -n libOSC%{soname} -p /sbin/ldconfig
+
+%postun -n libOSC%{soname} -p /sbin/ldconfig
+
 %files -f lives.lang
 %defattr(-,root,root)
 %docdir %{_datadir}/doc/lives-%{version}
@@ -175,7 +228,7 @@
 %{_bindir}/midistop
 %{_bindir}/sendOSC
 %{_bindir}/smogrify
-%{_datadir}/applications/LiVES.desktop
+%{_datadir}/applications/%{name}.desktop
 %dir %{_datadir}/lives
 %{_datadir}/lives/default.keymap
 %dir %{_datadir}/lives/icons
@@ -198,140 +251,76 @@
 %dir %{_libdir}/lives/plugins
 %dir %{_libdir}/lives/plugins/decoders
 %{_libdir}/lives/plugins/decoders/asf_decoder.so
-%{_libdir}/lives/plugins/decoders/asf_decoder.la
 %{_libdir}/lives/plugins/decoders/dv_decoder.so
-%{_libdir}/lives/plugins/decoders/dv_decoder.la
 %{_libdir}/lives/plugins/decoders/mkv_decoder.so
-%{_libdir}/lives/plugins/decoders/mkv_decoder.la
 %{_libdir}/lives/plugins/decoders/ogg_decoder.so
-%{_libdir}/lives/plugins/decoders/ogg_decoder.la
 %{_libdir}/lives/plugins/decoders/flv_decoder.so
-%{_libdir}/lives/plugins/decoders/flv_decoder.la
 %{_libdir}/lives/plugins/decoders/mpegts_decoder.so
-%{_libdir}/lives/plugins/decoders/mpegts_decoder.la
 %dir %{_libdir}/lives/plugins/effects
 %dir %{_libdir}/lives/plugins/effects/realtime
 %dir %{_libdir}/lives/plugins/effects/realtime/weed
 %{_libdir}/lives/plugins/effects/realtime/weed/alien_overlay.so
-%{_libdir}/lives/plugins/effects/realtime/weed/alien_overlay.la
 %{_libdir}/lives/plugins/effects/realtime/weed/alpha_means.so
-%{_libdir}/lives/plugins/effects/realtime/weed/alpha_means.la
 %{_libdir}/lives/plugins/effects/realtime/weed/audio_transition.so
-%{_libdir}/lives/plugins/effects/realtime/weed/audio_transition.la
 %{_libdir}/lives/plugins/effects/realtime/weed/audio_volume.so
-%{_libdir}/lives/plugins/effects/realtime/weed/audio_volume.la
 %{_libdir}/lives/plugins/effects/realtime/weed/blank_frame_detector.so
-%{_libdir}/lives/plugins/effects/realtime/weed/blank_frame_detector.la
 %{_libdir}/lives/plugins/effects/realtime/weed/blurzoom.so
-%{_libdir}/lives/plugins/effects/realtime/weed/blurzoom.la
 %{_libdir}/lives/plugins/effects/realtime/weed/bump2d.so
-%{_libdir}/lives/plugins/effects/realtime/weed/bump2d.la
 %{_libdir}/lives/plugins/effects/realtime/weed/ccorrect.so
-%{_libdir}/lives/plugins/effects/realtime/weed/ccorrect.la
 %{_libdir}/lives/plugins/effects/realtime/weed/colorkey.so
-%{_libdir}/lives/plugins/effects/realtime/weed/colorkey.la
 %{_libdir}/lives/plugins/effects/realtime/weed/comic.so
-%{_libdir}/lives/plugins/effects/realtime/weed/comic.la
 %{_libdir}/lives/plugins/effects/realtime/weed/compositor.so
-%{_libdir}/lives/plugins/effects/realtime/weed/compositor.la
 %{_libdir}/lives/plugins/effects/realtime/weed/data_processor.so
-%{_libdir}/lives/plugins/effects/realtime/weed/data_processor.la
 %{_libdir}/lives/plugins/effects/realtime/weed/data_unpacker.so
-%{_libdir}/lives/plugins/effects/realtime/weed/data_unpacker.la
 %{_libdir}/lives/plugins/effects/realtime/weed/deinterlace.so
-%{_libdir}/lives/plugins/effects/realtime/weed/deinterlace.la
 %{_libdir}/lives/plugins/effects/realtime/weed/edge.so
-%{_libdir}/lives/plugins/effects/realtime/weed/edge.la
 %{_libdir}/lives/plugins/effects/realtime/weed/fg_bg_removal.so
-%{_libdir}/lives/plugins/effects/realtime/weed/fg_bg_removal.la
 %{_libdir}/lives/plugins/effects/realtime/weed/fireTV.so
-%{_libdir}/lives/plugins/effects/realtime/weed/fireTV.la
 %{_libdir}/lives/plugins/effects/realtime/weed/fourKlives.so
-%{_libdir}/lives/plugins/effects/realtime/weed/fourKlives.la
 %{_libdir}/lives/plugins/effects/realtime/weed/gdk_fast_resize.so
-%{_libdir}/lives/plugins/effects/realtime/weed/gdk_fast_resize.la
 %{_libdir}/lives/plugins/effects/realtime/weed/haar_analyser.so
-%{_libdir}/lives/plugins/effects/realtime/weed/haar_analyser.la
 %{_libdir}/lives/plugins/effects/realtime/weed/haip.so
-%{_libdir}/lives/plugins/effects/realtime/weed/haip.la
 %{_libdir}/lives/plugins/effects/realtime/weed/ladspa.so
-%{_libdir}/lives/plugins/effects/realtime/weed/ladspa.la
 %{_libdir}/lives/plugins/effects/realtime/weed/layout_blends.so
-%{_libdir}/lives/plugins/effects/realtime/weed/layout_blends.la
 %{_libdir}/lives/plugins/effects/realtime/weed/lifeTV.so
-%{_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/log_sig.so
-%{_libdir}/lives/plugins/effects/realtime/weed/log_sig.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
-%{_libdir}/lives/plugins/effects/realtime/weed/multi_blends.la
 %{_libdir}/lives/plugins/effects/realtime/weed/multi_transitions.so
-%{_libdir}/lives/plugins/effects/realtime/weed/multi_transitions.la
 %{_libdir}/lives/plugins/effects/realtime/weed/negate.so
-%{_libdir}/lives/plugins/effects/realtime/weed/negate.la
 %{_libdir}/lives/plugins/effects/realtime/weed/nn_programmer.so
-%{_libdir}/lives/plugins/effects/realtime/weed/nn_programmer.la
 %{_libdir}/lives/plugins/effects/realtime/weed/noise.so
-%{_libdir}/lives/plugins/effects/realtime/weed/noise.la
 %{_libdir}/lives/plugins/effects/realtime/weed/onedTV.so
-%{_libdir}/lives/plugins/effects/realtime/weed/onedTV.la
 %{_libdir}/lives/plugins/effects/realtime/weed/palette_test.so
-%{_libdir}/lives/plugins/effects/realtime/weed/palette_test.la
 %{_libdir}/lives/plugins/effects/realtime/weed/plasma.so
-%{_libdir}/lives/plugins/effects/realtime/weed/plasma.la
 %{_libdir}/lives/plugins/effects/realtime/weed/posterise.so
-%{_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/revTV.so
-%{_libdir}/lives/plugins/effects/realtime/weed/revTV.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
-%{_libdir}/lives/plugins/effects/realtime/weed/rotozoom.la
 %{_libdir}/lives/plugins/effects/realtime/weed/scribbler.so
-%{_libdir}/lives/plugins/effects/realtime/weed/scribbler.la
 %{_libdir}/lives/plugins/effects/realtime/weed/shift.so
-%{_libdir}/lives/plugins/effects/realtime/weed/shift.la
 %{_libdir}/lives/plugins/effects/realtime/weed/simple_blend.so
-%{_libdir}/lives/plugins/effects/realtime/weed/simple_blend.la
 %{_libdir}/lives/plugins/effects/realtime/weed/slide_over.so
-%{_libdir}/lives/plugins/effects/realtime/weed/slide_over.la
 %{_libdir}/lives/plugins/effects/realtime/weed/softlight.so
-%{_libdir}/lives/plugins/effects/realtime/weed/softlight.la
 %{_libdir}/lives/plugins/effects/realtime/weed/targeted_zoom.so
-%{_libdir}/lives/plugins/effects/realtime/weed/targeted_zoom.la
 %{_libdir}/lives/plugins/effects/realtime/weed/textfun.so
-%{_libdir}/lives/plugins/effects/realtime/weed/textfun.la
 %{_libdir}/lives/plugins/effects/realtime/weed/tone_gen.so
-%{_libdir}/lives/plugins/effects/realtime/weed/tone_gen.la
 %{_libdir}/lives/plugins/effects/realtime/weed/tvpic.so
-%{_libdir}/lives/plugins/effects/realtime/weed/tvpic.la
 %{_libdir}/lives/plugins/effects/realtime/weed/vector_visualiser.so
-%{_libdir}/lives/plugins/effects/realtime/weed/vector_visualiser.la
 %{_libdir}/lives/plugins/effects/realtime/weed/vertigo.so
-%{_libdir}/lives/plugins/effects/realtime/weed/vertigo.la
 %{_libdir}/lives/plugins/effects/realtime/weed/videowall.so
-%{_libdir}/lives/plugins/effects/realtime/weed/videowall.la
 %{_libdir}/lives/plugins/effects/realtime/weed/warpTV.so
-%{_libdir}/lives/plugins/effects/realtime/weed/warpTV.la
 %{_libdir}/lives/plugins/effects/realtime/weed/xeffect.so
-%{_libdir}/lives/plugins/effects/realtime/weed/xeffect.la
 %dir %{_libdir}/lives/plugins/effects/realtime/weed/data
 %{_libdir}/lives/plugins/effects/realtime/weed/data/*
 %dir %{_libdir}/lives/plugins/effects/realtime/weed/frei0r
 %{_libdir}/lives/plugins/effects/realtime/weed/frei0r/frei0r.so
-%{_libdir}/lives/plugins/effects/realtime/weed/frei0r/frei0r.la
 %dir %{_libdir}/lives/plugins/effects/realtime/weed/libvisual
 %{_libdir}/lives/plugins/effects/realtime/weed/libvisual/libvis.so
-%{_libdir}/lives/plugins/effects/realtime/weed/libvisual/libvis.la
 %dir %{_libdir}/lives/plugins/effects/rendered
 %{_libdir}/lives/plugins/effects/rendered/blank_frames
 %{_libdir}/lives/plugins/effects/rendered/blur
@@ -406,26 +395,15 @@
 %{_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/openGL.so
-%{_libdir}/lives/plugins/playback/video/openGL.la
 %{_libdir}/lives/plugins/playback/video/vloopback.so
-%{_libdir}/lives/plugins/playback/video/vloopback.la
 %{_libdir}/lives/plugins/playback/video/yuv4mpeg_stream.so
-%{_libdir}/lives/plugins/playback/video/yuv4mpeg_stream.la
 %{_libdir}/lives/plugins/playback/video/icecast_output.so
-%{_libdir}/lives/plugins/playback/video/icecast_output.la
 %{_libdir}/lives/plugins/playback/video/vloopback2.so
-%{_libdir}/lives/plugins/playback/video/vloopback2.la
-%{_libdir}/lives/plugins/decoders/zzavformat_decoder.la
 %{_libdir}/lives/plugins/decoders/zzavformat_decoder.so
-%{_libdir}/lives/plugins/effects/realtime/weed/kaleidoscope.la
 %{_libdir}/lives/plugins/effects/realtime/weed/kaleidoscope.so
-%{_libdir}/lives/plugins/effects/realtime/weed/randomiser.la
 %{_libdir}/lives/plugins/effects/realtime/weed/randomiser.so
 
 %files -n libweed%{soname}
@@ -436,6 +414,10 @@
 %{_libdir}/libweed-utils.so.%{soname}.*
 %{_libdir}/libweed_slice.so.%{soname}
 %{_libdir}/libweed_slice.so.%{soname}.*
+%{_libdir}/libweed-utils_scripting.so.%{soname}
+%{_libdir}/libweed-utils_scripting.so.%{soname}.*
+%{_libdir}/libweed_slice_scripting.so.%{soname}
+%{_libdir}/libweed_slice_scripting.so.%{soname}.*
 
 %files -n libweed-devel
 %defattr(-,root,root)
@@ -443,10 +425,24 @@
 %{_libdir}/libweed.so
 %{_libdir}/libweed-utils.so
 %{_libdir}/libweed_slice.so
+%{_libdir}/libweed-utils_scripting.so
+%{_libdir}/libweed_slice_scripting.so
 %{_libdir}/pkgconfig/libweed.pc
 %{_libdir}/pkgconfig/libweed_slice.pc
 %{_libdir}/pkgconfig/libweed-plugin.pc
 %{_libdir}/pkgconfig/libweed-utils.pc
 %{_libdir}/pkgconfig/libweed-compat.pc
 
+%files -n libOSC%{soname}
+%defattr(-,root,root)
+%{_libdir}/libOSC.so.%{soname}
+%{_libdir}/libOSC.so.%{soname}.*
+%{_libdir}/libOSC_client.so.%{soname}
+%{_libdir}/libOSC_client.so.%{soname}.*
+
+%files -n libOSC-devel
+%defattr(-,root,root)
+%{_libdir}/libOSC.so
+%{_libdir}/libOSC_client.so
+
 %changelog

LiVES-2.2.8.tar.bz2/ChangeLog -> LiVES-2.4.1.tar.bz2/ChangeLog Changed

@@ -1,3 +1,39 @@
+Version 2.4.1 (9 Aug 2015)
+--------------------------
+NOTE: the LiVES homepage has moved to http://lives-video.com
+
+General compilation fixes.
+Compilation fixes for libav.
+Minor fixes for BSD compilation.
+Minor fix for initialisation of "alien_overlay" effect.
+Fix image file previews within File Open dialog (regression).
+
+
+
+
+
+
+
+Version 2.4.0 (3 May 2015)
+-------------------------
+Implement workaround for expose event problems in gtk+ 3.10.
+Fix threading crash in multitrack.
+Fix invalid saving of layouts in multitrack.
+Fix sizes of scrolled windows inside dialog boxes (regression).
+Fix timeline start position for gtkgrid widget in multitrack.
+Fix "fade background mode" (b) so it looks nice again.
+Stability fix for expose event during startup.
+Stability fix for mkv_decoder with broken end frames.
+Implement C++ language bindings (liblives).
+Fixes for several smaller issues (Thomas Berger).
+Code cleanup / reformat.
+Updated translations to UK English, French, Galician, German, Russian and Simplified Chinese.
+
+
+
+
+
+
 Version 2.2.8 (8 Feb 2015)
 --------------------------
 Fix crash in Insert Frames (regression).

LiVES-2.2.8.tar.bz2/GETTING.STARTED -> LiVES-2.4.1.tar.bz2/GETTING.STARTED Changed

@@ -4,14 +4,15 @@
 FAQ
 ---
  Does LiVES require a working copy of mplayer ?
-It is no longer a requirement to run LiVES, but without it you will not be able to open any movie clips* or see previews if the file open dialog.
-
-* that is no longer quite the case. dv files can now be opened without player, provided lives is compiled with libdv support. ogg/theora files can be opened without mplayer if LiVES is compiled with libogg and libtheora support.
+It is no longer a requirement to run LiVES, but without it you will not be able to open SOME movie clips* or see previews in the file open dialog.
 
+* in current versions of LiVES almost all clips can be opened instantly via plugins, howver mplayer is used as a fallback in cases 
+where the plugins fail.
 
 
 
  LiVES complains "Unable to open either video or audio". What is the problem ?
+This means the decoder plugins failed and the fallback of using mplayer also failed.
 Most likely your problem is in your mplayer setup. First, can you preview/play the file in mplayer ?
 If not then you probably need to add extra libraries to mplayer.
 
@@ -34,20 +35,23 @@
 only way you can damage your original material is by saving over it,
 but LiVES will warn you if you try to do this.
 
-* this is no longer always true. For files which are opened instantly (dv or ogg/theora), the original file is required until all frames have been chenged or copied.
+* this is no longer always true. For files which are opened instantly (dv or ogg/theora), 
+the original file is required until all frames have been chenged or copied.
 
 
 
  How do I set the encoder in LiVES ?
-The encoder plugin and output format can be set in Tools/Preferences/Encoding. 
-Depending on the encoder/format selected, you may need to install additional libraries or programs. You will also be prompted when Encoding a clip.
+The encoder plugin and output format can be set in Tools/Preferences/Encoding. You can also set it when encoding a clip.
+Depending on the encoder/format selected, you may need to install additional libraries or programs. 
+You will also be prompted when Encoding a clip.
 
 
  How do I change the temporary directory in LiVES ?
-The first time you start LiVES, you should change its temporary directory to a 
+The first time you start LiVES, you should set its temporary directory to a 
 partition with plenty of free space (approximately 5 times the size of all the 
 video files you want to have open at one time).
-To do this, go to Tools in the menu bar, and click on Preferences. Go to the 
+
+To change it later, go to Tools in the menu bar, and click on Preferences. Go to the 
 directory tab and change the temporary directory setting and click Apply, then 
 OK. LiVES will then exit and you will have to restart it. You should check in 
 Preferences afterwards that the directory has been updated.
@@ -66,10 +70,6 @@
 should remember the last directory you used and default to that instead.
 
 
- Why are sound and video synchronisation sometimes poor in LiVES ?
-This is fixed now if you make use of the "jack" audio player in LiVES.
-
-
  What is the difference between 'Backup' and 'Encode' ?
 Backup will save all of the current clip without loss of quality. You can later restore this backup and continue working exactly where you left off. See the LiVES manual for more information.
 
@@ -85,12 +85,11 @@
 
 
  How can I contribute to the LiVES project ?
-You can join the LiVES mailing list at 
-http://groups.yahoo.com/group/lives-video.
+You can join the LiVES mailing list at: https://lists.sourceforge.net/lists/listinfo/lives-users
 
 Donations (of any kind) are also very welcome.
 
-You can contact the author at: salsaman@xs4all.nl or salsaman@gmail.com
+You can contact the author at: salsaman@gmail.com

LiVES-2.2.8.tar.bz2/LiVES.doxygen -> LiVES-2.4.1.tar.bz2/LiVES.doxygen Changed

@@ -1,96 +1,121 @@
-# Doxyfile 1.7.1
+# Doxyfile 1.8.6
 
 # This file describes the settings to be used by the documentation system
-# doxygen (www.doxygen.org) for a project
+# doxygen (www.doxygen.org) for a project.
 #
-# All text after a hash (#) is considered a comment and will be ignored
+# All text after a double hash (##) is considered a comment and is placed in
+# front of the TAG it is preceding.
+#
+# All text after a single hash (#) is considered a comment and will be ignored.
 # The format is:
-#       TAG = value [value, ...]
-# For lists items can also be appended using:
-#       TAG += value [value, ...]
-# Values that contain spaces should be placed between quotes (" ")
+# TAG = value [value, ...]
+# For lists, items can also be appended using:
+# TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (\" \").
 
 #---------------------------------------------------------------------------
 # Project related configuration options
 #---------------------------------------------------------------------------
 
 # This tag specifies the encoding used for all characters in the config file
-# that follow. The default is UTF-8 which is also the encoding used for all
-# text before the first occurrence of this tag. Doxygen uses libiconv (or the
-# iconv built into libc) for the transcoding. See
-# http://www.gnu.org/software/libiconv for the list of possible encodings.
+# that follow. The default is UTF-8 which is also the encoding used for all text
+# before the first occurrence of this tag. Doxygen uses libiconv (or the iconv
+# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv
+# for the list of possible encodings.
+# The default value is: UTF-8.
 
 DOXYFILE_ENCODING      = UTF-8
 
-# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
-# by quotes) that should identify the project.
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by
+# double-quotes, unless you are using Doxywizard) that should identify the
+# project for which the documentation is generated. This name is used in the
+# title of most generated pages and in a few other places.
+# The default value is: My Project.
 
 PROJECT_NAME           = LiVES
 
-# The PROJECT_NUMBER tag can be used to enter a project or revision number.
-# This could be handy for archiving the generated documentation or
-# if some version control system is used.
-
-PROJECT_NUMBER         = 2.2.8
-
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
-# base path where the generated documentation will be put.
-# If a relative path is entered, it will be relative to the location
-# where doxygen was started. If left blank the current directory will be used.
+# The PROJECT_NUMBER tag can be used to enter a project or revision number. This
+# could be handy for archiving the generated documentation or if some version
+# control system is used.
+
+PROJECT_NUMBER         = 2.4.1
+
+# Using the PROJECT_BRIEF tag one can provide an optional one line description
+# for a project that appears at the top of each page and should give viewer a
+# quick idea about the purpose of the project. Keep the description short.
+
+PROJECT_BRIEF          =
+
+# With the PROJECT_LOGO tag one can specify an logo or icon that is included in
+# the documentation. The maximum height of the logo should not exceed 55 pixels
+# and the maximum width should not exceed 200 pixels. Doxygen will copy the logo
+# to the output directory.
+
+PROJECT_LOGO           =
+
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
+# into which the generated documentation will be written. If a relative path is
+# entered, it will be relative to the location where doxygen was started. If
+# left blank the current directory will be used.
 
 OUTPUT_DIRECTORY       = docs/doxygen
 
-# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
-# 4096 sub-directories (in 2 levels) under the output directory of each output
-# format and will distribute the generated files over these directories.
-# Enabling this option can be useful when feeding doxygen a huge amount of
-# source files, where putting all generated files in the same directory would
-# otherwise cause performance problems for the file system.
+# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 4096 sub-
+# directories (in 2 levels) under the output directory of each output format and
+# will distribute the generated files over these directories. Enabling this
+# option can be useful when feeding doxygen a huge amount of source files, where
+# putting all generated files in the same directory would otherwise causes
+# performance problems for the file system.
+# The default value is: NO.
 
 CREATE_SUBDIRS         = NO
 
 # The OUTPUT_LANGUAGE tag is used to specify the language in which all
 # documentation generated by doxygen is written. Doxygen will use this
 # information to generate all constant output in the proper language.
-# The default language is English, other supported languages are:
-# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional,
-# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German,
-# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English
-# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian,
-# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak,
-# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese.
+# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese,
+# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States),
+# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian,
+# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages),
+# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian,
+# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian,
+# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish,
+# Ukrainian and Vietnamese.
+# The default value is: English.
 
 OUTPUT_LANGUAGE        = English
 
-# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
-# include brief member descriptions after the members that are listed in
-# the file and class documentation (similar to JavaDoc).
-# Set to NO to disable this.
+# If the BRIEF_MEMBER_DESC tag is set to YES doxygen will include brief member
+# descriptions after the members that are listed in the file and class
+# documentation (similar to Javadoc). Set to NO to disable this.
+# The default value is: YES.
 
 BRIEF_MEMBER_DESC      = YES
 
-# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend
-# the brief description of a member or function before the detailed description.
-# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
+# If the REPEAT_BRIEF tag is set to YES doxygen will prepend the brief
+# description of a member or function before the detailed description
+#
+# Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
 # brief descriptions will be completely suppressed.
+# The default value is: YES.
 
 REPEAT_BRIEF           = YES
 
-# This tag implements a quasi-intelligent brief description abbreviator
-# that is used to form the text in various listings. Each string
-# in this list, if found as the leading text of the brief description, will be
-# stripped from the text and the result after processing the whole list, is
-# used as the annotated text. Otherwise, the brief description is used as-is.
-# If left blank, the following values are used ("$name" is automatically
-# replaced with the name of the entity): "The $name class" "The $name widget"
-# "The $name file" "is" "provides" "specifies" "contains"
-# "represents" "a" "an" "the"
+# This tag implements a quasi-intelligent brief description abbreviator that is
+# used to form the text in various listings. Each string in this list, if found
+# as the leading text of the brief description, will be stripped from the text
+# and the result, after processing the whole list, is used as the annotated
+# text. Otherwise, the brief description is used as-is. If left blank, the
+# following values are used ($name is automatically replaced with the name of
+# the entity):The $name class, The $name widget, The $name file, is, provides,
+# specifies, contains, represents, a, an and the.
 
 ABBREVIATE_BRIEF       =
 
 # If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
-# Doxygen will generate a detailed section even if there is only a brief
+# doxygen will generate a detailed section even if there is only a brief
 # description.
+# The default value is: NO.
 
 ALWAYS_DETAILED_SEC    = NO
 
@@ -98,153 +123,204 @@
 # inherited members of a class in the documentation of that class as if those
 # members were ordinary class members. Constructors, destructors and assignment
 # operators of the base classes will not be shown.
+# The default value is: NO.
 
 INLINE_INHERITED_MEMB  = NO
 
-# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full
-# path before files name in the file list and in the header files. If set
-# to NO the shortest path that makes the file name unique will be used.
+# If the FULL_PATH_NAMES tag is set to YES doxygen will prepend the full path
+# before files name in the file list and in the header files. If set to NO the
+# shortest path that makes the file name unique will be used
+# The default value is: YES.
 
 FULL_PATH_NAMES        = YES
 
-# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
-# can be used to strip a user-defined part of the path. Stripping is
-# only done if one of the specified strings matches the left-hand part of
-# the path. The tag can be used to show relative paths in the file list.
-# If left blank the directory from which doxygen is run is used as the
-# path to strip.
+# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path.
+# Stripping is only done if one of the specified strings matches the left-hand
+# part of the path. The tag can be used to show relative paths in the file list.
+# If left blank the directory from which doxygen is run is used as the path to
+# strip.
+#
+# Note that you can specify absolute paths here, but also relative paths, which
+# will be relative from the directory where doxygen is started.
+# This tag requires that the tag FULL_PATH_NAMES is set to YES.
 
 STRIP_FROM_PATH        =
 
-# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
-# the path mentioned in the documentation of a class, which tells
-# the reader which header file to include in order to use a class.
-# If left blank only the name of the header file containing the class
-# definition is used. Otherwise one should specify the include paths that
-# are normally passed to the compiler using the -I flag.
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the
+# path mentioned in the documentation of a class, which tells the reader which
+# header file to include in order to use a class. If left blank only the name of
+# the header file containing the class definition is used. Otherwise one should
+# specify the list of include paths that are normally passed to the compiler
+# using the -I flag.
 
 STRIP_FROM_INC_PATH    =
 
-# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
-# (but less readable) file names. This can be useful is your file systems
-# doesn't support long names like on DOS, Mac, or CD-ROM.
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but
+# less readable) file names. This can be useful is your file systems doesn't
+# support long names like on DOS, Mac, or CD-ROM.
+# The default value is: NO.
 
 SHORT_NAMES            = NO
 
-# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
-# will interpret the first line (until the first dot) of a JavaDoc-style
-# comment as the brief description. If set to NO, the JavaDoc
-# comments will behave just like regular Qt-style comments
-# (thus requiring an explicit @brief command for a brief description.)
+# If the JAVADOC_AUTOBRIEF tag is set to YES then doxygen will interpret the
+# first line (until the first dot) of a Javadoc-style comment as the brief
+# description. If set to NO, the Javadoc-style will behave just like regular Qt-
+# style comments (thus requiring an explicit @brief command for a brief
+# description.)
+# The default value is: NO.
 
 JAVADOC_AUTOBRIEF      = NO
 
-# If the QT_AUTOBRIEF tag is set to YES then Doxygen will
-# interpret the first line (until the first dot) of a Qt-style
-# comment as the brief description. If set to NO, the comments
-# will behave just like regular Qt-style comments (thus requiring
-# an explicit \brief command for a brief description.)
+# If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first
+# line (until the first dot) of a Qt-style comment as the brief description. If
+# set to NO, the Qt-style will behave just like regular Qt-style comments (thus
+# requiring an explicit \brief command for a brief description.)
+# The default value is: NO.
 
 QT_AUTOBRIEF           = NO
 
-# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
-# treat a multi-line C++ special comment block (i.e. a block of //! or ///
-# comments) as a brief description. This used to be the default behaviour.
-# The new default is to treat a multi-line C++ comment block as a detailed
-# description. Set this tag to YES if you prefer the old behaviour instead.
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a
+# multi-line C++ special comment block (i.e. a block of //! or /// comments) as
+# a brief description. This used to be the default behavior. The new default is
+# to treat a multi-line C++ comment block as a detailed description. Set this
+# tag to YES if you prefer the old behavior instead.
+#
+# Note that setting this tag to YES also means that rational rose comments are
+# not recognized any more.
+# The default value is: NO.
 
 MULTILINE_CPP_IS_BRIEF = NO
 
-# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented
-# member inherits the documentation from any documented member that it
-# re-implements.
+# If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
+# documentation from any documented member that it re-implements.
+# The default value is: YES.
 
 INHERIT_DOCS           = YES
 
-# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce
-# a new page for each member. If set to NO, the documentation of a member will
-# be part of the file/class/namespace that contains it.
+# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce a
+# new page for each member. If set to NO, the documentation of a member will be
+# part of the file/class/namespace that contains it.
+# The default value is: NO.
 
 SEPARATE_MEMBER_PAGES  = NO
 
-# The TAB_SIZE tag can be used to set the number of spaces in a tab.
-# Doxygen uses this value to replace tabs by spaces in code fragments.
+# The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen
+# uses this value to replace tabs by spaces in code fragments.
+# Minimum value: 1, maximum value: 16, default value: 4.
 
 TAB_SIZE               = 8
 
-# This tag can be used to specify a number of aliases that acts
-# as commands in the documentation. An alias has the form "name=value".
-# For example adding "sideeffect=\par Side Effects:\n" will allow you to
-# put the command \sideeffect (or @sideeffect) in the documentation, which
-# will result in a user-defined paragraph with heading "Side Effects:".
-# You can put \n's in the value part of an alias to insert newlines.
+# This tag can be used to specify a number of aliases that act as commands in
+# the documentation. An alias has the form:
+# name=value
+# For example adding
+# "sideeffect=@par Side Effects:\n"
+# will allow you to put the command \sideeffect (or @sideeffect) in the
+# documentation, which will result in a user-defined paragraph with heading
+# "Side Effects:". You can put \n's in the value part of an alias to insert
+# newlines.
 
 ALIASES                =
 
-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C
-# sources only. Doxygen will then generate output that is more tailored for C.
-# For instance, some of the names that are used will be different. The list
-# of all members will be omitted, etc.
+# This tag can be used to specify a number of word-keyword mappings (TCL only).
+# A mapping has the form "name=value". For example adding "class=itcl::class"
+# will allow you to use the command class in the itcl::class meaning.
+
+TCL_SUBST              =
+
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
+# only. Doxygen will then generate output that is more tailored for C. For
+# instance, some of the names that are used will be different. The list of all
+# members will be omitted, etc.
+# The default value is: NO.
 
 OPTIMIZE_OUTPUT_FOR_C  = YES
 
-# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java
-# sources only. Doxygen will then generate output that is more tailored for
-# Java. For instance, namespaces will be presented as packages, qualified
-# scopes will look different, etc.
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or
+# Python sources only. Doxygen will then generate output that is more tailored
+# for that language. For instance, namespaces will be presented as packages,
+# qualified scopes will look different, etc.
+# The default value is: NO.
 
 OPTIMIZE_OUTPUT_JAVA   = NO
 
 # Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
-# sources only. Doxygen will then generate output that is more tailored for
-# Fortran.
+# sources. Doxygen will then generate output that is tailored for Fortran.
+# The default value is: NO.
 
 OPTIMIZE_FOR_FORTRAN   = NO
 
 # Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
-# sources. Doxygen will then generate output that is tailored for
-# VHDL.
+# sources. Doxygen will then generate output that is tailored for VHDL.
+# The default value is: NO.
 
 OPTIMIZE_OUTPUT_VHDL   = NO
 
 # Doxygen selects the parser to use depending on the extension of the files it
-# parses. With this tag you can assign which parser to use for a given extension.
-# Doxygen has a built-in mapping, but you can override or extend it using this
-# tag. The format is ext=language, where ext is a file extension, and language
-# is one of the parsers supported by doxygen: IDL, Java, Javascript, CSharp, C,
-# C++, D, PHP, Objective-C, Python, Fortran, VHDL, C, C++. For instance to make
+# parses. With this tag you can assign which parser to use for a given
+# extension. Doxygen has a built-in mapping, but you can override or extend it
+# using this tag. The format is ext=language, where ext is a file extension, and
+# language is one of the parsers supported by doxygen: IDL, Java, Javascript,
+# C#, C, C++, D, PHP, Objective-C, Python, Fortran, VHDL. For instance to make
 # doxygen treat .inc files as Fortran files (default is PHP), and .f files as C
-# (default is Fortran), use: inc=Fortran f=C. Note that for custom extensions
-# you also need to set FILE_PATTERNS otherwise the files are not read by doxygen.
+# (default is Fortran), use: inc=Fortran f=C.
+#
+# Note For files without extension you can use no_extension as a placeholder.
+#
+# Note that for custom extensions you also need to set FILE_PATTERNS otherwise
+# the files are not read by doxygen.
 
 EXTENSION_MAPPING      =
 
+# If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments
+# according to the Markdown format, which allows for more readable
+# documentation. See http://daringfireball.net/projects/markdown/ for details.
+# The output of markdown processing is further processed by doxygen, so you can
+# mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in
+# case of backward compatibilities issues.
+# The default value is: YES.
+
+MARKDOWN_SUPPORT       = YES
+
+# When enabled doxygen tries to link words that correspond to documented
+# classes, or namespaces to their corresponding documentation. Such a link can
+# be prevented in individual cases by by putting a % sign in front of the word
+# or globally by setting AUTOLINK_SUPPORT to NO.
+# The default value is: YES.
+
+AUTOLINK_SUPPORT       = YES
+
 # If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
-# to include (a tag file for) the STL sources as input, then you should
-# set this tag to YES in order to let doxygen match functions declarations and
-# definitions whose arguments contain STL classes (e.g. func(std::string); v.s.
-# func(std::string) {}). This also make the inheritance and collaboration
+# to include (a tag file for) the STL sources as input, then you should set this
+# tag to YES in order to let doxygen match functions declarations and
+# definitions whose arguments contain STL classes (e.g. func(std::string);
+# versus func(std::string) {}). This also make the inheritance and collaboration
 # diagrams that involve STL classes more complete and accurate.
+# The default value is: NO.
 
 BUILTIN_STL_SUPPORT    = NO
 
 # If you use Microsoft's C++/CLI language, you should set this option to YES to
 # enable parsing support.
+# The default value is: NO.
 
 CPP_CLI_SUPPORT        = NO
 
-# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only.
-# Doxygen will parse them like normal C++ but will assume all classes use public
-# instead of private inheritance when no explicit protection keyword is present.
+# Set the SIP_SUPPORT tag to YES if your project consists of sip (see:
+# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen
+# will parse them like normal C++ but will assume all classes use public instead
+# of private inheritance when no explicit protection keyword is present.
+# The default value is: NO.
 
 SIP_SUPPORT            = NO
 
-# For Microsoft's IDL there are propget and propput attributes to indicate getter
-# and setter methods for a property. Setting this option to YES (the default)
-# will make doxygen to replace the get and set methods by a property in the
-# documentation. This will only work if the methods are indeed getting or
-# setting a simple type. If this is not the case, or you want to show the
-# methods anyway, you should set this option to NO.
+# For Microsoft's IDL there are propget and propput attributes to indicate
+# getter and setter methods for a property. Setting this option to YES will make
+# doxygen to replace the get and set methods by a property in the documentation.
+# This will only work if the methods are indeed getting or setting a simple
+# type. If this is not the case, or you want to show the methods anyway, you
+# should set this option to NO.
+# The default value is: YES.
 
 IDL_PROPERTY_SUPPORT   = YES
 
@@ -252,1068 +328,1558 @@
 # tag is set to YES, then doxygen will reuse the documentation of the first
 # member in the group (if any) for the other members of the group. By default
 # all members of a group must be documented explicitly.
+# The default value is: NO.
 
 DISTRIBUTE_GROUP_DOC   = NO
 
-# Set the SUBGROUPING tag to YES (the default) to allow class member groups of
-# the same type (for instance a group of public functions) to be put as a
-# subgroup of that type (e.g. under the Public Functions section). Set it to
-# NO to prevent subgrouping. Alternatively, this can be done per class using
-# the \nosubgrouping command.
+# Set the SUBGROUPING tag to YES to allow class member groups of the same type
+# (for instance a group of public functions) to be put as a subgroup of that
+# type (e.g. under the Public Functions section). Set it to NO to prevent
+# subgrouping. Alternatively, this can be done per class using the
+# \nosubgrouping command.
+# The default value is: YES.
 
 SUBGROUPING            = YES
 
-# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum
-# is documented as struct, union, or enum with the name of the typedef. So
+# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions
+# are shown inside the group in which they are included (e.g. using \ingroup)
+# instead of on a separate page (for HTML and Man pages) or section (for LaTeX
+# and RTF).
+#
+# Note that this feature does not work in combination with
+# SEPARATE_MEMBER_PAGES.
+# The default value is: NO.
+
+INLINE_GROUPED_CLASSES = NO
+
+# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions
+# with only public data fields or simple typedef fields will be shown inline in
+# the documentation of the scope in which they are defined (i.e. file,
+# namespace, or group documentation), provided this scope is documented. If set
+# to NO, structs, classes, and unions are shown on a separate page (for HTML and
+# Man pages) or section (for LaTeX and RTF).
+# The default value is: NO.
+
+INLINE_SIMPLE_STRUCTS  = NO
+
+# When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or
+# enum is documented as struct, union, or enum with the name of the typedef. So
 # typedef struct TypeS {} TypeT, will appear in the documentation as a struct
 # with name TypeT. When disabled the typedef will appear as a member of a file,
-# namespace, or class. And the struct will be named TypeS. This can typically
-# be useful for C code in case the coding convention dictates that all compound
+# namespace, or class. And the struct will be named TypeS. This can typically be
+# useful for C code in case the coding convention dictates that all compound
 # types are typedef'ed and only the typedef is referenced, never the tag name.
+# The default value is: NO.
 
 TYPEDEF_HIDES_STRUCT   = YES
 
-# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to
-# determine which symbols to keep in memory and which to flush to disk.
-# When the cache is full, less often used symbols will be written to disk.
-# For small to medium size projects (<1000 input files) the default value is
-# probably good enough. For larger projects a too small cache size can cause
-# doxygen to be busy swapping symbols to and from disk most of the time
-# causing a significant performance penality.
-# If the system has enough physical memory increasing the cache will improve the
-# performance by keeping more symbols in memory. Note that the value works on
-# a logarithmic scale so increasing the size by one will rougly double the
-# memory usage. The cache size is given by this formula:
-# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0,
-# corresponding to a cache size of 2^16 = 65536 symbols
+# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This
+# cache is used to resolve symbols given their name and scope. Since this can be
+# an expensive process and often the same symbol appears multiple times in the
+# code, doxygen keeps a cache of pre-resolved symbols. If the cache is too small
+# doxygen will become slower. If the cache is too large, memory is wasted. The
+# cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range
+# is 0..9, the default is 0, corresponding to a cache size of 2^16=65536
+# symbols. At the end of a run doxygen will report the cache usage and suggest
+# the optimal cache size from a speed point of view.
+# Minimum value: 0, maximum value: 9, default value: 0.
 
-SYMBOL_CACHE_SIZE      = 0
+LOOKUP_CACHE_SIZE      = 0
 
 #---------------------------------------------------------------------------
 # Build related configuration options
 #---------------------------------------------------------------------------
 
 # If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
-# documentation are documented, even if no documentation was available.
-# Private class members and static file members will be hidden unless
-# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
+# documentation are documented, even if no documentation was available. Private
+# class members and static file members will be hidden unless the
+# EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES.
+# Note: This will also disable the warnings about undocumented members that are
+# normally produced when WARNINGS is set to YES.
+# The default value is: NO.
 
 EXTRACT_ALL            = YES
 
-# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
-# will be included in the documentation.
+# If the EXTRACT_PRIVATE tag is set to YES all private members of a class will
+# be included in the documentation.
+# The default value is: NO.
 
 EXTRACT_PRIVATE        = NO
 
-# If the EXTRACT_STATIC tag is set to YES all static members of a file
-# will be included in the documentation.
+# If the EXTRACT_PACKAGE tag is set to YES all members with package or internal
+# scope will be included in the documentation.
+# The default value is: NO.
+
+EXTRACT_PACKAGE        = NO
+
+# If the EXTRACT_STATIC tag is set to YES all static members of a file will be
+# included in the documentation.
+# The default value is: NO.
 
 EXTRACT_STATIC         = NO
 
-# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs)
-# defined locally in source files will be included in the documentation.
-# If set to NO only classes defined in header files are included.
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) defined
+# locally in source files will be included in the documentation. If set to NO
+# only classes defined in header files are included. Does not have any effect
+# for Java sources.
+# The default value is: YES.
 
 EXTRACT_LOCAL_CLASSES  = NO
 
-# This flag is only useful for Objective-C code. When set to YES local
-# methods, which are defined in the implementation section but not in
-# the interface are included in the documentation.
-# If set to NO (the default) only methods in the interface are included.
+# This flag is only useful for Objective-C code. When set to YES local methods,
+# which are defined in the implementation section but not in the interface are
+# included in the documentation. If set to NO only methods in the interface are
+# included.
+# The default value is: NO.
 
 EXTRACT_LOCAL_METHODS  = NO
 
 # If this flag is set to YES, the members of anonymous namespaces will be
 # extracted and appear in the documentation as a namespace called
-# 'anonymous_namespace{file}', where file will be replaced with the base
-# name of the file that contains the anonymous namespace. By default
-# anonymous namespace are hidden.
+# 'anonymous_namespace{file}', where file will be replaced with the base name of
+# the file that contains the anonymous namespace. By default anonymous namespace
+# are hidden.
+# The default value is: NO.
 
 EXTRACT_ANON_NSPACES   = NO
 
-# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all
-# undocumented members of documented classes, files or namespaces.
-# If set to NO (the default) these members will be included in the
-# various overviews, but no documentation section is generated.
-# This option has no effect if EXTRACT_ALL is enabled.
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all
+# undocumented members inside documented classes or files. If set to NO these
+# members will be included in the various overviews, but no documentation
+# section is generated. This option has no effect if EXTRACT_ALL is enabled.
+# The default value is: NO.
 
 HIDE_UNDOC_MEMBERS     = NO
 
-# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all
-# undocumented classes that are normally visible in the class hierarchy.
-# If set to NO (the default) these classes will be included in the various
-# overviews. This option has no effect if EXTRACT_ALL is enabled.
+# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all
+# undocumented classes that are normally visible in the class hierarchy. If set
+# to NO these classes will be included in the various overviews. This option has
+# no effect if EXTRACT_ALL is enabled.
+# The default value is: NO.
 
 HIDE_UNDOC_CLASSES     = NO
 
-# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all
-# friend (class|struct|union) declarations.
-# If set to NO (the default) these declarations will be included in the
-# documentation.
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
+# (class|struct|union) declarations. If set to NO these declarations will be
+# included in the documentation.
+# The default value is: NO.
 
 HIDE_FRIEND_COMPOUNDS  = NO
 
-# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any
-# documentation blocks found inside the body of a function.
-# If set to NO (the default) these blocks will be appended to the
-# function's detailed documentation block.
+# If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any
+# documentation blocks found inside the body of a function. If set to NO these
+# blocks will be appended to the function's detailed documentation block.
+# The default value is: NO.
 
 HIDE_IN_BODY_DOCS      = NO
 
-# The INTERNAL_DOCS tag determines if documentation
-# that is typed after a \internal command is included. If the tag is set
-# to NO (the default) then the documentation will be excluded.
-# Set it to YES to include the internal documentation.
+# The INTERNAL_DOCS tag determines if documentation that is typed after a
+# \internal command is included. If the tag is set to NO then the documentation
+# will be excluded. Set it to YES to include the internal documentation.
+# The default value is: NO.
 
 INTERNAL_DOCS          = NO
 
-# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate
-# file names in lower-case letters. If set to YES upper-case letters are also
+# If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file
+# names in lower-case letters. If set to YES upper-case letters are also
 # allowed. This is useful if you have classes or files whose names only differ
 # in case and if your file system supports case sensitive file names. Windows
 # and Mac users are advised to set this option to NO.
+# The default value is: system dependent.
 
 CASE_SENSE_NAMES       = YES
 
-# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen
-# will show members with their full class and namespace scopes in the
-# documentation. If set to YES the scope will be hidden.
+# If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with
+# their full class and namespace scopes in the documentation. If set to YES the
+# scope will be hidden.
+# The default value is: NO.
 
 HIDE_SCOPE_NAMES       = NO
 
-# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen
-# will put a list of the files that are included by a file in the documentation
-# of that file.
+# If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
+# the files that are included by a file in the documentation of that file.
+# The default value is: YES.
 
 SHOW_INCLUDE_FILES     = YES
 
-# If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen
-# will list include files with double quotes in the documentation
-# rather than with sharp brackets.
+# If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each
+# grouped member an include statement to the documentation, telling the reader
+# which file to include in order to use the member.
+# The default value is: NO.
+
+SHOW_GROUPED_MEMB_INC  = NO
+
+# If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include
+# files with double quotes in the documentation rather than with sharp brackets.
+# The default value is: NO.
 
 FORCE_LOCAL_INCLUDES   = NO
 
-# If the INLINE_INFO tag is set to YES (the default) then a tag [inline]
-# is inserted in the documentation for inline members.
+# If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the
+# documentation for inline members.
+# The default value is: YES.
 
 INLINE_INFO            = YES
 
-# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen
-# will sort the (detailed) documentation of file and class members
-# alphabetically by member name. If set to NO the members will appear in
-# declaration order.
+# If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the
+# (detailed) documentation of file and class members alphabetically by member
+# name. If set to NO the members will appear in declaration order.
+# The default value is: YES.
 
 SORT_MEMBER_DOCS       = YES
 
-# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the
-# brief documentation of file, namespace and class members alphabetically
-# by member name. If set to NO (the default) the members will appear in
-# declaration order.
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief
+# descriptions of file, namespace and class members alphabetically by member
+# name. If set to NO the members will appear in declaration order. Note that
+# this will also influence the order of the classes in the class list.
+# The default value is: NO.
 
 SORT_BRIEF_DOCS        = NO
 
-# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen
-# will sort the (brief and detailed) documentation of class members so that
-# constructors and destructors are listed first. If set to NO (the default)
-# the constructors will appear in the respective orders defined by
-# SORT_MEMBER_DOCS and SORT_BRIEF_DOCS.
-# This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO
-# and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO.
+# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the
+# (brief and detailed) documentation of class members so that constructors and
+# destructors are listed first. If set to NO the constructors will appear in the
+# respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS.
+# Note: If SORT_BRIEF_DOCS is set to NO this option is ignored for sorting brief
+# member documentation.
+# Note: If SORT_MEMBER_DOCS is set to NO this option is ignored for sorting
+# detailed member documentation.
+# The default value is: NO.
 
 SORT_MEMBERS_CTORS_1ST = NO
 
-# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the
-# hierarchy of group names into alphabetical order. If set to NO (the default)
-# the group names will appear in their defined order.
+# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy
+# of group names into alphabetical order. If set to NO the group names will
+# appear in their defined order.
+# The default value is: NO.
 
 SORT_GROUP_NAMES       = NO
 
-# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be
-# sorted by fully-qualified names, including namespaces. If set to
-# NO (the default), the class list will be sorted only by class name,
-# not including the namespace part.
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by
+# fully-qualified names, including namespaces. If set to NO, the class list will
+# be sorted only by class name, not including the namespace part.
 # Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
-# Note: This option applies only to the class list, not to the
-# alphabetical list.
+# Note: This option applies only to the class list, not to the alphabetical
+# list.
+# The default value is: NO.
 
 SORT_BY_SCOPE_NAME     = NO
 
-# The GENERATE_TODOLIST tag can be used to enable (YES) or
-# disable (NO) the todo list. This list is created by putting \todo
-# commands in the documentation.
+# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper
+# type resolution of all parameters of a function it will reject a match between
+# the prototype and the implementation of a member function even if there is
+# only one candidate or it is obvious which candidate to choose by doing a
+# simple string match. By disabling STRICT_PROTO_MATCHING doxygen will still
+# accept a match between prototype and implementation in such cases.
+# The default value is: NO.
+
+STRICT_PROTO_MATCHING  = NO
+
+# The GENERATE_TODOLIST tag can be used to enable ( YES) or disable ( NO) the
+# todo list. This list is created by putting \todo commands in the
+# documentation.
+# The default value is: YES.
 
 GENERATE_TODOLIST      = YES
 
-# The GENERATE_TESTLIST tag can be used to enable (YES) or
-# disable (NO) the test list. This list is created by putting \test
-# commands in the documentation.
+# The GENERATE_TESTLIST tag can be used to enable ( YES) or disable ( NO) the
+# test list. This list is created by putting \test commands in the
+# documentation.
+# The default value is: YES.
 
 GENERATE_TESTLIST      = YES
 
-# The GENERATE_BUGLIST tag can be used to enable (YES) or
-# disable (NO) the bug list. This list is created by putting \bug
-# commands in the documentation.
+# The GENERATE_BUGLIST tag can be used to enable ( YES) or disable ( NO) the bug
+# list. This list is created by putting \bug commands in the documentation.
+# The default value is: YES.
 
 GENERATE_BUGLIST       = YES
 
-# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or
-# disable (NO) the deprecated list. This list is created by putting
-# \deprecated commands in the documentation.
+# The GENERATE_DEPRECATEDLIST tag can be used to enable ( YES) or disable ( NO)
+# the deprecated list. This list is created by putting \deprecated commands in
+# the documentation.
+# The default value is: YES.
 
 GENERATE_DEPRECATEDLIST= YES
 
-# The ENABLED_SECTIONS tag can be used to enable conditional
-# documentation sections, marked by \if sectionname ... \endif.
+# The ENABLED_SECTIONS tag can be used to enable conditional documentation
+# sections, marked by \if <section_label> ... \endif and \cond <section_label>
+# ... \endcond blocks.
 
 ENABLED_SECTIONS       =
 
-# The MAX_INITIALIZER_LINES tag determines the maximum number of lines
-# the initial value of a variable or define consists of for it to appear in
-# the documentation. If the initializer consists of more lines than specified
-# here it will be hidden. Use a value of 0 to hide initializers completely.
-# The appearance of the initializer of individual variables and defines in the
-# documentation can be controlled using \showinitializer or \hideinitializer
-# command in the documentation regardless of this setting.
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the
+# initial value of a variable or macro / define can have for it to appear in the
+# documentation. If the initializer consists of more lines than specified here
+# it will be hidden. Use a value of 0 to hide initializers completely. The
+# appearance of the value of individual variables and macros / defines can be
+# controlled using \showinitializer or \hideinitializer command in the
+# documentation regardless of this setting.
+# Minimum value: 0, maximum value: 10000, default value: 30.
 
 MAX_INITIALIZER_LINES  = 30
 
-# Set the SHOW_USED_FILES tag to NO to disable the list of files generated
-# at the bottom of the documentation of classes and structs. If set to YES the
-# list will mention the files that were used to generate the documentation.
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated at
+# the bottom of the documentation of classes and structs. If set to YES the list
+# will mention the files that were used to generate the documentation.
+# The default value is: YES.
 
 SHOW_USED_FILES        = YES
 
-# If the sources in your project are distributed over multiple directories
-# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy
-# in the documentation. The default is NO.
-
-SHOW_DIRECTORIES       = NO
-
-# Set the SHOW_FILES tag to NO to disable the generation of the Files page.
-# This will remove the Files entry from the Quick Index and from the
-# Folder Tree View (if specified). The default is YES.
+# Set the SHOW_FILES tag to NO to disable the generation of the Files page. This
+# will remove the Files entry from the Quick Index and from the Folder Tree View
+# (if specified).
+# The default value is: YES.
 
 SHOW_FILES             = YES
 
-# Set the SHOW_NAMESPACES tag to NO to disable the generation of the
-# Namespaces page.
-# This will remove the Namespaces entry from the Quick Index
-# and from the Folder Tree View (if specified). The default is YES.
+# Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces
+# page. This will remove the Namespaces entry from the Quick Index and from the
+# Folder Tree View (if specified).
+# The default value is: YES.
 
 SHOW_NAMESPACES        = YES
 
 # The FILE_VERSION_FILTER tag can be used to specify a program or script that
 # doxygen should invoke to get the current version for each file (typically from
 # the version control system). Doxygen will invoke the program by executing (via
-# popen()) the command <command> <input-file>, where <command> is the value of
-# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file
-# provided by doxygen. Whatever the program writes to standard output
-# is used as the file version. See the manual for examples.
+# popen()) the command command input-file, where command is the value of the
+# FILE_VERSION_FILTER tag, and input-file is the name of an input file provided
+# by doxygen. Whatever the program writes to standard output is used as the file
+# version. For an example see the documentation.
 
 FILE_VERSION_FILTER    =
 
 # The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
 # by doxygen. The layout file controls the global structure of the generated
-# output files in an output format independent way. The create the layout file
-# that represents doxygen's defaults, run doxygen with the -l option.
-# You can optionally specify a file name after the option, if omitted
-# DoxygenLayout.xml will be used as the name of the layout file.
+# output files in an output format independent way. To create the layout file
+# that represents doxygen's defaults, run doxygen with the -l option. You can
+# optionally specify a file name after the option, if omitted DoxygenLayout.xml
+# will be used as the name of the layout file.
+#
+# Note that if you run doxygen from a directory containing a file called
+# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
+# tag is left empty.
 
 LAYOUT_FILE            =
 
+# The CITE_BIB_FILES tag can be used to specify one or more bib files containing
+# the reference definitions. This must be a list of .bib files. The .bib
+# extension is automatically appended if omitted. This requires the bibtex tool
+# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info.
+# For LaTeX the style of the bibliography can be controlled using
+# LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the
+# search path. Do not use file names with spaces, bibtex cannot handle them. See
+# also \cite for info how to create references.
+
+CITE_BIB_FILES         =
+
 #---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
+# Configuration options related to warning and progress messages
 #---------------------------------------------------------------------------
 
-# The QUIET tag can be used to turn on/off the messages that are generated
-# by doxygen. Possible values are YES and NO. If left blank NO is used.
+# The QUIET tag can be used to turn on/off the messages that are generated to
+# standard output by doxygen. If QUIET is set to YES this implies that the
+# messages are off.
+# The default value is: NO.
 
 QUIET                  = NO
 
 # The WARNINGS tag can be used to turn on/off the warning messages that are
-# generated by doxygen. Possible values are YES and NO. If left blank
-# NO is used.
+# generated to standard error ( stderr) by doxygen. If WARNINGS is set to YES
+# this implies that the warnings are on.
+#
+# Tip: Turn warnings on while writing the documentation.
+# The default value is: YES.
 
 WARNINGS               = YES
 
-# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings
-# for undocumented members. If EXTRACT_ALL is set to YES then this flag will
-# automatically be disabled.
+# If the WARN_IF_UNDOCUMENTED tag is set to YES, then doxygen will generate
+# warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag
+# will automatically be disabled.
+# The default value is: YES.
 
 WARN_IF_UNDOCUMENTED   = YES
 
-# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for
-# potential errors in the documentation, such as not documenting some
-# parameters in a documented function, or documenting parameters that
-# don't exist or using markup commands wrongly.
+# If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
+# potential errors in the documentation, such as not documenting some parameters
+# in a documented function, or documenting parameters that don't exist or using
+# markup commands wrongly.
+# The default value is: YES.
 
 WARN_IF_DOC_ERROR      = YES
 
-# This WARN_NO_PARAMDOC option can be abled to get warnings for
-# functions that are documented, but have no documentation for their parameters
-# or return value. If set to NO (the default) doxygen will only warn about
-# wrong or incomplete parameter documentation, but not about the absence of
-# documentation.
+# This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
+# are documented, but have no documentation for their parameters or return
+# value. If set to NO doxygen will only warn about wrong or incomplete parameter
+# documentation, but not about the absence of documentation.
+# The default value is: NO.
 
 WARN_NO_PARAMDOC       = NO
 
-# The WARN_FORMAT tag determines the format of the warning messages that
-# doxygen can produce. The string should contain the $file, $line, and $text
-# tags, which will be replaced by the file and line number from which the
-# warning originated and the warning text. Optionally the format may contain
-# $version, which will be replaced by the version of the file (if it could
-# be obtained via FILE_VERSION_FILTER)
+# The WARN_FORMAT tag determines the format of the warning messages that doxygen
+# can produce. The string should contain the $file, $line, and $text tags, which
+# will be replaced by the file and line number from which the warning originated
+# and the warning text. Optionally the format may contain $version, which will
+# be replaced by the version of the file (if it could be obtained via
+# FILE_VERSION_FILTER)
+# The default value is: $file:$line: $text.
 
 WARN_FORMAT            = "$file:$line: $text"
 
-# The WARN_LOGFILE tag can be used to specify a file to which warning
-# and error messages should be written. If left blank the output is written
-# to stderr.
+# The WARN_LOGFILE tag can be used to specify a file to which warning and error
+# messages should be written. If left blank the output is written to standard
+# error (stderr).
 
 WARN_LOGFILE           =
 
 #---------------------------------------------------------------------------
-# configuration options related to the input files
+# Configuration options related to the input files
 #---------------------------------------------------------------------------
 
-# The INPUT tag can be used to specify the files and/or directories that contain
-# documented source files. You may enter file names like "myfile.cpp" or
-# directories like "/usr/src/myproject". Separate the files or directories
-# with spaces.
-
-INPUT                  = src lives-plugins/plugins/playback/video/videoplugin.h lives-plugins/plugins/decoders/decplugin.h
+# The INPUT tag is used to specify the files and/or directories that contain
+# documented source files. You may enter file names like myfile.cpp or
+# directories like /usr/src/myproject. Separate the files or directories with
+# spaces.
+# Note: If this tag is empty the current directory is searched.
+
+INPUT                  = src \
+                         lives-plugins/plugins/playback/video/videoplugin.h \
+                         lives-plugins/plugins/decoders/decplugin.h
 
 # This tag can be used to specify the character encoding of the source files
-# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
-# also the default input encoding. Doxygen uses libiconv (or the iconv built
-# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for
-# the list of possible encodings.
+# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
+# libiconv (or the iconv built into libc) for the transcoding. See the libiconv
+# documentation (see: http://www.gnu.org/software/libiconv) for the list of
+# possible encodings.
+# The default value is: UTF-8.
 
 INPUT_ENCODING         = UTF-8
 
 # If the value of the INPUT tag contains directories, you can use the
-# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
-# and *.h) to filter out the source-files in the directories. If left
-# blank the following patterns are tested:
-# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx
-# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90
+# FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and
+# *.h) to filter out the source-files in the directories. If left blank the
+# following patterns are tested:*.c, *.cc, *.cxx, *.cpp, *.c++, *.java, *.ii,
+# *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h, *.hh, *.hxx, *.hpp,
+# *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc, *.m, *.markdown,
+# *.md, *.mm, *.dox, *.py, *.f90, *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf,
+# *.qsf, *.as and *.js.
 
 FILE_PATTERNS          =
 
-# The RECURSIVE tag can be used to turn specify whether or not subdirectories
-# should be searched for input files as well. Possible values are YES and NO.
-# If left blank NO is used.
+# The RECURSIVE tag can be used to specify whether or not subdirectories should
+# be searched for input files as well.
+# The default value is: NO.
 
 RECURSIVE              = YES
 
-# The EXCLUDE tag can be used to specify files and/or directories that should
+# The EXCLUDE tag can be used to specify files and/or directories that should be
 # excluded from the INPUT source files. This way you can easily exclude a
 # subdirectory from a directory tree whose root is specified with the INPUT tag.
+#
+# Note that relative paths are relative to the directory from which doxygen is
+# run.
 
-EXCLUDE                = intl libOSC src/giw
+EXCLUDE                = intl \
+                         libOSC \
+                         src/giw
 
-# The EXCLUDE_SYMLINKS tag can be used select whether or not files or
-# directories that are symbolic links (a Unix filesystem feature) are excluded
+# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
+# directories that are symbolic links (a Unix file system feature) are excluded
 # from the input.
+# The default value is: NO.
 
 EXCLUDE_SYMLINKS       = NO
 
 # If the value of the INPUT tag contains directories, you can use the
 # EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
-# certain files from those directories. Note that the wildcards are matched
-# against the file with absolute path, so to exclude all test directories
-# for example use the pattern */test/*
+# certain files from those directories.
+#
+# Note that the wildcards are matched against the file with absolute path, so to
+# exclude all test directories for example use the pattern */test/*
 
-# exclude local test files
-EXCLUDE_PATTERNS       = 
+EXCLUDE_PATTERNS       =
 
 # The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
 # (namespaces, classes, functions, etc.) that should be excluded from the
 # output. The symbol name can be a fully qualified name, a word, or if the
 # wildcard * is used, a substring. Examples: ANamespace, AClass,
 # AClass::ANamespace, ANamespace::*Test
+#
+# Note that the wildcards are matched against the file with absolute path, so to
+# exclude all test directories use the pattern */test/*
 
 EXCLUDE_SYMBOLS        =
 
-# The EXAMPLE_PATH tag can be used to specify one or more files or
-# directories that contain example code fragments that are included (see
-# the \include command).
+# The EXAMPLE_PATH tag can be used to specify one or more files or directories
+# that contain example code fragments that are included (see the \include
+# command).
 
 EXAMPLE_PATH           = src
 
 # If the value of the EXAMPLE_PATH tag contains directories, you can use the
-# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
-# and *.h) to filter out the source-files in the directories. If left
-# blank all files are included.
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and
+# *.h) to filter out the source-files in the directories. If left blank all
+# files are included.
 
-EXAMPLE_PATTERNS       = *.c *.h
+EXAMPLE_PATTERNS       = *.c \
+                         *.h
 
 # If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
-# searched for input files to be used with the \include or \dontinclude
-# commands irrespective of the value of the RECURSIVE tag.
-# Possible values are YES and NO. If left blank NO is used.
+# searched for input files to be used with the \include or \dontinclude commands
+# irrespective of the value of the RECURSIVE tag.
+# The default value is: NO.
 
 EXAMPLE_RECURSIVE      = NO
 
-# The IMAGE_PATH tag can be used to specify one or more files or
-# directories that contain image that are included in the documentation (see
-# the \image command).
+# The IMAGE_PATH tag can be used to specify one or more files or directories
+# that contain images that are to be included in the documentation (see the
+# \image command).
 
 IMAGE_PATH             =
 
 # The INPUT_FILTER tag can be used to specify a program that doxygen should
 # invoke to filter for each input file. Doxygen will invoke the filter program
-# by executing (via popen()) the command <filter> <input-file>, where <filter>
-# is the value of the INPUT_FILTER tag, and <input-file> is the name of an
-# input file. Doxygen will then use the output that the filter program writes
-# to standard output.
-# If FILTER_PATTERNS is specified, this tag will be
-# ignored.
+# by executing (via popen()) the command:
+#
+# <filter> <input-file>
+#
+# where <filter> is the value of the INPUT_FILTER tag, and <input-file> is the
+# name of an input file. Doxygen will then use the output that the filter
+# program writes to standard output. If FILTER_PATTERNS is specified, this tag
+# will be ignored.
+#
+# Note that the filter must not add or remove lines; it is applied before the
+# code is scanned, but not when the output code is generated. If lines are added
+# or removed, the anchors will not be placed correctly.
 
 INPUT_FILTER           =
 
 # The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
-# basis.
-# Doxygen will compare the file name with each pattern and apply the
-# filter if there is a match.
-# The filters are a list of the form:
-# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further
-# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER
-# is applied to all files.
+# basis. Doxygen will compare the file name with each pattern and apply the
+# filter if there is a match. The filters are a list of the form: pattern=filter
+# (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how
+# filters are used. If the FILTER_PATTERNS tag is empty or if none of the
+# patterns match the file name, INPUT_FILTER is applied.
 
 FILTER_PATTERNS        =
 
 # If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
-# INPUT_FILTER) will be used to filter the input files when producing source
-# files to browse (i.e. when SOURCE_BROWSER is set to YES).
+# INPUT_FILTER ) will also be used to filter the input files that are used for
+# producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES).
+# The default value is: NO.
 
 FILTER_SOURCE_FILES    = NO
 
+# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
+# pattern. A pattern will override the setting for FILTER_PATTERN (if any) and
+# it is also possible to disable source filtering for a specific pattern using
+# *.ext= (so without naming a filter).
+# This tag requires that the tag FILTER_SOURCE_FILES is set to YES.
+
+FILTER_SOURCE_PATTERNS =
+
+# If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that
+# is part of the input, its contents will be placed on the main page
+# (index.html). This can be useful if you have a project on for instance GitHub
+# and want to reuse the introduction page also for the doxygen output.
+
+USE_MDFILE_AS_MAINPAGE =
+
 #---------------------------------------------------------------------------
-# configuration options related to source browsing
+# Configuration options related to source browsing
 #---------------------------------------------------------------------------
 
-# If the SOURCE_BROWSER tag is set to YES then a list of source files will
-# be generated. Documented entities will be cross-referenced with these sources.
-# Note: To get rid of all source code in the generated output, make sure also
-# VERBATIM_HEADERS is set to NO.
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will be
+# generated. Documented entities will be cross-referenced with these sources.
+#
+# Note: To get rid of all source code in the generated output, make sure that
+# also VERBATIM_HEADERS is set to NO.
+# The default value is: NO.
 
 SOURCE_BROWSER         = NO
 
-# Setting the INLINE_SOURCES tag to YES will include the body
-# of functions and classes directly in the documentation.
+# Setting the INLINE_SOURCES tag to YES will include the body of functions,
+# classes and enums directly into the documentation.
+# The default value is: NO.
 
 INLINE_SOURCES         = NO
 
-# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
-# doxygen to hide any special comment blocks from generated source code
-# fragments. Normal C and C++ comments will always remain visible.
+# Setting the STRIP_CODE_COMMENTS tag to YES will instruct doxygen to hide any
+# special comment blocks from generated source code fragments. Normal C, C++ and
+# Fortran comments will always remain visible.
+# The default value is: YES.
 
 STRIP_CODE_COMMENTS    = YES
 
-# If the REFERENCED_BY_RELATION tag is set to YES
-# then for each documented function all documented
-# functions referencing it will be listed.
+# If the REFERENCED_BY_RELATION tag is set to YES then for each documented
+# function all documented functions referencing it will be listed.
+# The default value is: NO.
 
 REFERENCED_BY_RELATION = NO
 
-# If the REFERENCES_RELATION tag is set to YES
-# then for each documented function all documented entities
-# called/used by that function will be listed.
+# If the REFERENCES_RELATION tag is set to YES then for each documented function
+# all documented entities called/used by that function will be listed.
+# The default value is: NO.
 
 REFERENCES_RELATION    = NO
 
-# If the REFERENCES_LINK_SOURCE tag is set to YES (the default)
-# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from
-# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will
-# link to the source code.
-# Otherwise they will link to the documentation.
+# If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set
+# to YES, then the hyperlinks from functions in REFERENCES_RELATION and
+# REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will
+# link to the documentation.
+# The default value is: YES.
 
 REFERENCES_LINK_SOURCE = YES
 
-# If the USE_HTAGS tag is set to YES then the references to source code
-# will point to the HTML generated by the htags(1) tool instead of doxygen
-# built-in source browser. The htags tool is part of GNU's global source
-# tagging system (see http://www.gnu.org/software/global/global.html). You
-# will need version 4.8.6 or higher.
+# If SOURCE_TOOLTIPS is enabled (the default) then hovering a hyperlink in the
+# source code will show a tooltip with additional information such as prototype,
+# brief description and links to the definition and documentation. Since this
+# will make the HTML file larger and loading of large files a bit slower, you
+# can opt to disable this feature.
+# The default value is: YES.
+# This tag requires that the tag SOURCE_BROWSER is set to YES.
+
+SOURCE_TOOLTIPS        = YES
+
+# If the USE_HTAGS tag is set to YES then the references to source code will
+# point to the HTML generated by the htags(1) tool instead of doxygen built-in
+# source browser. The htags tool is part of GNU's global source tagging system
+# (see http://www.gnu.org/software/global/global.html). You will need version
+# 4.8.6 or higher.
+#
+# To use it do the following:
+# - Install the latest version of global
+# - Enable SOURCE_BROWSER and USE_HTAGS in the config file
+# - Make sure the INPUT points to the root of the source tree
+# - Run doxygen as normal
+#
+# Doxygen will invoke htags (and that will in turn invoke gtags), so these
+# tools must be available from the command line (i.e. in the search path).
+#
+# The result: instead of the source browser generated by doxygen, the links to
+# source code will now point to the output of htags.
+# The default value is: NO.
+# This tag requires that the tag SOURCE_BROWSER is set to YES.
 
 USE_HTAGS              = NO
 
-# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen
-# will generate a verbatim copy of the header file for each class for
-# which an include is specified. Set to NO to disable this.
+# If the VERBATIM_HEADERS tag is set the YES then doxygen will generate a
+# verbatim copy of the header file for each class for which an include is
+# specified. Set to NO to disable this.
+# See also: Section \class.
+# The default value is: YES.
 
 VERBATIM_HEADERS       = YES
 
 #---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
+# Configuration options related to the alphabetical class index
 #---------------------------------------------------------------------------
 
-# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index
-# of all compounds will be generated. Enable this if the project
-# contains a lot of classes, structs, unions or interfaces.
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index of all
+# compounds will be generated. Enable this if the project contains a lot of
+# classes, structs, unions or interfaces.
+# The default value is: YES.
 
 ALPHABETICAL_INDEX     = YES
 
-# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then
-# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns
-# in which this list will be split (can be a number in the range [1..20])
+# The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in
+# which the alphabetical index list will be split.
+# Minimum value: 1, maximum value: 20, default value: 5.
+# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
 
 COLS_IN_ALPHA_INDEX    = 5
 
-# In case all classes in a project start with a common prefix, all
-# classes will be put under the same header in the alphabetical index.
-# The IGNORE_PREFIX tag can be used to specify one or more prefixes that
-# should be ignored while generating the index headers.
+# In case all classes in a project start with a common prefix, all classes will
+# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag
+# can be used to specify a prefix (or a list of prefixes) that should be ignored
+# while generating the index headers.
+# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
 
 IGNORE_PREFIX          =
 
 #---------------------------------------------------------------------------
-# configuration options related to the HTML output
+# Configuration options related to the HTML output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_HTML tag is set to YES (the default) Doxygen will
-# generate HTML output.
+# If the GENERATE_HTML tag is set to YES doxygen will generate HTML output
+# The default value is: YES.
 
 GENERATE_HTML          = YES
 
-# The HTML_OUTPUT tag is used to specify where the HTML docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `html' will be used as the default path.
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: html.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_OUTPUT            = html
 
-# The HTML_FILE_EXTENSION tag can be used to specify the file extension for
-# each generated HTML page (for example: .htm,.php,.asp). If it is left blank
-# doxygen will generate files with .html extension.
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each
+# generated HTML page (for example: .htm, .php, .asp).
+# The default value is: .html.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_FILE_EXTENSION    = .html
 
-# The HTML_HEADER tag can be used to specify a personal HTML header for
-# each generated HTML page. If it is left blank doxygen will generate a
+# The HTML_HEADER tag can be used to specify a user-defined HTML header file for
+# each generated HTML page. If the tag is left blank doxygen will generate a
 # standard header.
+#
+# To get valid HTML the header file that includes any scripts and style sheets
+# that doxygen needs, which is dependent on the configuration options used (e.g.
+# the setting GENERATE_TREEVIEW). It is highly recommended to start with a
+# default header using
+# doxygen -w html new_header.html new_footer.html new_stylesheet.css
+# YourConfigFile
+# and then modify the file new_header.html. See also section "Doxygen usage"
+# for information on how to generate the default header that doxygen normally
+# uses.
+# Note: The header is subject to change so you typically have to regenerate the
+# default header when upgrading to a newer version of doxygen. For a description
+# of the possible markers and block names see the documentation.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_HEADER            =
 
-# The HTML_FOOTER tag can be used to specify a personal HTML footer for
-# each generated HTML page. If it is left blank doxygen will generate a
-# standard footer.
+# The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each
+# generated HTML page. If the tag is left blank doxygen will generate a standard
+# footer. See HTML_HEADER for more information on how to generate a default
+# footer and what special commands can be used inside the footer. See also
+# section "Doxygen usage" for information on how to generate the default footer
+# that doxygen normally uses.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_FOOTER            =
 
-# The HTML_STYLESHEET tag can be used to specify a user-defined cascading
-# style sheet that is used by each HTML page. It can be used to
-# fine-tune the look of the HTML output. If the tag is left blank doxygen
-# will generate a default style sheet. Note that doxygen will try to copy
-# the style sheet file to the HTML output directory, so don't put your own
-# stylesheet in the HTML output directory as well, or it will be erased!
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading style
+# sheet that is used by each HTML page. It can be used to fine-tune the look of
+# the HTML output. If left blank doxygen will generate a default style sheet.
+# See also section "Doxygen usage" for information on how to generate the style
+# sheet that doxygen normally uses.
+# Note: It is recommended to use HTML_EXTRA_STYLESHEET instead of this tag, as
+# it is more robust and this tag (HTML_STYLESHEET) will in the future become
+# obsolete.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_STYLESHEET        =
 
-# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output.
-# Doxygen will adjust the colors in the stylesheet and background images
-# according to this color. Hue is specified as an angle on a colorwheel,
-# see http://en.wikipedia.org/wiki/Hue for more information.
-# For instance the value 0 represents red, 60 is yellow, 120 is green,
-# 180 is cyan, 240 is blue, 300 purple, and 360 is red again.
-# The allowed range is 0 to 359.
+# The HTML_EXTRA_STYLESHEET tag can be used to specify an additional user-
+# defined cascading style sheet that is included after the standard style sheets
+# created by doxygen. Using this option one can overrule certain style aspects.
+# This is preferred over using HTML_STYLESHEET since it does not replace the
+# standard style sheet and is therefor more robust against future updates.
+# Doxygen will copy the style sheet file to the output directory. For an example
+# see the documentation.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_EXTRA_STYLESHEET  =
+
+# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the HTML output directory. Note
+# that these files will be copied to the base HTML output directory. Use the
+# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
+# files. In the HTML_STYLESHEET file, use the file name only. Also note that the
+# files will be copied as-is; there are no commands or markers available.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_EXTRA_FILES       =
+
+# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
+# will adjust the colors in the stylesheet and background images according to
+# this color. Hue is specified as an angle on a colorwheel, see
+# http://en.wikipedia.org/wiki/Hue for more information. For instance the value
+# 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
+# purple, and 360 is red again.
+# Minimum value: 0, maximum value: 359, default value: 220.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_COLORSTYLE_HUE    = 220
 
-# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of
-# the colors in the HTML output. For a value of 0 the output will use
-# grayscales only. A value of 255 will produce the most vivid colors.
+# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
+# in the HTML output. For a value of 0 the output will use grayscales only. A
+# value of 255 will produce the most vivid colors.
+# Minimum value: 0, maximum value: 255, default value: 100.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_COLORSTYLE_SAT    = 100
 
-# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to
-# the luminance component of the colors in the HTML output. Values below
-# 100 gradually make the output lighter, whereas values above 100 make
-# the output darker. The value divided by 100 is the actual gamma applied,
-# so 80 represents a gamma of 0.8, The value 220 represents a gamma of 2.2,
-# and 100 does not change the gamma.
+# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the
+# luminance component of the colors in the HTML output. Values below 100
+# gradually make the output lighter, whereas values above 100 make the output
+# darker. The value divided by 100 is the actual gamma applied, so 80 represents
+# a gamma of 0.8, The value 220 represents a gamma of 2.2, and 100 does not
+# change the gamma.
+# Minimum value: 40, maximum value: 240, default value: 80.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_COLORSTYLE_GAMMA  = 80
 
 # If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
-# page will contain the date and time when the page was generated. Setting
-# this to NO can help when comparing the output of multiple runs.
+# page will contain the date and time when the page was generated. Setting this
+# to NO can help when comparing the output of multiple runs.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_TIMESTAMP         = YES
 
-# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,
-# files or namespaces will be aligned in HTML using tables. If set to
-# NO a bullet list will be used.
-
-HTML_ALIGN_MEMBERS     = YES
-
 # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
 # documentation will contain sections that can be hidden and shown after the
-# page has loaded. For this to work a browser that supports
-# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox
-# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari).
+# page has loaded.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_DYNAMIC_SECTIONS  = NO
 
-# If the GENERATE_DOCSET tag is set to YES, additional index files
-# will be generated that can be used as input for Apple's Xcode 3
-# integrated development environment, introduced with OSX 10.5 (Leopard).
-# To create a documentation set, doxygen will generate a Makefile in the
-# HTML output directory. Running make will produce the docset in that
-# directory and running "make install" will install the docset in
-# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find
-# it at startup.
-# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
+# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries
+# shown in the various tree structured indices initially; the user can expand
+# and collapse entries dynamically later on. Doxygen will expand the tree to
+# such a level that at most the specified number of entries are visible (unless
+# a fully collapsed tree already exceeds this amount). So setting the number of
+# entries 1 will produce a full collapsed tree by default. 0 is a special value
+# representing an infinite number of entries and will result in a full expanded
+# tree by default.
+# Minimum value: 0, maximum value: 9999, default value: 100.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_INDEX_NUM_ENTRIES = 100
+
+# If the GENERATE_DOCSET tag is set to YES, additional index files will be
+# generated that can be used as input for Apple's Xcode 3 integrated development
+# environment (see: http://developer.apple.com/tools/xcode/), introduced with
+# OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a
+# Makefile in the HTML output directory. Running make will produce the docset in
+# that directory and running make install will install the docset in
+# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at
+# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
 # for more information.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 GENERATE_DOCSET        = NO
 
-# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the
-# feed. A documentation feed provides an umbrella under which multiple
-# documentation sets from a single provider (such as a company or product suite)
-# can be grouped.
+# This tag determines the name of the docset feed. A documentation feed provides
+# an umbrella under which multiple documentation sets from a single provider
+# (such as a company or product suite) can be grouped.
+# The default value is: Doxygen generated docs.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
 
 DOCSET_FEEDNAME        = "Doxygen generated docs"
 
-# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that
-# should uniquely identify the documentation set bundle. This should be a
-# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen
-# will append .docset to the name.
+# This tag specifies a string that should uniquely identify the documentation
+# set bundle. This should be a reverse domain-name style string, e.g.
+# com.mycompany.MyDocSet. Doxygen will append .docset to the name.
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
 
 DOCSET_BUNDLE_ID       = org.doxygen.Project
 
-# When GENERATE_PUBLISHER_ID tag specifies a string that should uniquely identify
+# The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify
 # the documentation publisher. This should be a reverse domain-name style
 # string, e.g. com.mycompany.MyDocSet.documentation.
+# The default value is: org.doxygen.Publisher.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
 
 DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
 
-# The GENERATE_PUBLISHER_NAME tag identifies the documentation publisher.
+# The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher.
+# The default value is: Publisher.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
 
 DOCSET_PUBLISHER_NAME  = Publisher
 
-# If the GENERATE_HTMLHELP tag is set to YES, additional index files
-# will be generated that can be used as input for tools like the
-# Microsoft HTML help workshop to generate a compiled HTML help file (.chm)
-# of the generated HTML documentation.
+# If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
+# additional HTML index files: index.hhp, index.hhc, and index.hhk. The
+# index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
+# (see: http://www.microsoft.com/en-us/download/details.aspx?id=21138) on
+# Windows.
+#
+# The HTML Help Workshop contains a compiler that can convert all HTML output
+# generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
+# files are now used as the Windows 98 help format, and will replace the old
+# Windows help format (.hlp) on all Windows platforms in the future. Compressed
+# HTML files also contain an index, a table of contents, and you can search for
+# words in the documentation. The HTML workshop also contains a viewer for
+# compressed HTML files.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 GENERATE_HTMLHELP      = NO
 
-# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can
-# be used to specify the file name of the resulting .chm file. You
-# can add a path in front of the file if the result should not be
+# The CHM_FILE tag can be used to specify the file name of the resulting .chm
+# file. You can add a path in front of the file if the result should not be
 # written to the html output directory.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
 CHM_FILE               =
 
-# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can
-# be used to specify the location (absolute path including file name) of
-# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run
-# the HTML help compiler on the generated index.hhp.
+# The HHC_LOCATION tag can be used to specify the location (absolute path
+# including file name) of the HTML help compiler ( hhc.exe). If non-empty
+# doxygen will try to run the HTML help compiler on the generated index.hhp.
+# The file has to be specified with full path.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
 HHC_LOCATION           =
 
-# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag
-# controls if a separate .chi index file is generated (YES) or that
-# it should be included in the master .chm file (NO).
+# The GENERATE_CHI flag controls if a separate .chi index file is generated (
+# YES) or that it should be included in the master .chm file ( NO).
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
 GENERATE_CHI           = NO
 
-# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING
-# is used to encode HtmlHelp index (hhk), content (hhc) and project file
-# content.
+# The CHM_INDEX_ENCODING is used to encode HtmlHelp index ( hhk), content ( hhc)
+# and project file content.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
 CHM_INDEX_ENCODING     =
 
-# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag
-# controls whether a binary table of contents is generated (YES) or a
-# normal table of contents (NO) in the .chm file.
+# The BINARY_TOC flag controls whether a binary table of contents is generated (
+# YES) or a normal table of contents ( NO) in the .chm file.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
 BINARY_TOC             = NO
 
-# The TOC_EXPAND flag can be set to YES to add extra items for group members
-# to the contents of the HTML help documentation and to the tree view.
+# The TOC_EXPAND flag can be set to YES to add extra items for group members to
+# the table of contents of the HTML help documentation and to the tree view.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
 TOC_EXPAND             = NO
 
 # If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
-# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated
-# that can be used as input for Qt's qhelpgenerator to generate a
-# Qt Compressed Help (.qch) of the generated HTML documentation.
+# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that
+# can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help
+# (.qch) of the generated HTML documentation.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 GENERATE_QHP           = NO
 
-# If the QHG_LOCATION tag is specified, the QCH_FILE tag can
-# be used to specify the file name of the resulting .qch file.
-# The path specified is relative to the HTML output folder.
+# If the QHG_LOCATION tag is specified, the QCH_FILE tag can be used to specify
+# the file name of the resulting .qch file. The path specified is relative to
+# the HTML output folder.
+# This tag requires that the tag GENERATE_QHP is set to YES.
 
 QCH_FILE               =
 
-# The QHP_NAMESPACE tag specifies the namespace to use when generating
-# Qt Help Project output. For more information please see
-# http://doc.trolltech.com/qthelpproject.html#namespace
+# The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help
+# Project output. For more information please see Qt Help Project / Namespace
+# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace).
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_QHP is set to YES.
 
 QHP_NAMESPACE          = org.doxygen.Project
 
-# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating
-# Qt Help Project output. For more information please see
-# http://doc.trolltech.com/qthelpproject.html#virtual-folders
+# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt
+# Help Project output. For more information please see Qt Help Project / Virtual
+# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual-
+# folders).
+# The default value is: doc.
+# This tag requires that the tag GENERATE_QHP is set to YES.
 
 QHP_VIRTUAL_FOLDER     = doc
 
-# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to
-# add. For more information please see
-# http://doc.trolltech.com/qthelpproject.html#custom-filters
+# If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom
+# filter to add. For more information please see Qt Help Project / Custom
+# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
+# filters).
+# This tag requires that the tag GENERATE_QHP is set to YES.
 
 QHP_CUST_FILTER_NAME   =
 
-# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the
-# custom filter to add. For more information please see
-# <a href="http://doc.trolltech.com/qthelpproject.html#custom-filters">
-# Qt Help Project / Custom Filters</a>.
+# The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the
+# custom filter to add. For more information please see Qt Help Project / Custom
+# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
+# filters).
+# This tag requires that the tag GENERATE_QHP is set to YES.
 
 QHP_CUST_FILTER_ATTRS  =
 
 # The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
-# project's
-# filter section matches.
-# <a href="http://doc.trolltech.com/qthelpproject.html#filter-attributes">
-# Qt Help Project / Filter Attributes</a>.
+# project's filter section matches. Qt Help Project / Filter Attributes (see:
+# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes).
+# This tag requires that the tag GENERATE_QHP is set to YES.
 
 QHP_SECT_FILTER_ATTRS  =
 
-# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can
-# be used to specify the location of Qt's qhelpgenerator.
-# If non-empty doxygen will try to run qhelpgenerator on the generated
-# .qhp file.
+# The QHG_LOCATION tag can be used to specify the location of Qt's
+# qhelpgenerator. If non-empty doxygen will try to run qhelpgenerator on the
+# generated .qhp file.
+# This tag requires that the tag GENERATE_QHP is set to YES.
 
 QHG_LOCATION           =
 
-# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files
-#  will be generated, which together with the HTML files, form an Eclipse help
-# plugin. To install this plugin and make it available under the help contents
-# menu in Eclipse, the contents of the directory containing the HTML and XML
-# files needs to be copied into the plugins directory of eclipse. The name of
-# the directory within the plugins directory should be the same as
-# the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before
-# the help appears.
+# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be
+# generated, together with the HTML files, they form an Eclipse help plugin. To
+# install this plugin and make it available under the help contents menu in
+# Eclipse, the contents of the directory containing the HTML and XML files needs
+# to be copied into the plugins directory of eclipse. The name of the directory
+# within the plugins directory should be the same as the ECLIPSE_DOC_ID value.
+# After copying Eclipse needs to be restarted before the help appears.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 GENERATE_ECLIPSEHELP   = NO
 
-# A unique identifier for the eclipse help plugin. When installing the plugin
-# the directory name containing the HTML and XML files should also have
-# this name.
+# A unique identifier for the Eclipse help plugin. When installing the plugin
+# the directory name containing the HTML and XML files should also have this
+# name. Each documentation set should have its own identifier.
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_ECLIPSEHELP is set to YES.
 
 ECLIPSE_DOC_ID         = org.doxygen.Project
 
-# The DISABLE_INDEX tag can be used to turn on/off the condensed index at
-# top of each HTML page. The value NO (the default) enables the index and
-# the value YES disables it.
+# If you want full control over the layout of the generated HTML pages it might
+# be necessary to disable the index and replace it with your own. The
+# DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) at top
+# of each HTML page. A value of NO enables the index and the value YES disables
+# it. Since the tabs in the index contain the same information as the navigation
+# tree, you can set this option to YES if you also set GENERATE_TREEVIEW to YES.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 DISABLE_INDEX          = NO
 
-# This tag can be used to set the number of enum values (range [1..20])
-# that doxygen will group on one line in the generated HTML documentation.
-
-ENUM_VALUES_PER_LINE   = 4
-
 # The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
-# structure should be generated to display hierarchical information.
-# If the tag value is set to YES, a side panel will be generated
-# containing a tree-like index structure (just like the one that
-# is generated for HTML Help). For this to work a browser that supports
-# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser).
-# Windows users are probably better off using the HTML help feature.
+# structure should be generated to display hierarchical information. If the tag
+# value is set to YES, a side panel will be generated containing a tree-like
+# index structure (just like the one that is generated for HTML Help). For this
+# to work a browser that supports JavaScript, DHTML, CSS and frames is required
+# (i.e. any modern browser). Windows users are probably better off using the
+# HTML help feature. Via custom stylesheets (see HTML_EXTRA_STYLESHEET) one can
+# further fine-tune the look of the index. As an example, the default style
+# sheet generated by doxygen has an example that shows how to put an image at
+# the root of the tree instead of the PROJECT_NAME. Since the tree basically has
+# the same information as the tab index, you could consider setting
+# DISABLE_INDEX to YES when enabling this option.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 GENERATE_TREEVIEW      = NO
 
-# By enabling USE_INLINE_TREES, doxygen will generate the Groups, Directories,
-# and Class Hierarchy pages using a tree view instead of an ordered list.
+# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
+# doxygen will group on one line in the generated HTML documentation.
+#
+# Note that a value of 0 will completely suppress the enum values from appearing
+# in the overview section.
+# Minimum value: 0, maximum value: 20, default value: 4.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
-USE_INLINE_TREES       = NO
+ENUM_VALUES_PER_LINE   = 4
 
-# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
-# used to set the initial width (in pixels) of the frame in which the tree
-# is shown.
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be used
+# to set the initial width (in pixels) of the frame in which the tree is shown.
+# Minimum value: 0, maximum value: 1500, default value: 250.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 TREEVIEW_WIDTH         = 250
 
-# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open
-# links to external symbols imported via tag files in a separate window.
+# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open links to
+# external symbols imported via tag files in a separate window.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 EXT_LINKS_IN_WINDOW    = NO
 
-# Use this tag to change the font size of Latex formulas included
-# as images in the HTML documentation. The default is 10. Note that
-# when you change the font size after a successful doxygen run you need
-# to manually remove any form_*.png images from the HTML output directory
-# to force them to be regenerated.
+# Use this tag to change the font size of LaTeX formulas included as images in
+# the HTML documentation. When you change the font size after a successful
+# doxygen run you need to manually remove any form_*.png images from the HTML
+# output directory to force them to be regenerated.
+# Minimum value: 8, maximum value: 50, default value: 10.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 FORMULA_FONTSIZE       = 10
 
 # Use the FORMULA_TRANPARENT tag to determine whether or not the images
-# generated for formulas are transparent PNGs. Transparent PNGs are
-# not supported properly for IE 6.0, but are supported on all modern browsers.
-# Note that when changing this option you need to delete any form_*.png files
-# in the HTML output before the changes have effect.
+# generated for formulas are transparent PNGs. Transparent PNGs are not
+# supported properly for IE 6.0, but are supported on all modern browsers.
+#
+# Note that when changing this option you need to delete any form_*.png files in
+# the HTML output directory before the changes have effect.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 FORMULA_TRANSPARENT    = YES
 
-# When the SEARCHENGINE tag is enabled doxygen will generate a search box
-# for the HTML output. The underlying search engine uses javascript
-# and DHTML and should work on any modern browser. Note that when using
-# HTML help (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets
-# (GENERATE_DOCSET) there is already a search function so this one should
-# typically be disabled. For large projects the javascript based search engine
-# can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution.
+# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
+# http://www.mathjax.org) which uses client side Javascript for the rendering
+# instead of using prerendered bitmaps. Use this if you do not have LaTeX
+# installed or if you want to formulas look prettier in the HTML output. When
+# enabled you may also need to install MathJax separately and configure the path
+# to it using the MATHJAX_RELPATH option.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+USE_MATHJAX            = NO
+
+# When MathJax is enabled you can set the default output format to be used for
+# the MathJax output. See the MathJax site (see:
+# http://docs.mathjax.org/en/latest/output.html) for more details.
+# Possible values are: HTML-CSS (which is slower, but has the best
+# compatibility), NativeMML (i.e. MathML) and SVG.
+# The default value is: HTML-CSS.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_FORMAT         = HTML-CSS
+
+# When MathJax is enabled you need to specify the location relative to the HTML
+# output directory using the MATHJAX_RELPATH option. The destination directory
+# should contain the MathJax.js script. For instance, if the mathjax directory
+# is located at the same level as the HTML output directory, then
+# MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
+# Content Delivery Network so you can quickly see the result without installing
+# MathJax. However, it is strongly recommended to install a local copy of
+# MathJax from http://www.mathjax.org before deployment.
+# The default value is: http://cdn.mathjax.org/mathjax/latest.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
+
+# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
+# extension names that should be enabled during MathJax rendering. For example
+# MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_EXTENSIONS     =
+
+# The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces
+# of code that will be used on startup of the MathJax code. See the MathJax site
+# (see: http://docs.mathjax.org/en/latest/output.html) for more details. For an
+# example see the documentation.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_CODEFILE       =
+
+# When the SEARCHENGINE tag is enabled doxygen will generate a search box for
+# the HTML output. The underlying search engine uses javascript and DHTML and
+# should work on any modern browser. Note that when using HTML help
+# (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET)
+# there is already a search function so this one should typically be disabled.
+# For large projects the javascript based search engine can be slow, then
+# enabling SERVER_BASED_SEARCH may provide a better solution. It is possible to
+# search using the keyboard; to jump to the search box use <access key> + S
+# (what the <access key> is depends on the OS and browser, but it is typically
+# <CTRL>, <ALT>/<option>, or both). Inside the search box use the <cursor down
+# key> to jump into the search results window, the results can be navigated
+# using the <cursor keys>. Press <Enter> to select an item or <escape> to cancel
+# the search. The filter options can be selected when the cursor is inside the
+# search box by pressing <Shift>+<cursor down>. Also here use the <cursor keys>
+# to select a filter and <Enter> or <escape> to activate or cancel the filter
+# option.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 SEARCHENGINE           = YES
 
 # When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a PHP enabled web server instead of at the web client
-# using Javascript. Doxygen will generate the search PHP script and index
-# file to put on the web server. The advantage of the server
-# based approach is that it scales better to large projects and allows
-# full text search. The disadvances is that it is more difficult to setup
-# and does not have live searching capabilities.
+# implemented using a web server instead of a web client using Javascript. There
+# are two flavours of web server based searching depending on the
+# EXTERNAL_SEARCH setting. When disabled, doxygen will generate a PHP script for
+# searching and an index file used by the script. When EXTERNAL_SEARCH is
+# enabled the indexing and searching needs to be provided by external tools. See
+# the section "External Indexing and Searching" for details.
+# The default value is: NO.
+# This tag requires that the tag SEARCHENGINE is set to YES.
 
 SERVER_BASED_SEARCH    = NO
 
+# When EXTERNAL_SEARCH tag is enabled doxygen will no longer generate the PHP
+# script for searching. Instead the search results are written to an XML file
+# which needs to be processed by an external indexer. Doxygen will invoke an
+# external search engine pointed to by the SEARCHENGINE_URL option to obtain the
+# search results.
+#
+# Doxygen ships with an example indexer ( doxyindexer) and search engine
+# (doxysearch.cgi) which are based on the open source search engine library
+# Xapian (see: http://xapian.org/).
+#
+# See the section "External Indexing and Searching" for details.
+# The default value is: NO.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTERNAL_SEARCH        = NO
+
+# The SEARCHENGINE_URL should point to a search engine hosted by a web server
+# which will return the search results when EXTERNAL_SEARCH is enabled.
+#
+# Doxygen ships with an example indexer ( doxyindexer) and search engine
+# (doxysearch.cgi) which are based on the open source search engine library
+# Xapian (see: http://xapian.org/). See the section "External Indexing and
+# Searching" for details.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SEARCHENGINE_URL       =
+
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed
+# search data is written to a file for indexing by an external tool. With the
+# SEARCHDATA_FILE tag the name of this file can be specified.
+# The default file is: searchdata.xml.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SEARCHDATA_FILE        = searchdata.xml
+
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the
+# EXTERNAL_SEARCH_ID tag can be used as an identifier for the project. This is
+# useful in combination with EXTRA_SEARCH_MAPPINGS to search through multiple
+# projects and redirect the results back to the right project.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTERNAL_SEARCH_ID     =
+
+# The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen
+# projects other than the one defined by this configuration file, but that are
+# all added to the same external search index. Each project needs to have a
+# unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id of
+# to a relative location where the documentation can be found. The format is:
+# EXTRA_SEARCH_MAPPINGS = tagname1=loc1 tagname2=loc2 ...
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTRA_SEARCH_MAPPINGS  =
+
 #---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
+# Configuration options related to the LaTeX output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
-# generate Latex output.
+# If the GENERATE_LATEX tag is set to YES doxygen will generate LaTeX output.
+# The default value is: YES.
 
 GENERATE_LATEX         = NO
 
-# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `latex' will be used as the default path.
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: latex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_OUTPUT           = latex
 
 # The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
-# invoked. If left blank `latex' will be used as the default command name.
-# Note that when enabling USE_PDFLATEX this option is only used for
-# generating bitmaps for formulas in the HTML output, but not in the
-# Makefile that is written to the output directory.
+# invoked.
+#
+# Note that when enabling USE_PDFLATEX this option is only used for generating
+# bitmaps for formulas in the HTML output, but not in the Makefile that is
+# written to the output directory.
+# The default file is: latex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_CMD_NAME         = latex
 
-# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to
-# generate index for LaTeX. If left blank `makeindex' will be used as the
-# default command name.
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to generate
+# index for LaTeX.
+# The default file is: makeindex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 MAKEINDEX_CMD_NAME     = makeindex
 
-# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact
-# LaTeX documents. This may be useful for small projects and may help to
-# save some trees in general.
+# If the COMPACT_LATEX tag is set to YES doxygen generates more compact LaTeX
+# documents. This may be useful for small projects and may help to save some
+# trees in general.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 COMPACT_LATEX          = NO
 
-# The PAPER_TYPE tag can be used to set the paper type that is used
-# by the printer. Possible values are: a4, a4wide, letter, legal and
-# executive. If left blank a4wide will be used.
+# The PAPER_TYPE tag can be used to set the paper type that is used by the
+# printer.
+# Possible values are: a4 (210 x 297 mm), letter (8.5 x 11 inches), legal (8.5 x
+# 14 inches) and executive (7.25 x 10.5 inches).
+# The default value is: a4.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 PAPER_TYPE             = a4wide
 
-# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX
-# packages that should be included in the LaTeX output.
+# The EXTRA_PACKAGES tag can be used to specify one or more LaTeX package names
+# that should be included in the LaTeX output. To get the times font for
+# instance you can specify
+# EXTRA_PACKAGES=times
+# If left blank no extra packages will be included.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 EXTRA_PACKAGES         =
 
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for
-# the generated latex document. The header should contain everything until
-# the first chapter. If it is left blank doxygen will generate a
-# standard header. Notice: only use this tag if you know what you are doing!
+# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
+# generated LaTeX document. The header should contain everything until the first
+# chapter. If it is left blank doxygen will generate a standard header. See
+# section "Doxygen usage" for information on how to let doxygen write the
+# default header to a separate file.
+#
+# Note: Only use a user-defined header if you know what you are doing! The
+# following commands have a special meaning inside the header: $title,
+# $datetime, $date, $doxygenversion, $projectname, $projectnumber. Doxygen will
+# replace them by respectively the title of the page, the current date and time,
+# only the current date, the version number of doxygen, the project name (see
+# PROJECT_NAME), or the project number (see PROJECT_NUMBER).
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_HEADER           =
 
-# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated
-# is prepared for conversion to pdf (using ps2pdf). The pdf file will
-# contain links (just like the HTML output) instead of page references
-# This makes the output suitable for online browsing using a pdf viewer.
+# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
+# generated LaTeX document. The footer should contain everything after the last
+# chapter. If it is left blank doxygen will generate a standard footer.
+#
+# Note: Only use a user-defined footer if you know what you are doing!
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_FOOTER           =
+
+# The LATEX_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the LATEX_OUTPUT output
+# directory. Note that the files will be copied as-is; there are no commands or
+# markers available.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_EXTRA_FILES      =
+
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated is
+# prepared for conversion to PDF (using ps2pdf or pdflatex). The PDF file will
+# contain links (just like the HTML output) instead of page references. This
+# makes the output suitable for online browsing using a PDF viewer.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 PDF_HYPERLINKS         = YES
 
-# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of
-# plain latex in the generated Makefile. Set this option to YES to get a
+# If the LATEX_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
+# the PDF file directly from the LaTeX files. Set this option to YES to get a
 # higher quality PDF documentation.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 USE_PDFLATEX           = YES
 
-# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode.
-# command to the generated LaTeX files. This will instruct LaTeX to keep
-# running if errors occur, instead of asking the user for help.
-# This option is also used when generating formulas in HTML.
+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
+# command to the generated LaTeX files. This will instruct LaTeX to keep running
+# if errors occur, instead of asking the user for help. This option is also used
+# when generating formulas in HTML.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_BATCHMODE        = NO
 
-# If LATEX_HIDE_INDICES is set to YES then doxygen will not
-# include the index chapters (such as File Index, Compound Index, etc.)
-# in the output.
+# If the LATEX_HIDE_INDICES tag is set to YES then doxygen will not include the
+# index chapters (such as File Index, Compound Index, etc.) in the output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_HIDE_INDICES     = NO
 
-# If LATEX_SOURCE_CODE is set to YES then doxygen will include
-# source code with syntax highlighting in the LaTeX output.
-# Note that which sources are shown also depends on other settings
-# such as SOURCE_BROWSER.
+# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
+# code with syntax highlighting in the LaTeX output.
+#
+# Note that which sources are shown also depends on other settings such as
+# SOURCE_BROWSER.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_SOURCE_CODE      = NO
 
+# The LATEX_BIB_STYLE tag can be used to specify the style to use for the
+# bibliography, e.g. plainnat, or ieeetr. See
+# http://en.wikipedia.org/wiki/BibTeX and \cite for more info.
+# The default value is: plain.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_BIB_STYLE        = plain
+
 #---------------------------------------------------------------------------
-# configuration options related to the RTF output
+# Configuration options related to the RTF output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output
-# The RTF output is optimized for Word 97 and may not look very pretty with
-# other RTF readers or editors.
+# If the GENERATE_RTF tag is set to YES doxygen will generate RTF output. The
+# RTF output is optimized for Word 97 and may not look too pretty with other RTF
+# readers/editors.
+# The default value is: NO.
 
 GENERATE_RTF           = NO
 
-# The RTF_OUTPUT tag is used to specify where the RTF docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `rtf' will be used as the default path.
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: rtf.
+# This tag requires that the tag GENERATE_RTF is set to YES.
 
 RTF_OUTPUT             = rtf
 
-# If the COMPACT_RTF tag is set to YES Doxygen generates more compact
-# RTF documents. This may be useful for small projects and may help to
-# save some trees in general.
+# If the COMPACT_RTF tag is set to YES doxygen generates more compact RTF
+# documents. This may be useful for small projects and may help to save some
+# trees in general.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
 
 COMPACT_RTF            = NO
 
-# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated
-# will contain hyperlink fields. The RTF file will
-# contain links (just like the HTML output) instead of page references.
-# This makes the output suitable for online browsing using WORD or other
-# programs which support those fields.
-# Note: wordpad (write) and others do not support links.
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated will
+# contain hyperlink fields. The RTF file will contain links (just like the HTML
+# output) instead of page references. This makes the output suitable for online
+# browsing using Word or some other Word compatible readers that support those
+# fields.
+#
+# Note: WordPad (write) and others do not support links.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
 
 RTF_HYPERLINKS         = NO
 
-# Load stylesheet definitions from file. Syntax is similar to doxygen's
-# config file, i.e. a series of assignments. You only have to provide
-# replacements, missing definitions are set to their default value.
+# Load stylesheet definitions from file. Syntax is similar to doxygen's config
+# file, i.e. a series of assignments. You only have to provide replacements,
+# missing definitions are set to their default value.
+#
+# See also section "Doxygen usage" for information on how to generate the
+# default style sheet that doxygen normally uses.
+# This tag requires that the tag GENERATE_RTF is set to YES.
 
 RTF_STYLESHEET_FILE    =
 
-# Set optional variables used in the generation of an rtf document.
-# Syntax is similar to doxygen's config file.
+# Set optional variables used in the generation of an RTF document. Syntax is
+# similar to doxygen's config file. A template extensions file can be generated
+# using doxygen -e rtf extensionFile.
+# This tag requires that the tag GENERATE_RTF is set to YES.
 
 RTF_EXTENSIONS_FILE    =
 
 #---------------------------------------------------------------------------
-# configuration options related to the man page output
+# Configuration options related to the man page output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_MAN tag is set to YES (the default) Doxygen will
-# generate man pages
+# If the GENERATE_MAN tag is set to YES doxygen will generate man pages for
+# classes and files.
+# The default value is: NO.
 
 GENERATE_MAN           = NO
 
-# The MAN_OUTPUT tag is used to specify where the man pages will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `man' will be used as the default path.
+# The MAN_OUTPUT tag is used to specify where the man pages will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it. A directory man3 will be created inside the directory specified by
+# MAN_OUTPUT.
+# The default directory is: man.
+# This tag requires that the tag GENERATE_MAN is set to YES.
 
 MAN_OUTPUT             = man
 
-# The MAN_EXTENSION tag determines the extension that is added to
-# the generated man pages (default is the subroutine's section .3)
+# The MAN_EXTENSION tag determines the extension that is added to the generated
+# man pages. In case the manual section does not start with a number, the number
+# 3 is prepended. The dot (.) at the beginning of the MAN_EXTENSION tag is
+# optional.
+# The default value is: .3.
+# This tag requires that the tag GENERATE_MAN is set to YES.
 
 MAN_EXTENSION          = .3
 
-# If the MAN_LINKS tag is set to YES and Doxygen generates man output,
-# then it will generate one additional man file for each entity
-# documented in the real man page(s). These additional files
-# only source the real man page, but without them the man command
-# would be unable to find the correct page. The default is NO.
+# If the MAN_LINKS tag is set to YES and doxygen generates man output, then it
+# will generate one additional man file for each entity documented in the real
+# man page(s). These additional files only source the real man page, but without
+# them the man command would be unable to find the correct page.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_MAN is set to YES.
 
 MAN_LINKS              = NO
 
 #---------------------------------------------------------------------------
-# configuration options related to the XML output
+# Configuration options related to the XML output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_XML tag is set to YES Doxygen will
-# generate an XML file that captures the structure of
-# the code including all documentation.
+# If the GENERATE_XML tag is set to YES doxygen will generate an XML file that
+# captures the structure of the code including all documentation.
+# The default value is: NO.
 
 GENERATE_XML           = NO
 
-# The XML_OUTPUT tag is used to specify where the XML pages will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `xml' will be used as the default path.
+# The XML_OUTPUT tag is used to specify where the XML pages will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: xml.
+# This tag requires that the tag GENERATE_XML is set to YES.
 
 XML_OUTPUT             = xml
 
-# The XML_SCHEMA tag can be used to specify an XML schema,
-# which can be used by a validating XML parser to check the
-# syntax of the XML files.
+# The XML_SCHEMA tag can be used to specify a XML schema, which can be used by a
+# validating XML parser to check the syntax of the XML files.
+# This tag requires that the tag GENERATE_XML is set to YES.
 
 XML_SCHEMA             =
 
-# The XML_DTD tag can be used to specify an XML DTD,
-# which can be used by a validating XML parser to check the
-# syntax of the XML files.
+# The XML_DTD tag can be used to specify a XML DTD, which can be used by a
+# validating XML parser to check the syntax of the XML files.
+# This tag requires that the tag GENERATE_XML is set to YES.
 
 XML_DTD                =
 
-# If the XML_PROGRAMLISTING tag is set to YES Doxygen will
-# dump the program listings (including syntax highlighting
-# and cross-referencing information) to the XML output. Note that
-# enabling this will significantly increase the size of the XML output.
+# If the XML_PROGRAMLISTING tag is set to YES doxygen will dump the program
+# listings (including syntax highlighting and cross-referencing information) to
+# the XML output. Note that enabling this will significantly increase the size
+# of the XML output.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_XML is set to YES.
 
 XML_PROGRAMLISTING     = YES
 
 #---------------------------------------------------------------------------
-# configuration options for the AutoGen Definitions output
+# Configuration options related to the DOCBOOK output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_DOCBOOK tag is set to YES doxygen will generate Docbook files
+# that can be used to generate PDF.
+# The default value is: NO.
+
+GENERATE_DOCBOOK       = NO
+
+# The DOCBOOK_OUTPUT tag is used to specify where the Docbook pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be put in
+# front of it.
+# The default directory is: docbook.
+# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
+
+DOCBOOK_OUTPUT         = docbook
+
+#---------------------------------------------------------------------------
+# Configuration options for the AutoGen Definitions output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will
-# generate an AutoGen Definitions (see autogen.sf.net) file
-# that captures the structure of the code including all
-# documentation. Note that this feature is still experimental
-# and incomplete at the moment.
+# If the GENERATE_AUTOGEN_DEF tag is set to YES doxygen will generate an AutoGen
+# Definitions (see http://autogen.sf.net) file that captures the structure of
+# the code including all documentation. Note that this feature is still
+# experimental and incomplete at the moment.
+# The default value is: NO.
 
 GENERATE_AUTOGEN_DEF   = NO
 
 #---------------------------------------------------------------------------
-# configuration options related to the Perl module output
+# Configuration options related to the Perl module output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_PERLMOD tag is set to YES Doxygen will
-# generate a Perl module file that captures the structure of
-# the code including all documentation. Note that this
-# feature is still experimental and incomplete at the
-# moment.
+# If the GENERATE_PERLMOD tag is set to YES doxygen will generate a Perl module
+# file that captures the structure of the code including all documentation.
+#
+# Note that this feature is still experimental and incomplete at the moment.
+# The default value is: NO.
 
 GENERATE_PERLMOD       = NO
 
-# If the PERLMOD_LATEX tag is set to YES Doxygen will generate
-# the necessary Makefile rules, Perl scripts and LaTeX code to be able
-# to generate PDF and DVI output from the Perl module output.
+# If the PERLMOD_LATEX tag is set to YES doxygen will generate the necessary
+# Makefile rules, Perl scripts and LaTeX code to be able to generate PDF and DVI
+# output from the Perl module output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
 
 PERLMOD_LATEX          = NO
 
-# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be
-# nicely formatted so it can be parsed by a human reader.
-# This is useful
-# if you want to understand what is going on.
-# On the other hand, if this
-# tag is set to NO the size of the Perl module output will be much smaller
-# and Perl will parse it just the same.
+# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be nicely
+# formatted so it can be parsed by a human reader. This is useful if you want to
+# understand what is going on. On the other hand, if this tag is set to NO the
+# size of the Perl module output will be much smaller and Perl will parse it
+# just the same.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
 
 PERLMOD_PRETTY         = YES
 
-# The names of the make variables in the generated doxyrules.make file
-# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX.
-# This is useful so different doxyrules.make files included by the same
-# Makefile don't overwrite each other's variables.
+# The names of the make variables in the generated doxyrules.make file are
+# prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. This is useful
+# so different doxyrules.make files included by the same Makefile don't
+# overwrite each other's variables.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
 
 PERLMOD_MAKEVAR_PREFIX =
 
@@ -1321,110 +1887,128 @@
 # Configuration options related to the preprocessor
 #---------------------------------------------------------------------------
 
-# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will
-# evaluate all C-preprocessor directives found in the sources and include
-# files.
+# If the ENABLE_PREPROCESSING tag is set to YES doxygen will evaluate all
+# C-preprocessor directives found in the sources and include files.
+# The default value is: YES.
 
 ENABLE_PREPROCESSING   = YES
 
-# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro
-# names in the source code. If set to NO (the default) only conditional
-# compilation will be performed. Macro expansion can be done in a controlled
-# way by setting EXPAND_ONLY_PREDEF to YES.
+# If the MACRO_EXPANSION tag is set to YES doxygen will expand all macro names
+# in the source code. If set to NO only conditional compilation will be
+# performed. Macro expansion can be done in a controlled way by setting
+# EXPAND_ONLY_PREDEF to YES.
+# The default value is: NO.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
 MACRO_EXPANSION        = NO
 
-# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES
-# then the macro expansion is limited to the macros specified with the
-# PREDEFINED and EXPAND_AS_DEFINED tags.
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then
+# the macro expansion is limited to the macros specified with the PREDEFINED and
+# EXPAND_AS_DEFINED tags.
+# The default value is: NO.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
 EXPAND_ONLY_PREDEF     = NO
 
-# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files
-# in the INCLUDE_PATH (see below) will be search if a #include is found.
+# If the SEARCH_INCLUDES tag is set to YES the includes files in the
+# INCLUDE_PATH will be searched if a #include is found.
+# The default value is: YES.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
 SEARCH_INCLUDES        = YES
 
 # The INCLUDE_PATH tag can be used to specify one or more directories that
-# contain include files that are not input files but should be processed by
-# the preprocessor.
+# contain include files that are not input files but should be processed by the
+# preprocessor.
+# This tag requires that the tag SEARCH_INCLUDES is set to YES.
 
 INCLUDE_PATH           =
 
 # You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
 # patterns (like *.h and *.hpp) to filter out the header-files in the
-# directories. If left blank, the patterns specified with FILE_PATTERNS will
-# be used.
+# directories. If left blank, the patterns specified with FILE_PATTERNS will be
+# used.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
 INCLUDE_FILE_PATTERNS  =
 
-# The PREDEFINED tag can be used to specify one or more macro names that
-# are defined before the preprocessor is started (similar to the -D option of
-# gcc). The argument of the tag is a list of macros of the form: name
-# or name=definition (no spaces). If the definition and the = are
-# omitted =1 is assumed. To prevent a macro definition from being
-# undefined via #undef or recursively expanded use the := operator
-# instead of the = operator.
+# The PREDEFINED tag can be used to specify one or more macro names that are
+# defined before the preprocessor is started (similar to the -D option of e.g.
+# gcc). The argument of the tag is a list of macros of the form: name or
+# name=definition (no spaces). If the definition and the "=" are omitted, "=1"
+# is assumed. To prevent a macro definition from being undefined via #undef or
+# recursively expanded use the := operator instead of the = operator.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
 PREDEFINED             =
 
-# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
-# this tag can be used to specify a list of macro names that should be expanded.
-# The macro definition that is found in the sources will be used.
-# Use the PREDEFINED tag if you want to use a different macro definition.
+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
+# tag can be used to specify a list of macro names that should be expanded. The
+# macro definition that is found in the sources will be used. Use the PREDEFINED
+# tag if you want to use a different macro definition that overrules the
+# definition found in the source code.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
 EXPAND_AS_DEFINED      =
 
-# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then
-# doxygen's preprocessor will remove all function-like macros that are alone
-# on a line, have an all uppercase name, and do not end with a semicolon. Such
-# function macros are typically used for boiler-plate code, and will confuse
-# the parser if not removed.
+# If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will
+# remove all refrences to function-like macros that are alone on a line, have an
+# all uppercase name, and do not end with a semicolon. Such function macros are
+# typically used for boiler-plate code, and will confuse the parser if not
+# removed.
+# The default value is: YES.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
 SKIP_FUNCTION_MACROS   = YES
 
 #---------------------------------------------------------------------------
-# Configuration::additions related to external references
+# Configuration options related to external references
 #---------------------------------------------------------------------------
 
-# The TAGFILES option can be used to specify one or more tagfiles.
-# Optionally an initial location of the external documentation
-# can be added for each tagfile. The format of a tag file without
-# this location is as follows:
-#
+# The TAGFILES tag can be used to specify one or more tag files. For each tag
+# file the location of the external documentation should be added. The format of
+# a tag file without this location is as follows:
 # TAGFILES = file1 file2 ...
 # Adding location for the tag files is done as follows:
-#
 # TAGFILES = file1=loc1 "file2 = loc2" ...
-# where "loc1" and "loc2" can be relative or absolute paths or
-# URLs. If a location is present for each tag, the installdox tool
-# does not have to be run to correct the links.
-# Note that each tag file must have a unique name
-# (where the name does NOT include the path)
-# If a tag file is not located in the directory in which doxygen
-# is run, you must also specify the path to the tagfile here.
+# where loc1 and loc2 can be relative or absolute paths or URLs. See the
+# section "Linking to external documentation" for more information about the use
+# of tag files.
+# Note: Each tag file must have an unique name (where the name does NOT include
+# the path). If a tag file is not located in the directory in which doxygen is
+# run, you must also specify the path to the tagfile here.
 
 TAGFILES               =
 
-# When a file name is specified after GENERATE_TAGFILE, doxygen will create
-# a tag file that is based on the input files it reads.
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create a
+# tag file that is based on the input files it reads. See section "Linking to
+# external documentation" for more information about the usage of tag files.
 
 GENERATE_TAGFILE       =
 
-# If the ALLEXTERNALS tag is set to YES all external classes will be listed
-# in the class index. If set to NO only the inherited external classes
-# will be listed.
+# If the ALLEXTERNALS tag is set to YES all external class will be listed in the
+# class index. If set to NO only the inherited external classes will be listed.
+# The default value is: NO.
 
 ALLEXTERNALS           = NO
 
-# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed
-# in the modules index. If set to NO, only the current project's groups will
-# be listed.
+# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed in
+# the modules index. If set to NO, only the current project's groups will be
+# listed.
+# The default value is: YES.
 
 EXTERNAL_GROUPS        = YES
 
+# If the EXTERNAL_PAGES tag is set to YES all external pages will be listed in
+# the related pages index. If set to NO, only the current project's pages will
+# be listed.
+# The default value is: YES.
+
+EXTERNAL_PAGES         = YES
+
 # The PERL_PATH should be the absolute path and name of the perl script
-# interpreter (i.e. the result of `which perl').
+# interpreter (i.e. the result of 'which perl').
+# The default file (with absolute path) is: /usr/bin/perl.
 
 PERL_PATH              = /usr/bin/perl
 
@@ -1432,200 +2016,293 @@
 # Configuration options related to the dot tool
 #---------------------------------------------------------------------------
 
-# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will
-# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base
-# or super classes. Setting the tag to NO turns the diagrams off. Note that
-# this option is superseded by the HAVE_DOT option below. This is only a
-# fallback. It is recommended to install and use dot, since it yields more
+# If the CLASS_DIAGRAMS tag is set to YES doxygen will generate a class diagram
+# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to
+# NO turns the diagrams off. Note that this option also works with HAVE_DOT
+# disabled, but it is recommended to install and use dot, since it yields more
 # powerful graphs.
+# The default value is: YES.
 
 CLASS_DIAGRAMS         = YES
 
 # You can define message sequence charts within doxygen comments using the \msc
-# command. Doxygen will then run the mscgen tool (see
-# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the
+# command. Doxygen will then run the mscgen tool (see:
+# http://www.mcternan.me.uk/mscgen/)) to produce the chart and insert it in the
 # documentation. The MSCGEN_PATH tag allows you to specify the directory where
 # the mscgen tool resides. If left empty the tool is assumed to be found in the
 # default search path.
 
 MSCGEN_PATH            =
 
-# If set to YES, the inheritance and collaboration graphs will hide
-# inheritance and usage relations if the target is undocumented
-# or is not a class.
+# You can include diagrams made with dia in doxygen documentation. Doxygen will
+# then run dia to produce the diagram and insert it in the documentation. The
+# DIA_PATH tag allows you to specify the directory where the dia binary resides.
+# If left empty dia is assumed to be found in the default search path.
+
+DIA_PATH               =
+
+# If set to YES, the inheritance and collaboration graphs will hide inheritance
+# and usage relations if the target is undocumented or is not a class.
+# The default value is: YES.
 
 HIDE_UNDOC_RELATIONS   = YES
 
 # If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
-# available from the path. This tool is part of Graphviz, a graph visualization
-# toolkit from AT&T and Lucent Bell Labs. The other options in this section
-# have no effect if this option is set to NO (the default)
+# available from the path. This tool is part of Graphviz (see:
+# http://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent
+# Bell Labs. The other options in this section have no effect if this option is
+# set to NO
+# The default value is: NO.
 
 HAVE_DOT               = NO
 
-# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is
-# allowed to run in parallel. When set to 0 (the default) doxygen will
-# base this on the number of processors available in the system. You can set it
-# explicitly to a value larger than 0 to get control over the balance
-# between CPU load and processing speed.
+# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed
+# to run in parallel. When set to 0 doxygen will base this on the number of
+# processors available in the system. You can set it explicitly to a value
+# larger than 0 to get control over the balance between CPU load and processing
+# speed.
+# Minimum value: 0, maximum value: 32, default value: 0.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_NUM_THREADS        = 0
 
-# By default doxygen will write a font called FreeSans.ttf to the output
-# directory and reference it in all dot files that doxygen generates. This
-# font does not include all possible unicode characters however, so when you need
-# these (or just want a differently looking font) you can specify the font name
-# using DOT_FONTNAME. You need need to make sure dot is able to find the font,
-# which can be done by putting it in a standard location or by setting the
-# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory
-# containing the font.
+# When you want a differently looking font n the dot files that doxygen
+# generates you can specify the font name using DOT_FONTNAME. You need to make
+# sure dot is able to find the font, which can be done by putting it in a
+# standard location or by setting the DOTFONTPATH environment variable or by
+# setting DOT_FONTPATH to the directory containing the font.
+# The default value is: Helvetica.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_FONTNAME           = FreeSans.ttf
 
-# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs.
-# The default size is 10pt.
+# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of
+# dot graphs.
+# Minimum value: 4, maximum value: 24, default value: 10.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_FONTSIZE           = 10
 
-# By default doxygen will tell dot to use the output directory to look for the
-# FreeSans.ttf font (which doxygen will put there itself). If you specify a
-# different font using DOT_FONTNAME you can set the path where dot
-# can find it using this tag.
+# By default doxygen will tell dot to use the default font as specified with
+# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set
+# the path where dot can find it using this tag.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_FONTPATH           =
 
-# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
-# will generate a graph for each documented class showing the direct and
-# indirect inheritance relations. Setting this tag to YES will force the
-# the CLASS_DIAGRAMS tag to NO.
+# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for
+# each documented class showing the direct and indirect inheritance relations.
+# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 CLASS_GRAPH            = YES
 
-# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen
-# will generate a graph for each documented class showing the direct and
-# indirect implementation dependencies (inheritance, containment, and
-# class references variables) of the class with other documented classes.
+# If the COLLABORATION_GRAPH tag is set to YES then doxygen will generate a
+# graph for each documented class showing the direct and indirect implementation
+# dependencies (inheritance, containment, and class references variables) of the
+# class with other documented classes.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 COLLABORATION_GRAPH    = YES
 
-# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen
-# will generate a graph for groups, showing the direct groups dependencies
+# If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for
+# groups, showing the direct groups dependencies.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 GROUP_GRAPHS           = YES
 
 # If the UML_LOOK tag is set to YES doxygen will generate inheritance and
 # collaboration diagrams in a style similar to the OMG's Unified Modeling
 # Language.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 UML_LOOK               = NO
 
-# If set to YES, the inheritance and collaboration graphs will show the
-# relations between templates and their instances.
+# If the UML_LOOK tag is enabled, the fields and methods are shown inside the
+# class node. If there are many fields or methods and many nodes the graph may
+# become too big to be useful. The UML_LIMIT_NUM_FIELDS threshold limits the
+# number of items for each type to make the size more manageable. Set this to 0
+# for no limit. Note that the threshold may be exceeded by 50% before the limit
+# is enforced. So when you set the threshold to 10, up to 15 fields may appear,
+# but if the number exceeds 15, the total amount of fields shown is limited to
+# 10.
+# Minimum value: 0, maximum value: 100, default value: 10.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+UML_LIMIT_NUM_FIELDS   = 10
+
+# If the TEMPLATE_RELATIONS tag is set to YES then the inheritance and
+# collaboration graphs will show the relations between templates and their
+# instances.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 TEMPLATE_RELATIONS     = NO
 
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT
-# tags are set to YES then doxygen will generate a graph for each documented
-# file showing the direct and indirect include dependencies of the file with
-# other documented files.
+# If the INCLUDE_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are set to
+# YES then doxygen will generate a graph for each documented file showing the
+# direct and indirect include dependencies of the file with other documented
+# files.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 INCLUDE_GRAPH          = YES
 
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and
-# HAVE_DOT tags are set to YES then doxygen will generate a graph for each
-# documented header file showing the documented files that directly or
-# indirectly include this file.
+# If the INCLUDED_BY_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are
+# set to YES then doxygen will generate a graph for each documented file showing
+# the direct and indirect include dependencies of the file with other documented
+# files.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 INCLUDED_BY_GRAPH      = YES
 
-# If the CALL_GRAPH and HAVE_DOT options are set to YES then
-# doxygen will generate a call dependency graph for every global function
-# or class method. Note that enabling this option will significantly increase
-# the time of a run. So in most cases it will be better to enable call graphs
-# for selected functions only using the \callgraph command.
+# If the CALL_GRAPH tag is set to YES then doxygen will generate a call
+# dependency graph for every global function or class method.
+#
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable call graphs for selected
+# functions only using the \callgraph command.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 CALL_GRAPH             = NO
 
-# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then
-# doxygen will generate a caller dependency graph for every global function
-# or class method. Note that enabling this option will significantly increase
-# the time of a run. So in most cases it will be better to enable caller
-# graphs for selected functions only using the \callergraph command.
+# If the CALLER_GRAPH tag is set to YES then doxygen will generate a caller
+# dependency graph for every global function or class method.
+#
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable caller graphs for selected
+# functions only using the \callergraph command.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 CALLER_GRAPH           = NO
 
-# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen
-# will graphical hierarchy of all classes instead of a textual one.
+# If the GRAPHICAL_HIERARCHY tag is set to YES then doxygen will graphical
+# hierarchy of all classes instead of a textual one.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 GRAPHICAL_HIERARCHY    = YES
 
-# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES
-# then doxygen will show the dependencies a directory has on other directories
-# in a graphical way. The dependency relations are determined by the #include
-# relations between the files in the directories.
+# If the DIRECTORY_GRAPH tag is set to YES then doxygen will show the
+# dependencies a directory has on other directories in a graphical way. The
+# dependency relations are determined by the #include relations between the
+# files in the directories.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DIRECTORY_GRAPH        = YES
 
 # The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
-# generated by dot. Possible values are png, jpg, or gif
-# If left blank png will be used.
+# generated by dot.
+# Note: If you choose svg you need to set HTML_FILE_EXTENSION to xhtml in order
+# to make the SVG files visible in IE 9+ (other browsers do not have this
+# requirement).
+# Possible values are: png, jpg, gif and svg.
+# The default value is: png.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_IMAGE_FORMAT       = png
 
-# The tag DOT_PATH can be used to specify the path where the dot tool can be
+# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
+# enable generation of interactive SVG images that allow zooming and panning.
+#
+# Note that this requires a modern browser other than Internet Explorer. Tested
+# and working are Firefox, Chrome, Safari, and Opera.
+# Note: For IE 9+ you need to set HTML_FILE_EXTENSION to xhtml in order to make
+# the SVG files visible. Older versions of IE do not have SVG support.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INTERACTIVE_SVG        = NO
+
+# The DOT_PATH tag can be used to specify the path where the dot tool can be
 # found. If left blank, it is assumed the dot tool can be found in the path.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_PATH               =
 
 # The DOTFILE_DIRS tag can be used to specify one or more directories that
-# contain dot files that are included in the documentation (see the
-# \dotfile command).
+# contain dot files that are included in the documentation (see the \dotfile
+# command).
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOTFILE_DIRS           =
 
-# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of
-# nodes that will be shown in the graph. If the number of nodes in a graph
-# becomes larger than this value, doxygen will truncate the graph, which is
-# visualized by representing a node as a red box. Note that doxygen if the
-# number of direct children of the root node in a graph is already larger than
-# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note
-# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
+# The MSCFILE_DIRS tag can be used to specify one or more directories that
+# contain msc files that are included in the documentation (see the \mscfile
+# command).
+
+MSCFILE_DIRS           =
+
+# The DIAFILE_DIRS tag can be used to specify one or more directories that
+# contain dia files that are included in the documentation (see the \diafile
+# command).
+
+DIAFILE_DIRS           =
+
+# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes
+# that will be shown in the graph. If the number of nodes in a graph becomes
+# larger than this value, doxygen will truncate the graph, which is visualized
+# by representing a node as a red box. Note that doxygen if the number of direct
+# children of the root node in a graph is already larger than
+# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note that
+# the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
+# Minimum value: 0, maximum value: 10000, default value: 50.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_GRAPH_MAX_NODES    = 50
 
-# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the
-# graphs generated by dot. A depth value of 3 means that only nodes reachable
-# from the root by following a path via at most 3 edges will be shown. Nodes
-# that lay further from the root node will be omitted. Note that setting this
-# option to 1 or 2 may greatly reduce the computation time needed for large
-# code bases. Also note that the size of a graph can be further restricted by
+# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the graphs
+# generated by dot. A depth value of 3 means that only nodes reachable from the
+# root by following a path via at most 3 edges will be shown. Nodes that lay
+# further from the root node will be omitted. Note that setting this option to 1
+# or 2 may greatly reduce the computation time needed for large code bases. Also
+# note that the size of a graph can be further restricted by
 # DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
+# Minimum value: 0, maximum value: 1000, default value: 0.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 MAX_DOT_GRAPH_DEPTH    = 0
 
 # Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
-# background. This is disabled by default, because dot on Windows does not
-# seem to support this out of the box. Warning: Depending on the platform used,
-# enabling this option may lead to badly anti-aliased labels on the edges of
-# a graph (i.e. they become hard to read).
+# background. This is disabled by default, because dot on Windows does not seem
+# to support this out of the box.
+#
+# Warning: Depending on the platform used, enabling this option may lead to
+# badly anti-aliased labels on the edges of a graph (i.e. they become hard to
+# read).
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_TRANSPARENT        = NO
 
 # Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output
 # files in one run (i.e. multiple -o and -T options on the command line). This
-# makes dot run faster, but since only newer versions of dot (>1.8.10)
-# support this, this feature is disabled by default.
+# makes dot run faster, but since only newer versions of dot (>1.8.10) support
+# this, this feature is disabled by default.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_MULTI_TARGETS      = YES
 
-# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will
-# generate a legend page explaining the meaning of the various boxes and
-# arrows in the dot generated graphs.
+# If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page
+# explaining the meaning of the various boxes and arrows in the dot generated
+# graphs.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 GENERATE_LEGEND        = YES
 
-# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will
-# remove the intermediate dot files that are used to generate
-# the various graphs.
+# If the DOT_CLEANUP tag is set to YES doxygen will remove the intermediate dot
+# files that are used to generate the various graphs.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_CLEANUP            = YES

LiVES-2.2.8.tar.bz2/Makefile.am -> LiVES-2.4.1.tar.bz2/Makefile.am Changed

@@ -37,13 +37,16 @@
 if HAVE_DOXYGEN
 docs-doxygen:
 	$(DOXYGEN) LiVES.doxygen
+if BUILD_LIBLIVES
+	$(DOXYGEN) liblives.doxygen
+endif
 else
 docs-doxygen:
 	@echo "Doxygen not installed, skipping sourcecode documentation"
 endif
 
 #NOTE - if packaging libweed separately, weed-docs should go in libweed/Makefile.am
-doc_DATA = lives-plugins/marcos-encoders/README.multi_encoder AUTHORS BUGS ChangeLog FEATURES GETTING.STARTED README OMC/lives-OMC.txt RFX/LiVES-Perl.odt  RFX/rfxbuilder.odt RFX/RFX.spec weed-docs/weedspec.txt weed-docs/weedevents.txt docs/clip_format.txt
+doc_DATA = lives-plugins/marcos-encoders/README.multi_encoder AUTHORS BUGS ChangeLog FEATURES GETTING.STARTED README OMC/lives-OMC.txt RFX/LiVES-Perl.odt  RFX/rfxbuilder.odt RFX/RFX.spec weed-docs/weedspec.txt weed-docs/weedevents.txt docs/clip_format.txt docs/c++-bindings.odt
 
 EXTRA_DIST = \
 	configure \
@@ -67,6 +70,11 @@
 	menu-entries/lives.png \
 	menu-entries/lives.xpm \
 	LiVES.doxygen \
+	liblives.doxygen \
+	src/liblives.cpp \
+	src/liblives.hpp \
+	src/lbindings.c \
+	src/lbindings.h \
 	$(doc_DATA)
 
 
@@ -78,13 +86,18 @@
 	$(MKDIR_P) "$(DESTDIR)$(docdir)" \
 	$(MKDIR_P) "$(DESTDIR)$(sharedir)/applications/" \
 	$(MKDIR_P) "$(DESTDIR)$(sharedir)/pixmaps/" \
-	$(MKDIR_P) "$(DESTDIR)$(sharedir)/resources/"
+	$(MKDIR_P) "$(DESTDIR)$(sharedir)$(PACKAGE)/resources/" \
+	$(MKDIR_P) "$(DESTDIR)$(sharedir)$(PACKAGE)/tools/"
 
 install-data-local:
 	make docs-doxygen
 if HAVE_DOXYGEN
 	$(MKDIR_P) "$(DESTDIR)$(docdir)/html/LiVES"
 	cp -rf "$(srcdir)/docs/doxygen/html/"* "$(DESTDIR)$(docdir)/html/LiVES"
+if BUILD_LIBLIVES
+	$(MKDIR_P) "$(DESTDIR)$(docdir)/html/liblives"
+	cp -rf "$(srcdir)/docs/doxygen/liblives/html/"* "$(DESTDIR)$(docdir)/html/liblives"
+endif
 #NOTE - if packaging libweed separately, this should go in libweed/Makefile.am
 	$(MKDIR_P) "$(DESTDIR)$(docdir)/html/libweed"
 
@@ -133,7 +146,6 @@
 	rm -rf "$(docdir)"
 	rm -rf "$(sharedir)/applications/LiVES.desktop"
 	rm -rf "$(sharedir)/pixmaps/lives.xmp"
-	rm -rf "$(sharedir)/resources"
 
 	@echo
 	@echo "		*** WARNING - user specific configuration files have NOT been removed."

LiVES-2.2.8.tar.bz2/Makefile.in -> LiVES-2.4.1.tar.bz2/Makefile.in Changed

@@ -513,7 +513,7 @@
 sharedir = "$(prefix)/share"
 
 #NOTE - if packaging libweed separately, weed-docs should go in libweed/Makefile.am
-doc_DATA = lives-plugins/marcos-encoders/README.multi_encoder AUTHORS BUGS ChangeLog FEATURES GETTING.STARTED README OMC/lives-OMC.txt RFX/LiVES-Perl.odt  RFX/rfxbuilder.odt RFX/RFX.spec weed-docs/weedspec.txt weed-docs/weedevents.txt docs/clip_format.txt
+doc_DATA = lives-plugins/marcos-encoders/README.multi_encoder AUTHORS BUGS ChangeLog FEATURES GETTING.STARTED README OMC/lives-OMC.txt RFX/LiVES-Perl.odt  RFX/rfxbuilder.odt RFX/RFX.spec weed-docs/weedspec.txt weed-docs/weedevents.txt docs/clip_format.txt docs/c++-bindings.odt
 EXTRA_DIST = \
 	configure \
 	build-lives-rfx-plugin* \
@@ -536,6 +536,11 @@
 	menu-entries/lives.png \
 	menu-entries/lives.xpm \
 	LiVES.doxygen \
+	liblives.doxygen \
+	src/liblives.cpp \
+	src/liblives.hpp \
+	src/lbindings.c \
+	src/lbindings.h \
 	$(doc_DATA)
 
 DISTCLEANFILES = intltool-extract intltool-merge intltool-update po/POTFILES_PLUGINS
@@ -1041,6 +1046,7 @@
 
 @HAVE_DOXYGEN_TRUE@docs-doxygen:
 @HAVE_DOXYGEN_TRUE@	$(DOXYGEN) LiVES.doxygen
+@BUILD_LIBLIVES_TRUE@@HAVE_DOXYGEN_TRUE@	$(DOXYGEN) liblives.doxygen
 @HAVE_DOXYGEN_FALSE@docs-doxygen:
 @HAVE_DOXYGEN_FALSE@	@echo "Doxygen not installed, skipping sourcecode documentation"
 
@@ -1052,12 +1058,15 @@
 	$(MKDIR_P) "$(DESTDIR)$(docdir)" \
 	$(MKDIR_P) "$(DESTDIR)$(sharedir)/applications/" \
 	$(MKDIR_P) "$(DESTDIR)$(sharedir)/pixmaps/" \
-	$(MKDIR_P) "$(DESTDIR)$(sharedir)/resources/"
+	$(MKDIR_P) "$(DESTDIR)$(sharedir)$(PACKAGE)/resources/" \
+	$(MKDIR_P) "$(DESTDIR)$(sharedir)$(PACKAGE)/tools/"
 
 install-data-local:
 	make docs-doxygen
 @HAVE_DOXYGEN_TRUE@	$(MKDIR_P) "$(DESTDIR)$(docdir)/html/LiVES"
 @HAVE_DOXYGEN_TRUE@	cp -rf "$(srcdir)/docs/doxygen/html/"* "$(DESTDIR)$(docdir)/html/LiVES"
+@BUILD_LIBLIVES_TRUE@@HAVE_DOXYGEN_TRUE@	$(MKDIR_P) "$(DESTDIR)$(docdir)/html/liblives"
+@BUILD_LIBLIVES_TRUE@@HAVE_DOXYGEN_TRUE@	cp -rf "$(srcdir)/docs/doxygen/liblives/html/"* "$(DESTDIR)$(docdir)/html/liblives"
 #NOTE - if packaging libweed separately, this should go in libweed/Makefile.am
 @HAVE_DOXYGEN_TRUE@	$(MKDIR_P) "$(DESTDIR)$(docdir)/html/libweed"
 
@@ -1083,7 +1092,7 @@
 	"$(top_srcdir)/po/update_with_plugins.sh" install "$(PACKAGE)" "$(prefix)" "$(DESTDIR)"
 
 install-exec-hook:
-	$(LN_S) "$(DESTDIR)$(bindir)/lives-exe" "$(DESTDIR)$(bindir)/lives"
+	$(LN_S) "lives-exe" "$(DESTDIR)$(bindir)/lives"
 
 uninstall-local:
 	rm -rf "$(bindir)/lives"
@@ -1099,7 +1108,6 @@
 	rm -rf "$(docdir)"
 	rm -rf "$(sharedir)/applications/LiVES.desktop"
 	rm -rf "$(sharedir)/pixmaps/lives.xmp"
-	rm -rf "$(sharedir)/resources"
 
 	@echo
 	@echo "		*** WARNING - user specific configuration files have NOT been removed."

LiVES-2.2.8.tar.bz2/README -> LiVES-2.4.1.tar.bz2/README Changed

LiVES-2.2.8.tar.bz2/build-lives-rfx-plugin -> LiVES-2.4.1.tar.bz2/build-lives-rfx-plugin Changed

LiVES-2.2.8.tar.bz2/configure -> LiVES-2.4.1.tar.bz2/configure Changed

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for LiVES 2.2.8.
+# Generated by GNU Autoconf 2.69 for LiVES 2.4.1.
 #
 # Report bugs to <https://sourceforge.net/p/lives/bugs/>.
 #
@@ -590,8 +590,8 @@
 # Identity of this package.
 PACKAGE_NAME='LiVES'
 PACKAGE_TARNAME='lives'
-PACKAGE_VERSION='2.2.8'
-PACKAGE_STRING='LiVES 2.2.8'
+PACKAGE_VERSION='2.4.1'
+PACKAGE_STRING='LiVES 2.4.1'
 PACKAGE_BUGREPORT='https://sourceforge.net/p/lives/bugs/'
 PACKAGE_URL=''
 
@@ -639,6 +639,8 @@
 am__EXEEXT_TRUE
 LTLIBOBJS
 LIBOBJS
+BUILD_LIBLIVES_FALSE
+BUILD_LIBLIVES_TRUE
 BUILD_EXPERIMENTAL_FALSE
 BUILD_EXPERIMENTAL_TRUE
 HAVE_SYSTEM_WEED_PLUGIN_FALSE
@@ -1071,6 +1073,7 @@
 enable_liboil
 enable_frei0r
 enable_ldvgrab
+enable_liblives
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1696,7 +1699,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 2.2.8 to adapt to many kinds of systems.
+\`configure' configures LiVES 2.4.1 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1767,7 +1770,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of LiVES 2.2.8:";;
+     short | recursive ) echo "Configuration of LiVES 2.4.1:";;
    esac
   cat <<\_ACEOF
 
@@ -1820,6 +1823,7 @@
   --disable-liboil     Disable liboil support.
   --disable-frei0r     Disable frei0r support.
   --disable-ldvgrab     Disable LiVES-dvgrab.
+  --enable-liblives     Build additional liblives static library.
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -2024,7 +2028,7 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-LiVES configure 2.2.8
+LiVES configure 2.4.1
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2751,7 +2755,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 2.2.8, which was
+It was created by LiVES $as_me 2.4.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -3732,7 +3736,7 @@
 
 # Define the identity of the package.
  PACKAGE='lives'
- VERSION='2.2.8'
+ VERSION='2.4.1'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -18374,6 +18378,7 @@
 
 
 
+PTHREAD_OK=false
 
 
 
@@ -18695,11 +18700,13 @@
 
 # Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
 if test x"$acx_pthread_ok" = xyes; then
-        PTHREAD_OK=true
+
+$as_echo "#define HAVE_PTHREAD 1" >>confdefs.h
+
         :
 else
         acx_pthread_ok=no
-        PTHREAD_OK=false
+
 fi
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
@@ -18708,6 +18715,9 @@
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
+if test "$THREAD_SUPPORT" = "yes"; then
+    PTHREAD_OK=true
+fi
 
 IS_DARWIN="false"
 IS_IRIX="false"
@@ -28215,12 +28225,12 @@
     pkg_cv_WEED_CFLAGS="$WEED_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libweed >= 0.7.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libweed >= 0.7.0") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libweed >= 0.8.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libweed >= 0.8.0") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_WEED_CFLAGS=`$PKG_CONFIG --cflags "libweed >= 0.7.0" 2>/dev/null`
+  pkg_cv_WEED_CFLAGS=`$PKG_CONFIG --cflags "libweed >= 0.8.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -28232,12 +28242,12 @@
     pkg_cv_WEED_LIBS="$WEED_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libweed >= 0.7.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libweed >= 0.7.0") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libweed >= 0.8.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libweed >= 0.8.0") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_WEED_LIBS=`$PKG_CONFIG --libs "libweed >= 0.7.0" 2>/dev/null`
+  pkg_cv_WEED_LIBS=`$PKG_CONFIG --libs "libweed >= 0.8.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -28258,9 +28268,9 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        WEED_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libweed >= 0.7.0" 2>&1`
+	        WEED_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libweed >= 0.8.0" 2>&1`
         else
-	        WEED_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libweed >= 0.7.0" 2>&1`
+	        WEED_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libweed >= 0.8.0" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$WEED_PKG_ERRORS" >&5
@@ -28304,12 +28314,12 @@
     pkg_cv_WEED_SLICE_CFLAGS="$WEED_SLICE_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libweed_slice >= 0.7.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libweed_slice >= 0.7.0") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libweed_slice >= 0.8.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libweed_slice >= 0.8.0") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_WEED_SLICE_CFLAGS=`$PKG_CONFIG --cflags "libweed_slice >= 0.7.0" 2>/dev/null`
+  pkg_cv_WEED_SLICE_CFLAGS=`$PKG_CONFIG --cflags "libweed_slice >= 0.8.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -28321,12 +28331,12 @@
     pkg_cv_WEED_SLICE_LIBS="$WEED_SLICE_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libweed_slice >= 0.7.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libweed_slice >= 0.7.0") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libweed_slice >= 0.8.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libweed_slice >= 0.8.0") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_WEED_SLICE_LIBS=`$PKG_CONFIG --libs "libweed_slice >= 0.7.0" 2>/dev/null`
+  pkg_cv_WEED_SLICE_LIBS=`$PKG_CONFIG --libs "libweed_slice >= 0.8.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -28347,9 +28357,9 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        WEED_SLICE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libweed_slice >= 0.7.0" 2>&1`
+	        WEED_SLICE_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libweed_slice >= 0.8.0" 2>&1`
         else
-	        WEED_SLICE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libweed_slice >= 0.7.0" 2>&1`
+	        WEED_SLICE_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libweed_slice >= 0.8.0" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$WEED_SLICE_PKG_ERRORS" >&5
@@ -28394,12 +28404,12 @@
     pkg_cv_WEED_UTILS_CFLAGS="$WEED_UTILS_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libweed-utils >= 0.6.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libweed-utils >= 0.6.0") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libweed-utils >= 0.8.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libweed-utils >= 0.8.0") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_WEED_UTILS_CFLAGS=`$PKG_CONFIG --cflags "libweed-utils >= 0.6.0" 2>/dev/null`
+  pkg_cv_WEED_UTILS_CFLAGS=`$PKG_CONFIG --cflags "libweed-utils >= 0.8.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -28411,12 +28421,12 @@
     pkg_cv_WEED_UTILS_LIBS="$WEED_UTILS_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libweed-utils >= 0.6.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libweed-utils >= 0.6.0") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libweed-utils >= 0.8.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libweed-utils >= 0.8.0") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_WEED_UTILS_LIBS=`$PKG_CONFIG --libs "libweed-utils >= 0.6.0" 2>/dev/null`
+  pkg_cv_WEED_UTILS_LIBS=`$PKG_CONFIG --libs "libweed-utils >= 0.8.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -28437,9 +28447,9 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        WEED_UTILS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libweed-utils >= 0.6.0" 2>&1`
+	        WEED_UTILS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libweed-utils >= 0.8.0" 2>&1`
         else
-	        WEED_UTILS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libweed-utils >= 0.6.0" 2>&1`
+	        WEED_UTILS_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libweed-utils >= 0.8.0" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$WEED_UTILS_PKG_ERRORS" >&5
@@ -28483,12 +28493,12 @@
     pkg_cv_WEED_COMPAT_CFLAGS="$WEED_COMPAT_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libweed-compat >= 0.8.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libweed-compat >= 0.8.0") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libweed-compat >= 0.9.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libweed-compat >= 0.9.0") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_WEED_COMPAT_CFLAGS=`$PKG_CONFIG --cflags "libweed-compat >= 0.8.0" 2>/dev/null`
+  pkg_cv_WEED_COMPAT_CFLAGS=`$PKG_CONFIG --cflags "libweed-compat >= 0.9.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -28500,12 +28510,12 @@
     pkg_cv_WEED_COMPAT_LIBS="$WEED_COMPAT_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libweed-compat >= 0.8.0\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libweed-compat >= 0.8.0") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libweed-compat >= 0.9.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libweed-compat >= 0.9.0") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_WEED_COMPAT_LIBS=`$PKG_CONFIG --libs "libweed-compat >= 0.8.0" 2>/dev/null`
+  pkg_cv_WEED_COMPAT_LIBS=`$PKG_CONFIG --libs "libweed-compat >= 0.9.0" 2>/dev/null`
 		      test "x$?" != "x0" && pkg_failed=yes
 else
   pkg_failed=yes
@@ -28526,9 +28536,9 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        WEED_COMPAT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libweed-compat >= 0.8.0" 2>&1`
+	        WEED_COMPAT_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libweed-compat >= 0.9.0" 2>&1`
         else
-	        WEED_COMPAT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libweed-compat >= 0.8.0" 2>&1`
+	        WEED_COMPAT_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libweed-compat >= 0.9.0" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
 	echo "$WEED_COMPAT_PKG_ERRORS" >&5
@@ -28657,6 +28667,30 @@
 fi
 
 
+# Check whether --enable-liblives was given.
+if test "${enable_liblives+set}" = set; then :
+  enableval=$enable_liblives; liblives=yes
+else
+  liblives=no
+fi
+
+
+if test "$liblives" = "yes"; then
+if test "$disable_glslice" = "yes" ; then
+as_fn_error $? "\"cannot disable glib-slice when building liblives\"" "$LINENO" 5
+fi
+fi
+
+
+ if test $liblives != no; then
+  BUILD_LIBLIVES_TRUE=
+  BUILD_LIBLIVES_FALSE='#'
+else
+  BUILD_LIBLIVES_TRUE='#'
+  BUILD_LIBLIVES_FALSE=
+fi
+
+
 
 ac_config_files="$ac_config_files libweed/Makefile libOSC/Makefile libOSC/client/Makefile libOSC/sendOSC/Makefile po/Makefile.in Makefile intl/Makefile m4/Makefile src/Makefile resources/Makefile lives-plugins/Makefile lives-plugins/plugins/effects/RFXscripts/Makefile lives-plugins/plugins/effects/compound/Makefile lives-plugins/plugins/effects/Makefile lives-plugins/plugins/encoders/Makefile 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-plugins/themes/pinks/Makefile lives-plugins/themes/camera/Makefile lives-plugins/themes/editor/Makefile lives-plugins/themes/crayons/Makefile lives-plugins/themes/crayons-bright/Makefile lives-plugins/themes/Makefile lives-plugins/weed-plugins/Makefile lives-plugins/weed-plugins/gdk/Makefile lives-plugins/weed-plugins/cairo/Makefile lives-plugins/marcos-encoders/Makefile"
 
@@ -29101,6 +29135,10 @@
   as_fn_error $? "conditional \"BUILD_EXPERIMENTAL\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${BUILD_LIBLIVES_TRUE}" && test -z "${BUILD_LIBLIVES_FALSE}"; then
+  as_fn_error $? "conditional \"BUILD_LIBLIVES\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 
 : "${CONFIG_STATUS=./config.status}"
 ac_write_fail=0
@@ -29498,7 +29536,7 @@
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by LiVES $as_me 2.2.8, which was
+This file was extended by LiVES $as_me 2.4.1, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -29555,7 +29593,7 @@
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-LiVES config.status 2.2.8
+LiVES config.status 2.4.1
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
@@ -31608,10 +31646,5 @@
 echo "Remember to do \"sudo ldconfig\" or equivalent after installing."
 echo  "*******************************************************************"
 
-if test "$GTK310_WARN" = "true"; then
-echo
-echo "******************************************************************************************"
-echo "WARNING: GTK+ 3.10.x is known to buggy with LiVES. This version of gtk+ should be avoided."
-echo "******************************************************************************************"
-fi
+

LiVES-2.2.8.tar.bz2/configure.ac -> LiVES-2.4.1.tar.bz2/configure.ac 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,2.2.8,https://sourceforge.net/p/lives/bugs/)
+AC_INIT(LiVES,2.4.1,https://sourceforge.net/p/lives/bugs/)
 
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
@@ -40,7 +40,11 @@
 dnl AC_DEFINE([LiVES_VERSION],[],[Description])
 dnl AC_CONFIG_HEADERS(config.h)
 
-ACX_PTHREAD(PTHREAD_OK=true,PTHREAD_OK=false)
+PTHREAD_OK=false
+ACX_PTHREAD
+if test "$THREAD_SUPPORT" = "yes"; then
+    PTHREAD_OK=true
+fi
 
 IS_DARWIN="false"
 IS_IRIX="false"
@@ -855,7 +859,7 @@
 AM_CONDITIONAL(ENABLE_LDVGRAB,$HAVE_LDVGRAB)
 
 
-PKG_CHECK_MODULES(WEED, libweed >= 0.7.0, HAVE_SYSTEM_WEED=true, HAVE_SYSTEM_WEED=false)
+PKG_CHECK_MODULES(WEED, libweed >= 0.8.0, HAVE_SYSTEM_WEED=true, HAVE_SYSTEM_WEED=false)
 
 if test "$HAVE_SYSTEM_WEED" = "false"; then
 echo "...this is not a problem if we have WEED_SLICE"
@@ -867,7 +871,7 @@
 AM_CONDITIONAL(HAVE_SYSTEM_WEED,$HAVE_SYSTEM_WEED)
 
 
-PKG_CHECK_MODULES(WEED_SLICE, libweed_slice >= 0.7.0, HAVE_SYSTEM_WEED_SLICE=true, HAVE_SYSTEM_WEED_SLICE=false)
+PKG_CHECK_MODULES(WEED_SLICE, libweed_slice >= 0.8.0, HAVE_SYSTEM_WEED_SLICE=true, HAVE_SYSTEM_WEED_SLICE=false)
 
 if test "$HAVE_SYSTEM_WEED_SLICE" = "true"; then
 HAVE_SYSTEM_WEED=true
@@ -881,7 +885,7 @@
 AM_CONDITIONAL(HAVE_SYSTEM_WEED_SLICE,$HAVE_SYSTEM_WEED_SLICE)
 
 
-PKG_CHECK_MODULES(WEED_UTILS, libweed-utils >= 0.6.0, HAVE_SYSTEM_WEED_UTILS=true, HAVE_SYSTEM_WEED_UTILS=false)
+PKG_CHECK_MODULES(WEED_UTILS, libweed-utils >= 0.8.0, HAVE_SYSTEM_WEED_UTILS=true, HAVE_SYSTEM_WEED_UTILS=false)
 
 if test "$HAVE_SYSTEM_WEED_UTILS" = "false"; then
 echo "...will try to build from included sources"
@@ -893,7 +897,7 @@
 AM_CONDITIONAL(HAVE_SYSTEM_WEED_UTILS,$HAVE_SYSTEM_WEED_UTILS)
 
 
-PKG_CHECK_MODULES(WEED_COMPAT, libweed-compat >= 0.8.0, HAVE_SYSTEM_WEED_COMPAT=true, HAVE_SYSTEM_WEED_COMPAT=false)
+PKG_CHECK_MODULES(WEED_COMPAT, libweed-compat >= 0.9.0, HAVE_SYSTEM_WEED_COMPAT=true, HAVE_SYSTEM_WEED_COMPAT=false)
 
 AC_SUBST(WEED_COMPAT_CFLAGS)
 AC_SUBST(WEED_COMPAT_LIBS)
@@ -915,6 +919,17 @@
 
 AM_CONDITIONAL(BUILD_EXPERIMENTAL,false)
 
+AC_ARG_ENABLE( liblives, [  --enable-liblives     Build additional liblives static library.] , liblives=yes, liblives=no)
+
+if test "$liblives" = "yes"; then
+if test "$disable_glslice" = "yes" ; then
+AC_MSG_ERROR("cannot disable glib-slice when building liblives")
+fi
+fi
+ 
+
+AM_CONDITIONAL(BUILD_LIBLIVES, test $liblives != no)
+
 
 dnl find -name Makefile.am | sed "s/\.\///g" | sed "s/\.am//g" >> configure.in
 AC_CONFIG_FILES([
@@ -1002,10 +1017,5 @@
 echo "Remember to do \"sudo ldconfig\" or equivalent after installing."
 echo  "*******************************************************************"
 
-if test "$GTK310_WARN" = "true"; then
-echo
-echo "******************************************************************************************"
-echo "WARNING: GTK+ 3.10.x is known to be buggy with LiVES. This version of gtk+ should be avoided."
-echo "******************************************************************************************"
-fi
+

LiVES-2.4.1.tar.bz2/docs/c++-bindings.odt Added

LiVES-2.2.8.tar.bz2/libOSC/Makefile.am -> LiVES-2.4.1.tar.bz2/libOSC/Makefile.am Changed

LiVES-2.2.8.tar.bz2/libOSC/Makefile.in -> LiVES-2.4.1.tar.bz2/libOSC/Makefile.in Changed

@@ -109,7 +109,35 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-LTLIBRARIES = $(noinst_LTLIBRARIES)
+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__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__installdirs = "$(DESTDIR)$(libdir)"
+LTLIBRARIES = $(lib_LTLIBRARIES)
 libOSC_la_LIBADD =
 am__libOSC_la_SOURCES_DIST = OSC-address-space.c OSC-address-space.h \
 	OSC-callbacklist.c OSC-callbacklist.h OSC-drop.c OSC-drop.h \
@@ -504,13 +532,13 @@
 SUBDIRS = . client sendOSC
 OSC_LIB_FILE = libOSC.la 
 ALL_LIB_OPTS = -export-dynamic
-noinst_LTLIBRARIES = $(OSC_LIB_FILE)
+lib_LTLIBRARIES = $(OSC_LIB_FILE)
 @IS_SOLARIS_TRUE@solaris_CFLAGS = -DIS_SOLARIS=1
 @IS_MINGW_TRUE@mingw_CFLAGS = -DIS_MINGW=1 -I/usr/i686-pc-mingw32/sys-root/mingw/include
 @IS_MINGW_TRUE@mingw_LIBFLAGS = -lws2_32
 @IS_MINGW_FALSE@AM_CPPFLAGS = -I "$(top_srcdir)" -I "$(top_srcdir)/libOSC" -I "$(includedir)"
 @IS_MINGW_TRUE@AM_CPPFLAGS = -I "$(top_srcdir)" -I "$(top_srcdir)/libOSC"
-libOSC_la_CFLAGS = $(DEBUG_CFLAGS) $(solaris_CFLAGS) $(mingw_CFLAGS) -Wstrict-aliasing=0
+libOSC_la_CFLAGS = $(DEBUG_CFLAGS) $(solaris_CFLAGS) $(mingw_CFLAGS) -Wstrict-aliasing=0 -fPIC -DPIC
 @ENABLE_OSC_TRUE@libOSC_la_SOURCES = OSC-address-space.c OSC-address-space.h\
 @ENABLE_OSC_TRUE@		 OSC-callbacklist.c OSC-callbacklist.h\
 @ENABLE_OSC_TRUE@		 OSC-drop.c OSC-drop.h\
@@ -528,7 +556,7 @@
 @ENABLE_OSC_TRUE@		 OSC-struct.h \
 @ENABLE_OSC_TRUE@		 OSC-dispatch.h
 
-libOSC_la_LDFLAGS = $(ALL_LIB_OPTS) $(mingw_LIBFLAGS) -DDYNAMIC -O2 -Wall -rdynamic
+libOSC_la_LDFLAGS = $(ALL_LIB_OPTS) $(mingw_LIBFLAGS) -DDYNAMIC -O2 -Wall -rdynamic -fPIC -DPIC
 all: all-recursive
 
 .SUFFIXES:
@@ -564,9 +592,33 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
 
-clean-noinstLTLIBRARIES:
-	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-	@list='$(noinst_LTLIBRARIES)'; \
+install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+	@$(NORMAL_INSTALL)
+	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+	list2=; for p in $$list; do \
+	  if test -f $$p; then \
+	    list2="$$list2 $$p"; \
+	  else :; fi; \
+	done; \
+	test -z "$$list2" || { \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
+	}
+
+uninstall-libLTLIBRARIES:
+	@$(NORMAL_UNINSTALL)
+	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+	for p in $$list; do \
+	  $(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
+	done
+
+clean-libLTLIBRARIES:
+	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+	@list='$(lib_LTLIBRARIES)'; \
 	locs=`for p in $$list; do echo $$p; done | \
 	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
 	      sort -u`; \
@@ -576,7 +628,7 @@
 	}
 
 libOSC.la: $(libOSC_la_OBJECTS) $(libOSC_la_DEPENDENCIES) $(EXTRA_libOSC_la_DEPENDENCIES) 
-	$(AM_V_CCLD)$(libOSC_la_LINK)  $(libOSC_la_OBJECTS) $(libOSC_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(libOSC_la_LINK) -rpath $(libdir) $(libOSC_la_OBJECTS) $(libOSC_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -851,6 +903,9 @@
 all-am: Makefile $(LTLIBRARIES)
 installdirs: installdirs-recursive
 installdirs-am:
+	for dir in "$(DESTDIR)$(libdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-recursive
 install-exec: install-exec-recursive
 install-data: install-data-recursive
@@ -883,7 +938,7 @@
 	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-recursive
 
-clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
 	mostlyclean-am
 
 distclean: distclean-recursive
@@ -910,7 +965,7 @@
 
 install-dvi-am:
 
-install-exec-am:
+install-exec-am: install-libLTLIBRARIES
 
 install-html: install-html-recursive
 
@@ -950,24 +1005,24 @@
 
 ps-am:
 
-uninstall-am:
+uninstall-am: uninstall-libLTLIBRARIES
 
 .MAKE: $(am__recursive_targets) install-am install-strip
 
 .PHONY: $(am__recursive_targets) CTAGS GTAGS TAGS all all-am check \
-	check-am clean clean-generic clean-libtool \
-	clean-noinstLTLIBRARIES cscopelist-am ctags ctags-am distclean \
+	check-am clean clean-generic clean-libLTLIBRARIES \
+	clean-libtool cscopelist-am ctags ctags-am distclean \
 	distclean-compile distclean-generic distclean-libtool \
 	distclean-tags distdir dvi dvi-am html html-am info info-am \
 	install install-am install-data install-data-am install-dvi \
 	install-dvi-am install-exec install-exec-am install-html \
-	install-html-am install-info install-info-am install-man \
-	install-pdf install-pdf-am install-ps install-ps-am \
-	install-strip installcheck installcheck-am installdirs \
-	installdirs-am maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-am uninstall \
-	uninstall-am
+	install-html-am install-info install-info-am \
+	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs installdirs-am maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+	tags tags-am uninstall uninstall-am uninstall-libLTLIBRARIES
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.

LiVES-2.2.8.tar.bz2/libOSC/NetworkReturnAddress.c -> LiVES-2.4.1.tar.bz2/libOSC/NetworkReturnAddress.c Changed

LiVES-2.2.8.tar.bz2/libOSC/NetworkReturnAddress.h -> LiVES-2.4.1.tar.bz2/libOSC/NetworkReturnAddress.h Changed

LiVES-2.2.8.tar.bz2/libOSC/NetworkUDP.h -> LiVES-2.4.1.tar.bz2/libOSC/NetworkUDP.h Changed

LiVES-2.2.8.tar.bz2/libOSC/OSC-address-space.c -> LiVES-2.4.1.tar.bz2/libOSC/OSC-address-space.c Changed

LiVES-2.2.8.tar.bz2/libOSC/OSC-address-space.h -> LiVES-2.4.1.tar.bz2/libOSC/OSC-address-space.h Changed

LiVES-2.2.8.tar.bz2/libOSC/OSC-callbacklist.c -> LiVES-2.4.1.tar.bz2/libOSC/OSC-callbacklist.c Changed

LiVES-2.2.8.tar.bz2/libOSC/OSC-callbacklist.h -> LiVES-2.4.1.tar.bz2/libOSC/OSC-callbacklist.h Changed

LiVES-2.2.8.tar.bz2/libOSC/OSC-client.h -> LiVES-2.4.1.tar.bz2/libOSC/OSC-client.h Changed

LiVES-2.2.8.tar.bz2/libOSC/OSC-common.c -> LiVES-2.4.1.tar.bz2/libOSC/OSC-common.c Changed

LiVES-2.2.8.tar.bz2/libOSC/OSC-common.h -> LiVES-2.4.1.tar.bz2/libOSC/OSC-common.h Changed

LiVES-2.2.8.tar.bz2/libOSC/OSC-dispatch.h -> LiVES-2.4.1.tar.bz2/libOSC/OSC-dispatch.h Changed

LiVES-2.2.8.tar.bz2/libOSC/OSC-drop.c -> LiVES-2.4.1.tar.bz2/libOSC/OSC-drop.c Changed

LiVES-2.2.8.tar.bz2/libOSC/OSC-drop.h -> LiVES-2.4.1.tar.bz2/libOSC/OSC-drop.h Changed

LiVES-2.2.8.tar.bz2/libOSC/OSC-internal-messages.h -> LiVES-2.4.1.tar.bz2/libOSC/OSC-internal-messages.h Changed

LiVES-2.2.8.tar.bz2/libOSC/OSC-pattern-match.c -> LiVES-2.4.1.tar.bz2/libOSC/OSC-pattern-match.c Changed

LiVES-2.2.8.tar.bz2/libOSC/OSC-pattern-match.h -> LiVES-2.4.1.tar.bz2/libOSC/OSC-pattern-match.h Changed

LiVES-2.2.8.tar.bz2/libOSC/OSC-priority-queue.c -> LiVES-2.4.1.tar.bz2/libOSC/OSC-priority-queue.c Changed

LiVES-2.2.8.tar.bz2/libOSC/OSC-priority-queue.h -> LiVES-2.4.1.tar.bz2/libOSC/OSC-priority-queue.h Changed

LiVES-2.2.8.tar.bz2/libOSC/OSC-receive.c -> LiVES-2.4.1.tar.bz2/libOSC/OSC-receive.c Changed

@@ -1,5 +1,5 @@
 /*
-Copyright © 1998. The Regents of the University of California (Regents). 
+Copyright © 1998. The Regents of the University of California (Regents).
 All Rights Reserved.
 
 Written by Matt Wright, The Center for New Music and Audio Technologies,
@@ -22,7 +22,7 @@
 HEREUNDER IS PROVIDED "AS IS". REGENTS HAS NO OBLIGATION TO PROVIDE
 MAINTENANCE, SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 
-The OpenSound Control WWW page is 
+The OpenSound Control WWW page is
     http://www.cnmat.berkeley.edu/OpenSoundControl
 */
 
@@ -78,35 +78,35 @@
 
 
 struct {
-    OSCQueue TheQueue;		/* The Priority Queue */
-    OSCTimeTag lastTimeTag;	/* Best approximation to current time */
-    Boolean timePassed;		/* TRUE if OSCInvokeMessagesThatAreReady() has been
+  OSCQueue TheQueue;		/* The Priority Queue */
+  OSCTimeTag lastTimeTag;	/* Best approximation to current time */
+  Boolean timePassed;		/* TRUE if OSCInvokeMessagesThatAreReady() has been
 				   called since the last time OSCBeProductiveWhileWaiting() was. */
-    int recvBufSize;		/* Size of all receive buffers */
-    void *(*InitTimeMalloc)(int numBytes);
-    void *(*RealTimeMemoryAllocator)(int numBytes);
+  int recvBufSize;		/* Size of all receive buffers */
+  void *(*InitTimeMalloc)(int numBytes);
+  void *(*RealTimeMemoryAllocator)(int numBytes);
 } globals;
 
 
 /* Data structures */
 
 struct OSCPacketBuffer_struct {
-    char *buf;			/* Contents of network packet go here */
-    int n;			/* Overall size of packet */
-    int refcount;		/* # queued things using memory from this buffer */
-    struct OSCPacketBuffer_struct *nextFree;	/* For linked list of free packets */
+  char *buf;			/* Contents of network packet go here */
+  int n;			/* Overall size of packet */
+  int refcount;		/* # queued things using memory from this buffer */
+  struct OSCPacketBuffer_struct *nextFree;	/* For linked list of free packets */
 
-    Boolean returnAddrOK;       /* Because returnAddr points to memory we need to
+  Boolean returnAddrOK;       /* Because returnAddr points to memory we need to
 				   store future return addresses, we set this
 				   field to FALSE in situations where a packet
 				   buffer "has no return address" instead of
 				   setting returnAddr to 0 */
 
-    NetworkReturnAddressPtr returnAddr;
-    //void *returnAddr;	/* Addr of client this packet is from */
-	/* This was of type NetworkReturnAddressPtr, but the constness
+  NetworkReturnAddressPtr returnAddr;
+  //void *returnAddr;	/* Addr of client this packet is from */
+  /* This was of type NetworkReturnAddressPtr, but the constness
            was making it impossible for me to initialize it.  There's
-	   probably a better way that I don't understand. */
+     probably a better way that I don't understand. */
 
 };
 
@@ -118,27 +118,27 @@
 #define NOT_DISPATCHED_YET ((callbackList) -1)
 
 typedef struct queuedDataStruct {
-    OSCTimeTag timetag;	  /* When this bundle or message is supposed to happen */
-    OSCPacketBuffer myPacket;   /* Ptr. to buffer this is contained in */
-
-    enum {MESSAGE, BUNDLE} type;
-
-    union {
-	struct {
-	    char *bytes;
-	    int length;
-	} bundle;
-
-	struct {
-	    char *messageName;			/* Ptr. into receive buffer */
-	    int length;				/* Includes name and arugments */
-	    void *args;				/* 0 if not yet parsed */
-	    int argLength;
-	    callbackList callbacks;		/* May be NOT_DISPATCHED_YET */
-	} message;
-    } data;
-
-    struct queuedDataStruct *nextFree;	    /* For linked list of free structures */
+  OSCTimeTag timetag;	  /* When this bundle or message is supposed to happen */
+  OSCPacketBuffer myPacket;   /* Ptr. to buffer this is contained in */
+
+  enum {MESSAGE, BUNDLE} type;
+
+  union {
+    struct {
+      char *bytes;
+      int length;
+    } bundle;
+
+    struct {
+      char *messageName;			/* Ptr. into receive buffer */
+      int length;				/* Includes name and arugments */
+      void *args;				/* 0 if not yet parsed */
+      int argLength;
+      callbackList callbacks;		/* May be NOT_DISPATCHED_YET */
+    } message;
+  } data;
+
+  struct queuedDataStruct *nextFree;	    /* For linked list of free structures */
 } queuedData;
 
 
@@ -163,23 +163,23 @@
 
 
 Boolean OSCInitReceive(struct OSCReceiveMemoryTuner *t) {
-    globals.recvBufSize = t->receiveBufferSize;
-    globals.InitTimeMalloc = t->InitTimeMemoryAllocator;
-    globals.RealTimeMemoryAllocator = t->RealTimeMemoryAllocator;
-
-    globals.TheQueue = OSCNewQueue(t->numQueuedObjects, t->InitTimeMemoryAllocator);
-    if (globals.TheQueue == 0) return FALSE;
-
-    globals.lastTimeTag = OSCTT_Immediately();
-    globals.timePassed = TRUE;
-
-    if (InitPackets(t->receiveBufferSize, SizeOfNetworkReturnAddress(),
-		    t->numReceiveBuffers) == FALSE) return FALSE;
-    if (InitQueuedData(t->numQueuedObjects) == FALSE) return FALSE;
-    if (InitCallbackListNodes(t->numCallbackListNodes, t->InitTimeMemoryAllocator)
-	 == FALSE) return FALSE;
-    
-    return TRUE;
+  globals.recvBufSize = t->receiveBufferSize;
+  globals.InitTimeMalloc = t->InitTimeMemoryAllocator;
+  globals.RealTimeMemoryAllocator = t->RealTimeMemoryAllocator;
+
+  globals.TheQueue = OSCNewQueue(t->numQueuedObjects, t->InitTimeMemoryAllocator);
+  if (globals.TheQueue == 0) return FALSE;
+
+  globals.lastTimeTag = OSCTT_Immediately();
+  globals.timePassed = TRUE;
+
+  if (InitPackets(t->receiveBufferSize, SizeOfNetworkReturnAddress(),
+                  t->numReceiveBuffers) == FALSE) return FALSE;
+  if (InitQueuedData(t->numQueuedObjects) == FALSE) return FALSE;
+  if (InitCallbackListNodes(t->numCallbackListNodes, t->InitTimeMemoryAllocator)
+      == FALSE) return FALSE;
+
+  return TRUE;
 }
 
 
@@ -191,112 +191,111 @@
 
 #ifdef DEBUG_PACKET_MEM
 static void PrintPacketFreeList(void) {
-    struct OSCPacketBuffer_struct *p;
-    printf("- freePackets:");
-    if (freePackets == 0) {
-	printf(" [none]");
-    }
-    for (p = freePackets; p != 0; p = p->nextFree) {
-	printf(" %p", p);
-    }
-    printf("\n");
+  struct OSCPacketBuffer_struct *p;
+  printf("- freePackets:");
+  if (freePackets == 0) {
+    printf(" [none]");
+  }
+  for (p = freePackets; p != 0; p = p->nextFree) {
+    printf(" %p", p);
+  }
+  printf("\n");
 }
 #endif
 
 #define MIN_REASONABLE_RCV_BUFSIZE 128
 
-void	OSCFreeReceiver(void)
-{
-	if( freePackets) free(freePackets);
+void	OSCFreeReceiver(void) {
+  if (freePackets) free(freePackets);
 }
 
 
 static Boolean InitPackets(int receiveBufferSize, int clientAddrSize, int numReceiveBuffers) {
-    int i;
-    struct OSCPacketBuffer_struct *allPackets;
+  int i;
+  struct OSCPacketBuffer_struct *allPackets;
 
-    if (receiveBufferSize < MIN_REASONABLE_RCV_BUFSIZE) {
-	fatal_error("OSCInitReceive: receiveBufferSize of %d is unreasonably small.",
-		    receiveBufferSize);
-    }
+  if (receiveBufferSize < MIN_REASONABLE_RCV_BUFSIZE) {
+    fatal_error("OSCInitReceive: receiveBufferSize of %d is unreasonably small.",
+                receiveBufferSize);
+  }
 
-    allPackets = (*(globals.InitTimeMalloc))(numReceiveBuffers * sizeof(*allPackets));
-    if (allPackets == 0) return FALSE;
+  allPackets = (*(globals.InitTimeMalloc))(numReceiveBuffers * sizeof(*allPackets));
+  if (allPackets == 0) return FALSE;
 
-    for (i = 0; i < numReceiveBuffers; ++i) {
-	allPackets[i].returnAddr = (*(globals.InitTimeMalloc))(clientAddrSize);
-	if (allPackets[i].returnAddr == 0) return FALSE;
+  for (i = 0; i < numReceiveBuffers; ++i) {
+    allPackets[i].returnAddr = (*(globals.InitTimeMalloc))(clientAddrSize);
+    if (allPackets[i].returnAddr == 0) return FALSE;
 
-	allPackets[i].buf = (*(globals.InitTimeMalloc))(receiveBufferSize);
-	if (allPackets[i].buf == 0) return FALSE;
+    allPackets[i].buf = (*(globals.InitTimeMalloc))(receiveBufferSize);
+    if (allPackets[i].buf == 0) return FALSE;
 
-	allPackets[i].nextFree = &(allPackets[i+1]);
-    }
-    allPackets[numReceiveBuffers-1].nextFree = ((struct OSCPacketBuffer_struct *) 0);
-    freePackets = allPackets;
+    allPackets[i].nextFree = &(allPackets[i+1]);
+  }
+  allPackets[numReceiveBuffers-1].nextFree = ((struct OSCPacketBuffer_struct *) 0);
+  freePackets = allPackets;
 
-    return TRUE;
+  return TRUE;
 }
 
 char *OSCPacketBufferGetBuffer(OSCPacketBuffer p) {
-    return p->buf;
+  return p->buf;
 }
 
 int *OSCPacketBufferGetSize(OSCPacketBuffer p) {
-    return &(p->n);
+  return &(p->n);
 }
 
 int OSCGetReceiveBufferSize(void) {
-    return globals.recvBufSize;
+  return globals.recvBufSize;
 }
 
 NetworkReturnAddressPtr OSCPacketBufferGetClientAddr(OSCPacketBuffer p) {
-    return p->returnAddr;
+  return p->returnAddr;
 }
 
 
 #ifdef DEBUG
 void PrintPacket(OSCPacketBuffer p) {
-    printf("Packet %p.  buf %p, n %d, refcount %d, nextFree %p\n",
-	   p, p->buf, p->n, p->refcount, p->nextFree);
+  printf("Packet %p.  buf %p, n %d, refcount %d, nextFree %p\n",
+         p, p->buf, p->n, p->refcount, p->nextFree);
 }
 #endif
 
-    
+
 
 OSCPacketBuffer OSCAllocPacketBuffer(void) {
-    OSCPacketBuffer result;
-    if (freePackets == 0) {
-	/* Could try to call the real-time memory allocator here */
-	OSCWarning("OSCAllocPacketBuffer: no free packets!");
-	return 0;
-    }
+  OSCPacketBuffer result;
+  if (freePackets == 0) {
+    /* Could try to call the real-time memory allocator here */
+    OSCWarning("OSCAllocPacketBuffer: no free packets!");
+    return 0;
+  }
 
-    result = freePackets;
-    freePackets = result->nextFree;
-    result->refcount = 0;
+  result = freePackets;
+  freePackets = result->nextFree;
+  result->refcount = 0;
 
 #ifdef DEBUG_PACKET_MEM
-    printf("OSCAllocPacketBuffer: allocating %p ", result);
-    PrintPacketFreeList();
+  printf("OSCAllocPacketBuffer: allocating %p ", result);
+  PrintPacketFreeList();
 #endif
 
-    return result;
+  return result;
 }
 
 void OSCFreePacket(OSCPacketBuffer p) {
 #ifdef PARANOID
-    if (p->refcount != 0) {
-	OSCWarning("OSCFreePacket: %p's refcount is %d!\n", p, p->refcount);
-    }
+  if (p->refcount != 0) {
+    OSCWarning("OSCFreePacket: %p's refcount is %d!\n", p, p->refcount);
+  }
 #endif
 
-    p->nextFree = freePackets;
-    freePackets = p;
+  p->nextFree = freePackets;
+  freePackets = p;
 
 #ifdef DEBUG_PACKET_MEM
-    printf("OSCFreePacket: freed %p ", p);
-    PrintPacketFreeList();
+  printf("OSCFreePacket: freed %p ", p);
+  PrintPacketFreeList();
 #endif
 
 }
@@ -311,533 +310,533 @@
 
 #ifdef DEBUG_QD_MEM
 static void PrintQDFreeList(void) {
-    static queuedData *p;
-    printf("- freeQDList:");
-    if (freeQDList == 0) {
-        printf(" [none]");
-    }
-    for (p = freeQDList;  p != 0; p = p->nextFree) {
-        printf(" %p", p);
-    }
-    printf("\n");
+  static queuedData *p;
+  printf("- freeQDList:");
+  if (freeQDList == 0) {
+    printf(" [none]");
+  }
+  for (p = freeQDList;  p != 0; p = p->nextFree) {
+    printf(" %p", p);
+  }
+  printf("\n");
 }
 #endif
 
 static Boolean InitQueuedData(int numQueuedObjects) {
-    int i;
-    queuedData *allQD;
+  int i;
+  queuedData *allQD;
 
-    allQD = (*(globals.InitTimeMalloc))(numQueuedObjects * (sizeof(*allQD)));
-    if (allQD == 0) return FALSE;
+  allQD = (*(globals.InitTimeMalloc))(numQueuedObjects * (sizeof(*allQD)));
+  if (allQD == 0) return FALSE;
 
-    for (i = 0; i < numQueuedObjects; ++i) {
-	allQD[i].nextFree = &(allQD[i+1]);
-    }
-    allQD[numQueuedObjects-1].nextFree = 0;
-    freeQDList = &(allQD[0]);
+  for (i = 0; i < numQueuedObjects; ++i) {
+    allQD[i].nextFree = &(allQD[i+1]);
+  }
+  allQD[numQueuedObjects-1].nextFree = 0;
+  freeQDList = &(allQD[0]);
 
-    return TRUE;
+  return TRUE;
 }
 
 static queuedData *AllocQD(void) {
-    queuedData *result;
+  queuedData *result;
 
-    if (freeQDList == 0) {
-	/* Could try to call realtime malloc() */
-	OSCWarning("AllocQD: no QD objects free now; returning 0.");
-	return 0;
-    }
+  if (freeQDList == 0) {
+    /* Could try to call realtime malloc() */
+    OSCWarning("AllocQD: no QD objects free now; returning 0.");
+    return 0;
+  }
 
-    result = freeQDList;
-    freeQDList = freeQDList->nextFree;
-    return result;
+  result = freeQDList;
+  freeQDList = freeQDList->nextFree;
+  return result;
 }
-    
+
 static void FreeQD(queuedData *qd) {
-    qd->nextFree = freeQDList;
-    freeQDList = qd;
+  qd->nextFree = freeQDList;
+  freeQDList = qd;
 }
 
 
 void OSCAcceptPacket(OSCPacketBuffer packet) {
-    if ((packet->n % 4) != 0) {
-	OSCProblem("OSC packet size (%d bytes) not a multiple of 4.", packet->n);
-	DropPacket(packet);
-	return;
-    }
+  if ((packet->n % 4) != 0) {
+    OSCProblem("OSC packet size (%d bytes) not a multiple of 4.", packet->n);
+    DropPacket(packet);
+    return;
+  }
 
 #ifdef DEBUG
-    printf("OSCAcceptPacket(OSCPacketBuffer %p, buf %p, size %d)\n", 
-	   packet, packet->buf, packet->n);
+  printf("OSCAcceptPacket(OSCPacketBuffer %p, buf %p, size %d)\n",
+         packet, packet->buf, packet->n);
 #endif
 
-    /* If the packet came from the user, it's return address is OK. */
-    packet->returnAddrOK = TRUE;
+  /* If the packet came from the user, it's return address is OK. */
+  packet->returnAddrOK = TRUE;
 
-    InsertBundleOrMessage(packet->buf, packet->n, packet, OSCTT_Immediately());
+  InsertBundleOrMessage(packet->buf, packet->n, packet, OSCTT_Immediately());
 
 #ifdef PARANOID
-    if (packet->refcount == 0) {
-	if (freePackets != packet) {
-	    fatal_error("OSCAcceptPacket: packet refcount 0, but it's not the head of the free list!");
-	}
+  if (packet->refcount == 0) {
+    if (freePackets != packet) {
+      fatal_error("OSCAcceptPacket: packet refcount 0, but it's not the head of the free list!");
     }
+  }
 #endif
 
-    OSCInvokeAllMessagesThatAreReady(globals.lastTimeTag);
+  OSCInvokeAllMessagesThatAreReady(globals.lastTimeTag);
 }
 
 Boolean OSCBeProductiveWhileWaiting(void) {
-    /* Here's where we could be clever if an allocation fails. 
-       (I.e., if we're out of QD objects, we should avoid
-       parsing bundles.) The code isn't that smart yet. */
+  /* Here's where we could be clever if an allocation fails.
+     (I.e., if we're out of QD objects, we should avoid
+     parsing bundles.) The code isn't that smart yet. */
 
-    queuedData *qd;
+  queuedData *qd;
 
-    if (globals.timePassed) {
-	OSCQueueScanStart(globals.TheQueue);
-    }
+  if (globals.timePassed) {
+    OSCQueueScanStart(globals.TheQueue);
+  }
 
-    while (1) {
-	qd = (queuedData *) OSCQueueScanNext(globals.TheQueue);
-	if (qd == 0) return FALSE;
-
-	if (qd->type == BUNDLE) {
-            ParseBundle(qd);
-	    OSCQueueRemoveCurrentScanItem(globals.TheQueue);
-	    return TRUE;
-	} else {
-	    if (qd->data.message.callbacks == NOT_DISPATCHED_YET) {
-                if (ParseMessage(qd) == FALSE) {
-                    /* Problem with this message - flush it. */
-		    DropMessage(qd->data.message.messageName,
-				qd->data.message.length,
-				qd->myPacket);
-		    OSCQueueRemoveCurrentScanItem(globals.TheQueue);
-		    PacketRemoveRef(qd->myPacket);
-                    FreeQD(qd);
-		}
-		return TRUE;
-	    }
-	    /* The item we found was an already-dispatched message,
-	       so continue the while loop. */
-	}
-    }
+  while (1) {
+    qd = (queuedData *) OSCQueueScanNext(globals.TheQueue);
+    if (qd == 0) return FALSE;
+
+    if (qd->type == BUNDLE) {
+      ParseBundle(qd);
+      OSCQueueRemoveCurrentScanItem(globals.TheQueue);
+      return TRUE;
+    } else {
+      if (qd->data.message.callbacks == NOT_DISPATCHED_YET) {
+        if (ParseMessage(qd) == FALSE) {
+          /* Problem with this message - flush it. */
+          DropMessage(qd->data.message.messageName,
+                      qd->data.message.length,
+                      qd->myPacket);
+          OSCQueueRemoveCurrentScanItem(globals.TheQueue);
+          PacketRemoveRef(qd->myPacket);
+          FreeQD(qd);
+        }
+        return TRUE;
+      }
+      /* The item we found was an already-dispatched message,
+         so continue the while loop. */
+    }
+  }
 }
-    
+
 Boolean OSCInvokeMessagesThatAreReady(OSCTimeTag now) {
-    queuedData *x;
-    OSCTimeTag thisTimeTag;
+  queuedData *x;
+  OSCTimeTag thisTimeTag;
 
-    globals.lastTimeTag = now;
-    globals.timePassed = TRUE;
+  globals.lastTimeTag = now;
+  globals.timePassed = TRUE;
 
-    thisTimeTag = OSCQueueEarliestTimeTag(globals.TheQueue);
+  thisTimeTag = OSCQueueEarliestTimeTag(globals.TheQueue);
 
-    if (OSCTT_Compare(thisTimeTag, now) > 0) {
-	/* No messages ready yet. */
-	return FALSE;
-    }
+  if (OSCTT_Compare(thisTimeTag, now) > 0) {
+    /* No messages ready yet. */
+    return FALSE;
+  }
 
 #ifdef DEBUG
-    printf("OSCInvokeMessagesThatAreReady(%llx) - yes, some are ready; earliest %llx\n", now, thisTimeTag);
+  printf("OSCInvokeMessagesThatAreReady(%llx) - yes, some are ready; earliest %llx\n", now, thisTimeTag);
 #endif
 
-    while (OSCTT_Compare(thisTimeTag, OSCQueueEarliestTimeTag(globals.TheQueue)) == 0) {
-	x = (queuedData *) OSCQueueRemoveEarliest(globals.TheQueue);
-	if (!x) return FALSE;
+  while (OSCTT_Compare(thisTimeTag, OSCQueueEarliestTimeTag(globals.TheQueue)) == 0) {
+    x = (queuedData *) OSCQueueRemoveEarliest(globals.TheQueue);
+    if (!x) return FALSE;
 
 #ifdef DEBUG
-	printf("...Just removed earliest entry from queue: %p, TT %llx, %s\n",
-	       x, x->timetag, x->type == MESSAGE ? "message" : "bundle");
-	if (x->type == MESSAGE) {
-	    printf("...message %s, len %d, args %p, arglen %d, callbacks %p\n",
-		   x->data.message.messageName, x->data.message.length, x->data.message.args,
-		   x->data.message.argLength, x->data.message.callbacks);
-	} else {
-	    if (x->data.bundle.length == 0) {
-		printf("...bundle is empty.\n");
-	    } else {
-		printf("...bundle len %d, first count %d, first msg %s\n",
-		       x->data.bundle.length, *((int *) x->data.bundle.bytes), x->data.bundle.bytes+4);
-	    }
-	}
-	PrintPacket(x->myPacket);
+    printf("...Just removed earliest entry from queue: %p, TT %llx, %s\n",
+           x, x->timetag, x->type == MESSAGE ? "message" : "bundle");
+    if (x->type == MESSAGE) {
+      printf("...message %s, len %d, args %p, arglen %d, callbacks %p\n",
+             x->data.message.messageName, x->data.message.length, x->data.message.args,
+             x->data.message.argLength, x->data.message.callbacks);
+    } else {
+      if (x->data.bundle.length == 0) {
+        printf("...bundle is empty.\n");
+      } else {
+        printf("...bundle len %d, first count %d, first msg %s\n",
+               x->data.bundle.length, *((int *) x->data.bundle.bytes), x->data.bundle.bytes+4);
+      }
+    }
+    PrintPacket(x->myPacket);
 #endif
 
-	if (x->type == BUNDLE) {
-	    ParseBundle(x);
-	} else {
-	    if (x->data.message.callbacks == NOT_DISPATCHED_YET) {
-		if (ParseMessage(x) == FALSE) {
-		    /* Problem with this message - flush it. */
-		    PacketRemoveRef(x->myPacket);
-		    FreeQD(x);
-		    continue;
-		}
-	    }
-
-	    CallWholeCallbackList(x->data.message.callbacks,
-				  x->data.message.argLength,
-				  x->data.message.args, 
-				  thisTimeTag,
-				  x->myPacket->returnAddrOK ? x->myPacket->returnAddr : 0);
-
-	    PacketRemoveRef(x->myPacket);
-	    FreeQD(x);
-	}
+    if (x->type == BUNDLE) {
+      ParseBundle(x);
+    } else {
+      if (x->data.message.callbacks == NOT_DISPATCHED_YET) {
+        if (ParseMessage(x) == FALSE) {
+          /* Problem with this message - flush it. */
+          PacketRemoveRef(x->myPacket);
+          FreeQD(x);
+          continue;
+        }
+      }
+
+      CallWholeCallbackList(x->data.message.callbacks,
+                            x->data.message.argLength,
+                            x->data.message.args,
+                            thisTimeTag,
+                            x->myPacket->returnAddrOK ? x->myPacket->returnAddr : 0);
+
+      PacketRemoveRef(x->myPacket);
+      FreeQD(x);
     }
+  }
 
 
 #ifdef PARANOID
-    if (OSCTT_Compare(thisTimeTag, OSCQueueEarliestTimeTag(globals.TheQueue)) > 0) {
-	fatal_error("OSCInvokeMessagesThatAreReady: corrupt queue!\n"
-		    "  just did %llx; earliest in queue is now %llx",
-		    thisTimeTag, OSCQueueEarliestTimeTag(globals.TheQueue));
-    }
+  if (OSCTT_Compare(thisTimeTag, OSCQueueEarliestTimeTag(globals.TheQueue)) > 0) {
+    fatal_error("OSCInvokeMessagesThatAreReady: corrupt queue!\n"
+                "  just did %llx; earliest in queue is now %llx",
+                thisTimeTag, OSCQueueEarliestTimeTag(globals.TheQueue));
+  }
 #endif
 
-    return OSCTT_Compare(OSCQueueEarliestTimeTag(globals.TheQueue), now) <= 0;
+  return OSCTT_Compare(OSCQueueEarliestTimeTag(globals.TheQueue), now) <= 0;
 }
 
 void OSCInvokeAllMessagesThatAreReady(OSCTimeTag now) {
-    while (OSCInvokeMessagesThatAreReady(now)) {
-	/* Do nothing */
-    }
+  while (OSCInvokeMessagesThatAreReady(now)) {
+    /* Do nothing */
+  }
 }
 
 static void CallWholeCallbackList(callbackList l, int argLength, void *args, OSCTimeTag when,
-				  NetworkReturnAddressPtr returnAddr) {
-    /* In a multithreaded application, this might run in a different thread
-       than the thread that deals with the priority queue. */
-
-    callbackList next;
-
-    while (l != 0) {
-	(*(l->callback))(l->context, argLength, args, when, returnAddr);
-	next = l->next;
-	FreeCallbackListNode(l);
-	l = next;
-    }
+                                  NetworkReturnAddressPtr returnAddr) {
+  /* In a multithreaded application, this might run in a different thread
+     than the thread that deals with the priority queue. */
+
+  callbackList next;
+
+  while (l != 0) {
+    (*(l->callback))(l->context, argLength, args, when, returnAddr);
+    next = l->next;
+    FreeCallbackListNode(l);
+    l = next;
+  }
 }
 
 static void InsertBundleOrMessage(char *buf, int n, OSCPacketBuffer packet, OSCTimeTag enclosingTimeTag) {
-    Boolean IsBundle;
-    queuedData *qd;
-
-    /* We add the reference first thing so in case any of the upcoming
-       potential failure situations come we can call PacketRemoveRef, thereby
-       freeing the packet if necessary. */
-    PacketAddRef(packet);
-
-    if ((n % 4) != 0) {
-	OSCProblem("OSC message or bundle size (%d bytes) not a multiple of 4.", n);
-	DropMessage(buf, n, packet);
-	PacketRemoveRef(packet);
-	return;
-    }
-
-    if ((n >= 8) && (strncmp(buf, "#bundle", 8) == 0)) {
-	IsBundle = TRUE;
-
-	if (n < 16) {
-	    OSCProblem("Bundle message too small (%d bytes) for time tag.", n);
-	    DropBundle(buf, n, packet);
-	    PacketRemoveRef(packet);
-	    return;
-	}
-    } else {
-	IsBundle = FALSE;
-    }
-
-
-    qd = AllocQD();
-
-    if (qd == 0) {
-	OSCProblem("Not enough memory for queued data!");
-	DropBundle(buf, n, packet);
-	PacketRemoveRef(packet);
-	return;
-    }
-
-    qd->myPacket = packet;
-    qd->type = IsBundle ? BUNDLE : MESSAGE;
-
-    if (IsBundle) {
-	/* Be careful of 8-byte alignment when copying the time tag.  Here's a good
-	   way to get a bus error when buf happens not to be 8-byte aligned:
-	   qd->timetag = *((OSCTimeTag *)(buf+8));
-	*/
-	memcpy(&(qd->timetag), buf+8, sizeof(OSCTimeTag));
-
-	if (OSCTT_Compare(qd->timetag, enclosingTimeTag) < 0) {
-	    OSCProblem("Time tag of sub-bundle is before time tag of enclosing bundle.");
-	    DropBundle(buf, n, packet);
-	    PacketRemoveRef(packet);
-	    FreeQD(qd);
-	    return;
-	}
-	qd->data.bundle.bytes = buf + 16;
-	qd->data.bundle.length = n - 16;
-    } else {
-        qd->timetag = enclosingTimeTag;
-	qd->data.message.messageName = buf;
-	qd->data.message.length = n;
-	qd->data.message.callbacks = NOT_DISPATCHED_YET;
-    }
-
-    OSCQueueInsert(globals.TheQueue, (OSCSchedulableObject) qd);
+  Boolean IsBundle;
+  queuedData *qd;
+
+  /* We add the reference first thing so in case any of the upcoming
+     potential failure situations come we can call PacketRemoveRef, thereby
+     freeing the packet if necessary. */
+  PacketAddRef(packet);
+
+  if ((n % 4) != 0) {
+    OSCProblem("OSC message or bundle size (%d bytes) not a multiple of 4.", n);
+    DropMessage(buf, n, packet);
+    PacketRemoveRef(packet);
+    return;
+  }
+
+  if ((n >= 8) && (strncmp(buf, "#bundle", 8) == 0)) {
+    IsBundle = TRUE;
+
+    if (n < 16) {
+      OSCProblem("Bundle message too small (%d bytes) for time tag.", n);
+      DropBundle(buf, n, packet);
+      PacketRemoveRef(packet);
+      return;
+    }
+  } else {
+    IsBundle = FALSE;
+  }
+
+
+  qd = AllocQD();
+
+  if (qd == 0) {
+    OSCProblem("Not enough memory for queued data!");
+    DropBundle(buf, n, packet);
+    PacketRemoveRef(packet);
+    return;
+  }
+
+  qd->myPacket = packet;
+  qd->type = IsBundle ? BUNDLE : MESSAGE;
+
+  if (IsBundle) {
+    /* Be careful of 8-byte alignment when copying the time tag.  Here's a good
+       way to get a bus error when buf happens not to be 8-byte aligned:
+       qd->timetag = *((OSCTimeTag *)(buf+8));
+    */
+    memcpy(&(qd->timetag), buf+8, sizeof(OSCTimeTag));
+
+    if (OSCTT_Compare(qd->timetag, enclosingTimeTag) < 0) {
+      OSCProblem("Time tag of sub-bundle is before time tag of enclosing bundle.");
+      DropBundle(buf, n, packet);
+      PacketRemoveRef(packet);
+      FreeQD(qd);
+      return;
+    }
+    qd->data.bundle.bytes = buf + 16;
+    qd->data.bundle.length = n - 16;
+  } else {
+    qd->timetag = enclosingTimeTag;
+    qd->data.message.messageName = buf;
+    qd->data.message.length = n;
+    qd->data.message.callbacks = NOT_DISPATCHED_YET;
+  }
+
+  OSCQueueInsert(globals.TheQueue, (OSCSchedulableObject) qd);
 }
 
 
 static void ParseBundle(queuedData *qd) {
-    /* A queued bundle has been removed from the scheduler queue, and now it's
-       time to parse all the stuff inside it and schedule the enclosed
-       messages and bundles.  Once all the contents of the bundle have been
-       parsed and scheduled, we trash the bundle, decrementing the packet
-       count and freeing the QD. */
-
-    int size;
-    int i = 0;
-
-    if (qd->type != BUNDLE) {
-        fatal_error("This can't happen: bundle isn't a bundle!");
-    }
-
-    while (i < qd->data.bundle.length) {
-	size = *((int *) (qd->data.bundle.bytes + i));
-	if ((size % 4) != 0) {
-	    OSCProblem("Bad size count %d in bundle (not a multiple of 4).", size);
-	    DropBundle(qd->data.bundle.bytes, qd->data.bundle.length, qd->myPacket);
-	    goto bag;
-	}
-	if ((size + i + 4) > qd->data.bundle.length) {
-	    OSCProblem("Bad size count %d in bundle (only %d bytes left in entire bundle).",
-		     size, qd->data.bundle.length-i-4);
-	    DropBundle(qd->data.bundle.bytes, qd->data.bundle.length, qd->myPacket);
-	    goto bag;	
-	}
-	
-	/* Recursively handle element of bundle */
-	InsertBundleOrMessage(qd->data.bundle.bytes+i+4, size, qd->myPacket, qd->timetag);
-	i += 4 + size;
-    }
-
-    if (i != qd->data.bundle.length) {
-	fatal_error("This can't happen: internal logic error parsing bundle");
-    }
+  /* A queued bundle has been removed from the scheduler queue, and now it's
+     time to parse all the stuff inside it and schedule the enclosed
+     messages and bundles.  Once all the contents of the bundle have been
+     parsed and scheduled, we trash the bundle, decrementing the packet
+     count and freeing the QD. */
+
+  int size;
+  int i = 0;
+
+  if (qd->type != BUNDLE) {
+    fatal_error("This can't happen: bundle isn't a bundle!");
+  }
+
+  while (i < qd->data.bundle.length) {
+    size = *((int *)(qd->data.bundle.bytes + i));
+    if ((size % 4) != 0) {
+      OSCProblem("Bad size count %d in bundle (not a multiple of 4).", size);
+      DropBundle(qd->data.bundle.bytes, qd->data.bundle.length, qd->myPacket);
+      goto bag;
+    }
+    if ((size + i + 4) > qd->data.bundle.length) {
+      OSCProblem("Bad size count %d in bundle (only %d bytes left in entire bundle).",
+                 size, qd->data.bundle.length-i-4);
+      DropBundle(qd->data.bundle.bytes, qd->data.bundle.length, qd->myPacket);
+      goto bag;
+    }
+
+    /* Recursively handle element of bundle */
+    InsertBundleOrMessage(qd->data.bundle.bytes+i+4, size, qd->myPacket, qd->timetag);
+    i += 4 + size;
+  }
+
+  if (i != qd->data.bundle.length) {
+    fatal_error("This can't happen: internal logic error parsing bundle");
+  }
 
 bag:
-    /* If we got here successfully, we've added to the packet's reference count for
-       each message or subbundle by calling InsertBundleOrMessage(), so we remove the one
-       reference for bundle that we just parsed.  If we got here by "goto bag", there's a
-       problem with the bundle so we also want to lose the reference count. */
+  /* If we got here successfully, we've added to the packet's reference count for
+     each message or subbundle by calling InsertBundleOrMessage(), so we remove the one
+     reference for bundle that we just parsed.  If we got here by "goto bag", there's a
+     problem with the bundle so we also want to lose the reference count. */
 
-    PacketRemoveRef(qd->myPacket);
-    FreeQD(qd);
+  PacketRemoveRef(qd->myPacket);
+  FreeQD(qd);
 }
 
 
 static Boolean ParseMessage(queuedData *qd) {
-    /* Fill in all the information we'll need to execute the message as
-       quickly as possible when the time comes.  This means figuring out where
-       the address ends and the arguments begin, and also pattern matching the
-       address to find the callbacks associated with it.
+  /* Fill in all the information we'll need to execute the message as
+     quickly as possible when the time comes.  This means figuring out where
+     the address ends and the arguments begin, and also pattern matching the
+     address to find the callbacks associated with it.
 
-       The message may be something we have to invoke now, or it may be some
-       message scheduled for the future that's just waiting on the queue; this
-       procedure doesn't care.  */
+     The message may be something we have to invoke now, or it may be some
+     message scheduled for the future that's just waiting on the queue; this
+     procedure doesn't care.  */
 
 
-    char *args; 	/* char * so we can do pointer subtraction */
-    int messageLen;
-    char *DAAS_errormsg;
+  char *args; 	/* char * so we can do pointer subtraction */
+  int messageLen;
+  char *DAAS_errormsg;
 
 
-    if (qd->type != MESSAGE) {
-        fatal_error("This can't happen: message isn't a message!");
-    }
+  if (qd->type != MESSAGE) {
+    fatal_error("This can't happen: message isn't a message!");
+  }
 
-    args = OSCDataAfterAlignedString(qd->data.message.messageName, 
-				     qd->data.message.messageName+qd->data.message.length,
-				     &DAAS_errormsg);
+  args = OSCDataAfterAlignedString(qd->data.message.messageName,
+                                   qd->data.message.messageName+qd->data.message.length,
+                                   &DAAS_errormsg);
 
-    if (args == 0) {
-	OSCProblem("Bad message name string: %s\n", DAAS_errormsg);
-	DropMessage(qd->data.message.messageName, qd->data.message.length, qd->myPacket);
-	return FALSE;
-    }
+  if (args == 0) {
+    OSCProblem("Bad message name string: %s\n", DAAS_errormsg);
+    DropMessage(qd->data.message.messageName, qd->data.message.length, qd->myPacket);
+    return FALSE;
+  }
 
-    qd->data.message.args = args;
-    messageLen = args - qd->data.message.messageName;
-    qd->data.message.argLength = qd->data.message.length - messageLen;
+  qd->data.message.args = args;
+  messageLen = args - qd->data.message.messageName;
+  qd->data.message.argLength = qd->data.message.length - messageLen;
 
-    qd->data.message.callbacks = OSCDispatchMessage(qd->data.message.messageName);
+  qd->data.message.callbacks = OSCDispatchMessage(qd->data.message.messageName);
 
-    if (qd->data.message.callbacks == 0) {
-	OSCWarning("Message pattern \"%s\" did not correspond to any address in the synth.",
-		   qd->data.message.messageName);
-	return FALSE;
-    }
+  if (qd->data.message.callbacks == 0) {
+    OSCWarning("Message pattern \"%s\" did not correspond to any address in the synth.",
+               qd->data.message.messageName);
+    return FALSE;
+  }
 
-    return TRUE;
+  return TRUE;
 }
 
 static void PacketAddRef(OSCPacketBuffer packet) {
-    ++(packet->refcount);
+  ++(packet->refcount);
 }
 
 static void PacketRemoveRef(OSCPacketBuffer packet) {
-    --(packet->refcount);
-    if (packet->refcount == 0) {
-        OSCFreePacket(packet);
-    }
+  --(packet->refcount);
+  if (packet->refcount == 0) {
+    OSCFreePacket(packet);
+  }
 }
 
 
 
 /**************************************************
- Implementation of procedures declared in 
+ Implementation of procedures declared in
  OSC-internal-messages.h
  **************************************************/
 
 #include <libOSC/OSC-internal-messages.h>
 
 Boolean OSCSendInternalMessage(char *address, int arglen, void *args) {
-    return OSCSendInternalMessageWithRSVP(address, arglen, args, 0);
+  return OSCSendInternalMessageWithRSVP(address, arglen, args, 0);
 }
 
 Boolean OSCSendInternalMessageWithRSVP(char *address, int arglen, void *args,
-				       NetworkReturnAddressPtr returnAddr) {
-    callbackList l = OSCDispatchMessage(address);
+                                       NetworkReturnAddressPtr returnAddr) {
+  callbackList l = OSCDispatchMessage(address);
 
-    if (l == 0) return FALSE;
+  if (l == 0) return FALSE;
 
-    CallWholeCallbackList(l, arglen, args, OSCTT_Immediately(), returnAddr);
-    return TRUE;
+  CallWholeCallbackList(l, arglen, args, OSCTT_Immediately(), returnAddr);
+  return TRUE;
 }
 
 
 
-Boolean OSCScheduleInternalMessages(OSCTimeTag when, int numMessages, 
-				    char **addresses, int *arglens, void **args) {
+Boolean OSCScheduleInternalMessages(OSCTimeTag when, int numMessages,
+                                    char **addresses, int *arglens, void **args) {
   int i, bufSizeNeeded;
-    OSCPacketBuffer p;
-    queuedData *qd;
-    char *bufPtr;
-    
-
-    /* Figure out how big of a buffer we'll need to hold this huge bundle.
-       We don't store the "#bundle" string or the time tag, just the 4-byte
-       size counts, the addresses, possible extra null padding for the
-       addresses, and the arguments. */
-
-    bufSizeNeeded = 0;
-    for (i = 0; i < numMessages; ++i) {
-	bufSizeNeeded += 4 + OSCPaddedStrlen(addresses[i]) + arglens[i];
-    }
+  OSCPacketBuffer p;
+  queuedData *qd;
+  char *bufPtr;
 
-    if (bufSizeNeeded > OSCGetReceiveBufferSize()) {
-	return FALSE;
-    }
-	
 
-    /* Now try to allocate the data objects to hold these messages */
-    qd = AllocQD();
-    if (qd == 0) return FALSE;
+  /* Figure out how big of a buffer we'll need to hold this huge bundle.
+     We don't store the "#bundle" string or the time tag, just the 4-byte
+     size counts, the addresses, possible extra null padding for the
+     addresses, and the arguments. */
 
-    p = OSCAllocPacketBuffer();
-    if (p == 0) {
-	FreeQD(qd);
-	return FALSE;
-    }
+  bufSizeNeeded = 0;
+  for (i = 0; i < numMessages; ++i) {
+    bufSizeNeeded += 4 + OSCPaddedStrlen(addresses[i]) + arglens[i];
+  }
 
-    /* Now fill in the buffer with a fake #bundle message.   This is almost like
-       putting a real #bundle message in the buffer and then calling OSCAcceptPacket,
-       except that we save a little time and memory by not writing "#bundle" or the time tag,
-       and by pre-parsing the messages a little.   Thus, this code duplicates a lot
-       of what's in InsertBundleOrMessage() */
+  if (bufSizeNeeded > OSCGetReceiveBufferSize()) {
+    return FALSE;
+  }
 
-    bufPtr = p->buf;
 
-    for (i = 0; i < numMessages; ++i) {
-	/* First the size count of this bundle element */
-	*((int4 *) bufPtr) = OSCPaddedStrlen(addresses[i]) + arglens[i];
-	bufPtr += sizeof(int4);
+  /* Now try to allocate the data objects to hold these messages */
+  qd = AllocQD();
+  if (qd == 0) return FALSE;
 
-	/* Then the address */
-	bufPtr = OSCPaddedStrcpy(bufPtr, addresses[i]);
+  p = OSCAllocPacketBuffer();
+  if (p == 0) {
+    FreeQD(qd);
+    return FALSE;
+  }
 
-	/* Then the arguments */
-	memcpy(bufPtr, args[i], arglens[i]);
-	bufPtr += arglens[i];
-    }
+  /* Now fill in the buffer with a fake #bundle message.   This is almost like
+     putting a real #bundle message in the buffer and then calling OSCAcceptPacket,
+     except that we save a little time and memory by not writing "#bundle" or the time tag,
+     and by pre-parsing the messages a little.   Thus, this code duplicates a lot
+     of what's in InsertBundleOrMessage() */
+
+  bufPtr = p->buf;
+
+  for (i = 0; i < numMessages; ++i) {
+    /* First the size count of this bundle element */
+    *((int4 *) bufPtr) = OSCPaddedStrlen(addresses[i]) + arglens[i];
+    bufPtr += sizeof(int4);
+
+    /* Then the address */
+    bufPtr = OSCPaddedStrcpy(bufPtr, addresses[i]);
+
+    /* Then the arguments */
+    memcpy(bufPtr, args[i], arglens[i]);
+    bufPtr += arglens[i];
+  }
 
 #ifdef PARANOID
-    if (bufPtr != p->buf+bufSizeNeeded) {
-	fatal_error("OSCScheduleInternalMessages: internal error");
-    }
+  if (bufPtr != p->buf+bufSizeNeeded) {
+    fatal_error("OSCScheduleInternalMessages: internal error");
+  }
 #endif
 
-    /* Fill in the rest of the packet fields */
-    p->n = bufSizeNeeded;
-    p->returnAddrOK = FALSE;
-    PacketAddRef(p);
+  /* Fill in the rest of the packet fields */
+  p->n = bufSizeNeeded;
+  p->returnAddrOK = FALSE;
+  PacketAddRef(p);
 
-    /* Now fill in the queuedData object */
-    qd->timetag = when;
-    qd->myPacket = p;
-    qd->type = BUNDLE;
-    qd->data.bundle.length = bufSizeNeeded;
-    qd->data.bundle.bytes = p->buf;
+  /* Now fill in the queuedData object */
+  qd->timetag = when;
+  qd->myPacket = p;
+  qd->type = BUNDLE;
+  qd->data.bundle.length = bufSizeNeeded;
+  qd->data.bundle.bytes = p->buf;
 
-    /* Now we can put it into the scheduling queue. */
-    OSCQueueInsert(globals.TheQueue, (OSCSchedulableObject) qd);
+  /* Now we can put it into the scheduling queue. */
+  OSCQueueInsert(globals.TheQueue, (OSCSchedulableObject) qd);
 
-    return TRUE;
+  return TRUE;
 }
 
 Boolean NetworkPacketWaiting(OSCPacketBuffer packet) {
-	NetworkReturnAddressPtr na = OSCPacketBufferGetClientAddr(packet);
+  NetworkReturnAddressPtr na = OSCPacketBufferGetClientAddr(packet);
 #ifndef IS_MINGW
-	int n;
-	if( ioctl( na->sockfd, FIONREAD, &n, 0)==-1) return FALSE;
+  int n;
+  if (ioctl(na->sockfd, FIONREAD, &n, 0)==-1) return FALSE;
 #else
-	long unsigned int n;
-	if( ioctlsocket( na->sockfd, FIONREAD, &n)==-1) return FALSE;
+  long unsigned int n;
+  if (ioctlsocket(na->sockfd, FIONREAD, &n)==-1) return FALSE;
 #endif
-	if( n==0 ) return FALSE;
-	return TRUE;
+  if (n==0) return FALSE;
+  return TRUE;
 }
 
-Boolean NetworkReceivePacket( OSCPacketBuffer packet ) {
-    int n;	
-    NetworkReturnAddressPtr na = OSCPacketBufferGetClientAddr(packet);
-    
-    n = recvfrom( na->sockfd, packet->buf, 100, 0,
-	 (struct sockaddr*) &(na->cl_addr), &(na->clilen));
-	if(n<=0) {
-		return FALSE;
-	}
-    packet->n = n;
-    
-    return TRUE;
-}	 
+Boolean NetworkReceivePacket(OSCPacketBuffer packet) {
+  int n;
+  NetworkReturnAddressPtr na = OSCPacketBufferGetClientAddr(packet);
+
+  n = recvfrom(na->sockfd, packet->buf, 100, 0,
+               (struct sockaddr *) &(na->cl_addr), &(na->clilen));
+  if (n<=0) {
+    return FALSE;
+  }
+  packet->n = n;
+
+  return TRUE;
+}
 
 
 Boolean NetworkStartUDPServer(OSCPacketBuffer packet, int port_id) {
-	struct sockaddr_in my_addr;
-	my_addr.sin_family = AF_INET;
-	my_addr.sin_port = htons(port_id);
-	my_addr.sin_addr.s_addr = INADDR_ANY;
-
-	memset( &(my_addr.sin_zero), 0, 8);
-	
-	packet->returnAddr->sockfd = socket(AF_INET, SOCK_DGRAM, 0);
-	if( bind( packet->returnAddr->sockfd,
-		  (struct sockaddr*) &my_addr,
-		  sizeof(struct sockaddr)) == -1) return FALSE;
-
-	packet->returnAddr->clilen = sizeof(struct sockaddr);
-	return TRUE;
+  struct sockaddr_in my_addr;
+  my_addr.sin_family = AF_INET;
+  my_addr.sin_port = htons(port_id);
+  my_addr.sin_addr.s_addr = INADDR_ANY;
+
+  memset(&(my_addr.sin_zero), 0, 8);
+
+  packet->returnAddr->sockfd = socket(AF_INET, SOCK_DGRAM, 0);
+  if (bind(packet->returnAddr->sockfd,
+           (struct sockaddr *) &my_addr,
+           sizeof(struct sockaddr)) == -1) return FALSE;
+
+  packet->returnAddr->clilen = sizeof(struct sockaddr);
+  return TRUE;
 }

LiVES-2.2.8.tar.bz2/libOSC/OSC-receive.h -> LiVES-2.4.1.tar.bz2/libOSC/OSC-receive.h Changed

LiVES-2.2.8.tar.bz2/libOSC/OSC-string-help.c -> LiVES-2.4.1.tar.bz2/libOSC/OSC-string-help.c Changed

LiVES-2.2.8.tar.bz2/libOSC/OSC-string-help.h -> LiVES-2.4.1.tar.bz2/libOSC/OSC-string-help.h Changed

LiVES-2.2.8.tar.bz2/libOSC/OSC-struct.h -> LiVES-2.4.1.tar.bz2/libOSC/OSC-struct.h Changed

LiVES-2.2.8.tar.bz2/libOSC/OSC-timetag.c -> LiVES-2.4.1.tar.bz2/libOSC/OSC-timetag.c Changed

LiVES-2.2.8.tar.bz2/libOSC/OSC-timetag.h -> LiVES-2.4.1.tar.bz2/libOSC/OSC-timetag.h Changed

LiVES-2.2.8.tar.bz2/libOSC/client/Makefile.am -> LiVES-2.4.1.tar.bz2/libOSC/client/Makefile.am Changed

LiVES-2.2.8.tar.bz2/libOSC/client/Makefile.in -> LiVES-2.4.1.tar.bz2/libOSC/client/Makefile.in Changed

@@ -108,7 +108,35 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-LTLIBRARIES = $(noinst_LTLIBRARIES)
+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__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__installdirs = "$(DESTDIR)$(libdir)"
+LTLIBRARIES = $(lib_LTLIBRARIES)
 libOSC_client_la_LIBADD =
 am__libOSC_client_la_SOURCES_DIST = OSC-client.c OSC-timetag.c
 @ENABLE_OSC_TRUE@am_libOSC_client_la_OBJECTS =  \
@@ -447,10 +475,10 @@
 @IS_MINGW_TRUE@mingw_LDFLAGS = -lws2_32
 OSC_CLIENT_LIB_FILE = libOSC_client.la
 ALL_LIB_OPTS = -export-dynamic
-noinst_LTLIBRARIES = $(OSC_CLIENT_LIB_FILE)
-libOSC_client_la_CFLAGS = -I "$(srcdir)/.." $(DEBUG_CFLAGS) $(mingw_CFLAGS)
+lib_LTLIBRARIES = $(OSC_CLIENT_LIB_FILE)
+libOSC_client_la_CFLAGS = -I "$(srcdir)/.." $(DEBUG_CFLAGS) $(mingw_CFLAGS) -fPIC -DPIC
 @ENABLE_OSC_TRUE@libOSC_client_la_SOURCES = OSC-client.c OSC-timetag.c
-libOSC_client_la_LDFLAGS = $(ALL_LIB_OPTS) -DDYNAMIC -O2 -Wall -rdynamic $(mingw_LDFLAGS)
+libOSC_client_la_LDFLAGS = $(ALL_LIB_OPTS) -DDYNAMIC -O2 -Wall -rdynamic $(mingw_LDFLAGS) -fPIC -DPIC
 all: all-am
 
 .SUFFIXES:
@@ -486,9 +514,33 @@
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
 
-clean-noinstLTLIBRARIES:
-	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-	@list='$(noinst_LTLIBRARIES)'; \
+install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+	@$(NORMAL_INSTALL)
+	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+	list2=; for p in $$list; do \
+	  if test -f $$p; then \
+	    list2="$$list2 $$p"; \
+	  else :; fi; \
+	done; \
+	test -z "$$list2" || { \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
+	}
+
+uninstall-libLTLIBRARIES:
+	@$(NORMAL_UNINSTALL)
+	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+	for p in $$list; do \
+	  $(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
+	done
+
+clean-libLTLIBRARIES:
+	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+	@list='$(lib_LTLIBRARIES)'; \
 	locs=`for p in $$list; do echo $$p; done | \
 	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
 	      sort -u`; \
@@ -498,7 +550,7 @@
 	}
 
 libOSC_client.la: $(libOSC_client_la_OBJECTS) $(libOSC_client_la_DEPENDENCIES) $(EXTRA_libOSC_client_la_DEPENDENCIES) 
-	$(AM_V_CCLD)$(libOSC_client_la_LINK)  $(libOSC_client_la_OBJECTS) $(libOSC_client_la_LIBADD) $(LIBS)
+	$(AM_V_CCLD)$(libOSC_client_la_LINK) -rpath $(libdir) $(libOSC_client_la_OBJECTS) $(libOSC_client_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
@@ -636,6 +688,9 @@
 check: check-am
 all-am: Makefile $(LTLIBRARIES)
 installdirs:
+	for dir in "$(DESTDIR)$(libdir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
 install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
@@ -668,7 +723,7 @@
 	@echo "it deletes files that may require special tools to rebuild."
 clean: clean-am
 
-clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
+clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
 	mostlyclean-am
 
 distclean: distclean-am
@@ -695,7 +750,7 @@
 
 install-dvi-am:
 
-install-exec-am:
+install-exec-am: install-libLTLIBRARIES
 
 install-html: install-html-am
 
@@ -735,23 +790,23 @@
 
 ps-am:
 
-uninstall-am:
+uninstall-am: uninstall-libLTLIBRARIES
 
 .MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS TAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-noinstLTLIBRARIES cscopelist-am ctags \
+	clean-libLTLIBRARIES clean-libtool cscopelist-am ctags \
 	ctags-am distclean distclean-compile distclean-generic \
 	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
 	install-data-am install-dvi install-dvi-am install-exec \
 	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
+	install-info-am install-libLTLIBRARIES install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags tags-am uninstall uninstall-am
+	tags tags-am uninstall uninstall-am uninstall-libLTLIBRARIES
 
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.

LiVES-2.2.8.tar.bz2/libOSC/client/OSC-client.c -> LiVES-2.4.1.tar.bz2/libOSC/client/OSC-client.c Changed

@@ -1,7 +1,7 @@
 /*
 Written by Matt Wright, The Center for New Music and Audio Technologies,
 University of California, Berkeley.  Copyright (c) 1996,97,98,99,2000,01,02,03
-The Regents of the University of California (Regents).  
+The Regents of the University of California (Regents).
 
 Permission to use, copy, modify, distribute, and distribute modified versions
 of this software and its documentation without fee and without a signed
@@ -22,12 +22,12 @@
 */
 
 
-/* 
+/*
   Author: Matt Wright
   Version 2.2: Calls htonl in the right places 20000620
   Version 2.3: Gets typed messages right.
   Version 2.4: 031215: (re)added ChangeOutermostTimestamp(), htonl() OSX kludge
-  
+
  */
 
 
@@ -55,7 +55,7 @@
 #define htonl(x) (x)
 #else
 #include <arpa/inet.h>
-#endif 
+#endif
 
 #endif
 
@@ -70,56 +70,56 @@
 static int CheckTypeTag(OSCbuf *buf, char expectedType);
 
 void OSC_initBuffer(OSCbuf *buf, int size, char *byteArray) {
-    buf->buffer = byteArray;
-    buf->size = size;
-    OSC_resetBuffer(buf);
+  buf->buffer = byteArray;
+  buf->size = size;
+  OSC_resetBuffer(buf);
 }
 
-void OSC_resetBuffer(OSCbuf *buf) {	
-    buf->bufptr = buf->buffer;
-    buf->state = EMPTY;
-    buf->bundleDepth = 0;
-    buf->prevCounts[0] = 0;
-	buf->outerMostTimeStamp = 0;
-    buf->gettingFirstUntypedArg = 0;
-    buf->typeStringPtr = 0;
+void OSC_resetBuffer(OSCbuf *buf) {
+  buf->bufptr = buf->buffer;
+  buf->state = EMPTY;
+  buf->bundleDepth = 0;
+  buf->prevCounts[0] = 0;
+  buf->outerMostTimeStamp = 0;
+  buf->gettingFirstUntypedArg = 0;
+  buf->typeStringPtr = 0;
 }
 
 int OSC_isBufferEmpty(OSCbuf *buf) {
-    return buf->bufptr == buf->buffer;
+  return buf->bufptr == buf->buffer;
 }
 
 int OSC_freeSpaceInBuffer(OSCbuf *buf) {
-    return buf->size - (buf->bufptr - buf->buffer);
+  return buf->size - (buf->bufptr - buf->buffer);
 }
 
 int OSC_isBufferDone(OSCbuf *buf) {
-    return (buf->state == DONE || buf->state == ONE_MSG_ARGS);
+  return (buf->state == DONE || buf->state == ONE_MSG_ARGS);
 }
 
 char *OSC_getPacket(OSCbuf *buf) {
 #ifdef ERROR_CHECK_GETPACKET
-    if (buf->state == DONE || buf->state == ONE_MSG_ARGS) {
-	return buf->buffer;
-    } else {
-	OSC_errorMessage = "Packet has unterminated bundles";
-	return 0;
-    }
-#else
+  if (buf->state == DONE || buf->state == ONE_MSG_ARGS) {
     return buf->buffer;
+  } else {
+    OSC_errorMessage = "Packet has unterminated bundles";
+    return 0;
+  }
+#else
+  return buf->buffer;
 #endif
 }
 
 int OSC_packetSize(OSCbuf *buf) {
 #ifdef ERROR_CHECK_PACKETSIZE
-    if (buf->state == DONE || buf->state == ONE_MSG_ARGS) {
-	return (buf->bufptr - buf->buffer);
-    } else {
-        OSC_errorMessage = "Packet has unterminated bundles";
-        return 0;
-    }
-#else
+  if (buf->state == DONE || buf->state == ONE_MSG_ARGS) {
     return (buf->bufptr - buf->buffer);
+  } else {
+    OSC_errorMessage = "Packet has unterminated bundles";
+    return 0;
+  }
+#else
+  return (buf->bufptr - buf->buffer);
 #endif
 }
 
@@ -131,300 +131,301 @@
 }
 
 static void PatchMessageSize(OSCbuf *buf) {
-    int4byte size;
-    size = buf->bufptr - ((char *) buf->thisMsgSize) - 4;
-    *(buf->thisMsgSize) = htonl(size);
+  int4byte size;
+  size = buf->bufptr - ((char *) buf->thisMsgSize) - 4;
+  *(buf->thisMsgSize) = htonl(size);
 }
 
 int OSC_openBundle(OSCbuf *buf, OSCTimeTag tt) {
-    if (buf->state == ONE_MSG_ARGS) {
-	OSC_errorMessage = "Can't open a bundle in a one-message packet";
-	return 3;
-    }
+  if (buf->state == ONE_MSG_ARGS) {
+    OSC_errorMessage = "Can't open a bundle in a one-message packet";
+    return 3;
+  }
+
+  if (buf->state == DONE) {
+    OSC_errorMessage = "This packet is finished; can't open a new bundle";
+    return 4;
+  }
+
+  if (++(buf->bundleDepth) >= MAX_BUNDLE_NESTING) {
+    OSC_errorMessage = "Bundles nested too deeply; change MAX_BUNDLE_NESTING in OpenSoundControl.h";
+    return 2;
+  }
+
+  if (CheckTypeTag(buf, '\0')) return 9;
+
+  if (buf->state == GET_ARGS) {
+    PatchMessageSize(buf);
+  }
+
+  if (buf->state == EMPTY) {
+    /* Need 16 bytes for "#bundle" and time tag */
+    CheckOverflow(buf, 16);
+  } else {
+    /* This bundle is inside another bundle, so we need to leave
+       a blank size count for the size of this current bundle. */
+    CheckOverflow(buf, 20);
+    *((int4byte *)buf->bufptr) = 0xaaaaaaaa;
+    buf->prevCounts[buf->bundleDepth] = (int4byte *)buf->bufptr;
 
-    if (buf->state == DONE) {
-	OSC_errorMessage = "This packet is finished; can't open a new bundle";
-	return 4;
-    }
-
-    if (++(buf->bundleDepth) >= MAX_BUNDLE_NESTING) {
-	OSC_errorMessage = "Bundles nested too deeply; change MAX_BUNDLE_NESTING in OpenSoundControl.h";
-	return 2;
-    }
-
-    if (CheckTypeTag(buf, '\0')) return 9;
-
-    if (buf->state == GET_ARGS) {
-	PatchMessageSize(buf);
-    }
+    buf->bufptr += 4;
+  }
 
-    if (buf->state == EMPTY) {
-	/* Need 16 bytes for "#bundle" and time tag */
-	CheckOverflow(buf, 16);
-    } else {
-	/* This bundle is inside another bundle, so we need to leave
-	   a blank size count for the size of this current bundle. */
-	CheckOverflow(buf, 20);
-	*((int4byte *)buf->bufptr) = 0xaaaaaaaa;
-        buf->prevCounts[buf->bundleDepth] = (int4byte *)buf->bufptr;
-
-	buf->bufptr += 4;
-    }
+  buf->bufptr += OSC_padString(buf->bufptr, "#bundle");
 
-    buf->bufptr += OSC_padString(buf->bufptr, "#bundle");
 
+  *((OSCTimeTag *) buf->bufptr) = tt;
+  if (buf->state == EMPTY) {
+    buf->outerMostTimeStamp = (OSCTimeTag *) buf->bufptr;
+  }
 
-    *((OSCTimeTag *) buf->bufptr) = tt;
-    if (buf->state == EMPTY) {
-    	    buf->outerMostTimeStamp = (OSCTimeTag *) buf->bufptr;
-    }
 
-
-    if (htonl(1) != 1) {
-		/* Byte swap the 8-byte integer time tag */
-		int4byte *intp = (int4byte *)buf->bufptr;
-		intp[0] = htonl(intp[0]);
-		intp[1] = htonl(intp[1]);
+  if (htonl(1) != 1) {
+    /* Byte swap the 8-byte integer time tag */
+    int4byte *intp = (int4byte *)buf->bufptr;
+    intp[0] = htonl(intp[0]);
+    intp[1] = htonl(intp[1]);
 
 #ifdef HAS8BYTEINT
-		{ /* tt is a 64-bit int so we have to swap the two 32-bit words. 
-	    	(Otherwise tt is a struct of two 32-bit words, and even though
-	    	 each word was wrong-endian, they were in the right order
-	    	 in the struct.) */
-	    	int4byte temp = intp[0];
-	    	intp[0] = intp[1];
-	    	intp[1] = temp;
-		}
-#endif
+    {
+      /* tt is a 64-bit int so we have to swap the two 32-bit words.
+      	(Otherwise tt is a struct of two 32-bit words, and even though
+      	 each word was wrong-endian, they were in the right order
+      	 in the struct.) */
+      int4byte temp = intp[0];
+      intp[0] = intp[1];
+      intp[1] = temp;
     }
+#endif
+  }
 
-    buf->bufptr += sizeof(OSCTimeTag);
+  buf->bufptr += sizeof(OSCTimeTag);
 
-    buf->state = NEED_COUNT;
+  buf->state = NEED_COUNT;
 
-    buf->gettingFirstUntypedArg = 0;
-    buf->typeStringPtr = 0;
-    return 0;
+  buf->gettingFirstUntypedArg = 0;
+  buf->typeStringPtr = 0;
+  return 0;
 }
 
 
 
 int ChangeOutermostTimestamp(OSCbuf *buf, OSCTimeTag tt) {
-	if (buf->outerMostTimeStamp == 0) {
-		OSC_errorMessage = "No outermost timestamp to change.";
-		return 1;
-	} else {
-		*(buf->outerMostTimeStamp) = tt;
-		return 0;
-	}
+  if (buf->outerMostTimeStamp == 0) {
+    OSC_errorMessage = "No outermost timestamp to change.";
+    return 1;
+  } else {
+    *(buf->outerMostTimeStamp) = tt;
+    return 0;
+  }
 }
 
 
 int OSC_closeBundle(OSCbuf *buf) {
-    if (buf->bundleDepth == 0) {
-	/* This handles EMPTY, ONE_MSG, ARGS, and DONE */
-	OSC_errorMessage = "Can't close bundle; no bundle is open!";
-	return 5;
-    }
-
-    if (CheckTypeTag(buf, '\0')) return 9;
-
-    if (buf->state == GET_ARGS) {
-        PatchMessageSize(buf);
-    }
-
-    if (buf->bundleDepth == 1) {
-	/* Closing the last bundle: No bundle size to patch */
-	buf->state = DONE;
-    } else {
-	/* Closing a sub-bundle: patch bundle size */
-	int size = buf->bufptr - ((char *) buf->prevCounts[buf->bundleDepth]) - 4;
-	*(buf->prevCounts[buf->bundleDepth]) = htonl(size);
-	buf->state = NEED_COUNT;
-    }
+  if (buf->bundleDepth == 0) {
+    /* This handles EMPTY, ONE_MSG, ARGS, and DONE */
+    OSC_errorMessage = "Can't close bundle; no bundle is open!";
+    return 5;
+  }
+
+  if (CheckTypeTag(buf, '\0')) return 9;
+
+  if (buf->state == GET_ARGS) {
+    PatchMessageSize(buf);
+  }
+
+  if (buf->bundleDepth == 1) {
+    /* Closing the last bundle: No bundle size to patch */
+    buf->state = DONE;
+  } else {
+    /* Closing a sub-bundle: patch bundle size */
+    int size = buf->bufptr - ((char *) buf->prevCounts[buf->bundleDepth]) - 4;
+    *(buf->prevCounts[buf->bundleDepth]) = htonl(size);
+    buf->state = NEED_COUNT;
+  }
 
-    --buf->bundleDepth;
-    buf->gettingFirstUntypedArg = 0;
-    buf->typeStringPtr = 0;
-    return 0;
+  --buf->bundleDepth;
+  buf->gettingFirstUntypedArg = 0;
+  buf->typeStringPtr = 0;
+  return 0;
 }
 
 
 int OSC_closeAllBundles(OSCbuf *buf) {
-    if (buf->bundleDepth == 0) {
-        /* This handles EMPTY, ONE_MSG, ARGS, and DONE */
-        OSC_errorMessage = "Can't close all bundles; no bundle is open!";
-        return 6;
-    }
-
-    if (CheckTypeTag(buf, '\0')) return 9;
-
-    while (buf->bundleDepth > 0) {
-	OSC_closeBundle(buf);
-    }
-    buf->typeStringPtr = 0;
-    return 0;
+  if (buf->bundleDepth == 0) {
+    /* This handles EMPTY, ONE_MSG, ARGS, and DONE */
+    OSC_errorMessage = "Can't close all bundles; no bundle is open!";
+    return 6;
+  }
+
+  if (CheckTypeTag(buf, '\0')) return 9;
+
+  while (buf->bundleDepth > 0) {
+    OSC_closeBundle(buf);
+  }
+  buf->typeStringPtr = 0;
+  return 0;
 }
 
 int OSC_writeAddress(OSCbuf *buf, char *name) {
-    int4byte paddedLength;
+  int4byte paddedLength;
 
-    if (buf->state == ONE_MSG_ARGS) {
-	OSC_errorMessage = "This packet is not a bundle, so you can't write another address";
-	return 7;
-    }
+  if (buf->state == ONE_MSG_ARGS) {
+    OSC_errorMessage = "This packet is not a bundle, so you can't write another address";
+    return 7;
+  }
 
-    if (buf->state == DONE) {
-        OSC_errorMessage = "This packet is finished; can't write another address";
-        return 8;
-    }
+  if (buf->state == DONE) {
+    OSC_errorMessage = "This packet is finished; can't write another address";
+    return 8;
+  }
+
+  if (CheckTypeTag(buf, '\0')) return 9;
+
+  paddedLength = OSC_effectiveStringLength(name);
 
-    if (CheckTypeTag(buf, '\0')) return 9;
-
-    paddedLength = OSC_effectiveStringLength(name);
-
-    if (buf->state == EMPTY) {
-	/* This will be a one-message packet, so no sizes to worry about */
-	CheckOverflow(buf, paddedLength);
-	buf->state = ONE_MSG_ARGS;
-    } else {
-	/* GET_ARGS or NEED_COUNT */
-	CheckOverflow(buf, 4+paddedLength);
-	if (buf->state == GET_ARGS) {
-	    /* Close the old message */
-	    PatchMessageSize(buf);
-	}
-	buf->thisMsgSize = (int4byte *)buf->bufptr;
-	*(buf->thisMsgSize) = 0xbbbbbbbb;
-	buf->bufptr += 4;
-	buf->state = GET_ARGS;
+  if (buf->state == EMPTY) {
+    /* This will be a one-message packet, so no sizes to worry about */
+    CheckOverflow(buf, paddedLength);
+    buf->state = ONE_MSG_ARGS;
+  } else {
+    /* GET_ARGS or NEED_COUNT */
+    CheckOverflow(buf, 4+paddedLength);
+    if (buf->state == GET_ARGS) {
+      /* Close the old message */
+      PatchMessageSize(buf);
     }
+    buf->thisMsgSize = (int4byte *)buf->bufptr;
+    *(buf->thisMsgSize) = 0xbbbbbbbb;
+    buf->bufptr += 4;
+    buf->state = GET_ARGS;
+  }
 
-    /* Now write the name */
-    buf->bufptr += OSC_padString(buf->bufptr, name);
-    buf->typeStringPtr = 0;
-    buf->gettingFirstUntypedArg = 1;
+  /* Now write the name */
+  buf->bufptr += OSC_padString(buf->bufptr, name);
+  buf->typeStringPtr = 0;
+  buf->gettingFirstUntypedArg = 1;
 
-    return 0;
+  return 0;
 }
 
 int OSC_writeAddressAndTypes(OSCbuf *buf, char *name, char *types) {
-    int result;
-    int4byte paddedLength;
+  int result;
+  int4byte paddedLength;
 
-    if (CheckTypeTag(buf, '\0')) return 9;
+  if (CheckTypeTag(buf, '\0')) return 9;
 
-    result = OSC_writeAddress(buf, name);
+  result = OSC_writeAddress(buf, name);
 
-    if (result) return result;
+  if (result) return result;
 
-    paddedLength = OSC_effectiveStringLength(types);
+  paddedLength = OSC_effectiveStringLength(types);
 
-    CheckOverflow(buf, paddedLength);    
+  CheckOverflow(buf, paddedLength);
 
-    buf->typeStringPtr = buf->bufptr + 1; /* skip comma */
-    buf->bufptr += OSC_padString(buf->bufptr, types);
+  buf->typeStringPtr = buf->bufptr + 1; /* skip comma */
+  buf->bufptr += OSC_padString(buf->bufptr, types);
 
-    buf->gettingFirstUntypedArg = 0;
-    return 0;
+  buf->gettingFirstUntypedArg = 0;
+  return 0;
 }
 
 static int CheckTypeTag(OSCbuf *buf, char expectedType) {
-    if (buf->typeStringPtr) {
-	if (*(buf->typeStringPtr) != expectedType) {
-	    if (expectedType == '\0') {
-		OSC_errorMessage =
-		    "According to the type tag I expected more arguments.";
-	    } else if (*(buf->typeStringPtr) == '\0') {
-		OSC_errorMessage =
-		    "According to the type tag I didn't expect any more arguments.";
-	    } else {
-		OSC_errorMessage =
-		    "According to the type tag I expected an argument of a different type.";
-		/* printf("* Expected %c, string now %s\n", expectedType, buf->typeStringPtr); */
-	    }
-	    return 9; 
-	}
-	++(buf->typeStringPtr);
+  if (buf->typeStringPtr) {
+    if (*(buf->typeStringPtr) != expectedType) {
+      if (expectedType == '\0') {
+        OSC_errorMessage =
+          "According to the type tag I expected more arguments.";
+      } else if (*(buf->typeStringPtr) == '\0') {
+        OSC_errorMessage =
+          "According to the type tag I didn't expect any more arguments.";
+      } else {
+        OSC_errorMessage =
+          "According to the type tag I expected an argument of a different type.";
+        /* printf("* Expected %c, string now %s\n", expectedType, buf->typeStringPtr); */
+      }
+      return 9;
     }
-    return 0;
+    ++(buf->typeStringPtr);
+  }
+  return 0;
 }
 
 
 int OSC_writeFloatArg(OSCbuf *buf, float arg) {
-    int4byte *intp;
+  int4byte *intp;
 
-    CheckOverflow(buf, 4);
+  CheckOverflow(buf, 4);
 
-    if (CheckTypeTag(buf, 'f')) return 9;
+  if (CheckTypeTag(buf, 'f')) return 9;
 
-    /* Pretend arg is a long int so we can use htonl() */
-    intp = ((int4byte *) &arg);
-    *((int4byte *) buf->bufptr) = htonl(*intp);
+  /* Pretend arg is a long int so we can use htonl() */
+  intp = ((int4byte *) &arg);
+  *((int4byte *) buf->bufptr) = htonl(*intp);
 
-    buf->bufptr += 4;
+  buf->bufptr += 4;
 
-    buf->gettingFirstUntypedArg = 0;
-    return 0;
+  buf->gettingFirstUntypedArg = 0;
+  return 0;
 }
 
 
 
 int OSC_writeFloatArgs(OSCbuf *buf, int numFloats, float *args) {
-    int i;
-    int4byte *intp;
+  int i;
+  int4byte *intp;
 
-    CheckOverflow(buf, 4 * numFloats);
+  CheckOverflow(buf, 4 * numFloats);
 
-    /* Pretend args are long ints so we can use htonl() */
-    intp = ((int4byte *) args);
+  /* Pretend args are long ints so we can use htonl() */
+  intp = ((int4byte *) args);
 
-    for (i = 0; i < numFloats; i++) {
-	if (CheckTypeTag(buf, 'f')) return 9;
-	*((int4byte *) buf->bufptr) = htonl(intp[i]);
-	buf->bufptr += 4;
-    }
+  for (i = 0; i < numFloats; i++) {
+    if (CheckTypeTag(buf, 'f')) return 9;
+    *((int4byte *) buf->bufptr) = htonl(intp[i]);
+    buf->bufptr += 4;
+  }
 
-    buf->gettingFirstUntypedArg = 0;
-    return 0;
+  buf->gettingFirstUntypedArg = 0;
+  return 0;
 }
 
 int OSC_writeIntArg(OSCbuf *buf, int4byte arg) {
-    CheckOverflow(buf, 4);
+  CheckOverflow(buf, 4);
 
-    if (CheckTypeTag(buf, 'i')) return 9;
+  if (CheckTypeTag(buf, 'i')) return 9;
 
-    *((int4byte *) buf->bufptr) = htonl(arg);
-    buf->bufptr += 4;
+  *((int4byte *) buf->bufptr) = htonl(arg);
+  buf->bufptr += 4;
 
-    buf->gettingFirstUntypedArg = 0;
-    return 0;
+  buf->gettingFirstUntypedArg = 0;
+  return 0;
 }
 
 int OSC_writeStringArg(OSCbuf *buf, char *arg) {
-    int len;
+  int len;
 
-    if (CheckTypeTag(buf, 's')) return 9;
+  if (CheckTypeTag(buf, 's')) return 9;
 
-    len = OSC_effectiveStringLength(arg);
+  len = OSC_effectiveStringLength(arg);
 
-    if (buf->gettingFirstUntypedArg && arg[0] == ',') {
-	/* This un-type-tagged message starts with a string
-	   that starts with a comma, so we have to escape it
-	   (with a double comma) so it won't look like a type
-	   tag string. */
+  if (buf->gettingFirstUntypedArg && arg[0] == ',') {
+    /* This un-type-tagged message starts with a string
+       that starts with a comma, so we have to escape it
+       (with a double comma) so it won't look like a type
+       tag string. */
 
-	CheckOverflow(buf, len+4); /* Too conservative */
-	buf->bufptr += 
-	    OSC_padStringWithAnExtraStupidComma(buf->bufptr, arg);
+    CheckOverflow(buf, len+4); /* Too conservative */
+    buf->bufptr +=
+      OSC_padStringWithAnExtraStupidComma(buf->bufptr, arg);
 
-    } else {
-	CheckOverflow(buf, len);
-	buf->bufptr += OSC_padString(buf->bufptr, arg);
-    }
+  } else {
+    CheckOverflow(buf, len);
+    buf->bufptr += OSC_padString(buf->bufptr, arg);
+  }
 
-    buf->gettingFirstUntypedArg = 0;
-    return 0;
+  buf->gettingFirstUntypedArg = 0;
+  return 0;
 
 }
 
@@ -433,43 +434,43 @@
 
 #define STRING_ALIGN_PAD 4
 int OSC_effectiveStringLength(char *string) {
-    int len = strlen(string) + 1;  /* We need space for the null char. */
-    
-    /* Round up len to next multiple of STRING_ALIGN_PAD to account for alignment padding */
-    if ((len % STRING_ALIGN_PAD) != 0) {
-        len += STRING_ALIGN_PAD - (len % STRING_ALIGN_PAD);
-    }
-    return len;
+  int len = strlen(string) + 1;  /* We need space for the null char. */
+
+  /* Round up len to next multiple of STRING_ALIGN_PAD to account for alignment padding */
+  if ((len % STRING_ALIGN_PAD) != 0) {
+    len += STRING_ALIGN_PAD - (len % STRING_ALIGN_PAD);
+  }
+  return len;
 }
 
 static int OSC_padString(char *dest, char *str) {
-    int i;
-    
-    for (i = 0; str[i] != '\0'; i++) {
-        dest[i] = str[i];
-    }
-    
-    return OSC_WritePadding(dest, i);
+  int i;
+
+  for (i = 0; str[i] != '\0'; i++) {
+    dest[i] = str[i];
+  }
+
+  return OSC_WritePadding(dest, i);
 }
 
 static int OSC_padStringWithAnExtraStupidComma(char *dest, char *str) {
-    int i;
-    
-    dest[0] = ',';
-    for (i = 0; str[i] != '\0'; i++) {
-        dest[i+1] = str[i];
-    }
+  int i;
+
+  dest[0] = ',';
+  for (i = 0; str[i] != '\0'; i++) {
+    dest[i+1] = str[i];
+  }
 
-    return OSC_WritePadding(dest, i+1);
+  return OSC_WritePadding(dest, i+1);
 }
- 
+
 static int OSC_WritePadding(char *dest, int i) {
-    dest[i] = '\0';
-    i++;
+  dest[i] = '\0';
+  i++;
 
-    for (; (i % STRING_ALIGN_PAD) != 0; i++) {
-	dest[i] = '\0';
-    }
+  for (; (i % STRING_ALIGN_PAD) != 0; i++) {
+    dest[i] = '\0';
+  }
 
-    return i;
+  return i;
 }

LiVES-2.2.8.tar.bz2/libOSC/client/OSC-timetag.c -> LiVES-2.4.1.tar.bz2/libOSC/client/OSC-timetag.c Changed

LiVES-2.2.8.tar.bz2/libOSC/libosc.h -> LiVES-2.4.1.tar.bz2/libOSC/libosc.h Changed

LiVES-2.2.8.tar.bz2/libOSC/sendOSC/Makefile.am -> LiVES-2.4.1.tar.bz2/libOSC/sendOSC/Makefile.am Changed

LiVES-2.2.8.tar.bz2/libOSC/sendOSC/Makefile.in -> LiVES-2.4.1.tar.bz2/libOSC/sendOSC/Makefile.in Changed

@@ -447,7 +447,7 @@
 @ENABLE_OSC_TRUE@sendOSC = sendOSC
 @ENABLE_OSC_TRUE@LIBOSCDIR = ../client
 @ENABLE_OSC_TRUE@sendOSCdir = $(bindir)
-@ENABLE_OSC_TRUE@sendOSC_LDFLAGS = -L$(LIBOSCDIR) -lOSC_client $(mingw_LIBFLAGS)
+@ENABLE_OSC_TRUE@sendOSC_LDFLAGS = $(mingw_LIBFLAGS) $(top_builddir)/libOSC/client/.libs/libOSC_client.a
 @ENABLE_OSC_TRUE@sendOSC_CFLAGS = -I.. $(mingw_CFLAGS)
 @ENABLE_OSC_TRUE@sendOSC_SOURCES = htmsocket.c htmsocket.h sendOSC.c
 all: all-am
@@ -691,7 +691,7 @@
 	for dir in "$(DESTDIR)$(sendOSCdir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
-@ENABLE_OSC_FALSE@install: install-am
+install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
 uninstall: uninstall-am
@@ -721,6 +721,7 @@
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
+@ENABLE_OSC_FALSE@install-exec-local:
 clean: clean-am
 
 clean-am: clean-generic clean-libtool clean-sendOSCPROGRAMS \
@@ -750,7 +751,7 @@
 
 install-dvi-am:
 
-install-exec-am:
+install-exec-am: install-exec-local
 
 install-html: install-html-am
 
@@ -800,22 +801,19 @@
 	distclean-libtool distclean-tags distdir dvi dvi-am html \
 	html-am info info-am install install-am install-data \
 	install-data-am install-dvi install-dvi-am install-exec \
-	install-exec-am install-html install-html-am install-info \
-	install-info-am install-man install-pdf install-pdf-am \
-	install-ps install-ps-am install-sendOSCPROGRAMS install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
+	install-exec-am install-exec-local install-html \
+	install-html-am install-info install-info-am install-man \
+	install-pdf install-pdf-am install-ps install-ps-am \
+	install-sendOSCPROGRAMS install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	tags tags-am uninstall uninstall-am uninstall-sendOSCPROGRAMS
 
 
-@ENABLE_OSC_TRUE@install:
-@ENABLE_OSC_TRUE@	if ! test -f "$(bindir)/$(sendOSC)"; then \
-@ENABLE_OSC_TRUE@		if ! test -z $(bindir); then \
-@ENABLE_OSC_TRUE@			$(MKDIR_P) -- . "$(DESTDIR)$(bindir)"; \
-@ENABLE_OSC_TRUE@		fi; \
-@ENABLE_OSC_TRUE@		$(INSTALL_PROGRAM) $(sendOSC) "$(DESTDIR)$(bindir)"; \
-@ENABLE_OSC_TRUE@	fi
+@ENABLE_OSC_TRUE@install-exec-local:
+@ENABLE_OSC_TRUE@	$(MKDIR_P) "$(DESTDIR)$(bindir)"
+@ENABLE_OSC_TRUE@	cp -f $(sendOSC) "$(DESTDIR)$(bindir)" && chmod a+rx "$(DESTDIR)$(bindir)/$(sendOSC)"
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

LiVES-2.2.8.tar.bz2/libOSC/sendOSC/htmsocket.c -> LiVES-2.4.1.tar.bz2/libOSC/sendOSC/htmsocket.c Changed

@@ -1,7 +1,7 @@
 /*
 Written by Adrian Freed, The Center for New Music and Audio Technologies,
 University of California, Berkeley.  Copyright (c) 1992,93,94,95,96,97,98,99,2000,01,02,03,04
-The Regents of the University of California (Regents).  
+The Regents of the University of California (Regents).
 
 Permission to use, copy, modify, distribute, and distribute modified versions
 of this software and its documentation without fee and without a signed
@@ -24,14 +24,14 @@
 The OSC webpage is http://cnmat.cnmat.berkeley.edu/OpenSoundControl
 */
 
- /* htmsocket.c
+/* htmsocket.c
 
-	Adrian Freed
- 	send parameters to htm servers by udp or UNIX protocol
+Adrian Freed
+	send parameters to htm servers by udp or UNIX protocol
 
-    Modified 6/6/96 by Matt Wright to understand symbolic host names
-    in addition to X.X.X.X addresses.
- */
+   Modified 6/6/96 by Matt Wright to understand symbolic host names
+   in addition to X.X.X.X addresses.
+*/
 
 
 #include <stdio.h>
@@ -66,8 +66,7 @@
 
 #define _S_IREAD 256
 #define _S_IWRITE 128
-int mkstemp(char *tmpl)
-{
+int mkstemp(char *tmpl) {
   int ret=-1;
   mktemp(tmpl);
   ret=open(tmpl,O_RDWR|O_BINARY|O_CREAT|O_EXCL|_O_SHORT_LIVED, _S_IREAD|_S_IWRITE);
@@ -92,11 +91,10 @@
 
 #define UNIXDG_PATH "/tmp/htm"
 #define UNIXDG_TMP "/tmp/htm.XXXXXX"
-#include "htmsocket.h"                          
+#include "htmsocket.h"
 
 
-typedef struct
-{
+typedef struct {
   float srate;
 
   struct sockaddr_in serv_addr; /* udp socket */
@@ -122,156 +120,142 @@
 #endif
   desc *o;
   o = malloc(sizeof(*o));
-  if(!o)
+  if (!o)
     return 0;
 #ifdef IS_MINGW
   if (!host) host="localhost";
 #else
-  if(!host)
-    {
-      int clilen;
-      o->len = sizeof(ucl_addr);
-      /*
-       * Fill in the structure "userv_addr" with the address of the
-       * server that we want to send to.
-       */
-		
-      memset((char *) &o->userv_addr, 0, sizeof(o->userv_addr));
-      o->userv_addr.sun_family = AF_UNIX;
-      strcpy(o->userv_addr.sun_path, UNIXDG_PATH);
-      sprintf(o->userv_addr.sun_path+strlen(o->userv_addr.sun_path), "%d", portnumber);
-      o->uservlen = sizeof(o->userv_addr.sun_family) + strlen(o->userv_addr.sun_path);
-      o->addr = &(o->userv_addr);
-      /*
-       * Open a socket (a UNIX domain datagram socket).
-       */
-		
-      if ( (sockfd = socket(AF_UNIX, SOCK_DGRAM, 0)) >= 0)
-	{
-	  /*
-	   * Bind a local address for us.
-	   * In the UNIX domain we have to choose our own name (that
-	   * should be unique).  We'll use mktemp() to create a unique
-	   * pathname, based on our process id.
-	   */
-	  int dummy;
-
-	  memset((char *) &ucl_addr, 0, sizeof(ucl_addr));    /* zero out */
-	  ucl_addr.sun_family = AF_UNIX;
-	  strcpy(ucl_addr.sun_path, UNIXDG_TMP);
-
-	  dummy=mkstemp(ucl_addr.sun_path);
-	  dummy=dummy;
-	  clilen = sizeof(ucl_addr.sun_family) + strlen(ucl_addr.sun_path);
-		
-	  if (bind(sockfd, (struct sockaddr *) &ucl_addr, clilen) < 0)
-	    {
-	      perror("client: can't bind local address");
-	      close(sockfd);
-	      sockfd = -1;
-	    }
-	}
-      else
-	perror("unable to make socket\n");
-
-    }else
-    {
-#endif
+  if (!host) {
+    int clilen;
+    o->len = sizeof(ucl_addr);
+    /*
+     * Fill in the structure "userv_addr" with the address of the
+     * server that we want to send to.
+     */
+
+    memset((char *) &o->userv_addr, 0, sizeof(o->userv_addr));
+    o->userv_addr.sun_family = AF_UNIX;
+    strcpy(o->userv_addr.sun_path, UNIXDG_PATH);
+    sprintf(o->userv_addr.sun_path+strlen(o->userv_addr.sun_path), "%d", portnumber);
+    o->uservlen = sizeof(o->userv_addr.sun_family) + strlen(o->userv_addr.sun_path);
+    o->addr = &(o->userv_addr);
+    /*
+     * Open a socket (a UNIX domain datagram socket).
+     */
+
+    if ((sockfd = socket(AF_UNIX, SOCK_DGRAM, 0)) >= 0) {
       /*
-       * Fill in the structure "serv_addr" with the address of the
-       * server that we want to send to.
+       * Bind a local address for us.
+       * In the UNIX domain we have to choose our own name (that
+       * should be unique).  We'll use mktemp() to create a unique
+       * pathname, based on our process id.
        */
-      o->len = sizeof(cl_addr);
-      memset((char *)&o->serv_addr, 0, sizeof(o->serv_addr));
-      o->serv_addr.sin_family = AF_INET;
-
-      /* MW 6/6/96: Call gethostbyname() instead of inet_addr(),
-	 so that host can be either an Internet host name (e.g.,
-	 "les") or an Internet address in standard dot notation 
-	 (e.g., "128.32.122.13") */
-      {
-	struct hostent *hostsEntry;
-	unsigned long address;
-
-	hostsEntry = gethostbyname(host);
-	if (hostsEntry == NULL) {
-	  fprintf(stderr, "Couldn't decipher host name \"%s\"\n",
-		  host);
-	  return 0;
-	}
-		
-	address = *((unsigned long *) hostsEntry->h_addr_list[0]);
-	o->serv_addr.sin_addr.s_addr = address;
-      }
+      int dummy;
 
-      /* was: o->serv_addr.sin_addr.s_addr = inet_addr(host); */
+      memset((char *) &ucl_addr, 0, sizeof(ucl_addr));    /* zero out */
+      ucl_addr.sun_family = AF_UNIX;
+      strcpy(ucl_addr.sun_path, UNIXDG_TMP);
 
-      /* End MW changes */
+      dummy=mkstemp(ucl_addr.sun_path);
+      dummy=dummy;
+      clilen = sizeof(ucl_addr.sun_family) + strlen(ucl_addr.sun_path);
 
-      o->serv_addr.sin_port = htons(portnumber);
-      o->addr = &(o->serv_addr);
-      /*
-       * Open a socket (a UDP domain datagram socket).
-       */
-      if((sockfd = socket(AF_INET, SOCK_DGRAM, 0)) >= 0)
-	{
-	  memset((char *)&cl_addr, 0, sizeof(cl_addr));
-	  cl_addr.sin_family = AF_INET;
-	  cl_addr.sin_addr.s_addr = htonl(INADDR_ANY);
-	  cl_addr.sin_port = htons(0);
-			
-	  if(bind(sockfd, (struct sockaddr *) &cl_addr, sizeof(cl_addr)) < 0)
-	    {
-	      perror("could not bind\n");
-	      close(sockfd);
-	      sockfd = -1;
-	    }
-	}
-      else
-	{
-	  perror("unable to make socket\n");
-	}
-#ifndef IS_MINGW		
-    }
+      if (bind(sockfd, (struct sockaddr *) &ucl_addr, clilen) < 0) {
+        perror("client: can't bind local address");
+        close(sockfd);
+        sockfd = -1;
+      }
+    } else
+      perror("unable to make socket\n");
+
+  } else {
 #endif
-  if(sockfd<0)
-    {
-      free(o); o = 0;
+  /*
+   * Fill in the structure "serv_addr" with the address of the
+   * server that we want to send to.
+   */
+  o->len = sizeof(cl_addr);
+  memset((char *)&o->serv_addr, 0, sizeof(o->serv_addr));
+  o->serv_addr.sin_family = AF_INET;
+
+  /* MW 6/6/96: Call gethostbyname() instead of inet_addr(),
+  so that host can be either an Internet host name (e.g.,
+  "les") or an Internet address in standard dot notation
+  (e.g., "128.32.122.13") */
+  {
+    struct hostent *hostsEntry;
+    unsigned long address;
+
+    hostsEntry = gethostbyname(host);
+    if (hostsEntry == NULL) {
+      fprintf(stderr, "Couldn't decipher host name \"%s\"\n",
+              host);
+      return 0;
     }
-  else
-    o->sockfd = sockfd;
-  return o;
-  //#endif
-    return NULL;
+
+    address = *((unsigned long *) hostsEntry->h_addr_list[0]);
+    o->serv_addr.sin_addr.s_addr = address;
+  }
+
+  /* was: o->serv_addr.sin_addr.s_addr = inet_addr(host); */
+
+  /* End MW changes */
+
+  o->serv_addr.sin_port = htons(portnumber);
+  o->addr = &(o->serv_addr);
+  /*
+   * Open a socket (a UDP domain datagram socket).
+   */
+  if ((sockfd = socket(AF_INET, SOCK_DGRAM, 0)) >= 0) {
+    memset((char *)&cl_addr, 0, sizeof(cl_addr));
+    cl_addr.sin_family = AF_INET;
+    cl_addr.sin_addr.s_addr = htonl(INADDR_ANY);
+    cl_addr.sin_port = htons(0);
+
+    if (bind(sockfd, (struct sockaddr *) &cl_addr, sizeof(cl_addr)) < 0) {
+      perror("could not bind\n");
+      close(sockfd);
+      sockfd = -1;
+    }
+  } else {
+    perror("unable to make socket\n");
+  }
+#ifndef IS_MINGW
+}
+#endif
+if (sockfd<0) {
+  free(o);
+  o = 0;
+} else
+  o->sockfd = sockfd;
+return o;
+//#endif
+return NULL;
 }
 
 
 #include <errno.h>
 
-static  bool sendudp(const struct sockaddr *sp, int sockfd,int length, int count, void  *b)
-{
-	int rcount;
-	if((rcount=sendto(sockfd, b, count, 0, sp, length)) != count)
-	{
-/*	printf("sockfd %d count %d rcount %dlength %d errno %d\n", sockfd,count,rcount,length,
-			errno); */
-			return FALSE;
-	}
-	return TRUE;
+static  bool sendudp(const struct sockaddr *sp, int sockfd,int length, int count, void  *b) {
+  int rcount;
+  if ((rcount=sendto(sockfd, b, count, 0, sp, length)) != count) {
+    /*	printf("sockfd %d count %d rcount %dlength %d errno %d\n", sockfd,count,rcount,length,
+    			errno); */
+    return FALSE;
+  }
+  return TRUE;
 }
-bool SendHTMSocket(void *htmsendhandle, int length_in_bytes, void *buffer)
-{
+bool SendHTMSocket(void *htmsendhandle, int length_in_bytes, void *buffer) {
   //#ifndef IS_MINGW
-	desc *o = (desc *)htmsendhandle;
-	return sendudp(o->addr, o->sockfd, o->len, length_in_bytes, buffer);
-	//#endif
-	return FALSE;
+  desc *o = (desc *)htmsendhandle;
+  return sendudp(o->addr, o->sockfd, o->len, length_in_bytes, buffer);
+  //#endif
+  return FALSE;
 }
-void CloseHTMSocket(void *htmsendhandle)
-{
+void CloseHTMSocket(void *htmsendhandle) {
   //#ifndef IS_MINGW
-	desc *o = (desc *)htmsendhandle;
-	close(o->sockfd);
-	free(o);
-	//#endif
+  desc *o = (desc *)htmsendhandle;
+  close(o->sockfd);
+  free(o);
+  //#endif
 }

LiVES-2.2.8.tar.bz2/libOSC/sendOSC/htmsocket.h -> LiVES-2.4.1.tar.bz2/libOSC/sendOSC/htmsocket.h Changed

LiVES-2.2.8.tar.bz2/libOSC/sendOSC/sendOSC.c -> LiVES-2.4.1.tar.bz2/libOSC/sendOSC/sendOSC.c Changed

@@ -1,7 +1,7 @@
 /*
 Written by Matt Wright, The Center for New Music and Audio Technologies,
 University of California, Berkeley.  Copyright (c) 1996,97,98,99,2000,01,02,03
-The Regents of the University of California (Regents).  
+The Regents of the University of California (Regents).
 
 Permission to use, copy, modify, distribute, and distribute modified versions
 of this software and its documentation without fee and without a signed
@@ -66,12 +66,12 @@
 #include <inttypes.h>
 
 typedef struct {
-    enum {INTx, FLOATx, STRINGx} type;
-    union {
-        int i;
-        float f;
-        char *s;
-    } datum;
+  enum {INTx, FLOATx, STRINGx} type;
+  union {
+    int i;
+    float f;
+    char *s;
+  } datum;
 } typedArg;
 
 void CommandLineMode(int argc, char *argv[], void *htmsocket);
@@ -92,7 +92,7 @@
     4: Usage error
     5: Internal error
 */
-static int exitStatus = 0;  
+static int exitStatus = 0;
 
 
 static int useTypeTags = 1;
@@ -112,72 +112,72 @@
   iResult = WSAStartup(MAKEWORD(2,2), &wsaData);
   if (iResult != 0) {
     printf("WSAStartup failed: %d\n", iResult);
-    exit (1);
+    exit(1);
   }
 #endif
 
-    argc--;
-    argv++;
-
-    if (argc == 0) {
-	goto usageerror;
-    }
+  argc--;
+  argv++;
 
-    if (argc >= 1 && (strncmp(*argv, "-notypetags", 2) == 0)) {
-	useTypeTags = 0;
-        argv++;
-	argc--;
-    }
+  if (argc == 0) {
+    goto usageerror;
+  }
 
-    if (argc >= 2 && (strncmp(*argv, "-r", 2) == 0)) {
-	hostname = getenv("REMOTE_ADDR");
-	if (hostname == NULL) {
-	    complain("sendSC -r: REMOTE_ADDR not in environment\n");
-	    exit(4);
-	}
-	argv++;
-	argc--;
-    }
+  if (argc >= 1 && (strncmp(*argv, "-notypetags", 2) == 0)) {
+    useTypeTags = 0;
+    argv++;
+    argc--;
+  }
 
-    if (argc >= 3 && (strncmp(*argv, "-h", 2) == 0)) {
-        hostname = argv[1];
-        argv += 2;
-        argc -= 2;
+  if (argc >= 2 && (strncmp(*argv, "-r", 2) == 0)) {
+    hostname = getenv("REMOTE_ADDR");
+    if (hostname == NULL) {
+      complain("sendSC -r: REMOTE_ADDR not in environment\n");
+      exit(4);
     }
-    portnumber = atoi(*argv);
     argv++;
     argc--;
+  }
 
-    htmsocket = OpenHTMSocket(hostname, portnumber);
-    if (!htmsocket) {
-        perror("Couldn't open socket: ");
-        exit(3);
-    }
+  if (argc >= 3 && (strncmp(*argv, "-h", 2) == 0)) {
+    hostname = argv[1];
+    argv += 2;
+    argc -= 2;
+  }
+  portnumber = atoi(*argv);
+  argv++;
+  argc--;
+
+  htmsocket = OpenHTMSocket(hostname, portnumber);
+  if (!htmsocket) {
+    perror("Couldn't open socket: ");
+    exit(3);
+  }
 
-    if (argc > 0) {
-	printf("host %s, port %d, %s\n", hostname, portnumber,
-	       useTypeTags ? "use type tags" : "don't use type tags");
-        CommandLineMode(argc, argv, htmsocket);
-    } else {
-	printf("sendOSC version " LIBOSC_VERSION "\n");
-	printf("by Matt Wright. Copyright (c) 1996, 1997 Regents of the University of California.\n");
-	printf("host %s, port %d, %s\n", hostname, portnumber,
-	       useTypeTags ? "use type tags" : "don't use type tags");
-        InteractiveMode(htmsocket);
-    }
-    CloseHTMSocket(htmsocket);
+  if (argc > 0) {
+    printf("host %s, port %d, %s\n", hostname, portnumber,
+           useTypeTags ? "use type tags" : "don't use type tags");
+    CommandLineMode(argc, argv, htmsocket);
+  } else {
+    printf("sendOSC version " LIBOSC_VERSION "\n");
+    printf("by Matt Wright. Copyright (c) 1996, 1997 Regents of the University of California.\n");
+    printf("host %s, port %d, %s\n", hostname, portnumber,
+           useTypeTags ? "use type tags" : "don't use type tags");
+    InteractiveMode(htmsocket);
+  }
+  CloseHTMSocket(htmsocket);
 
 #ifdef IS_MINGW
-    WSACleanup();
+  WSACleanup();
 #endif
-    
-    exit(exitStatus);
 
+  exit(exitStatus);
 
-    usageerror:
-	complain("usage: %s [-notypetags] [-r] [-h target_host_name] port_number [message...]\n",
-		 argv[-1]);
-	exit(4);
+
+usageerror:
+  complain("usage: %s [-notypetags] [-r] [-h target_host_name] port_number [message...]\n",
+           argv[-1]);
+  exit(4);
 
 }
 
@@ -187,442 +187,443 @@
 static char bufferForOSCbuf[SC_BUFFER_SIZE];
 
 void CommandLineMode(int argc, char *argv[], void *htmsocket) {
-    char *messageName;
-    char *token;
-    typedArg args[MAX_ARGS];
-    int i,j, numArgs;
-    OSCbuf buf[1];
-
-    OSC_initBuffer(buf, SC_BUFFER_SIZE, bufferForOSCbuf);
-
-    if (argc > 1) {
-	if (OSC_openBundle(buf, OSCTT_Immediately())) {
-	    complain("Problem opening bundle: %s\n", OSC_errorMessage);
-	    return;
-	}
+  char *messageName;
+  char *token;
+  typedArg args[MAX_ARGS];
+  int i,j, numArgs;
+  OSCbuf buf[1];
+
+  OSC_initBuffer(buf, SC_BUFFER_SIZE, bufferForOSCbuf);
+
+  if (argc > 1) {
+    if (OSC_openBundle(buf, OSCTT_Immediately())) {
+      complain("Problem opening bundle: %s\n", OSC_errorMessage);
+      return;
     }
+  }
 
-    for (i = 0; i < argc; i++) {
-        messageName = strtok(argv[i], ",");
-        if (messageName == NULL) {
-            break;
-        }
-
-        j = 0;
-        while ((token = strtok(NULL, ",")) != NULL) {
-            args[j] = ParseToken(token);
-            j++;
-	    if (j >= MAX_ARGS) {
-		complain("Sorry; your message has more than MAX_ARGS (%d) arguments; ignoring the rest.\n",
-			 MAX_ARGS);
-		break;
-	    }
-        }
-        numArgs = j;
+  for (i = 0; i < argc; i++) {
+    messageName = strtok(argv[i], ",");
+    if (messageName == NULL) {
+      break;
+    }
 
-        WriteMessage(buf, messageName, numArgs, args);
+    j = 0;
+    while ((token = strtok(NULL, ",")) != NULL) {
+      args[j] = ParseToken(token);
+      j++;
+      if (j >= MAX_ARGS) {
+        complain("Sorry; your message has more than MAX_ARGS (%d) arguments; ignoring the rest.\n",
+                 MAX_ARGS);
+        break;
+      }
     }
+    numArgs = j;
+
+    WriteMessage(buf, messageName, numArgs, args);
+  }
 
-    if (argc > 1) {
-	if (OSC_closeBundle(buf)) {
-	    complain("Problem closing bundle: %s\n", OSC_errorMessage);
-	    return;
-	}
+  if (argc > 1) {
+    if (OSC_closeBundle(buf)) {
+      complain("Problem closing bundle: %s\n", OSC_errorMessage);
+      return;
     }
+  }
 
-    SendBuffer(htmsocket, buf);
+  SendBuffer(htmsocket, buf);
 }
 
 #define MAXMESG 2048
 
 void InteractiveMode(void *htmsocket) {
-    char mesg[MAXMESG];
-    OSCbuf buf[1];
-    int bundleDepth = 0;    /* At first, we haven't seen "[". */
-
-    OSC_initBuffer(buf, SC_BUFFER_SIZE, bufferForOSCbuf);
-
-    while (fgets(mesg, MAXMESG, stdin) != NULL) {
-        if (mesg[0] == '\n') {
-	  if (bundleDepth > 0) {
-	    /* Ignore blank lines inside a group. */
-	  } else {
-            /* blank line => repeat previous send */
-            SendBuffer(htmsocket, buf);
-	  }
-	  continue;
+  char mesg[MAXMESG];
+  OSCbuf buf[1];
+  int bundleDepth = 0;    /* At first, we haven't seen "[". */
+
+  OSC_initBuffer(buf, SC_BUFFER_SIZE, bufferForOSCbuf);
+
+  while (fgets(mesg, MAXMESG, stdin) != NULL) {
+    if (mesg[0] == '\n') {
+      if (bundleDepth > 0) {
+        /* Ignore blank lines inside a group. */
+      } else {
+        /* blank line => repeat previous send */
+        SendBuffer(htmsocket, buf);
+      }
+      continue;
+    }
+
+    if (bundleDepth == 0) {
+      OSC_resetBuffer(buf);
+    }
+
+    if (mesg[0] == '[') {
+      OSCTimeTag tt = ParseTimeTag(mesg+1);
+      if (OSC_openBundle(buf, tt)) {
+        complain("Problem opening bundle: %s\n", OSC_errorMessage);
+        OSC_resetBuffer(buf);
+        bundleDepth = 0;
+        continue;
+      }
+      bundleDepth++;
+    } else if (mesg[0] == ']' && mesg[1] == '\n' && mesg[2] == '\0') {
+      if (bundleDepth == 0) {
+        complain("Unexpected ']': not currently in a bundle.\n");
+      } else {
+        if (OSC_closeBundle(buf)) {
+          complain("Problem closing bundle: %s\n", OSC_errorMessage);
+          OSC_resetBuffer(buf);
+          bundleDepth = 0;
+          continue;
         }
 
-	if (bundleDepth == 0) {
-	    OSC_resetBuffer(buf);
-	}
-
-	if (mesg[0] == '[') {
-	    OSCTimeTag tt = ParseTimeTag(mesg+1);
-	    if (OSC_openBundle(buf, tt)) {
-		complain("Problem opening bundle: %s\n", OSC_errorMessage);
-		OSC_resetBuffer(buf);
-		bundleDepth = 0;
-		continue;
-	    }
-	    bundleDepth++;
-        } else if (mesg[0] == ']' && mesg[1] == '\n' && mesg[2] == '\0') {
-            if (bundleDepth == 0) {
-                complain("Unexpected ']': not currently in a bundle.\n");
-            } else {
-		if (OSC_closeBundle(buf)) {
-		    complain("Problem closing bundle: %s\n", OSC_errorMessage);
-		    OSC_resetBuffer(buf);
-		    bundleDepth = 0;
-		    continue;
-		}
-
-		bundleDepth--;
-		if (bundleDepth == 0) {
-		    SendBuffer(htmsocket, buf);
-		}
-            }
-        } else {
-            ParseInteractiveLine(buf, mesg);
-            if (bundleDepth != 0) {
-                /* Don't send anything until we close all bundles */
-            } else {
-                SendBuffer(htmsocket, buf);
-            }
+        bundleDepth--;
+        if (bundleDepth == 0) {
+          SendBuffer(htmsocket, buf);
         }
+      }
+    } else {
+      ParseInteractiveLine(buf, mesg);
+      if (bundleDepth != 0) {
+        /* Don't send anything until we close all bundles */
+      } else {
+        SendBuffer(htmsocket, buf);
+      }
     }
+  }
 }
 
 OSCTimeTag ParseTimeTag(char *s) {
-    char *p, *newline;
-    typedArg arg;
+  char *p, *newline;
+  typedArg arg;
+
+  p = s;
+  while (isspace(*p)) p++;
+  if (*p == '\0') return OSCTT_Immediately();
 
-    p = s;
+  if (*p == '+') {
+    /* Time tag is for some time in the future.  It should be a
+             number of seconds as an int or float */
+
+    newline = strchr(s, '\n');
+    if (newline != NULL) *newline = '\0';
+
+    p++; /* Skip '+' */
     while (isspace(*p)) p++;
-    if (*p == '\0') return OSCTT_Immediately();
-
-    if (*p == '+') {
-	/* Time tag is for some time in the future.  It should be a
-           number of seconds as an int or float */
-
-	newline = strchr(s, '\n');
-	if (newline != NULL) *newline = '\0';
-
-	p++; /* Skip '+' */
-	while (isspace(*p)) p++;
-
-	arg = ParseToken(p);
-	if (arg.type == STRINGx) {
-	    complain("warning: inscrutable time tag request: %s\n", s);
-	    return OSCTT_Immediately();
-	} else if (arg.type == INTx) {
-	    return OSCTT_PlusSeconds(OSCTT_CurrentTime(),
-				     (float) arg.datum.i);
-	} else if (arg.type == FLOATx) {
-	    return OSCTT_PlusSeconds(OSCTT_CurrentTime(), arg.datum.f);
-	} else {
-	    fatal_error("This can't happen!");
-	}
+
+    arg = ParseToken(p);
+    if (arg.type == STRINGx) {
+      complain("warning: inscrutable time tag request: %s\n", s);
+      return OSCTT_Immediately();
+    } else if (arg.type == INTx) {
+      return OSCTT_PlusSeconds(OSCTT_CurrentTime(),
+                               (float) arg.datum.i);
+    } else if (arg.type == FLOATx) {
+      return OSCTT_PlusSeconds(OSCTT_CurrentTime(), arg.datum.f);
+    } else {
+      fatal_error("This can't happen!");
     }
+  }
 
-    if (isdigit(*p) || (*p >= 'a' && *p <='f') || (*p >= 'A' && *p <='F')) {
-	/* They specified the 8-byte tag in hex */
-	OSCTimeTag tt;
-	if (sscanf(p, "%"PRIu64, (uint64_t *)&tt) != 1) {
-	    complain("warning: couldn't parse time tag %s\n", s);
-	    return OSCTT_Immediately();
-	}
+  if (isdigit(*p) || (*p >= 'a' && *p <='f') || (*p >= 'A' && *p <='F')) {
+    /* They specified the 8-byte tag in hex */
+    OSCTimeTag tt;
+    if (sscanf(p, "%"PRIu64, (uint64_t *)&tt) != 1) {
+      complain("warning: couldn't parse time tag %s\n", s);
+      return OSCTT_Immediately();
+    }
 #ifndef	HAS8BYTEINTx
-	if (ntohl(1) != 1) {
-	    /* tt is a struct of seconds and fractional part,
-	       and this machine is little-endian, so sscanf
-	       wrote each half of the time tag in the wrong half
-	       of the struct. */
-	    uint32_t temp;
-	    temp = tt.seconds;
-	    tt.seconds = tt.fraction ;
-	    tt.fraction = temp;
-	}
-#endif
-	return tt;
+    if (ntohl(1) != 1) {
+      /* tt is a struct of seconds and fractional part,
+         and this machine is little-endian, so sscanf
+         wrote each half of the time tag in the wrong half
+         of the struct. */
+      uint32_t temp;
+      temp = tt.seconds;
+      tt.seconds = tt.fraction ;
+      tt.fraction = temp;
     }
+#endif
+    return tt;
+  }
 
-    complain("warning: invalid time tag: %s\n", s);
-    return OSCTT_Immediately();
+  complain("warning: invalid time tag: %s\n", s);
+  return OSCTT_Immediately();
 }
-	    
 
-void ParseInteractiveLine(OSCbuf *buf, char *mesg) {
-    char *messageName, *token, *p;
-    typedArg args[MAX_ARGS];
-    int thisArg;
 
-    p = mesg;
-    while (isspace(*p)) p++;
-    if (*p == '\0') return;
+void ParseInteractiveLine(OSCbuf *buf, char *mesg) {
+  char *messageName, *token, *p;
+  typedArg args[MAX_ARGS];
+  int thisArg;
 
-    messageName = p;
+  p = mesg;
+  while (isspace(*p)) p++;
+  if (*p == '\0') return;
 
-    if (strcmp(messageName, "play\n") == 0) {
-	/* Special kludge feature to save typing */
-	typedArg arg;
+  messageName = p;
 
-	if (OSC_openBundle(buf, OSCTT_Immediately())) {
-	    complain("Problem opening bundle: %s\n", OSC_errorMessage);
-	    return;
-	}
+  if (strcmp(messageName, "play\n") == 0) {
+    /* Special kludge feature to save typing */
+    typedArg arg;
 
-	arg.type = INTx;
-	arg.datum.i = 0;
-	WriteMessage(buf, "/voices/0/tp/timbre_index", 1, &arg);
+    if (OSC_openBundle(buf, OSCTT_Immediately())) {
+      complain("Problem opening bundle: %s\n", OSC_errorMessage);
+      return;
+    }
 
-	arg.type = FLOATx;
-	arg.datum.i = 0.0f;
-	WriteMessage(buf, "/voices/0/tm/goto", 1, &arg);
+    arg.type = INTx;
+    arg.datum.i = 0;
+    WriteMessage(buf, "/voices/0/tp/timbre_index", 1, &arg);
 
-	if (OSC_closeBundle(buf)) {
-	    complain("Problem closing bundle: %s\n", OSC_errorMessage);
-	}
+    arg.type = FLOATx;
+    arg.datum.i = 0.0f;
+    WriteMessage(buf, "/voices/0/tm/goto", 1, &arg);
 
-	return;
+    if (OSC_closeBundle(buf)) {
+      complain("Problem closing bundle: %s\n", OSC_errorMessage);
     }
 
-    while (!isspace(*p) && *p != '\0') p++;
-    if (isspace(*p)) {
+    return;
+  }
+
+  while (!isspace(*p) && *p != '\0') p++;
+  if (isspace(*p)) {
+    *p = '\0';
+    p++;
+  }
+
+  thisArg = 0;
+  while (*p != '\0') {
+    /* flush leading whitespace */
+    while (isspace(*p)) p++;
+    if (*p == '\0') break;
+
+    if (*p == '"') {
+      /* A string argument: scan for close quotes */
+      p++;
+      args[thisArg].type = STRINGx;
+      args[thisArg].datum.s = p;
+
+      while (*p != '"') {
+        if (*p == '\0') {
+          complain("Unterminated quote mark: ignoring line\n");
+          return;
+        }
+        p++;
+      }
+      *p = '\0';
+      p++;
+    } else {
+      token = p;
+      while (!isspace(*p) && (*p != '\0')) p++;
+      if (isspace(*p)) {
         *p = '\0';
         p++;
+      }
+      args[thisArg] = ParseToken(token);
     }
-
-    thisArg = 0;
-    while (*p != '\0') {
-        /* flush leading whitespace */
-        while (isspace(*p)) p++;
-        if (*p == '\0') break;
-
-        if (*p == '"') {
-            /* A string argument: scan for close quotes */
-            p++;
-            args[thisArg].type = STRINGx;
-            args[thisArg].datum.s = p;
-
-            while (*p != '"') {
-                if (*p == '\0') {
-                    complain("Unterminated quote mark: ignoring line\n");
-                    return;
-                }
-                p++;
-            }
-            *p = '\0';
-            p++;
-        } else {
-            token = p;
-            while (!isspace(*p) && (*p != '\0')) p++;
-            if (isspace(*p)) {
-                *p = '\0';
-                p++;
-            }
-            args[thisArg] = ParseToken(token);
-        }
-        thisArg++;
-	if (thisArg >= MAX_ARGS) {
-	  complain("Sorry, your message has more than MAX_ARGS (%d) arguments; ignoring the rest.\n",
-		   MAX_ARGS);
-	  break;
-	}
+    thisArg++;
+    if (thisArg >= MAX_ARGS) {
+      complain("Sorry, your message has more than MAX_ARGS (%d) arguments; ignoring the rest.\n",
+               MAX_ARGS);
+      break;
     }
+  }
 
-    if (WriteMessage(buf, messageName, thisArg, args) != 0)  {
-	complain("Problem sending message: %s\n", OSC_errorMessage);
-    }
+  if (WriteMessage(buf, messageName, thisArg, args) != 0)  {
+    complain("Problem sending message: %s\n", OSC_errorMessage);
+  }
 }
 
 typedArg ParseToken(char *token) {
-    char *p = token;
-    typedArg returnVal;
+  char *p = token;
+  typedArg returnVal;
 
-    /* It might be an int, a float, or a string */
+  /* It might be an int, a float, or a string */
 
-    if (*p == '-') p++;
+  if (*p == '-') p++;
 
-    if (isdigit(*p) || *p == '.') {
-        while (isdigit(*p)) p++;
-        if (*p == '\0') {
-            returnVal.type = INTx;
-            returnVal.datum.i = atoi(token);
-            return returnVal;
-        }
-        if (*p == '.') {
-            p++;
-            while (isdigit(*p)) p++;
-            if (*p == '\0') {
-                returnVal.type = FLOATx;
-                returnVal.datum.f = atof(token);
-                return returnVal;
-            }
-        }
+  if (isdigit(*p) || *p == '.') {
+    while (isdigit(*p)) p++;
+    if (*p == '\0') {
+      returnVal.type = INTx;
+      returnVal.datum.i = atoi(token);
+      return returnVal;
+    }
+    if (*p == '.') {
+      p++;
+      while (isdigit(*p)) p++;
+      if (*p == '\0') {
+        returnVal.type = FLOATx;
+        returnVal.datum.f = atof(token);
+        return returnVal;
+      }
     }
+  }
 
-    returnVal.type = STRINGx;
-    returnVal.datum.s = token;
-    return returnVal;
+  returnVal.type = STRINGx;
+  returnVal.datum.s = token;
+  return returnVal;
 }
 
 int WriteMessage(OSCbuf *buf, char *messageName, int numArgs, typedArg *args) {
-    int j, returnVal;
+  int j, returnVal;
 
-    returnVal = 0;
+  returnVal = 0;
 
 #ifdef DEBUG
-    printf("WriteMessage: %s ", messageName);
+  printf("WriteMessage: %s ", messageName);
 
-     for (j = 0; j < numArgs; j++) {
-        switch (args[j].type) {
-            case INTx:
-	    printf("%d ", args[j].datum.i);
-            break;
+  for (j = 0; j < numArgs; j++) {
+    switch (args[j].type) {
+    case INTx:
+      printf("%d ", args[j].datum.i);
+      break;
 
-            case FLOATx:
-	    printf("%f ", args[j].datum.f);
-            break;
+    case FLOATx:
+      printf("%f ", args[j].datum.f);
+      break;
 
-            case STRINGx:
-	    printf("%s ", args[j].datum.s);
-            break;
+    case STRINGx:
+      printf("%s ", args[j].datum.s);
+      break;
 
-            default:
-            fatal_error("Unrecognized arg type");
-            exit(5);
-        }
+    default:
+      fatal_error("Unrecognized arg type");
+      exit(5);
     }
-    printf("\n");
+  }
+  printf("\n");
 #endif
 
-    if (!useTypeTags) {
-	returnVal = OSC_writeAddress(buf, messageName);
-	if (returnVal) {
-	    complain("Problem writing address: %s\n", OSC_errorMessage);
-	}
-    } else {
-	/* First figure out the type tags */
-	char typeTags[MAX_ARGS+2];
-	int i;
-
-	typeTags[0] = ',';
-
-	for (i = 0; i < numArgs; ++i) {
-	    switch (args[i].type) {
-		case INTx:
-		typeTags[i+1] = 'i';
-		break;
-
-		case FLOATx:
-		typeTags[i+1] = 'f';
-		break;
-
-		case STRINGx:
-		typeTags[i+1] = 's';
-		break;
-
-		default:
-		fatal_error("Unrecognized arg type");
-		exit(5);
-	    }
-	}
-	typeTags[i+1] = '\0';
-	    
-	returnVal = OSC_writeAddressAndTypes(buf, messageName, typeTags);
-	if (returnVal) {
-	    complain("Problem writing address: %s\n", OSC_errorMessage);
-	}
+  if (!useTypeTags) {
+    returnVal = OSC_writeAddress(buf, messageName);
+    if (returnVal) {
+      complain("Problem writing address: %s\n", OSC_errorMessage);
+    }
+  } else {
+    /* First figure out the type tags */
+    char typeTags[MAX_ARGS+2];
+    int i;
+
+    typeTags[0] = ',';
+
+    for (i = 0; i < numArgs; ++i) {
+      switch (args[i].type) {
+      case INTx:
+        typeTags[i+1] = 'i';
+        break;
+
+      case FLOATx:
+        typeTags[i+1] = 'f';
+        break;
+
+      case STRINGx:
+        typeTags[i+1] = 's';
+        break;
+
+      default:
+        fatal_error("Unrecognized arg type");
+        exit(5);
+      }
     }
+    typeTags[i+1] = '\0';
 
-     for (j = 0; j < numArgs; j++) {
-        switch (args[j].type) {
-            case INTx:
-            if ((returnVal = OSC_writeIntArg(buf, args[j].datum.i)) != 0) {
-		return returnVal;
-	    }
-            break;
-
-            case FLOATx:
-            if ((returnVal = OSC_writeFloatArg(buf, args[j].datum.f)) != 0) {
-		return returnVal;
-	    }
-            break;
-
-            case STRINGx:
-            if ((returnVal = OSC_writeStringArg(buf, args[j].datum.s)) != 0) {
-		return returnVal;
-	    }
-            break;
-
-            default:
-            fatal_error("Unrecognized arg type");
-            exit(5);
-        }
+    returnVal = OSC_writeAddressAndTypes(buf, messageName, typeTags);
+    if (returnVal) {
+      complain("Problem writing address: %s\n", OSC_errorMessage);
     }
+  }
+
+  for (j = 0; j < numArgs; j++) {
+    switch (args[j].type) {
+    case INTx:
+      if ((returnVal = OSC_writeIntArg(buf, args[j].datum.i)) != 0) {
+        return returnVal;
+      }
+      break;
+
+    case FLOATx:
+      if ((returnVal = OSC_writeFloatArg(buf, args[j].datum.f)) != 0) {
+        return returnVal;
+      }
+      break;
+
+    case STRINGx:
+      if ((returnVal = OSC_writeStringArg(buf, args[j].datum.s)) != 0) {
+        return returnVal;
+      }
+      break;
+
+    default:
+      fatal_error("Unrecognized arg type");
+      exit(5);
+    }
+  }
 
-    return returnVal;
+  return returnVal;
 }
 
 void SendBuffer(void *htmsocket, OSCbuf *buf) {
 #ifdef DEBUG
-    printf("Sending buffer...\n");
+  printf("Sending buffer...\n");
 #endif
-    if (OSC_isBufferEmpty(buf)) return;
-    if (!OSC_isBufferDone(buf)) {
-	fatal_error("SendBuffer() called but buffer not ready!");
-	exit(5);
-    }
-    SendData(htmsocket, OSC_packetSize(buf), OSC_getPacket(buf));
+  if (OSC_isBufferEmpty(buf)) return;
+  if (!OSC_isBufferDone(buf)) {
+    fatal_error("SendBuffer() called but buffer not ready!");
+    exit(5);
+  }
+  SendData(htmsocket, OSC_packetSize(buf), OSC_getPacket(buf));
 }
 
 void SendData(void *htmsocket, int size, char *data) {
-    if (!SendHTMSocket(htmsocket, size, data)) {
-        perror("Couldn't send out socket: ");
-        CloseHTMSocket(htmsocket);
-        exit(3);
-    }
+  if (!SendHTMSocket(htmsocket, size, data)) {
+    perror("Couldn't send out socket: ");
+    CloseHTMSocket(htmsocket);
+    exit(3);
+  }
 }
 
 void fatal_error(char *s) {
-    fprintf(stderr, "%s\n", s);
-    exit(4);
+  fprintf(stderr, "%s\n", s);
+  exit(4);
 }
 
 #include <stdarg.h>
 void complain(char *s, ...) {
-    va_list ap;
-    va_start(ap, s);
-    vfprintf(stderr, s, ap);
-    va_end(ap);
+  va_list ap;
+  va_start(ap, s);
+  vfprintf(stderr, s, ap);
+  va_end(ap);
 }
 
 
 #ifdef COMPUTE_MESSAGE_SIZE
-    /* Unused code to find the size of a message */
+/* Unused code to find the size of a message */
 
-    /* Compute size */
-    size = SynthControl_effectiveStringLength(messageName);
+/* Compute size */
+size = SynthControl_effectiveStringLength(messageName);
 
-    for (j = 0; j < numArgs; j++) {
-        switch (args[j].type) {
-            case INTx: case FLOATx:
-            size += 4;
-            break;
+for (j = 0; j < numArgs; j++) {
+  switch (args[j].type) {
+  case INTx:
+  case FLOATx:
+    size += 4;
+    break;
 
-            case STRINGx:
-            size += SynthControl_effectiveStringLength(args[j].datum.s);
-            break;
+  case STRINGx:
+    size += SynthControl_effectiveStringLength(args[j].datum.s);
+    break;
 
-            default:
-            fatal_error("Unrecognized token type");
-            exit(4);
-        }
-    }
+  default:
+    fatal_error("Unrecognized token type");
+    exit(4);
+  }
+}
 
-    if (!SynthControl_willMessageFit(buf, size)) {
-        complain("Message \"%s\" won't fit in buffer: dropping.", messageName);
-        return;
-    }
+if (!SynthControl_willMessageFit(buf, size)) {
+  complain("Message \"%s\" won't fit in buffer: dropping.", messageName);
+  return;
+}
 #endif

LiVES-2.4.1.tar.bz2/liblives.doxygen Added

@@ -0,0 +1,2303 @@
+# Doxyfile 1.8.6
+
+# This file describes the settings to be used by the documentation system
+# doxygen (www.doxygen.org) for a project.
+#
+# All text after a double hash (##) is considered a comment and is placed in
+# front of the TAG it is preceding.
+#
+# All text after a single hash (#) is considered a comment and will be ignored.
+# The format is:
+# TAG = value [value, ...]
+# For lists, items can also be appended using:
+# TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (\" \").
+
+#---------------------------------------------------------------------------
+# Project related configuration options
+#---------------------------------------------------------------------------
+
+# This tag specifies the encoding used for all characters in the config file
+# that follow. The default is UTF-8 which is also the encoding used for all text
+# before the first occurrence of this tag. Doxygen uses libiconv (or the iconv
+# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv
+# for the list of possible encodings.
+# The default value is: UTF-8.
+
+DOXYFILE_ENCODING      = UTF-8
+
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by
+# double-quotes, unless you are using Doxywizard) that should identify the
+# project for which the documentation is generated. This name is used in the
+# title of most generated pages and in a few other places.
+# The default value is: My Project.
+
+PROJECT_NAME           = liblives
+
+# The PROJECT_NUMBER tag can be used to enter a project or revision number. This
+# could be handy for archiving the generated documentation or if some version
+# control system is used.
+
+PROJECT_NUMBER         = 2.4.1
+
+# Using the PROJECT_BRIEF tag one can provide an optional one line description
+# for a project that appears at the top of each page and should give viewer a
+# quick idea about the purpose of the project. Keep the description short.
+
+PROJECT_BRIEF          =
+
+# With the PROJECT_LOGO tag one can specify an logo or icon that is included in
+# the documentation. The maximum height of the logo should not exceed 55 pixels
+# and the maximum width should not exceed 200 pixels. Doxygen will copy the logo
+# to the output directory.
+
+PROJECT_LOGO           =
+
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
+# into which the generated documentation will be written. If a relative path is
+# entered, it will be relative to the location where doxygen was started. If
+# left blank the current directory will be used.
+
+OUTPUT_DIRECTORY       = docs/doxygen/liblives
+
+# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 4096 sub-
+# directories (in 2 levels) under the output directory of each output format and
+# will distribute the generated files over these directories. Enabling this
+# option can be useful when feeding doxygen a huge amount of source files, where
+# putting all generated files in the same directory would otherwise causes
+# performance problems for the file system.
+# The default value is: NO.
+
+CREATE_SUBDIRS         = NO
+
+# The OUTPUT_LANGUAGE tag is used to specify the language in which all
+# documentation generated by doxygen is written. Doxygen will use this
+# information to generate all constant output in the proper language.
+# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese,
+# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States),
+# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian,
+# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages),
+# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian,
+# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian,
+# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish,
+# Ukrainian and Vietnamese.
+# The default value is: English.
+
+OUTPUT_LANGUAGE        = English
+
+# If the BRIEF_MEMBER_DESC tag is set to YES doxygen will include brief member
+# descriptions after the members that are listed in the file and class
+# documentation (similar to Javadoc). Set to NO to disable this.
+# The default value is: YES.
+
+BRIEF_MEMBER_DESC      = YES
+
+# If the REPEAT_BRIEF tag is set to YES doxygen will prepend the brief
+# description of a member or function before the detailed description
+#
+# Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
+# brief descriptions will be completely suppressed.
+# The default value is: YES.
+
+REPEAT_BRIEF           = YES
+
+# This tag implements a quasi-intelligent brief description abbreviator that is
+# used to form the text in various listings. Each string in this list, if found
+# as the leading text of the brief description, will be stripped from the text
+# and the result, after processing the whole list, is used as the annotated
+# text. Otherwise, the brief description is used as-is. If left blank, the
+# following values are used ($name is automatically replaced with the name of
+# the entity):The $name class, The $name widget, The $name file, is, provides,
+# specifies, contains, represents, a, an and the.
+
+ABBREVIATE_BRIEF       =
+
+# If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
+# doxygen will generate a detailed section even if there is only a brief
+# description.
+# The default value is: NO.
+
+ALWAYS_DETAILED_SEC    = NO
+
+# If the INLINE_INHERITED_MEMB tag is set to YES, doxygen will show all
+# inherited members of a class in the documentation of that class as if those
+# members were ordinary class members. Constructors, destructors and assignment
+# operators of the base classes will not be shown.
+# The default value is: NO.
+
+INLINE_INHERITED_MEMB  = NO
+
+# If the FULL_PATH_NAMES tag is set to YES doxygen will prepend the full path
+# before files name in the file list and in the header files. If set to NO the
+# shortest path that makes the file name unique will be used
+# The default value is: YES.
+
+FULL_PATH_NAMES        = YES
+
+# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path.
+# Stripping is only done if one of the specified strings matches the left-hand
+# part of the path. The tag can be used to show relative paths in the file list.
+# If left blank the directory from which doxygen is run is used as the path to
+# strip.
+#
+# Note that you can specify absolute paths here, but also relative paths, which
+# will be relative from the directory where doxygen is started.
+# This tag requires that the tag FULL_PATH_NAMES is set to YES.
+
+STRIP_FROM_PATH        =
+
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the
+# path mentioned in the documentation of a class, which tells the reader which
+# header file to include in order to use a class. If left blank only the name of
+# the header file containing the class definition is used. Otherwise one should
+# specify the list of include paths that are normally passed to the compiler
+# using the -I flag.
+
+STRIP_FROM_INC_PATH    =
+
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but
+# less readable) file names. This can be useful is your file systems doesn't
+# support long names like on DOS, Mac, or CD-ROM.
+# The default value is: NO.
+
+SHORT_NAMES            = NO
+
+# If the JAVADOC_AUTOBRIEF tag is set to YES then doxygen will interpret the
+# first line (until the first dot) of a Javadoc-style comment as the brief
+# description. If set to NO, the Javadoc-style will behave just like regular Qt-
+# style comments (thus requiring an explicit @brief command for a brief
+# description.)
+# The default value is: NO.
+
+JAVADOC_AUTOBRIEF      = YES
+
+# If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first
+# line (until the first dot) of a Qt-style comment as the brief description. If
+# set to NO, the Qt-style will behave just like regular Qt-style comments (thus
+# requiring an explicit \brief command for a brief description.)
+# The default value is: NO.
+
+QT_AUTOBRIEF           = NO
+
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a
+# multi-line C++ special comment block (i.e. a block of //! or /// comments) as
+# a brief description. This used to be the default behavior. The new default is
+# to treat a multi-line C++ comment block as a detailed description. Set this
+# tag to YES if you prefer the old behavior instead.
+#
+# Note that setting this tag to YES also means that rational rose comments are
+# not recognized any more.
+# The default value is: NO.
+
+MULTILINE_CPP_IS_BRIEF = NO
+
+# If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
+# documentation from any documented member that it re-implements.
+# The default value is: YES.
+
+INHERIT_DOCS           = YES
+
+# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce a
+# new page for each member. If set to NO, the documentation of a member will be
+# part of the file/class/namespace that contains it.
+# The default value is: NO.
+
+SEPARATE_MEMBER_PAGES  = NO
+
+# The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen
+# uses this value to replace tabs by spaces in code fragments.
+# Minimum value: 1, maximum value: 16, default value: 4.
+
+TAB_SIZE               = 4
+
+# This tag can be used to specify a number of aliases that act as commands in
+# the documentation. An alias has the form:
+# name=value
+# For example adding
+# "sideeffect=@par Side Effects:\n"
+# will allow you to put the command \sideeffect (or @sideeffect) in the
+# documentation, which will result in a user-defined paragraph with heading
+# "Side Effects:". You can put \n's in the value part of an alias to insert
+# newlines.
+
+ALIASES                =
+
+# This tag can be used to specify a number of word-keyword mappings (TCL only).
+# A mapping has the form "name=value". For example adding "class=itcl::class"
+# will allow you to use the command class in the itcl::class meaning.
+
+TCL_SUBST              =
+
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
+# only. Doxygen will then generate output that is more tailored for C. For
+# instance, some of the names that are used will be different. The list of all
+# members will be omitted, etc.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_FOR_C  = NO
+
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or
+# Python sources only. Doxygen will then generate output that is more tailored
+# for that language. For instance, namespaces will be presented as packages,
+# qualified scopes will look different, etc.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_JAVA   = NO
+
+# Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
+# sources. Doxygen will then generate output that is tailored for Fortran.
+# The default value is: NO.
+
+OPTIMIZE_FOR_FORTRAN   = NO
+
+# Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
+# sources. Doxygen will then generate output that is tailored for VHDL.
+# The default value is: NO.
+
+OPTIMIZE_OUTPUT_VHDL   = NO
+
+# Doxygen selects the parser to use depending on the extension of the files it
+# parses. With this tag you can assign which parser to use for a given
+# extension. Doxygen has a built-in mapping, but you can override or extend it
+# using this tag. The format is ext=language, where ext is a file extension, and
+# language is one of the parsers supported by doxygen: IDL, Java, Javascript,
+# C#, C, C++, D, PHP, Objective-C, Python, Fortran, VHDL. For instance to make
+# doxygen treat .inc files as Fortran files (default is PHP), and .f files as C
+# (default is Fortran), use: inc=Fortran f=C.
+#
+# Note For files without extension you can use no_extension as a placeholder.
+#
+# Note that for custom extensions you also need to set FILE_PATTERNS otherwise
+# the files are not read by doxygen.
+
+EXTENSION_MAPPING      =
+
+# If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments
+# according to the Markdown format, which allows for more readable
+# documentation. See http://daringfireball.net/projects/markdown/ for details.
+# The output of markdown processing is further processed by doxygen, so you can
+# mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in
+# case of backward compatibilities issues.
+# The default value is: YES.
+
+MARKDOWN_SUPPORT       = YES
+
+# When enabled doxygen tries to link words that correspond to documented
+# classes, or namespaces to their corresponding documentation. Such a link can
+# be prevented in individual cases by by putting a % sign in front of the word
+# or globally by setting AUTOLINK_SUPPORT to NO.
+# The default value is: YES.
+
+AUTOLINK_SUPPORT       = YES
+
+# If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
+# to include (a tag file for) the STL sources as input, then you should set this
+# tag to YES in order to let doxygen match functions declarations and
+# definitions whose arguments contain STL classes (e.g. func(std::string);
+# versus func(std::string) {}). This also make the inheritance and collaboration
+# diagrams that involve STL classes more complete and accurate.
+# The default value is: NO.
+
+BUILTIN_STL_SUPPORT    = NO
+
+# If you use Microsoft's C++/CLI language, you should set this option to YES to
+# enable parsing support.
+# The default value is: NO.
+
+CPP_CLI_SUPPORT        = NO
+
+# Set the SIP_SUPPORT tag to YES if your project consists of sip (see:
+# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen
+# will parse them like normal C++ but will assume all classes use public instead
+# of private inheritance when no explicit protection keyword is present.
+# The default value is: NO.
+
+SIP_SUPPORT            = NO
+
+# For Microsoft's IDL there are propget and propput attributes to indicate
+# getter and setter methods for a property. Setting this option to YES will make
+# doxygen to replace the get and set methods by a property in the documentation.
+# This will only work if the methods are indeed getting or setting a simple
+# type. If this is not the case, or you want to show the methods anyway, you
+# should set this option to NO.
+# The default value is: YES.
+
+IDL_PROPERTY_SUPPORT   = YES
+
+# If member grouping is used in the documentation and the DISTRIBUTE_GROUP_DOC
+# tag is set to YES, then doxygen will reuse the documentation of the first
+# member in the group (if any) for the other members of the group. By default
+# all members of a group must be documented explicitly.
+# The default value is: NO.
+
+DISTRIBUTE_GROUP_DOC   = NO
+
+# Set the SUBGROUPING tag to YES to allow class member groups of the same type
+# (for instance a group of public functions) to be put as a subgroup of that
+# type (e.g. under the Public Functions section). Set it to NO to prevent
+# subgrouping. Alternatively, this can be done per class using the
+# \nosubgrouping command.
+# The default value is: YES.
+
+SUBGROUPING            = YES
+
+# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions
+# are shown inside the group in which they are included (e.g. using \ingroup)
+# instead of on a separate page (for HTML and Man pages) or section (for LaTeX
+# and RTF).
+#
+# Note that this feature does not work in combination with
+# SEPARATE_MEMBER_PAGES.
+# The default value is: NO.
+
+INLINE_GROUPED_CLASSES = NO
+
+# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions
+# with only public data fields or simple typedef fields will be shown inline in
+# the documentation of the scope in which they are defined (i.e. file,
+# namespace, or group documentation), provided this scope is documented. If set
+# to NO, structs, classes, and unions are shown on a separate page (for HTML and
+# Man pages) or section (for LaTeX and RTF).
+# The default value is: NO.
+
+INLINE_SIMPLE_STRUCTS  = NO
+
+# When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or
+# enum is documented as struct, union, or enum with the name of the typedef. So
+# typedef struct TypeS {} TypeT, will appear in the documentation as a struct
+# with name TypeT. When disabled the typedef will appear as a member of a file,
+# namespace, or class. And the struct will be named TypeS. This can typically be
+# useful for C code in case the coding convention dictates that all compound
+# types are typedef'ed and only the typedef is referenced, never the tag name.
+# The default value is: NO.
+
+TYPEDEF_HIDES_STRUCT   = NO
+
+# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This
+# cache is used to resolve symbols given their name and scope. Since this can be
+# an expensive process and often the same symbol appears multiple times in the
+# code, doxygen keeps a cache of pre-resolved symbols. If the cache is too small
+# doxygen will become slower. If the cache is too large, memory is wasted. The
+# cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range
+# is 0..9, the default is 0, corresponding to a cache size of 2^16=65536
+# symbols. At the end of a run doxygen will report the cache usage and suggest
+# the optimal cache size from a speed point of view.
+# Minimum value: 0, maximum value: 9, default value: 0.
+
+LOOKUP_CACHE_SIZE      = 0
+
+#---------------------------------------------------------------------------
+# Build related configuration options
+#---------------------------------------------------------------------------
+
+# If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
+# documentation are documented, even if no documentation was available. Private
+# class members and static file members will be hidden unless the
+# EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES.
+# Note: This will also disable the warnings about undocumented members that are
+# normally produced when WARNINGS is set to YES.
+# The default value is: NO.
+
+EXTRACT_ALL            = NO
+
+# If the EXTRACT_PRIVATE tag is set to YES all private members of a class will
+# be included in the documentation.
+# The default value is: NO.
+
+EXTRACT_PRIVATE        = NO
+
+# If the EXTRACT_PACKAGE tag is set to YES all members with package or internal
+# scope will be included in the documentation.
+# The default value is: NO.
+
+EXTRACT_PACKAGE        = NO
+
+# If the EXTRACT_STATIC tag is set to YES all static members of a file will be
+# included in the documentation.
+# The default value is: NO.
+
+EXTRACT_STATIC         = NO
+
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) defined
+# locally in source files will be included in the documentation. If set to NO
+# only classes defined in header files are included. Does not have any effect
+# for Java sources.
+# The default value is: YES.
+
+EXTRACT_LOCAL_CLASSES  = YES
+
+# This flag is only useful for Objective-C code. When set to YES local methods,
+# which are defined in the implementation section but not in the interface are
+# included in the documentation. If set to NO only methods in the interface are
+# included.
+# The default value is: NO.
+
+EXTRACT_LOCAL_METHODS  = NO
+
+# If this flag is set to YES, the members of anonymous namespaces will be
+# extracted and appear in the documentation as a namespace called
+# 'anonymous_namespace{file}', where file will be replaced with the base name of
+# the file that contains the anonymous namespace. By default anonymous namespace
+# are hidden.
+# The default value is: NO.
+
+EXTRACT_ANON_NSPACES   = NO
+
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all
+# undocumented members inside documented classes or files. If set to NO these
+# members will be included in the various overviews, but no documentation
+# section is generated. This option has no effect if EXTRACT_ALL is enabled.
+# The default value is: NO.
+
+HIDE_UNDOC_MEMBERS     = NO
+
+# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all
+# undocumented classes that are normally visible in the class hierarchy. If set
+# to NO these classes will be included in the various overviews. This option has
+# no effect if EXTRACT_ALL is enabled.
+# The default value is: NO.
+
+HIDE_UNDOC_CLASSES     = NO
+
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
+# (class|struct|union) declarations. If set to NO these declarations will be
+# included in the documentation.
+# The default value is: NO.
+
+HIDE_FRIEND_COMPOUNDS  = NO
+
+# If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any
+# documentation blocks found inside the body of a function. If set to NO these
+# blocks will be appended to the function's detailed documentation block.
+# The default value is: NO.
+
+HIDE_IN_BODY_DOCS      = NO
+
+# The INTERNAL_DOCS tag determines if documentation that is typed after a
+# \internal command is included. If the tag is set to NO then the documentation
+# will be excluded. Set it to YES to include the internal documentation.
+# The default value is: NO.
+
+INTERNAL_DOCS          = NO
+
+# If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file
+# names in lower-case letters. If set to YES upper-case letters are also
+# allowed. This is useful if you have classes or files whose names only differ
+# in case and if your file system supports case sensitive file names. Windows
+# and Mac users are advised to set this option to NO.
+# The default value is: system dependent.
+
+CASE_SENSE_NAMES       = YES
+
+# If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with
+# their full class and namespace scopes in the documentation. If set to YES the
+# scope will be hidden.
+# The default value is: NO.
+
+HIDE_SCOPE_NAMES       = NO
+
+# If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
+# the files that are included by a file in the documentation of that file.
+# The default value is: YES.
+
+SHOW_INCLUDE_FILES     = YES
+
+# If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each
+# grouped member an include statement to the documentation, telling the reader
+# which file to include in order to use the member.
+# The default value is: NO.
+
+SHOW_GROUPED_MEMB_INC  = NO
+
+# If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include
+# files with double quotes in the documentation rather than with sharp brackets.
+# The default value is: NO.
+
+FORCE_LOCAL_INCLUDES   = NO
+
+# If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the
+# documentation for inline members.
+# The default value is: YES.
+
+INLINE_INFO            = YES
+
+# If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the
+# (detailed) documentation of file and class members alphabetically by member
+# name. If set to NO the members will appear in declaration order.
+# The default value is: YES.
+
+SORT_MEMBER_DOCS       = YES
+
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief
+# descriptions of file, namespace and class members alphabetically by member
+# name. If set to NO the members will appear in declaration order. Note that
+# this will also influence the order of the classes in the class list.
+# The default value is: NO.
+
+SORT_BRIEF_DOCS        = NO
+
+# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the
+# (brief and detailed) documentation of class members so that constructors and
+# destructors are listed first. If set to NO the constructors will appear in the
+# respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS.
+# Note: If SORT_BRIEF_DOCS is set to NO this option is ignored for sorting brief
+# member documentation.
+# Note: If SORT_MEMBER_DOCS is set to NO this option is ignored for sorting
+# detailed member documentation.
+# The default value is: NO.
+
+SORT_MEMBERS_CTORS_1ST = NO
+
+# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy
+# of group names into alphabetical order. If set to NO the group names will
+# appear in their defined order.
+# The default value is: NO.
+
+SORT_GROUP_NAMES       = NO
+
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by
+# fully-qualified names, including namespaces. If set to NO, the class list will
+# be sorted only by class name, not including the namespace part.
+# Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
+# Note: This option applies only to the class list, not to the alphabetical
+# list.
+# The default value is: NO.
+
+SORT_BY_SCOPE_NAME     = NO
+
+# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper
+# type resolution of all parameters of a function it will reject a match between
+# the prototype and the implementation of a member function even if there is
+# only one candidate or it is obvious which candidate to choose by doing a
+# simple string match. By disabling STRICT_PROTO_MATCHING doxygen will still
+# accept a match between prototype and implementation in such cases.
+# The default value is: NO.
+
+STRICT_PROTO_MATCHING  = NO
+
+# The GENERATE_TODOLIST tag can be used to enable ( YES) or disable ( NO) the
+# todo list. This list is created by putting \todo commands in the
+# documentation.
+# The default value is: YES.
+
+GENERATE_TODOLIST      = YES
+
+# The GENERATE_TESTLIST tag can be used to enable ( YES) or disable ( NO) the
+# test list. This list is created by putting \test commands in the
+# documentation.
+# The default value is: YES.
+
+GENERATE_TESTLIST      = YES
+
+# The GENERATE_BUGLIST tag can be used to enable ( YES) or disable ( NO) the bug
+# list. This list is created by putting \bug commands in the documentation.
+# The default value is: YES.
+
+GENERATE_BUGLIST       = YES
+
+# The GENERATE_DEPRECATEDLIST tag can be used to enable ( YES) or disable ( NO)
+# the deprecated list. This list is created by putting \deprecated commands in
+# the documentation.
+# The default value is: YES.
+
+GENERATE_DEPRECATEDLIST= YES
+
+# The ENABLED_SECTIONS tag can be used to enable conditional documentation
+# sections, marked by \if <section_label> ... \endif and \cond <section_label>
+# ... \endcond blocks.
+
+ENABLED_SECTIONS       =
+
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the
+# initial value of a variable or macro / define can have for it to appear in the
+# documentation. If the initializer consists of more lines than specified here
+# it will be hidden. Use a value of 0 to hide initializers completely. The
+# appearance of the value of individual variables and macros / defines can be
+# controlled using \showinitializer or \hideinitializer command in the
+# documentation regardless of this setting.
+# Minimum value: 0, maximum value: 10000, default value: 30.
+
+MAX_INITIALIZER_LINES  = 30
+
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated at
+# the bottom of the documentation of classes and structs. If set to YES the list
+# will mention the files that were used to generate the documentation.
+# The default value is: YES.
+
+SHOW_USED_FILES        = YES
+
+# Set the SHOW_FILES tag to NO to disable the generation of the Files page. This
+# will remove the Files entry from the Quick Index and from the Folder Tree View
+# (if specified).
+# The default value is: YES.
+
+SHOW_FILES             = YES
+
+# Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces
+# page. This will remove the Namespaces entry from the Quick Index and from the
+# Folder Tree View (if specified).
+# The default value is: YES.
+
+SHOW_NAMESPACES        = YES
+
+# The FILE_VERSION_FILTER tag can be used to specify a program or script that
+# doxygen should invoke to get the current version for each file (typically from
+# the version control system). Doxygen will invoke the program by executing (via
+# popen()) the command command input-file, where command is the value of the
+# FILE_VERSION_FILTER tag, and input-file is the name of an input file provided
+# by doxygen. Whatever the program writes to standard output is used as the file
+# version. For an example see the documentation.
+
+FILE_VERSION_FILTER    =
+
+# The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
+# by doxygen. The layout file controls the global structure of the generated
+# output files in an output format independent way. To create the layout file
+# that represents doxygen's defaults, run doxygen with the -l option. You can
+# optionally specify a file name after the option, if omitted DoxygenLayout.xml
+# will be used as the name of the layout file.
+#
+# Note that if you run doxygen from a directory containing a file called
+# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
+# tag is left empty.
+
+LAYOUT_FILE            =
+
+# The CITE_BIB_FILES tag can be used to specify one or more bib files containing
+# the reference definitions. This must be a list of .bib files. The .bib
+# extension is automatically appended if omitted. This requires the bibtex tool
+# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info.
+# For LaTeX the style of the bibliography can be controlled using
+# LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the
+# search path. Do not use file names with spaces, bibtex cannot handle them. See
+# also \cite for info how to create references.
+
+CITE_BIB_FILES         =
+
+#---------------------------------------------------------------------------
+# Configuration options related to warning and progress messages
+#---------------------------------------------------------------------------
+
+# The QUIET tag can be used to turn on/off the messages that are generated to
+# standard output by doxygen. If QUIET is set to YES this implies that the
+# messages are off.
+# The default value is: NO.
+
+QUIET                  = NO
+
+# The WARNINGS tag can be used to turn on/off the warning messages that are
+# generated to standard error ( stderr) by doxygen. If WARNINGS is set to YES
+# this implies that the warnings are on.
+#
+# Tip: Turn warnings on while writing the documentation.
+# The default value is: YES.
+
+WARNINGS               = YES
+
+# If the WARN_IF_UNDOCUMENTED tag is set to YES, then doxygen will generate
+# warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag
+# will automatically be disabled.
+# The default value is: YES.
+
+WARN_IF_UNDOCUMENTED   = YES
+
+# If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
+# potential errors in the documentation, such as not documenting some parameters
+# in a documented function, or documenting parameters that don't exist or using
+# markup commands wrongly.
+# The default value is: YES.
+
+WARN_IF_DOC_ERROR      = YES
+
+# This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
+# are documented, but have no documentation for their parameters or return
+# value. If set to NO doxygen will only warn about wrong or incomplete parameter
+# documentation, but not about the absence of documentation.
+# The default value is: NO.
+
+WARN_NO_PARAMDOC       = NO
+
+# The WARN_FORMAT tag determines the format of the warning messages that doxygen
+# can produce. The string should contain the $file, $line, and $text tags, which
+# will be replaced by the file and line number from which the warning originated
+# and the warning text. Optionally the format may contain $version, which will
+# be replaced by the version of the file (if it could be obtained via
+# FILE_VERSION_FILTER)
+# The default value is: $file:$line: $text.
+
+WARN_FORMAT            = "$file:$line: $text"
+
+# The WARN_LOGFILE tag can be used to specify a file to which warning and error
+# messages should be written. If left blank the output is written to standard
+# error (stderr).
+
+WARN_LOGFILE           =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the input files
+#---------------------------------------------------------------------------
+
+# The INPUT tag is used to specify the files and/or directories that contain
+# documented source files. You may enter file names like myfile.cpp or
+# directories like /usr/src/myproject. Separate the files or directories with
+# spaces.
+# Note: If this tag is empty the current directory is searched.
+
+INPUT                  = src/liblives.cpp src/liblives.hpp
+
+# This tag can be used to specify the character encoding of the source files
+# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
+# libiconv (or the iconv built into libc) for the transcoding. See the libiconv
+# documentation (see: http://www.gnu.org/software/libiconv) for the list of
+# possible encodings.
+# The default value is: UTF-8.
+
+INPUT_ENCODING         = UTF-8
+
+# If the value of the INPUT tag contains directories, you can use the
+# FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and
+# *.h) to filter out the source-files in the directories. If left blank the
+# following patterns are tested:*.c, *.cc, *.cxx, *.cpp, *.c++, *.java, *.ii,
+# *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h, *.hh, *.hxx, *.hpp,
+# *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc, *.m, *.markdown,
+# *.md, *.mm, *.dox, *.py, *.f90, *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf,
+# *.qsf, *.as and *.js.
+
+FILE_PATTERNS          =
+
+# The RECURSIVE tag can be used to specify whether or not subdirectories should
+# be searched for input files as well.
+# The default value is: NO.
+
+RECURSIVE              = NO
+
+# The EXCLUDE tag can be used to specify files and/or directories that should be
+# excluded from the INPUT source files. This way you can easily exclude a
+# subdirectory from a directory tree whose root is specified with the INPUT tag.
+#
+# Note that relative paths are relative to the directory from which doxygen is
+# run.
+
+EXCLUDE                =
+
+# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
+# directories that are symbolic links (a Unix file system feature) are excluded
+# from the input.
+# The default value is: NO.
+
+EXCLUDE_SYMLINKS       = NO
+
+# If the value of the INPUT tag contains directories, you can use the
+# EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
+# certain files from those directories.
+#
+# Note that the wildcards are matched against the file with absolute path, so to
+# exclude all test directories for example use the pattern */test/*
+
+EXCLUDE_PATTERNS       =
+
+# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
+# (namespaces, classes, functions, etc.) that should be excluded from the
+# output. The symbol name can be a fully qualified name, a word, or if the
+# wildcard * is used, a substring. Examples: ANamespace, AClass,
+# AClass::ANamespace, ANamespace::*Test
+#
+# Note that the wildcards are matched against the file with absolute path, so to
+# exclude all test directories use the pattern */test/*
+
+EXCLUDE_SYMBOLS        =
+
+# The EXAMPLE_PATH tag can be used to specify one or more files or directories
+# that contain example code fragments that are included (see the \include
+# command).
+
+EXAMPLE_PATH           =
+
+# If the value of the EXAMPLE_PATH tag contains directories, you can use the
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and
+# *.h) to filter out the source-files in the directories. If left blank all
+# files are included.
+
+EXAMPLE_PATTERNS       =
+
+# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
+# searched for input files to be used with the \include or \dontinclude commands
+# irrespective of the value of the RECURSIVE tag.
+# The default value is: NO.
+
+EXAMPLE_RECURSIVE      = NO
+
+# The IMAGE_PATH tag can be used to specify one or more files or directories
+# that contain images that are to be included in the documentation (see the
+# \image command).
+
+IMAGE_PATH             =
+
+# The INPUT_FILTER tag can be used to specify a program that doxygen should
+# invoke to filter for each input file. Doxygen will invoke the filter program
+# by executing (via popen()) the command:
+#
+# <filter> <input-file>
+#
+# where <filter> is the value of the INPUT_FILTER tag, and <input-file> is the
+# name of an input file. Doxygen will then use the output that the filter
+# program writes to standard output. If FILTER_PATTERNS is specified, this tag
+# will be ignored.
+#
+# Note that the filter must not add or remove lines; it is applied before the
+# code is scanned, but not when the output code is generated. If lines are added
+# or removed, the anchors will not be placed correctly.
+
+INPUT_FILTER           =
+
+# The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
+# basis. Doxygen will compare the file name with each pattern and apply the
+# filter if there is a match. The filters are a list of the form: pattern=filter
+# (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how
+# filters are used. If the FILTER_PATTERNS tag is empty or if none of the
+# patterns match the file name, INPUT_FILTER is applied.
+
+FILTER_PATTERNS        =
+
+# If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
+# INPUT_FILTER ) will also be used to filter the input files that are used for
+# producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES).
+# The default value is: NO.
+
+FILTER_SOURCE_FILES    = NO
+
+# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
+# pattern. A pattern will override the setting for FILTER_PATTERN (if any) and
+# it is also possible to disable source filtering for a specific pattern using
+# *.ext= (so without naming a filter).
+# This tag requires that the tag FILTER_SOURCE_FILES is set to YES.
+
+FILTER_SOURCE_PATTERNS =
+
+# If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that
+# is part of the input, its contents will be placed on the main page
+# (index.html). This can be useful if you have a project on for instance GitHub
+# and want to reuse the introduction page also for the doxygen output.
+
+USE_MDFILE_AS_MAINPAGE =
+
+#---------------------------------------------------------------------------
+# Configuration options related to source browsing
+#---------------------------------------------------------------------------
+
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will be
+# generated. Documented entities will be cross-referenced with these sources.
+#
+# Note: To get rid of all source code in the generated output, make sure that
+# also VERBATIM_HEADERS is set to NO.
+# The default value is: NO.
+
+SOURCE_BROWSER         = NO
+
+# Setting the INLINE_SOURCES tag to YES will include the body of functions,
+# classes and enums directly into the documentation.
+# The default value is: NO.
+
+INLINE_SOURCES         = NO
+
+# Setting the STRIP_CODE_COMMENTS tag to YES will instruct doxygen to hide any
+# special comment blocks from generated source code fragments. Normal C, C++ and
+# Fortran comments will always remain visible.
+# The default value is: YES.
+
+STRIP_CODE_COMMENTS    = YES
+
+# If the REFERENCED_BY_RELATION tag is set to YES then for each documented
+# function all documented functions referencing it will be listed.
+# The default value is: NO.
+
+REFERENCED_BY_RELATION = NO
+
+# If the REFERENCES_RELATION tag is set to YES then for each documented function
+# all documented entities called/used by that function will be listed.
+# The default value is: NO.
+
+REFERENCES_RELATION    = NO
+
+# If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set
+# to YES, then the hyperlinks from functions in REFERENCES_RELATION and
+# REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will
+# link to the documentation.
+# The default value is: YES.
+
+REFERENCES_LINK_SOURCE = YES
+
+# If SOURCE_TOOLTIPS is enabled (the default) then hovering a hyperlink in the
+# source code will show a tooltip with additional information such as prototype,
+# brief description and links to the definition and documentation. Since this
+# will make the HTML file larger and loading of large files a bit slower, you
+# can opt to disable this feature.
+# The default value is: YES.
+# This tag requires that the tag SOURCE_BROWSER is set to YES.
+
+SOURCE_TOOLTIPS        = YES
+
+# If the USE_HTAGS tag is set to YES then the references to source code will
+# point to the HTML generated by the htags(1) tool instead of doxygen built-in
+# source browser. The htags tool is part of GNU's global source tagging system
+# (see http://www.gnu.org/software/global/global.html). You will need version
+# 4.8.6 or higher.
+#
+# To use it do the following:
+# - Install the latest version of global
+# - Enable SOURCE_BROWSER and USE_HTAGS in the config file
+# - Make sure the INPUT points to the root of the source tree
+# - Run doxygen as normal
+#
+# Doxygen will invoke htags (and that will in turn invoke gtags), so these
+# tools must be available from the command line (i.e. in the search path).
+#
+# The result: instead of the source browser generated by doxygen, the links to
+# source code will now point to the output of htags.
+# The default value is: NO.
+# This tag requires that the tag SOURCE_BROWSER is set to YES.
+
+USE_HTAGS              = NO
+
+# If the VERBATIM_HEADERS tag is set the YES then doxygen will generate a
+# verbatim copy of the header file for each class for which an include is
+# specified. Set to NO to disable this.
+# See also: Section \class.
+# The default value is: YES.
+
+VERBATIM_HEADERS       = YES
+
+#---------------------------------------------------------------------------
+# Configuration options related to the alphabetical class index
+#---------------------------------------------------------------------------
+
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index of all
+# compounds will be generated. Enable this if the project contains a lot of
+# classes, structs, unions or interfaces.
+# The default value is: YES.
+
+ALPHABETICAL_INDEX     = YES
+
+# The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in
+# which the alphabetical index list will be split.
+# Minimum value: 1, maximum value: 20, default value: 5.
+# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
+
+COLS_IN_ALPHA_INDEX    = 5
+
+# In case all classes in a project start with a common prefix, all classes will
+# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag
+# can be used to specify a prefix (or a list of prefixes) that should be ignored
+# while generating the index headers.
+# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
+
+IGNORE_PREFIX          =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the HTML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_HTML tag is set to YES doxygen will generate HTML output
+# The default value is: YES.
+
+GENERATE_HTML          = YES
+
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: html.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_OUTPUT            = html
+
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each
+# generated HTML page (for example: .htm, .php, .asp).
+# The default value is: .html.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FILE_EXTENSION    = .html
+
+# The HTML_HEADER tag can be used to specify a user-defined HTML header file for
+# each generated HTML page. If the tag is left blank doxygen will generate a
+# standard header.
+#
+# To get valid HTML the header file that includes any scripts and style sheets
+# that doxygen needs, which is dependent on the configuration options used (e.g.
+# the setting GENERATE_TREEVIEW). It is highly recommended to start with a
+# default header using
+# doxygen -w html new_header.html new_footer.html new_stylesheet.css
+# YourConfigFile
+# and then modify the file new_header.html. See also section "Doxygen usage"
+# for information on how to generate the default header that doxygen normally
+# uses.
+# Note: The header is subject to change so you typically have to regenerate the
+# default header when upgrading to a newer version of doxygen. For a description
+# of the possible markers and block names see the documentation.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_HEADER            =
+
+# The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each
+# generated HTML page. If the tag is left blank doxygen will generate a standard
+# footer. See HTML_HEADER for more information on how to generate a default
+# footer and what special commands can be used inside the footer. See also
+# section "Doxygen usage" for information on how to generate the default footer
+# that doxygen normally uses.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_FOOTER            =
+
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading style
+# sheet that is used by each HTML page. It can be used to fine-tune the look of
+# the HTML output. If left blank doxygen will generate a default style sheet.
+# See also section "Doxygen usage" for information on how to generate the style
+# sheet that doxygen normally uses.
+# Note: It is recommended to use HTML_EXTRA_STYLESHEET instead of this tag, as
+# it is more robust and this tag (HTML_STYLESHEET) will in the future become
+# obsolete.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_STYLESHEET        =
+
+# The HTML_EXTRA_STYLESHEET tag can be used to specify an additional user-
+# defined cascading style sheet that is included after the standard style sheets
+# created by doxygen. Using this option one can overrule certain style aspects.
+# This is preferred over using HTML_STYLESHEET since it does not replace the
+# standard style sheet and is therefor more robust against future updates.
+# Doxygen will copy the style sheet file to the output directory. For an example
+# see the documentation.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_EXTRA_STYLESHEET  =
+
+# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the HTML output directory. Note
+# that these files will be copied to the base HTML output directory. Use the
+# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
+# files. In the HTML_STYLESHEET file, use the file name only. Also note that the
+# files will be copied as-is; there are no commands or markers available.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_EXTRA_FILES       =
+
+# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
+# will adjust the colors in the stylesheet and background images according to
+# this color. Hue is specified as an angle on a colorwheel, see
+# http://en.wikipedia.org/wiki/Hue for more information. For instance the value
+# 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
+# purple, and 360 is red again.
+# Minimum value: 0, maximum value: 359, default value: 220.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_HUE    = 220
+
+# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
+# in the HTML output. For a value of 0 the output will use grayscales only. A
+# value of 255 will produce the most vivid colors.
+# Minimum value: 0, maximum value: 255, default value: 100.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_SAT    = 100
+
+# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the
+# luminance component of the colors in the HTML output. Values below 100
+# gradually make the output lighter, whereas values above 100 make the output
+# darker. The value divided by 100 is the actual gamma applied, so 80 represents
+# a gamma of 0.8, The value 220 represents a gamma of 2.2, and 100 does not
+# change the gamma.
+# Minimum value: 40, maximum value: 240, default value: 80.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_COLORSTYLE_GAMMA  = 80
+
+# If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
+# page will contain the date and time when the page was generated. Setting this
+# to NO can help when comparing the output of multiple runs.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_TIMESTAMP         = YES
+
+# If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
+# documentation will contain sections that can be hidden and shown after the
+# page has loaded.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_DYNAMIC_SECTIONS  = NO
+
+# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries
+# shown in the various tree structured indices initially; the user can expand
+# and collapse entries dynamically later on. Doxygen will expand the tree to
+# such a level that at most the specified number of entries are visible (unless
+# a fully collapsed tree already exceeds this amount). So setting the number of
+# entries 1 will produce a full collapsed tree by default. 0 is a special value
+# representing an infinite number of entries and will result in a full expanded
+# tree by default.
+# Minimum value: 0, maximum value: 9999, default value: 100.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_INDEX_NUM_ENTRIES = 100
+
+# If the GENERATE_DOCSET tag is set to YES, additional index files will be
+# generated that can be used as input for Apple's Xcode 3 integrated development
+# environment (see: http://developer.apple.com/tools/xcode/), introduced with
+# OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a
+# Makefile in the HTML output directory. Running make will produce the docset in
+# that directory and running make install will install the docset in
+# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at
+# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
+# for more information.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_DOCSET        = NO
+
+# This tag determines the name of the docset feed. A documentation feed provides
+# an umbrella under which multiple documentation sets from a single provider
+# (such as a company or product suite) can be grouped.
+# The default value is: Doxygen generated docs.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_FEEDNAME        = "Doxygen generated docs"
+
+# This tag specifies a string that should uniquely identify the documentation
+# set bundle. This should be a reverse domain-name style string, e.g.
+# com.mycompany.MyDocSet. Doxygen will append .docset to the name.
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_BUNDLE_ID       = org.doxygen.Project
+
+# The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify
+# the documentation publisher. This should be a reverse domain-name style
+# string, e.g. com.mycompany.MyDocSet.documentation.
+# The default value is: org.doxygen.Publisher.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
+
+# The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher.
+# The default value is: Publisher.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
+
+DOCSET_PUBLISHER_NAME  = Publisher
+
+# If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
+# additional HTML index files: index.hhp, index.hhc, and index.hhk. The
+# index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
+# (see: http://www.microsoft.com/en-us/download/details.aspx?id=21138) on
+# Windows.
+#
+# The HTML Help Workshop contains a compiler that can convert all HTML output
+# generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
+# files are now used as the Windows 98 help format, and will replace the old
+# Windows help format (.hlp) on all Windows platforms in the future. Compressed
+# HTML files also contain an index, a table of contents, and you can search for
+# words in the documentation. The HTML workshop also contains a viewer for
+# compressed HTML files.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_HTMLHELP      = NO
+
+# The CHM_FILE tag can be used to specify the file name of the resulting .chm
+# file. You can add a path in front of the file if the result should not be
+# written to the html output directory.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+CHM_FILE               =
+
+# The HHC_LOCATION tag can be used to specify the location (absolute path
+# including file name) of the HTML help compiler ( hhc.exe). If non-empty
+# doxygen will try to run the HTML help compiler on the generated index.hhp.
+# The file has to be specified with full path.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+HHC_LOCATION           =
+
+# The GENERATE_CHI flag controls if a separate .chi index file is generated (
+# YES) or that it should be included in the master .chm file ( NO).
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+GENERATE_CHI           = NO
+
+# The CHM_INDEX_ENCODING is used to encode HtmlHelp index ( hhk), content ( hhc)
+# and project file content.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+CHM_INDEX_ENCODING     =
+
+# The BINARY_TOC flag controls whether a binary table of contents is generated (
+# YES) or a normal table of contents ( NO) in the .chm file.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+BINARY_TOC             = NO
+
+# The TOC_EXPAND flag can be set to YES to add extra items for group members to
+# the table of contents of the HTML help documentation and to the tree view.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
+
+TOC_EXPAND             = NO
+
+# If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
+# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that
+# can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help
+# (.qch) of the generated HTML documentation.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_QHP           = NO
+
+# If the QHG_LOCATION tag is specified, the QCH_FILE tag can be used to specify
+# the file name of the resulting .qch file. The path specified is relative to
+# the HTML output folder.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QCH_FILE               =
+
+# The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help
+# Project output. For more information please see Qt Help Project / Namespace
+# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace).
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_NAMESPACE          = org.doxygen.Project
+
+# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt
+# Help Project output. For more information please see Qt Help Project / Virtual
+# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual-
+# folders).
+# The default value is: doc.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_VIRTUAL_FOLDER     = doc
+
+# If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom
+# filter to add. For more information please see Qt Help Project / Custom
+# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
+# filters).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_CUST_FILTER_NAME   =
+
+# The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the
+# custom filter to add. For more information please see Qt Help Project / Custom
+# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
+# filters).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_CUST_FILTER_ATTRS  =
+
+# The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
+# project's filter section matches. Qt Help Project / Filter Attributes (see:
+# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes).
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHP_SECT_FILTER_ATTRS  =
+
+# The QHG_LOCATION tag can be used to specify the location of Qt's
+# qhelpgenerator. If non-empty doxygen will try to run qhelpgenerator on the
+# generated .qhp file.
+# This tag requires that the tag GENERATE_QHP is set to YES.
+
+QHG_LOCATION           =
+
+# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be
+# generated, together with the HTML files, they form an Eclipse help plugin. To
+# install this plugin and make it available under the help contents menu in
+# Eclipse, the contents of the directory containing the HTML and XML files needs
+# to be copied into the plugins directory of eclipse. The name of the directory
+# within the plugins directory should be the same as the ECLIPSE_DOC_ID value.
+# After copying Eclipse needs to be restarted before the help appears.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_ECLIPSEHELP   = NO
+
+# A unique identifier for the Eclipse help plugin. When installing the plugin
+# the directory name containing the HTML and XML files should also have this
+# name. Each documentation set should have its own identifier.
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_ECLIPSEHELP is set to YES.
+
+ECLIPSE_DOC_ID         = org.doxygen.Project
+
+# If you want full control over the layout of the generated HTML pages it might
+# be necessary to disable the index and replace it with your own. The
+# DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) at top
+# of each HTML page. A value of NO enables the index and the value YES disables
+# it. Since the tabs in the index contain the same information as the navigation
+# tree, you can set this option to YES if you also set GENERATE_TREEVIEW to YES.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+DISABLE_INDEX          = NO
+
+# The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
+# structure should be generated to display hierarchical information. If the tag
+# value is set to YES, a side panel will be generated containing a tree-like
+# index structure (just like the one that is generated for HTML Help). For this
+# to work a browser that supports JavaScript, DHTML, CSS and frames is required
+# (i.e. any modern browser). Windows users are probably better off using the
+# HTML help feature. Via custom stylesheets (see HTML_EXTRA_STYLESHEET) one can
+# further fine-tune the look of the index. As an example, the default style
+# sheet generated by doxygen has an example that shows how to put an image at
+# the root of the tree instead of the PROJECT_NAME. Since the tree basically has
+# the same information as the tab index, you could consider setting
+# DISABLE_INDEX to YES when enabling this option.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+GENERATE_TREEVIEW      = NO
+
+# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
+# doxygen will group on one line in the generated HTML documentation.
+#
+# Note that a value of 0 will completely suppress the enum values from appearing
+# in the overview section.
+# Minimum value: 0, maximum value: 20, default value: 4.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+ENUM_VALUES_PER_LINE   = 4
+
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be used
+# to set the initial width (in pixels) of the frame in which the tree is shown.
+# Minimum value: 0, maximum value: 1500, default value: 250.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+TREEVIEW_WIDTH         = 250
+
+# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open links to
+# external symbols imported via tag files in a separate window.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+EXT_LINKS_IN_WINDOW    = NO
+
+# Use this tag to change the font size of LaTeX formulas included as images in
+# the HTML documentation. When you change the font size after a successful
+# doxygen run you need to manually remove any form_*.png images from the HTML
+# output directory to force them to be regenerated.
+# Minimum value: 8, maximum value: 50, default value: 10.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FORMULA_FONTSIZE       = 10
+
+# Use the FORMULA_TRANPARENT tag to determine whether or not the images
+# generated for formulas are transparent PNGs. Transparent PNGs are not
+# supported properly for IE 6.0, but are supported on all modern browsers.
+#
+# Note that when changing this option you need to delete any form_*.png files in
+# the HTML output directory before the changes have effect.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+FORMULA_TRANSPARENT    = YES
+
+# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
+# http://www.mathjax.org) which uses client side Javascript for the rendering
+# instead of using prerendered bitmaps. Use this if you do not have LaTeX
+# installed or if you want to formulas look prettier in the HTML output. When
+# enabled you may also need to install MathJax separately and configure the path
+# to it using the MATHJAX_RELPATH option.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+USE_MATHJAX            = NO
+
+# When MathJax is enabled you can set the default output format to be used for
+# the MathJax output. See the MathJax site (see:
+# http://docs.mathjax.org/en/latest/output.html) for more details.
+# Possible values are: HTML-CSS (which is slower, but has the best
+# compatibility), NativeMML (i.e. MathML) and SVG.
+# The default value is: HTML-CSS.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_FORMAT         = HTML-CSS
+
+# When MathJax is enabled you need to specify the location relative to the HTML
+# output directory using the MATHJAX_RELPATH option. The destination directory
+# should contain the MathJax.js script. For instance, if the mathjax directory
+# is located at the same level as the HTML output directory, then
+# MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
+# Content Delivery Network so you can quickly see the result without installing
+# MathJax. However, it is strongly recommended to install a local copy of
+# MathJax from http://www.mathjax.org before deployment.
+# The default value is: http://cdn.mathjax.org/mathjax/latest.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
+
+# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
+# extension names that should be enabled during MathJax rendering. For example
+# MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_EXTENSIONS     =
+
+# The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces
+# of code that will be used on startup of the MathJax code. See the MathJax site
+# (see: http://docs.mathjax.org/en/latest/output.html) for more details. For an
+# example see the documentation.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_CODEFILE       =
+
+# When the SEARCHENGINE tag is enabled doxygen will generate a search box for
+# the HTML output. The underlying search engine uses javascript and DHTML and
+# should work on any modern browser. Note that when using HTML help
+# (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET)
+# there is already a search function so this one should typically be disabled.
+# For large projects the javascript based search engine can be slow, then
+# enabling SERVER_BASED_SEARCH may provide a better solution. It is possible to
+# search using the keyboard; to jump to the search box use <access key> + S
+# (what the <access key> is depends on the OS and browser, but it is typically
+# <CTRL>, <ALT>/<option>, or both). Inside the search box use the <cursor down
+# key> to jump into the search results window, the results can be navigated
+# using the <cursor keys>. Press <Enter> to select an item or <escape> to cancel
+# the search. The filter options can be selected when the cursor is inside the
+# search box by pressing <Shift>+<cursor down>. Also here use the <cursor keys>
+# to select a filter and <Enter> or <escape> to activate or cancel the filter
+# option.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+SEARCHENGINE           = YES
+
+# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
+# implemented using a web server instead of a web client using Javascript. There
+# are two flavours of web server based searching depending on the
+# EXTERNAL_SEARCH setting. When disabled, doxygen will generate a PHP script for
+# searching and an index file used by the script. When EXTERNAL_SEARCH is
+# enabled the indexing and searching needs to be provided by external tools. See
+# the section "External Indexing and Searching" for details.
+# The default value is: NO.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SERVER_BASED_SEARCH    = NO
+
+# When EXTERNAL_SEARCH tag is enabled doxygen will no longer generate the PHP
+# script for searching. Instead the search results are written to an XML file
+# which needs to be processed by an external indexer. Doxygen will invoke an
+# external search engine pointed to by the SEARCHENGINE_URL option to obtain the
+# search results.
+#
+# Doxygen ships with an example indexer ( doxyindexer) and search engine
+# (doxysearch.cgi) which are based on the open source search engine library
+# Xapian (see: http://xapian.org/).
+#
+# See the section "External Indexing and Searching" for details.
+# The default value is: NO.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTERNAL_SEARCH        = NO
+
+# The SEARCHENGINE_URL should point to a search engine hosted by a web server
+# which will return the search results when EXTERNAL_SEARCH is enabled.
+#
+# Doxygen ships with an example indexer ( doxyindexer) and search engine
+# (doxysearch.cgi) which are based on the open source search engine library
+# Xapian (see: http://xapian.org/). See the section "External Indexing and
+# Searching" for details.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SEARCHENGINE_URL       =
+
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed
+# search data is written to a file for indexing by an external tool. With the
+# SEARCHDATA_FILE tag the name of this file can be specified.
+# The default file is: searchdata.xml.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SEARCHDATA_FILE        = searchdata.xml
+
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the
+# EXTERNAL_SEARCH_ID tag can be used as an identifier for the project. This is
+# useful in combination with EXTRA_SEARCH_MAPPINGS to search through multiple
+# projects and redirect the results back to the right project.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTERNAL_SEARCH_ID     =
+
+# The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen
+# projects other than the one defined by this configuration file, but that are
+# all added to the same external search index. Each project needs to have a
+# unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id of
+# to a relative location where the documentation can be found. The format is:
+# EXTRA_SEARCH_MAPPINGS = tagname1=loc1 tagname2=loc2 ...
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTRA_SEARCH_MAPPINGS  =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the LaTeX output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_LATEX tag is set to YES doxygen will generate LaTeX output.
+# The default value is: YES.
+
+GENERATE_LATEX         = YES
+
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: latex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_OUTPUT           = latex
+
+# The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
+# invoked.
+#
+# Note that when enabling USE_PDFLATEX this option is only used for generating
+# bitmaps for formulas in the HTML output, but not in the Makefile that is
+# written to the output directory.
+# The default file is: latex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_CMD_NAME         = latex
+
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to generate
+# index for LaTeX.
+# The default file is: makeindex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+MAKEINDEX_CMD_NAME     = makeindex
+
+# If the COMPACT_LATEX tag is set to YES doxygen generates more compact LaTeX
+# documents. This may be useful for small projects and may help to save some
+# trees in general.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+COMPACT_LATEX          = NO
+
+# The PAPER_TYPE tag can be used to set the paper type that is used by the
+# printer.
+# Possible values are: a4 (210 x 297 mm), letter (8.5 x 11 inches), legal (8.5 x
+# 14 inches) and executive (7.25 x 10.5 inches).
+# The default value is: a4.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+PAPER_TYPE             = a4
+
+# The EXTRA_PACKAGES tag can be used to specify one or more LaTeX package names
+# that should be included in the LaTeX output. To get the times font for
+# instance you can specify
+# EXTRA_PACKAGES=times
+# If left blank no extra packages will be included.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+EXTRA_PACKAGES         =
+
+# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
+# generated LaTeX document. The header should contain everything until the first
+# chapter. If it is left blank doxygen will generate a standard header. See
+# section "Doxygen usage" for information on how to let doxygen write the
+# default header to a separate file.
+#
+# Note: Only use a user-defined header if you know what you are doing! The
+# following commands have a special meaning inside the header: $title,
+# $datetime, $date, $doxygenversion, $projectname, $projectnumber. Doxygen will
+# replace them by respectively the title of the page, the current date and time,
+# only the current date, the version number of doxygen, the project name (see
+# PROJECT_NAME), or the project number (see PROJECT_NUMBER).
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_HEADER           =
+
+# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
+# generated LaTeX document. The footer should contain everything after the last
+# chapter. If it is left blank doxygen will generate a standard footer.
+#
+# Note: Only use a user-defined footer if you know what you are doing!
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_FOOTER           =
+
+# The LATEX_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the LATEX_OUTPUT output
+# directory. Note that the files will be copied as-is; there are no commands or
+# markers available.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_EXTRA_FILES      =
+
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated is
+# prepared for conversion to PDF (using ps2pdf or pdflatex). The PDF file will
+# contain links (just like the HTML output) instead of page references. This
+# makes the output suitable for online browsing using a PDF viewer.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+PDF_HYPERLINKS         = YES
+
+# If the LATEX_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
+# the PDF file directly from the LaTeX files. Set this option to YES to get a
+# higher quality PDF documentation.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+USE_PDFLATEX           = YES
+
+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
+# command to the generated LaTeX files. This will instruct LaTeX to keep running
+# if errors occur, instead of asking the user for help. This option is also used
+# when generating formulas in HTML.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_BATCHMODE        = NO
+
+# If the LATEX_HIDE_INDICES tag is set to YES then doxygen will not include the
+# index chapters (such as File Index, Compound Index, etc.) in the output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_HIDE_INDICES     = NO
+
+# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
+# code with syntax highlighting in the LaTeX output.
+#
+# Note that which sources are shown also depends on other settings such as
+# SOURCE_BROWSER.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_SOURCE_CODE      = NO
+
+# The LATEX_BIB_STYLE tag can be used to specify the style to use for the
+# bibliography, e.g. plainnat, or ieeetr. See
+# http://en.wikipedia.org/wiki/BibTeX and \cite for more info.
+# The default value is: plain.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_BIB_STYLE        = plain
+
+#---------------------------------------------------------------------------
+# Configuration options related to the RTF output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_RTF tag is set to YES doxygen will generate RTF output. The
+# RTF output is optimized for Word 97 and may not look too pretty with other RTF
+# readers/editors.
+# The default value is: NO.
+
+GENERATE_RTF           = NO
+
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: rtf.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_OUTPUT             = rtf
+
+# If the COMPACT_RTF tag is set to YES doxygen generates more compact RTF
+# documents. This may be useful for small projects and may help to save some
+# trees in general.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+COMPACT_RTF            = NO
+
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated will
+# contain hyperlink fields. The RTF file will contain links (just like the HTML
+# output) instead of page references. This makes the output suitable for online
+# browsing using Word or some other Word compatible readers that support those
+# fields.
+#
+# Note: WordPad (write) and others do not support links.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_HYPERLINKS         = NO
+
+# Load stylesheet definitions from file. Syntax is similar to doxygen's config
+# file, i.e. a series of assignments. You only have to provide replacements,
+# missing definitions are set to their default value.
+#
+# See also section "Doxygen usage" for information on how to generate the
+# default style sheet that doxygen normally uses.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_STYLESHEET_FILE    =
+
+# Set optional variables used in the generation of an RTF document. Syntax is
+# similar to doxygen's config file. A template extensions file can be generated
+# using doxygen -e rtf extensionFile.
+# This tag requires that the tag GENERATE_RTF is set to YES.
+
+RTF_EXTENSIONS_FILE    =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the man page output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_MAN tag is set to YES doxygen will generate man pages for
+# classes and files.
+# The default value is: NO.
+
+GENERATE_MAN           = NO
+
+# The MAN_OUTPUT tag is used to specify where the man pages will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it. A directory man3 will be created inside the directory specified by
+# MAN_OUTPUT.
+# The default directory is: man.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_OUTPUT             = man
+
+# The MAN_EXTENSION tag determines the extension that is added to the generated
+# man pages. In case the manual section does not start with a number, the number
+# 3 is prepended. The dot (.) at the beginning of the MAN_EXTENSION tag is
+# optional.
+# The default value is: .3.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_EXTENSION          = .3
+
+# If the MAN_LINKS tag is set to YES and doxygen generates man output, then it
+# will generate one additional man file for each entity documented in the real
+# man page(s). These additional files only source the real man page, but without
+# them the man command would be unable to find the correct page.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_MAN is set to YES.
+
+MAN_LINKS              = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the XML output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_XML tag is set to YES doxygen will generate an XML file that
+# captures the structure of the code including all documentation.
+# The default value is: NO.
+
+GENERATE_XML           = NO
+
+# The XML_OUTPUT tag is used to specify where the XML pages will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: xml.
+# This tag requires that the tag GENERATE_XML is set to YES.
+
+XML_OUTPUT             = xml
+
+# The XML_SCHEMA tag can be used to specify a XML schema, which can be used by a
+# validating XML parser to check the syntax of the XML files.
+# This tag requires that the tag GENERATE_XML is set to YES.
+
+XML_SCHEMA             =
+
+# The XML_DTD tag can be used to specify a XML DTD, which can be used by a
+# validating XML parser to check the syntax of the XML files.
+# This tag requires that the tag GENERATE_XML is set to YES.
+
+XML_DTD                =
+
+# If the XML_PROGRAMLISTING tag is set to YES doxygen will dump the program
+# listings (including syntax highlighting and cross-referencing information) to
+# the XML output. Note that enabling this will significantly increase the size
+# of the XML output.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_XML is set to YES.
+
+XML_PROGRAMLISTING     = YES
+
+#---------------------------------------------------------------------------
+# Configuration options related to the DOCBOOK output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_DOCBOOK tag is set to YES doxygen will generate Docbook files
+# that can be used to generate PDF.
+# The default value is: NO.
+
+GENERATE_DOCBOOK       = NO
+
+# The DOCBOOK_OUTPUT tag is used to specify where the Docbook pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be put in
+# front of it.
+# The default directory is: docbook.
+# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
+
+DOCBOOK_OUTPUT         = docbook
+
+#---------------------------------------------------------------------------
+# Configuration options for the AutoGen Definitions output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_AUTOGEN_DEF tag is set to YES doxygen will generate an AutoGen
+# Definitions (see http://autogen.sf.net) file that captures the structure of
+# the code including all documentation. Note that this feature is still
+# experimental and incomplete at the moment.
+# The default value is: NO.
+
+GENERATE_AUTOGEN_DEF   = NO
+
+#---------------------------------------------------------------------------
+# Configuration options related to the Perl module output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_PERLMOD tag is set to YES doxygen will generate a Perl module
+# file that captures the structure of the code including all documentation.
+#
+# Note that this feature is still experimental and incomplete at the moment.
+# The default value is: NO.
+
+GENERATE_PERLMOD       = NO
+
+# If the PERLMOD_LATEX tag is set to YES doxygen will generate the necessary
+# Makefile rules, Perl scripts and LaTeX code to be able to generate PDF and DVI
+# output from the Perl module output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
+PERLMOD_LATEX          = NO
+
+# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be nicely
+# formatted so it can be parsed by a human reader. This is useful if you want to
+# understand what is going on. On the other hand, if this tag is set to NO the
+# size of the Perl module output will be much smaller and Perl will parse it
+# just the same.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
+PERLMOD_PRETTY         = YES
+
+# The names of the make variables in the generated doxyrules.make file are
+# prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. This is useful
+# so different doxyrules.make files included by the same Makefile don't
+# overwrite each other's variables.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
+
+PERLMOD_MAKEVAR_PREFIX =
+
+#---------------------------------------------------------------------------
+# Configuration options related to the preprocessor
+#---------------------------------------------------------------------------
+
+# If the ENABLE_PREPROCESSING tag is set to YES doxygen will evaluate all
+# C-preprocessor directives found in the sources and include files.
+# The default value is: YES.
+
+ENABLE_PREPROCESSING   = YES
+
+# If the MACRO_EXPANSION tag is set to YES doxygen will expand all macro names
+# in the source code. If set to NO only conditional compilation will be
+# performed. Macro expansion can be done in a controlled way by setting
+# EXPAND_ONLY_PREDEF to YES.
+# The default value is: NO.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+MACRO_EXPANSION        = YES
+
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then
+# the macro expansion is limited to the macros specified with the PREDEFINED and
+# EXPAND_AS_DEFINED tags.
+# The default value is: NO.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+EXPAND_ONLY_PREDEF     = YES
+
+# If the SEARCH_INCLUDES tag is set to YES the includes files in the
+# INCLUDE_PATH will be searched if a #include is found.
+# The default value is: YES.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+SEARCH_INCLUDES        = YES
+
+# The INCLUDE_PATH tag can be used to specify one or more directories that
+# contain include files that are not input files but should be processed by the
+# preprocessor.
+# This tag requires that the tag SEARCH_INCLUDES is set to YES.
+
+INCLUDE_PATH           =
+
+# You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
+# patterns (like *.h and *.hpp) to filter out the header-files in the
+# directories. If left blank, the patterns specified with FILE_PATTERNS will be
+# used.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+INCLUDE_FILE_PATTERNS  =
+
+# The PREDEFINED tag can be used to specify one or more macro names that are
+# defined before the preprocessor is started (similar to the -D option of e.g.
+# gcc). The argument of the tag is a list of macros of the form: name or
+# name=definition (no spaces). If the definition and the "=" are omitted, "=1"
+# is assumed. To prevent a macro definition from being undefined via #undef or
+# recursively expanded use the := operator instead of the = operator.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+PREDEFINED             = __cplusplus=1 DOXYGEN_SKIP LIVES_DLL_PUBLIC= LIVES_DLL_LOCAL=
+
+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
+# tag can be used to specify a list of macro names that should be expanded. The
+# macro definition that is found in the sources will be used. Use the PREDEFINED
+# tag if you want to use a different macro definition that overrules the
+# definition found in the source code.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+EXPAND_AS_DEFINED      =
+
+# If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will
+# remove all refrences to function-like macros that are alone on a line, have an
+# all uppercase name, and do not end with a semicolon. Such function macros are
+# typically used for boiler-plate code, and will confuse the parser if not
+# removed.
+# The default value is: YES.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
+
+SKIP_FUNCTION_MACROS   = YES
+
+#---------------------------------------------------------------------------
+# Configuration options related to external references
+#---------------------------------------------------------------------------
+
+# The TAGFILES tag can be used to specify one or more tag files. For each tag
+# file the location of the external documentation should be added. The format of
+# a tag file without this location is as follows:
+# TAGFILES = file1 file2 ...
+# Adding location for the tag files is done as follows:
+# TAGFILES = file1=loc1 "file2 = loc2" ...
+# where loc1 and loc2 can be relative or absolute paths or URLs. See the
+# section "Linking to external documentation" for more information about the use
+# of tag files.
+# Note: Each tag file must have an unique name (where the name does NOT include
+# the path). If a tag file is not located in the directory in which doxygen is
+# run, you must also specify the path to the tagfile here.
+
+TAGFILES               =
+
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create a
+# tag file that is based on the input files it reads. See section "Linking to
+# external documentation" for more information about the usage of tag files.
+
+GENERATE_TAGFILE       =
+
+# If the ALLEXTERNALS tag is set to YES all external class will be listed in the
+# class index. If set to NO only the inherited external classes will be listed.
+# The default value is: NO.
+
+ALLEXTERNALS           = NO
+
+# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed in
+# the modules index. If set to NO, only the current project's groups will be
+# listed.
+# The default value is: YES.
+
+EXTERNAL_GROUPS        = YES
+
+# If the EXTERNAL_PAGES tag is set to YES all external pages will be listed in
+# the related pages index. If set to NO, only the current project's pages will
+# be listed.
+# The default value is: YES.
+
+EXTERNAL_PAGES         = YES
+
+# The PERL_PATH should be the absolute path and name of the perl script
+# interpreter (i.e. the result of 'which perl').
+# The default file (with absolute path) is: /usr/bin/perl.
+
+PERL_PATH              = /usr/bin/perl
+
+#---------------------------------------------------------------------------
+# Configuration options related to the dot tool
+#---------------------------------------------------------------------------
+
+# If the CLASS_DIAGRAMS tag is set to YES doxygen will generate a class diagram
+# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to
+# NO turns the diagrams off. Note that this option also works with HAVE_DOT
+# disabled, but it is recommended to install and use dot, since it yields more
+# powerful graphs.
+# The default value is: YES.
+
+CLASS_DIAGRAMS         = YES
+
+# You can define message sequence charts within doxygen comments using the \msc
+# command. Doxygen will then run the mscgen tool (see:
+# http://www.mcternan.me.uk/mscgen/)) to produce the chart and insert it in the
+# documentation. The MSCGEN_PATH tag allows you to specify the directory where
+# the mscgen tool resides. If left empty the tool is assumed to be found in the
+# default search path.
+
+MSCGEN_PATH            =
+
+# You can include diagrams made with dia in doxygen documentation. Doxygen will
+# then run dia to produce the diagram and insert it in the documentation. The
+# DIA_PATH tag allows you to specify the directory where the dia binary resides.
+# If left empty dia is assumed to be found in the default search path.
+
+DIA_PATH               =
+
+# If set to YES, the inheritance and collaboration graphs will hide inheritance
+# and usage relations if the target is undocumented or is not a class.
+# The default value is: YES.
+
+HIDE_UNDOC_RELATIONS   = YES
+
+# If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
+# available from the path. This tool is part of Graphviz (see:
+# http://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent
+# Bell Labs. The other options in this section have no effect if this option is
+# set to NO
+# The default value is: NO.
+
+HAVE_DOT               = NO
+
+# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed
+# to run in parallel. When set to 0 doxygen will base this on the number of
+# processors available in the system. You can set it explicitly to a value
+# larger than 0 to get control over the balance between CPU load and processing
+# speed.
+# Minimum value: 0, maximum value: 32, default value: 0.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_NUM_THREADS        = 0
+
+# When you want a differently looking font n the dot files that doxygen
+# generates you can specify the font name using DOT_FONTNAME. You need to make
+# sure dot is able to find the font, which can be done by putting it in a
+# standard location or by setting the DOTFONTPATH environment variable or by
+# setting DOT_FONTPATH to the directory containing the font.
+# The default value is: Helvetica.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_FONTNAME           = Helvetica
+
+# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of
+# dot graphs.
+# Minimum value: 4, maximum value: 24, default value: 10.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_FONTSIZE           = 10
+
+# By default doxygen will tell dot to use the default font as specified with
+# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set
+# the path where dot can find it using this tag.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_FONTPATH           =
+
+# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for
+# each documented class showing the direct and indirect inheritance relations.
+# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+CLASS_GRAPH            = YES
+
+# If the COLLABORATION_GRAPH tag is set to YES then doxygen will generate a
+# graph for each documented class showing the direct and indirect implementation
+# dependencies (inheritance, containment, and class references variables) of the
+# class with other documented classes.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+COLLABORATION_GRAPH    = YES
+
+# If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for
+# groups, showing the direct groups dependencies.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+GROUP_GRAPHS           = YES
+
+# If the UML_LOOK tag is set to YES doxygen will generate inheritance and
+# collaboration diagrams in a style similar to the OMG's Unified Modeling
+# Language.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+UML_LOOK               = NO
+
+# If the UML_LOOK tag is enabled, the fields and methods are shown inside the
+# class node. If there are many fields or methods and many nodes the graph may
+# become too big to be useful. The UML_LIMIT_NUM_FIELDS threshold limits the
+# number of items for each type to make the size more manageable. Set this to 0
+# for no limit. Note that the threshold may be exceeded by 50% before the limit
+# is enforced. So when you set the threshold to 10, up to 15 fields may appear,
+# but if the number exceeds 15, the total amount of fields shown is limited to
+# 10.
+# Minimum value: 0, maximum value: 100, default value: 10.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+UML_LIMIT_NUM_FIELDS   = 10
+
+# If the TEMPLATE_RELATIONS tag is set to YES then the inheritance and
+# collaboration graphs will show the relations between templates and their
+# instances.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+TEMPLATE_RELATIONS     = NO
+
+# If the INCLUDE_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are set to
+# YES then doxygen will generate a graph for each documented file showing the
+# direct and indirect include dependencies of the file with other documented
+# files.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INCLUDE_GRAPH          = YES
+
+# If the INCLUDED_BY_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are
+# set to YES then doxygen will generate a graph for each documented file showing
+# the direct and indirect include dependencies of the file with other documented
+# files.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INCLUDED_BY_GRAPH      = YES
+
+# If the CALL_GRAPH tag is set to YES then doxygen will generate a call
+# dependency graph for every global function or class method.
+#
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable call graphs for selected
+# functions only using the \callgraph command.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+CALL_GRAPH             = NO
+
+# If the CALLER_GRAPH tag is set to YES then doxygen will generate a caller
+# dependency graph for every global function or class method.
+#
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable caller graphs for selected
+# functions only using the \callergraph command.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+CALLER_GRAPH           = NO
+
+# If the GRAPHICAL_HIERARCHY tag is set to YES then doxygen will graphical
+# hierarchy of all classes instead of a textual one.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+GRAPHICAL_HIERARCHY    = YES
+
+# If the DIRECTORY_GRAPH tag is set to YES then doxygen will show the
+# dependencies a directory has on other directories in a graphical way. The
+# dependency relations are determined by the #include relations between the
+# files in the directories.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DIRECTORY_GRAPH        = YES
+
+# The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
+# generated by dot.
+# Note: If you choose svg you need to set HTML_FILE_EXTENSION to xhtml in order
+# to make the SVG files visible in IE 9+ (other browsers do not have this
+# requirement).
+# Possible values are: png, jpg, gif and svg.
+# The default value is: png.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_IMAGE_FORMAT       = png
+
+# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
+# enable generation of interactive SVG images that allow zooming and panning.
+#
+# Note that this requires a modern browser other than Internet Explorer. Tested
+# and working are Firefox, Chrome, Safari, and Opera.
+# Note: For IE 9+ you need to set HTML_FILE_EXTENSION to xhtml in order to make
+# the SVG files visible. Older versions of IE do not have SVG support.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INTERACTIVE_SVG        = NO
+
+# The DOT_PATH tag can be used to specify the path where the dot tool can be
+# found. If left blank, it is assumed the dot tool can be found in the path.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_PATH               =
+
+# The DOTFILE_DIRS tag can be used to specify one or more directories that
+# contain dot files that are included in the documentation (see the \dotfile
+# command).
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOTFILE_DIRS           =
+
+# The MSCFILE_DIRS tag can be used to specify one or more directories that
+# contain msc files that are included in the documentation (see the \mscfile
+# command).
+
+MSCFILE_DIRS           =
+
+# The DIAFILE_DIRS tag can be used to specify one or more directories that
+# contain dia files that are included in the documentation (see the \diafile
+# command).
+
+DIAFILE_DIRS           =
+
+# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes
+# that will be shown in the graph. If the number of nodes in a graph becomes
+# larger than this value, doxygen will truncate the graph, which is visualized
+# by representing a node as a red box. Note that doxygen if the number of direct
+# children of the root node in a graph is already larger than
+# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note that
+# the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
+# Minimum value: 0, maximum value: 10000, default value: 50.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_GRAPH_MAX_NODES    = 50
+
+# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the graphs
+# generated by dot. A depth value of 3 means that only nodes reachable from the
+# root by following a path via at most 3 edges will be shown. Nodes that lay
+# further from the root node will be omitted. Note that setting this option to 1
+# or 2 may greatly reduce the computation time needed for large code bases. Also
+# note that the size of a graph can be further restricted by
+# DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
+# Minimum value: 0, maximum value: 1000, default value: 0.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+MAX_DOT_GRAPH_DEPTH    = 0
+
+# Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
+# background. This is disabled by default, because dot on Windows does not seem
+# to support this out of the box.
+#
+# Warning: Depending on the platform used, enabling this option may lead to
+# badly anti-aliased labels on the edges of a graph (i.e. they become hard to
+# read).
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_TRANSPARENT        = NO
+
+# Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output
+# files in one run (i.e. multiple -o and -T options on the command line). This
+# makes dot run faster, but since only newer versions of dot (>1.8.10) support
+# this, this feature is disabled by default.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_MULTI_TARGETS      = YES
+
+# If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page
+# explaining the meaning of the various boxes and arrows in the dot generated
+# graphs.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+GENERATE_LEGEND        = YES
+
+# If the DOT_CLEANUP tag is set to YES doxygen will remove the intermediate dot
+# files that are used to generate the various graphs.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+DOT_CLEANUP            = YES

LiVES-2.2.8.tar.bz2/libweed/Makefile.am -> LiVES-2.4.1.tar.bz2/libweed/Makefile.am Changed

@@ -24,8 +24,8 @@
 	@echo "Doxygen not installed, skipping sourcecode documentation"
 endif
 
-WEED_SO_VERSION = 0:6:0
-WEED_PSO_VERSION = 0:12:0
+WEED_SO_VERSION = 0:8:0
+WEED_PSO_VERSION = 0:13:0
 
 LIBS =
 
@@ -39,9 +39,9 @@
 extra_cflags = -fPIC -DPIC
 endif
 
-EXTRA_DIST = libweed.doxygen libweed.pc libweed-plugin.pc libweed_slice.pc libweed-utils.pc libweed-compat.pc
+lib_LTLIBRARIES = libweed.la libweed_slice.la libweed-utils.la libweed_slice_scripting.la libweed-utils_scripting.la
 
-lib_LTLIBRARIES = libweed.la libweed_slice.la libweed-utils.la
+EXTRA_DIST = libweed.doxygen libweed.pc libweed-plugin.pc libweed_slice.pc libweed-utils.pc libweed-compat.pc
 
 libweed_la_SOURCES = weed.c
 
@@ -50,12 +50,19 @@
 libweed_utils_la_SOURCES = weed-utils.c 
 
 
+libweed_slice_scripting_la_SOURCES = weed-gslice_scripting.c
+
+libweed_utils_scripting_la_SOURCES = weed-utils_scripting.c 
+
+
 libweedinclude_HEADERS = weed.h weed-host.h weed-plugin.h weed-utils.h weed-events.h weed-palettes.h weed-effects.h \
 	weed-compat.h
 
 libweedincludedir = "$(includedir)/weed"
 
 libweed_ladir = "$(libdir)/weed"
+libweed_scripting_ladir = "$(libdir)/weed"
+
 
 libweed_la_CFLAGS = -fvisibility=hidden
 
@@ -63,7 +70,7 @@
 
 libweed_la_LDFLAGS = -version-info $(WEED_SO_VERSION) $(shared_LDFLAGS)
 
-libweed_slice_la_CFLAGS = @GLIB_CFLAGS@ -fvisibility=hidden
+libweed_slice_la_CFLAGS = @GLIB_CFLAGS@ $(libweed_la_CFLAGS)
 
 libweed_slice_la_LDFLAGS = @GLIB_LIBS@ -version-info $(WEED_SO_VERSION) $(shared_LDFLAGS)
 
@@ -72,9 +79,19 @@
 libweed_utils_la_LDFLAGS = $(extra_ldflags) -version-info $(WEED_SO_VERSION) $(shared_LDFLAGS)
 
 
+libweed_slice_scripting_la_CFLAGS = @GLIB_CFLAGS@ $(libweed_la_CFLAGS)
+
+libweed_slice_scripting_la_LDFLAGS = @GLIB_LIBS@ -version-info $(WEED_SO_VERSION) $(shared_LDFLAGS)
+
+libweed_utils_scripting_la_CFLAGS = $(extra_cflags) @GLIB_CFLAGS@
+
+libweed_utils_scripting_la_LDFLAGS = $(extra_ldflags) -version-info $(WEED_SO_VERSION) $(shared_LDFLAGS) @GLIB_LIBS@
+
+
 uninstall-local:
 	rm -rf "$(libweedincludedir)"
 	rm -rf "$(libweed_ladir)"
+	rm -rf "$(libdir)/libweed"*
 	rm -rf "$(libdir)/pkgconfig/libweed"*

LiVES-2.2.8.tar.bz2/libweed/Makefile.in -> LiVES-2.4.1.tar.bz2/libweed/Makefile.in Changed

@@ -162,6 +162,15 @@
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(libweed_utils_la_CFLAGS) $(CFLAGS) \
 	$(libweed_utils_la_LDFLAGS) $(LDFLAGS) -o $@
+libweed_utils_scripting_la_LIBADD =
+am_libweed_utils_scripting_la_OBJECTS =  \
+	libweed_utils_scripting_la-weed-utils_scripting.lo
+libweed_utils_scripting_la_OBJECTS =  \
+	$(am_libweed_utils_scripting_la_OBJECTS)
+libweed_utils_scripting_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(libweed_utils_scripting_la_CFLAGS) $(CFLAGS) \
+	$(libweed_utils_scripting_la_LDFLAGS) $(LDFLAGS) -o $@
 libweed_la_LIBADD =
 am_libweed_la_OBJECTS = libweed_la-weed.lo
 libweed_la_OBJECTS = $(am_libweed_la_OBJECTS)
@@ -175,6 +184,15 @@
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
 	$(libweed_slice_la_CFLAGS) $(CFLAGS) \
 	$(libweed_slice_la_LDFLAGS) $(LDFLAGS) -o $@
+libweed_slice_scripting_la_LIBADD =
+am_libweed_slice_scripting_la_OBJECTS =  \
+	libweed_slice_scripting_la-weed-gslice_scripting.lo
+libweed_slice_scripting_la_OBJECTS =  \
+	$(am_libweed_slice_scripting_la_OBJECTS)
+libweed_slice_scripting_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
+	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
+	$(libweed_slice_scripting_la_CFLAGS) $(CFLAGS) \
+	$(libweed_slice_scripting_la_LDFLAGS) $(LDFLAGS) -o $@
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
 am__v_P_0 = false
@@ -209,10 +227,14 @@
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
 am__v_CCLD_0 = @echo "  CCLD    " $@;
 am__v_CCLD_1 = 
-SOURCES = $(libweed_utils_la_SOURCES) $(libweed_la_SOURCES) \
-	$(libweed_slice_la_SOURCES)
-DIST_SOURCES = $(libweed_utils_la_SOURCES) $(libweed_la_SOURCES) \
-	$(libweed_slice_la_SOURCES)
+SOURCES = $(libweed_utils_la_SOURCES) \
+	$(libweed_utils_scripting_la_SOURCES) $(libweed_la_SOURCES) \
+	$(libweed_slice_la_SOURCES) \
+	$(libweed_slice_scripting_la_SOURCES)
+DIST_SOURCES = $(libweed_utils_la_SOURCES) \
+	$(libweed_utils_scripting_la_SOURCES) $(libweed_la_SOURCES) \
+	$(libweed_slice_la_SOURCES) \
+	$(libweed_slice_scripting_la_SOURCES)
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -497,29 +519,36 @@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
 v4l1_INCFILE = @v4l1_INCFILE@
-WEED_SO_VERSION = 0:6:0
-WEED_PSO_VERSION = 0:12:0
+WEED_SO_VERSION = 0:8:0
+WEED_PSO_VERSION = 0:13:0
 @IS_DARWIN_FALSE@extra_ldflags = -fPIC -DPIC
 @IS_DARWIN_TRUE@extra_ldflags = 
 @IS_DARWIN_FALSE@extra_cflags = -fPIC -DPIC
 @IS_DARWIN_TRUE@extra_cflags = 
+lib_LTLIBRARIES = libweed.la libweed_slice.la libweed-utils.la libweed_slice_scripting.la libweed-utils_scripting.la
 EXTRA_DIST = libweed.doxygen libweed.pc libweed-plugin.pc libweed_slice.pc libweed-utils.pc libweed-compat.pc
-lib_LTLIBRARIES = libweed.la libweed_slice.la libweed-utils.la
 libweed_la_SOURCES = weed.c
 libweed_slice_la_SOURCES = weed-gslice.c
 libweed_utils_la_SOURCES = weed-utils.c 
+libweed_slice_scripting_la_SOURCES = weed-gslice_scripting.c
+libweed_utils_scripting_la_SOURCES = weed-utils_scripting.c 
 libweedinclude_HEADERS = weed.h weed-host.h weed-plugin.h weed-utils.h weed-events.h weed-palettes.h weed-effects.h \
 	weed-compat.h
 
 libweedincludedir = "$(includedir)/weed"
 libweed_ladir = "$(libdir)/weed"
+libweed_scripting_ladir = "$(libdir)/weed"
 libweed_la_CFLAGS = -fvisibility=hidden
 shared_LDFLAGS = -shared --tag=disable-static
 libweed_la_LDFLAGS = -version-info $(WEED_SO_VERSION) $(shared_LDFLAGS)
-libweed_slice_la_CFLAGS = @GLIB_CFLAGS@ -fvisibility=hidden
+libweed_slice_la_CFLAGS = @GLIB_CFLAGS@ $(libweed_la_CFLAGS)
 libweed_slice_la_LDFLAGS = @GLIB_LIBS@ -version-info $(WEED_SO_VERSION) $(shared_LDFLAGS)
 libweed_utils_la_CFLAGS = $(extra_cflags)
 libweed_utils_la_LDFLAGS = $(extra_ldflags) -version-info $(WEED_SO_VERSION) $(shared_LDFLAGS)
+libweed_slice_scripting_la_CFLAGS = @GLIB_CFLAGS@ $(libweed_la_CFLAGS)
+libweed_slice_scripting_la_LDFLAGS = @GLIB_LIBS@ -version-info $(WEED_SO_VERSION) $(shared_LDFLAGS)
+libweed_utils_scripting_la_CFLAGS = $(extra_cflags) @GLIB_CFLAGS@
+libweed_utils_scripting_la_LDFLAGS = $(extra_ldflags) -version-info $(WEED_SO_VERSION) $(shared_LDFLAGS) @GLIB_LIBS@
 all: all-am
 
 .SUFFIXES:
@@ -593,12 +622,18 @@
 libweed-utils.la: $(libweed_utils_la_OBJECTS) $(libweed_utils_la_DEPENDENCIES) $(EXTRA_libweed_utils_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(libweed_utils_la_LINK) -rpath $(libdir) $(libweed_utils_la_OBJECTS) $(libweed_utils_la_LIBADD) $(LIBS)
 
+libweed-utils_scripting.la: $(libweed_utils_scripting_la_OBJECTS) $(libweed_utils_scripting_la_DEPENDENCIES) $(EXTRA_libweed_utils_scripting_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(libweed_utils_scripting_la_LINK) -rpath $(libdir) $(libweed_utils_scripting_la_OBJECTS) $(libweed_utils_scripting_la_LIBADD) $(LIBS)
+
 libweed.la: $(libweed_la_OBJECTS) $(libweed_la_DEPENDENCIES) $(EXTRA_libweed_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(libweed_la_LINK) -rpath $(libdir) $(libweed_la_OBJECTS) $(libweed_la_LIBADD) $(LIBS)
 
 libweed_slice.la: $(libweed_slice_la_OBJECTS) $(libweed_slice_la_DEPENDENCIES) $(EXTRA_libweed_slice_la_DEPENDENCIES) 
 	$(AM_V_CCLD)$(libweed_slice_la_LINK) -rpath $(libdir) $(libweed_slice_la_OBJECTS) $(libweed_slice_la_LIBADD) $(LIBS)
 
+libweed_slice_scripting.la: $(libweed_slice_scripting_la_OBJECTS) $(libweed_slice_scripting_la_DEPENDENCIES) $(EXTRA_libweed_slice_scripting_la_DEPENDENCIES) 
+	$(AM_V_CCLD)$(libweed_slice_scripting_la_LINK) -rpath $(libdir) $(libweed_slice_scripting_la_OBJECTS) $(libweed_slice_scripting_la_LIBADD) $(LIBS)
+
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
 
@@ -607,7 +642,9 @@
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libweed_la-weed.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libweed_slice_la-weed-gslice.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libweed_slice_scripting_la-weed-gslice_scripting.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libweed_utils_la-weed-utils.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libweed_utils_scripting_la-weed-utils_scripting.Plo@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
@@ -637,6 +674,13 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libweed_utils_la_CFLAGS) $(CFLAGS) -c -o libweed_utils_la-weed-utils.lo `test -f 'weed-utils.c' || echo '$(srcdir)/'`weed-utils.c
 
+libweed_utils_scripting_la-weed-utils_scripting.lo: weed-utils_scripting.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libweed_utils_scripting_la_CFLAGS) $(CFLAGS) -MT libweed_utils_scripting_la-weed-utils_scripting.lo -MD -MP -MF $(DEPDIR)/libweed_utils_scripting_la-weed-utils_scripting.Tpo -c -o libweed_utils_scripting_la-weed-utils_scripting.lo `test -f 'weed-utils_scripting.c' || echo '$(srcdir)/'`weed-utils_scripting.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libweed_utils_scripting_la-weed-utils_scripting.Tpo $(DEPDIR)/libweed_utils_scripting_la-weed-utils_scripting.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='weed-utils_scripting.c' object='libweed_utils_scripting_la-weed-utils_scripting.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libweed_utils_scripting_la_CFLAGS) $(CFLAGS) -c -o libweed_utils_scripting_la-weed-utils_scripting.lo `test -f 'weed-utils_scripting.c' || echo '$(srcdir)/'`weed-utils_scripting.c
+
 libweed_la-weed.lo: weed.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libweed_la_CFLAGS) $(CFLAGS) -MT libweed_la-weed.lo -MD -MP -MF $(DEPDIR)/libweed_la-weed.Tpo -c -o libweed_la-weed.lo `test -f 'weed.c' || echo '$(srcdir)/'`weed.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libweed_la-weed.Tpo $(DEPDIR)/libweed_la-weed.Plo
@@ -651,6 +695,13 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libweed_slice_la_CFLAGS) $(CFLAGS) -c -o libweed_slice_la-weed-gslice.lo `test -f 'weed-gslice.c' || echo '$(srcdir)/'`weed-gslice.c
 
+libweed_slice_scripting_la-weed-gslice_scripting.lo: weed-gslice_scripting.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libweed_slice_scripting_la_CFLAGS) $(CFLAGS) -MT libweed_slice_scripting_la-weed-gslice_scripting.lo -MD -MP -MF $(DEPDIR)/libweed_slice_scripting_la-weed-gslice_scripting.Tpo -c -o libweed_slice_scripting_la-weed-gslice_scripting.lo `test -f 'weed-gslice_scripting.c' || echo '$(srcdir)/'`weed-gslice_scripting.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/libweed_slice_scripting_la-weed-gslice_scripting.Tpo $(DEPDIR)/libweed_slice_scripting_la-weed-gslice_scripting.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='weed-gslice_scripting.c' object='libweed_slice_scripting_la-weed-gslice_scripting.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libweed_slice_scripting_la_CFLAGS) $(CFLAGS) -c -o libweed_slice_scripting_la-weed-gslice_scripting.lo `test -f 'weed-gslice_scripting.c' || echo '$(srcdir)/'`weed-gslice_scripting.c
+
 mostlyclean-libtool:
 	-rm -f *.lo
 
@@ -903,6 +954,7 @@
 uninstall-local:
 	rm -rf "$(libweedincludedir)"
 	rm -rf "$(libweed_ladir)"
+	rm -rf "$(libdir)/libweed"*
 	rm -rf "$(libdir)/pkgconfig/libweed"*
 
 install-exec-hook:

LiVES-2.2.8.tar.bz2/libweed/libweed-compat.pc -> LiVES-2.4.1.tar.bz2/libweed/libweed-compat.pc Changed

LiVES-2.2.8.tar.bz2/libweed/libweed-utils.pc -> LiVES-2.4.1.tar.bz2/libweed/libweed-utils.pc Changed

LiVES-2.2.8.tar.bz2/libweed/libweed.doxygen -> LiVES-2.4.1.tar.bz2/libweed/libweed.doxygen Changed

@@ -1,96 +1,121 @@
-# Doxyfile 1.7.1
+# Doxyfile 1.8.6
 
 # This file describes the settings to be used by the documentation system
-# doxygen (www.doxygen.org) for a project
+# doxygen (www.doxygen.org) for a project.
 #
-# All text after a hash (#) is considered a comment and will be ignored
+# All text after a double hash (##) is considered a comment and is placed in
+# front of the TAG it is preceding.
+#
+# All text after a single hash (#) is considered a comment and will be ignored.
 # The format is:
-#       TAG = value [value, ...]
-# For lists items can also be appended using:
-#       TAG += value [value, ...]
-# Values that contain spaces should be placed between quotes (" ")
+# TAG = value [value, ...]
+# For lists, items can also be appended using:
+# TAG += value [value, ...]
+# Values that contain spaces should be placed between quotes (\" \").
 
 #---------------------------------------------------------------------------
 # Project related configuration options
 #---------------------------------------------------------------------------
 
 # This tag specifies the encoding used for all characters in the config file
-# that follow. The default is UTF-8 which is also the encoding used for all
-# text before the first occurrence of this tag. Doxygen uses libiconv (or the
-# iconv built into libc) for the transcoding. See
-# http://www.gnu.org/software/libiconv for the list of possible encodings.
+# that follow. The default is UTF-8 which is also the encoding used for all text
+# before the first occurrence of this tag. Doxygen uses libiconv (or the iconv
+# built into libc) for the transcoding. See http://www.gnu.org/software/libiconv
+# for the list of possible encodings.
+# The default value is: UTF-8.
 
 DOXYFILE_ENCODING      = UTF-8
 
-# The PROJECT_NAME tag is a single word (or a sequence of words surrounded
-# by quotes) that should identify the project.
+# The PROJECT_NAME tag is a single word (or a sequence of words surrounded by
+# double-quotes, unless you are using Doxywizard) that should identify the
+# project for which the documentation is generated. This name is used in the
+# title of most generated pages and in a few other places.
+# The default value is: My Project.
 
 PROJECT_NAME           = libweed
 
-# The PROJECT_NUMBER tag can be used to enter a project or revision number.
-# This could be handy for archiving the generated documentation or
-# if some version control system is used.
-
-PROJECT_NUMBER         = 0.0.3
-
-# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute)
-# base path where the generated documentation will be put.
-# If a relative path is entered, it will be relative to the location
-# where doxygen was started. If left blank the current directory will be used.
+# The PROJECT_NUMBER tag can be used to enter a project or revision number. This
+# could be handy for archiving the generated documentation or if some version
+# control system is used.
+
+PROJECT_NUMBER         = 0.6.0
+
+# Using the PROJECT_BRIEF tag one can provide an optional one line description
+# for a project that appears at the top of each page and should give viewer a
+# quick idea about the purpose of the project. Keep the description short.
+
+PROJECT_BRIEF          =
+
+# With the PROJECT_LOGO tag one can specify an logo or icon that is included in
+# the documentation. The maximum height of the logo should not exceed 55 pixels
+# and the maximum width should not exceed 200 pixels. Doxygen will copy the logo
+# to the output directory.
+
+PROJECT_LOGO           =
+
+# The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) path
+# into which the generated documentation will be written. If a relative path is
+# entered, it will be relative to the location where doxygen was started. If
+# left blank the current directory will be used.
 
 OUTPUT_DIRECTORY       = ../weed-docs/doxygen
 
-# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
-# 4096 sub-directories (in 2 levels) under the output directory of each output
-# format and will distribute the generated files over these directories.
-# Enabling this option can be useful when feeding doxygen a huge amount of
-# source files, where putting all generated files in the same directory would
-# otherwise cause performance problems for the file system.
+# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 4096 sub-
+# directories (in 2 levels) under the output directory of each output format and
+# will distribute the generated files over these directories. Enabling this
+# option can be useful when feeding doxygen a huge amount of source files, where
+# putting all generated files in the same directory would otherwise causes
+# performance problems for the file system.
+# The default value is: NO.
 
 CREATE_SUBDIRS         = NO
 
 # The OUTPUT_LANGUAGE tag is used to specify the language in which all
 # documentation generated by doxygen is written. Doxygen will use this
 # information to generate all constant output in the proper language.
-# The default language is English, other supported languages are:
-# Afrikaans, Arabic, Brazilian, Catalan, Chinese, Chinese-Traditional,
-# Croatian, Czech, Danish, Dutch, Esperanto, Farsi, Finnish, French, German,
-# Greek, Hungarian, Italian, Japanese, Japanese-en (Japanese with English
-# messages), Korean, Korean-en, Lithuanian, Norwegian, Macedonian, Persian,
-# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak,
-# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese.
+# Possible values are: Afrikaans, Arabic, Armenian, Brazilian, Catalan, Chinese,
+# Chinese-Traditional, Croatian, Czech, Danish, Dutch, English (United States),
+# Esperanto, Farsi (Persian), Finnish, French, German, Greek, Hungarian,
+# Indonesian, Italian, Japanese, Japanese-en (Japanese with English messages),
+# Korean, Korean-en (Korean with English messages), Latvian, Lithuanian,
+# Macedonian, Norwegian, Persian (Farsi), Polish, Portuguese, Romanian, Russian,
+# Serbian, Serbian-Cyrillic, Slovak, Slovene, Spanish, Swedish, Turkish,
+# Ukrainian and Vietnamese.
+# The default value is: English.
 
 OUTPUT_LANGUAGE        = English
 
-# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
-# include brief member descriptions after the members that are listed in
-# the file and class documentation (similar to JavaDoc).
-# Set to NO to disable this.
+# If the BRIEF_MEMBER_DESC tag is set to YES doxygen will include brief member
+# descriptions after the members that are listed in the file and class
+# documentation (similar to Javadoc). Set to NO to disable this.
+# The default value is: YES.
 
 BRIEF_MEMBER_DESC      = YES
 
-# If the REPEAT_BRIEF tag is set to YES (the default) Doxygen will prepend
-# the brief description of a member or function before the detailed description.
-# Note: if both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
+# If the REPEAT_BRIEF tag is set to YES doxygen will prepend the brief
+# description of a member or function before the detailed description
+#
+# Note: If both HIDE_UNDOC_MEMBERS and BRIEF_MEMBER_DESC are set to NO, the
 # brief descriptions will be completely suppressed.
+# The default value is: YES.
 
 REPEAT_BRIEF           = YES
 
-# This tag implements a quasi-intelligent brief description abbreviator
-# that is used to form the text in various listings. Each string
-# in this list, if found as the leading text of the brief description, will be
-# stripped from the text and the result after processing the whole list, is
-# used as the annotated text. Otherwise, the brief description is used as-is.
-# If left blank, the following values are used ("$name" is automatically
-# replaced with the name of the entity): "The $name class" "The $name widget"
-# "The $name file" "is" "provides" "specifies" "contains"
-# "represents" "a" "an" "the"
+# This tag implements a quasi-intelligent brief description abbreviator that is
+# used to form the text in various listings. Each string in this list, if found
+# as the leading text of the brief description, will be stripped from the text
+# and the result, after processing the whole list, is used as the annotated
+# text. Otherwise, the brief description is used as-is. If left blank, the
+# following values are used ($name is automatically replaced with the name of
+# the entity):The $name class, The $name widget, The $name file, is, provides,
+# specifies, contains, represents, a, an and the.
 
 ABBREVIATE_BRIEF       =
 
 # If the ALWAYS_DETAILED_SEC and REPEAT_BRIEF tags are both set to YES then
-# Doxygen will generate a detailed section even if there is only a brief
+# doxygen will generate a detailed section even if there is only a brief
 # description.
+# The default value is: NO.
 
 ALWAYS_DETAILED_SEC    = NO
 
@@ -98,153 +123,204 @@
 # inherited members of a class in the documentation of that class as if those
 # members were ordinary class members. Constructors, destructors and assignment
 # operators of the base classes will not be shown.
+# The default value is: NO.
 
 INLINE_INHERITED_MEMB  = NO
 
-# If the FULL_PATH_NAMES tag is set to YES then Doxygen will prepend the full
-# path before files name in the file list and in the header files. If set
-# to NO the shortest path that makes the file name unique will be used.
+# If the FULL_PATH_NAMES tag is set to YES doxygen will prepend the full path
+# before files name in the file list and in the header files. If set to NO the
+# shortest path that makes the file name unique will be used
+# The default value is: YES.
 
 FULL_PATH_NAMES        = NO
 
-# If the FULL_PATH_NAMES tag is set to YES then the STRIP_FROM_PATH tag
-# can be used to strip a user-defined part of the path. Stripping is
-# only done if one of the specified strings matches the left-hand part of
-# the path. The tag can be used to show relative paths in the file list.
-# If left blank the directory from which doxygen is run is used as the
-# path to strip.
+# The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path.
+# Stripping is only done if one of the specified strings matches the left-hand
+# part of the path. The tag can be used to show relative paths in the file list.
+# If left blank the directory from which doxygen is run is used as the path to
+# strip.
+#
+# Note that you can specify absolute paths here, but also relative paths, which
+# will be relative from the directory where doxygen is started.
+# This tag requires that the tag FULL_PATH_NAMES is set to YES.
 
 STRIP_FROM_PATH        =
 
-# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of
-# the path mentioned in the documentation of a class, which tells
-# the reader which header file to include in order to use a class.
-# If left blank only the name of the header file containing the class
-# definition is used. Otherwise one should specify the include paths that
-# are normally passed to the compiler using the -I flag.
+# The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of the
+# path mentioned in the documentation of a class, which tells the reader which
+# header file to include in order to use a class. If left blank only the name of
+# the header file containing the class definition is used. Otherwise one should
+# specify the list of include paths that are normally passed to the compiler
+# using the -I flag.
 
 STRIP_FROM_INC_PATH    =
 
-# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter
-# (but less readable) file names. This can be useful is your file systems
-# doesn't support long names like on DOS, Mac, or CD-ROM.
+# If the SHORT_NAMES tag is set to YES, doxygen will generate much shorter (but
+# less readable) file names. This can be useful is your file systems doesn't
+# support long names like on DOS, Mac, or CD-ROM.
+# The default value is: NO.
 
 SHORT_NAMES            = NO
 
-# If the JAVADOC_AUTOBRIEF tag is set to YES then Doxygen
-# will interpret the first line (until the first dot) of a JavaDoc-style
-# comment as the brief description. If set to NO, the JavaDoc
-# comments will behave just like regular Qt-style comments
-# (thus requiring an explicit @brief command for a brief description.)
+# If the JAVADOC_AUTOBRIEF tag is set to YES then doxygen will interpret the
+# first line (until the first dot) of a Javadoc-style comment as the brief
+# description. If set to NO, the Javadoc-style will behave just like regular Qt-
+# style comments (thus requiring an explicit @brief command for a brief
+# description.)
+# The default value is: NO.
 
 JAVADOC_AUTOBRIEF      = NO
 
-# If the QT_AUTOBRIEF tag is set to YES then Doxygen will
-# interpret the first line (until the first dot) of a Qt-style
-# comment as the brief description. If set to NO, the comments
-# will behave just like regular Qt-style comments (thus requiring
-# an explicit \brief command for a brief description.)
+# If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first
+# line (until the first dot) of a Qt-style comment as the brief description. If
+# set to NO, the Qt-style will behave just like regular Qt-style comments (thus
+# requiring an explicit \brief command for a brief description.)
+# The default value is: NO.
 
 QT_AUTOBRIEF           = NO
 
-# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make Doxygen
-# treat a multi-line C++ special comment block (i.e. a block of //! or ///
-# comments) as a brief description. This used to be the default behaviour.
-# The new default is to treat a multi-line C++ comment block as a detailed
-# description. Set this tag to YES if you prefer the old behaviour instead.
+# The MULTILINE_CPP_IS_BRIEF tag can be set to YES to make doxygen treat a
+# multi-line C++ special comment block (i.e. a block of //! or /// comments) as
+# a brief description. This used to be the default behavior. The new default is
+# to treat a multi-line C++ comment block as a detailed description. Set this
+# tag to YES if you prefer the old behavior instead.
+#
+# Note that setting this tag to YES also means that rational rose comments are
+# not recognized any more.
+# The default value is: NO.
 
 MULTILINE_CPP_IS_BRIEF = NO
 
-# If the INHERIT_DOCS tag is set to YES (the default) then an undocumented
-# member inherits the documentation from any documented member that it
-# re-implements.
+# If the INHERIT_DOCS tag is set to YES then an undocumented member inherits the
+# documentation from any documented member that it re-implements.
+# The default value is: YES.
 
 INHERIT_DOCS           = YES
 
-# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce
-# a new page for each member. If set to NO, the documentation of a member will
-# be part of the file/class/namespace that contains it.
+# If the SEPARATE_MEMBER_PAGES tag is set to YES, then doxygen will produce a
+# new page for each member. If set to NO, the documentation of a member will be
+# part of the file/class/namespace that contains it.
+# The default value is: NO.
 
 SEPARATE_MEMBER_PAGES  = NO
 
-# The TAB_SIZE tag can be used to set the number of spaces in a tab.
-# Doxygen uses this value to replace tabs by spaces in code fragments.
+# The TAB_SIZE tag can be used to set the number of spaces in a tab. Doxygen
+# uses this value to replace tabs by spaces in code fragments.
+# Minimum value: 1, maximum value: 16, default value: 4.
 
 TAB_SIZE               = 8
 
-# This tag can be used to specify a number of aliases that acts
-# as commands in the documentation. An alias has the form "name=value".
-# For example adding "sideeffect=\par Side Effects:\n" will allow you to
-# put the command \sideeffect (or @sideeffect) in the documentation, which
-# will result in a user-defined paragraph with heading "Side Effects:".
-# You can put \n's in the value part of an alias to insert newlines.
+# This tag can be used to specify a number of aliases that act as commands in
+# the documentation. An alias has the form:
+# name=value
+# For example adding
+# "sideeffect=@par Side Effects:\n"
+# will allow you to put the command \sideeffect (or @sideeffect) in the
+# documentation, which will result in a user-defined paragraph with heading
+# "Side Effects:". You can put \n's in the value part of an alias to insert
+# newlines.
 
 ALIASES                =
 
-# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C
-# sources only. Doxygen will then generate output that is more tailored for C.
-# For instance, some of the names that are used will be different. The list
-# of all members will be omitted, etc.
+# This tag can be used to specify a number of word-keyword mappings (TCL only).
+# A mapping has the form "name=value". For example adding "class=itcl::class"
+# will allow you to use the command class in the itcl::class meaning.
+
+TCL_SUBST              =
+
+# Set the OPTIMIZE_OUTPUT_FOR_C tag to YES if your project consists of C sources
+# only. Doxygen will then generate output that is more tailored for C. For
+# instance, some of the names that are used will be different. The list of all
+# members will be omitted, etc.
+# The default value is: NO.
 
 OPTIMIZE_OUTPUT_FOR_C  = YES
 
-# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java
-# sources only. Doxygen will then generate output that is more tailored for
-# Java. For instance, namespaces will be presented as packages, qualified
-# scopes will look different, etc.
+# Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or
+# Python sources only. Doxygen will then generate output that is more tailored
+# for that language. For instance, namespaces will be presented as packages,
+# qualified scopes will look different, etc.
+# The default value is: NO.
 
 OPTIMIZE_OUTPUT_JAVA   = NO
 
 # Set the OPTIMIZE_FOR_FORTRAN tag to YES if your project consists of Fortran
-# sources only. Doxygen will then generate output that is more tailored for
-# Fortran.
+# sources. Doxygen will then generate output that is tailored for Fortran.
+# The default value is: NO.
 
 OPTIMIZE_FOR_FORTRAN   = NO
 
 # Set the OPTIMIZE_OUTPUT_VHDL tag to YES if your project consists of VHDL
-# sources. Doxygen will then generate output that is tailored for
-# VHDL.
+# sources. Doxygen will then generate output that is tailored for VHDL.
+# The default value is: NO.
 
 OPTIMIZE_OUTPUT_VHDL   = NO
 
 # Doxygen selects the parser to use depending on the extension of the files it
-# parses. With this tag you can assign which parser to use for a given extension.
-# Doxygen has a built-in mapping, but you can override or extend it using this
-# tag. The format is ext=language, where ext is a file extension, and language
-# is one of the parsers supported by doxygen: IDL, Java, Javascript, CSharp, C,
-# C++, D, PHP, Objective-C, Python, Fortran, VHDL, C, C++. For instance to make
+# parses. With this tag you can assign which parser to use for a given
+# extension. Doxygen has a built-in mapping, but you can override or extend it
+# using this tag. The format is ext=language, where ext is a file extension, and
+# language is one of the parsers supported by doxygen: IDL, Java, Javascript,
+# C#, C, C++, D, PHP, Objective-C, Python, Fortran, VHDL. For instance to make
 # doxygen treat .inc files as Fortran files (default is PHP), and .f files as C
-# (default is Fortran), use: inc=Fortran f=C. Note that for custom extensions
-# you also need to set FILE_PATTERNS otherwise the files are not read by doxygen.
+# (default is Fortran), use: inc=Fortran f=C.
+#
+# Note For files without extension you can use no_extension as a placeholder.
+#
+# Note that for custom extensions you also need to set FILE_PATTERNS otherwise
+# the files are not read by doxygen.
 
 EXTENSION_MAPPING      =
 
+# If the MARKDOWN_SUPPORT tag is enabled then doxygen pre-processes all comments
+# according to the Markdown format, which allows for more readable
+# documentation. See http://daringfireball.net/projects/markdown/ for details.
+# The output of markdown processing is further processed by doxygen, so you can
+# mix doxygen, HTML, and XML commands with Markdown formatting. Disable only in
+# case of backward compatibilities issues.
+# The default value is: YES.
+
+MARKDOWN_SUPPORT       = YES
+
+# When enabled doxygen tries to link words that correspond to documented
+# classes, or namespaces to their corresponding documentation. Such a link can
+# be prevented in individual cases by by putting a % sign in front of the word
+# or globally by setting AUTOLINK_SUPPORT to NO.
+# The default value is: YES.
+
+AUTOLINK_SUPPORT       = YES
+
 # If you use STL classes (i.e. std::string, std::vector, etc.) but do not want
-# to include (a tag file for) the STL sources as input, then you should
-# set this tag to YES in order to let doxygen match functions declarations and
-# definitions whose arguments contain STL classes (e.g. func(std::string); v.s.
-# func(std::string) {}). This also make the inheritance and collaboration
+# to include (a tag file for) the STL sources as input, then you should set this
+# tag to YES in order to let doxygen match functions declarations and
+# definitions whose arguments contain STL classes (e.g. func(std::string);
+# versus func(std::string) {}). This also make the inheritance and collaboration
 # diagrams that involve STL classes more complete and accurate.
+# The default value is: NO.
 
 BUILTIN_STL_SUPPORT    = NO
 
 # If you use Microsoft's C++/CLI language, you should set this option to YES to
 # enable parsing support.
+# The default value is: NO.
 
 CPP_CLI_SUPPORT        = NO
 
-# Set the SIP_SUPPORT tag to YES if your project consists of sip sources only.
-# Doxygen will parse them like normal C++ but will assume all classes use public
-# instead of private inheritance when no explicit protection keyword is present.
+# Set the SIP_SUPPORT tag to YES if your project consists of sip (see:
+# http://www.riverbankcomputing.co.uk/software/sip/intro) sources only. Doxygen
+# will parse them like normal C++ but will assume all classes use public instead
+# of private inheritance when no explicit protection keyword is present.
+# The default value is: NO.
 
 SIP_SUPPORT            = NO
 
-# For Microsoft's IDL there are propget and propput attributes to indicate getter
-# and setter methods for a property. Setting this option to YES (the default)
-# will make doxygen to replace the get and set methods by a property in the
-# documentation. This will only work if the methods are indeed getting or
-# setting a simple type. If this is not the case, or you want to show the
-# methods anyway, you should set this option to NO.
+# For Microsoft's IDL there are propget and propput attributes to indicate
+# getter and setter methods for a property. Setting this option to YES will make
+# doxygen to replace the get and set methods by a property in the documentation.
+# This will only work if the methods are indeed getting or setting a simple
+# type. If this is not the case, or you want to show the methods anyway, you
+# should set this option to NO.
+# The default value is: YES.
 
 IDL_PROPERTY_SUPPORT   = YES
 
@@ -252,1068 +328,1554 @@
 # tag is set to YES, then doxygen will reuse the documentation of the first
 # member in the group (if any) for the other members of the group. By default
 # all members of a group must be documented explicitly.
+# The default value is: NO.
 
 DISTRIBUTE_GROUP_DOC   = NO
 
-# Set the SUBGROUPING tag to YES (the default) to allow class member groups of
-# the same type (for instance a group of public functions) to be put as a
-# subgroup of that type (e.g. under the Public Functions section). Set it to
-# NO to prevent subgrouping. Alternatively, this can be done per class using
-# the \nosubgrouping command.
+# Set the SUBGROUPING tag to YES to allow class member groups of the same type
+# (for instance a group of public functions) to be put as a subgroup of that
+# type (e.g. under the Public Functions section). Set it to NO to prevent
+# subgrouping. Alternatively, this can be done per class using the
+# \nosubgrouping command.
+# The default value is: YES.
 
 SUBGROUPING            = YES
 
-# When TYPEDEF_HIDES_STRUCT is enabled, a typedef of a struct, union, or enum
-# is documented as struct, union, or enum with the name of the typedef. So
+# When the INLINE_GROUPED_CLASSES tag is set to YES, classes, structs and unions
+# are shown inside the group in which they are included (e.g. using \ingroup)
+# instead of on a separate page (for HTML and Man pages) or section (for LaTeX
+# and RTF).
+#
+# Note that this feature does not work in combination with
+# SEPARATE_MEMBER_PAGES.
+# The default value is: NO.
+
+INLINE_GROUPED_CLASSES = NO
+
+# When the INLINE_SIMPLE_STRUCTS tag is set to YES, structs, classes, and unions
+# with only public data fields or simple typedef fields will be shown inline in
+# the documentation of the scope in which they are defined (i.e. file,
+# namespace, or group documentation), provided this scope is documented. If set
+# to NO, structs, classes, and unions are shown on a separate page (for HTML and
+# Man pages) or section (for LaTeX and RTF).
+# The default value is: NO.
+
+INLINE_SIMPLE_STRUCTS  = NO
+
+# When TYPEDEF_HIDES_STRUCT tag is enabled, a typedef of a struct, union, or
+# enum is documented as struct, union, or enum with the name of the typedef. So
 # typedef struct TypeS {} TypeT, will appear in the documentation as a struct
 # with name TypeT. When disabled the typedef will appear as a member of a file,
-# namespace, or class. And the struct will be named TypeS. This can typically
-# be useful for C code in case the coding convention dictates that all compound
+# namespace, or class. And the struct will be named TypeS. This can typically be
+# useful for C code in case the coding convention dictates that all compound
 # types are typedef'ed and only the typedef is referenced, never the tag name.
+# The default value is: NO.
 
 TYPEDEF_HIDES_STRUCT   = YES
 
-# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to
-# determine which symbols to keep in memory and which to flush to disk.
-# When the cache is full, less often used symbols will be written to disk.
-# For small to medium size projects (<1000 input files) the default value is
-# probably good enough. For larger projects a too small cache size can cause
-# doxygen to be busy swapping symbols to and from disk most of the time
-# causing a significant performance penality.
-# If the system has enough physical memory increasing the cache will improve the
-# performance by keeping more symbols in memory. Note that the value works on
-# a logarithmic scale so increasing the size by one will rougly double the
-# memory usage. The cache size is given by this formula:
-# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0,
-# corresponding to a cache size of 2^16 = 65536 symbols
+# The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This
+# cache is used to resolve symbols given their name and scope. Since this can be
+# an expensive process and often the same symbol appears multiple times in the
+# code, doxygen keeps a cache of pre-resolved symbols. If the cache is too small
+# doxygen will become slower. If the cache is too large, memory is wasted. The
+# cache size is given by this formula: 2^(16+LOOKUP_CACHE_SIZE). The valid range
+# is 0..9, the default is 0, corresponding to a cache size of 2^16=65536
+# symbols. At the end of a run doxygen will report the cache usage and suggest
+# the optimal cache size from a speed point of view.
+# Minimum value: 0, maximum value: 9, default value: 0.
 
-SYMBOL_CACHE_SIZE      = 0
+LOOKUP_CACHE_SIZE      = 0
 
 #---------------------------------------------------------------------------
 # Build related configuration options
 #---------------------------------------------------------------------------
 
 # If the EXTRACT_ALL tag is set to YES doxygen will assume all entities in
-# documentation are documented, even if no documentation was available.
-# Private class members and static file members will be hidden unless
-# the EXTRACT_PRIVATE and EXTRACT_STATIC tags are set to YES
+# documentation are documented, even if no documentation was available. Private
+# class members and static file members will be hidden unless the
+# EXTRACT_PRIVATE respectively EXTRACT_STATIC tags are set to YES.
+# Note: This will also disable the warnings about undocumented members that are
+# normally produced when WARNINGS is set to YES.
+# The default value is: NO.
 
 EXTRACT_ALL            = YES
 
-# If the EXTRACT_PRIVATE tag is set to YES all private members of a class
-# will be included in the documentation.
+# If the EXTRACT_PRIVATE tag is set to YES all private members of a class will
+# be included in the documentation.
+# The default value is: NO.
 
 EXTRACT_PRIVATE        = NO
 
-# If the EXTRACT_STATIC tag is set to YES all static members of a file
-# will be included in the documentation.
+# If the EXTRACT_PACKAGE tag is set to YES all members with package or internal
+# scope will be included in the documentation.
+# The default value is: NO.
+
+EXTRACT_PACKAGE        = NO
+
+# If the EXTRACT_STATIC tag is set to YES all static members of a file will be
+# included in the documentation.
+# The default value is: NO.
 
 EXTRACT_STATIC         = NO
 
-# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs)
-# defined locally in source files will be included in the documentation.
-# If set to NO only classes defined in header files are included.
+# If the EXTRACT_LOCAL_CLASSES tag is set to YES classes (and structs) defined
+# locally in source files will be included in the documentation. If set to NO
+# only classes defined in header files are included. Does not have any effect
+# for Java sources.
+# The default value is: YES.
 
 EXTRACT_LOCAL_CLASSES  = NO
 
-# This flag is only useful for Objective-C code. When set to YES local
-# methods, which are defined in the implementation section but not in
-# the interface are included in the documentation.
-# If set to NO (the default) only methods in the interface are included.
+# This flag is only useful for Objective-C code. When set to YES local methods,
+# which are defined in the implementation section but not in the interface are
+# included in the documentation. If set to NO only methods in the interface are
+# included.
+# The default value is: NO.
 
 EXTRACT_LOCAL_METHODS  = NO
 
 # If this flag is set to YES, the members of anonymous namespaces will be
 # extracted and appear in the documentation as a namespace called
-# 'anonymous_namespace{file}', where file will be replaced with the base
-# name of the file that contains the anonymous namespace. By default
-# anonymous namespace are hidden.
+# 'anonymous_namespace{file}', where file will be replaced with the base name of
+# the file that contains the anonymous namespace. By default anonymous namespace
+# are hidden.
+# The default value is: NO.
 
 EXTRACT_ANON_NSPACES   = NO
 
-# If the HIDE_UNDOC_MEMBERS tag is set to YES, Doxygen will hide all
-# undocumented members of documented classes, files or namespaces.
-# If set to NO (the default) these members will be included in the
-# various overviews, but no documentation section is generated.
-# This option has no effect if EXTRACT_ALL is enabled.
+# If the HIDE_UNDOC_MEMBERS tag is set to YES, doxygen will hide all
+# undocumented members inside documented classes or files. If set to NO these
+# members will be included in the various overviews, but no documentation
+# section is generated. This option has no effect if EXTRACT_ALL is enabled.
+# The default value is: NO.
 
 HIDE_UNDOC_MEMBERS     = NO
 
-# If the HIDE_UNDOC_CLASSES tag is set to YES, Doxygen will hide all
-# undocumented classes that are normally visible in the class hierarchy.
-# If set to NO (the default) these classes will be included in the various
-# overviews. This option has no effect if EXTRACT_ALL is enabled.
+# If the HIDE_UNDOC_CLASSES tag is set to YES, doxygen will hide all
+# undocumented classes that are normally visible in the class hierarchy. If set
+# to NO these classes will be included in the various overviews. This option has
+# no effect if EXTRACT_ALL is enabled.
+# The default value is: NO.
 
 HIDE_UNDOC_CLASSES     = NO
 
-# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, Doxygen will hide all
-# friend (class|struct|union) declarations.
-# If set to NO (the default) these declarations will be included in the
-# documentation.
+# If the HIDE_FRIEND_COMPOUNDS tag is set to YES, doxygen will hide all friend
+# (class|struct|union) declarations. If set to NO these declarations will be
+# included in the documentation.
+# The default value is: NO.
 
 HIDE_FRIEND_COMPOUNDS  = NO
 
-# If the HIDE_IN_BODY_DOCS tag is set to YES, Doxygen will hide any
-# documentation blocks found inside the body of a function.
-# If set to NO (the default) these blocks will be appended to the
-# function's detailed documentation block.
+# If the HIDE_IN_BODY_DOCS tag is set to YES, doxygen will hide any
+# documentation blocks found inside the body of a function. If set to NO these
+# blocks will be appended to the function's detailed documentation block.
+# The default value is: NO.
 
 HIDE_IN_BODY_DOCS      = NO
 
-# The INTERNAL_DOCS tag determines if documentation
-# that is typed after a \internal command is included. If the tag is set
-# to NO (the default) then the documentation will be excluded.
-# Set it to YES to include the internal documentation.
+# The INTERNAL_DOCS tag determines if documentation that is typed after a
+# \internal command is included. If the tag is set to NO then the documentation
+# will be excluded. Set it to YES to include the internal documentation.
+# The default value is: NO.
 
 INTERNAL_DOCS          = NO
 
-# If the CASE_SENSE_NAMES tag is set to NO then Doxygen will only generate
-# file names in lower-case letters. If set to YES upper-case letters are also
+# If the CASE_SENSE_NAMES tag is set to NO then doxygen will only generate file
+# names in lower-case letters. If set to YES upper-case letters are also
 # allowed. This is useful if you have classes or files whose names only differ
 # in case and if your file system supports case sensitive file names. Windows
 # and Mac users are advised to set this option to NO.
+# The default value is: system dependent.
 
 CASE_SENSE_NAMES       = YES
 
-# If the HIDE_SCOPE_NAMES tag is set to NO (the default) then Doxygen
-# will show members with their full class and namespace scopes in the
-# documentation. If set to YES the scope will be hidden.
+# If the HIDE_SCOPE_NAMES tag is set to NO then doxygen will show members with
+# their full class and namespace scopes in the documentation. If set to YES the
+# scope will be hidden.
+# The default value is: NO.
 
 HIDE_SCOPE_NAMES       = NO
 
-# If the SHOW_INCLUDE_FILES tag is set to YES (the default) then Doxygen
-# will put a list of the files that are included by a file in the documentation
-# of that file.
+# If the SHOW_INCLUDE_FILES tag is set to YES then doxygen will put a list of
+# the files that are included by a file in the documentation of that file.
+# The default value is: YES.
 
 SHOW_INCLUDE_FILES     = YES
 
-# If the FORCE_LOCAL_INCLUDES tag is set to YES then Doxygen
-# will list include files with double quotes in the documentation
-# rather than with sharp brackets.
+# If the SHOW_GROUPED_MEMB_INC tag is set to YES then Doxygen will add for each
+# grouped member an include statement to the documentation, telling the reader
+# which file to include in order to use the member.
+# The default value is: NO.
+
+SHOW_GROUPED_MEMB_INC  = NO
+
+# If the FORCE_LOCAL_INCLUDES tag is set to YES then doxygen will list include
+# files with double quotes in the documentation rather than with sharp brackets.
+# The default value is: NO.
 
 FORCE_LOCAL_INCLUDES   = NO
 
-# If the INLINE_INFO tag is set to YES (the default) then a tag [inline]
-# is inserted in the documentation for inline members.
+# If the INLINE_INFO tag is set to YES then a tag [inline] is inserted in the
+# documentation for inline members.
+# The default value is: YES.
 
 INLINE_INFO            = YES
 
-# If the SORT_MEMBER_DOCS tag is set to YES (the default) then doxygen
-# will sort the (detailed) documentation of file and class members
-# alphabetically by member name. If set to NO the members will appear in
-# declaration order.
+# If the SORT_MEMBER_DOCS tag is set to YES then doxygen will sort the
+# (detailed) documentation of file and class members alphabetically by member
+# name. If set to NO the members will appear in declaration order.
+# The default value is: YES.
 
 SORT_MEMBER_DOCS       = YES
 
-# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the
-# brief documentation of file, namespace and class members alphabetically
-# by member name. If set to NO (the default) the members will appear in
-# declaration order.
+# If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the brief
+# descriptions of file, namespace and class members alphabetically by member
+# name. If set to NO the members will appear in declaration order. Note that
+# this will also influence the order of the classes in the class list.
+# The default value is: NO.
 
 SORT_BRIEF_DOCS        = NO
 
-# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen
-# will sort the (brief and detailed) documentation of class members so that
-# constructors and destructors are listed first. If set to NO (the default)
-# the constructors will appear in the respective orders defined by
-# SORT_MEMBER_DOCS and SORT_BRIEF_DOCS.
-# This tag will be ignored for brief docs if SORT_BRIEF_DOCS is set to NO
-# and ignored for detailed docs if SORT_MEMBER_DOCS is set to NO.
+# If the SORT_MEMBERS_CTORS_1ST tag is set to YES then doxygen will sort the
+# (brief and detailed) documentation of class members so that constructors and
+# destructors are listed first. If set to NO the constructors will appear in the
+# respective orders defined by SORT_BRIEF_DOCS and SORT_MEMBER_DOCS.
+# Note: If SORT_BRIEF_DOCS is set to NO this option is ignored for sorting brief
+# member documentation.
+# Note: If SORT_MEMBER_DOCS is set to NO this option is ignored for sorting
+# detailed member documentation.
+# The default value is: NO.
 
 SORT_MEMBERS_CTORS_1ST = NO
 
-# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the
-# hierarchy of group names into alphabetical order. If set to NO (the default)
-# the group names will appear in their defined order.
+# If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy
+# of group names into alphabetical order. If set to NO the group names will
+# appear in their defined order.
+# The default value is: NO.
 
 SORT_GROUP_NAMES       = NO
 
-# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be
-# sorted by fully-qualified names, including namespaces. If set to
-# NO (the default), the class list will be sorted only by class name,
-# not including the namespace part.
+# If the SORT_BY_SCOPE_NAME tag is set to YES, the class list will be sorted by
+# fully-qualified names, including namespaces. If set to NO, the class list will
+# be sorted only by class name, not including the namespace part.
 # Note: This option is not very useful if HIDE_SCOPE_NAMES is set to YES.
-# Note: This option applies only to the class list, not to the
-# alphabetical list.
+# Note: This option applies only to the class list, not to the alphabetical
+# list.
+# The default value is: NO.
 
 SORT_BY_SCOPE_NAME     = NO
 
-# The GENERATE_TODOLIST tag can be used to enable (YES) or
-# disable (NO) the todo list. This list is created by putting \todo
-# commands in the documentation.
+# If the STRICT_PROTO_MATCHING option is enabled and doxygen fails to do proper
+# type resolution of all parameters of a function it will reject a match between
+# the prototype and the implementation of a member function even if there is
+# only one candidate or it is obvious which candidate to choose by doing a
+# simple string match. By disabling STRICT_PROTO_MATCHING doxygen will still
+# accept a match between prototype and implementation in such cases.
+# The default value is: NO.
+
+STRICT_PROTO_MATCHING  = NO
+
+# The GENERATE_TODOLIST tag can be used to enable ( YES) or disable ( NO) the
+# todo list. This list is created by putting \todo commands in the
+# documentation.
+# The default value is: YES.
 
 GENERATE_TODOLIST      = YES
 
-# The GENERATE_TESTLIST tag can be used to enable (YES) or
-# disable (NO) the test list. This list is created by putting \test
-# commands in the documentation.
+# The GENERATE_TESTLIST tag can be used to enable ( YES) or disable ( NO) the
+# test list. This list is created by putting \test commands in the
+# documentation.
+# The default value is: YES.
 
 GENERATE_TESTLIST      = YES
 
-# The GENERATE_BUGLIST tag can be used to enable (YES) or
-# disable (NO) the bug list. This list is created by putting \bug
-# commands in the documentation.
+# The GENERATE_BUGLIST tag can be used to enable ( YES) or disable ( NO) the bug
+# list. This list is created by putting \bug commands in the documentation.
+# The default value is: YES.
 
 GENERATE_BUGLIST       = YES
 
-# The GENERATE_DEPRECATEDLIST tag can be used to enable (YES) or
-# disable (NO) the deprecated list. This list is created by putting
-# \deprecated commands in the documentation.
+# The GENERATE_DEPRECATEDLIST tag can be used to enable ( YES) or disable ( NO)
+# the deprecated list. This list is created by putting \deprecated commands in
+# the documentation.
+# The default value is: YES.
 
 GENERATE_DEPRECATEDLIST= YES
 
-# The ENABLED_SECTIONS tag can be used to enable conditional
-# documentation sections, marked by \if sectionname ... \endif.
+# The ENABLED_SECTIONS tag can be used to enable conditional documentation
+# sections, marked by \if <section_label> ... \endif and \cond <section_label>
+# ... \endcond blocks.
 
 ENABLED_SECTIONS       =
 
-# The MAX_INITIALIZER_LINES tag determines the maximum number of lines
-# the initial value of a variable or define consists of for it to appear in
-# the documentation. If the initializer consists of more lines than specified
-# here it will be hidden. Use a value of 0 to hide initializers completely.
-# The appearance of the initializer of individual variables and defines in the
-# documentation can be controlled using \showinitializer or \hideinitializer
-# command in the documentation regardless of this setting.
+# The MAX_INITIALIZER_LINES tag determines the maximum number of lines that the
+# initial value of a variable or macro / define can have for it to appear in the
+# documentation. If the initializer consists of more lines than specified here
+# it will be hidden. Use a value of 0 to hide initializers completely. The
+# appearance of the value of individual variables and macros / defines can be
+# controlled using \showinitializer or \hideinitializer command in the
+# documentation regardless of this setting.
+# Minimum value: 0, maximum value: 10000, default value: 30.
 
 MAX_INITIALIZER_LINES  = 30
 
-# Set the SHOW_USED_FILES tag to NO to disable the list of files generated
-# at the bottom of the documentation of classes and structs. If set to YES the
-# list will mention the files that were used to generate the documentation.
+# Set the SHOW_USED_FILES tag to NO to disable the list of files generated at
+# the bottom of the documentation of classes and structs. If set to YES the list
+# will mention the files that were used to generate the documentation.
+# The default value is: YES.
 
 SHOW_USED_FILES        = YES
 
-# If the sources in your project are distributed over multiple directories
-# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy
-# in the documentation. The default is NO.
-
-SHOW_DIRECTORIES       = NO
-
-# Set the SHOW_FILES tag to NO to disable the generation of the Files page.
-# This will remove the Files entry from the Quick Index and from the
-# Folder Tree View (if specified). The default is YES.
+# Set the SHOW_FILES tag to NO to disable the generation of the Files page. This
+# will remove the Files entry from the Quick Index and from the Folder Tree View
+# (if specified).
+# The default value is: YES.
 
 SHOW_FILES             = YES
 
-# Set the SHOW_NAMESPACES tag to NO to disable the generation of the
-# Namespaces page.
-# This will remove the Namespaces entry from the Quick Index
-# and from the Folder Tree View (if specified). The default is YES.
+# Set the SHOW_NAMESPACES tag to NO to disable the generation of the Namespaces
+# page. This will remove the Namespaces entry from the Quick Index and from the
+# Folder Tree View (if specified).
+# The default value is: YES.
 
 SHOW_NAMESPACES        = YES
 
 # The FILE_VERSION_FILTER tag can be used to specify a program or script that
 # doxygen should invoke to get the current version for each file (typically from
 # the version control system). Doxygen will invoke the program by executing (via
-# popen()) the command <command> <input-file>, where <command> is the value of
-# the FILE_VERSION_FILTER tag, and <input-file> is the name of an input file
-# provided by doxygen. Whatever the program writes to standard output
-# is used as the file version. See the manual for examples.
+# popen()) the command command input-file, where command is the value of the
+# FILE_VERSION_FILTER tag, and input-file is the name of an input file provided
+# by doxygen. Whatever the program writes to standard output is used as the file
+# version. For an example see the documentation.
 
 FILE_VERSION_FILTER    =
 
 # The LAYOUT_FILE tag can be used to specify a layout file which will be parsed
 # by doxygen. The layout file controls the global structure of the generated
-# output files in an output format independent way. The create the layout file
-# that represents doxygen's defaults, run doxygen with the -l option.
-# You can optionally specify a file name after the option, if omitted
-# DoxygenLayout.xml will be used as the name of the layout file.
+# output files in an output format independent way. To create the layout file
+# that represents doxygen's defaults, run doxygen with the -l option. You can
+# optionally specify a file name after the option, if omitted DoxygenLayout.xml
+# will be used as the name of the layout file.
+#
+# Note that if you run doxygen from a directory containing a file called
+# DoxygenLayout.xml, doxygen will parse it automatically even if the LAYOUT_FILE
+# tag is left empty.
 
 LAYOUT_FILE            =
 
+# The CITE_BIB_FILES tag can be used to specify one or more bib files containing
+# the reference definitions. This must be a list of .bib files. The .bib
+# extension is automatically appended if omitted. This requires the bibtex tool
+# to be installed. See also http://en.wikipedia.org/wiki/BibTeX for more info.
+# For LaTeX the style of the bibliography can be controlled using
+# LATEX_BIB_STYLE. To use this feature you need bibtex and perl available in the
+# search path. Do not use file names with spaces, bibtex cannot handle them. See
+# also \cite for info how to create references.
+
+CITE_BIB_FILES         =
+
 #---------------------------------------------------------------------------
-# configuration options related to warning and progress messages
+# Configuration options related to warning and progress messages
 #---------------------------------------------------------------------------
 
-# The QUIET tag can be used to turn on/off the messages that are generated
-# by doxygen. Possible values are YES and NO. If left blank NO is used.
+# The QUIET tag can be used to turn on/off the messages that are generated to
+# standard output by doxygen. If QUIET is set to YES this implies that the
+# messages are off.
+# The default value is: NO.
 
 QUIET                  = NO
 
 # The WARNINGS tag can be used to turn on/off the warning messages that are
-# generated by doxygen. Possible values are YES and NO. If left blank
-# NO is used.
+# generated to standard error ( stderr) by doxygen. If WARNINGS is set to YES
+# this implies that the warnings are on.
+#
+# Tip: Turn warnings on while writing the documentation.
+# The default value is: YES.
 
 WARNINGS               = YES
 
-# If WARN_IF_UNDOCUMENTED is set to YES, then doxygen will generate warnings
-# for undocumented members. If EXTRACT_ALL is set to YES then this flag will
-# automatically be disabled.
+# If the WARN_IF_UNDOCUMENTED tag is set to YES, then doxygen will generate
+# warnings for undocumented members. If EXTRACT_ALL is set to YES then this flag
+# will automatically be disabled.
+# The default value is: YES.
 
 WARN_IF_UNDOCUMENTED   = YES
 
-# If WARN_IF_DOC_ERROR is set to YES, doxygen will generate warnings for
-# potential errors in the documentation, such as not documenting some
-# parameters in a documented function, or documenting parameters that
-# don't exist or using markup commands wrongly.
+# If the WARN_IF_DOC_ERROR tag is set to YES, doxygen will generate warnings for
+# potential errors in the documentation, such as not documenting some parameters
+# in a documented function, or documenting parameters that don't exist or using
+# markup commands wrongly.
+# The default value is: YES.
 
 WARN_IF_DOC_ERROR      = YES
 
-# This WARN_NO_PARAMDOC option can be abled to get warnings for
-# functions that are documented, but have no documentation for their parameters
-# or return value. If set to NO (the default) doxygen will only warn about
-# wrong or incomplete parameter documentation, but not about the absence of
-# documentation.
+# This WARN_NO_PARAMDOC option can be enabled to get warnings for functions that
+# are documented, but have no documentation for their parameters or return
+# value. If set to NO doxygen will only warn about wrong or incomplete parameter
+# documentation, but not about the absence of documentation.
+# The default value is: NO.
 
 WARN_NO_PARAMDOC       = NO
 
-# The WARN_FORMAT tag determines the format of the warning messages that
-# doxygen can produce. The string should contain the $file, $line, and $text
-# tags, which will be replaced by the file and line number from which the
-# warning originated and the warning text. Optionally the format may contain
-# $version, which will be replaced by the version of the file (if it could
-# be obtained via FILE_VERSION_FILTER)
+# The WARN_FORMAT tag determines the format of the warning messages that doxygen
+# can produce. The string should contain the $file, $line, and $text tags, which
+# will be replaced by the file and line number from which the warning originated
+# and the warning text. Optionally the format may contain $version, which will
+# be replaced by the version of the file (if it could be obtained via
+# FILE_VERSION_FILTER)
+# The default value is: $file:$line: $text.
 
 WARN_FORMAT            = "$file:$line: $text"
 
-# The WARN_LOGFILE tag can be used to specify a file to which warning
-# and error messages should be written. If left blank the output is written
-# to stderr.
+# The WARN_LOGFILE tag can be used to specify a file to which warning and error
+# messages should be written. If left blank the output is written to standard
+# error (stderr).
 
 WARN_LOGFILE           =
 
 #---------------------------------------------------------------------------
-# configuration options related to the input files
+# Configuration options related to the input files
 #---------------------------------------------------------------------------
 
-# The INPUT tag can be used to specify the files and/or directories that contain
-# documented source files. You may enter file names like "myfile.cpp" or
-# directories like "/usr/src/myproject". Separate the files or directories
-# with spaces.
+# The INPUT tag is used to specify the files and/or directories that contain
+# documented source files. You may enter file names like myfile.cpp or
+# directories like /usr/src/myproject. Separate the files or directories with
+# spaces.
+# Note: If this tag is empty the current directory is searched.
 
 INPUT                  = .
 
 # This tag can be used to specify the character encoding of the source files
-# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
-# also the default input encoding. Doxygen uses libiconv (or the iconv built
-# into libc) for the transcoding. See http://www.gnu.org/software/libiconv for
-# the list of possible encodings.
+# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
+# libiconv (or the iconv built into libc) for the transcoding. See the libiconv
+# documentation (see: http://www.gnu.org/software/libiconv) for the list of
+# possible encodings.
+# The default value is: UTF-8.
 
 INPUT_ENCODING         = UTF-8
 
 # If the value of the INPUT tag contains directories, you can use the
-# FILE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
-# and *.h) to filter out the source-files in the directories. If left
-# blank the following patterns are tested:
-# *.c *.cc *.cxx *.cpp *.c++ *.java *.ii *.ixx *.ipp *.i++ *.inl *.h *.hh *.hxx
-# *.hpp *.h++ *.idl *.odl *.cs *.php *.php3 *.inc *.m *.mm *.py *.f90
+# FILE_PATTERNS tag to specify one or more wildcard patterns (like *.cpp and
+# *.h) to filter out the source-files in the directories. If left blank the
+# following patterns are tested:*.c, *.cc, *.cxx, *.cpp, *.c++, *.java, *.ii,
+# *.ixx, *.ipp, *.i++, *.inl, *.idl, *.ddl, *.odl, *.h, *.hh, *.hxx, *.hpp,
+# *.h++, *.cs, *.d, *.php, *.php4, *.php5, *.phtml, *.inc, *.m, *.markdown,
+# *.md, *.mm, *.dox, *.py, *.f90, *.f, *.for, *.tcl, *.vhd, *.vhdl, *.ucf,
+# *.qsf, *.as and *.js.
 
 FILE_PATTERNS          =
 
-# The RECURSIVE tag can be used to turn specify whether or not subdirectories
-# should be searched for input files as well. Possible values are YES and NO.
-# If left blank NO is used.
+# The RECURSIVE tag can be used to specify whether or not subdirectories should
+# be searched for input files as well.
+# The default value is: NO.
 
 RECURSIVE              = NO
 
-# The EXCLUDE tag can be used to specify files and/or directories that should
+# The EXCLUDE tag can be used to specify files and/or directories that should be
 # excluded from the INPUT source files. This way you can easily exclude a
 # subdirectory from a directory tree whose root is specified with the INPUT tag.
+#
+# Note that relative paths are relative to the directory from which doxygen is
+# run.
 
-EXCLUDE                = 
+EXCLUDE                =
 
-# The EXCLUDE_SYMLINKS tag can be used select whether or not files or
-# directories that are symbolic links (a Unix filesystem feature) are excluded
+# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
+# directories that are symbolic links (a Unix file system feature) are excluded
 # from the input.
+# The default value is: NO.
 
 EXCLUDE_SYMLINKS       = NO
 
 # If the value of the INPUT tag contains directories, you can use the
 # EXCLUDE_PATTERNS tag to specify one or more wildcard patterns to exclude
-# certain files from those directories. Note that the wildcards are matched
-# against the file with absolute path, so to exclude all test directories
-# for example use the pattern */test/*
+# certain files from those directories.
+#
+# Note that the wildcards are matched against the file with absolute path, so to
+# exclude all test directories for example use the pattern */test/*
 
-# exclude local test files
-EXCLUDE_PATTERNS       = 
+EXCLUDE_PATTERNS       =
 
 # The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
 # (namespaces, classes, functions, etc.) that should be excluded from the
 # output. The symbol name can be a fully qualified name, a word, or if the
 # wildcard * is used, a substring. Examples: ANamespace, AClass,
 # AClass::ANamespace, ANamespace::*Test
+#
+# Note that the wildcards are matched against the file with absolute path, so to
+# exclude all test directories use the pattern */test/*
 
 EXCLUDE_SYMBOLS        =
 
-# The EXAMPLE_PATH tag can be used to specify one or more files or
-# directories that contain example code fragments that are included (see
-# the \include command).
+# The EXAMPLE_PATH tag can be used to specify one or more files or directories
+# that contain example code fragments that are included (see the \include
+# command).
 
 EXAMPLE_PATH           = .
 
 # If the value of the EXAMPLE_PATH tag contains directories, you can use the
-# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp
-# and *.h) to filter out the source-files in the directories. If left
-# blank all files are included.
+# EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp and
+# *.h) to filter out the source-files in the directories. If left blank all
+# files are included.
 
-EXAMPLE_PATTERNS       = *.c *.h
+EXAMPLE_PATTERNS       = *.c \
+                         *.h
 
 # If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
-# searched for input files to be used with the \include or \dontinclude
-# commands irrespective of the value of the RECURSIVE tag.
-# Possible values are YES and NO. If left blank NO is used.
+# searched for input files to be used with the \include or \dontinclude commands
+# irrespective of the value of the RECURSIVE tag.
+# The default value is: NO.
 
 EXAMPLE_RECURSIVE      = NO
 
-# The IMAGE_PATH tag can be used to specify one or more files or
-# directories that contain image that are included in the documentation (see
-# the \image command).
+# The IMAGE_PATH tag can be used to specify one or more files or directories
+# that contain images that are to be included in the documentation (see the
+# \image command).
 
 IMAGE_PATH             =
 
 # The INPUT_FILTER tag can be used to specify a program that doxygen should
 # invoke to filter for each input file. Doxygen will invoke the filter program
-# by executing (via popen()) the command <filter> <input-file>, where <filter>
-# is the value of the INPUT_FILTER tag, and <input-file> is the name of an
-# input file. Doxygen will then use the output that the filter program writes
-# to standard output.
-# If FILTER_PATTERNS is specified, this tag will be
-# ignored.
+# by executing (via popen()) the command:
+#
+# <filter> <input-file>
+#
+# where <filter> is the value of the INPUT_FILTER tag, and <input-file> is the
+# name of an input file. Doxygen will then use the output that the filter
+# program writes to standard output. If FILTER_PATTERNS is specified, this tag
+# will be ignored.
+#
+# Note that the filter must not add or remove lines; it is applied before the
+# code is scanned, but not when the output code is generated. If lines are added
+# or removed, the anchors will not be placed correctly.
 
 INPUT_FILTER           =
 
 # The FILTER_PATTERNS tag can be used to specify filters on a per file pattern
-# basis.
-# Doxygen will compare the file name with each pattern and apply the
-# filter if there is a match.
-# The filters are a list of the form:
-# pattern=filter (like *.cpp=my_cpp_filter). See INPUT_FILTER for further
-# info on how filters are used. If FILTER_PATTERNS is empty, INPUT_FILTER
-# is applied to all files.
+# basis. Doxygen will compare the file name with each pattern and apply the
+# filter if there is a match. The filters are a list of the form: pattern=filter
+# (like *.cpp=my_cpp_filter). See INPUT_FILTER for further information on how
+# filters are used. If the FILTER_PATTERNS tag is empty or if none of the
+# patterns match the file name, INPUT_FILTER is applied.
 
 FILTER_PATTERNS        =
 
 # If the FILTER_SOURCE_FILES tag is set to YES, the input filter (if set using
-# INPUT_FILTER) will be used to filter the input files when producing source
-# files to browse (i.e. when SOURCE_BROWSER is set to YES).
+# INPUT_FILTER ) will also be used to filter the input files that are used for
+# producing the source files to browse (i.e. when SOURCE_BROWSER is set to YES).
+# The default value is: NO.
 
 FILTER_SOURCE_FILES    = NO
 
+# The FILTER_SOURCE_PATTERNS tag can be used to specify source filters per file
+# pattern. A pattern will override the setting for FILTER_PATTERN (if any) and
+# it is also possible to disable source filtering for a specific pattern using
+# *.ext= (so without naming a filter).
+# This tag requires that the tag FILTER_SOURCE_FILES is set to YES.
+
+FILTER_SOURCE_PATTERNS =
+
+# If the USE_MDFILE_AS_MAINPAGE tag refers to the name of a markdown file that
+# is part of the input, its contents will be placed on the main page
+# (index.html). This can be useful if you have a project on for instance GitHub
+# and want to reuse the introduction page also for the doxygen output.
+
+USE_MDFILE_AS_MAINPAGE =
+
 #---------------------------------------------------------------------------
-# configuration options related to source browsing
+# Configuration options related to source browsing
 #---------------------------------------------------------------------------
 
-# If the SOURCE_BROWSER tag is set to YES then a list of source files will
-# be generated. Documented entities will be cross-referenced with these sources.
-# Note: To get rid of all source code in the generated output, make sure also
-# VERBATIM_HEADERS is set to NO.
+# If the SOURCE_BROWSER tag is set to YES then a list of source files will be
+# generated. Documented entities will be cross-referenced with these sources.
+#
+# Note: To get rid of all source code in the generated output, make sure that
+# also VERBATIM_HEADERS is set to NO.
+# The default value is: NO.
 
 SOURCE_BROWSER         = NO
 
-# Setting the INLINE_SOURCES tag to YES will include the body
-# of functions and classes directly in the documentation.
+# Setting the INLINE_SOURCES tag to YES will include the body of functions,
+# classes and enums directly into the documentation.
+# The default value is: NO.
 
 INLINE_SOURCES         = NO
 
-# Setting the STRIP_CODE_COMMENTS tag to YES (the default) will instruct
-# doxygen to hide any special comment blocks from generated source code
-# fragments. Normal C and C++ comments will always remain visible.
+# Setting the STRIP_CODE_COMMENTS tag to YES will instruct doxygen to hide any
+# special comment blocks from generated source code fragments. Normal C, C++ and
+# Fortran comments will always remain visible.
+# The default value is: YES.
 
 STRIP_CODE_COMMENTS    = YES
 
-# If the REFERENCED_BY_RELATION tag is set to YES
-# then for each documented function all documented
-# functions referencing it will be listed.
+# If the REFERENCED_BY_RELATION tag is set to YES then for each documented
+# function all documented functions referencing it will be listed.
+# The default value is: NO.
 
 REFERENCED_BY_RELATION = NO
 
-# If the REFERENCES_RELATION tag is set to YES
-# then for each documented function all documented entities
-# called/used by that function will be listed.
+# If the REFERENCES_RELATION tag is set to YES then for each documented function
+# all documented entities called/used by that function will be listed.
+# The default value is: NO.
 
 REFERENCES_RELATION    = NO
 
-# If the REFERENCES_LINK_SOURCE tag is set to YES (the default)
-# and SOURCE_BROWSER tag is set to YES, then the hyperlinks from
-# functions in REFERENCES_RELATION and REFERENCED_BY_RELATION lists will
-# link to the source code.
-# Otherwise they will link to the documentation.
+# If the REFERENCES_LINK_SOURCE tag is set to YES and SOURCE_BROWSER tag is set
+# to YES, then the hyperlinks from functions in REFERENCES_RELATION and
+# REFERENCED_BY_RELATION lists will link to the source code. Otherwise they will
+# link to the documentation.
+# The default value is: YES.
 
 REFERENCES_LINK_SOURCE = YES
 
-# If the USE_HTAGS tag is set to YES then the references to source code
-# will point to the HTML generated by the htags(1) tool instead of doxygen
-# built-in source browser. The htags tool is part of GNU's global source
-# tagging system (see http://www.gnu.org/software/global/global.html). You
-# will need version 4.8.6 or higher.
+# If SOURCE_TOOLTIPS is enabled (the default) then hovering a hyperlink in the
+# source code will show a tooltip with additional information such as prototype,
+# brief description and links to the definition and documentation. Since this
+# will make the HTML file larger and loading of large files a bit slower, you
+# can opt to disable this feature.
+# The default value is: YES.
+# This tag requires that the tag SOURCE_BROWSER is set to YES.
+
+SOURCE_TOOLTIPS        = YES
+
+# If the USE_HTAGS tag is set to YES then the references to source code will
+# point to the HTML generated by the htags(1) tool instead of doxygen built-in
+# source browser. The htags tool is part of GNU's global source tagging system
+# (see http://www.gnu.org/software/global/global.html). You will need version
+# 4.8.6 or higher.
+#
+# To use it do the following:
+# - Install the latest version of global
+# - Enable SOURCE_BROWSER and USE_HTAGS in the config file
+# - Make sure the INPUT points to the root of the source tree
+# - Run doxygen as normal
+#
+# Doxygen will invoke htags (and that will in turn invoke gtags), so these
+# tools must be available from the command line (i.e. in the search path).
+#
+# The result: instead of the source browser generated by doxygen, the links to
+# source code will now point to the output of htags.
+# The default value is: NO.
+# This tag requires that the tag SOURCE_BROWSER is set to YES.
 
 USE_HTAGS              = NO
 
-# If the VERBATIM_HEADERS tag is set to YES (the default) then Doxygen
-# will generate a verbatim copy of the header file for each class for
-# which an include is specified. Set to NO to disable this.
+# If the VERBATIM_HEADERS tag is set the YES then doxygen will generate a
+# verbatim copy of the header file for each class for which an include is
+# specified. Set to NO to disable this.
+# See also: Section \class.
+# The default value is: YES.
 
 VERBATIM_HEADERS       = YES
 
 #---------------------------------------------------------------------------
-# configuration options related to the alphabetical class index
+# Configuration options related to the alphabetical class index
 #---------------------------------------------------------------------------
 
-# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index
-# of all compounds will be generated. Enable this if the project
-# contains a lot of classes, structs, unions or interfaces.
+# If the ALPHABETICAL_INDEX tag is set to YES, an alphabetical index of all
+# compounds will be generated. Enable this if the project contains a lot of
+# classes, structs, unions or interfaces.
+# The default value is: YES.
 
 ALPHABETICAL_INDEX     = YES
 
-# If the alphabetical index is enabled (see ALPHABETICAL_INDEX) then
-# the COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns
-# in which this list will be split (can be a number in the range [1..20])
+# The COLS_IN_ALPHA_INDEX tag can be used to specify the number of columns in
+# which the alphabetical index list will be split.
+# Minimum value: 1, maximum value: 20, default value: 5.
+# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
 
 COLS_IN_ALPHA_INDEX    = 5
 
-# In case all classes in a project start with a common prefix, all
-# classes will be put under the same header in the alphabetical index.
-# The IGNORE_PREFIX tag can be used to specify one or more prefixes that
-# should be ignored while generating the index headers.
+# In case all classes in a project start with a common prefix, all classes will
+# be put under the same header in the alphabetical index. The IGNORE_PREFIX tag
+# can be used to specify a prefix (or a list of prefixes) that should be ignored
+# while generating the index headers.
+# This tag requires that the tag ALPHABETICAL_INDEX is set to YES.
 
 IGNORE_PREFIX          =
 
 #---------------------------------------------------------------------------
-# configuration options related to the HTML output
+# Configuration options related to the HTML output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_HTML tag is set to YES (the default) Doxygen will
-# generate HTML output.
+# If the GENERATE_HTML tag is set to YES doxygen will generate HTML output
+# The default value is: YES.
 
 GENERATE_HTML          = YES
 
-# The HTML_OUTPUT tag is used to specify where the HTML docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `html' will be used as the default path.
+# The HTML_OUTPUT tag is used to specify where the HTML docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: html.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_OUTPUT            = html
 
-# The HTML_FILE_EXTENSION tag can be used to specify the file extension for
-# each generated HTML page (for example: .htm,.php,.asp). If it is left blank
-# doxygen will generate files with .html extension.
+# The HTML_FILE_EXTENSION tag can be used to specify the file extension for each
+# generated HTML page (for example: .htm, .php, .asp).
+# The default value is: .html.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_FILE_EXTENSION    = .html
 
-# The HTML_HEADER tag can be used to specify a personal HTML header for
-# each generated HTML page. If it is left blank doxygen will generate a
+# The HTML_HEADER tag can be used to specify a user-defined HTML header file for
+# each generated HTML page. If the tag is left blank doxygen will generate a
 # standard header.
+#
+# To get valid HTML the header file that includes any scripts and style sheets
+# that doxygen needs, which is dependent on the configuration options used (e.g.
+# the setting GENERATE_TREEVIEW). It is highly recommended to start with a
+# default header using
+# doxygen -w html new_header.html new_footer.html new_stylesheet.css
+# YourConfigFile
+# and then modify the file new_header.html. See also section "Doxygen usage"
+# for information on how to generate the default header that doxygen normally
+# uses.
+# Note: The header is subject to change so you typically have to regenerate the
+# default header when upgrading to a newer version of doxygen. For a description
+# of the possible markers and block names see the documentation.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_HEADER            =
 
-# The HTML_FOOTER tag can be used to specify a personal HTML footer for
-# each generated HTML page. If it is left blank doxygen will generate a
-# standard footer.
+# The HTML_FOOTER tag can be used to specify a user-defined HTML footer for each
+# generated HTML page. If the tag is left blank doxygen will generate a standard
+# footer. See HTML_HEADER for more information on how to generate a default
+# footer and what special commands can be used inside the footer. See also
+# section "Doxygen usage" for information on how to generate the default footer
+# that doxygen normally uses.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_FOOTER            =
 
-# The HTML_STYLESHEET tag can be used to specify a user-defined cascading
-# style sheet that is used by each HTML page. It can be used to
-# fine-tune the look of the HTML output. If the tag is left blank doxygen
-# will generate a default style sheet. Note that doxygen will try to copy
-# the style sheet file to the HTML output directory, so don't put your own
-# stylesheet in the HTML output directory as well, or it will be erased!
+# The HTML_STYLESHEET tag can be used to specify a user-defined cascading style
+# sheet that is used by each HTML page. It can be used to fine-tune the look of
+# the HTML output. If left blank doxygen will generate a default style sheet.
+# See also section "Doxygen usage" for information on how to generate the style
+# sheet that doxygen normally uses.
+# Note: It is recommended to use HTML_EXTRA_STYLESHEET instead of this tag, as
+# it is more robust and this tag (HTML_STYLESHEET) will in the future become
+# obsolete.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_STYLESHEET        =
 
-# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output.
-# Doxygen will adjust the colors in the stylesheet and background images
-# according to this color. Hue is specified as an angle on a colorwheel,
-# see http://en.wikipedia.org/wiki/Hue for more information.
-# For instance the value 0 represents red, 60 is yellow, 120 is green,
-# 180 is cyan, 240 is blue, 300 purple, and 360 is red again.
-# The allowed range is 0 to 359.
+# The HTML_EXTRA_STYLESHEET tag can be used to specify an additional user-
+# defined cascading style sheet that is included after the standard style sheets
+# created by doxygen. Using this option one can overrule certain style aspects.
+# This is preferred over using HTML_STYLESHEET since it does not replace the
+# standard style sheet and is therefor more robust against future updates.
+# Doxygen will copy the style sheet file to the output directory. For an example
+# see the documentation.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_EXTRA_STYLESHEET  =
+
+# The HTML_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the HTML output directory. Note
+# that these files will be copied to the base HTML output directory. Use the
+# $relpath^ marker in the HTML_HEADER and/or HTML_FOOTER files to load these
+# files. In the HTML_STYLESHEET file, use the file name only. Also note that the
+# files will be copied as-is; there are no commands or markers available.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_EXTRA_FILES       =
+
+# The HTML_COLORSTYLE_HUE tag controls the color of the HTML output. Doxygen
+# will adjust the colors in the stylesheet and background images according to
+# this color. Hue is specified as an angle on a colorwheel, see
+# http://en.wikipedia.org/wiki/Hue for more information. For instance the value
+# 0 represents red, 60 is yellow, 120 is green, 180 is cyan, 240 is blue, 300
+# purple, and 360 is red again.
+# Minimum value: 0, maximum value: 359, default value: 220.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_COLORSTYLE_HUE    = 220
 
-# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of
-# the colors in the HTML output. For a value of 0 the output will use
-# grayscales only. A value of 255 will produce the most vivid colors.
+# The HTML_COLORSTYLE_SAT tag controls the purity (or saturation) of the colors
+# in the HTML output. For a value of 0 the output will use grayscales only. A
+# value of 255 will produce the most vivid colors.
+# Minimum value: 0, maximum value: 255, default value: 100.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_COLORSTYLE_SAT    = 100
 
-# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to
-# the luminance component of the colors in the HTML output. Values below
-# 100 gradually make the output lighter, whereas values above 100 make
-# the output darker. The value divided by 100 is the actual gamma applied,
-# so 80 represents a gamma of 0.8, The value 220 represents a gamma of 2.2,
-# and 100 does not change the gamma.
+# The HTML_COLORSTYLE_GAMMA tag controls the gamma correction applied to the
+# luminance component of the colors in the HTML output. Values below 100
+# gradually make the output lighter, whereas values above 100 make the output
+# darker. The value divided by 100 is the actual gamma applied, so 80 represents
+# a gamma of 0.8, The value 220 represents a gamma of 2.2, and 100 does not
+# change the gamma.
+# Minimum value: 40, maximum value: 240, default value: 80.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_COLORSTYLE_GAMMA  = 80
 
 # If the HTML_TIMESTAMP tag is set to YES then the footer of each generated HTML
-# page will contain the date and time when the page was generated. Setting
-# this to NO can help when comparing the output of multiple runs.
+# page will contain the date and time when the page was generated. Setting this
+# to NO can help when comparing the output of multiple runs.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_TIMESTAMP         = YES
 
-# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes,
-# files or namespaces will be aligned in HTML using tables. If set to
-# NO a bullet list will be used.
-
-HTML_ALIGN_MEMBERS     = YES
-
 # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
 # documentation will contain sections that can be hidden and shown after the
-# page has loaded. For this to work a browser that supports
-# JavaScript and DHTML is required (for instance Mozilla 1.0+, Firefox
-# Netscape 6.0+, Internet explorer 5.0+, Konqueror, or Safari).
+# page has loaded.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 HTML_DYNAMIC_SECTIONS  = NO
 
-# If the GENERATE_DOCSET tag is set to YES, additional index files
-# will be generated that can be used as input for Apple's Xcode 3
-# integrated development environment, introduced with OSX 10.5 (Leopard).
-# To create a documentation set, doxygen will generate a Makefile in the
-# HTML output directory. Running make will produce the docset in that
-# directory and running "make install" will install the docset in
-# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find
-# it at startup.
-# See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
+# With HTML_INDEX_NUM_ENTRIES one can control the preferred number of entries
+# shown in the various tree structured indices initially; the user can expand
+# and collapse entries dynamically later on. Doxygen will expand the tree to
+# such a level that at most the specified number of entries are visible (unless
+# a fully collapsed tree already exceeds this amount). So setting the number of
+# entries 1 will produce a full collapsed tree by default. 0 is a special value
+# representing an infinite number of entries and will result in a full expanded
+# tree by default.
+# Minimum value: 0, maximum value: 9999, default value: 100.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+HTML_INDEX_NUM_ENTRIES = 100
+
+# If the GENERATE_DOCSET tag is set to YES, additional index files will be
+# generated that can be used as input for Apple's Xcode 3 integrated development
+# environment (see: http://developer.apple.com/tools/xcode/), introduced with
+# OSX 10.5 (Leopard). To create a documentation set, doxygen will generate a
+# Makefile in the HTML output directory. Running make will produce the docset in
+# that directory and running make install will install the docset in
+# ~/Library/Developer/Shared/Documentation/DocSets so that Xcode will find it at
+# startup. See http://developer.apple.com/tools/creatingdocsetswithdoxygen.html
 # for more information.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 GENERATE_DOCSET        = NO
 
-# When GENERATE_DOCSET tag is set to YES, this tag determines the name of the
-# feed. A documentation feed provides an umbrella under which multiple
-# documentation sets from a single provider (such as a company or product suite)
-# can be grouped.
+# This tag determines the name of the docset feed. A documentation feed provides
+# an umbrella under which multiple documentation sets from a single provider
+# (such as a company or product suite) can be grouped.
+# The default value is: Doxygen generated docs.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
 
 DOCSET_FEEDNAME        = "Doxygen generated docs"
 
-# When GENERATE_DOCSET tag is set to YES, this tag specifies a string that
-# should uniquely identify the documentation set bundle. This should be a
-# reverse domain-name style string, e.g. com.mycompany.MyDocSet. Doxygen
-# will append .docset to the name.
+# This tag specifies a string that should uniquely identify the documentation
+# set bundle. This should be a reverse domain-name style string, e.g.
+# com.mycompany.MyDocSet. Doxygen will append .docset to the name.
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
 
 DOCSET_BUNDLE_ID       = org.doxygen.Project
 
-# When GENERATE_PUBLISHER_ID tag specifies a string that should uniquely identify
+# The DOCSET_PUBLISHER_ID tag specifies a string that should uniquely identify
 # the documentation publisher. This should be a reverse domain-name style
 # string, e.g. com.mycompany.MyDocSet.documentation.
+# The default value is: org.doxygen.Publisher.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
 
 DOCSET_PUBLISHER_ID    = org.doxygen.Publisher
 
-# The GENERATE_PUBLISHER_NAME tag identifies the documentation publisher.
+# The DOCSET_PUBLISHER_NAME tag identifies the documentation publisher.
+# The default value is: Publisher.
+# This tag requires that the tag GENERATE_DOCSET is set to YES.
 
 DOCSET_PUBLISHER_NAME  = Publisher
 
-# If the GENERATE_HTMLHELP tag is set to YES, additional index files
-# will be generated that can be used as input for tools like the
-# Microsoft HTML help workshop to generate a compiled HTML help file (.chm)
-# of the generated HTML documentation.
+# If the GENERATE_HTMLHELP tag is set to YES then doxygen generates three
+# additional HTML index files: index.hhp, index.hhc, and index.hhk. The
+# index.hhp is a project file that can be read by Microsoft's HTML Help Workshop
+# (see: http://www.microsoft.com/en-us/download/details.aspx?id=21138) on
+# Windows.
+#
+# The HTML Help Workshop contains a compiler that can convert all HTML output
+# generated by doxygen into a single compiled HTML file (.chm). Compiled HTML
+# files are now used as the Windows 98 help format, and will replace the old
+# Windows help format (.hlp) on all Windows platforms in the future. Compressed
+# HTML files also contain an index, a table of contents, and you can search for
+# words in the documentation. The HTML workshop also contains a viewer for
+# compressed HTML files.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 GENERATE_HTMLHELP      = NO
 
-# If the GENERATE_HTMLHELP tag is set to YES, the CHM_FILE tag can
-# be used to specify the file name of the resulting .chm file. You
-# can add a path in front of the file if the result should not be
+# The CHM_FILE tag can be used to specify the file name of the resulting .chm
+# file. You can add a path in front of the file if the result should not be
 # written to the html output directory.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
 CHM_FILE               =
 
-# If the GENERATE_HTMLHELP tag is set to YES, the HHC_LOCATION tag can
-# be used to specify the location (absolute path including file name) of
-# the HTML help compiler (hhc.exe). If non-empty doxygen will try to run
-# the HTML help compiler on the generated index.hhp.
+# The HHC_LOCATION tag can be used to specify the location (absolute path
+# including file name) of the HTML help compiler ( hhc.exe). If non-empty
+# doxygen will try to run the HTML help compiler on the generated index.hhp.
+# The file has to be specified with full path.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
 HHC_LOCATION           =
 
-# If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag
-# controls if a separate .chi index file is generated (YES) or that
-# it should be included in the master .chm file (NO).
+# The GENERATE_CHI flag controls if a separate .chi index file is generated (
+# YES) or that it should be included in the master .chm file ( NO).
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
 GENERATE_CHI           = NO
 
-# If the GENERATE_HTMLHELP tag is set to YES, the CHM_INDEX_ENCODING
-# is used to encode HtmlHelp index (hhk), content (hhc) and project file
-# content.
+# The CHM_INDEX_ENCODING is used to encode HtmlHelp index ( hhk), content ( hhc)
+# and project file content.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
 CHM_INDEX_ENCODING     =
 
-# If the GENERATE_HTMLHELP tag is set to YES, the BINARY_TOC flag
-# controls whether a binary table of contents is generated (YES) or a
-# normal table of contents (NO) in the .chm file.
+# The BINARY_TOC flag controls whether a binary table of contents is generated (
+# YES) or a normal table of contents ( NO) in the .chm file.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
 BINARY_TOC             = NO
 
-# The TOC_EXPAND flag can be set to YES to add extra items for group members
-# to the contents of the HTML help documentation and to the tree view.
+# The TOC_EXPAND flag can be set to YES to add extra items for group members to
+# the table of contents of the HTML help documentation and to the tree view.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTMLHELP is set to YES.
 
 TOC_EXPAND             = NO
 
 # If the GENERATE_QHP tag is set to YES and both QHP_NAMESPACE and
-# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated
-# that can be used as input for Qt's qhelpgenerator to generate a
-# Qt Compressed Help (.qch) of the generated HTML documentation.
+# QHP_VIRTUAL_FOLDER are set, an additional index file will be generated that
+# can be used as input for Qt's qhelpgenerator to generate a Qt Compressed Help
+# (.qch) of the generated HTML documentation.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 GENERATE_QHP           = NO
 
-# If the QHG_LOCATION tag is specified, the QCH_FILE tag can
-# be used to specify the file name of the resulting .qch file.
-# The path specified is relative to the HTML output folder.
+# If the QHG_LOCATION tag is specified, the QCH_FILE tag can be used to specify
+# the file name of the resulting .qch file. The path specified is relative to
+# the HTML output folder.
+# This tag requires that the tag GENERATE_QHP is set to YES.
 
 QCH_FILE               =
 
-# The QHP_NAMESPACE tag specifies the namespace to use when generating
-# Qt Help Project output. For more information please see
-# http://doc.trolltech.com/qthelpproject.html#namespace
+# The QHP_NAMESPACE tag specifies the namespace to use when generating Qt Help
+# Project output. For more information please see Qt Help Project / Namespace
+# (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#namespace).
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_QHP is set to YES.
 
 QHP_NAMESPACE          = org.doxygen.Project
 
-# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating
-# Qt Help Project output. For more information please see
-# http://doc.trolltech.com/qthelpproject.html#virtual-folders
+# The QHP_VIRTUAL_FOLDER tag specifies the namespace to use when generating Qt
+# Help Project output. For more information please see Qt Help Project / Virtual
+# Folders (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#virtual-
+# folders).
+# The default value is: doc.
+# This tag requires that the tag GENERATE_QHP is set to YES.
 
 QHP_VIRTUAL_FOLDER     = doc
 
-# If QHP_CUST_FILTER_NAME is set, it specifies the name of a custom filter to
-# add. For more information please see
-# http://doc.trolltech.com/qthelpproject.html#custom-filters
+# If the QHP_CUST_FILTER_NAME tag is set, it specifies the name of a custom
+# filter to add. For more information please see Qt Help Project / Custom
+# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
+# filters).
+# This tag requires that the tag GENERATE_QHP is set to YES.
 
 QHP_CUST_FILTER_NAME   =
 
-# The QHP_CUST_FILT_ATTRS tag specifies the list of the attributes of the
-# custom filter to add. For more information please see
-# <a href="http://doc.trolltech.com/qthelpproject.html#custom-filters">
-# Qt Help Project / Custom Filters</a>.
+# The QHP_CUST_FILTER_ATTRS tag specifies the list of the attributes of the
+# custom filter to add. For more information please see Qt Help Project / Custom
+# Filters (see: http://qt-project.org/doc/qt-4.8/qthelpproject.html#custom-
+# filters).
+# This tag requires that the tag GENERATE_QHP is set to YES.
 
 QHP_CUST_FILTER_ATTRS  =
 
 # The QHP_SECT_FILTER_ATTRS tag specifies the list of the attributes this
-# project's
-# filter section matches.
-# <a href="http://doc.trolltech.com/qthelpproject.html#filter-attributes">
-# Qt Help Project / Filter Attributes</a>.
+# project's filter section matches. Qt Help Project / Filter Attributes (see:
+# http://qt-project.org/doc/qt-4.8/qthelpproject.html#filter-attributes).
+# This tag requires that the tag GENERATE_QHP is set to YES.
 
 QHP_SECT_FILTER_ATTRS  =
 
-# If the GENERATE_QHP tag is set to YES, the QHG_LOCATION tag can
-# be used to specify the location of Qt's qhelpgenerator.
-# If non-empty doxygen will try to run qhelpgenerator on the generated
-# .qhp file.
+# The QHG_LOCATION tag can be used to specify the location of Qt's
+# qhelpgenerator. If non-empty doxygen will try to run qhelpgenerator on the
+# generated .qhp file.
+# This tag requires that the tag GENERATE_QHP is set to YES.
 
 QHG_LOCATION           =
 
-# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files
-#  will be generated, which together with the HTML files, form an Eclipse help
-# plugin. To install this plugin and make it available under the help contents
-# menu in Eclipse, the contents of the directory containing the HTML and XML
-# files needs to be copied into the plugins directory of eclipse. The name of
-# the directory within the plugins directory should be the same as
-# the ECLIPSE_DOC_ID value. After copying Eclipse needs to be restarted before
-# the help appears.
+# If the GENERATE_ECLIPSEHELP tag is set to YES, additional index files will be
+# generated, together with the HTML files, they form an Eclipse help plugin. To
+# install this plugin and make it available under the help contents menu in
+# Eclipse, the contents of the directory containing the HTML and XML files needs
+# to be copied into the plugins directory of eclipse. The name of the directory
+# within the plugins directory should be the same as the ECLIPSE_DOC_ID value.
+# After copying Eclipse needs to be restarted before the help appears.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 GENERATE_ECLIPSEHELP   = NO
 
-# A unique identifier for the eclipse help plugin. When installing the plugin
-# the directory name containing the HTML and XML files should also have
-# this name.
+# A unique identifier for the Eclipse help plugin. When installing the plugin
+# the directory name containing the HTML and XML files should also have this
+# name. Each documentation set should have its own identifier.
+# The default value is: org.doxygen.Project.
+# This tag requires that the tag GENERATE_ECLIPSEHELP is set to YES.
 
 ECLIPSE_DOC_ID         = org.doxygen.Project
 
-# The DISABLE_INDEX tag can be used to turn on/off the condensed index at
-# top of each HTML page. The value NO (the default) enables the index and
-# the value YES disables it.
+# If you want full control over the layout of the generated HTML pages it might
+# be necessary to disable the index and replace it with your own. The
+# DISABLE_INDEX tag can be used to turn on/off the condensed index (tabs) at top
+# of each HTML page. A value of NO enables the index and the value YES disables
+# it. Since the tabs in the index contain the same information as the navigation
+# tree, you can set this option to YES if you also set GENERATE_TREEVIEW to YES.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 DISABLE_INDEX          = NO
 
-# This tag can be used to set the number of enum values (range [1..20])
-# that doxygen will group on one line in the generated HTML documentation.
-
-ENUM_VALUES_PER_LINE   = 4
-
 # The GENERATE_TREEVIEW tag is used to specify whether a tree-like index
-# structure should be generated to display hierarchical information.
-# If the tag value is set to YES, a side panel will be generated
-# containing a tree-like index structure (just like the one that
-# is generated for HTML Help). For this to work a browser that supports
-# JavaScript, DHTML, CSS and frames is required (i.e. any modern browser).
-# Windows users are probably better off using the HTML help feature.
+# structure should be generated to display hierarchical information. If the tag
+# value is set to YES, a side panel will be generated containing a tree-like
+# index structure (just like the one that is generated for HTML Help). For this
+# to work a browser that supports JavaScript, DHTML, CSS and frames is required
+# (i.e. any modern browser). Windows users are probably better off using the
+# HTML help feature. Via custom stylesheets (see HTML_EXTRA_STYLESHEET) one can
+# further fine-tune the look of the index. As an example, the default style
+# sheet generated by doxygen has an example that shows how to put an image at
+# the root of the tree instead of the PROJECT_NAME. Since the tree basically has
+# the same information as the tab index, you could consider setting
+# DISABLE_INDEX to YES when enabling this option.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 GENERATE_TREEVIEW      = NO
 
-# By enabling USE_INLINE_TREES, doxygen will generate the Groups, Directories,
-# and Class Hierarchy pages using a tree view instead of an ordered list.
+# The ENUM_VALUES_PER_LINE tag can be used to set the number of enum values that
+# doxygen will group on one line in the generated HTML documentation.
+#
+# Note that a value of 0 will completely suppress the enum values from appearing
+# in the overview section.
+# Minimum value: 0, maximum value: 20, default value: 4.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
-USE_INLINE_TREES       = NO
+ENUM_VALUES_PER_LINE   = 4
 
-# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be
-# used to set the initial width (in pixels) of the frame in which the tree
-# is shown.
+# If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be used
+# to set the initial width (in pixels) of the frame in which the tree is shown.
+# Minimum value: 0, maximum value: 1500, default value: 250.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 TREEVIEW_WIDTH         = 250
 
-# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open
-# links to external symbols imported via tag files in a separate window.
+# When the EXT_LINKS_IN_WINDOW option is set to YES doxygen will open links to
+# external symbols imported via tag files in a separate window.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 EXT_LINKS_IN_WINDOW    = NO
 
-# Use this tag to change the font size of Latex formulas included
-# as images in the HTML documentation. The default is 10. Note that
-# when you change the font size after a successful doxygen run you need
-# to manually remove any form_*.png images from the HTML output directory
-# to force them to be regenerated.
+# Use this tag to change the font size of LaTeX formulas included as images in
+# the HTML documentation. When you change the font size after a successful
+# doxygen run you need to manually remove any form_*.png images from the HTML
+# output directory to force them to be regenerated.
+# Minimum value: 8, maximum value: 50, default value: 10.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 FORMULA_FONTSIZE       = 10
 
 # Use the FORMULA_TRANPARENT tag to determine whether or not the images
-# generated for formulas are transparent PNGs. Transparent PNGs are
-# not supported properly for IE 6.0, but are supported on all modern browsers.
-# Note that when changing this option you need to delete any form_*.png files
-# in the HTML output before the changes have effect.
+# generated for formulas are transparent PNGs. Transparent PNGs are not
+# supported properly for IE 6.0, but are supported on all modern browsers.
+#
+# Note that when changing this option you need to delete any form_*.png files in
+# the HTML output directory before the changes have effect.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 FORMULA_TRANSPARENT    = YES
 
-# When the SEARCHENGINE tag is enabled doxygen will generate a search box
-# for the HTML output. The underlying search engine uses javascript
-# and DHTML and should work on any modern browser. Note that when using
-# HTML help (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets
-# (GENERATE_DOCSET) there is already a search function so this one should
-# typically be disabled. For large projects the javascript based search engine
-# can be slow, then enabling SERVER_BASED_SEARCH may provide a better solution.
+# Enable the USE_MATHJAX option to render LaTeX formulas using MathJax (see
+# http://www.mathjax.org) which uses client side Javascript for the rendering
+# instead of using prerendered bitmaps. Use this if you do not have LaTeX
+# installed or if you want to formulas look prettier in the HTML output. When
+# enabled you may also need to install MathJax separately and configure the path
+# to it using the MATHJAX_RELPATH option.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_HTML is set to YES.
+
+USE_MATHJAX            = NO
+
+# When MathJax is enabled you can set the default output format to be used for
+# the MathJax output. See the MathJax site (see:
+# http://docs.mathjax.org/en/latest/output.html) for more details.
+# Possible values are: HTML-CSS (which is slower, but has the best
+# compatibility), NativeMML (i.e. MathML) and SVG.
+# The default value is: HTML-CSS.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_FORMAT         = HTML-CSS
+
+# When MathJax is enabled you need to specify the location relative to the HTML
+# output directory using the MATHJAX_RELPATH option. The destination directory
+# should contain the MathJax.js script. For instance, if the mathjax directory
+# is located at the same level as the HTML output directory, then
+# MATHJAX_RELPATH should be ../mathjax. The default value points to the MathJax
+# Content Delivery Network so you can quickly see the result without installing
+# MathJax. However, it is strongly recommended to install a local copy of
+# MathJax from http://www.mathjax.org before deployment.
+# The default value is: http://cdn.mathjax.org/mathjax/latest.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
+
+# The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
+# extension names that should be enabled during MathJax rendering. For example
+# MATHJAX_EXTENSIONS = TeX/AMSmath TeX/AMSsymbols
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_EXTENSIONS     =
+
+# The MATHJAX_CODEFILE tag can be used to specify a file with javascript pieces
+# of code that will be used on startup of the MathJax code. See the MathJax site
+# (see: http://docs.mathjax.org/en/latest/output.html) for more details. For an
+# example see the documentation.
+# This tag requires that the tag USE_MATHJAX is set to YES.
+
+MATHJAX_CODEFILE       =
+
+# When the SEARCHENGINE tag is enabled doxygen will generate a search box for
+# the HTML output. The underlying search engine uses javascript and DHTML and
+# should work on any modern browser. Note that when using HTML help
+# (GENERATE_HTMLHELP), Qt help (GENERATE_QHP), or docsets (GENERATE_DOCSET)
+# there is already a search function so this one should typically be disabled.
+# For large projects the javascript based search engine can be slow, then
+# enabling SERVER_BASED_SEARCH may provide a better solution. It is possible to
+# search using the keyboard; to jump to the search box use <access key> + S
+# (what the <access key> is depends on the OS and browser, but it is typically
+# <CTRL>, <ALT>/<option>, or both). Inside the search box use the <cursor down
+# key> to jump into the search results window, the results can be navigated
+# using the <cursor keys>. Press <Enter> to select an item or <escape> to cancel
+# the search. The filter options can be selected when the cursor is inside the
+# search box by pressing <Shift>+<cursor down>. Also here use the <cursor keys>
+# to select a filter and <Enter> or <escape> to activate or cancel the filter
+# option.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_HTML is set to YES.
 
 SEARCHENGINE           = YES
 
 # When the SERVER_BASED_SEARCH tag is enabled the search engine will be
-# implemented using a PHP enabled web server instead of at the web client
-# using Javascript. Doxygen will generate the search PHP script and index
-# file to put on the web server. The advantage of the server
-# based approach is that it scales better to large projects and allows
-# full text search. The disadvances is that it is more difficult to setup
-# and does not have live searching capabilities.
+# implemented using a web server instead of a web client using Javascript. There
+# are two flavours of web server based searching depending on the
+# EXTERNAL_SEARCH setting. When disabled, doxygen will generate a PHP script for
+# searching and an index file used by the script. When EXTERNAL_SEARCH is
+# enabled the indexing and searching needs to be provided by external tools. See
+# the section "External Indexing and Searching" for details.
+# The default value is: NO.
+# This tag requires that the tag SEARCHENGINE is set to YES.
 
 SERVER_BASED_SEARCH    = NO
 
+# When EXTERNAL_SEARCH tag is enabled doxygen will no longer generate the PHP
+# script for searching. Instead the search results are written to an XML file
+# which needs to be processed by an external indexer. Doxygen will invoke an
+# external search engine pointed to by the SEARCHENGINE_URL option to obtain the
+# search results.
+#
+# Doxygen ships with an example indexer ( doxyindexer) and search engine
+# (doxysearch.cgi) which are based on the open source search engine library
+# Xapian (see: http://xapian.org/).
+#
+# See the section "External Indexing and Searching" for details.
+# The default value is: NO.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTERNAL_SEARCH        = NO
+
+# The SEARCHENGINE_URL should point to a search engine hosted by a web server
+# which will return the search results when EXTERNAL_SEARCH is enabled.
+#
+# Doxygen ships with an example indexer ( doxyindexer) and search engine
+# (doxysearch.cgi) which are based on the open source search engine library
+# Xapian (see: http://xapian.org/). See the section "External Indexing and
+# Searching" for details.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SEARCHENGINE_URL       =
+
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the unindexed
+# search data is written to a file for indexing by an external tool. With the
+# SEARCHDATA_FILE tag the name of this file can be specified.
+# The default file is: searchdata.xml.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+SEARCHDATA_FILE        = searchdata.xml
+
+# When SERVER_BASED_SEARCH and EXTERNAL_SEARCH are both enabled the
+# EXTERNAL_SEARCH_ID tag can be used as an identifier for the project. This is
+# useful in combination with EXTRA_SEARCH_MAPPINGS to search through multiple
+# projects and redirect the results back to the right project.
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTERNAL_SEARCH_ID     =
+
+# The EXTRA_SEARCH_MAPPINGS tag can be used to enable searching through doxygen
+# projects other than the one defined by this configuration file, but that are
+# all added to the same external search index. Each project needs to have a
+# unique id set via EXTERNAL_SEARCH_ID. The search mapping then maps the id of
+# to a relative location where the documentation can be found. The format is:
+# EXTRA_SEARCH_MAPPINGS = tagname1=loc1 tagname2=loc2 ...
+# This tag requires that the tag SEARCHENGINE is set to YES.
+
+EXTRA_SEARCH_MAPPINGS  =
+
 #---------------------------------------------------------------------------
-# configuration options related to the LaTeX output
+# Configuration options related to the LaTeX output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_LATEX tag is set to YES (the default) Doxygen will
-# generate Latex output.
+# If the GENERATE_LATEX tag is set to YES doxygen will generate LaTeX output.
+# The default value is: YES.
 
 GENERATE_LATEX         = NO
 
-# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `latex' will be used as the default path.
+# The LATEX_OUTPUT tag is used to specify where the LaTeX docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: latex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_OUTPUT           = latex
 
 # The LATEX_CMD_NAME tag can be used to specify the LaTeX command name to be
-# invoked. If left blank `latex' will be used as the default command name.
-# Note that when enabling USE_PDFLATEX this option is only used for
-# generating bitmaps for formulas in the HTML output, but not in the
-# Makefile that is written to the output directory.
+# invoked.
+#
+# Note that when enabling USE_PDFLATEX this option is only used for generating
+# bitmaps for formulas in the HTML output, but not in the Makefile that is
+# written to the output directory.
+# The default file is: latex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_CMD_NAME         = latex
 
-# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to
-# generate index for LaTeX. If left blank `makeindex' will be used as the
-# default command name.
+# The MAKEINDEX_CMD_NAME tag can be used to specify the command name to generate
+# index for LaTeX.
+# The default file is: makeindex.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 MAKEINDEX_CMD_NAME     = makeindex
 
-# If the COMPACT_LATEX tag is set to YES Doxygen generates more compact
-# LaTeX documents. This may be useful for small projects and may help to
-# save some trees in general.
+# If the COMPACT_LATEX tag is set to YES doxygen generates more compact LaTeX
+# documents. This may be useful for small projects and may help to save some
+# trees in general.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 COMPACT_LATEX          = NO
 
-# The PAPER_TYPE tag can be used to set the paper type that is used
-# by the printer. Possible values are: a4, a4wide, letter, legal and
-# executive. If left blank a4wide will be used.
+# The PAPER_TYPE tag can be used to set the paper type that is used by the
+# printer.
+# Possible values are: a4 (210 x 297 mm), letter (8.5 x 11 inches), legal (8.5 x
+# 14 inches) and executive (7.25 x 10.5 inches).
+# The default value is: a4.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 PAPER_TYPE             = a4wide
 
-# The EXTRA_PACKAGES tag can be to specify one or more names of LaTeX
-# packages that should be included in the LaTeX output.
+# The EXTRA_PACKAGES tag can be used to specify one or more LaTeX package names
+# that should be included in the LaTeX output. To get the times font for
+# instance you can specify
+# EXTRA_PACKAGES=times
+# If left blank no extra packages will be included.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 EXTRA_PACKAGES         =
 
-# The LATEX_HEADER tag can be used to specify a personal LaTeX header for
-# the generated latex document. The header should contain everything until
-# the first chapter. If it is left blank doxygen will generate a
-# standard header. Notice: only use this tag if you know what you are doing!
+# The LATEX_HEADER tag can be used to specify a personal LaTeX header for the
+# generated LaTeX document. The header should contain everything until the first
+# chapter. If it is left blank doxygen will generate a standard header. See
+# section "Doxygen usage" for information on how to let doxygen write the
+# default header to a separate file.
+#
+# Note: Only use a user-defined header if you know what you are doing! The
+# following commands have a special meaning inside the header: $title,
+# $datetime, $date, $doxygenversion, $projectname, $projectnumber. Doxygen will
+# replace them by respectively the title of the page, the current date and time,
+# only the current date, the version number of doxygen, the project name (see
+# PROJECT_NAME), or the project number (see PROJECT_NUMBER).
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_HEADER           =
 
-# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated
-# is prepared for conversion to pdf (using ps2pdf). The pdf file will
-# contain links (just like the HTML output) instead of page references
-# This makes the output suitable for online browsing using a pdf viewer.
+# The LATEX_FOOTER tag can be used to specify a personal LaTeX footer for the
+# generated LaTeX document. The footer should contain everything after the last
+# chapter. If it is left blank doxygen will generate a standard footer.
+#
+# Note: Only use a user-defined footer if you know what you are doing!
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_FOOTER           =
+
+# The LATEX_EXTRA_FILES tag can be used to specify one or more extra images or
+# other source files which should be copied to the LATEX_OUTPUT output
+# directory. Note that the files will be copied as-is; there are no commands or
+# markers available.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_EXTRA_FILES      =
+
+# If the PDF_HYPERLINKS tag is set to YES, the LaTeX that is generated is
+# prepared for conversion to PDF (using ps2pdf or pdflatex). The PDF file will
+# contain links (just like the HTML output) instead of page references. This
+# makes the output suitable for online browsing using a PDF viewer.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 PDF_HYPERLINKS         = YES
 
-# If the USE_PDFLATEX tag is set to YES, pdflatex will be used instead of
-# plain latex in the generated Makefile. Set this option to YES to get a
+# If the LATEX_PDFLATEX tag is set to YES, doxygen will use pdflatex to generate
+# the PDF file directly from the LaTeX files. Set this option to YES to get a
 # higher quality PDF documentation.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 USE_PDFLATEX           = YES
 
-# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \\batchmode.
-# command to the generated LaTeX files. This will instruct LaTeX to keep
-# running if errors occur, instead of asking the user for help.
-# This option is also used when generating formulas in HTML.
+# If the LATEX_BATCHMODE tag is set to YES, doxygen will add the \batchmode
+# command to the generated LaTeX files. This will instruct LaTeX to keep running
+# if errors occur, instead of asking the user for help. This option is also used
+# when generating formulas in HTML.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_BATCHMODE        = NO
 
-# If LATEX_HIDE_INDICES is set to YES then doxygen will not
-# include the index chapters (such as File Index, Compound Index, etc.)
-# in the output.
+# If the LATEX_HIDE_INDICES tag is set to YES then doxygen will not include the
+# index chapters (such as File Index, Compound Index, etc.) in the output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_HIDE_INDICES     = NO
 
-# If LATEX_SOURCE_CODE is set to YES then doxygen will include
-# source code with syntax highlighting in the LaTeX output.
-# Note that which sources are shown also depends on other settings
-# such as SOURCE_BROWSER.
+# If the LATEX_SOURCE_CODE tag is set to YES then doxygen will include source
+# code with syntax highlighting in the LaTeX output.
+#
+# Note that which sources are shown also depends on other settings such as
+# SOURCE_BROWSER.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
 
 LATEX_SOURCE_CODE      = NO
 
+# The LATEX_BIB_STYLE tag can be used to specify the style to use for the
+# bibliography, e.g. plainnat, or ieeetr. See
+# http://en.wikipedia.org/wiki/BibTeX and \cite for more info.
+# The default value is: plain.
+# This tag requires that the tag GENERATE_LATEX is set to YES.
+
+LATEX_BIB_STYLE        = plain
+
 #---------------------------------------------------------------------------
-# configuration options related to the RTF output
+# Configuration options related to the RTF output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_RTF tag is set to YES Doxygen will generate RTF output
-# The RTF output is optimized for Word 97 and may not look very pretty with
-# other RTF readers or editors.
+# If the GENERATE_RTF tag is set to YES doxygen will generate RTF output. The
+# RTF output is optimized for Word 97 and may not look too pretty with other RTF
+# readers/editors.
+# The default value is: NO.
 
 GENERATE_RTF           = NO
 
-# The RTF_OUTPUT tag is used to specify where the RTF docs will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `rtf' will be used as the default path.
+# The RTF_OUTPUT tag is used to specify where the RTF docs will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: rtf.
+# This tag requires that the tag GENERATE_RTF is set to YES.
 
 RTF_OUTPUT             = rtf
 
-# If the COMPACT_RTF tag is set to YES Doxygen generates more compact
-# RTF documents. This may be useful for small projects and may help to
-# save some trees in general.
+# If the COMPACT_RTF tag is set to YES doxygen generates more compact RTF
+# documents. This may be useful for small projects and may help to save some
+# trees in general.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
 
 COMPACT_RTF            = NO
 
-# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated
-# will contain hyperlink fields. The RTF file will
-# contain links (just like the HTML output) instead of page references.
-# This makes the output suitable for online browsing using WORD or other
-# programs which support those fields.
-# Note: wordpad (write) and others do not support links.
+# If the RTF_HYPERLINKS tag is set to YES, the RTF that is generated will
+# contain hyperlink fields. The RTF file will contain links (just like the HTML
+# output) instead of page references. This makes the output suitable for online
+# browsing using Word or some other Word compatible readers that support those
+# fields.
+#
+# Note: WordPad (write) and others do not support links.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_RTF is set to YES.
 
 RTF_HYPERLINKS         = NO
 
-# Load stylesheet definitions from file. Syntax is similar to doxygen's
-# config file, i.e. a series of assignments. You only have to provide
-# replacements, missing definitions are set to their default value.
+# Load stylesheet definitions from file. Syntax is similar to doxygen's config
+# file, i.e. a series of assignments. You only have to provide replacements,
+# missing definitions are set to their default value.
+#
+# See also section "Doxygen usage" for information on how to generate the
+# default style sheet that doxygen normally uses.
+# This tag requires that the tag GENERATE_RTF is set to YES.
 
 RTF_STYLESHEET_FILE    =
 
-# Set optional variables used in the generation of an rtf document.
-# Syntax is similar to doxygen's config file.
+# Set optional variables used in the generation of an RTF document. Syntax is
+# similar to doxygen's config file. A template extensions file can be generated
+# using doxygen -e rtf extensionFile.
+# This tag requires that the tag GENERATE_RTF is set to YES.
 
 RTF_EXTENSIONS_FILE    =
 
 #---------------------------------------------------------------------------
-# configuration options related to the man page output
+# Configuration options related to the man page output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_MAN tag is set to YES (the default) Doxygen will
-# generate man pages
+# If the GENERATE_MAN tag is set to YES doxygen will generate man pages for
+# classes and files.
+# The default value is: NO.
 
 GENERATE_MAN           = NO
 
-# The MAN_OUTPUT tag is used to specify where the man pages will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `man' will be used as the default path.
+# The MAN_OUTPUT tag is used to specify where the man pages will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it. A directory man3 will be created inside the directory specified by
+# MAN_OUTPUT.
+# The default directory is: man.
+# This tag requires that the tag GENERATE_MAN is set to YES.
 
 MAN_OUTPUT             = man
 
-# The MAN_EXTENSION tag determines the extension that is added to
-# the generated man pages (default is the subroutine's section .3)
+# The MAN_EXTENSION tag determines the extension that is added to the generated
+# man pages. In case the manual section does not start with a number, the number
+# 3 is prepended. The dot (.) at the beginning of the MAN_EXTENSION tag is
+# optional.
+# The default value is: .3.
+# This tag requires that the tag GENERATE_MAN is set to YES.
 
 MAN_EXTENSION          = .3
 
-# If the MAN_LINKS tag is set to YES and Doxygen generates man output,
-# then it will generate one additional man file for each entity
-# documented in the real man page(s). These additional files
-# only source the real man page, but without them the man command
-# would be unable to find the correct page. The default is NO.
+# If the MAN_LINKS tag is set to YES and doxygen generates man output, then it
+# will generate one additional man file for each entity documented in the real
+# man page(s). These additional files only source the real man page, but without
+# them the man command would be unable to find the correct page.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_MAN is set to YES.
 
 MAN_LINKS              = NO
 
 #---------------------------------------------------------------------------
-# configuration options related to the XML output
+# Configuration options related to the XML output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_XML tag is set to YES Doxygen will
-# generate an XML file that captures the structure of
-# the code including all documentation.
+# If the GENERATE_XML tag is set to YES doxygen will generate an XML file that
+# captures the structure of the code including all documentation.
+# The default value is: NO.
 
 GENERATE_XML           = NO
 
-# The XML_OUTPUT tag is used to specify where the XML pages will be put.
-# If a relative path is entered the value of OUTPUT_DIRECTORY will be
-# put in front of it. If left blank `xml' will be used as the default path.
+# The XML_OUTPUT tag is used to specify where the XML pages will be put. If a
+# relative path is entered the value of OUTPUT_DIRECTORY will be put in front of
+# it.
+# The default directory is: xml.
+# This tag requires that the tag GENERATE_XML is set to YES.
 
 XML_OUTPUT             = xml
 
-# The XML_SCHEMA tag can be used to specify an XML schema,
-# which can be used by a validating XML parser to check the
-# syntax of the XML files.
+# The XML_SCHEMA tag can be used to specify a XML schema, which can be used by a
+# validating XML parser to check the syntax of the XML files.
+# This tag requires that the tag GENERATE_XML is set to YES.
 
 XML_SCHEMA             =
 
-# The XML_DTD tag can be used to specify an XML DTD,
-# which can be used by a validating XML parser to check the
-# syntax of the XML files.
+# The XML_DTD tag can be used to specify a XML DTD, which can be used by a
+# validating XML parser to check the syntax of the XML files.
+# This tag requires that the tag GENERATE_XML is set to YES.
 
 XML_DTD                =
 
-# If the XML_PROGRAMLISTING tag is set to YES Doxygen will
-# dump the program listings (including syntax highlighting
-# and cross-referencing information) to the XML output. Note that
-# enabling this will significantly increase the size of the XML output.
+# If the XML_PROGRAMLISTING tag is set to YES doxygen will dump the program
+# listings (including syntax highlighting and cross-referencing information) to
+# the XML output. Note that enabling this will significantly increase the size
+# of the XML output.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_XML is set to YES.
 
 XML_PROGRAMLISTING     = YES
 
 #---------------------------------------------------------------------------
-# configuration options for the AutoGen Definitions output
+# Configuration options related to the DOCBOOK output
+#---------------------------------------------------------------------------
+
+# If the GENERATE_DOCBOOK tag is set to YES doxygen will generate Docbook files
+# that can be used to generate PDF.
+# The default value is: NO.
+
+GENERATE_DOCBOOK       = NO
+
+# The DOCBOOK_OUTPUT tag is used to specify where the Docbook pages will be put.
+# If a relative path is entered the value of OUTPUT_DIRECTORY will be put in
+# front of it.
+# The default directory is: docbook.
+# This tag requires that the tag GENERATE_DOCBOOK is set to YES.
+
+DOCBOOK_OUTPUT         = docbook
+
+#---------------------------------------------------------------------------
+# Configuration options for the AutoGen Definitions output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_AUTOGEN_DEF tag is set to YES Doxygen will
-# generate an AutoGen Definitions (see autogen.sf.net) file
-# that captures the structure of the code including all
-# documentation. Note that this feature is still experimental
-# and incomplete at the moment.
+# If the GENERATE_AUTOGEN_DEF tag is set to YES doxygen will generate an AutoGen
+# Definitions (see http://autogen.sf.net) file that captures the structure of
+# the code including all documentation. Note that this feature is still
+# experimental and incomplete at the moment.
+# The default value is: NO.
 
 GENERATE_AUTOGEN_DEF   = NO
 
 #---------------------------------------------------------------------------
-# configuration options related to the Perl module output
+# Configuration options related to the Perl module output
 #---------------------------------------------------------------------------
 
-# If the GENERATE_PERLMOD tag is set to YES Doxygen will
-# generate a Perl module file that captures the structure of
-# the code including all documentation. Note that this
-# feature is still experimental and incomplete at the
-# moment.
+# If the GENERATE_PERLMOD tag is set to YES doxygen will generate a Perl module
+# file that captures the structure of the code including all documentation.
+#
+# Note that this feature is still experimental and incomplete at the moment.
+# The default value is: NO.
 
 GENERATE_PERLMOD       = NO
 
-# If the PERLMOD_LATEX tag is set to YES Doxygen will generate
-# the necessary Makefile rules, Perl scripts and LaTeX code to be able
-# to generate PDF and DVI output from the Perl module output.
+# If the PERLMOD_LATEX tag is set to YES doxygen will generate the necessary
+# Makefile rules, Perl scripts and LaTeX code to be able to generate PDF and DVI
+# output from the Perl module output.
+# The default value is: NO.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
 
 PERLMOD_LATEX          = NO
 
-# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be
-# nicely formatted so it can be parsed by a human reader.
-# This is useful
-# if you want to understand what is going on.
-# On the other hand, if this
-# tag is set to NO the size of the Perl module output will be much smaller
-# and Perl will parse it just the same.
+# If the PERLMOD_PRETTY tag is set to YES the Perl module output will be nicely
+# formatted so it can be parsed by a human reader. This is useful if you want to
+# understand what is going on. On the other hand, if this tag is set to NO the
+# size of the Perl module output will be much smaller and Perl will parse it
+# just the same.
+# The default value is: YES.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
 
 PERLMOD_PRETTY         = YES
 
-# The names of the make variables in the generated doxyrules.make file
-# are prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX.
-# This is useful so different doxyrules.make files included by the same
-# Makefile don't overwrite each other's variables.
+# The names of the make variables in the generated doxyrules.make file are
+# prefixed with the string contained in PERLMOD_MAKEVAR_PREFIX. This is useful
+# so different doxyrules.make files included by the same Makefile don't
+# overwrite each other's variables.
+# This tag requires that the tag GENERATE_PERLMOD is set to YES.
 
 PERLMOD_MAKEVAR_PREFIX =
 
@@ -1321,110 +1883,128 @@
 # Configuration options related to the preprocessor
 #---------------------------------------------------------------------------
 
-# If the ENABLE_PREPROCESSING tag is set to YES (the default) Doxygen will
-# evaluate all C-preprocessor directives found in the sources and include
-# files.
+# If the ENABLE_PREPROCESSING tag is set to YES doxygen will evaluate all
+# C-preprocessor directives found in the sources and include files.
+# The default value is: YES.
 
 ENABLE_PREPROCESSING   = YES
 
-# If the MACRO_EXPANSION tag is set to YES Doxygen will expand all macro
-# names in the source code. If set to NO (the default) only conditional
-# compilation will be performed. Macro expansion can be done in a controlled
-# way by setting EXPAND_ONLY_PREDEF to YES.
+# If the MACRO_EXPANSION tag is set to YES doxygen will expand all macro names
+# in the source code. If set to NO only conditional compilation will be
+# performed. Macro expansion can be done in a controlled way by setting
+# EXPAND_ONLY_PREDEF to YES.
+# The default value is: NO.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
 MACRO_EXPANSION        = NO
 
-# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES
-# then the macro expansion is limited to the macros specified with the
-# PREDEFINED and EXPAND_AS_DEFINED tags.
+# If the EXPAND_ONLY_PREDEF and MACRO_EXPANSION tags are both set to YES then
+# the macro expansion is limited to the macros specified with the PREDEFINED and
+# EXPAND_AS_DEFINED tags.
+# The default value is: NO.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
 EXPAND_ONLY_PREDEF     = NO
 
-# If the SEARCH_INCLUDES tag is set to YES (the default) the includes files
-# in the INCLUDE_PATH (see below) will be search if a #include is found.
+# If the SEARCH_INCLUDES tag is set to YES the includes files in the
+# INCLUDE_PATH will be searched if a #include is found.
+# The default value is: YES.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
 SEARCH_INCLUDES        = YES
 
 # The INCLUDE_PATH tag can be used to specify one or more directories that
-# contain include files that are not input files but should be processed by
-# the preprocessor.
+# contain include files that are not input files but should be processed by the
+# preprocessor.
+# This tag requires that the tag SEARCH_INCLUDES is set to YES.
 
 INCLUDE_PATH           =
 
 # You can use the INCLUDE_FILE_PATTERNS tag to specify one or more wildcard
 # patterns (like *.h and *.hpp) to filter out the header-files in the
-# directories. If left blank, the patterns specified with FILE_PATTERNS will
-# be used.
+# directories. If left blank, the patterns specified with FILE_PATTERNS will be
+# used.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
 INCLUDE_FILE_PATTERNS  =
 
-# The PREDEFINED tag can be used to specify one or more macro names that
-# are defined before the preprocessor is started (similar to the -D option of
-# gcc). The argument of the tag is a list of macros of the form: name
-# or name=definition (no spaces). If the definition and the = are
-# omitted =1 is assumed. To prevent a macro definition from being
-# undefined via #undef or recursively expanded use the := operator
-# instead of the = operator.
+# The PREDEFINED tag can be used to specify one or more macro names that are
+# defined before the preprocessor is started (similar to the -D option of e.g.
+# gcc). The argument of the tag is a list of macros of the form: name or
+# name=definition (no spaces). If the definition and the "=" are omitted, "=1"
+# is assumed. To prevent a macro definition from being undefined via #undef or
+# recursively expanded use the := operator instead of the = operator.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
 PREDEFINED             =
 
-# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then
-# this tag can be used to specify a list of macro names that should be expanded.
-# The macro definition that is found in the sources will be used.
-# Use the PREDEFINED tag if you want to use a different macro definition.
+# If the MACRO_EXPANSION and EXPAND_ONLY_PREDEF tags are set to YES then this
+# tag can be used to specify a list of macro names that should be expanded. The
+# macro definition that is found in the sources will be used. Use the PREDEFINED
+# tag if you want to use a different macro definition that overrules the
+# definition found in the source code.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
 EXPAND_AS_DEFINED      =
 
-# If the SKIP_FUNCTION_MACROS tag is set to YES (the default) then
-# doxygen's preprocessor will remove all function-like macros that are alone
-# on a line, have an all uppercase name, and do not end with a semicolon. Such
-# function macros are typically used for boiler-plate code, and will confuse
-# the parser if not removed.
+# If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will
+# remove all refrences to function-like macros that are alone on a line, have an
+# all uppercase name, and do not end with a semicolon. Such function macros are
+# typically used for boiler-plate code, and will confuse the parser if not
+# removed.
+# The default value is: YES.
+# This tag requires that the tag ENABLE_PREPROCESSING is set to YES.
 
 SKIP_FUNCTION_MACROS   = YES
 
 #---------------------------------------------------------------------------
-# Configuration::additions related to external references
+# Configuration options related to external references
 #---------------------------------------------------------------------------
 
-# The TAGFILES option can be used to specify one or more tagfiles.
-# Optionally an initial location of the external documentation
-# can be added for each tagfile. The format of a tag file without
-# this location is as follows:
-#
+# The TAGFILES tag can be used to specify one or more tag files. For each tag
+# file the location of the external documentation should be added. The format of
+# a tag file without this location is as follows:
 # TAGFILES = file1 file2 ...
 # Adding location for the tag files is done as follows:
-#
 # TAGFILES = file1=loc1 "file2 = loc2" ...
-# where "loc1" and "loc2" can be relative or absolute paths or
-# URLs. If a location is present for each tag, the installdox tool
-# does not have to be run to correct the links.
-# Note that each tag file must have a unique name
-# (where the name does NOT include the path)
-# If a tag file is not located in the directory in which doxygen
-# is run, you must also specify the path to the tagfile here.
+# where loc1 and loc2 can be relative or absolute paths or URLs. See the
+# section "Linking to external documentation" for more information about the use
+# of tag files.
+# Note: Each tag file must have an unique name (where the name does NOT include
+# the path). If a tag file is not located in the directory in which doxygen is
+# run, you must also specify the path to the tagfile here.
 
 TAGFILES               =
 
-# When a file name is specified after GENERATE_TAGFILE, doxygen will create
-# a tag file that is based on the input files it reads.
+# When a file name is specified after GENERATE_TAGFILE, doxygen will create a
+# tag file that is based on the input files it reads. See section "Linking to
+# external documentation" for more information about the usage of tag files.
 
 GENERATE_TAGFILE       =
 
-# If the ALLEXTERNALS tag is set to YES all external classes will be listed
-# in the class index. If set to NO only the inherited external classes
-# will be listed.
+# If the ALLEXTERNALS tag is set to YES all external class will be listed in the
+# class index. If set to NO only the inherited external classes will be listed.
+# The default value is: NO.
 
 ALLEXTERNALS           = NO
 
-# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed
-# in the modules index. If set to NO, only the current project's groups will
-# be listed.
+# If the EXTERNAL_GROUPS tag is set to YES all external groups will be listed in
+# the modules index. If set to NO, only the current project's groups will be
+# listed.
+# The default value is: YES.
 
 EXTERNAL_GROUPS        = YES
 
+# If the EXTERNAL_PAGES tag is set to YES all external pages will be listed in
+# the related pages index. If set to NO, only the current project's pages will
+# be listed.
+# The default value is: YES.
+
+EXTERNAL_PAGES         = YES
+
 # The PERL_PATH should be the absolute path and name of the perl script
-# interpreter (i.e. the result of `which perl').
+# interpreter (i.e. the result of 'which perl').
+# The default file (with absolute path) is: /usr/bin/perl.
 
 PERL_PATH              = /usr/bin/perl
 
@@ -1432,200 +2012,293 @@
 # Configuration options related to the dot tool
 #---------------------------------------------------------------------------
 
-# If the CLASS_DIAGRAMS tag is set to YES (the default) Doxygen will
-# generate a inheritance diagram (in HTML, RTF and LaTeX) for classes with base
-# or super classes. Setting the tag to NO turns the diagrams off. Note that
-# this option is superseded by the HAVE_DOT option below. This is only a
-# fallback. It is recommended to install and use dot, since it yields more
+# If the CLASS_DIAGRAMS tag is set to YES doxygen will generate a class diagram
+# (in HTML and LaTeX) for classes with base or super classes. Setting the tag to
+# NO turns the diagrams off. Note that this option also works with HAVE_DOT
+# disabled, but it is recommended to install and use dot, since it yields more
 # powerful graphs.
+# The default value is: YES.
 
 CLASS_DIAGRAMS         = YES
 
 # You can define message sequence charts within doxygen comments using the \msc
-# command. Doxygen will then run the mscgen tool (see
-# http://www.mcternan.me.uk/mscgen/) to produce the chart and insert it in the
+# command. Doxygen will then run the mscgen tool (see:
+# http://www.mcternan.me.uk/mscgen/)) to produce the chart and insert it in the
 # documentation. The MSCGEN_PATH tag allows you to specify the directory where
 # the mscgen tool resides. If left empty the tool is assumed to be found in the
 # default search path.
 
 MSCGEN_PATH            =
 
-# If set to YES, the inheritance and collaboration graphs will hide
-# inheritance and usage relations if the target is undocumented
-# or is not a class.
+# You can include diagrams made with dia in doxygen documentation. Doxygen will
+# then run dia to produce the diagram and insert it in the documentation. The
+# DIA_PATH tag allows you to specify the directory where the dia binary resides.
+# If left empty dia is assumed to be found in the default search path.
+
+DIA_PATH               =
+
+# If set to YES, the inheritance and collaboration graphs will hide inheritance
+# and usage relations if the target is undocumented or is not a class.
+# The default value is: YES.
 
 HIDE_UNDOC_RELATIONS   = YES
 
 # If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
-# available from the path. This tool is part of Graphviz, a graph visualization
-# toolkit from AT&T and Lucent Bell Labs. The other options in this section
-# have no effect if this option is set to NO (the default)
+# available from the path. This tool is part of Graphviz (see:
+# http://www.graphviz.org/), a graph visualization toolkit from AT&T and Lucent
+# Bell Labs. The other options in this section have no effect if this option is
+# set to NO
+# The default value is: NO.
 
 HAVE_DOT               = NO
 
-# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is
-# allowed to run in parallel. When set to 0 (the default) doxygen will
-# base this on the number of processors available in the system. You can set it
-# explicitly to a value larger than 0 to get control over the balance
-# between CPU load and processing speed.
+# The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed
+# to run in parallel. When set to 0 doxygen will base this on the number of
+# processors available in the system. You can set it explicitly to a value
+# larger than 0 to get control over the balance between CPU load and processing
+# speed.
+# Minimum value: 0, maximum value: 32, default value: 0.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_NUM_THREADS        = 0
 
-# By default doxygen will write a font called FreeSans.ttf to the output
-# directory and reference it in all dot files that doxygen generates. This
-# font does not include all possible unicode characters however, so when you need
-# these (or just want a differently looking font) you can specify the font name
-# using DOT_FONTNAME. You need need to make sure dot is able to find the font,
-# which can be done by putting it in a standard location or by setting the
-# DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory
-# containing the font.
+# When you want a differently looking font n the dot files that doxygen
+# generates you can specify the font name using DOT_FONTNAME. You need to make
+# sure dot is able to find the font, which can be done by putting it in a
+# standard location or by setting the DOTFONTPATH environment variable or by
+# setting DOT_FONTPATH to the directory containing the font.
+# The default value is: Helvetica.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_FONTNAME           = FreeSans.ttf
 
-# The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs.
-# The default size is 10pt.
+# The DOT_FONTSIZE tag can be used to set the size (in points) of the font of
+# dot graphs.
+# Minimum value: 4, maximum value: 24, default value: 10.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_FONTSIZE           = 10
 
-# By default doxygen will tell dot to use the output directory to look for the
-# FreeSans.ttf font (which doxygen will put there itself). If you specify a
-# different font using DOT_FONTNAME you can set the path where dot
-# can find it using this tag.
+# By default doxygen will tell dot to use the default font as specified with
+# DOT_FONTNAME. If you specify a different font using DOT_FONTNAME you can set
+# the path where dot can find it using this tag.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_FONTPATH           =
 
-# If the CLASS_GRAPH and HAVE_DOT tags are set to YES then doxygen
-# will generate a graph for each documented class showing the direct and
-# indirect inheritance relations. Setting this tag to YES will force the
-# the CLASS_DIAGRAMS tag to NO.
+# If the CLASS_GRAPH tag is set to YES then doxygen will generate a graph for
+# each documented class showing the direct and indirect inheritance relations.
+# Setting this tag to YES will force the CLASS_DIAGRAMS tag to NO.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 CLASS_GRAPH            = YES
 
-# If the COLLABORATION_GRAPH and HAVE_DOT tags are set to YES then doxygen
-# will generate a graph for each documented class showing the direct and
-# indirect implementation dependencies (inheritance, containment, and
-# class references variables) of the class with other documented classes.
+# If the COLLABORATION_GRAPH tag is set to YES then doxygen will generate a
+# graph for each documented class showing the direct and indirect implementation
+# dependencies (inheritance, containment, and class references variables) of the
+# class with other documented classes.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 COLLABORATION_GRAPH    = YES
 
-# If the GROUP_GRAPHS and HAVE_DOT tags are set to YES then doxygen
-# will generate a graph for groups, showing the direct groups dependencies
+# If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for
+# groups, showing the direct groups dependencies.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 GROUP_GRAPHS           = YES
 
 # If the UML_LOOK tag is set to YES doxygen will generate inheritance and
 # collaboration diagrams in a style similar to the OMG's Unified Modeling
 # Language.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 UML_LOOK               = NO
 
-# If set to YES, the inheritance and collaboration graphs will show the
-# relations between templates and their instances.
+# If the UML_LOOK tag is enabled, the fields and methods are shown inside the
+# class node. If there are many fields or methods and many nodes the graph may
+# become too big to be useful. The UML_LIMIT_NUM_FIELDS threshold limits the
+# number of items for each type to make the size more manageable. Set this to 0
+# for no limit. Note that the threshold may be exceeded by 50% before the limit
+# is enforced. So when you set the threshold to 10, up to 15 fields may appear,
+# but if the number exceeds 15, the total amount of fields shown is limited to
+# 10.
+# Minimum value: 0, maximum value: 100, default value: 10.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+UML_LIMIT_NUM_FIELDS   = 10
+
+# If the TEMPLATE_RELATIONS tag is set to YES then the inheritance and
+# collaboration graphs will show the relations between templates and their
+# instances.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 TEMPLATE_RELATIONS     = NO
 
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDE_GRAPH, and HAVE_DOT
-# tags are set to YES then doxygen will generate a graph for each documented
-# file showing the direct and indirect include dependencies of the file with
-# other documented files.
+# If the INCLUDE_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are set to
+# YES then doxygen will generate a graph for each documented file showing the
+# direct and indirect include dependencies of the file with other documented
+# files.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 INCLUDE_GRAPH          = YES
 
-# If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and
-# HAVE_DOT tags are set to YES then doxygen will generate a graph for each
-# documented header file showing the documented files that directly or
-# indirectly include this file.
+# If the INCLUDED_BY_GRAPH, ENABLE_PREPROCESSING and SEARCH_INCLUDES tags are
+# set to YES then doxygen will generate a graph for each documented file showing
+# the direct and indirect include dependencies of the file with other documented
+# files.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 INCLUDED_BY_GRAPH      = YES
 
-# If the CALL_GRAPH and HAVE_DOT options are set to YES then
-# doxygen will generate a call dependency graph for every global function
-# or class method. Note that enabling this option will significantly increase
-# the time of a run. So in most cases it will be better to enable call graphs
-# for selected functions only using the \callgraph command.
+# If the CALL_GRAPH tag is set to YES then doxygen will generate a call
+# dependency graph for every global function or class method.
+#
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable call graphs for selected
+# functions only using the \callgraph command.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 CALL_GRAPH             = NO
 
-# If the CALLER_GRAPH and HAVE_DOT tags are set to YES then
-# doxygen will generate a caller dependency graph for every global function
-# or class method. Note that enabling this option will significantly increase
-# the time of a run. So in most cases it will be better to enable caller
-# graphs for selected functions only using the \callergraph command.
+# If the CALLER_GRAPH tag is set to YES then doxygen will generate a caller
+# dependency graph for every global function or class method.
+#
+# Note that enabling this option will significantly increase the time of a run.
+# So in most cases it will be better to enable caller graphs for selected
+# functions only using the \callergraph command.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 CALLER_GRAPH           = NO
 
-# If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen
-# will graphical hierarchy of all classes instead of a textual one.
+# If the GRAPHICAL_HIERARCHY tag is set to YES then doxygen will graphical
+# hierarchy of all classes instead of a textual one.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 GRAPHICAL_HIERARCHY    = YES
 
-# If the DIRECTORY_GRAPH, SHOW_DIRECTORIES and HAVE_DOT tags are set to YES
-# then doxygen will show the dependencies a directory has on other directories
-# in a graphical way. The dependency relations are determined by the #include
-# relations between the files in the directories.
+# If the DIRECTORY_GRAPH tag is set to YES then doxygen will show the
+# dependencies a directory has on other directories in a graphical way. The
+# dependency relations are determined by the #include relations between the
+# files in the directories.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DIRECTORY_GRAPH        = YES
 
 # The DOT_IMAGE_FORMAT tag can be used to set the image format of the images
-# generated by dot. Possible values are png, jpg, or gif
-# If left blank png will be used.
+# generated by dot.
+# Note: If you choose svg you need to set HTML_FILE_EXTENSION to xhtml in order
+# to make the SVG files visible in IE 9+ (other browsers do not have this
+# requirement).
+# Possible values are: png, jpg, gif and svg.
+# The default value is: png.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_IMAGE_FORMAT       = png
 
-# The tag DOT_PATH can be used to specify the path where the dot tool can be
+# If DOT_IMAGE_FORMAT is set to svg, then this option can be set to YES to
+# enable generation of interactive SVG images that allow zooming and panning.
+#
+# Note that this requires a modern browser other than Internet Explorer. Tested
+# and working are Firefox, Chrome, Safari, and Opera.
+# Note: For IE 9+ you need to set HTML_FILE_EXTENSION to xhtml in order to make
+# the SVG files visible. Older versions of IE do not have SVG support.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
+
+INTERACTIVE_SVG        = NO
+
+# The DOT_PATH tag can be used to specify the path where the dot tool can be
 # found. If left blank, it is assumed the dot tool can be found in the path.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_PATH               =
 
 # The DOTFILE_DIRS tag can be used to specify one or more directories that
-# contain dot files that are included in the documentation (see the
-# \dotfile command).
+# contain dot files that are included in the documentation (see the \dotfile
+# command).
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOTFILE_DIRS           =
 
-# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of
-# nodes that will be shown in the graph. If the number of nodes in a graph
-# becomes larger than this value, doxygen will truncate the graph, which is
-# visualized by representing a node as a red box. Note that doxygen if the
-# number of direct children of the root node in a graph is already larger than
-# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note
-# that the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
+# The MSCFILE_DIRS tag can be used to specify one or more directories that
+# contain msc files that are included in the documentation (see the \mscfile
+# command).
+
+MSCFILE_DIRS           =
+
+# The DIAFILE_DIRS tag can be used to specify one or more directories that
+# contain dia files that are included in the documentation (see the \diafile
+# command).
+
+DIAFILE_DIRS           =
+
+# The DOT_GRAPH_MAX_NODES tag can be used to set the maximum number of nodes
+# that will be shown in the graph. If the number of nodes in a graph becomes
+# larger than this value, doxygen will truncate the graph, which is visualized
+# by representing a node as a red box. Note that doxygen if the number of direct
+# children of the root node in a graph is already larger than
+# DOT_GRAPH_MAX_NODES then the graph will not be shown at all. Also note that
+# the size of a graph can be further restricted by MAX_DOT_GRAPH_DEPTH.
+# Minimum value: 0, maximum value: 10000, default value: 50.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_GRAPH_MAX_NODES    = 50
 
-# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the
-# graphs generated by dot. A depth value of 3 means that only nodes reachable
-# from the root by following a path via at most 3 edges will be shown. Nodes
-# that lay further from the root node will be omitted. Note that setting this
-# option to 1 or 2 may greatly reduce the computation time needed for large
-# code bases. Also note that the size of a graph can be further restricted by
+# The MAX_DOT_GRAPH_DEPTH tag can be used to set the maximum depth of the graphs
+# generated by dot. A depth value of 3 means that only nodes reachable from the
+# root by following a path via at most 3 edges will be shown. Nodes that lay
+# further from the root node will be omitted. Note that setting this option to 1
+# or 2 may greatly reduce the computation time needed for large code bases. Also
+# note that the size of a graph can be further restricted by
 # DOT_GRAPH_MAX_NODES. Using a depth of 0 means no depth restriction.
+# Minimum value: 0, maximum value: 1000, default value: 0.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 MAX_DOT_GRAPH_DEPTH    = 0
 
 # Set the DOT_TRANSPARENT tag to YES to generate images with a transparent
-# background. This is disabled by default, because dot on Windows does not
-# seem to support this out of the box. Warning: Depending on the platform used,
-# enabling this option may lead to badly anti-aliased labels on the edges of
-# a graph (i.e. they become hard to read).
+# background. This is disabled by default, because dot on Windows does not seem
+# to support this out of the box.
+#
+# Warning: Depending on the platform used, enabling this option may lead to
+# badly anti-aliased labels on the edges of a graph (i.e. they become hard to
+# read).
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_TRANSPARENT        = NO
 
 # Set the DOT_MULTI_TARGETS tag to YES allow dot to generate multiple output
 # files in one run (i.e. multiple -o and -T options on the command line). This
-# makes dot run faster, but since only newer versions of dot (>1.8.10)
-# support this, this feature is disabled by default.
+# makes dot run faster, but since only newer versions of dot (>1.8.10) support
+# this, this feature is disabled by default.
+# The default value is: NO.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_MULTI_TARGETS      = YES
 
-# If the GENERATE_LEGEND tag is set to YES (the default) Doxygen will
-# generate a legend page explaining the meaning of the various boxes and
-# arrows in the dot generated graphs.
+# If the GENERATE_LEGEND tag is set to YES doxygen will generate a legend page
+# explaining the meaning of the various boxes and arrows in the dot generated
+# graphs.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 GENERATE_LEGEND        = YES
 
-# If the DOT_CLEANUP tag is set to YES (the default) Doxygen will
-# remove the intermediate dot files that are used to generate
-# the various graphs.
+# If the DOT_CLEANUP tag is set to YES doxygen will remove the intermediate dot
+# files that are used to generate the various graphs.
+# The default value is: YES.
+# This tag requires that the tag HAVE_DOT is set to YES.
 
 DOT_CLEANUP            = YES

LiVES-2.2.8.tar.bz2/libweed/libweed.pc -> LiVES-2.4.1.tar.bz2/libweed/libweed.pc Changed

LiVES-2.2.8.tar.bz2/libweed/libweed_slice.pc -> LiVES-2.4.1.tar.bz2/libweed/libweed_slice.pc Changed

LiVES-2.2.8.tar.bz2/libweed/weed-compat.h -> LiVES-2.4.1.tar.bz2/libweed/weed-compat.h Changed

@@ -59,8 +59,8 @@
 #include <weed/weed-palettes.h>
 #endif
 
-int fourccp_to_weedp (unsigned int fourcc, int bpp, int *interlaced, int *sampling, 
-		      int *sspace, int *clamping) {
+int fourccp_to_weedp(unsigned int fourcc, int bpp, int *interlaced, int *sampling,
+                     int *sspace, int *clamping) {
   // inputs are fourcc and bpp
   // returns int weed_palette
 
@@ -116,7 +116,7 @@
   case 0x43594448: // HDYC
     if (sspace!=NULL) *sspace=WEED_YUV_SUBSPACE_BT709;
     return WEED_PALETTE_UYVY;
-  case 0x564E5955: // UYNV 	
+  case 0x564E5955: // UYNV
   case 0x59565955: // UYVY
   case 0x32323459: // Y422
   case 0x76757963: // cyuv - ???
@@ -199,7 +199,7 @@
 #ifdef HAVE_AVCODEC
 #ifdef HAVE_AVUTIL
 
-  // compatibility with libavcodec
+// compatibility with libavcodec
 
 #include <libavcodec/avcodec.h>
 #include <libavutil/pixfmt.h>
@@ -247,6 +247,7 @@
 #define CODEC_ID_VP5 AV_CODEC_ID_VP5
 #define CODEC_ID_VP6 AV_CODEC_ID_VP6
 #define CODEC_ID_VP6F AV_CODEC_ID_VP6F
+#define CODEC_ID_VP6A AV_CODEC_ID_VP6A
 #define CODEC_ID_ASV1 AV_CODEC_ID_ASV1
 #define CODEC_ID_ASV2 AV_CODEC_ID_ASV2
 #define CODEC_ID_VCR1 AV_CODEC_ID_VCR1
@@ -260,7 +261,11 @@
 #define CODEC_ID_TRUEMOTION2 AV_CODEC_ID_TRUEMOTION2
 #define CODEC_ID_MSZH AV_CODEC_ID_MSZH
 #define CODEC_ID_ZLIB AV_CODEC_ID_ZLIB
+
+#if FF_API_SNOW
 #define CODEC_ID_SNOW AV_CODEC_ID_SNOW
+#endif
+
 #define CODEC_ID_4XM AV_CODEC_ID_4XM
 #define CODEC_ID_FLV1 AV_CODEC_ID_FLV1
 #define CODEC_ID_FLASHSV AV_CODEC_ID_FLASHSV
@@ -294,14 +299,14 @@
 #define CODEC_ID_FLASHSV2 AV_CODEC_ID_FLASHSV2
 #define CODEC_ID_TEXT AV_CODEC_ID_TEXT
 #define CODEC_ID_SSA AV_CODEC_ID_SSA
-#define CODEC_ID_SSA AV_CODEC_ID_SRT
+#define CODEC_ID_SRT AV_CODEC_ID_SRT
 #define CODEC_ID_VP8 AV_CODEC_ID_VP8
 #define CODEC_ID_RV10 AV_CODEC_ID_RV10
 #define CODEC_ID_RV20 AV_CODEC_ID_RV20
 #define CODEC_ID_RV30 AV_CODEC_ID_RV30
 #define CODEC_ID_RV40 AV_CODEC_ID_RV40
 #define CODEC_ID_MP3 AV_CODEC_ID_MP3
-#define CODEC_ID_MP3 AV_CODEC_ID_MP2
+#define CODEC_ID_MP2 AV_CODEC_ID_MP2
 #define CODEC_ID_AAC AV_CODEC_ID_AAC
 #define CODEC_ID_PCM_BLURAY AV_CODEC_ID_PCM_BLURAY
 #define CODEC_ID_AC3 AV_CODEC_ID_AC3
@@ -339,7 +344,7 @@
 
 #define CODEC_ID_PCM_U8 AV_CODEC_ID_PCM_U8
 
-#define CODEC_ID_PCM_QDM2 AV_CODEC_ID_QDM2
+#define CODEC_ID_QDM2 AV_CODEC_ID_QDM2
 #define CODEC_ID_RA_144 AV_CODEC_ID_RA_144
 #define CODEC_ID_RA_288 AV_CODEC_ID_RA_288
 #define CODEC_ID_ATRAC3 AV_CODEC_ID_ATRAC3
@@ -350,6 +355,24 @@
 
 #define CODEC_ID_TTF AV_CODEC_ID_TTF
 
+  // from mkv_decoder.h
+#define CODEC_ID_R10K AV_CODEC_ID_R10K
+#define CODEC_ID_R210 AV_CODEC_ID_R210
+#define CODEC_ID_V210 AV_CODEC_ID_V210
+#define CODEC_ID_MJPEGB AV_CODEC_ID_MJPEGB
+#define CODEC_ID_SVQ3 AV_CODEC_ID_SVQ3
+#define CODEC_ID_8BPS AV_CODEC_ID_8BPS
+#define CODEC_ID_SMC AV_CODEC_ID_SMC
+#define CODEC_ID_QTRLE AV_CODEC_ID_QTRLE
+#define CODEC_ID_QDRAW AV_CODEC_ID_QDRAW
+#define CODEC_ID_DNXHD AV_CODEC_ID_DNXHD
+#define CODEC_ID_SGI AV_CODEC_ID_SGI
+#define CODEC_ID_DPX AV_CODEC_ID_DPX
+#define CODEC_ID_PRORES AV_CODEC_ID_PRORES
+
+
+
+
 #endif
 
 const AVCodecTag codec_bmp_tags[] = {
@@ -376,7 +399,7 @@
   { CODEC_ID_MPEG4,        MKTAG('X', 'V', 'I', 'D') },
   { CODEC_ID_MPEG4,        MKTAG('M', 'P', '4', 'S') },
   { CODEC_ID_MPEG4,        MKTAG('M', '4', 'S', '2') },
-  { CODEC_ID_MPEG4,        MKTAG( 4 ,  0 ,  0 ,  0 ) }, /* some broken avi use this */
+  { CODEC_ID_MPEG4,        MKTAG(4 ,  0 ,  0 ,  0) },   /* some broken avi use this */
   { CODEC_ID_MPEG4,        MKTAG('D', 'I', 'V', '1') },
   { CODEC_ID_MPEG4,        MKTAG('B', 'L', 'Z', '0') },
   { CODEC_ID_MPEG4,        MKTAG('m', 'p', '4', 'v') },
@@ -441,9 +464,9 @@
   { CODEC_ID_MPEG1VIDEO,   MKTAG('P', 'I', 'M', '1') },
   { CODEC_ID_MPEG2VIDEO,   MKTAG('P', 'I', 'M', '2') },
   { CODEC_ID_MPEG1VIDEO,   MKTAG('V', 'C', 'R', '2') },
-  { CODEC_ID_MPEG1VIDEO,   MKTAG( 1 ,  0 ,  0 ,  16) },
-  { CODEC_ID_MPEG2VIDEO,   MKTAG( 2 ,  0 ,  0 ,  16) },
-  { CODEC_ID_MPEG4,        MKTAG( 4 ,  0 ,  0 ,  16) },
+  { CODEC_ID_MPEG1VIDEO,   MKTAG(1 ,  0 ,  0 ,  16) },
+  { CODEC_ID_MPEG2VIDEO,   MKTAG(2 ,  0 ,  0 ,  16) },
+  { CODEC_ID_MPEG4,        MKTAG(4 ,  0 ,  0 ,  16) },
   { CODEC_ID_MPEG2VIDEO,   MKTAG('D', 'V', 'R', ' ') },
   { CODEC_ID_MPEG2VIDEO,   MKTAG('M', 'M', 'E', 'S') },
   { CODEC_ID_MPEG2VIDEO,   MKTAG('L', 'M', 'P', '2') }, /* Lead MPEG2 in avi */
@@ -473,8 +496,8 @@
   { CODEC_ID_HUFFYUV,      MKTAG('H', 'F', 'Y', 'U') },
   { CODEC_ID_FFVHUFF,      MKTAG('F', 'F', 'V', 'H') },
   { CODEC_ID_CYUV,         MKTAG('C', 'Y', 'U', 'V') },
-  { CODEC_ID_RAWVIDEO,     MKTAG( 0 ,  0 ,  0 ,  0 ) },
-  { CODEC_ID_RAWVIDEO,     MKTAG( 3 ,  0 ,  0 ,  0 ) },
+  { CODEC_ID_RAWVIDEO,     MKTAG(0 ,  0 ,  0 ,  0) },
+  { CODEC_ID_RAWVIDEO,     MKTAG(3 ,  0 ,  0 ,  0) },
   { CODEC_ID_RAWVIDEO,     MKTAG('I', '4', '2', '0') },
   { CODEC_ID_RAWVIDEO,     MKTAG('Y', 'U', 'Y', '2') },
   { CODEC_ID_RAWVIDEO,     MKTAG('Y', '4', '2', '2') },
@@ -513,8 +536,8 @@
   { CODEC_ID_XAN_WC4,      MKTAG('X', 'x', 'a', 'n') },
   { CODEC_ID_MIMIC,        MKTAG('L', 'M', '2', '0') },
   { CODEC_ID_MSRLE,        MKTAG('m', 'r', 'l', 'e') },
-  { CODEC_ID_MSRLE,        MKTAG( 1 ,  0 ,  0 ,  0 ) },
-  { CODEC_ID_MSRLE,        MKTAG( 2 ,  0 ,  0 ,  0 ) },
+  { CODEC_ID_MSRLE,        MKTAG(1 ,  0 ,  0 ,  0) },
+  { CODEC_ID_MSRLE,        MKTAG(2 ,  0 ,  0 ,  0) },
   { CODEC_ID_MSVIDEO1,     MKTAG('M', 'S', 'V', 'C') },
   { CODEC_ID_MSVIDEO1,     MKTAG('m', 's', 'v', 'c') },
   { CODEC_ID_MSVIDEO1,     MKTAG('C', 'R', 'A', 'M') },
@@ -526,7 +549,9 @@
   { CODEC_ID_TRUEMOTION1,  MKTAG('P', 'V', 'E', 'Z') },
   { CODEC_ID_MSZH,         MKTAG('M', 'S', 'Z', 'H') },
   { CODEC_ID_ZLIB,         MKTAG('Z', 'L', 'I', 'B') },
+#if FF_API_SNOW
   { CODEC_ID_SNOW,         MKTAG('S', 'N', 'O', 'W') },
+#endif
   { CODEC_ID_4XM,          MKTAG('4', 'X', 'M', 'V') },
   { CODEC_ID_FLV1,         MKTAG('F', 'L', 'V', '1') },
   { CODEC_ID_FLASHSV,      MKTAG('F', 'S', 'V', '1') },
@@ -575,7 +600,7 @@
 
   switch (pix_fmt) {
   case PIX_FMT_RGB24:
-    return WEED_PALETTE_RGB24;
+      return WEED_PALETTE_RGB24;
   case PIX_FMT_BGR24:
     return WEED_PALETTE_BGR24;
   case PIX_FMT_RGBA:
@@ -623,7 +648,7 @@
 
   switch (pal) {
   case WEED_PALETTE_RGB24:
-    return PIX_FMT_RGB24;
+      return PIX_FMT_RGB24;
   case WEED_PALETTE_BGR24:
     return PIX_FMT_BGR24;
   case WEED_PALETTE_RGBA32:

LiVES-2.2.8.tar.bz2/libweed/weed-effects.h -> LiVES-2.4.1.tar.bz2/libweed/weed-effects.h Changed

@@ -56,11 +56,11 @@
 {
 #endif /* __cplusplus */
 
-  /* API version * 131 */
+/* API version * 131 */
 #define WEED_API_VERSION 131
 #define WEED_API_VERSION_131
 
-  /* plant types */
+/* plant types */
 #define WEED_PLANT_PLUGIN_INFO 1
 #define WEED_PLANT_FILTER_CLASS 2
 #define WEED_PLANT_FILTER_INSTANCE 3
@@ -107,7 +107,7 @@
 #define WEED_CHANNEL_SIZE_CAN_VARY            (1<<3)
 #define WEED_CHANNEL_PALETTE_CAN_VARY         (1<<4)
 
-  
+
 /* Channel flags */
 #define WEED_CHANNEL_ALPHA_PREMULT (1<<0)
 
@@ -125,22 +125,22 @@
 #define WEED_ERROR_INIT_ERROR 8
 #define WEED_ERROR_PLUGIN_INVALID 64
 
-  /* host bootstrap function */
-typedef weed_plant_t *(*weed_bootstrap_f) (weed_default_getter_f *value, int num_versions, int *plugin_versions);
+/* host bootstrap function */
+typedef weed_plant_t *(*weed_bootstrap_f)(weed_default_getter_f *value, int num_versions, int *plugin_versions);
 
-  /* plugin only functions */
+/* plugin only functions */
 typedef weed_plant_t *(*weed_setup_f)(weed_bootstrap_f weed_boot);
 typedef void (*weed_desetup_f)(void);
-typedef int (*weed_init_f) (weed_plant_t *filter_instance);
-typedef int (*weed_process_f) (weed_plant_t *filter_instance, weed_timecode_t timestamp);
-typedef int (*weed_deinit_f) (weed_plant_t *filter_instance);
+typedef int (*weed_init_f)(weed_plant_t *filter_instance);
+typedef int (*weed_process_f)(weed_plant_t *filter_instance, weed_timecode_t timestamp);
+typedef int (*weed_deinit_f)(weed_plant_t *filter_instance);
 
-  /* special plugin functions */
+/* special plugin functions */
 typedef void (*weed_display_f)(weed_plant_t *parameter);
 typedef int (*weed_interpolate_f)(weed_plant_t **in_values, weed_plant_t *out_value);
 
-  /* prototype here */
-  weed_plant_t *weed_setup (weed_bootstrap_f weed_boot);
+/* prototype here */
+weed_plant_t *weed_setup(weed_bootstrap_f weed_boot);
 
 #ifdef __cplusplus
 }

LiVES-2.2.8.tar.bz2/libweed/weed-events.h -> LiVES-2.4.1.tar.bz2/libweed/weed-events.h Changed

LiVES-2.2.8.tar.bz2/libweed/weed-gslice.c -> LiVES-2.4.1.tar.bz2/libweed/weed-gslice.c Changed

@@ -43,7 +43,7 @@
 
 */
 
-/* (C) Gabriel "Salsaman" Finch, 2005 */
+/* (C) Gabriel "Salsaman" Finch, 2005 - 2015 */
 
 // experimental implementation of libweed using glib's slice allocator
 
@@ -90,8 +90,8 @@
 
 static weed_plant_t *_weed_plant_new(int plant_type);
 static char **_weed_plant_list_leaves(weed_plant_t *plant);
-static int _weed_leaf_set_caller(weed_plant_t *plant, const char *key, int seed_type, int num_elems, 
-				 void *value, int caller);
+static int _weed_leaf_set_caller(weed_plant_t *plant, const char *key, int seed_type, int num_elems,
+                                 void *value, int caller);
 static int _weed_leaf_get(weed_plant_t *plant, const char *key, int idx, void *value);
 static int _weed_leaf_num_elements(weed_plant_t *plant, const char *key);
 static size_t _weed_leaf_element_size(weed_plant_t *plant, const char *key, int idx);
@@ -113,26 +113,26 @@
 #endif
 
 
-static inline size_t weed_strlen (const char *string) {
+static inline size_t weed_strlen(const char *string) {
   size_t len=0;
   size_t maxlen=(size_t)-2;
   while (*(string++)!=0&&(len!=maxlen)) len++;
   return len;
 }
 
-static inline char *weed_strdup (const char *string) {
+static inline char *weed_strdup(const char *string) {
   size_t len;
-  char *ret=weed_malloc((len=weed_strlen(string))+1);
-  
+  char *ret=(char *)weed_malloc((len=weed_strlen(string))+1);
+
   weed_memcpy(ret,string,len+1);
   return ret;
 }
 
-static inline char *weed_slice_strdup (const char *string) {
-  return g_slice_copy(weed_strlen(string)+1,string);
+static inline char *weed_slice_strdup(const char *string) {
+  return (char *)g_slice_copy(weed_strlen(string)+1,string);
 }
 
-static inline int weed_strcmp (const char *st1, const char *st2) {
+static inline int weed_strcmp(const char *st1, const char *st2) {
   while (!(*st1==0&&*st2==0)) {
     if (*(st1)==0||*(st2)==0||*(st1++)!=*(st2++)) return 1;
   }
@@ -140,23 +140,23 @@
 }
 
 
-static inline int weed_seed_is_ptr (int seed) {
- return (seed!=WEED_SEED_BOOLEAN&&seed!=WEED_SEED_INT&&seed!=WEED_SEED_DOUBLE&&seed!=WEED_SEED_STRING&&seed!=
-	 WEED_SEED_INT64)?1:0;
+static inline int weed_seed_is_ptr(int seed) {
+  return (seed!=WEED_SEED_BOOLEAN&&seed!=WEED_SEED_INT&&seed!=WEED_SEED_DOUBLE&&seed!=WEED_SEED_STRING&&seed!=
+          WEED_SEED_INT64)?1:0;
 }
 
-static inline size_t weed_seed_get_size (int seed, void *value) {
-  return weed_seed_is_ptr (seed)?(sizeof(void *)):\
-  (seed==WEED_SEED_BOOLEAN||seed==WEED_SEED_INT)?4:\
-  (seed==WEED_SEED_DOUBLE)?8:\
-  (seed==WEED_SEED_INT64)?8:\
-  (seed==WEED_SEED_STRING)?weed_strlen((const char *)value):0;
+static inline size_t weed_seed_get_size(int seed, void *value) {
+  return weed_seed_is_ptr(seed)?(sizeof(void *)):\
+         (seed==WEED_SEED_BOOLEAN||seed==WEED_SEED_INT)?4:\
+         (seed==WEED_SEED_DOUBLE)?8:\
+         (seed==WEED_SEED_INT64)?8:\
+         (seed==WEED_SEED_STRING)?weed_strlen((const char *)value):0;
 }
 
 static inline void weed_data_free(weed_data_t **data, int num_elems, int seed_type) {
   register int i;
-  for (i=0;i<num_elems;i++) {
-    if (!weed_seed_is_ptr(seed_type)||(seed_type==WEED_SEED_STRING&&data[i]->value!=NULL)) 
+  for (i=0; i<num_elems; i++) {
+    if (!weed_seed_is_ptr(seed_type)||(seed_type==WEED_SEED_STRING&&data[i]->value!=NULL))
       g_slice_free1(data[i]->size,data[i]->value);
     g_slice_free(weed_data_t,data[i]);
   }
@@ -171,8 +171,8 @@
   void **valuev=(void **)value;
 
   if (num_elems==0) return data;
-  if ((data=(weed_data_t **)g_slice_alloc(num_elems*sizeof(weed_data_t *)))==NULL) return ((void *)0);
-  for (i=0;i<num_elems;i++) {
+  if ((data=(weed_data_t **)g_slice_alloc(num_elems*sizeof(weed_data_t *)))==NULL) return ((weed_data_t **)0);
+  for (i=0; i<num_elems; i++) {
     if ((data[i]=g_slice_new(weed_data_t))==NULL) {
       weed_data_free(data,--i,seed_type);
       return NULL;
@@ -180,18 +180,17 @@
     if (weed_seed_is_ptr(seed_type)) data[i]->value=valuev[i];
     else {
       if (seed_type==WEED_SEED_STRING) {
-	size=weed_strlen(valuec[i]);
-	if (size>0) data[i]->value=g_slice_copy(size,valuec[i]);
-	else data[i]->value=NULL;
-	data[i]->size=size;
-      }
-      else {
-	size=weed_seed_get_size(seed_type,NULL);
-	data[i]->value=g_slice_copy(size,(char *)value+i*size);
+        size=weed_strlen(valuec[i]);
+        if (size>0) data[i]->value=g_slice_copy(size,valuec[i]);
+        else data[i]->value=NULL;
+        data[i]->size=size;
+      } else {
+        size=weed_seed_get_size(seed_type,NULL);
+        data[i]->value=g_slice_copy(size,(char *)value+i*size);
       }
       if (size>0&&data[i]->value==NULL) { // memory error
-	weed_data_free(data,--i,seed_type);
-	return NULL;
+        weed_data_free(data,--i,seed_type);
+        return NULL;
       }
     }
     if (seed_type!=WEED_SEED_STRING) data[i]->size=weed_seed_get_size(seed_type,data[i]->value);
@@ -200,24 +199,24 @@
 }
 
 static inline weed_leaf_t *weed_find_leaf(weed_plant_t *leaf, const char *key) {
- while (leaf!=NULL) {
-  if (!weed_strcmp((char *)leaf->key,(char *)key)) return leaf;
-  leaf=leaf->next;
- }
- return NULL;
+  while (leaf!=NULL) {
+    if (!weed_strcmp((char *)leaf->key,(char *)key)) return leaf;
+    leaf=leaf->next;
+  }
+  return NULL;
 }
 
 static inline void weed_leaf_free(weed_leaf_t *leaf) {
-  weed_data_free (leaf->data,leaf->num_elements,leaf->seed_type);
-  g_slice_free1 (weed_strlen(leaf->key)+1,(void *)leaf->key);
-  g_slice_free (weed_leaf_t,leaf);
+  weed_data_free(leaf->data,leaf->num_elements,leaf->seed_type);
+  g_slice_free1(weed_strlen(leaf->key)+1,(void *)leaf->key);
+  g_slice_free(weed_leaf_t,leaf);
 }
 
 static inline weed_leaf_t *weed_leaf_new(const char *key, int seed) {
   weed_leaf_t *leaf=g_slice_new(weed_leaf_t);
   if (leaf==NULL) return NULL;
   if ((leaf->key=weed_slice_strdup(key))==NULL) {
-    g_slice_free (weed_leaf_t,leaf);
+    g_slice_free(weed_leaf_t,leaf);
     return NULL;
   }
   leaf->seed_type=seed;
@@ -242,7 +241,7 @@
   weed_leaf_t *leafnext;
   while (leaf!=NULL) {
     leafnext=leaf->next;
-    weed_leaf_free (leaf);
+    weed_leaf_free(leaf);
     leaf=leafnext;
   }
 }
@@ -265,7 +264,7 @@
 
 
 static int _weed_leaf_set_flags(weed_plant_t *plant, const char *key, int flags) {
-  weed_leaf_t *leaf=weed_find_leaf (plant, key);
+  weed_leaf_t *leaf=weed_find_leaf(plant, key);
   if (leaf==NULL) return WEED_ERROR_NOSUCH_LEAF;
   leaf->flags=flags;
   return WEED_NO_ERROR;
@@ -274,14 +273,14 @@
 static weed_plant_t *_weed_plant_new(int plant_type) {
   weed_leaf_t *leaf;
   if ((leaf=weed_leaf_new("type",WEED_SEED_INT))==NULL) return NULL;
-  if ((leaf->data=(weed_data_t **)weed_data_new (WEED_SEED_INT,1,&plant_type))==NULL) {
-    g_slice_free1 (weed_strlen(leaf->key)+1,(void *)leaf->key);
-    g_slice_free (weed_leaf_t,leaf);
+  if ((leaf->data=(weed_data_t **)weed_data_new(WEED_SEED_INT,1,&plant_type))==NULL) {
+    g_slice_free1(weed_strlen(leaf->key)+1,(void *)leaf->key);
+    g_slice_free(weed_leaf_t,leaf);
     return NULL;
   }
   leaf->num_elements=1;
   leaf->next=NULL;
-  _weed_leaf_set_flags (leaf,"type",WEED_LEAF_READONLY_PLUGIN|WEED_LEAF_READONLY_HOST);
+  _weed_leaf_set_flags(leaf,"type",WEED_LEAF_READONLY_PLUGIN|WEED_LEAF_READONLY_HOST);
   return leaf;
 }
 
@@ -289,15 +288,15 @@
   weed_leaf_t *leaf=plant;
   char **leaflist;
   register int i=1;
-  for (;leaf!=NULL;i++) {
+  for (; leaf!=NULL; i++) {
     leaf=leaf->next;
   }
   if ((leaflist=(char **)weed_malloc(i*sizeof(char *)))==NULL) return NULL;
   i=0;
-  for (leaf=plant;leaf!=NULL;leaf=leaf->next) {
+  for (leaf=plant; leaf!=NULL; leaf=leaf->next) {
     if ((leaflist[i]=weed_strdup(leaf->key))==NULL) {
-      for (--i;i>=0;i--) weed_free (leaflist[i]);
-      weed_free (leaflist);
+      for (--i; i>=0; i--) weed_free(leaflist[i]);
+      weed_free(leaflist);
       return NULL;
     }
     i++;
@@ -306,26 +305,25 @@
   return leaflist;
 }
 
-static inline int _weed_leaf_set_caller(weed_plant_t *plant, const char *key, int seed_type, int num_elems, 
-					void *value, int caller) {
+static inline int _weed_leaf_set_caller(weed_plant_t *plant, const char *key, int seed_type, int num_elems,
+                                        void *value, int caller) {
 #ifdef CHECK_CALLER
   printf("caller was %d\n",caller);
 #endif
   weed_data_t **data=NULL;
-  weed_leaf_t *leaf=weed_find_leaf (plant,key);
+  weed_leaf_t *leaf=weed_find_leaf(plant,key);
   if (leaf==NULL) {
-    if ((leaf=weed_leaf_new (key,seed_type))==NULL) return WEED_ERROR_MEMORY_ALLOCATION;
-    weed_leaf_append (plant,leaf);
-  }
-  else {
+    if ((leaf=weed_leaf_new(key,seed_type))==NULL) return WEED_ERROR_MEMORY_ALLOCATION;
+    weed_leaf_append(plant,leaf);
+  } else {
     if ((caller==WEED_CALLER_PLUGIN&&leaf->flags&WEED_LEAF_READONLY_PLUGIN)||
-	(caller==WEED_CALLER_HOST&&leaf->flags&WEED_LEAF_READONLY_HOST)) return WEED_ERROR_LEAF_READONLY;
+        (caller==WEED_CALLER_HOST&&leaf->flags&WEED_LEAF_READONLY_HOST)) return WEED_ERROR_LEAF_READONLY;
     if (seed_type!=leaf->seed_type) return WEED_ERROR_WRONG_SEED_TYPE;
-    weed_data_free (leaf->data,leaf->num_elements,seed_type);
+    weed_data_free(leaf->data,leaf->num_elements,seed_type);
     leaf->data=NULL;
   }
   leaf->num_elements=0;
-  if (num_elems>0&&(data=weed_data_new (seed_type,num_elems,value))==NULL) {
+  if (num_elems>0&&(data=weed_data_new(seed_type,num_elems,value))==NULL) {
     return WEED_ERROR_MEMORY_ALLOCATION;
   }
   leaf->data=data;
@@ -336,13 +334,13 @@
 
 static int _weed_leaf_set(weed_plant_t *plant, const char *key, int seed_type, int num_elems, void *value) {
   // host version
-  return _weed_leaf_set_caller (plant,key,seed_type,num_elems,value,WEED_CALLER_HOST);
+  return _weed_leaf_set_caller(plant,key,seed_type,num_elems,value,WEED_CALLER_HOST);
 }
 
 
 static int _weed_leaf_set_plugin(weed_plant_t *plant, const char *key, int seed_type, int num_elems, void *value) {
   // plugin version - host should pass this to plugin in host_info
-  return _weed_leaf_set_caller (plant,key,seed_type,num_elems,value,WEED_CALLER_PLUGIN);
+  return _weed_leaf_set_caller(plant,key,seed_type,num_elems,value,WEED_CALLER_PLUGIN);
 }
 
 
@@ -355,18 +353,17 @@
 
   // additionally, the prototype of this function must never change
 
-  weed_leaf_t *leaf=weed_find_leaf (plant,key);
+  weed_leaf_t *leaf=weed_find_leaf(plant,key);
   if (leaf==NULL||idx>leaf->num_elements) return WEED_ERROR_NOSUCH_LEAF;
   if (value==NULL) return WEED_NO_ERROR;
-  if (weed_seed_is_ptr (leaf->seed_type)) memcpy (value,&leaf->data[idx]->value,sizeof(void *));
+  if (weed_seed_is_ptr(leaf->seed_type)) memcpy(value,&leaf->data[idx]->value,sizeof(void *));
   else {
     if (leaf->seed_type==WEED_SEED_STRING) {
       size_t size=leaf->data[idx]->size;
       char **valuecharptrptr=(char **)value;
       if (size>0) memcpy(*valuecharptrptr,leaf->data[idx]->value,size);
       memset(*valuecharptrptr+size,0,1);
-    }
-    else memcpy (value,leaf->data[idx]->value,weed_seed_get_size(leaf->seed_type,leaf->data[idx]->value));
+    } else memcpy(value,leaf->data[idx]->value,weed_seed_get_size(leaf->seed_type,leaf->data[idx]->value));
   }
   return WEED_NO_ERROR;
 
@@ -375,42 +372,41 @@
 
 
 static int _weed_leaf_get(weed_plant_t *plant, const char *key, int idx, void *value) {
-  weed_leaf_t *leaf=weed_find_leaf (plant,key);
+  weed_leaf_t *leaf=weed_find_leaf(plant,key);
   if (leaf==NULL||idx>leaf->num_elements) return WEED_ERROR_NOSUCH_LEAF;
   if (value==NULL) return WEED_NO_ERROR;
-  if (weed_seed_is_ptr (leaf->seed_type)) weed_memcpy (value,&leaf->data[idx]->value,sizeof(void *));
+  if (weed_seed_is_ptr(leaf->seed_type)) weed_memcpy(value,&leaf->data[idx]->value,sizeof(void *));
   else {
     if (leaf->seed_type==WEED_SEED_STRING) {
       size_t size=leaf->data[idx]->size;
       char **valuecharptrptr=(char **)value;
       if (size>0) weed_memcpy(*valuecharptrptr,leaf->data[idx]->value,size);
       weed_memset(*valuecharptrptr+size,0,1);
-    }
-    else weed_memcpy (value,leaf->data[idx]->value,weed_seed_get_size(leaf->seed_type,leaf->data[idx]->value));
+    } else weed_memcpy(value,leaf->data[idx]->value,weed_seed_get_size(leaf->seed_type,leaf->data[idx]->value));
   }
   return WEED_NO_ERROR;
 }
 
 static int _weed_leaf_num_elements(weed_plant_t *plant, const char *key) {
-  weed_leaf_t *leaf=weed_find_leaf (plant, key);
+  weed_leaf_t *leaf=weed_find_leaf(plant, key);
   if (leaf==NULL) return 0;
   return leaf->num_elements;
 }
 
 static size_t _weed_leaf_element_size(weed_plant_t *plant, const char *key, int idx) {
-  weed_leaf_t *leaf=weed_find_leaf (plant, key);
+  weed_leaf_t *leaf=weed_find_leaf(plant, key);
   if (leaf==NULL||idx>leaf->num_elements) return 0;
   return leaf->data[idx]->size;
 }
 
 static int _weed_leaf_seed_type(weed_plant_t *plant, const char *key) {
-  weed_leaf_t *leaf=weed_find_leaf (plant, key);
+  weed_leaf_t *leaf=weed_find_leaf(plant, key);
   if (leaf==NULL) return 0;
   return leaf->seed_type;
 }
 
 static int _weed_leaf_get_flags(weed_plant_t *plant, const char *key) {
-  weed_leaf_t *leaf=weed_find_leaf (plant, key);
+  weed_leaf_t *leaf=weed_find_leaf(plant, key);
   if (leaf==NULL) return 0;
   return leaf->flags;
 }

LiVES-2.4.1.tar.bz2/libweed/weed-gslice_scripting.c Added

@@ -0,0 +1,395 @@
+/* WEED is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 3 of the License, or (at your option) any later version.
+
+   Weed is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with this source code; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+
+
+   Weed is developed by:
+
+   Gabriel "Salsaman" Finch - http://lives.sourceforge.net
+
+
+   mainly based on LiViDO, which is developed by:
+
+
+   Niels Elburg - http://veejay.sf.net
+
+   Gabriel "Salsaman" Finch - http://lives.sourceforge.net
+
+   Denis "Jaromil" Rojo - http://freej.dyne.org
+
+   Tom Schouten - http://zwizwa.fartit.com
+
+   Andraz Tori - http://cvs.cinelerra.org
+
+   reviewed with suggestions and contributions from:
+
+   Silvano "Kysucix" Galliani - http://freej.dyne.org
+
+   Kentaro Fukuchi - http://megaui.net/fukuchi
+
+   Jun Iio - http://www.malib.net
+
+   Carlo Prelz - http://www2.fluido.as:8080/
+
+*/
+
+/* (C) Gabriel "Salsaman" Finch, 2005 - 2015 */
+
+// special version of libweed with fixed function defs. - for inclusion in other dynamic libs (e.g. liblives)
+
+#ifndef _WEED_VISIBLE_FUNCTIONS_
+#define _WEED_VISIBLE_FUNCTIONS_
+#endif
+
+#ifdef HAVE_SYSTEM_WEED
+#include <weed/weed.h>
+#include <weed/weed-host.h>
+#else
+#include "weed.h"
+#include "weed-host.h"
+#endif
+
+#include <glib.h>
+
+#ifdef CHECK_CALLER
+#include <stdio.h>
+#endif
+
+
+#include <string.h> // for malloc, memset, memcpy
+#include <stdlib.h> // for free
+
+
+#if GLIB_CHECK_VERSION(2,14,0) == FALSE
+static inline gpointer g_slice_copy(gsize bsize, gconstpointer block) {
+  gpointer ret=g_slice_alloc(bsize);
+  memcpy(ret,block,bsize);
+  return ret;
+}
+#endif
+
+
+static inline size_t weed_strlen(const char *string) {
+  size_t len=0;
+  size_t maxlen=(size_t)-2;
+  while (*(string++)!=0&&(len!=maxlen)) len++;
+  return len;
+}
+
+static inline char *weed_strdup(const char *string) {
+  size_t len;
+  char *ret=(char *)malloc((len=weed_strlen(string))+1);
+
+  memcpy(ret,string,len+1);
+  return ret;
+}
+
+static inline char *weed_slice_strdup(const char *string) {
+  return (char *)g_slice_copy(weed_strlen(string)+1,string);
+}
+
+static inline int weed_strcmp(const char *st1, const char *st2) {
+  while (!(*st1==0&&*st2==0)) {
+    if (*(st1)==0||*(st2)==0||*(st1++)!=*(st2++)) return 1;
+  }
+  return 0;
+}
+
+
+static inline int weed_seed_is_ptr(int seed) {
+  return (seed!=WEED_SEED_BOOLEAN&&seed!=WEED_SEED_INT&&seed!=WEED_SEED_DOUBLE&&seed!=WEED_SEED_STRING&&seed!=
+          WEED_SEED_INT64)?1:0;
+}
+
+static inline size_t weed_seed_get_size(int seed, void *value) {
+  return weed_seed_is_ptr(seed)?(sizeof(void *)):\
+         (seed==WEED_SEED_BOOLEAN||seed==WEED_SEED_INT)?4:\
+         (seed==WEED_SEED_DOUBLE)?8:\
+         (seed==WEED_SEED_INT64)?8:\
+         (seed==WEED_SEED_STRING)?weed_strlen((const char *)value):0;
+}
+
+static inline void weed_data_free(weed_data_t **data, int num_elems, int seed_type) {
+  register int i;
+  for (i=0; i<num_elems; i++) {
+    if (!weed_seed_is_ptr(seed_type)||(seed_type==WEED_SEED_STRING&&data[i]->value!=NULL))
+      g_slice_free1(data[i]->size,data[i]->value);
+    g_slice_free(weed_data_t,data[i]);
+  }
+  g_slice_free1(num_elems*sizeof(weed_data_t *),data);
+}
+
+static inline weed_data_t **weed_data_new(int seed_type, int num_elems, void *value) {
+  register int i;
+  weed_data_t **data=NULL;
+  size_t size;
+  char **valuec=(char **)value;
+  void **valuev=(void **)value;
+
+  if (num_elems==0) return data;
+  if ((data=(weed_data_t **)g_slice_alloc(num_elems*sizeof(weed_data_t *)))==NULL) return ((weed_data_t **)0);
+  for (i=0; i<num_elems; i++) {
+    if ((data[i]=g_slice_new(weed_data_t))==NULL) {
+      weed_data_free(data,--i,seed_type);
+      return NULL;
+    }
+    if (weed_seed_is_ptr(seed_type)) data[i]->value=valuev[i];
+    else {
+      if (seed_type==WEED_SEED_STRING) {
+        size=weed_strlen(valuec[i]);
+        if (size>0) data[i]->value=g_slice_copy(size,valuec[i]);
+        else data[i]->value=NULL;
+        data[i]->size=size;
+      } else {
+        size=weed_seed_get_size(seed_type,NULL);
+        data[i]->value=g_slice_copy(size,(char *)value+i*size);
+      }
+      if (size>0&&data[i]->value==NULL) { // memory error
+        weed_data_free(data,--i,seed_type);
+        return NULL;
+      }
+    }
+    if (seed_type!=WEED_SEED_STRING) data[i]->size=weed_seed_get_size(seed_type,data[i]->value);
+  }
+  return data;
+}
+
+static inline weed_leaf_t *weed_find_leaf(weed_plant_t *leaf, const char *key) {
+  while (leaf!=NULL) {
+    if (!weed_strcmp((char *)leaf->key,(char *)key)) return leaf;
+    leaf=leaf->next;
+  }
+  return NULL;
+}
+
+static inline void weed_leaf_free(weed_leaf_t *leaf) {
+  weed_data_free(leaf->data,leaf->num_elements,leaf->seed_type);
+  g_slice_free1(weed_strlen(leaf->key)+1,(void *)leaf->key);
+  g_slice_free(weed_leaf_t,leaf);
+}
+
+static inline weed_leaf_t *weed_leaf_new(const char *key, int seed) {
+  weed_leaf_t *leaf=g_slice_new(weed_leaf_t);
+  if (leaf==NULL) return NULL;
+  if ((leaf->key=weed_slice_strdup(key))==NULL) {
+    g_slice_free(weed_leaf_t,leaf);
+    return NULL;
+  }
+  leaf->seed_type=seed;
+  leaf->data=NULL;
+  leaf->next=NULL;
+  leaf->num_elements=leaf->flags=0;
+  return leaf;
+}
+
+static inline void weed_leaf_append(weed_plant_t *leaf, weed_leaf_t *newleaf) {
+  weed_leaf_t *leafnext;
+  while (leaf!=NULL) {
+    if ((leafnext=leaf->next)==NULL) {
+      leaf->next=newleaf;
+      return;
+    }
+    leaf=leafnext;
+  }
+}
+
+void weed_plant_free(weed_plant_t *leaf) {
+  weed_leaf_t *leafnext;
+  while (leaf!=NULL) {
+    leafnext=leaf->next;
+    weed_leaf_free(leaf);
+    leaf=leafnext;
+  }
+}
+
+
+int weed_leaf_delete(weed_plant_t *plant, const char *key) {
+  weed_leaf_t *leaf=plant,*leafnext;
+  while (leaf->next!=NULL) {
+    if (!weed_strcmp((char *)leaf->next->key,(char *)key)) {
+      if (leaf->next->flags&WEED_LEAF_READONLY_HOST) return WEED_ERROR_LEAF_READONLY;
+      leafnext=leaf->next;
+      leaf->next=leaf->next->next;
+      weed_leaf_free(leafnext);
+      return WEED_NO_ERROR;
+    }
+    leaf=leaf->next;
+  }
+  return WEED_ERROR_NOSUCH_LEAF;
+}
+
+
+int weed_leaf_set_flags(weed_plant_t *plant, const char *key, int flags) {
+  weed_leaf_t *leaf=weed_find_leaf(plant, key);
+  if (leaf==NULL) return WEED_ERROR_NOSUCH_LEAF;
+  leaf->flags=flags;
+  return WEED_NO_ERROR;
+}
+
+weed_plant_t *weed_plant_new(int plant_type) {
+  weed_leaf_t *leaf;
+  if ((leaf=weed_leaf_new("type",WEED_SEED_INT))==NULL) return NULL;
+  if ((leaf->data=(weed_data_t **)weed_data_new(WEED_SEED_INT,1,&plant_type))==NULL) {
+    g_slice_free1(weed_strlen(leaf->key)+1,(void *)leaf->key);
+    g_slice_free(weed_leaf_t,leaf);
+    return NULL;
+  }
+  leaf->num_elements=1;
+  leaf->next=NULL;
+  weed_leaf_set_flags(leaf,"type",WEED_LEAF_READONLY_PLUGIN|WEED_LEAF_READONLY_HOST);
+  return leaf;
+}
+
+char **weed_plant_list_leaves(weed_plant_t *plant) {
+  weed_leaf_t *leaf=plant;
+  char **leaflist;
+  register int i=1;
+  for (; leaf!=NULL; i++) {
+    leaf=leaf->next;
+  }
+  if ((leaflist=(char **)malloc(i*sizeof(char *)))==NULL) return NULL;
+  i=0;
+  for (leaf=plant; leaf!=NULL; leaf=leaf->next) {
+    if ((leaflist[i]=weed_strdup(leaf->key))==NULL) {
+      for (--i; i>=0; i--) free(leaflist[i]);
+      free(leaflist);
+      return NULL;
+    }
+    i++;
+  }
+  leaflist[i]=NULL;
+  return leaflist;
+}
+
+static inline int _weed_leaf_set_caller(weed_plant_t *plant, const char *key, int seed_type, int num_elems,
+                                        void *value, int caller) {
+#ifdef CHECK_CALLER
+  printf("caller was %d\n",caller);
+#endif
+  weed_data_t **data=NULL;
+  weed_leaf_t *leaf=weed_find_leaf(plant,key);
+  if (leaf==NULL) {
+    if ((leaf=weed_leaf_new(key,seed_type))==NULL) return WEED_ERROR_MEMORY_ALLOCATION;
+    weed_leaf_append(plant,leaf);
+  } else {
+    if ((caller==WEED_CALLER_PLUGIN&&leaf->flags&WEED_LEAF_READONLY_PLUGIN)||
+        (caller==WEED_CALLER_HOST&&leaf->flags&WEED_LEAF_READONLY_HOST)) return WEED_ERROR_LEAF_READONLY;
+    if (seed_type!=leaf->seed_type) return WEED_ERROR_WRONG_SEED_TYPE;
+    weed_data_free(leaf->data,leaf->num_elements,seed_type);
+    leaf->data=NULL;
+  }
+  leaf->num_elements=0;
+  if (num_elems>0&&(data=weed_data_new(seed_type,num_elems,value))==NULL) {
+    return WEED_ERROR_MEMORY_ALLOCATION;
+  }
+  leaf->data=data;
+  leaf->num_elements=num_elems;
+  return WEED_NO_ERROR;
+}
+
+
+int weed_leaf_set(weed_plant_t *plant, const char *key, int seed_type, int num_elems, void *value) {
+  // host version
+  return _weed_leaf_set_caller(plant,key,seed_type,num_elems,value,WEED_CALLER_HOST);
+}
+
+
+int weed_leaf_set_plugin(weed_plant_t *plant, const char *key, int seed_type, int num_elems, void *value) {
+  // plugin version - host should pass this to plugin in host_info
+  return _weed_leaf_set_caller(plant,key,seed_type,num_elems,value,WEED_CALLER_PLUGIN);
+}
+
+
+int weed_default_get(weed_plant_t *plant, const char *key, int idx, void *value) {
+  // the plugin should use this only when bootstrapping in order to get its memory functions
+  // the actual weed_leaf_get
+
+  // here we must assume that the plugin does not yet have its memory functions, so we can only
+  // use the standard ones
+
+  // additionally, the prototype of this function must never change
+
+  weed_leaf_t *leaf=weed_find_leaf(plant,key);
+  if (leaf==NULL||idx>leaf->num_elements) return WEED_ERROR_NOSUCH_LEAF;
+  if (value==NULL) return WEED_NO_ERROR;
+  if (weed_seed_is_ptr(leaf->seed_type)) memcpy(value,&leaf->data[idx]->value,sizeof(void *));
+  else {
+    if (leaf->seed_type==WEED_SEED_STRING) {
+      size_t size=leaf->data[idx]->size;
+      char **valuecharptrptr=(char **)value;
+      if (size>0) memcpy(*valuecharptrptr,leaf->data[idx]->value,size);
+      memset(*valuecharptrptr+size,0,1);
+    } else memcpy(value,leaf->data[idx]->value,weed_seed_get_size(leaf->seed_type,leaf->data[idx]->value));
+  }
+  return WEED_NO_ERROR;
+
+}
+
+
+
+int weed_leaf_get(weed_plant_t *plant, const char *key, int idx, void *value) {
+  weed_leaf_t *leaf=weed_find_leaf(plant,key);
+  if (leaf==NULL||idx>leaf->num_elements) return WEED_ERROR_NOSUCH_LEAF;
+  if (value==NULL) return WEED_NO_ERROR;
+  if (weed_seed_is_ptr(leaf->seed_type)) memcpy(value,&leaf->data[idx]->value,sizeof(void *));
+  else {
+    if (leaf->seed_type==WEED_SEED_STRING) {
+      size_t size=leaf->data[idx]->size;
+      char **valuecharptrptr=(char **)value;
+      if (size>0) memcpy(*valuecharptrptr,leaf->data[idx]->value,size);
+      memset(*valuecharptrptr+size,0,1);
+    } else memcpy(value,leaf->data[idx]->value,weed_seed_get_size(leaf->seed_type,leaf->data[idx]->value));
+  }
+  return WEED_NO_ERROR;
+}
+
+int weed_leaf_num_elements(weed_plant_t *plant, const char *key) {
+  weed_leaf_t *leaf=weed_find_leaf(plant, key);
+  if (leaf==NULL) return 0;
+  return leaf->num_elements;
+}
+
+size_t weed_leaf_element_size(weed_plant_t *plant, const char *key, int idx) {
+  weed_leaf_t *leaf=weed_find_leaf(plant, key);
+  if (leaf==NULL||idx>leaf->num_elements) return 0;
+  return leaf->data[idx]->size;
+}
+
+int weed_leaf_seed_type(weed_plant_t *plant, const char *key) {
+  weed_leaf_t *leaf=weed_find_leaf(plant, key);
+  if (leaf==NULL) return 0;
+  return leaf->seed_type;
+}
+
+int weed_leaf_get_flags(weed_plant_t *plant, const char *key) {
+  weed_leaf_t *leaf=weed_find_leaf(plant, key);
+  if (leaf==NULL) return 0;
+  return leaf->flags;
+}
+
+
+void weed_free(void *p) {
+  free(p);
+}
+
+void *weed_memset(void *p, int c, size_t n) {
+  return memset(p,c,n);
+}
+
+void *weed_malloc(size_t n) {
+  return malloc(n);
+}
+
+void *weed_memcpy(void *dest, const void *src, size_t n) {
+  return memcpy(dest,src,n);
+}

LiVES-2.2.8.tar.bz2/libweed/weed-host.h -> LiVES-2.4.1.tar.bz2/libweed/weed-host.h Changed

@@ -63,13 +63,15 @@
 #define WEED_CALLER_HOST 0
 #define WEED_CALLER_PLUGIN 1
 
-  /* host only functions */
+/* host only functions */
 typedef void (*weed_plant_free_f)(weed_plant_t *plant);
 typedef int (*weed_leaf_delete_f)(weed_plant_t *plant, const char *key);
 typedef int (*weed_leaf_set_flags_f)(weed_plant_t *plant, const char *key, int flags);
 typedef int (weed_leaf_set_caller_f)(weed_plant_t *plant, const char *key, int seed_type, int num_elems, void *value, int caller);
 
 #ifndef _SKIP_WEED_API_
+#ifndef _WEED_VISIBLE_FUNCTIONS_
+
 weed_default_getter_f weed_default_get;
 weed_leaf_get_f weed_leaf_get;
 weed_leaf_set_f weed_leaf_set;
@@ -89,9 +91,39 @@
 weed_memcpy_f weed_memcpy;
 weed_memset_f weed_memset;
 
+#else
+
+void weed_plant_free(weed_plant_t *leaf)  __attribute__((visibility("default")));
+char **weed_plant_list_leaves(weed_plant_t *plant) __attribute__((visibility("default")));
+int weed_leaf_set_flags(weed_plant_t *plant, const char *key, int flags) __attribute__((visibility("default")));
+int weed_leaf_get_flags(weed_plant_t *plant, const char *key) __attribute__((visibility("default")));
+weed_plant_t *weed_plant_new(int plant_type) __attribute__((visibility("default")));
+int weed_default_get(weed_plant_t *plant, const char *key, int idx, void *value) __attribute__((visibility("default")));
+int weed_leaf_get(weed_plant_t *plant, const char *key, int idx, void *value) __attribute__((visibility("default")));
+int weed_leaf_num_elements(weed_plant_t *plant, const char *key) __attribute__((visibility("default")));
+size_t weed_leaf_element_size(weed_plant_t *plant, const char *key, int idx) __attribute__((visibility("default")));
+int weed_leaf_seed_type(weed_plant_t *plant, const char *key) __attribute__((visibility("default")));
+int weed_leaf_get_flags(weed_plant_t *plant, const char *key) __attribute__((visibility("default")));
+int weed_leaf_set_plugin(weed_plant_t *plant, const char *key, int seed_type, int num_elems, void *value)
+__attribute__((visibility("default")));
+void *weed_malloc(size_t n) __attribute__((visibility("default")));
+void weed_free(void *p) __attribute__((visibility("default")));
+void *weed_memset(void *p, int c, size_t n) __attribute__((visibility("default")));
+void *weed_memcpy(void *dest, const void *src, size_t n) __attribute__((visibility("default")));
+int weed_leaf_set(weed_plant_t *plant, const char *key, int seed_type, int num_elems, void *value)
+__attribute__((visibility("default")));
+int weed_leaf_set_plugin(weed_plant_t *plant, const char *key, int seed_type, int num_elems, void *value)
+__attribute__((visibility("default")));
+int weed_leaf_delete(weed_plant_t *plant, const char *key) __attribute__((visibility("default")));
+
+#endif
+
+#endif
+
+#ifndef _WEED_VISIBLE_FUNCTIONS_
+void weed_init(int api_v, weed_malloc_f, weed_free_f, weed_memcpy_f, weed_memset_f) __attribute__((visibility("default")));
 #endif
 
-void weed_init(int api_v, weed_malloc_f, weed_free_f, weed_memcpy_f, weed_memset_f) __attribute__ ((visibility("default")));
 
 #ifdef __cplusplus
 }

LiVES-2.2.8.tar.bz2/libweed/weed-plugin.h -> LiVES-2.4.1.tar.bz2/libweed/weed-plugin.h Changed

LiVES-2.2.8.tar.bz2/libweed/weed-utils.c -> LiVES-2.4.1.tar.bz2/libweed/weed-utils.c Changed

@@ -71,7 +71,7 @@
 
 /////////////////////////////////////////////////////////////////
 
-int weed_plant_has_leaf (weed_plant_t *plant, const char *key) {
+int weed_plant_has_leaf(weed_plant_t *plant, const char *key) {
   if (weed_leaf_get(plant,key,0,NULL)==WEED_ERROR_NOSUCH_LEAF) return WEED_FALSE;
   return WEED_TRUE;
 }
@@ -79,92 +79,91 @@
 /////////////////////////////////////////////////////////////////
 // leaf setters
 
-int weed_set_int_value (weed_plant_t *plant, const char *key, int value) {
+int weed_set_int_value(weed_plant_t *plant, const char *key, int value) {
   // returns a WEED_ERROR
-  return weed_leaf_set (plant,key,WEED_SEED_INT,1,&value);
+  return weed_leaf_set(plant,key,WEED_SEED_INT,1,&value);
 }
 
-int weed_set_double_value (weed_plant_t *plant, const char *key, double value) {
+int weed_set_double_value(weed_plant_t *plant, const char *key, double value) {
   // returns a WEED_ERROR
-  return weed_leaf_set (plant,key,WEED_SEED_DOUBLE,1,&value);
+  return weed_leaf_set(plant,key,WEED_SEED_DOUBLE,1,&value);
 }
 
-int weed_set_boolean_value (weed_plant_t *plant, const char *key, int value) {
+int weed_set_boolean_value(weed_plant_t *plant, const char *key, int value) {
   // returns a WEED_ERROR
-  return weed_leaf_set (plant,key,WEED_SEED_BOOLEAN,1,&value);
+  return weed_leaf_set(plant,key,WEED_SEED_BOOLEAN,1,&value);
 }
 
-int weed_set_int64_value (weed_plant_t *plant, const char *key, int64_t value) {
+int weed_set_int64_value(weed_plant_t *plant, const char *key, int64_t value) {
   // returns a WEED_ERROR
-  return weed_leaf_set (plant,key,WEED_SEED_INT64,1,&value);
+  return weed_leaf_set(plant,key,WEED_SEED_INT64,1,&value);
 }
 
-int weed_set_string_value (weed_plant_t *plant, const char *key, const char *value) {
+int weed_set_string_value(weed_plant_t *plant, const char *key, const char *value) {
   // returns a WEED_ERROR
-  return weed_leaf_set (plant,key,WEED_SEED_STRING,1,&value);
+  return weed_leaf_set(plant,key,WEED_SEED_STRING,1,&value);
 }
 
-int weed_set_plantptr_value (weed_plant_t *plant, const char *key, weed_plant_t *value) {
+int weed_set_plantptr_value(weed_plant_t *plant, const char *key, weed_plant_t *value) {
   // returns a WEED_ERROR
-  return weed_leaf_set (plant,key,WEED_SEED_PLANTPTR,1,&value);
+  return weed_leaf_set(plant,key,WEED_SEED_PLANTPTR,1,&value);
 }
 
-int weed_set_voidptr_value (weed_plant_t *plant, const char *key, void *value) {
+int weed_set_voidptr_value(weed_plant_t *plant, const char *key, void *value) {
   // returns a WEED_ERROR
-  return weed_leaf_set (plant,key,WEED_SEED_VOIDPTR,1,&value);
+  return weed_leaf_set(plant,key,WEED_SEED_VOIDPTR,1,&value);
 }
 
 //////////////////////////////////////////////////////////////////////////////////////////////////
 // general leaf getter
 
-inline int weed_get_value (weed_plant_t *plant, const char *key, void *value) {
+inline int weed_get_value(weed_plant_t *plant, const char *key, void *value) {
   // returns a WEED_ERROR
   return weed_leaf_get(plant, key, 0, value);
 }
 
 ////////////////////////////////////////////////////////////
 
-int weed_get_int_value (weed_plant_t *plant, const char *key, int *error) {
+int weed_get_int_value(weed_plant_t *plant, const char *key, int *error) {
   int retval=0;
   if (weed_plant_has_leaf(plant,key)&&weed_leaf_seed_type(plant,key)!=WEED_SEED_INT) {
     *error=WEED_ERROR_WRONG_SEED_TYPE;
     return retval;
-  }
-  else *error=weed_get_value (plant,key,&retval);
+  } else *error=weed_get_value(plant,key,&retval);
   return retval;
 }
 
-double weed_get_double_value (weed_plant_t *plant, const char *key, int *error) {
+double weed_get_double_value(weed_plant_t *plant, const char *key, int *error) {
   double retval=0.;
   if (weed_plant_has_leaf(plant,key)&&weed_leaf_seed_type(plant,key)!=WEED_SEED_DOUBLE) {
     *error=WEED_ERROR_WRONG_SEED_TYPE;
     return retval;
   }
-  *error=weed_get_value (plant,key,&retval);
+  *error=weed_get_value(plant,key,&retval);
   return retval;
 }
 
-int weed_get_boolean_value (weed_plant_t *plant, const char *key, int *error) {
+int weed_get_boolean_value(weed_plant_t *plant, const char *key, int *error) {
   int retval=0;
   if (weed_plant_has_leaf(plant,key)&&weed_leaf_seed_type(plant,key)!=WEED_SEED_BOOLEAN) {
     *error=WEED_ERROR_WRONG_SEED_TYPE;
     return retval;
   }
-  *error=weed_get_value (plant,key,&retval);
+  *error=weed_get_value(plant,key,&retval);
   return retval;
 }
 
-int64_t weed_get_int64_value (weed_plant_t *plant, const char *key, int *error) {
+int64_t weed_get_int64_value(weed_plant_t *plant, const char *key, int *error) {
   int64_t retval=0;
   if (weed_plant_has_leaf(plant,key)&&weed_leaf_seed_type(plant,key)!=WEED_SEED_INT64) {
     *error=WEED_ERROR_WRONG_SEED_TYPE;
     return retval;
   }
-  *error=weed_get_value (plant,key,&retval);
+  *error=weed_get_value(plant,key,&retval);
   return retval;
 }
 
-char *weed_get_string_value (weed_plant_t *plant, const char *key, int *error) {
+char *weed_get_string_value(weed_plant_t *plant, const char *key, int *error) {
   size_t size;
   char *retval=NULL;
   if (weed_plant_has_leaf(plant,key)&&weed_leaf_seed_type(plant,key)!=WEED_SEED_STRING) {
@@ -175,38 +174,38 @@
     *error=WEED_ERROR_MEMORY_ALLOCATION;
     return NULL;
   }
-  if ((*error=weed_get_value (plant,key,&retval))!=WEED_NO_ERROR) {
-    weed_free (retval);
+  if ((*error=weed_get_value(plant,key,&retval))!=WEED_NO_ERROR) {
+    weed_free(retval);
     return NULL;
   }
   weed_memset(retval+size,0,1);
   return retval;
 }
 
-void *weed_get_voidptr_value (weed_plant_t *plant, const char *key, int *error) {
+void *weed_get_voidptr_value(weed_plant_t *plant, const char *key, int *error) {
   void *retval=NULL;
   if (weed_plant_has_leaf(plant,key)&&weed_leaf_seed_type(plant,key)!=WEED_SEED_VOIDPTR) {
     *error=WEED_ERROR_WRONG_SEED_TYPE;
     return retval;
   }
-  *error=weed_get_value (plant,key,&retval);
+  *error=weed_get_value(plant,key,&retval);
   return retval;
 }
 
-weed_plant_t *weed_get_plantptr_value (weed_plant_t *plant, const char *key, int *error) {
+weed_plant_t *weed_get_plantptr_value(weed_plant_t *plant, const char *key, int *error) {
   weed_plant_t *retval=NULL;
   if (weed_plant_has_leaf(plant,key)&&weed_leaf_seed_type(plant,key)!=WEED_SEED_PLANTPTR) {
     *error=WEED_ERROR_WRONG_SEED_TYPE;
     return retval;
   }
-  *error=weed_get_value (plant,key,&retval);
+  *error=weed_get_value(plant,key,&retval);
   return retval;
 }
 
 
 ////////////////////////////////////////////////////////////
 
-int *weed_get_int_array (weed_plant_t *plant, const char *key, int *error) {
+int *weed_get_int_array(weed_plant_t *plant, const char *key, int *error) {
   int i;
   int num_elems;
   int *retval;
@@ -216,23 +215,23 @@
     return NULL;
   }
 
-  if ((num_elems=weed_leaf_num_elements (plant,key))==0) return NULL;
+  if ((num_elems=weed_leaf_num_elements(plant,key))==0) return NULL;
 
   if ((retval=(int *)weed_malloc(num_elems*4))==NULL) {
     *error=WEED_ERROR_MEMORY_ALLOCATION;
     return NULL;
   }
 
-  for (i=0;i<num_elems;i++) {
+  for (i=0; i<num_elems; i++) {
     if ((*error=weed_leaf_get(plant, key, i, &retval[i]))!=WEED_NO_ERROR) {
-      weed_free (retval);
+      weed_free(retval);
       return NULL;
     }
   }
   return retval;
 }
 
-double *weed_get_double_array (weed_plant_t *plant, const char *key, int *error) {
+double *weed_get_double_array(weed_plant_t *plant, const char *key, int *error) {
   int i;
   int num_elems;
   double *retval;
@@ -241,23 +240,23 @@
     *error=WEED_ERROR_WRONG_SEED_TYPE;
     return NULL;
   }
-  if ((num_elems=weed_leaf_num_elements (plant,key))==0) return NULL;
+  if ((num_elems=weed_leaf_num_elements(plant,key))==0) return NULL;
 
   if ((retval=(double *)weed_malloc(num_elems*sizeof(double)))==NULL) {
     *error=WEED_ERROR_MEMORY_ALLOCATION;
     return NULL;
   }
 
-  for (i=0;i<num_elems;i++) {
+  for (i=0; i<num_elems; i++) {
     if ((*error=weed_leaf_get(plant, key, i, &retval[i]))!=WEED_NO_ERROR) {
-      weed_free (retval);
+      weed_free(retval);
       return NULL;
     }
   }
   return retval;
 }
 
-int *weed_get_boolean_array (weed_plant_t *plant, const char *key, int *error) {
+int *weed_get_boolean_array(weed_plant_t *plant, const char *key, int *error) {
   int i;
   int num_elems;
   int *retval;
@@ -267,23 +266,23 @@
     return NULL;
   }
 
-  if ((num_elems=weed_leaf_num_elements (plant,key))==0) return NULL;
+  if ((num_elems=weed_leaf_num_elements(plant,key))==0) return NULL;
 
   if ((retval=(int *)weed_malloc(num_elems*4))==NULL) {
     *error=WEED_ERROR_MEMORY_ALLOCATION;
     return NULL;
   }
 
-  for (i=0;i<num_elems;i++) {
+  for (i=0; i<num_elems; i++) {
     if ((*error=weed_leaf_get(plant, key, i, &retval[i]))!=WEED_NO_ERROR) {
-      weed_free (retval);
+      weed_free(retval);
       return NULL;
     }
   }
   return retval;
 }
 
-int64_t *weed_get_int64_array (weed_plant_t *plant, const char *key, int *error) {
+int64_t *weed_get_int64_array(weed_plant_t *plant, const char *key, int *error) {
   int i;
   int num_elems;
   int64_t *retval;
@@ -293,23 +292,23 @@
     return NULL;
   }
 
-  if ((num_elems=weed_leaf_num_elements (plant,key))==0) return NULL;
+  if ((num_elems=weed_leaf_num_elements(plant,key))==0) return NULL;
 
   if ((retval=(int64_t *)weed_malloc(num_elems*8))==NULL) {
     *error=WEED_ERROR_MEMORY_ALLOCATION;
     return NULL;
   }
 
-  for (i=0;i<num_elems;i++) {
+  for (i=0; i<num_elems; i++) {
     if ((*error=weed_leaf_get(plant, key, i, &retval[i]))!=WEED_NO_ERROR) {
-      weed_free (retval);
+      weed_free(retval);
       return NULL;
     }
   }
   return retval;
 }
 
-char **weed_get_string_array (weed_plant_t *plant, const char *key, int *error) {
+char **weed_get_string_array(weed_plant_t *plant, const char *key, int *error) {
   int i;
   int num_elems;
   char **retval;
@@ -320,23 +319,23 @@
     return NULL;
   }
 
-  if ((num_elems=weed_leaf_num_elements (plant,key))==0) return NULL;
+  if ((num_elems=weed_leaf_num_elements(plant,key))==0) return NULL;
 
   if ((retval=(char **)weed_malloc(num_elems*sizeof(char *)))==NULL) {
     *error=WEED_ERROR_MEMORY_ALLOCATION;
     return NULL;
   }
 
-  for (i=0;i<num_elems;i++) {
+  for (i=0; i<num_elems; i++) {
     if ((retval[i]=(char *)weed_malloc((size=weed_leaf_element_size(plant,key,i))+1))==NULL) {
-      for (--i;i>=0;i--) weed_free(retval[i]);
+      for (--i; i>=0; i--) weed_free(retval[i]);
       *error=WEED_ERROR_MEMORY_ALLOCATION;
-      weed_free (retval);
+      weed_free(retval);
       return NULL;
     }
     if ((*error=weed_leaf_get(plant, key, i, &retval[i]))!=WEED_NO_ERROR) {
-      for (--i;i>=0;i--) weed_free(retval[i]);
-      weed_free (retval);
+      for (--i; i>=0; i--) weed_free(retval[i]);
+      weed_free(retval);
       return NULL;
     }
     weed_memset(retval[i]+size,0,1);
@@ -344,7 +343,7 @@
   return retval;
 }
 
-void **weed_get_voidptr_array (weed_plant_t *plant, const char *key, int *error) {
+void **weed_get_voidptr_array(weed_plant_t *plant, const char *key, int *error) {
   int i;
   int num_elems;
   void **retval;
@@ -354,23 +353,23 @@
     return NULL;
   }
 
-  if ((num_elems=weed_leaf_num_elements (plant,key))==0) return NULL;
+  if ((num_elems=weed_leaf_num_elements(plant,key))==0) return NULL;
 
   if ((retval=(void **)weed_malloc(num_elems*sizeof(void *)))==NULL) {
     *error=WEED_ERROR_MEMORY_ALLOCATION;
     return NULL;
   }
 
-  for (i=0;i<num_elems;i++) {
+  for (i=0; i<num_elems; i++) {
     if ((*error=weed_leaf_get(plant, key, i, &retval[i]))!=WEED_NO_ERROR) {
-      weed_free (retval);
+      weed_free(retval);
       return NULL;
     }
   }
   return retval;
 }
 
-weed_plant_t **weed_get_plantptr_array (weed_plant_t *plant, const char *key, int *error) {
+weed_plant_t **weed_get_plantptr_array(weed_plant_t *plant, const char *key, int *error) {
   int i;
   int num_elems;
   weed_plant_t **retval;
@@ -380,16 +379,16 @@
     return NULL;
   }
 
-  if ((num_elems=weed_leaf_num_elements (plant,key))==0) return NULL;
+  if ((num_elems=weed_leaf_num_elements(plant,key))==0) return NULL;
 
   if ((retval=(weed_plant_t **)weed_malloc(num_elems*sizeof(weed_plant_t *)))==NULL) {
     *error=WEED_ERROR_MEMORY_ALLOCATION;
     return NULL;
   }
 
-  for (i=0;i<num_elems;i++) {
+  for (i=0; i<num_elems; i++) {
     if ((*error=weed_leaf_get(plant, key, i, &retval[i]))!=WEED_NO_ERROR) {
-      weed_free (retval);
+      weed_free(retval);
       return NULL;
     }
   }
@@ -398,39 +397,39 @@
 
 /////////////////////////////////////////////////////
 
-int weed_set_int_array (weed_plant_t *plant, const char *key, int num_elems, int *values) {
-  return weed_leaf_set (plant,key,WEED_SEED_INT,num_elems,values);
+int weed_set_int_array(weed_plant_t *plant, const char *key, int num_elems, int *values) {
+  return weed_leaf_set(plant,key,WEED_SEED_INT,num_elems,values);
 }
 
-int weed_set_double_array (weed_plant_t *plant, const char *key, int num_elems, double *values) {
-  return weed_leaf_set (plant,key,WEED_SEED_DOUBLE,num_elems,values);
+int weed_set_double_array(weed_plant_t *plant, const char *key, int num_elems, double *values) {
+  return weed_leaf_set(plant,key,WEED_SEED_DOUBLE,num_elems,values);
 }
 
-int weed_set_boolean_array (weed_plant_t *plant, const char *key, int num_elems, int *values) {
-  return weed_leaf_set (plant,key,WEED_SEED_BOOLEAN,num_elems,values);
+int weed_set_boolean_array(weed_plant_t *plant, const char *key, int num_elems, int *values) {
+  return weed_leaf_set(plant,key,WEED_SEED_BOOLEAN,num_elems,values);
 }
 
-int weed_set_int64_array (weed_plant_t *plant, const char *key, int num_elems, int64_t *values) {
-  return weed_leaf_set (plant,key,WEED_SEED_INT64,num_elems,values);
+int weed_set_int64_array(weed_plant_t *plant, const char *key, int num_elems, int64_t *values) {
+  return weed_leaf_set(plant,key,WEED_SEED_INT64,num_elems,values);
 }
 
-int weed_set_string_array (weed_plant_t *plant, const char *key, int num_elems, char **values) {
-  return weed_leaf_set (plant,key,WEED_SEED_STRING,num_elems,values);
+int weed_set_string_array(weed_plant_t *plant, const char *key, int num_elems, char **values) {
+  return weed_leaf_set(plant,key,WEED_SEED_STRING,num_elems,values);
 }
 
-int weed_set_voidptr_array (weed_plant_t *plant, const char *key, int num_elems, void **values) {
-  return weed_leaf_set (plant,key,WEED_SEED_VOIDPTR,num_elems,values);
+int weed_set_voidptr_array(weed_plant_t *plant, const char *key, int num_elems, void **values) {
+  return weed_leaf_set(plant,key,WEED_SEED_VOIDPTR,num_elems,values);
 }
 
-int weed_set_plantptr_array (weed_plant_t *plant, const char *key, int num_elems, weed_plant_t **values) {
-  return weed_leaf_set (plant,key,WEED_SEED_PLANTPTR,num_elems,values);
+int weed_set_plantptr_array(weed_plant_t *plant, const char *key, int num_elems, weed_plant_t **values) {
+  return weed_leaf_set(plant,key,WEED_SEED_PLANTPTR,num_elems,values);
 }
 
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 
-int weed_leaf_copy (weed_plant_t *dst, const char *keyt, weed_plant_t *src, const char *keyf) {
+int weed_leaf_copy(weed_plant_t *dst, const char *keyt, weed_plant_t *src, const char *keyf) {
   int num,seed_type,i,error;
   int *datai;
   double *datad;
@@ -480,8 +479,8 @@
     case WEED_SEED_STRING:
       datac=weed_get_string_array(src,keyf,&error);
       error=weed_set_string_array(dst,keyt,num,datac);
-      for (i=0;i<num;i++) {
-	weed_free(datac[i]);
+      for (i=0; i<num; i++) {
+        weed_free(datac[i]);
       }
       weed_free(datac);
       break;
@@ -491,14 +490,14 @@
 }
 
 
-weed_plant_t *weed_plant_copy (weed_plant_t *src) {
+weed_plant_t *weed_plant_copy(weed_plant_t *src) {
   int i=0,error;
   char **proplist=weed_plant_list_leaves(src);
   char *prop;
   weed_plant_t *plant=weed_plant_new(weed_get_int_value(src,"type",&error));
   if (plant==NULL) return NULL;
 
-  for (prop=proplist[0];(prop=proplist[i])!=NULL&&error==WEED_NO_ERROR;i++) {
+  for (prop=proplist[0]; (prop=proplist[i])!=NULL&&error==WEED_NO_ERROR; i++) {
     if (strcmp(prop,"type")) error=weed_leaf_copy(plant,prop,src,prop);
     weed_free(prop);
   }
@@ -513,7 +512,7 @@
 }
 
 
-int weed_get_plant_type (weed_plant_t *plant) {
+int weed_get_plant_type(weed_plant_t *plant) {
   int error;
   return weed_get_int_value(plant,"type",&error);
 }

LiVES-2.2.8.tar.bz2/libweed/weed-utils.h -> LiVES-2.4.1.tar.bz2/libweed/weed-utils.h Changed

@@ -57,42 +57,42 @@
 {
 #endif /* __cplusplus */
 
-int weed_plant_has_leaf (weed_plant_t *plant, const char *key);
-int weed_set_int_value (weed_plant_t *plant, const char *key, int value);
-int weed_set_double_value (weed_plant_t *plant, const char *key, double value);
-int weed_set_boolean_value (weed_plant_t *plant, const char *key, int value);
-int weed_set_int64_value (weed_plant_t *plant, const char *key, int64_t value);
-int weed_set_string_value (weed_plant_t *plant, const char *key, const char *value);
-int weed_set_plantptr_value (weed_plant_t *plant, const char *key, weed_plant_t *value);
-int weed_set_voidptr_value (weed_plant_t *plant, const char *key, void *value);
-
-int weed_get_int_value (weed_plant_t *plant, const char *key, int *error);
-double weed_get_double_value (weed_plant_t *plant, const char *key, int *error);
-int weed_get_boolean_value (weed_plant_t *plant, const char *key, int *error);
-int64_t weed_get_int64_value (weed_plant_t *plant, const char *key, int *error);
-char *weed_get_string_value (weed_plant_t *plant, const char *key, int *error);
-void *weed_get_voidptr_value (weed_plant_t *plant, const char *key, int *error);
-weed_plant_t *weed_get_plantptr_value (weed_plant_t *plant, const char *key, int *error);
-
-int *weed_get_int_array (weed_plant_t *plant, const char *key, int *error);
-double *weed_get_double_array (weed_plant_t *plant, const char *key, int *error);
-int *weed_get_boolean_array (weed_plant_t *plant, const char *key, int *error);
-int64_t *weed_get_int64_array (weed_plant_t *plant, const char *key, int *error);
-char **weed_get_string_array (weed_plant_t *plant, const char *key, int *error);
-void **weed_get_voidptr_array (weed_plant_t *plant, const char *key, int *error);
-weed_plant_t **weed_get_plantptr_array (weed_plant_t *plant, const char *key, int *error);
-
-int weed_set_int_array (weed_plant_t *plant, const char *key, int num_elems, int *values);
-int weed_set_double_array (weed_plant_t *plant, const char *key, int num_elems, double *values);
-int weed_set_boolean_array (weed_plant_t *plant, const char *key, int num_elems, int *values);
-int weed_set_int64_array (weed_plant_t *plant, const char *key, int num_elems, int64_t *values);
-int weed_set_string_array (weed_plant_t *plant, const char *key, int num_elems, char **values);
-int weed_set_voidptr_array (weed_plant_t *plant, const char *key, int num_elems, void **values);
-int weed_set_plantptr_array (weed_plant_t *plant, const char *key, int num_elems, weed_plant_t **values);
-
-int weed_leaf_copy (weed_plant_t *dest, const char *keyt, weed_plant_t *src, const char *keyf);
-weed_plant_t *weed_plant_copy (weed_plant_t *src);
-int weed_get_plant_type (weed_plant_t *plant);
+int weed_plant_has_leaf(weed_plant_t *plant, const char *key);
+int weed_set_int_value(weed_plant_t *plant, const char *key, int value);
+int weed_set_double_value(weed_plant_t *plant, const char *key, double value);
+int weed_set_boolean_value(weed_plant_t *plant, const char *key, int value);
+int weed_set_int64_value(weed_plant_t *plant, const char *key, int64_t value);
+int weed_set_string_value(weed_plant_t *plant, const char *key, const char *value);
+int weed_set_plantptr_value(weed_plant_t *plant, const char *key, weed_plant_t *value);
+int weed_set_voidptr_value(weed_plant_t *plant, const char *key, void *value);
+
+int weed_get_int_value(weed_plant_t *plant, const char *key, int *error);
+double weed_get_double_value(weed_plant_t *plant, const char *key, int *error);
+int weed_get_boolean_value(weed_plant_t *plant, const char *key, int *error);
+int64_t weed_get_int64_value(weed_plant_t *plant, const char *key, int *error);
+char *weed_get_string_value(weed_plant_t *plant, const char *key, int *error);
+void *weed_get_voidptr_value(weed_plant_t *plant, const char *key, int *error);
+weed_plant_t *weed_get_plantptr_value(weed_plant_t *plant, const char *key, int *error);
+
+int *weed_get_int_array(weed_plant_t *plant, const char *key, int *error);
+double *weed_get_double_array(weed_plant_t *plant, const char *key, int *error);
+int *weed_get_boolean_array(weed_plant_t *plant, const char *key, int *error);
+int64_t *weed_get_int64_array(weed_plant_t *plant, const char *key, int *error);
+char **weed_get_string_array(weed_plant_t *plant, const char *key, int *error);
+void **weed_get_voidptr_array(weed_plant_t *plant, const char *key, int *error);
+weed_plant_t **weed_get_plantptr_array(weed_plant_t *plant, const char *key, int *error);
+
+int weed_set_int_array(weed_plant_t *plant, const char *key, int num_elems, int *values);
+int weed_set_double_array(weed_plant_t *plant, const char *key, int num_elems, double *values);
+int weed_set_boolean_array(weed_plant_t *plant, const char *key, int num_elems, int *values);
+int weed_set_int64_array(weed_plant_t *plant, const char *key, int num_elems, int64_t *values);
+int weed_set_string_array(weed_plant_t *plant, const char *key, int num_elems, char **values);
+int weed_set_voidptr_array(weed_plant_t *plant, const char *key, int num_elems, void **values);
+int weed_set_plantptr_array(weed_plant_t *plant, const char *key, int num_elems, weed_plant_t **values);
+
+int weed_leaf_copy(weed_plant_t *dest, const char *keyt, weed_plant_t *src, const char *keyf);
+weed_plant_t *weed_plant_copy(weed_plant_t *src);
+int weed_get_plant_type(weed_plant_t *plant);
 
 #ifdef __cplusplus
 }

LiVES-2.4.1.tar.bz2/libweed/weed-utils_scripting.c Added

@@ -0,0 +1,507 @@
+/* WEED is free software; you can redistribute it and/or
+   modify it under the terms of the GNU Lesser General Public
+   License as published by the Free Software Foundation; either
+   version 3 of the License, or (at your option) any later version.
+
+   Weed is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+   Lesser General Public License for more details.
+
+   You should have received a copy of the GNU Lesser General Public
+   License along with this source code; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+
+
+   Weed is developed by:
+
+   Gabriel "Salsaman" Finch - http://lives.sourceforge.net
+
+
+   mainly based on LiViDO, which is developed by:
+
+
+   Niels Elburg - http://veejay.sf.net
+
+   Gabriel "Salsaman" Finch - http://lives.sourceforge.net
+
+   Denis "Jaromil" Rojo - http://freej.dyne.org
+
+   Tom Schouten - http://zwizwa.fartit.com
+
+   Andraz Tori - http://cvs.cinelerra.org
+
+   reviewed with suggestions and contributions from:
+
+   Silvano "Kysucix" Galliani - http://freej.dyne.org
+
+   Kentaro Fukuchi - http://megaui.net/fukuchi
+
+   Jun Iio - http://www.malib.net
+
+   Carlo Prelz - http://www2.fluido.as:8080/
+
+*/
+
+/* (C) Gabriel "Salsaman" Finch, 2005 - 2010 */
+
+#include <string.h>
+
+#ifdef HAVE_SYSTEM_WEED
+#include <weed/weed.h>
+#else
+#include "weed.h"
+#endif
+
+#include "weed-gslice_scripting.c"
+
+/////////////////////////////////////////////////////////////////
+
+int weed_plant_has_leaf(weed_plant_t *plant, const char *key) {
+  if (weed_leaf_get(plant,key,0,NULL)==WEED_ERROR_NOSUCH_LEAF) return WEED_FALSE;
+  return WEED_TRUE;
+}
+
+/////////////////////////////////////////////////////////////////
+// leaf setters
+
+int weed_set_int_value(weed_plant_t *plant, const char *key, int value) {
+  // returns a WEED_ERROR
+  return weed_leaf_set(plant,key,WEED_SEED_INT,1,&value);
+}
+
+int weed_set_double_value(weed_plant_t *plant, const char *key, double value) {
+  // returns a WEED_ERROR
+  return weed_leaf_set(plant,key,WEED_SEED_DOUBLE,1,&value);
+}
+
+int weed_set_boolean_value(weed_plant_t *plant, const char *key, int value) {
+  // returns a WEED_ERROR
+  return weed_leaf_set(plant,key,WEED_SEED_BOOLEAN,1,&value);
+}
+
+int weed_set_int64_value(weed_plant_t *plant, const char *key, int64_t value) {
+  // returns a WEED_ERROR
+  return weed_leaf_set(plant,key,WEED_SEED_INT64,1,&value);
+}
+
+int weed_set_string_value(weed_plant_t *plant, const char *key, const char *value) {
+  // returns a WEED_ERROR
+  return weed_leaf_set(plant,key,WEED_SEED_STRING,1,&value);
+}
+
+int weed_set_plantptr_value(weed_plant_t *plant, const char *key, weed_plant_t *value) {
+  // returns a WEED_ERROR
+  return weed_leaf_set(plant,key,WEED_SEED_PLANTPTR,1,&value);
+}
+
+int weed_set_voidptr_value(weed_plant_t *plant, const char *key, void *value) {
+  // returns a WEED_ERROR
+  return weed_leaf_set(plant,key,WEED_SEED_VOIDPTR,1,&value);
+}
+
+//////////////////////////////////////////////////////////////////////////////////////////////////
+// general leaf getter
+
+inline int weed_get_value(weed_plant_t *plant, const char *key, void *value) {
+  // returns a WEED_ERROR
+  return weed_leaf_get(plant, key, 0, value);
+}
+
+////////////////////////////////////////////////////////////
+
+int weed_get_int_value(weed_plant_t *plant, const char *key, int *error) {
+  int retval=0;
+  if (weed_plant_has_leaf(plant,key)&&weed_leaf_seed_type(plant,key)!=WEED_SEED_INT) {
+    *error=WEED_ERROR_WRONG_SEED_TYPE;
+    return retval;
+  } else *error=weed_get_value(plant,key,&retval);
+  return retval;
+}
+
+double weed_get_double_value(weed_plant_t *plant, const char *key, int *error) {
+  double retval=0.;
+  if (weed_plant_has_leaf(plant,key)&&weed_leaf_seed_type(plant,key)!=WEED_SEED_DOUBLE) {
+    *error=WEED_ERROR_WRONG_SEED_TYPE;
+    return retval;
+  }
+  *error=weed_get_value(plant,key,&retval);
+  return retval;
+}
+
+int weed_get_boolean_value(weed_plant_t *plant, const char *key, int *error) {
+  int retval=0;
+  if (weed_plant_has_leaf(plant,key)&&weed_leaf_seed_type(plant,key)!=WEED_SEED_BOOLEAN) {
+    *error=WEED_ERROR_WRONG_SEED_TYPE;
+    return retval;
+  }
+  *error=weed_get_value(plant,key,&retval);
+  return retval;
+}
+
+int64_t weed_get_int64_value(weed_plant_t *plant, const char *key, int *error) {
+  int64_t retval=0;
+  if (weed_plant_has_leaf(plant,key)&&weed_leaf_seed_type(plant,key)!=WEED_SEED_INT64) {
+    *error=WEED_ERROR_WRONG_SEED_TYPE;
+    return retval;
+  }
+  *error=weed_get_value(plant,key,&retval);
+  return retval;
+}
+
+char *weed_get_string_value(weed_plant_t *plant, const char *key, int *error) {
+  size_t size;
+  char *retval=NULL;
+  if (weed_plant_has_leaf(plant,key)&&weed_leaf_seed_type(plant,key)!=WEED_SEED_STRING) {
+    *error=WEED_ERROR_WRONG_SEED_TYPE;
+    return NULL;
+  }
+  if ((retval=(char *)weed_malloc((size=weed_leaf_element_size(plant,key,0))+1))==NULL) {
+    *error=WEED_ERROR_MEMORY_ALLOCATION;
+    return NULL;
+  }
+  if ((*error=weed_get_value(plant,key,&retval))!=WEED_NO_ERROR) {
+    weed_free(retval);
+    return NULL;
+  }
+  weed_memset(retval+size,0,1);
+  return retval;
+}
+
+void *weed_get_voidptr_value(weed_plant_t *plant, const char *key, int *error) {
+  void *retval=NULL;
+  if (weed_plant_has_leaf(plant,key)&&weed_leaf_seed_type(plant,key)!=WEED_SEED_VOIDPTR) {
+    *error=WEED_ERROR_WRONG_SEED_TYPE;
+    return retval;
+  }
+  *error=weed_get_value(plant,key,&retval);
+  return retval;
+}
+
+weed_plant_t *weed_get_plantptr_value(weed_plant_t *plant, const char *key, int *error) {
+  weed_plant_t *retval=NULL;
+  if (weed_plant_has_leaf(plant,key)&&weed_leaf_seed_type(plant,key)!=WEED_SEED_PLANTPTR) {
+    *error=WEED_ERROR_WRONG_SEED_TYPE;
+    return retval;
+  }
+  *error=weed_get_value(plant,key,&retval);
+  return retval;
+}
+
+
+////////////////////////////////////////////////////////////
+
+int *weed_get_int_array(weed_plant_t *plant, const char *key, int *error) {
+  int i;
+  int num_elems;
+  int *retval;
+
+  if (weed_plant_has_leaf(plant,key)&&weed_leaf_seed_type(plant,key)!=WEED_SEED_INT) {
+    *error=WEED_ERROR_WRONG_SEED_TYPE;
+    return NULL;
+  }
+
+  if ((num_elems=weed_leaf_num_elements(plant,key))==0) return NULL;
+
+  if ((retval=(int *)weed_malloc(num_elems*4))==NULL) {
+    *error=WEED_ERROR_MEMORY_ALLOCATION;
+    return NULL;
+  }
+
+  for (i=0; i<num_elems; i++) {
+    if ((*error=weed_leaf_get(plant, key, i, &retval[i]))!=WEED_NO_ERROR) {
+      weed_free(retval);
+      return NULL;
+    }
+  }
+  return retval;
+}
+
+double *weed_get_double_array(weed_plant_t *plant, const char *key, int *error) {
+  int i;
+  int num_elems;
+  double *retval;
+
+  if (weed_plant_has_leaf(plant,key)&&weed_leaf_seed_type(plant,key)!=WEED_SEED_DOUBLE) {
+    *error=WEED_ERROR_WRONG_SEED_TYPE;
+    return NULL;
+  }
+  if ((num_elems=weed_leaf_num_elements(plant,key))==0) return NULL;
+
+  if ((retval=(double *)weed_malloc(num_elems*sizeof(double)))==NULL) {
+    *error=WEED_ERROR_MEMORY_ALLOCATION;
+    return NULL;
+  }
+
+  for (i=0; i<num_elems; i++) {
+    if ((*error=weed_leaf_get(plant, key, i, &retval[i]))!=WEED_NO_ERROR) {
+      weed_free(retval);
+      return NULL;
+    }
+  }
+  return retval;
+}
+
+int *weed_get_boolean_array(weed_plant_t *plant, const char *key, int *error) {
+  int i;
+  int num_elems;
+  int *retval;
+
+  if (weed_plant_has_leaf(plant,key)&&weed_leaf_seed_type(plant,key)!=WEED_SEED_BOOLEAN) {
+    *error=WEED_ERROR_WRONG_SEED_TYPE;
+    return NULL;
+  }
+
+  if ((num_elems=weed_leaf_num_elements(plant,key))==0) return NULL;
+
+  if ((retval=(int *)weed_malloc(num_elems*4))==NULL) {
+    *error=WEED_ERROR_MEMORY_ALLOCATION;
+    return NULL;
+  }
+
+  for (i=0; i<num_elems; i++) {
+    if ((*error=weed_leaf_get(plant, key, i, &retval[i]))!=WEED_NO_ERROR) {
+      weed_free(retval);
+      return NULL;
+    }
+  }
+  return retval;
+}
+
+int64_t *weed_get_int64_array(weed_plant_t *plant, const char *key, int *error) {
+  int i;
+  int num_elems;
+  int64_t *retval;
+
+  if (weed_plant_has_leaf(plant,key)&&weed_leaf_seed_type(plant,key)!=WEED_SEED_INT64) {
+    *error=WEED_ERROR_WRONG_SEED_TYPE;
+    return NULL;
+  }
+
+  if ((num_elems=weed_leaf_num_elements(plant,key))==0) return NULL;
+
+  if ((retval=(int64_t *)weed_malloc(num_elems*8))==NULL) {
+    *error=WEED_ERROR_MEMORY_ALLOCATION;
+    return NULL;
+  }
+
+  for (i=0; i<num_elems; i++) {
+    if ((*error=weed_leaf_get(plant, key, i, &retval[i]))!=WEED_NO_ERROR) {
+      weed_free(retval);
+      return NULL;
+    }
+  }
+  return retval;
+}
+
+char **weed_get_string_array(weed_plant_t *plant, const char *key, int *error) {
+  int i;
+  int num_elems;
+  char **retval;
+  size_t size;
+
+  if (weed_plant_has_leaf(plant,key)&&weed_leaf_seed_type(plant,key)!=WEED_SEED_STRING) {
+    *error=WEED_ERROR_WRONG_SEED_TYPE;
+    return NULL;
+  }
+
+  if ((num_elems=weed_leaf_num_elements(plant,key))==0) return NULL;
+
+  if ((retval=(char **)weed_malloc(num_elems*sizeof(char *)))==NULL) {
+    *error=WEED_ERROR_MEMORY_ALLOCATION;
+    return NULL;
+  }
+
+  for (i=0; i<num_elems; i++) {
+    if ((retval[i]=(char *)weed_malloc((size=weed_leaf_element_size(plant,key,i))+1))==NULL) {
+      for (--i; i>=0; i--) weed_free(retval[i]);
+      *error=WEED_ERROR_MEMORY_ALLOCATION;
+      weed_free(retval);
+      return NULL;
+    }
+    if ((*error=weed_leaf_get(plant, key, i, &retval[i]))!=WEED_NO_ERROR) {
+      for (--i; i>=0; i--) weed_free(retval[i]);
+      weed_free(retval);
+      return NULL;
+    }
+    weed_memset(retval[i]+size,0,1);
+  }
+  return retval;
+}
+
+void **weed_get_voidptr_array(weed_plant_t *plant, const char *key, int *error) {
+  int i;
+  int num_elems;
+  void **retval;
+
+  if (weed_plant_has_leaf(plant,key)&&weed_leaf_seed_type(plant,key)!=WEED_SEED_VOIDPTR) {
+    *error=WEED_ERROR_WRONG_SEED_TYPE;
+    return NULL;
+  }
+
+  if ((num_elems=weed_leaf_num_elements(plant,key))==0) return NULL;
+
+  if ((retval=(void **)weed_malloc(num_elems*sizeof(void *)))==NULL) {
+    *error=WEED_ERROR_MEMORY_ALLOCATION;
+    return NULL;
+  }
+
+  for (i=0; i<num_elems; i++) {
+    if ((*error=weed_leaf_get(plant, key, i, &retval[i]))!=WEED_NO_ERROR) {
+      weed_free(retval);
+      return NULL;
+    }
+  }
+  return retval;
+}
+
+weed_plant_t **weed_get_plantptr_array(weed_plant_t *plant, const char *key, int *error) {
+  int i;
+  int num_elems;
+  weed_plant_t **retval;
+
+  if (weed_plant_has_leaf(plant,key)&&weed_leaf_seed_type(plant,key)!=WEED_SEED_PLANTPTR) {
+    *error=WEED_ERROR_WRONG_SEED_TYPE;
+    return NULL;
+  }
+
+  if ((num_elems=weed_leaf_num_elements(plant,key))==0) return NULL;
+
+  if ((retval=(weed_plant_t **)weed_malloc(num_elems*sizeof(weed_plant_t *)))==NULL) {
+    *error=WEED_ERROR_MEMORY_ALLOCATION;
+    return NULL;
+  }
+
+  for (i=0; i<num_elems; i++) {
+    if ((*error=weed_leaf_get(plant, key, i, &retval[i]))!=WEED_NO_ERROR) {
+      weed_free(retval);
+      return NULL;
+    }
+  }
+  return retval;
+}
+
+/////////////////////////////////////////////////////
+
+int weed_set_int_array(weed_plant_t *plant, const char *key, int num_elems, int *values) {
+  return weed_leaf_set(plant,key,WEED_SEED_INT,num_elems,values);
+}
+
+int weed_set_double_array(weed_plant_t *plant, const char *key, int num_elems, double *values) {
+  return weed_leaf_set(plant,key,WEED_SEED_DOUBLE,num_elems,values);
+}
+
+int weed_set_boolean_array(weed_plant_t *plant, const char *key, int num_elems, int *values) {
+  return weed_leaf_set(plant,key,WEED_SEED_BOOLEAN,num_elems,values);
+}
+
+int weed_set_int64_array(weed_plant_t *plant, const char *key, int num_elems, int64_t *values) {
+  return weed_leaf_set(plant,key,WEED_SEED_INT64,num_elems,values);
+}
+
+int weed_set_string_array(weed_plant_t *plant, const char *key, int num_elems, char **values) {
+  return weed_leaf_set(plant,key,WEED_SEED_STRING,num_elems,values);
+}
+
+int weed_set_voidptr_array(weed_plant_t *plant, const char *key, int num_elems, void **values) {
+  return weed_leaf_set(plant,key,WEED_SEED_VOIDPTR,num_elems,values);
+}
+
+int weed_set_plantptr_array(weed_plant_t *plant, const char *key, int num_elems, weed_plant_t **values) {
+  return weed_leaf_set(plant,key,WEED_SEED_PLANTPTR,num_elems,values);
+}
+
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+
+int weed_leaf_copy(weed_plant_t *dst, const char *keyt, weed_plant_t *src, const char *keyf) {
+  int num,seed_type,i,error;
+  int *datai;
+  double *datad;
+  char **datac;
+  int64_t *datai6;
+  void **datav;
+  weed_plant_t **datap;
+
+  if (weed_plant_has_leaf(src,keyf)==WEED_FALSE) return WEED_ERROR_NOSUCH_LEAF;
+
+  seed_type=weed_leaf_seed_type(src,keyf);
+  num=weed_leaf_num_elements(src,keyf);
+
+  if (num==0) weed_leaf_set(dst,keyt,seed_type,0,NULL);
+  else {
+    switch (seed_type) {
+    case WEED_SEED_INT:
+      datai=weed_get_int_array(src,keyf,&error);
+      error=weed_set_int_array(dst,keyt,num,datai);
+      weed_free(datai);
+      break;
+    case WEED_SEED_INT64:
+      datai6=weed_get_int64_array(src,keyf,&error);
+      error=weed_set_int64_array(dst,keyt,num,datai6);
+      weed_free(datai6);
+      break;
+    case WEED_SEED_BOOLEAN:
+      datai=weed_get_boolean_array(src,keyf,&error);
+      error=weed_set_boolean_array(dst,keyt,num,datai);
+      weed_free(datai);
+      break;
+    case WEED_SEED_DOUBLE:
+      datad=weed_get_double_array(src,keyf,&error);
+      error=weed_set_double_array(dst,keyt,num,datad);
+      weed_free(datad);
+      break;
+    case WEED_SEED_VOIDPTR:
+      datav=weed_get_voidptr_array(src,keyf,&error);
+      error=weed_set_voidptr_array(dst,keyt,num,datav);
+      weed_free(datav);
+      break;
+    case WEED_SEED_PLANTPTR:
+      datap=weed_get_plantptr_array(src,keyf,&error);
+      error=weed_set_plantptr_array(dst,keyt,num,datap);
+      weed_free(datap);
+      break;
+    case WEED_SEED_STRING:
+      datac=weed_get_string_array(src,keyf,&error);
+      error=weed_set_string_array(dst,keyt,num,datac);
+      for (i=0; i<num; i++) {
+        weed_free(datac[i]);
+      }
+      weed_free(datac);
+      break;
+    }
+  }
+  return error;
+}
+
+
+weed_plant_t *weed_plant_copy(weed_plant_t *src) {
+  int i=0,error;
+  char **proplist=weed_plant_list_leaves(src);
+  char *prop;
+  weed_plant_t *plant=weed_plant_new(weed_get_int_value(src,"type",&error));
+  if (plant==NULL) return NULL;
+
+  for (prop=proplist[0]; (prop=proplist[i])!=NULL&&error==WEED_NO_ERROR; i++) {
+    if (strcmp(prop,"type")) error=weed_leaf_copy(plant,prop,src,prop);
+    weed_free(prop);
+  }
+  weed_free(proplist);
+
+  if (error==WEED_ERROR_MEMORY_ALLOCATION) {
+    //if (plant!=NULL) weed_plant_free(plant); // well, we should free the plant, but the plugins don't have this function...
+    return NULL;
+  }
+
+  return plant;
+}
+
+
+int weed_get_plant_type(weed_plant_t *plant) {
+  int error;
+  return weed_get_int_value(plant,"type",&error);
+}
+
+
+

LiVES-2.2.8.tar.bz2/libweed/weed.c -> LiVES-2.4.1.tar.bz2/libweed/weed.c Changed

@@ -82,8 +82,8 @@
 
 static weed_plant_t *_weed_plant_new(int plant_type);
 static char **_weed_plant_list_leaves(weed_plant_t *plant);
-static int _weed_leaf_set_caller(weed_plant_t *plant, const char *key, int seed_type, int num_elems, 
-				 void *value, int caller);
+static int _weed_leaf_set_caller(weed_plant_t *plant, const char *key, int seed_type, int num_elems,
+                                 void *value, int caller);
 static int _weed_leaf_get(weed_plant_t *plant, const char *key, int idx, void *value);
 static int _weed_leaf_num_elements(weed_plant_t *plant, const char *key);
 static size_t _weed_leaf_element_size(weed_plant_t *plant, const char *key, int idx);
@@ -95,22 +95,22 @@
 static int _weed_leaf_set_flags(weed_plant_t *plant, const char *key, int flags);
 static int _weed_leaf_delete(weed_plant_t *plant, const char *key);
 
-static inline size_t weed_strlen (const char *string) {
+static inline size_t weed_strlen(const char *string) {
   size_t len=0;
   size_t maxlen=(size_t)-2;
   while (*(string++)!=0&&(len!=maxlen)) len++;
   return len;
 }
 
-static inline char *weed_strdup (const char *string) {
+static inline char *weed_strdup(const char *string) {
   size_t len;
   char *ret=weed_malloc((len=weed_strlen(string))+1);
   weed_memcpy(ret,string,len+1);
   return ret;
 }
 
-static inline int weed_strcmp (const char *st1, const char *st2) {
-  
+static inline int weed_strcmp(const char *st1, const char *st2) {
+
   while (!(*st1==0&&*st2==0)) {
     if (*(st1)==0||*(st2)==0||*(st1++)!=*(st2++)) return 1;
   }
@@ -118,23 +118,23 @@
 }
 
 
-static inline int weed_seed_is_ptr (int seed) {
- return (seed!=WEED_SEED_BOOLEAN&&seed!=WEED_SEED_INT&&seed!=WEED_SEED_DOUBLE&&seed!=WEED_SEED_STRING&&
-	 seed!=WEED_SEED_INT64)?1:0;
+static inline int weed_seed_is_ptr(int seed) {
+  return (seed!=WEED_SEED_BOOLEAN&&seed!=WEED_SEED_INT&&seed!=WEED_SEED_DOUBLE&&seed!=WEED_SEED_STRING&&
+          seed!=WEED_SEED_INT64)?1:0;
 }
 
-static inline size_t weed_seed_get_size (int seed, void *value) {
-  return weed_seed_is_ptr (seed)?(sizeof(void *)):\
-  (seed==WEED_SEED_BOOLEAN||seed==WEED_SEED_INT)?4:\
-  (seed==WEED_SEED_DOUBLE)?8:\
-  (seed==WEED_SEED_INT64)?8:\
-  (seed==WEED_SEED_STRING)?weed_strlen((const char *)value):0;
+static inline size_t weed_seed_get_size(int seed, void *value) {
+  return weed_seed_is_ptr(seed)?(sizeof(void *)):\
+         (seed==WEED_SEED_BOOLEAN||seed==WEED_SEED_INT)?4:\
+         (seed==WEED_SEED_DOUBLE)?8:\
+         (seed==WEED_SEED_INT64)?8:\
+         (seed==WEED_SEED_STRING)?weed_strlen((const char *)value):0;
 }
 
 static inline void weed_data_free(weed_data_t **data, int num_elems, int seed_type) {
   register int i;
   if (data==NULL) return;
-  for (i=0;i<num_elems;i++) {
+  for (i=0; i<num_elems; i++) {
     if (!weed_seed_is_ptr(seed_type)||(seed_type==WEED_SEED_STRING&&data[i]->value!=NULL)) weed_free(data[i]->value);
     weed_free(data[i]);
   }
@@ -150,7 +150,7 @@
 
   if (num_elems==0) return data;
   if ((data=(weed_data_t **)weed_malloc(num_elems*sizeof(weed_data_t *)))==NULL) return ((void *)0);
-  for (i=0;i<num_elems;i++) {
+  for (i=0; i<num_elems; i++) {
     if ((data[i]=(weed_data_t *)weed_malloc(sizeof(weed_data_t)))==NULL) {
       weed_data_free(data,--i,seed_type);
       return NULL;
@@ -158,20 +158,17 @@
     if (weed_seed_is_ptr(seed_type)) data[i]->value=valuev[i];
     else {
       if (seed_type==WEED_SEED_STRING) {
-	if ((size=weed_strlen(valuec[i]))>0) {
-	  if ((data[i]->value=weed_malloc((size=weed_strlen(valuec[i]))))!=NULL) {
-	    weed_memcpy(data[i]->value,valuec[i],size);
-	  }
-	}
-	else data[i]->value=NULL;
-	data[i]->size=size;
-      }
-      else 
-	if ((data[i]->value=weed_malloc((size=weed_seed_get_size(seed_type,NULL))))!=NULL) 
-	  weed_memcpy(data[i]->value,(char *)value+i*size,size);
+        if ((size=weed_strlen(valuec[i]))>0) {
+          if ((data[i]->value=weed_malloc((size=weed_strlen(valuec[i]))))!=NULL) {
+            weed_memcpy(data[i]->value,valuec[i],size);
+          }
+        } else data[i]->value=NULL;
+        data[i]->size=size;
+      } else if ((data[i]->value=weed_malloc((size=weed_seed_get_size(seed_type,NULL))))!=NULL)
+        weed_memcpy(data[i]->value,(char *)value+i*size,size);
       if (size>0&&data[i]->value==NULL) { // memory error
-	weed_data_free(data,--i,seed_type);
-	return NULL;
+        weed_data_free(data,--i,seed_type);
+        return NULL;
       }
     }
     if (seed_type!=WEED_SEED_STRING) data[i]->size=weed_seed_get_size(seed_type,data[i]->value);
@@ -180,24 +177,24 @@
 }
 
 static inline weed_leaf_t *weed_find_leaf(weed_plant_t *leaf, const char *key) {
- while (leaf!=NULL) {
-  if (!weed_strcmp((char *)leaf->key,(char *)key)) return leaf;
-  leaf=leaf->next;
- }
- return NULL;
+  while (leaf!=NULL) {
+    if (!weed_strcmp((char *)leaf->key,(char *)key)) return leaf;
+    leaf=leaf->next;
+  }
+  return NULL;
 }
 
 static inline void weed_leaf_free(weed_leaf_t *leaf) {
-  weed_data_free (leaf->data,leaf->num_elements,leaf->seed_type);
-  weed_free ((char *)leaf->key);
-  weed_free (leaf);
+  weed_data_free(leaf->data,leaf->num_elements,leaf->seed_type);
+  weed_free((char *)leaf->key);
+  weed_free(leaf);
 }
 
 static inline weed_leaf_t *weed_leaf_new(const char *key, int seed) {
   weed_leaf_t *leaf=(weed_leaf_t *)weed_malloc(sizeof(weed_leaf_t));
   if (leaf==NULL) return NULL;
   if ((leaf->key=weed_strdup(key))==NULL) {
-    weed_free (leaf);
+    weed_free(leaf);
     return NULL;
   }
   leaf->seed_type=seed;
@@ -222,7 +219,7 @@
   weed_leaf_t *leafnext;
   while (leaf!=NULL) {
     leafnext=leaf->next;
-    weed_leaf_free (leaf);
+    weed_leaf_free(leaf);
     leaf=leafnext;
   }
 }
@@ -245,7 +242,7 @@
 
 
 static int _weed_leaf_set_flags(weed_plant_t *plant, const char *key, int flags) {
-  weed_leaf_t *leaf=weed_find_leaf (plant, key);
+  weed_leaf_t *leaf=weed_find_leaf(plant, key);
   if (leaf==NULL) return WEED_ERROR_NOSUCH_LEAF;
   leaf->flags=flags;
   return WEED_NO_ERROR;
@@ -254,14 +251,14 @@
 static weed_plant_t *_weed_plant_new(int plant_type) {
   weed_leaf_t *leaf;
   if ((leaf=weed_leaf_new("type",WEED_SEED_INT))==NULL) return NULL;
-  if ((leaf->data=(weed_data_t **)weed_data_new (WEED_SEED_INT,1,&plant_type))==NULL) {
-    weed_free ((char *)leaf->key);
-    weed_free (leaf);
+  if ((leaf->data=(weed_data_t **)weed_data_new(WEED_SEED_INT,1,&plant_type))==NULL) {
+    weed_free((char *)leaf->key);
+    weed_free(leaf);
     return NULL;
   }
   leaf->num_elements=1;
   leaf->next=NULL;
-  _weed_leaf_set_flags (leaf,"type",WEED_LEAF_READONLY_PLUGIN|WEED_LEAF_READONLY_HOST);
+  _weed_leaf_set_flags(leaf,"type",WEED_LEAF_READONLY_PLUGIN|WEED_LEAF_READONLY_HOST);
   return leaf;
 }
 
@@ -269,15 +266,15 @@
   weed_leaf_t *leaf=plant;
   char **leaflist;
   register int i=1;
-  for (;leaf!=NULL;i++) {
+  for (; leaf!=NULL; i++) {
     leaf=leaf->next;
   }
   if ((leaflist=(char **)weed_malloc(i*sizeof(char *)))==NULL) return NULL;
   i=0;
-  for (leaf=plant;leaf!=NULL;leaf=leaf->next) {
+  for (leaf=plant; leaf!=NULL; leaf=leaf->next) {
     if ((leaflist[i]=weed_strdup(leaf->key))==NULL) {
-      for (--i;i>=0;i--) weed_free (leaflist[i]);
-      weed_free (leaflist);
+      for (--i; i>=0; i--) weed_free(leaflist[i]);
+      weed_free(leaflist);
       return NULL;
     }
     i++;
@@ -286,22 +283,22 @@
   return leaflist;
 }
 
-static inline int _weed_leaf_set_caller(weed_plant_t *plant, const char *key, int seed_type, int num_elems, 
-					void *value, int caller) {
+static inline int _weed_leaf_set_caller(weed_plant_t *plant, const char *key, int seed_type, int num_elems,
+                                        void *value, int caller) {
   weed_data_t **data=NULL;
-  weed_leaf_t *leaf=weed_find_leaf (plant,key);
+  weed_leaf_t *leaf=weed_find_leaf(plant,key);
   if (leaf==NULL) {
-    if ((leaf=weed_leaf_new (key,seed_type))==NULL) return WEED_ERROR_MEMORY_ALLOCATION;
-    weed_leaf_append (plant,leaf);
-  }
-  else {
-    if ((caller==WEED_CALLER_PLUGIN&&leaf->flags&WEED_LEAF_READONLY_PLUGIN)||(caller==WEED_CALLER_HOST&&leaf->flags&WEED_LEAF_READONLY_HOST)) return WEED_ERROR_LEAF_READONLY;
+    if ((leaf=weed_leaf_new(key,seed_type))==NULL) return WEED_ERROR_MEMORY_ALLOCATION;
+    weed_leaf_append(plant,leaf);
+  } else {
+    if ((caller==WEED_CALLER_PLUGIN&&leaf->flags&WEED_LEAF_READONLY_PLUGIN)||(caller==WEED_CALLER_HOST&&
+        leaf->flags&WEED_LEAF_READONLY_HOST)) return WEED_ERROR_LEAF_READONLY;
     if (seed_type!=leaf->seed_type) return WEED_ERROR_WRONG_SEED_TYPE;
-    weed_data_free (leaf->data,leaf->num_elements,seed_type);
+    weed_data_free(leaf->data,leaf->num_elements,seed_type);
     leaf->data=NULL;
   }
   leaf->num_elements=0;
-  if (num_elems>0&&(data=weed_data_new (seed_type,num_elems,value))==NULL) {
+  if (num_elems>0&&(data=weed_data_new(seed_type,num_elems,value))==NULL) {
     return WEED_ERROR_MEMORY_ALLOCATION;
   }
   leaf->data=data;
@@ -312,13 +309,13 @@
 
 static int _weed_leaf_set(weed_plant_t *plant, const char *key, int seed_type, int num_elems, void *value) {
   // host version
-  return _weed_leaf_set_caller (plant,key,seed_type,num_elems,value,WEED_CALLER_HOST);
+  return _weed_leaf_set_caller(plant,key,seed_type,num_elems,value,WEED_CALLER_HOST);
 }
 
 
 static int _weed_leaf_set_plugin(weed_plant_t *plant, const char *key, int seed_type, int num_elems, void *value) {
   // plugin version - host should pass this to plugin in host_info
-  return _weed_leaf_set_caller (plant,key,seed_type,num_elems,value,WEED_CALLER_PLUGIN);
+  return _weed_leaf_set_caller(plant,key,seed_type,num_elems,value,WEED_CALLER_PLUGIN);
 }
 
 
@@ -331,19 +328,18 @@
 
   // additionally, the prototype of this function must never change
 
-  weed_leaf_t *leaf=weed_find_leaf (plant,key);
+  weed_leaf_t *leaf=weed_find_leaf(plant,key);
   if (leaf==NULL) return WEED_ERROR_NOSUCH_LEAF;
   if (idx>=leaf->num_elements) return WEED_ERROR_NOSUCH_ELEMENT;
   if (value==NULL) return WEED_NO_ERROR;
-  if (weed_seed_is_ptr (leaf->seed_type)) memcpy (value,&leaf->data[idx]->value,sizeof(void *));
+  if (weed_seed_is_ptr(leaf->seed_type)) memcpy(value,&leaf->data[idx]->value,sizeof(void *));
   else {
     if (leaf->seed_type==WEED_SEED_STRING) {
       size_t size=leaf->data[idx]->size;
       char **valuecharptrptr=(char **)value;
       if (size>0) memcpy(*valuecharptrptr,leaf->data[idx]->value,size);
       memset(*valuecharptrptr+size,0,1);
-    }
-    else memcpy (value,leaf->data[idx]->value,weed_seed_get_size(leaf->seed_type,leaf->data[idx]->value));
+    } else memcpy(value,leaf->data[idx]->value,weed_seed_get_size(leaf->seed_type,leaf->data[idx]->value));
   }
   return WEED_NO_ERROR;
 
@@ -351,44 +347,43 @@
 
 
 static int _weed_leaf_get(weed_plant_t *plant, const char *key, int idx, void *value) {
-  weed_leaf_t *leaf=weed_find_leaf (plant,key);
+  weed_leaf_t *leaf=weed_find_leaf(plant,key);
   if (leaf==NULL) return WEED_ERROR_NOSUCH_LEAF;
   if (idx>=leaf->num_elements) return WEED_ERROR_NOSUCH_ELEMENT;
   if (value==NULL) return WEED_NO_ERROR;
-  if (weed_seed_is_ptr (leaf->seed_type)) weed_memcpy (value,&leaf->data[idx]->value,sizeof(void *));
+  if (weed_seed_is_ptr(leaf->seed_type)) weed_memcpy(value,&leaf->data[idx]->value,sizeof(void *));
   else {
     if (leaf->seed_type==WEED_SEED_STRING) {
       size_t size=leaf->data[idx]->size;
       char **valuecharptrptr=(char **)value;
       if (size>0) weed_memcpy(*valuecharptrptr,leaf->data[idx]->value,size);
       weed_memset(*valuecharptrptr+size,0,1);
-    }
-    else weed_memcpy (value,leaf->data[idx]->value,weed_seed_get_size(leaf->seed_type,leaf->data[idx]->value));
+    } else weed_memcpy(value,leaf->data[idx]->value,weed_seed_get_size(leaf->seed_type,leaf->data[idx]->value));
   }
   return WEED_NO_ERROR;
 }
 
 
 static int _weed_leaf_num_elements(weed_plant_t *plant, const char *key) {
-  weed_leaf_t *leaf=weed_find_leaf (plant, key);
+  weed_leaf_t *leaf=weed_find_leaf(plant, key);
   if (leaf==NULL) return 0;
   return leaf->num_elements;
 }
 
 static size_t _weed_leaf_element_size(weed_plant_t *plant, const char *key, int idx) {
-  weed_leaf_t *leaf=weed_find_leaf (plant, key);
+  weed_leaf_t *leaf=weed_find_leaf(plant, key);
   if (leaf==NULL||idx>=leaf->num_elements) return 0;
   return leaf->data[idx]->size;
 }
 
 static int _weed_leaf_seed_type(weed_plant_t *plant, const char *key) {
-  weed_leaf_t *leaf=weed_find_leaf (plant, key);
+  weed_leaf_t *leaf=weed_find_leaf(plant, key);
   if (leaf==NULL) return 0;
   return leaf->seed_type;
 }
 
 static int _weed_leaf_get_flags(weed_plant_t *plant, const char *key) {
-  weed_leaf_t *leaf=weed_find_leaf (plant, key);
+  weed_leaf_t *leaf=weed_find_leaf(plant, key);
   if (leaf==NULL) return 0;
   return leaf->flags;
 }

LiVES-2.2.8.tar.bz2/libweed/weed.h -> LiVES-2.4.1.tar.bz2/libweed/weed.h Changed

@@ -85,11 +85,11 @@
 #define WEED_SEED_VOIDPTR  65
 #define WEED_SEED_PLANTPTR 66
 
-  // these function types are fixed, and must be defined in the host
-typedef void *(*weed_malloc_f) (size_t size);
-typedef void (*weed_free_f) (void *ptr);
-typedef void *(*weed_memset_f) (void *s, int c, size_t n);
-typedef void *(*weed_memcpy_f) (void *dest, const void *src, size_t n);
+// these function types are fixed, and must be defined in the host
+typedef void *(*weed_malloc_f)(size_t size);
+typedef void (*weed_free_f)(void *ptr);
+typedef void *(*weed_memset_f)(void *s, int c, size_t n);
+typedef void *(*weed_memcpy_f)(void *dest, const void *src, size_t n);
 
 #ifndef HAVE_WEED_PLANT_T
 #define HAVE_WEED_PLANT_T
@@ -99,7 +99,7 @@
 typedef weed_leaf_t weed_plant_t;
 typedef size_t weed_size_t; // may be set to uint32_t or uint64_t
 
-  /* private data - these fields must NOT be accessed directly ! */
+/* private data - these fields must NOT be accessed directly ! */
 struct weed_leaf {
   const char *key;
   int seed_type;
@@ -118,10 +118,10 @@
 
 typedef int64_t weed_timecode_t;
 
-  /** this is fixed for ever, set in bootstrap_func */
+/** this is fixed for ever, set in bootstrap_func */
 typedef int (*weed_default_getter_f)(weed_plant_t *plant, const char *key, int idx, void *value);
 
-  /* host and plugin functions, may be changed depending on API level */
+/* host and plugin functions, may be changed depending on API level */
 typedef weed_plant_t *(*weed_plant_new_f)(int plant_type);
 typedef char **(*weed_plant_list_leaves_f)(weed_plant_t *plant);
 typedef int (*weed_leaf_set_f)(weed_plant_t *plant, const char *key, int seed_type, int num_elems, void *value);

LiVES-2.2.8.tar.bz2/lives-plugins/plugins/decoders/Makefile.am -> LiVES-2.4.1.tar.bz2/lives-plugins/plugins/decoders/Makefile.am Changed

@@ -1,7 +1,5 @@
 ## Process this with automake to create Makefile.in
 
-
-
 LIBS=
 
 decoderpluginslibdir = "$(libdir)/$(PACKAGE)/plugins/decoders"
@@ -103,7 +101,7 @@
 flv_libs = flv_decoder.la
 FLVDEC_LIBS = @LIBAVCODEC_LIBS@ @LIBAVFORMAT_LIBS@
 FLVDEC_CFLAGS = @LIBAVFORMAT_CFLAGS@ @LIBAVCODEC_CFLAGS@ -Wno-deprecated-declarations
-flv_decoder_la_SOURCES = flv_decoder.c flv_decoder.h
+flv_decoder_la_SOURCES = flv_decoder.c flv_decoder.h dec_helper.c
 flv_decoder_la_CFLAGS = $(libav_cflags) $(shared_cflags) $(weed_cflags) $(FLVDEC_CFLAGS)
 flv_decoder_la_LDFLAGS = $(shared_ldflags) $(FLVDEC_LIBS)
 
@@ -111,7 +109,7 @@
 asf_libs = asf_decoder.la
 ASFDEC_LIBS = @LIBAVCODEC_LIBS@ @LIBAVFORMAT_LIBS@
 ASFDEC_CFLAGS = @LIBAVFORMAT_CFLAGS@ @LIBAVCODEC_CFLAGS@ -Wno-deprecated-declarations
-asf_decoder_la_SOURCES = asf_decoder.c asf_decoder.h
+asf_decoder_la_SOURCES = asf_decoder.c asf_decoder.h dec_helper.c
 asf_decoder_la_CFLAGS = $(libav_cflags) $(shared_cflags) $(weed_cflags) $(ASFDEC_CFLAGS)
 asf_decoder_la_LDFLAGS = $(shared_ldflags) $(ASFDEC_LIBS)
 
@@ -131,7 +129,7 @@
 MPEGTSDEC_LIBS = @LIBAVCODEC_LIBS@ @LIBAVFORMAT_LIBS@ @LIBAVUTIL_LIBS@
 MPEGTSDEC_CFLAGS = @LIBAVFORMAT_CFLAGS@ @LIBAVCODEC_CFLAGS@ @LIBAVUTIL_CFLAGS@ \
 	-Wno-deprecated-declarations
-mpegts_decoder_la_SOURCES = mpegts_decoder.c mpegts_decoder.h
+mpegts_decoder_la_SOURCES = mpegts_decoder.c mpegts_decoder.h dec_helper.c
 mpegts_decoder_la_CFLAGS = $(libav_cflags) $(shared_cflags) $(weed_cflags) $(MPEGTSDEC_CFLAGS)
 mpegts_decoder_la_LDFLAGS = $(shared_ldflags) $(MPEGTSDEC_LIBS)

LiVES-2.2.8.tar.bz2/lives-plugins/plugins/decoders/Makefile.in -> LiVES-2.4.1.tar.bz2/lives-plugins/plugins/decoders/Makefile.in Changed

@@ -151,8 +151,10 @@
 am__installdirs = "$(DESTDIR)$(decoderpluginslibdir)"
 LTLIBRARIES = $(decoderpluginslib_LTLIBRARIES)
 asf_decoder_la_LIBADD =
-am__asf_decoder_la_SOURCES_DIST = asf_decoder.c asf_decoder.h
-@HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_TRUE@@HAVE_AVUTIL_TRUE@am_asf_decoder_la_OBJECTS = asf_decoder_la-asf_decoder.lo
+am__asf_decoder_la_SOURCES_DIST = asf_decoder.c asf_decoder.h \
+	dec_helper.c
+@HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_TRUE@@HAVE_AVUTIL_TRUE@am_asf_decoder_la_OBJECTS = asf_decoder_la-asf_decoder.lo \
+@HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_TRUE@@HAVE_AVUTIL_TRUE@	asf_decoder_la-dec_helper.lo
 asf_decoder_la_OBJECTS = $(am_asf_decoder_la_OBJECTS)
 AM_V_lt = $(am__v_lt_@AM_V@)
 am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
@@ -175,8 +177,10 @@
 @HAVE_LIBDV_TRUE@am_dv_decoder_la_rpath = -rpath \
 @HAVE_LIBDV_TRUE@	$(decoderpluginslibdir)
 flv_decoder_la_LIBADD =
-am__flv_decoder_la_SOURCES_DIST = flv_decoder.c flv_decoder.h
-@HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_TRUE@@HAVE_AVUTIL_TRUE@am_flv_decoder_la_OBJECTS = flv_decoder_la-flv_decoder.lo
+am__flv_decoder_la_SOURCES_DIST = flv_decoder.c flv_decoder.h \
+	dec_helper.c
+@HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_TRUE@@HAVE_AVUTIL_TRUE@am_flv_decoder_la_OBJECTS = flv_decoder_la-flv_decoder.lo \
+@HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_TRUE@@HAVE_AVUTIL_TRUE@	flv_decoder_la-dec_helper.lo
 flv_decoder_la_OBJECTS = $(am_flv_decoder_la_OBJECTS)
 flv_decoder_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
@@ -195,8 +199,10 @@
 @HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_TRUE@@HAVE_AVUTIL_TRUE@am_mkv_decoder_la_rpath = -rpath \
 @HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_TRUE@@HAVE_AVUTIL_TRUE@	$(decoderpluginslibdir)
 mpegts_decoder_la_LIBADD =
-am__mpegts_decoder_la_SOURCES_DIST = mpegts_decoder.c mpegts_decoder.h
-@HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_TRUE@@HAVE_AVUTIL_TRUE@am_mpegts_decoder_la_OBJECTS = mpegts_decoder_la-mpegts_decoder.lo
+am__mpegts_decoder_la_SOURCES_DIST = mpegts_decoder.c mpegts_decoder.h \
+	dec_helper.c
+@HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_TRUE@@HAVE_AVUTIL_TRUE@am_mpegts_decoder_la_OBJECTS = mpegts_decoder_la-mpegts_decoder.lo \
+@HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_TRUE@@HAVE_AVUTIL_TRUE@	mpegts_decoder_la-dec_helper.lo
 mpegts_decoder_la_OBJECTS = $(am_mpegts_decoder_la_OBJECTS)
 mpegts_decoder_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \
 	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link $(CCLD) \
@@ -592,13 +598,13 @@
 @HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_TRUE@@HAVE_AVUTIL_TRUE@flv_libs = flv_decoder.la
 @HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_TRUE@@HAVE_AVUTIL_TRUE@FLVDEC_LIBS = @LIBAVCODEC_LIBS@ @LIBAVFORMAT_LIBS@
 @HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_TRUE@@HAVE_AVUTIL_TRUE@FLVDEC_CFLAGS = @LIBAVFORMAT_CFLAGS@ @LIBAVCODEC_CFLAGS@ -Wno-deprecated-declarations
-@HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_TRUE@@HAVE_AVUTIL_TRUE@flv_decoder_la_SOURCES = flv_decoder.c flv_decoder.h
+@HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_TRUE@@HAVE_AVUTIL_TRUE@flv_decoder_la_SOURCES = flv_decoder.c flv_decoder.h dec_helper.c
 @HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_TRUE@@HAVE_AVUTIL_TRUE@flv_decoder_la_CFLAGS = $(libav_cflags) $(shared_cflags) $(weed_cflags) $(FLVDEC_CFLAGS)
 @HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_TRUE@@HAVE_AVUTIL_TRUE@flv_decoder_la_LDFLAGS = $(shared_ldflags) $(FLVDEC_LIBS)
 @HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_TRUE@@HAVE_AVUTIL_TRUE@asf_libs = asf_decoder.la
 @HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_TRUE@@HAVE_AVUTIL_TRUE@ASFDEC_LIBS = @LIBAVCODEC_LIBS@ @LIBAVFORMAT_LIBS@
 @HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_TRUE@@HAVE_AVUTIL_TRUE@ASFDEC_CFLAGS = @LIBAVFORMAT_CFLAGS@ @LIBAVCODEC_CFLAGS@ -Wno-deprecated-declarations
-@HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_TRUE@@HAVE_AVUTIL_TRUE@asf_decoder_la_SOURCES = asf_decoder.c asf_decoder.h
+@HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_TRUE@@HAVE_AVUTIL_TRUE@asf_decoder_la_SOURCES = asf_decoder.c asf_decoder.h dec_helper.c
 @HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_TRUE@@HAVE_AVUTIL_TRUE@asf_decoder_la_CFLAGS = $(libav_cflags) $(shared_cflags) $(weed_cflags) $(ASFDEC_CFLAGS)
 @HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_TRUE@@HAVE_AVUTIL_TRUE@asf_decoder_la_LDFLAGS = $(shared_ldflags) $(ASFDEC_LIBS)
 @HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_TRUE@@HAVE_AVUTIL_TRUE@mkv_libs = mkv_decoder.la
@@ -614,7 +620,7 @@
 @HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_TRUE@@HAVE_AVUTIL_TRUE@MPEGTSDEC_CFLAGS = @LIBAVFORMAT_CFLAGS@ @LIBAVCODEC_CFLAGS@ @LIBAVUTIL_CFLAGS@ \
 @HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_TRUE@@HAVE_AVUTIL_TRUE@	-Wno-deprecated-declarations
 
-@HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_TRUE@@HAVE_AVUTIL_TRUE@mpegts_decoder_la_SOURCES = mpegts_decoder.c mpegts_decoder.h
+@HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_TRUE@@HAVE_AVUTIL_TRUE@mpegts_decoder_la_SOURCES = mpegts_decoder.c mpegts_decoder.h dec_helper.c
 @HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_TRUE@@HAVE_AVUTIL_TRUE@mpegts_decoder_la_CFLAGS = $(libav_cflags) $(shared_cflags) $(weed_cflags) $(MPEGTSDEC_CFLAGS)
 @HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_TRUE@@HAVE_AVUTIL_TRUE@mpegts_decoder_la_LDFLAGS = $(shared_ldflags) $(MPEGTSDEC_LIBS)
 @HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_TRUE@@HAVE_AVUTIL_TRUE@zzavformat_libs = zzavformat_decoder.la
@@ -723,9 +729,12 @@
 	-rm -f *.tab.c
 
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asf_decoder_la-asf_decoder.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/asf_decoder_la-dec_helper.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/dv_decoder_la-dv_decoder.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/flv_decoder_la-dec_helper.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/flv_decoder_la-flv_decoder.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mkv_decoder_la-mkv_decoder.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mpegts_decoder_la-dec_helper.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/mpegts_decoder_la-mpegts_decoder.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ogg_decoder_la-ogg_decoder.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/zzavformat_decoder_la-avformat_decoder.Plo@am__quote@
@@ -758,6 +767,13 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(asf_decoder_la_CFLAGS) $(CFLAGS) -c -o asf_decoder_la-asf_decoder.lo `test -f 'asf_decoder.c' || echo '$(srcdir)/'`asf_decoder.c
 
+asf_decoder_la-dec_helper.lo: dec_helper.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(asf_decoder_la_CFLAGS) $(CFLAGS) -MT asf_decoder_la-dec_helper.lo -MD -MP -MF $(DEPDIR)/asf_decoder_la-dec_helper.Tpo -c -o asf_decoder_la-dec_helper.lo `test -f 'dec_helper.c' || echo '$(srcdir)/'`dec_helper.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/asf_decoder_la-dec_helper.Tpo $(DEPDIR)/asf_decoder_la-dec_helper.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dec_helper.c' object='asf_decoder_la-dec_helper.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(asf_decoder_la_CFLAGS) $(CFLAGS) -c -o asf_decoder_la-dec_helper.lo `test -f 'dec_helper.c' || echo '$(srcdir)/'`dec_helper.c
+
 dv_decoder_la-dv_decoder.lo: dv_decoder.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(dv_decoder_la_CFLAGS) $(CFLAGS) -MT dv_decoder_la-dv_decoder.lo -MD -MP -MF $(DEPDIR)/dv_decoder_la-dv_decoder.Tpo -c -o dv_decoder_la-dv_decoder.lo `test -f 'dv_decoder.c' || echo '$(srcdir)/'`dv_decoder.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/dv_decoder_la-dv_decoder.Tpo $(DEPDIR)/dv_decoder_la-dv_decoder.Plo
@@ -772,6 +788,13 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(flv_decoder_la_CFLAGS) $(CFLAGS) -c -o flv_decoder_la-flv_decoder.lo `test -f 'flv_decoder.c' || echo '$(srcdir)/'`flv_decoder.c
 
+flv_decoder_la-dec_helper.lo: dec_helper.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(flv_decoder_la_CFLAGS) $(CFLAGS) -MT flv_decoder_la-dec_helper.lo -MD -MP -MF $(DEPDIR)/flv_decoder_la-dec_helper.Tpo -c -o flv_decoder_la-dec_helper.lo `test -f 'dec_helper.c' || echo '$(srcdir)/'`dec_helper.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/flv_decoder_la-dec_helper.Tpo $(DEPDIR)/flv_decoder_la-dec_helper.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dec_helper.c' object='flv_decoder_la-dec_helper.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(flv_decoder_la_CFLAGS) $(CFLAGS) -c -o flv_decoder_la-dec_helper.lo `test -f 'dec_helper.c' || echo '$(srcdir)/'`dec_helper.c
+
 mkv_decoder_la-mkv_decoder.lo: mkv_decoder.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mkv_decoder_la_CFLAGS) $(CFLAGS) -MT mkv_decoder_la-mkv_decoder.lo -MD -MP -MF $(DEPDIR)/mkv_decoder_la-mkv_decoder.Tpo -c -o mkv_decoder_la-mkv_decoder.lo `test -f 'mkv_decoder.c' || echo '$(srcdir)/'`mkv_decoder.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/mkv_decoder_la-mkv_decoder.Tpo $(DEPDIR)/mkv_decoder_la-mkv_decoder.Plo
@@ -786,6 +809,13 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mpegts_decoder_la_CFLAGS) $(CFLAGS) -c -o mpegts_decoder_la-mpegts_decoder.lo `test -f 'mpegts_decoder.c' || echo '$(srcdir)/'`mpegts_decoder.c
 
+mpegts_decoder_la-dec_helper.lo: dec_helper.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mpegts_decoder_la_CFLAGS) $(CFLAGS) -MT mpegts_decoder_la-dec_helper.lo -MD -MP -MF $(DEPDIR)/mpegts_decoder_la-dec_helper.Tpo -c -o mpegts_decoder_la-dec_helper.lo `test -f 'dec_helper.c' || echo '$(srcdir)/'`dec_helper.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/mpegts_decoder_la-dec_helper.Tpo $(DEPDIR)/mpegts_decoder_la-dec_helper.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dec_helper.c' object='mpegts_decoder_la-dec_helper.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mpegts_decoder_la_CFLAGS) $(CFLAGS) -c -o mpegts_decoder_la-dec_helper.lo `test -f 'dec_helper.c' || echo '$(srcdir)/'`dec_helper.c
+
 ogg_decoder_la-ogg_decoder.lo: ogg_decoder.c
 @am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(ogg_decoder_la_CFLAGS) $(CFLAGS) -MT ogg_decoder_la-ogg_decoder.lo -MD -MP -MF $(DEPDIR)/ogg_decoder_la-ogg_decoder.Tpo -c -o ogg_decoder_la-ogg_decoder.lo `test -f 'ogg_decoder.c' || echo '$(srcdir)/'`ogg_decoder.c
 @am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/ogg_decoder_la-ogg_decoder.Tpo $(DEPDIR)/ogg_decoder_la-ogg_decoder.Plo

LiVES-2.2.8.tar.bz2/lives-plugins/plugins/decoders/asf_decoder.c -> LiVES-2.4.1.tar.bz2/lives-plugins/plugins/decoders/asf_decoder.c Changed

@@ -66,18 +66,17 @@
 
 #include "asf_decoder.h"
 
-static enum CodecID ff_codec_get_id(const AVCodecTag *tags, unsigned int tag)
-{
+static enum CodecID ff_codec_get_id(const AVCodecTag *tags, unsigned int tag) {
   int i;
-  for(i=0; tags[i].id != CODEC_ID_NONE;i++) {
-    if(tag == tags[i].tag)
+  for (i=0; tags[i].id != CODEC_ID_NONE; i++) {
+    if (tag == tags[i].tag)
       return tags[i].id;
   }
-  for(i=0; tags[i].id != CODEC_ID_NONE; i++) {
-    if(   toupper((tag >> 0)&0xFF) == toupper((tags[i].tag >> 0)&0xFF)
-	  && toupper((tag >> 8)&0xFF) == toupper((tags[i].tag >> 8)&0xFF)
-	  && toupper((tag >>16)&0xFF) == toupper((tags[i].tag >>16)&0xFF)
-	  && toupper((tag >>24)&0xFF) == toupper((tags[i].tag >>24)&0xFF))
+  for (i=0; tags[i].id != CODEC_ID_NONE; i++) {
+    if (toupper((tag >> 0)&0xFF) == toupper((tags[i].tag >> 0)&0xFF)
+        && toupper((tag >> 8)&0xFF) == toupper((tags[i].tag >> 8)&0xFF)
+        && toupper((tag >>16)&0xFF) == toupper((tags[i].tag >>16)&0xFF)
+        && toupper((tag >>24)&0xFF) == toupper((tags[i].tag >>24)&0xFF))
       return tags[i].id;
   }
   return CODEC_ID_NONE;
@@ -96,7 +95,7 @@
 /*
   static void convert_quad_chroma(guchar *src, int width, int height, guchar *dest) {
   // width and height here are width and height of dest chroma planes, in bytes
-  
+
   // double the chroma samples vertically and horizontally, with interpolation, eg. 420p to 444p
 
   // output to planes
@@ -167,7 +166,9 @@
   uint8_t *g1=(uint8_t *)v1;
   uint8_t *g2=(uint8_t *)v2;
   if (res==0) {
-    printf("check %0X %0X %0X %0X %0X %0X %0X %0X %0X %0X %0X %0X %0X %0X %0X %0X\n",(uint8_t)g1[0],(uint8_t)g1[1],(uint8_t)g1[2],(uint8_t)g1[3],(uint8_t)g1[4],(uint8_t)g1[5],(uint8_t)g1[6],(uint8_t)g1[7],(uint8_t)g1[8],(uint8_t)g1[9],(uint8_t)g1[10],(uint8_t)g1[11],(uint8_t)g1[12],(uint8_t)g1[13],(uint8_t)g1[14],(uint8_t)g1[15]);
+    printf("check %0X %0X %0X %0X %0X %0X %0X %0X %0X %0X %0X %0X %0X %0X %0X %0X\n",(uint8_t)g1[0],(uint8_t)g1[1],(uint8_t)g1[2],
+           (uint8_t)g1[3],(uint8_t)g1[4],(uint8_t)g1[5],(uint8_t)g1[6],(uint8_t)g1[7],(uint8_t)g1[8],(uint8_t)g1[9],(uint8_t)g1[10],(uint8_t)g1[11],
+           (uint8_t)g1[12],(uint8_t)g1[13],(uint8_t)g1[14],(uint8_t)g1[15]);
   }
 #endif
 
@@ -175,16 +176,15 @@
 }
 
 
-static void get_str16_nolen(unsigned char *inbuf, int len, char *buf, int buf_size)
-{
+static void get_str16_nolen(unsigned char *inbuf, int len, char *buf, int buf_size) {
   int i=0;
-  char* q = buf;
+  char *q = buf;
   while (len > 1) {
     uint8_t tmp;
     uint32_t ch;
 
     GET_UTF16(ch, (len -= 2) >= 0 ? get_le16int(&inbuf[i]) : 0, break;)
-      PUT_UTF8(ch, tmp, if (q - buf < buf_size - 1) *q++ = tmp;)
+    PUT_UTF8(ch, tmp, if (q - buf < buf_size - 1) *q++ = tmp;)
       i+=2;
   }
   *q = '\0';
@@ -200,12 +200,12 @@
 }
 
 
-static int get_value(const lives_clip_data_t *cdata, int type){
+static int get_value(const lives_clip_data_t *cdata, int type) {
   unsigned char buffer[4096];
   lives_asf_priv_t *priv=cdata->priv;
-  switch(type){
-  case 2: 
-  case 3: 
+  switch (type) {
+  case 2:
+  case 3:
     if (read(priv->fd,buffer,4)<4) {
       fprintf(stderr, "asf_decoder: read error getting value\n");
       close(priv->fd);
@@ -213,7 +213,7 @@
     }
     priv->input_position+=4;
     return get_le32int(buffer);
-  case 4: 
+  case 4:
     if (read(priv->fd,buffer,8)<8) {
       fprintf(stderr, "asf_decoder: read error getting value\n");
       close(priv->fd);
@@ -221,7 +221,7 @@
     }
     priv->input_position+=8;
     return get_le64int(buffer);
-  case 5: 
+  case 5:
     if (read(priv->fd,buffer,2)<2) {
       fprintf(stderr, "asf_decoder: read error getting value\n");
       close(priv->fd);
@@ -229,14 +229,14 @@
     }
     priv->input_position+=2;
     return get_le16int(buffer);
-  default:return INT_MIN;
+  default:
+    return INT_MIN;
   }
 }
 
 
 
-static boolean get_tag(const lives_clip_data_t *cdata, AVFormatContext *s, const char *key, int type, int len)
-{
+static boolean get_tag(const lives_clip_data_t *cdata, AVFormatContext *s, const char *key, int type, int len) {
   char *value;
   unsigned char buffer[4096];
   lives_asf_priv_t *priv=cdata->priv;
@@ -272,8 +272,7 @@
 }
 
 
-static void asf_reset_header(AVFormatContext *s)
-{
+static void asf_reset_header(AVFormatContext *s) {
   ASFContext *asf = s->priv_data;
   ASFStream *asf_st;
   int i;
@@ -298,7 +297,7 @@
   asf->packet_time_delta = 0;
   asf->packet_time_start = 0;
 
-  for(i=0; i<s->nb_streams; i++){
+  for (i=0; i<s->nb_streams; i++) {
     asf_st= s->streams[i]->priv_data;
     av_free_packet(&asf_st->pkt);
     asf_st->frag_offset=0;
@@ -312,21 +311,21 @@
   unsigned char buffer;
 
   while (1) {
-    if (read (priv->fd, &buffer, 1) < 1) return;
+    if (read(priv->fd, &buffer, 1) < 1) return;
     priv->input_position++;
     if (buffer==0x82) goto got_82;
     else continue;
 
-  got_82:
-    if (read (priv->fd, &buffer, 1) < 1) return;
+got_82:
+    if (read(priv->fd, &buffer, 1) < 1) return;
     priv->input_position++;
 
     if (buffer==0x82) goto got_82;
     if (buffer==0) goto got_0;
     else continue;
 
-  got_0:
-    if (read (priv->fd, &buffer, 1) < 1) return;
+got_0:
+    if (read(priv->fd, &buffer, 1) < 1) return;
     priv->input_position++;
     if (buffer==0) return; // OK
     if (buffer==0x82) goto got_82;
@@ -461,65 +460,65 @@
       priv->hdr_start=priv->input_position-3;
 
       if (read(priv->fd, buffer, 2)<2) return -2;
-      
+
       priv->input_position+=2;
-      
+
       asf->packet_flags    = buffer[0];
       asf->packet_property = buffer[1];
-      
+
       rsize+=3;
-      
+
       DO_2BITS(asf->packet_flags >> 5, packet_length, s->packet_size);
       DO_2BITS(asf->packet_flags >> 1, padsize, 0); // sequence ignored
       DO_2BITS(asf->packet_flags >> 3, padsize, 0); // padding length
-      
+
       if (read(priv->fd,buffer,4)<4) {
-	fprintf(stderr, "asf_decoder: read error getting value\n");
-	return -5;
+        fprintf(stderr, "asf_decoder: read error getting value\n");
+        return -5;
       }
-      
+
       priv->input_position+=4;
-      
+
       asf->packet_timestamp = get_le32int(buffer);  // send time
-      
+
       //the following checks prevent overflows and infinite loops
-      if(!packet_length || packet_length >= (1U<<29)){
-	fprintf(stderr, "invalid packet_length %d at:%"PRId64"\n", packet_length, priv->input_position);
-	return -3;
+      if (!packet_length || packet_length >= (1U<<29)) {
+        fprintf(stderr, "invalid packet_length %d at:%"PRId64"\n", packet_length, priv->input_position);
+        return -3;
       }
-      if(padsize >= packet_length){
-	fprintf(stderr, "invalid padsize %d at:%"PRId64"\n", padsize, priv->input_position);
-	return -4;
+      if (padsize >= packet_length) {
+        fprintf(stderr, "invalid padsize %d at:%"PRId64"\n", padsize, priv->input_position);
+        return -4;
       }
 
       if (read(priv->fd,buffer,2)<2) {
-	fprintf(stderr, "asf_decoder: read error getting value\n");
-	return -2;
+        fprintf(stderr, "asf_decoder: read error getting value\n");
+        return -2;
       }
       priv->input_position+=2;
-      
+
       //duration = get_le16int(buffer);
-      
+
       // rsize has at least 11 bytes which have to be present
-      
+
       if (asf->packet_flags & 0x01) {
-	// multi segments
-	if (read(priv->fd,buffer,1)<1) {
-	  fprintf(stderr, "asf_decoder: read error getting value\n");
-	  return -2;
-	}
-	priv->input_position++;
-	asf->packet_segsizetype = buffer[0];
-	rsize++;
-	asf->packet_segments = asf->packet_segsizetype & 0x3f;
+        // multi segments
+        if (read(priv->fd,buffer,1)<1) {
+          fprintf(stderr, "asf_decoder: read error getting value\n");
+          return -2;
+        }
+        priv->input_position++;
+        asf->packet_segsizetype = buffer[0];
+        rsize++;
+        asf->packet_segments = asf->packet_segsizetype & 0x3f;
       } else {
-	// single segment
-	asf->packet_segments = 1;
-	asf->packet_segsizetype = 0x80;
+        // single segment
+        asf->packet_segments = 1;
+        asf->packet_segsizetype = 0x80;
       }
-      
+
       asf->packet_size_left = packet_length - padsize - rsize;
-      
+
       if (packet_length < asf->hdr.min_pktsize)
         padsize += asf->hdr.min_pktsize - packet_length;
 
@@ -538,20 +537,20 @@
 
     do {
       // read frame header for fragment to get stream
-   
+
       lseek(priv->fd, priv->input_position, SEEK_SET);
       frag_start=priv->input_position;
 
       if (read(priv->fd,buffer,1)<1) {
-	fprintf(stderr, "asf_decoder: read error getting value\n");
-	return -2;
+        fprintf(stderr, "asf_decoder: read error getting value\n");
+        return -2;
       }
 
       priv->input_position++;
 
       num=buffer[0];
       asf->packet_key_frame = num >> 7;
-    
+
       streamid = num&0x7f;
 
 #ifdef DEBUG
@@ -560,181 +559,182 @@
       rsize=1;
 
       if (asf->packet_time_start==0) {
-	asf->asf_st = s->streams[asf->stream_index]->priv_data;
-  
-	// read rest of frame header
-
-	DO_2BITS(asf->packet_property >> 4, asf->packet_seq, 0);
-	DO_2BITS(asf->packet_property >> 2, asf->packet_frag_offset, 0);
-	DO_2BITS(asf->packet_property, asf->packet_replic_size, 0);
-
-	if (asf->packet_replic_size >= 8) {
-
-	  if (read(priv->fd,buffer,4)<4) {
-	    fprintf(stderr, "asf_decoder: read error getting value\n");
-	    return -2;
-	  }
-	  priv->input_position+=4;
-	  asf->packet_obj_size = get_le32int(buffer);
-
-	  if(asf->packet_obj_size >= (1<<24) || asf->packet_obj_size <= 0){
-	    if (streamid==vidindex) {
-	      fprintf(stderr, "asf_decoder: packet_obj_size invalid\n");
-	      return -9;
-	    }
-	  }
-
-	  if (read(priv->fd,buffer,4)<4) {
-	    fprintf(stderr, "asf_decoder: read error getting value\n");
-	    return -2;
-	  }
-	  priv->input_position+=4;
-
-	  asf->packet_frag_timestamp = get_le32int(buffer); // timestamp
-
-	  if(asf->packet_replic_size >= 8+38+4){
-
-	    priv->input_position+=10;
-	    lseek(priv->fd,10,SEEK_CUR);
-
-	    if (read(priv->fd,buffer,8)<8) {
-	      fprintf(stderr, "asf_decoder: read error getting value\n");
-	      return -2;
-	    }
-	    priv->input_position+=8;
-	    ts0= get_le64int(buffer);
-	
-	    priv->input_position+=asf->packet_replic_size + 16 - 38 - 4;
-	    lseek(priv->fd,asf->packet_replic_size + 16 - 38 - 4,SEEK_CUR);
-    
-	    if(ts0!= -1) asf->packet_frag_timestamp= ts0/10000;
-	    else         asf->packet_frag_timestamp= AV_NOPTS_VALUE;
-	  }else {
-	    priv->input_position+=asf->packet_replic_size - 8;
-	    lseek(priv->fd,asf->packet_replic_size - 8,SEEK_CUR);
-	  }
-	  rsize += asf->packet_replic_size; // FIXME - check validity
-	} else if (asf->packet_replic_size==1){
-	  // single packet ? - frag_offset is beginning timestamp
-	  asf->packet_time_start = asf->packet_frag_offset;
-	  asf->packet_frag_offset = 0;
-	  asf->packet_frag_timestamp = asf->packet_timestamp;
-
-	  if (read(priv->fd,buffer,1)<1) {
-	    fprintf(stderr, "asf_decoder: read error getting value\n");
-	    return -2;
-	  }
-	  priv->input_position+=1;
-
-	  asf->packet_time_delta = buffer[0];
-      
-	  rsize++;
-	}else if(asf->packet_replic_size!=0){
-	  if (check_eof(cdata)) {
-	    // could also be EOF in DO_2_BITS
-	    fprintf(stderr, "asf_decoder: EOF");
-	    return -2;
-	  }
-	  fprintf(stderr, "unexpected packet_replic_size of %d\n", asf->packet_replic_size);
-	  return -1;
-	}
-      
-	if (asf->packet_flags & 0x01) {
-	  // multi fragments
-	  DO_2BITS(asf->packet_segsizetype >> 6, asf->packet_frag_size, 0); // 0 is illegal
-	  if(asf->packet_frag_size > asf->packet_size_left - rsize){
-	    fprintf(stderr,"asf_decoder: packet_frag_size is invalid (%d > %d) %d %d\n",asf->packet_frag_size,asf->packet_size_left - rsize,asf->packet_padsize,rsize);
-	    
+        asf->asf_st = s->streams[asf->stream_index]->priv_data;
+
+        // read rest of frame header
+
+        DO_2BITS(asf->packet_property >> 4, asf->packet_seq, 0);
+        DO_2BITS(asf->packet_property >> 2, asf->packet_frag_offset, 0);
+        DO_2BITS(asf->packet_property, asf->packet_replic_size, 0);
+
+        if (asf->packet_replic_size >= 8) {
+
+          if (read(priv->fd,buffer,4)<4) {
+            fprintf(stderr, "asf_decoder: read error getting value\n");
+            return -2;
+          }
+          priv->input_position+=4;
+          asf->packet_obj_size = get_le32int(buffer);
+
+          if (asf->packet_obj_size >= (1<<24) || asf->packet_obj_size <= 0) {
+            if (streamid==vidindex) {
+              fprintf(stderr, "asf_decoder: packet_obj_size invalid\n");
+              return -9;
+            }
+          }
+
+          if (read(priv->fd,buffer,4)<4) {
+            fprintf(stderr, "asf_decoder: read error getting value\n");
+            return -2;
+          }
+          priv->input_position+=4;
+
+          asf->packet_frag_timestamp = get_le32int(buffer); // timestamp
+
+          if (asf->packet_replic_size >= 8+38+4) {
+
+            priv->input_position+=10;
+            lseek(priv->fd,10,SEEK_CUR);
+
+            if (read(priv->fd,buffer,8)<8) {
+              fprintf(stderr, "asf_decoder: read error getting value\n");
+              return -2;
+            }
+            priv->input_position+=8;
+            ts0= get_le64int(buffer);
+
+            priv->input_position+=asf->packet_replic_size + 16 - 38 - 4;
+            lseek(priv->fd,asf->packet_replic_size + 16 - 38 - 4,SEEK_CUR);
+
+            if (ts0!= -1) asf->packet_frag_timestamp= ts0/10000;
+            else         asf->packet_frag_timestamp= AV_NOPTS_VALUE;
+          } else {
+            priv->input_position+=asf->packet_replic_size - 8;
+            lseek(priv->fd,asf->packet_replic_size - 8,SEEK_CUR);
+          }
+          rsize += asf->packet_replic_size; // FIXME - check validity
+        } else if (asf->packet_replic_size==1) {
+          // single packet ? - frag_offset is beginning timestamp
+          asf->packet_time_start = asf->packet_frag_offset;
+          asf->packet_frag_offset = 0;
+          asf->packet_frag_timestamp = asf->packet_timestamp;
+
+          if (read(priv->fd,buffer,1)<1) {
+            fprintf(stderr, "asf_decoder: read error getting value\n");
+            return -2;
+          }
+          priv->input_position+=1;
+
+          asf->packet_time_delta = buffer[0];
+
+          rsize++;
+        } else if (asf->packet_replic_size!=0) {
+          if (check_eof(cdata)) {
+            // could also be EOF in DO_2_BITS
+            fprintf(stderr, "asf_decoder: EOF");
+            return -2;
+          }
+          fprintf(stderr, "unexpected packet_replic_size of %d\n", asf->packet_replic_size);
+          return -1;
+        }
+
+        if (asf->packet_flags & 0x01) {
+          // multi fragments
+          DO_2BITS(asf->packet_segsizetype >> 6, asf->packet_frag_size, 0); // 0 is illegal
+          if (asf->packet_frag_size > asf->packet_size_left - rsize) {
+            fprintf(stderr,"asf_decoder: packet_frag_size is invalid (%d > %d) %d %d\n",asf->packet_frag_size,asf->packet_size_left - rsize,
+                    asf->packet_padsize,rsize);
+
 #ifdef DEBUG
-	    printf("skipping %d %ld\n",asf->packet_size_left + asf->packet_padsize - 2, asf->packet_padsize);
-#endif	    
-
-	    lseek(priv->fd, asf->packet_size_left + asf->packet_padsize - 2 - rsize, SEEK_CUR);
-	    priv->input_position+=asf->packet_size_left + asf->packet_padsize - 2 - rsize;
-	    asf->packet_segments=0;
-	    asf->packet_size_left=0;
-    
-	    return -1;
-	  }
+            printf("skipping %d %ld\n",asf->packet_size_left + asf->packet_padsize - 2, asf->packet_padsize);
+#endif
+
+            lseek(priv->fd, asf->packet_size_left + asf->packet_padsize - 2 - rsize, SEEK_CUR);
+            priv->input_position+=asf->packet_size_left + asf->packet_padsize - 2 - rsize;
+            asf->packet_segments=0;
+            asf->packet_size_left=0;
+
+            return -1;
+          }
 #ifdef DEBUG
-	  printf("Fragsize %d nsegs %d\n", asf->packet_frag_size,asf->packet_segments);
+          printf("Fragsize %d nsegs %d\n", asf->packet_frag_size,asf->packet_segments);
 #endif
-	} else {
-	  asf->packet_frag_size = asf->packet_size_left - rsize;
+        } else {
+          asf->packet_frag_size = asf->packet_size_left - rsize;
 #ifdef DEBUG
-	  printf("Using rest  %d %d %d\n", asf->packet_frag_size, asf->packet_size_left, rsize);
+          printf("Using rest  %d %d %d\n", asf->packet_frag_size, asf->packet_size_left, rsize);
 #endif
-	}
+        }
       }
 
       if (streamid == vidindex) {
 #ifdef DEBUG
-	printf("got vid fragment in packet !\n");
+        printf("got vid fragment in packet !\n");
 #endif
 
-	if (asf->packet_key_frame&&asf->packet_frag_offset==0&&priv->have_start_dts) {
-	  pthread_mutex_lock(&priv->idxc->mutex);
-	  priv->kframe=add_keyframe(cdata,priv->hdr_start,priv->fragnum,asf->packet_frag_timestamp-priv->start_dts);
-	  pthread_mutex_unlock(&priv->idxc->mutex);
+        if (asf->packet_key_frame&&asf->packet_frag_offset==0&&priv->have_start_dts) {
+          pthread_mutex_lock(&priv->idxc->mutex);
+          priv->kframe=add_keyframe(cdata,priv->hdr_start,priv->fragnum,asf->packet_frag_timestamp-priv->start_dts);
+          pthread_mutex_unlock(&priv->idxc->mutex);
 
 #ifdef DEBUG
-	  printf("and is keyframe !\n");
+          printf("and is keyframe !\n");
 #endif
-	}
-
-	if (tdts>=0 && (asf->packet_frag_timestamp>=tdts)) {
-	  // reached target dts
-	  return 0;
-	}
-
-	
-	if (asf->packet_frag_offset==0) {
-	  if (pack_fill==0) priv->frame_dts=asf->packet_frag_timestamp;
-	  else if (tdts==-1) {
-	    // got complete AV video packet
-	    priv->input_position=frag_start;
-	    priv->avpkt.size=pack_fill;
-	    return 0;
-	  }
-	}
-
-	priv->fragnum++;
-
-	if (tfrag<=0 && tdts==-1) {
-
-	  if (asf->packet_frag_offset!=0 && pack_fill==0) {
-	    // we reached our target, but it has a non-zero offset, which is not allowed
-	    // So skip this packet;
-	    // - this could happen if we have broken fragments at the start of the clip.
-	    priv->input_position+=asf->packet_frag_size;
-	    continue;
-	  }
-
-	  while (asf->packet_frag_offset+asf->packet_frag_size>priv->avpkt.size) {
-	    fprintf(stderr, "asf_decoder: buffer overflow reading vid packet (%d + %d > %d),\n increasing buffer size\n",
-		    asf->packet_frag_offset,asf->packet_frag_size,priv->avpkt.size);
-
-	    priv->avpkt.data=realloc(priv->avpkt.data,priv->def_packet_size*2+FF_INPUT_BUFFER_PADDING_SIZE);
-	    memset(priv->avpkt.data+priv->avpkt.size,0,priv->def_packet_size);
-	    priv->def_packet_size*=2;
-	    priv->avpkt.size=priv->def_packet_size+FF_INPUT_BUFFER_PADDING_SIZE;
-	  }
-
-	  if (read(priv->fd,priv->avpkt.data+asf->packet_frag_offset,asf->packet_frag_size)
-	      <asf->packet_frag_size) {
-	    fprintf(stderr, "asf_decoder: EOF error reading vid packet\n");
-	    return -2;
-	  }
-	  pack_fill=asf->packet_frag_offset+asf->packet_frag_size;
-	}
-
-	priv->input_position+=asf->packet_frag_size;
-
-	tfrag--;
+        }
+
+        if (tdts>=0 && (asf->packet_frag_timestamp>=tdts)) {
+          // reached target dts
+          return 0;
+        }
+
+
+        if (asf->packet_frag_offset==0) {
+          if (pack_fill==0) priv->frame_dts=asf->packet_frag_timestamp;
+          else if (tdts==-1) {
+            // got complete AV video packet
+            priv->input_position=frag_start;
+            priv->avpkt.size=pack_fill;
+            return 0;
+          }
+        }
+
+        priv->fragnum++;
+
+        if (tfrag<=0 && tdts==-1) {
+
+          if (asf->packet_frag_offset!=0 && pack_fill==0) {
+            // we reached our target, but it has a non-zero offset, which is not allowed
+            // So skip this packet;
+            // - this could happen if we have broken fragments at the start of the clip.
+            priv->input_position+=asf->packet_frag_size;
+            continue;
+          }
+
+          while (asf->packet_frag_offset+asf->packet_frag_size>priv->avpkt.size) {
+            fprintf(stderr, "asf_decoder: buffer overflow reading vid packet (%d + %d > %d),\n increasing buffer size\n",
+                    asf->packet_frag_offset,asf->packet_frag_size,priv->avpkt.size);
+
+            priv->avpkt.data=realloc(priv->avpkt.data,priv->def_packet_size*2+FF_INPUT_BUFFER_PADDING_SIZE);
+            memset(priv->avpkt.data+priv->avpkt.size,0,priv->def_packet_size);
+            priv->def_packet_size*=2;
+            priv->avpkt.size=priv->def_packet_size+FF_INPUT_BUFFER_PADDING_SIZE;
+          }
+
+          if (read(priv->fd,priv->avpkt.data+asf->packet_frag_offset,asf->packet_frag_size)
+              <asf->packet_frag_size) {
+            fprintf(stderr, "asf_decoder: EOF error reading vid packet\n");
+            return -2;
+          }
+          pack_fill=asf->packet_frag_offset+asf->packet_frag_size;
+        }
+
+        priv->input_position+=asf->packet_frag_size;
+
+        tfrag--;
 
       } else {
-	// fragment is for another stream
-	priv->input_position+=asf->packet_frag_size;
+        // fragment is for another stream
+        priv->input_position+=asf->packet_frag_size;
       }
 
       asf->packet_size_left -= asf->packet_frag_size + rsize;
@@ -807,9 +807,9 @@
 
   pthread_mutex_lock(&indices_mutex);
 
-  for (i=0;i<nidxc;i++) {
+  for (i=0; i<nidxc; i++) {
     if (indices[i]->clients[0]->current_clip==cdata->current_clip&&
-	!strcmp(indices[i]->clients[0]->URI,cdata->URI)) {
+        !strcmp(indices[i]->clients[0]->URI,cdata->URI)) {
       idxc=indices[i];
       // append cdata to clients
       idxc->clients=(lives_clip_data_t **)realloc(idxc->clients,(idxc->nclients+1)*sizeof(lives_clip_data_t *));
@@ -856,33 +856,31 @@
     // remove this index
     index_free(idxc->idx);
     free(idxc->clients);
-    for (i=0;i<nidxc;i++) {
+    for (i=0; i<nidxc; i++) {
       if (indices[i]==idxc) {
-	nidxc--;
-	for (j=i;j<nidxc;j++) {
-	  indices[j]=indices[j+1];
-	}
-	free(idxc);
-	if (nidxc==0) {
-	  free(indices);
-	  indices=NULL;
-	}
-	else indices=(index_container_t **)realloc(indices,nidxc*sizeof(index_container_t *));
-	break;
+        nidxc--;
+        for (j=i; j<nidxc; j++) {
+          indices[j]=indices[j+1];
+        }
+        free(idxc);
+        if (nidxc==0) {
+          free(indices);
+          indices=NULL;
+        } else indices=(index_container_t **)realloc(indices,nidxc*sizeof(index_container_t *));
+        break;
       }
     }
-  }
-  else {
+  } else {
     // reduce client count by 1
-    for (i=0;i<idxc->nclients;i++) {
+    for (i=0; i<idxc->nclients; i++) {
       if (idxc->clients[i]==cdata) {
-	// remove this entry
-	idxc->nclients--;
-	for (j=i;j<idxc->nclients;j++) {
-	  idxc->clients[j]=idxc->clients[j+1];
-	}
-	idxc->clients=(lives_clip_data_t **)realloc(idxc->clients,idxc->nclients*sizeof(lives_clip_data_t *));
-	break;
+        // remove this entry
+        idxc->nclients--;
+        for (j=i; j<idxc->nclients; j++) {
+          idxc->clients[j]=idxc->clients[j+1];
+        }
+        idxc->clients=(lives_clip_data_t **)realloc(idxc->clients,idxc->nclients*sizeof(lives_clip_data_t *));
+        break;
       }
     }
   }
@@ -895,7 +893,7 @@
 static void idxc_release_all(void) {
   register int i;
 
-  for (i=0;i<nidxc;i++) {
+  for (i=0; i<nidxc; i++) {
     index_free(indices[i]->idx);
     free(indices[i]->clients);
     free(indices[i]);
@@ -904,7 +902,7 @@
 }
 
 
-static void detach_stream (lives_clip_data_t *cdata) {
+static void detach_stream(lives_clip_data_t *cdata) {
   // close the file, free the decoder
   lives_asf_priv_t *priv=cdata->priv;
 
@@ -923,7 +921,7 @@
 
   priv->ctx=NULL;
   priv->picture=NULL;
-  
+
   if (cdata->palettes!=NULL) free(cdata->palettes);
   cdata->palettes=NULL;
 
@@ -1004,7 +1002,7 @@
     goto seek_skip;
   }
 
-  if (read (priv->fd, header, ASF_PROBE_SIZE) < ASF_PROBE_SIZE) {
+  if (read(priv->fd, header, ASF_PROBE_SIZE) < ASF_PROBE_SIZE) {
     // for example, might be a directory
 #ifdef DEBUG
     fprintf(stderr, "asf_decoder: unable to read header for %s\n",cdata->URI);
@@ -1047,7 +1045,7 @@
   fstat(priv->fd,&sb);
   priv->filesize=sb.st_size;
 
- seek_skip:
+seek_skip:
 
   priv->idxc=idxc_for(cdata);
 
@@ -1062,9 +1060,9 @@
   priv->asf_st=NULL;
   priv->ctx=NULL;
 
-  for (i=0;i<128;i++) dar[i].num=dar[i].den=0;
+  for (i=0; i<128; i++) dar[i].num=dar[i].den=0;
 
-  for(;;) {
+  for (;;) {
     int64_t gpos=priv->input_position;
 
     get_guid(priv->fd, &g);
@@ -1083,9 +1081,9 @@
     if (!guidcmp(&g, &lives_asf_data_header)) {
       priv->asf->data_object_offset = priv->input_position;
       if (!(priv->asf->hdr.flags & 0x01) && gsize >= 100) {
-	priv->asf->data_object_size = gsize - 24;
+        priv->asf->data_object_size = gsize - 24;
       } else {
-	priv->asf->data_object_size = (uint64_t)-1;
+        priv->asf->data_object_size = (uint64_t)-1;
       }
       break;
     }
@@ -1103,11 +1101,11 @@
       priv->input_position+=sizeof(lives_asf_guid);
 
       if (read(priv->fd,buffer,8)<8) {
-	fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
-	detach_stream(cdata);
-	return FALSE;
+        fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
+        detach_stream(cdata);
+        return FALSE;
       }
-      
+
       priv->input_position+=8;
       priv->asf->hdr.file_size          = get_le64int(buffer);
 
@@ -1116,20 +1114,20 @@
 #endif
 
       if (read(priv->fd,buffer,8)<8) {
-	fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
-	detach_stream(cdata);
-	return FALSE;
+        fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
+        detach_stream(cdata);
+        return FALSE;
       }
-      
+
       priv->input_position+=8;
       priv->asf->hdr.create_time        = get_le64int(buffer);
-      
+
       if (read(priv->fd,buffer,8)<8) {
-	fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
-	detach_stream(cdata);
-	return FALSE;
+        fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
+        detach_stream(cdata);
+        return FALSE;
       }
-      
+
       priv->input_position+=8;
       priv->asf->nb_packets             = get_le64int(buffer);
 
@@ -1138,11 +1136,11 @@
 #endif
 
       if (read(priv->fd,buffer,8)<8) {
-	fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
-	detach_stream(cdata);
-	return FALSE;
+        fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
+        detach_stream(cdata);
+        return FALSE;
       }
-      
+
       priv->input_position+=8;
       priv->asf->hdr.play_time          = get_le64int(buffer);
 
@@ -1151,11 +1149,11 @@
 #endif
 
       if (read(priv->fd,buffer,8)<8) {
-	fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
-	detach_stream(cdata);
-	return FALSE;
+        fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
+        detach_stream(cdata);
+        return FALSE;
       }
-      
+
       priv->input_position+=8;
       // seems to be the duration
       priv->asf->hdr.send_time = get_le64int(buffer);
@@ -1165,11 +1163,11 @@
 #endif
 
       if (read(priv->fd,buffer,4)<4) {
-	fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
-	detach_stream(cdata);
-	return FALSE;
+        fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
+        detach_stream(cdata);
+        return FALSE;
       }
-     
+
       priv->input_position+=4;
       priv->asf->hdr.preroll            = get_le32int(buffer);
 
@@ -1178,47 +1176,47 @@
 #endif
 
       if (read(priv->fd,buffer,4)<4) {
-	fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
-	detach_stream(cdata);
-	return FALSE;
+        fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
+        detach_stream(cdata);
+        return FALSE;
       }
-      
+
       priv->input_position+=4;
       priv->asf->hdr.ignore             = get_le32int(buffer);
 
       if (read(priv->fd,buffer,4)<4) {
-	fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
-	detach_stream(cdata);
-	return FALSE;
+        fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
+        detach_stream(cdata);
+        return FALSE;
       }
-      
+
       priv->input_position+=4;
       priv->asf->hdr.flags              = get_le32int(buffer);
 
       if (read(priv->fd,buffer,4)<4) {
-	fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
-	detach_stream(cdata);
-	return FALSE;
+        fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
+        detach_stream(cdata);
+        return FALSE;
       }
-      
+
       priv->input_position+=4;
       priv->asf->hdr.min_pktsize        = get_le32int(buffer);
 
       if (read(priv->fd,buffer,4)<4) {
-	fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
-	detach_stream(cdata);
-	return FALSE;
+        fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
+        detach_stream(cdata);
+        return FALSE;
       }
-      
+
       priv->input_position+=4;
       priv->asf->hdr.max_pktsize        = get_le32int(buffer);
 
       if (read(priv->fd,buffer,4)<4) {
-	fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
-	detach_stream(cdata);
-	return FALSE;
+        fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
+        detach_stream(cdata);
+        return FALSE;
       }
-      
+
       priv->input_position+=4;
       priv->asf->hdr.max_bitrate        = get_le32int(buffer);
 
@@ -1241,9 +1239,9 @@
       priv->st = av_new_stream(priv->s, 0);
 
       if (!priv->st) {
-	fprintf(stderr, "asf_decoder: Unable to create new stream for %s\n",cdata->URI);
-	detach_stream(cdata);
-	return FALSE;
+        fprintf(stderr, "asf_decoder: Unable to create new stream for %s\n",cdata->URI);
+        detach_stream(cdata);
+        return FALSE;
       }
 
       av_set_pts_info(priv->st, 32, 1, 1000); /* 32 bit pts in ms */
@@ -1253,9 +1251,9 @@
       memset(priv->asf_st, 0, (sizeof(ASFStream)));
 
       if (!priv->asf_st) {
-	fprintf(stderr, "asf_decoder: Unable to create asf stream for %s\n",cdata->URI);
-	detach_stream(cdata);
-	return FALSE;
+        fprintf(stderr, "asf_decoder: Unable to create asf stream for %s\n",cdata->URI);
+        detach_stream(cdata);
+        return FALSE;
       }
 
       priv->st->priv_data = priv->asf_st;
@@ -1263,9 +1261,9 @@
 
       priv->asf_st->stream_language_index = 128; // invalid stream index means no language info
 
-      if(!(priv->asf->hdr.flags & 0x01)) { // if we aren't streaming...
-	priv->st->duration = priv->asf->hdr.play_time /
-	  (10000000 / 1000) - start_time;
+      if (!(priv->asf->hdr.flags & 0x01)) { // if we aren't streaming...
+        priv->st->duration = priv->asf->hdr.play_time /
+                             (10000000 / 1000) - start_time;
       }
 
       get_guid(priv->fd, &g);
@@ -1273,50 +1271,50 @@
 
       test_for_ext_stream_audio = 0;
       if (!guidcmp(&g, &lives_asf_audio_stream)) {
-	type = LIVES_MEDIA_TYPE_AUDIO;
+        type = LIVES_MEDIA_TYPE_AUDIO;
       } else if (!guidcmp(&g, &lives_asf_video_stream)) {
-	type = LIVES_MEDIA_TYPE_VIDEO;
+        type = LIVES_MEDIA_TYPE_VIDEO;
       } else if (!guidcmp(&g, &lives_asf_command_stream)) {
-	type = LIVES_MEDIA_TYPE_DATA;
+        type = LIVES_MEDIA_TYPE_DATA;
       } else if (!guidcmp(&g, &lives_asf_ext_stream_embed_stream_header)) {
-	test_for_ext_stream_audio = 1;
-	type = LIVES_MEDIA_TYPE_UNKNOWN;
+        test_for_ext_stream_audio = 1;
+        type = LIVES_MEDIA_TYPE_UNKNOWN;
       } else {
-	return -1;
+        return -1;
       }
 
       get_guid(priv->fd, &g);
       priv->input_position+=sizeof(lives_asf_guid);
 
       if (read(priv->fd,buffer,8)<8) {
-	fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
-	detach_stream(cdata);
-	return FALSE;
+        fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
+        detach_stream(cdata);
+        return FALSE;
       }
-      
+
       priv->input_position+=8;
 
       //      total_size = get_le64int(buffer);
 
       if (read(priv->fd,buffer,4)<4) {
-	fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
-	detach_stream(cdata);
-	return FALSE;
+        fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
+        detach_stream(cdata);
+        return FALSE;
       }
-      
+
       priv->input_position+=4;
 
       //type_specific_size = get_le32int(buffer);
-      
+
       lseek(priv->fd, 4, SEEK_CUR);
       priv->input_position+=4;
 
       if (read(priv->fd,buffer,2)<2) {
-	fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
-	detach_stream(cdata);
-	return FALSE;
+        fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
+        detach_stream(cdata);
+        return FALSE;
       }
-      
+
       priv->input_position+=2;
 
       priv->st->id = get_le16int(buffer) & 0x7f; /* stream id */
@@ -1327,146 +1325,144 @@
       priv->input_position+=4;
 
       if (test_for_ext_stream_audio) {
-	get_guid(priv->fd, &g);
-	priv->input_position+=sizeof(lives_asf_guid);
-	
-	if (!guidcmp(&g, &lives_asf_ext_stream_audio_stream)) {
-	  type = LIVES_MEDIA_TYPE_AUDIO;
-	  //is_dvr_ms_audio=1;
-	  get_guid(priv->fd, &g);
-	  priv->input_position+=sizeof(lives_asf_guid);
+        get_guid(priv->fd, &g);
+        priv->input_position+=sizeof(lives_asf_guid);
+
+        if (!guidcmp(&g, &lives_asf_ext_stream_audio_stream)) {
+          type = LIVES_MEDIA_TYPE_AUDIO;
+          //is_dvr_ms_audio=1;
+          get_guid(priv->fd, &g);
+          priv->input_position+=sizeof(lives_asf_guid);
 
-	  lseek(priv->fd, 12, SEEK_CUR);
-	  priv->input_position+=12;
+          lseek(priv->fd, 12, SEEK_CUR);
+          priv->input_position+=12;
 
-	  get_guid(priv->fd, &g);
-	  priv->input_position+=sizeof(lives_asf_guid);
+          get_guid(priv->fd, &g);
+          priv->input_position+=sizeof(lives_asf_guid);
 
-	  lseek(priv->fd, 4, SEEK_CUR);
-	  priv->input_position+=4;
-	}
+          lseek(priv->fd, 4, SEEK_CUR);
+          priv->input_position+=4;
+        }
       }
 
 
       if (type == LIVES_MEDIA_TYPE_AUDIO) {
-	priv->st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
+        priv->st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
 
       } else if (type == LIVES_MEDIA_TYPE_VIDEO) {
-	priv->st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
-	if (vidindex!=-1&&vidindex!=priv->st->id) {
-	  fprintf(stderr, "asf_decoder: unhandled multiple vidstreams %d and %d in %s\n",vidindex,priv->st->id,cdata->URI);
-	  got_vidst=TRUE;
-	  detach_stream(cdata);
-	  return FALSE;
-	}
-	else {
-	  vidst=priv->st;
-	  vidindex=vidst->id;
-	  priv->asf->stream_index=priv->asf->asfid2avid[vidindex];
-	}
-
-	lseek(priv->fd, 9, SEEK_CUR);
-	priv->input_position+=9;
-
-	if (read(priv->fd,buffer,2)<2) {
-	  fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
-	  detach_stream(cdata);
-	  return FALSE;
-	}
-      
-	priv->input_position+=2;
-
-	size = get_le16int(buffer); /* size */
-
-	if (read(priv->fd,buffer,4)<4) {
-	  fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
-	  detach_stream(cdata);
-	  return FALSE;
-	}
-      
-	priv->input_position+=4;
-	sizeX= get_le32int(buffer); /* size */
-
-	if (read(priv->fd,buffer,4)<4) {
-	  fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
-	  detach_stream(cdata);
-	  return FALSE;
-	}
-      
-	priv->input_position+=4;
-
-	if (!got_vidst) cdata->width = priv->st->codec->width = get_le32int(buffer);
-
-	if (read(priv->fd,buffer,4)<4) {
-	  fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
-	  detach_stream(cdata);
-	  return FALSE;
-	}
-      
-	priv->input_position+=4;
-	if (!got_vidst) cdata->height = priv->st->codec->height = get_le32int(buffer);
-
-	/* not available for asf */
-	lseek(priv->fd, 2, SEEK_CUR); // panes
-	priv->input_position+=2;
-
-
-	if (read(priv->fd,buffer,2)<2) {
-	  fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
-	  detach_stream(cdata);
-	  return FALSE;
-	}
-      
-	priv->input_position+=2;
-
-	if (!got_vidst) priv->st->codec->bits_per_coded_sample = get_le16int(buffer); /* depth */
-
-	if (read(priv->fd,buffer,4)<4) {
-	  fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
-	  detach_stream(cdata);
-	  return FALSE;
-	}
-      
-	priv->input_position+=4;
-	tag1 = get_le32int(buffer);
-
-	lseek(priv->fd, 20, SEEK_CUR);
-	priv->input_position+=20;
-
-	size= sizeX;
-
-	if (size > 40) {
-	  if (!got_vidst) {
-	    priv->st->codec->extradata_size = size - 40;
-
-	    priv->st->codec->extradata = malloc(priv->st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
-	    memset(priv->st->codec->extradata, 0, priv->st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
-
-	    if (read(priv->fd,priv->st->codec->extradata,
-		     priv->st->codec->extradata_size)<priv->st->codec->extradata_size) {
-	      fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
-	      detach_stream(cdata);
-	      return FALSE;
-	    }
-	  }
-	  else lseek(priv->fd,size - 40, SEEK_CUR);
-	  priv->input_position+=priv->st->codec->extradata_size;
-
-	}
+        priv->st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
+        if (vidindex!=-1&&vidindex!=priv->st->id) {
+          fprintf(stderr, "asf_decoder: unhandled multiple vidstreams %d and %d in %s\n",vidindex,priv->st->id,cdata->URI);
+          got_vidst=TRUE;
+          detach_stream(cdata);
+          return FALSE;
+        } else {
+          vidst=priv->st;
+          vidindex=vidst->id;
+          priv->asf->stream_index=priv->asf->asfid2avid[vidindex];
+        }
+
+        lseek(priv->fd, 9, SEEK_CUR);
+        priv->input_position+=9;
+
+        if (read(priv->fd,buffer,2)<2) {
+          fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
+          detach_stream(cdata);
+          return FALSE;
+        }
+
+        priv->input_position+=2;
+
+        size = get_le16int(buffer); /* size */
+
+        if (read(priv->fd,buffer,4)<4) {
+          fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
+          detach_stream(cdata);
+          return FALSE;
+        }
+
+        priv->input_position+=4;
+        sizeX= get_le32int(buffer); /* size */
+
+        if (read(priv->fd,buffer,4)<4) {
+          fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
+          detach_stream(cdata);
+          return FALSE;
+        }
+
+        priv->input_position+=4;
+
+        if (!got_vidst) cdata->width = priv->st->codec->width = get_le32int(buffer);
+
+        if (read(priv->fd,buffer,4)<4) {
+          fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
+          detach_stream(cdata);
+          return FALSE;
+        }
+
+        priv->input_position+=4;
+        if (!got_vidst) cdata->height = priv->st->codec->height = get_le32int(buffer);
+
+        /* not available for asf */
+        lseek(priv->fd, 2, SEEK_CUR); // panes
+        priv->input_position+=2;
+
+
+        if (read(priv->fd,buffer,2)<2) {
+          fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
+          detach_stream(cdata);
+          return FALSE;
+        }
+
+        priv->input_position+=2;
+
+        if (!got_vidst) priv->st->codec->bits_per_coded_sample = get_le16int(buffer); /* depth */
+
+        if (read(priv->fd,buffer,4)<4) {
+          fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
+          detach_stream(cdata);
+          return FALSE;
+        }
+
+        priv->input_position+=4;
+        tag1 = get_le32int(buffer);
+
+        lseek(priv->fd, 20, SEEK_CUR);
+        priv->input_position+=20;
+
+        size= sizeX;
+
+        if (size > 40) {
+          if (!got_vidst) {
+            priv->st->codec->extradata_size = size - 40;
+
+            priv->st->codec->extradata = malloc(priv->st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
+            memset(priv->st->codec->extradata, 0, priv->st->codec->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
+
+            if (read(priv->fd,priv->st->codec->extradata,
+                     priv->st->codec->extradata_size)<priv->st->codec->extradata_size) {
+              fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
+              detach_stream(cdata);
+              return FALSE;
+            }
+          } else lseek(priv->fd,size - 40, SEEK_CUR);
+          priv->input_position+=priv->st->codec->extradata_size;
+
+        }
 
         /* Extract palette from extradata if bpp <= 8 */
         /* This code assumes that extradata contains only palette */
         /* This is true for all paletted codecs implemented in ffmpeg */
 
-	if (!got_vidst) {
-	  if (priv->st->codec->extradata_size && (priv->st->codec->bits_per_coded_sample <= 8)) {
+        if (!got_vidst) {
+          if (priv->st->codec->extradata_size && (priv->st->codec->bits_per_coded_sample <= 8)) {
 
 
 #if !defined (IS_MINGW) && !defined (IS_SOLARIS) && !defined (__FreeBSD__)
 # if __BYTE_ORDER == __BIG_ENDIAN
             int i;
             for (i = 0; i < FFMIN(priv->st->codec->extradata_size, AVPALETTE_SIZE)/4; i++)
-                priv->asf_st->palette[i] = av_bswap32(((uint32_t*)priv->st->codec->extradata)[i]);
+              priv->asf_st->palette[i] = av_bswap32(((uint32_t *)priv->st->codec->extradata)[i]);
 #else
             memcpy(priv->asf_st->palette, priv->st->codec->extradata,
                    FFMIN(priv->st->codec->extradata_size, AVPALETTE_SIZE));
@@ -1477,14 +1473,14 @@
 #endif
 
             priv->asf_st->palette_changed = 1;
-        }
+          }
 
-	  priv->st->codec->codec_tag = tag1;
-	  priv->st->codec->codec_id = ff_codec_get_id((const AVCodecTag*)(codec_bmp_tags), tag1);
+          priv->st->codec->codec_tag = tag1;
+          priv->st->codec->codec_id = ff_codec_get_id((const AVCodecTag *)(codec_bmp_tags), tag1);
 
-	  if(tag1 == MK_FOURCC('D', 'V', 'R', ' '))
-	    priv->st->need_parsing = AVSTREAM_PARSE_FULL;
-	}
+          if (tag1 == MK_FOURCC('D', 'V', 'R', ' '))
+            priv->st->need_parsing = AVSTREAM_PARSE_FULL;
+        }
       }
 
       pos2 = priv->input_position;
@@ -1497,58 +1493,58 @@
       int len1, len2, len3, len4, len5;
 
       if (read(priv->fd,buffer,2)<2) {
-	fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
-	detach_stream(cdata);
-	return FALSE;
+        fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
+        detach_stream(cdata);
+        return FALSE;
       }
-    
+
       priv->input_position+=2;
 
       len1 = get_le16int(buffer);
 
       if (read(priv->fd,buffer,2)<2) {
-	fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
-	detach_stream(cdata);
-	return FALSE;
+        fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
+        detach_stream(cdata);
+        return FALSE;
       }
-      
+
       priv->input_position+=2;
 
       len2 = get_le16int(buffer);
 
       if (read(priv->fd,buffer,2)<2) {
-	fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
-	detach_stream(cdata);
-	return FALSE;
+        fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
+        detach_stream(cdata);
+        return FALSE;
       }
-      
+
       priv->input_position+=2;
 
       len3 = get_le16int(buffer);
       if (read(priv->fd,buffer,2)<2) {
-	fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
-	detach_stream(cdata);
-	return FALSE;
+        fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
+        detach_stream(cdata);
+        return FALSE;
       }
-      
+
       priv->input_position+=2;
 
       len4 = get_le16int(buffer);
 
       if (read(priv->fd,buffer,2)<2) {
-	fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
-	detach_stream(cdata);
-	return FALSE;
+        fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
+        detach_stream(cdata);
+        return FALSE;
       }
-    
+
       priv->input_position+=2;
 
       len5 = get_le16int(buffer);
 
       /*    get_tag(s, "title"    , 0, len1);
-	    get_tag(s, "author"   , 0, len2);
-	    get_tag(s, "copyright", 0, len3);
-	    get_tag(s, "comment"  , 0, len4); */
+      get_tag(s, "author"   , 0, len2);
+      get_tag(s, "copyright", 0, len3);
+      get_tag(s, "comment"  , 0, len4); */
 
       lseek(priv->fd, len1+len2+len3+len4+len5, SEEK_CUR);
       priv->input_position+=len1+len2+len3+len4+len5;
@@ -1562,227 +1558,227 @@
       int j;
 
       if (read(priv->fd,buffer,2)<2) {
-	fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
-	detach_stream(cdata);
-	return FALSE;
+        fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
+        detach_stream(cdata);
+        return FALSE;
       }
-    
+
       priv->input_position+=2;
 
       stream_count = get_le16int(buffer);
 
-      for(j = 0; j < stream_count; j++) {
-	int flags, bitrate, stream_id;
-
-	if (read(priv->fd,buffer,2)<2) {
-	  fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
-	  detach_stream(cdata);
-	  return FALSE;
-	}
-    
-	priv->input_position+=2;
-
-	flags = get_le16int(buffer);
-
-	if (read(priv->fd,buffer,4)<4) {
-	  fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
-	  detach_stream(cdata);
-	  return FALSE;
-	}
-	
-	priv->input_position+=4;
-	bitrate= get_le32int(buffer);
-	stream_id= (flags & 0x7f);
-	priv->asf->stream_bitrates[stream_id]= bitrate;
+      for (j = 0; j < stream_count; j++) {
+        int flags, bitrate, stream_id;
+
+        if (read(priv->fd,buffer,2)<2) {
+          fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
+          detach_stream(cdata);
+          return FALSE;
+        }
+
+        priv->input_position+=2;
+
+        flags = get_le16int(buffer);
+
+        if (read(priv->fd,buffer,4)<4) {
+          fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
+          detach_stream(cdata);
+          return FALSE;
+        }
+
+        priv->input_position+=4;
+        bitrate= get_le32int(buffer);
+        stream_id= (flags & 0x7f);
+        priv->asf->stream_bitrates[stream_id]= bitrate;
       }
     } else if (!guidcmp(&g, &lives_asf_language_guid)) {
       int j;
       int stream_count = get_le16int(buffer);
-      for(j = 0; j < stream_count; j++) {
-	char lang[6];
-	unsigned int lang_len;
-
-	if (read(priv->fd,buffer,1)<1) {
-	  fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
-	  detach_stream(cdata);
-	  return FALSE;
-	}
-	
-	priv->input_position+=1;
-
-	lang_len = buffer[0];
-
-	if (read(priv->fd,buffer,lang_len)<lang_len) {
-	  fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
-	  detach_stream(cdata);
-	  return FALSE;
-	}
-	
-	get_str16_nolen(buffer, lang_len, lang, sizeof(lang));
-	priv->input_position+=lang_len;
-
-	if (j < 128)
-	  av_strlcpy(priv->asf->stream_languages[j], lang, sizeof(*priv->asf->stream_languages));
+      for (j = 0; j < stream_count; j++) {
+        char lang[6];
+        unsigned int lang_len;
+
+        if (read(priv->fd,buffer,1)<1) {
+          fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
+          detach_stream(cdata);
+          return FALSE;
+        }
+
+        priv->input_position+=1;
+
+        lang_len = buffer[0];
+
+        if (read(priv->fd,buffer,lang_len)<lang_len) {
+          fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
+          detach_stream(cdata);
+          return FALSE;
+        }
+
+        get_str16_nolen(buffer, lang_len, lang, sizeof(lang));
+        priv->input_position+=lang_len;
+
+        if (j < 128)
+          av_strlcpy(priv->asf->stream_languages[j], lang, sizeof(*priv->asf->stream_languages));
       }
     } else if (!guidcmp(&g, &lives_asf_extended_content_header)) {
       int desc_count, i;
 
       if (read(priv->fd,buffer,2)<2) {
-	fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
-	detach_stream(cdata);
-	return FALSE;
+        fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
+        detach_stream(cdata);
+        return FALSE;
       }
-    
+
       priv->input_position+=2;
 
       desc_count = get_le16int(buffer);
 
-      for(i=0;i<desc_count;i++) {
-	int name_len,value_type,value_len;
-	char name[1024];
-	
-	if (read(priv->fd,buffer,2)<2) {
-	  fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
-	  detach_stream(cdata);
-	  return FALSE;
-	}
-    
-	priv->input_position+=2;
-	
-	name_len = get_le16int(buffer);
-
-	if (name_len%2)     // must be even, broken lavf versions wrote len-1
-	  name_len += 1;
-
-	if (read(priv->fd,buffer,name_len)<name_len) {
-	  fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
-	  detach_stream(cdata);
-	  return FALSE;
-	}
-
-	get_str16_nolen(buffer, name_len, name, sizeof(name));
-
-	priv->input_position+=name_len;
-
-	if (read(priv->fd,buffer,2)<2) {
-	  fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
-	  detach_stream(cdata);
-	  return FALSE;
-	}
-    
-	priv->input_position+=2;
-
-	value_type = get_le16int(buffer);
-
-	if (read(priv->fd,buffer,2)<2) {
-	  fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
-	  detach_stream(cdata);
-	  return FALSE;
-	}
-    
-	priv->input_position+=2;
-
-	value_len  = get_le16int(buffer);
-	if (!value_type && value_len%2)
-	  value_len += 1;
-	if (!get_tag(cdata, priv->s, name, value_type, value_len)) return FALSE;
-      }
-  
+      for (i=0; i<desc_count; i++) {
+        int name_len,value_type,value_len;
+        char name[1024];
+
+        if (read(priv->fd,buffer,2)<2) {
+          fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
+          detach_stream(cdata);
+          return FALSE;
+        }
+
+        priv->input_position+=2;
+
+        name_len = get_le16int(buffer);
+
+        if (name_len%2)     // must be even, broken lavf versions wrote len-1
+          name_len += 1;
+
+        if (read(priv->fd,buffer,name_len)<name_len) {
+          fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
+          detach_stream(cdata);
+          return FALSE;
+        }
+
+        get_str16_nolen(buffer, name_len, name, sizeof(name));
+
+        priv->input_position+=name_len;
+
+        if (read(priv->fd,buffer,2)<2) {
+          fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
+          detach_stream(cdata);
+          return FALSE;
+        }
+
+        priv->input_position+=2;
+
+        value_type = get_le16int(buffer);
+
+        if (read(priv->fd,buffer,2)<2) {
+          fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
+          detach_stream(cdata);
+          return FALSE;
+        }
+
+        priv->input_position+=2;
+
+        value_len  = get_le16int(buffer);
+        if (!value_type && value_len%2)
+          value_len += 1;
+        if (!get_tag(cdata, priv->s, name, value_type, value_len)) return FALSE;
+      }
+
     } else if (!guidcmp(&g, &lives_asf_metadata_header)) {
       int n, stream_num, name_len, value_len, value_num;
 
       if (read(priv->fd,buffer,2)<2) {
-	fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
-	detach_stream(cdata);
-	return FALSE;
+        fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
+        detach_stream(cdata);
+        return FALSE;
       }
-      
+
       priv->input_position+=2;
-	
+
       n = get_le16int(buffer);
-	
-      for(i=0;i<n;i++) {
-	char name[1024];
-
-	lseek(priv->fd, 2, SEEK_CUR); // lang_list_index
-	priv->input_position+=2;
-	  
-	if (read(priv->fd,buffer,2)<2) {
-	  fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
-	  detach_stream(cdata);
-	  return FALSE;
-	}
-	  
-	priv->input_position+=2;
-
-	stream_num= get_le16int(buffer);
-
-	if (read(priv->fd,buffer,2)<2) {
-	  fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
-	  detach_stream(cdata);
-	  return FALSE;
-	}
-    
-	priv->input_position+=2;
-
-	name_len=   get_le16int(buffer);
-
-	if (read(priv->fd,buffer,2)<2) {
-	  fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
-	  detach_stream(cdata);
-	  return FALSE;
-	}
-	  
-	priv->input_position+=2;
-	
-	//value_type= get_le16int(buffer);
-
-	if (read(priv->fd,buffer,4)<4) {
-	  fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
-	  detach_stream(cdata);
-	  return FALSE;
-	}
-	  
-	priv->input_position+=4;
-
-	value_len=  get_le32int(buffer);
-
-	if (read(priv->fd,buffer,name_len)<name_len) {
-	  fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
-	  detach_stream(cdata);
-	  return FALSE;
-	}
-
-	get_str16_nolen(buffer, name_len, name, sizeof(name));
-
-	priv->input_position+=name_len;
-
-	if (read(priv->fd,buffer,2)<2) {
-	  fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
-	  detach_stream(cdata);
-	  return FALSE;
-	}
-	  
-	priv->input_position+=2;
-	  
-	value_num= get_le16int(buffer);
-
-	// check this
-	priv->input_position+=value_len-2;
-	lseek(priv->fd, value_len+2, SEEK_CUR);
-
-
-	if(stream_num<128){
-	  if     (!strcmp(name, "AspectRatioX")) dar[stream_num].num= 
-						   value_num;
-	  else if(!strcmp(name, "AspectRatioY")) dar[stream_num].den= 
-						   value_num;
-
-	  // i think PAR == 1/DAR (gf)
-	  if (cdata->par==1.&&dar[stream_num].num!=0&&dar[stream_num].den!=0) 
-	    cdata->par=(float)dar[stream_num].den/(float)dar[stream_num].num;
-
-	}
+
+      for (i=0; i<n; i++) {
+        char name[1024];
+
+        lseek(priv->fd, 2, SEEK_CUR); // lang_list_index
+        priv->input_position+=2;
+
+        if (read(priv->fd,buffer,2)<2) {
+          fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
+          detach_stream(cdata);
+          return FALSE;
+        }
+
+        priv->input_position+=2;
+
+        stream_num= get_le16int(buffer);
+
+        if (read(priv->fd,buffer,2)<2) {
+          fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
+          detach_stream(cdata);
+          return FALSE;
+        }
+
+        priv->input_position+=2;
+
+        name_len=   get_le16int(buffer);
+
+        if (read(priv->fd,buffer,2)<2) {
+          fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
+          detach_stream(cdata);
+          return FALSE;
+        }
+
+        priv->input_position+=2;
+
+        //value_type= get_le16int(buffer);
+
+        if (read(priv->fd,buffer,4)<4) {
+          fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
+          detach_stream(cdata);
+          return FALSE;
+        }
+
+        priv->input_position+=4;
+
+        value_len=  get_le32int(buffer);
+
+        if (read(priv->fd,buffer,name_len)<name_len) {
+          fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
+          detach_stream(cdata);
+          return FALSE;
+        }
+
+        get_str16_nolen(buffer, name_len, name, sizeof(name));
+
+        priv->input_position+=name_len;
+
+        if (read(priv->fd,buffer,2)<2) {
+          fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
+          detach_stream(cdata);
+          return FALSE;
+        }
+
+        priv->input_position+=2;
+
+        value_num= get_le16int(buffer);
+
+        // check this
+        priv->input_position+=value_len-2;
+        lseek(priv->fd, value_len+2, SEEK_CUR);
+
+
+        if (stream_num<128) {
+          if (!strcmp(name, "AspectRatioX")) dar[stream_num].num=
+              value_num;
+          else if (!strcmp(name, "AspectRatioY")) dar[stream_num].den=
+              value_num;
+
+          // i think PAR == 1/DAR (gf)
+          if (cdata->par==1.&&dar[stream_num].num!=0&&dar[stream_num].den!=0)
+            cdata->par=(float)dar[stream_num].den/(float)dar[stream_num].num;
+
+        }
       }
     } else if (!guidcmp(&g, &lives_asf_ext_stream_header)) {
       int ext_len, payload_ext_ct, stream_ct;
@@ -1793,72 +1789,72 @@
       priv->input_position+=16;
 
       if (read(priv->fd,buffer,4)<4) {
-	fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
-	detach_stream(cdata);
-	return FALSE;
+        fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
+        detach_stream(cdata);
+        return FALSE;
       }
-	    
+
       priv->input_position+=4;
 
       leak_rate = get_le32int(buffer); // leak-datarate
 
       /*            get_le32int(buffer); // bucket-datasize
-		    get_le32int(buffer); // init-bucket-fullness
-		    get_le32int(buffer); // alt-leak-datarate
-		    get_le32int(buffer); // alt-bucket-datasize
-		    get_le32int(buffer); // alt-init-bucket-fullness
-		    get_le32int(buffer); // max-object-size
+        get_le32int(buffer); // init-bucket-fullness
+        get_le32int(buffer); // alt-leak-datarate
+        get_le32int(buffer); // alt-bucket-datasize
+        get_le32int(buffer); // alt-init-bucket-fullness
+        get_le32int(buffer); // max-object-size
       */
 
       lseek(priv->fd, 20, SEEK_CUR);
       priv->input_position+=20;
 
       if (read(priv->fd,buffer,4)<4) {
-	fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
-	detach_stream(cdata);
-	return FALSE;
+        fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
+        detach_stream(cdata);
+        return FALSE;
       }
-	    
+
       priv->input_position+=4;
 
       flags = get_le32int(buffer); // flags (reliable,seekable,no_cleanpoints?,resend-live-cleanpoints, rest of bits reserved)
 
       if (!(flags&0x02)) {
 #ifndef RELEASE
-	fprintf(stderr, "asf_decoder: NON-SEEKABLE FILE, falling back to default open.\n");
+        fprintf(stderr, "asf_decoder: NON-SEEKABLE FILE, falling back to default open.\n");
 #endif
-	detach_stream(cdata);
-	return FALSE;
+        detach_stream(cdata);
+        return FALSE;
       }
 
       if (read(priv->fd,buffer,2)<2) {
-	fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
-	detach_stream(cdata);
-	return FALSE;
+        fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
+        detach_stream(cdata);
+        return FALSE;
       }
-	    
+
       priv->input_position+=2;
 
       stream_num = get_le16int(buffer); // stream-num
 
       if (read(priv->fd,buffer,2)<2) {
-	fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
-	detach_stream(cdata);
-	return FALSE;
+        fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
+        detach_stream(cdata);
+        return FALSE;
       }
-	    
+
       priv->input_position+=2;
 
       stream_languageid_index = get_le16int(buffer); // stream-language-id-index
       if (stream_num < 128)
-	priv->asf->streams[stream_num].stream_language_index = stream_languageid_index;
-	    
+        priv->asf->streams[stream_num].stream_language_index = stream_languageid_index;
+
       if (read(priv->fd,buffer,8)<8) {
-	fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
-	detach_stream(cdata);
-	return FALSE;
+        fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
+        detach_stream(cdata);
+        return FALSE;
       }
-	    
+
       priv->input_position+=8;
 
       ftime = get_le64int(buffer); // avg frametime in 100ns units
@@ -1866,68 +1862,68 @@
       if (cdata->fps==0.) cdata->fps = (double)100000000./(double)ftime;
 
       if (read(priv->fd,buffer,2)<2) {
-	fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
-	detach_stream(cdata);
-	return FALSE;
+        fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
+        detach_stream(cdata);
+        return FALSE;
       }
-	    
+
       priv->input_position+=2;
       stream_ct = get_le16int(buffer); //stream-name-count
 
       if (read(priv->fd,buffer,2)<2) {
-	fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
-	detach_stream(cdata);
-	return FALSE;
+        fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
+        detach_stream(cdata);
+        return FALSE;
       }
-	    
+
       priv->input_position+=2;
       payload_ext_ct = get_le16int(buffer); //payload-extension-system-count
 
       if (stream_num < 128)
-	bitrate[stream_num] = leak_rate;
-
-      for (i=0; i<stream_ct; i++){
-	lseek(priv->fd, 2, SEEK_CUR);
-	priv->input_position+=2;
-
-	if (read(priv->fd,buffer,2)<2) {
-	  fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
-	  detach_stream(cdata);
-	  return FALSE;
-	}
-    
-	priv->input_position+=2;
-	ext_len = get_le16int(buffer);
-
-	lseek(priv->fd, ext_len, SEEK_CUR);
-	priv->input_position+=ext_len;
-      }
-
-      for (i=0; i<payload_ext_ct; i++){
-	get_guid(priv->fd, &g);
-	priv->input_position+=sizeof(lives_asf_guid);
-
-	if (read(priv->fd,buffer,2)<2) {
-	  fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
-	  detach_stream(cdata);
-	  return FALSE;
-	}
-	      
-	priv->input_position+=2;
-	      
-	//ext_d=get_le16int(buffer);
-	      
-	if (read(priv->fd,buffer,4)<4) {
-	  fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
-	  detach_stream(cdata);
-	  return FALSE;
-	}
-	      
-	priv->input_position+=4;
-	      
-	ext_len=get_le32int(buffer);
-	      
-	lseek(priv->fd, ext_len, SEEK_CUR);
+        bitrate[stream_num] = leak_rate;
+
+      for (i=0; i<stream_ct; i++) {
+        lseek(priv->fd, 2, SEEK_CUR);
+        priv->input_position+=2;
+
+        if (read(priv->fd,buffer,2)<2) {
+          fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
+          detach_stream(cdata);
+          return FALSE;
+        }
+
+        priv->input_position+=2;
+        ext_len = get_le16int(buffer);
+
+        lseek(priv->fd, ext_len, SEEK_CUR);
+        priv->input_position+=ext_len;
+      }
+
+      for (i=0; i<payload_ext_ct; i++) {
+        get_guid(priv->fd, &g);
+        priv->input_position+=sizeof(lives_asf_guid);
+
+        if (read(priv->fd,buffer,2)<2) {
+          fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
+          detach_stream(cdata);
+          return FALSE;
+        }
+
+        priv->input_position+=2;
+
+        //ext_d=get_le16int(buffer);
+
+        if (read(priv->fd,buffer,4)<4) {
+          fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
+          detach_stream(cdata);
+          return FALSE;
+        }
+
+        priv->input_position+=4;
+
+        ext_len=get_le32int(buffer);
+
+        lseek(priv->fd, ext_len, SEEK_CUR);
       }
 
       // there could be a optional stream properties object to follow
@@ -1951,11 +1947,11 @@
       priv->input_position+=16;
 
       if (read(priv->fd,buffer,4)<4) {
-	fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
-	detach_stream(cdata);
-	return FALSE;
+        fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
+        detach_stream(cdata);
+        return FALSE;
       }
-      
+
       priv->input_position+=4;
 
       cdata->nclips = count = get_le32int(buffer);    // markers count
@@ -1964,56 +1960,56 @@
       priv->input_position+=2;
 
       if (read(priv->fd,buffer,2)<2) {
-	fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
-	detach_stream(cdata);
-	return FALSE;
+        fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
+        detach_stream(cdata);
+        return FALSE;
       }
-    
+
       priv->input_position+=2;
-      
+
       name_len = get_le16int(buffer); // name length
       lseek(priv->fd, name_len, SEEK_CUR);
       priv->input_position+=name_len;
 
-      for(i=0;i<count;i++){
-	//	int64_t pres_time;
-	int name_len;
-	
-	lseek(priv->fd, 8, SEEK_CUR);
-	priv->input_position+=8;
-
-	if (read(priv->fd,buffer,8)<8) {
-	  fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
-	  detach_stream(cdata);
-	  return FALSE;
-	}
-    
-	priv->input_position+=8;
-
-	//pres_time = get_le64int(buffer); // presentation time
-	
-	lseek(priv->fd, 10, SEEK_CUR);
-	priv->input_position+=10;
-
-	if (read(priv->fd,buffer,4)<4) {
-	  fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
-	  detach_stream(cdata);
-	  return FALSE;
-	}
-    
-	priv->input_position+=4;
-	
-	name_len = get_le32int(buffer);  // name length
-
-	if (read(priv->fd,buffer,name_len)<name_len) {
-	  fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
-	  detach_stream(cdata);
-	  return FALSE;
-	}
-
-	get_str16_nolen(buffer, name_len * 2, name, sizeof(name));
-	//ff_new_chapter(s, i, (AVRational){1, 10000000}, pres_time, AV_NOPTS_VALUE, name );
-	priv->input_position+=name_len;
+      for (i=0; i<count; i++) {
+        //	int64_t pres_time;
+        int name_len;
+
+        lseek(priv->fd, 8, SEEK_CUR);
+        priv->input_position+=8;
+
+        if (read(priv->fd,buffer,8)<8) {
+          fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
+          detach_stream(cdata);
+          return FALSE;
+        }
+
+        priv->input_position+=8;
+
+        //pres_time = get_le64int(buffer); // presentation time
+
+        lseek(priv->fd, 10, SEEK_CUR);
+        priv->input_position+=10;
+
+        if (read(priv->fd,buffer,4)<4) {
+          fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
+          detach_stream(cdata);
+          return FALSE;
+        }
+
+        priv->input_position+=4;
+
+        name_len = get_le32int(buffer);  // name length
+
+        if (read(priv->fd,buffer,name_len)<name_len) {
+          fprintf(stderr, "asf_decoder: read error in %s\n",cdata->URI);
+          detach_stream(cdata);
+          return FALSE;
+        }
+
+        get_str16_nolen(buffer, name_len * 2, name, sizeof(name));
+        //ff_new_chapter(s, i, (AVRational){1, 10000000}, pres_time, AV_NOPTS_VALUE, name );
+        priv->input_position+=name_len;
       }
 
 
@@ -2023,25 +2019,25 @@
       return FALSE;
     } else {
       if (!priv->s->keylen) {
-	if (!guidcmp(&g, &lives_asf_content_encryption)||
-	    !guidcmp(&g, &lives_asf_ext_content_encryption) ||
-	    !guidcmp(&g, &lives_asf_digital_signature)) {
-	  fprintf(stderr, "asf_decoder: encrypted/signed content in %s\n",cdata->URI);
-	  detach_stream(cdata);
-	  return FALSE;
-	}
+        if (!guidcmp(&g, &lives_asf_content_encryption)||
+            !guidcmp(&g, &lives_asf_ext_content_encryption) ||
+            !guidcmp(&g, &lives_asf_digital_signature)) {
+          fprintf(stderr, "asf_decoder: encrypted/signed content in %s\n",cdata->URI);
+          detach_stream(cdata);
+          return FALSE;
+        }
       }
     }
 
     lseek(priv->fd, gpos + gsize, SEEK_SET);
-    if(priv->input_position != gpos + gsize)
+    if (priv->input_position != gpos + gsize)
 #ifdef DEBUG
       fprintf(stderr, "gpos mismatch our pos=%"PRIu64", end=%"PRIu64"\n", priv->input_position-gpos, gsize);
 #endif
     priv->input_position=gpos+gsize;
   } // end for
 
-  
+
   if (vidindex==-1) {
     fprintf(stderr, "asf_decoder: no video stream found in %s\n",cdata->URI);
     detach_stream(cdata);
@@ -2063,28 +2059,28 @@
   priv->data_start = priv->input_position;
   priv->asf->packet_size_left = 0;
 
-  for(i=0; i<128; i++){
+  for (i=0; i<128; i++) {
     int stream_num= priv->asf->asfid2avid[i];
-    if(stream_num>=0){
+    if (stream_num>=0) {
       AVStream *st = priv->s->streams[stream_num];
       if (!st||!priv->st->codec) continue;
       if (!priv->st->codec->bit_rate)
-	priv->st->codec->bit_rate = bitrate[i];
+        priv->st->codec->bit_rate = bitrate[i];
       if (dar[i].num > 0 && dar[i].den > 0)
-	av_reduce(&priv->st->sample_aspect_ratio.num,
-		  &priv->st->sample_aspect_ratio.den,
-		  dar[i].num, dar[i].den, INT_MAX);
-      
+        av_reduce(&priv->st->sample_aspect_ratio.num,
+                  &priv->st->sample_aspect_ratio.den,
+                  dar[i].num, dar[i].den, INT_MAX);
+
       // copy and convert language codes to the frontend
       /*      if (priv->asf->streams[i].stream_language_index < 128) {
-	      const char *rfc1766 = priv->asf->stream_languages[priv->asf->streams[i].stream_language_index];
-	      if (rfc1766 && strlen(rfc1766) > 1) {
-	      const char primary_tag[3] = { rfc1766[0], rfc1766[1], '\0' }; // ignore country code if any
-	      const char *iso6392 = av_convert_lang_to(primary_tag, AV_LANG_ISO639_2_BIBL);
-	      if (iso6392)
-	      av_dict_set(&priv->stmetadata, "language", iso6392, 0);
-	      }
-	      }*/
+        const char *rfc1766 = priv->asf->stream_languages[priv->asf->streams[i].stream_language_index];
+        if (rfc1766 && strlen(rfc1766) > 1) {
+        const char primary_tag[3] = { rfc1766[0], rfc1766[1], '\0' }; // ignore country code if any
+        const char *iso6392 = av_convert_lang_to(primary_tag, AV_LANG_ISO639_2_BIBL);
+        if (iso6392)
+        av_dict_set(&priv->stmetadata, "language", iso6392, 0);
+        }
+        }*/
     }
   }
 
@@ -2109,37 +2105,47 @@
     return TRUE;
   }
 
-  switch(vidst->codec->codec_id) {
+  switch (vidst->codec->codec_id) {
   case CODEC_ID_WMV1:
-    snprintf(cdata->video_name,16,"wmv1"); break;
+    snprintf(cdata->video_name,16,"wmv1");
+    break;
   case CODEC_ID_WMV2:
-    snprintf(cdata->video_name,16,"wmv2"); break;
+    snprintf(cdata->video_name,16,"wmv2");
+    break;
   case CODEC_ID_WMV3:
-    snprintf(cdata->video_name,16,"wmv3"); break;
+    snprintf(cdata->video_name,16,"wmv3");
+    break;
   case CODEC_ID_DVVIDEO:
-    snprintf(cdata->video_name,16,"dv"); break;
+    snprintf(cdata->video_name,16,"dv");
+    break;
   case CODEC_ID_MPEG4:
-    snprintf(cdata->video_name,16,"mpeg4"); break;
+    snprintf(cdata->video_name,16,"mpeg4");
+    break;
   case CODEC_ID_H264:
-    snprintf(cdata->video_name,16,"h264"); break;
+    snprintf(cdata->video_name,16,"h264");
+    break;
   case CODEC_ID_MPEG1VIDEO:
-    snprintf(cdata->video_name,16,"mpeg1"); break;
+    snprintf(cdata->video_name,16,"mpeg1");
+    break;
   case CODEC_ID_MPEG2VIDEO:
-    snprintf(cdata->video_name,16,"mpeg2"); break;
+    snprintf(cdata->video_name,16,"mpeg2");
+    break;
   default:
-    snprintf(cdata->video_name,16,"unknown"); break;
-    fprintf(stderr,"add video format %d\n",vidst->codec->codec_id); break;
+    snprintf(cdata->video_name,16,"unknown");
+    break;
+    fprintf(stderr,"add video format %d\n",vidst->codec->codec_id);
+    break;
   }
 
 
 #ifdef DEBUG
   fprintf(stderr,"video type is %s %d x %d (%d x %d +%d +%d)\n",cdata->video_name,
-	  cdata->width,cdata->height,cdata->frame_width,cdata->frame_height,cdata->offs_x,cdata->offs_y);
+          cdata->width,cdata->height,cdata->frame_width,cdata->frame_height,cdata->offs_x,cdata->offs_y);
 #endif
 
 
   if (!vidst->codec) {
-    if (strlen(cdata->video_name)>0) 
+    if (strlen(cdata->video_name)>0)
       fprintf(stderr, "asf_decoder: Could not find avcodec codec for video type %s\n",cdata->video_name);
     detach_stream(cdata);
     return FALSE;
@@ -2172,7 +2178,7 @@
       return FALSE; // eof
     }
   } while (retval<0);
-  
+
   if (priv->asf->packet_time_delta!=0) {
     fprintf(stderr, "asf_decoder: packet time delta of (%d) not understood\n",priv->asf->packet_time_delta);
     detach_stream(cdata);
@@ -2180,9 +2186,9 @@
   }
 
 #if LIBAVCODEC_VERSION_MAJOR >= 52
-  len=avcodec_decode_video2(vidst->codec, priv->picture, &got_picture, &priv->avpkt );
-#else 
-  len=avcodec_decode_video(vidst->codec, priv->picture, &got_picture, priv->avpkt.data, priv->avpkt.size );
+  len=avcodec_decode_video2(vidst->codec, priv->picture, &got_picture, &priv->avpkt);
+#else
+  len=avcodec_decode_video(vidst->codec, priv->picture, &got_picture, priv->avpkt.data, priv->avpkt.size);
 #endif
   priv->avpkt.size-=len;
 
@@ -2206,7 +2212,7 @@
   //#define DEBUG
 #ifdef DEBUG
   printf("first pts is %ld\n",pts);
-#endif  
+#endif
 
   if (pts==AV_NOPTS_VALUE) {
     fprintf(stderr, "asf_decoder: No timestamps for frames, not decoding.\n");
@@ -2218,32 +2224,32 @@
   do {
     free(priv->avpkt.data);
     retval = get_next_video_packet(cdata,-1,-1);
-      
+
     // try to get dts of second frame
     if (retval!=-2) { // eof
       if (retval==0) {
 
-	if (priv->frame_dts==AV_NOPTS_VALUE) {
-	  fprintf(stderr, "asf_decoder: No timestamp for second frame, aborting.\n");
-	  detach_stream(cdata);
-	  return FALSE;
-	}
+        if (priv->frame_dts==AV_NOPTS_VALUE) {
+          fprintf(stderr, "asf_decoder: No timestamp for second frame, aborting.\n");
+          detach_stream(cdata);
+          return FALSE;
+        }
 
-	if (priv->asf->packet_time_delta!=0) {
-	  fprintf(stderr, "asf_decoder: packet time delta of (%d) not understood\n",priv->asf->packet_time_delta);
-	  detach_stream(cdata);
-	  return FALSE;
-	}
+        if (priv->asf->packet_time_delta!=0) {
+          fprintf(stderr, "asf_decoder: packet time delta of (%d) not understood\n",priv->asf->packet_time_delta);
+          detach_stream(cdata);
+          return FALSE;
+        }
 
-	pts=priv->frame_dts-pts;
-	pts2=priv->frame_dts;
+        pts=priv->frame_dts-pts;
+        pts2=priv->frame_dts;
 
 #ifdef DEBUG
-	printf("delta pts is %ld %ld\n",pts,priv->frame_dts);
+        printf("delta pts is %ld %ld\n",pts,priv->frame_dts);
 #endif
-      
-	if (pts>0) cdata->fps=1000./(double)pts;
-	gotframe2=TRUE;
+
+        if (pts>0) cdata->fps=1000./(double)pts;
+        gotframe2=TRUE;
       }
     }
   } while (retval<0&&retval!=-2);
@@ -2253,35 +2259,35 @@
     do {
       free(priv->avpkt.data);
       retval = get_next_video_packet(cdata,-1,-1);
-      
+
       // try to get dts of second frame
       if (retval!=-2) { // eof
-	if (retval==0) {
-
-	  if (priv->frame_dts==AV_NOPTS_VALUE) {
-	    break;
-	  }
-
-	  if (priv->asf->packet_time_delta!=0) {
-	    fprintf(stderr, "asf_decoder: packet time delta of (%d) not understood\n",priv->asf->packet_time_delta);
-	    detach_stream(cdata);
-	    return FALSE;
-	  }
-
-	  if (priv->frame_dts-pts2!=pts) {
-	    // 2->3 delta can be more accurate than 1 - 2 delta
-	    pts=priv->frame_dts-pts2;
-	    if (pts>0) cdata->fps=1000./(double)pts;
-	    priv->start_dts=pts2-pts;
-	    priv->have_start_dts=TRUE;
-	    cdata->video_start_time=(double)priv->start_dts/10000.;
-	  }
+        if (retval==0) {
+
+          if (priv->frame_dts==AV_NOPTS_VALUE) {
+            break;
+          }
+
+          if (priv->asf->packet_time_delta!=0) {
+            fprintf(stderr, "asf_decoder: packet time delta of (%d) not understood\n",priv->asf->packet_time_delta);
+            detach_stream(cdata);
+            return FALSE;
+          }
+
+          if (priv->frame_dts-pts2!=pts) {
+            // 2->3 delta can be more accurate than 1 - 2 delta
+            pts=priv->frame_dts-pts2;
+            if (pts>0) cdata->fps=1000./(double)pts;
+            priv->start_dts=pts2-pts;
+            priv->have_start_dts=TRUE;
+            cdata->video_start_time=(double)priv->start_dts/10000.;
+          }
 
 #ifdef DEBUG
-	  printf("3delta pts is %ld %ld\n",pts,priv->frame_dts);
+          printf("3delta pts is %ld %ld\n",pts,priv->frame_dts);
 #endif
-      
-	}
+
+        }
       }
     } while (retval<0&&retval!=-2);
   }
@@ -2303,7 +2309,7 @@
 
 
   cdata->palettes[0]=avi_pix_fmt_to_weed_palette(ctx->pix_fmt,
-						 &cdata->YUV_clamping);
+                     &cdata->YUV_clamping);
 
   if (cdata->palettes[0]==WEED_PALETTE_END) {
     fprintf(stderr, "asf_decoder: Could not find a usable palette for (%d) %s\n",ctx->pix_fmt,cdata->URI);
@@ -2318,7 +2324,7 @@
 
   if (cdata->width==0) cdata->width=ctx->width-cdata->offs_x*2;
   if (cdata->height==0) cdata->height=ctx->height-cdata->offs_y*2;
-  
+
   if (cdata->width*cdata->height==0) {
     fprintf(stderr, "asf_decoder: invalid width and height (%d X %d)\n",cdata->width,cdata->height);
     detach_stream(cdata);
@@ -2327,7 +2333,7 @@
 
 #ifdef DEBUG
   fprintf(stderr,"using palette %d, size %d x %d\n",
-	  cdata->current_palette,cdata->width,cdata->height);
+          cdata->current_palette,cdata->width,cdata->height);
 #endif
 
   cdata->par=(double)ctx->sample_aspect_ratio.num/(double)ctx->sample_aspect_ratio.den;
@@ -2355,17 +2361,17 @@
       res=system(cmd);
 
       if (res) {
-	snprintf(cmd,1024,"LANGUAGE=en LANG=en mplayer2 \"%s\" -identify -frames 0 2>/dev/null | grep ID_VIDEO_FPS > %s",cdata->URI,tmpfname);
-	res=system(cmd);
+        snprintf(cmd,1024,"LANGUAGE=en LANG=en mplayer2 \"%s\" -identify -frames 0 2>/dev/null | grep ID_VIDEO_FPS > %s",cdata->URI,tmpfname);
+        res=system(cmd);
       }
-      
+
       if (!res) {
-	char buffer[1024];
-	ssize_t bytes=read(ofd,buffer,1024);
-	memset(buffer+bytes,0,1);
-	if (!(strncmp(buffer,"ID_VIDEO_FPS=",13))) {
-	  cdata->fps=strtod (buffer+13,NULL);
-	}
+        char buffer[1024];
+        ssize_t bytes=read(ofd,buffer,1024);
+        memset(buffer+bytes,0,1);
+        if (!(strncmp(buffer,"ID_VIDEO_FPS=",13))) {
+          cdata->fps=strtod(buffer+13,NULL);
+        }
       }
 
       close(ofd);
@@ -2384,7 +2390,7 @@
     detach_stream(cdata);
     return FALSE;
   }
-  
+
   if (ctx->ticks_per_frame==2) {
     // TODO - needs checking
     cdata->fps/=2.;
@@ -2407,7 +2413,8 @@
   }
 
   if (cdata->width!=cdata->frame_width||cdata->height!=cdata->frame_height)
-    fprintf(stderr,"asf_decoder: info frame size=%d x %d, pixel size=%d x %d\n",cdata->frame_width,cdata->frame_height,cdata->width,cdata->height);
+    fprintf(stderr,"asf_decoder: info frame size=%d x %d, pixel size=%d x %d\n",cdata->frame_width,cdata->frame_height,cdata->width,
+            cdata->height);
 
 
   return TRUE;
@@ -2425,7 +2432,7 @@
   nidxc=0;
 
   pthread_mutexattr_init(&mattr);
-  pthread_mutexattr_settype(&mattr,PTHREAD_MUTEX_RECURSIVE); 
+  pthread_mutexattr_settype(&mattr,PTHREAD_MUTEX_RECURSIVE);
 
   pthread_mutex_init(&indices_mutex,NULL);
   return NULL;
@@ -2438,12 +2445,12 @@
 
 
 
-static lives_clip_data_t *init_cdata (void) {
+static lives_clip_data_t *init_cdata(void) {
   lives_asf_priv_t *priv;
   lives_clip_data_t *cdata=(lives_clip_data_t *)malloc(sizeof(lives_clip_data_t));
 
   cdata->URI=NULL;
-  
+
   cdata->priv=priv=malloc(sizeof(lives_asf_priv_t));
 
   cdata->seek_flag=0;
@@ -2455,7 +2462,7 @@
   cdata->palettes[1]=WEED_PALETTE_END;
 
   priv->idxc=NULL;
-  
+
   priv->inited=FALSE;
 
   cdata->sync_hint=0;
@@ -2533,8 +2540,7 @@
 
     dpriv->last_frame=-1;
     dpriv->black_fill=FALSE;
-  }
-  else {  
+  } else {
     clone->nclips=1;
 
     ///////////////////////////////////////////////////////////
@@ -2644,7 +2650,7 @@
   unsigned char *dst=idst;
   register int i;
 
-  for (i=0;i<npixels;i++) {
+  for (i=0; i<npixels; i++) {
     switch (pal) {
     case WEED_PALETTE_RGBA32:
     case WEED_PALETTE_BGRA32:
@@ -2682,7 +2688,8 @@
       dst[0]=dst[3]=128;
       dst[1]=dst[2]=dst[4]=dst[5]=y_black;
       dst+=6;
-    default: break;
+    default:
+      break;
     }
   }
   return idst-dst;
@@ -2698,7 +2705,7 @@
   int64_t target_pts=frame_to_dts(cdata,tframe);
 
   unsigned char *dst,*src;
-  unsigned char black[4]={0,0,0,255};
+  unsigned char black[4]= {0,0,0,255};
 
   boolean got_picture=FALSE;
   boolean hit_target=FALSE;
@@ -2717,39 +2724,38 @@
 #endif
 
   if (pixel_data!=NULL) {
-    
+
     // calc frame width and height, including any border
-    
+
     if (pal==WEED_PALETTE_YUV420P||pal==WEED_PALETTE_YVU420P||pal==WEED_PALETTE_YUV422P||pal==WEED_PALETTE_YUV444P) {
       nplanes=3;
       black[0]=y_black;
       black[1]=black[2]=128;
-    }
-    else if (pal==WEED_PALETTE_YUVA4444P) {
+    } else if (pal==WEED_PALETTE_YUVA4444P) {
       nplanes=4;
       black[0]=y_black;
       black[1]=black[2]=128;
       black[3]=255;
     }
-    
+
     if (pal==WEED_PALETTE_RGB24||pal==WEED_PALETTE_BGR24) psize=3;
-    
+
     if (pal==WEED_PALETTE_RGBA32||pal==WEED_PALETTE_BGRA32||pal==WEED_PALETTE_ARGB32||pal==WEED_PALETTE_UYVY8888||
-	pal==WEED_PALETTE_YUYV8888||pal==WEED_PALETTE_YUV888||pal==WEED_PALETTE_YUVA8888) psize=4;
-    
+        pal==WEED_PALETTE_YUYV8888||pal==WEED_PALETTE_YUV888||pal==WEED_PALETTE_YUVA8888) psize=4;
+
     if (pal==WEED_PALETTE_YUV411) psize=6;
-    
+
     if (pal==WEED_PALETTE_A1) dstwidth>>=3;
-    
+
     dstwidth*=psize;
-    
+
     if (cdata->frame_height > cdata->height && height == cdata->height) {
       // host ignores vertical border
       btop=0;
       xheight=cdata->height;
       bbot=xheight-1;
     }
-    
+
     if (cdata->frame_width > cdata->width && rowstrides[0] < cdata->frame_width*psize) {
       // host ignores horizontal border
       bleft=bright=0;
@@ -2771,26 +2777,24 @@
 
       pthread_mutex_lock(&priv->idxc->mutex);
       if ((priv->kframe=get_idx_for_pts(cdata,target_pts-priv->start_dts))!=NULL) {
-	priv->input_position=priv->kframe->offs;
-	nextframe=dts_to_frame(cdata,priv->kframe->dts+priv->start_dts);
-	tfrag=priv->kframe->frag;
-      }
-      else priv->input_position=priv->data_start;
+        priv->input_position=priv->kframe->offs;
+        nextframe=dts_to_frame(cdata,priv->kframe->dts+priv->start_dts);
+        tfrag=priv->kframe->frag;
+      } else priv->input_position=priv->data_start;
       pthread_mutex_unlock(&priv->idxc->mutex);
-	
+
       // we are now at the kframe before or at target - parse packets until we hit target
-      
+
       //#define DEBUG_KFRAMES
 #ifdef DEBUG_KFRAMES
       if (priv->kframe!=NULL) printf("got kframe %ld frag %d for frame %ld\n",
-				     dts_to_frame(cdata,priv->kframe->dts+priv->start_dts),priv->kframe->frag,tframe);
+                                       dts_to_frame(cdata,priv->kframe->dts+priv->start_dts),priv->kframe->frag,tframe);
 #endif
 
-      avcodec_flush_buffers (priv->ctx);
+      avcodec_flush_buffers(priv->ctx);
       asf_reset_header(priv->s);
       priv->black_fill=FALSE;
-    }
-    else {
+    } else {
       nextframe=priv->last_frame+1;
       tfrag=-1;
     }
@@ -2798,7 +2802,7 @@
     //priv->ctx->skip_frame=AVDISCARD_NONREF;
 
     priv->last_frame=tframe;
- 
+
     // do this until we reach target frame //////////////
 
 
@@ -2806,20 +2810,20 @@
       int ret;
 
       if (priv->avpkt.size==0) {
-	ret = get_next_video_packet(cdata,tfrag,-1);
-	if (ret<0) {
-	  free(priv->avpkt.data);
-	  priv->avpkt.data=NULL;
-	  priv->avpkt.size=0;
-	  if (ret==-2) {
-	    // EOF
-	    if (pixel_data==NULL) return FALSE;
-	    priv->black_fill=TRUE;
-	    break;
-	  }
-	  fprintf(stderr,"asf_decoder: got frame decode error %d at frame %ld\n",ret,nextframe+1);
-	  continue;
-	}
+        ret = get_next_video_packet(cdata,tfrag,-1);
+        if (ret<0) {
+          free(priv->avpkt.data);
+          priv->avpkt.data=NULL;
+          priv->avpkt.size=0;
+          if (ret==-2) {
+            // EOF
+            if (pixel_data==NULL) return FALSE;
+            priv->black_fill=TRUE;
+            break;
+          }
+          fprintf(stderr,"asf_decoder: got frame decode error %d at frame %ld\n",ret,nextframe+1);
+          continue;
+        }
       }
 
 
@@ -2827,9 +2831,9 @@
       if (priv->picture==NULL) priv->picture=av_frame_alloc();
 
 #if LIBAVCODEC_VERSION_MAJOR >= 53
-      avcodec_decode_video2( priv->ctx, priv->picture, &got_picture, &priv->avpkt );
-#else 
-      avcodec_decode_video( priv->ctx, priv->picture, &got_picture, priv->avpkt.data, priv->avpkt.size );
+      avcodec_decode_video2(priv->ctx, priv->picture, &got_picture, &priv->avpkt);
+#else
+      avcodec_decode_video(priv->ctx, priv->picture, &got_picture, priv->avpkt.data, priv->avpkt.size);
 #endif
 
       free(priv->avpkt.data);
@@ -2842,10 +2846,10 @@
 
       // otherwise discard this frame
       if (got_picture) {
-	av_frame_free(&priv->picture);
-	priv->picture=NULL;
-	tfrag=-1;
-	nextframe++;
+        av_frame_free(&priv->picture);
+        priv->picture=NULL;
+        tfrag=-1;
+        nextframe++;
       }
     }
   }
@@ -2855,41 +2859,38 @@
 
   if (priv->black_fill) btop=cdata->frame_height;
 
-  for (p=0;p<nplanes;p++) {
+  for (p=0; p<nplanes; p++) {
     dst=pixel_data[p];
     src=priv->picture->data[p];
 
-    for (i=0;i<xheight;i++) {
+    for (i=0; i<xheight; i++) {
       if (i<btop||i>bbot) {
-	// top or bottom border, copy black row
-	if (pal==WEED_PALETTE_YUV420P||pal==WEED_PALETTE_YVU420P||pal==WEED_PALETTE_YUV422P||pal==WEED_PALETTE_YUV444P||
-	    pal==WEED_PALETTE_YUVA4444P||pal==WEED_PALETTE_RGB24||pal==WEED_PALETTE_BGR24) {
-	  memset(dst,black[p],dstwidth+(bleft+bright)*psize);
-	  dst+=dstwidth+(bleft+bright)*psize;
-	}
-	else dst+=write_black_pixel(dst,pal,dstwidth/psize+bleft+bright,y_black);
-	continue;
+        // top or bottom border, copy black row
+        if (pal==WEED_PALETTE_YUV420P||pal==WEED_PALETTE_YVU420P||pal==WEED_PALETTE_YUV422P||pal==WEED_PALETTE_YUV444P||
+            pal==WEED_PALETTE_YUVA4444P||pal==WEED_PALETTE_RGB24||pal==WEED_PALETTE_BGR24) {
+          memset(dst,black[p],dstwidth+(bleft+bright)*psize);
+          dst+=dstwidth+(bleft+bright)*psize;
+        } else dst+=write_black_pixel(dst,pal,dstwidth/psize+bleft+bright,y_black);
+        continue;
       }
 
       if (bleft>0) {
-	if (pal==WEED_PALETTE_YUV420P||pal==WEED_PALETTE_YVU420P||pal==WEED_PALETTE_YUV422P||pal==WEED_PALETTE_YUV444P||
-	    pal==WEED_PALETTE_YUVA4444P||pal==WEED_PALETTE_RGB24||pal==WEED_PALETTE_BGR24) {
-	  memset(dst,black[p],bleft*psize);
-	  dst+=bleft*psize;
-	}
-	else dst+=write_black_pixel(dst,pal,bleft,y_black);
+        if (pal==WEED_PALETTE_YUV420P||pal==WEED_PALETTE_YVU420P||pal==WEED_PALETTE_YUV422P||pal==WEED_PALETTE_YUV444P||
+            pal==WEED_PALETTE_YUVA4444P||pal==WEED_PALETTE_RGB24||pal==WEED_PALETTE_BGR24) {
+          memset(dst,black[p],bleft*psize);
+          dst+=bleft*psize;
+        } else dst+=write_black_pixel(dst,pal,bleft,y_black);
       }
 
       memcpy(dst,src,dstwidth);
       dst+=dstwidth;
 
       if (bright>0) {
-	if (pal==WEED_PALETTE_YUV420P||pal==WEED_PALETTE_YVU420P||pal==WEED_PALETTE_YUV422P||pal==WEED_PALETTE_YUV444P||
-	    pal==WEED_PALETTE_YUVA4444P||pal==WEED_PALETTE_RGB24||pal==WEED_PALETTE_BGR24) {
-	  memset(dst,black[p],bright*psize);
-	  dst+=bright*psize;
-	}
-	else dst+=write_black_pixel(dst,pal,bright,y_black);
+        if (pal==WEED_PALETTE_YUV420P||pal==WEED_PALETTE_YVU420P||pal==WEED_PALETTE_YUV422P||pal==WEED_PALETTE_YUV444P||
+            pal==WEED_PALETTE_YUVA4444P||pal==WEED_PALETTE_RGB24||pal==WEED_PALETTE_BGR24) {
+          memset(dst,black[p],bright*psize);
+          dst+=bright*psize;
+        } else dst+=write_black_pixel(dst,pal,bright,y_black);
       }
 
       src+=priv->picture->linesize[p];
@@ -2918,7 +2919,7 @@
   if (cdata->palettes!=NULL) free(cdata->palettes);
   cdata->palettes=NULL;
 
-  if (priv->idxc!=NULL) 
+  if (priv->idxc!=NULL)
     idxc_release(cdata);
 
   priv->idxc=NULL;

LiVES-2.2.8.tar.bz2/lives-plugins/plugins/decoders/asf_decoder.h -> LiVES-2.4.1.tar.bz2/lives-plugins/plugins/decoders/asf_decoder.h Changed

LiVES-2.2.8.tar.bz2/lives-plugins/plugins/decoders/avformat_decoder.c -> LiVES-2.4.1.tar.bz2/lives-plugins/plugins/decoders/avformat_decoder.c Changed

@@ -7,6 +7,14 @@
 
 #include "decplugin.h"
 
+#define HAVE_AVCODEC
+#define HAVE_AVUTIL
+
+#ifdef HAVE_SYSTEM_WEED
+#include <weed/weed-compat.h>
+#else
+#include "../../../libweed/weed-compat.h"
+#endif
 
 ///////////////////////////////////////////////////////
 #include <stdio.h>
@@ -59,7 +67,7 @@
 
 
 static int stream_peek(int fd, unsigned char *str, size_t len) {
-  off_t cpos=lseek(fd,0,SEEK_CUR); // get current posn 
+  off_t cpos=lseek(fd,0,SEEK_CUR); // get current posn
   int rv= pread(fd,str,len,cpos); // read len bytes without changing cpos
 
   if (rv==-1) {
@@ -70,54 +78,6 @@
 
 
 
-static int pix_fmt_to_palette(enum PixelFormat pix_fmt, int *clamped) {
-  if (clamped) *clamped=WEED_YUV_CLAMPING_CLAMPED;
-
-  switch (pix_fmt) {
-  case PIX_FMT_RGB24:
-    return WEED_PALETTE_RGB24;
-  case PIX_FMT_BGR24:
-    return WEED_PALETTE_BGR24;
-  case PIX_FMT_RGBA:
-    return WEED_PALETTE_RGBA32;
-  case PIX_FMT_BGRA:
-    return WEED_PALETTE_BGRA32;
-  case PIX_FMT_ARGB:
-    return WEED_PALETTE_ARGB32;
-  case PIX_FMT_YUV444P:
-    return WEED_PALETTE_YUV444P;
-  case PIX_FMT_YUV422P:
-    return WEED_PALETTE_YUV422P;
-  case PIX_FMT_YUV420P:
-    return WEED_PALETTE_YUV420P;
-  case PIX_FMT_YUYV422:
-    return WEED_PALETTE_YUYV;
-  case PIX_FMT_UYVY422:
-    return WEED_PALETTE_UYVY;
-  case PIX_FMT_UYYVYY411:
-    return WEED_PALETTE_YUV411;
-  case PIX_FMT_GRAY8:
-  case PIX_FMT_Y400A:
-    return WEED_PALETTE_A8;
-  case PIX_FMT_MONOWHITE:
-  case PIX_FMT_MONOBLACK:
-    return WEED_PALETTE_A1;
-  case PIX_FMT_YUVJ422P:
-    if (clamped) *clamped=WEED_YUV_CLAMPING_UNCLAMPED;
-    return WEED_PALETTE_YUV422P;
-  case PIX_FMT_YUVJ444P:
-    if (clamped) *clamped=WEED_YUV_CLAMPING_UNCLAMPED;
-    return WEED_PALETTE_YUV444P;
-  case PIX_FMT_YUVJ420P:
-    if (clamped) *clamped=WEED_YUV_CLAMPING_UNCLAMPED;
-    return WEED_PALETTE_YUV420P;
-
-  default:
-    fprintf(stderr,"unknown pix_fmt %d\n",pix_fmt);
-    return WEED_PALETTE_END;
-  }
-}
-
 
 
 void get_samps_and_signed(enum AVSampleFormat sfmt, int *asamps, boolean *asigned) {
@@ -158,63 +118,62 @@
 #ifdef DEBUG_RLF
     fprintf(stderr,"will check frame %ld of %ld...",lframe+1,cdata->nframes);
 #endif
-    
+
     timex=get_current_ticks();
     if (!get_frame(cdata,lframe,NULL,0,NULL)) {
       timex=get_current_ticks()-timex;
 
       if (timex>no_seek_limit) {
-	//#ifdef DEBUG_RLF
-	fprintf(stderr,"avcodec_decoder: seek was %ld, longer than limit of %d; giving up.\n",timex,NO_SEEK_LIMIT);
-	//#endif
-	return -1;
+        //#ifdef DEBUG_RLF
+        fprintf(stderr,"avcodec_decoder: seek was %ld, longer than limit of %d; giving up.\n",timex,NO_SEEK_LIMIT);
+        //#endif
+        return -1;
       }
 
 #ifdef DEBUG_RLF
       fprintf(stderr,"no (%ld)\n",timex);
 #endif
       if (diff==1) {
-	tottime/=nseeks;
+        tottime/=nseeks;
 #ifdef DEBUG_RLF
-	fprintf(stderr,"av positive seek was %ld\n",tottime);
+        fprintf(stderr,"av positive seek was %ld\n",tottime);
 #endif
-	return lframe-1;
+        return lframe-1;
       }
       if (diff<0) diff*=2;
       else if (diff==0) diff=-1;
       else diff/=2;
       lframe=olframe+diff;
       if (lframe<0) {
-	diff=olframe;
-	lframe=0;
-	if (diff==0) diff=1;
+        diff=olframe;
+        lframe=0;
+        if (diff==0) diff=1;
       }
-    }
-    else {
+    } else {
       timex=get_current_ticks()-timex;
 
       if (timex>NO_SEEK_LIMIT) {
-	//#ifdef DEBUG_RLF
-	fprintf(stderr,"avcodec_decoder: seek was %ld, longer than limit of %d; giving up.\n",timex,NO_SEEK_LIMIT);
-	//#endif
-	return -1;
+        //#ifdef DEBUG_RLF
+        fprintf(stderr,"avcodec_decoder: seek was %ld, longer than limit of %d; giving up.\n",timex,NO_SEEK_LIMIT);
+        //#endif
+        return -1;
       }
 
       if (timex>FAST_SEEK_LIMIT)
-	cdata->seek_flag=LIVES_SEEK_NEEDS_CALCULATION;
+        cdata->seek_flag=LIVES_SEEK_NEEDS_CALCULATION;
 
       tottime+=timex;
 #ifdef DEBUG_RLF
       fprintf(stderr,"yes ! (%ld)\n",timex);
 #endif
       if (diff<2&&diff>-4) {
-	tottime/=nseeks;
+        tottime/=nseeks;
 #ifdef DEBUG_RLF
-	fprintf(stderr,"av seek was %ld\n",tottime);
+        fprintf(stderr,"av seek was %ld\n",tottime);
 #endif
-	if (tottime>FAST_SEEK_LIMIT)
-	  cdata->seek_flag|=LIVES_SEEK_NEEDS_CALCULATION;
-	return lframe;
+        if (tottime>FAST_SEEK_LIMIT)
+          cdata->seek_flag|=LIVES_SEEK_NEEDS_CALCULATION;
+        return lframe;
       }
       diff/=2;
       if (diff<0) diff=-diff/2;
@@ -256,47 +215,47 @@
   }
 
   if (isclone) goto skip_probe;
-  
+
   pd.filename=cdata->URI;
 
   pd.buf=calloc(128,32);
 
   if ((pd.buf_size=stream_peek(priv->fd,pd.buf,2261))<2261) {
-    fprintf(stderr, "couldn't peek stream %d\n",pd.buf_size );
+    fprintf(stderr, "couldn't peek stream %d\n",pd.buf_size);
     return FALSE;
   }
 
-  if( !( fmt = av_probe_input_format( &pd, TRUE ) ) ) {
-    fprintf(stderr, "couldn't guess format\n" );
+  if (!(fmt = av_probe_input_format(&pd, TRUE))) {
+    fprintf(stderr, "couldn't guess format\n");
     return FALSE;
   }
 
   free(pd.buf);
 
-  if (!strcmp( fmt->name, "redir" ) ||
-      !strcmp( fmt->name, "sdp" ) ) {
+  if (!strcmp(fmt->name, "redir") ||
+      !strcmp(fmt->name, "sdp")) {
     return FALSE;
   }
 
   /* Don't trigger false alarms on bin files */
-  if( ! strcmp( fmt->name, "psxstr" ) ) {
+  if (! strcmp(fmt->name, "psxstr")) {
     int i_len;
-    i_len = strlen( cdata->URI );
-    if( i_len < 4 ) return FALSE;
-      
-    if( strcasecmp( &cdata->URI[i_len - 4], ".str" ) &&
-	strcasecmp( &cdata->URI[i_len - 4], ".xai" ) &&
-	strcasecmp( &cdata->URI[i_len - 3], ".xa" ) ) {
+    i_len = strlen(cdata->URI);
+    if (i_len < 4) return FALSE;
+
+    if (strcasecmp(&cdata->URI[i_len - 4], ".str") &&
+        strcasecmp(&cdata->URI[i_len - 4], ".xai") &&
+        strcasecmp(&cdata->URI[i_len - 3], ".xa")) {
       return FALSE;
     }
   }
-  
-  fprintf( stderr, "avformat detected format: %s\n", fmt->name );
+
+  fprintf(stderr, "avformat detected format: %s\n", fmt->name);
 
   priv->fmt=fmt;
   priv->inited=TRUE;
 
- skip_probe:
+skip_probe:
 
   priv->ic=NULL;
 
@@ -304,21 +263,21 @@
 
   priv->last_frame=-1;
   priv->black_fill=FALSE;
-  
+
   /* Open it */
-  if( avformat_open_input( &priv->ic, cdata->URI, priv->fmt, NULL ) ) {
-    fprintf( stderr, "avformat_open_input failed\n" );
+  if (avformat_open_input(&priv->ic, cdata->URI, priv->fmt, NULL)) {
+    fprintf(stderr, "avformat_open_input failed\n");
     return FALSE;
   }
-  
+
   if (!priv->ic->pb->seekable) {
-    fprintf( stderr, "avformat stream non-seekable\n" );
+    fprintf(stderr, "avformat stream non-seekable\n");
     return FALSE;
   }
 
   lives_avcodec_lock(); /* avformat calls avcodec behind our back!!! */
-  if( avformat_find_stream_info( priv->ic, NULL ) < 0 ) {
-    fprintf( stderr, "avformat_find_stream_info failed\n" );
+  if (avformat_find_stream_info(priv->ic, NULL) < 0) {
+    fprintf(stderr, "avformat_find_stream_info failed\n");
   }
   lives_avcodec_unlock();
 
@@ -327,7 +286,7 @@
     goto skip_init;
   }
 
-  
+
   // fill cdata
 
   cdata->nclips=1;
@@ -355,23 +314,23 @@
   cdata->asigned=FALSE;
   cdata->ainterleaf=TRUE;
 
-  for (i = 0; i < priv->ic->nb_streams; i++ ) {
+  for (i = 0; i < priv->ic->nb_streams; i++) {
 
-  skip_init:
+skip_init:
     s = priv->ic->streams[i];
     cc = s->codec;
- 
+
     // vlc_fourcc_t fcc;
     //const char *psz_type = "unknown";
 
     /*      if( !GetVlcFourcc( cc->codec_id, NULL, &fcc, NULL ) )
-	    fcc = VLC_FOURCC( 'u', 'n', 'd', 'f' );*/
+      fcc = VLC_FOURCC( 'u', 'n', 'd', 'f' );*/
 
-    switch( cc->codec_type ) {
+    switch (cc->codec_type) {
     case AVMEDIA_TYPE_AUDIO:
       if (priv->astream!=-1) {
-	fprintf(stderr, "Warning - got multiple audio streams\n");
-	break;
+        fprintf(stderr, "Warning - got multiple audio streams\n");
+        break;
       }
 
       cdata->achans = cc->channels;
@@ -394,8 +353,8 @@
     case AVMEDIA_TYPE_VIDEO:
 
       if (!isclone && priv->vstream!=-1) {
-	fprintf(stderr, "Warning - got multiple video streams\n");
-	break;
+        fprintf(stderr, "Warning - got multiple video streams\n");
+        break;
       }
 
       vdecoder=avcodec_find_decoder(cc->codec_id);
@@ -408,16 +367,16 @@
 
 
       /*if( cc->palctrl )
-	{
-	fmt.video.p_palette = malloc( sizeof(video_palette_t) );
-	*fmt.video.p_palette = *(video_palette_t *)cc->palctrl;
-	}*/
-	    
-	    
+      {
+      fmt.video.p_palette = malloc( sizeof(video_palette_t) );
+      *fmt.video.p_palette = *(video_palette_t *)cc->palctrl;
+      }*/
+
+
       cdata->YUV_subspace=WEED_YUV_SUBSPACE_YCBCR;
       cdata->YUV_sampling=WEED_YUV_SAMPLING_DEFAULT;
 
-      cdata->palettes[0]=pix_fmt_to_palette(cc->pix_fmt,&cdata->YUV_clamping);
+      cdata->palettes[0]=avi_pix_fmt_to_weed_palette(cc->pix_fmt,&cdata->YUV_clamping);
       cdata->palettes[1]=WEED_PALETTE_END;
 
       sprintf(cdata->video_name,"%s",cc->codec_name);
@@ -428,32 +387,33 @@
       priv->fps_avg=FALSE;
 
       if (cdata->fps==0.) {
-	cdata->fps=s->time_base.den/s->time_base.num;
-	if (cdata->fps>=1000.||cdata->fps==0.) {
-	  cdata->fps=(float)s->avg_frame_rate.num/(float)s->avg_frame_rate.den;
-	  priv->fps_avg=TRUE;
-	  if (isnan(cdata->fps)) {
-	    cdata->fps=s->time_base.den/s->time_base.num;
-	    priv->fps_avg=FALSE;
-	  }
-	}
+        cdata->fps=s->time_base.den/s->time_base.num;
+        if (cdata->fps>=1000.||cdata->fps==0.) {
+          cdata->fps=(float)s->avg_frame_rate.num/(float)s->avg_frame_rate.den;
+          priv->fps_avg=TRUE;
+          if (isnan(cdata->fps)) {
+            cdata->fps=s->time_base.den/s->time_base.num;
+            priv->fps_avg=FALSE;
+          }
+        }
       }
 
       priv->ctx=cc;
-	    
+
       if (priv->ctx->ticks_per_frame==2) {
-	// needs checking
-	cdata->interlace=LIVES_INTERLACE_BOTTOM_FIRST;
+        // needs checking
+        cdata->interlace=LIVES_INTERLACE_BOTTOM_FIRST;
       }
 
 #ifdef DEBUG
-      fprintf(stderr,"fps is %.4f %d %d %d %d %d\n",cdata->fps,s->time_base.den,s->time_base.num,cc->time_base.den,cc->time_base.num,priv->ctx->ticks_per_frame);
+      fprintf(stderr,"fps is %.4f %d %d %d %d %d\n",cdata->fps,s->time_base.den,s->time_base.num,cc->time_base.den,cc->time_base.num,
+              priv->ctx->ticks_per_frame);
 #endif
 
       if (cdata->nframes==0) {
-	if (priv->ic->duration!=(int64_t)AV_NOPTS_VALUE)
-	  cdata->nframes=((double)priv->ic->duration/(double)AV_TIME_BASE * cdata->fps -  .5);
-	if ((cdata->nframes==0||cdata->fps==1000.)&&s->nb_frames>1) cdata->nframes=s->nb_frames;
+        if (priv->ic->duration!=(int64_t)AV_NOPTS_VALUE)
+          cdata->nframes=((double)priv->ic->duration/(double)AV_TIME_BASE * cdata->fps -  .5);
+        if ((cdata->nframes==0||cdata->fps==1000.)&&s->nb_frames>1) cdata->nframes=s->nb_frames;
       }
 
       priv->vstream=i;
@@ -464,152 +424,152 @@
 
 
 
-		if( strncmp( p_sys->ic->iformat->name, "matroska", 8 ) == 0 &&
+      if( strncmp( p_sys->ic->iformat->name, "matroska", 8 ) == 0 &&
                 cc->codec_id == CODEC_ID_DVD_SUBTITLE &&
                 cc->extradata != NULL &&
                 cc->extradata_size > 0 )
-		{
+      {
                 char *psz_start;
                 char *psz_buf = malloc( cc->extradata_size + 1);
                 if( psz_buf != NULL )
                 {
-		memcpy( psz_buf, cc->extradata , cc->extradata_size );
-		psz_buf[cc->extradata_size] = '\0';
-
-		psz_start = strstr( psz_buf, "size:" );
-		if( psz_start &&
-		vobsub_size_parse( psz_start,
-		&fmt.subs.spu.i_original_frame_width,
-		&fmt.subs.spu.i_original_frame_height ) == VLC_SUCCESS )
-		{
-		msg_Dbg( p_demux, "original frame size: %dx%d",
-		fmt.subs.spu.i_original_frame_width,
-		fmt.subs.spu.i_original_frame_height );
-		}
-		else
-		{
-		msg_Warn( p_demux, "reading original frame size failed" );
-		}
-
-		psz_start = strstr( psz_buf, "palette:" );
-		if( psz_start &&
-		vobsub_palette_parse( psz_start, &fmt.subs.spu.palette[1] ) == VLC_SUCCESS )
-		{
-		fmt.subs.spu.palette[0] =  0xBeef;
-		msg_Dbg( p_demux, "vobsub palette read" );
-		}
-		else
-		{
-		msg_Warn( p_demux, "reading original palette failed" );
-		}
-		free( psz_buf );
+      memcpy( psz_buf, cc->extradata , cc->extradata_size );
+      psz_buf[cc->extradata_size] = '\0';
+
+      psz_start = strstr( psz_buf, "size:" );
+      if( psz_start &&
+      vobsub_size_parse( psz_start,
+      &fmt.subs.spu.i_original_frame_width,
+      &fmt.subs.spu.i_original_frame_height ) == VLC_SUCCESS )
+      {
+      msg_Dbg( p_demux, "original frame size: %dx%d",
+      fmt.subs.spu.i_original_frame_width,
+      fmt.subs.spu.i_original_frame_height );
+      }
+      else
+      {
+      msg_Warn( p_demux, "reading original frame size failed" );
+      }
+
+      psz_start = strstr( psz_buf, "palette:" );
+      if( psz_start &&
+      vobsub_palette_parse( psz_start, &fmt.subs.spu.palette[1] ) == VLC_SUCCESS )
+      {
+      fmt.subs.spu.palette[0] =  0xBeef;
+      msg_Dbg( p_demux, "vobsub palette read" );
+      }
+      else
+      {
+      msg_Warn( p_demux, "reading original palette failed" );
+      }
+      free( psz_buf );
                 }
-		}
+      }
 
-		psz_type = "subtitle";
-		break;
+      psz_type = "subtitle";
+      break;
       */
 
       //        default:
 
       /*
-	#ifdef HAVE_FFMPEG_CODEC_ATTACHMENT
-	if( cc->codec_type == CODEC_TYPE_ATTACHMENT )
-	{
-	input_attachment_t *p_attachment;
-	psz_type = "attachment";
-	if( cc->codec_id == CODEC_ID_TTF )
-	{
-	p_attachment = vlc_input_attachment_New( s->filename, "application/x-truetype-font", NULL,
-	cc->extradata, (int)cc->extradata_size );
-	TAB_APPEND( p_sys->i_attachments, p_sys->attachments, p_attachment );
-	}
-	else msg_Warn( p_demux, "unsupported attachment type in ffmpeg demux" );
-	}
-	break;
-	#endif
-
-	if( cc->codec_type == CODEC_TYPE_DATA )
-	psz_type = "data";
-
-	msg_Warn( p_demux, "unsupported track type in ffmpeg demux" );
-	break;
+      #ifdef HAVE_FFMPEG_CODEC_ATTACHMENT
+      if( cc->codec_type == CODEC_TYPE_ATTACHMENT )
+      {
+      input_attachment_t *p_attachment;
+      psz_type = "attachment";
+      if( cc->codec_id == CODEC_ID_TTF )
+      {
+      p_attachment = vlc_input_attachment_New( s->filename, "application/x-truetype-font", NULL,
+      cc->extradata, (int)cc->extradata_size );
+      TAB_APPEND( p_sys->i_attachments, p_sys->attachments, p_attachment );
+      }
+      else msg_Warn( p_demux, "unsupported attachment type in ffmpeg demux" );
+      }
+      break;
+      #endif
+
+      if( cc->codec_type == CODEC_TYPE_DATA )
+      psz_type = "data";
+
+      msg_Warn( p_demux, "unsupported track type in ffmpeg demux" );
+      break;
         }
         fmt.psz_language = strdup( s->language );
         if( s->disposition & AV_DISPOSITION_DEFAULT )
-	fmt.i_priority = 1000;
+      fmt.i_priority = 1000;
 
-	#ifdef HAVE_FFMPEG_CODEC_ATTACHMENT
+      #ifdef HAVE_FFMPEG_CODEC_ATTACHMENT
         if( cc->codec_type != CODEC_TYPE_ATTACHMENT )
-	#endif
+      #endif
         {
-	const bool    b_ogg = !strcmp( p_sys->fmt->name, "ogg" );
-	const uint8_t *p_extra = cc->extradata;
-	unsigned      i_extra  = cc->extradata_size;
-
-	if( cc->codec_id == CODEC_ID_THEORA && b_ogg )
-	{
-	unsigned pi_size[3];
-	void     *pp_data[3];
-	unsigned i_count;
-	for( i_count = 0; i_count < 3; i_count++ )
-	{
-	if( i_extra < 2 )
-	break;
-	pi_size[i_count] = GetWBE( p_extra );
-	pp_data[i_count] = (uint8_t*)&p_extra[2];
-	if( i_extra < pi_size[i_count] + 2 )
-	break;
-
-	p_extra += 2 + pi_size[i_count];
-	i_extra -= 2 + pi_size[i_count];
-	}
-	if( i_count > 0 && xiph_PackHeaders( &fmt.i_extra, &fmt.p_extra,
-	pi_size, pp_data, i_count ) )
-	{
-	fmt.i_extra = 0;
-	fmt.p_extra = NULL;
-	}
-	}
-	else if( cc->codec_id == CODEC_ID_SPEEX && b_ogg )
-	{
-	uint8_t p_dummy_comment[] = {
-	0, 0, 0, 0,
-	0, 0, 0, 0,
-	};
-	unsigned pi_size[2];
-	void     *pp_data[2];
-
-	pi_size[0] = i_extra;
-	pp_data[0] = (uint8_t*)p_extra;
-
-	pi_size[1] = sizeof(p_dummy_comment);
-	pp_data[1] = p_dummy_comment;
-
-	if( pi_size[0] > 0 && xiph_PackHeaders( &fmt.i_extra, &fmt.p_extra,
-	pi_size, pp_data, 2 ) )
-	{
-	fmt.i_extra = 0;
-	fmt.p_extra = NULL;
-	}
-	}
-	else if( cc->extradata_size > 0 )
-	{
-	fmt.p_extra = malloc( i_extra );
-	if( fmt.p_extra )
-	{
-	fmt.i_extra = i_extra;
-	memcpy( fmt.p_extra, p_extra, i_extra );
-	}
-	}
+      const bool    b_ogg = !strcmp( p_sys->fmt->name, "ogg" );
+      const uint8_t *p_extra = cc->extradata;
+      unsigned      i_extra  = cc->extradata_size;
+
+      if( cc->codec_id == CODEC_ID_THEORA && b_ogg )
+      {
+      unsigned pi_size[3];
+      void     *pp_data[3];
+      unsigned i_count;
+      for( i_count = 0; i_count < 3; i_count++ )
+      {
+      if( i_extra < 2 )
+      break;
+      pi_size[i_count] = GetWBE( p_extra );
+      pp_data[i_count] = (uint8_t*)&p_extra[2];
+      if( i_extra < pi_size[i_count] + 2 )
+      break;
+
+      p_extra += 2 + pi_size[i_count];
+      i_extra -= 2 + pi_size[i_count];
+      }
+      if( i_count > 0 && xiph_PackHeaders( &fmt.i_extra, &fmt.p_extra,
+      pi_size, pp_data, i_count ) )
+      {
+      fmt.i_extra = 0;
+      fmt.p_extra = NULL;
+      }
+      }
+      else if( cc->codec_id == CODEC_ID_SPEEX && b_ogg )
+      {
+      uint8_t p_dummy_comment[] = {
+      0, 0, 0, 0,
+      0, 0, 0, 0,
+      };
+      unsigned pi_size[2];
+      void     *pp_data[2];
+
+      pi_size[0] = i_extra;
+      pp_data[0] = (uint8_t*)p_extra;
+
+      pi_size[1] = sizeof(p_dummy_comment);
+      pp_data[1] = p_dummy_comment;
+
+      if( pi_size[0] > 0 && xiph_PackHeaders( &fmt.i_extra, &fmt.p_extra,
+      pi_size, pp_data, 2 ) )
+      {
+      fmt.i_extra = 0;
+      fmt.p_extra = NULL;
+      }
+      }
+      else if( cc->extradata_size > 0 )
+      {
+      fmt.p_extra = malloc( i_extra );
+      if( fmt.p_extra )
+      {
+      fmt.i_extra = i_extra;
+      memcpy( fmt.p_extra, p_extra, i_extra );
+      }
+      }
         }
         es = es_out_Add( p_demux->out, &fmt );
         if( s->disposition & AV_DISPOSITION_DEFAULT )
-	es_out_Control( p_demux->out, ES_OUT_SET_ES_DEFAULT, es );
+      es_out_Control( p_demux->out, ES_OUT_SET_ES_DEFAULT, es );
         es_format_Clean( &fmt );
 
         msg_Dbg( p_demux, "adding es: %s codec = %4.4s",
-	psz_type, (char*)&fcc );
+      psz_type, (char*)&fcc );
         TAB_APPEND( p_sys->i_tk, p_sys->tk, es );
       */
     default:
@@ -624,41 +584,41 @@
   }
 
 
-  if( priv->ic->start_time != (int64_t)AV_NOPTS_VALUE )
+  if (priv->ic->start_time != (int64_t)AV_NOPTS_VALUE)
     i_start_time = priv->ic->start_time * 1000000 / AV_TIME_BASE;
 
 
 
 
-  fprintf( stderr, "AVFormat supported stream\n" );
-  fprintf( stderr, "    - format = %s (%s)\n",
-	   priv->fmt->name, priv->fmt->long_name );
-  fprintf( stderr, "    - start time = %"PRId64"\n", i_start_time );
-  fprintf( stderr, "    - duration = %"PRId64"\n",
-	   ( priv->ic->duration != (int64_t)AV_NOPTS_VALUE ) ?
-	   priv->ic->duration * 1000000 / AV_TIME_BASE : -1 );
+  fprintf(stderr, "AVFormat supported stream\n");
+  fprintf(stderr, "    - format = %s (%s)\n",
+          priv->fmt->name, priv->fmt->long_name);
+  fprintf(stderr, "    - start time = %"PRId64"\n", i_start_time);
+  fprintf(stderr, "    - duration = %"PRId64"\n",
+          (priv->ic->duration != (int64_t)AV_NOPTS_VALUE) ?
+          priv->ic->duration * 1000000 / AV_TIME_BASE : -1);
 
 
 
 #ifdef HAVE_FFMPEG_CHAPTERS
   /*    if( p_sys->ic->nb_chapters > 0 )
         p_sys->p_title = vlc_input_title_New();
-	for( i = 0; i < p_sys->ic->nb_chapters; i++ )
-	{
+  for( i = 0; i < p_sys->ic->nb_chapters; i++ )
+  {
         seekpoint_t *s = vlc_seekpoint_New();
 
         if( p_sys->ic->chapters[i]->title )
         {
-	s->psz_name = strdup( p_sys->ic->chapters[i]->title );
-	EnsureUTF8( s->psz_name );
-	msg_Dbg( p_demux, "    - chapter %d: %s", i, s->psz_name );
+  s->psz_name = strdup( p_sys->ic->chapters[i]->title );
+  EnsureUTF8( s->psz_name );
+  msg_Dbg( p_demux, "    - chapter %d: %s", i, s->psz_name );
         }
         s->i_time_offset = p_sys->ic->chapters[i]->start * 1000000 *
-	p_sys->ic->chapters[i]->time_base.num /
-	p_sys->ic->chapters[i]->time_base.den -
-	(i_start_time != -1 ? i_start_time : 0 );
+  p_sys->ic->chapters[i]->time_base.num /
+  p_sys->ic->chapters[i]->time_base.den -
+  (i_start_time != -1 ? i_start_time : 0 );
         TAB_APPEND( p_sys->p_title->i_seekpoint, p_sys->p_title->seekpoint, s );
-	}*/
+  }*/
 #endif
 
 
@@ -667,7 +627,7 @@
 
 
 
-static void detach_stream (lives_clip_data_t *cdata) {
+static void detach_stream(lives_clip_data_t *cdata) {
   // close the file, free the decoder
   lives_av_priv_t *priv=cdata->priv;
   close(priv->fd);
@@ -712,16 +672,16 @@
 
 
 
-static lives_clip_data_t *init_cdata (void) {
+static lives_clip_data_t *init_cdata(void) {
   lives_av_priv_t *priv;
   lives_clip_data_t *cdata=(lives_clip_data_t *)malloc(sizeof(lives_clip_data_t));
-  
+
   cdata->palettes=malloc(2*sizeof(int));
-  
+
   cdata->palettes[1]=WEED_PALETTE_END;
-  
+
   cdata->URI=NULL;
-  
+
   cdata->priv=priv=malloc(sizeof(lives_av_priv_t));
 
   priv->fd=-1;
@@ -816,7 +776,7 @@
     dpriv->last_frame=1000000000;
   }
 
- dpriv->pFrame=NULL;
+  dpriv->pFrame=NULL;
 
   return clone;
 }
@@ -871,14 +831,15 @@
     priv->pFrame=NULL;
   }
 
- rescan:
+rescan:
   priv=cdata->priv;
 
   real_frames=get_real_last_frame(cdata,priv->longer_seek)+1;
 
   if (cdata->nframes>100&&real_frames<cdata->nframes*SEEK_SUCCESS_MIN_RATIO) {
-    fprintf(stderr,"avformat_decoder: ERROR - could only seek to %ld frames out of %ld\navformat_decoder: I will pass on this file as it may be broken.\n",
-	    real_frames,cdata->nframes);
+    fprintf(stderr,
+            "avformat_decoder: ERROR - could only seek to %ld frames out of %ld\navformat_decoder: I will pass on this file as it may be broken.\n",
+            real_frames,cdata->nframes);
     detach_stream(cdata);
     free(cdata->URI);
     cdata->URI=NULL;
@@ -914,7 +875,7 @@
   unsigned char *dst=idst;
   register int i;
 
-  for (i=0;i<npixels;i++) {
+  for (i=0; i<npixels; i++) {
     switch (pal) {
     case WEED_PALETTE_RGBA32:
     case WEED_PALETTE_BGRA32:
@@ -952,7 +913,8 @@
       dst[0]=dst[3]=128;
       dst[1]=dst[2]=dst[4]=dst[5]=y_black;
       dst+=6;
-    default: break;
+    default:
+      break;
     }
   }
   return idst-dst;
@@ -979,7 +941,7 @@
   int64_t timex;
 
   unsigned char *dst, *src;
-  unsigned char black[4]={0,0,0,255};
+  unsigned char black[4]= {0,0,0,255};
 
   boolean hit_target=FALSE;
 
@@ -1000,39 +962,38 @@
   timex=get_current_ticks();
 
   if (pixel_data!=NULL) {
-    
+
     // calc frame width and height, including any border
-    
+
     if (pal==WEED_PALETTE_YUV420P||pal==WEED_PALETTE_YVU420P||pal==WEED_PALETTE_YUV422P||pal==WEED_PALETTE_YUV444P) {
       nplanes=3;
       black[0]=y_black;
       black[1]=black[2]=128;
-    }
-    else if (pal==WEED_PALETTE_YUVA4444P) {
+    } else if (pal==WEED_PALETTE_YUVA4444P) {
       nplanes=4;
       black[0]=y_black;
       black[1]=black[2]=128;
       black[3]=255;
     }
-    
+
     if (pal==WEED_PALETTE_RGB24||pal==WEED_PALETTE_BGR24) psize=3;
-    
+
     if (pal==WEED_PALETTE_RGBA32||pal==WEED_PALETTE_BGRA32||pal==WEED_PALETTE_ARGB32||pal==WEED_PALETTE_UYVY8888||
-	pal==WEED_PALETTE_YUYV8888||pal==WEED_PALETTE_YUV888||pal==WEED_PALETTE_YUVA8888) psize=4;
-    
+        pal==WEED_PALETTE_YUYV8888||pal==WEED_PALETTE_YUV888||pal==WEED_PALETTE_YUVA8888) psize=4;
+
     if (pal==WEED_PALETTE_YUV411) psize=6;
-    
+
     if (pal==WEED_PALETTE_A1) dstwidth>>=3;
-    
+
     dstwidth*=psize;
-    
+
     if (cdata->frame_height > cdata->height && height == cdata->height) {
       // host ignores vertical border
       btop=0;
       xheight=cdata->height;
       bbot=xheight-1;
     }
-    
+
     if (cdata->frame_width > cdata->width && rowstrides[0] < cdata->frame_width*psize) {
       // host ignores horizontal border
       bleft=bright=0;
@@ -1050,28 +1011,27 @@
     priv->pFrame=NULL;
 
     time=(double)tframe/cdata->fps;
-  
+
     target_pts = time * (double)AV_TIME_BASE;
-  
+
     if (cdata->seek_flag&LIVES_SEEK_FAST) jump_frames=JUMP_FRAMES_FAST;
     else jump_frames=JUMP_FRAMES_SLOW;
 
-    if (tframe < priv->last_frame || tframe-priv->last_frame > jump_frames ) {
+    if (tframe < priv->last_frame || tframe-priv->last_frame > jump_frames) {
       int64_t xtarget_pts;
       // seek to new frame
 
       // try to seek straight to keyframe
-      if (!(cdata->seek_flag&LIVES_SEEK_FAST)&&tframe<priv->last_frame&&priv->found_pts!=-1&&target_pts>priv->found_pts) 
-	xtarget_pts=priv->found_pts;
+      if (!(cdata->seek_flag&LIVES_SEEK_FAST)&&tframe<priv->last_frame&&priv->found_pts!=-1&&target_pts>priv->found_pts)
+        xtarget_pts=priv->found_pts;
       else xtarget_pts=target_pts;
 
       seek_target=av_rescale_q(xtarget_pts, AV_TIME_BASE_Q, s->time_base);
-      av_seek_frame( priv->ic, priv->vstream, seek_target, AVSEEK_FLAG_BACKWARD);
+      av_seek_frame(priv->ic, priv->vstream, seek_target, AVSEEK_FLAG_BACKWARD);
       avcodec_flush_buffers(cc);
       priv->black_fill=FALSE;
       MyPts=-1;
-    }
-    else {
+    } else {
       MyPts=(priv->last_frame+1.)/cdata->fps*(double)AV_TIME_BASE;
     }
 
@@ -1079,27 +1039,27 @@
 
     while (1) {
       do {
-	int ret;
+        int ret;
 
-	ret=av_read_frame( priv->ic, &priv->packet );
+        ret=av_read_frame(priv->ic, &priv->packet);
 
 #ifdef DEBUG
-	fprintf(stderr,"ret was %d for tframe %ld\n",ret,tframe);
+        fprintf(stderr,"ret was %d for tframe %ld\n",ret,tframe);
 #endif
-	if (ret<0) {
-	  av_free_packet(&priv->packet);
-	  priv->last_frame=tframe;
-	  if (pixel_data==NULL) return FALSE;
-	  priv->black_fill=TRUE;
-	  goto framedone;
-	}
+        if (ret<0) {
+          av_free_packet(&priv->packet);
+          priv->last_frame=tframe;
+          if (pixel_data==NULL) return FALSE;
+          priv->black_fill=TRUE;
+          goto framedone;
+        }
 
       } while (priv->packet.stream_index!=priv->vstream);
 
       if (MyPts==-1) {
-	MyPts = priv->packet.pts;
-	MyPts = av_rescale_q( MyPts, s->time_base, AV_TIME_BASE_Q)-priv->ic->start_time;
-	priv->found_pts=MyPts;
+        MyPts = priv->packet.pts;
+        MyPts = av_rescale_q(MyPts, s->time_base, AV_TIME_BASE_Q)-priv->ic->start_time;
+        priv->found_pts=MyPts;
       }
 
 #ifdef DEBUG
@@ -1110,9 +1070,9 @@
 
 
 #if LIBAVCODEC_VERSION_MAJOR >= 53
-      avcodec_decode_video2( cc, priv->pFrame, &gotFrame, &priv->packet );
-#else 
-      avcodec_decode_video( cc, priv->pFrame, &gotFrame, priv->packet.data, priv->packet.size );
+      avcodec_decode_video2(cc, priv->pFrame, &gotFrame, &priv->packet);
+#else
+      avcodec_decode_video(cc, priv->pFrame, &gotFrame, priv->packet.data, priv->packet.size);
 #endif
 #ifdef DEBUG
       fprintf(stderr,"pt 1 %ld %d %ld\n",tframe,gotFrame,MyPts);
@@ -1120,25 +1080,26 @@
 
       av_free_packet(&priv->packet);
 
-      if (MyPts >= target_pts - 100 ) hit_target=TRUE;
+      if (MyPts >= target_pts - 100) hit_target=TRUE;
 
       if (hit_target&&gotFrame) break;
 
       // otherwise discard this frame
       if (gotFrame) {
-	MyPts+=(double)AV_TIME_BASE/cdata->fps;
-	av_frame_free(&priv->pFrame);
-	priv->pFrame=NULL;
+        MyPts+=(double)AV_TIME_BASE/cdata->fps;
+        av_frame_free(&priv->pFrame);
+        priv->pFrame=NULL;
       }
 
 
-    } while (!(hit_target&&gotFrame));
+    }
+    while (!(hit_target&&gotFrame));
   }
 
- framedone:
+framedone:
   timex=get_current_ticks()-timex;
-  if (timex>FAST_SEEK_LIMIT) ((lives_clip_data_t *)cdata)->seek_flag=LIVES_SEEK_NEEDS_CALCULATION;
-    
+  if (timex>FAST_SEEK_LIMIT)((lives_clip_data_t *)cdata)->seek_flag=LIVES_SEEK_NEEDS_CALCULATION;
+
   priv->last_frame=tframe;
 
   if (priv->pFrame==NULL||pixel_data==NULL) return TRUE;
@@ -1147,41 +1108,38 @@
 
   if (priv->black_fill) btop=cdata->frame_height;
 
-  for (p=0;p<nplanes;p++) {
+  for (p=0; p<nplanes; p++) {
     dst=pixel_data[p];
     src=priv->pFrame->data[p];
 
-    for (i=0;i<xheight;i++) {
+    for (i=0; i<xheight; i++) {
       if (i<btop||i>bbot) {
-	// top or bottom border, copy black row
-	if (pal==WEED_PALETTE_YUV420P||pal==WEED_PALETTE_YVU420P||pal==WEED_PALETTE_YUV422P||pal==WEED_PALETTE_YUV444P||
-	    pal==WEED_PALETTE_YUVA4444P||pal==WEED_PALETTE_RGB24||pal==WEED_PALETTE_BGR24) {
-	  memset(dst,black[p],dstwidth+(bleft+bright)*psize);
-	  dst+=dstwidth+(bleft+bright)*psize;
-	}
-	else dst+=write_black_pixel(dst,pal,dstwidth/psize+bleft+bright,y_black);
-	continue;
+        // top or bottom border, copy black row
+        if (pal==WEED_PALETTE_YUV420P||pal==WEED_PALETTE_YVU420P||pal==WEED_PALETTE_YUV422P||pal==WEED_PALETTE_YUV444P||
+            pal==WEED_PALETTE_YUVA4444P||pal==WEED_PALETTE_RGB24||pal==WEED_PALETTE_BGR24) {
+          memset(dst,black[p],dstwidth+(bleft+bright)*psize);
+          dst+=dstwidth+(bleft+bright)*psize;
+        } else dst+=write_black_pixel(dst,pal,dstwidth/psize+bleft+bright,y_black);
+        continue;
       }
 
       if (bleft>0) {
-	if (pal==WEED_PALETTE_YUV420P||pal==WEED_PALETTE_YVU420P||pal==WEED_PALETTE_YUV422P||pal==WEED_PALETTE_YUV444P||
-	    pal==WEED_PALETTE_YUVA4444P||pal==WEED_PALETTE_RGB24||pal==WEED_PALETTE_BGR24) {
-	  memset(dst,black[p],bleft*psize);
-	  dst+=bleft*psize;
-	}
-	else dst+=write_black_pixel(dst,pal,bleft,y_black);
+        if (pal==WEED_PALETTE_YUV420P||pal==WEED_PALETTE_YVU420P||pal==WEED_PALETTE_YUV422P||pal==WEED_PALETTE_YUV444P||
+            pal==WEED_PALETTE_YUVA4444P||pal==WEED_PALETTE_RGB24||pal==WEED_PALETTE_BGR24) {
+          memset(dst,black[p],bleft*psize);
+          dst+=bleft*psize;
+        } else dst+=write_black_pixel(dst,pal,bleft,y_black);
       }
 
       memcpy(dst,src,dstwidth);
       dst+=dstwidth;
 
       if (bright>0) {
-	if (pal==WEED_PALETTE_YUV420P||pal==WEED_PALETTE_YVU420P||pal==WEED_PALETTE_YUV422P||pal==WEED_PALETTE_YUV444P||
-	    pal==WEED_PALETTE_YUVA4444P||pal==WEED_PALETTE_RGB24||pal==WEED_PALETTE_BGR24) {
-	  memset(dst,black[p],bright*psize);
-	  dst+=bright*psize;
-	}
-	else dst+=write_black_pixel(dst,pal,bright,y_black);
+        if (pal==WEED_PALETTE_YUV420P||pal==WEED_PALETTE_YVU420P||pal==WEED_PALETTE_YUV422P||pal==WEED_PALETTE_YUV444P||
+            pal==WEED_PALETTE_YUVA4444P||pal==WEED_PALETTE_RGB24||pal==WEED_PALETTE_BGR24) {
+          memset(dst,black[p],bright*psize);
+          dst+=bright*psize;
+        } else dst+=write_black_pixel(dst,pal,bright,y_black);
       }
 
       src+=priv->pFrame->linesize[p];

LiVES-2.2.8.tar.bz2/lives-plugins/plugins/decoders/avformat_decoder.h -> LiVES-2.4.1.tar.bz2/lives-plugins/plugins/decoders/avformat_decoder.h Changed

LiVES-2.4.1.tar.bz2/lives-plugins/plugins/decoders/dec_helper.c Added

@@ -0,0 +1,43 @@
+// LiVES - decoder helper
+// (c) Th. Berger 2015 <loki@lokis-chaos.de>
+// released under the GNU GPL 3 or later
+// see file COPYING or www.gnu.org for details
+
+#include "decplugin.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+double get_fps(const char *uri) {
+  // use mplayer to get fps if we can...it seems to have some magical way
+  FILE *fp;
+  int rc;
+  double ret = -1.;
+  const char *binary;
+  char buffer[1024];
+  char cmd[1024];
+
+#define FIND_PLAYER(player) \
+    rc = system("which " #player); \
+    if ( rc == 0 ) { binary = #player; goto found_player; }
+
+  FIND_PLAYER(mplayer)
+  FIND_PLAYER(mplayer2)
+  FIND_PLAYER(mpv)
+
+  // if we get here, we did not find a player
+  goto exit;
+
+found_player:
+  snprintf(cmd,1024,"LANGUAGE=en LANG=en %s \"%s\" -identify -frames 0 2>/dev/null | grep ID_VIDEO_FPS",binary,uri);
+  fp = popen(cmd,"r");
+
+  fgets(buffer,1024,fp);
+  if (!(strncmp(buffer,"ID_VIDEO_FPS=",13))) {
+    ret = strtod(buffer+13,NULL);
+  }
+  pclose(fp);
+exit:
+  return ret;
+}

LiVES-2.2.8.tar.bz2/lives-plugins/plugins/decoders/decplugin.h -> LiVES-2.4.1.tar.bz2/lives-plugins/plugins/decoders/decplugin.h Changed

@@ -32,7 +32,7 @@
 #endif
 
 
-  typedef int boolean;
+typedef int boolean;
 #undef TRUE
 #undef FALSE
 #define TRUE 1
@@ -44,10 +44,10 @@
   LIVES_INTERLACE_TOP_FIRST=2
 } lives_interlace_t;
 
-  /// good
+/// good
 #define LIVES_SEEK_FAST (1<<0)
 
-  /// not so good
+/// not so good
 #define LIVES_SEEK_NEEDS_CALCULATION (1<<1)
 #define LIVES_SEEK_QUALITY_LOSS (1<<2)
 
@@ -84,11 +84,11 @@
 
   float fps;
 
-  int *palettes; ///< list of palettes which the format supports, terminated with WEED_PALETTE_END 
+  int *palettes; ///< list of palettes which the format supports, terminated with WEED_PALETTE_END
 
   /// plugin should init this to palettes[0] if URI changes
   int current_palette;  ///< current palette [rw host]; must be contained in palettes
-  
+
   int YUV_sampling;
   int YUV_clamping;
   int YUV_subspace;
@@ -125,7 +125,7 @@
 const char *version(void);
 
 
-/// pass in NULL clip_data for the first call, subsequent calls (if the URI, current_clip or current_palette changes) 
+/// pass in NULL clip_data for the first call, subsequent calls (if the URI, current_clip or current_palette changes)
 /// should reuse the previous value. If URI or current_clip are invalid, clip_data will be freed and NULL returned.
 ///
 /// plugin may or may not check current_palette to see if it is valid
@@ -148,7 +148,8 @@
 
 boolean set_palette(lives_clip_data_t *);
 
-int64_t rip_audio (const lives_clip_data_t *, const char *fname, int64_t stframe, int64_t nframes, unsigned char **abuff);
+int64_t rip_audio(const lives_clip_data_t *, const char *fname, int64_t stframe, int64_t nframes, unsigned char **abuff);
+boolean rip_audio_sequential(const lives_clip_data_t *, const char *fname);
 void rip_audio_cleanup(const lives_clip_data_t *);
 
 void module_unload(void);
@@ -166,6 +167,8 @@
 #define ABS(a) ((a)>=0.?(a):-(a))
 
 
+double get_fps(const char *uri);
+
 enum LiVESMediaType {
   LIVES_MEDIA_TYPE_UNKNOWN=0,
   LIVES_MEDIA_TYPE_VIDEO,

LiVES-2.2.8.tar.bz2/lives-plugins/plugins/decoders/dv_decoder.c -> LiVES-2.4.1.tar.bz2/lives-plugins/plugins/decoders/dv_decoder.c Changed

@@ -29,16 +29,15 @@
 static void dv_dec_set_header(lives_clip_data_t *cdata, uint8_t *data) {
   lives_dv_priv_t *priv=cdata->priv;
 
-  if((data[3] & 0x80) == 0) {      /* DSF flag */
+  if ((data[3] & 0x80) == 0) {     /* DSF flag */
     // NTSC
 
     priv->frame_size = 120000;
     priv->is_pal = 0;
     cdata->height=480;
     cdata->fps=30000./1001.;
-    
-  }
-  else {
+
+  } else {
     // PAL
 
     priv->frame_size = 144000;
@@ -89,7 +88,7 @@
 #endif
 
 
-  if (read (priv->fd, header, DV_HEADER_SIZE) < DV_HEADER_SIZE) {
+  if (read(priv->fd, header, DV_HEADER_SIZE) < DV_HEADER_SIZE) {
     fprintf(stderr, "dv_decoder: unable to read header for %s\n",cdata->URI);
     close(priv->fd);
     return FALSE;
@@ -105,7 +104,7 @@
 
   lseek64(priv->fd,0,SEEK_SET);
   fbuffer=malloc(priv->frame_size);
-  if (read (priv->fd, fbuffer, priv->frame_size) < priv->frame_size) {
+  if (read(priv->fd, fbuffer, priv->frame_size) < priv->frame_size) {
     fprintf(stderr, "dv_decoder: unable to read first frame for %s\n",cdata->URI);
     free(fbuffer);
     close(priv->fd);
@@ -155,7 +154,7 @@
   cdata->video_start_time=0.;
 
   priv->dv_dec->quality=DV_QUALITY_BEST;
-  
+
 
   if (!isclone&&!is_partial_clone) {
     fstat(priv->fd,&sb);
@@ -163,13 +162,13 @@
   }
 
   //priv.dv_dec->add_ntsc_setup=TRUE;
-    
+
   return TRUE;
 }
 
 
 
-static void detach_stream (lives_clip_data_t *cdata) {
+static void detach_stream(lives_clip_data_t *cdata) {
   // close the file, free the decoder
   lives_dv_priv_t *priv=cdata->priv;
   close(priv->fd);
@@ -196,33 +195,33 @@
 
 
 
-static lives_clip_data_t *init_cdata (void) {
+static lives_clip_data_t *init_cdata(void) {
   register int i;
   lives_dv_priv_t *priv;
   lives_clip_data_t *cdata=(lives_clip_data_t *)malloc(sizeof(lives_clip_data_t));
-  
+
   cdata->palettes=malloc(4*sizeof(int));
-  
+
   // plugin allows a choice of palettes; we set these in order of preference
   cdata->palettes[0]=WEED_PALETTE_YUYV8888;
   cdata->palettes[1]=WEED_PALETTE_RGB24;
   cdata->palettes[2]=WEED_PALETTE_BGR24;
   cdata->palettes[3]=WEED_PALETTE_END;
-  
+
   cdata->URI=NULL;
-  
+
   cdata->priv=priv=malloc(sizeof(lives_dv_priv_t));
 
-  for (i=0;i<4;i++) {
+  for (i=0; i<4; i++) {
     priv->audio_buffers[i]=NULL;
   }
-  
+
   priv->audio=NULL;
   priv->audio_fd=-1;
   priv->inited=FALSE;
 
   cdata->seek_flag=LIVES_SEEK_FAST;
-  
+
   cdata->sync_hint=0;
 
   memset(cdata->author,0,1);
@@ -271,7 +270,7 @@
   snprintf(clone->title,256,"%s",cdata->title);
   snprintf(clone->comment,256,"%s",cdata->comment);
 
-    // create "priv" elements
+  // create "priv" elements
   dpriv=clone->priv;
   spriv=cdata->priv;
 
@@ -327,7 +326,7 @@
       clip_data_free(cdata);
       return NULL;
     }
-   }
+  }
 
 
   return cdata;
@@ -351,20 +350,20 @@
       free(silencebuf);
       return FALSE;
     }
-    
+
     free(silencebuf);
   }
 
   if (abuff!=NULL) {
     // write to memory
-    for (j=0;j<nchans;j++) {
+    for (j=0; j<nchans; j++) {
       // write 0
       if (xoffs<0) memset(&(abuff[j][offs]),0,nsamps);
       else {
-	// or copy last bytes
-	for (i=0;i<nsamps;i+=2) {
-	  memcpy(&(abuff[j][offs+i]),&(abuff[j][xoffs]),2);
-	}
+        // or copy last bytes
+        for (i=0; i<nsamps; i+=2) {
+          memcpy(&(abuff[j][offs+i]),&(abuff[j][xoffs]),2);
+        }
       }
     }
   }
@@ -377,7 +376,7 @@
   register int i;
   lives_dv_priv_t *priv=cdata->priv;
 
-  for (i=0;i<4;i++) {
+  for (i=0; i<4; i++) {
     if (priv->audio_buffers[i]!=NULL) free(priv->audio_buffers[i]);
     priv->audio_buffers[i]=NULL;
   }
@@ -385,14 +384,14 @@
   if (priv->audio!=NULL) free(priv->audio);
   priv->audio=NULL;
 
-  if (priv->audio_fd!=-1) close (priv->audio_fd);
+  if (priv->audio_fd!=-1) close(priv->audio_fd);
 
 }
 
 
 
-int64_t rip_audio (const lives_clip_data_t *cdata, const char *fname, int64_t stframe, int64_t nframes, 
-		   unsigned char **abuff) {
+int64_t rip_audio(const lives_clip_data_t *cdata, const char *fname, int64_t stframe, int64_t nframes,
+                  unsigned char **abuff) {
   // rip audio from (video) frame stframe, length nframes (video) frames from cdata
   // to file fname *
 
@@ -405,7 +404,7 @@
   // sometimes we get fewer samples than expected, so we do two passes and set
   // scale on the first pass. This is then used to resample on the second pass)
 
-  // note: host can kill this function with SIGUSR1 at any point after we start writing the 
+  // note: host can kill this function with SIGUSR1 at any point after we start writing the
   //       output file
 
   // note: host will call rip_audio_cleanup() after calling here
@@ -434,20 +433,20 @@
 
   xframes=nframes;
 
-  for (i=0;i<4;i++) {
+  for (i=0; i<4; i++) {
     if (priv->audio_buffers[i]==NULL) {
       if (!(priv->audio_buffers[i] = (int16_t *)malloc(DV_AUDIO_MAX_SAMPLES * 2 * sizeof(int16_t)))) {
-	fprintf(stderr, "dv_decoder: out of memory\n");
-	return 0;
+        fprintf(stderr, "dv_decoder: out of memory\n");
+        return 0;
       }
     }
   }
 
   if (priv->audio==NULL) {
-    if(!(priv->audio = malloc(DV_AUDIO_MAX_SAMPLES * 8 * sizeof(int16_t)))) {
-      for (i=0;i<4;i++) {
-	free(priv->audio_buffers[i]);
-	priv->audio_buffers[i]=NULL;
+    if (!(priv->audio = malloc(DV_AUDIO_MAX_SAMPLES * 8 * sizeof(int16_t)))) {
+      for (i=0; i<4; i++) {
+        free(priv->audio_buffers[i]);
+        priv->audio_buffers[i]=NULL;
       }
       fprintf(stderr, "dv_decoder: out of memory\n");
       return 0;
@@ -478,7 +477,7 @@
   while (1) {
     // decode frame headers and total number of samples
 
-    if (read (priv->fd, buf, priv->frame_size) < priv->frame_size) break;
+    if (read(priv->fd, buf, priv->frame_size) < priv->frame_size) break;
     dv_parse_header(priv->dv_dec, buf);
 
     samples  = priv->dv_dec->audio->samples_this_frame;
@@ -502,60 +501,60 @@
 
     samps_out=0;
 
-    if (read (priv->fd, buf, priv->frame_size) < priv->frame_size) break;
+    if (read(priv->fd, buf, priv->frame_size) < priv->frame_size) break;
     dv_parse_header(priv->dv_dec, buf);
-    
+
     samples  = priv->dv_dec->audio->samples_this_frame;
-    
+
     dv_decode_full_audio(priv->dv_dec, buf, priv->audio_buffers);
 
     j=0;
 
     // interleave the audio into a single buffer
-    for (i=0;i<samples&&samps_expected;i++) {
-      
-      for (ch=0;ch<channels;ch++) {
-	if (fname!=NULL) priv->audio[j++] = priv->audio_buffers[ch][i];
-	else {
-	  // copy a 16 bit sample
-	  memcpy(&(abuff[ch][k]),&(priv->audio_buffers[ch][i]),2);
-	}
+    for (i=0; i<samples&&samps_expected; i++) {
+
+      for (ch=0; ch<channels; ch++) {
+        if (fname!=NULL) priv->audio[j++] = priv->audio_buffers[ch][i];
+        else {
+          // copy a 16 bit sample
+          memcpy(&(abuff[ch][k]),&(priv->audio_buffers[ch][i]),2);
+        }
       }
 
       k+=2;
-      
+
       offset_f+=scale;
 
       if (offset_f<=-1.&&i>0) {
-	// slipped back a whole sample, process same i
-	offset_f+=1.;
-	i--;
+        // slipped back a whole sample, process same i
+        offset_f+=1.;
+        i--;
       }
-      
-      
+
+
       if (offset_f>=1.) {
-	// slipped forward a whole sample, process i+2
-	offset_f-=1.;
-	i++;
+        // slipped forward a whole sample, process i+2
+        offset_f-=1.;
+        i++;
       }
 
       samps_expected--;
       samps_out++;
     }
-    
+
     bytes = samps_out*channels*2;
-    
+
     tot_samples+=samps_out;
 
     // write out
     if (fname!=NULL) {
-      if (write(priv->audio_fd, (char*) priv->audio, bytes) != bytes) {
-	free(buf);
-	fprintf(stderr, "dv_decoder: audio write error %s\n",fname);
-	return tot_samples;
+      if (write(priv->audio_fd, (char *) priv->audio, bytes) != bytes) {
+        free(buf);
+        fprintf(stderr, "dv_decoder: audio write error %s\n",fname);
+        return tot_samples;
       }
     }
-    
+
     if (--nframes==0) break;
   }
 
@@ -584,17 +583,17 @@
   lives_dv_priv_t *priv=cdata->priv;
 
   uint8_t fbuffer[priv->frame_size];
-  
+
   int64_t frame=tframe;
   off64_t bytes=frame*priv->frame_size;
-  
+
   lseek64(priv->fd,bytes,SEEK_SET);
-    
-  if (read (priv->fd, fbuffer, priv->frame_size) < priv->frame_size) return FALSE;
-  
+
+  if (read(priv->fd, fbuffer, priv->frame_size) < priv->frame_size) return FALSE;
+
   dv_parse_header(priv->dv_dec, fbuffer);
   dv_set_error_log(priv->dv_dec,nulfile);
-  
+
   switch (cdata->current_palette) {
   case WEED_PALETTE_RGB24:
     dv_decode_full_frame(priv->dv_dec,fbuffer,e_dv_color_rgb,(uint8_t **)pixel_data,rowstrides);

LiVES-2.2.8.tar.bz2/lives-plugins/plugins/decoders/flv_decoder.c -> LiVES-2.4.1.tar.bz2/lives-plugins/plugins/decoders/flv_decoder.c Changed

@@ -80,7 +80,7 @@
 /*
 static void convert_quad_chroma(guchar *src, int width, int height, guchar *dest) {
   // width and height here are width and height of dest chroma planes, in bytes
-  
+
   // double the chroma samples vertically and horizontally, with interpolation, eg. 420p to 444p
 
   // output to planes
@@ -134,7 +134,8 @@
 }
 
 static double getfloat64(unsigned char *data) {
-  int64_t v=(((int64_t)(data[0]&0xFF)<<56)+((int64_t)(data[1]&0xFF)<<48)+((int64_t)(data[2]&0xFF)<<40)+((int64_t)(data[3]&0xFF)<<32)+((int64_t)(data[4]&0xFF)<<24)+((int64_t)(data[5]&0xFF)<<16)+((int64_t)(data[6]&0XFF)<<8)+(int64_t)(data[7]&0xFF));
+  int64_t v=(((int64_t)(data[0]&0xFF)<<56)+((int64_t)(data[1]&0xFF)<<48)+((int64_t)(data[2]&0xFF)<<40)+((int64_t)(data[3]&0xFF)<<32)+((
+               int64_t)(data[4]&0xFF)<<24)+((int64_t)(data[5]&0xFF)<<16)+((int64_t)(data[6]&0XFF)<<8)+(int64_t)(data[7]&0xFF));
   return ldexp(((v&((1LL<<52)-1)) + (1LL<<52)) * (v>>63|1), (v>>52&0x7FF)-1075);
 }
 
@@ -148,7 +149,7 @@
 
   lseek(priv->fd,priv->input_position,SEEK_SET);
 
-  if (read (priv->fd, data, FLV_PACK_HEADER_SIZE) < FLV_PACK_HEADER_SIZE) {
+  if (read(priv->fd, data, FLV_PACK_HEADER_SIZE) < FLV_PACK_HEADER_SIZE) {
     //fprintf(stderr, "flv_decoder: unable to read packet header for %s\n",cdata->URI);
     return FALSE;
   }
@@ -174,7 +175,7 @@
   lives_flv_priv_t *priv=cdata->priv;
   unsigned char data[4];
 
-  if (read (priv->fd, data, 4) < 4) return -1;
+  if (read(priv->fd, data, 4) < 4) return -1;
   return ((data[0]&0xFF)<<24)+((data[1]&0xFF)<<16)+((data[2]&0xFF)<<8)+(data[3]&0xFF);
 }
 
@@ -204,7 +205,7 @@
     if (!lives_flv_parse_pack_header(cdata,&pack)) return -1;
     delta=-15;
     if (pack.type==FLV_TAG_TYPE_VIDEO) {
-      if (read (priv->fd, &flags, 1) < 1) return -1;
+      if (read(priv->fd, &flags, 1) < 1) return -1;
       if (!((flags & 0xF0)==0x50)) break;
       delta-=1;
     }
@@ -222,7 +223,7 @@
   unsigned char data[2];
 
   // read 6 bytes
-  if (read (fd, data, 2) < 2) return FALSE;
+  if (read(fd, data, 2) < 2) return FALSE;
 
   if ((data[0]&0xF0)==0x10) return TRUE;
 
@@ -253,12 +254,12 @@
 
 
 static index_entry *index_walk(index_entry *idx, int pts) {
-  while(idx!=NULL) {
+  while (idx!=NULL) {
     if (pts>=idx->dts&&pts<=idx->dts_max) return idx;
     idx=idx->next;
   }
   /// oops. something went wrong
-  return NULL; 
+  return NULL;
 }
 
 
@@ -280,53 +281,52 @@
     if (pack.type==FLV_TAG_TYPE_VIDEO&&pack.size>0) {
       if (is_keyframe(priv->fd)) {
 
-	if (pack.dts>mid_dts||(priv->idxc->idxth!=NULL&&pack.dts>=priv->idxc->idxth->dts)) {
-	  // handle case where we cross the mid point, or head and tail list have met
-	  if (priv->idxc->idxth!=NULL&&pack.dts>=priv->idxc->idxth->dts) {
-	    // two lists are now contiguous; swap pointers to indicate this; update old head-tail and return it
-	    
-	    // we found no keyframes between idxht and idxth, so therefore extend idxht
-	    priv->idxc->idxht->dts_max=priv->idxc->idxth->dts-1;
-	    priv->idxc->idxht->next=priv->idxc->idxth;
-	    nidx=priv->idxc->idxht; // this is the value we will return
-	    
-	    // cross the pointers
-	    priv->idxc->idxht=index_walk(priv->idxc->idxht,mid_dts*4/3);
-	    priv->idxc->idxth=index_walk(priv->idxc->idxhh,mid_dts*2/3);
-	    
-	    return nidx;
-	  }
-	  
-	  priv->idxc->idxht->dts_max=pack.dts-1;
-	  if (pack.dts>pts) return priv->idxc->idxht;
-
-	  // we crossed the mid point but head list is too short
-	  return index_downto(cdata,pts); // index from head of tail list down to pts
-	}
-
-	// add new keyframe
-	nidx=(index_entry *)malloc(sizeof(index_entry));
-	nidx->offs=priv->input_position-11;
-	nidx->dts=nidx->dts_max=pack.dts;
-	nidx->next=NULL;
-	if (priv->idxc->idxht!=NULL) {
-	  oldht=priv->idxc->idxht;
-	  oldht->dts_max=pack.dts-1;
-	  oldht->next=nidx;
-	}
-	else priv->idxc->idxhh=nidx;
-    
-	priv->idxc->idxht=nidx;
+        if (pack.dts>mid_dts||(priv->idxc->idxth!=NULL&&pack.dts>=priv->idxc->idxth->dts)) {
+          // handle case where we cross the mid point, or head and tail list have met
+          if (priv->idxc->idxth!=NULL&&pack.dts>=priv->idxc->idxth->dts) {
+            // two lists are now contiguous; swap pointers to indicate this; update old head-tail and return it
+
+            // we found no keyframes between idxht and idxth, so therefore extend idxht
+            priv->idxc->idxht->dts_max=priv->idxc->idxth->dts-1;
+            priv->idxc->idxht->next=priv->idxc->idxth;
+            nidx=priv->idxc->idxht; // this is the value we will return
+
+            // cross the pointers
+            priv->idxc->idxht=index_walk(priv->idxc->idxht,mid_dts*4/3);
+            priv->idxc->idxth=index_walk(priv->idxc->idxhh,mid_dts*2/3);
+
+            return nidx;
+          }
+
+          priv->idxc->idxht->dts_max=pack.dts-1;
+          if (pack.dts>pts) return priv->idxc->idxht;
+
+          // we crossed the mid point but head list is too short
+          return index_downto(cdata,pts); // index from head of tail list down to pts
+        }
+
+        // add new keyframe
+        nidx=(index_entry *)malloc(sizeof(index_entry));
+        nidx->offs=priv->input_position-11;
+        nidx->dts=nidx->dts_max=pack.dts;
+        nidx->next=NULL;
+        if (priv->idxc->idxht!=NULL) {
+          oldht=priv->idxc->idxht;
+          oldht->dts_max=pack.dts-1;
+          oldht->next=nidx;
+        } else priv->idxc->idxhh=nidx;
+
+        priv->idxc->idxht=nidx;
       }
 
       if (pack.dts==pts) {
-	// result is current keyframe
-	break;
+        // result is current keyframe
+        break;
       }
       if (pack.dts>pts) {
-	// result is previous keyframe
-	nidx=oldht;
-	break;
+        // result is previous keyframe
+        nidx=oldht;
+        break;
       }
 
     }
@@ -373,21 +373,20 @@
     if (pack.dts<=mid_dts||(priv->idxc->idxht!=NULL&&pack.dts<=priv->idxc->idxht->dts_max)) {
       // handle case where we cross the mid point, or head and tail list have met
       if (priv->idxc->idxht!=NULL&&pack.dts<=priv->idxc->idxht->dts_max) {
-	// two lists are now contiguous; swap pointers to indicate this; update old head-tail and return it
+        // two lists are now contiguous; swap pointers to indicate this; update old head-tail and return it
 
-	// we found no keyframes between idxth (or last_dts) and idxht, so therefore extend idxht
-	if (priv->idxc->idxth!=NULL) {
-	  priv->idxc->idxht->dts_max=priv->idxc->idxth->dts-1;
-	  priv->idxc->idxht->next=priv->idxc->idxth;
-	}
-	else priv->idxc->idxht->dts_max=frame_to_dts(cdata,cdata->nframes)-1;
-	nidx=priv->idxc->idxht; // this is the value we will return
+        // we found no keyframes between idxth (or last_dts) and idxht, so therefore extend idxht
+        if (priv->idxc->idxth!=NULL) {
+          priv->idxc->idxht->dts_max=priv->idxc->idxth->dts-1;
+          priv->idxc->idxht->next=priv->idxc->idxth;
+        } else priv->idxc->idxht->dts_max=frame_to_dts(cdata,cdata->nframes)-1;
+        nidx=priv->idxc->idxht; // this is the value we will return
 
-	// cross the pointers
-	priv->idxc->idxht=index_walk(priv->idxc->idxht,mid_dts*4/3);
-	priv->idxc->idxth=index_walk(priv->idxc->idxhh,mid_dts*2/3);
+        // cross the pointers
+        priv->idxc->idxht=index_walk(priv->idxc->idxht,mid_dts*4/3);
+        priv->idxc->idxth=index_walk(priv->idxc->idxhh,mid_dts*2/3);
 
-	return nidx;
+        return nidx;
       }
 
       // we crossed the mid point but head list is too short
@@ -403,12 +402,11 @@
     if (priv->idxc->idxth!=NULL) {
       nidx->dts_max=priv->idxc->idxth->dts-1;
       nidx->next=priv->idxc->idxth;
-    }
-    else {
+    } else {
       nidx->dts_max=frame_to_dts(cdata,cdata->nframes)-1;
       nidx->next=NULL;
     }
-    
+
     priv->idxc->idxth=nidx;
     if (nidx->dts<=pts) break; // found what we were looking for
 
@@ -495,9 +493,9 @@
 
   pthread_mutex_lock(&indices_mutex);
 
-  for (i=0;i<nidxc;i++) {
+  for (i=0; i<nidxc; i++) {
     if (indices[i]->clients[0]->current_clip==cdata->current_clip&&
-	!strcmp(indices[i]->clients[0]->URI,cdata->URI)) {
+        !strcmp(indices[i]->clients[0]->URI,cdata->URI)) {
       idxc=indices[i];
       // append cdata to clients
       idxc->clients=(lives_clip_data_t **)realloc(idxc->clients,(idxc->nclients+1)*sizeof(lives_clip_data_t *));
@@ -543,37 +541,35 @@
 
   if (idxc->nclients==1) {
     // remove this index
-    if (idxc->idxth!=NULL&&(idxc->idxht==NULL||(idxc->idxth->dts>idxc->idxht->dts))) 
+    if (idxc->idxth!=NULL&&(idxc->idxht==NULL||(idxc->idxth->dts>idxc->idxht->dts)))
       index_free(priv->idxc->idxth);
     if (idxc->idxhh!=NULL) index_free(idxc->idxhh);
     free(idxc->clients);
-    for (i=0;i<nidxc;i++) {
+    for (i=0; i<nidxc; i++) {
       if (indices[i]==idxc) {
-	nidxc--;
-	for (j=i;j<nidxc;j++) {
-	  indices[j]=indices[j+1];
-	}
-	free(idxc);
-	if (nidxc==0) {
-	  free(indices);
-	  indices=NULL;
-	}
-	else indices=(index_container_t **)realloc(indices,nidxc*sizeof(index_container_t *));
-	break;
+        nidxc--;
+        for (j=i; j<nidxc; j++) {
+          indices[j]=indices[j+1];
+        }
+        free(idxc);
+        if (nidxc==0) {
+          free(indices);
+          indices=NULL;
+        } else indices=(index_container_t **)realloc(indices,nidxc*sizeof(index_container_t *));
+        break;
       }
     }
-  }
-  else {
+  } else {
     // reduce client count by 1
-    for (i=0;i<idxc->nclients;i++) {
+    for (i=0; i<idxc->nclients; i++) {
       if (idxc->clients[i]==cdata) {
-	// remove this entry
-	idxc->nclients--;
-	for (j=i;j<idxc->nclients;j++) {
-	  idxc->clients[j]=idxc->clients[j+1];
-	}
-	idxc->clients=(lives_clip_data_t **)realloc(idxc->clients,idxc->nclients*sizeof(lives_clip_data_t *));
-	break;
+        // remove this entry
+        idxc->nclients--;
+        for (j=i; j<idxc->nclients; j++) {
+          idxc->clients[j]=idxc->clients[j+1];
+        }
+        idxc->clients=(lives_clip_data_t **)realloc(idxc->clients,idxc->nclients*sizeof(lives_clip_data_t *));
+        break;
       }
     }
   }
@@ -586,8 +582,8 @@
 static void idxc_release_all(void) {
   register int i;
 
-  for (i=0;i<nidxc;i++) {
-    if (indices[i]->idxth!=NULL&&(indices[i]->idxht==NULL||(indices[i]->idxth->dts>indices[i]->idxht->dts))) 
+  for (i=0; i<nidxc; i++) {
+    if (indices[i]->idxth!=NULL&&(indices[i]->idxht==NULL||(indices[i]->idxth->dts>indices[i]->idxht->dts)))
       index_free(indices[i]->idxth);
     if (indices[i]->idxhh!=NULL) index_free(indices[i]->idxhh);
     free(indices[i]->clients);
@@ -596,7 +592,7 @@
   nidxc=0;
 }
 
-static void detach_stream (lives_clip_data_t *cdata) {
+static void detach_stream(lives_clip_data_t *cdata) {
   // close the file, free the decoder
   lives_flv_priv_t *priv=cdata->priv;
 
@@ -667,7 +663,7 @@
   setmode(priv->fd,O_BINARY);
 #endif
 
-  if (read (priv->fd, header, FLV_PROBE_SIZE) < FLV_PROBE_SIZE) {
+  if (read(priv->fd, header, FLV_PROBE_SIZE) < FLV_PROBE_SIZE) {
     // for example, might be a directory
 #ifdef DEBUG
     fprintf(stderr, "flv_decoder: unable to read header for %s\n",cdata->URI);
@@ -718,7 +714,7 @@
     }
 
     pack.data=malloc(pack.size);
-    if (read (priv->fd, pack.data, pack.size) < pack.size) {
+    if (read(priv->fd, pack.data, pack.size) < pack.size) {
       fprintf(stderr, "flv_decoder: error in metadata for %s\n",cdata->URI);
       free(pack.data);
       close(priv->fd);
@@ -730,124 +726,123 @@
     while (offs<pack.size-2) {
       if (in_array&&key==NULL) type=AMF_DATA_TYPE_STRING;
       else {
-	type=(int)(pack.data[offs]&0xFF);
-	offs++;
+        type=(int)(pack.data[offs]&0xFF);
+        offs++;
       }
 
       switch (type) {
       case AMF_DATA_TYPE_NULL:
       case AMF_DATA_TYPE_UNDEFINED:
       case AMF_DATA_TYPE_UNSUPPORTED:
-	break; //these take up no additional space
+        break; //these take up no additional space
 
 
       case AMF_DATA_TYPE_STRING:
       case AMF_DATA_TYPE_LONG_STRING:
       case AMF_DATA_TYPE_OBJECT:
-	size=amf_get_string(pack.data+offs, buffer, FLV_META_SIZE);
-	if (size<=0) size=10000000;
-	offs+=size;
-	if (!gotmeta) {
-	  if (!strcmp(buffer, "onMetaData")) {
-	    gotmeta=TRUE;
-	  }
-	}
-
-	// deal with string
-	if (key!=NULL) {
-	  if (!strcmp(key,"comment")) snprintf(cdata->comment,256,"%s",buffer);
-	  if (!strcmp(key,"author")) snprintf(cdata->author,256,"%s",buffer);
-	  if (!strcmp(key,"title")) snprintf(cdata->title,256,"%s",buffer);
-	  free(key);
-	  key=NULL;
+        size=amf_get_string(pack.data+offs, buffer, FLV_META_SIZE);
+        if (size<=0) size=10000000;
+        offs+=size;
+        if (!gotmeta) {
+          if (!strcmp(buffer, "onMetaData")) {
+            gotmeta=TRUE;
+          }
+        }
+
+        // deal with string
+        if (key!=NULL) {
+          if (!strcmp(key,"comment")) snprintf(cdata->comment,256,"%s",buffer);
+          if (!strcmp(key,"author")) snprintf(cdata->author,256,"%s",buffer);
+          if (!strcmp(key,"title")) snprintf(cdata->title,256,"%s",buffer);
+          free(key);
+          key=NULL;
 #ifdef DEBUG
-	  fprintf(stderr,"%s\n",buffer);
+          fprintf(stderr,"%s\n",buffer);
 #endif
 
 
 
 
-	  // read eoo
-	  if (!in_array) offs++;
-	}
-	else {
-	  key=strdup(buffer);
+          // read eoo
+          if (!in_array) offs++;
+        } else {
+          key=strdup(buffer);
 #ifdef DEBUG
-	  fprintf(stderr,"%s:",key);
+          fprintf(stderr,"%s:",key);
 #endif
-	}
-	break;
+        }
+        break;
 
       case AMF_DATA_TYPE_MIXEDARRAY:
 #ifdef DEBUG
-	fprintf(stderr,"mixed");
+        fprintf(stderr,"mixed");
 #endif
-	in_array=TRUE;
+        in_array=TRUE;
       case AMF_DATA_TYPE_ARRAY:
 #ifdef DEBUG
-	fprintf(stderr,"array\n");
+        fprintf(stderr,"array\n");
 #endif
 
-	// TODO *** - check for "keyframes" (2 arrays, "filepositions", "times") and "seekPoints" (timestamps in ms)
+        // TODO *** - check for "keyframes" (2 arrays, "filepositions", "times") and "seekPoints" (timestamps in ms)
 
 
-	offs+=4; // max array elem
-	if (key!=NULL) free(key);
-	key=NULL;
-	//eoo++;
-	break;
+        offs+=4; // max array elem
+        if (key!=NULL) free(key);
+        key=NULL;
+        //eoo++;
+        break;
 
       case AMF_DATA_TYPE_NUMBER:
-	num_val = getfloat64(&pack.data[offs]);
+        num_val = getfloat64(&pack.data[offs]);
 #ifdef DEBUG
-	fprintf(stderr,"%f\n",num_val);
+        fprintf(stderr,"%f\n",num_val);
 #endif
 
-	offs+=8;
+        offs+=8;
 
-	if (!is_partial_clone&&!strcmp(key,"framerate")) cdata->fps=num_val;
-	if (!is_partial_clone&&!strcmp(key,"videoframerate")) cdata->fps=num_val;
-	if (!strcmp(key,"audiosamplerate")) cdata->arate=num_val;
-	if (!strcmp(key,"audiosamplesize")) cdata->asamps=num_val;
-	//if (!strcmp(key,"lasttimestamp")) lasttimestamp=num_val;
-	if (!strcmp(key,"height")) cdata->height=num_val;
-	if (!strcmp(key,"width")) cdata->width=num_val;
+        if (!is_partial_clone&&!strcmp(key,"framerate")) cdata->fps=num_val;
+        if (!is_partial_clone&&!strcmp(key,"videoframerate")) cdata->fps=num_val;
+        if (!strcmp(key,"audiosamplerate")) cdata->arate=num_val;
+        if (!strcmp(key,"audiosamplesize")) cdata->asamps=num_val;
+        //if (!strcmp(key,"lasttimestamp")) lasttimestamp=num_val;
+        if (!strcmp(key,"height")) cdata->height=num_val;
+        if (!strcmp(key,"width")) cdata->width=num_val;
+
+        if (key!=NULL) free(key);
+        key=NULL;
+        break;
 
-	if (key!=NULL) free(key);
-	key=NULL;
-	break;
-      
       case AMF_DATA_TYPE_BOOL:
-	num_val = (int)((pack.data[offs]&0xFF));
+        num_val = (int)((pack.data[offs]&0xFF));
 #ifdef DEBUG
-	fprintf(stderr,"%s\n",((int)num_val==1)?"true":"false");
+        fprintf(stderr,"%s\n",((int)num_val==1)?"true":"false");
 #endif
 
-	offs+=1;
+        offs+=1;
 
-	//if (!strcmp(key,"hasKeyframes")&&num_val==1.) haskeyframes=TRUE;
-	//else if (!strcmp(key,"canSeekToEnd")&&num_val==1.) canseekend=TRUE;
-	if (!strcmp(key,"hasAudio")&&num_val==0.) hasaudio=FALSE;
-	else if (!strcmp(key,"stereo")&&num_val==1.) cdata->achans=2;
+        //if (!strcmp(key,"hasKeyframes")&&num_val==1.) haskeyframes=TRUE;
+        //else if (!strcmp(key,"canSeekToEnd")&&num_val==1.) canseekend=TRUE;
+        if (!strcmp(key,"hasAudio")&&num_val==0.) hasaudio=FALSE;
+        else if (!strcmp(key,"stereo")&&num_val==1.) cdata->achans=2;
 
-	if (key!=NULL) free(key);
-	key=NULL;
+        if (key!=NULL) free(key);
+        key=NULL;
 
-	break;
+        break;
 
       case AMF_DATA_TYPE_DATE:
-	offs+=10;
-	if (key!=NULL) free(key);
-	key=NULL;
+        offs+=10;
+        if (key!=NULL) free(key);
+        key=NULL;
 #ifdef DEBUG
-	fprintf(stderr,"\n");
+        fprintf(stderr,"\n");
 #endif
-	break;
-      
+        break;
+
       default:
-	if (key!=NULL) free(key);
-	key=NULL;
-	break;
+        if (key!=NULL) free(key);
+        key=NULL;
+        break;
 
       }
 
@@ -865,14 +860,13 @@
     }
 
     /*  if (!haskeyframes) {
-	fprintf(stderr, "flv_decoder: non-seekable file %s\n",cdata->URI);
-	close(priv->fd);
-	return FALSE;
-	} */
+    fprintf(stderr, "flv_decoder: non-seekable file %s\n",cdata->URI);
+    close(priv->fd);
+    return FALSE;
+    } */
 
 
-  }
-  else priv->input_position-=11;
+  } else priv->input_position-=11;
 
   cdata->seek_flag=LIVES_SEEK_FAST|LIVES_SEEK_NEEDS_CALCULATION;
 
@@ -891,15 +885,15 @@
   while (!got_astream || !got_vstream) {
     do {
       if (!lives_flv_parse_pack_header(cdata,&pack)) {
-	close(priv->fd);
-	return FALSE;
+        close(priv->fd);
+        return FALSE;
       }
       if (pack.size==0) priv->input_position+=4; // backwards size
     } while (pack.size==0);
-    
-  
+
+
     pack.data=malloc(8);  // we only need at most 8 bytes here
-    if (read (priv->fd, pack.data, 8) < 8) {
+    if (read(priv->fd, pack.data, 8) < 8) {
       fprintf(stderr, "flv_decoder: error in stream header for %s\n",cdata->URI);
       free(pack.data);
       close(priv->fd);
@@ -915,49 +909,57 @@
       acodec=flags&FLV_AUDIO_CODECID_MASK;
       switch (acodec) {
       case 0:
-	// platform endian
-	sprintf(cdata->audio_name,"%s","pcm"); break;
+        // platform endian
+        sprintf(cdata->audio_name,"%s","pcm");
+        break;
       case 1:
-	sprintf(cdata->audio_name,"%s","adpcm"); break;
+        sprintf(cdata->audio_name,"%s","adpcm");
+        break;
       case 14:
-	cdata->arate=8192;
+        cdata->arate=8192;
       case 2:
-	sprintf(cdata->audio_name,"%s","mp3"); break;
+        sprintf(cdata->audio_name,"%s","mp3");
+        break;
       case 3:
-	// little endian
-	sprintf(cdata->audio_name,"%s","pcm"); break;
+        // little endian
+        sprintf(cdata->audio_name,"%s","pcm");
+        break;
       case 4:
       case 5:
       case 6:
-	sprintf(cdata->audio_name,"%s","nellymoser"); break;
+        sprintf(cdata->audio_name,"%s","nellymoser");
+        break;
       case 7:
       case 8:
-	sprintf(cdata->audio_name,"%s","logpcm"); break;
+        sprintf(cdata->audio_name,"%s","logpcm");
+        break;
       case 10:
-	sprintf(cdata->audio_name,"%s","aac"); break;
+        sprintf(cdata->audio_name,"%s","aac");
+        break;
       case 11:
-	sprintf(cdata->audio_name,"%s","speex"); break;
+        sprintf(cdata->audio_name,"%s","speex");
+        break;
       default:
-	break;
+        break;
       }
 
       if (cdata->arate==0) {
-	unsigned char aratec=flags&FLV_AUDIO_SAMPLERATE_MASK;
-	cdata->arate=44100;
-	if (aratec<3) cdata->arate>>=1;
-	if (aratec<2) cdata->arate>>=1;
-	if (aratec==0) cdata->arate=5500; 
+        unsigned char aratec=flags&FLV_AUDIO_SAMPLERATE_MASK;
+        cdata->arate=44100;
+        if (aratec<3) cdata->arate>>=1;
+        if (aratec<2) cdata->arate>>=1;
+        if (aratec==0) cdata->arate=5500;
       }
 
       if (cdata->achans==0) {
-	cdata->achans=2;
-	if ((flags&FLV_AUDIO_CHANNEL_MASK)==0) cdata->achans=1;
+        cdata->achans=2;
+        if ((flags&FLV_AUDIO_CHANNEL_MASK)==0) cdata->achans=1;
       }
 
 
       if (cdata->asamps==0) {
-	cdata->asamps=16;
-	if ((flags&FLV_AUDIO_SAMPLESIZE_MASK)==0) cdata->asamps=8;
+        cdata->asamps=16;
+        if ((flags&FLV_AUDIO_SAMPLESIZE_MASK)==0) cdata->asamps=8;
       }
 
       got_astream=TRUE;
@@ -969,17 +971,17 @@
       flags=pack.data[0];
 
       if ((flags & 0xF0)==0x50) { // video info / command frame
-	free(pack.data);
-	continue;
+        free(pack.data);
+        continue;
       }
 
 
       if (got_vstream) {
 #ifdef DEBUG
-	fprintf(stderr,"flv_decoder: got duplicate video stream in %s\n",cdata->URI);
+        fprintf(stderr,"flv_decoder: got duplicate video stream in %s\n",cdata->URI);
 #endif
-	free(pack.data);
-	continue;
+        free(pack.data);
+        continue;
       }
       got_vstream=TRUE;
       priv->data_start=priv->input_position-pack.size-4-11;
@@ -991,53 +993,57 @@
       priv->pack_offset=0;
 
       switch (vcodec) {
-      case FLV_CODECID_H263  : sprintf(cdata->video_name,"%s","flv1");
-	codec = avcodec_find_decoder(CODEC_ID_FLV1);
-	priv->pack_offset=1;
-	break;
-      case FLV_CODECID_SCREEN: sprintf(cdata->video_name,"%s","flashsv"); 
-	codec = avcodec_find_decoder(CODEC_ID_FLASHSV);
-	priv->pack_offset=1;
-	break;
-      case FLV_CODECID_SCREEN2: sprintf(cdata->video_name,"%s","flashsv2"); 
-	codec = avcodec_find_decoder(CODEC_ID_FLASHSV2);
-	priv->pack_offset=1;
-	break;
-      case FLV_CODECID_VP6   : sprintf(cdata->video_name,"%s","vp6f"); 
-	cdata->offs_x=(pack.data[1]&0X0F)>>1; // divide by 2 for offset
-	cdata->offs_y=(pack.data[1]&0XF0)>>5; // divide by 2 for offset
-	if (cdata->width==0) cdata->width=pack.data[7]*16-cdata->offs_x*2;
-	if (cdata->height==0) cdata->height=pack.data[6]*16-cdata->offs_y*2;
-	codec = avcodec_find_decoder(CODEC_ID_VP6F);
-	priv->pack_offset=2;
-	break;
+      case FLV_CODECID_H263  :
+        sprintf(cdata->video_name,"%s","flv1");
+        codec = avcodec_find_decoder(CODEC_ID_FLV1);
+        priv->pack_offset=1;
+        break;
+      case FLV_CODECID_SCREEN:
+        sprintf(cdata->video_name,"%s","flashsv");
+        codec = avcodec_find_decoder(CODEC_ID_FLASHSV);
+        priv->pack_offset=1;
+        break;
+      case FLV_CODECID_SCREEN2:
+        sprintf(cdata->video_name,"%s","flashsv2");
+        codec = avcodec_find_decoder(CODEC_ID_FLASHSV2);
+        priv->pack_offset=1;
+        break;
+      case FLV_CODECID_VP6   :
+        sprintf(cdata->video_name,"%s","vp6f");
+        cdata->offs_x=(pack.data[1]&0X0F)>>1; // divide by 2 for offset
+        cdata->offs_y=(pack.data[1]&0XF0)>>5; // divide by 2 for offset
+        if (cdata->width==0) cdata->width=pack.data[7]*16-cdata->offs_x*2;
+        if (cdata->height==0) cdata->height=pack.data[6]*16-cdata->offs_y*2;
+        codec = avcodec_find_decoder(CODEC_ID_VP6F);
+        priv->pack_offset=2;
+        break;
       case FLV_CODECID_VP6A  :
-	codec = avcodec_find_decoder(CODEC_ID_VP6A);
-	priv->ctx = ctx = avcodec_alloc_context3(codec);
-
-	sprintf(cdata->video_name,"%s","vp6a");
-	cdata->offs_x=(pack.data[1]&0X0F)>>1; // divide by 2 for offset
-	cdata->offs_y=(pack.data[1]&0XF0)>>5; // divide by 2 for offset
-	if (cdata->width==0) cdata->width=pack.data[7]*16-cdata->offs_x*2;
-	if (cdata->height==0) cdata->height=pack.data[6]*16-cdata->offs_y*2;
-	if (ctx->extradata_size != 1) {
-	  ctx->extradata_size = 1;
-	  ctx->extradata = av_malloc(1);
-	}
-	ctx->extradata[0] = pack.data[1];
-
-	priv->pack_offset=2;
-	break;
+        codec = avcodec_find_decoder(CODEC_ID_VP6A);
+        priv->ctx = ctx = avcodec_alloc_context3(codec);
+
+        sprintf(cdata->video_name,"%s","vp6a");
+        cdata->offs_x=(pack.data[1]&0X0F)>>1; // divide by 2 for offset
+        cdata->offs_y=(pack.data[1]&0XF0)>>5; // divide by 2 for offset
+        if (cdata->width==0) cdata->width=pack.data[7]*16-cdata->offs_x*2;
+        if (cdata->height==0) cdata->height=pack.data[6]*16-cdata->offs_y*2;
+        if (ctx->extradata_size != 1) {
+          ctx->extradata_size = 1;
+          ctx->extradata = av_malloc(1);
+        }
+        ctx->extradata[0] = pack.data[1];
+
+        priv->pack_offset=2;
+        break;
       case FLV_CODECID_H264:
-	// broken....
-	sprintf(cdata->video_name,"%s","h264");
-	codec = avcodec_find_decoder(CODEC_ID_H264);
-	priv->pack_offset=5;
-	break;
+        // broken....
+        sprintf(cdata->video_name,"%s","h264");
+        codec = avcodec_find_decoder(CODEC_ID_H264);
+        priv->pack_offset=5;
+        break;
       default:
-	fprintf(stderr,"flv_decoder: unknown video stream type (%d) in %s\n",vcodec,cdata->URI);
-	memset(cdata->video_name,0,1);
-	break;
+        fprintf(stderr,"flv_decoder: unknown video stream type (%d) in %s\n",vcodec,cdata->URI);
+        memset(cdata->video_name,0,1);
+        break;
       }
 
     }
@@ -1050,18 +1056,18 @@
 
 #ifdef DEBUG
   fprintf(stderr,"video type is %s %d x %d (%d x %d +%d +%d)\n",cdata->video_name,
-	  cdata->width,cdata->height,cdata->frame_width,cdata->frame_height,cdata->offs_x,cdata->offs_y);
+          cdata->width,cdata->height,cdata->frame_width,cdata->frame_height,cdata->offs_x,cdata->offs_y);
 #endif
 
 
   if (!codec) {
-    if (strlen(cdata->video_name)>0) 
+    if (strlen(cdata->video_name)>0)
       fprintf(stderr, "flv_decoder: Could not find avcodec codec for video type %s\n",cdata->video_name);
     detach_stream(cdata);
     return FALSE;
   }
 
-  if (ctx==NULL) 
+  if (ctx==NULL)
     priv->ctx = ctx = avcodec_alloc_context3(codec);
 
   if (avcodec_open2(ctx, codec, NULL) < 0) {
@@ -1084,56 +1090,55 @@
       priv->input_position+=pack.size+4;
 
       if (pack.size==0) {
-	lives_flv_parse_pack_header(cdata,&pack);
-	continue;
+        lives_flv_parse_pack_header(cdata,&pack);
+        continue;
       }
 
       if (pack.type!=FLV_TAG_TYPE_VIDEO) {
-	lives_flv_parse_pack_header(cdata,&pack);
-	continue;
+        lives_flv_parse_pack_header(cdata,&pack);
+        continue;
       }
 
       // read 5 bytes
       pack.data=malloc(5);
-      if (read (priv->fd, pack.data, 5) < 5) {
-	fprintf(stderr, "flv_decoder: error in stream header for %s\n",cdata->URI);
-	free(pack.data);
-	detach_stream(cdata);
-	return FALSE;
+      if (read(priv->fd, pack.data, 5) < 5) {
+        fprintf(stderr, "flv_decoder: error in stream header for %s\n",cdata->URI);
+        free(pack.data);
+        detach_stream(cdata);
+        return FALSE;
       }
-      
+
       flags=pack.data[0];
       avctype=pack.data[1];
-      
+
       if ((flags & 0xF0)==0x50) { // video info / command frame
-	free(pack.data);
-	lives_flv_parse_pack_header(cdata,&pack);
-	continue;
+        free(pack.data);
+        lives_flv_parse_pack_header(cdata,&pack);
+        continue;
       }
 
       if (avctype==1&&got_avcextradata) {
-	// got first real video packet
-	priv->input_position-=(pack.size+4);
-	priv->data_start=priv->input_position-11;
-	free(pack.data);
-	break;
+        // got first real video packet
+        priv->input_position-=(pack.size+4);
+        priv->data_start=priv->input_position-11;
+        free(pack.data);
+        break;
       }
 
       if (avctype==0) { // avc header for h264
 #ifdef DEBUG
-	fprintf(stderr,"getting extradata size %d\n",pack.size-5);
+        fprintf(stderr,"getting extradata size %d\n",pack.size-5);
 #endif
-	flv_get_extradata(cdata,pack.size-5);
-	free(pack.data);
-	got_avcextradata=TRUE;
-	lives_flv_parse_pack_header(cdata,&pack);
-	continue;
+        flv_get_extradata(cdata,pack.size-5);
+        free(pack.data);
+        got_avcextradata=TRUE;
+        lives_flv_parse_pack_header(cdata,&pack);
+        continue;
       }
 
 
     }
-  }
-  else if (priv->pack_offset!=0) lseek(priv->fd,priv->pack_offset,SEEK_CUR);
+  } else if (priv->pack_offset!=0) lseek(priv->fd,priv->pack_offset,SEEK_CUR);
 
   if (isclone) return TRUE;
 
@@ -1141,7 +1146,7 @@
 
   av_init_packet(&priv->avpkt);
 
-  priv->avpkt.size=read (priv->fd, pack.data, pack.size-priv->pack_offset);
+  priv->avpkt.size=read(priv->fd, pack.data, pack.size-priv->pack_offset);
   memset(pack.data+priv->avpkt.size,0,FF_INPUT_BUFFER_PADDING_SIZE);
   priv->input_position+=pack.size+4;
   priv->avpkt.data = pack.data;
@@ -1154,9 +1159,9 @@
 
     // this does not work for h264 and I dont know why not !!!!!!!!!!!!!!!!!!!!
 #if LIBAVCODEC_VERSION_MAJOR >= 52
-    len=avcodec_decode_video2(ctx, priv->picture, &got_picture, &priv->avpkt );
-#else 
-    len=avcodec_decode_video(ctx, priv->picture, &got_picture, priv->avpkt.data, priv->avpkt.size );
+    len=avcodec_decode_video2(ctx, priv->picture, &got_picture, &priv->avpkt);
+#else
+    len=avcodec_decode_video(ctx, priv->picture, &got_picture, priv->avpkt.data, priv->avpkt.size);
 #endif
     len=len;
 
@@ -1164,49 +1169,49 @@
       break;  // code below should pull more packets for h264, but still does not work !!!!!!
 
       // pull next video packet
- 
+
       while (1) {
-	lives_flv_parse_pack_header(cdata,&pack);
-	priv->input_position+=pack.size+4;
-	if (pack.size==0) continue;
-
-	if (pack.type==FLV_TAG_TYPE_VIDEO) {
-
-	  pack.data=malloc(5);  // we only need at most 5 bytes here
-	  if (read (priv->fd, pack.data, 5) < 5) {
-	    fprintf(stderr, "flv_decoder: error in stream header for %s\n",cdata->URI);
-	    free(pack.data);
-	    close(priv->fd);
-	    return FALSE;
-	  }
-
-	  flags=pack.data[0];
-	  avctype=pack.data[1];
-	  
-	  if ((flags & 0xF0)==0x50) { // video info / command frame
-	    free(pack.data);
-	    continue;
-	  }
-
-	  if (avctype==0) { // avc header for h264
-	    printf("getting extradata %d %d\n",ctx->extradata_size,pack.size);
-	    flv_get_extradata(cdata,pack.size-5);
-	    free(pack.data);
-	    continue;
-	  }
-
-	  if (avctype!=1) { // avc header for h264
-	    free(pack.data);
-	    continue;
-	  }
-
-	  pack.data=malloc(pack.size-priv->pack_offset+FF_INPUT_BUFFER_PADDING_SIZE);
-	  if (priv->pack_offset!=5) lseek(priv->fd,priv->pack_offset-5,SEEK_CUR);
-	  priv->avpkt.size=read (priv->fd, pack.data, pack.size-priv->pack_offset);
-	  memset(pack.data+priv->avpkt.size,0,FF_INPUT_BUFFER_PADDING_SIZE);
-	  priv->avpkt.data = pack.data;
-	  break;
-	}
+        lives_flv_parse_pack_header(cdata,&pack);
+        priv->input_position+=pack.size+4;
+        if (pack.size==0) continue;
+
+        if (pack.type==FLV_TAG_TYPE_VIDEO) {
+
+          pack.data=malloc(5);  // we only need at most 5 bytes here
+          if (read(priv->fd, pack.data, 5) < 5) {
+            fprintf(stderr, "flv_decoder: error in stream header for %s\n",cdata->URI);
+            free(pack.data);
+            close(priv->fd);
+            return FALSE;
+          }
+
+          flags=pack.data[0];
+          avctype=pack.data[1];
+
+          if ((flags & 0xF0)==0x50) { // video info / command frame
+            free(pack.data);
+            continue;
+          }
+
+          if (avctype==0) { // avc header for h264
+            printf("getting extradata %d %d\n",ctx->extradata_size,pack.size);
+            flv_get_extradata(cdata,pack.size-5);
+            free(pack.data);
+            continue;
+          }
+
+          if (avctype!=1) { // avc header for h264
+            free(pack.data);
+            continue;
+          }
+
+          pack.data=malloc(pack.size-priv->pack_offset+FF_INPUT_BUFFER_PADDING_SIZE);
+          if (priv->pack_offset!=5) lseek(priv->fd,priv->pack_offset-5,SEEK_CUR);
+          priv->avpkt.size=read(priv->fd, pack.data, pack.size-priv->pack_offset);
+          memset(pack.data+priv->avpkt.size,0,FF_INPUT_BUFFER_PADDING_SIZE);
+          priv->avpkt.data = pack.data;
+          break;
+        }
       }
     }
 
@@ -1230,7 +1235,7 @@
   if (ctx->colorspace==AVCOL_SPC_BT709) cdata->YUV_subspace=WEED_YUV_SUBSPACE_BT709;
 
   cdata->palettes[0]=avi_pix_fmt_to_weed_palette(ctx->pix_fmt,
-						 &cdata->YUV_clamping);
+                     &cdata->YUV_clamping);
 
   if (cdata->palettes[0]==WEED_PALETTE_END) {
     fprintf(stderr, "flv_decoder: Could not find a usable palette for (%d) %s\n",ctx->pix_fmt,cdata->URI);
@@ -1245,7 +1250,7 @@
 
   if (cdata->width==0) cdata->width=ctx->width-cdata->offs_x*2;
   if (cdata->height==0) cdata->height=ctx->height-cdata->offs_y*2;
-  
+
   if (cdata->width*cdata->height==0) {
     fprintf(stderr, "flv_decoder: invalid width and height (%d X %d)\n",cdata->width,cdata->height);
     detach_stream(cdata);
@@ -1254,7 +1259,7 @@
 
 #ifdef DEBUG
   fprintf(stderr,"using palette %d, size %d x %d\n",
-	  cdata->current_palette,cdata->width,cdata->height);
+          cdata->current_palette,cdata->width,cdata->height);
 #endif
 
   cdata->par=(double)ctx->sample_aspect_ratio.num/(double)ctx->sample_aspect_ratio.den;
@@ -1282,17 +1287,17 @@
       res=system(cmd);
 
       if (res) {
-	snprintf(cmd,1024,"LANGUAGE=en LANG=en mplayer2 \"%s\" -identify -frames 0 2>/dev/null | grep ID_VIDEO_FPS > %s",cdata->URI,tmpfname);
-	res=system(cmd);
+        snprintf(cmd,1024,"LANGUAGE=en LANG=en mplayer2 \"%s\" -identify -frames 0 2>/dev/null | grep ID_VIDEO_FPS > %s",cdata->URI,tmpfname);
+        res=system(cmd);
       }
 
       if (!res) {
-	char buffer[1024];
-	ssize_t bytes=read(ofd,buffer,1024);
-	memset(buffer+bytes,0,1);
-	if (!(strncmp(buffer,"ID_VIDEO_FPS=",13))) {
-	  cdata->fps=strtod (buffer+13,NULL);
-	}
+        char buffer[1024];
+        ssize_t bytes=read(ofd,buffer,1024);
+        memset(buffer+bytes,0,1);
+        if (!(strncmp(buffer,"ID_VIDEO_FPS=",13))) {
+          cdata->fps=strtod(buffer+13,NULL);
+        }
       }
       close(ofd);
       unlink(tmpfname);
@@ -1310,7 +1315,7 @@
     detach_stream(cdata);
     return FALSE;
   }
-  
+
   if (ctx->ticks_per_frame==2) {
     // TODO - needs checking
     cdata->fps/=2.;
@@ -1367,12 +1372,12 @@
 
 
 
-static lives_clip_data_t *init_cdata (void) {
+static lives_clip_data_t *init_cdata(void) {
   lives_flv_priv_t *priv;
   lives_clip_data_t *cdata=(lives_clip_data_t *)malloc(sizeof(lives_clip_data_t));
 
   cdata->URI=NULL;
-  
+
   cdata->priv=priv=malloc(sizeof(lives_flv_priv_t));
 
   cdata->seek_flag=0;
@@ -1452,8 +1457,7 @@
 
   if (spriv!=NULL) {
     dpriv->data_start=spriv->data_start;
-  }
-  else {
+  } else {
     clone->nclips=1;
 
     ///////////////////////////////////////////////////////////
@@ -1564,7 +1568,8 @@
   priv->picture=NULL;
 
   if (cdata->width!=cdata->frame_width||cdata->height!=cdata->frame_height)
-    fprintf(stderr,"flv_decoder: info - frame size=%d x %d, pixel size=%d x %d\n",cdata->frame_width,cdata->frame_height,cdata->width,cdata->height);
+    fprintf(stderr,"flv_decoder: info - frame size=%d x %d, pixel size=%d x %d\n",cdata->frame_width,cdata->frame_height,cdata->width,
+            cdata->height);
 
   return cdata;
 }
@@ -1573,7 +1578,7 @@
   unsigned char *dst=idst;
   register int i;
 
-  for (i=0;i<npixels;i++) {
+  for (i=0; i<npixels; i++) {
     switch (pal) {
     case WEED_PALETTE_RGBA32:
     case WEED_PALETTE_BGRA32:
@@ -1611,7 +1616,8 @@
       dst[0]=dst[3]=128;
       dst[1]=dst[2]=dst[4]=dst[5]=y_black;
       dst+=6;
-    default: break;
+    default:
+      break;
     }
   }
   return idst-dst;
@@ -1632,7 +1638,7 @@
   int y_black=(cdata->YUV_clamping==WEED_YUV_CLAMPING_CLAMPED)?16:0;
   boolean got_picture=FALSE;
   unsigned char *dst,*src,flags;
-  unsigned char black[4]={0,0,0,255};
+  unsigned char black[4]= {0,0,0,255};
   index_entry *idx;
   register int i,p;
 
@@ -1641,38 +1647,38 @@
 #endif
 
   if (pixel_data!=NULL) {
-    
+
     // calc frame width and height, including any border
-    
+
     if (pal==WEED_PALETTE_YUV420P||pal==WEED_PALETTE_YVU420P||pal==WEED_PALETTE_YUV422P||pal==WEED_PALETTE_YUV444P) {
       nplanes=3;
       black[0]=y_black;
       black[1]=black[2]=128;
-    }
-    else if (pal==WEED_PALETTE_YUVA4444P) {
+    } else if (pal==WEED_PALETTE_YUVA4444P) {
       nplanes=4;
       black[0]=y_black;
       black[1]=black[2]=128;
       black[3]=255;
     }
-    
+
     if (pal==WEED_PALETTE_RGB24||pal==WEED_PALETTE_BGR24) psize=3;
-    
-    if (pal==WEED_PALETTE_RGBA32||pal==WEED_PALETTE_BGRA32||pal==WEED_PALETTE_ARGB32||pal==WEED_PALETTE_UYVY8888||pal==WEED_PALETTE_YUYV8888||pal==WEED_PALETTE_YUV888||pal==WEED_PALETTE_YUVA8888) psize=4;
-    
+
+    if (pal==WEED_PALETTE_RGBA32||pal==WEED_PALETTE_BGRA32||pal==WEED_PALETTE_ARGB32||pal==WEED_PALETTE_UYVY8888||pal==WEED_PALETTE_YUYV8888||
+        pal==WEED_PALETTE_YUV888||pal==WEED_PALETTE_YUVA8888) psize=4;
+
     if (pal==WEED_PALETTE_YUV411) psize=6;
-    
+
     if (pal==WEED_PALETTE_A1) dstwidth>>=3;
-    
+
     dstwidth*=psize;
-    
+
     if (cdata->frame_height > cdata->height && height == cdata->height) {
       // host ignores vertical border
       btop=0;
       xheight=cdata->height;
       bbot=xheight-1;
     }
-    
+
     if (cdata->frame_width > cdata->width && rowstrides[0] < cdata->frame_width*psize) {
       // host ignores horizontal border
       bleft=bright=0;
@@ -1684,26 +1690,24 @@
   if (tframe!=priv->last_frame) {
 
     if (priv->last_frame==-1 || (tframe<priv->last_frame) || (tframe - priv->last_frame > rescan_limit)) {
-      
+
       pthread_mutex_lock(&priv->idxc->mutex);
       if ((idx=get_idx_for_pts(cdata,target_pts))!=NULL) {
-	priv->input_position=idx->offs;
-	nextframe=dts_to_frame(cdata,idx->dts);
-      }
-      else priv->input_position=priv->data_start;
+        priv->input_position=idx->offs;
+        nextframe=dts_to_frame(cdata,idx->dts);
+      } else priv->input_position=priv->data_start;
       pthread_mutex_unlock(&priv->idxc->mutex);
-      
+
       // we are now at the kframe before or at target - parse packets until we hit target
-      
+
 
 #ifdef DEBUG_KFRAMES
       if (idx!=NULL) printf("got kframe %ld for frame %ld\n",dts_to_frame(cdata,idx->dts),tframe);
 #endif
 
-      avcodec_flush_buffers (priv->ctx);
+      avcodec_flush_buffers(priv->ctx);
 
-    }
-    else {
+    } else {
       nextframe=priv->last_frame+1;
     }
 
@@ -1725,17 +1729,17 @@
 
       if (pack.type!=FLV_TAG_TYPE_VIDEO) continue;
 
-      if (read (priv->fd, &flags, 1) < 1) return FALSE;
+      if (read(priv->fd, &flags, 1) < 1) return FALSE;
 
       if ((flags & 0xF0)==0x50) { // video info / command frame
-	continue;
+        continue;
       }
 
       pack.data=malloc(pack.size-priv->pack_offset+FF_INPUT_BUFFER_PADDING_SIZE);
 
       if (priv->pack_offset!=1) lseek(priv->fd,priv->pack_offset-1,SEEK_CUR);
 
-      priv->avpkt.size=read (priv->fd, pack.data, pack.size-priv->pack_offset);
+      priv->avpkt.size=read(priv->fd, pack.data, pack.size-priv->pack_offset);
       memset(pack.data+priv->avpkt.size,0,FF_INPUT_BUFFER_PADDING_SIZE);
       priv->avpkt.data = pack.data;
       priv->avpkt.dts=priv->avpkt.pts=pack.dts;
@@ -1743,33 +1747,33 @@
       got_picture=FALSE;
 
       if ((pack.data[0] & FLV_VIDEO_CODECID_MASK)==FLV_CODECID_VP6A) {
-	priv->ctx->extradata[0] = pack.data[1];
+        priv->ctx->extradata[0] = pack.data[1];
       }
 
       if (nextframe<tframe&&(pack.data[0] & FLV_VIDEO_CODECID_MASK)==FLV_CODECID_H263
-	  &&(pack.data[0] & FLV_VIDEO_FRAMETYPE_MASK)==0x03) {
-	// disposable intra-frame
-	free(pack.data);
-	nextframe++;
-	continue;
+          &&(pack.data[0] & FLV_VIDEO_FRAMETYPE_MASK)==0x03) {
+        // disposable intra-frame
+        free(pack.data);
+        nextframe++;
+        continue;
       }
 
       if (nextframe==tframe) priv->ctx->skip_frame=AVDISCARD_DEFAULT;
 
       while (!got_picture) {
-	int len;
+        int len;
 #if LIBAVCODEC_VERSION_MAJOR >= 52
-	len=avcodec_decode_video2(priv->ctx, priv->picture, &got_picture, &priv->avpkt );
-#else 
-	len=avcodec_decode_video(priv->ctx, priv->picture, &got_picture, priv->avpkt.data, priv->avpkt.size );
+        len=avcodec_decode_video2(priv->ctx, priv->picture, &got_picture, &priv->avpkt);
+#else
+        len=avcodec_decode_video(priv->ctx, priv->picture, &got_picture, priv->avpkt.data, priv->avpkt.size);
 #endif
-	priv->avpkt.size-=len;
-	priv->avpkt.data+=len;
+        priv->avpkt.size-=len;
+        priv->avpkt.data+=len;
 
-	if (!got_picture&&priv->avpkt.size<=0) {
-	  free(pack.data);
-	  return FALSE;
-	}
+        if (!got_picture&&priv->avpkt.size<=0) {
+          free(pack.data);
+          return FALSE;
+        }
       }
 
       free(pack.data);
@@ -1781,39 +1785,39 @@
   }
 
   if (priv->picture==NULL||pixel_data==NULL) return TRUE;
-  
-  for (p=0;p<nplanes;p++) {
+
+  for (p=0; p<nplanes; p++) {
     dst=pixel_data[p];
     src=priv->picture->data[p];
 
-    for (i=0;i<xheight;i++) {
+    for (i=0; i<xheight; i++) {
       if (i<btop||i>bbot) {
-	// top or bottom border, copy black row
-	if (pal==WEED_PALETTE_YUV420P||pal==WEED_PALETTE_YVU420P||pal==WEED_PALETTE_YUV422P||pal==WEED_PALETTE_YUV444P||pal==WEED_PALETTE_YUVA4444P||pal==WEED_PALETTE_RGB24||pal==WEED_PALETTE_BGR24) {
-	  memset(dst,black[p],dstwidth+(bleft+bright)*psize);
-	  dst+=dstwidth+(bleft+bright)*psize;
-	}
-	else dst+=write_black_pixel(dst,pal,dstwidth/psize+bleft+bright,y_black);
-	continue;
+        // top or bottom border, copy black row
+        if (pal==WEED_PALETTE_YUV420P||pal==WEED_PALETTE_YVU420P||pal==WEED_PALETTE_YUV422P||pal==WEED_PALETTE_YUV444P||
+            pal==WEED_PALETTE_YUVA4444P||pal==WEED_PALETTE_RGB24||pal==WEED_PALETTE_BGR24) {
+          memset(dst,black[p],dstwidth+(bleft+bright)*psize);
+          dst+=dstwidth+(bleft+bright)*psize;
+        } else dst+=write_black_pixel(dst,pal,dstwidth/psize+bleft+bright,y_black);
+        continue;
       }
 
       if (bleft>0) {
-	if (pal==WEED_PALETTE_YUV420P||pal==WEED_PALETTE_YVU420P||pal==WEED_PALETTE_YUV422P||pal==WEED_PALETTE_YUV444P||pal==WEED_PALETTE_YUVA4444P||pal==WEED_PALETTE_RGB24||pal==WEED_PALETTE_BGR24) {
-	  memset(dst,black[p],bleft*psize);
-	  dst+=bleft*psize;
-	}
-	else dst+=write_black_pixel(dst,pal,bleft,y_black);
+        if (pal==WEED_PALETTE_YUV420P||pal==WEED_PALETTE_YVU420P||pal==WEED_PALETTE_YUV422P||pal==WEED_PALETTE_YUV444P||
+            pal==WEED_PALETTE_YUVA4444P||pal==WEED_PALETTE_RGB24||pal==WEED_PALETTE_BGR24) {
+          memset(dst,black[p],bleft*psize);
+          dst+=bleft*psize;
+        } else dst+=write_black_pixel(dst,pal,bleft,y_black);
       }
 
       memcpy(dst,src,dstwidth);
       dst+=dstwidth;
 
       if (bright>0) {
-	if (pal==WEED_PALETTE_YUV420P||pal==WEED_PALETTE_YVU420P||pal==WEED_PALETTE_YUV422P||pal==WEED_PALETTE_YUV444P||pal==WEED_PALETTE_YUVA4444P||pal==WEED_PALETTE_RGB24||pal==WEED_PALETTE_BGR24) {
-	  memset(dst,black[p],bright*psize);
-	  dst+=bright*psize;
-	}
-	else dst+=write_black_pixel(dst,pal,bright,y_black);
+        if (pal==WEED_PALETTE_YUV420P||pal==WEED_PALETTE_YVU420P||pal==WEED_PALETTE_YUV422P||pal==WEED_PALETTE_YUV444P||
+            pal==WEED_PALETTE_YUVA4444P||pal==WEED_PALETTE_RGB24||pal==WEED_PALETTE_BGR24) {
+          memset(dst,black[p],bright*psize);
+          dst+=bright*psize;
+        } else dst+=write_black_pixel(dst,pal,bright,y_black);
       }
 
       src+=priv->picture->linesize[p];
@@ -1829,7 +1833,7 @@
       bbot>>=1;
     }
   }
-  
+
   return TRUE;
 }

LiVES-2.2.8.tar.bz2/lives-plugins/plugins/decoders/flv_decoder.h -> LiVES-2.4.1.tar.bz2/lives-plugins/plugins/decoders/flv_decoder.h Changed

@@ -28,8 +28,8 @@
 
 // system header flags
 enum {
-    FLV_HEADER_FLAG_HASVIDEO = 1,
-    FLV_HEADER_FLAG_HASAUDIO = 4,
+  FLV_HEADER_FLAG_HASVIDEO = 1,
+  FLV_HEADER_FLAG_HASAUDIO = 4,
 };
 
 // packet flag masks
@@ -44,39 +44,39 @@
 
 // amf data types for metadata
 typedef enum {
-    AMF_DATA_TYPE_NUMBER      = 0x00,
-    AMF_DATA_TYPE_BOOL        = 0x01,
-    AMF_DATA_TYPE_STRING      = 0x02,
-    AMF_DATA_TYPE_OBJECT      = 0x03,
-    AMF_DATA_TYPE_NULL        = 0x05,
-    AMF_DATA_TYPE_UNDEFINED   = 0x06,
-    AMF_DATA_TYPE_REFERENCE   = 0x07,
-    AMF_DATA_TYPE_MIXEDARRAY  = 0x08,
-    AMF_DATA_TYPE_OBJECT_END  = 0x09,
-    AMF_DATA_TYPE_ARRAY       = 0x0a,
-    AMF_DATA_TYPE_DATE        = 0x0b,
-    AMF_DATA_TYPE_LONG_STRING = 0x0c,
-    AMF_DATA_TYPE_UNSUPPORTED = 0x0d,
+  AMF_DATA_TYPE_NUMBER      = 0x00,
+  AMF_DATA_TYPE_BOOL        = 0x01,
+  AMF_DATA_TYPE_STRING      = 0x02,
+  AMF_DATA_TYPE_OBJECT      = 0x03,
+  AMF_DATA_TYPE_NULL        = 0x05,
+  AMF_DATA_TYPE_UNDEFINED   = 0x06,
+  AMF_DATA_TYPE_REFERENCE   = 0x07,
+  AMF_DATA_TYPE_MIXEDARRAY  = 0x08,
+  AMF_DATA_TYPE_OBJECT_END  = 0x09,
+  AMF_DATA_TYPE_ARRAY       = 0x0a,
+  AMF_DATA_TYPE_DATE        = 0x0b,
+  AMF_DATA_TYPE_LONG_STRING = 0x0c,
+  AMF_DATA_TYPE_UNSUPPORTED = 0x0d,
 } AMFDataType;
 
 
 // video codecs
 enum {
-    FLV_CODECID_H263    = 2,
-    FLV_CODECID_SCREEN  = 3,
-    FLV_CODECID_VP6     = 4,
-    FLV_CODECID_VP6A    = 5,
-    FLV_CODECID_SCREEN2 = 6,
-    FLV_CODECID_H264    = 7,
+  FLV_CODECID_H263    = 2,
+  FLV_CODECID_SCREEN  = 3,
+  FLV_CODECID_VP6     = 4,
+  FLV_CODECID_VP6A    = 5,
+  FLV_CODECID_SCREEN2 = 6,
+  FLV_CODECID_H264    = 7,
 };
 
 
 // packet tags
 enum {
-    FLV_TAG_TYPE_ERROR = 0x00,
-    FLV_TAG_TYPE_AUDIO = 0x08,
-    FLV_TAG_TYPE_VIDEO = 0x09,
-    FLV_TAG_TYPE_META  = 0x12,
+  FLV_TAG_TYPE_ERROR = 0x00,
+  FLV_TAG_TYPE_AUDIO = 0x08,
+  FLV_TAG_TYPE_VIDEO = 0x09,
+  FLV_TAG_TYPE_META  = 0x12,
 };

LiVES-2.2.8.tar.bz2/lives-plugins/plugins/decoders/libav_helper.h -> LiVES-2.4.1.tar.bz2/lives-plugins/plugins/decoders/libav_helper.h Changed

@@ -28,144 +28,6 @@
 
 #ifdef HAVE_LIBAV_LIBS
 
-#if (LIBAVCODEC_VERSION_MAJOR > 54)
-#define CodecID AVCodecID
-
-#define CODEC_ID_NONE AV_CODEC_ID_NONE
-#define CODEC_ID_H264 AV_CODEC_ID_H264
-#define CODEC_ID_H263 AV_CODEC_ID_H263
-#define CODEC_ID_H263P AV_CODEC_ID_H263P
-#define CODEC_ID_H263I AV_CODEC_ID_H263I
-#define CODEC_ID_H261 AV_CODEC_ID_H261
-#define CODEC_ID_MPEG4 AV_CODEC_ID_MPEG4
-#define CODEC_ID_MSMPEG4V3 AV_CODEC_ID_MSMPEG4V3
-#define CODEC_ID_MSMPEG4V2 AV_CODEC_ID_MSMPEG4V2
-#define CODEC_ID_MSMPEG4V1 AV_CODEC_ID_MSMPEG4V1
-#define CODEC_ID_WMV1 AV_CODEC_ID_WMV1
-#define CODEC_ID_WMV2 AV_CODEC_ID_WMV2
-#define CODEC_ID_DVVIDEO AV_CODEC_ID_DVVIDEO
-#define CODEC_ID_MPEG1VIDEO AV_CODEC_ID_MPEG1VIDEO
-#define CODEC_ID_MPEG2VIDEO AV_CODEC_ID_MPEG2VIDEO
-#define CODEC_ID_MJPEG AV_CODEC_ID_MJPEG
-#define CODEC_ID_LJPEG AV_CODEC_ID_LJPEG
-#define CODEC_ID_JPEGLS AV_CODEC_ID_JPEGLS
-#define CODEC_ID_HUFFYUV AV_CODEC_ID_HUFFYUV
-#define CODEC_ID_FFVHUFF AV_CODEC_ID_FFVHUFF
-#define CODEC_ID_CYUV AV_CODEC_ID_CYUV
-#define CODEC_ID_RAWVIDEO AV_CODEC_ID_RAWVIDEO
-#define CODEC_ID_INDEO2 AV_CODEC_ID_INDEO2
-#define CODEC_ID_INDEO3 AV_CODEC_ID_INDEO3
-#define CODEC_ID_INDEO4 AV_CODEC_ID_INDEO4
-#define CODEC_ID_INDEO5 AV_CODEC_ID_INDEO5
-#define CODEC_ID_VP3 AV_CODEC_ID_VP3
-#define CODEC_ID_VP5 AV_CODEC_ID_VP5
-#define CODEC_ID_VP6 AV_CODEC_ID_VP6
-#define CODEC_ID_VP6F AV_CODEC_ID_VP6F
-#define CODEC_ID_ASV1 AV_CODEC_ID_ASV1
-#define CODEC_ID_ASV2 AV_CODEC_ID_ASV2
-#define CODEC_ID_VCR1 AV_CODEC_ID_VCR1
-#define CODEC_ID_FFV1 AV_CODEC_ID_FFV1
-#define CODEC_ID_XAN_WC4 AV_CODEC_ID_XAN_WC4
-#define CODEC_ID_MIMIC AV_CODEC_ID_MIMIC
-#define CODEC_ID_MSRLE AV_CODEC_ID_MSRLE
-#define CODEC_ID_MSVIDEO1 AV_CODEC_ID_MSVIDEO1
-#define CODEC_ID_CINEPAK AV_CODEC_ID_CINEPAK
-#define CODEC_ID_TRUEMOTION1 AV_CODEC_ID_TRUEMOTION1
-#define CODEC_ID_TRUEMOTION2 AV_CODEC_ID_TRUEMOTION2
-#define CODEC_ID_MSZH AV_CODEC_ID_MSZH
-#define CODEC_ID_ZLIB AV_CODEC_ID_ZLIB
-#define CODEC_ID_SNOW AV_CODEC_ID_SNOW
-#define CODEC_ID_4XM AV_CODEC_ID_4XM
-#define CODEC_ID_FLV1 AV_CODEC_ID_FLV1
-#define CODEC_ID_FLASHSV AV_CODEC_ID_FLASHSV
-#define CODEC_ID_SVQ1 AV_CODEC_ID_SVQ1
-#define CODEC_ID_TSCC AV_CODEC_ID_TSCC
-#define CODEC_ID_ULTI AV_CODEC_ID_ULTI
-#define CODEC_ID_VIXL AV_CODEC_ID_VIXL
-#define CODEC_ID_QPEG AV_CODEC_ID_QPEG
-#define CODEC_ID_WMV3 AV_CODEC_ID_WMV3
-#define CODEC_ID_VC1 AV_CODEC_ID_VC1
-#define CODEC_ID_LOCO AV_CODEC_ID_LOCO
-#define CODEC_ID_WNV1 AV_CODEC_ID_WNV1
-#define CODEC_ID_AASC AV_CODEC_ID_AASC
-#define CODEC_ID_FRAPS AV_CODEC_ID_FRAPS
-#define CODEC_ID_THEORA AV_CODEC_ID_THEORA
-#define CODEC_ID_CSCD AV_CODEC_ID_CSCD
-#define CODEC_ID_ZMBV AV_CODEC_ID_ZMBV
-#define CODEC_ID_KMVC AV_CODEC_ID_KMVC
-#define CODEC_ID_CAVS AV_CODEC_ID_CAVS
-#define CODEC_ID_JPEG2000 AV_CODEC_ID_JPEG2000
-#define CODEC_ID_VMNC AV_CODEC_ID_VMNC
-#define CODEC_ID_TARGA AV_CODEC_ID_TARGA
-#define CODEC_ID_PNG AV_CODEC_ID_PNG
-#define CODEC_ID_GIF AV_CODEC_ID_GIF
-#define CODEC_ID_TIFF AV_CODEC_ID_TIFF
-#define CODEC_ID_CLJR AV_CODEC_ID_CLJR
-#define CODEC_ID_DIRAC AV_CODEC_ID_DIRAC
-#define CODEC_ID_RPZA AV_CODEC_ID_RPZA
-#define CODEC_ID_SP5X AV_CODEC_ID_SP5X
-
-#define CODEC_ID_FLASHSV2 AV_CODEC_ID_FLASHSV2
-#define CODEC_ID_TEXT AV_CODEC_ID_TEXT
-#define CODEC_ID_SSA AV_CODEC_ID_SSA
-#define CODEC_ID_SSA AV_CODEC_ID_SRT
-#define CODEC_ID_VP8 AV_CODEC_ID_VP8
-#define CODEC_ID_RV10 AV_CODEC_ID_RV10
-#define CODEC_ID_RV20 AV_CODEC_ID_RV20
-#define CODEC_ID_RV30 AV_CODEC_ID_RV30
-#define CODEC_ID_RV40 AV_CODEC_ID_RV40
-#define CODEC_ID_MP3 AV_CODEC_ID_MP3
-#define CODEC_ID_MP2 AV_CODEC_ID_MP2
-#define CODEC_ID_AAC AV_CODEC_ID_AAC
-#define CODEC_ID_PCM_BLURAY AV_CODEC_ID_PCM_BLURAY
-#define CODEC_ID_AC3 AV_CODEC_ID_AC3
-#define CODEC_ID_VORBIS AV_CODEC_ID_VORBIS
-#define CODEC_ID_EAC3 AV_CODEC_ID_EAC3
-#define CODEC_ID_DTS AV_CODEC_ID_DTS
-#define CODEC_ID_TRUEHD AV_CODEC_ID_TRUEHD
-#define CODEC_ID_S302M AV_CODEC_ID_S302M
-#define CODEC_ID_DVB_TELETEXT AV_CODEC_ID_DVB_TELETEXT
-#define CODEC_ID_DVB_SUBTITLE AV_CODEC_ID_DVB_SUBTITLE
-#define CODEC_ID_DVD_SUBTITLE AV_CODEC_ID_DVD_SUBTITLE
-
-#define CODEC_ID_MOV_TEXT AV_CODEC_ID_MOV_TEXT
-#define CODEC_ID_MP4ALS AV_CODEC_ID_MP4ALS
-#define CODEC_ID_QCELP AV_CODEC_ID_QCELP
-#define CODEC_ID_MPEG4SYSTEMS AV_CODEC_ID_MPEG4SYSTEMS
-
-#define CODEC_ID_MPEG2TS AV_CODEC_ID_MPEG2TS
-#define CODEC_ID_AAC_LATM AV_CODEC_ID_AAC_LATM
-#define CODEC_ID_HDMV_PGS_SUBTITLE AV_CODEC_ID_HDMV_PGS_SUBTITLE
-
-#define CODEC_ID_FLAC AV_CODEC_ID_FLAC
-#define CODEC_ID_MLP AV_CODEC_ID_MLP
-
-#define CODEC_ID_PCM_F32LE AV_CODEC_ID_PCM_F32LE
-#define CODEC_ID_PCM_F64LE AV_CODEC_ID_PCM_F64LE
-
-#define CODEC_ID_PCM_S16BE AV_CODEC_ID_PCM_S16BE
-#define CODEC_ID_PCM_S24BE AV_CODEC_ID_PCM_S24BE
-#define CODEC_ID_PCM_S32BE AV_CODEC_ID_PCM_S32BE
-
-#define CODEC_ID_PCM_S16LE AV_CODEC_ID_PCM_S16LE
-#define CODEC_ID_PCM_S24LE AV_CODEC_ID_PCM_S24LE
-#define CODEC_ID_PCM_S32LE AV_CODEC_ID_PCM_S32LE
-
-#define CODEC_ID_PCM_U8 AV_CODEC_ID_PCM_U8
-
-#define CODEC_ID_PCM_QDM2 AV_CODEC_ID_QDM2
-#define CODEC_ID_RA_144 AV_CODEC_ID_RA_144
-#define CODEC_ID_RA_288 AV_CODEC_ID_RA_288
-#define CODEC_ID_ATRAC3 AV_CODEC_ID_ATRAC3
-#define CODEC_ID_COOK AV_CODEC_ID_COOK
-#define CODEC_ID_SIPR AV_CODEC_ID_SIPR
-#define CODEC_ID_TTA AV_CODEC_ID_TTA
-#define CODEC_ID_WAVPACK AV_CODEC_ID_WAVPACK
-
-#define CODEC_ID_TTF AV_CODEC_ID_TTF
-
-#endif
-
 #if ((LIBAVUTIL_VERSION_MAJOR < 51) || (LIBAVUTIL_VERSION_MAJOR == 51) && (LIBAVUTIL_VERSION_MINOR < 22))
 #define AV_OPT_TYPE_INT FF_OPT_TYPE_INT
 #endif
@@ -203,24 +65,23 @@
 
 #else
 static void av_set_pts_info(AVStream *s, int pts_wrap_bits,
-			      unsigned int pts_num, unsigned int pts_den)
-{
-    AVRational new_tb;
-    if(av_reduce(&new_tb.num, &new_tb.den, pts_num, pts_den, INT_MAX)){
-        if(new_tb.num != pts_num)
-            av_log(NULL, AV_LOG_DEBUG, "st:%d removing common factor %d from timebase\n", s->index, pts_num/new_tb.num);
-    }else
-        av_log(NULL, AV_LOG_WARNING, "st:%d has too large timebase, reducing\n", s->index);
-
-    if(new_tb.num <= 0 || new_tb.den <= 0) {
-        av_log(NULL, AV_LOG_ERROR, "Ignoring attempt to set invalid timebase %d/%d for st:%d\n", new_tb.num, new_tb.den, s->index);
-        return;
-    }
-    s->time_base = new_tb;
+                            unsigned int pts_num, unsigned int pts_den) {
+  AVRational new_tb;
+  if (av_reduce(&new_tb.num, &new_tb.den, pts_num, pts_den, INT_MAX)) {
+    if (new_tb.num != pts_num)
+      av_log(NULL, AV_LOG_DEBUG, "st:%d removing common factor %d from timebase\n", s->index, pts_num/new_tb.num);
+  } else
+    av_log(NULL, AV_LOG_WARNING, "st:%d has too large timebase, reducing\n", s->index);
+
+  if (new_tb.num <= 0 || new_tb.den <= 0) {
+    av_log(NULL, AV_LOG_ERROR, "Ignoring attempt to set invalid timebase %d/%d for st:%d\n", new_tb.num, new_tb.den, s->index);
+    return;
+  }
+  s->time_base = new_tb;
 #ifdef HAVE_AV_CODEC_SET_PKT_TIMEBASE
-    av_codec_set_pkt_timebase(s->codec, new_tb);
+  av_codec_set_pkt_timebase(s->codec, new_tb);
 #endif
-    s->pts_wrap_bits = pts_wrap_bits;
+  s->pts_wrap_bits = pts_wrap_bits;
 }
 
 #endif

LiVES-2.2.8.tar.bz2/lives-plugins/plugins/decoders/mkv_decoder.c -> LiVES-2.4.1.tar.bz2/lives-plugins/plugins/decoders/mkv_decoder.c Changed

@@ -94,18 +94,18 @@
 ////////////////////////////////////////////////////////////////////////////
 
 static double lives_int2dbl(int64_t v) {
-    if((uint64_t)v+v > 0xFFEULL<<52)
-        return NAN;
-    return ldexp(((v&((1LL<<52)-1)) + (1LL<<52)) * (v>>63|1), (v>>52&0x7FF)-1075);
+  if ((uint64_t)v+v > 0xFFEULL<<52)
+    return NAN;
+  return ldexp(((v&((1LL<<52)-1)) + (1LL<<52)) * (v>>63|1), (v>>52&0x7FF)-1075);
 }
 
 static float lives_int2flt(int32_t v) {
-    if((uint32_t)v+v > 0xFF000000U)
-        return NAN;
-    return ldexp(((v&0x7FFFFF) + (1<<23)) * (v>>31|1), (v>>23&0xFF)-150);
+  if ((uint32_t)v+v > 0xFF000000U)
+    return NAN;
+  return ldexp(((v&0x7FFFFF) + (1<<23)) * (v>>31|1), (v>>23&0xFF)-150);
 }
 
-const uint8_t ff_log2_tab[256]={
+const uint8_t ff_log2_tab[256]= {
   0,0,1,1,2,2,2,2,3,3,3,3,3,3,3,3,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,4,
   5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,5,
   6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,6,
@@ -117,18 +117,17 @@
 };
 
 
-static enum CodecID ff_codec_get_id(const AVCodecTag *tags, unsigned int tag)
-{
+static enum CodecID ff_codec_get_id(const AVCodecTag *tags, unsigned int tag) {
   int i;
-  for(i=0; tags[i].id != CODEC_ID_NONE;i++) {
-    if(tag == tags[i].tag)
+  for (i=0; tags[i].id != CODEC_ID_NONE; i++) {
+    if (tag == tags[i].tag)
       return tags[i].id;
   }
-  for(i=0; tags[i].id != CODEC_ID_NONE; i++) {
-    if(   toupper((tag >> 0)&0xFF) == toupper((tags[i].tag >> 0)&0xFF)
-	  && toupper((tag >> 8)&0xFF) == toupper((tags[i].tag >> 8)&0xFF)
-	  && toupper((tag >>16)&0xFF) == toupper((tags[i].tag >>16)&0xFF)
-	  && toupper((tag >>24)&0xFF) == toupper((tags[i].tag >>24)&0xFF))
+  for (i=0; tags[i].id != CODEC_ID_NONE; i++) {
+    if (toupper((tag >> 0)&0xFF) == toupper((tags[i].tag >> 0)&0xFF)
+        && toupper((tag >> 8)&0xFF) == toupper((tags[i].tag >> 8)&0xFF)
+        && toupper((tag >>16)&0xFF) == toupper((tags[i].tag >>16)&0xFF)
+        && toupper((tag >>24)&0xFF) == toupper((tags[i].tag >>24)&0xFF))
       return tags[i].id;
   }
   return CODEC_ID_NONE;
@@ -148,16 +147,16 @@
 static void lives_dynarray_add(void *tab_ptr, int *nb_ptr, void *elem) {
   int nb, nb_alloc;
   intptr_t *tab;
-  
+
   nb = *nb_ptr;
-  tab = *(intptr_t**)tab_ptr;
+  tab = *(intptr_t **)tab_ptr;
   if ((nb & (nb - 1)) == 0) {
     if (nb == 0)
       nb_alloc = 1;
     else
       nb_alloc = nb * 2;
     tab = av_realloc(tab, nb_alloc * sizeof(intptr_t));
-    *(intptr_t**)tab_ptr = tab;
+    *(intptr_t **)tab_ptr = tab;
   }
   tab[nb++] = (intptr_t)elem;
   *nb_ptr = nb;
@@ -197,7 +196,7 @@
  * number.
  * Returns: number of bytes read, < 0 on error
  */
-static int ebml_read_num(const lives_clip_data_t *cdata, uint8_t * data,
+static int ebml_read_num(const lives_clip_data_t *cdata, uint8_t *data,
                          int max_size, uint64_t *number) {
   lives_mkv_priv_t *priv=cdata->priv;
 
@@ -209,20 +208,19 @@
   /* The first byte tells us the length in bytes - avio_r8() can normally
    * return 0, but since that's not a valid first ebmlID byte, we can
    * use it safely here to catch EOS. */
-  
+
   if (data==NULL) {
-    if (read (priv->fd, buffer, 1) < 1) {
+    if (read(priv->fd, buffer, 1) < 1) {
       if (!priv->expect_eof)
-	fprintf(stderr, "mkv_decoder: error in stream header for %s\n",cdata->URI);
+        fprintf(stderr, "mkv_decoder: error in stream header for %s\n",cdata->URI);
       got_eof=TRUE;
       return 0;
     }
-  
+
     priv->input_position+=1;
-  
+
     total=*buffer;
-  }
-  else {
+  } else {
     total=data[0];
   }
 
@@ -231,12 +229,12 @@
   bread = 8 - ff_log2_tab[total];
 
   if (bread > max_size) {
-    fprintf(stderr,    
-	    "mkv_decoder: Invalid EBML number\n");
+    fprintf(stderr,
+            "mkv_decoder: Invalid EBML number\n");
     errval=-1;
     return 0;
   }
-  
+
   /* read out length */
   total ^= 1 << ff_log2_tab[total];
 
@@ -244,18 +242,17 @@
   while (n++ < bread) {
 
     if (data==NULL) {
-      if (read (priv->fd, buffer, 1) < 1) {
-	if (!priv->expect_eof)
-	  fprintf(stderr, "mkv_decoder: error in stream header for %s\n",cdata->URI);
-	got_eof=TRUE;
-	return 0;
+      if (read(priv->fd, buffer, 1) < 1) {
+        if (!priv->expect_eof)
+          fprintf(stderr, "mkv_decoder: error in stream header for %s\n",cdata->URI);
+        got_eof=TRUE;
+        return 0;
       }
-      
+
       priv->input_position+=1;
-      
+
       val8=(uint8_t)*buffer;
-    }
-    else {
+    } else {
       val8=data[n-1];
     }
 
@@ -297,20 +294,20 @@
   /* big-endian ordering; build up number */
   *num = 0;
   while (n++ < size) {
-    if (read (priv->fd, buffer, 1) < 1) {
+    if (read(priv->fd, buffer, 1) < 1) {
       if (!priv->expect_eof)
-	fprintf(stderr, "mkv_decoder: error in stream header for %s\n",cdata->URI);
+        fprintf(stderr, "mkv_decoder: error in stream header for %s\n",cdata->URI);
       got_eof=TRUE;
       return -ERR_EOF;
     }
-    
+
     priv->input_position+=1;
-    
+
     val8=(uint8_t)*buffer;
-    
+
     *num = (*num << 8) | val8;
   }
-  
+
   return 0;
 }
 
@@ -327,10 +324,10 @@
   if (size == 0) {
     *num = 0;
   } else if (size == 4) {
-    
+
     if (read(priv->fd,buffer,4)<4) {
       if (!priv->expect_eof)
-	fprintf(stderr, "mkv_decoder: read error in %s\n",cdata->URI);
+        fprintf(stderr, "mkv_decoder: read error in %s\n",cdata->URI);
       got_eof=TRUE;
       return -ERR_EOF;
     }
@@ -341,11 +338,11 @@
 
     *num= lives_int2flt(val32);
 
-  } else if(size==8){
+  } else if (size==8) {
 
     if (read(priv->fd,buffer,8)<8) {
       if (!priv->expect_eof)
-	fprintf(stderr, "mkv_decoder: read error in %s\n",cdata->URI);
+        fprintf(stderr, "mkv_decoder: read error in %s\n",cdata->URI);
       got_eof=TRUE;
       return -ERR_EOF;
     }
@@ -359,7 +356,7 @@
     errval=ERR_INVALID_DATA;
     return -errval;
   }
-  
+
   return 0;
 }
 
@@ -378,14 +375,14 @@
     return -errval;
   }
 
-  if (read (priv->fd, (uint8_t *) *str, size) < size) {
+  if (read(priv->fd, (uint8_t *) *str, size) < size) {
     if (!priv->expect_eof)
       fprintf(stderr, "mkv_decoder: error in stream header for %s\n",cdata->URI);
     av_freep(str);
     got_eof=TRUE;
     return -ERR_EOF;
   }
-  
+
   priv->input_position+=size;
 
   (*str)[size] = '\0';
@@ -406,11 +403,11 @@
     errval=ERR_NOMEM;
     return -errval;
   }
-  
+
   bin->size = length;
   bin->pos  = priv->input_position;
-  
-  if (read (priv->fd, bin->data, length) < length) {
+
+  if (read(priv->fd, bin->data, length) < length) {
     if (!priv->expect_eof)
       fprintf(stderr, "mkv_decoder: error in stream header for %s\n",cdata->URI);
     av_freep(&bin->data);
@@ -419,7 +416,7 @@
   }
 
   priv->input_position+=length;
-  
+
   return 0;
 }
 
@@ -431,20 +428,20 @@
 static int ebml_read_master(const lives_clip_data_t *cdata, uint64_t length) {
   lives_mkv_priv_t *priv=cdata->priv;
   MatroskaDemuxContext *matroska=&priv->matroska;
-  
+
   MatroskaLevel *level;
-  
+
   if (matroska->num_levels >= EBML_MAX_DEPTH) {
     //av_log(matroska->ctx, AV_LOG_ERROR,
     //       "File moves beyond max. allowed depth (%d)\n", EBML_MAX_DEPTH);
     errval=ERR_MAX_DEPTH;
     return -errval;
   }
-  
+
   level = &matroska->levels[matroska->num_levels++];
   level->start = priv->input_position;
   level->length = length;
-  
+
   return 0;
 }
 
@@ -464,20 +461,19 @@
                                  uint8_t *data, uint32_t size, int64_t *num) {
   uint64_t unum;
   int res;
-  
+
   /* read as unsigned number first */
   if ((res = matroska_ebmlnum_uint(cdata, data, size, &unum)) < 0)
     return res;
-  
+
   /* make signed (weird way) */
   *num = unum - ((1LL << (7*res - 1)) - 1);
-  
+
   return res;
 }
 
 static int ebml_parse_id(const lives_clip_data_t *cdata, EbmlSyntax *syntax,
-                         uint32_t id, void *data)
-{
+                         uint32_t id, void *data) {
   lives_mkv_priv_t *priv=cdata->priv;
   MatroskaDemuxContext *matroska=&priv->matroska;
   int reso;
@@ -500,19 +496,18 @@
 }
 
 static int ebml_parse(const lives_clip_data_t *cdata, EbmlSyntax *syntax,
-                      void *data)
-{
+                      void *data) {
   int res;
   lives_mkv_priv_t *priv=cdata->priv;
   MatroskaDemuxContext *matroska=&priv->matroska;
   if (!matroska->current_id) {
     uint64_t id;
-    
+
     int res = ebml_read_num(cdata, NULL, 4, &id);
 
     if (res < 0)
       return res;
-    
+
     matroska->current_id = id | 1 << 7*res;
 
     if (matroska->current_id!=163) {
@@ -521,13 +516,12 @@
 
   }
   res=ebml_parse_id(cdata, syntax, matroska->current_id, data);
-  
+
   return res;
 }
 
 static int ebml_parse_nest(const lives_clip_data_t *cdata, EbmlSyntax *syntax,
-                           void *data)
-{
+                           void *data) {
   int i, res = 0;
 
   for (i=0; syntax[i].id; i++)
@@ -536,11 +530,11 @@
       *(uint64_t *)((char *)data+syntax[i].data_offset) = syntax[i].def.u;
       break;
     case EBML_FLOAT:
-      *(double   *)((char *)data+syntax[i].data_offset) = syntax[i].def.f;
+      *(double *)((char *)data+syntax[i].data_offset) = syntax[i].def.f;
       break;
     case EBML_STR:
     case EBML_UTF8:
-      *(char    **)((char *)data+syntax[i].data_offset) = av_strdup(syntax[i].def.s);
+      *(char **)((char *)data+syntax[i].data_offset) = av_strdup(syntax[i].def.s);
       break;
     default:
       break;
@@ -552,8 +546,7 @@
   return res;
 }
 
-static int ebml_parse_elem(const lives_clip_data_t *cdata, EbmlSyntax *syntax, void *data)
-{
+static int ebml_parse_elem(const lives_clip_data_t *cdata, EbmlSyntax *syntax, void *data) {
   lives_mkv_priv_t *priv=cdata->priv;
   MatroskaDemuxContext *matroska=&priv->matroska;
 
@@ -583,7 +576,7 @@
       return -errval;
     }
     list->elem = newelem;
-    data = (char*)list->elem + list->nb_elem*syntax->list_elem_size;
+    data = (char *)list->elem + list->nb_elem*syntax->list_elem_size;
     memset(data, 0, syntax->list_elem_size);
     list->nb_elem++;
   }
@@ -599,19 +592,30 @@
   }
 
   switch (syntax->type) {
-  case EBML_UINT:  res = ebml_read_uint  (cdata, length, data);  break;
-  case EBML_FLOAT: res = ebml_read_float (cdata, length, data);  break;
+  case EBML_UINT:
+    res = ebml_read_uint(cdata, length, data);
+    break;
+  case EBML_FLOAT:
+    res = ebml_read_float(cdata, length, data);
+    break;
   case EBML_STR:
-  case EBML_UTF8:  res = ebml_read_ascii (cdata, length, data);  break;
-  case EBML_BIN:   res = ebml_read_binary(cdata, length, data);  break;
-  case EBML_NEST:  if ((res=ebml_read_master(cdata, length)) < 0)
+  case EBML_UTF8:
+    res = ebml_read_ascii(cdata, length, data);
+    break;
+  case EBML_BIN:
+    res = ebml_read_binary(cdata, length, data);
+    break;
+  case EBML_NEST:
+    if ((res=ebml_read_master(cdata, length)) < 0)
       return res;
     if (id == MATROSKA_ID_SEGMENT)
       matroska->segment_start = priv->input_position;
     return ebml_parse_nest(cdata, syntax->def.n, data);
-  case EBML_PASS:  return ebml_parse_id(cdata, syntax->def.n, id, data);
-  case EBML_STOP:  return 1;
-  default:        
+  case EBML_PASS:
+    return ebml_parse_id(cdata, syntax->def.n, id, data);
+  case EBML_STOP:
+    return 1;
+  default:
     // skip length bytes
     priv->input_position+=length;
     lseek(priv->fd, priv->input_position, SEEK_SET);
@@ -628,25 +632,29 @@
 }
 
 
-static void ebml_free(EbmlSyntax *syntax, void *data)
-{
+static void ebml_free(EbmlSyntax *syntax, void *data) {
   int i, j;
   for (i=0; syntax[i].id; i++) {
     void *data_off = (char *)data + syntax[i].data_offset;
     switch (syntax[i].type) {
     case EBML_STR:
-    case EBML_UTF8: av_freep(data_off);                      break;
-    case EBML_BIN:  av_freep(&((EbmlBin *)data_off)->data);  break;
+    case EBML_UTF8:
+      av_freep(data_off);
+      break;
+    case EBML_BIN:
+      av_freep(&((EbmlBin *)data_off)->data);
+      break;
     case EBML_NEST:
       if (syntax[i].list_elem_size) {
-	EbmlList *list = data_off;
-	char *ptr = list->elem;
-	for (j=0; j<list->nb_elem; j++, ptr+=syntax[i].list_elem_size)
-	  ebml_free(syntax[i].def.n, ptr);
-	free(list->elem);
+        EbmlList *list = data_off;
+        char *ptr = list->elem;
+        for (j=0; j<list->nb_elem; j++, ptr+=syntax[i].list_elem_size)
+          ebml_free(syntax[i].def.n, ptr);
+        free(list->elem);
       } else
-	ebml_free(syntax[i].def.n, data_off);
-    default:  break;
+        ebml_free(syntax[i].def.n, data_off);
+    default:
+      break;
     }
   }
 }
@@ -677,54 +685,54 @@
   uint64_t total = 0;
   int len_mask = 0x80, size = 1, n = 1, i;
   unsigned char nextbytes[1024];
-  
+
   /* EBML header? */
   if (AV_RB32(p) != EBML_ID_HEADER) {
     return FALSE;
   }
-  
+
   /* length of header */
   total = p[4];
-  
+
   while (size <= 8 && !(total & len_mask)) {
     size++;
     len_mask >>= 1;
   }
-  
+
   total &= (len_mask - 1);
-  
+
   while (n < size) {
     if (read(priv->fd,nextbytes,1)!=1) {
       return FALSE;
-      
+
     }
     total = (total << 8) | nextbytes[0]; // nextbyte is after p[4]
     n++;
     priv->input_position++;
   }
-  
+
   // read "total" bytes
-  
+
   if (read(priv->fd,nextbytes,total)!=total) {
     return FALSE;
   }
-  
+
   priv->input_position+=total;
-  
+
   /* The header should contain a known document type. For now,
    * we don't parse the whole header but simply check for the
    * availability of that array of characters inside the header.
    * Not fully fool-proof, but good enough. */
-  
+
   for (i = 0; i < 2; i++) {
     int probelen = strlen(matroska_doctypes[i]);
     if (total < probelen)
       continue;
     for (n = 0; n <= total-probelen; n++)
       if (!memcmp(nextbytes + n, matroska_doctypes[i], probelen))
-	return TRUE;
+        return TRUE;
   }
-  
+
   // probably valid EBML header but no recognized doctype
   return FALSE;
 }
@@ -732,13 +740,12 @@
 
 
 static MatroskaTrack *matroska_find_track_by_num(MatroskaDemuxContext *matroska,
-                                                 int num)
-{
+    int num) {
   MatroskaTrack *tracks = matroska->tracks.elem;
   int i;
 
   for (i=0; i < matroska->tracks.nb_elem; i++) {
-    if (tracks[i].num == num) 
+    if (tracks[i].num == num)
       return &tracks[i];
   }
   //av_log(matroska->ctx, AV_LOG_ERROR, "Invalid track number %d\n", num);
@@ -748,13 +755,12 @@
 
 
 
-static int matroska_decode_buffer(uint8_t** buf, int* buf_size,
-                                  MatroskaTrack *track)
-{
+static int matroska_decode_buffer(uint8_t **buf, int *buf_size,
+                                  MatroskaTrack *track) {
   MatroskaTrackEncoding *encodings = track->encodings.elem;
-  uint8_t* data = *buf;
+  uint8_t *data = *buf;
   int isize = *buf_size;
-  uint8_t* pkt_data = NULL;
+  uint8_t *pkt_data = NULL;
   int pkt_size = isize;
   int result = 0;
   int olen;
@@ -786,16 +792,16 @@
       pkt_size *= 3;
       newpktdata = av_realloc(pkt_data, pkt_size);
       if (!newpktdata) {
-	inflateEnd(&zstream);
-	goto failed;
+        inflateEnd(&zstream);
+        goto failed;
       }
       pkt_data = newpktdata;
       zstream.avail_out = pkt_size - zstream.total_out;
       zstream.next_out = pkt_data + zstream.total_out;
       if (pkt_data) {
-	result = inflate(&zstream, Z_NO_FLUSH);
+        result = inflate(&zstream, Z_NO_FLUSH);
       } else
-	result = Z_MEM_ERROR;
+        result = Z_MEM_ERROR;
     } while (result==Z_OK && pkt_size<10000000);
     pkt_size = zstream.total_out;
     inflateEnd(&zstream);
@@ -815,16 +821,16 @@
       pkt_size *= 3;
       newpktdata = av_realloc(pkt_data, pkt_size);
       if (!newpktdata) {
-	BZ2_bzDecompressEnd(&bzstream);
-	goto failed;
+        BZ2_bzDecompressEnd(&bzstream);
+        goto failed;
       }
       pkt_data = newpktdata;
       bzstream.avail_out = pkt_size - bzstream.total_out_lo32;
       bzstream.next_out = pkt_data + bzstream.total_out_lo32;
       if (pkt_data) {
-	result = BZ2_bzDecompress(&bzstream);
+        result = BZ2_bzDecompress(&bzstream);
       } else
-	result = BZ_MEM_ERROR;
+        result = BZ_MEM_ERROR;
     } while (result==BZ_OK && pkt_size<10000000);
     pkt_size = bzstream.total_out_lo32;
     BZ2_bzDecompressEnd(&bzstream);
@@ -840,7 +846,7 @@
   *buf = pkt_data;
   *buf_size = pkt_size;
   return 0;
- failed:
+failed:
   av_free(pkt_data);
   return -1;
 }
@@ -849,8 +855,7 @@
 
 
 static void matroska_fix_ass_packet(MatroskaDemuxContext *matroska,
-                                    AVPacket *pkt, uint64_t display_duration)
-{
+                                    AVPacket *pkt, uint64_t display_duration) {
   char *line;
   unsigned char *layer;
   unsigned char *ptr = pkt->data;
@@ -865,26 +870,31 @@
     int sc = matroska->time_scale * pkt->pts / 10000000;
     int ec = matroska->time_scale * end_pts  / 10000000;
     int sh, sm, ss, eh, em, es, len;
-    sh = sc/360000;  sc -= 360000*sh;
-    sm = sc/  6000;  sc -=   6000*sm;
-    ss = sc/   100;  sc -=    100*ss;
-    eh = ec/360000;  ec -= 360000*eh;
-    em = ec/  6000;  ec -=   6000*em;
-    es = ec/   100;  ec -=    100*es;
+    sh = sc/360000;
+    sc -= 360000*sh;
+    sm = sc/  6000;
+    sc -=   6000*sm;
+    ss = sc/   100;
+    sc -=    100*ss;
+    eh = ec/360000;
+    ec -= 360000*eh;
+    em = ec/  6000;
+    ec -=   6000*em;
+    es = ec/   100;
+    ec -=    100*es;
     *ptr++ = '\0';
     len = 50 + end-ptr + FF_INPUT_BUFFER_PADDING_SIZE;
     if (!(line = malloc(len)))
       return;
     snprintf(line,len,"Dialogue: %s,%d:%02d:%02d.%02d,%d:%02d:%02d.%02d,%s\r\n",
-	     layer, sh, sm, ss, sc, eh, em, es, ec, ptr);
+             layer, sh, sm, ss, sc, eh, em, es, ec, ptr);
     av_free(pkt->data);
     pkt->data = (unsigned char *)line;
     pkt->size = strlen(line);
   }
 }
 
-static int matroska_merge_packets(AVPacket *out, AVPacket *in)
-{
+static int matroska_merge_packets(AVPacket *out, AVPacket *in) {
   void *newdata = av_realloc(out->data, out->size+in->size);
   if (!newdata)
     return AVERROR(ENOMEM);
@@ -909,7 +919,7 @@
   MatroskaLevel level;
   int64_t offset;
   int ret = 0;
-  
+
   if (idx >= seekhead_list->nb_elem
       || seekhead[idx].id == MATROSKA_ID_SEEKHEAD
       || seekhead[idx].id == MATROSKA_ID_CLUSTER)
@@ -925,7 +935,7 @@
 
   priv->input_position=offset;
   lseek(priv->fd,priv->input_position,SEEK_SET);
-  
+
   /* We don't want to lose our seekhead level, so we add
    * a dummy. This is a crude hack. */
   if (matroska->num_levels == EBML_MAX_DEPTH) {
@@ -938,24 +948,24 @@
     matroska->levels[matroska->num_levels] = level;
     matroska->num_levels++;
     matroska->current_id = 0;
-    
+
     ret = ebml_parse(cdata, matroska_segment, matroska);
-    
+
     /* remove dummy level */
     while (matroska->num_levels) {
       uint64_t length = matroska->levels[--matroska->num_levels].length;
       if (length == (uint64_t)-1)
-	break;
+        break;
     }
   }
 
   /* seek back */
   priv->input_position=before_pos;
   lseek(priv->fd, priv->input_position, SEEK_SET);
-  
+
   matroska->level_up = level_up;
   matroska->current_id = saved_id;
-  
+
   return ret;
 }
 
@@ -987,10 +997,10 @@
     for (j = 0; j < pos_list->nb_elem; j++) {
       MatroskaTrack *track = matroska_find_track_by_num(matroska, pos[j].track);
       if (track && track->stream && track->stream==priv->vidst) {
-	pthread_mutex_lock(&priv->idxc->mutex);
-	lives_add_idx(cdata, pos[j].pos + matroska->segment_start, (uint32_t)(index[i].time/index_scale));
-	pthread_mutex_unlock(&priv->idxc->mutex);
-	//printf("ADD INDEX %ld %ld\n", pos[j].pos + matroska->segment_start, index[i].time/index_scale);
+        pthread_mutex_lock(&priv->idxc->mutex);
+        lives_add_idx(cdata, pos[j].pos + matroska->segment_start, (uint32_t)(index[i].time/index_scale));
+        pthread_mutex_unlock(&priv->idxc->mutex);
+        //printf("ADD INDEX %ld %ld\n", pos[j].pos + matroska->segment_start, index[i].time/index_scale);
       }
     }
   }
@@ -1004,12 +1014,12 @@
   EbmlList *seekhead_list = &matroska->seekhead;
   MatroskaSeekhead *seekhead = seekhead_list->elem;
   int i;
-  
+
   for (i = 0; i < seekhead_list->nb_elem; i++)
     if (seekhead[i].id == MATROSKA_ID_CUES)
       break;
   //assert(i <= seekhead_list->nb_elem);
-  
+
   matroska_parse_seekhead_entry(cdata, i);
   matroska_add_index_entries(cdata);
 }
@@ -1024,7 +1034,7 @@
   MatroskaSeekhead *seekhead = seekhead_list->elem;
   int64_t before_pos = priv->data_start;
   int i;
-  
+
   /*  // we should not do any seeking in the streaming case
       if (!matroska->ctx->pb->seekable ||
       (matroska->ctx->flags & AVFMT_FLAG_IGNIDX))
@@ -1110,11 +1120,11 @@
     }
 
 #if LIBAVCODEC_VERSION_MAJOR >= 52
-    avcodec_decode_video2(priv->ctx, priv->picture, &got_picture, &priv->avpkt );
-#else 
-    avcodec_decode_video(priv->ctx, priv->picture, &got_picture, priv->avpkt.data, priv->avpkt.size );
+    avcodec_decode_video2(priv->ctx, priv->picture, &got_picture, &priv->avpkt);
+#else
+    avcodec_decode_video(priv->ctx, priv->picture, &got_picture, priv->avpkt.data, priv->avpkt.size);
 #endif
-  
+
     if (got_picture) {
       frames++;
     }
@@ -1182,11 +1192,11 @@
     if (priv->avpkt.pos>=idx->offs) break;
 
 #if LIBAVCODEC_VERSION_MAJOR >= 52
-    avcodec_decode_video2(priv->ctx, priv->picture, &got_picture, &priv->avpkt );
-#else 
-    avcodec_decode_video(priv->ctx, priv->picture, &got_picture, priv->avpkt.data, priv->avpkt.size );
+    avcodec_decode_video2(priv->ctx, priv->picture, &got_picture, &priv->avpkt);
+#else
+    avcodec_decode_video(priv->ctx, priv->picture, &got_picture, priv->avpkt.data, priv->avpkt.size);
 #endif
-  
+
     if (got_picture) {
       frames++;
     }
@@ -1227,12 +1237,12 @@
 
 static index_entry *index_walk(index_entry *idx, uint32_t pts) {
   index_entry *xidx=idx;
-  while(xidx!=NULL) {
+  while (xidx!=NULL) {
     if (xidx->next==NULL || (pts>=xidx->dts && pts<xidx->next->dts)) return xidx;
     xidx=xidx->next;
   }
   /// oops. something went wrong
-  return NULL; 
+  return NULL;
 }
 
 
@@ -1311,16 +1321,16 @@
       || ebml.version > EBML_VERSION       || ebml.max_size > sizeof(uint64_t)
       || ebml.id_length > sizeof(uint32_t) || ebml.doctype_version > 3) {
     printf(
-	   "EBML %d header using unsupported features\n"
-	   "(EBML version %"PRIu64", doctype %s, doc version %"PRIu64")\n", res,
-	   ebml.version, ebml.doctype, ebml.doctype_version);
+      "EBML %d header using unsupported features\n"
+      "(EBML version %"PRIu64", doctype %s, doc version %"PRIu64")\n", res,
+      ebml.version, ebml.doctype, ebml.doctype_version);
     ebml_free(ebml_syntax, &ebml);
     return -19;// AVERROR_PATCHWELCOME;
   } else if (ebml.doctype_version == 3) {
     /*        av_log(matroska->ctx, AV_LOG_WARNING,
-	      "EBML header using unsupported features\n"
-	      "(EBML version %"PRIu64", doctype %s, doc version %"PRIu64")\n",
-	      ebml.version, ebml.doctype, ebml.doctype_version);*/
+        "EBML header using unsupported features\n"
+        "(EBML version %"PRIu64", doctype %s, doc version %"PRIu64")\n",
+        ebml.version, ebml.doctype, ebml.doctype_version);*/
   }
 
   for (i = 0; i < FF_ARRAY_ELEMS(matroska_doctypes); i++)
@@ -1346,7 +1356,7 @@
     matroska->time_scale = 1000000;
   if (matroska->duration)
     matroska->ctx->duration = matroska->duration * matroska->time_scale
-      * 1000 / AV_TIME_BASE;
+                              * 1000 / AV_TIME_BASE;
   av_dict_set(&s->metadata, "title", matroska->title, 0);
 
   tracks = matroska->tracks.elem;
@@ -1364,8 +1374,8 @@
 
     /* Apply some sanity checks. */
     if (track->type != MATROSKA_TRACK_TYPE_VIDEO &&
-	track->type != MATROSKA_TRACK_TYPE_AUDIO &&
-	track->type != MATROSKA_TRACK_TYPE_SUBTITLE) {
+        track->type != MATROSKA_TRACK_TYPE_AUDIO &&
+        track->type != MATROSKA_TRACK_TYPE_SUBTITLE) {
       continue;
     }
     if (track->codec_id == NULL)
@@ -1375,9 +1385,9 @@
 
       if (priv->has_video) {
 #ifdef DEBUG
-	fprintf(stderr,"mkv_decoder: duplicate video streams found\n");
+        fprintf(stderr,"mkv_decoder: duplicate video streams found\n");
 #endif
-	//continue;
+        //continue;
       }
 
       priv->vididx=i;
@@ -1385,28 +1395,29 @@
       priv->has_video=TRUE;
 
       if (!track->default_duration)
-	track->default_duration = 1000000000/track->video.frame_rate;
+        track->default_duration = 1000000000/track->video.frame_rate;
 
       if (cdata->fps==0.) cdata->fps=track->video.frame_rate;
 
       if (!track->video.display_width)
-	track->video.display_width = track->video.pixel_width;
+        track->video.display_width = track->video.pixel_width;
 
       cdata->width=track->video.pixel_width;
 
       if (!track->video.display_height)
-	track->video.display_height = track->video.pixel_height;
-      
+        track->video.display_height = track->video.pixel_height;
+
       cdata->height=track->video.pixel_height;
 
       if (track->video.color_space.size == 4)
-	fourcc = AV_RL32(track->video.color_space.data);
+        fourcc = AV_RL32(track->video.color_space.data);
 
       cdata->frame_width=track->video.display_width;
       cdata->frame_height=track->video.display_height;
 
       if (cdata->width!=cdata->frame_width||cdata->height!=cdata->frame_height)
-	fprintf(stderr,"mkv_decoder: info frame size=%d x %d, pixel size=%d x %d\n",cdata->frame_width,cdata->frame_height,cdata->width,cdata->height);
+        fprintf(stderr,"mkv_decoder: info frame size=%d x %d, pixel size=%d x %d\n",cdata->frame_width,cdata->frame_height,cdata->width,
+                cdata->height);
 
       if (track->video.flag_interlaced) cdata->interlace=LIVES_INTERLACE_BOTTOM_FIRST;
 
@@ -1417,81 +1428,81 @@
       fprintf(stderr,"mkv_decoder: Multiple combined encodings not supported\n");
       return -1;
     }
- 
+
     if (encodings_list->nb_elem == 1) {
       if (encodings[0].type ||
-	  (encodings[0].compression.algo != MATROSKA_TRACK_ENCODING_COMP_HEADERSTRIP &&
+          (encodings[0].compression.algo != MATROSKA_TRACK_ENCODING_COMP_HEADERSTRIP &&
 #if CONFIG_ZLIB
-	   encodings[0].compression.algo != MATROSKA_TRACK_ENCODING_COMP_ZLIB &&
+           encodings[0].compression.algo != MATROSKA_TRACK_ENCODING_COMP_ZLIB &&
 #endif
 #if CONFIG_BZLIB
-	   encodings[0].compression.algo != MATROSKA_TRACK_ENCODING_COMP_BZLIB &&
+           encodings[0].compression.algo != MATROSKA_TRACK_ENCODING_COMP_BZLIB &&
 #endif
-	   encodings[0].compression.algo != MATROSKA_TRACK_ENCODING_COMP_LZO)) {
-	encodings[0].scope = 0;
+           encodings[0].compression.algo != MATROSKA_TRACK_ENCODING_COMP_LZO)) {
+        encodings[0].scope = 0;
 
 
-	fprintf(stderr,"mkv_decoder: Unsupported encoding type\n");
-	return -2;
+        fprintf(stderr,"mkv_decoder: Unsupported encoding type\n");
+        return -2;
 
       } else if (track->codec_priv.size && encodings[0].scope&2) {
-	uint8_t *codec_priv = track->codec_priv.data;
-	int offset = matroska_decode_buffer(&track->codec_priv.data,
-					    &track->codec_priv.size,
-					    track);
-	if (offset < 0) {
-	  track->codec_priv.data = NULL;
-	  track->codec_priv.size = 0;
-
-
-	  fprintf(stderr,
-		  "mkv_decoder: Failed to decode codec private data\n");
-	  return -3;
-
-
-	} else if (offset > 0) {
-	  track->codec_priv.data = malloc(track->codec_priv.size + offset);
-	  memcpy(track->codec_priv.data,
-		 encodings[0].compression.settings.data, offset);
-	  memcpy(track->codec_priv.data+offset, codec_priv,
-		 track->codec_priv.size);
-	  track->codec_priv.size += offset;
-	}
-	if (codec_priv != track->codec_priv.data)
-	  free(codec_priv);
+        uint8_t *codec_priv = track->codec_priv.data;
+        int offset = matroska_decode_buffer(&track->codec_priv.data,
+                                            &track->codec_priv.size,
+                                            track);
+        if (offset < 0) {
+          track->codec_priv.data = NULL;
+          track->codec_priv.size = 0;
+
+
+          fprintf(stderr,
+                  "mkv_decoder: Failed to decode codec private data\n");
+          return -3;
+
+
+        } else if (offset > 0) {
+          track->codec_priv.data = malloc(track->codec_priv.size + offset);
+          memcpy(track->codec_priv.data,
+                 encodings[0].compression.settings.data, offset);
+          memcpy(track->codec_priv.data+offset, codec_priv,
+                 track->codec_priv.size);
+          track->codec_priv.size += offset;
+        }
+        if (codec_priv != track->codec_priv.data)
+          free(codec_priv);
       }
     }
 
-    for(j=0; ff_mkv_codec_tags[j].id != CODEC_ID_NONE; j++){
-      if(!strncmp(ff_mkv_codec_tags[j].str, track->codec_id,
-		  strlen(ff_mkv_codec_tags[j].str))){
-	codec_id= ff_mkv_codec_tags[j].id;
-	break;
+    for (j=0; ff_mkv_codec_tags[j].id != CODEC_ID_NONE; j++) {
+      if (!strncmp(ff_mkv_codec_tags[j].str, track->codec_id,
+                   strlen(ff_mkv_codec_tags[j].str))) {
+        codec_id= ff_mkv_codec_tags[j].id;
+        break;
       }
     }
 
     st = track->stream = av_new_stream(s, 0);
     if (st == NULL) {
       fprintf(stderr,
-	      "mkv_decoder: Out of memory\n");
+              "mkv_decoder: Out of memory\n");
       return -4;
     }
 
 
     if (!strcmp(track->codec_id, "V_MS/VFW/FOURCC")
-	&& track->codec_priv.size >= 40
-	&& track->codec_priv.data != NULL) {
+        && track->codec_priv.size >= 40
+        && track->codec_priv.data != NULL) {
       track->ms_compat = 1;
       fourcc = AV_RL32(track->codec_priv.data + 16);
       codec_id = ff_codec_get_id(codec_bmp_tags, fourcc);
       extradata_offset = 40;
     } else if (!strcmp(track->codec_id, "V_QUICKTIME")
-	       && (track->codec_priv.size >= 86)
-	       && (track->codec_priv.data != NULL)) {
+               && (track->codec_priv.size >= 86)
+               && (track->codec_priv.data != NULL)) {
       fourcc = AV_RL32(track->codec_priv.data);
       codec_id = ff_codec_get_id(codec_movvideo_tags, fourcc);
     } else if (codec_id == CODEC_ID_RV10 || codec_id == CODEC_ID_RV20 ||
-	       codec_id == CODEC_ID_RV30 || codec_id == CODEC_ID_RV40) {
+               codec_id == CODEC_ID_RV30 || codec_id == CODEC_ID_RV40) {
       extradata_offset = 26;
     }
 
@@ -1500,7 +1511,7 @@
 
     if (codec_id == CODEC_ID_NONE) {
       fprintf(stderr,
-	      "mkv_decoder: Unknown video codec\n");
+              "mkv_decoder: Unknown video codec\n");
       return -42;
     }
 
@@ -1514,8 +1525,8 @@
 
 
     /*    if (strcmp(track->language, "und"))
-	  av_dict_set(&st->metadata, "language", track->language, 0);
-	  av_dict_set(&st->metadata, "title", track->name, 0);
+    av_dict_set(&st->metadata, "language", track->language, 0);
+    av_dict_set(&st->metadata, "title", track->name, 0);
     */
 
     if (track->flag_default)
@@ -1528,22 +1539,22 @@
     //		track->default_duration, 1000000000, 30000);
 
     if (!st->codec->extradata) {
-      if(extradata){
-	st->codec->extradata = extradata;
-	st->codec->extradata_size = extradata_size;
-      } else if(track->codec_priv.data && track->codec_priv.size > 0){
-	st->codec->extradata = calloc(track->codec_priv.size +
-				      FF_INPUT_BUFFER_PADDING_SIZE,1);
-	if(st->codec->extradata == NULL){
-	  fprintf(stderr,
-		  "mkv_decoder: Out of memory\n");
-	  return -4;
-	}
-
-	st->codec->extradata_size = track->codec_priv.size;
-	memcpy(st->codec->extradata,
-	       track->codec_priv.data + extradata_offset,
-	       track->codec_priv.size);
+      if (extradata) {
+        st->codec->extradata = extradata;
+        st->codec->extradata_size = extradata_size;
+      } else if (track->codec_priv.data && track->codec_priv.size > 0) {
+        st->codec->extradata = calloc(track->codec_priv.size +
+                                      FF_INPUT_BUFFER_PADDING_SIZE,1);
+        if (st->codec->extradata == NULL) {
+          fprintf(stderr,
+                  "mkv_decoder: Out of memory\n");
+          return -4;
+        }
+
+        st->codec->extradata_size = track->codec_priv.size;
+        memcpy(st->codec->extradata,
+               track->codec_priv.data + extradata_offset,
+               track->codec_priv.size);
       }
     }
 
@@ -1556,38 +1567,37 @@
       st->codec->width  = track->video.pixel_width;
       st->codec->height = track->video.pixel_height;
       av_reduce(&st->sample_aspect_ratio.num,
-		&st->sample_aspect_ratio.den,
-		st->codec->height * track->video.display_width,
-		st->codec-> width * track->video.display_height,
-		255);
+                &st->sample_aspect_ratio.den,
+                st->codec->height * track->video.display_width,
+                st->codec-> width * track->video.display_height,
+                255);
       if (st->codec->codec_id != CODEC_ID_H264)
-	st->need_parsing = AVSTREAM_PARSE_HEADERS;
+        st->need_parsing = AVSTREAM_PARSE_HEADERS;
       if (track->default_duration)
-	st->avg_frame_rate = av_d2q(1000000000.0/track->default_duration, INT_MAX);
+        st->avg_frame_rate = av_d2q(1000000000.0/track->default_duration, INT_MAX);
 
       if (cdata->fps==0.) cdata->fps=(float)st->avg_frame_rate.num/(float)st->avg_frame_rate.den;
 
       /*
-	if (track->video.stereo_mode && track->video.stereo_mode < MATROSKA_VIDEO_STEREO_MODE_COUNT)
-	av_dict_set(&st->metadata, "stereo_mode", matroska_video_stereo_mode[track->video.stereo_mode], 0);
+      if (track->video.stereo_mode && track->video.stereo_mode < MATROSKA_VIDEO_STEREO_MODE_COUNT)
+      av_dict_set(&st->metadata, "stereo_mode", matroska_video_stereo_mode[track->video.stereo_mode], 0);
       */
 
       /* if we have virtual track, mark the real tracks */
       for (j=0; j < track->operation.combine_planes.nb_elem; j++) {
-	char buf[32];
-	if (planes[j].type >= MATROSKA_VIDEO_STEREO_PLANE_COUNT)
-	  continue;
-	snprintf(buf, sizeof(buf), "%s_%d",
-		 matroska_video_stereo_plane[planes[j].type], i);
-	for (k=0; k < matroska->tracks.nb_elem; k++)
-	  if (planes[j].uid == tracks[k].uid) {
-	    av_dict_set(&s->streams[k]->metadata,
-			"stereo_mode", buf, 0);
-	    break;
-	  }
+        char buf[32];
+        if (planes[j].type >= MATROSKA_VIDEO_STEREO_PLANE_COUNT)
+          continue;
+        snprintf(buf, sizeof(buf), "%s_%d",
+                 matroska_video_stereo_plane[planes[j].type], i);
+        for (k=0; k < matroska->tracks.nb_elem; k++)
+          if (planes[j].uid == tracks[k].uid) {
+            av_dict_set(&s->streams[k]->metadata,
+                        "stereo_mode", buf, 0);
+            break;
+          }
       }
-    }
-    else {
+    } else {
       avcodec_close(st->codec);
     }
   }
@@ -1607,24 +1617,60 @@
     return -6;
   }
 
-  switch (priv->vidst->codec->codec_id) { 	 
-  case CODEC_ID_VP8  : sprintf(cdata->video_name,"%s","vp8"); break; 	 
-  case CODEC_ID_THEORA  : sprintf(cdata->video_name,"%s","theora"); break; 	 
-  case CODEC_ID_SNOW  : sprintf(cdata->video_name,"%s","snow"); break; 	 
-  case CODEC_ID_DIRAC  : sprintf(cdata->video_name,"%s","dirac"); break; 	 
-  case CODEC_ID_MJPEG  : sprintf(cdata->video_name,"%s","mjpeg"); break; 	 
-  case CODEC_ID_MPEG1VIDEO  : sprintf(cdata->video_name,"%s","mpeg1"); break; 	 
-  case CODEC_ID_MPEG2VIDEO  : sprintf(cdata->video_name,"%s","mpeg2"); break; 	 
-  case CODEC_ID_MPEG4  : sprintf(cdata->video_name,"%s","mpeg4"); break; 	 
-  case CODEC_ID_H264  : sprintf(cdata->video_name,"%s","h264"); break; 	 
-  case CODEC_ID_MSMPEG4V3  : sprintf(cdata->video_name,"%s","msmpeg4"); break; 	 
-  case CODEC_ID_RV10  : sprintf(cdata->video_name,"%s","rv10"); break; 	 
-  case CODEC_ID_RV20  : sprintf(cdata->video_name,"%s","rv20"); break; 	 
-  case CODEC_ID_RV30  : sprintf(cdata->video_name,"%s","rv30"); break; 	 
-  case CODEC_ID_RV40  : sprintf(cdata->video_name,"%s","rv40"); break; 	 
-  case CODEC_ID_RAWVIDEO  : sprintf(cdata->video_name,"%s","raw"); break; 	 
-  default  : sprintf(cdata->video_name,"%s","unknown"); break; 	 
- }
+  switch (priv->vidst->codec->codec_id) {
+  case CODEC_ID_VP8  :
+    sprintf(cdata->video_name,"%s","vp8");
+    break;
+  case CODEC_ID_THEORA  :
+    sprintf(cdata->video_name,"%s","theora");
+    break;
+
+#if FF_API_SNOW
+  case CODEC_ID_SNOW  :
+    sprintf(cdata->video_name,"%s","snow");
+    break;
+#endif
+
+  case CODEC_ID_DIRAC  :
+    sprintf(cdata->video_name,"%s","dirac");
+    break;
+  case CODEC_ID_MJPEG  :
+    sprintf(cdata->video_name,"%s","mjpeg");
+    break;
+  case CODEC_ID_MPEG1VIDEO  :
+    sprintf(cdata->video_name,"%s","mpeg1");
+    break;
+  case CODEC_ID_MPEG2VIDEO  :
+    sprintf(cdata->video_name,"%s","mpeg2");
+    break;
+  case CODEC_ID_MPEG4  :
+    sprintf(cdata->video_name,"%s","mpeg4");
+    break;
+  case CODEC_ID_H264  :
+    sprintf(cdata->video_name,"%s","h264");
+    break;
+  case CODEC_ID_MSMPEG4V3  :
+    sprintf(cdata->video_name,"%s","msmpeg4");
+    break;
+  case CODEC_ID_RV10  :
+    sprintf(cdata->video_name,"%s","rv10");
+    break;
+  case CODEC_ID_RV20  :
+    sprintf(cdata->video_name,"%s","rv20");
+    break;
+  case CODEC_ID_RV30  :
+    sprintf(cdata->video_name,"%s","rv30");
+    break;
+  case CODEC_ID_RV40  :
+    sprintf(cdata->video_name,"%s","rv40");
+    break;
+  case CODEC_ID_RAWVIDEO  :
+    sprintf(cdata->video_name,"%s","raw");
+    break;
+  default  :
+    sprintf(cdata->video_name,"%s","unknown");
+    break;
+  }
 
 
   return 0;
@@ -1641,9 +1687,9 @@
 
   pthread_mutex_lock(&indices_mutex);
 
-  for (i=0;i<nidxc;i++) {
+  for (i=0; i<nidxc; i++) {
     if (indices[i]->clients[0]->current_clip==cdata->current_clip&&
-	!strcmp(indices[i]->clients[0]->URI,cdata->URI)) {
+        !strcmp(indices[i]->clients[0]->URI,cdata->URI)) {
       idxc=indices[i];
       // append cdata to clients
       idxc->clients=(lives_clip_data_t **)realloc(idxc->clients,(idxc->nclients+1)*sizeof(lives_clip_data_t *));
@@ -1690,33 +1736,31 @@
     // remove this index
     index_free(idxc->idxhh);
     free(idxc->clients);
-    for (i=0;i<nidxc;i++) {
+    for (i=0; i<nidxc; i++) {
       if (indices[i]==idxc) {
-	nidxc--;
-	for (j=i;j<nidxc;j++) {
-	  indices[j]=indices[j+1];
-	}
-	free(idxc);
-	if (nidxc==0) {
-	  free(indices);
-	  indices=NULL;
-	}
-	else indices=(index_container_t **)realloc(indices,nidxc*sizeof(index_container_t *));
-	break;
+        nidxc--;
+        for (j=i; j<nidxc; j++) {
+          indices[j]=indices[j+1];
+        }
+        free(idxc);
+        if (nidxc==0) {
+          free(indices);
+          indices=NULL;
+        } else indices=(index_container_t **)realloc(indices,nidxc*sizeof(index_container_t *));
+        break;
       }
     }
-  }
-  else {
+  } else {
     // reduce client count by 1
-    for (i=0;i<idxc->nclients;i++) {
+    for (i=0; i<idxc->nclients; i++) {
       if (idxc->clients[i]==cdata) {
-	// remove this entry
-	idxc->nclients--;
-	for (j=i;j<idxc->nclients;j++) {
-	  idxc->clients[j]=idxc->clients[j+1];
-	}
-	idxc->clients=(lives_clip_data_t **)realloc(idxc->clients,idxc->nclients*sizeof(lives_clip_data_t *));
-	break;
+        // remove this entry
+        idxc->nclients--;
+        for (j=i; j<idxc->nclients; j++) {
+          idxc->clients[j]=idxc->clients[j+1];
+        }
+        idxc->clients=(lives_clip_data_t **)realloc(idxc->clients,idxc->nclients*sizeof(lives_clip_data_t *));
+        break;
       }
     }
   }
@@ -1729,7 +1773,7 @@
 static void idxc_release_all(void) {
   register int i;
 
-  for (i=0;i<nidxc;i++) {
+  for (i=0; i<nidxc; i++) {
     index_free(indices[i]->idxhh);
     free(indices[i]->clients);
     free(indices[i]);
@@ -1738,7 +1782,7 @@
 }
 
 
-static void detach_stream (lives_clip_data_t *cdata) {
+static void detach_stream(lives_clip_data_t *cdata) {
   // close the file, free the decoder
   lives_mkv_priv_t *priv=cdata->priv;
 
@@ -1821,7 +1865,7 @@
 
   if (isclone) goto skip_probe;
 
-  if ((err=read (priv->fd, header, MKV_PROBE_SIZE)) < MKV_PROBE_SIZE) {
+  if ((err=read(priv->fd, header, MKV_PROBE_SIZE)) < MKV_PROBE_SIZE) {
     // for example, might be a directory
 #ifdef DEBUG
     fprintf(stderr, "mkv_decoder: unable to read header %d %d for %s\n",err,MKV_PROBE_SIZE,cdata->URI);
@@ -1840,7 +1884,7 @@
     close(priv->fd);
     return FALSE;
   }
-  
+
   if (!is_partial_clone) cdata->fps=0.;
   cdata->width=cdata->frame_width=cdata->height=cdata->frame_height=0;
   cdata->offs_x=cdata->offs_y=0;
@@ -1854,7 +1898,7 @@
 
   sprintf(cdata->audio_name,"%s","");
 
- skip_probe:
+skip_probe:
 
   priv->idxc=idxc_for(cdata);
   priv->inited=TRUE;
@@ -1891,13 +1935,13 @@
   //#define DEBUG
 #ifdef DEBUG
   fprintf(stderr,"video type is %f %s %d x %d (%d x %d +%d +%d)\n",duration,cdata->video_name,
-	  cdata->width,cdata->height,cdata->frame_width,cdata->frame_height,cdata->offs_x,cdata->offs_y);
+          cdata->width,cdata->height,cdata->frame_width,cdata->frame_height,cdata->offs_x,cdata->offs_y);
 #endif
 
   codec = avcodec_find_decoder(priv->vidst->codec->codec_id);
 
   if (!codec) {
-    if (strlen(cdata->video_name)>0) 
+    if (strlen(cdata->video_name)>0)
       fprintf(stderr, "mkv_decoder: Could not find avcodec codec for video type %s\n",cdata->video_name);
     detach_stream(cdata);
     return FALSE;
@@ -1927,11 +1971,13 @@
 
   while (!got_picture&&!got_eof) {
     matroska_read_packet(cdata,&priv->avpkt);
-    
+
+    if (got_eof) break;
+
 #if LIBAVCODEC_VERSION_MAJOR >= 52
-    avcodec_decode_video2(ctx, priv->picture, &got_picture, &priv->avpkt );
-#else 
-    avcodec_decode_video(ctx, priv->picture, &got_picture, priv->avpkt.data, priv->avpkt.size );
+    avcodec_decode_video2(ctx, priv->picture, &got_picture, &priv->avpkt);
+#else
+    avcodec_decode_video(ctx, priv->picture, &got_picture, priv->avpkt.data, priv->avpkt.size);
 #endif
   }
 
@@ -1952,17 +1998,18 @@
 
   matroska_read_packet(cdata,&priv->avpkt);
 
+  if (!got_eof) {
 #if LIBAVCODEC_VERSION_MAJOR >= 52
-  avcodec_decode_video2(ctx, priv->picture, &got_picture, &priv->avpkt );
-#else 
-  avcodec_decode_video(ctx, priv->picture, &got_picture, priv->avpkt.data, priv->avpkt.size );
+    avcodec_decode_video2(ctx, priv->picture, &got_picture, &priv->avpkt);
+#else
+    avcodec_decode_video(ctx, priv->picture, &got_picture, priv->avpkt.data, priv->avpkt.size);
 #endif
-  
+  }
+
   if (got_picture) {
     pts=priv->avpkt.pts-pts;
     dts=priv->avpkt.dts-dts;
-  }
-  else pts=dts=0;
+  } else pts=dts=0;
 
   if (priv->avpkt.data!=NULL) {
     free(priv->avpkt.data);
@@ -1981,7 +2028,7 @@
 
 
   cdata->palettes[0]=avi_pix_fmt_to_weed_palette(ctx->pix_fmt,
-						 &cdata->YUV_clamping);
+                     &cdata->YUV_clamping);
 
   if (cdata->palettes[0]==WEED_PALETTE_END) {
     fprintf(stderr, "mkv_decoder: Could not find a usable palette for (%d) %s\n",ctx->pix_fmt,cdata->URI);
@@ -1996,7 +2043,7 @@
 
   if (cdata->width==0) cdata->width=ctx->width-cdata->offs_x*2;
   if (cdata->height==0) cdata->height=ctx->height-cdata->offs_y*2;
-  
+
   if (cdata->width*cdata->height==0) {
     fprintf(stderr, "mkv_decoder: invalid width and height (%d X %d)\n",cdata->width,cdata->height);
     detach_stream(cdata);
@@ -2005,7 +2052,7 @@
 
 #ifdef DEBUG
   fprintf(stderr,"using palette %d, size %d x %d\n",
-	  cdata->current_palette,cdata->width,cdata->height);
+          cdata->current_palette,cdata->width,cdata->height);
 #endif
 
   cdata->par=(double)ctx->sample_aspect_ratio.num/(double)ctx->sample_aspect_ratio.den;
@@ -2032,9 +2079,9 @@
     snprintf(cmd,1024,"LANGUAGE=en LANG=en mplayer \"%s\" -identify -frames 0 2>/dev/null | grep ID_VIDEO_FPS > %s",cdata->URI,tmpfname);
 #else
     snprintf(cmd,1024,"mplayer.exe \"%s\" -identify -frames 0 2>NUL | grep.exe ID_VIDEO_FPS > %s",cdata->URI,tmpfname);
-#endif 
+#endif
     res=system(cmd);
-      
+
     if (!res) {
       char buffer[1024];
       ssize_t bytes;
@@ -2042,14 +2089,14 @@
       if (ofd>-1) {
 
 #ifdef IS_MINGW
-	setmode(ofd,O_BINARY);
+        setmode(ofd,O_BINARY);
 #endif
-	bytes=read(ofd,buffer,1024);
-	memset(buffer+bytes,0,1);
-	if (!(strncmp(buffer,"ID_VIDEO_FPS=",13))) {
-	  cdata->fps=strtod (buffer+13,NULL);
-	}
-	close(ofd);
+        bytes=read(ofd,buffer,1024);
+        memset(buffer+bytes,0,1);
+        if (!(strncmp(buffer,"ID_VIDEO_FPS=",13))) {
+          cdata->fps=strtod(buffer+13,NULL);
+        }
+        close(ofd);
       }
     }
     unlink(tmpfname);
@@ -2066,7 +2113,7 @@
     detach_stream(cdata);
     return FALSE;
   }
-  
+
   if (ctx->ticks_per_frame==2) {
     // TODO - needs checking
     cdata->fps/=2.;
@@ -2086,7 +2133,7 @@
     detach_stream(cdata);
     return FALSE;
   }
-  
+
   cdata->nframes=dts_to_frame(cdata,ldts)+2;
 
   // double check, sometimes we can be out by one or two frames
@@ -2129,12 +2176,12 @@
 
 
 
-static lives_clip_data_t *init_cdata (void) {
+static lives_clip_data_t *init_cdata(void) {
   lives_mkv_priv_t *priv;
   lives_clip_data_t *cdata=(lives_clip_data_t *)malloc(sizeof(lives_clip_data_t));
 
   cdata->URI=NULL;
-  
+
   cdata->priv=priv=malloc(sizeof(lives_mkv_priv_t));
 
   cdata->seek_flag=0;
@@ -2161,7 +2208,7 @@
 
   got_eof=FALSE;
   errval=0;
-  
+
   memset(cdata->author,0,1);
   memset(cdata->title,0,1);
   memset(cdata->comment,0,1);
@@ -2355,7 +2402,7 @@
   unsigned char *dst=idst;
   register int i;
 
-  for (i=0;i<npixels;i++) {
+  for (i=0; i<npixels; i++) {
     switch (pal) {
     case WEED_PALETTE_RGBA32:
     case WEED_PALETTE_BGRA32:
@@ -2393,7 +2440,8 @@
       dst[0]=dst[3]=128;
       dst[1]=dst[2]=dst[4]=dst[5]=y_black;
       dst+=6;
-    default: break;
+    default:
+      break;
     }
   }
   return idst-dst;
@@ -2416,11 +2464,11 @@
     if (matroska->num_packets > 1) {
       void *newpackets;
       memmove(&matroska->packets[0], &matroska->packets[1],
-	      (matroska->num_packets - 1) * sizeof(AVPacket *));
+              (matroska->num_packets - 1) * sizeof(AVPacket *));
       newpackets = av_realloc(matroska->packets,
-			      (matroska->num_packets - 1) * sizeof(AVPacket *));
+                              (matroska->num_packets - 1) * sizeof(AVPacket *));
       if (newpackets)
-	matroska->packets = newpackets;
+        matroska->packets = newpackets;
     } else {
       av_freep(&matroska->packets);
     }
@@ -2437,8 +2485,7 @@
 /*
  * Free all packets in our internal queue.
  */
-static void matroska_clear_queue(MatroskaDemuxContext *matroska)
-{
+static void matroska_clear_queue(MatroskaDemuxContext *matroska) {
   if (matroska->packets) {
     int n;
     for (n = 0; n < matroska->num_packets; n++) {
@@ -2453,8 +2500,7 @@
 static int matroska_parse_block(const lives_clip_data_t *cdata, uint8_t *data,
                                 int size, int64_t pos, uint64_t cluster_time,
                                 uint64_t duration, int is_keyframe,
-                                int64_t cluster_pos)
-{
+                                int64_t cluster_pos) {
 
   lives_mkv_priv_t *priv=cdata->priv;
   MatroskaDemuxContext *matroska=&priv->matroska;
@@ -2477,7 +2523,7 @@
   }
   data += n;
   size -= n;
-  
+
   track = matroska_find_track_by_num(matroska, num);
 
   if (!track || !track->stream) {
@@ -2510,12 +2556,12 @@
     timecode = cluster_time + block_time;
 
     if (track->type == MATROSKA_TRACK_TYPE_SUBTITLE
-	&& timecode < track->end_timecode)
+        && timecode < track->end_timecode)
       is_keyframe = 0;  /* overlapping subtitles are not key frame */
 
     track->end_timecode = FFMAX(track->end_timecode, timecode+duration);
   }
-  
+
   if (matroska->skip_to_keyframe && track->type != MATROSKA_TRACK_TYPE_SUBTITLE) {
     if (!is_keyframe || timecode < matroska->skip_to_timecode) {
       return res;
@@ -2541,23 +2587,23 @@
     lace_size = calloc(laces,sizeof(int));
 
     switch ((flags & 0x06) >> 1) {
-    case 0x1: /* Xiph lacing */ {
+    case 0x1: { /* Xiph lacing */
       uint8_t temp;
       uint32_t total = 0;
       for (n = 0; res == 0 && n < laces - 1; n++) {
-	while (1) {
-	  if (size == 0) {
-	    res = -1;
-	    break;
-	  }
-	  temp = *data;
-	  lace_size[n] += temp;
-	  data += 1;
-	  size -= 1;
-	  if (temp != 0xff)
-	    break;
-	}
-	total += lace_size[n];
+        while (1) {
+          if (size == 0) {
+            res = -1;
+            break;
+          }
+          temp = *data;
+          lace_size[n] += temp;
+          data += 1;
+          size -= 1;
+          if (temp != 0xff)
+            break;
+        }
+        total += lace_size[n];
       }
       lace_size[n] = size - total;
       break;
@@ -2565,33 +2611,33 @@
 
     case 0x2: /* fixed-size lacing */
       for (n = 0; n < laces; n++)
-	lace_size[n] = size / laces;
+        lace_size[n] = size / laces;
       break;
 
-    case 0x3: /* EBML lacing */ {
+    case 0x3: { /* EBML lacing */
       uint32_t total;
       n = matroska_ebmlnum_uint(cdata, data, size, &num);
       if (n < 0) {
-	//  av_log(matroska->ctx, AV_LOG_INFO,
-	//         "EBML block data error\n");
-	break;
+        //  av_log(matroska->ctx, AV_LOG_INFO,
+        //         "EBML block data error\n");
+        break;
       }
       data += n;
       size -= n;
       total = lace_size[0] = num;
       for (n = 1; res == 0 && n < laces - 1; n++) {
-	int64_t snum;
-	int r;
-	r = matroska_ebmlnum_sint(cdata, data, size, &snum);
-	if (r < 0) {
-	  // av_log(matroska->ctx, AV_LOG_INFO,
-	  //        "EBML block data error\n");
-	  break;
-	}
-	data += r;
-	size -= r;
-	lace_size[n] = lace_size[n - 1] + snum;
-	total += lace_size[n];
+        int64_t snum;
+        int r;
+        r = matroska_ebmlnum_sint(cdata, data, size, &snum);
+        if (r < 0) {
+          // av_log(matroska->ctx, AV_LOG_INFO,
+          //        "EBML block data error\n");
+          break;
+        }
+        data += r;
+        size -= r;
+        lace_size[n] = lace_size[n - 1] + snum;
+        total += lace_size[n];
       }
       lace_size[laces - 1] = size - total;
       break;
@@ -2604,70 +2650,70 @@
     for (n = 0; n < laces; n++) {
 
       {
-	MatroskaTrackEncoding *encodings = track->encodings.elem;
-	int offset = 0, pkt_size = lace_size[n];
-	uint8_t *pkt_data = data;
-
-	if (pkt_size > size) {
-	  //av_log(matroska->ctx, AV_LOG_ERROR, "Invalid packet size\n");
-	  break;
-	}
-
-	if (encodings && encodings->scope & 1) {
-	  offset = matroska_decode_buffer(&pkt_data,&pkt_size, track);
-	  if (offset < 0)
-	    continue;
-	}
-
-	pkt = calloc(sizeof(AVPacket),1);
-	/* XXX: prevent data copy... */
-	if (av_new_packet(pkt, pkt_size+offset) < 0) {
-	  free(pkt);
-	  res = AVERROR(ENOMEM);
-	  break;
-	}
-	if (offset)
-	  memcpy (pkt->data, encodings->compression.settings.data, offset);
-
-	memcpy (pkt->data+offset, pkt_data, pkt_size);
-
-	if (pkt_data != data)
-	  free(pkt_data);
-
-	if (n == 0)
-	  pkt->flags = is_keyframe;
-	pkt->stream_index = st->index;
-
-	if (track->ms_compat)
-	  pkt->dts = timecode;
-	else
-	  pkt->pts = timecode;
-	pkt->pos = pos;
-
-	if (st->codec->codec_id == CODEC_ID_TEXT)
-	  pkt->convergence_duration = duration;
-
-	else if (track->type != MATROSKA_TRACK_TYPE_SUBTITLE)
-	  pkt->duration = duration;
-
-	if (st->codec->codec_id == CODEC_ID_SSA)
-	  matroska_fix_ass_packet(matroska, pkt, duration);
-
-	if (matroska->prev_pkt &&
-	    timecode != AV_NOPTS_VALUE &&
-	    matroska->prev_pkt->pts == timecode &&
-	    matroska->prev_pkt->stream_index == st->index &&
-	    st->codec->codec_id == CODEC_ID_SSA)
-	  matroska_merge_packets(matroska->prev_pkt, pkt);
-	else {
-	  lives_dynarray_add(&matroska->packets,&matroska->num_packets,pkt);
-	  matroska->prev_pkt = pkt;
-	}
+        MatroskaTrackEncoding *encodings = track->encodings.elem;
+        int offset = 0, pkt_size = lace_size[n];
+        uint8_t *pkt_data = data;
+
+        if (pkt_size > size) {
+          //av_log(matroska->ctx, AV_LOG_ERROR, "Invalid packet size\n");
+          break;
+        }
+
+        if (encodings && encodings->scope & 1) {
+          offset = matroska_decode_buffer(&pkt_data,&pkt_size, track);
+          if (offset < 0)
+            continue;
+        }
+
+        pkt = calloc(sizeof(AVPacket),1);
+        /* XXX: prevent data copy... */
+        if (av_new_packet(pkt, pkt_size+offset) < 0) {
+          free(pkt);
+          res = AVERROR(ENOMEM);
+          break;
+        }
+        if (offset)
+          memcpy(pkt->data, encodings->compression.settings.data, offset);
+
+        memcpy(pkt->data+offset, pkt_data, pkt_size);
+
+        if (pkt_data != data)
+          free(pkt_data);
+
+        if (n == 0)
+          pkt->flags = is_keyframe;
+        pkt->stream_index = st->index;
+
+        if (track->ms_compat)
+          pkt->dts = timecode;
+        else
+          pkt->pts = timecode;
+        pkt->pos = pos;
+
+        if (st->codec->codec_id == CODEC_ID_TEXT)
+          pkt->convergence_duration = duration;
+
+        else if (track->type != MATROSKA_TRACK_TYPE_SUBTITLE)
+          pkt->duration = duration;
+
+        if (st->codec->codec_id == CODEC_ID_SSA)
+          matroska_fix_ass_packet(matroska, pkt, duration);
+
+        if (matroska->prev_pkt &&
+            timecode != AV_NOPTS_VALUE &&
+            matroska->prev_pkt->pts == timecode &&
+            matroska->prev_pkt->stream_index == st->index &&
+            st->codec->codec_id == CODEC_ID_SSA)
+          matroska_merge_packets(matroska->prev_pkt, pkt);
+        else {
+          lives_dynarray_add(&matroska->packets,&matroska->num_packets,pkt);
+          matroska->prev_pkt = pkt;
+        }
 
       }
 
       if (timecode != AV_NOPTS_VALUE)
-	timecode = duration ? timecode + duration : AV_NOPTS_VALUE;
+        timecode = duration ? timecode + duration : AV_NOPTS_VALUE;
       data += lace_size[n];
       size -= lace_size[n];
     }
@@ -2678,8 +2724,7 @@
 }
 
 
-static int matroska_parse_cluster(const lives_clip_data_t *cdata)
-{
+static int matroska_parse_cluster(const lives_clip_data_t *cdata) {
 
   lives_mkv_priv_t *priv=cdata->priv;
   MatroskaDemuxContext *matroska=&priv->matroska;
@@ -2703,10 +2748,10 @@
     if (blocks[i].bin.size > 0 && blocks[i].bin.data) {
       int is_keyframe = blocks[i].non_simple ? !blocks[i].reference : -1;
       res=matroska_parse_block(cdata,
-			       blocks[i].bin.data, blocks[i].bin.size,
-			       blocks[i].bin.pos,  cluster.timecode,
-			       blocks[i].duration, is_keyframe,
-			       pos);
+                               blocks[i].bin.data, blocks[i].bin.size,
+                               blocks[i].bin.pos,  cluster.timecode,
+                               blocks[i].duration, is_keyframe,
+                               pos);
     }
   }
   ebml_free(matroska_cluster, &cluster);
@@ -2725,16 +2770,15 @@
     if (matroska->done||got_eof) return FALSE;
     matroska_parse_cluster(cdata);
   }
-  
+
   return TRUE;
 }
 
 
 
 
-static index_entry * matroska_read_seek(const lives_clip_data_t *cdata,
-					uint32_t timestamp)
-{
+static index_entry *matroska_read_seek(const lives_clip_data_t *cdata,
+                                       uint32_t timestamp) {
 
   lives_mkv_priv_t *priv=cdata->priv;
   MatroskaDemuxContext *matroska=&priv->matroska;
@@ -2758,6 +2802,7 @@
   idx=get_idx_for_pts(cdata,timestamp);
 
   matroska_clear_queue(matroska);
+
   priv->input_position=idx->offs;
   lseek(priv->fd,priv->input_position,SEEK_SET);
 
@@ -2813,7 +2858,7 @@
   int y_black=(cdata->YUV_clamping==WEED_YUV_CLAMPING_CLAMPED)?16:0;
   boolean got_picture=FALSE;
   unsigned char *dst,*src;
-  unsigned char black[4]={0,0,0,255};
+  unsigned char black[4]= {0,0,0,255};
   index_entry *idx;
   register int i,p;
 
@@ -2830,32 +2875,31 @@
       nplanes=3;
       black[0]=y_black;
       black[1]=black[2]=128;
-    }
-    else if (pal==WEED_PALETTE_YUVA4444P) {
+    } else if (pal==WEED_PALETTE_YUVA4444P) {
       nplanes=4;
       black[0]=y_black;
       black[1]=black[2]=128;
       black[3]=255;
     }
-    
+
     if (pal==WEED_PALETTE_RGB24||pal==WEED_PALETTE_BGR24) psize=3;
-    
+
     if (pal==WEED_PALETTE_RGBA32||pal==WEED_PALETTE_BGRA32||pal==WEED_PALETTE_ARGB32||pal==WEED_PALETTE_UYVY8888||
-	pal==WEED_PALETTE_YUYV8888||pal==WEED_PALETTE_YUV888||pal==WEED_PALETTE_YUVA8888) psize=4;
-    
+        pal==WEED_PALETTE_YUYV8888||pal==WEED_PALETTE_YUV888||pal==WEED_PALETTE_YUVA8888) psize=4;
+
     if (pal==WEED_PALETTE_YUV411) psize=6;
-    
+
     if (pal==WEED_PALETTE_A1) dstwidth>>=3;
-    
+
     dstwidth*=psize;
-    
+
     if (cdata->frame_height > cdata->height && height == cdata->height) {
       // host ignores vertical border
       btop=0;
       xheight=cdata->height;
       bbot=xheight-1;
     }
-    
+
     if (cdata->frame_width > cdata->width && rowstrides[0] < cdata->frame_width*psize) {
       // host ignores horizontal border
       bleft=bright=0;
@@ -2870,12 +2914,12 @@
       idx=matroska_read_seek(cdata,target_pts);
       pthread_mutex_unlock(&priv->idxc->mutex);
       nextframe=dts_to_frame(cdata,idx->dts);
-      avcodec_flush_buffers (priv->ctx);
+      if (got_eof) return FALSE;
+      avcodec_flush_buffers(priv->ctx);
 #ifdef DEBUG_KFRAMES
       if (idx!=NULL) printf("got kframe %ld for frame %ld\n",dts_to_frame(cdata,idx->dts),tframe);
 #endif
-    }
-    else {
+    } else {
       nextframe=priv->last_frame+1;
     }
 
@@ -2893,20 +2937,20 @@
 
       while (!got_picture) {
 
-	if (priv->avpkt.data!=NULL) {
-	  free(priv->avpkt.data);
-	  priv->avpkt.data=NULL;
-	  priv->avpkt.size=0;
-	}
+        if (priv->avpkt.data!=NULL) {
+          free(priv->avpkt.data);
+          priv->avpkt.data=NULL;
+          priv->avpkt.size=0;
+        }
 
-	matroska_read_packet(cdata,&priv->avpkt);
+        matroska_read_packet(cdata,&priv->avpkt);
 
-	if (got_eof) return FALSE;
+        if (got_eof) return FALSE;
 
 #if LIBAVCODEC_VERSION_MAJOR >= 52
-	avcodec_decode_video2(priv->ctx, priv->picture, &got_picture, &priv->avpkt );
-#else 
-	avcodec_decode_video(priv->ctx, priv->picture, &got_picture, priv->avpkt.data, priv->avpkt.size );
+        avcodec_decode_video2(priv->ctx, priv->picture, &got_picture, &priv->avpkt);
+#else
+        avcodec_decode_video(priv->ctx, priv->picture, &got_picture, priv->avpkt.data, priv->avpkt.size);
 #endif
       }
 
@@ -2920,42 +2964,39 @@
   }
 
   if (priv->picture==NULL||pixel_data==NULL) return TRUE;
-  
-  for (p=0;p<nplanes;p++) {
+
+  for (p=0; p<nplanes; p++) {
     dst=pixel_data[p];
     src=priv->picture->data[p];
 
-    for (i=0;i<xheight;i++) {
+    for (i=0; i<xheight; i++) {
       if (i<btop||i>bbot) {
-	// top or bottom border, copy black row
-	if (pal==WEED_PALETTE_YUV420P||pal==WEED_PALETTE_YVU420P||pal==WEED_PALETTE_YUV422P||
-	    pal==WEED_PALETTE_YUV444P||pal==WEED_PALETTE_YUVA4444P||pal==WEED_PALETTE_RGB24||pal==WEED_PALETTE_BGR24) {
-	  memset(dst,black[p],dstwidth+(bleft+bright)*psize);
-	  dst+=dstwidth+(bleft+bright)*psize;
-	}
-	else dst+=write_black_pixel(dst,pal,dstwidth/psize+bleft+bright,y_black);
-	continue;
+        // top or bottom border, copy black row
+        if (pal==WEED_PALETTE_YUV420P||pal==WEED_PALETTE_YVU420P||pal==WEED_PALETTE_YUV422P||
+            pal==WEED_PALETTE_YUV444P||pal==WEED_PALETTE_YUVA4444P||pal==WEED_PALETTE_RGB24||pal==WEED_PALETTE_BGR24) {
+          memset(dst,black[p],dstwidth+(bleft+bright)*psize);
+          dst+=dstwidth+(bleft+bright)*psize;
+        } else dst+=write_black_pixel(dst,pal,dstwidth/psize+bleft+bright,y_black);
+        continue;
       }
 
       if (bleft>0) {
-	if (pal==WEED_PALETTE_YUV420P||pal==WEED_PALETTE_YVU420P||pal==WEED_PALETTE_YUV422P||pal==WEED_PALETTE_YUV444P||
-	    pal==WEED_PALETTE_YUVA4444P||pal==WEED_PALETTE_RGB24||pal==WEED_PALETTE_BGR24) {
-	  memset(dst,black[p],bleft*psize);
-	  dst+=bleft*psize;
-	}
-	else dst+=write_black_pixel(dst,pal,bleft,y_black);
+        if (pal==WEED_PALETTE_YUV420P||pal==WEED_PALETTE_YVU420P||pal==WEED_PALETTE_YUV422P||pal==WEED_PALETTE_YUV444P||
+            pal==WEED_PALETTE_YUVA4444P||pal==WEED_PALETTE_RGB24||pal==WEED_PALETTE_BGR24) {
+          memset(dst,black[p],bleft*psize);
+          dst+=bleft*psize;
+        } else dst+=write_black_pixel(dst,pal,bleft,y_black);
       }
 
       memcpy(dst,src,dstwidth);
       dst+=dstwidth;
 
       if (bright>0) {
-	if (pal==WEED_PALETTE_YUV420P||pal==WEED_PALETTE_YVU420P||pal==WEED_PALETTE_YUV422P||pal==WEED_PALETTE_YUV444P||
-	    pal==WEED_PALETTE_YUVA4444P||pal==WEED_PALETTE_RGB24||pal==WEED_PALETTE_BGR24) {
-	  memset(dst,black[p],bright*psize);
-	  dst+=bright*psize;
-	}
-	else dst+=write_black_pixel(dst,pal,bright,y_black);
+        if (pal==WEED_PALETTE_YUV420P||pal==WEED_PALETTE_YVU420P||pal==WEED_PALETTE_YUV422P||pal==WEED_PALETTE_YUV444P||
+            pal==WEED_PALETTE_YUVA4444P||pal==WEED_PALETTE_RGB24||pal==WEED_PALETTE_BGR24) {
+          memset(dst,black[p],bright*psize);
+          dst+=bright*psize;
+        } else dst+=write_black_pixel(dst,pal,bright,y_black);
       }
 
       src+=priv->picture->linesize[p];
@@ -2971,7 +3012,7 @@
       bbot>>=1;
     }
   }
-  
+
   return TRUE;
 }

LiVES-2.2.8.tar.bz2/lives-plugins/plugins/decoders/mkv_decoder.h -> LiVES-2.4.1.tar.bz2/lives-plugins/plugins/decoders/mkv_decoder.h Changed

@@ -242,15 +242,15 @@
  * Matroska Codec IDs, strings
  */
 
-typedef struct CodecTags{
-    char str[20];
-    enum CodecID id;
-}CodecTags;
+typedef struct CodecTags {
+  char str[20];
+  enum CodecID id;
+} CodecTags;
 
-typedef struct CodecMime{
-    char str[32];
-    enum CodecID id;
-}CodecMime;
+typedef struct CodecMime {
+  char str[32];
+  enum CodecID id;
+} CodecMime;
 
 /* max. depth in the EBML tree structure */
 #define EBML_MAX_DEPTH 16
@@ -258,9 +258,9 @@
 #define MATROSKA_VIDEO_STEREO_MODE_COUNT  15
 #define MATROSKA_VIDEO_STEREO_PLANE_COUNT  3
 
-struct AVMetadataConv{
-    const char *native;
-    const char *generic;
+struct AVMetadataConv {
+  const char *native;
+  const char *generic;
 };
 
 #if FF_API_OLD_METADATA2
@@ -269,765 +269,769 @@
 #endif
 
 const AVMetadataConv ff_mkv_metadata_conv[] = {
-    { "LEAD_PERFORMER", "performer" },
-    { "PART_NUMBER"   , "track"  },
-    { 0 }
+  { "LEAD_PERFORMER", "performer" },
+  { "PART_NUMBER"   , "track"  },
+  { 0 }
 };
 
 
 /*extern const CodecTags ff_mkv_codec_tags[];
 extern const CodecMime ff_mkv_mime_tags[];
-extern const 
+extern const
 extern const char * const matroska_video_stereo_mode[MATROSKA_VIDEO_STEREO_MODE_COUNT];
 extern const char * const matroska_video_stereo_plane[MATROSKA_VIDEO_STEREO_PLANE_COUNT];*/
 
-const CodecTags ff_mkv_codec_tags[]={
-    {"A_AAC"            , CODEC_ID_AAC},
-    {"A_AC3"            , CODEC_ID_AC3},
-    {"A_DTS"            , CODEC_ID_DTS},
-    {"A_EAC3"           , CODEC_ID_EAC3},
-    {"A_FLAC"           , CODEC_ID_FLAC},
-    {"A_MLP"            , CODEC_ID_MLP},
-    {"A_MPEG/L2"        , CODEC_ID_MP2},
-    {"A_MPEG/L1"        , CODEC_ID_MP2},
-    {"A_MPEG/L3"        , CODEC_ID_MP3},
-    {"A_PCM/FLOAT/IEEE" , CODEC_ID_PCM_F32LE},
-    {"A_PCM/FLOAT/IEEE" , CODEC_ID_PCM_F64LE},
-    {"A_PCM/INT/BIG"    , CODEC_ID_PCM_S16BE},
-    {"A_PCM/INT/BIG"    , CODEC_ID_PCM_S24BE},
-    {"A_PCM/INT/BIG"    , CODEC_ID_PCM_S32BE},
-    {"A_PCM/INT/LIT"    , CODEC_ID_PCM_S16LE},
-    {"A_PCM/INT/LIT"    , CODEC_ID_PCM_S24LE},
-    {"A_PCM/INT/LIT"    , CODEC_ID_PCM_S32LE},
-    {"A_PCM/INT/LIT"    , CODEC_ID_PCM_U8},
-    {"A_QUICKTIME/QDM2" , CODEC_ID_QDM2},
-    {"A_REAL/14_4"      , CODEC_ID_RA_144},
-    {"A_REAL/28_8"      , CODEC_ID_RA_288},
-    {"A_REAL/ATRC"      , CODEC_ID_ATRAC3},
-    {"A_REAL/COOK"      , CODEC_ID_COOK},
-    {"A_REAL/SIPR"      , CODEC_ID_SIPR},
-    {"A_TRUEHD"         , CODEC_ID_TRUEHD},
-    {"A_TTA1"           , CODEC_ID_TTA},
-    {"A_VORBIS"         , CODEC_ID_VORBIS},
-    {"A_WAVPACK4"       , CODEC_ID_WAVPACK},
-
-    {"S_TEXT/UTF8"      , CODEC_ID_TEXT},
-    {"S_TEXT/UTF8"      , CODEC_ID_SRT},
-    {"S_TEXT/ASCII"     , CODEC_ID_TEXT},
-    {"S_TEXT/ASS"       , CODEC_ID_SSA},
-    {"S_TEXT/SSA"       , CODEC_ID_SSA},
-    {"S_ASS"            , CODEC_ID_SSA},
-    {"S_SSA"            , CODEC_ID_SSA},
-    {"S_VOBSUB"         , CODEC_ID_DVD_SUBTITLE},
-    {"S_HDMV/PGS"       , CODEC_ID_HDMV_PGS_SUBTITLE},
-
-    {"V_DIRAC"          , CODEC_ID_DIRAC},
-    {"V_MJPEG"          , CODEC_ID_MJPEG},
-    {"V_MPEG1"          , CODEC_ID_MPEG1VIDEO},
-    {"V_MPEG2"          , CODEC_ID_MPEG2VIDEO},
-    {"V_MPEG4/ISO/ASP"  , CODEC_ID_MPEG4},
-    {"V_MPEG4/ISO/AP"   , CODEC_ID_MPEG4},
-    {"V_MPEG4/ISO/SP"   , CODEC_ID_MPEG4},
-    {"V_MPEG4/ISO/AVC"  , CODEC_ID_H264},
-    {"V_MPEG4/MS/V3"    , CODEC_ID_MSMPEG4V3},
-    {"V_REAL/RV10"      , CODEC_ID_RV10},
-    {"V_REAL/RV20"      , CODEC_ID_RV20},
-    {"V_REAL/RV30"      , CODEC_ID_RV30},
-    {"V_REAL/RV40"      , CODEC_ID_RV40},
-    {"V_SNOW"           , CODEC_ID_SNOW},
-    {"V_THEORA"         , CODEC_ID_THEORA},
-    {"V_UNCOMPRESSED"   , CODEC_ID_RAWVIDEO},
-    {"V_VP8"            , CODEC_ID_VP8},
-
-    {""                 , CODEC_ID_NONE}
+const CodecTags ff_mkv_codec_tags[]= {
+  {"A_AAC"            , CODEC_ID_AAC},
+  {"A_AC3"            , CODEC_ID_AC3},
+  {"A_DTS"            , CODEC_ID_DTS},
+  {"A_EAC3"           , CODEC_ID_EAC3},
+  {"A_FLAC"           , CODEC_ID_FLAC},
+  {"A_MLP"            , CODEC_ID_MLP},
+  {"A_MPEG/L2"        , CODEC_ID_MP2},
+  {"A_MPEG/L1"        , CODEC_ID_MP2},
+  {"A_MPEG/L3"        , CODEC_ID_MP3},
+  {"A_PCM/FLOAT/IEEE" , CODEC_ID_PCM_F32LE},
+  {"A_PCM/FLOAT/IEEE" , CODEC_ID_PCM_F64LE},
+  {"A_PCM/INT/BIG"    , CODEC_ID_PCM_S16BE},
+  {"A_PCM/INT/BIG"    , CODEC_ID_PCM_S24BE},
+  {"A_PCM/INT/BIG"    , CODEC_ID_PCM_S32BE},
+  {"A_PCM/INT/LIT"    , CODEC_ID_PCM_S16LE},
+  {"A_PCM/INT/LIT"    , CODEC_ID_PCM_S24LE},
+  {"A_PCM/INT/LIT"    , CODEC_ID_PCM_S32LE},
+  {"A_PCM/INT/LIT"    , CODEC_ID_PCM_U8},
+  {"A_QUICKTIME/QDM2" , CODEC_ID_QDM2},
+  {"A_REAL/14_4"      , CODEC_ID_RA_144},
+  {"A_REAL/28_8"      , CODEC_ID_RA_288},
+  {"A_REAL/ATRC"      , CODEC_ID_ATRAC3},
+  {"A_REAL/COOK"      , CODEC_ID_COOK},
+  {"A_REAL/SIPR"      , CODEC_ID_SIPR},
+  {"A_TRUEHD"         , CODEC_ID_TRUEHD},
+  {"A_TTA1"           , CODEC_ID_TTA},
+  {"A_VORBIS"         , CODEC_ID_VORBIS},
+  {"A_WAVPACK4"       , CODEC_ID_WAVPACK},
+
+  {"S_TEXT/UTF8"      , CODEC_ID_TEXT},
+  {"S_TEXT/UTF8"      , CODEC_ID_SRT},
+  {"S_TEXT/ASCII"     , CODEC_ID_TEXT},
+  {"S_TEXT/ASS"       , CODEC_ID_SSA},
+  {"S_TEXT/SSA"       , CODEC_ID_SSA},
+  {"S_ASS"            , CODEC_ID_SSA},
+  {"S_SSA"            , CODEC_ID_SSA},
+  {"S_VOBSUB"         , CODEC_ID_DVD_SUBTITLE},
+  {"S_HDMV/PGS"       , CODEC_ID_HDMV_PGS_SUBTITLE},
+
+  {"V_DIRAC"          , CODEC_ID_DIRAC},
+  {"V_MJPEG"          , CODEC_ID_MJPEG},
+  {"V_MPEG1"          , CODEC_ID_MPEG1VIDEO},
+  {"V_MPEG2"          , CODEC_ID_MPEG2VIDEO},
+  {"V_MPEG4/ISO/ASP"  , CODEC_ID_MPEG4},
+  {"V_MPEG4/ISO/AP"   , CODEC_ID_MPEG4},
+  {"V_MPEG4/ISO/SP"   , CODEC_ID_MPEG4},
+  {"V_MPEG4/ISO/AVC"  , CODEC_ID_H264},
+  {"V_MPEG4/MS/V3"    , CODEC_ID_MSMPEG4V3},
+  {"V_REAL/RV10"      , CODEC_ID_RV10},
+  {"V_REAL/RV20"      , CODEC_ID_RV20},
+  {"V_REAL/RV30"      , CODEC_ID_RV30},
+  {"V_REAL/RV40"      , CODEC_ID_RV40},
+
+#if FF_API_SNOW
+  {"V_SNOW"           , CODEC_ID_SNOW},
+#endif
+
+  {"V_THEORA"         , CODEC_ID_THEORA},
+  {"V_UNCOMPRESSED"   , CODEC_ID_RAWVIDEO},
+  {"V_VP8"            , CODEC_ID_VP8},
+
+  {""                 , CODEC_ID_NONE}
 };
 
 const CodecMime ff_mkv_mime_tags[] = {
-    {"text/plain"                 , CODEC_ID_TEXT},
-    {"image/gif"                  , CODEC_ID_GIF},
-    {"image/jpeg"                 , CODEC_ID_MJPEG},
-    {"image/png"                  , CODEC_ID_PNG},
-    {"image/tiff"                 , CODEC_ID_TIFF},
-    {"application/x-truetype-font", CODEC_ID_TTF},
-    {"application/x-font"         , CODEC_ID_TTF},
-
-    {""                           , CODEC_ID_NONE}
+  {"text/plain"                 , CODEC_ID_TEXT},
+  {"image/gif"                  , CODEC_ID_GIF},
+  {"image/jpeg"                 , CODEC_ID_MJPEG},
+  {"image/png"                  , CODEC_ID_PNG},
+  {"image/tiff"                 , CODEC_ID_TIFF},
+  {"application/x-truetype-font", CODEC_ID_TTF},
+  {"application/x-font"         , CODEC_ID_TTF},
+
+  {""                           , CODEC_ID_NONE}
 };
 
 
-const char * const matroska_video_stereo_mode[MATROSKA_VIDEO_STEREO_MODE_COUNT] = {
-    "mono",
-    "left_right",
-    "bottom_top",
-    "top_bottom",
-    "checkerboard_rl",
-    "checkerboard_lr"
-    "row_interleaved_rl",
-    "row_interleaved_lr",
-    "col_interleaved_rl",
-    "col_interleaved_lr",
-    "anaglyph_cyan_red",
-    "right_left",
-    "anaglyph_green_magenta",
-    "block_lr",
-    "block_rl",
+const char *const matroska_video_stereo_mode[MATROSKA_VIDEO_STEREO_MODE_COUNT] = {
+  "mono",
+  "left_right",
+  "bottom_top",
+  "top_bottom",
+  "checkerboard_rl",
+  "checkerboard_lr"
+  "row_interleaved_rl",
+  "row_interleaved_lr",
+  "col_interleaved_rl",
+  "col_interleaved_lr",
+  "anaglyph_cyan_red",
+  "right_left",
+  "anaglyph_green_magenta",
+  "block_lr",
+  "block_rl",
 };
 
-const char * const matroska_video_stereo_plane[MATROSKA_VIDEO_STEREO_PLANE_COUNT] = {
-    "left",
-    "right",
-    "background",
+const char *const matroska_video_stereo_plane[MATROSKA_VIDEO_STEREO_PLANE_COUNT] = {
+  "left",
+  "right",
+  "background",
 };
 
 
 typedef enum {
-    EBML_NONE,
-    EBML_UINT,
-    EBML_FLOAT,
-    EBML_STR,
-    EBML_UTF8,
-    EBML_BIN,
-    EBML_NEST,
-    EBML_PASS,
-    EBML_STOP,
-    EBML_TYPE_COUNT
+  EBML_NONE,
+  EBML_UINT,
+  EBML_FLOAT,
+  EBML_STR,
+  EBML_UTF8,
+  EBML_BIN,
+  EBML_NEST,
+  EBML_PASS,
+  EBML_STOP,
+  EBML_TYPE_COUNT
 } EbmlType;
 
 typedef const struct EbmlSyntax {
-    uint32_t id;
-    EbmlType type;
-    int list_elem_size;
-    int data_offset;
-    union {
-        uint64_t    u;
-        double      f;
-        const char *s;
-        const struct EbmlSyntax *n;
-    } def;
+  uint32_t id;
+  EbmlType type;
+  int list_elem_size;
+  int data_offset;
+  union {
+    uint64_t    u;
+    double      f;
+    const char *s;
+    const struct EbmlSyntax *n;
+  } def;
 } EbmlSyntax;
 
 typedef struct {
-    int nb_elem;
-    void *elem;
+  int nb_elem;
+  void *elem;
 } EbmlList;
 
 typedef struct {
-    int      size;
-    uint8_t *data;
-    int64_t  pos;
+  int      size;
+  uint8_t *data;
+  int64_t  pos;
 } EbmlBin;
 
 typedef struct {
-    uint64_t version;
-    uint64_t max_size;
-    uint64_t id_length;
-    char    *doctype;
-    uint64_t doctype_version;
+  uint64_t version;
+  uint64_t max_size;
+  uint64_t id_length;
+  char    *doctype;
+  uint64_t doctype_version;
 } Ebml;
 
 typedef struct {
-    uint64_t algo;
-    EbmlBin  settings;
+  uint64_t algo;
+  EbmlBin  settings;
 } MatroskaTrackCompression;
 
 typedef struct {
-    uint64_t scope;
-    uint64_t type;
-    MatroskaTrackCompression compression;
+  uint64_t scope;
+  uint64_t type;
+  MatroskaTrackCompression compression;
 } MatroskaTrackEncoding;
 
 typedef struct {
-    double   frame_rate;
-    uint64_t display_width;
-    uint64_t display_height;
-    uint64_t pixel_width;
-    uint64_t pixel_height;
-    EbmlBin color_space;
-    uint64_t stereo_mode;
-    uint64_t flag_interlaced;
+  double   frame_rate;
+  uint64_t display_width;
+  uint64_t display_height;
+  uint64_t pixel_width;
+  uint64_t pixel_height;
+  EbmlBin color_space;
+  uint64_t stereo_mode;
+  uint64_t flag_interlaced;
 } MatroskaTrackVideo;
 
 typedef struct {
-    double   samplerate;
-    double   out_samplerate;
-    uint64_t bitdepth;
-    uint64_t channels;
-
-    /* real audio header (extracted from extradata) */
-    int      coded_framesize;
-    int      sub_packet_h;
-    int      frame_size;
-    int      sub_packet_size;
-    int      sub_packet_cnt;
-    int      pkt_cnt;
-    uint64_t buf_timecode;
-    uint8_t *buf;
+  double   samplerate;
+  double   out_samplerate;
+  uint64_t bitdepth;
+  uint64_t channels;
+
+  /* real audio header (extracted from extradata) */
+  int      coded_framesize;
+  int      sub_packet_h;
+  int      frame_size;
+  int      sub_packet_size;
+  int      sub_packet_cnt;
+  int      pkt_cnt;
+  uint64_t buf_timecode;
+  uint8_t *buf;
 } MatroskaTrackAudio;
 
 typedef struct {
-    uint64_t uid;
-    uint64_t type;
+  uint64_t uid;
+  uint64_t type;
 } MatroskaTrackPlane;
 
 typedef struct {
-    EbmlList combine_planes;
+  EbmlList combine_planes;
 } MatroskaTrackOperation;
 
 typedef struct {
-    uint64_t num;
-    uint64_t uid;
-    uint64_t type;
-    char    *name;
-    char    *codec_id;
-    EbmlBin  codec_priv;
-    char    *language;
-    double time_scale;
-    uint64_t default_duration;
-    uint64_t flag_default;
-    uint64_t flag_forced;
-    MatroskaTrackVideo video;
-    MatroskaTrackAudio audio;
-    MatroskaTrackOperation operation;
-    EbmlList encodings;
-
-    AVStream *stream;
-    int64_t end_timecode;
-    int ms_compat;
+  uint64_t num;
+  uint64_t uid;
+  uint64_t type;
+  char    *name;
+  char    *codec_id;
+  EbmlBin  codec_priv;
+  char    *language;
+  double time_scale;
+  uint64_t default_duration;
+  uint64_t flag_default;
+  uint64_t flag_forced;
+  MatroskaTrackVideo video;
+  MatroskaTrackAudio audio;
+  MatroskaTrackOperation operation;
+  EbmlList encodings;
+
+  AVStream *stream;
+  int64_t end_timecode;
+  int ms_compat;
 } MatroskaTrack;
 
 typedef struct {
-    uint64_t uid;
-    char *filename;
-    char *mime;
-    EbmlBin bin;
+  uint64_t uid;
+  char *filename;
+  char *mime;
+  EbmlBin bin;
 
-    AVStream *stream;
+  AVStream *stream;
 } MatroskaAttachement;
 
 typedef struct {
-    uint64_t start;
-    uint64_t end;
-    uint64_t uid;
-    char    *title;
+  uint64_t start;
+  uint64_t end;
+  uint64_t uid;
+  char    *title;
 
-    AVChapter *chapter;
+  AVChapter *chapter;
 } MatroskaChapter;
 
 typedef struct {
-    uint64_t track;
-    uint64_t pos;
+  uint64_t track;
+  uint64_t pos;
 } MatroskaIndexPos;
 
 typedef struct {
-    uint64_t time;
-    EbmlList pos;
+  uint64_t time;
+  EbmlList pos;
 } MatroskaIndex;
 
 typedef struct {
-    char *name;
-    char *string;
-    char *lang;
-    uint64_t def;
-    EbmlList sub;
+  char *name;
+  char *string;
+  char *lang;
+  uint64_t def;
+  EbmlList sub;
 } MatroskaTag;
 
 typedef struct {
-    char    *type;
-    uint64_t typevalue;
-    uint64_t trackuid;
-    uint64_t chapteruid;
-    uint64_t attachuid;
+  char    *type;
+  uint64_t typevalue;
+  uint64_t trackuid;
+  uint64_t chapteruid;
+  uint64_t attachuid;
 } MatroskaTagTarget;
 
 typedef struct {
-    MatroskaTagTarget target;
-    EbmlList tag;
+  MatroskaTagTarget target;
+  EbmlList tag;
 } MatroskaTags;
 
 typedef struct {
-    uint64_t id;
-    uint64_t pos;
+  uint64_t id;
+  uint64_t pos;
 } MatroskaSeekhead;
 
 typedef struct {
-    uint64_t start;
-    uint64_t length;
+  uint64_t start;
+  uint64_t length;
 } MatroskaLevel;
 
 typedef struct {
-    AVFormatContext *ctx;
-
-    /* EBML stuff */
-    int num_levels;
-    MatroskaLevel levels[EBML_MAX_DEPTH];
-    int level_up;
-    uint32_t current_id;
-
-    uint64_t time_scale;
-    double   duration;
-    char    *title;
-    EbmlList tracks;
-    EbmlList attachments;
-    EbmlList chapters;
-    EbmlList index;
-    EbmlList tags;
-    EbmlList seekhead;
-
-    /* byte position of the segment inside the stream */
-    int64_t segment_start;
-
-    /* the packet queue */
-    AVPacket **packets;
-    int num_packets;
-    AVPacket *prev_pkt;
-
-    int done;
-
-    /* What to skip before effectively reading a packet. */
-    int skip_to_keyframe;
-    uint64_t skip_to_timecode;
-    int cues_parsing_deferred;
+  AVFormatContext *ctx;
+
+  /* EBML stuff */
+  int num_levels;
+  MatroskaLevel levels[EBML_MAX_DEPTH];
+  int level_up;
+  uint32_t current_id;
+
+  uint64_t time_scale;
+  double   duration;
+  char    *title;
+  EbmlList tracks;
+  EbmlList attachments;
+  EbmlList chapters;
+  EbmlList index;
+  EbmlList tags;
+  EbmlList seekhead;
+
+  /* byte position of the segment inside the stream */
+  int64_t segment_start;
+
+  /* the packet queue */
+  AVPacket **packets;
+  int num_packets;
+  AVPacket *prev_pkt;
+
+  int done;
+
+  /* What to skip before effectively reading a packet. */
+  int skip_to_keyframe;
+  uint64_t skip_to_timecode;
+  int cues_parsing_deferred;
 } MatroskaDemuxContext;
 
 typedef struct {
-    uint64_t duration;
-    int64_t  reference;
-    uint64_t non_simple;
-    EbmlBin  bin;
+  uint64_t duration;
+  int64_t  reference;
+  uint64_t non_simple;
+  EbmlBin  bin;
 } MatroskaBlock;
 
 typedef struct {
-    uint64_t timecode;
-    EbmlList blocks;
+  uint64_t timecode;
+  EbmlList blocks;
 } MatroskaCluster;
 
 static EbmlSyntax ebml_header[] = {
-    { EBML_ID_EBMLREADVERSION,        EBML_UINT, 0, offsetof(Ebml,version), {.u=EBML_VERSION} },
-    { EBML_ID_EBMLMAXSIZELENGTH,      EBML_UINT, 0, offsetof(Ebml,max_size), {.u=8} },
-    { EBML_ID_EBMLMAXIDLENGTH,        EBML_UINT, 0, offsetof(Ebml,id_length), {.u=4} },
-    { EBML_ID_DOCTYPE,                EBML_STR,  0, offsetof(Ebml,doctype), {.s="(none)"} },
-    { EBML_ID_DOCTYPEREADVERSION,     EBML_UINT, 0, offsetof(Ebml,doctype_version), {.u=1} },
-    { EBML_ID_EBMLVERSION,            EBML_NONE },
-    { EBML_ID_DOCTYPEVERSION,         EBML_NONE },
-    { 0 }
+  { EBML_ID_EBMLREADVERSION,        EBML_UINT, 0, offsetof(Ebml,version), {.u=EBML_VERSION} },
+  { EBML_ID_EBMLMAXSIZELENGTH,      EBML_UINT, 0, offsetof(Ebml,max_size), {.u=8} },
+  { EBML_ID_EBMLMAXIDLENGTH,        EBML_UINT, 0, offsetof(Ebml,id_length), {.u=4} },
+  { EBML_ID_DOCTYPE,                EBML_STR,  0, offsetof(Ebml,doctype), {.s="(none)"} },
+  { EBML_ID_DOCTYPEREADVERSION,     EBML_UINT, 0, offsetof(Ebml,doctype_version), {.u=1} },
+  { EBML_ID_EBMLVERSION,            EBML_NONE },
+  { EBML_ID_DOCTYPEVERSION,         EBML_NONE },
+  { 0 }
 };
 
 static EbmlSyntax ebml_syntax[] = {
-    { EBML_ID_HEADER,                 EBML_NEST, 0, 0, {.n=ebml_header} },
-    { 0 }
+  { EBML_ID_HEADER,                 EBML_NEST, 0, 0, {.n=ebml_header} },
+  { 0 }
 };
 
 static EbmlSyntax matroska_info[] = {
-    { MATROSKA_ID_TIMECODESCALE,      EBML_UINT,  0, offsetof(MatroskaDemuxContext,time_scale), {.u=1000000} },
-    { MATROSKA_ID_DURATION,           EBML_FLOAT, 0, offsetof(MatroskaDemuxContext,duration) },
-    { MATROSKA_ID_TITLE,              EBML_UTF8,  0, offsetof(MatroskaDemuxContext,title) },
-    { MATROSKA_ID_WRITINGAPP,         EBML_NONE },
-    { MATROSKA_ID_MUXINGAPP,          EBML_NONE },
-    { MATROSKA_ID_DATEUTC,            EBML_NONE },
-    { MATROSKA_ID_SEGMENTUID,         EBML_NONE },
-    { 0 }
+  { MATROSKA_ID_TIMECODESCALE,      EBML_UINT,  0, offsetof(MatroskaDemuxContext,time_scale), {.u=1000000} },
+  { MATROSKA_ID_DURATION,           EBML_FLOAT, 0, offsetof(MatroskaDemuxContext,duration) },
+  { MATROSKA_ID_TITLE,              EBML_UTF8,  0, offsetof(MatroskaDemuxContext,title) },
+  { MATROSKA_ID_WRITINGAPP,         EBML_NONE },
+  { MATROSKA_ID_MUXINGAPP,          EBML_NONE },
+  { MATROSKA_ID_DATEUTC,            EBML_NONE },
+  { MATROSKA_ID_SEGMENTUID,         EBML_NONE },
+  { 0 }
 };
 
 static EbmlSyntax matroska_track_video[] = {
-    { MATROSKA_ID_VIDEOFRAMERATE,     EBML_FLOAT,0, offsetof(MatroskaTrackVideo,frame_rate) },
-    { MATROSKA_ID_VIDEODISPLAYWIDTH,  EBML_UINT, 0, offsetof(MatroskaTrackVideo,display_width) },
-    { MATROSKA_ID_VIDEODISPLAYHEIGHT, EBML_UINT, 0, offsetof(MatroskaTrackVideo,display_height) },
-    { MATROSKA_ID_VIDEOPIXELWIDTH,    EBML_UINT, 0, offsetof(MatroskaTrackVideo,pixel_width) },
-    { MATROSKA_ID_VIDEOPIXELHEIGHT,   EBML_UINT, 0, offsetof(MatroskaTrackVideo,pixel_height) },
-    { MATROSKA_ID_VIDEOCOLORSPACE,    EBML_BIN,  0, offsetof(MatroskaTrackVideo,color_space) },
-    { MATROSKA_ID_VIDEOSTEREOMODE,    EBML_UINT, 0, offsetof(MatroskaTrackVideo,stereo_mode) },
-    { MATROSKA_ID_VIDEOFLAGINTERLACED,EBML_UINT, 0, offsetof(MatroskaTrackVideo,flag_interlaced), {.u=0}  },
-    { MATROSKA_ID_VIDEOPIXELCROPB,    EBML_NONE },
-    { MATROSKA_ID_VIDEOPIXELCROPT,    EBML_NONE },
-    { MATROSKA_ID_VIDEOPIXELCROPL,    EBML_NONE },
-    { MATROSKA_ID_VIDEOPIXELCROPR,    EBML_NONE },
-    { MATROSKA_ID_VIDEODISPLAYUNIT,   EBML_NONE },
-    { MATROSKA_ID_VIDEOASPECTRATIO,   EBML_NONE },
-    { 0 }
+  { MATROSKA_ID_VIDEOFRAMERATE,     EBML_FLOAT,0, offsetof(MatroskaTrackVideo,frame_rate) },
+  { MATROSKA_ID_VIDEODISPLAYWIDTH,  EBML_UINT, 0, offsetof(MatroskaTrackVideo,display_width) },
+  { MATROSKA_ID_VIDEODISPLAYHEIGHT, EBML_UINT, 0, offsetof(MatroskaTrackVideo,display_height) },
+  { MATROSKA_ID_VIDEOPIXELWIDTH,    EBML_UINT, 0, offsetof(MatroskaTrackVideo,pixel_width) },
+  { MATROSKA_ID_VIDEOPIXELHEIGHT,   EBML_UINT, 0, offsetof(MatroskaTrackVideo,pixel_height) },
+  { MATROSKA_ID_VIDEOCOLORSPACE,    EBML_BIN,  0, offsetof(MatroskaTrackVideo,color_space) },
+  { MATROSKA_ID_VIDEOSTEREOMODE,    EBML_UINT, 0, offsetof(MatroskaTrackVideo,stereo_mode) },
+  { MATROSKA_ID_VIDEOFLAGINTERLACED,EBML_UINT, 0, offsetof(MatroskaTrackVideo,flag_interlaced), {.u=0}  },
+  { MATROSKA_ID_VIDEOPIXELCROPB,    EBML_NONE },
+  { MATROSKA_ID_VIDEOPIXELCROPT,    EBML_NONE },
+  { MATROSKA_ID_VIDEOPIXELCROPL,    EBML_NONE },
+  { MATROSKA_ID_VIDEOPIXELCROPR,    EBML_NONE },
+  { MATROSKA_ID_VIDEODISPLAYUNIT,   EBML_NONE },
+  { MATROSKA_ID_VIDEOASPECTRATIO,   EBML_NONE },
+  { 0 }
 };
 
 static EbmlSyntax matroska_track_audio[] = {
-    { MATROSKA_ID_AUDIOSAMPLINGFREQ,  EBML_FLOAT,0, offsetof(MatroskaTrackAudio,samplerate), {.f=8000.0} },
-    { MATROSKA_ID_AUDIOOUTSAMPLINGFREQ,EBML_FLOAT,0,offsetof(MatroskaTrackAudio,out_samplerate) },
-    { MATROSKA_ID_AUDIOBITDEPTH,      EBML_UINT, 0, offsetof(MatroskaTrackAudio,bitdepth) },
-    { MATROSKA_ID_AUDIOCHANNELS,      EBML_UINT, 0, offsetof(MatroskaTrackAudio,channels), {.u=1} },
-    { 0 }
+  { MATROSKA_ID_AUDIOSAMPLINGFREQ,  EBML_FLOAT,0, offsetof(MatroskaTrackAudio,samplerate), {.f=8000.0} },
+  { MATROSKA_ID_AUDIOOUTSAMPLINGFREQ,EBML_FLOAT,0,offsetof(MatroskaTrackAudio,out_samplerate) },
+  { MATROSKA_ID_AUDIOBITDEPTH,      EBML_UINT, 0, offsetof(MatroskaTrackAudio,bitdepth) },
+  { MATROSKA_ID_AUDIOCHANNELS,      EBML_UINT, 0, offsetof(MatroskaTrackAudio,channels), {.u=1} },
+  { 0 }
 };
 
 static EbmlSyntax matroska_track_encoding_compression[] = {
-    { MATROSKA_ID_ENCODINGCOMPALGO,   EBML_UINT, 0, offsetof(MatroskaTrackCompression,algo), {.u=0} },
-    { MATROSKA_ID_ENCODINGCOMPSETTINGS,EBML_BIN, 0, offsetof(MatroskaTrackCompression,settings) },
-    { 0 }
+  { MATROSKA_ID_ENCODINGCOMPALGO,   EBML_UINT, 0, offsetof(MatroskaTrackCompression,algo), {.u=0} },
+  { MATROSKA_ID_ENCODINGCOMPSETTINGS,EBML_BIN, 0, offsetof(MatroskaTrackCompression,settings) },
+  { 0 }
 };
 
 static EbmlSyntax matroska_track_encoding[] = {
-    { MATROSKA_ID_ENCODINGSCOPE,      EBML_UINT, 0, offsetof(MatroskaTrackEncoding,scope), {.u=1} },
-    { MATROSKA_ID_ENCODINGTYPE,       EBML_UINT, 0, offsetof(MatroskaTrackEncoding,type), {.u=0} },
-    { MATROSKA_ID_ENCODINGCOMPRESSION,EBML_NEST, 0, offsetof(MatroskaTrackEncoding,compression), {.n=matroska_track_encoding_compression} },
-    { MATROSKA_ID_ENCODINGORDER,      EBML_NONE },
-    { 0 }
+  { MATROSKA_ID_ENCODINGSCOPE,      EBML_UINT, 0, offsetof(MatroskaTrackEncoding,scope), {.u=1} },
+  { MATROSKA_ID_ENCODINGTYPE,       EBML_UINT, 0, offsetof(MatroskaTrackEncoding,type), {.u=0} },
+  { MATROSKA_ID_ENCODINGCOMPRESSION,EBML_NEST, 0, offsetof(MatroskaTrackEncoding,compression), {.n=matroska_track_encoding_compression} },
+  { MATROSKA_ID_ENCODINGORDER,      EBML_NONE },
+  { 0 }
 };
 
 static EbmlSyntax matroska_track_encodings[] = {
-    { MATROSKA_ID_TRACKCONTENTENCODING, EBML_NEST, sizeof(MatroskaTrackEncoding), offsetof(MatroskaTrack,encodings), {.n=matroska_track_encoding} },
-    { 0 }
+  { MATROSKA_ID_TRACKCONTENTENCODING, EBML_NEST, sizeof(MatroskaTrackEncoding), offsetof(MatroskaTrack,encodings), {.n=matroska_track_encoding} },
+  { 0 }
 };
 
 static EbmlSyntax matroska_track_plane[] = {
-    { MATROSKA_ID_TRACKPLANEUID,  EBML_UINT, 0, offsetof(MatroskaTrackPlane,uid) },
-    { MATROSKA_ID_TRACKPLANETYPE, EBML_UINT, 0, offsetof(MatroskaTrackPlane,type) },
-    { 0 }
+  { MATROSKA_ID_TRACKPLANEUID,  EBML_UINT, 0, offsetof(MatroskaTrackPlane,uid) },
+  { MATROSKA_ID_TRACKPLANETYPE, EBML_UINT, 0, offsetof(MatroskaTrackPlane,type) },
+  { 0 }
 };
 
 static EbmlSyntax matroska_track_combine_planes[] = {
-    { MATROSKA_ID_TRACKPLANE, EBML_NEST, sizeof(MatroskaTrackPlane), offsetof(MatroskaTrackOperation,combine_planes), {.n=matroska_track_plane} },
-    { 0 }
+  { MATROSKA_ID_TRACKPLANE, EBML_NEST, sizeof(MatroskaTrackPlane), offsetof(MatroskaTrackOperation,combine_planes), {.n=matroska_track_plane} },
+  { 0 }
 };
 
 static EbmlSyntax matroska_track_operation[] = {
-    { MATROSKA_ID_TRACKCOMBINEPLANES, EBML_NEST, 0, 0, {.n=matroska_track_combine_planes} },
-    { 0 }
+  { MATROSKA_ID_TRACKCOMBINEPLANES, EBML_NEST, 0, 0, {.n=matroska_track_combine_planes} },
+  { 0 }
 };
 
 static EbmlSyntax matroska_track[] = {
-    { MATROSKA_ID_TRACKNUMBER,          EBML_UINT, 0, offsetof(MatroskaTrack,num) },
-    { MATROSKA_ID_TRACKNAME,            EBML_UTF8, 0, offsetof(MatroskaTrack,name) },
-    { MATROSKA_ID_TRACKUID,             EBML_UINT, 0, offsetof(MatroskaTrack,uid) },
-    { MATROSKA_ID_TRACKTYPE,            EBML_UINT, 0, offsetof(MatroskaTrack,type) },
-    { MATROSKA_ID_CODECID,              EBML_STR,  0, offsetof(MatroskaTrack,codec_id) },
-    { MATROSKA_ID_CODECPRIVATE,         EBML_BIN,  0, offsetof(MatroskaTrack,codec_priv) },
-    { MATROSKA_ID_TRACKLANGUAGE,        EBML_UTF8, 0, offsetof(MatroskaTrack,language), {.s="eng"} },
-    { MATROSKA_ID_TRACKDEFAULTDURATION, EBML_UINT, 0, offsetof(MatroskaTrack,default_duration) },
-    { MATROSKA_ID_TRACKTIMECODESCALE,   EBML_FLOAT,0, offsetof(MatroskaTrack,time_scale), {.f=1.0} },
-    { MATROSKA_ID_TRACKFLAGDEFAULT,     EBML_UINT, 0, offsetof(MatroskaTrack,flag_default), {.u=1} },
-    { MATROSKA_ID_TRACKFLAGFORCED,      EBML_UINT, 0, offsetof(MatroskaTrack,flag_forced), {.u=0} },
-    { MATROSKA_ID_TRACKVIDEO,           EBML_NEST, 0, offsetof(MatroskaTrack,video), {.n=matroska_track_video} },
-    { MATROSKA_ID_TRACKAUDIO,           EBML_NEST, 0, offsetof(MatroskaTrack,audio), {.n=matroska_track_audio} },
-    { MATROSKA_ID_TRACKOPERATION,       EBML_NEST, 0, offsetof(MatroskaTrack,operation), {.n=matroska_track_operation} },
-    { MATROSKA_ID_TRACKCONTENTENCODINGS,EBML_NEST, 0, 0, {.n=matroska_track_encodings} },
-    { MATROSKA_ID_TRACKFLAGENABLED,     EBML_NONE },
-    { MATROSKA_ID_TRACKFLAGLACING,      EBML_NONE },
-    { MATROSKA_ID_CODECNAME,            EBML_NONE },
-    { MATROSKA_ID_CODECDECODEALL,       EBML_NONE },
-    { MATROSKA_ID_CODECINFOURL,         EBML_NONE },
-    { MATROSKA_ID_CODECDOWNLOADURL,     EBML_NONE },
-    { MATROSKA_ID_TRACKMINCACHE,        EBML_NONE },
-    { MATROSKA_ID_TRACKMAXCACHE,        EBML_NONE },
-    { MATROSKA_ID_TRACKMAXBLKADDID,     EBML_NONE },
-    { 0 }
+  { MATROSKA_ID_TRACKNUMBER,          EBML_UINT, 0, offsetof(MatroskaTrack,num) },
+  { MATROSKA_ID_TRACKNAME,            EBML_UTF8, 0, offsetof(MatroskaTrack,name) },
+  { MATROSKA_ID_TRACKUID,             EBML_UINT, 0, offsetof(MatroskaTrack,uid) },
+  { MATROSKA_ID_TRACKTYPE,            EBML_UINT, 0, offsetof(MatroskaTrack,type) },
+  { MATROSKA_ID_CODECID,              EBML_STR,  0, offsetof(MatroskaTrack,codec_id) },
+  { MATROSKA_ID_CODECPRIVATE,         EBML_BIN,  0, offsetof(MatroskaTrack,codec_priv) },
+  { MATROSKA_ID_TRACKLANGUAGE,        EBML_UTF8, 0, offsetof(MatroskaTrack,language), {.s="eng"} },
+  { MATROSKA_ID_TRACKDEFAULTDURATION, EBML_UINT, 0, offsetof(MatroskaTrack,default_duration) },
+  { MATROSKA_ID_TRACKTIMECODESCALE,   EBML_FLOAT,0, offsetof(MatroskaTrack,time_scale), {.f=1.0} },
+  { MATROSKA_ID_TRACKFLAGDEFAULT,     EBML_UINT, 0, offsetof(MatroskaTrack,flag_default), {.u=1} },
+  { MATROSKA_ID_TRACKFLAGFORCED,      EBML_UINT, 0, offsetof(MatroskaTrack,flag_forced), {.u=0} },
+  { MATROSKA_ID_TRACKVIDEO,           EBML_NEST, 0, offsetof(MatroskaTrack,video), {.n=matroska_track_video} },
+  { MATROSKA_ID_TRACKAUDIO,           EBML_NEST, 0, offsetof(MatroskaTrack,audio), {.n=matroska_track_audio} },
+  { MATROSKA_ID_TRACKOPERATION,       EBML_NEST, 0, offsetof(MatroskaTrack,operation), {.n=matroska_track_operation} },
+  { MATROSKA_ID_TRACKCONTENTENCODINGS,EBML_NEST, 0, 0, {.n=matroska_track_encodings} },
+  { MATROSKA_ID_TRACKFLAGENABLED,     EBML_NONE },
+  { MATROSKA_ID_TRACKFLAGLACING,      EBML_NONE },
+  { MATROSKA_ID_CODECNAME,            EBML_NONE },
+  { MATROSKA_ID_CODECDECODEALL,       EBML_NONE },
+  { MATROSKA_ID_CODECINFOURL,         EBML_NONE },
+  { MATROSKA_ID_CODECDOWNLOADURL,     EBML_NONE },
+  { MATROSKA_ID_TRACKMINCACHE,        EBML_NONE },
+  { MATROSKA_ID_TRACKMAXCACHE,        EBML_NONE },
+  { MATROSKA_ID_TRACKMAXBLKADDID,     EBML_NONE },
+  { 0 }
 };
 
 static EbmlSyntax matroska_tracks[] = {
-    { MATROSKA_ID_TRACKENTRY,         EBML_NEST, sizeof(MatroskaTrack), offsetof(MatroskaDemuxContext,tracks), {.n=matroska_track} },
-    { 0 }
+  { MATROSKA_ID_TRACKENTRY,         EBML_NEST, sizeof(MatroskaTrack), offsetof(MatroskaDemuxContext,tracks), {.n=matroska_track} },
+  { 0 }
 };
 
 static EbmlSyntax matroska_attachment[] = {
-    { MATROSKA_ID_FILEUID,            EBML_UINT, 0, offsetof(MatroskaAttachement,uid) },
-    { MATROSKA_ID_FILENAME,           EBML_UTF8, 0, offsetof(MatroskaAttachement,filename) },
-    { MATROSKA_ID_FILEMIMETYPE,       EBML_STR,  0, offsetof(MatroskaAttachement,mime) },
-    { MATROSKA_ID_FILEDATA,           EBML_BIN,  0, offsetof(MatroskaAttachement,bin) },
-    { MATROSKA_ID_FILEDESC,           EBML_NONE },
-    { 0 }
+  { MATROSKA_ID_FILEUID,            EBML_UINT, 0, offsetof(MatroskaAttachement,uid) },
+  { MATROSKA_ID_FILENAME,           EBML_UTF8, 0, offsetof(MatroskaAttachement,filename) },
+  { MATROSKA_ID_FILEMIMETYPE,       EBML_STR,  0, offsetof(MatroskaAttachement,mime) },
+  { MATROSKA_ID_FILEDATA,           EBML_BIN,  0, offsetof(MatroskaAttachement,bin) },
+  { MATROSKA_ID_FILEDESC,           EBML_NONE },
+  { 0 }
 };
 
 static EbmlSyntax matroska_attachments[] = {
-    { MATROSKA_ID_ATTACHEDFILE,       EBML_NEST, sizeof(MatroskaAttachement), offsetof(MatroskaDemuxContext,attachments), {.n=matroska_attachment} },
-    { 0 }
+  { MATROSKA_ID_ATTACHEDFILE,       EBML_NEST, sizeof(MatroskaAttachement), offsetof(MatroskaDemuxContext,attachments), {.n=matroska_attachment} },
+  { 0 }
 };
 
 static EbmlSyntax matroska_chapter_display[] = {
-    { MATROSKA_ID_CHAPSTRING,         EBML_UTF8, 0, offsetof(MatroskaChapter,title) },
-    { MATROSKA_ID_CHAPLANG,           EBML_NONE },
-    { 0 }
+  { MATROSKA_ID_CHAPSTRING,         EBML_UTF8, 0, offsetof(MatroskaChapter,title) },
+  { MATROSKA_ID_CHAPLANG,           EBML_NONE },
+  { 0 }
 };
 
 static EbmlSyntax matroska_chapter_entry[] = {
-    { MATROSKA_ID_CHAPTERTIMESTART,   EBML_UINT, 0, offsetof(MatroskaChapter,start), {.u=AV_NOPTS_VALUE} },
-    { MATROSKA_ID_CHAPTERTIMEEND,     EBML_UINT, 0, offsetof(MatroskaChapter,end), {.u=AV_NOPTS_VALUE} },
-    { MATROSKA_ID_CHAPTERUID,         EBML_UINT, 0, offsetof(MatroskaChapter,uid) },
-    { MATROSKA_ID_CHAPTERDISPLAY,     EBML_NEST, 0, 0, {.n=matroska_chapter_display} },
-    { MATROSKA_ID_CHAPTERFLAGHIDDEN,  EBML_NONE },
-    { MATROSKA_ID_CHAPTERFLAGENABLED, EBML_NONE },
-    { MATROSKA_ID_CHAPTERPHYSEQUIV,   EBML_NONE },
-    { MATROSKA_ID_CHAPTERATOM,        EBML_NONE },
-    { 0 }
+  { MATROSKA_ID_CHAPTERTIMESTART,   EBML_UINT, 0, offsetof(MatroskaChapter,start), {.u=AV_NOPTS_VALUE} },
+  { MATROSKA_ID_CHAPTERTIMEEND,     EBML_UINT, 0, offsetof(MatroskaChapter,end), {.u=AV_NOPTS_VALUE} },
+  { MATROSKA_ID_CHAPTERUID,         EBML_UINT, 0, offsetof(MatroskaChapter,uid) },
+  { MATROSKA_ID_CHAPTERDISPLAY,     EBML_NEST, 0, 0, {.n=matroska_chapter_display} },
+  { MATROSKA_ID_CHAPTERFLAGHIDDEN,  EBML_NONE },
+  { MATROSKA_ID_CHAPTERFLAGENABLED, EBML_NONE },
+  { MATROSKA_ID_CHAPTERPHYSEQUIV,   EBML_NONE },
+  { MATROSKA_ID_CHAPTERATOM,        EBML_NONE },
+  { 0 }
 };
 
 static EbmlSyntax matroska_chapter[] = {
-    { MATROSKA_ID_CHAPTERATOM,        EBML_NEST, sizeof(MatroskaChapter), offsetof(MatroskaDemuxContext,chapters), {.n=matroska_chapter_entry} },
-    { MATROSKA_ID_EDITIONUID,         EBML_NONE },
-    { MATROSKA_ID_EDITIONFLAGHIDDEN,  EBML_NONE },
-    { MATROSKA_ID_EDITIONFLAGDEFAULT, EBML_NONE },
-    { MATROSKA_ID_EDITIONFLAGORDERED, EBML_NONE },
-    { 0 }
+  { MATROSKA_ID_CHAPTERATOM,        EBML_NEST, sizeof(MatroskaChapter), offsetof(MatroskaDemuxContext,chapters), {.n=matroska_chapter_entry} },
+  { MATROSKA_ID_EDITIONUID,         EBML_NONE },
+  { MATROSKA_ID_EDITIONFLAGHIDDEN,  EBML_NONE },
+  { MATROSKA_ID_EDITIONFLAGDEFAULT, EBML_NONE },
+  { MATROSKA_ID_EDITIONFLAGORDERED, EBML_NONE },
+  { 0 }
 };
 
 static EbmlSyntax matroska_chapters[] = {
-    { MATROSKA_ID_EDITIONENTRY,       EBML_NEST, 0, 0, {.n=matroska_chapter} },
-    { 0 }
+  { MATROSKA_ID_EDITIONENTRY,       EBML_NEST, 0, 0, {.n=matroska_chapter} },
+  { 0 }
 };
 
 static EbmlSyntax matroska_index_pos[] = {
-    { MATROSKA_ID_CUETRACK,           EBML_UINT, 0, offsetof(MatroskaIndexPos,track) },
-    { MATROSKA_ID_CUECLUSTERPOSITION, EBML_UINT, 0, offsetof(MatroskaIndexPos,pos)   },
-    { MATROSKA_ID_CUEBLOCKNUMBER,     EBML_NONE },
-    { 0 }
+  { MATROSKA_ID_CUETRACK,           EBML_UINT, 0, offsetof(MatroskaIndexPos,track) },
+  { MATROSKA_ID_CUECLUSTERPOSITION, EBML_UINT, 0, offsetof(MatroskaIndexPos,pos)   },
+  { MATROSKA_ID_CUEBLOCKNUMBER,     EBML_NONE },
+  { 0 }
 };
 
 static EbmlSyntax matroska_index_entry[] = {
-    { MATROSKA_ID_CUETIME,            EBML_UINT, 0, offsetof(MatroskaIndex,time) },
-    { MATROSKA_ID_CUETRACKPOSITION,   EBML_NEST, sizeof(MatroskaIndexPos), offsetof(MatroskaIndex,pos), {.n=matroska_index_pos} },
-    { 0 }
+  { MATROSKA_ID_CUETIME,            EBML_UINT, 0, offsetof(MatroskaIndex,time) },
+  { MATROSKA_ID_CUETRACKPOSITION,   EBML_NEST, sizeof(MatroskaIndexPos), offsetof(MatroskaIndex,pos), {.n=matroska_index_pos} },
+  { 0 }
 };
 
 static EbmlSyntax matroska_index[] = {
-    { MATROSKA_ID_POINTENTRY,         EBML_NEST, sizeof(MatroskaIndex), offsetof(MatroskaDemuxContext,index), {.n=matroska_index_entry} },
-    { 0 }
+  { MATROSKA_ID_POINTENTRY,         EBML_NEST, sizeof(MatroskaIndex), offsetof(MatroskaDemuxContext,index), {.n=matroska_index_entry} },
+  { 0 }
 };
 
 static EbmlSyntax matroska_simpletag[] = {
-    { MATROSKA_ID_TAGNAME,            EBML_UTF8, 0, offsetof(MatroskaTag,name) },
-    { MATROSKA_ID_TAGSTRING,          EBML_UTF8, 0, offsetof(MatroskaTag,string) },
-    { MATROSKA_ID_TAGLANG,            EBML_STR,  0, offsetof(MatroskaTag,lang), {.s="und"} },
-    { MATROSKA_ID_TAGDEFAULT,         EBML_UINT, 0, offsetof(MatroskaTag,def) },
-    { MATROSKA_ID_TAGDEFAULT_BUG,     EBML_UINT, 0, offsetof(MatroskaTag,def) },
-    { MATROSKA_ID_SIMPLETAG,          EBML_NEST, sizeof(MatroskaTag), offsetof(MatroskaTag,sub), {.n=matroska_simpletag} },
-    { 0 }
+  { MATROSKA_ID_TAGNAME,            EBML_UTF8, 0, offsetof(MatroskaTag,name) },
+  { MATROSKA_ID_TAGSTRING,          EBML_UTF8, 0, offsetof(MatroskaTag,string) },
+  { MATROSKA_ID_TAGLANG,            EBML_STR,  0, offsetof(MatroskaTag,lang), {.s="und"} },
+  { MATROSKA_ID_TAGDEFAULT,         EBML_UINT, 0, offsetof(MatroskaTag,def) },
+  { MATROSKA_ID_TAGDEFAULT_BUG,     EBML_UINT, 0, offsetof(MatroskaTag,def) },
+  { MATROSKA_ID_SIMPLETAG,          EBML_NEST, sizeof(MatroskaTag), offsetof(MatroskaTag,sub), {.n=matroska_simpletag} },
+  { 0 }
 };
 
 static EbmlSyntax matroska_tagtargets[] = {
-    { MATROSKA_ID_TAGTARGETS_TYPE,      EBML_STR,  0, offsetof(MatroskaTagTarget,type) },
-    { MATROSKA_ID_TAGTARGETS_TYPEVALUE, EBML_UINT, 0, offsetof(MatroskaTagTarget,typevalue), {.u=50} },
-    { MATROSKA_ID_TAGTARGETS_TRACKUID,  EBML_UINT, 0, offsetof(MatroskaTagTarget,trackuid) },
-    { MATROSKA_ID_TAGTARGETS_CHAPTERUID,EBML_UINT, 0, offsetof(MatroskaTagTarget,chapteruid) },
-    { MATROSKA_ID_TAGTARGETS_ATTACHUID, EBML_UINT, 0, offsetof(MatroskaTagTarget,attachuid) },
-    { 0 }
+  { MATROSKA_ID_TAGTARGETS_TYPE,      EBML_STR,  0, offsetof(MatroskaTagTarget,type) },
+  { MATROSKA_ID_TAGTARGETS_TYPEVALUE, EBML_UINT, 0, offsetof(MatroskaTagTarget,typevalue), {.u=50} },
+  { MATROSKA_ID_TAGTARGETS_TRACKUID,  EBML_UINT, 0, offsetof(MatroskaTagTarget,trackuid) },
+  { MATROSKA_ID_TAGTARGETS_CHAPTERUID,EBML_UINT, 0, offsetof(MatroskaTagTarget,chapteruid) },
+  { MATROSKA_ID_TAGTARGETS_ATTACHUID, EBML_UINT, 0, offsetof(MatroskaTagTarget,attachuid) },
+  { 0 }
 };
 
 static EbmlSyntax matroska_tag[] = {
-    { MATROSKA_ID_SIMPLETAG,          EBML_NEST, sizeof(MatroskaTag), offsetof(MatroskaTags,tag), {.n=matroska_simpletag} },
-    { MATROSKA_ID_TAGTARGETS,         EBML_NEST, 0, offsetof(MatroskaTags,target), {.n=matroska_tagtargets} },
-    { 0 }
+  { MATROSKA_ID_SIMPLETAG,          EBML_NEST, sizeof(MatroskaTag), offsetof(MatroskaTags,tag), {.n=matroska_simpletag} },
+  { MATROSKA_ID_TAGTARGETS,         EBML_NEST, 0, offsetof(MatroskaTags,target), {.n=matroska_tagtargets} },
+  { 0 }
 };
 
 static EbmlSyntax matroska_tags[] = {
-    { MATROSKA_ID_TAG,                EBML_NEST, sizeof(MatroskaTags), offsetof(MatroskaDemuxContext,tags), {.n=matroska_tag} },
-    { 0 }
+  { MATROSKA_ID_TAG,                EBML_NEST, sizeof(MatroskaTags), offsetof(MatroskaDemuxContext,tags), {.n=matroska_tag} },
+  { 0 }
 };
 
 static EbmlSyntax matroska_seekhead_entry[] = {
-    { MATROSKA_ID_SEEKID,             EBML_UINT, 0, offsetof(MatroskaSeekhead,id) },
-    { MATROSKA_ID_SEEKPOSITION,       EBML_UINT, 0, offsetof(MatroskaSeekhead,pos), {.u=-1} },
-    { 0 }
+  { MATROSKA_ID_SEEKID,             EBML_UINT, 0, offsetof(MatroskaSeekhead,id) },
+  { MATROSKA_ID_SEEKPOSITION,       EBML_UINT, 0, offsetof(MatroskaSeekhead,pos), {.u=-1} },
+  { 0 }
 };
 
 static EbmlSyntax matroska_seekhead[] = {
-    { MATROSKA_ID_SEEKENTRY,          EBML_NEST, sizeof(MatroskaSeekhead), offsetof(MatroskaDemuxContext,seekhead), {.n=matroska_seekhead_entry} },
-    { 0 }
+  { MATROSKA_ID_SEEKENTRY,          EBML_NEST, sizeof(MatroskaSeekhead), offsetof(MatroskaDemuxContext,seekhead), {.n=matroska_seekhead_entry} },
+  { 0 }
 };
 
 static EbmlSyntax matroska_segment[] = {
-    { MATROSKA_ID_INFO,           EBML_NEST, 0, 0, {.n=matroska_info       } },
-    { MATROSKA_ID_TRACKS,         EBML_NEST, 0, 0, {.n=matroska_tracks     } },
-    { MATROSKA_ID_ATTACHMENTS,    EBML_NEST, 0, 0, {.n=matroska_attachments} },
-    { MATROSKA_ID_CHAPTERS,       EBML_NEST, 0, 0, {.n=matroska_chapters   } },
-    { MATROSKA_ID_CUES,           EBML_NEST, 0, 0, {.n=matroska_index      } },
-    { MATROSKA_ID_TAGS,           EBML_NEST, 0, 0, {.n=matroska_tags       } },
-    { MATROSKA_ID_SEEKHEAD,       EBML_NEST, 0, 0, {.n=matroska_seekhead   } },
-    { MATROSKA_ID_CLUSTER,        EBML_STOP },
-    { 0 }
+  { MATROSKA_ID_INFO,           EBML_NEST, 0, 0, {.n=matroska_info       } },
+  { MATROSKA_ID_TRACKS,         EBML_NEST, 0, 0, {.n=matroska_tracks     } },
+  { MATROSKA_ID_ATTACHMENTS,    EBML_NEST, 0, 0, {.n=matroska_attachments} },
+  { MATROSKA_ID_CHAPTERS,       EBML_NEST, 0, 0, {.n=matroska_chapters   } },
+  { MATROSKA_ID_CUES,           EBML_NEST, 0, 0, {.n=matroska_index      } },
+  { MATROSKA_ID_TAGS,           EBML_NEST, 0, 0, {.n=matroska_tags       } },
+  { MATROSKA_ID_SEEKHEAD,       EBML_NEST, 0, 0, {.n=matroska_seekhead   } },
+  { MATROSKA_ID_CLUSTER,        EBML_STOP },
+  { 0 }
 };
 
 static EbmlSyntax matroska_segments[] = {
-    { MATROSKA_ID_SEGMENT,        EBML_NEST, 0, 0, {.n=matroska_segment    } },
-    { 0 }
+  { MATROSKA_ID_SEGMENT,        EBML_NEST, 0, 0, {.n=matroska_segment    } },
+  { 0 }
 };
 
 static EbmlSyntax matroska_blockgroup[] = {
-    { MATROSKA_ID_BLOCK,          EBML_BIN,  0, offsetof(MatroskaBlock,bin) },
-    { MATROSKA_ID_SIMPLEBLOCK,    EBML_BIN,  0, offsetof(MatroskaBlock,bin) },
-    { MATROSKA_ID_BLOCKDURATION,  EBML_UINT, 0, offsetof(MatroskaBlock,duration) },
-    { MATROSKA_ID_BLOCKREFERENCE, EBML_UINT, 0, offsetof(MatroskaBlock,reference) },
-    { 1,                          EBML_UINT, 0, offsetof(MatroskaBlock,non_simple), {.u=1} },
-    { 0 }
+  { MATROSKA_ID_BLOCK,          EBML_BIN,  0, offsetof(MatroskaBlock,bin) },
+  { MATROSKA_ID_SIMPLEBLOCK,    EBML_BIN,  0, offsetof(MatroskaBlock,bin) },
+  { MATROSKA_ID_BLOCKDURATION,  EBML_UINT, 0, offsetof(MatroskaBlock,duration) },
+  { MATROSKA_ID_BLOCKREFERENCE, EBML_UINT, 0, offsetof(MatroskaBlock,reference) },
+  { 1,                          EBML_UINT, 0, offsetof(MatroskaBlock,non_simple), {.u=1} },
+  { 0 }
 };
 
 static EbmlSyntax matroska_cluster[] = {
-    { MATROSKA_ID_CLUSTERTIMECODE,EBML_UINT,0, offsetof(MatroskaCluster,timecode) },
-    { MATROSKA_ID_BLOCKGROUP,     EBML_NEST, sizeof(MatroskaBlock), offsetof(MatroskaCluster,blocks), {.n=matroska_blockgroup} },
-    { MATROSKA_ID_SIMPLEBLOCK,    EBML_PASS, sizeof(MatroskaBlock), offsetof(MatroskaCluster,blocks), {.n=matroska_blockgroup} },
-    { MATROSKA_ID_CLUSTERPOSITION,EBML_NONE },
-    { MATROSKA_ID_CLUSTERPREVSIZE,EBML_NONE },
-    { 0 }
+  { MATROSKA_ID_CLUSTERTIMECODE,EBML_UINT,0, offsetof(MatroskaCluster,timecode) },
+  { MATROSKA_ID_BLOCKGROUP,     EBML_NEST, sizeof(MatroskaBlock), offsetof(MatroskaCluster,blocks), {.n=matroska_blockgroup} },
+  { MATROSKA_ID_SIMPLEBLOCK,    EBML_PASS, sizeof(MatroskaBlock), offsetof(MatroskaCluster,blocks), {.n=matroska_blockgroup} },
+  { MATROSKA_ID_CLUSTERPOSITION,EBML_NONE },
+  { MATROSKA_ID_CLUSTERPREVSIZE,EBML_NONE },
+  { 0 }
 };
 
 static EbmlSyntax matroska_clusters[] = {
-    { MATROSKA_ID_CLUSTER,        EBML_NEST, 0, 0, {.n=matroska_cluster} },
-    { MATROSKA_ID_INFO,           EBML_NONE },
-    { MATROSKA_ID_CUES,           EBML_NONE },
-    { MATROSKA_ID_TAGS,           EBML_NONE },
-    { MATROSKA_ID_SEEKHEAD,       EBML_NONE },
-    { 0 }
+  { MATROSKA_ID_CLUSTER,        EBML_NEST, 0, 0, {.n=matroska_cluster} },
+  { MATROSKA_ID_INFO,           EBML_NONE },
+  { MATROSKA_ID_CUES,           EBML_NONE },
+  { MATROSKA_ID_TAGS,           EBML_NONE },
+  { MATROSKA_ID_SEEKHEAD,       EBML_NONE },
+  { 0 }
 };
 
 
 
 const AVCodecTag codec_movvideo_tags[] = {
-/*  { CODEC_ID_, MKTAG('I', 'V', '5', '0') }, *//* Indeo 5.0 */
-
-    { CODEC_ID_RAWVIDEO, MKTAG('r', 'a', 'w', ' ') }, /* Uncompressed RGB */
-    { CODEC_ID_RAWVIDEO, MKTAG('y', 'u', 'v', '2') }, /* Uncompressed YUV422 */
-    { CODEC_ID_RAWVIDEO, MKTAG('A', 'V', 'U', 'I') }, /* YUV with alpha-channel (AVID Uncompressed) */
-    { CODEC_ID_RAWVIDEO, MKTAG('2', 'v', 'u', 'y') }, /* UNCOMPRESSED 8BIT 4:2:2 */
-    { CODEC_ID_RAWVIDEO, MKTAG('y', 'u', 'v', 's') }, /* same as 2vuy but byte swapped */
-
-    { CODEC_ID_RAWVIDEO, MKTAG('L', '5', '5', '5') },
-    { CODEC_ID_RAWVIDEO, MKTAG('L', '5', '6', '5') },
-    { CODEC_ID_RAWVIDEO, MKTAG('B', '5', '6', '5') },
-    { CODEC_ID_RAWVIDEO, MKTAG('2', '4', 'B', 'G') },
-    { CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 'A') },
-    { CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 'A') },
-    { CODEC_ID_RAWVIDEO, MKTAG('A', 'B', 'G', 'R') },
-    { CODEC_ID_RAWVIDEO, MKTAG('b', '1', '6', 'g') },
-    { CODEC_ID_RAWVIDEO, MKTAG('b', '4', '8', 'r') },
-    { CODEC_ID_RAWVIDEO, MKTAG('D', 'V', 'O', 'O') }, /* Digital Voodoo SD 8 Bit */
-
-    { CODEC_ID_R10K,   MKTAG('R', '1', '0', 'k') }, /* UNCOMPRESSED 10BIT RGB */
-    { CODEC_ID_R10K,   MKTAG('R', '1', '0', 'g') }, /* UNCOMPRESSED 10BIT RGB */
-    { CODEC_ID_R210,   MKTAG('r', '2', '1', '0') }, /* UNCOMPRESSED 10BIT RGB */
-    { CODEC_ID_V210,   MKTAG('v', '2', '1', '0') }, /* UNCOMPRESSED 10BIT 4:2:2 */
-
-    { CODEC_ID_MJPEG,  MKTAG('j', 'p', 'e', 'g') }, /* PhotoJPEG */
-    { CODEC_ID_MJPEG,  MKTAG('m', 'j', 'p', 'a') }, /* Motion-JPEG (format A) */
-    { CODEC_ID_MJPEG,  MKTAG('A', 'V', 'D', 'J') }, /* MJPEG with alpha-channel (AVID JFIF meridien compressed) */
-/*  { CODEC_ID_MJPEG,  MKTAG('A', 'V', 'R', 'n') }, *//* MJPEG with alpha-channel (AVID ABVB/Truevision NuVista) */
-    { CODEC_ID_MJPEG,  MKTAG('d', 'm', 'b', '1') }, /* Motion JPEG OpenDML */
-    { CODEC_ID_MJPEGB, MKTAG('m', 'j', 'p', 'b') }, /* Motion-JPEG (format B) */
-
-    { CODEC_ID_SVQ1, MKTAG('S', 'V', 'Q', '1') }, /* Sorenson Video v1 */
-    { CODEC_ID_SVQ1, MKTAG('s', 'v', 'q', '1') }, /* Sorenson Video v1 */
-    { CODEC_ID_SVQ1, MKTAG('s', 'v', 'q', 'i') }, /* Sorenson Video v1 (from QT specs)*/
-    { CODEC_ID_SVQ3, MKTAG('S', 'V', 'Q', '3') }, /* Sorenson Video v3 */
-
-    { CODEC_ID_MPEG4, MKTAG('m', 'p', '4', 'v') },
-    { CODEC_ID_MPEG4, MKTAG('D', 'I', 'V', 'X') }, /* OpenDiVX *//* sample files at http://heroinewarrior.com/xmovie.php3 use this tag */
-    { CODEC_ID_MPEG4, MKTAG('X', 'V', 'I', 'D') },
-    { CODEC_ID_MPEG4, MKTAG('3', 'I', 'V', '2') }, /* experimental: 3IVX files before ivx D4 4.5.1 */
-
-    { CODEC_ID_H263, MKTAG('h', '2', '6', '3') }, /* H263 */
-    { CODEC_ID_H263, MKTAG('s', '2', '6', '3') }, /* H263 ?? works */
-
-    { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'c', 'p') }, /* DV PAL */
-    { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'c', ' ') }, /* DV NTSC */
-    { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'p', 'p') }, /* DVCPRO PAL produced by FCP */
-    { CODEC_ID_DVVIDEO, MKTAG('d', 'v', '5', 'p') }, /* DVCPRO50 PAL produced by FCP */
-    { CODEC_ID_DVVIDEO, MKTAG('d', 'v', '5', 'n') }, /* DVCPRO50 NTSC produced by FCP */
-    { CODEC_ID_DVVIDEO, MKTAG('A', 'V', 'd', 'v') }, /* AVID DV */
-    { CODEC_ID_DVVIDEO, MKTAG('A', 'V', 'd', '1') }, /* AVID DV100 */
-    { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'h', 'q') }, /* DVCPRO HD 720p50 */
-    { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'h', 'p') }, /* DVCPRO HD 720p60 */
-    { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'h', '1') },
-    { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'h', '2') },
-    { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'h', '4') },
-    { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'h', '5') }, /* DVCPRO HD 50i produced by FCP */
-    { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'h', '6') }, /* DVCPRO HD 60i produced by FCP */
-    { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'h', '3') }, /* DVCPRO HD 30p produced by FCP */
-
-    { CODEC_ID_VP3,     MKTAG('V', 'P', '3', '1') }, /* On2 VP3 */
-    { CODEC_ID_RPZA,    MKTAG('r', 'p', 'z', 'a') }, /* Apple Video (RPZA) */
-    { CODEC_ID_CINEPAK, MKTAG('c', 'v', 'i', 'd') }, /* Cinepak */
-    { CODEC_ID_8BPS,    MKTAG('8', 'B', 'P', 'S') }, /* Planar RGB (8BPS) */
-    { CODEC_ID_SMC,     MKTAG('s', 'm', 'c', ' ') }, /* Apple Graphics (SMC) */
-    { CODEC_ID_QTRLE,   MKTAG('r', 'l', 'e', ' ') }, /* Apple Animation (RLE) */
-    { CODEC_ID_MSRLE,   MKTAG('W', 'R', 'L', 'E') },
-    { CODEC_ID_QDRAW,   MKTAG('q', 'd', 'r', 'w') }, /* QuickDraw */
-
-    { CODEC_ID_RAWVIDEO, MKTAG('W', 'R', 'A', 'W') },
-
-    { CODEC_ID_H264, MKTAG('a', 'v', 'c', '1') }, /* AVC-1/H.264 */
-    { CODEC_ID_H264, MKTAG('a', 'i', '5', 'p') }, /* AVC-Intra  50M 720p24/30/60 */
-    { CODEC_ID_H264, MKTAG('a', 'i', '5', 'q') }, /* AVC-Intra  50M 720p25/50 */
-    { CODEC_ID_H264, MKTAG('a', 'i', '5', '2') }, /* AVC-Intra  50M 1080p25/50 */
-    { CODEC_ID_H264, MKTAG('a', 'i', '5', '3') }, /* AVC-Intra  50M 1080p24/30/60 */
-    { CODEC_ID_H264, MKTAG('a', 'i', '5', '5') }, /* AVC-Intra  50M 1080i50 */
-    { CODEC_ID_H264, MKTAG('a', 'i', '5', '6') }, /* AVC-Intra  50M 1080i60 */
-    { CODEC_ID_H264, MKTAG('a', 'i', '1', 'p') }, /* AVC-Intra 100M 720p24/30/60 */
-    { CODEC_ID_H264, MKTAG('a', 'i', '1', 'q') }, /* AVC-Intra 100M 720p25/50 */
-    { CODEC_ID_H264, MKTAG('a', 'i', '1', '2') }, /* AVC-Intra 100M 1080p25/50 */
-    { CODEC_ID_H264, MKTAG('a', 'i', '1', '3') }, /* AVC-Intra 100M 1080p24/30/60 */
-    { CODEC_ID_H264, MKTAG('a', 'i', '1', '5') }, /* AVC-Intra 100M 1080i50 */
-    { CODEC_ID_H264, MKTAG('a', 'i', '1', '6') }, /* AVC-Intra 100M 1080i60 */
-
-    { CODEC_ID_MPEG1VIDEO, MKTAG('m', '1', 'v', '1') }, /* Apple MPEG-1 Camcorder */
-    { CODEC_ID_MPEG1VIDEO, MKTAG('m', 'p', 'e', 'g') }, /* MPEG */
-    { CODEC_ID_MPEG1VIDEO, MKTAG('m', '1', 'v', ' ') },
-    { CODEC_ID_MPEG2VIDEO, MKTAG('m', '2', 'v', '1') }, /* Apple MPEG-2 Camcorder */
-    { CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '1') }, /* MPEG2 HDV 720p30 */
-    { CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '2') }, /* MPEG2 HDV 1080i60 */
-    { CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '3') }, /* MPEG2 HDV 1080i50 */
-    { CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '5') }, /* MPEG2 HDV 720p25 */
-    { CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '6') }, /* MPEG2 HDV 1080p24 */
-    { CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '7') }, /* MPEG2 HDV 1080p25 */
-    { CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '8') }, /* MPEG2 HDV 1080p30 */
-    { CODEC_ID_MPEG2VIDEO, MKTAG('m', 'x', '5', 'n') }, /* MPEG2 IMX NTSC 525/60 50mb/s produced by FCP */
-    { CODEC_ID_MPEG2VIDEO, MKTAG('m', 'x', '5', 'p') }, /* MPEG2 IMX PAL 625/50 50mb/s produced by FCP */
-    { CODEC_ID_MPEG2VIDEO, MKTAG('m', 'x', '4', 'n') }, /* MPEG2 IMX NTSC 525/60 40mb/s produced by FCP */
-    { CODEC_ID_MPEG2VIDEO, MKTAG('m', 'x', '4', 'p') }, /* MPEG2 IMX PAL 625/50 40mb/s produced by FCP */
-    { CODEC_ID_MPEG2VIDEO, MKTAG('m', 'x', '3', 'n') }, /* MPEG2 IMX NTSC 525/60 30mb/s produced by FCP */
-    { CODEC_ID_MPEG2VIDEO, MKTAG('m', 'x', '3', 'p') }, /* MPEG2 IMX PAL 625/50 30mb/s produced by FCP */
-    { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', '5', '4') }, /* XDCAM HD422 720p24 CBR */
-    { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', '5', '5') }, /* XDCAM HD422 720p25 CBR */
-    { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', '5', '9') }, /* XDCAM HD422 720p60 CBR */
-    { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', '5', 'a') }, /* XDCAM HD422 720p50 CBR */
-    { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', '5', 'b') }, /* XDCAM HD422 1080i60 CBR */
-    { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', '5', 'c') }, /* XDCAM HD422 1080i50 CBR */
-    { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', '5', 'd') }, /* XDCAM HD422 1080p24 CBR */
-    { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', '5', 'e') }, /* XDCAM HD422 1080p25 CBR */
-    { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', '5', 'f') }, /* XDCAM HD422 1080p30 CBR */
-    { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', '1') }, /* XDCAM EX 720p30 VBR */
-    { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', '2') }, /* XDCAM HD 1080i60 */
-    { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', '3') }, /* XDCAM HD 1080i50 VBR */
-    { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', '4') }, /* XDCAM EX 720p24 VBR */
-    { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', '5') }, /* XDCAM EX 720p25 VBR */
-    { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', '6') }, /* XDCAM HD 1080p24 VBR */
-    { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', '7') }, /* XDCAM HD 1080p25 VBR */
-    { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', '8') }, /* XDCAM HD 1080p30 VBR */
-    { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', '9') }, /* XDCAM EX 720p60 VBR */
-    { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', 'a') }, /* XDCAM EX 720p50 VBR */
-    { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', 'b') }, /* XDCAM EX 1080i60 VBR */
-    { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', 'c') }, /* XDCAM EX 1080i50 VBR */
-    { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', 'd') }, /* XDCAM EX 1080p24 VBR */
-    { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', 'e') }, /* XDCAM EX 1080p25 VBR */
-    { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', 'f') }, /* XDCAM EX 1080p30 VBR */
-    { CODEC_ID_MPEG2VIDEO, MKTAG('A', 'V', 'm', 'p') }, /* AVID IMX PAL */
-
-    { CODEC_ID_JPEG2000, MKTAG('m', 'j', 'p', '2') }, /* JPEG 2000 produced by FCP */
-
-    { CODEC_ID_TARGA, MKTAG('t', 'g', 'a', ' ') }, /* Truevision Targa */
-    { CODEC_ID_TIFF,  MKTAG('t', 'i', 'f', 'f') }, /* TIFF embedded in MOV */
-    { CODEC_ID_GIF,   MKTAG('g', 'i', 'f', ' ') }, /* embedded gif files as frames (usually one "click to play movie" frame) */
-    { CODEC_ID_PNG,   MKTAG('p', 'n', 'g', ' ') },
-
-    { CODEC_ID_VC1, MKTAG('v', 'c', '-', '1') }, /* SMPTE RP 2025 */
-    { CODEC_ID_CAVS, MKTAG('a', 'v', 's', '2') },
-
-    { CODEC_ID_DIRAC, MKTAG('d', 'r', 'a', 'c') },
-    { CODEC_ID_DNXHD, MKTAG('A', 'V', 'd', 'n') }, /* AVID DNxHD */
-//  { CODEC_ID_FLV1,  MKTAG('H', '2', '6', '3') }, /* Flash Media Server */
-    { CODEC_ID_MSMPEG4V3, MKTAG('3', 'I', 'V', 'D') }, /* 3ivx DivX Doctor */
-    { CODEC_ID_RAWVIDEO, MKTAG('A', 'V', '1', 'x') }, /* AVID 1:1x */
-    { CODEC_ID_RAWVIDEO, MKTAG('A', 'V', 'u', 'p') },
-    { CODEC_ID_SGI,   MKTAG('s', 'g', 'i', ' ') }, /* SGI  */
-    { CODEC_ID_DPX,   MKTAG('d', 'p', 'x', ' ') }, /* DPX */
-
-    { CODEC_ID_PRORES, MKTAG('a', 'p', 'c', 'h') }, /* Apple ProRes 422 High Quality */
-    { CODEC_ID_PRORES, MKTAG('a', 'p', 'c', 'n') }, /* Apple ProRes 422 Standard Definition */
-    { CODEC_ID_PRORES, MKTAG('a', 'p', 'c', 's') }, /* Apple ProRes 422 LT */
-    { CODEC_ID_PRORES, MKTAG('a', 'p', 'c', 'o') }, /* Apple ProRes 422 Proxy */
-    { CODEC_ID_PRORES, MKTAG('a', 'p', '4', 'h') }, /* Apple ProRes 4444 */
-
-    { CODEC_ID_NONE, 0 },
+  /*  { CODEC_ID_, MKTAG('I', 'V', '5', '0') }, *//* Indeo 5.0 */
+
+  { CODEC_ID_RAWVIDEO, MKTAG('r', 'a', 'w', ' ') }, /* Uncompressed RGB */
+  { CODEC_ID_RAWVIDEO, MKTAG('y', 'u', 'v', '2') }, /* Uncompressed YUV422 */
+  { CODEC_ID_RAWVIDEO, MKTAG('A', 'V', 'U', 'I') }, /* YUV with alpha-channel (AVID Uncompressed) */
+  { CODEC_ID_RAWVIDEO, MKTAG('2', 'v', 'u', 'y') }, /* UNCOMPRESSED 8BIT 4:2:2 */
+  { CODEC_ID_RAWVIDEO, MKTAG('y', 'u', 'v', 's') }, /* same as 2vuy but byte swapped */
+
+  { CODEC_ID_RAWVIDEO, MKTAG('L', '5', '5', '5') },
+  { CODEC_ID_RAWVIDEO, MKTAG('L', '5', '6', '5') },
+  { CODEC_ID_RAWVIDEO, MKTAG('B', '5', '6', '5') },
+  { CODEC_ID_RAWVIDEO, MKTAG('2', '4', 'B', 'G') },
+  { CODEC_ID_RAWVIDEO, MKTAG('B', 'G', 'R', 'A') },
+  { CODEC_ID_RAWVIDEO, MKTAG('R', 'G', 'B', 'A') },
+  { CODEC_ID_RAWVIDEO, MKTAG('A', 'B', 'G', 'R') },
+  { CODEC_ID_RAWVIDEO, MKTAG('b', '1', '6', 'g') },
+  { CODEC_ID_RAWVIDEO, MKTAG('b', '4', '8', 'r') },
+  { CODEC_ID_RAWVIDEO, MKTAG('D', 'V', 'O', 'O') }, /* Digital Voodoo SD 8 Bit */
+
+  { CODEC_ID_R10K,   MKTAG('R', '1', '0', 'k') }, /* UNCOMPRESSED 10BIT RGB */
+  { CODEC_ID_R10K,   MKTAG('R', '1', '0', 'g') }, /* UNCOMPRESSED 10BIT RGB */
+  { CODEC_ID_R210,   MKTAG('r', '2', '1', '0') }, /* UNCOMPRESSED 10BIT RGB */
+  { CODEC_ID_V210,   MKTAG('v', '2', '1', '0') }, /* UNCOMPRESSED 10BIT 4:2:2 */
+
+  { CODEC_ID_MJPEG,  MKTAG('j', 'p', 'e', 'g') }, /* PhotoJPEG */
+  { CODEC_ID_MJPEG,  MKTAG('m', 'j', 'p', 'a') }, /* Motion-JPEG (format A) */
+  { CODEC_ID_MJPEG,  MKTAG('A', 'V', 'D', 'J') }, /* MJPEG with alpha-channel (AVID JFIF meridien compressed) */
+  /*  { CODEC_ID_MJPEG,  MKTAG('A', 'V', 'R', 'n') }, *//* MJPEG with alpha-channel (AVID ABVB/Truevision NuVista) */
+  { CODEC_ID_MJPEG,  MKTAG('d', 'm', 'b', '1') }, /* Motion JPEG OpenDML */
+  { CODEC_ID_MJPEGB, MKTAG('m', 'j', 'p', 'b') }, /* Motion-JPEG (format B) */
+
+  { CODEC_ID_SVQ1, MKTAG('S', 'V', 'Q', '1') }, /* Sorenson Video v1 */
+  { CODEC_ID_SVQ1, MKTAG('s', 'v', 'q', '1') }, /* Sorenson Video v1 */
+  { CODEC_ID_SVQ1, MKTAG('s', 'v', 'q', 'i') }, /* Sorenson Video v1 (from QT specs)*/
+  { CODEC_ID_SVQ3, MKTAG('S', 'V', 'Q', '3') }, /* Sorenson Video v3 */
+
+  { CODEC_ID_MPEG4, MKTAG('m', 'p', '4', 'v') },
+  { CODEC_ID_MPEG4, MKTAG('D', 'I', 'V', 'X') }, /* OpenDiVX *//* sample files at http://heroinewarrior.com/xmovie.php3 use this tag */
+  { CODEC_ID_MPEG4, MKTAG('X', 'V', 'I', 'D') },
+  { CODEC_ID_MPEG4, MKTAG('3', 'I', 'V', '2') }, /* experimental: 3IVX files before ivx D4 4.5.1 */
+
+  { CODEC_ID_H263, MKTAG('h', '2', '6', '3') }, /* H263 */
+  { CODEC_ID_H263, MKTAG('s', '2', '6', '3') }, /* H263 ?? works */
+
+  { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'c', 'p') }, /* DV PAL */
+  { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'c', ' ') }, /* DV NTSC */
+  { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'p', 'p') }, /* DVCPRO PAL produced by FCP */
+  { CODEC_ID_DVVIDEO, MKTAG('d', 'v', '5', 'p') }, /* DVCPRO50 PAL produced by FCP */
+  { CODEC_ID_DVVIDEO, MKTAG('d', 'v', '5', 'n') }, /* DVCPRO50 NTSC produced by FCP */
+  { CODEC_ID_DVVIDEO, MKTAG('A', 'V', 'd', 'v') }, /* AVID DV */
+  { CODEC_ID_DVVIDEO, MKTAG('A', 'V', 'd', '1') }, /* AVID DV100 */
+  { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'h', 'q') }, /* DVCPRO HD 720p50 */
+  { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'h', 'p') }, /* DVCPRO HD 720p60 */
+  { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'h', '1') },
+  { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'h', '2') },
+  { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'h', '4') },
+  { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'h', '5') }, /* DVCPRO HD 50i produced by FCP */
+  { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'h', '6') }, /* DVCPRO HD 60i produced by FCP */
+  { CODEC_ID_DVVIDEO, MKTAG('d', 'v', 'h', '3') }, /* DVCPRO HD 30p produced by FCP */
+
+  { CODEC_ID_VP3,     MKTAG('V', 'P', '3', '1') }, /* On2 VP3 */
+  { CODEC_ID_RPZA,    MKTAG('r', 'p', 'z', 'a') }, /* Apple Video (RPZA) */
+  { CODEC_ID_CINEPAK, MKTAG('c', 'v', 'i', 'd') }, /* Cinepak */
+  { CODEC_ID_8BPS,    MKTAG('8', 'B', 'P', 'S') }, /* Planar RGB (8BPS) */
+  { CODEC_ID_SMC,     MKTAG('s', 'm', 'c', ' ') }, /* Apple Graphics (SMC) */
+  { CODEC_ID_QTRLE,   MKTAG('r', 'l', 'e', ' ') }, /* Apple Animation (RLE) */
+  { CODEC_ID_MSRLE,   MKTAG('W', 'R', 'L', 'E') },
+  { CODEC_ID_QDRAW,   MKTAG('q', 'd', 'r', 'w') }, /* QuickDraw */
+
+  { CODEC_ID_RAWVIDEO, MKTAG('W', 'R', 'A', 'W') },
+
+  { CODEC_ID_H264, MKTAG('a', 'v', 'c', '1') }, /* AVC-1/H.264 */
+  { CODEC_ID_H264, MKTAG('a', 'i', '5', 'p') }, /* AVC-Intra  50M 720p24/30/60 */
+  { CODEC_ID_H264, MKTAG('a', 'i', '5', 'q') }, /* AVC-Intra  50M 720p25/50 */
+  { CODEC_ID_H264, MKTAG('a', 'i', '5', '2') }, /* AVC-Intra  50M 1080p25/50 */
+  { CODEC_ID_H264, MKTAG('a', 'i', '5', '3') }, /* AVC-Intra  50M 1080p24/30/60 */
+  { CODEC_ID_H264, MKTAG('a', 'i', '5', '5') }, /* AVC-Intra  50M 1080i50 */
+  { CODEC_ID_H264, MKTAG('a', 'i', '5', '6') }, /* AVC-Intra  50M 1080i60 */
+  { CODEC_ID_H264, MKTAG('a', 'i', '1', 'p') }, /* AVC-Intra 100M 720p24/30/60 */
+  { CODEC_ID_H264, MKTAG('a', 'i', '1', 'q') }, /* AVC-Intra 100M 720p25/50 */
+  { CODEC_ID_H264, MKTAG('a', 'i', '1', '2') }, /* AVC-Intra 100M 1080p25/50 */
+  { CODEC_ID_H264, MKTAG('a', 'i', '1', '3') }, /* AVC-Intra 100M 1080p24/30/60 */
+  { CODEC_ID_H264, MKTAG('a', 'i', '1', '5') }, /* AVC-Intra 100M 1080i50 */
+  { CODEC_ID_H264, MKTAG('a', 'i', '1', '6') }, /* AVC-Intra 100M 1080i60 */
+
+  { CODEC_ID_MPEG1VIDEO, MKTAG('m', '1', 'v', '1') }, /* Apple MPEG-1 Camcorder */
+  { CODEC_ID_MPEG1VIDEO, MKTAG('m', 'p', 'e', 'g') }, /* MPEG */
+  { CODEC_ID_MPEG1VIDEO, MKTAG('m', '1', 'v', ' ') },
+  { CODEC_ID_MPEG2VIDEO, MKTAG('m', '2', 'v', '1') }, /* Apple MPEG-2 Camcorder */
+  { CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '1') }, /* MPEG2 HDV 720p30 */
+  { CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '2') }, /* MPEG2 HDV 1080i60 */
+  { CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '3') }, /* MPEG2 HDV 1080i50 */
+  { CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '5') }, /* MPEG2 HDV 720p25 */
+  { CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '6') }, /* MPEG2 HDV 1080p24 */
+  { CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '7') }, /* MPEG2 HDV 1080p25 */
+  { CODEC_ID_MPEG2VIDEO, MKTAG('h', 'd', 'v', '8') }, /* MPEG2 HDV 1080p30 */
+  { CODEC_ID_MPEG2VIDEO, MKTAG('m', 'x', '5', 'n') }, /* MPEG2 IMX NTSC 525/60 50mb/s produced by FCP */
+  { CODEC_ID_MPEG2VIDEO, MKTAG('m', 'x', '5', 'p') }, /* MPEG2 IMX PAL 625/50 50mb/s produced by FCP */
+  { CODEC_ID_MPEG2VIDEO, MKTAG('m', 'x', '4', 'n') }, /* MPEG2 IMX NTSC 525/60 40mb/s produced by FCP */
+  { CODEC_ID_MPEG2VIDEO, MKTAG('m', 'x', '4', 'p') }, /* MPEG2 IMX PAL 625/50 40mb/s produced by FCP */
+  { CODEC_ID_MPEG2VIDEO, MKTAG('m', 'x', '3', 'n') }, /* MPEG2 IMX NTSC 525/60 30mb/s produced by FCP */
+  { CODEC_ID_MPEG2VIDEO, MKTAG('m', 'x', '3', 'p') }, /* MPEG2 IMX PAL 625/50 30mb/s produced by FCP */
+  { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', '5', '4') }, /* XDCAM HD422 720p24 CBR */
+  { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', '5', '5') }, /* XDCAM HD422 720p25 CBR */
+  { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', '5', '9') }, /* XDCAM HD422 720p60 CBR */
+  { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', '5', 'a') }, /* XDCAM HD422 720p50 CBR */
+  { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', '5', 'b') }, /* XDCAM HD422 1080i60 CBR */
+  { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', '5', 'c') }, /* XDCAM HD422 1080i50 CBR */
+  { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', '5', 'd') }, /* XDCAM HD422 1080p24 CBR */
+  { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', '5', 'e') }, /* XDCAM HD422 1080p25 CBR */
+  { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', '5', 'f') }, /* XDCAM HD422 1080p30 CBR */
+  { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', '1') }, /* XDCAM EX 720p30 VBR */
+  { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', '2') }, /* XDCAM HD 1080i60 */
+  { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', '3') }, /* XDCAM HD 1080i50 VBR */
+  { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', '4') }, /* XDCAM EX 720p24 VBR */
+  { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', '5') }, /* XDCAM EX 720p25 VBR */
+  { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', '6') }, /* XDCAM HD 1080p24 VBR */
+  { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', '7') }, /* XDCAM HD 1080p25 VBR */
+  { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', '8') }, /* XDCAM HD 1080p30 VBR */
+  { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', '9') }, /* XDCAM EX 720p60 VBR */
+  { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', 'a') }, /* XDCAM EX 720p50 VBR */
+  { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', 'b') }, /* XDCAM EX 1080i60 VBR */
+  { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', 'c') }, /* XDCAM EX 1080i50 VBR */
+  { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', 'd') }, /* XDCAM EX 1080p24 VBR */
+  { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', 'e') }, /* XDCAM EX 1080p25 VBR */
+  { CODEC_ID_MPEG2VIDEO, MKTAG('x', 'd', 'v', 'f') }, /* XDCAM EX 1080p30 VBR */
+  { CODEC_ID_MPEG2VIDEO, MKTAG('A', 'V', 'm', 'p') }, /* AVID IMX PAL */
+
+  { CODEC_ID_JPEG2000, MKTAG('m', 'j', 'p', '2') }, /* JPEG 2000 produced by FCP */
+
+  { CODEC_ID_TARGA, MKTAG('t', 'g', 'a', ' ') }, /* Truevision Targa */
+  { CODEC_ID_TIFF,  MKTAG('t', 'i', 'f', 'f') }, /* TIFF embedded in MOV */
+  { CODEC_ID_GIF,   MKTAG('g', 'i', 'f', ' ') }, /* embedded gif files as frames (usually one "click to play movie" frame) */
+  { CODEC_ID_PNG,   MKTAG('p', 'n', 'g', ' ') },
+
+  { CODEC_ID_VC1, MKTAG('v', 'c', '-', '1') }, /* SMPTE RP 2025 */
+  { CODEC_ID_CAVS, MKTAG('a', 'v', 's', '2') },
+
+  { CODEC_ID_DIRAC, MKTAG('d', 'r', 'a', 'c') },
+  { CODEC_ID_DNXHD, MKTAG('A', 'V', 'd', 'n') }, /* AVID DNxHD */
+  //  { CODEC_ID_FLV1,  MKTAG('H', '2', '6', '3') }, /* Flash Media Server */
+  { CODEC_ID_MSMPEG4V3, MKTAG('3', 'I', 'V', 'D') }, /* 3ivx DivX Doctor */
+  { CODEC_ID_RAWVIDEO, MKTAG('A', 'V', '1', 'x') }, /* AVID 1:1x */
+  { CODEC_ID_RAWVIDEO, MKTAG('A', 'V', 'u', 'p') },
+  { CODEC_ID_SGI,   MKTAG('s', 'g', 'i', ' ') }, /* SGI  */
+  { CODEC_ID_DPX,   MKTAG('d', 'p', 'x', ' ') }, /* DPX */
+
+  { CODEC_ID_PRORES, MKTAG('a', 'p', 'c', 'h') }, /* Apple ProRes 422 High Quality */
+  { CODEC_ID_PRORES, MKTAG('a', 'p', 'c', 'n') }, /* Apple ProRes 422 Standard Definition */
+  { CODEC_ID_PRORES, MKTAG('a', 'p', 'c', 's') }, /* Apple ProRes 422 LT */
+  { CODEC_ID_PRORES, MKTAG('a', 'p', 'c', 'o') }, /* Apple ProRes 422 Proxy */
+  { CODEC_ID_PRORES, MKTAG('a', 'p', '4', 'h') }, /* Apple ProRes 4444 */
+
+  { CODEC_ID_NONE, 0 },
 };
 
 ///////////////////////////////////////////////

LiVES-2.2.8.tar.bz2/lives-plugins/plugins/decoders/mpegts_decoder.c -> LiVES-2.4.1.tar.bz2/lives-plugins/plugins/decoders/mpegts_decoder.c Changed

@@ -80,7 +80,7 @@
 /**
  * Read 1-25 bits.
  */
-static inline unsigned int get_bits(GetBitContext *s, int n){
+static inline unsigned int get_bits(GetBitContext *s, int n) {
   register int tmp;
   OPEN_READER(re, s);
   UPDATE_CACHE(re, s);
@@ -92,7 +92,7 @@
 
 
 
-static inline unsigned int get_bits1(GetBitContext *s){
+static inline unsigned int get_bits1(GetBitContext *s) {
 #ifdef ALT_BITSTREAM_READER
   unsigned int index = s->index;
   uint8_t result = s->buffer[index>>3];
@@ -114,7 +114,7 @@
 
 
 
-static inline void skip_bits(GetBitContext *s, int n){
+static inline void skip_bits(GetBitContext *s, int n) {
   //Note gcc seems to optimize this to s->index+=n for the ALT_READER :))
   OPEN_READER(re, s);
   UPDATE_CACHE(re, s);
@@ -133,8 +133,7 @@
  * responsible for checking for the buffer end yourself (take advantage of the padding)!
  */
 static inline void init_get_bits(GetBitContext *s,
-				 const uint8_t *buffer, int bit_size)
-{
+                                 const uint8_t *buffer, int bit_size) {
   int buffer_size = (bit_size+7)>>3;
   if (buffer_size < 0 || bit_size < 0) {
     buffer_size = bit_size = 0;
@@ -147,7 +146,7 @@
 #ifdef ALT_BITSTREAM_READER
   s->index        = 0;
 #elif defined A32_BITSTREAM_READER
-  s->buffer_ptr   = (uint32_t*)((intptr_t)buffer & ~3);
+  s->buffer_ptr   = (uint32_t *)((intptr_t)buffer & ~3);
   s->bit_count    = 32 +     8*((intptr_t)buffer &  3);
   skip_bits_long(s, 0);
 #endif
@@ -175,12 +174,12 @@
 
 static index_entry *index_walk(index_entry *idx, uint32_t pts) {
   index_entry *xidx=idx;
-  while(xidx!=NULL) {
+  while (xidx!=NULL) {
     if (xidx->next==NULL || (pts>=xidx->dts && pts<xidx->next->dts)) return xidx;
     xidx=xidx->next;
   }
   /// oops. something went wrong
-  return NULL; 
+  return NULL;
 }
 
 
@@ -339,8 +338,10 @@
 };
 
 static const AVOption options[] = {
-  {"compute_pcr", "Compute exact PCR for each transport stream packet.", offsetof(MpegTSContext, mpeg2ts_compute_pcr), AV_OPT_TYPE_INT,
-   {.dbl = 0}, 0, 1, AV_OPT_FLAG_DECODING_PARAM },
+  {
+    "compute_pcr", "Compute exact PCR for each transport stream packet.", offsetof(MpegTSContext, mpeg2ts_compute_pcr), AV_OPT_TYPE_INT,
+    {.dbl = 0}, 0, 1, AV_OPT_FLAG_DECODING_PARAM
+  },
   { NULL },
 };
 
@@ -383,18 +384,17 @@
 
 //extern AVInputFormat ff_mpegts_demuxer;
 
-static enum CodecID ff_codec_get_id(const AVCodecTag *tags, unsigned int tag)
-{
+static enum CodecID ff_codec_get_id(const AVCodecTag *tags, unsigned int tag) {
   int i;
-  for(i=0; tags[i].id != CODEC_ID_NONE;i++) {
-    if(tag == tags[i].tag)
+  for (i=0; tags[i].id != CODEC_ID_NONE; i++) {
+    if (tag == tags[i].tag)
       return tags[i].id;
   }
-  for(i=0; tags[i].id != CODEC_ID_NONE; i++) {
-    if(   toupper((tag >> 0)&0xFF) == toupper((tags[i].tag >> 0)&0xFF)
-	  && toupper((tag >> 8)&0xFF) == toupper((tags[i].tag >> 8)&0xFF)
-	  && toupper((tag >>16)&0xFF) == toupper((tags[i].tag >>16)&0xFF)
-	  && toupper((tag >>24)&0xFF) == toupper((tags[i].tag >>24)&0xFF))
+  for (i=0; tags[i].id != CODEC_ID_NONE; i++) {
+    if (toupper((tag >> 0)&0xFF) == toupper((tags[i].tag >> 0)&0xFF)
+        && toupper((tag >> 8)&0xFF) == toupper((tags[i].tag >> 8)&0xFF)
+        && toupper((tag >>16)&0xFF) == toupper((tags[i].tag >>16)&0xFF)
+        && toupper((tag >>24)&0xFF) == toupper((tags[i].tag >>24)&0xFF))
       return tags[i].id;
   }
   return CODEC_ID_NONE;
@@ -411,8 +411,7 @@
     if (lseek(priv->fd, priv->input_position, SEEK_SET)==-1) {
       return FALSE;
     }
-  }
-  else {
+  } else {
     struct stat sb;
     fstat(fd,&sb);
     if (pos>sb.st_size) priv->got_eof=TRUE;
@@ -432,8 +431,7 @@
     if (lseek(priv->fd, priv->input_position, SEEK_SET)==-1) {
       return FALSE;
     }
-  }
-  else {
+  } else {
     off_t pos=lseek(fd,0,SEEK_CUR)+offs;
     return lives_seek(cdata,fd,pos);
   }
@@ -506,8 +504,8 @@
  */
 static inline int64_t ff_parse_pes_pts(const uint8_t *buf) {
   return (int64_t)(*buf & 0x0e) << 29 |
-    (lives_rb16(buf+1) >> 1) << 15 |
-    lives_rb16(buf+3) >> 1;
+         (lives_rb16(buf+1) >> 1) << 15 |
+         lives_rb16(buf+3) >> 1;
 }
 
 
@@ -542,8 +540,8 @@
 static void clear_program(MpegTSContext *ts, unsigned int programid) {
   int i;
 
-  for(i=0; i<ts->nb_prg; i++)
-    if(ts->prg[i].id == programid)
+  for (i=0; i<ts->nb_prg; i++)
+    if (ts->prg[i].id == programid)
       ts->prg[i].nb_pids = 0;
 }
 
@@ -555,7 +553,7 @@
 static void add_pat_entry(MpegTSContext *ts, unsigned int programid) {
   struct Program *p;
   void *tmp = av_realloc(ts->prg, (ts->nb_prg+1)*sizeof(struct Program));
-  if(!tmp)
+  if (!tmp)
     return;
   ts->prg = tmp;
   p = &ts->prg[ts->nb_prg];
@@ -564,31 +562,29 @@
   ts->nb_prg++;
 }
 
-static void add_pid_to_pmt(MpegTSContext *ts, unsigned int programid, unsigned int pid)
-{
+static void add_pid_to_pmt(MpegTSContext *ts, unsigned int programid, unsigned int pid) {
   int i;
   struct Program *p = NULL;
-  for(i=0; i<ts->nb_prg; i++) {
-    if(ts->prg[i].id == programid) {
+  for (i=0; i<ts->nb_prg; i++) {
+    if (ts->prg[i].id == programid) {
       p = &ts->prg[i];
       break;
     }
   }
-  if(!p)
+  if (!p)
     return;
 
-  if(p->nb_pids >= MAX_PIDS_PER_PROGRAM)
+  if (p->nb_pids >= MAX_PIDS_PER_PROGRAM)
     return;
-  
+
   //fprintf(stderr,"adding pid %d\n",pid);
   p->pids[p->nb_pids++] = pid;
 }
 
-static void set_pcr_pid(AVFormatContext *s, unsigned int programid, unsigned int pid)
-{
+static void set_pcr_pid(AVFormatContext *s, unsigned int programid, unsigned int pid) {
   int i;
-  for(i=0; i<s->nb_programs; i++) {
-    if(s->programs[i]->id == programid) {
+  for (i=0; i<s->nb_programs; i++) {
+    if (s->programs[i]->id == programid) {
       //s->programs[i]->pcr_pid = pid;
       break;
     }
@@ -603,24 +599,23 @@
  * @return 1 if the pid is only comprised in programs that have .discard=AVDISCARD_ALL
  *         0 otherwise
  */
-static int discard_pid(MpegTSContext *ts, unsigned int pid)
-{
+static int discard_pid(MpegTSContext *ts, unsigned int pid) {
   int i, j, k;
   int used = 0, discarded = 0;
   struct Program *p;
-  for(i=0; i<ts->nb_prg; i++) {
+  for (i=0; i<ts->nb_prg; i++) {
     p = &ts->prg[i];
-    for(j=0; j<p->nb_pids; j++) {
-      if(p->pids[j] != pid)
-	continue;
+    for (j=0; j<p->nb_pids; j++) {
+      if (p->pids[j] != pid)
+        continue;
       //is program with id p->id set to be discarded?
-      for(k=0; k<ts->stream->nb_programs; k++) {
-	if(ts->stream->programs[k]->id == p->id) {
-	  if(ts->stream->programs[k]->discard == AVDISCARD_ALL)
-	    discarded++;
-	  else
-	    used++;
-	}
+      for (k=0; k<ts->stream->nb_programs; k++) {
+        if (ts->stream->programs[k]->id == p->id) {
+          if (ts->stream->programs[k]->discard == AVDISCARD_ALL)
+            discarded++;
+          else
+            used++;
+        }
       }
     }
   }
@@ -633,8 +628,7 @@
  *  function when they are complete.
  */
 static void write_section_data(lives_clip_data_t *cdata, AVFormatContext *s, MpegTSFilter *tss1,
-                               const uint8_t *buf, int buf_size, int is_start)
-{
+                               const uint8_t *buf, int buf_size, int is_start) {
   MpegTSSectionFilter *tss = &tss1->u.section_filter;
   int len;
 
@@ -666,15 +660,15 @@
   if (tss->section_h_size != -1 && tss->section_index >= tss->section_h_size) {
     tss->end_of_section_reached = 1;
     if (!tss->check_crc ||
-	av_crc(av_crc_get_table(AV_CRC_32_IEEE), -1,
-	       tss->section_buf, tss->section_h_size) == 0)
+        av_crc(av_crc_get_table(AV_CRC_32_IEEE), -1,
+               tss->section_buf, tss->section_h_size) == 0)
       tss->section_cb(cdata, tss1, tss->section_buf, tss->section_h_size);
   }
 }
 
 static MpegTSFilter *mpegts_open_section_filter(MpegTSContext *ts, unsigned int pid,
-						SectionCallback *section_cb, void *opaque,
-						int check_crc)
+    SectionCallback *section_cb, void *opaque,
+    int check_crc)
 
 {
   MpegTSFilter *filter;
@@ -705,9 +699,8 @@
 }
 
 static MpegTSFilter *mpegts_open_pes_filter(MpegTSContext *ts, unsigned int pid,
-					    PESCallback *pes_cb,
-					    void *opaque)
-{
+    PESCallback *pes_cb,
+    void *opaque) {
   MpegTSFilter *filter;
   MpegTSPESFilter *pes;
 
@@ -728,8 +721,7 @@
   return filter;
 }
 
-static void mpegts_close_filter(MpegTSContext *ts, MpegTSFilter *filter)
-{
+static void mpegts_close_filter(MpegTSContext *ts, MpegTSFilter *filter) {
   int pid;
 
   pid = filter->pid;
@@ -749,7 +741,7 @@
   ts->pids[pid] = NULL;
 }
 
-static int analyze(const uint8_t *buf, int size, int packet_size, int *index){
+static int analyze(const uint8_t *buf, int size, int packet_size, int *index) {
   int stat[TS_MAX_PACKET_SIZE];
   int i;
   int x=0;
@@ -757,12 +749,12 @@
 
   memset(stat, 0, packet_size*sizeof(int));
 
-  for(x=i=0; i<size-3; i++) {
-    if(buf[i] == 0x47 && !(buf[i+1] & 0x80) && buf[i+3] != 0x47) {
+  for (x=i=0; i<size-3; i++) {
+    if (buf[i] == 0x47 && !(buf[i+1] & 0x80) && buf[i+3] != 0x47) {
       stat[x]++;
-      if(stat[x] > best_score) {
-	best_score= stat[x];
-	if(index) *index= x;
+      if (stat[x] > best_score) {
+        best_score= stat[x];
+        if (index) *index= x;
       }
     }
 
@@ -774,8 +766,7 @@
 }
 
 /* autodetect fec presence. Must have at least 1024 bytes  */
-static int get_packet_size(const uint8_t *buf, int size)
-{
+static int get_packet_size(const uint8_t *buf, int size) {
   int score, fec_score, dvhs_score;
 
   if (size < (TS_FEC_PACKET_SIZE * 5 + 1))
@@ -786,9 +777,9 @@
   fec_score= analyze(buf, size, TS_FEC_PACKET_SIZE, NULL);
   //    av_log(NULL, AV_LOG_DEBUG, "score: %d, dvhs_score: %d, fec_score: %d \n", score, dvhs_score, fec_score);
 
-  if     (score > fec_score && score > dvhs_score) return TS_PACKET_SIZE;
-  else if(dvhs_score > score && dvhs_score > fec_score) return TS_DVHS_PACKET_SIZE;
-  else if(score < fec_score && dvhs_score < fec_score) return TS_FEC_PACKET_SIZE;
+  if (score > fec_score && score > dvhs_score) return TS_PACKET_SIZE;
+  else if (dvhs_score > score && dvhs_score > fec_score) return TS_DVHS_PACKET_SIZE;
+  else if (score < fec_score && dvhs_score < fec_score) return TS_FEC_PACKET_SIZE;
   else                       return -1;
 }
 
@@ -800,8 +791,7 @@
   uint8_t last_sec_num;
 } SectionHeader;
 
-static inline int get8(const uint8_t **pp, const uint8_t *p_end)
-{
+static inline int get8(const uint8_t **pp, const uint8_t *p_end) {
   const uint8_t *p;
   int c;
 
@@ -813,8 +803,7 @@
   return c;
 }
 
-static inline int get16(const uint8_t **pp, const uint8_t *p_end)
-{
+static inline int get16(const uint8_t **pp, const uint8_t *p_end) {
   const uint8_t *p;
   int c;
 
@@ -828,8 +817,7 @@
 }
 
 /* read and allocate a DVB string preceded by its length */
-static char *getstr8(const uint8_t **pp, const uint8_t *p_end)
-{
+static char *getstr8(const uint8_t **pp, const uint8_t *p_end) {
   int len;
   const uint8_t *p;
   char *str;
@@ -851,8 +839,7 @@
 }
 
 static int parse_section_header(SectionHeader *h,
-                                const uint8_t **pp, const uint8_t *p_end)
-{
+                                const uint8_t **pp, const uint8_t *p_end) {
   int val;
 
   val = get8(pp, p_end);
@@ -944,8 +931,7 @@
 };
 
 static void mpegts_find_stream_type(AVStream *st,
-                                    uint32_t stream_type, const StreamType *types)
-{
+                                    uint32_t stream_type, const StreamType *types) {
   for (; types->stream_type; types++) {
     if (stream_type == types->stream_type) {
       st->codec->codec_type = types->codec_type;
@@ -967,13 +953,13 @@
   st->need_parsing = AVSTREAM_PARSE_FULL;
   pes->st = st;
   pes->stream_type = stream_type;
-  
+
   /*  fprintf(stderr,
       "stream=%d stream_type=%x pid=%x prog_reg_desc=%.4s\n",
       st->index, pes->stream_type, pes->pid, (char*)&prog_reg_desc);*/
-  
+
   st->codec->codec_tag = pes->stream_type;
-  
+
   if (st->codec->codec_tag==STREAM_TYPE_VIDEO_MPEG1||
       st->codec->codec_tag==STREAM_TYPE_VIDEO_MPEG2||
       st->codec->codec_tag==STREAM_TYPE_VIDEO_MPEG4||
@@ -990,10 +976,10 @@
   else if (st->codec->codec_tag==STREAM_TYPE_AUDIO_AAC_LATM) sprintf(cdata->audio_name,"%s","aac_latm");
   else if (st->codec->codec_tag==STREAM_TYPE_AUDIO_AC3) sprintf(cdata->audio_name,"%s","ac3");
   else if (st->codec->codec_tag==STREAM_TYPE_AUDIO_DTS) sprintf(cdata->audio_name,"%s","dts");
- 
+
   mpegts_find_stream_type(st, pes->stream_type, ISO_types);
-  
-  
+
+
   if ((prog_reg_desc == lives_rl32("HDMV") ||
        prog_reg_desc == lives_rl32("HDPR")) &&
       st->codec->codec_id == CODEC_ID_NONE) {
@@ -1005,14 +991,14 @@
       // priv_data cannot be shared between streams
       PESContext *sub_pes = av_malloc(sizeof(*sub_pes));
       if (!sub_pes)
-	return AVERROR(ENOMEM);
+        return AVERROR(ENOMEM);
       memcpy(sub_pes, pes, sizeof(*sub_pes));
 
       sub_st = av_new_stream(pes->stream, pes->pid);
 
       if (!sub_st) {
-	av_free(sub_pes);
-	return AVERROR(ENOMEM);
+        av_free(sub_pes);
+        return AVERROR(ENOMEM);
       }
 
       sub_st->id = pes->pid;
@@ -1026,7 +1012,7 @@
   }
   if (st->codec->codec_id == CODEC_ID_NONE)
     mpegts_find_stream_type(st, pes->stream_type, MISC_types);
-  if (st->codec->codec_id == CODEC_ID_NONE){
+  if (st->codec->codec_id == CODEC_ID_NONE) {
     st->codec->codec_id  = old_codec_id;
     st->codec->codec_type= old_codec_type;
   }
@@ -1034,16 +1020,15 @@
   return 0;
 }
 
-static void new_pes_packet(PESContext *pes, AVPacket *pkt)
-{
+static void new_pes_packet(PESContext *pes, AVPacket *pkt) {
   av_init_packet(pkt);
 
   pkt->destruct = av_destruct_packet;
   pkt->data = pes->buffer;
   pkt->size = pes->data_index;
 
-  if(pes->total_size != MAX_PES_PAYLOAD &&
-     pes->pes_header_size + pes->data_index != pes->total_size + 6) {
+  if (pes->total_size != MAX_PES_PAYLOAD &&
+      pes->pes_header_size + pes->data_index != pes->total_size + 6) {
     fprintf(stderr, "mpegts_decoder: PES packet size mismatch\n");
     //pes->flags |= AV_PKT_FLAG_CORRUPT;
   }
@@ -1068,8 +1053,7 @@
   pes->flags = 0;
 }
 
-static uint64_t get_bits64(GetBitContext *gb, int bits)
-{
+static uint64_t get_bits64(GetBitContext *gb, int bits) {
   uint64_t ret = 0;
   while (bits > 17) {
     ret <<= 17;
@@ -1081,8 +1065,7 @@
   return ret;
 }
 
-static int read_sl_header(PESContext *pes, SLConfigDescr *sl, const uint8_t *buf, int buf_size)
-{
+static int read_sl_header(PESContext *pes, SLConfigDescr *sl, const uint8_t *buf, int buf_size) {
   GetBitContext gb;
   int au_start_flag = 0, au_end_flag = 0, ocr_flag = 0, idle_flag = 0;
   int padding_flag = 0, padding_bits = 0, inst_bitrate_flag = 0;
@@ -1110,17 +1093,17 @@
       skip_bits_long(&gb, sl->packet_seq_num_len);
     if (sl->degr_prior_len)
       if (get_bits1(&gb))
-	skip_bits(&gb, sl->degr_prior_len);
+        skip_bits(&gb, sl->degr_prior_len);
     if (ocr_flag)
       skip_bits_long(&gb, sl->ocr_len);
     if (au_start_flag) {
       if (sl->use_rand_acc_pt)
-	get_bits1(&gb);
+        get_bits1(&gb);
       if (sl->au_seq_num_len > 0)
-	skip_bits_long(&gb, sl->au_seq_num_len);
+        skip_bits_long(&gb, sl->au_seq_num_len);
       if (sl->use_timestamps) {
-	dts_flag = get_bits1(&gb);
-	cts_flag = get_bits1(&gb);
+        dts_flag = get_bits1(&gb);
+        cts_flag = get_bits1(&gb);
       }
     }
     if (sl->inst_bitrate_len)
@@ -1154,7 +1137,7 @@
   const uint8_t *p;
   int len, code;
 
-  if(!ts->pkt)
+  if (!ts->pkt)
     return 0;
 
   if (is_start) {
@@ -1168,64 +1151,64 @@
   }
   p = buf;
   while (buf_size > 0) {
-    switch(pes->state) {
+    switch (pes->state) {
     case MPEGTS_HEADER:
       len = PES_START_SIZE - pes->data_index;
       if (len > buf_size)
-	len = buf_size;
+        len = buf_size;
       memcpy(pes->header + pes->data_index, p, len);
       pes->data_index += len;
       p += len;
       buf_size -= len;
       if (pes->data_index == PES_START_SIZE) {
-	/* we got all the PES or section header. We can now
-	   decide */
-	if (pes->header[0] == 0x00 && pes->header[1] == 0x00 &&
-	    pes->header[2] == 0x01) {
-	  /* it must be an mpeg2 PES stream */
-	  code = pes->header[3] | 0x100;
-	  //av_dlog(pes->stream, "pid=%x pes_code=%#x\n", pes->pid, code);
-
-	  if ((pes->st && pes->st->discard == AVDISCARD_ALL) ||
-	      code == 0x1be) /* padding_stream */
-	    goto skip;
-
-	  /* stream not present in PMT */
-	  if (!pes->st) {
-	    pes->st = av_new_stream(ts->stream, pes->pid);
-	    if (!pes->st)
-	      return AVERROR(ENOMEM);
-	    pes->st->id = pes->pid;
-	    mpegts_set_stream_info(cdata, pes->st, pes, 0, 0);
-	  }
-
-	  pes->total_size = lives_rb16(pes->header + 4);
-	  /* NOTE: a zero total size means the PES size is
-	     unbounded */
-	  if (!pes->total_size)
-	    pes->total_size = MAX_PES_PAYLOAD;
-
-	  /* allocate pes buffer */
-	  pes->buffer = av_malloc(pes->total_size+FF_INPUT_BUFFER_PADDING_SIZE);
-	  if (!pes->buffer)
-	    return AVERROR(ENOMEM);
-
-	  if (code != 0x1bc && code != 0x1bf && /* program_stream_map, private_stream_2 */
-	      code != 0x1f0 && code != 0x1f1 && /* ECM, EMM */
-	      code != 0x1ff && code != 0x1f2 && /* program_stream_directory, DSMCC_stream */
-	      code != 0x1f8) {                  /* ITU-T Rec. H.222.1 type E stream */
-	    pes->state = MPEGTS_PESHEADER;
-	  } else {
-	    pes->state = MPEGTS_PAYLOAD;
-	    pes->data_index = 0;
-	  }
-	} else {
-	  /* otherwise, it should be a table */
-	  /* skip packet */
-	skip:
-	  pes->state = MPEGTS_SKIP;
-	  continue;
-	}
+        /* we got all the PES or section header. We can now
+           decide */
+        if (pes->header[0] == 0x00 && pes->header[1] == 0x00 &&
+            pes->header[2] == 0x01) {
+          /* it must be an mpeg2 PES stream */
+          code = pes->header[3] | 0x100;
+          //av_dlog(pes->stream, "pid=%x pes_code=%#x\n", pes->pid, code);
+
+          if ((pes->st && pes->st->discard == AVDISCARD_ALL) ||
+              code == 0x1be) /* padding_stream */
+            goto skip;
+
+          /* stream not present in PMT */
+          if (!pes->st) {
+            pes->st = av_new_stream(ts->stream, pes->pid);
+            if (!pes->st)
+              return AVERROR(ENOMEM);
+            pes->st->id = pes->pid;
+            mpegts_set_stream_info(cdata, pes->st, pes, 0, 0);
+          }
+
+          pes->total_size = lives_rb16(pes->header + 4);
+          /* NOTE: a zero total size means the PES size is
+             unbounded */
+          if (!pes->total_size)
+            pes->total_size = MAX_PES_PAYLOAD;
+
+          /* allocate pes buffer */
+          pes->buffer = av_malloc(pes->total_size+FF_INPUT_BUFFER_PADDING_SIZE);
+          if (!pes->buffer)
+            return AVERROR(ENOMEM);
+
+          if (code != 0x1bc && code != 0x1bf && /* program_stream_map, private_stream_2 */
+              code != 0x1f0 && code != 0x1f1 && /* ECM, EMM */
+              code != 0x1ff && code != 0x1f2 && /* program_stream_directory, DSMCC_stream */
+              code != 0x1f8) {                  /* ITU-T Rec. H.222.1 type E stream */
+            pes->state = MPEGTS_PESHEADER;
+          } else {
+            pes->state = MPEGTS_PAYLOAD;
+            pes->data_index = 0;
+          }
+        } else {
+          /* otherwise, it should be a table */
+          /* skip packet */
+skip:
+          pes->state = MPEGTS_SKIP;
+          continue;
+        }
       }
       break;
       /**********************************************/
@@ -1233,87 +1216,87 @@
     case MPEGTS_PESHEADER:
       len = PES_HEADER_SIZE - pes->data_index;
       if (len < 0)
-	return -1;
+        return -1;
       if (len > buf_size)
-	len = buf_size;
+        len = buf_size;
       memcpy(pes->header + pes->data_index, p, len);
       pes->data_index += len;
       p += len;
       buf_size -= len;
       if (pes->data_index == PES_HEADER_SIZE) {
-	pes->pes_header_size = pes->header[8] + 9;
-	pes->state = MPEGTS_PESHEADER_FILL;
+        pes->pes_header_size = pes->header[8] + 9;
+        pes->state = MPEGTS_PESHEADER_FILL;
       }
       break;
     case MPEGTS_PESHEADER_FILL:
       len = pes->pes_header_size - pes->data_index;
       if (len < 0)
-	return -1;
+        return -1;
       if (len > buf_size)
-	len = buf_size;
+        len = buf_size;
       memcpy(pes->header + pes->data_index, p, len);
       pes->data_index += len;
       p += len;
       buf_size -= len;
       if (pes->data_index == pes->pes_header_size) {
-	const uint8_t *r;
-	unsigned int flags, pes_ext, skip;
+        const uint8_t *r;
+        unsigned int flags, pes_ext, skip;
 
-	flags = pes->header[7];
-	r = pes->header + 9;
-	pes->pts = AV_NOPTS_VALUE;
-	pes->dts = AV_NOPTS_VALUE;
-	if ((flags & 0xc0) == 0x80) {
-	  pes->dts = pes->pts = ff_parse_pes_pts(r);
-	  r += 5;
-	} else if ((flags & 0xc0) == 0xc0) {
-	  pes->pts = ff_parse_pes_pts(r);
-	  r += 5;
-	  pes->dts = ff_parse_pes_pts(r);
-	  r += 5;
-	}
-	pes->extended_stream_id = -1;
-	if (flags & 0x01) { /* PES extension */
-	  pes_ext = *r++;
-	  /* Skip PES private data, program packet sequence counter and P-STD buffer */
-	  skip = (pes_ext >> 4) & 0xb;
-	  skip += skip & 0x9;
-	  r += skip;
-	  if ((pes_ext & 0x41) == 0x01 &&
-	      (r + 2) <= (pes->header + pes->pes_header_size)) {
-	    /* PES extension 2 */
-	    if ((r[0] & 0x7f) > 0 && (r[1] & 0x80) == 0)
-	      pes->extended_stream_id = r[1];
-	  }
-	}
-
-	/* we got the full header. We parse it and get the payload */
-	pes->state = MPEGTS_PAYLOAD;
-	pes->data_index = 0;
-	if (pes->stream_type == 0x12) {
-	  int sl_header_bytes = read_sl_header(pes, &pes->sl, p, buf_size);
-	  pes->pes_header_size += sl_header_bytes;
-	  p += sl_header_bytes;
-	  buf_size -= sl_header_bytes;
-	}
+        flags = pes->header[7];
+        r = pes->header + 9;
+        pes->pts = AV_NOPTS_VALUE;
+        pes->dts = AV_NOPTS_VALUE;
+        if ((flags & 0xc0) == 0x80) {
+          pes->dts = pes->pts = ff_parse_pes_pts(r);
+          r += 5;
+        } else if ((flags & 0xc0) == 0xc0) {
+          pes->pts = ff_parse_pes_pts(r);
+          r += 5;
+          pes->dts = ff_parse_pes_pts(r);
+          r += 5;
+        }
+        pes->extended_stream_id = -1;
+        if (flags & 0x01) { /* PES extension */
+          pes_ext = *r++;
+          /* Skip PES private data, program packet sequence counter and P-STD buffer */
+          skip = (pes_ext >> 4) & 0xb;
+          skip += skip & 0x9;
+          r += skip;
+          if ((pes_ext & 0x41) == 0x01 &&
+              (r + 2) <= (pes->header + pes->pes_header_size)) {
+            /* PES extension 2 */
+            if ((r[0] & 0x7f) > 0 && (r[1] & 0x80) == 0)
+              pes->extended_stream_id = r[1];
+          }
+        }
+
+        /* we got the full header. We parse it and get the payload */
+        pes->state = MPEGTS_PAYLOAD;
+        pes->data_index = 0;
+        if (pes->stream_type == 0x12) {
+          int sl_header_bytes = read_sl_header(pes, &pes->sl, p, buf_size);
+          pes->pes_header_size += sl_header_bytes;
+          p += sl_header_bytes;
+          buf_size -= sl_header_bytes;
+        }
       }
       break;
     case MPEGTS_PAYLOAD:
       if (buf_size > 0 && pes->buffer) {
-	if (pes->data_index > 0 && pes->data_index+buf_size > pes->total_size) {
-	  new_pes_packet(pes, ts->pkt);
-	  pes->total_size = MAX_PES_PAYLOAD;
-	  pes->buffer = av_malloc(pes->total_size+FF_INPUT_BUFFER_PADDING_SIZE);
-	  if (!pes->buffer)
-	    return AVERROR(ENOMEM);
-	  ts->stop_parse = 1;
-	} else if (pes->data_index == 0 && buf_size > pes->total_size) {
-	  // pes packet size is < ts size packet and pes data is padded with 0xff
-	  // not sure if this is legal in ts but see issue #2392
-	  buf_size = pes->total_size;
-	}
-	memcpy(pes->buffer+pes->data_index, p, buf_size);
-	pes->data_index += buf_size;
+        if (pes->data_index > 0 && pes->data_index+buf_size > pes->total_size) {
+          new_pes_packet(pes, ts->pkt);
+          pes->total_size = MAX_PES_PAYLOAD;
+          pes->buffer = av_malloc(pes->total_size+FF_INPUT_BUFFER_PADDING_SIZE);
+          if (!pes->buffer)
+            return AVERROR(ENOMEM);
+          ts->stop_parse = 1;
+        } else if (pes->data_index == 0 && buf_size > pes->total_size) {
+          // pes packet size is < ts size packet and pes data is padded with 0xff
+          // not sure if this is legal in ts but see issue #2392
+          buf_size = pes->total_size;
+        }
+        memcpy(pes->buffer+pes->data_index, p, buf_size);
+        pes->data_index += buf_size;
       }
       buf_size = 0;
       /* emit complete packets with known packet size
@@ -1322,9 +1305,9 @@
        * total_size is the number of bytes following pes_packet_length
        * in the pes header, i.e. not counting the first 6 bytes */
       if (!ts->stop_parse && pes->total_size < MAX_PES_PAYLOAD &&
-	  pes->pes_header_size + pes->data_index == pes->total_size + 6) {
-	ts->stop_parse = 1;
-	new_pes_packet(pes, ts->pkt);
+          pes->pes_header_size + pes->data_index == pes->total_size + 6) {
+        ts->stop_parse = 1;
+        new_pes_packet(pes, ts->pkt);
       }
       break;
     case MPEGTS_SKIP:
@@ -1336,8 +1319,7 @@
   return 0;
 }
 
-static PESContext *add_pes_stream(MpegTSContext *ts, int pid, int pcr_pid)
-{
+static PESContext *add_pes_stream(MpegTSContext *ts, int pid, int pcr_pid) {
   MpegTSFilter *tss;
   PESContext *pes;
 
@@ -1373,9 +1355,8 @@
 
 
 static int init_MP4DescrParseContext(lives_clip_data_t *cdata,
-				     MP4DescrParseContext *d, AVFormatContext *s, const uint8_t *buf,
-				     unsigned size, Mp4Descr *descr, int max_descr_count)
-{
+                                     MP4DescrParseContext *d, AVFormatContext *s, const uint8_t *buf,
+                                     unsigned size, Mp4Descr *descr, int max_descr_count) {
   //    int ret;
   if (size > (1<<30))
     return -2;
@@ -1475,9 +1456,9 @@
       return AVERROR(ENOMEM);
     memcpy(st->codec->extradata, p, len);
     st->codec->extradata_size = len;
-    
+
     // audio
-    
+
   }
   return 0;
 }
@@ -1532,7 +1513,7 @@
     return -1;
   ff_mp4_parse_es_descr(cdata, d->fd, &es_id);
   d->active_descr = d->descr + (d->descr_count++);
-  
+
   d->active_descr->es_id = es_id;
   update_offsets(d->fd, &off, &len);
   parse_mp4_descr(cdata, d, off, len, MP4DecConfigDescrTag);
@@ -1557,8 +1538,7 @@
   return 0;
 }
 
-static int parse_MP4SLDescrTag(lives_clip_data_t *cdata, MP4DescrParseContext *d, int64_t off, int len)
-{
+static int parse_MP4SLDescrTag(lives_clip_data_t *cdata, MP4DescrParseContext *d, int64_t off, int len) {
   Mp4Descr *descr = d->active_descr;
   int predefined;
   if (!descr)
@@ -1585,8 +1565,8 @@
     descr->sl.au_seq_num_len     = (lengths >> 7) & 0x1f;
     descr->sl.packet_seq_num_len = (lengths >> 2) & 0x1f;
   } //else {
-    
-    //av_log_missing_feature(d->s, "Predefined SLConfigDescriptor\n", 0);
+
+  //av_log_missing_feature(d->s, "Predefined SLConfigDescriptor\n", 0);
   //}
   return 0;
 }
@@ -1611,12 +1591,12 @@
     fprintf(stderr, "mpegts_decoder: Maximum MP4 descriptor level exceeded\n");
     goto done;
   }
-  
+
   if (target_tag && tag != target_tag) {
     fprintf(stderr, "mpegts_decoder: Found tag %x expected %x\n", tag, target_tag);
     goto done;
   }
-  
+
   switch (tag) {
   case MP4IODescrTag:
     parse_MP4IODescrTag(cdata, d, off, len1);
@@ -1635,7 +1615,7 @@
     break;
   }
 
- done:
+done:
   d->level--;
   lives_seek(cdata, d->fd, off + len1);
   return 0;
@@ -1644,8 +1624,7 @@
 
 
 static int mp4_read_iods(lives_clip_data_t *cdata, AVFormatContext *s, const uint8_t *buf, unsigned size,
-                         Mp4Descr *descr, int *descr_count, int max_descr_count)
-{
+                         Mp4Descr *descr, int *descr_count, int max_descr_count) {
   MP4DescrParseContext d;
   if (init_MP4DescrParseContext(cdata, &d, s, buf, size, descr, max_descr_count) < 0)
     return -1;
@@ -1660,8 +1639,7 @@
 }
 
 static int mp4_read_od(lives_clip_data_t *cdata, AVFormatContext *s, const uint8_t *buf, unsigned size,
-                       Mp4Descr *descr, int *descr_count, int max_descr_count)
-{
+                       Mp4Descr *descr, int *descr_count, int max_descr_count) {
   MP4DescrParseContext d;
   if (init_MP4DescrParseContext(cdata, &d, s, buf, size, descr, max_descr_count) < 0)
     return -1;
@@ -1683,16 +1661,16 @@
   int mp4_descr_count = 0;
   int i, pid;
   AVFormatContext *s = ts->stream;
-  
+
   p_end = section + section_len - 4;
   p = section;
   if (parse_section_header(&h, &p, p_end) < 0)
     return;
   if (h.tid != M4OD_TID)
     return;
-  
+
   mp4_read_od(cdata, s, p, (unsigned)(p_end - p), mp4_descr, &mp4_descr_count, MAX_MP4_DESCR_COUNT);
-  
+
   for (pid = 0; pid < NB_PID_MAX; pid++) {
     if (!ts->pids[pid])
       continue;
@@ -1700,35 +1678,35 @@
       PESContext *pes;
       AVStream *st;
       if (ts->pids[pid]->es_id != mp4_descr[i].es_id)
-	continue;
+        continue;
       if (!(ts->pids[pid] && ts->pids[pid]->type == MPEGTS_PES)) {
-	//av_log(s, AV_LOG_ERROR, "pid %x is not PES\n", pid);
-	continue;
+        //av_log(s, AV_LOG_ERROR, "pid %x is not PES\n", pid);
+        continue;
       }
       pes = ts->pids[pid]->u.pes_filter.opaque;
       st = pes->st;
       if (!st) {
-	continue;
+        continue;
       }
-      
+
       pes->sl = mp4_descr[i].sl;
 
       ff_mp4_read_dec_config_descr(cdata, s, st, mp4_descr[i].dec_config_descr);
 
       if (st->codec->codec_id == CODEC_ID_AAC &&
-	  st->codec->extradata_size > 0)
-	st->need_parsing = 0;
+          st->codec->extradata_size > 0)
+        st->need_parsing = 0;
       if (st->codec->codec_id == CODEC_ID_H264 &&
-	  st->codec->extradata_size > 0)
-	st->need_parsing = 0;
+          st->codec->extradata_size > 0)
+        st->need_parsing = 0;
 
       if (st->codec->codec_id <= CODEC_ID_NONE) {
       } else if (st->codec->codec_id < CODEC_ID_FIRST_AUDIO) {
-	st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
+        st->codec->codec_type = AVMEDIA_TYPE_VIDEO;
       } else if (st->codec->codec_id < CODEC_ID_FIRST_SUBTITLE) {
-	st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
+        st->codec->codec_type = AVMEDIA_TYPE_AUDIO;
       } else if (st->codec->codec_id < CODEC_ID_FIRST_UNKNOWN) {
-	st->codec->codec_type = AVMEDIA_TYPE_SUBTITLE;
+        st->codec->codec_type = AVMEDIA_TYPE_SUBTITLE;
       }
     }
   }
@@ -1742,8 +1720,7 @@
 int ff_parse_mpeg2_descriptor(lives_clip_data_t *cdata, AVFormatContext *fc, AVStream *st, int stream_type,
                               const uint8_t **pp, const uint8_t *desc_list_end,
                               Mp4Descr *mp4_descr, int mp4_descr_count, int pid,
-                              MpegTSContext *ts)
-{
+                              MpegTSContext *ts) {
   const uint8_t *desc_end;
   int desc_len, desc_tag, desc_es_id;
   char language[252];
@@ -1765,33 +1742,33 @@
       stream_type == STREAM_TYPE_PRIVATE_DATA)
     mpegts_find_stream_type(st, desc_tag, DESC_types);
 
-  switch(desc_tag) {
+  switch (desc_tag) {
   case 0x1E: /* SL descriptor */
     desc_es_id = get16(pp, desc_end);
     if (ts && ts->pids[pid])
       ts->pids[pid]->es_id = desc_es_id;
     for (i = 0; i < mp4_descr_count; i++)
       if (mp4_descr[i].dec_config_descr_len &&
-	  mp4_descr[i].es_id == desc_es_id) {
- 
-	ff_mp4_read_dec_config_descr(cdata, fc, st, mp4_descr[i].dec_config_descr);
- 
-	if (st->codec->codec_id == CODEC_ID_AAC &&
-	    st->codec->extradata_size > 0)
-	  st->need_parsing = 0;
-	if (st->codec->codec_id == CODEC_ID_MPEG4SYSTEMS)
-	  mpegts_open_section_filter(ts, pid, m4sl_cb, ts, 1);
+          mp4_descr[i].es_id == desc_es_id) {
+
+        ff_mp4_read_dec_config_descr(cdata, fc, st, mp4_descr[i].dec_config_descr);
+
+        if (st->codec->codec_id == CODEC_ID_AAC &&
+            st->codec->extradata_size > 0)
+          st->need_parsing = 0;
+        if (st->codec->codec_id == CODEC_ID_MPEG4SYSTEMS)
+          mpegts_open_section_filter(ts, pid, m4sl_cb, ts, 1);
       }
     break;
   case 0x1F: /* FMC descriptor */
     get16(pp, desc_end);
     if (mp4_descr_count > 0 && (st->codec->codec_id == CODEC_ID_AAC_LATM) &&
-	mp4_descr->dec_config_descr_len && mp4_descr->es_id == pid) {
+        mp4_descr->dec_config_descr_len && mp4_descr->es_id == pid) {
       ff_mp4_read_dec_config_descr(cdata, fc, st, mp4_descr->dec_config_descr);
       if (st->codec->codec_id == CODEC_ID_AAC &&
-	  st->codec->extradata_size > 0){
-	st->need_parsing = 0;
-	st->codec->codec_type= AVMEDIA_TYPE_AUDIO;
+          st->codec->extradata_size > 0) {
+        st->need_parsing = 0;
+        st->codec->codec_type= AVMEDIA_TYPE_AUDIO;
       }
     }
     break;
@@ -1808,7 +1785,7 @@
     language[2] = get8(pp, desc_end);
     language[3] = 0;
     /* hearing impaired subtitles detection */
-    switch(get8(pp, desc_end)) {
+    switch (get8(pp, desc_end)) {
     case 0x20: /* DVB subtitles (for the hard of hearing) with no monitor aspect ratio criticality */
     case 0x21: /* DVB subtitles (for the hard of hearing) for display on 4:3 aspect ratio monitor */
     case 0x22: /* DVB subtitles (for the hard of hearing) for display on 16:9 aspect ratio monitor */
@@ -1824,8 +1801,8 @@
       //} else {
       st->codec->extradata = av_malloc(4 + FF_INPUT_BUFFER_PADDING_SIZE);
       if (st->codec->extradata) {
-	st->codec->extradata_size = 4;
-	memcpy(st->codec->extradata, *pp, 4);
+        st->codec->extradata_size = 4;
+        memcpy(st->codec->extradata, *pp, 4);
       }
     }
     *pp += 4;
@@ -1838,9 +1815,15 @@
       language[i + 2] = get8(pp, desc_end);
       language[i + 3] = ',';
       switch (get8(pp, desc_end)) {
-      case 0x01: st->disposition |= AV_DISPOSITION_CLEAN_EFFECTS; break;
-      case 0x02: st->disposition |= AV_DISPOSITION_HEARING_IMPAIRED; break;
-      case 0x03: st->disposition |= AV_DISPOSITION_VISUAL_IMPAIRED; break;
+      case 0x01:
+        st->disposition |= AV_DISPOSITION_CLEAN_EFFECTS;
+        break;
+      case 0x02:
+        st->disposition |= AV_DISPOSITION_HEARING_IMPAIRED;
+        break;
+      case 0x03:
+        st->disposition |= AV_DISPOSITION_VISUAL_IMPAIRED;
+        break;
       }
     }
     if (i) {
@@ -1853,7 +1836,7 @@
     *pp+=4;
     //av_dlog(fc, "reg_desc=%.4s\n", (char*)&st->codec->codec_tag);
     if (st->codec->codec_id == CODEC_ID_NONE &&
-	stream_type == STREAM_TYPE_PRIVATE_DATA)
+        stream_type == STREAM_TYPE_PRIVATE_DATA)
       mpegts_find_stream_type(st, st->codec->codec_tag, REGD_types);
     break;
   case 0x52: /* stream identifier descriptor */
@@ -1871,22 +1854,22 @@
   int i, j;
   AVProgram *program=NULL;
   void *tmp;
-  
+
   if (idx >= ac->nb_streams) {
     fprintf(stderr, "mpegts_decoder: stream index %d is not valid\n", idx);
     return;
   }
 
-  for(i=0; i<ac->nb_programs; i++){
-    if(ac->programs[i]->id != progid)
+  for (i=0; i<ac->nb_programs; i++) {
+    if (ac->programs[i]->id != progid)
       continue;
     program = ac->programs[i];
-    for(j=0; j<program->nb_stream_indexes; j++)
-      if(program->stream_index[j] == idx)
-	return;
-    
+    for (j=0; j<program->nb_stream_indexes; j++)
+      if (program->stream_index[j] == idx)
+        return;
+
     tmp = av_realloc(program->stream_index, sizeof(unsigned int)*(program->nb_stream_indexes+1));
-    if(!tmp)
+    if (!tmp)
       return;
     program->stream_index = tmp;
     program->stream_index[program->nb_stream_indexes++] = idx;
@@ -1913,45 +1896,45 @@
   int program_info_length, pcr_pid, pid, stream_type;
   int desc_list_len;
   uint32_t prog_reg_desc = 0; /* registration descriptor */
-  
+
   Mp4Descr mp4_descr[MAX_MP4_DESCR_COUNT] = {{ 0 }};
   int mp4_descr_count = 0;
   int i;
 
   //fprintf(stderr, "PMT: len %i\n", section_len);
   //hex_dump_debug(ts->stream, (uint8_t *)section, section_len);
-  
+
   p_end = section + section_len - 4;
   p = section;
   if (parse_section_header(h, &p, p_end) < 0)
     return;
-  
+
   // av_dlog(ts->stream, "sid=0x%x sec_num=%d/%d\n",
   //	  h->id, h->sec_num, h->last_sec_num);
-  
+
   if (h->tid != PMT_TID)
     return;
-  
+
   clear_program(ts, h->id);
   pcr_pid = get16(&p, p_end) & 0x1fff;
   if (pcr_pid < 0)
     return;
   add_pid_to_pmt(ts, h->id, pcr_pid);
   set_pcr_pid(ts->stream, h->id, pcr_pid);
-  
+
   // av_dlog(ts->stream, "pcr_pid=0x%x\n", pcr_pid);
-  
+
   program_info_length = get16(&p, p_end) & 0xfff;
   if (program_info_length < 0)
     return;
-  while(program_info_length >= 2) {
+  while (program_info_length >= 2) {
     uint8_t tag, len;
     tag = get8(&p, p_end);
     len = get8(&p, p_end);
-    
+
     //av_dlog(ts->stream, "program tag: 0x%02x len=%d\n", tag, len);
-    
-    if(len > program_info_length - 2)
+
+    if (len > program_info_length - 2)
       //something else is broken, exit the program_descriptors_loop
       break;
     program_info_length -= len + 2;
@@ -1960,7 +1943,7 @@
       get8(&p, p_end); // label
       len -= 2;
       mp4_read_iods(cdata, ts->stream, p, len, mp4_descr + mp4_descr_count,
-		    &mp4_descr_count, MAX_MP4_DESCR_COUNT);
+                    &mp4_descr_count, MAX_MP4_DESCR_COUNT);
     } else if (tag == 0x05 && len >= 4) { // registration descriptor
       prog_reg_desc = lives_rl32((const char *)p);
       p+=4;
@@ -1971,12 +1954,12 @@
   p += program_info_length;
   if (p >= p_end)
     goto out;
-  
+
   // stop parsing after pmt, we found header
   if (!ts->stream->nb_streams)
     ts->stop_parse = 2;
-  
-  for(;;) {
+
+  for (;;) {
     st = 0;
     pes = NULL;
     stream_type = get8(&p, p_end);
@@ -1990,25 +1973,25 @@
     if (ts->pids[pid] && ts->pids[pid]->type == MPEGTS_PES) {
       pes = ts->pids[pid]->u.pes_filter.opaque;
       if (!pes->st) {
-	pes->st = av_new_stream(pes->stream, pes->pid);
-	pes->st->id = pes->pid;
+        pes->st = av_new_stream(pes->stream, pes->pid);
+        pes->st->id = pes->pid;
       }
       st = pes->st;
     } else if (stream_type != 0x13) {
       if (ts->pids[pid]) mpegts_close_filter(ts, ts->pids[pid]); //wrongly added sdt filter probably
       pes = add_pes_stream(ts, pid, pcr_pid);
       if (pes) {
-	st = av_new_stream(pes->stream, pes->pid);
-	st->id = pes->pid;
+        st = av_new_stream(pes->stream, pes->pid);
+        st->id = pes->pid;
       }
     } else {
       int idx = ff_find_stream_index(ts->stream, pid);
       if (idx >= 0) {
-	st = ts->stream->streams[idx];
+        st = ts->stream->streams[idx];
       } else {
-	st = av_new_stream(pes->stream, pid);
-	st->id = pid;
-	st->codec->codec_type = AVMEDIA_TYPE_DATA;
+        st = av_new_stream(pes->stream, pid);
+        st->id = pid;
+        st->codec->codec_type = AVMEDIA_TYPE_DATA;
       }
     }
 
@@ -2028,26 +2011,25 @@
     desc_list_end = p + desc_list_len;
     if (desc_list_end > p_end)
       break;
-    for(;;) {
+    for (;;) {
       if (ff_parse_mpeg2_descriptor(cdata, ts->stream, st, stream_type, &p, desc_list_end,
-				    mp4_descr, mp4_descr_count, pid, ts) < 0)
-	break;
+                                    mp4_descr, mp4_descr_count, pid, ts) < 0)
+        break;
 
       if (pes && prog_reg_desc == lives_rl32("HDMV") && stream_type == 0x83 && pes->sub_st) {
-	ff_program_add_stream_index(ts->stream, h->id, pes->sub_st->index);
-	pes->sub_st->codec->codec_tag = st->codec->codec_tag;
+        ff_program_add_stream_index(ts->stream, h->id, pes->sub_st->index);
+        pes->sub_st->codec->codec_tag = st->codec->codec_tag;
       }
     }
     p = desc_list_end;
   }
 
- out:
+out:
   for (i = 0; i < mp4_descr_count; i++)
     av_free(mp4_descr[i].dec_config_descr);
 }
 
-static void pat_cb(lives_clip_data_t *cdata, MpegTSFilter *filter, const uint8_t *section, int section_len)
-{
+static void pat_cb(lives_clip_data_t *cdata, MpegTSFilter *filter, const uint8_t *section, int section_len) {
   MpegTSContext *ts = filter->u.section_filter.opaque;
   SectionHeader h1, *h = &h1;
   const uint8_t *p, *p_end;
@@ -2067,7 +2049,7 @@
   //  ts->stream->ts_id = h->id;
 
   clear_programs(ts);
-  for(;;) {
+  for (;;) {
     sid = get16(&p, p_end);
     if (sid < 0)
       break;
@@ -2084,7 +2066,7 @@
       //      program->program_num = sid;
       //program->pmt_pid = pmt_pid;
       if (ts->pids[pmt_pid])
-	mpegts_close_filter(ts, ts->pids[pmt_pid]);
+        mpegts_close_filter(ts, ts->pids[pmt_pid]);
       mpegts_open_section_filter(ts, pmt_pid, pmt_cb, ts, 1);
       add_pat_entry(ts, sid);
       add_pid_to_pmt(ts, sid, 0); //add pat pid to program
@@ -2093,8 +2075,7 @@
   }
 }
 
-static void sdt_cb(lives_clip_data_t *cdata, MpegTSFilter *filter, const uint8_t *section, int section_len)
-{
+static void sdt_cb(lives_clip_data_t *cdata, MpegTSFilter *filter, const uint8_t *section, int section_len) {
   MpegTSContext *ts = filter->u.section_filter.opaque;
   SectionHeader h1, *h = &h1;
   const uint8_t *p, *p_end, *desc_list_end, *desc_end;
@@ -2116,7 +2097,7 @@
   val = get8(&p, p_end);
   if (val < 0)
     return;
-  for(;;) {
+  for (;;) {
     sid = get16(&p, p_end);
     if (sid < 0)
       break;
@@ -2129,39 +2110,39 @@
     desc_list_end = p + desc_list_len;
     if (desc_list_end > p_end)
       break;
-    for(;;) {
+    for (;;) {
       desc_tag = get8(&p, desc_list_end);
       if (desc_tag < 0)
-	break;
+        break;
       desc_len = get8(&p, desc_list_end);
       desc_end = p + desc_len;
       if (desc_end > desc_list_end)
-	break;
+        break;
 
       //av_dlog(ts->stream, "tag: 0x%02x len=%d\n",
       //      desc_tag, desc_len);
 
-      switch(desc_tag) {
+      switch (desc_tag) {
       case 0x48:
-	service_type = get8(&p, p_end);
-	if (service_type < 0)
-	  break;
-	provider_name = getstr8(&p, p_end);
-	if (!provider_name)
-	  break;
-	name = getstr8(&p, p_end);
-	if (name) {
-	  AVProgram *program = av_new_program(ts->stream, sid);
-	  if(program) {
-	    av_dict_set(&program->metadata, "service_name", name, 0);
-	    av_dict_set(&program->metadata, "service_provider", provider_name, 0);
-	  }
-	}
-	av_free(name);
-	av_free(provider_name);
-	break;
+        service_type = get8(&p, p_end);
+        if (service_type < 0)
+          break;
+        provider_name = getstr8(&p, p_end);
+        if (!provider_name)
+          break;
+        name = getstr8(&p, p_end);
+        if (name) {
+          AVProgram *program = av_new_program(ts->stream, sid);
+          if (program) {
+            av_dict_set(&program->metadata, "service_name", name, 0);
+            av_dict_set(&program->metadata, "service_provider", provider_name, 0);
+          }
+        }
+        av_free(name);
+        av_free(provider_name);
+        break;
       default:
-	break;
+        break;
       }
       p = desc_end;
     }
@@ -2184,7 +2165,7 @@
 
   MpegTSFilter *tss;
   int len, pid, cc, expected_cc, cc_ok, afc, is_start, is_discontinuity,
-    has_adaptation, has_payload;
+      has_adaptation, has_payload;
   const uint8_t *p, *p_end;
   int64_t pos;
 
@@ -2192,7 +2173,7 @@
   AVStream *st;
 
   pid = lives_rb16(packet + 1) & 0x1fff;
-  if(pid && discard_pid(ts, pid))
+  if (pid && discard_pid(ts, pid))
     return 0;
   is_start = packet[1] & 0x40;
   tss = ts->pids[pid];
@@ -2220,23 +2201,23 @@
   has_adaptation = afc & 2;
   has_payload = afc & 1;
   is_discontinuity = has_adaptation
-    && packet[4] != 0 /* with length > 0 */
-    && (packet[5] & 0x80); /* and discontinuity indicated */
-  
+                     && packet[4] != 0 /* with length > 0 */
+                     && (packet[5] & 0x80); /* and discontinuity indicated */
+
   /* continuity check (currently not used) */
   cc = (packet[3] & 0xf);
   expected_cc = has_payload ? (tss->last_cc + 1) & 0x0f : tss->last_cc;
   cc_ok = pid == 0x1FFF // null packet PID
-    || is_discontinuity
-    || tss->last_cc < 0
-    || expected_cc == cc;
-  
+          || is_discontinuity
+          || tss->last_cc < 0
+          || expected_cc == cc;
+
   tss->last_cc = cc;
   if (!cc_ok) {
     fprintf(stderr,
-	    "mpegts_decoder: Continuity check failed for pid %d expected %d got %d\n",
-	    pid, expected_cc, cc);
-    if(tss->type == MPEGTS_PES) {
+            "mpegts_decoder: Continuity check failed for pid %d expected %d got %d\n",
+            pid, expected_cc, cc);
+    if (tss->type == MPEGTS_PES) {
       //PESContext *pc = tss->u.pes_filter.opaque;
       //pc->flags |= AV_PKT_FLAG_CORRUPT;
     }
@@ -2249,14 +2230,14 @@
   p = packet + 4;
   if (has_adaptation) {
     uint8_t xflags,spc;
-    if ((xflags=p[1])&4) { 
+    if ((xflags=p[1])&4) {
       // get splice distance
       size_t sploffs=1; // skip pcr
       if (xflags & 8) sploffs+=48; // skip opcr
 
       spc=p[sploffs];
       if (spc==0) {
-	//fprintf (stderr,"XXX:  Keyframe ?");
+        //fprintf (stderr,"XXX:  Keyframe ?");
       }
 
     }
@@ -2267,7 +2248,7 @@
   p_end = packet + TS_PACKET_SIZE;
   if (p >= p_end)
     return 0;
-  
+
   pos = priv->input_position;
   ts->pos47= pos % ts->raw_packet_size;
 
@@ -2277,35 +2258,35 @@
       /* pointer field present */
       len = *p++;
       if (p + len > p_end)
-	return 0;
+        return 0;
       if (len && cc_ok) {
-	/* write remaining section bytes */
-	write_section_data(cdata, s, tss,
-			   p, len, 0);
-	/* check whether filter has been closed */
-	if (!ts->pids[pid])
-	  return 0;
+        /* write remaining section bytes */
+        write_section_data(cdata, s, tss,
+                           p, len, 0);
+        /* check whether filter has been closed */
+        if (!ts->pids[pid])
+          return 0;
       }
       p += len;
       if (p < p_end) {
-	write_section_data(cdata, s, tss,
-			   p, p_end - p, 1);
+        write_section_data(cdata, s, tss,
+                           p, p_end - p, 1);
       }
     } else {
       if (cc_ok) {
-	write_section_data(cdata, s, tss,
-			   p, p_end - p, 0);
+        write_section_data(cdata, s, tss,
+                           p, p_end - p, 0);
       }
     }
   } else {
     int ret;
     // Note: The position here points actually behind the current packet.
     if ((ret = tss->u.pes_filter.pes_cb(cdata, tss, p, p_end - p, is_start,
-					pos - ts->raw_packet_size)) < 0)
+                                        pos - ts->raw_packet_size)) < 0)
       return ret;
   }
- 
-  
+
+
   return 0;
 }
 
@@ -2316,8 +2297,8 @@
   lives_mpegts_priv_t *priv=cdata->priv;
   int pb=priv->fd;
   int c, i;
-  
-  for(i = 0;i < MAX_RESYNC_SIZE; i++) {
+
+  for (i = 0; i < MAX_RESYNC_SIZE; i++) {
     c = lives_rf8(cdata,pb);
     if (check_for_eof(cdata))
       return -1;
@@ -2340,7 +2321,7 @@
 
   int skip, len;
 
-  for(;;) {
+  for (;;) {
     len = read(pb, buf, TS_PACKET_SIZE);
     if (len != TS_PACKET_SIZE) {
       priv->input_position+=len;
@@ -2354,13 +2335,13 @@
       priv->input_position-=TS_PACKET_SIZE;
       lseek(pb, priv->input_position, SEEK_SET);
       if (mpegts_resync(cdata) < 0)
-	return -1;
+        return -1;
       else
-	continue;
+        continue;
     } else {
       skip = raw_packet_size - TS_PACKET_SIZE;
       if (skip > 0) {
-	lives_seek(cdata, pb, priv->input_position+skip);
+        lives_seek(cdata, pb, priv->input_position+skip);
       }
       break;
     }
@@ -2388,30 +2369,30 @@
     for (i = 0; i < NB_PID_MAX; i++) {
       if (ts->pids[i]) {
 
-	if (ts->pids[i]->type == MPEGTS_PES) {
+        if (ts->pids[i]->type == MPEGTS_PES) {
 
-	  PESContext *pes = ts->pids[i]->u.pes_filter.opaque;
-	  av_freep(&pes->buffer);
-	  pes->data_index = 0;
-	  pes->state = MPEGTS_SKIP; /* skip until pes header */
-	}
-	ts->pids[i]->last_cc = -1;
+          PESContext *pes = ts->pids[i]->u.pes_filter.opaque;
+          av_freep(&pes->buffer);
+          pes->data_index = 0;
+          pes->state = MPEGTS_SKIP; /* skip until pes header */
+        }
+        ts->pids[i]->last_cc = -1;
       }
     }
   }
 
   ts->stop_parse = 0;
   packet_num = 0;
-  for(;;) {
+  for (;;) {
     packet_num++;
     if ((nb_packets != 0 && packet_num >= nb_packets) ||
-	ts->stop_parse > 1) {
+        ts->stop_parse > 1) {
       ret = -1;
       break;
     }
     if (ts->stop_parse > 0)
       break;
-    
+
     ret = read_packet(cdata, packet, ts->raw_packet_size);
     if (ret != 0)
       break;
@@ -2434,13 +2415,13 @@
   int score, fec_score, dvhs_score;
   int check_count= size / TS_FEC_PACKET_SIZE;
 #define CHECK_COUNT 10
-  
+
   if (check_count < CHECK_COUNT) return FALSE;
-  
+
   score      = analyze(p, TS_PACKET_SIZE     *check_count, TS_PACKET_SIZE     , NULL)*CHECK_COUNT/check_count;
   dvhs_score = analyze(p, TS_DVHS_PACKET_SIZE*check_count, TS_DVHS_PACKET_SIZE, NULL)*CHECK_COUNT/check_count;
   fec_score  = analyze(p, TS_FEC_PACKET_SIZE *check_count, TS_FEC_PACKET_SIZE , NULL)*CHECK_COUNT/check_count;
-  
+
   if (score > fec_score && score > dvhs_score && score > 6) return TRUE;
   else if (dvhs_score > score && dvhs_score > fec_score && dvhs_score > 6) return TRUE;
   else if (fec_score > 6) return TRUE;
@@ -2454,7 +2435,7 @@
   int afc, len, flags;
   const uint8_t *p;
   unsigned int v;
-  
+
   afc = (packet[3] >> 4) & 3;
   if (afc <= 1)
     return -1;
@@ -2484,7 +2465,7 @@
   uint8_t buf[8*1024];
   int len;
   int64_t pos;
-  
+
   /* read the first 8192 bytes to get packet size */
   pos = priv->input_position;
   len = read(pb, buf, sizeof(buf));
@@ -2514,7 +2495,7 @@
      * on files where the seek should work. */
     if (lseek(pb, pos, SEEK_SET) < 0)
       fprintf(stderr, "mpegts_decoder: Unable to seek back to the start\n");
-    
+
     mpegts_open_section_filter(ts, SDT_PID, sdt_cb, ts, 1);
 
     mpegts_open_section_filter(ts, PAT_PID, pat_cb, ts, 1);
@@ -2523,7 +2504,7 @@
     /* if could not find service, enable auto_guess */
 
     ts->auto_guess = 1;
-    
+
     //av_dlog(ts->stream, "tuning done\n");
 
     s->ctx_flags |= AVFMTCTX_NOHEADER;
@@ -2533,16 +2514,16 @@
     int64_t pcrs[2], pcr_h;
     int packet_count[2];
     uint8_t packet[TS_PACKET_SIZE];
-    
+
     /* only read packets */
-    
+
     st = av_new_stream(s, 0);
     if (!st)
       goto fail;
     av_set_pts_info(st, 60, 1, 27000000);
     st->codec->codec_type = AVMEDIA_TYPE_DATA;
     st->codec->codec_id = CODEC_ID_MPEG2TS;
-    
+
     if (priv->vidst==NULL) {
       priv->vidst=st;
       //fprintf(stderr,"mpegts_decoder: got video stream\n");
@@ -2553,23 +2534,23 @@
     pcr_pid = -1;
     nb_pcrs = 0;
     nb_packets = 0;
-    for(;;) {
+    for (;;) {
       ret = read_packet(cdata, packet, ts->raw_packet_size);
       if (ret < 0)
-	return -1;
+        return -1;
       pid = lives_rb16(packet + 1) & 0x1fff;
       if ((pcr_pid == -1 || pcr_pid == pid) &&
-	  parse_pcr(&pcr_h, &pcr_l, packet) == 0) {
-	pcr_pid = pid;
-	packet_count[nb_pcrs] = nb_packets;
-	pcrs[nb_pcrs] = pcr_h * 300 + pcr_l;
-	nb_pcrs++;
-	if (nb_pcrs >= 2)
-	  break;
+          parse_pcr(&pcr_h, &pcr_l, packet) == 0) {
+        pcr_pid = pid;
+        packet_count[nb_pcrs] = nb_packets;
+        pcrs[nb_pcrs] = pcr_h * 300 + pcr_l;
+        nb_pcrs++;
+        if (nb_pcrs >= 2)
+          break;
       }
       nb_packets++;
     }
-    
+
     /* NOTE1: the bitrate is computed without the FEC */
     /* NOTE2: it is only the bitrate of the start of the stream */
     ts->pcr_incr = (pcrs[1] - pcrs[0]) / (packet_count[1] - packet_count[0]);
@@ -2580,10 +2561,10 @@
     //av_dlog(ts->stream, "start=%0.3f pcr=%0.3f incr=%d\n",
     //	    st->start_time / 1000000.0, pcrs[0] / 27e6, ts->pcr_incr);
   }
-  
+
   lseek(pb, pos, SEEK_SET);
   return 0;
- fail:
+fail:
   return -1;
 }
 
@@ -2593,24 +2574,24 @@
   AVFormatContext *s=priv->s;
   MpegTSContext *ts = s->priv_data;
   int ret, i;
-  
+
   ts->pkt = pkt;
   ret = handle_packets(cdata, 0);
   if (ret < 0) {
     /* flush pes data left */
     for (i = 0; i < NB_PID_MAX; i++) {
       if (ts->pids[i] && ts->pids[i]->type == MPEGTS_PES) {
-	PESContext *pes = ts->pids[i]->u.pes_filter.opaque;
-	if (pes->state == MPEGTS_PAYLOAD && pes->data_index > 0) {
-	  new_pes_packet(pes, pkt);
-	  pes->state = MPEGTS_SKIP;
-	  ret = 0;
-	  break;
-	}
+        PESContext *pes = ts->pids[i]->u.pes_filter.opaque;
+        if (pes->state == MPEGTS_PAYLOAD && pes->data_index > 0) {
+          new_pes_packet(pes, pkt);
+          pes->state = MPEGTS_SKIP;
+          ret = 0;
+          break;
+        }
       }
     }
   }
-  
+
   return ret;
 }
 
@@ -2625,9 +2606,9 @@
 
   clear_programs(ts);
 
-  for(i=0;i<NB_PID_MAX;i++)
+  for (i=0; i<NB_PID_MAX; i++)
     if (ts->pids[i]) mpegts_close_filter(ts, ts->pids[i]);
-  
+
   return 0;
 }
 
@@ -2671,12 +2652,12 @@
 
 
 
-static lives_clip_data_t *init_cdata (void) {
+static lives_clip_data_t *init_cdata(void) {
   lives_mpegts_priv_t *priv;
   lives_clip_data_t *cdata=(lives_clip_data_t *)malloc(sizeof(lives_clip_data_t));
 
   cdata->URI=NULL;
-  
+
   cdata->priv=priv=malloc(sizeof(lives_mpegts_priv_t));
 
   cdata->seek_flag=0;
@@ -2704,11 +2685,11 @@
   memset(cdata->author,0,1);
   memset(cdata->title,0,1);
   memset(cdata->comment,0,1);
-  
+
   return cdata;
 }
 
-static index_entry * mpegts_read_seek(const lives_clip_data_t *cdata, uint32_t timestamp) {
+static index_entry *mpegts_read_seek(const lives_clip_data_t *cdata, uint32_t timestamp) {
   // use unadj timestamp
 
   lives_mpegts_priv_t *priv=cdata->priv;
@@ -2734,7 +2715,7 @@
     priv->avpkt.size=0;
   }
 
-  avcodec_flush_buffers (priv->ctx);
+  avcodec_flush_buffers(priv->ctx);
 
   return idx;
 }
@@ -2747,9 +2728,9 @@
 
   pthread_mutex_lock(&indices_mutex);
 
-  for (i=0;i<nidxc;i++) {
+  for (i=0; i<nidxc; i++) {
     if (indices[i]->clients[0]->current_clip==cdata->current_clip&&
-	!strcmp(indices[i]->clients[0]->URI,cdata->URI)) {
+        !strcmp(indices[i]->clients[0]->URI,cdata->URI)) {
       idxc=indices[i];
       // append cdata to clients
       idxc->clients=(lives_clip_data_t **)realloc(idxc->clients,(idxc->nclients+1)*sizeof(lives_clip_data_t *));
@@ -2791,40 +2772,38 @@
   if (idxc==NULL) return;
 
   pthread_mutex_lock(&indices_mutex);
-  
+
   if (idxc->nclients==1) {
     mpegts_save_index(idxc->clients[0]);
 
     // remove this index
     index_free(idxc->idxhh);
     free(idxc->clients);
-    for (i=0;i<nidxc;i++) {
+    for (i=0; i<nidxc; i++) {
       if (indices[i]==idxc) {
-	nidxc--;
-	for (j=i;j<nidxc;j++) {
-	  indices[j]=indices[j+1];
-	}
-	free(idxc);
-	if (nidxc==0) {
-	  free(indices);
-	  indices=NULL;
-	}
-	else indices=(index_container_t **)realloc(indices,nidxc*sizeof(index_container_t *));
-	break;
+        nidxc--;
+        for (j=i; j<nidxc; j++) {
+          indices[j]=indices[j+1];
+        }
+        free(idxc);
+        if (nidxc==0) {
+          free(indices);
+          indices=NULL;
+        } else indices=(index_container_t **)realloc(indices,nidxc*sizeof(index_container_t *));
+        break;
       }
     }
-  }
-  else {
+  } else {
     // reduce client count by 1
-    for (i=0;i<idxc->nclients;i++) {
+    for (i=0; i<idxc->nclients; i++) {
       if (idxc->clients[i]==cdata) {
-	// remove this entry
-	idxc->nclients--;
-	for (j=i;j<idxc->nclients;j++) {
-	  idxc->clients[j]=idxc->clients[j+1];
-	}
-	idxc->clients=(lives_clip_data_t **)realloc(idxc->clients,idxc->nclients*sizeof(lives_clip_data_t *));
-	break;
+        // remove this entry
+        idxc->nclients--;
+        for (j=i; j<idxc->nclients; j++) {
+          idxc->clients[j]=idxc->clients[j+1];
+        }
+        idxc->clients=(lives_clip_data_t **)realloc(idxc->clients,idxc->nclients*sizeof(lives_clip_data_t *));
+        break;
       }
     }
   }
@@ -2837,7 +2816,7 @@
 static void idxc_release_all(void) {
   register int i;
 
-  for (i=0;i<nidxc;i++) {
+  for (i=0; i<nidxc; i++) {
     index_free(indices[i]->idxhh);
     free(indices[i]->clients);
     free(indices[i]);
@@ -2847,7 +2826,7 @@
 
 
 
-static void detach_stream (lives_clip_data_t *cdata) {
+static void detach_stream(lives_clip_data_t *cdata) {
   // close the file, free the decoder
   lives_mpegts_priv_t *priv=cdata->priv;
 
@@ -2901,7 +2880,7 @@
 
   priv->input_position=priv->data_start;
   lseek(priv->fd,priv->input_position,SEEK_SET);
-  avcodec_flush_buffers (priv->ctx);
+  avcodec_flush_buffers(priv->ctx);
   mpegts_read_packet(cdata,&priv->avpkt);
   priv->got_eof=FALSE;
 
@@ -2915,69 +2894,69 @@
     while (!got_picture) {
 
 #if LIBAVCODEC_VERSION_MAJOR >= 52
-      len=avcodec_decode_video2(priv->ctx, priv->picture, &got_picture, &priv->avpkt );
-#else 
-      len=avcodec_decode_video(priv->ctx, priv->picture, &got_picture, priv->avpkt.data, priv->avpkt.size );
+      len=avcodec_decode_video2(priv->ctx, priv->picture, &got_picture, &priv->avpkt);
+#else
+      len=avcodec_decode_video(priv->ctx, priv->picture, &got_picture, priv->avpkt.data, priv->avpkt.size);
 #endif
 
       if (got_picture) {
-	idxpos_data=idxpos;
-	dts=priv->avpkt.dts-priv->start_dts;
-	pthread_mutex_lock(&priv->idxc->mutex);
-	lives_add_idx(cdata,idxpos,dts);
-	pthread_mutex_unlock(&priv->idxc->mutex);
-	avcodec_flush_buffers (priv->ctx);
-	idxpos=priv->input_position;
+        idxpos_data=idxpos;
+        dts=priv->avpkt.dts-priv->start_dts;
+        pthread_mutex_lock(&priv->idxc->mutex);
+        lives_add_idx(cdata,idxpos,dts);
+        pthread_mutex_unlock(&priv->idxc->mutex);
+        avcodec_flush_buffers(priv->ctx);
+        idxpos=priv->input_position;
       }
 
       if (len<0||len==priv->avpkt.size||got_picture) {
-	if (priv->avpkt.data!=NULL) {
-	  free(priv->avpkt.data);
-	  priv->avpkt.data=NULL;
-	  priv->avpkt.size=0;
-	}
-	if (priv->input_position==priv->filesize) goto vts_next;
-	mpegts_read_packet((lives_clip_data_t *)cdata,&priv->avpkt);
-	if (priv->got_eof) goto vts_next;
+        if (priv->avpkt.data!=NULL) {
+          free(priv->avpkt.data);
+          priv->avpkt.data=NULL;
+          priv->avpkt.size=0;
+        }
+        if (priv->input_position==priv->filesize) goto vts_next;
+        mpegts_read_packet((lives_clip_data_t *)cdata,&priv->avpkt);
+        if (priv->got_eof) goto vts_next;
       }
 
     }
   }
 
- vts_next:
+vts_next:
 
   // rewind back to last pos, and decode up to end now
 
   priv->input_position=idxpos_data;
   lseek(priv->fd,priv->input_position,SEEK_SET);
   priv->got_eof=FALSE;
-  avcodec_flush_buffers (priv->ctx);
+  avcodec_flush_buffers(priv->ctx);
   mpegts_read_packet(cdata,&priv->avpkt);
 
   while (1) {
 
 #if LIBAVCODEC_VERSION_MAJOR >= 52
-    len=avcodec_decode_video2(priv->ctx, priv->picture, &got_picture, &priv->avpkt );
-#else 
-    len=avcodec_decode_video(priv->ctx, priv->picture, &got_picture, priv->avpkt.data, priv->avpkt.size );
+    len=avcodec_decode_video2(priv->ctx, priv->picture, &got_picture, &priv->avpkt);
+#else
+    len=avcodec_decode_video(priv->ctx, priv->picture, &got_picture, priv->avpkt.data, priv->avpkt.size);
 #endif
 
     if (got_picture) last_dts=priv->avpkt.dts;
 
     if (len==priv->avpkt.size) {
       if (priv->avpkt.data!=NULL) {
-	free(priv->avpkt.data);
-	priv->avpkt.data=NULL;
-	priv->avpkt.size=0;
+        free(priv->avpkt.data);
+        priv->avpkt.data=NULL;
+        priv->avpkt.size=0;
       }
       if (priv->input_position==priv->filesize) goto vts_done;
       mpegts_read_packet((lives_clip_data_t *)cdata,&priv->avpkt);
       if (priv->got_eof) goto vts_done;
     }
-    
+
   }
 
- vts_done:
+vts_done:
 
   priv->got_eof=FALSE;
   return last_dts;
@@ -3035,7 +3014,7 @@
   fstat(priv->fd,&sb);
   priv->filesize=sb.st_size;
 
-  if (read (priv->fd, header, MPEGTS_PROBE_SIZE) < MPEGTS_PROBE_SIZE) {
+  if (read(priv->fd, header, MPEGTS_PROBE_SIZE) < MPEGTS_PROBE_SIZE) {
     // for example, might be a directory
 #ifdef DEBUG
     fprintf(stderr, "mpegts_decoder: unable to read header for %s\n",cdata->URI);
@@ -3053,7 +3032,7 @@
     close(priv->fd);
     return FALSE;
   }
-  
+
   priv->input_position=0;
   lseek(priv->fd,priv->input_position,SEEK_SET);
 
@@ -3070,14 +3049,14 @@
   sprintf(cdata->audio_name,"%s","");
 
 
- seek_skip:
+seek_skip:
   priv->idxc=idxc_for(cdata);
   priv->inited=TRUE;
 
   priv->s = avformat_alloc_context();
 
-  priv->ts=malloc(sizeof( MpegTSContext));
-  memset(priv->ts,0,sizeof( MpegTSContext));
+  priv->ts=malloc(sizeof(MpegTSContext));
+  memset(priv->ts,0,sizeof(MpegTSContext));
 
   priv->ts->raw_packet_size = TS_PACKET_SIZE;
   //ts->stream = s;
@@ -3109,27 +3088,41 @@
   cdata->offs_y=0;
 
   switch (priv->vidst->codec->codec_id) {
-  case CODEC_ID_DIRAC: sprintf(cdata->video_name,"%s","dirac"); break;
-  case CODEC_ID_H264: sprintf(cdata->video_name,"%s","h264"); break;
-  case CODEC_ID_MPEG1VIDEO: sprintf(cdata->video_name,"%s","mpeg1"); break;
-  case CODEC_ID_MPEG2VIDEO: sprintf(cdata->video_name,"%s","mpeg2"); break;
-  case CODEC_ID_MPEG4: sprintf(cdata->video_name,"%s","mpeg2"); break;
-  case CODEC_ID_VC1: sprintf(cdata->video_name,"%s","vc1"); break;
-  default: sprintf(cdata->video_name,"%s","unknown"); break;
+  case CODEC_ID_DIRAC:
+    sprintf(cdata->video_name,"%s","dirac");
+    break;
+  case CODEC_ID_H264:
+    sprintf(cdata->video_name,"%s","h264");
+    break;
+  case CODEC_ID_MPEG1VIDEO:
+    sprintf(cdata->video_name,"%s","mpeg1");
+    break;
+  case CODEC_ID_MPEG2VIDEO:
+    sprintf(cdata->video_name,"%s","mpeg2");
+    break;
+  case CODEC_ID_MPEG4:
+    sprintf(cdata->video_name,"%s","mpeg2");
+    break;
+  case CODEC_ID_VC1:
+    sprintf(cdata->video_name,"%s","vc1");
+    break;
+  default:
+    sprintf(cdata->video_name,"%s","unknown");
+    break;
   }
 
   //#define DEBUG
 #ifdef DEBUG
   fprintf(stderr,"video type is %f %s %d x %d (%d x %d +%d +%d)\n",duration,cdata->video_name,
-	  cdata->width,cdata->height,cdata->frame_width,cdata->frame_height,cdata->offs_x,cdata->offs_y);
+          cdata->width,cdata->height,cdata->frame_width,cdata->frame_height,cdata->offs_x,cdata->offs_y);
 #endif
 
- skip_det:
+skip_det:
 
   codec = avcodec_find_decoder(priv->vidst->codec->codec_id);
 
   if (!codec) {
-    if (strlen(cdata->video_name)>0) 
+    if (strlen(cdata->video_name)>0)
       fprintf(stderr, "mpegts_decoder: Could not find avcodec codec for video type %s\n",cdata->video_name);
     detach_stream(cdata);
     return FALSE;
@@ -3145,7 +3138,7 @@
 
   priv->codec=codec;
 
-  if(codec->capabilities&CODEC_CAP_TRUNCATED)
+  if (codec->capabilities&CODEC_CAP_TRUNCATED)
     ctx->flags|= CODEC_FLAG_TRUNCATED;
 
   // re-scan with avcodec; priv->data_start holds video data start position
@@ -3156,7 +3149,7 @@
 
   priv->input_position=priv->data_start;
   lseek(priv->fd,priv->input_position,SEEK_SET);
-  avcodec_flush_buffers (priv->ctx);
+  avcodec_flush_buffers(priv->ctx);
 
   priv->picture = av_frame_alloc();
 
@@ -3164,18 +3157,18 @@
 
   while (!got_picture&&!priv->got_eof) {
 
-  
+
 #if LIBAVCODEC_VERSION_MAJOR >= 52
-    len=avcodec_decode_video2(ctx, priv->picture, &got_picture, &priv->avpkt );
-#else 
-    len=avcodec_decode_video(ctx, priv->picture, &got_picture, priv->avpkt.data, priv->avpkt.size );
+    len=avcodec_decode_video2(ctx, priv->picture, &got_picture, &priv->avpkt);
+#else
+    len=avcodec_decode_video(ctx, priv->picture, &got_picture, priv->avpkt.data, priv->avpkt.size);
 #endif
 
     if (len<0||len==priv->avpkt.size) {
       if (priv->avpkt.data!=NULL) {
-	free(priv->avpkt.data);
-	priv->avpkt.data=NULL;
-	priv->avpkt.size=0;
+        free(priv->avpkt.data);
+        priv->avpkt.data=NULL;
+        priv->avpkt.size=0;
       }
       mpegts_read_packet(cdata,&priv->avpkt);
     }
@@ -3211,16 +3204,16 @@
   while (!got_picture&&!priv->got_eof) {
 
 #if LIBAVCODEC_VERSION_MAJOR >= 52
-    len=avcodec_decode_video2(ctx, priv->picture, &got_picture, &priv->avpkt );
-#else 
-    len=avcodec_decode_video(ctx, priv->picture, &got_picture, priv->avpkt.data, priv->avpkt.size );
+    len=avcodec_decode_video2(ctx, priv->picture, &got_picture, &priv->avpkt);
+#else
+    len=avcodec_decode_video(ctx, priv->picture, &got_picture, priv->avpkt.data, priv->avpkt.size);
 #endif
 
     if (len==priv->avpkt.size) {
       if (priv->avpkt.data!=NULL) {
-	free(priv->avpkt.data);
-	priv->avpkt.data=NULL;
-	priv->avpkt.size=0;
+        free(priv->avpkt.data);
+        priv->avpkt.data=NULL;
+        priv->avpkt.size=0;
       }
       mpegts_read_packet(cdata,&priv->avpkt);
     }
@@ -3231,8 +3224,7 @@
     pts=priv->avpkt.pts-pts;
     dts=priv->avpkt.dts-dts;
     //fprintf(stderr,"got second picture %ld %ld\n",pts,dts);
-  }
-  else pts=dts=0;
+  } else pts=dts=0;
 
   if (priv->avpkt.data!=NULL) {
     free(priv->avpkt.data);
@@ -3252,7 +3244,7 @@
 
 
   cdata->palettes[0]=avi_pix_fmt_to_weed_palette(ctx->pix_fmt,
-						 &cdata->YUV_clamping);
+                     &cdata->YUV_clamping);
 
   if (cdata->palettes[0]==WEED_PALETTE_END) {
     fprintf(stderr, "mpegts_decoder: Could not find a usable palette for (%d) %s\n",ctx->pix_fmt,cdata->URI);
@@ -3267,7 +3259,7 @@
 
   if (cdata->width==0) cdata->width=ctx->width-cdata->offs_x*2;
   if (cdata->height==0) cdata->height=ctx->height-cdata->offs_y*2;
-  
+
   if (cdata->width*cdata->height==0) {
     fprintf(stderr, "mpegts_decoder: invalid width and height (%d X %d)\n",cdata->width,cdata->height);
     detach_stream(cdata);
@@ -3276,7 +3268,7 @@
   //#define DEBUG
 #ifdef DEBUG
   fprintf(stderr,"using palette %d, size %d x %d\n",
-	  cdata->current_palette,cdata->width,cdata->height);
+          cdata->current_palette,cdata->width,cdata->height);
 #endif
 
   cdata->par=(double)ctx->sample_aspect_ratio.num/(double)ctx->sample_aspect_ratio.den;
@@ -3295,34 +3287,8 @@
 #ifndef IS_MINGW
 
   if (cdata->fps==0.||cdata->fps==1000.) {
-    // use mplayer to get fps if we can...it seems to have some magical way
-    char cmd[1024];
-    char tmpfname[32];
-    int ofd;
-
-    sprintf(tmpfname,"/tmp/mpegtsdec=XXXXXX");
-    ofd=mkstemp(tmpfname);
-    if (ofd!=-1) {
-      int res;
-      snprintf(cmd,1024,"LANGUAGE=en LANG=en mplayer \"%s\" -identify -frames 0 2>/dev/null | grep ID_VIDEO_FPS > %s",cdata->URI,tmpfname);
-      res=system(cmd);
-      
-      if (res) {
-	snprintf(cmd,1024,"LANGUAGE=en LANG=en mplayer2 \"%s\" -identify -frames 0 2>/dev/null | grep ID_VIDEO_FPS > %s",cdata->URI,tmpfname);
-	res=system(cmd);
-      }
-
-      if (!res) {
-	char buffer[1024];
-	ssize_t bytes=read(ofd,buffer,1024);
-	memset(buffer+bytes,0,1);
-	if (!(strncmp(buffer,"ID_VIDEO_FPS=",13))) {
-	  cdata->fps=strtod (buffer+13,NULL);
-	}
-      }
-      close(ofd);
-      unlink(tmpfname);
-    }
+    int res = get_fps(cdata->URI);
+    if (res >= 0) cdata->fps = res;
   }
 
 #endif
@@ -3335,12 +3301,12 @@
 
   if (cdata->fps==0.||cdata->fps==1000.) {
     fprintf(stderr, "mpegts_decoder: invalid framerate %.4f (%d / %d)\n",
-	    cdata->fps,ctx->time_base.den,ctx->time_base.num);
+            cdata->fps,ctx->time_base.den,ctx->time_base.num);
     detach_stream(cdata);
     return FALSE;
   }
 
-  
+
   if (ctx->ticks_per_frame==2) {
     // TODO - needs checking
     cdata->fps/=2.;
@@ -3364,7 +3330,7 @@
   }
 
   ldts-=priv->start_dts;
-  
+
   cdata->nframes=dts_to_frame(cdata,ldts)+2;
 
   //fprintf(stderr,"check for %ld frames\n",cdata->nframes);
@@ -3579,7 +3545,7 @@
   unsigned char *dst=idst;
   register int i;
 
-  for (i=0;i<npixels;i++) {
+  for (i=0; i<npixels; i++) {
     switch (pal) {
     case WEED_PALETTE_RGBA32:
     case WEED_PALETTE_BGRA32:
@@ -3617,7 +3583,8 @@
       dst[0]=dst[3]=128;
       dst[1]=dst[2]=dst[4]=dst[5]=y_black;
       dst+=6;
-    default: break;
+    default:
+      break;
     }
   }
   return idst-dst;
@@ -3641,7 +3608,7 @@
 
   boolean got_picture=FALSE;
   unsigned char *dst,*src;//,flags;
-  unsigned char black[4]={0,0,0,255};
+  unsigned char black[4]= {0,0,0,255};
 
   index_entry *idx;
   register int i,p;
@@ -3661,33 +3628,32 @@
       nplanes=3;
       black[0]=y_black;
       black[1]=black[2]=128;
-    }
-    else if (pal==WEED_PALETTE_YUVA4444P) {
+    } else if (pal==WEED_PALETTE_YUVA4444P) {
       nplanes=4;
       black[0]=y_black;
       black[1]=black[2]=128;
       black[3]=255;
     }
-    
+
     if (pal==WEED_PALETTE_RGB24||pal==WEED_PALETTE_BGR24) psize=3;
-    
+
     if (pal==WEED_PALETTE_RGBA32||pal==WEED_PALETTE_BGRA32||pal==WEED_PALETTE_ARGB32||
-	pal==WEED_PALETTE_UYVY8888||pal==WEED_PALETTE_YUYV8888||pal==WEED_PALETTE_YUV888||
-	pal==WEED_PALETTE_YUVA8888) psize=4;
-    
+        pal==WEED_PALETTE_UYVY8888||pal==WEED_PALETTE_YUYV8888||pal==WEED_PALETTE_YUV888||
+        pal==WEED_PALETTE_YUVA8888) psize=4;
+
     if (pal==WEED_PALETTE_YUV411) psize=6;
-    
+
     if (pal==WEED_PALETTE_A1) dstwidth>>=3;
-    
+
     dstwidth*=psize;
-    
+
     if (cdata->frame_height > cdata->height && height == cdata->height) {
       // host ignores vertical border
       btop=0;
       xheight=cdata->height;
       bbot=xheight-1;
     }
-    
+
     if (cdata->frame_width > cdata->width && rowstrides[0] < cdata->frame_width*psize) {
       // host ignores horizontal border
       bleft=bright=0;
@@ -3710,8 +3676,7 @@
 #ifdef DEBUG_KFRAMES
       if (idx!=NULL) printf("got kframe %ld for frame %ld\n",nextframe,tframe);
 #endif
-    }
-    else {
+    } else {
       nextframe=priv->last_frame+1;
     }
 
@@ -3729,23 +3694,23 @@
       while (!got_picture) {
 
 #if LIBAVCODEC_VERSION_MAJOR >= 52
-	len=avcodec_decode_video2(priv->ctx, priv->picture, &got_picture, &priv->avpkt );
-#else 
-	len=avcodec_decode_video(priv->ctx, priv->picture, &got_picture, priv->avpkt.data, priv->avpkt.size );
-#endif
-
-	if (len==priv->avpkt.size) {
-	  if (priv->avpkt.data!=NULL) {
-	    free(priv->avpkt.data);
-	    priv->avpkt.data=NULL;
-	    priv->avpkt.size=0;
-	  }
-
-	  if (priv->input_position==priv->filesize) return FALSE;
-	  mpegts_read_packet((lives_clip_data_t *)cdata,&priv->avpkt);
-	  if (priv->got_eof) return FALSE;
-	
-	}
+        len=avcodec_decode_video2(priv->ctx, priv->picture, &got_picture, &priv->avpkt);
+#else
+        len=avcodec_decode_video(priv->ctx, priv->picture, &got_picture, priv->avpkt.data, priv->avpkt.size);
+#endif
+
+        if (len==priv->avpkt.size) {
+          if (priv->avpkt.data!=NULL) {
+            free(priv->avpkt.data);
+            priv->avpkt.data=NULL;
+            priv->avpkt.size=0;
+          }
+
+          if (priv->input_position==priv->filesize) return FALSE;
+          mpegts_read_packet((lives_clip_data_t *)cdata,&priv->avpkt);
+          if (priv->got_eof) return FALSE;
+
+        }
       }
 
       nextframe++;
@@ -3758,44 +3723,41 @@
 
   if (pixel_data==NULL||priv->picture==NULL) return TRUE;
 
-  for (p=0;p<nplanes;p++) {
+  for (p=0; p<nplanes; p++) {
     dst=pixel_data[p];
     src=priv->picture->data[p];
 
-    for (i=0;i<xheight;i++) {
+    for (i=0; i<xheight; i++) {
       if (i<btop||i>bbot) {
-	// top or bottom border, copy black row
-	if (pal==WEED_PALETTE_YUV420P||pal==WEED_PALETTE_YVU420P||pal==WEED_PALETTE_YUV422P
-	    ||pal==WEED_PALETTE_YUV444P||pal==WEED_PALETTE_YUVA4444P||pal==WEED_PALETTE_RGB24
-	    ||pal==WEED_PALETTE_BGR24) {
-	  memset(dst,black[p],dstwidth+(bleft+bright)*psize);
-	  dst+=dstwidth+(bleft+bright)*psize;
-	}
-	else dst+=write_black_pixel(dst,pal,dstwidth/psize+bleft+bright,y_black);
-	continue;
+        // top or bottom border, copy black row
+        if (pal==WEED_PALETTE_YUV420P||pal==WEED_PALETTE_YVU420P||pal==WEED_PALETTE_YUV422P
+            ||pal==WEED_PALETTE_YUV444P||pal==WEED_PALETTE_YUVA4444P||pal==WEED_PALETTE_RGB24
+            ||pal==WEED_PALETTE_BGR24) {
+          memset(dst,black[p],dstwidth+(bleft+bright)*psize);
+          dst+=dstwidth+(bleft+bright)*psize;
+        } else dst+=write_black_pixel(dst,pal,dstwidth/psize+bleft+bright,y_black);
+        continue;
       }
 
       if (bleft>0) {
-	if (pal==WEED_PALETTE_YUV420P||pal==WEED_PALETTE_YVU420P||pal==WEED_PALETTE_YUV422P||
-	    pal==WEED_PALETTE_YUV444P||pal==WEED_PALETTE_YUVA4444P||pal==WEED_PALETTE_RGB24
-	    ||pal==WEED_PALETTE_BGR24) {
-	  memset(dst,black[p],bleft*psize);
-	  dst+=bleft*psize;
-	}
-	else dst+=write_black_pixel(dst,pal,bleft,y_black);
+        if (pal==WEED_PALETTE_YUV420P||pal==WEED_PALETTE_YVU420P||pal==WEED_PALETTE_YUV422P||
+            pal==WEED_PALETTE_YUV444P||pal==WEED_PALETTE_YUVA4444P||pal==WEED_PALETTE_RGB24
+            ||pal==WEED_PALETTE_BGR24) {
+          memset(dst,black[p],bleft*psize);
+          dst+=bleft*psize;
+        } else dst+=write_black_pixel(dst,pal,bleft,y_black);
       }
 
       memcpy(dst,src,dstwidth);
       dst+=dstwidth;
 
       if (bright>0) {
-	if (pal==WEED_PALETTE_YUV420P||pal==WEED_PALETTE_YVU420P||pal==WEED_PALETTE_YUV422P
-	    ||pal==WEED_PALETTE_YUV444P||pal==WEED_PALETTE_YUVA4444P||
-	    pal==WEED_PALETTE_RGB24||pal==WEED_PALETTE_BGR24) {
-	  memset(dst,black[p],bright*psize);
-	  dst+=bright*psize;
-	}
-	else dst+=write_black_pixel(dst,pal,bright,y_black);
+        if (pal==WEED_PALETTE_YUV420P||pal==WEED_PALETTE_YVU420P||pal==WEED_PALETTE_YUV422P
+            ||pal==WEED_PALETTE_YUV444P||pal==WEED_PALETTE_YUVA4444P||
+            pal==WEED_PALETTE_RGB24||pal==WEED_PALETTE_BGR24) {
+          memset(dst,black[p],bright*psize);
+          dst+=bright*psize;
+        } else dst+=write_black_pixel(dst,pal,bright,y_black);
       }
 
       src+=priv->picture->linesize[p];
@@ -3811,7 +3773,7 @@
       bbot>>=1;
     }
   }
-  
+
   return TRUE;
 }
 
@@ -3821,12 +3783,12 @@
 
 static void reverse_bytes(uint8_t *out, const uint8_t *in, size_t count) {
   register int i;
-  for (i=0;i<count;i++) {
+  for (i=0; i<count; i++) {
     out[i]=in[count-i-1];
   }
 }
 
-#endif 
+#endif
 
 #endif
 
@@ -3883,7 +3845,7 @@
   if ((fd=open("sync_index",O_CREAT|O_TRUNC|O_WRONLY,S_IRUSR|S_IWUSR))==-1) return;
 
   if (write(fd,ver,4)<4) goto donewr;
-  
+
   if (lives_write_le(fd,&max_dts,8)<8) goto failwr;
 
 
@@ -3895,11 +3857,11 @@
     idx=idx->next;
   }
 
- donewr:
+donewr:
   close(fd);
   return;
 
- failwr:
+failwr:
   close(fd);
   unlink("sync_index");
   return;
@@ -3955,14 +3917,14 @@
     count++;
   }
 
- donerd:
-  close (fd);
+donerd:
+  close(fd);
   return max_dts;
 
- failrd:
+failrd:
   if (priv->idxc->idxhh!=NULL) idxc_release(cdata);
 
-  close (fd);
+  close(fd);
   return 0;
 
 }

LiVES-2.2.8.tar.bz2/lives-plugins/plugins/decoders/mpegts_decoder.h -> LiVES-2.4.1.tar.bz2/lives-plugins/plugins/decoders/mpegts_decoder.h Changed

@@ -59,30 +59,30 @@
 void ff_mpegts_parse_close(MpegTSContext *ts);
 
 int ff_mpegts_parse_packet(lives_clip_data_t *cdata, MpegTSContext *ts, AVPacket *pkt,
-			   const uint8_t *buf, int len);
+                           const uint8_t *buf, int len);
 
 typedef struct {
-    int use_au_start;
-    int use_au_end;
-    int use_rand_acc_pt;
-    int use_padding;
-    int use_timestamps;
-    int use_idle;
-    int timestamp_res;
-    int timestamp_len;
-    int ocr_len;
-    int au_len;
-    int inst_bitrate_len;
-    int degr_prior_len;
-    int au_seq_num_len;
-    int packet_seq_num_len;
+  int use_au_start;
+  int use_au_end;
+  int use_rand_acc_pt;
+  int use_padding;
+  int use_timestamps;
+  int use_idle;
+  int timestamp_res;
+  int timestamp_len;
+  int ocr_len;
+  int au_len;
+  int inst_bitrate_len;
+  int degr_prior_len;
+  int au_seq_num_len;
+  int packet_seq_num_len;
 } SLConfigDescr;
 
 typedef struct {
-    int es_id;
-    int dec_config_descr_len;
-    uint8_t *dec_config_descr;
-    SLConfigDescr sl;
+  int es_id;
+  int dec_config_descr_len;
+  uint8_t *dec_config_descr;
+  SLConfigDescr sl;
 } Mp4Descr;
 
 /**
@@ -128,16 +128,16 @@
 /* bit input */
 /* buffer, buffer_end and size_in_bits must be present and used by every reader */
 typedef struct GetBitContext {
-    const uint8_t *buffer, *buffer_end;
+  const uint8_t *buffer, *buffer_end;
 #ifdef ALT_BITSTREAM_READER
-    int index;
+  int index;
 #elif defined A32_BITSTREAM_READER
-    uint32_t *buffer_ptr;
-    uint32_t cache0;
-    uint32_t cache1;
-    int bit_count;
+  uint32_t *buffer_ptr;
+  uint32_t cache0;
+  uint32_t cache1;
+  int bit_count;
 #endif
-    int size_in_bits;
+  int size_in_bits;
 } GetBitContext;
 
 
@@ -189,12 +189,12 @@
 
 #   define GET_CACHE(name, gb) ((uint32_t)name##_cache)
 
-static inline int get_bits_count(const GetBitContext *s){
-    return s->index;
+static inline int get_bits_count(const GetBitContext *s) {
+  return s->index;
 }
 
-static inline void skip_bits_long(GetBitContext *s, int n){
-    s->index += n;
+static inline void skip_bits_long(GetBitContext *s, int n) {
+  s->index += n;
 }
 
 #elif defined A32_BITSTREAM_READER
@@ -281,42 +281,40 @@
 #define MP4SLDescrTag                   0x06
 
 
-#define CODEC_ID_MPEG4SYSTEMS 0x20001
-
 /* http://www.mp4ra.org */
 /* ordered by muxing preference */
 const AVCodecTag ff_mp4_obj_type[] = {
-    { CODEC_ID_MOV_TEXT  , 0x08 },
-    { CODEC_ID_MPEG4     , 0x20 },
-    { CODEC_ID_H264      , 0x21 },
-    { CODEC_ID_AAC       , 0x40 },
-    { CODEC_ID_MP4ALS    , 0x40 }, /* 14496-3 ALS */
-    { CODEC_ID_MPEG2VIDEO, 0x61 }, /* MPEG2 Main */
-    { CODEC_ID_MPEG2VIDEO, 0x60 }, /* MPEG2 Simple */
-    { CODEC_ID_MPEG2VIDEO, 0x62 }, /* MPEG2 SNR */
-    { CODEC_ID_MPEG2VIDEO, 0x63 }, /* MPEG2 Spatial */
-    { CODEC_ID_MPEG2VIDEO, 0x64 }, /* MPEG2 High */
-    { CODEC_ID_MPEG2VIDEO, 0x65 }, /* MPEG2 422 */
-    { CODEC_ID_AAC       , 0x66 }, /* MPEG2 AAC Main */
-    { CODEC_ID_AAC       , 0x67 }, /* MPEG2 AAC Low */
-    { CODEC_ID_AAC       , 0x68 }, /* MPEG2 AAC SSR */
-    { CODEC_ID_MP3       , 0x69 }, /* 13818-3 */
-    { CODEC_ID_MP2       , 0x69 }, /* 11172-3 */
-    { CODEC_ID_MPEG1VIDEO, 0x6A }, /* 11172-2 */
-    { CODEC_ID_MP3       , 0x6B }, /* 11172-3 */
-    { CODEC_ID_MJPEG     , 0x6C }, /* 10918-1 */
-    { CODEC_ID_PNG       , 0x6D },
-    { CODEC_ID_JPEG2000  , 0x6E }, /* 15444-1 */
-    { CODEC_ID_VC1       , 0xA3 },
-    { CODEC_ID_DIRAC     , 0xA4 },
-    { CODEC_ID_AC3       , 0xA5 },
-    { CODEC_ID_DTS       , 0xA9 }, /* mp4ra.org */
-    { CODEC_ID_VORBIS    , 0xDD }, /* non standard, gpac uses it */
-    { CODEC_ID_DVD_SUBTITLE, 0xE0 }, /* non standard, see unsupported-embedded-subs-2.mp4 */
-    { CODEC_ID_QCELP     , 0xE1 },
-    { CODEC_ID_MPEG4SYSTEMS, 0x01 },
-    { CODEC_ID_MPEG4SYSTEMS, 0x02 },
-    { CODEC_ID_NONE      ,    0 },
+  { CODEC_ID_MOV_TEXT  , 0x08 },
+  { CODEC_ID_MPEG4     , 0x20 },
+  { CODEC_ID_H264      , 0x21 },
+  { CODEC_ID_AAC       , 0x40 },
+  { CODEC_ID_MP4ALS    , 0x40 }, /* 14496-3 ALS */
+  { CODEC_ID_MPEG2VIDEO, 0x61 }, /* MPEG2 Main */
+  { CODEC_ID_MPEG2VIDEO, 0x60 }, /* MPEG2 Simple */
+  { CODEC_ID_MPEG2VIDEO, 0x62 }, /* MPEG2 SNR */
+  { CODEC_ID_MPEG2VIDEO, 0x63 }, /* MPEG2 Spatial */
+  { CODEC_ID_MPEG2VIDEO, 0x64 }, /* MPEG2 High */
+  { CODEC_ID_MPEG2VIDEO, 0x65 }, /* MPEG2 422 */
+  { CODEC_ID_AAC       , 0x66 }, /* MPEG2 AAC Main */
+  { CODEC_ID_AAC       , 0x67 }, /* MPEG2 AAC Low */
+  { CODEC_ID_AAC       , 0x68 }, /* MPEG2 AAC SSR */
+  { CODEC_ID_MP3       , 0x69 }, /* 13818-3 */
+  { CODEC_ID_MP2       , 0x69 }, /* 11172-3 */
+  { CODEC_ID_MPEG1VIDEO, 0x6A }, /* 11172-2 */
+  { CODEC_ID_MP3       , 0x6B }, /* 11172-3 */
+  { CODEC_ID_MJPEG     , 0x6C }, /* 10918-1 */
+  { CODEC_ID_PNG       , 0x6D },
+  { CODEC_ID_JPEG2000  , 0x6E }, /* 15444-1 */
+  { CODEC_ID_VC1       , 0xA3 },
+  { CODEC_ID_DIRAC     , 0xA4 },
+  { CODEC_ID_AC3       , 0xA5 },
+  { CODEC_ID_DTS       , 0xA9 }, /* mp4ra.org */
+  { CODEC_ID_VORBIS    , 0xDD }, /* non standard, gpac uses it */
+  { CODEC_ID_DVD_SUBTITLE, 0xE0 }, /* non standard, see unsupported-embedded-subs-2.mp4 */
+  { CODEC_ID_QCELP     , 0xE1 },
+  { CODEC_ID_MPEG4SYSTEMS, 0x01 },
+  { CODEC_ID_MPEG4SYSTEMS, 0x02 },
+  { CODEC_ID_NONE      ,    0 },
 };

LiVES-2.2.8.tar.bz2/lives-plugins/plugins/decoders/ogg_decoder.c -> LiVES-2.4.1.tar.bz2/lives-plugins/plugins/decoders/ogg_decoder.c Changed

@@ -76,15 +76,13 @@
 
 
 #ifdef HAVE_DIRAC
-static void SchroFrameFree( SchroFrame *sframe, void *priv )
-{
+static void SchroFrameFree(SchroFrame *sframe, void *priv) {
   register int i;
-  for (i=0;i<3;i++) free (sframe->components[i].data);
+  for (i=0; i<3; i++) free(sframe->components[i].data);
 }
 
 
-static void SchroBufferFree( SchroBuffer *sbuf, void *priv )
-{
+static void SchroBufferFree(SchroBuffer *sbuf, void *priv) {
   free(priv);
 }
 
@@ -98,7 +96,7 @@
 
 
 
-static void index_entries_free (index_entry *idx) {
+static void index_entries_free(index_entry *idx) {
   index_entry *idx_next;
 
   while (idx!=NULL) {
@@ -146,11 +144,11 @@
 #endif
 
 
-static index_entry *theora_index_entry_add (lives_clip_data_t *cdata, int64_t granule, int64_t pagepos) {
+static index_entry *theora_index_entry_add(lives_clip_data_t *cdata, int64_t granule, int64_t pagepos) {
   // add or update entry for keyframe and return it
   index_entry *idx,*oidx,*last_idx=NULL;
   int64_t gpos,frame,kframe,tframe,tkframe;
-  
+
   lives_ogg_priv_t *priv=(lives_ogg_priv_t *)cdata->priv;
 
   if (priv->vstream==NULL) return NULL;
@@ -180,8 +178,8 @@
       // entry exists, update it if applicable, and return it in found
       frame = kframe + gpos-(kframe<<priv->vstream->stpriv->keyframe_granule_shift);
       if (frame<tframe) {
-	idx->value=granule;
-	idx->pagepos=pagepos;
+        idx->value=granule;
+        idx->pagepos=pagepos;
       }
       return idx;
     }
@@ -198,8 +196,7 @@
     idx->next=last_idx->next;
     last_idx->next=idx;
     idx->prev=last_idx;
-  }
-  else {
+  } else {
     idx->next=oidx;
     oidx=idx;
   }
@@ -216,7 +213,7 @@
 
 #ifdef HAVE_DIRAC
 
-static index_entry *dirac_index_entry_add_before (index_entry *idx, int64_t pagepos) {
+static index_entry *dirac_index_entry_add_before(index_entry *idx, int64_t pagepos) {
   index_entry *new_idx=index_entry_new();
 
   new_idx->value=-1;
@@ -233,8 +230,8 @@
 
 
 
-static index_entry *dirac_index_entry_add (lives_clip_data_t *cdata, int64_t pagepos, int64_t pagepos_end, 
-					   int64_t frame) {
+static index_entry *dirac_index_entry_add(lives_clip_data_t *cdata, int64_t pagepos, int64_t pagepos_end,
+    int64_t frame) {
   // add a new entry in order, and return a pointer to it
 
   lives_ogg_priv_t *priv=(lives_ogg_priv_t *)cdata->priv;
@@ -277,7 +274,7 @@
 
 
 
-static index_entry *get_bounds_for (lives_clip_data_t *cdata, int64_t tframe, int64_t *ppos_lower, int64_t *ppos_upper) {
+static index_entry *get_bounds_for(lives_clip_data_t *cdata, int64_t tframe, int64_t *ppos_lower, int64_t *ppos_upper) {
   // find upper and lower pagepos for frame; if we find an exact match, we return it
   int64_t kframe,frame,gpos;
 
@@ -298,8 +295,7 @@
       gpos=idx->value;
       kframe = gpos >> priv->vstream->stpriv->keyframe_granule_shift;
       frame = kframe + gpos-(kframe<<priv->vstream->stpriv->keyframe_granule_shift);
-    }
-    else {
+    } else {
       kframe=frame=idx->value;
     }
 
@@ -330,7 +326,7 @@
 /////////////////////////////////////////////////////
 
 #ifdef HAVE_THEORA
-static uint8_t * ptr_2_op(uint8_t * ptr, ogg_packet * op) {
+static uint8_t *ptr_2_op(uint8_t *ptr, ogg_packet *op) {
   memcpy(op, ptr, sizeof(*op));
   ptr += sizeof(*op);
   op->packet = ptr;
@@ -345,7 +341,7 @@
   int nsegs, i;
   int64_t result, gpos;
   int page_size;
-  char * buf;
+  char *buf;
 
   lives_ogg_priv_t *priv=(lives_ogg_priv_t *)cdata->priv;
   ogg_t *opriv=priv->opriv;
@@ -355,23 +351,23 @@
     return 0;
   }
 
-  lseek64 (opriv->fd, inpos, SEEK_SET);
+  lseek64(opriv->fd, inpos, SEEK_SET);
 
-  if (read (opriv->fd, header, PAGE_HEADER_BYTES) < PAGE_HEADER_BYTES) {
-    lseek64 (opriv->fd, inpos, SEEK_SET);
+  if (read(opriv->fd, header, PAGE_HEADER_BYTES) < PAGE_HEADER_BYTES) {
+    lseek64(opriv->fd, inpos, SEEK_SET);
     return 0;
   }
 
   nsegs = header[PAGE_HEADER_BYTES-1];
-  
-  if (read (opriv->fd, header+PAGE_HEADER_BYTES, nsegs) < nsegs) {
-    lseek64 (opriv->fd, inpos, SEEK_SET);
+
+  if (read(opriv->fd, header+PAGE_HEADER_BYTES, nsegs) < nsegs) {
+    lseek64(opriv->fd, inpos, SEEK_SET);
     return 0;
   }
 
   page_size = PAGE_HEADER_BYTES + nsegs;
 
-  for (i=0;i<nsegs;i++) page_size += header[PAGE_HEADER_BYTES+i];
+  for (i=0; i<nsegs; i++) page_size += header[PAGE_HEADER_BYTES+i];
 
   ogg_sync_reset(&opriv->oy);
 
@@ -379,7 +375,7 @@
 
   memcpy(buf,header,PAGE_HEADER_BYTES+nsegs);
 
-  result = read (opriv->fd, (uint8_t*)buf+PAGE_HEADER_BYTES+nsegs, page_size-PAGE_HEADER_BYTES-nsegs);
+  result = read(opriv->fd, (uint8_t *)buf+PAGE_HEADER_BYTES+nsegs, page_size-PAGE_HEADER_BYTES-nsegs);
 
   ogg_sync_wrote(&(opriv->oy), result+PAGE_HEADER_BYTES+nsegs);
 
@@ -393,10 +389,10 @@
   if (priv->vstream!=NULL) {
     if (priv->vstream->stpriv->fourcc_priv==FOURCC_THEORA) {
       if (ogg_page_serialno(&(opriv->current_page))==priv->vstream->stream_id) {
-	gpos=ogg_page_granulepos(&(opriv->current_page));
-	pthread_mutex_lock(&priv->idxc->mutex);
-	theora_index_entry_add (cdata, gpos, inpos);
-	pthread_mutex_unlock(&priv->idxc->mutex);
+        gpos=ogg_page_granulepos(&(opriv->current_page));
+        pthread_mutex_lock(&priv->idxc->mutex);
+        theora_index_entry_add(cdata, gpos, inpos);
+        pthread_mutex_unlock(&priv->idxc->mutex);
       }
     }
   }
@@ -407,31 +403,28 @@
 
 
 
-static uint32_t detect_stream(ogg_packet * op) {
+static uint32_t detect_stream(ogg_packet *op) {
   // TODO - do this in the decoder plugins (not in demuxer)
 
   //fprintf(stderr,"detecting stream\n");
-  if((op->bytes > 7) &&
-     (op->packet[0] == 0x01) &&
-     !strncmp((char*)(op->packet+1), "vorbis", 6)) {
+  if ((op->bytes > 7) &&
+      (op->packet[0] == 0x01) &&
+      !strncmp((char *)(op->packet+1), "vorbis", 6)) {
     //fprintf(stderr,"vorbis found\n");
     return FOURCC_VORBIS;
-  }
-  else if((op->bytes > 7) &&
-	  (op->packet[0] == 0x80) &&
-	  !strncmp((char*)(op->packet+1), "theora", 6)) {
+  } else if ((op->bytes > 7) &&
+             (op->packet[0] == 0x80) &&
+             !strncmp((char *)(op->packet+1), "theora", 6)) {
     //fprintf(stderr,"theora found\n");
     return FOURCC_THEORA;
-  }
-  else if((op->bytes > 5) &&
-	  (op->packet[4] == 0x00) &&
-	  !strncmp((char*)(op->packet), "BBCD", 4)) {
+  } else if ((op->bytes > 5) &&
+             (op->packet[4] == 0x00) &&
+             !strncmp((char *)(op->packet), "BBCD", 4)) {
     //fprintf(stderr,"dirac found\n");
     return FOURCC_DIRAC;
-  }
-  else if((op->bytes > 8) &&
-	  (op->packet[8] == 0x00) &&
-	  !strncmp((char*)(op->packet), "KW-DIRAC", 8)) {
+  } else if ((op->bytes > 8) &&
+             (op->packet[8] == 0x00) &&
+             !strncmp((char *)(op->packet), "KW-DIRAC", 8)) {
     //fprintf(stderr,"dirac found\n");
     return FOURCC_DIRAC;
   }
@@ -452,7 +445,7 @@
    *(p))
 
 
-static lives_in_stream *lives_in_stream_new (int type) {
+static lives_in_stream *lives_in_stream_new(int type) {
   lives_in_stream *lstream=(lives_in_stream *)malloc(sizeof(lives_in_stream));
   lstream->type=type;
   lstream->ext_data=NULL;
@@ -461,7 +454,7 @@
 }
 
 
-static void append_extradata(lives_in_stream *s, ogg_packet * op) {
+static void append_extradata(lives_in_stream *s, ogg_packet *op) {
   s->ext_data = realloc(s->ext_data, s->ext_size + sizeof(*op) + op->bytes);
   memcpy(s->ext_data + s->ext_size, op, sizeof(*op));
   memcpy(s->ext_data + s->ext_size + sizeof(*op), op->packet, op->bytes);
@@ -481,23 +474,20 @@
 
 
 
-static uint32_t dirac_uint( bs_t *p_bs )
-{
-    uint32_t u_count = 0, u_value = 0;
+static uint32_t dirac_uint(bs_t *p_bs) {
+  uint32_t u_count = 0, u_value = 0;
 
-    while( !bs_eof( p_bs ) && !bs_read( p_bs, 1 ) )
-    {
-        u_count++;
-        u_value <<= 1;
-        u_value |= bs_read( p_bs, 1 );
-    }
+  while (!bs_eof(p_bs) && !bs_read(p_bs, 1)) {
+    u_count++;
+    u_value <<= 1;
+    u_value |= bs_read(p_bs, 1);
+  }
 
-    return (1<<u_count) - 1 + u_value;
+  return (1<<u_count) - 1 + u_value;
 }
 
-static int dirac_bool( bs_t *p_bs )
-{
-    return bs_read( p_bs, 1 );
+static int dirac_bool(bs_t *p_bs) {
+  return bs_read(p_bs, 1);
 }
 
 
@@ -509,9 +499,9 @@
 
   pthread_mutex_lock(&indices_mutex);
 
-  for (i=0;i<nidxc;i++) {
+  for (i=0; i<nidxc; i++) {
     if (indices[i]->clients[0]->current_clip==cdata->current_clip&&
-	!strcmp(indices[i]->clients[0]->URI,cdata->URI)) {
+        !strcmp(indices[i]->clients[0]->URI,cdata->URI)) {
       idxc=indices[i];
       // append cdata to clients
       idxc->clients=(lives_clip_data_t **)realloc(idxc->clients,(idxc->nclients+1)*sizeof(lives_clip_data_t *));
@@ -557,33 +547,31 @@
     // remove this index
     index_entries_free(idxc->idx);
     free(idxc->clients);
-    for (i=0;i<nidxc;i++) {
+    for (i=0; i<nidxc; i++) {
       if (indices[i]==idxc) {
-	nidxc--;
-	for (j=i;j<nidxc;j++) {
-	  indices[j]=indices[j+1];
-	}
-	free(idxc);
-	if (nidxc==0) {
-	  free(indices);
-	  indices=NULL;
-	}
-	else indices=(index_container_t **)realloc(indices,nidxc*sizeof(index_container_t *));
-	break;
+        nidxc--;
+        for (j=i; j<nidxc; j++) {
+          indices[j]=indices[j+1];
+        }
+        free(idxc);
+        if (nidxc==0) {
+          free(indices);
+          indices=NULL;
+        } else indices=(index_container_t **)realloc(indices,nidxc*sizeof(index_container_t *));
+        break;
       }
     }
-  }
-  else {
+  } else {
     // reduce client count by 1
-    for (i=0;i<idxc->nclients;i++) {
+    for (i=0; i<idxc->nclients; i++) {
       if (idxc->clients[i]==cdata) {
-	// remove this entry
-	idxc->nclients--;
-	for (j=i;j<idxc->nclients;j++) {
-	  idxc->clients[j]=idxc->clients[j+1];
-	}
-	idxc->clients=(lives_clip_data_t **)realloc(idxc->clients,idxc->nclients*sizeof(lives_clip_data_t *));
-	break;
+        // remove this entry
+        idxc->nclients--;
+        for (j=i; j<idxc->nclients; j++) {
+          idxc->clients[j]=idxc->clients[j+1];
+        }
+        idxc->clients=(lives_clip_data_t **)realloc(idxc->clients,idxc->nclients*sizeof(lives_clip_data_t *));
+        break;
       }
     }
   }
@@ -596,7 +584,7 @@
 static void idxc_release_all(void) {
   register int i;
 
-  for (i=0;i<nidxc;i++) {
+  for (i=0; i<nidxc; i++) {
     index_entries_free(indices[i]->idx);
     free(indices[i]->clients);
     free(indices[i]);
@@ -632,7 +620,7 @@
 
 
   int done;
-  stream_priv_t * ogg_stream;
+  stream_priv_t *ogg_stream;
   int serialno;
   int header_bytes = 0;
   int64_t input_pos;
@@ -657,15 +645,15 @@
   priv->input_position=0;
 
   /* Get the first page of each stream */
-  while(1) {
+  while (1) {
 
     if (!(input_pos=get_page(cdata,priv->input_position))) {
       //fprintf(stderr, "EOF1 while setting up track\n");
       return 0;
     }
-    
+
     priv->input_position+=input_pos;
-    
+
     if (!ogg_page_bos(&(opriv->current_page))) {
       opriv->page_valid = 1;
       break;
@@ -675,12 +663,12 @@
     serialno = ogg_page_serialno(&(opriv->current_page));
     ogg_stream = calloc(1, sizeof(*ogg_stream));
     ogg_stream->last_granulepos = -1;
-    
+
     ogg_stream_init(&ogg_stream->os, serialno);
     ogg_stream_pagein(&ogg_stream->os, &(opriv->current_page));
     opriv->page_valid = 0;
     header_bytes += opriv->current_page.header_len + opriv->current_page.body_len;
-      
+
     if (ogg_stream_packetout(&ogg_stream->os, &opriv->op) != 1) {
       fprintf(stderr, "EOF3 while setting up track\n");
       ogg_stream_clear(&ogg_stream->os);
@@ -690,44 +678,44 @@
 
 
     // TODO - do stream detection in decoder plugins
-      
+
     ogg_stream->fourcc_priv = detect_stream(&opriv->op);
-      
-    switch(ogg_stream->fourcc_priv) {
+
+    switch (ogg_stream->fourcc_priv) {
     case FOURCC_VORBIS:
       if (priv->astream!=NULL) {
-	fprintf(stderr,"got extra audio stream\n");
-	ogg_stream_clear(&ogg_stream->os);
-	free(ogg_stream);
-	break;
+        fprintf(stderr,"got extra audio stream\n");
+        ogg_stream_clear(&ogg_stream->os);
+        free(ogg_stream);
+        break;
       }
       priv->astream = lives_in_stream_new(LIVES_STREAM_AUDIO);
       priv->astream->fourcc = FOURCC_VORBIS;
       priv->astream->stpriv   = ogg_stream;
       priv->astream->stream_id = serialno;
-	
+
       ogg_stream->header_packets_needed = 3;
       append_extradata(priv->astream, &opriv->op);
       ogg_stream->header_packets_read = 1;
-	
+
       /* Get samplerate */
       priv->astream->samplerate=PTR_2_32LE(opriv->op.packet + 12);
       //fprintf(stderr,"rate is %d\n",priv->astream->samplerate);
-	
+
       /* Read remaining header packets from this page */
       while (ogg_stream_packetout(&ogg_stream->os, &opriv->op) == 1) {
-	append_extradata(priv->astream, &opriv->op);
-	ogg_stream->header_packets_read++;
-	if (ogg_stream->header_packets_read == ogg_stream->header_packets_needed)  break;
+        append_extradata(priv->astream, &opriv->op);
+        ogg_stream->header_packets_read++;
+        if (ogg_stream->header_packets_read == ogg_stream->header_packets_needed)  break;
       }
       break;
 #ifdef HAVE_THEORA
     case FOURCC_THEORA:
       if (priv->vstream!=NULL) {
-	fprintf(stderr,"got extra video stream\n");
-	ogg_stream_clear(&ogg_stream->os);
-	free(ogg_stream);
-	break;
+        fprintf(stderr,"got extra video stream\n");
+        ogg_stream_clear(&ogg_stream->os);
+        free(ogg_stream);
+        break;
       }
       priv->vstream = lives_in_stream_new(LIVES_STREAM_VIDEO);
       priv->vstream->fourcc = FOURCC_THEORA;
@@ -744,9 +732,9 @@
       imajor=((uint8_t *)(priv->vstream->ext_data))[55];
       iminor=((uint8_t *)(priv->vstream->ext_data))[56];
       isubminor=((uint8_t *)(priv->vstream->ext_data))[57];
-	
+
       priv->vstream->version=imajor*1000000+iminor*1000+isubminor;
-	
+
       // TODO - get frame width, height, picture width, height, and x and y offsets
 
       cdata->seek_flag=LIVES_SEEK_FAST|LIVES_SEEK_NEEDS_CALCULATION;
@@ -755,27 +743,27 @@
       /* Get fps and keyframe shift */
       priv->vstream->fps_num = PTR_2_32BE(opriv->op.packet+22);
       priv->vstream->fps_denom = PTR_2_32BE(opriv->op.packet+26);
-      
+
       //fprintf(stderr,"fps is %d / %d\n",priv->vstream->fps_num,priv->vstream->fps_denom);
 
-      ogg_stream->keyframe_granule_shift = (char) ((opriv->op.packet[40] & 0x03) << 3);
+      ogg_stream->keyframe_granule_shift = (char)((opriv->op.packet[40] & 0x03) << 3);
       ogg_stream->keyframe_granule_shift |= (opriv->op.packet[41] & 0xe0) >> 5;
 
       /* Read remaining header packets from this page */
       while (ogg_stream_packetout(&ogg_stream->os, &opriv->op) == 1) {
-	append_extradata(priv->vstream, &opriv->op);
-	ogg_stream->header_packets_read++;
-	if (ogg_stream->header_packets_read == ogg_stream->header_packets_needed) break;
+        append_extradata(priv->vstream, &opriv->op);
+        ogg_stream->header_packets_read++;
+        if (ogg_stream->header_packets_read == ogg_stream->header_packets_needed) break;
       }
 
       break;
 #endif
     case FOURCC_DIRAC:
       if (priv->vstream!=NULL) {
-	fprintf(stderr,"got extra video stream\n");
-	ogg_stream_clear(&ogg_stream->os);
-	free(ogg_stream);
-	break;
+        fprintf(stderr,"got extra video stream\n");
+        ogg_stream_clear(&ogg_stream->os);
+        free(ogg_stream);
+        break;
       }
 
       priv->vstream = lives_in_stream_new(LIVES_STREAM_VIDEO);
@@ -791,13 +779,13 @@
       ogg_stream->keyframe_granule_shift = 22; /* not 32 */
 
       /* read in useful bits from sequence header */
-      bs_init( &bs, &opriv->op.packet, opriv->op.bytes );
+      bs_init(&bs, &opriv->op.packet, opriv->op.bytes);
 
       /* get version */
-      bs_skip( &bs, 13*8); /* parse_info_header */
+      bs_skip(&bs, 13*8);  /* parse_info_header */
 
-      imajor=dirac_uint( &bs ); /* major_version */
-      iminor=dirac_uint( &bs ); /* minor_version */
+      imajor=dirac_uint(&bs);   /* major_version */
+      iminor=dirac_uint(&bs);   /* minor_version */
       //iprof=dirac_uint( &bs ); /* profile */
       //ilevel=dirac_uint( &bs ); /* level */
 
@@ -805,51 +793,51 @@
 
       //printf("dirac version %d\n",priv->vstream->version);
 
-      u_video_format = dirac_uint( &bs ); /* index */
-      if( u_video_format >= u_dirac_vidfmt_frate ) {
-	/* don't know how to parse this ogg dirac stream */
-	ogg_stream_clear(&ogg_stream->os);
-	free(ogg_stream);
-	free(priv->vstream);
-	priv->vstream=NULL;
-	break;
+      u_video_format = dirac_uint(&bs);   /* index */
+      if (u_video_format >= u_dirac_vidfmt_frate) {
+        /* don't know how to parse this ogg dirac stream */
+        ogg_stream_clear(&ogg_stream->os);
+        free(ogg_stream);
+        free(priv->vstream);
+        priv->vstream=NULL;
+        break;
       }
 
-      if( dirac_bool( &bs ) ) {
-	cdata->frame_width=cdata->width=dirac_uint( &bs ); /* frame_width */
-	cdata->frame_height=cdata->width=dirac_uint( &bs ); /* frame_height */
+      if (dirac_bool(&bs)) {
+        cdata->frame_width=cdata->width=dirac_uint(&bs);   /* frame_width */
+        cdata->frame_height=cdata->width=dirac_uint(&bs);   /* frame_height */
       }
       // else...????
 
-      if( dirac_bool( &bs ) ) {
-	dirac_uint( &bs ); /* chroma_format */
+      if (dirac_bool(&bs)) {
+        dirac_uint(&bs);   /* chroma_format */
       }
 
-      if( dirac_bool( &bs ) ) {
-	dirac_uint( &bs ); /* scan_format */
+      if (dirac_bool(&bs)) {
+        dirac_uint(&bs);   /* scan_format */
       }
 
       u_n = p_dirac_frate_tbl[pu_dirac_vidfmt_frate[u_video_format]].u_n;
       u_d = p_dirac_frate_tbl[pu_dirac_vidfmt_frate[u_video_format]].u_d;
 
-      if( dirac_bool( &bs ) ) {
-	uint32_t u_frame_rate_index = dirac_uint( &bs );
-	if( u_frame_rate_index >= u_dirac_frate_tbl ) {
-	  /* something is wrong with this stream */
-	  ogg_stream_clear(&ogg_stream->os);
-	  free(ogg_stream);
-	  free(priv->vstream);
-	  priv->vstream=NULL;
-	  break;
-	}
-	u_n = p_dirac_frate_tbl[u_frame_rate_index].u_n;
-	u_d = p_dirac_frate_tbl[u_frame_rate_index].u_d;
-	if( u_frame_rate_index == 0 ) {
-	  u_n = dirac_uint( &bs ); /* frame_rate_numerator */
-	  u_d = dirac_uint( &bs ); /* frame_rate_denominator */
-	}
+      if (dirac_bool(&bs)) {
+        uint32_t u_frame_rate_index = dirac_uint(&bs);
+        if (u_frame_rate_index >= u_dirac_frate_tbl) {
+          /* something is wrong with this stream */
+          ogg_stream_clear(&ogg_stream->os);
+          free(ogg_stream);
+          free(priv->vstream);
+          priv->vstream=NULL;
+          break;
+        }
+        u_n = p_dirac_frate_tbl[u_frame_rate_index].u_n;
+        u_d = p_dirac_frate_tbl[u_frame_rate_index].u_d;
+        if (u_frame_rate_index == 0) {
+          u_n = dirac_uint(&bs);   /* frame_rate_numerator */
+          u_d = dirac_uint(&bs);   /* frame_rate_denominator */
+        }
       }
-      
+
       cdata->fps = (float) u_n / (float) u_d;
 
       cdata->seek_flag=LIVES_SEEK_FAST|LIVES_SEEK_NEEDS_CALCULATION|LIVES_SEEK_QUALITY_LOSS;
@@ -878,55 +866,54 @@
   while (!done) {
     lives_in_stream *stream = stream_from_sno(cdata,ogg_page_serialno(&(opriv->current_page)));
     if (stream) {
-      ogg_stream = (stream_priv_t*)(stream->stpriv);
+      ogg_stream = (stream_priv_t *)(stream->stpriv);
       ogg_stream_pagein(&(ogg_stream->os), &(opriv->current_page));
       opriv->page_valid = 0;
       header_bytes += opriv->current_page.header_len + opriv->current_page.body_len;
-      
-      switch(ogg_stream->fourcc_priv) {
+
+      switch (ogg_stream->fourcc_priv) {
       case FOURCC_THEORA:
       case FOURCC_VORBIS:
-	/* Read remaining header packets from this page */
-	while (ogg_stream_packetout(&ogg_stream->os, &opriv->op) == 1) {
-	  append_extradata(stream, &opriv->op);
-	  ogg_stream->header_packets_read++;
-	  /* Second packet is vorbis comment starting after 7 bytes */
-	  //if (ogg_stream->header_packets_read == 2) parse_vorbis_comment(stream, opriv->op.packet + 7, opriv->op.bytes - 7);
-	  if (ogg_stream->header_packets_read == ogg_stream->header_packets_needed) break;
-	}
-	break;
+        /* Read remaining header packets from this page */
+        while (ogg_stream_packetout(&ogg_stream->os, &opriv->op) == 1) {
+          append_extradata(stream, &opriv->op);
+          ogg_stream->header_packets_read++;
+          /* Second packet is vorbis comment starting after 7 bytes */
+          //if (ogg_stream->header_packets_read == 2) parse_vorbis_comment(stream, opriv->op.packet + 7, opriv->op.bytes - 7);
+          if (ogg_stream->header_packets_read == ogg_stream->header_packets_needed) break;
+        }
+        break;
       }
-    }
-    else {
+    } else {
       opriv->page_valid = 0;
       header_bytes += opriv->current_page.header_len + opriv->current_page.body_len;
     }
-    
+
     /* Check if we are done for all streams */
     done = 1;
-    
+
     //for (i = 0; i < track->num_audio_streams; i++) {
     if (priv->astream!=NULL) {
       ogg_stream = priv->astream->stpriv;
       if (ogg_stream->header_packets_read < ogg_stream->header_packets_needed) done = 0;
     }
-    
+
     if (done) {
       //for(i = 0; i < track->num_video_streams; i++)
       //{
       if (priv->vstream!=NULL) {
-	ogg_stream = priv->vstream->stpriv;
-	if (ogg_stream->header_packets_read < ogg_stream->header_packets_needed) done = 0;
+        ogg_stream = priv->vstream->stpriv;
+        if (ogg_stream->header_packets_read < ogg_stream->header_packets_needed) done = 0;
       }
     }
     //}
-    
+
     /* Read the next page if we aren't done yet */
-    
+
     if (!done) {
       if (!(input_pos=get_page(cdata,priv->input_position))) {
-	fprintf(stderr, "EOF2 while setting up track");
-	return 0;
+        fprintf(stderr, "EOF2 while setting up track");
+        return 0;
       }
       priv->input_position+=input_pos;
     }
@@ -940,42 +927,47 @@
 
 #ifdef HAVE_DIRAC
 void get_dirac_cdata(lives_clip_data_t *cdata, SchroDecoder *schrodec) {
- SchroVideoFormat *sformat=schro_decoder_get_video_format(schrodec);
- cdata->frame_width=sformat->width;
- cdata->frame_height=sformat->height;
+  SchroVideoFormat *sformat=schro_decoder_get_video_format(schrodec);
+  cdata->frame_width=sformat->width;
+  cdata->frame_height=sformat->height;
 
- cdata->width=sformat->clean_width;
- cdata->height=(sformat->clean_height>>1)<<1;
- 
+  cdata->width=sformat->clean_width;
+  cdata->height=(sformat->clean_height>>1)<<1;
 
- if (sformat->interlaced) {
-   if (sformat->top_field_first) cdata->interlace=LIVES_INTERLACE_TOP_FIRST;
-   else cdata->interlace=LIVES_INTERLACE_BOTTOM_FIRST;
- }
- else cdata->interlace=LIVES_INTERLACE_NONE;
 
- switch( sformat->chroma_format ) {
- case SCHRO_CHROMA_420: cdata->palettes[0]=WEED_PALETTE_YUV420P; break;
- case SCHRO_CHROMA_422: cdata->palettes[0]=WEED_PALETTE_YUV422P; break;
- case SCHRO_CHROMA_444: cdata->palettes[0]=WEED_PALETTE_YUV444P; break;
- default:
-   cdata->palettes[0]=WEED_PALETTE_END;
-   break;
- }
+  if (sformat->interlaced) {
+    if (sformat->top_field_first) cdata->interlace=LIVES_INTERLACE_TOP_FIRST;
+    else cdata->interlace=LIVES_INTERLACE_BOTTOM_FIRST;
+  } else cdata->interlace=LIVES_INTERLACE_NONE;
 
- //if (sformat->colour_matrix==SCHRO_COLOUR_MATRIX_HDTV) cdata->YUV_subspace=WEED_YUV_SUBSPACE_BT709;
+  switch (sformat->chroma_format) {
+  case SCHRO_CHROMA_420:
+    cdata->palettes[0]=WEED_PALETTE_YUV420P;
+    break;
+  case SCHRO_CHROMA_422:
+    cdata->palettes[0]=WEED_PALETTE_YUV422P;
+    break;
+  case SCHRO_CHROMA_444:
+    cdata->palettes[0]=WEED_PALETTE_YUV444P;
+    break;
+  default:
+    cdata->palettes[0]=WEED_PALETTE_END;
+    break;
+  }
+
+  //if (sformat->colour_matrix==SCHRO_COLOUR_MATRIX_HDTV) cdata->YUV_subspace=WEED_YUV_SUBSPACE_BT709;
 
- cdata->offs_x = sformat->left_offset;
- cdata->offs_y = sformat->top_offset;
+  cdata->offs_x = sformat->left_offset;
+  cdata->offs_y = sformat->top_offset;
 
- cdata->par = sformat->aspect_ratio_numerator/sformat->aspect_ratio_denominator;
+  cdata->par = sformat->aspect_ratio_numerator/sformat->aspect_ratio_denominator;
 
- if (sformat->luma_offset==0) cdata->YUV_clamping=WEED_YUV_CLAMPING_UNCLAMPED;
- else cdata->YUV_clamping=WEED_YUV_CLAMPING_CLAMPED;
+  if (sformat->luma_offset==0) cdata->YUV_clamping=WEED_YUV_CLAMPING_UNCLAMPED;
+  else cdata->YUV_clamping=WEED_YUV_CLAMPING_CLAMPED;
 
- //printf("vals %d %d %d %d %d %d\n",sformat->width,sformat->height,sformat->clean_width,sformat->clean_height,sformat->interlaced,cdata->palettes[0]);
+  //printf("vals %d %d %d %d %d %d\n",sformat->width,sformat->height,sformat->clean_width,sformat->clean_height,sformat->interlaced,cdata->palettes[0]);
 
- free(sformat);
+  free(sformat);
 
 }
 #endif
@@ -998,9 +990,9 @@
 /* Get new data */
 
 static int64_t get_data(lives_clip_data_t *cdata, size_t bytes_to_read) {
-  char * buf;
+  char *buf;
   int64_t result;
-  
+
   lives_ogg_priv_t *priv=(lives_ogg_priv_t *)cdata->priv;
   ogg_t *opriv=priv->opriv;
 
@@ -1014,8 +1006,8 @@
   ogg_sync_reset(&opriv->oy);
   buf = ogg_sync_buffer(&(opriv->oy), bytes_to_read);
 
-  lseek64 (opriv->fd, priv->input_position, SEEK_SET);
-  result = read(opriv->fd, (uint8_t*)buf, bytes_to_read);
+  lseek64(opriv->fd, priv->input_position, SEEK_SET);
+  result = read(opriv->fd, (uint8_t *)buf, bytes_to_read);
 
   opriv->page_valid=0;
 
@@ -1028,7 +1020,7 @@
    return file position, -1 is returned on failure. For theora only. */
 
 
-static int64_t find_first_page (lives_clip_data_t *cdata, int64_t pos1, int64_t pos2, int64_t *kframe, int64_t *frame) {
+static int64_t find_first_page(lives_clip_data_t *cdata, int64_t pos1, int64_t pos2, int64_t *kframe, int64_t *frame) {
   lives_ogg_priv_t *priv=(lives_ogg_priv_t *)cdata->priv;
 
   int64_t bytes;
@@ -1053,13 +1045,13 @@
 
   seek_byte(cdata,pos1);
 
-  if ( pos1 == priv->vstream->data_start ) {
-      /* set a dummy granulepos at data_start */
-      *kframe = priv->kframe_offset;
-      *frame = priv->kframe_offset;
+  if (pos1 == priv->vstream->data_start) {
+    /* set a dummy granulepos at data_start */
+    *kframe = priv->kframe_offset;
+    *frame = priv->kframe_offset;
 
-      opriv->page_valid = 1;
-      return priv->input_position;
+    opriv->page_valid = 1;
+    return priv->input_position;
   }
 
   if (bytes_to_read>BYTES_TO_READ) bytes_to_read=BYTES_TO_READ;
@@ -1079,7 +1071,7 @@
       *frame=-1;
       return -1; // eof
     }
-    
+
     bytes_to_read=BYTES_TO_READ;
 
     result = ogg_sync_pageseek(&opriv->oy, &opriv->current_page);
@@ -1105,7 +1097,7 @@
   seek_byte(cdata,priv->input_position);
   ogg_stream_reset(&priv->vstream->stpriv->os);
 
-  while(1) {
+  while (1) {
 
     //printf("here %ld and %ld\n",priv->input_position,pos2);
 
@@ -1135,7 +1127,7 @@
       if (!pages_checked) pos1=priv->input_position;
       continue;
     }
-      
+
     ogg_stream_pagein(&priv->vstream->stpriv->os, &(opriv->current_page));
 
     pages_checked++;
@@ -1151,20 +1143,20 @@
       pthread_mutex_lock(&priv->idxc->mutex);
       theora_index_entry_add(cdata,granulepos,pos1);
       pthread_mutex_unlock(&priv->idxc->mutex);
-    
+
       *kframe =
-	  granulepos >> priv->vstream->stpriv->keyframe_granule_shift;
-      
+        granulepos >> priv->vstream->stpriv->keyframe_granule_shift;
+
       *frame = *kframe +
-	  granulepos-(*kframe<<priv->vstream->stpriv->keyframe_granule_shift);
-      
+               granulepos-(*kframe<<priv->vstream->stpriv->keyframe_granule_shift);
+
       opriv->page_valid=1;
       return pos1;
     }
 
     //  -> start of next page
     priv->input_position+=result;
-    
+
   }
 }
 
@@ -1174,7 +1166,7 @@
 /* Find the last frame for theora,
    -1 is returned on failure */
 
-static int64_t find_last_theora_frame (lives_clip_data_t *cdata, lives_in_stream *vstream) {
+static int64_t find_last_theora_frame(lives_clip_data_t *cdata, lives_in_stream *vstream) {
 
   int64_t page_pos, start_pos;
   int64_t this_frame=0, last_frame = -1;
@@ -1190,7 +1182,7 @@
 
   start_pos = pos2 - BYTES_TO_READ;
 
-  while(1) {
+  while (1) {
     if (start_pos<pos1) start_pos=pos1;
 
     //printf("in pos %ld and %ld with %ld\n",start_pos,pos2,vstream->data_start);
@@ -1202,18 +1194,17 @@
     if (this_frame == -1) {
       // no pages found in range
       if (last_frame >= 0) {     /* No more pages in range -> return last one */
-	return last_frame;
+        return last_frame;
       }
       if (start_pos <= pos1) {
-	return -1;
+        return -1;
       }
       /* Go back a bit */
       pos2-=start_pos;
       start_pos -= BYTES_TO_READ;
       if (start_pos<pos1) start_pos=pos1;
       pos2+=start_pos;
-    }
-    else {
+    } else {
       // found a page, see if we can find another one
       //printf("set last_frame to %ld\n",this_frame);
       last_frame = this_frame;
@@ -1230,7 +1221,7 @@
  * pos2 in not included in the search.
  * This is for dirac only. */
 
-static int64_t find_first_sync_frame (lives_clip_data_t *cdata, int64_t pos1, int64_t pos2, int64_t *frame) {
+static int64_t find_first_sync_frame(lives_clip_data_t *cdata, int64_t pos1, int64_t pos2, int64_t *frame) {
 
   lives_ogg_priv_t *priv=(lives_ogg_priv_t *)cdata->priv;
 
@@ -1264,9 +1255,9 @@
       pos1=idx->pagepos_end+1;
 
       if (idx->pagepos_end>=pos2-1) {
-	// region was checked and there are no seq frames
-	*frame=-1;
-	return pos1;
+        // region was checked and there are no seq frames
+        *frame=-1;
+        return pos1;
       }
 
       break;
@@ -1309,7 +1300,7 @@
       *frame=-1;
       return -1; // eof
     }
-    
+
     bytes_to_read=BYTES_TO_READ;
 
     result = ogg_sync_pageseek(&opriv->oy, &opriv->current_page);
@@ -1335,7 +1326,7 @@
   seek_byte(cdata,priv->input_position);
   ogg_stream_reset(&priv->vstream->stpriv->os);
 
-  while(1) {
+  while (1) {
 
     //printf("here %ld and %ld\n",priv->input_position,pos2);
 
@@ -1349,30 +1340,30 @@
 
     pthread_mutex_lock(&priv->idxc->mutex);
 
-    if ( (idx=find_pagepos_in_index(priv->idxc->idx,priv->input_position))!=NULL ) {
+    if ((idx=find_pagepos_in_index(priv->idxc->idx,priv->input_position))!=NULL) {
       // this part was already checked
-      
+
       //printf("WE ALREADY CHECKED THIS\n");
-      
+
       if (idx->value!=-1) {
-	// we already found a sync frame here
-	if (extend!=NULL) {
-	  extend->pagepos_end=idx->pagepos-1;
-	  if (extend->pagepos_end<extend->pagepos) priv->idxc->idx=index_entry_delete(extend);
-	}
-
-	*frame=idx->value;
-	pthread_mutex_unlock(&priv->idxc->mutex);
-	//printf("As I recall, the sync frame was %ld\n",*frame);
-	return idx->pagepos;
+        // we already found a sync frame here
+        if (extend!=NULL) {
+          extend->pagepos_end=idx->pagepos-1;
+          if (extend->pagepos_end<extend->pagepos) priv->idxc->idx=index_entry_delete(extend);
+        }
+
+        *frame=idx->value;
+        pthread_mutex_unlock(&priv->idxc->mutex);
+        //printf("As I recall, the sync frame was %ld\n",*frame);
+        return idx->pagepos;
       }
 
       // no sync frame here - update this entry and jump to pagepos_end
       if (pages_checked>=2&&idx->pagepos<pos1) idx->pagepos=pos1;
-      
+
       pos1=priv->input_position=idx->pagepos_end+1;
       pthread_mutex_unlock(&priv->idxc->mutex);
-      
+
       //printf("no seq frames, skipping\n");
 
       // need more data
@@ -1401,7 +1392,7 @@
       if (!pages_checked) pos1=priv->input_position;
       continue;
     }
-      
+
     ogg_stream_pagein(&priv->vstream->stpriv->os, &(opriv->current_page));
 
     if (pages_checked>0) pages_checked++;
@@ -1416,60 +1407,59 @@
 
       // is this packet a seq start ?
       if (opriv->op.packet[4]==0) {
-	//printf("got a seq start\n");
-
-	// if other packets ended on this page, we know that seq start begins on this page
-	// otherwise it will have begun at pos1
-	if (page_packets_checked>1) pos1=priv->input_position;
-
-	// get the frame number, close extend, add a new index entry
-	seek_byte(cdata,pos1);
-	
-	// feed packets to the dirac_decoder until we get a frame number
-	// note: in theory we should be able to get the next frame from the granulepos
-	// however this seems broken
-	priv->last_frame=-1;
-	priv->cframe=-1;
-	
-	ogg_data_process(cdata,NULL,FALSE);
-	
-	//printf("seq frame was %ld\n",priv->last_frame);
-	
-	*frame=priv->last_frame;
-	
-	schro_decoder_reset(dpriv->schrodec);
-	
-	ogg_stream_reset(&priv->vstream->stpriv->os);
-	
-	pthread_mutex_lock(&priv->idxc->mutex);
-	if (priv->last_frame>-1) {
-	  // finish off the previous search area
-	  if (extend!=NULL) {
-	    extend->pagepos_end=pos1-1;
-	    if (extend->pagepos_end<extend->pagepos) priv->idxc->idx=index_entry_delete(extend);
-	  }
-	  
-	  // and add this one
-	  extend=dirac_index_entry_add(cdata,pos1,priv->input_position+result-1,*frame);
-	  
-	  if (extend->pagepos_end<extend->pagepos) priv->idxc->idx=index_entry_delete(extend);
-	  else if (extend->prev==NULL) priv->idxc->idx=extend;
-	  
-	}
-	else {
-	  // we got no frames, we must have reached EOF
-	  if (extend!=NULL) {
-	    extend->pagepos_end=priv->input_position-1;
-	    if (extend->pagepos_end<extend->pagepos) priv->idxc->idx=index_entry_delete(extend);
-	  }
-	  pos1=-1;
-	}
-	pthread_mutex_unlock(&priv->idxc->mutex);
-	
-	return pos1; // return offset of start page
-	
+        //printf("got a seq start\n");
+
+        // if other packets ended on this page, we know that seq start begins on this page
+        // otherwise it will have begun at pos1
+        if (page_packets_checked>1) pos1=priv->input_position;
+
+        // get the frame number, close extend, add a new index entry
+        seek_byte(cdata,pos1);
+
+        // feed packets to the dirac_decoder until we get a frame number
+        // note: in theory we should be able to get the next frame from the granulepos
+        // however this seems broken
+        priv->last_frame=-1;
+        priv->cframe=-1;
+
+        ogg_data_process(cdata,NULL,FALSE);
+
+        //printf("seq frame was %ld\n",priv->last_frame);
+
+        *frame=priv->last_frame;
+
+        schro_decoder_reset(dpriv->schrodec);
+
+        ogg_stream_reset(&priv->vstream->stpriv->os);
+
+        pthread_mutex_lock(&priv->idxc->mutex);
+        if (priv->last_frame>-1) {
+          // finish off the previous search area
+          if (extend!=NULL) {
+            extend->pagepos_end=pos1-1;
+            if (extend->pagepos_end<extend->pagepos) priv->idxc->idx=index_entry_delete(extend);
+          }
+
+          // and add this one
+          extend=dirac_index_entry_add(cdata,pos1,priv->input_position+result-1,*frame);
+
+          if (extend->pagepos_end<extend->pagepos) priv->idxc->idx=index_entry_delete(extend);
+          else if (extend->prev==NULL) priv->idxc->idx=extend;
+
+        } else {
+          // we got no frames, we must have reached EOF
+          if (extend!=NULL) {
+            extend->pagepos_end=priv->input_position-1;
+            if (extend->pagepos_end<extend->pagepos) priv->idxc->idx=index_entry_delete(extend);
+          }
+          pos1=-1;
+        }
+        pthread_mutex_unlock(&priv->idxc->mutex);
+
+        return pos1; // return offset of start page
+
       }
-      
+
     }
 
 
@@ -1478,36 +1468,35 @@
       pos1=priv->input_position; // the start of this page
 
       if (pages_checked==-1) {
-	// we can start counting pages from here
-	pages_checked=1;
+        // we can start counting pages from here
+        pages_checked=1;
       }
 
 
       if (pages_checked>=2) {
-	// if we checked from one packet to the next and found no seq header.
-	// We now know that the first pages had no seq header
-	// so we can start marking from pos1 up to start of this page - 1
-	pthread_mutex_lock(&priv->idxc->mutex);
-	if (extend==NULL) {
-	  extend=dirac_index_entry_add(cdata,pos1,priv->input_position-1,-1);
-	  if (extend->prev==NULL) priv->idxc->idx=extend;
-	}
-	else {
-	  extend->pagepos_end=priv->input_position-1;
-	}
-	if (extend->pagepos_end<extend->pagepos) priv->idxc->idx=index_entry_delete(extend);
-	else if (extend->prev!=NULL&&extend->prev->pagepos_end==extend->pagepos-1&&extend->prev->value==-1) {
-	  extend->prev->pagepos_end=extend->pagepos_end;
-	  index_entry_delete(extend);
-	}
-	pthread_mutex_unlock(&priv->idxc->mutex);
+        // if we checked from one packet to the next and found no seq header.
+        // We now know that the first pages had no seq header
+        // so we can start marking from pos1 up to start of this page - 1
+        pthread_mutex_lock(&priv->idxc->mutex);
+        if (extend==NULL) {
+          extend=dirac_index_entry_add(cdata,pos1,priv->input_position-1,-1);
+          if (extend->prev==NULL) priv->idxc->idx=extend;
+        } else {
+          extend->pagepos_end=priv->input_position-1;
+        }
+        if (extend->pagepos_end<extend->pagepos) priv->idxc->idx=index_entry_delete(extend);
+        else if (extend->prev!=NULL&&extend->prev->pagepos_end==extend->pagepos-1&&extend->prev->value==-1) {
+          extend->prev->pagepos_end=extend->pagepos_end;
+          index_entry_delete(extend);
+        }
+        pthread_mutex_unlock(&priv->idxc->mutex);
       }
 
     }
-    
+
     //  -> start of next page
     priv->input_position+=result;
-    
+
   }
 }
 
@@ -1518,7 +1507,7 @@
 This is for dirac only. */
 
 
-static int64_t find_last_sync_frame (lives_clip_data_t *cdata, lives_in_stream *vstream) {
+static int64_t find_last_sync_frame(lives_clip_data_t *cdata, lives_in_stream *vstream) {
   int64_t page_pos, last_page_pos = -1, start_pos;
   int64_t this_frame=-1;
   int64_t pos1,pos2;
@@ -1532,7 +1521,7 @@
 
   start_pos = pos2 - BYTES_TO_READ;
 
-  while(1) {
+  while (1) {
     if (start_pos<pos1) start_pos=pos1;
 
     page_pos = find_first_sync_frame(cdata, start_pos, pos2, &this_frame);
@@ -1541,20 +1530,18 @@
 
     if (this_frame == -1) {
       // no sync frames found in range
-      if (last_page_pos >= 0)     /* No more pages in range -> return last one */
-	{
-	  return last_page_pos;
-	}
+      if (last_page_pos >= 0) {   /* No more pages in range -> return last one */
+        return last_page_pos;
+      }
       if (start_pos <= pos1) {
-	return -1;
+        return -1;
       }
       /* Go back a bit */
       pos2-=start_pos;
       start_pos -= BYTES_TO_READ;
       if (start_pos<pos1) start_pos=pos1;
       pos2+=start_pos;
-    }
-    else {
+    } else {
       // found a page, see if we can find another one
       last_page_pos = page_pos;
       start_pos = page_pos+1;
@@ -1573,7 +1560,7 @@
 
 
 
-static int64_t get_last_granulepos (lives_clip_data_t *cdata, int serialno) {
+static int64_t get_last_granulepos(lives_clip_data_t *cdata, int serialno) {
   // granulepos here is actually a frame - TODO ** fix for audio !
 
 #ifdef HAVE_DIRAC
@@ -1597,7 +1584,7 @@
 
     ogg_stream_reset(&priv->vstream->stpriv->os);
 
-    schro_decoder_reset( dpriv->schrodec);
+    schro_decoder_reset(dpriv->schrodec);
 
     priv->last_frame=-1;
     priv->cframe=-1;
@@ -1606,7 +1593,7 @@
 
     while (ogg_data_process(cdata,NULL,TRUE)); // continue until we reach EOF
 
-    schro_decoder_reset( dpriv->schrodec);
+    schro_decoder_reset(dpriv->schrodec);
 
     ogg_stream_reset(&priv->vstream->stpriv->os);
 
@@ -1620,7 +1607,7 @@
 
   // TODO - fix for vorbis
 
-  frame = find_last_theora_frame (cdata,priv->vstream);
+  frame = find_last_theora_frame(cdata,priv->vstream);
   if (frame < 0) return -1;
 
   return frame;
@@ -1628,7 +1615,7 @@
 }
 
 
- 
+
 static double granulepos_2_time(lives_in_stream *s, int64_t pos) {
   // actually should be frame or sample to time
 
@@ -1643,10 +1630,10 @@
   case FOURCC_THEORA:
   case FOURCC_DIRAC:
     //fprintf(stderr,"vpos is %lld\n",pos);
-    stream_priv = (stream_priv_t*)(s->stpriv);
+    stream_priv = (stream_priv_t *)(s->stpriv);
 
     frames = pos;
-    
+
     return ((double)s->fps_denom/(double)s->fps_num*(double)frames);
     break;
 
@@ -1656,7 +1643,7 @@
 
 
 static ssize_t stream_peek(int fd, char *str, size_t len) {
-  off_t cpos=lseek(fd,0,SEEK_CUR); // get current posn 
+  off_t cpos=lseek(fd,0,SEEK_CUR); // get current posn
 
 #ifndef IS_MINGW
   return pread(fd,str,len,cpos); // read len bytes without changing cpos
@@ -1737,7 +1724,7 @@
 
   opriv->page_valid=0;
 
-  // index init 
+  // index init
   priv->idxc=idxc_for(cdata);
 
   /* get ogg info */
@@ -1765,7 +1752,7 @@
     /* Initialize theora structures */
     theora_info_init(&tpriv->ti);
     theora_comment_init(&tpriv->tc);
-    
+
     /* Get header packets and initialize decoder */
     if (priv->vstream->ext_data==NULL) {
       fprintf(stderr, "Theora codec requires extra data\n");
@@ -1778,12 +1765,12 @@
     }
 
     ext_pos = priv->vstream->ext_data;
-    
-    for (i=0;i<3;i++) {
+
+    for (i=0; i<3; i++) {
       ext_pos = ptr_2_op(ext_pos, &op);
       theora_decode_header(&tpriv->ti, &tpriv->tc, &op);
     }
-  
+
     theora_decode_init(&tpriv->ts, &tpriv->ti);
 
     // check to find whether first frame is zero or one
@@ -1840,16 +1827,16 @@
 
 
   /* Get format */
-  
+
 #ifdef HAVE_THEORA
   if (priv->vstream->stpriv->fourcc_priv==FOURCC_THEORA) {
     theora_priv_t *tpriv=priv->tpriv;
     cdata->width  = cdata->frame_width = opriv->y_width = tpriv->ti.frame_width;
     cdata->height = cdata->frame_height = opriv->y_height = tpriv->ti.frame_height;
-    
+
     if (cdata->fps==0.) cdata->fps  = (float)tpriv->ti.fps_numerator/(float)tpriv->ti.fps_denominator;
-    
-    switch(tpriv->ti.pixelformat) {
+
+    switch (tpriv->ti.pixelformat) {
     case OC_PF_420:
       cdata->palettes[0] = WEED_PALETTE_YUV420P;
       opriv->uv_width = opriv->y_width>>1;
@@ -1874,25 +1861,25 @@
     if (tpriv->tc.comments>0) {
       size_t lenleft=256,csize;
       char *cbuf=cdata->comment;
-      for (i=0;i<=tpriv->tc.comments;i++) {
-	csize=tpriv->tc.comment_lengths[i];
-	if (csize>lenleft) csize=lenleft;
-	snprintf(cbuf,csize,"%s",tpriv->tc.user_comments[i]);
-	cbuf+=csize;
-	lenleft-=csize;
-	if (lenleft==0) break;
-	if (i+1<=tpriv->tc.comments) {
-	  if (lenleft<strlen("\n")+1) break;
-	  sprintf(cbuf,"\n");
-	  cbuf+=strlen("\n");
-	  lenleft-=strlen("\n");
-	}
+      for (i=0; i<=tpriv->tc.comments; i++) {
+        csize=tpriv->tc.comment_lengths[i];
+        if (csize>lenleft) csize=lenleft;
+        snprintf(cbuf,csize,"%s",tpriv->tc.user_comments[i]);
+        cbuf+=csize;
+        lenleft-=csize;
+        if (lenleft==0) break;
+        if (i+1<=tpriv->tc.comments) {
+          if (lenleft<strlen("\n")+1) break;
+          sprintf(cbuf,"\n");
+          cbuf+=strlen("\n");
+          lenleft-=strlen("\n");
+        }
       }
     }
 
   }
 #endif
-  
+
 
 #ifdef HAVE_DIRAC
   if (priv->vstream->stpriv->fourcc_priv==FOURCC_DIRAC) {
@@ -1909,33 +1896,33 @@
       opriv->page_valid=0;
 
       if (!(input_pos=get_page(cdata,priv->input_position))) {
-	// should never reach here
-	fprintf(stderr, "EOF1 while decoding\n");
-	return FALSE;
+        // should never reach here
+        fprintf(stderr, "EOF1 while decoding\n");
+        return FALSE;
       }
-      
+
       priv->input_position+=input_pos;
 
       if (ogg_page_serialno(&(opriv->current_page))!=priv->vstream->stream_id) continue;
       ogg_stream_pagein(&priv->vstream->stpriv->os, &(opriv->current_page));
-      
+
       while (ogg_stream_packetout(&priv->vstream->stpriv->os, &opriv->op) > 0) {
-	// feed packets to decoder
+        // feed packets to decoder
         SchroBuffer *schrobuffer;
-	int state;
-
-        schrobuffer = schro_buffer_new_with_data( opriv->op.packet, opriv->op.bytes );
-	schro_decoder_autoparse_push( dpriv->schrodec, schrobuffer );
-
-	state = schro_decoder_autoparse_wait( dpriv->schrodec );
-	
-	if (state==SCHRO_DECODER_FIRST_ACCESS_UNIT) {
-	  // should have our cdata now
-	  get_dirac_cdata(cdata,dpriv->schrodec);
-	  done=TRUE;
-	  break;
-	}
-	if (done) break;
+        int state;
+
+        schrobuffer = schro_buffer_new_with_data(opriv->op.packet, opriv->op.bytes);
+        schro_decoder_autoparse_push(dpriv->schrodec, schrobuffer);
+
+        state = schro_decoder_autoparse_wait(dpriv->schrodec);
+
+        if (state==SCHRO_DECODER_FIRST_ACCESS_UNIT) {
+          // should have our cdata now
+          get_dirac_cdata(cdata,dpriv->schrodec);
+          done=TRUE;
+          break;
+        }
+        if (done) break;
       }
       if (done) break;
     }
@@ -1946,16 +1933,16 @@
     //fprintf(stderr,"got dirac fps=%.4f %d x %d\n",cdata->fps,cdata->width,cdata->height);
 
 
-    schro_decoder_reset( dpriv->schrodec );
+    schro_decoder_reset(dpriv->schrodec);
     seek_byte(cdata,start_pos);
     ogg_stream_reset(&priv->vstream->stpriv->os);
 
     // find first keyframe
-    find_first_sync_frame(cdata, priv->vstream->data_start, opriv->total_bytes, &priv->kframe_offset); 
+    find_first_sync_frame(cdata, priv->vstream->data_start, opriv->total_bytes, &priv->kframe_offset);
 
     sprintf(cdata->video_name,"%s","dirac");
 
- }
+  }
 
 #endif
 
@@ -1971,9 +1958,8 @@
 
   if (priv->astream!=NULL) {
     sprintf(cdata->audio_name,"%s","vorbis");
-  }
-  else memset(cdata->audio_name,0,1);
-  
+  } else memset(cdata->audio_name,0,1);
+
 
   if (isclone) return TRUE;
 
@@ -1995,11 +1981,11 @@
     gpos=get_last_granulepos(cdata,priv->vstream->stream_id);
 
     /*  kframe=gpos >> priv->vstream->priv->keyframe_granule_shift;
-	priv->vstream->nframes = kframe + gpos-(kframe<<priv->vstream->priv->keyframe_granule_shift);*/
+    priv->vstream->nframes = kframe + gpos-(kframe<<priv->vstream->priv->keyframe_granule_shift);*/
 
     priv->vstream->nframes=gpos;
 
-    stream_duration = 
+    stream_duration =
       granulepos_2_time(priv->vstream,gpos);
     priv->vstream->duration=stream_duration;
     priv->vstream->stpriv->last_granulepos=gpos;
@@ -2012,7 +1998,8 @@
   cdata->nframes=priv->vstream->nframes;
 
   if (cdata->width!=cdata->frame_width||cdata->height!=cdata->frame_height)
-    fprintf(stderr,"ogg_decoder: info - frame size=%d x %d, pixel size=%d x %d\n",cdata->frame_width,cdata->frame_height,cdata->width,cdata->height);
+    fprintf(stderr,"ogg_decoder: info - frame size=%d x %d, pixel size=%d x %d\n",cdata->frame_width,cdata->frame_height,cdata->width,
+            cdata->height);
 
 
   return TRUE;
@@ -2021,7 +2008,7 @@
 
 
 
-static void detach_stream (lives_clip_data_t *cdata) {
+static void detach_stream(lives_clip_data_t *cdata) {
   // close the file, free the decoder
   lives_ogg_priv_t *priv=(lives_ogg_priv_t *)cdata->priv;
   ogg_t *opriv=priv->opriv;
@@ -2049,12 +2036,12 @@
 
 
 #ifdef HAVE_DIRAC
-  if (priv->dpriv!=NULL) { 
-    schro_decoder_reset( dpriv->schrodec );
+  if (priv->dpriv!=NULL) {
+    schro_decoder_reset(dpriv->schrodec);
     if (dpriv->schroframe!=NULL) {
       schro_frame_unref(dpriv->schroframe);
     }
-    if (dpriv->schrodec!=NULL) schro_decoder_free( dpriv->schrodec );
+    if (dpriv->schrodec!=NULL) schro_decoder_free(dpriv->schrodec);
     dpriv->schrodec=NULL;
     dpriv->schroframe=NULL;
     free(dpriv);
@@ -2109,7 +2096,7 @@
 
   // on the second pass we find the highest granulepos < target. This places us just before or at the start of the target keyframe
 
-  // when we come to decode, we start from this second position, discarding any completed packets on that page, 
+  // when we come to decode, we start from this second position, discarding any completed packets on that page,
   // and read pages discarding packets until we get to the target frame
 
   // we return the granulepos which we find
@@ -2170,9 +2157,9 @@
 
     if (start_pos>=end_pos) {
       if (start_pos==ppos_lower) {
-	if (!can_exact) seek_byte(cdata,start_pos);
-	priv->cpagepos=start_pos;
-	return frame_to_gpos(cdata,priv->kframe_offset,1);
+        if (!can_exact) seek_byte(cdata,start_pos);
+        priv->cpagepos=start_pos;
+        return frame_to_gpos(cdata,priv->kframe_offset,1);
       }
       break;
     }
@@ -2192,25 +2179,24 @@
       //fprintf(stderr,"first sync_frame is %ld %ld\n",kframe,frame);
 
       if (can_exact&&frame>=tframe&&kframe<=tframe) {
-	// got it !
-	//fprintf(stderr,"seek got keyframe %ld for %ld\n",kframe,tframe);
-	priv->cpagepos=pagepos;
-	return frame_to_gpos(cdata,kframe,frame);
+        // got it !
+        //fprintf(stderr,"seek got keyframe %ld for %ld\n",kframe,tframe);
+        priv->cpagepos=pagepos;
+        return frame_to_gpos(cdata,kframe,frame);
       }
 
       if ((kframe<tframe||(can_exact&&kframe==tframe))&&kframe>best_kframe) {
-	best_kframe=kframe;
-	best_frame=frame;
-	best_pagepos=pagepos;
+        best_kframe=kframe;
+        best_frame=frame;
+        best_pagepos=pagepos;
       }
 
       if (frame>=tframe) {
-	//fprintf(stderr,"checking lower segment\n");
-	// check previous segment
-	start_pos-=segsize;
-	end_pos-=segsize;
-      }
-      else start_pos=pagepos;
+        //fprintf(stderr,"checking lower segment\n");
+        // check previous segment
+        start_pos-=segsize;
+        end_pos-=segsize;
+      } else start_pos=pagepos;
 
     }
 
@@ -2239,7 +2225,7 @@
     gpos=frame_to_gpos(cdata,best_kframe,best_frame);
     return gpos;
   }
-  
+
   // should never reach here
   //fprintf(stderr,"not found\n");
   return -1;
@@ -2391,7 +2377,7 @@
   // the first time this is called, caller should pass NULL as the clone
   // subsequent calls to this should re-use the same cdata
 
-  // if the host wants a different URI, a different current_clip, or a different current_palette, 
+  // if the host wants a different URI, a different current_clip, or a different current_palette,
   // this must be called again with the same
   // cdata as the second parameter
   lives_ogg_priv_t *priv;
@@ -2451,7 +2437,7 @@
   if (theora_decode_packetin(&tpriv->ts,op)==0) {
     if (priv->skip<=0) {
       if (theora_decode_YUVout(&tpriv->ts, yuv)==0) {
-	priv->frame_out=TRUE;
+        priv->frame_out=TRUE;
       }
     }
   }
@@ -2466,7 +2452,7 @@
   unsigned char *dst=idst;
   register int i;
 
-  for (i=0;i<npixels;i++) {
+  for (i=0; i<npixels; i++) {
     switch (pal) {
     case WEED_PALETTE_RGBA32:
     case WEED_PALETTE_BGRA32:
@@ -2504,7 +2490,8 @@
       dst[0]=dst[3]=128;
       dst[1]=dst[2]=dst[4]=dst[5]=y_black;
       dst+=6;
-    default: break;
+    default:
+      break;
     }
   }
   return idst-dst;
@@ -2519,7 +2506,7 @@
   uint8_t *s_y=sframe->components[0].data;
   uint8_t *s_u=sframe->components[1].data;
   uint8_t *s_v=sframe->components[2].data;
-  
+
   uint8_t *d_y=pixel_data[0];
   uint8_t *d_u=pixel_data[1];
   uint8_t *d_v=pixel_data[2];
@@ -2530,7 +2517,7 @@
 
   int mheight=(sframe->components[0].height >> 1) << 1;
 
-  for (i=0;i<mheight;i++) {
+  for (i=0; i<mheight; i++) {
     memcpy(d_y,s_y,sframe->components[0].width);
     d_y+=sframe->components[0].width;
     s_y+=sframe->components[0].stride;
@@ -2570,20 +2557,20 @@
   if (!cont) {
     buf=malloc(op->bytes);
     memcpy(buf,op->packet,op->bytes);
-    
-    schrobuffer = schro_buffer_new_with_data( buf, op->bytes );
+
+    schrobuffer = schro_buffer_new_with_data(buf, op->bytes);
     schrobuffer->priv=buf;
-    
+
     schrobuffer->free = SchroBufferFree;
-    
+
     if (!schro_decoder_push_ready(sd)) fprintf(stderr,"decoder not ready !\n");
-    
-    schro_decoder_autoparse_push( sd, schrobuffer );
+
+    schro_decoder_autoparse_push(sd, schrobuffer);
   }
 
   while (1) {
 
-    state = schro_decoder_autoparse_wait( sd );
+    state = schro_decoder_autoparse_wait(sd);
     switch (state) {
 
     case SCHRO_DECODER_EOS:
@@ -2602,41 +2589,40 @@
     case SCHRO_DECODER_NEED_FRAME:
       //printf("need frame\n");
       schroframe = schro_frame_new();
-      schro_frame_set_free_callback( schroframe, SchroFrameFree, NULL );
+      schro_frame_set_free_callback(schroframe, SchroFrameFree, NULL);
 
       if (cdata->current_palette==WEED_PALETTE_YUV420P) schroframe->format = SCHRO_FRAME_FORMAT_U8_420;
       if (cdata->current_palette==WEED_PALETTE_YUV422P) schroframe->format = SCHRO_FRAME_FORMAT_U8_422;
       if (cdata->current_palette==WEED_PALETTE_YUV444P) schroframe->format = SCHRO_FRAME_FORMAT_U8_444;
-      
+
       schroframe->width=frame_width=cdata->frame_width;
       schroframe->height=frame_height=cdata->frame_height;
-      
-      for( i=0; i<3; i++ ) {
+
+      for (i=0; i<3; i++) {
         schroframe->components[i].width = frame_width;
         schroframe->components[i].stride = frame_width;
         schroframe->components[i].height = frame_height;
         schroframe->components[i].length = frame_width*frame_height;
         schroframe->components[i].data = malloc(frame_width*frame_height);
-	
+
         if (i==0) {
-	  if (cdata->current_palette==WEED_PALETTE_YUV420P) {
-	    frame_width>>=1;
-	    frame_height>>=1;
-	  }
-	  if (cdata->current_palette==WEED_PALETTE_YUV422P) {
-	    frame_width>>=1;
-	  }
-	  
-	}
-	else {
-	  schroframe->components[i].v_shift =
-	    SCHRO_FRAME_FORMAT_V_SHIFT( schroframe->format );
-	  schroframe->components[i].h_shift =
-	    SCHRO_FRAME_FORMAT_H_SHIFT( schroframe->format );
+          if (cdata->current_palette==WEED_PALETTE_YUV420P) {
+            frame_width>>=1;
+            frame_height>>=1;
+          }
+          if (cdata->current_palette==WEED_PALETTE_YUV422P) {
+            frame_width>>=1;
+          }
+
+        } else {
+          schroframe->components[i].v_shift =
+            SCHRO_FRAME_FORMAT_V_SHIFT(schroframe->format);
+          schroframe->components[i].h_shift =
+            SCHRO_FRAME_FORMAT_H_SHIFT(schroframe->format);
         }
       }
-      
-      schro_decoder_add_output_picture( sd, schroframe);
+
+      schro_decoder_add_output_picture(sd, schroframe);
       break;
 
     case SCHRO_DECODER_OK:
@@ -2644,23 +2630,23 @@
       //else priv->last_frame++;
       //fprintf(stderr,"dirac decoding picture %ld skip is %d, target %ld\n",priv->last_frame,priv->skip,priv->cframe);
       if ((schroframe=schro_decoder_pull(sd))!=NULL) {
-	if (priv->cframe<0||priv->cframe==priv->last_frame) {
-	  priv->frame_out=TRUE;
-	  // copy data to pixel_data
-	  if (pixel_data!=NULL) {
-	    schroframe_to_pixel_data(schroframe,pixel_data);
-	    dpriv->schroframe=schroframe;
-	    return TRUE;
-	  }
-	}
-	schro_frame_unref(schroframe);
-	//priv->cframe++;
-	//priv->skip--;
+        if (priv->cframe<0||priv->cframe==priv->last_frame) {
+          priv->frame_out=TRUE;
+          // copy data to pixel_data
+          if (pixel_data!=NULL) {
+            schroframe_to_pixel_data(schroframe,pixel_data);
+            dpriv->schroframe=schroframe;
+            return TRUE;
+          }
+        }
+        schro_frame_unref(schroframe);
+        //priv->cframe++;
+        //priv->skip--;
       }
       //else printf("Null frame !\n");
       if (pixel_data==NULL) return TRUE;
       break;
-      
+
     case SCHRO_DECODER_ERROR:
       fprintf(stderr,"Schro decoder error !\n");
       priv->frame_out=TRUE;
@@ -2704,19 +2690,19 @@
 
     if (!cont) {
       if (!(input_pos=get_page(cdata,priv->input_position))) {
-	// should never reach here (except when discovering last frame for dirac)
-	//fprintf(stderr, "EOF1 while decoding\n");
-	return FALSE;
+        // should never reach here (except when discovering last frame for dirac)
+        //fprintf(stderr, "EOF1 while decoding\n");
+        return FALSE;
       }
       priv->input_position+=input_pos;
-      
+
       if (ogg_page_serialno(&(opriv->current_page))!=priv->vstream->stream_id) continue;
       ogg_stream_pagein(&priv->vstream->stpriv->os, &(opriv->current_page));
       //printf("pulled page\n");
     }
 
     while ((cont&&priv->vstream->stpriv->fourcc_priv==FOURCC_DIRAC) ||
-	   ogg_stream_packetout(&priv->vstream->stpriv->os, &opriv->op) > 0) {
+           ogg_stream_packetout(&priv->vstream->stpriv->os, &opriv->op) > 0) {
 
       // cframe is the frame we are about to decode
 
@@ -2724,35 +2710,35 @@
 
 #ifdef HAVE_THEORA
       if (priv->vstream->stpriv->fourcc_priv==FOURCC_THEORA) {
-	
-	if (!priv->ignore_packets) {
-	  yuv_buffer *yuv=yuvbuffer;
-	  ogg_theora_read(cdata,&opriv->op,yuv);
-	}
 
-	priv->cframe++;
-	priv->skip--;
+        if (!priv->ignore_packets) {
+          yuv_buffer *yuv=yuvbuffer;
+          ogg_theora_read(cdata,&opriv->op,yuv);
+        }
+
+        priv->cframe++;
+        priv->skip--;
 
 
       }
 #endif
-	
+
 #ifdef HAVE_DIRAC
       if (priv->vstream->stpriv->fourcc_priv==FOURCC_DIRAC) {
-	uint8_t **yuv=yuvbuffer;
-	
-	// TODO - if packet is seq start, add to index
-	//printf("dec packet\n");
-
-	ogg_dirac_read(cdata,&opriv->op,yuv, cont);
-	
-	// dirac can pull several frames from the same packet
-	if (!priv->frame_out) cont=FALSE;
+        uint8_t **yuv=yuvbuffer;
+
+        // TODO - if packet is seq start, add to index
+        //printf("dec packet\n");
+
+        ogg_dirac_read(cdata,&opriv->op,yuv, cont);
+
+        // dirac can pull several frames from the same packet
+        if (!priv->frame_out) cont=FALSE;
       }
 #endif
 
       if (priv->frame_out) break;
-      
+
       sched_yield();
     }
     priv->ignore_packets=FALSE; // start decoding packets
@@ -2764,7 +2750,7 @@
 }
 
 
-boolean get_frame(const lives_clip_data_t *cdata, int64_t tframe, int* rowstrides, int height, void **pixel_data) {
+boolean get_frame(const lives_clip_data_t *cdata, int64_t tframe, int *rowstrides, int height, void **pixel_data) {
   // seek to frame, and return pixel_data
 
   lives_ogg_priv_t *priv=(lives_ogg_priv_t *)cdata->priv;
@@ -2794,7 +2780,7 @@
   unsigned char *dst,*src;
 
   int y_black=(cdata->YUV_clamping==WEED_YUV_CLAMPING_CLAMPED)?16:0;
-  unsigned char black[4]={0,0,0,255};
+  unsigned char black[4]= {0,0,0,255};
 
   int xheight=(cdata->frame_height>>1)<<1,pal=cdata->current_palette,nplanes=1,dstwidth=cdata->width,psize=1;
   int btop=cdata->offs_y,bbot=xheight-1-btop;
@@ -2805,32 +2791,31 @@
       nplanes=3;
       black[0]=y_black;
       black[1]=black[2]=128;
-    }
-    else if (pal==WEED_PALETTE_YUVA4444P) {
+    } else if (pal==WEED_PALETTE_YUVA4444P) {
       nplanes=4;
       black[0]=y_black;
       black[1]=black[2]=128;
       black[3]=255;
     }
-    
+
     if (pal==WEED_PALETTE_RGB24||pal==WEED_PALETTE_BGR24) psize=3;
-    
+
     if (pal==WEED_PALETTE_RGBA32||pal==WEED_PALETTE_BGRA32||pal==WEED_PALETTE_ARGB32||pal==WEED_PALETTE_UYVY8888||
-	pal==WEED_PALETTE_YUYV8888||pal==WEED_PALETTE_YUV888||pal==WEED_PALETTE_YUVA8888) psize=4;
-    
+        pal==WEED_PALETTE_YUYV8888||pal==WEED_PALETTE_YUV888||pal==WEED_PALETTE_YUVA8888) psize=4;
+
     if (pal==WEED_PALETTE_YUV411) psize=6;
-    
+
     if (pal==WEED_PALETTE_A1) dstwidth>>=3;
-    
+
     dstwidth*=psize;
-    
+
     if (cdata->frame_height > cdata->height && height == cdata->height) {
       // host ignores vertical border
       btop=0;
       xheight=(cdata->height>>1)<<1;
       bbot=xheight-1;
     }
-    
+
     if (cdata->frame_width > cdata->width && rowstrides[0] < cdata->frame_width*psize) {
       // host ignores horizontal border
       bleft=bright=0;
@@ -2857,14 +2842,13 @@
     if (priv->vstream->stpriv->fourcc_priv==FOURCC_DIRAC) {
       dirac_priv_t *dpriv=priv->dpriv;
       if (dpriv->schroframe!=NULL) {
-	schroframe_to_pixel_data(dpriv->schroframe,(uint8_t **)pixel_data);
-	return TRUE;
+        schroframe_to_pixel_data(dpriv->schroframe,(uint8_t **)pixel_data);
+        return TRUE;
       }
       return FALSE;
     }
 #endif
-  }
-  else {
+  } else {
 #ifdef HAVE_DIRAC
     if (priv->vstream->stpriv->fourcc_priv==FOURCC_DIRAC&&dpriv->schroframe!=NULL) {
       schro_frame_unref(dpriv->schroframe);
@@ -2882,102 +2866,96 @@
       // this is a big kludge, because really for dirac we should always seek from the first frame
       // because frames can refer to any earlier frame
       if (priv->vstream->stpriv->fourcc_priv==FOURCC_DIRAC) {
-	tframe-=DIRAC_EXTRA_FRAMES ;
+        tframe-=DIRAC_EXTRA_FRAMES ;
       }
 
       // need to find a new kframe
       pthread_mutex_lock(&priv->idxc->mutex);
       fidx=get_bounds_for((lives_clip_data_t *)cdata,tframe,&ppos_lower,&ppos_upper);
       if (fidx==NULL) {
-	//printf("pt a\n");
-	int64_t last_ret_frame=priv->last_frame;
-	pthread_mutex_unlock(&priv->idxc->mutex);
-	granulepos=ogg_seek((lives_clip_data_t *)cdata,tframe,ppos_lower,ppos_upper,TRUE);
-	pthread_mutex_lock(&priv->idxc->mutex);
-	priv->last_frame=last_ret_frame;
-	if (granulepos==-1) return FALSE; // should never happen...
-      }
-      else granulepos=fidx->value;
+        //printf("pt a\n");
+        int64_t last_ret_frame=priv->last_frame;
+        pthread_mutex_unlock(&priv->idxc->mutex);
+        granulepos=ogg_seek((lives_clip_data_t *)cdata,tframe,ppos_lower,ppos_upper,TRUE);
+        pthread_mutex_lock(&priv->idxc->mutex);
+        priv->last_frame=last_ret_frame;
+        if (granulepos==-1) return FALSE; // should never happen...
+      } else granulepos=fidx->value;
       pthread_mutex_unlock(&priv->idxc->mutex);
       //printf("pt a2\n");
 
       if (priv->vstream->stpriv->fourcc_priv==FOURCC_THEORA) {
-	kframe = granulepos >> priv->vstream->stpriv->keyframe_granule_shift;
-	//printf("kframe %ld tframe %ld\n",kframe,tframe);
-      }
-      else {
-	kframe=granulepos;
-	// part 2 of the dirac kludge
-	tframe+=DIRAC_EXTRA_FRAMES;
+        kframe = granulepos >> priv->vstream->stpriv->keyframe_granule_shift;
+        //printf("kframe %ld tframe %ld\n",kframe,tframe);
+      } else {
+        kframe=granulepos;
+        // part 2 of the dirac kludge
+        tframe+=DIRAC_EXTRA_FRAMES;
       }
 
       if (kframe<priv->kframe_offset) kframe=priv->kframe_offset;
-    }
-    else kframe=priv->last_kframe;
-    
+    } else kframe=priv->last_kframe;
+
     priv->ignore_packets=FALSE;
-    
+
     //printf("cf %ld and %ld\n",tframe,priv->last_frame);
 
     if (tframe>priv->last_frame&&(tframe-priv->last_frame<=max_frame_diff||
-				  (kframe==priv->last_kframe&&priv->vstream->stpriv->fourcc_priv==FOURCC_THEORA))) {
+                                  (kframe==priv->last_kframe&&priv->vstream->stpriv->fourcc_priv==FOURCC_THEORA))) {
       // same keyframe as last time, or next frame; we can continue where we left off
       cont=TRUE;
       priv->skip=tframe-priv->last_frame-1;
       priv->input_position=priv->current_pos;
       //printf("CONTINUING %ld %ld %ld %ld\n",tframe,priv->last_frame,kframe,priv->last_kframe);
-    }
-    else {
+    } else {
       if (fidx==NULL||priv->vstream->stpriv->fourcc_priv==FOURCC_THEORA) {
-	if (priv->vstream->stpriv->fourcc_priv==FOURCC_THEORA) {
-	  pthread_mutex_lock(&priv->idxc->mutex);
-	  get_bounds_for((lives_clip_data_t *)cdata,kframe-1,&ppos_lower,&ppos_upper);
-	  pthread_mutex_unlock(&priv->idxc->mutex);
-	  granulepos=ogg_seek((lives_clip_data_t *)cdata,kframe-1,ppos_lower,ppos_upper,FALSE);
-	  //fprintf(stderr,"starting from found gpos %ld\n",granulepos);
-	
-	  xkframe=granulepos >> priv->vstream->stpriv->keyframe_granule_shift;
-
-
-	  pthread_mutex_lock(&priv->idxc->mutex);
-	  get_bounds_for((lives_clip_data_t *)cdata,xkframe-1,&ppos_lower,&ppos_upper);
-	  pthread_mutex_unlock(&priv->idxc->mutex);
-	  granulepos=ogg_seek((lives_clip_data_t *)cdata,xkframe-1,ppos_lower,ppos_upper,FALSE);
-	  //fprintf(stderr,"starting from found gpos %ld\n",granulepos);
-	
-	  xkframe=granulepos >> priv->vstream->stpriv->keyframe_granule_shift;
-
-	  priv->cframe = xkframe + granulepos-(xkframe<<priv->vstream->stpriv->keyframe_granule_shift); // cframe will be the next frame we decode
-	  //printf("xkframe is %ld %ld\n",xkframe,priv->cframe);
-	}
-	else {
-	  priv->cframe=kframe;
-	  priv->input_position=priv->cpagepos;
-	  //printf("SEEK TO %ld\n",priv->cpagepos);
-	}
-
-	if (priv->input_position==priv->vstream->data_start) {
-	  priv->cframe=kframe=priv->kframe_offset;
-	}
-
-	priv->skip=tframe-priv->cframe;
-	//printf("skip is %ld - %ld = %ld\n",tframe,priv->cframe,priv->skip);
-      }
-      else {
-	// same keyframe as last time
-	priv->input_position=fidx->pagepos;
-	priv->cframe=kframe=fidx->value;
-	priv->skip=tframe-priv->cframe+1;
+        if (priv->vstream->stpriv->fourcc_priv==FOURCC_THEORA) {
+          pthread_mutex_lock(&priv->idxc->mutex);
+          get_bounds_for((lives_clip_data_t *)cdata,kframe-1,&ppos_lower,&ppos_upper);
+          pthread_mutex_unlock(&priv->idxc->mutex);
+          granulepos=ogg_seek((lives_clip_data_t *)cdata,kframe-1,ppos_lower,ppos_upper,FALSE);
+          //fprintf(stderr,"starting from found gpos %ld\n",granulepos);
+
+          xkframe=granulepos >> priv->vstream->stpriv->keyframe_granule_shift;
+
+
+          pthread_mutex_lock(&priv->idxc->mutex);
+          get_bounds_for((lives_clip_data_t *)cdata,xkframe-1,&ppos_lower,&ppos_upper);
+          pthread_mutex_unlock(&priv->idxc->mutex);
+          granulepos=ogg_seek((lives_clip_data_t *)cdata,xkframe-1,ppos_lower,ppos_upper,FALSE);
+          //fprintf(stderr,"starting from found gpos %ld\n",granulepos);
+
+          xkframe=granulepos >> priv->vstream->stpriv->keyframe_granule_shift;
+
+          priv->cframe = xkframe + granulepos-(xkframe<<priv->vstream->stpriv->keyframe_granule_shift); // cframe will be the next frame we decode
+          //printf("xkframe is %ld %ld\n",xkframe,priv->cframe);
+        } else {
+          priv->cframe=kframe;
+          priv->input_position=priv->cpagepos;
+          //printf("SEEK TO %ld\n",priv->cpagepos);
+        }
+
+        if (priv->input_position==priv->vstream->data_start) {
+          priv->cframe=kframe=priv->kframe_offset;
+        }
+
+        priv->skip=tframe-priv->cframe;
+        //printf("skip is %ld - %ld = %ld\n",tframe,priv->cframe,priv->skip);
+      } else {
+        // same keyframe as last time
+        priv->input_position=fidx->pagepos;
+        priv->cframe=kframe=fidx->value;
+        priv->skip=tframe-priv->cframe+1;
       }
-      
+
       if (priv->input_position>priv->vstream->data_start) {
-	priv->ignore_packets=TRUE;
+        priv->ignore_packets=TRUE;
       }
-      
+
     }
-    
+
     //fprintf(stderr,"getting yuv at %ld\n",input_position);
-    
+
     priv->last_frame=tframe;
     priv->last_kframe=kframe;
 
@@ -3001,78 +2979,75 @@
   if (priv->vstream->stpriv->fourcc_priv==FOURCC_THEORA) {
     size_t srcadd;
 
-    for (p=0;p<nplanes;p++) {
+    for (p=0; p<nplanes; p++) {
       dst=pixel_data[p];
 
       switch (p) {
       case 0:
-	src=yuv.y;
-	srcadd=yuv.y_stride;
-	break;
+        src=yuv.y;
+        srcadd=yuv.y_stride;
+        break;
       case 1:
-	src=yuv.u;
-	srcadd=yuv.uv_stride;
-	break;
+        src=yuv.u;
+        srcadd=yuv.uv_stride;
+        break;
       case 2:
-	src=yuv.v;
-	srcadd=yuv.uv_stride;
-	break;
+        src=yuv.v;
+        srcadd=yuv.uv_stride;
+        break;
       default:
-	srcadd=0;
-	src=NULL;
-	break;
+        srcadd=0;
+        src=NULL;
+        break;
       }
 
-      for (i=0;i<xheight;i++) {
-	if (i<btop||i>bbot) {
-	  // top or bottom border, copy black row
-	  if (pal==WEED_PALETTE_YUV420P||pal==WEED_PALETTE_YVU420P||pal==WEED_PALETTE_YUV422P||
-	      pal==WEED_PALETTE_YUV444P||pal==WEED_PALETTE_YUVA4444P||pal==WEED_PALETTE_RGB24||pal==WEED_PALETTE_BGR24) {
-	    memset(dst,black[p],dstwidth+(bleft+bright)*psize);
-	    dst+=dstwidth+(bleft+bright)*psize;
-	  }
-	  else dst+=write_black_pixel(dst,pal,dstwidth/psize+bleft+bright,y_black);
-	  continue;
-	}
-
-	if (bleft>0) {
-	  if (pal==WEED_PALETTE_YUV420P||pal==WEED_PALETTE_YVU420P||pal==WEED_PALETTE_YUV422P||pal==WEED_PALETTE_YUV444P||
-	      pal==WEED_PALETTE_YUVA4444P||pal==WEED_PALETTE_RGB24||pal==WEED_PALETTE_BGR24) {
-	    memset(dst,black[p],bleft*psize);
-	    dst+=bleft*psize;
-	  }
-	  else dst+=write_black_pixel(dst,pal,bleft,y_black);
-	}
-
-	memcpy(dst,src,srcadd);
-	dst+=dstwidth;
-
-	if (bright>0) {
-	  if (pal==WEED_PALETTE_YUV420P||pal==WEED_PALETTE_YVU420P||pal==WEED_PALETTE_YUV422P||pal==WEED_PALETTE_YUV444P||
-	      pal==WEED_PALETTE_YUVA4444P||pal==WEED_PALETTE_RGB24||pal==WEED_PALETTE_BGR24) {
-	    memset(dst,black[p],bright*psize);
-	    dst+=bright*psize;
-	  }
-	  else dst+=write_black_pixel(dst,pal,bright,y_black);
-	}
-
-	src+=srcadd;
+      for (i=0; i<xheight; i++) {
+        if (i<btop||i>bbot) {
+          // top or bottom border, copy black row
+          if (pal==WEED_PALETTE_YUV420P||pal==WEED_PALETTE_YVU420P||pal==WEED_PALETTE_YUV422P||
+              pal==WEED_PALETTE_YUV444P||pal==WEED_PALETTE_YUVA4444P||pal==WEED_PALETTE_RGB24||pal==WEED_PALETTE_BGR24) {
+            memset(dst,black[p],dstwidth+(bleft+bright)*psize);
+            dst+=dstwidth+(bleft+bright)*psize;
+          } else dst+=write_black_pixel(dst,pal,dstwidth/psize+bleft+bright,y_black);
+          continue;
+        }
+
+        if (bleft>0) {
+          if (pal==WEED_PALETTE_YUV420P||pal==WEED_PALETTE_YVU420P||pal==WEED_PALETTE_YUV422P||pal==WEED_PALETTE_YUV444P||
+              pal==WEED_PALETTE_YUVA4444P||pal==WEED_PALETTE_RGB24||pal==WEED_PALETTE_BGR24) {
+            memset(dst,black[p],bleft*psize);
+            dst+=bleft*psize;
+          } else dst+=write_black_pixel(dst,pal,bleft,y_black);
+        }
+
+        memcpy(dst,src,srcadd);
+        dst+=dstwidth;
+
+        if (bright>0) {
+          if (pal==WEED_PALETTE_YUV420P||pal==WEED_PALETTE_YVU420P||pal==WEED_PALETTE_YUV422P||pal==WEED_PALETTE_YUV444P||
+              pal==WEED_PALETTE_YUVA4444P||pal==WEED_PALETTE_RGB24||pal==WEED_PALETTE_BGR24) {
+            memset(dst,black[p],bright*psize);
+            dst+=bright*psize;
+          } else dst+=write_black_pixel(dst,pal,bright,y_black);
+        }
+
+        src+=srcadd;
       }
       if (p==0&&(pal==WEED_PALETTE_YUV420P||pal==WEED_PALETTE_YVU420P||pal==WEED_PALETTE_YUV422P)) {
-	dstwidth>>=1;
-	bleft>>=1;
-	bright>>=1;
+        dstwidth>>=1;
+        bleft>>=1;
+        bright>>=1;
       }
       if (p==0&&(pal==WEED_PALETTE_YUV420P||pal==WEED_PALETTE_YVU420P)) {
-	xheight>>=1;
-	btop>>=1;
-	bbot>>=1;
+        xheight>>=1;
+        btop>>=1;
+        bbot>>=1;
       }
     }
     return TRUE;
   }
 #endif
-  
+
   return FALSE;
 }
 
@@ -3086,7 +3061,7 @@
   cdata->palettes=NULL;
 
   // free index entries
-  if (priv->idxc!=NULL) idxc_release(cdata); 
+  if (priv->idxc!=NULL) idxc_release(cdata);
   priv->idxc=NULL;
 
   if (cdata->URI!=NULL) {
@@ -3097,7 +3072,7 @@
   if (priv->opriv!=NULL) free(priv->opriv);
 
   if (priv!=NULL) free(priv);
-  
+
   free(cdata);
 }

LiVES-2.2.8.tar.bz2/lives-plugins/plugins/decoders/ogg_decoder.h -> LiVES-2.4.1.tar.bz2/lives-plugins/plugins/decoders/ogg_decoder.h Changed

@@ -19,10 +19,10 @@
   ogg_packet      op;
 
   char *buffer;
- 
+
   /* current_page is valid */
   int page_valid;
- 
+
   int y_width;
   int y_height;
   int uv_width;
@@ -51,8 +51,7 @@
 #define FOURCC_THEORA    MK_FOURCC('T','H','R','A')
 
 #ifdef HAVE_THEORA
-typedef struct
-{
+typedef struct {
   theora_info    ti;
   theora_comment tc;
   theora_state   ts;
@@ -71,12 +70,12 @@
 
 
 // vorbis
-#define FOURCC_VORBIS    MK_FOURCC('V','B','I','S') 
+#define FOURCC_VORBIS    MK_FOURCC('V','B','I','S')
 
 
 
 // dirac
-#define FOURCC_DIRAC    MK_FOURCC('D','R','A','C') 
+#define FOURCC_DIRAC    MK_FOURCC('D','R','A','C')
 
 
 typedef struct lives_stream_s {
@@ -143,7 +142,7 @@
   dirac_priv_t *dpriv;
 #endif
 
-// seeking
+  // seeking
   off64_t input_position;
   off64_t current_pos;
   int skip;
@@ -155,7 +154,7 @@
   boolean ignore_packets;
   boolean frame_out;
 
-// indexing
+  // indexing
   index_container_t *idxc;
 } lives_ogg_priv_t;
 
@@ -166,169 +165,140 @@
 
 
 
-  typedef struct bs_s
-  {
-    uint8_t *p_start;
-    uint8_t *p;
-    uint8_t *p_end;
-    
-    ssize_t  i_left;    /**< i_count number of available bits */
-  } bs_t;
-  
-  static inline void bs_init( bs_t *s, const void *p_data, size_t i_data )
-  {
-    s->p_start = (void *)p_data;
-    s->p       = s->p_start;
-    s->p_end   = s->p_start + i_data;
-    s->i_left  = 8;
-  }
-  
-  static inline int bs_pos( const bs_t *s )
-  {
-    return( 8 * ( s->p - s->p_start ) + 8 - s->i_left );
-  }
-  
-  static inline int bs_eof( const bs_t *s )
-  {
-    return( s->p >= s->p_end ? 1: 0 );
-  }
-  
-  static inline uint32_t bs_read( bs_t *s, int i_count )
-  {
-    static const uint32_t i_mask[33] =
-      {  0x00,
-	 0x01,      0x03,      0x07,      0x0f,
-	 0x1f,      0x3f,      0x7f,      0xff,
-	 0x1ff,     0x3ff,     0x7ff,     0xfff,
-	 0x1fff,    0x3fff,    0x7fff,    0xffff,
-	 0x1ffff,   0x3ffff,   0x7ffff,   0xfffff,
-	 0x1fffff,  0x3fffff,  0x7fffff,  0xffffff,
-	 0x1ffffff, 0x3ffffff, 0x7ffffff, 0xfffffff,
-	 0x1fffffff,0x3fffffff,0x7fffffff,0xffffffff};
-    int      i_shr;
-    uint32_t i_result = 0;
-    
-    while( i_count > 0 )
-      {
-        if( s->p >= s->p_end )
-	  {
-            break;
-	  }
-	
-        if( ( i_shr = s->i_left - i_count ) >= 0 )
-	  {
-            /* more in the buffer than requested */
-            i_result |= ( *s->p >> i_shr )&i_mask[i_count];
-            s->i_left -= i_count;
-            if( s->i_left == 0 )
-	      {
-                s->p++;
-                s->i_left = 8;
-	      }
-            return( i_result );
-	  }
-        else
-	  {
-            /* less in the buffer than requested */
-	    i_result |= (*s->p&i_mask[s->i_left]) << -i_shr;
-	    i_count  -= s->i_left;
-	    s->p++;
-	    s->i_left = 8;
-	  }
-      }
-    
-    return( i_result );
-  }
-  
-  static inline uint32_t bs_read1( bs_t *s )
-  {
-    if( s->p < s->p_end )
-      {
-        unsigned int i_result;
-	
-        s->i_left--;
-        i_result = ( *s->p >> s->i_left )&0x01;
-        if( s->i_left == 0 )
-	  {
-            s->p++;
-            s->i_left = 8;
-	  }
-        return i_result;
+typedef struct bs_s {
+  uint8_t *p_start;
+  uint8_t *p;
+  uint8_t *p_end;
+
+  ssize_t  i_left;    /**< i_count number of available bits */
+} bs_t;
+
+static inline void bs_init(bs_t *s, const void *p_data, size_t i_data) {
+  s->p_start = (void *)p_data;
+  s->p       = s->p_start;
+  s->p_end   = s->p_start + i_data;
+  s->i_left  = 8;
+}
+
+static inline int bs_pos(const bs_t *s) {
+  return (8 * (s->p - s->p_start) + 8 - s->i_left);
+}
+
+static inline int bs_eof(const bs_t *s) {
+  return (s->p >= s->p_end ? 1: 0);
+}
+
+static inline uint32_t bs_read(bs_t *s, int i_count) {
+  static const uint32_t i_mask[33] = {
+    0x00,
+    0x01,      0x03,      0x07,      0x0f,
+    0x1f,      0x3f,      0x7f,      0xff,
+    0x1ff,     0x3ff,     0x7ff,     0xfff,
+    0x1fff,    0x3fff,    0x7fff,    0xffff,
+    0x1ffff,   0x3ffff,   0x7ffff,   0xfffff,
+    0x1fffff,  0x3fffff,  0x7fffff,  0xffffff,
+    0x1ffffff, 0x3ffffff, 0x7ffffff, 0xfffffff,
+    0x1fffffff,0x3fffffff,0x7fffffff,0xffffffff
+  };
+  int      i_shr;
+  uint32_t i_result = 0;
+
+  while (i_count > 0) {
+    if (s->p >= s->p_end) {
+      break;
+    }
+
+    if ((i_shr = s->i_left - i_count) >= 0) {
+      /* more in the buffer than requested */
+      i_result |= (*s->p >> i_shr)&i_mask[i_count];
+      s->i_left -= i_count;
+      if (s->i_left == 0) {
+        s->p++;
+        s->i_left = 8;
       }
-    
-    return 0;
+      return (i_result);
+    } else {
+      /* less in the buffer than requested */
+      i_result |= (*s->p&i_mask[s->i_left]) << -i_shr;
+      i_count  -= s->i_left;
+      s->p++;
+      s->i_left = 8;
+    }
   }
-  
-  static inline uint32_t bs_show( bs_t *s, int i_count )
-  {
-    bs_t     s_tmp = *s;
-    return bs_read( &s_tmp, i_count );
+
+  return (i_result);
+}
+
+static inline uint32_t bs_read1(bs_t *s) {
+  if (s->p < s->p_end) {
+    unsigned int i_result;
+
+    s->i_left--;
+    i_result = (*s->p >> s->i_left)&0x01;
+    if (s->i_left == 0) {
+      s->p++;
+      s->i_left = 8;
+    }
+    return i_result;
   }
-  
-  static inline void bs_skip( bs_t *s, ssize_t i_count )
-  {
-    s->i_left -= i_count;
-    
-    if( s->i_left <= 0 )
-      {
-        const int i_bytes = ( -s->i_left + 8 ) / 8;
-	
-        s->p += i_bytes;
-        s->i_left += 8 * i_bytes;
-      }
+
+  return 0;
+}
+
+static inline uint32_t bs_show(bs_t *s, int i_count) {
+  bs_t     s_tmp = *s;
+  return bs_read(&s_tmp, i_count);
+}
+
+static inline void bs_skip(bs_t *s, ssize_t i_count) {
+  s->i_left -= i_count;
+
+  if (s->i_left <= 0) {
+    const int i_bytes = (-s->i_left + 8) / 8;
+
+    s->p += i_bytes;
+    s->i_left += 8 * i_bytes;
   }
-  
-  static inline void bs_write( bs_t *s, int i_count, uint32_t i_bits )
-  {
-    while( i_count > 0 )
-      {
-        if( s->p >= s->p_end )
-	  {
-            break;
-	  }
-	
-        i_count--;
-	
-        if( ( i_bits >> i_count )&0x01 )
-	  {
-            *s->p |= 1 << ( s->i_left - 1 );
-	  }
-        else
-	  {
-            *s->p &= ~( 1 << ( s->i_left - 1 ) );
-	  }
-        s->i_left--;
-        if( s->i_left == 0 )
-	  {
-            s->p++;
-            s->i_left = 8;
-	  }
-      }
+}
+
+static inline void bs_write(bs_t *s, int i_count, uint32_t i_bits) {
+  while (i_count > 0) {
+    if (s->p >= s->p_end) {
+      break;
+    }
+
+    i_count--;
+
+    if ((i_bits >> i_count)&0x01) {
+      *s->p |= 1 << (s->i_left - 1);
+    } else {
+      *s->p &= ~(1 << (s->i_left - 1));
+    }
+    s->i_left--;
+    if (s->i_left == 0) {
+      s->p++;
+      s->i_left = 8;
+    }
   }
-  
-  static inline void bs_align( bs_t *s )
-  {
-    if( s->i_left != 8 )
-      {
-        s->i_left = 8;
-        s->p++;
-      }
+}
+
+static inline void bs_align(bs_t *s) {
+  if (s->i_left != 8) {
+    s->i_left = 8;
+    s->p++;
   }
-  
-  static inline void bs_align_0( bs_t *s )
-  {
-    if( s->i_left != 8 )
-      {
-        bs_write( s, s->i_left, 0 );
-      }
+}
+
+static inline void bs_align_0(bs_t *s) {
+  if (s->i_left != 8) {
+    bs_write(s, s->i_left, 0);
   }
-  
-  static inline void bs_align_1( bs_t *s )
-  {
-    while( s->i_left != 8 )
-      {
-        bs_write( s, 1, 1 );
-      }
+}
+
+static inline void bs_align_1(bs_t *s) {
+  while (s->i_left != 8) {
+    bs_write(s, 1, 1);
   }
-  
+}
+

LiVES-2.2.8.tar.bz2/lives-plugins/plugins/playback/video/SDL.c -> LiVES-2.4.1.tar.bz2/lives-plugins/plugins/playback/video/SDL.c Changed

@@ -16,10 +16,10 @@
 static char plugin_version[64]="LiVES SDL playback engine version 1.2";
 static char error[256];
 
-static boolean (*render_fn)(int hsize, int vsize, void **pixel_data);
-static boolean render_frame_rgb (int hsize, int vsize, void **pixel_data);
-static boolean render_frame_yuv (int hsize, int vsize, void **pixel_data);
-static boolean render_frame_unknown (int hsize, int vsize, void **pixel_data);
+static boolean(*render_fn)(int hsize, int vsize, void **pixel_data);
+static boolean render_frame_rgb(int hsize, int vsize, void **pixel_data);
+static boolean render_frame_yuv(int hsize, int vsize, void **pixel_data);
+static boolean render_frame_unknown(int hsize, int vsize, void **pixel_data);
 
 static int palette_list[6];
 static int mypalette;
@@ -67,8 +67,9 @@
 
 
 const char *module_check_init(void) {
-  if (getenv ("HAVE_SDL")==NULL&&system ("which sdl-config >/dev/null 2>&1")==256) {
-    snprintf (error,256,"\n\nUnable to find sdl-config in your path.\nPlease make sure you have SDL installed correctly to use this plugin.\nYou can override this with 'export HAVE_SDL=1'\n");
+  if (getenv("HAVE_SDL")==NULL&&system("which sdl-config >/dev/null 2>&1")==256) {
+    snprintf(error,256,
+             "\n\nUnable to find sdl-config in your path.\nPlease make sure you have SDL installed correctly to use this plugin.\nYou can override this with 'export HAVE_SDL=1'\n");
     return error;
   }
 
@@ -79,31 +80,31 @@
   ov_vsize=ov_hsize=0;
 
   mypalette=WEED_PALETTE_END;
-  rect=(SDL_Rect *)malloc (sizeof(SDL_Rect));
+  rect=(SDL_Rect *)malloc(sizeof(SDL_Rect));
 
   return NULL;
 }
 
 
 
-const char *version (void) {
+const char *version(void) {
   return plugin_version;
 }
 
-const char *get_description (void) {
+const char *get_description(void) {
   return "The SDL plugin allows faster playback.\n";
 }
 
-uint64_t get_capabilities (int palette) {
+uint64_t get_capabilities(int palette) {
   if (palette==WEED_PALETTE_UYVY8888) {
     return VPP_CAN_RESIZE|VPP_LOCAL_DISPLAY;
   }
   return VPP_LOCAL_DISPLAY;
 }
 
-const char *get_init_rfx (void) {
+const char *get_init_rfx(void) {
   return \
-"<define>\\n\
+         "<define>\\n\
 |1.7\\n\
 </define>\\n\
 <language_code>\\n\
@@ -137,13 +138,12 @@
 }
 
 
-boolean set_palette (int palette) {
+boolean set_palette(int palette) {
   if (palette==WEED_PALETTE_RGB24) {
     render_fn=&render_frame_rgb;
     mypalette=palette;
     return TRUE;
-  }
-  else if (palette==WEED_PALETTE_UYVY8888||palette==WEED_PALETTE_YUYV8888||palette==WEED_PALETTE_YUV420P||palette==WEED_PALETTE_YVU420P) {
+  } else if (palette==WEED_PALETTE_UYVY8888||palette==WEED_PALETTE_YUYV8888||palette==WEED_PALETTE_YUV420P||palette==WEED_PALETTE_YVU420P) {
     render_fn=&render_frame_yuv;
     mypalette=palette;
     return TRUE;
@@ -165,7 +165,7 @@
 
 
 
-boolean init_screen (int width, int height, boolean fullscreen, uint64_t window_id, int argc, char **argv) {
+boolean init_screen(int width, int height, boolean fullscreen, uint64_t window_id, int argc, char **argv) {
   // screen size is in RGB pixels
   int hwaccel=1;
   int yuvdir=1;
@@ -193,39 +193,39 @@
   }
 
   snprintf(tmp,32,"%d",yuvdir);
-  my_setenv ("SDL_VIDEO_YUV_DIRECT", tmp);
+  my_setenv("SDL_VIDEO_YUV_DIRECT", tmp);
 
   snprintf(tmp,32,"%d",yuvhwa);
-  my_setenv ("SDL_VIDEO_YUV_HWACCEL", tmp);
+  my_setenv("SDL_VIDEO_YUV_HWACCEL", tmp);
 
   snprintf(tmp,32,"%"PRIu64,window_id);
-  if (!fullscreen) my_setenv ("SDL_WINDOWID", tmp);
+  if (!fullscreen) my_setenv("SDL_WINDOWID", tmp);
 
   if (fsover) fullscreen=FALSE;
 
-  if((SDL_Init (SDL_INIT_VIDEO)==-1)) {
-    fprintf (stderr,"SDL player : Could not initialize SDL: %s.\n", SDL_GetError());
+  if ((SDL_Init(SDL_INIT_VIDEO)==-1)) {
+    fprintf(stderr,"SDL player : Could not initialize SDL: %s.\n", SDL_GetError());
     return FALSE;
   }
 
   modeopts=(SDL_HWSURFACE*hws)|(SDL_DOUBLEBUF*dblbuf)|(SDL_HWACCEL*hwaccel);
 
-  SDL_ShowCursor (FALSE);
-  screen = SDL_SetVideoMode (width, height, 24, modeopts | (fullscreen?SDL_FULLSCREEN:0) | SDL_NOFRAME);
-  if ( screen == NULL ) {
-    fprintf (stderr,"SDL player : Couldn't set %dx%dx24 video mode: %s\n", width, height,
-	     SDL_GetError());
+  SDL_ShowCursor(FALSE);
+  screen = SDL_SetVideoMode(width, height, 24, modeopts | (fullscreen?SDL_FULLSCREEN:0) | SDL_NOFRAME);
+  if (screen == NULL) {
+    fprintf(stderr,"SDL player : Couldn't set %dx%dx24 video mode: %s\n", width, height,
+            SDL_GetError());
     // do we need SDL_ShowCursor/SDL_quit here ?
     return FALSE;
   }
 
   /* Enable Unicode translation */
-  SDL_EnableUNICODE ( 1 );
+  SDL_EnableUNICODE(1);
 
   // if palette is RGB, create RGB surface the same size as the screen
   if (mypalette==WEED_PALETTE_RGB24) {
     RGBimage = SDL_CreateRGBSurface(SDL_HWSURFACE, width, height, 24,
-				    0x0000FF, 0x00FF00, 0xFF0000, 0x00);
+                                    0x0000FF, 0x00FF00, 0xFF0000, 0x00);
     if (RGBimage == NULL) {
       fprintf(stderr,"SDL player: Can't create: %s\n", SDL_GetError());
       return FALSE;
@@ -240,12 +240,12 @@
 }
 
 
-boolean render_frame (int hsize, int vsize, int64_t tc, void **pixel_data, void **rd, void **pp) {
+boolean render_frame(int hsize, int vsize, int64_t tc, void **pixel_data, void **rd, void **pp) {
   // call the function which was set in set_palette
-  return render_fn (hsize,vsize,pixel_data);
+  return render_fn(hsize,vsize,pixel_data);
 }
 
-boolean render_frame_rgb (int hsize, int vsize, void **pixel_data) {
+boolean render_frame_rgb(int hsize, int vsize, void **pixel_data) {
   // broken - crashes
   // hsize and vsize are in pixels (n-byte)
   SDL_LockSurface(RGBimage);
@@ -258,19 +258,17 @@
 }
 
 
-boolean render_frame_yuv (int hsize, int vsize, void **pixel_data) {
+boolean render_frame_yuv(int hsize, int vsize, void **pixel_data) {
   // hsize may be in uyvy-macropixels (2 real pixels per 4 byte macropixel !)
   uint32_t ovtype=SDL_IYUV_OVERLAY;
 
   if (mypalette==WEED_PALETTE_UYVY8888) {
     ovtype=SDL_UYVY_OVERLAY;
     hsize*=2;
-  }
-  else if (mypalette==WEED_PALETTE_YUYV8888) {
+  } else if (mypalette==WEED_PALETTE_YUYV8888) {
     ovtype=SDL_YUY2_OVERLAY;
     hsize*=2;
-  }
-  else if (mypalette==WEED_PALETTE_YVU420P) ovtype=SDL_YV12_OVERLAY;
+  } else if (mypalette==WEED_PALETTE_YVU420P) ovtype=SDL_YV12_OVERLAY;
 
 
   if ((ov_hsize!=hsize||ov_vsize!=vsize)&&(overlay!=NULL)) {
@@ -279,47 +277,46 @@
   }
 
   if (overlay==NULL) {
-    overlay=SDL_CreateYUVOverlay (hsize, vsize, ovtype, screen);
+    overlay=SDL_CreateYUVOverlay(hsize, vsize, ovtype, screen);
     ov_hsize=hsize;
     ov_vsize=vsize;
   }
 
-  SDL_LockYUVOverlay (overlay);
+  SDL_LockYUVOverlay(overlay);
 
-  if (mypalette==WEED_PALETTE_UYVY||mypalette==WEED_PALETTE_YUYV) memcpy (overlay->pixels[0],pixel_data[0],hsize*vsize*2);
+  if (mypalette==WEED_PALETTE_UYVY||mypalette==WEED_PALETTE_YUYV) memcpy(overlay->pixels[0],pixel_data[0],hsize*vsize*2);
   else {
-    memcpy (overlay->pixels[0],pixel_data[0],hsize*vsize);
-    memcpy (overlay->pixels[1],pixel_data[1],hsize*vsize>>2);
-    memcpy (overlay->pixels[2],pixel_data[2],hsize*vsize>>2);
+    memcpy(overlay->pixels[0],pixel_data[0],hsize*vsize);
+    memcpy(overlay->pixels[1],pixel_data[1],hsize*vsize>>2);
+    memcpy(overlay->pixels[2],pixel_data[2],hsize*vsize>>2);
   }
 
-  SDL_UnlockYUVOverlay (overlay);
-  SDL_DisplayYUVOverlay (overlay,rect);
+  SDL_UnlockYUVOverlay(overlay);
+  SDL_DisplayYUVOverlay(overlay,rect);
   is_ready=TRUE;
   return TRUE;
 }
 
 
-boolean render_frame_unknown (int hsize, int vsize, void **pixel_data) {
+boolean render_frame_unknown(int hsize, int vsize, void **pixel_data) {
   fprintf(stderr,"SDL plugin error: No palette was set !\n");
   return FALSE;
 }
 
 
-void exit_screen (int16_t mouse_x, int16_t mouse_y) {
+void exit_screen(int16_t mouse_x, int16_t mouse_y) {
   if (mypalette==WEED_PALETTE_RGB24) {
     if (RGBimage!=NULL) {
-      SDL_FreeSurface (RGBimage);
+      SDL_FreeSurface(RGBimage);
       RGBimage=NULL;
     }
-  }
-  else if (overlay!=NULL) {
+  } else if (overlay!=NULL) {
     SDL_FreeYUVOverlay(overlay);
     overlay=NULL;
   }
   if (mouse_x>=0&&mouse_y>=0) {
-    SDL_ShowCursor (TRUE);
-    SDL_WarpMouse ((int16_t)mouse_x, (int16_t)mouse_y);
+    SDL_ShowCursor(TRUE);
+    SDL_WarpMouse((int16_t)mouse_x, (int16_t)mouse_y);
   }
   SDL_Quit();
   is_ready=FALSE;
@@ -327,44 +324,44 @@
 
 
 void module_unload(void) {
-  free (rect);
+  free(rect);
 }
 
 
 
 
-boolean send_keycodes (keyfunc host_key_fn) {
+boolean send_keycodes(keyfunc host_key_fn) {
   // poll for keyboard events, pass them back to the caller
   // return FALSE on error
   uint16_t mod_mask,scancode=0;
 
   if (host_key_fn==NULL) return FALSE;
 
-  while(is_ready && SDL_PollEvent (&event)) {
+  while (is_ready && SDL_PollEvent(&event)) {
     mod_mask=0;
     if (event.type==SDL_KEYDOWN||event.type==SDL_KEYUP) {
       mod=event.key.keysym.mod;
 
       if (mod&KMOD_CTRL) {
-	mod_mask|=MOD_CONTROL_MASK;
+        mod_mask|=MOD_CONTROL_MASK;
       }
       if (mod&KMOD_ALT) {
-	mod_mask|=MOD_ALT_MASK;
+        mod_mask|=MOD_ALT_MASK;
       }
       if (event.type==SDL_KEYDOWN) {
-	if (!mod_mask) {
-	  scancode=event.key.keysym.unicode;
-	}
-	if (!scancode) {
-	  scancode=(uint16_t)event.key.keysym.scancode;
-	  mod_mask|=MOD_NEEDS_TRANSLATION;
-	}
-	host_key_fn (TRUE,scancode,mod_mask);
+        if (!mod_mask) {
+          scancode=event.key.keysym.unicode;
+        }
+        if (!scancode) {
+          scancode=(uint16_t)event.key.keysym.scancode;
+          mod_mask|=MOD_NEEDS_TRANSLATION;
+        }
+        host_key_fn(TRUE,scancode,mod_mask);
       }
-      
+
       else {
-	// key up - no unicode :-(
-	host_key_fn (FALSE,(uint16_t)event.key.keysym.scancode,(mod_mask|MOD_NEEDS_TRANSLATION));
+        // key up - no unicode :-(
+        host_key_fn(FALSE,(uint16_t)event.key.keysym.scancode,(mod_mask|MOD_NEEDS_TRANSLATION));
       }
     }
   }

LiVES-2.2.8.tar.bz2/lives-plugins/plugins/playback/video/icecast_output.c -> LiVES-2.4.1.tar.bz2/lives-plugins/plugins/playback/video/icecast_output.c Changed

@@ -21,9 +21,9 @@
 
 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);
-boolean render_frame_yuv420 (int hsize, int vsize, void **pixel_data);
-boolean render_frame_unknown (int hsize, int vsize, void **pixel_data);
+static boolean(*render_fn)(int hsize, int vsize, void **pixel_data);
+boolean render_frame_yuv420(int hsize, int vsize, void **pixel_data);
+boolean render_frame_unknown(int hsize, int vsize, void **pixel_data);
 
 static int ov_vsize,ov_hsize;
 
@@ -50,15 +50,15 @@
   y4m_ratio_t fps;
   int bufn;
   int bufc;
-  uint8_t ***framebuf;
+  uint8_t ** *framebuf;
 } yuv4m_t;
 
 
 static yuv4m_t *yuv4mpeg;
 
-yuv4m_t *yuv4mpeg_alloc (void) {
-  yuv4m_t *yuv4mpeg = (yuv4m_t *) malloc (sizeof(yuv4m_t));
-  if(!yuv4mpeg) return NULL;
+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;
@@ -104,7 +104,7 @@
   }
 
   // yes i know....129....well some encoders may ignore "black frames" @ start
-  if (clear) memset (planes[1],129,size);
+  if (clear) memset(planes[1],129,size);
 
   planes[2]=(uint8_t *)malloc(size);
   if (!planes[2]) {
@@ -113,7 +113,7 @@
     free(planes);
     return NULL;
   }
-  if (clear) memset (planes[2],128,size);
+  if (clear) memset(planes[2],128,size);
 
   return planes;
 }
@@ -137,8 +137,8 @@
   ov_vsize=ov_hsize=0;
 
   yuv4mpeg=yuv4mpeg_alloc();
-  y4m_init_stream_info (&(yuv4mpeg->streaminfo));
-  y4m_init_frame_info (&(yuv4mpeg->frameinfo));
+  y4m_init_stream_info(&(yuv4mpeg->streaminfo));
+  y4m_init_frame_info(&(yuv4mpeg->frameinfo));
   yuv4mpeg->fd=-1;
 
   // get tempdir
@@ -157,11 +157,11 @@
 }
 
 
-const char *version (void) {
+const char *version(void) {
   return plugin_version;
 }
 
-const char *get_description (void) {
+const char *get_description(void) {
   return "The icecast_output plugin provides realtime encoding\n to an icecast2 server in ogg/theora/vorbis format.\nIt requires ffmpeg2theora, oggTranscode, oggfwd and oggJoin.\nTry first with small frame sizes and low fps.\nNB: oggTranscode can be downloaded as part of oggvideotools 0.8a\nhttp://sourceforge.net/projects/oggvideotools/files/\n";
 }
 
@@ -172,7 +172,7 @@
 }
 
 
-uint64_t get_capabilities (int palette) {
+uint64_t get_capabilities(int palette) {
   return 0;
 }
 
@@ -186,9 +186,9 @@
 }
 
 
-const char *get_init_rfx (void) {
+const char *get_init_rfx(void) {
   return \
-"<define>\\n\
+         "<define>\\n\
 |1.7\\n\
 </define>\\n\
 <language_code>\\n\
@@ -214,8 +214,7 @@
     clampings[0]=WEED_YUV_CLAMPING_UNCLAMPED;
     clampings[1]=WEED_YUV_CLAMPING_CLAMPED;
     clampings[2]=-1;
-  }
-  else clampings[0]=-1;
+  } else clampings[0]=-1;
   return clampings;
 }
 
@@ -228,7 +227,7 @@
 
 
 
-boolean set_palette (int palette) {
+boolean set_palette(int palette) {
   if (!yuv4mpeg) return FALSE;
   if (palette==WEED_PALETTE_YUV420P) {
     mypalette=palette;
@@ -239,12 +238,12 @@
   return FALSE;
 }
 
-const char * get_fps_list (int palette) {
+const char *get_fps_list(int palette) {
   return "12|16|8|4|2|1|20|24|24000:1001|25|30000:1001|30|60";
 }
 
 
-boolean set_fps (double in_fps) {
+boolean set_fps(double in_fps) {
   if (in_fps>23.97599&&in_fps<23.9761) {
     yuv4mpeg->fps=y4m_fps_NTSC_FILM;
     return TRUE;
@@ -261,7 +260,7 @@
 static int audio;
 #include <errno.h>
 
-boolean init_screen (int width, int height, boolean fullscreen, uint64_t window_id, int argc, char **argv) {
+boolean init_screen(int width, int height, boolean fullscreen, uint64_t window_id, int argc, char **argv) {
   int dummyvar;
   char cmd[8192];
   const char *ics=NULL,*icpw=NULL,*icmp=NULL;
@@ -299,11 +298,10 @@
   if (syncd==0) yuv4mpeg->bufn=0;
   if (yuv4mpeg->bufn>0) {
     yuv4mpeg->bufc=1;
-    yuv4mpeg->framebuf=(uint8_t ***)malloc(yuv4mpeg->bufn*sizeof(uint8_t **));
+    yuv4mpeg->framebuf=(uint8_t ** *)malloc(yuv4mpeg->bufn*sizeof(uint8_t **));
     if (!yuv4mpeg->framebuf) return FALSE;
-    for (i=0;i<yuv4mpeg->bufn;i++) yuv4mpeg->framebuf[i]=NULL;
-  }
-  else yuv4mpeg->bufc=0;
+    for (i=0; i<yuv4mpeg->bufn; i++) yuv4mpeg->framebuf[i]=NULL;
+  } else yuv4mpeg->bufc=0;
 
   make_path("stream",mypid,"fifo");
   mkfifo(xfile,S_IRUSR|S_IWUSR); // raw yuv4m
@@ -323,17 +321,15 @@
   if (afd!=-1) {
     audio=1;
     close(afd);
-  }
-  else audio=0;
+  } else audio=0;
 
   if (audio) {
-    snprintf(cmd,8192,"oggTranscode %s/video-%d.ogv %s/video2-%d.ogv &",tmpdir,mypid,tmpdir,mypid); 
+    snprintf(cmd,8192,"oggTranscode %s/video-%d.ogv %s/video2-%d.ogv &",tmpdir,mypid,tmpdir,mypid);
     dummyvar=system(cmd);
     snprintf(cmd,8192,"oggJoin %s/video3-%d.ogv %s/video2-%d.ogv %s/livesaudio-%d.stream &",tmpdir,mypid,tmpdir,mypid,tmpdir,mypid);
     dummyvar=system(cmd);
-  }
-  else {
-    snprintf(cmd,8192,"oggTranscode %s/video-%d.ogv %s/video3-%d.ogv &",tmpdir,mypid,tmpdir,mypid); 
+  } else {
+    snprintf(cmd,8192,"oggTranscode %s/video-%d.ogv %s/video3-%d.ogv &",tmpdir,mypid,tmpdir,mypid);
     dummyvar=system(cmd);
   }
 
@@ -356,15 +352,15 @@
 
   //y4m_log_stream_info(LOG_INFO, "lives-yuv4mpeg", &(yuv4mpeg->streaminfo));
   return TRUE;
- }
+}
 
 
-boolean render_frame (int hsize, int vsize, int64_t tc, void **pixel_data, void **rd, void **pp) {
+boolean render_frame(int hsize, int vsize, int64_t tc, void **pixel_data, void **rd, void **pp) {
   // call the function which was set in set_palette
-  return render_fn (hsize,vsize,pixel_data);
+  return render_fn(hsize,vsize,pixel_data);
 }
 
-boolean render_frame_yuv420 (int hsize, int vsize, void **pixel_data) {
+boolean render_frame_yuv420(int hsize, int vsize, void **pixel_data) {
   int i,z;
   size_t fsize;
   register int j;
@@ -373,9 +369,9 @@
     //start new stream
     y4m_si_set_width(&(yuv4mpeg->streaminfo), hsize);
     y4m_si_set_height(&(yuv4mpeg->streaminfo), vsize);
-    
+
     y4m_si_set_sampleaspect(&(yuv4mpeg->streaminfo), yuv4mpeg->sar);
-    
+
     i = y4m_write_stream_header(yuv4mpeg->fd, &(yuv4mpeg->streaminfo));
 
     if (i != Y4M_OK) return FALSE;
@@ -386,14 +382,14 @@
     if (yuv4mpeg->bufn>0) {
       yuv4mpeg->bufc=1; // reset delay (for now)
 
-      for (i=0;i<yuv4mpeg->bufn;i++) {
-	if (yuv4mpeg->framebuf[i]!=NULL) {
-	  for (j=0;j<3;j++) {
-	    free(yuv4mpeg->framebuf[i][j]);
-	  }
-	  free(yuv4mpeg->framebuf[i]);
-	  yuv4mpeg->framebuf[i]=NULL;
-	}
+      for (i=0; i<yuv4mpeg->bufn; i++) {
+        if (yuv4mpeg->framebuf[i]!=NULL) {
+          for (j=0; j<3; j++) {
+            free(yuv4mpeg->framebuf[i][j]);
+          }
+          free(yuv4mpeg->framebuf[i]);
+          yuv4mpeg->framebuf[i]=NULL;
+        }
       }
 
       if (blankframe!=NULL) free(blankframe);
@@ -406,9 +402,8 @@
   if (yuv4mpeg->bufn==0) {
     // no sync delay
     i = y4m_write_frame(yuv4mpeg->fd, &(yuv4mpeg->streaminfo),
-			&(yuv4mpeg->frameinfo), (uint8_t **)pixel_data);
-  }
-  else {
+                        &(yuv4mpeg->frameinfo), (uint8_t **)pixel_data);
+  } else {
     // write frame to next slot in buffer
     z=yuv4mpeg->bufc-1;
     fsize=hsize*vsize;
@@ -422,15 +417,14 @@
       if (blankframe==NULL) return FALSE; // oom
 
       i = y4m_write_frame(yuv4mpeg->fd, &(yuv4mpeg->streaminfo),
-			  &(yuv4mpeg->frameinfo), blankframe);
-    }
-    else {
+                          &(yuv4mpeg->frameinfo), blankframe);
+    } else {
       // old frame to op
       i = y4m_write_frame(yuv4mpeg->fd, &(yuv4mpeg->streaminfo),
-			  &(yuv4mpeg->frameinfo), (uint8_t **)yuv4mpeg->framebuf[z]);
+                          &(yuv4mpeg->frameinfo), (uint8_t **)yuv4mpeg->framebuf[z]);
     }
 
-    for (j=0;j<3;j++) {
+    for (j=0; j<3; j++) {
       memcpy(yuv4mpeg->framebuf[z][j],pixel_data[j],fsize);
       if (j==0) fsize>>=2;
     }
@@ -446,14 +440,14 @@
   return TRUE;
 }
 
-boolean render_frame_unknown (int hsize, int vsize, void **pixel_data) {
+boolean render_frame_unknown(int hsize, int vsize, void **pixel_data) {
   if (mypalette==WEED_PALETTE_END) {
     fprintf(stderr,"ogg_stream plugin error: No palette was set !\n");
   }
   return FALSE;
 }
 
-void exit_screen (int16_t mouse_x, int16_t mouse_y) {
+void exit_screen(int16_t mouse_x, int16_t mouse_y) {
   int dummyvar;
   int mypid=getpid();
 
@@ -487,13 +481,13 @@
     }
 
     if (yuv4mpeg->framebuf!=NULL) {
-      for (i=0;i<yuv4mpeg->bufn;i++) {
-	if (yuv4mpeg->framebuf[i]!=NULL) {
-	  for (j=0;j<3;j++) {
-	    free(yuv4mpeg->framebuf[i][j]);
-	  }
-	  free(yuv4mpeg->framebuf[i]);
-	}
+      for (i=0; i<yuv4mpeg->bufn; i++) {
+        if (yuv4mpeg->framebuf[i]!=NULL) {
+          for (j=0; j<3; j++) {
+            free(yuv4mpeg->framebuf[i][j]);
+          }
+          free(yuv4mpeg->framebuf[i]);
+        }
       }
       free(yuv4mpeg->framebuf);
     }
@@ -508,7 +502,7 @@
 
 void module_unload(void) {
   if (yuv4mpeg!=NULL) {
-    free (yuv4mpeg);
+    free(yuv4mpeg);
   }
   yuv4mpeg=NULL;
 }

LiVES-2.2.8.tar.bz2/lives-plugins/plugins/playback/video/lives2lives_stream.c -> LiVES-2.4.1.tar.bz2/lives-plugins/plugins/playback/video/lives2lives_stream.c Changed

@@ -21,9 +21,9 @@
 
 static char plugin_version[64]="LiVES to LiVES streaming engine version 1.1";
 
-static boolean (*render_fn)(int hsize, int vsize, int64_t tc, void **pixel_data);
-boolean render_frame_stream (int hsize, int vsize, int64_t tc, void **pixel_data);
-boolean render_frame_unknown (int hsize, int vsize, int64_t tc, void **pixel_data);
+static boolean(*render_fn)(int hsize, int vsize, int64_t tc, void **pixel_data);
+boolean render_frame_stream(int hsize, int vsize, int64_t tc, void **pixel_data);
+boolean render_frame_unknown(int hsize, int vsize, int64_t tc, void **pixel_data);
 
 /////////////////////////////////////////////////////////////////////////
 
@@ -60,8 +60,8 @@
 } desc;
 
 
-lives_stream_t *lstream_alloc (void) {
-  lives_stream_t *lstream = (lives_stream_t *) malloc (sizeof(lives_stream_t));
+lives_stream_t *lstream_alloc(void) {
+  lives_stream_t *lstream = (lives_stream_t *) malloc(sizeof(lives_stream_t));
   if (!lstream) return NULL;
   lstream->handle=NULL;
   lstream->YUV_clamping=WEED_YUV_CLAMPING_CLAMPED;
@@ -82,16 +82,16 @@
   o->len = sizeof(cl_addr);
   memset((char *)&o->serv_addr, 0, sizeof(o->serv_addr));
   o->serv_addr.sin_family = AF_INET;
-  
+
   hostsEntry = gethostbyname(host);
   if (hostsEntry == NULL) {
     herror(NULL);
     return NULL;
   }
-    
+
   address = *((uint64_t *) hostsEntry->h_addr_list[0]);
   o->serv_addr.sin_addr.s_addr = address;
-  
+
   o->serv_addr.sin_port = htons(portnumber);
   o->addr = &(o->serv_addr);
 
@@ -100,20 +100,18 @@
     cl_addr.sin_family = AF_INET;
     cl_addr.sin_addr.s_addr = htonl(INADDR_ANY);
     cl_addr.sin_port = htons(0);
-    
-    if(bind(sockfd, (struct sockaddr *) &cl_addr, sizeof(cl_addr)) < 0) {
+
+    if (bind(sockfd, (struct sockaddr *) &cl_addr, sizeof(cl_addr)) < 0) {
       fprintf(stderr,"could not bind\n");
       close(sockfd);
       sockfd = -1;
     }
-  }
-  else fprintf(stderr,"unable to make socket\n");
+  } else fprintf(stderr,"unable to make socket\n");
 
-  if(sockfd<0) {
+  if (sockfd<0) {
     free(o);
     o = NULL;
-  }
-  else o->sockfd = sockfd;
+  } else o->sockfd = sockfd;
 
   if (o!=NULL&&strcmp(host,"INADDR_ANY")) {
     connect(sockfd, o->addr, sizeof(cl_addr));
@@ -132,12 +130,10 @@
     if (mcount>count) mcount=count;
     if ((res=sendto(sockfd, b, mcount, 0, sp, length))==-1) {
       if (errno==EMSGSIZE) {
-	mcount>>=1;
-	lstream->mtu=mcount;
-      }
-      else return FALSE;
-    }
-    else {
+        mcount>>=1;
+        lstream->mtu=mcount;
+      } else return FALSE;
+    } else {
       count-=res;
       b+=res;
     }
@@ -170,11 +166,11 @@
 }
 
 
-const char *version (void) {
+const char *version(void) {
   return plugin_version;
 }
 
-const char *get_description (void) {
+const char *get_description(void) {
   return "The LiVES 2 LiVES stream plugin allows streaming to another copy of LiVES.\n";
 }
 
@@ -190,8 +186,7 @@
     clampings[0]=WEED_YUV_CLAMPING_UNCLAMPED;
     clampings[1]=WEED_YUV_CLAMPING_CLAMPED;
     clampings[2]=-1;
-  }
-  else clampings[0]=-1;
+  } else clampings[0]=-1;
   return clampings;
 }
 
@@ -205,12 +200,12 @@
 }
 
 
-uint64_t get_capabilities (int palette) {
+uint64_t get_capabilities(int palette) {
   return 0;
 }
 
 
-boolean set_palette (int palette) {
+boolean set_palette(int palette) {
   if (!lstream) return FALSE;
   if (palette==WEED_PALETTE_YUV420P||palette==WEED_PALETTE_RGB24) {
     lstream->palette=palette;
@@ -221,9 +216,9 @@
   return FALSE;
 }
 
-const char *get_init_rfx (void) {
+const char *get_init_rfx(void) {
   return \
-"<define>\\n\
+         "<define>\\n\
 |1.7\\n\
 </define>\\n\
 <language_code>\\n\
@@ -249,17 +244,17 @@
 ";
 }
 
-const char * get_fps_list (int palette) {
+const char *get_fps_list(int palette) {
   return "8|12|16|24|25|30|50|60";
 }
 
 
-boolean set_fps (double in_fps) {
+boolean set_fps(double in_fps) {
   lstream->fps=in_fps;
   return TRUE;
 }
 
-boolean init_screen (int width, int height, boolean fullscreen, uint64_t window_id, int argc, char **argv) {
+boolean init_screen(int width, int height, boolean fullscreen, uint64_t window_id, int argc, char **argv) {
   char host[16];
   int port;
 
@@ -284,12 +279,12 @@
 }
 
 
-boolean render_frame (int hsize, int vsize, int64_t tc, void **pixel_data, void **rd, void **pp) {
+boolean render_frame(int hsize, int vsize, int64_t tc, void **pixel_data, void **rd, void **pp) {
   // call the function which was set in set_palette
-  return render_fn (hsize,vsize,tc,pixel_data);
+  return render_fn(hsize,vsize,tc,pixel_data);
 }
 
-boolean render_frame_stream (int hsize, int vsize, int64_t tc, void **pixel_data) {
+boolean render_frame_stream(int hsize, int vsize, int64_t tc, void **pixel_data) {
   char hdrstr[128];
   size_t hdrstrlen;
   int mcount;
@@ -321,7 +316,8 @@
   mcount=dsize*4;
   setsockopt(((desc *)(lstream->handle))->sockfd, SOL_SOCKET, SO_SNDBUF, (void *) &mcount, sizeof(mcount));
 
-  snprintf(hdrstr,128,"1 0 0 %d %"PRId64" %d %d %.8f %d 1 %d 0 0 ", dsize, tc, hsize, vsize, lstream->fps, lstream->palette, lstream->YUV_clamping);
+  snprintf(hdrstr,128,"1 0 0 %d %"PRId64" %d %d %.8f %d 1 %d 0 0 ", dsize, tc, hsize, vsize, lstream->fps, lstream->palette,
+           lstream->YUV_clamping);
 
   hdrstrlen=strlen(hdrstr);
 
@@ -333,8 +329,7 @@
     lives_stream_out(pixel_data[0],hsize*vsize);
     lives_stream_out(pixel_data[1],(hsize*vsize)>>2);
     lives_stream_out(pixel_data[2],(hsize*vsize)>>2);
-  }
-  else if (lstream->palette==WEED_PALETTE_RGB24) {
+  } else if (lstream->palette==WEED_PALETTE_RGB24) {
     lives_stream_out(pixel_data[0],dsize);
   }
 
@@ -342,7 +337,7 @@
 }
 
 
-boolean render_frame_unknown (int hsize, int vsize, int64_t tc, void **pixel_data) {
+boolean render_frame_unknown(int hsize, int vsize, int64_t tc, void **pixel_data) {
   if (lstream->palette==WEED_PALETTE_END) {
     fprintf(stderr,"lives2lives_stream plugin error: No palette was set !\n");
     return 0;
@@ -350,7 +345,7 @@
   return FALSE;
 }
 
-void exit_screen (int16_t mouse_x, int16_t mouse_y) {
+void exit_screen(int16_t mouse_x, int16_t mouse_y) {
   if (lstream!=NULL&&lstream->handle!=NULL) {
     lives_stream_out("STREND",6);
     lstream_close_socket(lstream);
@@ -361,7 +356,7 @@
 
 void module_unload(void) {
   if (lstream!=NULL) {
-    free (lstream);
+    free(lstream);
     lstream=NULL;
   }
 }

LiVES-2.2.8.tar.bz2/lives-plugins/plugins/playback/video/oggstream.c -> LiVES-2.4.1.tar.bz2/lives-plugins/plugins/playback/video/oggstream.c Changed

@@ -21,9 +21,9 @@
 
 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);
-boolean render_frame_yuv420 (int hsize, int vsize, void **pixel_data);
-boolean render_frame_unknown (int hsize, int vsize, void **pixel_data);
+static boolean(*render_fn)(int hsize, int vsize, void **pixel_data);
+boolean render_frame_yuv420(int hsize, int vsize, void **pixel_data);
+boolean render_frame_unknown(int hsize, int vsize, void **pixel_data);
 
 static int ov_vsize,ov_hsize;
 
@@ -50,15 +50,15 @@
   y4m_ratio_t fps;
   int bufn;
   int bufc;
-  uint8_t ***framebuf;
+  uint8_t ** *framebuf;
 } yuv4m_t;
 
 
 static yuv4m_t *yuv4mpeg;
 
-yuv4m_t *yuv4mpeg_alloc (void) {
-  yuv4m_t *yuv4mpeg = (yuv4m_t *) malloc (sizeof(yuv4m_t));
-  if(!yuv4mpeg) return NULL;
+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;
@@ -103,7 +103,7 @@
     return NULL;
   }
 
-  if (clear) memset (planes[1],129,size);
+  if (clear) memset(planes[1],129,size);
 
   planes[2]=(uint8_t *)malloc(size);
   if (!planes[2]) {
@@ -112,7 +112,7 @@
     free(planes);
     return NULL;
   }
-  if (clear) memset (planes[2],128,size);
+  if (clear) memset(planes[2],128,size);
 
   return planes;
 }
@@ -136,8 +136,8 @@
   ov_vsize=ov_hsize=0;
 
   yuv4mpeg=yuv4mpeg_alloc();
-  y4m_init_stream_info (&(yuv4mpeg->streaminfo));
-  y4m_init_frame_info (&(yuv4mpeg->frameinfo));
+  y4m_init_stream_info(&(yuv4mpeg->streaminfo));
+  y4m_init_frame_info(&(yuv4mpeg->frameinfo));
   yuv4mpeg->fd=-1;
 
   // get tempdir
@@ -156,11 +156,11 @@
 }
 
 
-const char *version (void) {
+const char *version(void) {
   return plugin_version;
 }
 
-const char *get_description (void) {
+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";
 }
 
@@ -171,7 +171,7 @@
 }
 
 
-uint64_t get_capabilities (int palette) {
+uint64_t get_capabilities(int palette) {
   return 0;
 }
 
@@ -185,9 +185,9 @@
 }
 
 
-const char *get_init_rfx (void) {
+const char *get_init_rfx(void) {
   return \
-"<define>\\n\
+         "<define>\\n\
 |1.7\\n\
 </define>\\n\
 <language_code>\\n\
@@ -209,8 +209,7 @@
     clampings[0]=WEED_YUV_CLAMPING_UNCLAMPED;
     clampings[1]=WEED_YUV_CLAMPING_CLAMPED;
     clampings[2]=-1;
-  }
-  else clampings[0]=-1;
+  } else clampings[0]=-1;
   return clampings;
 }
 
@@ -223,7 +222,7 @@
 
 
 
-boolean set_palette (int palette) {
+boolean set_palette(int palette) {
   if (!yuv4mpeg) return FALSE;
   if (palette==WEED_PALETTE_YUV420P) {
     mypalette=palette;
@@ -234,12 +233,12 @@
   return FALSE;
 }
 
-const char * get_fps_list (int palette) {
+const char *get_fps_list(int palette) {
   return "12|16|8|4|2|1|20|24|24000:1001|25|30000:1001|30|60";
 }
 
 
-boolean set_fps (double in_fps) {
+boolean set_fps(double in_fps) {
   if (in_fps>23.97599&&in_fps<23.9761) {
     yuv4mpeg->fps=y4m_fps_NTSC_FILM;
     return TRUE;
@@ -256,7 +255,7 @@
 static int audio;
 #include <errno.h>
 
-boolean init_screen (int width, int height, boolean fullscreen, uint64_t window_id, int argc, char **argv) {
+boolean init_screen(int width, int height, boolean fullscreen, uint64_t window_id, int argc, char **argv) {
   int dummyvar;
   const char *outfile;
   char cmd[8192];
@@ -274,8 +273,7 @@
 
   if (argc>0) {
     outfile=argv[0];
-  }
-  else {
+  } else {
     outfile="-";
   }
 
@@ -294,11 +292,10 @@
   if (syncd==0) yuv4mpeg->bufn=0;
   if (yuv4mpeg->bufn>0) {
     yuv4mpeg->bufc=1;
-    yuv4mpeg->framebuf=(uint8_t ***)malloc(yuv4mpeg->bufn*sizeof(uint8_t **));
+    yuv4mpeg->framebuf=(uint8_t ** *)malloc(yuv4mpeg->bufn*sizeof(uint8_t **));
     if (!yuv4mpeg->framebuf) return FALSE;
-    for (i=0;i<yuv4mpeg->bufn;i++) yuv4mpeg->framebuf[i]=NULL;
-  }
-  else yuv4mpeg->bufc=0;
+    for (i=0; i<yuv4mpeg->bufn; i++) yuv4mpeg->framebuf[i]=NULL;
+  } else yuv4mpeg->bufc=0;
 
   make_path("stream",mypid,"fifo");
   mkfifo(xfile,S_IRUSR|S_IWUSR); // raw yuv4m
@@ -307,7 +304,8 @@
   make_path("video2",mypid,"ogv");
   mkfifo(xfile,S_IRUSR|S_IWUSR); // corrected ogg stream (saved or muxed)
 
-  snprintf(cmd,8192,"ffmpeg2theora --noaudio --nosync -e 10000 -f yuv4m -F %d:%d -o %s/video-%d.ogv %s/stream-%d.fifo&",(int)yuv4mpeg->fps.n,(int)yuv4mpeg->fps.d,tmpdir,mypid,tmpdir,mypid);
+  snprintf(cmd,8192,"ffmpeg2theora --noaudio --nosync -e 10000 -f yuv4m -F %d:%d -o %s/video-%d.ogv %s/stream-%d.fifo&",(int)yuv4mpeg->fps.n,
+           (int)yuv4mpeg->fps.d,tmpdir,mypid,tmpdir,mypid);
   dummyvar=system(cmd);
   //printf("cmd is %s\n",cmd);
   make_path("livesaudio",mypid,"stream");
@@ -316,17 +314,15 @@
   if (afd!=-1) {
     audio=1;
     close(afd);
-  }
-  else audio=0;
+  } else audio=0;
 
   if (audio) {
-    snprintf(cmd,8192,"oggTranscode %s/video-%d.ogv %s/video2-%d.ogv &",tmpdir,mypid,tmpdir,mypid); 
+    snprintf(cmd,8192,"oggTranscode %s/video-%d.ogv %s/video2-%d.ogv &",tmpdir,mypid,tmpdir,mypid);
     dummyvar=system(cmd);
     snprintf(cmd,8192,"oggJoin \"%s\" %s/video2-%d.ogv %s/livesaudio-%d.stream &",outfile,tmpdir,mypid,tmpdir,mypid);
     dummyvar=system(cmd);
-  }
-  else {
-    snprintf(cmd,8192,"oggTranscode %s/video-%d.ogv \"%s\" &",tmpdir,mypid,outfile); 
+  } else {
+    snprintf(cmd,8192,"oggTranscode %s/video-%d.ogv \"%s\" &",tmpdir,mypid,outfile);
     dummyvar=system(cmd);
   }
 
@@ -347,15 +343,15 @@
 
   //y4m_log_stream_info(LOG_INFO, "lives-yuv4mpeg", &(yuv4mpeg->streaminfo));
   return TRUE;
- }
+}
 
 
-boolean render_frame (int hsize, int vsize, int64_t tc, void **pixel_data, void **rd, void **pp) {
+boolean render_frame(int hsize, int vsize, int64_t tc, void **pixel_data, void **rd, void **pp) {
   // call the function which was set in set_palette
-  return render_fn (hsize,vsize,pixel_data);
+  return render_fn(hsize,vsize,pixel_data);
 }
 
-boolean render_frame_yuv420 (int hsize, int vsize, void **pixel_data) {
+boolean render_frame_yuv420(int hsize, int vsize, void **pixel_data) {
   int i,z;
   size_t fsize;
   register int j;
@@ -364,9 +360,9 @@
     //start new stream
     y4m_si_set_width(&(yuv4mpeg->streaminfo), hsize);
     y4m_si_set_height(&(yuv4mpeg->streaminfo), vsize);
-    
+
     y4m_si_set_sampleaspect(&(yuv4mpeg->streaminfo), yuv4mpeg->sar);
-    
+
     i = y4m_write_stream_header(yuv4mpeg->fd, &(yuv4mpeg->streaminfo));
 
     if (i != Y4M_OK) {
@@ -378,14 +374,14 @@
     if (yuv4mpeg->bufn>0) {
       yuv4mpeg->bufc=1; // reset delay (for now)
 
-      for (i=0;i<yuv4mpeg->bufn;i++) {
-	if (yuv4mpeg->framebuf[i]!=NULL) {
-	  for (j=0;j<3;j++) {
-	    free(yuv4mpeg->framebuf[i][j]);
-	  }
-	  free(yuv4mpeg->framebuf[i]);
-	  yuv4mpeg->framebuf[i]=NULL;
-	}
+      for (i=0; i<yuv4mpeg->bufn; i++) {
+        if (yuv4mpeg->framebuf[i]!=NULL) {
+          for (j=0; j<3; j++) {
+            free(yuv4mpeg->framebuf[i][j]);
+          }
+          free(yuv4mpeg->framebuf[i]);
+          yuv4mpeg->framebuf[i]=NULL;
+        }
       }
 
       if (blankframe!=NULL) free(blankframe);
@@ -398,10 +394,9 @@
   if (yuv4mpeg->bufn==0) {
     // no sync delay
     i = y4m_write_frame(yuv4mpeg->fd, &(yuv4mpeg->streaminfo),
-			&(yuv4mpeg->frameinfo), (uint8_t **)pixel_data);
-    
-  }
-  else {
+                        &(yuv4mpeg->frameinfo), (uint8_t **)pixel_data);
+
+  } else {
     // write frame to next slot in buffer
     z=yuv4mpeg->bufc-1;
     fsize=hsize*vsize;
@@ -410,24 +405,23 @@
       // blank to output
       yuv4mpeg->framebuf[z]=make_blankframe(fsize,FALSE);
       if (yuv4mpeg->framebuf[z]==NULL) {
-	return FALSE;
+        return FALSE;
       }
 
       if (blankframe==NULL) blankframe=make_blankframe(fsize,FALSE);
       if (blankframe==NULL) {
-	return FALSE; // oom
+        return FALSE; // oom
       }
 
       i = y4m_write_frame(yuv4mpeg->fd, &(yuv4mpeg->streaminfo),
-			  &(yuv4mpeg->frameinfo), blankframe);
-    }
-    else {
+                          &(yuv4mpeg->frameinfo), blankframe);
+    } else {
       // old frame to op
       i = y4m_write_frame(yuv4mpeg->fd, &(yuv4mpeg->streaminfo),
-			  &(yuv4mpeg->frameinfo), (uint8_t **)yuv4mpeg->framebuf[z]);
+                          &(yuv4mpeg->frameinfo), (uint8_t **)yuv4mpeg->framebuf[z]);
     }
 
-    for (j=0;j<3;j++) {
+    for (j=0; j<3; j++) {
       memcpy(yuv4mpeg->framebuf[z][j],pixel_data[j],fsize);
       if (j==0) fsize>>=2;
     }
@@ -444,14 +438,14 @@
   return TRUE;
 }
 
-boolean render_frame_unknown (int hsize, int vsize, void **pixel_data) {
+boolean render_frame_unknown(int hsize, int vsize, void **pixel_data) {
   if (mypalette==WEED_PALETTE_END) {
     fprintf(stderr,"ogg_stream plugin error: No palette was set !\n");
   }
   return FALSE;
 }
 
-void exit_screen (int16_t mouse_x, int16_t mouse_y) {
+void exit_screen(int16_t mouse_x, int16_t mouse_y) {
   int dummyvar;
   int mypid=getpid();
 
@@ -483,13 +477,13 @@
     }
 
     if (yuv4mpeg->framebuf!=NULL) {
-      for (i=0;i<yuv4mpeg->bufn;i++) {
-	if (yuv4mpeg->framebuf[i]!=NULL) {
-	  for (j=0;j<3;j++) {
-	    free(yuv4mpeg->framebuf[i][j]);
-	  }
-	  free(yuv4mpeg->framebuf[i]);
-	}
+      for (i=0; i<yuv4mpeg->bufn; i++) {
+        if (yuv4mpeg->framebuf[i]!=NULL) {
+          for (j=0; j<3; j++) {
+            free(yuv4mpeg->framebuf[i][j]);
+          }
+          free(yuv4mpeg->framebuf[i]);
+        }
       }
       free(yuv4mpeg->framebuf);
     }
@@ -504,7 +498,7 @@
 
 void module_unload(void) {
   if (yuv4mpeg!=NULL) {
-    free (yuv4mpeg);
+    free(yuv4mpeg);
   }
   yuv4mpeg=NULL;
 }

LiVES-2.2.8.tar.bz2/lives-plugins/plugins/playback/video/openGL.cpp -> LiVES-2.4.1.tar.bz2/lives-plugins/plugins/playback/video/openGL.cpp Changed

LiVES-2.2.8.tar.bz2/lives-plugins/plugins/playback/video/videoplugin.h -> LiVES-2.4.1.tar.bz2/lives-plugins/plugins/playback/video/videoplugin.h Changed

@@ -44,7 +44,7 @@
 # define PRIu64		__PRI64_PREFIX "u"
 #endif // ifndef PRI64d
 
-typedef void * (func_ptr)(void *);
+typedef void *(func_ptr)(void *);
 
 #ifndef IS_MINGW
 typedef int boolean;
@@ -65,22 +65,22 @@
 // all playback modules need to implement these functions, unless they are marked (optional)
 
 /// host calls at startup
-const char *module_check_init (void);
-const char *version (void);
-const char *get_description (void);  ///< optional
-const char *get_init_rfx (void);  ///< optional
+const char *module_check_init(void);
+const char *version(void);
+const char *get_description(void);   ///< optional
+const char *get_init_rfx(void);   ///< optional
 
 ///< optional (but should return a weed plantptr array of paramtmpl and chantmpl, NULL terminated)
-const void **get_play_params (func_ptr func); 
+const void **get_play_params(func_ptr func);
 
 /// plugin send list of palettes, in order of preference
 const int *get_palette_list(void);
 
 /// host sets the palette used
-boolean set_palette (int palette);
+boolean set_palette(int palette);
 
-/// host will call this 
-uint64_t get_capabilities (int palette);
+/// host will call this
+uint64_t get_capabilities(int palette);
 
 #define VPP_CAN_RESIZE    1<<0
 #define VPP_CAN_RETURN    1<<1
@@ -88,7 +88,7 @@
 
 
 /// ready the screen to play (optional)
-boolean init_screen (int width, int height, boolean fullscreen, uint64_t window_id, int argc, char **argv);
+boolean init_screen(int width, int height, boolean fullscreen, uint64_t window_id, int argc, char **argv);
 
 /// display one frame, adding effects if you like,
 /// and resizing it to screen size if possible (VPP_CAN_RESIZE)
@@ -99,60 +99,60 @@
 /// hsize and vsize are width and height of the pixel data (in macropixels)
 /// no extra padding (rowstrides) is allowed
 /// play_params should be cast to weed_plant_t ** (if the plugin exports get_play_paramtmpls() )
-boolean render_frame (int hsize, int vsize, int64_t timecode, void **pixel_data, void **return_data, 
-		      void **play_params);
+boolean render_frame(int hsize, int vsize, int64_t timecode, void **pixel_data, void **return_data,
+                     void **play_params);
 
 /// destroy the screen, return mouse to original posn., allow the host GUI to take over (optional)
-void exit_screen (int16_t mouse_x, int16_t mouse_y);
+void exit_screen(int16_t mouse_x, int16_t mouse_y);
 
 /// this is called when module is unloaded
-void module_unload (void);
+void module_unload(void);
 
 ////////////////////////////////////////////////////////////////////
 
 // extra functions for fixed fps
-const char *get_fps_list (int palette);
-boolean set_fps (double fps);
+const char *get_fps_list(int palette);
+boolean set_fps(double fps);
 
 ///////////////////////////////////////////////////////////////////////////
 // mandatory function for display plugins (VPP_LOCAL_DISPLAY)
 
 /// This is a host function - a pointer to it is passed in send_keycodes()
-typedef boolean (*keyfunc)(boolean down, uint16_t unicode, uint16_t keymod);
+typedef boolean(*keyfunc)(boolean down, uint16_t unicode, uint16_t keymod);
 
 #define MOD_CONTROL_MASK 1<<2
 #define MOD_ALT_MASK 1<<3
 #define MOD_NEEDS_TRANSLATION 1<<15
 
 /// host calls this fn to send keycodes, plugin should call key function with a unicode keycode and modifier. If no more keys, return FALSE.
-boolean send_keycodes (keyfunc);
+boolean send_keycodes(keyfunc);
 
 //////////////////////////////////////////////////////////////////////////
 // optional functions for yuv palettes
 
 /// plugin send list of palette sampling types, in order of preference (optional); -1 terminates list
-const 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
-const 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
-const 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);
+boolean set_yuv_palette_sampling(int sampling_type);
 
 /// host sets the palette sampling (optional)
-boolean set_yuv_palette_clamping (int clamping_type);
+boolean set_yuv_palette_clamping(int clamping_type);
 
 /// host sets the palette subspace (optional)
-boolean set_yuv_palette_subspace (int subspace_type);
+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 ?] 
+// signed/endian [get_raw_audio_fmts ?]
 
 
 #ifdef __cplusplus

LiVES-2.2.8.tar.bz2/lives-plugins/plugins/playback/video/vjack_output.c -> LiVES-2.4.1.tar.bz2/lives-plugins/plugins/playback/video/vjack_output.c Changed

@@ -25,15 +25,15 @@
 static jack_port_t *output_port;
 static jack_client_t *client;
 
-int server_process (jack_nframes_t nframes, void *arg) {
+int server_process(jack_nframes_t nframes, void *arg) {
   // jack calls this
-  uint8_t* in;
+  uint8_t *in;
 
   if (rb==NULL) return 0;
 
-  in = jack_port_get_buffer (output_port, nframes);
-  while ( jack_ringbuffer_read_space(rb) >= frame_size) {
-    jack_ringbuffer_read (rb, (void *) in, frame_size);
+  in = jack_port_get_buffer(output_port, nframes);
+  while (jack_ringbuffer_read_space(rb) >= frame_size) {
+    jack_ringbuffer_read(rb, (void *) in, frame_size);
   }
   return 0;
 }
@@ -52,60 +52,60 @@
   const char *server_name=NULL; // set to "video0" if running with audio on "default"
 
   // connect to vjack
-  client = jack_client_open (client_name, options, &status, server_name);
+  client = jack_client_open(client_name, options, &status, server_name);
   if (client == NULL) {
-    fprintf (stderr, "jack_client_open() failed, "
-	     "status = 0x%2.0x\n", status);
+    fprintf(stderr, "jack_client_open() failed, "
+            "status = 0x%2.0x\n", status);
     if (status & JackServerFailed) {
-      fprintf (stderr, "vjack_output: Unable to connect to JACK server\n");
+      fprintf(stderr, "vjack_output: Unable to connect to JACK server\n");
     }
     return "unable to connect";
   }
   if (status & JackServerStarted) {
-    fprintf (stderr, "JACK server started\n");
+    fprintf(stderr, "JACK server started\n");
   }
   if (status & JackNameNotUnique) {
     client_name = jack_get_client_name(client);
-    fprintf (stderr, "unique name `%s' assigned\n", client_name);
+    fprintf(stderr, "unique name `%s' assigned\n", client_name);
   }
 
-  fprintf (stderr,"engine sample rate: %" PRIu32 "\n",
-	   jack_get_sample_rate (client));
+  fprintf(stderr,"engine sample rate: %" PRIu32 "\n",
+          jack_get_sample_rate(client));
+
+  output_port = jack_port_register(client,
+                                   "video_out",
+                                   JACK_DEFAULT_VIDEO_TYPE,
+                                   JackPortIsOutput,
+                                   0);
 
-  output_port = jack_port_register (client, 
-				    "video_out",
-				    JACK_DEFAULT_VIDEO_TYPE,
-				    JackPortIsOutput, 
-				    0);
-  
   if (output_port==NULL) {
     fprintf(stderr, "vjack_output: no more JACK ports available\n");
     return "no jack ports available";
   }
 
-  rb = NULL; 
+  rb = NULL;
 
   // set process callback and start
-  jack_set_process_callback (client, server_process, NULL);  
+  jack_set_process_callback(client, server_process, NULL);
 
   // and start the processing
-  if (jack_activate (client)) {
-    fprintf (stderr, "vjack_output: cannot activate client\n");
+  if (jack_activate(client)) {
+    fprintf(stderr, "vjack_output: cannot activate client\n");
     return "cannot activate client";
   }
 
   return NULL;
 }
 
-const char *version (void) {
+const char *version(void) {
   return plugin_version;
 }
 
-const char *get_description (void) {
+const char *get_description(void) {
   return "The vjack_output plugin allows sending frames to videojack.\nThis is an experimental plugin\n";
 }
 
-uint64_t get_capabilities (int palette) {
+uint64_t get_capabilities(int palette) {
   return 0;
 }
 
@@ -115,7 +115,7 @@
   return palette_list;
 }
 
-boolean set_palette (int palette) {
+boolean set_palette(int palette) {
   if (palette==WEED_PALETTE_RGBA32) {
     mypalette=palette;
     return TRUE;
@@ -124,31 +124,31 @@
   return FALSE;
 }
 
-boolean init_screen (int width, int height, boolean fullscreen, uint64_t window_id, int argc, char **argv) {
+boolean init_screen(int width, int height, boolean fullscreen, uint64_t window_id, int argc, char **argv) {
   jack_video_set_width_and_height(client,output_port,width,height);
   frame_size=width*height*4;
-  rb = jack_ringbuffer_create ( 16 * frame_size);
+  rb = jack_ringbuffer_create(16 * frame_size);
   return TRUE;
 }
 
-boolean render_frame (int hsize, int vsize, int64_t tc, void **pixel_data, void **return_data) {
+boolean render_frame(int hsize, int vsize, int64_t tc, void **pixel_data, void **return_data) {
   // hsize and vsize are in pixels (n-byte)
 
-  jack_ringbuffer_write (rb, pixel_data[0], frame_size);
+  jack_ringbuffer_write(rb, pixel_data[0], frame_size);
   return TRUE;
 }
 
-void exit_screen (int16_t mouse_x, int16_t mouse_y) {
+void exit_screen(int16_t mouse_x, int16_t mouse_y) {
   if (rb!=NULL) jack_ringbuffer_free(rb);
   rb=NULL;
 }
 
 void module_unload(void) {
-  if (jack_deactivate (client)) {
-    fprintf (stderr, "vjack_output error: cannot deactivate client\n");
+  if (jack_deactivate(client)) {
+    fprintf(stderr, "vjack_output error: cannot deactivate client\n");
   }
 
   // disconnect from vjack
-  jack_client_close (client);
+  jack_client_close(client);
   fprintf(stderr, "vjack_output: jack port unregistered\n");
 }

LiVES-2.2.8.tar.bz2/lives-plugins/plugins/playback/video/vloopback.c -> LiVES-2.4.1.tar.bz2/lives-plugins/plugins/playback/video/vloopback.c Changed

@@ -43,93 +43,87 @@
 //////////////////////////////////////////////
 
 
-static int file_filter( const struct dirent *a )
-{
-   int match = 0;
-   
-   // match: 'videoXY' where X = {0..9} and Y = {0..9}
-   if( !strncmp( a->d_name, "video", 5 ) )
-   {
-      if( strlen( a->d_name ) > 5 )
+static int file_filter(const struct dirent *a) {
+  int match = 0;
+
+  // match: 'videoXY' where X = {0..9} and Y = {0..9}
+  if (!strncmp(a->d_name, "video", 5)) {
+    if (strlen(a->d_name) > 5) {
+      if ((a->d_name[5] >= '0') && (a->d_name[5] <= '9'))      // match
+        // the 'X'
       {
-	 if( ( a->d_name[5] >= '0' ) && ( a->d_name[5] <= '9' ) ) // match
-							      // the 'X'
-	 {
-	    match = 1;
-	 }
-	 
-	 if( strlen( a->d_name ) > 6 )
-	 {
-	    match = 0;
-	    
-	    if( ( a->d_name[6] >= '0' ) && ( a->d_name[6] <= '9' ) )
-	    {
-	       match = 1;
-	    }
-	 }
-	 
-	 if( strlen( a->d_name ) > 7 )
-	 {
-	    match = 0;
-	 }
+        match = 1;
       }
-   }
-   
-   return match;
+
+      if (strlen(a->d_name) > 6) {
+        match = 0;
+
+        if ((a->d_name[6] >= '0') && (a->d_name[6] <= '9')) {
+          match = 1;
+        }
+      }
+
+      if (strlen(a->d_name) > 7) {
+        match = 0;
+      }
+    }
+  }
+
+  return match;
 }
 
 
 #define MAX_DEVICES 65
 
 static char **get_vloopback_devices(void) {
-   char devname[256];
-   struct dirent **namelist;
-   int n;
-   int fd;
-   int i=-1;
-   int ndevices=0;
-   struct video_capability v4lcap;
-   char **devnames=malloc(MAX_DEVICES * sizeof(char *));
-   
-   for (i=0;i<MAX_DEVICES;devnames[i++]=NULL);
-
-   n = scandir( "/dev", &namelist, file_filter, alphasort );
-   if( n < 0 ) return devnames;
-   
-    
-   for(i=0; i < n && ndevices < MAX_DEVICES-1; i++ ) {
-     sprintf( devname, "/dev/%s", namelist[i]->d_name );
-
-     if( ( fd = open( devname, O_RDONLY | O_NONBLOCK ) ) == -1 ) {
-       // could not open device
-       continue;
-     }
-      
-     if( ioctl( fd, VIDIOCGCAP, &v4lcap ) < 0 ) {
-       // not a video device
-       close( fd );
-       continue;
-     }
-
-     // is it vloopback ?
-     if (strstr(v4lcap.name,"loopback")==NULL) continue;
-
-      if( (v4lcap.type & VID_TYPE_CAPTURE ) ) {
-	// is an output device
-	close( fd );
-	continue;
-      }
-
-      close( fd );
-      devnames[ndevices++]=strdup(devname);
-      //fprintf(stderr,"got %s\n",devname);
-   }
-   devnames[ndevices]=NULL;
+  char devname[256];
+  struct dirent **namelist;
+  int n;
+  int fd;
+  int i=-1;
+  int ndevices=0;
+  struct video_capability v4lcap;
+  char **devnames=malloc(MAX_DEVICES * sizeof(char *));
+
+  for (i=0; i<MAX_DEVICES; devnames[i++]=NULL);
+
+  n = scandir("/dev", &namelist, file_filter, alphasort);
+  if (n < 0) return devnames;
+
+
+  for (i=0; i < n && ndevices < MAX_DEVICES-1; i++) {
+    sprintf(devname, "/dev/%s", namelist[i]->d_name);
+
+    if ((fd = open(devname, O_RDONLY | O_NONBLOCK)) == -1) {
+      // could not open device
+      continue;
+    }
+
+    if (ioctl(fd, VIDIOCGCAP, &v4lcap) < 0) {
+      // not a video device
+      close(fd);
+      continue;
+    }
+
+    // is it vloopback ?
+    if (strstr(v4lcap.name,"loopback")==NULL) continue;
+
+    if ((v4lcap.type & VID_TYPE_CAPTURE)) {
+      // is an output device
+      close(fd);
+      continue;
+    }
+
+    close(fd);
+    devnames[ndevices++]=strdup(devname);
+    //fprintf(stderr,"got %s\n",devname);
+  }
+  devnames[ndevices]=NULL;
 
-   for( i=0; i < n; free(namelist[i++]) );
-   free (namelist);
+  for (i=0; i < n; free(namelist[i++]));
+  free(namelist);
 
-   return devnames;
+  return devnames;
 }
 
 
@@ -145,28 +139,28 @@
     free(vdevs);
     return "No vloopback devices were found\nTry: sudo modprobe vloopback\n";
   }
-  
+
   while (vdevs[i]!=NULL) free(vdevs[i++]);
-  free( vdevs );
+  free(vdevs);
 
   return NULL;
 }
 
-const char *version (void) {
+const char *version(void) {
   return plugin_version;
 }
 
-const char *get_description (void) {
+const char *get_description(void) {
   return "The vloopback playback plugin makes LiVES appear as a video device in /dev.\n";
 }
 
-uint64_t get_capabilities (int palette) {
+uint64_t get_capabilities(int palette) {
   return 0;
 }
 
 const char rfx[32768];
 
-const char *get_init_rfx (void) {
+const char *get_init_rfx(void) {
   char **vdevs = get_vloopback_devices();
   char devstr[30000];
   size_t slen=0;
@@ -176,18 +170,18 @@
     free(vdevs);
     return "No vloopback devices were found\nTry: sudo modprobe vloopback\n";
   }
-  
-  memset( devstr, 0, 1 );
+
+  memset(devstr, 0, 1);
 
   while (vdevs[i]!=NULL) {
     snprintf(devstr+slen,30000-slen,"%s|",vdevs[i]);
     slen+=strlen(vdevs[i])+1;
     free(vdevs[i++]);
   }
-  free( vdevs );
+  free(vdevs);
 
   snprintf((char *)rfx,32768,"%s%s%s",
-	  "<define>\\n\
+           "<define>\\n\
 |1.7\\n\
 </define>\\n\
 <language_code>\\n\
@@ -195,15 +189,15 @@
 </language_code>\\n\
 <params> \\n\
 vdevname|Video _device|string_list|0|",
-	  devstr,
-	  "\\n\
+           devstr,
+           "\\n\
 </params> \\n\
 <param_window> \\n\
 </param_window> \\n\
 <onchange> \\n\
 </onchange> \\n\
 "
-	  );
+          );
 
   return rfx;
 
@@ -217,7 +211,7 @@
   return palette_list;
 }
 
-boolean set_palette (int palette) {
+boolean set_palette(int palette) {
   if (palette==WEED_PALETTE_UYVY) {
     mypalette=palette;
     return TRUE;
@@ -239,7 +233,7 @@
   return clampings;
 }
 
-boolean init_screen (int width, int height, boolean fullscreen, uint64_t window_id, int argc, char **argv) {
+boolean init_screen(int width, int height, boolean fullscreen, uint64_t window_id, int argc, char **argv) {
   int i=0,idx=0;
   char **vdevs;
 
@@ -250,52 +244,51 @@
   vdevs = get_vloopback_devices();
   if (vdevs[idx]!=NULL) {
     vdevname=strdup(vdevs[idx]);
-  }
-  else vdevname=NULL;
-  
+  } else vdevname=NULL;
+
   while (vdevs[i]!=NULL) free(vdevs[i++]);
-  free( vdevs );
+  free(vdevs);
 
   if (vdevname==NULL) return FALSE;
 
   vdevfd=open(vdevname, O_WRONLY);
 
   if (vdevfd==-1) {
-    fprintf (stderr, "vloopback output: cannot open %s %s\n",vdevname,strerror(errno));
+    fprintf(stderr, "vloopback output: cannot open %s %s\n",vdevname,strerror(errno));
     return FALSE;
   }
 
-  if( ioctl(vdevfd, VIDIOCGPICT, &x_vidpic) == -1) {
-    fprintf (stderr, "vloopback output: cannot get palette for %s\n",vdevname);
+  if (ioctl(vdevfd, VIDIOCGPICT, &x_vidpic) == -1) {
+    fprintf(stderr, "vloopback output: cannot get palette for %s\n",vdevname);
     return FALSE;
   }
 
   if (mypalette==WEED_PALETTE_RGB24) x_vidpic.palette=VIDEO_PALETTE_RGB24;
   else if (mypalette==WEED_PALETTE_UYVY) x_vidpic.palette=VIDEO_PALETTE_UYVY;
 
-  if( ioctl(vdevfd, VIDIOCSPICT, &x_vidpic) == -1) {
-    fprintf (stderr, "vloopback output: cannot set palette for %s\n",vdevname);
+  if (ioctl(vdevfd, VIDIOCSPICT, &x_vidpic) == -1) {
+    fprintf(stderr, "vloopback output: cannot set palette for %s\n",vdevname);
     return FALSE;
   }
 
 
-  if( ioctl(vdevfd, VIDIOCGWIN, &x_vidwin) == -1) {
-    fprintf (stderr, "vloopback output: cannot get dimensions for %s\n",vdevname);
+  if (ioctl(vdevfd, VIDIOCGWIN, &x_vidwin) == -1) {
+    fprintf(stderr, "vloopback output: cannot get dimensions for %s\n",vdevname);
     return FALSE;
   }
 
   x_vidwin.width=width;
   x_vidwin.height=height;
 
-  if( ioctl(vdevfd, VIDIOCSWIN, &x_vidwin) == -1) {
-    fprintf (stderr, "vloopback output: cannot set dimensions for %s\n",vdevname);
+  if (ioctl(vdevfd, VIDIOCSWIN, &x_vidwin) == -1) {
+    fprintf(stderr, "vloopback output: cannot set dimensions for %s\n",vdevname);
     return FALSE;
   }
   return TRUE;
 }
 
 
-boolean render_frame (int hsize, int vsize, int64_t tc, void **pixel_data, void **rd, void **pp) {
+boolean render_frame(int hsize, int vsize, int64_t tc, void **pixel_data, void **rd, void **pp) {
   // hsize and vsize are in [macro]pixels (n-byte)
   size_t frame_size,bytes;
 
@@ -305,14 +298,14 @@
   bytes=write(vdevfd,pixel_data[0],frame_size);
 
   if (bytes!=frame_size) {
-    fprintf (stderr, "Error writing frame to %s\n",vdevname);
+    fprintf(stderr, "Error writing frame to %s\n",vdevname);
     return FALSE;
   }
 
   return TRUE;
 }
 
-void exit_screen (int16_t mouse_x, int16_t mouse_y) {
+void exit_screen(int16_t mouse_x, int16_t mouse_y) {
   int xval=0;
   if (vdevfd!=-1) xval=close(vdevfd);
   if (vdevname!=NULL) free(vdevname);

LiVES-2.2.8.tar.bz2/lives-plugins/plugins/playback/video/vloopback2.c -> LiVES-2.4.1.tar.bz2/lives-plugins/plugins/playback/video/vloopback2.c Changed

@@ -43,92 +43,86 @@
 //////////////////////////////////////////////
 
 
-static int file_filter( const struct dirent *a )
-{
-   int match = 0;
-   
-   // match: 'videoXY' where X = {0..9} and Y = {0..9}
-   if( !strncmp( a->d_name, "video", 5 ) )
-   {
-      if( strlen( a->d_name ) > 5 )
+static int file_filter(const struct dirent *a) {
+  int match = 0;
+
+  // match: 'videoXY' where X = {0..9} and Y = {0..9}
+  if (!strncmp(a->d_name, "video", 5)) {
+    if (strlen(a->d_name) > 5) {
+      if ((a->d_name[5] >= '0') && (a->d_name[5] <= '9'))      // match
+        // the 'X'
       {
-	 if( ( a->d_name[5] >= '0' ) && ( a->d_name[5] <= '9' ) ) // match
-							      // the 'X'
-	 {
-	    match = 1;
-	 }
-	 
-	 if( strlen( a->d_name ) > 6 )
-	 {
-	    match = 0;
-	    
-	    if( ( a->d_name[6] >= '0' ) && ( a->d_name[6] <= '9' ) )
-	    {
-	       match = 1;
-	    }
-	 }
-	 
-	 if( strlen( a->d_name ) > 7 )
-	 {
-	    match = 0;
-	 }
+        match = 1;
       }
-   }
-   
-   return match;
+
+      if (strlen(a->d_name) > 6) {
+        match = 0;
+
+        if ((a->d_name[6] >= '0') && (a->d_name[6] <= '9')) {
+          match = 1;
+        }
+      }
+
+      if (strlen(a->d_name) > 7) {
+        match = 0;
+      }
+    }
+  }
+
+  return match;
 }
 
 
 #define MAX_DEVICES 65
 
 static char **get_vloopback2_devices(void) {
-   char devname[256];
-   struct dirent **namelist;
-   int n;
-   int fd;
-   int i=-1;
-   int ndevices=0;
-
-   struct v4l2_capability vid_caps;
-
-   char **devnames=malloc(MAX_DEVICES * sizeof(char *));
-   
-   for (i=0;i<MAX_DEVICES;devnames[i++]=NULL);
-
-   n = scandir( "/dev", &namelist, file_filter, alphasort );
-   if( n < 0 ) return devnames;
-   
-    
-   for(i=0; i < n && ndevices < MAX_DEVICES-1; i++ ) {
-     sprintf( devname, "/dev/%s", namelist[i]->d_name );
-
-     if( ( fd = open( devname, O_RDWR | O_NONBLOCK ) ) == -1 ) {
-       // could not open device
-       continue;
-     }
-      
-     if( ioctl( fd, VIDIOC_QUERYCAP, &vid_caps ) < 0 ) {
-       // not a video device
-       close( fd );
-       continue;
-     }
-
-     if( !(vid_caps.capabilities & V4L2_CAP_VIDEO_OUTPUT ) ) {
-       // is not an output device
-       close( fd );
-       continue;
-      }
-     
-     close( fd );
-     devnames[ndevices++]=strdup(devname);
-     //fprintf(stderr,"got %s\n",devname);
-   }
-   devnames[ndevices]=NULL;
+  char devname[256];
+  struct dirent **namelist;
+  int n;
+  int fd;
+  int i=-1;
+  int ndevices=0;
+
+  struct v4l2_capability vid_caps;
+
+  char **devnames=malloc(MAX_DEVICES * sizeof(char *));
 
-   for( i=0; i < n; free(namelist[i++]) );
-   free (namelist);
+  for (i=0; i<MAX_DEVICES; devnames[i++]=NULL);
 
-   return devnames;
+  n = scandir("/dev", &namelist, file_filter, alphasort);
+  if (n < 0) return devnames;
+
+
+  for (i=0; i < n && ndevices < MAX_DEVICES-1; i++) {
+    sprintf(devname, "/dev/%s", namelist[i]->d_name);
+
+    if ((fd = open(devname, O_RDWR | O_NONBLOCK)) == -1) {
+      // could not open device
+      continue;
+    }
+
+    if (ioctl(fd, VIDIOC_QUERYCAP, &vid_caps) < 0) {
+      // not a video device
+      close(fd);
+      continue;
+    }
+
+    if (!(vid_caps.capabilities & V4L2_CAP_VIDEO_OUTPUT)) {
+      // is not an output device
+      close(fd);
+      continue;
+    }
+
+    close(fd);
+    devnames[ndevices++]=strdup(devname);
+    //fprintf(stderr,"got %s\n",devname);
+  }
+  devnames[ndevices]=NULL;
+
+  for (i=0; i < n; free(namelist[i++]));
+  free(namelist);
+
+  return devnames;
 }
 
 
@@ -150,9 +144,9 @@
     free(vdevs);
     return "No vloopback2 devices were found\nInstall vloopback2 and then try: sudo modprobe v4l2loopback\nAlso check the device permissions for /dev/video*.\n";
   }
-  
+
   while (vdevs[i]!=NULL) free(vdevs[i++]);
-  free( vdevs );
+  free(vdevs);
 
   // get tempdir
   dummyvar=system("smogrify get_tempdir oggstream");
@@ -168,15 +162,15 @@
   return NULL;
 }
 
-const char *version (void) {
+const char *version(void) {
   return plugin_version;
 }
 
-const char *get_description (void) {
+const char *get_description(void) {
   return "The vloopback2 playback plugin makes LiVES appear as a video device in /dev.\nIt requires the vloopback2 kernel module which can be downloaded from\nhttps://github.com/umlaeute/v4l2loopback\n";
 }
 
-uint64_t get_capabilities (int palette) {
+uint64_t get_capabilities(int palette) {
   return 0;
 }
 
@@ -192,7 +186,7 @@
 const char rfx[32768];
 
 
-const char *get_init_rfx (void) {
+const char *get_init_rfx(void) {
   char **vdevs = get_vloopback2_devices();
   char devstr[30000];
   size_t slen=0;
@@ -202,18 +196,18 @@
     free(vdevs);
     return "No vloopback2 devices were found\nInstall vloopback2 and then try: sudo modprobe webcamstudio\nAlso check the device permissions.\n";
   }
-  
-  memset( devstr, 0, 1 );
+
+  memset(devstr, 0, 1);
 
   while (vdevs[i]!=NULL) {
     snprintf(devstr+slen,30000-slen,"%s|",vdevs[i]);
     slen+=strlen(vdevs[i])+1;
     free(vdevs[i++]);
   }
-  free( vdevs );
+  free(vdevs);
 
   snprintf((char *)rfx,32768,"%s%s%s",
-	  "<define>\\n\
+           "<define>\\n\
 |1.7\\n\
 </define>\\n\
 <language_code>\\n\
@@ -221,8 +215,8 @@
 </language_code>\\n\
 <params> \\n\
 vdevname|Video _device|string_list|0|",
-	  devstr,
-	  "\\n\
+           devstr,
+           "\\n\
 afname|Send _audio to|string|/tmp/audio.wav|1024|\\n\
 </params> \\n\
 <param_window> \\n\
@@ -230,7 +224,7 @@
 <onchange> \\n\
 </onchange> \\n\
 "
-	  );
+          );
 
   return rfx;
 
@@ -246,7 +240,7 @@
 }
 
 
-boolean set_palette (int palette) {
+boolean set_palette(int palette) {
   if (palette==WEED_PALETTE_UYVY) {
     mypalette=palette;
     return TRUE;
@@ -284,7 +278,7 @@
 }
 
 
-boolean init_screen (int width, int height, boolean fullscreen, uint64_t window_id, int argc, char **argv) {
+boolean init_screen(int width, int height, boolean fullscreen, uint64_t window_id, int argc, char **argv) {
   // width in pixels
 
   int i=0,idx=0,ret_code;
@@ -311,25 +305,24 @@
   vdevs = get_vloopback2_devices();
   if (vdevs[idx]!=NULL) {
     vdevname=strdup(vdevs[idx]);
-  }
-  else vdevname=NULL;
-  
+  } else vdevname=NULL;
+
   while (vdevs[i]!=NULL) free(vdevs[i++]);
-  free( vdevs );
+  free(vdevs);
 
   if (vdevname==NULL) return FALSE;
 
   vdevfd=open(vdevname, O_WRONLY);
 
   if (vdevfd==-1) {
-    fprintf (stderr, "vloopback2 output: cannot open %s %s\n",vdevname,strerror(errno));
+    fprintf(stderr, "vloopback2 output: cannot open %s %s\n",vdevname,strerror(errno));
     return FALSE;
   }
 
   ret_code = ioctl(vdevfd, VIDIOC_QUERYCAP, &vid_caps);
 
   if (ret_code) {
-    fprintf (stderr, "vloopback2 output: cannot ioct failed for %s\n",vdevname);
+    fprintf(stderr, "vloopback2 output: cannot ioct failed for %s\n",vdevname);
     return FALSE;
   }
 
@@ -338,7 +331,7 @@
   vid_format.fmt.pix.width = width;
   vid_format.fmt.pix.height = height;
 
-  switch(mypalette){
+  switch (mypalette) {
   case WEED_PALETTE_RGB24:
     vid_format.fmt.pix.pixelformat = V4L2_PIX_FMT_RGB24;
     vid_format.fmt.pix.bytesperline = width *3;
@@ -355,20 +348,19 @@
     vid_format.fmt.pix.sizeimage = width*height*2;
     break;
   }
-  
+
   vid_format.fmt.pix.field = V4L2_FIELD_NONE;
   vid_format.fmt.pix.priv = 0;
 
   if (mypalette==WEED_PALETTE_UYVY) {
-    if (mysubspace==WEED_YUV_SUBSPACE_BT709) 
+    if (mysubspace==WEED_YUV_SUBSPACE_BT709)
       vid_format.fmt.pix.colorspace = V4L2_COLORSPACE_REC709;
     else {
-      if (myclamp==WEED_YUV_CLAMPING_UNCLAMPED) 
-	vid_format.fmt.pix.colorspace = V4L2_COLORSPACE_SMPTE170M; 
+      if (myclamp==WEED_YUV_CLAMPING_UNCLAMPED)
+        vid_format.fmt.pix.colorspace = V4L2_COLORSPACE_SMPTE170M;
       else vid_format.fmt.pix.colorspace = V4L2_COLORSPACE_JPEG;
     }
-  }
-  else vid_format.fmt.pix.colorspace = V4L2_COLORSPACE_SRGB;
+  } else vid_format.fmt.pix.colorspace = V4L2_COLORSPACE_SRGB;
 
   ret_code = ioctl(vdevfd, VIDIOC_S_FMT, &vid_format);
 
@@ -380,7 +372,7 @@
       audio=1;
       close(afd);
     }
-    
+
     if (audio) {
       snprintf(cmd,8192,"/bin/cat %s > \"%s\" &",xfile,audfile);
       dummyvar=system(cmd);
@@ -392,25 +384,25 @@
 
 
 
-boolean render_frame (int hsize, int vsize, int64_t tc, void **pixel_data, void **rd, void **pp) {
+boolean render_frame(int hsize, int vsize, int64_t tc, void **pixel_data, void **rd, void **pp) {
   // hsize and vsize are in [macro]pixels (n-byte)
   size_t frame_size,bytes;
 
-  if (mypalette==WEED_PALETTE_RGB24||mypalette==WEED_PALETTE_BGR24) 
+  if (mypalette==WEED_PALETTE_RGB24||mypalette==WEED_PALETTE_BGR24)
     frame_size=hsize*vsize*3;
   else frame_size=hsize*vsize*4;
 
   bytes=write(vdevfd,pixel_data[0],frame_size);
 
   if (bytes!=frame_size) {
-    fprintf (stderr, "Error %s writing frame to %s\n",strerror(errno),vdevname);
+    fprintf(stderr, "Error %s writing frame to %s\n",strerror(errno),vdevname);
     return FALSE;
   }
 
   return TRUE;
 }
 
-void exit_screen (int16_t mouse_x, int16_t mouse_y) {
+void exit_screen(int16_t mouse_x, int16_t mouse_y) {
   int xval=0;
   if (vdevfd!=-1) xval=close(vdevfd);
   if (vdevname!=NULL) free(vdevname);

LiVES-2.2.8.tar.bz2/lives-plugins/plugins/playback/video/yuv4mpeg_stream.c -> LiVES-2.4.1.tar.bz2/lives-plugins/plugins/playback/video/yuv4mpeg_stream.c Changed

@@ -14,9 +14,9 @@
 
 static char plugin_version[64]="LiVES yuv4mpeg playback engine version 1.1";
 
-static boolean (*render_fn)(int hsize, int vsize, void **pixel_data);
-boolean render_frame_yuv420 (int hsize, int vsize, void **pixel_data);
-boolean render_frame_unknown (int hsize, int vsize, void **pixel_data);
+static boolean(*render_fn)(int hsize, int vsize, void **pixel_data);
+boolean render_frame_yuv420(int hsize, int vsize, void **pixel_data);
+boolean render_frame_unknown(int hsize, int vsize, void **pixel_data);
 
 static int ov_vsize,ov_hsize;
 
@@ -40,13 +40,13 @@
 
 static yuv4m_t *yuv4mpeg;
 
-yuv4m_t *yuv4mpeg_alloc (void) {
-  yuv4m_t *yuv4mpeg = (yuv4m_t *) malloc (sizeof(yuv4m_t));
-  if(!yuv4mpeg) return NULL;
+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;
-  y4m_init_stream_info (&(yuv4mpeg->streaminfo));
-  y4m_init_frame_info (&(yuv4mpeg->frameinfo));
+  y4m_init_stream_info(&(yuv4mpeg->streaminfo));
+  y4m_init_frame_info(&(yuv4mpeg->frameinfo));
   return yuv4mpeg;
 }
 
@@ -63,11 +63,11 @@
 }
 
 
-const char *version (void) {
+const char *version(void) {
   return plugin_version;
 }
 
-const char *get_description (void) {
+const char *get_description(void) {
   return "The yuvmpeg_stream plugin allows streaming in yuv4mpeg format.\nOutput is on stdout, so it can be piped into another application.\n";
 }
 
@@ -78,7 +78,7 @@
 }
 
 
-uint64_t get_capabilities (int palette) {
+uint64_t get_capabilities(int palette) {
   return 0;
 }
 
@@ -88,13 +88,12 @@
     clampings[0]=WEED_YUV_CLAMPING_UNCLAMPED;
     clampings[1]=WEED_YUV_CLAMPING_CLAMPED;
     clampings[2]=-1;
-  }
-  else clampings[0]=-1;
+  } else clampings[0]=-1;
   return clampings;
 }
 
 
-boolean set_palette (int palette) {
+boolean set_palette(int palette) {
   if (!yuv4mpeg) return FALSE;
   if (palette==WEED_PALETTE_YUV420P) {
     mypalette=palette;
@@ -105,12 +104,12 @@
   return FALSE;
 }
 
-const char * get_fps_list (int palette) {
+const char *get_fps_list(int palette) {
   return "24|24000:1001|25|30000:1001|30|60";
 }
 
 
-boolean set_fps (double in_fps) {
+boolean set_fps(double in_fps) {
   if (in_fps>23.97599&&in_fps<23.9761) {
     yuv4mpeg->fps=y4m_fps_NTSC_FILM;
     return TRUE;
@@ -124,7 +123,7 @@
   return TRUE;
 }
 
-boolean init_screen (int width, int height, boolean fullscreen, uint64_t window_id, int argc, char **argv) {
+boolean init_screen(int width, int height, boolean fullscreen, uint64_t window_id, int argc, char **argv) {
   if (mypalette==WEED_PALETTE_END) {
     fprintf(stderr,"yuv4mpeg_stream plugin error: No palette was set !\n");
     return FALSE;
@@ -132,27 +131,27 @@
 
   y4m_si_set_framerate(&(yuv4mpeg->streaminfo),yuv4mpeg->fps);
   y4m_si_set_interlace(&(yuv4mpeg->streaminfo), Y4M_ILACE_NONE);
-  
+
   //y4m_log_stream_info(LOG_INFO, "lives-yuv4mpeg", &(yuv4mpeg->streaminfo));
   return TRUE;
 }
 
 
-boolean render_frame (int hsize, int vsize, int64_t tc, void **pixel_data, void **rd, void **pp) {
+boolean render_frame(int hsize, int vsize, int64_t tc, void **pixel_data, void **rd, void **pp) {
   // call the function which was set in set_palette
-  return render_fn (hsize,vsize,pixel_data);
+  return render_fn(hsize,vsize,pixel_data);
 }
 
-boolean render_frame_yuv420 (int hsize, int vsize, void **pixel_data) {
+boolean render_frame_yuv420(int hsize, int vsize, void **pixel_data) {
   int i;
 
   if ((ov_hsize!=hsize||ov_vsize!=vsize)) {
     //start new stream
     y4m_si_set_width(&(yuv4mpeg->streaminfo), hsize);
     y4m_si_set_height(&(yuv4mpeg->streaminfo), vsize);
-    
+
     y4m_si_set_sampleaspect(&(yuv4mpeg->streaminfo), yuv4mpeg->sar);
-    
+
     i = y4m_write_stream_header(1, &(yuv4mpeg->streaminfo));
 
     if (i != Y4M_OK) return FALSE;
@@ -162,20 +161,20 @@
   }
 
   i = y4m_write_frame(1, &(yuv4mpeg->streaminfo),
-  		&(yuv4mpeg->frameinfo), (uint8_t **)pixel_data);
+                      &(yuv4mpeg->frameinfo), (uint8_t **)pixel_data);
   if (i != Y4M_OK) return FALSE;
 
   return TRUE;
 }
 
-boolean render_frame_unknown (int hsize, int vsize, void **pixel_data) {
+boolean render_frame_unknown(int hsize, int vsize, void **pixel_data) {
   if (mypalette==WEED_PALETTE_END) {
     fprintf(stderr,"yuv4mpeg_stream plugin error: No palette was set !\n");
   }
   return FALSE;
 }
 
-void exit_screen (int16_t mouse_x, int16_t mouse_y) {
+void exit_screen(int16_t mouse_x, int16_t mouse_y) {
   y4m_fini_stream_info(&(yuv4mpeg->streaminfo));
   y4m_fini_frame_info(&(yuv4mpeg->frameinfo));
 }
@@ -183,7 +182,7 @@
 
 void module_unload(void) {
   if (yuv4mpeg!=NULL) {
-    free (yuv4mpeg);
+    free(yuv4mpeg);
   }
 }

LiVES-2.2.8.tar.bz2/lives-plugins/weed-plugins/RGBdelay.c -> LiVES-2.4.1.tar.bz2/lives-plugins/weed-plugins/RGBdelay.c Changed

@@ -21,7 +21,7 @@
 ///////////////////////////////////////////////////////////////////
 
 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 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
 
@@ -68,7 +68,7 @@
     return WEED_ERROR_MEMORY_ALLOCATION;
   }
 
-  for (i=0;i<ncache;i++) {
+  for (i=0; i<ncache; i++) {
     sdata->is_bgr[i]=0;
   }
 
@@ -81,10 +81,10 @@
     return WEED_ERROR_MEMORY_ALLOCATION;
   }
 
-  for (i=0;i<ncache;i++) {
+  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]);
+      for (--i; i>=0; i--) weed_free(sdata->cache[i]);
       weed_free(sdata->cache);
       weed_free(sdata->is_bgr);
       weed_free(sdata);
@@ -98,7 +98,7 @@
 
   ncache*=4;
 
-  for (i=0;i<205;i++) {
+  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);
@@ -113,9 +113,10 @@
 
 
 
-int RGBd_process (weed_plant_t *inst, weed_timecode_t timestamp) {
+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_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;
@@ -134,7 +135,7 @@
   int inplace=(src==dst);
   int b1,b2,b3;
 
-  for (i=sdata->ccache;i>0;i--) {
+  for (i=sdata->ccache; i>0; i--) {
     if (i==sdata->tcache) continue;
 
     if (i==sdata->tcache-1||i==sdata->ccache) {
@@ -147,7 +148,7 @@
     // 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);
+        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);
     }
 
@@ -156,10 +157,10 @@
 
     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);
+        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
@@ -169,8 +170,7 @@
     sdata->is_bgr[0]=1;
     a=3;
     c=1;
-  }
-  else sdata->is_bgr[0]=0;
+  } else sdata->is_bgr[0]=0;
 
   sdata->ccache+=(sdata->ccache < sdata->tcache);
 
@@ -205,18 +205,18 @@
     cstrb=cstr/tstrb;
     cstrc=cstr/tstrc;
 
-    for (;src<end;src+=irowstride) {
+    for (; src<end; src+=irowstride) {
 
       weed_memcpy(sdata->cache[0]+x,src,width);
 
-      for (i=0;i<width;i+=3) {
-	if (b1==WEED_TRUE) dst[i]=((double)src[i]*cstra+.5);
-	else if (inplace) dst[i]=0;
-	if (b2==WEED_TRUE) dst[i+1]=((double)src[i+1]*cstrb+.5);
-	else if (inplace) dst[i+1]=0;
-	if (b3==WEED_TRUE) dst[i+2]=((double)src[i+2]*cstrc+.5);
-	else if (inplace) dst[i+2]=0;
-	
+      for (i=0; i<width; i+=3) {
+        if (b1==WEED_TRUE) dst[i]=((double)src[i]*cstra+.5);
+        else if (inplace) dst[i]=0;
+        if (b2==WEED_TRUE) dst[i+1]=((double)src[i+1]*cstrb+.5);
+        else if (inplace) dst[i+1]=0;
+        if (b3==WEED_TRUE) dst[i+2]=((double)src[i+2]*cstrc+.5);
+        else if (inplace) dst[i+2]=0;
+
       }
       x+=width;
       dst+=orowstride;
@@ -227,7 +227,7 @@
   }
 
 
-  for (j=1;j<sdata->ccache;j++) {
+  for (j=1; j<sdata->ccache; j++) {
     // maybe overlay something from j frames ago
 
     a+=4;
@@ -237,7 +237,7 @@
     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_FALSE&&b2==WEED_FALSE&&b3==WEED_FALSE)
       continue;
 
@@ -256,11 +256,11 @@
       cstra=cstr/tstrc;
     }
 
-    for (;src<end;src+=irowstride) {
-      for (i=0;i<width;i+=3) {
-	if (b1==WEED_TRUE) dst[i]+=((double)sdata->cache[j][x+(crossed?(i+2):i)]*cstra+.5);
-	if (b2==WEED_TRUE) dst[i+1]+=((double)sdata->cache[j][x+i+1]*cstrb+.5);
-	if (b3==WEED_TRUE) dst[i+2]+=((double)sdata->cache[j][x+(crossed?i:(i+2))]*cstrc+.5);
+    for (; src<end; src+=irowstride) {
+      for (i=0; i<width; i+=3) {
+        if (b1==WEED_TRUE) dst[i]+=((double)sdata->cache[j][x+(crossed?(i+2):i)]*cstra+.5);
+        if (b2==WEED_TRUE) dst[i+1]+=((double)sdata->cache[j][x+i+1]*cstrb+.5);
+        if (b3==WEED_TRUE) dst[i+2]+=((double)sdata->cache[j][x+(crossed?i:(i+2))]*cstrc+.5);
       }
       x+=width;
       dst+=orowstride;
@@ -280,7 +280,7 @@
 
   if (sdata!=NULL) {
     if (sdata->cache!=NULL) {
-      for (i=0;i<sdata->tcache;i++) weed_free(sdata->cache[i]);
+      for (i=0; i<sdata->tcache; i++) weed_free(sdata->cache[i]);
       weed_free(sdata->cache);
     }
 
@@ -292,18 +292,18 @@
 }
 
 
-weed_plant_t *weed_setup (weed_bootstrap_f weed_boot) {
+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 **clone;
 
   if (plugin_info!=NULL) {
-    int palette_list[]={WEED_PALETTE_BGR24,WEED_PALETTE_RGB24,WEED_PALETTE_END};
-    int palette_list2[]={WEED_PALETTE_YUV888,WEED_PALETTE_END};
+    int palette_list[]= {WEED_PALETTE_BGR24,WEED_PALETTE_RGB24,WEED_PALETTE_END};
+    int palette_list2[]= {WEED_PALETTE_YUV888,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_chantmpls2[]={weed_channel_template_init("in channel 0",WEED_CHANNEL_REINIT_ON_SIZE_CHANGE,palette_list2),NULL};
-    weed_plant_t *out_chantmpls2[]={weed_channel_template_init("out channel 0",WEED_CHANNEL_CAN_DO_INPLACE,palette_list2),NULL};
+    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_chantmpls2[]= {weed_channel_template_init("in channel 0",WEED_CHANNEL_REINIT_ON_SIZE_CHANGE,palette_list2),NULL};
+    weed_plant_t *out_chantmpls2[]= {weed_channel_template_init("out channel 0",WEED_CHANNEL_CAN_DO_INPLACE,palette_list2),NULL};
     weed_plant_t *filter_class,*gui;
 
     weed_plant_t *in_params[206];
@@ -314,36 +314,37 @@
     in_params[0]=weed_integer_init("fcsize","Frame _Cache Size",20,0,50);
     weed_set_int_value(in_params[0],"flags",WEED_PARAMETER_REINIT_ON_VALUE_CHANGE);
 
-    for (i=1;i<205;i+=4) {
-      for (j=0;j<3;j++) {
-	if (j==2) snprintf(label,256,"        Frame -%-2d       ",(i-1)/4);
-	else weed_memset(label,0,1);
-	in_params[i+j]=weed_switch_init("",label,i<4?WEED_TRUE:WEED_FALSE);
+    for (i=1; i<205; i+=4) {
+      for (j=0; j<3; j++) {
+        if (j==2) snprintf(label,256,"        Frame -%-2d       ",(i-1)/4);
+        else weed_memset(label,0,1);
+        in_params[i+j]=weed_switch_init("",label,i<4?WEED_TRUE:WEED_FALSE);
       }
       in_params[i+j]=weed_float_init("","",1.,0.,1.);
 
       if (i>=80) {
-	gui=weed_parameter_template_get_gui(in_params[i]);
-	weed_set_boolean_value(gui,"hidden",WEED_TRUE);
-	gui=weed_parameter_template_get_gui(in_params[i+1]);
-	weed_set_boolean_value(gui,"hidden",WEED_TRUE);
-	gui=weed_parameter_template_get_gui(in_params[i+2]);
-	weed_set_boolean_value(gui,"hidden",WEED_TRUE);
-	gui=weed_parameter_template_get_gui(in_params[i+3]);
-	weed_set_boolean_value(gui,"hidden",WEED_TRUE);
+        gui=weed_parameter_template_get_gui(in_params[i]);
+        weed_set_boolean_value(gui,"hidden",WEED_TRUE);
+        gui=weed_parameter_template_get_gui(in_params[i+1]);
+        weed_set_boolean_value(gui,"hidden",WEED_TRUE);
+        gui=weed_parameter_template_get_gui(in_params[i+2]);
+        weed_set_boolean_value(gui,"hidden",WEED_TRUE);
+        gui=weed_parameter_template_get_gui(in_params[i+3]);
+        weed_set_boolean_value(gui,"hidden",WEED_TRUE);
       }
     }
 
     in_params[205]=NULL;
 
-    filter_class=weed_filter_class_init("RGBdelay","salsaman",1,0,&RGBd_init,&RGBd_process,&RGBd_deinit,in_chantmpls,out_chantmpls,in_params,NULL);
+    filter_class=weed_filter_class_init("RGBdelay","salsaman",1,0,&RGBd_init,&RGBd_process,&RGBd_deinit,in_chantmpls,out_chantmpls,in_params,
+                                        NULL);
 
     gui=weed_filter_class_get_gui(filter_class);
     rfx_strings[0]="layout|p0";
     rfx_strings[1]="layout|hseparator|";
     rfx_strings[2]="layout|\"  R\"|\"         G \"|\"         B \"|fill|\"Blend Strength\"|fill|";
 
-    for(i=3;i<54;i++) {
+    for (i=3; i<54; i++) {
       rfx_strings[i]=weed_malloc(1024);
       snprintf(rfx_strings[i],1024,"layout|p%d|p%d|p%d|p%d|",(i-3)*4+1,(i-3)*4+2,(i-3)*4+3,(i-2)*4);
     }
@@ -352,12 +353,13 @@
     weed_set_string_value(gui,"rfx_delim","|");
     weed_set_string_array(gui,"rfx_strings",54,rfx_strings);
 
-    weed_plugin_info_add_filter_class (plugin_info,filter_class);
+    weed_plugin_info_add_filter_class(plugin_info,filter_class);
 
 
     rfx_strings[2]="layout|\"  Y\"|\"         U \"|\"         V \"|fill|\"Blend Strength\"|fill|";
 
-    filter_class=weed_filter_class_init("YUVdelay","salsaman",1,0,&RGBd_init,&RGBd_process,&RGBd_deinit,in_chantmpls2,out_chantmpls2,(clone=weed_clone_plants(in_params)),NULL);
+    filter_class=weed_filter_class_init("YUVdelay","salsaman",1,0,&RGBd_init,&RGBd_process,&RGBd_deinit,in_chantmpls2,out_chantmpls2,
+                                        (clone=weed_clone_plants(in_params)),NULL);
     weed_free(clone);
 
     gui=weed_filter_class_get_gui(filter_class);
@@ -365,9 +367,9 @@
     weed_set_string_value(gui,"rfx_delim","|");
     weed_set_string_array(gui,"rfx_strings",54,rfx_strings);
 
-    weed_plugin_info_add_filter_class (plugin_info,filter_class);
+    weed_plugin_info_add_filter_class(plugin_info,filter_class);
 
-    for(i=3;i<54;i++) weed_free(rfx_strings[i]);
+    for (i=3; i<54; i++) weed_free(rfx_strings[i]);
 
     weed_set_int_value(plugin_info,"version",package_version);
   }

LiVES-2.2.8.tar.bz2/lives-plugins/weed-plugins/alien_overlay.c -> LiVES-2.4.1.tar.bz2/lives-plugins/weed-plugins/alien_overlay.c Changed

LiVES-2.2.8.tar.bz2/lives-plugins/weed-plugins/alpha_means.c -> LiVES-2.4.1.tar.bz2/lives-plugins/weed-plugins/alpha_means.c Changed

LiVES-2.2.8.tar.bz2/lives-plugins/weed-plugins/audio_fft.c -> LiVES-2.4.1.tar.bz2/lives-plugins/weed-plugins/audio_fft.c Changed

LiVES-2.2.8.tar.bz2/lives-plugins/weed-plugins/audio_transition.c -> LiVES-2.4.1.tar.bz2/lives-plugins/weed-plugins/audio_transition.c Changed

LiVES-2.2.8.tar.bz2/lives-plugins/weed-plugins/audio_volume.c -> LiVES-2.4.1.tar.bz2/lives-plugins/weed-plugins/audio_volume.c Changed

LiVES-2.2.8.tar.bz2/lives-plugins/weed-plugins/beat_detector.c -> LiVES-2.4.1.tar.bz2/lives-plugins/weed-plugins/beat_detector.c Changed

@@ -17,7 +17,7 @@
 ///////////////////////////////////////////////////////////////////
 
 static int num_versions=1; // number of different weed api versions supported
-static int api_versions[]={131}; // array of weed api versions supported in plugin, in order of preference (most preferred first)
+static int api_versions[]= {131}; // array of weed api versions supported in plugin, in order of preference (most preferred first)
 
 static int package_version=1; // version of this package
 
@@ -53,15 +53,16 @@
 
 static size_t sizf=sizeof(float);
 
-float freq[NSLICES]={25.,50.,75.,100.,150.,200.,250.,300.,
-		     400.,500.,600.,
-		     700.,800.,900.,1000.,1100.,1200.,1300.,1400.,
-		     1600.,1800.,2000.,2200.,2400.,2600.,2800.,3000.,
-		     3200.,3600.,4000.,4400.,4800,5200.,5600.,6000.,
-		     6400.,6800.,
-		     7400.,8000.,8600.,9200.,9800.,10400.,11000.,11600.,
-		     12400.,13200,14000.,14800.,15600.,16400.,17600.,18800.,
-		     20000.};
+float freq[NSLICES]= {25.,50.,75.,100.,150.,200.,250.,300.,
+                      400.,500.,600.,
+                      700.,800.,900.,1000.,1100.,1200.,1300.,1400.,
+                      1600.,1800.,2000.,2200.,2400.,2600.,2800.,3000.,
+                      3200.,3600.,4000.,4400.,4800,5200.,5600.,6000.,
+                      6400.,6800.,
+                      7400.,8000.,8600.,9200.,9800.,10400.,11000.,11600.,
+                      12400.,13200,14000.,14800.,15600.,16400.,17600.,18800.,
+                      20000.
+                     };
 
 
 #define MAXPLANS 18
@@ -88,7 +89,7 @@
   // return 2**(i+1)
   register int j,x=2;
 
-  for (j=0;j<i;j++) x*=2;
+  for (j=0; j<i; j++) x*=2;
 
   return x;
 }
@@ -97,20 +98,20 @@
 static int create_plans(void) {
   register int i,nsamps;
 
-  for (i=0;i<MAXPLANS;i++) {
+  for (i=0; i<MAXPLANS; i++) {
     // create fftw plan
     nsamps=twopow(i);
 
-    ins[i] = (float*) fftwf_malloc(nsamps*sizeof(float));
+    ins[i] = (float *) fftwf_malloc(nsamps*sizeof(float));
     if (ins[i]==NULL) {
       return WEED_ERROR_MEMORY_ALLOCATION;
     }
-    
-    outs[i] = (fftwf_complex*) fftwf_malloc(nsamps*sizeof(fftwf_complex));
+
+    outs[i] = (fftwf_complex *) fftwf_malloc(nsamps*sizeof(fftwf_complex));
     if (outs[i]==NULL) {
       return WEED_ERROR_MEMORY_ALLOCATION;
     }
-    
+
     plans[i] = fftwf_plan_dft_r2c_1d(nsamps, ins[i], outs[i], i<13?FFTW_MEASURE:FFTW_ESTIMATE);
   }
   return WEED_NO_ERROR;
@@ -129,14 +130,14 @@
     return WEED_ERROR_MEMORY_ALLOCATION;
   }
 
-  for (i=0;i<NSLICES;i++) {
+  for (i=0; i<NSLICES; i++) {
     sdata->av[i]=0.;
-     for (j=0;j<BUFMAX;j++) {
+    for (j=0; j<BUFMAX; j++) {
       sdata->buf[i][j]=0.;
     }
   }
 
-  for (j=0;j<BUFMAX;j++) {
+  for (j=0; j<BUFMAX; j++) {
     sdata->bufsize[j]=0;
   }
 
@@ -165,7 +166,7 @@
 
 
 
-int beat_process (weed_plant_t *inst, weed_timecode_t timestamp) {
+int beat_process(weed_plant_t *inst, weed_timecode_t timestamp) {
   int error;
   int chans,nsamps,onsamps,base,inter,rate,k;
 
@@ -207,7 +208,7 @@
 
 
   rate=weed_get_int_value(in_channel,"audio_rate",&error);
-    
+
   chans=weed_get_int_value(in_channel,"audio_channels",&error);
   inter=weed_get_boolean_value(in_channel,"audio_interleaf",&error);
 
@@ -216,18 +217,17 @@
     sdata->totsamps-=sdata->bufsize[0];
     // shift all values up
 
-    for (i=0;i<NSLICES;i++) {
+    for (i=0; i<NSLICES; i++) {
       sdata->av[i]=0.;
 
-      for (j=0;j<sdata->bufidx;j++) {
-	sdata->buf[i][j]=sdata->buf[i][j+1];
-	if (sdata->buf[i][j]!=-1.) sdata->av[i]+=(double)sdata->buf[i][j];
+      for (j=0; j<sdata->bufidx; j++) {
+        sdata->buf[i][j]=sdata->buf[i][j+1];
+        if (sdata->buf[i][j]!=-1.) sdata->av[i]+=(double)sdata->buf[i][j];
       }
     }
 
     has_data=WEED_TRUE;
-  }
-  else {
+  } else {
     sdata->bufidx++;
     if (sdata->bufidx==BUFMAX) {
       //fprintf(stderr,"OVERFLOW\n");
@@ -238,54 +238,51 @@
   sdata->totsamps+=onsamps;
   sdata->bufsize[sdata->bufidx]=onsamps;
 
-  for (s=0;s<NSLICES;s++) {
+  for (s=0; s<NSLICES; s++) {
     sdata->buf[s][sdata->bufidx]=0.;
   }
 
   base=rndlog2(onsamps);
   nsamps=twopow(base);
 
-  for (i=0;i<chans;i++) {
+  for (i=0; i<chans; i++) {
     // do transform for each channel
-      
+
     // copy in data to sdata->in
     if (inter==WEED_FALSE) {
       // non-interleaved
       if (hamming==WEED_TRUE) {
-	for (j=0;j<nsamps;j++) {
-	  ins[base][j]=src[j]*(0.54f - 0.46f * cosf(TWO_PI*(float)j/(float)(nsamps-1.)));
-	}
-      }
-      else {
-	weed_memcpy(ins[base],src,nsamps*sizf);
+        for (j=0; j<nsamps; j++) {
+          ins[base][j]=src[j]*(0.54f - 0.46f * cosf(TWO_PI*(float)j/(float)(nsamps-1.)));
+        }
+      } else {
+        weed_memcpy(ins[base],src,nsamps*sizf);
       }
       src+=onsamps;
-    }
-    else {
+    } else {
       // interleaved
-      for (j=0;j<nsamps;j++) {
-	if (hamming==WEED_TRUE) {
-	  ins[base][j]=src[j*chans]*(0.54f - 0.46f * cosf(TWO_PI*(float)j/(float)(nsamps-1.)));
-	}
-	else {
-	  ins[base][j]=src[j*chans];
-	}
+      for (j=0; j<nsamps; j++) {
+        if (hamming==WEED_TRUE) {
+          ins[base][j]=src[j*chans]*(0.54f - 0.46f * cosf(TWO_PI*(float)j/(float)(nsamps-1.)));
+        } else {
+          ins[base][j]=src[j*chans];
+        }
       }
       src++;
     }
 
 
 
-      
+
     //fprintf(stderr,"executing plan of size %d\n",sdata->size);
     fftwf_execute(plans[base]);
 
     okmin=kmin=0;
 
-    for (s=0;s<NSLICES;s++) {
+    for (s=0; s<NSLICES; s++) {
       // which element do we want for output ?
       // out array goes from 0 to (nsamps/2 + 1) [div b y 2 rounded down]
-	
+
       // nyquist freq is rate / 2
       // so the freq. of the kth element is: f  =  k/nsamps * rate
       // therefore k = f/rate * nsamps
@@ -294,41 +291,39 @@
       kmax = freq[s]/(double)rate*(double)nsamps;
 
       if (kmax>=(nsamps>>1)) {
-	// frequency invalid - too high for this sample packet
-	tot=-1.;
-	sdata->buf[s][sdata->bufidx]=tot;
-      }
-      else {
-
-	// use an overlap
-	rkmin=kmin-((kmin-okmin)>>1);
-	if (s<NSLICES-1) {
-	  rkmax=kmax+(freq[s+1]-freq[s])/2./(double)rate*(double)nsamps;
-	  if (rkmax>=(nsamps>>1)) {
-	    rkmax=kmax;
-	  }
-	}
-	else rkmax=kmax;
-
-	totx=0.;
-
-	for (k=rkmin;k<=rkmax;k++) {
-	  // sum values over range
-	  // average over range
-	  totx+=sqrtf(outs[base][k][0]*outs[base][k][0]+outs[base][k][1]*outs[base][k][1]);
-	}
-
-	// average over bandwidth
-	totx/=((float)rkmax-(float)rkmin+1.);
-
-	// boost lower freq
-	totx/=((float)rkmax-(float)rkmin+1.);
-
-	// store this value in the buffer
-	sdata->buf[s][sdata->bufidx]+=totx/(float)chans;
-
-	okmin=kmin;
-	kmin=kmax;
+        // frequency invalid - too high for this sample packet
+        tot=-1.;
+        sdata->buf[s][sdata->bufidx]=tot;
+      } else {
+
+        // use an overlap
+        rkmin=kmin-((kmin-okmin)>>1);
+        if (s<NSLICES-1) {
+          rkmax=kmax+(freq[s+1]-freq[s])/2./(double)rate*(double)nsamps;
+          if (rkmax>=(nsamps>>1)) {
+            rkmax=kmax;
+          }
+        } else rkmax=kmax;
+
+        totx=0.;
+
+        for (k=rkmin; k<=rkmax; k++) {
+          // sum values over range
+          // average over range
+          totx+=sqrtf(outs[base][k][0]*outs[base][k][0]+outs[base][k][1]*outs[base][k][1]);
+        }
+
+        // average over bandwidth
+        totx/=((float)rkmax-(float)rkmin+1.);
+
+        // boost lower freq
+        totx/=((float)rkmax-(float)rkmin+1.);
+
+        // store this value in the buffer
+        sdata->buf[s][sdata->bufidx]+=totx/(float)chans;
+
+        okmin=kmin;
+        kmin=kmax;
       }
     } // done for all slices
   } // done for all channels
@@ -350,21 +345,21 @@
 
   var=0.;
 
-  for (i=0;i<NSLICES;i++) {
+  for (i=0; i<NSLICES; i++) {
     // for the variance:
     //av=sdata->av[i]/(double)sdata->bufidx;
 
     if (sdata->bufidx>ONSET_WINDOW) {
       float val1,val2,varx;
-      for (j=sdata->bufidx-ONSET_WINDOW;j<=sdata->bufidx;j++) {
-	if (
-	    (val1=sdata->buf[i][j])!=-1.&&
-	    (val2=sdata->buf[i][j-1])!=-1.
-	    ) {
-	  varx=(val1-val2);
-	  if (varx<0.) varx=0.;
-	  var+=(double)varx/(double)ONSET_WINDOW;
-	}
+      for (j=sdata->bufidx-ONSET_WINDOW; j<=sdata->bufidx; j++) {
+        if (
+          (val1=sdata->buf[i][j])!=-1.&&
+          (val2=sdata->buf[i][j-1])!=-1.
+        ) {
+          varx=(val1-val2);
+          if (varx<0.) varx=0.;
+          var+=(double)varx/(double)ONSET_WINDOW;
+        }
       }
     }
   }
@@ -375,7 +370,7 @@
   var/=(double)NSLICES;
 
 
-  for (i=0;i<NSLICES;i++) {
+  for (i=0; i<NSLICES; i++) {
     av=sdata->av[i]/(double)sdata->bufidx;
     if (var>=varlim && sdata->buf[i][sdata->bufidx] >= (avlim*av)) {
       // got a beat !
@@ -388,36 +383,37 @@
 
   //fprintf(stderr,"\n\n");
 
- done:
+done:
   weed_set_boolean_value(out_params[0],"value",beat_pulse);
   weed_set_int64_value(out_params[0],"timecode",timestamp);
   weed_set_boolean_value(out_params[1],"value",beat_hold);
   weed_set_int64_value(out_params[1],"timecode",timestamp);
 
   weed_free(out_params);
-  
+
   return WEED_NO_ERROR;
 }
 
 
 
 
-weed_plant_t *weed_setup (weed_bootstrap_f weed_boot) {
+weed_plant_t *weed_setup(weed_bootstrap_f weed_boot) {
   weed_plant_t *plugin_info;
   if (create_plans()!=WEED_NO_ERROR) return NULL;
   plugin_info=weed_plugin_info_init(weed_boot,num_versions,api_versions);
   if (plugin_info!=NULL) {
-    weed_plant_t *in_chantmpls[]={weed_audio_channel_template_init("in channel 0",0),NULL};
-    weed_plant_t *in_params[]={weed_switch_init("reset","_Reset hold",WEED_FALSE),weed_float_init("avlim","_Average threshold",3.,0.,40.),
-			       weed_float_init("varlim","_Variance threshold",0.5,0.,10.),weed_switch_init("hamming","Use _Hamming",WEED_TRUE),NULL};
-    weed_plant_t *out_params[]={weed_out_param_switch_init("beat pulse",WEED_FALSE),weed_out_param_switch_init("beat hold",WEED_FALSE),NULL};
+    weed_plant_t *in_chantmpls[]= {weed_audio_channel_template_init("in channel 0",0),NULL};
+    weed_plant_t *in_params[]= {weed_switch_init("reset","_Reset hold",WEED_FALSE),weed_float_init("avlim","_Average threshold",3.,0.,40.),
+                                weed_float_init("varlim","_Variance threshold",0.5,0.,10.),weed_switch_init("hamming","Use _Hamming",WEED_TRUE),NULL
+                               };
+    weed_plant_t *out_params[]= {weed_out_param_switch_init("beat pulse",WEED_FALSE),weed_out_param_switch_init("beat hold",WEED_FALSE),NULL};
     weed_plant_t *filter_class=weed_filter_class_init("beat detector","salsaman",1,0,&beat_init,&beat_process,
-						      &beat_deinit,in_chantmpls,NULL,in_params,out_params);
+                               &beat_deinit,in_chantmpls,NULL,in_params,out_params);
 
     weed_plant_t *gui=weed_parameter_template_get_gui(in_params[0]);
     weed_set_boolean_value(gui,"hidden",WEED_TRUE);
 
-    weed_plugin_info_add_filter_class (plugin_info,filter_class);
+    weed_plugin_info_add_filter_class(plugin_info,filter_class);
 
     weed_set_int_value(plugin_info,"version",package_version);
   }
@@ -427,7 +423,7 @@
 
 void weed_desetup(void) {
   register int i;
-  for (i=0;i<MAXPLANS;i++) {
+  for (i=0; i<MAXPLANS; i++) {
     fftwf_destroy_plan(plans[i]);
     fftwf_free(ins[i]);
     fftwf_free(outs[i]);

LiVES-2.2.8.tar.bz2/lives-plugins/weed-plugins/blank_frame_detector.c -> LiVES-2.4.1.tar.bz2/lives-plugins/weed-plugins/blank_frame_detector.c Changed

@@ -20,7 +20,7 @@
 ///////////////////////////////////////////////////////////////////
 
 static int num_versions=1; // number of different weed api versions supported
-static int api_versions[]={131}; // array of weed api versions supported in plugin, in order (most preferred first)
+static int api_versions[]= {131}; // array of weed api versions supported in plugin, in order (most preferred first)
 
 static int package_version=1; // version of this package
 
@@ -53,21 +53,21 @@
 static void init_luma_arrays(void) {
   register int i;
 
-  for (i=0;i<256;i++) {
+  for (i=0; i<256; i++) {
     Y_R[i]=.299*(float)i*256.;
     Y_G[i]=.587*(float)i*256.;
     Y_B[i]=.114*(float)i*256.;
   }
 
-  for (i=0;i<17;i++) {
+  for (i=0; i<17; i++) {
     unclamp_luma[i]=0;
   }
 
-  for (i=17;i<235;i++) {
+  for (i=17; i<235; i++) {
     unclamp_luma[i]=(int)((float)(i-16.)/219.*255.+.5);
   }
 
-  for (i=235;i<256;i++) {
+  for (i=235; i<256; i++) {
     unclamp_luma[i]=255;
   }
 
@@ -83,7 +83,7 @@
 ////////////////////////////////////////////////////////////
 
 
-int bfd_init (weed_plant_t *inst) {
+int bfd_init(weed_plant_t *inst) {
   int error;
   weed_plant_t **out_params=weed_get_plantptr_array(inst,"out_parameters",&error);
   weed_plant_t *blank=out_params[0];
@@ -106,7 +106,7 @@
 
 
 
-int bfd_deinit (weed_plant_t *inst) {
+int bfd_deinit(weed_plant_t *inst) {
   int error;
   _sdata *sdata=(_sdata *)weed_get_voidptr_value(inst,"plugin_internal",&error);
 
@@ -117,7 +117,7 @@
 
 
 
-int bfd_process (weed_plant_t *inst, weed_timecode_t timestamp) {
+int bfd_process(weed_plant_t *inst, weed_timecode_t timestamp) {
   int error;
   weed_plant_t *in_channel=weed_get_plantptr_value(inst,"in_channels",&error);
   unsigned char *src=(unsigned char *)weed_get_voidptr_value(in_channel,"pixel_data",&error);
@@ -143,7 +143,7 @@
       pal==WEED_PALETTE_YUV888||pal==WEED_PALETTE_YUVA8888) {
 
     if (weed_plant_has_leaf(in_channel,"YUV_clamping")&&
-	(weed_get_int_value(in_channel,"YUV_clamping",&error)==WEED_YUV_CLAMPING_CLAMPED))
+        (weed_get_int_value(in_channel,"YUV_clamping",&error)==WEED_YUV_CLAMPING_CLAMPED))
       clamped=1;
   }
 
@@ -158,19 +158,19 @@
 
   if (pal==WEED_PALETTE_UYVY) start=1;
 
-  for (;src<end;src+=irowstride) {
-    for (i=start;i<width;i+=psize) {
+  for (; src<end; src+=irowstride) {
+    for (i=start; i<width; i+=psize) {
       if (pal==WEED_PALETTE_RGB24||pal==WEED_PALETTE_RGBA32) luma=calc_luma(src[i],src[i+1],src[i+2]);
       else if (pal==WEED_PALETTE_BGR24||pal==WEED_PALETTE_BGRA32) luma=calc_luma(src[i+2],src[i+1],src[i]);
       else if (pal==WEED_PALETTE_ARGB32) luma=calc_luma(src[i+1],src[i+2],src[i+3]);
       else luma=(clamped?unclamp_luma[src[i]]:src[i]);
 
       if (luma>threshold) {
-	// is not blank
-	sdata->count=-1;
-	break;
+        // is not blank
+        sdata->count=-1;
+        break;
       }
-      
+
     }
   }
 
@@ -191,22 +191,24 @@
 
 
 
-weed_plant_t *weed_setup (weed_bootstrap_f weed_boot) {
+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);
   if (plugin_info!=NULL) {
-    int palette_list[]={WEED_PALETTE_BGR24,WEED_PALETTE_RGB24,WEED_PALETTE_RGBA32,WEED_PALETTE_BGRA32,
-			WEED_PALETTE_ARGB32,WEED_PALETTE_YUVA8888,WEED_PALETTE_YUV888,WEED_PALETTE_YUV444P,
-			WEED_PALETTE_YUVA4444P,WEED_PALETTE_YUV422P,WEED_PALETTE_YUV420P,WEED_PALETTE_YVU420P,
-			WEED_PALETTE_UYVY,WEED_PALETTE_YUYV,
-			WEED_PALETTE_END};
-    weed_plant_t *out_params[]={weed_out_param_switch_init("blank",WEED_FALSE),NULL};
-    weed_plant_t *in_params[]={weed_integer_init("threshold","Luma _threshold",0,0,255),
-			       weed_integer_init("fcount","Frame _count",1,1,1000),NULL};
-    weed_plant_t *in_chantmpls[]={weed_channel_template_init("in channel 0",0,palette_list),NULL};
+    int palette_list[]= {WEED_PALETTE_BGR24,WEED_PALETTE_RGB24,WEED_PALETTE_RGBA32,WEED_PALETTE_BGRA32,
+                         WEED_PALETTE_ARGB32,WEED_PALETTE_YUVA8888,WEED_PALETTE_YUV888,WEED_PALETTE_YUV444P,
+                         WEED_PALETTE_YUVA4444P,WEED_PALETTE_YUV422P,WEED_PALETTE_YUV420P,WEED_PALETTE_YVU420P,
+                         WEED_PALETTE_UYVY,WEED_PALETTE_YUYV,
+                         WEED_PALETTE_END
+                        };
+    weed_plant_t *out_params[]= {weed_out_param_switch_init("blank",WEED_FALSE),NULL};
+    weed_plant_t *in_params[]= {weed_integer_init("threshold","Luma _threshold",0,0,255),
+                                weed_integer_init("fcount","Frame _count",1,1,1000),NULL
+                               };
+    weed_plant_t *in_chantmpls[]= {weed_channel_template_init("in channel 0",0,palette_list),NULL};
     weed_plant_t *filter_class=weed_filter_class_init("blank_frame_detector","salsaman",1,0,&bfd_init,
-						      &bfd_process,&bfd_deinit,in_chantmpls,NULL,in_params,out_params);
+                               &bfd_process,&bfd_deinit,in_chantmpls,NULL,in_params,out_params);
 
-    weed_plugin_info_add_filter_class (plugin_info,filter_class);
+    weed_plugin_info_add_filter_class(plugin_info,filter_class);
 
     weed_set_int_value(plugin_info,"version",package_version);

LiVES-2.2.8.tar.bz2/lives-plugins/weed-plugins/blurzoom.c -> LiVES-2.4.1.tar.bz2/lives-plugins/weed-plugins/blurzoom.c Changed

@@ -27,7 +27,7 @@
 ///////////////////////////////////////////////////////////////////
 
 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 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
 
@@ -89,21 +89,21 @@
   short *q;
   unsigned char *r;
   int v;
-  
+
   rowstride-=width;
 
   p = src;
   q = sdata->background;
   r = sdata->diff;
-  for(i=0; i<height; i++) {
-    for (j=0;j<width;j++) {
+  for (i=0; i<height; i++) {
+    for (j=0; j<width; j++) {
       R = ((*p)&0xff0000)>>(16-1);
       G = ((*p)&0xff00)>>(8-2);
       B = (*p)&0xff;
       v = (R + G + B) - (int)(*q);
       *q = (short)(R + G + B);
       *r = ((v + sdata->threshold)>>24) | ((sdata->threshold - v)>>24);
-      
+
       p++;
       q++;
       r++;
@@ -122,35 +122,35 @@
   int buf_height=sdata->buf_height;
 
   prevptr = (int)(0.5+RATIO*(-VIDEO_HWIDTH)+VIDEO_HWIDTH);
-  for(xx=0; xx<(sdata->buf_width_blocks); xx++){
+  for (xx=0; xx<(sdata->buf_width_blocks); xx++) {
     bits = 0;
-    for(x=0; x<32; x++){
+    for (x=0; x<32; x++) {
       ptr= (int)(0.5+RATIO*(xx*32+x-VIDEO_HWIDTH)+VIDEO_HWIDTH);
 #ifdef USE_NASM
       bits = bits<<1;
-      if(ptr != prevptr)
-	bits |= 1;
+      if (ptr != prevptr)
+        bits |= 1;
 #else
       bits = bits>>1;
-      if(ptr != prevptr)
-	bits |= 0x80000000;
+      if (ptr != prevptr)
+        bits |= 0x80000000;
 #endif /* USE_NASM */
       prevptr = ptr;
     }
     sdata->blurzoomx[xx] = bits;
   }
-  
+
   ty = (int)(0.5+RATIO*(-VIDEO_HHEIGHT)+VIDEO_HHEIGHT);
   tx = (int)(0.5+RATIO*(-VIDEO_HWIDTH)+VIDEO_HWIDTH);
   xx=(int)(0.5+RATIO*(buf_width-1-VIDEO_HWIDTH)+VIDEO_HWIDTH);
   sdata->blurzoomy[0] = ty * buf_width + tx;
   prevptr = ty * buf_width + xx;
-  for(y=1; y<buf_height; y++){
+  for (y=1; y<buf_height; y++) {
     ty = (int)(0.5+RATIO*(y-VIDEO_HHEIGHT)+VIDEO_HHEIGHT);
     sdata->blurzoomy[y] = ty * buf_width + tx - prevptr;
     prevptr = ty * buf_width + xx;
   }
-}		
+}
 
 
 #ifndef USE_NASM
@@ -160,13 +160,13 @@
   int width;
   register unsigned char *p, *q;
   register unsigned char v;
-  
+
   width = sdata->buf_width;
   p = sdata->blurzoombuf + width + 1;
   q = p + sdata->buf_width*sdata->buf_height;
-  
-  for(y=sdata->buf_height-2; y>0; y--) {
-    for(x=width-2; x>0; x--) {
+
+  for (y=sdata->buf_height-2; y>0; y--) {
+    for (x=width-2; x>0; x--) {
       if ((v = (*(p-width) + *(p-1) + *(p+1) + *(p+width))/4 - 1)==255) v=0;
       *(q++) = v;
       p++;
@@ -183,20 +183,20 @@
   register unsigned char *p, *q;
   int blocks, height;
   register int dx;
-  
+
   p = sdata->blurzoombuf + sdata->buf_width*sdata->buf_height;
   q = sdata->blurzoombuf;
   height = sdata->buf_height;
   blocks = sdata->buf_width_blocks;
-  
-  for(y=0; y<height; y++) {
+
+  for (y=0; y<height; y++) {
     p += sdata->blurzoomy[y];
-    for(b=0; b<blocks; b++) {
+    for (b=0; b<blocks; b++) {
       dx = sdata->blurzoomx[b];
-      for(x=0; x<32; x++) {
-	p += (dx & 1);
-	*q++ = *p;
-	dx = dx>>1;
+      for (x=0; x<32; x++) {
+        p += (dx & 1);
+        *q++ = *p;
+        dx = dx>>1;
       }
     }
   }
@@ -204,50 +204,46 @@
 
 
 
-static inline void blurzoomcore(struct _sdata *sdata)
-{
+static inline void blurzoomcore(struct _sdata *sdata) {
   blur(sdata);
   zoom(sdata);
 }
 #endif /* USE_NASM */
 
-static void makePalette(int pal)
-{
+static void makePalette(int pal) {
   int i;
-  
+
 #define DELTA (255/(COLORS/2-1))
-  
-  for (i=0;i<256;i++) {
+
+  for (i=0; i<256; i++) {
     palettes[i]=0;
   }
 
 
-  for(i=0; i<COLORS/2; i++) {
+  for (i=0; i<COLORS/2; i++) {
     if (pal==WEED_PALETTE_RGBA32) {
       palettes[COLORS*2+i] = i*DELTA;
       palettes[i] = (i*DELTA)<<16;
-    }
-    else {
+    } else {
       palettes[i] = i*DELTA;
       palettes[COLORS*2+i] = (i*DELTA)<<16;
     }
     palettes[COLORS   + i] = (i*DELTA)<<8;
   }
-  for(i=0; i<COLORS/2; i++) {
+  for (i=0; i<COLORS/2; i++) {
     if (pal==WEED_PALETTE_RGBA32) {
       palettes[COLORS*2         + i + COLORS/2] = 255 | (i*DELTA)<<16 | (i*DELTA)<<8;
       palettes[ i + COLORS/2] = (255<<16) | (i*DELTA)<<8 | i*DELTA;
-    }
-    else {
+    } else {
       palettes[i + COLORS/2] = 255 | (i*DELTA)<<16 | (i*DELTA)<<8;
       palettes[COLORS*2+ i + COLORS/2] = (255<<16) | (i*DELTA)<<8 | i*DELTA;
     }
     palettes[COLORS   + i + COLORS/2] = (255<<8) | (i*DELTA)<<16 | i*DELTA;
   }
-  for(i=0; i<COLORS; i++) {
+  for (i=0; i<COLORS; i++) {
     palettes[COLORS*3 + i] = (255*i/COLORS) * 0x10101;
   }
-  for(i=0; i<COLORS*PATTERN; i++) {
+  for (i=0; i<COLORS*PATTERN; i++) {
     palettes[i] = palettes[i] & 0xfefeff;
   }
 }
@@ -263,7 +259,7 @@
 
   sdata=weed_malloc(sizeof(struct _sdata));
 
-  if(sdata == NULL ) return WEED_ERROR_MEMORY_ALLOCATION;
+  if (sdata == NULL) return WEED_ERROR_MEMORY_ALLOCATION;
 
   in_channel=weed_get_plantptr_value(inst,"in_channels",&error);
 
@@ -273,7 +269,7 @@
 
   sdata->buf_width_blocks = (video_width / 32);
 
-  if(sdata->buf_width_blocks > 255) return WEED_ERROR_MEMORY_ALLOCATION;
+  if (sdata->buf_width_blocks > 255) return WEED_ERROR_MEMORY_ALLOCATION;
 
   sdata->buf_width = sdata->buf_width_blocks * 32;
   sdata->buf_height = video_height;
@@ -282,20 +278,20 @@
   buf_area = sdata->buf_width * sdata->buf_height;
 
   sdata->blurzoombuf = (unsigned char *)weed_malloc(buf_area * 2);
-  if(sdata->blurzoombuf == NULL) {
+  if (sdata->blurzoombuf == NULL) {
     weed_free(sdata);
     return WEED_ERROR_MEMORY_ALLOCATION;
   }
 
   sdata->blurzoomx = (int *)weed_malloc(sdata->buf_width*sizeof(int));
-  if(sdata->blurzoomx == NULL ) {
+  if (sdata->blurzoomx == NULL) {
     weed_free(sdata->blurzoombuf);
     weed_free(sdata);
     return WEED_ERROR_MEMORY_ALLOCATION;
   }
 
   sdata->blurzoomy = (int *)weed_malloc(sdata->buf_height*sizeof(int));
-  if(sdata->blurzoomy == NULL ) {
+  if (sdata->blurzoomy == NULL) {
     weed_free(sdata->blurzoombuf);
     weed_free(sdata->blurzoomx);
     weed_free(sdata);
@@ -307,7 +303,7 @@
   sdata->threshold=MAGIC_THRESHOLD*7;
 
   sdata->snapframe = (RGB32 *)weed_malloc(video_area*PIXEL_SIZE);
-  if(sdata->snapframe == NULL) {
+  if (sdata->snapframe == NULL) {
     weed_free(sdata->blurzoombuf);
     weed_free(sdata->blurzoomy);
     weed_free(sdata->blurzoomx);
@@ -317,7 +313,7 @@
 
 
   sdata->background = (short *)weed_malloc(video_height*video_width*sizeof(short));
-  if(sdata->background == NULL ) {
+  if (sdata->background == NULL) {
     weed_free(sdata->blurzoombuf);
     weed_free(sdata->blurzoomy);
     weed_free(sdata->blurzoomx);
@@ -327,7 +323,7 @@
   }
 
   sdata->diff = (unsigned char *)weed_malloc(video_height*video_width * 4 * sizeof(unsigned char));
-  if(sdata->diff == NULL ) {
+  if (sdata->diff == NULL) {
     weed_free(sdata->background);
     weed_free(sdata->blurzoombuf);
     weed_free(sdata->blurzoomy);
@@ -345,7 +341,7 @@
 
   sdata->snapTime=0;
   sdata->snapInterval=3;
-  
+
   weed_set_voidptr_value(inst,"plugin_internal",sdata);
 
   return WEED_NO_ERROR;
@@ -376,14 +372,14 @@
 
 
 
-int blurzoom_process (weed_plant_t *inst, weed_timecode_t timecode) {
+int blurzoom_process(weed_plant_t *inst, weed_timecode_t timecode) {
   weed_plant_t *in_channel,*out_channel,*in_param;
 
   register int x, y;
   register RGB32 a, b;
 
   register unsigned char *diff, *p;
-  
+
   RGB32 *src,*dest;
 
   struct _sdata *sdata;
@@ -413,49 +409,49 @@
   in_param=weed_get_plantptr_value(inst,"in_parameters",&error);
   mode=weed_get_int_value(in_param,"value",&error);
 
-  if(mode != 2 || sdata->snapTime <= 0) {
+  if (mode != 2 || sdata->snapTime <= 0) {
     image_bgsubtract_update_y(src,video_width,video_height,irow,sdata);
-    if(mode == 0 || sdata->snapTime <= 0) {
+    if (mode == 0 || sdata->snapTime <= 0) {
       diff += sdata->buf_margin_left;
       p = sdata->blurzoombuf;
-      for(y=0; y<sdata->buf_height; y++) {
-	for(x=0; x<sdata->buf_width; x++) {
-	  p[x] |= diff[x] >> 3;
-	}
-	diff += video_width;
-	p += sdata->buf_width;
+      for (y=0; y<sdata->buf_height; y++) {
+        for (x=0; x<sdata->buf_width; x++) {
+          p[x] |= diff[x] >> 3;
+        }
+        diff += video_width;
+        p += sdata->buf_width;
       }
-      if(mode == 1 || mode == 2) {
-	for (x=0;x<video_height;x++) {
-	  weed_memcpy(sdata->snapframe+snap_offs, src+src_offs, video_width * PIXEL_SIZE);
-	  snap_offs+=video_width;
-	  src_offs+=irow;
-	}
+      if (mode == 1 || mode == 2) {
+        for (x=0; x<video_height; x++) {
+          weed_memcpy(sdata->snapframe+snap_offs, src+src_offs, video_width * PIXEL_SIZE);
+          snap_offs+=video_width;
+          src_offs+=irow;
+        }
       }
     }
   }
 
   blurzoomcore(sdata);
-  
+
   irow-=video_width;
   orow-=video_width;
 
-  if(mode == 1 || mode == 2) {
+  if (mode == 1 || mode == 2) {
     src = sdata->snapframe;
   }
   p = sdata->blurzoombuf;
-  for(y=0; y<video_height; y++) {
-    for(x=0; x<sdata->buf_margin_left; x++) {
+  for (y=0; y<video_height; y++) {
+    for (x=0; x<sdata->buf_margin_left; x++) {
       *dest++ = *src++;
     }
-    for(x=0; x<sdata->buf_width; x++) {
+    for (x=0; x<sdata->buf_width; x++) {
       a = *src & 0xfefeff;
       b = palette[*p++];
       a += b;
       b = a & 0x1010100;
       *dest++ = (*src++ & 0xff000000) | ((a | (b - (b >> 8)))&0xffffff);
     }
-    for(x=0; x<sdata->buf_margin_right; x++) {
+    for (x=0; x<sdata->buf_margin_right; x++) {
       *dest++ = *src++;
     }
 
@@ -463,30 +459,31 @@
     dest+=orow;
 
   }
-  
-  if(mode == 1 || mode == 2) {
+
+  if (mode == 1 || mode == 2) {
     sdata->snapTime--;
-    if(sdata->snapTime < 0) {
+    if (sdata->snapTime < 0) {
       sdata->snapTime = sdata->snapInterval;
     }
   }
   return WEED_NO_ERROR;
 }
- 
 
-weed_plant_t *weed_setup (weed_bootstrap_f weed_boot) {
+
+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);
   if (plugin_info!=NULL) {
-    const char *modes[]={"normal","strobe","strobe2","trigger",NULL};
+    const char *modes[]= {"normal","strobe","strobe2","trigger",NULL};
 
-    int palette_list[]={WEED_PALETTE_BGRA32,WEED_PALETTE_RGBA32,WEED_PALETTE_END};
+    int palette_list[]= {WEED_PALETTE_BGRA32,WEED_PALETTE_RGBA32,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",0,palette_list),NULL};
-    weed_plant_t *in_params[]={weed_string_list_init("mode","Trigger _Mode",0,modes),NULL};
-    weed_plant_t *filter_class=weed_filter_class_init("blurzoom","effectTV",1,0,&blurzoom_init,&blurzoom_process,&blurzoom_deinit,in_chantmpls,out_chantmpls,in_params,NULL);
+    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",0,palette_list),NULL};
+    weed_plant_t *in_params[]= {weed_string_list_init("mode","Trigger _Mode",0,modes),NULL};
+    weed_plant_t *filter_class=weed_filter_class_init("blurzoom","effectTV",1,0,&blurzoom_init,&blurzoom_process,&blurzoom_deinit,in_chantmpls,
+                               out_chantmpls,in_params,NULL);
 
-    weed_plugin_info_add_filter_class (plugin_info,filter_class);
+    weed_plugin_info_add_filter_class(plugin_info,filter_class);
 
     weed_set_int_value(plugin_info,"version",package_version);
   }

LiVES-2.2.8.tar.bz2/lives-plugins/weed-plugins/bump2d.c -> LiVES-2.4.1.tar.bz2/lives-plugins/weed-plugins/bump2d.c Changed

@@ -20,7 +20,7 @@
 ///////////////////////////////////////////////////////////////////
 
 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 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
 
@@ -46,8 +46,7 @@
   uint16_t sin_index2;
 } _sdata;
 
-typedef struct
-{
+typedef struct {
   short x, y;
 } BUMP;
 
@@ -62,17 +61,15 @@
 static int Y_B[256];
 
 
-static int myround(double n)
-{
-  if (n >= 0) 
+static int myround(double n) {
+  if (n >= 0)
     return (int)(n + 0.5);
   else
     return (int)(n - 0.5);
 }
 
 
-static void init_RGB_to_YCbCr_tables(void)
-{
+static void init_RGB_to_YCbCr_tables(void) {
   int i;
 
   /*
@@ -82,29 +79,29 @@
    * to one of each, add the following:
    *             + (fixed-pogint-factor / 2)         --- for rounding later
    *             + (Q-offset * fixed-pogint-factor)  --- to add the offset
-   *             
+   *
    */
   for (i = 0; i < 256; i++) {
-    Y_R[i] = myround(0.299 * (double)i 
-		     * 219.0 / 255.0 * (double)(1<<FP_BITS));
-    Y_G[i] = myround(0.587 * (double)i 
-		     * 219.0 / 255.0 * (double)(1<<FP_BITS));
-    Y_B[i] = myround((0.114 * (double)i 
-		      * 219.0 / 255.0 * (double)(1<<FP_BITS))
-		     + (double)(1<<(FP_BITS-1))
-		     + (16.0 * (double)(1<<FP_BITS)));
+    Y_R[i] = myround(0.299 * (double)i
+                     * 219.0 / 255.0 * (double)(1<<FP_BITS));
+    Y_G[i] = myround(0.587 * (double)i
+                     * 219.0 / 255.0 * (double)(1<<FP_BITS));
+    Y_B[i] = myround((0.114 * (double)i
+                      * 219.0 / 255.0 * (double)(1<<FP_BITS))
+                     + (double)(1<<(FP_BITS-1))
+                     + (16.0 * (double)(1<<FP_BITS)));
 
   }
 }
 
 
-static inline uint8_t 
-calc_luma (uint8_t *pixel) {
+static inline uint8_t
+calc_luma(uint8_t *pixel) {
   return (Y_R[pixel[2]] + Y_G[pixel[1]]+ Y_B[pixel[0]]) >> FP_BITS;
 }
 
 
-int bumpmap_init (weed_plant_t *inst) {
+int bumpmap_init(weed_plant_t *inst) {
   _sdata *sdata=(_sdata *)weed_malloc(sizeof(_sdata));
   if (sdata==NULL) return WEED_ERROR_MEMORY_ALLOCATION;
 
@@ -116,7 +113,7 @@
 }
 
 
-int bumpmap_deinit (weed_plant_t *inst) {
+int bumpmap_deinit(weed_plant_t *inst) {
   int error;
   _sdata *sdata=weed_get_voidptr_value(inst,"plugin_internal",&error);
   if (sdata!=NULL) {
@@ -128,9 +125,10 @@
 }
 
 
-int bumpmap_process (weed_plant_t *inst, weed_timecode_t timestamp) {
+int bumpmap_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_channel=weed_get_plantptr_value(inst,"in_channels",&error),*out_channel=weed_get_plantptr_value(inst,"out_channels",
+                           &error);
   unsigned char *src=weed_get_voidptr_value(in_channel,"pixel_data",&error);
   unsigned char *dst=weed_get_voidptr_value(out_channel,"pixel_data",&error);
   int width=weed_get_int_value(in_channel,"width",&error);
@@ -156,13 +154,13 @@
 
   lightx = aSin[sdata->sin_index];
   lighty = aSin[sdata->sin_index2];
-  
+
   weed_memset(dst,0,orowstride);
   s1 = dst + orowstride;
-  
+
   orowstride-=width3-3;
 
-  for (y = 1; y < height - 1; ++y) {    
+  for (y = 1; y < height - 1; ++y) {
     temp = lighty - y;
     weed_memset(s1,0,3);
     s1+=3;
@@ -170,16 +168,16 @@
     for (x = 1; x < width - 1; x++) {
       normalx = bumpmap[x][y].x + lightx - x;
       normaly = bumpmap[x][y].y + temp;
-      
+
       if (normalx < 0)
-	normalx = 0;
+        normalx = 0;
       else if (normalx > 255)
-	normalx = 0;
+        normalx = 0;
       if (normaly < 0)
-	normaly = 0;
+        normaly = 0;
       else if (normaly > 255)
-	normaly = 0;	  
-      
+        normaly = 0;
+
       weed_memset(s1,reflectionmap[normalx][normaly],3);
       s1+=3;
     }
@@ -188,7 +186,7 @@
   }
 
   weed_memset(s1,0,orowstride+width3-3);
-  
+
   sdata->sin_index += 3;
   sdata->sin_index &= 511;
   sdata->sin_index2 += 5;
@@ -198,48 +196,45 @@
 }
 
 
-void bumpmap_x_init(void)
-{
+void bumpmap_x_init(void) {
   int i;
   short x, y;
   float rad;
-  
+
   /*create sin lookup table */
-  for (i = 0; i < 512; i++)
-    {
-      rad =  (float)i * 0.0174532 * 0.703125; 
-      aSin[i] = (short)((sin(rad) * 100.0) + 256.0);
-    }
-  
+  for (i = 0; i < 512; i++) {
+    rad = (float)i * 0.0174532 * 0.703125;
+    aSin[i] = (short)((sin(rad) * 100.0) + 256.0);
+  }
+
   /* create reflection map */
-  
-  for (x = 0; x < 256; ++x)
-    {
-      for (y = 0; y < 256; ++y)
-	{
-	  float X = (x - 128) / 128.0;
-	  float Y = (y - 128) / 128.0;
-	  float Z =  1.0 - sqrt(X * X + Y * Y);
-	  Z *= 255.0;
-	  if (Z < 0.0)
-	    Z = 0.0;
-	  reflectionmap[x][y] = Z;
-	}
+
+  for (x = 0; x < 256; ++x) {
+    for (y = 0; y < 256; ++y) {
+      float X = (x - 128) / 128.0;
+      float Y = (y - 128) / 128.0;
+      float Z =  1.0 - sqrt(X * X + Y * Y);
+      Z *= 255.0;
+      if (Z < 0.0)
+        Z = 0.0;
+      reflectionmap[x][y] = Z;
     }
-  
+  }
+
 }
 
 
-weed_plant_t *weed_setup (weed_bootstrap_f weed_boot) {
+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);
   if (plugin_info!=NULL) {
-    int palette_list[]={WEED_PALETTE_BGR24,WEED_PALETTE_RGB24,WEED_PALETTE_END};
+    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),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("bumpmap","salsaman",1,0,&bumpmap_init,&bumpmap_process,&bumpmap_deinit,in_chantmpls,out_chantmpls,NULL,NULL);
+    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("bumpmap","salsaman",1,0,&bumpmap_init,&bumpmap_process,&bumpmap_deinit,in_chantmpls,
+                               out_chantmpls,NULL,NULL);
 
-    weed_plugin_info_add_filter_class (plugin_info,filter_class);
+    weed_plugin_info_add_filter_class(plugin_info,filter_class);
 
     weed_set_int_value(plugin_info,"version",package_version);

LiVES-2.2.8.tar.bz2/lives-plugins/weed-plugins/cairo/vector_visualiser.c -> LiVES-2.4.1.tar.bz2/lives-plugins/weed-plugins/cairo/vector_visualiser.c Changed

LiVES-2.2.8.tar.bz2/lives-plugins/weed-plugins/ccorrect.c -> LiVES-2.4.1.tar.bz2/lives-plugins/weed-plugins/ccorrect.c Changed

LiVES-2.2.8.tar.bz2/lives-plugins/weed-plugins/colorkey.c -> LiVES-2.4.1.tar.bz2/lives-plugins/weed-plugins/colorkey.c Changed

LiVES-2.2.8.tar.bz2/lives-plugins/weed-plugins/comic.c -> LiVES-2.4.1.tar.bz2/lives-plugins/weed-plugins/comic.c Changed

@@ -22,7 +22,7 @@
 ///////////////////////////////////////////////////////////////////
 
 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 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
 
@@ -39,7 +39,7 @@
 
 /////////////////////////////////////////////////////////////
 
-static uint32_t sqrti (uint32_t n) {
+static uint32_t sqrti(uint32_t n) {
   register uint32_t root=0, remainder=n, place=0x40000000, tmp;
 
   while (place > remainder) place>>=2;
@@ -56,24 +56,25 @@
 
 
 
-static void cp_chroma (unsigned char *dst, unsigned char *src, int irowstride, int orowstride, int width, int height) {
+static void cp_chroma(unsigned char *dst, unsigned char *src, int irowstride, int orowstride, int width, int height) {
 
   if (irowstride==orowstride&&irowstride==width) weed_memcpy(dst,src,width*height);
   else {
     register int i;
-    for (i=0;i<height;i++) {
+    for (i=0; i<height; i++) {
       weed_memcpy(dst,src,width);
       src+=irowstride;
       dst+=orowstride;
     }
   }
 }
-  
 
 
-static int comic_process (weed_plant_t *inst, weed_timecode_t timestamp) {
+
+static int comic_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_channel=weed_get_plantptr_value(inst,"in_channels",&error),*out_channel=weed_get_plantptr_value(inst,"out_channels",
+                           &error);
   uint8_t **srcp=(uint8_t **)weed_get_voidptr_array(in_channel,"pixel_data",&error);
   uint8_t **dstp=(uint8_t **)weed_get_voidptr_array(out_channel,"pixel_data",&error);
   int width=weed_get_int_value(in_channel,"width",&error);
@@ -111,8 +112,7 @@
     yinv=255;
     ymin=0;
     ymax=255;
-  }
-  else {
+  } else {
     yinv=251;
     ymin=16;
     ymax=235;
@@ -122,20 +122,21 @@
   width--;
 
   // process each row
-  for (;src<end;src+=(irowstride-width-1)) {
+  for (; src<end; src+=(irowstride-width-1)) {
 
     // skip leftmost pixel
     *(dst++)=*src;
     src++;
 
     // process all pixels except leftmost and rightmost
-    for (i=1;i<width;i++) {
+    for (i=1; i<width; i++) {
 
       // do edge detect and convolve
-      row0=( *(src+irowstride-1) - *(src-irowstride-1) ) + ( ( *(src+irowstride) - *(src-irowstride) ) << 1 ) + ( *(src+irowstride+1) - *(src+irowstride-1) );
-      row1=( *(src-irowstride+1) - *(src-irowstride-1) ) + ( ( *(src+1) - *(src-1) ) << 1) + ( *(src+irowstride+1) + *(src+irowstride-1) );
-      
-      sum= ( ( 3 * sqrti( row0 * row0 + row1 *row1 ) / 2 ) * scale ) >>8;
+      row0=(*(src+irowstride-1) - *(src-irowstride-1)) + ((*(src+irowstride) - *(src-irowstride)) << 1) + (*(src+irowstride+1) - *
+           (src+irowstride-1));
+      row1=(*(src-irowstride+1) - *(src-irowstride-1)) + ((*(src+1) - *(src-1)) << 1) + (*(src+irowstride+1) + *(src+irowstride-1));
+
+      sum= ((3 * sqrti(row0 * row0 + row1 *row1) / 2) * scale) >>8;
 
       // clamp and invert
       sum=yinv-(sum<ymin?ymin:sum>ymax?ymax:sum);
@@ -167,7 +168,7 @@
   if (palette==WEED_PALETTE_YUVA4444P) nplanes=4;
   else nplanes=3;
 
-  for (i=1;i<nplanes;i++) {
+  for (i=1; i<nplanes; i++) {
     cp_chroma(dstp[i],srcp[i],irowstrides[i],orowstrides[i],width,height);
   }
 
@@ -182,19 +183,19 @@
 
 
 
-weed_plant_t *weed_setup (weed_bootstrap_f weed_boot) {
+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);
   if (plugin_info!=NULL) {
-    int palette_list[]={WEED_PALETTE_YUV444P,WEED_PALETTE_YUVA4444P,WEED_PALETTE_YUV422P,WEED_PALETTE_YUV420P,WEED_PALETTE_YVU420P,WEED_PALETTE_END};
+    int palette_list[]= {WEED_PALETTE_YUV444P,WEED_PALETTE_YUVA4444P,WEED_PALETTE_YUV422P,WEED_PALETTE_YUV420P,WEED_PALETTE_YVU420P,WEED_PALETTE_END};
 
-    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",0,palette_list),NULL};
+    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",0,palette_list),NULL};
     weed_plant_t *filter_class=weed_filter_class_init("comicbook","salsaman",1,0,NULL,&comic_process,NULL,in_chantmpls,out_chantmpls,NULL,NULL);
 
     // set preference of unclamped
     weed_set_int_value(in_chantmpls[0],"YUV_clamping",WEED_YUV_CLAMPING_UNCLAMPED);
 
-    weed_plugin_info_add_filter_class (plugin_info,filter_class);
+    weed_plugin_info_add_filter_class(plugin_info,filter_class);
 
     weed_set_int_value(plugin_info,"version",package_version);
   }

LiVES-2.2.8.tar.bz2/lives-plugins/weed-plugins/data_processor.c -> LiVES-2.4.1.tar.bz2/lives-plugins/weed-plugins/data_processor.c Changed

@@ -22,7 +22,7 @@
 ///////////////////////////////////////////////////////////////////
 
 static int num_versions=1; // number of different weed api versions supported
-static int api_versions[]={131}; // array of weed api versions supported in plugin, in order of preference (most preferred first)
+static int api_versions[]= {131}; // array of weed api versions supported in plugin, in order of preference (most preferred first)
 
 static int package_version=1; // version of this package
 
@@ -57,7 +57,7 @@
 } _sdata;
 
 
-typedef struct _node node; 
+typedef struct _node node;
 
 struct _node {
   node *left;
@@ -81,7 +81,7 @@
 }
 
 
-static node * add_parent(node *xnode, char *value) {
+static node *add_parent(node *xnode, char *value) {
   // add a parent to node; if node is rootnode, newnode becomes the new root
   // node becomes the left child
 
@@ -90,15 +90,14 @@
   if (xnode->parent!=NULL) {
     if (xnode->parent->left==xnode) xnode->parent->left=newnode;
     else xnode->parent->right=newnode;
-  }
-  else rootnode=newnode;
+  } else rootnode=newnode;
   xnode->parent=newnode;
 
   return newnode;
 }
 
 
-static node * add_right(node *xnode, char *value) {
+static node *add_right(node *xnode, char *value) {
   // add node as right child
 
   node *newnode=new_node(value);
@@ -203,8 +202,7 @@
 #ifdef DEBUG
     fprintf(stderr,"%s\n",res);
 #endif
-  }
-  else {
+  } else {
     simplify(xnode->left,sdata);
     simplify(xnode->right,sdata);
 
@@ -215,15 +213,14 @@
       res=simplify2(xnode->left,xnode->right,xnode,sdata);
       if (xnode->left!=NULL) xnode->left->visited=2;
       if (xnode->right!=NULL) xnode->right->visited=2;
-      
+
 #ifdef DEBUG
       fprintf(stderr,"%s\n",res);
 #endif
-    }
-    else {
+    } else {
       if (xnode->visited<2) {
-	xnode->visited=2;
-	simplify(xnode,sdata);
+        xnode->visited=2;
+        simplify(xnode,sdata);
       }
     }
   }
@@ -256,28 +253,28 @@
 
   register int i;
 
-  for (i=0;i<len;i++) {
+  for (i=0; i<len; i++) {
     switch (exp[i]) {
 
     case '[':
       if (varname==NULL) {
 #ifdef DEBUG_SYNTAX
-	printf("pt 1\n");
+        printf("pt 1\n");
 #endif
-	return 1;
+        return 1;
       }
       plevel=2;
       pstart=++i;
 
-      while(1) {
-	if (!strncmp(&exp[i],"]",1)) break;
-	i++;
-	if (i>len) {
+      while (1) {
+        if (!strncmp(&exp[i],"]",1)) break;
+        i++;
+        if (i>len) {
 #ifdef DEBUG_SYNTAX
-	printf("pt 2\n");
+          printf("pt 2\n");
 #endif
-	  return 1;
-	}
+          return 1;
+        }
       }
 
       if (i-pstart+3>MAX_EXP_LEN) return 5;
@@ -303,9 +300,9 @@
       varname=NULL;
 
       if (oldroot!=NULL) {
-	oldroot->right=rootnode;
-	if (rootnode!=NULL) rootnode->parent=oldroot;
-	rootnode=oldroot;
+        oldroot->right=rootnode;
+        if (rootnode!=NULL) rootnode->parent=oldroot;
+        rootnode=oldroot;
       }
 
       break;
@@ -313,33 +310,33 @@
     case '(':
       if (plevel==1) {
 #ifdef DEBUG_SYNTAX
-	printf("pt 3\n");
+        printf("pt 3\n");
 #endif
-	return 1;
+        return 1;
       }
       if (nstart!=-1) {
 #ifdef DEBUG_SYNTAX
-	printf("pt 4\n");
+        printf("pt 4\n");
 #endif
-	return 1;
+        return 1;
       }
 
       plevel=2;
       pstart=++i;
 
-      while(1) {
-	if (!strncmp(&exp[i],")",1)) plevel--;
-	else if (!strncmp(&exp[i],"(",1)) plevel++;
+      while (1) {
+        if (!strncmp(&exp[i],")",1)) plevel--;
+        else if (!strncmp(&exp[i],"(",1)) plevel++;
 
-	if (plevel==1) break;
+        if (plevel==1) break;
 
-	i++;
-	if (i>len) {
+        i++;
+        if (i>len) {
 #ifdef DEBUG_SYNTAX
-	printf("pt 5\n");
+          printf("pt 5\n");
 #endif
-	  return 1;
-	}
+          return 1;
+        }
       }
 
       parbit=strndup(exp+pstart,i-pstart);
@@ -357,9 +354,9 @@
       if (retval!=0) return retval;
 
       if (oldroot!=NULL) {
-	oldroot->right=rootnode;
-	if (rootnode!=NULL) rootnode->parent=oldroot;
-	rootnode=oldroot;
+        oldroot->right=rootnode;
+        if (rootnode!=NULL) rootnode->parent=oldroot;
+        rootnode=oldroot;
       }
       break;
 
@@ -375,30 +372,30 @@
     case '9':
       if (plevel==1) {
 #ifdef DEBUG_SYNTAX
-	printf("pt 6\n");
+        printf("pt 6\n");
 #endif
-	return 1;
+        return 1;
       }
       if (varname!=NULL) {
 #ifdef DEBUG_SYNTAX
-	printf("pt 7\n");
+        printf("pt 7\n");
 #endif
-	return 1;
+        return 1;
       }
       if (nstart==-1) nstart=i;
       break;
     case '.':
       if (plevel==1) {
 #ifdef DEBUG_SYNTAX
-	printf("pt 8\n");
+        printf("pt 8\n");
 #endif
-	return 1;
+        return 1;
       }
       if (gotdot||varname!=NULL) {
 #ifdef DEBUG_SYNTAX
-	printf("pt 9\n");
+        printf("pt 9\n");
 #endif
-	return 1;
+        return 1;
       }
       if (nstart==-1) nstart=i;
       gotdot=1;
@@ -407,67 +404,65 @@
     case '+':
       if (varname!=NULL) {
 #ifdef DEBUG_SYNTAX
-	printf("pt 10\n");
+        printf("pt 10\n");
 #endif
-	return 1;
+        return 1;
       }
       if (nstart==-1&&plevel==0) {
-	if (len+2>MAX_EXP_LEN) return 5;
-
-	tmp=weed_malloc(len+2);
-	snprintf(tmp,i+1,"%s",exp);
-
-	sprintf(tmp+i,"0");
-
-	// replace "+-" or "-+" with "0-"
-	// replace "++" or "--" with "0+ or "
-	if ((op=='-'&&exp[i]=='+')||(op=='+'&&exp[i]=='-')||(op!='+'&&op!='-'&&exp[i]=='-')) 
-	  sprintf(tmp+i+1,"-");
-	else 
-	  sprintf(tmp+i+1,"+");
-	sprintf(tmp+i+2,"%s",exp+i+1);
-	len++;
-	i--;
-	sprintf((char *)exp,"%s",tmp);
-
-	weed_free(tmp);
-	op=exp[i];
-	break;
+        if (len+2>MAX_EXP_LEN) return 5;
+
+        tmp=weed_malloc(len+2);
+        snprintf(tmp,i+1,"%s",exp);
+
+        sprintf(tmp+i,"0");
+
+        // replace "+-" or "-+" with "0-"
+        // replace "++" or "--" with "0+ or "
+        if ((op=='-'&&exp[i]=='+')||(op=='+'&&exp[i]=='-')||(op!='+'&&op!='-'&&exp[i]=='-'))
+          sprintf(tmp+i+1,"-");
+        else
+          sprintf(tmp+i+1,"+");
+        sprintf(tmp+i+2,"%s",exp+i+1);
+        len++;
+        i--;
+        sprintf((char *)exp,"%s",tmp);
+
+        weed_free(tmp);
+        op=exp[i];
+        break;
       }
 
     case '*':
     case '/':
       if (varname!=NULL) {
 #ifdef DEBUG_SYNTAX
-	printf("pt 11\n");
+        printf("pt 11\n");
 #endif
-	return 1;
+        return 1;
       }
       op=exp[i];
       if (plevel==0) {
-	if (nstart==-1) {
+        if (nstart==-1) {
 #ifdef DEBUG_SYNTAX
-	printf("pt 12\n");
+          printf("pt 12\n");
 #endif
-	  return 1;
-	}
-
-	snprintf(buf,i-nstart+1,"%s",exp+nstart);
-	
-	if (rootnode==NULL) {
-	  rootnode=new_node(buf);
-	  snprintf(buf,2,"%s",&exp[i]);
-	  add_parent(rootnode,buf);
-	}
-	else {
-	  add_right(rootnode,buf);
-	  snprintf(buf,2,"%s",&exp[i]);
-	  add_parent(rootnode,buf);
-	}
-      }
-      else {
-	snprintf(buf,2,"%s",&exp[i]);
-	add_parent(rootnode,buf);
+          return 1;
+        }
+
+        snprintf(buf,i-nstart+1,"%s",exp+nstart);
+
+        if (rootnode==NULL) {
+          rootnode=new_node(buf);
+          snprintf(buf,2,"%s",&exp[i]);
+          add_parent(rootnode,buf);
+        } else {
+          add_right(rootnode,buf);
+          snprintf(buf,2,"%s",&exp[i]);
+          add_parent(rootnode,buf);
+        }
+      } else {
+        snprintf(buf,2,"%s",&exp[i]);
+        add_parent(rootnode,buf);
       }
 
       nstart=-1;
@@ -478,30 +473,30 @@
     case 'i':
       if (plevel==1) {
 #ifdef DEBUG_SYNTAX
-	printf("pt 13\n");
+        printf("pt 13\n");
 #endif
-	return 1;
+        return 1;
       }
       if (varname!=NULL||nstart!=-1) {
 #ifdef DEBUG_SYNTAX
-	printf("pt 14\n");
+        printf("pt 14\n");
 #endif
-	return 1;
+        return 1;
       }
       varname=strdup("i");
       break;
     case 's':
       if (plevel==1) {
 #ifdef DEBUG_SYNTAX
-	printf("pt 15\n");
+        printf("pt 15\n");
 #endif
-	return 1;
+        return 1;
       }
       if (varname!=NULL||nstart!=-1) {
 #ifdef DEBUG_SYNTAX
-	printf("pt 16\n");
+        printf("pt 16\n");
 #endif
-	return 1;
+        return 1;
       }
       varname=strdup("s");
       break;
@@ -514,7 +509,7 @@
 
   if (nstart==-1) {
 #ifdef DEBUG_SYNTAX
-	printf("pt 17\n");
+    printf("pt 17\n");
 #endif
     if (plevel==0) return 1;
     return 0;
@@ -524,8 +519,7 @@
 
   if (rootnode==NULL) {
     rootnode=new_node(buf);
-  }
-  else {
+  } else {
     add_right(rootnode,buf);
   }
 
@@ -575,8 +569,8 @@
 
   register int i;
 
-  
-  for (i=0;i<len;i++) {
+
+  for (i=0; i<len; i++) {
     switch (exp[i]) {
     case '(':
       nstart=i;
@@ -597,7 +591,7 @@
     case '6':
     case '7':
     case '8':
-    case '9': 
+    case '9':
     case 'i':
     case 's':
       if (nstart==-1) nstart=i;
@@ -605,18 +599,18 @@
     case '+':
     case '-':
       if (nstart==-1) {
-	nstart=i;
-	break;
+        nstart=i;
+        break;
       }
       if (plevel>0&&(lastop=='*'||lastop=='/')) {
-	// close parens
-	if (nstart==-1) break;
-	sprintf(tmp,"%s",exp);
-	sprintf(tmp+i,")%s",exp+i);
-	sprintf((char *)exp,"%s",tmp);
-	len++;
-	i++;
-	plevel--;
+        // close parens
+        if (nstart==-1) break;
+        sprintf(tmp,"%s",exp);
+        sprintf(tmp+i,")%s",exp+i);
+        sprintf((char *)exp,"%s",tmp);
+        len++;
+        i++;
+        plevel--;
       }
       lastop=exp[i];
       nstart=-1;
@@ -624,14 +618,14 @@
     case '*':
     case '/':
       if (lastop=='+'||lastop=='-') {
-	// open parens
-	sprintf(tmp,"%s",exp);
-	sprintf(tmp+nstart,"(%s",exp+nstart);
-	sprintf((char *)exp,"%s",tmp);
-	len++;
-	i++;
-	nstart=-1;
-	plevel++;
+        // open parens
+        sprintf(tmp,"%s",exp);
+        sprintf(tmp+nstart,"(%s",exp+nstart);
+        sprintf((char *)exp,"%s",tmp);
+        len++;
+        i++;
+        nstart=-1;
+        plevel++;
       }
       lastop=exp[i];
       break;
@@ -640,12 +634,12 @@
     }
   }
 
- preprocdone:
+preprocdone:
 
   // close any open parens
   if (plevel>0) {
     sprintf(tmp,"%s",exp);
-    for (i=0;i<plevel;i++) {
+    for (i=0; i<plevel; i++) {
       sprintf(tmp+len+i,")");
     }
     sprintf((char *)exp,"%s",tmp);
@@ -658,7 +652,7 @@
 
 
 
-static double evaluate (const char *exp, _sdata *sdata) {
+static double evaluate(const char *exp, _sdata *sdata) {
   double res;
 
   sdata->error=0;
@@ -678,7 +672,7 @@
   print_tree(rootnode,2);
   fprintf(stderr,"\n\n");
 #endif
-  
+
   simplify(rootnode,sdata);
 
 #ifdef DEBUG
@@ -719,7 +713,7 @@
     return WEED_ERROR_MEMORY_ALLOCATION;
   }
 
-  for (i=0;i<NSTORE;i++) {
+  for (i=0; i<NSTORE; i++) {
     sdata->store[i]=0.;
   }
 
@@ -730,7 +724,7 @@
 
 
 
-int dataproc_process (weed_plant_t *inst, weed_timecode_t timestamp) {
+int dataproc_process(weed_plant_t *inst, weed_timecode_t timestamp) {
   int error;
   weed_plant_t **in_params=weed_get_plantptr_array(inst,"in_parameters",&error);
   weed_plant_t **out_params=weed_get_plantptr_array(inst,"out_parameters",&error);
@@ -750,7 +744,7 @@
 
   sdata->params=in_params;
 
-  for (i=EQS;i<EQN;i++) {
+  for (i=EQS; i<EQN; i++) {
     if (ip!=NULL) weed_free(ip);
     ip=weed_get_string_value(in_params[i],"value",&error);
 
@@ -796,58 +790,66 @@
 
     if (!strncmp(ip,"o[",2)) {
       if (which>=EQN-EQS) {
-	sdata->error=3;
+        sdata->error=3;
       }
     }
 
     else if (!strncmp(ip,"s[",2)) {
       if (which>=NSTORE) {
-	sdata->error=4;
+        sdata->error=4;
       }
     }
 
     if (!sdata->error) {
       sprintf(exp,"%s",ptr+1);
       res=evaluate(exp,sdata);
-    }
-    else sdata->error+=100;
+    } else sdata->error+=100;
 
     if (sdata->error) {
       switch (sdata->error) {
       case 1:
-	sprintf(exp,"%s",ptr+1);
-	fprintf(stderr,"data_processor ERROR: syntax error in RHS of eqn %d\n%s\n",i-EQS,exp); break;
+        sprintf(exp,"%s",ptr+1);
+        fprintf(stderr,"data_processor ERROR: syntax error in RHS of eqn %d\n%s\n",i-EQS,exp);
+        break;
       case 2:
-	fprintf(stderr,"data_processor ERROR: division by 0 in RHS of eqn %d\n",i-EQS); break;
+        fprintf(stderr,"data_processor ERROR: division by 0 in RHS of eqn %d\n",i-EQS);
+        break;
       case 3:
-	fprintf(stderr,"data_processor ERROR: i array out of bounds in RHS of eqn %d\n",i-EQS); break;
+        fprintf(stderr,"data_processor ERROR: i array out of bounds in RHS of eqn %d\n",i-EQS);
+        break;
       case 4:
-	fprintf(stderr,"data_processor ERROR: s array out of bounds in RHS of eqn %d\n",i-EQS); break;
+        fprintf(stderr,"data_processor ERROR: s array out of bounds in RHS of eqn %d\n",i-EQS);
+        break;
       case 5:
-	fprintf(stderr,"data_processor ERROR: expanded expression too long in RHS of eqn %d\n",i-EQS); break;
+        fprintf(stderr,"data_processor ERROR: expanded expression too long in RHS of eqn %d\n",i-EQS);
+        break;
       case 101:
-	snprintf(exp,len,"%s",ip+2);
-	fprintf(stderr,"data_processor ERROR: syntax error in LHS of eqn %d\n%s\n",i-EQS,exp); break;
+        snprintf(exp,len,"%s",ip+2);
+        fprintf(stderr,"data_processor ERROR: syntax error in LHS of eqn %d\n%s\n",i-EQS,exp);
+        break;
       case 102:
-	fprintf(stderr,"data_processor ERROR: division by 0 in LHS of eqn %d\n",i-EQS); break;
+        fprintf(stderr,"data_processor ERROR: division by 0 in LHS of eqn %d\n",i-EQS);
+        break;
       case 103:
-	fprintf(stderr,"data_processor ERROR: o array out of bounds in LHS of eqn %d\n",i-EQS); break;
+        fprintf(stderr,"data_processor ERROR: o array out of bounds in LHS of eqn %d\n",i-EQS);
+        break;
       case 104:
-	fprintf(stderr,"data_processor ERROR: s array out of bounds in LHS of eqn %d\n",i-EQS); break;
+        fprintf(stderr,"data_processor ERROR: s array out of bounds in LHS of eqn %d\n",i-EQS);
+        break;
       case 105:
-	fprintf(stderr,"data_processor ERROR: expanded expression too long in LHS of eqn %d\n",i-EQS); break;
+        fprintf(stderr,"data_processor ERROR: expanded expression too long in LHS of eqn %d\n",i-EQS);
+        break;
       default:
-	break;
+        break;
       }
 
     }
 
     else {
       if (!strncmp(ip,"s",1)) {
-	sdata->store[which]=res;
-      }
-      else {
-	weed_set_double_value(out_params[which],"value",res);
+        sdata->store[which]=res;
+      } else {
+        weed_set_double_value(out_params[which],"value",res);
       }
     }
 
@@ -876,7 +878,7 @@
 
 
 
-weed_plant_t *weed_setup (weed_bootstrap_f weed_boot) {
+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);
 
   if (plugin_info!=NULL) {
@@ -892,14 +894,14 @@
     char label[256];
     char desc[512];
 
-    for (i=0;i<EQS;i++) {
+    for (i=0; i<EQS; i++) {
       snprintf(name,256,"input%03d",i);
       in_params[i]=weed_float_init(name,"",0.,-1000000000000.,1000000000000.);
       gui=weed_parameter_template_get_gui(in_params[i]);
       weed_set_boolean_value(gui,"hidden",WEED_TRUE);
     }
 
-    for (i=EQS;i<EQN;i++) {
+    for (i=EQS; i<EQN; i++) {
       snprintf(name,256,"equation%03d",i-EQS);
       snprintf(label,256,"Equation %03d",i-EQS);
       snprintf(name2,256,"output%03d",i-EQS);
@@ -911,13 +913,15 @@
     out_params[EQN-EQS]=NULL;
 
     filter_class=weed_filter_class_init("data_processor","salsaman",1,0,&dataproc_init,&dataproc_process,
-					&dataproc_deinit,NULL,NULL,in_params,out_params);
+                                        &dataproc_deinit,NULL,NULL,in_params,out_params);
 
-    snprintf(desc,512,"Generically process out[x] from a combination of in[y], store[z] and arithmetic expressions.\nE.g:\no[0]=s[0]\ns[0]=i[0]*4\n\nArray subscripts can be from 0 - %d",EQS-1);
+    snprintf(desc,512,
+             "Generically process out[x] from a combination of in[y], store[z] and arithmetic expressions.\nE.g:\no[0]=s[0]\ns[0]=i[0]*4\n\nArray subscripts can be from 0 - %d",
+             EQS-1);
 
     weed_set_string_value(filter_class,"description",desc);
 
-    weed_plugin_info_add_filter_class (plugin_info,filter_class);
+    weed_plugin_info_add_filter_class(plugin_info,filter_class);
 
     weed_set_int_value(plugin_info,"version",package_version);
   }

LiVES-2.2.8.tar.bz2/lives-plugins/weed-plugins/data_unpacker.c -> LiVES-2.4.1.tar.bz2/lives-plugins/weed-plugins/data_unpacker.c Changed

LiVES-2.2.8.tar.bz2/lives-plugins/weed-plugins/deinterlace.c -> LiVES-2.4.1.tar.bz2/lives-plugins/weed-plugins/deinterlace.c Changed

LiVES-2.2.8.tar.bz2/lives-plugins/weed-plugins/edge.c -> LiVES-2.4.1.tar.bz2/lives-plugins/weed-plugins/edge.c Changed

LiVES-2.2.8.tar.bz2/lives-plugins/weed-plugins/fg_bg_removal.c -> LiVES-2.4.1.tar.bz2/lives-plugins/weed-plugins/fg_bg_removal.c Changed

LiVES-2.2.8.tar.bz2/lives-plugins/weed-plugins/fireTV.c -> LiVES-2.4.1.tar.bz2/lives-plugins/weed-plugins/fireTV.c Changed

@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////
 
 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 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
 
@@ -69,8 +69,7 @@
 
 //////////////////////////////////////////////////////
 
-inline uint32_t fastrand(struct _sdata *sdata)
-{
+inline uint32_t fastrand(struct _sdata *sdata) {
 #define rand_a 1073741789L
 #define rand_c 32749L
 
@@ -79,10 +78,9 @@
 
 
 
-static void HSItoRGB(double H, double S, double I, int *r, int *g, int *b)
-{
+static void HSItoRGB(double H, double S, double I, int *r, int *g, int *b) {
   double T,Rv,Gv,Bv;
-  
+
   T=H;
   Rv=1+S*sin(T-2*M_PI/3);
   Gv=1+S*sin(T);
@@ -94,20 +92,21 @@
 }
 
 
-static void makePalette()
-{
+static void makePalette() {
   int i, r, g, b;
 
-  for(i=0; i<MaxColor; i++) {
+  for (i=0; i<MaxColor; i++) {
     HSItoRGB(4.6-1.5*i/MaxColor, (double)i/MaxColor, (double)i/MaxColor, &r, &g, &b);
     palette[i] = ((r<<16)|(g<<8)|b)&0xffffff;
   }
-  for(i=MaxColor; i<256; i++) {
-    if(r<255)r++;if(r<255)r++;if(r<255)r++;
-    if(g<255)g++;
-    if(g<255)g++;
-    if(b<255)b++;
-    if(b<255)b++;
+  for (i=MaxColor; i<256; i++) {
+    if (r<255)r++;
+    if (r<255)r++;
+    if (r<255)r++;
+    if (g<255)g++;
+    if (g<255)g++;
+    if (b<255)b++;
+    if (b<255)b++;
     palette[i] = ((r<<16)|(g<<8)|b)&0xffffff;
   }
 }
@@ -120,21 +119,21 @@
   short *q;
   unsigned char *r;
   int v;
-  
+
   rowstride-=width;
 
   p = src;
   q = sdata->background;
   r = sdata->diff;
-  for(i=0; i<height; i++) {
-    for (j=0;j<width;j++) {
+  for (i=0; i<height; i++) {
+    for (j=0; j<width; j++) {
       R = ((*p)&0xff0000)>>(16-1);
       G = ((*p)&0xff00)>>(8-2);
       B = (*p)&0xff;
       v = (R + G + B) - (int)(*q);
       *q = (short)(R + G + B);
       *r = ((v + sdata->threshold)>>24) | ((sdata->threshold - v)>>24);
-      
+
       p++;
       q++;
       r++;
@@ -142,7 +141,7 @@
     p+=rowstride;
   }
 
-  
+
   /* The origin of subtraction function is;
    * diff(src, dest) = (abs(src - dest) > threshold) ? 0xff : 0;
    *
@@ -158,7 +157,7 @@
 
 
 
-int fire_init (weed_plant_t *inst) {
+int fire_init(weed_plant_t *inst) {
   int error;
   int map_h;
   int map_w;
@@ -167,7 +166,7 @@
   weed_plant_t *in_channel;
 
   sdata=weed_malloc(sizeof(struct _sdata));
-  if(sdata == NULL) return WEED_ERROR_MEMORY_ALLOCATION;
+  if (sdata == NULL) return WEED_ERROR_MEMORY_ALLOCATION;
 
   in_channel=weed_get_plantptr_value(inst,"in_channels",&error);
 
@@ -175,18 +174,18 @@
   map_w=weed_get_int_value(in_channel,"width",&error);
 
   sdata->buffer = (unsigned char *)weed_malloc(map_h*map_w*sizeof(unsigned char));
-  if(sdata->buffer == NULL ) {
+  if (sdata->buffer == NULL) {
     weed_free(sdata);
     return WEED_ERROR_MEMORY_ALLOCATION;
   }
   sdata->background = (short *)weed_malloc(map_h*map_w*sizeof(short));
-  if(sdata->background == NULL ) {
+  if (sdata->background == NULL) {
     weed_free(sdata->buffer);
     weed_free(sdata);
     return WEED_ERROR_MEMORY_ALLOCATION;
   }
   sdata->diff = (unsigned char *)weed_malloc(map_h*map_w * sizeof(unsigned char));
-  if(sdata->diff == NULL ) {
+  if (sdata->diff == NULL) {
     weed_free(sdata->background);
     weed_free(sdata->buffer);
     weed_free(sdata);
@@ -201,7 +200,7 @@
 }
 
 
-int fire_deinit (weed_plant_t *inst) {
+int fire_deinit(weed_plant_t *inst) {
   int error;
   struct _sdata *sdata;
 
@@ -217,7 +216,7 @@
 }
 
 
-int fire_process (weed_plant_t *inst, weed_timecode_t timestamp) {
+int fire_process(weed_plant_t *inst, weed_timecode_t timestamp) {
   struct _sdata *sdata;
 
   unsigned char v;
@@ -250,22 +249,22 @@
 
   image_bgsubtract_y(src,video_width,video_height,irow,sdata);
 
-  for(i=0; i<video_area-video_width; i++) {
+  for (i=0; i<video_area-video_width; i++) {
     sdata->buffer[i] |= sdata->diff[i];
   }
-  for(x=1; x<video_width-1; x++) {
+  for (x=1; x<video_width-1; x++) {
     i = video_width + x;
-    for(y=1; y<video_height; y++) {
+    for (y=1; y<video_height; y++) {
       v = sdata->buffer[i];
-      if(v<Decay)
-	sdata->buffer[i-video_width] = 0;
+      if (v<Decay)
+        sdata->buffer[i-video_width] = 0;
       else
-      sdata->buffer[i-video_width+fastrand(sdata)%3-1] = v - (fastrand(sdata)&Decay);
+        sdata->buffer[i-video_width+fastrand(sdata)%3-1] = v - (fastrand(sdata)&Decay);
       i += video_width;
     }
   }
-  for(y=0; y<video_height; y++) {
-    for(x=1; x<video_width-1; x++) {
+  for (y=0; y<video_height; y++) {
+    for (x=1; x<video_width-1; x++) {
       dest[y*orow+x] = (src[y*irow+x]&0xff000000)|palette[sdata->buffer[y*video_width+x]];
     }
   }
@@ -276,18 +275,19 @@
 
 
 
-weed_plant_t *weed_setup (weed_bootstrap_f weed_boot) {
+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);
 
   if (plugin_info!=NULL) {
-    int palette_list[]={WEED_PALETTE_BGRA32,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",0,palette_list),NULL};
-    
-    weed_plant_t *filter_class=weed_filter_class_init("fireTV","effectTV",1,0,&fire_init,&fire_process,&fire_deinit,in_chantmpls,out_chantmpls,NULL,NULL);
-    
-    weed_plugin_info_add_filter_class (plugin_info,filter_class);
-    
+    int palette_list[]= {WEED_PALETTE_BGRA32,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",0,palette_list),NULL};
+
+    weed_plant_t *filter_class=weed_filter_class_init("fireTV","effectTV",1,0,&fire_init,&fire_process,&fire_deinit,in_chantmpls,out_chantmpls,
+                               NULL,NULL);
+
+    weed_plugin_info_add_filter_class(plugin_info,filter_class);
+
     weed_set_int_value(plugin_info,"version",package_version);
 
     makePalette();

LiVES-2.2.8.tar.bz2/lives-plugins/weed-plugins/fourKlives.c -> LiVES-2.4.1.tar.bz2/lives-plugins/weed-plugins/fourKlives.c Changed

@@ -21,7 +21,7 @@
 ///////////////////////////////////////////////////////////////////
 
 static int num_versions=1; // number of different weed api versions supported
-static int api_versions[]={131}; // array of weed api versions supported in plugin, in order of preference (most preferred first)
+static int api_versions[]= {131}; // array of weed api versions supported in plugin, in order of preference (most preferred first)
 
 static int package_version=1; // version of this package
 
@@ -83,11 +83,11 @@
 
   sdata->maxtracks=0;
 
-  for(n=0;n<WAVES;n++) {
+  for (n=0; n<WAVES; n++) {
     sdata->aalto[n]=NULL;
   }
 
-  for(n=0;n<INSTR;n++) {
+  for (n=0; n<INSTR; n++) {
     sdata->echo[n]=NULL;
     sdata->instr[n]=NULL;
     sdata->pi[n]=0;
@@ -97,81 +97,81 @@
   sdata->global=freq;
   sdata->counter=0;
 
-    /* Generate lower octaves from 6 */
-  for(n=4;n>=0;n--)
-    for(i=0;i<12;i++)
+  /* Generate lower octaves from 6 */
+  for (n=4; n>=0; n--)
+    for (i=0; i<12; i++)
       notei[n*12+i]=notei[(n+1)*12+i]/2;
 
   /* Generate the waveforms */
-  for(n=0;n<WAVES;n++) {
+  for (n=0; n<WAVES; n++) {
     if (n!=KOHINA) {
       sdata->aalto[n]=weed_malloc(sdata->slen*sizeof(float));
       if (sdata->aalto[n]==NULL) {
-	return WEED_ERROR_MEMORY_ALLOCATION;
+        return WEED_ERROR_MEMORY_ALLOCATION;
       }
       weed_memset(sdata->aalto[n],0,sdata->slen*sizeof(float));
     }
   }
 
-    for (n=0;n<sdata->slen;n++) {
-      sdata->aalto[KANTTI][n]=(n<sdata->slen/2)?-1.0:1.0;
-      sdata->aalto[SINI][n]  =sin(n*2.0*M_PI/(float)sdata->slen);
-      sdata->aalto[SAHA][n]  =-1.0+fmod(1.0+2.0*n/(float)sdata->slen,2.0);
-    }
+  for (n=0; n<sdata->slen; n++) {
+    sdata->aalto[KANTTI][n]=(n<sdata->slen/2)?-1.0:1.0;
+    sdata->aalto[SINI][n]  =sin(n*2.0*M_PI/(float)sdata->slen);
+    sdata->aalto[SAHA][n]  =-1.0+fmod(1.0+2.0*n/(float)sdata->slen,2.0);
+  }
 
-    /* Noise needs to be longer */
-    sdata->aalto[KOHINA]=weed_malloc(sdata->global*sizeof(float));
-    if (sdata->aalto[KOHINA]==NULL) {
-      return WEED_ERROR_MEMORY_ALLOCATION;
-    }
+  /* Noise needs to be longer */
+  sdata->aalto[KOHINA]=weed_malloc(sdata->global*sizeof(float));
+  if (sdata->aalto[KOHINA]==NULL) {
+    return WEED_ERROR_MEMORY_ALLOCATION;
+  }
 
-    for(n=0;n<sdata->global;n++)
-        sdata->aalto[KOHINA][n]=(rand()%2000-1000)/(float)1000.0;
+  for (n=0; n<sdata->global; n++)
+    sdata->aalto[KOHINA][n]=(rand()%2000-1000)/(float)1000.0;
 
-    /* Set starting values */
-    for(n=0;n<INSTR;n++) {
-      sdata->live_row[n]=0;
-      sdata->new_live_row[n]=0;
+  /* Set starting values */
+  for (n=0; n<INSTR; n++) {
+    sdata->live_row[n]=0;
+    sdata->new_live_row[n]=0;
 
-      sdata->off[n]=-1;
-      sdata->plus[n]=0;
-      sdata->trak[n][0]=END;
-      sdata->ti[n]=-1;
-      sdata->eko[n]=0;
-      sdata->pan[n]=(n&1)?128-64:128+64;
+    sdata->off[n]=-1;
+    sdata->plus[n]=0;
+    sdata->trak[n][0]=END;
+    sdata->ti[n]=-1;
+    sdata->eko[n]=0;
+    sdata->pan[n]=(n&1)?128-64:128+64;
 #ifdef MONO
-      sdata->pan[n]=128;
+    sdata->pan[n]=128;
 #endif
-      
-      sdata->pola[n]=0;
-      sdata->vol[n]=255;
-      sdata->prev[n]=0;
-      sdata->slide[n]=0;
-    }
-    return WEED_NO_ERROR;
+
+    sdata->pola[n]=0;
+    sdata->vol[n]=255;
+    sdata->prev[n]=0;
+    sdata->slide[n]=0;
+  }
+  return WEED_NO_ERROR;
 }
 
 #ifndef TINY
 static int syna_load(_sdata *sdata, const char *tune) {
-    FILE    *f;
-    long    length;
+  FILE    *f;
+  long    length;
 
-    int retval;
+  int retval;
 
-    /* Read the file and call syna_get */
-    f=fopen(tune,"rb");
-    if (f==NULL) return WEED_ERROR_INIT_ERROR;
-    fseek(f,0,SEEK_END);
-    length=ftell(f);
-    fseek(f,0,SEEK_SET);
-    sdata->module=weed_malloc(length+1);
-    retval=fread(sdata->module,1,length,f);
-    sdata->module[length]=0; /* String ends in zero */
-    fclose(f);
+  /* Read the file and call syna_get */
+  f=fopen(tune,"rb");
+  if (f==NULL) return WEED_ERROR_INIT_ERROR;
+  fseek(f,0,SEEK_END);
+  length=ftell(f);
+  fseek(f,0,SEEK_SET);
+  sdata->module=weed_malloc(length+1);
+  retval=fread(sdata->module,1,length,f);
+  sdata->module[length]=0; /* String ends in zero */
+  fclose(f);
 
-    if (retval<length) return WEED_ERROR_INIT_ERROR;
+  if (retval<length) return WEED_ERROR_INIT_ERROR;
 
-    return(syna_get(sdata));
+  return (syna_get(sdata));
 }
 #endif
 
@@ -187,140 +187,136 @@
 #endif
 
   /* Extract rows */
-  for(n=0;n<MAXR;n++) {
+  for (n=0; n<MAXR; n++) {
     rows[n]=strtok((n)?NULL:sdata->module,"\n");
-    if(rows[n]==NULL)
+    if (rows[n]==NULL)
       break;
   }
 
   /* Extract data from rows */
-  for(i=0;i<n;i++) {
-    if(rows[i][0]=='#')
+  for (i=0; i<n; i++) {
+    if (rows[i][0]=='#')
       continue;
 
     key=strtok(rows[i],":");
 
     if (key) {
-      if(!strcmp(key,"bpm")) {
-	tmp=atoi(strtok(NULL,":"))*10/25;
-	sdata->song_bpm=tmp;
-	sdata->new_update=sdata->update=6*sdata->global/tmp;
-	sdata->ekolen=sdata->update*3;
+      if (!strcmp(key,"bpm")) {
+        tmp=atoi(strtok(NULL,":"))*10/25;
+        sdata->song_bpm=tmp;
+        sdata->new_update=sdata->update=6*sdata->global/tmp;
+        sdata->ekolen=sdata->update*3;
+      }
+      if (key[0]=='i') {
+        /* Get instrument number and wave form */
+        tmp=atoi(&key[1]);
+        if (tmp<INSTR) {
+          if (sdata->echo[tmp]!=NULL) weed_free(sdata->echo[tmp]);
+          sdata->echo[tmp]=weed_malloc(sdata->ekolen*sizeof(int));
+          if (sdata->echo[tmp]==NULL) {
+            return WEED_ERROR_MEMORY_ALLOCATION;
+          }
+          weed_memset(sdata->echo[tmp],0,sdata->ekolen*sizeof(int));
+        }
+
+        tnp=strtok(NULL,",");
+
+        wave=0;
+
+        if (!strcmp(tnp,"kantti") || !strcmp(tnp,"square"))
+          wave=0;
+        else if (!strcmp(tnp,"sini") || !strcmp(tnp,"sin"))
+          wave=1;
+        else if (!strcmp(tnp,"saha") || !strcmp(tnp,"saw"))
+          wave=2;
+        else if (!strcmp(tnp,"kohina") || !strcmp(tnp,"noise"))
+          wave=3;
+
+        /* Get ADSR */
+        a=atoi(strtok(NULL,","));
+        d=atoi(strtok(NULL,","));
+        s=atoi(strtok(NULL,","));
+        r=atoi(strtok(NULL,","));
+
+        if (tmp<INSTR) {
+          sdata->len[tmp]=a+d+s+r+1;
+          sdata->instr[tmp]=weed_malloc(sdata->len[tmp]*sizeof(int));
+          if (sdata->echo[tmp]==NULL) {
+            return WEED_ERROR_MEMORY_ALLOCATION;
+          }
+          weed_memset(sdata->instr[tmp],0,sdata->len[tmp]*sizeof(int));
+        }
+
+        mod=atoi(strtok(NULL,","));
+        if ((tnp=strtok(NULL,",")))
+          sweep=atoi(tnp);
+        else
+          sweep=0;
+        if ((tnp=strtok(NULL,",")))
+          if (tmp<INSTR) sdata->pan[tmp]=(float)atoi(tnp)*255/100;
+        if ((tnp=strtok(NULL,",")))
+          if (tmp<INSTR) sdata->pola[tmp]=atoi(tnp)*255/100;
+
+        wave_mod=1;
+
+        if ((tnp=strtok(NULL,","))) {
+          if (!strcmp(tnp,"kantti") || !strcmp(tnp,"square"))
+            wave_mod=0;
+          else if (!strcmp(tnp,"sini") || !strcmp(tnp,"sin"))
+            wave_mod=1;
+          else if (!strcmp(tnp,"saha") || !strcmp(tnp,"saw"))
+            wave_mod=2;
+          else if (!strcmp(tnp,"kohina") || !strcmp(tnp,"noise"))
+            wave_mod=3;
+        }
+
+        if (tmp<INSTR) adsr(sdata,a,d,s,r,mod,sweep,tmp,wave,wave_mod);
       }
-      if(key[0]=='i') {
-	/* Get instrument number and wave form */
-	tmp=atoi(&key[1]);
-	if (tmp<INSTR) {
-	  if (sdata->echo[tmp]!=NULL) weed_free(sdata->echo[tmp]);
-	  sdata->echo[tmp]=weed_malloc(sdata->ekolen*sizeof(int));
-	  if (sdata->echo[tmp]==NULL) {
-	    return WEED_ERROR_MEMORY_ALLOCATION;
-	  }
-	  weed_memset(sdata->echo[tmp],0,sdata->ekolen*sizeof(int));
-	}
-
-	tnp=strtok(NULL,",");
-
-	wave=0;
-
-	if(!strcmp(tnp,"kantti") || !strcmp(tnp,"square"))
-	  wave=0;
-	else if(!strcmp(tnp,"sini") || !strcmp(tnp,"sin"))
-	  wave=1;
-	else if(!strcmp(tnp,"saha") || !strcmp(tnp,"saw"))
-	  wave=2;
-	else if(!strcmp(tnp,"kohina") || !strcmp(tnp,"noise"))
-	  wave=3;
-	
-	/* Get ADSR */
-	a=atoi(strtok(NULL,","));
-	d=atoi(strtok(NULL,","));
-	s=atoi(strtok(NULL,","));
-	r=atoi(strtok(NULL,","));
-
-	if (tmp<INSTR) {
-	  sdata->len[tmp]=a+d+s+r+1;
-	  sdata->instr[tmp]=weed_malloc(sdata->len[tmp]*sizeof(int));
-	  if (sdata->echo[tmp]==NULL) {
-	    return WEED_ERROR_MEMORY_ALLOCATION;
-	  }
-	  weed_memset(sdata->instr[tmp],0,sdata->len[tmp]*sizeof(int));
-	}
-
-	mod=atoi(strtok(NULL,","));
-	if((tnp=strtok(NULL,",")))
-	  sweep=atoi(tnp);
-	else
-	  sweep=0;
-	if((tnp=strtok(NULL,",")))
-	  if (tmp<INSTR) sdata->pan[tmp]=(float)atoi(tnp)*255/100;
-	if((tnp=strtok(NULL,",")))
-	  if (tmp<INSTR) sdata->pola[tmp]=atoi(tnp)*255/100;
-
-	wave_mod=1;
-	
-	if ((tnp=strtok(NULL,","))) {
-	  if(!strcmp(tnp,"kantti") || !strcmp(tnp,"square"))
-	    wave_mod=0;
-	  else if(!strcmp(tnp,"sini") || !strcmp(tnp,"sin"))
-	    wave_mod=1;
-	  else if(!strcmp(tnp,"saha") || !strcmp(tnp,"saw"))
-	    wave_mod=2;
-	  else if(!strcmp(tnp,"kohina") || !strcmp(tnp,"noise"))
-	    wave_mod=3;
-	}
-
-	if (tmp<INSTR) adsr(sdata,a,d,s,r,mod,sweep,tmp,wave,wave_mod);
+
+      if (key[0]=='p') { /* Handle pattern */
+        patt=atoi(&key[1]);
+        j=0;
+        while (1) {
+          tnp=strtok(NULL,",");
+          if (tnp!=NULL) {
+            note=0;
+            for (tmp=0; notes[tmp][0]!='0'; tmp++)
+              if (!strcmp(notes[tmp],tnp))
+                note=notei[tmp];
+            sdata->ptn[patt][j]=note;
+            if (note==VOL || note==SLIDE) {
+              j++;
+              sdata->ptn[patt][j]=atoi(strtok(NULL,","));
+            }
+
+            j++;
+          } else {
+            sdata->ptn[patt][j]=END;
+            break;
+          }
+        }
       }
 
-      if(key[0]=='p') /* Handle pattern */
-	{
-	  patt=atoi(&key[1]);
-	  j=0;
-	  while(1) {
-	    tnp=strtok(NULL,",");
-	    if(tnp!=NULL) {
-	      note=0;
-	      for (tmp=0;notes[tmp][0]!='0';tmp++)
-		if(!strcmp(notes[tmp],tnp))
-		  note=notei[tmp];
-	      sdata->ptn[patt][j]=note;
-	      if(note==VOL || note==SLIDE) {
-		j++;
-		sdata->ptn[patt][j]=atoi(strtok(NULL,","));
-	      }
-
-	      j++;
-	    }
-	    else {
-	      sdata->ptn[patt][j]=END;
-	      break;
-	    }
-	  }
-	}
-
-      if(key[0]=='t') /* Handle track */
-	{
-	  track=atoi(&key[1]);
-	  j=0;
-	  while(1) {
-	    tnp=strtok(NULL,",");
-	    if(tnp!=NULL) {
-	      if(!strcmp(tnp,"loop"))
-		sdata->trak[track][j]=LOOP;
-	      else {
-		patt=atoi(&tnp[1]);
-		sdata->trak[track][j]=patt;
-	      }
-	      if (j>sdata->maxtracks) sdata->maxtracks=j;
-	      j++;
-	    }
-	    else {
-	      sdata->trak[track][j]=END;
-	      break;
-	    }
-	  }
-	}
+      if (key[0]=='t') { /* Handle track */
+        track=atoi(&key[1]);
+        j=0;
+        while (1) {
+          tnp=strtok(NULL,",");
+          if (tnp!=NULL) {
+            if (!strcmp(tnp,"loop"))
+              sdata->trak[track][j]=LOOP;
+            else {
+              patt=atoi(&tnp[1]);
+              sdata->trak[track][j]=patt;
+            }
+            if (j>sdata->maxtracks) sdata->maxtracks=j;
+            j++;
+          } else {
+            sdata->trak[track][j]=END;
+            break;
+          }
+        }
+      }
     }
   }
 
@@ -329,10 +325,10 @@
 
 #if 0
 // added by Antti Silvast for setting all live the rows
-static void set_live_rows(_sdata *sdata, int * the_rows) {
+static void set_live_rows(_sdata *sdata, int *the_rows) {
   register int i;
 
-  for(i=0;i<INSTR; i++) {
+  for (i=0; i<INSTR; i++) {
     sdata->new_live_row[i]=the_rows[i];
     //pi[i]=0;
   }
@@ -348,87 +344,96 @@
   int note,li; // li is the "live i"
   int left,right,smp;
   int ceko,c1eko;
-      
+
   register int i,n;
 
   ceko=sdata->counter%sdata->ekolen;
 
-  for(n=0;n<length;n++,sdata->counter++) {
+  for (n=0; n<length; n++,sdata->counter++) {
     c1eko=ceko+1;
-    if(c1eko==sdata->ekolen)
+    if (c1eko==sdata->ekolen)
       c1eko=0;
 
     /* New row */
     if (sdata->counter > sdata->update) {
       sdata->counter=0;
       sdata->update=sdata->new_update;
-      for (i=1;sdata->trak[i][0]!=END;i++) {
-	li=sdata->live_row[i];
-	//li=i;
-	if (li==END)
-	  continue;
-	sdata->pi[i]++;
-
-	if(li==-1 || sdata->ptn[sdata->trak[i][li]][sdata->pi[i]]==END) {
-	  li=sdata->live_row[i]=sdata->new_live_row[i];
-	  //ti[i]++;
-	  /*
-	    if(trak[i][li]==LOOP)
-	    li=0;
-	    if(trak[i][li]==END)
-	    li=END;
-	  */
-	  sdata->pi[i]=0;
-	}
-	//printf("%d=%d ",i,trak[i][li]);
-
-	if (li!=END) {
-	  if ((note=sdata->ptn[sdata->trak[i][li]][sdata->pi[i]])) {
-	    switch(note) {
-	    case STOP  : sdata->off[i]=-1; break;
-	    case ECHON : sdata->eko[i]=1; break;
-	    case ECHOFF: sdata->eko[i]=0; break;
-	    case VOL   : sdata->pi[i]++;
-	      sdata->vol[i]=sdata->ptn[sdata->trak[i][li]][sdata->pi[i]]*255/100;
-	      break;
-	    case SLIDE : sdata->pi[i]++;
-	      sdata->slide[i]=sdata->ptn[sdata->trak[i][li]][sdata->pi[i]]*164/1000;
-	      break;
-	    default    : sdata->plus[i]=note<<13;
-	      //plus[i]/=BFREQ;
-	      sdata->off[i]=0;
-	    }
-	  }
-	}
+      for (i=1; sdata->trak[i][0]!=END; i++) {
+        li=sdata->live_row[i];
+        //li=i;
+        if (li==END)
+          continue;
+        sdata->pi[i]++;
+
+        if (li==-1 || sdata->ptn[sdata->trak[i][li]][sdata->pi[i]]==END) {
+          li=sdata->live_row[i]=sdata->new_live_row[i];
+          //ti[i]++;
+          /*
+            if(trak[i][li]==LOOP)
+            li=0;
+            if(trak[i][li]==END)
+            li=END;
+          */
+          sdata->pi[i]=0;
+        }
+        //printf("%d=%d ",i,trak[i][li]);
+
+        if (li!=END) {
+          if ((note=sdata->ptn[sdata->trak[i][li]][sdata->pi[i]])) {
+            switch (note) {
+            case STOP  :
+              sdata->off[i]=-1;
+              break;
+            case ECHON :
+              sdata->eko[i]=1;
+              break;
+            case ECHOFF:
+              sdata->eko[i]=0;
+              break;
+            case VOL   :
+              sdata->pi[i]++;
+              sdata->vol[i]=sdata->ptn[sdata->trak[i][li]][sdata->pi[i]]*255/100;
+              break;
+            case SLIDE :
+              sdata->pi[i]++;
+              sdata->slide[i]=sdata->ptn[sdata->trak[i][li]][sdata->pi[i]]*164/1000;
+              break;
+            default    :
+              sdata->plus[i]=note<<13;
+              //plus[i]/=BFREQ;
+              sdata->off[i]=0;
+            }
+          }
+        }
       }
-      
+
       //printf("\n");
-      
+
     }
 
 #define MARQ_ARM_OPT
-    
+
 #ifndef MARQ_ARM_OPT
     /* Sum the instruments */
     left=right=0;
-    for(i=1;sdata->trak[i][0]!=END;i++) {
+    for (i=1; sdata->trak[i][0]!=END; i++) {
       smp=sdata->echo[i][(sdata->counter+1)%sdata->ekolen];
 
       sdata->echo[i][sdata->counter%sdata->ekolen]=sdata->echo[i][(sdata->counter+1)%sdata->ekolen]*6/10;
       if (sdata->off[i]>=0) {
-	smp+=sdata->instr[i][sdata->off[i]>>13];
+        smp+=sdata->instr[i][sdata->off[i]>>13];
 
-	if (sdata->eko[i])
-	  sdata->echo[i][sdata->counter%sdata->ekolen]=smp*2/10;
+        if (sdata->eko[i])
+          sdata->echo[i][sdata->counter%sdata->ekolen]=smp*2/10;
 
-	sdata->off[i]+=(sdata->plus[i]+sdata->base_speed);
-	sdata->plus[i]+=sdata->slide[i];
-	if ((sdata->off[i]>>13)>=sdata->len[i] || sdata->off[i]<0)
-	  sdata->off[i]=-1;
+        sdata->off[i]+=(sdata->plus[i]+sdata->base_speed);
+        sdata->plus[i]+=sdata->slide[i];
+        if ((sdata->off[i]>>13)>=sdata->len[i] || sdata->off[i]<0)
+          sdata->off[i]=-1;
       }
 
       if (sdata->pola[i])
-	smp=(smp*(255^sdata->pola[i])>>8)+(sdata->prev[i]*sdata->pola[i]>>8);
+        smp=(smp*(255^sdata->pola[i])>>8)+(sdata->prev[i]*sdata->pola[i]>>8);
       sdata->prev[i]=smp;
 
       smp=smp*sdata->vol[i]>>8;
@@ -438,7 +443,7 @@
 
     if (left<-98301)
       left=-98301;
-    if(left>98301)
+    if (left>98301)
       left=98301;
     if (!interleave||channels==1)
       dest[n]=(float)left/98301.;
@@ -446,10 +451,10 @@
       dest[n*2]=(float)left/98301.;
 
     if (channels==2) {
-      if(right<-98301)
-	right=-98301;
-      if(right>98301)
-	right=98301;
+      if (right<-98301)
+        right=-98301;
+      if (right>98301)
+        right=98301;
       if (interleave) dest[n*2+1]=(float)right/98301.;
       else dest[n+length]=(float)right/98301.;
     }
@@ -457,7 +462,7 @@
 #else
     // sum the instruments
     left=right=0;
-    for (i=1;sdata->trak[i][0]!=END;i++) {
+    for (i=1; sdata->trak[i][0]!=END; i++) {
 
       smp=sdata->echo[i][c1eko];
 
@@ -466,58 +471,56 @@
       sdata->echo[i][ceko]=smp*19>>5;
 
       if (sdata->off[i]>=0) {
-	smp+=sdata->instr[i][sdata->off[i]>>13];
-	//fprintf(stderr,"ok2 %d\n",smp);
-
-	if(sdata->eko[i])
-	  sdata->echo[i][ceko]=smp*13>>6;
-	
-	sdata->off[i]+=(sdata->plus[i]/sdata->base_freq);
-	sdata->plus[i]+=sdata->slide[i]*sdata->base_freq;
-	if ((sdata->off[i]>>13)>=sdata->len[i] || sdata->off[i]<0)
-	  sdata->off[i]=-1;
+        smp+=sdata->instr[i][sdata->off[i]>>13];
+        //fprintf(stderr,"ok2 %d\n",smp);
+
+        if (sdata->eko[i])
+          sdata->echo[i][ceko]=smp*13>>6;
+
+        sdata->off[i]+=(sdata->plus[i]/sdata->base_freq);
+        sdata->plus[i]+=sdata->slide[i]*sdata->base_freq;
+        if ((sdata->off[i]>>13)>=sdata->len[i] || sdata->off[i]<0)
+          sdata->off[i]=-1;
       }
 
       if (sdata->pola[i])
-	smp=(smp*(255^sdata->pola[i])>>8)+(sdata->prev[i]*sdata->pola[i]>>8);
+        smp=(smp*(255^sdata->pola[i])>>8)+(sdata->prev[i]*sdata->pola[i]>>8);
       sdata->prev[i]=smp;
       //fprintf(stderr,"ok23 %d\n",smp);
 
       smp=smp*sdata->vol[i]>>8;
-	//fprintf(stderr,"ok24 %d\n",smp);
+      //fprintf(stderr,"ok24 %d\n",smp);
       left+=(255^sdata->pan[i])*smp>>8;
       if (channels==2)
-	right+=sdata->pan[i]*smp>>8;
+        right+=sdata->pan[i]*smp>>8;
     }
-    
-    if(left<-98301)
+
+    if (left<-98301)
       left=-98301;
-    else
-      if(left>98301)
-	left=98301;
+    else if (left>98301)
+      left=98301;
     if (!interleave||channels==1)
       dest[n]=(float)(left*21>>6)/32767.;
     else {
       dest[n*2]=(float)(left*21>>6)/32767.;
-      
+
     }
-    
+
     if (channels==2) {
-      if(right<-98301)
-	right=-98301;
-      else
-	if(right>98301)
-	  right=98301;
+      if (right<-98301)
+        right=-98301;
+      else if (right>98301)
+        right=98301;
       if (interleave) dest[n*2+1]=(float)(right*21>>6)/32767.;
       else dest[n+length]=(float)(right*21>>6)/32767.;
     }
-    
+
     //fprintf(stderr,"vals %d and %d, %f and %f\n",left,right,(float)(left*21>>6)/32767.,(float)(right*21>>6)/32767.);
 
     ceko++;
-    if(ceko==sdata->ekolen)
+    if (ceko==sdata->ekolen)
       ceko=0;
-	
+
 #endif
 
 
@@ -525,67 +528,65 @@
 }
 
 /* Make ADSR to instruments */
-static void adsr(_sdata *sdata, int a, int d, int s, int r, int mod, int swp, int ins, int wave, int wave_mod)
-{
-    int n,modulo=sdata->slen,id=0;
-    float  i=0,vol=0.0,dv,oh=0.0,op,ip=1,sweep;
-
-    if(!a) a=1;
-    if(!r) r=1;
-
-    if(wave==KOHINA)
-        modulo=sdata->global;
-
-    if(mod) /* We modulate! */
-	if (wave_mod==1)
-		op=mod/100.0*2.0*M_PI/(float)sdata->slen;
-	else
-	        op=(float)mod/100.0;
+static void adsr(_sdata *sdata, int a, int d, int s, int r, int mod, int swp, int ins, int wave, int wave_mod) {
+  int n,modulo=sdata->slen,id=0;
+  float  i=0,vol=0.0,dv,oh=0.0,op,ip=1,sweep;
+
+  if (!a) a=1;
+  if (!r) r=1;
+
+  if (wave==KOHINA)
+    modulo=sdata->global;
+
+  if (mod) /* We modulate! */
+    if (wave_mod==1)
+      op=mod/100.0*2.0*M_PI/(float)sdata->slen;
     else
-        op=0;
+      op=(float)mod/100.0;
+  else
+    op=0;
 
-    sweep=(float)swp/1000.0/(float)sdata->slen;
+  sweep=(float)swp/1000.0/(float)sdata->slen;
 
-    dv=32767.0/(float)a;
-    for(n=0;n<a;n++,i+=ip,ip+=sweep,vol+=dv,oh+=op)
-	if (wave_mod!=1)
-	        sdata->instr[ins][id++]=vol*sdata->aalto[wave][((int)i)%modulo]*((mod)?sdata->aalto[wave_mod][((int)oh)%modulo]:1.0);
-	else
-	        sdata->instr[ins][id++]=vol*sdata->aalto[wave][((int)i)%modulo]*((mod)?sin(oh):1.0);
+  dv=32767.0/(float)a;
+  for (n=0; n<a; n++,i+=ip,ip+=sweep,vol+=dv,oh+=op)
+    if (wave_mod!=1)
+      sdata->instr[ins][id++]=vol*sdata->aalto[wave][((int)i)%modulo]*((mod)?sdata->aalto[wave_mod][((int)oh)%modulo]:1.0);
+    else
+      sdata->instr[ins][id++]=vol*sdata->aalto[wave][((int)i)%modulo]*((mod)?sin(oh):1.0);
 
-    for(n=0;n<d;n++,i+=ip,ip+=sweep,vol-=dv,oh+=op)
-	if (wave_mod!=1)
-	        sdata->instr[ins][id++]=vol*sdata->aalto[wave][((int)i)%modulo]*((mod)?sdata->aalto[wave_mod][((int)oh)%modulo]:1.0);
-	else
-	        sdata->instr[ins][id++]=vol*sdata->aalto[wave][((int)i)%modulo]*((mod)?sin(oh):1.0);
+  for (n=0; n<d; n++,i+=ip,ip+=sweep,vol-=dv,oh+=op)
+    if (wave_mod!=1)
+      sdata->instr[ins][id++]=vol*sdata->aalto[wave][((int)i)%modulo]*((mod)?sdata->aalto[wave_mod][((int)oh)%modulo]:1.0);
+    else
+      sdata->instr[ins][id++]=vol*sdata->aalto[wave][((int)i)%modulo]*((mod)?sin(oh):1.0);
 
 
-    for(n=0;n<s;n++,i+=ip,ip+=sweep,oh+=op)
-	if (wave_mod!=1) 
-	        sdata->instr[ins][id++]=vol*sdata->aalto[wave][((int)i)%modulo]*((mod)?sdata->aalto[wave_mod][((int)oh)%modulo]:1.0);
-	else
-	        sdata->instr[ins][id++]=vol*sdata->aalto[wave][((int)i)%modulo]*((mod)?sin(oh):1.0);
+  for (n=0; n<s; n++,i+=ip,ip+=sweep,oh+=op)
+    if (wave_mod!=1)
+      sdata->instr[ins][id++]=vol*sdata->aalto[wave][((int)i)%modulo]*((mod)?sdata->aalto[wave_mod][((int)oh)%modulo]:1.0);
+    else
+      sdata->instr[ins][id++]=vol*sdata->aalto[wave][((int)i)%modulo]*((mod)?sin(oh):1.0);
 
-    dv=vol/(float)r;
+  dv=vol/(float)r;
 
-    for(n=0;n<r;n++,i+=ip,ip+=sweep,vol-=dv,oh+=op)
-	if (wave_mod!=1)
-	        sdata->instr[ins][id++]=vol*sdata->aalto[wave][((int)i)%modulo]*((mod)?sdata->aalto[wave_mod][((int)oh)%modulo]:1.0);
-	else
-	        sdata->instr[ins][id++]=vol*sdata->aalto[wave][((int)i)%modulo]*((mod)?sin(oh):1.0);
+  for (n=0; n<r; n++,i+=ip,ip+=sweep,vol-=dv,oh+=op)
+    if (wave_mod!=1)
+      sdata->instr[ins][id++]=vol*sdata->aalto[wave][((int)i)%modulo]*((mod)?sdata->aalto[wave_mod][((int)oh)%modulo]:1.0);
+    else
+      sdata->instr[ins][id++]=vol*sdata->aalto[wave][((int)i)%modulo]*((mod)?sin(oh):1.0);
 
 }
 
 /* Fix the fscking Windoze/DOS newlines */
 #ifndef TINY
-void cleanup(char *s)
-{
-    char    *d=strdup(s);
-
-    for(;*d;d++)
-        if(*d!='\r' && *d!=' ')
-            *s++=*d;
-    *s=0;
+void cleanup(char *s) {
+  char    *d=strdup(s);
+
+  for (; *d; d++)
+    if (*d!='\r' && *d!=' ')
+      *s++=*d;
+  *s=0;
 }
 #endif
 
@@ -595,10 +596,10 @@
 
   if (sdata==NULL) return;
 
-  for(n=0;n<WAVES;n++) {
+  for (n=0; n<WAVES; n++) {
     if (sdata->aalto[n]!=NULL) weed_free(sdata->aalto[n]);
   }
-  for(n=0;n<INSTR;n++) {
+  for (n=0; n<INSTR; n++) {
     if (sdata->echo[n]!=NULL) weed_free(sdata->echo[n]);
   }
   if (sdata->module!=NULL) weed_free(sdata->module);
@@ -620,7 +621,7 @@
 
 
 
-int fourk_init (weed_plant_t *inst) {
+int fourk_init(weed_plant_t *inst) {
   int error,retval;
   int rate;
 
@@ -660,7 +661,7 @@
     sprintf(tune+strlen(tune),"%s",".txt");
 
 #ifdef DEBUG
-  fprintf(stderr,"4k: loading tune %s\n",tune);
+    fprintf(stderr,"4k: loading tune %s\n",tune);
 #endif
 
     if ((retval=syna_load(sdata,tune))!=WEED_NO_ERROR) {
@@ -683,7 +684,7 @@
 
 
 
-int fourk_process (weed_plant_t *inst, weed_timecode_t timestamp) {
+int fourk_process(weed_plant_t *inst, weed_timecode_t timestamp) {
   int error;
   int chans,nsamps,inter;
 
@@ -707,7 +708,7 @@
   inter=weed_get_boolean_value(out_channel,"audio_interleaf",&error);
   //rate=weed_get_int_value(out_channel,"audio_rate",&error);
 
-  for (i=0;i<NCHANNELS;i++) {
+  for (i=0; i<NCHANNELS; i++) {
     set_live_row(sdata,i,(rand()%(sdata->maxtracks*1000-1))/1000.f+1.);  // 2nd val can be 2 (?) to npat (?)
   }
 
@@ -722,7 +723,7 @@
 
 
 
-weed_plant_t *weed_setup (weed_bootstrap_f weed_boot) {
+weed_plant_t *weed_setup(weed_bootstrap_f weed_boot) {
   weed_plant_t *plugin_info;
   DIR *dir=NULL;
   struct dirent *dirent;
@@ -755,17 +756,17 @@
     weed_plant_t *in_params[NCHANNELS+4]; // tune name + channel rows + tempo + base_freq + NULL
     weed_plant_t *filter_class;
 
-  
+
     register int i;
-    
-    in_params[0]=weed_string_list_init("tune_name","_Tune",0,(const char ** const)tunes);
+
+    in_params[0]=weed_string_list_init("tune_name","_Tune",0,(const char **const)tunes);
     weed_set_int_value(in_params[0],"flags",WEED_PARAMETER_REINIT_ON_VALUE_CHANGE);
 
     in_params[1]=weed_float_init("tempo","_Tempo",.5,0.,1.);
     in_params[2]=weed_float_init("bfreq","Base _Frequency",.5,0.,1.);
 
 
-    for (i=3;i<NCHANNELS+3;i++) {
+    for (i=3; i<NCHANNELS+3; i++) {
       // TODO - unique name
       in_params[i]=weed_float_init("cparam","cparam",.5,0.,1.);
     }
@@ -776,9 +777,9 @@
     out_chantmpls[1]=NULL;
 
     filter_class=weed_filter_class_init("fourKlives","salsaman, anti and marq",1,0,&fourk_init,&fourk_process,
-						      &fourk_deinit,NULL,out_chantmpls,in_params,NULL);
+                                        &fourk_deinit,NULL,out_chantmpls,in_params,NULL);
 
-    weed_plugin_info_add_filter_class (plugin_info,filter_class);
+    weed_plugin_info_add_filter_class(plugin_info,filter_class);
 
     weed_set_int_value(plugin_info,"version",package_version);
   }
@@ -790,5 +791,5 @@
 
 void weed_desetup(void) {
   register int i;
-  for (i=0;tunes[i]!=NULL;i++) weed_free(tunes[i]);
+  for (i=0; tunes[i]!=NULL; i++) weed_free(tunes[i]);
 }

LiVES-2.2.8.tar.bz2/lives-plugins/weed-plugins/freenect.c -> LiVES-2.4.1.tar.bz2/lives-plugins/weed-plugins/freenect.c Changed

LiVES-2.2.8.tar.bz2/lives-plugins/weed-plugins/frei0r.c -> LiVES-2.4.1.tar.bz2/lives-plugins/weed-plugins/frei0r.c Changed

@@ -34,7 +34,7 @@
 ///////////////////////////////////////////////////////////////////
 
 static int num_versions=1; // number of different weed api versions supported
-static int api_versions[]={131}; // array of weed api versions supported in plugin, in order of preference (most preferred first)
+static int api_versions[]= {131}; // array of weed api versions supported in plugin, in order of preference (most preferred first)
 
 static int package_version=1; // version of this package
 
@@ -58,7 +58,8 @@
 typedef void (*f0r_get_plugin_info_f)(f0r_plugin_info_t *info);
 typedef void (*f0r_get_param_info_f)(f0r_param_info_t *info, int param_index);
 typedef void (*f0r_update_f)(f0r_instance_t instance, double time, const uint32_t *inframe, uint32_t *outframe);
-typedef void (*f0r_update2_f)(f0r_instance_t instance, double time, const uint32_t *inframe1, const uint32_t *inframe2, const uint32_t *inframe3, uint32_t *outframe);
+typedef void (*f0r_update2_f)(f0r_instance_t instance, double time, const uint32_t *inframe1, const uint32_t *inframe2,
+                              const uint32_t *inframe3, uint32_t *outframe);
 typedef void (*f0r_set_param_value_f)(f0r_instance_t *instance, f0r_param_t *param, int param_index);
 
 #if FREI0R_MAJOR_VERSION >1 || FREI0R_MINOR_VERSION > 1
@@ -77,19 +78,19 @@
 #endif
 
 
-static void getenv_piece(char * target, size_t tlen, char *envvar, int num) {
+static void getenv_piece(char *target, size_t tlen, char *envvar, int num) {
   // get num piece from envvar path and set in target
   char *str1;
   memset(target,0,1);
-  
+
   /* extract first string from string sequence */
   str1 = strtok(envvar, ":");
- 
+
   /* loop until finishied */
-  while ( --num>=0 ) {
+  while (--num>=0) {
     /* extract string from string sequence */
     str1 = strtok(NULL, ":");
-      
+
     /* check if there is nothing else to extract */
     if (str1 == NULL) break;
   }
@@ -102,7 +103,7 @@
 
 
 
-int frei0r_init (weed_plant_t *inst) {
+int frei0r_init(weed_plant_t *inst) {
   weed_plant_t *out_channel,*filter;
   int error,height,width,cpalette;
   f0r_instance_t f0r_inst;
@@ -121,14 +122,14 @@
 
   f0r_construct=weed_get_voidptr_value(filter,"plugin_f0r_construct",&error);
 
-  if ((f0r_inst=(*f0r_construct) (width,height))==NULL) return WEED_ERROR_INIT_ERROR;
+  if ((f0r_inst=(*f0r_construct)(width,height))==NULL) return WEED_ERROR_INIT_ERROR;
   weed_set_voidptr_value(inst,"plugin_f0r_inst",f0r_inst);
 
   return WEED_NO_ERROR;
 }
 
 
-int frei0r_deinit (weed_plant_t *inst) {
+int frei0r_deinit(weed_plant_t *inst) {
   int error;
   f0r_instance_t f0r_inst;
   f0r_destruct_f f0r_destruct;
@@ -144,7 +145,7 @@
 }
 
 
-static void weed_params_to_frei0r_params (weed_plant_t *inst, weed_plant_t **in_params, int num_weed_params) {
+static void weed_params_to_frei0r_params(weed_plant_t *inst, weed_plant_t **in_params, int num_weed_params) {
   int i,error,hint;
   int pnum=0;
   weed_plant_t *ptmpl;
@@ -158,7 +159,7 @@
   f0r_param_color_t f0rcol;
   char *string;
 
-  for (i=0;i<num_weed_params;i++) {
+  for (i=0; i<num_weed_params; i++) {
     ptmpl=weed_get_plantptr_value(in_params[i],"template",&error);
     hint=weed_get_int_value(ptmpl,"hint",&error);
     switch (hint) {
@@ -169,13 +170,13 @@
       break;
     case WEED_HINT_FLOAT:
       vald=weed_get_double_value(in_params[i],"value",&error);
-      if (!weed_plant_has_leaf(ptmpl,"plugin_f0r_position")) (*f0r_set_param_value)(f0rinst,(f0r_param_t)&vald,pnum);
+      if (!weed_plant_has_leaf(ptmpl,"plugin_f0r_position"))(*f0r_set_param_value)(f0rinst,(f0r_param_t)&vald,pnum);
       else {
-	i++;
-	vald2=weed_get_double_value(in_params[i],"value",&error);
-	f0rpos.x=vald;
-	f0rpos.y=vald2;
-	(*f0r_set_param_value)(f0rinst,(f0r_param_t)&f0rpos,pnum);
+        i++;
+        vald2=weed_get_double_value(in_params[i],"value",&error);
+        f0rpos.x=vald;
+        f0rpos.y=vald2;
+        (*f0r_set_param_value)(f0rinst,(f0r_param_t)&f0rpos,pnum);
       }
       break;
     case WEED_HINT_COLOR:
@@ -201,7 +202,7 @@
 
 
 
-int frei0r_process (weed_plant_t *inst, weed_timecode_t timestamp) {
+int frei0r_process(weed_plant_t *inst, weed_timecode_t timestamp) {
   int error;
 
   f0r_instance_t f0r_inst;
@@ -232,7 +233,8 @@
     f0r_update=weed_get_voidptr_value(filter,"plugin_f0r_update",&error);
     out_channels=weed_get_plantptr_array(inst,"out_channels",&error);
     in_channels=weed_get_plantptr_array(inst,"in_channels",&error);
-    (*f0r_update)(f0r_inst,time,weed_get_voidptr_value(in_channels[0],"pixel_data",&error),weed_get_voidptr_value(out_channels[0],"pixel_data",&error));
+    (*f0r_update)(f0r_inst,time,weed_get_voidptr_value(in_channels[0],"pixel_data",&error),weed_get_voidptr_value(out_channels[0],"pixel_data",
+                  &error));
     weed_free(out_channels);
     weed_free(in_channels);
     break;
@@ -241,7 +243,7 @@
     out_channels=weed_get_plantptr_array(inst,"out_channels",&error);
     in_channels=weed_get_plantptr_array(inst,"in_channels",&error);
     (*f0r_update2)(f0r_inst,time,weed_get_voidptr_value(in_channels[0],"pixel_data",&error),
-		   weed_get_voidptr_value(in_channels[1],"pixel_data",&error),NULL,weed_get_voidptr_value(out_channels[0],"pixel_data",&error));
+                   weed_get_voidptr_value(in_channels[1],"pixel_data",&error),NULL,weed_get_voidptr_value(out_channels[0],"pixel_data",&error));
     weed_free(out_channels);
     weed_free(in_channels);
     break;
@@ -250,9 +252,9 @@
     out_channels=weed_get_plantptr_array(inst,"out_channels",&error);
     in_channels=weed_get_plantptr_array(inst,"in_channels",&error);
     (*f0r_update2)(f0r_inst,time,weed_get_voidptr_value(in_channels[0],"pixel_data",&error),
-		   weed_get_voidptr_value(in_channels[1],"pixel_data",&error),
-		   weed_get_voidptr_value(in_channels[2],"pixel_data",&error),
-		   weed_get_voidptr_value(out_channels[0],"pixel_data",&error));
+                   weed_get_voidptr_value(in_channels[1],"pixel_data",&error),
+                   weed_get_voidptr_value(in_channels[2],"pixel_data",&error),
+                   weed_get_voidptr_value(out_channels[0],"pixel_data",&error));
     weed_free(out_channels);
     weed_free(in_channels);
     break;
@@ -262,7 +264,7 @@
 
 
 
-weed_plant_t *weed_setup (weed_bootstrap_f weed_boot) {
+weed_plant_t *weed_setup(weed_bootstrap_f weed_boot) {
   weed_plant_t *plugin_info;
   if (FREI0R_MAJOR_VERSION<1||FREI0R_MINOR_VERSION<1) return NULL;
 
@@ -337,536 +339,537 @@
 #endif
     if (fpp!=NULL) {
       vdirval=10;
-    }
-    else {
+    } else {
       snprintf(homedir,PATH_MAX,"%s",getenv("HOME"));
-      snprintf (vdir3,PATH_MAX,"%s/frei0r-1/",homedir);
+      snprintf(vdir3,PATH_MAX,"%s/frei0r-1/",homedir);
     }
 
     while (vdirval<6||vdirval>9) {
       // step through each of our frei0r dirs
       if (vdirval==0) {
-	curvdir=opendir(vdir3);
-	if (curvdir==NULL) vdirval=2;
-	else vdirval=1;
+        curvdir=opendir(vdir3);
+        if (curvdir==NULL) vdirval=2;
+        else vdirval=1;
       }
-      
+
       if (vdirval==2) {
-	if (curvdir!=NULL) closedir(curvdir);
-	curvdir=opendir(vdir2);
-	if (curvdir==NULL) vdirval=4;
-	else vdirval=3;
+        if (curvdir!=NULL) closedir(curvdir);
+        curvdir=opendir(vdir2);
+        if (curvdir==NULL) vdirval=4;
+        else vdirval=3;
       }
-      
+
       if (vdirval==4) {
-	if (curvdir!=NULL) closedir(curvdir);
-	curvdir=opendir(vdir1);
-	if (curvdir==NULL) {
-	  vdirval=6;
-	  break;
-	}
-	vdirval=5;
+        if (curvdir!=NULL) closedir(curvdir);
+        curvdir=opendir(vdir1);
+        if (curvdir==NULL) {
+          vdirval=6;
+          break;
+        }
+        vdirval=5;
       }
 
       if (vdirval>9) {
-	getenv_piece(vdir1,PATH_MAX,fpp,vdirval-10);
-	if (!strlen(vdir1)||vdir1==NULL) {
-	  vdirval=6;
-	  break;
-	}
-	curvdir=opendir(vdir1);
-	if (curvdir==NULL) {
-	  vdirval=6;
-	  break;
-	}
+        getenv_piece(vdir1,PATH_MAX,fpp,vdirval-10);
+        if (!strlen(vdir1)||vdir1==NULL) {
+          vdirval=6;
+          break;
+        }
+        curvdir=opendir(vdir1);
+        if (curvdir==NULL) {
+          vdirval=6;
+          break;
+        }
       }
-      
+
       weed_memset(vendor_name,0,1);
-	
+
       do {
 
-	snprintf(dir1,PATH_MAX,"%s/%s",vdir1,vendor_name);
-
-	if (vdirval<10) {
-	  snprintf(dir2,PATH_MAX,"%s/%s",vdir2,vendor_name);
-	  snprintf(dir3,PATH_MAX,"%s/%s",vdir3,vendor_name);
-	}
-
-	vdirent=readdir(curvdir);
-	  
-	if (vdirent==NULL) {
-	  closedir(curvdir);
-	  curvdir=NULL;
-	  vdirval++;
-	  break;
-	}
-
-	if (!strncmp(vdirent->d_name,"..",strlen(vdirent->d_name))) continue;
-
-	snprintf(vendor_name,PATH_MAX,"%s",vdirent->d_name);
-
-	if (vdirval==1) {
-	  curdir=opendir(dir3);
-	  if (curdir==NULL) continue;
-	}
-	else if (vdirval==3) {
-	  if (curdir!=NULL) closedir(curdir);
-	  curdir=opendir(dir2);
-	  if (curdir==NULL) continue;
-	}
-	else if (vdirval==5||vdirval>9) {
-	  if (curdir!=NULL) closedir(curdir);
-	  curdir=opendir(dir1);
-	  if (curdir==NULL) continue;
-	}
-
-	finished=0;
-	
-	while (!finished) {
-	  // step through our plugins
-	  dirent=readdir(curdir);
-
-	  if (dirent==NULL) {
-	    finished=1;
-	    continue;
-	  }
-
-	  if (!strncmp(dirent->d_name,"..",strlen(dirent->d_name))) continue;
-	  
-	  snprintf(plugin_name,PATH_MAX,"%s",dirent->d_name);
-
-	  snprintf(plug1,PATH_MAX,"%s/%s",dir1,plugin_name);
-
-	  if (vdirval<10) {
-	    snprintf(plug2,PATH_MAX,"%s/%s",dir2,plugin_name);
-	    snprintf(plug3,PATH_MAX,"%s/%s",dir3,plugin_name);
-	    
-	    handle=dlopen(plug3,RTLD_NOW);
-	    if ((handle!=NULL&&(vdirval>1))||(handle==NULL&&vdirval==1)) {
-	      if (handle!=NULL) dlclose(handle);
-	      continue;
-	    }
-	    
-	    if (vdirval>1) {
-	      handle=dlopen(plug2,RTLD_NOW);
-	      if ((handle!=NULL&&(vdirval>3))||(handle==NULL&&vdirval==3)) {
-		if (handle!=NULL) dlclose(handle);
-		continue;
-	      }
-	    }
-	  }
-
-	  if (vdirval==5||vdirval>9) {
-	    handle=dlopen(plug1,RTLD_NOW);
-	    if (handle==NULL) continue;
-	  }
-	  
-	  if ((f0r_deinit=dlsym(handle,"f0r_deinit"))==NULL) {
-	    dlclose(handle);
-	    continue;
-	  }
-	  
-	  if ((f0r_init=dlsym(handle,"f0r_init"))==NULL) {
-	    dlclose(handle);
-	    continue;
-	  }
-	  
-	  if ((f0r_get_plugin_info=dlsym(handle,"f0r_get_plugin_info"))==NULL) {
-	    dlclose(handle);
-	    continue;
-	  }
-
-	  if ((f0r_get_param_info=dlsym(handle,"f0r_get_param_info"))==NULL) {
-	    dlclose(handle);
-	    continue;
-	  }
-	  
-	  if ((f0r_construct=dlsym(handle,"f0r_construct"))==NULL) {
-	    dlclose(handle);
-	    continue;
-	  }
-	  
-	  if ((f0r_destruct=dlsym(handle,"f0r_destruct"))==NULL) {
-	    dlclose(handle);
-	    continue;
-	  }
-
-	  is_unstable=0;
-
-	  (*f0r_init)();
-	  (*f0r_get_plugin_info)(&f0rinfo);
-	  
-	  if (f0rinfo.frei0r_version!=FREI0R_MAJOR_VERSION) {
-	    (*f0r_deinit)();
-	    dlclose(handle);
-	    continue;
-	  }
-
-	  switch (f0rinfo.plugin_type) {
-	  case F0R_PLUGIN_TYPE_SOURCE:
-	  case F0R_PLUGIN_TYPE_FILTER:
-	    if ((f0r_update=dlsym(handle,"f0r_update"))==NULL) {
-	      (*f0r_deinit)();
-	      dlclose(handle);
-	      continue;
-	    }
-	    break;
-	  case F0R_PLUGIN_TYPE_MIXER2:
-	  case F0R_PLUGIN_TYPE_MIXER3:
-	    if ((f0r_update2=dlsym(handle,"f0r_update2"))==NULL) {
-	      (*f0r_deinit)();
-	      dlclose(handle);
-	      continue;
-	    }
-	    break;
-	  default:
-	    (*f0r_deinit)();
-	    dlclose(handle);
-	    continue;
-	  }
-
-	  if (f0rinfo.color_model==F0R_COLOR_MODEL_BGRA8888) {
-	    pal=weed_malloc(2*sizeof(int));
-	    pal[0]=WEED_PALETTE_BGRA8888;
-	    pal[1]=WEED_PALETTE_END;
-	  }
-	  else if (f0rinfo.color_model==F0R_COLOR_MODEL_RGBA8888) {
-	    pal=weed_malloc(2*sizeof(int));
-	    pal[0]=WEED_PALETTE_RGBA8888;
-	    pal[1]=WEED_PALETTE_END;
-	  }
-	  else if (f0rinfo.color_model==F0R_COLOR_MODEL_PACKED32) {
-	    pal=weed_malloc(7*sizeof(int));
-	    pal[0]=WEED_PALETTE_RGBA8888;
-	    pal[1]=WEED_PALETTE_BGRA8888;
-	    pal[2]=WEED_PALETTE_ARGB8888;
-	    pal[3]=WEED_PALETTE_UYVY8888;
-	    pal[4]=WEED_PALETTE_YUYV8888;
-	    pal[5]=WEED_PALETTE_YUVA8888;
-	    pal[6]=WEED_PALETTE_END;
-	  }
-	  else {
-	    f0r_deinit();
-	    dlclose(handle);
-	    continue;
-	  }
-
-	  out_chantmpls=weed_malloc(2*sizeof(weed_plant_t *));
-	  out_chantmpls[0]=weed_channel_template_init("out channel 0",WEED_CHANNEL_REINIT_ON_SIZE_CHANGE,pal);
-	  weed_set_int_value(out_chantmpls[0],"hstep",8);
-	  weed_set_int_value(out_chantmpls[0],"vstep",8);
-	  weed_set_int_value(out_chantmpls[0],"maxwidth",2048);
-	  weed_set_int_value(out_chantmpls[0],"maxheight",2048);
-	  weed_set_int_value(out_chantmpls[0],"alignment",16);
-	  out_chantmpls[1]=NULL;
-	  
-	  switch (f0rinfo.plugin_type) {
-	  case F0R_PLUGIN_TYPE_SOURCE:
-	    in_chantmpls=NULL;
-	    break;
-	  case F0R_PLUGIN_TYPE_FILTER:
-	    in_chantmpls=weed_malloc(2*sizeof(weed_plant_t *));
-	    in_chantmpls[0]=weed_channel_template_init("in channel 0",WEED_CHANNEL_REINIT_ON_SIZE_CHANGE,pal);
-	    weed_set_int_value(in_chantmpls[0],"hstep",8);
-	    weed_set_int_value(in_chantmpls[0],"vstep",8);
-	    weed_set_int_value(in_chantmpls[0],"maxwidth",2048);
-	    weed_set_int_value(in_chantmpls[0],"maxheight",2048);
-	    weed_set_int_value(in_chantmpls[0],"alignment",16);
-	    in_chantmpls[1]=NULL;
-	    break;
-	  case F0R_PLUGIN_TYPE_MIXER2:
-	    in_chantmpls=weed_malloc(3*sizeof(weed_plant_t *));
-	    in_chantmpls[0]=weed_channel_template_init("in channel 0",WEED_CHANNEL_REINIT_ON_SIZE_CHANGE,pal);
-	    weed_set_int_value(in_chantmpls[0],"hstep",8);
-	    weed_set_int_value(in_chantmpls[0],"vstep",8);
-	    weed_set_int_value(in_chantmpls[0],"maxwidth",2048);
-	    weed_set_int_value(in_chantmpls[0],"maxheight",2048);
-	    weed_set_int_value(in_chantmpls[0],"alignment",16);
-	    
-	    in_chantmpls[1]=weed_channel_template_init("in channel 1",WEED_CHANNEL_REINIT_ON_SIZE_CHANGE,pal);
-	    weed_set_int_value(in_chantmpls[1],"hstep",8);
-	    weed_set_int_value(in_chantmpls[1],"vstep",8);
-	    weed_set_int_value(in_chantmpls[1],"maxwidth",2048);
-	    weed_set_int_value(in_chantmpls[1],"maxheight",2048);
-	    weed_set_int_value(in_chantmpls[1],"alignment",16);
-	    in_chantmpls[2]=NULL;
-	    break;
-	  case F0R_PLUGIN_TYPE_MIXER3:
-	    in_chantmpls=weed_malloc(4*sizeof(weed_plant_t *));
-	    in_chantmpls[0]=weed_channel_template_init("in channel 0",WEED_CHANNEL_REINIT_ON_SIZE_CHANGE,pal);
-	    weed_set_int_value(in_chantmpls[0],"hstep",8);
-	    weed_set_int_value(in_chantmpls[0],"vstep",8);
-	    weed_set_int_value(in_chantmpls[0],"maxwidth",2048);
-	    weed_set_int_value(in_chantmpls[0],"maxheight",2048);
-	    weed_set_int_value(in_chantmpls[0],"alignment",16);
-	    
-	    in_chantmpls[1]=weed_channel_template_init("in channel 1",WEED_CHANNEL_REINIT_ON_SIZE_CHANGE,pal);
-	    weed_set_int_value(in_chantmpls[1],"hstep",8);
-	    weed_set_int_value(in_chantmpls[1],"vstep",8);
-	    weed_set_int_value(in_chantmpls[1],"maxwidth",2048);
-	    weed_set_int_value(in_chantmpls[1],"maxheight",2048);
-	    weed_set_int_value(in_chantmpls[1],"alignment",16);
-	    
-	    in_chantmpls[2]=weed_channel_template_init("in channel 2",WEED_CHANNEL_REINIT_ON_SIZE_CHANGE,pal);
-	    weed_set_int_value(in_chantmpls[2],"hstep",8);
-	    weed_set_int_value(in_chantmpls[2],"vstep",8);
-	    weed_set_int_value(in_chantmpls[2],"maxwidth",2048);
-	    weed_set_int_value(in_chantmpls[2],"maxheight",2048);
-	    weed_set_int_value(in_chantmpls[2],"alignment",16);
-	    in_chantmpls[3]=NULL;
-	    break;
-	  default:
-	    (*f0r_deinit)();
-	    dlclose(handle);
-	    weed_free(pal);
-	    weed_free(out_chantmpls);
-	    if (in_chantmpls!=NULL) weed_free(in_chantmpls);
-	    continue;
-	  }
-	  
-	  num_weed_params=0;
-	  weed_free(pal);
+        snprintf(dir1,PATH_MAX,"%s/%s",vdir1,vendor_name);
+
+        if (vdirval<10) {
+          snprintf(dir2,PATH_MAX,"%s/%s",vdir2,vendor_name);
+          snprintf(dir3,PATH_MAX,"%s/%s",vdir3,vendor_name);
+        }
+
+        vdirent=readdir(curvdir);
+
+        if (vdirent==NULL) {
+          closedir(curvdir);
+          curvdir=NULL;
+          vdirval++;
+          break;
+        }
+
+        if (!strncmp(vdirent->d_name,"..",strlen(vdirent->d_name))) continue;
+
+        snprintf(vendor_name,PATH_MAX,"%s",vdirent->d_name);
+
+        if (vdirval==1) {
+          curdir=opendir(dir3);
+          if (curdir==NULL) continue;
+        } else if (vdirval==3) {
+          if (curdir!=NULL) closedir(curdir);
+          curdir=opendir(dir2);
+          if (curdir==NULL) continue;
+        } else if (vdirval==5||vdirval>9) {
+          if (curdir!=NULL) closedir(curdir);
+          curdir=opendir(dir1);
+          if (curdir==NULL) continue;
+        }
+
+        finished=0;
+
+        while (!finished) {
+          // step through our plugins
+          dirent=readdir(curdir);
+
+          if (dirent==NULL) {
+            finished=1;
+            continue;
+          }
+
+          if (!strncmp(dirent->d_name,"..",strlen(dirent->d_name))) continue;
+
+          snprintf(plugin_name,PATH_MAX,"%s",dirent->d_name);
+
+          snprintf(plug1,PATH_MAX,"%s/%s",dir1,plugin_name);
+
+          if (vdirval<10) {
+            snprintf(plug2,PATH_MAX,"%s/%s",dir2,plugin_name);
+            snprintf(plug3,PATH_MAX,"%s/%s",dir3,plugin_name);
+
+            handle=dlopen(plug3,RTLD_NOW);
+            if ((handle!=NULL&&(vdirval>1))||(handle==NULL&&vdirval==1)) {
+              if (handle!=NULL) dlclose(handle);
+              continue;
+            }
+
+            if (vdirval>1) {
+              handle=dlopen(plug2,RTLD_NOW);
+              if ((handle!=NULL&&(vdirval>3))||(handle==NULL&&vdirval==3)) {
+                if (handle!=NULL) dlclose(handle);
+                continue;
+              }
+            }
+          }
+
+          if (vdirval==5||vdirval>9) {
+            handle=dlopen(plug1,RTLD_NOW);
+            if (handle==NULL) continue;
+          }
+
+          if ((f0r_deinit=dlsym(handle,"f0r_deinit"))==NULL) {
+            dlclose(handle);
+            continue;
+          }
+
+          if ((f0r_init=dlsym(handle,"f0r_init"))==NULL) {
+            dlclose(handle);
+            continue;
+          }
+
+          if ((f0r_get_plugin_info=dlsym(handle,"f0r_get_plugin_info"))==NULL) {
+            dlclose(handle);
+            continue;
+          }
+
+          if ((f0r_get_param_info=dlsym(handle,"f0r_get_param_info"))==NULL) {
+            dlclose(handle);
+            continue;
+          }
+
+          if ((f0r_construct=dlsym(handle,"f0r_construct"))==NULL) {
+            dlclose(handle);
+            continue;
+          }
+
+          if ((f0r_destruct=dlsym(handle,"f0r_destruct"))==NULL) {
+            dlclose(handle);
+            continue;
+          }
+
+          is_unstable=0;
+
+          (*f0r_init)();
+          (*f0r_get_plugin_info)(&f0rinfo);
+
+          if (f0rinfo.frei0r_version!=FREI0R_MAJOR_VERSION) {
+            (*f0r_deinit)();
+            dlclose(handle);
+            continue;
+          }
+
+          switch (f0rinfo.plugin_type) {
+          case F0R_PLUGIN_TYPE_SOURCE:
+          case F0R_PLUGIN_TYPE_FILTER:
+            if ((f0r_update=dlsym(handle,"f0r_update"))==NULL) {
+              (*f0r_deinit)();
+              dlclose(handle);
+              continue;
+            }
+            break;
+          case F0R_PLUGIN_TYPE_MIXER2:
+          case F0R_PLUGIN_TYPE_MIXER3:
+            if ((f0r_update2=dlsym(handle,"f0r_update2"))==NULL) {
+              (*f0r_deinit)();
+              dlclose(handle);
+              continue;
+            }
+            break;
+          default:
+            (*f0r_deinit)();
+            dlclose(handle);
+            continue;
+          }
+
+          if (f0rinfo.color_model==F0R_COLOR_MODEL_BGRA8888) {
+            pal=weed_malloc(2*sizeof(int));
+            pal[0]=WEED_PALETTE_BGRA8888;
+            pal[1]=WEED_PALETTE_END;
+          } else if (f0rinfo.color_model==F0R_COLOR_MODEL_RGBA8888) {
+            pal=weed_malloc(2*sizeof(int));
+            pal[0]=WEED_PALETTE_RGBA8888;
+            pal[1]=WEED_PALETTE_END;
+          } else if (f0rinfo.color_model==F0R_COLOR_MODEL_PACKED32) {
+            pal=weed_malloc(7*sizeof(int));
+            pal[0]=WEED_PALETTE_RGBA8888;
+            pal[1]=WEED_PALETTE_BGRA8888;
+            pal[2]=WEED_PALETTE_ARGB8888;
+            pal[3]=WEED_PALETTE_UYVY8888;
+            pal[4]=WEED_PALETTE_YUYV8888;
+            pal[5]=WEED_PALETTE_YUVA8888;
+            pal[6]=WEED_PALETTE_END;
+          } else {
+            f0r_deinit();
+            dlclose(handle);
+            continue;
+          }
+
+          out_chantmpls=weed_malloc(2*sizeof(weed_plant_t *));
+          out_chantmpls[0]=weed_channel_template_init("out channel 0",WEED_CHANNEL_REINIT_ON_SIZE_CHANGE,pal);
+          weed_set_int_value(out_chantmpls[0],"hstep",8);
+          weed_set_int_value(out_chantmpls[0],"vstep",8);
+          weed_set_int_value(out_chantmpls[0],"maxwidth",2048);
+          weed_set_int_value(out_chantmpls[0],"maxheight",2048);
+          weed_set_int_value(out_chantmpls[0],"alignment",16);
+          out_chantmpls[1]=NULL;
+
+          switch (f0rinfo.plugin_type) {
+          case F0R_PLUGIN_TYPE_SOURCE:
+            in_chantmpls=NULL;
+            break;
+          case F0R_PLUGIN_TYPE_FILTER:
+            in_chantmpls=weed_malloc(2*sizeof(weed_plant_t *));
+            in_chantmpls[0]=weed_channel_template_init("in channel 0",WEED_CHANNEL_REINIT_ON_SIZE_CHANGE,pal);
+            weed_set_int_value(in_chantmpls[0],"hstep",8);
+            weed_set_int_value(in_chantmpls[0],"vstep",8);
+            weed_set_int_value(in_chantmpls[0],"maxwidth",2048);
+            weed_set_int_value(in_chantmpls[0],"maxheight",2048);
+            weed_set_int_value(in_chantmpls[0],"alignment",16);
+            in_chantmpls[1]=NULL;
+            break;
+          case F0R_PLUGIN_TYPE_MIXER2:
+            in_chantmpls=weed_malloc(3*sizeof(weed_plant_t *));
+            in_chantmpls[0]=weed_channel_template_init("in channel 0",WEED_CHANNEL_REINIT_ON_SIZE_CHANGE,pal);
+            weed_set_int_value(in_chantmpls[0],"hstep",8);
+            weed_set_int_value(in_chantmpls[0],"vstep",8);
+            weed_set_int_value(in_chantmpls[0],"maxwidth",2048);
+            weed_set_int_value(in_chantmpls[0],"maxheight",2048);
+            weed_set_int_value(in_chantmpls[0],"alignment",16);
+
+            in_chantmpls[1]=weed_channel_template_init("in channel 1",WEED_CHANNEL_REINIT_ON_SIZE_CHANGE,pal);
+            weed_set_int_value(in_chantmpls[1],"hstep",8);
+            weed_set_int_value(in_chantmpls[1],"vstep",8);
+            weed_set_int_value(in_chantmpls[1],"maxwidth",2048);
+            weed_set_int_value(in_chantmpls[1],"maxheight",2048);
+            weed_set_int_value(in_chantmpls[1],"alignment",16);
+            in_chantmpls[2]=NULL;
+            break;
+          case F0R_PLUGIN_TYPE_MIXER3:
+            in_chantmpls=weed_malloc(4*sizeof(weed_plant_t *));
+            in_chantmpls[0]=weed_channel_template_init("in channel 0",WEED_CHANNEL_REINIT_ON_SIZE_CHANGE,pal);
+            weed_set_int_value(in_chantmpls[0],"hstep",8);
+            weed_set_int_value(in_chantmpls[0],"vstep",8);
+            weed_set_int_value(in_chantmpls[0],"maxwidth",2048);
+            weed_set_int_value(in_chantmpls[0],"maxheight",2048);
+            weed_set_int_value(in_chantmpls[0],"alignment",16);
+
+            in_chantmpls[1]=weed_channel_template_init("in channel 1",WEED_CHANNEL_REINIT_ON_SIZE_CHANGE,pal);
+            weed_set_int_value(in_chantmpls[1],"hstep",8);
+            weed_set_int_value(in_chantmpls[1],"vstep",8);
+            weed_set_int_value(in_chantmpls[1],"maxwidth",2048);
+            weed_set_int_value(in_chantmpls[1],"maxheight",2048);
+            weed_set_int_value(in_chantmpls[1],"alignment",16);
+
+            in_chantmpls[2]=weed_channel_template_init("in channel 2",WEED_CHANNEL_REINIT_ON_SIZE_CHANGE,pal);
+            weed_set_int_value(in_chantmpls[2],"hstep",8);
+            weed_set_int_value(in_chantmpls[2],"vstep",8);
+            weed_set_int_value(in_chantmpls[2],"maxwidth",2048);
+            weed_set_int_value(in_chantmpls[2],"maxheight",2048);
+            weed_set_int_value(in_chantmpls[2],"alignment",16);
+            in_chantmpls[3]=NULL;
+            break;
+          default:
+            (*f0r_deinit)();
+            dlclose(handle);
+            weed_free(pal);
+            weed_free(out_chantmpls);
+            if (in_chantmpls!=NULL) weed_free(in_chantmpls);
+            continue;
+          }
+
+          num_weed_params=0;
+          weed_free(pal);
 
 #ifdef CAN_GET_DEF
-	  // try to get defaults
-	  if ((f0r_inst=(*f0r_construct) (640,480))==NULL) {
-	    (*f0r_deinit)();
-	    dlclose(handle);
-	    weed_free(out_chantmpls);
-	    if (in_chantmpls!=NULL) weed_free(in_chantmpls);
-	    continue;
-	  }
+          // try to get defaults
+          if ((f0r_inst=(*f0r_construct)(640,480))==NULL) {
+            (*f0r_deinit)();
+            dlclose(handle);
+            weed_free(out_chantmpls);
+            if (in_chantmpls!=NULL) weed_free(in_chantmpls);
+            continue;
+          }
 #endif
 
-	  if (f0rinfo.num_params>0) {
-	    if ((f0r_set_param_value=dlsym(handle,"f0r_set_param_value"))==NULL) {
+          if (f0rinfo.num_params>0) {
+            if ((f0r_set_param_value=dlsym(handle,"f0r_set_param_value"))==NULL) {
 #ifdef CAN_GET_DEF
-	      f0r_destruct(f0r_inst);
+              f0r_destruct(f0r_inst);
 #endif
-	      (*f0r_deinit)();
-	      dlclose(handle);
-	      weed_free(out_chantmpls);
-	      if (in_chantmpls!=NULL) weed_free(in_chantmpls);
-	      continue;
-	    }
+              (*f0r_deinit)();
+              dlclose(handle);
+              weed_free(out_chantmpls);
+              if (in_chantmpls!=NULL) weed_free(in_chantmpls);
+              continue;
+            }
 
 #ifdef CAN_GET_DEF
-	    if ((f0r_get_param_value=dlsym(handle,"f0r_get_param_value"))==NULL) {
-	      f0r_destruct(f0r_inst);
-	      (*f0r_deinit)();
-	      dlclose(handle);
-	      weed_free(out_chantmpls);
-	      if (in_chantmpls!=NULL) weed_free(in_chantmpls);
-	      continue;
-	    }
+            if ((f0r_get_param_value=dlsym(handle,"f0r_get_param_value"))==NULL) {
+              f0r_destruct(f0r_inst);
+              (*f0r_deinit)();
+              dlclose(handle);
+              weed_free(out_chantmpls);
+              if (in_chantmpls!=NULL) weed_free(in_chantmpls);
+              continue;
+            }
 #endif
 
-	    for (pnum=0;pnum<f0rinfo.num_params;pnum++) {
-	      num_weed_params++;
-	      (*f0r_get_param_info)(&pinfo,pnum);
-	      if (pinfo.type==F0R_PARAM_POSITION) num_weed_params++;
-	    }
-
-	    if (num_weed_params>f0rinfo.num_params) {
-	      rfx_strings=weed_malloc((f0rinfo.num_params)*sizeof(char *));
-	      for (pnum=0;pnum<f0rinfo.num_params;pnum++) {
-		rfx_strings[pnum]=(char *)weed_malloc(256);
-	      }
-	    }
-	    in_params=weed_malloc((num_weed_params+1)*sizeof(weed_plant_t *));
-
-	    wnum=0;
-	    for (pnum=0;pnum<f0rinfo.num_params;pnum++) {
-	      (*f0r_get_param_info)(&pinfo,pnum);
-	      label=malloc(strlen((char *)pinfo.name)+2);
-	      sprintf(label,"_%s",(char *)pinfo.name);
-	      switch (pinfo.type) {
-	      case F0R_PARAM_BOOL:
-		vald=0.;
+            for (pnum=0; pnum<f0rinfo.num_params; pnum++) {
+              num_weed_params++;
+              (*f0r_get_param_info)(&pinfo,pnum);
+              if (pinfo.type==F0R_PARAM_POSITION) num_weed_params++;
+            }
+
+            if (num_weed_params>f0rinfo.num_params) {
+              rfx_strings=weed_malloc((f0rinfo.num_params)*sizeof(char *));
+              for (pnum=0; pnum<f0rinfo.num_params; pnum++) {
+                rfx_strings[pnum]=(char *)weed_malloc(256);
+              }
+            }
+            in_params=weed_malloc((num_weed_params+1)*sizeof(weed_plant_t *));
+
+            wnum=0;
+            for (pnum=0; pnum<f0rinfo.num_params; pnum++) {
+              (*f0r_get_param_info)(&pinfo,pnum);
+              label=malloc(strlen((char *)pinfo.name)+2);
+              sprintf(label,"_%s",(char *)pinfo.name);
+              switch (pinfo.type) {
+              case F0R_PARAM_BOOL:
+                vald=0.;
 #ifdef CAN_GET_DEF
-		f0r_get_param_value(f0r_inst,(void **)&vald,pnum);
-		if (vald!=0.&&vald!=1.) {
-		  fprintf(stderr,"Warning, frei0r plugin %s by %s sets bad default value (%f) for boolean parameter %s.\nThis plugin may be unstable !\n",f0rinfo.name,f0rinfo.author,vald,pinfo.name);
-		  is_unstable=1;
-		}
-		if (vald<=0.5) vald=0.;
-		else vald=1.;
+                f0r_get_param_value(f0r_inst,(void **)&vald,pnum);
+                if (vald!=0.&&vald!=1.) {
+                  fprintf(stderr,"Warning, frei0r plugin %s by %s sets bad default value (%f) for boolean parameter %s.\nThis plugin may be unstable !\n",
+                          f0rinfo.name,f0rinfo.author,vald,pinfo.name);
+                  is_unstable=1;
+                }
+                if (vald<=0.5) vald=0.;
+                else vald=1.;
 #endif
-		in_params[wnum]=weed_switch_init((char *)pinfo.name,label,vald==0.?WEED_FALSE:WEED_TRUE);
-		weed_set_string_value(in_params[wnum],"description",(char *)pinfo.explanation);
-		if (num_weed_params>f0rinfo.num_params) sprintf(rfx_strings[pnum],"layout|p%d|",wnum);
-		break;
-	      case F0R_PARAM_DOUBLE:
-		vald=0.;
+                in_params[wnum]=weed_switch_init((char *)pinfo.name,label,vald==0.?WEED_FALSE:WEED_TRUE);
+                weed_set_string_value(in_params[wnum],"description",(char *)pinfo.explanation);
+                if (num_weed_params>f0rinfo.num_params) sprintf(rfx_strings[pnum],"layout|p%d|",wnum);
+                break;
+              case F0R_PARAM_DOUBLE:
+                vald=0.;
 #ifdef CAN_GET_DEF
-		f0r_get_param_value(f0r_inst,(void **)&vald,pnum);
+                f0r_get_param_value(f0r_inst,(void **)&vald,pnum);
 
-		if (vald<0.||vald>1.) {
-		  fprintf(stderr,"Warning, frei0r plugin %s by %s sets bad default value (%f) for parameter %s.\nThis plugin may be unstable !\n",f0rinfo.name,f0rinfo.author,vald,pinfo.name);
-		  is_unstable=1;
-		  if (vald<0.) vald=0.;
-		  if (vald>1.) vald=1.;
-		}
+                if (vald<0.||vald>1.) {
+                  fprintf(stderr,"Warning, frei0r plugin %s by %s sets bad default value (%f) for parameter %s.\nThis plugin may be unstable !\n",
+                          f0rinfo.name,f0rinfo.author,vald,pinfo.name);
+                  is_unstable=1;
+                  if (vald<0.) vald=0.;
+                  if (vald>1.) vald=1.;
+                }
 
 #endif
-		in_params[wnum]=weed_float_init((char *)pinfo.name,label,vald,0.,1.);
-		weed_set_string_value(in_params[wnum],"description",(char *)pinfo.explanation);
-		if (num_weed_params>f0rinfo.num_params) sprintf(rfx_strings[pnum],"layout|p%d|",wnum);
-		pgui=weed_parameter_template_get_gui(in_params[wnum]);
-		weed_set_double_value(pgui,"step_size",.01);
-		weed_set_int_value(pgui,"decimals",2);
-		break;
-	      case F0R_PARAM_COLOR:
-		valcol.r=valcol.g=valcol.b=0.;
+                in_params[wnum]=weed_float_init((char *)pinfo.name,label,vald,0.,1.);
+                weed_set_string_value(in_params[wnum],"description",(char *)pinfo.explanation);
+                if (num_weed_params>f0rinfo.num_params) sprintf(rfx_strings[pnum],"layout|p%d|",wnum);
+                pgui=weed_parameter_template_get_gui(in_params[wnum]);
+                weed_set_double_value(pgui,"step_size",.01);
+                weed_set_int_value(pgui,"decimals",2);
+                break;
+              case F0R_PARAM_COLOR:
+                valcol.r=valcol.g=valcol.b=0.;
 #ifdef CAN_GET_DEF
-		f0r_get_param_value(f0r_inst,(void **)&valcol,pnum);
-
-		if (valcol.r<0.||valcol.r>1.) {
-		  fprintf(stderr,"Warning, frei0r plugin %s by %s sets bad default value red (%f) for parameter %s.\nThis plugin may be unstable !\n",f0rinfo.name,f0rinfo.author,vald,pinfo.name);
-		  is_unstable=1;
-		  if (valcol.r<0.) valcol.r=0.;
-		  if (valcol.r>1.) valcol.r=1.;
-		}
-
-		if (valcol.g<0.||valcol.g>1.) {
-		  fprintf(stderr,"Warning, frei0r plugin %s by %s sets bad default value green (%f) for parameter %s.\nThis plugin may be unstable !\n",f0rinfo.name,f0rinfo.author,vald,pinfo.name);
-		  is_unstable=1;
-		  if (valcol.g<0.) valcol.g=0.;
-		  if (valcol.g>1.) valcol.g=1.;
-		}
-
-		if (valcol.b<0.||valcol.b>1.) {
-		  fprintf(stderr,"Warning, frei0r plugin %s by %s sets bad default value blue (%f) for parameter %s.\nThis plugin may be unstable !\n",f0rinfo.name,f0rinfo.author,vald,pinfo.name);
-		  is_unstable=1;
-		  if (valcol.b<0.) valcol.b=0.;
-		  if (valcol.b>1.) valcol.b=1.;
-		}
+                f0r_get_param_value(f0r_inst,(void **)&valcol,pnum);
+
+                if (valcol.r<0.||valcol.r>1.) {
+                  fprintf(stderr,"Warning, frei0r plugin %s by %s sets bad default value red (%f) for parameter %s.\nThis plugin may be unstable !\n",
+                          f0rinfo.name,f0rinfo.author,vald,pinfo.name);
+                  is_unstable=1;
+                  if (valcol.r<0.) valcol.r=0.;
+                  if (valcol.r>1.) valcol.r=1.;
+                }
+
+                if (valcol.g<0.||valcol.g>1.) {
+                  fprintf(stderr,"Warning, frei0r plugin %s by %s sets bad default value green (%f) for parameter %s.\nThis plugin may be unstable !\n",
+                          f0rinfo.name,f0rinfo.author,vald,pinfo.name);
+                  is_unstable=1;
+                  if (valcol.g<0.) valcol.g=0.;
+                  if (valcol.g>1.) valcol.g=1.;
+                }
+
+                if (valcol.b<0.||valcol.b>1.) {
+                  fprintf(stderr,"Warning, frei0r plugin %s by %s sets bad default value blue (%f) for parameter %s.\nThis plugin may be unstable !\n",
+                          f0rinfo.name,f0rinfo.author,vald,pinfo.name);
+                  is_unstable=1;
+                  if (valcol.b<0.) valcol.b=0.;
+                  if (valcol.b>1.) valcol.b=1.;
+                }
 
 #endif
-		in_params[wnum]=weed_colRGBd_init((char *)pinfo.name,label,valcol.r,valcol.g,valcol.b);
-		weed_set_string_value(in_params[wnum],"description",(char *)pinfo.explanation);
-		if (num_weed_params>f0rinfo.num_params) sprintf(rfx_strings[pnum],"layout|p%d|",wnum);
-		break;
-	      case F0R_PARAM_POSITION:
-		valpos.x=valpos.y=0.;
+                in_params[wnum]=weed_colRGBd_init((char *)pinfo.name,label,valcol.r,valcol.g,valcol.b);
+                weed_set_string_value(in_params[wnum],"description",(char *)pinfo.explanation);
+                if (num_weed_params>f0rinfo.num_params) sprintf(rfx_strings[pnum],"layout|p%d|",wnum);
+                break;
+              case F0R_PARAM_POSITION:
+                valpos.x=valpos.y=0.;
 #ifdef CAN_GET_DEF
-		f0r_get_param_value(f0r_inst,(void **)&valpos,pnum);
-		if (valpos.x<0.||valpos.x>1.) {
-		  fprintf(stderr,"Warning, frei0r plugin %s by %s sets bad default value x-pos (%f) for parameter %s.\nThis plugin may be unstable !\n",f0rinfo.name,f0rinfo.author,vald,pinfo.name);
-		  is_unstable=1;
-		  if (valpos.x<0.) valpos.x=0.;
-		  if (valpos.x>1.) valpos.x=1.;
-		}
-
-		if (valpos.y<0.||valpos.y>1.) {
-		  fprintf(stderr,"Warning, frei0r plugin %s by %s sets bad default value x-pos (%f) for parameter %s.\nThis plugin may be unstable !\n",f0rinfo.name,f0rinfo.author,vald,pinfo.name);
-		  is_unstable=1;
-		  if (valpos.y<0.) valpos.y=0.;
-		  if (valpos.y>1.) valpos.y=1.;
-		}
+                f0r_get_param_value(f0r_inst,(void **)&valpos,pnum);
+                if (valpos.x<0.||valpos.x>1.) {
+                  fprintf(stderr,"Warning, frei0r plugin %s by %s sets bad default value x-pos (%f) for parameter %s.\nThis plugin may be unstable !\n",
+                          f0rinfo.name,f0rinfo.author,vald,pinfo.name);
+                  is_unstable=1;
+                  if (valpos.x<0.) valpos.x=0.;
+                  if (valpos.x>1.) valpos.x=1.;
+                }
+
+                if (valpos.y<0.||valpos.y>1.) {
+                  fprintf(stderr,"Warning, frei0r plugin %s by %s sets bad default value x-pos (%f) for parameter %s.\nThis plugin may be unstable !\n",
+                          f0rinfo.name,f0rinfo.author,vald,pinfo.name);
+                  is_unstable=1;
+                  if (valpos.y<0.) valpos.y=0.;
+                  if (valpos.y>1.) valpos.y=1.;
+                }
 #endif
-		in_params[wnum]=weed_float_init((char *)pinfo.name,label,valpos.x,0.,1.);
-		weed_set_string_value(in_params[wnum],"description",(char *)pinfo.explanation);
-		weed_set_boolean_value(in_params[wnum],"plugin_is_position",WEED_TRUE);
-		pgui=weed_parameter_template_get_gui(in_params[wnum]);
-		weed_set_double_value(pgui,"step_size",.01);
-		weed_set_int_value(pgui,"decimals",2);
-		wnum++;
-		in_params[wnum]=weed_float_init((char *)pinfo.name,"",valpos.y,0.,1.);
-		weed_set_string_value(in_params[wnum],"description",(char *)pinfo.explanation);
-		sprintf(rfx_strings[pnum],"layout|p%d|\"X\"|fill|p%d|\"Y\"|fill|",wnum-1,wnum);
-		pgui=weed_parameter_template_get_gui(in_params[wnum]);
-		weed_set_double_value(pgui,"step_size",.01);
-		weed_set_int_value(pgui,"decimals",2);
-		break;
-	      case F0R_PARAM_STRING:
+                in_params[wnum]=weed_float_init((char *)pinfo.name,label,valpos.x,0.,1.);
+                weed_set_string_value(in_params[wnum],"description",(char *)pinfo.explanation);
+                weed_set_boolean_value(in_params[wnum],"plugin_is_position",WEED_TRUE);
+                pgui=weed_parameter_template_get_gui(in_params[wnum]);
+                weed_set_double_value(pgui,"step_size",.01);
+                weed_set_int_value(pgui,"decimals",2);
+                wnum++;
+                in_params[wnum]=weed_float_init((char *)pinfo.name,"",valpos.y,0.,1.);
+                weed_set_string_value(in_params[wnum],"description",(char *)pinfo.explanation);
+                sprintf(rfx_strings[pnum],"layout|p%d|\"X\"|fill|p%d|\"Y\"|fill|",wnum-1,wnum);
+                pgui=weed_parameter_template_get_gui(in_params[wnum]);
+                weed_set_double_value(pgui,"step_size",.01);
+                weed_set_int_value(pgui,"decimals",2);
+                break;
+              case F0R_PARAM_STRING:
 #ifdef CAN_GET_DEF
-		f0r_get_param_value(f0r_inst,(void **)&valch,pnum);
+                f0r_get_param_value(f0r_inst,(void **)&valch,pnum);
 #else
-		valch=strdup("Frei0r");
+                valch=strdup("Frei0r");
 #endif
-		in_params[wnum]=weed_text_init((char *)pinfo.name,label,valch);
+                in_params[wnum]=weed_text_init((char *)pinfo.name,label,valch);
 #ifndef CAN_GET_DEF
-		free(valch);
+                free(valch);
 #endif
-		weed_set_string_value(in_params[wnum],"description",(char *)pinfo.explanation);
-		if (num_weed_params>f0rinfo.num_params) sprintf(rfx_strings[pnum],"layout|p%d|",wnum);
-		break;
-	      default:
+                weed_set_string_value(in_params[wnum],"description",(char *)pinfo.explanation);
+                if (num_weed_params>f0rinfo.num_params) sprintf(rfx_strings[pnum],"layout|p%d|",wnum);
+                break;
+              default:
 #ifdef CAN_GET_DEF
-		f0r_destruct(f0r_inst);
+                f0r_destruct(f0r_inst);
 #endif
-		(*f0r_deinit)();
-		dlclose(handle);
-		weed_free(out_chantmpls);
-		if (in_chantmpls!=NULL) weed_free(in_chantmpls);
-		if (in_params!=NULL) weed_free(in_params);
-		if (rfx_strings!=NULL) {
-		  int j;
-		  for (j=0;j<pnum;j++) weed_free(rfx_strings[j]);
-		  weed_free(rfx_strings);
-		}
-		continue;
-	      }
-	      free(label);
-	      wnum++;
-	    }
-	    in_params[pnum]=NULL;
-	  }
+                (*f0r_deinit)();
+                dlclose(handle);
+                weed_free(out_chantmpls);
+                if (in_chantmpls!=NULL) weed_free(in_chantmpls);
+                if (in_params!=NULL) weed_free(in_params);
+                if (rfx_strings!=NULL) {
+                  int j;
+                  for (j=0; j<pnum; j++) weed_free(rfx_strings[j]);
+                  weed_free(rfx_strings);
+                }
+                continue;
+              }
+              free(label);
+              wnum++;
+            }
+            in_params[pnum]=NULL;
+          }
 
 #ifdef CAN_GET_DEF
-	  f0r_destruct(f0r_inst);
+          f0r_destruct(f0r_inst);
 #endif
 
-	  snprintf(weed_name,PATH_MAX,"Frei0r: %s",f0rinfo.name);
-	  pversion=f0rinfo.major_version*1000+f0rinfo.minor_version;
-
-	  filter_class=weed_filter_class_init(weed_name,"Frei0r developers",pversion,0,&frei0r_init,&frei0r_process,
-					      &frei0r_deinit,in_chantmpls,out_chantmpls,in_params,NULL);
-
-	  weed_set_string_value(filter_class,"extra_authors",(char *)f0rinfo.author);
-
-	  if (is_unstable) {
-	    weed_set_boolean_value(filter_class,"plugin_unstable",WEED_TRUE);
-	  }
-
-	  if (num_weed_params>f0rinfo.num_params) {
-	    gui=weed_filter_class_get_gui(filter_class);
-	    weed_set_string_value(gui,"layout_scheme","RFX");
-	    weed_set_string_value(gui,"rfx_delim","|");
-	    weed_set_string_array(gui,"rfx_strings",f0rinfo.num_params,rfx_strings);
-	    for (wnum=0;wnum<f0rinfo.num_params;wnum++) weed_free(rfx_strings[wnum]);
-	    weed_free(rfx_strings);
-	    rfx_strings=NULL;
-	  }
-
-	  if (f0rinfo.explanation!=NULL) weed_set_string_value(filter_class,"description",(char *)f0rinfo.explanation);
-	  num_filters++;
-	  weed_free(out_chantmpls);
-	  if (in_chantmpls!=NULL) weed_free(in_chantmpls);
-	  if (in_params!=NULL) weed_free(in_params);
-	  in_params=NULL;
-	  
-	  weed_set_voidptr_value(filter_class,"plugin_f0r_construct",f0r_construct);
-	  weed_set_voidptr_value(filter_class,"plugin_f0r_destruct",f0r_destruct);
-	  if (f0rinfo.num_params>0) weed_set_voidptr_value(filter_class,"plugin_f0r_set_param_value",f0r_set_param_value);
-	  weed_set_int_value(filter_class,"plugin_f0r_type",f0rinfo.plugin_type);
-
-	  switch (f0rinfo.plugin_type) {
-	  case F0R_PLUGIN_TYPE_SOURCE:
-	    weed_set_double_value(filter_class,"target_fps",25.); // set reasonable default fps
-	  case F0R_PLUGIN_TYPE_FILTER:
-	    weed_set_voidptr_value(filter_class,"plugin_f0r_update",f0r_update);
-	    break;
-	  default:
-	    weed_set_voidptr_value(filter_class,"plugin_f0r_update2",f0r_update2);
-	    break;
-	  }
-
-	  weed_plugin_info_add_filter_class (plugin_info,filter_class);
-	  // end plugin
-	}
-	// end vendor dir
+          snprintf(weed_name,PATH_MAX,"Frei0r: %s",f0rinfo.name);
+          pversion=f0rinfo.major_version*1000+f0rinfo.minor_version;
+
+          filter_class=weed_filter_class_init(weed_name,"Frei0r developers",pversion,0,&frei0r_init,&frei0r_process,
+                                              &frei0r_deinit,in_chantmpls,out_chantmpls,in_params,NULL);
+
+          weed_set_string_value(filter_class,"extra_authors",(char *)f0rinfo.author);
+
+          if (is_unstable) {
+            weed_set_boolean_value(filter_class,"plugin_unstable",WEED_TRUE);
+          }
+
+          if (num_weed_params>f0rinfo.num_params) {
+            gui=weed_filter_class_get_gui(filter_class);
+            weed_set_string_value(gui,"layout_scheme","RFX");
+            weed_set_string_value(gui,"rfx_delim","|");
+            weed_set_string_array(gui,"rfx_strings",f0rinfo.num_params,rfx_strings);
+            for (wnum=0; wnum<f0rinfo.num_params; wnum++) weed_free(rfx_strings[wnum]);
+            weed_free(rfx_strings);
+            rfx_strings=NULL;
+          }
+
+          if (f0rinfo.explanation!=NULL) weed_set_string_value(filter_class,"description",(char *)f0rinfo.explanation);
+          num_filters++;
+          weed_free(out_chantmpls);
+          if (in_chantmpls!=NULL) weed_free(in_chantmpls);
+          if (in_params!=NULL) weed_free(in_params);
+          in_params=NULL;
+
+          weed_set_voidptr_value(filter_class,"plugin_f0r_construct",f0r_construct);
+          weed_set_voidptr_value(filter_class,"plugin_f0r_destruct",f0r_destruct);
+          if (f0rinfo.num_params>0) weed_set_voidptr_value(filter_class,"plugin_f0r_set_param_value",f0r_set_param_value);
+          weed_set_int_value(filter_class,"plugin_f0r_type",f0rinfo.plugin_type);
+
+          switch (f0rinfo.plugin_type) {
+          case F0R_PLUGIN_TYPE_SOURCE:
+            weed_set_double_value(filter_class,"target_fps",25.); // set reasonable default fps
+          case F0R_PLUGIN_TYPE_FILTER:
+            weed_set_voidptr_value(filter_class,"plugin_f0r_update",f0r_update);
+            break;
+          default:
+            weed_set_voidptr_value(filter_class,"plugin_f0r_update2",f0r_update2);
+            break;
+          }
+
+          weed_plugin_info_add_filter_class(plugin_info,filter_class);
+          // end plugin
+        }
+        // end vendor dir
       } while (vdirent!=NULL);
       if (curdir!=NULL) closedir(curdir);
     }

LiVES-2.2.8.tar.bz2/lives-plugins/weed-plugins/gdk/compositor.c -> LiVES-2.4.1.tar.bz2/lives-plugins/weed-plugins/gdk/compositor.c Changed

@@ -24,7 +24,7 @@
 ///////////////////////////////////////////////////////////////////
 
 static int num_versions=2; // number of different weed api versions supported
-static int api_versions[]={131,110,100}; // array of weed api versions supported in plugin, in order of preference (most preferred first)
+static int api_versions[]= {131,110,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
 
@@ -40,32 +40,33 @@
 
 #include <gdk/gdk.h>
 
-inline G_GNUC_CONST int pl_gdk_rowstride_value (int rowstride) {
+inline G_GNUC_CONST int pl_gdk_rowstride_value(int rowstride) {
   // from gdk-pixbuf.c
   /* Always align rows to 32-bit boundaries */
   return (rowstride + 3) & ~3;
 }
 
-inline int G_GNUC_CONST pl_gdk_last_rowstride_value (int width, int nchans) {
+inline int G_GNUC_CONST pl_gdk_last_rowstride_value(int width, int nchans) {
   // from gdk pixbuf docs
   return width*(((nchans<<3)+7)>>3);
 }
 
-static void plugin_free_buffer (guchar *pixels, gpointer data) {
+static void plugin_free_buffer(guchar *pixels, gpointer data) {
   return;
 }
 
 
-static GdkPixbuf *pl_gdk_pixbuf_cheat(GdkColorspace colorspace, gboolean has_alpha, int bits_per_sample, int width, int height, guchar *buf) {
+static GdkPixbuf *pl_gdk_pixbuf_cheat(GdkColorspace colorspace, gboolean has_alpha, int bits_per_sample, int width, int height,
+                                      guchar *buf) {
   // we can cheat if our buffer is correctly sized
   int channels=has_alpha?4:3;
   int rowstride=pl_gdk_rowstride_value(width*channels);
-  return gdk_pixbuf_new_from_data (buf, colorspace, has_alpha, bits_per_sample, width, height, rowstride, plugin_free_buffer, NULL);
+  return gdk_pixbuf_new_from_data(buf, colorspace, has_alpha, bits_per_sample, width, height, rowstride, plugin_free_buffer, NULL);
 }
 
 
 
-static GdkPixbuf *pl_data_to_pixbuf (int palette, int width, int height, int irowstride, guchar *pixel_data) {
+static GdkPixbuf *pl_data_to_pixbuf(int palette, int width, int height, int irowstride, guchar *pixel_data) {
   GdkPixbuf *pixbuf;
   int rowstride,orowstride;
   gboolean cheat=FALSE;
@@ -78,8 +79,7 @@
     if (irowstride==pl_gdk_rowstride_value(width*3)) {
       pixbuf=pl_gdk_pixbuf_cheat(GDK_COLORSPACE_RGB, FALSE, 8, width, height, pixel_data);
       cheat=TRUE;
-    }
-    else pixbuf=gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, width, height);
+    } else pixbuf=gdk_pixbuf_new(GDK_COLORSPACE_RGB, FALSE, 8, width, height);
     n_channels=3;
     break;
   case WEED_PALETTE_RGBA32:
@@ -88,29 +88,28 @@
     if (irowstride==pl_gdk_rowstride_value(width*4)) {
       pixbuf=pl_gdk_pixbuf_cheat(GDK_COLORSPACE_RGB, TRUE, 8, width, height, pixel_data);
       cheat=TRUE;
-    }
-    else pixbuf=gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8, width, height);
+    } else pixbuf=gdk_pixbuf_new(GDK_COLORSPACE_RGB, TRUE, 8, width, height);
     n_channels=4;
     break;
   default:
     return NULL;
   }
-  pixels=gdk_pixbuf_get_pixels (pixbuf);
+  pixels=gdk_pixbuf_get_pixels(pixbuf);
   orowstride=gdk_pixbuf_get_rowstride(pixbuf);
-  
+
   if (irowstride>orowstride) rowstride=orowstride;
   else rowstride=irowstride;
   end=pixels+orowstride*height;
 
   if (!cheat) {
     gboolean done=FALSE;
-    for (;pixels<end&&!done;pixels+=orowstride) {
+    for (; pixels<end&&!done; pixels+=orowstride) {
       if (pixels+orowstride>=end) {
-	orowstride=rowstride=pl_gdk_last_rowstride_value(width,n_channels);
-	done=TRUE;
+        orowstride=rowstride=pl_gdk_last_rowstride_value(width,n_channels);
+        done=TRUE;
       }
       weed_memcpy(pixels,pixel_data,rowstride);
-      if (rowstride<orowstride) weed_memset (pixels+rowstride,0,orowstride-rowstride);
+      if (rowstride<orowstride) weed_memset(pixels+rowstride,0,orowstride-rowstride);
       pixel_data+=irowstride;
     }
   }
@@ -130,7 +129,7 @@
 }
 
 
-int compositor_process (weed_plant_t *inst, weed_timecode_t timecode) {
+int compositor_process(weed_plant_t *inst, weed_timecode_t timecode) {
   int error;
   weed_plant_t **in_channels=NULL;
   int num_in_channels=0;
@@ -194,8 +193,8 @@
   // set out frame to bgcol
 
   end=dst+oheight*orowstride;
-  for (dst2=dst;dst2<end;dst2+=orowstride) {
-    for (x=0;x<owidth3;x+=3) {
+  for (dst2=dst; dst2<end; dst2+=orowstride) {
+    for (x=0; x<owidth3; x+=3) {
       dst2[x]=bgcol[0];
       dst2[x+1]=bgcol[1];
       dst2[x+2]=bgcol[2];
@@ -206,7 +205,7 @@
 
   // add overlays in reverse order
 
-  for (z=num_in_channels-1;z>=0;z--) {
+  for (z=num_in_channels-1; z>=0; z--) {
     // check if host disabled this channel : this is allowed as we have set "max_repeats"
     if (weed_plant_has_leaf(in_channels[z],"disabled")&&weed_get_boolean_value(in_channels[z],"disabled",&error)==WEED_TRUE) continue;
 
@@ -227,34 +226,33 @@
     if (out_width*out_height>0) {
       in_width=weed_get_int_value(in_channels[z],"width",&error);
       in_height=weed_get_int_value(in_channels[z],"height",&error);
-      
+
       src=weed_get_voidptr_value(in_channels[z],"pixel_data",&error);
       irowstride=weed_get_int_value(in_channels[z],"rowstrides",&error);
-      
+
       // scale image to new size
-      
+
       in_pixbuf=pl_data_to_pixbuf(WEED_PALETTE_RGB24, in_width, in_height, irowstride, (guchar *)src);
-      
+
       if (out_width>in_width||out_height>in_height) {
-	out_pixbuf=gdk_pixbuf_scale_simple(in_pixbuf,out_width,out_height,up_interp);
+        out_pixbuf=gdk_pixbuf_scale_simple(in_pixbuf,out_width,out_height,up_interp);
+      } else {
+        out_pixbuf=gdk_pixbuf_scale_simple(in_pixbuf,out_width,out_height,down_interp);
       }
-      else {
-	out_pixbuf=gdk_pixbuf_scale_simple(in_pixbuf,out_width,out_height,down_interp);
-      }
-      
+
       g_object_unref(in_pixbuf);
-      
+
       src=gdk_pixbuf_get_pixels(out_pixbuf);
 
       out_width=gdk_pixbuf_get_width(out_pixbuf);
       out_height=gdk_pixbuf_get_height(out_pixbuf);
       irowstride=gdk_pixbuf_get_rowstride(out_pixbuf);
-      
 
-      for (y=myoffsy;y<oheight&&y<myoffsy+out_height;y++) {
-	for (x=myoffsx;x<owidth&&x<myoffsx+out_width;x++) {
-	  paint_pixel(dst,y*orowstride+x*3,src,(y-myoffsy)*irowstride+(x-myoffsx)*3,myalpha);
-	}
+
+      for (y=myoffsy; y<oheight&&y<myoffsy+out_height; y++) {
+        for (x=myoffsx; x<owidth&&x<myoffsx+out_width; x++) {
+          paint_pixel(dst,y*orowstride+x*3,src,(y-myoffsy)*irowstride+(x-myoffsx)*3,myalpha);
+        }
       }
       g_object_unref(out_pixbuf);
     }
@@ -272,27 +270,28 @@
 
 
 
-weed_plant_t *weed_setup (weed_bootstrap_f weed_boot) {
+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);
   if (plugin_info!=NULL) {
-    int palette_list[]={WEED_PALETTE_RGB24,WEED_PALETTE_END};
-    weed_plant_t *in_chantmpls[]={weed_channel_template_init("in channel 0",WEED_CHANNEL_SIZE_CAN_VARY,palette_list),NULL};
-    weed_plant_t *out_chantmpls[]={weed_channel_template_init("out channel 0",WEED_CHANNEL_SIZE_CAN_VARY,palette_list),NULL};
+    int palette_list[]= {WEED_PALETTE_RGB24,WEED_PALETTE_END};
+    weed_plant_t *in_chantmpls[]= {weed_channel_template_init("in channel 0",WEED_CHANNEL_SIZE_CAN_VARY,palette_list),NULL};
+    weed_plant_t *out_chantmpls[]= {weed_channel_template_init("out channel 0",WEED_CHANNEL_SIZE_CAN_VARY,palette_list),NULL};
 
-    weed_plant_t *in_params[]={weed_float_init("xoffs","_X offset",0.,0.,1.),weed_float_init("yoffs","_Y offset",0.,0.,1.),weed_float_init("scalex","Scale _width",1.,0.,1.),weed_float_init("scaley","Scale _height",1.,0.,1.),weed_float_init("alpha","_Alpha",1.0,0.0,1.0),weed_colRGBi_init("bgcol","_Background color",0,0,0),NULL};
+    weed_plant_t *in_params[]= {weed_float_init("xoffs","_X offset",0.,0.,1.),weed_float_init("yoffs","_Y offset",0.,0.,1.),weed_float_init("scalex","Scale _width",1.,0.,1.),weed_float_init("scaley","Scale _height",1.,0.,1.),weed_float_init("alpha","_Alpha",1.0,0.0,1.0),weed_colRGBi_init("bgcol","_Background color",0,0,0),NULL};
 
-    weed_plant_t *filter_class=weed_filter_class_init("compositor","salsaman",1,0,NULL,&compositor_process,NULL,in_chantmpls,out_chantmpls,in_params,NULL);
+    weed_plant_t *filter_class=weed_filter_class_init("compositor","salsaman",1,0,NULL,&compositor_process,NULL,in_chantmpls,out_chantmpls,
+                               in_params,NULL);
 
     weed_plant_t *gui=weed_filter_class_get_gui(filter_class);
 
     // define RFX layout
-    char *rfx_strings[]={"layout|p0|p1|","layout|p2|p3|","layout|p4|","layout|hseparator|","layout|p5|","special|framedraw|multrect|0|1|2|3|4|"};
+    char *rfx_strings[]= {"layout|p0|p1|","layout|p2|p3|","layout|p4|","layout|hseparator|","layout|p5|","special|framedraw|multrect|0|1|2|3|4|"};
 
     int api_used=weed_get_api_version(plugin_info);
     // set 0 to infinite repeats
     weed_set_int_value(in_chantmpls[0],"max_repeats",0);
     weed_set_boolean_value(in_chantmpls[0],"optional",WEED_TRUE);
-    
+
     // this is necessary for the host
     if (api_used==100) {
       weed_set_int_value(in_params[0],"flags",WEED_PARAMETER_VARIABLE_ELEMENTS);
@@ -300,8 +299,7 @@
       weed_set_int_value(in_params[2],"flags",WEED_PARAMETER_VARIABLE_ELEMENTS);
       weed_set_int_value(in_params[3],"flags",WEED_PARAMETER_VARIABLE_ELEMENTS);
       weed_set_int_value(in_params[4],"flags",WEED_PARAMETER_VARIABLE_ELEMENTS);
-    }
-    else if (api_used>=110) {
+    } else if (api_used>=110) {
       // use WEED_PARAMETER_ELEMENT_PER_CHANNEL from spec 110
       weed_set_int_value(in_params[0],"flags",WEED_PARAMETER_VARIABLE_ELEMENTS|WEED_PARAMETER_ELEMENT_PER_CHANNEL);
       weed_set_int_value(in_params[1],"flags",WEED_PARAMETER_VARIABLE_ELEMENTS|WEED_PARAMETER_ELEMENT_PER_CHANNEL);
@@ -322,7 +320,7 @@
     weed_set_string_value(gui,"rfx_delim","|");
     weed_set_string_array(gui,"rfx_strings",6,rfx_strings);
 
-    weed_plugin_info_add_filter_class (plugin_info,filter_class);
+    weed_plugin_info_add_filter_class(plugin_info,filter_class);
 
     weed_set_int_value(plugin_info,"version",package_version);

LiVES-2.2.8.tar.bz2/lives-plugins/weed-plugins/gdk/gdk_fast_resize.c -> LiVES-2.4.1.tar.bz2/lives-plugins/weed-plugins/gdk/gdk_fast_resize.c Changed

@@ -26,7 +26,7 @@
 ///////////////////////////////////////////////////////////////////
 
 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 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
 
@@ -40,32 +40,33 @@
 
 #include <gdk/gdk.h>
 
-inline G_GNUC_CONST int pl_gdk_rowstride_value (int rowstride) {
+inline G_GNUC_CONST int pl_gdk_rowstride_value(int rowstride) {
   // from gdk-pixbuf.c
   /* Always align rows to 32-bit boundaries */
   return (rowstride + 3) & ~3;
 }
 
-inline int G_GNUC_CONST pl_gdk_last_rowstride_value (int width, int nchans) {
+inline int G_GNUC_CONST pl_gdk_last_rowstride_value(int width, int nchans) {
   // from gdk pixbuf docs
   return width*(((nchans<<3)+7)>>3);
 }
 
-static void plugin_free_buffer (guchar *pixels, gpointer data) {
+static void plugin_free_buffer(guchar *pixels, gpointer data) {
   return;
 }
 
 
-static GdkPixbuf *pl_gdk_pixbuf_cheat(GdkColorspace colorspace, gboolean has_alpha, int bits_per_sample, int width, int height, guchar *buf) {
+static GdkPixbuf *pl_gdk_pixbuf_cheat(GdkColorspace colorspace, gboolean has_alpha, int bits_per_sample, int width, int height,
+                                      guchar *buf) {
   // we can cheat if our buffer is correctly sized
   int channels=has_alpha?4:3;
   int rowstride=pl_gdk_rowstride_value(width*channels);
-  return gdk_pixbuf_new_from_data (buf, colorspace, has_alpha, bits_per_sample, width, height, rowstride, plugin_free_buffer, NULL);
+  return gdk_pixbuf_new_from_data(buf, colorspace, has_alpha, bits_per_sample, width, height, rowstride, plugin_free_buffer, NULL);
 }
 
 
 
-static GdkPixbuf *pl_channel_to_pixbuf (weed_plant_t *channel) {
+static GdkPixbuf *pl_channel_to_pixbuf(weed_plant_t *channel) {
   int error;
   GdkPixbuf *pixbuf;
   int palette=weed_get_int_value(channel,"current_palette",&error);
@@ -84,8 +85,7 @@
     if (irowstride==pl_gdk_rowstride_value(width*3)) {
       pixbuf=pl_gdk_pixbuf_cheat(GDK_COLORSPACE_RGB, FALSE, 8, width, height, pixel_data);
       cheat=TRUE;
-    }
-    else pixbuf=gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, width, height);
+    } else pixbuf=gdk_pixbuf_new(GDK_COLORSPACE_RGB, FALSE, 8, width, height);
     n_channels=3;
     break;
   case WEED_PALETTE_RGBA32:
@@ -95,29 +95,28 @@
     if (irowstride==pl_gdk_rowstride_value(width*4)) {
       pixbuf=pl_gdk_pixbuf_cheat(GDK_COLORSPACE_RGB, TRUE, 8, width, height, pixel_data);
       cheat=TRUE;
-    }
-    else pixbuf=gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8, width, height);
+    } else pixbuf=gdk_pixbuf_new(GDK_COLORSPACE_RGB, TRUE, 8, width, height);
     n_channels=4;
     break;
   default:
     return NULL;
   }
-  pixels=gdk_pixbuf_get_pixels (pixbuf);
+  pixels=gdk_pixbuf_get_pixels(pixbuf);
   orowstride=gdk_pixbuf_get_rowstride(pixbuf);
-  
+
   if (irowstride>orowstride) rowstride=orowstride;
   else rowstride=irowstride;
   end=pixels+orowstride*height;
 
   if (!cheat) {
     gboolean done=FALSE;
-    for (;pixels<end&&!done;pixels+=orowstride) {
+    for (; pixels<end&&!done; pixels+=orowstride) {
       if (pixels+orowstride>=end) {
-	orowstride=rowstride=pl_gdk_last_rowstride_value(width,n_channels);
-	done=TRUE;
+        orowstride=rowstride=pl_gdk_last_rowstride_value(width,n_channels);
+        done=TRUE;
       }
       weed_memcpy(pixels,pixel_data,rowstride);
-      if (rowstride<orowstride) weed_memset (pixels+rowstride,0,orowstride-rowstride);
+      if (rowstride<orowstride) weed_memset(pixels+rowstride,0,orowstride-rowstride);
       pixel_data+=irowstride;
     }
   }
@@ -128,7 +127,7 @@
 
 static gboolean pl_pixbuf_to_channel(weed_plant_t *channel, GdkPixbuf *pixbuf) {
   // return TRUE if we can use the original pixbuf pixels
-  
+
   int error;
   int rowstride=gdk_pixbuf_get_rowstride(pixbuf);
   int width=gdk_pixbuf_get_width(pixbuf);
@@ -145,7 +144,7 @@
     return FALSE;
   }
 
-  for (i=0;i<height;i++) {
+  for (i=0; i<height; i++) {
     if (i==height-1) rowstride=pl_gdk_last_rowstride_value(width,n_channels);
     weed_memcpy(dst,in_pixel_data,rowstride);
     in_pixel_data+=rowstride;
@@ -160,9 +159,10 @@
 
 
 
-int resize_process (weed_plant_t *inst, weed_timecode_t timestamp) {
+int resize_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_channel=weed_get_plantptr_value(inst,"in_channels",&error),*out_channel=weed_get_plantptr_value(inst,"out_channels",
+                           &error);
 
   int inwidth=weed_get_int_value(in_channel,"width",&error);
   int inheight=weed_get_int_value(in_channel,"height",&error);
@@ -178,8 +178,7 @@
 
   if (outwidth>inwidth||outheight>inheight) {
     out_pixbuf=gdk_pixbuf_scale_simple(in_pixbuf,outwidth,outheight,up_interp);
-  }
-  else {
+  } else {
     out_pixbuf=gdk_pixbuf_scale_simple(in_pixbuf,outwidth,outheight,down_interp);
   }
 
@@ -194,16 +193,17 @@
 
 
 
-weed_plant_t *weed_setup (weed_bootstrap_f weed_boot) {
+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);
   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};
+    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),NULL};
-    weed_plant_t *out_chantmpls[]={weed_channel_template_init("out channel 0",WEED_CHANNEL_SIZE_CAN_VARY,palette_list),NULL};
-    weed_plant_t *filter_class=weed_filter_class_init("gdk_fast_resize","salsaman",1,WEED_FILTER_IS_CONVERTER,NULL,&resize_process,NULL,in_chantmpls,out_chantmpls,NULL,NULL);
+    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_SIZE_CAN_VARY,palette_list),NULL};
+    weed_plant_t *filter_class=weed_filter_class_init("gdk_fast_resize","salsaman",1,WEED_FILTER_IS_CONVERTER,NULL,&resize_process,NULL,
+                               in_chantmpls,out_chantmpls,NULL,NULL);
 
-    weed_plugin_info_add_filter_class (plugin_info,filter_class);
+    weed_plugin_info_add_filter_class(plugin_info,filter_class);
 
     weed_set_int_value(plugin_info,"version",package_version);

LiVES-2.2.8.tar.bz2/lives-plugins/weed-plugins/gdk/haar_analyser.h -> LiVES-2.4.1.tar.bz2/lives-plugins/weed-plugins/gdk/haar_analyser.h Changed

LiVES-2.2.8.tar.bz2/lives-plugins/weed-plugins/gdk/mask_overlay.c -> LiVES-2.4.1.tar.bz2/lives-plugins/weed-plugins/gdk/mask_overlay.c Changed

LiVES-2.2.8.tar.bz2/lives-plugins/weed-plugins/gdk/puretext.c -> LiVES-2.4.1.tar.bz2/lives-plugins/weed-plugins/gdk/puretext.c Changed

@@ -18,7 +18,7 @@
 ///////////////////////////////////////////////////////////////////
 
 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 api_versions[]= {131,100}; // array of weed api versions supported in plugin, in order of preference (most preferred first)
 
 static int package_version=2; // version of this package
 
@@ -118,7 +118,7 @@
   double rot;
   double rotvel;
   double rotaccel;
-  
+
   rgb_t colour;
   double alpha;
 
@@ -192,9 +192,9 @@
   // premult to postmult and vice-versa
 
   register int i,j;
-  
-  for (i=0;i<256;i++) { //alpha val
-    for (j=0;j<256;j++) { // val to be converted
+
+  for (i=0; i<256; i++) { //alpha val
+    for (j=0; j<256; j++) { // val to be converted
       unal[i][j]=(float)j*255./(float)i;
       al[i][j]=(float)j*(float)i/255.;
     }
@@ -224,23 +224,22 @@
   }
 
   if (un) {
-    for (i=0;i<height;i++) {
-      for (j=0;j<width;j+=psize) {
-	alpha=ptr[j+aoffs];
-	for (p=coffs;p<psizel;p++) {
-	  ptr[j+p]=unal[alpha][ptr[j+p]];
-	}
+    for (i=0; i<height; i++) {
+      for (j=0; j<width; j+=psize) {
+        alpha=ptr[j+aoffs];
+        for (p=coffs; p<psizel; p++) {
+          ptr[j+p]=unal[alpha][ptr[j+p]];
+        }
       }
       ptr+=rowstride;
     }
-  }
-  else {
-    for (i=0;i<height;i++) {
-      for (j=0;j<width;j+=psize) {
-	alpha=ptr[j+aoffs];
-	for (p=coffs;p<psizel;p++) {
-	  ptr[j+p]=al[alpha][ptr[j+p]];
-	}
+  } else {
+    for (i=0; i<height; i++) {
+      for (j=0; j<width; j+=psize) {
+        alpha=ptr[j+aoffs];
+        for (p=coffs; p<psizel; p++) {
+          ptr[j+p]=al[alpha][ptr[j+p]];
+        }
       }
       ptr+=rowstride;
     }
@@ -289,10 +288,9 @@
 
   if (irowstride==orowstride) {
     weed_memcpy((void *)pixel_data,(void *)src,irowstride*height);
-  }
-  else {
+  } else {
     dst=pixel_data;
-    for (i=0;i<height;i++) {
+    for (i=0; i<height; i++) {
       weed_memcpy((void *)dst,(void *)src,widthx);
       weed_memset((void *)dst+widthx,0,widthx-orowstride);
       dst+=orowstride;
@@ -307,9 +305,9 @@
   }
 
   surf=cairo_image_surface_create_for_data(pixel_data,
-					   cform, 
-					   width, height,
-					   orowstride);
+       cform,
+       width, height,
+       orowstride);
 
   if (surf==NULL) {
     weed_free(pixel_data);
@@ -344,18 +342,17 @@
   register int i;
 
   // flush to ensure all writing to the image was done
-  cairo_surface_flush (surface);
+  cairo_surface_flush(surface);
 
-  src = cairo_image_surface_get_data (surface);
+  src = cairo_image_surface_get_data(surface);
 
   irowstride=cairo_format_stride_for_width(cform,width);
 
   if (irowstride==orowstride) {
     weed_memcpy((void *)pixel_data,(void *)src,irowstride*height);
-  }
-  else {
+  } else {
     dst=pixel_data;
-    for (i=0;i<height;i++) {
+    for (i=0; i<height; i++) {
       weed_memcpy((void *)dst,(void *)src,widthx);
       weed_memset((void *)(dst+widthx),0,widthx-orowstride);
       dst+=orowstride;
@@ -463,12 +460,11 @@
     xtoffs=mbtowc(&pwc,&text[toffs],4);
     if (iswspace(pwc)) {
       if (idx==-1) {
-	subst->length=toffs-subst->start;
-	return subst;
+        subst->length=toffs-subst->start;
+        return subst;
       }
       isaspace=TRUE;
-    }
-    else if (isaspace) {
+    } else if (isaspace) {
       if (--idx==-1) subst->start=toffs;
       isaspace=FALSE;
     }
@@ -493,12 +489,11 @@
   while (text[toffs]!='\0') {
     if (isspace(text[toffs])) {
       if (idx==-1) {
-	subst->length=toffs-subst->start;
-	return subst;
+        subst->length=toffs-subst->start;
+        return subst;
       }
       isaspace=TRUE;
-    }
-    else if (isaspace) {
+    } else if (isaspace) {
       if (--idx==-1) subst->start=toffs;
       isaspace=FALSE;
     }
@@ -516,9 +511,9 @@
   // calculate width and height of layout
   int w_, h_;
   pango_layout_get_size(layout, &w_, &h_);
-  if(pw)
+  if (pw)
     *pw = ((double)w_)/PANGO_SCALE;
-  if(ph)
+  if (ph)
     *ph = ((double)h_)/PANGO_SCALE;
 }
 
@@ -589,16 +584,16 @@
 }
 
 static void rotate_text(cairo_t *cairo, PangoLayout *layout, int x_center, int y_center, double radians) {
- cairo_translate (cairo, x_center, y_center);
- cairo_rotate (cairo, radians);
+  cairo_translate(cairo, x_center, y_center);
+  cairo_rotate(cairo, radians);
 
- /* Inform Pango to re-layout the text with the new transformation */
- pango_cairo_update_layout (cairo, layout);
+  /* Inform Pango to re-layout the text with the new transformation */
+  pango_cairo_update_layout(cairo, layout);
 }
 
 
-static void proctext(sdata_t *sdata, weed_timecode_t tc, char *xtext, cairo_t *cairo, PangoLayout *layout, 
-		     PangoFontDescription *font, int width, int height) {
+static void proctext(sdata_t *sdata, weed_timecode_t tc, char *xtext, cairo_t *cairo, PangoLayout *layout,
+                     PangoFontDescription *font, int width, int height) {
   double dwidth,dheight;
   double radX,radY;
 
@@ -610,19 +605,19 @@
       sdata->length=1;
       sdata->tmode=PT_WORD_MODE;
     }
-    
+
     if (sdata->start>-1) {
       set_font_size(layout,font,64);
       // get pixel size of word
       getlsize(layout, &dwidth, &dheight);
-      
+
       setxypos(dwidth,dheight,width/2,height/2,&sdata->x_text,&sdata->y_text);
 
       sdata->dbl1-=sdata->dbl1/3.5+.5; // blur shrink
       sdata->dbl2+=.07;
       sdata->fg_alpha=sdata->dbl2;
     }
-    
+
     if (sdata->alarm) {
       pt_subst_t *xsubst;
       char nxlast;
@@ -632,44 +627,41 @@
       sdata->fg_alpha=sdata->dbl2=0.;
 
       if (sdata->length>0) {
-	sdata->start++;
-	if (sdata->start>=sdata->wlength) {
-	  sdata->start=0;
-	  sdata->length=0;
-	  sdata->dbl1=0.;
-	  pt_set_alarm(sdata,1000); // milliseconds
-	}
-      }
-      else {
-	sdata->length=1;
-	sdata->bool1=TRUE;
+        sdata->start++;
+        if (sdata->start>=sdata->wlength) {
+          sdata->start=0;
+          sdata->length=0;
+          sdata->dbl1=0.;
+          pt_set_alarm(sdata,1000); // milliseconds
+        }
+      } else {
+        sdata->length=1;
+        sdata->bool1=TRUE;
       }
 
       if (sdata->length>0) {
-	if (sdata->start==sdata->wlength-1) {
-	  pt_set_alarm(sdata,1000); // milliseconds
-	}
-	else {
-	  // peek at last char of next word
-	  if (sdata->text_type==TEXT_TYPE_ASCII) {
-	    xsubst=get_nth_word_ascii(sdata->text,sdata->start);
-	  }
-	  else {
-	    xsubst=get_nth_word_utf8(sdata->text,sdata->start);
-	  }
-	  
-	  nxlast=sdata->text[xsubst->start+xsubst->length-1];
-	  
-	  weed_free(xsubst);
-	  
-	  if (nxlast=='.'||nxlast=='!'||nxlast=='?') pt_set_alarm(sdata,1000); // milliseconds
-	  else if (nxlast==',') pt_set_alarm(sdata,700); // milliseconds
-	  else if (nxlast==';') pt_set_alarm(sdata,800); // milliseconds
-	  else pt_set_alarm(sdata,500); // milliseconds
-	}
+        if (sdata->start==sdata->wlength-1) {
+          pt_set_alarm(sdata,1000); // milliseconds
+        } else {
+          // peek at last char of next word
+          if (sdata->text_type==TEXT_TYPE_ASCII) {
+            xsubst=get_nth_word_ascii(sdata->text,sdata->start);
+          } else {
+            xsubst=get_nth_word_utf8(sdata->text,sdata->start);
+          }
+
+          nxlast=sdata->text[xsubst->start+xsubst->length-1];
+
+          weed_free(xsubst);
+
+          if (nxlast=='.'||nxlast=='!'||nxlast=='?') pt_set_alarm(sdata,1000); // milliseconds
+          else if (nxlast==',') pt_set_alarm(sdata,700); // milliseconds
+          else if (nxlast==';') pt_set_alarm(sdata,800); // milliseconds
+          else pt_set_alarm(sdata,500); // milliseconds
+        }
       }
     }
-    
+
     break;
 
   case (PT_LETTER_STARFIELD):
@@ -686,24 +678,23 @@
       pt_letter_data_t *ldt=&sdata->letter_data[sdata->count];
       double dist=ldt->zpos;
       if (dist>1.) {
-	set_font_size(layout,font,1024./dist);
+        set_font_size(layout,font,1024./dist);
 
-	// get pixel size of letter/word
-	getlsize(layout, &dwidth, &dheight);
+        // get pixel size of letter/word
+        getlsize(layout, &dwidth, &dheight);
 
-	sdata->x_text=ldt->xpos/dist+(double)width/2.;
-	sdata->y_text=ldt->ypos/dist+(double)height/2.;
+        sdata->x_text=ldt->xpos/dist+(double)width/2.;
+        sdata->y_text=ldt->ypos/dist+(double)height/2.;
 
-	setxypos(dwidth,dheight,sdata->x_text,sdata->y_text,&sdata->x_text,&sdata->y_text);
+        setxypos(dwidth,dheight,sdata->x_text,sdata->y_text,&sdata->x_text,&sdata->y_text);
 
-	sdata->fg_alpha=dist/100.+.5;
+        sdata->fg_alpha=dist/100.+.5;
 
-	anim_letter(ldt);
+        anim_letter(ldt);
 
-	colour_copy(&sdata->fg,&ldt->colour);
+        colour_copy(&sdata->fg,&ldt->colour);
 
-      }
-      else pango_layout_set_text(layout, "", -1);
+      } else pango_layout_set_text(layout, "", -1);
 
     }
 
@@ -724,12 +715,11 @@
       ldt->xaccel=ldt->yaccel=ldt->zaccel=ldt->rotaccel=0.;
 
       if (sdata->length==0||!strncmp(&sdata->text[utf8offs(sdata->text,sdata->length)]," ",1)) {
-	ldt->colour.red=getrandi(60,255);
-	ldt->colour.green=getrandi(60,255);
-	ldt->colour.blue=getrandi(60,255);
-      }
-      else {
-	colour_copy(&ldt->colour,&(sdata->letter_data[sdata->length-1].colour));
+        ldt->colour.red=getrandi(60,255);
+        ldt->colour.green=getrandi(60,255);
+        ldt->colour.blue=getrandi(60,255);
+      } else {
+        colour_copy(&ldt->colour,&(sdata->letter_data[sdata->length-1].colour));
       }
 
       sdata->length++;
@@ -797,73 +787,68 @@
     }
 
     set_font_size(layout,font,2560./(sdata->count+19.));
-      
+
     // get pixel size of letter/word
     getlsize(layout, &dwidth, &dheight);
-      
+
     // expansion factor
     if (sdata->int1<2) {
       sdata->dbl3=1.;
       sdata->bool1=FALSE;
-    }
-    else sdata->dbl3+=.0001;
-      
+    } else sdata->dbl3+=.0001;
+
     // set x_text, y_text
     if (!sdata->count) {
       sdata->dbl1=radX=width*.45*sdata->dbl3;
       sdata->dbl2=radY=height*.45*sdata->dbl3;
-    }
-    else {
+    } else {
       if (!sdata->bool1) {
-	sdata->dbl1=radX=sdata->dbl1*.98;
-	sdata->dbl2=radY=sdata->dbl2*.98;
-      }
-      else {
-	sdata->dbl1=radX=sdata->dbl1*.97;
-	sdata->dbl2=radY=sdata->dbl2*.97;
+        sdata->dbl1=radX=sdata->dbl1*.98;
+        sdata->dbl2=radY=sdata->dbl2*.98;
+      } else {
+        sdata->dbl1=radX=sdata->dbl1*.97;
+        sdata->dbl2=radY=sdata->dbl2*.97;
       }
     }
-      
-    if (sdata->bool1) 
+
+    if (sdata->bool1)
       setxypos(dwidth,dheight,width/2+sin(sdata->count/4.+(sdata->dbl3-1.)*9.)*radX,
-	       height/2-cos(-sdata->count/4.-(sdata->dbl3-1.)*8.)*radY,&sdata->x_text,&sdata->y_text);
-      
+               height/2-cos(-sdata->count/4.-(sdata->dbl3-1.)*8.)*radY,&sdata->x_text,&sdata->y_text);
+
     else
       setxypos(dwidth,dheight,width/2+sin(sdata->count/4.+(sdata->dbl3-1.)*8.)*radX,
-	       height/2-cos(-sdata->count/4.-(sdata->dbl3-1.)*8.)*radY,&sdata->x_text,&sdata->y_text);
-      
+               height/2-cos(-sdata->count/4.-(sdata->dbl3-1.)*8.)*radY,&sdata->x_text,&sdata->y_text);
+
     if (!strncmp(xtext,".",1)) sdata->int1++;
-      
+
     if (sdata->alarm) {
       pt_set_alarm(sdata,250); // milliseconds
       if (sdata->start+sdata->length<sdata->tlength) {
-	// add an extra letter
-	sdata->length++;
-      }
-      else {
-	sdata->length-=2;
-	sdata->start+=2;
-	sdata->dbl3-=.0002;
-
-	sdata->dbl1=sdata->dbl1*.97;
-	sdata->dbl2=radY=sdata->dbl2*.97;
-	  
-	// trip to lissajou
-	if (!sdata->bool1) sdata->bool1=TRUE;
-	  
-	if (sdata->length<=0) {
-	  sdata->length=1;
-	  sdata->start=0;
-	  sdata->bool1=FALSE;
-	  sdata->dbl3=-sdata->dbl3/12.;
-	}
-	else pt_set_alarm(sdata,50); // milliseconds
-	  
+        // add an extra letter
+        sdata->length++;
+      } else {
+        sdata->length-=2;
+        sdata->start+=2;
+        sdata->dbl3-=.0002;
+
+        sdata->dbl1=sdata->dbl1*.97;
+        sdata->dbl2=radY=sdata->dbl2*.97;
+
+        // trip to lissajou
+        if (!sdata->bool1) sdata->bool1=TRUE;
+
+        if (sdata->length<=0) {
+          sdata->length=1;
+          sdata->start=0;
+          sdata->bool1=FALSE;
+          sdata->dbl3=-sdata->dbl3/12.;
+        } else pt_set_alarm(sdata,50); // milliseconds
+
       }
-	
+
     }
     break;
-      
+
   } // end switch
 
 }
@@ -887,7 +872,7 @@
     g_snprintf(buff,512,"Error opening file %s",textfile);
   }
 
-  weed_free(textfile);     
+  weed_free(textfile);
   weed_free(in_params);
 
   sdata=(sdata_t *)weed_malloc(sizeof(sdata_t));
@@ -914,8 +899,7 @@
   if (sdata->text_type==TEXT_TYPE_ASCII) {
     sdata->tlength=strlen(sdata->text);
     sdata->wlength=get_ascii_word_length(sdata->text);
-  }
-  else {
+  } else {
     sdata->tlength=utf8len(sdata->text);
     sdata->wlength=get_utf8_word_length(sdata->text);
   }
@@ -951,7 +935,7 @@
 
 
 
-int puretext_process (weed_plant_t *inst, weed_timecode_t tc) {
+int puretext_process(weed_plant_t *inst, weed_timecode_t tc) {
   int error;
 
   weed_plant_t *in_channel=weed_get_plantptr_value(inst,"in_channels",&error);
@@ -969,7 +953,7 @@
   guchar *dst=weed_get_voidptr_value(out_channel,"pixel_data",&error);
 
   size_t toffs;
-    
+
   //int alpha_threshold = 0;
 
   int orowstride=weed_get_int_value(out_channel,"rowstrides",&error);
@@ -980,7 +964,7 @@
   int mode=weed_get_int_value(in_params[P_MODE],"value",&error);
 
   register int i,j;
-  
+
 
   weed_free(in_params); // must weed free because we got an array
 
@@ -995,8 +979,7 @@
   if (sdata->timer==-1.||tc<sdata->last_tc) {
     sdata->timer=0.;
     sdata->length=0;
-  }
-  else {
+  } else {
     sdata->timer+=(double)(tc-sdata->last_tc)/100000000.;
     sdata->alarm=FALSE;
   }
@@ -1019,134 +1002,130 @@
 
 
   // THINGS TO TO WITH TEXTS AND PANGO
-  if((!in_channel) || (in_channel == out_channel))
+  if ((!in_channel) || (in_channel == out_channel))
     cairo = channel_to_cairo(out_channel);
   else
     cairo = channel_to_cairo(in_channel);
 
-      if(cairo) {
-	// TODO - get real offset of start in bytes
-
-	if (sdata->text_type==TEXT_TYPE_ASCII) {
-	  toffs=sdata->start;
-	}
-	else {
-	  toffs=utf8offs(sdata->text,sdata->start);
-	}
-
-	// loop from start char to end char
-	for (i=sdata->start;i<sdata->start+(sdata->length==0?1:sdata->length);i++) {
-	  PangoLayout *layout = pango_cairo_create_layout(cairo);
-	  if (layout) { 
-	    PangoFontDescription *font;
-	    char *xtext;
-
-	    font = pango_font_description_new();
-
-	    // send letter or word to proctext
-
-	    //if((num_fonts_available) && (fontnum >= 0) && (fontnum < num_fonts_available) && (fonts_available[fontnum]))
-	    pango_font_description_set_family(font, "Serif");
-
-	    if (sdata->length==0) {
-	      xtext=weed_malloc(1);
-	      weed_memset(xtext,0,1);
-	    }
-	    else {
-	      switch (sdata->tmode) {
-		case PT_LETTER_MODE:
-		  // letter mode
-		  if (sdata->text_type==TEXT_TYPE_ASCII) {
-		    xtext=stringdup(&sdata->text[toffs],1);
-		    toffs++;
-		  }
-		  else {
-		    int xlen=mbtowc(NULL,&sdata->text[toffs],4);
-		    xtext=stringdup(&sdata->text[toffs],xlen);
-		    toffs+=xlen;
-		  }
-		  break;
-
-		case PT_WORD_MODE:
-		  // word mode
-		  if (sdata->text_type==TEXT_TYPE_ASCII) {
-		    xsubst=get_nth_word_ascii(sdata->text,i);
-		  }
-		  else {
-		    xsubst=get_nth_word_utf8(sdata->text,i);
-		  }
-		  xtext=stringdup(&sdata->text[xsubst->start],xsubst->length);
-
-		  weed_free(xsubst);
-		  break;
-	      default:
-		// TODO - line mode and all mode
-		xtext=weed_malloc(1);
-		weed_memset(xtext,0,1);
-		break;
-		}
-	    }
-	    pango_layout_set_font_description(layout, font);
-	    pango_layout_set_text(layout, (char *)xtext, -1);
-
-	    // default colour - opaque white
-	    sdata->fg.red=sdata->fg.green=sdata->fg.blue=255.;
-	    sdata->fg_alpha=1.;
-
-	    cairo_save(cairo);
-
-	    // get size, position, and colour
-	    proctext(sdata,tc,(char *)xtext,cairo,layout,font,width,height);
-
-	    free(xtext);
-
-	    cairo_move_to(cairo, sdata->x_text, sdata->y_text);
-
-	    cairo_set_source_rgba(cairo,sdata->fg.red/255.0, sdata->fg.green/255.0, sdata->fg.blue/255.0, 
-				  sdata->fg_alpha);
-
-	    pango_cairo_show_layout(cairo, layout);
-
-	    cairo_restore(cairo);
-
-	    pango_font_description_free(font);
-	    g_object_unref(layout);
-	  }
-
-	  sdata->count++;
-
-	} // end loop
-
-	cairo_to_channel(cairo,out_channel);
-	cairo_destroy(cairo);
+  if (cairo) {
+    // TODO - get real offset of start in bytes
+
+    if (sdata->text_type==TEXT_TYPE_ASCII) {
+      toffs=sdata->start;
+    } else {
+      toffs=utf8offs(sdata->text,sdata->start);
+    }
+
+    // loop from start char to end char
+    for (i=sdata->start; i<sdata->start+(sdata->length==0?1:sdata->length); i++) {
+      PangoLayout *layout = pango_cairo_create_layout(cairo);
+      if (layout) {
+        PangoFontDescription *font;
+        char *xtext;
+
+        font = pango_font_description_new();
+
+        // send letter or word to proctext
+
+        //if((num_fonts_available) && (fontnum >= 0) && (fontnum < num_fonts_available) && (fonts_available[fontnum]))
+        pango_font_description_set_family(font, "Serif");
+
+        if (sdata->length==0) {
+          xtext=weed_malloc(1);
+          weed_memset(xtext,0,1);
+        } else {
+          switch (sdata->tmode) {
+          case PT_LETTER_MODE:
+            // letter mode
+            if (sdata->text_type==TEXT_TYPE_ASCII) {
+              xtext=stringdup(&sdata->text[toffs],1);
+              toffs++;
+            } else {
+              int xlen=mbtowc(NULL,&sdata->text[toffs],4);
+              xtext=stringdup(&sdata->text[toffs],xlen);
+              toffs+=xlen;
+            }
+            break;
+
+          case PT_WORD_MODE:
+            // word mode
+            if (sdata->text_type==TEXT_TYPE_ASCII) {
+              xsubst=get_nth_word_ascii(sdata->text,i);
+            } else {
+              xsubst=get_nth_word_utf8(sdata->text,i);
+            }
+            xtext=stringdup(&sdata->text[xsubst->start],xsubst->length);
+
+            weed_free(xsubst);
+            break;
+          default:
+            // TODO - line mode and all mode
+            xtext=weed_malloc(1);
+            weed_memset(xtext,0,1);
+            break;
+          }
+        }
+        pango_layout_set_font_description(layout, font);
+        pango_layout_set_text(layout, (char *)xtext, -1);
+
+        // default colour - opaque white
+        sdata->fg.red=sdata->fg.green=sdata->fg.blue=255.;
+        sdata->fg_alpha=1.;
+
+        cairo_save(cairo);
+
+        // get size, position, and colour
+        proctext(sdata,tc,(char *)xtext,cairo,layout,font,width,height);
+
+        free(xtext);
+
+        cairo_move_to(cairo, sdata->x_text, sdata->y_text);
+
+        cairo_set_source_rgba(cairo,sdata->fg.red/255.0, sdata->fg.green/255.0, sdata->fg.blue/255.0,
+                              sdata->fg_alpha);
+
+        pango_cairo_show_layout(cairo, layout);
+
+        cairo_restore(cairo);
+
+        pango_font_description_free(font);
+        g_object_unref(layout);
       }
 
+      sdata->count++;
+
+    } // end loop
+
+    cairo_to_channel(cairo,out_channel);
+    cairo_destroy(cairo);
+  }
+
 
   if (sdata->mode==PT_WORD_COALESCE) {
     if (sdata->dbl1>0.) {
       guchar *b_data=bgdata;
       int width3=width*3;
       guchar *dstx=dst=weed_get_voidptr_value(out_channel,"pixel_data",&error);
-      
-      for (i=0;i<height;i++) {
-	for (j=0;j<width3;j+=3) {
-	  if (dst[j]!=b_data[j]||dst[j+1]!=b_data[j+1]||dst[j+2]!=b_data[j+2]) {
-	    // move point by sdata->dbl1 pixels
-	    double angle=rand_angle();
-	    int x=j/3+sin(angle)*sdata->dbl1;
-	    int y=i+cos(angle)*sdata->dbl1;
-	    if (x>0&&x<width&&y>0&&y<height) {
-	      // blur 1 pixel
-	      memcpy(&dstx[y*orowstride+x*3],&dst[j],3);
-	      // protect blurred pixel
-	      if (y>=i) memcpy(&bgdata[y*orowstride+x*3],&dst[j],3);
-	    }
-	    // replace original pixel
-	    memcpy(&dst[j],&b_data[j],3);
-	  }
-	}
-	dst+=orowstride;
-	b_data+=orowstride;
+
+      for (i=0; i<height; i++) {
+        for (j=0; j<width3; j+=3) {
+          if (dst[j]!=b_data[j]||dst[j+1]!=b_data[j+1]||dst[j+2]!=b_data[j+2]) {
+            // move point by sdata->dbl1 pixels
+            double angle=rand_angle();
+            int x=j/3+sin(angle)*sdata->dbl1;
+            int y=i+cos(angle)*sdata->dbl1;
+            if (x>0&&x<width&&y>0&&y<height) {
+              // blur 1 pixel
+              memcpy(&dstx[y*orowstride+x*3],&dst[j],3);
+              // protect blurred pixel
+              if (y>=i) memcpy(&bgdata[y*orowstride+x*3],&dst[j],3);
+            }
+            // replace original pixel
+            memcpy(&dst[j],&b_data[j],3);
+          }
+        }
+        dst+=orowstride;
+        b_data+=orowstride;
       }
     }
     weed_free(bgdata);
@@ -1160,7 +1139,7 @@
 
 
 /*
-static int font_compare(const void *p1, const void *p2) {  
+static int font_compare(const void *p1, const void *p2) {
   const char *s1 = (const char *)(*(char **)p1);
   const char *s2 = (const char *)(*(char **)p2);
   char *u1 = g_utf8_casefold(s1, -1);
@@ -1171,7 +1150,7 @@
   return ret;
   }*/
 
-weed_plant_t *weed_setup (weed_bootstrap_f weed_boot) {
+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);
 
   if (plugin_info!=NULL) {
@@ -1179,8 +1158,8 @@
     weed_plant_t *filter_class;
     PangoContext *ctx;
 
-    const char *modes[]={"Spiral text","Spinning letters","Letter starfield","Word coalesce",NULL};
-    char *rfx_strings[]={"special|fileread|0|"};
+    const char *modes[]= {"Spiral text","Spinning letters","Letter starfield","Word coalesce",NULL};
+    char *rfx_strings[]= {"special|fileread|0|"};
 
     char *deftextfile;
 
@@ -1192,7 +1171,7 @@
 
     if (is_big_endian())
       palette_list[0]=WEED_PALETTE_ARGB32;
-    else 
+    else
       palette_list[0]=WEED_PALETTE_BGRA32;
 
     palette_list[1]=WEED_PALETTE_END;
@@ -1212,19 +1191,19 @@
     fonts_available = NULL;
 
     ctx = gdk_pango_context_get();
-    if(ctx) {
+    if (ctx) {
       PangoFontMap *pfm = pango_context_get_font_map(ctx);
-      if(pfm) {
+      if (pfm) {
         int num = 0;
         PangoFontFamily **pff = NULL;
         pango_font_map_list_families(pfm, &pff, &num);
-        if(num > 0) {
+        if (num > 0) {
           // we should reserve num+1 for a final NULL pointer
           fonts_available = (char **)weed_malloc((num+1)*sizeof(char *));
-          if(fonts_available) {
+          if (fonts_available) {
             register int i;
             num_fonts_available = num;
-            for(i = 0; i < num; ++i) {
+            for (i = 0; i < num; ++i) {
               fonts_available[i] = strdup(pango_font_family_get_name(pff[i]));
             }
             // don't forget this thing
@@ -1232,7 +1211,7 @@
           }
         }
         g_free(pff);
-      } 
+      }
       g_object_unref(ctx);
     }
 
@@ -1242,14 +1221,14 @@
     gui=weed_parameter_template_get_gui(in_params[P_TEXT]);
     weed_set_int_value(gui,"maxchars",80); // for display only - fileread will override this
     flags=0;
-    if (weed_plant_has_leaf(in_params[P_TEXT],"flags")) 
+    if (weed_plant_has_leaf(in_params[P_TEXT],"flags"))
       flags=weed_get_int_value(in_params[P_TEXT],"flags",&error);
     flags|=WEED_PARAMETER_REINIT_ON_VALUE_CHANGE;
     weed_set_int_value(in_params[P_TEXT],"flags",flags);
 
     in_params[P_MODE]=weed_string_list_init("mode","Effect _mode",0,modes);
     flags=0;
-    if (weed_plant_has_leaf(in_params[P_MODE],"flags")) 
+    if (weed_plant_has_leaf(in_params[P_MODE],"flags"))
       flags=weed_get_int_value(in_params[P_MODE],"flags",&error);
     flags|=WEED_PARAMETER_REINIT_ON_VALUE_CHANGE;
     weed_set_int_value(in_params[P_MODE],"flags",flags);
@@ -1258,14 +1237,14 @@
     g_free(deftextfile);
 
     filter_class=weed_filter_class_init("puretext","Salsaman & Aleksej Penkov",1,0,&puretext_init,&puretext_process,NULL,
-					in_chantmpls,out_chantmpls,in_params,NULL);
+                                        in_chantmpls,out_chantmpls,in_params,NULL);
 
     gui=weed_filter_class_get_gui(filter_class);
     weed_set_string_value(gui,"layout_scheme","RFX");
     weed_set_string_value(gui,"rfx_delim","|");
     weed_set_string_array(gui,"rfx_strings",1,rfx_strings);
 
-    weed_plugin_info_add_filter_class (plugin_info,filter_class);
+    weed_plugin_info_add_filter_class(plugin_info,filter_class);
 
     weed_set_int_value(plugin_info,"version",package_version);
 
@@ -1278,13 +1257,13 @@
 
 void weed_desetup(void) {
   // clean up what we reserve for font family names
-  if(num_fonts_available && fonts_available) {
+  if (num_fonts_available && fonts_available) {
     int i;
-    for(i = 0; i < num_fonts_available; ++i) {
+    for (i = 0; i < num_fonts_available; ++i) {
       free((void *)fonts_available[i]);
     }
     weed_free((void *)fonts_available);
-  }    
+  }
   num_fonts_available = 0;
   fonts_available = NULL;
 }

LiVES-2.2.8.tar.bz2/lives-plugins/weed-plugins/gdk/scribbler.c -> LiVES-2.4.1.tar.bz2/lives-plugins/weed-plugins/gdk/scribbler.c Changed

LiVES-2.2.8.tar.bz2/lives-plugins/weed-plugins/gdk/videowall.c -> LiVES-2.4.1.tar.bz2/lives-plugins/weed-plugins/gdk/videowall.c Changed

LiVES-2.2.8.tar.bz2/lives-plugins/weed-plugins/gdk/vjack_rcv.c -> LiVES-2.4.1.tar.bz2/lives-plugins/weed-plugins/gdk/vjack_rcv.c Changed

@@ -23,7 +23,7 @@
 ///////////////////////////////////////////////////////////////////
 
 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 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
 
@@ -56,32 +56,33 @@
 
 #include <gdk/gdk.h>
 
-inline G_GNUC_CONST int pl_gdk_rowstride_value (int rowstride) {
+inline G_GNUC_CONST int pl_gdk_rowstride_value(int rowstride) {
   // from gdk-pixbuf.c
   /* Always align rows to 32-bit boundaries */
   return (rowstride + 3) & ~3;
 }
 
-inline int G_GNUC_CONST pl_gdk_last_rowstride_value (int width, int nchans) {
+inline int G_GNUC_CONST pl_gdk_last_rowstride_value(int width, int nchans) {
   // from gdk pixbuf docs
   return width*(((nchans<<3)+7)>>3);
 }
 
-static void plugin_free_buffer (guchar *pixels, gpointer data) {
+static void plugin_free_buffer(guchar *pixels, gpointer data) {
   return;
 }
 
 
-static inline GdkPixbuf *pl_gdk_pixbuf_cheat(GdkColorspace colorspace, gboolean has_alpha, int bits_per_sample, int width, int height, guchar *buf) {
+static inline GdkPixbuf *pl_gdk_pixbuf_cheat(GdkColorspace colorspace, gboolean has_alpha, int bits_per_sample, int width, int height,
+    guchar *buf) {
   // we can cheat if our buffer is correctly sized
   int channels=has_alpha?4:3;
   int rowstride=pl_gdk_rowstride_value(width*channels);
-  return gdk_pixbuf_new_from_data (buf, colorspace, has_alpha, bits_per_sample, width, height, rowstride, plugin_free_buffer, NULL);
+  return gdk_pixbuf_new_from_data(buf, colorspace, has_alpha, bits_per_sample, width, height, rowstride, plugin_free_buffer, NULL);
 }
 
 
 
-static GdkPixbuf *pl_data_to_pixbuf (int palette, int width, int height, int irowstride, guchar *pixel_data) {
+static GdkPixbuf *pl_data_to_pixbuf(int palette, int width, int height, int irowstride, guchar *pixel_data) {
   GdkPixbuf *pixbuf;
   int rowstride,orowstride;
   gboolean cheat=FALSE;
@@ -94,8 +95,7 @@
     if (irowstride==pl_gdk_rowstride_value(width*3)) {
       pixbuf=pl_gdk_pixbuf_cheat(GDK_COLORSPACE_RGB, FALSE, 8, width, height, pixel_data);
       cheat=TRUE;
-    }
-    else pixbuf=gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, width, height);
+    } else pixbuf=gdk_pixbuf_new(GDK_COLORSPACE_RGB, FALSE, 8, width, height);
     n_channels=3;
     break;
   case WEED_PALETTE_RGBA32:
@@ -104,29 +104,28 @@
     if (irowstride==pl_gdk_rowstride_value(width*4)) {
       pixbuf=pl_gdk_pixbuf_cheat(GDK_COLORSPACE_RGB, TRUE, 8, width, height, pixel_data);
       cheat=TRUE;
-    }
-    else pixbuf=gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8, width, height);
+    } else pixbuf=gdk_pixbuf_new(GDK_COLORSPACE_RGB, TRUE, 8, width, height);
     n_channels=4;
     break;
   default:
     return NULL;
   }
-  pixels=gdk_pixbuf_get_pixels (pixbuf);
+  pixels=gdk_pixbuf_get_pixels(pixbuf);
   orowstride=gdk_pixbuf_get_rowstride(pixbuf);
-  
+
   if (irowstride>orowstride) rowstride=orowstride;
   else rowstride=irowstride;
   end=pixels+orowstride*height;
 
   if (!cheat) {
     gboolean done=FALSE;
-    for (;pixels<end&&!done;pixels+=orowstride) {
+    for (; pixels<end&&!done; pixels+=orowstride) {
       if (pixels+orowstride>=end) {
-	orowstride=rowstride=pl_gdk_last_rowstride_value(width,n_channels);
-	done=TRUE;
+        orowstride=rowstride=pl_gdk_last_rowstride_value(width,n_channels);
+        done=TRUE;
       }
       weed_memcpy(pixels,pixel_data,rowstride);
-      if (rowstride<orowstride) weed_memset (pixels+rowstride,0,orowstride-rowstride);
+      if (rowstride<orowstride) weed_memset(pixels+rowstride,0,orowstride-rowstride);
       pixel_data+=irowstride;
     }
   }
@@ -137,7 +136,7 @@
 
 static gboolean pl_pixbuf_to_channel(weed_plant_t *channel, GdkPixbuf *pixbuf) {
   // return TRUE if we can use the original pixbuf pixels
-  
+
   int error;
   int rowstride=gdk_pixbuf_get_rowstride(pixbuf);
   int width=gdk_pixbuf_get_width(pixbuf);
@@ -154,7 +153,7 @@
     return FALSE;
   }
 
-  for (i=0;i<height;i++) {
+  for (i=0; i<height; i++) {
     if (i==height-1) rowstride=pl_gdk_last_rowstride_value(width,n_channels);
     weed_memcpy(dst,in_pixel_data,rowstride);
     in_pixel_data+=rowstride;
@@ -181,14 +180,13 @@
 
 
 
-int server_process (jack_nframes_t nframes, void *arg)
-{
+int server_process(jack_nframes_t nframes, void *arg) {
   // this is called by jack when a frame is received
   sdata *sd=(sdata *)arg;
   unsigned int width=jack_video_get_width(sd->client,sd->input_port);
   unsigned int height=jack_video_get_height(sd->client,sd->input_port);
   unsigned int frame_size;
-  uint8_t* in = jack_port_get_buffer (sd->input_port, nframes);
+  uint8_t *in = jack_port_get_buffer(sd->input_port, nframes);
 
   frame_size = width * height * 4;
 
@@ -196,12 +194,11 @@
 
   // enough space for one more frame
   if (jack_ringbuffer_write_space(sd->rb) >= frame_size) {
-    jack_ringbuffer_write (sd->rb, (void *) in, frame_size);
-  }
-  else {
+    jack_ringbuffer_write(sd->rb, (void *) in, frame_size);
+  } else {
     //fprintf (stderr, "drop frame\n");
   }
-  
+
   return 0;
 }
 
@@ -225,7 +222,7 @@
   double jack_sample_rate;
 
   sd=weed_malloc(sizeof(sdata));
-  if(sd==NULL) return WEED_ERROR_MEMORY_ALLOCATION;
+  if (sd==NULL) return WEED_ERROR_MEMORY_ALLOCATION;
 
   in_params=weed_get_plantptr_array(inst,"in_parameters",&error);
   server_name=weed_get_string_value(in_params[0],"value",&error);
@@ -243,7 +240,7 @@
 
 #ifdef SMOOTH
   sd->bgbuf=weed_malloc(out_frame_size);
-  if(sd->bgbuf==NULL) {
+  if (sd->bgbuf==NULL) {
     weed_free(sd);
     return WEED_ERROR_MEMORY_ALLOCATION;
   }
@@ -255,17 +252,17 @@
   //snprintf(com,512,"/bin/ln -s %s ~/.jackdrc>/dev/null 2>&1",conffile);
   //system(com);
 
-  sd->client = jack_client_open (client_name, options, &status, server_name);
+  sd->client = jack_client_open(client_name, options, &status, server_name);
   weed_free(server_name);
   weed_free(conffile);
 
   //  system("/bin/mv -f ~/.jackdrc._bak ~/.jackdrc>/dev/null 2>&1");
 
   if (sd->client==NULL) {
-    fprintf (stderr, "jack_client_open() failed, "
-	     "status = 0x%2.0x\n", status);
+    fprintf(stderr, "jack_client_open() failed, "
+            "status = 0x%2.0x\n", status);
     if (status & JackServerFailed) {
-      fprintf (stderr, "Unable to connect to JACK server\n");
+      fprintf(stderr, "Unable to connect to JACK server\n");
     }
 #ifdef SMOOTH
     weed_free(sd->bgbuf);
@@ -274,50 +271,48 @@
     return WEED_ERROR_INIT_ERROR;
   }
   if (status & JackServerStarted) {
-    fprintf (stderr, "JACK server started\n");
+    fprintf(stderr, "JACK server started\n");
   }
   if (status & JackNameNotUnique) {
     assigned_client_name = jack_get_client_name(sd->client);
-    fprintf (stderr, "unique name `%s' assigned\n", assigned_client_name);
+    fprintf(stderr, "unique name `%s' assigned\n", assigned_client_name);
   }
-  
-  fprintf (stderr,"engine sample rate: %" PRIu32 "\n",
-	   jack_get_sample_rate (sd->client));
+
+  fprintf(stderr,"engine sample rate: %" PRIu32 "\n",
+          jack_get_sample_rate(sd->client));
 
 
 
-  sd->input_port = jack_port_register (sd->client, 
-				   "video_in",
-				   JACK_DEFAULT_VIDEO_TYPE,
-				   JackPortIsInput, 
-				   0);
-  
-  if (sd->input_port==NULL) 
-    {
-      fprintf(stderr, "no more JACK ports available\n");
+  sd->input_port = jack_port_register(sd->client,
+                                      "video_in",
+                                      JACK_DEFAULT_VIDEO_TYPE,
+                                      JackPortIsInput,
+                                      0);
+
+  if (sd->input_port==NULL) {
+    fprintf(stderr, "no more JACK ports available\n");
 #ifdef SMOOTH
-      weed_free(sd->bgbuf);
+    weed_free(sd->bgbuf);
 #endif
-      weed_free(sd);
-      return WEED_ERROR_INIT_ERROR;
-    }
-  
+    weed_free(sd);
+    return WEED_ERROR_INIT_ERROR;
+  }
+
   // set process callback and start
-  
-  jack_set_process_callback (sd->client, server_process, sd);  
-  
-  if (jack_activate (sd->client)) 
-    {
-      fprintf (stderr, "cannot activate client");
+
+  jack_set_process_callback(sd->client, server_process, sd);
+
+  if (jack_activate(sd->client)) {
+    fprintf(stderr, "cannot activate client");
 #ifdef SMOOTH
-      weed_free(sd->bgbuf);
+    weed_free(sd->bgbuf);
 #endif
-      weed_free(sd);
-      return WEED_ERROR_INIT_ERROR;
-    }
+    weed_free(sd);
+    return WEED_ERROR_INIT_ERROR;
+  }
 
   sd->rb=NULL;
-  
+
   //jack_on_shutdown (client, jack_shutdown, 0);
   weed_set_voidptr_value(inst,"plugin_internal",sd);
 
@@ -328,7 +323,7 @@
 }
 
 
-int vjack_rcv_process (weed_plant_t *inst, weed_timecode_t timestamp) {
+int vjack_rcv_process(weed_plant_t *inst, weed_timecode_t timestamp) {
   // TODO check for server shutdown
   int error;
   unsigned int frame_size;
@@ -354,11 +349,11 @@
   if (frame_size==0) return WEED_NO_ERROR;  // not connected to an output
 
   // communication structure between process and display thread
-  if (sd->rb==NULL) sd->rb = jack_ringbuffer_create (2*in_width*in_height*4);
-  
+  if (sd->rb==NULL) sd->rb = jack_ringbuffer_create(2*in_width*in_height*4);
+
   if (in_width==out_width&&in_height==out_height) {
-    while ( jack_ringbuffer_read_space(sd->rb) >= frame_size) {
-      jack_ringbuffer_read (sd->rb, (char *)dst, frame_size);
+    while (jack_ringbuffer_read_space(sd->rb) >= frame_size) {
+      jack_ringbuffer_read(sd->rb, (char *)dst, frame_size);
       wrote=1;
     }
 
@@ -366,15 +361,15 @@
     if (!wrote) weed_memcpy(dst,sd->bgbuf,frame_size);
     else weed_memcpy(sd->bgbuf,dst,frame_size);
 #endif
-    
+
     return WEED_NO_ERROR;
   }
 
   // resize needed
 
-  while ( jack_ringbuffer_read_space(sd->rb) >= frame_size) {
+  while (jack_ringbuffer_read_space(sd->rb) >= frame_size) {
     if (tmpbuff==NULL) tmpbuff = weed_malloc(frame_size);
-    jack_ringbuffer_read (sd->rb, tmpbuff, frame_size);
+    jack_ringbuffer_read(sd->rb, tmpbuff, frame_size);
     wrote=1;
   }
 
@@ -389,8 +384,7 @@
 
   if (out_width>in_width||out_height>in_height) {
     out_pixbuf=gdk_pixbuf_scale_simple(in_pixbuf,out_width,out_height,up_interp);
-  }
-  else {
+  } else {
     out_pixbuf=gdk_pixbuf_scale_simple(in_pixbuf,out_width,out_height,down_interp);
   }
 
@@ -412,12 +406,12 @@
 
 
 
-int vjack_rcv_deinit (weed_plant_t *inst) {
+int vjack_rcv_deinit(weed_plant_t *inst) {
   int error;
   sdata *sd=(sdata *)weed_get_voidptr_value(inst,"plugin_internal",&error);
 
-  jack_deactivate (sd->client);
-  jack_client_close (sd->client);
+  jack_deactivate(sd->client);
+  jack_client_close(sd->client);
   if (--instances<0) instances=0;
 
 #ifdef SMOOTH
@@ -435,16 +429,17 @@
 
 
 
-weed_plant_t *weed_setup (weed_bootstrap_f weed_boot) {
+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);
   if (plugin_info!=NULL) {
-    int palette_list[]={WEED_PALETTE_RGBA32,WEED_PALETTE_END};
+    int palette_list[]= {WEED_PALETTE_RGBA32,WEED_PALETTE_END};
+
+    weed_plant_t *out_chantmpls[]= {weed_channel_template_init("out 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_REINIT_ON_SIZE_CHANGE,palette_list),NULL};
-    
-    weed_plant_t *in_params[]={weed_text_init("servername","_Server name","default"),weed_text_init("conffile","_Config file","~/.jackdrc.vjack"),NULL};
+    weed_plant_t *in_params[]= {weed_text_init("servername","_Server name","default"),weed_text_init("conffile","_Config file","~/.jackdrc.vjack"),NULL};
 
-    weed_plant_t *filter_class=weed_filter_class_init("vjack_rcv","martin/salsaman",1,0,&vjack_rcv_init,&vjack_rcv_process,&vjack_rcv_deinit,NULL,out_chantmpls,in_params,NULL);
+    weed_plant_t *filter_class=weed_filter_class_init("vjack_rcv","martin/salsaman",1,0,&vjack_rcv_init,&vjack_rcv_process,&vjack_rcv_deinit,
+                               NULL,out_chantmpls,in_params,NULL);
 
     weed_plant_t *gui=weed_parameter_template_get_gui(in_params[0]);
     weed_set_int_value(gui,"maxchars",32);
@@ -452,8 +447,8 @@
     gui=weed_parameter_template_get_gui(in_params[1]);
     weed_set_int_value(gui,"maxchars",128);
 
-    weed_plugin_info_add_filter_class (plugin_info,filter_class);
-    
+    weed_plugin_info_add_filter_class(plugin_info,filter_class);
+
     weed_set_int_value(plugin_info,"version",package_version);
   }
   return plugin_info;

LiVES-2.2.8.tar.bz2/lives-plugins/weed-plugins/haip.c -> LiVES-2.4.1.tar.bz2/lives-plugins/weed-plugins/haip.c Changed

LiVES-2.2.8.tar.bz2/lives-plugins/weed-plugins/kaleidoscope.c -> LiVES-2.4.1.tar.bz2/lives-plugins/weed-plugins/kaleidoscope.c Changed

LiVES-2.2.8.tar.bz2/lives-plugins/weed-plugins/ladspa.c -> LiVES-2.4.1.tar.bz2/lives-plugins/weed-plugins/ladspa.c Changed

@@ -19,7 +19,7 @@
 ///////////////////////////////////////////////////////////////////
 
 static int num_versions=1; // number of different weed api versions supported
-static int api_versions[]={131}; // array of weed api versions supported in plugin, in order of preference (most preferred first)
+static int api_versions[]= {131}; // array of weed api versions supported in plugin, in order of preference (most preferred first)
 
 static int package_version=1; // version of this package
 
@@ -54,11 +54,11 @@
 
 #include <ladspa.h>
 
-typedef LADSPA_Descriptor* (*lad_descriptor_f)(unsigned long);
-typedef LADSPA_Handle (*lad_instantiate_f)(const struct _LADSPA_Descriptor * Descriptor, unsigned long SampleRate);
+typedef LADSPA_Descriptor *(*lad_descriptor_f)(unsigned long);
+typedef LADSPA_Handle(*lad_instantiate_f)(const struct _LADSPA_Descriptor *Descriptor, unsigned long SampleRate);
 typedef void (*lad_activate_f)(LADSPA_Handle Instance);
 typedef void (*lad_deactivate_f)(LADSPA_Handle Instance);
-typedef void (*lad_connect_port_f)(LADSPA_Handle Instance, unsigned long Port, LADSPA_Data * DataLocation);
+typedef void (*lad_connect_port_f)(LADSPA_Handle Instance, unsigned long Port, LADSPA_Data *DataLocation);
 typedef void (*lad_run_f)(LADSPA_Handle Instance, unsigned long SampleCount);
 typedef void (*lad_cleanup_f)(LADSPA_Handle Instance);
 
@@ -74,19 +74,19 @@
 
 //////////////////////////////////////////////////////////////////
 
-static void getenv_piece(char * target, size_t tlen, char *envvar, int num) {
+static void getenv_piece(char *target, size_t tlen, char *envvar, int num) {
   // get num piece from envvar path and set in target
   char *str1;
   memset(target,0,1);
-  
+
   /* extract first string from string sequence */
   str1 = strtok(envvar, ":");
- 
+
   /* loop until finishied */
-  while ( --num>=0 ) {
+  while (--num>=0) {
     /* extract string from string sequence */
     str1 = strtok(NULL, ":");
-      
+
     /* check if there is nothing else to extract */
     if (str1 == NULL) break;
   }
@@ -102,9 +102,9 @@
 
   float *tmpfbuffer=(float *)weed_malloc(nsamps*nchans*sizeof(float));
   if (tmpfbuffer==NULL) return WEED_ERROR_MEMORY_ALLOCATION;
-  
-  for (i=0;i<nsamps;i++) {
-    for (j=0;j<nchans;j++) {
+
+  for (i=0; i<nsamps; i++) {
+    for (j=0; j<nchans; j++) {
       tmpfbuffer[nsamps*j+i]=fbuffer[i*nchans+j];
     }
   }
@@ -120,9 +120,9 @@
 
   float *tmpfbuffer=(float *)weed_malloc(nsamps*nchans*sizeof(float));
   if (tmpfbuffer==NULL) return WEED_ERROR_MEMORY_ALLOCATION;
-  
-  for (i=0;i<nsamps;i++) {
-    for (j=0;j<nchans;j++) {
+
+  for (i=0; i<nsamps; i++) {
+    for (j=0; j<nchans; j++) {
       tmpfbuffer[i*nchans+j]=fbuffer[j*nsamps+i];
     }
   }
@@ -142,7 +142,7 @@
   weed_plant_t *filter=weed_get_plantptr_value(inst,"filter_class",&error);
 
   lad_instantiate_f lad_instantiate_func=(lad_instantiate_f)weed_get_voidptr_value(filter,"plugin_lad_instantiate_func",&error);
-  LADSPA_Descriptor* laddes=(LADSPA_Descriptor *)weed_get_voidptr_value(filter,"plugin_lad_descriptor",&error);
+  LADSPA_Descriptor *laddes=(LADSPA_Descriptor *)weed_get_voidptr_value(filter,"plugin_lad_descriptor",&error);
 
   _sdata *sdata;
 
@@ -160,7 +160,7 @@
   if (channel==NULL&&weed_plant_has_leaf(inst,"out_channels")) channel=weed_get_plantptr_value(inst,"out_channels",&error);
 
   if (channel!=NULL) rate=weed_get_int_value(channel,"audio_rate",&error);
-  
+
   if (rate==0) rate=DEF_ARATE;
 
   pinc=weed_get_int_value(filter,"plugin_in_channels",&error);
@@ -179,21 +179,20 @@
       weed_plant_t **in_params=(weed_plant_t **)weed_get_plantptr_array(inst,"in_parameters",&error);
       int ninps=(weed_leaf_num_elements(inst,"in_parameters")-2)/2;
       int link=weed_get_boolean_value(in_params[ninps*2],"value",&error);
-      for (i=0;i<ninps;i++) {
-	weed_plant_t *ptmpl=weed_get_plantptr_value(in_params[i],"template",&error);
-	weed_plant_t *gui=weed_parameter_template_get_gui(ptmpl);
-	if (link==WEED_TRUE) {
-	  weed_set_int_value(gui,"copy_value_to",i+ninps);
-	  ptmpl=weed_get_plantptr_value(in_params[i+ninps],"template",&error);
-	  gui=weed_parameter_template_get_gui(ptmpl);
-	  weed_set_int_value(gui,"copy_value_to",i);
-	}
-	else {
-	  weed_set_int_value(gui,"copy_value_to",-1);
-	  ptmpl=weed_get_plantptr_value(in_params[i+ninps],"template",&error);
-	  gui=weed_parameter_template_get_gui(ptmpl);
-	  weed_set_int_value(gui,"copy_value_to",-1);
-	}
+      for (i=0; i<ninps; i++) {
+        weed_plant_t *ptmpl=weed_get_plantptr_value(in_params[i],"template",&error);
+        weed_plant_t *gui=weed_parameter_template_get_gui(ptmpl);
+        if (link==WEED_TRUE) {
+          weed_set_int_value(gui,"copy_value_to",i+ninps);
+          ptmpl=weed_get_plantptr_value(in_params[i+ninps],"template",&error);
+          gui=weed_parameter_template_get_gui(ptmpl);
+          weed_set_int_value(gui,"copy_value_to",i);
+        } else {
+          weed_set_int_value(gui,"copy_value_to",-1);
+          ptmpl=weed_get_plantptr_value(in_params[i+ninps],"template",&error);
+          gui=weed_parameter_template_get_gui(ptmpl);
+          weed_set_int_value(gui,"copy_value_to",-1);
+        }
       }
     }
   }
@@ -211,13 +210,13 @@
   lad_cleanup_f lad_cleanup_func=(lad_cleanup_f)weed_get_voidptr_value(filter,"plugin_lad_cleanup_func",&error);
 
   if (sdata->activated_l==WEED_TRUE) {
-    if (lad_deactivate_func!=NULL) (*lad_deactivate_func)(sdata->handle_l);
-    if (lad_cleanup_func!=NULL) (*lad_cleanup_func)(sdata->handle_l);
+    if (lad_deactivate_func!=NULL)(*lad_deactivate_func)(sdata->handle_l);
+    if (lad_cleanup_func!=NULL)(*lad_cleanup_func)(sdata->handle_l);
   }
 
   if (sdata->activated_r==WEED_TRUE) {
-    if (lad_deactivate_func!=NULL) (*lad_deactivate_func)(sdata->handle_r);
-    if (lad_cleanup_func!=NULL) (*lad_cleanup_func)(sdata->handle_r);
+    if (lad_deactivate_func!=NULL)(*lad_deactivate_func)(sdata->handle_r);
+    if (lad_cleanup_func!=NULL)(*lad_cleanup_func)(sdata->handle_r);
   }
 
   if (sdata!=NULL) {
@@ -230,7 +229,7 @@
 
 
 
-int ladspa_process (weed_plant_t *inst, weed_timecode_t timestamp) {
+int ladspa_process(weed_plant_t *inst, weed_timecode_t timestamp) {
   int error;
   int nsamps=0;
 
@@ -252,7 +251,7 @@
   float *src=NULL,*dst=NULL,*psrc,*pdst;
   float *invals=NULL,*outvals=NULL;
 
-  LADSPA_Descriptor* laddes;
+  LADSPA_Descriptor *laddes;
   LADSPA_PortDescriptor ladpdes;
   LADSPA_PortRangeHint ladphint;
   LADSPA_PortRangeHintDescriptor ladphintdes;
@@ -310,13 +309,13 @@
 
   if (sdata->activated_l==WEED_FALSE) {
     lad_activate_f lad_activate_func=(lad_activate_f)weed_get_voidptr_value(filter,"plugin_lad_activate_func",&error);
-    if (lad_activate_func!=NULL) (*lad_activate_func)(sdata->handle_l);
+    if (lad_activate_func!=NULL)(*lad_activate_func)(sdata->handle_l);
     sdata->activated_l=WEED_TRUE;
   }
 
   if (dual&&sdata->activated_r==WEED_FALSE) {
     lad_activate_f lad_activate_func=(lad_activate_f)weed_get_voidptr_value(filter,"plugin_lad_activate_func",&error);
-    if (lad_activate_func!=NULL) (*lad_activate_func)(sdata->handle_r);
+    if (lad_activate_func!=NULL)(*lad_activate_func)(sdata->handle_r);
     sdata->activated_r=WEED_TRUE;
   }
 
@@ -338,23 +337,22 @@
   if (pinc>0||poutc>0) {
     // connect audio ports
 
-    for (i=0;i<laddes->PortCount;i++) {
+    for (i=0; i<laddes->PortCount; i++) {
       ladpdes=laddes->PortDescriptors[i];
-        
+
       if (ladpdes&LADSPA_PORT_AUDIO) {
-	// channel
-	if (ladpdes&LADSPA_PORT_INPUT) {
-	  // connect to next instance audio in
-	  (*lad_connect_port_func)(handle,i,(LADSPA_Data *)psrc);
-	  psrc+=nsamps;
-	  iinc--;
-	}
-	else {
-	  // connect to next instance audio out
-	  (*lad_connect_port_func)(handle,i,(LADSPA_Data *)pdst);
-	  pdst+=nsamps;
-	  ioutc--;
-	}
+        // channel
+        if (ladpdes&LADSPA_PORT_INPUT) {
+          // connect to next instance audio in
+          (*lad_connect_port_func)(handle,i,(LADSPA_Data *)psrc);
+          psrc+=nsamps;
+          iinc--;
+        } else {
+          // connect to next instance audio out
+          (*lad_connect_port_func)(handle,i,(LADSPA_Data *)pdst);
+          pdst+=nsamps;
+          ioutc--;
+        }
       }
     }
 
@@ -365,7 +363,7 @@
     in_params=(weed_plant_t **)weed_get_plantptr_array(inst,"in_parameters",&error);
     if (weed_get_boolean_value(filter,"plugin_dual",&error)==WEED_TRUE) iinp-=2;
   }
-  
+
   if (weed_plant_has_leaf(inst,"out_parameters")) {
     ioutp=weed_leaf_num_elements(inst,"out_parameters");
     out_params=(weed_plant_t **)weed_get_plantptr_array(inst,"out_parameters",&error);
@@ -377,33 +375,30 @@
 
   if (iinp>0||ioutp>0) {
 
-    for (i=0;i<laddes->PortCount;i++) {
+    for (i=0; i<laddes->PortCount; i++) {
       ladpdes=laddes->PortDescriptors[i];
-      
+
       if (ladpdes&LADSPA_PORT_CONTROL) {
-	// control ports
-	ladphint=laddes->PortRangeHints[i];
-	ladphintdes=ladphint.HintDescriptor;
-	ptmpl=weed_get_plantptr_value(in_params[pinp],"template",&error);
-
-	if (ladpdes&LADSPA_PORT_INPUT) {
-	  // connect to next instance in param	
-	  if (ladphintdes&LADSPA_HINT_TOGGLED) {
-	    invals[pinp]=(float)weed_get_boolean_value(in_params[pinp],"value",&error);
-	  }
-	  else if (ladphintdes&LADSPA_HINT_TOGGLED) {
-	    invals[pinp]=(float)weed_get_int_value(in_params[pinp],"value",&error);
-	  }
-	  else {
-	    invals[pinp]=(float)weed_get_double_value(in_params[pinp],"value",&error);
-	  }
-	  if (weed_get_boolean_value(ptmpl,"plugin_sample_rate",&error)==WEED_TRUE) invals[pinp]*=(float)rate;
-	  (*lad_connect_port_func)(handle,i,(LADSPA_Data *)&invals[pinp++]);
-	}
-	else {
-	  // connect to store for out params
-	  (*lad_connect_port_func)(handle,i,(LADSPA_Data *)&outvals[poutp++]);
-	}
+        // control ports
+        ladphint=laddes->PortRangeHints[i];
+        ladphintdes=ladphint.HintDescriptor;
+        ptmpl=weed_get_plantptr_value(in_params[pinp],"template",&error);
+
+        if (ladpdes&LADSPA_PORT_INPUT) {
+          // connect to next instance in param
+          if (ladphintdes&LADSPA_HINT_TOGGLED) {
+            invals[pinp]=(float)weed_get_boolean_value(in_params[pinp],"value",&error);
+          } else if (ladphintdes&LADSPA_HINT_TOGGLED) {
+            invals[pinp]=(float)weed_get_int_value(in_params[pinp],"value",&error);
+          } else {
+            invals[pinp]=(float)weed_get_double_value(in_params[pinp],"value",&error);
+          }
+          if (weed_get_boolean_value(ptmpl,"plugin_sample_rate",&error)==WEED_TRUE) invals[pinp]*=(float)rate;
+          (*lad_connect_port_func)(handle,i,(LADSPA_Data *)&invals[pinp++]);
+        } else {
+          // connect to store for out params
+          (*lad_connect_port_func)(handle,i,(LADSPA_Data *)&outvals[poutp++]);
+        }
       }
     }
 
@@ -422,21 +417,20 @@
       // if we have an unconnected (second) in channel, we connect it here; otherwise we connect both input ports again
       if (iinc==0) psrc=src;
 
-      for (i=0;i<laddes->PortCount;i++) {
-	ladpdes=laddes->PortDescriptors[i];
-        
-	if (ladpdes&LADSPA_PORT_AUDIO) {
-	  // channel
-	  if (ladpdes&LADSPA_PORT_INPUT) {
-	    // connect to next instance audio in
-	    (*lad_connect_port_func)(handle,i,(LADSPA_Data *)psrc);
-	    psrc+=nsamps;
-	  }
-	  else {
-	    // connect to next instance audio out
-	    (*lad_connect_port_func)(handle,i,(LADSPA_Data *)pdst);
-	  }
-	}
+      for (i=0; i<laddes->PortCount; i++) {
+        ladpdes=laddes->PortDescriptors[i];
+
+        if (ladpdes&LADSPA_PORT_AUDIO) {
+          // channel
+          if (ladpdes&LADSPA_PORT_INPUT) {
+            // connect to next instance audio in
+            (*lad_connect_port_func)(handle,i,(LADSPA_Data *)psrc);
+            psrc+=nsamps;
+          } else {
+            // connect to next instance audio out
+            (*lad_connect_port_func)(handle,i,(LADSPA_Data *)pdst);
+          }
+        }
       }
     }
   }
@@ -446,35 +440,32 @@
 
     if (pinp<iinp||poutp<ioutp) {
       // need to use second instance
-      for (i=0;i<laddes->PortCount;i++) {
-	ladpdes=laddes->PortDescriptors[i];
-      
-	if (ladpdes&LADSPA_PORT_CONTROL) {
-	  // control ports
-	  ladphint=laddes->PortRangeHints[i];
-	  ladphintdes=ladphint.HintDescriptor;
-	  ptmpl=weed_get_plantptr_value(in_params[pinp],"template",&error);
-
-	  if (ladpdes&LADSPA_PORT_INPUT) {
-	    // connect to next instance in param	
-	    if (ladphintdes&LADSPA_HINT_TOGGLED) {
-	      invals[pinp]=(float)weed_get_boolean_value(in_params[pinp],"value",&error);
-	    }
-	    else if (ladphintdes&LADSPA_HINT_TOGGLED) {
-	      invals[pinp]=(float)weed_get_int_value(in_params[pinp],"value",&error);
-	    }
-	    else {
-	      invals[pinp]=(float)weed_get_double_value(in_params[pinp],"value",&error);
-	    }
-	    if (weed_get_boolean_value(ptmpl,"plugin_sample_rate",&error)==WEED_TRUE) invals[pinp]*=(float)rate;
-
-	    (*lad_connect_port_func)(handle,i,(LADSPA_Data *)&invals[pinp++]);
-	  }
-	  else {
-	    // connect to store for out params
-	    (*lad_connect_port_func)(handle,i,(LADSPA_Data *)&outvals[poutp++]);
-	  }
-	}
+      for (i=0; i<laddes->PortCount; i++) {
+        ladpdes=laddes->PortDescriptors[i];
+
+        if (ladpdes&LADSPA_PORT_CONTROL) {
+          // control ports
+          ladphint=laddes->PortRangeHints[i];
+          ladphintdes=ladphint.HintDescriptor;
+          ptmpl=weed_get_plantptr_value(in_params[pinp],"template",&error);
+
+          if (ladpdes&LADSPA_PORT_INPUT) {
+            // connect to next instance in param
+            if (ladphintdes&LADSPA_HINT_TOGGLED) {
+              invals[pinp]=(float)weed_get_boolean_value(in_params[pinp],"value",&error);
+            } else if (ladphintdes&LADSPA_HINT_TOGGLED) {
+              invals[pinp]=(float)weed_get_int_value(in_params[pinp],"value",&error);
+            } else {
+              invals[pinp]=(float)weed_get_double_value(in_params[pinp],"value",&error);
+            }
+            if (weed_get_boolean_value(ptmpl,"plugin_sample_rate",&error)==WEED_TRUE) invals[pinp]*=(float)rate;
+
+            (*lad_connect_port_func)(handle,i,(LADSPA_Data *)&invals[pinp++]);
+          } else {
+            // connect to store for out params
+            (*lad_connect_port_func)(handle,i,(LADSPA_Data *)&outvals[poutp++]);
+          }
+        }
       }
 
     }
@@ -482,10 +473,10 @@
   }
 
 
-  if (dual) (*lad_run_func)(handle,nsamps);
+  if (dual)(*lad_run_func)(handle,nsamps);
 
   // copy out values to out_params
-  for (i=0;i<ioutp;i++) {
+  for (i=0; i<ioutp; i++) {
     switch (weed_leaf_seed_type(out_params[i],"value")) {
     case WEED_SEED_BOOLEAN:
       weed_set_boolean_value(out_params[i],"value",(int)outvals[i]);
@@ -523,7 +514,7 @@
 
 
 
-weed_plant_t *weed_setup (weed_bootstrap_f weed_boot) {
+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);
   unsigned long num_plugins=0;
 
@@ -537,7 +528,7 @@
     char **rfx_strings=NULL;
     weed_plant_t **out_chantmpls=NULL,**in_chantmpls=NULL;
     weed_plant_t **in_params=NULL,**out_params=NULL,*gui;
-    
+
     struct dirent *vdirent=NULL;
     weed_plant_t *filter_class;
 
@@ -545,8 +536,8 @@
     int pnum,wnum;
 
     int new_stdout,new_stderr;
-    
-    LADSPA_Descriptor* laddes;
+
+    LADSPA_Descriptor *laddes;
     LADSPA_Properties ladprop;
     LADSPA_PortDescriptor ladpdes;
     LADSPA_PortRangeHint ladphint;
@@ -600,421 +591,404 @@
       if (curvdir==NULL) break;
 
       while (1) {
-	// check each plugin
-	vdirent=readdir(curvdir);
-	if (vdirent==NULL) {
-	  closedir(curvdir);
-	  curvdir=NULL;
-	  vdirval++;
-	  break;
-	}
-
-	if (!strncmp(vdirent->d_name,"..",strlen(vdirent->d_name))) continue;
-
-	snprintf(plugin_name,PATH_MAX,"%s",vdirent->d_name);
-	snprintf(plug1,PATH_MAX,"%s/%s",vdir,plugin_name);
-
-	//fprintf(stderr,"checking %s\n",plug1);
-
-	handle=dlopen(plug1,RTLD_NOW);
-	if (handle==NULL) continue;
-	
-	if ((lad_descriptor_func=dlsym(handle,"ladspa_descriptor"))==NULL) {
-	  dlclose(handle);
-	  continue;
-	}
-
-	num_plugins=0;
-
-	while ((laddes=((*lad_descriptor_func)(num_plugins))) != NULL) {
-
-	  if ((lad_instantiate_func=laddes->instantiate)==NULL) {
-	    continue;
-	  }
-
-	  lad_activate_func=laddes->activate;
-
-	  lad_deactivate_func=laddes->deactivate;
-
-	  if ((lad_connect_port_func=laddes->connect_port)==NULL) {
-	    continue;
-	  }
-	  if ((lad_run_func=laddes->run)==NULL) {
-	    continue;
-	  }
-
-	  lad_cleanup_func=laddes->cleanup;
-
-	  //fprintf(stderr,"2checking %s : %ld\n",plug1,num_plugins);
-	  ladprop=laddes->Properties;
-
-	  ninps=noutps=ninchs=noutchs=0;
-
-	  // create the in_parameters, out_parameters, in_channels, out_channels
-
-	  for (i=0;i<laddes->PortCount;i++) {
-	    // count number of each type first
-	    ladpdes=laddes->PortDescriptors[i];
-	    ladphint=laddes->PortRangeHints[i];
-
-	    if (ladpdes&LADSPA_PORT_CONTROL) {
-	      // parameter
-	      if (ladpdes&LADSPA_PORT_INPUT) {
-		// in_param
-		ninps++;
-	      }
-	      else {
-		// out_param
-		noutps++;
-	      }
-	    }
-	    else {
-	      // channel
-	      if (ladpdes&LADSPA_PORT_INPUT) {
-		// in_channel
-		ninchs++;
-	      }
-	      else {
-		// out_channel
-		noutchs++;
-	      }
-	    }
-	  }
-
-
-	  // do we need to double up the channels ?
-	  // if we have 0,1 or 2 input channels, 1 outputs
-	  // 1 input, 0 or 2 outputs
-
-	  if ((ninchs<2&&noutchs<2&&(ninchs+noutchs>0))||noutchs==1) {
-	    dual=WEED_TRUE;
-	    stcount=1;
-	  }
-	  else {
-	    dual=WEED_FALSE;
-	    stcount=0;
-	  }
-
-	  oninchs=ninchs;
-	  onoutchs=noutchs;
-	  oninps=ninps;
-	  onoutps=noutps;
-
-	  if (dual&&oninchs==1) ninchs=2; 
-	  if (dual&&onoutchs==1) noutchs=2; 
-
-	  if (dual==WEED_TRUE) {
-	    ninps=oninps*2;
-	    noutps=onoutps*2;
-
-	    rfx_strings=weed_malloc((ninps+3+stcount)*sizeof(char *));
-	    for (pnum=0;pnum<ninps+3+stcount;pnum++) {
-	      rfx_strings[pnum]=(char *)weed_malloc(256);
-	    }
-
-	    if (ninchs==0) {
-	      sprintf(rfx_strings[stcount],"layout|\"Left output channel\"|");
-	      sprintf(rfx_strings[oninps+2+stcount],"layout|\"Right output channel\"|");
-	    }
-	    else {
-	      if (ninchs==1) sprintf(rfx_strings[stcount],"layout|\"Left/mono channel\"");
-	      else sprintf(rfx_strings[stcount],"layout|\"Left channel\"");
-	      sprintf(rfx_strings[oninps+2+stcount],"layout|\"Right channel\"");
-	    }
-	    sprintf(rfx_strings[oninps+1+stcount],"layout|hseparator|");
-	  }
-
-	  if (ninps>0) {
-	    // add extra in 2 extra params for "link channels"
-	    in_params=(weed_plant_t **)weed_malloc((++ninps+stcount*2)*sizeof(weed_plant_t *));
-	    in_params[ninps+stcount*2-1]=NULL;
-	    if (dual==WEED_TRUE) {
-	      in_params[ninps-1]=weed_switch_init("link","_Link left and right parameters",WEED_TRUE);
-	      gui=weed_parameter_template_get_gui(in_params[ninps-1]);
-	      weed_set_int_value(gui,"copy_value_to",ninps);
-	      sprintf(rfx_strings[0],"layout|p%d|",ninps-1);
-
-	      // link it to a dummy param which is hidden and reinit - this allows the value to be updated and the plugin to be reinited at any time
-	      in_params[ninps]=weed_switch_init("link dummy","linkdummy",WEED_TRUE);
-	      weed_set_int_value(in_params[ninps],"flags",WEED_PARAMETER_REINIT_ON_VALUE_CHANGE); 
-	      gui=weed_parameter_template_get_gui(in_params[ninps]);
-	      weed_set_boolean_value(gui,"hidden",WEED_TRUE);
-	    }
-
-	  }
-	  else in_params=NULL;
-
-	  if (noutps>0) {
-	    out_params=(weed_plant_t **)weed_malloc(++noutps*sizeof(weed_plant_t *));
-	    out_params[noutps-1]=NULL;
-	  }
-	  else out_params=NULL;
-
-	  //fprintf(stderr,"%s has inc %d and outc %d\n",laddes->Name,ninchs,noutchs);
-
-	  if (ninchs>0) {
-	    in_chantmpls=(weed_plant_t **)weed_malloc(2*sizeof(weed_plant_t *));
-	    if (ninchs==1) sprintf(cname,"Mono channel");
-	    else if (ninchs==2) sprintf(cname,"Stereo channel");
-	    else sprintf(cname,"Multi channel");
-	    in_chantmpls[0]=weed_audio_channel_template_init(cname,0);
-	    in_chantmpls[1]=NULL;
-	    if (!dual||oninchs!=1) weed_set_int_value(in_chantmpls[0],"audio_channels",ninchs);
-	    weed_set_boolean_value(in_chantmpls[0],"audio_interleaf",WEED_FALSE);
-	  }
-	  else in_chantmpls=NULL;
-
-	  if (noutchs>0) {
-	    out_chantmpls=(weed_plant_t **)weed_malloc(++noutchs*sizeof(weed_plant_t *));
-	    if (noutchs==1) sprintf(cname,"Mono channel");
-	    else if (noutchs==2) sprintf(cname,"Stereo channel");
-	    else sprintf(cname,"Multi channel");
-	    out_chantmpls[0]=weed_audio_channel_template_init(cname,0);
-	    out_chantmpls[1]=NULL;
-	    if (!dual||onoutchs!=1) weed_set_int_value(out_chantmpls[0],"audio_channels",noutchs);
-	    weed_set_boolean_value(out_chantmpls[0],"audio_interleaf",WEED_FALSE);
-	    if (oninchs==onoutchs&&!(ladprop&LADSPA_PROPERTY_INPLACE_BROKEN)) weed_set_int_value(out_chantmpls[0],"flags",WEED_CHANNEL_CAN_DO_INPLACE);
-	  }
-	  else out_chantmpls=NULL;
-
-	  cnoutps=cninps=0;
-
-	  for (i=0;i<laddes->PortCount;i++) {
-	    ladpdes=laddes->PortDescriptors[i];
-	    ladphint=laddes->PortRangeHints[i];
-	    ladphintdes=ladphint.HintDescriptor;
-
-	    if (ladpdes&LADSPA_PORT_CONTROL) {
-	      // parameter
-	      if (ladpdes&LADSPA_PORT_INPUT) {
-		// in_param
-		snprintf(label,LABSIZE,"_%s",laddes->PortNames[i]);
-
-		if (ladphintdes&LADSPA_HINT_TOGGLED) {
-		  // boolean type
-		  if (ladphintdes&LADSPA_HINT_DEFAULT_1) {
-		    in_params[cninps]=weed_switch_init(laddes->PortNames[i],label,WEED_TRUE);
-		    if (dual) in_params[cninps+oninps]=weed_switch_init(laddes->PortNames[i],label,WEED_TRUE);
-		  }
-		  else {
-		    in_params[cninps]=weed_switch_init(laddes->PortNames[i],label,WEED_FALSE);
-		    if (dual) in_params[cninps+oninps]=weed_switch_init(laddes->PortNames[i],label,WEED_FALSE);
-		  }
-		}
-		else {
-		  // int/float type
-		  lbound=ladphint.LowerBound;
-		  ubound=ladphint.UpperBound;
-
-		  if (lbound==0.&&ubound==0.) {
-		    // try some sanity
-		    lbound=0.;
-		    ubound=1.;
-		  }
-
-		  defval=lbound;
-
-		  if (ladphintdes&LADSPA_HINT_DEFAULT_LOW) {
-		    defval+=(ubound-lbound)/4.;
-		  }
-
-		  else if (ladphintdes&LADSPA_HINT_DEFAULT_MIDDLE) {
-		    defval+=(ubound-lbound)/2.;
-		  }
-
-		  else if (ladphintdes&LADSPA_HINT_DEFAULT_HIGH) {
-		    defval+=(ubound-lbound)*3./4.;
-		  }
-
-		  else if (ladphintdes&LADSPA_HINT_DEFAULT_MAXIMUM) {
-		    defval=ubound;
-		  }
-
-		  else if (ladphintdes&LADSPA_HINT_DEFAULT_0) {
-		    defval=0.;
-		  }
-
-		  else if (ladphintdes&LADSPA_HINT_DEFAULT_1) {
-		    defval=1.;
-		  }
-
-		  else if (ladphintdes&LADSPA_HINT_DEFAULT_100) {
-		    defval=100.;
-		  }
-
-		  else if (ladphintdes&LADSPA_HINT_DEFAULT_440) {
-		    defval=440.;
-		  }
-		  if (ladphintdes&LADSPA_HINT_INTEGER) {
-		    in_params[cninps]=weed_integer_init(laddes->PortNames[i],label,defval+.5,lbound+.5,ubound+.5);
-		    if (dual) in_params[cninps+oninps]=weed_integer_init(laddes->PortNames[i],label,defval+.5,lbound+.5,ubound+.5);
-		  }
-		  else {
-		    in_params[cninps]=weed_float_init(laddes->PortNames[i],label,defval,lbound,ubound);
-		    if (dual) in_params[cninps+oninps]=weed_float_init(laddes->PortNames[i],label,defval,lbound,ubound);
-		  }
-
-		}
-
-		if (ladphintdes&LADSPA_HINT_SAMPLE_RATE) weed_set_boolean_value(in_params[cninps],"plugin_sample_rate",WEED_TRUE);
-		else weed_set_boolean_value(in_params[cninps],"plugin_sample_rate",WEED_FALSE);
-
-		if (ladphintdes&LADSPA_HINT_LOGARITHMIC) weed_set_boolean_value(in_params[cninps],"plugin_logarithmic",WEED_TRUE);
-		else weed_set_boolean_value(in_params[cninps],"plugin_logarithmic",WEED_FALSE);
-
-		if (dual) {
-		  if (ladphintdes&LADSPA_HINT_SAMPLE_RATE) weed_set_boolean_value(in_params[cninps+oninps],"plugin_sample_rate",WEED_TRUE);
-		  else weed_set_boolean_value(in_params[cninps+oninps],"plugin_sample_rate",WEED_FALSE);
-
-		  if (ladphintdes&LADSPA_HINT_LOGARITHMIC) weed_set_boolean_value(in_params[cninps+oninps],"plugin_logarithmic",WEED_TRUE);
-		  else weed_set_boolean_value(in_params[cninps+oninps],"plugin_logarithmic",WEED_FALSE);
-
-		  sprintf(rfx_strings[cninps+1+stcount],"layout|p%d|",cninps);
-		  sprintf(rfx_strings[cninps+oninps+3+stcount],"layout|p%d|",cninps+oninps);
-		}
-
-		cninps++;
-	      }
-	      else {
-		// out_param
-		if (ladphintdes&LADSPA_HINT_TOGGLED) {
-		  // boolean type
-		  if (ladphintdes&LADSPA_HINT_DEFAULT_1) {
-		    out_params[cnoutps]=weed_out_param_switch_init(laddes->PortNames[i],WEED_TRUE);
-		    if (dual) out_params[cnoutps+onoutps]=weed_out_param_switch_init(laddes->PortNames[i],WEED_TRUE);
-		  }
-		  else {
-		    out_params[cnoutps]=weed_out_param_switch_init(laddes->PortNames[i],WEED_FALSE);
-		    if (dual) out_params[cnoutps+onoutps]=weed_out_param_switch_init(laddes->PortNames[i],WEED_FALSE);
-		  }
-		}
-		else {
-		  // int/float type
-		  lbound=ladphint.LowerBound;
-		  ubound=ladphint.UpperBound;
-		  defval=lbound;
-
-		  if (ladphintdes&LADSPA_HINT_DEFAULT_LOW) {
-		    defval+=(ubound-lbound)/4.;
-		  }
-
-		  else if (ladphintdes&LADSPA_HINT_DEFAULT_MIDDLE) {
-		    defval+=(ubound-lbound)/2.;
-		  }
-
-		  else if (ladphintdes&LADSPA_HINT_DEFAULT_HIGH) {
-		    defval+=(ubound-lbound)*3./4.;
-		  }
-
-		  else if (ladphintdes&LADSPA_HINT_DEFAULT_MAXIMUM) {
-		    defval=ubound;
-		  }
-
-		  else if (ladphintdes&LADSPA_HINT_DEFAULT_0) {
-		    defval=0.;
-		  }
-
-		  else if (ladphintdes&LADSPA_HINT_DEFAULT_1) {
-		    defval=1.;
-		  }
-
-		  else if (ladphintdes&LADSPA_HINT_DEFAULT_100) {
-		    defval=100.;
-		  }
-
-		  else if (ladphintdes&LADSPA_HINT_DEFAULT_440) {
-		    defval=440.;
-		  }
-		  
-		  if (ladphintdes&LADSPA_HINT_INTEGER) {
-		    out_params[cnoutps]=weed_out_param_integer_init(laddes->PortNames[i],defval+.5,lbound+.5,ubound+.5);
-		    if (dual) out_params[cnoutps+onoutps]=weed_out_param_integer_init(laddes->PortNames[i],defval+.5,lbound+.5,ubound+.5);
-		  }
-		  else {
-		    out_params[cnoutps]=weed_out_param_float_init(laddes->PortNames[i],defval,lbound,ubound);
-		    if (dual) out_params[cnoutps+onoutps]=weed_out_param_float_init(laddes->PortNames[i],defval,lbound,ubound);
-		  }
-
-		}
-
-		if (ladphintdes&LADSPA_HINT_SAMPLE_RATE) weed_set_boolean_value(out_params[cnoutps],"plugin_sample_rate",WEED_TRUE);
-		else weed_set_boolean_value(out_params[cnoutps],"plugin_sample_rate",WEED_FALSE);
-
-		if (dual) {
-		  if (ladphintdes&LADSPA_HINT_SAMPLE_RATE) weed_set_boolean_value(out_params[cnoutps],"plugin_sample_rate",WEED_TRUE);
-		  else weed_set_boolean_value(out_params[cnoutps],"plugin_sample_rate",WEED_FALSE);
-		}
-
-		cnoutps++;
-	      }
-
-
-	    }
-
-	  }
-
-	  snprintf(weed_name,PATH_MAX,"LADSPA: %s",laddes->Name);
-
-	  filter_class=weed_filter_class_init(weed_name,"LADSPA developers",0,0,&ladspa_init,&ladspa_process,&ladspa_deinit,
-					      in_chantmpls,out_chantmpls,in_params,out_params);
-	
-	  weed_set_string_value(filter_class,"extra_authors",laddes->Maker);
-
-	  weed_set_voidptr_value(filter_class,"plugin_lad_descriptor",laddes);
-
-	  weed_set_voidptr_value(filter_class,"plugin_lad_descriptor_func",(void *)lad_descriptor_func);
-	  weed_set_voidptr_value(filter_class,"plugin_lad_instantiate_func",(void *)lad_instantiate_func);
-	  weed_set_voidptr_value(filter_class,"plugin_lad_activate_func",(void *)lad_activate_func);
-	  weed_set_voidptr_value(filter_class,"plugin_lad_deactivate_func",(void *)lad_deactivate_func);
-	  weed_set_voidptr_value(filter_class,"plugin_lad_connect_port_func",(void *)lad_connect_port_func);
-	  weed_set_voidptr_value(filter_class,"plugin_lad_run_func",(void *)lad_run_func);
-	  weed_set_voidptr_value(filter_class,"plugin_lad_cleanup_func",(void *)lad_cleanup_func);
-
-	  if (dual==WEED_TRUE) {
-	    weed_set_boolean_value(filter_class,"plugin_dual",WEED_TRUE);
-	    if (ninps>0) {
-	      gui=weed_filter_class_get_gui(filter_class);
-	      weed_set_string_value(gui,"layout_scheme","RFX");
-	      weed_set_string_value(gui,"rfx_delim","|");
-
-	      // subtract 1 from ninps since we incremented it
-	      weed_set_string_array(gui,"rfx_strings",ninps+2+stcount,rfx_strings);
-	      for (wnum=0;wnum<ninps+2+stcount;wnum++) weed_free(rfx_strings[wnum]);
-	      weed_free(rfx_strings);
-	      rfx_strings=NULL;
-	      
-	      for (j=0;j<oninps;j++) {
-		gui=weed_parameter_template_get_gui(in_params[j]);
-		weed_set_int_value(gui,"copy_value_to",j+oninps);
-		gui=weed_parameter_template_get_gui(in_params[j+oninps]);
-		weed_set_int_value(gui,"copy_value_to",j);
-	      }
-
-	    }
-	  }
-	  else weed_set_boolean_value(filter_class,"plugin_dual",WEED_FALSE);
-
-	  if (in_params!=NULL) weed_free(in_params);
-	  if (out_params!=NULL) weed_free(out_params);
-	  if (in_chantmpls!=NULL) weed_free(in_chantmpls);
-	  if (out_chantmpls!=NULL) weed_free(out_chantmpls);
-
-	  weed_set_int_value(filter_class,"plugin_in_channels",oninchs);
-	  weed_set_int_value(filter_class,"plugin_out_channels",onoutchs);
-	  weed_set_int_value(filter_class,"plugin_in_params",oninps);
-	  weed_set_int_value(filter_class,"plugin_out_params",onoutps);
-	  
-	  weed_plugin_info_add_filter_class (plugin_info,filter_class);
-	  num_plugins++;
-	  num_filters++;
-	  //fprintf(stderr,"DONE\n");
-	}
+        // check each plugin
+        vdirent=readdir(curvdir);
+        if (vdirent==NULL) {
+          closedir(curvdir);
+          curvdir=NULL;
+          vdirval++;
+          break;
+        }
+
+        if (!strncmp(vdirent->d_name,"..",strlen(vdirent->d_name))) continue;
+
+        snprintf(plugin_name,PATH_MAX,"%s",vdirent->d_name);
+        snprintf(plug1,PATH_MAX,"%s/%s",vdir,plugin_name);
+
+        //fprintf(stderr,"checking %s\n",plug1);
+
+        handle=dlopen(plug1,RTLD_NOW);
+        if (handle==NULL) continue;
+
+        if ((lad_descriptor_func=dlsym(handle,"ladspa_descriptor"))==NULL) {
+          dlclose(handle);
+          continue;
+        }
+
+        num_plugins=0;
+
+        while ((laddes=((*lad_descriptor_func)(num_plugins))) != NULL) {
+
+          if ((lad_instantiate_func=laddes->instantiate)==NULL) {
+            continue;
+          }
+
+          lad_activate_func=laddes->activate;
+
+          lad_deactivate_func=laddes->deactivate;
+
+          if ((lad_connect_port_func=laddes->connect_port)==NULL) {
+            continue;
+          }
+          if ((lad_run_func=laddes->run)==NULL) {
+            continue;
+          }
+
+          lad_cleanup_func=laddes->cleanup;
+
+          //fprintf(stderr,"2checking %s : %ld\n",plug1,num_plugins);
+          ladprop=laddes->Properties;
+
+          ninps=noutps=ninchs=noutchs=0;
+
+          // create the in_parameters, out_parameters, in_channels, out_channels
+
+          for (i=0; i<laddes->PortCount; i++) {
+            // count number of each type first
+            ladpdes=laddes->PortDescriptors[i];
+            ladphint=laddes->PortRangeHints[i];
+
+            if (ladpdes&LADSPA_PORT_CONTROL) {
+              // parameter
+              if (ladpdes&LADSPA_PORT_INPUT) {
+                // in_param
+                ninps++;
+              } else {
+                // out_param
+                noutps++;
+              }
+            } else {
+              // channel
+              if (ladpdes&LADSPA_PORT_INPUT) {
+                // in_channel
+                ninchs++;
+              } else {
+                // out_channel
+                noutchs++;
+              }
+            }
+          }
+
+
+          // do we need to double up the channels ?
+          // if we have 0,1 or 2 input channels, 1 outputs
+          // 1 input, 0 or 2 outputs
+
+          if ((ninchs<2&&noutchs<2&&(ninchs+noutchs>0))||noutchs==1) {
+            dual=WEED_TRUE;
+            stcount=1;
+          } else {
+            dual=WEED_FALSE;
+            stcount=0;
+          }
+
+          oninchs=ninchs;
+          onoutchs=noutchs;
+          oninps=ninps;
+          onoutps=noutps;
+
+          if (dual&&oninchs==1) ninchs=2;
+          if (dual&&onoutchs==1) noutchs=2;
+
+          if (dual==WEED_TRUE) {
+            ninps=oninps*2;
+            noutps=onoutps*2;
+
+            rfx_strings=weed_malloc((ninps+3+stcount)*sizeof(char *));
+            for (pnum=0; pnum<ninps+3+stcount; pnum++) {
+              rfx_strings[pnum]=(char *)weed_malloc(256);
+            }
+
+            if (ninchs==0) {
+              sprintf(rfx_strings[stcount],"layout|\"Left output channel\"|");
+              sprintf(rfx_strings[oninps+2+stcount],"layout|\"Right output channel\"|");
+            } else {
+              if (ninchs==1) sprintf(rfx_strings[stcount],"layout|\"Left/mono channel\"");
+              else sprintf(rfx_strings[stcount],"layout|\"Left channel\"");
+              sprintf(rfx_strings[oninps+2+stcount],"layout|\"Right channel\"");
+            }
+            sprintf(rfx_strings[oninps+1+stcount],"layout|hseparator|");
+          }
+
+          if (ninps>0) {
+            // add extra in 2 extra params for "link channels"
+            in_params=(weed_plant_t **)weed_malloc((++ninps+stcount*2)*sizeof(weed_plant_t *));
+            in_params[ninps+stcount*2-1]=NULL;
+            if (dual==WEED_TRUE) {
+              in_params[ninps-1]=weed_switch_init("link","_Link left and right parameters",WEED_TRUE);
+              gui=weed_parameter_template_get_gui(in_params[ninps-1]);
+              weed_set_int_value(gui,"copy_value_to",ninps);
+              sprintf(rfx_strings[0],"layout|p%d|",ninps-1);
+
+              // link it to a dummy param which is hidden and reinit - this allows the value to be updated and the plugin to be reinited at any time
+              in_params[ninps]=weed_switch_init("link dummy","linkdummy",WEED_TRUE);
+              weed_set_int_value(in_params[ninps],"flags",WEED_PARAMETER_REINIT_ON_VALUE_CHANGE);
+              gui=weed_parameter_template_get_gui(in_params[ninps]);
+              weed_set_boolean_value(gui,"hidden",WEED_TRUE);
+            }
+
+          } else in_params=NULL;
+
+          if (noutps>0) {
+            out_params=(weed_plant_t **)weed_malloc(++noutps*sizeof(weed_plant_t *));
+            out_params[noutps-1]=NULL;
+          } else out_params=NULL;
+
+          //fprintf(stderr,"%s has inc %d and outc %d\n",laddes->Name,ninchs,noutchs);
+
+          if (ninchs>0) {
+            in_chantmpls=(weed_plant_t **)weed_malloc(2*sizeof(weed_plant_t *));
+            if (ninchs==1) sprintf(cname,"Mono channel");
+            else if (ninchs==2) sprintf(cname,"Stereo channel");
+            else sprintf(cname,"Multi channel");
+            in_chantmpls[0]=weed_audio_channel_template_init(cname,0);
+            in_chantmpls[1]=NULL;
+            if (!dual||oninchs!=1) weed_set_int_value(in_chantmpls[0],"audio_channels",ninchs);
+            weed_set_boolean_value(in_chantmpls[0],"audio_interleaf",WEED_FALSE);
+          } else in_chantmpls=NULL;
+
+          if (noutchs>0) {
+            out_chantmpls=(weed_plant_t **)weed_malloc(++noutchs*sizeof(weed_plant_t *));
+            if (noutchs==1) sprintf(cname,"Mono channel");
+            else if (noutchs==2) sprintf(cname,"Stereo channel");
+            else sprintf(cname,"Multi channel");
+            out_chantmpls[0]=weed_audio_channel_template_init(cname,0);
+            out_chantmpls[1]=NULL;
+            if (!dual||onoutchs!=1) weed_set_int_value(out_chantmpls[0],"audio_channels",noutchs);
+            weed_set_boolean_value(out_chantmpls[0],"audio_interleaf",WEED_FALSE);
+            if (oninchs==onoutchs&&!(ladprop&LADSPA_PROPERTY_INPLACE_BROKEN)) weed_set_int_value(out_chantmpls[0],"flags",WEED_CHANNEL_CAN_DO_INPLACE);
+          } else out_chantmpls=NULL;
+
+          cnoutps=cninps=0;
+
+          for (i=0; i<laddes->PortCount; i++) {
+            ladpdes=laddes->PortDescriptors[i];
+            ladphint=laddes->PortRangeHints[i];
+            ladphintdes=ladphint.HintDescriptor;
+
+            if (ladpdes&LADSPA_PORT_CONTROL) {
+              // parameter
+              if (ladpdes&LADSPA_PORT_INPUT) {
+                // in_param
+                snprintf(label,LABSIZE,"_%s",laddes->PortNames[i]);
+
+                if (ladphintdes&LADSPA_HINT_TOGGLED) {
+                  // boolean type
+                  if (ladphintdes&LADSPA_HINT_DEFAULT_1) {
+                    in_params[cninps]=weed_switch_init(laddes->PortNames[i],label,WEED_TRUE);
+                    if (dual) in_params[cninps+oninps]=weed_switch_init(laddes->PortNames[i],label,WEED_TRUE);
+                  } else {
+                    in_params[cninps]=weed_switch_init(laddes->PortNames[i],label,WEED_FALSE);
+                    if (dual) in_params[cninps+oninps]=weed_switch_init(laddes->PortNames[i],label,WEED_FALSE);
+                  }
+                } else {
+                  // int/float type
+                  lbound=ladphint.LowerBound;
+                  ubound=ladphint.UpperBound;
+
+                  if (lbound==0.&&ubound==0.) {
+                    // try some sanity
+                    lbound=0.;
+                    ubound=1.;
+                  }
+
+                  defval=lbound;
+
+                  if (ladphintdes&LADSPA_HINT_DEFAULT_LOW) {
+                    defval+=(ubound-lbound)/4.;
+                  }
+
+                  else if (ladphintdes&LADSPA_HINT_DEFAULT_MIDDLE) {
+                    defval+=(ubound-lbound)/2.;
+                  }
+
+                  else if (ladphintdes&LADSPA_HINT_DEFAULT_HIGH) {
+                    defval+=(ubound-lbound)*3./4.;
+                  }
+
+                  else if (ladphintdes&LADSPA_HINT_DEFAULT_MAXIMUM) {
+                    defval=ubound;
+                  }
+
+                  else if (ladphintdes&LADSPA_HINT_DEFAULT_0) {
+                    defval=0.;
+                  }
+
+                  else if (ladphintdes&LADSPA_HINT_DEFAULT_1) {
+                    defval=1.;
+                  }
+
+                  else if (ladphintdes&LADSPA_HINT_DEFAULT_100) {
+                    defval=100.;
+                  }
+
+                  else if (ladphintdes&LADSPA_HINT_DEFAULT_440) {
+                    defval=440.;
+                  }
+                  if (ladphintdes&LADSPA_HINT_INTEGER) {
+                    in_params[cninps]=weed_integer_init(laddes->PortNames[i],label,defval+.5,lbound+.5,ubound+.5);
+                    if (dual) in_params[cninps+oninps]=weed_integer_init(laddes->PortNames[i],label,defval+.5,lbound+.5,ubound+.5);
+                  } else {
+                    in_params[cninps]=weed_float_init(laddes->PortNames[i],label,defval,lbound,ubound);
+                    if (dual) in_params[cninps+oninps]=weed_float_init(laddes->PortNames[i],label,defval,lbound,ubound);
+                  }
+
+                }
+
+                if (ladphintdes&LADSPA_HINT_SAMPLE_RATE) weed_set_boolean_value(in_params[cninps],"plugin_sample_rate",WEED_TRUE);
+                else weed_set_boolean_value(in_params[cninps],"plugin_sample_rate",WEED_FALSE);
+
+                if (ladphintdes&LADSPA_HINT_LOGARITHMIC) weed_set_boolean_value(in_params[cninps],"plugin_logarithmic",WEED_TRUE);
+                else weed_set_boolean_value(in_params[cninps],"plugin_logarithmic",WEED_FALSE);
+
+                if (dual) {
+                  if (ladphintdes&LADSPA_HINT_SAMPLE_RATE) weed_set_boolean_value(in_params[cninps+oninps],"plugin_sample_rate",WEED_TRUE);
+                  else weed_set_boolean_value(in_params[cninps+oninps],"plugin_sample_rate",WEED_FALSE);
+
+                  if (ladphintdes&LADSPA_HINT_LOGARITHMIC) weed_set_boolean_value(in_params[cninps+oninps],"plugin_logarithmic",WEED_TRUE);
+                  else weed_set_boolean_value(in_params[cninps+oninps],"plugin_logarithmic",WEED_FALSE);
+
+                  sprintf(rfx_strings[cninps+1+stcount],"layout|p%d|",cninps);
+                  sprintf(rfx_strings[cninps+oninps+3+stcount],"layout|p%d|",cninps+oninps);
+                }
+
+                cninps++;
+              } else {
+                // out_param
+                if (ladphintdes&LADSPA_HINT_TOGGLED) {
+                  // boolean type
+                  if (ladphintdes&LADSPA_HINT_DEFAULT_1) {
+                    out_params[cnoutps]=weed_out_param_switch_init(laddes->PortNames[i],WEED_TRUE);
+                    if (dual) out_params[cnoutps+onoutps]=weed_out_param_switch_init(laddes->PortNames[i],WEED_TRUE);
+                  } else {
+                    out_params[cnoutps]=weed_out_param_switch_init(laddes->PortNames[i],WEED_FALSE);
+                    if (dual) out_params[cnoutps+onoutps]=weed_out_param_switch_init(laddes->PortNames[i],WEED_FALSE);
+                  }
+                } else {
+                  // int/float type
+                  lbound=ladphint.LowerBound;
+                  ubound=ladphint.UpperBound;
+                  defval=lbound;
+
+                  if (ladphintdes&LADSPA_HINT_DEFAULT_LOW) {
+                    defval+=(ubound-lbound)/4.;
+                  }
+
+                  else if (ladphintdes&LADSPA_HINT_DEFAULT_MIDDLE) {
+                    defval+=(ubound-lbound)/2.;
+                  }
+
+                  else if (ladphintdes&LADSPA_HINT_DEFAULT_HIGH) {
+                    defval+=(ubound-lbound)*3./4.;
+                  }
+
+                  else if (ladphintdes&LADSPA_HINT_DEFAULT_MAXIMUM) {
+                    defval=ubound;
+                  }
+
+                  else if (ladphintdes&LADSPA_HINT_DEFAULT_0) {
+                    defval=0.;
+                  }
+
+                  else if (ladphintdes&LADSPA_HINT_DEFAULT_1) {
+                    defval=1.;
+                  }
+
+                  else if (ladphintdes&LADSPA_HINT_DEFAULT_100) {
+                    defval=100.;
+                  }
+
+                  else if (ladphintdes&LADSPA_HINT_DEFAULT_440) {
+                    defval=440.;
+                  }
+
+                  if (ladphintdes&LADSPA_HINT_INTEGER) {
+                    out_params[cnoutps]=weed_out_param_integer_init(laddes->PortNames[i],defval+.5,lbound+.5,ubound+.5);
+                    if (dual) out_params[cnoutps+onoutps]=weed_out_param_integer_init(laddes->PortNames[i],defval+.5,lbound+.5,ubound+.5);
+                  } else {
+                    out_params[cnoutps]=weed_out_param_float_init(laddes->PortNames[i],defval,lbound,ubound);
+                    if (dual) out_params[cnoutps+onoutps]=weed_out_param_float_init(laddes->PortNames[i],defval,lbound,ubound);
+                  }
+
+                }
+
+                if (ladphintdes&LADSPA_HINT_SAMPLE_RATE) weed_set_boolean_value(out_params[cnoutps],"plugin_sample_rate",WEED_TRUE);
+                else weed_set_boolean_value(out_params[cnoutps],"plugin_sample_rate",WEED_FALSE);
+
+                if (dual) {
+                  if (ladphintdes&LADSPA_HINT_SAMPLE_RATE) weed_set_boolean_value(out_params[cnoutps],"plugin_sample_rate",WEED_TRUE);
+                  else weed_set_boolean_value(out_params[cnoutps],"plugin_sample_rate",WEED_FALSE);
+                }
+
+                cnoutps++;
+              }
+
+
+            }
+
+          }
+
+          snprintf(weed_name,PATH_MAX,"LADSPA: %s",laddes->Name);
+
+          filter_class=weed_filter_class_init(weed_name,"LADSPA developers",0,0,&ladspa_init,&ladspa_process,&ladspa_deinit,
+                                              in_chantmpls,out_chantmpls,in_params,out_params);
+
+          weed_set_string_value(filter_class,"extra_authors",laddes->Maker);
+
+          weed_set_voidptr_value(filter_class,"plugin_lad_descriptor",laddes);
+
+          weed_set_voidptr_value(filter_class,"plugin_lad_descriptor_func",(void *)lad_descriptor_func);
+          weed_set_voidptr_value(filter_class,"plugin_lad_instantiate_func",(void *)lad_instantiate_func);
+          weed_set_voidptr_value(filter_class,"plugin_lad_activate_func",(void *)lad_activate_func);
+          weed_set_voidptr_value(filter_class,"plugin_lad_deactivate_func",(void *)lad_deactivate_func);
+          weed_set_voidptr_value(filter_class,"plugin_lad_connect_port_func",(void *)lad_connect_port_func);
+          weed_set_voidptr_value(filter_class,"plugin_lad_run_func",(void *)lad_run_func);
+          weed_set_voidptr_value(filter_class,"plugin_lad_cleanup_func",(void *)lad_cleanup_func);
+
+          if (dual==WEED_TRUE) {
+            weed_set_boolean_value(filter_class,"plugin_dual",WEED_TRUE);
+            if (ninps>0) {
+              gui=weed_filter_class_get_gui(filter_class);
+              weed_set_string_value(gui,"layout_scheme","RFX");
+              weed_set_string_value(gui,"rfx_delim","|");
+
+              // subtract 1 from ninps since we incremented it
+              weed_set_string_array(gui,"rfx_strings",ninps+2+stcount,rfx_strings);
+              for (wnum=0; wnum<ninps+2+stcount; wnum++) weed_free(rfx_strings[wnum]);
+              weed_free(rfx_strings);
+              rfx_strings=NULL;
+
+              for (j=0; j<oninps; j++) {
+                gui=weed_parameter_template_get_gui(in_params[j]);
+                weed_set_int_value(gui,"copy_value_to",j+oninps);
+                gui=weed_parameter_template_get_gui(in_params[j+oninps]);
+                weed_set_int_value(gui,"copy_value_to",j);
+              }
+
+            }
+          } else weed_set_boolean_value(filter_class,"plugin_dual",WEED_FALSE);
+
+          if (in_params!=NULL) weed_free(in_params);
+          if (out_params!=NULL) weed_free(out_params);
+          if (in_chantmpls!=NULL) weed_free(in_chantmpls);
+          if (out_chantmpls!=NULL) weed_free(out_chantmpls);
+
+          weed_set_int_value(filter_class,"plugin_in_channels",oninchs);
+          weed_set_int_value(filter_class,"plugin_out_channels",onoutchs);
+          weed_set_int_value(filter_class,"plugin_in_params",oninps);
+          weed_set_int_value(filter_class,"plugin_out_params",onoutps);
+
+          weed_plugin_info_add_filter_class(plugin_info,filter_class);
+          num_plugins++;
+          num_filters++;
+          //fprintf(stderr,"DONE\n");
+        }
       }
     }
 
 #ifndef DEBUG
-  dup2(new_stdout,1);
-  dup2(new_stderr,2);
+    dup2(new_stdout,1);
+    dup2(new_stderr,2);
 #endif
 
   }

LiVES-2.2.8.tar.bz2/lives-plugins/weed-plugins/layout_blends.c -> LiVES-2.4.1.tar.bz2/lives-plugins/weed-plugins/layout_blends.c Changed

LiVES-2.2.8.tar.bz2/lives-plugins/weed-plugins/libvis.c -> LiVES-2.4.1.tar.bz2/lives-plugins/weed-plugins/libvis.c Changed

@@ -23,10 +23,11 @@
 #include "../../libweed/weed-effects.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 api_versions[]= {131,100}; // array of weed api versions supported in plugin, in order of preference (most preferred first)
 
 static int package_version=2; // version of this package
 
@@ -51,7 +52,7 @@
 
 #include <pthread.h>
 
-static int libvis_host_audio_callback (VisInput *, VisAudio *, void *user_data);
+static int libvis_host_audio_callback(VisInput *, VisAudio *, void *user_data);
 
 typedef struct {
   VisVideo *video;
@@ -69,7 +70,7 @@
 
 ///////////////////////////////////////////////////////////////
 
-int libvis_init (weed_plant_t *inst) {
+int libvis_init(weed_plant_t *inst) {
   weed_libvis_t *libvis=NULL;
   weed_plant_t *out_channel,*filter;
 
@@ -112,30 +113,29 @@
 
   if (ainput!=NULL&&instances&&strcmp(ainput,"jack")) return WEED_ERROR_TOO_MANY_INSTANCES;
 
-  if (libvis==NULL) libvis=(weed_libvis_t *)weed_malloc (sizeof(weed_libvis_t));
+  if (libvis==NULL) libvis=(weed_libvis_t *)weed_malloc(sizeof(weed_libvis_t));
   if (libvis==NULL) return WEED_ERROR_MEMORY_ALLOCATION;
 
   if (old_input==NULL||ainput==NULL||strcmp(ainput,old_input)||instances>0) {
     if (old_input!=NULL) {
       if (instances==0) {
-	visual_object_destroy (VISUAL_OBJECT (old_visinput));
-	old_visinput=NULL;
+        visual_object_destroy(VISUAL_OBJECT(old_visinput));
+        old_visinput=NULL;
       }
       free(old_input);
       old_input=NULL;
     }
     if (ainput!=NULL) {
-      old_visinput=libvis->input = visual_input_new (!strcmp(ainput,"auto")?NULL:ainput);
+      old_visinput=libvis->input = visual_input_new(!strcmp(ainput,"auto")?NULL:ainput);
       old_input=strdup(ainput);
     }
-  }
-  else libvis->input=old_visinput;
+  } else libvis->input=old_visinput;
 
 
   // host supplied audio buffers
 
   if (libvis->input==NULL) { // wish this worked
-    weed_free (libvis);
+    weed_free(libvis);
     return WEED_ERROR_INIT_ERROR;
   }
 
@@ -145,21 +145,21 @@
   out_channel=weed_get_plantptr_value(inst,"out_channels",&error);
   palette=weed_get_int_value(out_channel,"current_palette",&error);
 
-  if (palette==WEED_PALETTE_RGB24) visual_video_set_depth (libvis->video, VISUAL_VIDEO_DEPTH_24BIT);
-  else visual_video_set_depth (libvis->video, VISUAL_VIDEO_DEPTH_32BIT);
+  if (palette==WEED_PALETTE_RGB24) visual_video_set_depth(libvis->video, VISUAL_VIDEO_DEPTH_24BIT);
+  else visual_video_set_depth(libvis->video, VISUAL_VIDEO_DEPTH_32BIT);
 
-  visual_video_set_dimension (libvis->video, weed_get_int_value(out_channel,"width",&error), weed_get_int_value(out_channel,"height",&error));
+  visual_video_set_dimension(libvis->video, weed_get_int_value(out_channel,"width",&error), weed_get_int_value(out_channel,"height",&error));
 
   filter_name=weed_get_string_value(filter,"name",&error);
   if (!strncmp(filter_name,"libvisual: ",11)) filtname=filter_name+11;
   else filtname=filter_name;
-  libvis->actor = visual_actor_new (filtname);
+  libvis->actor = visual_actor_new(filtname);
   weed_free(filter_name);
 
-  visual_actor_realize (libvis->actor);
-  visual_actor_set_video (libvis->actor, libvis->video);
-  visual_actor_video_negotiate (libvis->actor, 0, FALSE, FALSE);
-  visual_input_realize (libvis->input);
+  visual_actor_realize(libvis->actor);
+  visual_actor_set_video(libvis->actor, libvis->video);
+  visual_actor_video_negotiate(libvis->actor, 0, FALSE, FALSE);
+  visual_input_realize(libvis->input);
 
   libvis->audio=NULL;
   libvis->audio_frames=0;
@@ -171,31 +171,31 @@
 
   if (!strcmp(ainput,"auto")) {
     pthread_mutex_init(&libvis->pcm_mutex,NULL);
-    visual_input_set_callback (libvis->input, libvis_host_audio_callback, (void *)libvis);
+    visual_input_set_callback(libvis->input, libvis_host_audio_callback, (void *)libvis);
   }
 
   return WEED_NO_ERROR;
 }
 
 
-int libvis_deinit (weed_plant_t *inst) {
+int libvis_deinit(weed_plant_t *inst) {
   weed_libvis_t *libvis;
   int error;
 
   if (weed_plant_has_leaf(inst,"plugin_internal")) {
     libvis=(weed_libvis_t *)weed_get_voidptr_value(inst,"plugin_internal",&error);
     if (libvis->instance>0) {
-      visual_object_destroy (VISUAL_OBJECT (libvis->input));
+      visual_object_destroy(VISUAL_OBJECT(libvis->input));
     }
-    if (libvis->video!=NULL) visual_object_free (VISUAL_OBJECT (libvis->video));
-    if (libvis->actor!=NULL) visual_object_destroy (VISUAL_OBJECT (libvis->actor));
+    if (libvis->video!=NULL) visual_object_free(VISUAL_OBJECT(libvis->video));
+    if (libvis->actor!=NULL) visual_object_destroy(VISUAL_OBJECT(libvis->actor));
     if (libvis->audio!=NULL) weed_free(libvis->audio);
-    weed_free (libvis);
+    weed_free(libvis);
     libvis=NULL;
     weed_set_voidptr_value(inst,"plugin_internal",libvis);
   }
   if (--instances<0) instances=0;
-  
+
   return WEED_NO_ERROR;
 }
 
@@ -224,21 +224,20 @@
       weed_free(libvis->audio);
     }
 
-    for (j=0;j<adlen;j++) {
+    for (j=0; j<adlen; j++) {
       if (ainter==WEED_TRUE) {
-	// interlaced
-	for (i=0;i<2;i++) {
-	  aud_data[libvis->audio_frames*2+i]=32767.*adata[i];
-	}
-	adata+=achans;
-      }
-      else {
-	// non-interlaced
-	for (i=0;i<2;i++) {
-	  aud_data[libvis->audio_frames*2+i]=32767.*adata[j];
-	  adata+=adlen;
-	}
-	adata=oadata;
+        // interlaced
+        for (i=0; i<2; i++) {
+          aud_data[libvis->audio_frames*2+i]=32767.*adata[i];
+        }
+        adata+=achans;
+      } else {
+        // non-interlaced
+        for (i=0; i<2; i++) {
+          aud_data[libvis->audio_frames*2+i]=32767.*adata[j];
+          adata+=adlen;
+        }
+        adata=oadata;
       }
       libvis->audio_frames++;
     }
@@ -249,7 +248,7 @@
 
 
 
-int libvis_process (weed_plant_t *inst, weed_timecode_t timestamp) {
+int libvis_process(weed_plant_t *inst, weed_timecode_t timestamp) {
   int error;
   weed_libvis_t *libvis=(weed_libvis_t *)weed_get_voidptr_value(inst,"plugin_internal",&error);
   weed_plant_t *out_channel=weed_get_plantptr_value(inst,"out_channels",&error);
@@ -258,26 +257,26 @@
 
   if (in_channel!=NULL) store_audio(libvis,in_channel);
 
-  visual_input_run (libvis->input);
-  visual_video_set_buffer (libvis->video, pixel_data);
-  visual_actor_run (libvis->actor, libvis->input->audio);
+  visual_input_run(libvis->input);
+  visual_video_set_buffer(libvis->video, pixel_data);
+  visual_actor_run(libvis->actor, libvis->input->audio);
   return WEED_NO_ERROR;
 }
 
 
-weed_plant_t *weed_setup (weed_bootstrap_f weed_boot) {
+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);
 
   if (plugin_info!=NULL) {
-    int palette_list[]={WEED_PALETTE_RGB24,WEED_PALETTE_RGBA32,WEED_PALETTE_END};
+    int palette_list[]= {WEED_PALETTE_RGB24,WEED_PALETTE_RGBA32,WEED_PALETTE_END};
     weed_plant_t *out_chantmpls[2];
     char *name=NULL;
     char fullname[256];
     weed_plant_t *filter_class;
     weed_plant_t *in_params[2];
-    const char *listeners[]={"None","Alsa","ESD","Jack","Mplayer","Auto",NULL};
+    const char *listeners[]= {"None","Alsa","ESD","Jack","Mplayer","Auto",NULL};
 
-    weed_plant_t *in_chantmpls[]={weed_audio_channel_template_init("In audio",0),NULL};
+    weed_plant_t *in_chantmpls[]= {weed_audio_channel_template_init("In audio",0),NULL};
 
     // set hints for host
     weed_set_int_value(in_chantmpls[0],"audio_channels",2);
@@ -291,26 +290,26 @@
     old_visinput=NULL;
 
     if (VISUAL_PLUGIN_API_VERSION<2) return NULL;
-    visual_log_set_verboseness (VISUAL_LOG_VERBOSENESS_NONE);
+    visual_log_set_verboseness(VISUAL_LOG_VERBOSENESS_NONE);
 
-    if (visual_init (NULL,NULL)<0) {
-      fprintf (stderr, "Libvis : Unable to init libvisual plugins\n");
+    if (visual_init(NULL,NULL)<0) {
+      fprintf(stderr, "Libvis : Unable to init libvisual plugins\n");
       return NULL;
     }
 
     in_params[1]=NULL;
     out_chantmpls[1]=NULL;
 
-    while ((name=(char *)visual_actor_get_next_by_name_nogl (name))!=NULL) {
+    while ((name=(char *)visual_actor_get_next_by_name_nogl(name))!=NULL) {
       snprintf(fullname,256,"libvisual: %s",name);
       in_params[0]=weed_string_list_init("listener","Audio _listener",5,listeners);
       weed_set_int_value(in_params[0],"flags",WEED_PARAMETER_REINIT_ON_VALUE_CHANGE);
       out_chantmpls[0]=weed_channel_template_init("out channel 0",0,palette_list);
       filter_class=weed_filter_class_init(fullname,"Team libvisual",1,0,&libvis_init,&libvis_process,&libvis_deinit,
-					  in_chantmpls,out_chantmpls,in_params,NULL);
+                                          in_chantmpls,out_chantmpls,in_params,NULL);
       weed_set_double_value(filter_class,"target_fps",50.); // set reasonable default fps
 
-      weed_plugin_info_add_filter_class (plugin_info,filter_class);
+      weed_plugin_info_add_filter_class(plugin_info,filter_class);
     }
     weed_set_int_value(plugin_info,"version",package_version);
     //weed_plant_free(out_chantmpls[0]);
@@ -321,7 +320,7 @@
 
 ///////////// callback so host can supply its own audio sammples //////////
 
-static int libvis_host_audio_callback (VisInput *input, VisAudio *audio, void *user_data) {
+static int libvis_host_audio_callback(VisInput *input, VisAudio *audio, void *user_data) {
   // audio_data is 16bit signed, little endian
   // two channels non-interlaced, ideally 512 samples in length
   // a rate of 44100Hz is recommended
@@ -338,7 +337,7 @@
 
   if (libvis->audio!=NULL) {
     pthread_mutex_lock(&libvis->pcm_mutex);
-    weed_memcpy (audio->plugpcm,libvis->audio,alen);
+    weed_memcpy(audio->plugpcm,libvis->audio,alen);
     weed_free(libvis->audio);
     libvis->audio=NULL;
     libvis->audio_frames=0;

LiVES-2.2.8.tar.bz2/lives-plugins/weed-plugins/lifeTV.c -> LiVES-2.4.1.tar.bz2/lives-plugins/weed-plugins/lifeTV.c Changed

@@ -28,7 +28,7 @@
 ///////////////////////////////////////////////////////////////////
 
 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 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
 
@@ -71,21 +71,21 @@
   short *q;
   unsigned char *r;
   int v;
-  
+
   rowstride-=width;
 
   p = src;
   q = sdata->background;
   r = sdata->diff;
-  for(i=0; i<height; i++) {
-    for (j=0;j<width;j++) {
+  for (i=0; i<height; i++) {
+    for (j=0; j<width; j++) {
       R = ((*p)&0xff0000)>>(16-1);
       G = ((*p)&0xff00)>>(8-2);
       B = (*p)&0xff;
       v = (R + G + B) - (int)(*q);
       *q = (short)(R + G + B);
       *r = ((v + sdata->threshold)>>24) | ((sdata->threshold - v)>>24);
-      
+
       p++;
       q++;
       r++;
@@ -101,14 +101,14 @@
   unsigned char *src, *dest;
   unsigned int count;
   unsigned int sum1, sum2, sum3;
-  
+
   src = sdata->diff;
   dest = sdata->diff2 + width +1;
-  for(y=1; y<height-1; y++) {
+  for (y=1; y<height-1; y++) {
     sum1 = src[0] + src[width] + src[width*2];
     sum2 = src[1] + src[width+1] + src[width*2+1];
     src += 2;
-    for(x=1; x<width-1; x++) {
+    for (x=1; x<width-1; x++) {
       sum3 = src[0] + src[width] + src[width*2];
       count = sum1 + sum2 + sum3;
       sum1 = sum2;
@@ -120,21 +120,20 @@
   }
 }
 
-static void clear_field(struct _sdata *sdata, int video_area)
-{
+static void clear_field(struct _sdata *sdata, int video_area) {
   bzero(sdata->field1, video_area);
 }
 
 /////////////////////////////////////////////////////////////
 
-int lifetv_init (weed_plant_t *inst) {
+int lifetv_init(weed_plant_t *inst) {
   struct _sdata *sdata;
   int height,width,video_area;
   weed_plant_t *in_channel;
   int error;
 
   sdata=weed_malloc(sizeof(struct _sdata));
-  if(sdata == NULL ) return WEED_ERROR_MEMORY_ALLOCATION;
+  if (sdata == NULL) return WEED_ERROR_MEMORY_ALLOCATION;
 
   in_channel=weed_get_plantptr_value(inst,"in_channels",&error);
 
@@ -151,7 +150,7 @@
 
   sdata->diff = (unsigned char *)weed_malloc(video_area*sizeof(unsigned char));
 
-  if(sdata->diff == NULL ) {
+  if (sdata->diff == NULL) {
     weed_free(sdata->field);
     weed_free(sdata);
     return WEED_ERROR_MEMORY_ALLOCATION;
@@ -159,7 +158,7 @@
 
   sdata->diff2 = (unsigned char *)weed_malloc(video_area*sizeof(unsigned char));
 
-  if(sdata->diff2 == NULL ) {
+  if (sdata->diff2 == NULL) {
     weed_free(sdata->diff);
     weed_free(sdata->field);
     weed_free(sdata);
@@ -168,7 +167,7 @@
 
 
   sdata->background = (short *)weed_malloc(video_area*sizeof(short));
-  if(sdata->background == NULL ) {
+  if (sdata->background == NULL) {
     weed_free(sdata->field);
     weed_free(sdata->diff);
     weed_free(sdata->diff2);
@@ -176,7 +175,7 @@
     return WEED_ERROR_MEMORY_ALLOCATION;
   }
 
-  if(sdata->background == NULL ) {
+  if (sdata->background == NULL) {
     weed_free(sdata->field);
     weed_free(sdata->diff);
     weed_free(sdata->diff2);
@@ -196,7 +195,7 @@
 }
 
 
-int lifetv_deinit (weed_plant_t *inst) {
+int lifetv_deinit(weed_plant_t *inst) {
   struct _sdata *sdata;
   int error;
 
@@ -213,7 +212,7 @@
 }
 
 
-int lifetv_process (weed_plant_t *inst, weed_timecode_t timestamp) {
+int lifetv_process(weed_plant_t *inst, weed_timecode_t timestamp) {
   struct _sdata *sdata;
 
   weed_plant_t *in_channel,*out_channel;
@@ -224,7 +223,7 @@
   RGB32 *src,*dest;
 
   RGB32 pix;
-  
+
   int width,height,video_area,irow,orow;
   int error;
   register int x, y;
@@ -251,7 +250,7 @@
 
   irow-=width;
 
-  for(x=0; x<video_area; x++) {
+  for (x=0; x<video_area; x++) {
     sdata->field1[x] |= p[x];
   }
 
@@ -261,10 +260,10 @@
   src += width + 1;
   /* each value of cell is 0 or 0xff. 0xff can be treated as -1, so
    * following equations treat each value as negative number. */
-  for(y=1; y<height-1; y++) {
+  for (y=1; y<height-1; y++) {
     sum1 = 0;
     sum2 = p[0] + p[width] + p[width*2];
-    for(x=1; x<width-1; x++) {
+    for (x=1; x<width-1; x++) {
       sum3 = p[1] + p[width+1] + p[width*2+1];
       sum = sum1 + sum2 + sum3;
       v = 0 - ((sum==0xfd)|((p[width]!=0)&(sum==0xfc)));
@@ -291,16 +290,17 @@
 
 
 
-weed_plant_t *weed_setup (weed_bootstrap_f weed_boot) {
+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);
   if (plugin_info!=NULL) {
-    int palette_list[]={WEED_PALETTE_RGBA32,WEED_PALETTE_BGRA32,WEED_PALETTE_END};
+    int palette_list[]= {WEED_PALETTE_RGBA32,WEED_PALETTE_BGRA32,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",0,palette_list),NULL};
-    weed_plant_t *filter_class=weed_filter_class_init("lifeTV","effectTV",1,0,&lifetv_init,&lifetv_process,&lifetv_deinit,in_chantmpls,out_chantmpls,NULL,NULL);
+    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",0,palette_list),NULL};
+    weed_plant_t *filter_class=weed_filter_class_init("lifeTV","effectTV",1,0,&lifetv_init,&lifetv_process,&lifetv_deinit,in_chantmpls,
+                               out_chantmpls,NULL,NULL);
 
-    weed_plugin_info_add_filter_class (plugin_info,filter_class);
+    weed_plugin_info_add_filter_class(plugin_info,filter_class);
 
     weed_set_int_value(plugin_info,"version",package_version);
   }

LiVES-2.2.8.tar.bz2/lives-plugins/weed-plugins/livetext.c -> LiVES-2.4.1.tar.bz2/lives-plugins/weed-plugins/livetext.c Changed

@@ -19,7 +19,7 @@
 ///////////////////////////////////////////////////////////////////
 
 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 api_versions[]= {131,100}; // array of weed api versions supported in plugin, in order of preference (most preferred first)
 
 static int package_version=2; // version of this package
 
@@ -57,18 +57,18 @@
 /////////////////////////////////////////////
 
 
-static int get_hex_digit (char *d) {
+static int get_hex_digit(char *d) {
   char c[2];
   c[0]=*d;
   c[1]=0;
 
-  if (!strcmp (c,"a")||!strcmp (c,"A")) return 10;
-  if (!strcmp (c,"b")||!strcmp (c,"B")) return 11;
-  if (!strcmp (c,"c")||!strcmp (c,"C")) return 12;
-  if (!strcmp (c,"d")||!strcmp (c,"D")) return 13;
-  if (!strcmp (c,"e")||!strcmp (c,"E")) return 14;
-  if (!strcmp (c,"f")||!strcmp (c,"F")) return 15;
-  return(atoi (c));
+  if (!strcmp(c,"a")||!strcmp(c,"A")) return 10;
+  if (!strcmp(c,"b")||!strcmp(c,"B")) return 11;
+  if (!strcmp(c,"c")||!strcmp(c,"C")) return 12;
+  if (!strcmp(c,"d")||!strcmp(c,"D")) return 13;
+  if (!strcmp(c,"e")||!strcmp(c,"E")) return 14;
+  if (!strcmp(c,"f")||!strcmp(c,"F")) return 15;
+  return (atoi(c));
 }
 
 
@@ -84,18 +84,20 @@
 
   // this can be expanded by increasing NFONTMAPS
 
-  font_maps[0]="ANSI|8|0000183C3C3C18181800181800000000006666662400000000000000000000000000006C6CFE6C6C6CFE6C6C0000000018187CC6C2C07C060686C67C1818000000000000C2C60C183060C686000000000000386C6C3876DCCCCCCC76000000000030303060000000000000000000000000000C18303030303030180C00000000000030180C0C0C0C0C0C1830000000000000000000663CFF3C66000000000000000000000018187E181800000000000000000000000000000018181830000000000000000000007E0000000000000000000000000000000000001818000000000000000002060C183060C0800000000000007CC6C6CEDEF6E6C6C67C0000000000001838781818181818187E0000000000007CC6060C183060C0C6FE0000000000007CC606063C060606C67C0000000000000C1C3C6CCCFE0C0C0C1E000000000000FEC0C0C0FC060606C67C0000000000003860C0C0FCC6C6C6C67C000000000000FEC606060C18303030300000000000007CC6C6C67CC6C6C6C67C0000000000007CC6C6C67E0606060C78000000000000000018180000001818000000000000000000181800000018183000000000000000060C18306030180C060000000000000000007E00007E000000000000000000006030180C060C1830600000000000007CC6C60C1818180018180000000000007CC6C6C6DEDEDEDCC07C00000000000010386CC6C6FEC6C6C6C6000000000000FC6666667C66666666FC0000000000003C66C2C0C0C0C0C2663C000000000000F86C6666666666666CF8000000000000FE6662687868606266FE000000000000FE6662687868606060F00000000000003C66C2C0C0DEC6C6663A000000000000C6C6C6C6FEC6C6C6C6C60000000000003C18181818181818183C0000000000001E0C0C0C0C0CCCCCCC78000000000000E666666C78786C6666E6000000000000F06060606060606266FE000000000000C3E7FFFFDBC3C3C3C3C3000000000000C6E6F6FEDECEC6C6C6C60000000000007CC6C6C6C6C6C6C6C67C000000000000FC6666667C60606060F00000000000007CC6C6C6C6C6C6D6DE7C0C0E00000000FC6666667C6C666666E60000000000007CC6C660380C06C6C67C000000000000FFDB991818181818183C000000000000C6C6C6C6C6C6C6C6C67C000000000000C3C3C3C3C3C3C3663C18000000000000C3C3C3C3C3DBDBFF6666000000000000C3C3663C18183C66C3C3000000000000C3C3C3663C181818183C000000000000FFC3860C183060C1C3FF0000000000003C30303030303030303C0000000000000080C0E070381C0E06020000000000003C0C0C0C0C0C0C0C0C3C0000000010386CC600000000000000000000000000000000000000000000000000FF0000303018000000000000000000000000000000000000780C7CCCCCCC76000000000000E06060786C666666667C0000000000000000007CC6C0C0C0C67C0000000000001C0C0C3C6CCCCCCCCC760000000000000000007CC6FEC0C0C67C000000000000386C6460F060606060F000000000000000000076CCCCCCCCCC7C0CCC78000000E060606C7666666666E60000000000001818003818181818183C0000000000000606000E06060606060666663C000000E06060666C78786C66E60000000000003818181818181818183C000000000000000000E6FFDBDBDBDBDB000000000000000000DC6666666666660000000000000000007CC6C6C6C6C67C000000000000000000DC66666666667C6060F000000000000076CCCCCCCCCC7C0C0C1E000000000000DC7666606060F00000000000000000007CC660380CC67C000000000000103030FC30303030361C000000000000000000CCCCCCCCCCCC76000000000000000000C3C3C3C3663C18000000000000000000C3C3C3DBDBFF66000000000000000000C3663C183C66C3000000000000000000C6C6C6C6C6C67E060CF8000000000000FECC183060C6FE0000000000000E18181870181818180E00000000000018181818001818181818000000000000701818180E181818187000000000000076DC0000000000000000000000000000000010386CC6C6C6FE0000000000";
-  
+  font_maps[0]=
+    "ANSI|8|0000183C3C3C18181800181800000000006666662400000000000000000000000000006C6CFE6C6C6CFE6C6C0000000018187CC6C2C07C060686C67C1818000000000000C2C60C183060C686000000000000386C6C3876DCCCCCCC76000000000030303060000000000000000000000000000C18303030303030180C00000000000030180C0C0C0C0C0C1830000000000000000000663CFF3C66000000000000000000000018187E181800000000000000000000000000000018181830000000000000000000007E0000000000000000000000000000000000001818000000000000000002060C183060C0800000000000007CC6C6CEDEF6E6C6C67C0000000000001838781818181818187E0000000000007CC6060C183060C0C6FE0000000000007CC606063C060606C67C0000000000000C1C3C6CCCFE0C0C0C1E000000000000FEC0C0C0FC060606C67C0000000000003860C0C0FCC6C6C6C67C000000000000FEC606060C18303030300000000000007CC6C6C67CC6C6C6C67C0000000000007CC6C6C67E0606060C78000000000000000018180000001818000000000000000000181800000018183000000000000000060C18306030180C060000000000000000007E00007E000000000000000000006030180C060C1830600000000000007CC6C60C1818180018180000000000007CC6C6C6DEDEDEDCC07C00000000000010386CC6C6FEC6C6C6C6000000000000FC6666667C66666666FC0000000000003C66C2C0C0C0C0C2663C000000000000F86C6666666666666CF8000000000000FE6662687868606266FE000000000000FE6662687868606060F00000000000003C66C2C0C0DEC6C6663A000000000000C6C6C6C6FEC6C6C6C6C60000000000003C18181818181818183C0000000000001E0C0C0C0C0CCCCCCC78000000000000E666666C78786C6666E6000000000000F06060606060606266FE000000000000C3E7FFFFDBC3C3C3C3C3000000000000C6E6F6FEDECEC6C6C6C60000000000007CC6C6C6C6C6C6C6C67C000000000000FC6666667C60606060F00000000000007CC6C6C6C6C6C6D6DE7C0C0E00000000FC6666667C6C666666E60000000000007CC6C660380C06C6C67C000000000000FFDB991818181818183C000000000000C6C6C6C6C6C6C6C6C67C000000000000C3C3C3C3C3C3C3663C18000000000000C3C3C3C3C3DBDBFF6666000000000000C3C3663C18183C66C3C3000000000000C3C3C3663C181818183C000000000000FFC3860C183060C1C3FF0000000000003C30303030303030303C0000000000000080C0E070381C0E06020000000000003C0C0C0C0C0C0C0C0C3C0000000010386CC600000000000000000000000000000000000000000000000000FF0000303018000000000000000000000000000000000000780C7CCCCCCC76000000000000E06060786C666666667C0000000000000000007CC6C0C0C0C67C0000000000001C0C0C3C6CCCCCCCCC760000000000000000007CC6FEC0C0C67C000000000000386C6460F060606060F000000000000000000076CCCCCCCCCC7C0CCC78000000E060606C7666666666E60000000000001818003818181818183C0000000000000606000E06060606060666663C000000E06060666C78786C66E60000000000003818181818181818183C000000000000000000E6FFDBDBDBDBDB000000000000000000DC6666666666660000000000000000007CC6C6C6C6C67C000000000000000000DC66666666667C6060F000000000000076CCCCCCCCCC7C0C0C1E000000000000DC7666606060F00000000000000000007CC660380CC67C000000000000103030FC30303030361C000000000000000000CCCCCCCCCCCC76000000000000000000C3C3C3C3663C18000000000000000000C3C3C3DBDBFF66000000000000000000C3663C183C66C3000000000000000000C6C6C6C6C6C67E060CF8000000000000FECC183060C6FE0000000000000E18181870181818180E00000000000018181818001818181818000000000000701818180E181818187000000000000076DC0000000000000000000000000000000010386CC6C6C6FE0000000000";
+
 
   // hex encoded font map - Hiragana
-  font_maps[1]="Hiragana|16|0000000000000000020002E03F00024002400FF01488250822083C100060018000000100010001F83F000120012007F01A4822444144418443043C08003000C0000000000000000000000000300010101008100810041104120414000C00040000000000000060102010200820082004200420042104120414001800080008000000000000000000040003F0000001F026081804000400040008003000C003000000080007F00000000001F04608380400040004000400040008003000C007000000000000000000040003E0000020401FF00080010003C004400840107C000000001000080007C00000002041F03E40008001800280044008401040203E000000000000000000000000061002083FF4020007E00A101208120812080C10006000000800040804E47F02041E040007F00C081404240444044404380800700000000006000200020847C43C44044408420842085A104610822080270040000000000004040212020804107FC80444044408420842105E1042208026804100000000000100008C00F01F80004700F87F2000200010401040F02000180007F0000000000206011801E01E800047007803C03C200020001041F02010180007E00000000000700020004000800300040008000400020001000080006000100008000000000052004900800100020004000800100010000C00030000C00020001000000000206020102010201347FC40104010401044104810502030201040108000000000104220292024202047FF40204020402048205020502030203040118000000000000010000FF80010002000000000000000000000400020021FFC000000000000000200091FF40020004000000000000000000000400020021FFC00000000000001000080004E30700FC000200010001040C84038200010000C0003F80004000002040112008820FC1FC0004000200020401040F0400020001C0003FC00000000300008000800080008000800080010001002100410081010086007800000000010200910088008000800080008001000100110021004100810300FC00000000000E0002000204FFF302001A0026004200420026001A00040008003000C00000001840052004847FE3840004007C0084008C0074000400040008001000E000000002030100810081008FE7F1008100810081008D0083008000FFC0000000000000014104A08200820082008FE7F200820082009A0086008000C0003FC0000000000F01F20004000800100021E0FE014006400040004000400030000FC0000000000FA1F25004000800100021E0FE014006400040004000400030000FC0000000004000400046047803C7E040008000800080010001200120021FE4000000000000414040A046047803C7E040008000800080010001200120021FE40000000000003000100217C1F800200040005FC0E0208021002100200040008007003800000060A020542F83F00040008000BF81C041004200420040008001000E0070000000000000000000000000003F00C081004000400040008001000600380000000000000000001F80604780200020002000200020004000400180060078000000000000A000501F806047802000200020002000200040004001800600780000000000000003C07C07A000400040008000800080008000400020001F80000000000000000003C07C07A14040A040008000800080008000400020001F8000000000000030001000100010801180160038004000800100010001000080007FC000000000600020A02050210023002C007000800100020002000200010000FF8000000000400040007707C1C04100410081008100810101013F01418242443C2000000002000100011FC1000200040004000400040004C005200610021FE20001000000001000100410043F02D08110431022902450242024374448C388C0072000200000C000400047805847E04440408041804180428F4490C490638F9080008000000000007F01908210441044102410241024102420222021C040008003000C00000106010101010101E27F0201040104010401045F05A1C621261E1200000000000106A10151010101E27F0201040104010401045F05A1C621261E120000000000020C620292026203C4FE040208020802080208BE0B438C424C3C2400000000000010041003E08020804080808100C200C20122010201010200FC0000000000000010A41053E08020804080808100C200C20122010201010200FC0000000000000010641093E0E020804080808100C200C20122010201010200FC000000000000002000100008001400200040002000110008804440842104226404180000000000214010A00800140020004000200011000880444084210422640418000000000020C0112008C0140020004000200011000880444084210422640418000000000000000000300048008401020602000100008000400020001000000000000000000000014030A04800840102060200010000800040002000100000000000000000000000C0312048C0840102060200010000800040002000100000000000000002000107C11902010201E47F040104010401049F85214221221E1200000000000400A207527C04040407C8FC080408040804093F0A448444443824000000000004006207927C64040407C8FC080408040804093E0A458444443824000000000000180008000FE7F800080008000FC3F80008000800FE0109810860F0000000000018022801C8000980108010802080FF0321842144422482130400080010000001800041005887E04040204023C00440444044C0434080408041003E000000000018030801080108017E01918290449024502460245024804301800600180000006000200020022001FE0040044043FF40402040204020402040403F800000000000000000000000000801040087805A446243A040288027001000100010000000100108020F8214422421C027002080409F8040004000200020002000100000000000000000000001180108011F81684188420842084229821E001000600000001802040107811C4124224424842504260424442424421F8108003000400000000000000000000000180008000FC0080008000800F8010E0119C0E0000000000018000800080008600F800800080008000801FC020B0208C21021E0100000000060001E018001000100010F01308140418041004200420040008003007C000040408080808090A0A0C04000000030000007811900E2000400080010003F804040802138264420442044C03F00000000018000400047004903F104410041004100C101411241154120C0C040000000000006011A00E400080010002780784080210022002400200040008003003C0000000000000000000000600040004F01F88060404040C041404140804100460000010000800040004000C78158466020C02140224024402440274040C080470000001C006401880010003E00D18120422024402440244E24912311400F80010000013E00C4000800170078808041304148404F80380081C182224424382000400000100010011380FC0020003000487085870E0034004400840080007FE000000000700010002000200040004000800080017801842104220442044404800300000000000000000000003FC1C080010012001C001000100020002000400080000000000000047FE3804011801E001000100010002000200040008001000000000000000000000000001020C00000000000000180008001000100020004000C0014002400C403040004000400040000000000000000000000000010001001FF01110101010201040004000800100020000000100010001001FF811081008100810081010101000200040008003000C0000000000000000000000000000001FF0010001000100010001003FFC0000000000000000000000000000107C0F8001000100010001000100010043FE3C000000000000000000000000000080004000401FFC00C0014002400440184000C0000000000100008000400040407F3FC0004000C00140024004400840104061C00040000003000100010001FC7F040104010401040104020402080488087010006000000001040112010801003FFC01040104010402040204040408881078200040000000040002000100010047FC39000100010001FF7E8000800080008000800000000004000214010A010047FC39000100010001FF7E8000800080008000800000000001000100010003FC040808081010201040200040008001000600180060000000010A0105010003FC04080808101020104020004000800100060018006000000006000200020004000FFE082010202020404000400080010002000400080000000614020A020004000FFE0820102020204040004000800100020004000800000000000000000020001FF800080008000800080008001000107FFC00000000000000000014000A20001FF800080008000800080008001000107FFC0000000000000060182004200420043E7FE00420042004200420044000400080010002000000006A182504200420043E7FE0042004200420042004400040008001000200000000001000080004002002100408080010002000400080110012000C000000000000501028080004002002100408080010002000400080110012000C00000000000000107C0F840008000800100020004000E00110020804041802600000000000000A20F51F100010002000200040008001C00220041008083004C00000000000000008000400040004FC0F087410042004C004000400040007FE0000000000000004080A0404040004FC0F087410042004C004000400040007FE00000000000000000008100808080408041004100020002000400080010002000C0000000000000A0005201010100810082008200040004000800100020004001800000000000100010001FC020404080C101220212040C00080014002000400180060000000020A020503F804080810182024404240818001000280040008003000C00000000000001803E03C800080008003FE7C80008001000100020004001800000000000000003007C279050102010007FCF9000100020002000400080030000000000000000000000000000200110808880488041000100020004000800100060000000000020E21021102108408840808000800100020004000800100060018000000000A0405421822082108111010100020002000400080010002000C003000000010180FE0000000004FFE3080008000800080010001000200040008003000000020301FCA000500009FFC61000100010001000200020004000800100060000003010101010101010101010101010100000314010A01000100010001E00118010401000100010001000100010001000000018000800080008040FE3F80008000800080010001000200040018000000000000000000000000001FF80000000000000000000043FE3C000000000000000000000000001FFC0008000800100610012000C000A001100208040418026000000004000200010000F03F200040008001E003180D0471020102010001000100000000000018000400040008000800100010002000400080010002000C003000000000000040064002200210021004080408080408041002100220024000000000000014004A06400220021002100408040808040804100210022002400000000000000C0052064C02200210021004080408080408041002100220024000000000000000300010001000100C107013801C00100010001000100010041FFC0000000000003014100A1000100C107013801C00100010001000100010041FFC00000000000C3012100C1000100C107013801C00100010001000100010041FFC000000000000000023FC1C04000400080008001000200040008001000200040018000000000A000547F838080008001000100020004000800100020004000800300000000006000947FE3808000800100010002000400080010002000400080030000000000000000200050004800840102060100008000400020002000000000000000000000004001203080480084010206010000800040002000200000000000000000000000C0012030C04800840102060100008000400020002000000000000000003000100010041FE3F00012009100908110811042104410005000300000000000314010A010041FE3F0001200910090811081104210441000500030000000000030C0112010C41FE3F000120091009081108110421044100050003000000000000000000003E43C23C04000800101820064001800080004000400000000000001E0001C00030000C1C0003800060001800041C00030000C00030000800000000020001000100010002000200044004200810100810F82704780200020002000000780008000800100110009000600020005000880104020004001800000000000000000001F81F0001000100010007FE790001000100010001FF0000000000000000000000000000040002000278078879100120014001000100010000000000040004000200023E03C24F043108011001200140008000800080008000000000000000000000000000000000000000000FE000200020002000203FFC000000000000000000000000000000001FF00010001000100020002000207FFE000000000000000000000000000000000FF8000800080FF80010001000101FF0000000000000000000001FFC00040004000400041FF800080008000800087FF8000000000FF800000000000043FC3C0400040008001000200040018006000800100000000020101008100810081008100810081008100810001000200040018006000000030019000900090009000900090109020904090811101120214041800000000000000000100010001001100210041008101010201040118016001800000000000000000000001FF81008100810081008100810081FF810001000000000000000000000000000000010001FF01010101010200020004000400080010002000000000000001FF810081008100810081010001000200020004000800100020000000080008000803FFC08800880088008807FFF008000800080008000800080000000000000000001F83E1000600180010001000100010047FE3800000000000000000000003FF80008000800081FF800080010001000200040008003000C00000000000000300008040404040800080010002000400080010002003C00000000000214010A010001001FF81008100810101010102000400080010002000400000000000000000000000100010001F01F1001100110021002100410086010000000000000000000000000000400040004780FA0104020400080010002000400";
+  font_maps[1]=
+    "Hiragana|16|0000000000000000020002E03F00024002400FF01488250822083C100060018000000100010001F83F000120012007F01A4822444144418443043C08003000C0000000000000000000000000300010101008100810041104120414000C00040000000000000060102010200820082004200420042104120414001800080008000000000000000000040003F0000001F026081804000400040008003000C003000000080007F00000000001F04608380400040004000400040008003000C007000000000000000000040003E0000020401FF00080010003C004400840107C000000001000080007C00000002041F03E40008001800280044008401040203E000000000000000000000000061002083FF4020007E00A101208120812080C10006000000800040804E47F02041E040007F00C081404240444044404380800700000000006000200020847C43C44044408420842085A104610822080270040000000000004040212020804107FC80444044408420842105E1042208026804100000000000100008C00F01F80004700F87F2000200010401040F02000180007F0000000000206011801E01E800047007803C03C200020001041F02010180007E00000000000700020004000800300040008000400020001000080006000100008000000000052004900800100020004000800100010000C00030000C00020001000000000206020102010201347FC40104010401044104810502030201040108000000000104220292024202047FF40204020402048205020502030203040118000000000000010000FF80010002000000000000000000000400020021FFC000000000000000200091FF40020004000000000000000000000400020021FFC00000000000001000080004E30700FC000200010001040C84038200010000C0003F80004000002040112008820FC1FC0004000200020401040F0400020001C0003FC00000000300008000800080008000800080010001002100410081010086007800000000010200910088008000800080008001000100110021004100810300FC00000000000E0002000204FFF302001A0026004200420026001A00040008003000C00000001840052004847FE3840004007C0084008C0074000400040008001000E000000002030100810081008FE7F1008100810081008D0083008000FFC0000000000000014104A08200820082008FE7F200820082009A0086008000C0003FC0000000000F01F20004000800100021E0FE014006400040004000400030000FC0000000000FA1F25004000800100021E0FE014006400040004000400030000FC0000000004000400046047803C7E040008000800080010001200120021FE4000000000000414040A046047803C7E040008000800080010001200120021FE40000000000003000100217C1F800200040005FC0E0208021002100200040008007003800000060A020542F83F00040008000BF81C041004200420040008001000E0070000000000000000000000000003F00C081004000400040008001000600380000000000000000001F80604780200020002000200020004000400180060078000000000000A000501F806047802000200020002000200040004001800600780000000000000003C07C07A000400040008000800080008000400020001F80000000000000000003C07C07A14040A040008000800080008000400020001F8000000000000030001000100010801180160038004000800100010001000080007FC000000000600020A02050210023002C007000800100020002000200010000FF8000000000400040007707C1C04100410081008100810101013F01418242443C2000000002000100011FC1000200040004000400040004C005200610021FE20001000000001000100410043F02D08110431022902450242024374448C388C0072000200000C000400047805847E04440408041804180428F4490C490638F9080008000000000007F01908210441044102410241024102420222021C040008003000C00000106010101010101E27F0201040104010401045F05A1C621261E1200000000000106A10151010101E27F0201040104010401045F05A1C621261E120000000000020C620292026203C4FE040208020802080208BE0B438C424C3C2400000000000010041003E08020804080808100C200C20122010201010200FC0000000000000010A41053E08020804080808100C200C20122010201010200FC0000000000000010641093E0E020804080808100C200C20122010201010200FC000000000000002000100008001400200040002000110008804440842104226404180000000000214010A00800140020004000200011000880444084210422640418000000000020C0112008C0140020004000200011000880444084210422640418000000000000000000300048008401020602000100008000400020001000000000000000000000014030A04800840102060200010000800040002000100000000000000000000000C0312048C0840102060200010000800040002000100000000000000002000107C11902010201E47F040104010401049F85214221221E1200000000000400A207527C04040407C8FC080408040804093F0A448444443824000000000004006207927C64040407C8FC080408040804093E0A458444443824000000000000180008000FE7F800080008000FC3F80008000800FE0109810860F0000000000018022801C8000980108010802080FF0321842144422482130400080010000001800041005887E04040204023C00440444044C0434080408041003E000000000018030801080108017E01918290449024502460245024804301800600180000006000200020022001FE0040044043FF40402040204020402040403F800000000000000000000000000801040087805A446243A040288027001000100010000000100108020F8214422421C027002080409F8040004000200020002000100000000000000000000001180108011F81684188420842084229821E001000600000001802040107811C4124224424842504260424442424421F8108003000400000000000000000000000180008000FC0080008000800F8010E0119C0E0000000000018000800080008600F800800080008000801FC020B0208C21021E0100000000060001E018001000100010F01308140418041004200420040008003007C000040408080808090A0A0C04000000030000007811900E2000400080010003F804040802138264420442044C03F00000000018000400047004903F104410041004100C101411241154120C0C040000000000006011A00E400080010002780784080210022002400200040008003003C0000000000000000000000600040004F01F88060404040C041404140804100460000010000800040004000C78158466020C02140224024402440274040C080470000001C006401880010003E00D18120422024402440244E24912311400F80010000013E00C4000800170078808041304148404F80380081C182224424382000400000100010011380FC0020003000487085870E0034004400840080007FE000000000700010002000200040004000800080017801842104220442044404800300000000000000000000003FC1C080010012001C001000100020002000400080000000000000047FE3804011801E001000100010002000200040008001000000000000000000000000001020C00000000000000180008001000100020004000C0014002400C403040004000400040000000000000000000000000010001001FF01110101010201040004000800100020000000100010001001FF811081008100810081010101000200040008003000C0000000000000000000000000000001FF0010001000100010001003FFC0000000000000000000000000000107C0F8001000100010001000100010043FE3C000000000000000000000000000080004000401FFC00C0014002400440184000C0000000000100008000400040407F3FC0004000C00140024004400840104061C00040000003000100010001FC7F040104010401040104020402080488087010006000000001040112010801003FFC01040104010402040204040408881078200040000000040002000100010047FC39000100010001FF7E8000800080008000800000000004000214010A010047FC39000100010001FF7E8000800080008000800000000001000100010003FC040808081010201040200040008001000600180060000000010A0105010003FC04080808101020104020004000800100060018006000000006000200020004000FFE082010202020404000400080010002000400080000000614020A020004000FFE0820102020204040004000800100020004000800000000000000000020001FF800080008000800080008001000107FFC00000000000000000014000A20001FF800080008000800080008001000107FFC0000000000000060182004200420043E7FE00420042004200420044000400080010002000000006A182504200420043E7FE0042004200420042004400040008001000200000000001000080004002002100408080010002000400080110012000C000000000000501028080004002002100408080010002000400080110012000C00000000000000107C0F840008000800100020004000E00110020804041802600000000000000A20F51F100010002000200040008001C00220041008083004C00000000000000008000400040004FC0F087410042004C004000400040007FE0000000000000004080A0404040004FC0F087410042004C004000400040007FE00000000000000000008100808080408041004100020002000400080010002000C0000000000000A0005201010100810082008200040004000800100020004001800000000000100010001FC020404080C101220212040C00080014002000400180060000000020A020503F804080810182024404240818001000280040008003000C00000000000001803E03C800080008003FE7C80008001000100020004001800000000000000003007C279050102010007FCF9000100020002000400080030000000000000000000000000000200110808880488041000100020004000800100060000000000020E21021102108408840808000800100020004000800100060018000000000A0405421822082108111010100020002000400080010002000C003000000010180FE0000000004FFE3080008000800080010001000200040008003000000020301FCA000500009FFC61000100010001000200020004000800100060000003010101010101010101010101010100000314010A01000100010001E00118010401000100010001000100010001000000018000800080008040FE3F80008000800080010001000200040018000000000000000000000000001FF80000000000000000000043FE3C000000000000000000000000001FFC0008000800100610012000C000A001100208040418026000000004000200010000F03F200040008001E003180D0471020102010001000100000000000018000400040008000800100010002000400080010002000C003000000000000040064002200210021004080408080408041002100220024000000000000014004A06400220021002100408040808040804100210022002400000000000000C0052064C02200210021004080408080408041002100220024000000000000000300010001000100C107013801C00100010001000100010041FFC0000000000003014100A1000100C107013801C00100010001000100010041FFC00000000000C3012100C1000100C107013801C00100010001000100010041FFC000000000000000023FC1C04000400080008001000200040008001000200040018000000000A000547F838080008001000100020004000800100020004000800300000000006000947FE3808000800100010002000400080010002000400080030000000000000000200050004800840102060100008000400020002000000000000000000000004001203080480084010206010000800040002000200000000000000000000000C0012030C04800840102060100008000400020002000000000000000003000100010041FE3F00012009100908110811042104410005000300000000000314010A010041FE3F0001200910090811081104210441000500030000000000030C0112010C41FE3F000120091009081108110421044100050003000000000000000000003E43C23C04000800101820064001800080004000400000000000001E0001C00030000C1C0003800060001800041C00030000C00030000800000000020001000100010002000200044004200810100810F82704780200020002000000780008000800100110009000600020005000880104020004001800000000000000000001F81F0001000100010007FE790001000100010001FF0000000000000000000000000000040002000278078879100120014001000100010000000000040004000200023E03C24F043108011001200140008000800080008000000000000000000000000000000000000000000FE000200020002000203FFC000000000000000000000000000000001FF00010001000100020002000207FFE000000000000000000000000000000000FF8000800080FF80010001000101FF0000000000000000000001FFC00040004000400041FF800080008000800087FF8000000000FF800000000000043FC3C0400040008001000200040018006000800100000000020101008100810081008100810081008100810001000200040018006000000030019000900090009000900090109020904090811101120214041800000000000000000100010001001100210041008101010201040118016001800000000000000000000001FF81008100810081008100810081FF810001000000000000000000000000000000010001FF01010101010200020004000400080010002000000000000001FF810081008100810081010001000200020004000800100020000000080008000803FFC08800880088008807FFF008000800080008000800080000000000000000001F83E1000600180010001000100010047FE3800000000000000000000003FF80008000800081FF800080010001000200040008003000C00000000000000300008040404040800080010002000400080010002003C00000000000214010A010001001FF81008100810101010102000400080010002000400000000000000000000000100010001F01F1001100110021002100410086010000000000000000000000000000400040004780FA0104020400080010002000400";
 
 
- int i,j,k;
- int nglyphs;
- size_t len;
+  int i,j,k;
+  int nglyphs;
+  size_t len;
 
-  for (k=0;k<NFONTMAPS;k++) {
+  for (k=0; k<NFONTMAPS; k++) {
     len=strcspn(font_maps[k],"|");
     font_tables[k].fontname=weed_malloc(len+1);
     weed_memcpy(font_tables[k].fontname,font_maps[k],len);
@@ -108,17 +110,17 @@
     font_tables[k].nglyphs=++nglyphs;
     font_tables[k].fonttable=weed_malloc(32*nglyphs);
 
-    for (i=0;i<nglyphs*16;i+=16) {
-      for (j=0;j<16;j++) {
-	if (i==0) font_tables[k].fonttable[j]=0; // make sure we have a space
-	else {
-	  if (font_tables[k].width==16) {
-	    font_tables[k].fonttable[i+j]=((get_hex_digit(&font_maps[k][(i-16+j)*4])<<12)+(get_hex_digit(&font_maps[k][(i-16+j)*4+1])<<8)+(get_hex_digit(&font_maps[k][(i-16+j)*4+2])<<4)+(get_hex_digit(&font_maps[k][(i-16+j)*4+3])));
-	  }
-	  else {
-	    font_tables[k].fonttable[i+j]=((get_hex_digit(&font_maps[k][(i-16+j)*2])<<4)+(get_hex_digit(&font_maps[k][(i-16+j)*2+1])));
-	  }
-	}
+    for (i=0; i<nglyphs*16; i+=16) {
+      for (j=0; j<16; j++) {
+        if (i==0) font_tables[k].fonttable[j]=0; // make sure we have a space
+        else {
+          if (font_tables[k].width==16) {
+            font_tables[k].fonttable[i+j]=((get_hex_digit(&font_maps[k][(i-16+j)*4])<<12)+(get_hex_digit(&font_maps[k][(i-16+j)*4+1])<<8)+
+                                           (get_hex_digit(&font_maps[k][(i-16+j)*4+2])<<4)+(get_hex_digit(&font_maps[k][(i-16+j)*4+3])));
+          } else {
+            font_tables[k].fonttable[i+j]=((get_hex_digit(&font_maps[k][(i-16+j)*2])<<4)+(get_hex_digit(&font_maps[k][(i-16+j)*2+1])));
+          }
+        }
       }
     }
   }
@@ -129,35 +131,34 @@
 static inline void fill_line(int fontwidth, unsigned char *dst, unsigned short fontrow, int type, rgb_t *fg, rgb_t *bg) {
   register int i;
 
-  for (i=fontwidth-1;i>=0;i--) {
+  for (i=fontwidth-1; i>=0; i--) {
     switch (type) {
     case 1:
       // fg and bg
       if (fontrow&(1<<i)) {
-	dst[0]=fg->red;
-	dst[1]=fg->green;
-	dst[2]=fg->blue;
-      }
-      else {
-	dst[0]=bg->red;
-	dst[1]=bg->green;
-	dst[2]=bg->blue;
+        dst[0]=fg->red;
+        dst[1]=fg->green;
+        dst[2]=fg->blue;
+      } else {
+        dst[0]=bg->red;
+        dst[1]=bg->green;
+        dst[2]=bg->blue;
       }
       break;
     case 0:
       // fg only
       if (fontrow&(1<<i)) {
-	dst[0]=fg->red;
-	dst[1]=fg->green;
-	dst[2]=fg->blue;
+        dst[0]=fg->red;
+        dst[1]=fg->green;
+        dst[2]=fg->blue;
       }
       break;
     case 2:
       // bg only
       if (!(fontrow&(1<<i))) {
-	dst[0]=bg->red;
-	dst[1]=bg->green;
-	dst[2]=bg->blue;
+        dst[0]=bg->red;
+        dst[1]=bg->green;
+        dst[2]=bg->blue;
       }
       break;
     }
@@ -175,7 +176,7 @@
 
   if (glyph<0||glyph>=font_tables[fontnum].nglyphs) return;
 
-  for (i=0;i<16;i++) {
+  for (i=0; i<16; i++) {
     fill_line(font_tables[fontnum].width,dst,font_tables[fontnum].fonttable[glyph*16+i],type,fg,bg);
     dst+=drow;
   }
@@ -190,7 +191,7 @@
 
   if (cent==WEED_FALSE) return 0;
 
-  for (i=0;str[i]!=0;i++) {
+  for (i=0; str[i]!=0; i++) {
     if (!strncmp(str+i,"\n",1)) {
       break;
     }
@@ -212,7 +213,7 @@
 
   if (rise==WEED_FALSE) return 0;
 
-  for (i=0;str[i]!=0;i++) {
+  for (i=0; str[i]!=0; i++) {
     if (!strncmp(str+i,"\n",1)) res--;
   }
 
@@ -231,7 +232,7 @@
 /////////////////////////////////////////////////////////////
 
 
-int livetext_process (weed_plant_t *inst, weed_timecode_t timestamp) {
+int livetext_process(weed_plant_t *inst, weed_timecode_t timestamp) {
   int error;
   //unsigned int irow16,orow16;
   //unsigned int startx,starty,endx;
@@ -274,8 +275,7 @@
     in_channel=weed_get_plantptr_value(inst,"in_channels",&error);
     src=weed_get_voidptr_value(in_channel,"pixel_data",&error);
     irowstride=weed_get_int_value(in_channel,"rowstrides",&error);
-  }
-  else src=dst;
+  } else src=dst;
 
 
   if (palette==WEED_PALETTE_RGBA32||palette==WEED_PALETTE_BGRA32) pbits=4;
@@ -283,7 +283,7 @@
   text=weed_get_string_value(in_params[0],"value",&error);
   mode=weed_get_int_value(in_params[1],"value",&error);
   fontnum=weed_get_int_value(in_params[2],"value",&error);
-  
+
   fg=(rgb_t *)weed_get_int_array(in_params[3],"value",&error);
   bg=(rgb_t *)weed_get_int_array(in_params[4],"value",&error);
 
@@ -312,7 +312,7 @@
   pbits*=font_tables[fontnum].width;
 
   if (src!=dst) {
-    for (i=0;i<height;i++) {
+    for (i=0; i<height; i++) {
       weed_memcpy(&dst[i*orowstride],&src[i*irowstride],widthx);
       if (ofill>0) weed_memset(&dst[i*orowstride+widthx],0,ofill);
     }
@@ -321,15 +321,14 @@
   xpos=get_xpos(text,widthz,cent);
   ypos=get_ypos(text,heightx,rise);
 
-  for (i=0;i<strlen(text);i++) {
+  for (i=0; i<strlen(text); i++) {
     if (!strncmp(text+i,"\n",1)) {
       xpos=get_xpos(text+i+1,widthz,cent);
       ypos++;
-    }
-    else {
+    } else {
       if (xpos>=0&&xpos<widthz&&ypos>=0&&ypos<heightx) {
-	offs=ypos*orowstride*16+xpos*pbits;
-	fill_block(fontnum,&dst[offs],orowstride,(int)text[i],mode,fg,bg);
+        offs=ypos*orowstride*16+xpos*pbits;
+        fill_block(fontnum,&dst[offs],orowstride,(int)text[i],mode,fg,bg);
       }
       xpos++;
     }
@@ -345,15 +344,15 @@
 
 
 
-weed_plant_t *weed_setup (weed_bootstrap_f weed_boot) {
+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) {
-    const char *modes[]={"foreground only","foreground and background","background only",NULL};
-    int palette_list[]={WEED_PALETTE_BGR24,WEED_PALETTE_RGB24,WEED_PALETTE_RGBA32,WEED_PALETTE_BGRA32,WEED_PALETTE_END};
-    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};
+    const char *modes[]= {"foreground only","foreground and background","background only",NULL};
+    int palette_list[]= {WEED_PALETTE_BGR24,WEED_PALETTE_RGB24,WEED_PALETTE_RGBA32,WEED_PALETTE_BGRA32,WEED_PALETTE_END};
+    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 *in_params[8],*pgui;
     weed_plant_t *filter_class;
 
@@ -362,7 +361,7 @@
 
     make_font_tables();
 
-    for (i=0;i<NFONTMAPS;i++) {
+    for (i=0; i<NFONTMAPS; i++) {
       fonts[i]=font_tables[i].fontname;
     }
     fonts[i]=NULL;
@@ -375,19 +374,20 @@
     in_params[5]=weed_switch_init("center","_Center text",WEED_TRUE);
     in_params[6]=weed_switch_init("rising","_Rising text",WEED_TRUE);
     in_params[7]=NULL;
-    
+
     pgui=weed_parameter_template_get_gui(in_params[0]);
     weed_set_int_value(pgui,"maxchars",65536);
 
     filter_class=weed_filter_class_init("livetext","salsaman",1,0,NULL,&livetext_process,NULL,in_chantmpls,out_chantmpls,in_params,NULL);
 
-    weed_plugin_info_add_filter_class (plugin_info,filter_class);
+    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,(clone1=weed_clone_plants(out_chantmpls)),(clone2=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_plugin_info_add_filter_class(plugin_info,filter_class);
     weed_set_double_value(filter_class,"target_fps",25.); // set reasonable default fps
 
     weed_set_int_value(plugin_info,"version",package_version);
@@ -401,7 +401,7 @@
 
 void weed_desetup(void) {
   int k;
-  for (k=0;k<NFONTMAPS;k++) {
+  for (k=0; k<NFONTMAPS; k++) {
     weed_free(font_tables[k].fontname);
     weed_free(font_tables[k].fonttable);
   }

LiVES-2.2.8.tar.bz2/lives-plugins/weed-plugins/log_sig.c -> LiVES-2.4.1.tar.bz2/lives-plugins/weed-plugins/log_sig.c Changed

@@ -24,7 +24,7 @@
 ///////////////////////////////////////////////////////////////////
 
 static int num_versions=1; // number of different weed api versions supported
-static int api_versions[]={131}; // array of weed api versions supported in plugin, in order of preference (most preferred first)
+static int api_versions[]= {131}; // array of weed api versions supported in plugin, in order of preference (most preferred first)
 
 static int package_version=1; // version of this package
 
@@ -42,7 +42,7 @@
 /////////////////////////////////////////////////////////////
 
 
-int logsig_process (weed_plant_t *inst, weed_timecode_t timestamp) {
+int logsig_process(weed_plant_t *inst, weed_timecode_t timestamp) {
   int error;
   weed_plant_t **in_params=weed_get_plantptr_array(inst,"in_parameters",&error);
   weed_plant_t **out_params=weed_get_plantptr_array(inst,"out_parameters",&error);
@@ -50,7 +50,7 @@
 
   register int i;
 
-  for (i=0;i<256;i++) {
+  for (i=0; i<256; i++) {
     if (weed_plant_has_leaf(in_params[i],"value")) {
       fval=weed_get_double_value(in_params[i],"value",&error);
       weed_set_double_value(out_params[i],"value",1./(1.+exp(-fval)));
@@ -64,7 +64,7 @@
 }
 
 
-weed_plant_t *weed_setup (weed_bootstrap_f weed_boot) {
+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);
 
   if (plugin_info!=NULL) {
@@ -78,7 +78,7 @@
     char name[256];
     char label[256];
 
-    for (i=0;i<256;i++) {
+    for (i=0; i<256; i++) {
       snprintf(name,256,"input%03d",i);
       snprintf(label,256,"Input %03d",i);
       in_params[i]=weed_float_init(name,label,0.,-1000000000000.,1000000000000.);
@@ -90,11 +90,11 @@
     out_params[i]=NULL;
 
     filter_class=weed_filter_class_init("log_sig","salsaman",1,0,NULL,&logsig_process,
-					NULL,NULL,NULL,in_params,out_params);
+                                        NULL,NULL,NULL,in_params,out_params);
 
     weed_set_string_value(filter_class,"description","Scales float values between -1.0 and 1.0 using a log-sig function");
 
-    weed_plugin_info_add_filter_class (plugin_info,filter_class);
+    weed_plugin_info_add_filter_class(plugin_info,filter_class);
 
     weed_set_int_value(plugin_info,"version",package_version);
   }

LiVES-2.2.8.tar.bz2/lives-plugins/weed-plugins/mirrors.c -> LiVES-2.4.1.tar.bz2/lives-plugins/weed-plugins/mirrors.c Changed

LiVES-2.2.8.tar.bz2/lives-plugins/weed-plugins/multi_blends.c -> LiVES-2.4.1.tar.bz2/lives-plugins/weed-plugins/multi_blends.c Changed

LiVES-2.2.8.tar.bz2/lives-plugins/weed-plugins/multi_transitions.c -> LiVES-2.4.1.tar.bz2/lives-plugins/weed-plugins/multi_transitions.c Changed

@@ -17,7 +17,7 @@
 ///////////////////////////////////////////////////////////////////
 
 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 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
 
@@ -60,8 +60,7 @@
 
 
 
-static inline uint32_t fastrand(_sdata *sdata)
-{
+static inline uint32_t fastrand(_sdata *sdata) {
 #define rand_a 1073741789L
 #define rand_c 32749L
 
@@ -69,7 +68,7 @@
 }
 
 
-int dissolve_init (weed_plant_t *inst) {
+int dissolve_init(weed_plant_t *inst) {
   int error;
   weed_plant_t *in_channel=weed_get_plantptr_value(inst,"in_channels",&error);
   int width=weed_get_int_value(in_channel,"width",&error);
@@ -80,16 +79,16 @@
 
   sdata=weed_malloc(sizeof(_sdata));
 
-  if (sdata == NULL ) return WEED_ERROR_MEMORY_ALLOCATION;
+  if (sdata == NULL) return WEED_ERROR_MEMORY_ALLOCATION;
 
   sdata->mask=(float *)weed_malloc(width*height*sizeof(float));
 
-  if (sdata->mask == NULL ) return WEED_ERROR_MEMORY_ALLOCATION;
+  if (sdata->mask == NULL) return WEED_ERROR_MEMORY_ALLOCATION;
 
   sdata->fastrand_val=fastrand_seed(0x91FD57B4); // random seed
 
-  for (i=0;i<end;i+=width) {
-    for (j=0;j<width;j++) {
+  for (i=0; i<end; i+=width) {
+    for (j=0; j<width; j++) {
       sdata->mask[i+j]=(float)((double)(sdata->fastrand_val=fastrand(sdata))/(double)UINT32_MAX);
     }
   }
@@ -99,7 +98,7 @@
   return WEED_NO_ERROR;
 }
 
-int dissolve_deinit (weed_plant_t *inst) {
+int dissolve_deinit(weed_plant_t *inst) {
   int error;
   _sdata *sdata=(_sdata *)weed_get_voidptr_value(inst,"plugin_internal",&error);
   if (sdata->mask!=NULL) weed_free(sdata->mask);
@@ -108,9 +107,10 @@
 
 
 
-static int common_process (int type, weed_plant_t *inst, weed_timecode_t timecode) {
+static int common_process(int type, weed_plant_t *inst, weed_timecode_t timecode) {
   int error;
-  weed_plant_t **in_channels=weed_get_plantptr_array(inst,"in_channels",&error),*out_channel=weed_get_plantptr_value(inst,"out_channels",&error);
+  weed_plant_t **in_channels=weed_get_plantptr_array(inst,"in_channels",&error),*out_channel=weed_get_plantptr_value(inst,"out_channels",
+                             &error);
   unsigned char *src1=weed_get_voidptr_value(in_channels[0],"pixel_data",&error);
   unsigned char *src2=weed_get_voidptr_value(in_channels[1],"pixel_data",&error);
   unsigned char *dst=weed_get_voidptr_value(out_channel,"pixel_data",&error);
@@ -173,59 +173,56 @@
     i+=offset;
   }
 
-  for (;src1<end;src1+=irowstride1) {
-    for (j=0;j<width;j+=psize) {
+  for (; src1<end; src1+=irowstride1) {
+    for (j=0; j<width; j+=psize) {
       switch (type) {
       case 0:
-	// iris rectangle
-	xx=(int)hwidth*bfneg+.5;
-	yy=(int)hheight*bfneg+.5;
-	if (j<xx||j>=(width-xx)||i<yy||i>=(height-yy)) {
-	  if (!inplace) weed_memcpy(&dst[j],&src1[j],psize);
-	  else {
-	    if (i>=(height-yy)) {
-	      j=width;
-	      src1=end;
-	      break;
-	    }
-	    if (j>=ihwidth) {
-	      j=width;
-	      break;
-	    }
-	  }
-	}
-	else weed_memcpy(&dst[j],&src2[j],psize);
-	break;
+        // iris rectangle
+        xx=(int)hwidth*bfneg+.5;
+        yy=(int)hheight*bfneg+.5;
+        if (j<xx||j>=(width-xx)||i<yy||i>=(height-yy)) {
+          if (!inplace) weed_memcpy(&dst[j],&src1[j],psize);
+          else {
+            if (i>=(height-yy)) {
+              j=width;
+              src1=end;
+              break;
+            }
+            if (j>=ihwidth) {
+              j=width;
+              break;
+            }
+          }
+        } else weed_memcpy(&dst[j],&src2[j],psize);
+        break;
       case 1:
-	//iris circle
-	xxf=(float)(i-ihheight);
-	yyf=(float)(j-ihwidth)/(float)psize;
-	if (sqrt((xxf*xxf+yyf*yyf)/maxradsq)>bf) {
-	  if (!inplace) weed_memcpy(&dst[j],&src1[j],psize);
-	  else {
-	    if (yyf>=0) {
-	      j=width;
-	      if (xxf>0&&yyf==0) src1=end;
-	      break;
-	    }
-	  }
-	}
-	else weed_memcpy(&dst[j],&src2[j],psize);
-	break;
+        //iris circle
+        xxf=(float)(i-ihheight);
+        yyf=(float)(j-ihwidth)/(float)psize;
+        if (sqrt((xxf*xxf+yyf*yyf)/maxradsq)>bf) {
+          if (!inplace) weed_memcpy(&dst[j],&src1[j],psize);
+          else {
+            if (yyf>=0) {
+              j=width;
+              if (xxf>0&&yyf==0) src1=end;
+              break;
+            }
+          }
+        } else weed_memcpy(&dst[j],&src2[j],psize);
+        break;
       case 2:
-	// four way split
-	if (abs(i-hheight)/hheight<bf||abs(j-hwidth)/hwidth<bf||bf==1.f) {
-	  weed_memcpy(&dst[j],&src2[j],psize);
-	}
-	else {
-	  weed_memcpy(&dst[j],&src1[j+(j>ihwidth?-yy:yy)+(i>ihheight?-xx:xx)],psize);
-	}
-	break;
+        // four way split
+        if (abs(i-hheight)/hheight<bf||abs(j-hwidth)/hwidth<bf||bf==1.f) {
+          weed_memcpy(&dst[j],&src2[j],psize);
+        } else {
+          weed_memcpy(&dst[j],&src1[j+(j>ihwidth?-yy:yy)+(i>ihheight?-xx:xx)],psize);
+        }
+        break;
       case 3:
-	// dissolve
-	if (sdata->mask[(i*width+j)/psize]<bf) weed_memcpy(&dst[j],&src2[j],psize);
-	else if (!inplace) weed_memcpy(&dst[j],&src1[j],psize);
-	break;
+        // dissolve
+        if (sdata->mask[(i*width+j)/psize]<bf) weed_memcpy(&dst[j],&src2[j],psize);
+        else if (!inplace) weed_memcpy(&dst[j],&src1[j],psize);
+        break;
       }
 
     }
@@ -238,42 +235,44 @@
 }
 
 
-int irisr_process (weed_plant_t *inst, weed_timecode_t timestamp) {
+int irisr_process(weed_plant_t *inst, weed_timecode_t timestamp) {
   return common_process(0,inst,timestamp);
 }
 
-int irisc_process (weed_plant_t *inst, weed_timecode_t timestamp) {
+int irisc_process(weed_plant_t *inst, weed_timecode_t timestamp) {
   return common_process(1,inst,timestamp);
 }
 
-int fourw_process (weed_plant_t *inst, weed_timecode_t timestamp) {
+int fourw_process(weed_plant_t *inst, weed_timecode_t timestamp) {
   return common_process(2,inst,timestamp);
 }
 
-int dissolve_process (weed_plant_t *inst, weed_timecode_t timestamp) {
+int dissolve_process(weed_plant_t *inst, weed_timecode_t timestamp) {
   return common_process(3,inst,timestamp);
 }
 
 
 
-weed_plant_t *weed_setup (weed_bootstrap_f weed_boot) {
+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};
-    weed_plant_t *out_chantmpls[]={weed_channel_template_init("out channel 0",WEED_CHANNEL_CAN_DO_INPLACE,palette_list),NULL};
-    weed_plant_t *in_params1[]={weed_float_init("amount","_Transition",0.,0.,1.),NULL};
+    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};
+    weed_plant_t *out_chantmpls[]= {weed_channel_template_init("out channel 0",WEED_CHANNEL_CAN_DO_INPLACE,palette_list),NULL};
+    weed_plant_t *in_params1[]= {weed_float_init("amount","_Transition",0.,0.,1.),NULL};
 
-    weed_plant_t *filter_class=weed_filter_class_init("iris rectangle","salsaman",1,WEED_FILTER_HINT_IS_STATELESS|WEED_FILTER_HINT_MAY_THREAD,NULL,irisr_process,NULL,in_chantmpls,out_chantmpls,in_params1,NULL);
+    weed_plant_t *filter_class=weed_filter_class_init("iris rectangle","salsaman",1,WEED_FILTER_HINT_IS_STATELESS|WEED_FILTER_HINT_MAY_THREAD,
+                               NULL,irisr_process,NULL,in_chantmpls,out_chantmpls,in_params1,NULL);
 
     weed_set_boolean_value(in_params1[0],"transition",WEED_TRUE);
 
-    weed_plugin_info_add_filter_class (plugin_info,filter_class);
+    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|WEED_FILTER_HINT_MAY_THREAD,NULL,irisc_process,NULL,(clone1=weed_clone_plants(in_chantmpls)),(clone2=weed_clone_plants(out_chantmpls)),(clone3=weed_clone_plants(in_params1)),NULL);
-    weed_plugin_info_add_filter_class (plugin_info,filter_class);
+    filter_class=weed_filter_class_init("iris circle","salsaman",1,WEED_FILTER_HINT_IS_STATELESS|WEED_FILTER_HINT_MAY_THREAD,NULL,irisc_process,
+                                        NULL,(clone1=weed_clone_plants(in_chantmpls)),(clone2=weed_clone_plants(out_chantmpls)),(clone3=weed_clone_plants(in_params1)),NULL);
+    weed_plugin_info_add_filter_class(plugin_info,filter_class);
     weed_free(clone1);
     weed_free(clone2);
     weed_free(clone3);
@@ -281,17 +280,20 @@
 
     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|WEED_FILTER_HINT_MAY_THREAD,NULL,fourw_process,NULL,(clone1=weed_clone_plants(in_chantmpls)),(clone2=weed_clone_plants(out_chantmpls)),(clone3=weed_clone_plants(in_params1)),NULL);
-    weed_plugin_info_add_filter_class (plugin_info,filter_class);
+    filter_class=weed_filter_class_init("4 way split","salsaman",1,WEED_FILTER_HINT_IS_STATELESS|WEED_FILTER_HINT_MAY_THREAD,NULL,fourw_process,
+                                        NULL,(clone1=weed_clone_plants(in_chantmpls)),(clone2=weed_clone_plants(out_chantmpls)),(clone3=weed_clone_plants(in_params1)),NULL);
+    weed_plugin_info_add_filter_class(plugin_info,filter_class);
     weed_free(clone1);
     weed_free(clone2);
     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|WEED_FILTER_HINT_MAY_THREAD,dissolve_init,dissolve_process,dissolve_deinit,(clone1=weed_clone_plants(in_chantmpls)),(clone2=weed_clone_plants(out_chantmpls)),(clone3=weed_clone_plants(in_params1)),NULL);
-    weed_plugin_info_add_filter_class (plugin_info,filter_class);
+
+    filter_class=weed_filter_class_init("dissolve","salsaman",1,WEED_FILTER_HINT_IS_STATELESS|WEED_FILTER_HINT_MAY_THREAD,dissolve_init,
+                                        dissolve_process,dissolve_deinit,(clone1=weed_clone_plants(in_chantmpls)),(clone2=weed_clone_plants(out_chantmpls)),
+                                        (clone3=weed_clone_plants(in_params1)),NULL);
+    weed_plugin_info_add_filter_class(plugin_info,filter_class);
     weed_free(clone1);
     weed_free(clone2);
     weed_free(clone3);

LiVES-2.2.8.tar.bz2/lives-plugins/weed-plugins/negate.c -> LiVES-2.4.1.tar.bz2/lives-plugins/weed-plugins/negate.c Changed

LiVES-2.2.8.tar.bz2/lives-plugins/weed-plugins/nn_programmer.c -> LiVES-2.4.1.tar.bz2/lives-plugins/weed-plugins/nn_programmer.c Changed

LiVES-2.2.8.tar.bz2/lives-plugins/weed-plugins/noise.c -> LiVES-2.4.1.tar.bz2/lives-plugins/weed-plugins/noise.c Changed

LiVES-2.2.8.tar.bz2/lives-plugins/weed-plugins/onedTV.c -> LiVES-2.4.1.tar.bz2/lives-plugins/weed-plugins/onedTV.c Changed

@@ -30,7 +30,7 @@
 ///////////////////////////////////////////////////////////////////
 
 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 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
 
@@ -67,13 +67,13 @@
 int oned_init(weed_plant_t *inst) {
   struct _sdata *sdata;
   int map_w,map_h;
-  
+
   weed_plant_t *in_channel;
   int error;
 
   sdata=weed_malloc(sizeof(struct _sdata));
 
-  if(sdata == NULL ) return WEED_ERROR_MEMORY_ALLOCATION;
+  if (sdata == NULL) return WEED_ERROR_MEMORY_ALLOCATION;
 
   in_channel=weed_get_plantptr_value(inst,"in_channels",&error);
 
@@ -81,7 +81,7 @@
   map_w=weed_get_int_value(in_channel,"width",&error);
 
   sdata->linebuf = weed_malloc(map_w*map_w*sizeof(RGB32));
-  if(sdata->linebuf == NULL ) {
+  if (sdata->linebuf == NULL) {
     weed_free(sdata);
     return WEED_ERROR_MEMORY_ALLOCATION;
   }
@@ -119,7 +119,7 @@
 }
 
 
-int oned_process (weed_plant_t *inst, weed_timecode_t timestamp) {
+int oned_process(weed_plant_t *inst, weed_timecode_t timestamp) {
   weed_plant_t *in_channel,*out_channel;
   struct _sdata *sdata;
   RGB32 *src,*odest,*dest;
@@ -148,17 +148,17 @@
   blitline(src,sdata->linebuf,width,irow,sdata);
 
   sdata->line++;
-  if(sdata->line >= height)
+  if (sdata->line >= height)
     sdata->line = 0;
 
-  for (i=0;i<height;i++) {
+  for (i=0; i<height; i++) {
     weed_memcpy(dest,sdata->linebuf+offs,width*4);
     dest+=orow;
     offs+=width;
   }
 
   dest = odest + orow * sdata->line;
-  for(i=0; i<width; i++) {
+  for (i=0; i<width; i++) {
     dest[i] = 0xff00ff00;
   }
   return WEED_NO_ERROR;
@@ -166,16 +166,17 @@
 
 
 
-weed_plant_t *weed_setup (weed_bootstrap_f weed_boot) {
+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);
   if (plugin_info!=NULL) {
-    int palette_list[]={WEED_PALETTE_RGBA32,WEED_PALETTE_END};
+    int palette_list[]= {WEED_PALETTE_RGBA32,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",0,palette_list),NULL};
-    weed_plant_t *filter_class=weed_filter_class_init("onedTV","effectTV",1,0,&oned_init,&oned_process,&oned_deinit,in_chantmpls,out_chantmpls,NULL,NULL);
+    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",0,palette_list),NULL};
+    weed_plant_t *filter_class=weed_filter_class_init("onedTV","effectTV",1,0,&oned_init,&oned_process,&oned_deinit,in_chantmpls,out_chantmpls,
+                               NULL,NULL);
 
-    weed_plugin_info_add_filter_class (plugin_info,filter_class);
+    weed_plugin_info_add_filter_class(plugin_info,filter_class);
 
     weed_set_int_value(plugin_info,"version",package_version);
   }

LiVES-2.2.8.tar.bz2/lives-plugins/weed-plugins/palette_test.c -> LiVES-2.4.1.tar.bz2/lives-plugins/weed-plugins/palette_test.c Changed

LiVES-2.2.8.tar.bz2/lives-plugins/weed-plugins/plasma.c -> LiVES-2.4.1.tar.bz2/lives-plugins/weed-plugins/plasma.c Changed

LiVES-2.2.8.tar.bz2/lives-plugins/weed-plugins/posterise.c -> LiVES-2.4.1.tar.bz2/lives-plugins/weed-plugins/posterise.c Changed

LiVES-2.2.8.tar.bz2/lives-plugins/weed-plugins/projectM-ConfigFile.h -> LiVES-2.4.1.tar.bz2/lives-plugins/weed-plugins/projectM-ConfigFile.h Changed

@@ -3,17 +3,17 @@
 // Richard J. Wagner  v2.1  24 May 2004  wagnerr@umich.edu
 
 // Copyright (c) 2004 Richard J. Wagner
-// 
+//
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to
 // deal in the Software without restriction, including without limitation the
 // rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
 // sell copies of the Software, and to permit persons to whom the Software is
 // furnished to do so, subject to the following conditions:
-// 
+//
 // The above copyright notice and this permission notice shall be included in
 // all copies or substantial portions of the Software.
-// 
+//
 // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 // IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
 // FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
@@ -24,12 +24,12 @@
 
 // Typical usage
 // -------------
-// 
+//
 // Given a configuration file "settings.inp":
 //   atoms  = 25
 //   length = 8.0  # nanometers
 //   name = Reece Surcher
-// 
+//
 // Named values are read in various ways, with or without default values:
 //   ConfigFile config( "settings.inp" );
 //   int atoms = config.read<int>( "atoms" );
@@ -37,7 +37,7 @@
 //   string author, title;
 //   config.readInto( author, "name" );
 //   config.readInto( title, "title", string("Untitled") );
-// 
+//
 // See file example.cpp for more examples.
 
 #ifndef CONFIGFILE_H
@@ -52,183 +52,188 @@
 using std::string;
 
 class ConfigFile {
-// Data
+  // Data
 protected:
-	string myDelimiter;  // separator between key and value
-	string myComment;    // separator between value and comments
-	string mySentry;     // optional string to signal end of file
-	std::map<string,string> myContents;  // extracted keys and values
-	
-	typedef std::map<string,string>::iterator mapi;
-	typedef std::map<string,string>::const_iterator mapci;
-
-// Methods
+  string myDelimiter;  // separator between key and value
+  string myComment;    // separator between value and comments
+  string mySentry;     // optional string to signal end of file
+  std::map<string,string> myContents;  // extracted keys and values
+
+  typedef std::map<string,string>::iterator mapi;
+  typedef std::map<string,string>::const_iterator mapci;
+
+  // Methods
 public:
-	ConfigFile( string filename,
-	            string delimiter = "=",
-	            string comment = "#",
-				string sentry = "EndConfigFile" );
-	ConfigFile();
-	
-	// Search for key and read value or optional default value
-	template<class T> T read( const string& key ) const;  // call as read<T>
-	template<class T> T read( const string& key, const T& value ) const;
-	template<class T> bool readInto( T& var, const string& key ) const;
-	template<class T>
-	bool readInto( T& var, const string& key, const T& value ) const;
-	
-	// Modify keys and values
-	template<class T> void add( string key, const T& value );
-	void remove( const string& key );
-	
-	// Check whether key exists in configuration
-	bool keyExists( const string& key ) const;
-	
-	// Check or change configuration syntax
-	string getDelimiter() const { return myDelimiter; }
-	string getComment() const { return myComment; }
-	string getSentry() const { return mySentry; }
-	string setDelimiter( const string& s )
-		{ string old = myDelimiter;  myDelimiter = s;  return old; }  
-	string setComment( const string& s )
-		{ string old = myComment;  myComment = s;  return old; }
-	
-	// Write or read configuration
-	friend std::ostream& operator<<( std::ostream& os, const ConfigFile& cf );
-	friend std::istream& operator>>( std::istream& is, ConfigFile& cf );
-	
+  ConfigFile(string filename,
+             string delimiter = "=",
+             string comment = "#",
+             string sentry = "EndConfigFile");
+  ConfigFile();
+
+  // Search for key and read value or optional default value
+  template<class T> T read(const string &key) const;    // call as read<T>
+  template<class T> T read(const string &key, const T &value) const;
+  template<class T> bool readInto(T &var, const string &key) const;
+  template<class T>
+  bool readInto(T &var, const string &key, const T &value) const;
+
+  // Modify keys and values
+  template<class T> void add(string key, const T &value);
+  void remove(const string &key);
+
+  // Check whether key exists in configuration
+  bool keyExists(const string &key) const;
+
+  // Check or change configuration syntax
+  string getDelimiter() const {
+    return myDelimiter;
+  }
+  string getComment() const {
+    return myComment;
+  }
+  string getSentry() const {
+    return mySentry;
+  }
+  string setDelimiter(const string &s) {
+    string old = myDelimiter;
+    myDelimiter = s;
+    return old;
+  }
+  string setComment(const string &s) {
+    string old = myComment;
+    myComment = s;
+    return old;
+  }
+
+  // Write or read configuration
+  friend std::ostream &operator<<(std::ostream &os, const ConfigFile &cf);
+  friend std::istream &operator>>(std::istream &is, ConfigFile &cf);
+
 protected:
-	template<class T> static string T_as_string( const T& t );
-	template<class T> static T string_as_T( const string& s );
-	static void trim( string& s );
+  template<class T> static string T_as_string(const T &t);
+  template<class T> static T string_as_T(const string &s);
+  static void trim(string &s);
 
 
-// Exception types
+  // Exception types
 public:
-	struct file_not_found {
-		string filename;
-		file_not_found( const string& filename_ = string() )
-			: filename(filename_) {} };
-	struct key_not_found {  // thrown only by T read(key) variant of read()
-		string key;
-		key_not_found( const string& key_ = string() )
-			: key(key_) {} };
+  struct file_not_found {
+    string filename;
+    file_not_found(const string &filename_ = string())
+      : filename(filename_) {}
+  };
+  struct key_not_found {  // thrown only by T read(key) variant of read()
+    string key;
+    key_not_found(const string &key_ = string())
+      : key(key_) {}
+  };
 };
 
 
 /* static */
 template<class T>
-string ConfigFile::T_as_string( const T& t )
-{
-	// Convert from a T to a string
-	// Type T must support << operator
-	std::ostringstream ost;
-	ost << t;
-	return ost.str();
+string ConfigFile::T_as_string(const T &t) {
+  // Convert from a T to a string
+  // Type T must support << operator
+  std::ostringstream ost;
+  ost << t;
+  return ost.str();
 }
 
 
 /* static */
 template<class T>
-T ConfigFile::string_as_T( const string& s )
-{
-	// Convert from a string to a T
-	// Type T must support >> operator
-	T t;
-	std::istringstream ist(s);
-	ist >> t;
-	return t;
+T ConfigFile::string_as_T(const string &s) {
+  // Convert from a string to a T
+  // Type T must support >> operator
+  T t;
+  std::istringstream ist(s);
+  ist >> t;
+  return t;
 }
 
 
 /* static */
 template<>
-inline string ConfigFile::string_as_T<string>( const string& s )
-{
-	// Convert from a string to a string
-	// In other words, do nothing
-	return s;
+inline string ConfigFile::string_as_T<string>(const string &s) {
+  // Convert from a string to a string
+  // In other words, do nothing
+  return s;
 }
 
 
 /* static */
 template<>
-inline bool ConfigFile::string_as_T<bool>( const string& s )
-{
-	// Convert from a string to a bool
-	// Interpret "false", "F", "no", "n", "0" as false
-	// Interpret "true", "T", "yes", "y", "1", "-1", or anything else as true
-	bool b = true;
-	string sup = s;
-	for( string::iterator p = sup.begin(); p != sup.end(); ++p )
-		*p = toupper(*p);  // make string all caps
-	if( sup==string("FALSE") || sup==string("F") ||
-	    sup==string("NO") || sup==string("N") ||
-	    sup==string("0") || sup==string("NONE") )
-		b = false;
-	return b;
+inline bool ConfigFile::string_as_T<bool>(const string &s) {
+  // Convert from a string to a bool
+  // Interpret "false", "F", "no", "n", "0" as false
+  // Interpret "true", "T", "yes", "y", "1", "-1", or anything else as true
+  bool b = true;
+  string sup = s;
+  for (string::iterator p = sup.begin(); p != sup.end(); ++p)
+    *p = toupper(*p);  // make string all caps
+  if (sup==string("FALSE") || sup==string("F") ||
+      sup==string("NO") || sup==string("N") ||
+      sup==string("0") || sup==string("NONE"))
+    b = false;
+  return b;
 }
 
 
 template<class T>
-T ConfigFile::read( const string& key ) const
-{
-	// Read the value corresponding to key
-	mapci p = myContents.find(key);
-	if( p == myContents.end() ) throw key_not_found(key);
-	return string_as_T<T>( p->second );
+T ConfigFile::read(const string &key) const {
+  // Read the value corresponding to key
+  mapci p = myContents.find(key);
+  if (p == myContents.end()) throw key_not_found(key);
+  return string_as_T<T>(p->second);
 }
 
 
 template<class T>
-T ConfigFile::read( const string& key, const T& value ) const
-{
-	// Return the value corresponding to key or given default value
-	// if key is not found
-	mapci p = myContents.find(key);
-	if( p == myContents.end() ) return value;
-	return string_as_T<T>( p->second );
+T ConfigFile::read(const string &key, const T &value) const {
+  // Return the value corresponding to key or given default value
+  // if key is not found
+  mapci p = myContents.find(key);
+  if (p == myContents.end()) return value;
+  return string_as_T<T>(p->second);
 }
 
 
 template<class T>
-bool ConfigFile::readInto( T& var, const string& key ) const
-{
-	// Get the value corresponding to key and store in var
-	// Return true if key is found
-	// Otherwise leave var untouched
-	mapci p = myContents.find(key);
-	bool found = ( p != myContents.end() );
-	if( found ) var = string_as_T<T>( p->second );
-	return found;
+bool ConfigFile::readInto(T &var, const string &key) const {
+  // Get the value corresponding to key and store in var
+  // Return true if key is found
+  // Otherwise leave var untouched
+  mapci p = myContents.find(key);
+  bool found = (p != myContents.end());
+  if (found) var = string_as_T<T>(p->second);
+  return found;
 }
 
 
 template<class T>
-bool ConfigFile::readInto( T& var, const string& key, const T& value ) const
-{
-	// Get the value corresponding to key and store in var
-	// Return true if key is found
-	// Otherwise set var to given default
-	mapci p = myContents.find(key);
-	bool found = ( p != myContents.end() );
-	if( found )
-		var = string_as_T<T>( p->second );
-	else
-		var = value;
-	return found;
+bool ConfigFile::readInto(T &var, const string &key, const T &value) const {
+  // Get the value corresponding to key and store in var
+  // Return true if key is found
+  // Otherwise set var to given default
+  mapci p = myContents.find(key);
+  bool found = (p != myContents.end());
+  if (found)
+    var = string_as_T<T>(p->second);
+  else
+    var = value;
+  return found;
 }
 
 
 template<class T>
-void ConfigFile::add( string key, const T& value )
-{
-	// Add a key with given value
-	string v = T_as_string( value );
-	trim(key);
-	trim(v);
-	myContents[key] = v;
-	return;
+void ConfigFile::add(string key, const T &value) {
+  // Add a key with given value
+  string v = T_as_string(value);
+  trim(key);
+  trim(v);
+  myContents[key] = v;
+  return;
 }
 
 #endif  // CONFIGFILE_H
@@ -238,13 +243,13 @@
 //   + First release
 //   + Template read() access only through non-member readConfigFile()
 //   + ConfigurationFileBool is only built-in helper class
-// 
+//
 // v2.0  3 May 2002
 //   + Shortened name from ConfigurationFile to ConfigFile
 //   + Implemented template member functions
 //   + Changed default comment separator from % to #
 //   + Enabled reading of multiple-line values
-// 
+//
 // v2.1  24 May 2004
 //   + Made template specializations inline to avoid compiler-dependent linkage
 //   + Allowed comments within multiple-line values

LiVES-2.2.8.tar.bz2/lives-plugins/weed-plugins/projectM.cpp -> LiVES-2.4.1.tar.bz2/lives-plugins/weed-plugins/projectM.cpp Changed

@@ -48,6 +48,8 @@
 
 #include <pthread.h>
 
+#include <limits.h>
+
 #include "projectM-ConfigFile.h"
 #include "projectM-getConfigFilename.h"
 
@@ -387,6 +389,8 @@
     weed_set_string_array(iparamgui,"choices",sd->nprs,(char **)sd->prnames);
   }
 
+  sd->nprs--;
+
   sd->rendering=true;
 
   weed_set_voidptr_value(inst,"plugin_internal",sd);
@@ -446,7 +450,14 @@
 
   if (sd->update_size||sd->fbuffer==NULL) return WEED_NO_ERROR;
 
-  sd->pidx=weed_get_int_value(inparam,"value",&error)-1;
+  // ex. nprs = 10, we have 10 programs 0 - 9 and -1 is random
+  // 0 - 10, we just subtract 1
+  // else (val - 1) % nprs .e.g 11 - 1 = 10, 10 % 10 = 0
+
+  sd->pidx=weed_get_int_value(inparam,"value",&error);
+
+  if (sd->pidx<=sd->nprs) sd->pidx--;
+  else sd->pidx=(sd->pidx-1) % sd->nprs;
 
   if (0) {
     projectMEvent evt;
@@ -536,6 +547,8 @@
 
     //weed_set_int_value(in_params[0],"flags",WEED_PARAMETER_REINIT_ON_VALUE_CHANGE);
 
+    weed_set_int_value(in_params[0],"max",INT_MAX);
+
     weed_set_int_value(in_chantmpls[0],"audio_channels",1);
     weed_set_boolean_value(in_chantmpls[0],"audio_interleaf",WEED_TRUE);
     weed_set_boolean_value(in_chantmpls[0],"optional",WEED_TRUE);

LiVES-2.2.8.tar.bz2/lives-plugins/weed-plugins/randomiser.c -> LiVES-2.4.1.tar.bz2/lives-plugins/weed-plugins/randomiser.c Changed

LiVES-2.2.8.tar.bz2/lives-plugins/weed-plugins/revTV.c -> LiVES-2.4.1.tar.bz2/lives-plugins/weed-plugins/revTV.c Changed

LiVES-2.2.8.tar.bz2/lives-plugins/weed-plugins/rippleTV.c -> LiVES-2.4.1.tar.bz2/lives-plugins/weed-plugins/rippleTV.c Changed

@@ -29,7 +29,7 @@
 ///////////////////////////////////////////////////////////////////
 
 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 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
 
@@ -89,8 +89,7 @@
 
 
 
-static void image_bgset_y(RGB32 *src, int width, int height, int rowstride, struct _sdata *sdata)
-{
+static void image_bgset_y(RGB32 *src, int width, int height, int rowstride, struct _sdata *sdata) {
   register int i,j;
   int R, G, B;
   RGB32 *p;
@@ -100,8 +99,8 @@
 
   p = src;
   q = sdata->background;
-  for(i=0; i<height; i++) {
-    for (j=0;j<width;j++) {
+  for (i=0; i<height; i++) {
+    for (j=0; j<width; j++) {
       R = ((*p)&0xff0000)>>(16-1);
       G = ((*p)&0xff00)>>(8-2);
       B = (*p)&0xff;
@@ -122,21 +121,21 @@
   short *q;
   unsigned char *r;
   int v;
-  
+
   rowstride-=width;
 
   p = src;
   q = sdata->background;
   r = sdata->diff;
-  for(i=0; i<height; i++) {
-    for (j=0;j<width;j++) {
+  for (i=0; i<height; i++) {
+    for (j=0; j<width; j++) {
       R = ((*p)&0xff0000)>>(16-1);
       G = ((*p)&0xff00)>>(8-2);
       B = (*p)&0xff;
       v = (R + G + B) - (int)(*q);
       *q = (short)(R + G + B);
       *r = ((v + sdata->threshold)>>24) | ((sdata->threshold - v)>>24);
-      
+
       p++;
       q++;
       r++;
@@ -148,8 +147,7 @@
 
 /////////////////////////////////////////////////////
 
-static inline uint32_t fastrand(struct _sdata *sdata)
-{
+static inline uint32_t fastrand(struct _sdata *sdata) {
 #define rand_a 1073741789L
 #define rand_c 32749L
 
@@ -157,30 +155,28 @@
 }
 
 
-static void setTable(void)
-{
+static void setTable(void) {
   int i;
-  
-  for(i=0; i<128; i++) {
+
+  for (i=0; i<128; i++) {
     sqrtable[i] = i*i;
   }
-  for(i=1; i<=128; i++) {
+  for (i=1; i<=128; i++) {
     sqrtable[256-i] = -i*i;
   }
 }
 
-static int setBackground(RGB32 *src, int width, int height, int rowstride, struct _sdata *sdata)
-{
+static int setBackground(RGB32 *src, int width, int height, int rowstride, struct _sdata *sdata) {
   image_bgset_y(src, width, height, rowstride, sdata);
   sdata->bgIsSet = 1;
-  
+
   return 0;
 }
 
 
 /////////////////////////////////////////////////////////////
 
-int ripple_init (weed_plant_t *inst) {
+int ripple_init(weed_plant_t *inst) {
   int map_h;
   int map_w;
   struct _sdata *sdata;
@@ -189,7 +185,7 @@
   int error;
 
   sdata=weed_malloc(sizeof(struct _sdata));
-  if(sdata == NULL) return WEED_ERROR_MEMORY_ALLOCATION;
+  if (sdata == NULL) return WEED_ERROR_MEMORY_ALLOCATION;
 
   in_channel=weed_get_plantptr_value(inst,"in_channels",&error);
 
@@ -197,25 +193,25 @@
   map_w=weed_get_int_value(in_channel,"width",&error);
 
   sdata->map = (int *)weed_malloc(map_h*map_w*3*sizeof(int));
-  if(sdata->map == NULL ) {
+  if (sdata->map == NULL) {
     weed_free(sdata);
     return WEED_ERROR_MEMORY_ALLOCATION;
   }
   sdata->vtable = (signed char *)weed_malloc(map_h*map_w*2*sizeof(signed char));
-  if(sdata->vtable == NULL ) {
+  if (sdata->vtable == NULL) {
     weed_free(sdata->map);
     weed_free(sdata);
     return WEED_ERROR_MEMORY_ALLOCATION;
   }
   sdata->background = (short *)weed_malloc(map_h*map_w*sizeof(short));
-  if(sdata->background == NULL ) {
+  if (sdata->background == NULL) {
     weed_free(sdata->vtable);
     weed_free(sdata->map);
     weed_free(sdata);
     return WEED_ERROR_MEMORY_ALLOCATION;
   }
   sdata->diff = (unsigned char *)weed_malloc(map_h*map_w * 4 * sizeof(unsigned char));
-  if(sdata->diff == NULL ) {
+  if (sdata->diff == NULL) {
     weed_free(sdata->background);
     weed_free(sdata->vtable);
     weed_free(sdata->map);
@@ -239,7 +235,7 @@
 }
 
 
-int ripple_deinit (weed_plant_t *inst) {
+int ripple_deinit(weed_plant_t *inst) {
   int error;
   struct _sdata *sdata;
 
@@ -256,14 +252,13 @@
 }
 
 
-static void motiondetect(RGB32 *src, int width, int height, int rowstride, struct _sdata *sdata)
-{
+static void motiondetect(RGB32 *src, int width, int height, int rowstride, struct _sdata *sdata) {
   unsigned char *diff;
   int *p, *q;
   register int x, y;
   int h;
-  
-  if(!sdata->bgIsSet) {
+
+  if (!sdata->bgIsSet) {
     setBackground(src,width,height,rowstride,sdata);
   }
   image_bgsubtract_update_y(src,width,height,rowstride,sdata);
@@ -273,12 +268,12 @@
   q = sdata->map2+width+1;
   diff += width+2;
 
-  for(y=height-2; y>0; y--) {
-    for(x=width-2; x>0; x--) {
+  for (y=height-2; y>0; y--) {
+    for (x=width-2; x>0; x--) {
       h = (int)*diff + (int)*(diff+1) + (int)*(diff+width) + (int)*(diff+width+1);
-      if(h>0) {
-	*p = h<<(point + impact - 8);
-	*q = *p;
+      if (h>0) {
+        *p = h<<(point + impact - 8);
+        *q = *p;
       }
       p++;
       q++;
@@ -292,8 +287,7 @@
 
 
 
-static inline void drop(int power, int width, int height, struct _sdata *sdata)
-{
+static inline void drop(int power, int width, int height, struct _sdata *sdata) {
   int x, y;
   int *p, *q;
 
@@ -309,13 +303,12 @@
   *(q-width-1) = *(q-width+1) = *(q+width-1) = *(p+width+1) = power/4;
 }
 
-static void raindrop(int width, int height, struct _sdata *sdata)
-{
-  
+static void raindrop(int width, int height, struct _sdata *sdata) {
+
   int i;
-  
-  if(period == 0) {
-    switch(rain_stat) {
+
+  if (period == 0) {
+    switch (rain_stat) {
     case 0:
       period = (fastrand(sdata)>>23)+100;
       drop_prob = 0;
@@ -354,13 +347,13 @@
       break;
     }
   }
-  switch(rain_stat) {
+  switch (rain_stat) {
   default:
   case 0:
     break;
   case 1:
   case 5:
-    if((fastrand(sdata)>>8)<drop_prob) {
+    if ((fastrand(sdata)>>8)<drop_prob) {
       drop(drop_power,width,height,sdata);
     }
     drop_prob += drop_prob_increment;
@@ -368,7 +361,7 @@
   case 2:
   case 3:
   case 4:
-    for(i=drops_per_frame/16; i>0; i--) {
+    for (i=drops_per_frame/16; i>0; i--) {
       drop(drop_power,width,height,sdata);
     }
     drops_per_frame += drop_prob_increment;
@@ -379,7 +372,7 @@
 
 
 
-int ripple_process (weed_plant_t *inst, weed_timecode_t timestamp) {
+int ripple_process(weed_plant_t *inst, weed_timecode_t timestamp) {
   register int x, y, i;
   int dx, dy;
   int h, v;
@@ -415,47 +408,47 @@
   mode=weed_get_int_value(in_param,"value",&error);
 
   /* impact from the motion or rain drop */
-  if(mode) {
+  if (mode) {
     raindrop(width,height,sdata);
   } else {
     motiondetect(src,width,height,irowstride,sdata);
   }
-  
+
   /* simulate surface wave */
-	
+
   /* This function is called only 30 times per second. To increase a speed
    * of wave, iterates this loop several times. */
-  for(i=loopnum; i>0; i--) {
+  for (i=loopnum; i>0; i--) {
     /* wave simulation */
     p = sdata->map1 + width + 1;
     q = sdata->map2 + width + 1;
     r = sdata->map3 + width + 1;
-    for(y=height-2; y>0; y--) {
-      for(x=width-2; x>0; x--) {
-	h = *(p-width-1) + *(p-width+1) + *(p+width-1) + *(p+width+1)
-	  + *(p-width) + *(p-1) + *(p+1) + *(p+width) - (*p)*9;
-	h = h >> 3;
-	v = *p - *q;
-	v += h - (v >> decay);
-	*r = v + *p;
-	p++;
-	q++;
-	r++;
+    for (y=height-2; y>0; y--) {
+      for (x=width-2; x>0; x--) {
+        h = *(p-width-1) + *(p-width+1) + *(p+width-1) + *(p+width+1)
+            + *(p-width) + *(p-1) + *(p+1) + *(p+width) - (*p)*9;
+        h = h >> 3;
+        v = *p - *q;
+        v += h - (v >> decay);
+        *r = v + *p;
+        p++;
+        q++;
+        r++;
       }
       p += 2;
       q += 2;
       r += 2;
     }
-    
+
     /* low pass filter */
     p = sdata->map3 + width + 1;
     q = sdata->map2 + width + 1;
-    for(y=height-2; y>0; y--) {
-      for(x=width-2; x>0; x--) {
-	h = *(p-width) + *(p-1) + *(p+1) + *(p+width) + (*p)*60;
-	*q = h >> 6;
-	p++;
-	q++;
+    for (y=height-2; y>0; y--) {
+      for (x=width-2; x>0; x--) {
+        h = *(p-width) + *(p-1) + *(p+1) + *(p+width) + (*p)*60;
+        *q = h >> 6;
+        p++;
+        q++;
       }
       p+=2;
       q+=2;
@@ -468,44 +461,44 @@
 
   vp = sdata->vtable;
   p = sdata->map1;
-  for(y=height-1; y>0; y--) {
-    for(x=width-1; x>0; x--) {
+  for (y=height-1; y>0; y--) {
+    for (x=width-1; x>0; x--) {
       /* difference of the height between two voxel. They are twiced to
        * emphasise the wave. */
-      vp[0] = sqrtable[((p[0] - p[1])>>(point-1))&0xff]; 
-      vp[1] = sqrtable[((p[0] - p[width])>>(point-1))&0xff]; 
+      vp[0] = sqrtable[((p[0] - p[1])>>(point-1))&0xff];
+      vp[1] = sqrtable[((p[0] - p[width])>>(point-1))&0xff];
       p++;
       vp+=2;
     }
     p++;
     vp+=2;
   }
-  
+
   vp = sdata->vtable;
 
   /* draw refracted image. The vector table is stretched. */
-  for(y=0; y<height-2; y+=2) {
-    for(x=0; x<width; x+=2) {
+  for (y=0; y<height-2; y+=2) {
+    for (x=0; x<width; x+=2) {
       h = (int)vp[0];
       v = (int)vp[1];
       dx = x + h;
       dy = y + v;
-      if(dx<0) dx=0;
-      if(dy<0) dy=0;
-      if(dx>=width) dx=width-1;
-      if(dy>=height) dy=height-1;
+      if (dx<0) dx=0;
+      if (dy<0) dy=0;
+      if (dx>=width) dx=width-1;
+      if (dy>=height) dy=height-1;
       dest[0] = src[dy*irowstride+dx];
-      
+
       i = dx;
-      
+
       dx = x + 1 + (h+(int)vp[2])/2;
-      if(dx<0) dx=0;
-      if(dx>=width) dx=width-1;
+      if (dx<0) dx=0;
+      if (dx>=width) dx=width-1;
       dest[1] = src[dy*irowstride+dx];
-      
+
       dy = y + 1 + (v+(int)vp[width*2+1])/2;
-      if(dy<0) dy=0;
-      if(dy>=height) dy=height-1;
+      if (dy<0) dy=0;
+      if (dy>=height) dy=height-1;
       dest[orowstride] = src[dy*irowstride+i];
 
       dest[orowstride+1] = src[dy*irowstride+dx];
@@ -522,20 +515,21 @@
 /////////////////////////////////////////////////////////////////////////
 
 
-weed_plant_t *weed_setup (weed_bootstrap_f weed_boot) {
+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);
 
   if (plugin_info!=NULL) {
-    const char *modes[]={"ripples","rain",NULL};
-    int palette_list[]={WEED_PALETTE_RGBA32,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",0,palette_list),NULL};
-    weed_plant_t *in_params[]={weed_string_list_init("mode","Ripple _mode",0,modes),NULL};
-
-    weed_plant_t *filter_class=weed_filter_class_init("rippleTV","effectTV",1,0,&ripple_init,&ripple_process,&ripple_deinit,in_chantmpls,out_chantmpls,in_params,NULL);
-    
-    weed_plugin_info_add_filter_class (plugin_info,filter_class);
-    
+    const char *modes[]= {"ripples","rain",NULL};
+    int palette_list[]= {WEED_PALETTE_RGBA32,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",0,palette_list),NULL};
+    weed_plant_t *in_params[]= {weed_string_list_init("mode","Ripple _mode",0,modes),NULL};
+
+    weed_plant_t *filter_class=weed_filter_class_init("rippleTV","effectTV",1,0,&ripple_init,&ripple_process,&ripple_deinit,in_chantmpls,
+                               out_chantmpls,in_params,NULL);
+
+    weed_plugin_info_add_filter_class(plugin_info,filter_class);
+
     weed_set_int_value(plugin_info,"version",package_version);
 
     setTable();

LiVES-2.2.8.tar.bz2/lives-plugins/weed-plugins/rotozoom.c -> LiVES-2.4.1.tar.bz2/lives-plugins/weed-plugins/rotozoom.c Changed

LiVES-2.2.8.tar.bz2/lives-plugins/weed-plugins/shift.c -> LiVES-2.4.1.tar.bz2/lives-plugins/weed-plugins/shift.c Changed

LiVES-2.2.8.tar.bz2/lives-plugins/weed-plugins/simple_blend.c -> LiVES-2.4.1.tar.bz2/lives-plugins/weed-plugins/simple_blend.c Changed

LiVES-2.2.8.tar.bz2/lives-plugins/weed-plugins/slide_over.c -> LiVES-2.4.1.tar.bz2/lives-plugins/weed-plugins/slide_over.c Changed

LiVES-2.2.8.tar.bz2/lives-plugins/weed-plugins/softlight.c -> LiVES-2.4.1.tar.bz2/lives-plugins/weed-plugins/softlight.c Changed

@@ -22,7 +22,7 @@
 ///////////////////////////////////////////////////////////////////
 
 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 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
 
@@ -39,7 +39,7 @@
 
 /////////////////////////////////////////////////////////////
 
-static uint32_t sqrti (uint32_t n) {
+static uint32_t sqrti(uint32_t n) {
   register uint32_t root=0, remainder=n, place=0x40000000, tmp;
 
   while (place > remainder) place>>=2;
@@ -56,24 +56,25 @@
 
 
 
-static void cp_chroma (unsigned char *dst, unsigned char *src, int irowstride, int orowstride, int width, int height) {
+static void cp_chroma(unsigned char *dst, unsigned char *src, int irowstride, int orowstride, int width, int height) {
 
   if (irowstride==orowstride&&irowstride==width) weed_memcpy(dst,src,width*height);
   else {
     register int i;
-    for (i=0;i<height;i++) {
+    for (i=0; i<height; i++) {
       weed_memcpy(dst,src,width);
       src+=irowstride;
       dst+=orowstride;
     }
   }
 }
-  
 
 
-static int softlight_process (weed_plant_t *inst, weed_timecode_t timestamp) {
+
+static int softlight_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_channel=weed_get_plantptr_value(inst,"in_channels",&error),*out_channel=weed_get_plantptr_value(inst,"out_channels",
+                           &error);
   uint8_t **srcp=(uint8_t **)weed_get_voidptr_array(in_channel,"pixel_data",&error);
   uint8_t **dstp=(uint8_t **)weed_get_voidptr_array(out_channel,"pixel_data",&error);
   int width=weed_get_int_value(in_channel,"width",&error);
@@ -110,8 +111,7 @@
   if (clamping==WEED_YUV_CLAMPING_UNCLAMPED) {
     ymin=0;
     ymax=255;
-  }
-  else {
+  } else {
     ymin=16;
     ymax=235;
   }
@@ -120,20 +120,21 @@
   width--;
 
   // process each row
-  for (;src<end;src+=(irowstride-width-1)) {
+  for (; src<end; src+=(irowstride-width-1)) {
 
     // skip leftmost pixel
     *(dst++)=*src;
     src++;
 
     // process all pixels except leftmost and rightmost
-    for (i=1;i<width;i++) {
+    for (i=1; i<width; i++) {
 
       // do edge detect and convolve
-      row0=( *(src+irowstride-1) - *(src-irowstride-1) ) + ( ( *(src+irowstride) - *(src-irowstride) ) << 1 ) + ( *(src+irowstride+1) - *(src+irowstride-1) );
-      row1=( *(src-irowstride+1) - *(src-irowstride-1) ) + ( ( *(src+1) - *(src-1) ) << 1) + ( *(src+irowstride+1) + *(src+irowstride-1) );
-      
-      sum= ( ( 3 * sqrti( row0 * row0 + row1 *row1 ) / 2 ) * scale ) >>8;
+      row0=(*(src+irowstride-1) - *(src-irowstride-1)) + ((*(src+irowstride) - *(src-irowstride)) << 1) + (*(src+irowstride+1) - *
+           (src+irowstride-1));
+      row1=(*(src-irowstride+1) - *(src-irowstride-1)) + ((*(src+1) - *(src-1)) << 1) + (*(src+irowstride+1) + *(src+irowstride-1));
+
+      sum= ((3 * sqrti(row0 * row0 + row1 *row1) / 2) * scale) >>8;
 
       // clamp
       sum=(sum<ymin?ymin:sum>ymax?ymax:sum);
@@ -165,7 +166,7 @@
   if (palette==WEED_PALETTE_YUVA4444P) nplanes=4;
   else nplanes=3;
 
-  for (i=1;i<nplanes;i++) {
+  for (i=1; i<nplanes; i++) {
     cp_chroma(dstp[i],srcp[i],irowstrides[i],orowstrides[i],width,height);
   }
 
@@ -180,19 +181,20 @@
 
 
 
-weed_plant_t *weed_setup (weed_bootstrap_f weed_boot) {
+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);
   if (plugin_info!=NULL) {
-    int palette_list[]={WEED_PALETTE_YUV444P,WEED_PALETTE_YUVA4444P,WEED_PALETTE_YUV422P,WEED_PALETTE_YUV420P,WEED_PALETTE_YVU420P,WEED_PALETTE_END};
+    int palette_list[]= {WEED_PALETTE_YUV444P,WEED_PALETTE_YUVA4444P,WEED_PALETTE_YUV422P,WEED_PALETTE_YUV420P,WEED_PALETTE_YVU420P,WEED_PALETTE_END};
 
-    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",0,palette_list),NULL};
-    weed_plant_t *filter_class=weed_filter_class_init("softlight","salsaman",1,0,NULL,&softlight_process,NULL,in_chantmpls,out_chantmpls,NULL,NULL);
+    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",0,palette_list),NULL};
+    weed_plant_t *filter_class=weed_filter_class_init("softlight","salsaman",1,0,NULL,&softlight_process,NULL,in_chantmpls,out_chantmpls,NULL,
+                               NULL);
 
     // set preference of unclamped
     weed_set_int_value(in_chantmpls[0],"YUV_clamping",WEED_YUV_CLAMPING_UNCLAMPED);
 
-    weed_plugin_info_add_filter_class (plugin_info,filter_class);
+    weed_plugin_info_add_filter_class(plugin_info,filter_class);
 
     weed_set_int_value(plugin_info,"version",package_version);
   }

LiVES-2.2.8.tar.bz2/lives-plugins/weed-plugins/syna.h -> LiVES-2.4.1.tar.bz2/lives-plugins/weed-plugins/syna.h Changed

@@ -52,14 +52,14 @@
   float   *aalto[WAVES];
 
   int  *instr[INSTR],*echo[INSTR],vol[INSTR],pola[INSTR],
-    prev[INSTR],pan[INSTR],off[INSTR],plus[INSTR],slide[INSTR];
+       prev[INSTR],pan[INSTR],off[INSTR],plus[INSTR],slide[INSTR];
 
-// an addition for Syna Live -Antti
+  // an addition for Syna Live -Antti
   int	live_row[INSTR];
   int	new_live_row[INSTR];
 
   int  global,slen,update,new_update,trak[INSTR][PTLEN],ptn[MAXR][PTLEN],
-            ti[INSTR],pi[INSTR],len[INSTR],ekolen;
+       ti[INSTR],pi[INSTR],len[INSTR],ekolen;
 
   char *module,eko[INSTR];
 
@@ -73,23 +73,25 @@
 } _sdata;
 
 
-static char *notes[]={
-            "c1","C1","d1","D1", "e1","f1","F1","g1", "G1","a1","A1","b1",
-            "c2","C2","d2","D2", "e2","f2","F2","g2", "G2","a2","A2","b2",
-            "c3","C3","d3","D3", "e3","f3","F3","g3", "G3","a3","A3","b3",
-            "c4","C4","d4","D4", "e4","f4","F4","g4", "G4","a4","A4","b4",
-            "c5","C5","d5","D5", "e5","f5","F5","g5", "G5","a5","A5","b5",
-            "c6","C6","d6","D6", "e6","f6","F6","g6", "G6","a6","A6","b6",
-            "echo1","echo0","stop","vol","sld","0"};
+static char *notes[]= {
+  "c1","C1","d1","D1", "e1","f1","F1","g1", "G1","a1","A1","b1",
+  "c2","C2","d2","D2", "e2","f2","F2","g2", "G2","a2","A2","b2",
+  "c3","C3","d3","D3", "e3","f3","F3","g3", "G3","a3","A3","b3",
+  "c4","C4","d4","D4", "e4","f4","F4","g4", "G4","a4","A4","b4",
+  "c5","C5","d5","D5", "e5","f5","F5","g5", "G5","a5","A5","b5",
+  "c6","C6","d6","D6", "e6","f6","F6","g6", "G6","a6","A6","b6",
+  "echo1","echo0","stop","vol","sld","0"
+};
 
-static int notei[]={
-            0,0,0,0, 0,0,0,0, 0,0,0,0,
-            0,0,0,0, 0,0,0,0, 0,0,0,0,
-            0,0,0,0, 0,0,0,0, 0,0,0,0,
-            0,0,0,0, 0,0,0,0, 0,0,0,0,
-            0,0,0,0, 0,0,0,0, 0,0,0,0,
-            1047,1109,1175,1245, 1319,1397,1480,1568, 1661,1760,1864,1976,
-            ECHON,ECHOFF,STOP,VOL,SLIDE,0};
+static int notei[]= {
+  0,0,0,0, 0,0,0,0, 0,0,0,0,
+  0,0,0,0, 0,0,0,0, 0,0,0,0,
+  0,0,0,0, 0,0,0,0, 0,0,0,0,
+  0,0,0,0, 0,0,0,0, 0,0,0,0,
+  0,0,0,0, 0,0,0,0, 0,0,0,0,
+  1047,1109,1175,1245, 1319,1397,1480,1568, 1661,1760,1864,1976,
+  ECHON,ECHOFF,STOP,VOL,SLIDE,0
+};
 
 
 static void adsr(_sdata *, int a, int d, int s, int r, int mod, int swp, int ins, int wave, int wave_mod);
@@ -105,7 +107,7 @@
 
 #if 0
 // Change all the live rows.
-static void set_live_rows(_sdata *, int * the_rows);
+static void set_live_rows(_sdata *, int *the_rows);
 #endif
 
 // Change just one live row.

LiVES-2.2.8.tar.bz2/lives-plugins/weed-plugins/targeted_zoom.c -> LiVES-2.4.1.tar.bz2/lives-plugins/weed-plugins/targeted_zoom.c Changed

LiVES-2.2.8.tar.bz2/lives-plugins/weed-plugins/textfun.c -> LiVES-2.4.1.tar.bz2/lives-plugins/weed-plugins/textfun.c Changed

@@ -19,7 +19,7 @@
 ///////////////////////////////////////////////////////////////////
 
 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 api_versions[]= {131,100}; // array of weed api versions supported in plugin, in order of preference (most preferred first)
 
 static int package_version=2; // version of this package
 
@@ -52,26 +52,26 @@
 
 void makeonescount(void) {
   int i,j;
-  for (i=0;i<65536;i++) {
+  for (i=0; i<65536; i++) {
     onescount[i]=0;
-    for (j=0;j<16;j++) {
+    for (j=0; j<16; j++) {
       if (i&(1<<j)) onescount[i]++;
     }
   }
 }
 
-static int get_hex_digit (char *d) {
+static int get_hex_digit(char *d) {
   char c[2];
   c[0]=*d;
   c[1]=0;
 
-  if (!strcmp (c,"a")||!strcmp (c,"A")) return 10;
-  if (!strcmp (c,"b")||!strcmp (c,"B")) return 11;
-  if (!strcmp (c,"c")||!strcmp (c,"C")) return 12;
-  if (!strcmp (c,"d")||!strcmp (c,"D")) return 13;
-  if (!strcmp (c,"e")||!strcmp (c,"E")) return 14;
-  if (!strcmp (c,"f")||!strcmp (c,"F")) return 15;
-  return(atoi (c));
+  if (!strcmp(c,"a")||!strcmp(c,"A")) return 10;
+  if (!strcmp(c,"b")||!strcmp(c,"B")) return 11;
+  if (!strcmp(c,"c")||!strcmp(c,"C")) return 12;
+  if (!strcmp(c,"d")||!strcmp(c,"D")) return 13;
+  if (!strcmp(c,"e")||!strcmp(c,"E")) return 14;
+  if (!strcmp(c,"f")||!strcmp(c,"F")) return 15;
+  return (atoi(c));
 }
 
 
@@ -87,19 +87,21 @@
 
   // this can be expanded by increasing NFONTMAPS
 
-  font_maps[0]="ANSI|8|0000183C3C3C18181800181800000000006666662400000000000000000000000000006C6CFE6C6C6CFE6C6C0000000018187CC6C2C07C060686C67C1818000000000000C2C60C183060C686000000000000386C6C3876DCCCCCCC76000000000030303060000000000000000000000000000C18303030303030180C00000000000030180C0C0C0C0C0C1830000000000000000000663CFF3C66000000000000000000000018187E181800000000000000000000000000000018181830000000000000000000007E0000000000000000000000000000000000001818000000000000000002060C183060C0800000000000007CC6C6CEDEF6E6C6C67C0000000000001838781818181818187E0000000000007CC6060C183060C0C6FE0000000000007CC606063C060606C67C0000000000000C1C3C6CCCFE0C0C0C1E000000000000FEC0C0C0FC060606C67C0000000000003860C0C0FCC6C6C6C67C000000000000FEC606060C18303030300000000000007CC6C6C67CC6C6C6C67C0000000000007CC6C6C67E0606060C78000000000000000018180000001818000000000000000000181800000018183000000000000000060C18306030180C060000000000000000007E00007E000000000000000000006030180C060C1830600000000000007CC6C60C1818180018180000000000007CC6C6C6DEDEDEDCC07C00000000000010386CC6C6FEC6C6C6C6000000000000FC6666667C66666666FC0000000000003C66C2C0C0C0C0C2663C000000000000F86C6666666666666CF8000000000000FE6662687868606266FE000000000000FE6662687868606060F00000000000003C66C2C0C0DEC6C6663A000000000000C6C6C6C6FEC6C6C6C6C60000000000003C18181818181818183C0000000000001E0C0C0C0C0CCCCCCC78000000000000E666666C78786C6666E6000000000000F06060606060606266FE000000000000C3E7FFFFDBC3C3C3C3C3000000000000C6E6F6FEDECEC6C6C6C60000000000007CC6C6C6C6C6C6C6C67C000000000000FC6666667C60606060F00000000000007CC6C6C6C6C6C6D6DE7C0C0E00000000FC6666667C6C666666E60000000000007CC6C660380C06C6C67C000000000000FFDB991818181818183C000000000000C6C6C6C6C6C6C6C6C67C000000000000C3C3C3C3C3C3C3663C18000000000000C3C3C3C3C3DBDBFF6666000000000000C3C3663C18183C66C3C3000000000000C3C3C3663C181818183C000000000000FFC3860C183060C1C3FF0000000000003C30303030303030303C0000000000000080C0E070381C0E06020000000000003C0C0C0C0C0C0C0C0C3C0000000010386CC600000000000000000000000000000000000000000000000000FF0000303018000000000000000000000000000000000000780C7CCCCCCC76000000000000E06060786C666666667C0000000000000000007CC6C0C0C0C67C0000000000001C0C0C3C6CCCCCCCCC760000000000000000007CC6FEC0C0C67C000000000000386C6460F060606060F000000000000000000076CCCCCCCCCC7C0CCC78000000E060606C7666666666E60000000000001818003818181818183C0000000000000606000E06060606060666663C000000E06060666C78786C66E60000000000003818181818181818183C000000000000000000E6FFDBDBDBDBDB000000000000000000DC6666666666660000000000000000007CC6C6C6C6C67C000000000000000000DC66666666667C6060F000000000000076CCCCCCCCCC7C0C0C1E000000000000DC7666606060F00000000000000000007CC660380CC67C000000000000103030FC30303030361C000000000000000000CCCCCCCCCCCC76000000000000000000C3C3C3C3663C18000000000000000000C3C3C3DBDBFF66000000000000000000C3663C183C66C3000000000000000000C6C6C6C6C6C67E060CF8000000000000FECC183060C6FE0000000000000E18181870181818180E00000000000018181818001818181818000000000000701818180E181818187000000000000076DC0000000000000000000000000000000010386CC6C6C6FE0000000000";
-  
+  font_maps[0]=
+    "ANSI|8|0000183C3C3C18181800181800000000006666662400000000000000000000000000006C6CFE6C6C6CFE6C6C0000000018187CC6C2C07C060686C67C1818000000000000C2C60C183060C686000000000000386C6C3876DCCCCCCC76000000000030303060000000000000000000000000000C18303030303030180C00000000000030180C0C0C0C0C0C1830000000000000000000663CFF3C66000000000000000000000018187E181800000000000000000000000000000018181830000000000000000000007E0000000000000000000000000000000000001818000000000000000002060C183060C0800000000000007CC6C6CEDEF6E6C6C67C0000000000001838781818181818187E0000000000007CC6060C183060C0C6FE0000000000007CC606063C060606C67C0000000000000C1C3C6CCCFE0C0C0C1E000000000000FEC0C0C0FC060606C67C0000000000003860C0C0FCC6C6C6C67C000000000000FEC606060C18303030300000000000007CC6C6C67CC6C6C6C67C0000000000007CC6C6C67E0606060C78000000000000000018180000001818000000000000000000181800000018183000000000000000060C18306030180C060000000000000000007E00007E000000000000000000006030180C060C1830600000000000007CC6C60C1818180018180000000000007CC6C6C6DEDEDEDCC07C00000000000010386CC6C6FEC6C6C6C6000000000000FC6666667C66666666FC0000000000003C66C2C0C0C0C0C2663C000000000000F86C6666666666666CF8000000000000FE6662687868606266FE000000000000FE6662687868606060F00000000000003C66C2C0C0DEC6C6663A000000000000C6C6C6C6FEC6C6C6C6C60000000000003C18181818181818183C0000000000001E0C0C0C0C0CCCCCCC78000000000000E666666C78786C6666E6000000000000F06060606060606266FE000000000000C3E7FFFFDBC3C3C3C3C3000000000000C6E6F6FEDECEC6C6C6C60000000000007CC6C6C6C6C6C6C6C67C000000000000FC6666667C60606060F00000000000007CC6C6C6C6C6C6D6DE7C0C0E00000000FC6666667C6C666666E60000000000007CC6C660380C06C6C67C000000000000FFDB991818181818183C000000000000C6C6C6C6C6C6C6C6C67C000000000000C3C3C3C3C3C3C3663C18000000000000C3C3C3C3C3DBDBFF6666000000000000C3C3663C18183C66C3C3000000000000C3C3C3663C181818183C000000000000FFC3860C183060C1C3FF0000000000003C30303030303030303C0000000000000080C0E070381C0E06020000000000003C0C0C0C0C0C0C0C0C3C0000000010386CC600000000000000000000000000000000000000000000000000FF0000303018000000000000000000000000000000000000780C7CCCCCCC76000000000000E06060786C666666667C0000000000000000007CC6C0C0C0C67C0000000000001C0C0C3C6CCCCCCCCC760000000000000000007CC6FEC0C0C67C000000000000386C6460F060606060F000000000000000000076CCCCCCCCCC7C0CCC78000000E060606C7666666666E60000000000001818003818181818183C0000000000000606000E06060606060666663C000000E06060666C78786C66E60000000000003818181818181818183C000000000000000000E6FFDBDBDBDBDB000000000000000000DC6666666666660000000000000000007CC6C6C6C6C67C000000000000000000DC66666666667C6060F000000000000076CCCCCCCCCC7C0C0C1E000000000000DC7666606060F00000000000000000007CC660380CC67C000000000000103030FC30303030361C000000000000000000CCCCCCCCCCCC76000000000000000000C3C3C3C3663C18000000000000000000C3C3C3DBDBFF66000000000000000000C3663C183C66C3000000000000000000C6C6C6C6C6C67E060CF8000000000000FECC183060C6FE0000000000000E18181870181818180E00000000000018181818001818181818000000000000701818180E181818187000000000000076DC0000000000000000000000000000000010386CC6C6C6FE0000000000";
+
 
   // hex encoded font map - Hiragana
-  font_maps[1]="Hiragana|16|0000000000000000020002E03F00024002400FF01488250822083C100060018000000100010001F83F000120012007F01A4822444144418443043C08003000C0000000000000000000000000300010101008100810041104120414000C00040000000000000060102010200820082004200420042104120414001800080008000000000000000000040003F0000001F026081804000400040008003000C003000000080007F00000000001F04608380400040004000400040008003000C007000000000000000000040003E0000020401FF00080010003C004400840107C000000001000080007C00000002041F03E40008001800280044008401040203E000000000000000000000000061002083FF4020007E00A101208120812080C10006000000800040804E47F02041E040007F00C081404240444044404380800700000000006000200020847C43C44044408420842085A104610822080270040000000000004040212020804107FC80444044408420842105E1042208026804100000000000100008C00F01F80004700F87F2000200010401040F02000180007F0000000000206011801E01E800047007803C03C200020001041F02010180007E00000000000700020004000800300040008000400020001000080006000100008000000000052004900800100020004000800100010000C00030000C00020001000000000206020102010201347FC40104010401044104810502030201040108000000000104220292024202047FF40204020402048205020502030203040118000000000000010000FF80010002000000000000000000000400020021FFC000000000000000200091FF40020004000000000000000000000400020021FFC00000000000001000080004E30700FC000200010001040C84038200010000C0003F80004000002040112008820FC1FC0004000200020401040F0400020001C0003FC00000000300008000800080008000800080010001002100410081010086007800000000010200910088008000800080008001000100110021004100810300FC00000000000E0002000204FFF302001A0026004200420026001A00040008003000C00000001840052004847FE3840004007C0084008C0074000400040008001000E000000002030100810081008FE7F1008100810081008D0083008000FFC0000000000000014104A08200820082008FE7F200820082009A0086008000C0003FC0000000000F01F20004000800100021E0FE014006400040004000400030000FC0000000000FA1F25004000800100021E0FE014006400040004000400030000FC0000000004000400046047803C7E040008000800080010001200120021FE4000000000000414040A046047803C7E040008000800080010001200120021FE40000000000003000100217C1F800200040005FC0E0208021002100200040008007003800000060A020542F83F00040008000BF81C041004200420040008001000E0070000000000000000000000000003F00C081004000400040008001000600380000000000000000001F80604780200020002000200020004000400180060078000000000000A000501F806047802000200020002000200040004001800600780000000000000003C07C07A000400040008000800080008000400020001F80000000000000000003C07C07A14040A040008000800080008000400020001F8000000000000030001000100010801180160038004000800100010001000080007FC000000000600020A02050210023002C007000800100020002000200010000FF8000000000400040007707C1C04100410081008100810101013F01418242443C2000000002000100011FC1000200040004000400040004C005200610021FE20001000000001000100410043F02D08110431022902450242024374448C388C0072000200000C000400047805847E04440408041804180428F4490C490638F9080008000000000007F01908210441044102410241024102420222021C040008003000C00000106010101010101E27F0201040104010401045F05A1C621261E1200000000000106A10151010101E27F0201040104010401045F05A1C621261E120000000000020C620292026203C4FE040208020802080208BE0B438C424C3C2400000000000010041003E08020804080808100C200C20122010201010200FC0000000000000010A41053E08020804080808100C200C20122010201010200FC0000000000000010641093E0E020804080808100C200C20122010201010200FC000000000000002000100008001400200040002000110008804440842104226404180000000000214010A00800140020004000200011000880444084210422640418000000000020C0112008C0140020004000200011000880444084210422640418000000000000000000300048008401020602000100008000400020001000000000000000000000014030A04800840102060200010000800040002000100000000000000000000000C0312048C0840102060200010000800040002000100000000000000002000107C11902010201E47F040104010401049F85214221221E1200000000000400A207527C04040407C8FC080408040804093F0A448444443824000000000004006207927C64040407C8FC080408040804093E0A458444443824000000000000180008000FE7F800080008000FC3F80008000800FE0109810860F0000000000018022801C8000980108010802080FF0321842144422482130400080010000001800041005887E04040204023C00440444044C0434080408041003E000000000018030801080108017E01918290449024502460245024804301800600180000006000200020022001FE0040044043FF40402040204020402040403F800000000000000000000000000801040087805A446243A040288027001000100010000000100108020F8214422421C027002080409F8040004000200020002000100000000000000000000001180108011F81684188420842084229821E001000600000001802040107811C4124224424842504260424442424421F8108003000400000000000000000000000180008000FC0080008000800F8010E0119C0E0000000000018000800080008600F800800080008000801FC020B0208C21021E0100000000060001E018001000100010F01308140418041004200420040008003007C000040408080808090A0A0C04000000030000007811900E2000400080010003F804040802138264420442044C03F00000000018000400047004903F104410041004100C101411241154120C0C040000000000006011A00E400080010002780784080210022002400200040008003003C0000000000000000000000600040004F01F88060404040C041404140804100460000010000800040004000C78158466020C02140224024402440274040C080470000001C006401880010003E00D18120422024402440244E24912311400F80010000013E00C4000800170078808041304148404F80380081C182224424382000400000100010011380FC0020003000487085870E0034004400840080007FE000000000700010002000200040004000800080017801842104220442044404800300000000000000000000003FC1C080010012001C001000100020002000400080000000000000047FE3804011801E001000100010002000200040008001000000000000000000000000001020C00000000000000180008001000100020004000C0014002400C403040004000400040000000000000000000000000010001001FF01110101010201040004000800100020000000100010001001FF811081008100810081010101000200040008003000C0000000000000000000000000000001FF0010001000100010001003FFC0000000000000000000000000000107C0F8001000100010001000100010043FE3C000000000000000000000000000080004000401FFC00C0014002400440184000C0000000000100008000400040407F3FC0004000C00140024004400840104061C00040000003000100010001FC7F040104010401040104020402080488087010006000000001040112010801003FFC01040104010402040204040408881078200040000000040002000100010047FC39000100010001FF7E8000800080008000800000000004000214010A010047FC39000100010001FF7E8000800080008000800000000001000100010003FC040808081010201040200040008001000600180060000000010A0105010003FC04080808101020104020004000800100060018006000000006000200020004000FFE082010202020404000400080010002000400080000000614020A020004000FFE0820102020204040004000800100020004000800000000000000000020001FF800080008000800080008001000107FFC00000000000000000014000A20001FF800080008000800080008001000107FFC0000000000000060182004200420043E7FE00420042004200420044000400080010002000000006A182504200420043E7FE0042004200420042004400040008001000200000000001000080004002002100408080010002000400080110012000C000000000000501028080004002002100408080010002000400080110012000C00000000000000107C0F840008000800100020004000E00110020804041802600000000000000A20F51F100010002000200040008001C00220041008083004C00000000000000008000400040004FC0F087410042004C004000400040007FE0000000000000004080A0404040004FC0F087410042004C004000400040007FE00000000000000000008100808080408041004100020002000400080010002000C0000000000000A0005201010100810082008200040004000800100020004001800000000000100010001FC020404080C101220212040C00080014002000400180060000000020A020503F804080810182024404240818001000280040008003000C00000000000001803E03C800080008003FE7C80008001000100020004001800000000000000003007C279050102010007FCF9000100020002000400080030000000000000000000000000000200110808880488041000100020004000800100060000000000020E21021102108408840808000800100020004000800100060018000000000A0405421822082108111010100020002000400080010002000C003000000010180FE0000000004FFE3080008000800080010001000200040008003000000020301FCA000500009FFC61000100010001000200020004000800100060000003010101010101010101010101010100000314010A01000100010001E00118010401000100010001000100010001000000018000800080008040FE3F80008000800080010001000200040018000000000000000000000000001FF80000000000000000000043FE3C000000000000000000000000001FFC0008000800100610012000C000A001100208040418026000000004000200010000F03F200040008001E003180D0471020102010001000100000000000018000400040008000800100010002000400080010002000C003000000000000040064002200210021004080408080408041002100220024000000000000014004A06400220021002100408040808040804100210022002400000000000000C0052064C02200210021004080408080408041002100220024000000000000000300010001000100C107013801C00100010001000100010041FFC0000000000003014100A1000100C107013801C00100010001000100010041FFC00000000000C3012100C1000100C107013801C00100010001000100010041FFC000000000000000023FC1C04000400080008001000200040008001000200040018000000000A000547F838080008001000100020004000800100020004000800300000000006000947FE3808000800100010002000400080010002000400080030000000000000000200050004800840102060100008000400020002000000000000000000000004001203080480084010206010000800040002000200000000000000000000000C0012030C04800840102060100008000400020002000000000000000003000100010041FE3F00012009100908110811042104410005000300000000000314010A010041FE3F0001200910090811081104210441000500030000000000030C0112010C41FE3F000120091009081108110421044100050003000000000000000000003E43C23C04000800101820064001800080004000400000000000001E0001C00030000C1C0003800060001800041C00030000C00030000800000000020001000100010002000200044004200810100810F82704780200020002000000780008000800100110009000600020005000880104020004001800000000000000000001F81F0001000100010007FE790001000100010001FF0000000000000000000000000000040002000278078879100120014001000100010000000000040004000200023E03C24F043108011001200140008000800080008000000000000000000000000000000000000000000FE000200020002000203FFC000000000000000000000000000000001FF00010001000100020002000207FFE000000000000000000000000000000000FF8000800080FF80010001000101FF0000000000000000000001FFC00040004000400041FF800080008000800087FF8000000000FF800000000000043FC3C0400040008001000200040018006000800100000000020101008100810081008100810081008100810001000200040018006000000030019000900090009000900090109020904090811101120214041800000000000000000100010001001100210041008101010201040118016001800000000000000000000001FF81008100810081008100810081FF810001000000000000000000000000000000010001FF01010101010200020004000400080010002000000000000001FF810081008100810081010001000200020004000800100020000000080008000803FFC08800880088008807FFF008000800080008000800080000000000000000001F83E1000600180010001000100010047FE3800000000000000000000003FF80008000800081FF800080010001000200040008003000C00000000000000300008040404040800080010002000400080010002003C00000000000214010A010001001FF81008100810101010102000400080010002000400000000000000000000000100010001F01F1001100110021002100410086010000000000000000000000000000400040004780FA0104020400080010002000400";
+  font_maps[1]=
+    "Hiragana|16|0000000000000000020002E03F00024002400FF01488250822083C100060018000000100010001F83F000120012007F01A4822444144418443043C08003000C0000000000000000000000000300010101008100810041104120414000C00040000000000000060102010200820082004200420042104120414001800080008000000000000000000040003F0000001F026081804000400040008003000C003000000080007F00000000001F04608380400040004000400040008003000C007000000000000000000040003E0000020401FF00080010003C004400840107C000000001000080007C00000002041F03E40008001800280044008401040203E000000000000000000000000061002083FF4020007E00A101208120812080C10006000000800040804E47F02041E040007F00C081404240444044404380800700000000006000200020847C43C44044408420842085A104610822080270040000000000004040212020804107FC80444044408420842105E1042208026804100000000000100008C00F01F80004700F87F2000200010401040F02000180007F0000000000206011801E01E800047007803C03C200020001041F02010180007E00000000000700020004000800300040008000400020001000080006000100008000000000052004900800100020004000800100010000C00030000C00020001000000000206020102010201347FC40104010401044104810502030201040108000000000104220292024202047FF40204020402048205020502030203040118000000000000010000FF80010002000000000000000000000400020021FFC000000000000000200091FF40020004000000000000000000000400020021FFC00000000000001000080004E30700FC000200010001040C84038200010000C0003F80004000002040112008820FC1FC0004000200020401040F0400020001C0003FC00000000300008000800080008000800080010001002100410081010086007800000000010200910088008000800080008001000100110021004100810300FC00000000000E0002000204FFF302001A0026004200420026001A00040008003000C00000001840052004847FE3840004007C0084008C0074000400040008001000E000000002030100810081008FE7F1008100810081008D0083008000FFC0000000000000014104A08200820082008FE7F200820082009A0086008000C0003FC0000000000F01F20004000800100021E0FE014006400040004000400030000FC0000000000FA1F25004000800100021E0FE014006400040004000400030000FC0000000004000400046047803C7E040008000800080010001200120021FE4000000000000414040A046047803C7E040008000800080010001200120021FE40000000000003000100217C1F800200040005FC0E0208021002100200040008007003800000060A020542F83F00040008000BF81C041004200420040008001000E0070000000000000000000000000003F00C081004000400040008001000600380000000000000000001F80604780200020002000200020004000400180060078000000000000A000501F806047802000200020002000200040004001800600780000000000000003C07C07A000400040008000800080008000400020001F80000000000000000003C07C07A14040A040008000800080008000400020001F8000000000000030001000100010801180160038004000800100010001000080007FC000000000600020A02050210023002C007000800100020002000200010000FF8000000000400040007707C1C04100410081008100810101013F01418242443C2000000002000100011FC1000200040004000400040004C005200610021FE20001000000001000100410043F02D08110431022902450242024374448C388C0072000200000C000400047805847E04440408041804180428F4490C490638F9080008000000000007F01908210441044102410241024102420222021C040008003000C00000106010101010101E27F0201040104010401045F05A1C621261E1200000000000106A10151010101E27F0201040104010401045F05A1C621261E120000000000020C620292026203C4FE040208020802080208BE0B438C424C3C2400000000000010041003E08020804080808100C200C20122010201010200FC0000000000000010A41053E08020804080808100C200C20122010201010200FC0000000000000010641093E0E020804080808100C200C20122010201010200FC000000000000002000100008001400200040002000110008804440842104226404180000000000214010A00800140020004000200011000880444084210422640418000000000020C0112008C0140020004000200011000880444084210422640418000000000000000000300048008401020602000100008000400020001000000000000000000000014030A04800840102060200010000800040002000100000000000000000000000C0312048C0840102060200010000800040002000100000000000000002000107C11902010201E47F040104010401049F85214221221E1200000000000400A207527C04040407C8FC080408040804093F0A448444443824000000000004006207927C64040407C8FC080408040804093E0A458444443824000000000000180008000FE7F800080008000FC3F80008000800FE0109810860F0000000000018022801C8000980108010802080FF0321842144422482130400080010000001800041005887E04040204023C00440444044C0434080408041003E000000000018030801080108017E01918290449024502460245024804301800600180000006000200020022001FE0040044043FF40402040204020402040403F800000000000000000000000000801040087805A446243A040288027001000100010000000100108020F8214422421C027002080409F8040004000200020002000100000000000000000000001180108011F81684188420842084229821E001000600000001802040107811C4124224424842504260424442424421F8108003000400000000000000000000000180008000FC0080008000800F8010E0119C0E0000000000018000800080008600F800800080008000801FC020B0208C21021E0100000000060001E018001000100010F01308140418041004200420040008003007C000040408080808090A0A0C04000000030000007811900E2000400080010003F804040802138264420442044C03F00000000018000400047004903F104410041004100C101411241154120C0C040000000000006011A00E400080010002780784080210022002400200040008003003C0000000000000000000000600040004F01F88060404040C041404140804100460000010000800040004000C78158466020C02140224024402440274040C080470000001C006401880010003E00D18120422024402440244E24912311400F80010000013E00C4000800170078808041304148404F80380081C182224424382000400000100010011380FC0020003000487085870E0034004400840080007FE000000000700010002000200040004000800080017801842104220442044404800300000000000000000000003FC1C080010012001C001000100020002000400080000000000000047FE3804011801E001000100010002000200040008001000000000000000000000000001020C00000000000000180008001000100020004000C0014002400C403040004000400040000000000000000000000000010001001FF01110101010201040004000800100020000000100010001001FF811081008100810081010101000200040008003000C0000000000000000000000000000001FF0010001000100010001003FFC0000000000000000000000000000107C0F8001000100010001000100010043FE3C000000000000000000000000000080004000401FFC00C0014002400440184000C0000000000100008000400040407F3FC0004000C00140024004400840104061C00040000003000100010001FC7F040104010401040104020402080488087010006000000001040112010801003FFC01040104010402040204040408881078200040000000040002000100010047FC39000100010001FF7E8000800080008000800000000004000214010A010047FC39000100010001FF7E8000800080008000800000000001000100010003FC040808081010201040200040008001000600180060000000010A0105010003FC04080808101020104020004000800100060018006000000006000200020004000FFE082010202020404000400080010002000400080000000614020A020004000FFE0820102020204040004000800100020004000800000000000000000020001FF800080008000800080008001000107FFC00000000000000000014000A20001FF800080008000800080008001000107FFC0000000000000060182004200420043E7FE00420042004200420044000400080010002000000006A182504200420043E7FE0042004200420042004400040008001000200000000001000080004002002100408080010002000400080110012000C000000000000501028080004002002100408080010002000400080110012000C00000000000000107C0F840008000800100020004000E00110020804041802600000000000000A20F51F100010002000200040008001C00220041008083004C00000000000000008000400040004FC0F087410042004C004000400040007FE0000000000000004080A0404040004FC0F087410042004C004000400040007FE00000000000000000008100808080408041004100020002000400080010002000C0000000000000A0005201010100810082008200040004000800100020004001800000000000100010001FC020404080C101220212040C00080014002000400180060000000020A020503F804080810182024404240818001000280040008003000C00000000000001803E03C800080008003FE7C80008001000100020004001800000000000000003007C279050102010007FCF9000100020002000400080030000000000000000000000000000200110808880488041000100020004000800100060000000000020E21021102108408840808000800100020004000800100060018000000000A0405421822082108111010100020002000400080010002000C003000000010180FE0000000004FFE3080008000800080010001000200040008003000000020301FCA000500009FFC61000100010001000200020004000800100060000003010101010101010101010101010100000314010A01000100010001E00118010401000100010001000100010001000000018000800080008040FE3F80008000800080010001000200040018000000000000000000000000001FF80000000000000000000043FE3C000000000000000000000000001FFC0008000800100610012000C000A001100208040418026000000004000200010000F03F200040008001E003180D0471020102010001000100000000000018000400040008000800100010002000400080010002000C003000000000000040064002200210021004080408080408041002100220024000000000000014004A06400220021002100408040808040804100210022002400000000000000C0052064C02200210021004080408080408041002100220024000000000000000300010001000100C107013801C00100010001000100010041FFC0000000000003014100A1000100C107013801C00100010001000100010041FFC00000000000C3012100C1000100C107013801C00100010001000100010041FFC000000000000000023FC1C04000400080008001000200040008001000200040018000000000A000547F838080008001000100020004000800100020004000800300000000006000947FE3808000800100010002000400080010002000400080030000000000000000200050004800840102060100008000400020002000000000000000000000004001203080480084010206010000800040002000200000000000000000000000C0012030C04800840102060100008000400020002000000000000000003000100010041FE3F00012009100908110811042104410005000300000000000314010A010041FE3F0001200910090811081104210441000500030000000000030C0112010C41FE3F000120091009081108110421044100050003000000000000000000003E43C23C04000800101820064001800080004000400000000000001E0001C00030000C1C0003800060001800041C00030000C00030000800000000020001000100010002000200044004200810100810F82704780200020002000000780008000800100110009000600020005000880104020004001800000000000000000001F81F0001000100010007FE790001000100010001FF0000000000000000000000000000040002000278078879100120014001000100010000000000040004000200023E03C24F043108011001200140008000800080008000000000000000000000000000000000000000000FE000200020002000203FFC000000000000000000000000000000001FF00010001000100020002000207FFE000000000000000000000000000000000FF8000800080FF80010001000101FF0000000000000000000001FFC00040004000400041FF800080008000800087FF8000000000FF800000000000043FC3C0400040008001000200040018006000800100000000020101008100810081008100810081008100810001000200040018006000000030019000900090009000900090109020904090811101120214041800000000000000000100010001001100210041008101010201040118016001800000000000000000000001FF81008100810081008100810081FF810001000000000000000000000000000000010001FF01010101010200020004000400080010002000000000000001FF810081008100810081010001000200020004000800100020000000080008000803FFC08800880088008807FFF008000800080008000800080000000000000000001F83E1000600180010001000100010047FE3800000000000000000000003FF80008000800081FF800080010001000200040008003000C00000000000000300008040404040800080010002000400080010002003C00000000000214010A010001001FF81008100810101010102000400080010002000400000000000000000000000100010001F01F1001100110021002100410086010000000000000000000000000000400040004780FA0104020400080010002000400";
 
   font_maps[2]="diamond|16|0000000000000000018003C007E00FF01FF83FFC7FFE3FFC1FF80FF007E003C001800000";
 
- int i,j,k;
- int nglyphs;
- size_t len;
+  int i,j,k;
+  int nglyphs;
+  size_t len;
 
-  for (k=0;k<NFONTMAPS;k++) {
+  for (k=0; k<NFONTMAPS; k++) {
     len=strcspn(font_maps[k],"|");
     font_tables[k].fontname=weed_malloc(len+1);
     weed_memcpy(font_tables[k].fontname,font_maps[k],len);
@@ -112,17 +114,17 @@
     font_tables[k].nglyphs=++nglyphs;
     font_tables[k].fonttable=weed_malloc(32*nglyphs);
 
-    for (i=0;i<nglyphs*16;i+=16) {
-      for (j=0;j<16;j++) {
-	if (i==0) font_tables[k].fonttable[j]=0; // make sure we have a space
-	else {
-	  if (font_tables[k].width==16) {
-	    font_tables[k].fonttable[i+j]=((get_hex_digit(&font_maps[k][(i-16+j)*4])<<12)+(get_hex_digit(&font_maps[k][(i-16+j)*4+1])<<8)+(get_hex_digit(&font_maps[k][(i-16+j)*4+2])<<4)+(get_hex_digit(&font_maps[k][(i-16+j)*4+3])));
-	  }
-	  else {
-	    font_tables[k].fonttable[i+j]=((get_hex_digit(&font_maps[k][(i-16+j)*2])<<4)+(get_hex_digit(&font_maps[k][(i-16+j)*2+1])));
-	  }
-	}
+    for (i=0; i<nglyphs*16; i+=16) {
+      for (j=0; j<16; j++) {
+        if (i==0) font_tables[k].fonttable[j]=0; // make sure we have a space
+        else {
+          if (font_tables[k].width==16) {
+            font_tables[k].fonttable[i+j]=((get_hex_digit(&font_maps[k][(i-16+j)*4])<<12)+(get_hex_digit(&font_maps[k][(i-16+j)*4+1])<<8)+
+                                           (get_hex_digit(&font_maps[k][(i-16+j)*4+2])<<4)+(get_hex_digit(&font_maps[k][(i-16+j)*4+3])));
+          } else {
+            font_tables[k].fonttable[i+j]=((get_hex_digit(&font_maps[k][(i-16+j)*2])<<4)+(get_hex_digit(&font_maps[k][(i-16+j)*2+1])));
+          }
+        }
       }
     }
   }
@@ -137,9 +139,8 @@
 static int Y_B[256];
 
 
-static int myround(double n)
-{
-  if (n >= 0) 
+static int myround(double n) {
+  if (n >= 0)
     return (int)(n + 0.5);
   else
     return (int)(n - 0.5);
@@ -147,8 +148,7 @@
 
 
 
-static void init_RGB_to_YCbCr_tables(void)
-{
+static void init_RGB_to_YCbCr_tables(void) {
   int i;
 
   /*
@@ -158,34 +158,34 @@
    * to one of each, add the following:
    *             + (fixed-pogint-factor / 2)         --- for rounding later
    *             + (Q-offset * fixed-pogint-factor)  --- to add the offset
-   *             
+   *
    */
   for (i = 0; i < 256; i++) {
-    Y_R[i] = myround(0.299 * (double)i 
-		     * 219.0 / 255.0 * (double)(1<<FP_BITS));
-    Y_G[i] = myround(0.587 * (double)i 
-		     * 219.0 / 255.0 * (double)(1<<FP_BITS));
-    Y_B[i] = myround((0.114 * (double)i 
-		      * 219.0 / 255.0 * (double)(1<<FP_BITS))
-		     + (double)(1<<(FP_BITS-1))
-		     + (16.0 * (double)(1<<FP_BITS)));
+    Y_R[i] = myround(0.299 * (double)i
+                     * 219.0 / 255.0 * (double)(1<<FP_BITS));
+    Y_G[i] = myround(0.587 * (double)i
+                     * 219.0 / 255.0 * (double)(1<<FP_BITS));
+    Y_B[i] = myround((0.114 * (double)i
+                      * 219.0 / 255.0 * (double)(1<<FP_BITS))
+                     + (double)(1<<(FP_BITS-1))
+                     + (16.0 * (double)(1<<FP_BITS)));
 
   }
 }
 
 
-static inline uint8_t 
-calc_luma (uint8_t *pixel) {
+static inline uint8_t
+calc_luma(uint8_t *pixel) {
   return (Y_R[pixel[0]] + Y_G[pixel[1]]+ Y_B[pixel[2]]) >> FP_BITS;
 }
 
 
-static inline uint8_t make_lumbyte (unsigned char *img, uint8_t thresh) {
+static inline uint8_t make_lumbyte(unsigned char *img, uint8_t thresh) {
   // here we map 8 pixels to one byte; if the luma of a pixel is > THRESH we set a 1, otherwise a 0
   uint8_t lumbyte=0;
   register int i;
 
-  for (i=7;i>=0;i--) {
+  for (i=7; i>=0; i--) {
     if (calc_luma(img)>thresh) lumbyte|=(1<<i);
     img+=3;
   }
@@ -193,10 +193,11 @@
 }
 
 
-static inline void fill_line(int fontwidth, unsigned char *src,unsigned char *dst, unsigned char *fillval, unsigned short fontrow, int type) {
+static inline void fill_line(int fontwidth, unsigned char *src,unsigned char *dst, unsigned char *fillval, unsigned short fontrow,
+                             int type) {
   register int i;
 
-  for (i=fontwidth-1;i>=0;i--) {
+  for (i=fontwidth-1; i>=0; i--) {
     switch (type) {
     case 0:
       // coloured pixels
@@ -230,7 +231,7 @@
   if (type==2) weed_memset(fillval,(src[0]+src[1]+src[2])/3,3);
   else if (type==3) weed_memcpy(fillval,src,3);
 
-  for (i=0;i<16;i++) {
+  for (i=0; i<16; i++) {
     fill_line(font_tables[fontnum].width,src,dst,fillval,font_tables[fontnum].fonttable[glyph*16+i],type);
     dst+=drow;
     if (type==0) src+=irow;
@@ -240,7 +241,7 @@
 /////////////////////////////////////////////////////////////
 
 
-int textfun_process (weed_plant_t *inst, weed_timecode_t timestamp) {
+int textfun_process(weed_plant_t *inst, weed_timecode_t timestamp) {
   int error;
   unsigned int width3,irow16,orow16;
   unsigned int startx,starty,endx;
@@ -249,7 +250,8 @@
   int mode;
   uint8_t thresh;
   int fontnum;
-  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_channel=weed_get_plantptr_value(inst,"in_channels",&error),*out_channel=weed_get_plantptr_value(inst,"out_channels",
+                           &error);
   unsigned char *src=weed_get_voidptr_value(in_channel,"pixel_data",&error);
   unsigned char *dst=weed_get_voidptr_value(out_channel,"pixel_data",&error);
   int width=weed_get_int_value(in_channel,"width",&error);
@@ -291,26 +293,26 @@
 
 
   // get a FONT_WIDTH x 16 block, compare with each character and find the minimum difference
-  for (;src<end;src+=irow16) {
-    for (j=startx;j<endx;j+=skip) {
+  for (; src<end; src+=irow16) {
+    for (j=startx; j<endx; j+=skip) {
       minones=256;
 
-      for (l=0;l<16;l++) lb[l]=make_lumbyte(&src[j+l*irowstride],thresh);
-      if (font_tables[fontnum].width==16) for (l=0;l<16;l++) lb2[l]=make_lumbyte(&src[j+l*irowstride+24],thresh);
-
-      for (k=0;k<glyph16;k+=16) {
-	numones=m=0;
-	// xor'ing our lumbyte with a font row, and then looking this up in onescount gives us the number of different bits
-	if (font_tables[fontnum].width==16) {
-	  for (l=0;l<16;l++) if ((numones+=onescount[(uint16_t)(((uint16_t)lb[l]<<8)+(uint16_t)lb2[l])^font_tables[fontnum].fonttable[k+(m++)]])>=minones) break;
-	}
-	else {
-	  for (l=0;l<16;l++) if ((numones+=onescount[(lb[l]^(uint8_t)(font_tables[fontnum].fonttable[k+(m++)]))])>=minones) break;
-	}
-	if (numones<minones) {
-	  minones=numones;
-	  minchar=k>>4;
-	}
+      for (l=0; l<16; l++) lb[l]=make_lumbyte(&src[j+l*irowstride],thresh);
+      if (font_tables[fontnum].width==16) for (l=0; l<16; l++) lb2[l]=make_lumbyte(&src[j+l*irowstride+24],thresh);
+
+      for (k=0; k<glyph16; k+=16) {
+        numones=m=0;
+        // xor'ing our lumbyte with a font row, and then looking this up in onescount gives us the number of different bits
+        if (font_tables[fontnum].width==16) {
+          for (l=0; l<16;
+               l++) if ((numones+=onescount[(uint16_t)(((uint16_t)lb[l]<<8)+(uint16_t)lb2[l])^font_tables[fontnum].fonttable[k+(m++)]])>=minones) break;
+        } else {
+          for (l=0; l<16; l++) if ((numones+=onescount[(lb[l]^(uint8_t)(font_tables[fontnum].fonttable[k+(m++)]))])>=minones) break;
+        }
+        if (numones<minones) {
+          minones=numones;
+          minchar=k>>4;
+        }
       }
       // fill 8x16 block in dest with char
       fill_block(fontnum,&src[j],&dst[j],orowstride,irowstride,minchar,mode);
@@ -323,14 +325,14 @@
 
 
 
-weed_plant_t *weed_setup (weed_bootstrap_f weed_boot) {
+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);
 
   if (plugin_info!=NULL) {
-    const char *modes[]={"colour pixels","monochrome","greyscale","solid colours",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),NULL};
-    weed_plant_t *out_chantmpls[]={weed_channel_template_init("out channel 0",0,palette_list),NULL};
+    const char *modes[]= {"colour pixels","monochrome","greyscale","solid colours",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),NULL};
+    weed_plant_t *out_chantmpls[]= {weed_channel_template_init("out channel 0",0,palette_list),NULL};
     weed_plant_t *in_params[4];
     weed_plant_t *filter_class;
 
@@ -339,7 +341,7 @@
 
     make_font_tables();
 
-    for (i=0;i<NFONTMAPS;i++) {
+    for (i=0; i<NFONTMAPS; i++) {
       fonts[i]=font_tables[i].fontname;
     }
     fonts[i]=NULL;
@@ -348,11 +350,11 @@
     in_params[1]=weed_string_list_init("mode","Colour _mode",0,modes);
     in_params[2]=weed_string_list_init("font","_Font",0,fonts);
     in_params[3]=NULL;
-    
+
     filter_class=weed_filter_class_init("textfun","salsaman",2,0,NULL,&textfun_process,NULL,in_chantmpls,out_chantmpls,in_params,NULL);
 
-    weed_plugin_info_add_filter_class (plugin_info,filter_class);
-    
+    weed_plugin_info_add_filter_class(plugin_info,filter_class);
+
     weed_set_int_value(plugin_info,"version",package_version);
 
     init_RGB_to_YCbCr_tables();
@@ -367,7 +369,7 @@
 
 void weed_desetup(void) {
   int k;
-  for (k=0;k<NFONTMAPS;k++) {
+  for (k=0; k<NFONTMAPS; k++) {
     weed_free(font_tables[k].fontname);
     weed_free(font_tables[k].fonttable);
   }

LiVES-2.2.8.tar.bz2/lives-plugins/weed-plugins/tone_gen.c -> LiVES-2.4.1.tar.bz2/lives-plugins/weed-plugins/tone_gen.c Changed

LiVES-2.2.8.tar.bz2/lives-plugins/weed-plugins/tvpic.c -> LiVES-2.4.1.tar.bz2/lives-plugins/weed-plugins/tvpic.c Changed

@@ -20,7 +20,7 @@
 ///////////////////////////////////////////////////////////////////
 
 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 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
 
@@ -49,10 +49,11 @@
 }
 
 
-static int tvpic_process (weed_plant_t *inst, weed_timecode_t timestamp) {
+static int tvpic_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_channel=weed_get_plantptr_value(inst,"in_channels",&error),*out_channel=weed_get_plantptr_value(inst,"out_channels",
+                           &error);
 
   unsigned char *src=weed_get_voidptr_value(in_channel,"pixel_data",&error);
   unsigned char *dest=weed_get_voidptr_value(out_channel,"pixel_data",&error);
@@ -124,115 +125,111 @@
   }
 
 
-  for (y=offset;y<dheight;y++) {
+  for (y=offset; y<dheight; y++) {
     x=0;
     while (x<width) {
       if (x<lbord||x>rbord) {
-	set_black(&dest[x],&src[x],alpha,psize);
-	x+=psize;
-      }
-      else if (y==height-1) {
-	// bottom row, 2 possibilities
-	// if odd, rgb from row, rgb from row/row-1
-	if (odd) {
-	  weed_memcpy(&dest[x],&src[x],psize);
-	  x+=psize;
-	  weed_memcpy(&dest[x],&src[x],psize);
-	  x+=psize;
-	  weed_memcpy(&dest[x],&src[x],psize);
-	  x+=psize;
-	  set_avg(&dest[x],&src[x],&src[x-irowstride],red,alpha,psize);
-	  x+=psize;
-	  set_avg(&dest[x],&src[x],&src[x-irowstride],green,alpha,psize);
-	  x+=psize;
-	  set_avg(&dest[x],&src[x],&src[x-irowstride],blue,alpha,psize);
-	  x+=psize;
-	}
-	else {
-	  // if even, rgb from row/row-1, 3 black
-	  set_avg(&dest[x],&src[x],&src[x-irowstride],red,alpha,psize);
-	  x+=psize;
-	  set_avg(&dest[x],&src[x],&src[x-irowstride],green,alpha,psize);
-	  x+=psize;
-	  set_avg(&dest[x],&src[x],&src[x-irowstride],blue,alpha,psize);
-	  x+=psize;
-	  set_black(&dest[x],&src[x],alpha,psize);
-	  x+=psize;
-	  set_black(&dest[x],&src[x],alpha,psize);
-	  x+=psize;
-	  set_black(&dest[x],&src[x],alpha,psize);
-	  x+=psize;
-	}
-      }
-      else if (y==0) {
-	// top row has 3 black, rgb from row/row+1, 3 black, etc
-	set_black(&dest[x],&src[x],alpha,psize);
-	x+=psize;
-	set_black(&dest[x],&src[x],alpha,psize);
-	x+=psize;
-	set_black(&dest[x],&src[x],alpha,psize);
-	x+=psize;
-	set_avg(&dest[x],&src[x],&src[x+irowstride],red,alpha,psize);
-	x+=psize;
-	set_avg(&dest[x],&src[x],&src[x+irowstride],green,alpha,psize);
-	x+=psize;
-	set_avg(&dest[x],&src[x],&src[x+irowstride],blue,alpha,psize);
-	x+=psize;
-      }
-      else {
-	// normal row, 2 possibilities
-	if (odd) {
-	  // if odd, rgb from row/row+1, rgb from row/row-1
-	  set_avg(&dest[x],&src[x],&src[x+irowstride],red,alpha,psize);
-	  x+=psize;
-	  set_avg(&dest[x],&src[x],&src[x+irowstride],green,alpha,psize);
-	  x+=psize;
-	  set_avg(&dest[x],&src[x],&src[x+irowstride],blue,alpha,psize);
-	  x+=psize;
-	  set_avg(&dest[x],&src[x],&src[x-irowstride],red,alpha,psize);
-	  x+=psize;
-	  set_avg(&dest[x],&src[x],&src[x-irowstride],green,alpha,psize);
-	  x+=psize;
-	  set_avg(&dest[x],&src[x],&src[x-irowstride],blue,alpha,psize);
-	  x+=psize;
-	}
-	else {
-	  // if even, rgb from row/row-1, rgb from row/row+1
-	  set_avg(&dest[x],&src[x],&src[x-irowstride],red,alpha,psize);
-	  x+=psize;
-	  set_avg(&dest[x],&src[x],&src[x-irowstride],green,alpha,psize);
-	  x+=psize;
-	  set_avg(&dest[x],&src[x],&src[x-irowstride],blue,alpha,psize);
-	  x+=psize;
-	  set_avg(&dest[x],&src[x],&src[x+irowstride],red,alpha,psize);
-	  x+=psize;
-	  set_avg(&dest[x],&src[x],&src[x+irowstride],green,alpha,psize);
-	  x+=psize;
-	  set_avg(&dest[x],&src[x],&src[x+irowstride],blue,alpha,psize);
-	  x+=psize;
-	}
+        set_black(&dest[x],&src[x],alpha,psize);
+        x+=psize;
+      } else if (y==height-1) {
+        // bottom row, 2 possibilities
+        // if odd, rgb from row, rgb from row/row-1
+        if (odd) {
+          weed_memcpy(&dest[x],&src[x],psize);
+          x+=psize;
+          weed_memcpy(&dest[x],&src[x],psize);
+          x+=psize;
+          weed_memcpy(&dest[x],&src[x],psize);
+          x+=psize;
+          set_avg(&dest[x],&src[x],&src[x-irowstride],red,alpha,psize);
+          x+=psize;
+          set_avg(&dest[x],&src[x],&src[x-irowstride],green,alpha,psize);
+          x+=psize;
+          set_avg(&dest[x],&src[x],&src[x-irowstride],blue,alpha,psize);
+          x+=psize;
+        } else {
+          // if even, rgb from row/row-1, 3 black
+          set_avg(&dest[x],&src[x],&src[x-irowstride],red,alpha,psize);
+          x+=psize;
+          set_avg(&dest[x],&src[x],&src[x-irowstride],green,alpha,psize);
+          x+=psize;
+          set_avg(&dest[x],&src[x],&src[x-irowstride],blue,alpha,psize);
+          x+=psize;
+          set_black(&dest[x],&src[x],alpha,psize);
+          x+=psize;
+          set_black(&dest[x],&src[x],alpha,psize);
+          x+=psize;
+          set_black(&dest[x],&src[x],alpha,psize);
+          x+=psize;
+        }
+      } else if (y==0) {
+        // top row has 3 black, rgb from row/row+1, 3 black, etc
+        set_black(&dest[x],&src[x],alpha,psize);
+        x+=psize;
+        set_black(&dest[x],&src[x],alpha,psize);
+        x+=psize;
+        set_black(&dest[x],&src[x],alpha,psize);
+        x+=psize;
+        set_avg(&dest[x],&src[x],&src[x+irowstride],red,alpha,psize);
+        x+=psize;
+        set_avg(&dest[x],&src[x],&src[x+irowstride],green,alpha,psize);
+        x+=psize;
+        set_avg(&dest[x],&src[x],&src[x+irowstride],blue,alpha,psize);
+        x+=psize;
+      } else {
+        // normal row, 2 possibilities
+        if (odd) {
+          // if odd, rgb from row/row+1, rgb from row/row-1
+          set_avg(&dest[x],&src[x],&src[x+irowstride],red,alpha,psize);
+          x+=psize;
+          set_avg(&dest[x],&src[x],&src[x+irowstride],green,alpha,psize);
+          x+=psize;
+          set_avg(&dest[x],&src[x],&src[x+irowstride],blue,alpha,psize);
+          x+=psize;
+          set_avg(&dest[x],&src[x],&src[x-irowstride],red,alpha,psize);
+          x+=psize;
+          set_avg(&dest[x],&src[x],&src[x-irowstride],green,alpha,psize);
+          x+=psize;
+          set_avg(&dest[x],&src[x],&src[x-irowstride],blue,alpha,psize);
+          x+=psize;
+        } else {
+          // if even, rgb from row/row-1, rgb from row/row+1
+          set_avg(&dest[x],&src[x],&src[x-irowstride],red,alpha,psize);
+          x+=psize;
+          set_avg(&dest[x],&src[x],&src[x-irowstride],green,alpha,psize);
+          x+=psize;
+          set_avg(&dest[x],&src[x],&src[x-irowstride],blue,alpha,psize);
+          x+=psize;
+          set_avg(&dest[x],&src[x],&src[x+irowstride],red,alpha,psize);
+          x+=psize;
+          set_avg(&dest[x],&src[x],&src[x+irowstride],green,alpha,psize);
+          x+=psize;
+          set_avg(&dest[x],&src[x],&src[x+irowstride],blue,alpha,psize);
+          x+=psize;
+        }
       }
     }
     dest+=orowstride;
     src+=irowstride;
     odd=!odd;
-  } 
+  }
   return WEED_NO_ERROR;
 }
 
 
 
 
-weed_plant_t *weed_setup (weed_bootstrap_f weed_boot) {
+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);
   if (plugin_info!=NULL) {
-    int palette_list[]={WEED_PALETTE_BGR24,WEED_PALETTE_RGB24,WEED_PALETTE_RGBA32,WEED_PALETTE_BGRA32,WEED_PALETTE_ARGB32,WEED_PALETTE_END};
+    int palette_list[]= {WEED_PALETTE_BGR24,WEED_PALETTE_RGB24,WEED_PALETTE_RGBA32,WEED_PALETTE_BGRA32,WEED_PALETTE_ARGB32,WEED_PALETTE_END};
 
-    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",0,palette_list),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_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",0,palette_list),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);
+    weed_plugin_info_add_filter_class(plugin_info,filter_class);
 
     weed_set_int_value(plugin_info,"version",package_version);
   }

LiVES-2.2.8.tar.bz2/lives-plugins/weed-plugins/vertigo.c -> LiVES-2.4.1.tar.bz2/lives-plugins/weed-plugins/vertigo.c Changed

LiVES-2.2.8.tar.bz2/lives-plugins/weed-plugins/warpTV.c -> LiVES-2.4.1.tar.bz2/lives-plugins/weed-plugins/warpTV.c Changed

@@ -31,7 +31,7 @@
 ///////////////////////////////////////////////////////////////////
 
 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 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
 
@@ -70,15 +70,15 @@
 };
 
 
-static void initSinTable (struct _sdata *sdata) {
+static void initSinTable(struct _sdata *sdata) {
   Sint32 *tptr, *tsinptr;
   double i;
 
   tsinptr = tptr = sdata->sintable;
-  
+
   for (i = 0; i < 1024; i++)
-    *tptr++ = (int) (sin (i*M_PI/512) * 32767);
-  
+    *tptr++ = (int)(sin(i*M_PI/512) * 32767);
+
   for (i = 0; i < 256; i++)
     *tptr++ = *tsinptr++;
 }
@@ -86,39 +86,39 @@
 
 
 
-static void initDistTable (struct _sdata *sdata, int width, int height) {
+static void initDistTable(struct _sdata *sdata, int width, int height) {
   Sint32 halfw, halfh, *distptr;
 #ifdef PS2
   float	x,y,m;
 #else
-double x,y,m;
+  double x,y,m;
 #endif
 
   halfw = width/2.+.5;
   halfh = height/2.+.5;
-  
+
   distptr = sdata->disttable;
-  
-  m = sqrt ((double)(halfw*halfw + halfh*halfh));
-  
-for (y = -halfh; y < halfh; y++)
-     for (x= -halfw; x < halfw; x++)
+
+  m = sqrt((double)(halfw*halfw + halfh*halfh));
+
+  for (y = -halfh; y < halfh; y++)
+    for (x= -halfw; x < halfw; x++)
 #ifdef PS2
-     *distptr++ = ((int)
-     ( (sqrtf (x*x+y*y) * 511.100100) / m)) << 1;
+      *distptr++ = ((int)
+                    ((sqrtf(x*x+y*y) * 511.100100) / m)) << 1;
 #else
-  *distptr++ = ((int)
-     ( (sqrt (x*x+y*y) * 511.100100) / m)) << 1;
+      *distptr++ = ((int)
+                    ((sqrt(x*x+y*y) * 511.100100) / m)) << 1;
 #endif
 }
 
 
-static void doWarp (int xw, int yw, int cw,RGB32 *src,RGB32 *dst, int width, int height, int irow, int orow, struct _sdata *sdata) {
+static void doWarp(int xw, int yw, int cw,RGB32 *src,RGB32 *dst, int width, int height, int irow, int orow, struct _sdata *sdata) {
   Sint32 c,i, x,y, dx,dy, maxx, maxy;
   Sint32 skip, *ctptr, *distptr;
   Uint32 *destptr;
   //	Uint32 **offsptr;
-  
+
   ctptr = sdata->ctable;
   distptr = sdata->disttable;
   destptr = dst;
@@ -130,33 +130,34 @@
     *ctptr++ = ((sdata->sintable[i+256] * xw) >> 15);
     c += cw;
   }
-  maxx = width - 2; maxy = height - 2;
+  maxx = width - 2;
+  maxy = height - 2;
   /*	printf("Forring\n"); */
   for (y = 0; y < height-1; y++) {
     for (x = 0; x < width; x++) {
       i = *distptr;
       distptr++;
-      dx = sdata->ctable [i+1] + x; 
-      dy = sdata->ctable [i] + y;	 
-      
-      
-      if (dx < 0) dx = 0; 
-      else if (dx > maxx) dx = maxx; 
-      
-      if (dy < 0) dy = 0; 
-      else if (dy > maxy) dy = maxy; 
+      dx = sdata->ctable [i+1] + x;
+      dy = sdata->ctable [i] + y;
+
+
+      if (dx < 0) dx = 0;
+      else if (dx > maxx) dx = maxx;
+
+      if (dy < 0) dy = 0;
+      else if (dy > maxy) dy = maxy;
       /* 	   printf("f:%d\n",dy); */
       /*	   printf("%d\t%d\n",dx,dy); */
-      *destptr++ = src[dy*irow+dx]; 
+      *destptr++ = src[dy*irow+dx];
     }
     destptr += skip;
   }
-  
+
 }
 
 /////////////////////////////////////////////////////////////
 
-int warp_init (weed_plant_t *inst) {
+int warp_init(weed_plant_t *inst) {
   int video_height;
   int video_width;
   int error;
@@ -178,14 +179,14 @@
   video_height=video_height/2.+.5;
   video_height*=2;
 
-  sdata->disttable = weed_malloc (video_width * video_height * sizeof (int));
-  if(sdata->disttable == NULL ) {
+  sdata->disttable = weed_malloc(video_width * video_height * sizeof(int));
+  if (sdata->disttable == NULL) {
     weed_free(sdata);
     return WEED_ERROR_MEMORY_ALLOCATION;
   }
 
-  initSinTable (sdata);
-  initDistTable (sdata,video_width,video_height);
+  initSinTable(sdata);
+  initDistTable(sdata,video_width,video_height);
 
   sdata->tval=0;
 
@@ -195,7 +196,7 @@
 }
 
 
-int warp_deinit (weed_plant_t *inst) {
+int warp_deinit(weed_plant_t *inst) {
   int error;
   struct _sdata *sdata;
   sdata=weed_get_voidptr_value(inst,"plugin_internal",&error);
@@ -208,7 +209,7 @@
 }
 
 
-int warp_process (weed_plant_t *inst, weed_timecode_t timestamp) {
+int warp_process(weed_plant_t *inst, weed_timecode_t timestamp) {
   RGB32 *src,*dest;
   struct _sdata *sdata;
 
@@ -233,11 +234,11 @@
   orow = weed_get_int_value(out_channel,"rowstrides",&error)/4;
 
 
-  xw  = (int) (sin((sdata->tval+100)*M_PI/128) * 30);
-  yw  = (int) (sin((sdata->tval)*M_PI/256) * -35);
-  cw  = (int) (sin((sdata->tval-70)*M_PI/64) * 50);
-  xw += (int) (sin((sdata->tval-10)*M_PI/512) * 40);
-  yw += (int) (sin((sdata->tval+30)*M_PI/512) * 40);	  
+  xw  = (int)(sin((sdata->tval+100)*M_PI/128) * 30);
+  yw  = (int)(sin((sdata->tval)*M_PI/256) * -35);
+  cw  = (int)(sin((sdata->tval-70)*M_PI/64) * 50);
+  xw += (int)(sin((sdata->tval-10)*M_PI/512) * 40);
+  yw += (int)(sin((sdata->tval+30)*M_PI/512) * 40);
 
   doWarp(xw,yw,cw,src,dest,width,height,irow,orow,sdata);
   sdata->tval = (sdata->tval+1) &511;
@@ -248,18 +249,19 @@
 
 
 
-weed_plant_t *weed_setup (weed_bootstrap_f weed_boot) {
+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);
 
   if (plugin_info!=NULL) {
-    int palette_list[]={WEED_PALETTE_RGBA32,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",0,palette_list),NULL};
-    
-    weed_plant_t *filter_class=weed_filter_class_init("warpTV","effectTV",1,0,&warp_init,&warp_process,&warp_deinit,in_chantmpls,out_chantmpls,NULL,NULL);
-    
-    weed_plugin_info_add_filter_class (plugin_info,filter_class);
-    
+    int palette_list[]= {WEED_PALETTE_RGBA32,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",0,palette_list),NULL};
+
+    weed_plant_t *filter_class=weed_filter_class_init("warpTV","effectTV",1,0,&warp_init,&warp_process,&warp_deinit,in_chantmpls,out_chantmpls,
+                               NULL,NULL);
+
+    weed_plugin_info_add_filter_class(plugin_info,filter_class);
+
     weed_set_int_value(plugin_info,"version",package_version);
   }

LiVES-2.2.8.tar.bz2/lives-plugins/weed-plugins/weed-plugin-utils.c -> LiVES-2.4.1.tar.bz2/lives-plugins/weed-plugins/weed-plugin-utils.c Changed

@@ -62,7 +62,7 @@
 
 
 ///////////////////////////////////////////////////////////
-inline int _leaf_exists (weed_plant_t *plant, const char *key) {
+inline int _leaf_exists(weed_plant_t *plant, const char *key) {
   if (weed_leaf_get(plant,key,0,NULL)==WEED_ERROR_NOSUCH_LEAF) return 0;
   return 1;
 }
@@ -80,7 +80,7 @@
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
 
-weed_plant_t *weed_plugin_info_init (weed_bootstrap_f weed_boot, int num_versions, int *api_versions) {
+weed_plant_t *weed_plugin_info_init(weed_bootstrap_f weed_boot, int num_versions, int *api_versions) {
   /////////////////////////////////////////////////////////
   // get our bootstrap values
   // every plugin should call this in its weed_setup()
@@ -166,21 +166,21 @@
 }
 
 
-weed_plant_t *weed_channel_template_init (const char *name, int flags, int *palettes) {
+weed_plant_t *weed_channel_template_init(const char *name, int flags, int *palettes) {
   int i;
   weed_plant_t *chantmpl=weed_plant_new(WEED_PLANT_CHANNEL_TEMPLATE);
 
   weed_leaf_set(chantmpl,"name",WEED_SEED_STRING,1,&name);
   weed_leaf_set(chantmpl,"flags",WEED_SEED_INT,1,&flags);
 
-  for (i=0;palettes[i]!=WEED_PALETTE_END;i++);
+  for (i=0; palettes[i]!=WEED_PALETTE_END; i++);
   if (i==0) weed_leaf_set(chantmpl,"palette_list",WEED_SEED_INT,0,NULL);
   else weed_leaf_set(chantmpl,"palette_list",WEED_SEED_INT,i,palettes);
   return chantmpl;
 }
 
 
-weed_plant_t *weed_audio_channel_template_init (const char *name, int flags) {
+weed_plant_t *weed_audio_channel_template_init(const char *name, int flags) {
   int wtrue=WEED_TRUE;
   weed_plant_t *chantmpl=weed_plant_new(WEED_PLANT_CHANNEL_TEMPLATE);
 
@@ -191,7 +191,9 @@
 }
 
 
-weed_plant_t *weed_filter_class_init (const char *name, const char *author, int version, int flags, weed_init_f init_func, weed_process_f process_func, weed_deinit_f deinit_func, weed_plant_t **in_chantmpls, weed_plant_t **out_chantmpls, weed_plant_t **in_paramtmpls, weed_plant_t **out_paramtmpls) {
+weed_plant_t *weed_filter_class_init(const char *name, const char *author, int version, int flags, weed_init_f init_func,
+                                     weed_process_f process_func, weed_deinit_f deinit_func, weed_plant_t **in_chantmpls, weed_plant_t **out_chantmpls,
+                                     weed_plant_t **in_paramtmpls, weed_plant_t **out_paramtmpls) {
   int i;
   weed_plant_t *filter_class=weed_plant_new(WEED_PLANT_FILTER_CLASS);
 
@@ -218,40 +220,40 @@
 
   if (in_chantmpls==NULL||in_chantmpls[0]==NULL) weed_leaf_set(filter_class,"in_channel_templates",WEED_SEED_VOIDPTR,0,NULL);
   else {
-    for (i=0;in_chantmpls[i]!=NULL;i++);
+    for (i=0; in_chantmpls[i]!=NULL; i++);
     weed_leaf_set(filter_class,"in_channel_templates",WEED_SEED_PLANTPTR,i,in_chantmpls);
 
   }
 
   if (out_chantmpls==NULL||out_chantmpls[0]==NULL) weed_leaf_set(filter_class,"out_channel_templates",WEED_SEED_VOIDPTR,0,NULL);
   else {
-    for (i=0;out_chantmpls[i]!=NULL;i++);
+    for (i=0; out_chantmpls[i]!=NULL; i++);
     weed_leaf_set(filter_class,"out_channel_templates",WEED_SEED_PLANTPTR,i,out_chantmpls);
   }
 
   if (in_paramtmpls==NULL||in_paramtmpls[0]==NULL) weed_leaf_set(filter_class,"in_parameter_templates",WEED_SEED_VOIDPTR,0,NULL);
   else {
-    for (i=0;in_paramtmpls[i]!=NULL;i++);
+    for (i=0; in_paramtmpls[i]!=NULL; i++);
     weed_leaf_set(filter_class,"in_parameter_templates",WEED_SEED_PLANTPTR,i,in_paramtmpls);
   }
 
   if (out_paramtmpls==NULL||out_paramtmpls[0]==NULL) weed_leaf_set(filter_class,"out_parameter_templates",WEED_SEED_VOIDPTR,0,NULL);
   else {
-    for (i=0;out_paramtmpls[i]!=NULL;i++);
+    for (i=0; out_paramtmpls[i]!=NULL; i++);
     weed_leaf_set(filter_class,"out_parameter_templates",WEED_SEED_PLANTPTR,i,out_paramtmpls);
   }
-  
+
   return filter_class;
-} 
+}
 
 
-void weed_plugin_info_add_filter_class (weed_plant_t *plugin_info, weed_plant_t *filter_class) {
+void weed_plugin_info_add_filter_class(weed_plant_t *plugin_info, weed_plant_t *filter_class) {
   int num_filters=0,i;
   weed_plant_t **filters;
 
   if (_leaf_exists(plugin_info,"filters")) num_filters=weed_leaf_num_elements(plugin_info,"filters");
   filters=(weed_plant_t **)weed_malloc((num_filters+1)*sizeof(weed_plant_t *));
-  for (i=0;i<num_filters;i++) weed_leaf_get(plugin_info,"filters",i,&filters[i]);
+  for (i=0; i<num_filters; i++) weed_leaf_get(plugin_info,"filters",i,&filters[i]);
   filters[i]=filter_class;
   weed_leaf_set(plugin_info,"filters",WEED_SEED_PLANTPTR,i+1,filters);
   weed_leaf_set(filter_class,"plugin_info",WEED_SEED_PLANTPTR,1,&plugin_info);
@@ -259,7 +261,7 @@
 }
 
 
-weed_plant_t *weed_parameter_template_get_gui (weed_plant_t *paramt) {
+weed_plant_t *weed_parameter_template_get_gui(weed_plant_t *paramt) {
   weed_plant_t *gui;
 
   if (_leaf_exists(paramt,"gui")) {
@@ -273,7 +275,7 @@
 }
 
 
-weed_plant_t *weed_filter_class_get_gui (weed_plant_t *filter) {
+weed_plant_t *weed_filter_class_get_gui(weed_plant_t *filter) {
   weed_plant_t *gui;
 
   if (_leaf_exists(filter,"gui")) {
@@ -286,7 +288,7 @@
   return gui;
 }
 
-  
+
 weed_plant_t *weed_parameter_get_gui(weed_plant_t *param) {
   weed_plant_t *xtemplate;
 
@@ -301,7 +303,7 @@
 
 //////////////////////////////////////////////////////////////////////////////////////////////
 
-weed_plant_t *weed_integer_init (const char *name, const char *label, int def, int min, int max) {
+weed_plant_t *weed_integer_init(const char *name, const char *label, int def, int min, int max) {
   weed_plant_t *paramt=weed_plant_new(WEED_PLANT_PARAMETER_TEMPLATE);
   int hint=WEED_HINT_INTEGER;
   weed_plant_t *gui;
@@ -321,7 +323,7 @@
 }
 
 
-weed_plant_t *weed_string_list_init (const char *name, const char *label, int def, const char ** const list) {
+weed_plant_t *weed_string_list_init(const char *name, const char *label, int def, const char **const list) {
   int i=0;
   weed_plant_t *paramt,*gui;
   int min=0;
@@ -340,7 +342,7 @@
 }
 
 
-weed_plant_t *weed_switch_init (const char *name, const char *label, int def) {
+weed_plant_t *weed_switch_init(const char *name, const char *label, int def) {
   weed_plant_t *paramt=weed_plant_new(WEED_PLANT_PARAMETER_TEMPLATE);
   int hint=WEED_HINT_SWITCH;
   weed_plant_t *gui;
@@ -357,7 +359,7 @@
   return paramt;
 }
 
-weed_plant_t *weed_radio_init (const char *name, const char *label, int def, int group) {
+weed_plant_t *weed_radio_init(const char *name, const char *label, int def, int group) {
   weed_plant_t *paramt=weed_switch_init(name,label,def);
   weed_leaf_set(paramt,"group",WEED_SEED_INT,1,&group);
   return paramt;
@@ -365,7 +367,7 @@
 
 
 
-weed_plant_t *weed_float_init (const char *name, const char *label, double def, double min, double max) {
+weed_plant_t *weed_float_init(const char *name, const char *label, double def, double min, double max) {
   weed_plant_t *paramt=weed_plant_new(WEED_PLANT_PARAMETER_TEMPLATE);
   int hint=WEED_HINT_FLOAT;
   weed_plant_t *gui;
@@ -385,7 +387,7 @@
 }
 
 
-weed_plant_t *weed_text_init (const char *name, const char *label, const char *def) {
+weed_plant_t *weed_text_init(const char *name, const char *label, const char *def) {
   weed_plant_t *paramt=weed_plant_new(WEED_PLANT_PARAMETER_TEMPLATE);
   int hint=WEED_HINT_TEXT;
   weed_plant_t *gui;
@@ -403,11 +405,11 @@
 }
 
 
-weed_plant_t *weed_colRGBi_init (const char *name, const char *label, int red, int green, int blue) {
+weed_plant_t *weed_colRGBi_init(const char *name, const char *label, int red, int green, int blue) {
   weed_plant_t *paramt=weed_plant_new(WEED_PLANT_PARAMETER_TEMPLATE);
   int hint=WEED_HINT_COLOR;
   int cspace=WEED_COLORSPACE_RGB;
-  int def[3]={red,green,blue};
+  int def[3]= {red,green,blue};
   int min=0;
   int max=255;
   weed_plant_t *gui;
@@ -429,11 +431,11 @@
 }
 
 
-weed_plant_t *weed_colRGBd_init (const char *name, const char *label, double red, double green, double blue) {
+weed_plant_t *weed_colRGBd_init(const char *name, const char *label, double red, double green, double blue) {
   weed_plant_t *paramt=weed_plant_new(WEED_PLANT_PARAMETER_TEMPLATE);
   int hint=WEED_HINT_COLOR;
   int cspace=WEED_COLORSPACE_RGB;
-  double def[3]={red,green,blue};
+  double def[3]= {red,green,blue};
   double min=0.;
   double max=1.;
   weed_plant_t *gui;
@@ -455,7 +457,7 @@
 }
 
 
-weed_plant_t *weed_out_param_integer_init (const char *name, int def, int min, int max) {
+weed_plant_t *weed_out_param_integer_init(const char *name, int def, int min, int max) {
   weed_plant_t *paramt=weed_plant_new(WEED_PLANT_PARAMETER_TEMPLATE);
   int hint=WEED_HINT_INTEGER;
 
@@ -468,7 +470,7 @@
 }
 
 
-weed_plant_t *weed_out_param_integer_init_nominmax (const char *name, int def) {
+weed_plant_t *weed_out_param_integer_init_nominmax(const char *name, int def) {
   weed_plant_t *paramt=weed_plant_new(WEED_PLANT_PARAMETER_TEMPLATE);
   int hint=WEED_HINT_INTEGER;
 
@@ -479,7 +481,7 @@
 }
 
 
-weed_plant_t *weed_out_param_switch_init (const char *name, int def) {
+weed_plant_t *weed_out_param_switch_init(const char *name, int def) {
   weed_plant_t *paramt=weed_plant_new(WEED_PLANT_PARAMETER_TEMPLATE);
   int hint=WEED_HINT_SWITCH;
   weed_leaf_set(paramt,"name",WEED_SEED_STRING,1,&name);
@@ -490,7 +492,7 @@
 
 
 
-weed_plant_t *weed_out_param_float_init (const char *name, double def, double min, double max) {
+weed_plant_t *weed_out_param_float_init(const char *name, double def, double min, double max) {
   weed_plant_t *paramt=weed_plant_new(WEED_PLANT_PARAMETER_TEMPLATE);
   int hint=WEED_HINT_FLOAT;
 
@@ -505,7 +507,7 @@
 
 
 
-weed_plant_t *weed_out_param_float_init_nominmax (const char *name, double def) {
+weed_plant_t *weed_out_param_float_init_nominmax(const char *name, double def) {
   weed_plant_t *paramt=weed_plant_new(WEED_PLANT_PARAMETER_TEMPLATE);
   int hint=WEED_HINT_FLOAT;
 
@@ -518,7 +520,7 @@
 
 
 
-weed_plant_t *weed_out_param_text_init (const char *name, const char *def) {
+weed_plant_t *weed_out_param_text_init(const char *name, const char *def) {
   weed_plant_t *paramt=weed_plant_new(WEED_PLANT_PARAMETER_TEMPLATE);
   int hint=WEED_HINT_TEXT;
 
@@ -531,11 +533,11 @@
 
 
 
-weed_plant_t *weed_out_param_colRGBi_init (const char *name, int red, int green, int blue) {
+weed_plant_t *weed_out_param_colRGBi_init(const char *name, int red, int green, int blue) {
   weed_plant_t *paramt=weed_plant_new(WEED_PLANT_PARAMETER_TEMPLATE);
   int hint=WEED_HINT_COLOR;
   int cspace=WEED_COLORSPACE_RGB;
-  int def[3]={red,green,blue};
+  int def[3]= {red,green,blue};
   int min=0;
   int max=255;
 
@@ -552,11 +554,11 @@
 
 
 
-weed_plant_t *weed_out_param_colRGBd_init (const char *name, double red, double green, double blue) {
+weed_plant_t *weed_out_param_colRGBd_init(const char *name, double red, double green, double blue) {
   weed_plant_t *paramt=weed_plant_new(WEED_PLANT_PARAMETER_TEMPLATE);
   int hint=WEED_HINT_COLOR;
   int cspace=WEED_COLORSPACE_RGB;
-  double def[3]={red,green,blue};
+  double def[3]= {red,green,blue};
   double min=0.;
   double max=1.;
 
@@ -575,7 +577,7 @@
 
 ///////////////////////////////////////////////////////////////////////
 
-static void _weed_clone_leaf (weed_plant_t *from, const char *key, weed_plant_t *to) {
+static void _weed_clone_leaf(weed_plant_t *from, const char *key, weed_plant_t *to) {
   int i,num=weed_leaf_num_elements(from,key);
 
   int *datai;
@@ -593,50 +595,50 @@
     switch (seed_type) {
     case WEED_SEED_INT:
       datai=(int *)weed_malloc(num*sizeof(int));
-      for (i=0;i<num;i++) weed_leaf_get(from,key,i,&datai[i]);
+      for (i=0; i<num; i++) weed_leaf_get(from,key,i,&datai[i]);
       weed_leaf_set(to,key,WEED_SEED_INT,num,datai);
       weed_free(datai);
       break;
     case WEED_SEED_INT64:
       datai6=(int64_t *)weed_malloc(num*sizeof(int64_t));
-      for (i=0;i<num;i++) weed_leaf_get(from,key,i,&datai6[i]);
+      for (i=0; i<num; i++) weed_leaf_get(from,key,i,&datai6[i]);
       weed_leaf_set(to,key,WEED_SEED_INT64,num,datai6);
       weed_free(datai6);
       break;
     case WEED_SEED_BOOLEAN:
       datai=(int *)weed_malloc(num*sizeof(int));
-      for (i=0;i<num;i++) weed_leaf_get(from,key,i,&datai[i]);
+      for (i=0; i<num; i++) weed_leaf_get(from,key,i,&datai[i]);
       weed_leaf_set(to,key,WEED_SEED_BOOLEAN,num,datai);
       weed_free(datai);
       break;
     case WEED_SEED_DOUBLE:
       datad=(double *)weed_malloc(num*sizeof(double));
-      for (i=0;i<num;i++) weed_leaf_get(from,key,i,&datad[i]);
+      for (i=0; i<num; i++) weed_leaf_get(from,key,i,&datad[i]);
       weed_leaf_set(to,key,WEED_SEED_DOUBLE,num,datad);
       weed_free(datad);
       break;
     case WEED_SEED_VOIDPTR:
       datav=(void **)weed_malloc(num*sizeof(void *));
-      for (i=0;i<num;i++) weed_leaf_get(from,key,i,&datav[i]);
+      for (i=0; i<num; i++) weed_leaf_get(from,key,i,&datav[i]);
       weed_leaf_set(to,key,WEED_SEED_VOIDPTR,num,datav);
       weed_free(datav);
       break;
     case WEED_SEED_PLANTPTR:
       datap=(weed_plant_t **)weed_malloc(num*sizeof(weed_plant_t *));
-      for (i=0;i<num;i++) weed_leaf_get(from,key,i,&datap[i]);
+      for (i=0; i<num; i++) weed_leaf_get(from,key,i,&datap[i]);
       weed_leaf_set(to,key,WEED_SEED_PLANTPTR,num,datap);
       weed_free(datap);
       break;
     case WEED_SEED_STRING:
       datac=(char **)weed_malloc(num*sizeof(char *));
-      for (i=0;i<num;i++) {
-	stlen=weed_leaf_element_size(from,key,i);
-	datac[i]=(char *)weed_malloc(stlen+1);
-	weed_leaf_get(from,key,i,&datac[i]);
-	weed_memset(datac[i]+stlen,0,1);
+      for (i=0; i<num; i++) {
+        stlen=weed_leaf_element_size(from,key,i);
+        datac[i]=(char *)weed_malloc(stlen+1);
+        weed_leaf_get(from,key,i,&datac[i]);
+        weed_memset(datac[i]+stlen,0,1);
       }
       weed_leaf_set(to,key,WEED_SEED_STRING,num,datac);
-      for (i=0;i<num;i++) weed_free(datac[i]);
+      for (i=0; i<num; i++) weed_free(datac[i]);
       weed_free(datac);
       break;
     }
@@ -644,33 +646,32 @@
 }
 
 
-weed_plant_t **weed_clone_plants (weed_plant_t **plants) {
+weed_plant_t **weed_clone_plants(weed_plant_t **plants) {
   //plants must be a NULL terminated array
   int i,j,k,type,num_plants;
   weed_plant_t **ret,*gui,*gui2;
   char **leaves,**leaves2;
-  for (i=0;plants[i]!=NULL;i++);
+  for (i=0; plants[i]!=NULL; i++);
   num_plants=i;
   ret=(weed_plant_t **)weed_malloc((num_plants+1)*sizeof(weed_plant_t *));
 
-  for (i=0;i<num_plants;i++) {
+  for (i=0; i<num_plants; i++) {
     weed_leaf_get(plants[i],"type",0,&type);
     ret[i]=weed_plant_new(type);
 
     leaves=weed_plant_list_leaves(plants[i]);
-    for (j=0;leaves[j]!=NULL;j++) {
+    for (j=0; leaves[j]!=NULL; j++) {
       if (!strcmp(leaves[j],"gui")) {
-	weed_leaf_get(plants[i],"gui",0,&gui);
-	gui2=weed_plant_new(WEED_PLANT_GUI);
-	weed_leaf_set(ret[i],"gui",WEED_SEED_PLANTPTR,1,&gui2);
-	leaves2=weed_plant_list_leaves(gui);
-	for (k=0;leaves2[k]!=NULL;k++) {
-	  _weed_clone_leaf(gui,leaves2[k],gui2);
-	  weed_free(leaves2[k]);
-	}
-	weed_free(leaves2);
-      }
-      else _weed_clone_leaf(plants[i],leaves[j],ret[i]);
+        weed_leaf_get(plants[i],"gui",0,&gui);
+        gui2=weed_plant_new(WEED_PLANT_GUI);
+        weed_leaf_set(ret[i],"gui",WEED_SEED_PLANTPTR,1,&gui2);
+        leaves2=weed_plant_list_leaves(gui);
+        for (k=0; leaves2[k]!=NULL; k++) {
+          _weed_clone_leaf(gui,leaves2[k],gui2);
+          weed_free(leaves2[k]);
+        }
+        weed_free(leaves2);
+      } else _weed_clone_leaf(plants[i],leaves[j],ret[i]);
       weed_free(leaves[j]);
     }
     weed_free(leaves);

LiVES-2.2.8.tar.bz2/lives-plugins/weed-plugins/weed-utils-code.c -> LiVES-2.4.1.tar.bz2/lives-plugins/weed-plugins/weed-utils-code.c Changed

@@ -57,7 +57,7 @@
 
 /////////////////////////////////////////////////////////////////
 
-static int weed_plant_has_leaf (weed_plant_t *plant, const char *key) {
+static int weed_plant_has_leaf(weed_plant_t *plant, const char *key) {
   if (weed_leaf_get(plant,key,0,NULL)==WEED_ERROR_NOSUCH_LEAF) return WEED_FALSE;
   return WEED_TRUE;
 }
@@ -65,92 +65,91 @@
 /////////////////////////////////////////////////////////////////
 // leaf setters
 
-static int weed_set_int_value (weed_plant_t *plant, const char *key, int value) {
+static int weed_set_int_value(weed_plant_t *plant, const char *key, int value) {
   // returns a WEED_ERROR
-  return weed_leaf_set (plant,key,WEED_SEED_INT,1,&value);
+  return weed_leaf_set(plant,key,WEED_SEED_INT,1,&value);
 }
 
-static int weed_set_double_value (weed_plant_t *plant, const char *key, double value) {
+static int weed_set_double_value(weed_plant_t *plant, const char *key, double value) {
   // returns a WEED_ERROR
-  return weed_leaf_set (plant,key,WEED_SEED_DOUBLE,1,&value);
+  return weed_leaf_set(plant,key,WEED_SEED_DOUBLE,1,&value);
 }
 
-static int weed_set_boolean_value (weed_plant_t *plant, const char *key, int value) {
+static int weed_set_boolean_value(weed_plant_t *plant, const char *key, int value) {
   // returns a WEED_ERROR
-  return weed_leaf_set (plant,key,WEED_SEED_BOOLEAN,1,&value);
+  return weed_leaf_set(plant,key,WEED_SEED_BOOLEAN,1,&value);
 }
 
-static int weed_set_int64_value (weed_plant_t *plant, const char *key, int64_t value) {
+static int weed_set_int64_value(weed_plant_t *plant, const char *key, int64_t value) {
   // returns a WEED_ERROR
-  return weed_leaf_set (plant,key,WEED_SEED_INT64,1,&value);
+  return weed_leaf_set(plant,key,WEED_SEED_INT64,1,&value);
 }
 
-static int weed_set_string_value (weed_plant_t *plant, const char *key, const char *value) {
+static int weed_set_string_value(weed_plant_t *plant, const char *key, const char *value) {
   // returns a WEED_ERROR
-  return weed_leaf_set (plant,key,WEED_SEED_STRING,1,&value);
+  return weed_leaf_set(plant,key,WEED_SEED_STRING,1,&value);
 }
 
-static int weed_set_plantptr_value (weed_plant_t *plant, const char *key, weed_plant_t *value) {
+static int weed_set_plantptr_value(weed_plant_t *plant, const char *key, weed_plant_t *value) {
   // returns a WEED_ERROR
-  return weed_leaf_set (plant,key,WEED_SEED_PLANTPTR,1,&value);
+  return weed_leaf_set(plant,key,WEED_SEED_PLANTPTR,1,&value);
 }
 
-static int weed_set_voidptr_value (weed_plant_t *plant, const char *key, void *value) {
+static int weed_set_voidptr_value(weed_plant_t *plant, const char *key, void *value) {
   // returns a WEED_ERROR
-  return weed_leaf_set (plant,key,WEED_SEED_VOIDPTR,1,&value);
+  return weed_leaf_set(plant,key,WEED_SEED_VOIDPTR,1,&value);
 }
 
 //////////////////////////////////////////////////////////////////////////////////////////////////
 // general leaf getter
 
-inline static int weed_get_value (weed_plant_t *plant, const char *key, void *value) {
+inline static int weed_get_value(weed_plant_t *plant, const char *key, void *value) {
   // returns a WEED_ERROR
   return weed_leaf_get(plant, key, 0, value);
 }
 
 ////////////////////////////////////////////////////////////
 
-static int weed_get_int_value (weed_plant_t *plant, const char *key, int *error) {
+static int weed_get_int_value(weed_plant_t *plant, const char *key, int *error) {
   int retval=0;
   if (weed_plant_has_leaf(plant,key)&&weed_leaf_seed_type(plant,key)!=WEED_SEED_INT) {
     *error=WEED_ERROR_WRONG_SEED_TYPE;
     return retval;
-  }
-  else *error=weed_get_value (plant,key,&retval);
+  } else *error=weed_get_value(plant,key,&retval);
   return retval;
 }
 
-static double weed_get_double_value (weed_plant_t *plant, const char *key, int *error) {
+static double weed_get_double_value(weed_plant_t *plant, const char *key, int *error) {
   double retval=0.;
   if (weed_plant_has_leaf(plant,key)&&weed_leaf_seed_type(plant,key)!=WEED_SEED_DOUBLE) {
     *error=WEED_ERROR_WRONG_SEED_TYPE;
     return retval;
   }
-  *error=weed_get_value (plant,key,&retval);
+  *error=weed_get_value(plant,key,&retval);
   return retval;
 }
 
-static int weed_get_boolean_value (weed_plant_t *plant, const char *key, int *error) {
+static int weed_get_boolean_value(weed_plant_t *plant, const char *key, int *error) {
   int retval=0;
   if (weed_plant_has_leaf(plant,key)&&weed_leaf_seed_type(plant,key)!=WEED_SEED_BOOLEAN) {
     *error=WEED_ERROR_WRONG_SEED_TYPE;
     return retval;
   }
-  *error=weed_get_value (plant,key,&retval);
+  *error=weed_get_value(plant,key,&retval);
   return retval;
 }
 
-static int64_t weed_get_int64_value (weed_plant_t *plant, const char *key, int *error) {
+static int64_t weed_get_int64_value(weed_plant_t *plant, const char *key, int *error) {
   int64_t retval=0;
   if (weed_plant_has_leaf(plant,key)&&weed_leaf_seed_type(plant,key)!=WEED_SEED_INT64) {
     *error=WEED_ERROR_WRONG_SEED_TYPE;
     return retval;
   }
-  *error=weed_get_value (plant,key,&retval);
+  *error=weed_get_value(plant,key,&retval);
   return retval;
 }
 
-static char *weed_get_string_value (weed_plant_t *plant, const char *key, int *error) {
+static char *weed_get_string_value(weed_plant_t *plant, const char *key, int *error) {
   size_t size;
   char *retval=NULL;
   if (weed_plant_has_leaf(plant,key)&&weed_leaf_seed_type(plant,key)!=WEED_SEED_STRING) {
@@ -161,38 +160,38 @@
     *error=WEED_ERROR_MEMORY_ALLOCATION;
     return NULL;
   }
-  if ((*error=weed_get_value (plant,key,&retval))!=WEED_NO_ERROR) {
-    weed_free (retval);
+  if ((*error=weed_get_value(plant,key,&retval))!=WEED_NO_ERROR) {
+    weed_free(retval);
     return NULL;
   }
   weed_memset(retval+size,0,1);
   return retval;
 }
 
-static void *weed_get_voidptr_value (weed_plant_t *plant, const char *key, int *error) {
+static void *weed_get_voidptr_value(weed_plant_t *plant, const char *key, int *error) {
   void *retval=NULL;
   if (weed_plant_has_leaf(plant,key)&&weed_leaf_seed_type(plant,key)!=WEED_SEED_VOIDPTR) {
     *error=WEED_ERROR_WRONG_SEED_TYPE;
     return retval;
   }
-  *error=weed_get_value (plant,key,&retval);
+  *error=weed_get_value(plant,key,&retval);
   return retval;
 }
 
-static weed_plant_t *weed_get_plantptr_value (weed_plant_t *plant, const char *key, int *error) {
+static weed_plant_t *weed_get_plantptr_value(weed_plant_t *plant, const char *key, int *error) {
   weed_plant_t *retval=NULL;
   if (weed_plant_has_leaf(plant,key)&&weed_leaf_seed_type(plant,key)!=WEED_SEED_PLANTPTR) {
     *error=WEED_ERROR_WRONG_SEED_TYPE;
     return retval;
   }
-  *error=weed_get_value (plant,key,&retval);
+  *error=weed_get_value(plant,key,&retval);
   return retval;
 }
 
 
 ////////////////////////////////////////////////////////////
 
-static int *weed_get_int_array (weed_plant_t *plant, const char *key, int *error) {
+static int *weed_get_int_array(weed_plant_t *plant, const char *key, int *error) {
   int i;
   int num_elems;
   int *retval;
@@ -202,23 +201,23 @@
     return NULL;
   }
 
-  if ((num_elems=weed_leaf_num_elements (plant,key))==0) return NULL;
+  if ((num_elems=weed_leaf_num_elements(plant,key))==0) return NULL;
 
   if ((retval=(int *)weed_malloc(num_elems*4))==NULL) {
     *error=WEED_ERROR_MEMORY_ALLOCATION;
     return NULL;
   }
 
-  for (i=0;i<num_elems;i++) {
+  for (i=0; i<num_elems; i++) {
     if ((*error=weed_leaf_get(plant, key, i, &retval[i]))!=WEED_NO_ERROR) {
-      weed_free (retval);
+      weed_free(retval);
       return NULL;
     }
   }
   return retval;
 }
 
-static double *weed_get_double_array (weed_plant_t *plant, const char *key, int *error) {
+static double *weed_get_double_array(weed_plant_t *plant, const char *key, int *error) {
   int i;
   int num_elems;
   double *retval;
@@ -227,23 +226,23 @@
     *error=WEED_ERROR_WRONG_SEED_TYPE;
     return NULL;
   }
-  if ((num_elems=weed_leaf_num_elements (plant,key))==0) return NULL;
+  if ((num_elems=weed_leaf_num_elements(plant,key))==0) return NULL;
 
   if ((retval=(double *)weed_malloc(num_elems*sizeof(double)))==NULL) {
     *error=WEED_ERROR_MEMORY_ALLOCATION;
     return NULL;
   }
 
-  for (i=0;i<num_elems;i++) {
+  for (i=0; i<num_elems; i++) {
     if ((*error=weed_leaf_get(plant, key, i, &retval[i]))!=WEED_NO_ERROR) {
-      weed_free (retval);
+      weed_free(retval);
       return NULL;
     }
   }
   return retval;
 }
 
-static int *weed_get_boolean_array (weed_plant_t *plant, const char *key, int *error) {
+static int *weed_get_boolean_array(weed_plant_t *plant, const char *key, int *error) {
   int i;
   int num_elems;
   int *retval;
@@ -253,23 +252,23 @@
     return NULL;
   }
 
-  if ((num_elems=weed_leaf_num_elements (plant,key))==0) return NULL;
+  if ((num_elems=weed_leaf_num_elements(plant,key))==0) return NULL;
 
   if ((retval=(int *)weed_malloc(num_elems*4))==NULL) {
     *error=WEED_ERROR_MEMORY_ALLOCATION;
     return NULL;
   }
 
-  for (i=0;i<num_elems;i++) {
+  for (i=0; i<num_elems; i++) {
     if ((*error=weed_leaf_get(plant, key, i, &retval[i]))!=WEED_NO_ERROR) {
-      weed_free (retval);
+      weed_free(retval);
       return NULL;
     }
   }
   return retval;
 }
 
-static int64_t *weed_get_int64_array (weed_plant_t *plant, const char *key, int *error) {
+static int64_t *weed_get_int64_array(weed_plant_t *plant, const char *key, int *error) {
   int i;
   int num_elems;
   int64_t *retval;
@@ -279,23 +278,23 @@
     return NULL;
   }
 
-  if ((num_elems=weed_leaf_num_elements (plant,key))==0) return NULL;
+  if ((num_elems=weed_leaf_num_elements(plant,key))==0) return NULL;
 
   if ((retval=(int64_t *)weed_malloc(num_elems*8))==NULL) {
     *error=WEED_ERROR_MEMORY_ALLOCATION;
     return NULL;
   }
 
-  for (i=0;i<num_elems;i++) {
+  for (i=0; i<num_elems; i++) {
     if ((*error=weed_leaf_get(plant, key, i, &retval[i]))!=WEED_NO_ERROR) {
-      weed_free (retval);
+      weed_free(retval);
       return NULL;
     }
   }
   return retval;
 }
 
-static char **weed_get_string_array (weed_plant_t *plant, const char *key, int *error) {
+static char **weed_get_string_array(weed_plant_t *plant, const char *key, int *error) {
   int i;
   int num_elems;
   char **retval;
@@ -306,23 +305,23 @@
     return NULL;
   }
 
-  if ((num_elems=weed_leaf_num_elements (plant,key))==0) return NULL;
+  if ((num_elems=weed_leaf_num_elements(plant,key))==0) return NULL;
 
   if ((retval=(char **)weed_malloc(num_elems*sizeof(char *)))==NULL) {
     *error=WEED_ERROR_MEMORY_ALLOCATION;
     return NULL;
   }
 
-  for (i=0;i<num_elems;i++) {
+  for (i=0; i<num_elems; i++) {
     if ((retval[i]=(char *)weed_malloc((size=weed_leaf_element_size(plant,key,i))+1))==NULL) {
-      for (--i;i>=0;i--) weed_free(retval[i]);
+      for (--i; i>=0; i--) weed_free(retval[i]);
       *error=WEED_ERROR_MEMORY_ALLOCATION;
-      weed_free (retval);
+      weed_free(retval);
       return NULL;
     }
     if ((*error=weed_leaf_get(plant, key, i, &retval[i]))!=WEED_NO_ERROR) {
-      for (--i;i>=0;i--) weed_free(retval[i]);
-      weed_free (retval);
+      for (--i; i>=0; i--) weed_free(retval[i]);
+      weed_free(retval);
       return NULL;
     }
     weed_memset(retval[i]+size,0,1);
@@ -330,7 +329,7 @@
   return retval;
 }
 
-static void **weed_get_voidptr_array (weed_plant_t *plant, const char *key, int *error) {
+static void **weed_get_voidptr_array(weed_plant_t *plant, const char *key, int *error) {
   int i;
   int num_elems;
   void **retval;
@@ -340,23 +339,23 @@
     return NULL;
   }
 
-  if ((num_elems=weed_leaf_num_elements (plant,key))==0) return NULL;
+  if ((num_elems=weed_leaf_num_elements(plant,key))==0) return NULL;
 
   if ((retval=(void **)weed_malloc(num_elems*sizeof(void *)))==NULL) {
     *error=WEED_ERROR_MEMORY_ALLOCATION;
     return NULL;
   }
 
-  for (i=0;i<num_elems;i++) {
+  for (i=0; i<num_elems; i++) {
     if ((*error=weed_leaf_get(plant, key, i, &retval[i]))!=WEED_NO_ERROR) {
-      weed_free (retval);
+      weed_free(retval);
       return NULL;
     }
   }
   return retval;
 }
 
-static weed_plant_t **weed_get_plantptr_array (weed_plant_t *plant, const char *key, int *error) {
+static weed_plant_t **weed_get_plantptr_array(weed_plant_t *plant, const char *key, int *error) {
   int i;
   int num_elems;
   weed_plant_t **retval;
@@ -366,16 +365,16 @@
     return NULL;
   }
 
-  if ((num_elems=weed_leaf_num_elements (plant,key))==0) return NULL;
+  if ((num_elems=weed_leaf_num_elements(plant,key))==0) return NULL;
 
   if ((retval=(weed_plant_t **)weed_malloc(num_elems*sizeof(weed_plant_t *)))==NULL) {
     *error=WEED_ERROR_MEMORY_ALLOCATION;
     return NULL;
   }
 
-  for (i=0;i<num_elems;i++) {
+  for (i=0; i<num_elems; i++) {
     if ((*error=weed_leaf_get(plant, key, i, &retval[i]))!=WEED_NO_ERROR) {
-      weed_free (retval);
+      weed_free(retval);
       return NULL;
     }
   }
@@ -384,30 +383,30 @@
 
 /////////////////////////////////////////////////////
 
-static int weed_set_int_array (weed_plant_t *plant, const char *key, int num_elems, int *values) {
-  return weed_leaf_set (plant,key,WEED_SEED_INT,num_elems,values);
+static int weed_set_int_array(weed_plant_t *plant, const char *key, int num_elems, int *values) {
+  return weed_leaf_set(plant,key,WEED_SEED_INT,num_elems,values);
 }
 
-static int weed_set_double_array (weed_plant_t *plant, const char *key, int num_elems, double *values) {
-  return weed_leaf_set (plant,key,WEED_SEED_DOUBLE,num_elems,values);
+static int weed_set_double_array(weed_plant_t *plant, const char *key, int num_elems, double *values) {
+  return weed_leaf_set(plant,key,WEED_SEED_DOUBLE,num_elems,values);
 }
 
-static int weed_set_boolean_array (weed_plant_t *plant, const char *key, int num_elems, int *values) {
-  return weed_leaf_set (plant,key,WEED_SEED_BOOLEAN,num_elems,values);
+static int weed_set_boolean_array(weed_plant_t *plant, const char *key, int num_elems, int *values) {
+  return weed_leaf_set(plant,key,WEED_SEED_BOOLEAN,num_elems,values);
 }
 
-static int weed_set_int64_array (weed_plant_t *plant, const char *key, int num_elems, int64_t *values) {
-  return weed_leaf_set (plant,key,WEED_SEED_INT64,num_elems,values);
+static int weed_set_int64_array(weed_plant_t *plant, const char *key, int num_elems, int64_t *values) {
+  return weed_leaf_set(plant,key,WEED_SEED_INT64,num_elems,values);
 }
 
-static int weed_set_string_array (weed_plant_t *plant, const char *key, int num_elems, char **values) {
-  return weed_leaf_set (plant,key,WEED_SEED_STRING,num_elems,values);
+static int weed_set_string_array(weed_plant_t *plant, const char *key, int num_elems, char **values) {
+  return weed_leaf_set(plant,key,WEED_SEED_STRING,num_elems,values);
 }
 
-static int weed_set_voidptr_array (weed_plant_t *plant, const char *key, int num_elems, void **values) {
-  return weed_leaf_set (plant,key,WEED_SEED_VOIDPTR,num_elems,values);
+static int weed_set_voidptr_array(weed_plant_t *plant, const char *key, int num_elems, void **values) {
+  return weed_leaf_set(plant,key,WEED_SEED_VOIDPTR,num_elems,values);
 }
 
-static int weed_set_plantptr_array (weed_plant_t *plant, const char *key, int num_elems, weed_plant_t **values) {
-  return weed_leaf_set (plant,key,WEED_SEED_PLANTPTR,num_elems,values);
+static int weed_set_plantptr_array(weed_plant_t *plant, const char *key, int num_elems, weed_plant_t **values) {
+  return weed_leaf_set(plant,key,WEED_SEED_PLANTPTR,num_elems,values);
 }

LiVES-2.2.8.tar.bz2/lives-plugins/weed-plugins/xeffect.c -> LiVES-2.4.1.tar.bz2/lives-plugins/weed-plugins/xeffect.c Changed

LiVES-2.2.8.tar.bz2/po/ar.po -> LiVES-2.4.1.tar.bz2/po/ar.po Changed

@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n"
-"POT-Creation-Date: 2015-02-08 17:18-0300\n"
+"POT-Creation-Date: 2015-08-09 14:52-0300\n"
 "PO-Revision-Date: 2013-03-14 12:31+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Arabic <ar@li.org>\n"
@@ -18,8 +18,7 @@
 "X-Launchpad-Export-Date: 2013-03-28 10:41+0000\n"
 "X-Generator: Launchpad (build 16546)\n"
 
-#. TRANSLATORS: do not translate this message
-#: src/main.c:118
+#: src/main.c:128
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -28,22 +27,22 @@
 "http://lives.sourceforge.net/TRANS-README.txt"
 msgstr ""
 
-#: src/main.c:134
+#: src/main.c:153
 #, c-format
 msgid "%s Warning: %s\n"
 msgstr ""
 
-#: src/main.c:138
+#: src/main.c:157
 #, c-format
 msgid "%s Critical error: %s\n"
 msgstr ""
 
-#: src/main.c:139
+#: src/main.c:158
 #, c-format
 msgid "%s Fatal error: %s\n"
 msgstr ""
 
-#: src/main.c:176
+#: src/main.c:198
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -57,7 +56,7 @@
 "group_id=64341&atid=507139\n"
 "سيتم إنعاش البرنامج بعد إعادة تشغيله. وشكرا\n"
 
-#: src/main.c:177
+#: src/main.c:199
 msgid ""
 "\n"
 "\n"
@@ -69,7 +68,7 @@
 "عند الإبلاغ عن العثرات ، يرجى ذِكر نظام التشغيل الخاص بك ، والتوزيعة ، "
 "وإصدارة البرنامج."
 
-#: src/main.c:180
+#: src/main.c:203
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -77,7 +76,7 @@
 "وأية معلومات موضحة أدناه.\n"
 "\n"
 
-#: src/main.c:184
+#: src/main.c:206
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
@@ -87,84 +86,84 @@
 "المعلومات.\n"
 "\n"
 
-#: src/main.c:192
+#: src/main.c:216
 msgid "Preserving set.\n"
 msgstr "الحفاظ على ضبط\n"
 
-#: src/main.c:636
+#: src/main.c:691
 msgid "Resizing"
 msgstr "غيّر حجم"
 
-#: src/main.c:643
+#: src/main.c:698
 msgid "_Resize All Frames"
 msgstr "غيّر حجم جميع الإطارات"
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:895
+#: src/main.c:948
 msgid "Any"
 msgstr "أيّ"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:897
+#: src/main.c:950
 msgid "None"
 msgstr "بدون"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:899
+#: src/main.c:952
 msgid "recommended"
 msgstr "مستحسن"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:901
+#: src/main.c:954
 msgid "disabled !"
 msgstr "معطّل !"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:903
+#: src/main.c:956
 msgid "**The current layout**"
 msgstr "**التخطيط الحالي**"
 
 #. TRANSLATORS: adjective for "Built in" type effects
-#: src/main.c:905
+#: src/main.c:958
 msgid "Builtin"
 msgstr "مُضمَّن"
 
 #. TRANSLATORS: adjective for "Custom" type effects
-#: src/main.c:907
+#: src/main.c:960
 msgid "Custom"
 msgstr "مخصص"
 
 #. TRANSLATORS: adjective for "Test" type effects
-#: src/main.c:909
+#: src/main.c:962
 msgid "Test"
 msgstr "اختبار"
 
-#: src/main.c:1054
+#: src/main.c:1107
 msgid "Foreground"
 msgstr ""
 
-#: src/main.c:1055
+#: src/main.c:1108
 #, fuzzy
 msgid "Background"
 msgstr "_خلفية بيضاء"
 
-#: src/main.c:1566
+#: src/main.c:1624
 msgid "Loading realtime effect plugins..."
 msgstr "تحميل إضافات مؤثرات الوقت الحقيقي..."
 
-#: src/main.c:1631
+#: src/main.c:1690
 msgid "Starting jack audio server..."
 msgstr "بدء خادوم جاك الصوت..."
 
-#: src/main.c:1633
+#: src/main.c:1692
 msgid "Starting jack transport server..."
 msgstr "بدء خادوم نقل جاك"
 
-#: src/main.c:1634
+#: src/main.c:1693
 msgid "Connecting to jack transport server..."
 msgstr "يتصل بخادوم نقل جاك"
 
-#: src/main.c:1663
+#: src/main.c:1723
 #, c-format
 msgid ""
 "\n"
@@ -176,114 +175,114 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1697
+#: src/main.c:1758
 msgid "Starting pulse audio server..."
 msgstr "بدء خادوم بالص-اوديو..."
 
-#: src/main.c:1765
+#: src/main.c:1825
 msgid "Checking optional dependencies:"
 msgstr "التحقق من إكتشاف التبعيات"
 
-#: src/main.c:1766
+#: src/main.c:1826
 msgid "mplayer...detected..."
 msgstr "تم العثور علي mplayer"
 
-#: src/main.c:1767
+#: src/main.c:1827
 msgid "mplayer...NOT DETECTED..."
 msgstr "لم يتم العثور علي mplayer"
 
-#: src/main.c:1768
+#: src/main.c:1828
 #, fuzzy
 msgid "mplayer2...detected..."
 msgstr "تم العثور علي mplayer"
 
-#: src/main.c:1769
+#: src/main.c:1829
 #, fuzzy
 msgid "mplayer2...NOT DETECTED..."
 msgstr "لم يتم العثور علي mplayer"
 
-#: src/main.c:1770
+#: src/main.c:1830
 msgid "convert...detected..."
 msgstr "تم العثور علي convert"
 
-#: src/main.c:1771
+#: src/main.c:1831
 msgid "convert...NOT DETECTED..."
 msgstr "لم يتم العثور علي convert"
 
-#: src/main.c:1772
+#: src/main.c:1832
 msgid "composite...detected..."
 msgstr "تم العثور علي composite"
 
-#: src/main.c:1773
+#: src/main.c:1833
 msgid "composite...NOT DETECTED..."
 msgstr "لم يتم العثور علي composite"
 
-#: src/main.c:1774
+#: src/main.c:1834
 msgid "sox...detected\n"
 msgstr "تم العثور على .'sox'\n"
 
-#: src/main.c:1775
+#: src/main.c:1835
 msgid "sox...NOT DETECTED\n"
 msgstr "لم يتم العثور على .'sox'\n"
 
-#: src/main.c:1776
+#: src/main.c:1836
 msgid "cdda2wav...detected..."
 msgstr "إكتشاف...'cdda2wav'..."
 
-#: src/main.c:1777
+#: src/main.c:1837
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "عدم إكتشاف...'cdda2wav'..."
 
-#: src/main.c:1778
+#: src/main.c:1838
 msgid "jackd...detected..."
 msgstr "إكتشاف ...جاك..."
 
-#: src/main.c:1779
+#: src/main.c:1839
 msgid "jackd...NOT DETECTED..."
 msgstr "عدم إكتشاف ...جاك..."
 
-#: src/main.c:1780
+#: src/main.c:1840
 msgid "pulse audio...detected..."
 msgstr "إكتشاف ...'pulse audio'..."
 
-#: src/main.c:1781
+#: src/main.c:1841
 msgid "pulse audio...NOT DETECTED..."
 msgstr "عدم إكتشاف ...'pulse audio'..."
 
-#: src/main.c:1782
+#: src/main.c:1842
 msgid "python...detected..."
 msgstr "إكتشاف ...بايثون..."
 
-#: src/main.c:1783
+#: src/main.c:1843
 msgid "python...NOT DETECTED..."
 msgstr "عدم إكتشاف ...بايثون..."
 
-#: src/main.c:1784
+#: src/main.c:1844
 msgid "dvgrab...detected..."
 msgstr "إكتشاف ...'dvgrab'..."
 
-#: src/main.c:1785
+#: src/main.c:1845
 msgid "dvgrab...NOT DETECTED..."
 msgstr "عدم إكتشاف ...'dvgrab'..."
 
-#: src/main.c:1786
+#: src/main.c:1846
 msgid "xwininfo...detected..."
 msgstr "إكتشاف ... 'xwininfo'..."
 
-#: src/main.c:1787
+#: src/main.c:1847
 msgid "xwininfo...NOT DETECTED..."
 msgstr "عدم إكتشاف ... 'xwininfo'..."
 
-#: src/main.c:1793
+#: src/main.c:1853
 #, c-format
 msgid "Windows version %04X"
 msgstr ""
 
-#: src/main.c:1795
+#: src/main.c:1855
 msgid "UNKNOWN - please patch me !"
 msgstr ""
 
-#: src/main.c:1799
+#: src/main.c:1859
 #, c-format
 msgid ""
 "\n"
@@ -294,48 +293,48 @@
 "\n"
 "تقرير مدير النافذة كـ \"%s\"; "
 
-#: src/main.c:1802
+#: src/main.c:1862
 #, c-format
 msgid "number of monitors detected: %d\n"
 msgstr "إكتشاف عدد الشاشات %d\n"
 
-#: src/main.c:1805
+#: src/main.c:1865
 #, c-format
 msgid "Number of CPUs detected: %d "
 msgstr ""
 
-#: src/main.c:1808 src/multitrack.c:4902
+#: src/main.c:1868 src/multitrack.c:5068
 msgid "little endian"
 msgstr ""
 
-#: src/main.c:1809 src/multitrack.c:4901
+#: src/main.c:1869 src/multitrack.c:5067
 msgid "big endian"
 msgstr ""
 
-#: src/main.c:1810
+#: src/main.c:1870
 #, c-format
 msgid "(%d bits, %s)\n"
 msgstr ""
 
-#: src/main.c:1814
+#: src/main.c:1874
 msgid "GUI type is: "
 msgstr ""
 
-#: src/main.c:1818
+#: src/main.c:1878
 #, c-format
 msgid "GTK+ version %d.%d.%d (compiled with %d.%d.%d)"
 msgstr ""
 
-#: src/main.c:1840
+#: src/main.c:1900
 msgid ", with cairo support"
 msgstr ""
 
-#: src/main.c:1847
+#: src/main.c:1907
 #, c-format
 msgid "Temp directory is %s\n"
 msgstr "مجلدات الملفات المؤقتة %s\n"
 
-#: src/main.c:1851
+#: src/main.c:1911
 msgid ""
 "WARNING - this version of LiVES was compiled without either\n"
 "jack or pulse audio support.\n"
@@ -345,15 +344,15 @@
 "توصيل جاك الصوت او 'pulse audio'\n"
 "العديد من ميزات الصوت لن تكون متوفرة\n"
 
-#: src/main.c:1854
+#: src/main.c:1914
 msgid "Compiled with jack support, good !\n"
 msgstr "التواصل مع جاك الصوت ، جيد !\n"
 
-#: src/main.c:1857
+#: src/main.c:1917
 msgid "Compiled with pulse audio support, wonderful !\n"
 msgstr "التواصل مع 'pulse audio' ، رائع !\n"
 
-#: src/main.c:1861
+#: src/main.c:1921
 #, c-format
 msgid ""
 "Welcome to LiVES version %s.\n"
@@ -362,7 +361,7 @@
 "مرحبا بك مع إصدار برنامج لايفز %s\n"
 "\n"
 
-#: src/main.c:2306
+#: src/main.c:2380
 #, c-format
 msgid ""
 "\n"
@@ -371,87 +370,92 @@
 "\n"
 "جمل بدأ البرنامج: %s [المدخلات] [اسم الملف [وقت-البدأ] [الإطارات]\n"
 
-#: src/main.c:2307
+#: src/main.c:2381
 msgid "Where: filename is the name of a media file or backup file.\n"
 msgstr "حيث: اسم الملف هو أسم ملف الميديا أو اسم ملف النسخ الاحتياطي\n"
 
-#: src/main.c:2308
+#: src/main.c:2382
 msgid "start_time : filename start time in seconds\n"
 msgstr "وقت-البدأ : تعريف وقت البدأ بوحدة الثانية\n"
 
-#: src/main.c:2309
+#: src/main.c:2383
 msgid "frames : maximum number of frames to open\n"
 msgstr "الإطارات : أكبر عدد ممكن لفتح الإطارات\n"
 
-#: src/main.c:2311
+#: src/main.c:2385
 msgid "opts can be:\n"
 msgstr "تستطيع الإختيار:\n"
 
-#: src/main.c:2312
+#: src/main.c:2386
 msgid "-help            : show this help text and exit\n"
 msgstr "-مساعدة : عرض مستند المساعدة وإغلاقه\n"
 
-#: src/main.c:2313
+#: src/main.c:2387
 msgid "-tmpdir <tempdir>: use alternate working directory (e.g /var/ramdisk)\n"
 msgstr ""
 
-#: src/main.c:2314
+#: src/main.c:2388
 msgid "-set <setname>   : autoload clip set setname\n"
 msgstr "-المجموعة <اسم المجموعة> : تحميل تلقائى لإسم مجموعة المقاطع\n"
 
-#: src/main.c:2315
+#: src/main.c:2389
 msgid "-noset           : do not load any set on startup\n"
 msgstr "-مجموعة غير متوفرة : عدم تحميل أى مجموعة عند البداية\n"
 
-#: src/main.c:2316
+#: src/main.c:2390
 msgid "-norecover       : force no-loading of crash recovery\n"
 msgstr "-عدم إسترجاع : عدم إسترجاع المجموعة المعطوبة بالقوة\n"
 
-#: src/main.c:2317
+#: src/main.c:2391
 msgid "-recover         : force loading of crash recovery\n"
 msgstr "-إسترجاع : إسترجاع المجموعة المعطوبة بالقوة\n"
 
-#: src/main.c:2318
-msgid "-nothreaddialog  : doe nothing - retained for backwards compatibility\n"
+#: src/main.c:2392
+msgid ""
+"-nothreaddialog  : does nothing - retained for backwards compatibility\n"
 msgstr ""
 
-#: src/main.c:2319
+#: src/main.c:2393
 msgid "-nogui           : do not show the gui\n"
 msgstr "-عدم إستخدام الواجهة الرسومية : لا تستعرض الواجهة الرسومية\n"
 
-#: src/main.c:2320
+#: src/main.c:2394
 msgid "-nosplash        : do not show the splash window\n"
 msgstr ""
 
-#: src/main.c:2321
+#: src/main.c:2395
 msgid "-noplaywin       : do not show the play window\n"
 msgstr ""
 
-#: src/main.c:2322
+#: src/main.c:2396
+msgid "-noninteractive  : disable menu interactivity\n"
+msgstr ""
+
+#: src/main.c:2397
 msgid "-startup-ce      : start in clip editor mode\n"
 msgstr "-إبدأ تشغيل محرر المقاطع : بداية تشغيل وضع محرر المقاطع\n"
 
-#: src/main.c:2323
+#: src/main.c:2398
 msgid "-startup-mt      : start in multitrack mode\n"
 msgstr "-إبدأ-تشغيل المسارات المتعددة : بداية تشغيل وضع المسارات المتعددة\n"
 
-#: src/main.c:2324
+#: src/main.c:2399
 msgid ""
 "-fxmodesmax <n>  : allow <n> modes per effect key (minimum is 1, default is "
 "8)\n"
 msgstr ""
 
-#: src/main.c:2326
+#: src/main.c:2401
 msgid "-oscstart <port> : start OSC listener on UDP port <port>\n"
 msgstr ""
 "إبدأ مكتب المنسق الخاص <منفذ> : ابدأ مكتب المنسق الخاص بالمستمع على منفذ "
 "'UDP'\n"
 
-#: src/main.c:2327
+#: src/main.c:2402
 msgid "-nooscstart      : do not start OSC listener\n"
 msgstr "لا تبدأ مكتب المنسق الخاص : لا تبدأ مكتب المنسق الخاص بالمستمع\n"
 
-#: src/main.c:2329
+#: src/main.c:2404
 #, fuzzy
 msgid ""
 "-aplayer <ap>    : start with selected audio player. <ap> can be mplayer, "
@@ -461,44 +465,44 @@
 "'mplayer'"
 
 #. TRANSLATORS: pulse (audio)
-#: src/main.c:2332
+#: src/main.c:2407
 msgid ", pulse"
 msgstr ""
 
-#: src/main.c:2335
+#: src/main.c:2410
 msgid ", sox or jack\n"
 msgstr "، 'sox' أو جاك\n"
 
-#: src/main.c:2336
+#: src/main.c:2412
 msgid ""
 "-jackopts <opts>    : opts is a bitmap of jack startup options [1 = jack "
 "transport client, 2 = jack transport master, 4 = start jack transport "
 "server, 8 = pause audio when video paused, 16 = start jack audio server] \n"
 msgstr ""
 
-#: src/main.c:2338
+#: src/main.c:2414
 msgid " or sox\n"
 msgstr " أو 'sox'\n"
 
-#: src/main.c:2340
+#: src/main.c:2416
 msgid "-devicemap <mapname>          : autoload devicemap\n"
 msgstr "-مخطط الجهاز <إسم المخطط> : تحميل تلقائى لمخطط الجهاز\n"
 
-#: src/main.c:2341
+#: src/main.c:2418
 msgid ""
 "-vppdefaults <file>          : load video playback plugin defaults from "
 "<file> (Note: only sets the settings, not the plugin type)\n"
 msgstr ""
 
-#: src/main.c:2342
+#: src/main.c:2419
 msgid "-debug            : try to debug crashes (requires 'gdb' installed)\n"
 msgstr "- صَحّح : حاول تصحيح الأعطاب (يحتاج تثبيت 'gdb')\n"
 
-#: src/main.c:2373 src/gui.c:1128
+#: src/main.c:2449 src/gui.c:1127
 msgid "Starting GUI..."
 msgstr "بداية تشغيل الواجة الرسومية..."
 
-#: src/main.c:2396
+#: src/main.c:2475
 #, c-format
 msgid ""
 "\n"
@@ -509,7 +513,7 @@
 "(Maybe you need to change the value of <prefix_dir> in your %s file)\n"
 msgstr ""
 
-#: src/main.c:2410
+#: src/main.c:2492
 #, c-format
 msgid ""
 "\n"
@@ -517,7 +521,7 @@
 "Please make sure you have write access to %s and try again.\n"
 msgstr ""
 
-#: src/main.c:2415
+#: src/main.c:2498
 msgid ""
 "\n"
 "`smogrify` must be in your path, and be executable\n"
@@ -531,7 +535,7 @@
 "من فضلك راجع ملف 'README' المرفق مع الحزمة\n"
 "قبل تشغيل برنامج لايفز.\n"
 
-#: src/main.c:2421
+#: src/main.c:2504
 #, c-format
 msgid ""
 "\n"
@@ -541,7 +545,7 @@
 "Please check the file permissions for this file and try again.\n"
 msgstr ""
 
-#: src/main.c:2428
+#: src/main.c:2512
 #, c-format
 msgid ""
 "\n"
@@ -552,7 +556,7 @@
 "and try again.\n"
 msgstr ""
 
-#: src/main.c:2438
+#: src/main.c:2522
 #, c-format
 msgid ""
 "Please check the <tempdir> setting in \n"
@@ -560,7 +564,7 @@
 "and try again.\n"
 msgstr ""
 
-#: src/main.c:2445
+#: src/main.c:2528
 #, c-format
 msgid ""
 "\n"
@@ -570,7 +574,7 @@
 "%s"
 msgstr ""
 
-#: src/main.c:2453
+#: src/main.c:2536
 msgid ""
 "\n"
 "An incorrect version of smogrify was found in your path.\n"
@@ -588,7 +592,7 @@
 "\n"
 "وشكرا\n"
 
-#: src/main.c:2458
+#: src/main.c:2541
 #, fuzzy
 msgid ""
 "\n"
@@ -599,7 +603,7 @@
 "يحتاج برنامج لايفز اى من أدوات 'mplayer' أو 'sox' لآداء مهامه . يرجى تنصيب "
 "أحد هذه الأدوات ، ثم إعادة المحاولة\n"
 
-#: src/main.c:2462
+#: src/main.c:2546
 #, fuzzy
 msgid ""
 "\n"
@@ -610,7 +614,7 @@
 "يحتاج برنامج لايفز اى من أدوات 'mplayer' أو 'sox' لآداء مهامه . يرجى تنصيب "
 "أحد هذه الأدوات ، ثم إعادة المحاولة\n"
 
-#: src/main.c:2472
+#: src/main.c:2556
 #, fuzzy
 msgid ""
 "\n"
@@ -621,7 +625,7 @@
 "لم يستطيع برنامج لايفز الوصول الى الأداة 'mplayer' . ربما تحتاج تنصيب الأداة "
 "للحصول على أداء أفضل.\n"
 
-#: src/main.c:2475
+#: src/main.c:2561
 msgid ""
 "\n"
 "LiVES was unable to locate 'convert'. You should install convert and image-"
@@ -631,7 +635,7 @@
 "لم يستطيع برنامج لايفز الوصول الى الأداة 'convert' و 'image-magick' . ربما "
 "تحتاج تنصيب الأداتين للحصول على تأثيرات الإعادة.\n"
 
-#: src/main.c:2478
+#: src/main.c:2566
 msgid ""
 "\n"
 "LiVES was unable to locate 'composite'. You should install composite and "
@@ -641,7 +645,7 @@
 "لم يستطيع برنامج لايفز الوصول الى الأداة 'composite' و 'image-magick' . ربما "
 "تحتاج تنصيب الأداتين للحصول على تأثيرات الدمج 'merge function'\n"
 
-#: src/main.c:2481
+#: src/main.c:2570
 msgid ""
 "\n"
 "LiVES was unable to locate 'sox'. Some audio features may not work. You "
@@ -651,7 +655,7 @@
 "لم يستطيع برنامج لايفز الوصول الى الأداة 'sox' . بعض مميرات الصوت لن تعمل. "
 "يجب تنصيب الأداة 'sox'\n"
 
-#: src/main.c:2484
+#: src/main.c:2575
 #, c-format
 msgid ""
 "\n"
@@ -662,59 +666,59 @@
 "You may need to change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/main.c:2611
+#: src/main.c:2707
 #, c-format
 msgid "Autoloading set %s..."
 msgstr "التحميل التلقائى للمجموعة %s..."
 
 #. TRANSLATORS: localised name may be used here
-#: src/main.c:2781 src/interface.c:738
+#: src/main.c:2902
 msgid "LiVES"
 msgstr ""
 
-#: src/main.c:2948
+#: src/main.c:3066
 #, c-format
 msgid "Invalid audio player %s\n"
 msgstr "أوديو بلاير 'audio player' غير صالح %s\n"
 
-#: src/main.c:3077
+#: src/main.c:3214
 #, c-format
 msgid "LiVES-%s: <Untitled%d> %dx%d : %d frames %d bpp %.3f fps"
 msgstr ""
 
-#: src/main.c:3082
+#: src/main.c:3219
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : ??? frames ??? bpp %.3f fps"
 msgstr ""
 
-#: src/main.c:3086
+#: src/main.c:3222
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : %d frames %d bpp %.3f fps"
 msgstr ""
 
-#: src/main.c:3094
+#: src/main.c:3229
 #, c-format
 msgid "LiVES-%s: <No File>"
 msgstr ""
 
 #. TRANSLATORS: rec(ord)
-#: src/main.c:5085
+#: src/main.c:5201
 #, c-format
 msgid "rec %9d/%d"
 msgstr ""
 
 #. TRANSLATORS: out of memory (rec(ord))
-#: src/main.c:5091
+#: src/main.c:5206
 #, c-format
 msgid "!rec %9d/%d"
 msgstr ""
 
-#: src/main.c:5398 src/main.c:5399 src/gui.c:2110 src/gui.c:3220
-#: src/saveplay.c:2336
+#: src/main.c:5500 src/main.c:5501 src/gui.c:2108 src/gui.c:3331
+#: src/saveplay.c:2315
 msgid "Play"
 msgstr "شغّل"
 
-#: src/main.c:6128
+#: src/main.c:6216
 msgid ""
 "LiVES was unable to capture this image\n"
 "\n"
@@ -722,35 +726,35 @@
 "لم يتمكن برنامج لايفز من إلتقاط هذه الصورة\n"
 "\n"
 
-#: src/main.c:6250
+#: src/main.c:6345
 #, c-format
 msgid "Closed file %s\n"
 msgstr "ملف مغلق %s\n"
 
-#: src/main.c:6452 src/gui.c:648 src/utils.c:4312 src/utils.c:4344
-#: src/saveplay.c:3550 src/multitrack.c:4510 src/multitrack.c:6268
+#: src/main.c:6542 src/gui.c:647 src/utils.c:4256 src/utils.c:4286
+#: src/saveplay.c:3500 src/multitrack.c:4678 src/multitrack.c:6447
 msgid "_Undo"
 msgstr "_تراجع"
 
-#: src/main.c:6453 src/gui.c:666 src/utils.c:4313 src/utils.c:4345
-#: src/saveplay.c:3551 src/multitrack.c:4531 src/multitrack.c:6293
+#: src/main.c:6543 src/gui.c:665 src/utils.c:4257 src/utils.c:4287
+#: src/saveplay.c:3501 src/multitrack.c:4698 src/multitrack.c:6472
 msgid "_Redo"
 msgstr "_كرّر"
 
-#: src/main.c:6493 src/interface.c:470 src/gui.c:2326 src/preferences.c:2357
-#: src/resample.c:1516
+#: src/main.c:6583 src/interface.c:457 src/gui.c:2324 src/preferences.c:2391
+#: src/resample.c:1488
 msgid "Video"
 msgstr "فيديو"
 
-#: src/main.c:6494 src/interface.c:483 src/gui.c:2351
+#: src/main.c:6584 src/interface.c:470 src/gui.c:2348
 msgid "Left Audio"
 msgstr "الصوت الأيسر"
 
-#: src/main.c:6495 src/gui.c:2375
+#: src/main.c:6585 src/gui.c:2371
 msgid "Right Audio"
 msgstr "الصوت الأيمن"
 
-#: src/main.c:6540
+#: src/main.c:6630
 msgid ""
 "\n"
 "\n"
@@ -759,11 +763,11 @@
 "Please adjust the playback options in Preferences and try again.\n"
 msgstr ""
 
-#: src/main.c:7051 src/plugins.c:1502
+#: src/main.c:7134 src/plugins.c:1468
 msgid "LiVES: - Play Window"
 msgstr ""
 
-#: src/startup.c:25
+#: src/startup.c:24
 #, c-format
 msgid ""
 "A directory named\n"
@@ -773,7 +777,7 @@
 "(Free space = %s)\n"
 msgstr ""
 
-#: src/startup.c:32
+#: src/startup.c:29
 #, c-format
 msgid ""
 "A directory named\n"
@@ -783,7 +787,7 @@
 "Please select another location.\n"
 msgstr ""
 
-#: src/startup.c:49
+#: src/startup.c:46
 #, c-format
 msgid ""
 "\n"
@@ -794,7 +798,7 @@
 "(Free space = %s)"
 msgstr ""
 
-#: src/startup.c:54
+#: src/startup.c:50
 #, c-format
 msgid ""
 "\n"
@@ -803,54 +807,54 @@
 "Please try again and choose a different location.\n"
 msgstr ""
 
-#: src/startup.c:96
+#: src/startup.c:92
 msgid "Directory name is too long !"
 msgstr ""
 
-#: src/startup.c:223
+#: src/startup.c:216
 msgid ""
 "LiVES FAILED TO START YOUR SELECTED AUDIO PLAYER !\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:230
+#: src/startup.c:222
 msgid ""
 "Before starting LiVES, you need to choose an audio player.\n"
 "\n"
 "PULSE AUDIO is recommended for most users"
 msgstr ""
 
-#: src/startup.c:233
+#: src/startup.c:225
 msgid ""
 ", but this version of LiVES was not compiled with pulse audio support.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:236
+#: src/startup.c:229
 msgid ""
 ", but you do not have pulse audio installed on your system.\n"
 " You are advised to install pulse audio first before running LiVES.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:241
+#: src/startup.c:233
 msgid "JACK audio is recommended for pro users"
 msgstr ""
 
-#: src/startup.c:244
+#: src/startup.c:236
 msgid ""
 ", but this version of LiVES was not compiled with jack audio support.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:247
+#: src/startup.c:239
 msgid ""
 ", but you do not have jackd installed. You may wish to install jackd first "
 "before running LiVES.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:250
+#: src/startup.c:242
 msgid ""
 ", but may prevent LiVES from starting on some systems.\n"
 "If LiVES will not start with jack, you can restart and try with another "
@@ -858,11 +862,11 @@
 "\n"
 msgstr ""
 
-#: src/startup.c:254
+#: src/startup.c:246
 msgid "SOX may be used if neither of the preceding players work, "
 msgstr ""
 
-#: src/startup.c:257
+#: src/startup.c:249
 msgid ""
 "but some audio features will be disabled.\n"
 "\n"
@@ -870,149 +874,149 @@
 "ولكن بعض ميزات الصوت سوف يتم تعطيلها.\n"
 "\n"
 
-#: src/startup.c:260
+#: src/startup.c:251
 msgid ""
 "but you do not have sox installed.\n"
 "You are advised to install it before running LiVES.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:264
+#: src/startup.c:255
 msgid ""
 "The MPLAYER/MPLAYER2 audio player is only recommended for testing purposes.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:281
+#: src/startup.c:271
 msgid "LiVES: - Choose an audio player"
 msgstr ""
 
-#: src/startup.c:298
+#: src/startup.c:288
 msgid "Use _pulse audio player"
 msgstr ""
 
-#: src/startup.c:320
+#: src/startup.c:310
 msgid "Use _jack audio player"
 msgstr ""
 
-#: src/startup.c:340
+#: src/startup.c:330
 msgid "Use _sox audio player"
 msgstr ""
 
-#: src/startup.c:361
+#: src/startup.c:351
 msgid "Use _mplayer audio player"
 msgstr ""
 
-#: src/startup.c:381
+#: src/startup.c:371
 msgid "Use _mplayer2 audio player"
 msgstr ""
 
-#: src/startup.c:405 src/startup.c:580 src/interface.c:1506
+#: src/startup.c:395 src/startup.c:569 src/interface.c:1398
 msgid "_Next"
 msgstr ""
 
-#: src/startup.c:445
+#: src/startup.c:435
 msgid "Skipped"
 msgstr ""
 
-#: src/startup.c:460
+#: src/startup.c:450
 msgid "Passed"
 msgstr ""
 
-#: src/startup.c:493
+#: src/startup.c:483
 msgid "Failed"
 msgstr ""
 
-#: src/startup.c:552
+#: src/startup.c:542
 msgid "LiVES: - Testing Configuration"
 msgstr ""
 
-#: src/startup.c:555
+#: src/startup.c:544
 msgid "LiVES: - Troubleshoot"
 msgstr ""
 
-#: src/startup.c:568
+#: src/startup.c:557
 msgid "LiVES will now run some basic configuration tests\n"
 msgstr ""
 
-#: src/startup.c:603
+#: src/startup.c:591
 msgid "Checking for \"sox\" presence"
 msgstr ""
 
-#: src/startup.c:607
+#: src/startup.c:595
 msgid ""
 "You should install sox to be able to use all the audio features in LiVES"
 msgstr ""
 
-#: src/startup.c:615
+#: src/startup.c:602
 msgid "Checking if sox can convert audio"
 msgstr ""
 
-#: src/startup.c:638
+#: src/startup.c:625
 msgid "Unable to allocate 176400 bytes memory."
 msgstr ""
 
-#: src/startup.c:653
+#: src/startup.c:639
 #, c-format
 msgid "Unable to write to: %s"
 msgstr ""
 
-#: src/startup.c:667 src/startup.c:807
+#: src/startup.c:653 src/startup.c:789
 #, c-format
 msgid "Command failed: %s"
 msgstr ""
 
-#: src/startup.c:689
+#: src/startup.c:675
 msgid "You should install sox_fmt_all or similar"
 msgstr ""
 
-#: src/startup.c:717
+#: src/startup.c:703
 msgid "Checking for \"mplayer\" presence"
 msgstr ""
 
-#: src/startup.c:721
+#: src/startup.c:707
 msgid ""
 "You should install mplayer or mplayer2 to be able to use all the decoding "
 "features in LiVES"
 msgstr ""
 
-#: src/startup.c:747
+#: src/startup.c:732
 msgid "Checking if mplayer can convert audio"
 msgstr ""
 
-#: src/startup.c:768
+#: src/startup.c:751
 msgid "You should install mplayer or mplayer2 with pcm/wav support"
 msgstr ""
 
-#: src/startup.c:785
+#: src/startup.c:767
 msgid "Checking if mplayer can decode to png/alpha"
 msgstr ""
 
-#: src/startup.c:828
+#: src/startup.c:810
 msgid "You may wish to upgrade mplayer to a newer version"
 msgstr ""
 
-#: src/startup.c:854
+#: src/startup.c:836
 msgid "Checking if mplayer can decode to jpeg"
 msgstr ""
 
-#: src/startup.c:882
+#: src/startup.c:862
 msgid "You should install mplayer with either png/alpha or jpeg support"
 msgstr ""
 
-#: src/startup.c:883
+#: src/startup.c:863
 msgid "You may wish to add jpeg output support to mplayer"
 msgstr ""
 
-#: src/startup.c:892
+#: src/startup.c:872
 msgid "Checking for \"convert\" presence"
 msgstr ""
 
-#: src/startup.c:896
+#: src/startup.c:876
 msgid "Install imageMagick to be able to use all of the rendered effects"
 msgstr ""
 
-#: src/startup.c:909
+#: src/startup.c:889
 msgid ""
 "\n"
 "\n"
@@ -1020,7 +1024,7 @@
 "Preferences/Decoding.    \n"
 msgstr ""
 
-#: src/startup.c:915
+#: src/startup.c:894
 msgid ""
 "\n"
 "\n"
@@ -1028,49 +1032,49 @@
 "continue    \n"
 msgstr ""
 
-#: src/startup.c:949
+#: src/startup.c:928
 msgid ""
 "\n"
 "\n"
 "Finally, you can choose the default startup interface for LiVES.\n"
 msgstr ""
 
-#: src/startup.c:950
+#: src/startup.c:929
 msgid ""
 "\n"
 "\n"
 "LiVES has two main interfaces and you can start up with either of them.\n"
 msgstr ""
 
-#: src/startup.c:951
+#: src/startup.c:930
 msgid ""
 "\n"
 "\n"
 "The default can always be changed later from Preferences.\n"
 msgstr ""
 
-#: src/startup.c:961
+#: src/startup.c:940
 msgid "LiVES: - Choose the startup interface"
 msgstr ""
 
-#: src/startup.c:972
+#: src/startup.c:951
 msgid "Start in _Clip Edit mode"
 msgstr ""
 
-#: src/startup.c:975
+#: src/startup.c:954
 msgid "This is the best choice for simple editing tasks and for VJs\n"
 msgstr ""
 
-#: src/startup.c:981
+#: src/startup.c:960
 msgid "Start in _Multitrack mode"
 msgstr ""
 
-#: src/startup.c:983
+#: src/startup.c:962
 msgid ""
 "This is a better choice for complex editing tasks involving multiple clips.\n"
 msgstr ""
 
-#: src/startup.c:992
+#: src/startup.c:971
 msgid "_Finish"
 msgstr ""
 
@@ -1087,35 +1091,35 @@
 msgid "Apply _Deinterlace"
 msgstr ""
 
-#: src/interface.c:66
+#: src/interface.c:65
 msgid "If this is set, frames will be deinterlaced as they are imported."
 msgstr ""
 
-#: src/interface.c:113 src/callbacks.c:9623 src/callbacks.c:9646
-#: src/callbacks.c:9647 src/gui.c:3223 src/gui.c:3821 src/saveplay.c:2339
-#: src/saveplay.c:3138 src/dialogs.c:1514 src/dialogs.c:1515
-#: src/dialogs.c:1746 src/dialogs.c:1747 src/framedraw.c:238
-#: src/multitrack.c:8031
+#: src/interface.c:106 src/callbacks.c:9542 src/callbacks.c:9564
+#: src/callbacks.c:9565 src/gui.c:3333 src/gui.c:3946 src/saveplay.c:2317
+#: src/saveplay.c:3097 src/dialogs.c:1575 src/dialogs.c:1576
+#: src/dialogs.c:1804 src/dialogs.c:1805 src/framedraw.c:236
+#: src/multitrack.c:8210
 msgid "Preview"
 msgstr "معاينة"
 
-#: src/interface.c:132
+#: src/interface.c:125
 msgid "Click here to _Preview any selected video, image or audio file"
 msgstr ""
 
-#: src/interface.c:135
+#: src/interface.c:127
 msgid "Click here to _Preview any selected audio file"
 msgstr ""
 
-#: src/interface.c:138
+#: src/interface.c:129
 msgid "Click here to _Preview the video"
 msgstr ""
 
-#: src/interface.c:181 src/dialogs.c:2542
+#: src/interface.c:169 src/dialogs.c:2621
 msgid "LiVES: - Processing..."
 msgstr ""
 
-#: src/interface.c:217
+#: src/interface.c:205
 msgid ""
 "\n"
 "\n"
@@ -1124,8 +1128,8 @@
 "Remember to switch off effects (ctrl-0) afterwards !"
 msgstr ""
 
-#: src/interface.c:222 src/callbacks.c:9373 src/callbacks.c:9420
-#: src/dialogs.c:2570
+#: src/interface.c:210 src/callbacks.c:9283 src/callbacks.c:9332
+#: src/dialogs.c:2649
 msgid ""
 "\n"
 "Please Wait"
@@ -1133,188 +1137,178 @@
 "\n"
 "يرجى الانتظار"
 
-#: src/interface.c:242
+#: src/interface.c:230
 msgid "Show Details"
 msgstr ""
 
-#: src/interface.c:254 src/dialogs.c:2584
+#: src/interface.c:242 src/dialogs.c:2663
 msgid "_Enough"
 msgstr "_كاف"
 
-#: src/interface.c:255 src/framedraw.c:278
+#: src/interface.c:243 src/framedraw.c:276
 msgid "_Preview"
 msgstr "_معاينة"
 
-#: src/interface.c:257
+#: src/interface.c:245 src/callbacks.c:9282 src/callbacks.c:9330
 msgid "Paus_e"
 msgstr ""
 
-#: src/interface.c:258 src/callbacks.c:9417
+#: src/interface.c:246 src/callbacks.c:9329
 msgid "Pause/_Enough"
 msgstr ""
 
-#: src/interface.c:285
+#: src/interface.c:273
 msgid "_Cancel"
 msgstr "إل_غِ"
 
-#: src/interface.c:374
+#: src/interface.c:361
 #, c-format
 msgid "LiVES: - %s"
 msgstr ""
 
-#: src/interface.c:376
+#: src/interface.c:363
 msgid "LiVES: - Multitrack details"
 msgstr ""
 
-#: src/interface.c:407
+#: src/interface.c:394
 msgid "Format"
 msgstr "التنسيق"
 
-#: src/interface.c:412
+#: src/interface.c:399
 msgid "Frame size"
 msgstr "حجم الإطار"
 
-#: src/interface.c:417
+#: src/interface.c:404
 msgid "File size"
 msgstr "حجم الملف"
 
-#: src/interface.c:418
+#: src/interface.c:405
 msgid "Byte size"
 msgstr "حجم البايت"
 
-#: src/interface.c:423 src/interface.c:1891
+#: src/interface.c:410 src/interface.c:1760
 msgid "FPS"
 msgstr ""
 
-#: src/interface.c:428
+#: src/interface.c:415
 msgid "Frames"
 msgstr "الإطارات"
 
-#: src/interface.c:429
+#: src/interface.c:416
 msgid "Events"
 msgstr "الأحداث"
 
-#: src/interface.c:434 src/interface.c:500 src/interface.c:542
+#: src/interface.c:421 src/interface.c:486 src/interface.c:528
 msgid "Total time"
 msgstr "إجمالي الوقت"
 
-#: src/interface.c:486 src/resample.c:1488
+#: src/interface.c:472 src/resample.c:1460
 msgid "Audio"
 msgstr "الصوت"
 
-#: src/interface.c:511 src/interface.c:553
+#: src/interface.c:497 src/interface.c:539
 msgid "Rate/size"
 msgstr "معدل / حجم"
 
-#: src/interface.c:530
+#: src/interface.c:516
 msgid "Right audio"
 msgstr ""
 
-#: src/interface.c:622
+#: src/interface.c:607
 msgid "LiVES: - Encoding options"
 msgstr ""
 
-#: src/interface.c:636
+#: src/interface.c:621
 msgid "<------------- (Check the box to re_size as suggested)"
 msgstr ""
 
-#: src/interface.c:637
+#: src/interface.c:622
 msgid "<------------- (Check the box to use the _size recommendation)"
 msgstr ""
 
-#: src/interface.c:662
+#: src/interface.c:646
 msgid "Use _letterboxing to maintain aspect ratio (optional)"
 msgstr ""
 
-#: src/interface.c:663
+#: src/interface.c:647
 msgid ""
 "Draw black rectangles either above or to the sides of the image, to prevent "
 "it from stretching."
 msgstr ""
 
-#: src/interface.c:694
+#: src/interface.c:677
 msgid "Keep _my settings"
 msgstr "إبقاء _اعدادتي"
 
-#: src/interface.c:695
+#: src/interface.c:678
 msgid "Use _recommended settings"
 msgstr "استخدام الإ_عدادات الموصى بها"
 
-#: src/interface.c:775 src/dialogs.c:114
-msgid ""
-"Do _not show this warning any more\n"
-"(can be turned back on from Preferences/Warnings)"
-msgstr ""
-
-#: src/interface.c:787
-msgid "Show _Details"
-msgstr "وتظهر _تفاصيل"
-
-#: src/interface.c:881
+#: src/interface.c:769
 msgid "_Close Window"
 msgstr "أ_غلق النّافذة"
 
-#: src/interface.c:883
+#: src/interface.c:771
 msgid "_Save to file"
 msgstr "_لحفظ الملف"
 
-#: src/interface.c:928
+#: src/interface.c:816
 msgid "LiVES: - Insert"
 msgstr ""
 
-#: src/interface.c:945
+#: src/interface.c:833
 msgid "_Number of times to insert"
 msgstr ""
 
-#: src/interface.c:954
+#: src/interface.c:842
 msgid "_Insert to fit audio"
 msgstr ""
 
-#: src/interface.c:968
+#: src/interface.c:856
 msgid "Insert _before selection"
 msgstr ""
 
-#: src/interface.c:970
+#: src/interface.c:858
 msgid "Insert clipboard before selected frames"
 msgstr ""
 
-#: src/interface.c:986
+#: src/interface.c:875
 msgid "Insert _after selection"
 msgstr ""
 
-#: src/interface.c:988
+#: src/interface.c:877
 msgid "Insert clipboard after selected frames"
 msgstr ""
 
-#: src/interface.c:999
+#: src/interface.c:888
 msgid "Insert _with sound"
 msgstr ""
 
-#: src/interface.c:1012
+#: src/interface.c:901
 msgid "Insert with_out sound"
 msgstr ""
 
-#: src/interface.c:1093
+#: src/interface.c:985
 msgid "LiVES: - Open Selection"
 msgstr ""
 
-#: src/interface.c:1111
+#: src/interface.c:1004
 msgid "Selection start time (sec)"
 msgstr ""
 
-#: src/interface.c:1117
+#: src/interface.c:1010
 msgid "Number of frames to open"
 msgstr ""
 
-#: src/interface.c:1193
+#: src/interface.c:1088
 msgid "LiVES: - Open Location"
 msgstr ""
 
-#: src/interface.c:1195
+#: src/interface.c:1090
 msgid "LiVES: - Open Youtube Clip"
 msgstr ""
 
-#: src/interface.c:1213
+#: src/interface.c:1109
 msgid ""
 "\n"
 "\n"
@@ -1324,7 +1318,7 @@
 "\n"
 msgstr ""
 
-#: src/interface.c:1216
+#: src/interface.c:1112
 msgid ""
 "\n"
 "\n"
@@ -1333,62 +1327,62 @@
 "\n"
 msgstr ""
 
-#: src/interface.c:1220
+#: src/interface.c:1116
 msgid ""
 "Enter the URL of the clip below.\n"
 "E.g: http://www.youtube.com/watch?v=WCR6f6WzjP8\n"
 "\n"
 msgstr ""
 
-#: src/interface.c:1231
+#: src/interface.c:1127
 msgid "URL : "
 msgstr ""
 
-#: src/interface.c:1231
+#: src/interface.c:1127
 msgid "Youtube URL : "
 msgstr ""
 
-#: src/interface.c:1235
+#: src/interface.c:1131
 msgid "Do not send bandwidth information"
 msgstr "لا ترسل معلومات النطاق الترددي"
 
-#: src/interface.c:1237
+#: src/interface.c:1133
 msgid "Try this setting if you are having problems getting a stream"
 msgstr "حاول هذا الإعداد إذا كنت تواجه مشاكل في الحصول على دفق"
 
-#: src/interface.c:1258
+#: src/interface.c:1155
 msgid "Download to _Directory : "
 msgstr ""
 
-#: src/interface.c:1276
+#: src/interface.c:1173
 msgid "Download _File Name : "
 msgstr ""
 
-#: src/interface.c:1281
+#: src/interface.c:1178
 msgid ".webm"
 msgstr ""
 
-#: src/interface.c:1359
+#: src/interface.c:1256
 msgid "LiVES: - Rename Clip"
 msgstr ""
 
-#: src/interface.c:1362
-msgid "LiVES: - Enter Set Name"
+#: src/interface.c:1258
+msgid "LiVES: - Enter Set Name to Save as"
 msgstr ""
 
-#: src/interface.c:1365
+#: src/interface.c:1260
 msgid "LiVES: - Enter a Set Name to Reload"
 msgstr ""
 
-#: src/interface.c:1368
+#: src/interface.c:1262
 msgid "LiVES: - Choose a Working Directory"
 msgstr ""
 
-#: src/interface.c:1371
+#: src/interface.c:1264
 msgid "LiVES: - Rename Current Track"
 msgstr ""
 
-#: src/interface.c:1391
+#: src/interface.c:1283
 msgid ""
 "You need to enter a name for the current clip set.\n"
 "This will allow you reload the layout with the same clips later.\n"
@@ -1396,354 +1390,354 @@
 "LiVES will remind you to save the clip set later when you try to exit.\n"
 msgstr ""
 
-#: src/interface.c:1397
+#: src/interface.c:1289
 msgid ""
 "In order to export this project, you must enter a name for this clip set.\n"
 "This will also be used for the project name.\n"
 msgstr ""
 
-#: src/interface.c:1404
+#: src/interface.c:1296
 msgid ""
 "Welcome to LiVES !\n"
 "This startup wizard will guide you through the\n"
 "initial install so that you can get the most from this application.\n"
 msgstr ""
 
-#: src/interface.c:1408
+#: src/interface.c:1300
 msgid ""
 "\n"
 "First of all you need to choose a working directory for LiVES.\n"
 "This should be a directory with plenty of disk space available.\n"
 msgstr ""
 
-#: src/interface.c:1427
+#: src/interface.c:1317
 msgid "New name "
 msgstr ""
 
-#: src/interface.c:1430
+#: src/interface.c:1319
 msgid "Set name "
 msgstr ""
 
-#: src/interface.c:1550
+#: src/interface.c:1435
 msgid "Use def_aults"
 msgstr ""
 
-#: src/interface.c:1553 src/interface.c:1840 src/preferences.c:2515
-#: src/preferences.c:2697
+#: src/interface.c:1437 src/interface.c:1709 src/preferences.c:2550
+#: src/preferences.c:2739
 msgid "_Advanced"
 msgstr "متق_دم"
 
-#: src/interface.c:1604
+#: src/interface.c:1487
 msgid "LiVES:- Select input device"
 msgstr ""
 
-#: src/interface.c:1622
+#: src/interface.c:1504
 msgid "Select input device:"
 msgstr ""
 
-#: src/interface.c:1686
+#: src/interface.c:1568
 msgid "LiVES:- Load CD Track"
 msgstr ""
 
-#: src/interface.c:1689
+#: src/interface.c:1570
 msgid "LiVES:- Select DVD Title/Chapter"
 msgstr ""
 
-#: src/interface.c:1692
+#: src/interface.c:1572
 msgid "LiVES:- Select VCD Title"
 msgstr ""
 
-#: src/interface.c:1695
+#: src/interface.c:1574
 msgid "LiVES:- Change Maximum Visible Tracks"
 msgstr ""
 
-#: src/interface.c:1698
+#: src/interface.c:1576
 msgid "LiVES:- Device details"
 msgstr ""
 
-#: src/interface.c:1721
+#: src/interface.c:1598
 #, c-format
 msgid "Track to load (from %s)"
 msgstr ""
 
-#: src/interface.c:1724
+#: src/interface.c:1600
 msgid "DVD Title"
 msgstr ""
 
-#: src/interface.c:1727
+#: src/interface.c:1602
 msgid "VCD Title"
 msgstr ""
 
-#: src/interface.c:1730
+#: src/interface.c:1604
 msgid "Maximum number of tracks to display"
 msgstr "الحد الأقصى لعدد من المسارات لعرض"
 
-#: src/interface.c:1733
+#: src/interface.c:1606
 msgid "Device:        /dev/video"
 msgstr ""
 
-#: src/interface.c:1736
+#: src/interface.c:1608
 msgid "Device:        fw:"
 msgstr ""
 
-#: src/interface.c:1771
+#: src/interface.c:1641
 msgid "Chapter  "
 msgstr "الفصل  "
 
-#: src/interface.c:1776
+#: src/interface.c:1645
 msgid "Channel  "
 msgstr ""
 
-#: src/interface.c:1791
+#: src/interface.c:1660
 msgid "Audio ID  "
 msgstr ""
 
-#: src/interface.c:1857
+#: src/interface.c:1726
 msgid "Input number"
 msgstr ""
 
-#: src/interface.c:1865
+#: src/interface.c:1734
 msgid "Use default width, height and FPS"
 msgstr ""
 
-#: src/interface.c:1879
+#: src/interface.c:1748
 msgid "Width"
 msgstr ""
 
-#: src/interface.c:1885
+#: src/interface.c:1754
 msgid "Height"
 msgstr ""
 
-#: src/interface.c:1899
+#: src/interface.c:1768
 msgid "_Driver"
 msgstr ""
 
-#: src/interface.c:1902
+#: src/interface.c:1771
 msgid "_Output format"
 msgstr ""
 
-#: src/interface.c:1998
+#: src/interface.c:1865
 msgid "LiVES:- Fade Audio In"
 msgstr ""
 
-#: src/interface.c:2001
+#: src/interface.c:1867
 msgid "LiVES:- Fade Audio Out"
 msgstr ""
 
-#: src/interface.c:2017
+#: src/interface.c:1883
 msgid "Fade in over  "
 msgstr ""
 
-#: src/interface.c:2018
+#: src/interface.c:1884
 msgid "first"
 msgstr "الأوّل"
 
-#: src/interface.c:2021
+#: src/interface.c:1886
 msgid "Fade out over  "
 msgstr ""
 
-#: src/interface.c:2022
+#: src/interface.c:1887
 msgid "last"
 msgstr "الأخير"
 
-#: src/interface.c:2044
+#: src/interface.c:1909
 msgid "seconds."
 msgstr "ثوان."
 
-#: src/interface.c:2052 src/saveplay.c:1507
+#: src/interface.c:1917 src/saveplay.c:1484
 msgid "selection"
 msgstr "التحديد"
 
-#: src/interface.c:2092
+#: src/interface.c:1956
 msgid "LiVES: - File Comments (optional)"
 msgstr ""
 
-#: src/interface.c:2107
+#: src/interface.c:1971
 msgid "Title/Name : "
 msgstr "اللقب / الاسم : "
 
-#: src/interface.c:2114
+#: src/interface.c:1978
 msgid "Author/Artist : "
 msgstr "الكاتب / الفنان : "
 
-#: src/interface.c:2121
+#: src/interface.c:1985
 msgid "Comments : "
 msgstr "التعليقات : "
 
-#: src/interface.c:2151
+#: src/interface.c:2015
 msgid "_Options"
 msgstr ""
 
-#: src/interface.c:2158
+#: src/interface.c:2022
 msgid "Save _subtitles to file"
 msgstr ""
 
-#: src/interface.c:2170
+#: src/interface.c:2033
 msgid "Subtitle file"
 msgstr ""
 
-#: src/interface.c:2172
+#: src/interface.c:2035
 msgid "Browse..."
 msgstr ""
 
-#: src/interface.c:2255
+#: src/interface.c:2132
 msgid "LiVES: - choose a device"
 msgstr ""
 
-#: src/interface.c:2259
+#: src/interface.c:2135
 msgid "LiVES: - choose a directory"
 msgstr ""
 
-#: src/interface.c:2262
+#: src/interface.c:2137
 msgid "LiVES: - choose a file"
 msgstr ""
 
-#: src/interface.c:2445
+#: src/interface.c:2381
 msgid "LiVES: - Cancel/Discard/Save"
 msgstr ""
 
-#: src/interface.c:2460
+#: src/interface.c:2397
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has not been saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:2463
+#: src/interface.c:2400
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has been changed since the last save.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:2467
+#: src/interface.c:2404
 msgid ""
 "You are about to exit LiVES.\n"
 "The current clip set can be saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:2468
+#: src/interface.c:2405
 msgid ""
 "The current clip set has not been saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:2472
+#: src/interface.c:2408
 msgid ""
 "The current layout has not been saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:2475
+#: src/interface.c:2410
 msgid ""
 "The current layout has *not* been changed since it was last saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:2480
+#: src/interface.c:2415
 msgid ""
 "The current layout contains generated frames and cannot be retained.\n"
 "You may wish to render it before exiting multitrack mode.\n"
 msgstr ""
 
-#: src/interface.c:2483
+#: src/interface.c:2418
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout contains generated frames and cannot be retained.\n"
 "What do you wish to do ?"
 msgstr ""
 
-#: src/interface.c:2496
+#: src/interface.c:2431
 msgid "Clip set _name"
 msgstr ""
 
-#: src/interface.c:2502
+#: src/interface.c:2437
 msgid "_Auto reload next time"
 msgstr ""
 
-#: src/interface.c:2538 src/interface.c:2547
+#: src/interface.c:2473 src/interface.c:2482
 msgid "_Wipe layout"
 msgstr "_يمسح تخطيط"
 
-#: src/interface.c:2539
+#: src/interface.c:2474
 msgid "_Ignore changes"
 msgstr "_تجاهل التغييرات"
 
-#: src/interface.c:2540
+#: src/interface.c:2475
 msgid "_Delete clip set"
 msgstr ""
 
-#: src/interface.c:2541
+#: src/interface.c:2476
 msgid "_Delete layout"
 msgstr "_تخطيط حذف"
 
-#: src/interface.c:2545
+#: src/interface.c:2480
 msgid "_Save layout"
 msgstr "_حفظ التخطيط"
 
-#: src/interface.c:2546
+#: src/interface.c:2481
 msgid "_Save clip set"
 msgstr ""
 
-#: src/interface.c:2565
+#: src/interface.c:2502
 msgid ""
 "\n"
 "LiVES has detected a multitrack layout from a previous session.\n"
 "Would you like to try and recover it ?\n"
 msgstr ""
 
-#: src/interface.c:2589
+#: src/interface.c:2528
 msgid "LiVES: - Disk Recovery Options"
 msgstr ""
 
-#: src/interface.c:2608
+#: src/interface.c:2549
 msgid "Delete _Orphaned Clips"
 msgstr ""
 
-#: src/interface.c:2609
+#: src/interface.c:2550
 msgid "Delete any clips which are not currently loaded or part of a set"
 msgstr ""
 
-#: src/interface.c:2622
+#: src/interface.c:2564
 msgid "Clear _Backup Files from Closed Clips"
 msgstr ""
 
-#: src/interface.c:2633
+#: src/interface.c:2575
 msgid "Remove Sets which have _Layouts but no Clips"
 msgstr ""
 
-#: src/interface.c:2644
+#: src/interface.c:2586
 msgid "_Reset to Defaults"
 msgstr ""
 
-#: src/interface.c:2651
+#: src/interface.c:2593
 msgid "_Accept"
 msgstr ""
 
-#: src/callbacks.c:198
+#: src/callbacks.c:208
 #, c-format
 msgid "Saving as set %s..."
 msgstr ""
 
-#: src/callbacks.c:833
+#: src/callbacks.c:852
 msgid "Please enter the name of the file to save the clip as.\n"
 msgstr ""
 
-#: src/callbacks.c:841
+#: src/callbacks.c:860
 msgid "Please enter a valid URL for the download.\n"
 msgstr ""
 
-#: src/callbacks.c:867
+#: src/callbacks.c:886
 #, c-format
 msgid "Downloading %s to %s..."
 msgstr ""
 
-#: src/callbacks.c:895
+#: src/callbacks.c:912
 msgid "Downloading clip"
 msgstr ""
 
-#: src/callbacks.c:933
+#: src/callbacks.c:950
 msgid ""
 "\n"
 "LiVES was unable to download the clip.\n"
@@ -1751,17 +1745,17 @@
 "the latest youtube-dl installed.\n"
 msgstr ""
 
-#: src/callbacks.c:1114 src/callbacks.c:1149
+#: src/callbacks.c:1131 src/callbacks.c:1166
 msgid "This file"
 msgstr "هذا الملف"
 
-#: src/callbacks.c:1115
+#: src/callbacks.c:1132
 msgid ""
 ",\n"
 " - including the current layout - "
 msgstr ""
 
-#: src/callbacks.c:1117
+#: src/callbacks.c:1134
 #, c-format
 msgid ""
 "\n"
@@ -1771,7 +1765,7 @@
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1119
+#: src/callbacks.c:1136
 #, c-format
 msgid ""
 "\n"
@@ -1781,14 +1775,14 @@
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1150
+#: src/callbacks.c:1167
 msgid ""
 "Changes made to this clip have not been saved or backed up.\n"
 "\n"
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1343
+#: src/callbacks.c:1356
 msgid ""
 "\n"
 "Invalid project file.\n"
@@ -1796,7 +1790,7 @@
 "\n"
 "الملف غير صالح المشروع.\n"
 
-#: src/callbacks.c:1356
+#: src/callbacks.c:1370
 #, c-format
 msgid ""
 "\n"
@@ -1809,33 +1803,33 @@
 "Once you have done this, you will be able to import the new project.\n"
 msgstr ""
 
-#: src/callbacks.c:1366
+#: src/callbacks.c:1381
 #, c-format
 msgid "Importing the project %s as set %s..."
 msgstr ""
 
-#: src/callbacks.c:1386
+#: src/callbacks.c:1399
 msgid "Importing project"
 msgstr ""
 
-#: src/callbacks.c:1472
+#: src/callbacks.c:1481
 #, c-format
 msgid "Exporting project %s..."
 msgstr ""
 
-#: src/callbacks.c:1490
+#: src/callbacks.c:1497
 msgid "Exporting project"
 msgstr ""
 
-#: src/callbacks.c:1506
+#: src/callbacks.c:1513
 msgid "Backup as .lv1 file"
 msgstr ""
 
-#: src/callbacks.c:1522
+#: src/callbacks.c:1529
 msgid "Restore .lv1 file"
 msgstr ""
 
-#: src/callbacks.c:1664
+#: src/callbacks.c:1671
 msgid ""
 "\n"
 "\n"
@@ -1843,72 +1837,77 @@
 "Are you sure ?\n"
 msgstr ""
 
-#: src/callbacks.c:1725
+#: src/callbacks.c:1732
 #, c-format
 msgid "Deleting set %s..."
 msgstr ""
 
-#: src/callbacks.c:1727
+#: src/callbacks.c:1734
 msgid "Deleting set..."
 msgstr ""
 
-#: src/callbacks.c:1731
+#: src/callbacks.c:1738
 msgid "Deleting set"
 msgstr ""
 
-#: src/callbacks.c:1739
+#: src/callbacks.c:1746
 #, c-format
 msgid "Set %s was permanently deleted from the disk.\n"
 msgstr ""
 
-#: src/callbacks.c:1787 src/callbacks.c:11764
+#: src/callbacks.c:1792 src/callbacks.c:11676
 msgid "Insert Silence"
 msgstr ""
 
-#: src/callbacks.c:1840 src/callbacks.c:1923 src/callbacks.c:2086
+#: src/callbacks.c:1844 src/callbacks.c:1927 src/callbacks.c:2089
 msgid "Undoing"
 msgstr ""
 
-#: src/callbacks.c:1936 src/callbacks.c:2147
+#: src/callbacks.c:1940 src/callbacks.c:2150
 msgid "Restoring audio..."
 msgstr ""
 
-#: src/callbacks.c:1952
+#: src/callbacks.c:1956
 msgid "Clearing frame images"
 msgstr ""
 
-#: src/callbacks.c:1985
+#: src/callbacks.c:1988
 msgid "Deleting excess frames"
 msgstr ""
 
-#: src/callbacks.c:2229
+#: src/callbacks.c:2232
 #, c-format
 msgid "Length of video is now %d frames at %.3f frames per second.\n"
 msgstr ""
 
-#: src/callbacks.c:2233 src/resample.c:683 src/resample.c:2166
+#: src/callbacks.c:2235 src/resample.c:678 src/resample.c:2133
 #, c-format
 msgid "Clipboard was resampled to %d frames.\n"
 msgstr ""
 
-#: src/callbacks.c:2394 src/callbacks.c:2423
+#: src/callbacks.c:2396 src/callbacks.c:2425
 msgid "Redoing"
 msgstr "الإعادة"
 
-#: src/callbacks.c:2462
+#: src/callbacks.c:2472
 #, c-format
-msgid "Copying frames %d to %d%s to the clipboard..."
+msgid "Copying frames %d to %d (with sound) to the clipboard..."
 msgstr ""
 
-#: src/callbacks.c:2525
+#: src/callbacks.c:2474
+#, c-format
+msgid "Copying frames %d to %d to the clipboard..."
+msgstr ""
+
+#: src/callbacks.c:2526
 msgid "Copying to the clipboard"
 msgstr ""
 
-#: src/callbacks.c:2600
+#: src/callbacks.c:2601
 msgid "Cut"
 msgstr "قصّ"
 
-#: src/callbacks.c:2641 src/callbacks.c:3068 src/callbacks.c:8026
+#: src/callbacks.c:2641 src/callbacks.c:3063 src/callbacks.c:7631
 msgid "Pulling frames from clipboard"
 msgstr ""
 
@@ -1917,22 +1916,22 @@
 msgid "Pasting %d frames to new clip %s..."
 msgstr ""
 
-#: src/callbacks.c:2678
+#: src/callbacks.c:2676
 msgid "Pasting"
 msgstr "اللصق"
 
-#: src/callbacks.c:2694
+#: src/callbacks.c:2692
 msgid "...added audio..."
 msgstr ""
 
-#: src/callbacks.c:2778
+#: src/callbacks.c:2775
 msgid ""
 "This operation requires resizing or converting of frames.\n"
 "Please install 'convert' from the Image-magick package, and then restart "
 "LiVES.\n"
 msgstr ""
 
-#: src/callbacks.c:2795
+#: src/callbacks.c:2793
 msgid ""
 "\n"
 "\n"
@@ -1941,31 +1940,31 @@
 "the 'Trim Audio' function from the Audio menu."
 msgstr ""
 
-#: src/callbacks.c:2819
+#: src/callbacks.c:2817
 msgid ""
 "LiVES cannot insert because the audio rates do not match.\n"
 "Please install 'sox', and try again."
 msgstr ""
 
-#: src/callbacks.c:2838
+#: src/callbacks.c:2835
 msgid ""
 "\n"
 "Insertion will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:2888 src/callbacks.c:11692
+#: src/callbacks.c:2883 src/callbacks.c:11606
 msgid ""
 "\n"
 "Insertion will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:2996 src/callbacks.c:3025
+#: src/callbacks.c:2987 src/callbacks.c:3016
 msgid "Resampling clipboard audio"
 msgstr ""
 
-#: src/callbacks.c:3041
+#: src/callbacks.c:3032
 msgid ""
 "\n"
 "\n"
@@ -1973,7 +1972,7 @@
 "Clipboard audio has been erased.\n"
 msgstr ""
 
-#: src/callbacks.c:3055
+#: src/callbacks.c:3045
 msgid ""
 "\n"
 "\n"
@@ -1982,86 +1981,86 @@
 "using unchanged audio ?\n"
 msgstr ""
 
-#: src/callbacks.c:3137 src/callbacks.c:3311
+#: src/callbacks.c:3132 src/callbacks.c:3299
 #, c-format
 msgid "Inserting %d%s frames from the clipboard..."
 msgstr ""
 
-#: src/callbacks.c:3162 src/callbacks.c:3236 src/callbacks.c:3339
+#: src/callbacks.c:3155 src/callbacks.c:3224 src/callbacks.c:3325
 msgid "Inserting"
 msgstr "جاري الإدراج"
 
-#: src/callbacks.c:3193
+#: src/callbacks.c:3187
 #, c-format
 msgid "Inserting %d times from the clipboard%s..."
 msgstr ""
 
-#: src/callbacks.c:3200
+#: src/callbacks.c:3191
 #, c-format
 msgid "Inserting %d frames from the clipboard%s..."
 msgstr ""
 
-#: src/callbacks.c:3418
+#: src/callbacks.c:3404
 msgid "Insert"
 msgstr "إدراج"
 
-#: src/callbacks.c:3486
+#: src/callbacks.c:3471
 msgid ""
 "\n"
 "Deleting all frames will close this file.\n"
 "Are you sure ?"
 msgstr ""
 
-#: src/callbacks.c:3495
+#: src/callbacks.c:3480
 msgid ""
 "\n"
 "Deletion will cause missing frames in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3515 src/callbacks.c:10920 src/callbacks.c:11162
-#: src/callbacks.c:11228
+#: src/callbacks.c:3500 src/callbacks.c:10851 src/callbacks.c:11087
+#: src/callbacks.c:11152
 msgid ""
 "\n"
 "Deletion will cause missing audio in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3534
+#: src/callbacks.c:3519
 msgid ""
 "\n"
 "Deletion will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3553 src/callbacks.c:11210
+#: src/callbacks.c:3538 src/callbacks.c:11134
 msgid ""
 "\n"
 "Deletion will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3611
+#: src/callbacks.c:3597
 #, c-format
 msgid "Deleting frames %d to %d%s..."
 msgstr ""
 
-#: src/callbacks.c:3636
+#: src/callbacks.c:3619
 msgid "Deleting"
 msgstr "يمحي"
 
-#: src/callbacks.c:3717
+#: src/callbacks.c:3699
 msgid "Delete"
 msgstr "حذف"
 
-#: src/callbacks.c:3738
+#: src/callbacks.c:3717
 msgid ""
 "\n"
 "\n"
 "Selection is locked.\n"
 msgstr ""
 
-#: src/callbacks.c:4092
+#: src/callbacks.c:4056
 msgid ""
 "Ready to record. Use 'control' and cursor keys during playback to record "
 "your performance.\n"
@@ -2069,11 +2068,11 @@
 "play.)\n"
 msgstr ""
 
-#: src/callbacks.c:4098
+#: src/callbacks.c:4061
 msgid "Record cancelled.\n"
 msgstr ""
 
-#: src/callbacks.c:4237
+#: src/callbacks.c:4197
 #, c-format
 msgid ""
 "\n"
@@ -2082,7 +2081,7 @@
 "%s\n"
 msgstr ""
 
-#: src/callbacks.c:4241
+#: src/callbacks.c:4200
 #, c-format
 msgid ""
 "\n"
@@ -2091,7 +2090,7 @@
 "The plugin may be broken or not installed correctly."
 msgstr ""
 
-#: src/callbacks.c:4571
+#: src/callbacks.c:4532
 #, c-format
 msgid ""
 "Saving the set will cause copies of all loaded clips to remain on the disk"
@@ -2100,22 +2099,22 @@
 "Please press 'Cancel' if that is not what you want.\n"
 msgstr ""
 
-#: src/callbacks.c:4654
+#: src/callbacks.c:4617
 #, c-format
 msgid "Saving set %s"
 msgstr ""
 
-#: src/callbacks.c:5005
+#: src/callbacks.c:4964
 #, c-format
 msgid "Loading clips from set %s"
 msgstr ""
 
-#: src/callbacks.c:5093
+#: src/callbacks.c:5051
 #, c-format
 msgid "%d clips and %d layouts were recovered from set (%s).\n"
 msgstr ""
 
-#: src/callbacks.c:5312
+#: src/callbacks.c:5259
 msgid ""
 "LiVES will attempt to recover some disk space.\n"
 "You should ONLY run this if you have no other copies of LiVES running on "
@@ -2123,24 +2122,24 @@
 "Click OK to proceed.\n"
 msgstr ""
 
-#: src/callbacks.c:5317
+#: src/callbacks.c:5264
 msgid "Cleaning up disk space..."
 msgstr ""
 
-#: src/callbacks.c:5387
+#: src/callbacks.c:5334
 msgid "Recovering disk space"
 msgstr ""
 
-#: src/callbacks.c:5439
+#: src/callbacks.c:5386
 #, c-format
 msgid "%s of disk space was recovered.\n"
 msgstr ""
 
-#: src/callbacks.c:5482
+#: src/callbacks.c:5428
 msgid "Resetting frame rates and frame values..."
 msgstr ""
 
-#: src/callbacks.c:5523
+#: src/callbacks.c:5469
 #, c-format
 msgid ""
 "\n"
@@ -2148,68 +2147,68 @@
 "Internal: %s (%d bpp) / %s\n"
 msgstr ""
 
-#: src/callbacks.c:5525
+#: src/callbacks.c:5471
 msgid "buffered"
 msgstr ""
 
-#: src/callbacks.c:5538 src/callbacks.c:5557 src/callbacks.c:5575
-#: src/callbacks.c:5609
+#: src/callbacks.c:5484 src/callbacks.c:5502 src/callbacks.c:5518
+#: src/callbacks.c:5551
 msgid ""
 "\n"
 "  Opening..."
 msgstr ""
 
-#: src/callbacks.c:5545
+#: src/callbacks.c:5490
 #, c-format
 msgid ""
 "\n"
 "(%d virtual)"
 msgstr ""
 
-#: src/callbacks.c:5548
+#: src/callbacks.c:5493
 #, c-format
 msgid ""
 "\n"
 "(%d decoded)"
 msgstr ""
 
-#: src/callbacks.c:5560 src/callbacks.c:5578 src/callbacks.c:5612
+#: src/callbacks.c:5504 src/callbacks.c:5520 src/callbacks.c:5553
 #, c-format
 msgid ""
 "\n"
 "  %.2f sec."
 msgstr ""
 
-#: src/callbacks.c:5569
+#: src/callbacks.c:5512
 msgid ""
 "\n"
 "  Unknown"
 msgstr ""
 
-#: src/callbacks.c:5582 src/callbacks.c:5596
+#: src/callbacks.c:5524 src/callbacks.c:5538
 msgid "unsigned"
 msgstr ""
 
-#: src/callbacks.c:5583 src/callbacks.c:5597
+#: src/callbacks.c:5525 src/callbacks.c:5539
 msgid "signed"
 msgstr ""
 
-#: src/callbacks.c:5585 src/callbacks.c:5599
+#: src/callbacks.c:5527 src/callbacks.c:5541
 msgid "big-endian"
 msgstr ""
 
-#: src/callbacks.c:5586 src/callbacks.c:5600
+#: src/callbacks.c:5528 src/callbacks.c:5542
 msgid "little-endian"
 msgstr ""
 
-#: src/callbacks.c:5588 src/callbacks.c:5602
+#: src/callbacks.c:5530 src/callbacks.c:5544
 #, c-format
 msgid ""
 "  %d Hz %d bit\n"
 "%s %s"
 msgstr ""
 
-#: src/callbacks.c:5707
+#: src/callbacks.c:5647
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -2226,15 +2225,15 @@
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA.\n"
 msgstr ""
 
-#: src/callbacks.c:5721
+#: src/callbacks.c:5661
 msgid "A video editor and VJ program."
 msgstr "وتحرير الفيديو وبرنامج الجيش اليوغوسلافي."
 
-#: src/callbacks.c:5722
+#: src/callbacks.c:5662
 msgid "About LiVES"
 msgstr ""
 
-#: src/callbacks.c:5724
+#: src/callbacks.c:5664
 msgid "translator_credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -2243,7 +2242,7 @@
 "  عبدالله شلي (Abdellah Chelli) https://launchpad.net/~sneetsher\n"
 "  عمرو رجائى(Amr) https://launchpad.net/~amr-ragaee"
 
-#: src/callbacks.c:5758
+#: src/callbacks.c:5699
 #, c-format
 msgid ""
 "LiVES Version %s\n"
@@ -2257,14 +2256,14 @@
 "Homepage: http://lives.sourceforge.net"
 msgstr ""
 
-#: src/callbacks.c:6037
+#: src/callbacks.c:5996
 msgid ""
 "\n"
 "\n"
 "You need to install mplayer or mplayer2 to be able to preview this file.\n"
 msgstr ""
 
-#: src/callbacks.c:6040
+#: src/callbacks.c:5998
 msgid ""
 "\n"
 "\n"
@@ -2272,215 +2271,206 @@
 "this file.\n"
 msgstr ""
 
-#: src/callbacks.c:6423 src/callbacks.c:8289
-msgid ""
-"\n"
-"Loading new audio may cause missing audio in some multitrack layouts.\n"
-"Are you sure you wish to continue ?\n"
-"."
-msgstr ""
-
-#: src/callbacks.c:6523
-#, c-format
-msgid "Opening audio %s, type %s..."
-msgstr ""
-
-#: src/callbacks.c:6556 src/saveplay.c:480
-msgid "Opening audio"
-msgstr ""
-
-#: src/callbacks.c:6565 src/callbacks.c:6612 src/callbacks.c:8387
-#: src/callbacks.c:8429 src/callbacks.c:8472 src/callbacks.c:10846
-msgid "Cancelling"
-msgstr "إلغاء"
-
-#: src/callbacks.c:6660 src/callbacks.c:8514 src/callbacks.c:10876
-#: src/callbacks.c:11563
-msgid "Committing audio"
-msgstr ""
-
-#: src/callbacks.c:6672 src/callbacks.c:8546
-msgid "New Audio"
-msgstr "أغنية جديدة"
-
-#: src/callbacks.c:6779
+#: src/callbacks.c:6459
 #, c-format
 msgid ""
 "Text was saved as\n"
 "%s\n"
 msgstr ""
 
-#: src/callbacks.c:6951 src/saveplay.c:3618
-#, c-format
-msgid "%d frames are enough !\n"
-msgstr ""
-
-#: src/callbacks.c:7050
+#: src/callbacks.c:6706
 msgid "LiVES: - Encoder debug output"
 msgstr ""
 
-#: src/callbacks.c:7087 src/gui.c:1922
+#: src/callbacks.c:6743 src/gui.c:1921
 msgid "Fullscreen playback (f)"
 msgstr ""
 
-#: src/callbacks.c:7089
+#: src/callbacks.c:6744
 msgid "Fullscreen playback off (f)"
 msgstr ""
 
-#: src/callbacks.c:7188 src/callbacks.c:7336 src/callbacks.c:7664
-#: src/callbacks.c:7681 src/gui.c:3712 src/saveplay.c:2467 src/saveplay.c:2501
-#: src/saveplay.c:3115 src/saveplay.c:3220 src/saveplay.c:3239
-#: src/multitrack.c:9340 src/multitrack.c:11060
+#: src/callbacks.c:6841 src/callbacks.c:6983 src/callbacks.c:7283
+#: src/callbacks.c:7298 src/gui.c:3838 src/saveplay.c:2442 src/saveplay.c:2475
+#: src/saveplay.c:3074 src/saveplay.c:3178 src/saveplay.c:3197
+#: src/multitrack.c:9526 src/multitrack.c:11288
 #, c-format
 msgid " (%d %% scale)"
 msgstr ""
 
-#: src/callbacks.c:7190 src/callbacks.c:7338 src/callbacks.c:7666
-#: src/gui.c:3716 src/saveplay.c:2469 src/saveplay.c:2503
+#: src/callbacks.c:6843 src/callbacks.c:6985 src/callbacks.c:7285
+#: src/gui.c:3842 src/saveplay.c:2444 src/saveplay.c:2477
 #, c-format
 msgid "LiVES: - Play Window%s"
 msgstr ""
 
-#: src/callbacks.c:7302 src/gui.c:1907
+#: src/callbacks.c:6950 src/gui.c:1906
 msgid "Double size (d)"
 msgstr ""
 
-#: src/callbacks.c:7309
+#: src/callbacks.c:6956
 msgid "Single size (d)"
 msgstr ""
 
-#: src/callbacks.c:7442 src/callbacks.c:7443
+#: src/callbacks.c:7087 src/callbacks.c:7088
 msgid "Hide the play window (s)"
 msgstr ""
 
-#: src/callbacks.c:7452 src/gui.c:1746
+#: src/callbacks.c:7096 src/gui.c:1744
 msgid "Show the play window (s)"
 msgstr ""
 
-#: src/callbacks.c:7453 src/gui.c:1896
+#: src/callbacks.c:7097 src/gui.c:1895
 msgid "Play in separate window (s)"
 msgstr ""
 
-#: src/callbacks.c:7535 src/gui.c:4060 src/saveplay.c:2498
+#: src/callbacks.c:7175 src/gui.c:4169 src/saveplay.c:2472
 msgid "LiVES: - Streaming"
 msgstr ""
 
-#: src/callbacks.c:7778
+#: src/callbacks.c:7388
 msgid "Switch continuous looping off (o)"
 msgstr "التبديل حلقات متواصلة من (س)"
 
-#: src/callbacks.c:7785 src/gui.c:1795
+#: src/callbacks.c:7394 src/gui.c:1793
 msgid "Switch continuous looping on (o)"
 msgstr "حلقات التبديل المستمر على (س)"
 
-#: src/callbacks.c:7837
+#: src/callbacks.c:7444
 #, c-format
 msgid "Audio volume (%.2f)"
 msgstr ""
 
-#: src/callbacks.c:7876 src/callbacks.c:7877 src/gui.c:3640
+#: src/callbacks.c:7483 src/callbacks.c:7484 src/gui.c:3766
 msgid "Unmute the audio (z)"
 msgstr ""
 
-#: src/callbacks.c:7888 src/callbacks.c:7889 src/gui.c:1808 src/gui.c:3639
+#: src/callbacks.c:7494 src/callbacks.c:7495 src/gui.c:1806 src/gui.c:3765
 msgid "Mute the audio (z)"
 msgstr ""
 
-#: src/callbacks.c:8038
+#: src/callbacks.c:7643
 msgid "Reversing clipboard..."
 msgstr ""
 
-#: src/callbacks.c:8052
+#: src/callbacks.c:7657
 msgid "Reversing clipboard"
 msgstr ""
 
-#: src/callbacks.c:8084
+#: src/callbacks.c:7689
 msgid "LiVES: Load subtitles from..."
 msgstr ""
 
-#: src/callbacks.c:8151 src/saveplay.c:970
+#: src/callbacks.c:7753 src/saveplay.c:956
 #, c-format
 msgid "Loaded subtitle file: %s\n"
 msgstr ""
 
-#: src/callbacks.c:8220
+#: src/callbacks.c:7821
 msgid "Subtitles were erased.\n"
 msgstr ""
 
-#: src/callbacks.c:8239
+#: src/callbacks.c:7843
 msgid "LiVES: - Select Audio File"
 msgstr ""
 
-#: src/callbacks.c:8250
+#: src/callbacks.c:7878 src/callbacks.c:8232
+msgid ""
+"\n"
+"Loading new audio may cause missing audio in some multitrack layouts.\n"
+"Are you sure you wish to continue ?\n"
+"."
+msgstr ""
+
+#: src/callbacks.c:7989
+#, c-format
+msgid "Opening audio %s, type %s..."
+msgstr ""
+
+#: src/callbacks.c:8023 src/saveplay.c:477
+msgid "Opening audio"
+msgstr ""
+
+#: src/callbacks.c:8032 src/callbacks.c:8083 src/callbacks.c:8327
+#: src/callbacks.c:8369 src/callbacks.c:8412 src/callbacks.c:10766
+msgid "Cancelling"
+msgstr "إلغاء"
+
+#: src/callbacks.c:8137 src/callbacks.c:8454 src/callbacks.c:10803
+#: src/callbacks.c:11477
+msgid "Committing audio"
+msgstr ""
+
+#: src/callbacks.c:8153 src/callbacks.c:8484
+msgid "New Audio"
+msgstr "أغنية جديدة"
+
+#: src/callbacks.c:8194
 msgid "Please set your CD play device in Tools | Preferences | Misc\n"
 msgstr ""
 
-#: src/callbacks.c:8321
+#: src/callbacks.c:8264
 #, c-format
 msgid "Opening CD track %d from %s..."
 msgstr ""
 
-#: src/callbacks.c:8326
+#: src/callbacks.c:8267
 #, c-format
 msgid "CD track %d"
 msgstr ""
 
-#: src/callbacks.c:8373
+#: src/callbacks.c:8313
 msgid "Opening CD track..."
 msgstr "افتتاح مؤتمر نزع السلاح المسار..."
 
-#: src/callbacks.c:8415 src/callbacks.c:8461
+#: src/callbacks.c:8355 src/callbacks.c:8401
 msgid "Error loading CD track\n"
 msgstr ""
 
-#: src/callbacks.c:8584
+#: src/callbacks.c:8518
 msgid "layout errors"
 msgstr "أخطاء التصميم"
 
-#: src/callbacks.c:8595
+#: src/callbacks.c:8529
 msgid "Close _Window"
 msgstr "إغلاق _النافذة"
 
-#: src/callbacks.c:8606
+#: src/callbacks.c:8540
 msgid "Clear _Errors"
 msgstr "أخطاء وا_ضحة"
 
-#: src/callbacks.c:8617
+#: src/callbacks.c:8551
 msgid "_Delete affected layouts"
 msgstr "_حذف تخطيطات المتضررة"
 
-#: src/callbacks.c:9343 src/callbacks.c:9388
+#: src/callbacks.c:9253 src/callbacks.c:9298
 msgid "Resume"
 msgstr "إستأنف"
 
-#: src/callbacks.c:9344
+#: src/callbacks.c:9254
 msgid ""
 "\n"
 "Paused\n"
 "(click Resume to continue processing)"
 msgstr ""
 
-#: src/callbacks.c:9345 src/callbacks.c:9406
+#: src/callbacks.c:9255 src/callbacks.c:9315
 msgid "paused..."
 msgstr "مؤقتا..."
 
-#: src/callbacks.c:9372 src/callbacks.c:9418
-msgid "Pause"
-msgstr "ايقاف مؤقت"
-
-#: src/callbacks.c:9374 src/callbacks.c:9421
+#: src/callbacks.c:9284 src/callbacks.c:9333
 msgid "resumed..."
 msgstr "استأنفت..."
 
-#: src/callbacks.c:9393
+#: src/callbacks.c:9303
 msgid "Keep"
 msgstr "حافظ عليه"
 
-#: src/callbacks.c:9396
+#: src/callbacks.c:9305
 msgid "Enough"
 msgstr ""
 
-#: src/callbacks.c:9401
+#: src/callbacks.c:9310
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2493,28 +2483,28 @@
 "(انقر فوق الاحتفاظ للحفاظ على ما لديك ، ووقف)\n"
 "(انقر فوق استئناف لمواصلة تجهيز)"
 
-#: src/callbacks.c:9419
+#: src/callbacks.c:9331
 msgid "Cancel"
 msgstr "إلغـاء"
 
-#: src/callbacks.c:9558
+#: src/callbacks.c:9478
 msgid "Stop"
 msgstr ""
 
-#: src/callbacks.c:10053 src/multitrack.c:13247
+#: src/callbacks.c:9968 src/multitrack.c:13489
 msgid "LiVES: Selected frame"
 msgstr ""
 
-#: src/callbacks.c:10061
+#: src/callbacks.c:9976
 msgid "_Save frame as..."
 msgstr ""
 
-#: src/callbacks.c:10290
+#: src/callbacks.c:10202
 #, c-format
 msgid "Audio is ahead of video by %.4f secs. at frame %d, with fps %.4f\n"
 msgstr ""
 
-#: src/callbacks.c:10347
+#: src/callbacks.c:10255
 msgid ""
 "\n"
 "\n"
@@ -2523,7 +2513,7 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10353
+#: src/callbacks.c:10261
 msgid ""
 "\n"
 "\n"
@@ -2531,7 +2521,7 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10429 src/callbacks.c:11479
+#: src/callbacks.c:10334 src/callbacks.c:11395
 msgid ""
 "\n"
 "Record time must be greater than 0.\n"
@@ -2539,7 +2529,7 @@
 "\n"
 "سجل الوقت يجب أن يكون أكبر من الصفر.\n"
 
-#: src/callbacks.c:10440
+#: src/callbacks.c:10346
 msgid ""
 "Capture an External Window:\n"
 "\n"
@@ -2548,17 +2538,17 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10445
+#: src/callbacks.c:10351
 msgid "External window was released.\n"
 msgstr "الخارجية النافذة قد أفرج عنه.\n"
 
-#: src/callbacks.c:10479
+#: src/callbacks.c:10385
 msgid ""
 "Click on a Window to Capture it\n"
 "Press 'q' to stop recording"
 msgstr ""
 
-#: src/callbacks.c:10513
+#: src/callbacks.c:10419
 #, c-format
 msgid ""
 "\n"
@@ -2568,19 +2558,19 @@
 "(Default of %.3f frames per second will be used.)\n"
 msgstr ""
 
-#: src/callbacks.c:10539
+#: src/callbacks.c:10443
 msgid "LiVES was unable to capture this window. Sorry.\n"
 msgstr ""
 
-#: src/callbacks.c:10695
+#: src/callbacks.c:10601
 msgid "Export Selected Audio as..."
 msgstr "أغاني مختارة والتصدير..."
 
-#: src/callbacks.c:10699
+#: src/callbacks.c:10604
 msgid "Export Audio as..."
 msgstr "التصدير والصوت..."
 
-#: src/callbacks.c:10714
+#: src/callbacks.c:10619
 msgid ""
 "\n"
 "\n"
@@ -2589,86 +2579,86 @@
 "rate.\n"
 msgstr ""
 
-#: src/callbacks.c:10720
+#: src/callbacks.c:10625
 #, c-format
 msgid "Exporting audio frames %d to %d as %s..."
 msgstr ""
 
-#: src/callbacks.c:10725
+#: src/callbacks.c:10629
 #, c-format
 msgid "Exporting audio as %s..."
 msgstr ""
 
-#: src/callbacks.c:10751
+#: src/callbacks.c:10655
 msgid "Exporting audio"
 msgstr "تصدير الصوت"
 
-#: src/callbacks.c:10782
+#: src/callbacks.c:10695
 msgid "LiVES: - Append Audio File"
 msgstr ""
 
-#: src/callbacks.c:10825
+#: src/callbacks.c:10739
 #, c-format
 msgid "Appending audio file %s..."
 msgstr ""
 
-#: src/callbacks.c:10836
+#: src/callbacks.c:10756
 msgid "Appending audio"
 msgstr "إلحاق الصوت"
 
-#: src/callbacks.c:10892
+#: src/callbacks.c:10818
 msgid "Append Audio"
 msgstr "إلحاق أغنية"
 
-#: src/callbacks.c:10952
+#: src/callbacks.c:10883
 #, c-format
 msgid "Padding audio to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10954
+#: src/callbacks.c:10885
 #, c-format
 msgid "Trimming audio from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10973
+#: src/callbacks.c:10904
 msgid "Trimming/Padding audio"
 msgstr ""
 
-#: src/callbacks.c:10981
+#: src/callbacks.c:10912
 msgid "Trim/Pad Audio"
 msgstr "تقليم / الوسادة أغنية"
 
-#: src/callbacks.c:11055
+#: src/callbacks.c:10982
 msgid "Fading audio in"
 msgstr ""
 
-#: src/callbacks.c:11056
+#: src/callbacks.c:10983
 msgid "Fade audio in"
 msgstr ""
 
-#: src/callbacks.c:11061
+#: src/callbacks.c:10987
 msgid "Fading audio out"
 msgstr ""
 
-#: src/callbacks.c:11062
+#: src/callbacks.c:10988
 msgid "Fade audio out"
 msgstr ""
 
-#: src/callbacks.c:11085
+#: src/callbacks.c:11011
 #, c-format
 msgid "%s over %.1f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11087
+#: src/callbacks.c:11013
 #, c-format
 msgid "%s from time %.2f seconds to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11094
+#: src/callbacks.c:11020
 msgid "Fading audio..."
 msgstr "يتلاشى الصوت..."
 
-#: src/callbacks.c:11194
+#: src/callbacks.c:11119
 msgid ""
 "\n"
 "Deleting all audio will close this file.\n"
@@ -2678,947 +2668,947 @@
 "حذف جميع السمعية سيتم إغلاق هذا الملف.\n"
 "هل أنت متأكد ؟"
 
-#: src/callbacks.c:11197
+#: src/callbacks.c:11122
 msgid "Deleting all audio..."
 msgstr "حذف كل صوت..."
 
-#: src/callbacks.c:11203
+#: src/callbacks.c:11127
 #, c-format
 msgid "Deleting audio from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11290
+#: src/callbacks.c:11214
 msgid "Deleting Audio"
 msgstr "حذف أغنية"
 
-#: src/callbacks.c:11297
+#: src/callbacks.c:11221
 msgid "Delete Audio"
 msgstr "حذف أغنية"
 
-#: src/callbacks.c:11636
+#: src/callbacks.c:11550
 msgid "Record new audio"
 msgstr "تسجيل صوتي جديد"
 
-#: src/callbacks.c:11725
+#: src/callbacks.c:11640
 #, c-format
 msgid "Inserting silence from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11754
+#: src/callbacks.c:11666
 msgid "Inserting Silence"
 msgstr ""
 
-#: src/merge.c:85
+#: src/merge.c:96
 msgid "LiVES: - Merge"
 msgstr ""
 
-#: src/merge.c:102
+#: src/merge.c:113
 #, c-format
 msgid "Merge Clipboard [ %d Frames ]       With Selection [ %d Frames ]"
 msgstr ""
 
-#: src/merge.c:107
+#: src/merge.c:118
 #, c-format
 msgid ""
 "Merge Clipboard [ %d Frames (resampled) ]       With Selection [ %d Frames ]"
 msgstr ""
 
-#: src/merge.c:118
+#: src/merge.c:130
 msgid "Align _Starts"
 msgstr ""
 
-#: src/merge.c:123
+#: src/merge.c:135
 msgid "Align _Ends"
 msgstr ""
 
-#: src/merge.c:134
+#: src/merge.c:146
 msgid "What to do with extra clipboard frames -"
 msgstr "ماذا تفعل مع إطارات الحافظة اضافية -"
 
-#: src/merge.c:137
+#: src/merge.c:149
 msgid "_Insert Frames"
 msgstr "_إدراج إطارات"
 
-#: src/merge.c:143
+#: src/merge.c:155
 msgid "_Drop Frames"
 msgstr "_انخفاض بأطر"
 
-#: src/merge.c:149
+#: src/merge.c:160
 msgid "Number of Times to Loop Clipboard"
 msgstr ""
 
-#: src/merge.c:160
+#: src/merge.c:171
 msgid "_Loop Clipboard to Fit Selection"
 msgstr ""
 
-#: src/merge.c:173
+#: src/merge.c:184
 msgid "_Transition Method:"
 msgstr "_طريقة الانتقال :"
 
-#: src/merge.c:394
+#: src/merge.c:395
 msgid "Merging clipboard with selection..."
 msgstr ""
 
-#: src/merge.c:551
+#: src/merge.c:539
 msgid "Merge done.\n"
 msgstr "دمج عمله.\n"
 
-#: src/gui.c:123
+#: src/gui.c:122
 msgid "_Custom Generators"
 msgstr ""
 
-#: src/gui.c:124
+#: src/gui.c:123
 msgid "_Custom Effects"
 msgstr "_العرف الأثر"
 
-#: src/gui.c:125
+#: src/gui.c:124
 msgid "Custom _Utilities"
 msgstr "العرف ا_لمرافق"
 
-#: src/gui.c:352 src/multitrack.c:5964
+#: src/gui.c:351 src/multitrack.c:6143
 msgid "_File"
 msgstr "_ملف"
 
-#: src/gui.c:367 src/multitrack.c:5989
+#: src/gui.c:366 src/multitrack.c:6168
 msgid "_Open File/Directory"
 msgstr "_فتح ملف / دليل"
 
-#: src/gui.c:373
+#: src/gui.c:372
 msgid "O_pen Part of File..."
 msgstr ""
 
-#: src/gui.c:379 src/gui.c:383 src/multitrack.c:6006 src/multitrack.c:6023
-#: src/multitrack.c:6028
+#: src/gui.c:378 src/gui.c:382 src/multitrack.c:6185 src/multitrack.c:6202
+#: src/multitrack.c:6207
 msgid "Open _Location/Stream..."
 msgstr "فتح _الموقع / دفق..."
 
-#: src/gui.c:393 src/multitrack.c:6016
+#: src/gui.c:392 src/multitrack.c:6195
 msgid "Open _Youtube Clip..."
 msgstr ""
 
-#: src/gui.c:404
+#: src/gui.c:403
 msgid "Import from _dvd/vcd..."
 msgstr ""
 
-#: src/gui.c:413
+#: src/gui.c:412
 msgid "Import from _dvd"
 msgstr ""
 
-#: src/gui.c:416
+#: src/gui.c:415
 msgid "Import from _vcd"
 msgstr ""
 
-#: src/gui.c:419
+#: src/gui.c:418
 msgid "_Import from Firewire"
 msgstr ""
 
-#: src/gui.c:428 src/multitrack.c:6086
+#: src/gui.c:427 src/multitrack.c:6265
 msgid "Import from _Firewire Device (dv)"
 msgstr ""
 
-#: src/gui.c:429 src/multitrack.c:6094
+#: src/gui.c:428 src/multitrack.c:6273
 msgid "Import from _Firewire Device (hdv)"
 msgstr ""
 
-#: src/gui.c:457
+#: src/gui.c:456
 msgid "_Add Webcam/TV card..."
 msgstr ""
 
-#: src/gui.c:476
+#: src/gui.c:475
 msgid "Add _Unicap Device"
 msgstr ""
 
-#: src/gui.c:486
+#: src/gui.c:485
 msgid "Add Live _Firewire Device"
 msgstr ""
 
-#: src/gui.c:495
+#: src/gui.c:494
 msgid "Add _TV Device"
 msgstr ""
 
-#: src/gui.c:510 src/multitrack.c:6117
+#: src/gui.c:509 src/multitrack.c:6296
 msgid "_Recent Files..."
 msgstr "_الملفات الحديثة..."
 
-#: src/gui.c:560 src/multitrack.c:6177
+#: src/gui.c:559 src/multitrack.c:6356
 msgid "_Reload Clip Set..."
 msgstr ""
 
-#: src/gui.c:564 src/multitrack.c:6185
+#: src/gui.c:563 src/multitrack.c:6364
 msgid "Close/Sa_ve All Clips"
 msgstr ""
 
-#: src/gui.c:575
+#: src/gui.c:574
 msgid "_Encode Clip As..."
 msgstr ""
 
-#: src/gui.c:577
+#: src/gui.c:576
 msgid "Encode _Selection As..."
 msgstr ""
 
-#: src/gui.c:584
+#: src/gui.c:583
 msgid "_Close This Clip"
 msgstr "_إغلاق هذه القصاصات"
 
-#: src/gui.c:595
+#: src/gui.c:594
 msgid "_Backup Clip as .lv1..."
 msgstr ""
 
-#: src/gui.c:604
+#: src/gui.c:603
 msgid "_Restore Clip from .lv1..."
 msgstr ""
 
-#: src/gui.c:615
+#: src/gui.c:614
 msgid "Encode/Load/Backup _with Sound"
 msgstr ""
 
-#: src/gui.c:620
+#: src/gui.c:619
 msgid "Auto load subtitles"
 msgstr ""
 
-#: src/gui.c:628 src/multitrack.c:6224
+#: src/gui.c:627 src/multitrack.c:6403
 msgid "Clean _up Diskspace"
 msgstr ""
 
-#: src/gui.c:636 src/multitrack.c:6257
+#: src/gui.c:635 src/multitrack.c:6436
 msgid "_Edit"
 msgstr "_تعديل"
 
-#: src/gui.c:685
+#: src/gui.c:684
 msgid "_MULTITRACK mode"
 msgstr ""
 
-#: src/gui.c:696
+#: src/gui.c:695
 msgid "_Copy Selection"
 msgstr "_نسخة التحديد"
 
-#: src/gui.c:705
+#: src/gui.c:704
 msgid "Cu_t Selection"
 msgstr "ق_طع التحديد"
 
-#: src/gui.c:714
+#: src/gui.c:713
 msgid "_Insert from Clipboard..."
 msgstr ""
 
-#: src/gui.c:730
+#: src/gui.c:729
 msgid "Paste as _New"
 msgstr ""
 
-#: src/gui.c:739
+#: src/gui.c:738
 msgid "_Merge Clipboard with Selection..."
 msgstr ""
 
-#: src/gui.c:746
+#: src/gui.c:745
 msgid "_Delete Selection"
 msgstr "ا_حذف التحديد"
 
-#: src/gui.c:764
+#: src/gui.c:763
 msgid "Decouple _Video from Audio"
 msgstr ""
 
-#: src/gui.c:772
+#: src/gui.c:771
 msgid "_Select..."
 msgstr "انت_ق..."
 
-#: src/gui.c:786
+#: src/gui.c:785
 msgid "Select _All Frames"
 msgstr "حدد كافة _إطارات"
 
-#: src/gui.c:794
+#: src/gui.c:793
 msgid "_Start Frame Only"
 msgstr ""
 
-#: src/gui.c:802
+#: src/gui.c:801
 msgid "_End Frame Only"
 msgstr ""
 
-#: src/gui.c:813
+#: src/gui.c:812
 msgid "Select from _First Frame"
 msgstr ""
 
-#: src/gui.c:817
+#: src/gui.c:816
 msgid "Select to _Last Frame"
 msgstr ""
 
-#: src/gui.c:821
+#: src/gui.c:820
 msgid "Select Last Insertion/_Merge"
 msgstr ""
 
-#: src/gui.c:825
+#: src/gui.c:824
 msgid "Select Last _Effect"
 msgstr "حدد _تأثير آخر"
 
-#: src/gui.c:829
+#: src/gui.c:828
 msgid "_Invert Selection"
 msgstr "اع_كس الاختيار"
 
-#: src/gui.c:837
+#: src/gui.c:836
 msgid "_Lock Selection Width"
 msgstr "_قفل اختيار العرض"
 
-#: src/gui.c:842 src/multitrack.c:6409
+#: src/gui.c:841 src/multitrack.c:6591
 msgid "_Play"
 msgstr "_شَغِّل"
 
-#: src/gui.c:854
+#: src/gui.c:853
 msgid "_Play All"
 msgstr "_تلعب جميع"
 
-#: src/gui.c:869
+#: src/gui.c:868
 msgid "Pla_y Selection"
 msgstr "اخت_يار اللعب"
 
-#: src/gui.c:877
+#: src/gui.c:876
 msgid "Play _Clipboard"
 msgstr ""
 
-#: src/gui.c:899 src/multitrack.c:6441
+#: src/gui.c:898 src/multitrack.c:6623
 msgid "_Stop"
 msgstr "_قف"
 
-#: src/gui.c:914 src/multitrack.c:6453
+#: src/gui.c:913 src/multitrack.c:6635
 msgid "Re_wind"
 msgstr "الترج_يع"
 
-#: src/gui.c:946 src/multitrack.c:6471
+#: src/gui.c:945 src/multitrack.c:6653
 msgid "_Full Screen"
 msgstr "_كامل الشاشة"
 
-#: src/gui.c:955
+#: src/gui.c:954
 msgid "_Double Size"
 msgstr "_مضاعفة الحجم"
 
-#: src/gui.c:963 src/multitrack.c:6479
+#: src/gui.c:962 src/multitrack.c:6661
 msgid "Play in _Separate Window"
 msgstr "اللعب في نافذة _منفصلة"
 
-#: src/gui.c:972
+#: src/gui.c:971
 msgid "_Blank Background"
 msgstr "_خلفية بيضاء"
 
-#: src/gui.c:979
+#: src/gui.c:978
 msgid "(Auto)_loop Video (to fit audio track)"
 msgstr "(تلقائيا) _حلقة فيديو (لتناسب المسار الصوتي)"
 
-#: src/gui.c:988 src/multitrack.c:6487
+#: src/gui.c:987 src/multitrack.c:6669
 msgid "L_oop Continuously"
 msgstr "حلق_ة مستمرة"
 
-#: src/gui.c:997
+#: src/gui.c:996
 msgid "Pin_g Pong Loops"
 msgstr "_بينغ بونغ الحلقات"
 
-#: src/gui.c:1005 src/multitrack.c:6495
+#: src/gui.c:1004 src/multitrack.c:6677
 msgid "_Mute"
 msgstr "أص_مت"
 
-#: src/gui.c:1017
+#: src/gui.c:1016
 msgid "Separate Window 'S_ticky' Mode"
 msgstr ""
 
-#: src/gui.c:1025
+#: src/gui.c:1024
 msgid "S_how Frame Counter"
 msgstr ""
 
-#: src/gui.c:1035
+#: src/gui.c:1034
 msgid "Show Subtitles"
 msgstr ""
 
-#: src/gui.c:1045
+#: src/gui.c:1044
 msgid "Letterbox mode"
 msgstr ""
 
-#: src/gui.c:1051 src/multitrack.c:6507
+#: src/gui.c:1050 src/multitrack.c:6689
 msgid "Effect_s"
 msgstr "الآ_ثار"
 
-#: src/gui.c:1054
+#: src/gui.c:1053
 msgid "Effects are applied to the current selection."
 msgstr ""
 
-#: src/gui.c:1067
+#: src/gui.c:1066
 msgid "_Run Test Rendered Effect/Tool/Generator..."
 msgstr ""
 
-#: src/gui.c:1072 src/multitrack.c:7123
+#: src/gui.c:1071 src/multitrack.c:7299
 msgid "_Tools"
 msgstr "_الأدوات"
 
-#: src/gui.c:1075
+#: src/gui.c:1074
 msgid "Tools are applied to complete clips."
 msgstr "أدوات يتم تطبيقها على مقاطع كاملة."
 
-#: src/gui.c:1085
+#: src/gui.c:1084
 msgid "_Reverse Clipboard"
 msgstr ""
 
-#: src/gui.c:1094
+#: src/gui.c:1093
 msgid "_Change Playback/Save Speed..."
 msgstr ""
 
-#: src/gui.c:1099
+#: src/gui.c:1098
 msgid "Resample _Video to New Frame Rate..."
 msgstr ""
 
-#: src/gui.c:1105
+#: src/gui.c:1104
 msgid "_Utilities"
 msgstr "أد_وات"
 
-#: src/gui.c:1110
+#: src/gui.c:1109
 msgid "Custom _Tools"
 msgstr "أدوات _مخصص"
 
-#: src/gui.c:1116 src/multitrack.c:7149
+#: src/gui.c:1115 src/multitrack.c:7325
 msgid "_Generate"
 msgstr "ت_وليد"
 
-#: src/gui.c:1126
+#: src/gui.c:1125
 msgid "Loading rendered effect plugins..."
 msgstr ""
 
-#: src/gui.c:1139
+#: src/gui.c:1138
 msgid "Load _Subtitles from File..."
 msgstr ""
 
-#: src/gui.c:1144
+#: src/gui.c:1143
 msgid "Erase subtitles"
 msgstr ""
 
-#: src/gui.c:1152 src/multitrack.c:7158
+#: src/gui.c:1151 src/multitrack.c:7334
 msgid "Capture _External Window... "
 msgstr ""
 
-#: src/gui.c:1159 src/multitrack.c:7173
+#: src/gui.c:1158 src/multitrack.c:7349
 msgid "_Preferences..."
 msgstr "_تفضيلات..."
 
-#: src/gui.c:1172
+#: src/gui.c:1171
 msgid "_Audio"
 msgstr "_الصوت"
 
-#: src/gui.c:1184
+#: src/gui.c:1183
 msgid "Load _New Audio for Clip..."
 msgstr ""
 
-#: src/gui.c:1190
+#: src/gui.c:1189
 msgid "Load _CD Track..."
 msgstr ""
 
-#: src/gui.c:1191
+#: src/gui.c:1190
 msgid "E_ject CD"
 msgstr "_قذف القرص"
 
-#: src/gui.c:1205
+#: src/gui.c:1204
 msgid "Record E_xternal Audio..."
 msgstr ""
 
-#: src/gui.c:1218
+#: src/gui.c:1217
 msgid "to New _Clip..."
 msgstr "لكليب _جديد..."
 
-#: src/gui.c:1222
+#: src/gui.c:1221
 msgid "to _Selection"
 msgstr "لا_ختيار"
 
-#: src/gui.c:1230
+#: src/gui.c:1229
 msgid "Fade Audio _In..."
 msgstr ""
 
-#: src/gui.c:1234
+#: src/gui.c:1233
 msgid "Fade Audio _Out..."
 msgstr ""
 
-#: src/gui.c:1244
+#: src/gui.c:1243
 msgid "_Export Audio..."
 msgstr "_تصدير أغنية..."
 
-#: src/gui.c:1257
+#: src/gui.c:1256
 msgid "Export _Selected Audio..."
 msgstr ""
 
-#: src/gui.c:1261
+#: src/gui.c:1260
 msgid "Export _All Audio..."
 msgstr ""
 
-#: src/gui.c:1265
+#: src/gui.c:1264
 msgid "_Append Audio..."
 msgstr ""
 
-#: src/gui.c:1270
+#: src/gui.c:1269
 msgid "_Trim/Pad Audio..."
 msgstr ""
 
-#: src/gui.c:1283
+#: src/gui.c:1282
 msgid "Trim/Pad Audio to _Selection"
 msgstr ""
 
-#: src/gui.c:1288
+#: src/gui.c:1287
 msgid "Trim/Pad Audio from Beginning to _Play Start"
 msgstr ""
 
-#: src/gui.c:1293
+#: src/gui.c:1292
 msgid "_Delete Audio..."
 msgstr "_حذف أغنية..."
 
-#: src/gui.c:1306
+#: src/gui.c:1305
 msgid "Delete _Selected Audio"
 msgstr ""
 
-#: src/gui.c:1310
+#: src/gui.c:1309
 msgid "Delete _All Audio"
 msgstr ""
 
-#: src/gui.c:1314
+#: src/gui.c:1313
 msgid "Insert _Silence in Selection"
 msgstr ""
 
-#: src/gui.c:1319
+#: src/gui.c:1318
 msgid "_Resample Audio..."
 msgstr ""
 
-#: src/gui.c:1324
+#: src/gui.c:1323
 msgid "_Info"
 msgstr ""
 
-#: src/gui.c:1336
+#: src/gui.c:1335
 msgid "Show Clip _Info"
 msgstr "وتظهر معلوم_ات كليب"
 
-#: src/gui.c:1344
+#: src/gui.c:1343
 msgid "Show/_Edit File Comments"
 msgstr "عرض / _تحرير ملف تعليقات"
 
-#: src/gui.c:1349
+#: src/gui.c:1348
 msgid "Show _Clipboard Info"
 msgstr ""
 
-#: src/gui.c:1360 src/multitrack.c:7286
+#: src/gui.c:1359 src/multitrack.c:7462
 msgid "Show _Messages"
 msgstr "وتظهر _رسائل"
 
-#: src/gui.c:1364 src/multitrack.c:7365
+#: src/gui.c:1363 src/multitrack.c:7541
 msgid "Show _Layout Errors"
 msgstr "وتظهر_ تخطيط أخطاء"
 
-#: src/gui.c:1369 src/multitrack.c:7263
+#: src/gui.c:1368 src/multitrack.c:7439
 msgid "_Clips"
 msgstr "_لقطات"
 
-#: src/gui.c:1381
+#: src/gui.c:1380
 msgid "_Rename Current Clip in Menu..."
 msgstr ""
 
-#: src/gui.c:1399
+#: src/gui.c:1398
 msgid "A_dvanced"
 msgstr "م_تقدم"
 
-#: src/gui.c:1412
+#: src/gui.c:1411
 msgid "_RFX Effects/Tools/Utilities"
 msgstr ""
 
-#: src/gui.c:1424
+#: src/gui.c:1423
 msgid "_New Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1428
+#: src/gui.c:1427
 msgid "_Copy RFX Script to Test..."
 msgstr ""
 
-#: src/gui.c:1432
+#: src/gui.c:1431
 msgid "_Edit Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1436
+#: src/gui.c:1435
 msgid "Rena_me Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1440
+#: src/gui.c:1439
 msgid "_Delete Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1450
+#: src/gui.c:1449
 msgid "_Promote Test Rendered Effect/Tool/Generator..."
 msgstr ""
 
-#: src/gui.c:1457
+#: src/gui.c:1456
 msgid "_Import Custom RFX script..."
 msgstr ""
 
-#: src/gui.c:1461
+#: src/gui.c:1460
 msgid "E_xport Custom RFX script..."
 msgstr ""
 
-#: src/gui.c:1465
+#: src/gui.c:1464
 msgid "De_lete Custom RFX Script..."
 msgstr ""
 
-#: src/gui.c:1472
+#: src/gui.c:1471
 msgid "Re_build all RFX plugins"
 msgstr ""
 
-#: src/gui.c:1501
+#: src/gui.c:1498
 msgid "Receive _LiVES stream from..."
 msgstr ""
 
-#: src/gui.c:1506
+#: src/gui.c:1503
 msgid "_Send LiVES stream to..."
 msgstr "_ارسال تيار لأرواح..."
 
-#: src/gui.c:1515
+#: src/gui.c:1512
 #, c-format
 msgid "Open _yuv4mpeg stream on %sstream.yuv..."
 msgstr ""
 
-#: src/gui.c:1536
+#: src/gui.c:1534
 msgid "_Import Project (.lv2)..."
 msgstr ""
 
-#: src/gui.c:1540
+#: src/gui.c:1538
 msgid "E_xport Project (.lv2)..."
 msgstr ""
 
-#: src/gui.c:1545
+#: src/gui.c:1543
 msgid "_VJ"
 msgstr "_الجيش اليوغوسلافي"
 
-#: src/gui.c:1557
+#: src/gui.c:1555
 msgid "Real Time _Effect Mapping"
 msgstr ""
 
-#: src/gui.c:1563
+#: src/gui.c:1561
 msgid "Bind real time effects to ctrl-number keys."
 msgstr ""
 
-#: src/gui.c:1565
+#: src/gui.c:1563
 msgid "Set Real Time Effect _Defaults"
 msgstr ""
 
-#: src/gui.c:1567
+#: src/gui.c:1565
 msgid "Set default parameter values for real time effects."
 msgstr ""
 
-#: src/gui.c:1580
+#: src/gui.c:1578
 msgid "Save Real Time Effect _Defaults"
 msgstr ""
 
-#: src/gui.c:1583
+#: src/gui.c:1581
 msgid ""
 "Save real time effect defaults so they will be restored each time you use "
 "LiVES."
 msgstr ""
 
-#: src/gui.c:1589
+#: src/gui.c:1587
 msgid "_Reset all playback speeds and positions"
 msgstr "_إعادة تعيين جميع سرعات القراءة ومواقف"
 
-#: src/gui.c:1592
+#: src/gui.c:1590
 msgid ""
 "Reset all playback positions to frame 1, and reset all playback frame rates."
 msgstr ""
 
-#: src/gui.c:1594
+#: src/gui.c:1592
 msgid "_MIDI/joystick interface"
 msgstr "_ميدي / عصا التحكم واجهة"
 
-#: src/gui.c:1609
+#: src/gui.c:1607
 msgid "_MIDI/joystick learner..."
 msgstr "_ميدي / جويستيك المتعلم..."
 
-#: src/gui.c:1614
+#: src/gui.c:1612
 msgid "_Save device mapping..."
 msgstr "_انقاذ جهاز رسم الخرائط..."
 
-#: src/gui.c:1620
+#: src/gui.c:1618
 msgid "_Load device mapping..."
 msgstr "_تحميل جهاز رسم الخرائط..."
 
-#: src/gui.c:1628
+#: src/gui.c:1626
 msgid "Show VJ _Keys"
 msgstr "وتظهر الجيش اليوغوسلافي _كيز"
 
-#: src/gui.c:1632
+#: src/gui.c:1630
 msgid "To_ys"
 msgstr "ولعب ا_طفال"
 
-#: src/gui.c:1644
+#: src/gui.c:1642
 msgid "_None"
 msgstr "_لا شيء"
 
-#: src/gui.c:1652
+#: src/gui.c:1650
 msgid "_Autolives"
 msgstr ""
 
-#: src/gui.c:1657
+#: src/gui.c:1655
 msgid "_Mad Frames"
 msgstr "_جنون بأطر"
 
-#: src/gui.c:1662
+#: src/gui.c:1660
 msgid "_LiVES TV (broadband)"
 msgstr "_أرواح تلفزيون (النطاق العريض)"
 
-#: src/gui.c:1672 src/multitrack.c:7387
+#: src/gui.c:1670 src/multitrack.c:7563
 msgid "_Help"
 msgstr "_مساعدة"
 
-#: src/gui.c:1684 src/multitrack.c:7407
+#: src/gui.c:1682 src/multitrack.c:7583
 msgid "_Manual (opens in browser)"
 msgstr "_مختصر (يفتح في المتصفح)"
 
-#: src/gui.c:1691 src/multitrack.c:7416
+#: src/gui.c:1689 src/multitrack.c:7592
 msgid "_Donate to the project !"
 msgstr "_التبرع لهذا المشروع !"
 
-#: src/gui.c:1695 src/multitrack.c:7420
+#: src/gui.c:1693 src/multitrack.c:7596
 msgid "_Email the author"
 msgstr "_البريد الإلكتروني لصاحب"
 
-#: src/gui.c:1699 src/multitrack.c:7424
+#: src/gui.c:1697 src/multitrack.c:7600
 msgid "Report a _bug"
 msgstr "بلغ عن عثرة"
 
-#: src/gui.c:1703 src/multitrack.c:7428
+#: src/gui.c:1701 src/multitrack.c:7604
 msgid "Suggest a _feature"
 msgstr "_اقتراح ميزة"
 
-#: src/gui.c:1707 src/multitrack.c:7432
+#: src/gui.c:1705 src/multitrack.c:7608
 msgid "Assist with _translating"
 msgstr "بادر بالترجمة"
 
-#: src/gui.c:1714 src/multitrack.c:7439
+#: src/gui.c:1712 src/multitrack.c:7615
 msgid "_Troubleshoot"
 msgstr "حل المشا_كل"
 
-#: src/gui.c:1718 src/multitrack.c:7443
+#: src/gui.c:1716 src/multitrack.c:7619
 msgid "_About"
 msgstr "_عن"
 
-#: src/gui.c:1752
+#: src/gui.c:1750
 msgid "Rewind to start (w)"
 msgstr "الترجيع لبدء (ث)"
 
-#: src/gui.c:1760 src/multitrack.c:16720
+#: src/gui.c:1758 src/multitrack.c:17010
 msgid "Play all (p)"
 msgstr "تلعب جميعع (ع)"
 
-#: src/gui.c:1768 src/gui.c:1877
+#: src/gui.c:1766 src/gui.c:1876
 msgid "Stop playback (q)"
 msgstr "وقف التشغيل (ف)"
 
-#: src/gui.c:1779
+#: src/gui.c:1777
 msgid "Play selection (y)"
 msgstr "تلعب اختيار (ذ)"
 
-#: src/gui.c:1832
+#: src/gui.c:1829
 msgid "Volume"
 msgstr "الحجم"
 
-#: src/gui.c:1854
+#: src/gui.c:1853
 msgid "Audio volume (1.00)"
 msgstr ""
 
-#: src/gui.c:1883
+#: src/gui.c:1882
 msgid "Unblank background (b)"
 msgstr ""
 
-#: src/gui.c:1929
+#: src/gui.c:1928
 msgid "Play slower (ctrl-down)"
 msgstr "تلعب أبطأ (السيطرة لأسفل)"
 
-#: src/gui.c:1935
+#: src/gui.c:1934
 msgid "Play faster (ctrl-up)"
 msgstr "اللعب بشكل أسرع (السيطرة متابعة)"
 
-#: src/gui.c:1942
+#: src/gui.c:1941
 msgid "Skip back (ctrl-left)"
 msgstr ""
 
-#: src/gui.c:1948
+#: src/gui.c:1947
 msgid "Skip forward (ctrl-right)"
 msgstr ""
 
-#: src/gui.c:1954
+#: src/gui.c:1953
 msgid "Show clip info (i)"
 msgstr ""
 
-#: src/gui.c:1960
+#: src/gui.c:1959
 msgid "Hide this toolbar"
 msgstr "إخفاء شريط الأدوات هذا"
 
-#: src/gui.c:1962
+#: src/gui.c:1961
 msgid ""
 "Press \"s\" to toggle separate play window for improved performance, \"q\" "
 "to stop."
 msgstr ""
 
 #. TRANSLATORS: please keep the translated string the same length
-#: src/gui.c:1995
+#: src/gui.c:1994
 msgid "     Video playback speed (frames per second)        "
 msgstr ""
 
-#: src/gui.c:2009
+#: src/gui.c:2008
 msgid "Vary the video speed"
 msgstr "تختلف سرعة الفيديو"
 
-#: src/gui.c:2092 src/gui.c:3218
+#: src/gui.c:2090 src/gui.c:3329
 msgid "First Frame"
 msgstr "الإطار الأول"
 
-#: src/gui.c:2193 src/gui.c:3226
+#: src/gui.c:2191 src/gui.c:3336
 msgid "Last Frame"
 msgstr "الإطار آخر"
 
-#: src/gui.c:2210
+#: src/gui.c:2208
 msgid "The first selected frame in this clip"
 msgstr "الإطار الأول الذي اختير في هذه القصاصة"
 
-#: src/gui.c:2248
+#: src/gui.c:2246
 msgid "The last selected frame in this clip"
 msgstr "الإطار الأخير المحدد في هذا الكليب"
 
-#: src/gui.c:2532
+#: src/gui.c:2546
 msgid "Starting...\n"
 msgstr "بدءا...\n"
 
-#: src/gui.c:3074
+#: src/gui.c:3181
 msgid "    Press 'q' to stop recording.  DO NOT COVER THE PLAY WINDOW !   "
 msgstr ""
 
-#: src/gui.c:3521
+#: src/gui.c:3643
 msgid "Frame number to preview"
 msgstr ""
 
-#: src/gui.c:3538
+#: src/gui.c:3660
 msgid "_Free"
 msgstr "_حر"
 
-#: src/gui.c:3539
+#: src/gui.c:3661
 msgid "Free choice of frame number"
 msgstr ""
 
-#: src/gui.c:3543
+#: src/gui.c:3666
 msgid "_Start"
 msgstr "اب_دأ"
 
-#: src/gui.c:3544
+#: src/gui.c:3667
 msgid "Frame number is linked to start frame"
 msgstr ""
 
-#: src/gui.c:3551
+#: src/gui.c:3675
 msgid "_End"
 msgstr "_نهاية"
 
-#: src/gui.c:3552
+#: src/gui.c:3676
 msgid "Frame number is linked to end frame"
 msgstr ""
 
-#: src/gui.c:3559
+#: src/gui.c:3684
 msgid "_Pointer"
 msgstr ""
 
-#: src/gui.c:3560
+#: src/gui.c:3685
 msgid "Frame number is linked to playback pointer"
 msgstr ""
 
-#: src/gui.c:3581
+#: src/gui.c:3707
 msgid "Rewind"
 msgstr "إعادة"
 
-#: src/gui.c:3592 src/dialogs.c:894 src/dialogs.c:896 src/dialogs.c:1817
-#: src/dialogs.c:1819
+#: src/gui.c:3718 src/dialogs.c:960 src/dialogs.c:962 src/dialogs.c:1873
+#: src/dialogs.c:1875
 msgid "Play all"
 msgstr ""
 
-#: src/gui.c:3605
+#: src/gui.c:3731
 msgid "Play Selection"
 msgstr ""
 
-#: src/gui.c:3619
+#: src/gui.c:3745
 msgid "Loop On/Off"
 msgstr ""
 
-#: src/gui.c:3693
+#: src/gui.c:3819
 msgid "Start _recording"
 msgstr ""
 
-#: src/gui.c:3698
+#: src/gui.c:3824
 msgid "Stop _recording"
 msgstr ""
 
-#: src/gui.c:3703
+#: src/gui.c:3829
 msgid "_Record Performance"
 msgstr ""
 
-#: src/gui.c:3851
+#: src/gui.c:3974
 msgid "Hide Play Window"
 msgstr ""
 
-#: src/gui.c:4232
+#: src/gui.c:4333
 msgid "Show Play Window"
 msgstr ""
 
-#: src/ce_thumbs.c:222
+#: src/ce_thumbs.c:242
 #, c-format
 msgid "Mapped to ctrl-%d"
 msgstr ""
 
-#: src/ce_thumbs.c:276 src/effects.c:85 src/preferences.c:3195
+#: src/ce_thumbs.c:296 src/effects.c:86 src/preferences.c:3247
 msgid "Effects"
 msgstr "المؤثرات"
 
-#: src/ce_thumbs.c:279 src/multitrack.c:5615
+#: src/ce_thumbs.c:299 src/multitrack.c:5791
 msgid "Clips"
 msgstr ""
 
-#: src/ce_thumbs.c:303
+#: src/ce_thumbs.c:323
 #, c-format
 msgid "Show / apply effects to %s\n"
 msgstr ""
 
-#: src/ce_thumbs.c:315
+#: src/ce_thumbs.c:335
 #, c-format
 msgid "Select clip for %s\n"
 msgstr ""
 
-#: src/ce_thumbs.c:515
+#: src/ce_thumbs.c:536
 msgid "_Pin"
 msgstr ""
 
-#: src/ce_thumbs.c:515
+#: src/ce_thumbs.c:537
 msgid "Pin the parameter box to the window"
 msgstr ""
 
 #. TRANSLATORS: Exabytes
-#: src/utils.c:794
+#: src/utils.c:800
 #, c-format
 msgid "%.2f EB"
 msgstr ""
 
 #. TRANSLATORS: Petabytes
-#: src/utils.c:798
+#: src/utils.c:803
 #, c-format
 msgid "%.2f PB"
 msgstr ""
 
 #. TRANSLATORS: Terabytes
-#: src/utils.c:802
+#: src/utils.c:806
 #, c-format
 msgid "%.2f TB"
 msgstr ""
 
 #. TRANSLATORS: Gigabytes
-#: src/utils.c:806
+#: src/utils.c:809
 #, c-format
 msgid "%.2f GB"
 msgstr ""
 
 #. TRANSLATORS: Megabytes
-#: src/utils.c:810
+#: src/utils.c:812
 #, c-format
 msgid "%.2f MB"
 msgstr ""
 
 #. TRANSLATORS: Kilobytes (1024 bytes)
-#: src/utils.c:814
+#: src/utils.c:815
 #, c-format
 msgid "%.2f KiB"
 msgstr ""
@@ -3628,7 +3618,7 @@
 msgid "%d bytes"
 msgstr ""
 
-#: src/utils.c:1841
+#: src/utils.c:1835
 msgid "Clearing the clipboard"
 msgstr ""
 
@@ -3640,81 +3630,81 @@
 "Switched to clip %s\n"
 msgstr ""
 
-#: src/utils.c:1880
+#: src/utils.c:1877
 msgid ""
 "\n"
 "==============================\n"
 "Switched to empty clip\n"
 msgstr ""
 
-#: src/utils.c:1917
+#: src/utils.c:1916
 msgid "(blank)"
 msgstr ""
 
-#: src/utils.c:1920
+#: src/utils.c:1919
 #, c-format
 msgid ""
 "The set name has been changed from %s to %s. Affected layouts have been "
 "updated accordingly\n"
 msgstr ""
 
-#: src/utils.c:1928
+#: src/utils.c:1927
 #, c-format
 msgid ""
 "The clip %s is missing from this set.\n"
 "It is required by the following layouts:\n"
 msgstr ""
 
-#: src/utils.c:1932
+#: src/utils.c:1931
 #, c-format
 msgid ""
 "The clip %s has been closed.\n"
 "It is required by the following layouts:\n"
 msgstr ""
 
-#: src/utils.c:1937
+#: src/utils.c:1936
 #, c-format
 msgid ""
 "Frames have been shifted in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1942
+#: src/utils.c:1941
 #, c-format
 msgid ""
 "Frames have been deleted from the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1947
+#: src/utils.c:1946
 #, c-format
 msgid ""
 "Audio has been deleted from the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1952
+#: src/utils.c:1951
 #, c-format
 msgid ""
 "Audio has been shifted in clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1957
+#: src/utils.c:1956
 #, c-format
 msgid ""
 "Audio has been altered in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1962
+#: src/utils.c:1961
 #, c-format
 msgid ""
 "Frames have been altered in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:2135
+#: src/utils.c:2134
 #, c-format
 msgid ""
 "Set %s\n"
@@ -3722,7 +3712,7 @@
 "by another copy of LiVES.\n"
 msgstr ""
 
-#: src/utils.c:2142
+#: src/utils.c:2140
 #, c-format
 msgid ""
 "\n"
@@ -3768,67 +3758,67 @@
 msgid "Removing layout %s\n"
 msgstr ""
 
-#: src/utils.c:3014
+#: src/utils.c:2996
 msgid "Video [opening...]"
 msgstr ""
 
-#: src/utils.c:3018
+#: src/utils.c:2999
 #, c-format
 msgid "Video [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:3022
+#: src/utils.c:3002
 msgid "(Undefined)"
 msgstr ""
 
-#: src/utils.c:3025
+#: src/utils.c:3004
 msgid "(No video)"
 msgstr ""
 
-#: src/utils.c:3032
+#: src/utils.c:3011
 msgid "(No audio)"
 msgstr ""
 
-#: src/utils.c:3037
+#: src/utils.c:3015
 msgid "Mono  [opening...]"
 msgstr ""
 
-#: src/utils.c:3040
+#: src/utils.c:3017
 msgid "Left Audio [opening...]"
 msgstr ""
 
-#: src/utils.c:3045
+#: src/utils.c:3021
 #, c-format
 msgid "Mono [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:3048
+#: src/utils.c:3023
 #, c-format
 msgid "Left Audio [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:3056
+#: src/utils.c:3031
 msgid "Right Audio [opening...]"
 msgstr ""
 
-#: src/utils.c:3059
+#: src/utils.c:3033
 #, c-format
 msgid "Right Audio [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:3506
+#: src/utils.c:3472
 msgid "LiVES cannot switch to mplayer whilst clips are loading."
 msgstr ""
 
-#: src/utils.c:3559
+#: src/utils.c:3525
 msgid "LiVES cannot switch to mplayer2 whilst clips are loading."
 msgstr ""
 
-#: src/utils.c:3809
+#: src/utils.c:3775
 msgid "Cleaning up clip"
 msgstr ""
 
-#: src/utils.c:3913
+#: src/utils.c:3874
 #, c-format
 msgid ""
 "\n"
@@ -3838,30 +3828,29 @@
 "Overwrite ?\n"
 msgstr ""
 
-#: src/utils.c:4305 src/utils.c:4337 src/multitrack.c:4503
+#: src/utils.c:4250 src/utils.c:4280 src/multitrack.c:4672
 #, c-format
 msgid "_Undo %s"
 msgstr "_تراجع عن %s"
 
-#: src/utils.c:4306 src/utils.c:4338 src/multitrack.c:4525
+#: src/utils.c:4251 src/utils.c:4281 src/multitrack.c:4693
 #, c-format
 msgid "_Redo %s"
 msgstr "أ_عد %s"
 
-#: src/utils.c:4363
+#: src/utils.c:4305
 msgid "-------------Selection------------"
 msgstr ""
 
-#. TRANSLATORS: - try to keep the text of the middle part the same length, by deleting "-" if necessary
-#: src/utils.c:4371
+#: src/utils.c:4313
 msgid " sec ] ----------Selection---------- [ "
 msgstr ""
 
-#: src/utils.c:4371
+#: src/utils.c:4314
 msgid " frames ] ----------"
 msgstr ""
 
-#: src/utils.c:5360
+#: src/utils.c:5302
 msgid ""
 "Your version of mplayer/ffmpeg may be broken !\n"
 "See http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2071\n"
@@ -3872,11 +3861,11 @@
 "Try running Help/Troubleshoot for more information."
 msgstr ""
 
-#: src/saveplay.c:178
+#: src/saveplay.c:179
 msgid "Examining file header"
 msgstr ""
 
-#: src/saveplay.c:315 src/saveplay.c:789
+#: src/saveplay.c:316 src/saveplay.c:779
 #, c-format
 msgid "Opening %s"
 msgstr "فتح %s"
@@ -3886,36 +3875,36 @@
 msgid "Opening %s start time %.2f sec. frames %d"
 msgstr ""
 
-#: src/saveplay.c:326 src/saveplay.c:4001
+#: src/saveplay.c:326 src/saveplay.c:3927
 msgid " without sound"
 msgstr ""
 
-#: src/saveplay.c:396
+#: src/saveplay.c:395
 #, c-format
 msgid "Opening audio for %s"
 msgstr ""
 
-#: src/saveplay.c:557
+#: src/saveplay.c:554
 #, c-format
 msgid "Auto trimming %.2f seconds of audio at start..."
 msgstr ""
 
-#: src/saveplay.c:567
+#: src/saveplay.c:562
 #, c-format
 msgid "Auto trimming %.2f seconds of audio at end..."
 msgstr ""
 
-#: src/saveplay.c:584
+#: src/saveplay.c:577
 #, c-format
 msgid "Auto padding with %.2f seconds of silence at start..."
 msgstr ""
 
-#: src/saveplay.c:599
+#: src/saveplay.c:590
 #, c-format
 msgid "Auto padding with %.2f seconds of silence at end..."
 msgstr ""
 
-#: src/saveplay.c:671
+#: src/saveplay.c:661
 #, c-format
 msgid ""
 "\n"
@@ -3927,11 +3916,11 @@
 "Are you sure you wish to continue ?"
 msgstr ""
 
-#: src/saveplay.c:685
+#: src/saveplay.c:676
 msgid " - please be patient."
 msgstr ""
 
-#: src/saveplay.c:938
+#: src/saveplay.c:926
 msgid ""
 "\n"
 "\n"
@@ -3939,14 +3928,14 @@
 "Please check the terminal window for more details.\n"
 msgstr ""
 
-#: src/saveplay.c:940
+#: src/saveplay.c:928
 msgid ""
 "\n"
 "\n"
 "You may need to install mplayer to open this file.\n"
 msgstr ""
 
-#: src/saveplay.c:948
+#: src/saveplay.c:934
 msgid ""
 "\n"
 "\n"
@@ -3954,29 +3943,29 @@
 "Tools|Preferences|Decoding\n"
 msgstr ""
 
-#: src/saveplay.c:1014
+#: src/saveplay.c:995
 msgid "Adding image..."
 msgstr ""
 
-#: src/saveplay.c:1108
+#: src/saveplay.c:1089
 #, c-format
 msgid "Subtitles were saved as %s\n"
 msgstr ""
 
-#: src/saveplay.c:1192
+#: src/saveplay.c:1171
 #, c-format
 msgid "LiVES: Save Frame %d as..."
 msgstr ""
 
-#: src/saveplay.c:1195
+#: src/saveplay.c:1174
 msgid "LiVES: Save Frame as..."
 msgstr ""
 
-#: src/saveplay.c:1322
+#: src/saveplay.c:1303
 msgid "LiVES: Save Clip as..."
 msgstr ""
 
-#: src/saveplay.c:1390
+#: src/saveplay.c:1369
 msgid ""
 "Saving your video could lead to a loss of quality !\n"
 "You are strongly advised to 'Save As' to a new file.\n"
@@ -3984,67 +3973,67 @@
 "Do you still wish to continue ?"
 msgstr ""
 
-#: src/saveplay.c:1517 src/saveplay.c:1683 src/saveplay.c:1762
-#: src/saveplay.c:4014
+#: src/saveplay.c:1494 src/saveplay.c:1659 src/saveplay.c:1738
+#: src/saveplay.c:3940
 msgid "Pulling frames from clip"
 msgstr ""
 
-#: src/saveplay.c:1588 src/saveplay.c:1727
+#: src/saveplay.c:1565 src/saveplay.c:1703
 msgid "Linking selection"
 msgstr ""
 
-#: src/saveplay.c:1779
+#: src/saveplay.c:1755
 msgid " (with no sound)\n"
 msgstr ""
 
-#: src/saveplay.c:1786
+#: src/saveplay.c:1761
 #, c-format
 msgid "Saving frames %d to %d%s as \"%s\" : encoder = %s : format = %s..."
 msgstr ""
 
-#: src/saveplay.c:1790
+#: src/saveplay.c:1765
 #, c-format
 msgid "Saving frames 1 to %d%s as \"%s\" : encoder %s : format = %s..."
 msgstr ""
 
-#: src/saveplay.c:1909
+#: src/saveplay.c:1890
 msgid "Saving [can take a long time]"
 msgstr ""
 
-#: src/saveplay.c:2057
+#: src/saveplay.c:2044
 msgid ""
 "\n"
 "\n"
 "Encoder error - output file was not created !\n"
 msgstr ""
 
-#: src/saveplay.c:2094
+#: src/saveplay.c:2081
 msgid "Clearing letterbox"
 msgstr ""
 
-#: src/saveplay.c:2183
+#: src/saveplay.c:2168
 #, c-format
 msgid "File size was %s\n"
 msgstr ""
 
-#: src/saveplay.c:2284
+#: src/saveplay.c:2265
 msgid "recording aborted by preview.\n"
 msgstr ""
 
-#: src/saveplay.c:2288
+#: src/saveplay.c:2268
 msgid "recording aborted by clipboard playback.\n"
 msgstr ""
 
-#: src/saveplay.c:2291
+#: src/saveplay.c:2270
 msgid "Recording performance..."
 msgstr ""
 
-#: src/saveplay.c:3293
+#: src/saveplay.c:3251
 #, c-format
 msgid "Average FPS was %.4f\n"
 msgstr ""
 
-#: src/saveplay.c:3299
+#: src/saveplay.c:3256
 msgid ""
 "\n"
 "\n"
@@ -4053,16 +4042,21 @@
 "and resize all frames to the current size.\n"
 msgstr ""
 
-#: src/saveplay.c:3479
+#: src/saveplay.c:3429
 msgid "Unknown"
 msgstr "غير معروف"
 
-#: src/saveplay.c:3588 src/saveplay.c:4585
+#: src/saveplay.c:3538 src/saveplay.c:4502
 #, c-format
 msgid "Untitled%d"
 msgstr "دون عنوان%d"
 
-#: src/saveplay.c:3633
+#: src/saveplay.c:3567
+#, c-format
+msgid "%d frames are enough !\n"
+msgstr ""
+
+#: src/saveplay.c:3579
 #, c-format
 msgid ""
 "\n"
@@ -4070,7 +4064,7 @@
 "Bad things may happen with this clip.\n"
 msgstr ""
 
-#: src/saveplay.c:3723
+#: src/saveplay.c:3667
 #, c-format
 msgid ""
 "\n"
@@ -4078,73 +4072,73 @@
 "Default can be set in Tools | Preferences | Misc.\n"
 msgstr ""
 
-#: src/saveplay.c:3735
+#: src/saveplay.c:3677
 #, c-format
 msgid "Playback speed was adjusted to %.3f frames per second to fit audio.\n"
 msgstr ""
 
-#: src/saveplay.c:3754
+#: src/saveplay.c:3694
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d *bpp=Greyscale* fps=%.3f\n"
 "Audio:"
 msgstr ""
 
-#: src/saveplay.c:3758 src/saveplay.c:4762
+#: src/saveplay.c:3698 src/saveplay.c:4671
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d bpp=%d fps=%.3f\n"
 "Audio:"
 msgstr ""
 
-#: src/saveplay.c:3762 src/saveplay.c:4766
+#: src/saveplay.c:3703 src/saveplay.c:4676
 #, c-format
 msgid "%s none\n"
 msgstr ""
 
-#: src/saveplay.c:3774
+#: src/saveplay.c:3714
 #, c-format
 msgid " - Author: %s\n"
 msgstr ""
 
-#: src/saveplay.c:3779
+#: src/saveplay.c:3717
 #, c-format
 msgid " - Title: %s\n"
 msgstr ""
 
-#: src/saveplay.c:3784
+#: src/saveplay.c:3720
 #, c-format
 msgid " - Comment: %s\n"
 msgstr ""
 
-#: src/saveplay.c:3897
+#: src/saveplay.c:3829
 #, c-format
 msgid "Saving frame %d as %s..."
 msgstr ""
 
-#: src/saveplay.c:3996
+#: src/saveplay.c:3924
 #, c-format
 msgid "Backing up %s to %s"
 msgstr ""
 
-#: src/saveplay.c:4049
+#: src/saveplay.c:3975
 msgid "Backing up"
 msgstr ""
 
-#: src/saveplay.c:4083
+#: src/saveplay.c:4009
 msgid "performance data was backed up..."
 msgstr ""
 
-#: src/saveplay.c:4661
+#: src/saveplay.c:4574
 #, c-format
 msgid "Restoring %s..."
 msgstr ""
 
-#: src/saveplay.c:4692
+#: src/saveplay.c:4603
 msgid "Restoring"
 msgstr "يسترجع"
 
-#: src/saveplay.c:4714
+#: src/saveplay.c:4625
 #, c-format
 msgid ""
 "\n"
@@ -4154,22 +4148,22 @@
 msgstr ""
 
 #. TRANSLATORS: rec(ord) %.2f M(ega)B(ytes)
-#: src/saveplay.c:5207
+#: src/saveplay.c:5118
 #, c-format
 msgid "rec %.2f MB"
 msgstr ""
 
-#: src/saveplay.c:5213
+#: src/saveplay.c:5123
 #, c-format
 msgid "!rec %.2f MB"
 msgstr ""
 
 #. TRANSLATORS: rec(ord) ?? M(ega)B(ytes)
-#: src/saveplay.c:5216
+#: src/saveplay.c:5126
 msgid "rec ?? MB"
 msgstr ""
 
-#: src/saveplay.c:5241
+#: src/saveplay.c:5151
 #, c-format
 msgid ""
 "\n"
@@ -4177,54 +4171,72 @@
 "Record stop level can be set in Preferences.\n"
 msgstr ""
 
-#: src/saveplay.c:5535
+#: src/saveplay.c:5447
 msgid ""
 "\n"
 "Files from a previous run of LiVES were found.\n"
 "Do you want to attempt to recover them ?\n"
 msgstr ""
 
-#: src/saveplay.c:5557
+#: src/saveplay.c:5469
 msgid "Recovering files"
 msgstr ""
 
-#: src/saveplay.c:5560
+#: src/saveplay.c:5472
 msgid "Recovering files..."
 msgstr ""
 
-#: src/dialogs.c:72
+#: src/dialogs.c:71
 msgid "Show affected _layouts"
 msgstr ""
 
-#: src/dialogs.c:128
+#: src/dialogs.c:113
+msgid ""
+"Do _not show this warning any more\n"
+"(can be turned back on from Preferences/Warnings)"
+msgstr ""
+
+#: src/dialogs.c:127
 msgid "_Recover disk space"
 msgstr ""
 
-#: src/dialogs.c:143
+#: src/dialogs.c:142
 msgid " _Advanced Settings >>"
 msgstr ""
 
-#: src/dialogs.c:184
+#: src/dialogs.c:183 src/dialogs.c:221
 msgid "LiVES: - Warning !"
 msgstr ""
 
 #: src/dialogs.c:194
-msgid "LiVES: - Question"
+msgid "LiVES: - Error !"
 msgstr ""
 
 #: src/dialogs.c:204
+msgid "LiVES: - Information"
+msgstr ""
+
+#: src/dialogs.c:230
+msgid "LiVES: - Question"
+msgstr ""
+
+#: src/dialogs.c:239
 msgid "LiVES: - File Error"
 msgstr ""
 
-#: src/dialogs.c:208
+#: src/dialogs.c:241
 msgid "_Abort"
 msgstr ""
 
-#: src/dialogs.c:213
+#: src/dialogs.c:246
 msgid "_Retry"
 msgstr ""
 
-#: src/dialogs.c:597
+#: src/dialogs.c:306
+msgid "Show _Details"
+msgstr "وتظهر _تفاصيل"
+
+#: src/dialogs.c:657
 #, c-format
 msgid ""
 "FREE SPACE IN THE PARTITION CONTAINING\n"
@@ -4235,7 +4247,7 @@
 "(Disk warning levels can be configured in Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:615
+#: src/dialogs.c:676
 #, c-format
 msgid ""
 "Free space in the partition containing\n"
@@ -4247,11 +4259,11 @@
 "Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:627
+#: src/dialogs.c:688
 msgid "Audio players cannot be switched during playback."
 msgstr ""
 
-#: src/dialogs.c:632
+#: src/dialogs.c:694
 msgid ""
 "\n"
 "\n"
@@ -4259,46 +4271,46 @@
 "Please try closing some other applications first.\n"
 msgstr ""
 
-#: src/dialogs.c:752
+#: src/dialogs.c:820
 msgid "Processing has been paused."
 msgstr ""
 
-#: src/dialogs.c:937
+#: src/dialogs.c:1002
 #, c-format
 msgid ""
 "\n"
 "%s%d%% done. Time remaining: %u sec%s\n"
 msgstr ""
 
-#: src/dialogs.c:1335
+#: src/dialogs.c:1391
 #, c-format
 msgid ""
 "\n"
 "%d/%d frames opened. Time remaining %u sec.\n"
 msgstr ""
 
-#: src/dialogs.c:1337
+#: src/dialogs.c:1393
 #, c-format
 msgid ""
 "\n"
 "%d/%d frames opened.\n"
 msgstr ""
 
-#: src/dialogs.c:1341
+#: src/dialogs.c:1396
 #, c-format
 msgid ""
 "\n"
 "%d frames opened.\n"
 msgstr ""
 
-#: src/dialogs.c:1940
+#: src/dialogs.c:1993
 #, c-format
 msgid ""
 "\n"
 "Time remaining: %d sec"
 msgstr ""
 
-#: src/dialogs.c:1988
+#: src/dialogs.c:2040
 #, c-format
 msgid ""
 "\n"
@@ -4306,7 +4318,7 @@
 "Please close a file and then try again."
 msgstr ""
 
-#: src/dialogs.c:1994
+#: src/dialogs.c:2047
 #, c-format
 msgid ""
 "LiVES was unable to write to its temporary directory.\n"
@@ -4318,7 +4330,7 @@
 "Please make sure you can write to this directory."
 msgstr ""
 
-#: src/dialogs.c:2005
+#: src/dialogs.c:2059
 #, fuzzy
 msgid ""
 "\n"
@@ -4329,20 +4341,20 @@
 "يحتاج برنامج لايفز اى من أدوات 'mplayer' أو 'sox' لآداء مهامه . يرجى تنصيب "
 "أحد هذه الأدوات ، ثم إعادة المحاولة\n"
 
-#: src/dialogs.c:2010
+#: src/dialogs.c:2064
 msgid ""
 "Audio was not loaded; please install mplayer or mplayer2 if you expected "
 "audio for this clip.\n"
 msgstr ""
 
-#: src/dialogs.c:2014
+#: src/dialogs.c:2069
 msgid ""
 "Audio resampling is required for this format.\n"
 "Please install 'sox'\n"
 "Or switch to another encoder format in Tools | Preferences | Encoding\n"
 msgstr ""
 
-#: src/dialogs.c:2019
+#: src/dialogs.c:2075
 msgid ""
 "\n"
 "\n"
@@ -4350,19 +4362,19 @@
 "Please set the audio codec in Tools|Preferences|Encoding\n"
 msgstr ""
 
-#: src/dialogs.c:2024
+#: src/dialogs.c:2080
 msgid ""
 "This layout includes generated frames.\n"
 "It cannot be saved, you must render it to a clip first.\n"
 msgstr ""
 
-#: src/dialogs.c:2029
+#: src/dialogs.c:2085
 msgid ""
 "This layout includes generated or recorded audio.\n"
 "It cannot be saved, you must render it to a clip first.\n"
 msgstr ""
 
-#: src/dialogs.c:2039 src/dialogs.c:2137
+#: src/dialogs.c:2095 src/dialogs.c:2189
 #, c-format
 msgid ""
 "\n"
@@ -4370,83 +4382,83 @@
 "Due to restrictions in the %s format\n"
 msgstr ""
 
-#: src/dialogs.c:2059
+#: src/dialogs.c:2115
 msgid ""
 "LiVES recommends the following settings:\n"
 "\n"
 msgstr ""
 
-#: src/dialogs.c:2065 src/dialogs.c:2174 src/resample.c:850
+#: src/dialogs.c:2121 src/dialogs.c:2225 src/resample.c:839
 msgid ", signed"
 msgstr ""
 
-#: src/dialogs.c:2066 src/dialogs.c:2175 src/resample.c:853
+#: src/dialogs.c:2122 src/dialogs.c:2226 src/resample.c:841
 msgid ", unsigned"
 msgstr ""
 
-#: src/dialogs.c:2070 src/dialogs.c:2179 src/resample.c:858
+#: src/dialogs.c:2126 src/dialogs.c:2230 src/resample.c:846
 msgid ", little-endian"
 msgstr ""
 
-#: src/dialogs.c:2071 src/dialogs.c:2180 src/resample.c:861
+#: src/dialogs.c:2127 src/dialogs.c:2231 src/resample.c:848
 msgid ", big-endian"
 msgstr ""
 
-#: src/dialogs.c:2077
+#: src/dialogs.c:2132
 #, c-format
 msgid "Use an audio rate of %d Hz%s%s\n"
 msgstr ""
 
-#: src/dialogs.c:2085
+#: src/dialogs.c:2140
 #, c-format
 msgid "Set video rate to %.3f frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:2089
+#: src/dialogs.c:2143
 #, c-format
 msgid "Set video rate to %d:%d frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:2094 src/dialogs.c:2209
+#: src/dialogs.c:2148 src/dialogs.c:2258
 #, c-format
 msgid "Set video size to %d x %d pixels\n"
 msgstr ""
 
-#: src/dialogs.c:2102 src/dialogs.c:2208
+#: src/dialogs.c:2156 src/dialogs.c:2257
 msgid ""
 "\n"
 "You may wish to:\n"
 msgstr ""
 
-#: src/dialogs.c:2105 src/dialogs.c:2200
+#: src/dialogs.c:2159 src/dialogs.c:2249
 #, c-format
 msgid "resize video to %d x %d pixels\n"
 msgstr ""
 
-#: src/dialogs.c:2110
+#: src/dialogs.c:2163
 msgid "disable audio, since the target encoder cannot encode audio\n"
 msgstr ""
 
-#: src/dialogs.c:2170
+#: src/dialogs.c:2221
 msgid "LiVES must:\n"
 msgstr ""
 
-#: src/dialogs.c:2185
+#: src/dialogs.c:2235
 #, c-format
 msgid "resample audio to %d Hz%s%s\n"
 msgstr ""
 
-#: src/dialogs.c:2192
+#: src/dialogs.c:2242
 #, c-format
 msgid "resample video to %.3f frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:2196
+#: src/dialogs.c:2245
 #, c-format
 msgid "resample video to %d:%d frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:2215
+#: src/dialogs.c:2263
 msgid ""
 "\n"
 "You will be able to undo these changes afterwards.\n"
@@ -4455,14 +4467,14 @@
 "\n"
 msgstr ""
 
-#: src/dialogs.c:2218
+#: src/dialogs.c:2265
 msgid ""
 "\n"
 "Changes applied to the selection will not be permanent.\n"
 "\n"
 msgstr ""
 
-#: src/dialogs.c:2237
+#: src/dialogs.c:2285
 msgid ""
 "\n"
 "\n"
@@ -4471,7 +4483,7 @@
 "Try recording for just a selection of the file."
 msgstr ""
 
-#: src/dialogs.c:2244
+#: src/dialogs.c:2293
 msgid ""
 "The playback speed (fps), or the audio rate\n"
 " of the clipboard does not match\n"
@@ -4482,7 +4494,7 @@
 "Please press Cancel to abort the insert, or OK to continue."
 msgstr ""
 
-#: src/dialogs.c:2253
+#: src/dialogs.c:2304
 #, c-format
 msgid ""
 "When opening a yuvmpeg stream, you should first create a fifo file in:\n"
@@ -4495,11 +4507,11 @@
 "click Cancel."
 msgstr ""
 
-#: src/dialogs.c:2305
+#: src/dialogs.c:2356
 msgid "Show Keys"
 msgstr ""
 
-#: src/dialogs.c:2306
+#: src/dialogs.c:2358
 msgid ""
 "You can use the following keys during playback to control LiVES:-\n"
 "\n"
@@ -4541,11 +4553,11 @@
 "g                             ping pong loops\n"
 msgstr ""
 
-#: src/dialogs.c:2313
+#: src/dialogs.c:2365
 msgid "Multitrack Keys"
 msgstr ""
 
-#: src/dialogs.c:2314
+#: src/dialogs.c:2367
 msgid ""
 "You can use the following keys to control the multitrack window:-\n"
 "\n"
@@ -4567,18 +4579,18 @@
 "For other keys, see the menus.\n"
 msgstr ""
 
-#: src/dialogs.c:2322
+#: src/dialogs.c:2375
 msgid "Message History"
 msgstr ""
 
-#: src/dialogs.c:2335
+#: src/dialogs.c:2388
 #, c-format
 msgid ""
 "After upgrading/installing, you may need to adjust the <prefix_dir> setting "
 "in your %s file"
 msgstr ""
 
-#: src/dialogs.c:2344
+#: src/dialogs.c:2399
 #, c-format
 msgid ""
 "\n"
@@ -4589,25 +4601,25 @@
 "or change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/dialogs.c:2352
+#: src/dialogs.c:2408
 msgid ""
 "Sorry, unknown audio type.\n"
 "\n"
 " (Filenames must end in .mp3, .ogg, .wav, .mod, .xm or .it)"
 msgstr ""
 
-#: src/dialogs.c:2353
+#: src/dialogs.c:2409
 msgid "failed (unknown type)\n"
 msgstr ""
 
-#: src/dialogs.c:2358
+#: src/dialogs.c:2415
 msgid ""
 "\n"
 "Do you wish to remove the layout files associated with this set ?\n"
 "(They will not be usable without the set).\n"
 msgstr ""
 
-#: src/dialogs.c:2363
+#: src/dialogs.c:2421
 #, c-format
 msgid ""
 "\n"
@@ -4616,7 +4628,7 @@
 "Click Cancel to pick a new name.\n"
 msgstr ""
 
-#: src/dialogs.c:2370
+#: src/dialogs.c:2429
 msgid ""
 "\n"
 "Frames from this clip are used in some multitrack layouts.\n"
@@ -4624,7 +4636,7 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2374
+#: src/dialogs.c:2433
 msgid ""
 "\n"
 "Audio from this clip is used in some multitrack layouts.\n"
@@ -4632,7 +4644,7 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2378
+#: src/dialogs.c:2438
 #, c-format
 msgid ""
 "\n"
@@ -4643,7 +4655,7 @@
 "Otherwise click Cancel to skip loading this file.\n"
 msgstr ""
 
-#: src/dialogs.c:2385
+#: src/dialogs.c:2446
 #, c-format
 msgid ""
 "\n"
@@ -4653,7 +4665,7 @@
 "The clip could not be loaded.\n"
 msgstr ""
 
-#: src/dialogs.c:2392
+#: src/dialogs.c:2455
 msgid ""
 "\n"
 "Dear user, the jack developers decided to remove the -Z option from jackd.\n"
@@ -4661,7 +4673,7 @@
 "Alternately, select a different audio player in Preferences.\n"
 msgstr ""
 
-#: src/dialogs.c:2396
+#: src/dialogs.c:2460
 msgid ""
 "\n"
 "Unable to start up jack. Please ensure that alsa is set up correctly on your "
@@ -4670,13 +4682,13 @@
 "Automatic jack startup will be disabled now.\n"
 msgstr ""
 
-#: src/dialogs.c:2402
+#: src/dialogs.c:2466
 msgid ""
 "\n"
 "Unable to connect to jack server. Please start jack before starting LiVES\n"
 msgstr ""
 
-#: src/dialogs.c:2411
+#: src/dialogs.c:2475
 #, c-format
 msgid ""
 "\n"
@@ -4687,13 +4699,13 @@
 "%s\n"
 msgstr ""
 
-#: src/dialogs.c:2418
+#: src/dialogs.c:2482
 msgid ""
 "\n"
 "Alternately, you can restart LiVES and select another audio player.\n"
 msgstr ""
 
-#: src/dialogs.c:2423
+#: src/dialogs.c:2488
 #, c-format
 msgid ""
 "\n"
@@ -4703,7 +4715,7 @@
 "It is recommended to increase it to at least %d MB"
 msgstr ""
 
-#: src/dialogs.c:2429
+#: src/dialogs.c:2496
 #, c-format
 msgid ""
 "\n"
@@ -4712,7 +4724,7 @@
 "Do you wish to delete them ?\n"
 msgstr ""
 
-#: src/dialogs.c:2436
+#: src/dialogs.c:2504
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for multitrack undo.\n"
@@ -4720,7 +4732,7 @@
 "using Preferences/Multitrack/Undo Memory\n"
 msgstr ""
 
-#: src/dialogs.c:2440
+#: src/dialogs.c:2508
 msgid ""
 "\n"
 "Out of memory for undo.\n"
@@ -4728,63 +4740,63 @@
 "using Preferences/Multitrack/Undo Memory\n"
 msgstr ""
 
-#: src/dialogs.c:2444
+#: src/dialogs.c:2512
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for the multitrack undo buffer.\n"
 msgstr ""
 
-#: src/dialogs.c:2446
+#: src/dialogs.c:2514
 msgid "or enter a smaller value.\n"
 msgstr ""
 
-#: src/dialogs.c:2448
+#: src/dialogs.c:2516
 msgid "Try again from the clip editor, try closing some other applications\n"
 msgstr ""
 
-#: src/dialogs.c:2449
+#: src/dialogs.c:2517
 msgid "Try closing some other applications\n"
 msgstr ""
 
-#: src/dialogs.c:2460
+#: src/dialogs.c:2529
 msgid ""
 "Multitrack is set to 0 audio channels, but this layout has audio.\n"
 "You should adjust the audio settings from the Tools menu.\n"
 msgstr ""
 
-#: src/dialogs.c:2464
+#: src/dialogs.c:2534
 msgid ""
 "The current layout has audio, so audio channels may not be set to zero.\n"
 msgstr ""
 
-#: src/dialogs.c:2468
+#: src/dialogs.c:2539
 msgid ""
 "Multitrack audio preview is only available with the\n"
 "\"jack\" or \"pulse audio\" audio player.\n"
 "You can set this in Tools|Preferences|Playback."
 msgstr ""
 
-#: src/dialogs.c:2472
+#: src/dialogs.c:2545
 msgid ""
 "Errors were detected in the layout (which may be due to transferring from "
 "another system, or from an older version of LiVES).\n"
 "Should I try to repair the disk copy of the layout ?\n"
 msgstr ""
 
-#: src/dialogs.c:2476
+#: src/dialogs.c:2549
 msgid ""
 "LiVES was unable to load the layout.\n"
 "Sorry.\n"
 msgstr ""
 
-#: src/dialogs.c:2482
+#: src/dialogs.c:2555
 msgid ""
 "\n"
 "\n"
 "Audio rate must be greater than 0.\n"
 msgstr ""
 
-#: src/dialogs.c:2486
+#: src/dialogs.c:2559
 msgid ""
 "\n"
 "Event list will be very large\n"
@@ -4792,14 +4804,14 @@
 "Are you sure you wish to view it ?\n"
 msgstr ""
 
-#: src/dialogs.c:2491
+#: src/dialogs.c:2564
 msgid ""
 "\n"
 "\n"
 "You must install 'dvgrab' to use this function.\n"
 msgstr ""
 
-#: src/dialogs.c:2496
+#: src/dialogs.c:2570
 msgid ""
 "\n"
 "\n"
@@ -4808,25 +4820,25 @@
 "You may need to select one of these in Tools/Preferences/Playback.\n"
 msgstr ""
 
-#: src/dialogs.c:2500
+#: src/dialogs.c:2574
 msgid "Video playback plugin failed to initialise palette !\n"
 msgstr ""
 
-#: src/dialogs.c:2504
+#: src/dialogs.c:2579
 msgid "Decoder plugin failed to initialise palette !\n"
 msgstr ""
 
-#: src/dialogs.c:2509
+#: src/dialogs.c:2584
 msgid "Unable to set framerate of video plugin\n"
 msgstr ""
 
-#: src/dialogs.c:2514
+#: src/dialogs.c:2590
 msgid ""
 "After a crash, it is advisable to clean up the disk with\n"
 "File|Clean up disk space\n"
 msgstr ""
 
-#: src/dialogs.c:2526
+#: src/dialogs.c:2604
 #, c-format
 msgid ""
 "Stream frame size is too large for your network buffers.\n"
@@ -4835,33 +4847,33 @@
 "echo %d > /proc/sys/net/core/rmem_max\n"
 msgstr ""
 
-#: src/dialogs.c:2714
+#: src/dialogs.c:2800
 msgid "cancelled.\n"
 msgstr ""
 
-#: src/dialogs.c:2721
+#: src/dialogs.c:2805
 msgid "failed.\n"
 msgstr ""
 
-#: src/dialogs.c:2728
+#: src/dialogs.c:2810
 msgid "done.\n"
 msgstr ""
 
-#: src/dialogs.c:2732
+#: src/dialogs.c:2814
 msgid "error in file. Failed.\n"
 msgstr ""
 
-#: src/dialogs.c:2766 src/dialogs.c:2815 src/dialogs.c:2839
+#: src/dialogs.c:2848 src/dialogs.c:2897 src/dialogs.c:2921
 #, c-format
 msgid "Additional info: %s\n"
 msgstr ""
 
-#: src/dialogs.c:2769
+#: src/dialogs.c:2851
 #, c-format
 msgid "The error value was %d%s\n"
 msgstr ""
 
-#: src/dialogs.c:2772
+#: src/dialogs.c:2854
 #, c-format
 msgid ""
 "\n"
@@ -4871,7 +4883,7 @@
 "%s%s%s"
 msgstr ""
 
-#: src/dialogs.c:2818
+#: src/dialogs.c:2900
 #, c-format
 msgid ""
 "\n"
@@ -4881,7 +4893,7 @@
 "%s"
 msgstr ""
 
-#: src/dialogs.c:2842
+#: src/dialogs.c:2924
 #, c-format
 msgid ""
 "\n"
@@ -4891,7 +4903,7 @@
 "%s"
 msgstr ""
 
-#: src/dialogs.c:2886
+#: src/dialogs.c:2968
 #, c-format
 msgid ""
 "\n"
@@ -4900,7 +4912,7 @@
 "Please check for possible error causes.\n"
 msgstr ""
 
-#: src/dialogs.c:2890
+#: src/dialogs.c:2971
 #, c-format
 msgid ""
 "\n"
@@ -4910,7 +4922,7 @@
 "%s.\n"
 msgstr ""
 
-#: src/dialogs.c:2921
+#: src/dialogs.c:3002
 #, c-format
 msgid ""
 "\n"
@@ -4919,7 +4931,7 @@
 "Please check for possible error causes.\n"
 msgstr ""
 
-#: src/dialogs.c:2925
+#: src/dialogs.c:3005
 #, c-format
 msgid ""
 "\n"
@@ -4929,12 +4941,12 @@
 "%s.\n"
 msgstr ""
 
-#: src/dialogs.c:2993
+#: src/dialogs.c:3073
 #, c-format
 msgid "Value for \"%s\" could not be read."
 msgstr ""
 
-#: src/dialogs.c:3011
+#: src/dialogs.c:3091
 #, c-format
 msgid ""
 "\n"
@@ -4943,7 +4955,7 @@
 "Please check your system for errors.\n"
 msgstr ""
 
-#: src/dialogs.c:3020
+#: src/dialogs.c:3100
 #, c-format
 msgid ""
 "\n"
@@ -4952,7 +4964,7 @@
 "Please check the file permissions and try again."
 msgstr ""
 
-#: src/dialogs.c:3027
+#: src/dialogs.c:3109
 #, c-format
 msgid ""
 "\n"
@@ -4961,7 +4973,7 @@
 "Please check the directory permissions and try again."
 msgstr ""
 
-#: src/dialogs.c:3034
+#: src/dialogs.c:3116
 #, c-format
 msgid ""
 "\n"
@@ -4969,14 +4981,14 @@
 "%s\n"
 msgstr ""
 
-#: src/dialogs.c:3041
+#: src/dialogs.c:3123
 msgid ""
 "\n"
 "Abort and exit immediately from LiVES\n"
 "Are you sure ?\n"
 msgstr ""
 
-#: src/dialogs.c:3047
+#: src/dialogs.c:3129
 #, c-format
 msgid ""
 "\n"
@@ -4984,13 +4996,13 @@
 "Please select another encoder from the list.\n"
 msgstr ""
 
-#: src/dialogs.c:3056
+#: src/dialogs.c:3139
 msgid ""
 "\n"
 "This card is already in use and cannot be opened multiple times.\n"
 msgstr ""
 
-#: src/dialogs.c:3061
+#: src/dialogs.c:3145
 #, c-format
 msgid ""
 "\n"
@@ -5000,27 +5012,27 @@
 "- Check if the device actually exists.\n"
 msgstr ""
 
-#: src/dialogs.c:3068
+#: src/dialogs.c:3153
 msgid ""
 "\n"
 "This file already has subtitles loaded.\n"
 "Do you wish to overwrite the existing subtitles ?\n"
 msgstr ""
 
-#: src/dialogs.c:3072
+#: src/dialogs.c:3157
 msgid ""
 "\n"
 "LiVES currently only supports subtitles of type .srt and .sub.\n"
 msgstr ""
 
-#: src/dialogs.c:3076
+#: src/dialogs.c:3161
 msgid ""
 "\n"
 "Erase all subtitles from this clip.\n"
 "Are you sure ?\n"
 msgstr ""
 
-#: src/dialogs.c:3082
+#: src/dialogs.c:3168
 #, c-format
 msgid ""
 "\n"
@@ -5029,14 +5041,14 @@
 "or OK to continue and save as type \"%s\"\n"
 msgstr ""
 
-#: src/dialogs.c:3089
+#: src/dialogs.c:3176
 msgid ""
 "\n"
 "Do you wish to move the current clip sets to the new directory ?\n"
 "(If unsure, click Yes)\n"
 msgstr ""
 
-#: src/dialogs.c:3093
+#: src/dialogs.c:3181
 #, c-format
 msgid ""
 "\n"
@@ -5047,19 +5059,19 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:3099
+#: src/dialogs.c:3188
 msgid ""
 "\n"
 "No video input devices could be found.\n"
 msgstr ""
 
-#: src/dialogs.c:3103
+#: src/dialogs.c:3192
 msgid ""
 "\n"
 "All video input devices are already in use.\n"
 msgstr ""
 
-#: src/dialogs.c:3107
+#: src/dialogs.c:3196
 msgid ""
 "\n"
 "\n"
@@ -5067,15 +5079,14 @@
 "DO NOT SHUT DOWN OR CLOSE LIVES !\n"
 msgstr ""
 
-#: src/dialogs.c:3127
+#: src/dialogs.c:3203
 #, c-format
 msgid ""
 "No clips were recovered for set (%s).\n"
 "Please check the spelling of the set name and try again.\n"
 msgstr ""
 
-#. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:3136
+#: src/dialogs.c:3214
 #, c-format
 msgid ""
 "\n"
@@ -5087,7 +5098,7 @@
 msgstr ""
 
 #. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:3144
+#: src/dialogs.c:3222
 #, c-format
 msgid ""
 "\n"
@@ -5096,34 +5107,34 @@
 "\n"
 msgstr ""
 
-#: src/dialogs.c:3150
+#: src/dialogs.c:3228
 msgid ""
 "\n"
 "You must have autolives.pl installed and in your path to use this toy.\n"
 "Consult your package distributor.\n"
 msgstr ""
 
-#: src/dialogs.c:3154
+#: src/dialogs.c:3232
 msgid ""
 "\n"
 "You must have a minimum of one clip loaded to use this toy.\n"
 msgstr ""
 
-#: src/dialogs.c:3158
+#: src/dialogs.c:3236
 msgid ""
 "\n"
 "LiVES lost its connection to jack and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:3162
+#: src/dialogs.c:3240
 msgid ""
 "\n"
 "LiVES lost its connection to pulseaudio and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:3175
+#: src/dialogs.c:3254
 #, c-format
 msgid ""
 "\n"
@@ -5132,544 +5143,544 @@
 "Do you wish to allow this (for this session only) ?\n"
 msgstr ""
 
-#: src/effects.c:60
+#: src/effects.c:61
 msgid "generator"
 msgstr "مولد"
 
-#: src/effects.c:61
+#: src/effects.c:62
 msgid "Generators"
 msgstr ""
 
-#: src/effects.c:63
+#: src/effects.c:64
 msgid "audio generator"
 msgstr ""
 
-#: src/effects.c:64
+#: src/effects.c:65
 msgid "Audio Generators"
 msgstr ""
 
-#: src/effects.c:66
+#: src/effects.c:67
 msgid "audio/video generator"
 msgstr ""
 
-#: src/effects.c:67
+#: src/effects.c:68
 msgid "Audio/Video Generators"
 msgstr ""
 
-#: src/effects.c:69
+#: src/effects.c:70
 msgid "data generator"
 msgstr ""
 
-#: src/effects.c:70
+#: src/effects.c:71
 msgid "Data Generators"
 msgstr ""
 
-#: src/effects.c:72
+#: src/effects.c:73
 msgid "data visualiser"
 msgstr ""
 
-#: src/effects.c:73
+#: src/effects.c:74
 msgid "Data Visualisers"
 msgstr ""
 
-#: src/effects.c:75
+#: src/effects.c:76
 msgid "data processor"
 msgstr ""
 
-#: src/effects.c:76
+#: src/effects.c:77
 msgid "Data Processors"
 msgstr ""
 
-#: src/effects.c:78
+#: src/effects.c:79
 msgid "data source"
 msgstr ""
 
-#: src/effects.c:79
+#: src/effects.c:80
 msgid "Data Sources"
 msgstr ""
 
-#: src/effects.c:81
+#: src/effects.c:82
 msgid "transition"
 msgstr ""
 
-#: src/effects.c:82
+#: src/effects.c:83
 msgid "Transitions"
 msgstr "الانتقالات"
 
-#: src/effects.c:84
+#: src/effects.c:85
 msgid "effect"
 msgstr "التأثير"
 
-#: src/effects.c:87 src/rfx-builder.c:187
+#: src/effects.c:88 src/rfx-builder.c:187
 msgid "utility"
 msgstr ""
 
-#: src/effects.c:88
+#: src/effects.c:89
 msgid "Utilities"
 msgstr "أدوات"
 
-#: src/effects.c:90
+#: src/effects.c:91
 msgid "compositor"
 msgstr ""
 
-#: src/effects.c:91
+#: src/effects.c:92
 msgid "Compositors"
 msgstr ""
 
-#: src/effects.c:93
+#: src/effects.c:94
 msgid "tap"
 msgstr ""
 
-#: src/effects.c:94
+#: src/effects.c:95
 msgid "Taps"
 msgstr ""
 
-#: src/effects.c:96
+#: src/effects.c:97
 msgid "splitter"
 msgstr ""
 
-#: src/effects.c:97
+#: src/effects.c:98
 msgid "Splitters"
 msgstr ""
 
-#: src/effects.c:99
+#: src/effects.c:100
 msgid "converter"
 msgstr ""
 
-#: src/effects.c:100
+#: src/effects.c:101
 msgid "Converters"
 msgstr ""
 
-#: src/effects.c:102
+#: src/effects.c:103
 msgid "analyser"
 msgstr ""
 
-#: src/effects.c:103
+#: src/effects.c:104
 msgid "Analysers"
 msgstr ""
 
-#: src/effects.c:108
+#: src/effects.c:109
 msgid "audio/video"
 msgstr ""
 
-#: src/effects.c:109
+#: src/effects.c:110
 msgid "Audio/Video Transitions"
 msgstr ""
 
-#: src/effects.c:111
+#: src/effects.c:112
 msgid "video only"
 msgstr ""
 
-#: src/effects.c:112
+#: src/effects.c:113
 msgid "Video only Transitions"
 msgstr ""
 
-#: src/effects.c:114 src/multitrack.c:10740
+#: src/effects.c:115 src/multitrack.c:10962
 msgid "audio only"
 msgstr ""
 
-#: src/effects.c:115
+#: src/effects.c:116
 msgid "Audio only Transitions"
 msgstr ""
 
-#: src/effects.c:117 src/effects.c:120 src/multitrack.c:18757
+#: src/effects.c:118 src/effects.c:121 src/multitrack.c:19097
 msgid "audio"
 msgstr "ملف صوتي"
 
-#: src/effects.c:118
+#: src/effects.c:119
 msgid "Audio Mixers"
 msgstr ""
 
-#: src/effects.c:121
+#: src/effects.c:122
 msgid "Audio Effects"
 msgstr ""
 
-#: src/effects.c:123
+#: src/effects.c:124
 msgid "video"
 msgstr ""
 
-#: src/effects.c:124
+#: src/effects.c:125
 msgid "Video Effects"
 msgstr ""
 
-#: src/effects.c:126
+#: src/effects.c:127
 msgid "audio volume controller"
 msgstr ""
 
-#: src/effects.c:127
+#: src/effects.c:128
 msgid "Audio Volume Controllers"
 msgstr ""
 
-#: src/effects.c:129
+#: src/effects.c:130
 msgid "video analyser"
 msgstr ""
 
-#: src/effects.c:130
+#: src/effects.c:131
 msgid "Video analysers"
 msgstr ""
 
-#: src/effects.c:132
+#: src/effects.c:133
 msgid "audio analyser"
 msgstr ""
 
-#: src/effects.c:133
+#: src/effects.c:134
 msgid "Audio Analysers"
 msgstr ""
 
-#: src/effects.c:137 src/plugins.c:2559 src/plugins.c:2573
+#: src/effects.c:138 src/plugins.c:2507 src/plugins.c:2521
 msgid "unknown"
 msgstr "مجهول"
 
-#: src/effects.c:238
+#: src/effects.c:235
 #, c-format
 msgid "%s all frames..."
 msgstr ""
 
-#: src/effects.c:243
+#: src/effects.c:239
 #, c-format
 msgid "%s clipboard into frames %d to %d..."
 msgstr ""
 
-#: src/effects.c:250
+#: src/effects.c:245
 #, c-format
 msgid "%s to clipboard..."
 msgstr ""
 
-#: src/effects.c:254
+#: src/effects.c:248
 #, c-format
 msgid "%s to new clip..."
 msgstr ""
 
-#: src/effects.c:259
+#: src/effects.c:252
 #, c-format
 msgid "%s frames %d to %d..."
 msgstr ""
 
-#: src/effects.c:290
+#: src/effects.c:283
 #, c-format
 msgid "%s clipboard with selection"
 msgstr ""
 
-#: src/effects.c:295
+#: src/effects.c:287
 #, c-format
 msgid "%s to clipboard"
 msgstr ""
 
-#: src/effects.c:299
+#: src/effects.c:290
 #, c-format
 msgid "%s to new clip"
 msgstr ""
 
-#: src/effects.c:304
+#: src/effects.c:294
 #, c-format
 msgid "%s frames %d to %d"
 msgstr ""
 
-#: src/effects.c:456 src/effects.c:523
+#: src/effects.c:443 src/effects.c:507
 msgid ""
 "\n"
 "No frames were generated.\n"
 msgstr ""
 
-#: src/effects-weed.c:431
+#: src/effects-weed.c:452
 msgid "integer"
 msgstr ""
 
-#: src/effects-weed.c:432
+#: src/effects-weed.c:454
 msgid "int64"
 msgstr ""
 
-#: src/effects-weed.c:433
+#: src/effects-weed.c:456
 msgid "boolean"
 msgstr ""
 
-#: src/effects-weed.c:434
+#: src/effects-weed.c:458
 msgid "double"
 msgstr ""
 
-#: src/effects-weed.c:435
+#: src/effects-weed.c:460
 msgid "string"
 msgstr ""
 
-#: src/effects-weed.c:436
+#: src/effects-weed.c:462
 msgid "pointer"
 msgstr ""
 
-#: src/effects-weed.c:4591
+#: src/effects-weed.c:4581
 #, c-format
 msgid "Error: plugin %s has no weed_setup() function.\n"
 msgstr ""
 
-#: src/effects-weed.c:4606
+#: src/effects-weed.c:4595
 #, c-format
 msgid "No usable filters found in plugin %s\n"
 msgstr ""
 
-#: src/effects-weed.c:4680
+#: src/effects-weed.c:4668
 #, c-format
 msgid "Found duplicate plugin %s"
 msgstr ""
 
-#: src/effects-weed.c:4734
+#: src/effects-weed.c:4723
 #, c-format
 msgid ""
 "Info: Unable to load plugin %s\n"
 "Error was: %s\n"
 msgstr ""
 
-#: src/effects-weed.c:4737 src/effects-weed.c:5858
+#: src/effects-weed.c:4726 src/effects-weed.c:5847
 msgid "Some plugin directories"
 msgstr ""
 
 #. TRANSLATORS: example " - LADSPA plugins -"
-#: src/effects-weed.c:4812 src/rte_window.c:2105
+#: src/effects-weed.c:4801 src/rte_window.c:2107
 #, c-format
 msgid " - %s plugins -"
 msgstr ""
 
-#: src/effects-weed.c:5012
+#: src/effects-weed.c:4998
 #, c-format
 msgid "Successfully loaded %d Weed filters\n"
 msgstr ""
 
-#: src/effects-weed.c:5177
+#: src/effects-weed.c:5162
 #, c-format
 msgid "Invalid compound effect %s - has conflicting target_fps\n"
 msgstr ""
 
-#: src/effects-weed.c:5197
+#: src/effects-weed.c:5182
 #, c-format
 msgid "Invalid compound effect %s - has multiple transition parameters\n"
 msgstr ""
 
-#: src/effects-weed.c:5211
+#: src/effects-weed.c:5196
 #, c-format
 msgid "Invalid compound effect %s - has multiple master volume parameters\n"
 msgstr ""
 
-#: src/effects-weed.c:5346
+#: src/effects-weed.c:5329
 #, c-format
 msgid "Invalid compound effect %s - must have >1 sub filters\n"
 msgstr ""
 
-#: src/effects-weed.c:5366
+#: src/effects-weed.c:5349
 #, c-format
 msgid "Invalid effect %s found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5381
+#: src/effects-weed.c:5364
 #, c-format
 msgid "Invalid default found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5392
+#: src/effects-weed.c:5375
 #, c-format
 msgid "Invalid filter %d for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5406
+#: src/effects-weed.c:5389
 #, c-format
 msgid "Invalid param %d for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5433
+#: src/effects-weed.c:5416
 #, c-format
 msgid ""
 "Invalid number of values for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5467
+#: src/effects-weed.c:5450
 #, c-format
 msgid ""
 "Invalid non-boolean value for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5500
+#: src/effects-weed.c:5483
 #, c-format
 msgid "Invalid param link found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5511
+#: src/effects-weed.c:5494
 #, c-format
 msgid ""
 "Invalid out filter %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5529
+#: src/effects-weed.c:5513
 #, c-format
 msgid ""
 "Invalid out param %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5541
+#: src/effects-weed.c:5526
 #, c-format
 msgid ""
 "Invalid non-boolean value for autoscale found in compound effect %s, line "
 "%d\n"
 msgstr ""
 
-#: src/effects-weed.c:5552
+#: src/effects-weed.c:5537
 #, c-format
 msgid ""
 "Invalid in filter %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5566
+#: src/effects-weed.c:5552
 #, c-format
 msgid ""
 "Invalid in param %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5594
+#: src/effects-weed.c:5581
 #, c-format
 msgid "Invalid channel link found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5605
+#: src/effects-weed.c:5592
 #, c-format
 msgid ""
 "Invalid out filter %d for link channels found in compound effect %s, line "
 "%d\n"
 msgstr ""
 
-#: src/effects-weed.c:5623
+#: src/effects-weed.c:5611
 #, c-format
 msgid ""
 "Invalid out channel %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5633
+#: src/effects-weed.c:5622
 #, c-format
 msgid ""
 "Invalid in filter %d for link channels found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5651
+#: src/effects-weed.c:5641
 #, c-format
 msgid ""
 "Invalid in channel %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5687
+#: src/effects-weed.c:5678
 #, c-format
 msgid "Compound:%s"
 msgstr ""
 
-#: src/effects-weed.c:5758
+#: src/effects-weed.c:5749
 #, c-format
 msgid "Successfully loaded %d compound filters\n"
 msgstr ""
 
-#: src/effects-weed.c:6591
+#: src/effects-weed.c:6570
 #, c-format
 msgid "Effect %s cannot be used with this audio player.\n"
 msgstr ""
 
-#: src/effects-weed.c:6737
+#: src/effects-weed.c:6718
 #, c-format
 msgid "Failed to start instance %s, error code %d\n"
 msgstr ""
 
-#: src/effects-weed.c:6814
+#: src/effects-weed.c:6797
 #, c-format
 msgid "Unable to start generator %s\n"
 msgstr ""
 
-#: src/effects-weed.c:7621
+#: src/effects-weed.c:7607
 #, c-format
 msgid "Failed to start generator %s\n"
 msgstr ""
 
-#: src/effects-weed.c:7718
+#: src/effects-weed.c:7701
 #, c-format
 msgid "Failed to start generator %s, error %d\n"
 msgstr ""
 
-#: src/effects-weed.c:9012
+#: src/effects-weed.c:8993
 #, c-format
 msgid "%s [unstable] (%s)"
 msgstr ""
 
-#: src/effects-data.c:3278
+#: src/effects-data.c:3234
 #, c-format
 msgid "ACTIVATE (%s)"
 msgstr ""
 
-#: src/effects-data.c:3548
+#: src/effects-data.c:3501
 msgid "ACTIVATE"
 msgstr ""
 
-#: src/effects-data.c:3876
+#: src/effects-data.c:3829
 #, c-format
 msgid "Key slot %d"
 msgstr ""
 
-#: src/effects-data.c:3998
+#: src/effects-data.c:3951
 msgid "Autoscale"
 msgstr ""
 
-#: src/effects-data.c:4089
+#: src/effects-data.c:4042
 msgid "Add another connection for this output parameter"
 msgstr ""
 
-#: src/effects-data.c:4102 src/effects-data.c:4151
+#: src/effects-data.c:4055 src/effects-data.c:4104
 #, fuzzy
 msgid "Delete this connection"
 msgstr "ا_حذف التحديد"
 
-#: src/effects-data.c:4138
+#: src/effects-data.c:4091
 msgid "Add another connection for this output channel"
 msgstr ""
 
-#: src/effects-data.c:4223
+#: src/effects-data.c:4176
 msgid "Connected to -->"
 msgstr ""
 
-#: src/effects-data.c:4243
+#: src/effects-data.c:4196
 #, c-format
 msgid "%s - Alpha Channel Connections"
 msgstr ""
 
-#: src/effects-data.c:4316
+#: src/effects-data.c:4269
 #, c-format
 msgid "%s - Parameter Data Connections"
 msgstr ""
 
-#: src/effects-data.c:4336
+#: src/effects-data.c:4289
 msgid "Autoscale All"
 msgstr ""
 
-#: src/effects-data.c:4361 src/effects-data.c:4890
+#: src/effects-data.c:4314 src/effects-data.c:4841
 msgid "ACTIVATED"
 msgstr ""
 
-#: src/effects-data.c:4774
+#: src/effects-data.c:4726
 msgid "LiVES: - Parameter and Alpha Channel Connections"
 msgstr ""
 
-#: src/effects-data.c:4785
+#: src/effects-data.c:4736
 msgid "Auto Connect Channels"
 msgstr ""
 
-#: src/effects-data.c:4797
+#: src/effects-data.c:4748
 msgid "Auto Connect Parameters"
 msgstr ""
 
-#: src/effects-data.c:4807
+#: src/effects-data.c:4758
 msgid "Disconnect All"
 msgstr ""
 
-#: src/effects-data.c:4875
+#: src/effects-data.c:4826
 #, c-format
 msgid "Input channel is already connected from (%d,%d) %s"
 msgstr ""
 
-#: src/effects-data.c:4891
+#: src/effects-data.c:4842
 #, c-format
 msgid "Input parameter is already connected from (%d,%d) %s"
 msgstr ""
 
-#: src/effects-data.c:4899
+#: src/effects-data.c:4851
 msgid "Input and output parameters are not compatible"
 msgstr ""
 
@@ -5681,43 +5692,43 @@
 msgid "_Reset Values"
 msgstr ""
 
-#: src/framedraw.c:267
+#: src/framedraw.c:265
 msgid "_Frame"
 msgstr ""
 
-#: src/paramspecial.c:266
+#: src/paramspecial.c:259
 msgid "Maintain _Aspect Ratio"
 msgstr ""
 
-#: src/paramspecial.c:267
+#: src/paramspecial.c:260
 msgid "Maintain aspect ratio of original frame"
 msgstr ""
 
-#: src/paramspecial.c:341
+#: src/paramspecial.c:335
 msgid "Display Password"
 msgstr ""
 
-#: src/paramwindow.c:450
+#: src/paramwindow.c:447
 msgid "Transition _In"
 msgstr ""
 
-#: src/paramwindow.c:452
+#: src/paramwindow.c:449
 msgid "Click to set the transition parameter to show only the front frame"
 msgstr ""
 
-#: src/paramwindow.c:474
+#: src/paramwindow.c:472
 msgid "Crossfade audio"
 msgstr ""
 
-#: src/paramwindow.c:475
+#: src/paramwindow.c:473
 msgid "Check the box to make audio transition with the video"
 msgstr ""
 
-#: src/paramwindow.c:493
+#: src/paramwindow.c:492
 msgid "Transition _Out"
 msgstr ""
 
-#: src/paramwindow.c:495
+#: src/paramwindow.c:494
 msgid "Click to set the transition parameter to show only the rear frame"
 msgstr ""
 
@@ -5730,23 +5741,23 @@
 msgid "%s : size"
 msgstr ""
 
-#: src/paramwindow.c:598
+#: src/paramwindow.c:597
 msgid "New size (pixels)"
 msgstr ""
 
-#: src/paramwindow.c:617 src/plugins.c:997
+#: src/paramwindow.c:616 src/plugins.c:973
 msgid "_Width"
 msgstr "ع_رض"
 
-#: src/paramwindow.c:636 src/plugins.c:1003
+#: src/paramwindow.c:635 src/plugins.c:979
 msgid "_Height"
 msgstr "إر_تفاع"
 
-#: src/paramwindow.c:684
+#: src/paramwindow.c:683
 msgid "Generate to _Clipboard"
 msgstr ""
 
-#: src/paramwindow.c:686
+#: src/paramwindow.c:685
 msgid "Generate frames to the clipboard"
 msgstr ""
 
@@ -5758,7 +5769,7 @@
 msgid "Generate frames to a new clip"
 msgstr ""
 
-#: src/paramwindow.c:822
+#: src/paramwindow.c:824
 #, c-format
 msgid ""
 "\n"
@@ -5766,71 +5777,71 @@
 "\n"
 msgstr ""
 
-#: src/paramwindow.c:920 src/paramwindow.c:930
+#: src/paramwindow.c:934 src/paramwindow.c:942
 msgid "Set as default"
 msgstr "تعينه كافتراضي"
 
-#: src/paramwindow.c:922 src/paramwindow.c:938
+#: src/paramwindow.c:936 src/paramwindow.c:950
 msgid "Reset"
 msgstr ""
 
-#: src/paramwindow.c:932 src/rte_window.c:2401 src/omc-learn.c:1357
+#: src/paramwindow.c:944 src/rte_window.c:2394 src/omc-learn.c:1347
 msgid "Close _window"
 msgstr "غغلق النافذة"
 
-#: src/paramwindow.c:1337
+#: src/paramwindow.c:1340
 msgid "No parameters"
 msgstr ""
 
-#: src/paramwindow.c:1419
+#: src/paramwindow.c:1424
 msgid "Invalid parameter"
 msgstr ""
 
-#: src/paramwindow.c:1611
+#: src/paramwindow.c:1610
 msgid "LiVES: - Select Colour"
 msgstr ""
 
-#: src/paramwindow.c:1616
+#: src/paramwindow.c:1615
 msgid "Click to set the colour"
 msgstr ""
 
-#: src/paramwindow.c:1628
+#: src/paramwindow.c:1626
 msgid "_Red"
 msgstr ""
 
-#: src/paramwindow.c:1629
+#: src/paramwindow.c:1627
 msgid "The red value (0 - 255)"
 msgstr ""
 
-#: src/paramwindow.c:1632
+#: src/paramwindow.c:1630
 msgid "_Green"
 msgstr ""
 
-#: src/paramwindow.c:1633
+#: src/paramwindow.c:1631
 msgid "The green value (0 - 255)"
 msgstr ""
 
-#: src/paramwindow.c:1636
+#: src/paramwindow.c:1634
 msgid "_Blue"
 msgstr ""
 
-#: src/paramwindow.c:1637
+#: src/paramwindow.c:1635
 msgid "The blue value (0 - 255)"
 msgstr ""
 
-#: src/plugins.c:85
+#: src/plugins.c:86
 #, c-format
 msgid ""
 "\n"
 "Plugin error: %s failed with code %d"
 msgstr ""
 
-#: src/plugins.c:87
+#: src/plugins.c:88
 #, c-format
 msgid " : message was %s\n"
 msgstr ""
 
-#: src/plugins.c:387
+#: src/plugins.c:375
 #, c-format
 msgid ""
 "\n"
@@ -5840,17 +5851,17 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/plugins.c:397
+#: src/plugins.c:385
 #, c-format
 msgid "Updating video playback plugin defaults in %s\n"
 msgstr ""
 
-#: src/plugins.c:452
+#: src/plugins.c:444
 #, c-format
 msgid "Loading video playback plugin defaults from %s..."
 msgstr ""
 
-#: src/plugins.c:515
+#: src/plugins.c:505
 #, c-format
 msgid ""
 "\n"
@@ -5860,32 +5871,32 @@
 "\n"
 msgstr ""
 
-#: src/plugins.c:855
+#: src/plugins.c:836
 #, c-format
 msgid "Saving playback plugin defaults to %s..."
 msgstr ""
 
-#: src/plugins.c:962
+#: src/plugins.c:939
 msgid "_FPS"
 msgstr ""
 
-#: src/plugins.c:963
+#: src/plugins.c:940
 msgid "Fixed framerate for plugin.\n"
 msgstr ""
 
-#: src/plugins.c:1032
+#: src/plugins.c:1008
 msgid "_Colourspace"
 msgstr ""
 
-#: src/plugins.c:1033
+#: src/plugins.c:1009
 msgid "Colourspace input to the plugin.\n"
 msgstr ""
 
-#: src/plugins.c:1089
+#: src/plugins.c:1065
 msgid "Save settings to an alternate file.\n"
 msgstr ""
 
-#: src/plugins.c:1206
+#: src/plugins.c:1182
 #, c-format
 msgid ""
 "\n"
@@ -5894,7 +5905,7 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/plugins.c:1252
+#: src/plugins.c:1228
 #, c-format
 msgid ""
 "\n"
@@ -5904,38 +5915,38 @@
 "Unable to use it.\n"
 msgstr ""
 
-#: src/plugins.c:1265
+#: src/plugins.c:1241
 #, c-format
 msgid ""
 "Video playback plugin failed to initialise.\n"
 "Error was: %s\n"
 msgstr ""
 
-#: src/plugins.c:1461
+#: src/plugins.c:1428
 msgid ""
 "\n"
 "Warning ! Video playback plugin will not send key presses. Keyboard may be "
 "disabled during plugin use !\n"
 msgstr ""
 
-#: src/plugins.c:1465
+#: src/plugins.c:1433
 #, c-format
 msgid ""
 "*** Using %s plugin for fs playback, agreed to use palette type %d ( %s ). "
 "***\n"
 msgstr ""
 
-#: src/plugins.c:1571
+#: src/plugins.c:1537
 #, c-format
 msgid "Audio stream unable to use preferred format '%s'\n"
 msgstr ""
 
-#: src/plugins.c:1579
+#: src/plugins.c:1543
 #, c-format
 msgid "Using format '%s' instead.\n"
 msgstr ""
 
-#: src/plugins.c:1616
+#: src/plugins.c:1579
 #, c-format
 msgid ""
 "LiVES was unable to find its encoder plugins. Please make sure you have the "
@@ -5944,7 +5955,7 @@
 "or change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/plugins.c:1624
+#: src/plugins.c:1589
 #, c-format
 msgid ""
 "LiVES did not receive a response from the encoder plugin called '%s'.\n"
@@ -5953,11 +5964,11 @@
 "or switch to another plugin using Tools|Preferences|Encoding\n"
 msgstr ""
 
-#: src/plugins.c:2032
+#: src/plugins.c:1987
 msgid "Unable to resize, please install imageMagick\n"
 msgstr ""
 
-#: src/plugins.c:2231
+#: src/plugins.c:2183
 #, c-format
 msgid ""
 "\n"
@@ -5965,12 +5976,12 @@
 "No decoders found in %s !\n"
 msgstr ""
 
-#: src/plugins.c:2415
+#: src/plugins.c:2369
 #, fuzzy, c-format
 msgid " using %s"
 msgstr "فتح %s"
 
-#: src/plugins.c:2499
+#: src/plugins.c:2451
 #, c-format
 msgid ""
 "\n"
@@ -5979,7 +5990,7 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/plugins.c:2522
+#: src/plugins.c:2472
 #, c-format
 msgid ""
 "\n"
@@ -5989,24 +6000,24 @@
 "Unable to use it.\n"
 msgstr ""
 
-#: src/plugins.c:2564
+#: src/plugins.c:2512
 msgid "/unknown"
 msgstr ""
 
-#: src/plugins.c:2651
+#: src/plugins.c:2598
 msgid "LiVES: - Decoder Plugins"
 msgstr ""
 
-#: src/plugins.c:2669
+#: src/plugins.c:2616
 msgid "Enabled Video Decoders (uncheck to disable)"
 msgstr ""
 
-#: src/plugins.c:2726
+#: src/plugins.c:2672
 #, c-format
 msgid "Failed to load %s, transitions may not resize.\n"
 msgstr ""
 
-#: src/plugins.c:3854
+#: src/plugins.c:3797
 #, c-format
 msgid "%s advanced settings"
 msgstr ""
@@ -6015,15 +6026,15 @@
 msgid "LiVES: - New Test RFX"
 msgstr ""
 
-#: src/rfx-builder.c:136
+#: src/rfx-builder.c:135
 msgid "LiVES: - Edit Test RFX"
 msgstr ""
 
-#: src/rfx-builder.c:166
+#: src/rfx-builder.c:165
 msgid "Type:"
 msgstr "النّوع:"
 
-#: src/rfx-builder.c:184
+#: src/rfx-builder.c:183
 msgid "tool"
 msgstr ""
 
@@ -6035,130 +6046,130 @@
 msgid "The name of the plugin. No spaces allowed."
 msgstr ""
 
-#: src/rfx-builder.c:201
+#: src/rfx-builder.c:202
 msgid "Version:       "
 msgstr ""
 
-#: src/rfx-builder.c:203
+#: src/rfx-builder.c:204
 msgid "The script version."
 msgstr ""
 
-#: src/rfx-builder.c:210
+#: src/rfx-builder.c:212
 msgid "    Author:       "
 msgstr ""
 
-#: src/rfx-builder.c:211
+#: src/rfx-builder.c:213
 msgid "The script author."
 msgstr ""
 
-#: src/rfx-builder.c:217
+#: src/rfx-builder.c:220
 msgid "    URL (optional):       "
 msgstr ""
 
-#: src/rfx-builder.c:218
+#: src/rfx-builder.c:221
 msgid "URL for the plugin maintainer."
 msgstr ""
 
-#: src/rfx-builder.c:226
+#: src/rfx-builder.c:230
 msgid "Menu text:    "
 msgstr ""
 
-#: src/rfx-builder.c:227
+#: src/rfx-builder.c:231
 msgid "The text to show in the menu."
 msgstr ""
 
-#: src/rfx-builder.c:239
+#: src/rfx-builder.c:244
 msgid "Action description:        "
 msgstr ""
 
-#: src/rfx-builder.c:241
+#: src/rfx-builder.c:246
 msgid "Describe what the plugin is doing. E.g. \"Edge detecting\""
 msgstr ""
 
-#: src/rfx-builder.c:246
+#: src/rfx-builder.c:251
 msgid "Minimum frames:"
 msgstr ""
 
-#: src/rfx-builder.c:249
+#: src/rfx-builder.c:254
 msgid ""
 "Minimum number of frames this effect/tool can be applied to. Normally 1."
 msgstr ""
 
-#: src/rfx-builder.c:260
+#: src/rfx-builder.c:265
 msgid "_Requirements..."
 msgstr ""
 
-#: src/rfx-builder.c:263
+#: src/rfx-builder.c:268
 msgid "Enter any binaries required by the plugin."
 msgstr ""
 
-#: src/rfx-builder.c:267
+#: src/rfx-builder.c:272
 msgid "_Properties..."
 msgstr "ال_خصائص..."
 
-#: src/rfx-builder.c:270
+#: src/rfx-builder.c:275
 msgid "Set properties for the plugin. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:274
+#: src/rfx-builder.c:279
 msgid "_Parameters..."
 msgstr ""
 
-#: src/rfx-builder.c:277
+#: src/rfx-builder.c:282
 msgid "Set up parameters used in pre/loop/post/trigger code. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:281
+#: src/rfx-builder.c:286
 msgid "Parameter _Window Hints..."
 msgstr ""
 
-#: src/rfx-builder.c:284
+#: src/rfx-builder.c:289
 msgid "Set hints about how to lay out the parameter window. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:290
+#: src/rfx-builder.c:295
 msgid "_Language code:"
 msgstr ""
 
-#: src/rfx-builder.c:291
+#: src/rfx-builder.c:296
 msgid "Language for pre/loop/post/triggers. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:300
+#: src/rfx-builder.c:305
 msgid "_Pre loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:303
+#: src/rfx-builder.c:308
 msgid "Code to be executed before the loop. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:307
+#: src/rfx-builder.c:312
 msgid "_Loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:310
+#: src/rfx-builder.c:315
 msgid "Loop code to be applied to each frame."
 msgstr ""
 
-#: src/rfx-builder.c:314
+#: src/rfx-builder.c:319
 msgid "_Post loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:317
+#: src/rfx-builder.c:322
 msgid "Code to be executed after the loop. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:321
+#: src/rfx-builder.c:326
 msgid "_Trigger code..."
 msgstr ""
 
-#: src/rfx-builder.c:324
+#: src/rfx-builder.c:329
 msgid ""
 "Set trigger code for when the parameter window is shown, or when a parameter "
 "is changed. Optional (except for Utilities)."
 msgstr ""
 
-#: src/rfx-builder.c:421
+#: src/rfx-builder.c:426
 #, c-format
 msgid ""
 "\n"
@@ -6168,55 +6179,55 @@
 "%s\n"
 msgstr ""
 
-#: src/rfx-builder.c:544
+#: src/rfx-builder.c:541
 msgid "LiVES: - RFX Requirements"
 msgstr ""
 
-#: src/rfx-builder.c:548
+#: src/rfx-builder.c:544
 msgid "LiVES: - RFX Parameters"
 msgstr ""
 
-#: src/rfx-builder.c:552
+#: src/rfx-builder.c:547
 msgid "LiVES: - RFX Parameter Window Hints"
 msgstr ""
 
-#: src/rfx-builder.c:556
+#: src/rfx-builder.c:550
 msgid "LiVES: - RFX Triggers"
 msgstr ""
 
-#: src/rfx-builder.c:622
+#: src/rfx-builder.c:613
 msgid "_New Entry"
 msgstr ""
 
-#: src/rfx-builder.c:625
+#: src/rfx-builder.c:616
 msgid "_Edit Entry"
 msgstr ""
 
-#: src/rfx-builder.c:628
+#: src/rfx-builder.c:619
 msgid "_Remove Entry"
 msgstr ""
 
-#: src/rfx-builder.c:632
+#: src/rfx-builder.c:623
 msgid "Move _Up"
 msgstr "انقل للأ_على"
 
-#: src/rfx-builder.c:635
+#: src/rfx-builder.c:626
 msgid "Move _Down"
 msgstr "أ_سفل"
 
-#: src/rfx-builder.c:1004
+#: src/rfx-builder.c:984
 msgid "LiVES: - RFX Properties"
 msgstr ""
 
-#: src/rfx-builder.c:1013
+#: src/rfx-builder.c:993
 msgid "_Slow (hint to GUI)"
 msgstr ""
 
-#: src/rfx-builder.c:1024
+#: src/rfx-builder.c:1004
 msgid "_Batch mode generator"
 msgstr ""
 
-#: src/rfx-builder.c:1831
+#: src/rfx-builder.c:1790
 msgid ""
 "\n"
 "\n"
@@ -6225,7 +6236,7 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:1875
+#: src/rfx-builder.c:1834
 msgid ""
 "\n"
 "\n"
@@ -6233,219 +6244,219 @@
 "Please check the trigger code.\n"
 msgstr ""
 
-#: src/rfx-builder.c:1994
+#: src/rfx-builder.c:1950
 msgid "LiVES: - New RFX Parameter"
 msgstr ""
 
-#: src/rfx-builder.c:1997
+#: src/rfx-builder.c:1952
 msgid "LiVES: - Edit RFX Parameter"
 msgstr ""
 
-#: src/rfx-builder.c:2013
+#: src/rfx-builder.c:1968
 msgid "_Name:    "
 msgstr ""
 
-#: src/rfx-builder.c:2016
+#: src/rfx-builder.c:1971
 msgid "Name of the parameter, must be unique in the plugin."
 msgstr ""
 
-#: src/rfx-builder.c:2025
+#: src/rfx-builder.c:1981
 msgid "_Label:    "
 msgstr ""
 
-#: src/rfx-builder.c:2028
+#: src/rfx-builder.c:1984
 msgid ""
 "Label to be shown by the parameter. An underscore represents mnemonic "
 "accelerator."
 msgstr ""
 
-#: src/rfx-builder.c:2039
+#: src/rfx-builder.c:1996
 msgid "_Type:         "
 msgstr ""
 
-#: src/rfx-builder.c:2040
+#: src/rfx-builder.c:1997
 msgid "Parameter type (select from list)."
 msgstr ""
 
-#: src/rfx-builder.c:2073
+#: src/rfx-builder.c:2029
 msgid "Decimal _places: "
 msgstr ""
 
-#: src/rfx-builder.c:2082 src/rfx-builder.c:2477 src/rfx-builder.c:2495
+#: src/rfx-builder.c:2038 src/rfx-builder.c:2430 src/rfx-builder.c:2447
 msgid "_Default value:    "
 msgstr ""
 
-#: src/rfx-builder.c:2098
+#: src/rfx-builder.c:2054
 msgid "_Default: "
 msgstr ""
 
-#: src/rfx-builder.c:2132
+#: src/rfx-builder.c:2087
 msgid "Button _Group: "
 msgstr ""
 
-#: src/rfx-builder.c:2134
+#: src/rfx-builder.c:2089
 msgid "A non-zero value can be used to group radio buttons."
 msgstr ""
 
-#: src/rfx-builder.c:2142 src/rfx-builder.c:2478
+#: src/rfx-builder.c:2097 src/rfx-builder.c:2431
 msgid "_Minimum value: "
 msgstr ""
 
-#: src/rfx-builder.c:2148 src/rfx-builder.c:2479
+#: src/rfx-builder.c:2103 src/rfx-builder.c:2432
 msgid "Ma_ximum value: "
 msgstr ""
 
-#: src/rfx-builder.c:2157
+#: src/rfx-builder.c:2113
 msgid "     _Step size:   "
 msgstr ""
 
-#: src/rfx-builder.c:2160
+#: src/rfx-builder.c:2117
 msgid ""
 "How much the parameter is adjusted when the spinbutton arrows are pressed."
 msgstr ""
 
-#: src/rfx-builder.c:2171
+#: src/rfx-builder.c:2129
 msgid "_Wrap value"
 msgstr ""
 
-#: src/rfx-builder.c:2172
+#: src/rfx-builder.c:2131
 msgid "Whether the value wraps max->min and min->max."
 msgstr ""
 
-#: src/rfx-builder.c:2470
+#: src/rfx-builder.c:2424
 msgid "Set _values"
 msgstr ""
 
-#: src/rfx-builder.c:2512
+#: src/rfx-builder.c:2463
 msgid "Default _Red:  "
 msgstr ""
 
-#: src/rfx-builder.c:2513
+#: src/rfx-builder.c:2464
 msgid "Default _Green:"
 msgstr ""
 
-#: src/rfx-builder.c:2514
+#: src/rfx-builder.c:2465
 msgid "Default _Blue: "
 msgstr ""
 
-#: src/rfx-builder.c:2538
+#: src/rfx-builder.c:2488
 msgid "Set _default"
 msgstr ""
 
-#: src/rfx-builder.c:2540
+#: src/rfx-builder.c:2490
 msgid "Default value:  "
 msgstr ""
 
-#: src/rfx-builder.c:2541
+#: src/rfx-builder.c:2491
 msgid "Maximum length (chars): "
 msgstr ""
 
-#: src/rfx-builder.c:2576
+#: src/rfx-builder.c:2526
 msgid "LiVES: - New RFX Parameter Window Hint"
 msgstr ""
 
-#: src/rfx-builder.c:2579
+#: src/rfx-builder.c:2528
 msgid "LiVES: - Edit RFX Parameter Window Hint"
 msgstr ""
 
-#: src/rfx-builder.c:2622
+#: src/rfx-builder.c:2569
 msgid "_Keyword:         "
 msgstr ""
 
-#: src/rfx-builder.c:2639
+#: src/rfx-builder.c:2586
 msgid "Special _Type:         "
 msgstr ""
 
-#: src/rfx-builder.c:2656
+#: src/rfx-builder.c:2602
 msgid "Special _Subtype:         "
 msgstr ""
 
-#: src/rfx-builder.c:2667 src/rfx-builder.c:2706
+#: src/rfx-builder.c:2613 src/rfx-builder.c:2651
 msgid "Row:    "
 msgstr ""
 
-#: src/rfx-builder.c:2732
+#: src/rfx-builder.c:2676
 #, c-format
 msgid "Linked parameters (%d):    "
 msgstr ""
 
-#: src/rfx-builder.c:2749
+#: src/rfx-builder.c:2693
 msgid "Linked parameters (4):    "
 msgstr ""
 
-#: src/rfx-builder.c:2752
+#: src/rfx-builder.c:2695
 msgid "Linked parameters (2):    "
 msgstr ""
 
-#: src/rfx-builder.c:2777
+#: src/rfx-builder.c:2720
 msgid "LiVES: - New RFX Trigger"
 msgstr ""
 
-#: src/rfx-builder.c:2780
+#: src/rfx-builder.c:2722
 msgid "LiVES: - Edit RFX Trigger"
 msgstr ""
 
-#: src/rfx-builder.c:2808
+#: src/rfx-builder.c:2750
 msgid "When:         "
 msgstr ""
 
-#: src/rfx-builder.c:2904
+#: src/rfx-builder.c:2846
 msgid "LiVES: - Pre Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:2911
+#: src/rfx-builder.c:2853
 msgid "LiVES: - Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:2918
+#: src/rfx-builder.c:2860
 msgid "LiVES: - Post Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:2931
+#: src/rfx-builder.c:2873
 #, c-format
 msgid "LiVES: - Default text (max length %d)"
 msgstr ""
 
-#: src/rfx-builder.c:2944
+#: src/rfx-builder.c:2885
 msgid "LiVES: - Enter values, one per line"
 msgstr ""
 
-#: src/rfx-builder.c:3055
+#: src/rfx-builder.c:2996
 msgid ""
 "\n"
 "\n"
 "Name must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3060
+#: src/rfx-builder.c:3001
 msgid ""
 "\n"
 "\n"
 "Name must not contain spaces.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3065
+#: src/rfx-builder.c:3006
 msgid ""
 "\n"
 "\n"
 "Menu text must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3071
+#: src/rfx-builder.c:3012
 msgid ""
 "\n"
 "\n"
 "Action description must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3076
+#: src/rfx-builder.c:3017
 msgid ""
 "\n"
 "\n"
 "Author must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3085 src/rfx-builder.c:4339
+#: src/rfx-builder.c:3026 src/rfx-builder.c:4253
 msgid ""
 "\n"
 "\n"
@@ -6453,28 +6464,28 @@
 "Name must be unique.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3092
+#: src/rfx-builder.c:3033
 msgid ""
 "\n"
 "\n"
 "Loop code should not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3098
+#: src/rfx-builder.c:3039
 msgid ""
 "\n"
 "\n"
 "Trigger code should not be blank for a utility.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3111
+#: src/rfx-builder.c:3052
 msgid ""
 "\n"
 "\n"
 "Parameter name must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3117
+#: src/rfx-builder.c:3058
 msgid ""
 "\n"
 "\n"
@@ -6483,41 +6494,41 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:3171
+#: src/rfx-builder.c:3111
 #, c-format
 msgid "Writing script file %s..."
 msgstr ""
 
-#: src/rfx-builder.c:3477
+#: src/rfx-builder.c:3411
 msgid "No <define> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3484 src/rfx-builder.c:3493
+#: src/rfx-builder.c:3418 src/rfx-builder.c:3427
 msgid "Bad script version.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3505
+#: src/rfx-builder.c:3439
 msgid "No <name> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3513
+#: src/rfx-builder.c:3447
 msgid "No <version> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3522
+#: src/rfx-builder.c:3456
 msgid "No <author> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3536
+#: src/rfx-builder.c:3470
 msgid "No <description> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3540
+#: src/rfx-builder.c:3474
 #, c-format
 msgid "Bad description. (%s)\n"
 msgstr ""
 
-#: src/rfx-builder.c:3702
+#: src/rfx-builder.c:3627
 #, c-format
 msgid ""
 "\n"
@@ -6527,27 +6538,27 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:3859
+#: src/rfx-builder.c:3780
 msgid "Rebuilding all RFX scripts...builtin..."
 msgstr ""
 
-#: src/rfx-builder.c:3860
+#: src/rfx-builder.c:3781
 msgid "Rebuilding scripts"
 msgstr ""
 
-#: src/rfx-builder.c:3868
+#: src/rfx-builder.c:3789
 msgid "custom..."
 msgstr ""
 
-#: src/rfx-builder.c:3872
+#: src/rfx-builder.c:3793
 msgid "test..."
 msgstr ""
 
-#: src/rfx-builder.c:3878
+#: src/rfx-builder.c:3799
 msgid "rebuilding dynamic menu entries..."
 msgstr ""
 
-#: src/rfx-builder.c:3905 src/rfx-builder.c:3912
+#: src/rfx-builder.c:3826 src/rfx-builder.c:3834
 #, c-format
 msgid ""
 "\n"
@@ -6556,7 +6567,7 @@
 "Please check this program is in your path and executable.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3951
+#: src/rfx-builder.c:3874
 #, c-format
 msgid ""
 "\n"
@@ -6566,12 +6577,12 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:3960
+#: src/rfx-builder.c:3884
 #, c-format
 msgid "Deleting rfx script %s..."
 msgstr ""
 
-#: src/rfx-builder.c:3980
+#: src/rfx-builder.c:3902
 #, c-format
 msgid ""
 "\n"
@@ -6581,7 +6592,7 @@
 "Error code was %d\n"
 msgstr ""
 
-#: src/rfx-builder.c:4016
+#: src/rfx-builder.c:3938
 #, c-format
 msgid ""
 "\n"
@@ -6591,12 +6602,12 @@
 "Please delete it first, or rename the test script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4027
+#: src/rfx-builder.c:3950
 #, c-format
 msgid "Promoting rfx test plugin %s to custom..."
 msgstr ""
 
-#: src/rfx-builder.c:4044
+#: src/rfx-builder.c:3965
 #, c-format
 msgid ""
 "\n"
@@ -6607,20 +6618,20 @@
 "Return code was %d (%s)\n"
 msgstr ""
 
-#: src/rfx-builder.c:4070
+#: src/rfx-builder.c:3990
 msgid "LiVES: - Export Script to..."
 msgstr ""
 
-#: src/rfx-builder.c:4077 src/rfx-builder.c:4156
+#: src/rfx-builder.c:3997 src/rfx-builder.c:4074
 #, c-format
 msgid "Copying %s to %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4105
+#: src/rfx-builder.c:4024
 msgid "LiVES: Import Script from..."
 msgstr ""
 
-#: src/rfx-builder.c:4148
+#: src/rfx-builder.c:4067
 #, c-format
 msgid ""
 "\n"
@@ -6630,43 +6641,43 @@
 "Please delete it first, or rename the import script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4249
+#: src/rfx-builder.c:4166
 msgid "LiVES: - Copy RFX Script"
 msgstr ""
 
-#: src/rfx-builder.c:4251
+#: src/rfx-builder.c:4168
 msgid "_From type:    "
 msgstr ""
 
-#: src/rfx-builder.c:4258
+#: src/rfx-builder.c:4175
 msgid "   Script:    "
 msgstr ""
 
-#: src/rfx-builder.c:4267
+#: src/rfx-builder.c:4183
 msgid "LiVES: - Rename test RFX Script"
 msgstr ""
 
-#: src/rfx-builder.c:4268
+#: src/rfx-builder.c:4184
 msgid "From script: "
 msgstr ""
 
-#: src/rfx-builder.c:4273
+#: src/rfx-builder.c:4188
 msgid "LiVES: - RFX Script name"
 msgstr ""
 
-#: src/rfx-builder.c:4274
+#: src/rfx-builder.c:4189
 msgid "Script name: "
 msgstr ""
 
-#: src/rfx-builder.c:4294
+#: src/rfx-builder.c:4209
 msgid "New name: "
 msgstr ""
 
-#: src/rfx-builder.c:4297
+#: src/rfx-builder.c:4212
 msgid "New script name: "
 msgstr ""
 
-#: src/rfx-builder.c:4372
+#: src/rfx-builder.c:4286
 msgid ""
 "\n"
 "\n"
@@ -6674,12 +6685,12 @@
 "Script name must be unique.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4384
+#: src/rfx-builder.c:4297
 #, c-format
 msgid "Renaming RFX test script %s to %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4390
+#: src/rfx-builder.c:4302
 #, c-format
 msgid ""
 "\n"
@@ -6690,21 +6701,21 @@
 "Return code was %d\n"
 msgstr ""
 
-#: src/rfx-builder.c:4610
+#: src/rfx-builder.c:4518
 msgid "_Apply Real Time Effects to Selection"
 msgstr ""
 
-#: src/rfx-builder.c:4664
+#: src/rfx-builder.c:4572
 #, c-format
 msgid "Loading rendered effect %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4766
+#: src/rfx-builder.c:4674
 msgid ""
 "See: VJ - show VJ keys. Set the realtime effects, and then apply them here."
 msgstr ""
 
-#: src/preferences.c:359
+#: src/preferences.c:351
 msgid ""
 "\n"
 "\n"
@@ -6712,7 +6723,7 @@
 "full screen, separate window (fs) mode\n"
 msgstr ""
 
-#: src/preferences.c:408
+#: src/preferences.c:400
 msgid ""
 "\n"
 "\n"
@@ -6720,7 +6731,7 @@
 "(Free space = UNKNOWN)"
 msgstr ""
 
-#: src/preferences.c:412
+#: src/preferences.c:403
 #, c-format
 msgid ""
 "\n"
@@ -6729,14 +6740,14 @@
 "(Free space = %s)"
 msgstr ""
 
-#: src/preferences.c:416
+#: src/preferences.c:408
 msgid ""
 "The temp directory is LiVES working directory where opened clips and sets "
 "are stored.\n"
 "It should be in a partition with plenty of free disk space.\n"
 msgstr ""
 
-#: src/preferences.c:784
+#: src/preferences.c:839
 #, c-format
 msgid ""
 "Unable to create or write to the new temporary directory.\n"
@@ -6747,7 +6758,7 @@
 "The directory will not be changed now.\n"
 msgstr ""
 
-#: src/preferences.c:786
+#: src/preferences.c:843
 #, c-format
 msgid ""
 "Unable to create or write to the new temporary directory.\n"
@@ -6757,7 +6768,7 @@
 "The directory will not be changed now.\n"
 msgstr ""
 
-#: src/preferences.c:798
+#: src/preferences.c:856
 msgid ""
 "You have chosen to change the temporary directory.\n"
 "Please make sure you have no other copies of LiVES open.\n"
@@ -6769,20 +6780,20 @@
 "original setting."
 msgstr ""
 
-#: src/preferences.c:1169
+#: src/preferences.c:1221
 msgid ""
 "\n"
 "Unable to switch audio players to jack - jackd must be installed first.\n"
 "See http://jackaudio.org\n"
 msgstr ""
 
-#: src/preferences.c:1175
+#: src/preferences.c:1226
 msgid ""
 "\n"
 "Switching audio players requires restart (jackd must not be running)\n"
 msgstr ""
 
-#: src/preferences.c:1202
+#: src/preferences.c:1253
 msgid ""
 "\n"
 "Unable to switch audio players to pulse audio\n"
@@ -6790,814 +6801,814 @@
 "See http://www.pulseaudio.org\n"
 msgstr ""
 
-#: src/preferences.c:1502
+#: src/preferences.c:1544
 msgid "PCM (highest quality; largest files)"
 msgstr ""
 
-#: src/preferences.c:2063
+#: src/preferences.c:2096
 msgid "LiVES: - Preferences"
 msgstr ""
 
-#: src/preferences.c:2142
+#: src/preferences.c:2177
 msgid "Open file selection maximised"
 msgstr ""
 
-#: src/preferences.c:2149
+#: src/preferences.c:2184
 msgid "Show recent files in the File menu"
 msgstr ""
 
-#: src/preferences.c:2158
+#: src/preferences.c:2193
 msgid "Stop screensaver on playback    "
 msgstr ""
 
-#: src/preferences.c:2165
+#: src/preferences.c:2200
 msgid "Open main window maximised"
 msgstr ""
 
-#: src/preferences.c:2173
+#: src/preferences.c:2208
 msgid "Show toolbar when background is blanked"
 msgstr ""
 
-#: src/preferences.c:2181
+#: src/preferences.c:2216
 msgid "Allow mouse wheel to switch clips"
 msgstr ""
 
-#: src/preferences.c:2192
+#: src/preferences.c:2227
 msgid "Shrink previews to fit in interface"
 msgstr ""
 
-#: src/preferences.c:2202
+#: src/preferences.c:2237
 msgid "Startup mode:"
 msgstr ""
 
-#: src/preferences.c:2206
+#: src/preferences.c:2241
 msgid "_Clip editor"
 msgstr ""
 
-#: src/preferences.c:2210
+#: src/preferences.c:2245
 msgid "_Multitrack mode"
 msgstr ""
 
-#: src/preferences.c:2234
+#: src/preferences.c:2268
 msgid "Multi-head support"
 msgstr ""
 
-#: src/preferences.c:2242
+#: src/preferences.c:2276
 msgid " monitor number for LiVES interface"
 msgstr ""
 
-#: src/preferences.c:2248
+#: src/preferences.c:2282
 msgid " monitor number for playback"
 msgstr ""
 
-#: src/preferences.c:2260
+#: src/preferences.c:2294
 msgid ""
 "A setting of 0 means use all available monitors (only works with some "
 "playback plugins)."
 msgstr ""
 
-#: src/preferences.c:2270
+#: src/preferences.c:2304
 msgid "Force single monitor"
 msgstr ""
 
-#: src/preferences.c:2271
+#: src/preferences.c:2305
 msgid "Ignore all except the first monitor."
 msgstr ""
 
-#: src/preferences.c:2293
+#: src/preferences.c:2327
 msgid "Show clip thumbnails during playback"
 msgstr ""
 
-#: src/preferences.c:2306
+#: src/preferences.c:2340
 msgid "GUI"
 msgstr "واجهة مستعمل رسومية"
 
-#: src/preferences.c:2321
+#: src/preferences.c:2355
 msgid "When entering Multitrack mode:"
 msgstr ""
 
-#: src/preferences.c:2330
+#: src/preferences.c:2364
 msgid "_Prompt me for width, height, fps and audio settings"
 msgstr ""
 
-#: src/preferences.c:2336
+#: src/preferences.c:2370
 msgid "_Always use the following values:"
 msgstr ""
 
-#: src/preferences.c:2345
+#: src/preferences.c:2379
 msgid "Use these same _values for rendering a new clip"
 msgstr ""
 
-#: src/preferences.c:2370
+#: src/preferences.c:2404
 msgid "_Width           "
 msgstr ""
 
-#: src/preferences.c:2375
+#: src/preferences.c:2409
 msgid "          _Height      "
 msgstr ""
 
-#: src/preferences.c:2379
+#: src/preferences.c:2413
 msgid "          _FPS"
 msgstr ""
 
-#: src/preferences.c:2387
+#: src/preferences.c:2421
 msgid "Enable backing audio track"
 msgstr ""
 
-#: src/preferences.c:2394
+#: src/preferences.c:2428
 msgid "Audio track per video track"
 msgstr ""
 
-#: src/preferences.c:2423
+#: src/preferences.c:2457
 msgid "    _Undo buffer size (MB)    "
 msgstr ""
 
-#: src/preferences.c:2432
+#: src/preferences.c:2466
 msgid "_Exit multitrack mode after rendering"
 msgstr ""
 
-#: src/preferences.c:2440
+#: src/preferences.c:2474
 msgid "Auto backup layouts"
 msgstr ""
 
-#: src/preferences.c:2445
+#: src/preferences.c:2479
 msgid "_Every"
 msgstr ""
 
-#: src/preferences.c:2453
+#: src/preferences.c:2487
 msgid "seconds"
 msgstr "ثوان"
 
-#: src/preferences.c:2461
+#: src/preferences.c:2495
 msgid "After every _change"
 msgstr ""
 
-#: src/preferences.c:2467
+#: src/preferences.c:2501
 msgid "_Never"
 msgstr "أ_بدًا"
 
-#: src/preferences.c:2490
+#: src/preferences.c:2523
 msgid "Multitrack/Render"
 msgstr ""
 
-#: src/preferences.c:2508
+#: src/preferences.c:2541
 msgid "Use instant opening when possible"
 msgstr ""
 
-#: src/preferences.c:2509
+#: src/preferences.c:2543
 msgid "Enable instant opening of some file types using decoder plugins"
 msgstr ""
 
-#: src/preferences.c:2531
+#: src/preferences.c:2567
 msgid "Video open command (fallback)"
 msgstr ""
 
-#: src/preferences.c:2543
+#: src/preferences.c:2579
 msgid "Open/render compression"
 msgstr ""
 
-#: src/preferences.c:2546
+#: src/preferences.c:2582
 msgid " %     ( lower = slower, larger files; for jpeg, higher quality )"
 msgstr ""
 
-#: src/preferences.c:2558
+#: src/preferences.c:2594
 msgid "Default image format"
 msgstr ""
 
-#: src/preferences.c:2562
+#: src/preferences.c:2598
 msgid "_jpeg"
 msgstr ""
 
-#: src/preferences.c:2565
+#: src/preferences.c:2601
 msgid "_png"
 msgstr ""
 
-#: src/preferences.c:2572
+#: src/preferences.c:2608
 msgid "(Check Help/Troubleshoot to see which image formats are supported)"
 msgstr ""
 
-#: src/preferences.c:2580
+#: src/preferences.c:2616
 msgid "Enable automatic deinterlacing when possible"
 msgstr ""
 
-#: src/preferences.c:2582
+#: src/preferences.c:2619
 msgid "Automatically deinterlace frames when a plugin suggests it"
 msgstr ""
 
-#: src/preferences.c:2593
+#: src/preferences.c:2632
 msgid "Automatic trimming / padding of audio when possible"
 msgstr ""
 
-#: src/preferences.c:2595
+#: src/preferences.c:2634
 msgid "Automatically trim or pad audio when a plugin suggests it"
 msgstr ""
 
-#: src/preferences.c:2606
+#: src/preferences.c:2646
 msgid "Ignore blank borders when possible"
 msgstr ""
 
-#: src/preferences.c:2608
+#: src/preferences.c:2648
 msgid "Clip any blank borders from frames where possible"
 msgstr ""
 
-#: src/preferences.c:2619
+#: src/preferences.c:2660
 msgid "When opening multiple files, concatenate images into one clip"
 msgstr ""
 
-#: src/preferences.c:2629
+#: src/preferences.c:2670
 msgid "Decoding"
 msgstr ""
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:2652
+#: src/preferences.c:2693
 msgid "Low - can improve performance on slower machines"
 msgstr ""
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:2654
+#: src/preferences.c:2695
 msgid "Normal - recommended for most users"
 msgstr ""
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:2656
+#: src/preferences.c:2697
 msgid "High - can improve quality on very fast machines"
 msgstr ""
 
-#: src/preferences.c:2659
+#: src/preferences.c:2700
 msgid "Preview _quality"
 msgstr ""
 
-#: src/preferences.c:2660
+#: src/preferences.c:2701
 msgid "The preview quality for video playback - affects resizing"
 msgstr ""
 
-#: src/preferences.c:2675
+#: src/preferences.c:2717
 msgid "_Show FPS statistics"
 msgstr ""
 
-#: src/preferences.c:2694
+#: src/preferences.c:2736
 msgid "_Plugin"
 msgstr ""
 
-#: src/preferences.c:2718
+#: src/preferences.c:2760
 msgid "Stream audio"
 msgstr ""
 
-#: src/preferences.c:2721
+#: src/preferences.c:2763
 msgid "Stream audio to playback plugin"
 msgstr ""
 
-#: src/preferences.c:2734
+#: src/preferences.c:2778
 msgid "Record player output"
 msgstr ""
 
-#: src/preferences.c:2737
+#: src/preferences.c:2781
 msgid "Record output from player instead of input to player"
 msgstr ""
 
-#: src/preferences.c:2744
+#: src/preferences.c:2789
 msgid "VIDEO"
 msgstr ""
 
-#: src/preferences.c:2787
+#: src/preferences.c:2833
 msgid "_Player"
 msgstr ""
 
-#: src/preferences.c:2792
+#: src/preferences.c:2838
 msgid "(See also the Jack Integration tab for jack startup options)"
 msgstr ""
 
-#: src/preferences.c:2819
+#: src/preferences.c:2865
 msgid "mplayer"
 msgstr ""
 
-#: src/preferences.c:2830
+#: src/preferences.c:2876
 msgid "mplayer2"
 msgstr ""
 
-#: src/preferences.c:2833
+#: src/preferences.c:2879
 msgid "Audio play _command"
 msgstr ""
 
-#: src/preferences.c:2840
+#: src/preferences.c:2886
 msgid "- internal -"
 msgstr ""
 
-#: src/preferences.c:2849
+#: src/preferences.c:2895
 msgid "Audio follows video _rate/direction"
 msgstr ""
 
-#: src/preferences.c:2857
+#: src/preferences.c:2903
 msgid "Audio follows _clip switches"
 msgstr ""
 
-#: src/preferences.c:2864
+#: src/preferences.c:2910
 msgid "Source:"
 msgstr ""
 
-#: src/preferences.c:2868
+#: src/preferences.c:2914
 msgid "_Internal"
 msgstr ""
 
-#: src/preferences.c:2873
+#: src/preferences.c:2919
 msgid "_External (requires jack or pulse audio player)"
 msgstr ""
 
-#: src/preferences.c:2892
+#: src/preferences.c:2940
 msgid "AUDIO"
 msgstr ""
 
-#: src/preferences.c:2902
+#: src/preferences.c:2950
 msgid "Playback"
 msgstr "تشغيل"
 
-#: src/preferences.c:2925
+#: src/preferences.c:2973
 msgid ""
 "Record audio when capturing an e_xternal window\n"
 " (requires jack or pulse audio)"
 msgstr ""
 
-#: src/preferences.c:2940
+#: src/preferences.c:2988
 msgid "      What to record when 'r' is pressed   "
 msgstr ""
 
-#: src/preferences.c:2949
+#: src/preferences.c:2997
 msgid "_Frame changes"
 msgstr ""
 
-#: src/preferences.c:2964
+#: src/preferences.c:3012
 msgid "F_PS changes"
 msgstr ""
 
-#: src/preferences.c:2982
+#: src/preferences.c:3030
 msgid "_Real time effects"
 msgstr ""
 
-#: src/preferences.c:2993
+#: src/preferences.c:3041
 msgid "_Clip switches"
 msgstr ""
 
-#: src/preferences.c:3004
+#: src/preferences.c:3052
 msgid "_Audio (requires jack or pulse audio player)"
 msgstr ""
 
-#: src/preferences.c:3024
+#: src/preferences.c:3072
 msgid "Pause recording if free disk space falls below"
 msgstr ""
 
 #. TRANSLATORS: gigabytes
-#: src/preferences.c:3030
+#: src/preferences.c:3078
 msgid "GB"
 msgstr ""
 
-#: src/preferences.c:3037
+#: src/preferences.c:3085
 msgid "Recording"
 msgstr "يجري التسجيل"
 
-#: src/preferences.c:3055
+#: src/preferences.c:3103
 msgid "Encoder"
 msgstr ""
 
-#: src/preferences.c:3090
+#: src/preferences.c:3137
 msgid "Output format"
 msgstr ""
 
-#: src/preferences.c:3106
+#: src/preferences.c:3153
 msgid "Audio codec"
 msgstr "كوديك الصوت"
 
-#: src/preferences.c:3119
+#: src/preferences.c:3165
 msgid "Encoding"
 msgstr "الترميز"
 
-#: src/preferences.c:3134
+#: src/preferences.c:3180
 msgid "Use _antialiasing when resizing"
 msgstr ""
 
-#: src/preferences.c:3143
+#: src/preferences.c:3189
 msgid "Number of _real time effect keys"
 msgstr ""
 
-#: src/preferences.c:3145
+#: src/preferences.c:3192
 msgid ""
 "The number of \"virtual\" real time effect keys. They can be controlled "
 "through the real time effects window, or via network (OSC)."
 msgstr ""
 
-#: src/preferences.c:3152
+#: src/preferences.c:3199
 msgid "Use _threads where possible when applying effects"
 msgstr ""
 
-#: src/preferences.c:3159
+#: src/preferences.c:3207
 msgid "Number of _threads"
 msgstr ""
 
-#: src/preferences.c:3172
+#: src/preferences.c:3221
 msgid "Restart is required if any of the following paths are changed:"
 msgstr ""
 
-#: src/preferences.c:3182
+#: src/preferences.c:3231
 msgid "Weed plugin path"
 msgstr ""
 
-#: src/preferences.c:3184
+#: src/preferences.c:3234
 msgid "Frei0r plugin path"
 msgstr ""
 
-#: src/preferences.c:3186
+#: src/preferences.c:3237
 msgid "LADSPA plugin path"
 msgstr ""
 
-#: src/preferences.c:3209
+#: src/preferences.c:3261
 msgid "      Video load directory (default)      "
 msgstr ""
 
-#: src/preferences.c:3215
+#: src/preferences.c:3267
 msgid "      Video save directory (default) "
 msgstr ""
 
-#: src/preferences.c:3221
+#: src/preferences.c:3273
 msgid "      Audio load directory (default) "
 msgstr ""
 
-#: src/preferences.c:3227
+#: src/preferences.c:3279
 msgid "      Image directory (default) "
 msgstr ""
 
-#: src/preferences.c:3233
+#: src/preferences.c:3285
 msgid "      Backup/Restore directory (default) "
 msgstr ""
 
-#: src/preferences.c:3239
+#: src/preferences.c:3291
 msgid "      Temp directory (do not remove) "
 msgstr ""
 
-#: src/preferences.c:3252
+#: src/preferences.c:3304
 msgid "The default directory for loading video clips from"
 msgstr ""
 
-#: src/preferences.c:3277
+#: src/preferences.c:3329
 msgid "The default directory for saving encoded clips to"
 msgstr ""
 
-#: src/preferences.c:3285
+#: src/preferences.c:3337
 msgid "The default directory for loading and saving audio"
 msgstr ""
 
-#: src/preferences.c:3293
+#: src/preferences.c:3345
 msgid "The default directory for saving frameshots to"
 msgstr ""
 
-#: src/preferences.c:3301
+#: src/preferences.c:3353
 msgid "The default directory for backing up/restoring single clips"
 msgstr ""
 
-#: src/preferences.c:3309
+#: src/preferences.c:3361
 msgid "LiVES working directory."
 msgstr ""
 
-#: src/preferences.c:3359
+#: src/preferences.c:3412
 msgid "Directories"
 msgstr "مجلد الحفظ"
 
-#: src/preferences.c:3374
+#: src/preferences.c:3427
 msgid "Warn if diskspace falls below: "
 msgstr ""
 
-#: src/preferences.c:3380 src/preferences.c:3394
+#: src/preferences.c:3433 src/preferences.c:3447
 msgid " MB [set to 0 to disable]"
 msgstr ""
 
-#: src/preferences.c:3389
+#: src/preferences.c:3442
 msgid "Diskspace critical level: "
 msgstr ""
 
-#: src/preferences.c:3407
+#: src/preferences.c:3461
 msgid ""
 "Warn on Insert / Merge if _frame rate of clipboard does not match frame rate "
 "of selection"
 msgstr ""
 
-#: src/preferences.c:3417
+#: src/preferences.c:3471
 msgid "Warn on Open if file _size exceeds "
 msgstr ""
 
-#: src/preferences.c:3425
+#: src/preferences.c:3479
 msgid " MB"
 msgstr " م بايت"
 
-#: src/preferences.c:3432
+#: src/preferences.c:3486
 msgid "Show a warning before saving a se_t"
 msgstr ""
 
-#: src/preferences.c:3442
+#: src/preferences.c:3496
 msgid ""
 "Show a warning if _mplayer/mplayer2, sox, composite or convert is not found "
 "when LiVES is started."
 msgstr ""
 
-#: src/preferences.c:3452
+#: src/preferences.c:3506
 msgid "Show a warning if no _rendered effects are found at startup."
 msgstr ""
 
-#: src/preferences.c:3464
+#: src/preferences.c:3518
 msgid "Show a warning if no _encoder plugins are found at startup."
 msgstr ""
 
-#: src/preferences.c:3474
+#: src/preferences.c:3528
 msgid "Show a warning if a _duplicate set name is entered."
 msgstr ""
 
-#: src/preferences.c:3485
+#: src/preferences.c:3539
 msgid "When a set is loaded, warn if clips are missing from _layouts."
 msgstr ""
 
-#: src/preferences.c:3495
+#: src/preferences.c:3550
 msgid "Warn if a clip used in a layout is about to be closed."
 msgstr ""
 
-#: src/preferences.c:3505
+#: src/preferences.c:3561
 msgid "Warn if frames used in a layout are about to be deleted."
 msgstr ""
 
-#: src/preferences.c:3515
+#: src/preferences.c:3572
 msgid "Warn if frames used in a layout are about to be shifted."
 msgstr ""
 
-#: src/preferences.c:3525
+#: src/preferences.c:3583
 msgid "Warn if frames used in a layout are about to be altered."
 msgstr ""
 
-#: src/preferences.c:3535
+#: src/preferences.c:3594
 msgid "Warn if audio used in a layout is about to be deleted."
 msgstr ""
 
-#: src/preferences.c:3546
+#: src/preferences.c:3606
 msgid "Warn if audio used in a layout is about to be shifted."
 msgstr ""
 
-#: src/preferences.c:3556
+#: src/preferences.c:3617
 msgid "Warn if audio used in a layout is about to be altered."
 msgstr ""
 
-#: src/preferences.c:3566
+#: src/preferences.c:3628
 msgid "Popup layout errors after clip changes."
 msgstr ""
 
-#: src/preferences.c:3577
+#: src/preferences.c:3639
 msgid "Warn if the layout has not been saved when leaving multitrack mode."
 msgstr ""
 
-#: src/preferences.c:3588
+#: src/preferences.c:3650
 msgid ""
 "Warn if multitrack has no audio channels, and a layout with audio is loaded."
 msgstr ""
 
-#: src/preferences.c:3598
+#: src/preferences.c:3660
 msgid ""
 "Warn if multitrack has audio channels, and your audio player is not \"jack\" "
 "or \"pulse audio\"."
 msgstr ""
 
-#: src/preferences.c:3610
+#: src/preferences.c:3672
 msgid "Show info message after importing from firewire device."
 msgstr ""
 
-#: src/preferences.c:3626
+#: src/preferences.c:3688
 msgid "Show a warning before opening a yuv4mpeg stream (advanced)."
 msgstr ""
 
-#: src/preferences.c:3639
+#: src/preferences.c:3701
 msgid "Show a warning when multitrack is low on backup space."
 msgstr ""
 
-#: src/preferences.c:3650
+#: src/preferences.c:3713
 msgid "Show a warning advising cleaning of disk space after a crash."
 msgstr ""
 
-#: src/preferences.c:3661
+#: src/preferences.c:3725
 msgid "Show a warning if unable to connect to pulseaudio player."
 msgstr ""
 
-#: src/preferences.c:3673
+#: src/preferences.c:3737
 msgid "Show a warning before wiping a layout which has unsaved changes."
 msgstr ""
 
-#: src/preferences.c:3685
+#: src/preferences.c:3749
 msgid "Warnings"
 msgstr "تحذيرات"
 
-#: src/preferences.c:3703
+#: src/preferences.c:3767
 msgid "Midi synch (requires the files midistart and midistop)"
 msgstr ""
 
-#: src/preferences.c:3715
+#: src/preferences.c:3779
 msgid "When inserting/merging frames:  "
 msgstr ""
 
-#: src/preferences.c:3719
+#: src/preferences.c:3783
 msgid "_Speed Up/Slow Down Insertion"
 msgstr ""
 
-#: src/preferences.c:3723
+#: src/preferences.c:3787
 msgid "_Resample Insertion"
 msgstr ""
 
-#: src/preferences.c:3730
+#: src/preferences.c:3794
 msgid "CD device           "
 msgstr ""
 
-#: src/preferences.c:3733
+#: src/preferences.c:3797
 msgid "LiVES can load audio tracks from this CD"
 msgstr ""
 
-#: src/preferences.c:3746
+#: src/preferences.c:3813
 msgid "Default FPS        "
 msgstr ""
 
-#: src/preferences.c:3749
+#: src/preferences.c:3816
 msgid "Frames per second to use when none is specified"
 msgstr ""
 
-#: src/preferences.c:3757
+#: src/preferences.c:3825
 msgid "Misc"
 msgstr "متفرقات"
 
-#: src/preferences.c:3782
+#: src/preferences.c:3850
 msgid "New theme:           "
 msgstr ""
 
-#: src/preferences.c:3800
+#: src/preferences.c:3867
 msgid "Themes"
 msgstr "السِمات"
 
-#: src/preferences.c:3815
+#: src/preferences.c:3882
 msgid "Download bandwidth (Kb/s)       "
 msgstr ""
 
-#: src/preferences.c:3823
+#: src/preferences.c:3890
 msgid "LiVES must be compiled without \"configure --disable-OSC\" to use OMC"
 msgstr ""
 
-#: src/preferences.c:3833
+#: src/preferences.c:3900
 msgid "OMC remote control enabled"
 msgstr ""
 
-#: src/preferences.c:3841
+#: src/preferences.c:3908
 msgid "UDP port       "
 msgstr ""
 
-#: src/preferences.c:3850
+#: src/preferences.c:3917
 msgid "Start OMC on startup"
 msgstr ""
 
-#: src/preferences.c:3870
+#: src/preferences.c:3937
 msgid "Streaming/Networking"
 msgstr ""
 
-#: src/preferences.c:3882
+#: src/preferences.c:3949
 msgid "Jack transport"
 msgstr ""
 
-#: src/preferences.c:3886
+#: src/preferences.c:3953
 msgid ""
 "LiVES must be compiled with jack/transport.h and jack/jack.h present to use "
 "jack transport"
 msgstr ""
 
-#: src/preferences.c:3892
+#: src/preferences.c:3959
 msgid "Jack _transport config file"
 msgstr ""
 
-#: src/preferences.c:3899 src/preferences.c:3989
+#: src/preferences.c:3967 src/preferences.c:4058
 msgid "Start _server on LiVES startup"
 msgstr ""
 
-#: src/preferences.c:3911
+#: src/preferences.c:3979
 msgid "Jack transport _master (start and stop)"
 msgstr ""
 
-#: src/preferences.c:3921
+#: src/preferences.c:3989
 msgid "Jack transport _client (start and stop)"
 msgstr ""
 
-#: src/preferences.c:3935
+#: src/preferences.c:4003
 msgid "Jack transport sets start position"
 msgstr ""
 
-#: src/preferences.c:3952
+#: src/preferences.c:4020
 msgid "Jack transport timebase slave"
 msgstr ""
 
-#: src/preferences.c:3963
+#: src/preferences.c:4031
 msgid "(See also Playback -> Audio follows video rate/direction)"
 msgstr ""
 
-#: src/preferences.c:3971
+#: src/preferences.c:4039
 msgid "Jack audio"
 msgstr ""
 
-#: src/preferences.c:3975
+#: src/preferences.c:4043
 msgid "LiVES must be compiled with jack/jack.h present to use jack audio"
 msgstr ""
 
-#: src/preferences.c:3978
+#: src/preferences.c:4046
 msgid ""
 "You MUST set the audio player to \"jack\" in the Playback tab to use jack "
 "audio"
 msgstr ""
 
-#: src/preferences.c:3984
+#: src/preferences.c:4052
 msgid "Jack _audio server config file"
 msgstr ""
 
-#: src/preferences.c:3996
+#: src/preferences.c:4065
 msgid "Play audio even when transport is _paused"
 msgstr ""
 
-#: src/preferences.c:4008
+#: src/preferences.c:4077
 msgid "Automatically connect to System Out ports when 'playing' External Audio"
 msgstr ""
 
-#: src/preferences.c:4021
+#: src/preferences.c:4090
 msgid "Jack Integration"
 msgstr ""
 
-#: src/preferences.c:4035
+#: src/preferences.c:4104
 msgid "Events to respond to:"
 msgstr ""
 
-#: src/preferences.c:4044
+#: src/preferences.c:4113
 msgid "_Joystick events"
 msgstr ""
 
-#: src/preferences.c:4051
+#: src/preferences.c:4120
 msgid "_Joystick device"
 msgstr ""
 
-#: src/preferences.c:4053
+#: src/preferences.c:4122
 msgid "The joystick device, e.g. /dev/input/js0"
 msgstr ""
 
-#: src/preferences.c:4071
+#: src/preferences.c:4142
 msgid "_MIDI events"
 msgstr ""
 
-#: src/preferences.c:4080
+#: src/preferences.c:4151
 msgid "Use _ALSA MIDI (recommended)"
 msgstr ""
 
-#: src/preferences.c:4082
+#: src/preferences.c:4153
 msgid "Create an ALSA MIDI port which other MIDI devices can be connected to"
 msgstr ""
 
-#: src/preferences.c:4090
+#: src/preferences.c:4162
 msgid "Use _raw MIDI"
 msgstr ""
 
-#: src/preferences.c:4092
+#: src/preferences.c:4164
 msgid "Read directly from the MIDI device"
 msgstr ""
 
-#: src/preferences.c:4104
+#: src/preferences.c:4177
 msgid "_MIDI device"
 msgstr ""
 
-#: src/preferences.c:4106
+#: src/preferences.c:4179
 msgid "The MIDI device, e.g. /dev/input/midi0"
 msgstr ""
 
-#: src/preferences.c:4118
+#: src/preferences.c:4193
 msgid "Advanced"
 msgstr "متقدِم"
 
-#: src/preferences.c:4124
+#: src/preferences.c:4199
 msgid "MIDI check _rate"
 msgstr ""
 
-#: src/preferences.c:4127
+#: src/preferences.c:4203
 msgid ""
 "Number of MIDI checks per keyboard tick. Increasing this may improve MIDI "
 "responsiveness, but may slow down playback."
 msgstr ""
 
-#: src/preferences.c:4134
+#: src/preferences.c:4211
 msgid "MIDI repeat"
 msgstr ""
 
-#: src/preferences.c:4137
+#: src/preferences.c:4214
 msgid "Number of non-reads allowed between succesive reads."
 msgstr ""
 
-#: src/preferences.c:4140
+#: src/preferences.c:4218
 msgid "(Warning: setting this value too high can slow down playback.)"
 msgstr ""
 
-#: src/preferences.c:4159
+#: src/preferences.c:4237
 msgid "MIDI/Joystick learner"
 msgstr ""
 
-#: src/preferences.c:4499
+#: src/preferences.c:4679
 msgid ""
 "\n"
 "LiVES will now shut down. You need to restart it for the directory change to "
@@ -7605,214 +7616,214 @@
 "Click OK to continue.\n"
 msgstr ""
 
-#: src/preferences.c:4523
+#: src/preferences.c:4703
 msgid ""
 "For the directory change to take effect LiVES will restart when preferences "
 "dialog closes."
 msgstr ""
 
-#: src/preferences.c:4527
+#: src/preferences.c:4707
 msgid "Theme changes will not take effect until the next time you start LiVES."
 msgstr ""
 
-#: src/preferences.c:4531
+#: src/preferences.c:4711
 msgid "Jack options will not take effect until the next time you start LiVES."
 msgstr ""
 
-#: src/osc.c:2585
+#: src/osc.c:2616
 #, c-format
 msgid "Syncing to external framerate of %.8f frames per second.\n"
 msgstr ""
 
-#: src/osc.c:6746
+#: src/osc.c:6938
 msgid "Cannot initialize OSC receiver\n"
 msgstr ""
 
-#: src/osc.c:6770
+#: src/osc.c:6961
 #, c-format
 msgid "WARNING: Cannot start OSC server at UDP port %d\n"
 msgstr ""
 
-#: src/osc.c:6775
+#: src/osc.c:6963
 #, c-format
 msgid "Started OSC server at UDP port %d\n"
 msgstr ""
 
-#: src/osc.c:6890
+#: src/osc.c:7076
 #, c-format
 msgid "Cannot start OSC/UDP server at port %d \n"
 msgstr ""
 
-#: src/resample.c:125 src/resample.c:304
+#: src/resample.c:131 src/resample.c:305
 #, c-format
 msgid "Resizing frames 1 to %d"
 msgstr ""
 
-#: src/resample.c:140 src/resample.c:318
+#: src/resample.c:145 src/resample.c:318
 #, c-format
 msgid "Resizing/letterboxing frames 1 to %d"
 msgstr ""
 
-#: src/resample.c:361 src/resample.c:385
+#: src/resample.c:360 src/resample.c:384
 msgid "Resize"
 msgstr "أعد التحجيم"
 
-#: src/resample.c:395
+#: src/resample.c:394
 msgid "Resample/Resize"
 msgstr ""
 
-#: src/resample.c:680
+#: src/resample.c:676
 #, c-format
 msgid "Length of video is now %d frames.\n"
 msgstr ""
 
-#: src/resample.c:745
+#: src/resample.c:737
 msgid ""
 "\n"
 "\n"
 "New rate must be greater than 0\n"
 msgstr ""
 
-#: src/resample.c:797 src/resample.c:813
+#: src/resample.c:788 src/resample.c:803
 msgid "Resampling audio"
 msgstr ""
 
-#: src/resample.c:831
+#: src/resample.c:821
 msgid "LiVES was unable to resample the audio as requested.\n"
 msgstr ""
 
-#: src/resample.c:833 src/resample.c:837
+#: src/resample.c:823 src/resample.c:827
 msgid "Resample Audio"
 msgstr ""
 
-#: src/resample.c:845
+#: src/resample.c:835
 #, c-format
 msgid "Audio was resampled to %d Hz, %d channels, %d bit"
 msgstr ""
 
-#: src/resample.c:1034
+#: src/resample.c:1016
 #, c-format
 msgid "Resampling video at %.8f frames per second..."
 msgstr ""
 
-#: src/resample.c:1037
+#: src/resample.c:1018
 #, c-format
 msgid "Resampling video at %.3f frames per second..."
 msgstr ""
 
-#: src/resample.c:1068
+#: src/resample.c:1049
 msgid "Reordering error !\n"
 msgstr ""
 
-#: src/resample.c:1079
+#: src/resample.c:1060
 msgid "Resample"
 msgstr "إعاده التشكيل"
 
-#: src/resample.c:1192
+#: src/resample.c:1173
 msgid "LiVES: - Resample Audio"
 msgstr ""
 
-#: src/resample.c:1195
+#: src/resample.c:1175
 msgid "LiVES: - Insert Silence"
 msgstr ""
 
-#: src/resample.c:1198
+#: src/resample.c:1177
 msgid "LiVES: - New Clip Audio"
 msgstr ""
 
-#: src/resample.c:1201
+#: src/resample.c:1179
 msgid "LiVES: - External Clip Settings"
 msgstr ""
 
-#: src/resample.c:1238 src/resample.c:1358
+#: src/resample.c:1215 src/resample.c:1332
 msgid "Rate (Hz) "
 msgstr ""
 
-#: src/resample.c:1245 src/resample.c:1372
+#: src/resample.c:1222 src/resample.c:1346
 msgid "Channels"
 msgstr ""
 
-#: src/resample.c:1252
+#: src/resample.c:1229
 msgid "Sample Size "
 msgstr ""
 
-#: src/resample.c:1268 src/resample.c:1425
+#: src/resample.c:1245 src/resample.c:1399
 msgid "Signed"
 msgstr ""
 
-#: src/resample.c:1274 src/resample.c:1435
+#: src/resample.c:1251 src/resample.c:1409
 msgid "Unsigned"
 msgstr "غير موقّع"
 
-#: src/resample.c:1297 src/resample.c:1460
+#: src/resample.c:1273 src/resample.c:1433
 msgid "Little Endian"
 msgstr ""
 
-#: src/resample.c:1303 src/resample.c:1468
+#: src/resample.c:1279 src/resample.c:1441
 msgid "Big Endian"
 msgstr ""
 
-#: src/resample.c:1315
+#: src/resample.c:1290
 msgid "Current"
 msgstr "الحالي"
 
-#: src/resample.c:1340
+#: src/resample.c:1315
 msgid "_Enable audio"
 msgstr ""
 
-#: src/resample.c:1372
+#: src/resample.c:1346
 msgid "_Channels"
 msgstr ""
 
-#: src/resample.c:1394
+#: src/resample.c:1368
 msgid "_Sample Size"
 msgstr ""
 
-#: src/resample.c:1394
+#: src/resample.c:1368
 msgid "Sample Size"
 msgstr ""
 
-#: src/resample.c:1489
+#: src/resample.c:1461
 msgid "New"
 msgstr "جديد"
 
-#: src/resample.c:1512
+#: src/resample.c:1484
 msgid "_Frames Per Second "
 msgstr ""
 
-#: src/resample.c:1530
+#: src/resample.c:1502
 msgid "Record for maximum:  "
 msgstr ""
 
-#: src/resample.c:1533
+#: src/resample.c:1505
 msgid " hours  "
 msgstr ""
 
-#: src/resample.c:1536
+#: src/resample.c:1508
 msgid " minutes  "
 msgstr ""
 
-#: src/resample.c:1538
+#: src/resample.c:1510
 msgid " seconds  "
 msgstr ""
 
-#: src/resample.c:1545
+#: src/resample.c:1517
 msgid "Unlimited"
 msgstr "غير محدود"
 
-#: src/resample.c:1561
+#: src/resample.c:1533
 msgid "Click OK to begin recording, or Cancel to quit."
 msgstr ""
 
-#: src/resample.c:1670
+#: src/resample.c:1638
 msgid "LiVES: - Change playback speed"
 msgstr ""
 
-#: src/resample.c:1673
+#: src/resample.c:1640
 msgid "LiVES: - Resample Video"
 msgstr ""
 
-#: src/resample.c:1696
+#: src/resample.c:1663
 #, c-format
 msgid ""
 "\n"
@@ -7823,7 +7834,7 @@
 "in _frames per second"
 msgstr ""
 
-#: src/resample.c:1701
+#: src/resample.c:1667
 #, c-format
 msgid ""
 "\n"
@@ -7834,89 +7845,89 @@
 "in frames per second"
 msgstr ""
 
-#: src/resample.c:1723
+#: src/resample.c:1688
 msgid "OR enter the desired clip length in _seconds"
 msgstr ""
 
-#: src/resample.c:1745
+#: src/resample.c:1710
 msgid "Change the _audio speed as well"
 msgstr ""
 
-#: src/resample.c:1846
+#: src/resample.c:1810
 msgid ""
 "\n"
 "Speeding up the clip will cause missing frames in some multitrack layouts.\n"
 "Are you sure you wish to change the speed ?\n"
 msgstr ""
 
-#: src/resample.c:1863
+#: src/resample.c:1829
 msgid ""
 "\n"
 "Speeding up the clip will cause missing audio in some multitrack layouts.\n"
 "Are you sure you wish to change the speed ?\n"
 msgstr ""
 
-#: src/resample.c:1878
+#: src/resample.c:1847
 msgid ""
 "\n"
 "Changing the speed will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/resample.c:1892
+#: src/resample.c:1863
 msgid ""
 "\n"
 "Changing the speed will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/resample.c:1938
+#: src/resample.c:1911
 msgid "Speed Change"
 msgstr ""
 
-#: src/resample.c:1947
+#: src/resample.c:1920
 #, c-format
 msgid "Changed playback speed to %.3f frames per second and audio to %d Hz.\n"
 msgstr ""
 
-#: src/resample.c:1950
+#: src/resample.c:1922
 #, c-format
 msgid "Changed playback speed to %.3f frames per second.\n"
 msgstr ""
 
-#: src/resample.c:2035
+#: src/resample.c:2006
 msgid "Resampling video"
 msgstr ""
 
-#: src/resample.c:2042 src/resample.c:2160 src/resample.c:2182
+#: src/resample.c:2012 src/resample.c:2127 src/resample.c:2148
 msgid "Resampling clipboard video"
 msgstr ""
 
-#: src/resample.c:2047
+#: src/resample.c:2016
 msgid "Reordering frames"
 msgstr ""
 
-#: src/resample.c:2056
+#: src/resample.c:2025
 msgid ""
 "\n"
 "\n"
 "LiVES was unable to reorder the frames."
 msgstr ""
 
-#: src/resample.c:2104
+#: src/resample.c:2071
 msgid "Deordering frames"
 msgstr ""
 
-#: src/resample.c:2199
+#: src/resample.c:2165
 msgid "resampling error..."
 msgstr ""
 
-#: src/rte_window.c:85 src/rte_window.c:1708
+#: src/rte_window.c:124 src/rte_window.c:1709
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
-#: src/rte_window.c:112
+#: src/rte_window.c:150
 msgid ""
 "\n"
 "\n"
@@ -7926,7 +7937,7 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:426
+#: src/rte_window.c:460
 msgid ""
 "\n"
 "\n"
@@ -7934,19 +7945,19 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:432
+#: src/rte_window.c:466
 #, c-format
 msgid "Saving keymap to %s\n"
 msgstr ""
 
-#: src/rte_window.c:439
+#: src/rte_window.c:471
 #, c-format
 msgid ""
 "\n"
 "Updating keymap file %s..."
 msgstr ""
 
-#: src/rte_window.c:446
+#: src/rte_window.c:477
 #, c-format
 msgid ""
 "\n"
@@ -7956,12 +7967,12 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/rte_window.c:526
+#: src/rte_window.c:556
 #, c-format
 msgid "Saving real time effect defaults to %s..."
 msgstr ""
 
-#: src/rte_window.c:535
+#: src/rte_window.c:563
 #, c-format
 msgid ""
 "\n"
@@ -7971,22 +7982,22 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/rte_window.c:632
+#: src/rte_window.c:657
 #, c-format
 msgid "Loading real time effect defaults from %s..."
 msgstr ""
 
-#: src/rte_window.c:681
+#: src/rte_window.c:701
 #, c-format
 msgid "Loading generator default sizes from %s..."
 msgstr ""
 
-#: src/rte_window.c:1306
+#: src/rte_window.c:1319
 #, c-format
 msgid "Loading default keymap from %s..."
 msgstr ""
 
-#: src/rte_window.c:1329
+#: src/rte_window.c:1339
 #, c-format
 msgid ""
 "\n"
@@ -7996,48 +8007,48 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/rte_window.c:1403
+#: src/rte_window.c:1412
 #, c-format
 msgid "Invalid line %d in %s\n"
 msgstr ""
 
-#: src/rte_window.c:1483
+#: src/rte_window.c:1490
 #, c-format
 msgid "Invalid key %d in %s\n"
 msgstr ""
 
-#: src/rte_window.c:1498
+#: src/rte_window.c:1505
 #, c-format
 msgid "Invalid effect %s in %s\n"
 msgstr ""
 
-#: src/rte_window.c:1517
+#: src/rte_window.c:1524
 #, c-format
 msgid "Unknown effect %s in %s\n"
 msgstr ""
 
-#: src/rte_window.c:1535
+#: src/rte_window.c:1542
 #, c-format
 msgid ""
 "This version of LiVES cannot mix generators/non-generators on the same key "
 "(%d) !\n"
 msgstr ""
 
-#: src/rte_window.c:1547
+#: src/rte_window.c:1554
 #, c-format
 msgid "Too many effects bound to key %d.\n"
 msgstr ""
 
-#: src/rte_window.c:1587
+#: src/rte_window.c:1593
 msgid "update required.\n"
 msgstr ""
 
-#: src/rte_window.c:1603
+#: src/rte_window.c:1607
 #, c-format
 msgid "Loading data connection map from %s..."
 msgstr ""
 
-#: src/rte_window.c:1612
+#: src/rte_window.c:1614
 msgid ""
 "\n"
 "\n"
@@ -8045,41 +8056,41 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:1691
+#: src/rte_window.c:1692
 #, c-format
 msgid "LiVES: Information for %s"
 msgstr ""
 
-#: src/rte_window.c:1704
+#: src/rte_window.c:1705
 #, c-format
 msgid "Effect name: %s"
 msgstr ""
 
-#: src/rte_window.c:1712
+#: src/rte_window.c:1713
 #, c-format
 msgid "Plugin name: %s"
 msgstr ""
 
-#: src/rte_window.c:1716
+#: src/rte_window.c:1717
 #, c-format
 msgid "Author: %s"
 msgstr ""
 
-#: src/rte_window.c:1721
+#: src/rte_window.c:1722
 #, c-format
 msgid "and: %s"
 msgstr ""
 
-#: src/rte_window.c:1726
+#: src/rte_window.c:1727
 #, c-format
 msgid "Version: %d"
 msgstr ""
 
-#: src/rte_window.c:1734
+#: src/rte_window.c:1735
 msgid "Description: "
 msgstr "الوصف: "
 
-#: src/rte_window.c:1960
+#: src/rte_window.c:1963
 msgid ""
 "\n"
 "\n"
@@ -8088,69 +8099,69 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:2024
+#: src/rte_window.c:2027
 #, c-format
 msgid "LiVES could not locate the effect %s.\n"
 msgstr ""
 
-#: src/rte_window.c:2225
+#: src/rte_window.c:2216
 msgid "LiVES: Real time effect mapping"
 msgstr ""
 
-#: src/rte_window.c:2257
+#: src/rte_window.c:2248
 #, c-format
 msgid "Ctrl-%d"
 msgstr ""
 
-#: src/rte_window.c:2264
+#: src/rte_window.c:2255
 msgid "Key active"
 msgstr ""
 
-#: src/rte_window.c:2279
+#: src/rte_window.c:2271
 msgid "Key grab"
 msgstr ""
 
-#: src/rte_window.c:2280
+#: src/rte_window.c:2272
 msgid "Grab keyboard for this effect key"
 msgstr ""
 
-#: src/rte_window.c:2290
+#: src/rte_window.c:2283
 msgid "_Clear all effects"
 msgstr ""
 
-#: src/rte_window.c:2304
+#: src/rte_window.c:2297
 msgid "Mode active"
 msgstr ""
 
-#: src/rte_window.c:2314 src/multitrack.c:8568
+#: src/rte_window.c:2307 src/multitrack.c:8762
 msgid "Info"
 msgstr "معلومات"
 
-#: src/rte_window.c:2315
+#: src/rte_window.c:2308
 msgid "Set Parameters"
 msgstr ""
 
-#: src/rte_window.c:2316
+#: src/rte_window.c:2309
 msgid "Set Connections"
 msgstr ""
 
-#: src/rte_window.c:2317
+#: src/rte_window.c:2310
 msgid "Clear"
 msgstr "امح"
 
-#: src/rte_window.c:2326
+#: src/rte_window.c:2319
 msgid "Effect name:"
 msgstr ""
 
-#: src/rte_window.c:2391
+#: src/rte_window.c:2384
 msgid "_Save as default keymap"
 msgstr ""
 
-#: src/rte_window.c:2396
+#: src/rte_window.c:2389
 msgid "_Load default keymap"
 msgstr ""
 
-#: src/rte_window.c:2840
+#: src/rte_window.c:2833
 #, c-format
 msgid ""
 "Unable to create default keymap file: %s\n"
@@ -8208,86 +8219,86 @@
 msgid "none\n"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:494
+#: src/lives-yuv4mpeg.c:493
 #, c-format
 msgid ""
 "Unable to set display framerate to %.3f fps.\n"
 "\n"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:503
+#: src/lives-yuv4mpeg.c:502
 #, c-format
 msgid "Unable to open yuv4mpeg out stream %s\n"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:628
+#: src/lives-yuv4mpeg.c:626
 #, c-format
 msgid "TV card %d"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:713
+#: src/lives-yuv4mpeg.c:710
 #, c-format
 msgid "Opened TV card %d (%s)"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:760
+#: src/lives-yuv4mpeg.c:757
 #, c-format
 msgid "Firewire card %d"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:796
+#: src/lives-yuv4mpeg.c:793
 #, c-format
 msgid "Opened firewire card %d"
 msgstr ""
 
-#: src/multitrack.c:666
+#: src/multitrack.c:736
 msgid "Auto backup"
 msgstr ""
 
-#: src/multitrack.c:868
+#: src/multitrack.c:935
 msgid "Backing audio"
 msgstr ""
 
-#: src/multitrack.c:1435
+#: src/multitrack.c:1515
 #, c-format
 msgid "%s : parameters for %s"
 msgstr ""
 
-#: src/multitrack.c:1809 src/multitrack.c:3483
+#: src/multitrack.c:1881 src/multitrack.c:3635
 #, c-format
 msgid "Current track: %s (layer %d)\n"
 msgstr ""
 
-#: src/multitrack.c:1813 src/multitrack.c:3484
+#: src/multitrack.c:1885 src/multitrack.c:3637
 msgid "Current track: Backing audio\n"
 msgstr ""
 
-#: src/multitrack.c:1814
+#: src/multitrack.c:1886
 #, c-format
 msgid "Current track: Layer %d audio\n"
 msgstr ""
 
-#: src/multitrack.c:1817
+#: src/multitrack.c:1889
 #, c-format
 msgid "%.2f sec.\n"
 msgstr ""
 
-#: src/multitrack.c:1822 src/multitrack.c:3490
+#: src/multitrack.c:1894 src/multitrack.c:3643
 #, c-format
 msgid "Source: %s"
 msgstr ""
 
-#: src/multitrack.c:1825 src/multitrack.c:3492
+#: src/multitrack.c:1897 src/multitrack.c:3645
 msgid "Right click for context menu.\n"
 msgstr ""
 
-#: src/multitrack.c:1827
+#: src/multitrack.c:1899
 msgid ""
 "Double click on a block\n"
 "to select it."
 msgstr ""
 
-#: src/multitrack.c:3312
+#: src/multitrack.c:3452
 msgid ""
 "\n"
 "\n"
@@ -8296,7 +8307,7 @@
 "right or double clicking on it.\n"
 msgstr ""
 
-#: src/multitrack.c:3315
+#: src/multitrack.c:3455
 msgid ""
 "\n"
 "\n"
@@ -8304,14 +8315,14 @@
 "Select an effect in FX stack first to view its parameters.\n"
 msgstr ""
 
-#: src/multitrack.c:3318
+#: src/multitrack.c:3458
 msgid ""
 "\n"
 "\n"
 "No clips loaded.\n"
 msgstr ""
 
-#: src/multitrack.c:3321
+#: src/multitrack.c:3462
 msgid ""
 "You must select two video tracks\n"
 "and a time region\n"
@@ -8321,7 +8332,7 @@
 "before inserting clips into the timeline."
 msgstr ""
 
-#: src/multitrack.c:3324
+#: src/multitrack.c:3465
 msgid ""
 "\n"
 "\n"
@@ -8330,210 +8341,210 @@
 "to apply compositors.\n"
 msgstr ""
 
-#: src/multitrack.c:3487
+#: src/multitrack.c:3640
 #, c-format
 msgid "%.2f sec. to %.2f sec.\n"
 msgstr ""
 
-#: src/multitrack.c:3493
+#: src/multitrack.c:3646
 msgid ""
 "Single click on timeline\n"
 "to select a frame.\n"
 msgstr ""
 
-#: src/multitrack.c:3711 src/multitrack.c:6790
+#: src/multitrack.c:3858 src/multitrack.c:6972
 #, c-format
 msgid "%s [unstable]"
 msgstr ""
 
-#: src/multitrack.c:3822
+#: src/multitrack.c:3973
 msgid ""
 "You can click and drag\n"
 "below the timeline"
 msgstr ""
 
-#: src/multitrack.c:3823
+#: src/multitrack.c:3974
 msgid "to select a time region.\n"
 msgstr ""
 
-#: src/multitrack.c:3985
+#: src/multitrack.c:4137
 msgid "LiVES: Selected clip"
 msgstr ""
 
-#: src/multitrack.c:3993
+#: src/multitrack.c:4145
 msgid "_Adjust start and end points"
 msgstr ""
 
-#: src/multitrack.c:4002
+#: src/multitrack.c:4154
 msgid "_Edit/encode in clip editor"
 msgstr ""
 
-#: src/multitrack.c:4009
+#: src/multitrack.c:4161
 msgid "_Show clip information"
 msgstr ""
 
-#: src/multitrack.c:4016
+#: src/multitrack.c:4168
 msgid "_Close this clip"
 msgstr ""
 
-#: src/multitrack.c:4236
+#: src/multitrack.c:4388
 msgid "Audio mixer (ctrl-m)"
 msgstr ""
 
-#: src/multitrack.c:4336
+#: src/multitrack.c:4488
 msgid "Single click on timeline"
 msgstr ""
 
-#: src/multitrack.c:4337
+#: src/multitrack.c:4489
 msgid "to select a frame."
 msgstr ""
 
-#: src/multitrack.c:4338
+#: src/multitrack.c:4490
 msgid "Double click or right click on timeline"
 msgstr ""
 
-#: src/multitrack.c:4339
+#: src/multitrack.c:4491
 msgid "to select a block."
 msgstr ""
 
-#: src/multitrack.c:4340
+#: src/multitrack.c:4492
 msgid "Clips can be dragged"
 msgstr ""
 
-#: src/multitrack.c:4341
+#: src/multitrack.c:4493
 msgid "onto the timeline."
 msgstr ""
 
-#: src/multitrack.c:4343
+#: src/multitrack.c:4495
 msgid "Mouse mode is: Move"
 msgstr ""
 
-#: src/multitrack.c:4344
+#: src/multitrack.c:4496
 msgid "clips can be moved around."
 msgstr ""
 
-#: src/multitrack.c:4349
+#: src/multitrack.c:4500
 msgid "Mouse mode is: Select."
 msgstr ""
 
-#: src/multitrack.c:4350
+#: src/multitrack.c:4501
 msgid "Drag with mouse on timeline"
 msgstr ""
 
-#: src/multitrack.c:4351
+#: src/multitrack.c:4502
 msgid "to select tracks and time."
 msgstr ""
 
-#: src/multitrack.c:4362
+#: src/multitrack.c:4509
 msgid "_Insert mode: Normal"
 msgstr ""
 
-#: src/multitrack.c:4378
+#: src/multitrack.c:4537
 msgid "_Mouse mode: Move"
 msgstr ""
 
-#: src/multitrack.c:4382
+#: src/multitrack.c:4540
 msgid "_Mouse mode: Select"
 msgstr ""
 
-#: src/multitrack.c:4405 src/multitrack.c:7925
+#: src/multitrack.c:4563 src/multitrack.c:8104
 msgid "Gravity: Normal"
 msgstr ""
 
-#: src/multitrack.c:4409
+#: src/multitrack.c:4565
 msgid "Gravity: Left"
 msgstr ""
 
-#: src/multitrack.c:4414
+#: src/multitrack.c:4569
 msgid "Gravity: Right"
 msgstr ""
 
-#: src/multitrack.c:4416
+#: src/multitrack.c:4570
 msgid "Close _last gap(s) in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:4419
+#: src/multitrack.c:4572
 msgid "Close _first gap(s) in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:4458
+#: src/multitrack.c:4627
 msgid "Close gaps"
 msgstr ""
 
-#: src/multitrack.c:4460
+#: src/multitrack.c:4629
 msgid "Move block"
 msgstr ""
 
-#: src/multitrack.c:4462
+#: src/multitrack.c:4631
 msgid "Move audio block"
 msgstr ""
 
-#: src/multitrack.c:4464
+#: src/multitrack.c:4633
 msgid "Delete block"
 msgstr "احذف الصندوق"
 
-#: src/multitrack.c:4466
+#: src/multitrack.c:4635
 msgid "Delete audio block"
 msgstr ""
 
-#: src/multitrack.c:4468
+#: src/multitrack.c:4637
 msgid "Split tracks"
 msgstr ""
 
-#: src/multitrack.c:4470
+#: src/multitrack.c:4639
 msgid "Split block"
 msgstr ""
 
-#: src/multitrack.c:4473
+#: src/multitrack.c:4642
 #, c-format
 msgid "Apply %s"
 msgstr ""
 
-#: src/multitrack.c:4478
+#: src/multitrack.c:4647
 #, c-format
 msgid "Delete %s"
 msgstr "إحذف %s"
 
-#: src/multitrack.c:4482
+#: src/multitrack.c:4651
 msgid "Insert block"
 msgstr ""
 
-#: src/multitrack.c:4484
+#: src/multitrack.c:4653
 msgid "Insert gap"
 msgstr ""
 
-#: src/multitrack.c:4486
+#: src/multitrack.c:4655
 msgid "Insert audio block"
 msgstr ""
 
-#: src/multitrack.c:4488
+#: src/multitrack.c:4657
 msgid "Effect order change"
 msgstr ""
 
-#: src/multitrack.c:4898
+#: src/multitrack.c:5064
 msgid "unsigned "
 msgstr ""
 
-#: src/multitrack.c:4899
+#: src/multitrack.c:5065
 msgid "signed "
 msgstr ""
 
-#: src/multitrack.c:4904
+#: src/multitrack.c:5071
 #, c-format
 msgid ""
 "Multitrack values set to %.3f fps, frame size %d x %d, audio channels %d, "
 "audio rate %d, audio sample size %d, %s.\n"
 msgstr ""
 
-#: src/multitrack.c:4938
+#: src/multitrack.c:5104
 msgid "invalid event list. Failed.\n"
 msgstr ""
 
-#: src/multitrack.c:4944
+#: src/multitrack.c:5110
 msgid "event list has invalid fps. Failed.\n"
 msgstr ""
 
-#: src/multitrack.c:4953
+#: src/multitrack.c:5122
 #, c-format
 msgid ""
 "\n"
@@ -8543,7 +8554,7 @@
 "then load in the new set from the File menu.\n"
 msgstr ""
 
-#: src/multitrack.c:4993
+#: src/multitrack.c:5163
 #, c-format
 msgid ""
 "\n"
@@ -8551,600 +8562,592 @@
 "It cannot be loaded.\n"
 msgstr ""
 
-#: src/multitrack.c:5329 src/multitrack.c:5338 src/multitrack.c:21133
+#: src/multitrack.c:5452
 msgid "Layout was wiped.\n"
 msgstr ""
 
-#: src/multitrack.c:5374
+#: src/multitrack.c:5547
 #, c-format
 msgid "LiVES-%s: Multitrack %dx%d : %d bpp %.3f fps"
 msgstr ""
 
-#: src/multitrack.c:5617
+#: src/multitrack.c:5793
 msgid "In/out"
 msgstr ""
 
-#: src/multitrack.c:5619
+#: src/multitrack.c:5795
 msgid "FX stack"
 msgstr ""
 
-#: src/multitrack.c:5627 src/omc-learn.c:673
+#: src/multitrack.c:5803 src/omc-learn.c:659
 msgid "Params."
 msgstr ""
 
-#: src/multitrack.c:5978
+#: src/multitrack.c:6157
 msgid "_Open..."
 msgstr ""
 
-#: src/multitrack.c:5996
+#: src/multitrack.c:6175
 msgid "O_pen File Selection..."
 msgstr "_فتح ملف اختيار..."
 
-#: src/multitrack.c:6040
+#: src/multitrack.c:6219
 msgid "Import Selection from _dvd/vcd..."
 msgstr ""
 
-#: src/multitrack.c:6050
+#: src/multitrack.c:6229
 msgid "Import Selection from _dvd"
 msgstr ""
 
-#: src/multitrack.c:6060
+#: src/multitrack.c:6239
 msgid "Import Selection from _vcd"
 msgstr ""
 
-#: src/multitrack.c:6076
+#: src/multitrack.c:6255
 msgid "_Import from Device"
 msgstr "_الاستيراد من الأجهزة"
 
-#: src/multitrack.c:6103
+#: src/multitrack.c:6282
 msgid "_Close the selected clip"
 msgstr ""
 
-#: src/multitrack.c:6198
+#: src/multitrack.c:6377
 msgid "_Save layout as..."
 msgstr ""
 
-#: src/multitrack.c:6206
+#: src/multitrack.c:6385
 msgid "_Load layout..."
 msgstr ""
 
-#: src/multitrack.c:6210
+#: src/multitrack.c:6389
 msgid "_Wipe/Delete layout..."
 msgstr ""
 
-#: src/multitrack.c:6236
+#: src/multitrack.c:6415
 msgid "_Ignore width, height and audio values from loaded layouts"
 msgstr ""
 
-#: src/multitrack.c:6240
+#: src/multitrack.c:6419
 msgid "Auto load _subtitles with clips"
 msgstr ""
 
-#: src/multitrack.c:6322
+#: src/multitrack.c:6501
 msgid "_CLIP EDITOR"
 msgstr ""
 
-#: src/multitrack.c:6334
+#: src/multitrack.c:6513
 msgid "_Adjust selected clip start/end points"
 msgstr ""
 
-#: src/multitrack.c:6343
+#: src/multitrack.c:6522
 msgid "_Insert selected clip"
 msgstr ""
 
-#: src/multitrack.c:6355
+#: src/multitrack.c:6534
 msgid "_Insert selected clip audio"
 msgstr ""
 
-#: src/multitrack.c:6364
+#: src/multitrack.c:6543
 msgid "_Delete selected block"
 msgstr ""
 
-#: src/multitrack.c:6373
+#: src/multitrack.c:6555
 msgid "_Jump to previous block boundary"
 msgstr ""
 
-#: src/multitrack.c:6382
+#: src/multitrack.c:6564
 msgid "_Jump to next block boundary"
 msgstr ""
 
-#: src/multitrack.c:6395
+#: src/multitrack.c:6577
 msgid "Clear _marks from timeline"
 msgstr ""
 
-#: src/multitrack.c:6403
+#: src/multitrack.c:6585
 msgid "Ignore selection limits when inserting"
 msgstr ""
 
-#: src/multitrack.c:6420 src/multitrack.c:16719
+#: src/multitrack.c:6602 src/multitrack.c:17009
 msgid "_Play from Timeline Position"
 msgstr ""
 
-#: src/multitrack.c:6434
+#: src/multitrack.c:6616
 msgid "Pla_y selected time only"
 msgstr ""
 
-#: src/multitrack.c:6518
+#: src/multitrack.c:6700
 msgid "_Move effects with blocks"
 msgstr ""
 
-#: src/multitrack.c:6531
+#: src/multitrack.c:6713
 msgid "Select _autotransition effect..."
 msgstr ""
 
-#: src/multitrack.c:6542
+#: src/multitrack.c:6724
 msgid "Crossfade audio with autotransition"
 msgstr ""
 
-#: src/multitrack.c:6550
+#: src/multitrack.c:6732
 msgid "View/_Edit selected effect"
 msgstr ""
 
-#: src/multitrack.c:6554
+#: src/multitrack.c:6736
 msgid "_Delete selected effect"
 msgstr ""
 
-#: src/multitrack.c:6562
+#: src/multitrack.c:6744
 msgid "Apply effect to _block..."
 msgstr ""
 
-#: src/multitrack.c:6619
+#: src/multitrack.c:6801
 msgid "Apply effect to _region..."
 msgstr ""
 
-#: src/multitrack.c:6885
+#: src/multitrack.c:7061
 msgid "_Tracks"
 msgstr ""
 
-#: src/multitrack.c:6896
+#: src/multitrack.c:7072
 msgid "Rename current track"
 msgstr ""
 
-#: src/multitrack.c:6904
+#: src/multitrack.c:7080
 msgid "Make _Backing Audio current track"
 msgstr ""
 
-#: src/multitrack.c:6915
+#: src/multitrack.c:7091
 msgid "Add Video Track at _Rear"
 msgstr ""
 
-#: src/multitrack.c:6923
+#: src/multitrack.c:7099
 msgid "Add Video Track at _Front"
 msgstr ""
 
-#: src/multitrack.c:6936
+#: src/multitrack.c:7112
 msgid "_Split current track at cursor"
 msgstr ""
 
-#: src/multitrack.c:6948
+#: src/multitrack.c:7124
 msgid "_Split selected video tracks"
 msgstr ""
 
-#: src/multitrack.c:6961
+#: src/multitrack.c:7137
 msgid "Insert gap in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:6969
+#: src/multitrack.c:7145
 msgid "Insert gap in current track/selected time"
 msgstr ""
 
-#: src/multitrack.c:6981
+#: src/multitrack.c:7157
 msgid "Close all _gaps in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:7007
+#: src/multitrack.c:7183
 msgid "Se_lection"
 msgstr "ال_تحديد"
 
-#: src/multitrack.c:7018
+#: src/multitrack.c:7194
 msgid "_Select Current Track"
 msgstr ""
 
-#: src/multitrack.c:7025
+#: src/multitrack.c:7201
 msgid "Select _all video tracks"
 msgstr ""
 
-#: src/multitrack.c:7032
+#: src/multitrack.c:7208
 msgid "Select _no video tracks"
 msgstr ""
 
-#: src/multitrack.c:7039
+#: src/multitrack.c:7215
 msgid "Select all _time"
 msgstr ""
 
-#: src/multitrack.c:7050
+#: src/multitrack.c:7226
 msgid "Select from _zero time"
 msgstr ""
 
-#: src/multitrack.c:7057
+#: src/multitrack.c:7233
 msgid "Select to _end time"
 msgstr ""
 
-#: src/multitrack.c:7064
+#: src/multitrack.c:7240
 msgid "_Copy..."
 msgstr "ا_نسخ..."
 
-#: src/multitrack.c:7075
+#: src/multitrack.c:7251
 msgid "_Timecode to region start"
 msgstr ""
 
-#: src/multitrack.c:7082
+#: src/multitrack.c:7258
 msgid "_Timecode to region end"
 msgstr ""
 
-#: src/multitrack.c:7089
+#: src/multitrack.c:7265
 msgid "_Region start to timecode"
 msgstr ""
 
-#: src/multitrack.c:7096
+#: src/multitrack.c:7272
 msgid "_Region end to timecode"
 msgstr ""
 
-#: src/multitrack.c:7110
+#: src/multitrack.c:7286
 msgid "Select/deselect block at current track/time"
 msgstr ""
 
-#: src/multitrack.c:7135
+#: src/multitrack.c:7311
 msgid "_Change width, height and audio values..."
 msgstr ""
 
-#: src/multitrack.c:7194
+#: src/multitrack.c:7370
 msgid "_Render"
 msgstr "ت_صيير"
 
-#: src/multitrack.c:7205
+#: src/multitrack.c:7381
 msgid "_Render all to new clip"
 msgstr ""
 
-#: src/multitrack.c:7220
+#: src/multitrack.c:7396
 msgid "Render _video"
 msgstr ""
 
-#: src/multitrack.c:7225
+#: src/multitrack.c:7401
 msgid "Render _audio"
 msgstr ""
 
-#: src/multitrack.c:7235
+#: src/multitrack.c:7411
 msgid "_Normalise rendered audio"
 msgstr ""
 
-#: src/multitrack.c:7242
+#: src/multitrack.c:7418
 msgid "_Pre-render audio"
 msgstr ""
 
-#: src/multitrack.c:7251
+#: src/multitrack.c:7427
 msgid "_View"
 msgstr "_معاينة"
 
-#: src/multitrack.c:7270
+#: src/multitrack.c:7446
 msgid "Block _In/out points"
 msgstr ""
 
-#: src/multitrack.c:7279
+#: src/multitrack.c:7455
 msgid "_Effects at current"
 msgstr ""
 
-#: src/multitrack.c:7297
+#: src/multitrack.c:7473
 msgid "Audio parameters"
 msgstr ""
 
-#: src/multitrack.c:7308
+#: src/multitrack.c:7484
 msgid "Show backing _audio track"
 msgstr ""
 
-#: src/multitrack.c:7312
+#: src/multitrack.c:7488
 msgid "Compact view"
 msgstr ""
 
-#: src/multitrack.c:7320
+#: src/multitrack.c:7496
 msgid "Maximum tracks to display..."
 msgstr ""
 
-#: src/multitrack.c:7327
+#: src/multitrack.c:7503
 msgid "Scroll to follow playback"
 msgstr ""
 
-#: src/multitrack.c:7331
+#: src/multitrack.c:7507
 msgid "_Center on cursor"
 msgstr ""
 
-#: src/multitrack.c:7338
+#: src/multitrack.c:7514
 msgid "_Zoom in"
 msgstr ""
 
-#: src/multitrack.c:7349
+#: src/multitrack.c:7525
 msgid "_Zoom out"
 msgstr ""
 
-#: src/multitrack.c:7361
+#: src/multitrack.c:7537
 msgid "Multitrack _details"
 msgstr ""
 
-#: src/multitrack.c:7374
+#: src/multitrack.c:7550
 msgid "_Event Window"
 msgstr ""
 
-#: src/multitrack.c:7378
+#: src/multitrack.c:7554
 msgid "_Event Window (selected time only)"
 msgstr ""
 
-#: src/multitrack.c:7382
+#: src/multitrack.c:7558
 msgid "_Show FRAME events"
 msgstr ""
 
-#: src/multitrack.c:7399
+#: src/multitrack.c:7575
 msgid "_Show multitrack keys"
 msgstr ""
 
-#: src/multitrack.c:7468
+#: src/multitrack.c:7644
 msgid "Mouse mode: _Move"
 msgstr ""
 
-#: src/multitrack.c:7476
+#: src/multitrack.c:7652
 msgid "Mouse mode: _Select"
 msgstr ""
 
-#: src/multitrack.c:7505
+#: src/multitrack.c:7681
 msgid "Insert mode: _Normal"
 msgstr ""
 
-#: src/multitrack.c:7733
+#: src/multitrack.c:7909
 msgid "Insert with _audio"
 msgstr ""
 
-#: src/multitrack.c:7734
+#: src/multitrack.c:7910
 msgid ""
 "Select whether video clips are inserted and moved with their audio or not"
 msgstr ""
 
-#: src/multitrack.c:7829
+#: src/multitrack.c:8007
 msgid "Select _overlap"
 msgstr ""
 
-#: src/multitrack.c:7830
+#: src/multitrack.c:8008
 msgid ""
 "Select whether timeline selection snaps to overlap between selected tracks "
 "or not"
 msgstr ""
 
-#: src/multitrack.c:7894 src/multitrack.c:14198
+#: src/multitrack.c:8073 src/multitrack.c:14422
 msgid "Expanded View (d)"
 msgstr ""
 
-#: src/multitrack.c:7897 src/multitrack.c:14205
+#: src/multitrack.c:8076 src/multitrack.c:14428
 msgid "Compact View (d)"
 msgstr ""
 
-#: src/multitrack.c:7939
+#: src/multitrack.c:8118
 msgid "Gravity: _Normal"
 msgstr ""
 
-#: src/multitrack.c:7952
+#: src/multitrack.c:8131
 msgid "Gravity: _Left"
 msgstr ""
 
-#: src/multitrack.c:7967
+#: src/multitrack.c:8146
 msgid "Gravity: _Right"
 msgstr ""
 
-#: src/multitrack.c:8297
+#: src/multitrack.c:8496
 msgid "_Apply"
 msgstr "_طبّق"
 
-#: src/multitrack.c:8319
+#: src/multitrack.c:8518
 msgid "Time"
 msgstr ""
 
-#: src/multitrack.c:8333
+#: src/multitrack.c:8532
 msgid "_Del. node"
 msgstr ""
 
-#: src/multitrack.c:8341
+#: src/multitrack.c:8540
 msgid "_Next node"
 msgstr ""
 
-#: src/multitrack.c:8349
+#: src/multitrack.c:8548
 msgid "_Prev node"
 msgstr ""
 
-#: src/multitrack.c:8373
+#: src/multitrack.c:8574
 msgid "_Reverse playback  "
 msgstr ""
 
-#: src/multitrack.c:8395
+#: src/multitrack.c:8596
 msgid "_Velocity  "
 msgstr ""
 
-#: src/multitrack.c:8464
+#: src/multitrack.c:8664
 msgid "Anchor _start"
 msgstr ""
 
-#: src/multitrack.c:8465
+#: src/multitrack.c:8665
 msgid "Anchor the start point to the timeline"
 msgstr ""
 
-#: src/multitrack.c:8481
-msgid "Start frame"
-msgstr ""
-
-#: src/multitrack.c:8533
+#: src/multitrack.c:8728
 msgid "Anchor _end"
 msgstr ""
 
-#: src/multitrack.c:8534
+#: src/multitrack.c:8729
 msgid "Anchor the end point to the timeline"
 msgstr ""
 
-#: src/multitrack.c:8546
-msgid "End frame"
-msgstr ""
-
-#: src/multitrack.c:8739
+#: src/multitrack.c:8929
 msgid "Scroll"
 msgstr "التمرير"
 
-#: src/multitrack.c:9316
+#: src/multitrack.c:9502
 msgid ""
 "\n"
 "==============================\n"
 "Switched to Clip Edit mode\n"
 msgstr ""
 
-#: src/multitrack.c:9502
+#: src/multitrack.c:9708
 msgid "Timeline (seconds)"
 msgstr ""
 
-#: src/multitrack.c:9984
+#: src/multitrack.c:10202
 msgid " Backing audio"
 msgstr ""
 
-#: src/multitrack.c:9987
+#: src/multitrack.c:10204
 #, c-format
 msgid " Layer %d audio"
 msgstr ""
 
-#: src/multitrack.c:9995
+#: src/multitrack.c:10212
 msgid "Show/hide audio details"
 msgstr ""
 
-#: src/multitrack.c:10010 src/multitrack.c:10232
+#: src/multitrack.c:10227 src/multitrack.c:10452
 #, c-format
 msgid "Layer %d audio"
 msgstr ""
 
-#: src/multitrack.c:10144 src/multitrack.c:10261
+#: src/multitrack.c:10353 src/multitrack.c:10481
 #, c-format
 msgid "%s (layer %d)"
 msgstr ""
 
-#: src/multitrack.c:10184
+#: src/multitrack.c:10403
 msgid "Select track"
 msgstr ""
 
-#: src/multitrack.c:10188
+#: src/multitrack.c:10407
 msgid "Show/hide audio"
 msgstr ""
 
-#: src/multitrack.c:10194
+#: src/multitrack.c:10413
 #, c-format
 msgid "Video %d"
 msgstr ""
 
-#: src/multitrack.c:10233
+#: src/multitrack.c:10453
 #, c-format
 msgid " %s"
 msgstr ""
 
-#: src/multitrack.c:10346
+#: src/multitrack.c:10574
 msgid "LiVES: Selected effect"
 msgstr ""
 
-#: src/multitrack.c:10358
+#: src/multitrack.c:10586
 msgid "_View/Edit this effect"
 msgstr ""
 
-#: src/multitrack.c:10361
+#: src/multitrack.c:10588
 msgid "_View this effect"
 msgstr ""
 
-#: src/multitrack.c:10369
+#: src/multitrack.c:10596
 msgid "_Delete this effect"
 msgstr ""
 
-#: src/multitrack.c:10422
+#: src/multitrack.c:10648
 msgid "Cannot insert after this effect"
 msgstr ""
 
-#: src/multitrack.c:10451
+#: src/multitrack.c:10677
 msgid "This effect cannot be moved"
 msgstr ""
 
-#: src/multitrack.c:10499
+#: src/multitrack.c:10724
 #, c-format
 msgid "  %d to %d selected  "
 msgstr ""
 
-#: src/multitrack.c:10502 src/multitrack.c:10746
+#: src/multitrack.c:10727 src/multitrack.c:10968
 #, c-format
 msgid "%.2f sec."
 msgstr ""
 
-#: src/multitrack.c:10717
+#: src/multitrack.c:10940
 #, c-format
 msgid "%d frames"
 msgstr ""
 
-#: src/multitrack.c:11070
+#: src/multitrack.c:11299
 msgid ""
 "\n"
 "==============================\n"
 "Switched to Multitrack mode\n"
 msgstr ""
 
-#: src/multitrack.c:12691
+#: src/multitrack.c:12939
 msgid "Drag the time slider to where you"
 msgstr ""
 
-#: src/multitrack.c:12692
+#: src/multitrack.c:12940
 msgid "want to set effect parameters"
 msgstr ""
 
-#: src/multitrack.c:12693
+#: src/multitrack.c:12941
 msgid "Set parameters, then click \"Apply\"\n"
 msgstr ""
 
-#: src/multitrack.c:12694
+#: src/multitrack.c:12942
 msgid ""
 "NODES are points where parameters\n"
 "have been set.\n"
 "Nodes can be deleted."
 msgstr ""
 
-#: src/multitrack.c:12697
+#: src/multitrack.c:12944
 msgid "Effect has no parameters.\n"
 msgstr ""
 
-#: src/multitrack.c:12788
+#: src/multitrack.c:13033
 #, c-format
 msgid "%s output"
 msgstr ""
 
-#: src/multitrack.c:12794 src/multitrack.c:12804
+#: src/multitrack.c:13038 src/multitrack.c:13046
 #, c-format
 msgid "layer %d"
 msgstr ""
 
-#: src/multitrack.c:12796 src/multitrack.c:12806
+#: src/multitrack.c:13039 src/multitrack.c:13047
 msgid "audio track"
 msgstr ""
 
-#: src/multitrack.c:12797
+#: src/multitrack.c:13040
 #, c-format
 msgid "%s to %s"
 msgstr ""
 
-#: src/multitrack.c:12807
+#: src/multitrack.c:13048
 #, c-format
 msgid "%s from %s"
 msgstr ""
 
-#: src/multitrack.c:12860
+#: src/multitrack.c:13099
 msgid "_Prev filter map"
 msgstr ""
 
-#: src/multitrack.c:12871
+#: src/multitrack.c:13110
 msgid "Insert _before"
 msgstr ""
 
-#: src/multitrack.c:12881
+#: src/multitrack.c:13120
 msgid "Insert _after"
 msgstr ""
 
-#: src/multitrack.c:12896
+#: src/multitrack.c:13134
 msgid "_Next filter map"
 msgstr ""
 
-#: src/multitrack.c:12911
+#: src/multitrack.c:13148
 msgid ""
 "\n"
 "\n"
@@ -9152,272 +9155,272 @@
 "current time.\n"
 msgstr ""
 
-#: src/multitrack.c:12929
+#: src/multitrack.c:13166
 msgid ""
 "Drag a compositor anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:12936
+#: src/multitrack.c:13173
 msgid ""
 "Drag a transition anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:12944
+#: src/multitrack.c:13181
 msgid ""
 "Effects can be dragged\n"
 "onto blocks on the timeline."
 msgstr ""
 
-#: src/multitrack.c:13166
+#: src/multitrack.c:13406
 msgid "LiVES: Selected block/frame"
 msgstr ""
 
-#: src/multitrack.c:13173
+#: src/multitrack.c:13413
 msgid "_Select this block"
 msgstr ""
 
-#: src/multitrack.c:13183
+#: src/multitrack.c:13423
 msgid "_Split block here"
 msgstr ""
 
-#: src/multitrack.c:13191
+#: src/multitrack.c:13431
 msgid "List _effects here"
 msgstr ""
 
-#: src/multitrack.c:13200 src/multitrack.c:13277
+#: src/multitrack.c:13440 src/multitrack.c:13518
 #, c-format
 msgid "_Adjust %s"
 msgstr ""
 
-#: src/multitrack.c:13215
+#: src/multitrack.c:13455
 msgid "_Delete this block"
 msgstr ""
 
-#: src/multitrack.c:13258
+#: src/multitrack.c:13500
 msgid "_Insert here"
 msgstr ""
 
-#: src/multitrack.c:13264
+#: src/multitrack.c:13505
 msgid "_Insert audio here"
 msgstr ""
 
-#: src/multitrack.c:14801
+#: src/multitrack.c:15017
 #, c-format
 msgid "Inserted gap in selected tracks from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:14835
+#: src/multitrack.c:15048
 #, c-format
 msgid "Inserted gap in track %s from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15036
+#: src/multitrack.c:15244
 #, c-format
 msgid "Undid %s\n"
 msgstr ""
 
-#: src/multitrack.c:15235
+#: src/multitrack.c:15445
 #, c-format
 msgid "Redid %s\n"
 msgstr ""
 
-#: src/multitrack.c:15268
+#: src/multitrack.c:15475
 msgid ""
 "\n"
 " (variable)"
 msgstr ""
 
-#: src/multitrack.c:15502 src/multitrack.c:15614 src/multitrack.c:18736
-#: src/multitrack.c:18748
+#: src/multitrack.c:15710 src/multitrack.c:15823 src/multitrack.c:19077
+#: src/multitrack.c:19089
 #, c-format
 msgid "track %s"
 msgstr ""
 
-#: src/multitrack.c:15507 src/multitrack.c:15619 src/multitrack.c:18741
+#: src/multitrack.c:15715 src/multitrack.c:15828 src/multitrack.c:19082
 #, c-format
 msgid "tracks %s and %s"
 msgstr ""
 
-#: src/multitrack.c:15513 src/multitrack.c:15625 src/multitrack.c:18751
+#: src/multitrack.c:15721 src/multitrack.c:15834 src/multitrack.c:19091
 msgid "selected tracks"
 msgstr ""
 
-#: src/multitrack.c:15516
+#: src/multitrack.c:15726
 #, c-format
 msgid "Added %s %s to %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15550
+#: src/multitrack.c:15760
 #, c-format
 msgid "Added effect %s to track %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15631
+#: src/multitrack.c:15845
 #, c-format
 msgid "Deleted %s %s from %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15935
+#: src/multitrack.c:16143
 #, c-format
 msgid "rendered %d frames to new clip.\n"
 msgstr ""
 
-#: src/multitrack.c:16025
+#: src/multitrack.c:16230
 msgid "Cleaning up..."
 msgstr "حذف الحزم الغير مستخدمة"
 
-#: src/multitrack.c:16712
+#: src/multitrack.c:17003
 msgid "_Pause"
 msgstr "_إيقاف مؤقت"
 
-#: src/multitrack.c:16713
+#: src/multitrack.c:17004
 msgid "Pause (p)"
 msgstr ""
 
-#: src/multitrack.c:16856
+#: src/multitrack.c:17151
 msgid "Press 'm' during playback"
 msgstr ""
 
-#: src/multitrack.c:16857
+#: src/multitrack.c:17152
 msgid "to make a mark on the timeline"
 msgstr ""
 
-#: src/multitrack.c:17154
+#: src/multitrack.c:17498
 #, c-format
 msgid ""
 "Inserted audio %.4f to %.4f from clip %s into backing audio from time %.4f "
 "to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:17414
+#: src/multitrack.c:17759
 #, c-format
 msgid ""
 "Inserted frames %d to %d from clip %s into track %s from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:17998
+#: src/multitrack.c:18332
 #, c-format
 msgid ""
 "Time region %.3f to %.3f\n"
 "selected.\n"
 msgstr ""
 
-#: src/multitrack.c:18002
+#: src/multitrack.c:18336
 msgid ""
 "select one or more tracks\n"
 "to create a region.\n"
 msgstr ""
 
-#: src/multitrack.c:18004
+#: src/multitrack.c:18337
 #, c-format
 msgid "%d video tracks selected.\n"
 msgstr ""
 
-#: src/multitrack.c:18006
+#: src/multitrack.c:18339
 msgid ""
 "Double click on timeline\n"
 "to deselect time region."
 msgstr ""
 
-#: src/multitrack.c:18013
+#: src/multitrack.c:18346
 msgid ""
 "Single click on an effect\n"
 "to select it."
 msgstr ""
 
-#: src/multitrack.c:18014
+#: src/multitrack.c:18347
 msgid ""
 "Double click on an effect\n"
 "to edit it."
 msgstr ""
 
-#: src/multitrack.c:18015
+#: src/multitrack.c:18348
 msgid ""
 "Right click on an effect\n"
 "for context menu.\n"
 msgstr ""
 
-#: src/multitrack.c:18017
+#: src/multitrack.c:18350
 msgid ""
 "Effect order can be changed at\n"
 "FILTER MAPS"
 msgstr ""
 
-#: src/multitrack.c:18024
+#: src/multitrack.c:18357
 msgid ""
 "You can select an effect,\n"
 "then use the INSERT BEFORE"
 msgstr ""
 
-#: src/multitrack.c:18025
+#: src/multitrack.c:18358
 msgid "or INSERT AFTER buttons to move it."
 msgstr ""
 
-#: src/multitrack.c:18307 src/multitrack.c:18320
+#: src/multitrack.c:18639 src/multitrack.c:18652
 msgid "Click on another effect,"
 msgstr ""
 
-#: src/multitrack.c:18308 src/multitrack.c:18321
+#: src/multitrack.c:18640 src/multitrack.c:18653
 msgid ""
 "and the selected one\n"
 "will be inserted"
 msgstr ""
 
-#: src/multitrack.c:18309
+#: src/multitrack.c:18641
 msgid "after it.\n"
 msgstr ""
 
-#: src/multitrack.c:18322
+#: src/multitrack.c:18654
 msgid "before it.\n"
 msgstr ""
 
-#: src/multitrack.c:18551
+#: src/multitrack.c:18889
 #, c-format
 msgid "Removed parameter values for effect %s at time %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:18759
+#: src/multitrack.c:19100
 #, c-format
 msgid "Set parameter values for %s %s on %s at time %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:19251 src/multitrack.c:20873
+#: src/multitrack.c:19630 src/multitrack.c:21195
 msgid "_Autoreload each time"
 msgstr ""
 
-#: src/multitrack.c:19323
+#: src/multitrack.c:19702
 #, fuzzy
 msgid "Saving layout"
 msgstr "_حفظ التخطيط"
 
-#: src/multitrack.c:19345
+#: src/multitrack.c:19725
 #, c-format
 msgid "Saved layout to %s\n"
 msgstr ""
 
-#: src/multitrack.c:20783
+#: src/multitrack.c:21125
 msgid "clips and frames"
 msgstr ""
 
-#: src/multitrack.c:20787
+#: src/multitrack.c:21128
 msgid "clips"
 msgstr ""
 
-#: src/multitrack.c:20790
+#: src/multitrack.c:21130
 msgid "frames"
 msgstr "إطارات"
 
-#: src/multitrack.c:20800
+#: src/multitrack.c:21140
 msgid ""
 "\n"
 "Auto reload layout.\n"
 msgstr ""
 
-#: src/multitrack.c:20803
+#: src/multitrack.c:21143
 #, c-format
 msgid ""
 "%s\n"
@@ -9425,100 +9428,100 @@
 "Therefore it could not be loaded properly.\n"
 msgstr ""
 
-#: src/multitrack.c:20920
+#: src/multitrack.c:21284
 msgid "auto backup"
 msgstr ""
 
-#: src/multitrack.c:20923
+#: src/multitrack.c:21287
 #, c-format
 msgid ""
 "\n"
 "Unable to load layout file %s\n"
 msgstr ""
 
-#: src/multitrack.c:20944
+#: src/multitrack.c:21308
 #, c-format
 msgid "Loading layout from %s..."
 msgstr ""
 
-#: src/multitrack.c:20978
+#: src/multitrack.c:21338
 #, c-format
 msgid "Got %d events...processing..."
 msgstr ""
 
-#: src/multitrack.c:20991
+#: src/multitrack.c:21349
 msgid "Checking and rebuilding event list"
 msgstr ""
 
-#: src/multitrack.c:21017
+#: src/multitrack.c:21374
 #, c-format
 msgid "%d errors detected.\n"
 msgstr ""
 
-#: src/multitrack.c:21068
+#: src/multitrack.c:21422
 #, c-format
 msgid "Multitrack fps set to %.3f\n"
 msgstr ""
 
-#: src/multitrack.c:21225
+#: src/multitrack.c:21576
 msgid ""
 "The current layout has changes which have not been saved.\n"
 "Are you sure you wish to wipe it ?\n"
 msgstr ""
 
-#: src/multitrack.c:22047
+#: src/multitrack.c:22385
 msgid "LiVES: Multitrack audio mixer"
 msgstr ""
 
-#: src/multitrack.c:22077
+#: src/multitrack.c:22414
 msgid "_Reset values"
 msgstr ""
 
-#: src/multitrack.c:22081
+#: src/multitrack.c:22418
 msgid "_Close mixer"
 msgstr ""
 
-#: src/multitrack.c:22130
+#: src/multitrack.c:22466
 msgid ""
 "_Invert backing audio\n"
 "and layer volumes"
 msgstr ""
 
-#: src/multitrack.c:22132
+#: src/multitrack.c:22468
 msgid "Adjust backing and layer audio values so that they sum to 1.0"
 msgstr ""
 
-#: src/multitrack.c:22175
+#: src/multitrack.c:22510
 msgid "_Gang layer audio"
 msgstr ""
 
-#: src/multitrack.c:22177
+#: src/multitrack.c:22512
 msgid "Adjust all layer audio values to the same value"
 msgstr ""
 
-#: src/jack.c:104
+#: src/jack.c:102
 msgid "JACK server started\n"
 msgstr ""
 
-#: src/jack.c:1284 src/jack.c:1353
+#: src/jack.c:1265 src/jack.c:1334
 msgid "Unable to connect to JACK server\n"
 msgstr ""
 
-#: src/jack.c:1512
+#: src/jack.c:1491
 msgid "Started jack audio subsystem.\n"
 msgstr ""
 
-#: src/jack.c:1623
+#: src/jack.c:1600
 msgid "Started jack audio reader.\n"
 msgstr ""
 
-#: src/jack.c:1838
+#: src/jack.c:1815
 msgid ""
 "\n"
 "Connection to jack audio was reset.\n"
 msgstr ""
 
-#: src/pulse.c:87
+#: src/pulse.c:88
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -9526,7 +9529,7 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:92
+#: src/pulse.c:94
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -9534,7 +9537,7 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:96
+#: src/pulse.c:99
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -9542,335 +9545,335 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:101
+#: src/pulse.c:104
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
 msgstr ""
 
-#: src/pulse.c:107
+#: src/pulse.c:109
 msgid "LiVES will exit and you can choose another audio player.\n"
 msgstr ""
 
-#: src/pulse.c:1352
+#: src/pulse.c:1335
 msgid ""
 "\n"
 "Connection to pulse audio was reset.\n"
 msgstr ""
 
-#: src/colourspace.c:1100
+#: src/colourspace.c:1092
 msgid "unclamped"
 msgstr ""
 
-#: src/colourspace.c:1101
+#: src/colourspace.c:1093
 msgid "clamped"
 msgstr ""
 
-#: src/omc-learn.c:195
+#: src/omc-learn.c:191
 #, c-format
 msgid "Responding to joystick events from %s\n"
 msgstr ""
 
-#: src/omc-learn.c:289
+#: src/omc-learn.c:279
 msgid "Creating ALSA seq port..."
 msgstr ""
 
-#: src/omc-learn.c:325
+#: src/omc-learn.c:313
 #, c-format
 msgid "Responding to MIDI events from %s\n"
 msgstr ""
 
-#: src/omc-learn.c:568
+#: src/omc-learn.c:554
 msgid "data"
 msgstr "المعطيات"
 
-#: src/omc-learn.c:571
+#: src/omc-learn.c:557
 msgid "velocity"
 msgstr ""
 
-#: src/omc-learn.c:572
+#: src/omc-learn.c:558
 msgid "note"
 msgstr "ملاحظة"
 
-#: src/omc-learn.c:574 src/omc-learn.c:736 src/omc-learn.c:1105
-#: src/omc-learn.c:1591 src/omc-learn.c:1640
+#: src/omc-learn.c:560 src/omc-learn.c:724 src/omc-learn.c:1092
+#: src/omc-learn.c:1581 src/omc-learn.c:1630
 msgid "value"
 msgstr "قيمة"
 
-#: src/omc-learn.c:576
+#: src/omc-learn.c:562
 msgid "state"
 msgstr "الولاية"
 
-#: src/omc-learn.c:688
+#: src/omc-learn.c:674
 msgid "variable"
 msgstr "متغيّر"
 
-#: src/omc-learn.c:1001
+#: src/omc-learn.c:989
 msgid "Vars."
 msgstr ""
 
-#: src/omc-learn.c:1054
+#: src/omc-learn.c:1041
 #, c-format
 msgid "MIDI ch %d note on"
 msgstr ""
 
-#: src/omc-learn.c:1058
+#: src/omc-learn.c:1045
 #, c-format
 msgid "MIDI ch %d note off"
 msgstr ""
 
-#: src/omc-learn.c:1062
+#: src/omc-learn.c:1049
 #, c-format
 msgid "MIDI ch %d controller %d"
 msgstr ""
 
-#: src/omc-learn.c:1066
+#: src/omc-learn.c:1053
 #, c-format
 msgid "MIDI ch %d pitch bend"
 msgstr ""
 
-#: src/omc-learn.c:1070
+#: src/omc-learn.c:1057
 #, c-format
 msgid "MIDI ch %d pgm change"
 msgstr ""
 
-#: src/omc-learn.c:1073
+#: src/omc-learn.c:1060
 #, c-format
 msgid "Joystick button %d"
 msgstr ""
 
-#: src/omc-learn.c:1076
+#: src/omc-learn.c:1063
 #, c-format
 msgid "Joystick axis %d"
 msgstr ""
 
-#: src/omc-learn.c:1113
+#: src/omc-learn.c:1100
 msgid "x"
 msgstr "س"
 
-#: src/omc-learn.c:1122
+#: src/omc-learn.c:1109
 msgid "range"
 msgstr "النطاق"
 
-#: src/omc-learn.c:1143
+#: src/omc-learn.c:1130
 msgid "+ offset1"
 msgstr ""
 
-#: src/omc-learn.c:1161
+#: src/omc-learn.c:1150
 msgid "* scale"
 msgstr ""
 
-#: src/omc-learn.c:1179
+#: src/omc-learn.c:1170
 msgid "+ offset2"
 msgstr ""
 
-#: src/omc-learn.c:1280
+#: src/omc-learn.c:1270
 msgid ""
 "\n"
 "Click OK to delete all entries\n"
 msgstr ""
 
-#: src/omc-learn.c:1318
+#: src/omc-learn.c:1308
 msgid "LiVES: OMC learner"
 msgstr ""
 
-#: src/omc-learn.c:1334
+#: src/omc-learn.c:1324
 msgid "Clear _unmatched"
 msgstr ""
 
-#: src/omc-learn.c:1345
+#: src/omc-learn.c:1335
 msgid "_Delete all"
 msgstr "_حذف الكل"
 
-#: src/omc-learn.c:1411
+#: src/omc-learn.c:1401
 msgid "Start video playback"
 msgstr ""
 
-#: src/omc-learn.c:1414
+#: src/omc-learn.c:1404
 msgid "Stop video playback"
 msgstr ""
 
-#: src/omc-learn.c:1418
+#: src/omc-learn.c:1408
 msgid "Clip select <clipnum>"
 msgstr ""
 
-#: src/omc-learn.c:1419
+#: src/omc-learn.c:1409
 msgid "Switch foreground clip to the nth valid clip"
 msgstr ""
 
-#: src/omc-learn.c:1423
+#: src/omc-learn.c:1413
 msgid "Play forwards"
 msgstr ""
 
-#: src/omc-learn.c:1424
+#: src/omc-learn.c:1414
 msgid "Play video in a forwards direction"
 msgstr ""
 
-#: src/omc-learn.c:1427
+#: src/omc-learn.c:1417
 msgid "Play backwards"
 msgstr ""
 
-#: src/omc-learn.c:1428
+#: src/omc-learn.c:1418
 msgid "Play video in a backwards direction"
 msgstr ""
 
-#: src/omc-learn.c:1431
+#: src/omc-learn.c:1421
 msgid "Reverse playback direction"
 msgstr ""
 
-#: src/omc-learn.c:1432
+#: src/omc-learn.c:1422
 msgid "Reverse direction of video playback"
 msgstr ""
 
-#: src/omc-learn.c:1435
+#: src/omc-learn.c:1425
 msgid "Play video faster"
 msgstr ""
 
-#: src/omc-learn.c:1436
+#: src/omc-learn.c:1426
 msgid "Play video at a slightly faster rate"
 msgstr ""
 
-#: src/omc-learn.c:1439
+#: src/omc-learn.c:1429
 msgid "Play video slower"
 msgstr ""
 
-#: src/omc-learn.c:1440
+#: src/omc-learn.c:1430
 msgid "Play video at a slightly slower rate"
 msgstr ""
 
-#: src/omc-learn.c:1443
+#: src/omc-learn.c:1433
 msgid "Toggle video freeze"
 msgstr ""
 
-#: src/omc-learn.c:1444
+#: src/omc-learn.c:1434
 msgid "Freeze video, or if already frozen, unfreeze it"
 msgstr ""
 
-#: src/omc-learn.c:1447
+#: src/omc-learn.c:1437
 msgid "Set video framerate to <fps>"
 msgstr ""
 
-#: src/omc-learn.c:1448
+#: src/omc-learn.c:1438
 msgid "Set framerate of foreground clip to <float fps>"
 msgstr ""
 
-#: src/omc-learn.c:1452
+#: src/omc-learn.c:1442
 msgid "Start recording"
 msgstr ""
 
-#: src/omc-learn.c:1455
+#: src/omc-learn.c:1445
 msgid "Stop recording"
 msgstr "إيقاف التسجيل"
 
-#: src/omc-learn.c:1458
+#: src/omc-learn.c:1448
 msgid "Toggle recording state"
 msgstr ""
 
-#: src/omc-learn.c:1461
+#: src/omc-learn.c:1451
 msgid "Swap foreground and background clips"
 msgstr ""
 
-#: src/omc-learn.c:1463
+#: src/omc-learn.c:1453
 msgid "Reset effect keys"
 msgstr ""
 
-#: src/omc-learn.c:1464
+#: src/omc-learn.c:1454
 msgid "Switch all effects off."
 msgstr ""
 
-#: src/omc-learn.c:1467
+#: src/omc-learn.c:1457
 msgid "Enable effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1471
+#: src/omc-learn.c:1461
 msgid "Disable effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1475
+#: src/omc-learn.c:1465
 msgid "Toggle effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1479
+#: src/omc-learn.c:1469
 msgid "Set parameter value <key> <pnum> = <value>"
 msgstr ""
 
-#: src/omc-learn.c:1480
+#: src/omc-learn.c:1470
 msgid "Set <value> of pth (numerical) parameter for effect key <key>."
 msgstr ""
 
-#: src/omc-learn.c:1484
+#: src/omc-learn.c:1474
 msgid "Switch foreground to next clip"
 msgstr ""
 
-#: src/omc-learn.c:1487
+#: src/omc-learn.c:1477
 msgid "Switch foreground to previous clip"
 msgstr ""
 
-#: src/omc-learn.c:1490
+#: src/omc-learn.c:1480
 msgid "Set video framerate to ratio <fps_ratio>"
 msgstr ""
 
-#: src/omc-learn.c:1491
+#: src/omc-learn.c:1481
 msgid "Set framerate ratio of foreground clip to <float fps_ratio>"
 msgstr ""
 
-#: src/omc-learn.c:1495
+#: src/omc-learn.c:1485
 msgid "Retrigger clip <clipnum>"
 msgstr ""
 
-#: src/omc-learn.c:1496
+#: src/omc-learn.c:1486
 msgid ""
 "Switch foreground clip to the nth valid clip, and reset the frame number"
 msgstr ""
 
-#: src/omc-learn.c:1500
+#: src/omc-learn.c:1490
 msgid "Cycle to next mode for effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1504
+#: src/omc-learn.c:1494
 msgid "Cycle to previous mode for effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1508
+#: src/omc-learn.c:1498
 msgid "Set playback plugin parameter value <pnum> = <value>"
 msgstr ""
 
-#: src/omc-learn.c:1509
+#: src/omc-learn.c:1499
 msgid "Set <value> of pth parameter for the playback plugin."
 msgstr ""
 
 #. TRANSLATORS: short form of "clip number"
-#: src/omc-learn.c:1536 src/omc-learn.c:1607
+#: src/omc-learn.c:1526 src/omc-learn.c:1597
 msgid "clipnum"
 msgstr ""
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1545
+#: src/omc-learn.c:1535
 msgid "fps"
 msgstr "إطار في الثانية"
 
 #. TRANSLATORS: as in keyboard key
-#: src/omc-learn.c:1553 src/omc-learn.c:1560 src/omc-learn.c:1567
-#: src/omc-learn.c:1575 src/omc-learn.c:1615 src/omc-learn.c:1623
+#: src/omc-learn.c:1543 src/omc-learn.c:1550 src/omc-learn.c:1557
+#: src/omc-learn.c:1565 src/omc-learn.c:1605 src/omc-learn.c:1613
 msgid "key"
 msgstr ""
 
 #. TRANSLATORS: short form of "parameter number"
-#: src/omc-learn.c:1583 src/omc-learn.c:1632
+#: src/omc-learn.c:1573 src/omc-learn.c:1622
 msgid "pnum"
 msgstr ""
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1599
+#: src/omc-learn.c:1589
 msgid "fps_ratio"
 msgstr ""
 
-#: src/omc-learn.c:2443
+#: src/omc-learn.c:2417
 #, c-format
 msgid "Saving device mapping to file %s..."
 msgstr ""
 
-#: src/omc-learn.c:2527
+#: src/omc-learn.c:2498
 #, c-format
 msgid ""
 "\n"
@@ -9879,7 +9882,7 @@
 "%s\n"
 msgstr ""
 
-#: src/omc-learn.c:2534
+#: src/omc-learn.c:2505
 #, c-format
 msgid ""
 "\n"
@@ -9888,12 +9891,12 @@
 "%s\n"
 msgstr ""
 
-#: src/omc-learn.c:2571
+#: src/omc-learn.c:2541
 #, c-format
 msgid "Loading device mapping from file %s..."
 msgstr ""
 
-#: src/omc-learn.c:2576
+#: src/omc-learn.c:2544
 #, c-format
 msgid ""
 "\n"
@@ -9903,12 +9906,12 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/videodev.c:547
+#: src/videodev.c:539
 #, c-format
 msgid "Unable to open device %s\n"
 msgstr ""
 
-#: src/videodev.c:564
+#: src/videodev.c:554
 #, c-format
 msgid "Opened device %s\n"
 msgstr ""
@@ -10733,6 +10736,9 @@
 #~ msgid "$error"
 #~ msgstr "$خطأ"
 
+#~ msgid "Pause"
+#~ msgstr "ايقاف مؤقت"
+
 #~ msgid "                                                            "
 #~ msgstr "                                                            "

LiVES-2.2.8.tar.bz2/po/ca.po -> LiVES-2.4.1.tar.bz2/po/ca.po Changed

@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n"
-"POT-Creation-Date: 2015-02-08 17:18-0300\n"
+"POT-Creation-Date: 2015-08-09 14:52-0300\n"
 "PO-Revision-Date: 2013-03-14 12:31+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Catalan <ca@li.org>\n"
@@ -18,8 +18,7 @@
 "X-Launchpad-Export-Date: 2013-03-28 10:41+0000\n"
 "X-Generator: Launchpad (build 16546)\n"
 
-#. TRANSLATORS: do not translate this message
-#: src/main.c:118
+#: src/main.c:128
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -28,22 +27,22 @@
 "http://lives.sourceforge.net/TRANS-README.txt"
 msgstr ""
 
-#: src/main.c:134
+#: src/main.c:153
 #, c-format
 msgid "%s Warning: %s\n"
 msgstr ""
 
-#: src/main.c:138
+#: src/main.c:157
 #, c-format
 msgid "%s Critical error: %s\n"
 msgstr ""
 
-#: src/main.c:139
+#: src/main.c:158
 #, c-format
 msgid "%s Fatal error: %s\n"
 msgstr ""
 
-#: src/main.c:176
+#: src/main.c:198
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -57,7 +56,7 @@
 "group_id=64341&atid=507139\n"
 "Gràcies. La recuperació ha de ser possible si es reinicia LiVES.\n"
 
-#: src/main.c:177
+#: src/main.c:199
 msgid ""
 "\n"
 "\n"
@@ -69,7 +68,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:180
+#: src/main.c:203
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -77,7 +76,7 @@
 "Tot seguit hi haurà alguna informació:\n"
 "\n"
 
-#: src/main.c:184
+#: src/main.c:206
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
@@ -87,84 +86,84 @@
 "informació.\n"
 "\n"
 
-#: src/main.c:192
+#: src/main.c:216
 msgid "Preserving set.\n"
 msgstr "Grup de seguretat.\n"
 
-#: src/main.c:636
+#: src/main.c:691
 msgid "Resizing"
 msgstr "Redimensionat"
 
-#: src/main.c:643
+#: src/main.c:698
 msgid "_Resize All Frames"
 msgstr "reconfigureu totes les finestres"
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:895
+#: src/main.c:948
 msgid "Any"
 msgstr "qualsevol"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:897
+#: src/main.c:950
 msgid "None"
 msgstr "Cap"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:899
+#: src/main.c:952
 msgid "recommended"
 msgstr "Recomanat"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:901
+#: src/main.c:954
 msgid "disabled !"
 msgstr "Espatllat"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:903
+#: src/main.c:956
 msgid "**The current layout**"
 msgstr "**El disseny actual**"
 
 #. TRANSLATORS: adjective for "Built in" type effects
-#: src/main.c:905
+#: src/main.c:958
 msgid "Builtin"
 msgstr "Incorporat"
 
 #. TRANSLATORS: adjective for "Custom" type effects
-#: src/main.c:907
+#: src/main.c:960
 msgid "Custom"
 msgstr "Personalitzat"
 
 #. TRANSLATORS: adjective for "Test" type effects
-#: src/main.c:909
+#: src/main.c:962
 msgid "Test"
 msgstr "Comprova"
 
-#: src/main.c:1054
+#: src/main.c:1107
 msgid "Foreground"
 msgstr ""
 
-#: src/main.c:1055
+#: src/main.c:1108
 #, fuzzy
 msgid "Background"
 msgstr "_Inici"
 
-#: src/main.c:1566
+#: src/main.c:1624
 msgid "Loading realtime effect plugins..."
 msgstr "Carregant connexió d'efectes reals"
 
-#: src/main.c:1631
+#: src/main.c:1690
 msgid "Starting jack audio server..."
 msgstr "Començant connexió de servidor d'audio jack..."
 
-#: src/main.c:1633
+#: src/main.c:1692
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1634
+#: src/main.c:1693
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1663
+#: src/main.c:1723
 #, c-format
 msgid ""
 "\n"
@@ -176,114 +175,114 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1697
+#: src/main.c:1758
 msgid "Starting pulse audio server..."
 msgstr "Començant servidor d'audio pulsant..."
 
-#: src/main.c:1765
+#: src/main.c:1825
 msgid "Checking optional dependencies:"
 msgstr "Comprovant dependències opcionals:"
 
-#: src/main.c:1766
+#: src/main.c:1826
 msgid "mplayer...detected..."
 msgstr "mplayer...detectat..."
 
-#: src/main.c:1767
+#: src/main.c:1827
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...NO S'HA DETECTAT..."
 
-#: src/main.c:1768
+#: src/main.c:1828
 #, fuzzy
 msgid "mplayer2...detected..."
 msgstr "mplayer...detectat..."
 
-#: src/main.c:1769
+#: src/main.c:1829
 #, fuzzy
 msgid "mplayer2...NOT DETECTED..."
 msgstr "mplayer...NO S'HA DETECTAT..."
 
-#: src/main.c:1770
+#: src/main.c:1830
 msgid "convert...detected..."
 msgstr "detectat convertidor"
 
-#: src/main.c:1771
+#: src/main.c:1831
 msgid "convert...NOT DETECTED..."
 msgstr "NO S'HA DETECTAT convertidor"
 
-#: src/main.c:1772
+#: src/main.c:1832
 msgid "composite...detected..."
 msgstr "detectada composició"
 
-#: src/main.c:1773
+#: src/main.c:1833
 msgid "composite...NOT DETECTED..."
 msgstr "NO S'HA DETECTAT composició"
 
-#: src/main.c:1774
+#: src/main.c:1834
 msgid "sox...detected\n"
 msgstr "sox...detectat...\n"
 
-#: src/main.c:1775
+#: src/main.c:1835
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...NO S'HA DETECTAT...\n"
 
-#: src/main.c:1776
+#: src/main.c:1836
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...detectat..."
 
-#: src/main.c:1777
+#: src/main.c:1837
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...NO S'HA DETECTAT..."
 
-#: src/main.c:1778
+#: src/main.c:1838
 msgid "jackd...detected..."
 msgstr "jackd...detectat..."
 
-#: src/main.c:1779
+#: src/main.c:1839
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...NO S'HA DETECTAT..."
 
-#: src/main.c:1780
+#: src/main.c:1840
 msgid "pulse audio...detected..."
 msgstr "pulse audio...detectat..."
 
-#: src/main.c:1781
+#: src/main.c:1841
 msgid "pulse audio...NOT DETECTED..."
 msgstr "pulse audio...NO S'HA DETECTAT..."
 
-#: src/main.c:1782
+#: src/main.c:1842
 msgid "python...detected..."
 msgstr "python...detectat..."
 
-#: src/main.c:1783
+#: src/main.c:1843
 msgid "python...NOT DETECTED..."
 msgstr "python...NO S'HA DETECTAT..."
 
-#: src/main.c:1784
+#: src/main.c:1844
 msgid "dvgrab...detected..."
 msgstr "dvgrab...detectat..."
 
-#: src/main.c:1785
+#: src/main.c:1845
 msgid "dvgrab...NOT DETECTED..."
 msgstr "dvgrab...NO S'HA DETECTAT..."
 
-#: src/main.c:1786
+#: src/main.c:1846
 msgid "xwininfo...detected..."
 msgstr "xwininfo...detectat..."
 
-#: src/main.c:1787
+#: src/main.c:1847
 msgid "xwininfo...NOT DETECTED..."
 msgstr "xwininfo...NO S'HA DETECTAT..."
 
-#: src/main.c:1793
+#: src/main.c:1853
 #, c-format
 msgid "Windows version %04X"
 msgstr ""
 
-#: src/main.c:1795
+#: src/main.c:1855
 msgid "UNKNOWN - please patch me !"
 msgstr ""
 
-#: src/main.c:1799
+#: src/main.c:1859
 #, c-format
 msgid ""
 "\n"
@@ -294,63 +293,63 @@
 "\n"
 "Administrador Finestra d'informes com \"%s\"; "
 
-#: src/main.c:1802
+#: src/main.c:1862
 #, c-format
 msgid "number of monitors detected: %d\n"
 msgstr "nombre de monitors detectat: %d\n"
 
-#: src/main.c:1805
+#: src/main.c:1865
 #, c-format
 msgid "Number of CPUs detected: %d "
 msgstr ""
 
-#: src/main.c:1808 src/multitrack.c:4902
+#: src/main.c:1868 src/multitrack.c:5068
 msgid "little endian"
 msgstr ""
 
-#: src/main.c:1809 src/multitrack.c:4901
+#: src/main.c:1869 src/multitrack.c:5067
 msgid "big endian"
 msgstr ""
 
-#: src/main.c:1810
+#: src/main.c:1870
 #, c-format
 msgid "(%d bits, %s)\n"
 msgstr ""
 
-#: src/main.c:1814
+#: src/main.c:1874
 msgid "GUI type is: "
 msgstr ""
 
-#: src/main.c:1818
+#: src/main.c:1878
 #, c-format
 msgid "GTK+ version %d.%d.%d (compiled with %d.%d.%d)"
 msgstr ""
 
-#: src/main.c:1840
+#: src/main.c:1900
 msgid ", with cairo support"
 msgstr ""
 
-#: src/main.c:1847
+#: src/main.c:1907
 #, c-format
 msgid "Temp directory is %s\n"
 msgstr "Directori temporal és %s\n"
 
-#: src/main.c:1851
+#: src/main.c:1911
 msgid ""
 "WARNING - this version of LiVES was compiled without either\n"
 "jack or pulse audio support.\n"
 "Many audio features will be unavailable.\n"
 msgstr ""
 
-#: src/main.c:1854
+#: src/main.c:1914
 msgid "Compiled with jack support, good !\n"
 msgstr "Compilat amb suport per a jack, bé !\n"
 
-#: src/main.c:1857
+#: src/main.c:1917
 msgid "Compiled with pulse audio support, wonderful !\n"
 msgstr "Compilat amb suport pulse audio, meravellós !\n"
 
-#: src/main.c:1861
+#: src/main.c:1921
 #, c-format
 msgid ""
 "Welcome to LiVES version %s.\n"
@@ -359,92 +358,97 @@
 "Benvingut a LiVES versió %s.\n"
 "\n"
 
-#: src/main.c:2306
+#: src/main.c:2380
 #, c-format
 msgid ""
 "\n"
 "Startup syntax is: %s [opts] [filename [start_time] [frames]]\n"
 msgstr ""
 
-#: src/main.c:2307
+#: src/main.c:2381
 msgid "Where: filename is the name of a media file or backup file.\n"
 msgstr ""
 
-#: src/main.c:2308
+#: src/main.c:2382
 msgid "start_time : filename start time in seconds\n"
 msgstr ""
 
-#: src/main.c:2309
+#: src/main.c:2383
 msgid "frames : maximum number of frames to open\n"
 msgstr "frames: nombre màxim de fotogrames per obrir\n"
 
-#: src/main.c:2311
+#: src/main.c:2385
 msgid "opts can be:\n"
 msgstr "opts poden ser:\n"
 
-#: src/main.c:2312
+#: src/main.c:2386
 msgid "-help            : show this help text and exit\n"
 msgstr "-help : mostra aquest text d'ajuda i sortir de\n"
 
-#: src/main.c:2313
+#: src/main.c:2387
 msgid "-tmpdir <tempdir>: use alternate working directory (e.g /var/ramdisk)\n"
 msgstr ""
 
-#: src/main.c:2314
+#: src/main.c:2388
 msgid "-set <setname>   : autoload clip set setname\n"
 msgstr ""
 
-#: src/main.c:2315
+#: src/main.c:2389
 msgid "-noset           : do not load any set on startup\n"
 msgstr "-noset : no carregueu cap conjunt en l'arrencada\n"
 
-#: src/main.c:2316
+#: src/main.c:2390
 msgid "-norecover       : force no-loading of crash recovery\n"
 msgstr ""
 
-#: src/main.c:2317
+#: src/main.c:2391
 msgid "-recover         : force loading of crash recovery\n"
 msgstr "-recover : càrrega de força de xoc de recuperació\n"
 
-#: src/main.c:2318
-msgid "-nothreaddialog  : doe nothing - retained for backwards compatibility\n"
+#: src/main.c:2392
+msgid ""
+"-nothreaddialog  : does nothing - retained for backwards compatibility\n"
 msgstr ""
 
-#: src/main.c:2319
+#: src/main.c:2393
 msgid "-nogui           : do not show the gui\n"
 msgstr "-nogui : no mostrar la interfície gràfica d'usuari\n"
 
-#: src/main.c:2320
+#: src/main.c:2394
 msgid "-nosplash        : do not show the splash window\n"
 msgstr ""
 
-#: src/main.c:2321
+#: src/main.c:2395
 msgid "-noplaywin       : do not show the play window\n"
 msgstr ""
 
-#: src/main.c:2322
+#: src/main.c:2396
+msgid "-noninteractive  : disable menu interactivity\n"
+msgstr ""
+
+#: src/main.c:2397
 msgid "-startup-ce      : start in clip editor mode\n"
 msgstr "-startup-ce : començarà en mode d'imatge en l'editor\n"
 
-#: src/main.c:2323
+#: src/main.c:2398
 msgid "-startup-mt      : start in multitrack mode\n"
 msgstr "-startup-mt : començarà en la manera multipista\n"
 
-#: src/main.c:2324
+#: src/main.c:2399
 msgid ""
 "-fxmodesmax <n>  : allow <n> modes per effect key (minimum is 1, default is "
 "8)\n"
 msgstr ""
 
-#: src/main.c:2326
+#: src/main.c:2401
 msgid "-oscstart <port> : start OSC listener on UDP port <port>\n"
 msgstr ""
 
-#: src/main.c:2327
+#: src/main.c:2402
 msgid "-nooscstart      : do not start OSC listener\n"
 msgstr "-nooscstart : no comenci oient OSC\n"
 
-#: src/main.c:2329
+#: src/main.c:2404
 #, fuzzy
 msgid ""
 "-aplayer <ap>    : start with selected audio player. <ap> can be mplayer, "
@@ -454,45 +458,45 @@
 "ser mplayer"
 
 #. TRANSLATORS: pulse (audio)
-#: src/main.c:2332
+#: src/main.c:2407
 msgid ", pulse"
 msgstr ", pulse"
 
-#: src/main.c:2335
+#: src/main.c:2410
 msgid ", sox or jack\n"
 msgstr ", sox o jack\n"
 
-#: src/main.c:2336
+#: src/main.c:2412
 msgid ""
 "-jackopts <opts>    : opts is a bitmap of jack startup options [1 = jack "
 "transport client, 2 = jack transport master, 4 = start jack transport "
 "server, 8 = pause audio when video paused, 16 = start jack audio server] \n"
 msgstr ""
 
-#: src/main.c:2338
+#: src/main.c:2414
 msgid " or sox\n"
 msgstr " o sox\n"
 
-#: src/main.c:2340
+#: src/main.c:2416
 msgid "-devicemap <mapname>          : autoload devicemap\n"
 msgstr ""
 
-#: src/main.c:2341
+#: src/main.c:2418
 msgid ""
 "-vppdefaults <file>          : load video playback plugin defaults from "
 "<file> (Note: only sets the settings, not the plugin type)\n"
 msgstr ""
 
-#: src/main.c:2342
+#: src/main.c:2419
 msgid "-debug            : try to debug crashes (requires 'gdb' installed)\n"
 msgstr ""
 "-debug : tractar d'accidents de depuració (requereix 'gdb' instal lat)\n"
 
-#: src/main.c:2373 src/gui.c:1128
+#: src/main.c:2449 src/gui.c:1127
 msgid "Starting GUI..."
 msgstr "A partir GUI ..."
 
-#: src/main.c:2396
+#: src/main.c:2475
 #, c-format
 msgid ""
 "\n"
@@ -503,7 +507,7 @@
 "(Maybe you need to change the value of <prefix_dir> in your %s file)\n"
 msgstr ""
 
-#: src/main.c:2410
+#: src/main.c:2492
 #, c-format
 msgid ""
 "\n"
@@ -511,7 +515,7 @@
 "Please make sure you have write access to %s and try again.\n"
 msgstr ""
 
-#: src/main.c:2415
+#: src/main.c:2498
 msgid ""
 "\n"
 "`smogrify` must be in your path, and be executable\n"
@@ -520,7 +524,7 @@
 "before running LiVES.\n"
 msgstr ""
 
-#: src/main.c:2421
+#: src/main.c:2504
 #, c-format
 msgid ""
 "\n"
@@ -530,7 +534,7 @@
 "Please check the file permissions for this file and try again.\n"
 msgstr ""
 
-#: src/main.c:2428
+#: src/main.c:2512
 #, c-format
 msgid ""
 "\n"
@@ -541,7 +545,7 @@
 "and try again.\n"
 msgstr ""
 
-#: src/main.c:2438
+#: src/main.c:2522
 #, c-format
 msgid ""
 "Please check the <tempdir> setting in \n"
@@ -549,7 +553,7 @@
 "and try again.\n"
 msgstr ""
 
-#: src/main.c:2445
+#: src/main.c:2528
 #, c-format
 msgid ""
 "\n"
@@ -559,7 +563,7 @@
 "%s"
 msgstr ""
 
-#: src/main.c:2453
+#: src/main.c:2536
 msgid ""
 "\n"
 "An incorrect version of smogrify was found in your path.\n"
@@ -570,49 +574,49 @@
 "Thankyou.\n"
 msgstr ""
 
-#: src/main.c:2458
+#: src/main.c:2541
 msgid ""
 "\n"
 "LiVES currently requires 'mplayer', 'mplayer2' or 'sox' to function. Please "
 "install one or other of these, and try again.\n"
 msgstr ""
 
-#: src/main.c:2462
+#: src/main.c:2546
 msgid ""
 "\n"
 "LiVES currently requires both 'mplayer' or 'mplayer2' and 'sox' to function. "
 "Please install these, and try again.\n"
 msgstr ""
 
-#: src/main.c:2472
+#: src/main.c:2556
 msgid ""
 "\n"
 "LiVES was unable to locate 'mplayer' or 'mplayer2'. You may wish to install "
 "either one to use LiVES more fully.\n"
 msgstr ""
 
-#: src/main.c:2475
+#: src/main.c:2561
 msgid ""
 "\n"
 "LiVES was unable to locate 'convert'. You should install convert and image-"
 "magick if you want to use rendered effects.\n"
 msgstr ""
 
-#: src/main.c:2478
+#: src/main.c:2566
 msgid ""
 "\n"
 "LiVES was unable to locate 'composite'. You should install composite and "
 "image-magick if you want to use the merge function.\n"
 msgstr ""
 
-#: src/main.c:2481
+#: src/main.c:2570
 msgid ""
 "\n"
 "LiVES was unable to locate 'sox'. Some audio features may not work. You "
 "should install 'sox'.\n"
 msgstr ""
 
-#: src/main.c:2484
+#: src/main.c:2575
 #, c-format
 msgid ""
 "\n"
@@ -623,93 +627,93 @@
 "You may need to change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/main.c:2611
+#: src/main.c:2707
 #, c-format
 msgid "Autoloading set %s..."
 msgstr ""
 
 #. TRANSLATORS: localised name may be used here
-#: src/main.c:2781 src/interface.c:738
+#: src/main.c:2902
 msgid "LiVES"
 msgstr ""
 
-#: src/main.c:2948
+#: src/main.c:3066
 #, c-format
 msgid "Invalid audio player %s\n"
 msgstr ""
 
-#: src/main.c:3077
+#: src/main.c:3214
 #, c-format
 msgid "LiVES-%s: <Untitled%d> %dx%d : %d frames %d bpp %.3f fps"
 msgstr ""
 
-#: src/main.c:3082
+#: src/main.c:3219
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : ??? frames ??? bpp %.3f fps"
 msgstr ""
 
-#: src/main.c:3086
+#: src/main.c:3222
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : %d frames %d bpp %.3f fps"
 msgstr ""
 
-#: src/main.c:3094
+#: src/main.c:3229
 #, c-format
 msgid "LiVES-%s: <No File>"
 msgstr "LiVES-%s: <N d'arxiu>"
 
 #. TRANSLATORS: rec(ord)
-#: src/main.c:5085
+#: src/main.c:5201
 #, c-format
 msgid "rec %9d/%d"
 msgstr ""
 
 #. TRANSLATORS: out of memory (rec(ord))
-#: src/main.c:5091
+#: src/main.c:5206
 #, c-format
 msgid "!rec %9d/%d"
 msgstr ""
 
-#: src/main.c:5398 src/main.c:5399 src/gui.c:2110 src/gui.c:3220
-#: src/saveplay.c:2336
+#: src/main.c:5500 src/main.c:5501 src/gui.c:2108 src/gui.c:3331
+#: src/saveplay.c:2315
 msgid "Play"
 msgstr "Reprodueix"
 
-#: src/main.c:6128
+#: src/main.c:6216
 msgid ""
 "LiVES was unable to capture this image\n"
 "\n"
 msgstr ""
 
-#: src/main.c:6250
+#: src/main.c:6345
 #, c-format
 msgid "Closed file %s\n"
 msgstr "Tancat el fitxer %s\n"
 
-#: src/main.c:6452 src/gui.c:648 src/utils.c:4312 src/utils.c:4344
-#: src/saveplay.c:3550 src/multitrack.c:4510 src/multitrack.c:6268
+#: src/main.c:6542 src/gui.c:647 src/utils.c:4256 src/utils.c:4286
+#: src/saveplay.c:3500 src/multitrack.c:4678 src/multitrack.c:6447
 msgid "_Undo"
 msgstr "_Desfés"
 
-#: src/main.c:6453 src/gui.c:666 src/utils.c:4313 src/utils.c:4345
-#: src/saveplay.c:3551 src/multitrack.c:4531 src/multitrack.c:6293
+#: src/main.c:6543 src/gui.c:665 src/utils.c:4257 src/utils.c:4287
+#: src/saveplay.c:3501 src/multitrack.c:4698 src/multitrack.c:6472
 msgid "_Redo"
 msgstr "_Refés"
 
-#: src/main.c:6493 src/interface.c:470 src/gui.c:2326 src/preferences.c:2357
-#: src/resample.c:1516
+#: src/main.c:6583 src/interface.c:457 src/gui.c:2324 src/preferences.c:2391
+#: src/resample.c:1488
 msgid "Video"
 msgstr "Vídeo"
 
-#: src/main.c:6494 src/interface.c:483 src/gui.c:2351
+#: src/main.c:6584 src/interface.c:470 src/gui.c:2348
 msgid "Left Audio"
 msgstr ""
 
-#: src/main.c:6495 src/gui.c:2375
+#: src/main.c:6585 src/gui.c:2371
 msgid "Right Audio"
 msgstr ""
 
-#: src/main.c:6540
+#: src/main.c:6630
 msgid ""
 "\n"
 "\n"
@@ -718,11 +722,11 @@
 "Please adjust the playback options in Preferences and try again.\n"
 msgstr ""
 
-#: src/main.c:7051 src/plugins.c:1502
+#: src/main.c:7134 src/plugins.c:1468
 msgid "LiVES: - Play Window"
 msgstr ""
 
-#: src/startup.c:25
+#: src/startup.c:24
 #, c-format
 msgid ""
 "A directory named\n"
@@ -732,7 +736,7 @@
 "(Free space = %s)\n"
 msgstr ""
 
-#: src/startup.c:32
+#: src/startup.c:29
 #, c-format
 msgid ""
 "A directory named\n"
@@ -742,7 +746,7 @@
 "Please select another location.\n"
 msgstr ""
 
-#: src/startup.c:49
+#: src/startup.c:46
 #, c-format
 msgid ""
 "\n"
@@ -753,7 +757,7 @@
 "(Free space = %s)"
 msgstr ""
 
-#: src/startup.c:54
+#: src/startup.c:50
 #, c-format
 msgid ""
 "\n"
@@ -762,54 +766,54 @@
 "Please try again and choose a different location.\n"
 msgstr ""
 
-#: src/startup.c:96
+#: src/startup.c:92
 msgid "Directory name is too long !"
 msgstr ""
 
-#: src/startup.c:223
+#: src/startup.c:216
 msgid ""
 "LiVES FAILED TO START YOUR SELECTED AUDIO PLAYER !\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:230
+#: src/startup.c:222
 msgid ""
 "Before starting LiVES, you need to choose an audio player.\n"
 "\n"
 "PULSE AUDIO is recommended for most users"
 msgstr ""
 
-#: src/startup.c:233
+#: src/startup.c:225
 msgid ""
 ", but this version of LiVES was not compiled with pulse audio support.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:236
+#: src/startup.c:229
 msgid ""
 ", but you do not have pulse audio installed on your system.\n"
 " You are advised to install pulse audio first before running LiVES.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:241
+#: src/startup.c:233
 msgid "JACK audio is recommended for pro users"
 msgstr ""
 
-#: src/startup.c:244
+#: src/startup.c:236
 msgid ""
 ", but this version of LiVES was not compiled with jack audio support.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:247
+#: src/startup.c:239
 msgid ""
 ", but you do not have jackd installed. You may wish to install jackd first "
 "before running LiVES.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:250
+#: src/startup.c:242
 msgid ""
 ", but may prevent LiVES from starting on some systems.\n"
 "If LiVES will not start with jack, you can restart and try with another "
@@ -817,159 +821,159 @@
 "\n"
 msgstr ""
 
-#: src/startup.c:254
+#: src/startup.c:246
 msgid "SOX may be used if neither of the preceding players work, "
 msgstr ""
 
-#: src/startup.c:257
+#: src/startup.c:249
 msgid ""
 "but some audio features will be disabled.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:260
+#: src/startup.c:251
 msgid ""
 "but you do not have sox installed.\n"
 "You are advised to install it before running LiVES.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:264
+#: src/startup.c:255
 msgid ""
 "The MPLAYER/MPLAYER2 audio player is only recommended for testing purposes.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:281
+#: src/startup.c:271
 msgid "LiVES: - Choose an audio player"
 msgstr ""
 
-#: src/startup.c:298
+#: src/startup.c:288
 msgid "Use _pulse audio player"
 msgstr ""
 
-#: src/startup.c:320
+#: src/startup.c:310
 msgid "Use _jack audio player"
 msgstr ""
 
-#: src/startup.c:340
+#: src/startup.c:330
 msgid "Use _sox audio player"
 msgstr ""
 
-#: src/startup.c:361
+#: src/startup.c:351
 msgid "Use _mplayer audio player"
 msgstr ""
 
-#: src/startup.c:381
+#: src/startup.c:371
 msgid "Use _mplayer2 audio player"
 msgstr ""
 
-#: src/startup.c:405 src/startup.c:580 src/interface.c:1506
+#: src/startup.c:395 src/startup.c:569 src/interface.c:1398
 msgid "_Next"
 msgstr "_Següent"
 
-#: src/startup.c:445
+#: src/startup.c:435
 msgid "Skipped"
 msgstr ""
 
-#: src/startup.c:460
+#: src/startup.c:450
 msgid "Passed"
 msgstr ""
 
-#: src/startup.c:493
+#: src/startup.c:483
 msgid "Failed"
 msgstr ""
 
-#: src/startup.c:552
+#: src/startup.c:542
 msgid "LiVES: - Testing Configuration"
 msgstr ""
 
-#: src/startup.c:555
+#: src/startup.c:544
 msgid "LiVES: - Troubleshoot"
 msgstr ""
 
-#: src/startup.c:568
+#: src/startup.c:557
 msgid "LiVES will now run some basic configuration tests\n"
 msgstr ""
 
-#: src/startup.c:603
+#: src/startup.c:591
 msgid "Checking for \"sox\" presence"
 msgstr ""
 
-#: src/startup.c:607
+#: src/startup.c:595
 msgid ""
 "You should install sox to be able to use all the audio features in LiVES"
 msgstr ""
 
-#: src/startup.c:615
+#: src/startup.c:602
 msgid "Checking if sox can convert audio"
 msgstr ""
 
-#: src/startup.c:638
+#: src/startup.c:625
 msgid "Unable to allocate 176400 bytes memory."
 msgstr ""
 
-#: src/startup.c:653
+#: src/startup.c:639
 #, c-format
 msgid "Unable to write to: %s"
 msgstr ""
 
-#: src/startup.c:667 src/startup.c:807
+#: src/startup.c:653 src/startup.c:789
 #, c-format
 msgid "Command failed: %s"
 msgstr ""
 
-#: src/startup.c:689
+#: src/startup.c:675
 msgid "You should install sox_fmt_all or similar"
 msgstr ""
 
-#: src/startup.c:717
+#: src/startup.c:703
 msgid "Checking for \"mplayer\" presence"
 msgstr ""
 
-#: src/startup.c:721
+#: src/startup.c:707
 msgid ""
 "You should install mplayer or mplayer2 to be able to use all the decoding "
 "features in LiVES"
 msgstr ""
 
-#: src/startup.c:747
+#: src/startup.c:732
 msgid "Checking if mplayer can convert audio"
 msgstr ""
 
-#: src/startup.c:768
+#: src/startup.c:751
 msgid "You should install mplayer or mplayer2 with pcm/wav support"
 msgstr ""
 
-#: src/startup.c:785
+#: src/startup.c:767
 msgid "Checking if mplayer can decode to png/alpha"
 msgstr ""
 
-#: src/startup.c:828
+#: src/startup.c:810
 msgid "You may wish to upgrade mplayer to a newer version"
 msgstr ""
 
-#: src/startup.c:854
+#: src/startup.c:836
 msgid "Checking if mplayer can decode to jpeg"
 msgstr ""
 
-#: src/startup.c:882
+#: src/startup.c:862
 msgid "You should install mplayer with either png/alpha or jpeg support"
 msgstr ""
 
-#: src/startup.c:883
+#: src/startup.c:863
 msgid "You may wish to add jpeg output support to mplayer"
 msgstr ""
 
-#: src/startup.c:892
+#: src/startup.c:872
 msgid "Checking for \"convert\" presence"
 msgstr ""
 
-#: src/startup.c:896
+#: src/startup.c:876
 msgid "Install imageMagick to be able to use all of the rendered effects"
 msgstr ""
 
-#: src/startup.c:909
+#: src/startup.c:889
 msgid ""
 "\n"
 "\n"
@@ -977,7 +981,7 @@
 "Preferences/Decoding.    \n"
 msgstr ""
 
-#: src/startup.c:915
+#: src/startup.c:894
 msgid ""
 "\n"
 "\n"
@@ -985,49 +989,49 @@
 "continue    \n"
 msgstr ""
 
-#: src/startup.c:949
+#: src/startup.c:928
 msgid ""
 "\n"
 "\n"
 "Finally, you can choose the default startup interface for LiVES.\n"
 msgstr ""
 
-#: src/startup.c:950
+#: src/startup.c:929
 msgid ""
 "\n"
 "\n"
 "LiVES has two main interfaces and you can start up with either of them.\n"
 msgstr ""
 
-#: src/startup.c:951
+#: src/startup.c:930
 msgid ""
 "\n"
 "\n"
 "The default can always be changed later from Preferences.\n"
 msgstr ""
 
-#: src/startup.c:961
+#: src/startup.c:940
 msgid "LiVES: - Choose the startup interface"
 msgstr ""
 
-#: src/startup.c:972
+#: src/startup.c:951
 msgid "Start in _Clip Edit mode"
 msgstr ""
 
-#: src/startup.c:975
+#: src/startup.c:954
 msgid "This is the best choice for simple editing tasks and for VJs\n"
 msgstr ""
 
-#: src/startup.c:981
+#: src/startup.c:960
 msgid "Start in _Multitrack mode"
 msgstr ""
 
-#: src/startup.c:983
+#: src/startup.c:962
 msgid ""
 "This is a better choice for complex editing tasks involving multiple clips.\n"
 msgstr ""
 
-#: src/startup.c:992
+#: src/startup.c:971
 msgid "_Finish"
 msgstr ""
 
@@ -1044,35 +1048,35 @@
 msgid "Apply _Deinterlace"
 msgstr ""
 
-#: src/interface.c:66
+#: src/interface.c:65
 msgid "If this is set, frames will be deinterlaced as they are imported."
 msgstr ""
 
-#: src/interface.c:113 src/callbacks.c:9623 src/callbacks.c:9646
-#: src/callbacks.c:9647 src/gui.c:3223 src/gui.c:3821 src/saveplay.c:2339
-#: src/saveplay.c:3138 src/dialogs.c:1514 src/dialogs.c:1515
-#: src/dialogs.c:1746 src/dialogs.c:1747 src/framedraw.c:238
-#: src/multitrack.c:8031
+#: src/interface.c:106 src/callbacks.c:9542 src/callbacks.c:9564
+#: src/callbacks.c:9565 src/gui.c:3333 src/gui.c:3946 src/saveplay.c:2317
+#: src/saveplay.c:3097 src/dialogs.c:1575 src/dialogs.c:1576
+#: src/dialogs.c:1804 src/dialogs.c:1805 src/framedraw.c:236
+#: src/multitrack.c:8210
 msgid "Preview"
 msgstr "Visualització prèvia"
 
-#: src/interface.c:132
+#: src/interface.c:125
 msgid "Click here to _Preview any selected video, image or audio file"
 msgstr ""
 
-#: src/interface.c:135
+#: src/interface.c:127
 msgid "Click here to _Preview any selected audio file"
 msgstr ""
 
-#: src/interface.c:138
+#: src/interface.c:129
 msgid "Click here to _Preview the video"
 msgstr ""
 
-#: src/interface.c:181 src/dialogs.c:2542
+#: src/interface.c:169 src/dialogs.c:2621
 msgid "LiVES: - Processing..."
 msgstr ""
 
-#: src/interface.c:217
+#: src/interface.c:205
 msgid ""
 "\n"
 "\n"
@@ -1086,8 +1090,8 @@
 "\n"
 "Recordeu apagar els efectes (ctrl-0) després !"
 
-#: src/interface.c:222 src/callbacks.c:9373 src/callbacks.c:9420
-#: src/dialogs.c:2570
+#: src/interface.c:210 src/callbacks.c:9283 src/callbacks.c:9332
+#: src/dialogs.c:2649
 msgid ""
 "\n"
 "Please Wait"
@@ -1095,188 +1099,178 @@
 "\n"
 "Esperi"
 
-#: src/interface.c:242
+#: src/interface.c:230
 msgid "Show Details"
 msgstr ""
 
-#: src/interface.c:254 src/dialogs.c:2584
+#: src/interface.c:242 src/dialogs.c:2663
 msgid "_Enough"
 msgstr "_Suficient"
 
-#: src/interface.c:255 src/framedraw.c:278
+#: src/interface.c:243 src/framedraw.c:276
 msgid "_Preview"
 msgstr "_Previsualització"
 
-#: src/interface.c:257
+#: src/interface.c:245 src/callbacks.c:9282 src/callbacks.c:9330
 msgid "Paus_e"
 msgstr ""
 
-#: src/interface.c:258 src/callbacks.c:9417
+#: src/interface.c:246 src/callbacks.c:9329
 msgid "Pause/_Enough"
 msgstr ""
 
-#: src/interface.c:285
+#: src/interface.c:273
 msgid "_Cancel"
 msgstr "_Cancel·la"
 
-#: src/interface.c:374
+#: src/interface.c:361
 #, c-format
 msgid "LiVES: - %s"
 msgstr ""
 
-#: src/interface.c:376
+#: src/interface.c:363
 msgid "LiVES: - Multitrack details"
 msgstr ""
 
-#: src/interface.c:407
+#: src/interface.c:394
 msgid "Format"
 msgstr "Formata"
 
-#: src/interface.c:412
+#: src/interface.c:399
 msgid "Frame size"
 msgstr "Mida del marc"
 
-#: src/interface.c:417
+#: src/interface.c:404
 msgid "File size"
 msgstr "Mida del fitxer"
 
-#: src/interface.c:418
+#: src/interface.c:405
 msgid "Byte size"
 msgstr ""
 
-#: src/interface.c:423 src/interface.c:1891
+#: src/interface.c:410 src/interface.c:1760
 msgid "FPS"
 msgstr "QPS"
 
-#: src/interface.c:428
+#: src/interface.c:415
 msgid "Frames"
 msgstr "Marcs"
 
-#: src/interface.c:429
+#: src/interface.c:416
 msgid "Events"
 msgstr "Esdeveniments"
 
-#: src/interface.c:434 src/interface.c:500 src/interface.c:542
+#: src/interface.c:421 src/interface.c:486 src/interface.c:528
 msgid "Total time"
 msgstr "Temps total"
 
-#: src/interface.c:486 src/resample.c:1488
+#: src/interface.c:472 src/resample.c:1460
 msgid "Audio"
 msgstr "Àudio"
 
-#: src/interface.c:511 src/interface.c:553
+#: src/interface.c:497 src/interface.c:539
 msgid "Rate/size"
 msgstr ""
 
-#: src/interface.c:530
+#: src/interface.c:516
 msgid "Right audio"
 msgstr ""
 
-#: src/interface.c:622
+#: src/interface.c:607
 msgid "LiVES: - Encoding options"
 msgstr ""
 
-#: src/interface.c:636
+#: src/interface.c:621
 msgid "<------------- (Check the box to re_size as suggested)"
 msgstr ""
 
-#: src/interface.c:637
+#: src/interface.c:622
 msgid "<------------- (Check the box to use the _size recommendation)"
 msgstr ""
 
-#: src/interface.c:662
+#: src/interface.c:646
 msgid "Use _letterboxing to maintain aspect ratio (optional)"
 msgstr ""
 
-#: src/interface.c:663
+#: src/interface.c:647
 msgid ""
 "Draw black rectangles either above or to the sides of the image, to prevent "
 "it from stretching."
 msgstr ""
 
-#: src/interface.c:694
+#: src/interface.c:677
 msgid "Keep _my settings"
 msgstr "Mantingui la configuració del _meu"
 
-#: src/interface.c:695
+#: src/interface.c:678
 msgid "Use _recommended settings"
 msgstr ""
 
-#: src/interface.c:775 src/dialogs.c:114
-msgid ""
-"Do _not show this warning any more\n"
-"(can be turned back on from Preferences/Warnings)"
-msgstr ""
-
-#: src/interface.c:787
-msgid "Show _Details"
-msgstr "Mostra _Detalls"
-
-#: src/interface.c:881
+#: src/interface.c:769
 msgid "_Close Window"
 msgstr "_Tanca la finestra"
 
-#: src/interface.c:883
+#: src/interface.c:771
 msgid "_Save to file"
 msgstr "_Desa en arxiu"
 
-#: src/interface.c:928
+#: src/interface.c:816
 msgid "LiVES: - Insert"
 msgstr "LiVES: - Insereix"
 
-#: src/interface.c:945
+#: src/interface.c:833
 msgid "_Number of times to insert"
 msgstr "_Nombre de vegades per inserir"
 
-#: src/interface.c:954
+#: src/interface.c:842
 msgid "_Insert to fit audio"
 msgstr ""
 
-#: src/interface.c:968
+#: src/interface.c:856
 msgid "Insert _before selection"
 msgstr ""
 
-#: src/interface.c:970
+#: src/interface.c:858
 msgid "Insert clipboard before selected frames"
 msgstr ""
 
-#: src/interface.c:986
+#: src/interface.c:875
 msgid "Insert _after selection"
 msgstr ""
 
-#: src/interface.c:988
+#: src/interface.c:877
 msgid "Insert clipboard after selected frames"
 msgstr ""
 
-#: src/interface.c:999
+#: src/interface.c:888
 msgid "Insert _with sound"
 msgstr "Insereix _amb el so"
 
-#: src/interface.c:1012
+#: src/interface.c:901
 msgid "Insert with_out sound"
 msgstr "Insereix _sense so"
 
-#: src/interface.c:1093
+#: src/interface.c:985
 msgid "LiVES: - Open Selection"
 msgstr "LiVES: - De selecció obert"
 
-#: src/interface.c:1111
+#: src/interface.c:1004
 msgid "Selection start time (sec)"
 msgstr ""
 
-#: src/interface.c:1117
+#: src/interface.c:1010
 msgid "Number of frames to open"
 msgstr ""
 
-#: src/interface.c:1193
+#: src/interface.c:1088
 msgid "LiVES: - Open Location"
 msgstr ""
 
-#: src/interface.c:1195
+#: src/interface.c:1090
 msgid "LiVES: - Open Youtube Clip"
 msgstr ""
 
-#: src/interface.c:1213
+#: src/interface.c:1109
 msgid ""
 "\n"
 "\n"
@@ -1286,7 +1280,7 @@
 "\n"
 msgstr ""
 
-#: src/interface.c:1216
+#: src/interface.c:1112
 msgid ""
 "\n"
 "\n"
@@ -1295,63 +1289,63 @@
 "\n"
 msgstr ""
 
-#: src/interface.c:1220
+#: src/interface.c:1116
 msgid ""
 "Enter the URL of the clip below.\n"
 "E.g: http://www.youtube.com/watch?v=WCR6f6WzjP8\n"
 "\n"
 msgstr ""
 
-#: src/interface.c:1231
+#: src/interface.c:1127
 msgid "URL : "
 msgstr "URL : "
 
-#: src/interface.c:1231
+#: src/interface.c:1127
 msgid "Youtube URL : "
 msgstr ""
 
-#: src/interface.c:1235
+#: src/interface.c:1131
 msgid "Do not send bandwidth information"
 msgstr "No enviï informació d'ample de banda"
 
-#: src/interface.c:1237
+#: src/interface.c:1133
 msgid "Try this setting if you are having problems getting a stream"
 msgstr ""
 "Proveu aquesta opció si vostè està tenint problemes per aconseguir un flux de"
 
-#: src/interface.c:1258
+#: src/interface.c:1155
 msgid "Download to _Directory : "
 msgstr ""
 
-#: src/interface.c:1276
+#: src/interface.c:1173
 msgid "Download _File Name : "
 msgstr ""
 
-#: src/interface.c:1281
+#: src/interface.c:1178
 msgid ".webm"
 msgstr ""
 
-#: src/interface.c:1359
+#: src/interface.c:1256
 msgid "LiVES: - Rename Clip"
 msgstr ""
 
-#: src/interface.c:1362
-msgid "LiVES: - Enter Set Name"
+#: src/interface.c:1258
+msgid "LiVES: - Enter Set Name to Save as"
 msgstr ""
 
-#: src/interface.c:1365
+#: src/interface.c:1260
 msgid "LiVES: - Enter a Set Name to Reload"
 msgstr ""
 
-#: src/interface.c:1368
+#: src/interface.c:1262
 msgid "LiVES: - Choose a Working Directory"
 msgstr "LiVES: - Tria un directori de treball"
 
-#: src/interface.c:1371
+#: src/interface.c:1264
 msgid "LiVES: - Rename Current Track"
 msgstr ""
 
-#: src/interface.c:1391
+#: src/interface.c:1283
 msgid ""
 "You need to enter a name for the current clip set.\n"
 "This will allow you reload the layout with the same clips later.\n"
@@ -1359,354 +1353,354 @@
 "LiVES will remind you to save the clip set later when you try to exit.\n"
 msgstr ""
 
-#: src/interface.c:1397
+#: src/interface.c:1289
 msgid ""
 "In order to export this project, you must enter a name for this clip set.\n"
 "This will also be used for the project name.\n"
 msgstr ""
 
-#: src/interface.c:1404
+#: src/interface.c:1296
 msgid ""
 "Welcome to LiVES !\n"
 "This startup wizard will guide you through the\n"
 "initial install so that you can get the most from this application.\n"
 msgstr ""
 
-#: src/interface.c:1408
+#: src/interface.c:1300
 msgid ""
 "\n"
 "First of all you need to choose a working directory for LiVES.\n"
 "This should be a directory with plenty of disk space available.\n"
 msgstr ""
 
-#: src/interface.c:1427
+#: src/interface.c:1317
 msgid "New name "
 msgstr "Nou nom "
 
-#: src/interface.c:1430
+#: src/interface.c:1319
 msgid "Set name "
 msgstr ""
 
-#: src/interface.c:1550
+#: src/interface.c:1435
 msgid "Use def_aults"
 msgstr ""
 
-#: src/interface.c:1553 src/interface.c:1840 src/preferences.c:2515
-#: src/preferences.c:2697
+#: src/interface.c:1437 src/interface.c:1709 src/preferences.c:2550
+#: src/preferences.c:2739
 msgid "_Advanced"
 msgstr "_Avançat"
 
-#: src/interface.c:1604
+#: src/interface.c:1487
 msgid "LiVES:- Select input device"
 msgstr ""
 
-#: src/interface.c:1622
+#: src/interface.c:1504
 msgid "Select input device:"
 msgstr ""
 
-#: src/interface.c:1686
+#: src/interface.c:1568
 msgid "LiVES:- Load CD Track"
 msgstr ""
 
-#: src/interface.c:1689
+#: src/interface.c:1570
 msgid "LiVES:- Select DVD Title/Chapter"
 msgstr ""
 
-#: src/interface.c:1692
+#: src/interface.c:1572
 msgid "LiVES:- Select VCD Title"
 msgstr ""
 
-#: src/interface.c:1695
+#: src/interface.c:1574
 msgid "LiVES:- Change Maximum Visible Tracks"
 msgstr ""
 
-#: src/interface.c:1698
+#: src/interface.c:1576
 msgid "LiVES:- Device details"
 msgstr ""
 
-#: src/interface.c:1721
+#: src/interface.c:1598
 #, c-format
 msgid "Track to load (from %s)"
 msgstr ""
 
-#: src/interface.c:1724
+#: src/interface.c:1600
 msgid "DVD Title"
 msgstr ""
 
-#: src/interface.c:1727
+#: src/interface.c:1602
 msgid "VCD Title"
 msgstr ""
 
-#: src/interface.c:1730
+#: src/interface.c:1604
 msgid "Maximum number of tracks to display"
 msgstr ""
 
-#: src/interface.c:1733
+#: src/interface.c:1606
 msgid "Device:        /dev/video"
 msgstr ""
 
-#: src/interface.c:1736
+#: src/interface.c:1608
 msgid "Device:        fw:"
 msgstr ""
 
-#: src/interface.c:1771
+#: src/interface.c:1641
 msgid "Chapter  "
 msgstr "Capítol  "
 
-#: src/interface.c:1776
+#: src/interface.c:1645
 msgid "Channel  "
 msgstr ""
 
-#: src/interface.c:1791
+#: src/interface.c:1660
 msgid "Audio ID  "
 msgstr ""
 
-#: src/interface.c:1857
+#: src/interface.c:1726
 msgid "Input number"
 msgstr ""
 
-#: src/interface.c:1865
+#: src/interface.c:1734
 msgid "Use default width, height and FPS"
 msgstr ""
 
-#: src/interface.c:1879
+#: src/interface.c:1748
 msgid "Width"
 msgstr ""
 
-#: src/interface.c:1885
+#: src/interface.c:1754
 msgid "Height"
 msgstr ""
 
-#: src/interface.c:1899
+#: src/interface.c:1768
 msgid "_Driver"
 msgstr ""
 
-#: src/interface.c:1902
+#: src/interface.c:1771
 msgid "_Output format"
 msgstr ""
 
-#: src/interface.c:1998
+#: src/interface.c:1865
 msgid "LiVES:- Fade Audio In"
 msgstr ""
 
-#: src/interface.c:2001
+#: src/interface.c:1867
 msgid "LiVES:- Fade Audio Out"
 msgstr ""
 
-#: src/interface.c:2017
+#: src/interface.c:1883
 msgid "Fade in over  "
 msgstr ""
 
-#: src/interface.c:2018
+#: src/interface.c:1884
 msgid "first"
 msgstr "primer"
 
-#: src/interface.c:2021
+#: src/interface.c:1886
 msgid "Fade out over  "
 msgstr ""
 
-#: src/interface.c:2022
+#: src/interface.c:1887
 msgid "last"
 msgstr "últim"
 
-#: src/interface.c:2044
+#: src/interface.c:1909
 msgid "seconds."
 msgstr "segons."
 
-#: src/interface.c:2052 src/saveplay.c:1507
+#: src/interface.c:1917 src/saveplay.c:1484
 msgid "selection"
 msgstr "selecció"
 
-#: src/interface.c:2092
+#: src/interface.c:1956
 msgid "LiVES: - File Comments (optional)"
 msgstr ""
 
-#: src/interface.c:2107
+#: src/interface.c:1971
 msgid "Title/Name : "
 msgstr "Títol/Nom : "
 
-#: src/interface.c:2114
+#: src/interface.c:1978
 msgid "Author/Artist : "
 msgstr "Autor/Artista : "
 
-#: src/interface.c:2121
+#: src/interface.c:1985
 msgid "Comments : "
 msgstr "Comentaris : "
 
-#: src/interface.c:2151
+#: src/interface.c:2015
 msgid "_Options"
 msgstr ""
 
-#: src/interface.c:2158
+#: src/interface.c:2022
 msgid "Save _subtitles to file"
 msgstr ""
 
-#: src/interface.c:2170
+#: src/interface.c:2033
 msgid "Subtitle file"
 msgstr ""
 
-#: src/interface.c:2172
+#: src/interface.c:2035
 msgid "Browse..."
 msgstr ""
 
-#: src/interface.c:2255
+#: src/interface.c:2132
 msgid "LiVES: - choose a device"
 msgstr ""
 
-#: src/interface.c:2259
+#: src/interface.c:2135
 msgid "LiVES: - choose a directory"
 msgstr ""
 
-#: src/interface.c:2262
+#: src/interface.c:2137
 msgid "LiVES: - choose a file"
 msgstr ""
 
-#: src/interface.c:2445
+#: src/interface.c:2381
 msgid "LiVES: - Cancel/Discard/Save"
 msgstr ""
 
-#: src/interface.c:2460
+#: src/interface.c:2397
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has not been saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:2463
+#: src/interface.c:2400
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has been changed since the last save.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:2467
+#: src/interface.c:2404
 msgid ""
 "You are about to exit LiVES.\n"
 "The current clip set can be saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:2468
+#: src/interface.c:2405
 msgid ""
 "The current clip set has not been saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:2472
+#: src/interface.c:2408
 msgid ""
 "The current layout has not been saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:2475
+#: src/interface.c:2410
 msgid ""
 "The current layout has *not* been changed since it was last saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:2480
+#: src/interface.c:2415
 msgid ""
 "The current layout contains generated frames and cannot be retained.\n"
 "You may wish to render it before exiting multitrack mode.\n"
 msgstr ""
 
-#: src/interface.c:2483
+#: src/interface.c:2418
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout contains generated frames and cannot be retained.\n"
 "What do you wish to do ?"
 msgstr ""
 
-#: src/interface.c:2496
+#: src/interface.c:2431
 msgid "Clip set _name"
 msgstr ""
 
-#: src/interface.c:2502
+#: src/interface.c:2437
 msgid "_Auto reload next time"
 msgstr ""
 
-#: src/interface.c:2538 src/interface.c:2547
+#: src/interface.c:2473 src/interface.c:2482
 msgid "_Wipe layout"
 msgstr ""
 
-#: src/interface.c:2539
+#: src/interface.c:2474
 msgid "_Ignore changes"
 msgstr "No feu cas dels canvis"
 
-#: src/interface.c:2540
+#: src/interface.c:2475
 msgid "_Delete clip set"
 msgstr ""
 
-#: src/interface.c:2541
+#: src/interface.c:2476
 msgid "_Delete layout"
 msgstr ""
 
-#: src/interface.c:2545
+#: src/interface.c:2480
 msgid "_Save layout"
 msgstr "_Guardar disseny"
 
-#: src/interface.c:2546
+#: src/interface.c:2481
 msgid "_Save clip set"
 msgstr ""
 
-#: src/interface.c:2565
+#: src/interface.c:2502
 msgid ""
 "\n"
 "LiVES has detected a multitrack layout from a previous session.\n"
 "Would you like to try and recover it ?\n"
 msgstr ""
 
-#: src/interface.c:2589
+#: src/interface.c:2528
 msgid "LiVES: - Disk Recovery Options"
 msgstr ""
 
-#: src/interface.c:2608
+#: src/interface.c:2549
 msgid "Delete _Orphaned Clips"
 msgstr ""
 
-#: src/interface.c:2609
+#: src/interface.c:2550
 msgid "Delete any clips which are not currently loaded or part of a set"
 msgstr ""
 
-#: src/interface.c:2622
+#: src/interface.c:2564
 msgid "Clear _Backup Files from Closed Clips"
 msgstr ""
 
-#: src/interface.c:2633
+#: src/interface.c:2575
 msgid "Remove Sets which have _Layouts but no Clips"
 msgstr ""
 
-#: src/interface.c:2644
+#: src/interface.c:2586
 msgid "_Reset to Defaults"
 msgstr ""
 
-#: src/interface.c:2651
+#: src/interface.c:2593
 msgid "_Accept"
 msgstr ""
 
-#: src/callbacks.c:198
+#: src/callbacks.c:208
 #, c-format
 msgid "Saving as set %s..."
 msgstr ""
 
-#: src/callbacks.c:833
+#: src/callbacks.c:852
 msgid "Please enter the name of the file to save the clip as.\n"
 msgstr ""
 
-#: src/callbacks.c:841
+#: src/callbacks.c:860
 msgid "Please enter a valid URL for the download.\n"
 msgstr ""
 
-#: src/callbacks.c:867
+#: src/callbacks.c:886
 #, c-format
 msgid "Downloading %s to %s..."
 msgstr ""
 
-#: src/callbacks.c:895
+#: src/callbacks.c:912
 msgid "Downloading clip"
 msgstr ""
 
-#: src/callbacks.c:933
+#: src/callbacks.c:950
 msgid ""
 "\n"
 "LiVES was unable to download the clip.\n"
@@ -1714,11 +1708,11 @@
 "the latest youtube-dl installed.\n"
 msgstr ""
 
-#: src/callbacks.c:1114 src/callbacks.c:1149
+#: src/callbacks.c:1131 src/callbacks.c:1166
 msgid "This file"
 msgstr "Aquest fitxer"
 
-#: src/callbacks.c:1115
+#: src/callbacks.c:1132
 msgid ""
 ",\n"
 " - including the current layout - "
@@ -1726,7 +1720,7 @@
 ",\n"
 " - incloent-hi el disseny actual - "
 
-#: src/callbacks.c:1117
+#: src/callbacks.c:1134
 #, c-format
 msgid ""
 "\n"
@@ -1736,7 +1730,7 @@
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1119
+#: src/callbacks.c:1136
 #, c-format
 msgid ""
 "\n"
@@ -1746,14 +1740,14 @@
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1150
+#: src/callbacks.c:1167
 msgid ""
 "Changes made to this clip have not been saved or backed up.\n"
 "\n"
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1343
+#: src/callbacks.c:1356
 msgid ""
 "\n"
 "Invalid project file.\n"
@@ -1761,7 +1755,7 @@
 "\n"
 "Arxiu de projecte no vàlid.\n"
 
-#: src/callbacks.c:1356
+#: src/callbacks.c:1370
 #, c-format
 msgid ""
 "\n"
@@ -1774,33 +1768,33 @@
 "Once you have done this, you will be able to import the new project.\n"
 msgstr ""
 
-#: src/callbacks.c:1366
+#: src/callbacks.c:1381
 #, c-format
 msgid "Importing the project %s as set %s..."
 msgstr ""
 
-#: src/callbacks.c:1386
+#: src/callbacks.c:1399
 msgid "Importing project"
 msgstr ""
 
-#: src/callbacks.c:1472
+#: src/callbacks.c:1481
 #, c-format
 msgid "Exporting project %s..."
 msgstr ""
 
-#: src/callbacks.c:1490
+#: src/callbacks.c:1497
 msgid "Exporting project"
 msgstr ""
 
-#: src/callbacks.c:1506
+#: src/callbacks.c:1513
 msgid "Backup as .lv1 file"
 msgstr ""
 
-#: src/callbacks.c:1522
+#: src/callbacks.c:1529
 msgid "Restore .lv1 file"
 msgstr ""
 
-#: src/callbacks.c:1664
+#: src/callbacks.c:1671
 msgid ""
 "\n"
 "\n"
@@ -1808,72 +1802,77 @@
 "Are you sure ?\n"
 msgstr ""
 
-#: src/callbacks.c:1725
+#: src/callbacks.c:1732
 #, c-format
 msgid "Deleting set %s..."
 msgstr ""
 
-#: src/callbacks.c:1727
+#: src/callbacks.c:1734
 msgid "Deleting set..."
 msgstr ""
 
-#: src/callbacks.c:1731
+#: src/callbacks.c:1738
 msgid "Deleting set"
 msgstr ""
 
-#: src/callbacks.c:1739
+#: src/callbacks.c:1746
 #, c-format
 msgid "Set %s was permanently deleted from the disk.\n"
 msgstr ""
 
-#: src/callbacks.c:1787 src/callbacks.c:11764
+#: src/callbacks.c:1792 src/callbacks.c:11676
 msgid "Insert Silence"
 msgstr ""
 
-#: src/callbacks.c:1840 src/callbacks.c:1923 src/callbacks.c:2086
+#: src/callbacks.c:1844 src/callbacks.c:1927 src/callbacks.c:2089
 msgid "Undoing"
 msgstr ""
 
-#: src/callbacks.c:1936 src/callbacks.c:2147
+#: src/callbacks.c:1940 src/callbacks.c:2150
 msgid "Restoring audio..."
 msgstr ""
 
-#: src/callbacks.c:1952
+#: src/callbacks.c:1956
 msgid "Clearing frame images"
 msgstr ""
 
-#: src/callbacks.c:1985
+#: src/callbacks.c:1988
 msgid "Deleting excess frames"
 msgstr ""
 
-#: src/callbacks.c:2229
+#: src/callbacks.c:2232
 #, c-format
 msgid "Length of video is now %d frames at %.3f frames per second.\n"
 msgstr ""
 
-#: src/callbacks.c:2233 src/resample.c:683 src/resample.c:2166
+#: src/callbacks.c:2235 src/resample.c:678 src/resample.c:2133
 #, c-format
 msgid "Clipboard was resampled to %d frames.\n"
 msgstr ""
 
-#: src/callbacks.c:2394 src/callbacks.c:2423
+#: src/callbacks.c:2396 src/callbacks.c:2425
 msgid "Redoing"
 msgstr ""
 
-#: src/callbacks.c:2462
+#: src/callbacks.c:2472
 #, c-format
-msgid "Copying frames %d to %d%s to the clipboard..."
+msgid "Copying frames %d to %d (with sound) to the clipboard..."
 msgstr ""
 
-#: src/callbacks.c:2525
+#: src/callbacks.c:2474
+#, c-format
+msgid "Copying frames %d to %d to the clipboard..."
+msgstr ""
+
+#: src/callbacks.c:2526
 msgid "Copying to the clipboard"
 msgstr ""
 
-#: src/callbacks.c:2600
+#: src/callbacks.c:2601
 msgid "Cut"
 msgstr "Retalla"
 
-#: src/callbacks.c:2641 src/callbacks.c:3068 src/callbacks.c:8026
+#: src/callbacks.c:2641 src/callbacks.c:3063 src/callbacks.c:7631
 msgid "Pulling frames from clipboard"
 msgstr ""
 
@@ -1882,22 +1881,22 @@
 msgid "Pasting %d frames to new clip %s..."
 msgstr ""
 
-#: src/callbacks.c:2678
+#: src/callbacks.c:2676
 msgid "Pasting"
 msgstr ""
 
-#: src/callbacks.c:2694
+#: src/callbacks.c:2692
 msgid "...added audio..."
 msgstr ""
 
-#: src/callbacks.c:2778
+#: src/callbacks.c:2775
 msgid ""
 "This operation requires resizing or converting of frames.\n"
 "Please install 'convert' from the Image-magick package, and then restart "
 "LiVES.\n"
 msgstr ""
 
-#: src/callbacks.c:2795
+#: src/callbacks.c:2793
 msgid ""
 "\n"
 "\n"
@@ -1906,31 +1905,31 @@
 "the 'Trim Audio' function from the Audio menu."
 msgstr ""
 
-#: src/callbacks.c:2819
+#: src/callbacks.c:2817
 msgid ""
 "LiVES cannot insert because the audio rates do not match.\n"
 "Please install 'sox', and try again."
 msgstr ""
 
-#: src/callbacks.c:2838
+#: src/callbacks.c:2835
 msgid ""
 "\n"
 "Insertion will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:2888 src/callbacks.c:11692
+#: src/callbacks.c:2883 src/callbacks.c:11606
 msgid ""
 "\n"
 "Insertion will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:2996 src/callbacks.c:3025
+#: src/callbacks.c:2987 src/callbacks.c:3016
 msgid "Resampling clipboard audio"
 msgstr ""
 
-#: src/callbacks.c:3041
+#: src/callbacks.c:3032
 msgid ""
 "\n"
 "\n"
@@ -1938,7 +1937,7 @@
 "Clipboard audio has been erased.\n"
 msgstr ""
 
-#: src/callbacks.c:3055
+#: src/callbacks.c:3045
 msgid ""
 "\n"
 "\n"
@@ -1947,79 +1946,79 @@
 "using unchanged audio ?\n"
 msgstr ""
 
-#: src/callbacks.c:3137 src/callbacks.c:3311
+#: src/callbacks.c:3132 src/callbacks.c:3299
 #, c-format
 msgid "Inserting %d%s frames from the clipboard..."
 msgstr ""
 
-#: src/callbacks.c:3162 src/callbacks.c:3236 src/callbacks.c:3339
+#: src/callbacks.c:3155 src/callbacks.c:3224 src/callbacks.c:3325
 msgid "Inserting"
 msgstr "S'està inserint"
 
-#: src/callbacks.c:3193
+#: src/callbacks.c:3187
 #, c-format
 msgid "Inserting %d times from the clipboard%s..."
 msgstr ""
 
-#: src/callbacks.c:3200
+#: src/callbacks.c:3191
 #, c-format
 msgid "Inserting %d frames from the clipboard%s..."
 msgstr ""
 
-#: src/callbacks.c:3418
+#: src/callbacks.c:3404
 msgid "Insert"
 msgstr "Insereix"
 
-#: src/callbacks.c:3486
+#: src/callbacks.c:3471
 msgid ""
 "\n"
 "Deleting all frames will close this file.\n"
 "Are you sure ?"
 msgstr ""
 
-#: src/callbacks.c:3495
+#: src/callbacks.c:3480
 msgid ""
 "\n"
 "Deletion will cause missing frames in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3515 src/callbacks.c:10920 src/callbacks.c:11162
-#: src/callbacks.c:11228
+#: src/callbacks.c:3500 src/callbacks.c:10851 src/callbacks.c:11087
+#: src/callbacks.c:11152
 msgid ""
 "\n"
 "Deletion will cause missing audio in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3534
+#: src/callbacks.c:3519
 msgid ""
 "\n"
 "Deletion will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3553 src/callbacks.c:11210
+#: src/callbacks.c:3538 src/callbacks.c:11134
 msgid ""
 "\n"
 "Deletion will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3611
+#: src/callbacks.c:3597
 #, c-format
 msgid "Deleting frames %d to %d%s..."
 msgstr ""
 
-#: src/callbacks.c:3636
+#: src/callbacks.c:3619
 msgid "Deleting"
 msgstr "S'està suprimint"
 
-#: src/callbacks.c:3717
+#: src/callbacks.c:3699
 msgid "Delete"
 msgstr "Suprimeix"
 
-#: src/callbacks.c:3738
+#: src/callbacks.c:3717
 msgid ""
 "\n"
 "\n"
@@ -2029,7 +2028,7 @@
 "\n"
 "La selecció està bloquejat.\n"
 
-#: src/callbacks.c:4092
+#: src/callbacks.c:4056
 msgid ""
 "Ready to record. Use 'control' and cursor keys during playback to record "
 "your performance.\n"
@@ -2037,11 +2036,11 @@
 "play.)\n"
 msgstr ""
 
-#: src/callbacks.c:4098
+#: src/callbacks.c:4061
 msgid "Record cancelled.\n"
 msgstr ""
 
-#: src/callbacks.c:4237
+#: src/callbacks.c:4197
 #, c-format
 msgid ""
 "\n"
@@ -2050,7 +2049,7 @@
 "%s\n"
 msgstr ""
 
-#: src/callbacks.c:4241
+#: src/callbacks.c:4200
 #, c-format
 msgid ""
 "\n"
@@ -2059,7 +2058,7 @@
 "The plugin may be broken or not installed correctly."
 msgstr ""
 
-#: src/callbacks.c:4571
+#: src/callbacks.c:4532
 #, c-format
 msgid ""
 "Saving the set will cause copies of all loaded clips to remain on the disk"
@@ -2068,22 +2067,22 @@
 "Please press 'Cancel' if that is not what you want.\n"
 msgstr ""
 
-#: src/callbacks.c:4654
+#: src/callbacks.c:4617
 #, c-format
 msgid "Saving set %s"
 msgstr ""
 
-#: src/callbacks.c:5005
+#: src/callbacks.c:4964
 #, c-format
 msgid "Loading clips from set %s"
 msgstr ""
 
-#: src/callbacks.c:5093
+#: src/callbacks.c:5051
 #, c-format
 msgid "%d clips and %d layouts were recovered from set (%s).\n"
 msgstr ""
 
-#: src/callbacks.c:5312
+#: src/callbacks.c:5259
 msgid ""
 "LiVES will attempt to recover some disk space.\n"
 "You should ONLY run this if you have no other copies of LiVES running on "
@@ -2091,24 +2090,24 @@
 "Click OK to proceed.\n"
 msgstr ""
 
-#: src/callbacks.c:5317
+#: src/callbacks.c:5264
 msgid "Cleaning up disk space..."
 msgstr ""
 
-#: src/callbacks.c:5387
+#: src/callbacks.c:5334
 msgid "Recovering disk space"
 msgstr ""
 
-#: src/callbacks.c:5439
+#: src/callbacks.c:5386
 #, c-format
 msgid "%s of disk space was recovered.\n"
 msgstr ""
 
-#: src/callbacks.c:5482
+#: src/callbacks.c:5428
 msgid "Resetting frame rates and frame values..."
 msgstr ""
 
-#: src/callbacks.c:5523
+#: src/callbacks.c:5469
 #, c-format
 msgid ""
 "\n"
@@ -2116,68 +2115,68 @@
 "Internal: %s (%d bpp) / %s\n"
 msgstr ""
 
-#: src/callbacks.c:5525
+#: src/callbacks.c:5471
 msgid "buffered"
 msgstr ""
 
-#: src/callbacks.c:5538 src/callbacks.c:5557 src/callbacks.c:5575
-#: src/callbacks.c:5609
+#: src/callbacks.c:5484 src/callbacks.c:5502 src/callbacks.c:5518
+#: src/callbacks.c:5551
 msgid ""
 "\n"
 "  Opening..."
 msgstr ""
 
-#: src/callbacks.c:5545
+#: src/callbacks.c:5490
 #, c-format
 msgid ""
 "\n"
 "(%d virtual)"
 msgstr ""
 
-#: src/callbacks.c:5548
+#: src/callbacks.c:5493
 #, c-format
 msgid ""
 "\n"
 "(%d decoded)"
 msgstr ""
 
-#: src/callbacks.c:5560 src/callbacks.c:5578 src/callbacks.c:5612
+#: src/callbacks.c:5504 src/callbacks.c:5520 src/callbacks.c:5553
 #, c-format
 msgid ""
 "\n"
 "  %.2f sec."
 msgstr ""
 
-#: src/callbacks.c:5569
+#: src/callbacks.c:5512
 msgid ""
 "\n"
 "  Unknown"
 msgstr ""
 
-#: src/callbacks.c:5582 src/callbacks.c:5596
+#: src/callbacks.c:5524 src/callbacks.c:5538
 msgid "unsigned"
 msgstr ""
 
-#: src/callbacks.c:5583 src/callbacks.c:5597
+#: src/callbacks.c:5525 src/callbacks.c:5539
 msgid "signed"
 msgstr ""
 
-#: src/callbacks.c:5585 src/callbacks.c:5599
+#: src/callbacks.c:5527 src/callbacks.c:5541
 msgid "big-endian"
 msgstr ""
 
-#: src/callbacks.c:5586 src/callbacks.c:5600
+#: src/callbacks.c:5528 src/callbacks.c:5542
 msgid "little-endian"
 msgstr ""
 
-#: src/callbacks.c:5588 src/callbacks.c:5602
+#: src/callbacks.c:5530 src/callbacks.c:5544
 #, c-format
 msgid ""
 "  %d Hz %d bit\n"
 "%s %s"
 msgstr ""
 
-#: src/callbacks.c:5707
+#: src/callbacks.c:5647
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -2194,15 +2193,15 @@
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA.\n"
 msgstr ""
 
-#: src/callbacks.c:5721
+#: src/callbacks.c:5661
 msgid "A video editor and VJ program."
 msgstr ""
 
-#: src/callbacks.c:5722
+#: src/callbacks.c:5662
 msgid "About LiVES"
 msgstr ""
 
-#: src/callbacks.c:5724
+#: src/callbacks.c:5664
 msgid "translator_credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -2211,7 +2210,7 @@
 "  nitrofurano https://launchpad.net/~nitrofurano-3t\n"
 "  salsaman https://launchpad.net/~salsaman"
 
-#: src/callbacks.c:5758
+#: src/callbacks.c:5699
 #, c-format
 msgid ""
 "LiVES Version %s\n"
@@ -2225,14 +2224,14 @@
 "Homepage: http://lives.sourceforge.net"
 msgstr ""
 
-#: src/callbacks.c:6037
+#: src/callbacks.c:5996
 msgid ""
 "\n"
 "\n"
 "You need to install mplayer or mplayer2 to be able to preview this file.\n"
 msgstr ""
 
-#: src/callbacks.c:6040
+#: src/callbacks.c:5998
 msgid ""
 "\n"
 "\n"
@@ -2240,215 +2239,206 @@
 "this file.\n"
 msgstr ""
 
-#: src/callbacks.c:6423 src/callbacks.c:8289
-msgid ""
-"\n"
-"Loading new audio may cause missing audio in some multitrack layouts.\n"
-"Are you sure you wish to continue ?\n"
-"."
-msgstr ""
-
-#: src/callbacks.c:6523
-#, c-format
-msgid "Opening audio %s, type %s..."
-msgstr ""
-
-#: src/callbacks.c:6556 src/saveplay.c:480
-msgid "Opening audio"
-msgstr ""
-
-#: src/callbacks.c:6565 src/callbacks.c:6612 src/callbacks.c:8387
-#: src/callbacks.c:8429 src/callbacks.c:8472 src/callbacks.c:10846
-msgid "Cancelling"
-msgstr "S'està cancel·lant"
-
-#: src/callbacks.c:6660 src/callbacks.c:8514 src/callbacks.c:10876
-#: src/callbacks.c:11563
-msgid "Committing audio"
-msgstr ""
-
-#: src/callbacks.c:6672 src/callbacks.c:8546
-msgid "New Audio"
-msgstr ""
-
-#: src/callbacks.c:6779
+#: src/callbacks.c:6459
 #, c-format
 msgid ""
 "Text was saved as\n"
 "%s\n"
 msgstr ""
 
-#: src/callbacks.c:6951 src/saveplay.c:3618
-#, c-format
-msgid "%d frames are enough !\n"
-msgstr ""
-
-#: src/callbacks.c:7050
+#: src/callbacks.c:6706
 msgid "LiVES: - Encoder debug output"
 msgstr ""
 
-#: src/callbacks.c:7087 src/gui.c:1922
+#: src/callbacks.c:6743 src/gui.c:1921
 msgid "Fullscreen playback (f)"
 msgstr ""
 
-#: src/callbacks.c:7089
+#: src/callbacks.c:6744
 msgid "Fullscreen playback off (f)"
 msgstr ""
 
-#: src/callbacks.c:7188 src/callbacks.c:7336 src/callbacks.c:7664
-#: src/callbacks.c:7681 src/gui.c:3712 src/saveplay.c:2467 src/saveplay.c:2501
-#: src/saveplay.c:3115 src/saveplay.c:3220 src/saveplay.c:3239
-#: src/multitrack.c:9340 src/multitrack.c:11060
+#: src/callbacks.c:6841 src/callbacks.c:6983 src/callbacks.c:7283
+#: src/callbacks.c:7298 src/gui.c:3838 src/saveplay.c:2442 src/saveplay.c:2475
+#: src/saveplay.c:3074 src/saveplay.c:3178 src/saveplay.c:3197
+#: src/multitrack.c:9526 src/multitrack.c:11288
 #, c-format
 msgid " (%d %% scale)"
 msgstr ""
 
-#: src/callbacks.c:7190 src/callbacks.c:7338 src/callbacks.c:7666
-#: src/gui.c:3716 src/saveplay.c:2469 src/saveplay.c:2503
+#: src/callbacks.c:6843 src/callbacks.c:6985 src/callbacks.c:7285
+#: src/gui.c:3842 src/saveplay.c:2444 src/saveplay.c:2477
 #, c-format
 msgid "LiVES: - Play Window%s"
 msgstr ""
 
-#: src/callbacks.c:7302 src/gui.c:1907
+#: src/callbacks.c:6950 src/gui.c:1906
 msgid "Double size (d)"
 msgstr ""
 
-#: src/callbacks.c:7309
+#: src/callbacks.c:6956
 msgid "Single size (d)"
 msgstr ""
 
-#: src/callbacks.c:7442 src/callbacks.c:7443
+#: src/callbacks.c:7087 src/callbacks.c:7088
 msgid "Hide the play window (s)"
 msgstr ""
 
-#: src/callbacks.c:7452 src/gui.c:1746
+#: src/callbacks.c:7096 src/gui.c:1744
 msgid "Show the play window (s)"
 msgstr ""
 
-#: src/callbacks.c:7453 src/gui.c:1896
+#: src/callbacks.c:7097 src/gui.c:1895
 msgid "Play in separate window (s)"
 msgstr ""
 
-#: src/callbacks.c:7535 src/gui.c:4060 src/saveplay.c:2498
+#: src/callbacks.c:7175 src/gui.c:4169 src/saveplay.c:2472
 msgid "LiVES: - Streaming"
 msgstr ""
 
-#: src/callbacks.c:7778
+#: src/callbacks.c:7388
 msgid "Switch continuous looping off (o)"
 msgstr ""
 
-#: src/callbacks.c:7785 src/gui.c:1795
+#: src/callbacks.c:7394 src/gui.c:1793
 msgid "Switch continuous looping on (o)"
 msgstr ""
 
-#: src/callbacks.c:7837
+#: src/callbacks.c:7444
 #, c-format
 msgid "Audio volume (%.2f)"
 msgstr ""
 
-#: src/callbacks.c:7876 src/callbacks.c:7877 src/gui.c:3640
+#: src/callbacks.c:7483 src/callbacks.c:7484 src/gui.c:3766
 msgid "Unmute the audio (z)"
 msgstr ""
 
-#: src/callbacks.c:7888 src/callbacks.c:7889 src/gui.c:1808 src/gui.c:3639
+#: src/callbacks.c:7494 src/callbacks.c:7495 src/gui.c:1806 src/gui.c:3765
 msgid "Mute the audio (z)"
 msgstr ""
 
-#: src/callbacks.c:8038
+#: src/callbacks.c:7643
 msgid "Reversing clipboard..."
 msgstr ""
 
-#: src/callbacks.c:8052
+#: src/callbacks.c:7657
 msgid "Reversing clipboard"
 msgstr ""
 
-#: src/callbacks.c:8084
+#: src/callbacks.c:7689
 msgid "LiVES: Load subtitles from..."
 msgstr ""
 
-#: src/callbacks.c:8151 src/saveplay.c:970
+#: src/callbacks.c:7753 src/saveplay.c:956
 #, c-format
 msgid "Loaded subtitle file: %s\n"
 msgstr ""
 
-#: src/callbacks.c:8220
+#: src/callbacks.c:7821
 msgid "Subtitles were erased.\n"
 msgstr ""
 
-#: src/callbacks.c:8239
+#: src/callbacks.c:7843
 msgid "LiVES: - Select Audio File"
 msgstr ""
 
-#: src/callbacks.c:8250
+#: src/callbacks.c:7878 src/callbacks.c:8232
+msgid ""
+"\n"
+"Loading new audio may cause missing audio in some multitrack layouts.\n"
+"Are you sure you wish to continue ?\n"
+"."
+msgstr ""
+
+#: src/callbacks.c:7989
+#, c-format
+msgid "Opening audio %s, type %s..."
+msgstr ""
+
+#: src/callbacks.c:8023 src/saveplay.c:477
+msgid "Opening audio"
+msgstr ""
+
+#: src/callbacks.c:8032 src/callbacks.c:8083 src/callbacks.c:8327
+#: src/callbacks.c:8369 src/callbacks.c:8412 src/callbacks.c:10766
+msgid "Cancelling"
+msgstr "S'està cancel·lant"
+
+#: src/callbacks.c:8137 src/callbacks.c:8454 src/callbacks.c:10803
+#: src/callbacks.c:11477
+msgid "Committing audio"
+msgstr ""
+
+#: src/callbacks.c:8153 src/callbacks.c:8484
+msgid "New Audio"
+msgstr ""
+
+#: src/callbacks.c:8194
 msgid "Please set your CD play device in Tools | Preferences | Misc\n"
 msgstr ""
 
-#: src/callbacks.c:8321
+#: src/callbacks.c:8264
 #, c-format
 msgid "Opening CD track %d from %s..."
 msgstr ""
 
-#: src/callbacks.c:8326
+#: src/callbacks.c:8267
 #, c-format
 msgid "CD track %d"
 msgstr ""
 
-#: src/callbacks.c:8373
+#: src/callbacks.c:8313
 msgid "Opening CD track..."
 msgstr ""
 
-#: src/callbacks.c:8415 src/callbacks.c:8461
+#: src/callbacks.c:8355 src/callbacks.c:8401
 msgid "Error loading CD track\n"
 msgstr ""
 
-#: src/callbacks.c:8584
+#: src/callbacks.c:8518
 msgid "layout errors"
 msgstr ""
 
-#: src/callbacks.c:8595
+#: src/callbacks.c:8529
 msgid "Close _Window"
 msgstr ""
 
-#: src/callbacks.c:8606
+#: src/callbacks.c:8540
 msgid "Clear _Errors"
 msgstr ""
 
-#: src/callbacks.c:8617
+#: src/callbacks.c:8551
 msgid "_Delete affected layouts"
 msgstr ""
 
-#: src/callbacks.c:9343 src/callbacks.c:9388
+#: src/callbacks.c:9253 src/callbacks.c:9298
 msgid "Resume"
 msgstr "Reprén"
 
-#: src/callbacks.c:9344
+#: src/callbacks.c:9254
 msgid ""
 "\n"
 "Paused\n"
 "(click Resume to continue processing)"
 msgstr ""
 
-#: src/callbacks.c:9345 src/callbacks.c:9406
+#: src/callbacks.c:9255 src/callbacks.c:9315
 msgid "paused..."
 msgstr ""
 
-#: src/callbacks.c:9372 src/callbacks.c:9418
-msgid "Pause"
-msgstr "Fes una pausa"
-
-#: src/callbacks.c:9374 src/callbacks.c:9421
+#: src/callbacks.c:9284 src/callbacks.c:9333
 msgid "resumed..."
 msgstr ""
 
-#: src/callbacks.c:9393
+#: src/callbacks.c:9303
 msgid "Keep"
 msgstr "Mantén"
 
-#: src/callbacks.c:9396
+#: src/callbacks.c:9305
 msgid "Enough"
 msgstr ""
 
-#: src/callbacks.c:9401
+#: src/callbacks.c:9310
 #, c-format
 msgid ""
 "\n"
@@ -2457,28 +2447,28 @@
 "(click Resume to continue processing)"
 msgstr ""
 
-#: src/callbacks.c:9419
+#: src/callbacks.c:9331
 msgid "Cancel"
 msgstr "Cancel·la"
 
-#: src/callbacks.c:9558
+#: src/callbacks.c:9478
 msgid "Stop"
 msgstr ""
 
-#: src/callbacks.c:10053 src/multitrack.c:13247
+#: src/callbacks.c:9968 src/multitrack.c:13489
 msgid "LiVES: Selected frame"
 msgstr ""
 
-#: src/callbacks.c:10061
+#: src/callbacks.c:9976
 msgid "_Save frame as..."
 msgstr ""
 
-#: src/callbacks.c:10290
+#: src/callbacks.c:10202
 #, c-format
 msgid "Audio is ahead of video by %.4f secs. at frame %d, with fps %.4f\n"
 msgstr ""
 
-#: src/callbacks.c:10347
+#: src/callbacks.c:10255
 msgid ""
 "\n"
 "\n"
@@ -2487,7 +2477,7 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10353
+#: src/callbacks.c:10261
 msgid ""
 "\n"
 "\n"
@@ -2495,13 +2485,13 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10429 src/callbacks.c:11479
+#: src/callbacks.c:10334 src/callbacks.c:11395
 msgid ""
 "\n"
 "Record time must be greater than 0.\n"
 msgstr ""
 
-#: src/callbacks.c:10440
+#: src/callbacks.c:10346
 msgid ""
 "Capture an External Window:\n"
 "\n"
@@ -2510,17 +2500,17 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10445
+#: src/callbacks.c:10351
 msgid "External window was released.\n"
 msgstr ""
 
-#: src/callbacks.c:10479
+#: src/callbacks.c:10385
 msgid ""
 "Click on a Window to Capture it\n"
 "Press 'q' to stop recording"
 msgstr ""
 
-#: src/callbacks.c:10513
+#: src/callbacks.c:10419
 #, c-format
 msgid ""
 "\n"
@@ -2530,19 +2520,19 @@
 "(Default of %.3f frames per second will be used.)\n"
 msgstr ""
 
-#: src/callbacks.c:10539
+#: src/callbacks.c:10443
 msgid "LiVES was unable to capture this window. Sorry.\n"
 msgstr ""
 
-#: src/callbacks.c:10695
+#: src/callbacks.c:10601
 msgid "Export Selected Audio as..."
 msgstr ""
 
-#: src/callbacks.c:10699
+#: src/callbacks.c:10604
 msgid "Export Audio as..."
 msgstr ""
 
-#: src/callbacks.c:10714
+#: src/callbacks.c:10619
 msgid ""
 "\n"
 "\n"
@@ -2551,1033 +2541,1033 @@
 "rate.\n"
 msgstr ""
 
-#: src/callbacks.c:10720
+#: src/callbacks.c:10625
 #, c-format
 msgid "Exporting audio frames %d to %d as %s..."
 msgstr ""
 
-#: src/callbacks.c:10725
+#: src/callbacks.c:10629
 #, c-format
 msgid "Exporting audio as %s..."
 msgstr ""
 
-#: src/callbacks.c:10751
+#: src/callbacks.c:10655
 msgid "Exporting audio"
 msgstr ""
 
-#: src/callbacks.c:10782
+#: src/callbacks.c:10695
 msgid "LiVES: - Append Audio File"
 msgstr ""
 
-#: src/callbacks.c:10825
+#: src/callbacks.c:10739
 #, c-format
 msgid "Appending audio file %s..."
 msgstr ""
 
-#: src/callbacks.c:10836
+#: src/callbacks.c:10756
 msgid "Appending audio"
 msgstr ""
 
-#: src/callbacks.c:10892
+#: src/callbacks.c:10818
 msgid "Append Audio"
 msgstr ""
 
-#: src/callbacks.c:10952
+#: src/callbacks.c:10883
 #, c-format
 msgid "Padding audio to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10954
+#: src/callbacks.c:10885
 #, c-format
 msgid "Trimming audio from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10973
+#: src/callbacks.c:10904
 msgid "Trimming/Padding audio"
 msgstr ""
 
-#: src/callbacks.c:10981
+#: src/callbacks.c:10912
 msgid "Trim/Pad Audio"
 msgstr ""
 
-#: src/callbacks.c:11055
+#: src/callbacks.c:10982
 msgid "Fading audio in"
 msgstr ""
 
-#: src/callbacks.c:11056
+#: src/callbacks.c:10983
 msgid "Fade audio in"
 msgstr ""
 
-#: src/callbacks.c:11061
+#: src/callbacks.c:10987
 msgid "Fading audio out"
 msgstr ""
 
-#: src/callbacks.c:11062
+#: src/callbacks.c:10988
 msgid "Fade audio out"
 msgstr ""
 
-#: src/callbacks.c:11085
+#: src/callbacks.c:11011
 #, c-format
 msgid "%s over %.1f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11087
+#: src/callbacks.c:11013
 #, c-format
 msgid "%s from time %.2f seconds to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11094
+#: src/callbacks.c:11020
 msgid "Fading audio..."
 msgstr ""
 
-#: src/callbacks.c:11194
+#: src/callbacks.c:11119
 msgid ""
 "\n"
 "Deleting all audio will close this file.\n"
 "Are you sure ?"
 msgstr ""
 
-#: src/callbacks.c:11197
+#: src/callbacks.c:11122
 msgid "Deleting all audio..."
 msgstr ""
 
-#: src/callbacks.c:11203
+#: src/callbacks.c:11127
 #, c-format
 msgid "Deleting audio from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11290
+#: src/callbacks.c:11214
 msgid "Deleting Audio"
 msgstr ""
 
-#: src/callbacks.c:11297
+#: src/callbacks.c:11221
 msgid "Delete Audio"
 msgstr ""
 
-#: src/callbacks.c:11636
+#: src/callbacks.c:11550
 msgid "Record new audio"
 msgstr ""
 
-#: src/callbacks.c:11725
+#: src/callbacks.c:11640
 #, c-format
 msgid "Inserting silence from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11754
+#: src/callbacks.c:11666
 msgid "Inserting Silence"
 msgstr ""
 
-#: src/merge.c:85
+#: src/merge.c:96
 msgid "LiVES: - Merge"
 msgstr ""
 
-#: src/merge.c:102
+#: src/merge.c:113
 #, c-format
 msgid "Merge Clipboard [ %d Frames ]       With Selection [ %d Frames ]"
 msgstr ""
 
-#: src/merge.c:107
+#: src/merge.c:118
 #, c-format
 msgid ""
 "Merge Clipboard [ %d Frames (resampled) ]       With Selection [ %d Frames ]"
 msgstr ""
 
-#: src/merge.c:118
+#: src/merge.c:130
 msgid "Align _Starts"
 msgstr ""
 
-#: src/merge.c:123
+#: src/merge.c:135
 msgid "Align _Ends"
 msgstr ""
 
-#: src/merge.c:134
+#: src/merge.c:146
 msgid "What to do with extra clipboard frames -"
 msgstr ""
 
-#: src/merge.c:137
+#: src/merge.c:149
 msgid "_Insert Frames"
 msgstr ""
 
-#: src/merge.c:143
+#: src/merge.c:155
 msgid "_Drop Frames"
 msgstr ""
 
-#: src/merge.c:149
+#: src/merge.c:160
 msgid "Number of Times to Loop Clipboard"
 msgstr ""
 
-#: src/merge.c:160
+#: src/merge.c:171
 msgid "_Loop Clipboard to Fit Selection"
 msgstr ""
 
-#: src/merge.c:173
+#: src/merge.c:184
 msgid "_Transition Method:"
 msgstr ""
 
-#: src/merge.c:394
+#: src/merge.c:395
 msgid "Merging clipboard with selection..."
 msgstr ""
 
-#: src/merge.c:551
+#: src/merge.c:539
 msgid "Merge done.\n"
 msgstr ""
 
-#: src/gui.c:123
+#: src/gui.c:122
 msgid "_Custom Generators"
 msgstr ""
 
-#: src/gui.c:124
+#: src/gui.c:123
 msgid "_Custom Effects"
 msgstr ""
 
-#: src/gui.c:125
+#: src/gui.c:124
 msgid "Custom _Utilities"
 msgstr ""
 
-#: src/gui.c:352 src/multitrack.c:5964
+#: src/gui.c:351 src/multitrack.c:6143
 msgid "_File"
 msgstr "_Fitxer"
 
-#: src/gui.c:367 src/multitrack.c:5989
+#: src/gui.c:366 src/multitrack.c:6168
 msgid "_Open File/Directory"
 msgstr ""
 
-#: src/gui.c:373
+#: src/gui.c:372
 msgid "O_pen Part of File..."
 msgstr ""
 
-#: src/gui.c:379 src/gui.c:383 src/multitrack.c:6006 src/multitrack.c:6023
-#: src/multitrack.c:6028
+#: src/gui.c:378 src/gui.c:382 src/multitrack.c:6185 src/multitrack.c:6202
+#: src/multitrack.c:6207
 msgid "Open _Location/Stream..."
 msgstr ""
 
-#: src/gui.c:393 src/multitrack.c:6016
+#: src/gui.c:392 src/multitrack.c:6195
 msgid "Open _Youtube Clip..."
 msgstr ""
 
-#: src/gui.c:404
+#: src/gui.c:403
 msgid "Import from _dvd/vcd..."
 msgstr ""
 
-#: src/gui.c:413
+#: src/gui.c:412
 msgid "Import from _dvd"
 msgstr ""
 
-#: src/gui.c:416
+#: src/gui.c:415
 msgid "Import from _vcd"
 msgstr ""
 
-#: src/gui.c:419
+#: src/gui.c:418
 msgid "_Import from Firewire"
 msgstr ""
 
-#: src/gui.c:428 src/multitrack.c:6086
+#: src/gui.c:427 src/multitrack.c:6265
 msgid "Import from _Firewire Device (dv)"
 msgstr ""
 
-#: src/gui.c:429 src/multitrack.c:6094
+#: src/gui.c:428 src/multitrack.c:6273
 msgid "Import from _Firewire Device (hdv)"
 msgstr ""
 
-#: src/gui.c:457
+#: src/gui.c:456
 msgid "_Add Webcam/TV card..."
 msgstr ""
 
-#: src/gui.c:476
+#: src/gui.c:475
 msgid "Add _Unicap Device"
 msgstr ""
 
-#: src/gui.c:486
+#: src/gui.c:485
 msgid "Add Live _Firewire Device"
 msgstr ""
 
-#: src/gui.c:495
+#: src/gui.c:494
 msgid "Add _TV Device"
 msgstr ""
 
-#: src/gui.c:510 src/multitrack.c:6117
+#: src/gui.c:509 src/multitrack.c:6296
 msgid "_Recent Files..."
 msgstr ""
 
-#: src/gui.c:560 src/multitrack.c:6177
+#: src/gui.c:559 src/multitrack.c:6356
 msgid "_Reload Clip Set..."
 msgstr ""
 
-#: src/gui.c:564 src/multitrack.c:6185
+#: src/gui.c:563 src/multitrack.c:6364
 msgid "Close/Sa_ve All Clips"
 msgstr ""
 
-#: src/gui.c:575
+#: src/gui.c:574
 msgid "_Encode Clip As..."
 msgstr ""
 
-#: src/gui.c:577
+#: src/gui.c:576
 msgid "Encode _Selection As..."
 msgstr ""
 
-#: src/gui.c:584
+#: src/gui.c:583
 msgid "_Close This Clip"
 msgstr ""
 
-#: src/gui.c:595
+#: src/gui.c:594
 msgid "_Backup Clip as .lv1..."
 msgstr ""
 
-#: src/gui.c:604
+#: src/gui.c:603
 msgid "_Restore Clip from .lv1..."
 msgstr ""
 
-#: src/gui.c:615
+#: src/gui.c:614
 msgid "Encode/Load/Backup _with Sound"
 msgstr ""
 
-#: src/gui.c:620
+#: src/gui.c:619
 msgid "Auto load subtitles"
 msgstr ""
 
-#: src/gui.c:628 src/multitrack.c:6224
+#: src/gui.c:627 src/multitrack.c:6403
 msgid "Clean _up Diskspace"
 msgstr ""
 
-#: src/gui.c:636 src/multitrack.c:6257
+#: src/gui.c:635 src/multitrack.c:6436
 msgid "_Edit"
 msgstr "_Edita"
 
-#: src/gui.c:685
+#: src/gui.c:684
 msgid "_MULTITRACK mode"
 msgstr ""
 
-#: src/gui.c:696
+#: src/gui.c:695
 msgid "_Copy Selection"
 msgstr ""
 
-#: src/gui.c:705
+#: src/gui.c:704
 msgid "Cu_t Selection"
 msgstr ""
 
-#: src/gui.c:714
+#: src/gui.c:713
 msgid "_Insert from Clipboard..."
 msgstr ""
 
-#: src/gui.c:730
+#: src/gui.c:729
 msgid "Paste as _New"
 msgstr "Enganxa com a _nou"
 
-#: src/gui.c:739
+#: src/gui.c:738
 msgid "_Merge Clipboard with Selection..."
 msgstr ""
 
-#: src/gui.c:746
+#: src/gui.c:745
 msgid "_Delete Selection"
 msgstr "_Suprimix la selecció"
 
-#: src/gui.c:764
+#: src/gui.c:763
 msgid "Decouple _Video from Audio"
 msgstr ""
 
-#: src/gui.c:772
+#: src/gui.c:771
 msgid "_Select..."
 msgstr "S_elecciona..."
 
-#: src/gui.c:786
+#: src/gui.c:785
 msgid "Select _All Frames"
 msgstr ""
 
-#: src/gui.c:794
+#: src/gui.c:793
 msgid "_Start Frame Only"
 msgstr ""
 
-#: src/gui.c:802
+#: src/gui.c:801
 msgid "_End Frame Only"
 msgstr ""
 
-#: src/gui.c:813
+#: src/gui.c:812
 msgid "Select from _First Frame"
 msgstr ""
 
-#: src/gui.c:817
+#: src/gui.c:816
 msgid "Select to _Last Frame"
 msgstr ""
 
-#: src/gui.c:821
+#: src/gui.c:820
 msgid "Select Last Insertion/_Merge"
 msgstr ""
 
-#: src/gui.c:825
+#: src/gui.c:824
 msgid "Select Last _Effect"
 msgstr ""
 
-#: src/gui.c:829
+#: src/gui.c:828
 msgid "_Invert Selection"
 msgstr "_Inverteix la selecció"
 
-#: src/gui.c:837
+#: src/gui.c:836
 msgid "_Lock Selection Width"
 msgstr ""
 
-#: src/gui.c:842 src/multitrack.c:6409
+#: src/gui.c:841 src/multitrack.c:6591
 msgid "_Play"
 msgstr "_Reprodueix"
 
-#: src/gui.c:854
+#: src/gui.c:853
 msgid "_Play All"
 msgstr ""
 
-#: src/gui.c:869
+#: src/gui.c:868
 msgid "Pla_y Selection"
 msgstr ""
 
-#: src/gui.c:877
+#: src/gui.c:876
 msgid "Play _Clipboard"
 msgstr ""
 
-#: src/gui.c:899 src/multitrack.c:6441
+#: src/gui.c:898 src/multitrack.c:6623
 msgid "_Stop"
 msgstr "_Atura"
 
-#: src/gui.c:914 src/multitrack.c:6453
+#: src/gui.c:913 src/multitrack.c:6635
 msgid "Re_wind"
 msgstr ""
 
-#: src/gui.c:946 src/multitrack.c:6471
+#: src/gui.c:945 src/multitrack.c:6653
 msgid "_Full Screen"
 msgstr "Pantalla _completa"
 
-#: src/gui.c:955
+#: src/gui.c:954
 msgid "_Double Size"
 msgstr ""
 
-#: src/gui.c:963 src/multitrack.c:6479
+#: src/gui.c:962 src/multitrack.c:6661
 msgid "Play in _Separate Window"
 msgstr ""
 
-#: src/gui.c:972
+#: src/gui.c:971
 msgid "_Blank Background"
 msgstr ""
 
-#: src/gui.c:979
+#: src/gui.c:978
 msgid "(Auto)_loop Video (to fit audio track)"
 msgstr ""
 
-#: src/gui.c:988 src/multitrack.c:6487
+#: src/gui.c:987 src/multitrack.c:6669
 msgid "L_oop Continuously"
 msgstr ""
 
-#: src/gui.c:997
+#: src/gui.c:996
 msgid "Pin_g Pong Loops"
 msgstr ""
 
-#: src/gui.c:1005 src/multitrack.c:6495
+#: src/gui.c:1004 src/multitrack.c:6677
 msgid "_Mute"
 msgstr "_Silenci"
 
-#: src/gui.c:1017
+#: src/gui.c:1016
 msgid "Separate Window 'S_ticky' Mode"
 msgstr ""
 
-#: src/gui.c:1025
+#: src/gui.c:1024
 msgid "S_how Frame Counter"
 msgstr ""
 
-#: src/gui.c:1035
+#: src/gui.c:1034
 msgid "Show Subtitles"
 msgstr ""
 
-#: src/gui.c:1045
+#: src/gui.c:1044
 msgid "Letterbox mode"
 msgstr ""
 
-#: src/gui.c:1051 src/multitrack.c:6507
+#: src/gui.c:1050 src/multitrack.c:6689
 msgid "Effect_s"
 msgstr ""
 
-#: src/gui.c:1054
+#: src/gui.c:1053
 msgid "Effects are applied to the current selection."
 msgstr ""
 
-#: src/gui.c:1067
+#: src/gui.c:1066
 msgid "_Run Test Rendered Effect/Tool/Generator..."
 msgstr ""
 
-#: src/gui.c:1072 src/multitrack.c:7123
+#: src/gui.c:1071 src/multitrack.c:7299
 msgid "_Tools"
 msgstr "_Eines"
 
-#: src/gui.c:1075
+#: src/gui.c:1074
 msgid "Tools are applied to complete clips."
 msgstr ""
 
-#: src/gui.c:1085
+#: src/gui.c:1084
 msgid "_Reverse Clipboard"
 msgstr ""
 
-#: src/gui.c:1094
+#: src/gui.c:1093
 msgid "_Change Playback/Save Speed..."
 msgstr ""
 
-#: src/gui.c:1099
+#: src/gui.c:1098
 msgid "Resample _Video to New Frame Rate..."
 msgstr ""
 
-#: src/gui.c:1105
+#: src/gui.c:1104
 msgid "_Utilities"
 msgstr "_Utilitats"
 
-#: src/gui.c:1110
+#: src/gui.c:1109
 msgid "Custom _Tools"
 msgstr ""
 
-#: src/gui.c:1116 src/multitrack.c:7149
+#: src/gui.c:1115 src/multitrack.c:7325
 msgid "_Generate"
 msgstr "_Genera"
 
-#: src/gui.c:1126
+#: src/gui.c:1125
 msgid "Loading rendered effect plugins..."
 msgstr ""
 
-#: src/gui.c:1139
+#: src/gui.c:1138
 msgid "Load _Subtitles from File..."
 msgstr ""
 
-#: src/gui.c:1144
+#: src/gui.c:1143
 msgid "Erase subtitles"
 msgstr ""
 
-#: src/gui.c:1152 src/multitrack.c:7158
+#: src/gui.c:1151 src/multitrack.c:7334
 msgid "Capture _External Window... "
 msgstr ""
 
-#: src/gui.c:1159 src/multitrack.c:7173
+#: src/gui.c:1158 src/multitrack.c:7349
 msgid "_Preferences..."
 msgstr "_Preferències..."
 
-#: src/gui.c:1172
+#: src/gui.c:1171
 msgid "_Audio"
 msgstr "_Àudio"
 
-#: src/gui.c:1184
+#: src/gui.c:1183
 msgid "Load _New Audio for Clip..."
 msgstr ""
 
-#: src/gui.c:1190
+#: src/gui.c:1189
 msgid "Load _CD Track..."
 msgstr ""
 
-#: src/gui.c:1191
+#: src/gui.c:1190
 msgid "E_ject CD"
 msgstr ""
 
-#: src/gui.c:1205
+#: src/gui.c:1204
 msgid "Record E_xternal Audio..."
 msgstr ""
 
-#: src/gui.c:1218
+#: src/gui.c:1217
 msgid "to New _Clip..."
 msgstr ""
 
-#: src/gui.c:1222
+#: src/gui.c:1221
 msgid "to _Selection"
 msgstr ""
 
-#: src/gui.c:1230
+#: src/gui.c:1229
 msgid "Fade Audio _In..."
 msgstr ""
 
-#: src/gui.c:1234
+#: src/gui.c:1233
 msgid "Fade Audio _Out..."
 msgstr ""
 
-#: src/gui.c:1244
+#: src/gui.c:1243
 msgid "_Export Audio..."
 msgstr ""
 
-#: src/gui.c:1257
+#: src/gui.c:1256
 msgid "Export _Selected Audio..."
 msgstr ""
 
-#: src/gui.c:1261
+#: src/gui.c:1260
 msgid "Export _All Audio..."
 msgstr ""
 
-#: src/gui.c:1265
+#: src/gui.c:1264
 msgid "_Append Audio..."
 msgstr ""
 
-#: src/gui.c:1270
+#: src/gui.c:1269
 msgid "_Trim/Pad Audio..."
 msgstr ""
 
-#: src/gui.c:1283
+#: src/gui.c:1282
 msgid "Trim/Pad Audio to _Selection"
 msgstr ""
 
-#: src/gui.c:1288
+#: src/gui.c:1287
 msgid "Trim/Pad Audio from Beginning to _Play Start"
 msgstr ""
 
-#: src/gui.c:1293
+#: src/gui.c:1292
 msgid "_Delete Audio..."
 msgstr ""
 
-#: src/gui.c:1306
+#: src/gui.c:1305
 msgid "Delete _Selected Audio"
 msgstr ""
 
-#: src/gui.c:1310
+#: src/gui.c:1309
 msgid "Delete _All Audio"
 msgstr ""
 
-#: src/gui.c:1314
+#: src/gui.c:1313
 msgid "Insert _Silence in Selection"
 msgstr ""
 
-#: src/gui.c:1319
+#: src/gui.c:1318
 msgid "_Resample Audio..."
 msgstr ""
 
-#: src/gui.c:1324
+#: src/gui.c:1323
 msgid "_Info"
 msgstr "_Informació"
 
-#: src/gui.c:1336
+#: src/gui.c:1335
 msgid "Show Clip _Info"
 msgstr ""
 
-#: src/gui.c:1344
+#: src/gui.c:1343
 msgid "Show/_Edit File Comments"
 msgstr ""
 
-#: src/gui.c:1349
+#: src/gui.c:1348
 msgid "Show _Clipboard Info"
 msgstr ""
 
-#: src/gui.c:1360 src/multitrack.c:7286
+#: src/gui.c:1359 src/multitrack.c:7462
 msgid "Show _Messages"
 msgstr ""
 
-#: src/gui.c:1364 src/multitrack.c:7365
+#: src/gui.c:1363 src/multitrack.c:7541
 msgid "Show _Layout Errors"
 msgstr ""
 
-#: src/gui.c:1369 src/multitrack.c:7263
+#: src/gui.c:1368 src/multitrack.c:7439
 msgid "_Clips"
 msgstr ""
 
-#: src/gui.c:1381
+#: src/gui.c:1380
 msgid "_Rename Current Clip in Menu..."
 msgstr ""
 
-#: src/gui.c:1399
+#: src/gui.c:1398
 msgid "A_dvanced"
 msgstr "Ava_nçat"
 
-#: src/gui.c:1412
+#: src/gui.c:1411
 msgid "_RFX Effects/Tools/Utilities"
 msgstr ""
 
-#: src/gui.c:1424
+#: src/gui.c:1423
 msgid "_New Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1428
+#: src/gui.c:1427
 msgid "_Copy RFX Script to Test..."
 msgstr ""
 
-#: src/gui.c:1432
+#: src/gui.c:1431
 msgid "_Edit Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1436
+#: src/gui.c:1435
 msgid "Rena_me Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1440
+#: src/gui.c:1439
 msgid "_Delete Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1450
+#: src/gui.c:1449
 msgid "_Promote Test Rendered Effect/Tool/Generator..."
 msgstr ""
 
-#: src/gui.c:1457
+#: src/gui.c:1456
 msgid "_Import Custom RFX script..."
 msgstr ""
 
-#: src/gui.c:1461
+#: src/gui.c:1460
 msgid "E_xport Custom RFX script..."
 msgstr ""
 
-#: src/gui.c:1465
+#: src/gui.c:1464
 msgid "De_lete Custom RFX Script..."
 msgstr ""
 
-#: src/gui.c:1472
+#: src/gui.c:1471
 msgid "Re_build all RFX plugins"
 msgstr ""
 
-#: src/gui.c:1501
+#: src/gui.c:1498
 msgid "Receive _LiVES stream from..."
 msgstr ""
 
-#: src/gui.c:1506
+#: src/gui.c:1503
 msgid "_Send LiVES stream to..."
 msgstr ""
 
-#: src/gui.c:1515
+#: src/gui.c:1512
 #, c-format
 msgid "Open _yuv4mpeg stream on %sstream.yuv..."
 msgstr ""
 
-#: src/gui.c:1536
+#: src/gui.c:1534
 msgid "_Import Project (.lv2)..."
 msgstr ""
 
-#: src/gui.c:1540
+#: src/gui.c:1538
 msgid "E_xport Project (.lv2)..."
 msgstr ""
 
-#: src/gui.c:1545
+#: src/gui.c:1543
 msgid "_VJ"
 msgstr "_VJ"
 
-#: src/gui.c:1557
+#: src/gui.c:1555
 msgid "Real Time _Effect Mapping"
 msgstr ""
 
-#: src/gui.c:1563
+#: src/gui.c:1561
 msgid "Bind real time effects to ctrl-number keys."
 msgstr ""
 
-#: src/gui.c:1565
+#: src/gui.c:1563
 msgid "Set Real Time Effect _Defaults"
 msgstr ""
 
-#: src/gui.c:1567
+#: src/gui.c:1565
 msgid "Set default parameter values for real time effects."
 msgstr ""
 
-#: src/gui.c:1580
+#: src/gui.c:1578
 msgid "Save Real Time Effect _Defaults"
 msgstr ""
 
-#: src/gui.c:1583
+#: src/gui.c:1581
 msgid ""
 "Save real time effect defaults so they will be restored each time you use "
 "LiVES."
 msgstr ""
 
-#: src/gui.c:1589
+#: src/gui.c:1587
 msgid "_Reset all playback speeds and positions"
 msgstr ""
 
-#: src/gui.c:1592
+#: src/gui.c:1590
 msgid ""
 "Reset all playback positions to frame 1, and reset all playback frame rates."
 msgstr ""
 
-#: src/gui.c:1594
+#: src/gui.c:1592
 msgid "_MIDI/joystick interface"
 msgstr ""
 
-#: src/gui.c:1609
+#: src/gui.c:1607
 msgid "_MIDI/joystick learner..."
 msgstr ""
 
-#: src/gui.c:1614
+#: src/gui.c:1612
 msgid "_Save device mapping..."
 msgstr ""
 
-#: src/gui.c:1620
+#: src/gui.c:1618
 msgid "_Load device mapping..."
 msgstr ""
 
-#: src/gui.c:1628
+#: src/gui.c:1626
 msgid "Show VJ _Keys"
 msgstr ""
 
-#: src/gui.c:1632
+#: src/gui.c:1630
 msgid "To_ys"
 msgstr "_Joguines"
 
-#: src/gui.c:1644
+#: src/gui.c:1642
 msgid "_None"
 msgstr "_Cap"
 
-#: src/gui.c:1652
+#: src/gui.c:1650
 msgid "_Autolives"
 msgstr ""
 
-#: src/gui.c:1657
+#: src/gui.c:1655
 msgid "_Mad Frames"
 msgstr ""
 
-#: src/gui.c:1662
+#: src/gui.c:1660
 msgid "_LiVES TV (broadband)"
 msgstr ""
 
-#: src/gui.c:1672 src/multitrack.c:7387
+#: src/gui.c:1670 src/multitrack.c:7563
 msgid "_Help"
 msgstr "_Ajuda"
 
-#: src/gui.c:1684 src/multitrack.c:7407
+#: src/gui.c:1682 src/multitrack.c:7583
 msgid "_Manual (opens in browser)"
 msgstr ""
 
-#: src/gui.c:1691 src/multitrack.c:7416
+#: src/gui.c:1689 src/multitrack.c:7592
 msgid "_Donate to the project !"
 msgstr ""
 
-#: src/gui.c:1695 src/multitrack.c:7420
+#: src/gui.c:1693 src/multitrack.c:7596
 msgid "_Email the author"
 msgstr ""
 
-#: src/gui.c:1699 src/multitrack.c:7424
+#: src/gui.c:1697 src/multitrack.c:7600
 msgid "Report a _bug"
 msgstr ""
 
-#: src/gui.c:1703 src/multitrack.c:7428
+#: src/gui.c:1701 src/multitrack.c:7604
 msgid "Suggest a _feature"
 msgstr ""
 
-#: src/gui.c:1707 src/multitrack.c:7432
+#: src/gui.c:1705 src/multitrack.c:7608
 msgid "Assist with _translating"
 msgstr ""
 
-#: src/gui.c:1714 src/multitrack.c:7439
+#: src/gui.c:1712 src/multitrack.c:7615
 msgid "_Troubleshoot"
 msgstr ""
 
-#: src/gui.c:1718 src/multitrack.c:7443
+#: src/gui.c:1716 src/multitrack.c:7619
 msgid "_About"
 msgstr "_Quant a"
 
-#: src/gui.c:1752
+#: src/gui.c:1750
 msgid "Rewind to start (w)"
 msgstr ""
 
-#: src/gui.c:1760 src/multitrack.c:16720
+#: src/gui.c:1758 src/multitrack.c:17010
 msgid "Play all (p)"
 msgstr ""
 
-#: src/gui.c:1768 src/gui.c:1877
+#: src/gui.c:1766 src/gui.c:1876
 msgid "Stop playback (q)"
 msgstr ""
 
-#: src/gui.c:1779
+#: src/gui.c:1777
 msgid "Play selection (y)"
 msgstr ""
 
-#: src/gui.c:1832
+#: src/gui.c:1829
 msgid "Volume"
 msgstr "Volum"
 
-#: src/gui.c:1854
+#: src/gui.c:1853
 msgid "Audio volume (1.00)"
 msgstr ""
 
-#: src/gui.c:1883
+#: src/gui.c:1882
 msgid "Unblank background (b)"
 msgstr ""
 
-#: src/gui.c:1929
+#: src/gui.c:1928
 msgid "Play slower (ctrl-down)"
 msgstr ""
 
-#: src/gui.c:1935
+#: src/gui.c:1934
 msgid "Play faster (ctrl-up)"
 msgstr ""
 
-#: src/gui.c:1942
+#: src/gui.c:1941
 msgid "Skip back (ctrl-left)"
 msgstr ""
 
-#: src/gui.c:1948
+#: src/gui.c:1947
 msgid "Skip forward (ctrl-right)"
 msgstr ""
 
-#: src/gui.c:1954
+#: src/gui.c:1953
 msgid "Show clip info (i)"
 msgstr ""
 
-#: src/gui.c:1960
+#: src/gui.c:1959
 msgid "Hide this toolbar"
 msgstr ""
 
-#: src/gui.c:1962
+#: src/gui.c:1961
 msgid ""
 "Press \"s\" to toggle separate play window for improved performance, \"q\" "
 "to stop."
 msgstr ""
 
 #. TRANSLATORS: please keep the translated string the same length
-#: src/gui.c:1995
+#: src/gui.c:1994
 msgid "     Video playback speed (frames per second)        "
 msgstr ""
 
-#: src/gui.c:2009
+#: src/gui.c:2008
 msgid "Vary the video speed"
 msgstr ""
 
-#: src/gui.c:2092 src/gui.c:3218
+#: src/gui.c:2090 src/gui.c:3329
 msgid "First Frame"
 msgstr ""
 
-#: src/gui.c:2193 src/gui.c:3226
+#: src/gui.c:2191 src/gui.c:3336
 msgid "Last Frame"
 msgstr ""
 
-#: src/gui.c:2210
+#: src/gui.c:2208
 msgid "The first selected frame in this clip"
 msgstr ""
 
-#: src/gui.c:2248
+#: src/gui.c:2246
 msgid "The last selected frame in this clip"
 msgstr ""
 
-#: src/gui.c:2532
+#: src/gui.c:2546
 msgid "Starting...\n"
 msgstr ""
 
-#: src/gui.c:3074
+#: src/gui.c:3181
 msgid "    Press 'q' to stop recording.  DO NOT COVER THE PLAY WINDOW !   "
 msgstr ""
 
-#: src/gui.c:3521
+#: src/gui.c:3643
 msgid "Frame number to preview"
 msgstr ""
 
-#: src/gui.c:3538
+#: src/gui.c:3660
 msgid "_Free"
 msgstr "_Lliure"
 
-#: src/gui.c:3539
+#: src/gui.c:3661
 msgid "Free choice of frame number"
 msgstr ""
 
-#: src/gui.c:3543
+#: src/gui.c:3666
 msgid "_Start"
 msgstr "_Inici"
 
-#: src/gui.c:3544
+#: src/gui.c:3667
 msgid "Frame number is linked to start frame"
 msgstr ""
 
-#: src/gui.c:3551
+#: src/gui.c:3675
 msgid "_End"
 msgstr ""
 
-#: src/gui.c:3552
+#: src/gui.c:3676
 msgid "Frame number is linked to end frame"
 msgstr ""
 
-#: src/gui.c:3559
+#: src/gui.c:3684
 msgid "_Pointer"
 msgstr ""
 
-#: src/gui.c:3560
+#: src/gui.c:3685
 msgid "Frame number is linked to playback pointer"
 msgstr ""
 
-#: src/gui.c:3581
+#: src/gui.c:3707
 msgid "Rewind"
 msgstr "Arrere"
 
-#: src/gui.c:3592 src/dialogs.c:894 src/dialogs.c:896 src/dialogs.c:1817
-#: src/dialogs.c:1819
+#: src/gui.c:3718 src/dialogs.c:960 src/dialogs.c:962 src/dialogs.c:1873
+#: src/dialogs.c:1875
 msgid "Play all"
 msgstr "Reprodueix-ho tot"
 
-#: src/gui.c:3605
+#: src/gui.c:3731
 msgid "Play Selection"
 msgstr ""
 
-#: src/gui.c:3619
+#: src/gui.c:3745
 msgid "Loop On/Off"
 msgstr ""
 
-#: src/gui.c:3693
+#: src/gui.c:3819
 msgid "Start _recording"
 msgstr ""
 
-#: src/gui.c:3698
+#: src/gui.c:3824
 msgid "Stop _recording"
 msgstr ""
 
-#: src/gui.c:3703
+#: src/gui.c:3829
 msgid "_Record Performance"
 msgstr ""
 
-#: src/gui.c:3851
+#: src/gui.c:3974
 msgid "Hide Play Window"
 msgstr ""
 
-#: src/gui.c:4232
+#: src/gui.c:4333
 msgid "Show Play Window"
 msgstr ""
 
-#: src/ce_thumbs.c:222
+#: src/ce_thumbs.c:242
 #, c-format
 msgid "Mapped to ctrl-%d"
 msgstr ""
 
-#: src/ce_thumbs.c:276 src/effects.c:85 src/preferences.c:3195
+#: src/ce_thumbs.c:296 src/effects.c:86 src/preferences.c:3247
 msgid "Effects"
 msgstr "Efectes"
 
-#: src/ce_thumbs.c:279 src/multitrack.c:5615
+#: src/ce_thumbs.c:299 src/multitrack.c:5791
 msgid "Clips"
 msgstr ""
 
-#: src/ce_thumbs.c:303
+#: src/ce_thumbs.c:323
 #, c-format
 msgid "Show / apply effects to %s\n"
 msgstr ""
 
-#: src/ce_thumbs.c:315
+#: src/ce_thumbs.c:335
 #, c-format
 msgid "Select clip for %s\n"
 msgstr ""
 
-#: src/ce_thumbs.c:515
+#: src/ce_thumbs.c:536
 msgid "_Pin"
 msgstr ""
 
-#: src/ce_thumbs.c:515
+#: src/ce_thumbs.c:537
 msgid "Pin the parameter box to the window"
 msgstr ""
 
 #. TRANSLATORS: Exabytes
-#: src/utils.c:794
+#: src/utils.c:800
 #, c-format
 msgid "%.2f EB"
 msgstr ""
 
 #. TRANSLATORS: Petabytes
-#: src/utils.c:798
+#: src/utils.c:803
 #, c-format
 msgid "%.2f PB"
 msgstr ""
 
 #. TRANSLATORS: Terabytes
-#: src/utils.c:802
+#: src/utils.c:806
 #, c-format
 msgid "%.2f TB"
 msgstr ""
 
 #. TRANSLATORS: Gigabytes
-#: src/utils.c:806
+#: src/utils.c:809
 #, c-format
 msgid "%.2f GB"
 msgstr ""
 
 #. TRANSLATORS: Megabytes
-#: src/utils.c:810
+#: src/utils.c:812
 #, c-format
 msgid "%.2f MB"
 msgstr ""
 
 #. TRANSLATORS: Kilobytes (1024 bytes)
-#: src/utils.c:814
+#: src/utils.c:815
 #, c-format
 msgid "%.2f KiB"
 msgstr ""
@@ -3587,7 +3577,7 @@
 msgid "%d bytes"
 msgstr ""
 
-#: src/utils.c:1841
+#: src/utils.c:1835
 msgid "Clearing the clipboard"
 msgstr ""
 
@@ -3599,81 +3589,81 @@
 "Switched to clip %s\n"
 msgstr ""
 
-#: src/utils.c:1880
+#: src/utils.c:1877
 msgid ""
 "\n"
 "==============================\n"
 "Switched to empty clip\n"
 msgstr ""
 
-#: src/utils.c:1917
+#: src/utils.c:1916
 msgid "(blank)"
 msgstr ""
 
-#: src/utils.c:1920
+#: src/utils.c:1919
 #, c-format
 msgid ""
 "The set name has been changed from %s to %s. Affected layouts have been "
 "updated accordingly\n"
 msgstr ""
 
-#: src/utils.c:1928
+#: src/utils.c:1927
 #, c-format
 msgid ""
 "The clip %s is missing from this set.\n"
 "It is required by the following layouts:\n"
 msgstr ""
 
-#: src/utils.c:1932
+#: src/utils.c:1931
 #, c-format
 msgid ""
 "The clip %s has been closed.\n"
 "It is required by the following layouts:\n"
 msgstr ""
 
-#: src/utils.c:1937
+#: src/utils.c:1936
 #, c-format
 msgid ""
 "Frames have been shifted in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1942
+#: src/utils.c:1941
 #, c-format
 msgid ""
 "Frames have been deleted from the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1947
+#: src/utils.c:1946
 #, c-format
 msgid ""
 "Audio has been deleted from the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1952
+#: src/utils.c:1951
 #, c-format
 msgid ""
 "Audio has been shifted in clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1957
+#: src/utils.c:1956
 #, c-format
 msgid ""
 "Audio has been altered in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1962
+#: src/utils.c:1961
 #, c-format
 msgid ""
 "Frames have been altered in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:2135
+#: src/utils.c:2134
 #, c-format
 msgid ""
 "Set %s\n"
@@ -3681,7 +3671,7 @@
 "by another copy of LiVES.\n"
 msgstr ""
 
-#: src/utils.c:2142
+#: src/utils.c:2140
 #, c-format
 msgid ""
 "\n"
@@ -3727,67 +3717,67 @@
 msgid "Removing layout %s\n"
 msgstr ""
 
-#: src/utils.c:3014
+#: src/utils.c:2996
 msgid "Video [opening...]"
 msgstr ""
 
-#: src/utils.c:3018
+#: src/utils.c:2999
 #, c-format
 msgid "Video [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:3022
+#: src/utils.c:3002
 msgid "(Undefined)"
 msgstr ""
 
-#: src/utils.c:3025
+#: src/utils.c:3004
 msgid "(No video)"
 msgstr ""
 
-#: src/utils.c:3032
+#: src/utils.c:3011
 msgid "(No audio)"
 msgstr ""
 
-#: src/utils.c:3037
+#: src/utils.c:3015
 msgid "Mono  [opening...]"
 msgstr ""
 
-#: src/utils.c:3040
+#: src/utils.c:3017
 msgid "Left Audio [opening...]"
 msgstr ""
 
-#: src/utils.c:3045
+#: src/utils.c:3021
 #, c-format
 msgid "Mono [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:3048
+#: src/utils.c:3023
 #, c-format
 msgid "Left Audio [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:3056
+#: src/utils.c:3031
 msgid "Right Audio [opening...]"
 msgstr ""
 
-#: src/utils.c:3059
+#: src/utils.c:3033
 #, c-format
 msgid "Right Audio [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:3506
+#: src/utils.c:3472
 msgid "LiVES cannot switch to mplayer whilst clips are loading."
 msgstr ""
 
-#: src/utils.c:3559
+#: src/utils.c:3525
 msgid "LiVES cannot switch to mplayer2 whilst clips are loading."
 msgstr ""
 
-#: src/utils.c:3809
+#: src/utils.c:3775
 msgid "Cleaning up clip"
 msgstr ""
 
-#: src/utils.c:3913
+#: src/utils.c:3874
 #, c-format
 msgid ""
 "\n"
@@ -3797,30 +3787,29 @@
 "Overwrite ?\n"
 msgstr ""
 
-#: src/utils.c:4305 src/utils.c:4337 src/multitrack.c:4503
+#: src/utils.c:4250 src/utils.c:4280 src/multitrack.c:4672
 #, c-format
 msgid "_Undo %s"
 msgstr "_Desfés %s"
 
-#: src/utils.c:4306 src/utils.c:4338 src/multitrack.c:4525
+#: src/utils.c:4251 src/utils.c:4281 src/multitrack.c:4693
 #, c-format
 msgid "_Redo %s"
 msgstr "_Refés %s"
 
-#: src/utils.c:4363
+#: src/utils.c:4305
 msgid "-------------Selection------------"
 msgstr ""
 
-#. TRANSLATORS: - try to keep the text of the middle part the same length, by deleting "-" if necessary
-#: src/utils.c:4371
+#: src/utils.c:4313
 msgid " sec ] ----------Selection---------- [ "
 msgstr ""
 
-#: src/utils.c:4371
+#: src/utils.c:4314
 msgid " frames ] ----------"
 msgstr ""
 
-#: src/utils.c:5360
+#: src/utils.c:5302
 msgid ""
 "Your version of mplayer/ffmpeg may be broken !\n"
 "See http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2071\n"
@@ -3831,11 +3820,11 @@
 "Try running Help/Troubleshoot for more information."
 msgstr ""
 
-#: src/saveplay.c:178
+#: src/saveplay.c:179
 msgid "Examining file header"
 msgstr ""
 
-#: src/saveplay.c:315 src/saveplay.c:789
+#: src/saveplay.c:316 src/saveplay.c:779
 #, c-format
 msgid "Opening %s"
 msgstr "S'està obrint %s"
@@ -3845,36 +3834,36 @@
 msgid "Opening %s start time %.2f sec. frames %d"
 msgstr ""
 
-#: src/saveplay.c:326 src/saveplay.c:4001
+#: src/saveplay.c:326 src/saveplay.c:3927
 msgid " without sound"
 msgstr ""
 
-#: src/saveplay.c:396
+#: src/saveplay.c:395
 #, c-format
 msgid "Opening audio for %s"
 msgstr ""
 
-#: src/saveplay.c:557
+#: src/saveplay.c:554
 #, c-format
 msgid "Auto trimming %.2f seconds of audio at start..."
 msgstr ""
 
-#: src/saveplay.c:567
+#: src/saveplay.c:562
 #, c-format
 msgid "Auto trimming %.2f seconds of audio at end..."
 msgstr ""
 
-#: src/saveplay.c:584
+#: src/saveplay.c:577
 #, c-format
 msgid "Auto padding with %.2f seconds of silence at start..."
 msgstr ""
 
-#: src/saveplay.c:599
+#: src/saveplay.c:590
 #, c-format
 msgid "Auto padding with %.2f seconds of silence at end..."
 msgstr ""
 
-#: src/saveplay.c:671
+#: src/saveplay.c:661
 #, c-format
 msgid ""
 "\n"
@@ -3886,11 +3875,11 @@
 "Are you sure you wish to continue ?"
 msgstr ""
 
-#: src/saveplay.c:685
+#: src/saveplay.c:676
 msgid " - please be patient."
 msgstr ""
 
-#: src/saveplay.c:938
+#: src/saveplay.c:926
 msgid ""
 "\n"
 "\n"
@@ -3898,14 +3887,14 @@
 "Please check the terminal window for more details.\n"
 msgstr ""
 
-#: src/saveplay.c:940
+#: src/saveplay.c:928
 msgid ""
 "\n"
 "\n"
 "You may need to install mplayer to open this file.\n"
 msgstr ""
 
-#: src/saveplay.c:948
+#: src/saveplay.c:934
 msgid ""
 "\n"
 "\n"
@@ -3913,29 +3902,29 @@
 "Tools|Preferences|Decoding\n"
 msgstr ""
 
-#: src/saveplay.c:1014
+#: src/saveplay.c:995
 msgid "Adding image..."
 msgstr ""
 
-#: src/saveplay.c:1108
+#: src/saveplay.c:1089
 #, c-format
 msgid "Subtitles were saved as %s\n"
 msgstr ""
 
-#: src/saveplay.c:1192
+#: src/saveplay.c:1171
 #, c-format
 msgid "LiVES: Save Frame %d as..."
 msgstr ""
 
-#: src/saveplay.c:1195
+#: src/saveplay.c:1174
 msgid "LiVES: Save Frame as..."
 msgstr ""
 
-#: src/saveplay.c:1322
+#: src/saveplay.c:1303
 msgid "LiVES: Save Clip as..."
 msgstr ""
 
-#: src/saveplay.c:1390
+#: src/saveplay.c:1369
 msgid ""
 "Saving your video could lead to a loss of quality !\n"
 "You are strongly advised to 'Save As' to a new file.\n"
@@ -3943,67 +3932,67 @@
 "Do you still wish to continue ?"
 msgstr ""
 
-#: src/saveplay.c:1517 src/saveplay.c:1683 src/saveplay.c:1762
-#: src/saveplay.c:4014
+#: src/saveplay.c:1494 src/saveplay.c:1659 src/saveplay.c:1738
+#: src/saveplay.c:3940
 msgid "Pulling frames from clip"
 msgstr ""
 
-#: src/saveplay.c:1588 src/saveplay.c:1727
+#: src/saveplay.c:1565 src/saveplay.c:1703
 msgid "Linking selection"
 msgstr ""
 
-#: src/saveplay.c:1779
+#: src/saveplay.c:1755
 msgid " (with no sound)\n"
 msgstr ""
 
-#: src/saveplay.c:1786
+#: src/saveplay.c:1761
 #, c-format
 msgid "Saving frames %d to %d%s as \"%s\" : encoder = %s : format = %s..."
 msgstr ""
 
-#: src/saveplay.c:1790
+#: src/saveplay.c:1765
 #, c-format
 msgid "Saving frames 1 to %d%s as \"%s\" : encoder %s : format = %s..."
 msgstr ""
 
-#: src/saveplay.c:1909
+#: src/saveplay.c:1890
 msgid "Saving [can take a long time]"
 msgstr ""
 
-#: src/saveplay.c:2057
+#: src/saveplay.c:2044
 msgid ""
 "\n"
 "\n"
 "Encoder error - output file was not created !\n"
 msgstr ""
 
-#: src/saveplay.c:2094
+#: src/saveplay.c:2081
 msgid "Clearing letterbox"
 msgstr ""
 
-#: src/saveplay.c:2183
+#: src/saveplay.c:2168
 #, c-format
 msgid "File size was %s\n"
 msgstr ""
 
-#: src/saveplay.c:2284
+#: src/saveplay.c:2265
 msgid "recording aborted by preview.\n"
 msgstr ""
 
-#: src/saveplay.c:2288
+#: src/saveplay.c:2268
 msgid "recording aborted by clipboard playback.\n"
 msgstr ""
 
-#: src/saveplay.c:2291
+#: src/saveplay.c:2270
 msgid "Recording performance..."
 msgstr ""
 
-#: src/saveplay.c:3293
+#: src/saveplay.c:3251
 #, c-format
 msgid "Average FPS was %.4f\n"
 msgstr ""
 
-#: src/saveplay.c:3299
+#: src/saveplay.c:3256
 msgid ""
 "\n"
 "\n"
@@ -4012,16 +4001,21 @@
 "and resize all frames to the current size.\n"
 msgstr ""
 
-#: src/saveplay.c:3479
+#: src/saveplay.c:3429
 msgid "Unknown"
 msgstr "Desconegut"
 
-#: src/saveplay.c:3588 src/saveplay.c:4585
+#: src/saveplay.c:3538 src/saveplay.c:4502
 #, c-format
 msgid "Untitled%d"
 msgstr "Sense títol%d"
 
-#: src/saveplay.c:3633
+#: src/saveplay.c:3567
+#, c-format
+msgid "%d frames are enough !\n"
+msgstr ""
+
+#: src/saveplay.c:3579
 #, c-format
 msgid ""
 "\n"
@@ -4029,7 +4023,7 @@
 "Bad things may happen with this clip.\n"
 msgstr ""
 
-#: src/saveplay.c:3723
+#: src/saveplay.c:3667
 #, c-format
 msgid ""
 "\n"
@@ -4037,73 +4031,73 @@
 "Default can be set in Tools | Preferences | Misc.\n"
 msgstr ""
 
-#: src/saveplay.c:3735
+#: src/saveplay.c:3677
 #, c-format
 msgid "Playback speed was adjusted to %.3f frames per second to fit audio.\n"
 msgstr ""
 
-#: src/saveplay.c:3754
+#: src/saveplay.c:3694
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d *bpp=Greyscale* fps=%.3f\n"
 "Audio:"
 msgstr ""
 
-#: src/saveplay.c:3758 src/saveplay.c:4762
+#: src/saveplay.c:3698 src/saveplay.c:4671
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d bpp=%d fps=%.3f\n"
 "Audio:"
 msgstr ""
 
-#: src/saveplay.c:3762 src/saveplay.c:4766
+#: src/saveplay.c:3703 src/saveplay.c:4676
 #, c-format
 msgid "%s none\n"
 msgstr ""
 
-#: src/saveplay.c:3774
+#: src/saveplay.c:3714
 #, c-format
 msgid " - Author: %s\n"
 msgstr ""
 
-#: src/saveplay.c:3779
+#: src/saveplay.c:3717
 #, c-format
 msgid " - Title: %s\n"
 msgstr ""
 
-#: src/saveplay.c:3784
+#: src/saveplay.c:3720
 #, c-format
 msgid " - Comment: %s\n"
 msgstr ""
 
-#: src/saveplay.c:3897
+#: src/saveplay.c:3829
 #, c-format
 msgid "Saving frame %d as %s..."
 msgstr ""
 
-#: src/saveplay.c:3996
+#: src/saveplay.c:3924
 #, c-format
 msgid "Backing up %s to %s"
 msgstr ""
 
-#: src/saveplay.c:4049
+#: src/saveplay.c:3975
 msgid "Backing up"
 msgstr ""
 
-#: src/saveplay.c:4083
+#: src/saveplay.c:4009
 msgid "performance data was backed up..."
 msgstr ""
 
-#: src/saveplay.c:4661
+#: src/saveplay.c:4574
 #, c-format
 msgid "Restoring %s..."
 msgstr ""
 
-#: src/saveplay.c:4692
+#: src/saveplay.c:4603
 msgid "Restoring"
 msgstr "S'està restaurant"
 
-#: src/saveplay.c:4714
+#: src/saveplay.c:4625
 #, c-format
 msgid ""
 "\n"
@@ -4113,22 +4107,22 @@
 msgstr ""
 
 #. TRANSLATORS: rec(ord) %.2f M(ega)B(ytes)
-#: src/saveplay.c:5207
+#: src/saveplay.c:5118
 #, c-format
 msgid "rec %.2f MB"
 msgstr ""
 
-#: src/saveplay.c:5213
+#: src/saveplay.c:5123
 #, c-format
 msgid "!rec %.2f MB"
 msgstr ""
 
 #. TRANSLATORS: rec(ord) ?? M(ega)B(ytes)
-#: src/saveplay.c:5216
+#: src/saveplay.c:5126
 msgid "rec ?? MB"
 msgstr ""
 
-#: src/saveplay.c:5241
+#: src/saveplay.c:5151
 #, c-format
 msgid ""
 "\n"
@@ -4136,54 +4130,74 @@
 "Record stop level can be set in Preferences.\n"
 msgstr ""
 
-#: src/saveplay.c:5535
+#: src/saveplay.c:5447
 msgid ""
 "\n"
 "Files from a previous run of LiVES were found.\n"
 "Do you want to attempt to recover them ?\n"
 msgstr ""
 
-#: src/saveplay.c:5557
+#: src/saveplay.c:5469
 msgid "Recovering files"
 msgstr ""
 
-#: src/saveplay.c:5560
+#: src/saveplay.c:5472
 msgid "Recovering files..."
 msgstr ""
 
-#: src/dialogs.c:72
+#: src/dialogs.c:71
 msgid "Show affected _layouts"
 msgstr ""
 
-#: src/dialogs.c:128
+#: src/dialogs.c:113
+msgid ""
+"Do _not show this warning any more\n"
+"(can be turned back on from Preferences/Warnings)"
+msgstr ""
+
+#: src/dialogs.c:127
 msgid "_Recover disk space"
 msgstr ""
 
-#: src/dialogs.c:143
+#: src/dialogs.c:142
 msgid " _Advanced Settings >>"
 msgstr ""
 
-#: src/dialogs.c:184
+#: src/dialogs.c:183 src/dialogs.c:221
 msgid "LiVES: - Warning !"
 msgstr ""
 
 #: src/dialogs.c:194
+#, fuzzy
+msgid "LiVES: - Error !"
+msgstr "LiVES: - Insereix"
+
+#: src/dialogs.c:204
+#, fuzzy
+msgid "LiVES: - Information"
+msgstr "LiVES: - Insereix"
+
+#: src/dialogs.c:230
 msgid "LiVES: - Question"
 msgstr ""
 
-#: src/dialogs.c:204
+#: src/dialogs.c:239
 msgid "LiVES: - File Error"
 msgstr ""
 
-#: src/dialogs.c:208
+#: src/dialogs.c:241
 msgid "_Abort"
 msgstr ""
 
-#: src/dialogs.c:213
+#: src/dialogs.c:246
 msgid "_Retry"
 msgstr ""
 
-#: src/dialogs.c:597
+#: src/dialogs.c:306
+msgid "Show _Details"
+msgstr "Mostra _Detalls"
+
+#: src/dialogs.c:657
 #, c-format
 msgid ""
 "FREE SPACE IN THE PARTITION CONTAINING\n"
@@ -4194,7 +4208,7 @@
 "(Disk warning levels can be configured in Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:615
+#: src/dialogs.c:676
 #, c-format
 msgid ""
 "Free space in the partition containing\n"
@@ -4206,11 +4220,11 @@
 "Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:627
+#: src/dialogs.c:688
 msgid "Audio players cannot be switched during playback."
 msgstr ""
 
-#: src/dialogs.c:632
+#: src/dialogs.c:694
 msgid ""
 "\n"
 "\n"
@@ -4218,46 +4232,46 @@
 "Please try closing some other applications first.\n"
 msgstr ""
 
-#: src/dialogs.c:752
+#: src/dialogs.c:820
 msgid "Processing has been paused."
 msgstr ""
 
-#: src/dialogs.c:937
+#: src/dialogs.c:1002
 #, c-format
 msgid ""
 "\n"
 "%s%d%% done. Time remaining: %u sec%s\n"
 msgstr ""
 
-#: src/dialogs.c:1335
+#: src/dialogs.c:1391
 #, c-format
 msgid ""
 "\n"
 "%d/%d frames opened. Time remaining %u sec.\n"
 msgstr ""
 
-#: src/dialogs.c:1337
+#: src/dialogs.c:1393
 #, c-format
 msgid ""
 "\n"
 "%d/%d frames opened.\n"
 msgstr ""
 
-#: src/dialogs.c:1341
+#: src/dialogs.c:1396
 #, c-format
 msgid ""
 "\n"
 "%d frames opened.\n"
 msgstr ""
 
-#: src/dialogs.c:1940
+#: src/dialogs.c:1993
 #, c-format
 msgid ""
 "\n"
 "Time remaining: %d sec"
 msgstr ""
 
-#: src/dialogs.c:1988
+#: src/dialogs.c:2040
 #, c-format
 msgid ""
 "\n"
@@ -4265,7 +4279,7 @@
 "Please close a file and then try again."
 msgstr ""
 
-#: src/dialogs.c:1994
+#: src/dialogs.c:2047
 #, c-format
 msgid ""
 "LiVES was unable to write to its temporary directory.\n"
@@ -4277,27 +4291,27 @@
 "Please make sure you can write to this directory."
 msgstr ""
 
-#: src/dialogs.c:2005
+#: src/dialogs.c:2059
 msgid ""
 "\n"
 "LiVES currently requires either 'mplayer', 'mplayer2', or 'sox' to function. "
 "Please install one or other of these, and try again.\n"
 msgstr ""
 
-#: src/dialogs.c:2010
+#: src/dialogs.c:2064
 msgid ""
 "Audio was not loaded; please install mplayer or mplayer2 if you expected "
 "audio for this clip.\n"
 msgstr ""
 
-#: src/dialogs.c:2014
+#: src/dialogs.c:2069
 msgid ""
 "Audio resampling is required for this format.\n"
 "Please install 'sox'\n"
 "Or switch to another encoder format in Tools | Preferences | Encoding\n"
 msgstr ""
 
-#: src/dialogs.c:2019
+#: src/dialogs.c:2075
 msgid ""
 "\n"
 "\n"
@@ -4305,19 +4319,19 @@
 "Please set the audio codec in Tools|Preferences|Encoding\n"
 msgstr ""
 
-#: src/dialogs.c:2024
+#: src/dialogs.c:2080
 msgid ""
 "This layout includes generated frames.\n"
 "It cannot be saved, you must render it to a clip first.\n"
 msgstr ""
 
-#: src/dialogs.c:2029
+#: src/dialogs.c:2085
 msgid ""
 "This layout includes generated or recorded audio.\n"
 "It cannot be saved, you must render it to a clip first.\n"
 msgstr ""
 
-#: src/dialogs.c:2039 src/dialogs.c:2137
+#: src/dialogs.c:2095 src/dialogs.c:2189
 #, c-format
 msgid ""
 "\n"
@@ -4325,83 +4339,83 @@
 "Due to restrictions in the %s format\n"
 msgstr ""
 
-#: src/dialogs.c:2059
+#: src/dialogs.c:2115
 msgid ""
 "LiVES recommends the following settings:\n"
 "\n"
 msgstr ""
 
-#: src/dialogs.c:2065 src/dialogs.c:2174 src/resample.c:850
+#: src/dialogs.c:2121 src/dialogs.c:2225 src/resample.c:839
 msgid ", signed"
 msgstr ""
 
-#: src/dialogs.c:2066 src/dialogs.c:2175 src/resample.c:853
+#: src/dialogs.c:2122 src/dialogs.c:2226 src/resample.c:841
 msgid ", unsigned"
 msgstr ""
 
-#: src/dialogs.c:2070 src/dialogs.c:2179 src/resample.c:858
+#: src/dialogs.c:2126 src/dialogs.c:2230 src/resample.c:846
 msgid ", little-endian"
 msgstr ""
 
-#: src/dialogs.c:2071 src/dialogs.c:2180 src/resample.c:861
+#: src/dialogs.c:2127 src/dialogs.c:2231 src/resample.c:848
 msgid ", big-endian"
 msgstr ""
 
-#: src/dialogs.c:2077
+#: src/dialogs.c:2132
 #, c-format
 msgid "Use an audio rate of %d Hz%s%s\n"
 msgstr ""
 
-#: src/dialogs.c:2085
+#: src/dialogs.c:2140
 #, c-format
 msgid "Set video rate to %.3f frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:2089
+#: src/dialogs.c:2143
 #, c-format
 msgid "Set video rate to %d:%d frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:2094 src/dialogs.c:2209
+#: src/dialogs.c:2148 src/dialogs.c:2258
 #, c-format
 msgid "Set video size to %d x %d pixels\n"
 msgstr ""
 
-#: src/dialogs.c:2102 src/dialogs.c:2208
+#: src/dialogs.c:2156 src/dialogs.c:2257
 msgid ""
 "\n"
 "You may wish to:\n"
 msgstr ""
 
-#: src/dialogs.c:2105 src/dialogs.c:2200
+#: src/dialogs.c:2159 src/dialogs.c:2249
 #, c-format
 msgid "resize video to %d x %d pixels\n"
 msgstr ""
 
-#: src/dialogs.c:2110
+#: src/dialogs.c:2163
 msgid "disable audio, since the target encoder cannot encode audio\n"
 msgstr ""
 
-#: src/dialogs.c:2170
+#: src/dialogs.c:2221
 msgid "LiVES must:\n"
 msgstr ""
 
-#: src/dialogs.c:2185
+#: src/dialogs.c:2235
 #, c-format
 msgid "resample audio to %d Hz%s%s\n"
 msgstr ""
 
-#: src/dialogs.c:2192
+#: src/dialogs.c:2242
 #, c-format
 msgid "resample video to %.3f frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:2196
+#: src/dialogs.c:2245
 #, c-format
 msgid "resample video to %d:%d frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:2215
+#: src/dialogs.c:2263
 msgid ""
 "\n"
 "You will be able to undo these changes afterwards.\n"
@@ -4410,14 +4424,14 @@
 "\n"
 msgstr ""
 
-#: src/dialogs.c:2218
+#: src/dialogs.c:2265
 msgid ""
 "\n"
 "Changes applied to the selection will not be permanent.\n"
 "\n"
 msgstr ""
 
-#: src/dialogs.c:2237
+#: src/dialogs.c:2285
 msgid ""
 "\n"
 "\n"
@@ -4426,7 +4440,7 @@
 "Try recording for just a selection of the file."
 msgstr ""
 
-#: src/dialogs.c:2244
+#: src/dialogs.c:2293
 msgid ""
 "The playback speed (fps), or the audio rate\n"
 " of the clipboard does not match\n"
@@ -4437,7 +4451,7 @@
 "Please press Cancel to abort the insert, or OK to continue."
 msgstr ""
 
-#: src/dialogs.c:2253
+#: src/dialogs.c:2304
 #, c-format
 msgid ""
 "When opening a yuvmpeg stream, you should first create a fifo file in:\n"
@@ -4450,11 +4464,11 @@
 "click Cancel."
 msgstr ""
 
-#: src/dialogs.c:2305
+#: src/dialogs.c:2356
 msgid "Show Keys"
 msgstr ""
 
-#: src/dialogs.c:2306
+#: src/dialogs.c:2358
 msgid ""
 "You can use the following keys during playback to control LiVES:-\n"
 "\n"
@@ -4496,11 +4510,11 @@
 "g                             ping pong loops\n"
 msgstr ""
 
-#: src/dialogs.c:2313
+#: src/dialogs.c:2365
 msgid "Multitrack Keys"
 msgstr ""
 
-#: src/dialogs.c:2314
+#: src/dialogs.c:2367
 msgid ""
 "You can use the following keys to control the multitrack window:-\n"
 "\n"
@@ -4522,18 +4536,18 @@
 "For other keys, see the menus.\n"
 msgstr ""
 
-#: src/dialogs.c:2322
+#: src/dialogs.c:2375
 msgid "Message History"
 msgstr ""
 
-#: src/dialogs.c:2335
+#: src/dialogs.c:2388
 #, c-format
 msgid ""
 "After upgrading/installing, you may need to adjust the <prefix_dir> setting "
 "in your %s file"
 msgstr ""
 
-#: src/dialogs.c:2344
+#: src/dialogs.c:2399
 #, c-format
 msgid ""
 "\n"
@@ -4544,25 +4558,25 @@
 "or change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/dialogs.c:2352
+#: src/dialogs.c:2408
 msgid ""
 "Sorry, unknown audio type.\n"
 "\n"
 " (Filenames must end in .mp3, .ogg, .wav, .mod, .xm or .it)"
 msgstr ""
 
-#: src/dialogs.c:2353
+#: src/dialogs.c:2409
 msgid "failed (unknown type)\n"
 msgstr ""
 
-#: src/dialogs.c:2358
+#: src/dialogs.c:2415
 msgid ""
 "\n"
 "Do you wish to remove the layout files associated with this set ?\n"
 "(They will not be usable without the set).\n"
 msgstr ""
 
-#: src/dialogs.c:2363
+#: src/dialogs.c:2421
 #, c-format
 msgid ""
 "\n"
@@ -4571,7 +4585,7 @@
 "Click Cancel to pick a new name.\n"
 msgstr ""
 
-#: src/dialogs.c:2370
+#: src/dialogs.c:2429
 msgid ""
 "\n"
 "Frames from this clip are used in some multitrack layouts.\n"
@@ -4579,7 +4593,7 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2374
+#: src/dialogs.c:2433
 msgid ""
 "\n"
 "Audio from this clip is used in some multitrack layouts.\n"
@@ -4587,7 +4601,7 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2378
+#: src/dialogs.c:2438
 #, c-format
 msgid ""
 "\n"
@@ -4598,7 +4612,7 @@
 "Otherwise click Cancel to skip loading this file.\n"
 msgstr ""
 
-#: src/dialogs.c:2385
+#: src/dialogs.c:2446
 #, c-format
 msgid ""
 "\n"
@@ -4608,7 +4622,7 @@
 "The clip could not be loaded.\n"
 msgstr ""
 
-#: src/dialogs.c:2392
+#: src/dialogs.c:2455
 msgid ""
 "\n"
 "Dear user, the jack developers decided to remove the -Z option from jackd.\n"
@@ -4616,7 +4630,7 @@
 "Alternately, select a different audio player in Preferences.\n"
 msgstr ""
 
-#: src/dialogs.c:2396
+#: src/dialogs.c:2460
 msgid ""
 "\n"
 "Unable to start up jack. Please ensure that alsa is set up correctly on your "
@@ -4625,13 +4639,13 @@
 "Automatic jack startup will be disabled now.\n"
 msgstr ""
 
-#: src/dialogs.c:2402
+#: src/dialogs.c:2466
 msgid ""
 "\n"
 "Unable to connect to jack server. Please start jack before starting LiVES\n"
 msgstr ""
 
-#: src/dialogs.c:2411
+#: src/dialogs.c:2475
 #, c-format
 msgid ""
 "\n"
@@ -4642,13 +4656,13 @@
 "%s\n"
 msgstr ""
 
-#: src/dialogs.c:2418
+#: src/dialogs.c:2482
 msgid ""
 "\n"
 "Alternately, you can restart LiVES and select another audio player.\n"
 msgstr ""
 
-#: src/dialogs.c:2423
+#: src/dialogs.c:2488
 #, c-format
 msgid ""
 "\n"
@@ -4658,7 +4672,7 @@
 "It is recommended to increase it to at least %d MB"
 msgstr ""
 
-#: src/dialogs.c:2429
+#: src/dialogs.c:2496
 #, c-format
 msgid ""
 "\n"
@@ -4667,7 +4681,7 @@
 "Do you wish to delete them ?\n"
 msgstr ""
 
-#: src/dialogs.c:2436
+#: src/dialogs.c:2504
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for multitrack undo.\n"
@@ -4675,7 +4689,7 @@
 "using Preferences/Multitrack/Undo Memory\n"
 msgstr ""
 
-#: src/dialogs.c:2440
+#: src/dialogs.c:2508
 msgid ""
 "\n"
 "Out of memory for undo.\n"
@@ -4683,63 +4697,63 @@
 "using Preferences/Multitrack/Undo Memory\n"
 msgstr ""
 
-#: src/dialogs.c:2444
+#: src/dialogs.c:2512
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for the multitrack undo buffer.\n"
 msgstr ""
 
-#: src/dialogs.c:2446
+#: src/dialogs.c:2514
 msgid "or enter a smaller value.\n"
 msgstr ""
 
-#: src/dialogs.c:2448
+#: src/dialogs.c:2516
 msgid "Try again from the clip editor, try closing some other applications\n"
 msgstr ""
 
-#: src/dialogs.c:2449
+#: src/dialogs.c:2517
 msgid "Try closing some other applications\n"
 msgstr ""
 
-#: src/dialogs.c:2460
+#: src/dialogs.c:2529
 msgid ""
 "Multitrack is set to 0 audio channels, but this layout has audio.\n"
 "You should adjust the audio settings from the Tools menu.\n"
 msgstr ""
 
-#: src/dialogs.c:2464
+#: src/dialogs.c:2534
 msgid ""
 "The current layout has audio, so audio channels may not be set to zero.\n"
 msgstr ""
 
-#: src/dialogs.c:2468
+#: src/dialogs.c:2539
 msgid ""
 "Multitrack audio preview is only available with the\n"
 "\"jack\" or \"pulse audio\" audio player.\n"
 "You can set this in Tools|Preferences|Playback."
 msgstr ""
 
-#: src/dialogs.c:2472
+#: src/dialogs.c:2545
 msgid ""
 "Errors were detected in the layout (which may be due to transferring from "
 "another system, or from an older version of LiVES).\n"
 "Should I try to repair the disk copy of the layout ?\n"
 msgstr ""
 
-#: src/dialogs.c:2476
+#: src/dialogs.c:2549
 msgid ""
 "LiVES was unable to load the layout.\n"
 "Sorry.\n"
 msgstr ""
 
-#: src/dialogs.c:2482
+#: src/dialogs.c:2555
 msgid ""
 "\n"
 "\n"
 "Audio rate must be greater than 0.\n"
 msgstr ""
 
-#: src/dialogs.c:2486
+#: src/dialogs.c:2559
 msgid ""
 "\n"
 "Event list will be very large\n"
@@ -4747,14 +4761,14 @@
 "Are you sure you wish to view it ?\n"
 msgstr ""
 
-#: src/dialogs.c:2491
+#: src/dialogs.c:2564
 msgid ""
 "\n"
 "\n"
 "You must install 'dvgrab' to use this function.\n"
 msgstr ""
 
-#: src/dialogs.c:2496
+#: src/dialogs.c:2570
 msgid ""
 "\n"
 "\n"
@@ -4763,25 +4777,25 @@
 "You may need to select one of these in Tools/Preferences/Playback.\n"
 msgstr ""
 
-#: src/dialogs.c:2500
+#: src/dialogs.c:2574
 msgid "Video playback plugin failed to initialise palette !\n"
 msgstr ""
 
-#: src/dialogs.c:2504
+#: src/dialogs.c:2579
 msgid "Decoder plugin failed to initialise palette !\n"
 msgstr ""
 
-#: src/dialogs.c:2509
+#: src/dialogs.c:2584
 msgid "Unable to set framerate of video plugin\n"
 msgstr ""
 
-#: src/dialogs.c:2514
+#: src/dialogs.c:2590
 msgid ""
 "After a crash, it is advisable to clean up the disk with\n"
 "File|Clean up disk space\n"
 msgstr ""
 
-#: src/dialogs.c:2526
+#: src/dialogs.c:2604
 #, c-format
 msgid ""
 "Stream frame size is too large for your network buffers.\n"
@@ -4790,33 +4804,33 @@
 "echo %d > /proc/sys/net/core/rmem_max\n"
 msgstr ""
 
-#: src/dialogs.c:2714
+#: src/dialogs.c:2800
 msgid "cancelled.\n"
 msgstr ""
 
-#: src/dialogs.c:2721
+#: src/dialogs.c:2805
 msgid "failed.\n"
 msgstr ""
 
-#: src/dialogs.c:2728
+#: src/dialogs.c:2810
 msgid "done.\n"
 msgstr "fet.\n"
 
-#: src/dialogs.c:2732
+#: src/dialogs.c:2814
 msgid "error in file. Failed.\n"
 msgstr ""
 
-#: src/dialogs.c:2766 src/dialogs.c:2815 src/dialogs.c:2839
+#: src/dialogs.c:2848 src/dialogs.c:2897 src/dialogs.c:2921
 #, c-format
 msgid "Additional info: %s\n"
 msgstr ""
 
-#: src/dialogs.c:2769
+#: src/dialogs.c:2851
 #, c-format
 msgid "The error value was %d%s\n"
 msgstr ""
 
-#: src/dialogs.c:2772
+#: src/dialogs.c:2854
 #, c-format
 msgid ""
 "\n"
@@ -4826,7 +4840,7 @@
 "%s%s%s"
 msgstr ""
 
-#: src/dialogs.c:2818
+#: src/dialogs.c:2900
 #, c-format
 msgid ""
 "\n"
@@ -4836,7 +4850,7 @@
 "%s"
 msgstr ""
 
-#: src/dialogs.c:2842
+#: src/dialogs.c:2924
 #, c-format
 msgid ""
 "\n"
@@ -4846,7 +4860,7 @@
 "%s"
 msgstr ""
 
-#: src/dialogs.c:2886
+#: src/dialogs.c:2968
 #, c-format
 msgid ""
 "\n"
@@ -4855,7 +4869,7 @@
 "Please check for possible error causes.\n"
 msgstr ""
 
-#: src/dialogs.c:2890
+#: src/dialogs.c:2971
 #, c-format
 msgid ""
 "\n"
@@ -4865,7 +4879,7 @@
 "%s.\n"
 msgstr ""
 
-#: src/dialogs.c:2921
+#: src/dialogs.c:3002
 #, c-format
 msgid ""
 "\n"
@@ -4874,7 +4888,7 @@
 "Please check for possible error causes.\n"
 msgstr ""
 
-#: src/dialogs.c:2925
+#: src/dialogs.c:3005
 #, c-format
 msgid ""
 "\n"
@@ -4884,12 +4898,12 @@
 "%s.\n"
 msgstr ""
 
-#: src/dialogs.c:2993
+#: src/dialogs.c:3073
 #, c-format
 msgid "Value for \"%s\" could not be read."
 msgstr ""
 
-#: src/dialogs.c:3011
+#: src/dialogs.c:3091
 #, c-format
 msgid ""
 "\n"
@@ -4898,7 +4912,7 @@
 "Please check your system for errors.\n"
 msgstr ""
 
-#: src/dialogs.c:3020
+#: src/dialogs.c:3100
 #, c-format
 msgid ""
 "\n"
@@ -4907,7 +4921,7 @@
 "Please check the file permissions and try again."
 msgstr ""
 
-#: src/dialogs.c:3027
+#: src/dialogs.c:3109
 #, c-format
 msgid ""
 "\n"
@@ -4916,7 +4930,7 @@
 "Please check the directory permissions and try again."
 msgstr ""
 
-#: src/dialogs.c:3034
+#: src/dialogs.c:3116
 #, c-format
 msgid ""
 "\n"
@@ -4924,14 +4938,14 @@
 "%s\n"
 msgstr ""
 
-#: src/dialogs.c:3041
+#: src/dialogs.c:3123
 msgid ""
 "\n"
 "Abort and exit immediately from LiVES\n"
 "Are you sure ?\n"
 msgstr ""
 
-#: src/dialogs.c:3047
+#: src/dialogs.c:3129
 #, c-format
 msgid ""
 "\n"
@@ -4939,13 +4953,13 @@
 "Please select another encoder from the list.\n"
 msgstr ""
 
-#: src/dialogs.c:3056
+#: src/dialogs.c:3139
 msgid ""
 "\n"
 "This card is already in use and cannot be opened multiple times.\n"
 msgstr ""
 
-#: src/dialogs.c:3061
+#: src/dialogs.c:3145
 #, c-format
 msgid ""
 "\n"
@@ -4955,27 +4969,27 @@
 "- Check if the device actually exists.\n"
 msgstr ""
 
-#: src/dialogs.c:3068
+#: src/dialogs.c:3153
 msgid ""
 "\n"
 "This file already has subtitles loaded.\n"
 "Do you wish to overwrite the existing subtitles ?\n"
 msgstr ""
 
-#: src/dialogs.c:3072
+#: src/dialogs.c:3157
 msgid ""
 "\n"
 "LiVES currently only supports subtitles of type .srt and .sub.\n"
 msgstr ""
 
-#: src/dialogs.c:3076
+#: src/dialogs.c:3161
 msgid ""
 "\n"
 "Erase all subtitles from this clip.\n"
 "Are you sure ?\n"
 msgstr ""
 
-#: src/dialogs.c:3082
+#: src/dialogs.c:3168
 #, c-format
 msgid ""
 "\n"
@@ -4984,14 +4998,14 @@
 "or OK to continue and save as type \"%s\"\n"
 msgstr ""
 
-#: src/dialogs.c:3089
+#: src/dialogs.c:3176
 msgid ""
 "\n"
 "Do you wish to move the current clip sets to the new directory ?\n"
 "(If unsure, click Yes)\n"
 msgstr ""
 
-#: src/dialogs.c:3093
+#: src/dialogs.c:3181
 #, c-format
 msgid ""
 "\n"
@@ -5002,19 +5016,19 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:3099
+#: src/dialogs.c:3188
 msgid ""
 "\n"
 "No video input devices could be found.\n"
 msgstr ""
 
-#: src/dialogs.c:3103
+#: src/dialogs.c:3192
 msgid ""
 "\n"
 "All video input devices are already in use.\n"
 msgstr ""
 
-#: src/dialogs.c:3107
+#: src/dialogs.c:3196
 msgid ""
 "\n"
 "\n"
@@ -5022,15 +5036,14 @@
 "DO NOT SHUT DOWN OR CLOSE LIVES !\n"
 msgstr ""
 
-#: src/dialogs.c:3127
+#: src/dialogs.c:3203
 #, c-format
 msgid ""
 "No clips were recovered for set (%s).\n"
 "Please check the spelling of the set name and try again.\n"
 msgstr ""
 
-#. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:3136
+#: src/dialogs.c:3214
 #, c-format
 msgid ""
 "\n"
@@ -5042,7 +5055,7 @@
 msgstr ""
 
 #. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:3144
+#: src/dialogs.c:3222
 #, c-format
 msgid ""
 "\n"
@@ -5051,34 +5064,34 @@
 "\n"
 msgstr ""
 
-#: src/dialogs.c:3150
+#: src/dialogs.c:3228
 msgid ""
 "\n"
 "You must have autolives.pl installed and in your path to use this toy.\n"
 "Consult your package distributor.\n"
 msgstr ""
 
-#: src/dialogs.c:3154
+#: src/dialogs.c:3232
 msgid ""
 "\n"
 "You must have a minimum of one clip loaded to use this toy.\n"
 msgstr ""
 
-#: src/dialogs.c:3158
+#: src/dialogs.c:3236
 msgid ""
 "\n"
 "LiVES lost its connection to jack and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:3162
+#: src/dialogs.c:3240
 msgid ""
 "\n"
 "LiVES lost its connection to pulseaudio and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:3175
+#: src/dialogs.c:3254
 #, c-format
 msgid ""
 "\n"
@@ -5087,544 +5100,544 @@
 "Do you wish to allow this (for this session only) ?\n"
 msgstr ""
 
-#: src/effects.c:60
+#: src/effects.c:61
 msgid "generator"
 msgstr "generador"
 
-#: src/effects.c:61
+#: src/effects.c:62
 msgid "Generators"
 msgstr ""
 
-#: src/effects.c:63
+#: src/effects.c:64
 msgid "audio generator"
 msgstr ""
 
-#: src/effects.c:64
+#: src/effects.c:65
 msgid "Audio Generators"
 msgstr ""
 
-#: src/effects.c:66
+#: src/effects.c:67
 msgid "audio/video generator"
 msgstr ""
 
-#: src/effects.c:67
+#: src/effects.c:68
 msgid "Audio/Video Generators"
 msgstr ""
 
-#: src/effects.c:69
+#: src/effects.c:70
 msgid "data generator"
 msgstr ""
 
-#: src/effects.c:70
+#: src/effects.c:71
 msgid "Data Generators"
 msgstr ""
 
-#: src/effects.c:72
+#: src/effects.c:73
 msgid "data visualiser"
 msgstr ""
 
-#: src/effects.c:73
+#: src/effects.c:74
 msgid "Data Visualisers"
 msgstr ""
 
-#: src/effects.c:75
+#: src/effects.c:76
 msgid "data processor"
 msgstr ""
 
-#: src/effects.c:76
+#: src/effects.c:77
 msgid "Data Processors"
 msgstr ""
 
-#: src/effects.c:78
+#: src/effects.c:79
 msgid "data source"
 msgstr ""
 
-#: src/effects.c:79
+#: src/effects.c:80
 msgid "Data Sources"
 msgstr ""
 
-#: src/effects.c:81
+#: src/effects.c:82
 msgid "transition"
 msgstr ""
 
-#: src/effects.c:82
+#: src/effects.c:83
 msgid "Transitions"
 msgstr "Transicions"
 
-#: src/effects.c:84
+#: src/effects.c:85
 msgid "effect"
 msgstr "efecte"
 
-#: src/effects.c:87 src/rfx-builder.c:187
+#: src/effects.c:88 src/rfx-builder.c:187
 msgid "utility"
 msgstr ""
 
-#: src/effects.c:88
+#: src/effects.c:89
 msgid "Utilities"
 msgstr "Utilitats"
 
-#: src/effects.c:90
+#: src/effects.c:91
 msgid "compositor"
 msgstr ""
 
-#: src/effects.c:91
+#: src/effects.c:92
 msgid "Compositors"
 msgstr ""
 
-#: src/effects.c:93
+#: src/effects.c:94
 msgid "tap"
 msgstr ""
 
-#: src/effects.c:94
+#: src/effects.c:95
 msgid "Taps"
 msgstr ""
 
-#: src/effects.c:96
+#: src/effects.c:97
 msgid "splitter"
 msgstr "divisor"
 
-#: src/effects.c:97
+#: src/effects.c:98
 msgid "Splitters"
 msgstr ""
 
-#: src/effects.c:99
+#: src/effects.c:100
 msgid "converter"
 msgstr ""
 
-#: src/effects.c:100
+#: src/effects.c:101
 msgid "Converters"
 msgstr ""
 
-#: src/effects.c:102
+#: src/effects.c:103
 msgid "analyser"
 msgstr ""
 
-#: src/effects.c:103
+#: src/effects.c:104
 msgid "Analysers"
 msgstr ""
 
-#: src/effects.c:108
+#: src/effects.c:109
 msgid "audio/video"
 msgstr ""
 
-#: src/effects.c:109
+#: src/effects.c:110
 msgid "Audio/Video Transitions"
 msgstr ""
 
-#: src/effects.c:111
+#: src/effects.c:112
 msgid "video only"
 msgstr ""
 
-#: src/effects.c:112
+#: src/effects.c:113
 msgid "Video only Transitions"
 msgstr ""
 
-#: src/effects.c:114 src/multitrack.c:10740
+#: src/effects.c:115 src/multitrack.c:10962
 msgid "audio only"
 msgstr ""
 
-#: src/effects.c:115
+#: src/effects.c:116
 msgid "Audio only Transitions"
 msgstr ""
 
-#: src/effects.c:117 src/effects.c:120 src/multitrack.c:18757
+#: src/effects.c:118 src/effects.c:121 src/multitrack.c:19097
 msgid "audio"
 msgstr "àudio"
 
-#: src/effects.c:118
+#: src/effects.c:119
 msgid "Audio Mixers"
 msgstr "Mescladors d'àudio"
 
-#: src/effects.c:121
+#: src/effects.c:122
 msgid "Audio Effects"
 msgstr ""
 
-#: src/effects.c:123
+#: src/effects.c:124
 msgid "video"
 msgstr ""
 
-#: src/effects.c:124
+#: src/effects.c:125
 msgid "Video Effects"
 msgstr ""
 
-#: src/effects.c:126
+#: src/effects.c:127
 msgid "audio volume controller"
 msgstr ""
 
-#: src/effects.c:127
+#: src/effects.c:128
 msgid "Audio Volume Controllers"
 msgstr ""
 
-#: src/effects.c:129
+#: src/effects.c:130
 msgid "video analyser"
 msgstr ""
 
-#: src/effects.c:130
+#: src/effects.c:131
 msgid "Video analysers"
 msgstr ""
 
-#: src/effects.c:132
+#: src/effects.c:133
 msgid "audio analyser"
 msgstr ""
 
-#: src/effects.c:133
+#: src/effects.c:134
 msgid "Audio Analysers"
 msgstr ""
 
-#: src/effects.c:137 src/plugins.c:2559 src/plugins.c:2573
+#: src/effects.c:138 src/plugins.c:2507 src/plugins.c:2521
 msgid "unknown"
 msgstr "desconegut"
 
-#: src/effects.c:238
+#: src/effects.c:235
 #, c-format
 msgid "%s all frames..."
 msgstr ""
 
-#: src/effects.c:243
+#: src/effects.c:239
 #, c-format
 msgid "%s clipboard into frames %d to %d..."
 msgstr ""
 
-#: src/effects.c:250
+#: src/effects.c:245
 #, c-format
 msgid "%s to clipboard..."
 msgstr ""
 
-#: src/effects.c:254
+#: src/effects.c:248
 #, c-format
 msgid "%s to new clip..."
 msgstr ""
 
-#: src/effects.c:259
+#: src/effects.c:252
 #, c-format
 msgid "%s frames %d to %d..."
 msgstr ""
 
-#: src/effects.c:290
+#: src/effects.c:283
 #, c-format
 msgid "%s clipboard with selection"
 msgstr ""
 
-#: src/effects.c:295
+#: src/effects.c:287
 #, c-format
 msgid "%s to clipboard"
 msgstr ""
 
-#: src/effects.c:299
+#: src/effects.c:290
 #, c-format
 msgid "%s to new clip"
 msgstr ""
 
-#: src/effects.c:304
+#: src/effects.c:294
 #, c-format
 msgid "%s frames %d to %d"
 msgstr ""
 
-#: src/effects.c:456 src/effects.c:523
+#: src/effects.c:443 src/effects.c:507
 msgid ""
 "\n"
 "No frames were generated.\n"
 msgstr ""
 
-#: src/effects-weed.c:431
+#: src/effects-weed.c:452
 msgid "integer"
 msgstr ""
 
-#: src/effects-weed.c:432
+#: src/effects-weed.c:454
 msgid "int64"
 msgstr ""
 
-#: src/effects-weed.c:433
+#: src/effects-weed.c:456
 msgid "boolean"
 msgstr ""
 
-#: src/effects-weed.c:434
+#: src/effects-weed.c:458
 msgid "double"
 msgstr ""
 
-#: src/effects-weed.c:435
+#: src/effects-weed.c:460
 msgid "string"
 msgstr ""
 
-#: src/effects-weed.c:436
+#: src/effects-weed.c:462
 msgid "pointer"
 msgstr ""
 
-#: src/effects-weed.c:4591
+#: src/effects-weed.c:4581
 #, c-format
 msgid "Error: plugin %s has no weed_setup() function.\n"
 msgstr ""
 
-#: src/effects-weed.c:4606
+#: src/effects-weed.c:4595
 #, c-format
 msgid "No usable filters found in plugin %s\n"
 msgstr ""
 
-#: src/effects-weed.c:4680
+#: src/effects-weed.c:4668
 #, c-format
 msgid "Found duplicate plugin %s"
 msgstr ""
 
-#: src/effects-weed.c:4734
+#: src/effects-weed.c:4723
 #, c-format
 msgid ""
 "Info: Unable to load plugin %s\n"
 "Error was: %s\n"
 msgstr ""
 
-#: src/effects-weed.c:4737 src/effects-weed.c:5858
+#: src/effects-weed.c:4726 src/effects-weed.c:5847
 msgid "Some plugin directories"
 msgstr ""
 
 #. TRANSLATORS: example " - LADSPA plugins -"
-#: src/effects-weed.c:4812 src/rte_window.c:2105
+#: src/effects-weed.c:4801 src/rte_window.c:2107
 #, c-format
 msgid " - %s plugins -"
 msgstr ""
 
-#: src/effects-weed.c:5012
+#: src/effects-weed.c:4998
 #, c-format
 msgid "Successfully loaded %d Weed filters\n"
 msgstr ""
 
-#: src/effects-weed.c:5177
+#: src/effects-weed.c:5162
 #, c-format
 msgid "Invalid compound effect %s - has conflicting target_fps\n"
 msgstr ""
 
-#: src/effects-weed.c:5197
+#: src/effects-weed.c:5182
 #, c-format
 msgid "Invalid compound effect %s - has multiple transition parameters\n"
 msgstr ""
 
-#: src/effects-weed.c:5211
+#: src/effects-weed.c:5196
 #, c-format
 msgid "Invalid compound effect %s - has multiple master volume parameters\n"
 msgstr ""
 
-#: src/effects-weed.c:5346
+#: src/effects-weed.c:5329
 #, c-format
 msgid "Invalid compound effect %s - must have >1 sub filters\n"
 msgstr ""
 
-#: src/effects-weed.c:5366
+#: src/effects-weed.c:5349
 #, c-format
 msgid "Invalid effect %s found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5381
+#: src/effects-weed.c:5364
 #, c-format
 msgid "Invalid default found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5392
+#: src/effects-weed.c:5375
 #, c-format
 msgid "Invalid filter %d for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5406
+#: src/effects-weed.c:5389
 #, c-format
 msgid "Invalid param %d for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5433
+#: src/effects-weed.c:5416
 #, c-format
 msgid ""
 "Invalid number of values for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5467
+#: src/effects-weed.c:5450
 #, c-format
 msgid ""
 "Invalid non-boolean value for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5500
+#: src/effects-weed.c:5483
 #, c-format
 msgid "Invalid param link found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5511
+#: src/effects-weed.c:5494
 #, c-format
 msgid ""
 "Invalid out filter %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5529
+#: src/effects-weed.c:5513
 #, c-format
 msgid ""
 "Invalid out param %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5541
+#: src/effects-weed.c:5526
 #, c-format
 msgid ""
 "Invalid non-boolean value for autoscale found in compound effect %s, line "
 "%d\n"
 msgstr ""
 
-#: src/effects-weed.c:5552
+#: src/effects-weed.c:5537
 #, c-format
 msgid ""
 "Invalid in filter %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5566
+#: src/effects-weed.c:5552
 #, c-format
 msgid ""
 "Invalid in param %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5594
+#: src/effects-weed.c:5581
 #, c-format
 msgid "Invalid channel link found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5605
+#: src/effects-weed.c:5592
 #, c-format
 msgid ""
 "Invalid out filter %d for link channels found in compound effect %s, line "
 "%d\n"
 msgstr ""
 
-#: src/effects-weed.c:5623
+#: src/effects-weed.c:5611
 #, c-format
 msgid ""
 "Invalid out channel %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5633
+#: src/effects-weed.c:5622
 #, c-format
 msgid ""
 "Invalid in filter %d for link channels found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5651
+#: src/effects-weed.c:5641
 #, c-format
 msgid ""
 "Invalid in channel %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5687
+#: src/effects-weed.c:5678
 #, c-format
 msgid "Compound:%s"
 msgstr ""
 
-#: src/effects-weed.c:5758
+#: src/effects-weed.c:5749
 #, c-format
 msgid "Successfully loaded %d compound filters\n"
 msgstr ""
 
-#: src/effects-weed.c:6591
+#: src/effects-weed.c:6570
 #, c-format
 msgid "Effect %s cannot be used with this audio player.\n"
 msgstr ""
 
-#: src/effects-weed.c:6737
+#: src/effects-weed.c:6718
 #, c-format
 msgid "Failed to start instance %s, error code %d\n"
 msgstr ""
 
-#: src/effects-weed.c:6814
+#: src/effects-weed.c:6797
 #, c-format
 msgid "Unable to start generator %s\n"
 msgstr ""
 
-#: src/effects-weed.c:7621
+#: src/effects-weed.c:7607
 #, c-format
 msgid "Failed to start generator %s\n"
 msgstr ""
 
-#: src/effects-weed.c:7718
+#: src/effects-weed.c:7701
 #, c-format
 msgid "Failed to start generator %s, error %d\n"
 msgstr ""
 
-#: src/effects-weed.c:9012
+#: src/effects-weed.c:8993
 #, c-format
 msgid "%s [unstable] (%s)"
 msgstr ""
 
-#: src/effects-data.c:3278
+#: src/effects-data.c:3234
 #, c-format
 msgid "ACTIVATE (%s)"
 msgstr ""
 
-#: src/effects-data.c:3548
+#: src/effects-data.c:3501
 msgid "ACTIVATE"
 msgstr ""
 
-#: src/effects-data.c:3876
+#: src/effects-data.c:3829
 #, c-format
 msgid "Key slot %d"
 msgstr ""
 
-#: src/effects-data.c:3998
+#: src/effects-data.c:3951
 msgid "Autoscale"
 msgstr ""
 
-#: src/effects-data.c:4089
+#: src/effects-data.c:4042
 msgid "Add another connection for this output parameter"
 msgstr ""
 
-#: src/effects-data.c:4102 src/effects-data.c:4151
+#: src/effects-data.c:4055 src/effects-data.c:4104
 #, fuzzy
 msgid "Delete this connection"
 msgstr "_Suprimix la selecció"
 
-#: src/effects-data.c:4138
+#: src/effects-data.c:4091
 msgid "Add another connection for this output channel"
 msgstr ""
 
-#: src/effects-data.c:4223
+#: src/effects-data.c:4176
 msgid "Connected to -->"
 msgstr ""
 
-#: src/effects-data.c:4243
+#: src/effects-data.c:4196
 #, c-format
 msgid "%s - Alpha Channel Connections"
 msgstr ""
 
-#: src/effects-data.c:4316
+#: src/effects-data.c:4269
 #, c-format
 msgid "%s - Parameter Data Connections"
 msgstr ""
 
-#: src/effects-data.c:4336
+#: src/effects-data.c:4289
 msgid "Autoscale All"
 msgstr ""
 
-#: src/effects-data.c:4361 src/effects-data.c:4890
+#: src/effects-data.c:4314 src/effects-data.c:4841
 msgid "ACTIVATED"
 msgstr ""
 
-#: src/effects-data.c:4774
+#: src/effects-data.c:4726
 msgid "LiVES: - Parameter and Alpha Channel Connections"
 msgstr ""
 
-#: src/effects-data.c:4785
+#: src/effects-data.c:4736
 msgid "Auto Connect Channels"
 msgstr ""
 
-#: src/effects-data.c:4797
+#: src/effects-data.c:4748
 msgid "Auto Connect Parameters"
 msgstr ""
 
-#: src/effects-data.c:4807
+#: src/effects-data.c:4758
 msgid "Disconnect All"
 msgstr ""
 
-#: src/effects-data.c:4875
+#: src/effects-data.c:4826
 #, c-format
 msgid "Input channel is already connected from (%d,%d) %s"
 msgstr ""
 
-#: src/effects-data.c:4891
+#: src/effects-data.c:4842
 #, c-format
 msgid "Input parameter is already connected from (%d,%d) %s"
 msgstr ""
 
-#: src/effects-data.c:4899
+#: src/effects-data.c:4851
 msgid "Input and output parameters are not compatible"
 msgstr ""
 
@@ -5636,43 +5649,43 @@
 msgid "_Reset Values"
 msgstr ""
 
-#: src/framedraw.c:267
+#: src/framedraw.c:265
 msgid "_Frame"
 msgstr ""
 
-#: src/paramspecial.c:266
+#: src/paramspecial.c:259
 msgid "Maintain _Aspect Ratio"
 msgstr ""
 
-#: src/paramspecial.c:267
+#: src/paramspecial.c:260
 msgid "Maintain aspect ratio of original frame"
 msgstr ""
 
-#: src/paramspecial.c:341
+#: src/paramspecial.c:335
 msgid "Display Password"
 msgstr ""
 
-#: src/paramwindow.c:450
+#: src/paramwindow.c:447
 msgid "Transition _In"
 msgstr ""
 
-#: src/paramwindow.c:452
+#: src/paramwindow.c:449
 msgid "Click to set the transition parameter to show only the front frame"
 msgstr ""
 
-#: src/paramwindow.c:474
+#: src/paramwindow.c:472
 msgid "Crossfade audio"
 msgstr ""
 
-#: src/paramwindow.c:475
+#: src/paramwindow.c:473
 msgid "Check the box to make audio transition with the video"
 msgstr ""
 
-#: src/paramwindow.c:493
+#: src/paramwindow.c:492
 msgid "Transition _Out"
 msgstr ""
 
-#: src/paramwindow.c:495
+#: src/paramwindow.c:494
 msgid "Click to set the transition parameter to show only the rear frame"
 msgstr ""
 
@@ -5685,23 +5698,23 @@
 msgid "%s : size"
 msgstr ""
 
-#: src/paramwindow.c:598
+#: src/paramwindow.c:597
 msgid "New size (pixels)"
 msgstr ""
 
-#: src/paramwindow.c:617 src/plugins.c:997
+#: src/paramwindow.c:616 src/plugins.c:973
 msgid "_Width"
 msgstr "A_mplada"
 
-#: src/paramwindow.c:636 src/plugins.c:1003
+#: src/paramwindow.c:635 src/plugins.c:979
 msgid "_Height"
 msgstr "A_lçada"
 
-#: src/paramwindow.c:684
+#: src/paramwindow.c:683
 msgid "Generate to _Clipboard"
 msgstr ""
 
-#: src/paramwindow.c:686
+#: src/paramwindow.c:685
 msgid "Generate frames to the clipboard"
 msgstr ""
 
@@ -5713,7 +5726,7 @@
 msgid "Generate frames to a new clip"
 msgstr ""
 
-#: src/paramwindow.c:822
+#: src/paramwindow.c:824
 #, c-format
 msgid ""
 "\n"
@@ -5721,71 +5734,71 @@
 "\n"
 msgstr ""
 
-#: src/paramwindow.c:920 src/paramwindow.c:930
+#: src/paramwindow.c:934 src/paramwindow.c:942
 msgid "Set as default"
 msgstr "Estableix com a predeterminat"
 
-#: src/paramwindow.c:922 src/paramwindow.c:938
+#: src/paramwindow.c:936 src/paramwindow.c:950
 msgid "Reset"
 msgstr ""
 
-#: src/paramwindow.c:932 src/rte_window.c:2401 src/omc-learn.c:1357
+#: src/paramwindow.c:944 src/rte_window.c:2394 src/omc-learn.c:1347
 msgid "Close _window"
 msgstr "Tanca la _finestra"
 
-#: src/paramwindow.c:1337
+#: src/paramwindow.c:1340
 msgid "No parameters"
 msgstr ""
 
-#: src/paramwindow.c:1419
+#: src/paramwindow.c:1424
 msgid "Invalid parameter"
 msgstr "Paràmetre no vàlid"
 
-#: src/paramwindow.c:1611
+#: src/paramwindow.c:1610
 msgid "LiVES: - Select Colour"
 msgstr ""
 
-#: src/paramwindow.c:1616
+#: src/paramwindow.c:1615
 msgid "Click to set the colour"
 msgstr ""
 
-#: src/paramwindow.c:1628
+#: src/paramwindow.c:1626
 msgid "_Red"
 msgstr ""
 
-#: src/paramwindow.c:1629
+#: src/paramwindow.c:1627
 msgid "The red value (0 - 255)"
 msgstr ""
 
-#: src/paramwindow.c:1632
+#: src/paramwindow.c:1630
 msgid "_Green"
 msgstr ""
 
-#: src/paramwindow.c:1633
+#: src/paramwindow.c:1631
 msgid "The green value (0 - 255)"
 msgstr ""
 
-#: src/paramwindow.c:1636
+#: src/paramwindow.c:1634
 msgid "_Blue"
 msgstr ""
 
-#: src/paramwindow.c:1637
+#: src/paramwindow.c:1635
 msgid "The blue value (0 - 255)"
 msgstr ""
 
-#: src/plugins.c:85
+#: src/plugins.c:86
 #, c-format
 msgid ""
 "\n"
 "Plugin error: %s failed with code %d"
 msgstr ""
 
-#: src/plugins.c:87
+#: src/plugins.c:88
 #, c-format
 msgid " : message was %s\n"
 msgstr ""
 
-#: src/plugins.c:387
+#: src/plugins.c:375
 #, c-format
 msgid ""
 "\n"
@@ -5795,17 +5808,17 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/plugins.c:397
+#: src/plugins.c:385
 #, c-format
 msgid "Updating video playback plugin defaults in %s\n"
 msgstr ""
 
-#: src/plugins.c:452
+#: src/plugins.c:444
 #, c-format
 msgid "Loading video playback plugin defaults from %s..."
 msgstr ""
 
-#: src/plugins.c:515
+#: src/plugins.c:505
 #, c-format
 msgid ""
 "\n"
@@ -5815,32 +5828,32 @@
 "\n"
 msgstr ""
 
-#: src/plugins.c:855
+#: src/plugins.c:836
 #, c-format
 msgid "Saving playback plugin defaults to %s..."
 msgstr ""
 
-#: src/plugins.c:962
+#: src/plugins.c:939
 msgid "_FPS"
 msgstr "_FPS"
 
-#: src/plugins.c:963
+#: src/plugins.c:940
 msgid "Fixed framerate for plugin.\n"
 msgstr ""
 
-#: src/plugins.c:1032
+#: src/plugins.c:1008
 msgid "_Colourspace"
 msgstr ""
 
-#: src/plugins.c:1033
+#: src/plugins.c:1009
 msgid "Colourspace input to the plugin.\n"
 msgstr ""
 
-#: src/plugins.c:1089
+#: src/plugins.c:1065
 msgid "Save settings to an alternate file.\n"
 msgstr ""
 
-#: src/plugins.c:1206
+#: src/plugins.c:1182
 #, c-format
 msgid ""
 "\n"
@@ -5849,7 +5862,7 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/plugins.c:1252
+#: src/plugins.c:1228
 #, c-format
 msgid ""
 "\n"
@@ -5859,38 +5872,38 @@
 "Unable to use it.\n"
 msgstr ""
 
-#: src/plugins.c:1265
+#: src/plugins.c:1241
 #, c-format
 msgid ""
 "Video playback plugin failed to initialise.\n"
 "Error was: %s\n"
 msgstr ""
 
-#: src/plugins.c:1461
+#: src/plugins.c:1428
 msgid ""
 "\n"
 "Warning ! Video playback plugin will not send key presses. Keyboard may be "
 "disabled during plugin use !\n"
 msgstr ""
 
-#: src/plugins.c:1465
+#: src/plugins.c:1433
 #, c-format
 msgid ""
 "*** Using %s plugin for fs playback, agreed to use palette type %d ( %s ). "
 "***\n"
 msgstr ""
 
-#: src/plugins.c:1571
+#: src/plugins.c:1537
 #, c-format
 msgid "Audio stream unable to use preferred format '%s'\n"
 msgstr ""
 
-#: src/plugins.c:1579
+#: src/plugins.c:1543
 #, c-format
 msgid "Using format '%s' instead.\n"
 msgstr ""
 
-#: src/plugins.c:1616
+#: src/plugins.c:1579
 #, c-format
 msgid ""
 "LiVES was unable to find its encoder plugins. Please make sure you have the "
@@ -5899,7 +5912,7 @@
 "or change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/plugins.c:1624
+#: src/plugins.c:1589
 #, c-format
 msgid ""
 "LiVES did not receive a response from the encoder plugin called '%s'.\n"
@@ -5908,11 +5921,11 @@
 "or switch to another plugin using Tools|Preferences|Encoding\n"
 msgstr ""
 
-#: src/plugins.c:2032
+#: src/plugins.c:1987
 msgid "Unable to resize, please install imageMagick\n"
 msgstr ""
 
-#: src/plugins.c:2231
+#: src/plugins.c:2183
 #, c-format
 msgid ""
 "\n"
@@ -5920,12 +5933,12 @@
 "No decoders found in %s !\n"
 msgstr ""
 
-#: src/plugins.c:2415
+#: src/plugins.c:2369
 #, fuzzy, c-format
 msgid " using %s"
 msgstr "S'està obrint %s"
 
-#: src/plugins.c:2499
+#: src/plugins.c:2451
 #, c-format
 msgid ""
 "\n"
@@ -5934,7 +5947,7 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/plugins.c:2522
+#: src/plugins.c:2472
 #, c-format
 msgid ""
 "\n"
@@ -5944,24 +5957,24 @@
 "Unable to use it.\n"
 msgstr ""
 
-#: src/plugins.c:2564
+#: src/plugins.c:2512
 msgid "/unknown"
 msgstr ""
 
-#: src/plugins.c:2651
+#: src/plugins.c:2598
 msgid "LiVES: - Decoder Plugins"
 msgstr ""
 
-#: src/plugins.c:2669
+#: src/plugins.c:2616
 msgid "Enabled Video Decoders (uncheck to disable)"
 msgstr ""
 
-#: src/plugins.c:2726
+#: src/plugins.c:2672
 #, c-format
 msgid "Failed to load %s, transitions may not resize.\n"
 msgstr ""
 
-#: src/plugins.c:3854
+#: src/plugins.c:3797
 #, c-format
 msgid "%s advanced settings"
 msgstr ""
@@ -5970,15 +5983,15 @@
 msgid "LiVES: - New Test RFX"
 msgstr ""
 
-#: src/rfx-builder.c:136
+#: src/rfx-builder.c:135
 msgid "LiVES: - Edit Test RFX"
 msgstr ""
 
-#: src/rfx-builder.c:166
+#: src/rfx-builder.c:165
 msgid "Type:"
 msgstr "Tipus:"
 
-#: src/rfx-builder.c:184
+#: src/rfx-builder.c:183
 msgid "tool"
 msgstr ""
 
@@ -5990,130 +6003,130 @@
 msgid "The name of the plugin. No spaces allowed."
 msgstr ""
 
-#: src/rfx-builder.c:201
+#: src/rfx-builder.c:202
 msgid "Version:       "
 msgstr ""
 
-#: src/rfx-builder.c:203
+#: src/rfx-builder.c:204
 msgid "The script version."
 msgstr ""
 
-#: src/rfx-builder.c:210
+#: src/rfx-builder.c:212
 msgid "    Author:       "
 msgstr ""
 
-#: src/rfx-builder.c:211
+#: src/rfx-builder.c:213
 msgid "The script author."
 msgstr ""
 
-#: src/rfx-builder.c:217
+#: src/rfx-builder.c:220
 msgid "    URL (optional):       "
 msgstr ""
 
-#: src/rfx-builder.c:218
+#: src/rfx-builder.c:221
 msgid "URL for the plugin maintainer."
 msgstr ""
 
-#: src/rfx-builder.c:226
+#: src/rfx-builder.c:230
 msgid "Menu text:    "
 msgstr ""
 
-#: src/rfx-builder.c:227
+#: src/rfx-builder.c:231
 msgid "The text to show in the menu."
 msgstr ""
 
-#: src/rfx-builder.c:239
+#: src/rfx-builder.c:244
 msgid "Action description:        "
 msgstr ""
 
-#: src/rfx-builder.c:241
+#: src/rfx-builder.c:246
 msgid "Describe what the plugin is doing. E.g. \"Edge detecting\""
 msgstr ""
 
-#: src/rfx-builder.c:246
+#: src/rfx-builder.c:251
 msgid "Minimum frames:"
 msgstr ""
 
-#: src/rfx-builder.c:249
+#: src/rfx-builder.c:254
 msgid ""
 "Minimum number of frames this effect/tool can be applied to. Normally 1."
 msgstr ""
 
-#: src/rfx-builder.c:260
+#: src/rfx-builder.c:265
 msgid "_Requirements..."
 msgstr ""
 
-#: src/rfx-builder.c:263
+#: src/rfx-builder.c:268
 msgid "Enter any binaries required by the plugin."
 msgstr ""
 
-#: src/rfx-builder.c:267
+#: src/rfx-builder.c:272
 msgid "_Properties..."
 msgstr "_Propietats..."
 
-#: src/rfx-builder.c:270
+#: src/rfx-builder.c:275
 msgid "Set properties for the plugin. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:274
+#: src/rfx-builder.c:279
 msgid "_Parameters..."
 msgstr ""
 
-#: src/rfx-builder.c:277
+#: src/rfx-builder.c:282
 msgid "Set up parameters used in pre/loop/post/trigger code. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:281
+#: src/rfx-builder.c:286
 msgid "Parameter _Window Hints..."
 msgstr ""
 
-#: src/rfx-builder.c:284
+#: src/rfx-builder.c:289
 msgid "Set hints about how to lay out the parameter window. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:290
+#: src/rfx-builder.c:295
 msgid "_Language code:"
 msgstr ""
 
-#: src/rfx-builder.c:291
+#: src/rfx-builder.c:296
 msgid "Language for pre/loop/post/triggers. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:300
+#: src/rfx-builder.c:305
 msgid "_Pre loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:303
+#: src/rfx-builder.c:308
 msgid "Code to be executed before the loop. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:307
+#: src/rfx-builder.c:312
 msgid "_Loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:310
+#: src/rfx-builder.c:315
 msgid "Loop code to be applied to each frame."
 msgstr ""
 
-#: src/rfx-builder.c:314
+#: src/rfx-builder.c:319
 msgid "_Post loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:317
+#: src/rfx-builder.c:322
 msgid "Code to be executed after the loop. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:321
+#: src/rfx-builder.c:326
 msgid "_Trigger code..."
 msgstr ""
 
-#: src/rfx-builder.c:324
+#: src/rfx-builder.c:329
 msgid ""
 "Set trigger code for when the parameter window is shown, or when a parameter "
 "is changed. Optional (except for Utilities)."
 msgstr ""
 
-#: src/rfx-builder.c:421
+#: src/rfx-builder.c:426
 #, c-format
 msgid ""
 "\n"
@@ -6123,55 +6136,55 @@
 "%s\n"
 msgstr ""
 
-#: src/rfx-builder.c:544
+#: src/rfx-builder.c:541
 msgid "LiVES: - RFX Requirements"
 msgstr ""
 
-#: src/rfx-builder.c:548
+#: src/rfx-builder.c:544
 msgid "LiVES: - RFX Parameters"
 msgstr ""
 
-#: src/rfx-builder.c:552
+#: src/rfx-builder.c:547
 msgid "LiVES: - RFX Parameter Window Hints"
 msgstr ""
 
-#: src/rfx-builder.c:556
+#: src/rfx-builder.c:550
 msgid "LiVES: - RFX Triggers"
 msgstr ""
 
-#: src/rfx-builder.c:622
+#: src/rfx-builder.c:613
 msgid "_New Entry"
 msgstr ""
 
-#: src/rfx-builder.c:625
+#: src/rfx-builder.c:616
 msgid "_Edit Entry"
 msgstr ""
 
-#: src/rfx-builder.c:628
+#: src/rfx-builder.c:619
 msgid "_Remove Entry"
 msgstr ""
 
-#: src/rfx-builder.c:632
+#: src/rfx-builder.c:623
 msgid "Move _Up"
 msgstr "Mou am_unt"
 
-#: src/rfx-builder.c:635
+#: src/rfx-builder.c:626
 msgid "Move _Down"
 msgstr "Mou a_vall"
 
-#: src/rfx-builder.c:1004
+#: src/rfx-builder.c:984
 msgid "LiVES: - RFX Properties"
 msgstr ""
 
-#: src/rfx-builder.c:1013
+#: src/rfx-builder.c:993
 msgid "_Slow (hint to GUI)"
 msgstr ""
 
-#: src/rfx-builder.c:1024
+#: src/rfx-builder.c:1004
 msgid "_Batch mode generator"
 msgstr ""
 
-#: src/rfx-builder.c:1831
+#: src/rfx-builder.c:1790
 msgid ""
 "\n"
 "\n"
@@ -6180,7 +6193,7 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:1875
+#: src/rfx-builder.c:1834
 msgid ""
 "\n"
 "\n"
@@ -6188,219 +6201,219 @@
 "Please check the trigger code.\n"
 msgstr ""
 
-#: src/rfx-builder.c:1994
+#: src/rfx-builder.c:1950
 msgid "LiVES: - New RFX Parameter"
 msgstr ""
 
-#: src/rfx-builder.c:1997
+#: src/rfx-builder.c:1952
 msgid "LiVES: - Edit RFX Parameter"
 msgstr ""
 
-#: src/rfx-builder.c:2013
+#: src/rfx-builder.c:1968
 msgid "_Name:    "
 msgstr ""
 
-#: src/rfx-builder.c:2016
+#: src/rfx-builder.c:1971
 msgid "Name of the parameter, must be unique in the plugin."
 msgstr ""
 
-#: src/rfx-builder.c:2025
+#: src/rfx-builder.c:1981
 msgid "_Label:    "
 msgstr ""
 
-#: src/rfx-builder.c:2028
+#: src/rfx-builder.c:1984
 msgid ""
 "Label to be shown by the parameter. An underscore represents mnemonic "
 "accelerator."
 msgstr ""
 
-#: src/rfx-builder.c:2039
+#: src/rfx-builder.c:1996
 msgid "_Type:         "
 msgstr ""
 
-#: src/rfx-builder.c:2040
+#: src/rfx-builder.c:1997
 msgid "Parameter type (select from list)."
 msgstr ""
 
-#: src/rfx-builder.c:2073
+#: src/rfx-builder.c:2029
 msgid "Decimal _places: "
 msgstr ""
 
-#: src/rfx-builder.c:2082 src/rfx-builder.c:2477 src/rfx-builder.c:2495
+#: src/rfx-builder.c:2038 src/rfx-builder.c:2430 src/rfx-builder.c:2447
 msgid "_Default value:    "
 msgstr ""
 
-#: src/rfx-builder.c:2098
+#: src/rfx-builder.c:2054
 msgid "_Default: "
 msgstr ""
 
-#: src/rfx-builder.c:2132
+#: src/rfx-builder.c:2087
 msgid "Button _Group: "
 msgstr ""
 
-#: src/rfx-builder.c:2134
+#: src/rfx-builder.c:2089
 msgid "A non-zero value can be used to group radio buttons."
 msgstr ""
 
-#: src/rfx-builder.c:2142 src/rfx-builder.c:2478
+#: src/rfx-builder.c:2097 src/rfx-builder.c:2431
 msgid "_Minimum value: "
 msgstr ""
 
-#: src/rfx-builder.c:2148 src/rfx-builder.c:2479
+#: src/rfx-builder.c:2103 src/rfx-builder.c:2432
 msgid "Ma_ximum value: "
 msgstr ""
 
-#: src/rfx-builder.c:2157
+#: src/rfx-builder.c:2113
 msgid "     _Step size:   "
 msgstr ""
 
-#: src/rfx-builder.c:2160
+#: src/rfx-builder.c:2117
 msgid ""
 "How much the parameter is adjusted when the spinbutton arrows are pressed."
 msgstr ""
 
-#: src/rfx-builder.c:2171
+#: src/rfx-builder.c:2129
 msgid "_Wrap value"
 msgstr ""
 
-#: src/rfx-builder.c:2172
+#: src/rfx-builder.c:2131
 msgid "Whether the value wraps max->min and min->max."
 msgstr ""
 
-#: src/rfx-builder.c:2470
+#: src/rfx-builder.c:2424
 msgid "Set _values"
 msgstr ""
 
-#: src/rfx-builder.c:2512
+#: src/rfx-builder.c:2463
 msgid "Default _Red:  "
 msgstr ""
 
-#: src/rfx-builder.c:2513
+#: src/rfx-builder.c:2464
 msgid "Default _Green:"
 msgstr ""
 
-#: src/rfx-builder.c:2514
+#: src/rfx-builder.c:2465
 msgid "Default _Blue: "
 msgstr ""
 
-#: src/rfx-builder.c:2538
+#: src/rfx-builder.c:2488
 msgid "Set _default"
 msgstr ""
 
-#: src/rfx-builder.c:2540
+#: src/rfx-builder.c:2490
 msgid "Default value:  "
 msgstr ""
 
-#: src/rfx-builder.c:2541
+#: src/rfx-builder.c:2491
 msgid "Maximum length (chars): "
 msgstr ""
 
-#: src/rfx-builder.c:2576
+#: src/rfx-builder.c:2526
 msgid "LiVES: - New RFX Parameter Window Hint"
 msgstr ""
 
-#: src/rfx-builder.c:2579
+#: src/rfx-builder.c:2528
 msgid "LiVES: - Edit RFX Parameter Window Hint"
 msgstr ""
 
-#: src/rfx-builder.c:2622
+#: src/rfx-builder.c:2569
 msgid "_Keyword:         "
 msgstr ""
 
-#: src/rfx-builder.c:2639
+#: src/rfx-builder.c:2586
 msgid "Special _Type:         "
 msgstr ""
 
-#: src/rfx-builder.c:2656
+#: src/rfx-builder.c:2602
 msgid "Special _Subtype:         "
 msgstr ""
 
-#: src/rfx-builder.c:2667 src/rfx-builder.c:2706
+#: src/rfx-builder.c:2613 src/rfx-builder.c:2651
 msgid "Row:    "
 msgstr ""
 
-#: src/rfx-builder.c:2732
+#: src/rfx-builder.c:2676
 #, c-format
 msgid "Linked parameters (%d):    "
 msgstr ""
 
-#: src/rfx-builder.c:2749
+#: src/rfx-builder.c:2693
 msgid "Linked parameters (4):    "
 msgstr ""
 
-#: src/rfx-builder.c:2752
+#: src/rfx-builder.c:2695
 msgid "Linked parameters (2):    "
 msgstr ""
 
-#: src/rfx-builder.c:2777
+#: src/rfx-builder.c:2720
 msgid "LiVES: - New RFX Trigger"
 msgstr ""
 
-#: src/rfx-builder.c:2780
+#: src/rfx-builder.c:2722
 msgid "LiVES: - Edit RFX Trigger"
 msgstr ""
 
-#: src/rfx-builder.c:2808
+#: src/rfx-builder.c:2750
 msgid "When:         "
 msgstr ""
 
-#: src/rfx-builder.c:2904
+#: src/rfx-builder.c:2846
 msgid "LiVES: - Pre Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:2911
+#: src/rfx-builder.c:2853
 msgid "LiVES: - Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:2918
+#: src/rfx-builder.c:2860
 msgid "LiVES: - Post Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:2931
+#: src/rfx-builder.c:2873
 #, c-format
 msgid "LiVES: - Default text (max length %d)"
 msgstr ""
 
-#: src/rfx-builder.c:2944
+#: src/rfx-builder.c:2885
 msgid "LiVES: - Enter values, one per line"
 msgstr ""
 
-#: src/rfx-builder.c:3055
+#: src/rfx-builder.c:2996
 msgid ""
 "\n"
 "\n"
 "Name must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3060
+#: src/rfx-builder.c:3001
 msgid ""
 "\n"
 "\n"
 "Name must not contain spaces.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3065
+#: src/rfx-builder.c:3006
 msgid ""
 "\n"
 "\n"
 "Menu text must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3071
+#: src/rfx-builder.c:3012
 msgid ""
 "\n"
 "\n"
 "Action description must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3076
+#: src/rfx-builder.c:3017
 msgid ""
 "\n"
 "\n"
 "Author must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3085 src/rfx-builder.c:4339
+#: src/rfx-builder.c:3026 src/rfx-builder.c:4253
 msgid ""
 "\n"
 "\n"
@@ -6408,28 +6421,28 @@
 "Name must be unique.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3092
+#: src/rfx-builder.c:3033
 msgid ""
 "\n"
 "\n"
 "Loop code should not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3098
+#: src/rfx-builder.c:3039
 msgid ""
 "\n"
 "\n"
 "Trigger code should not be blank for a utility.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3111
+#: src/rfx-builder.c:3052
 msgid ""
 "\n"
 "\n"
 "Parameter name must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3117
+#: src/rfx-builder.c:3058
 msgid ""
 "\n"
 "\n"
@@ -6438,41 +6451,41 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:3171
+#: src/rfx-builder.c:3111
 #, c-format
 msgid "Writing script file %s..."
 msgstr ""
 
-#: src/rfx-builder.c:3477
+#: src/rfx-builder.c:3411
 msgid "No <define> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3484 src/rfx-builder.c:3493
+#: src/rfx-builder.c:3418 src/rfx-builder.c:3427
 msgid "Bad script version.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3505
+#: src/rfx-builder.c:3439
 msgid "No <name> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3513
+#: src/rfx-builder.c:3447
 msgid "No <version> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3522
+#: src/rfx-builder.c:3456
 msgid "No <author> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3536
+#: src/rfx-builder.c:3470
 msgid "No <description> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3540
+#: src/rfx-builder.c:3474
 #, c-format
 msgid "Bad description. (%s)\n"
 msgstr ""
 
-#: src/rfx-builder.c:3702
+#: src/rfx-builder.c:3627
 #, c-format
 msgid ""
 "\n"
@@ -6482,27 +6495,27 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:3859
+#: src/rfx-builder.c:3780
 msgid "Rebuilding all RFX scripts...builtin..."
 msgstr ""
 
-#: src/rfx-builder.c:3860
+#: src/rfx-builder.c:3781
 msgid "Rebuilding scripts"
 msgstr ""
 
-#: src/rfx-builder.c:3868
+#: src/rfx-builder.c:3789
 msgid "custom..."
 msgstr ""
 
-#: src/rfx-builder.c:3872
+#: src/rfx-builder.c:3793
 msgid "test..."
 msgstr ""
 
-#: src/rfx-builder.c:3878
+#: src/rfx-builder.c:3799
 msgid "rebuilding dynamic menu entries..."
 msgstr ""
 
-#: src/rfx-builder.c:3905 src/rfx-builder.c:3912
+#: src/rfx-builder.c:3826 src/rfx-builder.c:3834
 #, c-format
 msgid ""
 "\n"
@@ -6511,7 +6524,7 @@
 "Please check this program is in your path and executable.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3951
+#: src/rfx-builder.c:3874
 #, c-format
 msgid ""
 "\n"
@@ -6521,12 +6534,12 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:3960
+#: src/rfx-builder.c:3884
 #, c-format
 msgid "Deleting rfx script %s..."
 msgstr ""
 
-#: src/rfx-builder.c:3980
+#: src/rfx-builder.c:3902
 #, c-format
 msgid ""
 "\n"
@@ -6536,7 +6549,7 @@
 "Error code was %d\n"
 msgstr ""
 
-#: src/rfx-builder.c:4016
+#: src/rfx-builder.c:3938
 #, c-format
 msgid ""
 "\n"
@@ -6546,12 +6559,12 @@
 "Please delete it first, or rename the test script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4027
+#: src/rfx-builder.c:3950
 #, c-format
 msgid "Promoting rfx test plugin %s to custom..."
 msgstr ""
 
-#: src/rfx-builder.c:4044
+#: src/rfx-builder.c:3965
 #, c-format
 msgid ""
 "\n"
@@ -6562,20 +6575,20 @@
 "Return code was %d (%s)\n"
 msgstr ""
 
-#: src/rfx-builder.c:4070
+#: src/rfx-builder.c:3990
 msgid "LiVES: - Export Script to..."
 msgstr ""
 
-#: src/rfx-builder.c:4077 src/rfx-builder.c:4156
+#: src/rfx-builder.c:3997 src/rfx-builder.c:4074
 #, c-format
 msgid "Copying %s to %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4105
+#: src/rfx-builder.c:4024
 msgid "LiVES: Import Script from..."
 msgstr ""
 
-#: src/rfx-builder.c:4148
+#: src/rfx-builder.c:4067
 #, c-format
 msgid ""
 "\n"
@@ -6585,43 +6598,43 @@
 "Please delete it first, or rename the import script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4249
+#: src/rfx-builder.c:4166
 msgid "LiVES: - Copy RFX Script"
 msgstr ""
 
-#: src/rfx-builder.c:4251
+#: src/rfx-builder.c:4168
 msgid "_From type:    "
 msgstr ""
 
-#: src/rfx-builder.c:4258
+#: src/rfx-builder.c:4175
 msgid "   Script:    "
 msgstr ""
 
-#: src/rfx-builder.c:4267
+#: src/rfx-builder.c:4183
 msgid "LiVES: - Rename test RFX Script"
 msgstr ""
 
-#: src/rfx-builder.c:4268
+#: src/rfx-builder.c:4184
 msgid "From script: "
 msgstr ""
 
-#: src/rfx-builder.c:4273
+#: src/rfx-builder.c:4188
 msgid "LiVES: - RFX Script name"
 msgstr ""
 
-#: src/rfx-builder.c:4274
+#: src/rfx-builder.c:4189
 msgid "Script name: "
 msgstr ""
 
-#: src/rfx-builder.c:4294
+#: src/rfx-builder.c:4209
 msgid "New name: "
 msgstr ""
 
-#: src/rfx-builder.c:4297
+#: src/rfx-builder.c:4212
 msgid "New script name: "
 msgstr ""
 
-#: src/rfx-builder.c:4372
+#: src/rfx-builder.c:4286
 msgid ""
 "\n"
 "\n"
@@ -6629,12 +6642,12 @@
 "Script name must be unique.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4384
+#: src/rfx-builder.c:4297
 #, c-format
 msgid "Renaming RFX test script %s to %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4390
+#: src/rfx-builder.c:4302
 #, c-format
 msgid ""
 "\n"
@@ -6645,21 +6658,21 @@
 "Return code was %d\n"
 msgstr ""
 
-#: src/rfx-builder.c:4610
+#: src/rfx-builder.c:4518
 msgid "_Apply Real Time Effects to Selection"
 msgstr ""
 
-#: src/rfx-builder.c:4664
+#: src/rfx-builder.c:4572
 #, c-format
 msgid "Loading rendered effect %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4766
+#: src/rfx-builder.c:4674
 msgid ""
 "See: VJ - show VJ keys. Set the realtime effects, and then apply them here."
 msgstr ""
 
-#: src/preferences.c:359
+#: src/preferences.c:351
 msgid ""
 "\n"
 "\n"
@@ -6667,7 +6680,7 @@
 "full screen, separate window (fs) mode\n"
 msgstr ""
 
-#: src/preferences.c:408
+#: src/preferences.c:400
 msgid ""
 "\n"
 "\n"
@@ -6675,7 +6688,7 @@
 "(Free space = UNKNOWN)"
 msgstr ""
 
-#: src/preferences.c:412
+#: src/preferences.c:403
 #, c-format
 msgid ""
 "\n"
@@ -6684,14 +6697,14 @@
 "(Free space = %s)"
 msgstr ""
 
-#: src/preferences.c:416
+#: src/preferences.c:408
 msgid ""
 "The temp directory is LiVES working directory where opened clips and sets "
 "are stored.\n"
 "It should be in a partition with plenty of free disk space.\n"
 msgstr ""
 
-#: src/preferences.c:784
+#: src/preferences.c:839
 #, c-format
 msgid ""
 "Unable to create or write to the new temporary directory.\n"
@@ -6702,7 +6715,7 @@
 "The directory will not be changed now.\n"
 msgstr ""
 
-#: src/preferences.c:786
+#: src/preferences.c:843
 #, c-format
 msgid ""
 "Unable to create or write to the new temporary directory.\n"
@@ -6712,7 +6725,7 @@
 "The directory will not be changed now.\n"
 msgstr ""
 
-#: src/preferences.c:798
+#: src/preferences.c:856
 msgid ""
 "You have chosen to change the temporary directory.\n"
 "Please make sure you have no other copies of LiVES open.\n"
@@ -6724,20 +6737,20 @@
 "original setting."
 msgstr ""
 
-#: src/preferences.c:1169
+#: src/preferences.c:1221
 msgid ""
 "\n"
 "Unable to switch audio players to jack - jackd must be installed first.\n"
 "See http://jackaudio.org\n"
 msgstr ""
 
-#: src/preferences.c:1175
+#: src/preferences.c:1226
 msgid ""
 "\n"
 "Switching audio players requires restart (jackd must not be running)\n"
 msgstr ""
 
-#: src/preferences.c:1202
+#: src/preferences.c:1253
 msgid ""
 "\n"
 "Unable to switch audio players to pulse audio\n"
@@ -6745,815 +6758,815 @@
 "See http://www.pulseaudio.org\n"
 msgstr ""
 
-#: src/preferences.c:1502
+#: src/preferences.c:1544
 msgid "PCM (highest quality; largest files)"
 msgstr ""
 
-#: src/preferences.c:2063
+#: src/preferences.c:2096
 msgid "LiVES: - Preferences"
 msgstr ""
 
-#: src/preferences.c:2142
+#: src/preferences.c:2177
 msgid "Open file selection maximised"
 msgstr ""
 
-#: src/preferences.c:2149
+#: src/preferences.c:2184
 msgid "Show recent files in the File menu"
 msgstr ""
 
-#: src/preferences.c:2158
+#: src/preferences.c:2193
 msgid "Stop screensaver on playback    "
 msgstr ""
 
-#: src/preferences.c:2165
+#: src/preferences.c:2200
 msgid "Open main window maximised"
 msgstr ""
 
-#: src/preferences.c:2173
+#: src/preferences.c:2208
 msgid "Show toolbar when background is blanked"
 msgstr ""
 
-#: src/preferences.c:2181
+#: src/preferences.c:2216
 msgid "Allow mouse wheel to switch clips"
 msgstr ""
 
-#: src/preferences.c:2192
+#: src/preferences.c:2227
 msgid "Shrink previews to fit in interface"
 msgstr ""
 
-#: src/preferences.c:2202
+#: src/preferences.c:2237
 msgid "Startup mode:"
 msgstr ""
 
-#: src/preferences.c:2206
+#: src/preferences.c:2241
 msgid "_Clip editor"
 msgstr ""
 
-#: src/preferences.c:2210
+#: src/preferences.c:2245
 msgid "_Multitrack mode"
 msgstr ""
 
-#: src/preferences.c:2234
+#: src/preferences.c:2268
 msgid "Multi-head support"
 msgstr ""
 
-#: src/preferences.c:2242
+#: src/preferences.c:2276
 msgid " monitor number for LiVES interface"
 msgstr ""
 
-#: src/preferences.c:2248
+#: src/preferences.c:2282
 msgid " monitor number for playback"
 msgstr ""
 
-#: src/preferences.c:2260
+#: src/preferences.c:2294
 msgid ""
 "A setting of 0 means use all available monitors (only works with some "
 "playback plugins)."
 msgstr ""
 
-#: src/preferences.c:2270
+#: src/preferences.c:2304
 msgid "Force single monitor"
 msgstr ""
 
-#: src/preferences.c:2271
+#: src/preferences.c:2305
 msgid "Ignore all except the first monitor."
 msgstr ""
 
-#: src/preferences.c:2293
+#: src/preferences.c:2327
 msgid "Show clip thumbnails during playback"
 msgstr ""
 
-#: src/preferences.c:2306
+#: src/preferences.c:2340
 msgid "GUI"
 msgstr "IGU"
 
-#: src/preferences.c:2321
+#: src/preferences.c:2355
 msgid "When entering Multitrack mode:"
 msgstr ""
 
-#: src/preferences.c:2330
+#: src/preferences.c:2364
 msgid "_Prompt me for width, height, fps and audio settings"
 msgstr ""
 
-#: src/preferences.c:2336
+#: src/preferences.c:2370
 msgid "_Always use the following values:"
 msgstr ""
 
-#: src/preferences.c:2345
+#: src/preferences.c:2379
 msgid "Use these same _values for rendering a new clip"
 msgstr ""
 
-#: src/preferences.c:2370
+#: src/preferences.c:2404
 msgid "_Width           "
 msgstr ""
 
-#: src/preferences.c:2375
+#: src/preferences.c:2409
 msgid "          _Height      "
 msgstr ""
 
-#: src/preferences.c:2379
+#: src/preferences.c:2413
 msgid "          _FPS"
 msgstr ""
 
-#: src/preferences.c:2387
+#: src/preferences.c:2421
 msgid "Enable backing audio track"
 msgstr ""
 
-#: src/preferences.c:2394
+#: src/preferences.c:2428
 msgid "Audio track per video track"
 msgstr ""
 
-#: src/preferences.c:2423
+#: src/preferences.c:2457
 msgid "    _Undo buffer size (MB)    "
 msgstr ""
 
-#: src/preferences.c:2432
+#: src/preferences.c:2466
 msgid "_Exit multitrack mode after rendering"
 msgstr ""
 
-#: src/preferences.c:2440
+#: src/preferences.c:2474
 msgid "Auto backup layouts"
 msgstr ""
 
-#: src/preferences.c:2445
+#: src/preferences.c:2479
 msgid "_Every"
 msgstr ""
 
-#: src/preferences.c:2453
+#: src/preferences.c:2487
 msgid "seconds"
 msgstr "segons"
 
-#: src/preferences.c:2461
+#: src/preferences.c:2495
 msgid "After every _change"
 msgstr ""
 
-#: src/preferences.c:2467
+#: src/preferences.c:2501
 msgid "_Never"
 msgstr "_Mai"
 
-#: src/preferences.c:2490
+#: src/preferences.c:2523
 msgid "Multitrack/Render"
 msgstr ""
 
-#: src/preferences.c:2508
+#: src/preferences.c:2541
 msgid "Use instant opening when possible"
 msgstr ""
 
-#: src/preferences.c:2509
+#: src/preferences.c:2543
 msgid "Enable instant opening of some file types using decoder plugins"
 msgstr ""
 
-#: src/preferences.c:2531
+#: src/preferences.c:2567
 msgid "Video open command (fallback)"
 msgstr ""
 
-#: src/preferences.c:2543
+#: src/preferences.c:2579
 msgid "Open/render compression"
 msgstr ""
 
-#: src/preferences.c:2546
+#: src/preferences.c:2582
 msgid " %     ( lower = slower, larger files; for jpeg, higher quality )"
 msgstr ""
 
-#: src/preferences.c:2558
+#: src/preferences.c:2594
 msgid "Default image format"
 msgstr ""
 
-#: src/preferences.c:2562
+#: src/preferences.c:2598
 msgid "_jpeg"
 msgstr "_jpeg"
 
-#: src/preferences.c:2565
+#: src/preferences.c:2601
 msgid "_png"
 msgstr "_png"
 
-#: src/preferences.c:2572
+#: src/preferences.c:2608
 msgid "(Check Help/Troubleshoot to see which image formats are supported)"
 msgstr ""
 
-#: src/preferences.c:2580
+#: src/preferences.c:2616
 msgid "Enable automatic deinterlacing when possible"
 msgstr ""
 
-#: src/preferences.c:2582
+#: src/preferences.c:2619
 msgid "Automatically deinterlace frames when a plugin suggests it"
 msgstr ""
 
-#: src/preferences.c:2593
+#: src/preferences.c:2632
 msgid "Automatic trimming / padding of audio when possible"
 msgstr ""
 
-#: src/preferences.c:2595
+#: src/preferences.c:2634
 msgid "Automatically trim or pad audio when a plugin suggests it"
 msgstr ""
 
-#: src/preferences.c:2606
+#: src/preferences.c:2646
 msgid "Ignore blank borders when possible"
 msgstr ""
 
-#: src/preferences.c:2608
+#: src/preferences.c:2648
 msgid "Clip any blank borders from frames where possible"
 msgstr ""
 
-#: src/preferences.c:2619
+#: src/preferences.c:2660
 msgid "When opening multiple files, concatenate images into one clip"
 msgstr ""
 
-#: src/preferences.c:2629
+#: src/preferences.c:2670
 msgid "Decoding"
 msgstr "S'està descodificant"
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:2652
+#: src/preferences.c:2693
 msgid "Low - can improve performance on slower machines"
 msgstr ""
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:2654
+#: src/preferences.c:2695
 msgid "Normal - recommended for most users"
 msgstr ""
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:2656
+#: src/preferences.c:2697
 msgid "High - can improve quality on very fast machines"
 msgstr ""
 
-#: src/preferences.c:2659
+#: src/preferences.c:2700
 msgid "Preview _quality"
 msgstr ""
 
-#: src/preferences.c:2660
+#: src/preferences.c:2701
 msgid "The preview quality for video playback - affects resizing"
 msgstr ""
 
-#: src/preferences.c:2675
+#: src/preferences.c:2717
 msgid "_Show FPS statistics"
 msgstr ""
 
-#: src/preferences.c:2694
+#: src/preferences.c:2736
 msgid "_Plugin"
 msgstr "_Connectors"
 
-#: src/preferences.c:2718
+#: src/preferences.c:2760
 msgid "Stream audio"
 msgstr ""
 
-#: src/preferences.c:2721
+#: src/preferences.c:2763
 msgid "Stream audio to playback plugin"
 msgstr ""
 
-#: src/preferences.c:2734
+#: src/preferences.c:2778
 msgid "Record player output"
 msgstr ""
 
-#: src/preferences.c:2737
+#: src/preferences.c:2781
 msgid "Record output from player instead of input to player"
 msgstr ""
 
-#: src/preferences.c:2744
+#: src/preferences.c:2789
 msgid "VIDEO"
 msgstr "VÍDEO"
 
-#: src/preferences.c:2787
+#: src/preferences.c:2833
 msgid "_Player"
 msgstr ""
 
-#: src/preferences.c:2792
+#: src/preferences.c:2838
 msgid "(See also the Jack Integration tab for jack startup options)"
 msgstr ""
 
-#: src/preferences.c:2819
+#: src/preferences.c:2865
 msgid "mplayer"
 msgstr "mplayer"
 
-#: src/preferences.c:2830
+#: src/preferences.c:2876
 #, fuzzy
 msgid "mplayer2"
 msgstr "mplayer"
 
-#: src/preferences.c:2833
+#: src/preferences.c:2879
 msgid "Audio play _command"
 msgstr ""
 
-#: src/preferences.c:2840
+#: src/preferences.c:2886
 msgid "- internal -"
 msgstr ""
 
-#: src/preferences.c:2849
+#: src/preferences.c:2895
 msgid "Audio follows video _rate/direction"
 msgstr ""
 
-#: src/preferences.c:2857
+#: src/preferences.c:2903
 msgid "Audio follows _clip switches"
 msgstr ""
 
-#: src/preferences.c:2864
+#: src/preferences.c:2910
 msgid "Source:"
 msgstr ""
 
-#: src/preferences.c:2868
+#: src/preferences.c:2914
 msgid "_Internal"
 msgstr ""
 
-#: src/preferences.c:2873
+#: src/preferences.c:2919
 msgid "_External (requires jack or pulse audio player)"
 msgstr ""
 
-#: src/preferences.c:2892
+#: src/preferences.c:2940
 msgid "AUDIO"
 msgstr ""
 
-#: src/preferences.c:2902
+#: src/preferences.c:2950
 msgid "Playback"
 msgstr "Reproducció"
 
-#: src/preferences.c:2925
+#: src/preferences.c:2973
 msgid ""
 "Record audio when capturing an e_xternal window\n"
 " (requires jack or pulse audio)"
 msgstr ""
 
-#: src/preferences.c:2940
+#: src/preferences.c:2988
 msgid "      What to record when 'r' is pressed   "
 msgstr ""
 
-#: src/preferences.c:2949
+#: src/preferences.c:2997
 msgid "_Frame changes"
 msgstr ""
 
-#: src/preferences.c:2964
+#: src/preferences.c:3012
 msgid "F_PS changes"
 msgstr ""
 
-#: src/preferences.c:2982
+#: src/preferences.c:3030
 msgid "_Real time effects"
 msgstr ""
 
-#: src/preferences.c:2993
+#: src/preferences.c:3041
 msgid "_Clip switches"
 msgstr ""
 
-#: src/preferences.c:3004
+#: src/preferences.c:3052
 msgid "_Audio (requires jack or pulse audio player)"
 msgstr ""
 
-#: src/preferences.c:3024
+#: src/preferences.c:3072
 msgid "Pause recording if free disk space falls below"
 msgstr ""
 
 #. TRANSLATORS: gigabytes
-#: src/preferences.c:3030
+#: src/preferences.c:3078
 msgid "GB"
 msgstr ""
 
-#: src/preferences.c:3037
+#: src/preferences.c:3085
 msgid "Recording"
 msgstr "Enregistrament"
 
-#: src/preferences.c:3055
+#: src/preferences.c:3103
 msgid "Encoder"
 msgstr ""
 
-#: src/preferences.c:3090
+#: src/preferences.c:3137
 msgid "Output format"
 msgstr ""
 
-#: src/preferences.c:3106
+#: src/preferences.c:3153
 msgid "Audio codec"
 msgstr "Còdec d'Àudio"
 
-#: src/preferences.c:3119
+#: src/preferences.c:3165
 msgid "Encoding"
 msgstr "Codificació"
 
-#: src/preferences.c:3134
+#: src/preferences.c:3180
 msgid "Use _antialiasing when resizing"
 msgstr ""
 
-#: src/preferences.c:3143
+#: src/preferences.c:3189
 msgid "Number of _real time effect keys"
 msgstr ""
 
-#: src/preferences.c:3145
+#: src/preferences.c:3192
 msgid ""
 "The number of \"virtual\" real time effect keys. They can be controlled "
 "through the real time effects window, or via network (OSC)."
 msgstr ""
 
-#: src/preferences.c:3152
+#: src/preferences.c:3199
 msgid "Use _threads where possible when applying effects"
 msgstr ""
 
-#: src/preferences.c:3159
+#: src/preferences.c:3207
 msgid "Number of _threads"
 msgstr ""
 
-#: src/preferences.c:3172
+#: src/preferences.c:3221
 msgid "Restart is required if any of the following paths are changed:"
 msgstr ""
 
-#: src/preferences.c:3182
+#: src/preferences.c:3231
 msgid "Weed plugin path"
 msgstr ""
 
-#: src/preferences.c:3184
+#: src/preferences.c:3234
 msgid "Frei0r plugin path"
 msgstr ""
 
-#: src/preferences.c:3186
+#: src/preferences.c:3237
 msgid "LADSPA plugin path"
 msgstr ""
 
-#: src/preferences.c:3209
+#: src/preferences.c:3261
 msgid "      Video load directory (default)      "
 msgstr ""
 
-#: src/preferences.c:3215
+#: src/preferences.c:3267
 msgid "      Video save directory (default) "
 msgstr ""
 
-#: src/preferences.c:3221
+#: src/preferences.c:3273
 msgid "      Audio load directory (default) "
 msgstr ""
 
-#: src/preferences.c:3227
+#: src/preferences.c:3279
 msgid "      Image directory (default) "
 msgstr ""
 
-#: src/preferences.c:3233
+#: src/preferences.c:3285
 msgid "      Backup/Restore directory (default) "
 msgstr ""
 
-#: src/preferences.c:3239
+#: src/preferences.c:3291
 msgid "      Temp directory (do not remove) "
 msgstr ""
 
-#: src/preferences.c:3252
+#: src/preferences.c:3304
 msgid "The default directory for loading video clips from"
 msgstr ""
 
-#: src/preferences.c:3277
+#: src/preferences.c:3329
 msgid "The default directory for saving encoded clips to"
 msgstr ""
 
-#: src/preferences.c:3285
+#: src/preferences.c:3337
 msgid "The default directory for loading and saving audio"
 msgstr ""
 
-#: src/preferences.c:3293
+#: src/preferences.c:3345
 msgid "The default directory for saving frameshots to"
 msgstr ""
 
-#: src/preferences.c:3301
+#: src/preferences.c:3353
 msgid "The default directory for backing up/restoring single clips"
 msgstr ""
 
-#: src/preferences.c:3309
+#: src/preferences.c:3361
 msgid "LiVES working directory."
 msgstr ""
 
-#: src/preferences.c:3359
+#: src/preferences.c:3412
 msgid "Directories"
 msgstr "Directoris"
 
-#: src/preferences.c:3374
+#: src/preferences.c:3427
 msgid "Warn if diskspace falls below: "
 msgstr ""
 
-#: src/preferences.c:3380 src/preferences.c:3394
+#: src/preferences.c:3433 src/preferences.c:3447
 msgid " MB [set to 0 to disable]"
 msgstr ""
 
-#: src/preferences.c:3389
+#: src/preferences.c:3442
 msgid "Diskspace critical level: "
 msgstr ""
 
-#: src/preferences.c:3407
+#: src/preferences.c:3461
 msgid ""
 "Warn on Insert / Merge if _frame rate of clipboard does not match frame rate "
 "of selection"
 msgstr ""
 
-#: src/preferences.c:3417
+#: src/preferences.c:3471
 msgid "Warn on Open if file _size exceeds "
 msgstr ""
 
-#: src/preferences.c:3425
+#: src/preferences.c:3479
 msgid " MB"
 msgstr " MB"
 
-#: src/preferences.c:3432
+#: src/preferences.c:3486
 msgid "Show a warning before saving a se_t"
 msgstr ""
 
-#: src/preferences.c:3442
+#: src/preferences.c:3496
 msgid ""
 "Show a warning if _mplayer/mplayer2, sox, composite or convert is not found "
 "when LiVES is started."
 msgstr ""
 
-#: src/preferences.c:3452
+#: src/preferences.c:3506
 msgid "Show a warning if no _rendered effects are found at startup."
 msgstr ""
 
-#: src/preferences.c:3464
+#: src/preferences.c:3518
 msgid "Show a warning if no _encoder plugins are found at startup."
 msgstr ""
 
-#: src/preferences.c:3474
+#: src/preferences.c:3528
 msgid "Show a warning if a _duplicate set name is entered."
 msgstr ""
 
-#: src/preferences.c:3485
+#: src/preferences.c:3539
 msgid "When a set is loaded, warn if clips are missing from _layouts."
 msgstr ""
 
-#: src/preferences.c:3495
+#: src/preferences.c:3550
 msgid "Warn if a clip used in a layout is about to be closed."
 msgstr ""
 
-#: src/preferences.c:3505
+#: src/preferences.c:3561
 msgid "Warn if frames used in a layout are about to be deleted."
 msgstr ""
 
-#: src/preferences.c:3515
+#: src/preferences.c:3572
 msgid "Warn if frames used in a layout are about to be shifted."
 msgstr ""
 
-#: src/preferences.c:3525
+#: src/preferences.c:3583
 msgid "Warn if frames used in a layout are about to be altered."
 msgstr ""
 
-#: src/preferences.c:3535
+#: src/preferences.c:3594
 msgid "Warn if audio used in a layout is about to be deleted."
 msgstr ""
 
-#: src/preferences.c:3546
+#: src/preferences.c:3606
 msgid "Warn if audio used in a layout is about to be shifted."
 msgstr ""
 
-#: src/preferences.c:3556
+#: src/preferences.c:3617
 msgid "Warn if audio used in a layout is about to be altered."
 msgstr ""
 
-#: src/preferences.c:3566
+#: src/preferences.c:3628
 msgid "Popup layout errors after clip changes."
 msgstr ""
 
-#: src/preferences.c:3577
+#: src/preferences.c:3639
 msgid "Warn if the layout has not been saved when leaving multitrack mode."
 msgstr ""
 
-#: src/preferences.c:3588
+#: src/preferences.c:3650
 msgid ""
 "Warn if multitrack has no audio channels, and a layout with audio is loaded."
 msgstr ""
 
-#: src/preferences.c:3598
+#: src/preferences.c:3660
 msgid ""
 "Warn if multitrack has audio channels, and your audio player is not \"jack\" "
 "or \"pulse audio\"."
 msgstr ""
 
-#: src/preferences.c:3610
+#: src/preferences.c:3672
 msgid "Show info message after importing from firewire device."
 msgstr ""
 
-#: src/preferences.c:3626
+#: src/preferences.c:3688
 msgid "Show a warning before opening a yuv4mpeg stream (advanced)."
 msgstr ""
 
-#: src/preferences.c:3639
+#: src/preferences.c:3701
 msgid "Show a warning when multitrack is low on backup space."
 msgstr ""
 
-#: src/preferences.c:3650
+#: src/preferences.c:3713
 msgid "Show a warning advising cleaning of disk space after a crash."
 msgstr ""
 
-#: src/preferences.c:3661
+#: src/preferences.c:3725
 msgid "Show a warning if unable to connect to pulseaudio player."
 msgstr ""
 
-#: src/preferences.c:3673
+#: src/preferences.c:3737
 msgid "Show a warning before wiping a layout which has unsaved changes."
 msgstr ""
 
-#: src/preferences.c:3685
+#: src/preferences.c:3749
 msgid "Warnings"
 msgstr "Advertències"
 
-#: src/preferences.c:3703
+#: src/preferences.c:3767
 msgid "Midi synch (requires the files midistart and midistop)"
 msgstr ""
 
-#: src/preferences.c:3715
+#: src/preferences.c:3779
 msgid "When inserting/merging frames:  "
 msgstr ""
 
-#: src/preferences.c:3719
+#: src/preferences.c:3783
 msgid "_Speed Up/Slow Down Insertion"
 msgstr ""
 
-#: src/preferences.c:3723
+#: src/preferences.c:3787
 msgid "_Resample Insertion"
 msgstr ""
 
-#: src/preferences.c:3730
+#: src/preferences.c:3794
 msgid "CD device           "
 msgstr ""
 
-#: src/preferences.c:3733
+#: src/preferences.c:3797
 msgid "LiVES can load audio tracks from this CD"
 msgstr ""
 
-#: src/preferences.c:3746
+#: src/preferences.c:3813
 msgid "Default FPS        "
 msgstr ""
 
-#: src/preferences.c:3749
+#: src/preferences.c:3816
 msgid "Frames per second to use when none is specified"
 msgstr ""
 
-#: src/preferences.c:3757
+#: src/preferences.c:3825
 msgid "Misc"
 msgstr "Miscelànea"
 
-#: src/preferences.c:3782
+#: src/preferences.c:3850
 msgid "New theme:           "
 msgstr ""
 
-#: src/preferences.c:3800
+#: src/preferences.c:3867
 msgid "Themes"
 msgstr "Temes"
 
-#: src/preferences.c:3815
+#: src/preferences.c:3882
 msgid "Download bandwidth (Kb/s)       "
 msgstr ""
 
-#: src/preferences.c:3823
+#: src/preferences.c:3890
 msgid "LiVES must be compiled without \"configure --disable-OSC\" to use OMC"
 msgstr ""
 
-#: src/preferences.c:3833
+#: src/preferences.c:3900
 msgid "OMC remote control enabled"
 msgstr ""
 
-#: src/preferences.c:3841
+#: src/preferences.c:3908
 msgid "UDP port       "
 msgstr ""
 
-#: src/preferences.c:3850
+#: src/preferences.c:3917
 msgid "Start OMC on startup"
 msgstr ""
 
-#: src/preferences.c:3870
+#: src/preferences.c:3937
 msgid "Streaming/Networking"
 msgstr ""
 
-#: src/preferences.c:3882
+#: src/preferences.c:3949
 msgid "Jack transport"
 msgstr ""
 
-#: src/preferences.c:3886
+#: src/preferences.c:3953
 msgid ""
 "LiVES must be compiled with jack/transport.h and jack/jack.h present to use "
 "jack transport"
 msgstr ""
 
-#: src/preferences.c:3892
+#: src/preferences.c:3959
 msgid "Jack _transport config file"
 msgstr ""
 
-#: src/preferences.c:3899 src/preferences.c:3989
+#: src/preferences.c:3967 src/preferences.c:4058
 msgid "Start _server on LiVES startup"
 msgstr ""
 
-#: src/preferences.c:3911
+#: src/preferences.c:3979
 msgid "Jack transport _master (start and stop)"
 msgstr ""
 
-#: src/preferences.c:3921
+#: src/preferences.c:3989
 msgid "Jack transport _client (start and stop)"
 msgstr ""
 
-#: src/preferences.c:3935
+#: src/preferences.c:4003
 msgid "Jack transport sets start position"
 msgstr ""
 
-#: src/preferences.c:3952
+#: src/preferences.c:4020
 msgid "Jack transport timebase slave"
 msgstr ""
 
-#: src/preferences.c:3963
+#: src/preferences.c:4031
 msgid "(See also Playback -> Audio follows video rate/direction)"
 msgstr ""
 
-#: src/preferences.c:3971
+#: src/preferences.c:4039
 msgid "Jack audio"
 msgstr ""
 
-#: src/preferences.c:3975
+#: src/preferences.c:4043
 msgid "LiVES must be compiled with jack/jack.h present to use jack audio"
 msgstr ""
 
-#: src/preferences.c:3978
+#: src/preferences.c:4046
 msgid ""
 "You MUST set the audio player to \"jack\" in the Playback tab to use jack "
 "audio"
 msgstr ""
 
-#: src/preferences.c:3984
+#: src/preferences.c:4052
 msgid "Jack _audio server config file"
 msgstr ""
 
-#: src/preferences.c:3996
+#: src/preferences.c:4065
 msgid "Play audio even when transport is _paused"
 msgstr ""
 
-#: src/preferences.c:4008
+#: src/preferences.c:4077
 msgid "Automatically connect to System Out ports when 'playing' External Audio"
 msgstr ""
 
-#: src/preferences.c:4021
+#: src/preferences.c:4090
 msgid "Jack Integration"
 msgstr ""
 
-#: src/preferences.c:4035
+#: src/preferences.c:4104
 msgid "Events to respond to:"
 msgstr ""
 
-#: src/preferences.c:4044
+#: src/preferences.c:4113
 msgid "_Joystick events"
 msgstr ""
 
-#: src/preferences.c:4051
+#: src/preferences.c:4120
 msgid "_Joystick device"
 msgstr ""
 
-#: src/preferences.c:4053
+#: src/preferences.c:4122
 msgid "The joystick device, e.g. /dev/input/js0"
 msgstr ""
 
-#: src/preferences.c:4071
+#: src/preferences.c:4142
 msgid "_MIDI events"
 msgstr ""
 
-#: src/preferences.c:4080
+#: src/preferences.c:4151
 msgid "Use _ALSA MIDI (recommended)"
 msgstr ""
 
-#: src/preferences.c:4082
+#: src/preferences.c:4153
 msgid "Create an ALSA MIDI port which other MIDI devices can be connected to"
 msgstr ""
 
-#: src/preferences.c:4090
+#: src/preferences.c:4162
 msgid "Use _raw MIDI"
 msgstr ""
 
-#: src/preferences.c:4092
+#: src/preferences.c:4164
 msgid "Read directly from the MIDI device"
 msgstr ""
 
-#: src/preferences.c:4104
+#: src/preferences.c:4177
 msgid "_MIDI device"
 msgstr ""
 
-#: src/preferences.c:4106
+#: src/preferences.c:4179
 msgid "The MIDI device, e.g. /dev/input/midi0"
 msgstr ""
 
-#: src/preferences.c:4118
+#: src/preferences.c:4193
 msgid "Advanced"
 msgstr "Avançat"
 
-#: src/preferences.c:4124
+#: src/preferences.c:4199
 msgid "MIDI check _rate"
 msgstr ""
 
-#: src/preferences.c:4127
+#: src/preferences.c:4203
 msgid ""
 "Number of MIDI checks per keyboard tick. Increasing this may improve MIDI "
 "responsiveness, but may slow down playback."
 msgstr ""
 
-#: src/preferences.c:4134
+#: src/preferences.c:4211
 msgid "MIDI repeat"
 msgstr ""
 
-#: src/preferences.c:4137
+#: src/preferences.c:4214
 msgid "Number of non-reads allowed between succesive reads."
 msgstr ""
 
-#: src/preferences.c:4140
+#: src/preferences.c:4218
 msgid "(Warning: setting this value too high can slow down playback.)"
 msgstr ""
 
-#: src/preferences.c:4159
+#: src/preferences.c:4237
 msgid "MIDI/Joystick learner"
 msgstr ""
 
-#: src/preferences.c:4499
+#: src/preferences.c:4679
 msgid ""
 "\n"
 "LiVES will now shut down. You need to restart it for the directory change to "
@@ -7561,214 +7574,214 @@
 "Click OK to continue.\n"
 msgstr ""
 
-#: src/preferences.c:4523
+#: src/preferences.c:4703
 msgid ""
 "For the directory change to take effect LiVES will restart when preferences "
 "dialog closes."
 msgstr ""
 
-#: src/preferences.c:4527
+#: src/preferences.c:4707
 msgid "Theme changes will not take effect until the next time you start LiVES."
 msgstr ""
 
-#: src/preferences.c:4531
+#: src/preferences.c:4711
 msgid "Jack options will not take effect until the next time you start LiVES."
 msgstr ""
 
-#: src/osc.c:2585
+#: src/osc.c:2616
 #, c-format
 msgid "Syncing to external framerate of %.8f frames per second.\n"
 msgstr ""
 
-#: src/osc.c:6746
+#: src/osc.c:6938
 msgid "Cannot initialize OSC receiver\n"
 msgstr ""
 
-#: src/osc.c:6770
+#: src/osc.c:6961
 #, c-format
 msgid "WARNING: Cannot start OSC server at UDP port %d\n"
 msgstr ""
 
-#: src/osc.c:6775
+#: src/osc.c:6963
 #, c-format
 msgid "Started OSC server at UDP port %d\n"
 msgstr ""
 
-#: src/osc.c:6890
+#: src/osc.c:7076
 #, c-format
 msgid "Cannot start OSC/UDP server at port %d \n"
 msgstr ""
 
-#: src/resample.c:125 src/resample.c:304
+#: src/resample.c:131 src/resample.c:305
 #, c-format
 msgid "Resizing frames 1 to %d"
 msgstr ""
 
-#: src/resample.c:140 src/resample.c:318
+#: src/resample.c:145 src/resample.c:318
 #, c-format
 msgid "Resizing/letterboxing frames 1 to %d"
 msgstr ""
 
-#: src/resample.c:361 src/resample.c:385
+#: src/resample.c:360 src/resample.c:384
 msgid "Resize"
 msgstr "Redimensiona"
 
-#: src/resample.c:395
+#: src/resample.c:394
 msgid "Resample/Resize"
 msgstr ""
 
-#: src/resample.c:680
+#: src/resample.c:676
 #, c-format
 msgid "Length of video is now %d frames.\n"
 msgstr ""
 
-#: src/resample.c:745
+#: src/resample.c:737
 msgid ""
 "\n"
 "\n"
 "New rate must be greater than 0\n"
 msgstr ""
 
-#: src/resample.c:797 src/resample.c:813
+#: src/resample.c:788 src/resample.c:803
 msgid "Resampling audio"
 msgstr ""
 
-#: src/resample.c:831
+#: src/resample.c:821
 msgid "LiVES was unable to resample the audio as requested.\n"
 msgstr ""
 
-#: src/resample.c:833 src/resample.c:837
+#: src/resample.c:823 src/resample.c:827
 msgid "Resample Audio"
 msgstr ""
 
-#: src/resample.c:845
+#: src/resample.c:835
 #, c-format
 msgid "Audio was resampled to %d Hz, %d channels, %d bit"
 msgstr ""
 
-#: src/resample.c:1034
+#: src/resample.c:1016
 #, c-format
 msgid "Resampling video at %.8f frames per second..."
 msgstr ""
 
-#: src/resample.c:1037
+#: src/resample.c:1018
 #, c-format
 msgid "Resampling video at %.3f frames per second..."
 msgstr ""
 
-#: src/resample.c:1068
+#: src/resample.c:1049
 msgid "Reordering error !\n"
 msgstr ""
 
-#: src/resample.c:1079
+#: src/resample.c:1060
 msgid "Resample"
 msgstr "Remostreja"
 
-#: src/resample.c:1192
+#: src/resample.c:1173
 msgid "LiVES: - Resample Audio"
 msgstr ""
 
-#: src/resample.c:1195
+#: src/resample.c:1175
 msgid "LiVES: - Insert Silence"
 msgstr ""
 
-#: src/resample.c:1198
+#: src/resample.c:1177
 msgid "LiVES: - New Clip Audio"
 msgstr ""
 
-#: src/resample.c:1201
+#: src/resample.c:1179
 msgid "LiVES: - External Clip Settings"
 msgstr ""
 
-#: src/resample.c:1238 src/resample.c:1358
+#: src/resample.c:1215 src/resample.c:1332
 msgid "Rate (Hz) "
 msgstr ""
 
-#: src/resample.c:1245 src/resample.c:1372
+#: src/resample.c:1222 src/resample.c:1346
 msgid "Channels"
 msgstr ""
 
-#: src/resample.c:1252
+#: src/resample.c:1229
 msgid "Sample Size "
 msgstr ""
 
-#: src/resample.c:1268 src/resample.c:1425
+#: src/resample.c:1245 src/resample.c:1399
 msgid "Signed"
 msgstr ""
 
-#: src/resample.c:1274 src/resample.c:1435
+#: src/resample.c:1251 src/resample.c:1409
 msgid "Unsigned"
 msgstr "Sense signar"
 
-#: src/resample.c:1297 src/resample.c:1460
+#: src/resample.c:1273 src/resample.c:1433
 msgid "Little Endian"
 msgstr ""
 
-#: src/resample.c:1303 src/resample.c:1468
+#: src/resample.c:1279 src/resample.c:1441
 msgid "Big Endian"
 msgstr ""
 
-#: src/resample.c:1315
+#: src/resample.c:1290
 msgid "Current"
 msgstr "Actual"
 
-#: src/resample.c:1340
+#: src/resample.c:1315
 msgid "_Enable audio"
 msgstr ""
 
-#: src/resample.c:1372
+#: src/resample.c:1346
 msgid "_Channels"
 msgstr ""
 
-#: src/resample.c:1394
+#: src/resample.c:1368
 msgid "_Sample Size"
 msgstr ""
 
-#: src/resample.c:1394
+#: src/resample.c:1368
 msgid "Sample Size"
 msgstr ""
 
-#: src/resample.c:1489
+#: src/resample.c:1461
 msgid "New"
 msgstr "Nou"
 
-#: src/resample.c:1512
+#: src/resample.c:1484
 msgid "_Frames Per Second "
 msgstr ""
 
-#: src/resample.c:1530
+#: src/resample.c:1502
 msgid "Record for maximum:  "
 msgstr ""
 
-#: src/resample.c:1533
+#: src/resample.c:1505
 msgid " hours  "
 msgstr ""
 
-#: src/resample.c:1536
+#: src/resample.c:1508
 msgid " minutes  "
 msgstr ""
 
-#: src/resample.c:1538
+#: src/resample.c:1510
 msgid " seconds  "
 msgstr ""
 
-#: src/resample.c:1545
+#: src/resample.c:1517
 msgid "Unlimited"
 msgstr "Il·limitat"
 
-#: src/resample.c:1561
+#: src/resample.c:1533
 msgid "Click OK to begin recording, or Cancel to quit."
 msgstr ""
 
-#: src/resample.c:1670
+#: src/resample.c:1638
 msgid "LiVES: - Change playback speed"
 msgstr ""
 
-#: src/resample.c:1673
+#: src/resample.c:1640
 msgid "LiVES: - Resample Video"
 msgstr ""
 
-#: src/resample.c:1696
+#: src/resample.c:1663
 #, c-format
 msgid ""
 "\n"
@@ -7779,7 +7792,7 @@
 "in _frames per second"
 msgstr ""
 
-#: src/resample.c:1701
+#: src/resample.c:1667
 #, c-format
 msgid ""
 "\n"
@@ -7790,89 +7803,89 @@
 "in frames per second"
 msgstr ""
 
-#: src/resample.c:1723
+#: src/resample.c:1688
 msgid "OR enter the desired clip length in _seconds"
 msgstr ""
 
-#: src/resample.c:1745
+#: src/resample.c:1710
 msgid "Change the _audio speed as well"
 msgstr ""
 
-#: src/resample.c:1846
+#: src/resample.c:1810
 msgid ""
 "\n"
 "Speeding up the clip will cause missing frames in some multitrack layouts.\n"
 "Are you sure you wish to change the speed ?\n"
 msgstr ""
 
-#: src/resample.c:1863
+#: src/resample.c:1829
 msgid ""
 "\n"
 "Speeding up the clip will cause missing audio in some multitrack layouts.\n"
 "Are you sure you wish to change the speed ?\n"
 msgstr ""
 
-#: src/resample.c:1878
+#: src/resample.c:1847
 msgid ""
 "\n"
 "Changing the speed will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/resample.c:1892
+#: src/resample.c:1863
 msgid ""
 "\n"
 "Changing the speed will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/resample.c:1938
+#: src/resample.c:1911
 msgid "Speed Change"
 msgstr ""
 
-#: src/resample.c:1947
+#: src/resample.c:1920
 #, c-format
 msgid "Changed playback speed to %.3f frames per second and audio to %d Hz.\n"
 msgstr ""
 
-#: src/resample.c:1950
+#: src/resample.c:1922
 #, c-format
 msgid "Changed playback speed to %.3f frames per second.\n"
 msgstr ""
 
-#: src/resample.c:2035
+#: src/resample.c:2006
 msgid "Resampling video"
 msgstr ""
 
-#: src/resample.c:2042 src/resample.c:2160 src/resample.c:2182
+#: src/resample.c:2012 src/resample.c:2127 src/resample.c:2148
 msgid "Resampling clipboard video"
 msgstr ""
 
-#: src/resample.c:2047
+#: src/resample.c:2016
 msgid "Reordering frames"
 msgstr ""
 
-#: src/resample.c:2056
+#: src/resample.c:2025
 msgid ""
 "\n"
 "\n"
 "LiVES was unable to reorder the frames."
 msgstr ""
 
-#: src/resample.c:2104
+#: src/resample.c:2071
 msgid "Deordering frames"
 msgstr ""
 
-#: src/resample.c:2199
+#: src/resample.c:2165
 msgid "resampling error..."
 msgstr ""
 
-#: src/rte_window.c:85 src/rte_window.c:1708
+#: src/rte_window.c:124 src/rte_window.c:1709
 #, c-format
 msgid "Type: %s"
 msgstr "Tipus: %s"
 
-#: src/rte_window.c:112
+#: src/rte_window.c:150
 msgid ""
 "\n"
 "\n"
@@ -7882,7 +7895,7 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:426
+#: src/rte_window.c:460
 msgid ""
 "\n"
 "\n"
@@ -7890,19 +7903,19 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:432
+#: src/rte_window.c:466
 #, c-format
 msgid "Saving keymap to %s\n"
 msgstr ""
 
-#: src/rte_window.c:439
+#: src/rte_window.c:471
 #, c-format
 msgid ""
 "\n"
 "Updating keymap file %s..."
 msgstr ""
 
-#: src/rte_window.c:446
+#: src/rte_window.c:477
 #, c-format
 msgid ""
 "\n"
@@ -7912,12 +7925,12 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/rte_window.c:526
+#: src/rte_window.c:556
 #, c-format
 msgid "Saving real time effect defaults to %s..."
 msgstr ""
 
-#: src/rte_window.c:535
+#: src/rte_window.c:563
 #, c-format
 msgid ""
 "\n"
@@ -7927,22 +7940,22 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/rte_window.c:632
+#: src/rte_window.c:657
 #, c-format
 msgid "Loading real time effect defaults from %s..."
 msgstr ""
 
-#: src/rte_window.c:681
+#: src/rte_window.c:701
 #, c-format
 msgid "Loading generator default sizes from %s..."
 msgstr ""
 
-#: src/rte_window.c:1306
+#: src/rte_window.c:1319
 #, c-format
 msgid "Loading default keymap from %s..."
 msgstr ""
 
-#: src/rte_window.c:1329
+#: src/rte_window.c:1339
 #, c-format
 msgid ""
 "\n"
@@ -7952,48 +7965,48 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/rte_window.c:1403
+#: src/rte_window.c:1412
 #, c-format
 msgid "Invalid line %d in %s\n"
 msgstr ""
 
-#: src/rte_window.c:1483
+#: src/rte_window.c:1490
 #, c-format
 msgid "Invalid key %d in %s\n"
 msgstr ""
 
-#: src/rte_window.c:1498
+#: src/rte_window.c:1505
 #, c-format
 msgid "Invalid effect %s in %s\n"
 msgstr ""
 
-#: src/rte_window.c:1517
+#: src/rte_window.c:1524
 #, c-format
 msgid "Unknown effect %s in %s\n"
 msgstr ""
 
-#: src/rte_window.c:1535
+#: src/rte_window.c:1542
 #, c-format
 msgid ""
 "This version of LiVES cannot mix generators/non-generators on the same key "
 "(%d) !\n"
 msgstr ""
 
-#: src/rte_window.c:1547
+#: src/rte_window.c:1554
 #, c-format
 msgid "Too many effects bound to key %d.\n"
 msgstr ""
 
-#: src/rte_window.c:1587
+#: src/rte_window.c:1593
 msgid "update required.\n"
 msgstr ""
 
-#: src/rte_window.c:1603
+#: src/rte_window.c:1607
 #, c-format
 msgid "Loading data connection map from %s..."
 msgstr ""
 
-#: src/rte_window.c:1612
+#: src/rte_window.c:1614
 msgid ""
 "\n"
 "\n"
@@ -8001,41 +8014,41 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:1691
+#: src/rte_window.c:1692
 #, c-format
 msgid "LiVES: Information for %s"
 msgstr ""
 
-#: src/rte_window.c:1704
+#: src/rte_window.c:1705
 #, c-format
 msgid "Effect name: %s"
 msgstr ""
 
-#: src/rte_window.c:1712
+#: src/rte_window.c:1713
 #, c-format
 msgid "Plugin name: %s"
 msgstr ""
 
-#: src/rte_window.c:1716
+#: src/rte_window.c:1717
 #, c-format
 msgid "Author: %s"
 msgstr ""
 
-#: src/rte_window.c:1721
+#: src/rte_window.c:1722
 #, c-format
 msgid "and: %s"
 msgstr ""
 
-#: src/rte_window.c:1726
+#: src/rte_window.c:1727
 #, c-format
 msgid "Version: %d"
 msgstr ""
 
-#: src/rte_window.c:1734
+#: src/rte_window.c:1735
 msgid "Description: "
 msgstr "Descripció: "
 
-#: src/rte_window.c:1960
+#: src/rte_window.c:1963
 msgid ""
 "\n"
 "\n"
@@ -8044,69 +8057,69 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:2024
+#: src/rte_window.c:2027
 #, c-format
 msgid "LiVES could not locate the effect %s.\n"
 msgstr ""
 
-#: src/rte_window.c:2225
+#: src/rte_window.c:2216
 msgid "LiVES: Real time effect mapping"
 msgstr ""
 
-#: src/rte_window.c:2257
+#: src/rte_window.c:2248
 #, c-format
 msgid "Ctrl-%d"
 msgstr ""
 
-#: src/rte_window.c:2264
+#: src/rte_window.c:2255
 msgid "Key active"
 msgstr ""
 
-#: src/rte_window.c:2279
+#: src/rte_window.c:2271
 msgid "Key grab"
 msgstr ""
 
-#: src/rte_window.c:2280
+#: src/rte_window.c:2272
 msgid "Grab keyboard for this effect key"
 msgstr ""
 
-#: src/rte_window.c:2290
+#: src/rte_window.c:2283
 msgid "_Clear all effects"
 msgstr ""
 
-#: src/rte_window.c:2304
+#: src/rte_window.c:2297
 msgid "Mode active"
 msgstr ""
 
-#: src/rte_window.c:2314 src/multitrack.c:8568
+#: src/rte_window.c:2307 src/multitrack.c:8762
 msgid "Info"
 msgstr "Informació"
 
-#: src/rte_window.c:2315
+#: src/rte_window.c:2308
 msgid "Set Parameters"
 msgstr ""
 
-#: src/rte_window.c:2316
+#: src/rte_window.c:2309
 msgid "Set Connections"
 msgstr ""
 
-#: src/rte_window.c:2317
+#: src/rte_window.c:2310
 msgid "Clear"
 msgstr "Neteja"
 
-#: src/rte_window.c:2326
+#: src/rte_window.c:2319
 msgid "Effect name:"
 msgstr ""
 
-#: src/rte_window.c:2391
+#: src/rte_window.c:2384
 msgid "_Save as default keymap"
 msgstr ""
 
-#: src/rte_window.c:2396
+#: src/rte_window.c:2389
 msgid "_Load default keymap"
 msgstr ""
 
-#: src/rte_window.c:2840
+#: src/rte_window.c:2833
 #, c-format
 msgid ""
 "Unable to create default keymap file: %s\n"
@@ -8164,86 +8177,86 @@
 msgid "none\n"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:494
+#: src/lives-yuv4mpeg.c:493
 #, c-format
 msgid ""
 "Unable to set display framerate to %.3f fps.\n"
 "\n"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:503
+#: src/lives-yuv4mpeg.c:502
 #, c-format
 msgid "Unable to open yuv4mpeg out stream %s\n"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:628
+#: src/lives-yuv4mpeg.c:626
 #, c-format
 msgid "TV card %d"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:713
+#: src/lives-yuv4mpeg.c:710
 #, c-format
 msgid "Opened TV card %d (%s)"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:760
+#: src/lives-yuv4mpeg.c:757
 #, c-format
 msgid "Firewire card %d"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:796
+#: src/lives-yuv4mpeg.c:793
 #, c-format
 msgid "Opened firewire card %d"
 msgstr ""
 
-#: src/multitrack.c:666
+#: src/multitrack.c:736
 msgid "Auto backup"
 msgstr ""
 
-#: src/multitrack.c:868
+#: src/multitrack.c:935
 msgid "Backing audio"
 msgstr ""
 
-#: src/multitrack.c:1435
+#: src/multitrack.c:1515
 #, c-format
 msgid "%s : parameters for %s"
 msgstr ""
 
-#: src/multitrack.c:1809 src/multitrack.c:3483
+#: src/multitrack.c:1881 src/multitrack.c:3635
 #, c-format
 msgid "Current track: %s (layer %d)\n"
 msgstr ""
 
-#: src/multitrack.c:1813 src/multitrack.c:3484
+#: src/multitrack.c:1885 src/multitrack.c:3637
 msgid "Current track: Backing audio\n"
 msgstr ""
 
-#: src/multitrack.c:1814
+#: src/multitrack.c:1886
 #, c-format
 msgid "Current track: Layer %d audio\n"
 msgstr ""
 
-#: src/multitrack.c:1817
+#: src/multitrack.c:1889
 #, c-format
 msgid "%.2f sec.\n"
 msgstr ""
 
-#: src/multitrack.c:1822 src/multitrack.c:3490
+#: src/multitrack.c:1894 src/multitrack.c:3643
 #, c-format
 msgid "Source: %s"
 msgstr ""
 
-#: src/multitrack.c:1825 src/multitrack.c:3492
+#: src/multitrack.c:1897 src/multitrack.c:3645
 msgid "Right click for context menu.\n"
 msgstr ""
 
-#: src/multitrack.c:1827
+#: src/multitrack.c:1899
 msgid ""
 "Double click on a block\n"
 "to select it."
 msgstr ""
 
-#: src/multitrack.c:3312
+#: src/multitrack.c:3452
 msgid ""
 "\n"
 "\n"
@@ -8252,7 +8265,7 @@
 "right or double clicking on it.\n"
 msgstr ""
 
-#: src/multitrack.c:3315
+#: src/multitrack.c:3455
 msgid ""
 "\n"
 "\n"
@@ -8260,14 +8273,14 @@
 "Select an effect in FX stack first to view its parameters.\n"
 msgstr ""
 
-#: src/multitrack.c:3318
+#: src/multitrack.c:3458
 msgid ""
 "\n"
 "\n"
 "No clips loaded.\n"
 msgstr ""
 
-#: src/multitrack.c:3321
+#: src/multitrack.c:3462
 msgid ""
 "You must select two video tracks\n"
 "and a time region\n"
@@ -8277,7 +8290,7 @@
 "before inserting clips into the timeline."
 msgstr ""
 
-#: src/multitrack.c:3324
+#: src/multitrack.c:3465
 msgid ""
 "\n"
 "\n"
@@ -8286,210 +8299,210 @@
 "to apply compositors.\n"
 msgstr ""
 
-#: src/multitrack.c:3487
+#: src/multitrack.c:3640
 #, c-format
 msgid "%.2f sec. to %.2f sec.\n"
 msgstr ""
 
-#: src/multitrack.c:3493
+#: src/multitrack.c:3646
 msgid ""
 "Single click on timeline\n"
 "to select a frame.\n"
 msgstr ""
 
-#: src/multitrack.c:3711 src/multitrack.c:6790
+#: src/multitrack.c:3858 src/multitrack.c:6972
 #, c-format
 msgid "%s [unstable]"
 msgstr ""
 
-#: src/multitrack.c:3822
+#: src/multitrack.c:3973
 msgid ""
 "You can click and drag\n"
 "below the timeline"
 msgstr ""
 
-#: src/multitrack.c:3823
+#: src/multitrack.c:3974
 msgid "to select a time region.\n"
 msgstr ""
 
-#: src/multitrack.c:3985
+#: src/multitrack.c:4137
 msgid "LiVES: Selected clip"
 msgstr ""
 
-#: src/multitrack.c:3993
+#: src/multitrack.c:4145
 msgid "_Adjust start and end points"
 msgstr ""
 
-#: src/multitrack.c:4002
+#: src/multitrack.c:4154
 msgid "_Edit/encode in clip editor"
 msgstr ""
 
-#: src/multitrack.c:4009
+#: src/multitrack.c:4161
 msgid "_Show clip information"
 msgstr ""
 
-#: src/multitrack.c:4016
+#: src/multitrack.c:4168
 msgid "_Close this clip"
 msgstr ""
 
-#: src/multitrack.c:4236
+#: src/multitrack.c:4388
 msgid "Audio mixer (ctrl-m)"
 msgstr ""
 
-#: src/multitrack.c:4336
+#: src/multitrack.c:4488
 msgid "Single click on timeline"
 msgstr ""
 
-#: src/multitrack.c:4337
+#: src/multitrack.c:4489
 msgid "to select a frame."
 msgstr ""
 
-#: src/multitrack.c:4338
+#: src/multitrack.c:4490
 msgid "Double click or right click on timeline"
 msgstr ""
 
-#: src/multitrack.c:4339
+#: src/multitrack.c:4491
 msgid "to select a block."
 msgstr ""
 
-#: src/multitrack.c:4340
+#: src/multitrack.c:4492
 msgid "Clips can be dragged"
 msgstr ""
 
-#: src/multitrack.c:4341
+#: src/multitrack.c:4493
 msgid "onto the timeline."
 msgstr ""
 
-#: src/multitrack.c:4343
+#: src/multitrack.c:4495
 msgid "Mouse mode is: Move"
 msgstr ""
 
-#: src/multitrack.c:4344
+#: src/multitrack.c:4496
 msgid "clips can be moved around."
 msgstr ""
 
-#: src/multitrack.c:4349
+#: src/multitrack.c:4500
 msgid "Mouse mode is: Select."
 msgstr ""
 
-#: src/multitrack.c:4350
+#: src/multitrack.c:4501
 msgid "Drag with mouse on timeline"
 msgstr ""
 
-#: src/multitrack.c:4351
+#: src/multitrack.c:4502
 msgid "to select tracks and time."
 msgstr ""
 
-#: src/multitrack.c:4362
+#: src/multitrack.c:4509
 msgid "_Insert mode: Normal"
 msgstr ""
 
-#: src/multitrack.c:4378
+#: src/multitrack.c:4537
 msgid "_Mouse mode: Move"
 msgstr ""
 
-#: src/multitrack.c:4382
+#: src/multitrack.c:4540
 msgid "_Mouse mode: Select"
 msgstr ""
 
-#: src/multitrack.c:4405 src/multitrack.c:7925
+#: src/multitrack.c:4563 src/multitrack.c:8104
 msgid "Gravity: Normal"
 msgstr ""
 
-#: src/multitrack.c:4409
+#: src/multitrack.c:4565
 msgid "Gravity: Left"
 msgstr ""
 
-#: src/multitrack.c:4414
+#: src/multitrack.c:4569
 msgid "Gravity: Right"
 msgstr ""
 
-#: src/multitrack.c:4416
+#: src/multitrack.c:4570
 msgid "Close _last gap(s) in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:4419
+#: src/multitrack.c:4572
 msgid "Close _first gap(s) in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:4458
+#: src/multitrack.c:4627
 msgid "Close gaps"
 msgstr "Tapa els forats"
 
-#: src/multitrack.c:4460
+#: src/multitrack.c:4629
 msgid "Move block"
 msgstr ""
 
-#: src/multitrack.c:4462
+#: src/multitrack.c:4631
 msgid "Move audio block"
 msgstr ""
 
-#: src/multitrack.c:4464
+#: src/multitrack.c:4633
 msgid "Delete block"
 msgstr "Suprimeix el bloc"
 
-#: src/multitrack.c:4466
+#: src/multitrack.c:4635
 msgid "Delete audio block"
 msgstr ""
 
-#: src/multitrack.c:4468
+#: src/multitrack.c:4637
 msgid "Split tracks"
 msgstr ""
 
-#: src/multitrack.c:4470
+#: src/multitrack.c:4639
 msgid "Split block"
 msgstr ""
 
-#: src/multitrack.c:4473
+#: src/multitrack.c:4642
 #, c-format
 msgid "Apply %s"
 msgstr ""
 
-#: src/multitrack.c:4478
+#: src/multitrack.c:4647
 #, c-format
 msgid "Delete %s"
 msgstr "Suprimeix %s"
 
-#: src/multitrack.c:4482
+#: src/multitrack.c:4651
 msgid "Insert block"
 msgstr ""
 
-#: src/multitrack.c:4484
+#: src/multitrack.c:4653
 msgid "Insert gap"
 msgstr ""
 
-#: src/multitrack.c:4486
+#: src/multitrack.c:4655
 msgid "Insert audio block"
 msgstr ""
 
-#: src/multitrack.c:4488
+#: src/multitrack.c:4657
 msgid "Effect order change"
 msgstr ""
 
-#: src/multitrack.c:4898
+#: src/multitrack.c:5064
 msgid "unsigned "
 msgstr ""
 
-#: src/multitrack.c:4899
+#: src/multitrack.c:5065
 msgid "signed "
 msgstr ""
 
-#: src/multitrack.c:4904
+#: src/multitrack.c:5071
 #, c-format
 msgid ""
 "Multitrack values set to %.3f fps, frame size %d x %d, audio channels %d, "
 "audio rate %d, audio sample size %d, %s.\n"
 msgstr ""
 
-#: src/multitrack.c:4938
+#: src/multitrack.c:5104
 msgid "invalid event list. Failed.\n"
 msgstr ""
 
-#: src/multitrack.c:4944
+#: src/multitrack.c:5110
 msgid "event list has invalid fps. Failed.\n"
 msgstr ""
 
-#: src/multitrack.c:4953
+#: src/multitrack.c:5122
 #, c-format
 msgid ""
 "\n"
@@ -8499,7 +8512,7 @@
 "then load in the new set from the File menu.\n"
 msgstr ""
 
-#: src/multitrack.c:4993
+#: src/multitrack.c:5163
 #, c-format
 msgid ""
 "\n"
@@ -8507,600 +8520,592 @@
 "It cannot be loaded.\n"
 msgstr ""
 
-#: src/multitrack.c:5329 src/multitrack.c:5338 src/multitrack.c:21133
+#: src/multitrack.c:5452
 msgid "Layout was wiped.\n"
 msgstr ""
 
-#: src/multitrack.c:5374
+#: src/multitrack.c:5547
 #, c-format
 msgid "LiVES-%s: Multitrack %dx%d : %d bpp %.3f fps"
 msgstr ""
 
-#: src/multitrack.c:5617
+#: src/multitrack.c:5793
 msgid "In/out"
 msgstr ""
 
-#: src/multitrack.c:5619
+#: src/multitrack.c:5795
 msgid "FX stack"
 msgstr ""
 
-#: src/multitrack.c:5627 src/omc-learn.c:673
+#: src/multitrack.c:5803 src/omc-learn.c:659
 msgid "Params."
 msgstr ""
 
-#: src/multitrack.c:5978
+#: src/multitrack.c:6157
 msgid "_Open..."
 msgstr ""
 
-#: src/multitrack.c:5996
+#: src/multitrack.c:6175
 msgid "O_pen File Selection..."
 msgstr ""
 
-#: src/multitrack.c:6040
+#: src/multitrack.c:6219
 msgid "Import Selection from _dvd/vcd..."
 msgstr ""
 
-#: src/multitrack.c:6050
+#: src/multitrack.c:6229
 msgid "Import Selection from _dvd"
 msgstr ""
 
-#: src/multitrack.c:6060
+#: src/multitrack.c:6239
 msgid "Import Selection from _vcd"
 msgstr ""
 
-#: src/multitrack.c:6076
+#: src/multitrack.c:6255
 msgid "_Import from Device"
 msgstr ""
 
-#: src/multitrack.c:6103
+#: src/multitrack.c:6282
 msgid "_Close the selected clip"
 msgstr ""
 
-#: src/multitrack.c:6198
+#: src/multitrack.c:6377
 msgid "_Save layout as..."
 msgstr ""
 
-#: src/multitrack.c:6206
+#: src/multitrack.c:6385
 msgid "_Load layout..."
 msgstr ""
 
-#: src/multitrack.c:6210
+#: src/multitrack.c:6389
 msgid "_Wipe/Delete layout..."
 msgstr ""
 
-#: src/multitrack.c:6236
+#: src/multitrack.c:6415
 msgid "_Ignore width, height and audio values from loaded layouts"
 msgstr ""
 
-#: src/multitrack.c:6240
+#: src/multitrack.c:6419
 msgid "Auto load _subtitles with clips"
 msgstr ""
 
-#: src/multitrack.c:6322
+#: src/multitrack.c:6501
 msgid "_CLIP EDITOR"
 msgstr ""
 
-#: src/multitrack.c:6334
+#: src/multitrack.c:6513
 msgid "_Adjust selected clip start/end points"
 msgstr ""
 
-#: src/multitrack.c:6343
+#: src/multitrack.c:6522
 msgid "_Insert selected clip"
 msgstr ""
 
-#: src/multitrack.c:6355
+#: src/multitrack.c:6534
 msgid "_Insert selected clip audio"
 msgstr ""
 
-#: src/multitrack.c:6364
+#: src/multitrack.c:6543
 msgid "_Delete selected block"
 msgstr ""
 
-#: src/multitrack.c:6373
+#: src/multitrack.c:6555
 msgid "_Jump to previous block boundary"
 msgstr ""
 
-#: src/multitrack.c:6382
+#: src/multitrack.c:6564
 msgid "_Jump to next block boundary"
 msgstr ""
 
-#: src/multitrack.c:6395
+#: src/multitrack.c:6577
 msgid "Clear _marks from timeline"
 msgstr ""
 
-#: src/multitrack.c:6403
+#: src/multitrack.c:6585
 msgid "Ignore selection limits when inserting"
 msgstr ""
 
-#: src/multitrack.c:6420 src/multitrack.c:16719
+#: src/multitrack.c:6602 src/multitrack.c:17009
 msgid "_Play from Timeline Position"
 msgstr ""
 
-#: src/multitrack.c:6434
+#: src/multitrack.c:6616
 msgid "Pla_y selected time only"
 msgstr ""
 
-#: src/multitrack.c:6518
+#: src/multitrack.c:6700
 msgid "_Move effects with blocks"
 msgstr ""
 
-#: src/multitrack.c:6531
+#: src/multitrack.c:6713
 msgid "Select _autotransition effect..."
 msgstr ""
 
-#: src/multitrack.c:6542
+#: src/multitrack.c:6724
 msgid "Crossfade audio with autotransition"
 msgstr ""
 
-#: src/multitrack.c:6550
+#: src/multitrack.c:6732
 msgid "View/_Edit selected effect"
 msgstr ""
 
-#: src/multitrack.c:6554
+#: src/multitrack.c:6736
 msgid "_Delete selected effect"
 msgstr ""
 
-#: src/multitrack.c:6562
+#: src/multitrack.c:6744
 msgid "Apply effect to _block..."
 msgstr ""
 
-#: src/multitrack.c:6619
+#: src/multitrack.c:6801
 msgid "Apply effect to _region..."
 msgstr ""
 
-#: src/multitrack.c:6885
+#: src/multitrack.c:7061
 msgid "_Tracks"
 msgstr ""
 
-#: src/multitrack.c:6896
+#: src/multitrack.c:7072
 msgid "Rename current track"
 msgstr ""
 
-#: src/multitrack.c:6904
+#: src/multitrack.c:7080
 msgid "Make _Backing Audio current track"
 msgstr ""
 
-#: src/multitrack.c:6915
+#: src/multitrack.c:7091
 msgid "Add Video Track at _Rear"
 msgstr ""
 
-#: src/multitrack.c:6923
+#: src/multitrack.c:7099
 msgid "Add Video Track at _Front"
 msgstr ""
 
-#: src/multitrack.c:6936
+#: src/multitrack.c:7112
 msgid "_Split current track at cursor"
 msgstr ""
 
-#: src/multitrack.c:6948
+#: src/multitrack.c:7124
 msgid "_Split selected video tracks"
 msgstr ""
 
-#: src/multitrack.c:6961
+#: src/multitrack.c:7137
 msgid "Insert gap in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:6969
+#: src/multitrack.c:7145
 msgid "Insert gap in current track/selected time"
 msgstr ""
 
-#: src/multitrack.c:6981
+#: src/multitrack.c:7157
 msgid "Close all _gaps in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:7007
+#: src/multitrack.c:7183
 msgid "Se_lection"
 msgstr "_Selecció"
 
-#: src/multitrack.c:7018
+#: src/multitrack.c:7194
 msgid "_Select Current Track"
 msgstr ""
 
-#: src/multitrack.c:7025
+#: src/multitrack.c:7201
 msgid "Select _all video tracks"
 msgstr ""
 
-#: src/multitrack.c:7032
+#: src/multitrack.c:7208
 msgid "Select _no video tracks"
 msgstr ""
 
-#: src/multitrack.c:7039
+#: src/multitrack.c:7215
 msgid "Select all _time"
 msgstr ""
 
-#: src/multitrack.c:7050
+#: src/multitrack.c:7226
 msgid "Select from _zero time"
 msgstr ""
 
-#: src/multitrack.c:7057
+#: src/multitrack.c:7233
 msgid "Select to _end time"
 msgstr ""
 
-#: src/multitrack.c:7064
+#: src/multitrack.c:7240
 msgid "_Copy..."
 msgstr "_Copia..."
 
-#: src/multitrack.c:7075
+#: src/multitrack.c:7251
 msgid "_Timecode to region start"
 msgstr ""
 
-#: src/multitrack.c:7082
+#: src/multitrack.c:7258
 msgid "_Timecode to region end"
 msgstr ""
 
-#: src/multitrack.c:7089
+#: src/multitrack.c:7265
 msgid "_Region start to timecode"
 msgstr ""
 
-#: src/multitrack.c:7096
+#: src/multitrack.c:7272
 msgid "_Region end to timecode"
 msgstr ""
 
-#: src/multitrack.c:7110
+#: src/multitrack.c:7286
 msgid "Select/deselect block at current track/time"
 msgstr ""
 
-#: src/multitrack.c:7135
+#: src/multitrack.c:7311
 msgid "_Change width, height and audio values..."
 msgstr ""
 
-#: src/multitrack.c:7194
+#: src/multitrack.c:7370
 msgid "_Render"
 msgstr "_Renderitza"
 
-#: src/multitrack.c:7205
+#: src/multitrack.c:7381
 msgid "_Render all to new clip"
 msgstr ""
 
-#: src/multitrack.c:7220
+#: src/multitrack.c:7396
 msgid "Render _video"
 msgstr ""
 
-#: src/multitrack.c:7225
+#: src/multitrack.c:7401
 msgid "Render _audio"
 msgstr ""
 
-#: src/multitrack.c:7235
+#: src/multitrack.c:7411
 msgid "_Normalise rendered audio"
 msgstr ""
 
-#: src/multitrack.c:7242
+#: src/multitrack.c:7418
 msgid "_Pre-render audio"
 msgstr ""
 
-#: src/multitrack.c:7251
+#: src/multitrack.c:7427
 msgid "_View"
 msgstr "_Visualitza"
 
-#: src/multitrack.c:7270
+#: src/multitrack.c:7446
 msgid "Block _In/out points"
 msgstr ""
 
-#: src/multitrack.c:7279
+#: src/multitrack.c:7455
 msgid "_Effects at current"
 msgstr ""
 
-#: src/multitrack.c:7297
+#: src/multitrack.c:7473
 msgid "Audio parameters"
 msgstr ""
 
-#: src/multitrack.c:7308
+#: src/multitrack.c:7484
 msgid "Show backing _audio track"
 msgstr ""
 
-#: src/multitrack.c:7312
+#: src/multitrack.c:7488
 msgid "Compact view"
 msgstr "Visualització compacta"
 
-#: src/multitrack.c:7320
+#: src/multitrack.c:7496
 msgid "Maximum tracks to display..."
 msgstr ""
 
-#: src/multitrack.c:7327
+#: src/multitrack.c:7503
 msgid "Scroll to follow playback"
 msgstr ""
 
-#: src/multitrack.c:7331
+#: src/multitrack.c:7507
 msgid "_Center on cursor"
 msgstr ""
 
-#: src/multitrack.c:7338
+#: src/multitrack.c:7514
 msgid "_Zoom in"
 msgstr ""
 
-#: src/multitrack.c:7349
+#: src/multitrack.c:7525
 msgid "_Zoom out"
 msgstr ""
 
-#: src/multitrack.c:7361
+#: src/multitrack.c:7537
 msgid "Multitrack _details"
 msgstr ""
 
-#: src/multitrack.c:7374
+#: src/multitrack.c:7550
 msgid "_Event Window"
 msgstr ""
 
-#: src/multitrack.c:7378
+#: src/multitrack.c:7554
 msgid "_Event Window (selected time only)"
 msgstr ""
 
-#: src/multitrack.c:7382
+#: src/multitrack.c:7558
 msgid "_Show FRAME events"
 msgstr ""
 
-#: src/multitrack.c:7399
+#: src/multitrack.c:7575
 msgid "_Show multitrack keys"
 msgstr ""
 
-#: src/multitrack.c:7468
+#: src/multitrack.c:7644
 msgid "Mouse mode: _Move"
 msgstr ""
 
-#: src/multitrack.c:7476
+#: src/multitrack.c:7652
 msgid "Mouse mode: _Select"
 msgstr ""
 
-#: src/multitrack.c:7505
+#: src/multitrack.c:7681
 msgid "Insert mode: _Normal"
 msgstr ""
 
-#: src/multitrack.c:7733
+#: src/multitrack.c:7909
 msgid "Insert with _audio"
 msgstr ""
 
-#: src/multitrack.c:7734
+#: src/multitrack.c:7910
 msgid ""
 "Select whether video clips are inserted and moved with their audio or not"
 msgstr ""
 
-#: src/multitrack.c:7829
+#: src/multitrack.c:8007
 msgid "Select _overlap"
 msgstr ""
 
-#: src/multitrack.c:7830
+#: src/multitrack.c:8008
 msgid ""
 "Select whether timeline selection snaps to overlap between selected tracks "
 "or not"
 msgstr ""
 
-#: src/multitrack.c:7894 src/multitrack.c:14198
+#: src/multitrack.c:8073 src/multitrack.c:14422
 msgid "Expanded View (d)"
 msgstr ""
 
-#: src/multitrack.c:7897 src/multitrack.c:14205
+#: src/multitrack.c:8076 src/multitrack.c:14428
 msgid "Compact View (d)"
 msgstr ""
 
-#: src/multitrack.c:7939
+#: src/multitrack.c:8118
 msgid "Gravity: _Normal"
 msgstr ""
 
-#: src/multitrack.c:7952
+#: src/multitrack.c:8131
 msgid "Gravity: _Left"
 msgstr ""
 
-#: src/multitrack.c:7967
+#: src/multitrack.c:8146
 msgid "Gravity: _Right"
 msgstr ""
 
-#: src/multitrack.c:8297
+#: src/multitrack.c:8496
 msgid "_Apply"
 msgstr "_Aplica"
 
-#: src/multitrack.c:8319
+#: src/multitrack.c:8518
 msgid "Time"
 msgstr ""
 
-#: src/multitrack.c:8333
+#: src/multitrack.c:8532
 msgid "_Del. node"
 msgstr ""
 
-#: src/multitrack.c:8341
+#: src/multitrack.c:8540
 msgid "_Next node"
 msgstr ""
 
-#: src/multitrack.c:8349
+#: src/multitrack.c:8548
 msgid "_Prev node"
 msgstr ""
 
-#: src/multitrack.c:8373
+#: src/multitrack.c:8574
 msgid "_Reverse playback  "
 msgstr ""
 
-#: src/multitrack.c:8395
+#: src/multitrack.c:8596
 msgid "_Velocity  "
 msgstr ""
 
-#: src/multitrack.c:8464
+#: src/multitrack.c:8664
 msgid "Anchor _start"
 msgstr ""
 
-#: src/multitrack.c:8465
+#: src/multitrack.c:8665
 msgid "Anchor the start point to the timeline"
 msgstr ""
 
-#: src/multitrack.c:8481
-msgid "Start frame"
-msgstr ""
-
-#: src/multitrack.c:8533
+#: src/multitrack.c:8728
 msgid "Anchor _end"
 msgstr ""
 
-#: src/multitrack.c:8534
+#: src/multitrack.c:8729
 msgid "Anchor the end point to the timeline"
 msgstr ""
 
-#: src/multitrack.c:8546
-msgid "End frame"
-msgstr ""
-
-#: src/multitrack.c:8739
+#: src/multitrack.c:8929
 msgid "Scroll"
 msgstr "Desplaçament"
 
-#: src/multitrack.c:9316
+#: src/multitrack.c:9502
 msgid ""
 "\n"
 "==============================\n"
 "Switched to Clip Edit mode\n"
 msgstr ""
 
-#: src/multitrack.c:9502
+#: src/multitrack.c:9708
 msgid "Timeline (seconds)"
 msgstr ""
 
-#: src/multitrack.c:9984
+#: src/multitrack.c:10202
 msgid " Backing audio"
 msgstr ""
 
-#: src/multitrack.c:9987
+#: src/multitrack.c:10204
 #, c-format
 msgid " Layer %d audio"
 msgstr ""
 
-#: src/multitrack.c:9995
+#: src/multitrack.c:10212
 msgid "Show/hide audio details"
 msgstr ""
 
-#: src/multitrack.c:10010 src/multitrack.c:10232
+#: src/multitrack.c:10227 src/multitrack.c:10452
 #, c-format
 msgid "Layer %d audio"
 msgstr ""
 
-#: src/multitrack.c:10144 src/multitrack.c:10261
+#: src/multitrack.c:10353 src/multitrack.c:10481
 #, c-format
 msgid "%s (layer %d)"
 msgstr ""
 
-#: src/multitrack.c:10184
+#: src/multitrack.c:10403
 msgid "Select track"
 msgstr ""
 
-#: src/multitrack.c:10188
+#: src/multitrack.c:10407
 msgid "Show/hide audio"
 msgstr ""
 
-#: src/multitrack.c:10194
+#: src/multitrack.c:10413
 #, c-format
 msgid "Video %d"
 msgstr ""
 
-#: src/multitrack.c:10233
+#: src/multitrack.c:10453
 #, c-format
 msgid " %s"
 msgstr " %s"
 
-#: src/multitrack.c:10346
+#: src/multitrack.c:10574
 msgid "LiVES: Selected effect"
 msgstr ""
 
-#: src/multitrack.c:10358
+#: src/multitrack.c:10586
 msgid "_View/Edit this effect"
 msgstr ""
 
-#: src/multitrack.c:10361
+#: src/multitrack.c:10588
 msgid "_View this effect"
 msgstr ""
 
-#: src/multitrack.c:10369
+#: src/multitrack.c:10596
 msgid "_Delete this effect"
 msgstr ""
 
-#: src/multitrack.c:10422
+#: src/multitrack.c:10648
 msgid "Cannot insert after this effect"
 msgstr ""
 
-#: src/multitrack.c:10451
+#: src/multitrack.c:10677
 msgid "This effect cannot be moved"
 msgstr ""
 
-#: src/multitrack.c:10499
+#: src/multitrack.c:10724
 #, c-format
 msgid "  %d to %d selected  "
 msgstr ""
 
-#: src/multitrack.c:10502 src/multitrack.c:10746
+#: src/multitrack.c:10727 src/multitrack.c:10968
 #, c-format
 msgid "%.2f sec."
 msgstr ""
 
-#: src/multitrack.c:10717
+#: src/multitrack.c:10940
 #, c-format
 msgid "%d frames"
 msgstr ""
 
-#: src/multitrack.c:11070
+#: src/multitrack.c:11299
 msgid ""
 "\n"
 "==============================\n"
 "Switched to Multitrack mode\n"
 msgstr ""
 
-#: src/multitrack.c:12691
+#: src/multitrack.c:12939
 msgid "Drag the time slider to where you"
 msgstr ""
 
-#: src/multitrack.c:12692
+#: src/multitrack.c:12940
 msgid "want to set effect parameters"
 msgstr ""
 
-#: src/multitrack.c:12693
+#: src/multitrack.c:12941
 msgid "Set parameters, then click \"Apply\"\n"
 msgstr ""
 
-#: src/multitrack.c:12694
+#: src/multitrack.c:12942
 msgid ""
 "NODES are points where parameters\n"
 "have been set.\n"
 "Nodes can be deleted."
 msgstr ""
 
-#: src/multitrack.c:12697
+#: src/multitrack.c:12944
 msgid "Effect has no parameters.\n"
 msgstr ""
 
-#: src/multitrack.c:12788
+#: src/multitrack.c:13033
 #, c-format
 msgid "%s output"
 msgstr ""
 
-#: src/multitrack.c:12794 src/multitrack.c:12804
+#: src/multitrack.c:13038 src/multitrack.c:13046
 #, c-format
 msgid "layer %d"
 msgstr ""
 
-#: src/multitrack.c:12796 src/multitrack.c:12806
+#: src/multitrack.c:13039 src/multitrack.c:13047
 msgid "audio track"
 msgstr ""
 
-#: src/multitrack.c:12797
+#: src/multitrack.c:13040
 #, c-format
 msgid "%s to %s"
 msgstr "%s a %s"
 
-#: src/multitrack.c:12807
+#: src/multitrack.c:13048
 #, c-format
 msgid "%s from %s"
 msgstr ""
 
-#: src/multitrack.c:12860
+#: src/multitrack.c:13099
 msgid "_Prev filter map"
 msgstr ""
 
-#: src/multitrack.c:12871
+#: src/multitrack.c:13110
 msgid "Insert _before"
 msgstr ""
 
-#: src/multitrack.c:12881
+#: src/multitrack.c:13120
 msgid "Insert _after"
 msgstr ""
 
-#: src/multitrack.c:12896
+#: src/multitrack.c:13134
 msgid "_Next filter map"
 msgstr ""
 
-#: src/multitrack.c:12911
+#: src/multitrack.c:13148
 msgid ""
 "\n"
 "\n"
@@ -9108,272 +9113,272 @@
 "current time.\n"
 msgstr ""
 
-#: src/multitrack.c:12929
+#: src/multitrack.c:13166
 msgid ""
 "Drag a compositor anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:12936
+#: src/multitrack.c:13173
 msgid ""
 "Drag a transition anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:12944
+#: src/multitrack.c:13181
 msgid ""
 "Effects can be dragged\n"
 "onto blocks on the timeline."
 msgstr ""
 
-#: src/multitrack.c:13166
+#: src/multitrack.c:13406
 msgid "LiVES: Selected block/frame"
 msgstr ""
 
-#: src/multitrack.c:13173
+#: src/multitrack.c:13413
 msgid "_Select this block"
 msgstr ""
 
-#: src/multitrack.c:13183
+#: src/multitrack.c:13423
 msgid "_Split block here"
 msgstr ""
 
-#: src/multitrack.c:13191
+#: src/multitrack.c:13431
 msgid "List _effects here"
 msgstr ""
 
-#: src/multitrack.c:13200 src/multitrack.c:13277
+#: src/multitrack.c:13440 src/multitrack.c:13518
 #, c-format
 msgid "_Adjust %s"
 msgstr ""
 
-#: src/multitrack.c:13215
+#: src/multitrack.c:13455
 msgid "_Delete this block"
 msgstr ""
 
-#: src/multitrack.c:13258
+#: src/multitrack.c:13500
 msgid "_Insert here"
 msgstr ""
 
-#: src/multitrack.c:13264
+#: src/multitrack.c:13505
 msgid "_Insert audio here"
 msgstr ""
 
-#: src/multitrack.c:14801
+#: src/multitrack.c:15017
 #, c-format
 msgid "Inserted gap in selected tracks from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:14835
+#: src/multitrack.c:15048
 #, c-format
 msgid "Inserted gap in track %s from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15036
+#: src/multitrack.c:15244
 #, c-format
 msgid "Undid %s\n"
 msgstr ""
 
-#: src/multitrack.c:15235
+#: src/multitrack.c:15445
 #, c-format
 msgid "Redid %s\n"
 msgstr ""
 
-#: src/multitrack.c:15268
+#: src/multitrack.c:15475
 msgid ""
 "\n"
 " (variable)"
 msgstr ""
 
-#: src/multitrack.c:15502 src/multitrack.c:15614 src/multitrack.c:18736
-#: src/multitrack.c:18748
+#: src/multitrack.c:15710 src/multitrack.c:15823 src/multitrack.c:19077
+#: src/multitrack.c:19089
 #, c-format
 msgid "track %s"
 msgstr ""
 
-#: src/multitrack.c:15507 src/multitrack.c:15619 src/multitrack.c:18741
+#: src/multitrack.c:15715 src/multitrack.c:15828 src/multitrack.c:19082
 #, c-format
 msgid "tracks %s and %s"
 msgstr ""
 
-#: src/multitrack.c:15513 src/multitrack.c:15625 src/multitrack.c:18751
+#: src/multitrack.c:15721 src/multitrack.c:15834 src/multitrack.c:19091
 msgid "selected tracks"
 msgstr ""
 
-#: src/multitrack.c:15516
+#: src/multitrack.c:15726
 #, c-format
 msgid "Added %s %s to %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15550
+#: src/multitrack.c:15760
 #, c-format
 msgid "Added effect %s to track %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15631
+#: src/multitrack.c:15845
 #, c-format
 msgid "Deleted %s %s from %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15935
+#: src/multitrack.c:16143
 #, c-format
 msgid "rendered %d frames to new clip.\n"
 msgstr ""
 
-#: src/multitrack.c:16025
+#: src/multitrack.c:16230
 msgid "Cleaning up..."
 msgstr ""
 
-#: src/multitrack.c:16712
+#: src/multitrack.c:17003
 msgid "_Pause"
 msgstr "_Pausa"
 
-#: src/multitrack.c:16713
+#: src/multitrack.c:17004
 msgid "Pause (p)"
 msgstr ""
 
-#: src/multitrack.c:16856
+#: src/multitrack.c:17151
 msgid "Press 'm' during playback"
 msgstr ""
 
-#: src/multitrack.c:16857
+#: src/multitrack.c:17152
 msgid "to make a mark on the timeline"
 msgstr ""
 
-#: src/multitrack.c:17154
+#: src/multitrack.c:17498
 #, c-format
 msgid ""
 "Inserted audio %.4f to %.4f from clip %s into backing audio from time %.4f "
 "to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:17414
+#: src/multitrack.c:17759
 #, c-format
 msgid ""
 "Inserted frames %d to %d from clip %s into track %s from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:17998
+#: src/multitrack.c:18332
 #, c-format
 msgid ""
 "Time region %.3f to %.3f\n"
 "selected.\n"
 msgstr ""
 
-#: src/multitrack.c:18002
+#: src/multitrack.c:18336
 msgid ""
 "select one or more tracks\n"
 "to create a region.\n"
 msgstr ""
 
-#: src/multitrack.c:18004
+#: src/multitrack.c:18337
 #, c-format
 msgid "%d video tracks selected.\n"
 msgstr ""
 
-#: src/multitrack.c:18006
+#: src/multitrack.c:18339
 msgid ""
 "Double click on timeline\n"
 "to deselect time region."
 msgstr ""
 
-#: src/multitrack.c:18013
+#: src/multitrack.c:18346
 msgid ""
 "Single click on an effect\n"
 "to select it."
 msgstr ""
 
-#: src/multitrack.c:18014
+#: src/multitrack.c:18347
 msgid ""
 "Double click on an effect\n"
 "to edit it."
 msgstr ""
 
-#: src/multitrack.c:18015
+#: src/multitrack.c:18348
 msgid ""
 "Right click on an effect\n"
 "for context menu.\n"
 msgstr ""
 
-#: src/multitrack.c:18017
+#: src/multitrack.c:18350
 msgid ""
 "Effect order can be changed at\n"
 "FILTER MAPS"
 msgstr ""
 
-#: src/multitrack.c:18024
+#: src/multitrack.c:18357
 msgid ""
 "You can select an effect,\n"
 "then use the INSERT BEFORE"
 msgstr ""
 
-#: src/multitrack.c:18025
+#: src/multitrack.c:18358
 msgid "or INSERT AFTER buttons to move it."
 msgstr ""
 
-#: src/multitrack.c:18307 src/multitrack.c:18320
+#: src/multitrack.c:18639 src/multitrack.c:18652
 msgid "Click on another effect,"
 msgstr ""
 
-#: src/multitrack.c:18308 src/multitrack.c:18321
+#: src/multitrack.c:18640 src/multitrack.c:18653
 msgid ""
 "and the selected one\n"
 "will be inserted"
 msgstr ""
 
-#: src/multitrack.c:18309
+#: src/multitrack.c:18641
 msgid "after it.\n"
 msgstr ""
 
-#: src/multitrack.c:18322
+#: src/multitrack.c:18654
 msgid "before it.\n"
 msgstr ""
 
-#: src/multitrack.c:18551
+#: src/multitrack.c:18889
 #, c-format
 msgid "Removed parameter values for effect %s at time %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:18759
+#: src/multitrack.c:19100
 #, c-format
 msgid "Set parameter values for %s %s on %s at time %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:19251 src/multitrack.c:20873
+#: src/multitrack.c:19630 src/multitrack.c:21195
 msgid "_Autoreload each time"
 msgstr ""
 
-#: src/multitrack.c:19323
+#: src/multitrack.c:19702
 #, fuzzy
 msgid "Saving layout"
 msgstr "_Guardar disseny"
 
-#: src/multitrack.c:19345
+#: src/multitrack.c:19725
 #, c-format
 msgid "Saved layout to %s\n"
 msgstr ""
 
-#: src/multitrack.c:20783
+#: src/multitrack.c:21125
 msgid "clips and frames"
 msgstr ""
 
-#: src/multitrack.c:20787
+#: src/multitrack.c:21128
 msgid "clips"
 msgstr ""
 
-#: src/multitrack.c:20790
+#: src/multitrack.c:21130
 msgid "frames"
 msgstr "fotogrames"
 
-#: src/multitrack.c:20800
+#: src/multitrack.c:21140
 msgid ""
 "\n"
 "Auto reload layout.\n"
 msgstr ""
 
-#: src/multitrack.c:20803
+#: src/multitrack.c:21143
 #, c-format
 msgid ""
 "%s\n"
@@ -9381,100 +9386,100 @@
 "Therefore it could not be loaded properly.\n"
 msgstr ""
 
-#: src/multitrack.c:20920
+#: src/multitrack.c:21284
 msgid "auto backup"
 msgstr ""
 
-#: src/multitrack.c:20923
+#: src/multitrack.c:21287
 #, c-format
 msgid ""
 "\n"
 "Unable to load layout file %s\n"
 msgstr ""
 
-#: src/multitrack.c:20944
+#: src/multitrack.c:21308
 #, c-format
 msgid "Loading layout from %s..."
 msgstr ""
 
-#: src/multitrack.c:20978
+#: src/multitrack.c:21338
 #, c-format
 msgid "Got %d events...processing..."
 msgstr ""
 
-#: src/multitrack.c:20991
+#: src/multitrack.c:21349
 msgid "Checking and rebuilding event list"
 msgstr ""
 
-#: src/multitrack.c:21017
+#: src/multitrack.c:21374
 #, c-format
 msgid "%d errors detected.\n"
 msgstr ""
 
-#: src/multitrack.c:21068
+#: src/multitrack.c:21422
 #, c-format
 msgid "Multitrack fps set to %.3f\n"
 msgstr ""
 
-#: src/multitrack.c:21225
+#: src/multitrack.c:21576
 msgid ""
 "The current layout has changes which have not been saved.\n"
 "Are you sure you wish to wipe it ?\n"
 msgstr ""
 
-#: src/multitrack.c:22047
+#: src/multitrack.c:22385
 msgid "LiVES: Multitrack audio mixer"
 msgstr ""
 
-#: src/multitrack.c:22077
+#: src/multitrack.c:22414
 msgid "_Reset values"
 msgstr ""
 
-#: src/multitrack.c:22081
+#: src/multitrack.c:22418
 msgid "_Close mixer"
 msgstr ""
 
-#: src/multitrack.c:22130
+#: src/multitrack.c:22466
 msgid ""
 "_Invert backing audio\n"
 "and layer volumes"
 msgstr ""
 
-#: src/multitrack.c:22132
+#: src/multitrack.c:22468
 msgid "Adjust backing and layer audio values so that they sum to 1.0"
 msgstr ""
 
-#: src/multitrack.c:22175
+#: src/multitrack.c:22510
 msgid "_Gang layer audio"
 msgstr ""
 
-#: src/multitrack.c:22177
+#: src/multitrack.c:22512
 msgid "Adjust all layer audio values to the same value"
 msgstr ""
 
-#: src/jack.c:104
+#: src/jack.c:102
 msgid "JACK server started\n"
 msgstr ""
 
-#: src/jack.c:1284 src/jack.c:1353
+#: src/jack.c:1265 src/jack.c:1334
 msgid "Unable to connect to JACK server\n"
 msgstr ""
 
-#: src/jack.c:1512
+#: src/jack.c:1491
 msgid "Started jack audio subsystem.\n"
 msgstr ""
 
-#: src/jack.c:1623
+#: src/jack.c:1600
 msgid "Started jack audio reader.\n"
 msgstr ""
 
-#: src/jack.c:1838
+#: src/jack.c:1815
 msgid ""
 "\n"
 "Connection to jack audio was reset.\n"
 msgstr ""
 
-#: src/pulse.c:87
+#: src/pulse.c:88
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -9482,7 +9487,7 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:92
+#: src/pulse.c:94
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -9490,7 +9495,7 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:96
+#: src/pulse.c:99
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -9498,335 +9503,335 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:101
+#: src/pulse.c:104
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
 msgstr ""
 
-#: src/pulse.c:107
+#: src/pulse.c:109
 msgid "LiVES will exit and you can choose another audio player.\n"
 msgstr ""
 
-#: src/pulse.c:1352
+#: src/pulse.c:1335
 msgid ""
 "\n"
 "Connection to pulse audio was reset.\n"
 msgstr ""
 
-#: src/colourspace.c:1100
+#: src/colourspace.c:1092
 msgid "unclamped"
 msgstr ""
 
-#: src/colourspace.c:1101
+#: src/colourspace.c:1093
 msgid "clamped"
 msgstr ""
 
-#: src/omc-learn.c:195
+#: src/omc-learn.c:191
 #, c-format
 msgid "Responding to joystick events from %s\n"
 msgstr ""
 
-#: src/omc-learn.c:289
+#: src/omc-learn.c:279
 msgid "Creating ALSA seq port..."
 msgstr ""
 
-#: src/omc-learn.c:325
+#: src/omc-learn.c:313
 #, c-format
 msgid "Responding to MIDI events from %s\n"
 msgstr ""
 
-#: src/omc-learn.c:568
+#: src/omc-learn.c:554
 msgid "data"
 msgstr "dades"
 
-#: src/omc-learn.c:571
+#: src/omc-learn.c:557
 msgid "velocity"
 msgstr "velocitat"
 
-#: src/omc-learn.c:572
+#: src/omc-learn.c:558
 msgid "note"
 msgstr "nota"
 
-#: src/omc-learn.c:574 src/omc-learn.c:736 src/omc-learn.c:1105
-#: src/omc-learn.c:1591 src/omc-learn.c:1640
+#: src/omc-learn.c:560 src/omc-learn.c:724 src/omc-learn.c:1092
+#: src/omc-learn.c:1581 src/omc-learn.c:1630
 msgid "value"
 msgstr "valor"
 
-#: src/omc-learn.c:576
+#: src/omc-learn.c:562
 msgid "state"
 msgstr "estat"
 
-#: src/omc-learn.c:688
+#: src/omc-learn.c:674
 msgid "variable"
 msgstr "variable"
 
-#: src/omc-learn.c:1001
+#: src/omc-learn.c:989
 msgid "Vars."
 msgstr ""
 
-#: src/omc-learn.c:1054
+#: src/omc-learn.c:1041
 #, c-format
 msgid "MIDI ch %d note on"
 msgstr ""
 
-#: src/omc-learn.c:1058
+#: src/omc-learn.c:1045
 #, c-format
 msgid "MIDI ch %d note off"
 msgstr ""
 
-#: src/omc-learn.c:1062
+#: src/omc-learn.c:1049
 #, c-format
 msgid "MIDI ch %d controller %d"
 msgstr ""
 
-#: src/omc-learn.c:1066
+#: src/omc-learn.c:1053
 #, c-format
 msgid "MIDI ch %d pitch bend"
 msgstr ""
 
-#: src/omc-learn.c:1070
+#: src/omc-learn.c:1057
 #, c-format
 msgid "MIDI ch %d pgm change"
 msgstr ""
 
-#: src/omc-learn.c:1073
+#: src/omc-learn.c:1060
 #, c-format
 msgid "Joystick button %d"
 msgstr ""
 
-#: src/omc-learn.c:1076
+#: src/omc-learn.c:1063
 #, c-format
 msgid "Joystick axis %d"
 msgstr ""
 
-#: src/omc-learn.c:1113
+#: src/omc-learn.c:1100
 msgid "x"
 msgstr "x"
 
-#: src/omc-learn.c:1122
+#: src/omc-learn.c:1109
 msgid "range"
 msgstr "interval"
 
-#: src/omc-learn.c:1143
+#: src/omc-learn.c:1130
 msgid "+ offset1"
 msgstr ""
 
-#: src/omc-learn.c:1161
+#: src/omc-learn.c:1150
 msgid "* scale"
 msgstr ""
 
-#: src/omc-learn.c:1179
+#: src/omc-learn.c:1170
 msgid "+ offset2"
 msgstr ""
 
-#: src/omc-learn.c:1280
+#: src/omc-learn.c:1270
 msgid ""
 "\n"
 "Click OK to delete all entries\n"
 msgstr ""
 
-#: src/omc-learn.c:1318
+#: src/omc-learn.c:1308
 msgid "LiVES: OMC learner"
 msgstr ""
 
-#: src/omc-learn.c:1334
+#: src/omc-learn.c:1324
 msgid "Clear _unmatched"
 msgstr ""
 
-#: src/omc-learn.c:1345
+#: src/omc-learn.c:1335
 msgid "_Delete all"
 msgstr "_Suprimeix-los tots"
 
-#: src/omc-learn.c:1411
+#: src/omc-learn.c:1401
 msgid "Start video playback"
 msgstr ""
 
-#: src/omc-learn.c:1414
+#: src/omc-learn.c:1404
 msgid "Stop video playback"
 msgstr ""
 
-#: src/omc-learn.c:1418
+#: src/omc-learn.c:1408
 msgid "Clip select <clipnum>"
 msgstr ""
 
-#: src/omc-learn.c:1419
+#: src/omc-learn.c:1409
 msgid "Switch foreground clip to the nth valid clip"
 msgstr ""
 
-#: src/omc-learn.c:1423
+#: src/omc-learn.c:1413
 msgid "Play forwards"
 msgstr ""
 
-#: src/omc-learn.c:1424
+#: src/omc-learn.c:1414
 msgid "Play video in a forwards direction"
 msgstr ""
 
-#: src/omc-learn.c:1427
+#: src/omc-learn.c:1417
 msgid "Play backwards"
 msgstr ""
 
-#: src/omc-learn.c:1428
+#: src/omc-learn.c:1418
 msgid "Play video in a backwards direction"
 msgstr ""
 
-#: src/omc-learn.c:1431
+#: src/omc-learn.c:1421
 msgid "Reverse playback direction"
 msgstr ""
 
-#: src/omc-learn.c:1432
+#: src/omc-learn.c:1422
 msgid "Reverse direction of video playback"
 msgstr ""
 
-#: src/omc-learn.c:1435
+#: src/omc-learn.c:1425
 msgid "Play video faster"
 msgstr ""
 
-#: src/omc-learn.c:1436
+#: src/omc-learn.c:1426
 msgid "Play video at a slightly faster rate"
 msgstr ""
 
-#: src/omc-learn.c:1439
+#: src/omc-learn.c:1429
 msgid "Play video slower"
 msgstr ""
 
-#: src/omc-learn.c:1440
+#: src/omc-learn.c:1430
 msgid "Play video at a slightly slower rate"
 msgstr ""
 
-#: src/omc-learn.c:1443
+#: src/omc-learn.c:1433
 msgid "Toggle video freeze"
 msgstr ""
 
-#: src/omc-learn.c:1444
+#: src/omc-learn.c:1434
 msgid "Freeze video, or if already frozen, unfreeze it"
 msgstr ""
 
-#: src/omc-learn.c:1447
+#: src/omc-learn.c:1437
 msgid "Set video framerate to <fps>"
 msgstr ""
 
-#: src/omc-learn.c:1448
+#: src/omc-learn.c:1438
 msgid "Set framerate of foreground clip to <float fps>"
 msgstr ""
 
-#: src/omc-learn.c:1452
+#: src/omc-learn.c:1442
 msgid "Start recording"
 msgstr ""
 
-#: src/omc-learn.c:1455
+#: src/omc-learn.c:1445
 msgid "Stop recording"
 msgstr "Atura l'enregistrament"
 
-#: src/omc-learn.c:1458
+#: src/omc-learn.c:1448
 msgid "Toggle recording state"
 msgstr ""
 
-#: src/omc-learn.c:1461
+#: src/omc-learn.c:1451
 msgid "Swap foreground and background clips"
 msgstr ""
 
-#: src/omc-learn.c:1463
+#: src/omc-learn.c:1453
 msgid "Reset effect keys"
 msgstr ""
 
-#: src/omc-learn.c:1464
+#: src/omc-learn.c:1454
 msgid "Switch all effects off."
 msgstr ""
 
-#: src/omc-learn.c:1467
+#: src/omc-learn.c:1457
 msgid "Enable effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1471
+#: src/omc-learn.c:1461
 msgid "Disable effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1475
+#: src/omc-learn.c:1465
 msgid "Toggle effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1479
+#: src/omc-learn.c:1469
 msgid "Set parameter value <key> <pnum> = <value>"
 msgstr ""
 
-#: src/omc-learn.c:1480
+#: src/omc-learn.c:1470
 msgid "Set <value> of pth (numerical) parameter for effect key <key>."
 msgstr ""
 
-#: src/omc-learn.c:1484
+#: src/omc-learn.c:1474
 msgid "Switch foreground to next clip"
 msgstr ""
 
-#: src/omc-learn.c:1487
+#: src/omc-learn.c:1477
 msgid "Switch foreground to previous clip"
 msgstr ""
 
-#: src/omc-learn.c:1490
+#: src/omc-learn.c:1480
 msgid "Set video framerate to ratio <fps_ratio>"
 msgstr ""
 
-#: src/omc-learn.c:1491
+#: src/omc-learn.c:1481
 msgid "Set framerate ratio of foreground clip to <float fps_ratio>"
 msgstr ""
 
-#: src/omc-learn.c:1495
+#: src/omc-learn.c:1485
 msgid "Retrigger clip <clipnum>"
 msgstr ""
 
-#: src/omc-learn.c:1496
+#: src/omc-learn.c:1486
 msgid ""
 "Switch foreground clip to the nth valid clip, and reset the frame number"
 msgstr ""
 
-#: src/omc-learn.c:1500
+#: src/omc-learn.c:1490
 msgid "Cycle to next mode for effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1504
+#: src/omc-learn.c:1494
 msgid "Cycle to previous mode for effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1508
+#: src/omc-learn.c:1498
 msgid "Set playback plugin parameter value <pnum> = <value>"
 msgstr ""
 
-#: src/omc-learn.c:1509
+#: src/omc-learn.c:1499
 msgid "Set <value> of pth parameter for the playback plugin."
 msgstr ""
 
 #. TRANSLATORS: short form of "clip number"
-#: src/omc-learn.c:1536 src/omc-learn.c:1607
+#: src/omc-learn.c:1526 src/omc-learn.c:1597
 msgid "clipnum"
 msgstr ""
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1545
+#: src/omc-learn.c:1535
 msgid "fps"
 msgstr "fps"
 
 #. TRANSLATORS: as in keyboard key
-#: src/omc-learn.c:1553 src/omc-learn.c:1560 src/omc-learn.c:1567
-#: src/omc-learn.c:1575 src/omc-learn.c:1615 src/omc-learn.c:1623
+#: src/omc-learn.c:1543 src/omc-learn.c:1550 src/omc-learn.c:1557
+#: src/omc-learn.c:1565 src/omc-learn.c:1605 src/omc-learn.c:1613
 msgid "key"
 msgstr "clau"
 
 #. TRANSLATORS: short form of "parameter number"
-#: src/omc-learn.c:1583 src/omc-learn.c:1632
+#: src/omc-learn.c:1573 src/omc-learn.c:1622
 msgid "pnum"
 msgstr "pnum"
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1599
+#: src/omc-learn.c:1589
 msgid "fps_ratio"
 msgstr "fps_ratio"
 
-#: src/omc-learn.c:2443
+#: src/omc-learn.c:2417
 #, c-format
 msgid "Saving device mapping to file %s..."
 msgstr ""
 
-#: src/omc-learn.c:2527
+#: src/omc-learn.c:2498
 #, c-format
 msgid ""
 "\n"
@@ -9835,7 +9840,7 @@
 "%s\n"
 msgstr ""
 
-#: src/omc-learn.c:2534
+#: src/omc-learn.c:2505
 #, c-format
 msgid ""
 "\n"
@@ -9844,12 +9849,12 @@
 "%s\n"
 msgstr ""
 
-#: src/omc-learn.c:2571
+#: src/omc-learn.c:2541
 #, c-format
 msgid "Loading device mapping from file %s..."
 msgstr ""
 
-#: src/omc-learn.c:2576
+#: src/omc-learn.c:2544
 #, c-format
 msgid ""
 "\n"
@@ -9859,12 +9864,12 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/videodev.c:547
+#: src/videodev.c:539
 #, c-format
 msgid "Unable to open device %s\n"
 msgstr ""
 
-#: src/videodev.c:564
+#: src/videodev.c:554
 #, c-format
 msgid "Opened device %s\n"
 msgstr ""
@@ -10678,6 +10683,10 @@
 #~ msgid "tunnel"
 #~ msgstr "tunel"
 
+#, fuzzy
+#~ msgid "LiVES audio error."
+#~ msgstr "LiVES: - Insereix"
+
 #~ msgid "cdda2wav is required for this function."
 #~ msgstr "És necessari cdda2wav per aquesta funció"
 
@@ -10690,6 +10699,9 @@
 #~ msgid "$error"
 #~ msgstr "Falla"
 
+#~ msgid "Pause"
+#~ msgstr "Fes una pausa"
+
 #~ msgid "                                                            "
 #~ msgstr "                                                            "

LiVES-2.2.8.tar.bz2/po/cs.po -> LiVES-2.4.1.tar.bz2/po/cs.po Changed

@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: LiVEScz\n"
 "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n"
-"POT-Creation-Date: 2015-02-08 17:18-0300\n"
+"POT-Creation-Date: 2015-08-09 14:52-0300\n"
 "PO-Revision-Date: 2013-03-14 12:31+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: <martin@svobodicz.com, ales@mur.at>\n"
@@ -20,8 +20,7 @@
 "X-Poedit-Country: CZECH REPUBLIC\n"
 "X-Poedit-Language: Czech\n"
 
-#. TRANSLATORS: do not translate this message
-#: src/main.c:118
+#: src/main.c:128
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -30,22 +29,22 @@
 "http://lives.sourceforge.net/TRANS-README.txt"
 msgstr ""
 
-#: src/main.c:134
+#: src/main.c:153
 #, c-format
 msgid "%s Warning: %s\n"
 msgstr ""
 
-#: src/main.c:138
+#: src/main.c:157
 #, c-format
 msgid "%s Critical error: %s\n"
 msgstr ""
 
-#: src/main.c:139
+#: src/main.c:158
 #, c-format
 msgid "%s Fatal error: %s\n"
 msgstr ""
 
-#: src/main.c:176
+#: src/main.c:198
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -59,7 +58,7 @@
 "group_id=64341&atid=507139\n"
 "Dzięki. Odzyskiwanie powinno być możliwe po uruchomieniu LiVES.\n"
 
-#: src/main.c:177
+#: src/main.c:199
 msgid ""
 "\n"
 "\n"
@@ -71,7 +70,7 @@
 "Przy zgłaszaniu awarii, należy podać szczegółowe informacje na temat systemu "
 "operacyjnego, dystrybucję i wersję LiVES ("
 
-#: src/main.c:180
+#: src/main.c:203
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -79,91 +78,91 @@
 "oraz wszelkie informacje przedstawione poniżej:\n"
 "\n"
 
-#: src/main.c:184
+#: src/main.c:206
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
 "\n"
 msgstr ""
 
-#: src/main.c:192
+#: src/main.c:216
 msgid "Preserving set.\n"
 msgstr "Zachování nastavení.\n"
 
-#: src/main.c:636
+#: src/main.c:691
 msgid "Resizing"
 msgstr "Měním velikost"
 
-#: src/main.c:643
+#: src/main.c:698
 msgid "_Resize All Frames"
 msgstr "Změnit velikost všech _snímků"
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:895
+#: src/main.c:948
 msgid "Any"
 msgstr "Libovolný"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:897
+#: src/main.c:950
 msgid "None"
 msgstr "Žádný"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:899
+#: src/main.c:952
 msgid "recommended"
 msgstr "doporučeno"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:901
+#: src/main.c:954
 msgid "disabled !"
 msgstr "zakázáno!"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:903
+#: src/main.c:956
 msgid "**The current layout**"
 msgstr "**Bieżący układ**"
 
 #. TRANSLATORS: adjective for "Built in" type effects
-#: src/main.c:905
+#: src/main.c:958
 msgid "Builtin"
 msgstr "Vestavěno"
 
 #. TRANSLATORS: adjective for "Custom" type effects
-#: src/main.c:907
+#: src/main.c:960
 msgid "Custom"
 msgstr "Vlastní"
 
 #. TRANSLATORS: adjective for "Test" type effects
-#: src/main.c:909
+#: src/main.c:962
 msgid "Test"
 msgstr "Test"
 
-#: src/main.c:1054
+#: src/main.c:1107
 msgid "Foreground"
 msgstr ""
 
-#: src/main.c:1055
+#: src/main.c:1108
 #, fuzzy
 msgid "Background"
 msgstr "_Prázdné pozadí"
 
-#: src/main.c:1566
+#: src/main.c:1624
 msgid "Loading realtime effect plugins..."
 msgstr "Načítám pluginy pro efekty v reálném času..."
 
-#: src/main.c:1631
+#: src/main.c:1690
 msgid "Starting jack audio server..."
 msgstr "Spouštím zvukový server JACK..."
 
-#: src/main.c:1633
+#: src/main.c:1692
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1634
+#: src/main.c:1693
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1663
+#: src/main.c:1723
 #, c-format
 msgid ""
 "\n"
@@ -175,114 +174,114 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1697
+#: src/main.c:1758
 msgid "Starting pulse audio server..."
 msgstr ""
 
-#: src/main.c:1765
+#: src/main.c:1825
 msgid "Checking optional dependencies:"
 msgstr "Kontrola dodatečných závislostí:"
 
-#: src/main.c:1766
+#: src/main.c:1826
 msgid "mplayer...detected..."
 msgstr "mplayer... nalezen..."
 
-#: src/main.c:1767
+#: src/main.c:1827
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer... NENALEZEN..."
 
-#: src/main.c:1768
+#: src/main.c:1828
 #, fuzzy
 msgid "mplayer2...detected..."
 msgstr "mplayer... nalezen..."
 
-#: src/main.c:1769
+#: src/main.c:1829
 #, fuzzy
 msgid "mplayer2...NOT DETECTED..."
 msgstr "mplayer... NENALEZEN..."
 
-#: src/main.c:1770
+#: src/main.c:1830
 msgid "convert...detected..."
 msgstr "convert... nalezen..."
 
-#: src/main.c:1771
+#: src/main.c:1831
 msgid "convert...NOT DETECTED..."
 msgstr "convert... NENALEZEN..."
 
-#: src/main.c:1772
+#: src/main.c:1832
 msgid "composite...detected..."
 msgstr "composite... nalezen..."
 
-#: src/main.c:1773
+#: src/main.c:1833
 msgid "composite...NOT DETECTED..."
 msgstr "composite... NENALEZEN..."
 
-#: src/main.c:1774
+#: src/main.c:1834
 msgid "sox...detected\n"
 msgstr "sox... nalezen\n"
 
-#: src/main.c:1775
+#: src/main.c:1835
 msgid "sox...NOT DETECTED\n"
 msgstr "sox... NENALEZEN\n"
 
-#: src/main.c:1776
+#: src/main.c:1836
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav... nalezen..."
 
-#: src/main.c:1777
+#: src/main.c:1837
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav... NENALEZEN..."
 
-#: src/main.c:1778
+#: src/main.c:1838
 msgid "jackd...detected..."
 msgstr "jackd... nalezen..."
 
-#: src/main.c:1779
+#: src/main.c:1839
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd... NENALEZEN..."
 
-#: src/main.c:1780
+#: src/main.c:1840
 msgid "pulse audio...detected..."
 msgstr "pulse audio...wykryto..."
 
-#: src/main.c:1781
+#: src/main.c:1841
 msgid "pulse audio...NOT DETECTED..."
 msgstr "pulse audio...NIE WYKRYTO..."
 
-#: src/main.c:1782
+#: src/main.c:1842
 msgid "python...detected..."
 msgstr "python... nalezen..."
 
-#: src/main.c:1783
+#: src/main.c:1843
 msgid "python...NOT DETECTED..."
 msgstr "python... NENALEZEN..."
 
-#: src/main.c:1784
+#: src/main.c:1844
 msgid "dvgrab...detected..."
 msgstr "dvgrab... nalezen..."
 
-#: src/main.c:1785
+#: src/main.c:1845
 msgid "dvgrab...NOT DETECTED..."
 msgstr "dvgrab... NENALEZEN..."
 
-#: src/main.c:1786
+#: src/main.c:1846
 msgid "xwininfo...detected..."
 msgstr "xwininfo... nalezeno..."
 
-#: src/main.c:1787
+#: src/main.c:1847
 msgid "xwininfo...NOT DETECTED..."
 msgstr "xwininfo... NENALEZENO..."
 
-#: src/main.c:1793
+#: src/main.c:1853
 #, c-format
 msgid "Windows version %04X"
 msgstr ""
 
-#: src/main.c:1795
+#: src/main.c:1855
 msgid "UNKNOWN - please patch me !"
 msgstr ""
 
-#: src/main.c:1799
+#: src/main.c:1859
 #, c-format
 msgid ""
 "\n"
@@ -293,63 +292,63 @@
 "\n"
 "Správcem oken je \"%s\"; "
 
-#: src/main.c:1802
+#: src/main.c:1862
 #, c-format
 msgid "number of monitors detected: %d\n"
 msgstr "počet nalezených monitorů: %d\n"
 
-#: src/main.c:1805
+#: src/main.c:1865
 #, c-format
 msgid "Number of CPUs detected: %d "
 msgstr ""
 
-#: src/main.c:1808 src/multitrack.c:4902
+#: src/main.c:1868 src/multitrack.c:5068
 msgid "little endian"
 msgstr "malý endian"
 
-#: src/main.c:1809 src/multitrack.c:4901
+#: src/main.c:1869 src/multitrack.c:5067
 msgid "big endian"
 msgstr "velký endian"
 
-#: src/main.c:1810
+#: src/main.c:1870
 #, c-format
 msgid "(%d bits, %s)\n"
 msgstr ""
 
-#: src/main.c:1814
+#: src/main.c:1874
 msgid "GUI type is: "
 msgstr ""
 
-#: src/main.c:1818
+#: src/main.c:1878
 #, c-format
 msgid "GTK+ version %d.%d.%d (compiled with %d.%d.%d)"
 msgstr ""
 
-#: src/main.c:1840
+#: src/main.c:1900
 msgid ", with cairo support"
 msgstr ""
 
-#: src/main.c:1847
+#: src/main.c:1907
 #, c-format
 msgid "Temp directory is %s\n"
 msgstr "Složka pro dočasné soubory je %s\n"
 
-#: src/main.c:1851
+#: src/main.c:1911
 msgid ""
 "WARNING - this version of LiVES was compiled without either\n"
 "jack or pulse audio support.\n"
 "Many audio features will be unavailable.\n"
 msgstr ""
 
-#: src/main.c:1854
+#: src/main.c:1914
 msgid "Compiled with jack support, good !\n"
 msgstr "Zkompilováno s podporou Jacku, dobrá práce!\n"
 
-#: src/main.c:1857
+#: src/main.c:1917
 msgid "Compiled with pulse audio support, wonderful !\n"
 msgstr "Kompilován s podporou pulse audio, skvělé !\n"
 
-#: src/main.c:1861
+#: src/main.c:1921
 #, c-format
 msgid ""
 "Welcome to LiVES version %s.\n"
@@ -358,7 +357,7 @@
 "Vítejte v LiVES verze %s.\n"
 "\n"
 
-#: src/main.c:2306
+#: src/main.c:2380
 #, c-format
 msgid ""
 "\n"
@@ -367,85 +366,90 @@
 "\n"
 "Startovací syntaxe je: %s [opts] [filename [start_time] [frames]]\n"
 
-#: src/main.c:2307
+#: src/main.c:2381
 msgid "Where: filename is the name of a media file or backup file.\n"
 msgstr "Kde: název souboru je název media souboru nebo záložního souboru.\n"
 
-#: src/main.c:2308
+#: src/main.c:2382
 msgid "start_time : filename start time in seconds\n"
 msgstr "počáteční _čas : čas do spuštění souboru ve vteřinách\n"
 
-#: src/main.c:2309
+#: src/main.c:2383
 msgid "frames : maximum number of frames to open\n"
 msgstr "snímků : maximální počet snímků, které lze otevřít\n"
 
-#: src/main.c:2311
+#: src/main.c:2385
 msgid "opts can be:\n"
 msgstr "opts může být:\n"
 
-#: src/main.c:2312
+#: src/main.c:2386
 msgid "-help            : show this help text and exit\n"
 msgstr "-help            : zobrazit tuto nápovědu a ukončit\n"
 
-#: src/main.c:2313
+#: src/main.c:2387
 msgid "-tmpdir <tempdir>: use alternate working directory (e.g /var/ramdisk)\n"
 msgstr ""
 
-#: src/main.c:2314
+#: src/main.c:2388
 msgid "-set <setname>   : autoload clip set setname\n"
 msgstr "-set <setname>   : automaticky otevřít sestavu klipu\n"
 
-#: src/main.c:2315
+#: src/main.c:2389
 msgid "-noset           : do not load any set on startup\n"
 msgstr "-noset           : při spuštění nenahrávat sestavu\n"
 
-#: src/main.c:2316
+#: src/main.c:2390
 msgid "-norecover       : force no-loading of crash recovery\n"
 msgstr "-norecover       : nenahrávat havarijní zálohu\n"
 
-#: src/main.c:2317
+#: src/main.c:2391
 msgid "-recover         : force loading of crash recovery\n"
 msgstr "-recover         : nahrát havarijní zálohu\n"
 
-#: src/main.c:2318
-msgid "-nothreaddialog  : doe nothing - retained for backwards compatibility\n"
+#: src/main.c:2392
+msgid ""
+"-nothreaddialog  : does nothing - retained for backwards compatibility\n"
 msgstr ""
 
-#: src/main.c:2319
+#: src/main.c:2393
 msgid "-nogui           : do not show the gui\n"
 msgstr "-nogui           : nezobrazovat GUI\n"
 
-#: src/main.c:2320
+#: src/main.c:2394
 msgid "-nosplash        : do not show the splash window\n"
 msgstr ""
 
-#: src/main.c:2321
+#: src/main.c:2395
 msgid "-noplaywin       : do not show the play window\n"
 msgstr ""
 
-#: src/main.c:2322
+#: src/main.c:2396
+msgid "-noninteractive  : disable menu interactivity\n"
+msgstr ""
+
+#: src/main.c:2397
 msgid "-startup-ce      : start in clip editor mode\n"
 msgstr ""
 
-#: src/main.c:2323
+#: src/main.c:2398
 msgid "-startup-mt      : start in multitrack mode\n"
 msgstr ""
 
-#: src/main.c:2324
+#: src/main.c:2399
 msgid ""
 "-fxmodesmax <n>  : allow <n> modes per effect key (minimum is 1, default is "
 "8)\n"
 msgstr ""
 
-#: src/main.c:2326
+#: src/main.c:2401
 msgid "-oscstart <port> : start OSC listener on UDP port <port>\n"
 msgstr "-oscstart <port> : spustit OSC naslouchač na UDP portu <port>\n"
 
-#: src/main.c:2327
+#: src/main.c:2402
 msgid "-nooscstart      : do not start OSC listener\n"
 msgstr "-nooscstart      : nespouštět OSC naslouchač\n"
 
-#: src/main.c:2329
+#: src/main.c:2404
 #, fuzzy
 msgid ""
 "-aplayer <ap>    : start with selected audio player. <ap> can be mplayer, "
@@ -455,44 +459,44 @@
 "mplayer"
 
 #. TRANSLATORS: pulse (audio)
-#: src/main.c:2332
+#: src/main.c:2407
 msgid ", pulse"
 msgstr ", pulse"
 
-#: src/main.c:2335
+#: src/main.c:2410
 msgid ", sox or jack\n"
 msgstr ", sox, nebo jack\n"
 
-#: src/main.c:2336
+#: src/main.c:2412
 msgid ""
 "-jackopts <opts>    : opts is a bitmap of jack startup options [1 = jack "
 "transport client, 2 = jack transport master, 4 = start jack transport "
 "server, 8 = pause audio when video paused, 16 = start jack audio server] \n"
 msgstr ""
 
-#: src/main.c:2338
+#: src/main.c:2414
 msgid " or sox\n"
 msgstr " lub sox\n"
 
-#: src/main.c:2340
+#: src/main.c:2416
 msgid "-devicemap <mapname>          : autoload devicemap\n"
 msgstr "-devicemap <nazwa mapy> : automatycznie Pokaż urządzenie ładunkowe\n"
 
-#: src/main.c:2341
+#: src/main.c:2418
 msgid ""
 "-vppdefaults <file>          : load video playback plugin defaults from "
 "<file> (Note: only sets the settings, not the plugin type)\n"
 msgstr ""
 
-#: src/main.c:2342
+#: src/main.c:2419
 msgid "-debug            : try to debug crashes (requires 'gdb' installed)\n"
 msgstr "-debug : próby debugowania awarii (wymaga 'gdb' zainstalowane)\n"
 
-#: src/main.c:2373 src/gui.c:1128
+#: src/main.c:2449 src/gui.c:1127
 msgid "Starting GUI..."
 msgstr "Startuji grafické rozhraní..."
 
-#: src/main.c:2396
+#: src/main.c:2475
 #, c-format
 msgid ""
 "\n"
@@ -503,7 +507,7 @@
 "(Maybe you need to change the value of <prefix_dir> in your %s file)\n"
 msgstr ""
 
-#: src/main.c:2410
+#: src/main.c:2492
 #, c-format
 msgid ""
 "\n"
@@ -511,7 +515,7 @@
 "Please make sure you have write access to %s and try again.\n"
 msgstr ""
 
-#: src/main.c:2415
+#: src/main.c:2498
 msgid ""
 "\n"
 "`smogrify` must be in your path, and be executable\n"
@@ -525,7 +529,7 @@
 "Prosím přečtěte si ještě jednou README soubor, který byl dodán s instalačním "
 "balíkem než spustíte LiVES.\n"
 
-#: src/main.c:2421
+#: src/main.c:2504
 #, c-format
 msgid ""
 "\n"
@@ -535,7 +539,7 @@
 "Please check the file permissions for this file and try again.\n"
 msgstr ""
 
-#: src/main.c:2428
+#: src/main.c:2512
 #, c-format
 msgid ""
 "\n"
@@ -546,7 +550,7 @@
 "and try again.\n"
 msgstr ""
 
-#: src/main.c:2438
+#: src/main.c:2522
 #, c-format
 msgid ""
 "Please check the <tempdir> setting in \n"
@@ -554,7 +558,7 @@
 "and try again.\n"
 msgstr ""
 
-#: src/main.c:2445
+#: src/main.c:2528
 #, c-format
 msgid ""
 "\n"
@@ -564,7 +568,7 @@
 "%s"
 msgstr ""
 
-#: src/main.c:2453
+#: src/main.c:2536
 msgid ""
 "\n"
 "An incorrect version of smogrify was found in your path.\n"
@@ -581,7 +585,7 @@
 "instalačním balíkem než spustíte LiVES.\n"
 "Díky.\n"
 
-#: src/main.c:2458
+#: src/main.c:2541
 #, fuzzy
 msgid ""
 "\n"
@@ -592,7 +596,7 @@
 "LiVES pro provoz momentálně vyžaduje 'mplayer', nebo 'sox'. Nainstalujte "
 "jeden z nich a zkuste to znovu.\n"
 
-#: src/main.c:2462
+#: src/main.c:2546
 #, fuzzy
 msgid ""
 "\n"
@@ -603,7 +607,7 @@
 "LiVES pro provoz momentálně vyžaduje 'mplayer', nebo 'sox'. Nainstalujte "
 "jeden z nich a zkuste to znovu.\n"
 
-#: src/main.c:2472
+#: src/main.c:2556
 #, fuzzy
 msgid ""
 "\n"
@@ -614,7 +618,7 @@
 "LiVES nebyl schopen najít 'mplayer'. Instalací 'mplayer' získáte plně "
 "funkční LiVES.\n"
 
-#: src/main.c:2475
+#: src/main.c:2561
 msgid ""
 "\n"
 "LiVES was unable to locate 'convert'. You should install convert and image-"
@@ -624,7 +628,7 @@
 "LiVES nebyl schopen najít 'convert'. Chcete-li využívat renderovacích "
 "efektů, měli byste nainstalovat convert a image-magick.\n"
 
-#: src/main.c:2478
+#: src/main.c:2566
 msgid ""
 "\n"
 "LiVES was unable to locate 'composite'. You should install composite and "
@@ -634,7 +638,7 @@
 "LiVES nebyl schopen najít 'composite'. Pakliže chcete využívat funkci "
 "slučování, měli byste nainstalovat composite a image-magick.\n"
 
-#: src/main.c:2481
+#: src/main.c:2570
 msgid ""
 "\n"
 "LiVES was unable to locate 'sox'. Some audio features may not work. You "
@@ -644,7 +648,7 @@
 "LiVES nemohlo nalézt 'sox'. Některé zvukové funkce nejspíše nebudou "
 "fungovat. Měli byste nainstalovat 'sox'.\n"
 
-#: src/main.c:2484
+#: src/main.c:2575
 #, c-format
 msgid ""
 "\n"
@@ -655,60 +659,60 @@
 "You may need to change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/main.c:2611
+#: src/main.c:2707
 #, c-format
 msgid "Autoloading set %s..."
 msgstr "Automaticky načítám sadu %s..."
 
 #. TRANSLATORS: localised name may be used here
-#: src/main.c:2781 src/interface.c:738
+#: src/main.c:2902
 msgid "LiVES"
 msgstr ""
 
-#: src/main.c:2948
+#: src/main.c:3066
 #, c-format
 msgid "Invalid audio player %s\n"
 msgstr "Neplatný zvukový přehrávač %s\n"
 
-#: src/main.c:3077
+#: src/main.c:3214
 #, c-format
 msgid "LiVES-%s: <Untitled%d> %dx%d : %d frames %d bpp %.3f fps"
 msgstr ""
 "LiVES-%s: <Bezejmenný%d> %dx%d : %d snímků, %d bitů na pixel, %.3f snímků/s"
 
-#: src/main.c:3082
+#: src/main.c:3219
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : ??? frames ??? bpp %.3f fps"
 msgstr "LiVES-%s: <%s> %dx%d : ??? snímků ???, bitů na pixel, %.3f snímků/s"
 
-#: src/main.c:3086
+#: src/main.c:3222
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : %d frames %d bpp %.3f fps"
 msgstr "LiVES-%s: <%s> %dx%d : %d snímků, %d bitů na pixel, %.3f snímků/s"
 
-#: src/main.c:3094
+#: src/main.c:3229
 #, c-format
 msgid "LiVES-%s: <No File>"
 msgstr "LiVES-%s: <žádný soubor>"
 
 #. TRANSLATORS: rec(ord)
-#: src/main.c:5085
+#: src/main.c:5201
 #, c-format
 msgid "rec %9d/%d"
 msgstr ""
 
 #. TRANSLATORS: out of memory (rec(ord))
-#: src/main.c:5091
+#: src/main.c:5206
 #, c-format
 msgid "!rec %9d/%d"
 msgstr ""
 
-#: src/main.c:5398 src/main.c:5399 src/gui.c:2110 src/gui.c:3220
-#: src/saveplay.c:2336
+#: src/main.c:5500 src/main.c:5501 src/gui.c:2108 src/gui.c:3331
+#: src/saveplay.c:2315
 msgid "Play"
 msgstr "Přehrát"
 
-#: src/main.c:6128
+#: src/main.c:6216
 msgid ""
 "LiVES was unable to capture this image\n"
 "\n"
@@ -716,35 +720,35 @@
 "LiVES nebyl schopen zachytit tento obrázek\n"
 "\n"
 
-#: src/main.c:6250
+#: src/main.c:6345
 #, c-format
 msgid "Closed file %s\n"
 msgstr "Zavřený soubor %s\n"
 
-#: src/main.c:6452 src/gui.c:648 src/utils.c:4312 src/utils.c:4344
-#: src/saveplay.c:3550 src/multitrack.c:4510 src/multitrack.c:6268
+#: src/main.c:6542 src/gui.c:647 src/utils.c:4256 src/utils.c:4286
+#: src/saveplay.c:3500 src/multitrack.c:4678 src/multitrack.c:6447
 msgid "_Undo"
 msgstr "_Zpět"
 
-#: src/main.c:6453 src/gui.c:666 src/utils.c:4313 src/utils.c:4345
-#: src/saveplay.c:3551 src/multitrack.c:4531 src/multitrack.c:6293
+#: src/main.c:6543 src/gui.c:665 src/utils.c:4257 src/utils.c:4287
+#: src/saveplay.c:3501 src/multitrack.c:4698 src/multitrack.c:6472
 msgid "_Redo"
 msgstr "_Znovu"
 
-#: src/main.c:6493 src/interface.c:470 src/gui.c:2326 src/preferences.c:2357
-#: src/resample.c:1516
+#: src/main.c:6583 src/interface.c:457 src/gui.c:2324 src/preferences.c:2391
+#: src/resample.c:1488
 msgid "Video"
 msgstr "Video"
 
-#: src/main.c:6494 src/interface.c:483 src/gui.c:2351
+#: src/main.c:6584 src/interface.c:470 src/gui.c:2348
 msgid "Left Audio"
 msgstr "Levý zvuk"
 
-#: src/main.c:6495 src/gui.c:2375
+#: src/main.c:6585 src/gui.c:2371
 msgid "Right Audio"
 msgstr "Pravý zvuk"
 
-#: src/main.c:6540
+#: src/main.c:6630
 #, fuzzy
 msgid ""
 "\n"
@@ -759,11 +763,11 @@
 "přepínat klipy při otevírání.\n"
 "Upravte nastavení přehrávání v Nastavení a zkuste to znova.\n"
 
-#: src/main.c:7051 src/plugins.c:1502
+#: src/main.c:7134 src/plugins.c:1468
 msgid "LiVES: - Play Window"
 msgstr "LiVES: - Přehrávací okno"
 
-#: src/startup.c:25
+#: src/startup.c:24
 #, c-format
 msgid ""
 "A directory named\n"
@@ -773,7 +777,7 @@
 "(Free space = %s)\n"
 msgstr ""
 
-#: src/startup.c:32
+#: src/startup.c:29
 #, c-format
 msgid ""
 "A directory named\n"
@@ -783,7 +787,7 @@
 "Please select another location.\n"
 msgstr ""
 
-#: src/startup.c:49
+#: src/startup.c:46
 #, c-format
 msgid ""
 "\n"
@@ -794,7 +798,7 @@
 "(Free space = %s)"
 msgstr ""
 
-#: src/startup.c:54
+#: src/startup.c:50
 #, c-format
 msgid ""
 "\n"
@@ -803,54 +807,54 @@
 "Please try again and choose a different location.\n"
 msgstr ""
 
-#: src/startup.c:96
+#: src/startup.c:92
 msgid "Directory name is too long !"
 msgstr ""
 
-#: src/startup.c:223
+#: src/startup.c:216
 msgid ""
 "LiVES FAILED TO START YOUR SELECTED AUDIO PLAYER !\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:230
+#: src/startup.c:222
 msgid ""
 "Before starting LiVES, you need to choose an audio player.\n"
 "\n"
 "PULSE AUDIO is recommended for most users"
 msgstr ""
 
-#: src/startup.c:233
+#: src/startup.c:225
 msgid ""
 ", but this version of LiVES was not compiled with pulse audio support.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:236
+#: src/startup.c:229
 msgid ""
 ", but you do not have pulse audio installed on your system.\n"
 " You are advised to install pulse audio first before running LiVES.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:241
+#: src/startup.c:233
 msgid "JACK audio is recommended for pro users"
 msgstr ""
 
-#: src/startup.c:244
+#: src/startup.c:236
 msgid ""
 ", but this version of LiVES was not compiled with jack audio support.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:247
+#: src/startup.c:239
 msgid ""
 ", but you do not have jackd installed. You may wish to install jackd first "
 "before running LiVES.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:250
+#: src/startup.c:242
 msgid ""
 ", but may prevent LiVES from starting on some systems.\n"
 "If LiVES will not start with jack, you can restart and try with another "
@@ -858,11 +862,11 @@
 "\n"
 msgstr ""
 
-#: src/startup.c:254
+#: src/startup.c:246
 msgid "SOX may be used if neither of the preceding players work, "
 msgstr ""
 
-#: src/startup.c:257
+#: src/startup.c:249
 msgid ""
 "but some audio features will be disabled.\n"
 "\n"
@@ -870,150 +874,150 @@
 "ale některé zvukové funkce, bude zakázán.\n"
 "\n"
 
-#: src/startup.c:260
+#: src/startup.c:251
 msgid ""
 "but you do not have sox installed.\n"
 "You are advised to install it before running LiVES.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:264
+#: src/startup.c:255
 msgid ""
 "The MPLAYER/MPLAYER2 audio player is only recommended for testing purposes.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:281
+#: src/startup.c:271
 msgid "LiVES: - Choose an audio player"
 msgstr "LiVES: - Zvolte zvukový přehrávač"
 
-#: src/startup.c:298
+#: src/startup.c:288
 msgid "Use _pulse audio player"
 msgstr "Použijte _pulse audio přehrávač"
 
-#: src/startup.c:320
+#: src/startup.c:310
 msgid "Use _jack audio player"
 msgstr "Použít zvukový přehrávač _jack"
 
-#: src/startup.c:340
+#: src/startup.c:330
 msgid "Use _sox audio player"
 msgstr "Použijte _sox audio přehrávač"
 
-#: src/startup.c:361
+#: src/startup.c:351
 msgid "Use _mplayer audio player"
 msgstr "Použijte _mplayer audio přehrávač"
 
-#: src/startup.c:381
+#: src/startup.c:371
 #, fuzzy
 msgid "Use _mplayer2 audio player"
 msgstr "Použijte _mplayer audio přehrávač"
 
-#: src/startup.c:405 src/startup.c:580 src/interface.c:1506
+#: src/startup.c:395 src/startup.c:569 src/interface.c:1398
 msgid "_Next"
 msgstr ""
 
-#: src/startup.c:445
+#: src/startup.c:435
 msgid "Skipped"
 msgstr ""
 
-#: src/startup.c:460
+#: src/startup.c:450
 msgid "Passed"
 msgstr ""
 
-#: src/startup.c:493
+#: src/startup.c:483
 msgid "Failed"
 msgstr ""
 
-#: src/startup.c:552
+#: src/startup.c:542
 msgid "LiVES: - Testing Configuration"
 msgstr ""
 
-#: src/startup.c:555
+#: src/startup.c:544
 msgid "LiVES: - Troubleshoot"
 msgstr ""
 
-#: src/startup.c:568
+#: src/startup.c:557
 msgid "LiVES will now run some basic configuration tests\n"
 msgstr ""
 
-#: src/startup.c:603
+#: src/startup.c:591
 msgid "Checking for \"sox\" presence"
 msgstr ""
 
-#: src/startup.c:607
+#: src/startup.c:595
 msgid ""
 "You should install sox to be able to use all the audio features in LiVES"
 msgstr ""
 
-#: src/startup.c:615
+#: src/startup.c:602
 msgid "Checking if sox can convert audio"
 msgstr ""
 
-#: src/startup.c:638
+#: src/startup.c:625
 msgid "Unable to allocate 176400 bytes memory."
 msgstr ""
 
-#: src/startup.c:653
+#: src/startup.c:639
 #, c-format
 msgid "Unable to write to: %s"
 msgstr ""
 
-#: src/startup.c:667 src/startup.c:807
+#: src/startup.c:653 src/startup.c:789
 #, c-format
 msgid "Command failed: %s"
 msgstr ""
 
-#: src/startup.c:689
+#: src/startup.c:675
 msgid "You should install sox_fmt_all or similar"
 msgstr ""
 
-#: src/startup.c:717
+#: src/startup.c:703
 msgid "Checking for \"mplayer\" presence"
 msgstr ""
 
-#: src/startup.c:721
+#: src/startup.c:707
 msgid ""
 "You should install mplayer or mplayer2 to be able to use all the decoding "
 "features in LiVES"
 msgstr ""
 
-#: src/startup.c:747
+#: src/startup.c:732
 msgid "Checking if mplayer can convert audio"
 msgstr ""
 
-#: src/startup.c:768
+#: src/startup.c:751
 msgid "You should install mplayer or mplayer2 with pcm/wav support"
 msgstr ""
 
-#: src/startup.c:785
+#: src/startup.c:767
 msgid "Checking if mplayer can decode to png/alpha"
 msgstr ""
 
-#: src/startup.c:828
+#: src/startup.c:810
 msgid "You may wish to upgrade mplayer to a newer version"
 msgstr ""
 
-#: src/startup.c:854
+#: src/startup.c:836
 msgid "Checking if mplayer can decode to jpeg"
 msgstr ""
 
-#: src/startup.c:882
+#: src/startup.c:862
 msgid "You should install mplayer with either png/alpha or jpeg support"
 msgstr ""
 
-#: src/startup.c:883
+#: src/startup.c:863
 msgid "You may wish to add jpeg output support to mplayer"
 msgstr ""
 
-#: src/startup.c:892
+#: src/startup.c:872
 msgid "Checking for \"convert\" presence"
 msgstr ""
 
-#: src/startup.c:896
+#: src/startup.c:876
 msgid "Install imageMagick to be able to use all of the rendered effects"
 msgstr ""
 
-#: src/startup.c:909
+#: src/startup.c:889
 msgid ""
 "\n"
 "\n"
@@ -1021,7 +1025,7 @@
 "Preferences/Decoding.    \n"
 msgstr ""
 
-#: src/startup.c:915
+#: src/startup.c:894
 msgid ""
 "\n"
 "\n"
@@ -1029,49 +1033,49 @@
 "continue    \n"
 msgstr ""
 
-#: src/startup.c:949
+#: src/startup.c:928
 msgid ""
 "\n"
 "\n"
 "Finally, you can choose the default startup interface for LiVES.\n"
 msgstr ""
 
-#: src/startup.c:950
+#: src/startup.c:929
 msgid ""
 "\n"
 "\n"
 "LiVES has two main interfaces and you can start up with either of them.\n"
 msgstr ""
 
-#: src/startup.c:951
+#: src/startup.c:930
 msgid ""
 "\n"
 "\n"
 "The default can always be changed later from Preferences.\n"
 msgstr ""
 
-#: src/startup.c:961
+#: src/startup.c:940
 msgid "LiVES: - Choose the startup interface"
 msgstr ""
 
-#: src/startup.c:972
+#: src/startup.c:951
 msgid "Start in _Clip Edit mode"
 msgstr ""
 
-#: src/startup.c:975
+#: src/startup.c:954
 msgid "This is the best choice for simple editing tasks and for VJs\n"
 msgstr ""
 
-#: src/startup.c:981
+#: src/startup.c:960
 msgid "Start in _Multitrack mode"
 msgstr ""
 
-#: src/startup.c:983
+#: src/startup.c:962
 msgid ""
 "This is a better choice for complex editing tasks involving multiple clips.\n"
 msgstr ""
 
-#: src/startup.c:992
+#: src/startup.c:971
 msgid "_Finish"
 msgstr ""
 
@@ -1088,38 +1092,38 @@
 msgid "Apply _Deinterlace"
 msgstr ""
 
-#: src/interface.c:66
+#: src/interface.c:65
 msgid "If this is set, frames will be deinterlaced as they are imported."
 msgstr ""
 "Je-li zapnuto, ze snímků bude odstraněno prokládání tak, jak jsou "
 "importovány."
 
-#: src/interface.c:113 src/callbacks.c:9623 src/callbacks.c:9646
-#: src/callbacks.c:9647 src/gui.c:3223 src/gui.c:3821 src/saveplay.c:2339
-#: src/saveplay.c:3138 src/dialogs.c:1514 src/dialogs.c:1515
-#: src/dialogs.c:1746 src/dialogs.c:1747 src/framedraw.c:238
-#: src/multitrack.c:8031
+#: src/interface.c:106 src/callbacks.c:9542 src/callbacks.c:9564
+#: src/callbacks.c:9565 src/gui.c:3333 src/gui.c:3946 src/saveplay.c:2317
+#: src/saveplay.c:3097 src/dialogs.c:1575 src/dialogs.c:1576
+#: src/dialogs.c:1804 src/dialogs.c:1805 src/framedraw.c:236
+#: src/multitrack.c:8210
 msgid "Preview"
 msgstr "Náhled"
 
-#: src/interface.c:132
+#: src/interface.c:125
 msgid "Click here to _Preview any selected video, image or audio file"
 msgstr ""
 "Kliknutím zobrazíte _náhled vybraného videa, obrázku, či zvukového souboru"
 
-#: src/interface.c:135
+#: src/interface.c:127
 msgid "Click here to _Preview any selected audio file"
 msgstr "Kliknutím zobrazíte _náhled vybraného zvukového souboru"
 
-#: src/interface.c:138
+#: src/interface.c:129
 msgid "Click here to _Preview the video"
 msgstr "Kliknutím zobrazíte _náhled vybraného videa"
 
-#: src/interface.c:181 src/dialogs.c:2542
+#: src/interface.c:169 src/dialogs.c:2621
 msgid "LiVES: - Processing..."
 msgstr "LiVES: - Zpracovávám..."
 
-#: src/interface.c:217
+#: src/interface.c:205
 msgid ""
 "\n"
 "\n"
@@ -1133,8 +1137,8 @@
 "\n"
 "Nezapomeňte poté vypnout (ctrl-0) efekty!"
 
-#: src/interface.c:222 src/callbacks.c:9373 src/callbacks.c:9420
-#: src/dialogs.c:2570
+#: src/interface.c:210 src/callbacks.c:9283 src/callbacks.c:9332
+#: src/dialogs.c:2649
 msgid ""
 "\n"
 "Please Wait"
@@ -1142,190 +1146,178 @@
 "\n"
 "Čekejte prosím"
 
-#: src/interface.c:242
+#: src/interface.c:230
 msgid "Show Details"
 msgstr ""
 
-#: src/interface.c:254 src/dialogs.c:2584
+#: src/interface.c:242 src/dialogs.c:2663
 msgid "_Enough"
 msgstr "_Dost"
 
-#: src/interface.c:255 src/framedraw.c:278
+#: src/interface.c:243 src/framedraw.c:276
 msgid "_Preview"
 msgstr "_Náhled"
 
-#: src/interface.c:257
+#: src/interface.c:245 src/callbacks.c:9282 src/callbacks.c:9330
 msgid "Paus_e"
 msgstr ""
 
-#: src/interface.c:258 src/callbacks.c:9417
+#: src/interface.c:246 src/callbacks.c:9329
 msgid "Pause/_Enough"
 msgstr ""
 
-#: src/interface.c:285
+#: src/interface.c:273
 msgid "_Cancel"
 msgstr "_Zrušit"
 
-#: src/interface.c:374
+#: src/interface.c:361
 #, c-format
 msgid "LiVES: - %s"
 msgstr ""
 
-#: src/interface.c:376
+#: src/interface.c:363
 msgid "LiVES: - Multitrack details"
 msgstr ""
 
-#: src/interface.c:407
+#: src/interface.c:394
 msgid "Format"
 msgstr "Formátovat"
 
-#: src/interface.c:412
+#: src/interface.c:399
 msgid "Frame size"
 msgstr "Velikost snímku"
 
-#: src/interface.c:417
+#: src/interface.c:404
 msgid "File size"
 msgstr "Velikost souboru"
 
-#: src/interface.c:418
+#: src/interface.c:405
 msgid "Byte size"
 msgstr "Velikost v Bytech"
 
-#: src/interface.c:423 src/interface.c:1891
+#: src/interface.c:410 src/interface.c:1760
 msgid "FPS"
 msgstr "FPS"
 
-#: src/interface.c:428
+#: src/interface.c:415
 msgid "Frames"
 msgstr "Snímků"
 
-#: src/interface.c:429
+#: src/interface.c:416
 msgid "Events"
 msgstr "Události"
 
-#: src/interface.c:434 src/interface.c:500 src/interface.c:542
+#: src/interface.c:421 src/interface.c:486 src/interface.c:528
 msgid "Total time"
 msgstr "Celkovy čas"
 
-#: src/interface.c:486 src/resample.c:1488
+#: src/interface.c:472 src/resample.c:1460
 msgid "Audio"
 msgstr "Zvuk"
 
-#: src/interface.c:511 src/interface.c:553
+#: src/interface.c:497 src/interface.c:539
 msgid "Rate/size"
 msgstr "Pomer(rate)/velikost"
 
-#: src/interface.c:530
+#: src/interface.c:516
 msgid "Right audio"
 msgstr "Pravý zvuk"
 
-#: src/interface.c:622
+#: src/interface.c:607
 msgid "LiVES: - Encoding options"
 msgstr "LiVES: - Nastavení kódování"
 
-#: src/interface.c:636
+#: src/interface.c:621
 msgid "<------------- (Check the box to re_size as suggested)"
 msgstr ""
 
-#: src/interface.c:637
+#: src/interface.c:622
 msgid "<------------- (Check the box to use the _size recommendation)"
 msgstr ""
 
-#: src/interface.c:662
+#: src/interface.c:646
 msgid "Use _letterboxing to maintain aspect ratio (optional)"
 msgstr ""
 
-#: src/interface.c:663
+#: src/interface.c:647
 msgid ""
 "Draw black rectangles either above or to the sides of the image, to prevent "
 "it from stretching."
 msgstr ""
 
-#: src/interface.c:694
+#: src/interface.c:677
 msgid "Keep _my settings"
 msgstr "Uložit _má nastavení"
 
-#: src/interface.c:695
+#: src/interface.c:678
 msgid "Use _recommended settings"
 msgstr "Použít _doporučené nastavení"
 
-#: src/interface.c:775 src/dialogs.c:114
-msgid ""
-"Do _not show this warning any more\n"
-"(can be turned back on from Preferences/Warnings)"
-msgstr ""
-"_Nezobrazovat již toto varování\n"
-"(změnu nastavení provedete v Nastavení > Varování)"
-
-#: src/interface.c:787
-msgid "Show _Details"
-msgstr "Zobrazit _Detaily"
-
-#: src/interface.c:881
+#: src/interface.c:769
 msgid "_Close Window"
 msgstr "_Zavřít okno"
 
-#: src/interface.c:883
+#: src/interface.c:771
 msgid "_Save to file"
 msgstr "_Zapisz do pliku"
 
-#: src/interface.c:928
+#: src/interface.c:816
 msgid "LiVES: - Insert"
 msgstr "LiVES: - Vložit"
 
-#: src/interface.c:945
+#: src/interface.c:833
 msgid "_Number of times to insert"
 msgstr "_Kolikrát vložit"
 
-#: src/interface.c:954
+#: src/interface.c:842
 msgid "_Insert to fit audio"
 msgstr "_Vložit do délky zvuku"
 
-#: src/interface.c:968
+#: src/interface.c:856
 msgid "Insert _before selection"
 msgstr "Vložit _před výběr"
 
-#: src/interface.c:970
+#: src/interface.c:858
 msgid "Insert clipboard before selected frames"
 msgstr "Vložit obsah schránky před vybrané snímky"
 
-#: src/interface.c:986
+#: src/interface.c:875
 msgid "Insert _after selection"
 msgstr "Vložit _za výběr"
 
-#: src/interface.c:988
+#: src/interface.c:877
 msgid "Insert clipboard after selected frames"
 msgstr "Vložit obsah schránky za vybrané snímky"
 
-#: src/interface.c:999
+#: src/interface.c:888
 msgid "Insert _with sound"
 msgstr "Vložit _se zvukem"
 
-#: src/interface.c:1012
+#: src/interface.c:901
 msgid "Insert with_out sound"
 msgstr "Vložit _bez zvuku"
 
-#: src/interface.c:1093
+#: src/interface.c:985
 msgid "LiVES: - Open Selection"
 msgstr "LiVES: - Otevřít výběr"
 
-#: src/interface.c:1111
+#: src/interface.c:1004
 msgid "Selection start time (sec)"
 msgstr ""
 
-#: src/interface.c:1117
+#: src/interface.c:1010
 msgid "Number of frames to open"
 msgstr ""
 
-#: src/interface.c:1193
+#: src/interface.c:1088
 msgid "LiVES: - Open Location"
 msgstr "LiVES: - Otevřít umístění"
 
-#: src/interface.c:1195
+#: src/interface.c:1090
 msgid "LiVES: - Open Youtube Clip"
 msgstr ""
 
-#: src/interface.c:1213
+#: src/interface.c:1109
 msgid ""
 "\n"
 "\n"
@@ -1341,7 +1333,7 @@
 "Dále se ujistěte, zda máte nastavenou šířku pásma v Nastavení > Streamování\n"
 "\n"
 
-#: src/interface.c:1216
+#: src/interface.c:1112
 msgid ""
 "\n"
 "\n"
@@ -1350,62 +1342,63 @@
 "\n"
 msgstr ""
 
-#: src/interface.c:1220
+#: src/interface.c:1116
 msgid ""
 "Enter the URL of the clip below.\n"
 "E.g: http://www.youtube.com/watch?v=WCR6f6WzjP8\n"
 "\n"
 msgstr ""
 
-#: src/interface.c:1231
+#: src/interface.c:1127
 msgid "URL : "
 msgstr "URL : "
 
-#: src/interface.c:1231
+#: src/interface.c:1127
 msgid "Youtube URL : "
 msgstr ""
 
-#: src/interface.c:1235
+#: src/interface.c:1131
 msgid "Do not send bandwidth information"
 msgstr "Neposílat informace o šířce pásma"
 
-#: src/interface.c:1237
+#: src/interface.c:1133
 msgid "Try this setting if you are having problems getting a stream"
 msgstr "Máte-li problém s příjmem, zkuste toto nastavení"
 
-#: src/interface.c:1258
+#: src/interface.c:1155
 msgid "Download to _Directory : "
 msgstr ""
 
-#: src/interface.c:1276
+#: src/interface.c:1173
 msgid "Download _File Name : "
 msgstr ""
 
-#: src/interface.c:1281
+#: src/interface.c:1178
 msgid ".webm"
 msgstr ""
 
-#: src/interface.c:1359
+#: src/interface.c:1256
 msgid "LiVES: - Rename Clip"
 msgstr "LiVES: - Přejmenovat klip"
 
-#: src/interface.c:1362
-msgid "LiVES: - Enter Set Name"
+#: src/interface.c:1258
+#, fuzzy
+msgid "LiVES: - Enter Set Name to Save as"
 msgstr "LiVES: - Zadejte jméno sestavy"
 
-#: src/interface.c:1365
+#: src/interface.c:1260
 msgid "LiVES: - Enter a Set Name to Reload"
 msgstr ""
 
-#: src/interface.c:1368
+#: src/interface.c:1262
 msgid "LiVES: - Choose a Working Directory"
 msgstr ""
 
-#: src/interface.c:1371
+#: src/interface.c:1264
 msgid "LiVES: - Rename Current Track"
 msgstr ""
 
-#: src/interface.c:1391
+#: src/interface.c:1283
 msgid ""
 "You need to enter a name for the current clip set.\n"
 "This will allow you reload the layout with the same clips later.\n"
@@ -1417,7 +1410,7 @@
 "Prosím napište jméno sestavy.\n"
 "LiVES Vám připomene uložení sestavy při ukončení.\n"
 
-#: src/interface.c:1397
+#: src/interface.c:1289
 msgid ""
 "In order to export this project, you must enter a name for this clip set.\n"
 "This will also be used for the project name.\n"
@@ -1426,207 +1419,207 @@
 "projekt.\n"
 "Jméno bude použito jako jméno projektu.\n"
 
-#: src/interface.c:1404
+#: src/interface.c:1296
 msgid ""
 "Welcome to LiVES !\n"
 "This startup wizard will guide you through the\n"
 "initial install so that you can get the most from this application.\n"
 msgstr ""
 
-#: src/interface.c:1408
+#: src/interface.c:1300
 msgid ""
 "\n"
 "First of all you need to choose a working directory for LiVES.\n"
 "This should be a directory with plenty of disk space available.\n"
 msgstr ""
 
-#: src/interface.c:1427
+#: src/interface.c:1317
 msgid "New name "
 msgstr "Nové jméno "
 
-#: src/interface.c:1430
+#: src/interface.c:1319
 msgid "Set name "
 msgstr "Zadat jméno "
 
-#: src/interface.c:1550
+#: src/interface.c:1435
 msgid "Use def_aults"
 msgstr ""
 
-#: src/interface.c:1553 src/interface.c:1840 src/preferences.c:2515
-#: src/preferences.c:2697
+#: src/interface.c:1437 src/interface.c:1709 src/preferences.c:2550
+#: src/preferences.c:2739
 msgid "_Advanced"
 msgstr "_Pokročilé"
 
-#: src/interface.c:1604
+#: src/interface.c:1487
 msgid "LiVES:- Select input device"
 msgstr ""
 
-#: src/interface.c:1622
+#: src/interface.c:1504
 msgid "Select input device:"
 msgstr ""
 
-#: src/interface.c:1686
+#: src/interface.c:1568
 msgid "LiVES:- Load CD Track"
 msgstr "LiVES:- Zavést CD stopu"
 
-#: src/interface.c:1689
+#: src/interface.c:1570
 msgid "LiVES:- Select DVD Title/Chapter"
 msgstr "LiVES:- Zvolit DVD titul/kapitolu"
 
-#: src/interface.c:1692
+#: src/interface.c:1572
 msgid "LiVES:- Select VCD Title"
 msgstr "LiVES:- Zvolit VCD titul"
 
-#: src/interface.c:1695
+#: src/interface.c:1574
 msgid "LiVES:- Change Maximum Visible Tracks"
 msgstr ""
 
-#: src/interface.c:1698
+#: src/interface.c:1576
 msgid "LiVES:- Device details"
 msgstr ""
 
-#: src/interface.c:1721
+#: src/interface.c:1598
 #, c-format
 msgid "Track to load (from %s)"
 msgstr "Zavést stopu (z %s)"
 
-#: src/interface.c:1724
+#: src/interface.c:1600
 msgid "DVD Title"
 msgstr "DVD titul"
 
-#: src/interface.c:1727
+#: src/interface.c:1602
 msgid "VCD Title"
 msgstr "VCD titul"
 
-#: src/interface.c:1730
+#: src/interface.c:1604
 msgid "Maximum number of tracks to display"
 msgstr "Maximální počet stop k zobrazení"
 
-#: src/interface.c:1733
+#: src/interface.c:1606
 msgid "Device:        /dev/video"
 msgstr ""
 
-#: src/interface.c:1736
+#: src/interface.c:1608
 msgid "Device:        fw:"
 msgstr ""
 
-#: src/interface.c:1771
+#: src/interface.c:1641
 msgid "Chapter  "
 msgstr "Kapitola  "
 
-#: src/interface.c:1776
+#: src/interface.c:1645
 msgid "Channel  "
 msgstr ""
 
-#: src/interface.c:1791
+#: src/interface.c:1660
 msgid "Audio ID  "
 msgstr "Audio ID  "
 
-#: src/interface.c:1857
+#: src/interface.c:1726
 msgid "Input number"
 msgstr ""
 
-#: src/interface.c:1865
+#: src/interface.c:1734
 msgid "Use default width, height and FPS"
 msgstr ""
 
-#: src/interface.c:1879
+#: src/interface.c:1748
 msgid "Width"
 msgstr ""
 
-#: src/interface.c:1885
+#: src/interface.c:1754
 msgid "Height"
 msgstr ""
 
-#: src/interface.c:1899
+#: src/interface.c:1768
 msgid "_Driver"
 msgstr ""
 
-#: src/interface.c:1902
+#: src/interface.c:1771
 msgid "_Output format"
 msgstr ""
 
-#: src/interface.c:1998
+#: src/interface.c:1865
 msgid "LiVES:- Fade Audio In"
 msgstr "LiVES: - Postupně zesílit zvuk"
 
-#: src/interface.c:2001
+#: src/interface.c:1867
 msgid "LiVES:- Fade Audio Out"
 msgstr "LiVES: - Postupně ztišit zvuk"
 
-#: src/interface.c:2017
+#: src/interface.c:1883
 msgid "Fade in over  "
 msgstr "Zesílit přes  "
 
-#: src/interface.c:2018
+#: src/interface.c:1884
 msgid "first"
 msgstr "první"
 
-#: src/interface.c:2021
+#: src/interface.c:1886
 msgid "Fade out over  "
 msgstr "Ztišit přes  "
 
-#: src/interface.c:2022
+#: src/interface.c:1887
 msgid "last"
 msgstr "poslední"
 
-#: src/interface.c:2044
+#: src/interface.c:1909
 msgid "seconds."
 msgstr "sekund."
 
-#: src/interface.c:2052 src/saveplay.c:1507
+#: src/interface.c:1917 src/saveplay.c:1484
 msgid "selection"
 msgstr "výběr"
 
-#: src/interface.c:2092
+#: src/interface.c:1956
 msgid "LiVES: - File Comments (optional)"
 msgstr "LiVES: - Komentáře k souborům (volitelné)"
 
-#: src/interface.c:2107
+#: src/interface.c:1971
 msgid "Title/Name : "
 msgstr "Titul/název : "
 
-#: src/interface.c:2114
+#: src/interface.c:1978
 msgid "Author/Artist : "
 msgstr "Autor/umělec : "
 
-#: src/interface.c:2121
+#: src/interface.c:1985
 msgid "Comments : "
 msgstr "Komentáře : "
 
-#: src/interface.c:2151
+#: src/interface.c:2015
 msgid "_Options"
 msgstr ""
 
-#: src/interface.c:2158
+#: src/interface.c:2022
 msgid "Save _subtitles to file"
 msgstr ""
 
-#: src/interface.c:2170
+#: src/interface.c:2033
 msgid "Subtitle file"
 msgstr ""
 
-#: src/interface.c:2172
+#: src/interface.c:2035
 msgid "Browse..."
 msgstr ""
 
-#: src/interface.c:2255
+#: src/interface.c:2132
 msgid "LiVES: - choose a device"
 msgstr ""
 
-#: src/interface.c:2259
+#: src/interface.c:2135
 msgid "LiVES: - choose a directory"
 msgstr ""
 
-#: src/interface.c:2262
+#: src/interface.c:2137
 msgid "LiVES: - choose a file"
 msgstr ""
 
-#: src/interface.c:2445
+#: src/interface.c:2381
 msgid "LiVES: - Cancel/Discard/Save"
 msgstr "LiVES: - Zrušit/zahodit/uložit"
 
-#: src/interface.c:2460
+#: src/interface.c:2397
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has not been saved.\n"
@@ -1636,7 +1629,7 @@
 "Stávající rozložení bylo od posledního uložení změněno.\n"
 "Co chcete učinit?\n"
 
-#: src/interface.c:2463
+#: src/interface.c:2400
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has been changed since the last save.\n"
@@ -1646,7 +1639,7 @@
 "Stávající rozložení bylo od posledního uložení změněno.\n"
 "Co chcete učinit?\n"
 
-#: src/interface.c:2467
+#: src/interface.c:2404
 msgid ""
 "You are about to exit LiVES.\n"
 "The current clip set can be saved.\n"
@@ -1656,7 +1649,7 @@
 "Stávající sestava klipů může být uložena.\n"
 "Co chcete učinit?\n"
 
-#: src/interface.c:2468
+#: src/interface.c:2405
 msgid ""
 "The current clip set has not been saved.\n"
 "What would you like to do ?\n"
@@ -1664,7 +1657,7 @@
 "Současná sestava klipů nebyla uložena.\n"
 "Co chcete učinit?\n"
 
-#: src/interface.c:2472
+#: src/interface.c:2408
 msgid ""
 "The current layout has not been saved.\n"
 "What would you like to do ?\n"
@@ -1672,7 +1665,7 @@
 "Současné rozložení nebylo uloženo.\n"
 "Co chcete učinit?\n"
 
-#: src/interface.c:2475
+#: src/interface.c:2410
 #, fuzzy
 msgid ""
 "The current layout has *not* been changed since it was last saved.\n"
@@ -1681,109 +1674,109 @@
 "Obecny układ nie został zmieniony od ostatniego zapisania.\n"
 "Co chcesz zrobić ?\n"
 
-#: src/interface.c:2480
+#: src/interface.c:2415
 msgid ""
 "The current layout contains generated frames and cannot be retained.\n"
 "You may wish to render it before exiting multitrack mode.\n"
 msgstr ""
 
-#: src/interface.c:2483
+#: src/interface.c:2418
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout contains generated frames and cannot be retained.\n"
 "What do you wish to do ?"
 msgstr ""
 
-#: src/interface.c:2496
+#: src/interface.c:2431
 msgid "Clip set _name"
 msgstr "_Zadat jméno klipu"
 
-#: src/interface.c:2502
+#: src/interface.c:2437
 msgid "_Auto reload next time"
 msgstr "_Automatické otevření při dalším spuštění"
 
-#: src/interface.c:2538 src/interface.c:2547
+#: src/interface.c:2473 src/interface.c:2482
 msgid "_Wipe layout"
 msgstr "_Vymazat rozložení"
 
-#: src/interface.c:2539
+#: src/interface.c:2474
 msgid "_Ignore changes"
 msgstr "_Ignorovat změny"
 
-#: src/interface.c:2540
+#: src/interface.c:2475
 msgid "_Delete clip set"
 msgstr "_Smazat klipy"
 
-#: src/interface.c:2541
+#: src/interface.c:2476
 msgid "_Delete layout"
 msgstr "_Smazat rozložení"
 
-#: src/interface.c:2545
+#: src/interface.c:2480
 msgid "_Save layout"
 msgstr "_Uložit rozložení"
 
-#: src/interface.c:2546
+#: src/interface.c:2481
 msgid "_Save clip set"
 msgstr "_Uložit sestavu klipu"
 
-#: src/interface.c:2565
+#: src/interface.c:2502
 msgid ""
 "\n"
 "LiVES has detected a multitrack layout from a previous session.\n"
 "Would you like to try and recover it ?\n"
 msgstr ""
 
-#: src/interface.c:2589
+#: src/interface.c:2528
 msgid "LiVES: - Disk Recovery Options"
 msgstr ""
 
-#: src/interface.c:2608
+#: src/interface.c:2549
 msgid "Delete _Orphaned Clips"
 msgstr ""
 
-#: src/interface.c:2609
+#: src/interface.c:2550
 msgid "Delete any clips which are not currently loaded or part of a set"
 msgstr ""
 
-#: src/interface.c:2622
+#: src/interface.c:2564
 msgid "Clear _Backup Files from Closed Clips"
 msgstr ""
 
-#: src/interface.c:2633
+#: src/interface.c:2575
 msgid "Remove Sets which have _Layouts but no Clips"
 msgstr ""
 
-#: src/interface.c:2644
+#: src/interface.c:2586
 msgid "_Reset to Defaults"
 msgstr ""
 
-#: src/interface.c:2651
+#: src/interface.c:2593
 msgid "_Accept"
 msgstr ""
 
-#: src/callbacks.c:198
+#: src/callbacks.c:208
 #, c-format
 msgid "Saving as set %s..."
 msgstr "Ukládám jako sestavu %s..."
 
-#: src/callbacks.c:833
+#: src/callbacks.c:852
 msgid "Please enter the name of the file to save the clip as.\n"
 msgstr ""
 
-#: src/callbacks.c:841
+#: src/callbacks.c:860
 msgid "Please enter a valid URL for the download.\n"
 msgstr ""
 
-#: src/callbacks.c:867
+#: src/callbacks.c:886
 #, c-format
 msgid "Downloading %s to %s..."
 msgstr ""
 
-#: src/callbacks.c:895
+#: src/callbacks.c:912
 msgid "Downloading clip"
 msgstr ""
 
-#: src/callbacks.c:933
+#: src/callbacks.c:950
 msgid ""
 "\n"
 "LiVES was unable to download the clip.\n"
@@ -1791,17 +1784,17 @@
 "the latest youtube-dl installed.\n"
 msgstr ""
 
-#: src/callbacks.c:1114 src/callbacks.c:1149
+#: src/callbacks.c:1131 src/callbacks.c:1166
 msgid "This file"
 msgstr "Tento soubor"
 
-#: src/callbacks.c:1115
+#: src/callbacks.c:1132
 msgid ""
 ",\n"
 " - including the current layout - "
 msgstr ""
 
-#: src/callbacks.c:1117
+#: src/callbacks.c:1134
 #, c-format
 msgid ""
 "\n"
@@ -1811,7 +1804,7 @@
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1119
+#: src/callbacks.c:1136
 #, c-format
 msgid ""
 "\n"
@@ -1821,14 +1814,14 @@
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1150
+#: src/callbacks.c:1167
 msgid ""
 "Changes made to this clip have not been saved or backed up.\n"
 "\n"
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1343
+#: src/callbacks.c:1356
 msgid ""
 "\n"
 "Invalid project file.\n"
@@ -1836,7 +1829,7 @@
 "\n"
 "Neplatný soubor projektu.\n"
 
-#: src/callbacks.c:1356
+#: src/callbacks.c:1370
 #, c-format
 msgid ""
 "\n"
@@ -1858,33 +1851,33 @@
 "stornujte.\n"
 "Po této změně budete moci importovat nový projekt.\n"
 
-#: src/callbacks.c:1366
+#: src/callbacks.c:1381
 #, c-format
 msgid "Importing the project %s as set %s..."
 msgstr "Importuji projekt %s  jako %s..."
 
-#: src/callbacks.c:1386
+#: src/callbacks.c:1399
 msgid "Importing project"
 msgstr "Importuji projekt"
 
-#: src/callbacks.c:1472
+#: src/callbacks.c:1481
 #, c-format
 msgid "Exporting project %s..."
 msgstr "Exportuji projekt %s..."
 
-#: src/callbacks.c:1490
+#: src/callbacks.c:1497
 msgid "Exporting project"
 msgstr "Exportuji projekt"
 
-#: src/callbacks.c:1506
+#: src/callbacks.c:1513
 msgid "Backup as .lv1 file"
 msgstr "Zálohovat jako .lv1 rejstřík"
 
-#: src/callbacks.c:1522
+#: src/callbacks.c:1529
 msgid "Restore .lv1 file"
 msgstr "Obnovit .lv1 soubor"
 
-#: src/callbacks.c:1664
+#: src/callbacks.c:1671
 msgid ""
 "\n"
 "\n"
@@ -1896,72 +1889,77 @@
 "Sestava bude smazána z disku.\n"
 "Jste si jisti?\n"
 
-#: src/callbacks.c:1725
+#: src/callbacks.c:1732
 #, c-format
 msgid "Deleting set %s..."
 msgstr ""
 
-#: src/callbacks.c:1727
+#: src/callbacks.c:1734
 msgid "Deleting set..."
 msgstr "Mažu sestavu..."
 
-#: src/callbacks.c:1731
+#: src/callbacks.c:1738
 msgid "Deleting set"
 msgstr "Mazání sestavy"
 
-#: src/callbacks.c:1739
+#: src/callbacks.c:1746
 #, c-format
 msgid "Set %s was permanently deleted from the disk.\n"
 msgstr "Sestava %s byla trvale smazána z disku.\n"
 
-#: src/callbacks.c:1787 src/callbacks.c:11764
+#: src/callbacks.c:1792 src/callbacks.c:11676
 msgid "Insert Silence"
 msgstr "Vložit ticho"
 
-#: src/callbacks.c:1840 src/callbacks.c:1923 src/callbacks.c:2086
+#: src/callbacks.c:1844 src/callbacks.c:1927 src/callbacks.c:2089
 msgid "Undoing"
 msgstr "Vracím zpět"
 
-#: src/callbacks.c:1936 src/callbacks.c:2147
+#: src/callbacks.c:1940 src/callbacks.c:2150
 msgid "Restoring audio..."
 msgstr "Obnovuji zvuk..."
 
-#: src/callbacks.c:1952
+#: src/callbacks.c:1956
 msgid "Clearing frame images"
 msgstr ""
 
-#: src/callbacks.c:1985
+#: src/callbacks.c:1988
 msgid "Deleting excess frames"
 msgstr ""
 
-#: src/callbacks.c:2229
+#: src/callbacks.c:2232
 #, c-format
 msgid "Length of video is now %d frames at %.3f frames per second.\n"
 msgstr "Délka videa je momentálně %d snímků při %.3f snímků za sekundu\n"
 
-#: src/callbacks.c:2233 src/resample.c:683 src/resample.c:2166
+#: src/callbacks.c:2235 src/resample.c:678 src/resample.c:2133
 #, c-format
 msgid "Clipboard was resampled to %d frames.\n"
 msgstr "Schránka byla převzorkována na %d snímků\n"
 
-#: src/callbacks.c:2394 src/callbacks.c:2423
+#: src/callbacks.c:2396 src/callbacks.c:2425
 msgid "Redoing"
 msgstr "Opakuji"
 
-#: src/callbacks.c:2462
-#, c-format
-msgid "Copying frames %d to %d%s to the clipboard..."
+#: src/callbacks.c:2472
+#, fuzzy, c-format
+msgid "Copying frames %d to %d (with sound) to the clipboard..."
+msgstr "Kopírování snímků %d do %d%s do schránky ..."
+
+#: src/callbacks.c:2474
+#, fuzzy, c-format
+msgid "Copying frames %d to %d to the clipboard..."
 msgstr "Kopírování snímků %d do %d%s do schránky ..."
 
-#: src/callbacks.c:2525
+#: src/callbacks.c:2526
 msgid "Copying to the clipboard"
 msgstr "Kopírování do schránky"
 
-#: src/callbacks.c:2600
+#: src/callbacks.c:2601
 msgid "Cut"
 msgstr "Vyjmout"
 
-#: src/callbacks.c:2641 src/callbacks.c:3068 src/callbacks.c:8026
+#: src/callbacks.c:2641 src/callbacks.c:3063 src/callbacks.c:7631
 #, fuzzy
 msgid "Pulling frames from clipboard"
 msgstr "Vkládání %d%s snímků ze schránky..."
@@ -1971,22 +1969,22 @@
 msgid "Pasting %d frames to new clip %s..."
 msgstr ""
 
-#: src/callbacks.c:2678
+#: src/callbacks.c:2676
 msgid "Pasting"
 msgstr "Vkládání"
 
-#: src/callbacks.c:2694
+#: src/callbacks.c:2692
 msgid "...added audio..."
 msgstr ""
 
-#: src/callbacks.c:2778
+#: src/callbacks.c:2775
 msgid ""
 "This operation requires resizing or converting of frames.\n"
 "Please install 'convert' from the Image-magick package, and then restart "
 "LiVES.\n"
 msgstr ""
 
-#: src/callbacks.c:2795
+#: src/callbacks.c:2793
 msgid ""
 "\n"
 "\n"
@@ -2000,7 +1998,7 @@
 "Zkuste označit všechny snímky a potom použít \n"
 "'Oříznout zvuk' ze Zvukového menu."
 
-#: src/callbacks.c:2819
+#: src/callbacks.c:2817
 msgid ""
 "LiVES cannot insert because the audio rates do not match.\n"
 "Please install 'sox', and try again."
@@ -2008,7 +2006,7 @@
 "LiVES nemohl vložit protože poměr zvuku nesedí.\n"
 "Prosím instalujte 'sox' a zkuste znovu."
 
-#: src/callbacks.c:2838
+#: src/callbacks.c:2835
 msgid ""
 "\n"
 "Insertion will cause frames to shift in some multitrack layouts.\n"
@@ -2018,7 +2016,7 @@
 "Vložením dojde k posunu snímků v některých vícestopých rozvrženích.\n"
 "Opravdu pokračovat ?\n"
 
-#: src/callbacks.c:2888 src/callbacks.c:11692
+#: src/callbacks.c:2883 src/callbacks.c:11606
 msgid ""
 "\n"
 "Insertion will cause audio to shift in some multitrack layouts.\n"
@@ -2028,11 +2026,11 @@
 "Vložením dojde k posunu zvuku v některých vícestopých rozvrženích.\n"
 "Opravdu pokračovat ?\n"
 
-#: src/callbacks.c:2996 src/callbacks.c:3025
+#: src/callbacks.c:2987 src/callbacks.c:3016
 msgid "Resampling clipboard audio"
 msgstr "Převzorkovat zvuk ve schráce"
 
-#: src/callbacks.c:3041
+#: src/callbacks.c:3032
 msgid ""
 "\n"
 "\n"
@@ -2044,7 +2042,7 @@
 "LiVES nemohl převzorkovat zvuk ve schránce.\n"
 "Zvuk ze schránky byl vymazán.\n"
 
-#: src/callbacks.c:3055
+#: src/callbacks.c:3045
 msgid ""
 "\n"
 "\n"
@@ -2058,30 +2056,30 @@
 "chcete pokračovat s vkládáním\n"
 "s nezměněným zvukem ?\n"
 
-#: src/callbacks.c:3137 src/callbacks.c:3311
+#: src/callbacks.c:3132 src/callbacks.c:3299
 #, c-format
 msgid "Inserting %d%s frames from the clipboard..."
 msgstr "Vkládání %d%s snímků ze schránky..."
 
-#: src/callbacks.c:3162 src/callbacks.c:3236 src/callbacks.c:3339
+#: src/callbacks.c:3155 src/callbacks.c:3224 src/callbacks.c:3325
 msgid "Inserting"
 msgstr "Vkládám"
 
-#: src/callbacks.c:3193
+#: src/callbacks.c:3187
 #, c-format
 msgid "Inserting %d times from the clipboard%s..."
 msgstr "Vložit %d krát ze schránky%s..."
 
-#: src/callbacks.c:3200
+#: src/callbacks.c:3191
 #, c-format
 msgid "Inserting %d frames from the clipboard%s..."
 msgstr "Vložit %d snímků ze schránky%s..."
 
-#: src/callbacks.c:3418
+#: src/callbacks.c:3404
 msgid "Insert"
 msgstr "Vložit"
 
-#: src/callbacks.c:3486
+#: src/callbacks.c:3471
 msgid ""
 "\n"
 "Deleting all frames will close this file.\n"
@@ -2091,7 +2089,7 @@
 "Vymazání všech snímků zavře tento soubor.\n"
 "Opravdu to chcete ?"
 
-#: src/callbacks.c:3495
+#: src/callbacks.c:3480
 msgid ""
 "\n"
 "Deletion will cause missing frames in some multitrack layouts.\n"
@@ -2101,8 +2099,8 @@
 "Smazání způsobí chybějící snímky v některých vícestopých rozloženích.\n"
 "Opravdu pokračovat ?\n"
 
-#: src/callbacks.c:3515 src/callbacks.c:10920 src/callbacks.c:11162
-#: src/callbacks.c:11228
+#: src/callbacks.c:3500 src/callbacks.c:10851 src/callbacks.c:11087
+#: src/callbacks.c:11152
 msgid ""
 "\n"
 "Deletion will cause missing audio in some multitrack layouts.\n"
@@ -2112,7 +2110,7 @@
 "Smazání způsobí chybějící zvuk v některých vícestopých rozloženích.\n"
 "Opravdu pokračovat ?\n"
 
-#: src/callbacks.c:3534
+#: src/callbacks.c:3519
 msgid ""
 "\n"
 "Deletion will cause frames to shift in some multitrack layouts.\n"
@@ -2122,7 +2120,7 @@
 "Smazání způsobí posun snímků v některých vícestopých rozloženích.\n"
 "Opravdu pokračovat ?\n"
 
-#: src/callbacks.c:3553 src/callbacks.c:11210
+#: src/callbacks.c:3538 src/callbacks.c:11134
 msgid ""
 "\n"
 "Deletion will cause audio to shift in some multitrack layouts.\n"
@@ -2132,20 +2130,20 @@
 "Smazání způsobí posun zvuku v některých vícestopých rozloženích.\n"
 "Opravdu pokračovat ?\n"
 
-#: src/callbacks.c:3611
+#: src/callbacks.c:3597
 #, c-format
 msgid "Deleting frames %d to %d%s..."
 msgstr "Mazání snímků %d do %d%s..."
 
-#: src/callbacks.c:3636
+#: src/callbacks.c:3619
 msgid "Deleting"
 msgstr "Mažu"
 
-#: src/callbacks.c:3717
+#: src/callbacks.c:3699
 msgid "Delete"
 msgstr "Smazat"
 
-#: src/callbacks.c:3738
+#: src/callbacks.c:3717
 msgid ""
 "\n"
 "\n"
@@ -2155,7 +2153,7 @@
 "\n"
 "Výběr je uzamčený.\n"
 
-#: src/callbacks.c:4092
+#: src/callbacks.c:4056
 msgid ""
 "Ready to record. Use 'control' and cursor keys during playback to record "
 "your performance.\n"
@@ -2163,11 +2161,11 @@
 "play.)\n"
 msgstr ""
 
-#: src/callbacks.c:4098
+#: src/callbacks.c:4061
 msgid "Record cancelled.\n"
 msgstr "Nahrávání přerušeno.\n"
 
-#: src/callbacks.c:4237
+#: src/callbacks.c:4197
 #, c-format
 msgid ""
 "\n"
@@ -2180,7 +2178,7 @@
 "Zpráva tohoto pluginu '%s':\n"
 "%s\n"
 
-#: src/callbacks.c:4241
+#: src/callbacks.c:4200
 #, c-format
 msgid ""
 "\n"
@@ -2193,7 +2191,7 @@
 "Nelze najít 'init' metodu v pluginu %s.\n"
 "Plugin je možná poškozený nebo není správně instalován."
 
-#: src/callbacks.c:4571
+#: src/callbacks.c:4532
 #, c-format
 msgid ""
 "Saving the set will cause copies of all loaded clips to remain on the disk"
@@ -2205,22 +2203,22 @@
 "\n"
 "Klikněte ''Zrušit' pokud nesouhlasíte.\n"
 
-#: src/callbacks.c:4654
+#: src/callbacks.c:4617
 #, c-format
 msgid "Saving set %s"
 msgstr "Ukládádání %s"
 
-#: src/callbacks.c:5005
+#: src/callbacks.c:4964
 #, c-format
 msgid "Loading clips from set %s"
 msgstr "Otvírání klipů ze sady %s"
 
-#: src/callbacks.c:5093
+#: src/callbacks.c:5051
 #, c-format
 msgid "%d clips and %d layouts were recovered from set (%s).\n"
 msgstr ""
 
-#: src/callbacks.c:5312
+#: src/callbacks.c:5259
 msgid ""
 "LiVES will attempt to recover some disk space.\n"
 "You should ONLY run this if you have no other copies of LiVES running on "
@@ -2231,24 +2229,24 @@
 "Pokračujte POUZE pokud nemáte spuštěnou další kopii LiVES.\n"
 "Pokračujete kliknutím OK.\n"
 
-#: src/callbacks.c:5317
+#: src/callbacks.c:5264
 msgid "Cleaning up disk space..."
 msgstr "Čistím diskový prostor..."
 
-#: src/callbacks.c:5387
+#: src/callbacks.c:5334
 msgid "Recovering disk space"
 msgstr ""
 
-#: src/callbacks.c:5439
+#: src/callbacks.c:5386
 #, c-format
 msgid "%s of disk space was recovered.\n"
 msgstr ""
 
-#: src/callbacks.c:5482
+#: src/callbacks.c:5428
 msgid "Resetting frame rates and frame values..."
 msgstr ""
 
-#: src/callbacks.c:5523
+#: src/callbacks.c:5469
 #, c-format
 msgid ""
 "\n"
@@ -2256,12 +2254,12 @@
 "Internal: %s (%d bpp) / %s\n"
 msgstr ""
 
-#: src/callbacks.c:5525
+#: src/callbacks.c:5471
 msgid "buffered"
 msgstr ""
 
-#: src/callbacks.c:5538 src/callbacks.c:5557 src/callbacks.c:5575
-#: src/callbacks.c:5609
+#: src/callbacks.c:5484 src/callbacks.c:5502 src/callbacks.c:5518
+#: src/callbacks.c:5551
 msgid ""
 "\n"
 "  Opening..."
@@ -2269,7 +2267,7 @@
 "\n"
 "  Otvírání..."
 
-#: src/callbacks.c:5545
+#: src/callbacks.c:5490
 #, c-format
 msgid ""
 "\n"
@@ -2278,7 +2276,7 @@
 "\n"
 "(%d virtual)"
 
-#: src/callbacks.c:5548
+#: src/callbacks.c:5493
 #, c-format
 msgid ""
 "\n"
@@ -2287,14 +2285,14 @@
 "\n"
 "(%d decoded)"
 
-#: src/callbacks.c:5560 src/callbacks.c:5578 src/callbacks.c:5612
+#: src/callbacks.c:5504 src/callbacks.c:5520 src/callbacks.c:5553
 #, c-format
 msgid ""
 "\n"
 "  %.2f sec."
 msgstr ""
 
-#: src/callbacks.c:5569
+#: src/callbacks.c:5512
 msgid ""
 "\n"
 "  Unknown"
@@ -2302,23 +2300,23 @@
 "\n"
 "  Neznámo"
 
-#: src/callbacks.c:5582 src/callbacks.c:5596
+#: src/callbacks.c:5524 src/callbacks.c:5538
 msgid "unsigned"
 msgstr ""
 
-#: src/callbacks.c:5583 src/callbacks.c:5597
+#: src/callbacks.c:5525 src/callbacks.c:5539
 msgid "signed"
 msgstr ""
 
-#: src/callbacks.c:5585 src/callbacks.c:5599
+#: src/callbacks.c:5527 src/callbacks.c:5541
 msgid "big-endian"
 msgstr ""
 
-#: src/callbacks.c:5586 src/callbacks.c:5600
+#: src/callbacks.c:5528 src/callbacks.c:5542
 msgid "little-endian"
 msgstr ""
 
-#: src/callbacks.c:5588 src/callbacks.c:5602
+#: src/callbacks.c:5530 src/callbacks.c:5544
 #, c-format
 msgid ""
 "  %d Hz %d bit\n"
@@ -2327,7 +2325,7 @@
 "  %d Hz %d bit\n"
 "%s %s"
 
-#: src/callbacks.c:5707
+#: src/callbacks.c:5647
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -2344,15 +2342,15 @@
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA.\n"
 msgstr ""
 
-#: src/callbacks.c:5721
+#: src/callbacks.c:5661
 msgid "A video editor and VJ program."
 msgstr ""
 
-#: src/callbacks.c:5722
+#: src/callbacks.c:5662
 msgid "About LiVES"
 msgstr ""
 
-#: src/callbacks.c:5724
+#: src/callbacks.c:5664
 msgid "translator_credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -2362,7 +2360,7 @@
 "  milzou https://launchpad.net/~vonfsro\n"
 "  salsaman https://launchpad.net/~salsaman"
 
-#: src/callbacks.c:5758
+#: src/callbacks.c:5699
 #, c-format
 msgid ""
 "LiVES Version %s\n"
@@ -2376,7 +2374,7 @@
 "Homepage: http://lives.sourceforge.net"
 msgstr ""
 
-#: src/callbacks.c:6037
+#: src/callbacks.c:5996
 #, fuzzy
 msgid ""
 "\n"
@@ -2387,7 +2385,7 @@
 "\n"
 "Musíte nainstalovat mplayer pro náhled tohoto souboru.\n"
 
-#: src/callbacks.c:6040
+#: src/callbacks.c:5998
 #, fuzzy
 msgid ""
 "\n"
@@ -2399,220 +2397,211 @@
 "\n"
 "Musíte nainstalovat mplayer pro náhled tohoto souboru.\n"
 
-#: src/callbacks.c:6423 src/callbacks.c:8289
-msgid ""
-"\n"
-"Loading new audio may cause missing audio in some multitrack layouts.\n"
-"Are you sure you wish to continue ?\n"
-"."
-msgstr ""
-"\n"
-"Otevření nové audio stopy může zapříčinit chybějící zvuk v některých "
-"vícestopých rozvrženích.\n"
-"Opravdu chcete pokračovat ?\n"
-"."
-
-#: src/callbacks.c:6523
-#, c-format
-msgid "Opening audio %s, type %s..."
-msgstr "Otvíráni zvuku %s, typu %s..."
-
-#: src/callbacks.c:6556 src/saveplay.c:480
-msgid "Opening audio"
-msgstr "Otevřít zvuk"
-
-#: src/callbacks.c:6565 src/callbacks.c:6612 src/callbacks.c:8387
-#: src/callbacks.c:8429 src/callbacks.c:8472 src/callbacks.c:10846
-msgid "Cancelling"
-msgstr "Ruší se"
-
-#: src/callbacks.c:6660 src/callbacks.c:8514 src/callbacks.c:10876
-#: src/callbacks.c:11563
-msgid "Committing audio"
-msgstr "Vykonávání zvuku"
-
-#: src/callbacks.c:6672 src/callbacks.c:8546
-msgid "New Audio"
-msgstr "Nový zvuk"
-
-#: src/callbacks.c:6779
+#: src/callbacks.c:6459
 #, c-format
 msgid ""
 "Text was saved as\n"
 "%s\n"
 msgstr ""
 
-#: src/callbacks.c:6951 src/saveplay.c:3618
-#, c-format
-msgid "%d frames are enough !\n"
-msgstr "%d snímků je dost !\n"
-
-#: src/callbacks.c:7050
+#: src/callbacks.c:6706
 msgid "LiVES: - Encoder debug output"
 msgstr ""
 
-#: src/callbacks.c:7087 src/gui.c:1922
+#: src/callbacks.c:6743 src/gui.c:1921
 msgid "Fullscreen playback (f)"
 msgstr "Přehrát celou obrazovku (f)"
 
-#: src/callbacks.c:7089
+#: src/callbacks.c:6744
 msgid "Fullscreen playback off (f)"
 msgstr "Vypnout přehrávání na celou obrazovku (f)"
 
-#: src/callbacks.c:7188 src/callbacks.c:7336 src/callbacks.c:7664
-#: src/callbacks.c:7681 src/gui.c:3712 src/saveplay.c:2467 src/saveplay.c:2501
-#: src/saveplay.c:3115 src/saveplay.c:3220 src/saveplay.c:3239
-#: src/multitrack.c:9340 src/multitrack.c:11060
+#: src/callbacks.c:6841 src/callbacks.c:6983 src/callbacks.c:7283
+#: src/callbacks.c:7298 src/gui.c:3838 src/saveplay.c:2442 src/saveplay.c:2475
+#: src/saveplay.c:3074 src/saveplay.c:3178 src/saveplay.c:3197
+#: src/multitrack.c:9526 src/multitrack.c:11288
 #, c-format
 msgid " (%d %% scale)"
 msgstr ""
 
-#: src/callbacks.c:7190 src/callbacks.c:7338 src/callbacks.c:7666
-#: src/gui.c:3716 src/saveplay.c:2469 src/saveplay.c:2503
+#: src/callbacks.c:6843 src/callbacks.c:6985 src/callbacks.c:7285
+#: src/gui.c:3842 src/saveplay.c:2444 src/saveplay.c:2477
 #, c-format
 msgid "LiVES: - Play Window%s"
 msgstr ""
 
-#: src/callbacks.c:7302 src/gui.c:1907
+#: src/callbacks.c:6950 src/gui.c:1906
 msgid "Double size (d)"
 msgstr "Dvojitá velikost (d)"
 
-#: src/callbacks.c:7309
+#: src/callbacks.c:6956
 msgid "Single size (d)"
 msgstr "Jednoduchá velikost (d)"
 
-#: src/callbacks.c:7442 src/callbacks.c:7443
+#: src/callbacks.c:7087 src/callbacks.c:7088
 msgid "Hide the play window (s)"
 msgstr "Schovej přehrávací okno (s)"
 
-#: src/callbacks.c:7452 src/gui.c:1746
+#: src/callbacks.c:7096 src/gui.c:1744
 msgid "Show the play window (s)"
 msgstr "Zobraz hrací okno (s)"
 
-#: src/callbacks.c:7453 src/gui.c:1896
+#: src/callbacks.c:7097 src/gui.c:1895
 msgid "Play in separate window (s)"
 msgstr "Přehraj v odděleném okně (s)"
 
-#: src/callbacks.c:7535 src/gui.c:4060 src/saveplay.c:2498
+#: src/callbacks.c:7175 src/gui.c:4169 src/saveplay.c:2472
 msgid "LiVES: - Streaming"
 msgstr ""
 
-#: src/callbacks.c:7778
+#: src/callbacks.c:7388
 msgid "Switch continuous looping off (o)"
 msgstr "Vypnout opakované hraní (o)"
 
-#: src/callbacks.c:7785 src/gui.c:1795
+#: src/callbacks.c:7394 src/gui.c:1793
 msgid "Switch continuous looping on (o)"
 msgstr "Zapnout opakované hraní (o)"
 
-#: src/callbacks.c:7837
+#: src/callbacks.c:7444
 #, c-format
 msgid "Audio volume (%.2f)"
 msgstr "Hlasitost zvuku (%.2f)"
 
-#: src/callbacks.c:7876 src/callbacks.c:7877 src/gui.c:3640
+#: src/callbacks.c:7483 src/callbacks.c:7484 src/gui.c:3766
 msgid "Unmute the audio (z)"
 msgstr "Pustit zvuk (z)"
 
-#: src/callbacks.c:7888 src/callbacks.c:7889 src/gui.c:1808 src/gui.c:3639
+#: src/callbacks.c:7494 src/callbacks.c:7495 src/gui.c:1806 src/gui.c:3765
 msgid "Mute the audio (z)"
 msgstr "Ztišit zvuk (z)"
 
-#: src/callbacks.c:8038
+#: src/callbacks.c:7643
 msgid "Reversing clipboard..."
 msgstr "Obracení přechodné paměti..."
 
-#: src/callbacks.c:8052
+#: src/callbacks.c:7657
 msgid "Reversing clipboard"
 msgstr "Obracení přechodné paměti"
 
-#: src/callbacks.c:8084
+#: src/callbacks.c:7689
 msgid "LiVES: Load subtitles from..."
 msgstr ""
 
-#: src/callbacks.c:8151 src/saveplay.c:970
+#: src/callbacks.c:7753 src/saveplay.c:956
 #, c-format
 msgid "Loaded subtitle file: %s\n"
 msgstr ""
 
-#: src/callbacks.c:8220
+#: src/callbacks.c:7821
 msgid "Subtitles were erased.\n"
 msgstr ""
 
-#: src/callbacks.c:8239
+#: src/callbacks.c:7843
 msgid "LiVES: - Select Audio File"
 msgstr ""
 
-#: src/callbacks.c:8250
+#: src/callbacks.c:7878 src/callbacks.c:8232
+msgid ""
+"\n"
+"Loading new audio may cause missing audio in some multitrack layouts.\n"
+"Are you sure you wish to continue ?\n"
+"."
+msgstr ""
+"\n"
+"Otevření nové audio stopy může zapříčinit chybějící zvuk v některých "
+"vícestopých rozvrženích.\n"
+"Opravdu chcete pokračovat ?\n"
+"."
+
+#: src/callbacks.c:7989
+#, c-format
+msgid "Opening audio %s, type %s..."
+msgstr "Otvíráni zvuku %s, typu %s..."
+
+#: src/callbacks.c:8023 src/saveplay.c:477
+msgid "Opening audio"
+msgstr "Otevřít zvuk"
+
+#: src/callbacks.c:8032 src/callbacks.c:8083 src/callbacks.c:8327
+#: src/callbacks.c:8369 src/callbacks.c:8412 src/callbacks.c:10766
+msgid "Cancelling"
+msgstr "Ruší se"
+
+#: src/callbacks.c:8137 src/callbacks.c:8454 src/callbacks.c:10803
+#: src/callbacks.c:11477
+msgid "Committing audio"
+msgstr "Vykonávání zvuku"
+
+#: src/callbacks.c:8153 src/callbacks.c:8484
+msgid "New Audio"
+msgstr "Nový zvuk"
+
+#: src/callbacks.c:8194
 msgid "Please set your CD play device in Tools | Preferences | Misc\n"
 msgstr "Označte vaše zařízení pro hraní CD v Nástroje | Předvolby | Různé\n"
 
-#: src/callbacks.c:8321
+#: src/callbacks.c:8264
 #, c-format
 msgid "Opening CD track %d from %s..."
 msgstr "Otevirání CD stopy %d z %s..."
 
-#: src/callbacks.c:8326
+#: src/callbacks.c:8267
 #, c-format
 msgid "CD track %d"
 msgstr "CD stopa %d"
 
-#: src/callbacks.c:8373
+#: src/callbacks.c:8313
 msgid "Opening CD track..."
 msgstr "Otvírání CD stopy..."
 
-#: src/callbacks.c:8415 src/callbacks.c:8461
+#: src/callbacks.c:8355 src/callbacks.c:8401
 msgid "Error loading CD track\n"
 msgstr "Chyba při otvírání CD stopy\n"
 
-#: src/callbacks.c:8584
+#: src/callbacks.c:8518
 msgid "layout errors"
 msgstr "chyby rozložení"
 
-#: src/callbacks.c:8595
+#: src/callbacks.c:8529
 msgid "Close _Window"
 msgstr "_Zavřít okno"
 
-#: src/callbacks.c:8606
+#: src/callbacks.c:8540
 msgid "Clear _Errors"
 msgstr "Vymazat _chyby"
 
-#: src/callbacks.c:8617
+#: src/callbacks.c:8551
 msgid "_Delete affected layouts"
 msgstr "_Smazat zasažené rozvržení"
 
-#: src/callbacks.c:9343 src/callbacks.c:9388
+#: src/callbacks.c:9253 src/callbacks.c:9298
 msgid "Resume"
 msgstr "Pokračovat"
 
-#: src/callbacks.c:9344
+#: src/callbacks.c:9254
 msgid ""
 "\n"
 "Paused\n"
 "(click Resume to continue processing)"
 msgstr ""
 
-#: src/callbacks.c:9345 src/callbacks.c:9406
+#: src/callbacks.c:9255 src/callbacks.c:9315
 msgid "paused..."
 msgstr "pozastaveno..."
 
-#: src/callbacks.c:9372 src/callbacks.c:9418
-msgid "Pause"
-msgstr "Pauza"
-
-#: src/callbacks.c:9374 src/callbacks.c:9421
+#: src/callbacks.c:9284 src/callbacks.c:9333
 msgid "resumed..."
 msgstr "pokračovat..."
 
-#: src/callbacks.c:9393
+#: src/callbacks.c:9303
 msgid "Keep"
 msgstr "Zachovat"
 
-#: src/callbacks.c:9396
+#: src/callbacks.c:9305
 msgid "Enough"
 msgstr ""
 
-#: src/callbacks.c:9401
+#: src/callbacks.c:9310
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2625,28 +2614,28 @@
 "(kliknout Podržet pro zachování toho co máme a stop)\n"
 "(kliknout Pokračovat pro pokračování)"
 
-#: src/callbacks.c:9419
+#: src/callbacks.c:9331
 msgid "Cancel"
 msgstr "Zrušit"
 
-#: src/callbacks.c:9558
+#: src/callbacks.c:9478
 msgid "Stop"
 msgstr ""
 
-#: src/callbacks.c:10053 src/multitrack.c:13247
+#: src/callbacks.c:9968 src/multitrack.c:13489
 msgid "LiVES: Selected frame"
 msgstr "LiVES: Vybrané snímky"
 
-#: src/callbacks.c:10061
+#: src/callbacks.c:9976
 msgid "_Save frame as..."
 msgstr ""
 
-#: src/callbacks.c:10290
+#: src/callbacks.c:10202
 #, c-format
 msgid "Audio is ahead of video by %.4f secs. at frame %d, with fps %.4f\n"
 msgstr ""
 
-#: src/callbacks.c:10347
+#: src/callbacks.c:10255
 msgid ""
 "\n"
 "\n"
@@ -2655,7 +2644,7 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10353
+#: src/callbacks.c:10261
 msgid ""
 "\n"
 "\n"
@@ -2668,7 +2657,7 @@
 "\"xwininfo\"\n"
 "\n"
 
-#: src/callbacks.c:10429 src/callbacks.c:11479
+#: src/callbacks.c:10334 src/callbacks.c:11395
 msgid ""
 "\n"
 "Record time must be greater than 0.\n"
@@ -2676,7 +2665,7 @@
 "\n"
 "Doba nahrávání musí být větší než 0.\n"
 
-#: src/callbacks.c:10440
+#: src/callbacks.c:10346
 msgid ""
 "Capture an External Window:\n"
 "\n"
@@ -2690,17 +2679,17 @@
 "Vyberte 'Zrušit' pro zrušení\n"
 "\n"
 
-#: src/callbacks.c:10445
+#: src/callbacks.c:10351
 msgid "External window was released.\n"
 msgstr "Externí. okno bylo spuštěno.\n"
 
-#: src/callbacks.c:10479
+#: src/callbacks.c:10385
 msgid ""
 "Click on a Window to Capture it\n"
 "Press 'q' to stop recording"
 msgstr ""
 
-#: src/callbacks.c:10513
+#: src/callbacks.c:10419
 #, c-format
 msgid ""
 "\n"
@@ -2715,19 +2704,19 @@
 "Stop nebo 'q' pro ukončení.\n"
 "(Bude použito výchozí nastavení %.3f snímků za sekundu.)\n"
 
-#: src/callbacks.c:10539
+#: src/callbacks.c:10443
 msgid "LiVES was unable to capture this window. Sorry.\n"
 msgstr "LiVES nemohl zachytit toto okno. Sorry.\n"
 
-#: src/callbacks.c:10695
+#: src/callbacks.c:10601
 msgid "Export Selected Audio as..."
 msgstr "Vyexportovat vybraný zvuk jako..."
 
-#: src/callbacks.c:10699
+#: src/callbacks.c:10604
 msgid "Export Audio as..."
 msgstr "Vyexportovat zvuk jako..."
 
-#: src/callbacks.c:10714
+#: src/callbacks.c:10619
 msgid ""
 "\n"
 "\n"
@@ -2741,86 +2730,86 @@
 "Klikněte na 'OK'  pro export s novou rychlostí nebo 'Zrušit' a exportovat "
 "originálním poměrem(rate).\n"
 
-#: src/callbacks.c:10720
+#: src/callbacks.c:10625
 #, c-format
 msgid "Exporting audio frames %d to %d as %s..."
 msgstr "Exportování zvuku %d do %d jako %s..."
 
-#: src/callbacks.c:10725
+#: src/callbacks.c:10629
 #, c-format
 msgid "Exporting audio as %s..."
 msgstr "Exportování zvuku jako %s..."
 
-#: src/callbacks.c:10751
+#: src/callbacks.c:10655
 msgid "Exporting audio"
 msgstr "Exportování zvuku"
 
-#: src/callbacks.c:10782
+#: src/callbacks.c:10695
 msgid "LiVES: - Append Audio File"
 msgstr ""
 
-#: src/callbacks.c:10825
+#: src/callbacks.c:10739
 #, c-format
 msgid "Appending audio file %s..."
 msgstr "Připojování zvukového soubor %s..."
 
-#: src/callbacks.c:10836
+#: src/callbacks.c:10756
 msgid "Appending audio"
 msgstr "Připojování zvuku"
 
-#: src/callbacks.c:10892
+#: src/callbacks.c:10818
 msgid "Append Audio"
 msgstr "Připojit zvuk"
 
-#: src/callbacks.c:10952
+#: src/callbacks.c:10883
 #, c-format
 msgid "Padding audio to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10954
+#: src/callbacks.c:10885
 #, c-format
 msgid "Trimming audio from %.2f to %.2f seconds..."
 msgstr "Oříznutí zvuku z %.2f na %.2f sekundy..."
 
-#: src/callbacks.c:10973
+#: src/callbacks.c:10904
 msgid "Trimming/Padding audio"
 msgstr "Oříznout/Doplnit zvuk"
 
-#: src/callbacks.c:10981
+#: src/callbacks.c:10912
 msgid "Trim/Pad Audio"
 msgstr "Oříznout/Doplnit zvuk"
 
-#: src/callbacks.c:11055
+#: src/callbacks.c:10982
 msgid "Fading audio in"
 msgstr "Zesilování zvuku"
 
-#: src/callbacks.c:11056
+#: src/callbacks.c:10983
 msgid "Fade audio in"
 msgstr "Zesilování zvuku"
 
-#: src/callbacks.c:11061
+#: src/callbacks.c:10987
 msgid "Fading audio out"
 msgstr "Ztišování zvuku"
 
-#: src/callbacks.c:11062
+#: src/callbacks.c:10988
 msgid "Fade audio out"
 msgstr "Ztlumit zvuk"
 
-#: src/callbacks.c:11085
+#: src/callbacks.c:11011
 #, c-format
 msgid "%s over %.1f seconds..."
 msgstr "%s na %.1f vteřin"
 
-#: src/callbacks.c:11087
+#: src/callbacks.c:11013
 #, c-format
 msgid "%s from time %.2f seconds to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11094
+#: src/callbacks.c:11020
 msgid "Fading audio..."
 msgstr "Ztišování..."
 
-#: src/callbacks.c:11194
+#: src/callbacks.c:11119
 msgid ""
 "\n"
 "Deleting all audio will close this file.\n"
@@ -2830,630 +2819,630 @@
 "Vymazání audia způsobí zavření tohoto souboru.\n"
 "Pokračovat ?"
 
-#: src/callbacks.c:11197
+#: src/callbacks.c:11122
 msgid "Deleting all audio..."
 msgstr "Vymazáváni zvuku kompletně"
 
-#: src/callbacks.c:11203
+#: src/callbacks.c:11127
 #, c-format
 msgid "Deleting audio from %.2f to %.2f seconds..."
 msgstr "Vymazáváni zvuku od %.2f do %.2f sekund..."
 
-#: src/callbacks.c:11290
+#: src/callbacks.c:11214
 msgid "Deleting Audio"
 msgstr "Mazání zvuku"
 
-#: src/callbacks.c:11297
+#: src/callbacks.c:11221
 msgid "Delete Audio"
 msgstr "Vymazat zvuk"
 
-#: src/callbacks.c:11636
+#: src/callbacks.c:11550
 msgid "Record new audio"
 msgstr "Nahrát nový zvuk"
 
-#: src/callbacks.c:11725
+#: src/callbacks.c:11640
 #, c-format
 msgid "Inserting silence from %.2f to %.2f seconds..."
 msgstr "Vkládání ticha od %.2f do %.2f sekund..."
 
-#: src/callbacks.c:11754
+#: src/callbacks.c:11666
 msgid "Inserting Silence"
 msgstr "Vkládání ticha"
 
-#: src/merge.c:85
+#: src/merge.c:96
 msgid "LiVES: - Merge"
 msgstr "LiVES: - Sloučit"
 
-#: src/merge.c:102
+#: src/merge.c:113
 #, c-format
 msgid "Merge Clipboard [ %d Frames ]       With Selection [ %d Frames ]"
 msgstr "Sloučit schránku [ %d snímků ]    s výběrem [ %d snímků ]"
 
-#: src/merge.c:107
+#: src/merge.c:118
 #, c-format
 msgid ""
 "Merge Clipboard [ %d Frames (resampled) ]       With Selection [ %d Frames ]"
 msgstr "Sloučit schránku [ %d snímků (přeskupeno)]    s výběrem [ %d snímků ]"
 
-#: src/merge.c:118
+#: src/merge.c:130
 msgid "Align _Starts"
 msgstr "Vyrovnat _počátky"
 
-#: src/merge.c:123
+#: src/merge.c:135
 msgid "Align _Ends"
 msgstr "Vyrovnat _konce"
 
-#: src/merge.c:134
+#: src/merge.c:146
 msgid "What to do with extra clipboard frames -"
 msgstr "Co dělat s přebývajícími snímky ve schránce -"
 
-#: src/merge.c:137
+#: src/merge.c:149
 msgid "_Insert Frames"
 msgstr "_Vložit snímky"
 
-#: src/merge.c:143
+#: src/merge.c:155
 msgid "_Drop Frames"
 msgstr "_Zahodit snímky"
 
-#: src/merge.c:149
+#: src/merge.c:160
 msgid "Number of Times to Loop Clipboard"
 msgstr "Počet opakování schránky"
 
-#: src/merge.c:160
+#: src/merge.c:171
 msgid "_Loop Clipboard to Fit Selection"
 msgstr "_Opakovat schránku do naplnění výběru"
 
-#: src/merge.c:173
+#: src/merge.c:184
 msgid "_Transition Method:"
 msgstr "_Přechod:"
 
-#: src/merge.c:394
+#: src/merge.c:395
 msgid "Merging clipboard with selection..."
 msgstr "Sloučit schránku s výběrem..."
 
-#: src/merge.c:551
+#: src/merge.c:539
 msgid "Merge done.\n"
 msgstr "Sloučení hotovo.\n"
 
-#: src/gui.c:123
+#: src/gui.c:122
 msgid "_Custom Generators"
 msgstr ""
 
-#: src/gui.c:124
+#: src/gui.c:123
 msgid "_Custom Effects"
 msgstr "_Vlastní efekty"
 
-#: src/gui.c:125
+#: src/gui.c:124
 msgid "Custom _Utilities"
 msgstr "Vlastní _pomůcky"
 
-#: src/gui.c:352 src/multitrack.c:5964
+#: src/gui.c:351 src/multitrack.c:6143
 msgid "_File"
 msgstr "_Soubor"
 
-#: src/gui.c:367 src/multitrack.c:5989
+#: src/gui.c:366 src/multitrack.c:6168
 msgid "_Open File/Directory"
 msgstr "_Otevřít soubor/adresář"
 
-#: src/gui.c:373
+#: src/gui.c:372
 msgid "O_pen Part of File..."
 msgstr ""
 
-#: src/gui.c:379 src/gui.c:383 src/multitrack.c:6006 src/multitrack.c:6023
-#: src/multitrack.c:6028
+#: src/gui.c:378 src/gui.c:382 src/multitrack.c:6185 src/multitrack.c:6202
+#: src/multitrack.c:6207
 msgid "Open _Location/Stream..."
 msgstr "_Otevřít  umístění/stream..."
 
-#: src/gui.c:393 src/multitrack.c:6016
+#: src/gui.c:392 src/multitrack.c:6195
 msgid "Open _Youtube Clip..."
 msgstr ""
 
-#: src/gui.c:404
+#: src/gui.c:403
 msgid "Import from _dvd/vcd..."
 msgstr ""
 
-#: src/gui.c:413
+#: src/gui.c:412
 msgid "Import from _dvd"
 msgstr ""
 
-#: src/gui.c:416
+#: src/gui.c:415
 msgid "Import from _vcd"
 msgstr ""
 
-#: src/gui.c:419
+#: src/gui.c:418
 msgid "_Import from Firewire"
 msgstr ""
 
-#: src/gui.c:428 src/multitrack.c:6086
+#: src/gui.c:427 src/multitrack.c:6265
 msgid "Import from _Firewire Device (dv)"
 msgstr "Importovat z _Firewire zařízení (dv)"
 
-#: src/gui.c:429 src/multitrack.c:6094
+#: src/gui.c:428 src/multitrack.c:6273
 msgid "Import from _Firewire Device (hdv)"
 msgstr "Importovat z _Firewire zařízení (hdvú"
 
-#: src/gui.c:457
+#: src/gui.c:456
 msgid "_Add Webcam/TV card..."
 msgstr ""
 
-#: src/gui.c:476
+#: src/gui.c:475
 msgid "Add _Unicap Device"
 msgstr ""
 
-#: src/gui.c:486
+#: src/gui.c:485
 msgid "Add Live _Firewire Device"
 msgstr ""
 
-#: src/gui.c:495
+#: src/gui.c:494
 msgid "Add _TV Device"
 msgstr ""
 
-#: src/gui.c:510 src/multitrack.c:6117
+#: src/gui.c:509 src/multitrack.c:6296
 msgid "_Recent Files..."
 msgstr "_Poslední soubory..."
 
-#: src/gui.c:560 src/multitrack.c:6177
+#: src/gui.c:559 src/multitrack.c:6356
 msgid "_Reload Clip Set..."
 msgstr "_Znovuotevřít sadu..."
 
-#: src/gui.c:564 src/multitrack.c:6185
+#: src/gui.c:563 src/multitrack.c:6364
 msgid "Close/Sa_ve All Clips"
 msgstr "Zavřít/_Uložit vše"
 
-#: src/gui.c:575
+#: src/gui.c:574
 msgid "_Encode Clip As..."
 msgstr ""
 
-#: src/gui.c:577
+#: src/gui.c:576
 msgid "Encode _Selection As..."
 msgstr "Kódovat _výběr jako..."
 
-#: src/gui.c:584
+#: src/gui.c:583
 msgid "_Close This Clip"
 msgstr "_Zavřít tento klip"
 
-#: src/gui.c:595
+#: src/gui.c:594
 msgid "_Backup Clip as .lv1..."
 msgstr "_Zálohovat klip jako lv1..."
 
-#: src/gui.c:604
+#: src/gui.c:603
 msgid "_Restore Clip from .lv1..."
 msgstr "_Obnovit klip z .lv1..."
 
-#: src/gui.c:615
+#: src/gui.c:614
 msgid "Encode/Load/Backup _with Sound"
 msgstr "Kódovat/Otevřít/Zálohovat _se zvukem"
 
-#: src/gui.c:620
+#: src/gui.c:619
 msgid "Auto load subtitles"
 msgstr ""
 
-#: src/gui.c:628 src/multitrack.c:6224
+#: src/gui.c:627 src/multitrack.c:6403
 msgid "Clean _up Diskspace"
 msgstr "_Vyčistit disk"
 
-#: src/gui.c:636 src/multitrack.c:6257
+#: src/gui.c:635 src/multitrack.c:6436
 msgid "_Edit"
 msgstr "_Editovat"
 
-#: src/gui.c:685
+#: src/gui.c:684
 msgid "_MULTITRACK mode"
 msgstr "_VÍCESTOPÝ režim"
 
-#: src/gui.c:696
+#: src/gui.c:695
 msgid "_Copy Selection"
 msgstr "_Kopírovat výběr"
 
-#: src/gui.c:705
+#: src/gui.c:704
 msgid "Cu_t Selection"
 msgstr "Vyjmout výběr"
 
-#: src/gui.c:714
+#: src/gui.c:713
 msgid "_Insert from Clipboard..."
 msgstr "_Vložit ze schránky..."
 
-#: src/gui.c:730
+#: src/gui.c:729
 msgid "Paste as _New"
 msgstr "Vložit jako _nový"
 
-#: src/gui.c:739
+#: src/gui.c:738
 msgid "_Merge Clipboard with Selection..."
 msgstr "_Sloučit schránku s výběrem..."
 
-#: src/gui.c:746
+#: src/gui.c:745
 msgid "_Delete Selection"
 msgstr "_Smazat výběr"
 
-#: src/gui.c:764
+#: src/gui.c:763
 msgid "Decouple _Video from Audio"
 msgstr "Oddělit _video od zvuku"
 
-#: src/gui.c:772
+#: src/gui.c:771
 msgid "_Select..."
 msgstr "_Vybrat..."
 
-#: src/gui.c:786
+#: src/gui.c:785
 msgid "Select _All Frames"
 msgstr "Vybrat všechny snímky"
 
-#: src/gui.c:794
+#: src/gui.c:793
 msgid "_Start Frame Only"
 msgstr "_Pouze počáteční snímek"
 
-#: src/gui.c:802
+#: src/gui.c:801
 msgid "_End Frame Only"
 msgstr "_Pouze poslední snímek"
 
-#: src/gui.c:813
+#: src/gui.c:812
 msgid "Select from _First Frame"
 msgstr "Vybrat od prvního snímku"
 
-#: src/gui.c:817
+#: src/gui.c:816
 msgid "Select to _Last Frame"
 msgstr "Vybrat do _posledního snímku"
 
-#: src/gui.c:821
+#: src/gui.c:820
 msgid "Select Last Insertion/_Merge"
 msgstr "Vybrat poslední vložení/_Sloučení"
 
-#: src/gui.c:825
+#: src/gui.c:824
 msgid "Select Last _Effect"
 msgstr "Vybrat poslední _efekt"
 
-#: src/gui.c:829
+#: src/gui.c:828
 msgid "_Invert Selection"
 msgstr "_Obrátit výběr"
 
-#: src/gui.c:837
+#: src/gui.c:836
 msgid "_Lock Selection Width"
 msgstr "_Zamknout šířku výběru"
 
-#: src/gui.c:842 src/multitrack.c:6409
+#: src/gui.c:841 src/multitrack.c:6591
 msgid "_Play"
 msgstr "_Přehrát"
 
-#: src/gui.c:854
+#: src/gui.c:853
 msgid "_Play All"
 msgstr "_Přehrát vše"
 
-#: src/gui.c:869
+#: src/gui.c:868
 msgid "Pla_y Selection"
 msgstr "_Přehrát výběr"
 
-#: src/gui.c:877
+#: src/gui.c:876
 msgid "Play _Clipboard"
 msgstr "_Přehrát schránku"
 
-#: src/gui.c:899 src/multitrack.c:6441
+#: src/gui.c:898 src/multitrack.c:6623
 msgid "_Stop"
 msgstr "_Stop"
 
-#: src/gui.c:914 src/multitrack.c:6453
+#: src/gui.c:913 src/multitrack.c:6635
 msgid "Re_wind"
 msgstr "_Převinout"
 
-#: src/gui.c:946 src/multitrack.c:6471
+#: src/gui.c:945 src/multitrack.c:6653
 msgid "_Full Screen"
 msgstr "_Plná obrazovka"
 
-#: src/gui.c:955
+#: src/gui.c:954
 msgid "_Double Size"
 msgstr "_Dvojitá velikost"
 
-#: src/gui.c:963 src/multitrack.c:6479
+#: src/gui.c:962 src/multitrack.c:6661
 msgid "Play in _Separate Window"
 msgstr "_Přehrát v odděleném okně"
 
-#: src/gui.c:972
+#: src/gui.c:971
 msgid "_Blank Background"
 msgstr "_Prázdné pozadí"
 
-#: src/gui.c:979
+#: src/gui.c:978
 msgid "(Auto)_loop Video (to fit audio track)"
 msgstr "(Automaticky)_opakovat video (vyplnit podle zvuku)"
 
-#: src/gui.c:988 src/multitrack.c:6487
+#: src/gui.c:987 src/multitrack.c:6669
 msgid "L_oop Continuously"
 msgstr "O_pakovat nepřetržitě"
 
-#: src/gui.c:997
+#: src/gui.c:996
 msgid "Pin_g Pong Loops"
 msgstr "Pin_g Pong Smyčky"
 
-#: src/gui.c:1005 src/multitrack.c:6495
+#: src/gui.c:1004 src/multitrack.c:6677
 msgid "_Mute"
 msgstr "_Ztlumit zvuk"
 
-#: src/gui.c:1017
+#: src/gui.c:1016
 msgid "Separate Window 'S_ticky' Mode"
 msgstr "Oddělené okno sticky mode"
 
-#: src/gui.c:1025
+#: src/gui.c:1024
 msgid "S_how Frame Counter"
 msgstr "Ukázat počítadlo snímků"
 
-#: src/gui.c:1035
+#: src/gui.c:1034
 msgid "Show Subtitles"
 msgstr ""
 
-#: src/gui.c:1045
+#: src/gui.c:1044
 msgid "Letterbox mode"
 msgstr ""
 
-#: src/gui.c:1051 src/multitrack.c:6507
+#: src/gui.c:1050 src/multitrack.c:6689
 msgid "Effect_s"
 msgstr "E_fekty"
 
-#: src/gui.c:1054
+#: src/gui.c:1053
 msgid "Effects are applied to the current selection."
 msgstr "Efekty jsou použity na současný výběr"
 
-#: src/gui.c:1067
+#: src/gui.c:1066
 msgid "_Run Test Rendered Effect/Tool/Generator..."
 msgstr ""
 
-#: src/gui.c:1072 src/multitrack.c:7123
+#: src/gui.c:1071 src/multitrack.c:7299
 msgid "_Tools"
 msgstr "_Nástroje"
 
-#: src/gui.c:1075
+#: src/gui.c:1074
 msgid "Tools are applied to complete clips."
 msgstr "Nástroje jsou použity na dokončení klipů"
 
-#: src/gui.c:1085
+#: src/gui.c:1084
 msgid "_Reverse Clipboard"
 msgstr "_Otočit schránku"
 
-#: src/gui.c:1094
+#: src/gui.c:1093
 msgid "_Change Playback/Save Speed..."
 msgstr "_Změnit přehrávání / Uložit rychlost"
 
-#: src/gui.c:1099
+#: src/gui.c:1098
 msgid "Resample _Video to New Frame Rate..."
 msgstr "Převzorkovat _video na nový poměr(sample rate)"
 
-#: src/gui.c:1105
+#: src/gui.c:1104
 msgid "_Utilities"
 msgstr "_Pomůcky"
 
-#: src/gui.c:1110
+#: src/gui.c:1109
 msgid "Custom _Tools"
 msgstr "Vlastní _nástroje"
 
-#: src/gui.c:1116 src/multitrack.c:7149
+#: src/gui.c:1115 src/multitrack.c:7325
 msgid "_Generate"
 msgstr "_Generovat"
 
-#: src/gui.c:1126
+#: src/gui.c:1125
 msgid "Loading rendered effect plugins..."
 msgstr ""
 
-#: src/gui.c:1139
+#: src/gui.c:1138
 msgid "Load _Subtitles from File..."
 msgstr ""
 
-#: src/gui.c:1144
+#: src/gui.c:1143
 msgid "Erase subtitles"
 msgstr ""
 
-#: src/gui.c:1152 src/multitrack.c:7158
+#: src/gui.c:1151 src/multitrack.c:7334
 msgid "Capture _External Window... "
 msgstr "Zachytit _externí okno "
 
-#: src/gui.c:1159 src/multitrack.c:7173
+#: src/gui.c:1158 src/multitrack.c:7349
 msgid "_Preferences..."
 msgstr "_Nastavení..."
 
-#: src/gui.c:1172
+#: src/gui.c:1171
 msgid "_Audio"
 msgstr "_Zvuk"
 
-#: src/gui.c:1184
+#: src/gui.c:1183
 msgid "Load _New Audio for Clip..."
 msgstr "Zavést _nový zvuk pro klip"
 
-#: src/gui.c:1190
+#: src/gui.c:1189
 msgid "Load _CD Track..."
 msgstr "Zavést _CD stopu"
 
-#: src/gui.c:1191
+#: src/gui.c:1190
 msgid "E_ject CD"
 msgstr "Vysunout CD"
 
-#: src/gui.c:1205
+#: src/gui.c:1204
 msgid "Record E_xternal Audio..."
 msgstr "Nahrát e_xterní zvuk..."
 
-#: src/gui.c:1218
+#: src/gui.c:1217
 msgid "to New _Clip..."
 msgstr "k novému _klipu..."
 
-#: src/gui.c:1222
+#: src/gui.c:1221
 msgid "to _Selection"
 msgstr "k _výběru"
 
-#: src/gui.c:1230
+#: src/gui.c:1229
 msgid "Fade Audio _In..."
 msgstr "_Zesílit zvuk..."
 
-#: src/gui.c:1234
+#: src/gui.c:1233
 msgid "Fade Audio _Out..."
 msgstr "_Ztišit zvuk..."
 
-#: src/gui.c:1244
+#: src/gui.c:1243
 msgid "_Export Audio..."
 msgstr "_Vyexportovat zvuk"
 
-#: src/gui.c:1257
+#: src/gui.c:1256
 msgid "Export _Selected Audio..."
 msgstr "_Vyexportovat označený zvuk"
 
-#: src/gui.c:1261
+#: src/gui.c:1260
 msgid "Export _All Audio..."
 msgstr "_Vyexportovat všechen zvuk"
 
-#: src/gui.c:1265
+#: src/gui.c:1264
 msgid "_Append Audio..."
 msgstr "_Připojit zvuk"
 
-#: src/gui.c:1270
+#: src/gui.c:1269
 msgid "_Trim/Pad Audio..."
 msgstr "_Oříznout/pad zvuk..."
 
-#: src/gui.c:1283
+#: src/gui.c:1282
 msgid "Trim/Pad Audio to _Selection"
 msgstr "_oříznout/pad zvuk k označení..."
 
-#: src/gui.c:1288
+#: src/gui.c:1287
 msgid "Trim/Pad Audio from Beginning to _Play Start"
 msgstr "_oříznout/pad zvuk od začátku do _Hraj Start..."
 
-#: src/gui.c:1293
+#: src/gui.c:1292
 msgid "_Delete Audio..."
 msgstr "_vymazat zvuk"
 
-#: src/gui.c:1306
+#: src/gui.c:1305
 msgid "Delete _Selected Audio"
 msgstr "_vymazat označený zvuk"
 
-#: src/gui.c:1310
+#: src/gui.c:1309
 msgid "Delete _All Audio"
 msgstr "_vymazat veškerý zvuk"
 
-#: src/gui.c:1314
+#: src/gui.c:1313
 msgid "Insert _Silence in Selection"
 msgstr "Vsunout _ticho do výběru"
 
-#: src/gui.c:1319
+#: src/gui.c:1318
 msgid "_Resample Audio..."
 msgstr "_Převzorkovat zvuk..."
 
-#: src/gui.c:1324
+#: src/gui.c:1323
 msgid "_Info"
 msgstr "_Info"
 
-#: src/gui.c:1336
+#: src/gui.c:1335
 msgid "Show Clip _Info"
 msgstr "Zobrazit _Informace o klipu"
 
-#: src/gui.c:1344
+#: src/gui.c:1343
 msgid "Show/_Edit File Comments"
 msgstr "Zobrazit/ _Upravit komentáře k souboru"
 
-#: src/gui.c:1349
+#: src/gui.c:1348
 msgid "Show _Clipboard Info"
 msgstr "Zobrazit _informace o schránce"
 
-#: src/gui.c:1360 src/multitrack.c:7286
+#: src/gui.c:1359 src/multitrack.c:7462
 msgid "Show _Messages"
 msgstr "Zobrazit _zprávy"
 
-#: src/gui.c:1364 src/multitrack.c:7365
+#: src/gui.c:1363 src/multitrack.c:7541
 msgid "Show _Layout Errors"
 msgstr "Zobrazit chyby _rozložení"
 
-#: src/gui.c:1369 src/multitrack.c:7263
+#: src/gui.c:1368 src/multitrack.c:7439
 msgid "_Clips"
 msgstr "_Klipy"
 
-#: src/gui.c:1381
+#: src/gui.c:1380
 msgid "_Rename Current Clip in Menu..."
 msgstr "_Přejmenovat klip v menu..."
 
-#: src/gui.c:1399
+#: src/gui.c:1398
 msgid "A_dvanced"
 msgstr "Pro _pokročilé"
 
-#: src/gui.c:1412
+#: src/gui.c:1411
 msgid "_RFX Effects/Tools/Utilities"
 msgstr "_RFX Efekty/Nástroje/Pomůcky"
 
-#: src/gui.c:1424
+#: src/gui.c:1423
 msgid "_New Test RFX Script..."
 msgstr "_Nový test RFX Skript"
 
-#: src/gui.c:1428
+#: src/gui.c:1427
 msgid "_Copy RFX Script to Test..."
 msgstr "_Kopírovat RFX Skript k testování..."
 
-#: src/gui.c:1432
+#: src/gui.c:1431
 msgid "_Edit Test RFX Script..."
 msgstr "_Upravit RFX Skript"
 
-#: src/gui.c:1436
+#: src/gui.c:1435
 msgid "Rena_me Test RFX Script..."
 msgstr "_Přejmenovat RFX Skript"
 
-#: src/gui.c:1440
+#: src/gui.c:1439
 msgid "_Delete Test RFX Script..."
 msgstr "_Smazat test RFX Skript"
 
-#: src/gui.c:1450
+#: src/gui.c:1449
 msgid "_Promote Test Rendered Effect/Tool/Generator..."
 msgstr ""
 
-#: src/gui.c:1457
+#: src/gui.c:1456
 msgid "_Import Custom RFX script..."
 msgstr "_Importovat vlastní RFX skript"
 
-#: src/gui.c:1461
+#: src/gui.c:1460
 msgid "E_xport Custom RFX script..."
 msgstr "_Exportovat vlastní RFX skript"
 
-#: src/gui.c:1465
+#: src/gui.c:1464
 msgid "De_lete Custom RFX Script..."
 msgstr "_Smazat vlastní RFX skript"
 
-#: src/gui.c:1472
+#: src/gui.c:1471
 msgid "Re_build all RFX plugins"
 msgstr "_Rekonstruovat všechny RFX pluginy"
 
-#: src/gui.c:1501
+#: src/gui.c:1498
 msgid "Receive _LiVES stream from..."
 msgstr ""
 
-#: src/gui.c:1506
+#: src/gui.c:1503
 msgid "_Send LiVES stream to..."
 msgstr "_Poslat LiVES proud do ..."
 
-#: src/gui.c:1515
+#: src/gui.c:1512
 #, c-format
 msgid "Open _yuv4mpeg stream on %sstream.yuv..."
 msgstr "Otevřít _yuv4mpeg stream na %sstream.yuv"
 
-#: src/gui.c:1536
+#: src/gui.c:1534
 msgid "_Import Project (.lv2)..."
 msgstr "_Importovat projekt (.lv2)..."
 
-#: src/gui.c:1540
+#: src/gui.c:1538
 msgid "E_xport Project (.lv2)..."
 msgstr "E_xportovat projekt (.lv2)"
 
-#: src/gui.c:1545
+#: src/gui.c:1543
 msgid "_VJ"
 msgstr "_VJ"
 
-#: src/gui.c:1557
+#: src/gui.c:1555
 msgid "Real Time _Effect Mapping"
 msgstr "Mapování real time _efektu"
 
-#: src/gui.c:1563
+#: src/gui.c:1561
 msgid "Bind real time effects to ctrl-number keys."
 msgstr "Přiřaď real time efekty k ctrl-numerickým klávesám."
 
-#: src/gui.c:1565
+#: src/gui.c:1563
 msgid "Set Real Time Effect _Defaults"
 msgstr "Nastavit _výchozí hodnoty real time effektu"
 
-#: src/gui.c:1567
+#: src/gui.c:1565
 msgid "Set default parameter values for real time effects."
 msgstr "Nastavit výchozí hodnoty pro real time efekty."
 
-#: src/gui.c:1580
+#: src/gui.c:1578
 msgid "Save Real Time Effect _Defaults"
 msgstr "Uložit _výchozí hodnoty real time effektu"
 
-#: src/gui.c:1583
+#: src/gui.c:1581
 msgid ""
 "Save real time effect defaults so they will be restored each time you use "
 "LiVES."
@@ -3461,318 +3450,318 @@
 "Uložit výchozí hodnoty real time efektů, budou použity při každém spuštění "
 "LiVES."
 
-#: src/gui.c:1589
+#: src/gui.c:1587
 msgid "_Reset all playback speeds and positions"
 msgstr "_Resetování všech rychlosti přehrávání a pozice"
 
-#: src/gui.c:1592
+#: src/gui.c:1590
 msgid ""
 "Reset all playback positions to frame 1, and reset all playback frame rates."
 msgstr ""
 
-#: src/gui.c:1594
+#: src/gui.c:1592
 msgid "_MIDI/joystick interface"
 msgstr "Rozhraní _MIDI/Joystick"
 
-#: src/gui.c:1609
+#: src/gui.c:1607
 msgid "_MIDI/joystick learner..."
 msgstr ""
 
-#: src/gui.c:1614
+#: src/gui.c:1612
 msgid "_Save device mapping..."
 msgstr "_Uložit mapu zařízení..."
 
-#: src/gui.c:1620
+#: src/gui.c:1618
 msgid "_Load device mapping..."
 msgstr "_Načíst mapu zařízení..."
 
-#: src/gui.c:1628
+#: src/gui.c:1626
 msgid "Show VJ _Keys"
 msgstr "Zobrazit VJ klávesy"
 
-#: src/gui.c:1632
+#: src/gui.c:1630
 msgid "To_ys"
 msgstr "Hračky"
 
-#: src/gui.c:1644
+#: src/gui.c:1642
 msgid "_None"
 msgstr "_Nic"
 
-#: src/gui.c:1652
+#: src/gui.c:1650
 msgid "_Autolives"
 msgstr ""
 
-#: src/gui.c:1657
+#: src/gui.c:1655
 msgid "_Mad Frames"
 msgstr "_Bláznivé snímky"
 
-#: src/gui.c:1662
+#: src/gui.c:1660
 msgid "_LiVES TV (broadband)"
 msgstr "_LiVES TV (širokopásmová)"
 
-#: src/gui.c:1672 src/multitrack.c:7387
+#: src/gui.c:1670 src/multitrack.c:7563
 msgid "_Help"
 msgstr "_Pomoc"
 
-#: src/gui.c:1684 src/multitrack.c:7407
+#: src/gui.c:1682 src/multitrack.c:7583
 msgid "_Manual (opens in browser)"
 msgstr "_Manuál (otevře se v prohlížeči)"
 
-#: src/gui.c:1691 src/multitrack.c:7416
+#: src/gui.c:1689 src/multitrack.c:7592
 msgid "_Donate to the project !"
 msgstr "_Věnovat prostředky na projekt !"
 
-#: src/gui.c:1695 src/multitrack.c:7420
+#: src/gui.c:1693 src/multitrack.c:7596
 msgid "_Email the author"
 msgstr "_E-mail autora"
 
-#: src/gui.c:1699 src/multitrack.c:7424
+#: src/gui.c:1697 src/multitrack.c:7600
 msgid "Report a _bug"
 msgstr "_Nahlásit chybu"
 
-#: src/gui.c:1703 src/multitrack.c:7428
+#: src/gui.c:1701 src/multitrack.c:7604
 msgid "Suggest a _feature"
 msgstr "Navrhněte _funkci"
 
-#: src/gui.c:1707 src/multitrack.c:7432
+#: src/gui.c:1705 src/multitrack.c:7608
 msgid "Assist with _translating"
 msgstr ""
 
-#: src/gui.c:1714 src/multitrack.c:7439
+#: src/gui.c:1712 src/multitrack.c:7615
 msgid "_Troubleshoot"
 msgstr ""
 
-#: src/gui.c:1718 src/multitrack.c:7443
+#: src/gui.c:1716 src/multitrack.c:7619
 msgid "_About"
 msgstr "_O LiVES"
 
-#: src/gui.c:1752
+#: src/gui.c:1750
 msgid "Rewind to start (w)"
 msgstr "Zpět na začátek (w)"
 
-#: src/gui.c:1760 src/multitrack.c:16720
+#: src/gui.c:1758 src/multitrack.c:17010
 msgid "Play all (p)"
 msgstr "Přehrát vše (p)"
 
-#: src/gui.c:1768 src/gui.c:1877
+#: src/gui.c:1766 src/gui.c:1876
 msgid "Stop playback (q)"
 msgstr "Zastavit přehrávání (q)"
 
-#: src/gui.c:1779
+#: src/gui.c:1777
 msgid "Play selection (y)"
 msgstr "Přehrát výběr (y)"
 
-#: src/gui.c:1832
+#: src/gui.c:1829
 msgid "Volume"
 msgstr "Hlasitost"
 
-#: src/gui.c:1854
+#: src/gui.c:1853
 msgid "Audio volume (1.00)"
 msgstr "Hlasitost zvuku (1.00)"
 
-#: src/gui.c:1883
+#: src/gui.c:1882
 msgid "Unblank background (b)"
 msgstr "Vyplň pozadí (b)"
 
-#: src/gui.c:1929
+#: src/gui.c:1928
 msgid "Play slower (ctrl-down)"
 msgstr "Hrát pomaleji (ctrl-šipka dolů)"
 
-#: src/gui.c:1935
+#: src/gui.c:1934
 msgid "Play faster (ctrl-up)"
 msgstr "Hrát rychleji (ctrl+šipka nahoru)"
 
-#: src/gui.c:1942
+#: src/gui.c:1941
 msgid "Skip back (ctrl-left)"
 msgstr "přeskočit dozadu (kontrol+levá šipka)"
 
-#: src/gui.c:1948
+#: src/gui.c:1947
 msgid "Skip forward (ctrl-right)"
 msgstr "Přeskočit dopředu (ctrl+pravá šipka)"
 
-#: src/gui.c:1954
+#: src/gui.c:1953
 msgid "Show clip info (i)"
 msgstr "Zobrazt informace o klipu (i)"
 
-#: src/gui.c:1960
+#: src/gui.c:1959
 msgid "Hide this toolbar"
 msgstr "Schovat tuto lištu"
 
-#: src/gui.c:1962
+#: src/gui.c:1961
 msgid ""
 "Press \"s\" to toggle separate play window for improved performance, \"q\" "
 "to stop."
 msgstr ""
 
 #. TRANSLATORS: please keep the translated string the same length
-#: src/gui.c:1995
+#: src/gui.c:1994
 msgid "     Video playback speed (frames per second)        "
 msgstr "     Rychlost přehrávání videa (snímků za sekundu)        "
 
-#: src/gui.c:2009
+#: src/gui.c:2008
 msgid "Vary the video speed"
 msgstr "Změnit rychlost videa"
 
-#: src/gui.c:2092 src/gui.c:3218
+#: src/gui.c:2090 src/gui.c:3329
 msgid "First Frame"
 msgstr "První snímek"
 
-#: src/gui.c:2193 src/gui.c:3226
+#: src/gui.c:2191 src/gui.c:3336
 msgid "Last Frame"
 msgstr "Poslední snímek"
 
-#: src/gui.c:2210
+#: src/gui.c:2208
 msgid "The first selected frame in this clip"
 msgstr "První vybraný snímek v tomto klipu"
 
-#: src/gui.c:2248
+#: src/gui.c:2246
 msgid "The last selected frame in this clip"
 msgstr "Poslední vybraný snímek v tomto klipu"
 
-#: src/gui.c:2532
+#: src/gui.c:2546
 msgid "Starting...\n"
 msgstr "Začíná.....\n"
 
-#: src/gui.c:3074
+#: src/gui.c:3181
 msgid "    Press 'q' to stop recording.  DO NOT COVER THE PLAY WINDOW !   "
 msgstr "    Stisknutím 'q' ukončíte nahrávání.  NEPŘEKRÝVEJTE HRACÍ OKNO !   "
 
-#: src/gui.c:3521
+#: src/gui.c:3643
 msgid "Frame number to preview"
 msgstr "Číslo snímku k náhledu"
 
-#: src/gui.c:3538
+#: src/gui.c:3660
 msgid "_Free"
 msgstr "Vo_lné"
 
-#: src/gui.c:3539
+#: src/gui.c:3661
 msgid "Free choice of frame number"
 msgstr "Volný výběr čísla snímku"
 
-#: src/gui.c:3543
+#: src/gui.c:3666
 msgid "_Start"
 msgstr "_Start"
 
-#: src/gui.c:3544
+#: src/gui.c:3667
 msgid "Frame number is linked to start frame"
 msgstr ""
 
-#: src/gui.c:3551
+#: src/gui.c:3675
 msgid "_End"
 msgstr "Kon_ec"
 
-#: src/gui.c:3552
+#: src/gui.c:3676
 msgid "Frame number is linked to end frame"
 msgstr ""
 
-#: src/gui.c:3559
+#: src/gui.c:3684
 msgid "_Pointer"
 msgstr "_Kurzor"
 
-#: src/gui.c:3560
+#: src/gui.c:3685
 msgid "Frame number is linked to playback pointer"
 msgstr ""
 
-#: src/gui.c:3581
+#: src/gui.c:3707
 msgid "Rewind"
 msgstr "Převinout"
 
-#: src/gui.c:3592 src/dialogs.c:894 src/dialogs.c:896 src/dialogs.c:1817
-#: src/dialogs.c:1819
+#: src/gui.c:3718 src/dialogs.c:960 src/dialogs.c:962 src/dialogs.c:1873
+#: src/dialogs.c:1875
 msgid "Play all"
 msgstr "Přehrát vše"
 
-#: src/gui.c:3605
+#: src/gui.c:3731
 msgid "Play Selection"
 msgstr "Přehrát výběr"
 
-#: src/gui.c:3619
+#: src/gui.c:3745
 msgid "Loop On/Off"
 msgstr "Opakování zapnuto/vypnuto"
 
-#: src/gui.c:3693
+#: src/gui.c:3819
 msgid "Start _recording"
 msgstr "Spustit _nahrávání"
 
-#: src/gui.c:3698
+#: src/gui.c:3824
 msgid "Stop _recording"
 msgstr "Zastavit _nahrávání"
 
-#: src/gui.c:3703
+#: src/gui.c:3829
 msgid "_Record Performance"
 msgstr ""
 
-#: src/gui.c:3851
+#: src/gui.c:3974
 msgid "Hide Play Window"
 msgstr "Schovat přehrávací okno"
 
-#: src/gui.c:4232
+#: src/gui.c:4333
 msgid "Show Play Window"
 msgstr "Zobrazit přehrávací okno"
 
-#: src/ce_thumbs.c:222
+#: src/ce_thumbs.c:242
 #, c-format
 msgid "Mapped to ctrl-%d"
 msgstr ""
 
-#: src/ce_thumbs.c:276 src/effects.c:85 src/preferences.c:3195
+#: src/ce_thumbs.c:296 src/effects.c:86 src/preferences.c:3247
 msgid "Effects"
 msgstr "Efekty"
 
-#: src/ce_thumbs.c:279 src/multitrack.c:5615
+#: src/ce_thumbs.c:299 src/multitrack.c:5791
 msgid "Clips"
 msgstr ""
 
-#: src/ce_thumbs.c:303
+#: src/ce_thumbs.c:323
 #, c-format
 msgid "Show / apply effects to %s\n"
 msgstr ""
 
-#: src/ce_thumbs.c:315
+#: src/ce_thumbs.c:335
 #, fuzzy, c-format
 msgid "Select clip for %s\n"
 msgstr "_Smazat klipy"
 
-#: src/ce_thumbs.c:515
+#: src/ce_thumbs.c:536
 msgid "_Pin"
 msgstr ""
 
-#: src/ce_thumbs.c:515
+#: src/ce_thumbs.c:537
 msgid "Pin the parameter box to the window"
 msgstr ""
 
 #. TRANSLATORS: Exabytes
-#: src/utils.c:794
+#: src/utils.c:800
 #, c-format
 msgid "%.2f EB"
 msgstr ""
 
 #. TRANSLATORS: Petabytes
-#: src/utils.c:798
+#: src/utils.c:803
 #, c-format
 msgid "%.2f PB"
 msgstr ""
 
 #. TRANSLATORS: Terabytes
-#: src/utils.c:802
+#: src/utils.c:806
 #, c-format
 msgid "%.2f TB"
 msgstr ""
 
 #. TRANSLATORS: Gigabytes
-#: src/utils.c:806
+#: src/utils.c:809
 #, c-format
 msgid "%.2f GB"
 msgstr ""
 
 #. TRANSLATORS: Megabytes
-#: src/utils.c:810
+#: src/utils.c:812
 #, c-format
 msgid "%.2f MB"
 msgstr ""
 
 #. TRANSLATORS: Kilobytes (1024 bytes)
-#: src/utils.c:814
+#: src/utils.c:815
 #, c-format
 msgid "%.2f KiB"
 msgstr ""
@@ -3782,7 +3771,7 @@
 msgid "%d bytes"
 msgstr ""
 
-#: src/utils.c:1841
+#: src/utils.c:1835
 msgid "Clearing the clipboard"
 msgstr "Mazání schránky"
 
@@ -3797,7 +3786,7 @@
 "==============================\n"
 "Přepnuto na klip %s\n"
 
-#: src/utils.c:1880
+#: src/utils.c:1877
 msgid ""
 "\n"
 "==============================\n"
@@ -3807,11 +3796,11 @@
 "==============================\n"
 "Přehození na prázdný klip\n"
 
-#: src/utils.c:1917
+#: src/utils.c:1916
 msgid "(blank)"
 msgstr ""
 
-#: src/utils.c:1920
+#: src/utils.c:1919
 #, c-format
 msgid ""
 "The set name has been changed from %s to %s. Affected layouts have been "
@@ -3820,7 +3809,7 @@
 "Jméno setu bylo změněno z %s na %s. Související rozložení budou "
 "aktualizovány\n"
 
-#: src/utils.c:1928
+#: src/utils.c:1927
 #, c-format
 msgid ""
 "The clip %s is missing from this set.\n"
@@ -3829,7 +3818,7 @@
 "Klip %s schází v tomto setu.\n"
 "Je vyžadován tímto rozložením:\n"
 
-#: src/utils.c:1932
+#: src/utils.c:1931
 #, c-format
 msgid ""
 "The clip %s has been closed.\n"
@@ -3838,7 +3827,7 @@
 "Klip %s byl uzavřen.\n"
 "Je vyžadován tímto rozložením:\n"
 
-#: src/utils.c:1937
+#: src/utils.c:1936
 #, c-format
 msgid ""
 "Frames have been shifted in the clip %s.\n"
@@ -3847,7 +3836,7 @@
 "Snímky v klipu %s byly posunuty.\n"
 "Tato rozvržení budou ovlivněny:\n"
 
-#: src/utils.c:1942
+#: src/utils.c:1941
 #, c-format
 msgid ""
 "Frames have been deleted from the clip %s.\n"
@@ -3856,7 +3845,7 @@
 "Snímky z klipu %s byly smazány.\n"
 "Tato rozvržení budou ovlivněna:\n"
 
-#: src/utils.c:1947
+#: src/utils.c:1946
 #, c-format
 msgid ""
 "Audio has been deleted from the clip %s.\n"
@@ -3865,7 +3854,7 @@
 "Zvuk byl smazán z klipu %s.\n"
 "Tato rozvržení budou ovlivněna:\n"
 
-#: src/utils.c:1952
+#: src/utils.c:1951
 #, c-format
 msgid ""
 "Audio has been shifted in clip %s.\n"
@@ -3874,7 +3863,7 @@
 "Zvuk v klipu %s byl posunut.\n"
 "Tato rozvržení budou ovlivněna:\n"
 
-#: src/utils.c:1957
+#: src/utils.c:1956
 #, c-format
 msgid ""
 "Audio has been altered in the clip %s.\n"
@@ -3883,7 +3872,7 @@
 "Zvuk v klipu %s byl upraven.\n"
 "Tato rozvržení budou ovlivněna:\n"
 
-#: src/utils.c:1962
+#: src/utils.c:1961
 #, c-format
 msgid ""
 "Frames have been altered in the clip %s.\n"
@@ -3892,7 +3881,7 @@
 "Snímky v klipu %s byly upraveny.\n"
 "Tato rozvržení budou ovlivněna:\n"
 
-#: src/utils.c:2135
+#: src/utils.c:2134
 #, c-format
 msgid ""
 "Set %s\n"
@@ -3900,7 +3889,7 @@
 "by another copy of LiVES.\n"
 msgstr ""
 
-#: src/utils.c:2142
+#: src/utils.c:2140
 #, c-format
 msgid ""
 "\n"
@@ -3956,68 +3945,68 @@
 msgid "Removing layout %s\n"
 msgstr "Odstraňuji rozložení %s\n"
 
-#: src/utils.c:3014
+#: src/utils.c:2996
 msgid "Video [opening...]"
 msgstr "Video [otevírání...]"
 
-#: src/utils.c:3018
+#: src/utils.c:2999
 #, c-format
 msgid "Video [%.2f sec]"
 msgstr "Video  [%.2f sek]"
 
-#: src/utils.c:3022
+#: src/utils.c:3002
 msgid "(Undefined)"
 msgstr "(Nepopsané)"
 
-#: src/utils.c:3025
+#: src/utils.c:3004
 msgid "(No video)"
 msgstr "(Žádné video)"
 
-#: src/utils.c:3032
+#: src/utils.c:3011
 msgid "(No audio)"
 msgstr "(Žádný zvuk)"
 
-#: src/utils.c:3037
+#: src/utils.c:3015
 msgid "Mono  [opening...]"
 msgstr "Mono  [otevírání...]"
 
-#: src/utils.c:3040
+#: src/utils.c:3017
 msgid "Left Audio [opening...]"
 msgstr "Levý kanál zvuku  [otevírání...]"
 
-#: src/utils.c:3045
+#: src/utils.c:3021
 #, c-format
 msgid "Mono [%.2f sec]"
 msgstr "Mono [%.2f sec]"
 
-#: src/utils.c:3048
+#: src/utils.c:3023
 #, c-format
 msgid "Left Audio [%.2f sec]"
 msgstr "Levý kanál zvuku   [%.2f sek]"
 
-#: src/utils.c:3056
+#: src/utils.c:3031
 msgid "Right Audio [opening...]"
 msgstr "Pravý kanál zvuku  [otevírání...]"
 
-#: src/utils.c:3059
+#: src/utils.c:3033
 #, c-format
 msgid "Right Audio [%.2f sec]"
 msgstr "Pravý kanál zvuku  [%.2f sek]"
 
-#: src/utils.c:3506
+#: src/utils.c:3472
 msgid "LiVES cannot switch to mplayer whilst clips are loading."
 msgstr "LiVES nemůže při načítání klipů přepnout na mplayer."
 
-#: src/utils.c:3559
+#: src/utils.c:3525
 #, fuzzy
 msgid "LiVES cannot switch to mplayer2 whilst clips are loading."
 msgstr "LiVES nemůže při načítání klipů přepnout na mplayer."
 
-#: src/utils.c:3809
+#: src/utils.c:3775
 msgid "Cleaning up clip"
 msgstr "Vyčištění klipu"
 
-#: src/utils.c:3913
+#: src/utils.c:3874
 #, c-format
 msgid ""
 "\n"
@@ -4032,30 +4021,29 @@
 "\n"
 "přemazat ?\n"
 
-#: src/utils.c:4305 src/utils.c:4337 src/multitrack.c:4503
+#: src/utils.c:4250 src/utils.c:4280 src/multitrack.c:4672
 #, c-format
 msgid "_Undo %s"
 msgstr "_Vrátit %s"
 
-#: src/utils.c:4306 src/utils.c:4338 src/multitrack.c:4525
+#: src/utils.c:4251 src/utils.c:4281 src/multitrack.c:4693
 #, c-format
 msgid "_Redo %s"
 msgstr "_Opakovat %s"
 
-#: src/utils.c:4363
+#: src/utils.c:4305
 msgid "-------------Selection------------"
 msgstr "---------------Výběr--------------"
 
-#. TRANSLATORS: - try to keep the text of the middle part the same length, by deleting "-" if necessary
-#: src/utils.c:4371
+#: src/utils.c:4313
 msgid " sec ] ----------Selection---------- [ "
 msgstr " sek ] ----------výběr---------- [ "
 
-#: src/utils.c:4371
+#: src/utils.c:4314
 msgid " frames ] ----------"
 msgstr " snímků ] ----------"
 
-#: src/utils.c:5360
+#: src/utils.c:5302
 msgid ""
 "Your version of mplayer/ffmpeg may be broken !\n"
 "See http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2071\n"
@@ -4066,11 +4054,11 @@
 "Try running Help/Troubleshoot for more information."
 msgstr ""
 
-#: src/saveplay.c:178
+#: src/saveplay.c:179
 msgid "Examining file header"
 msgstr "Kontroluji hlavičku souboru"
 
-#: src/saveplay.c:315 src/saveplay.c:789
+#: src/saveplay.c:316 src/saveplay.c:779
 #, c-format
 msgid "Opening %s"
 msgstr "Otvírání%s"
@@ -4080,36 +4068,36 @@
 msgid "Opening %s start time %.2f sec. frames %d"
 msgstr "Otvírání%s začátek %.2f sek. snímků %d"
 
-#: src/saveplay.c:326 src/saveplay.c:4001
+#: src/saveplay.c:326 src/saveplay.c:3927
 msgid " without sound"
 msgstr " bez zvuku"
 
-#: src/saveplay.c:396
+#: src/saveplay.c:395
 #, c-format
 msgid "Opening audio for %s"
 msgstr "Otevírám zvuk pro %s"
 
-#: src/saveplay.c:557
+#: src/saveplay.c:554
 #, c-format
 msgid "Auto trimming %.2f seconds of audio at start..."
 msgstr ""
 
-#: src/saveplay.c:567
+#: src/saveplay.c:562
 #, c-format
 msgid "Auto trimming %.2f seconds of audio at end..."
 msgstr ""
 
-#: src/saveplay.c:584
+#: src/saveplay.c:577
 #, c-format
 msgid "Auto padding with %.2f seconds of silence at start..."
 msgstr ""
 
-#: src/saveplay.c:599
+#: src/saveplay.c:590
 #, c-format
 msgid "Auto padding with %.2f seconds of silence at end..."
 msgstr ""
 
-#: src/saveplay.c:671
+#: src/saveplay.c:661
 #, c-format
 msgid ""
 "\n"
@@ -4121,11 +4109,11 @@
 "Are you sure you wish to continue ?"
 msgstr ""
 
-#: src/saveplay.c:685
+#: src/saveplay.c:676
 msgid " - please be patient."
 msgstr " - mějte přeci trpělivost."
 
-#: src/saveplay.c:938
+#: src/saveplay.c:926
 msgid ""
 "\n"
 "\n"
@@ -4137,7 +4125,7 @@
 "LiVES nebyl schopen extrahovat buď video, nebo zvuk.\n"
 "Prosím, pro více informací zkontrolujte okno terminálu.\n"
 
-#: src/saveplay.c:940
+#: src/saveplay.c:928
 msgid ""
 "\n"
 "\n"
@@ -4147,7 +4135,7 @@
 "\n"
 "K otevření tohoto souboru musíte nainstalovat mplayer.\n"
 
-#: src/saveplay.c:948
+#: src/saveplay.c:934
 msgid ""
 "\n"
 "\n"
@@ -4159,29 +4147,29 @@
 "Zkontrolujte nastavení příkazu pro otevření videa v\n"
 "Nástrojích|Předvolbách|Dekodování\n"
 
-#: src/saveplay.c:1014
+#: src/saveplay.c:995
 msgid "Adding image..."
 msgstr ""
 
-#: src/saveplay.c:1108
+#: src/saveplay.c:1089
 #, c-format
 msgid "Subtitles were saved as %s\n"
 msgstr ""
 
-#: src/saveplay.c:1192
+#: src/saveplay.c:1171
 #, c-format
 msgid "LiVES: Save Frame %d as..."
 msgstr ""
 
-#: src/saveplay.c:1195
+#: src/saveplay.c:1174
 msgid "LiVES: Save Frame as..."
 msgstr ""
 
-#: src/saveplay.c:1322
+#: src/saveplay.c:1303
 msgid "LiVES: Save Clip as..."
 msgstr ""
 
-#: src/saveplay.c:1390
+#: src/saveplay.c:1369
 msgid ""
 "Saving your video could lead to a loss of quality !\n"
 "You are strongly advised to 'Save As' to a new file.\n"
@@ -4193,34 +4181,34 @@
 "\n"
 "Tak co, pokračovat ?"
 
-#: src/saveplay.c:1517 src/saveplay.c:1683 src/saveplay.c:1762
-#: src/saveplay.c:4014
+#: src/saveplay.c:1494 src/saveplay.c:1659 src/saveplay.c:1738
+#: src/saveplay.c:3940
 msgid "Pulling frames from clip"
 msgstr ""
 
-#: src/saveplay.c:1588 src/saveplay.c:1727
+#: src/saveplay.c:1565 src/saveplay.c:1703
 msgid "Linking selection"
 msgstr "Spojuji výběr"
 
-#: src/saveplay.c:1779
+#: src/saveplay.c:1755
 msgid " (with no sound)\n"
 msgstr " (bez zvuku)\n"
 
-#: src/saveplay.c:1786
+#: src/saveplay.c:1761
 #, c-format
 msgid "Saving frames %d to %d%s as \"%s\" : encoder = %s : format = %s..."
 msgstr "Ukládání snímků %d do %d%s jako \"%s\" : enkoder = %s : formát = %s..."
 
-#: src/saveplay.c:1790
+#: src/saveplay.c:1765
 #, c-format
 msgid "Saving frames 1 to %d%s as \"%s\" : encoder %s : format = %s..."
 msgstr "Ukládání snímků 1 do %d%s jako \"%s\" : enkoder = %s : formát = %s..."
 
-#: src/saveplay.c:1909
+#: src/saveplay.c:1890
 msgid "Saving [can take a long time]"
 msgstr "Ukládám [může to chvíli trvat]"
 
-#: src/saveplay.c:2057
+#: src/saveplay.c:2044
 msgid ""
 "\n"
 "\n"
@@ -4230,33 +4218,33 @@
 "\n"
 "Chyba enkoderu - výstupní soubor nebyl vytvořen !\n"
 
-#: src/saveplay.c:2094
+#: src/saveplay.c:2081
 msgid "Clearing letterbox"
 msgstr ""
 
-#: src/saveplay.c:2183
+#: src/saveplay.c:2168
 #, c-format
 msgid "File size was %s\n"
 msgstr ""
 
-#: src/saveplay.c:2284
+#: src/saveplay.c:2265
 msgid "recording aborted by preview.\n"
 msgstr "nahrávání přerušeno náhledem.\n"
 
-#: src/saveplay.c:2288
+#: src/saveplay.c:2268
 msgid "recording aborted by clipboard playback.\n"
 msgstr "nahrávání přerušeno přehráváním náhledu.\n"
 
-#: src/saveplay.c:2291
+#: src/saveplay.c:2270
 msgid "Recording performance..."
 msgstr "Nahrávání produkce..."
 
-#: src/saveplay.c:3293
+#: src/saveplay.c:3251
 #, c-format
 msgid "Average FPS was %.4f\n"
 msgstr "Průměrná hodnota FPS byla %.4f\n"
 
-#: src/saveplay.c:3299
+#: src/saveplay.c:3256
 msgid ""
 "\n"
 "\n"
@@ -4270,16 +4258,21 @@
 "Klikněte na Nástroje--->Změnit velikost všech snímků \n"
 "a změňte všechny velikost všech snímků na současnou hodnotu.\n"
 
-#: src/saveplay.c:3479
+#: src/saveplay.c:3429
 msgid "Unknown"
 msgstr "Neznámé"
 
-#: src/saveplay.c:3588 src/saveplay.c:4585
+#: src/saveplay.c:3538 src/saveplay.c:4502
 #, c-format
 msgid "Untitled%d"
 msgstr "Bez jména%d"
 
-#: src/saveplay.c:3633
+#: src/saveplay.c:3567
+#, c-format
+msgid "%d frames are enough !\n"
+msgstr "%d snímků je dost !\n"
+
+#: src/saveplay.c:3579
 #, c-format
 msgid ""
 "\n"
@@ -4287,7 +4280,7 @@
 "Bad things may happen with this clip.\n"
 msgstr ""
 
-#: src/saveplay.c:3723
+#: src/saveplay.c:3667
 #, c-format
 msgid ""
 "\n"
@@ -4299,14 +4292,14 @@
 "(snímků za sekundu). \n"
 "Výchozí hodnoty lze nastavit v Nástroje | Předvolby | Různé\n"
 
-#: src/saveplay.c:3735
+#: src/saveplay.c:3677
 #, c-format
 msgid "Playback speed was adjusted to %.3f frames per second to fit audio.\n"
 msgstr ""
 "Rychlost přehrávání byla upravena na %.3f snímků za sekundu, aby odpovídal "
 "zvuku.\n"
 
-#: src/saveplay.c:3754
+#: src/saveplay.c:3694
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d *bpp=Greyscale* fps=%.3f\n"
@@ -4315,7 +4308,7 @@
 "Snímky=%d typ=%s velikost=%dx%d *bpp=Šedá škála* snímků za sekundu  =%.3f\n"
 "Zvuk:"
 
-#: src/saveplay.c:3758 src/saveplay.c:4762
+#: src/saveplay.c:3698 src/saveplay.c:4671
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d bpp=%d fps=%.3f\n"
@@ -4324,54 +4317,54 @@
 "Snímků=%d typ=%s velikost=%dx%d bpp=%d snímků za sekundu =%.3f\n"
 "Zvuk:"
 
-#: src/saveplay.c:3762 src/saveplay.c:4766
+#: src/saveplay.c:3703 src/saveplay.c:4676
 #, c-format
 msgid "%s none\n"
 msgstr "%s nic\n"
 
-#: src/saveplay.c:3774
+#: src/saveplay.c:3714
 #, fuzzy, c-format
 msgid " - Author: %s\n"
 msgstr "Autor: %s"
 
-#: src/saveplay.c:3779
+#: src/saveplay.c:3717
 #, fuzzy, c-format
 msgid " - Title: %s\n"
 msgstr " - Komentář: %s\n"
 
-#: src/saveplay.c:3784
+#: src/saveplay.c:3720
 #, c-format
 msgid " - Comment: %s\n"
 msgstr " - Komentář: %s\n"
 
-#: src/saveplay.c:3897
+#: src/saveplay.c:3829
 #, c-format
 msgid "Saving frame %d as %s..."
 msgstr "Uložení snímků %d jako %s..."
 
-#: src/saveplay.c:3996
+#: src/saveplay.c:3924
 #, c-format
 msgid "Backing up %s to %s"
 msgstr "zZálohování %s jako %s"
 
-#: src/saveplay.c:4049
+#: src/saveplay.c:3975
 msgid "Backing up"
 msgstr "Zálohuji"
 
-#: src/saveplay.c:4083
+#: src/saveplay.c:4009
 msgid "performance data was backed up..."
 msgstr "data byly zazálohovány"
 
-#: src/saveplay.c:4661
+#: src/saveplay.c:4574
 #, c-format
 msgid "Restoring %s..."
 msgstr "Obnovování %s..."
 
-#: src/saveplay.c:4692
+#: src/saveplay.c:4603
 msgid "Restoring"
 msgstr "Obnovování"
 
-#: src/saveplay.c:4714
+#: src/saveplay.c:4625
 #, c-format
 msgid ""
 "\n"
@@ -4385,22 +4378,22 @@
 "LiVES ho nemohl obnovit.\n"
 
 #. TRANSLATORS: rec(ord) %.2f M(ega)B(ytes)
-#: src/saveplay.c:5207
+#: src/saveplay.c:5118
 #, c-format
 msgid "rec %.2f MB"
 msgstr ""
 
-#: src/saveplay.c:5213
+#: src/saveplay.c:5123
 #, c-format
 msgid "!rec %.2f MB"
 msgstr ""
 
 #. TRANSLATORS: rec(ord) ?? M(ega)B(ytes)
-#: src/saveplay.c:5216
+#: src/saveplay.c:5126
 msgid "rec ?? MB"
 msgstr ""
 
-#: src/saveplay.c:5241
+#: src/saveplay.c:5151
 #, c-format
 msgid ""
 "\n"
@@ -4408,7 +4401,7 @@
 "Record stop level can be set in Preferences.\n"
 msgstr ""
 
-#: src/saveplay.c:5535
+#: src/saveplay.c:5447
 msgid ""
 "\n"
 "Files from a previous run of LiVES were found.\n"
@@ -4418,47 +4411,69 @@
 "Byly nalezeny soubory z předchozího spuštění LiVES.\n"
 "Pokusit se o jejich obnovení?\n"
 
-#: src/saveplay.c:5557
+#: src/saveplay.c:5469
 msgid "Recovering files"
 msgstr "Obnovuji soubory"
 
-#: src/saveplay.c:5560
+#: src/saveplay.c:5472
 msgid "Recovering files..."
 msgstr ""
 
-#: src/dialogs.c:72
+#: src/dialogs.c:71
 msgid "Show affected _layouts"
 msgstr "Zobrazit postižených _rozložení"
 
-#: src/dialogs.c:128
+#: src/dialogs.c:113
+msgid ""
+"Do _not show this warning any more\n"
+"(can be turned back on from Preferences/Warnings)"
+msgstr ""
+"_Nezobrazovat již toto varování\n"
+"(změnu nastavení provedete v Nastavení > Varování)"
+
+#: src/dialogs.c:127
 msgid "_Recover disk space"
 msgstr ""
 
-#: src/dialogs.c:143
+#: src/dialogs.c:142
 msgid " _Advanced Settings >>"
 msgstr ""
 
-#: src/dialogs.c:184
+#: src/dialogs.c:183 src/dialogs.c:221
 msgid "LiVES: - Warning !"
 msgstr "LiVES: - Varování !"
 
 #: src/dialogs.c:194
+#, fuzzy
+msgid "LiVES: - Error !"
+msgstr "LiVES: - Varování !"
+
+#: src/dialogs.c:204
+#, fuzzy
+msgid "LiVES: - Information"
+msgstr "LiVES: Zpráva pro %s"
+
+#: src/dialogs.c:230
 msgid "LiVES: - Question"
 msgstr ""
 
-#: src/dialogs.c:204
+#: src/dialogs.c:239
 msgid "LiVES: - File Error"
 msgstr ""
 
-#: src/dialogs.c:208
+#: src/dialogs.c:241
 msgid "_Abort"
 msgstr ""
 
-#: src/dialogs.c:213
+#: src/dialogs.c:246
 msgid "_Retry"
 msgstr ""
 
-#: src/dialogs.c:597
+#: src/dialogs.c:306
+msgid "Show _Details"
+msgstr "Zobrazit _Detaily"
+
+#: src/dialogs.c:657
 #, c-format
 msgid ""
 "FREE SPACE IN THE PARTITION CONTAINING\n"
@@ -4469,7 +4484,7 @@
 "(Disk warning levels can be configured in Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:615
+#: src/dialogs.c:676
 #, c-format
 msgid ""
 "Free space in the partition containing\n"
@@ -4481,11 +4496,11 @@
 "Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:627
+#: src/dialogs.c:688
 msgid "Audio players cannot be switched during playback."
 msgstr "Audio přehrávače nemohou být přepnuty během přehrávání."
 
-#: src/dialogs.c:632
+#: src/dialogs.c:694
 msgid ""
 "\n"
 "\n"
@@ -4497,18 +4512,18 @@
 "LiVES nemohl vykonat tuto operaci kvůli nedostatek paměti.\n"
 "Co takhle zkusit zavřít ostatní prográmky ...\n"
 
-#: src/dialogs.c:752
+#: src/dialogs.c:820
 msgid "Processing has been paused."
 msgstr ""
 
-#: src/dialogs.c:937
+#: src/dialogs.c:1002
 #, c-format
 msgid ""
 "\n"
 "%s%d%% done. Time remaining: %u sec%s\n"
 msgstr ""
 
-#: src/dialogs.c:1335
+#: src/dialogs.c:1391
 #, c-format
 msgid ""
 "\n"
@@ -4517,14 +4532,14 @@
 "\n"
 "Otevřeno %d z %d snímků. Zbývající čas je přibližně %us.\n"
 
-#: src/dialogs.c:1337
+#: src/dialogs.c:1393
 #, c-format
 msgid ""
 "\n"
 "%d/%d frames opened.\n"
 msgstr ""
 
-#: src/dialogs.c:1341
+#: src/dialogs.c:1396
 #, c-format
 msgid ""
 "\n"
@@ -4533,7 +4548,7 @@
 "\n"
 "%d snímků otevřeno.\n"
 
-#: src/dialogs.c:1940
+#: src/dialogs.c:1993
 #, c-format
 msgid ""
 "\n"
@@ -4542,7 +4557,7 @@
 "\n"
 "Zbývající čas: %d sec"
 
-#: src/dialogs.c:1988
+#: src/dialogs.c:2040
 #, c-format
 msgid ""
 "\n"
@@ -4553,7 +4568,7 @@
 "Nezlobte se, ale LiVES může otevřít pouze %d souborů najednou.\n"
 "Zavřete soubor a zkuste to znova."
 
-#: src/dialogs.c:1994
+#: src/dialogs.c:2047
 #, c-format
 msgid ""
 "LiVES was unable to write to its temporary directory.\n"
@@ -4572,7 +4587,7 @@
 "\n"
 "Ujistěte se, že do tohoto adresáře můžete zapisovat."
 
-#: src/dialogs.c:2005
+#: src/dialogs.c:2059
 #, fuzzy
 msgid ""
 "\n"
@@ -4583,13 +4598,13 @@
 "LiVES pro provoz momentálně vyžaduje 'mplayer', nebo 'sox'. Nainstalujte "
 "jeden z nich a zkuste to znovu.\n"
 
-#: src/dialogs.c:2010
+#: src/dialogs.c:2064
 msgid ""
 "Audio was not loaded; please install mplayer or mplayer2 if you expected "
 "audio for this clip.\n"
 msgstr ""
 
-#: src/dialogs.c:2014
+#: src/dialogs.c:2069
 msgid ""
 "Audio resampling is required for this format.\n"
 "Please install 'sox'\n"
@@ -4599,7 +4614,7 @@
 "Prosím nainstalujte 'sox'\n"
 "Nebo vyberte jiný formát kódování v Nástroje | Nastavení | Encoding\n"
 
-#: src/dialogs.c:2019
+#: src/dialogs.c:2075
 msgid ""
 "\n"
 "\n"
@@ -4611,7 +4626,7 @@
 "Tento formát nelze použít s vybraným zvukovým kodekem.\n"
 "Nastavte zvukový kodek v Nástroje|Nastavení|Encoding\n"
 
-#: src/dialogs.c:2024
+#: src/dialogs.c:2080
 msgid ""
 "This layout includes generated frames.\n"
 "It cannot be saved, you must render it to a clip first.\n"
@@ -4619,13 +4634,13 @@
 "Toto rozvržení obsahuje vygenerované snímky.\n"
 "Nelze ho uložit. Nejprve ho vyrendrujte klip.\n"
 
-#: src/dialogs.c:2029
+#: src/dialogs.c:2085
 msgid ""
 "This layout includes generated or recorded audio.\n"
 "It cannot be saved, you must render it to a clip first.\n"
 msgstr ""
 
-#: src/dialogs.c:2039 src/dialogs.c:2137
+#: src/dialogs.c:2095 src/dialogs.c:2189
 #, c-format
 msgid ""
 "\n"
@@ -4636,7 +4651,7 @@
 "\n"
 "Z důvodu omezení ve %s formátu\n"
 
-#: src/dialogs.c:2059
+#: src/dialogs.c:2115
 msgid ""
 "LiVES recommends the following settings:\n"
 "\n"
@@ -4644,43 +4659,43 @@
 "LiVES doporučuje následující nastavení:\n"
 "\n"
 
-#: src/dialogs.c:2065 src/dialogs.c:2174 src/resample.c:850
+#: src/dialogs.c:2121 src/dialogs.c:2225 src/resample.c:839
 msgid ", signed"
 msgstr ", označeno"
 
-#: src/dialogs.c:2066 src/dialogs.c:2175 src/resample.c:853
+#: src/dialogs.c:2122 src/dialogs.c:2226 src/resample.c:841
 msgid ", unsigned"
 msgstr ", neoznačeno"
 
-#: src/dialogs.c:2070 src/dialogs.c:2179 src/resample.c:858
+#: src/dialogs.c:2126 src/dialogs.c:2230 src/resample.c:846
 msgid ", little-endian"
 msgstr ", malý endian"
 
-#: src/dialogs.c:2071 src/dialogs.c:2180 src/resample.c:861
+#: src/dialogs.c:2127 src/dialogs.c:2231 src/resample.c:848
 msgid ", big-endian"
 msgstr ", velký endian"
 
-#: src/dialogs.c:2077
+#: src/dialogs.c:2132
 #, c-format
 msgid "Use an audio rate of %d Hz%s%s\n"
 msgstr ""
 
-#: src/dialogs.c:2085
+#: src/dialogs.c:2140
 #, c-format
 msgid "Set video rate to %.3f frames per second\n"
 msgstr "Nastavení videa na %.3f snímků za sekundu\n"
 
-#: src/dialogs.c:2089
+#: src/dialogs.c:2143
 #, c-format
 msgid "Set video rate to %d:%d frames per second\n"
 msgstr "Nastavení videa na %d:%d snímků za sekundu\n"
 
-#: src/dialogs.c:2094 src/dialogs.c:2209
+#: src/dialogs.c:2148 src/dialogs.c:2258
 #, c-format
 msgid "Set video size to %d x %d pixels\n"
 msgstr "Nastav velikost videa na %d x %d pixelů\n"
 
-#: src/dialogs.c:2102 src/dialogs.c:2208
+#: src/dialogs.c:2156 src/dialogs.c:2257
 msgid ""
 "\n"
 "You may wish to:\n"
@@ -4688,35 +4703,35 @@
 "\n"
 "Přejete si:\n"
 
-#: src/dialogs.c:2105 src/dialogs.c:2200
+#: src/dialogs.c:2159 src/dialogs.c:2249
 #, c-format
 msgid "resize video to %d x %d pixels\n"
 msgstr "změnit velikost videa %d x %d pixelů\n"
 
-#: src/dialogs.c:2110
+#: src/dialogs.c:2163
 msgid "disable audio, since the target encoder cannot encode audio\n"
 msgstr ""
 
-#: src/dialogs.c:2170
+#: src/dialogs.c:2221
 msgid "LiVES must:\n"
 msgstr "LiVES musí:\n"
 
-#: src/dialogs.c:2185
+#: src/dialogs.c:2235
 #, c-format
 msgid "resample audio to %d Hz%s%s\n"
 msgstr ""
 
-#: src/dialogs.c:2192
+#: src/dialogs.c:2242
 #, c-format
 msgid "resample video to %.3f frames per second\n"
 msgstr "převzorkování videa na %.3f snímků za sekundu\n"
 
-#: src/dialogs.c:2196
+#: src/dialogs.c:2245
 #, c-format
 msgid "resample video to %d:%d frames per second\n"
 msgstr "převzorkování videa na %d:%d snímků za sekundu\n"
 
-#: src/dialogs.c:2215
+#: src/dialogs.c:2263
 msgid ""
 "\n"
 "You will be able to undo these changes afterwards.\n"
@@ -4730,7 +4745,7 @@
 "Vyberte `OK` pro pokračování, `Zrušit` pro storno.\n"
 "\n"
 
-#: src/dialogs.c:2218
+#: src/dialogs.c:2265
 msgid ""
 "\n"
 "Changes applied to the selection will not be permanent.\n"
@@ -4740,7 +4755,7 @@
 "Změny použité na výběr nebudou trvalé.\n"
 "\n"
 
-#: src/dialogs.c:2237
+#: src/dialogs.c:2285
 msgid ""
 "\n"
 "\n"
@@ -4753,7 +4768,7 @@
 "LiVES nemohl nahrát produkci. Nedostatek paměti \n"
 "Zkuste nahrát jen vybranou část souboru"
 
-#: src/dialogs.c:2244
+#: src/dialogs.c:2293
 msgid ""
 "The playback speed (fps), or the audio rate\n"
 " of the clipboard does not match\n"
@@ -4770,7 +4785,7 @@
 "Vložení bude upraveno, aby se vešlo do klipu\n"
 "Vyberte 'Zrušit' a ukončíte vkládání nebo 'OK' a pokračovat."
 
-#: src/dialogs.c:2253
+#: src/dialogs.c:2304
 #, c-format
 msgid ""
 "When opening a yuvmpeg stream, you should first create a fifo file in:\n"
@@ -4783,11 +4798,11 @@
 "click Cancel."
 msgstr ""
 
-#: src/dialogs.c:2305
+#: src/dialogs.c:2356
 msgid "Show Keys"
 msgstr "Zobrazit klávesy"
 
-#: src/dialogs.c:2306
+#: src/dialogs.c:2358
 msgid ""
 "You can use the following keys during playback to control LiVES:-\n"
 "\n"
@@ -4867,11 +4882,11 @@
 "d dvojí rozměr\n"
 "g smyčky ping pong\n"
 
-#: src/dialogs.c:2313
+#: src/dialogs.c:2365
 msgid "Multitrack Keys"
 msgstr "Klávesy pro výběr stopy"
 
-#: src/dialogs.c:2314
+#: src/dialogs.c:2367
 msgid ""
 "You can use the following keys to control the multitrack window:-\n"
 "\n"
@@ -4893,18 +4908,18 @@
 "For other keys, see the menus.\n"
 msgstr ""
 
-#: src/dialogs.c:2322
+#: src/dialogs.c:2375
 msgid "Message History"
 msgstr "Historie zpráv"
 
-#: src/dialogs.c:2335
+#: src/dialogs.c:2388
 #, c-format
 msgid ""
 "After upgrading/installing, you may need to adjust the <prefix_dir> setting "
 "in your %s file"
 msgstr ""
 
-#: src/dialogs.c:2344
+#: src/dialogs.c:2399
 #, c-format
 msgid ""
 "\n"
@@ -4915,7 +4930,7 @@
 "or change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/dialogs.c:2352
+#: src/dialogs.c:2408
 msgid ""
 "Sorry, unknown audio type.\n"
 "\n"
@@ -4925,18 +4940,18 @@
 "\n"
 " (Soubory musí mít příponu .mp3, .ogg, .wav, .mod, .xm nebo .it)"
 
-#: src/dialogs.c:2353
+#: src/dialogs.c:2409
 msgid "failed (unknown type)\n"
 msgstr "nezdařilo se(neznámý typ)\n"
 
-#: src/dialogs.c:2358
+#: src/dialogs.c:2415
 msgid ""
 "\n"
 "Do you wish to remove the layout files associated with this set ?\n"
 "(They will not be usable without the set).\n"
 msgstr ""
 
-#: src/dialogs.c:2363
+#: src/dialogs.c:2421
 #, c-format
 msgid ""
 "\n"
@@ -4949,7 +4964,7 @@
 "Kliknutím na 'OK' přidáte aktuální klipy a rozložení k existujícímu.\n"
 "Klikněte na 'Zrušit' pro výběr nového jména.\n"
 
-#: src/dialogs.c:2370
+#: src/dialogs.c:2429
 msgid ""
 "\n"
 "Frames from this clip are used in some multitrack layouts.\n"
@@ -4961,7 +4976,7 @@
 "Opravdu pokračovat ?\n"
 "."
 
-#: src/dialogs.c:2374
+#: src/dialogs.c:2433
 msgid ""
 "\n"
 "Audio from this clip is used in some multitrack layouts.\n"
@@ -4973,7 +4988,7 @@
 "Opravdu pokračovat ?\n"
 "."
 
-#: src/dialogs.c:2378
+#: src/dialogs.c:2438
 #, c-format
 msgid ""
 "\n"
@@ -4984,7 +4999,7 @@
 "Otherwise click Cancel to skip loading this file.\n"
 msgstr ""
 
-#: src/dialogs.c:2385
+#: src/dialogs.c:2446
 #, c-format
 msgid ""
 "\n"
@@ -4994,7 +5009,7 @@
 "The clip could not be loaded.\n"
 msgstr ""
 
-#: src/dialogs.c:2392
+#: src/dialogs.c:2455
 msgid ""
 "\n"
 "Dear user, the jack developers decided to remove the -Z option from jackd.\n"
@@ -5002,7 +5017,7 @@
 "Alternately, select a different audio player in Preferences.\n"
 msgstr ""
 
-#: src/dialogs.c:2396
+#: src/dialogs.c:2460
 msgid ""
 "\n"
 "Unable to start up jack. Please ensure that alsa is set up correctly on your "
@@ -5011,13 +5026,13 @@
 "Automatic jack startup will be disabled now.\n"
 msgstr ""
 
-#: src/dialogs.c:2402
+#: src/dialogs.c:2466
 msgid ""
 "\n"
 "Unable to connect to jack server. Please start jack before starting LiVES\n"
 msgstr ""
 
-#: src/dialogs.c:2411
+#: src/dialogs.c:2475
 #, c-format
 msgid ""
 "\n"
@@ -5028,13 +5043,13 @@
 "%s\n"
 msgstr ""
 
-#: src/dialogs.c:2418
+#: src/dialogs.c:2482
 msgid ""
 "\n"
 "Alternately, you can restart LiVES and select another audio player.\n"
 msgstr ""
 
-#: src/dialogs.c:2423
+#: src/dialogs.c:2488
 #, c-format
 msgid ""
 "\n"
@@ -5044,7 +5059,7 @@
 "It is recommended to increase it to at least %d MB"
 msgstr ""
 
-#: src/dialogs.c:2429
+#: src/dialogs.c:2496
 #, c-format
 msgid ""
 "\n"
@@ -5053,7 +5068,7 @@
 "Do you wish to delete them ?\n"
 msgstr ""
 
-#: src/dialogs.c:2436
+#: src/dialogs.c:2504
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for multitrack undo.\n"
@@ -5066,7 +5081,7 @@
 "Zavřete jinou aplikaci, nebo uberte paměť pro krok zpět\n"
 "v Nastavení/Multitrack/Paměť zpět\n"
 
-#: src/dialogs.c:2440
+#: src/dialogs.c:2508
 msgid ""
 "\n"
 "Out of memory for undo.\n"
@@ -5078,7 +5093,7 @@
 "Zvyšte velikost paměti pro krok zpět\n"
 "v Nastavení/Multitrack/Paměť zpět\n"
 
-#: src/dialogs.c:2444
+#: src/dialogs.c:2512
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for the multitrack undo buffer.\n"
@@ -5087,19 +5102,19 @@
 "LiVES nemohl rezervovat dostatek paměť pro zásobník multistopého kroku "
 "zpět.\n"
 
-#: src/dialogs.c:2446
+#: src/dialogs.c:2514
 msgid "or enter a smaller value.\n"
 msgstr "nebo vložte menší hodnotu.\n"
 
-#: src/dialogs.c:2448
+#: src/dialogs.c:2516
 msgid "Try again from the clip editor, try closing some other applications\n"
 msgstr "Zkuste znovu z editoru klipů, zkuste uzavřít jiné aplikace\n"
 
-#: src/dialogs.c:2449
+#: src/dialogs.c:2517
 msgid "Try closing some other applications\n"
 msgstr "Zkuste zavřít jinou aplikaci\n"
 
-#: src/dialogs.c:2460
+#: src/dialogs.c:2529
 msgid ""
 "Multitrack is set to 0 audio channels, but this layout has audio.\n"
 "You should adjust the audio settings from the Tools menu.\n"
@@ -5107,34 +5122,34 @@
 "Multitrack má nastaveno 0 zvukových kanálu, ale rozložení obsahuje zvuk.\n"
 "Upravte nastavení zvuku v menu Nástroje.\n"
 
-#: src/dialogs.c:2464
+#: src/dialogs.c:2534
 msgid ""
 "The current layout has audio, so audio channels may not be set to zero.\n"
 msgstr ""
 "Současná struktura obsahuje zvuk, proto zvukové kanály nemohou mít nulovou "
 "hodnotu.\n"
 
-#: src/dialogs.c:2468
+#: src/dialogs.c:2539
 msgid ""
 "Multitrack audio preview is only available with the\n"
 "\"jack\" or \"pulse audio\" audio player.\n"
 "You can set this in Tools|Preferences|Playback."
 msgstr ""
 
-#: src/dialogs.c:2472
+#: src/dialogs.c:2545
 msgid ""
 "Errors were detected in the layout (which may be due to transferring from "
 "another system, or from an older version of LiVES).\n"
 "Should I try to repair the disk copy of the layout ?\n"
 msgstr ""
 
-#: src/dialogs.c:2476
+#: src/dialogs.c:2549
 msgid ""
 "LiVES was unable to load the layout.\n"
 "Sorry.\n"
 msgstr ""
 
-#: src/dialogs.c:2482
+#: src/dialogs.c:2555
 msgid ""
 "\n"
 "\n"
@@ -5144,7 +5159,7 @@
 "\n"
 "Audio poměr(rate) musí být větší než 0.\n"
 
-#: src/dialogs.c:2486
+#: src/dialogs.c:2559
 msgid ""
 "\n"
 "Event list will be very large\n"
@@ -5152,7 +5167,7 @@
 "Are you sure you wish to view it ?\n"
 msgstr ""
 
-#: src/dialogs.c:2491
+#: src/dialogs.c:2564
 msgid ""
 "\n"
 "\n"
@@ -5162,7 +5177,7 @@
 "\n"
 "Pro používání této funkce musíte nainstalovat balík \"dvgrab\".\n"
 
-#: src/dialogs.c:2496
+#: src/dialogs.c:2570
 msgid ""
 "\n"
 "\n"
@@ -5171,25 +5186,25 @@
 "You may need to select one of these in Tools/Preferences/Playback.\n"
 msgstr ""
 
-#: src/dialogs.c:2500
+#: src/dialogs.c:2574
 msgid "Video playback plugin failed to initialise palette !\n"
 msgstr ""
 
-#: src/dialogs.c:2504
+#: src/dialogs.c:2579
 msgid "Decoder plugin failed to initialise palette !\n"
 msgstr ""
 
-#: src/dialogs.c:2509
+#: src/dialogs.c:2584
 msgid "Unable to set framerate of video plugin\n"
 msgstr ""
 
-#: src/dialogs.c:2514
+#: src/dialogs.c:2590
 msgid ""
 "After a crash, it is advisable to clean up the disk with\n"
 "File|Clean up disk space\n"
 msgstr ""
 
-#: src/dialogs.c:2526
+#: src/dialogs.c:2604
 #, c-format
 msgid ""
 "Stream frame size is too large for your network buffers.\n"
@@ -5198,33 +5213,33 @@
 "echo %d > /proc/sys/net/core/rmem_max\n"
 msgstr ""
 
-#: src/dialogs.c:2714
+#: src/dialogs.c:2800
 msgid "cancelled.\n"
 msgstr "přerušeno.\n"
 
-#: src/dialogs.c:2721
+#: src/dialogs.c:2805
 msgid "failed.\n"
 msgstr "selhalo.\n"
 
-#: src/dialogs.c:2728
+#: src/dialogs.c:2810
 msgid "done.\n"
 msgstr "hotovo.\n"
 
-#: src/dialogs.c:2732
+#: src/dialogs.c:2814
 msgid "error in file. Failed.\n"
 msgstr "chyba v souboru. Ukončeno.\n"
 
-#: src/dialogs.c:2766 src/dialogs.c:2815 src/dialogs.c:2839
+#: src/dialogs.c:2848 src/dialogs.c:2897 src/dialogs.c:2921
 #, c-format
 msgid "Additional info: %s\n"
 msgstr ""
 
-#: src/dialogs.c:2769
+#: src/dialogs.c:2851
 #, c-format
 msgid "The error value was %d%s\n"
 msgstr ""
 
-#: src/dialogs.c:2772
+#: src/dialogs.c:2854
 #, c-format
 msgid ""
 "\n"
@@ -5234,7 +5249,7 @@
 "%s%s%s"
 msgstr ""
 
-#: src/dialogs.c:2818
+#: src/dialogs.c:2900
 #, c-format
 msgid ""
 "\n"
@@ -5244,7 +5259,7 @@
 "%s"
 msgstr ""
 
-#: src/dialogs.c:2842
+#: src/dialogs.c:2924
 #, c-format
 msgid ""
 "\n"
@@ -5254,7 +5269,7 @@
 "%s"
 msgstr ""
 
-#: src/dialogs.c:2886
+#: src/dialogs.c:2968
 #, c-format
 msgid ""
 "\n"
@@ -5263,7 +5278,7 @@
 "Please check for possible error causes.\n"
 msgstr ""
 
-#: src/dialogs.c:2890
+#: src/dialogs.c:2971
 #, c-format
 msgid ""
 "\n"
@@ -5273,7 +5288,7 @@
 "%s.\n"
 msgstr ""
 
-#: src/dialogs.c:2921
+#: src/dialogs.c:3002
 #, c-format
 msgid ""
 "\n"
@@ -5282,7 +5297,7 @@
 "Please check for possible error causes.\n"
 msgstr ""
 
-#: src/dialogs.c:2925
+#: src/dialogs.c:3005
 #, c-format
 msgid ""
 "\n"
@@ -5292,12 +5307,12 @@
 "%s.\n"
 msgstr ""
 
-#: src/dialogs.c:2993
+#: src/dialogs.c:3073
 #, c-format
 msgid "Value for \"%s\" could not be read."
 msgstr ""
 
-#: src/dialogs.c:3011
+#: src/dialogs.c:3091
 #, c-format
 msgid ""
 "\n"
@@ -5306,7 +5321,7 @@
 "Please check your system for errors.\n"
 msgstr ""
 
-#: src/dialogs.c:3020
+#: src/dialogs.c:3100
 #, c-format
 msgid ""
 "\n"
@@ -5319,7 +5334,7 @@
 "%s\n"
 "podivejte se na zapisovací povolení rejstříku"
 
-#: src/dialogs.c:3027
+#: src/dialogs.c:3109
 #, c-format
 msgid ""
 "\n"
@@ -5328,7 +5343,7 @@
 "Please check the directory permissions and try again."
 msgstr ""
 
-#: src/dialogs.c:3034
+#: src/dialogs.c:3116
 #, c-format
 msgid ""
 "\n"
@@ -5336,14 +5351,14 @@
 "%s\n"
 msgstr ""
 
-#: src/dialogs.c:3041
+#: src/dialogs.c:3123
 msgid ""
 "\n"
 "Abort and exit immediately from LiVES\n"
 "Are you sure ?\n"
 msgstr ""
 
-#: src/dialogs.c:3047
+#: src/dialogs.c:3129
 #, c-format
 msgid ""
 "\n"
@@ -5351,13 +5366,13 @@
 "Please select another encoder from the list.\n"
 msgstr ""
 
-#: src/dialogs.c:3056
+#: src/dialogs.c:3139
 msgid ""
 "\n"
 "This card is already in use and cannot be opened multiple times.\n"
 msgstr ""
 
-#: src/dialogs.c:3061
+#: src/dialogs.c:3145
 #, c-format
 msgid ""
 "\n"
@@ -5367,27 +5382,27 @@
 "- Check if the device actually exists.\n"
 msgstr ""
 
-#: src/dialogs.c:3068
+#: src/dialogs.c:3153
 msgid ""
 "\n"
 "This file already has subtitles loaded.\n"
 "Do you wish to overwrite the existing subtitles ?\n"
 msgstr ""
 
-#: src/dialogs.c:3072
+#: src/dialogs.c:3157
 msgid ""
 "\n"
 "LiVES currently only supports subtitles of type .srt and .sub.\n"
 msgstr ""
 
-#: src/dialogs.c:3076
+#: src/dialogs.c:3161
 msgid ""
 "\n"
 "Erase all subtitles from this clip.\n"
 "Are you sure ?\n"
 msgstr ""
 
-#: src/dialogs.c:3082
+#: src/dialogs.c:3168
 #, c-format
 msgid ""
 "\n"
@@ -5396,14 +5411,14 @@
 "or OK to continue and save as type \"%s\"\n"
 msgstr ""
 
-#: src/dialogs.c:3089
+#: src/dialogs.c:3176
 msgid ""
 "\n"
 "Do you wish to move the current clip sets to the new directory ?\n"
 "(If unsure, click Yes)\n"
 msgstr ""
 
-#: src/dialogs.c:3093
+#: src/dialogs.c:3181
 #, c-format
 msgid ""
 "\n"
@@ -5414,19 +5429,19 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:3099
+#: src/dialogs.c:3188
 msgid ""
 "\n"
 "No video input devices could be found.\n"
 msgstr ""
 
-#: src/dialogs.c:3103
+#: src/dialogs.c:3192
 msgid ""
 "\n"
 "All video input devices are already in use.\n"
 msgstr ""
 
-#: src/dialogs.c:3107
+#: src/dialogs.c:3196
 msgid ""
 "\n"
 "\n"
@@ -5434,15 +5449,14 @@
 "DO NOT SHUT DOWN OR CLOSE LIVES !\n"
 msgstr ""
 
-#: src/dialogs.c:3127
+#: src/dialogs.c:3203
 #, c-format
 msgid ""
 "No clips were recovered for set (%s).\n"
 "Please check the spelling of the set name and try again.\n"
 msgstr ""
 
-#. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:3136
+#: src/dialogs.c:3214
 #, c-format
 msgid ""
 "\n"
@@ -5454,7 +5468,7 @@
 msgstr ""
 
 #. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:3144
+#: src/dialogs.c:3222
 #, c-format
 msgid ""
 "\n"
@@ -5463,34 +5477,34 @@
 "\n"
 msgstr ""
 
-#: src/dialogs.c:3150
+#: src/dialogs.c:3228
 msgid ""
 "\n"
 "You must have autolives.pl installed and in your path to use this toy.\n"
 "Consult your package distributor.\n"
 msgstr ""
 
-#: src/dialogs.c:3154
+#: src/dialogs.c:3232
 msgid ""
 "\n"
 "You must have a minimum of one clip loaded to use this toy.\n"
 msgstr ""
 
-#: src/dialogs.c:3158
+#: src/dialogs.c:3236
 msgid ""
 "\n"
 "LiVES lost its connection to jack and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:3162
+#: src/dialogs.c:3240
 msgid ""
 "\n"
 "LiVES lost its connection to pulseaudio and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:3175
+#: src/dialogs.c:3254
 #, c-format
 msgid ""
 "\n"
@@ -5499,240 +5513,240 @@
 "Do you wish to allow this (for this session only) ?\n"
 msgstr ""
 
-#: src/effects.c:60
+#: src/effects.c:61
 msgid "generator"
 msgstr "generátor"
 
-#: src/effects.c:61
+#: src/effects.c:62
 msgid "Generators"
 msgstr "Generátory"
 
-#: src/effects.c:63
+#: src/effects.c:64
 msgid "audio generator"
 msgstr ""
 
-#: src/effects.c:64
+#: src/effects.c:65
 msgid "Audio Generators"
 msgstr ""
 
-#: src/effects.c:66
+#: src/effects.c:67
 msgid "audio/video generator"
 msgstr ""
 
-#: src/effects.c:67
+#: src/effects.c:68
 msgid "Audio/Video Generators"
 msgstr ""
 
-#: src/effects.c:69
+#: src/effects.c:70
 msgid "data generator"
 msgstr ""
 
-#: src/effects.c:70
+#: src/effects.c:71
 msgid "Data Generators"
 msgstr ""
 
-#: src/effects.c:72
+#: src/effects.c:73
 msgid "data visualiser"
 msgstr ""
 
-#: src/effects.c:73
+#: src/effects.c:74
 msgid "Data Visualisers"
 msgstr ""
 
-#: src/effects.c:75
+#: src/effects.c:76
 msgid "data processor"
 msgstr ""
 
-#: src/effects.c:76
+#: src/effects.c:77
 msgid "Data Processors"
 msgstr ""
 
-#: src/effects.c:78
+#: src/effects.c:79
 msgid "data source"
 msgstr ""
 
-#: src/effects.c:79
+#: src/effects.c:80
 msgid "Data Sources"
 msgstr ""
 
-#: src/effects.c:81
+#: src/effects.c:82
 msgid "transition"
 msgstr "přechod"
 
-#: src/effects.c:82
+#: src/effects.c:83
 msgid "Transitions"
 msgstr "Přechody"
 
-#: src/effects.c:84
+#: src/effects.c:85
 msgid "effect"
 msgstr "efekt"
 
-#: src/effects.c:87 src/rfx-builder.c:187
+#: src/effects.c:88 src/rfx-builder.c:187
 msgid "utility"
 msgstr "pomůcka"
 
-#: src/effects.c:88
+#: src/effects.c:89
 msgid "Utilities"
 msgstr "Pomůcky"
 
-#: src/effects.c:90
+#: src/effects.c:91
 msgid "compositor"
 msgstr "sazeč"
 
-#: src/effects.c:91
+#: src/effects.c:92
 msgid "Compositors"
 msgstr "Sezeče"
 
-#: src/effects.c:93
+#: src/effects.c:94
 msgid "tap"
 msgstr "tap"
 
-#: src/effects.c:94
+#: src/effects.c:95
 msgid "Taps"
 msgstr "Taps"
 
-#: src/effects.c:96
+#: src/effects.c:97
 msgid "splitter"
 msgstr "rozdělovač"
 
-#: src/effects.c:97
+#: src/effects.c:98
 msgid "Splitters"
 msgstr "Rozdělovače"
 
-#: src/effects.c:99
+#: src/effects.c:100
 msgid "converter"
 msgstr ""
 
-#: src/effects.c:100
+#: src/effects.c:101
 msgid "Converters"
 msgstr "Převodníky"
 
-#: src/effects.c:102
+#: src/effects.c:103
 msgid "analyser"
 msgstr ""
 
-#: src/effects.c:103
+#: src/effects.c:104
 msgid "Analysers"
 msgstr ""
 
-#: src/effects.c:108
+#: src/effects.c:109
 msgid "audio/video"
 msgstr ""
 
-#: src/effects.c:109
+#: src/effects.c:110
 msgid "Audio/Video Transitions"
 msgstr "Přechody zvuku/videa"
 
-#: src/effects.c:111
+#: src/effects.c:112
 msgid "video only"
 msgstr ""
 
-#: src/effects.c:112
+#: src/effects.c:113
 msgid "Video only Transitions"
 msgstr ""
 
-#: src/effects.c:114 src/multitrack.c:10740
+#: src/effects.c:115 src/multitrack.c:10962
 msgid "audio only"
 msgstr "pouze zvuk"
 
-#: src/effects.c:115
+#: src/effects.c:116
 msgid "Audio only Transitions"
 msgstr ""
 
-#: src/effects.c:117 src/effects.c:120 src/multitrack.c:18757
+#: src/effects.c:118 src/effects.c:121 src/multitrack.c:19097
 msgid "audio"
 msgstr "audio"
 
-#: src/effects.c:118
+#: src/effects.c:119
 msgid "Audio Mixers"
 msgstr "Audio Mixery"
 
-#: src/effects.c:121
+#: src/effects.c:122
 msgid "Audio Effects"
 msgstr ""
 
-#: src/effects.c:123
+#: src/effects.c:124
 msgid "video"
 msgstr ""
 
-#: src/effects.c:124
+#: src/effects.c:125
 msgid "Video Effects"
 msgstr ""
 
-#: src/effects.c:126
+#: src/effects.c:127
 msgid "audio volume controller"
 msgstr "Ovládání hlasitosti"
 
-#: src/effects.c:127
+#: src/effects.c:128
 msgid "Audio Volume Controllers"
 msgstr "Ovladače hlasitosti zvuku"
 
-#: src/effects.c:129
+#: src/effects.c:130
 msgid "video analyser"
 msgstr ""
 
-#: src/effects.c:130
+#: src/effects.c:131
 msgid "Video analysers"
 msgstr ""
 
-#: src/effects.c:132
+#: src/effects.c:133
 msgid "audio analyser"
 msgstr ""
 
-#: src/effects.c:133
+#: src/effects.c:134
 msgid "Audio Analysers"
 msgstr ""
 
-#: src/effects.c:137 src/plugins.c:2559 src/plugins.c:2573
+#: src/effects.c:138 src/plugins.c:2507 src/plugins.c:2521
 msgid "unknown"
 msgstr "neznámý"
 
-#: src/effects.c:238
+#: src/effects.c:235
 #, c-format
 msgid "%s all frames..."
 msgstr "%s všechny snímky..."
 
-#: src/effects.c:243
+#: src/effects.c:239
 #, c-format
 msgid "%s clipboard into frames %d to %d..."
 msgstr "%s schránka do snímků %d na %d..."
 
-#: src/effects.c:250
+#: src/effects.c:245
 #, c-format
 msgid "%s to clipboard..."
 msgstr "%s do schránky..."
 
-#: src/effects.c:254
+#: src/effects.c:248
 #, c-format
 msgid "%s to new clip..."
 msgstr "%s do nového klipu..."
 
-#: src/effects.c:259
+#: src/effects.c:252
 #, c-format
 msgid "%s frames %d to %d..."
 msgstr "%s snímků %d do %d..."
 
-#: src/effects.c:290
+#: src/effects.c:283
 #, c-format
 msgid "%s clipboard with selection"
 msgstr "%s schránka s výběrem"
 
-#: src/effects.c:295
+#: src/effects.c:287
 #, c-format
 msgid "%s to clipboard"
 msgstr "%s do schránky"
 
-#: src/effects.c:299
+#: src/effects.c:290
 #, c-format
 msgid "%s to new clip"
 msgstr "%s do nového klipu"
 
-#: src/effects.c:304
+#: src/effects.c:294
 #, c-format
 msgid "%s frames %d to %d"
 msgstr "%s snímky %d do %d"
 
-#: src/effects.c:456 src/effects.c:523
+#: src/effects.c:443 src/effects.c:507
 msgid ""
 "\n"
 "No frames were generated.\n"
@@ -5740,305 +5754,305 @@
 "\n"
 "Nebyly generovány žádné snímky.\n"
 
-#: src/effects-weed.c:431
+#: src/effects-weed.c:452
 msgid "integer"
 msgstr ""
 
-#: src/effects-weed.c:432
+#: src/effects-weed.c:454
 msgid "int64"
 msgstr ""
 
-#: src/effects-weed.c:433
+#: src/effects-weed.c:456
 msgid "boolean"
 msgstr ""
 
-#: src/effects-weed.c:434
+#: src/effects-weed.c:458
 msgid "double"
 msgstr ""
 
-#: src/effects-weed.c:435
+#: src/effects-weed.c:460
 msgid "string"
 msgstr ""
 
-#: src/effects-weed.c:436
+#: src/effects-weed.c:462
 msgid "pointer"
 msgstr ""
 
-#: src/effects-weed.c:4591
+#: src/effects-weed.c:4581
 #, c-format
 msgid "Error: plugin %s has no weed_setup() function.\n"
 msgstr "Chyba: plugin %s nemá žádnou funkci weed_setup().\n"
 
-#: src/effects-weed.c:4606
+#: src/effects-weed.c:4595
 #, c-format
 msgid "No usable filters found in plugin %s\n"
 msgstr ""
 
-#: src/effects-weed.c:4680
+#: src/effects-weed.c:4668
 #, c-format
 msgid "Found duplicate plugin %s"
 msgstr ""
 
-#: src/effects-weed.c:4734
+#: src/effects-weed.c:4723
 #, c-format
 msgid ""
 "Info: Unable to load plugin %s\n"
 "Error was: %s\n"
 msgstr ""
 
-#: src/effects-weed.c:4737 src/effects-weed.c:5858
+#: src/effects-weed.c:4726 src/effects-weed.c:5847
 msgid "Some plugin directories"
 msgstr ""
 
 #. TRANSLATORS: example " - LADSPA plugins -"
-#: src/effects-weed.c:4812 src/rte_window.c:2105
+#: src/effects-weed.c:4801 src/rte_window.c:2107
 #, c-format
 msgid " - %s plugins -"
 msgstr ""
 
-#: src/effects-weed.c:5012
+#: src/effects-weed.c:4998
 #, c-format
 msgid "Successfully loaded %d Weed filters\n"
 msgstr ""
 
-#: src/effects-weed.c:5177
+#: src/effects-weed.c:5162
 #, c-format
 msgid "Invalid compound effect %s - has conflicting target_fps\n"
 msgstr ""
 
-#: src/effects-weed.c:5197
+#: src/effects-weed.c:5182
 #, c-format
 msgid "Invalid compound effect %s - has multiple transition parameters\n"
 msgstr ""
 
-#: src/effects-weed.c:5211
+#: src/effects-weed.c:5196
 #, c-format
 msgid "Invalid compound effect %s - has multiple master volume parameters\n"
 msgstr ""
 
-#: src/effects-weed.c:5346
+#: src/effects-weed.c:5329
 #, c-format
 msgid "Invalid compound effect %s - must have >1 sub filters\n"
 msgstr ""
 
-#: src/effects-weed.c:5366
+#: src/effects-weed.c:5349
 #, c-format
 msgid "Invalid effect %s found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5381
+#: src/effects-weed.c:5364
 #, c-format
 msgid "Invalid default found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5392
+#: src/effects-weed.c:5375
 #, c-format
 msgid "Invalid filter %d for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5406
+#: src/effects-weed.c:5389
 #, c-format
 msgid "Invalid param %d for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5433
+#: src/effects-weed.c:5416
 #, c-format
 msgid ""
 "Invalid number of values for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5467
+#: src/effects-weed.c:5450
 #, c-format
 msgid ""
 "Invalid non-boolean value for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5500
+#: src/effects-weed.c:5483
 #, c-format
 msgid "Invalid param link found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5511
+#: src/effects-weed.c:5494
 #, c-format
 msgid ""
 "Invalid out filter %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5529
+#: src/effects-weed.c:5513
 #, c-format
 msgid ""
 "Invalid out param %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5541
+#: src/effects-weed.c:5526
 #, c-format
 msgid ""
 "Invalid non-boolean value for autoscale found in compound effect %s, line "
 "%d\n"
 msgstr ""
 
-#: src/effects-weed.c:5552
+#: src/effects-weed.c:5537
 #, c-format
 msgid ""
 "Invalid in filter %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5566
+#: src/effects-weed.c:5552
 #, c-format
 msgid ""
 "Invalid in param %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5594
+#: src/effects-weed.c:5581
 #, c-format
 msgid "Invalid channel link found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5605
+#: src/effects-weed.c:5592
 #, c-format
 msgid ""
 "Invalid out filter %d for link channels found in compound effect %s, line "
 "%d\n"
 msgstr ""
 
-#: src/effects-weed.c:5623
+#: src/effects-weed.c:5611
 #, c-format
 msgid ""
 "Invalid out channel %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5633
+#: src/effects-weed.c:5622
 #, c-format
 msgid ""
 "Invalid in filter %d for link channels found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5651
+#: src/effects-weed.c:5641
 #, c-format
 msgid ""
 "Invalid in channel %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5687
+#: src/effects-weed.c:5678
 #, c-format
 msgid "Compound:%s"
 msgstr ""
 
-#: src/effects-weed.c:5758
+#: src/effects-weed.c:5749
 #, c-format
 msgid "Successfully loaded %d compound filters\n"
 msgstr ""
 
-#: src/effects-weed.c:6591
+#: src/effects-weed.c:6570
 #, c-format
 msgid "Effect %s cannot be used with this audio player.\n"
 msgstr ""
 
-#: src/effects-weed.c:6737
+#: src/effects-weed.c:6718
 #, c-format
 msgid "Failed to start instance %s, error code %d\n"
 msgstr "Nelze spustit ukázku %s, chybový kód %d\n"
 
-#: src/effects-weed.c:6814
+#: src/effects-weed.c:6797
 #, c-format
 msgid "Unable to start generator %s\n"
 msgstr "Nelze spustit generátor %s\n"
 
-#: src/effects-weed.c:7621
+#: src/effects-weed.c:7607
 #, c-format
 msgid "Failed to start generator %s\n"
 msgstr "Nepodařilo se spustit generátor %s\n"
 
-#: src/effects-weed.c:7718
+#: src/effects-weed.c:7701
 #, c-format
 msgid "Failed to start generator %s, error %d\n"
 msgstr "Nepodařilo se spustit generátor %s, chyba %d\n"
 
-#: src/effects-weed.c:9012
+#: src/effects-weed.c:8993
 #, c-format
 msgid "%s [unstable] (%s)"
 msgstr ""
 
-#: src/effects-data.c:3278
+#: src/effects-data.c:3234
 #, c-format
 msgid "ACTIVATE (%s)"
 msgstr ""
 
-#: src/effects-data.c:3548
+#: src/effects-data.c:3501
 msgid "ACTIVATE"
 msgstr ""
 
-#: src/effects-data.c:3876
+#: src/effects-data.c:3829
 #, c-format
 msgid "Key slot %d"
 msgstr ""
 
-#: src/effects-data.c:3998
+#: src/effects-data.c:3951
 msgid "Autoscale"
 msgstr ""
 
-#: src/effects-data.c:4089
+#: src/effects-data.c:4042
 msgid "Add another connection for this output parameter"
 msgstr ""
 
-#: src/effects-data.c:4102 src/effects-data.c:4151
+#: src/effects-data.c:4055 src/effects-data.c:4104
 #, fuzzy
 msgid "Delete this connection"
 msgstr "_Odstranit tento efekt"
 
-#: src/effects-data.c:4138
+#: src/effects-data.c:4091
 msgid "Add another connection for this output channel"
 msgstr ""
 
-#: src/effects-data.c:4223
+#: src/effects-data.c:4176
 msgid "Connected to -->"
 msgstr ""
 
-#: src/effects-data.c:4243
+#: src/effects-data.c:4196
 #, c-format
 msgid "%s - Alpha Channel Connections"
 msgstr ""
 
-#: src/effects-data.c:4316
+#: src/effects-data.c:4269
 #, c-format
 msgid "%s - Parameter Data Connections"
 msgstr ""
 
-#: src/effects-data.c:4336
+#: src/effects-data.c:4289
 msgid "Autoscale All"
 msgstr ""
 
-#: src/effects-data.c:4361 src/effects-data.c:4890
+#: src/effects-data.c:4314 src/effects-data.c:4841
 msgid "ACTIVATED"
 msgstr ""
 
-#: src/effects-data.c:4774
+#: src/effects-data.c:4726
 msgid "LiVES: - Parameter and Alpha Channel Connections"
 msgstr ""
 
-#: src/effects-data.c:4785
+#: src/effects-data.c:4736
 msgid "Auto Connect Channels"
 msgstr ""
 
-#: src/effects-data.c:4797
+#: src/effects-data.c:4748
 msgid "Auto Connect Parameters"
 msgstr ""
 
-#: src/effects-data.c:4807
+#: src/effects-data.c:4758
 msgid "Disconnect All"
 msgstr ""
 
-#: src/effects-data.c:4875
+#: src/effects-data.c:4826
 #, c-format
 msgid "Input channel is already connected from (%d,%d) %s"
 msgstr ""
 
-#: src/effects-data.c:4891
+#: src/effects-data.c:4842
 #, c-format
 msgid "Input parameter is already connected from (%d,%d) %s"
 msgstr ""
 
-#: src/effects-data.c:4899
+#: src/effects-data.c:4851
 msgid "Input and output parameters are not compatible"
 msgstr ""
 
@@ -6050,43 +6064,43 @@
 msgid "_Reset Values"
 msgstr "_Vynulovat hodnoty"
 
-#: src/framedraw.c:267
+#: src/framedraw.c:265
 msgid "_Frame"
 msgstr ""
 
-#: src/paramspecial.c:266
+#: src/paramspecial.c:259
 msgid "Maintain _Aspect Ratio"
 msgstr "Oprava ukazatele hlediska"
 
-#: src/paramspecial.c:267
+#: src/paramspecial.c:260
 msgid "Maintain aspect ratio of original frame"
 msgstr "Zachovat stejný poměr stran jako u originálního políčka"
 
-#: src/paramspecial.c:341
+#: src/paramspecial.c:335
 msgid "Display Password"
 msgstr ""
 
-#: src/paramwindow.c:450
+#: src/paramwindow.c:447
 msgid "Transition _In"
 msgstr "Přechod _In"
 
-#: src/paramwindow.c:452
+#: src/paramwindow.c:449
 msgid "Click to set the transition parameter to show only the front frame"
 msgstr ""
 
-#: src/paramwindow.c:474
+#: src/paramwindow.c:472
 msgid "Crossfade audio"
 msgstr ""
 
-#: src/paramwindow.c:475
+#: src/paramwindow.c:473
 msgid "Check the box to make audio transition with the video"
 msgstr ""
 
-#: src/paramwindow.c:493
+#: src/paramwindow.c:492
 msgid "Transition _Out"
 msgstr "Přechod _Out"
 
-#: src/paramwindow.c:495
+#: src/paramwindow.c:494
 msgid "Click to set the transition parameter to show only the rear frame"
 msgstr ""
 
@@ -6099,23 +6113,23 @@
 msgid "%s : size"
 msgstr "%s : velikost"
 
-#: src/paramwindow.c:598
+#: src/paramwindow.c:597
 msgid "New size (pixels)"
 msgstr "Nová velikost (pixely)"
 
-#: src/paramwindow.c:617 src/plugins.c:997
+#: src/paramwindow.c:616 src/plugins.c:973
 msgid "_Width"
 msgstr "_Šířka"
 
-#: src/paramwindow.c:636 src/plugins.c:1003
+#: src/paramwindow.c:635 src/plugins.c:979
 msgid "_Height"
 msgstr "_Výška"
 
-#: src/paramwindow.c:684
+#: src/paramwindow.c:683
 msgid "Generate to _Clipboard"
 msgstr "Generovat do S_chránky"
 
-#: src/paramwindow.c:686
+#: src/paramwindow.c:685
 msgid "Generate frames to the clipboard"
 msgstr "Generovat rámce do schránky"
 
@@ -6127,7 +6141,7 @@
 msgid "Generate frames to a new clip"
 msgstr "Generovat rámce do nového klipu"
 
-#: src/paramwindow.c:822
+#: src/paramwindow.c:824
 #, c-format
 msgid ""
 "\n"
@@ -6138,59 +6152,59 @@
 "Musíte označit nejméně %d snímků k použití tohoto efektu.\n"
 "\n"
 
-#: src/paramwindow.c:920 src/paramwindow.c:930
+#: src/paramwindow.c:934 src/paramwindow.c:942
 msgid "Set as default"
 msgstr "Nastavit jako výchozí"
 
-#: src/paramwindow.c:922 src/paramwindow.c:938
+#: src/paramwindow.c:936 src/paramwindow.c:950
 msgid "Reset"
 msgstr ""
 
-#: src/paramwindow.c:932 src/rte_window.c:2401 src/omc-learn.c:1357
+#: src/paramwindow.c:944 src/rte_window.c:2394 src/omc-learn.c:1347
 msgid "Close _window"
 msgstr "_Zavřít okno"
 
-#: src/paramwindow.c:1337
+#: src/paramwindow.c:1340
 msgid "No parameters"
 msgstr "Žádné parametry"
 
-#: src/paramwindow.c:1419
+#: src/paramwindow.c:1424
 msgid "Invalid parameter"
 msgstr "Neplatný parametr"
 
-#: src/paramwindow.c:1611
+#: src/paramwindow.c:1610
 msgid "LiVES: - Select Colour"
 msgstr "LiVES: - Výběr barvy"
 
-#: src/paramwindow.c:1616
+#: src/paramwindow.c:1615
 msgid "Click to set the colour"
 msgstr "Klikněte pro nastavení barvy"
 
-#: src/paramwindow.c:1628
+#: src/paramwindow.c:1626
 msgid "_Red"
 msgstr ""
 
-#: src/paramwindow.c:1629
+#: src/paramwindow.c:1627
 msgid "The red value (0 - 255)"
 msgstr "Červená (0 - 255)"
 
-#: src/paramwindow.c:1632
+#: src/paramwindow.c:1630
 msgid "_Green"
 msgstr ""
 
-#: src/paramwindow.c:1633
+#: src/paramwindow.c:1631
 msgid "The green value (0 - 255)"
 msgstr "Zelená (0 -255)"
 
-#: src/paramwindow.c:1636
+#: src/paramwindow.c:1634
 msgid "_Blue"
 msgstr ""
 
-#: src/paramwindow.c:1637
+#: src/paramwindow.c:1635
 msgid "The blue value (0 - 255)"
 msgstr "Modrá (0 - 255)"
 
-#: src/plugins.c:85
+#: src/plugins.c:86
 #, c-format
 msgid ""
 "\n"
@@ -6199,12 +6213,12 @@
 "\n"
 "Chyba pluginu : %s  selhal s kódem %d"
 
-#: src/plugins.c:87
+#: src/plugins.c:88
 #, c-format
 msgid " : message was %s\n"
 msgstr " : zpráva  %s\n"
 
-#: src/plugins.c:387
+#: src/plugins.c:375
 #, c-format
 msgid ""
 "\n"
@@ -6214,17 +6228,17 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/plugins.c:397
+#: src/plugins.c:385
 #, c-format
 msgid "Updating video playback plugin defaults in %s\n"
 msgstr ""
 
-#: src/plugins.c:452
+#: src/plugins.c:444
 #, c-format
 msgid "Loading video playback plugin defaults from %s..."
 msgstr ""
 
-#: src/plugins.c:515
+#: src/plugins.c:505
 #, c-format
 msgid ""
 "\n"
@@ -6234,32 +6248,32 @@
 "\n"
 msgstr ""
 
-#: src/plugins.c:855
+#: src/plugins.c:836
 #, c-format
 msgid "Saving playback plugin defaults to %s..."
 msgstr ""
 
-#: src/plugins.c:962
+#: src/plugins.c:939
 msgid "_FPS"
 msgstr "_FPS"
 
-#: src/plugins.c:963
+#: src/plugins.c:940
 msgid "Fixed framerate for plugin.\n"
 msgstr ""
 
-#: src/plugins.c:1032
+#: src/plugins.c:1008
 msgid "_Colourspace"
 msgstr ""
 
-#: src/plugins.c:1033
+#: src/plugins.c:1009
 msgid "Colourspace input to the plugin.\n"
 msgstr ""
 
-#: src/plugins.c:1089
+#: src/plugins.c:1065
 msgid "Save settings to an alternate file.\n"
 msgstr ""
 
-#: src/plugins.c:1206
+#: src/plugins.c:1182
 #, c-format
 msgid ""
 "\n"
@@ -6268,7 +6282,7 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/plugins.c:1252
+#: src/plugins.c:1228
 #, c-format
 msgid ""
 "\n"
@@ -6278,38 +6292,38 @@
 "Unable to use it.\n"
 msgstr ""
 
-#: src/plugins.c:1265
+#: src/plugins.c:1241
 #, c-format
 msgid ""
 "Video playback plugin failed to initialise.\n"
 "Error was: %s\n"
 msgstr ""
 
-#: src/plugins.c:1461
+#: src/plugins.c:1428
 msgid ""
 "\n"
 "Warning ! Video playback plugin will not send key presses. Keyboard may be "
 "disabled during plugin use !\n"
 msgstr ""
 
-#: src/plugins.c:1465
+#: src/plugins.c:1433
 #, c-format
 msgid ""
 "*** Using %s plugin for fs playback, agreed to use palette type %d ( %s ). "
 "***\n"
 msgstr ""
 
-#: src/plugins.c:1571
+#: src/plugins.c:1537
 #, c-format
 msgid "Audio stream unable to use preferred format '%s'\n"
 msgstr ""
 
-#: src/plugins.c:1579
+#: src/plugins.c:1543
 #, c-format
 msgid "Using format '%s' instead.\n"
 msgstr ""
 
-#: src/plugins.c:1616
+#: src/plugins.c:1579
 #, c-format
 msgid ""
 "LiVES was unable to find its encoder plugins. Please make sure you have the "
@@ -6318,7 +6332,7 @@
 "or change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/plugins.c:1624
+#: src/plugins.c:1589
 #, c-format
 msgid ""
 "LiVES did not receive a response from the encoder plugin called '%s'.\n"
@@ -6327,11 +6341,11 @@
 "or switch to another plugin using Tools|Preferences|Encoding\n"
 msgstr ""
 
-#: src/plugins.c:2032
+#: src/plugins.c:1987
 msgid "Unable to resize, please install imageMagick\n"
 msgstr "Nelze změnit velikost, nainstalujete imageMagick\n"
 
-#: src/plugins.c:2231
+#: src/plugins.c:2183
 #, c-format
 msgid ""
 "\n"
@@ -6339,12 +6353,12 @@
 "No decoders found in %s !\n"
 msgstr ""
 
-#: src/plugins.c:2415
+#: src/plugins.c:2369
 #, fuzzy, c-format
 msgid " using %s"
 msgstr "Otvírání%s"
 
-#: src/plugins.c:2499
+#: src/plugins.c:2451
 #, c-format
 msgid ""
 "\n"
@@ -6353,7 +6367,7 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/plugins.c:2522
+#: src/plugins.c:2472
 #, c-format
 msgid ""
 "\n"
@@ -6363,24 +6377,24 @@
 "Unable to use it.\n"
 msgstr ""
 
-#: src/plugins.c:2564
+#: src/plugins.c:2512
 msgid "/unknown"
 msgstr "/unknown"
 
-#: src/plugins.c:2651
+#: src/plugins.c:2598
 msgid "LiVES: - Decoder Plugins"
 msgstr ""
 
-#: src/plugins.c:2669
+#: src/plugins.c:2616
 msgid "Enabled Video Decoders (uncheck to disable)"
 msgstr ""
 
-#: src/plugins.c:2726
+#: src/plugins.c:2672
 #, c-format
 msgid "Failed to load %s, transitions may not resize.\n"
 msgstr "Otevření %s selhalo, přechod nemůže změnit velikost.\n"
 
-#: src/plugins.c:3854
+#: src/plugins.c:3797
 #, c-format
 msgid "%s advanced settings"
 msgstr "%s pokročilé nastavení"
@@ -6389,15 +6403,15 @@
 msgid "LiVES: - New Test RFX"
 msgstr "LiVES: - Nový Test RFX"
 
-#: src/rfx-builder.c:136
+#: src/rfx-builder.c:135
 msgid "LiVES: - Edit Test RFX"
 msgstr "LiVES: - Editovat Test RFX"
 
-#: src/rfx-builder.c:166
+#: src/rfx-builder.c:165
 msgid "Type:"
 msgstr "Typ:"
 
-#: src/rfx-builder.c:184
+#: src/rfx-builder.c:183
 msgid "tool"
 msgstr ""
 
@@ -6409,125 +6423,125 @@
 msgid "The name of the plugin. No spaces allowed."
 msgstr "Jméno pluginu (bez mezer)."
 
-#: src/rfx-builder.c:201
+#: src/rfx-builder.c:202
 msgid "Version:       "
 msgstr "Verze:       "
 
-#: src/rfx-builder.c:203
+#: src/rfx-builder.c:204
 msgid "The script version."
 msgstr "Verze skriptu."
 
-#: src/rfx-builder.c:210
+#: src/rfx-builder.c:212
 msgid "    Author:       "
 msgstr "    Autor:       "
 
-#: src/rfx-builder.c:211
+#: src/rfx-builder.c:213
 msgid "The script author."
 msgstr "Autor skriptu."
 
-#: src/rfx-builder.c:217
+#: src/rfx-builder.c:220
 msgid "    URL (optional):       "
 msgstr "    URL (nepovinné):       "
 
-#: src/rfx-builder.c:218
+#: src/rfx-builder.c:221
 msgid "URL for the plugin maintainer."
 msgstr "URL správce pluginu."
 
-#: src/rfx-builder.c:226
+#: src/rfx-builder.c:230
 msgid "Menu text:    "
 msgstr "Menu text:    "
 
-#: src/rfx-builder.c:227
+#: src/rfx-builder.c:231
 msgid "The text to show in the menu."
 msgstr "Text zobrazený v menu."
 
-#: src/rfx-builder.c:239
+#: src/rfx-builder.c:244
 msgid "Action description:        "
 msgstr "Popis akce:        "
 
-#: src/rfx-builder.c:241
+#: src/rfx-builder.c:246
 msgid "Describe what the plugin is doing. E.g. \"Edge detecting\""
 msgstr "Popište, co plugin dělá. např \"identifikuje rohy\""
 
-#: src/rfx-builder.c:246
+#: src/rfx-builder.c:251
 msgid "Minimum frames:"
 msgstr "Minimální počet snímků:"
 
-#: src/rfx-builder.c:249
+#: src/rfx-builder.c:254
 msgid ""
 "Minimum number of frames this effect/tool can be applied to. Normally 1."
 msgstr ""
 "Minimální počet snímků, kterým tento efekt muže být aplikován. Normálně 1."
 
-#: src/rfx-builder.c:260
+#: src/rfx-builder.c:265
 msgid "_Requirements..."
 msgstr "_Požadavky..."
 
-#: src/rfx-builder.c:263
+#: src/rfx-builder.c:268
 msgid "Enter any binaries required by the plugin."
 msgstr "Vypište binárky požadované pluginem."
 
-#: src/rfx-builder.c:267
+#: src/rfx-builder.c:272
 msgid "_Properties..."
 msgstr "_Vlastnosti"
 
-#: src/rfx-builder.c:270
+#: src/rfx-builder.c:275
 msgid "Set properties for the plugin. Optional."
 msgstr "Nastavit vlastnosti pro plugin. Nepovinné."
 
-#: src/rfx-builder.c:274
+#: src/rfx-builder.c:279
 msgid "_Parameters..."
 msgstr "_Parametry..."
 
-#: src/rfx-builder.c:277
+#: src/rfx-builder.c:282
 msgid "Set up parameters used in pre/loop/post/trigger code. Optional."
 msgstr "Nastavit parametry použité v před/smyčka/po/spoušť kódu. Nepovinné."
 
-#: src/rfx-builder.c:281
+#: src/rfx-builder.c:286
 msgid "Parameter _Window Hints..."
 msgstr "Parametr _okna nápovědy..."
 
-#: src/rfx-builder.c:284
+#: src/rfx-builder.c:289
 msgid "Set hints about how to lay out the parameter window. Optional."
 msgstr "Nastavit nápovědy jak rozložit okno s parametry. Nepovinné."
 
-#: src/rfx-builder.c:290
+#: src/rfx-builder.c:295
 msgid "_Language code:"
 msgstr ""
 
-#: src/rfx-builder.c:291
+#: src/rfx-builder.c:296
 msgid "Language for pre/loop/post/triggers. Optional."
 msgstr "Jazyl pro před/smyčka/po/spoušť. Nepovinné."
 
-#: src/rfx-builder.c:300
+#: src/rfx-builder.c:305
 msgid "_Pre loop code..."
 msgstr "_Před smyčka kód..."
 
-#: src/rfx-builder.c:303
+#: src/rfx-builder.c:308
 msgid "Code to be executed before the loop. Optional."
 msgstr "Kód spouštěný před smyčkou. Nepovinné."
 
-#: src/rfx-builder.c:307
+#: src/rfx-builder.c:312
 msgid "_Loop code..."
 msgstr "_Kód smyčky..."
 
-#: src/rfx-builder.c:310
+#: src/rfx-builder.c:315
 msgid "Loop code to be applied to each frame."
 msgstr "Kód smyčky použitý na každý snímek."
 
-#: src/rfx-builder.c:314
+#: src/rfx-builder.c:319
 msgid "_Post loop code..."
 msgstr "_Kód po smyčce..."
 
-#: src/rfx-builder.c:317
+#: src/rfx-builder.c:322
 msgid "Code to be executed after the loop. Optional."
 msgstr "Kód spouštěný po smyčce. Nepovinné."
 
-#: src/rfx-builder.c:321
+#: src/rfx-builder.c:326
 msgid "_Trigger code..."
 msgstr "_Spouštěcí kód..."
 
-#: src/rfx-builder.c:324
+#: src/rfx-builder.c:329
 msgid ""
 "Set trigger code for when the parameter window is shown, or when a parameter "
 "is changed. Optional (except for Utilities)."
@@ -6535,7 +6549,7 @@
 "Nastavit spouštěcí kód pro situaci, kdy parametr okna je zobrazen, nebo "
 "parametr je pozměněn. Nepovinné (kromě Pomůcek)"
 
-#: src/rfx-builder.c:421
+#: src/rfx-builder.c:426
 #, c-format
 msgid ""
 "\n"
@@ -6550,55 +6564,55 @@
 "%s\n"
 "%s\n"
 
-#: src/rfx-builder.c:544
+#: src/rfx-builder.c:541
 msgid "LiVES: - RFX Requirements"
 msgstr "LiVES: - RFX požadavky"
 
-#: src/rfx-builder.c:548
+#: src/rfx-builder.c:544
 msgid "LiVES: - RFX Parameters"
 msgstr "LiVES: - RFX parametry"
 
-#: src/rfx-builder.c:552
+#: src/rfx-builder.c:547
 msgid "LiVES: - RFX Parameter Window Hints"
 msgstr "LiVES: - RFX parametry okna nápověda"
 
-#: src/rfx-builder.c:556
+#: src/rfx-builder.c:550
 msgid "LiVES: - RFX Triggers"
 msgstr "LiVES: - RFX spouštěče"
 
-#: src/rfx-builder.c:622
+#: src/rfx-builder.c:613
 msgid "_New Entry"
 msgstr "_Nový vstup"
 
-#: src/rfx-builder.c:625
+#: src/rfx-builder.c:616
 msgid "_Edit Entry"
 msgstr "_Upravit vstup"
 
-#: src/rfx-builder.c:628
+#: src/rfx-builder.c:619
 msgid "_Remove Entry"
 msgstr "_Vymazat vstup"
 
-#: src/rfx-builder.c:632
+#: src/rfx-builder.c:623
 msgid "Move _Up"
 msgstr "Posun_nahoru"
 
-#: src/rfx-builder.c:635
+#: src/rfx-builder.c:626
 msgid "Move _Down"
 msgstr "Posun_dolu"
 
-#: src/rfx-builder.c:1004
+#: src/rfx-builder.c:984
 msgid "LiVES: - RFX Properties"
 msgstr "LiVES: - RFX vlastnosti"
 
-#: src/rfx-builder.c:1013
+#: src/rfx-builder.c:993
 msgid "_Slow (hint to GUI)"
 msgstr "_Pomalu (nápověda GUI)"
 
-#: src/rfx-builder.c:1024
+#: src/rfx-builder.c:1004
 msgid "_Batch mode generator"
 msgstr ""
 
-#: src/rfx-builder.c:1831
+#: src/rfx-builder.c:1790
 msgid ""
 "\n"
 "\n"
@@ -6612,7 +6626,7 @@
 "Nejdříve odstraňte spouštěč .\n"
 "\n"
 
-#: src/rfx-builder.c:1875
+#: src/rfx-builder.c:1834
 msgid ""
 "\n"
 "\n"
@@ -6624,185 +6638,185 @@
 "Některé spouštěče byly upraveny.\n"
 "Zkontrolujte kód spouštěče.\n"
 
-#: src/rfx-builder.c:1994
+#: src/rfx-builder.c:1950
 msgid "LiVES: - New RFX Parameter"
 msgstr "LiVES: - Nový RFX Parametr"
 
-#: src/rfx-builder.c:1997
+#: src/rfx-builder.c:1952
 msgid "LiVES: - Edit RFX Parameter"
 msgstr "LiVES: - Editovat RFX Parametr"
 
-#: src/rfx-builder.c:2013
+#: src/rfx-builder.c:1968
 msgid "_Name:    "
 msgstr "_Jméno:    "
 
-#: src/rfx-builder.c:2016
+#: src/rfx-builder.c:1971
 msgid "Name of the parameter, must be unique in the plugin."
 msgstr "Jméno parametru musí být v pluginu jedinečné."
 
-#: src/rfx-builder.c:2025
+#: src/rfx-builder.c:1981
 msgid "_Label:    "
 msgstr "_Jméno/Označení:    "
 
-#: src/rfx-builder.c:2028
+#: src/rfx-builder.c:1984
 msgid ""
 "Label to be shown by the parameter. An underscore represents mnemonic "
 "accelerator."
 msgstr ""
 "Jméno zobrazované parametrem. Podtržené představuje mnemotechnickou pomůcku."
 
-#: src/rfx-builder.c:2039
+#: src/rfx-builder.c:1996
 msgid "_Type:         "
 msgstr "_Typ:         "
 
-#: src/rfx-builder.c:2040
+#: src/rfx-builder.c:1997
 msgid "Parameter type (select from list)."
 msgstr "Typ parametru (vyberte ze seznamu)"
 
-#: src/rfx-builder.c:2073
+#: src/rfx-builder.c:2029
 msgid "Decimal _places: "
 msgstr "Počet decimálních _míst: "
 
-#: src/rfx-builder.c:2082 src/rfx-builder.c:2477 src/rfx-builder.c:2495
+#: src/rfx-builder.c:2038 src/rfx-builder.c:2430 src/rfx-builder.c:2447
 msgid "_Default value:    "
 msgstr "_Výchozí hodnota:    "
 
-#: src/rfx-builder.c:2098
+#: src/rfx-builder.c:2054
 msgid "_Default: "
 msgstr "_Výchozí: "
 
-#: src/rfx-builder.c:2132
+#: src/rfx-builder.c:2087
 msgid "Button _Group: "
 msgstr "Tlačítko _skupina: "
 
-#: src/rfx-builder.c:2134
+#: src/rfx-builder.c:2089
 msgid "A non-zero value can be used to group radio buttons."
 msgstr "Pro skupinu přepínačů může být použita pouze nenulová hodnota."
 
-#: src/rfx-builder.c:2142 src/rfx-builder.c:2478
+#: src/rfx-builder.c:2097 src/rfx-builder.c:2431
 msgid "_Minimum value: "
 msgstr "_Minimální hodnota: "
 
-#: src/rfx-builder.c:2148 src/rfx-builder.c:2479
+#: src/rfx-builder.c:2103 src/rfx-builder.c:2432
 msgid "Ma_ximum value: "
 msgstr "Ma_ximální hodnota: "
 
-#: src/rfx-builder.c:2157
+#: src/rfx-builder.c:2113
 msgid "     _Step size:   "
 msgstr "     _Krok:   "
 
-#: src/rfx-builder.c:2160
+#: src/rfx-builder.c:2117
 msgid ""
 "How much the parameter is adjusted when the spinbutton arrows are pressed."
 msgstr "O kolik je upraven parametr po stisku otáčecích šipek."
 
-#: src/rfx-builder.c:2171
+#: src/rfx-builder.c:2129
 msgid "_Wrap value"
 msgstr ""
 
-#: src/rfx-builder.c:2172
+#: src/rfx-builder.c:2131
 msgid "Whether the value wraps max->min and min->max."
 msgstr "Vždy když hodnota překročí max->min a min->max."
 
-#: src/rfx-builder.c:2470
+#: src/rfx-builder.c:2424
 msgid "Set _values"
 msgstr "Nastav _hodnoty"
 
-#: src/rfx-builder.c:2512
+#: src/rfx-builder.c:2463
 msgid "Default _Red:  "
 msgstr "Výchozí _červená:  "
 
-#: src/rfx-builder.c:2513
+#: src/rfx-builder.c:2464
 msgid "Default _Green:"
 msgstr "Výchozí _zelená"
 
-#: src/rfx-builder.c:2514
+#: src/rfx-builder.c:2465
 msgid "Default _Blue: "
 msgstr "Výchozí _modrá "
 
-#: src/rfx-builder.c:2538
+#: src/rfx-builder.c:2488
 msgid "Set _default"
 msgstr "Nastavit _výchozí"
 
-#: src/rfx-builder.c:2540
+#: src/rfx-builder.c:2490
 msgid "Default value:  "
 msgstr "Výchozí hodnota:  "
 
-#: src/rfx-builder.c:2541
+#: src/rfx-builder.c:2491
 msgid "Maximum length (chars): "
 msgstr "Maximální délka (znaků): "
 
-#: src/rfx-builder.c:2576
+#: src/rfx-builder.c:2526
 msgid "LiVES: - New RFX Parameter Window Hint"
 msgstr "LiVES: - Nový RFX Parametr nápovědy okna"
 
-#: src/rfx-builder.c:2579
+#: src/rfx-builder.c:2528
 msgid "LiVES: - Edit RFX Parameter Window Hint"
 msgstr "LiVES: - Editovat RFX Parametr nápovědy okna"
 
-#: src/rfx-builder.c:2622
+#: src/rfx-builder.c:2569
 msgid "_Keyword:         "
 msgstr ""
 
-#: src/rfx-builder.c:2639
+#: src/rfx-builder.c:2586
 msgid "Special _Type:         "
 msgstr ""
 
-#: src/rfx-builder.c:2656
+#: src/rfx-builder.c:2602
 msgid "Special _Subtype:         "
 msgstr ""
 
-#: src/rfx-builder.c:2667 src/rfx-builder.c:2706
+#: src/rfx-builder.c:2613 src/rfx-builder.c:2651
 msgid "Row:    "
 msgstr "Řada:    "
 
-#: src/rfx-builder.c:2732
+#: src/rfx-builder.c:2676
 #, c-format
 msgid "Linked parameters (%d):    "
 msgstr ""
 
-#: src/rfx-builder.c:2749
+#: src/rfx-builder.c:2693
 msgid "Linked parameters (4):    "
 msgstr "Propojené parametry (4):    "
 
-#: src/rfx-builder.c:2752
+#: src/rfx-builder.c:2695
 msgid "Linked parameters (2):    "
 msgstr "Propojené parametry (2):    "
 
-#: src/rfx-builder.c:2777
+#: src/rfx-builder.c:2720
 msgid "LiVES: - New RFX Trigger"
 msgstr "LiVES: - Nový RFX spouštěč"
 
-#: src/rfx-builder.c:2780
+#: src/rfx-builder.c:2722
 msgid "LiVES: - Edit RFX Trigger"
 msgstr "LiVES: - Upravitt RFX spouštěč"
 
-#: src/rfx-builder.c:2808
+#: src/rfx-builder.c:2750
 msgid "When:         "
 msgstr "Pokud:         "
 
-#: src/rfx-builder.c:2904
+#: src/rfx-builder.c:2846
 msgid "LiVES: - Pre Loop Code"
 msgstr "LiVES: - Před smyčkový kód"
 
-#: src/rfx-builder.c:2911
+#: src/rfx-builder.c:2853
 msgid "LiVES: - Loop Code"
 msgstr "LiVES: - Smyčkový kód"
 
-#: src/rfx-builder.c:2918
+#: src/rfx-builder.c:2860
 msgid "LiVES: - Post Loop Code"
 msgstr "LiVES: - Po smyčkový kód"
 
-#: src/rfx-builder.c:2931
+#: src/rfx-builder.c:2873
 #, c-format
 msgid "LiVES: - Default text (max length %d)"
 msgstr "LiVES: -Výchozí text (max. délka %d)"
 
-#: src/rfx-builder.c:2944
+#: src/rfx-builder.c:2885
 msgid "LiVES: - Enter values, one per line"
 msgstr "LiVES: - Zadejte hodnoty, jedna na řádek"
 
-#: src/rfx-builder.c:3055
+#: src/rfx-builder.c:2996
 msgid ""
 "\n"
 "\n"
@@ -6812,7 +6826,7 @@
 "\n"
 "Jméno nesmí být prázdné.\n"
 
-#: src/rfx-builder.c:3060
+#: src/rfx-builder.c:3001
 msgid ""
 "\n"
 "\n"
@@ -6822,7 +6836,7 @@
 "\n"
 "Jméno nesmí obsahovat mezery.\n"
 
-#: src/rfx-builder.c:3065
+#: src/rfx-builder.c:3006
 msgid ""
 "\n"
 "\n"
@@ -6832,7 +6846,7 @@
 "\n"
 "Text v menu nesmí zůstat prázdný.\n"
 
-#: src/rfx-builder.c:3071
+#: src/rfx-builder.c:3012
 msgid ""
 "\n"
 "\n"
@@ -6842,7 +6856,7 @@
 "\n"
 "Popis akce nesmí zůstat prázdný.\n"
 
-#: src/rfx-builder.c:3076
+#: src/rfx-builder.c:3017
 msgid ""
 "\n"
 "\n"
@@ -6852,7 +6866,7 @@
 "\n"
 "Jméno autor nesmí zůstat prázdné.\n"
 
-#: src/rfx-builder.c:3085 src/rfx-builder.c:4339
+#: src/rfx-builder.c:3026 src/rfx-builder.c:4253
 msgid ""
 "\n"
 "\n"
@@ -6864,7 +6878,7 @@
 "Plugin s tímto jménem již existuje.\n"
 "Jméno musí být jedinečné.\n"
 
-#: src/rfx-builder.c:3092
+#: src/rfx-builder.c:3033
 msgid ""
 "\n"
 "\n"
@@ -6874,7 +6888,7 @@
 "\n"
 "Smyčkový kód by neměl být prázdný\n"
 
-#: src/rfx-builder.c:3098
+#: src/rfx-builder.c:3039
 msgid ""
 "\n"
 "\n"
@@ -6884,7 +6898,7 @@
 "\n"
 "Spouštěcí kód by pro pomůcku neměl být prázdný\n"
 
-#: src/rfx-builder.c:3111
+#: src/rfx-builder.c:3052
 msgid ""
 "\n"
 "\n"
@@ -6894,7 +6908,7 @@
 "\n"
 "Jméno parametru nesmí být prázdné.\n"
 
-#: src/rfx-builder.c:3117
+#: src/rfx-builder.c:3058
 msgid ""
 "\n"
 "\n"
@@ -6907,41 +6921,41 @@
 "Nalezen duplicitní parametr. Jméno parametru musí být v pluginu jedinečné.\n"
 "\n"
 
-#: src/rfx-builder.c:3171
+#: src/rfx-builder.c:3111
 #, c-format
 msgid "Writing script file %s..."
 msgstr "Zápis skriptového souboru %s..."
 
-#: src/rfx-builder.c:3477
+#: src/rfx-builder.c:3411
 msgid "No <define> section found in script.\n"
 msgstr "<define> sekce nebyla ve skriptu nalezena.\n"
 
-#: src/rfx-builder.c:3484 src/rfx-builder.c:3493
+#: src/rfx-builder.c:3418 src/rfx-builder.c:3427
 msgid "Bad script version.\n"
 msgstr "Špatná verze skriptu.\n"
 
-#: src/rfx-builder.c:3505
+#: src/rfx-builder.c:3439
 msgid "No <name> section found in script.\n"
 msgstr "<name> sekce nebyla ve skriptu nalezena.\n"
 
-#: src/rfx-builder.c:3513
+#: src/rfx-builder.c:3447
 msgid "No <version> section found in script.\n"
 msgstr "<version> sekce nebyla ve skriptu nalezena.\n"
 
-#: src/rfx-builder.c:3522
+#: src/rfx-builder.c:3456
 msgid "No <author> section found in script.\n"
 msgstr "<author> sekce nebyla ve skriptu nalezena.\n"
 
-#: src/rfx-builder.c:3536
+#: src/rfx-builder.c:3470
 msgid "No <description> section found in script.\n"
 msgstr "<description> sekce nebyla ve skriptu nalezena .\n"
 
-#: src/rfx-builder.c:3540
+#: src/rfx-builder.c:3474
 #, c-format
 msgid "Bad description. (%s)\n"
 msgstr "Špatný popis. (%s)\n"
 
-#: src/rfx-builder.c:3702
+#: src/rfx-builder.c:3627
 #, c-format
 msgid ""
 "\n"
@@ -6956,27 +6970,27 @@
 "nalezen ve skriptu.\n"
 "\n"
 
-#: src/rfx-builder.c:3859
+#: src/rfx-builder.c:3780
 msgid "Rebuilding all RFX scripts...builtin..."
 msgstr "Předělávání všech RFX skriptů...vestavěno..."
 
-#: src/rfx-builder.c:3860
+#: src/rfx-builder.c:3781
 msgid "Rebuilding scripts"
 msgstr "Předělávání skriptů"
 
-#: src/rfx-builder.c:3868
+#: src/rfx-builder.c:3789
 msgid "custom..."
 msgstr "vlastní..."
 
-#: src/rfx-builder.c:3872
+#: src/rfx-builder.c:3793
 msgid "test..."
 msgstr "test..."
 
-#: src/rfx-builder.c:3878
+#: src/rfx-builder.c:3799
 msgid "rebuilding dynamic menu entries..."
 msgstr "Předělávání vstupů dynamického menu ..."
 
-#: src/rfx-builder.c:3905 src/rfx-builder.c:3912
+#: src/rfx-builder.c:3826 src/rfx-builder.c:3834
 #, c-format
 msgid ""
 "\n"
@@ -6989,7 +7003,7 @@
 "LiVES nemohl najít program %s.\n"
 "Zkontrolujte, je-li v cestě a je spustitelný program.\n"
 
-#: src/rfx-builder.c:3951
+#: src/rfx-builder.c:3874
 #, c-format
 msgid ""
 "\n"
@@ -7004,12 +7018,12 @@
 "%s ?\n"
 "\n"
 
-#: src/rfx-builder.c:3960
+#: src/rfx-builder.c:3884
 #, c-format
 msgid "Deleting rfx script %s..."
 msgstr "Mazání rfx skriptu %s..."
 
-#: src/rfx-builder.c:3980
+#: src/rfx-builder.c:3902
 #, c-format
 msgid ""
 "\n"
@@ -7024,7 +7038,7 @@
 "%s\n"
 "Kód chyby: %d\n"
 
-#: src/rfx-builder.c:4016
+#: src/rfx-builder.c:3938
 #, c-format
 msgid ""
 "\n"
@@ -7039,12 +7053,12 @@
 "už existuje.\n"
 "Vymažte jej nebo přejmenujte testovací skript.\n"
 
-#: src/rfx-builder.c:4027
+#: src/rfx-builder.c:3950
 #, c-format
 msgid "Promoting rfx test plugin %s to custom..."
 msgstr "Prosazování testovacího rfx pluginu %s do běžného..."
 
-#: src/rfx-builder.c:4044
+#: src/rfx-builder.c:3965
 #, c-format
 msgid ""
 "\n"
@@ -7055,20 +7069,20 @@
 "Return code was %d (%s)\n"
 msgstr ""
 
-#: src/rfx-builder.c:4070
+#: src/rfx-builder.c:3990
 msgid "LiVES: - Export Script to..."
 msgstr ""
 
-#: src/rfx-builder.c:4077 src/rfx-builder.c:4156
+#: src/rfx-builder.c:3997 src/rfx-builder.c:4074
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "Kopírování %s do %s..."
 
-#: src/rfx-builder.c:4105
+#: src/rfx-builder.c:4024
 msgid "LiVES: Import Script from..."
 msgstr ""
 
-#: src/rfx-builder.c:4148
+#: src/rfx-builder.c:4067
 #, c-format
 msgid ""
 "\n"
@@ -7083,43 +7097,43 @@
 "již existuje.\n"
 "Nejprve jej vymažte nebo přejmenujte importovaný skript.\n"
 
-#: src/rfx-builder.c:4249
+#: src/rfx-builder.c:4166
 msgid "LiVES: - Copy RFX Script"
 msgstr "LiVES: - Kopírovat RFX skript"
 
-#: src/rfx-builder.c:4251
+#: src/rfx-builder.c:4168
 msgid "_From type:    "
 msgstr ""
 
-#: src/rfx-builder.c:4258
+#: src/rfx-builder.c:4175
 msgid "   Script:    "
 msgstr "   Skript :    "
 
-#: src/rfx-builder.c:4267
+#: src/rfx-builder.c:4183
 msgid "LiVES: - Rename test RFX Script"
 msgstr "LiVES: - Přejmenovat testovací RFX skript"
 
-#: src/rfx-builder.c:4268
+#: src/rfx-builder.c:4184
 msgid "From script: "
 msgstr "Ze skriptu : "
 
-#: src/rfx-builder.c:4273
+#: src/rfx-builder.c:4188
 msgid "LiVES: - RFX Script name"
 msgstr "LiVES: - Jméno RFX  skriptu"
 
-#: src/rfx-builder.c:4274
+#: src/rfx-builder.c:4189
 msgid "Script name: "
 msgstr "Jméno skriptu: "
 
-#: src/rfx-builder.c:4294
+#: src/rfx-builder.c:4209
 msgid "New name: "
 msgstr "Nové jméno: "
 
-#: src/rfx-builder.c:4297
+#: src/rfx-builder.c:4212
 msgid "New script name: "
 msgstr "Nové jméno skriptu: "
 
-#: src/rfx-builder.c:4372
+#: src/rfx-builder.c:4286
 msgid ""
 "\n"
 "\n"
@@ -7131,12 +7145,12 @@
 "Testovací skript s tímto jménem již existuje.\n"
 "Jméno musí být unikátní.\n"
 
-#: src/rfx-builder.c:4384
+#: src/rfx-builder.c:4297
 #, c-format
 msgid "Renaming RFX test script %s to %s..."
 msgstr "Přejmenování RFX testovacího skriptu %s na %s..."
 
-#: src/rfx-builder.c:4390
+#: src/rfx-builder.c:4302
 #, c-format
 msgid ""
 "\n"
@@ -7153,23 +7167,23 @@
 "%s\n"
 "Kód %d\n"
 
-#: src/rfx-builder.c:4610
+#: src/rfx-builder.c:4518
 msgid "_Apply Real Time Effects to Selection"
 msgstr "_Použití Real time efektů na výběr"
 
-#: src/rfx-builder.c:4664
+#: src/rfx-builder.c:4572
 #, c-format
 msgid "Loading rendered effect %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4766
+#: src/rfx-builder.c:4674
 msgid ""
 "See: VJ - show VJ keys. Set the realtime effects, and then apply them here."
 msgstr ""
 "Vidíte: VJ - ukázat  VJ klávesy.  Nastavit real time efekty a pak je zde "
 "použít."
 
-#: src/preferences.c:359
+#: src/preferences.c:351
 msgid ""
 "\n"
 "\n"
@@ -7177,7 +7191,7 @@
 "full screen, separate window (fs) mode\n"
 msgstr ""
 
-#: src/preferences.c:408
+#: src/preferences.c:400
 msgid ""
 "\n"
 "\n"
@@ -7185,7 +7199,7 @@
 "(Free space = UNKNOWN)"
 msgstr ""
 
-#: src/preferences.c:412
+#: src/preferences.c:403
 #, c-format
 msgid ""
 "\n"
@@ -7194,14 +7208,14 @@
 "(Free space = %s)"
 msgstr ""
 
-#: src/preferences.c:416
+#: src/preferences.c:408
 msgid ""
 "The temp directory is LiVES working directory where opened clips and sets "
 "are stored.\n"
 "It should be in a partition with plenty of free disk space.\n"
 msgstr ""
 
-#: src/preferences.c:784
+#: src/preferences.c:839
 #, c-format
 msgid ""
 "Unable to create or write to the new temporary directory.\n"
@@ -7212,7 +7226,7 @@
 "The directory will not be changed now.\n"
 msgstr ""
 
-#: src/preferences.c:786
+#: src/preferences.c:843
 #, c-format
 msgid ""
 "Unable to create or write to the new temporary directory.\n"
@@ -7222,7 +7236,7 @@
 "The directory will not be changed now.\n"
 msgstr ""
 
-#: src/preferences.c:798
+#: src/preferences.c:856
 msgid ""
 "You have chosen to change the temporary directory.\n"
 "Please make sure you have no other copies of LiVES open.\n"
@@ -7240,7 +7254,7 @@
 "\n"
 "Stisknutím 'Zrušit' obnovíte výchozí nastavení dočasného adresáře."
 
-#: src/preferences.c:1169
+#: src/preferences.c:1221
 msgid ""
 "\n"
 "Unable to switch audio players to jack - jackd must be installed first.\n"
@@ -7251,7 +7265,7 @@
 "nainstalován.\n"
 "Viz. http://jackaudio.org\n"
 
-#: src/preferences.c:1175
+#: src/preferences.c:1226
 msgid ""
 "\n"
 "Switching audio players requires restart (jackd must not be running)\n"
@@ -7259,7 +7273,7 @@
 "\n"
 "Přepnutí audio přehrávačů vyžaduje restart (jackd nesmí být používán)\n"
 
-#: src/preferences.c:1202
+#: src/preferences.c:1253
 msgid ""
 "\n"
 "Unable to switch audio players to pulse audio\n"
@@ -7267,396 +7281,396 @@
 "See http://www.pulseaudio.org\n"
 msgstr ""
 
-#: src/preferences.c:1502
+#: src/preferences.c:1544
 msgid "PCM (highest quality; largest files)"
 msgstr "PCM (nejvyšší kvalita; největší soubory)"
 
-#: src/preferences.c:2063
+#: src/preferences.c:2096
 msgid "LiVES: - Preferences"
 msgstr "LiVES: - Předvolby"
 
-#: src/preferences.c:2142
+#: src/preferences.c:2177
 msgid "Open file selection maximised"
 msgstr "Otevřít maximalizovaný výběr souboru"
 
-#: src/preferences.c:2149
+#: src/preferences.c:2184
 msgid "Show recent files in the File menu"
 msgstr "Zobrazit poslední soubory v menu Soubor"
 
-#: src/preferences.c:2158
+#: src/preferences.c:2193
 msgid "Stop screensaver on playback    "
 msgstr ""
 
-#: src/preferences.c:2165
+#: src/preferences.c:2200
 msgid "Open main window maximised"
 msgstr "Otevřít maximalizované hlavní okno"
 
-#: src/preferences.c:2173
+#: src/preferences.c:2208
 msgid "Show toolbar when background is blanked"
 msgstr "Zobrazit nástrojovou lištu pokud je pozadí prázdné"
 
-#: src/preferences.c:2181
+#: src/preferences.c:2216
 msgid "Allow mouse wheel to switch clips"
 msgstr ""
 
-#: src/preferences.c:2192
+#: src/preferences.c:2227
 msgid "Shrink previews to fit in interface"
 msgstr ""
 
-#: src/preferences.c:2202
+#: src/preferences.c:2237
 msgid "Startup mode:"
 msgstr ""
 
-#: src/preferences.c:2206
+#: src/preferences.c:2241
 msgid "_Clip editor"
 msgstr ""
 
-#: src/preferences.c:2210
+#: src/preferences.c:2245
 msgid "_Multitrack mode"
 msgstr ""
 
-#: src/preferences.c:2234
+#: src/preferences.c:2268
 msgid "Multi-head support"
 msgstr ""
 
-#: src/preferences.c:2242
+#: src/preferences.c:2276
 msgid " monitor number for LiVES interface"
 msgstr ""
 
-#: src/preferences.c:2248
+#: src/preferences.c:2282
 msgid " monitor number for playback"
 msgstr ""
 
-#: src/preferences.c:2260
+#: src/preferences.c:2294
 msgid ""
 "A setting of 0 means use all available monitors (only works with some "
 "playback plugins)."
 msgstr ""
 
-#: src/preferences.c:2270
+#: src/preferences.c:2304
 msgid "Force single monitor"
 msgstr ""
 
-#: src/preferences.c:2271
+#: src/preferences.c:2305
 msgid "Ignore all except the first monitor."
 msgstr ""
 
-#: src/preferences.c:2293
+#: src/preferences.c:2327
 msgid "Show clip thumbnails during playback"
 msgstr ""
 
-#: src/preferences.c:2306
+#: src/preferences.c:2340
 msgid "GUI"
 msgstr "GUI"
 
-#: src/preferences.c:2321
+#: src/preferences.c:2355
 msgid "When entering Multitrack mode:"
 msgstr "Při spuštění vícestopého módu:"
 
-#: src/preferences.c:2330
+#: src/preferences.c:2364
 msgid "_Prompt me for width, height, fps and audio settings"
 msgstr "_Vyzvi mě k nastavení šířky, výšky, fps a zvuku"
 
-#: src/preferences.c:2336
+#: src/preferences.c:2370
 msgid "_Always use the following values:"
 msgstr "_Vždy použij tyto hodnoty:"
 
-#: src/preferences.c:2345
+#: src/preferences.c:2379
 msgid "Use these same _values for rendering a new clip"
 msgstr "Použij stejné _hodnoty pro rendrování nového klipu"
 
-#: src/preferences.c:2370
+#: src/preferences.c:2404
 msgid "_Width           "
 msgstr "_Šířka           "
 
-#: src/preferences.c:2375
+#: src/preferences.c:2409
 msgid "          _Height      "
 msgstr "          _Výška      "
 
-#: src/preferences.c:2379
+#: src/preferences.c:2413
 msgid "          _FPS"
 msgstr ""
 
-#: src/preferences.c:2387
+#: src/preferences.c:2421
 msgid "Enable backing audio track"
 msgstr ""
 
-#: src/preferences.c:2394
+#: src/preferences.c:2428
 msgid "Audio track per video track"
 msgstr ""
 
-#: src/preferences.c:2423
+#: src/preferences.c:2457
 msgid "    _Undo buffer size (MB)    "
 msgstr "    _Zpět velikost bufferu (MB)    "
 
-#: src/preferences.c:2432
+#: src/preferences.c:2466
 msgid "_Exit multitrack mode after rendering"
 msgstr "_Ukončit vícestopý mód po převodu"
 
-#: src/preferences.c:2440
+#: src/preferences.c:2474
 msgid "Auto backup layouts"
 msgstr ""
 
-#: src/preferences.c:2445
+#: src/preferences.c:2479
 msgid "_Every"
 msgstr ""
 
-#: src/preferences.c:2453
+#: src/preferences.c:2487
 msgid "seconds"
 msgstr "sekundy"
 
-#: src/preferences.c:2461
+#: src/preferences.c:2495
 msgid "After every _change"
 msgstr ""
 
-#: src/preferences.c:2467
+#: src/preferences.c:2501
 msgid "_Never"
 msgstr "_Nikdy"
 
-#: src/preferences.c:2490
+#: src/preferences.c:2523
 msgid "Multitrack/Render"
 msgstr "Vícestopa/Převod"
 
-#: src/preferences.c:2508
+#: src/preferences.c:2541
 msgid "Use instant opening when possible"
 msgstr ""
 
-#: src/preferences.c:2509
+#: src/preferences.c:2543
 msgid "Enable instant opening of some file types using decoder plugins"
 msgstr ""
 
-#: src/preferences.c:2531
+#: src/preferences.c:2567
 msgid "Video open command (fallback)"
 msgstr ""
 
-#: src/preferences.c:2543
+#: src/preferences.c:2579
 msgid "Open/render compression"
 msgstr ""
 
-#: src/preferences.c:2546
+#: src/preferences.c:2582
 msgid " %     ( lower = slower, larger files; for jpeg, higher quality )"
 msgstr " %     ( snížení = zpomalení, větší soubory; pro jpeg, vyšší kvalita )"
 
-#: src/preferences.c:2558
+#: src/preferences.c:2594
 msgid "Default image format"
 msgstr ""
 
-#: src/preferences.c:2562
+#: src/preferences.c:2598
 msgid "_jpeg"
 msgstr "_jpeg"
 
-#: src/preferences.c:2565
+#: src/preferences.c:2601
 msgid "_png"
 msgstr ""
 
-#: src/preferences.c:2572
+#: src/preferences.c:2608
 msgid "(Check Help/Troubleshoot to see which image formats are supported)"
 msgstr ""
 
-#: src/preferences.c:2580
+#: src/preferences.c:2616
 msgid "Enable automatic deinterlacing when possible"
 msgstr ""
 
-#: src/preferences.c:2582
+#: src/preferences.c:2619
 msgid "Automatically deinterlace frames when a plugin suggests it"
 msgstr ""
 
-#: src/preferences.c:2593
+#: src/preferences.c:2632
 msgid "Automatic trimming / padding of audio when possible"
 msgstr ""
 
-#: src/preferences.c:2595
+#: src/preferences.c:2634
 msgid "Automatically trim or pad audio when a plugin suggests it"
 msgstr ""
 
-#: src/preferences.c:2606
+#: src/preferences.c:2646
 msgid "Ignore blank borders when possible"
 msgstr ""
 
-#: src/preferences.c:2608
+#: src/preferences.c:2648
 msgid "Clip any blank borders from frames where possible"
 msgstr ""
 
-#: src/preferences.c:2619
+#: src/preferences.c:2660
 msgid "When opening multiple files, concatenate images into one clip"
 msgstr ""
 
-#: src/preferences.c:2629
+#: src/preferences.c:2670
 msgid "Decoding"
 msgstr "Dekódování"
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:2652
+#: src/preferences.c:2693
 msgid "Low - can improve performance on slower machines"
 msgstr ""
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:2654
+#: src/preferences.c:2695
 msgid "Normal - recommended for most users"
 msgstr ""
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:2656
+#: src/preferences.c:2697
 msgid "High - can improve quality on very fast machines"
 msgstr ""
 
-#: src/preferences.c:2659
+#: src/preferences.c:2700
 msgid "Preview _quality"
 msgstr "Kvalita _náhledu"
 
-#: src/preferences.c:2660
+#: src/preferences.c:2701
 msgid "The preview quality for video playback - affects resizing"
 msgstr ""
 
-#: src/preferences.c:2675
+#: src/preferences.c:2717
 msgid "_Show FPS statistics"
 msgstr "_Zobrazit FPS statistiky"
 
-#: src/preferences.c:2694
+#: src/preferences.c:2736
 msgid "_Plugin"
 msgstr "_Plugin"
 
-#: src/preferences.c:2718
+#: src/preferences.c:2760
 msgid "Stream audio"
 msgstr ""
 
-#: src/preferences.c:2721
+#: src/preferences.c:2763
 msgid "Stream audio to playback plugin"
 msgstr ""
 
-#: src/preferences.c:2734
+#: src/preferences.c:2778
 msgid "Record player output"
 msgstr ""
 
-#: src/preferences.c:2737
+#: src/preferences.c:2781
 msgid "Record output from player instead of input to player"
 msgstr ""
 
-#: src/preferences.c:2744
+#: src/preferences.c:2789
 msgid "VIDEO"
 msgstr "VIDEO"
 
-#: src/preferences.c:2787
+#: src/preferences.c:2833
 msgid "_Player"
 msgstr "_Přehrávač"
 
-#: src/preferences.c:2792
+#: src/preferences.c:2838
 msgid "(See also the Jack Integration tab for jack startup options)"
 msgstr ""
 
-#: src/preferences.c:2819
+#: src/preferences.c:2865
 msgid "mplayer"
 msgstr "mplayer"
 
-#: src/preferences.c:2830
+#: src/preferences.c:2876
 #, fuzzy
 msgid "mplayer2"
 msgstr "mplayer"
 
-#: src/preferences.c:2833
+#: src/preferences.c:2879
 msgid "Audio play _command"
 msgstr ""
 
-#: src/preferences.c:2840
+#: src/preferences.c:2886
 msgid "- internal -"
 msgstr "- vnitřní -"
 
-#: src/preferences.c:2849
+#: src/preferences.c:2895
 msgid "Audio follows video _rate/direction"
 msgstr "Zvuk kopíruje video _tempo/směr"
 
-#: src/preferences.c:2857
+#: src/preferences.c:2903
 msgid "Audio follows _clip switches"
 msgstr "Zvuk kopíruje přepínání _klipů"
 
-#: src/preferences.c:2864
+#: src/preferences.c:2910
 msgid "Source:"
 msgstr ""
 
-#: src/preferences.c:2868
+#: src/preferences.c:2914
 msgid "_Internal"
 msgstr ""
 
-#: src/preferences.c:2873
+#: src/preferences.c:2919
 msgid "_External (requires jack or pulse audio player)"
 msgstr ""
 
-#: src/preferences.c:2892
+#: src/preferences.c:2940
 msgid "AUDIO"
 msgstr "AUDIO"
 
-#: src/preferences.c:2902
+#: src/preferences.c:2950
 msgid "Playback"
 msgstr "Přehrát"
 
-#: src/preferences.c:2925
+#: src/preferences.c:2973
 msgid ""
 "Record audio when capturing an e_xternal window\n"
 " (requires jack or pulse audio)"
 msgstr ""
 
-#: src/preferences.c:2940
+#: src/preferences.c:2988
 msgid "      What to record when 'r' is pressed   "
 msgstr "      Co nahrát po stisku 'r'   "
 
-#: src/preferences.c:2949
+#: src/preferences.c:2997
 msgid "_Frame changes"
 msgstr "Změny _snímku"
 
-#: src/preferences.c:2964
+#: src/preferences.c:3012
 msgid "F_PS changes"
 msgstr "F_PS změny"
 
-#: src/preferences.c:2982
+#: src/preferences.c:3030
 msgid "_Real time effects"
 msgstr ""
 
-#: src/preferences.c:2993
+#: src/preferences.c:3041
 msgid "_Clip switches"
 msgstr ""
 
-#: src/preferences.c:3004
+#: src/preferences.c:3052
 msgid "_Audio (requires jack or pulse audio player)"
 msgstr ""
 
-#: src/preferences.c:3024
+#: src/preferences.c:3072
 msgid "Pause recording if free disk space falls below"
 msgstr ""
 
 #. TRANSLATORS: gigabytes
-#: src/preferences.c:3030
+#: src/preferences.c:3078
 msgid "GB"
 msgstr ""
 
-#: src/preferences.c:3037
+#: src/preferences.c:3085
 msgid "Recording"
 msgstr "Nahrávání"
 
-#: src/preferences.c:3055
+#: src/preferences.c:3103
 msgid "Encoder"
 msgstr ""
 
-#: src/preferences.c:3090
+#: src/preferences.c:3137
 msgid "Output format"
 msgstr "Výstupní formát"
 
-#: src/preferences.c:3106
+#: src/preferences.c:3153
 msgid "Audio codec"
 msgstr "Zvukový kodek"
 
-#: src/preferences.c:3119
+#: src/preferences.c:3165
 msgid "Encoding"
 msgstr "Kódování"
 
-#: src/preferences.c:3134
+#: src/preferences.c:3180
 msgid "Use _antialiasing when resizing"
 msgstr "Použít _antialiasing při změně velikosti"
 
-#: src/preferences.c:3143
+#: src/preferences.c:3189
 msgid "Number of _real time effect keys"
 msgstr ""
 
-#: src/preferences.c:3145
+#: src/preferences.c:3192
 msgid ""
 "The number of \"virtual\" real time effect keys. They can be controlled "
 "through the real time effects window, or via network (OSC)."
@@ -7664,95 +7678,95 @@
 "Počet  \"virtuálních\" kláves realtime efektů. Lze je ovládat přes okno "
 "realtime efektů, nebo přes síť (OSC)."
 
-#: src/preferences.c:3152
+#: src/preferences.c:3199
 msgid "Use _threads where possible when applying effects"
 msgstr ""
 
-#: src/preferences.c:3159
+#: src/preferences.c:3207
 msgid "Number of _threads"
 msgstr ""
 
-#: src/preferences.c:3172
+#: src/preferences.c:3221
 msgid "Restart is required if any of the following paths are changed:"
 msgstr ""
 
-#: src/preferences.c:3182
+#: src/preferences.c:3231
 msgid "Weed plugin path"
 msgstr ""
 
-#: src/preferences.c:3184
+#: src/preferences.c:3234
 msgid "Frei0r plugin path"
 msgstr ""
 
-#: src/preferences.c:3186
+#: src/preferences.c:3237
 msgid "LADSPA plugin path"
 msgstr ""
 
-#: src/preferences.c:3209
+#: src/preferences.c:3261
 msgid "      Video load directory (default)      "
 msgstr ""
 
-#: src/preferences.c:3215
+#: src/preferences.c:3267
 msgid "      Video save directory (default) "
 msgstr ""
 
-#: src/preferences.c:3221
+#: src/preferences.c:3273
 msgid "      Audio load directory (default) "
 msgstr ""
 
-#: src/preferences.c:3227
+#: src/preferences.c:3279
 msgid "      Image directory (default) "
 msgstr ""
 
-#: src/preferences.c:3233
+#: src/preferences.c:3285
 msgid "      Backup/Restore directory (default) "
 msgstr ""
 
-#: src/preferences.c:3239
+#: src/preferences.c:3291
 msgid "      Temp directory (do not remove) "
 msgstr ""
 
-#: src/preferences.c:3252
+#: src/preferences.c:3304
 msgid "The default directory for loading video clips from"
 msgstr ""
 
-#: src/preferences.c:3277
+#: src/preferences.c:3329
 msgid "The default directory for saving encoded clips to"
 msgstr ""
 
-#: src/preferences.c:3285
+#: src/preferences.c:3337
 msgid "The default directory for loading and saving audio"
 msgstr ""
 
-#: src/preferences.c:3293
+#: src/preferences.c:3345
 msgid "The default directory for saving frameshots to"
 msgstr ""
 
-#: src/preferences.c:3301
+#: src/preferences.c:3353
 msgid "The default directory for backing up/restoring single clips"
 msgstr ""
 
-#: src/preferences.c:3309
+#: src/preferences.c:3361
 msgid "LiVES working directory."
 msgstr "Pracovní adresář LiVES."
 
-#: src/preferences.c:3359
+#: src/preferences.c:3412
 msgid "Directories"
 msgstr "Adresáře"
 
-#: src/preferences.c:3374
+#: src/preferences.c:3427
 msgid "Warn if diskspace falls below: "
 msgstr ""
 
-#: src/preferences.c:3380 src/preferences.c:3394
+#: src/preferences.c:3433 src/preferences.c:3447
 msgid " MB [set to 0 to disable]"
 msgstr ""
 
-#: src/preferences.c:3389
+#: src/preferences.c:3442
 msgid "Diskspace critical level: "
 msgstr ""
 
-#: src/preferences.c:3407
+#: src/preferences.c:3461
 msgid ""
 "Warn on Insert / Merge if _frame rate of clipboard does not match frame rate "
 "of selection"
@@ -7760,197 +7774,197 @@
 "Varovat při Vkládání / Sloučit pokud tempo snímků ve schránce nesouhlasí s "
 "tempem výběru"
 
-#: src/preferences.c:3417
+#: src/preferences.c:3471
 msgid "Warn on Open if file _size exceeds "
 msgstr "Varovat při otvírání velikost souboru přesáhne "
 
-#: src/preferences.c:3425
+#: src/preferences.c:3479
 msgid " MB"
 msgstr " MB"
 
-#: src/preferences.c:3432
+#: src/preferences.c:3486
 msgid "Show a warning before saving a se_t"
 msgstr "Zobrazit varování před uložením se_tu"
 
-#: src/preferences.c:3442
+#: src/preferences.c:3496
 msgid ""
 "Show a warning if _mplayer/mplayer2, sox, composite or convert is not found "
 "when LiVES is started."
 msgstr ""
 
-#: src/preferences.c:3452
+#: src/preferences.c:3506
 msgid "Show a warning if no _rendered effects are found at startup."
 msgstr ""
 "Zobrazit varování jestliže při spuštění _nejsou nalezeny rendrovací efekty ."
 
-#: src/preferences.c:3464
+#: src/preferences.c:3518
 msgid "Show a warning if no _encoder plugins are found at startup."
 msgstr ""
 "Zobrazit varování jestliže při startu _nejsou nalezeny kódovací pluginy ."
 
-#: src/preferences.c:3474
+#: src/preferences.c:3528
 msgid "Show a warning if a _duplicate set name is entered."
 msgstr "Zobrazit varování, jestliže je vloženo duplicitní jméno."
 
-#: src/preferences.c:3485
+#: src/preferences.c:3539
 msgid "When a set is loaded, warn if clips are missing from _layouts."
 msgstr "Při nahrání sestavy upozornit, jestliže chybí klipy z _rozvržení."
 
-#: src/preferences.c:3495
+#: src/preferences.c:3550
 msgid "Warn if a clip used in a layout is about to be closed."
 msgstr "Upozornit, jestliže má být zavřen klip použitý v rozvržení."
 
-#: src/preferences.c:3505
+#: src/preferences.c:3561
 msgid "Warn if frames used in a layout are about to be deleted."
 msgstr "Upozornit, jestliže mají být smazány snímky použité v rozvržení."
 
-#: src/preferences.c:3515
+#: src/preferences.c:3572
 msgid "Warn if frames used in a layout are about to be shifted."
 msgstr "Upozornit, jestliže mají být posunuty snímky použité v rozvržení."
 
-#: src/preferences.c:3525
+#: src/preferences.c:3583
 msgid "Warn if frames used in a layout are about to be altered."
 msgstr "Upozornit, jestliže mají být změněny snímky použité v rozvržení."
 
-#: src/preferences.c:3535
+#: src/preferences.c:3594
 msgid "Warn if audio used in a layout is about to be deleted."
 msgstr "Upozornit, jestliže má být smazán zvuk použitý v rozvržení."
 
-#: src/preferences.c:3546
+#: src/preferences.c:3606
 msgid "Warn if audio used in a layout is about to be shifted."
 msgstr "Upozornit, jestliže má být posunut zvuk použitý v rozvržení."
 
-#: src/preferences.c:3556
+#: src/preferences.c:3617
 msgid "Warn if audio used in a layout is about to be altered."
 msgstr "Upozornit, jestliže má být změněn zvuk použitý v rozvržení."
 
-#: src/preferences.c:3566
+#: src/preferences.c:3628
 msgid "Popup layout errors after clip changes."
 msgstr ""
 
-#: src/preferences.c:3577
+#: src/preferences.c:3639
 msgid "Warn if the layout has not been saved when leaving multitrack mode."
 msgstr ""
 "Upozornit, jestliže rozložení nebylo před ukončením vícestopého režimu "
 "uloženo."
 
-#: src/preferences.c:3588
+#: src/preferences.c:3650
 msgid ""
 "Warn if multitrack has no audio channels, and a layout with audio is loaded."
 msgstr ""
 "Upozornit, jestliže multitrack nemá zvukové kanály a rozložení je otevřeno "
 "se zvukem."
 
-#: src/preferences.c:3598
+#: src/preferences.c:3660
 msgid ""
 "Warn if multitrack has audio channels, and your audio player is not \"jack\" "
 "or \"pulse audio\"."
 msgstr ""
 
-#: src/preferences.c:3610
+#: src/preferences.c:3672
 msgid "Show info message after importing from firewire device."
 msgstr "Zobrazit informační zprávu po importu z firewire zařízení."
 
-#: src/preferences.c:3626
+#: src/preferences.c:3688
 msgid "Show a warning before opening a yuv4mpeg stream (advanced)."
 msgstr ""
 
-#: src/preferences.c:3639
+#: src/preferences.c:3701
 msgid "Show a warning when multitrack is low on backup space."
 msgstr ""
 
-#: src/preferences.c:3650
+#: src/preferences.c:3713
 msgid "Show a warning advising cleaning of disk space after a crash."
 msgstr ""
 
-#: src/preferences.c:3661
+#: src/preferences.c:3725
 msgid "Show a warning if unable to connect to pulseaudio player."
 msgstr ""
 
-#: src/preferences.c:3673
+#: src/preferences.c:3737
 #, fuzzy
 msgid "Show a warning before wiping a layout which has unsaved changes."
 msgstr "Zobrazit varování před uložením se_tu"
 
-#: src/preferences.c:3685
+#: src/preferences.c:3749
 msgid "Warnings"
 msgstr "Varování"
 
-#: src/preferences.c:3703
+#: src/preferences.c:3767
 msgid "Midi synch (requires the files midistart and midistop)"
 msgstr ""
 "Identifikační signál bloku Midi (vyžaduje rejstříky midistart a midistop)"
 
-#: src/preferences.c:3715
+#: src/preferences.c:3779
 msgid "When inserting/merging frames:  "
 msgstr "Při vkládání/slučování snímků:  "
 
-#: src/preferences.c:3719
+#: src/preferences.c:3783
 msgid "_Speed Up/Slow Down Insertion"
 msgstr "_Zrychlit/Zpomalit vkládání"
 
-#: src/preferences.c:3723
+#: src/preferences.c:3787
 msgid "_Resample Insertion"
 msgstr "_Převzorkovat vložení"
 
-#: src/preferences.c:3730
+#: src/preferences.c:3794
 msgid "CD device           "
 msgstr "CD zařízení           "
 
-#: src/preferences.c:3733
+#: src/preferences.c:3797
 msgid "LiVES can load audio tracks from this CD"
 msgstr "LiVES může zavést zvukové stopy z tohoto CD"
 
-#: src/preferences.c:3746
+#: src/preferences.c:3813
 msgid "Default FPS        "
 msgstr "Standard FPS        "
 
-#: src/preferences.c:3749
+#: src/preferences.c:3816
 msgid "Frames per second to use when none is specified"
 msgstr "Snímků za sekundu pokud není uvedeno jinak"
 
-#: src/preferences.c:3757
+#: src/preferences.c:3825
 msgid "Misc"
 msgstr "Různé"
 
-#: src/preferences.c:3782
+#: src/preferences.c:3850
 msgid "New theme:           "
 msgstr "Nové téma:           "
 
-#: src/preferences.c:3800
+#: src/preferences.c:3867
 msgid "Themes"
 msgstr "Témata"
 
-#: src/preferences.c:3815
+#: src/preferences.c:3882
 msgid "Download bandwidth (Kb/s)       "
 msgstr "Rychlost stahování (Kb/s)       "
 
-#: src/preferences.c:3823
+#: src/preferences.c:3890
 msgid "LiVES must be compiled without \"configure --disable-OSC\" to use OMC"
 msgstr ""
 "LiVES musí být zkompilován bez \"configure --disable-OCS\" pro použití OMC"
 
-#: src/preferences.c:3833
+#: src/preferences.c:3900
 msgid "OMC remote control enabled"
 msgstr "Dálková správa OMC povolena"
 
-#: src/preferences.c:3841
+#: src/preferences.c:3908
 msgid "UDP port       "
 msgstr "UDP port       "
 
-#: src/preferences.c:3850
+#: src/preferences.c:3917
 msgid "Start OMC on startup"
 msgstr "Spustit OMC při startu"
 
-#: src/preferences.c:3870
+#: src/preferences.c:3937
 msgid "Streaming/Networking"
 msgstr "Streamování/Vysílání přes síť"
 
-#: src/preferences.c:3882
+#: src/preferences.c:3949
 msgid "Jack transport"
 msgstr "Jack přenos"
 
-#: src/preferences.c:3886
+#: src/preferences.c:3953
 msgid ""
 "LiVES must be compiled with jack/transport.h and jack/jack.h present to use "
 "jack transport"
@@ -7958,43 +7972,43 @@
 "LiVES musí být zkompilován s jack/transport.h a jack/jack.h pro použití "
 "přenosu přes jack"
 
-#: src/preferences.c:3892
+#: src/preferences.c:3959
 msgid "Jack _transport config file"
 msgstr "Jack: _přenosový konfigurační soubor"
 
-#: src/preferences.c:3899 src/preferences.c:3989
+#: src/preferences.c:3967 src/preferences.c:4058
 msgid "Start _server on LiVES startup"
 msgstr "Spustit _server při startu LiVES"
 
-#: src/preferences.c:3911
+#: src/preferences.c:3979
 msgid "Jack transport _master (start and stop)"
 msgstr ""
 
-#: src/preferences.c:3921
+#: src/preferences.c:3989
 msgid "Jack transport _client (start and stop)"
 msgstr ""
 
-#: src/preferences.c:3935
+#: src/preferences.c:4003
 msgid "Jack transport sets start position"
 msgstr ""
 
-#: src/preferences.c:3952
+#: src/preferences.c:4020
 msgid "Jack transport timebase slave"
 msgstr ""
 
-#: src/preferences.c:3963
+#: src/preferences.c:4031
 msgid "(See also Playback -> Audio follows video rate/direction)"
 msgstr ""
 
-#: src/preferences.c:3971
+#: src/preferences.c:4039
 msgid "Jack audio"
 msgstr "Jack zvuk"
 
-#: src/preferences.c:3975
+#: src/preferences.c:4043
 msgid "LiVES must be compiled with jack/jack.h present to use jack audio"
 msgstr "LiVES musí být zkompilován s  jack/jack.h pro použití audio jack"
 
-#: src/preferences.c:3978
+#: src/preferences.c:4046
 msgid ""
 "You MUST set the audio player to \"jack\" in the Playback tab to use jack "
 "audio"
@@ -8002,97 +8016,97 @@
 "MUSÍTE nastavit audio přehrávač na \"jack\" v záložce Přehrávání, chcete-li "
 "používat audio konektor"
 
-#: src/preferences.c:3984
+#: src/preferences.c:4052
 msgid "Jack _audio server config file"
 msgstr "Jack: konfigurační soubor _zvukového serveru"
 
-#: src/preferences.c:3996
+#: src/preferences.c:4065
 msgid "Play audio even when transport is _paused"
 msgstr ""
 
-#: src/preferences.c:4008
+#: src/preferences.c:4077
 msgid "Automatically connect to System Out ports when 'playing' External Audio"
 msgstr ""
 
-#: src/preferences.c:4021
+#: src/preferences.c:4090
 msgid "Jack Integration"
 msgstr "Integrace jacku"
 
-#: src/preferences.c:4035
+#: src/preferences.c:4104
 msgid "Events to respond to:"
 msgstr ""
 
-#: src/preferences.c:4044
+#: src/preferences.c:4113
 msgid "_Joystick events"
 msgstr ""
 
-#: src/preferences.c:4051
+#: src/preferences.c:4120
 msgid "_Joystick device"
 msgstr ""
 
-#: src/preferences.c:4053
+#: src/preferences.c:4122
 msgid "The joystick device, e.g. /dev/input/js0"
 msgstr ""
 
-#: src/preferences.c:4071
+#: src/preferences.c:4142
 msgid "_MIDI events"
 msgstr ""
 
-#: src/preferences.c:4080
+#: src/preferences.c:4151
 msgid "Use _ALSA MIDI (recommended)"
 msgstr ""
 
-#: src/preferences.c:4082
+#: src/preferences.c:4153
 msgid "Create an ALSA MIDI port which other MIDI devices can be connected to"
 msgstr ""
 
-#: src/preferences.c:4090
+#: src/preferences.c:4162
 msgid "Use _raw MIDI"
 msgstr ""
 
-#: src/preferences.c:4092
+#: src/preferences.c:4164
 msgid "Read directly from the MIDI device"
 msgstr ""
 
-#: src/preferences.c:4104
+#: src/preferences.c:4177
 msgid "_MIDI device"
 msgstr ""
 
-#: src/preferences.c:4106
+#: src/preferences.c:4179
 msgid "The MIDI device, e.g. /dev/input/midi0"
 msgstr ""
 
-#: src/preferences.c:4118
+#: src/preferences.c:4193
 msgid "Advanced"
 msgstr "Rozšířené"
 
-#: src/preferences.c:4124
+#: src/preferences.c:4199
 msgid "MIDI check _rate"
 msgstr ""
 
-#: src/preferences.c:4127
+#: src/preferences.c:4203
 msgid ""
 "Number of MIDI checks per keyboard tick. Increasing this may improve MIDI "
 "responsiveness, but may slow down playback."
 msgstr ""
 
-#: src/preferences.c:4134
+#: src/preferences.c:4211
 msgid "MIDI repeat"
 msgstr ""
 
-#: src/preferences.c:4137
+#: src/preferences.c:4214
 msgid "Number of non-reads allowed between succesive reads."
 msgstr ""
 
-#: src/preferences.c:4140
+#: src/preferences.c:4218
 msgid "(Warning: setting this value too high can slow down playback.)"
 msgstr ""
 
-#: src/preferences.c:4159
+#: src/preferences.c:4237
 msgid "MIDI/Joystick learner"
 msgstr ""
 
-#: src/preferences.c:4499
+#: src/preferences.c:4679
 msgid ""
 "\n"
 "LiVES will now shut down. You need to restart it for the directory change to "
@@ -8100,68 +8114,68 @@
 "Click OK to continue.\n"
 msgstr ""
 
-#: src/preferences.c:4523
+#: src/preferences.c:4703
 msgid ""
 "For the directory change to take effect LiVES will restart when preferences "
 "dialog closes."
 msgstr ""
 
-#: src/preferences.c:4527
+#: src/preferences.c:4707
 msgid "Theme changes will not take effect until the next time you start LiVES."
 msgstr "Změny témat budou patrné po restartování LiVES."
 
-#: src/preferences.c:4531
+#: src/preferences.c:4711
 msgid "Jack options will not take effect until the next time you start LiVES."
 msgstr "Změny nastavení jack se projeví po restartu LiVES."
 
-#: src/osc.c:2585
+#: src/osc.c:2616
 #, c-format
 msgid "Syncing to external framerate of %.8f frames per second.\n"
 msgstr "Synchronizace s externí frekvencí %.8f snímků za sekundu.\n"
 
-#: src/osc.c:6746
+#: src/osc.c:6938
 msgid "Cannot initialize OSC receiver\n"
 msgstr "Nelze inicializovat OSC přijímač\n"
 
-#: src/osc.c:6770
+#: src/osc.c:6961
 #, c-format
 msgid "WARNING: Cannot start OSC server at UDP port %d\n"
 msgstr "UPOZORNĚNÍ: Nelze spusti OSC server na UDP portu %d\n"
 
-#: src/osc.c:6775
+#: src/osc.c:6963
 #, c-format
 msgid "Started OSC server at UDP port %d\n"
 msgstr "Spuštěn OSC server na UDP portu %d\n"
 
-#: src/osc.c:6890
+#: src/osc.c:7076
 #, c-format
 msgid "Cannot start OSC/UDP server at port %d \n"
 msgstr "Nelze spustit OSC/UDP server na portu %d \n"
 
-#: src/resample.c:125 src/resample.c:304
+#: src/resample.c:131 src/resample.c:305
 #, c-format
 msgid "Resizing frames 1 to %d"
 msgstr "Měním velikost snímků od 1 do %d"
 
-#: src/resample.c:140 src/resample.c:318
+#: src/resample.c:145 src/resample.c:318
 #, c-format
 msgid "Resizing/letterboxing frames 1 to %d"
 msgstr ""
 
-#: src/resample.c:361 src/resample.c:385
+#: src/resample.c:360 src/resample.c:384
 msgid "Resize"
 msgstr "Změna velikosti"
 
-#: src/resample.c:395
+#: src/resample.c:394
 msgid "Resample/Resize"
 msgstr "Převzorkování/Změnit velikost"
 
-#: src/resample.c:680
+#: src/resample.c:676
 #, c-format
 msgid "Length of video is now %d frames.\n"
 msgstr "Délka videa je nyní %d snímků.\n"
 
-#: src/resample.c:745
+#: src/resample.c:737
 msgid ""
 "\n"
 "\n"
@@ -8171,146 +8185,146 @@
 "\n"
 "Nový poměr(rate) musí být větší než 0\n"
 
-#: src/resample.c:797 src/resample.c:813
+#: src/resample.c:788 src/resample.c:803
 msgid "Resampling audio"
 msgstr "Převzorkování zvuku"
 
-#: src/resample.c:831
+#: src/resample.c:821
 msgid "LiVES was unable to resample the audio as requested.\n"
 msgstr "LiVES nebyl schopen převzorkovat zvuk.\n"
 
-#: src/resample.c:833 src/resample.c:837
+#: src/resample.c:823 src/resample.c:827
 msgid "Resample Audio"
 msgstr "Převzorkovat zvuk"
 
-#: src/resample.c:845
+#: src/resample.c:835
 #, c-format
 msgid "Audio was resampled to %d Hz, %d channels, %d bit"
 msgstr "Zvuk byl převzorkován na %d Hz, %d kanálů, %d bitů"
 
-#: src/resample.c:1034
+#: src/resample.c:1016
 #, c-format
 msgid "Resampling video at %.8f frames per second..."
 msgstr "Převzorkování videa na %.3f snímků za vteřinu..."
 
-#: src/resample.c:1037
+#: src/resample.c:1018
 #, c-format
 msgid "Resampling video at %.3f frames per second..."
 msgstr "Převzorkování videa na %.3f snímků za vteřinu..."
 
-#: src/resample.c:1068
+#: src/resample.c:1049
 msgid "Reordering error !\n"
 msgstr ""
 
-#: src/resample.c:1079
+#: src/resample.c:1060
 msgid "Resample"
 msgstr "Převzorkovat"
 
-#: src/resample.c:1192
+#: src/resample.c:1173
 msgid "LiVES: - Resample Audio"
 msgstr "LiVES: - Převzorkovat zvuk"
 
-#: src/resample.c:1195
+#: src/resample.c:1175
 msgid "LiVES: - Insert Silence"
 msgstr "LiVES: - Vsunout ticho"
 
-#: src/resample.c:1198
+#: src/resample.c:1177
 msgid "LiVES: - New Clip Audio"
 msgstr "LiVES: - Nový zvukový klip"
 
-#: src/resample.c:1201
+#: src/resample.c:1179
 msgid "LiVES: - External Clip Settings"
 msgstr "LiVES: - Nastavení externího klipu"
 
-#: src/resample.c:1238 src/resample.c:1358
+#: src/resample.c:1215 src/resample.c:1332
 msgid "Rate (Hz) "
 msgstr "Poměr (Rate v Hertzích) "
 
-#: src/resample.c:1245 src/resample.c:1372
+#: src/resample.c:1222 src/resample.c:1346
 msgid "Channels"
 msgstr ""
 
-#: src/resample.c:1252
+#: src/resample.c:1229
 msgid "Sample Size "
 msgstr ""
 
-#: src/resample.c:1268 src/resample.c:1425
+#: src/resample.c:1245 src/resample.c:1399
 msgid "Signed"
 msgstr "Označeno"
 
-#: src/resample.c:1274 src/resample.c:1435
+#: src/resample.c:1251 src/resample.c:1409
 msgid "Unsigned"
 msgstr "Neoznačeno"
 
-#: src/resample.c:1297 src/resample.c:1460
+#: src/resample.c:1273 src/resample.c:1433
 msgid "Little Endian"
 msgstr "Little Endian"
 
-#: src/resample.c:1303 src/resample.c:1468
+#: src/resample.c:1279 src/resample.c:1441
 msgid "Big Endian"
 msgstr "Big Endian"
 
-#: src/resample.c:1315
+#: src/resample.c:1290
 msgid "Current"
 msgstr "Současný"
 
-#: src/resample.c:1340
+#: src/resample.c:1315
 msgid "_Enable audio"
 msgstr "P_ovolit zvuk"
 
-#: src/resample.c:1372
+#: src/resample.c:1346
 msgid "_Channels"
 msgstr ""
 
-#: src/resample.c:1394
+#: src/resample.c:1368
 msgid "_Sample Size"
 msgstr ""
 
-#: src/resample.c:1394
+#: src/resample.c:1368
 msgid "Sample Size"
 msgstr ""
 
-#: src/resample.c:1489
+#: src/resample.c:1461
 msgid "New"
 msgstr "Nový"
 
-#: src/resample.c:1512
+#: src/resample.c:1484
 msgid "_Frames Per Second "
 msgstr "_Snímků za sekundu "
 
-#: src/resample.c:1530
+#: src/resample.c:1502
 msgid "Record for maximum:  "
 msgstr "Nahrát maximálně:  "
 
-#: src/resample.c:1533
+#: src/resample.c:1505
 msgid " hours  "
 msgstr " hodin  "
 
-#: src/resample.c:1536
+#: src/resample.c:1508
 msgid " minutes  "
 msgstr " minut  "
 
-#: src/resample.c:1538
+#: src/resample.c:1510
 msgid " seconds  "
 msgstr " sekund  "
 
-#: src/resample.c:1545
+#: src/resample.c:1517
 msgid "Unlimited"
 msgstr "Neomezené"
 
-#: src/resample.c:1561
+#: src/resample.c:1533
 msgid "Click OK to begin recording, or Cancel to quit."
 msgstr "Kliněte na OK pro nahrávání, Zrušit pro ukončení."
 
-#: src/resample.c:1670
+#: src/resample.c:1638
 msgid "LiVES: - Change playback speed"
 msgstr "LiVES: - Změnit rychlost přehrávání"
 
-#: src/resample.c:1673
+#: src/resample.c:1640
 msgid "LiVES: - Resample Video"
 msgstr "LiVES: - Převzorkovat video"
 
-#: src/resample.c:1696
+#: src/resample.c:1663
 #, c-format
 msgid ""
 "\n"
@@ -8321,7 +8335,7 @@
 "in _frames per second"
 msgstr ""
 
-#: src/resample.c:1701
+#: src/resample.c:1667
 #, c-format
 msgid ""
 "\n"
@@ -8332,15 +8346,15 @@
 "in frames per second"
 msgstr ""
 
-#: src/resample.c:1723
+#: src/resample.c:1688
 msgid "OR enter the desired clip length in _seconds"
 msgstr ""
 
-#: src/resample.c:1745
+#: src/resample.c:1710
 msgid "Change the _audio speed as well"
 msgstr ""
 
-#: src/resample.c:1846
+#: src/resample.c:1810
 msgid ""
 "\n"
 "Speeding up the clip will cause missing frames in some multitrack layouts.\n"
@@ -8351,7 +8365,7 @@
 "rozloženích.\n"
 "Opravdu změnit rychlost ?\n"
 
-#: src/resample.c:1863
+#: src/resample.c:1829
 msgid ""
 "\n"
 "Speeding up the clip will cause missing audio in some multitrack layouts.\n"
@@ -8361,48 +8375,48 @@
 "Zrychlení klipu způsobí chybějící zvuk v některých vícestopých rozloženích.\n"
 "Opravdu změnit rychlost ?\n"
 
-#: src/resample.c:1878
+#: src/resample.c:1847
 msgid ""
 "\n"
 "Changing the speed will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/resample.c:1892
+#: src/resample.c:1863
 msgid ""
 "\n"
 "Changing the speed will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/resample.c:1938
+#: src/resample.c:1911
 msgid "Speed Change"
 msgstr "Změna rychlosti"
 
-#: src/resample.c:1947
+#: src/resample.c:1920
 #, c-format
 msgid "Changed playback speed to %.3f frames per second and audio to %d Hz.\n"
 msgstr ""
 "Změna rychlosti playbacku na %.3f rámečků za sekundu a zvuku na %d Hz.\n"
 
-#: src/resample.c:1950
+#: src/resample.c:1922
 #, c-format
 msgid "Changed playback speed to %.3f frames per second.\n"
 msgstr "Změna rychlosti playbacku na %.3f rámečků za sekundu\n"
 
-#: src/resample.c:2035
+#: src/resample.c:2006
 msgid "Resampling video"
 msgstr "Převzorkování videa"
 
-#: src/resample.c:2042 src/resample.c:2160 src/resample.c:2182
+#: src/resample.c:2012 src/resample.c:2127 src/resample.c:2148
 msgid "Resampling clipboard video"
 msgstr "Převzorkování videa ze schránky"
 
-#: src/resample.c:2047
+#: src/resample.c:2016
 msgid "Reordering frames"
 msgstr "Přeskupení snímků"
 
-#: src/resample.c:2056
+#: src/resample.c:2025
 msgid ""
 "\n"
 "\n"
@@ -8412,20 +8426,20 @@
 "\n"
 "LiVES nemohl přeskupit snímky"
 
-#: src/resample.c:2104
+#: src/resample.c:2071
 msgid "Deordering frames"
 msgstr "Srovnávání rámečků"
 
-#: src/resample.c:2199
+#: src/resample.c:2165
 msgid "resampling error..."
 msgstr "chyba při převzorkování..."
 
-#: src/rte_window.c:85 src/rte_window.c:1708
+#: src/rte_window.c:124 src/rte_window.c:1709
 #, c-format
 msgid "Type: %s"
 msgstr "Typ: %s"
 
-#: src/rte_window.c:112
+#: src/rte_window.c:150
 msgid ""
 "\n"
 "\n"
@@ -8441,7 +8455,7 @@
 "Opravdu ?\n"
 "\n"
 
-#: src/rte_window.c:426
+#: src/rte_window.c:460
 msgid ""
 "\n"
 "\n"
@@ -8453,12 +8467,12 @@
 "Klikněte na 'OK' nastavíte toto rozložení kláves jako výchozí\n"
 "\n"
 
-#: src/rte_window.c:432
+#: src/rte_window.c:466
 #, c-format
 msgid "Saving keymap to %s\n"
 msgstr "Ukládání rozložení kláves %s\n"
 
-#: src/rte_window.c:439
+#: src/rte_window.c:471
 #, c-format
 msgid ""
 "\n"
@@ -8467,7 +8481,7 @@
 "\n"
 "Aktualizuji soubor rozložení kláves %s..."
 
-#: src/rte_window.c:446
+#: src/rte_window.c:477
 #, c-format
 msgid ""
 "\n"
@@ -8477,12 +8491,12 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/rte_window.c:526
+#: src/rte_window.c:556
 #, c-format
 msgid "Saving real time effect defaults to %s..."
 msgstr "Ukládání výchozích hodnot real time efektu do  %s..."
 
-#: src/rte_window.c:535
+#: src/rte_window.c:563
 #, c-format
 msgid ""
 "\n"
@@ -8497,22 +8511,22 @@
 "%s\n"
 "Kód chyby :%d\n"
 
-#: src/rte_window.c:632
+#: src/rte_window.c:657
 #, c-format
 msgid "Loading real time effect defaults from %s..."
 msgstr "Zavádění výchozích hodnot real time efektu z %s..."
 
-#: src/rte_window.c:681
+#: src/rte_window.c:701
 #, c-format
 msgid "Loading generator default sizes from %s..."
 msgstr "Nahrávání výchozích rozměrů generátoru z %s..."
 
-#: src/rte_window.c:1306
+#: src/rte_window.c:1319
 #, c-format
 msgid "Loading default keymap from %s..."
 msgstr "Nahrávání výchozího rozložení kláves z %s..."
 
-#: src/rte_window.c:1329
+#: src/rte_window.c:1339
 #, c-format
 msgid ""
 "\n"
@@ -8527,27 +8541,27 @@
 "%s\n"
 "Kód chyby :%d\n"
 
-#: src/rte_window.c:1403
+#: src/rte_window.c:1412
 #, c-format
 msgid "Invalid line %d in %s\n"
 msgstr "Neplatný řádek %d v %s\n"
 
-#: src/rte_window.c:1483
+#: src/rte_window.c:1490
 #, c-format
 msgid "Invalid key %d in %s\n"
 msgstr "Neplatná klávesa %d v %s\n"
 
-#: src/rte_window.c:1498
+#: src/rte_window.c:1505
 #, c-format
 msgid "Invalid effect %s in %s\n"
 msgstr "Neplatný efect %s v %s\n"
 
-#: src/rte_window.c:1517
+#: src/rte_window.c:1524
 #, c-format
 msgid "Unknown effect %s in %s\n"
 msgstr ""
 
-#: src/rte_window.c:1535
+#: src/rte_window.c:1542
 #, c-format
 msgid ""
 "This version of LiVES cannot mix generators/non-generators on the same key "
@@ -8556,21 +8570,21 @@
 "Tato verze LiVES neumožňuje kombinaci generátorů/negenerátorů na stejné "
 "klávese (%d) !\n"
 
-#: src/rte_window.c:1547
+#: src/rte_window.c:1554
 #, c-format
 msgid "Too many effects bound to key %d.\n"
 msgstr "Klávese %d přiřazeno příliš efektů.\n"
 
-#: src/rte_window.c:1587
+#: src/rte_window.c:1593
 msgid "update required.\n"
 msgstr "vyžadován update.\n"
 
-#: src/rte_window.c:1603
+#: src/rte_window.c:1607
 #, c-format
 msgid "Loading data connection map from %s..."
 msgstr ""
 
-#: src/rte_window.c:1612
+#: src/rte_window.c:1614
 msgid ""
 "\n"
 "\n"
@@ -8582,41 +8596,41 @@
 "Některé efekty se nepodařilo nalézt.\n"
 "\n"
 
-#: src/rte_window.c:1691
+#: src/rte_window.c:1692
 #, c-format
 msgid "LiVES: Information for %s"
 msgstr "LiVES: Zpráva pro %s"
 
-#: src/rte_window.c:1704
+#: src/rte_window.c:1705
 #, c-format
 msgid "Effect name: %s"
 msgstr "Jméno efektu: %s"
 
-#: src/rte_window.c:1712
+#: src/rte_window.c:1713
 #, c-format
 msgid "Plugin name: %s"
 msgstr "Jméno pluginu: %s"
 
-#: src/rte_window.c:1716
+#: src/rte_window.c:1717
 #, c-format
 msgid "Author: %s"
 msgstr "Autor: %s"
 
-#: src/rte_window.c:1721
+#: src/rte_window.c:1722
 #, c-format
 msgid "and: %s"
 msgstr ""
 
-#: src/rte_window.c:1726
+#: src/rte_window.c:1727
 #, c-format
 msgid "Version: %d"
 msgstr "Verze: %d"
 
-#: src/rte_window.c:1734
+#: src/rte_window.c:1735
 msgid "Description: "
 msgstr "Popis: "
 
-#: src/rte_window.c:1960
+#: src/rte_window.c:1963
 msgid ""
 "\n"
 "\n"
@@ -8630,69 +8644,69 @@
 "klávese.\n"
 "\n"
 
-#: src/rte_window.c:2024
+#: src/rte_window.c:2027
 #, c-format
 msgid "LiVES could not locate the effect %s.\n"
 msgstr "LiVES nemůže najít efekt %s.\n"
 
-#: src/rte_window.c:2225
+#: src/rte_window.c:2216
 msgid "LiVES: Real time effect mapping"
 msgstr "LiVES: Zobrazování real time efektu"
 
-#: src/rte_window.c:2257
+#: src/rte_window.c:2248
 #, c-format
 msgid "Ctrl-%d"
 msgstr "Ctrl-%d"
 
-#: src/rte_window.c:2264
+#: src/rte_window.c:2255
 msgid "Key active"
 msgstr "Aktivní klávesa"
 
-#: src/rte_window.c:2279
+#: src/rte_window.c:2271
 msgid "Key grab"
 msgstr "Klávesová zkratka"
 
-#: src/rte_window.c:2280
+#: src/rte_window.c:2272
 msgid "Grab keyboard for this effect key"
 msgstr ""
 
-#: src/rte_window.c:2290
+#: src/rte_window.c:2283
 msgid "_Clear all effects"
 msgstr "_Odstranit všechny efekty"
 
-#: src/rte_window.c:2304
+#: src/rte_window.c:2297
 msgid "Mode active"
 msgstr "Aktivní mód"
 
-#: src/rte_window.c:2314 src/multitrack.c:8568
+#: src/rte_window.c:2307 src/multitrack.c:8762
 msgid "Info"
 msgstr "informace"
 
-#: src/rte_window.c:2315
+#: src/rte_window.c:2308
 msgid "Set Parameters"
 msgstr "Nastavit parametry"
 
-#: src/rte_window.c:2316
+#: src/rte_window.c:2309
 msgid "Set Connections"
 msgstr ""
 
-#: src/rte_window.c:2317
+#: src/rte_window.c:2310
 msgid "Clear"
 msgstr "Odstranit"
 
-#: src/rte_window.c:2326
+#: src/rte_window.c:2319
 msgid "Effect name:"
 msgstr "Jméno efektu:"
 
-#: src/rte_window.c:2391
+#: src/rte_window.c:2384
 msgid "_Save as default keymap"
 msgstr "_Uložit jako výchozí nastavení kláves"
 
-#: src/rte_window.c:2396
+#: src/rte_window.c:2389
 msgid "_Load default keymap"
 msgstr "_Nahrát výchozí nastavení kláves"
 
-#: src/rte_window.c:2840
+#: src/rte_window.c:2833
 #, c-format
 msgid ""
 "Unable to create default keymap file: %s\n"
@@ -8753,7 +8767,7 @@
 msgid "none\n"
 msgstr "nic\n"
 
-#: src/lives-yuv4mpeg.c:494
+#: src/lives-yuv4mpeg.c:493
 #, c-format
 msgid ""
 "Unable to set display framerate to %.3f fps.\n"
@@ -8762,79 +8776,79 @@
 "Nelze nastavit poměr zobrazovaných snímků na  %.3f fps.\n"
 "\n"
 
-#: src/lives-yuv4mpeg.c:503
+#: src/lives-yuv4mpeg.c:502
 #, c-format
 msgid "Unable to open yuv4mpeg out stream %s\n"
 msgstr "Nelze otevřít yuv4mpeg stream %s\n"
 
-#: src/lives-yuv4mpeg.c:628
+#: src/lives-yuv4mpeg.c:626
 #, c-format
 msgid "TV card %d"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:713
+#: src/lives-yuv4mpeg.c:710
 #, c-format
 msgid "Opened TV card %d (%s)"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:760
+#: src/lives-yuv4mpeg.c:757
 #, c-format
 msgid "Firewire card %d"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:796
+#: src/lives-yuv4mpeg.c:793
 #, c-format
 msgid "Opened firewire card %d"
 msgstr ""
 
-#: src/multitrack.c:666
+#: src/multitrack.c:736
 msgid "Auto backup"
 msgstr ""
 
-#: src/multitrack.c:868
+#: src/multitrack.c:935
 msgid "Backing audio"
 msgstr ""
 
-#: src/multitrack.c:1435
+#: src/multitrack.c:1515
 #, fuzzy, c-format
 msgid "%s : parameters for %s"
 msgstr "Žádné parametry"
 
-#: src/multitrack.c:1809 src/multitrack.c:3483
+#: src/multitrack.c:1881 src/multitrack.c:3635
 #, c-format
 msgid "Current track: %s (layer %d)\n"
 msgstr "Aktuální stopa: %s (vrstav %d)\n"
 
-#: src/multitrack.c:1813 src/multitrack.c:3484
+#: src/multitrack.c:1885 src/multitrack.c:3637
 msgid "Current track: Backing audio\n"
 msgstr "Aktuální stopa: Zvuk v pozadí\n"
 
-#: src/multitrack.c:1814
+#: src/multitrack.c:1886
 #, c-format
 msgid "Current track: Layer %d audio\n"
 msgstr ""
 
-#: src/multitrack.c:1817
+#: src/multitrack.c:1889
 #, c-format
 msgid "%.2f sec.\n"
 msgstr "%.2f s\n"
 
-#: src/multitrack.c:1822 src/multitrack.c:3490
+#: src/multitrack.c:1894 src/multitrack.c:3643
 #, c-format
 msgid "Source: %s"
 msgstr "Zdroj: %s"
 
-#: src/multitrack.c:1825 src/multitrack.c:3492
+#: src/multitrack.c:1897 src/multitrack.c:3645
 msgid "Right click for context menu.\n"
 msgstr "Klikněte pravý tlačítkem pro zobrazení kontextového menu.\n"
 
-#: src/multitrack.c:1827
+#: src/multitrack.c:1899
 msgid ""
 "Double click on a block\n"
 "to select it."
 msgstr ""
 
-#: src/multitrack.c:3312
+#: src/multitrack.c:3452
 msgid ""
 "\n"
 "\n"
@@ -8843,7 +8857,7 @@
 "right or double clicking on it.\n"
 msgstr ""
 
-#: src/multitrack.c:3315
+#: src/multitrack.c:3455
 msgid ""
 "\n"
 "\n"
@@ -8851,14 +8865,14 @@
 "Select an effect in FX stack first to view its parameters.\n"
 msgstr ""
 
-#: src/multitrack.c:3318
+#: src/multitrack.c:3458
 msgid ""
 "\n"
 "\n"
 "No clips loaded.\n"
 msgstr ""
 
-#: src/multitrack.c:3321
+#: src/multitrack.c:3462
 msgid ""
 "You must select two video tracks\n"
 "and a time region\n"
@@ -8868,7 +8882,7 @@
 "before inserting clips into the timeline."
 msgstr ""
 
-#: src/multitrack.c:3324
+#: src/multitrack.c:3465
 msgid ""
 "\n"
 "\n"
@@ -8877,12 +8891,12 @@
 "to apply compositors.\n"
 msgstr ""
 
-#: src/multitrack.c:3487
+#: src/multitrack.c:3640
 #, c-format
 msgid "%.2f sec. to %.2f sec.\n"
 msgstr "%.2f s do %.2f s.\n"
 
-#: src/multitrack.c:3493
+#: src/multitrack.c:3646
 msgid ""
 "Single click on timeline\n"
 "to select a frame.\n"
@@ -8890,184 +8904,184 @@
 "Kliknutím na časovou osu\n"
 "vyberete snímek.\n"
 
-#: src/multitrack.c:3711 src/multitrack.c:6790
+#: src/multitrack.c:3858 src/multitrack.c:6972
 #, c-format
 msgid "%s [unstable]"
 msgstr ""
 
-#: src/multitrack.c:3822
+#: src/multitrack.c:3973
 msgid ""
 "You can click and drag\n"
 "below the timeline"
 msgstr ""
 
-#: src/multitrack.c:3823
+#: src/multitrack.c:3974
 msgid "to select a time region.\n"
 msgstr "vyberte časové pásmo.\n"
 
-#: src/multitrack.c:3985
+#: src/multitrack.c:4137
 msgid "LiVES: Selected clip"
 msgstr ""
 
-#: src/multitrack.c:3993
+#: src/multitrack.c:4145
 msgid "_Adjust start and end points"
 msgstr ""
 
-#: src/multitrack.c:4002
+#: src/multitrack.c:4154
 msgid "_Edit/encode in clip editor"
 msgstr ""
 
-#: src/multitrack.c:4009
+#: src/multitrack.c:4161
 msgid "_Show clip information"
 msgstr ""
 
-#: src/multitrack.c:4016
+#: src/multitrack.c:4168
 msgid "_Close this clip"
 msgstr ""
 
-#: src/multitrack.c:4236
+#: src/multitrack.c:4388
 msgid "Audio mixer (ctrl-m)"
 msgstr ""
 
-#: src/multitrack.c:4336
+#: src/multitrack.c:4488
 msgid "Single click on timeline"
 msgstr ""
 
-#: src/multitrack.c:4337
+#: src/multitrack.c:4489
 msgid "to select a frame."
 msgstr ""
 
-#: src/multitrack.c:4338
+#: src/multitrack.c:4490
 msgid "Double click or right click on timeline"
 msgstr ""
 
-#: src/multitrack.c:4339
+#: src/multitrack.c:4491
 msgid "to select a block."
 msgstr ""
 
-#: src/multitrack.c:4340
+#: src/multitrack.c:4492
 msgid "Clips can be dragged"
 msgstr ""
 
-#: src/multitrack.c:4341
+#: src/multitrack.c:4493
 msgid "onto the timeline."
 msgstr ""
 
-#: src/multitrack.c:4343
+#: src/multitrack.c:4495
 msgid "Mouse mode is: Move"
 msgstr ""
 
-#: src/multitrack.c:4344
+#: src/multitrack.c:4496
 msgid "clips can be moved around."
 msgstr ""
 
-#: src/multitrack.c:4349
+#: src/multitrack.c:4500
 msgid "Mouse mode is: Select."
 msgstr ""
 
-#: src/multitrack.c:4350
+#: src/multitrack.c:4501
 msgid "Drag with mouse on timeline"
 msgstr ""
 
-#: src/multitrack.c:4351
+#: src/multitrack.c:4502
 msgid "to select tracks and time."
 msgstr ""
 
-#: src/multitrack.c:4362
+#: src/multitrack.c:4509
 msgid "_Insert mode: Normal"
 msgstr ""
 
-#: src/multitrack.c:4378
+#: src/multitrack.c:4537
 msgid "_Mouse mode: Move"
 msgstr "_Mód myši: Posun"
 
-#: src/multitrack.c:4382
+#: src/multitrack.c:4540
 msgid "_Mouse mode: Select"
 msgstr "_Mód myši: Výběr"
 
-#: src/multitrack.c:4405 src/multitrack.c:7925
+#: src/multitrack.c:4563 src/multitrack.c:8104
 msgid "Gravity: Normal"
 msgstr ""
 
-#: src/multitrack.c:4409
+#: src/multitrack.c:4565
 msgid "Gravity: Left"
 msgstr ""
 
-#: src/multitrack.c:4414
+#: src/multitrack.c:4569
 msgid "Gravity: Right"
 msgstr ""
 
-#: src/multitrack.c:4416
+#: src/multitrack.c:4570
 msgid "Close _last gap(s) in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:4419
+#: src/multitrack.c:4572
 msgid "Close _first gap(s) in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:4458
+#: src/multitrack.c:4627
 msgid "Close gaps"
 msgstr "Zavřít časové intervaly"
 
-#: src/multitrack.c:4460
+#: src/multitrack.c:4629
 msgid "Move block"
 msgstr "Přesunout blok"
 
-#: src/multitrack.c:4462
+#: src/multitrack.c:4631
 msgid "Move audio block"
 msgstr "Přesunout audio blok"
 
-#: src/multitrack.c:4464
+#: src/multitrack.c:4633
 msgid "Delete block"
 msgstr "Smazat blok"
 
-#: src/multitrack.c:4466
+#: src/multitrack.c:4635
 msgid "Delete audio block"
 msgstr "Smazat zvukový blok"
 
-#: src/multitrack.c:4468
+#: src/multitrack.c:4637
 msgid "Split tracks"
 msgstr "Rozdělit stopy"
 
-#: src/multitrack.c:4470
+#: src/multitrack.c:4639
 msgid "Split block"
 msgstr "Rozdělit blok"
 
-#: src/multitrack.c:4473
+#: src/multitrack.c:4642
 #, c-format
 msgid "Apply %s"
 msgstr "Použít %s"
 
-#: src/multitrack.c:4478
+#: src/multitrack.c:4647
 #, c-format
 msgid "Delete %s"
 msgstr "Smazat %s"
 
-#: src/multitrack.c:4482
+#: src/multitrack.c:4651
 msgid "Insert block"
 msgstr "Vložit blok"
 
-#: src/multitrack.c:4484
+#: src/multitrack.c:4653
 msgid "Insert gap"
 msgstr ""
 
-#: src/multitrack.c:4486
+#: src/multitrack.c:4655
 msgid "Insert audio block"
 msgstr "Vložit zvukový blok"
 
-#: src/multitrack.c:4488
+#: src/multitrack.c:4657
 msgid "Effect order change"
 msgstr ""
 
-#: src/multitrack.c:4898
+#: src/multitrack.c:5064
 msgid "unsigned "
 msgstr "neoznačený "
 
-#: src/multitrack.c:4899
+#: src/multitrack.c:5065
 msgid "signed "
 msgstr "označený "
 
-#: src/multitrack.c:4904
+#: src/multitrack.c:5071
 #, c-format
 msgid ""
 "Multitrack values set to %.3f fps, frame size %d x %d, audio channels %d, "
@@ -9076,15 +9090,15 @@
 "Multitrack hodnoty nastaveny na %.3f fps, velikost snímku %d x %d, zvukové "
 "kanály %d, audio poměr %d, velikost zvukového vzorku %d, %s.\n"
 
-#: src/multitrack.c:4938
+#: src/multitrack.c:5104
 msgid "invalid event list. Failed.\n"
 msgstr "neplatný seznam událostí. Ukončeno.\n"
 
-#: src/multitrack.c:4944
+#: src/multitrack.c:5110
 msgid "event list has invalid fps. Failed.\n"
 msgstr "seznam událostí má neplatný fps. Ukončeno.\n"
 
-#: src/multitrack.c:4953
+#: src/multitrack.c:5122
 #, c-format
 msgid ""
 "\n"
@@ -9099,7 +9113,7 @@
 "uzavřete aktuální set,\n"
 "potom otevřete v novém setu z menu Soubor.\n"
 
-#: src/multitrack.c:4993
+#: src/multitrack.c:5163
 #, c-format
 msgid ""
 "\n"
@@ -9110,439 +9124,431 @@
 "LiVES našel neplatný počet zvukových kanálů (%d).\n"
 "Nemohlo být otevřeno.\n"
 
-#: src/multitrack.c:5329 src/multitrack.c:5338 src/multitrack.c:21133
+#: src/multitrack.c:5452
 msgid "Layout was wiped.\n"
 msgstr ""
 
-#: src/multitrack.c:5374
+#: src/multitrack.c:5547
 #, c-format
 msgid "LiVES-%s: Multitrack %dx%d : %d bpp %.3f fps"
 msgstr "LiVES-%s: Multitrack %dx%d : %d bpp %.3f fps"
 
-#: src/multitrack.c:5617
+#: src/multitrack.c:5793
 msgid "In/out"
 msgstr ""
 
-#: src/multitrack.c:5619
+#: src/multitrack.c:5795
 msgid "FX stack"
 msgstr ""
 
-#: src/multitrack.c:5627 src/omc-learn.c:673
+#: src/multitrack.c:5803 src/omc-learn.c:659
 msgid "Params."
 msgstr ""
 
-#: src/multitrack.c:5978
+#: src/multitrack.c:6157
 msgid "_Open..."
 msgstr ""
 
-#: src/multitrack.c:5996
+#: src/multitrack.c:6175
 msgid "O_pen File Selection..."
 msgstr "_Otevřít soubor..."
 
-#: src/multitrack.c:6040
+#: src/multitrack.c:6219
 msgid "Import Selection from _dvd/vcd..."
 msgstr "Importovat výběr z _dvd/vcd..."
 
-#: src/multitrack.c:6050
+#: src/multitrack.c:6229
 msgid "Import Selection from _dvd"
 msgstr "Importovat výběr z _dvd"
 
-#: src/multitrack.c:6060
+#: src/multitrack.c:6239
 msgid "Import Selection from _vcd"
 msgstr "Importovat výběr z _vcd"
 
-#: src/multitrack.c:6076
+#: src/multitrack.c:6255
 msgid "_Import from Device"
 msgstr "Importovat ze zařízení"
 
-#: src/multitrack.c:6103
+#: src/multitrack.c:6282
 msgid "_Close the selected clip"
 msgstr ""
 
-#: src/multitrack.c:6198
+#: src/multitrack.c:6377
 msgid "_Save layout as..."
 msgstr "_Uložit rozložení jako..."
 
-#: src/multitrack.c:6206
+#: src/multitrack.c:6385
 msgid "_Load layout..."
 msgstr ""
 
-#: src/multitrack.c:6210
+#: src/multitrack.c:6389
 msgid "_Wipe/Delete layout..."
 msgstr "_Vyčistit/Smazat rozložení..."
 
-#: src/multitrack.c:6236
+#: src/multitrack.c:6415
 msgid "_Ignore width, height and audio values from loaded layouts"
 msgstr "_Ignorovat šířku, výšku a hodnoty zvuku v otevřeném rozložení"
 
-#: src/multitrack.c:6240
+#: src/multitrack.c:6419
 msgid "Auto load _subtitles with clips"
 msgstr ""
 
-#: src/multitrack.c:6322
+#: src/multitrack.c:6501
 msgid "_CLIP EDITOR"
 msgstr "_EDITOR KLIPU"
 
-#: src/multitrack.c:6334
+#: src/multitrack.c:6513
 msgid "_Adjust selected clip start/end points"
 msgstr ""
 
-#: src/multitrack.c:6343
+#: src/multitrack.c:6522
 msgid "_Insert selected clip"
 msgstr "_Vložit vybraný klip"
 
-#: src/multitrack.c:6355
+#: src/multitrack.c:6534
 msgid "_Insert selected clip audio"
 msgstr "_Vložit vybraný zvukový klip"
 
-#: src/multitrack.c:6364
+#: src/multitrack.c:6543
 msgid "_Delete selected block"
 msgstr "_Smazat vybraný blok"
 
-#: src/multitrack.c:6373
+#: src/multitrack.c:6555
 msgid "_Jump to previous block boundary"
 msgstr "_Přeskočit na hranici předchozího bloku"
 
-#: src/multitrack.c:6382
+#: src/multitrack.c:6564
 msgid "_Jump to next block boundary"
 msgstr "_Přeskočit na hranici následujícího bloku"
 
-#: src/multitrack.c:6395
+#: src/multitrack.c:6577
 msgid "Clear _marks from timeline"
 msgstr "Smazat _značky z časové osy"
 
-#: src/multitrack.c:6403
+#: src/multitrack.c:6585
 msgid "Ignore selection limits when inserting"
 msgstr ""
 
-#: src/multitrack.c:6420 src/multitrack.c:16719
+#: src/multitrack.c:6602 src/multitrack.c:17009
 msgid "_Play from Timeline Position"
 msgstr ""
 
-#: src/multitrack.c:6434
+#: src/multitrack.c:6616
 msgid "Pla_y selected time only"
 msgstr ""
 
-#: src/multitrack.c:6518
+#: src/multitrack.c:6700
 msgid "_Move effects with blocks"
 msgstr "_Přesunout efekty s bloky"
 
-#: src/multitrack.c:6531
+#: src/multitrack.c:6713
 msgid "Select _autotransition effect..."
 msgstr ""
 
-#: src/multitrack.c:6542
+#: src/multitrack.c:6724
 msgid "Crossfade audio with autotransition"
 msgstr ""
 
-#: src/multitrack.c:6550
+#: src/multitrack.c:6732
 msgid "View/_Edit selected effect"
 msgstr ""
 
-#: src/multitrack.c:6554
+#: src/multitrack.c:6736
 msgid "_Delete selected effect"
 msgstr "_Smazat vybraný efekt"
 
-#: src/multitrack.c:6562
+#: src/multitrack.c:6744
 msgid "Apply effect to _block..."
 msgstr "Použít efekt na _blok..."
 
-#: src/multitrack.c:6619
+#: src/multitrack.c:6801
 msgid "Apply effect to _region..."
 msgstr "Použít efekt na _oblast..."
 
-#: src/multitrack.c:6885
+#: src/multitrack.c:7061
 msgid "_Tracks"
 msgstr "_Stopy"
 
-#: src/multitrack.c:6896
+#: src/multitrack.c:7072
 msgid "Rename current track"
 msgstr ""
 
-#: src/multitrack.c:6904
+#: src/multitrack.c:7080
 msgid "Make _Backing Audio current track"
 msgstr "Přesun aktuální zvukové stopy na _pozadí"
 
-#: src/multitrack.c:6915
+#: src/multitrack.c:7091
 msgid "Add Video Track at _Rear"
 msgstr "Přidat video stopu na _konec"
 
-#: src/multitrack.c:6923
+#: src/multitrack.c:7099
 msgid "Add Video Track at _Front"
 msgstr "Přidat video stopu na _začátek"
 
-#: src/multitrack.c:6936
+#: src/multitrack.c:7112
 msgid "_Split current track at cursor"
 msgstr ""
 
-#: src/multitrack.c:6948
+#: src/multitrack.c:7124
 msgid "_Split selected video tracks"
 msgstr "_Rozdělit vybrané video stopy"
 
-#: src/multitrack.c:6961
+#: src/multitrack.c:7137
 msgid "Insert gap in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:6969
+#: src/multitrack.c:7145
 msgid "Insert gap in current track/selected time"
 msgstr ""
 
-#: src/multitrack.c:6981
+#: src/multitrack.c:7157
 msgid "Close all _gaps in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:7007
+#: src/multitrack.c:7183
 msgid "Se_lection"
 msgstr "_Výběr"
 
-#: src/multitrack.c:7018
+#: src/multitrack.c:7194
 msgid "_Select Current Track"
 msgstr "_Vybrat stávající stopu"
 
-#: src/multitrack.c:7025
+#: src/multitrack.c:7201
 msgid "Select _all video tracks"
 msgstr "Vybrat _všechny video stopy"
 
-#: src/multitrack.c:7032
+#: src/multitrack.c:7208
 msgid "Select _no video tracks"
 msgstr "_Nevybrat video stopu"
 
-#: src/multitrack.c:7039
+#: src/multitrack.c:7215
 msgid "Select all _time"
 msgstr "Vybrat _vše"
 
-#: src/multitrack.c:7050
+#: src/multitrack.c:7226
 msgid "Select from _zero time"
 msgstr "Vybrat od _začátku"
 
-#: src/multitrack.c:7057
+#: src/multitrack.c:7233
 msgid "Select to _end time"
 msgstr "Vybrat do _konce"
 
-#: src/multitrack.c:7064
+#: src/multitrack.c:7240
 msgid "_Copy..."
 msgstr "_Kopírovat..."
 
-#: src/multitrack.c:7075
+#: src/multitrack.c:7251
 msgid "_Timecode to region start"
 msgstr "_Začátek oblasti"
 
-#: src/multitrack.c:7082
+#: src/multitrack.c:7258
 msgid "_Timecode to region end"
 msgstr "_Konec oblasti"
 
-#: src/multitrack.c:7089
+#: src/multitrack.c:7265
 msgid "_Region start to timecode"
 msgstr "_Spustit v čase"
 
-#: src/multitrack.c:7096
+#: src/multitrack.c:7272
 msgid "_Region end to timecode"
 msgstr "_Ukončit v čase"
 
-#: src/multitrack.c:7110
+#: src/multitrack.c:7286
 msgid "Select/deselect block at current track/time"
 msgstr ""
 
-#: src/multitrack.c:7135
+#: src/multitrack.c:7311
 msgid "_Change width, height and audio values..."
 msgstr "_Změnit šířku, výšku a hodnoty zvuku..."
 
-#: src/multitrack.c:7194
+#: src/multitrack.c:7370
 msgid "_Render"
 msgstr "_Render"
 
-#: src/multitrack.c:7205
+#: src/multitrack.c:7381
 msgid "_Render all to new clip"
 msgstr ""
 
-#: src/multitrack.c:7220
+#: src/multitrack.c:7396
 msgid "Render _video"
 msgstr "Rendrovat_video"
 
-#: src/multitrack.c:7225
+#: src/multitrack.c:7401
 msgid "Render _audio"
 msgstr "Rendrovat _zvuk"
 
-#: src/multitrack.c:7235
+#: src/multitrack.c:7411
 msgid "_Normalise rendered audio"
 msgstr ""
 
-#: src/multitrack.c:7242
+#: src/multitrack.c:7418
 msgid "_Pre-render audio"
 msgstr ""
 
-#: src/multitrack.c:7251
+#: src/multitrack.c:7427
 msgid "_View"
 msgstr "_Pohled"
 
-#: src/multitrack.c:7270
+#: src/multitrack.c:7446
 msgid "Block _In/out points"
 msgstr "Blokovat _In/out body"
 
-#: src/multitrack.c:7279
+#: src/multitrack.c:7455
 msgid "_Effects at current"
 msgstr "_Aktuální efekty"
 
-#: src/multitrack.c:7297
+#: src/multitrack.c:7473
 msgid "Audio parameters"
 msgstr "Zvukové parametry"
 
-#: src/multitrack.c:7308
+#: src/multitrack.c:7484
 msgid "Show backing _audio track"
 msgstr "Zobraz _zvukovou stopu na pozadí"
 
-#: src/multitrack.c:7312
+#: src/multitrack.c:7488
 msgid "Compact view"
 msgstr "Kompaktní pohled"
 
-#: src/multitrack.c:7320
+#: src/multitrack.c:7496
 msgid "Maximum tracks to display..."
 msgstr ""
 
-#: src/multitrack.c:7327
+#: src/multitrack.c:7503
 msgid "Scroll to follow playback"
 msgstr ""
 
-#: src/multitrack.c:7331
+#: src/multitrack.c:7507
 msgid "_Center on cursor"
 msgstr ""
 
-#: src/multitrack.c:7338
+#: src/multitrack.c:7514
 msgid "_Zoom in"
 msgstr "_Přiblížit"
 
-#: src/multitrack.c:7349
+#: src/multitrack.c:7525
 msgid "_Zoom out"
 msgstr "_Oddálit"
 
-#: src/multitrack.c:7361
+#: src/multitrack.c:7537
 msgid "Multitrack _details"
 msgstr "_Detaily o multitracku"
 
-#: src/multitrack.c:7374
+#: src/multitrack.c:7550
 msgid "_Event Window"
 msgstr "Okno _událostí"
 
-#: src/multitrack.c:7378
+#: src/multitrack.c:7554
 msgid "_Event Window (selected time only)"
 msgstr ""
 
-#: src/multitrack.c:7382
+#: src/multitrack.c:7558
 msgid "_Show FRAME events"
 msgstr "_Zobraz události SNÍMKU"
 
-#: src/multitrack.c:7399
+#: src/multitrack.c:7575
 msgid "_Show multitrack keys"
 msgstr "_Zobraz klávesy mutlitracku"
 
-#: src/multitrack.c:7468
+#: src/multitrack.c:7644
 msgid "Mouse mode: _Move"
 msgstr "Mód myši: _Posun"
 
-#: src/multitrack.c:7476
+#: src/multitrack.c:7652
 msgid "Mouse mode: _Select"
 msgstr "Mód myši: _Výběr"
 
-#: src/multitrack.c:7505
+#: src/multitrack.c:7681
 msgid "Insert mode: _Normal"
 msgstr ""
 
-#: src/multitrack.c:7733
+#: src/multitrack.c:7909
 msgid "Insert with _audio"
 msgstr ""
 
-#: src/multitrack.c:7734
+#: src/multitrack.c:7910
 msgid ""
 "Select whether video clips are inserted and moved with their audio or not"
 msgstr ""
 
-#: src/multitrack.c:7829
+#: src/multitrack.c:8007
 msgid "Select _overlap"
 msgstr ""
 
-#: src/multitrack.c:7830
+#: src/multitrack.c:8008
 msgid ""
 "Select whether timeline selection snaps to overlap between selected tracks "
 "or not"
 msgstr ""
 
-#: src/multitrack.c:7894 src/multitrack.c:14198
+#: src/multitrack.c:8073 src/multitrack.c:14422
 msgid "Expanded View (d)"
 msgstr ""
 
-#: src/multitrack.c:7897 src/multitrack.c:14205
+#: src/multitrack.c:8076 src/multitrack.c:14428
 msgid "Compact View (d)"
 msgstr ""
 
-#: src/multitrack.c:7939
+#: src/multitrack.c:8118
 msgid "Gravity: _Normal"
 msgstr ""
 
-#: src/multitrack.c:7952
+#: src/multitrack.c:8131
 msgid "Gravity: _Left"
 msgstr ""
 
-#: src/multitrack.c:7967
+#: src/multitrack.c:8146
 msgid "Gravity: _Right"
 msgstr ""
 
-#: src/multitrack.c:8297
+#: src/multitrack.c:8496
 msgid "_Apply"
 msgstr "_Použít"
 
-#: src/multitrack.c:8319
+#: src/multitrack.c:8518
 msgid "Time"
 msgstr ""
 
-#: src/multitrack.c:8333
+#: src/multitrack.c:8532
 msgid "_Del. node"
 msgstr "_Smazat uzel"
 
-#: src/multitrack.c:8341
+#: src/multitrack.c:8540
 msgid "_Next node"
 msgstr "_Další uzel"
 
-#: src/multitrack.c:8349
+#: src/multitrack.c:8548
 msgid "_Prev node"
 msgstr "_Předchozí uzel"
 
-#: src/multitrack.c:8373
+#: src/multitrack.c:8574
 msgid "_Reverse playback  "
 msgstr "_Otočit přehrávání  "
 
-#: src/multitrack.c:8395
+#: src/multitrack.c:8596
 msgid "_Velocity  "
 msgstr "_Rychlost  "
 
-#: src/multitrack.c:8464
+#: src/multitrack.c:8664
 msgid "Anchor _start"
 msgstr "_Začátek ukotvení"
 
-#: src/multitrack.c:8465
+#: src/multitrack.c:8665
 msgid "Anchor the start point to the timeline"
 msgstr ""
 
-#: src/multitrack.c:8481
-msgid "Start frame"
-msgstr "První snímek"
-
-#: src/multitrack.c:8533
+#: src/multitrack.c:8728
 msgid "Anchor _end"
 msgstr "_Konec ukotvení"
 
-#: src/multitrack.c:8534
+#: src/multitrack.c:8729
 msgid "Anchor the end point to the timeline"
 msgstr ""
 
-#: src/multitrack.c:8546
-msgid "End frame"
-msgstr "Poslední snímek"
-
-#: src/multitrack.c:8739
+#: src/multitrack.c:8929
 msgid "Scroll"
 msgstr "Rolovat"
 
-#: src/multitrack.c:9316
+#: src/multitrack.c:9502
 msgid ""
 "\n"
 "==============================\n"
@@ -9552,91 +9558,91 @@
 "==============================\n"
 "Přepnuto do režimu Editace klipu\n"
 
-#: src/multitrack.c:9502
+#: src/multitrack.c:9708
 msgid "Timeline (seconds)"
 msgstr "Časová osa (vteřiny)"
 
-#: src/multitrack.c:9984
+#: src/multitrack.c:10202
 msgid " Backing audio"
 msgstr " Zvuk v pozadí"
 
-#: src/multitrack.c:9987
+#: src/multitrack.c:10204
 #, c-format
 msgid " Layer %d audio"
 msgstr ""
 
-#: src/multitrack.c:9995
+#: src/multitrack.c:10212
 msgid "Show/hide audio details"
 msgstr ""
 
-#: src/multitrack.c:10010 src/multitrack.c:10232
+#: src/multitrack.c:10227 src/multitrack.c:10452
 #, c-format
 msgid "Layer %d audio"
 msgstr ""
 
-#: src/multitrack.c:10144 src/multitrack.c:10261
+#: src/multitrack.c:10353 src/multitrack.c:10481
 #, c-format
 msgid "%s (layer %d)"
 msgstr "%s (vrstva %d)"
 
-#: src/multitrack.c:10184
+#: src/multitrack.c:10403
 msgid "Select track"
 msgstr ""
 
-#: src/multitrack.c:10188
+#: src/multitrack.c:10407
 msgid "Show/hide audio"
 msgstr ""
 
-#: src/multitrack.c:10194
+#: src/multitrack.c:10413
 #, c-format
 msgid "Video %d"
 msgstr "Video %d"
 
-#: src/multitrack.c:10233
+#: src/multitrack.c:10453
 #, c-format
 msgid " %s"
 msgstr " %s"
 
-#: src/multitrack.c:10346
+#: src/multitrack.c:10574
 msgid "LiVES: Selected effect"
 msgstr "LiVES: Vybraný efekt"
 
-#: src/multitrack.c:10358
+#: src/multitrack.c:10586
 msgid "_View/Edit this effect"
 msgstr "Zobrazit/Upra_vit tento efekt"
 
-#: src/multitrack.c:10361
+#: src/multitrack.c:10588
 msgid "_View this effect"
 msgstr "Zobra_zit tento efekt"
 
-#: src/multitrack.c:10369
+#: src/multitrack.c:10596
 msgid "_Delete this effect"
 msgstr "_Odstranit tento efekt"
 
-#: src/multitrack.c:10422
+#: src/multitrack.c:10648
 msgid "Cannot insert after this effect"
 msgstr ""
 
-#: src/multitrack.c:10451
+#: src/multitrack.c:10677
 msgid "This effect cannot be moved"
 msgstr ""
 
-#: src/multitrack.c:10499
+#: src/multitrack.c:10724
 #, c-format
 msgid "  %d to %d selected  "
 msgstr "  %d do %d vybráno  "
 
-#: src/multitrack.c:10502 src/multitrack.c:10746
+#: src/multitrack.c:10727 src/multitrack.c:10968
 #, c-format
 msgid "%.2f sec."
 msgstr "%.2f s"
 
-#: src/multitrack.c:10717
+#: src/multitrack.c:10940
 #, c-format
 msgid "%d frames"
 msgstr "%d snímků"
 
-#: src/multitrack.c:11070
+#: src/multitrack.c:11299
 msgid ""
 "\n"
 "==============================\n"
@@ -9646,70 +9652,70 @@
 "==============================\n"
 "Přepnuto do vícestopého režimu\n"
 
-#: src/multitrack.c:12691
+#: src/multitrack.c:12939
 msgid "Drag the time slider to where you"
 msgstr ""
 
-#: src/multitrack.c:12692
+#: src/multitrack.c:12940
 msgid "want to set effect parameters"
 msgstr ""
 
-#: src/multitrack.c:12693
+#: src/multitrack.c:12941
 msgid "Set parameters, then click \"Apply\"\n"
 msgstr ""
 
-#: src/multitrack.c:12694
+#: src/multitrack.c:12942
 msgid ""
 "NODES are points where parameters\n"
 "have been set.\n"
 "Nodes can be deleted."
 msgstr ""
 
-#: src/multitrack.c:12697
+#: src/multitrack.c:12944
 msgid "Effect has no parameters.\n"
 msgstr ""
 
-#: src/multitrack.c:12788
+#: src/multitrack.c:13033
 #, c-format
 msgid "%s output"
 msgstr "%s výstup"
 
-#: src/multitrack.c:12794 src/multitrack.c:12804
+#: src/multitrack.c:13038 src/multitrack.c:13046
 #, c-format
 msgid "layer %d"
 msgstr "vrstva %d"
 
-#: src/multitrack.c:12796 src/multitrack.c:12806
+#: src/multitrack.c:13039 src/multitrack.c:13047
 msgid "audio track"
 msgstr "zvuková stopa"
 
-#: src/multitrack.c:12797
+#: src/multitrack.c:13040
 #, c-format
 msgid "%s to %s"
 msgstr "%s na %s"
 
-#: src/multitrack.c:12807
+#: src/multitrack.c:13048
 #, c-format
 msgid "%s from %s"
 msgstr ""
 
-#: src/multitrack.c:12860
+#: src/multitrack.c:13099
 msgid "_Prev filter map"
 msgstr "Mapa _předchozího filtru"
 
-#: src/multitrack.c:12871
+#: src/multitrack.c:13110
 msgid "Insert _before"
 msgstr "Vložit _před"
 
-#: src/multitrack.c:12881
+#: src/multitrack.c:13120
 msgid "Insert _after"
 msgstr "Vložit _po"
 
-#: src/multitrack.c:12896
+#: src/multitrack.c:13134
 msgid "_Next filter map"
 msgstr "Mapa _dalšího filtru"
 
-#: src/multitrack.c:12911
+#: src/multitrack.c:13148
 msgid ""
 "\n"
 "\n"
@@ -9717,80 +9723,80 @@
 "current time.\n"
 msgstr ""
 
-#: src/multitrack.c:12929
+#: src/multitrack.c:13166
 msgid ""
 "Drag a compositor anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:12936
+#: src/multitrack.c:13173
 msgid ""
 "Drag a transition anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:12944
+#: src/multitrack.c:13181
 msgid ""
 "Effects can be dragged\n"
 "onto blocks on the timeline."
 msgstr ""
 
-#: src/multitrack.c:13166
+#: src/multitrack.c:13406
 msgid "LiVES: Selected block/frame"
 msgstr "LiVES: Vybraný blok/snímek"
 
-#: src/multitrack.c:13173
+#: src/multitrack.c:13413
 msgid "_Select this block"
 msgstr "_Zvolit tento blok"
 
-#: src/multitrack.c:13183
+#: src/multitrack.c:13423
 msgid "_Split block here"
 msgstr "Zde _rozdělit blok"
 
-#: src/multitrack.c:13191
+#: src/multitrack.c:13431
 msgid "List _effects here"
 msgstr "Seznam _efektů"
 
-#: src/multitrack.c:13200 src/multitrack.c:13277
+#: src/multitrack.c:13440 src/multitrack.c:13518
 #, c-format
 msgid "_Adjust %s"
 msgstr "_Upravit %s"
 
-#: src/multitrack.c:13215
+#: src/multitrack.c:13455
 msgid "_Delete this block"
 msgstr "_Vymazat tento blok"
 
-#: src/multitrack.c:13258
+#: src/multitrack.c:13500
 msgid "_Insert here"
 msgstr "_Vložit zde"
 
-#: src/multitrack.c:13264
+#: src/multitrack.c:13505
 msgid "_Insert audio here"
 msgstr "_Zvuk vložit sem"
 
-#: src/multitrack.c:14801
+#: src/multitrack.c:15017
 #, c-format
 msgid "Inserted gap in selected tracks from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:14835
+#: src/multitrack.c:15048
 #, c-format
 msgid "Inserted gap in track %s from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15036
+#: src/multitrack.c:15244
 #, c-format
 msgid "Undid %s\n"
 msgstr ""
 
-#: src/multitrack.c:15235
+#: src/multitrack.c:15445
 #, c-format
 msgid "Redid %s\n"
 msgstr ""
 
-#: src/multitrack.c:15268
+#: src/multitrack.c:15475
 msgid ""
 "\n"
 " (variable)"
@@ -9798,62 +9804,62 @@
 "\n"
 " (proměnná)"
 
-#: src/multitrack.c:15502 src/multitrack.c:15614 src/multitrack.c:18736
-#: src/multitrack.c:18748
+#: src/multitrack.c:15710 src/multitrack.c:15823 src/multitrack.c:19077
+#: src/multitrack.c:19089
 #, c-format
 msgid "track %s"
 msgstr "stopa %s"
 
-#: src/multitrack.c:15507 src/multitrack.c:15619 src/multitrack.c:18741
+#: src/multitrack.c:15715 src/multitrack.c:15828 src/multitrack.c:19082
 #, c-format
 msgid "tracks %s and %s"
 msgstr "skladby %s a %s"
 
-#: src/multitrack.c:15513 src/multitrack.c:15625 src/multitrack.c:18751
+#: src/multitrack.c:15721 src/multitrack.c:15834 src/multitrack.c:19091
 msgid "selected tracks"
 msgstr "vybrané stopy"
 
-#: src/multitrack.c:15516
+#: src/multitrack.c:15726
 #, c-format
 msgid "Added %s %s to %s from %.4f to %.4f\n"
 msgstr "Přidány %s %s do %s od %.4f do %.4f\n"
 
-#: src/multitrack.c:15550
+#: src/multitrack.c:15760
 #, c-format
 msgid "Added effect %s to track %s from %.4f to %.4f\n"
 msgstr "Přidán efektt %s do stopy %s od %.4f do %.4f\n"
 
-#: src/multitrack.c:15631
+#: src/multitrack.c:15845
 #, c-format
 msgid "Deleted %s %s from %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15935
+#: src/multitrack.c:16143
 #, c-format
 msgid "rendered %d frames to new clip.\n"
 msgstr "vloženo %d snímků do nového klipu.\n"
 
-#: src/multitrack.c:16025
+#: src/multitrack.c:16230
 msgid "Cleaning up..."
 msgstr "Probíhá úklid..."
 
-#: src/multitrack.c:16712
+#: src/multitrack.c:17003
 msgid "_Pause"
 msgstr "_Pozastavit"
 
-#: src/multitrack.c:16713
+#: src/multitrack.c:17004
 msgid "Pause (p)"
 msgstr "Pozastavit (p)"
 
-#: src/multitrack.c:16856
+#: src/multitrack.c:17151
 msgid "Press 'm' during playback"
 msgstr ""
 
-#: src/multitrack.c:16857
+#: src/multitrack.c:17152
 msgid "to make a mark on the timeline"
 msgstr ""
 
-#: src/multitrack.c:17154
+#: src/multitrack.c:17498
 #, c-format
 msgid ""
 "Inserted audio %.4f to %.4f from clip %s into backing audio from time %.4f "
@@ -9861,20 +9867,20 @@
 msgstr ""
 "Vložený zvuk %.4f do %.4f z klipu %s do zvuku v pozadí od %.4f do %.4f\n"
 
-#: src/multitrack.c:17414
+#: src/multitrack.c:17759
 #, c-format
 msgid ""
 "Inserted frames %d to %d from clip %s into track %s from time %.4f to %.4f\n"
 msgstr "Vložené snímky %d do %d z klipu %s do stopy %s od %.4f do %.4f\n"
 
-#: src/multitrack.c:17998
+#: src/multitrack.c:18332
 #, c-format
 msgid ""
 "Time region %.3f to %.3f\n"
 "selected.\n"
 msgstr ""
 
-#: src/multitrack.c:18002
+#: src/multitrack.c:18336
 msgid ""
 "select one or more tracks\n"
 "to create a region.\n"
@@ -9882,106 +9888,106 @@
 "vyberte jendu nebo více stop\n"
 "pro vytvoření pásma.\n"
 
-#: src/multitrack.c:18004
+#: src/multitrack.c:18337
 #, c-format
 msgid "%d video tracks selected.\n"
 msgstr "%d video soubory vybrány.\n"
 
-#: src/multitrack.c:18006
+#: src/multitrack.c:18339
 msgid ""
 "Double click on timeline\n"
 "to deselect time region."
 msgstr ""
 
-#: src/multitrack.c:18013
+#: src/multitrack.c:18346
 msgid ""
 "Single click on an effect\n"
 "to select it."
 msgstr ""
 
-#: src/multitrack.c:18014
+#: src/multitrack.c:18347
 msgid ""
 "Double click on an effect\n"
 "to edit it."
 msgstr ""
 
-#: src/multitrack.c:18015
+#: src/multitrack.c:18348
 msgid ""
 "Right click on an effect\n"
 "for context menu.\n"
 msgstr ""
 
-#: src/multitrack.c:18017
+#: src/multitrack.c:18350
 msgid ""
 "Effect order can be changed at\n"
 "FILTER MAPS"
 msgstr ""
 
-#: src/multitrack.c:18024
+#: src/multitrack.c:18357
 msgid ""
 "You can select an effect,\n"
 "then use the INSERT BEFORE"
 msgstr ""
 
-#: src/multitrack.c:18025
+#: src/multitrack.c:18358
 msgid "or INSERT AFTER buttons to move it."
 msgstr "nebo pro posun VLOŽIT PO."
 
-#: src/multitrack.c:18307 src/multitrack.c:18320
+#: src/multitrack.c:18639 src/multitrack.c:18652
 msgid "Click on another effect,"
 msgstr ""
 
-#: src/multitrack.c:18308 src/multitrack.c:18321
+#: src/multitrack.c:18640 src/multitrack.c:18653
 msgid ""
 "and the selected one\n"
 "will be inserted"
 msgstr ""
 
-#: src/multitrack.c:18309
+#: src/multitrack.c:18641
 msgid "after it.\n"
 msgstr "po.\n"
 
-#: src/multitrack.c:18322
+#: src/multitrack.c:18654
 msgid "before it.\n"
 msgstr "před tím.\n"
 
-#: src/multitrack.c:18551
+#: src/multitrack.c:18889
 #, c-format
 msgid "Removed parameter values for effect %s at time %.4f\n"
 msgstr "Odstraněné hodnoty pro efekt %s v čase %.4f\n"
 
-#: src/multitrack.c:18759
+#: src/multitrack.c:19100
 #, c-format
 msgid "Set parameter values for %s %s on %s at time %.4f\n"
 msgstr "Nastavit hodnoty pro %s %s na %s v čase %.4f\n"
 
-#: src/multitrack.c:19251 src/multitrack.c:20873
+#: src/multitrack.c:19630 src/multitrack.c:21195
 msgid "_Autoreload each time"
 msgstr "_Automatické otevření (pokaždé)"
 
-#: src/multitrack.c:19323
+#: src/multitrack.c:19702
 #, fuzzy
 msgid "Saving layout"
 msgstr "_Uložit rozložení"
 
-#: src/multitrack.c:19345
+#: src/multitrack.c:19725
 #, c-format
 msgid "Saved layout to %s\n"
 msgstr "Rozvržení uloženo do %s\n"
 
-#: src/multitrack.c:20783
+#: src/multitrack.c:21125
 msgid "clips and frames"
 msgstr "klipy a snímky"
 
-#: src/multitrack.c:20787
+#: src/multitrack.c:21128
 msgid "clips"
 msgstr "clipy"
 
-#: src/multitrack.c:20790
+#: src/multitrack.c:21130
 msgid "frames"
 msgstr "snímky"
 
-#: src/multitrack.c:20800
+#: src/multitrack.c:21140
 msgid ""
 "\n"
 "Auto reload layout.\n"
@@ -9989,7 +9995,7 @@
 "\n"
 "Autozavedení rozvržení.\n"
 
-#: src/multitrack.c:20803
+#: src/multitrack.c:21143
 #, c-format
 msgid ""
 "%s\n"
@@ -10000,11 +10006,11 @@
 "Některé %s scházejí v rozložení%s\n"
 "Z toho důvodu nemohly být otevřeny správně.\n"
 
-#: src/multitrack.c:20920
+#: src/multitrack.c:21284
 msgid "auto backup"
 msgstr ""
 
-#: src/multitrack.c:20923
+#: src/multitrack.c:21287
 #, c-format
 msgid ""
 "\n"
@@ -10013,31 +10019,31 @@
 "\n"
 "Nelze zavést soubor s rozvržením %s\n"
 
-#: src/multitrack.c:20944
+#: src/multitrack.c:21308
 #, c-format
 msgid "Loading layout from %s..."
 msgstr "Zavádím rozvržení z %s..."
 
-#: src/multitrack.c:20978
+#: src/multitrack.c:21338
 #, c-format
 msgid "Got %d events...processing..."
 msgstr "%d událostí...zpracovávám..."
 
-#: src/multitrack.c:20991
+#: src/multitrack.c:21349
 msgid "Checking and rebuilding event list"
 msgstr "Kontroluji a znovu vytvářím seznam události"
 
-#: src/multitrack.c:21017
+#: src/multitrack.c:21374
 #, c-format
 msgid "%d errors detected.\n"
 msgstr "%d chyb nalezeno.\n"
 
-#: src/multitrack.c:21068
+#: src/multitrack.c:21422
 #, c-format
 msgid "Multitrack fps set to %.3f\n"
 msgstr "Multitrack fps nastaven na %.3f\n"
 
-#: src/multitrack.c:21225
+#: src/multitrack.c:21576
 #, fuzzy
 msgid ""
 "The current layout has changes which have not been saved.\n"
@@ -10046,59 +10052,59 @@
 "Současné rozložení nebylo uloženo.\n"
 "Co chcete učinit?\n"
 
-#: src/multitrack.c:22047
+#: src/multitrack.c:22385
 msgid "LiVES: Multitrack audio mixer"
 msgstr ""
 
-#: src/multitrack.c:22077
+#: src/multitrack.c:22414
 msgid "_Reset values"
 msgstr "_Obnovit hodnoty"
 
-#: src/multitrack.c:22081
+#: src/multitrack.c:22418
 msgid "_Close mixer"
 msgstr ""
 
-#: src/multitrack.c:22130
+#: src/multitrack.c:22466
 msgid ""
 "_Invert backing audio\n"
 "and layer volumes"
 msgstr ""
 
-#: src/multitrack.c:22132
+#: src/multitrack.c:22468
 msgid "Adjust backing and layer audio values so that they sum to 1.0"
 msgstr ""
 
-#: src/multitrack.c:22175
+#: src/multitrack.c:22510
 msgid "_Gang layer audio"
 msgstr ""
 
-#: src/multitrack.c:22177
+#: src/multitrack.c:22512
 msgid "Adjust all layer audio values to the same value"
 msgstr ""
 
-#: src/jack.c:104
+#: src/jack.c:102
 msgid "JACK server started\n"
 msgstr "JACK server spuštěn\n"
 
-#: src/jack.c:1284 src/jack.c:1353
+#: src/jack.c:1265 src/jack.c:1334
 msgid "Unable to connect to JACK server\n"
 msgstr "Nelze se připojit k JACK serveru\n"
 
-#: src/jack.c:1512
+#: src/jack.c:1491
 msgid "Started jack audio subsystem.\n"
 msgstr "Spuštěn podsystém jack audio.\n"
 
-#: src/jack.c:1623
+#: src/jack.c:1600
 msgid "Started jack audio reader.\n"
 msgstr "Spuštěna čtečka audio jacku .\n"
 
-#: src/jack.c:1838
+#: src/jack.c:1815
 msgid ""
 "\n"
 "Connection to jack audio was reset.\n"
 msgstr ""
 
-#: src/pulse.c:87
+#: src/pulse.c:88
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -10106,7 +10112,7 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:92
+#: src/pulse.c:94
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -10114,7 +10120,7 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:96
+#: src/pulse.c:99
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -10122,335 +10128,335 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:101
+#: src/pulse.c:104
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
 msgstr ""
 
-#: src/pulse.c:107
+#: src/pulse.c:109
 msgid "LiVES will exit and you can choose another audio player.\n"
 msgstr ""
 
-#: src/pulse.c:1352
+#: src/pulse.c:1335
 msgid ""
 "\n"
 "Connection to pulse audio was reset.\n"
 msgstr ""
 
-#: src/colourspace.c:1100
+#: src/colourspace.c:1092
 msgid "unclamped"
 msgstr ""
 
-#: src/colourspace.c:1101
+#: src/colourspace.c:1093
 msgid "clamped"
 msgstr ""
 
-#: src/omc-learn.c:195
+#: src/omc-learn.c:191
 #, c-format
 msgid "Responding to joystick events from %s\n"
 msgstr ""
 
-#: src/omc-learn.c:289
+#: src/omc-learn.c:279
 msgid "Creating ALSA seq port..."
 msgstr ""
 
-#: src/omc-learn.c:325
+#: src/omc-learn.c:313
 #, c-format
 msgid "Responding to MIDI events from %s\n"
 msgstr ""
 
-#: src/omc-learn.c:568
+#: src/omc-learn.c:554
 msgid "data"
 msgstr "data"
 
-#: src/omc-learn.c:571
+#: src/omc-learn.c:557
 msgid "velocity"
 msgstr "rychlost"
 
-#: src/omc-learn.c:572
+#: src/omc-learn.c:558
 msgid "note"
 msgstr "poznámka"
 
-#: src/omc-learn.c:574 src/omc-learn.c:736 src/omc-learn.c:1105
-#: src/omc-learn.c:1591 src/omc-learn.c:1640
+#: src/omc-learn.c:560 src/omc-learn.c:724 src/omc-learn.c:1092
+#: src/omc-learn.c:1581 src/omc-learn.c:1630
 msgid "value"
 msgstr "hodnota"
 
-#: src/omc-learn.c:576
+#: src/omc-learn.c:562
 msgid "state"
 msgstr "stav"
 
-#: src/omc-learn.c:688
+#: src/omc-learn.c:674
 msgid "variable"
 msgstr "proměnná"
 
-#: src/omc-learn.c:1001
+#: src/omc-learn.c:989
 msgid "Vars."
 msgstr ""
 
-#: src/omc-learn.c:1054
+#: src/omc-learn.c:1041
 #, c-format
 msgid "MIDI ch %d note on"
 msgstr ""
 
-#: src/omc-learn.c:1058
+#: src/omc-learn.c:1045
 #, c-format
 msgid "MIDI ch %d note off"
 msgstr ""
 
-#: src/omc-learn.c:1062
+#: src/omc-learn.c:1049
 #, c-format
 msgid "MIDI ch %d controller %d"
 msgstr ""
 
-#: src/omc-learn.c:1066
+#: src/omc-learn.c:1053
 #, c-format
 msgid "MIDI ch %d pitch bend"
 msgstr ""
 
-#: src/omc-learn.c:1070
+#: src/omc-learn.c:1057
 #, c-format
 msgid "MIDI ch %d pgm change"
 msgstr ""
 
-#: src/omc-learn.c:1073
+#: src/omc-learn.c:1060
 #, c-format
 msgid "Joystick button %d"
 msgstr ""
 
-#: src/omc-learn.c:1076
+#: src/omc-learn.c:1063
 #, c-format
 msgid "Joystick axis %d"
 msgstr ""
 
-#: src/omc-learn.c:1113
+#: src/omc-learn.c:1100
 msgid "x"
 msgstr "x"
 
-#: src/omc-learn.c:1122
+#: src/omc-learn.c:1109
 msgid "range"
 msgstr "oblast"
 
-#: src/omc-learn.c:1143
+#: src/omc-learn.c:1130
 msgid "+ offset1"
 msgstr ""
 
-#: src/omc-learn.c:1161
+#: src/omc-learn.c:1150
 msgid "* scale"
 msgstr ""
 
-#: src/omc-learn.c:1179
+#: src/omc-learn.c:1170
 msgid "+ offset2"
 msgstr ""
 
-#: src/omc-learn.c:1280
+#: src/omc-learn.c:1270
 msgid ""
 "\n"
 "Click OK to delete all entries\n"
 msgstr ""
 
-#: src/omc-learn.c:1318
+#: src/omc-learn.c:1308
 msgid "LiVES: OMC learner"
 msgstr ""
 
-#: src/omc-learn.c:1334
+#: src/omc-learn.c:1324
 msgid "Clear _unmatched"
 msgstr ""
 
-#: src/omc-learn.c:1345
+#: src/omc-learn.c:1335
 msgid "_Delete all"
 msgstr "_Odstranit vše"
 
-#: src/omc-learn.c:1411
+#: src/omc-learn.c:1401
 msgid "Start video playback"
 msgstr ""
 
-#: src/omc-learn.c:1414
+#: src/omc-learn.c:1404
 msgid "Stop video playback"
 msgstr ""
 
-#: src/omc-learn.c:1418
+#: src/omc-learn.c:1408
 msgid "Clip select <clipnum>"
 msgstr ""
 
-#: src/omc-learn.c:1419
+#: src/omc-learn.c:1409
 msgid "Switch foreground clip to the nth valid clip"
 msgstr ""
 
-#: src/omc-learn.c:1423
+#: src/omc-learn.c:1413
 msgid "Play forwards"
 msgstr ""
 
-#: src/omc-learn.c:1424
+#: src/omc-learn.c:1414
 msgid "Play video in a forwards direction"
 msgstr ""
 
-#: src/omc-learn.c:1427
+#: src/omc-learn.c:1417
 msgid "Play backwards"
 msgstr ""
 
-#: src/omc-learn.c:1428
+#: src/omc-learn.c:1418
 msgid "Play video in a backwards direction"
 msgstr ""
 
-#: src/omc-learn.c:1431
+#: src/omc-learn.c:1421
 msgid "Reverse playback direction"
 msgstr ""
 
-#: src/omc-learn.c:1432
+#: src/omc-learn.c:1422
 msgid "Reverse direction of video playback"
 msgstr ""
 
-#: src/omc-learn.c:1435
+#: src/omc-learn.c:1425
 msgid "Play video faster"
 msgstr ""
 
-#: src/omc-learn.c:1436
+#: src/omc-learn.c:1426
 msgid "Play video at a slightly faster rate"
 msgstr ""
 
-#: src/omc-learn.c:1439
+#: src/omc-learn.c:1429
 msgid "Play video slower"
 msgstr ""
 
-#: src/omc-learn.c:1440
+#: src/omc-learn.c:1430
 msgid "Play video at a slightly slower rate"
 msgstr ""
 
-#: src/omc-learn.c:1443
+#: src/omc-learn.c:1433
 msgid "Toggle video freeze"
 msgstr ""
 
-#: src/omc-learn.c:1444
+#: src/omc-learn.c:1434
 msgid "Freeze video, or if already frozen, unfreeze it"
 msgstr ""
 
-#: src/omc-learn.c:1447
+#: src/omc-learn.c:1437
 msgid "Set video framerate to <fps>"
 msgstr ""
 
-#: src/omc-learn.c:1448
+#: src/omc-learn.c:1438
 msgid "Set framerate of foreground clip to <float fps>"
 msgstr ""
 
-#: src/omc-learn.c:1452
+#: src/omc-learn.c:1442
 msgid "Start recording"
 msgstr ""
 
-#: src/omc-learn.c:1455
+#: src/omc-learn.c:1445
 msgid "Stop recording"
 msgstr "Zastavit nahrávání"
 
-#: src/omc-learn.c:1458
+#: src/omc-learn.c:1448
 msgid "Toggle recording state"
 msgstr ""
 
-#: src/omc-learn.c:1461
+#: src/omc-learn.c:1451
 msgid "Swap foreground and background clips"
 msgstr ""
 
-#: src/omc-learn.c:1463
+#: src/omc-learn.c:1453
 msgid "Reset effect keys"
 msgstr ""
 
-#: src/omc-learn.c:1464
+#: src/omc-learn.c:1454
 msgid "Switch all effects off."
 msgstr ""
 
-#: src/omc-learn.c:1467
+#: src/omc-learn.c:1457
 msgid "Enable effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1471
+#: src/omc-learn.c:1461
 msgid "Disable effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1475
+#: src/omc-learn.c:1465
 msgid "Toggle effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1479
+#: src/omc-learn.c:1469
 msgid "Set parameter value <key> <pnum> = <value>"
 msgstr ""
 
-#: src/omc-learn.c:1480
+#: src/omc-learn.c:1470
 msgid "Set <value> of pth (numerical) parameter for effect key <key>."
 msgstr ""
 
-#: src/omc-learn.c:1484
+#: src/omc-learn.c:1474
 msgid "Switch foreground to next clip"
 msgstr ""
 
-#: src/omc-learn.c:1487
+#: src/omc-learn.c:1477
 msgid "Switch foreground to previous clip"
 msgstr ""
 
-#: src/omc-learn.c:1490
+#: src/omc-learn.c:1480
 msgid "Set video framerate to ratio <fps_ratio>"
 msgstr ""
 
-#: src/omc-learn.c:1491
+#: src/omc-learn.c:1481
 msgid "Set framerate ratio of foreground clip to <float fps_ratio>"
 msgstr ""
 
-#: src/omc-learn.c:1495
+#: src/omc-learn.c:1485
 msgid "Retrigger clip <clipnum>"
 msgstr ""
 
-#: src/omc-learn.c:1496
+#: src/omc-learn.c:1486
 msgid ""
 "Switch foreground clip to the nth valid clip, and reset the frame number"
 msgstr ""
 
-#: src/omc-learn.c:1500
+#: src/omc-learn.c:1490
 msgid "Cycle to next mode for effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1504
+#: src/omc-learn.c:1494
 msgid "Cycle to previous mode for effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1508
+#: src/omc-learn.c:1498
 msgid "Set playback plugin parameter value <pnum> = <value>"
 msgstr ""
 
-#: src/omc-learn.c:1509
+#: src/omc-learn.c:1499
 msgid "Set <value> of pth parameter for the playback plugin."
 msgstr ""
 
 #. TRANSLATORS: short form of "clip number"
-#: src/omc-learn.c:1536 src/omc-learn.c:1607
+#: src/omc-learn.c:1526 src/omc-learn.c:1597
 msgid "clipnum"
 msgstr ""
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1545
+#: src/omc-learn.c:1535
 msgid "fps"
 msgstr "fps"
 
 #. TRANSLATORS: as in keyboard key
-#: src/omc-learn.c:1553 src/omc-learn.c:1560 src/omc-learn.c:1567
-#: src/omc-learn.c:1575 src/omc-learn.c:1615 src/omc-learn.c:1623
+#: src/omc-learn.c:1543 src/omc-learn.c:1550 src/omc-learn.c:1557
+#: src/omc-learn.c:1565 src/omc-learn.c:1605 src/omc-learn.c:1613
 msgid "key"
 msgstr "klíč"
 
 #. TRANSLATORS: short form of "parameter number"
-#: src/omc-learn.c:1583 src/omc-learn.c:1632
+#: src/omc-learn.c:1573 src/omc-learn.c:1622
 msgid "pnum"
 msgstr "pnum"
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1599
+#: src/omc-learn.c:1589
 msgid "fps_ratio"
 msgstr ""
 
-#: src/omc-learn.c:2443
+#: src/omc-learn.c:2417
 #, c-format
 msgid "Saving device mapping to file %s..."
 msgstr ""
 
-#: src/omc-learn.c:2527
+#: src/omc-learn.c:2498
 #, c-format
 msgid ""
 "\n"
@@ -10459,7 +10465,7 @@
 "%s\n"
 msgstr ""
 
-#: src/omc-learn.c:2534
+#: src/omc-learn.c:2505
 #, c-format
 msgid ""
 "\n"
@@ -10468,12 +10474,12 @@
 "%s\n"
 msgstr ""
 
-#: src/omc-learn.c:2571
+#: src/omc-learn.c:2541
 #, c-format
 msgid "Loading device mapping from file %s..."
 msgstr ""
 
-#: src/omc-learn.c:2576
+#: src/omc-learn.c:2544
 #, c-format
 msgid ""
 "\n"
@@ -10483,12 +10489,12 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/videodev.c:547
+#: src/videodev.c:539
 #, c-format
 msgid "Unable to open device %s\n"
 msgstr ""
 
-#: src/videodev.c:564
+#: src/videodev.c:554
 #, c-format
 msgid "Opened device %s\n"
 msgstr ""
@@ -11445,6 +11451,15 @@
 #~ msgid "$error"
 #~ msgstr "$error"
 
+#~ msgid "Pause"
+#~ msgstr "Pauza"
+
+#~ msgid "Start frame"
+#~ msgstr "První snímek"
+
+#~ msgid "End frame"
+#~ msgstr "Poslední snímek"
+
 #~ msgid "                                                            "
 #~ msgstr "                                                            "

LiVES-2.2.8.tar.bz2/po/da.po -> LiVES-2.4.1.tar.bz2/po/da.po Changed

@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n"
-"POT-Creation-Date: 2015-02-08 17:18-0300\n"
+"POT-Creation-Date: 2015-08-09 14:52-0300\n"
 "PO-Revision-Date: 2013-03-14 12:31+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Danish <da@li.org>\n"
@@ -18,8 +18,7 @@
 "X-Launchpad-Export-Date: 2013-03-28 10:41+0000\n"
 "X-Generator: Launchpad (build 16546)\n"
 
-#. TRANSLATORS: do not translate this message
-#: src/main.c:118
+#: src/main.c:128
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -28,22 +27,22 @@
 "http://lives.sourceforge.net/TRANS-README.txt"
 msgstr ""
 
-#: src/main.c:134
+#: src/main.c:153
 #, c-format
 msgid "%s Warning: %s\n"
 msgstr ""
 
-#: src/main.c:138
+#: src/main.c:157
 #, c-format
 msgid "%s Critical error: %s\n"
 msgstr ""
 
-#: src/main.c:139
+#: src/main.c:158
 #, c-format
 msgid "%s Fatal error: %s\n"
 msgstr ""
 
-#: src/main.c:176
+#: src/main.c:198
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -52,7 +51,7 @@
 "Thanks. Recovery should be possible if you restart LiVES.\n"
 msgstr ""
 
-#: src/main.c:177
+#: src/main.c:199
 msgid ""
 "\n"
 "\n"
@@ -60,97 +59,97 @@
 "distribution, and the LiVES version ("
 msgstr ""
 
-#: src/main.c:180
+#: src/main.c:203
 msgid ""
 "and any information shown below:\n"
 "\n"
 msgstr ""
 
-#: src/main.c:184
+#: src/main.c:206
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
 "\n"
 msgstr ""
 
-#: src/main.c:192
+#: src/main.c:216
 msgid "Preserving set.\n"
 msgstr ""
 
-#: src/main.c:636
+#: src/main.c:691
 msgid "Resizing"
 msgstr "Ændrer størrelse"
 
-#: src/main.c:643
+#: src/main.c:698
 msgid "_Resize All Frames"
 msgstr ""
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:895
+#: src/main.c:948
 msgid "Any"
 msgstr "Enhver"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:897
+#: src/main.c:950
 msgid "None"
 msgstr "Ingen"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:899
+#: src/main.c:952
 msgid "recommended"
 msgstr "anbefalet"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:901
+#: src/main.c:954
 msgid "disabled !"
 msgstr ""
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:903
+#: src/main.c:956
 msgid "**The current layout**"
 msgstr ""
 
 #. TRANSLATORS: adjective for "Built in" type effects
-#: src/main.c:905
+#: src/main.c:958
 msgid "Builtin"
 msgstr "Indbygget"
 
 #. TRANSLATORS: adjective for "Custom" type effects
-#: src/main.c:907
+#: src/main.c:960
 msgid "Custom"
 msgstr "Brugerdefineret"
 
 #. TRANSLATORS: adjective for "Test" type effects
-#: src/main.c:909
+#: src/main.c:962
 msgid "Test"
 msgstr "Test"
 
-#: src/main.c:1054
+#: src/main.c:1107
 msgid "Foreground"
 msgstr ""
 
-#: src/main.c:1055
+#: src/main.c:1108
 #, fuzzy
 msgid "Background"
 msgstr "_Start farve"
 
-#: src/main.c:1566
+#: src/main.c:1624
 msgid "Loading realtime effect plugins..."
 msgstr ""
 
-#: src/main.c:1631
+#: src/main.c:1690
 msgid "Starting jack audio server..."
 msgstr ""
 
-#: src/main.c:1633
+#: src/main.c:1692
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1634
+#: src/main.c:1693
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1663
+#: src/main.c:1723
 #, c-format
 msgid ""
 "\n"
@@ -162,112 +161,112 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1697
+#: src/main.c:1758
 msgid "Starting pulse audio server..."
 msgstr ""
 
-#: src/main.c:1765
+#: src/main.c:1825
 msgid "Checking optional dependencies:"
 msgstr ""
 
-#: src/main.c:1766
+#: src/main.c:1826
 msgid "mplayer...detected..."
 msgstr ""
 
-#: src/main.c:1767
+#: src/main.c:1827
 msgid "mplayer...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1768
+#: src/main.c:1828
 msgid "mplayer2...detected..."
 msgstr ""
 
-#: src/main.c:1769
+#: src/main.c:1829
 msgid "mplayer2...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1770
+#: src/main.c:1830
 msgid "convert...detected..."
 msgstr ""
 
-#: src/main.c:1771
+#: src/main.c:1831
 msgid "convert...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1772
+#: src/main.c:1832
 msgid "composite...detected..."
 msgstr ""
 
-#: src/main.c:1773
+#: src/main.c:1833
 msgid "composite...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1774
+#: src/main.c:1834
 msgid "sox...detected\n"
 msgstr ""
 
-#: src/main.c:1775
+#: src/main.c:1835
 msgid "sox...NOT DETECTED\n"
 msgstr ""
 
-#: src/main.c:1776
+#: src/main.c:1836
 msgid "cdda2wav...detected..."
 msgstr ""
 
-#: src/main.c:1777
+#: src/main.c:1837
 msgid "cdda2wav...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1778
+#: src/main.c:1838
 msgid "jackd...detected..."
 msgstr ""
 
-#: src/main.c:1779
+#: src/main.c:1839
 msgid "jackd...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1780
+#: src/main.c:1840
 msgid "pulse audio...detected..."
 msgstr ""
 
-#: src/main.c:1781
+#: src/main.c:1841
 msgid "pulse audio...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1782
+#: src/main.c:1842
 msgid "python...detected..."
 msgstr ""
 
-#: src/main.c:1783
+#: src/main.c:1843
 msgid "python...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1784
+#: src/main.c:1844
 msgid "dvgrab...detected..."
 msgstr ""
 
-#: src/main.c:1785
+#: src/main.c:1845
 msgid "dvgrab...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1786
+#: src/main.c:1846
 msgid "xwininfo...detected..."
 msgstr ""
 
-#: src/main.c:1787
+#: src/main.c:1847
 msgid "xwininfo...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1793
+#: src/main.c:1853
 #, c-format
 msgid "Windows version %04X"
 msgstr ""
 
-#: src/main.c:1795
+#: src/main.c:1855
 msgid "UNKNOWN - please patch me !"
 msgstr ""
 
-#: src/main.c:1799
+#: src/main.c:1859
 #, c-format
 msgid ""
 "\n"
@@ -275,199 +274,204 @@
 "Window manager reports as \"%s\"; "
 msgstr ""
 
-#: src/main.c:1802
+#: src/main.c:1862
 #, c-format
 msgid "number of monitors detected: %d\n"
 msgstr ""
 
-#: src/main.c:1805
+#: src/main.c:1865
 #, c-format
 msgid "Number of CPUs detected: %d "
 msgstr ""
 
-#: src/main.c:1808 src/multitrack.c:4902
+#: src/main.c:1868 src/multitrack.c:5068
 msgid "little endian"
 msgstr ""
 
-#: src/main.c:1809 src/multitrack.c:4901
+#: src/main.c:1869 src/multitrack.c:5067
 msgid "big endian"
 msgstr ""
 
-#: src/main.c:1810
+#: src/main.c:1870
 #, c-format
 msgid "(%d bits, %s)\n"
 msgstr ""
 
-#: src/main.c:1814
+#: src/main.c:1874
 msgid "GUI type is: "
 msgstr ""
 
-#: src/main.c:1818
+#: src/main.c:1878
 #, c-format
 msgid "GTK+ version %d.%d.%d (compiled with %d.%d.%d)"
 msgstr ""
 
-#: src/main.c:1840
+#: src/main.c:1900
 msgid ", with cairo support"
 msgstr ""
 
-#: src/main.c:1847
+#: src/main.c:1907
 #, c-format
 msgid "Temp directory is %s\n"
 msgstr ""
 
-#: src/main.c:1851
+#: src/main.c:1911
 msgid ""
 "WARNING - this version of LiVES was compiled without either\n"
 "jack or pulse audio support.\n"
 "Many audio features will be unavailable.\n"
 msgstr ""
 
-#: src/main.c:1854
+#: src/main.c:1914
 msgid "Compiled with jack support, good !\n"
 msgstr ""
 
-#: src/main.c:1857
+#: src/main.c:1917
 msgid "Compiled with pulse audio support, wonderful !\n"
 msgstr ""
 
-#: src/main.c:1861
+#: src/main.c:1921
 #, c-format
 msgid ""
 "Welcome to LiVES version %s.\n"
 "\n"
 msgstr ""
 
-#: src/main.c:2306
+#: src/main.c:2380
 #, c-format
 msgid ""
 "\n"
 "Startup syntax is: %s [opts] [filename [start_time] [frames]]\n"
 msgstr ""
 
-#: src/main.c:2307
+#: src/main.c:2381
 msgid "Where: filename is the name of a media file or backup file.\n"
 msgstr ""
 
-#: src/main.c:2308
+#: src/main.c:2382
 msgid "start_time : filename start time in seconds\n"
 msgstr ""
 
-#: src/main.c:2309
+#: src/main.c:2383
 msgid "frames : maximum number of frames to open\n"
 msgstr ""
 
-#: src/main.c:2311
+#: src/main.c:2385
 msgid "opts can be:\n"
 msgstr ""
 
-#: src/main.c:2312
+#: src/main.c:2386
 msgid "-help            : show this help text and exit\n"
 msgstr ""
 
-#: src/main.c:2313
+#: src/main.c:2387
 msgid "-tmpdir <tempdir>: use alternate working directory (e.g /var/ramdisk)\n"
 msgstr ""
 
-#: src/main.c:2314
+#: src/main.c:2388
 msgid "-set <setname>   : autoload clip set setname\n"
 msgstr ""
 
-#: src/main.c:2315
+#: src/main.c:2389
 msgid "-noset           : do not load any set on startup\n"
 msgstr ""
 
-#: src/main.c:2316
+#: src/main.c:2390
 msgid "-norecover       : force no-loading of crash recovery\n"
 msgstr ""
 
-#: src/main.c:2317
+#: src/main.c:2391
 msgid "-recover         : force loading of crash recovery\n"
 msgstr ""
 
-#: src/main.c:2318
-msgid "-nothreaddialog  : doe nothing - retained for backwards compatibility\n"
+#: src/main.c:2392
+msgid ""
+"-nothreaddialog  : does nothing - retained for backwards compatibility\n"
 msgstr ""
 
-#: src/main.c:2319
+#: src/main.c:2393
 msgid "-nogui           : do not show the gui\n"
 msgstr ""
 
-#: src/main.c:2320
+#: src/main.c:2394
 msgid "-nosplash        : do not show the splash window\n"
 msgstr ""
 
-#: src/main.c:2321
+#: src/main.c:2395
 msgid "-noplaywin       : do not show the play window\n"
 msgstr ""
 
-#: src/main.c:2322
+#: src/main.c:2396
+msgid "-noninteractive  : disable menu interactivity\n"
+msgstr ""
+
+#: src/main.c:2397
 msgid "-startup-ce      : start in clip editor mode\n"
 msgstr ""
 
-#: src/main.c:2323
+#: src/main.c:2398
 msgid "-startup-mt      : start in multitrack mode\n"
 msgstr ""
 
-#: src/main.c:2324
+#: src/main.c:2399
 msgid ""
 "-fxmodesmax <n>  : allow <n> modes per effect key (minimum is 1, default is "
 "8)\n"
 msgstr ""
 
-#: src/main.c:2326
+#: src/main.c:2401
 msgid "-oscstart <port> : start OSC listener on UDP port <port>\n"
 msgstr ""
 
-#: src/main.c:2327
+#: src/main.c:2402
 msgid "-nooscstart      : do not start OSC listener\n"
 msgstr ""
 
-#: src/main.c:2329
+#: src/main.c:2404
 msgid ""
 "-aplayer <ap>    : start with selected audio player. <ap> can be mplayer, "
 "mplayer2"
 msgstr ""
 
 #. TRANSLATORS: pulse (audio)
-#: src/main.c:2332
+#: src/main.c:2407
 msgid ", pulse"
 msgstr ""
 
-#: src/main.c:2335
+#: src/main.c:2410
 msgid ", sox or jack\n"
 msgstr ""
 
-#: src/main.c:2336
+#: src/main.c:2412
 msgid ""
 "-jackopts <opts>    : opts is a bitmap of jack startup options [1 = jack "
 "transport client, 2 = jack transport master, 4 = start jack transport "
 "server, 8 = pause audio when video paused, 16 = start jack audio server] \n"
 msgstr ""
 
-#: src/main.c:2338
+#: src/main.c:2414
 msgid " or sox\n"
 msgstr ""
 
-#: src/main.c:2340
+#: src/main.c:2416
 msgid "-devicemap <mapname>          : autoload devicemap\n"
 msgstr ""
 
-#: src/main.c:2341
+#: src/main.c:2418
 msgid ""
 "-vppdefaults <file>          : load video playback plugin defaults from "
 "<file> (Note: only sets the settings, not the plugin type)\n"
 msgstr ""
 
-#: src/main.c:2342
+#: src/main.c:2419
 msgid "-debug            : try to debug crashes (requires 'gdb' installed)\n"
 msgstr ""
 
-#: src/main.c:2373 src/gui.c:1128
+#: src/main.c:2449 src/gui.c:1127
 msgid "Starting GUI..."
 msgstr ""
 
-#: src/main.c:2396
+#: src/main.c:2475
 #, c-format
 msgid ""
 "\n"
@@ -478,7 +482,7 @@
 "(Maybe you need to change the value of <prefix_dir> in your %s file)\n"
 msgstr ""
 
-#: src/main.c:2410
+#: src/main.c:2492
 #, c-format
 msgid ""
 "\n"
@@ -486,7 +490,7 @@
 "Please make sure you have write access to %s and try again.\n"
 msgstr ""
 
-#: src/main.c:2415
+#: src/main.c:2498
 msgid ""
 "\n"
 "`smogrify` must be in your path, and be executable\n"
@@ -495,7 +499,7 @@
 "before running LiVES.\n"
 msgstr ""
 
-#: src/main.c:2421
+#: src/main.c:2504
 #, c-format
 msgid ""
 "\n"
@@ -505,7 +509,7 @@
 "Please check the file permissions for this file and try again.\n"
 msgstr ""
 
-#: src/main.c:2428
+#: src/main.c:2512
 #, c-format
 msgid ""
 "\n"
@@ -516,7 +520,7 @@
 "and try again.\n"
 msgstr ""
 
-#: src/main.c:2438
+#: src/main.c:2522
 #, c-format
 msgid ""
 "Please check the <tempdir> setting in \n"
@@ -524,7 +528,7 @@
 "and try again.\n"
 msgstr ""
 
-#: src/main.c:2445
+#: src/main.c:2528
 #, c-format
 msgid ""
 "\n"
@@ -534,7 +538,7 @@
 "%s"
 msgstr ""
 
-#: src/main.c:2453
+#: src/main.c:2536
 msgid ""
 "\n"
 "An incorrect version of smogrify was found in your path.\n"
@@ -545,49 +549,49 @@
 "Thankyou.\n"
 msgstr ""
 
-#: src/main.c:2458
+#: src/main.c:2541
 msgid ""
 "\n"
 "LiVES currently requires 'mplayer', 'mplayer2' or 'sox' to function. Please "
 "install one or other of these, and try again.\n"
 msgstr ""
 
-#: src/main.c:2462
+#: src/main.c:2546
 msgid ""
 "\n"
 "LiVES currently requires both 'mplayer' or 'mplayer2' and 'sox' to function. "
 "Please install these, and try again.\n"
 msgstr ""
 
-#: src/main.c:2472
+#: src/main.c:2556
 msgid ""
 "\n"
 "LiVES was unable to locate 'mplayer' or 'mplayer2'. You may wish to install "
 "either one to use LiVES more fully.\n"
 msgstr ""
 
-#: src/main.c:2475
+#: src/main.c:2561
 msgid ""
 "\n"
 "LiVES was unable to locate 'convert'. You should install convert and image-"
 "magick if you want to use rendered effects.\n"
 msgstr ""
 
-#: src/main.c:2478
+#: src/main.c:2566
 msgid ""
 "\n"
 "LiVES was unable to locate 'composite'. You should install composite and "
 "image-magick if you want to use the merge function.\n"
 msgstr ""
 
-#: src/main.c:2481
+#: src/main.c:2570
 msgid ""
 "\n"
 "LiVES was unable to locate 'sox'. Some audio features may not work. You "
 "should install 'sox'.\n"
 msgstr ""
 
-#: src/main.c:2484
+#: src/main.c:2575
 #, c-format
 msgid ""
 "\n"
@@ -598,93 +602,93 @@
 "You may need to change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/main.c:2611
+#: src/main.c:2707
 #, c-format
 msgid "Autoloading set %s..."
 msgstr ""
 
 #. TRANSLATORS: localised name may be used here
-#: src/main.c:2781 src/interface.c:738
+#: src/main.c:2902
 msgid "LiVES"
 msgstr ""
 
-#: src/main.c:2948
+#: src/main.c:3066
 #, c-format
 msgid "Invalid audio player %s\n"
 msgstr ""
 
-#: src/main.c:3077
+#: src/main.c:3214
 #, c-format
 msgid "LiVES-%s: <Untitled%d> %dx%d : %d frames %d bpp %.3f fps"
 msgstr ""
 
-#: src/main.c:3082
+#: src/main.c:3219
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : ??? frames ??? bpp %.3f fps"
 msgstr ""
 
-#: src/main.c:3086
+#: src/main.c:3222
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : %d frames %d bpp %.3f fps"
 msgstr ""
 
-#: src/main.c:3094
+#: src/main.c:3229
 #, c-format
 msgid "LiVES-%s: <No File>"
 msgstr ""
 
 #. TRANSLATORS: rec(ord)
-#: src/main.c:5085
+#: src/main.c:5201
 #, c-format
 msgid "rec %9d/%d"
 msgstr ""
 
 #. TRANSLATORS: out of memory (rec(ord))
-#: src/main.c:5091
+#: src/main.c:5206
 #, c-format
 msgid "!rec %9d/%d"
 msgstr ""
 
-#: src/main.c:5398 src/main.c:5399 src/gui.c:2110 src/gui.c:3220
-#: src/saveplay.c:2336
+#: src/main.c:5500 src/main.c:5501 src/gui.c:2108 src/gui.c:3331
+#: src/saveplay.c:2315
 msgid "Play"
 msgstr "Afspil"
 
-#: src/main.c:6128
+#: src/main.c:6216
 msgid ""
 "LiVES was unable to capture this image\n"
 "\n"
 msgstr ""
 
-#: src/main.c:6250
+#: src/main.c:6345
 #, c-format
 msgid "Closed file %s\n"
 msgstr ""
 
-#: src/main.c:6452 src/gui.c:648 src/utils.c:4312 src/utils.c:4344
-#: src/saveplay.c:3550 src/multitrack.c:4510 src/multitrack.c:6268
+#: src/main.c:6542 src/gui.c:647 src/utils.c:4256 src/utils.c:4286
+#: src/saveplay.c:3500 src/multitrack.c:4678 src/multitrack.c:6447
 msgid "_Undo"
 msgstr "Fortryd"
 
-#: src/main.c:6453 src/gui.c:666 src/utils.c:4313 src/utils.c:4345
-#: src/saveplay.c:3551 src/multitrack.c:4531 src/multitrack.c:6293
+#: src/main.c:6543 src/gui.c:665 src/utils.c:4257 src/utils.c:4287
+#: src/saveplay.c:3501 src/multitrack.c:4698 src/multitrack.c:6472
 msgid "_Redo"
 msgstr ""
 
-#: src/main.c:6493 src/interface.c:470 src/gui.c:2326 src/preferences.c:2357
-#: src/resample.c:1516
+#: src/main.c:6583 src/interface.c:457 src/gui.c:2324 src/preferences.c:2391
+#: src/resample.c:1488
 msgid "Video"
 msgstr "Video"
 
-#: src/main.c:6494 src/interface.c:483 src/gui.c:2351
+#: src/main.c:6584 src/interface.c:470 src/gui.c:2348
 msgid "Left Audio"
 msgstr ""
 
-#: src/main.c:6495 src/gui.c:2375
+#: src/main.c:6585 src/gui.c:2371
 msgid "Right Audio"
 msgstr ""
 
-#: src/main.c:6540
+#: src/main.c:6630
 msgid ""
 "\n"
 "\n"
@@ -693,11 +697,11 @@
 "Please adjust the playback options in Preferences and try again.\n"
 msgstr ""
 
-#: src/main.c:7051 src/plugins.c:1502
+#: src/main.c:7134 src/plugins.c:1468
 msgid "LiVES: - Play Window"
 msgstr ""
 
-#: src/startup.c:25
+#: src/startup.c:24
 #, c-format
 msgid ""
 "A directory named\n"
@@ -707,7 +711,7 @@
 "(Free space = %s)\n"
 msgstr ""
 
-#: src/startup.c:32
+#: src/startup.c:29
 #, c-format
 msgid ""
 "A directory named\n"
@@ -717,7 +721,7 @@
 "Please select another location.\n"
 msgstr ""
 
-#: src/startup.c:49
+#: src/startup.c:46
 #, c-format
 msgid ""
 "\n"
@@ -728,7 +732,7 @@
 "(Free space = %s)"
 msgstr ""
 
-#: src/startup.c:54
+#: src/startup.c:50
 #, c-format
 msgid ""
 "\n"
@@ -737,54 +741,54 @@
 "Please try again and choose a different location.\n"
 msgstr ""
 
-#: src/startup.c:96
+#: src/startup.c:92
 msgid "Directory name is too long !"
 msgstr ""
 
-#: src/startup.c:223
+#: src/startup.c:216
 msgid ""
 "LiVES FAILED TO START YOUR SELECTED AUDIO PLAYER !\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:230
+#: src/startup.c:222
 msgid ""
 "Before starting LiVES, you need to choose an audio player.\n"
 "\n"
 "PULSE AUDIO is recommended for most users"
 msgstr ""
 
-#: src/startup.c:233
+#: src/startup.c:225
 msgid ""
 ", but this version of LiVES was not compiled with pulse audio support.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:236
+#: src/startup.c:229
 msgid ""
 ", but you do not have pulse audio installed on your system.\n"
 " You are advised to install pulse audio first before running LiVES.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:241
+#: src/startup.c:233
 msgid "JACK audio is recommended for pro users"
 msgstr ""
 
-#: src/startup.c:244
+#: src/startup.c:236
 msgid ""
 ", but this version of LiVES was not compiled with jack audio support.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:247
+#: src/startup.c:239
 msgid ""
 ", but you do not have jackd installed. You may wish to install jackd first "
 "before running LiVES.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:250
+#: src/startup.c:242
 msgid ""
 ", but may prevent LiVES from starting on some systems.\n"
 "If LiVES will not start with jack, you can restart and try with another "
@@ -792,159 +796,159 @@
 "\n"
 msgstr ""
 
-#: src/startup.c:254
+#: src/startup.c:246
 msgid "SOX may be used if neither of the preceding players work, "
 msgstr ""
 
-#: src/startup.c:257
+#: src/startup.c:249
 msgid ""
 "but some audio features will be disabled.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:260
+#: src/startup.c:251
 msgid ""
 "but you do not have sox installed.\n"
 "You are advised to install it before running LiVES.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:264
+#: src/startup.c:255
 msgid ""
 "The MPLAYER/MPLAYER2 audio player is only recommended for testing purposes.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:281
+#: src/startup.c:271
 msgid "LiVES: - Choose an audio player"
 msgstr ""
 
-#: src/startup.c:298
+#: src/startup.c:288
 msgid "Use _pulse audio player"
 msgstr ""
 
-#: src/startup.c:320
+#: src/startup.c:310
 msgid "Use _jack audio player"
 msgstr ""
 
-#: src/startup.c:340
+#: src/startup.c:330
 msgid "Use _sox audio player"
 msgstr ""
 
-#: src/startup.c:361
+#: src/startup.c:351
 msgid "Use _mplayer audio player"
 msgstr ""
 
-#: src/startup.c:381
+#: src/startup.c:371
 msgid "Use _mplayer2 audio player"
 msgstr ""
 
-#: src/startup.c:405 src/startup.c:580 src/interface.c:1506
+#: src/startup.c:395 src/startup.c:569 src/interface.c:1398
 msgid "_Next"
 msgstr "_Næste"
 
-#: src/startup.c:445
+#: src/startup.c:435
 msgid "Skipped"
 msgstr ""
 
-#: src/startup.c:460
+#: src/startup.c:450
 msgid "Passed"
 msgstr ""
 
-#: src/startup.c:493
+#: src/startup.c:483
 msgid "Failed"
 msgstr ""
 
-#: src/startup.c:552
+#: src/startup.c:542
 msgid "LiVES: - Testing Configuration"
 msgstr ""
 
-#: src/startup.c:555
+#: src/startup.c:544
 msgid "LiVES: - Troubleshoot"
 msgstr ""
 
-#: src/startup.c:568
+#: src/startup.c:557
 msgid "LiVES will now run some basic configuration tests\n"
 msgstr ""
 
-#: src/startup.c:603
+#: src/startup.c:591
 msgid "Checking for \"sox\" presence"
 msgstr ""
 
-#: src/startup.c:607
+#: src/startup.c:595
 msgid ""
 "You should install sox to be able to use all the audio features in LiVES"
 msgstr ""
 
-#: src/startup.c:615
+#: src/startup.c:602
 msgid "Checking if sox can convert audio"
 msgstr ""
 
-#: src/startup.c:638
+#: src/startup.c:625
 msgid "Unable to allocate 176400 bytes memory."
 msgstr ""
 
-#: src/startup.c:653
+#: src/startup.c:639
 #, c-format
 msgid "Unable to write to: %s"
 msgstr ""
 
-#: src/startup.c:667 src/startup.c:807
+#: src/startup.c:653 src/startup.c:789
 #, c-format
 msgid "Command failed: %s"
 msgstr ""
 
-#: src/startup.c:689
+#: src/startup.c:675
 msgid "You should install sox_fmt_all or similar"
 msgstr ""
 
-#: src/startup.c:717
+#: src/startup.c:703
 msgid "Checking for \"mplayer\" presence"
 msgstr ""
 
-#: src/startup.c:721
+#: src/startup.c:707
 msgid ""
 "You should install mplayer or mplayer2 to be able to use all the decoding "
 "features in LiVES"
 msgstr ""
 
-#: src/startup.c:747
+#: src/startup.c:732
 msgid "Checking if mplayer can convert audio"
 msgstr ""
 
-#: src/startup.c:768
+#: src/startup.c:751
 msgid "You should install mplayer or mplayer2 with pcm/wav support"
 msgstr ""
 
-#: src/startup.c:785
+#: src/startup.c:767
 msgid "Checking if mplayer can decode to png/alpha"
 msgstr ""
 
-#: src/startup.c:828
+#: src/startup.c:810
 msgid "You may wish to upgrade mplayer to a newer version"
 msgstr ""
 
-#: src/startup.c:854
+#: src/startup.c:836
 msgid "Checking if mplayer can decode to jpeg"
 msgstr ""
 
-#: src/startup.c:882
+#: src/startup.c:862
 msgid "You should install mplayer with either png/alpha or jpeg support"
 msgstr ""
 
-#: src/startup.c:883
+#: src/startup.c:863
 msgid "You may wish to add jpeg output support to mplayer"
 msgstr ""
 
-#: src/startup.c:892
+#: src/startup.c:872
 msgid "Checking for \"convert\" presence"
 msgstr ""
 
-#: src/startup.c:896
+#: src/startup.c:876
 msgid "Install imageMagick to be able to use all of the rendered effects"
 msgstr ""
 
-#: src/startup.c:909
+#: src/startup.c:889
 msgid ""
 "\n"
 "\n"
@@ -952,7 +956,7 @@
 "Preferences/Decoding.    \n"
 msgstr ""
 
-#: src/startup.c:915
+#: src/startup.c:894
 msgid ""
 "\n"
 "\n"
@@ -960,49 +964,49 @@
 "continue    \n"
 msgstr ""
 
-#: src/startup.c:949
+#: src/startup.c:928
 msgid ""
 "\n"
 "\n"
 "Finally, you can choose the default startup interface for LiVES.\n"
 msgstr ""
 
-#: src/startup.c:950
+#: src/startup.c:929
 msgid ""
 "\n"
 "\n"
 "LiVES has two main interfaces and you can start up with either of them.\n"
 msgstr ""
 
-#: src/startup.c:951
+#: src/startup.c:930
 msgid ""
 "\n"
 "\n"
 "The default can always be changed later from Preferences.\n"
 msgstr ""
 
-#: src/startup.c:961
+#: src/startup.c:940
 msgid "LiVES: - Choose the startup interface"
 msgstr ""
 
-#: src/startup.c:972
+#: src/startup.c:951
 msgid "Start in _Clip Edit mode"
 msgstr ""
 
-#: src/startup.c:975
+#: src/startup.c:954
 msgid "This is the best choice for simple editing tasks and for VJs\n"
 msgstr ""
 
-#: src/startup.c:981
+#: src/startup.c:960
 msgid "Start in _Multitrack mode"
 msgstr ""
 
-#: src/startup.c:983
+#: src/startup.c:962
 msgid ""
 "This is a better choice for complex editing tasks involving multiple clips.\n"
 msgstr ""
 
-#: src/startup.c:992
+#: src/startup.c:971
 msgid "_Finish"
 msgstr ""
 
@@ -1019,35 +1023,35 @@
 msgid "Apply _Deinterlace"
 msgstr ""
 
-#: src/interface.c:66
+#: src/interface.c:65
 msgid "If this is set, frames will be deinterlaced as they are imported."
 msgstr ""
 
-#: src/interface.c:113 src/callbacks.c:9623 src/callbacks.c:9646
-#: src/callbacks.c:9647 src/gui.c:3223 src/gui.c:3821 src/saveplay.c:2339
-#: src/saveplay.c:3138 src/dialogs.c:1514 src/dialogs.c:1515
-#: src/dialogs.c:1746 src/dialogs.c:1747 src/framedraw.c:238
-#: src/multitrack.c:8031
+#: src/interface.c:106 src/callbacks.c:9542 src/callbacks.c:9564
+#: src/callbacks.c:9565 src/gui.c:3333 src/gui.c:3946 src/saveplay.c:2317
+#: src/saveplay.c:3097 src/dialogs.c:1575 src/dialogs.c:1576
+#: src/dialogs.c:1804 src/dialogs.c:1805 src/framedraw.c:236
+#: src/multitrack.c:8210
 msgid "Preview"
 msgstr "Forhåndsvisning"
 
-#: src/interface.c:132
+#: src/interface.c:125
 msgid "Click here to _Preview any selected video, image or audio file"
 msgstr ""
 
-#: src/interface.c:135
+#: src/interface.c:127
 msgid "Click here to _Preview any selected audio file"
 msgstr ""
 
-#: src/interface.c:138
+#: src/interface.c:129
 msgid "Click here to _Preview the video"
 msgstr ""
 
-#: src/interface.c:181 src/dialogs.c:2542
+#: src/interface.c:169 src/dialogs.c:2621
 msgid "LiVES: - Processing..."
 msgstr ""
 
-#: src/interface.c:217
+#: src/interface.c:205
 msgid ""
 "\n"
 "\n"
@@ -1056,8 +1060,8 @@
 "Remember to switch off effects (ctrl-0) afterwards !"
 msgstr ""
 
-#: src/interface.c:222 src/callbacks.c:9373 src/callbacks.c:9420
-#: src/dialogs.c:2570
+#: src/interface.c:210 src/callbacks.c:9283 src/callbacks.c:9332
+#: src/dialogs.c:2649
 msgid ""
 "\n"
 "Please Wait"
@@ -1065,188 +1069,178 @@
 "\n"
 "Vent venligst"
 
-#: src/interface.c:242
+#: src/interface.c:230
 msgid "Show Details"
 msgstr ""
 
-#: src/interface.c:254 src/dialogs.c:2584
+#: src/interface.c:242 src/dialogs.c:2663
 msgid "_Enough"
 msgstr ""
 
-#: src/interface.c:255 src/framedraw.c:278
+#: src/interface.c:243 src/framedraw.c:276
 msgid "_Preview"
 msgstr ""
 
-#: src/interface.c:257
+#: src/interface.c:245 src/callbacks.c:9282 src/callbacks.c:9330
 msgid "Paus_e"
 msgstr ""
 
-#: src/interface.c:258 src/callbacks.c:9417
+#: src/interface.c:246 src/callbacks.c:9329
 msgid "Pause/_Enough"
 msgstr ""
 
-#: src/interface.c:285
+#: src/interface.c:273
 msgid "_Cancel"
 msgstr "_Annuller"
 
-#: src/interface.c:374
+#: src/interface.c:361
 #, c-format
 msgid "LiVES: - %s"
 msgstr ""
 
-#: src/interface.c:376
+#: src/interface.c:363
 msgid "LiVES: - Multitrack details"
 msgstr ""
 
-#: src/interface.c:407
+#: src/interface.c:394
 msgid "Format"
 msgstr "Format"
 
-#: src/interface.c:412
+#: src/interface.c:399
 msgid "Frame size"
 msgstr ""
 
-#: src/interface.c:417
+#: src/interface.c:404
 msgid "File size"
 msgstr "Filstørrelse"
 
-#: src/interface.c:418
+#: src/interface.c:405
 msgid "Byte size"
 msgstr ""
 
-#: src/interface.c:423 src/interface.c:1891
+#: src/interface.c:410 src/interface.c:1760
 msgid "FPS"
 msgstr "FPS"
 
-#: src/interface.c:428
+#: src/interface.c:415
 msgid "Frames"
 msgstr ""
 
-#: src/interface.c:429
+#: src/interface.c:416
 msgid "Events"
 msgstr "Begivenheder"
 
-#: src/interface.c:434 src/interface.c:500 src/interface.c:542
+#: src/interface.c:421 src/interface.c:486 src/interface.c:528
 msgid "Total time"
 msgstr "Tid i alt"
 
-#: src/interface.c:486 src/resample.c:1488
+#: src/interface.c:472 src/resample.c:1460
 msgid "Audio"
 msgstr "Lyd"
 
-#: src/interface.c:511 src/interface.c:553
+#: src/interface.c:497 src/interface.c:539
 msgid "Rate/size"
 msgstr ""
 
-#: src/interface.c:530
+#: src/interface.c:516
 msgid "Right audio"
 msgstr ""
 
-#: src/interface.c:622
+#: src/interface.c:607
 msgid "LiVES: - Encoding options"
 msgstr ""
 
-#: src/interface.c:636
+#: src/interface.c:621
 msgid "<------------- (Check the box to re_size as suggested)"
 msgstr ""
 
-#: src/interface.c:637
+#: src/interface.c:622
 msgid "<------------- (Check the box to use the _size recommendation)"
 msgstr ""
 
-#: src/interface.c:662
+#: src/interface.c:646
 msgid "Use _letterboxing to maintain aspect ratio (optional)"
 msgstr ""
 
-#: src/interface.c:663
+#: src/interface.c:647
 msgid ""
 "Draw black rectangles either above or to the sides of the image, to prevent "
 "it from stretching."
 msgstr ""
 
-#: src/interface.c:694
+#: src/interface.c:677
 msgid "Keep _my settings"
 msgstr ""
 
-#: src/interface.c:695
+#: src/interface.c:678
 msgid "Use _recommended settings"
 msgstr ""
 
-#: src/interface.c:775 src/dialogs.c:114
-msgid ""
-"Do _not show this warning any more\n"
-"(can be turned back on from Preferences/Warnings)"
-msgstr ""
-
-#: src/interface.c:787
-msgid "Show _Details"
-msgstr "Vis _detaljer"
-
-#: src/interface.c:881
+#: src/interface.c:769
 msgid "_Close Window"
 msgstr "_Luk Vindue"
 
-#: src/interface.c:883
+#: src/interface.c:771
 msgid "_Save to file"
 msgstr ""
 
-#: src/interface.c:928
+#: src/interface.c:816
 msgid "LiVES: - Insert"
 msgstr ""
 
-#: src/interface.c:945
+#: src/interface.c:833
 msgid "_Number of times to insert"
 msgstr ""
 
-#: src/interface.c:954
+#: src/interface.c:842
 msgid "_Insert to fit audio"
 msgstr ""
 
-#: src/interface.c:968
+#: src/interface.c:856
 msgid "Insert _before selection"
 msgstr ""
 
-#: src/interface.c:970
+#: src/interface.c:858
 msgid "Insert clipboard before selected frames"
 msgstr ""
 
-#: src/interface.c:986
+#: src/interface.c:875
 msgid "Insert _after selection"
 msgstr ""
 
-#: src/interface.c:988
+#: src/interface.c:877
 msgid "Insert clipboard after selected frames"
 msgstr ""
 
-#: src/interface.c:999
+#: src/interface.c:888
 msgid "Insert _with sound"
 msgstr ""
 
-#: src/interface.c:1012
+#: src/interface.c:901
 msgid "Insert with_out sound"
 msgstr ""
 
-#: src/interface.c:1093
+#: src/interface.c:985
 msgid "LiVES: - Open Selection"
 msgstr ""
 
-#: src/interface.c:1111
+#: src/interface.c:1004
 msgid "Selection start time (sec)"
 msgstr ""
 
-#: src/interface.c:1117
+#: src/interface.c:1010
 msgid "Number of frames to open"
 msgstr ""
 
-#: src/interface.c:1193
+#: src/interface.c:1088
 msgid "LiVES: - Open Location"
 msgstr ""
 
-#: src/interface.c:1195
+#: src/interface.c:1090
 msgid "LiVES: - Open Youtube Clip"
 msgstr ""
 
-#: src/interface.c:1213
+#: src/interface.c:1109
 msgid ""
 "\n"
 "\n"
@@ -1256,7 +1250,7 @@
 "\n"
 msgstr ""
 
-#: src/interface.c:1216
+#: src/interface.c:1112
 msgid ""
 "\n"
 "\n"
@@ -1265,62 +1259,62 @@
 "\n"
 msgstr ""
 
-#: src/interface.c:1220
+#: src/interface.c:1116
 msgid ""
 "Enter the URL of the clip below.\n"
 "E.g: http://www.youtube.com/watch?v=WCR6f6WzjP8\n"
 "\n"
 msgstr ""
 
-#: src/interface.c:1231
+#: src/interface.c:1127
 msgid "URL : "
 msgstr "URL : "
 
-#: src/interface.c:1231
+#: src/interface.c:1127
 msgid "Youtube URL : "
 msgstr ""
 
-#: src/interface.c:1235
+#: src/interface.c:1131
 msgid "Do not send bandwidth information"
 msgstr ""
 
-#: src/interface.c:1237
+#: src/interface.c:1133
 msgid "Try this setting if you are having problems getting a stream"
 msgstr ""
 
-#: src/interface.c:1258
+#: src/interface.c:1155
 msgid "Download to _Directory : "
 msgstr ""
 
-#: src/interface.c:1276
+#: src/interface.c:1173
 msgid "Download _File Name : "
 msgstr ""
 
-#: src/interface.c:1281
+#: src/interface.c:1178
 msgid ".webm"
 msgstr ""
 
-#: src/interface.c:1359
+#: src/interface.c:1256
 msgid "LiVES: - Rename Clip"
 msgstr ""
 
-#: src/interface.c:1362
-msgid "LiVES: - Enter Set Name"
+#: src/interface.c:1258
+msgid "LiVES: - Enter Set Name to Save as"
 msgstr ""
 
-#: src/interface.c:1365
+#: src/interface.c:1260
 msgid "LiVES: - Enter a Set Name to Reload"
 msgstr ""
 
-#: src/interface.c:1368
+#: src/interface.c:1262
 msgid "LiVES: - Choose a Working Directory"
 msgstr ""
 
-#: src/interface.c:1371
+#: src/interface.c:1264
 msgid "LiVES: - Rename Current Track"
 msgstr ""
 
-#: src/interface.c:1391
+#: src/interface.c:1283
 msgid ""
 "You need to enter a name for the current clip set.\n"
 "This will allow you reload the layout with the same clips later.\n"
@@ -1328,354 +1322,354 @@
 "LiVES will remind you to save the clip set later when you try to exit.\n"
 msgstr ""
 
-#: src/interface.c:1397
+#: src/interface.c:1289
 msgid ""
 "In order to export this project, you must enter a name for this clip set.\n"
 "This will also be used for the project name.\n"
 msgstr ""
 
-#: src/interface.c:1404
+#: src/interface.c:1296
 msgid ""
 "Welcome to LiVES !\n"
 "This startup wizard will guide you through the\n"
 "initial install so that you can get the most from this application.\n"
 msgstr ""
 
-#: src/interface.c:1408
+#: src/interface.c:1300
 msgid ""
 "\n"
 "First of all you need to choose a working directory for LiVES.\n"
 "This should be a directory with plenty of disk space available.\n"
 msgstr ""
 
-#: src/interface.c:1427
+#: src/interface.c:1317
 msgid "New name "
 msgstr "Nyt navn "
 
-#: src/interface.c:1430
+#: src/interface.c:1319
 msgid "Set name "
 msgstr ""
 
-#: src/interface.c:1550
+#: src/interface.c:1435
 msgid "Use def_aults"
 msgstr ""
 
-#: src/interface.c:1553 src/interface.c:1840 src/preferences.c:2515
-#: src/preferences.c:2697
+#: src/interface.c:1437 src/interface.c:1709 src/preferences.c:2550
+#: src/preferences.c:2739
 msgid "_Advanced"
 msgstr "_Avanceret"
 
-#: src/interface.c:1604
+#: src/interface.c:1487
 msgid "LiVES:- Select input device"
 msgstr ""
 
-#: src/interface.c:1622
+#: src/interface.c:1504
 msgid "Select input device:"
 msgstr ""
 
-#: src/interface.c:1686
+#: src/interface.c:1568
 msgid "LiVES:- Load CD Track"
 msgstr ""
 
-#: src/interface.c:1689
+#: src/interface.c:1570
 msgid "LiVES:- Select DVD Title/Chapter"
 msgstr ""
 
-#: src/interface.c:1692
+#: src/interface.c:1572
 msgid "LiVES:- Select VCD Title"
 msgstr ""
 
-#: src/interface.c:1695
+#: src/interface.c:1574
 msgid "LiVES:- Change Maximum Visible Tracks"
 msgstr ""
 
-#: src/interface.c:1698
+#: src/interface.c:1576
 msgid "LiVES:- Device details"
 msgstr ""
 
-#: src/interface.c:1721
+#: src/interface.c:1598
 #, c-format
 msgid "Track to load (from %s)"
 msgstr ""
 
-#: src/interface.c:1724
+#: src/interface.c:1600
 msgid "DVD Title"
 msgstr ""
 
-#: src/interface.c:1727
+#: src/interface.c:1602
 msgid "VCD Title"
 msgstr ""
 
-#: src/interface.c:1730
+#: src/interface.c:1604
 msgid "Maximum number of tracks to display"
 msgstr ""
 
-#: src/interface.c:1733
+#: src/interface.c:1606
 msgid "Device:        /dev/video"
 msgstr ""
 
-#: src/interface.c:1736
+#: src/interface.c:1608
 msgid "Device:        fw:"
 msgstr ""
 
-#: src/interface.c:1771
+#: src/interface.c:1641
 msgid "Chapter  "
 msgstr ""
 
-#: src/interface.c:1776
+#: src/interface.c:1645
 msgid "Channel  "
 msgstr ""
 
-#: src/interface.c:1791
+#: src/interface.c:1660
 msgid "Audio ID  "
 msgstr ""
 
-#: src/interface.c:1857
+#: src/interface.c:1726
 msgid "Input number"
 msgstr ""
 
-#: src/interface.c:1865
+#: src/interface.c:1734
 msgid "Use default width, height and FPS"
 msgstr ""
 
-#: src/interface.c:1879
+#: src/interface.c:1748
 msgid "Width"
 msgstr ""
 
-#: src/interface.c:1885
+#: src/interface.c:1754
 msgid "Height"
 msgstr ""
 
-#: src/interface.c:1899
+#: src/interface.c:1768
 msgid "_Driver"
 msgstr ""
 
-#: src/interface.c:1902
+#: src/interface.c:1771
 msgid "_Output format"
 msgstr ""
 
-#: src/interface.c:1998
+#: src/interface.c:1865
 msgid "LiVES:- Fade Audio In"
 msgstr ""
 
-#: src/interface.c:2001
+#: src/interface.c:1867
 msgid "LiVES:- Fade Audio Out"
 msgstr ""
 
-#: src/interface.c:2017
+#: src/interface.c:1883
 msgid "Fade in over  "
 msgstr ""
 
-#: src/interface.c:2018
+#: src/interface.c:1884
 msgid "first"
 msgstr "først"
 
-#: src/interface.c:2021
+#: src/interface.c:1886
 msgid "Fade out over  "
 msgstr ""
 
-#: src/interface.c:2022
+#: src/interface.c:1887
 msgid "last"
 msgstr "sidste"
 
-#: src/interface.c:2044
+#: src/interface.c:1909
 msgid "seconds."
 msgstr "sekunder."
 
-#: src/interface.c:2052 src/saveplay.c:1507
+#: src/interface.c:1917 src/saveplay.c:1484
 msgid "selection"
 msgstr ""
 
-#: src/interface.c:2092
+#: src/interface.c:1956
 msgid "LiVES: - File Comments (optional)"
 msgstr ""
 
-#: src/interface.c:2107
+#: src/interface.c:1971
 msgid "Title/Name : "
 msgstr ""
 
-#: src/interface.c:2114
+#: src/interface.c:1978
 msgid "Author/Artist : "
 msgstr ""
 
-#: src/interface.c:2121
+#: src/interface.c:1985
 msgid "Comments : "
 msgstr ""
 
-#: src/interface.c:2151
+#: src/interface.c:2015
 msgid "_Options"
 msgstr ""
 
-#: src/interface.c:2158
+#: src/interface.c:2022
 msgid "Save _subtitles to file"
 msgstr ""
 
-#: src/interface.c:2170
+#: src/interface.c:2033
 msgid "Subtitle file"
 msgstr ""
 
-#: src/interface.c:2172
+#: src/interface.c:2035
 msgid "Browse..."
 msgstr ""
 
-#: src/interface.c:2255
+#: src/interface.c:2132
 msgid "LiVES: - choose a device"
 msgstr ""
 
-#: src/interface.c:2259
+#: src/interface.c:2135
 msgid "LiVES: - choose a directory"
 msgstr ""
 
-#: src/interface.c:2262
+#: src/interface.c:2137
 msgid "LiVES: - choose a file"
 msgstr ""
 
-#: src/interface.c:2445
+#: src/interface.c:2381
 msgid "LiVES: - Cancel/Discard/Save"
 msgstr ""
 
-#: src/interface.c:2460
+#: src/interface.c:2397
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has not been saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:2463
+#: src/interface.c:2400
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has been changed since the last save.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:2467
+#: src/interface.c:2404
 msgid ""
 "You are about to exit LiVES.\n"
 "The current clip set can be saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:2468
+#: src/interface.c:2405
 msgid ""
 "The current clip set has not been saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:2472
+#: src/interface.c:2408
 msgid ""
 "The current layout has not been saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:2475
+#: src/interface.c:2410
 msgid ""
 "The current layout has *not* been changed since it was last saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:2480
+#: src/interface.c:2415
 msgid ""
 "The current layout contains generated frames and cannot be retained.\n"
 "You may wish to render it before exiting multitrack mode.\n"
 msgstr ""
 
-#: src/interface.c:2483
+#: src/interface.c:2418
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout contains generated frames and cannot be retained.\n"
 "What do you wish to do ?"
 msgstr ""
 
-#: src/interface.c:2496
+#: src/interface.c:2431
 msgid "Clip set _name"
 msgstr ""
 
-#: src/interface.c:2502
+#: src/interface.c:2437
 msgid "_Auto reload next time"
 msgstr ""
 
-#: src/interface.c:2538 src/interface.c:2547
+#: src/interface.c:2473 src/interface.c:2482
 msgid "_Wipe layout"
 msgstr ""
 
-#: src/interface.c:2539
+#: src/interface.c:2474
 msgid "_Ignore changes"
 msgstr ""
 
-#: src/interface.c:2540
+#: src/interface.c:2475
 msgid "_Delete clip set"
 msgstr ""
 
-#: src/interface.c:2541
+#: src/interface.c:2476
 msgid "_Delete layout"
 msgstr ""
 
-#: src/interface.c:2545
+#: src/interface.c:2480
 msgid "_Save layout"
 msgstr ""
 
-#: src/interface.c:2546
+#: src/interface.c:2481
 msgid "_Save clip set"
 msgstr ""
 
-#: src/interface.c:2565
+#: src/interface.c:2502
 msgid ""
 "\n"
 "LiVES has detected a multitrack layout from a previous session.\n"
 "Would you like to try and recover it ?\n"
 msgstr ""
 
-#: src/interface.c:2589
+#: src/interface.c:2528
 msgid "LiVES: - Disk Recovery Options"
 msgstr ""
 
-#: src/interface.c:2608
+#: src/interface.c:2549
 msgid "Delete _Orphaned Clips"
 msgstr ""
 
-#: src/interface.c:2609
+#: src/interface.c:2550
 msgid "Delete any clips which are not currently loaded or part of a set"
 msgstr ""
 
-#: src/interface.c:2622
+#: src/interface.c:2564
 msgid "Clear _Backup Files from Closed Clips"
 msgstr ""
 
-#: src/interface.c:2633
+#: src/interface.c:2575
 msgid "Remove Sets which have _Layouts but no Clips"
 msgstr ""
 
-#: src/interface.c:2644
+#: src/interface.c:2586
 msgid "_Reset to Defaults"
 msgstr ""
 
-#: src/interface.c:2651
+#: src/interface.c:2593
 msgid "_Accept"
 msgstr ""
 
-#: src/callbacks.c:198
+#: src/callbacks.c:208
 #, c-format
 msgid "Saving as set %s..."
 msgstr ""
 
-#: src/callbacks.c:833
+#: src/callbacks.c:852
 msgid "Please enter the name of the file to save the clip as.\n"
 msgstr ""
 
-#: src/callbacks.c:841
+#: src/callbacks.c:860
 msgid "Please enter a valid URL for the download.\n"
 msgstr ""
 
-#: src/callbacks.c:867
+#: src/callbacks.c:886
 #, c-format
 msgid "Downloading %s to %s..."
 msgstr ""
 
-#: src/callbacks.c:895
+#: src/callbacks.c:912
 msgid "Downloading clip"
 msgstr ""
 
-#: src/callbacks.c:933
+#: src/callbacks.c:950
 msgid ""
 "\n"
 "LiVES was unable to download the clip.\n"
@@ -1683,17 +1677,17 @@
 "the latest youtube-dl installed.\n"
 msgstr ""
 
-#: src/callbacks.c:1114 src/callbacks.c:1149
+#: src/callbacks.c:1131 src/callbacks.c:1166
 msgid "This file"
 msgstr "Denne fil"
 
-#: src/callbacks.c:1115
+#: src/callbacks.c:1132
 msgid ""
 ",\n"
 " - including the current layout - "
 msgstr ""
 
-#: src/callbacks.c:1117
+#: src/callbacks.c:1134
 #, c-format
 msgid ""
 "\n"
@@ -1703,7 +1697,7 @@
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1119
+#: src/callbacks.c:1136
 #, c-format
 msgid ""
 "\n"
@@ -1713,20 +1707,20 @@
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1150
+#: src/callbacks.c:1167
 msgid ""
 "Changes made to this clip have not been saved or backed up.\n"
 "\n"
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1343
+#: src/callbacks.c:1356
 msgid ""
 "\n"
 "Invalid project file.\n"
 msgstr ""
 
-#: src/callbacks.c:1356
+#: src/callbacks.c:1370
 #, c-format
 msgid ""
 "\n"
@@ -1739,33 +1733,33 @@
 "Once you have done this, you will be able to import the new project.\n"
 msgstr ""
 
-#: src/callbacks.c:1366
+#: src/callbacks.c:1381
 #, c-format
 msgid "Importing the project %s as set %s..."
 msgstr ""
 
-#: src/callbacks.c:1386
+#: src/callbacks.c:1399
 msgid "Importing project"
 msgstr ""
 
-#: src/callbacks.c:1472
+#: src/callbacks.c:1481
 #, c-format
 msgid "Exporting project %s..."
 msgstr ""
 
-#: src/callbacks.c:1490
+#: src/callbacks.c:1497
 msgid "Exporting project"
 msgstr ""
 
-#: src/callbacks.c:1506
+#: src/callbacks.c:1513
 msgid "Backup as .lv1 file"
 msgstr ""
 
-#: src/callbacks.c:1522
+#: src/callbacks.c:1529
 msgid "Restore .lv1 file"
 msgstr ""
 
-#: src/callbacks.c:1664
+#: src/callbacks.c:1671
 msgid ""
 "\n"
 "\n"
@@ -1773,72 +1767,77 @@
 "Are you sure ?\n"
 msgstr ""
 
-#: src/callbacks.c:1725
+#: src/callbacks.c:1732
 #, c-format
 msgid "Deleting set %s..."
 msgstr ""
 
-#: src/callbacks.c:1727
+#: src/callbacks.c:1734
 msgid "Deleting set..."
 msgstr ""
 
-#: src/callbacks.c:1731
+#: src/callbacks.c:1738
 msgid "Deleting set"
 msgstr ""
 
-#: src/callbacks.c:1739
+#: src/callbacks.c:1746
 #, c-format
 msgid "Set %s was permanently deleted from the disk.\n"
 msgstr ""
 
-#: src/callbacks.c:1787 src/callbacks.c:11764
+#: src/callbacks.c:1792 src/callbacks.c:11676
 msgid "Insert Silence"
 msgstr ""
 
-#: src/callbacks.c:1840 src/callbacks.c:1923 src/callbacks.c:2086
+#: src/callbacks.c:1844 src/callbacks.c:1927 src/callbacks.c:2089
 msgid "Undoing"
 msgstr ""
 
-#: src/callbacks.c:1936 src/callbacks.c:2147
+#: src/callbacks.c:1940 src/callbacks.c:2150
 msgid "Restoring audio..."
 msgstr ""
 
-#: src/callbacks.c:1952
+#: src/callbacks.c:1956
 msgid "Clearing frame images"
 msgstr ""
 
-#: src/callbacks.c:1985
+#: src/callbacks.c:1988
 msgid "Deleting excess frames"
 msgstr ""
 
-#: src/callbacks.c:2229
+#: src/callbacks.c:2232
 #, c-format
 msgid "Length of video is now %d frames at %.3f frames per second.\n"
 msgstr ""
 
-#: src/callbacks.c:2233 src/resample.c:683 src/resample.c:2166
+#: src/callbacks.c:2235 src/resample.c:678 src/resample.c:2133
 #, c-format
 msgid "Clipboard was resampled to %d frames.\n"
 msgstr ""
 
-#: src/callbacks.c:2394 src/callbacks.c:2423
+#: src/callbacks.c:2396 src/callbacks.c:2425
 msgid "Redoing"
 msgstr ""
 
-#: src/callbacks.c:2462
+#: src/callbacks.c:2472
 #, c-format
-msgid "Copying frames %d to %d%s to the clipboard..."
+msgid "Copying frames %d to %d (with sound) to the clipboard..."
 msgstr ""
 
-#: src/callbacks.c:2525
+#: src/callbacks.c:2474
+#, c-format
+msgid "Copying frames %d to %d to the clipboard..."
+msgstr ""
+
+#: src/callbacks.c:2526
 msgid "Copying to the clipboard"
 msgstr ""
 
-#: src/callbacks.c:2600
+#: src/callbacks.c:2601
 msgid "Cut"
 msgstr "Klip"
 
-#: src/callbacks.c:2641 src/callbacks.c:3068 src/callbacks.c:8026
+#: src/callbacks.c:2641 src/callbacks.c:3063 src/callbacks.c:7631
 msgid "Pulling frames from clipboard"
 msgstr ""
 
@@ -1847,22 +1846,22 @@
 msgid "Pasting %d frames to new clip %s..."
 msgstr ""
 
-#: src/callbacks.c:2678
+#: src/callbacks.c:2676
 msgid "Pasting"
 msgstr "Sæt ind"
 
-#: src/callbacks.c:2694
+#: src/callbacks.c:2692
 msgid "...added audio..."
 msgstr ""
 
-#: src/callbacks.c:2778
+#: src/callbacks.c:2775
 msgid ""
 "This operation requires resizing or converting of frames.\n"
 "Please install 'convert' from the Image-magick package, and then restart "
 "LiVES.\n"
 msgstr ""
 
-#: src/callbacks.c:2795
+#: src/callbacks.c:2793
 msgid ""
 "\n"
 "\n"
@@ -1871,31 +1870,31 @@
 "the 'Trim Audio' function from the Audio menu."
 msgstr ""
 
-#: src/callbacks.c:2819
+#: src/callbacks.c:2817
 msgid ""
 "LiVES cannot insert because the audio rates do not match.\n"
 "Please install 'sox', and try again."
 msgstr ""
 
-#: src/callbacks.c:2838
+#: src/callbacks.c:2835
 msgid ""
 "\n"
 "Insertion will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:2888 src/callbacks.c:11692
+#: src/callbacks.c:2883 src/callbacks.c:11606
 msgid ""
 "\n"
 "Insertion will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:2996 src/callbacks.c:3025
+#: src/callbacks.c:2987 src/callbacks.c:3016
 msgid "Resampling clipboard audio"
 msgstr ""
 
-#: src/callbacks.c:3041
+#: src/callbacks.c:3032
 msgid ""
 "\n"
 "\n"
@@ -1903,7 +1902,7 @@
 "Clipboard audio has been erased.\n"
 msgstr ""
 
-#: src/callbacks.c:3055
+#: src/callbacks.c:3045
 msgid ""
 "\n"
 "\n"
@@ -1912,86 +1911,86 @@
 "using unchanged audio ?\n"
 msgstr ""
 
-#: src/callbacks.c:3137 src/callbacks.c:3311
+#: src/callbacks.c:3132 src/callbacks.c:3299
 #, c-format
 msgid "Inserting %d%s frames from the clipboard..."
 msgstr ""
 
-#: src/callbacks.c:3162 src/callbacks.c:3236 src/callbacks.c:3339
+#: src/callbacks.c:3155 src/callbacks.c:3224 src/callbacks.c:3325
 msgid "Inserting"
 msgstr "Indsætter"
 
-#: src/callbacks.c:3193
+#: src/callbacks.c:3187
 #, c-format
 msgid "Inserting %d times from the clipboard%s..."
 msgstr ""
 
-#: src/callbacks.c:3200
+#: src/callbacks.c:3191
 #, c-format
 msgid "Inserting %d frames from the clipboard%s..."
 msgstr ""
 
-#: src/callbacks.c:3418
+#: src/callbacks.c:3404
 msgid "Insert"
 msgstr "Indsæt"
 
-#: src/callbacks.c:3486
+#: src/callbacks.c:3471
 msgid ""
 "\n"
 "Deleting all frames will close this file.\n"
 "Are you sure ?"
 msgstr ""
 
-#: src/callbacks.c:3495
+#: src/callbacks.c:3480
 msgid ""
 "\n"
 "Deletion will cause missing frames in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3515 src/callbacks.c:10920 src/callbacks.c:11162
-#: src/callbacks.c:11228
+#: src/callbacks.c:3500 src/callbacks.c:10851 src/callbacks.c:11087
+#: src/callbacks.c:11152
 msgid ""
 "\n"
 "Deletion will cause missing audio in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3534
+#: src/callbacks.c:3519
 msgid ""
 "\n"
 "Deletion will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3553 src/callbacks.c:11210
+#: src/callbacks.c:3538 src/callbacks.c:11134
 msgid ""
 "\n"
 "Deletion will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3611
+#: src/callbacks.c:3597
 #, c-format
 msgid "Deleting frames %d to %d%s..."
 msgstr ""
 
-#: src/callbacks.c:3636
+#: src/callbacks.c:3619
 msgid "Deleting"
 msgstr "Sletter"
 
-#: src/callbacks.c:3717
+#: src/callbacks.c:3699
 msgid "Delete"
 msgstr "Slet"
 
-#: src/callbacks.c:3738
+#: src/callbacks.c:3717
 msgid ""
 "\n"
 "\n"
 "Selection is locked.\n"
 msgstr ""
 
-#: src/callbacks.c:4092
+#: src/callbacks.c:4056
 msgid ""
 "Ready to record. Use 'control' and cursor keys during playback to record "
 "your performance.\n"
@@ -1999,11 +1998,11 @@
 "play.)\n"
 msgstr ""
 
-#: src/callbacks.c:4098
+#: src/callbacks.c:4061
 msgid "Record cancelled.\n"
 msgstr ""
 
-#: src/callbacks.c:4237
+#: src/callbacks.c:4197
 #, c-format
 msgid ""
 "\n"
@@ -2012,7 +2011,7 @@
 "%s\n"
 msgstr ""
 
-#: src/callbacks.c:4241
+#: src/callbacks.c:4200
 #, c-format
 msgid ""
 "\n"
@@ -2021,7 +2020,7 @@
 "The plugin may be broken or not installed correctly."
 msgstr ""
 
-#: src/callbacks.c:4571
+#: src/callbacks.c:4532
 #, c-format
 msgid ""
 "Saving the set will cause copies of all loaded clips to remain on the disk"
@@ -2030,22 +2029,22 @@
 "Please press 'Cancel' if that is not what you want.\n"
 msgstr ""
 
-#: src/callbacks.c:4654
+#: src/callbacks.c:4617
 #, c-format
 msgid "Saving set %s"
 msgstr ""
 
-#: src/callbacks.c:5005
+#: src/callbacks.c:4964
 #, c-format
 msgid "Loading clips from set %s"
 msgstr ""
 
-#: src/callbacks.c:5093
+#: src/callbacks.c:5051
 #, c-format
 msgid "%d clips and %d layouts were recovered from set (%s).\n"
 msgstr ""
 
-#: src/callbacks.c:5312
+#: src/callbacks.c:5259
 msgid ""
 "LiVES will attempt to recover some disk space.\n"
 "You should ONLY run this if you have no other copies of LiVES running on "
@@ -2053,24 +2052,24 @@
 "Click OK to proceed.\n"
 msgstr ""
 
-#: src/callbacks.c:5317
+#: src/callbacks.c:5264
 msgid "Cleaning up disk space..."
 msgstr ""
 
-#: src/callbacks.c:5387
+#: src/callbacks.c:5334
 msgid "Recovering disk space"
 msgstr ""
 
-#: src/callbacks.c:5439
+#: src/callbacks.c:5386
 #, c-format
 msgid "%s of disk space was recovered.\n"
 msgstr ""
 
-#: src/callbacks.c:5482
+#: src/callbacks.c:5428
 msgid "Resetting frame rates and frame values..."
 msgstr ""
 
-#: src/callbacks.c:5523
+#: src/callbacks.c:5469
 #, c-format
 msgid ""
 "\n"
@@ -2078,39 +2077,39 @@
 "Internal: %s (%d bpp) / %s\n"
 msgstr ""
 
-#: src/callbacks.c:5525
+#: src/callbacks.c:5471
 msgid "buffered"
 msgstr ""
 
-#: src/callbacks.c:5538 src/callbacks.c:5557 src/callbacks.c:5575
-#: src/callbacks.c:5609
+#: src/callbacks.c:5484 src/callbacks.c:5502 src/callbacks.c:5518
+#: src/callbacks.c:5551
 msgid ""
 "\n"
 "  Opening..."
 msgstr ""
 
-#: src/callbacks.c:5545
+#: src/callbacks.c:5490
 #, c-format
 msgid ""
 "\n"
 "(%d virtual)"
 msgstr ""
 
-#: src/callbacks.c:5548
+#: src/callbacks.c:5493
 #, c-format
 msgid ""
 "\n"
 "(%d decoded)"
 msgstr ""
 
-#: src/callbacks.c:5560 src/callbacks.c:5578 src/callbacks.c:5612
+#: src/callbacks.c:5504 src/callbacks.c:5520 src/callbacks.c:5553
 #, c-format
 msgid ""
 "\n"
 "  %.2f sec."
 msgstr ""
 
-#: src/callbacks.c:5569
+#: src/callbacks.c:5512
 msgid ""
 "\n"
 "  Unknown"
@@ -2118,30 +2117,30 @@
 "\n"
 "  Ukendt"
 
-#: src/callbacks.c:5582 src/callbacks.c:5596
+#: src/callbacks.c:5524 src/callbacks.c:5538
 msgid "unsigned"
 msgstr ""
 
-#: src/callbacks.c:5583 src/callbacks.c:5597
+#: src/callbacks.c:5525 src/callbacks.c:5539
 msgid "signed"
 msgstr ""
 
-#: src/callbacks.c:5585 src/callbacks.c:5599
+#: src/callbacks.c:5527 src/callbacks.c:5541
 msgid "big-endian"
 msgstr ""
 
-#: src/callbacks.c:5586 src/callbacks.c:5600
+#: src/callbacks.c:5528 src/callbacks.c:5542
 msgid "little-endian"
 msgstr ""
 
-#: src/callbacks.c:5588 src/callbacks.c:5602
+#: src/callbacks.c:5530 src/callbacks.c:5544
 #, c-format
 msgid ""
 "  %d Hz %d bit\n"
 "%s %s"
 msgstr ""
 
-#: src/callbacks.c:5707
+#: src/callbacks.c:5647
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -2158,22 +2157,22 @@
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA.\n"
 msgstr ""
 
-#: src/callbacks.c:5721
+#: src/callbacks.c:5661
 msgid "A video editor and VJ program."
 msgstr ""
 
-#: src/callbacks.c:5722
+#: src/callbacks.c:5662
 msgid "About LiVES"
 msgstr ""
 
-#: src/callbacks.c:5724
+#: src/callbacks.c:5664
 msgid "translator_credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  AJenbo https://launchpad.net/~ajenbo\n"
 "  nanker https://launchpad.net/~nanker"
 
-#: src/callbacks.c:5758
+#: src/callbacks.c:5699
 #, c-format
 msgid ""
 "LiVES Version %s\n"
@@ -2187,14 +2186,14 @@
 "Homepage: http://lives.sourceforge.net"
 msgstr ""
 
-#: src/callbacks.c:6037
+#: src/callbacks.c:5996
 msgid ""
 "\n"
 "\n"
 "You need to install mplayer or mplayer2 to be able to preview this file.\n"
 msgstr ""
 
-#: src/callbacks.c:6040
+#: src/callbacks.c:5998
 msgid ""
 "\n"
 "\n"
@@ -2202,215 +2201,206 @@
 "this file.\n"
 msgstr ""
 
-#: src/callbacks.c:6423 src/callbacks.c:8289
-msgid ""
-"\n"
-"Loading new audio may cause missing audio in some multitrack layouts.\n"
-"Are you sure you wish to continue ?\n"
-"."
-msgstr ""
-
-#: src/callbacks.c:6523
-#, c-format
-msgid "Opening audio %s, type %s..."
-msgstr ""
-
-#: src/callbacks.c:6556 src/saveplay.c:480
-msgid "Opening audio"
-msgstr ""
-
-#: src/callbacks.c:6565 src/callbacks.c:6612 src/callbacks.c:8387
-#: src/callbacks.c:8429 src/callbacks.c:8472 src/callbacks.c:10846
-msgid "Cancelling"
-msgstr "Annullerer"
-
-#: src/callbacks.c:6660 src/callbacks.c:8514 src/callbacks.c:10876
-#: src/callbacks.c:11563
-msgid "Committing audio"
-msgstr ""
-
-#: src/callbacks.c:6672 src/callbacks.c:8546
-msgid "New Audio"
-msgstr "Ny lyd"
-
-#: src/callbacks.c:6779
+#: src/callbacks.c:6459
 #, c-format
 msgid ""
 "Text was saved as\n"
 "%s\n"
 msgstr ""
 
-#: src/callbacks.c:6951 src/saveplay.c:3618
-#, c-format
-msgid "%d frames are enough !\n"
-msgstr ""
-
-#: src/callbacks.c:7050
+#: src/callbacks.c:6706
 msgid "LiVES: - Encoder debug output"
 msgstr ""
 
-#: src/callbacks.c:7087 src/gui.c:1922
+#: src/callbacks.c:6743 src/gui.c:1921
 msgid "Fullscreen playback (f)"
 msgstr ""
 
-#: src/callbacks.c:7089
+#: src/callbacks.c:6744
 msgid "Fullscreen playback off (f)"
 msgstr ""
 
-#: src/callbacks.c:7188 src/callbacks.c:7336 src/callbacks.c:7664
-#: src/callbacks.c:7681 src/gui.c:3712 src/saveplay.c:2467 src/saveplay.c:2501
-#: src/saveplay.c:3115 src/saveplay.c:3220 src/saveplay.c:3239
-#: src/multitrack.c:9340 src/multitrack.c:11060
+#: src/callbacks.c:6841 src/callbacks.c:6983 src/callbacks.c:7283
+#: src/callbacks.c:7298 src/gui.c:3838 src/saveplay.c:2442 src/saveplay.c:2475
+#: src/saveplay.c:3074 src/saveplay.c:3178 src/saveplay.c:3197
+#: src/multitrack.c:9526 src/multitrack.c:11288
 #, c-format
 msgid " (%d %% scale)"
 msgstr ""
 
-#: src/callbacks.c:7190 src/callbacks.c:7338 src/callbacks.c:7666
-#: src/gui.c:3716 src/saveplay.c:2469 src/saveplay.c:2503
+#: src/callbacks.c:6843 src/callbacks.c:6985 src/callbacks.c:7285
+#: src/gui.c:3842 src/saveplay.c:2444 src/saveplay.c:2477
 #, c-format
 msgid "LiVES: - Play Window%s"
 msgstr ""
 
-#: src/callbacks.c:7302 src/gui.c:1907
+#: src/callbacks.c:6950 src/gui.c:1906
 msgid "Double size (d)"
 msgstr ""
 
-#: src/callbacks.c:7309
+#: src/callbacks.c:6956
 msgid "Single size (d)"
 msgstr ""
 
-#: src/callbacks.c:7442 src/callbacks.c:7443
+#: src/callbacks.c:7087 src/callbacks.c:7088
 msgid "Hide the play window (s)"
 msgstr ""
 
-#: src/callbacks.c:7452 src/gui.c:1746
+#: src/callbacks.c:7096 src/gui.c:1744
 msgid "Show the play window (s)"
 msgstr ""
 
-#: src/callbacks.c:7453 src/gui.c:1896
+#: src/callbacks.c:7097 src/gui.c:1895
 msgid "Play in separate window (s)"
 msgstr ""
 
-#: src/callbacks.c:7535 src/gui.c:4060 src/saveplay.c:2498
+#: src/callbacks.c:7175 src/gui.c:4169 src/saveplay.c:2472
 msgid "LiVES: - Streaming"
 msgstr ""
 
-#: src/callbacks.c:7778
+#: src/callbacks.c:7388
 msgid "Switch continuous looping off (o)"
 msgstr ""
 
-#: src/callbacks.c:7785 src/gui.c:1795
+#: src/callbacks.c:7394 src/gui.c:1793
 msgid "Switch continuous looping on (o)"
 msgstr ""
 
-#: src/callbacks.c:7837
+#: src/callbacks.c:7444
 #, c-format
 msgid "Audio volume (%.2f)"
 msgstr ""
 
-#: src/callbacks.c:7876 src/callbacks.c:7877 src/gui.c:3640
+#: src/callbacks.c:7483 src/callbacks.c:7484 src/gui.c:3766
 msgid "Unmute the audio (z)"
 msgstr ""
 
-#: src/callbacks.c:7888 src/callbacks.c:7889 src/gui.c:1808 src/gui.c:3639
+#: src/callbacks.c:7494 src/callbacks.c:7495 src/gui.c:1806 src/gui.c:3765
 msgid "Mute the audio (z)"
 msgstr ""
 
-#: src/callbacks.c:8038
+#: src/callbacks.c:7643
 msgid "Reversing clipboard..."
 msgstr ""
 
-#: src/callbacks.c:8052
+#: src/callbacks.c:7657
 msgid "Reversing clipboard"
 msgstr ""
 
-#: src/callbacks.c:8084
+#: src/callbacks.c:7689
 msgid "LiVES: Load subtitles from..."
 msgstr ""
 
-#: src/callbacks.c:8151 src/saveplay.c:970
+#: src/callbacks.c:7753 src/saveplay.c:956
 #, c-format
 msgid "Loaded subtitle file: %s\n"
 msgstr ""
 
-#: src/callbacks.c:8220
+#: src/callbacks.c:7821
 msgid "Subtitles were erased.\n"
 msgstr ""
 
-#: src/callbacks.c:8239
+#: src/callbacks.c:7843
 msgid "LiVES: - Select Audio File"
 msgstr ""
 
-#: src/callbacks.c:8250
+#: src/callbacks.c:7878 src/callbacks.c:8232
+msgid ""
+"\n"
+"Loading new audio may cause missing audio in some multitrack layouts.\n"
+"Are you sure you wish to continue ?\n"
+"."
+msgstr ""
+
+#: src/callbacks.c:7989
+#, c-format
+msgid "Opening audio %s, type %s..."
+msgstr ""
+
+#: src/callbacks.c:8023 src/saveplay.c:477
+msgid "Opening audio"
+msgstr ""
+
+#: src/callbacks.c:8032 src/callbacks.c:8083 src/callbacks.c:8327
+#: src/callbacks.c:8369 src/callbacks.c:8412 src/callbacks.c:10766
+msgid "Cancelling"
+msgstr "Annullerer"
+
+#: src/callbacks.c:8137 src/callbacks.c:8454 src/callbacks.c:10803
+#: src/callbacks.c:11477
+msgid "Committing audio"
+msgstr ""
+
+#: src/callbacks.c:8153 src/callbacks.c:8484
+msgid "New Audio"
+msgstr "Ny lyd"
+
+#: src/callbacks.c:8194
 msgid "Please set your CD play device in Tools | Preferences | Misc\n"
 msgstr ""
 
-#: src/callbacks.c:8321
+#: src/callbacks.c:8264
 #, c-format
 msgid "Opening CD track %d from %s..."
 msgstr ""
 
-#: src/callbacks.c:8326
+#: src/callbacks.c:8267
 #, c-format
 msgid "CD track %d"
 msgstr ""
 
-#: src/callbacks.c:8373
+#: src/callbacks.c:8313
 msgid "Opening CD track..."
 msgstr ""
 
-#: src/callbacks.c:8415 src/callbacks.c:8461
+#: src/callbacks.c:8355 src/callbacks.c:8401
 msgid "Error loading CD track\n"
 msgstr ""
 
-#: src/callbacks.c:8584
+#: src/callbacks.c:8518
 msgid "layout errors"
 msgstr ""
 
-#: src/callbacks.c:8595
+#: src/callbacks.c:8529
 msgid "Close _Window"
 msgstr "Luk _vindue"
 
-#: src/callbacks.c:8606
+#: src/callbacks.c:8540
 msgid "Clear _Errors"
 msgstr "Ryd _fejl"
 
-#: src/callbacks.c:8617
+#: src/callbacks.c:8551
 msgid "_Delete affected layouts"
 msgstr ""
 
-#: src/callbacks.c:9343 src/callbacks.c:9388
+#: src/callbacks.c:9253 src/callbacks.c:9298
 msgid "Resume"
 msgstr "Genoptag"
 
-#: src/callbacks.c:9344
+#: src/callbacks.c:9254
 msgid ""
 "\n"
 "Paused\n"
 "(click Resume to continue processing)"
 msgstr ""
 
-#: src/callbacks.c:9345 src/callbacks.c:9406
+#: src/callbacks.c:9255 src/callbacks.c:9315
 msgid "paused..."
 msgstr "på pause..."
 
-#: src/callbacks.c:9372 src/callbacks.c:9418
-msgid "Pause"
-msgstr "Pause"
-
-#: src/callbacks.c:9374 src/callbacks.c:9421
+#: src/callbacks.c:9284 src/callbacks.c:9333
 msgid "resumed..."
 msgstr "genoptaget..."
 
-#: src/callbacks.c:9393
+#: src/callbacks.c:9303
 msgid "Keep"
 msgstr "Behold"
 
-#: src/callbacks.c:9396
+#: src/callbacks.c:9305
 msgid "Enough"
 msgstr ""
 
-#: src/callbacks.c:9401
+#: src/callbacks.c:9310
 #, c-format
 msgid ""
 "\n"
@@ -2419,28 +2409,28 @@
 "(click Resume to continue processing)"
 msgstr ""
 
-#: src/callbacks.c:9419
+#: src/callbacks.c:9331
 msgid "Cancel"
 msgstr "Annuller"
 
-#: src/callbacks.c:9558
+#: src/callbacks.c:9478
 msgid "Stop"
 msgstr ""
 
-#: src/callbacks.c:10053 src/multitrack.c:13247
+#: src/callbacks.c:9968 src/multitrack.c:13489
 msgid "LiVES: Selected frame"
 msgstr "LiVES: Valgt ramme"
 
-#: src/callbacks.c:10061
+#: src/callbacks.c:9976
 msgid "_Save frame as..."
 msgstr ""
 
-#: src/callbacks.c:10290
+#: src/callbacks.c:10202
 #, c-format
 msgid "Audio is ahead of video by %.4f secs. at frame %d, with fps %.4f\n"
 msgstr ""
 
-#: src/callbacks.c:10347
+#: src/callbacks.c:10255
 msgid ""
 "\n"
 "\n"
@@ -2449,7 +2439,7 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10353
+#: src/callbacks.c:10261
 msgid ""
 "\n"
 "\n"
@@ -2457,13 +2447,13 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10429 src/callbacks.c:11479
+#: src/callbacks.c:10334 src/callbacks.c:11395
 msgid ""
 "\n"
 "Record time must be greater than 0.\n"
 msgstr ""
 
-#: src/callbacks.c:10440
+#: src/callbacks.c:10346
 msgid ""
 "Capture an External Window:\n"
 "\n"
@@ -2472,17 +2462,17 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10445
+#: src/callbacks.c:10351
 msgid "External window was released.\n"
 msgstr ""
 
-#: src/callbacks.c:10479
+#: src/callbacks.c:10385
 msgid ""
 "Click on a Window to Capture it\n"
 "Press 'q' to stop recording"
 msgstr ""
 
-#: src/callbacks.c:10513
+#: src/callbacks.c:10419
 #, c-format
 msgid ""
 "\n"
@@ -2492,19 +2482,19 @@
 "(Default of %.3f frames per second will be used.)\n"
 msgstr ""
 
-#: src/callbacks.c:10539
+#: src/callbacks.c:10443
 msgid "LiVES was unable to capture this window. Sorry.\n"
 msgstr ""
 
-#: src/callbacks.c:10695
+#: src/callbacks.c:10601
 msgid "Export Selected Audio as..."
 msgstr ""
 
-#: src/callbacks.c:10699
+#: src/callbacks.c:10604
 msgid "Export Audio as..."
 msgstr ""
 
-#: src/callbacks.c:10714
+#: src/callbacks.c:10619
 msgid ""
 "\n"
 "\n"
@@ -2513,1033 +2503,1033 @@
 "rate.\n"
 msgstr ""
 
-#: src/callbacks.c:10720
+#: src/callbacks.c:10625
 #, c-format
 msgid "Exporting audio frames %d to %d as %s..."
 msgstr ""
 
-#: src/callbacks.c:10725
+#: src/callbacks.c:10629
 #, c-format
 msgid "Exporting audio as %s..."
 msgstr ""
 
-#: src/callbacks.c:10751
+#: src/callbacks.c:10655
 msgid "Exporting audio"
 msgstr ""
 
-#: src/callbacks.c:10782
+#: src/callbacks.c:10695
 msgid "LiVES: - Append Audio File"
 msgstr ""
 
-#: src/callbacks.c:10825
+#: src/callbacks.c:10739
 #, c-format
 msgid "Appending audio file %s..."
 msgstr ""
 
-#: src/callbacks.c:10836
+#: src/callbacks.c:10756
 msgid "Appending audio"
 msgstr ""
 
-#: src/callbacks.c:10892
+#: src/callbacks.c:10818
 msgid "Append Audio"
 msgstr ""
 
-#: src/callbacks.c:10952
+#: src/callbacks.c:10883
 #, c-format
 msgid "Padding audio to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10954
+#: src/callbacks.c:10885
 #, c-format
 msgid "Trimming audio from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10973
+#: src/callbacks.c:10904
 msgid "Trimming/Padding audio"
 msgstr ""
 
-#: src/callbacks.c:10981
+#: src/callbacks.c:10912
 msgid "Trim/Pad Audio"
 msgstr ""
 
-#: src/callbacks.c:11055
+#: src/callbacks.c:10982
 msgid "Fading audio in"
 msgstr ""
 
-#: src/callbacks.c:11056
+#: src/callbacks.c:10983
 msgid "Fade audio in"
 msgstr ""
 
-#: src/callbacks.c:11061
+#: src/callbacks.c:10987
 msgid "Fading audio out"
 msgstr ""
 
-#: src/callbacks.c:11062
+#: src/callbacks.c:10988
 msgid "Fade audio out"
 msgstr ""
 
-#: src/callbacks.c:11085
+#: src/callbacks.c:11011
 #, c-format
 msgid "%s over %.1f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11087
+#: src/callbacks.c:11013
 #, c-format
 msgid "%s from time %.2f seconds to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11094
+#: src/callbacks.c:11020
 msgid "Fading audio..."
 msgstr ""
 
-#: src/callbacks.c:11194
+#: src/callbacks.c:11119
 msgid ""
 "\n"
 "Deleting all audio will close this file.\n"
 "Are you sure ?"
 msgstr ""
 
-#: src/callbacks.c:11197
+#: src/callbacks.c:11122
 msgid "Deleting all audio..."
 msgstr ""
 
-#: src/callbacks.c:11203
+#: src/callbacks.c:11127
 #, c-format
 msgid "Deleting audio from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11290
+#: src/callbacks.c:11214
 msgid "Deleting Audio"
 msgstr ""
 
-#: src/callbacks.c:11297
+#: src/callbacks.c:11221
 msgid "Delete Audio"
 msgstr ""
 
-#: src/callbacks.c:11636
+#: src/callbacks.c:11550
 msgid "Record new audio"
 msgstr ""
 
-#: src/callbacks.c:11725
+#: src/callbacks.c:11640
 #, c-format
 msgid "Inserting silence from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11754
+#: src/callbacks.c:11666
 msgid "Inserting Silence"
 msgstr ""
 
-#: src/merge.c:85
+#: src/merge.c:96
 msgid "LiVES: - Merge"
 msgstr ""
 
-#: src/merge.c:102
+#: src/merge.c:113
 #, c-format
 msgid "Merge Clipboard [ %d Frames ]       With Selection [ %d Frames ]"
 msgstr ""
 
-#: src/merge.c:107
+#: src/merge.c:118
 #, c-format
 msgid ""
 "Merge Clipboard [ %d Frames (resampled) ]       With Selection [ %d Frames ]"
 msgstr ""
 
-#: src/merge.c:118
+#: src/merge.c:130
 msgid "Align _Starts"
 msgstr ""
 
-#: src/merge.c:123
+#: src/merge.c:135
 msgid "Align _Ends"
 msgstr ""
 
-#: src/merge.c:134
+#: src/merge.c:146
 msgid "What to do with extra clipboard frames -"
 msgstr ""
 
-#: src/merge.c:137
+#: src/merge.c:149
 msgid "_Insert Frames"
 msgstr ""
 
-#: src/merge.c:143
+#: src/merge.c:155
 msgid "_Drop Frames"
 msgstr ""
 
-#: src/merge.c:149
+#: src/merge.c:160
 msgid "Number of Times to Loop Clipboard"
 msgstr ""
 
-#: src/merge.c:160
+#: src/merge.c:171
 msgid "_Loop Clipboard to Fit Selection"
 msgstr ""
 
-#: src/merge.c:173
+#: src/merge.c:184
 msgid "_Transition Method:"
 msgstr ""
 
-#: src/merge.c:394
+#: src/merge.c:395
 msgid "Merging clipboard with selection..."
 msgstr ""
 
-#: src/merge.c:551
+#: src/merge.c:539
 msgid "Merge done.\n"
 msgstr ""
 
-#: src/gui.c:123
+#: src/gui.c:122
 msgid "_Custom Generators"
 msgstr ""
 
-#: src/gui.c:124
+#: src/gui.c:123
 msgid "_Custom Effects"
 msgstr ""
 
-#: src/gui.c:125
+#: src/gui.c:124
 msgid "Custom _Utilities"
 msgstr ""
 
-#: src/gui.c:352 src/multitrack.c:5964
+#: src/gui.c:351 src/multitrack.c:6143
 msgid "_File"
 msgstr ""
 
-#: src/gui.c:367 src/multitrack.c:5989
+#: src/gui.c:366 src/multitrack.c:6168
 msgid "_Open File/Directory"
 msgstr ""
 
-#: src/gui.c:373
+#: src/gui.c:372
 msgid "O_pen Part of File..."
 msgstr ""
 
-#: src/gui.c:379 src/gui.c:383 src/multitrack.c:6006 src/multitrack.c:6023
-#: src/multitrack.c:6028
+#: src/gui.c:378 src/gui.c:382 src/multitrack.c:6185 src/multitrack.c:6202
+#: src/multitrack.c:6207
 msgid "Open _Location/Stream..."
 msgstr ""
 
-#: src/gui.c:393 src/multitrack.c:6016
+#: src/gui.c:392 src/multitrack.c:6195
 msgid "Open _Youtube Clip..."
 msgstr ""
 
-#: src/gui.c:404
+#: src/gui.c:403
 msgid "Import from _dvd/vcd..."
 msgstr ""
 
-#: src/gui.c:413
+#: src/gui.c:412
 msgid "Import from _dvd"
 msgstr ""
 
-#: src/gui.c:416
+#: src/gui.c:415
 msgid "Import from _vcd"
 msgstr ""
 
-#: src/gui.c:419
+#: src/gui.c:418
 msgid "_Import from Firewire"
 msgstr ""
 
-#: src/gui.c:428 src/multitrack.c:6086
+#: src/gui.c:427 src/multitrack.c:6265
 msgid "Import from _Firewire Device (dv)"
 msgstr ""
 
-#: src/gui.c:429 src/multitrack.c:6094
+#: src/gui.c:428 src/multitrack.c:6273
 msgid "Import from _Firewire Device (hdv)"
 msgstr ""
 
-#: src/gui.c:457
+#: src/gui.c:456
 msgid "_Add Webcam/TV card..."
 msgstr ""
 
-#: src/gui.c:476
+#: src/gui.c:475
 msgid "Add _Unicap Device"
 msgstr ""
 
-#: src/gui.c:486
+#: src/gui.c:485
 msgid "Add Live _Firewire Device"
 msgstr ""
 
-#: src/gui.c:495
+#: src/gui.c:494
 msgid "Add _TV Device"
 msgstr ""
 
-#: src/gui.c:510 src/multitrack.c:6117
+#: src/gui.c:509 src/multitrack.c:6296
 msgid "_Recent Files..."
 msgstr ""
 
-#: src/gui.c:560 src/multitrack.c:6177
+#: src/gui.c:559 src/multitrack.c:6356
 msgid "_Reload Clip Set..."
 msgstr ""
 
-#: src/gui.c:564 src/multitrack.c:6185
+#: src/gui.c:563 src/multitrack.c:6364
 msgid "Close/Sa_ve All Clips"
 msgstr ""
 
-#: src/gui.c:575
+#: src/gui.c:574
 msgid "_Encode Clip As..."
 msgstr ""
 
-#: src/gui.c:577
+#: src/gui.c:576
 msgid "Encode _Selection As..."
 msgstr ""
 
-#: src/gui.c:584
+#: src/gui.c:583
 msgid "_Close This Clip"
 msgstr ""
 
-#: src/gui.c:595
+#: src/gui.c:594
 msgid "_Backup Clip as .lv1..."
 msgstr ""
 
-#: src/gui.c:604
+#: src/gui.c:603
 msgid "_Restore Clip from .lv1..."
 msgstr ""
 
-#: src/gui.c:615
+#: src/gui.c:614
 msgid "Encode/Load/Backup _with Sound"
 msgstr ""
 
-#: src/gui.c:620
+#: src/gui.c:619
 msgid "Auto load subtitles"
 msgstr ""
 
-#: src/gui.c:628 src/multitrack.c:6224
+#: src/gui.c:627 src/multitrack.c:6403
 msgid "Clean _up Diskspace"
 msgstr ""
 
-#: src/gui.c:636 src/multitrack.c:6257
+#: src/gui.c:635 src/multitrack.c:6436
 msgid "_Edit"
 msgstr ""
 
-#: src/gui.c:685
+#: src/gui.c:684
 msgid "_MULTITRACK mode"
 msgstr ""
 
-#: src/gui.c:696
+#: src/gui.c:695
 msgid "_Copy Selection"
 msgstr ""
 
-#: src/gui.c:705
+#: src/gui.c:704
 msgid "Cu_t Selection"
 msgstr ""
 
-#: src/gui.c:714
+#: src/gui.c:713
 msgid "_Insert from Clipboard..."
 msgstr ""
 
-#: src/gui.c:730
+#: src/gui.c:729
 msgid "Paste as _New"
 msgstr ""
 
-#: src/gui.c:739
+#: src/gui.c:738
 msgid "_Merge Clipboard with Selection..."
 msgstr ""
 
-#: src/gui.c:746
+#: src/gui.c:745
 msgid "_Delete Selection"
 msgstr ""
 
-#: src/gui.c:764
+#: src/gui.c:763
 msgid "Decouple _Video from Audio"
 msgstr ""
 
-#: src/gui.c:772
+#: src/gui.c:771
 msgid "_Select..."
 msgstr ""
 
-#: src/gui.c:786
+#: src/gui.c:785
 msgid "Select _All Frames"
 msgstr ""
 
-#: src/gui.c:794
+#: src/gui.c:793
 msgid "_Start Frame Only"
 msgstr ""
 
-#: src/gui.c:802
+#: src/gui.c:801
 msgid "_End Frame Only"
 msgstr ""
 
-#: src/gui.c:813
+#: src/gui.c:812
 msgid "Select from _First Frame"
 msgstr ""
 
-#: src/gui.c:817
+#: src/gui.c:816
 msgid "Select to _Last Frame"
 msgstr ""
 
-#: src/gui.c:821
+#: src/gui.c:820
 msgid "Select Last Insertion/_Merge"
 msgstr ""
 
-#: src/gui.c:825
+#: src/gui.c:824
 msgid "Select Last _Effect"
 msgstr ""
 
-#: src/gui.c:829
+#: src/gui.c:828
 msgid "_Invert Selection"
 msgstr ""
 
-#: src/gui.c:837
+#: src/gui.c:836
 msgid "_Lock Selection Width"
 msgstr ""
 
-#: src/gui.c:842 src/multitrack.c:6409
+#: src/gui.c:841 src/multitrack.c:6591
 msgid "_Play"
 msgstr ""
 
-#: src/gui.c:854
+#: src/gui.c:853
 msgid "_Play All"
 msgstr ""
 
-#: src/gui.c:869
+#: src/gui.c:868
 msgid "Pla_y Selection"
 msgstr ""
 
-#: src/gui.c:877
+#: src/gui.c:876
 msgid "Play _Clipboard"
 msgstr ""
 
-#: src/gui.c:899 src/multitrack.c:6441
+#: src/gui.c:898 src/multitrack.c:6623
 msgid "_Stop"
 msgstr ""
 
-#: src/gui.c:914 src/multitrack.c:6453
+#: src/gui.c:913 src/multitrack.c:6635
 msgid "Re_wind"
 msgstr ""
 
-#: src/gui.c:946 src/multitrack.c:6471
+#: src/gui.c:945 src/multitrack.c:6653
 msgid "_Full Screen"
 msgstr ""
 
-#: src/gui.c:955
+#: src/gui.c:954
 msgid "_Double Size"
 msgstr ""
 
-#: src/gui.c:963 src/multitrack.c:6479
+#: src/gui.c:962 src/multitrack.c:6661
 msgid "Play in _Separate Window"
 msgstr ""
 
-#: src/gui.c:972
+#: src/gui.c:971
 msgid "_Blank Background"
 msgstr ""
 
-#: src/gui.c:979
+#: src/gui.c:978
 msgid "(Auto)_loop Video (to fit audio track)"
 msgstr ""
 
-#: src/gui.c:988 src/multitrack.c:6487
+#: src/gui.c:987 src/multitrack.c:6669
 msgid "L_oop Continuously"
 msgstr ""
 
-#: src/gui.c:997
+#: src/gui.c:996
 msgid "Pin_g Pong Loops"
 msgstr ""
 
-#: src/gui.c:1005 src/multitrack.c:6495
+#: src/gui.c:1004 src/multitrack.c:6677
 msgid "_Mute"
 msgstr ""
 
-#: src/gui.c:1017
+#: src/gui.c:1016
 msgid "Separate Window 'S_ticky' Mode"
 msgstr ""
 
-#: src/gui.c:1025
+#: src/gui.c:1024
 msgid "S_how Frame Counter"
 msgstr ""
 
-#: src/gui.c:1035
+#: src/gui.c:1034
 msgid "Show Subtitles"
 msgstr ""
 
-#: src/gui.c:1045
+#: src/gui.c:1044
 msgid "Letterbox mode"
 msgstr ""
 
-#: src/gui.c:1051 src/multitrack.c:6507
+#: src/gui.c:1050 src/multitrack.c:6689
 msgid "Effect_s"
 msgstr ""
 
-#: src/gui.c:1054
+#: src/gui.c:1053
 msgid "Effects are applied to the current selection."
 msgstr ""
 
-#: src/gui.c:1067
+#: src/gui.c:1066
 msgid "_Run Test Rendered Effect/Tool/Generator..."
 msgstr ""
 
-#: src/gui.c:1072 src/multitrack.c:7123
+#: src/gui.c:1071 src/multitrack.c:7299
 msgid "_Tools"
 msgstr ""
 
-#: src/gui.c:1075
+#: src/gui.c:1074
 msgid "Tools are applied to complete clips."
 msgstr ""
 
-#: src/gui.c:1085
+#: src/gui.c:1084
 msgid "_Reverse Clipboard"
 msgstr ""
 
-#: src/gui.c:1094
+#: src/gui.c:1093
 msgid "_Change Playback/Save Speed..."
 msgstr ""
 
-#: src/gui.c:1099
+#: src/gui.c:1098
 msgid "Resample _Video to New Frame Rate..."
 msgstr ""
 
-#: src/gui.c:1105
+#: src/gui.c:1104
 msgid "_Utilities"
 msgstr ""
 
-#: src/gui.c:1110
+#: src/gui.c:1109
 msgid "Custom _Tools"
 msgstr ""
 
-#: src/gui.c:1116 src/multitrack.c:7149
+#: src/gui.c:1115 src/multitrack.c:7325
 msgid "_Generate"
 msgstr ""
 
-#: src/gui.c:1126
+#: src/gui.c:1125
 msgid "Loading rendered effect plugins..."
 msgstr ""
 
-#: src/gui.c:1139
+#: src/gui.c:1138
 msgid "Load _Subtitles from File..."
 msgstr ""
 
-#: src/gui.c:1144
+#: src/gui.c:1143
 msgid "Erase subtitles"
 msgstr ""
 
-#: src/gui.c:1152 src/multitrack.c:7158
+#: src/gui.c:1151 src/multitrack.c:7334
 msgid "Capture _External Window... "
 msgstr ""
 
-#: src/gui.c:1159 src/multitrack.c:7173
+#: src/gui.c:1158 src/multitrack.c:7349
 msgid "_Preferences..."
 msgstr ""
 
-#: src/gui.c:1172
+#: src/gui.c:1171
 msgid "_Audio"
 msgstr ""
 
-#: src/gui.c:1184
+#: src/gui.c:1183
 msgid "Load _New Audio for Clip..."
 msgstr ""
 
-#: src/gui.c:1190
+#: src/gui.c:1189
 msgid "Load _CD Track..."
 msgstr ""
 
-#: src/gui.c:1191
+#: src/gui.c:1190
 msgid "E_ject CD"
 msgstr ""
 
-#: src/gui.c:1205
+#: src/gui.c:1204
 msgid "Record E_xternal Audio..."
 msgstr ""
 
-#: src/gui.c:1218
+#: src/gui.c:1217
 msgid "to New _Clip..."
 msgstr ""
 
-#: src/gui.c:1222
+#: src/gui.c:1221
 msgid "to _Selection"
 msgstr ""
 
-#: src/gui.c:1230
+#: src/gui.c:1229
 msgid "Fade Audio _In..."
 msgstr ""
 
-#: src/gui.c:1234
+#: src/gui.c:1233
 msgid "Fade Audio _Out..."
 msgstr ""
 
-#: src/gui.c:1244
+#: src/gui.c:1243
 msgid "_Export Audio..."
 msgstr ""
 
-#: src/gui.c:1257
+#: src/gui.c:1256
 msgid "Export _Selected Audio..."
 msgstr ""
 
-#: src/gui.c:1261
+#: src/gui.c:1260
 msgid "Export _All Audio..."
 msgstr ""
 
-#: src/gui.c:1265
+#: src/gui.c:1264
 msgid "_Append Audio..."
 msgstr ""
 
-#: src/gui.c:1270
+#: src/gui.c:1269
 msgid "_Trim/Pad Audio..."
 msgstr ""
 
-#: src/gui.c:1283
+#: src/gui.c:1282
 msgid "Trim/Pad Audio to _Selection"
 msgstr ""
 
-#: src/gui.c:1288
+#: src/gui.c:1287
 msgid "Trim/Pad Audio from Beginning to _Play Start"
 msgstr ""
 
-#: src/gui.c:1293
+#: src/gui.c:1292
 msgid "_Delete Audio..."
 msgstr ""
 
-#: src/gui.c:1306
+#: src/gui.c:1305
 msgid "Delete _Selected Audio"
 msgstr ""
 
-#: src/gui.c:1310
+#: src/gui.c:1309
 msgid "Delete _All Audio"
 msgstr ""
 
-#: src/gui.c:1314
+#: src/gui.c:1313
 msgid "Insert _Silence in Selection"
 msgstr ""
 
-#: src/gui.c:1319
+#: src/gui.c:1318
 msgid "_Resample Audio..."
 msgstr ""
 
-#: src/gui.c:1324
+#: src/gui.c:1323
 msgid "_Info"
 msgstr ""
 
-#: src/gui.c:1336
+#: src/gui.c:1335
 msgid "Show Clip _Info"
 msgstr ""
 
-#: src/gui.c:1344
+#: src/gui.c:1343
 msgid "Show/_Edit File Comments"
 msgstr ""
 
-#: src/gui.c:1349
+#: src/gui.c:1348
 msgid "Show _Clipboard Info"
 msgstr ""
 
-#: src/gui.c:1360 src/multitrack.c:7286
+#: src/gui.c:1359 src/multitrack.c:7462
 msgid "Show _Messages"
 msgstr ""
 
-#: src/gui.c:1364 src/multitrack.c:7365
+#: src/gui.c:1363 src/multitrack.c:7541
 msgid "Show _Layout Errors"
 msgstr ""
 
-#: src/gui.c:1369 src/multitrack.c:7263
+#: src/gui.c:1368 src/multitrack.c:7439
 msgid "_Clips"
 msgstr ""
 
-#: src/gui.c:1381
+#: src/gui.c:1380
 msgid "_Rename Current Clip in Menu..."
 msgstr ""
 
-#: src/gui.c:1399
+#: src/gui.c:1398
 msgid "A_dvanced"
 msgstr ""
 
-#: src/gui.c:1412
+#: src/gui.c:1411
 msgid "_RFX Effects/Tools/Utilities"
 msgstr ""
 
-#: src/gui.c:1424
+#: src/gui.c:1423
 msgid "_New Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1428
+#: src/gui.c:1427
 msgid "_Copy RFX Script to Test..."
 msgstr ""
 
-#: src/gui.c:1432
+#: src/gui.c:1431
 msgid "_Edit Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1436
+#: src/gui.c:1435
 msgid "Rena_me Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1440
+#: src/gui.c:1439
 msgid "_Delete Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1450
+#: src/gui.c:1449
 msgid "_Promote Test Rendered Effect/Tool/Generator..."
 msgstr ""
 
-#: src/gui.c:1457
+#: src/gui.c:1456
 msgid "_Import Custom RFX script..."
 msgstr ""
 
-#: src/gui.c:1461
+#: src/gui.c:1460
 msgid "E_xport Custom RFX script..."
 msgstr ""
 
-#: src/gui.c:1465
+#: src/gui.c:1464
 msgid "De_lete Custom RFX Script..."
 msgstr ""
 
-#: src/gui.c:1472
+#: src/gui.c:1471
 msgid "Re_build all RFX plugins"
 msgstr ""
 
-#: src/gui.c:1501
+#: src/gui.c:1498
 msgid "Receive _LiVES stream from..."
 msgstr ""
 
-#: src/gui.c:1506
+#: src/gui.c:1503
 msgid "_Send LiVES stream to..."
 msgstr ""
 
-#: src/gui.c:1515
+#: src/gui.c:1512
 #, c-format
 msgid "Open _yuv4mpeg stream on %sstream.yuv..."
 msgstr ""
 
-#: src/gui.c:1536
+#: src/gui.c:1534
 msgid "_Import Project (.lv2)..."
 msgstr ""
 
-#: src/gui.c:1540
+#: src/gui.c:1538
 msgid "E_xport Project (.lv2)..."
 msgstr ""
 
-#: src/gui.c:1545
+#: src/gui.c:1543
 msgid "_VJ"
 msgstr ""
 
-#: src/gui.c:1557
+#: src/gui.c:1555
 msgid "Real Time _Effect Mapping"
 msgstr ""
 
-#: src/gui.c:1563
+#: src/gui.c:1561
 msgid "Bind real time effects to ctrl-number keys."
 msgstr ""
 
-#: src/gui.c:1565
+#: src/gui.c:1563
 msgid "Set Real Time Effect _Defaults"
 msgstr ""
 
-#: src/gui.c:1567
+#: src/gui.c:1565
 msgid "Set default parameter values for real time effects."
 msgstr ""
 
-#: src/gui.c:1580
+#: src/gui.c:1578
 msgid "Save Real Time Effect _Defaults"
 msgstr ""
 
-#: src/gui.c:1583
+#: src/gui.c:1581
 msgid ""
 "Save real time effect defaults so they will be restored each time you use "
 "LiVES."
 msgstr ""
 
-#: src/gui.c:1589
+#: src/gui.c:1587
 msgid "_Reset all playback speeds and positions"
 msgstr ""
 
-#: src/gui.c:1592
+#: src/gui.c:1590
 msgid ""
 "Reset all playback positions to frame 1, and reset all playback frame rates."
 msgstr ""
 
-#: src/gui.c:1594
+#: src/gui.c:1592
 msgid "_MIDI/joystick interface"
 msgstr ""
 
-#: src/gui.c:1609
+#: src/gui.c:1607
 msgid "_MIDI/joystick learner..."
 msgstr ""
 
-#: src/gui.c:1614
+#: src/gui.c:1612
 msgid "_Save device mapping..."
 msgstr ""
 
-#: src/gui.c:1620
+#: src/gui.c:1618
 msgid "_Load device mapping..."
 msgstr ""
 
-#: src/gui.c:1628
+#: src/gui.c:1626
 msgid "Show VJ _Keys"
 msgstr ""
 
-#: src/gui.c:1632
+#: src/gui.c:1630
 msgid "To_ys"
 msgstr ""
 
-#: src/gui.c:1644
+#: src/gui.c:1642
 msgid "_None"
 msgstr ""
 
-#: src/gui.c:1652
+#: src/gui.c:1650
 msgid "_Autolives"
 msgstr ""
 
-#: src/gui.c:1657
+#: src/gui.c:1655
 msgid "_Mad Frames"
 msgstr ""
 
-#: src/gui.c:1662
+#: src/gui.c:1660
 msgid "_LiVES TV (broadband)"
 msgstr ""
 
-#: src/gui.c:1672 src/multitrack.c:7387
+#: src/gui.c:1670 src/multitrack.c:7563
 msgid "_Help"
 msgstr ""
 
-#: src/gui.c:1684 src/multitrack.c:7407
+#: src/gui.c:1682 src/multitrack.c:7583
 msgid "_Manual (opens in browser)"
 msgstr ""
 
-#: src/gui.c:1691 src/multitrack.c:7416
+#: src/gui.c:1689 src/multitrack.c:7592
 msgid "_Donate to the project !"
 msgstr ""
 
-#: src/gui.c:1695 src/multitrack.c:7420
+#: src/gui.c:1693 src/multitrack.c:7596
 msgid "_Email the author"
 msgstr ""
 
-#: src/gui.c:1699 src/multitrack.c:7424
+#: src/gui.c:1697 src/multitrack.c:7600
 msgid "Report a _bug"
 msgstr ""
 
-#: src/gui.c:1703 src/multitrack.c:7428
+#: src/gui.c:1701 src/multitrack.c:7604
 msgid "Suggest a _feature"
 msgstr ""
 
-#: src/gui.c:1707 src/multitrack.c:7432
+#: src/gui.c:1705 src/multitrack.c:7608
 msgid "Assist with _translating"
 msgstr ""
 
-#: src/gui.c:1714 src/multitrack.c:7439
+#: src/gui.c:1712 src/multitrack.c:7615
 msgid "_Troubleshoot"
 msgstr ""
 
-#: src/gui.c:1718 src/multitrack.c:7443
+#: src/gui.c:1716 src/multitrack.c:7619
 msgid "_About"
 msgstr ""
 
-#: src/gui.c:1752
+#: src/gui.c:1750
 msgid "Rewind to start (w)"
 msgstr ""
 
-#: src/gui.c:1760 src/multitrack.c:16720
+#: src/gui.c:1758 src/multitrack.c:17010
 msgid "Play all (p)"
 msgstr ""
 
-#: src/gui.c:1768 src/gui.c:1877
+#: src/gui.c:1766 src/gui.c:1876
 msgid "Stop playback (q)"
 msgstr ""
 
-#: src/gui.c:1779
+#: src/gui.c:1777
 msgid "Play selection (y)"
 msgstr ""
 
-#: src/gui.c:1832
+#: src/gui.c:1829
 msgid "Volume"
 msgstr ""
 
-#: src/gui.c:1854
+#: src/gui.c:1853
 msgid "Audio volume (1.00)"
 msgstr ""
 
-#: src/gui.c:1883
+#: src/gui.c:1882
 msgid "Unblank background (b)"
 msgstr ""
 
-#: src/gui.c:1929
+#: src/gui.c:1928
 msgid "Play slower (ctrl-down)"
 msgstr ""
 
-#: src/gui.c:1935
+#: src/gui.c:1934
 msgid "Play faster (ctrl-up)"
 msgstr ""
 
-#: src/gui.c:1942
+#: src/gui.c:1941
 msgid "Skip back (ctrl-left)"
 msgstr ""
 
-#: src/gui.c:1948
+#: src/gui.c:1947
 msgid "Skip forward (ctrl-right)"
 msgstr ""
 
-#: src/gui.c:1954
+#: src/gui.c:1953
 msgid "Show clip info (i)"
 msgstr ""
 
-#: src/gui.c:1960
+#: src/gui.c:1959
 msgid "Hide this toolbar"
 msgstr ""
 
-#: src/gui.c:1962
+#: src/gui.c:1961
 msgid ""
 "Press \"s\" to toggle separate play window for improved performance, \"q\" "
 "to stop."
 msgstr ""
 
 #. TRANSLATORS: please keep the translated string the same length
-#: src/gui.c:1995
+#: src/gui.c:1994
 msgid "     Video playback speed (frames per second)        "
 msgstr ""
 
-#: src/gui.c:2009
+#: src/gui.c:2008
 msgid "Vary the video speed"
 msgstr ""
 
-#: src/gui.c:2092 src/gui.c:3218
+#: src/gui.c:2090 src/gui.c:3329
 msgid "First Frame"
 msgstr ""
 
-#: src/gui.c:2193 src/gui.c:3226
+#: src/gui.c:2191 src/gui.c:3336
 msgid "Last Frame"
 msgstr ""
 
-#: src/gui.c:2210
+#: src/gui.c:2208
 msgid "The first selected frame in this clip"
 msgstr ""
 
-#: src/gui.c:2248
+#: src/gui.c:2246
 msgid "The last selected frame in this clip"
 msgstr ""
 
-#: src/gui.c:2532
+#: src/gui.c:2546
 msgid "Starting...\n"
 msgstr ""
 
-#: src/gui.c:3074
+#: src/gui.c:3181
 msgid "    Press 'q' to stop recording.  DO NOT COVER THE PLAY WINDOW !   "
 msgstr ""
 
-#: src/gui.c:3521
+#: src/gui.c:3643
 msgid "Frame number to preview"
 msgstr ""
 
-#: src/gui.c:3538
+#: src/gui.c:3660
 msgid "_Free"
 msgstr ""
 
-#: src/gui.c:3539
+#: src/gui.c:3661
 msgid "Free choice of frame number"
 msgstr ""
 
-#: src/gui.c:3543
+#: src/gui.c:3666
 msgid "_Start"
 msgstr ""
 
-#: src/gui.c:3544
+#: src/gui.c:3667
 msgid "Frame number is linked to start frame"
 msgstr ""
 
-#: src/gui.c:3551
+#: src/gui.c:3675
 msgid "_End"
 msgstr ""
 
-#: src/gui.c:3552
+#: src/gui.c:3676
 msgid "Frame number is linked to end frame"
 msgstr ""
 
-#: src/gui.c:3559
+#: src/gui.c:3684
 msgid "_Pointer"
 msgstr ""
 
-#: src/gui.c:3560
+#: src/gui.c:3685
 msgid "Frame number is linked to playback pointer"
 msgstr ""
 
-#: src/gui.c:3581
+#: src/gui.c:3707
 msgid "Rewind"
 msgstr ""
 
-#: src/gui.c:3592 src/dialogs.c:894 src/dialogs.c:896 src/dialogs.c:1817
-#: src/dialogs.c:1819
+#: src/gui.c:3718 src/dialogs.c:960 src/dialogs.c:962 src/dialogs.c:1873
+#: src/dialogs.c:1875
 msgid "Play all"
 msgstr ""
 
-#: src/gui.c:3605
+#: src/gui.c:3731
 msgid "Play Selection"
 msgstr ""
 
-#: src/gui.c:3619
+#: src/gui.c:3745
 msgid "Loop On/Off"
 msgstr ""
 
-#: src/gui.c:3693
+#: src/gui.c:3819
 msgid "Start _recording"
 msgstr ""
 
-#: src/gui.c:3698
+#: src/gui.c:3824
 msgid "Stop _recording"
 msgstr ""
 
-#: src/gui.c:3703
+#: src/gui.c:3829
 msgid "_Record Performance"
 msgstr ""
 
-#: src/gui.c:3851
+#: src/gui.c:3974
 msgid "Hide Play Window"
 msgstr ""
 
-#: src/gui.c:4232
+#: src/gui.c:4333
 msgid "Show Play Window"
 msgstr ""
 
-#: src/ce_thumbs.c:222
+#: src/ce_thumbs.c:242
 #, c-format
 msgid "Mapped to ctrl-%d"
 msgstr ""
 
-#: src/ce_thumbs.c:276 src/effects.c:85 src/preferences.c:3195
+#: src/ce_thumbs.c:296 src/effects.c:86 src/preferences.c:3247
 msgid "Effects"
 msgstr "Effekter"
 
-#: src/ce_thumbs.c:279 src/multitrack.c:5615
+#: src/ce_thumbs.c:299 src/multitrack.c:5791
 msgid "Clips"
 msgstr ""
 
-#: src/ce_thumbs.c:303
+#: src/ce_thumbs.c:323
 #, c-format
 msgid "Show / apply effects to %s\n"
 msgstr ""
 
-#: src/ce_thumbs.c:315
+#: src/ce_thumbs.c:335
 #, c-format
 msgid "Select clip for %s\n"
 msgstr ""
 
-#: src/ce_thumbs.c:515
+#: src/ce_thumbs.c:536
 msgid "_Pin"
 msgstr ""
 
-#: src/ce_thumbs.c:515
+#: src/ce_thumbs.c:537
 msgid "Pin the parameter box to the window"
 msgstr ""
 
 #. TRANSLATORS: Exabytes
-#: src/utils.c:794
+#: src/utils.c:800
 #, c-format
 msgid "%.2f EB"
 msgstr ""
 
 #. TRANSLATORS: Petabytes
-#: src/utils.c:798
+#: src/utils.c:803
 #, c-format
 msgid "%.2f PB"
 msgstr ""
 
 #. TRANSLATORS: Terabytes
-#: src/utils.c:802
+#: src/utils.c:806
 #, c-format
 msgid "%.2f TB"
 msgstr ""
 
 #. TRANSLATORS: Gigabytes
-#: src/utils.c:806
+#: src/utils.c:809
 #, c-format
 msgid "%.2f GB"
 msgstr ""
 
 #. TRANSLATORS: Megabytes
-#: src/utils.c:810
+#: src/utils.c:812
 #, c-format
 msgid "%.2f MB"
 msgstr ""
 
 #. TRANSLATORS: Kilobytes (1024 bytes)
-#: src/utils.c:814
+#: src/utils.c:815
 #, c-format
 msgid "%.2f KiB"
 msgstr ""
@@ -3549,7 +3539,7 @@
 msgid "%d bytes"
 msgstr ""
 
-#: src/utils.c:1841
+#: src/utils.c:1835
 msgid "Clearing the clipboard"
 msgstr ""
 
@@ -3561,81 +3551,81 @@
 "Switched to clip %s\n"
 msgstr ""
 
-#: src/utils.c:1880
+#: src/utils.c:1877
 msgid ""
 "\n"
 "==============================\n"
 "Switched to empty clip\n"
 msgstr ""
 
-#: src/utils.c:1917
+#: src/utils.c:1916
 msgid "(blank)"
 msgstr ""
 
-#: src/utils.c:1920
+#: src/utils.c:1919
 #, c-format
 msgid ""
 "The set name has been changed from %s to %s. Affected layouts have been "
 "updated accordingly\n"
 msgstr ""
 
-#: src/utils.c:1928
+#: src/utils.c:1927
 #, c-format
 msgid ""
 "The clip %s is missing from this set.\n"
 "It is required by the following layouts:\n"
 msgstr ""
 
-#: src/utils.c:1932
+#: src/utils.c:1931
 #, c-format
 msgid ""
 "The clip %s has been closed.\n"
 "It is required by the following layouts:\n"
 msgstr ""
 
-#: src/utils.c:1937
+#: src/utils.c:1936
 #, c-format
 msgid ""
 "Frames have been shifted in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1942
+#: src/utils.c:1941
 #, c-format
 msgid ""
 "Frames have been deleted from the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1947
+#: src/utils.c:1946
 #, c-format
 msgid ""
 "Audio has been deleted from the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1952
+#: src/utils.c:1951
 #, c-format
 msgid ""
 "Audio has been shifted in clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1957
+#: src/utils.c:1956
 #, c-format
 msgid ""
 "Audio has been altered in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1962
+#: src/utils.c:1961
 #, c-format
 msgid ""
 "Frames have been altered in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:2135
+#: src/utils.c:2134
 #, c-format
 msgid ""
 "Set %s\n"
@@ -3643,7 +3633,7 @@
 "by another copy of LiVES.\n"
 msgstr ""
 
-#: src/utils.c:2142
+#: src/utils.c:2140
 #, c-format
 msgid ""
 "\n"
@@ -3689,67 +3679,67 @@
 msgid "Removing layout %s\n"
 msgstr ""
 
-#: src/utils.c:3014
+#: src/utils.c:2996
 msgid "Video [opening...]"
 msgstr ""
 
-#: src/utils.c:3018
+#: src/utils.c:2999
 #, c-format
 msgid "Video [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:3022
+#: src/utils.c:3002
 msgid "(Undefined)"
 msgstr ""
 
-#: src/utils.c:3025
+#: src/utils.c:3004
 msgid "(No video)"
 msgstr ""
 
-#: src/utils.c:3032
+#: src/utils.c:3011
 msgid "(No audio)"
 msgstr ""
 
-#: src/utils.c:3037
+#: src/utils.c:3015
 msgid "Mono  [opening...]"
 msgstr ""
 
-#: src/utils.c:3040
+#: src/utils.c:3017
 msgid "Left Audio [opening...]"
 msgstr ""
 
-#: src/utils.c:3045
+#: src/utils.c:3021
 #, c-format
 msgid "Mono [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:3048
+#: src/utils.c:3023
 #, c-format
 msgid "Left Audio [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:3056
+#: src/utils.c:3031
 msgid "Right Audio [opening...]"
 msgstr ""
 
-#: src/utils.c:3059
+#: src/utils.c:3033
 #, c-format
 msgid "Right Audio [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:3506
+#: src/utils.c:3472
 msgid "LiVES cannot switch to mplayer whilst clips are loading."
 msgstr ""
 
-#: src/utils.c:3559
+#: src/utils.c:3525
 msgid "LiVES cannot switch to mplayer2 whilst clips are loading."
 msgstr ""
 
-#: src/utils.c:3809
+#: src/utils.c:3775
 msgid "Cleaning up clip"
 msgstr ""
 
-#: src/utils.c:3913
+#: src/utils.c:3874
 #, c-format
 msgid ""
 "\n"
@@ -3759,30 +3749,29 @@
 "Overwrite ?\n"
 msgstr ""
 
-#: src/utils.c:4305 src/utils.c:4337 src/multitrack.c:4503
+#: src/utils.c:4250 src/utils.c:4280 src/multitrack.c:4672
 #, c-format
 msgid "_Undo %s"
 msgstr ""
 
-#: src/utils.c:4306 src/utils.c:4338 src/multitrack.c:4525
+#: src/utils.c:4251 src/utils.c:4281 src/multitrack.c:4693
 #, c-format
 msgid "_Redo %s"
 msgstr ""
 
-#: src/utils.c:4363
+#: src/utils.c:4305
 msgid "-------------Selection------------"
 msgstr ""
 
-#. TRANSLATORS: - try to keep the text of the middle part the same length, by deleting "-" if necessary
-#: src/utils.c:4371
+#: src/utils.c:4313
 msgid " sec ] ----------Selection---------- [ "
 msgstr ""
 
-#: src/utils.c:4371
+#: src/utils.c:4314
 msgid " frames ] ----------"
 msgstr ""
 
-#: src/utils.c:5360
+#: src/utils.c:5302
 msgid ""
 "Your version of mplayer/ffmpeg may be broken !\n"
 "See http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2071\n"
@@ -3793,11 +3782,11 @@
 "Try running Help/Troubleshoot for more information."
 msgstr ""
 
-#: src/saveplay.c:178
+#: src/saveplay.c:179
 msgid "Examining file header"
 msgstr ""
 
-#: src/saveplay.c:315 src/saveplay.c:789
+#: src/saveplay.c:316 src/saveplay.c:779
 #, c-format
 msgid "Opening %s"
 msgstr ""
@@ -3807,36 +3796,36 @@
 msgid "Opening %s start time %.2f sec. frames %d"
 msgstr ""
 
-#: src/saveplay.c:326 src/saveplay.c:4001
+#: src/saveplay.c:326 src/saveplay.c:3927
 msgid " without sound"
 msgstr ""
 
-#: src/saveplay.c:396
+#: src/saveplay.c:395
 #, c-format
 msgid "Opening audio for %s"
 msgstr ""
 
-#: src/saveplay.c:557
+#: src/saveplay.c:554
 #, c-format
 msgid "Auto trimming %.2f seconds of audio at start..."
 msgstr ""
 
-#: src/saveplay.c:567
+#: src/saveplay.c:562
 #, c-format
 msgid "Auto trimming %.2f seconds of audio at end..."
 msgstr ""
 
-#: src/saveplay.c:584
+#: src/saveplay.c:577
 #, c-format
 msgid "Auto padding with %.2f seconds of silence at start..."
 msgstr ""
 
-#: src/saveplay.c:599
+#: src/saveplay.c:590
 #, c-format
 msgid "Auto padding with %.2f seconds of silence at end..."
 msgstr ""
 
-#: src/saveplay.c:671
+#: src/saveplay.c:661
 #, c-format
 msgid ""
 "\n"
@@ -3848,11 +3837,11 @@
 "Are you sure you wish to continue ?"
 msgstr ""
 
-#: src/saveplay.c:685
+#: src/saveplay.c:676
 msgid " - please be patient."
 msgstr ""
 
-#: src/saveplay.c:938
+#: src/saveplay.c:926
 msgid ""
 "\n"
 "\n"
@@ -3860,14 +3849,14 @@
 "Please check the terminal window for more details.\n"
 msgstr ""
 
-#: src/saveplay.c:940
+#: src/saveplay.c:928
 msgid ""
 "\n"
 "\n"
 "You may need to install mplayer to open this file.\n"
 msgstr ""
 
-#: src/saveplay.c:948
+#: src/saveplay.c:934
 msgid ""
 "\n"
 "\n"
@@ -3875,29 +3864,29 @@
 "Tools|Preferences|Decoding\n"
 msgstr ""
 
-#: src/saveplay.c:1014
+#: src/saveplay.c:995
 msgid "Adding image..."
 msgstr ""
 
-#: src/saveplay.c:1108
+#: src/saveplay.c:1089
 #, c-format
 msgid "Subtitles were saved as %s\n"
 msgstr ""
 
-#: src/saveplay.c:1192
+#: src/saveplay.c:1171
 #, c-format
 msgid "LiVES: Save Frame %d as..."
 msgstr ""
 
-#: src/saveplay.c:1195
+#: src/saveplay.c:1174
 msgid "LiVES: Save Frame as..."
 msgstr ""
 
-#: src/saveplay.c:1322
+#: src/saveplay.c:1303
 msgid "LiVES: Save Clip as..."
 msgstr ""
 
-#: src/saveplay.c:1390
+#: src/saveplay.c:1369
 msgid ""
 "Saving your video could lead to a loss of quality !\n"
 "You are strongly advised to 'Save As' to a new file.\n"
@@ -3905,67 +3894,67 @@
 "Do you still wish to continue ?"
 msgstr ""
 
-#: src/saveplay.c:1517 src/saveplay.c:1683 src/saveplay.c:1762
-#: src/saveplay.c:4014
+#: src/saveplay.c:1494 src/saveplay.c:1659 src/saveplay.c:1738
+#: src/saveplay.c:3940
 msgid "Pulling frames from clip"
 msgstr ""
 
-#: src/saveplay.c:1588 src/saveplay.c:1727
+#: src/saveplay.c:1565 src/saveplay.c:1703
 msgid "Linking selection"
 msgstr ""
 
-#: src/saveplay.c:1779
+#: src/saveplay.c:1755
 msgid " (with no sound)\n"
 msgstr ""
 
-#: src/saveplay.c:1786
+#: src/saveplay.c:1761
 #, c-format
 msgid "Saving frames %d to %d%s as \"%s\" : encoder = %s : format = %s..."
 msgstr ""
 
-#: src/saveplay.c:1790
+#: src/saveplay.c:1765
 #, c-format
 msgid "Saving frames 1 to %d%s as \"%s\" : encoder %s : format = %s..."
 msgstr ""
 
-#: src/saveplay.c:1909
+#: src/saveplay.c:1890
 msgid "Saving [can take a long time]"
 msgstr ""
 
-#: src/saveplay.c:2057
+#: src/saveplay.c:2044
 msgid ""
 "\n"
 "\n"
 "Encoder error - output file was not created !\n"
 msgstr ""
 
-#: src/saveplay.c:2094
+#: src/saveplay.c:2081
 msgid "Clearing letterbox"
 msgstr ""
 
-#: src/saveplay.c:2183
+#: src/saveplay.c:2168
 #, c-format
 msgid "File size was %s\n"
 msgstr ""
 
-#: src/saveplay.c:2284
+#: src/saveplay.c:2265
 msgid "recording aborted by preview.\n"
 msgstr ""
 
-#: src/saveplay.c:2288
+#: src/saveplay.c:2268
 msgid "recording aborted by clipboard playback.\n"
 msgstr ""
 
-#: src/saveplay.c:2291
+#: src/saveplay.c:2270
 msgid "Recording performance..."
 msgstr ""
 
-#: src/saveplay.c:3293
+#: src/saveplay.c:3251
 #, c-format
 msgid "Average FPS was %.4f\n"
 msgstr ""
 
-#: src/saveplay.c:3299
+#: src/saveplay.c:3256
 msgid ""
 "\n"
 "\n"
@@ -3974,16 +3963,21 @@
 "and resize all frames to the current size.\n"
 msgstr ""
 
-#: src/saveplay.c:3479
+#: src/saveplay.c:3429
 msgid "Unknown"
 msgstr ""
 
-#: src/saveplay.c:3588 src/saveplay.c:4585
+#: src/saveplay.c:3538 src/saveplay.c:4502
 #, c-format
 msgid "Untitled%d"
 msgstr ""
 
-#: src/saveplay.c:3633
+#: src/saveplay.c:3567
+#, c-format
+msgid "%d frames are enough !\n"
+msgstr ""
+
+#: src/saveplay.c:3579
 #, c-format
 msgid ""
 "\n"
@@ -3991,7 +3985,7 @@
 "Bad things may happen with this clip.\n"
 msgstr ""
 
-#: src/saveplay.c:3723
+#: src/saveplay.c:3667
 #, c-format
 msgid ""
 "\n"
@@ -3999,73 +3993,73 @@
 "Default can be set in Tools | Preferences | Misc.\n"
 msgstr ""
 
-#: src/saveplay.c:3735
+#: src/saveplay.c:3677
 #, c-format
 msgid "Playback speed was adjusted to %.3f frames per second to fit audio.\n"
 msgstr ""
 
-#: src/saveplay.c:3754
+#: src/saveplay.c:3694
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d *bpp=Greyscale* fps=%.3f\n"
 "Audio:"
 msgstr ""
 
-#: src/saveplay.c:3758 src/saveplay.c:4762
+#: src/saveplay.c:3698 src/saveplay.c:4671
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d bpp=%d fps=%.3f\n"
 "Audio:"
 msgstr ""
 
-#: src/saveplay.c:3762 src/saveplay.c:4766
+#: src/saveplay.c:3703 src/saveplay.c:4676
 #, c-format
 msgid "%s none\n"
 msgstr ""
 
-#: src/saveplay.c:3774
+#: src/saveplay.c:3714
 #, fuzzy, c-format
 msgid " - Author: %s\n"
 msgstr "Forfatter: %s"
 
-#: src/saveplay.c:3779
+#: src/saveplay.c:3717
 #, c-format
 msgid " - Title: %s\n"
 msgstr ""
 
-#: src/saveplay.c:3784
+#: src/saveplay.c:3720
 #, c-format
 msgid " - Comment: %s\n"
 msgstr ""
 
-#: src/saveplay.c:3897
+#: src/saveplay.c:3829
 #, c-format
 msgid "Saving frame %d as %s..."
 msgstr ""
 
-#: src/saveplay.c:3996
+#: src/saveplay.c:3924
 #, c-format
 msgid "Backing up %s to %s"
 msgstr ""
 
-#: src/saveplay.c:4049
+#: src/saveplay.c:3975
 msgid "Backing up"
 msgstr ""
 
-#: src/saveplay.c:4083
+#: src/saveplay.c:4009
 msgid "performance data was backed up..."
 msgstr ""
 
-#: src/saveplay.c:4661
+#: src/saveplay.c:4574
 #, c-format
 msgid "Restoring %s..."
 msgstr ""
 
-#: src/saveplay.c:4692
+#: src/saveplay.c:4603
 msgid "Restoring"
 msgstr ""
 
-#: src/saveplay.c:4714
+#: src/saveplay.c:4625
 #, c-format
 msgid ""
 "\n"
@@ -4075,22 +4069,22 @@
 msgstr ""
 
 #. TRANSLATORS: rec(ord) %.2f M(ega)B(ytes)
-#: src/saveplay.c:5207
+#: src/saveplay.c:5118
 #, c-format
 msgid "rec %.2f MB"
 msgstr ""
 
-#: src/saveplay.c:5213
+#: src/saveplay.c:5123
 #, c-format
 msgid "!rec %.2f MB"
 msgstr ""
 
 #. TRANSLATORS: rec(ord) ?? M(ega)B(ytes)
-#: src/saveplay.c:5216
+#: src/saveplay.c:5126
 msgid "rec ?? MB"
 msgstr ""
 
-#: src/saveplay.c:5241
+#: src/saveplay.c:5151
 #, c-format
 msgid ""
 "\n"
@@ -4098,54 +4092,74 @@
 "Record stop level can be set in Preferences.\n"
 msgstr ""
 
-#: src/saveplay.c:5535
+#: src/saveplay.c:5447
 msgid ""
 "\n"
 "Files from a previous run of LiVES were found.\n"
 "Do you want to attempt to recover them ?\n"
 msgstr ""
 
-#: src/saveplay.c:5557
+#: src/saveplay.c:5469
 msgid "Recovering files"
 msgstr ""
 
-#: src/saveplay.c:5560
+#: src/saveplay.c:5472
 msgid "Recovering files..."
 msgstr ""
 
-#: src/dialogs.c:72
+#: src/dialogs.c:71
 msgid "Show affected _layouts"
 msgstr ""
 
-#: src/dialogs.c:128
+#: src/dialogs.c:113
+msgid ""
+"Do _not show this warning any more\n"
+"(can be turned back on from Preferences/Warnings)"
+msgstr ""
+
+#: src/dialogs.c:127
 msgid "_Recover disk space"
 msgstr ""
 
-#: src/dialogs.c:143
+#: src/dialogs.c:142
 msgid " _Advanced Settings >>"
 msgstr ""
 
-#: src/dialogs.c:184
+#: src/dialogs.c:183 src/dialogs.c:221
 msgid "LiVES: - Warning !"
 msgstr ""
 
 #: src/dialogs.c:194
+#, fuzzy
+msgid "LiVES: - Error !"
+msgstr "LiVES: - Indstillinger"
+
+#: src/dialogs.c:204
+#, fuzzy
+msgid "LiVES: - Information"
+msgstr "LiVES: Information for %s"
+
+#: src/dialogs.c:230
 msgid "LiVES: - Question"
 msgstr ""
 
-#: src/dialogs.c:204
+#: src/dialogs.c:239
 msgid "LiVES: - File Error"
 msgstr ""
 
-#: src/dialogs.c:208
+#: src/dialogs.c:241
 msgid "_Abort"
 msgstr ""
 
-#: src/dialogs.c:213
+#: src/dialogs.c:246
 msgid "_Retry"
 msgstr ""
 
-#: src/dialogs.c:597
+#: src/dialogs.c:306
+msgid "Show _Details"
+msgstr "Vis _detaljer"
+
+#: src/dialogs.c:657
 #, c-format
 msgid ""
 "FREE SPACE IN THE PARTITION CONTAINING\n"
@@ -4156,7 +4170,7 @@
 "(Disk warning levels can be configured in Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:615
+#: src/dialogs.c:676
 #, c-format
 msgid ""
 "Free space in the partition containing\n"
@@ -4168,11 +4182,11 @@
 "Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:627
+#: src/dialogs.c:688
 msgid "Audio players cannot be switched during playback."
 msgstr ""
 
-#: src/dialogs.c:632
+#: src/dialogs.c:694
 msgid ""
 "\n"
 "\n"
@@ -4180,46 +4194,46 @@
 "Please try closing some other applications first.\n"
 msgstr ""
 
-#: src/dialogs.c:752
+#: src/dialogs.c:820
 msgid "Processing has been paused."
 msgstr ""
 
-#: src/dialogs.c:937
+#: src/dialogs.c:1002
 #, c-format
 msgid ""
 "\n"
 "%s%d%% done. Time remaining: %u sec%s\n"
 msgstr ""
 
-#: src/dialogs.c:1335
+#: src/dialogs.c:1391
 #, c-format
 msgid ""
 "\n"
 "%d/%d frames opened. Time remaining %u sec.\n"
 msgstr ""
 
-#: src/dialogs.c:1337
+#: src/dialogs.c:1393
 #, c-format
 msgid ""
 "\n"
 "%d/%d frames opened.\n"
 msgstr ""
 
-#: src/dialogs.c:1341
+#: src/dialogs.c:1396
 #, c-format
 msgid ""
 "\n"
 "%d frames opened.\n"
 msgstr ""
 
-#: src/dialogs.c:1940
+#: src/dialogs.c:1993
 #, c-format
 msgid ""
 "\n"
 "Time remaining: %d sec"
 msgstr ""
 
-#: src/dialogs.c:1988
+#: src/dialogs.c:2040
 #, c-format
 msgid ""
 "\n"
@@ -4227,7 +4241,7 @@
 "Please close a file and then try again."
 msgstr ""
 
-#: src/dialogs.c:1994
+#: src/dialogs.c:2047
 #, c-format
 msgid ""
 "LiVES was unable to write to its temporary directory.\n"
@@ -4239,27 +4253,27 @@
 "Please make sure you can write to this directory."
 msgstr ""
 
-#: src/dialogs.c:2005
+#: src/dialogs.c:2059
 msgid ""
 "\n"
 "LiVES currently requires either 'mplayer', 'mplayer2', or 'sox' to function. "
 "Please install one or other of these, and try again.\n"
 msgstr ""
 
-#: src/dialogs.c:2010
+#: src/dialogs.c:2064
 msgid ""
 "Audio was not loaded; please install mplayer or mplayer2 if you expected "
 "audio for this clip.\n"
 msgstr ""
 
-#: src/dialogs.c:2014
+#: src/dialogs.c:2069
 msgid ""
 "Audio resampling is required for this format.\n"
 "Please install 'sox'\n"
 "Or switch to another encoder format in Tools | Preferences | Encoding\n"
 msgstr ""
 
-#: src/dialogs.c:2019
+#: src/dialogs.c:2075
 msgid ""
 "\n"
 "\n"
@@ -4267,19 +4281,19 @@
 "Please set the audio codec in Tools|Preferences|Encoding\n"
 msgstr ""
 
-#: src/dialogs.c:2024
+#: src/dialogs.c:2080
 msgid ""
 "This layout includes generated frames.\n"
 "It cannot be saved, you must render it to a clip first.\n"
 msgstr ""
 
-#: src/dialogs.c:2029
+#: src/dialogs.c:2085
 msgid ""
 "This layout includes generated or recorded audio.\n"
 "It cannot be saved, you must render it to a clip first.\n"
 msgstr ""
 
-#: src/dialogs.c:2039 src/dialogs.c:2137
+#: src/dialogs.c:2095 src/dialogs.c:2189
 #, c-format
 msgid ""
 "\n"
@@ -4287,83 +4301,83 @@
 "Due to restrictions in the %s format\n"
 msgstr ""
 
-#: src/dialogs.c:2059
+#: src/dialogs.c:2115
 msgid ""
 "LiVES recommends the following settings:\n"
 "\n"
 msgstr ""
 
-#: src/dialogs.c:2065 src/dialogs.c:2174 src/resample.c:850
+#: src/dialogs.c:2121 src/dialogs.c:2225 src/resample.c:839
 msgid ", signed"
 msgstr ""
 
-#: src/dialogs.c:2066 src/dialogs.c:2175 src/resample.c:853
+#: src/dialogs.c:2122 src/dialogs.c:2226 src/resample.c:841
 msgid ", unsigned"
 msgstr ""
 
-#: src/dialogs.c:2070 src/dialogs.c:2179 src/resample.c:858
+#: src/dialogs.c:2126 src/dialogs.c:2230 src/resample.c:846
 msgid ", little-endian"
 msgstr ""
 
-#: src/dialogs.c:2071 src/dialogs.c:2180 src/resample.c:861
+#: src/dialogs.c:2127 src/dialogs.c:2231 src/resample.c:848
 msgid ", big-endian"
 msgstr ""
 
-#: src/dialogs.c:2077
+#: src/dialogs.c:2132
 #, c-format
 msgid "Use an audio rate of %d Hz%s%s\n"
 msgstr ""
 
-#: src/dialogs.c:2085
+#: src/dialogs.c:2140
 #, c-format
 msgid "Set video rate to %.3f frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:2089
+#: src/dialogs.c:2143
 #, c-format
 msgid "Set video rate to %d:%d frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:2094 src/dialogs.c:2209
+#: src/dialogs.c:2148 src/dialogs.c:2258
 #, c-format
 msgid "Set video size to %d x %d pixels\n"
 msgstr ""
 
-#: src/dialogs.c:2102 src/dialogs.c:2208
+#: src/dialogs.c:2156 src/dialogs.c:2257
 msgid ""
 "\n"
 "You may wish to:\n"
 msgstr ""
 
-#: src/dialogs.c:2105 src/dialogs.c:2200
+#: src/dialogs.c:2159 src/dialogs.c:2249
 #, c-format
 msgid "resize video to %d x %d pixels\n"
 msgstr ""
 
-#: src/dialogs.c:2110
+#: src/dialogs.c:2163
 msgid "disable audio, since the target encoder cannot encode audio\n"
 msgstr ""
 
-#: src/dialogs.c:2170
+#: src/dialogs.c:2221
 msgid "LiVES must:\n"
 msgstr ""
 
-#: src/dialogs.c:2185
+#: src/dialogs.c:2235
 #, c-format
 msgid "resample audio to %d Hz%s%s\n"
 msgstr ""
 
-#: src/dialogs.c:2192
+#: src/dialogs.c:2242
 #, c-format
 msgid "resample video to %.3f frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:2196
+#: src/dialogs.c:2245
 #, c-format
 msgid "resample video to %d:%d frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:2215
+#: src/dialogs.c:2263
 msgid ""
 "\n"
 "You will be able to undo these changes afterwards.\n"
@@ -4372,14 +4386,14 @@
 "\n"
 msgstr ""
 
-#: src/dialogs.c:2218
+#: src/dialogs.c:2265
 msgid ""
 "\n"
 "Changes applied to the selection will not be permanent.\n"
 "\n"
 msgstr ""
 
-#: src/dialogs.c:2237
+#: src/dialogs.c:2285
 msgid ""
 "\n"
 "\n"
@@ -4388,7 +4402,7 @@
 "Try recording for just a selection of the file."
 msgstr ""
 
-#: src/dialogs.c:2244
+#: src/dialogs.c:2293
 msgid ""
 "The playback speed (fps), or the audio rate\n"
 " of the clipboard does not match\n"
@@ -4399,7 +4413,7 @@
 "Please press Cancel to abort the insert, or OK to continue."
 msgstr ""
 
-#: src/dialogs.c:2253
+#: src/dialogs.c:2304
 #, c-format
 msgid ""
 "When opening a yuvmpeg stream, you should first create a fifo file in:\n"
@@ -4412,11 +4426,11 @@
 "click Cancel."
 msgstr ""
 
-#: src/dialogs.c:2305
+#: src/dialogs.c:2356
 msgid "Show Keys"
 msgstr ""
 
-#: src/dialogs.c:2306
+#: src/dialogs.c:2358
 msgid ""
 "You can use the following keys during playback to control LiVES:-\n"
 "\n"
@@ -4458,11 +4472,11 @@
 "g                             ping pong loops\n"
 msgstr ""
 
-#: src/dialogs.c:2313
+#: src/dialogs.c:2365
 msgid "Multitrack Keys"
 msgstr ""
 
-#: src/dialogs.c:2314
+#: src/dialogs.c:2367
 msgid ""
 "You can use the following keys to control the multitrack window:-\n"
 "\n"
@@ -4484,18 +4498,18 @@
 "For other keys, see the menus.\n"
 msgstr ""
 
-#: src/dialogs.c:2322
+#: src/dialogs.c:2375
 msgid "Message History"
 msgstr ""
 
-#: src/dialogs.c:2335
+#: src/dialogs.c:2388
 #, c-format
 msgid ""
 "After upgrading/installing, you may need to adjust the <prefix_dir> setting "
 "in your %s file"
 msgstr ""
 
-#: src/dialogs.c:2344
+#: src/dialogs.c:2399
 #, c-format
 msgid ""
 "\n"
@@ -4506,25 +4520,25 @@
 "or change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/dialogs.c:2352
+#: src/dialogs.c:2408
 msgid ""
 "Sorry, unknown audio type.\n"
 "\n"
 " (Filenames must end in .mp3, .ogg, .wav, .mod, .xm or .it)"
 msgstr ""
 
-#: src/dialogs.c:2353
+#: src/dialogs.c:2409
 msgid "failed (unknown type)\n"
 msgstr ""
 
-#: src/dialogs.c:2358
+#: src/dialogs.c:2415
 msgid ""
 "\n"
 "Do you wish to remove the layout files associated with this set ?\n"
 "(They will not be usable without the set).\n"
 msgstr ""
 
-#: src/dialogs.c:2363
+#: src/dialogs.c:2421
 #, c-format
 msgid ""
 "\n"
@@ -4533,7 +4547,7 @@
 "Click Cancel to pick a new name.\n"
 msgstr ""
 
-#: src/dialogs.c:2370
+#: src/dialogs.c:2429
 msgid ""
 "\n"
 "Frames from this clip are used in some multitrack layouts.\n"
@@ -4541,7 +4555,7 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2374
+#: src/dialogs.c:2433
 msgid ""
 "\n"
 "Audio from this clip is used in some multitrack layouts.\n"
@@ -4549,7 +4563,7 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2378
+#: src/dialogs.c:2438
 #, c-format
 msgid ""
 "\n"
@@ -4560,7 +4574,7 @@
 "Otherwise click Cancel to skip loading this file.\n"
 msgstr ""
 
-#: src/dialogs.c:2385
+#: src/dialogs.c:2446
 #, c-format
 msgid ""
 "\n"
@@ -4570,7 +4584,7 @@
 "The clip could not be loaded.\n"
 msgstr ""
 
-#: src/dialogs.c:2392
+#: src/dialogs.c:2455
 msgid ""
 "\n"
 "Dear user, the jack developers decided to remove the -Z option from jackd.\n"
@@ -4578,7 +4592,7 @@
 "Alternately, select a different audio player in Preferences.\n"
 msgstr ""
 
-#: src/dialogs.c:2396
+#: src/dialogs.c:2460
 msgid ""
 "\n"
 "Unable to start up jack. Please ensure that alsa is set up correctly on your "
@@ -4587,13 +4601,13 @@
 "Automatic jack startup will be disabled now.\n"
 msgstr ""
 
-#: src/dialogs.c:2402
+#: src/dialogs.c:2466
 msgid ""
 "\n"
 "Unable to connect to jack server. Please start jack before starting LiVES\n"
 msgstr ""
 
-#: src/dialogs.c:2411
+#: src/dialogs.c:2475
 #, c-format
 msgid ""
 "\n"
@@ -4604,13 +4618,13 @@
 "%s\n"
 msgstr ""
 
-#: src/dialogs.c:2418
+#: src/dialogs.c:2482
 msgid ""
 "\n"
 "Alternately, you can restart LiVES and select another audio player.\n"
 msgstr ""
 
-#: src/dialogs.c:2423
+#: src/dialogs.c:2488
 #, c-format
 msgid ""
 "\n"
@@ -4620,7 +4634,7 @@
 "It is recommended to increase it to at least %d MB"
 msgstr ""
 
-#: src/dialogs.c:2429
+#: src/dialogs.c:2496
 #, c-format
 msgid ""
 "\n"
@@ -4629,7 +4643,7 @@
 "Do you wish to delete them ?\n"
 msgstr ""
 
-#: src/dialogs.c:2436
+#: src/dialogs.c:2504
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for multitrack undo.\n"
@@ -4637,7 +4651,7 @@
 "using Preferences/Multitrack/Undo Memory\n"
 msgstr ""
 
-#: src/dialogs.c:2440
+#: src/dialogs.c:2508
 msgid ""
 "\n"
 "Out of memory for undo.\n"
@@ -4645,63 +4659,63 @@
 "using Preferences/Multitrack/Undo Memory\n"
 msgstr ""
 
-#: src/dialogs.c:2444
+#: src/dialogs.c:2512
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for the multitrack undo buffer.\n"
 msgstr ""
 
-#: src/dialogs.c:2446
+#: src/dialogs.c:2514
 msgid "or enter a smaller value.\n"
 msgstr ""
 
-#: src/dialogs.c:2448
+#: src/dialogs.c:2516
 msgid "Try again from the clip editor, try closing some other applications\n"
 msgstr ""
 
-#: src/dialogs.c:2449
+#: src/dialogs.c:2517
 msgid "Try closing some other applications\n"
 msgstr ""
 
-#: src/dialogs.c:2460
+#: src/dialogs.c:2529
 msgid ""
 "Multitrack is set to 0 audio channels, but this layout has audio.\n"
 "You should adjust the audio settings from the Tools menu.\n"
 msgstr ""
 
-#: src/dialogs.c:2464
+#: src/dialogs.c:2534
 msgid ""
 "The current layout has audio, so audio channels may not be set to zero.\n"
 msgstr ""
 
-#: src/dialogs.c:2468
+#: src/dialogs.c:2539
 msgid ""
 "Multitrack audio preview is only available with the\n"
 "\"jack\" or \"pulse audio\" audio player.\n"
 "You can set this in Tools|Preferences|Playback."
 msgstr ""
 
-#: src/dialogs.c:2472
+#: src/dialogs.c:2545
 msgid ""
 "Errors were detected in the layout (which may be due to transferring from "
 "another system, or from an older version of LiVES).\n"
 "Should I try to repair the disk copy of the layout ?\n"
 msgstr ""
 
-#: src/dialogs.c:2476
+#: src/dialogs.c:2549
 msgid ""
 "LiVES was unable to load the layout.\n"
 "Sorry.\n"
 msgstr ""
 
-#: src/dialogs.c:2482
+#: src/dialogs.c:2555
 msgid ""
 "\n"
 "\n"
 "Audio rate must be greater than 0.\n"
 msgstr ""
 
-#: src/dialogs.c:2486
+#: src/dialogs.c:2559
 msgid ""
 "\n"
 "Event list will be very large\n"
@@ -4709,14 +4723,14 @@
 "Are you sure you wish to view it ?\n"
 msgstr ""
 
-#: src/dialogs.c:2491
+#: src/dialogs.c:2564
 msgid ""
 "\n"
 "\n"
 "You must install 'dvgrab' to use this function.\n"
 msgstr ""
 
-#: src/dialogs.c:2496
+#: src/dialogs.c:2570
 msgid ""
 "\n"
 "\n"
@@ -4725,25 +4739,25 @@
 "You may need to select one of these in Tools/Preferences/Playback.\n"
 msgstr ""
 
-#: src/dialogs.c:2500
+#: src/dialogs.c:2574
 msgid "Video playback plugin failed to initialise palette !\n"
 msgstr ""
 
-#: src/dialogs.c:2504
+#: src/dialogs.c:2579
 msgid "Decoder plugin failed to initialise palette !\n"
 msgstr ""
 
-#: src/dialogs.c:2509
+#: src/dialogs.c:2584
 msgid "Unable to set framerate of video plugin\n"
 msgstr ""
 
-#: src/dialogs.c:2514
+#: src/dialogs.c:2590
 msgid ""
 "After a crash, it is advisable to clean up the disk with\n"
 "File|Clean up disk space\n"
 msgstr ""
 
-#: src/dialogs.c:2526
+#: src/dialogs.c:2604
 #, c-format
 msgid ""
 "Stream frame size is too large for your network buffers.\n"
@@ -4752,33 +4766,33 @@
 "echo %d > /proc/sys/net/core/rmem_max\n"
 msgstr ""
 
-#: src/dialogs.c:2714
+#: src/dialogs.c:2800
 msgid "cancelled.\n"
 msgstr ""
 
-#: src/dialogs.c:2721
+#: src/dialogs.c:2805
 msgid "failed.\n"
 msgstr ""
 
-#: src/dialogs.c:2728
+#: src/dialogs.c:2810
 msgid "done.\n"
 msgstr ""
 
-#: src/dialogs.c:2732
+#: src/dialogs.c:2814
 msgid "error in file. Failed.\n"
 msgstr ""
 
-#: src/dialogs.c:2766 src/dialogs.c:2815 src/dialogs.c:2839
+#: src/dialogs.c:2848 src/dialogs.c:2897 src/dialogs.c:2921
 #, c-format
 msgid "Additional info: %s\n"
 msgstr ""
 
-#: src/dialogs.c:2769
+#: src/dialogs.c:2851
 #, c-format
 msgid "The error value was %d%s\n"
 msgstr ""
 
-#: src/dialogs.c:2772
+#: src/dialogs.c:2854
 #, c-format
 msgid ""
 "\n"
@@ -4788,7 +4802,7 @@
 "%s%s%s"
 msgstr ""
 
-#: src/dialogs.c:2818
+#: src/dialogs.c:2900
 #, c-format
 msgid ""
 "\n"
@@ -4798,7 +4812,7 @@
 "%s"
 msgstr ""
 
-#: src/dialogs.c:2842
+#: src/dialogs.c:2924
 #, c-format
 msgid ""
 "\n"
@@ -4808,7 +4822,7 @@
 "%s"
 msgstr ""
 
-#: src/dialogs.c:2886
+#: src/dialogs.c:2968
 #, c-format
 msgid ""
 "\n"
@@ -4817,7 +4831,7 @@
 "Please check for possible error causes.\n"
 msgstr ""
 
-#: src/dialogs.c:2890
+#: src/dialogs.c:2971
 #, c-format
 msgid ""
 "\n"
@@ -4827,7 +4841,7 @@
 "%s.\n"
 msgstr ""
 
-#: src/dialogs.c:2921
+#: src/dialogs.c:3002
 #, c-format
 msgid ""
 "\n"
@@ -4836,7 +4850,7 @@
 "Please check for possible error causes.\n"
 msgstr ""
 
-#: src/dialogs.c:2925
+#: src/dialogs.c:3005
 #, c-format
 msgid ""
 "\n"
@@ -4846,12 +4860,12 @@
 "%s.\n"
 msgstr ""
 
-#: src/dialogs.c:2993
+#: src/dialogs.c:3073
 #, c-format
 msgid "Value for \"%s\" could not be read."
 msgstr ""
 
-#: src/dialogs.c:3011
+#: src/dialogs.c:3091
 #, c-format
 msgid ""
 "\n"
@@ -4860,7 +4874,7 @@
 "Please check your system for errors.\n"
 msgstr ""
 
-#: src/dialogs.c:3020
+#: src/dialogs.c:3100
 #, c-format
 msgid ""
 "\n"
@@ -4869,7 +4883,7 @@
 "Please check the file permissions and try again."
 msgstr ""
 
-#: src/dialogs.c:3027
+#: src/dialogs.c:3109
 #, c-format
 msgid ""
 "\n"
@@ -4878,7 +4892,7 @@
 "Please check the directory permissions and try again."
 msgstr ""
 
-#: src/dialogs.c:3034
+#: src/dialogs.c:3116
 #, c-format
 msgid ""
 "\n"
@@ -4886,14 +4900,14 @@
 "%s\n"
 msgstr ""
 
-#: src/dialogs.c:3041
+#: src/dialogs.c:3123
 msgid ""
 "\n"
 "Abort and exit immediately from LiVES\n"
 "Are you sure ?\n"
 msgstr ""
 
-#: src/dialogs.c:3047
+#: src/dialogs.c:3129
 #, c-format
 msgid ""
 "\n"
@@ -4901,13 +4915,13 @@
 "Please select another encoder from the list.\n"
 msgstr ""
 
-#: src/dialogs.c:3056
+#: src/dialogs.c:3139
 msgid ""
 "\n"
 "This card is already in use and cannot be opened multiple times.\n"
 msgstr ""
 
-#: src/dialogs.c:3061
+#: src/dialogs.c:3145
 #, c-format
 msgid ""
 "\n"
@@ -4917,27 +4931,27 @@
 "- Check if the device actually exists.\n"
 msgstr ""
 
-#: src/dialogs.c:3068
+#: src/dialogs.c:3153
 msgid ""
 "\n"
 "This file already has subtitles loaded.\n"
 "Do you wish to overwrite the existing subtitles ?\n"
 msgstr ""
 
-#: src/dialogs.c:3072
+#: src/dialogs.c:3157
 msgid ""
 "\n"
 "LiVES currently only supports subtitles of type .srt and .sub.\n"
 msgstr ""
 
-#: src/dialogs.c:3076
+#: src/dialogs.c:3161
 msgid ""
 "\n"
 "Erase all subtitles from this clip.\n"
 "Are you sure ?\n"
 msgstr ""
 
-#: src/dialogs.c:3082
+#: src/dialogs.c:3168
 #, c-format
 msgid ""
 "\n"
@@ -4946,14 +4960,14 @@
 "or OK to continue and save as type \"%s\"\n"
 msgstr ""
 
-#: src/dialogs.c:3089
+#: src/dialogs.c:3176
 msgid ""
 "\n"
 "Do you wish to move the current clip sets to the new directory ?\n"
 "(If unsure, click Yes)\n"
 msgstr ""
 
-#: src/dialogs.c:3093
+#: src/dialogs.c:3181
 #, c-format
 msgid ""
 "\n"
@@ -4964,19 +4978,19 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:3099
+#: src/dialogs.c:3188
 msgid ""
 "\n"
 "No video input devices could be found.\n"
 msgstr ""
 
-#: src/dialogs.c:3103
+#: src/dialogs.c:3192
 msgid ""
 "\n"
 "All video input devices are already in use.\n"
 msgstr ""
 
-#: src/dialogs.c:3107
+#: src/dialogs.c:3196
 msgid ""
 "\n"
 "\n"
@@ -4984,15 +4998,14 @@
 "DO NOT SHUT DOWN OR CLOSE LIVES !\n"
 msgstr ""
 
-#: src/dialogs.c:3127
+#: src/dialogs.c:3203
 #, c-format
 msgid ""
 "No clips were recovered for set (%s).\n"
 "Please check the spelling of the set name and try again.\n"
 msgstr ""
 
-#. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:3136
+#: src/dialogs.c:3214
 #, c-format
 msgid ""
 "\n"
@@ -5004,7 +5017,7 @@
 msgstr ""
 
 #. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:3144
+#: src/dialogs.c:3222
 #, c-format
 msgid ""
 "\n"
@@ -5013,34 +5026,34 @@
 "\n"
 msgstr ""
 
-#: src/dialogs.c:3150
+#: src/dialogs.c:3228
 msgid ""
 "\n"
 "You must have autolives.pl installed and in your path to use this toy.\n"
 "Consult your package distributor.\n"
 msgstr ""
 
-#: src/dialogs.c:3154
+#: src/dialogs.c:3232
 msgid ""
 "\n"
 "You must have a minimum of one clip loaded to use this toy.\n"
 msgstr ""
 
-#: src/dialogs.c:3158
+#: src/dialogs.c:3236
 msgid ""
 "\n"
 "LiVES lost its connection to jack and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:3162
+#: src/dialogs.c:3240
 msgid ""
 "\n"
 "LiVES lost its connection to pulseaudio and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:3175
+#: src/dialogs.c:3254
 #, c-format
 msgid ""
 "\n"
@@ -5049,544 +5062,544 @@
 "Do you wish to allow this (for this session only) ?\n"
 msgstr ""
 
-#: src/effects.c:60
+#: src/effects.c:61
 msgid "generator"
 msgstr ""
 
-#: src/effects.c:61
+#: src/effects.c:62
 msgid "Generators"
 msgstr ""
 
-#: src/effects.c:63
+#: src/effects.c:64
 msgid "audio generator"
 msgstr ""
 
-#: src/effects.c:64
+#: src/effects.c:65
 msgid "Audio Generators"
 msgstr ""
 
-#: src/effects.c:66
+#: src/effects.c:67
 msgid "audio/video generator"
 msgstr ""
 
-#: src/effects.c:67
+#: src/effects.c:68
 msgid "Audio/Video Generators"
 msgstr ""
 
-#: src/effects.c:69
+#: src/effects.c:70
 msgid "data generator"
 msgstr ""
 
-#: src/effects.c:70
+#: src/effects.c:71
 msgid "Data Generators"
 msgstr ""
 
-#: src/effects.c:72
+#: src/effects.c:73
 msgid "data visualiser"
 msgstr ""
 
-#: src/effects.c:73
+#: src/effects.c:74
 msgid "Data Visualisers"
 msgstr ""
 
-#: src/effects.c:75
+#: src/effects.c:76
 msgid "data processor"
 msgstr ""
 
-#: src/effects.c:76
+#: src/effects.c:77
 msgid "Data Processors"
 msgstr ""
 
-#: src/effects.c:78
+#: src/effects.c:79
 msgid "data source"
 msgstr ""
 
-#: src/effects.c:79
+#: src/effects.c:80
 msgid "Data Sources"
 msgstr ""
 
-#: src/effects.c:81
+#: src/effects.c:82
 msgid "transition"
 msgstr "overgange"
 
-#: src/effects.c:82
+#: src/effects.c:83
 msgid "Transitions"
 msgstr "Overgange"
 
-#: src/effects.c:84
+#: src/effects.c:85
 msgid "effect"
 msgstr "effekt"
 
-#: src/effects.c:87 src/rfx-builder.c:187
+#: src/effects.c:88 src/rfx-builder.c:187
 msgid "utility"
 msgstr ""
 
-#: src/effects.c:88
+#: src/effects.c:89
 msgid "Utilities"
 msgstr ""
 
-#: src/effects.c:90
+#: src/effects.c:91
 msgid "compositor"
 msgstr ""
 
-#: src/effects.c:91
+#: src/effects.c:92
 msgid "Compositors"
 msgstr ""
 
-#: src/effects.c:93
+#: src/effects.c:94
 msgid "tap"
 msgstr ""
 
-#: src/effects.c:94
+#: src/effects.c:95
 msgid "Taps"
 msgstr ""
 
-#: src/effects.c:96
+#: src/effects.c:97
 msgid "splitter"
 msgstr "opdeler"
 
-#: src/effects.c:97
+#: src/effects.c:98
 msgid "Splitters"
 msgstr "Opdelere"
 
-#: src/effects.c:99
+#: src/effects.c:100
 msgid "converter"
 msgstr ""
 
-#: src/effects.c:100
+#: src/effects.c:101
 msgid "Converters"
 msgstr ""
 
-#: src/effects.c:102
+#: src/effects.c:103
 msgid "analyser"
 msgstr ""
 
-#: src/effects.c:103
+#: src/effects.c:104
 msgid "Analysers"
 msgstr ""
 
-#: src/effects.c:108
+#: src/effects.c:109
 msgid "audio/video"
 msgstr "lyd/video"
 
-#: src/effects.c:109
+#: src/effects.c:110
 msgid "Audio/Video Transitions"
 msgstr ""
 
-#: src/effects.c:111
+#: src/effects.c:112
 msgid "video only"
 msgstr "kun video"
 
-#: src/effects.c:112
+#: src/effects.c:113
 msgid "Video only Transitions"
 msgstr ""
 
-#: src/effects.c:114 src/multitrack.c:10740
+#: src/effects.c:115 src/multitrack.c:10962
 msgid "audio only"
 msgstr "kun lyd"
 
-#: src/effects.c:115
+#: src/effects.c:116
 msgid "Audio only Transitions"
 msgstr ""
 
-#: src/effects.c:117 src/effects.c:120 src/multitrack.c:18757
+#: src/effects.c:118 src/effects.c:121 src/multitrack.c:19097
 msgid "audio"
 msgstr "lyd"
 
-#: src/effects.c:118
+#: src/effects.c:119
 msgid "Audio Mixers"
 msgstr "Lydmiksere"
 
-#: src/effects.c:121
+#: src/effects.c:122
 msgid "Audio Effects"
 msgstr "Lydeffekter"
 
-#: src/effects.c:123
+#: src/effects.c:124
 msgid "video"
 msgstr ""
 
-#: src/effects.c:124
+#: src/effects.c:125
 msgid "Video Effects"
 msgstr ""
 
-#: src/effects.c:126
+#: src/effects.c:127
 msgid "audio volume controller"
 msgstr "lydstyrke kontrol"
 
-#: src/effects.c:127
+#: src/effects.c:128
 msgid "Audio Volume Controllers"
 msgstr "Lydstyrke kontrol"
 
-#: src/effects.c:129
+#: src/effects.c:130
 msgid "video analyser"
 msgstr ""
 
-#: src/effects.c:130
+#: src/effects.c:131
 msgid "Video analysers"
 msgstr ""
 
-#: src/effects.c:132
+#: src/effects.c:133
 msgid "audio analyser"
 msgstr ""
 
-#: src/effects.c:133
+#: src/effects.c:134
 msgid "Audio Analysers"
 msgstr ""
 
-#: src/effects.c:137 src/plugins.c:2559 src/plugins.c:2573
+#: src/effects.c:138 src/plugins.c:2507 src/plugins.c:2521
 msgid "unknown"
 msgstr "ukendt"
 
-#: src/effects.c:238
+#: src/effects.c:235
 #, c-format
 msgid "%s all frames..."
 msgstr ""
 
-#: src/effects.c:243
+#: src/effects.c:239
 #, c-format
 msgid "%s clipboard into frames %d to %d..."
 msgstr ""
 
-#: src/effects.c:250
+#: src/effects.c:245
 #, c-format
 msgid "%s to clipboard..."
 msgstr ""
 
-#: src/effects.c:254
+#: src/effects.c:248
 #, c-format
 msgid "%s to new clip..."
 msgstr ""
 
-#: src/effects.c:259
+#: src/effects.c:252
 #, c-format
 msgid "%s frames %d to %d..."
 msgstr ""
 
-#: src/effects.c:290
+#: src/effects.c:283
 #, c-format
 msgid "%s clipboard with selection"
 msgstr ""
 
-#: src/effects.c:295
+#: src/effects.c:287
 #, c-format
 msgid "%s to clipboard"
 msgstr ""
 
-#: src/effects.c:299
+#: src/effects.c:290
 #, c-format
 msgid "%s to new clip"
 msgstr ""
 
-#: src/effects.c:304
+#: src/effects.c:294
 #, c-format
 msgid "%s frames %d to %d"
 msgstr ""
 
-#: src/effects.c:456 src/effects.c:523
+#: src/effects.c:443 src/effects.c:507
 msgid ""
 "\n"
 "No frames were generated.\n"
 msgstr ""
 
-#: src/effects-weed.c:431
+#: src/effects-weed.c:452
 msgid "integer"
 msgstr ""
 
-#: src/effects-weed.c:432
+#: src/effects-weed.c:454
 msgid "int64"
 msgstr ""
 
-#: src/effects-weed.c:433
+#: src/effects-weed.c:456
 msgid "boolean"
 msgstr ""
 
-#: src/effects-weed.c:434
+#: src/effects-weed.c:458
 msgid "double"
 msgstr ""
 
-#: src/effects-weed.c:435
+#: src/effects-weed.c:460
 msgid "string"
 msgstr ""
 
-#: src/effects-weed.c:436
+#: src/effects-weed.c:462
 msgid "pointer"
 msgstr ""
 
-#: src/effects-weed.c:4591
+#: src/effects-weed.c:4581
 #, c-format
 msgid "Error: plugin %s has no weed_setup() function.\n"
 msgstr ""
 
-#: src/effects-weed.c:4606
+#: src/effects-weed.c:4595
 #, c-format
 msgid "No usable filters found in plugin %s\n"
 msgstr ""
 
-#: src/effects-weed.c:4680
+#: src/effects-weed.c:4668
 #, c-format
 msgid "Found duplicate plugin %s"
 msgstr ""
 
-#: src/effects-weed.c:4734
+#: src/effects-weed.c:4723
 #, c-format
 msgid ""
 "Info: Unable to load plugin %s\n"
 "Error was: %s\n"
 msgstr ""
 
-#: src/effects-weed.c:4737 src/effects-weed.c:5858
+#: src/effects-weed.c:4726 src/effects-weed.c:5847
 msgid "Some plugin directories"
 msgstr ""
 
 #. TRANSLATORS: example " - LADSPA plugins -"
-#: src/effects-weed.c:4812 src/rte_window.c:2105
+#: src/effects-weed.c:4801 src/rte_window.c:2107
 #, c-format
 msgid " - %s plugins -"
 msgstr ""
 
-#: src/effects-weed.c:5012
+#: src/effects-weed.c:4998
 #, c-format
 msgid "Successfully loaded %d Weed filters\n"
 msgstr ""
 
-#: src/effects-weed.c:5177
+#: src/effects-weed.c:5162
 #, c-format
 msgid "Invalid compound effect %s - has conflicting target_fps\n"
 msgstr ""
 
-#: src/effects-weed.c:5197
+#: src/effects-weed.c:5182
 #, c-format
 msgid "Invalid compound effect %s - has multiple transition parameters\n"
 msgstr ""
 
-#: src/effects-weed.c:5211
+#: src/effects-weed.c:5196
 #, c-format
 msgid "Invalid compound effect %s - has multiple master volume parameters\n"
 msgstr ""
 
-#: src/effects-weed.c:5346
+#: src/effects-weed.c:5329
 #, c-format
 msgid "Invalid compound effect %s - must have >1 sub filters\n"
 msgstr ""
 
-#: src/effects-weed.c:5366
+#: src/effects-weed.c:5349
 #, c-format
 msgid "Invalid effect %s found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5381
+#: src/effects-weed.c:5364
 #, c-format
 msgid "Invalid default found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5392
+#: src/effects-weed.c:5375
 #, c-format
 msgid "Invalid filter %d for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5406
+#: src/effects-weed.c:5389
 #, c-format
 msgid "Invalid param %d for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5433
+#: src/effects-weed.c:5416
 #, c-format
 msgid ""
 "Invalid number of values for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5467
+#: src/effects-weed.c:5450
 #, c-format
 msgid ""
 "Invalid non-boolean value for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5500
+#: src/effects-weed.c:5483
 #, c-format
 msgid "Invalid param link found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5511
+#: src/effects-weed.c:5494
 #, c-format
 msgid ""
 "Invalid out filter %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5529
+#: src/effects-weed.c:5513
 #, c-format
 msgid ""
 "Invalid out param %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5541
+#: src/effects-weed.c:5526
 #, c-format
 msgid ""
 "Invalid non-boolean value for autoscale found in compound effect %s, line "
 "%d\n"
 msgstr ""
 
-#: src/effects-weed.c:5552
+#: src/effects-weed.c:5537
 #, c-format
 msgid ""
 "Invalid in filter %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5566
+#: src/effects-weed.c:5552
 #, c-format
 msgid ""
 "Invalid in param %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5594
+#: src/effects-weed.c:5581
 #, c-format
 msgid "Invalid channel link found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5605
+#: src/effects-weed.c:5592
 #, c-format
 msgid ""
 "Invalid out filter %d for link channels found in compound effect %s, line "
 "%d\n"
 msgstr ""
 
-#: src/effects-weed.c:5623
+#: src/effects-weed.c:5611
 #, c-format
 msgid ""
 "Invalid out channel %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5633
+#: src/effects-weed.c:5622
 #, c-format
 msgid ""
 "Invalid in filter %d for link channels found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5651
+#: src/effects-weed.c:5641
 #, c-format
 msgid ""
 "Invalid in channel %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5687
+#: src/effects-weed.c:5678
 #, c-format
 msgid "Compound:%s"
 msgstr ""
 
-#: src/effects-weed.c:5758
+#: src/effects-weed.c:5749
 #, c-format
 msgid "Successfully loaded %d compound filters\n"
 msgstr ""
 
-#: src/effects-weed.c:6591
+#: src/effects-weed.c:6570
 #, c-format
 msgid "Effect %s cannot be used with this audio player.\n"
 msgstr ""
 
-#: src/effects-weed.c:6737
+#: src/effects-weed.c:6718
 #, c-format
 msgid "Failed to start instance %s, error code %d\n"
 msgstr ""
 
-#: src/effects-weed.c:6814
+#: src/effects-weed.c:6797
 #, c-format
 msgid "Unable to start generator %s\n"
 msgstr ""
 
-#: src/effects-weed.c:7621
+#: src/effects-weed.c:7607
 #, c-format
 msgid "Failed to start generator %s\n"
 msgstr ""
 
-#: src/effects-weed.c:7718
+#: src/effects-weed.c:7701
 #, c-format
 msgid "Failed to start generator %s, error %d\n"
 msgstr ""
 
-#: src/effects-weed.c:9012
+#: src/effects-weed.c:8993
 #, c-format
 msgid "%s [unstable] (%s)"
 msgstr ""
 
-#: src/effects-data.c:3278
+#: src/effects-data.c:3234
 #, c-format
 msgid "ACTIVATE (%s)"
 msgstr ""
 
-#: src/effects-data.c:3548
+#: src/effects-data.c:3501
 msgid "ACTIVATE"
 msgstr ""
 
-#: src/effects-data.c:3876
+#: src/effects-data.c:3829
 #, c-format
 msgid "Key slot %d"
 msgstr ""
 
-#: src/effects-data.c:3998
+#: src/effects-data.c:3951
 msgid "Autoscale"
 msgstr ""
 
-#: src/effects-data.c:4089
+#: src/effects-data.c:4042
 msgid "Add another connection for this output parameter"
 msgstr ""
 
-#: src/effects-data.c:4102 src/effects-data.c:4151
+#: src/effects-data.c:4055 src/effects-data.c:4104
 #, fuzzy
 msgid "Delete this connection"
 msgstr "_Slet denne effekt"
 
-#: src/effects-data.c:4138
+#: src/effects-data.c:4091
 msgid "Add another connection for this output channel"
 msgstr ""
 
-#: src/effects-data.c:4223
+#: src/effects-data.c:4176
 msgid "Connected to -->"
 msgstr ""
 
-#: src/effects-data.c:4243
+#: src/effects-data.c:4196
 #, c-format
 msgid "%s - Alpha Channel Connections"
 msgstr ""
 
-#: src/effects-data.c:4316
+#: src/effects-data.c:4269
 #, c-format
 msgid "%s - Parameter Data Connections"
 msgstr ""
 
-#: src/effects-data.c:4336
+#: src/effects-data.c:4289
 msgid "Autoscale All"
 msgstr ""
 
-#: src/effects-data.c:4361 src/effects-data.c:4890
+#: src/effects-data.c:4314 src/effects-data.c:4841
 msgid "ACTIVATED"
 msgstr ""
 
-#: src/effects-data.c:4774
+#: src/effects-data.c:4726
 msgid "LiVES: - Parameter and Alpha Channel Connections"
 msgstr ""
 
-#: src/effects-data.c:4785
+#: src/effects-data.c:4736
 msgid "Auto Connect Channels"
 msgstr ""
 
-#: src/effects-data.c:4797
+#: src/effects-data.c:4748
 msgid "Auto Connect Parameters"
 msgstr ""
 
-#: src/effects-data.c:4807
+#: src/effects-data.c:4758
 msgid "Disconnect All"
 msgstr ""
 
-#: src/effects-data.c:4875
+#: src/effects-data.c:4826
 #, c-format
 msgid "Input channel is already connected from (%d,%d) %s"
 msgstr ""
 
-#: src/effects-data.c:4891
+#: src/effects-data.c:4842
 #, c-format
 msgid "Input parameter is already connected from (%d,%d) %s"
 msgstr ""
 
-#: src/effects-data.c:4899
+#: src/effects-data.c:4851
 msgid "Input and output parameters are not compatible"
 msgstr ""
 
@@ -5598,43 +5611,43 @@
 msgid "_Reset Values"
 msgstr "_Nulstil værdier"
 
-#: src/framedraw.c:267
+#: src/framedraw.c:265
 msgid "_Frame"
 msgstr ""
 
-#: src/paramspecial.c:266
+#: src/paramspecial.c:259
 msgid "Maintain _Aspect Ratio"
 msgstr ""
 
-#: src/paramspecial.c:267
+#: src/paramspecial.c:260
 msgid "Maintain aspect ratio of original frame"
 msgstr ""
 
-#: src/paramspecial.c:341
+#: src/paramspecial.c:335
 msgid "Display Password"
 msgstr ""
 
-#: src/paramwindow.c:450
+#: src/paramwindow.c:447
 msgid "Transition _In"
 msgstr ""
 
-#: src/paramwindow.c:452
+#: src/paramwindow.c:449
 msgid "Click to set the transition parameter to show only the front frame"
 msgstr ""
 
-#: src/paramwindow.c:474
+#: src/paramwindow.c:472
 msgid "Crossfade audio"
 msgstr ""
 
-#: src/paramwindow.c:475
+#: src/paramwindow.c:473
 msgid "Check the box to make audio transition with the video"
 msgstr ""
 
-#: src/paramwindow.c:493
+#: src/paramwindow.c:492
 msgid "Transition _Out"
 msgstr ""
 
-#: src/paramwindow.c:495
+#: src/paramwindow.c:494
 msgid "Click to set the transition parameter to show only the rear frame"
 msgstr ""
 
@@ -5647,23 +5660,23 @@
 msgid "%s : size"
 msgstr "%s : størrelse"
 
-#: src/paramwindow.c:598
+#: src/paramwindow.c:597
 msgid "New size (pixels)"
 msgstr "Ny størrelse (pixels)"
 
-#: src/paramwindow.c:617 src/plugins.c:997
+#: src/paramwindow.c:616 src/plugins.c:973
 msgid "_Width"
 msgstr "_Bredde"
 
-#: src/paramwindow.c:636 src/plugins.c:1003
+#: src/paramwindow.c:635 src/plugins.c:979
 msgid "_Height"
 msgstr "_Højde"
 
-#: src/paramwindow.c:684
+#: src/paramwindow.c:683
 msgid "Generate to _Clipboard"
 msgstr ""
 
-#: src/paramwindow.c:686
+#: src/paramwindow.c:685
 msgid "Generate frames to the clipboard"
 msgstr ""
 
@@ -5675,7 +5688,7 @@
 msgid "Generate frames to a new clip"
 msgstr ""
 
-#: src/paramwindow.c:822
+#: src/paramwindow.c:824
 #, c-format
 msgid ""
 "\n"
@@ -5683,71 +5696,71 @@
 "\n"
 msgstr ""
 
-#: src/paramwindow.c:920 src/paramwindow.c:930
+#: src/paramwindow.c:934 src/paramwindow.c:942
 msgid "Set as default"
 msgstr "Vælg som standard"
 
-#: src/paramwindow.c:922 src/paramwindow.c:938
+#: src/paramwindow.c:936 src/paramwindow.c:950
 msgid "Reset"
 msgstr ""
 
-#: src/paramwindow.c:932 src/rte_window.c:2401 src/omc-learn.c:1357
+#: src/paramwindow.c:944 src/rte_window.c:2394 src/omc-learn.c:1347
 msgid "Close _window"
 msgstr "Luk _vindue"
 
-#: src/paramwindow.c:1337
+#: src/paramwindow.c:1340
 msgid "No parameters"
 msgstr "Ingen parametre"
 
-#: src/paramwindow.c:1419
+#: src/paramwindow.c:1424
 msgid "Invalid parameter"
 msgstr "Ugyldig parameter"
 
-#: src/paramwindow.c:1611
+#: src/paramwindow.c:1610
 msgid "LiVES: - Select Colour"
 msgstr "LiVES: - Vælg farve"
 
-#: src/paramwindow.c:1616
+#: src/paramwindow.c:1615
 msgid "Click to set the colour"
 msgstr "Klik for at vælge farve"
 
-#: src/paramwindow.c:1628
+#: src/paramwindow.c:1626
 msgid "_Red"
 msgstr ""
 
-#: src/paramwindow.c:1629
+#: src/paramwindow.c:1627
 msgid "The red value (0 - 255)"
 msgstr "Den røde værdi (0 - 255)"
 
-#: src/paramwindow.c:1632
+#: src/paramwindow.c:1630
 msgid "_Green"
 msgstr ""
 
-#: src/paramwindow.c:1633
+#: src/paramwindow.c:1631
 msgid "The green value (0 - 255)"
 msgstr "Den grønne værdi (0 - 255)"
 
-#: src/paramwindow.c:1636
+#: src/paramwindow.c:1634
 msgid "_Blue"
 msgstr ""
 
-#: src/paramwindow.c:1637
+#: src/paramwindow.c:1635
 msgid "The blue value (0 - 255)"
 msgstr "Den blå værdi (0 - 255)"
 
-#: src/plugins.c:85
+#: src/plugins.c:86
 #, c-format
 msgid ""
 "\n"
 "Plugin error: %s failed with code %d"
 msgstr ""
 
-#: src/plugins.c:87
+#: src/plugins.c:88
 #, c-format
 msgid " : message was %s\n"
 msgstr ""
 
-#: src/plugins.c:387
+#: src/plugins.c:375
 #, c-format
 msgid ""
 "\n"
@@ -5757,17 +5770,17 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/plugins.c:397
+#: src/plugins.c:385
 #, c-format
 msgid "Updating video playback plugin defaults in %s\n"
 msgstr ""
 
-#: src/plugins.c:452
+#: src/plugins.c:444
 #, c-format
 msgid "Loading video playback plugin defaults from %s..."
 msgstr ""
 
-#: src/plugins.c:515
+#: src/plugins.c:505
 #, c-format
 msgid ""
 "\n"
@@ -5777,32 +5790,32 @@
 "\n"
 msgstr ""
 
-#: src/plugins.c:855
+#: src/plugins.c:836
 #, c-format
 msgid "Saving playback plugin defaults to %s..."
 msgstr ""
 
-#: src/plugins.c:962
+#: src/plugins.c:939
 msgid "_FPS"
 msgstr "_FPS"
 
-#: src/plugins.c:963
+#: src/plugins.c:940
 msgid "Fixed framerate for plugin.\n"
 msgstr ""
 
-#: src/plugins.c:1032
+#: src/plugins.c:1008
 msgid "_Colourspace"
 msgstr ""
 
-#: src/plugins.c:1033
+#: src/plugins.c:1009
 msgid "Colourspace input to the plugin.\n"
 msgstr ""
 
-#: src/plugins.c:1089
+#: src/plugins.c:1065
 msgid "Save settings to an alternate file.\n"
 msgstr ""
 
-#: src/plugins.c:1206
+#: src/plugins.c:1182
 #, c-format
 msgid ""
 "\n"
@@ -5811,7 +5824,7 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/plugins.c:1252
+#: src/plugins.c:1228
 #, c-format
 msgid ""
 "\n"
@@ -5821,38 +5834,38 @@
 "Unable to use it.\n"
 msgstr ""
 
-#: src/plugins.c:1265
+#: src/plugins.c:1241
 #, c-format
 msgid ""
 "Video playback plugin failed to initialise.\n"
 "Error was: %s\n"
 msgstr ""
 
-#: src/plugins.c:1461
+#: src/plugins.c:1428
 msgid ""
 "\n"
 "Warning ! Video playback plugin will not send key presses. Keyboard may be "
 "disabled during plugin use !\n"
 msgstr ""
 
-#: src/plugins.c:1465
+#: src/plugins.c:1433
 #, c-format
 msgid ""
 "*** Using %s plugin for fs playback, agreed to use palette type %d ( %s ). "
 "***\n"
 msgstr ""
 
-#: src/plugins.c:1571
+#: src/plugins.c:1537
 #, c-format
 msgid "Audio stream unable to use preferred format '%s'\n"
 msgstr ""
 
-#: src/plugins.c:1579
+#: src/plugins.c:1543
 #, c-format
 msgid "Using format '%s' instead.\n"
 msgstr ""
 
-#: src/plugins.c:1616
+#: src/plugins.c:1579
 #, c-format
 msgid ""
 "LiVES was unable to find its encoder plugins. Please make sure you have the "
@@ -5861,7 +5874,7 @@
 "or change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/plugins.c:1624
+#: src/plugins.c:1589
 #, c-format
 msgid ""
 "LiVES did not receive a response from the encoder plugin called '%s'.\n"
@@ -5870,11 +5883,11 @@
 "or switch to another plugin using Tools|Preferences|Encoding\n"
 msgstr ""
 
-#: src/plugins.c:2032
+#: src/plugins.c:1987
 msgid "Unable to resize, please install imageMagick\n"
 msgstr ""
 
-#: src/plugins.c:2231
+#: src/plugins.c:2183
 #, c-format
 msgid ""
 "\n"
@@ -5882,12 +5895,12 @@
 "No decoders found in %s !\n"
 msgstr ""
 
-#: src/plugins.c:2415
+#: src/plugins.c:2369
 #, c-format
 msgid " using %s"
 msgstr ""
 
-#: src/plugins.c:2499
+#: src/plugins.c:2451
 #, c-format
 msgid ""
 "\n"
@@ -5896,7 +5909,7 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/plugins.c:2522
+#: src/plugins.c:2472
 #, c-format
 msgid ""
 "\n"
@@ -5906,24 +5919,24 @@
 "Unable to use it.\n"
 msgstr ""
 
-#: src/plugins.c:2564
+#: src/plugins.c:2512
 msgid "/unknown"
 msgstr "/ukendt"
 
-#: src/plugins.c:2651
+#: src/plugins.c:2598
 msgid "LiVES: - Decoder Plugins"
 msgstr ""
 
-#: src/plugins.c:2669
+#: src/plugins.c:2616
 msgid "Enabled Video Decoders (uncheck to disable)"
 msgstr ""
 
-#: src/plugins.c:2726
+#: src/plugins.c:2672
 #, c-format
 msgid "Failed to load %s, transitions may not resize.\n"
 msgstr ""
 
-#: src/plugins.c:3854
+#: src/plugins.c:3797
 #, c-format
 msgid "%s advanced settings"
 msgstr "%s avancerede indstillinger"
@@ -5932,15 +5945,15 @@
 msgid "LiVES: - New Test RFX"
 msgstr "LiVES: - Ny test RFX"
 
-#: src/rfx-builder.c:136
+#: src/rfx-builder.c:135
 msgid "LiVES: - Edit Test RFX"
 msgstr ""
 
-#: src/rfx-builder.c:166
+#: src/rfx-builder.c:165
 msgid "Type:"
 msgstr ""
 
-#: src/rfx-builder.c:184
+#: src/rfx-builder.c:183
 msgid "tool"
 msgstr ""
 
@@ -5952,130 +5965,130 @@
 msgid "The name of the plugin. No spaces allowed."
 msgstr ""
 
-#: src/rfx-builder.c:201
+#: src/rfx-builder.c:202
 msgid "Version:       "
 msgstr "Version:       "
 
-#: src/rfx-builder.c:203
+#: src/rfx-builder.c:204
 msgid "The script version."
 msgstr "Script version."
 
-#: src/rfx-builder.c:210
+#: src/rfx-builder.c:212
 msgid "    Author:       "
 msgstr "    Forfatter:       "
 
-#: src/rfx-builder.c:211
+#: src/rfx-builder.c:213
 msgid "The script author."
 msgstr "Script forfatter"
 
-#: src/rfx-builder.c:217
+#: src/rfx-builder.c:220
 msgid "    URL (optional):       "
 msgstr ""
 
-#: src/rfx-builder.c:218
+#: src/rfx-builder.c:221
 msgid "URL for the plugin maintainer."
 msgstr ""
 
-#: src/rfx-builder.c:226
+#: src/rfx-builder.c:230
 msgid "Menu text:    "
 msgstr "Menu tekst:    "
 
-#: src/rfx-builder.c:227
+#: src/rfx-builder.c:231
 msgid "The text to show in the menu."
 msgstr ""
 
-#: src/rfx-builder.c:239
+#: src/rfx-builder.c:244
 msgid "Action description:        "
 msgstr ""
 
-#: src/rfx-builder.c:241
+#: src/rfx-builder.c:246
 msgid "Describe what the plugin is doing. E.g. \"Edge detecting\""
 msgstr ""
 
-#: src/rfx-builder.c:246
+#: src/rfx-builder.c:251
 msgid "Minimum frames:"
 msgstr ""
 
-#: src/rfx-builder.c:249
+#: src/rfx-builder.c:254
 msgid ""
 "Minimum number of frames this effect/tool can be applied to. Normally 1."
 msgstr ""
 
-#: src/rfx-builder.c:260
+#: src/rfx-builder.c:265
 msgid "_Requirements..."
 msgstr ""
 
-#: src/rfx-builder.c:263
+#: src/rfx-builder.c:268
 msgid "Enter any binaries required by the plugin."
 msgstr ""
 
-#: src/rfx-builder.c:267
+#: src/rfx-builder.c:272
 msgid "_Properties..."
 msgstr ""
 
-#: src/rfx-builder.c:270
+#: src/rfx-builder.c:275
 msgid "Set properties for the plugin. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:274
+#: src/rfx-builder.c:279
 msgid "_Parameters..."
 msgstr "_Parametre..."
 
-#: src/rfx-builder.c:277
+#: src/rfx-builder.c:282
 msgid "Set up parameters used in pre/loop/post/trigger code. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:281
+#: src/rfx-builder.c:286
 msgid "Parameter _Window Hints..."
 msgstr ""
 
-#: src/rfx-builder.c:284
+#: src/rfx-builder.c:289
 msgid "Set hints about how to lay out the parameter window. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:290
+#: src/rfx-builder.c:295
 msgid "_Language code:"
 msgstr ""
 
-#: src/rfx-builder.c:291
+#: src/rfx-builder.c:296
 msgid "Language for pre/loop/post/triggers. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:300
+#: src/rfx-builder.c:305
 msgid "_Pre loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:303
+#: src/rfx-builder.c:308
 msgid "Code to be executed before the loop. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:307
+#: src/rfx-builder.c:312
 msgid "_Loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:310
+#: src/rfx-builder.c:315
 msgid "Loop code to be applied to each frame."
 msgstr ""
 
-#: src/rfx-builder.c:314
+#: src/rfx-builder.c:319
 msgid "_Post loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:317
+#: src/rfx-builder.c:322
 msgid "Code to be executed after the loop. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:321
+#: src/rfx-builder.c:326
 msgid "_Trigger code..."
 msgstr ""
 
-#: src/rfx-builder.c:324
+#: src/rfx-builder.c:329
 msgid ""
 "Set trigger code for when the parameter window is shown, or when a parameter "
 "is changed. Optional (except for Utilities)."
 msgstr ""
 
-#: src/rfx-builder.c:421
+#: src/rfx-builder.c:426
 #, c-format
 msgid ""
 "\n"
@@ -6085,55 +6098,55 @@
 "%s\n"
 msgstr ""
 
-#: src/rfx-builder.c:544
+#: src/rfx-builder.c:541
 msgid "LiVES: - RFX Requirements"
 msgstr "LiVES: - RFX Krav"
 
-#: src/rfx-builder.c:548
+#: src/rfx-builder.c:544
 msgid "LiVES: - RFX Parameters"
 msgstr "LiVES: - RFX Parametre"
 
-#: src/rfx-builder.c:552
+#: src/rfx-builder.c:547
 msgid "LiVES: - RFX Parameter Window Hints"
 msgstr ""
 
-#: src/rfx-builder.c:556
+#: src/rfx-builder.c:550
 msgid "LiVES: - RFX Triggers"
 msgstr ""
 
-#: src/rfx-builder.c:622
+#: src/rfx-builder.c:613
 msgid "_New Entry"
 msgstr ""
 
-#: src/rfx-builder.c:625
+#: src/rfx-builder.c:616
 msgid "_Edit Entry"
 msgstr ""
 
-#: src/rfx-builder.c:628
+#: src/rfx-builder.c:619
 msgid "_Remove Entry"
 msgstr ""
 
-#: src/rfx-builder.c:632
+#: src/rfx-builder.c:623
 msgid "Move _Up"
 msgstr "Flyt _op"
 
-#: src/rfx-builder.c:635
+#: src/rfx-builder.c:626
 msgid "Move _Down"
 msgstr "Flyt ne_d"
 
-#: src/rfx-builder.c:1004
+#: src/rfx-builder.c:984
 msgid "LiVES: - RFX Properties"
 msgstr ""
 
-#: src/rfx-builder.c:1013
+#: src/rfx-builder.c:993
 msgid "_Slow (hint to GUI)"
 msgstr ""
 
-#: src/rfx-builder.c:1024
+#: src/rfx-builder.c:1004
 msgid "_Batch mode generator"
 msgstr ""
 
-#: src/rfx-builder.c:1831
+#: src/rfx-builder.c:1790
 msgid ""
 "\n"
 "\n"
@@ -6142,7 +6155,7 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:1875
+#: src/rfx-builder.c:1834
 msgid ""
 "\n"
 "\n"
@@ -6150,219 +6163,219 @@
 "Please check the trigger code.\n"
 msgstr ""
 
-#: src/rfx-builder.c:1994
+#: src/rfx-builder.c:1950
 msgid "LiVES: - New RFX Parameter"
 msgstr ""
 
-#: src/rfx-builder.c:1997
+#: src/rfx-builder.c:1952
 msgid "LiVES: - Edit RFX Parameter"
 msgstr ""
 
-#: src/rfx-builder.c:2013
+#: src/rfx-builder.c:1968
 msgid "_Name:    "
 msgstr "_Navn:    "
 
-#: src/rfx-builder.c:2016
+#: src/rfx-builder.c:1971
 msgid "Name of the parameter, must be unique in the plugin."
 msgstr ""
 
-#: src/rfx-builder.c:2025
+#: src/rfx-builder.c:1981
 msgid "_Label:    "
 msgstr ""
 
-#: src/rfx-builder.c:2028
+#: src/rfx-builder.c:1984
 msgid ""
 "Label to be shown by the parameter. An underscore represents mnemonic "
 "accelerator."
 msgstr ""
 
-#: src/rfx-builder.c:2039
+#: src/rfx-builder.c:1996
 msgid "_Type:         "
 msgstr ""
 
-#: src/rfx-builder.c:2040
+#: src/rfx-builder.c:1997
 msgid "Parameter type (select from list)."
 msgstr ""
 
-#: src/rfx-builder.c:2073
+#: src/rfx-builder.c:2029
 msgid "Decimal _places: "
 msgstr ""
 
-#: src/rfx-builder.c:2082 src/rfx-builder.c:2477 src/rfx-builder.c:2495
+#: src/rfx-builder.c:2038 src/rfx-builder.c:2430 src/rfx-builder.c:2447
 msgid "_Default value:    "
 msgstr ""
 
-#: src/rfx-builder.c:2098
+#: src/rfx-builder.c:2054
 msgid "_Default: "
 msgstr ""
 
-#: src/rfx-builder.c:2132
+#: src/rfx-builder.c:2087
 msgid "Button _Group: "
 msgstr ""
 
-#: src/rfx-builder.c:2134
+#: src/rfx-builder.c:2089
 msgid "A non-zero value can be used to group radio buttons."
 msgstr ""
 
-#: src/rfx-builder.c:2142 src/rfx-builder.c:2478
+#: src/rfx-builder.c:2097 src/rfx-builder.c:2431
 msgid "_Minimum value: "
 msgstr ""
 
-#: src/rfx-builder.c:2148 src/rfx-builder.c:2479
+#: src/rfx-builder.c:2103 src/rfx-builder.c:2432
 msgid "Ma_ximum value: "
 msgstr ""
 
-#: src/rfx-builder.c:2157
+#: src/rfx-builder.c:2113
 msgid "     _Step size:   "
 msgstr ""
 
-#: src/rfx-builder.c:2160
+#: src/rfx-builder.c:2117
 msgid ""
 "How much the parameter is adjusted when the spinbutton arrows are pressed."
 msgstr ""
 
-#: src/rfx-builder.c:2171
+#: src/rfx-builder.c:2129
 msgid "_Wrap value"
 msgstr ""
 
-#: src/rfx-builder.c:2172
+#: src/rfx-builder.c:2131
 msgid "Whether the value wraps max->min and min->max."
 msgstr ""
 
-#: src/rfx-builder.c:2470
+#: src/rfx-builder.c:2424
 msgid "Set _values"
 msgstr "Sæt _værdier"
 
-#: src/rfx-builder.c:2512
+#: src/rfx-builder.c:2463
 msgid "Default _Red:  "
 msgstr "Standard _Rød:  "
 
-#: src/rfx-builder.c:2513
+#: src/rfx-builder.c:2464
 msgid "Default _Green:"
 msgstr "Standard _Grøn:"
 
-#: src/rfx-builder.c:2514
+#: src/rfx-builder.c:2465
 msgid "Default _Blue: "
 msgstr "Standard _Blå: "
 
-#: src/rfx-builder.c:2538
+#: src/rfx-builder.c:2488
 msgid "Set _default"
 msgstr ""
 
-#: src/rfx-builder.c:2540
+#: src/rfx-builder.c:2490
 msgid "Default value:  "
 msgstr "Standrad værdi:  "
 
-#: src/rfx-builder.c:2541
+#: src/rfx-builder.c:2491
 msgid "Maximum length (chars): "
 msgstr ""
 
-#: src/rfx-builder.c:2576
+#: src/rfx-builder.c:2526
 msgid "LiVES: - New RFX Parameter Window Hint"
 msgstr ""
 
-#: src/rfx-builder.c:2579
+#: src/rfx-builder.c:2528
 msgid "LiVES: - Edit RFX Parameter Window Hint"
 msgstr ""
 
-#: src/rfx-builder.c:2622
+#: src/rfx-builder.c:2569
 msgid "_Keyword:         "
 msgstr ""
 
-#: src/rfx-builder.c:2639
+#: src/rfx-builder.c:2586
 msgid "Special _Type:         "
 msgstr ""
 
-#: src/rfx-builder.c:2656
+#: src/rfx-builder.c:2602
 msgid "Special _Subtype:         "
 msgstr ""
 
-#: src/rfx-builder.c:2667 src/rfx-builder.c:2706
+#: src/rfx-builder.c:2613 src/rfx-builder.c:2651
 msgid "Row:    "
 msgstr "Række:    "
 
-#: src/rfx-builder.c:2732
+#: src/rfx-builder.c:2676
 #, c-format
 msgid "Linked parameters (%d):    "
 msgstr ""
 
-#: src/rfx-builder.c:2749
+#: src/rfx-builder.c:2693
 msgid "Linked parameters (4):    "
 msgstr ""
 
-#: src/rfx-builder.c:2752
+#: src/rfx-builder.c:2695
 msgid "Linked parameters (2):    "
 msgstr ""
 
-#: src/rfx-builder.c:2777
+#: src/rfx-builder.c:2720
 msgid "LiVES: - New RFX Trigger"
 msgstr ""
 
-#: src/rfx-builder.c:2780
+#: src/rfx-builder.c:2722
 msgid "LiVES: - Edit RFX Trigger"
 msgstr ""
 
-#: src/rfx-builder.c:2808
+#: src/rfx-builder.c:2750
 msgid "When:         "
 msgstr ""
 
-#: src/rfx-builder.c:2904
+#: src/rfx-builder.c:2846
 msgid "LiVES: - Pre Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:2911
+#: src/rfx-builder.c:2853
 msgid "LiVES: - Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:2918
+#: src/rfx-builder.c:2860
 msgid "LiVES: - Post Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:2931
+#: src/rfx-builder.c:2873
 #, c-format
 msgid "LiVES: - Default text (max length %d)"
 msgstr ""
 
-#: src/rfx-builder.c:2944
+#: src/rfx-builder.c:2885
 msgid "LiVES: - Enter values, one per line"
 msgstr ""
 
-#: src/rfx-builder.c:3055
+#: src/rfx-builder.c:2996
 msgid ""
 "\n"
 "\n"
 "Name must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3060
+#: src/rfx-builder.c:3001
 msgid ""
 "\n"
 "\n"
 "Name must not contain spaces.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3065
+#: src/rfx-builder.c:3006
 msgid ""
 "\n"
 "\n"
 "Menu text must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3071
+#: src/rfx-builder.c:3012
 msgid ""
 "\n"
 "\n"
 "Action description must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3076
+#: src/rfx-builder.c:3017
 msgid ""
 "\n"
 "\n"
 "Author must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3085 src/rfx-builder.c:4339
+#: src/rfx-builder.c:3026 src/rfx-builder.c:4253
 msgid ""
 "\n"
 "\n"
@@ -6370,28 +6383,28 @@
 "Name must be unique.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3092
+#: src/rfx-builder.c:3033
 msgid ""
 "\n"
 "\n"
 "Loop code should not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3098
+#: src/rfx-builder.c:3039
 msgid ""
 "\n"
 "\n"
 "Trigger code should not be blank for a utility.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3111
+#: src/rfx-builder.c:3052
 msgid ""
 "\n"
 "\n"
 "Parameter name must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3117
+#: src/rfx-builder.c:3058
 msgid ""
 "\n"
 "\n"
@@ -6400,41 +6413,41 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:3171
+#: src/rfx-builder.c:3111
 #, c-format
 msgid "Writing script file %s..."
 msgstr ""
 
-#: src/rfx-builder.c:3477
+#: src/rfx-builder.c:3411
 msgid "No <define> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3484 src/rfx-builder.c:3493
+#: src/rfx-builder.c:3418 src/rfx-builder.c:3427
 msgid "Bad script version.\n"
 msgstr "Dårlig script version.\n"
 
-#: src/rfx-builder.c:3505
+#: src/rfx-builder.c:3439
 msgid "No <name> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3513
+#: src/rfx-builder.c:3447
 msgid "No <version> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3522
+#: src/rfx-builder.c:3456
 msgid "No <author> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3536
+#: src/rfx-builder.c:3470
 msgid "No <description> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3540
+#: src/rfx-builder.c:3474
 #, c-format
 msgid "Bad description. (%s)\n"
 msgstr ""
 
-#: src/rfx-builder.c:3702
+#: src/rfx-builder.c:3627
 #, c-format
 msgid ""
 "\n"
@@ -6444,27 +6457,27 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:3859
+#: src/rfx-builder.c:3780
 msgid "Rebuilding all RFX scripts...builtin..."
 msgstr ""
 
-#: src/rfx-builder.c:3860
+#: src/rfx-builder.c:3781
 msgid "Rebuilding scripts"
 msgstr ""
 
-#: src/rfx-builder.c:3868
+#: src/rfx-builder.c:3789
 msgid "custom..."
 msgstr ""
 
-#: src/rfx-builder.c:3872
+#: src/rfx-builder.c:3793
 msgid "test..."
 msgstr "test..."
 
-#: src/rfx-builder.c:3878
+#: src/rfx-builder.c:3799
 msgid "rebuilding dynamic menu entries..."
 msgstr ""
 
-#: src/rfx-builder.c:3905 src/rfx-builder.c:3912
+#: src/rfx-builder.c:3826 src/rfx-builder.c:3834
 #, c-format
 msgid ""
 "\n"
@@ -6473,7 +6486,7 @@
 "Please check this program is in your path and executable.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3951
+#: src/rfx-builder.c:3874
 #, c-format
 msgid ""
 "\n"
@@ -6483,12 +6496,12 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:3960
+#: src/rfx-builder.c:3884
 #, c-format
 msgid "Deleting rfx script %s..."
 msgstr ""
 
-#: src/rfx-builder.c:3980
+#: src/rfx-builder.c:3902
 #, c-format
 msgid ""
 "\n"
@@ -6498,7 +6511,7 @@
 "Error code was %d\n"
 msgstr ""
 
-#: src/rfx-builder.c:4016
+#: src/rfx-builder.c:3938
 #, c-format
 msgid ""
 "\n"
@@ -6508,12 +6521,12 @@
 "Please delete it first, or rename the test script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4027
+#: src/rfx-builder.c:3950
 #, c-format
 msgid "Promoting rfx test plugin %s to custom..."
 msgstr ""
 
-#: src/rfx-builder.c:4044
+#: src/rfx-builder.c:3965
 #, c-format
 msgid ""
 "\n"
@@ -6524,20 +6537,20 @@
 "Return code was %d (%s)\n"
 msgstr ""
 
-#: src/rfx-builder.c:4070
+#: src/rfx-builder.c:3990
 msgid "LiVES: - Export Script to..."
 msgstr ""
 
-#: src/rfx-builder.c:4077 src/rfx-builder.c:4156
+#: src/rfx-builder.c:3997 src/rfx-builder.c:4074
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "Kopierer %s til %s..."
 
-#: src/rfx-builder.c:4105
+#: src/rfx-builder.c:4024
 msgid "LiVES: Import Script from..."
 msgstr ""
 
-#: src/rfx-builder.c:4148
+#: src/rfx-builder.c:4067
 #, c-format
 msgid ""
 "\n"
@@ -6547,43 +6560,43 @@
 "Please delete it first, or rename the import script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4249
+#: src/rfx-builder.c:4166
 msgid "LiVES: - Copy RFX Script"
 msgstr "LiVES: - Kopier RFX script"
 
-#: src/rfx-builder.c:4251
+#: src/rfx-builder.c:4168
 msgid "_From type:    "
 msgstr ""
 
-#: src/rfx-builder.c:4258
+#: src/rfx-builder.c:4175
 msgid "   Script:    "
 msgstr "   Script:    "
 
-#: src/rfx-builder.c:4267
+#: src/rfx-builder.c:4183
 msgid "LiVES: - Rename test RFX Script"
 msgstr ""
 
-#: src/rfx-builder.c:4268
+#: src/rfx-builder.c:4184
 msgid "From script: "
 msgstr "Fra script: "
 
-#: src/rfx-builder.c:4273
+#: src/rfx-builder.c:4188
 msgid "LiVES: - RFX Script name"
 msgstr "LiVES: - RFX Script navn"
 
-#: src/rfx-builder.c:4274
+#: src/rfx-builder.c:4189
 msgid "Script name: "
 msgstr "Script navn: "
 
-#: src/rfx-builder.c:4294
+#: src/rfx-builder.c:4209
 msgid "New name: "
 msgstr "Nyt navn: "
 
-#: src/rfx-builder.c:4297
+#: src/rfx-builder.c:4212
 msgid "New script name: "
 msgstr "Nyt script navn: "
 
-#: src/rfx-builder.c:4372
+#: src/rfx-builder.c:4286
 msgid ""
 "\n"
 "\n"
@@ -6591,12 +6604,12 @@
 "Script name must be unique.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4384
+#: src/rfx-builder.c:4297
 #, c-format
 msgid "Renaming RFX test script %s to %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4390
+#: src/rfx-builder.c:4302
 #, c-format
 msgid ""
 "\n"
@@ -6607,21 +6620,21 @@
 "Return code was %d\n"
 msgstr ""
 
-#: src/rfx-builder.c:4610
+#: src/rfx-builder.c:4518
 msgid "_Apply Real Time Effects to Selection"
 msgstr ""
 
-#: src/rfx-builder.c:4664
+#: src/rfx-builder.c:4572
 #, c-format
 msgid "Loading rendered effect %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4766
+#: src/rfx-builder.c:4674
 msgid ""
 "See: VJ - show VJ keys. Set the realtime effects, and then apply them here."
 msgstr ""
 
-#: src/preferences.c:359
+#: src/preferences.c:351
 msgid ""
 "\n"
 "\n"
@@ -6629,7 +6642,7 @@
 "full screen, separate window (fs) mode\n"
 msgstr ""
 
-#: src/preferences.c:408
+#: src/preferences.c:400
 msgid ""
 "\n"
 "\n"
@@ -6637,7 +6650,7 @@
 "(Free space = UNKNOWN)"
 msgstr ""
 
-#: src/preferences.c:412
+#: src/preferences.c:403
 #, c-format
 msgid ""
 "\n"
@@ -6646,14 +6659,14 @@
 "(Free space = %s)"
 msgstr ""
 
-#: src/preferences.c:416
+#: src/preferences.c:408
 msgid ""
 "The temp directory is LiVES working directory where opened clips and sets "
 "are stored.\n"
 "It should be in a partition with plenty of free disk space.\n"
 msgstr ""
 
-#: src/preferences.c:784
+#: src/preferences.c:839
 #, c-format
 msgid ""
 "Unable to create or write to the new temporary directory.\n"
@@ -6664,7 +6677,7 @@
 "The directory will not be changed now.\n"
 msgstr ""
 
-#: src/preferences.c:786
+#: src/preferences.c:843
 #, c-format
 msgid ""
 "Unable to create or write to the new temporary directory.\n"
@@ -6674,7 +6687,7 @@
 "The directory will not be changed now.\n"
 msgstr ""
 
-#: src/preferences.c:798
+#: src/preferences.c:856
 msgid ""
 "You have chosen to change the temporary directory.\n"
 "Please make sure you have no other copies of LiVES open.\n"
@@ -6686,20 +6699,20 @@
 "original setting."
 msgstr ""
 
-#: src/preferences.c:1169
+#: src/preferences.c:1221
 msgid ""
 "\n"
 "Unable to switch audio players to jack - jackd must be installed first.\n"
 "See http://jackaudio.org\n"
 msgstr ""
 
-#: src/preferences.c:1175
+#: src/preferences.c:1226
 msgid ""
 "\n"
 "Switching audio players requires restart (jackd must not be running)\n"
 msgstr ""
 
-#: src/preferences.c:1202
+#: src/preferences.c:1253
 msgid ""
 "\n"
 "Unable to switch audio players to pulse audio\n"
@@ -6707,815 +6720,815 @@
 "See http://www.pulseaudio.org\n"
 msgstr ""
 
-#: src/preferences.c:1502
+#: src/preferences.c:1544
 msgid "PCM (highest quality; largest files)"
 msgstr ""
 
-#: src/preferences.c:2063
+#: src/preferences.c:2096
 msgid "LiVES: - Preferences"
 msgstr "LiVES: - Indstillinger"
 
-#: src/preferences.c:2142
+#: src/preferences.c:2177
 msgid "Open file selection maximised"
 msgstr ""
 
-#: src/preferences.c:2149
+#: src/preferences.c:2184
 msgid "Show recent files in the File menu"
 msgstr ""
 
-#: src/preferences.c:2158
+#: src/preferences.c:2193
 msgid "Stop screensaver on playback    "
 msgstr ""
 
-#: src/preferences.c:2165
+#: src/preferences.c:2200
 msgid "Open main window maximised"
 msgstr ""
 
-#: src/preferences.c:2173
+#: src/preferences.c:2208
 msgid "Show toolbar when background is blanked"
 msgstr ""
 
-#: src/preferences.c:2181
+#: src/preferences.c:2216
 msgid "Allow mouse wheel to switch clips"
 msgstr ""
 
-#: src/preferences.c:2192
+#: src/preferences.c:2227
 msgid "Shrink previews to fit in interface"
 msgstr ""
 
-#: src/preferences.c:2202
+#: src/preferences.c:2237
 msgid "Startup mode:"
 msgstr ""
 
-#: src/preferences.c:2206
+#: src/preferences.c:2241
 msgid "_Clip editor"
 msgstr ""
 
-#: src/preferences.c:2210
+#: src/preferences.c:2245
 msgid "_Multitrack mode"
 msgstr ""
 
-#: src/preferences.c:2234
+#: src/preferences.c:2268
 msgid "Multi-head support"
 msgstr ""
 
-#: src/preferences.c:2242
+#: src/preferences.c:2276
 msgid " monitor number for LiVES interface"
 msgstr ""
 
-#: src/preferences.c:2248
+#: src/preferences.c:2282
 msgid " monitor number for playback"
 msgstr ""
 
-#: src/preferences.c:2260
+#: src/preferences.c:2294
 msgid ""
 "A setting of 0 means use all available monitors (only works with some "
 "playback plugins)."
 msgstr ""
 
-#: src/preferences.c:2270
+#: src/preferences.c:2304
 msgid "Force single monitor"
 msgstr ""
 
-#: src/preferences.c:2271
+#: src/preferences.c:2305
 msgid "Ignore all except the first monitor."
 msgstr ""
 
-#: src/preferences.c:2293
+#: src/preferences.c:2327
 msgid "Show clip thumbnails during playback"
 msgstr ""
 
-#: src/preferences.c:2306
+#: src/preferences.c:2340
 msgid "GUI"
 msgstr "GUI"
 
-#: src/preferences.c:2321
+#: src/preferences.c:2355
 msgid "When entering Multitrack mode:"
 msgstr ""
 
-#: src/preferences.c:2330
+#: src/preferences.c:2364
 msgid "_Prompt me for width, height, fps and audio settings"
 msgstr ""
 
-#: src/preferences.c:2336
+#: src/preferences.c:2370
 msgid "_Always use the following values:"
 msgstr "_Anvend altid følgende værdier:"
 
-#: src/preferences.c:2345
+#: src/preferences.c:2379
 msgid "Use these same _values for rendering a new clip"
 msgstr ""
 
-#: src/preferences.c:2370
+#: src/preferences.c:2404
 msgid "_Width           "
 msgstr ""
 
-#: src/preferences.c:2375
+#: src/preferences.c:2409
 msgid "          _Height      "
 msgstr ""
 
-#: src/preferences.c:2379
+#: src/preferences.c:2413
 msgid "          _FPS"
 msgstr ""
 
-#: src/preferences.c:2387
+#: src/preferences.c:2421
 msgid "Enable backing audio track"
 msgstr ""
 
-#: src/preferences.c:2394
+#: src/preferences.c:2428
 msgid "Audio track per video track"
 msgstr ""
 
-#: src/preferences.c:2423
+#: src/preferences.c:2457
 msgid "    _Undo buffer size (MB)    "
 msgstr ""
 
-#: src/preferences.c:2432
+#: src/preferences.c:2466
 msgid "_Exit multitrack mode after rendering"
 msgstr ""
 
-#: src/preferences.c:2440
+#: src/preferences.c:2474
 msgid "Auto backup layouts"
 msgstr ""
 
-#: src/preferences.c:2445
+#: src/preferences.c:2479
 msgid "_Every"
 msgstr ""
 
-#: src/preferences.c:2453
+#: src/preferences.c:2487
 msgid "seconds"
 msgstr "sekunder"
 
-#: src/preferences.c:2461
+#: src/preferences.c:2495
 msgid "After every _change"
 msgstr "Efter hver _ændring"
 
-#: src/preferences.c:2467
+#: src/preferences.c:2501
 msgid "_Never"
 msgstr "_Aldrig"
 
-#: src/preferences.c:2490
+#: src/preferences.c:2523
 msgid "Multitrack/Render"
 msgstr ""
 
-#: src/preferences.c:2508
+#: src/preferences.c:2541
 msgid "Use instant opening when possible"
 msgstr ""
 
-#: src/preferences.c:2509
+#: src/preferences.c:2543
 msgid "Enable instant opening of some file types using decoder plugins"
 msgstr ""
 
-#: src/preferences.c:2531
+#: src/preferences.c:2567
 msgid "Video open command (fallback)"
 msgstr ""
 
-#: src/preferences.c:2543
+#: src/preferences.c:2579
 msgid "Open/render compression"
 msgstr ""
 
-#: src/preferences.c:2546
+#: src/preferences.c:2582
 msgid " %     ( lower = slower, larger files; for jpeg, higher quality )"
 msgstr ""
 
-#: src/preferences.c:2558
+#: src/preferences.c:2594
 msgid "Default image format"
 msgstr ""
 
-#: src/preferences.c:2562
+#: src/preferences.c:2598
 msgid "_jpeg"
 msgstr "_jpeg"
 
-#: src/preferences.c:2565
+#: src/preferences.c:2601
 msgid "_png"
 msgstr "_png"
 
-#: src/preferences.c:2572
+#: src/preferences.c:2608
 msgid "(Check Help/Troubleshoot to see which image formats are supported)"
 msgstr ""
 
-#: src/preferences.c:2580
+#: src/preferences.c:2616
 msgid "Enable automatic deinterlacing when possible"
 msgstr ""
 
-#: src/preferences.c:2582
+#: src/preferences.c:2619
 msgid "Automatically deinterlace frames when a plugin suggests it"
 msgstr ""
 
-#: src/preferences.c:2593
+#: src/preferences.c:2632
 msgid "Automatic trimming / padding of audio when possible"
 msgstr ""
 
-#: src/preferences.c:2595
+#: src/preferences.c:2634
 msgid "Automatically trim or pad audio when a plugin suggests it"
 msgstr ""
 
-#: src/preferences.c:2606
+#: src/preferences.c:2646
 msgid "Ignore blank borders when possible"
 msgstr ""
 
-#: src/preferences.c:2608
+#: src/preferences.c:2648
 msgid "Clip any blank borders from frames where possible"
 msgstr ""
 
-#: src/preferences.c:2619
+#: src/preferences.c:2660
 msgid "When opening multiple files, concatenate images into one clip"
 msgstr ""
 
-#: src/preferences.c:2629
+#: src/preferences.c:2670
 msgid "Decoding"
 msgstr "Afkoder"
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:2652
+#: src/preferences.c:2693
 msgid "Low - can improve performance on slower machines"
 msgstr ""
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:2654
+#: src/preferences.c:2695
 msgid "Normal - recommended for most users"
 msgstr ""
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:2656
+#: src/preferences.c:2697
 msgid "High - can improve quality on very fast machines"
 msgstr ""
 
-#: src/preferences.c:2659
+#: src/preferences.c:2700
 msgid "Preview _quality"
 msgstr ""
 
-#: src/preferences.c:2660
+#: src/preferences.c:2701
 msgid "The preview quality for video playback - affects resizing"
 msgstr ""
 
-#: src/preferences.c:2675
+#: src/preferences.c:2717
 msgid "_Show FPS statistics"
 msgstr ""
 
-#: src/preferences.c:2694
+#: src/preferences.c:2736
 msgid "_Plugin"
 msgstr "_Plugin"
 
-#: src/preferences.c:2718
+#: src/preferences.c:2760
 msgid "Stream audio"
 msgstr ""
 
-#: src/preferences.c:2721
+#: src/preferences.c:2763
 msgid "Stream audio to playback plugin"
 msgstr ""
 
-#: src/preferences.c:2734
+#: src/preferences.c:2778
 msgid "Record player output"
 msgstr ""
 
-#: src/preferences.c:2737
+#: src/preferences.c:2781
 msgid "Record output from player instead of input to player"
 msgstr ""
 
-#: src/preferences.c:2744
+#: src/preferences.c:2789
 msgid "VIDEO"
 msgstr "VIDEO"
 
-#: src/preferences.c:2787
+#: src/preferences.c:2833
 msgid "_Player"
 msgstr "_Afspiller"
 
-#: src/preferences.c:2792
+#: src/preferences.c:2838
 msgid "(See also the Jack Integration tab for jack startup options)"
 msgstr ""
 
-#: src/preferences.c:2819
+#: src/preferences.c:2865
 msgid "mplayer"
 msgstr ""
 
-#: src/preferences.c:2830
+#: src/preferences.c:2876
 #, fuzzy
 msgid "mplayer2"
 msgstr "_Afspiller"
 
-#: src/preferences.c:2833
+#: src/preferences.c:2879
 msgid "Audio play _command"
 msgstr ""
 
-#: src/preferences.c:2840
+#: src/preferences.c:2886
 msgid "- internal -"
 msgstr "- internt -"
 
-#: src/preferences.c:2849
+#: src/preferences.c:2895
 msgid "Audio follows video _rate/direction"
 msgstr ""
 
-#: src/preferences.c:2857
+#: src/preferences.c:2903
 msgid "Audio follows _clip switches"
 msgstr ""
 
-#: src/preferences.c:2864
+#: src/preferences.c:2910
 msgid "Source:"
 msgstr ""
 
-#: src/preferences.c:2868
+#: src/preferences.c:2914
 msgid "_Internal"
 msgstr ""
 
-#: src/preferences.c:2873
+#: src/preferences.c:2919
 msgid "_External (requires jack or pulse audio player)"
 msgstr ""
 
-#: src/preferences.c:2892
+#: src/preferences.c:2940
 msgid "AUDIO"
 msgstr "LYD"
 
-#: src/preferences.c:2902
+#: src/preferences.c:2950
 msgid "Playback"
 msgstr "Afspilning"
 
-#: src/preferences.c:2925
+#: src/preferences.c:2973
 msgid ""
 "Record audio when capturing an e_xternal window\n"
 " (requires jack or pulse audio)"
 msgstr ""
 
-#: src/preferences.c:2940
+#: src/preferences.c:2988
 msgid "      What to record when 'r' is pressed   "
 msgstr ""
 
-#: src/preferences.c:2949
+#: src/preferences.c:2997
 msgid "_Frame changes"
 msgstr ""
 
-#: src/preferences.c:2964
+#: src/preferences.c:3012
 msgid "F_PS changes"
 msgstr ""
 
-#: src/preferences.c:2982
+#: src/preferences.c:3030
 msgid "_Real time effects"
 msgstr ""
 
-#: src/preferences.c:2993
+#: src/preferences.c:3041
 msgid "_Clip switches"
 msgstr ""
 
-#: src/preferences.c:3004
+#: src/preferences.c:3052
 msgid "_Audio (requires jack or pulse audio player)"
 msgstr ""
 
-#: src/preferences.c:3024
+#: src/preferences.c:3072
 msgid "Pause recording if free disk space falls below"
 msgstr ""
 
 #. TRANSLATORS: gigabytes
-#: src/preferences.c:3030
+#: src/preferences.c:3078
 msgid "GB"
 msgstr "GB"
 
-#: src/preferences.c:3037
+#: src/preferences.c:3085
 msgid "Recording"
 msgstr "Optager"
 
-#: src/preferences.c:3055
+#: src/preferences.c:3103
 msgid "Encoder"
 msgstr ""
 
-#: src/preferences.c:3090
+#: src/preferences.c:3137
 msgid "Output format"
 msgstr "Output format"
 
-#: src/preferences.c:3106
+#: src/preferences.c:3153
 msgid "Audio codec"
 msgstr "Lyd codeks"
 
-#: src/preferences.c:3119
+#: src/preferences.c:3165
 msgid "Encoding"
 msgstr "Encoder"
 
-#: src/preferences.c:3134
+#: src/preferences.c:3180
 msgid "Use _antialiasing when resizing"
 msgstr ""
 
-#: src/preferences.c:3143
+#: src/preferences.c:3189
 msgid "Number of _real time effect keys"
 msgstr ""
 
-#: src/preferences.c:3145
+#: src/preferences.c:3192
 msgid ""
 "The number of \"virtual\" real time effect keys. They can be controlled "
 "through the real time effects window, or via network (OSC)."
 msgstr ""
 
-#: src/preferences.c:3152
+#: src/preferences.c:3199
 msgid "Use _threads where possible when applying effects"
 msgstr ""
 
-#: src/preferences.c:3159
+#: src/preferences.c:3207
 msgid "Number of _threads"
 msgstr ""
 
-#: src/preferences.c:3172
+#: src/preferences.c:3221
 msgid "Restart is required if any of the following paths are changed:"
 msgstr ""
 
-#: src/preferences.c:3182
+#: src/preferences.c:3231
 msgid "Weed plugin path"
 msgstr ""
 
-#: src/preferences.c:3184
+#: src/preferences.c:3234
 msgid "Frei0r plugin path"
 msgstr ""
 
-#: src/preferences.c:3186
+#: src/preferences.c:3237
 msgid "LADSPA plugin path"
 msgstr ""
 
-#: src/preferences.c:3209
+#: src/preferences.c:3261
 msgid "      Video load directory (default)      "
 msgstr ""
 
-#: src/preferences.c:3215
+#: src/preferences.c:3267
 msgid "      Video save directory (default) "
 msgstr ""
 
-#: src/preferences.c:3221
+#: src/preferences.c:3273
 msgid "      Audio load directory (default) "
 msgstr ""
 
-#: src/preferences.c:3227
+#: src/preferences.c:3279
 msgid "      Image directory (default) "
 msgstr ""
 
-#: src/preferences.c:3233
+#: src/preferences.c:3285
 msgid "      Backup/Restore directory (default) "
 msgstr ""
 
-#: src/preferences.c:3239
+#: src/preferences.c:3291
 msgid "      Temp directory (do not remove) "
 msgstr ""
 
-#: src/preferences.c:3252
+#: src/preferences.c:3304
 msgid "The default directory for loading video clips from"
 msgstr ""
 
-#: src/preferences.c:3277
+#: src/preferences.c:3329
 msgid "The default directory for saving encoded clips to"
 msgstr ""
 
-#: src/preferences.c:3285
+#: src/preferences.c:3337
 msgid "The default directory for loading and saving audio"
 msgstr ""
 
-#: src/preferences.c:3293
+#: src/preferences.c:3345
 msgid "The default directory for saving frameshots to"
 msgstr ""
 
-#: src/preferences.c:3301
+#: src/preferences.c:3353
 msgid "The default directory for backing up/restoring single clips"
 msgstr ""
 
-#: src/preferences.c:3309
+#: src/preferences.c:3361
 msgid "LiVES working directory."
 msgstr ""
 
-#: src/preferences.c:3359
+#: src/preferences.c:3412
 msgid "Directories"
 msgstr "Mapper"
 
-#: src/preferences.c:3374
+#: src/preferences.c:3427
 msgid "Warn if diskspace falls below: "
 msgstr ""
 
-#: src/preferences.c:3380 src/preferences.c:3394
+#: src/preferences.c:3433 src/preferences.c:3447
 msgid " MB [set to 0 to disable]"
 msgstr ""
 
-#: src/preferences.c:3389
+#: src/preferences.c:3442
 msgid "Diskspace critical level: "
 msgstr ""
 
-#: src/preferences.c:3407
+#: src/preferences.c:3461
 msgid ""
 "Warn on Insert / Merge if _frame rate of clipboard does not match frame rate "
 "of selection"
 msgstr ""
 
-#: src/preferences.c:3417
+#: src/preferences.c:3471
 msgid "Warn on Open if file _size exceeds "
 msgstr ""
 
-#: src/preferences.c:3425
+#: src/preferences.c:3479
 msgid " MB"
 msgstr " MB"
 
-#: src/preferences.c:3432
+#: src/preferences.c:3486
 msgid "Show a warning before saving a se_t"
 msgstr ""
 
-#: src/preferences.c:3442
+#: src/preferences.c:3496
 msgid ""
 "Show a warning if _mplayer/mplayer2, sox, composite or convert is not found "
 "when LiVES is started."
 msgstr ""
 
-#: src/preferences.c:3452
+#: src/preferences.c:3506
 msgid "Show a warning if no _rendered effects are found at startup."
 msgstr ""
 
-#: src/preferences.c:3464
+#: src/preferences.c:3518
 msgid "Show a warning if no _encoder plugins are found at startup."
 msgstr ""
 
-#: src/preferences.c:3474
+#: src/preferences.c:3528
 msgid "Show a warning if a _duplicate set name is entered."
 msgstr ""
 
-#: src/preferences.c:3485
+#: src/preferences.c:3539
 msgid "When a set is loaded, warn if clips are missing from _layouts."
 msgstr ""
 
-#: src/preferences.c:3495
+#: src/preferences.c:3550
 msgid "Warn if a clip used in a layout is about to be closed."
 msgstr ""
 
-#: src/preferences.c:3505
+#: src/preferences.c:3561
 msgid "Warn if frames used in a layout are about to be deleted."
 msgstr ""
 
-#: src/preferences.c:3515
+#: src/preferences.c:3572
 msgid "Warn if frames used in a layout are about to be shifted."
 msgstr ""
 
-#: src/preferences.c:3525
+#: src/preferences.c:3583
 msgid "Warn if frames used in a layout are about to be altered."
 msgstr ""
 
-#: src/preferences.c:3535
+#: src/preferences.c:3594
 msgid "Warn if audio used in a layout is about to be deleted."
 msgstr ""
 
-#: src/preferences.c:3546
+#: src/preferences.c:3606
 msgid "Warn if audio used in a layout is about to be shifted."
 msgstr ""
 
-#: src/preferences.c:3556
+#: src/preferences.c:3617
 msgid "Warn if audio used in a layout is about to be altered."
 msgstr ""
 
-#: src/preferences.c:3566
+#: src/preferences.c:3628
 msgid "Popup layout errors after clip changes."
 msgstr ""
 
-#: src/preferences.c:3577
+#: src/preferences.c:3639
 msgid "Warn if the layout has not been saved when leaving multitrack mode."
 msgstr ""
 
-#: src/preferences.c:3588
+#: src/preferences.c:3650
 msgid ""
 "Warn if multitrack has no audio channels, and a layout with audio is loaded."
 msgstr ""
 
-#: src/preferences.c:3598
+#: src/preferences.c:3660
 msgid ""
 "Warn if multitrack has audio channels, and your audio player is not \"jack\" "
 "or \"pulse audio\"."
 msgstr ""
 
-#: src/preferences.c:3610
+#: src/preferences.c:3672
 msgid "Show info message after importing from firewire device."
 msgstr ""
 
-#: src/preferences.c:3626
+#: src/preferences.c:3688
 msgid "Show a warning before opening a yuv4mpeg stream (advanced)."
 msgstr ""
 
-#: src/preferences.c:3639
+#: src/preferences.c:3701
 msgid "Show a warning when multitrack is low on backup space."
 msgstr ""
 
-#: src/preferences.c:3650
+#: src/preferences.c:3713
 msgid "Show a warning advising cleaning of disk space after a crash."
 msgstr ""
 
-#: src/preferences.c:3661
+#: src/preferences.c:3725
 msgid "Show a warning if unable to connect to pulseaudio player."
 msgstr ""
 
-#: src/preferences.c:3673
+#: src/preferences.c:3737
 msgid "Show a warning before wiping a layout which has unsaved changes."
 msgstr ""
 
-#: src/preferences.c:3685
+#: src/preferences.c:3749
 msgid "Warnings"
 msgstr "Advarsler"
 
-#: src/preferences.c:3703
+#: src/preferences.c:3767
 msgid "Midi synch (requires the files midistart and midistop)"
 msgstr ""
 
-#: src/preferences.c:3715
+#: src/preferences.c:3779
 msgid "When inserting/merging frames:  "
 msgstr ""
 
-#: src/preferences.c:3719
+#: src/preferences.c:3783
 msgid "_Speed Up/Slow Down Insertion"
 msgstr ""
 
-#: src/preferences.c:3723
+#: src/preferences.c:3787
 msgid "_Resample Insertion"
 msgstr ""
 
-#: src/preferences.c:3730
+#: src/preferences.c:3794
 msgid "CD device           "
 msgstr "CD udstyr           "
 
-#: src/preferences.c:3733
+#: src/preferences.c:3797
 msgid "LiVES can load audio tracks from this CD"
 msgstr ""
 
-#: src/preferences.c:3746
+#: src/preferences.c:3813
 msgid "Default FPS        "
 msgstr ""
 
-#: src/preferences.c:3749
+#: src/preferences.c:3816
 msgid "Frames per second to use when none is specified"
 msgstr ""
 
-#: src/preferences.c:3757
+#: src/preferences.c:3825
 msgid "Misc"
 msgstr "Div"
 
-#: src/preferences.c:3782
+#: src/preferences.c:3850
 msgid "New theme:           "
 msgstr "Nyt tema           "
 
-#: src/preferences.c:3800
+#: src/preferences.c:3867
 msgid "Themes"
 msgstr "Temaer"
 
-#: src/preferences.c:3815
+#: src/preferences.c:3882
 msgid "Download bandwidth (Kb/s)       "
 msgstr ""
 
-#: src/preferences.c:3823
+#: src/preferences.c:3890
 msgid "LiVES must be compiled without \"configure --disable-OSC\" to use OMC"
 msgstr ""
 
-#: src/preferences.c:3833
+#: src/preferences.c:3900
 msgid "OMC remote control enabled"
 msgstr ""
 
-#: src/preferences.c:3841
+#: src/preferences.c:3908
 msgid "UDP port       "
 msgstr ""
 
-#: src/preferences.c:3850
+#: src/preferences.c:3917
 msgid "Start OMC on startup"
 msgstr ""
 
-#: src/preferences.c:3870
+#: src/preferences.c:3937
 msgid "Streaming/Networking"
 msgstr ""
 
-#: src/preferences.c:3882
+#: src/preferences.c:3949
 msgid "Jack transport"
 msgstr ""
 
-#: src/preferences.c:3886
+#: src/preferences.c:3953
 msgid ""
 "LiVES must be compiled with jack/transport.h and jack/jack.h present to use "
 "jack transport"
 msgstr ""
 
-#: src/preferences.c:3892
+#: src/preferences.c:3959
 msgid "Jack _transport config file"
 msgstr ""
 
-#: src/preferences.c:3899 src/preferences.c:3989
+#: src/preferences.c:3967 src/preferences.c:4058
 msgid "Start _server on LiVES startup"
 msgstr ""
 
-#: src/preferences.c:3911
+#: src/preferences.c:3979
 msgid "Jack transport _master (start and stop)"
 msgstr ""
 
-#: src/preferences.c:3921
+#: src/preferences.c:3989
 msgid "Jack transport _client (start and stop)"
 msgstr ""
 
-#: src/preferences.c:3935
+#: src/preferences.c:4003
 msgid "Jack transport sets start position"
 msgstr ""
 
-#: src/preferences.c:3952
+#: src/preferences.c:4020
 msgid "Jack transport timebase slave"
 msgstr ""
 
-#: src/preferences.c:3963
+#: src/preferences.c:4031
 msgid "(See also Playback -> Audio follows video rate/direction)"
 msgstr ""
 
-#: src/preferences.c:3971
+#: src/preferences.c:4039
 msgid "Jack audio"
 msgstr ""
 
-#: src/preferences.c:3975
+#: src/preferences.c:4043
 msgid "LiVES must be compiled with jack/jack.h present to use jack audio"
 msgstr ""
 
-#: src/preferences.c:3978
+#: src/preferences.c:4046
 msgid ""
 "You MUST set the audio player to \"jack\" in the Playback tab to use jack "
 "audio"
 msgstr ""
 
-#: src/preferences.c:3984
+#: src/preferences.c:4052
 msgid "Jack _audio server config file"
 msgstr ""
 
-#: src/preferences.c:3996
+#: src/preferences.c:4065
 msgid "Play audio even when transport is _paused"
 msgstr ""
 
-#: src/preferences.c:4008
+#: src/preferences.c:4077
 msgid "Automatically connect to System Out ports when 'playing' External Audio"
 msgstr ""
 
-#: src/preferences.c:4021
+#: src/preferences.c:4090
 msgid "Jack Integration"
 msgstr "Jack integration"
 
-#: src/preferences.c:4035
+#: src/preferences.c:4104
 msgid "Events to respond to:"
 msgstr ""
 
-#: src/preferences.c:4044
+#: src/preferences.c:4113
 msgid "_Joystick events"
 msgstr ""
 
-#: src/preferences.c:4051
+#: src/preferences.c:4120
 msgid "_Joystick device"
 msgstr "_Joystick udstyr"
 
-#: src/preferences.c:4053
+#: src/preferences.c:4122
 msgid "The joystick device, e.g. /dev/input/js0"
 msgstr ""
 
-#: src/preferences.c:4071
+#: src/preferences.c:4142
 msgid "_MIDI events"
 msgstr ""
 
-#: src/preferences.c:4080
+#: src/preferences.c:4151
 msgid "Use _ALSA MIDI (recommended)"
 msgstr ""
 
-#: src/preferences.c:4082
+#: src/preferences.c:4153
 msgid "Create an ALSA MIDI port which other MIDI devices can be connected to"
 msgstr ""
 
-#: src/preferences.c:4090
+#: src/preferences.c:4162
 msgid "Use _raw MIDI"
 msgstr ""
 
-#: src/preferences.c:4092
+#: src/preferences.c:4164
 msgid "Read directly from the MIDI device"
 msgstr ""
 
-#: src/preferences.c:4104
+#: src/preferences.c:4177
 msgid "_MIDI device"
 msgstr "_MIDI udstyr"
 
-#: src/preferences.c:4106
+#: src/preferences.c:4179
 msgid "The MIDI device, e.g. /dev/input/midi0"
 msgstr ""
 
-#: src/preferences.c:4118
+#: src/preferences.c:4193
 msgid "Advanced"
 msgstr "Avanceret"
 
-#: src/preferences.c:4124
+#: src/preferences.c:4199
 msgid "MIDI check _rate"
 msgstr ""
 
-#: src/preferences.c:4127
+#: src/preferences.c:4203
 msgid ""
 "Number of MIDI checks per keyboard tick. Increasing this may improve MIDI "
 "responsiveness, but may slow down playback."
 msgstr ""
 
-#: src/preferences.c:4134
+#: src/preferences.c:4211
 msgid "MIDI repeat"
 msgstr "MIDI gentag"
 
-#: src/preferences.c:4137
+#: src/preferences.c:4214
 msgid "Number of non-reads allowed between succesive reads."
 msgstr ""
 
-#: src/preferences.c:4140
+#: src/preferences.c:4218
 msgid "(Warning: setting this value too high can slow down playback.)"
 msgstr ""
 
-#: src/preferences.c:4159
+#: src/preferences.c:4237
 msgid "MIDI/Joystick learner"
 msgstr ""
 
-#: src/preferences.c:4499
+#: src/preferences.c:4679
 msgid ""
 "\n"
 "LiVES will now shut down. You need to restart it for the directory change to "
@@ -7523,214 +7536,214 @@
 "Click OK to continue.\n"
 msgstr ""
 
-#: src/preferences.c:4523
+#: src/preferences.c:4703
 msgid ""
 "For the directory change to take effect LiVES will restart when preferences "
 "dialog closes."
 msgstr ""
 
-#: src/preferences.c:4527
+#: src/preferences.c:4707
 msgid "Theme changes will not take effect until the next time you start LiVES."
 msgstr ""
 
-#: src/preferences.c:4531
+#: src/preferences.c:4711
 msgid "Jack options will not take effect until the next time you start LiVES."
 msgstr ""
 
-#: src/osc.c:2585
+#: src/osc.c:2616
 #, c-format
 msgid "Syncing to external framerate of %.8f frames per second.\n"
 msgstr ""
 
-#: src/osc.c:6746
+#: src/osc.c:6938
 msgid "Cannot initialize OSC receiver\n"
 msgstr ""
 
-#: src/osc.c:6770
+#: src/osc.c:6961
 #, c-format
 msgid "WARNING: Cannot start OSC server at UDP port %d\n"
 msgstr ""
 
-#: src/osc.c:6775
+#: src/osc.c:6963
 #, c-format
 msgid "Started OSC server at UDP port %d\n"
 msgstr ""
 
-#: src/osc.c:6890
+#: src/osc.c:7076
 #, c-format
 msgid "Cannot start OSC/UDP server at port %d \n"
 msgstr ""
 
-#: src/resample.c:125 src/resample.c:304
+#: src/resample.c:131 src/resample.c:305
 #, c-format
 msgid "Resizing frames 1 to %d"
 msgstr ""
 
-#: src/resample.c:140 src/resample.c:318
+#: src/resample.c:145 src/resample.c:318
 #, c-format
 msgid "Resizing/letterboxing frames 1 to %d"
 msgstr ""
 
-#: src/resample.c:361 src/resample.c:385
+#: src/resample.c:360 src/resample.c:384
 msgid "Resize"
 msgstr "Tilpas"
 
-#: src/resample.c:395
+#: src/resample.c:394
 msgid "Resample/Resize"
 msgstr ""
 
-#: src/resample.c:680
+#: src/resample.c:676
 #, c-format
 msgid "Length of video is now %d frames.\n"
 msgstr ""
 
-#: src/resample.c:745
+#: src/resample.c:737
 msgid ""
 "\n"
 "\n"
 "New rate must be greater than 0\n"
 msgstr ""
 
-#: src/resample.c:797 src/resample.c:813
+#: src/resample.c:788 src/resample.c:803
 msgid "Resampling audio"
 msgstr ""
 
-#: src/resample.c:831
+#: src/resample.c:821
 msgid "LiVES was unable to resample the audio as requested.\n"
 msgstr ""
 
-#: src/resample.c:833 src/resample.c:837
+#: src/resample.c:823 src/resample.c:827
 msgid "Resample Audio"
 msgstr ""
 
-#: src/resample.c:845
+#: src/resample.c:835
 #, c-format
 msgid "Audio was resampled to %d Hz, %d channels, %d bit"
 msgstr ""
 
-#: src/resample.c:1034
+#: src/resample.c:1016
 #, c-format
 msgid "Resampling video at %.8f frames per second..."
 msgstr ""
 
-#: src/resample.c:1037
+#: src/resample.c:1018
 #, c-format
 msgid "Resampling video at %.3f frames per second..."
 msgstr ""
 
-#: src/resample.c:1068
+#: src/resample.c:1049
 msgid "Reordering error !\n"
 msgstr ""
 
-#: src/resample.c:1079
+#: src/resample.c:1060
 msgid "Resample"
 msgstr ""
 
-#: src/resample.c:1192
+#: src/resample.c:1173
 msgid "LiVES: - Resample Audio"
 msgstr ""
 
-#: src/resample.c:1195
+#: src/resample.c:1175
 msgid "LiVES: - Insert Silence"
 msgstr "LiVES: - Indsæt stilhed"
 
-#: src/resample.c:1198
+#: src/resample.c:1177
 msgid "LiVES: - New Clip Audio"
 msgstr ""
 
-#: src/resample.c:1201
+#: src/resample.c:1179
 msgid "LiVES: - External Clip Settings"
 msgstr ""
 
-#: src/resample.c:1238 src/resample.c:1358
+#: src/resample.c:1215 src/resample.c:1332
 msgid "Rate (Hz) "
 msgstr ""
 
-#: src/resample.c:1245 src/resample.c:1372
+#: src/resample.c:1222 src/resample.c:1346
 msgid "Channels"
 msgstr ""
 
-#: src/resample.c:1252
+#: src/resample.c:1229
 msgid "Sample Size "
 msgstr ""
 
-#: src/resample.c:1268 src/resample.c:1425
+#: src/resample.c:1245 src/resample.c:1399
 msgid "Signed"
 msgstr ""
 
-#: src/resample.c:1274 src/resample.c:1435
+#: src/resample.c:1251 src/resample.c:1409
 msgid "Unsigned"
 msgstr ""
 
-#: src/resample.c:1297 src/resample.c:1460
+#: src/resample.c:1273 src/resample.c:1433
 msgid "Little Endian"
 msgstr ""
 
-#: src/resample.c:1303 src/resample.c:1468
+#: src/resample.c:1279 src/resample.c:1441
 msgid "Big Endian"
 msgstr ""
 
-#: src/resample.c:1315
+#: src/resample.c:1290
 msgid "Current"
 msgstr "Aktuel"
 
-#: src/resample.c:1340
+#: src/resample.c:1315
 msgid "_Enable audio"
 msgstr "_Slå lyd til"
 
-#: src/resample.c:1372
+#: src/resample.c:1346
 msgid "_Channels"
 msgstr ""
 
-#: src/resample.c:1394
+#: src/resample.c:1368
 msgid "_Sample Size"
 msgstr ""
 
-#: src/resample.c:1394
+#: src/resample.c:1368
 msgid "Sample Size"
 msgstr ""
 
-#: src/resample.c:1489
+#: src/resample.c:1461
 msgid "New"
 msgstr "Ny"
 
-#: src/resample.c:1512
+#: src/resample.c:1484
 msgid "_Frames Per Second "
 msgstr "_Rammer per sekundt "
 
-#: src/resample.c:1530
+#: src/resample.c:1502
 msgid "Record for maximum:  "
 msgstr ""
 
-#: src/resample.c:1533
+#: src/resample.c:1505
 msgid " hours  "
 msgstr " timer  "
 
-#: src/resample.c:1536
+#: src/resample.c:1508
 msgid " minutes  "
 msgstr " minutter  "
 
-#: src/resample.c:1538
+#: src/resample.c:1510
 msgid " seconds  "
 msgstr " sekender  "
 
-#: src/resample.c:1545
+#: src/resample.c:1517
 msgid "Unlimited"
 msgstr "Ubegrænset"
 
-#: src/resample.c:1561
+#: src/resample.c:1533
 msgid "Click OK to begin recording, or Cancel to quit."
 msgstr ""
 
-#: src/resample.c:1670
+#: src/resample.c:1638
 msgid "LiVES: - Change playback speed"
 msgstr ""
 
-#: src/resample.c:1673
+#: src/resample.c:1640
 msgid "LiVES: - Resample Video"
 msgstr ""
 
-#: src/resample.c:1696
+#: src/resample.c:1663
 #, c-format
 msgid ""
 "\n"
@@ -7741,7 +7754,7 @@
 "in _frames per second"
 msgstr ""
 
-#: src/resample.c:1701
+#: src/resample.c:1667
 #, c-format
 msgid ""
 "\n"
@@ -7752,89 +7765,89 @@
 "in frames per second"
 msgstr ""
 
-#: src/resample.c:1723
+#: src/resample.c:1688
 msgid "OR enter the desired clip length in _seconds"
 msgstr ""
 
-#: src/resample.c:1745
+#: src/resample.c:1710
 msgid "Change the _audio speed as well"
 msgstr ""
 
-#: src/resample.c:1846
+#: src/resample.c:1810
 msgid ""
 "\n"
 "Speeding up the clip will cause missing frames in some multitrack layouts.\n"
 "Are you sure you wish to change the speed ?\n"
 msgstr ""
 
-#: src/resample.c:1863
+#: src/resample.c:1829
 msgid ""
 "\n"
 "Speeding up the clip will cause missing audio in some multitrack layouts.\n"
 "Are you sure you wish to change the speed ?\n"
 msgstr ""
 
-#: src/resample.c:1878
+#: src/resample.c:1847
 msgid ""
 "\n"
 "Changing the speed will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/resample.c:1892
+#: src/resample.c:1863
 msgid ""
 "\n"
 "Changing the speed will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/resample.c:1938
+#: src/resample.c:1911
 msgid "Speed Change"
 msgstr "Hastighedsændring"
 
-#: src/resample.c:1947
+#: src/resample.c:1920
 #, c-format
 msgid "Changed playback speed to %.3f frames per second and audio to %d Hz.\n"
 msgstr ""
 
-#: src/resample.c:1950
+#: src/resample.c:1922
 #, c-format
 msgid "Changed playback speed to %.3f frames per second.\n"
 msgstr ""
 
-#: src/resample.c:2035
+#: src/resample.c:2006
 msgid "Resampling video"
 msgstr ""
 
-#: src/resample.c:2042 src/resample.c:2160 src/resample.c:2182
+#: src/resample.c:2012 src/resample.c:2127 src/resample.c:2148
 msgid "Resampling clipboard video"
 msgstr ""
 
-#: src/resample.c:2047
+#: src/resample.c:2016
 msgid "Reordering frames"
 msgstr ""
 
-#: src/resample.c:2056
+#: src/resample.c:2025
 msgid ""
 "\n"
 "\n"
 "LiVES was unable to reorder the frames."
 msgstr ""
 
-#: src/resample.c:2104
+#: src/resample.c:2071
 msgid "Deordering frames"
 msgstr ""
 
-#: src/resample.c:2199
+#: src/resample.c:2165
 msgid "resampling error..."
 msgstr ""
 
-#: src/rte_window.c:85 src/rte_window.c:1708
+#: src/rte_window.c:124 src/rte_window.c:1709
 #, c-format
 msgid "Type: %s"
 msgstr "Type: %s"
 
-#: src/rte_window.c:112
+#: src/rte_window.c:150
 msgid ""
 "\n"
 "\n"
@@ -7844,7 +7857,7 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:426
+#: src/rte_window.c:460
 msgid ""
 "\n"
 "\n"
@@ -7852,19 +7865,19 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:432
+#: src/rte_window.c:466
 #, c-format
 msgid "Saving keymap to %s\n"
 msgstr ""
 
-#: src/rte_window.c:439
+#: src/rte_window.c:471
 #, c-format
 msgid ""
 "\n"
 "Updating keymap file %s..."
 msgstr ""
 
-#: src/rte_window.c:446
+#: src/rte_window.c:477
 #, c-format
 msgid ""
 "\n"
@@ -7874,12 +7887,12 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/rte_window.c:526
+#: src/rte_window.c:556
 #, c-format
 msgid "Saving real time effect defaults to %s..."
 msgstr ""
 
-#: src/rte_window.c:535
+#: src/rte_window.c:563
 #, c-format
 msgid ""
 "\n"
@@ -7889,22 +7902,22 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/rte_window.c:632
+#: src/rte_window.c:657
 #, c-format
 msgid "Loading real time effect defaults from %s..."
 msgstr ""
 
-#: src/rte_window.c:681
+#: src/rte_window.c:701
 #, c-format
 msgid "Loading generator default sizes from %s..."
 msgstr ""
 
-#: src/rte_window.c:1306
+#: src/rte_window.c:1319
 #, c-format
 msgid "Loading default keymap from %s..."
 msgstr ""
 
-#: src/rte_window.c:1329
+#: src/rte_window.c:1339
 #, c-format
 msgid ""
 "\n"
@@ -7914,48 +7927,48 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/rte_window.c:1403
+#: src/rte_window.c:1412
 #, c-format
 msgid "Invalid line %d in %s\n"
 msgstr ""
 
-#: src/rte_window.c:1483
+#: src/rte_window.c:1490
 #, c-format
 msgid "Invalid key %d in %s\n"
 msgstr ""
 
-#: src/rte_window.c:1498
+#: src/rte_window.c:1505
 #, c-format
 msgid "Invalid effect %s in %s\n"
 msgstr ""
 
-#: src/rte_window.c:1517
+#: src/rte_window.c:1524
 #, c-format
 msgid "Unknown effect %s in %s\n"
 msgstr ""
 
-#: src/rte_window.c:1535
+#: src/rte_window.c:1542
 #, c-format
 msgid ""
 "This version of LiVES cannot mix generators/non-generators on the same key "
 "(%d) !\n"
 msgstr ""
 
-#: src/rte_window.c:1547
+#: src/rte_window.c:1554
 #, c-format
 msgid "Too many effects bound to key %d.\n"
 msgstr ""
 
-#: src/rte_window.c:1587
+#: src/rte_window.c:1593
 msgid "update required.\n"
 msgstr "opdatering nødvendig.\n"
 
-#: src/rte_window.c:1603
+#: src/rte_window.c:1607
 #, c-format
 msgid "Loading data connection map from %s..."
 msgstr ""
 
-#: src/rte_window.c:1612
+#: src/rte_window.c:1614
 msgid ""
 "\n"
 "\n"
@@ -7963,41 +7976,41 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:1691
+#: src/rte_window.c:1692
 #, c-format
 msgid "LiVES: Information for %s"
 msgstr "LiVES: Information for %s"
 
-#: src/rte_window.c:1704
+#: src/rte_window.c:1705
 #, c-format
 msgid "Effect name: %s"
 msgstr "Effekt navn: %s"
 
-#: src/rte_window.c:1712
+#: src/rte_window.c:1713
 #, c-format
 msgid "Plugin name: %s"
 msgstr "Plugin navn: %s"
 
-#: src/rte_window.c:1716
+#: src/rte_window.c:1717
 #, c-format
 msgid "Author: %s"
 msgstr "Forfatter: %s"
 
-#: src/rte_window.c:1721
+#: src/rte_window.c:1722
 #, c-format
 msgid "and: %s"
 msgstr ""
 
-#: src/rte_window.c:1726
+#: src/rte_window.c:1727
 #, c-format
 msgid "Version: %d"
 msgstr "Version: %d"
 
-#: src/rte_window.c:1734
+#: src/rte_window.c:1735
 msgid "Description: "
 msgstr "Beskrivelse: "
 
-#: src/rte_window.c:1960
+#: src/rte_window.c:1963
 msgid ""
 "\n"
 "\n"
@@ -8006,69 +8019,69 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:2024
+#: src/rte_window.c:2027
 #, c-format
 msgid "LiVES could not locate the effect %s.\n"
 msgstr ""
 
-#: src/rte_window.c:2225
+#: src/rte_window.c:2216
 msgid "LiVES: Real time effect mapping"
 msgstr ""
 
-#: src/rte_window.c:2257
+#: src/rte_window.c:2248
 #, c-format
 msgid "Ctrl-%d"
 msgstr "Ctrl-%d"
 
-#: src/rte_window.c:2264
+#: src/rte_window.c:2255
 msgid "Key active"
 msgstr ""
 
-#: src/rte_window.c:2279
+#: src/rte_window.c:2271
 msgid "Key grab"
 msgstr ""
 
-#: src/rte_window.c:2280
+#: src/rte_window.c:2272
 msgid "Grab keyboard for this effect key"
 msgstr ""
 
-#: src/rte_window.c:2290
+#: src/rte_window.c:2283
 msgid "_Clear all effects"
 msgstr ""
 
-#: src/rte_window.c:2304
+#: src/rte_window.c:2297
 msgid "Mode active"
 msgstr ""
 
-#: src/rte_window.c:2314 src/multitrack.c:8568
+#: src/rte_window.c:2307 src/multitrack.c:8762
 msgid "Info"
 msgstr "Info"
 
-#: src/rte_window.c:2315
+#: src/rte_window.c:2308
 msgid "Set Parameters"
 msgstr "Sæt parametre"
 
-#: src/rte_window.c:2316
+#: src/rte_window.c:2309
 msgid "Set Connections"
 msgstr ""
 
-#: src/rte_window.c:2317
+#: src/rte_window.c:2310
 msgid "Clear"
 msgstr "Ryd"
 
-#: src/rte_window.c:2326
+#: src/rte_window.c:2319
 msgid "Effect name:"
 msgstr "Effekt navn:"
 
-#: src/rte_window.c:2391
+#: src/rte_window.c:2384
 msgid "_Save as default keymap"
 msgstr ""
 
-#: src/rte_window.c:2396
+#: src/rte_window.c:2389
 msgid "_Load default keymap"
 msgstr ""
 
-#: src/rte_window.c:2840
+#: src/rte_window.c:2833
 #, c-format
 msgid ""
 "Unable to create default keymap file: %s\n"
@@ -8126,86 +8139,86 @@
 msgid "none\n"
 msgstr "intet\n"
 
-#: src/lives-yuv4mpeg.c:494
+#: src/lives-yuv4mpeg.c:493
 #, c-format
 msgid ""
 "Unable to set display framerate to %.3f fps.\n"
 "\n"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:503
+#: src/lives-yuv4mpeg.c:502
 #, c-format
 msgid "Unable to open yuv4mpeg out stream %s\n"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:628
+#: src/lives-yuv4mpeg.c:626
 #, c-format
 msgid "TV card %d"
 msgstr "TV kort %d"
 
-#: src/lives-yuv4mpeg.c:713
+#: src/lives-yuv4mpeg.c:710
 #, c-format
 msgid "Opened TV card %d (%s)"
 msgstr "Åbnede TV kort %d (%s)"
 
-#: src/lives-yuv4mpeg.c:760
+#: src/lives-yuv4mpeg.c:757
 #, c-format
 msgid "Firewire card %d"
 msgstr "Firewire kort %d"
 
-#: src/lives-yuv4mpeg.c:796
+#: src/lives-yuv4mpeg.c:793
 #, c-format
 msgid "Opened firewire card %d"
 msgstr "Åbnede firewire kort %d"
 
-#: src/multitrack.c:666
+#: src/multitrack.c:736
 msgid "Auto backup"
 msgstr "Auto backup"
 
-#: src/multitrack.c:868
+#: src/multitrack.c:935
 msgid "Backing audio"
 msgstr ""
 
-#: src/multitrack.c:1435
+#: src/multitrack.c:1515
 #, fuzzy, c-format
 msgid "%s : parameters for %s"
 msgstr "Ingen parametre"
 
-#: src/multitrack.c:1809 src/multitrack.c:3483
+#: src/multitrack.c:1881 src/multitrack.c:3635
 #, c-format
 msgid "Current track: %s (layer %d)\n"
 msgstr ""
 
-#: src/multitrack.c:1813 src/multitrack.c:3484
+#: src/multitrack.c:1885 src/multitrack.c:3637
 msgid "Current track: Backing audio\n"
 msgstr ""
 
-#: src/multitrack.c:1814
+#: src/multitrack.c:1886
 #, c-format
 msgid "Current track: Layer %d audio\n"
 msgstr ""
 
-#: src/multitrack.c:1817
+#: src/multitrack.c:1889
 #, c-format
 msgid "%.2f sec.\n"
 msgstr ""
 
-#: src/multitrack.c:1822 src/multitrack.c:3490
+#: src/multitrack.c:1894 src/multitrack.c:3643
 #, c-format
 msgid "Source: %s"
 msgstr "Kilde: %s"
 
-#: src/multitrack.c:1825 src/multitrack.c:3492
+#: src/multitrack.c:1897 src/multitrack.c:3645
 msgid "Right click for context menu.\n"
 msgstr ""
 
-#: src/multitrack.c:1827
+#: src/multitrack.c:1899
 msgid ""
 "Double click on a block\n"
 "to select it."
 msgstr ""
 
-#: src/multitrack.c:3312
+#: src/multitrack.c:3452
 msgid ""
 "\n"
 "\n"
@@ -8214,7 +8227,7 @@
 "right or double clicking on it.\n"
 msgstr ""
 
-#: src/multitrack.c:3315
+#: src/multitrack.c:3455
 msgid ""
 "\n"
 "\n"
@@ -8222,14 +8235,14 @@
 "Select an effect in FX stack first to view its parameters.\n"
 msgstr ""
 
-#: src/multitrack.c:3318
+#: src/multitrack.c:3458
 msgid ""
 "\n"
 "\n"
 "No clips loaded.\n"
 msgstr ""
 
-#: src/multitrack.c:3321
+#: src/multitrack.c:3462
 msgid ""
 "You must select two video tracks\n"
 "and a time region\n"
@@ -8239,7 +8252,7 @@
 "before inserting clips into the timeline."
 msgstr ""
 
-#: src/multitrack.c:3324
+#: src/multitrack.c:3465
 msgid ""
 "\n"
 "\n"
@@ -8248,210 +8261,210 @@
 "to apply compositors.\n"
 msgstr ""
 
-#: src/multitrack.c:3487
+#: src/multitrack.c:3640
 #, c-format
 msgid "%.2f sec. to %.2f sec.\n"
 msgstr ""
 
-#: src/multitrack.c:3493
+#: src/multitrack.c:3646
 msgid ""
 "Single click on timeline\n"
 "to select a frame.\n"
 msgstr ""
 
-#: src/multitrack.c:3711 src/multitrack.c:6790
+#: src/multitrack.c:3858 src/multitrack.c:6972
 #, c-format
 msgid "%s [unstable]"
 msgstr ""
 
-#: src/multitrack.c:3822
+#: src/multitrack.c:3973
 msgid ""
 "You can click and drag\n"
 "below the timeline"
 msgstr ""
 
-#: src/multitrack.c:3823
+#: src/multitrack.c:3974
 msgid "to select a time region.\n"
 msgstr ""
 
-#: src/multitrack.c:3985
+#: src/multitrack.c:4137
 msgid "LiVES: Selected clip"
 msgstr ""
 
-#: src/multitrack.c:3993
+#: src/multitrack.c:4145
 msgid "_Adjust start and end points"
 msgstr ""
 
-#: src/multitrack.c:4002
+#: src/multitrack.c:4154
 msgid "_Edit/encode in clip editor"
 msgstr ""
 
-#: src/multitrack.c:4009
+#: src/multitrack.c:4161
 msgid "_Show clip information"
 msgstr ""
 
-#: src/multitrack.c:4016
+#: src/multitrack.c:4168
 msgid "_Close this clip"
 msgstr ""
 
-#: src/multitrack.c:4236
+#: src/multitrack.c:4388
 msgid "Audio mixer (ctrl-m)"
 msgstr ""
 
-#: src/multitrack.c:4336
+#: src/multitrack.c:4488
 msgid "Single click on timeline"
 msgstr ""
 
-#: src/multitrack.c:4337
+#: src/multitrack.c:4489
 msgid "to select a frame."
 msgstr "at vælge en ramme."
 
-#: src/multitrack.c:4338
+#: src/multitrack.c:4490
 msgid "Double click or right click on timeline"
 msgstr ""
 
-#: src/multitrack.c:4339
+#: src/multitrack.c:4491
 msgid "to select a block."
 msgstr "at vælge en blok."
 
-#: src/multitrack.c:4340
+#: src/multitrack.c:4492
 msgid "Clips can be dragged"
 msgstr ""
 
-#: src/multitrack.c:4341
+#: src/multitrack.c:4493
 msgid "onto the timeline."
 msgstr ""
 
-#: src/multitrack.c:4343
+#: src/multitrack.c:4495
 msgid "Mouse mode is: Move"
 msgstr ""
 
-#: src/multitrack.c:4344
+#: src/multitrack.c:4496
 msgid "clips can be moved around."
 msgstr ""
 
-#: src/multitrack.c:4349
+#: src/multitrack.c:4500
 msgid "Mouse mode is: Select."
 msgstr ""
 
-#: src/multitrack.c:4350
+#: src/multitrack.c:4501
 msgid "Drag with mouse on timeline"
 msgstr ""
 
-#: src/multitrack.c:4351
+#: src/multitrack.c:4502
 msgid "to select tracks and time."
 msgstr ""
 
-#: src/multitrack.c:4362
+#: src/multitrack.c:4509
 msgid "_Insert mode: Normal"
 msgstr ""
 
-#: src/multitrack.c:4378
+#: src/multitrack.c:4537
 msgid "_Mouse mode: Move"
 msgstr ""
 
-#: src/multitrack.c:4382
+#: src/multitrack.c:4540
 msgid "_Mouse mode: Select"
 msgstr ""
 
-#: src/multitrack.c:4405 src/multitrack.c:7925
+#: src/multitrack.c:4563 src/multitrack.c:8104
 msgid "Gravity: Normal"
 msgstr ""
 
-#: src/multitrack.c:4409
+#: src/multitrack.c:4565
 msgid "Gravity: Left"
 msgstr ""
 
-#: src/multitrack.c:4414
+#: src/multitrack.c:4569
 msgid "Gravity: Right"
 msgstr ""
 
-#: src/multitrack.c:4416
+#: src/multitrack.c:4570
 msgid "Close _last gap(s) in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:4419
+#: src/multitrack.c:4572
 msgid "Close _first gap(s) in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:4458
+#: src/multitrack.c:4627
 msgid "Close gaps"
 msgstr ""
 
-#: src/multitrack.c:4460
+#: src/multitrack.c:4629
 msgid "Move block"
 msgstr "Flyt blok"
 
-#: src/multitrack.c:4462
+#: src/multitrack.c:4631
 msgid "Move audio block"
 msgstr "Flyt lydblok"
 
-#: src/multitrack.c:4464
+#: src/multitrack.c:4633
 msgid "Delete block"
 msgstr "Slet blok"
 
-#: src/multitrack.c:4466
+#: src/multitrack.c:4635
 msgid "Delete audio block"
 msgstr "Slet lydblok"
 
-#: src/multitrack.c:4468
+#: src/multitrack.c:4637
 msgid "Split tracks"
 msgstr "Split spor"
 
-#: src/multitrack.c:4470
+#: src/multitrack.c:4639
 msgid "Split block"
 msgstr "Split blok"
 
-#: src/multitrack.c:4473
+#: src/multitrack.c:4642
 #, c-format
 msgid "Apply %s"
 msgstr ""
 
-#: src/multitrack.c:4478
+#: src/multitrack.c:4647
 #, c-format
 msgid "Delete %s"
 msgstr "Slet %s"
 
-#: src/multitrack.c:4482
+#: src/multitrack.c:4651
 msgid "Insert block"
 msgstr "Indsæt blok"
 
-#: src/multitrack.c:4484
+#: src/multitrack.c:4653
 msgid "Insert gap"
 msgstr "Indsæt mellemrum"
 
-#: src/multitrack.c:4486
+#: src/multitrack.c:4655
 msgid "Insert audio block"
 msgstr "Indsæt lydblok"
 
-#: src/multitrack.c:4488
+#: src/multitrack.c:4657
 msgid "Effect order change"
 msgstr ""
 
-#: src/multitrack.c:4898
+#: src/multitrack.c:5064
 msgid "unsigned "
 msgstr ""
 
-#: src/multitrack.c:4899
+#: src/multitrack.c:5065
 msgid "signed "
 msgstr ""
 
-#: src/multitrack.c:4904
+#: src/multitrack.c:5071
 #, c-format
 msgid ""
 "Multitrack values set to %.3f fps, frame size %d x %d, audio channels %d, "
 "audio rate %d, audio sample size %d, %s.\n"
 msgstr ""
 
-#: src/multitrack.c:4938
+#: src/multitrack.c:5104
 msgid "invalid event list. Failed.\n"
 msgstr ""
 
-#: src/multitrack.c:4944
+#: src/multitrack.c:5110
 msgid "event list has invalid fps. Failed.\n"
 msgstr ""
 
-#: src/multitrack.c:4953
+#: src/multitrack.c:5122
 #, c-format
 msgid ""
 "\n"
@@ -8461,7 +8474,7 @@
 "then load in the new set from the File menu.\n"
 msgstr ""
 
-#: src/multitrack.c:4993
+#: src/multitrack.c:5163
 #, c-format
 msgid ""
 "\n"
@@ -8469,600 +8482,592 @@
 "It cannot be loaded.\n"
 msgstr ""
 
-#: src/multitrack.c:5329 src/multitrack.c:5338 src/multitrack.c:21133
+#: src/multitrack.c:5452
 msgid "Layout was wiped.\n"
 msgstr ""
 
-#: src/multitrack.c:5374
+#: src/multitrack.c:5547
 #, c-format
 msgid "LiVES-%s: Multitrack %dx%d : %d bpp %.3f fps"
 msgstr ""
 
-#: src/multitrack.c:5617
+#: src/multitrack.c:5793
 msgid "In/out"
 msgstr ""
 
-#: src/multitrack.c:5619
+#: src/multitrack.c:5795
 msgid "FX stack"
 msgstr ""
 
-#: src/multitrack.c:5627 src/omc-learn.c:673
+#: src/multitrack.c:5803 src/omc-learn.c:659
 msgid "Params."
 msgstr ""
 
-#: src/multitrack.c:5978
+#: src/multitrack.c:6157
 msgid "_Open..."
 msgstr "_Åbn..."
 
-#: src/multitrack.c:5996
+#: src/multitrack.c:6175
 msgid "O_pen File Selection..."
 msgstr ""
 
-#: src/multitrack.c:6040
+#: src/multitrack.c:6219
 msgid "Import Selection from _dvd/vcd..."
 msgstr ""
 
-#: src/multitrack.c:6050
+#: src/multitrack.c:6229
 msgid "Import Selection from _dvd"
 msgstr ""
 
-#: src/multitrack.c:6060
+#: src/multitrack.c:6239
 msgid "Import Selection from _vcd"
 msgstr ""
 
-#: src/multitrack.c:6076
+#: src/multitrack.c:6255
 msgid "_Import from Device"
 msgstr ""
 
-#: src/multitrack.c:6103
+#: src/multitrack.c:6282
 msgid "_Close the selected clip"
 msgstr ""
 
-#: src/multitrack.c:6198
+#: src/multitrack.c:6377
 msgid "_Save layout as..."
 msgstr ""
 
-#: src/multitrack.c:6206
+#: src/multitrack.c:6385
 msgid "_Load layout..."
 msgstr "_Indlæs layout..."
 
-#: src/multitrack.c:6210
+#: src/multitrack.c:6389
 msgid "_Wipe/Delete layout..."
 msgstr ""
 
-#: src/multitrack.c:6236
+#: src/multitrack.c:6415
 msgid "_Ignore width, height and audio values from loaded layouts"
 msgstr ""
 
-#: src/multitrack.c:6240
+#: src/multitrack.c:6419
 msgid "Auto load _subtitles with clips"
 msgstr ""
 
-#: src/multitrack.c:6322
+#: src/multitrack.c:6501
 msgid "_CLIP EDITOR"
 msgstr ""
 
-#: src/multitrack.c:6334
+#: src/multitrack.c:6513
 msgid "_Adjust selected clip start/end points"
 msgstr ""
 
-#: src/multitrack.c:6343
+#: src/multitrack.c:6522
 msgid "_Insert selected clip"
 msgstr ""
 
-#: src/multitrack.c:6355
+#: src/multitrack.c:6534
 msgid "_Insert selected clip audio"
 msgstr ""
 
-#: src/multitrack.c:6364
+#: src/multitrack.c:6543
 msgid "_Delete selected block"
 msgstr "_Slet den valgte blok"
 
-#: src/multitrack.c:6373
+#: src/multitrack.c:6555
 msgid "_Jump to previous block boundary"
 msgstr ""
 
-#: src/multitrack.c:6382
+#: src/multitrack.c:6564
 msgid "_Jump to next block boundary"
 msgstr ""
 
-#: src/multitrack.c:6395
+#: src/multitrack.c:6577
 msgid "Clear _marks from timeline"
 msgstr ""
 
-#: src/multitrack.c:6403
+#: src/multitrack.c:6585
 msgid "Ignore selection limits when inserting"
 msgstr ""
 
-#: src/multitrack.c:6420 src/multitrack.c:16719
+#: src/multitrack.c:6602 src/multitrack.c:17009
 msgid "_Play from Timeline Position"
 msgstr ""
 
-#: src/multitrack.c:6434
+#: src/multitrack.c:6616
 msgid "Pla_y selected time only"
 msgstr ""
 
-#: src/multitrack.c:6518
+#: src/multitrack.c:6700
 msgid "_Move effects with blocks"
 msgstr ""
 
-#: src/multitrack.c:6531
+#: src/multitrack.c:6713
 msgid "Select _autotransition effect..."
 msgstr ""
 
-#: src/multitrack.c:6542
+#: src/multitrack.c:6724
 msgid "Crossfade audio with autotransition"
 msgstr ""
 
-#: src/multitrack.c:6550
+#: src/multitrack.c:6732
 msgid "View/_Edit selected effect"
 msgstr ""
 
-#: src/multitrack.c:6554
+#: src/multitrack.c:6736
 msgid "_Delete selected effect"
 msgstr "_Slet den valgte effekt"
 
-#: src/multitrack.c:6562
+#: src/multitrack.c:6744
 msgid "Apply effect to _block..."
 msgstr ""
 
-#: src/multitrack.c:6619
+#: src/multitrack.c:6801
 msgid "Apply effect to _region..."
 msgstr ""
 
-#: src/multitrack.c:6885
+#: src/multitrack.c:7061
 msgid "_Tracks"
 msgstr "_Spor"
 
-#: src/multitrack.c:6896
+#: src/multitrack.c:7072
 msgid "Rename current track"
 msgstr ""
 
-#: src/multitrack.c:6904
+#: src/multitrack.c:7080
 msgid "Make _Backing Audio current track"
 msgstr ""
 
-#: src/multitrack.c:6915
+#: src/multitrack.c:7091
 msgid "Add Video Track at _Rear"
 msgstr ""
 
-#: src/multitrack.c:6923
+#: src/multitrack.c:7099
 msgid "Add Video Track at _Front"
 msgstr ""
 
-#: src/multitrack.c:6936
+#: src/multitrack.c:7112
 msgid "_Split current track at cursor"
 msgstr ""
 
-#: src/multitrack.c:6948
+#: src/multitrack.c:7124
 msgid "_Split selected video tracks"
 msgstr ""
 
-#: src/multitrack.c:6961
+#: src/multitrack.c:7137
 msgid "Insert gap in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:6969
+#: src/multitrack.c:7145
 msgid "Insert gap in current track/selected time"
 msgstr ""
 
-#: src/multitrack.c:6981
+#: src/multitrack.c:7157
 msgid "Close all _gaps in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:7007
+#: src/multitrack.c:7183
 msgid "Se_lection"
 msgstr "Va_lg"
 
-#: src/multitrack.c:7018
+#: src/multitrack.c:7194
 msgid "_Select Current Track"
 msgstr "_Vælg aktuelt spor"
 
-#: src/multitrack.c:7025
+#: src/multitrack.c:7201
 msgid "Select _all video tracks"
 msgstr "Vælg _alle videospor"
 
-#: src/multitrack.c:7032
+#: src/multitrack.c:7208
 msgid "Select _no video tracks"
 msgstr "Vælg _ingen videospor"
 
-#: src/multitrack.c:7039
+#: src/multitrack.c:7215
 msgid "Select all _time"
 msgstr ""
 
-#: src/multitrack.c:7050
+#: src/multitrack.c:7226
 msgid "Select from _zero time"
 msgstr ""
 
-#: src/multitrack.c:7057
+#: src/multitrack.c:7233
 msgid "Select to _end time"
 msgstr ""
 
-#: src/multitrack.c:7064
+#: src/multitrack.c:7240
 msgid "_Copy..."
 msgstr "_Kopier..."
 
-#: src/multitrack.c:7075
+#: src/multitrack.c:7251
 msgid "_Timecode to region start"
 msgstr ""
 
-#: src/multitrack.c:7082
+#: src/multitrack.c:7258
 msgid "_Timecode to region end"
 msgstr ""
 
-#: src/multitrack.c:7089
+#: src/multitrack.c:7265
 msgid "_Region start to timecode"
 msgstr ""
 
-#: src/multitrack.c:7096
+#: src/multitrack.c:7272
 msgid "_Region end to timecode"
 msgstr ""
 
-#: src/multitrack.c:7110
+#: src/multitrack.c:7286
 msgid "Select/deselect block at current track/time"
 msgstr ""
 
-#: src/multitrack.c:7135
+#: src/multitrack.c:7311
 msgid "_Change width, height and audio values..."
 msgstr ""
 
-#: src/multitrack.c:7194
+#: src/multitrack.c:7370
 msgid "_Render"
 msgstr ""
 
-#: src/multitrack.c:7205
+#: src/multitrack.c:7381
 msgid "_Render all to new clip"
 msgstr ""
 
-#: src/multitrack.c:7220
+#: src/multitrack.c:7396
 msgid "Render _video"
 msgstr ""
 
-#: src/multitrack.c:7225
+#: src/multitrack.c:7401
 msgid "Render _audio"
 msgstr ""
 
-#: src/multitrack.c:7235
+#: src/multitrack.c:7411
 msgid "_Normalise rendered audio"
 msgstr ""
 
-#: src/multitrack.c:7242
+#: src/multitrack.c:7418
 msgid "_Pre-render audio"
 msgstr ""
 
-#: src/multitrack.c:7251
+#: src/multitrack.c:7427
 msgid "_View"
 msgstr "_Vis"
 
-#: src/multitrack.c:7270
+#: src/multitrack.c:7446
 msgid "Block _In/out points"
 msgstr ""
 
-#: src/multitrack.c:7279
+#: src/multitrack.c:7455
 msgid "_Effects at current"
 msgstr ""
 
-#: src/multitrack.c:7297
+#: src/multitrack.c:7473
 msgid "Audio parameters"
 msgstr "Lydparametre"
 
-#: src/multitrack.c:7308
+#: src/multitrack.c:7484
 msgid "Show backing _audio track"
 msgstr ""
 
-#: src/multitrack.c:7312
+#: src/multitrack.c:7488
 msgid "Compact view"
 msgstr "Kompakt visning"
 
-#: src/multitrack.c:7320
+#: src/multitrack.c:7496
 msgid "Maximum tracks to display..."
 msgstr ""
 
-#: src/multitrack.c:7327
+#: src/multitrack.c:7503
 msgid "Scroll to follow playback"
 msgstr ""
 
-#: src/multitrack.c:7331
+#: src/multitrack.c:7507
 msgid "_Center on cursor"
 msgstr ""
 
-#: src/multitrack.c:7338
+#: src/multitrack.c:7514
 msgid "_Zoom in"
 msgstr "_Zoom ind"
 
-#: src/multitrack.c:7349
+#: src/multitrack.c:7525
 msgid "_Zoom out"
 msgstr "_Zoom ud"
 
-#: src/multitrack.c:7361
+#: src/multitrack.c:7537
 msgid "Multitrack _details"
 msgstr ""
 
-#: src/multitrack.c:7374
+#: src/multitrack.c:7550
 msgid "_Event Window"
 msgstr ""
 
-#: src/multitrack.c:7378
+#: src/multitrack.c:7554
 msgid "_Event Window (selected time only)"
 msgstr ""
 
-#: src/multitrack.c:7382
+#: src/multitrack.c:7558
 msgid "_Show FRAME events"
 msgstr ""
 
-#: src/multitrack.c:7399
+#: src/multitrack.c:7575
 msgid "_Show multitrack keys"
 msgstr ""
 
-#: src/multitrack.c:7468
+#: src/multitrack.c:7644
 msgid "Mouse mode: _Move"
 msgstr ""
 
-#: src/multitrack.c:7476
+#: src/multitrack.c:7652
 msgid "Mouse mode: _Select"
 msgstr ""
 
-#: src/multitrack.c:7505
+#: src/multitrack.c:7681
 msgid "Insert mode: _Normal"
 msgstr ""
 
-#: src/multitrack.c:7733
+#: src/multitrack.c:7909
 msgid "Insert with _audio"
 msgstr ""
 
-#: src/multitrack.c:7734
+#: src/multitrack.c:7910
 msgid ""
 "Select whether video clips are inserted and moved with their audio or not"
 msgstr ""
 
-#: src/multitrack.c:7829
+#: src/multitrack.c:8007
 msgid "Select _overlap"
 msgstr ""
 
-#: src/multitrack.c:7830
+#: src/multitrack.c:8008
 msgid ""
 "Select whether timeline selection snaps to overlap between selected tracks "
 "or not"
 msgstr ""
 
-#: src/multitrack.c:7894 src/multitrack.c:14198
+#: src/multitrack.c:8073 src/multitrack.c:14422
 msgid "Expanded View (d)"
 msgstr ""
 
-#: src/multitrack.c:7897 src/multitrack.c:14205
+#: src/multitrack.c:8076 src/multitrack.c:14428
 msgid "Compact View (d)"
 msgstr ""
 
-#: src/multitrack.c:7939
+#: src/multitrack.c:8118
 msgid "Gravity: _Normal"
 msgstr ""
 
-#: src/multitrack.c:7952
+#: src/multitrack.c:8131
 msgid "Gravity: _Left"
 msgstr ""
 
-#: src/multitrack.c:7967
+#: src/multitrack.c:8146
 msgid "Gravity: _Right"
 msgstr ""
 
-#: src/multitrack.c:8297
+#: src/multitrack.c:8496
 msgid "_Apply"
 msgstr "_Anvend"
 
-#: src/multitrack.c:8319
+#: src/multitrack.c:8518
 msgid "Time"
 msgstr "Tid"
 
-#: src/multitrack.c:8333
+#: src/multitrack.c:8532
 msgid "_Del. node"
 msgstr ""
 
-#: src/multitrack.c:8341
+#: src/multitrack.c:8540
 msgid "_Next node"
 msgstr ""
 
-#: src/multitrack.c:8349
+#: src/multitrack.c:8548
 msgid "_Prev node"
 msgstr ""
 
-#: src/multitrack.c:8373
+#: src/multitrack.c:8574
 msgid "_Reverse playback  "
 msgstr ""
 
-#: src/multitrack.c:8395
+#: src/multitrack.c:8596
 msgid "_Velocity  "
 msgstr ""
 
-#: src/multitrack.c:8464
+#: src/multitrack.c:8664
 msgid "Anchor _start"
 msgstr ""
 
-#: src/multitrack.c:8465
+#: src/multitrack.c:8665
 msgid "Anchor the start point to the timeline"
 msgstr ""
 
-#: src/multitrack.c:8481
-msgid "Start frame"
-msgstr "Start ramme"
-
-#: src/multitrack.c:8533
+#: src/multitrack.c:8728
 msgid "Anchor _end"
 msgstr ""
 
-#: src/multitrack.c:8534
+#: src/multitrack.c:8729
 msgid "Anchor the end point to the timeline"
 msgstr ""
 
-#: src/multitrack.c:8546
-msgid "End frame"
-msgstr "Slut ramme"
-
-#: src/multitrack.c:8739
+#: src/multitrack.c:8929
 msgid "Scroll"
 msgstr "Rul"
 
-#: src/multitrack.c:9316
+#: src/multitrack.c:9502
 msgid ""
 "\n"
 "==============================\n"
 "Switched to Clip Edit mode\n"
 msgstr ""
 
-#: src/multitrack.c:9502
+#: src/multitrack.c:9708
 msgid "Timeline (seconds)"
 msgstr ""
 
-#: src/multitrack.c:9984
+#: src/multitrack.c:10202
 msgid " Backing audio"
 msgstr ""
 
-#: src/multitrack.c:9987
+#: src/multitrack.c:10204
 #, c-format
 msgid " Layer %d audio"
 msgstr ""
 
-#: src/multitrack.c:9995
+#: src/multitrack.c:10212
 msgid "Show/hide audio details"
 msgstr ""
 
-#: src/multitrack.c:10010 src/multitrack.c:10232
+#: src/multitrack.c:10227 src/multitrack.c:10452
 #, c-format
 msgid "Layer %d audio"
 msgstr ""
 
-#: src/multitrack.c:10144 src/multitrack.c:10261
+#: src/multitrack.c:10353 src/multitrack.c:10481
 #, c-format
 msgid "%s (layer %d)"
 msgstr ""
 
-#: src/multitrack.c:10184
+#: src/multitrack.c:10403
 msgid "Select track"
 msgstr "Vælg spor"
 
-#: src/multitrack.c:10188
+#: src/multitrack.c:10407
 msgid "Show/hide audio"
 msgstr "Vis/skjul lyd"
 
-#: src/multitrack.c:10194
+#: src/multitrack.c:10413
 #, c-format
 msgid "Video %d"
 msgstr "Video %d"
 
-#: src/multitrack.c:10233
+#: src/multitrack.c:10453
 #, c-format
 msgid " %s"
 msgstr " %s"
 
-#: src/multitrack.c:10346
+#: src/multitrack.c:10574
 msgid "LiVES: Selected effect"
 msgstr "LiVES: Valgt effekt"
 
-#: src/multitrack.c:10358
+#: src/multitrack.c:10586
 msgid "_View/Edit this effect"
 msgstr ""
 
-#: src/multitrack.c:10361
+#: src/multitrack.c:10588
 msgid "_View this effect"
 msgstr "_Vis denne effekt"
 
-#: src/multitrack.c:10369
+#: src/multitrack.c:10596
 msgid "_Delete this effect"
 msgstr "_Slet denne effekt"
 
-#: src/multitrack.c:10422
+#: src/multitrack.c:10648
 msgid "Cannot insert after this effect"
 msgstr ""
 
-#: src/multitrack.c:10451
+#: src/multitrack.c:10677
 msgid "This effect cannot be moved"
 msgstr "Denne effekt kan ikke flyttes"
 
-#: src/multitrack.c:10499
+#: src/multitrack.c:10724
 #, c-format
 msgid "  %d to %d selected  "
 msgstr ""
 
-#: src/multitrack.c:10502 src/multitrack.c:10746
+#: src/multitrack.c:10727 src/multitrack.c:10968
 #, c-format
 msgid "%.2f sec."
 msgstr ""
 
-#: src/multitrack.c:10717
+#: src/multitrack.c:10940
 #, c-format
 msgid "%d frames"
 msgstr "%d rammer"
 
-#: src/multitrack.c:11070
+#: src/multitrack.c:11299
 msgid ""
 "\n"
 "==============================\n"
 "Switched to Multitrack mode\n"
 msgstr ""
 
-#: src/multitrack.c:12691
+#: src/multitrack.c:12939
 msgid "Drag the time slider to where you"
 msgstr ""
 
-#: src/multitrack.c:12692
+#: src/multitrack.c:12940
 msgid "want to set effect parameters"
 msgstr ""
 
-#: src/multitrack.c:12693
+#: src/multitrack.c:12941
 msgid "Set parameters, then click \"Apply\"\n"
 msgstr ""
 
-#: src/multitrack.c:12694
+#: src/multitrack.c:12942
 msgid ""
 "NODES are points where parameters\n"
 "have been set.\n"
 "Nodes can be deleted."
 msgstr ""
 
-#: src/multitrack.c:12697
+#: src/multitrack.c:12944
 msgid "Effect has no parameters.\n"
 msgstr ""
 
-#: src/multitrack.c:12788
+#: src/multitrack.c:13033
 #, c-format
 msgid "%s output"
 msgstr "%s output"
 
-#: src/multitrack.c:12794 src/multitrack.c:12804
+#: src/multitrack.c:13038 src/multitrack.c:13046
 #, c-format
 msgid "layer %d"
 msgstr ""
 
-#: src/multitrack.c:12796 src/multitrack.c:12806
+#: src/multitrack.c:13039 src/multitrack.c:13047
 msgid "audio track"
 msgstr "lydspor"
 
-#: src/multitrack.c:12797
+#: src/multitrack.c:13040
 #, c-format
 msgid "%s to %s"
 msgstr "%s til %s"
 
-#: src/multitrack.c:12807
+#: src/multitrack.c:13048
 #, c-format
 msgid "%s from %s"
 msgstr ""
 
-#: src/multitrack.c:12860
+#: src/multitrack.c:13099
 msgid "_Prev filter map"
 msgstr ""
 
-#: src/multitrack.c:12871
+#: src/multitrack.c:13110
 msgid "Insert _before"
 msgstr "Indsæt _før"
 
-#: src/multitrack.c:12881
+#: src/multitrack.c:13120
 msgid "Insert _after"
 msgstr "Indsæt _efter"
 
-#: src/multitrack.c:12896
+#: src/multitrack.c:13134
 msgid "_Next filter map"
 msgstr ""
 
-#: src/multitrack.c:12911
+#: src/multitrack.c:13148
 msgid ""
 "\n"
 "\n"
@@ -9070,271 +9075,271 @@
 "current time.\n"
 msgstr ""
 
-#: src/multitrack.c:12929
+#: src/multitrack.c:13166
 msgid ""
 "Drag a compositor anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:12936
+#: src/multitrack.c:13173
 msgid ""
 "Drag a transition anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:12944
+#: src/multitrack.c:13181
 msgid ""
 "Effects can be dragged\n"
 "onto blocks on the timeline."
 msgstr ""
 
-#: src/multitrack.c:13166
+#: src/multitrack.c:13406
 msgid "LiVES: Selected block/frame"
 msgstr ""
 
-#: src/multitrack.c:13173
+#: src/multitrack.c:13413
 msgid "_Select this block"
 msgstr "_Vælg denne blok"
 
-#: src/multitrack.c:13183
+#: src/multitrack.c:13423
 msgid "_Split block here"
 msgstr "_Split blok her"
 
-#: src/multitrack.c:13191
+#: src/multitrack.c:13431
 msgid "List _effects here"
 msgstr ""
 
-#: src/multitrack.c:13200 src/multitrack.c:13277
+#: src/multitrack.c:13440 src/multitrack.c:13518
 #, c-format
 msgid "_Adjust %s"
 msgstr "_Juster %s"
 
-#: src/multitrack.c:13215
+#: src/multitrack.c:13455
 msgid "_Delete this block"
 msgstr "Slet denne _blok"
 
-#: src/multitrack.c:13258
+#: src/multitrack.c:13500
 msgid "_Insert here"
 msgstr "_Indsæt her"
 
-#: src/multitrack.c:13264
+#: src/multitrack.c:13505
 msgid "_Insert audio here"
 msgstr "_Indsæt lyd her"
 
-#: src/multitrack.c:14801
+#: src/multitrack.c:15017
 #, c-format
 msgid "Inserted gap in selected tracks from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:14835
+#: src/multitrack.c:15048
 #, c-format
 msgid "Inserted gap in track %s from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15036
+#: src/multitrack.c:15244
 #, c-format
 msgid "Undid %s\n"
 msgstr ""
 
-#: src/multitrack.c:15235
+#: src/multitrack.c:15445
 #, c-format
 msgid "Redid %s\n"
 msgstr ""
 
-#: src/multitrack.c:15268
+#: src/multitrack.c:15475
 msgid ""
 "\n"
 " (variable)"
 msgstr ""
 
-#: src/multitrack.c:15502 src/multitrack.c:15614 src/multitrack.c:18736
-#: src/multitrack.c:18748
+#: src/multitrack.c:15710 src/multitrack.c:15823 src/multitrack.c:19077
+#: src/multitrack.c:19089
 #, c-format
 msgid "track %s"
 msgstr "spor %s"
 
-#: src/multitrack.c:15507 src/multitrack.c:15619 src/multitrack.c:18741
+#: src/multitrack.c:15715 src/multitrack.c:15828 src/multitrack.c:19082
 #, c-format
 msgid "tracks %s and %s"
 msgstr "spor %s og %s"
 
-#: src/multitrack.c:15513 src/multitrack.c:15625 src/multitrack.c:18751
+#: src/multitrack.c:15721 src/multitrack.c:15834 src/multitrack.c:19091
 msgid "selected tracks"
 msgstr "valgte spor"
 
-#: src/multitrack.c:15516
+#: src/multitrack.c:15726
 #, c-format
 msgid "Added %s %s to %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15550
+#: src/multitrack.c:15760
 #, c-format
 msgid "Added effect %s to track %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15631
+#: src/multitrack.c:15845
 #, c-format
 msgid "Deleted %s %s from %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15935
+#: src/multitrack.c:16143
 #, c-format
 msgid "rendered %d frames to new clip.\n"
 msgstr ""
 
-#: src/multitrack.c:16025
+#: src/multitrack.c:16230
 msgid "Cleaning up..."
 msgstr "Rydder op..."
 
-#: src/multitrack.c:16712
+#: src/multitrack.c:17003
 msgid "_Pause"
 msgstr "_Pause"
 
-#: src/multitrack.c:16713
+#: src/multitrack.c:17004
 msgid "Pause (p)"
 msgstr "Pause (p)"
 
-#: src/multitrack.c:16856
+#: src/multitrack.c:17151
 msgid "Press 'm' during playback"
 msgstr ""
 
-#: src/multitrack.c:16857
+#: src/multitrack.c:17152
 msgid "to make a mark on the timeline"
 msgstr ""
 
-#: src/multitrack.c:17154
+#: src/multitrack.c:17498
 #, c-format
 msgid ""
 "Inserted audio %.4f to %.4f from clip %s into backing audio from time %.4f "
 "to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:17414
+#: src/multitrack.c:17759
 #, c-format
 msgid ""
 "Inserted frames %d to %d from clip %s into track %s from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:17998
+#: src/multitrack.c:18332
 #, c-format
 msgid ""
 "Time region %.3f to %.3f\n"
 "selected.\n"
 msgstr ""
 
-#: src/multitrack.c:18002
+#: src/multitrack.c:18336
 msgid ""
 "select one or more tracks\n"
 "to create a region.\n"
 msgstr ""
 
-#: src/multitrack.c:18004
+#: src/multitrack.c:18337
 #, c-format
 msgid "%d video tracks selected.\n"
 msgstr ""
 
-#: src/multitrack.c:18006
+#: src/multitrack.c:18339
 msgid ""
 "Double click on timeline\n"
 "to deselect time region."
 msgstr ""
 
-#: src/multitrack.c:18013
+#: src/multitrack.c:18346
 msgid ""
 "Single click on an effect\n"
 "to select it."
 msgstr ""
 
-#: src/multitrack.c:18014
+#: src/multitrack.c:18347
 msgid ""
 "Double click on an effect\n"
 "to edit it."
 msgstr ""
 
-#: src/multitrack.c:18015
+#: src/multitrack.c:18348
 msgid ""
 "Right click on an effect\n"
 "for context menu.\n"
 msgstr ""
 
-#: src/multitrack.c:18017
+#: src/multitrack.c:18350
 msgid ""
 "Effect order can be changed at\n"
 "FILTER MAPS"
 msgstr ""
 
-#: src/multitrack.c:18024
+#: src/multitrack.c:18357
 msgid ""
 "You can select an effect,\n"
 "then use the INSERT BEFORE"
 msgstr ""
 
-#: src/multitrack.c:18025
+#: src/multitrack.c:18358
 msgid "or INSERT AFTER buttons to move it."
 msgstr ""
 
-#: src/multitrack.c:18307 src/multitrack.c:18320
+#: src/multitrack.c:18639 src/multitrack.c:18652
 msgid "Click on another effect,"
 msgstr ""
 
-#: src/multitrack.c:18308 src/multitrack.c:18321
+#: src/multitrack.c:18640 src/multitrack.c:18653
 msgid ""
 "and the selected one\n"
 "will be inserted"
 msgstr ""
 
-#: src/multitrack.c:18309
+#: src/multitrack.c:18641
 msgid "after it.\n"
 msgstr "efter det.\n"
 
-#: src/multitrack.c:18322
+#: src/multitrack.c:18654
 msgid "before it.\n"
 msgstr "før det.\n"
 
-#: src/multitrack.c:18551
+#: src/multitrack.c:18889
 #, c-format
 msgid "Removed parameter values for effect %s at time %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:18759
+#: src/multitrack.c:19100
 #, c-format
 msgid "Set parameter values for %s %s on %s at time %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:19251 src/multitrack.c:20873
+#: src/multitrack.c:19630 src/multitrack.c:21195
 msgid "_Autoreload each time"
 msgstr ""
 
-#: src/multitrack.c:19323
+#: src/multitrack.c:19702
 msgid "Saving layout"
 msgstr ""
 
-#: src/multitrack.c:19345
+#: src/multitrack.c:19725
 #, c-format
 msgid "Saved layout to %s\n"
 msgstr ""
 
-#: src/multitrack.c:20783
+#: src/multitrack.c:21125
 msgid "clips and frames"
 msgstr ""
 
-#: src/multitrack.c:20787
+#: src/multitrack.c:21128
 msgid "clips"
 msgstr ""
 
-#: src/multitrack.c:20790
+#: src/multitrack.c:21130
 msgid "frames"
 msgstr "rammer"
 
-#: src/multitrack.c:20800
+#: src/multitrack.c:21140
 msgid ""
 "\n"
 "Auto reload layout.\n"
 msgstr ""
 
-#: src/multitrack.c:20803
+#: src/multitrack.c:21143
 #, c-format
 msgid ""
 "%s\n"
@@ -9342,100 +9347,100 @@
 "Therefore it could not be loaded properly.\n"
 msgstr ""
 
-#: src/multitrack.c:20920
+#: src/multitrack.c:21284
 msgid "auto backup"
 msgstr "auto backup"
 
-#: src/multitrack.c:20923
+#: src/multitrack.c:21287
 #, c-format
 msgid ""
 "\n"
 "Unable to load layout file %s\n"
 msgstr ""
 
-#: src/multitrack.c:20944
+#: src/multitrack.c:21308
 #, c-format
 msgid "Loading layout from %s..."
 msgstr "Indlæser layout fra %s..."
 
-#: src/multitrack.c:20978
+#: src/multitrack.c:21338
 #, c-format
 msgid "Got %d events...processing..."
 msgstr ""
 
-#: src/multitrack.c:20991
+#: src/multitrack.c:21349
 msgid "Checking and rebuilding event list"
 msgstr ""
 
-#: src/multitrack.c:21017
+#: src/multitrack.c:21374
 #, c-format
 msgid "%d errors detected.\n"
 msgstr "%d fejl opdaget.\n"
 
-#: src/multitrack.c:21068
+#: src/multitrack.c:21422
 #, c-format
 msgid "Multitrack fps set to %.3f\n"
 msgstr ""
 
-#: src/multitrack.c:21225
+#: src/multitrack.c:21576
 msgid ""
 "The current layout has changes which have not been saved.\n"
 "Are you sure you wish to wipe it ?\n"
 msgstr ""
 
-#: src/multitrack.c:22047
+#: src/multitrack.c:22385
 msgid "LiVES: Multitrack audio mixer"
 msgstr ""
 
-#: src/multitrack.c:22077
+#: src/multitrack.c:22414
 msgid "_Reset values"
 msgstr "_Nulstil værdier"
 
-#: src/multitrack.c:22081
+#: src/multitrack.c:22418
 msgid "_Close mixer"
 msgstr "_Luk mikser"
 
-#: src/multitrack.c:22130
+#: src/multitrack.c:22466
 msgid ""
 "_Invert backing audio\n"
 "and layer volumes"
 msgstr ""
 
-#: src/multitrack.c:22132
+#: src/multitrack.c:22468
 msgid "Adjust backing and layer audio values so that they sum to 1.0"
 msgstr ""
 
-#: src/multitrack.c:22175
+#: src/multitrack.c:22510
 msgid "_Gang layer audio"
 msgstr ""
 
-#: src/multitrack.c:22177
+#: src/multitrack.c:22512
 msgid "Adjust all layer audio values to the same value"
 msgstr ""
 
-#: src/jack.c:104
+#: src/jack.c:102
 msgid "JACK server started\n"
 msgstr "JACK server startet\n"
 
-#: src/jack.c:1284 src/jack.c:1353
+#: src/jack.c:1265 src/jack.c:1334
 msgid "Unable to connect to JACK server\n"
 msgstr "Kunne ikke oprette forbindelse til JACK server\n"
 
-#: src/jack.c:1512
+#: src/jack.c:1491
 msgid "Started jack audio subsystem.\n"
 msgstr ""
 
-#: src/jack.c:1623
+#: src/jack.c:1600
 msgid "Started jack audio reader.\n"
 msgstr ""
 
-#: src/jack.c:1838
+#: src/jack.c:1815
 msgid ""
 "\n"
 "Connection to jack audio was reset.\n"
 msgstr ""
 
-#: src/pulse.c:87
+#: src/pulse.c:88
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -9443,7 +9448,7 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:92
+#: src/pulse.c:94
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -9451,7 +9456,7 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:96
+#: src/pulse.c:99
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -9459,335 +9464,335 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:101
+#: src/pulse.c:104
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
 msgstr ""
 
-#: src/pulse.c:107
+#: src/pulse.c:109
 msgid "LiVES will exit and you can choose another audio player.\n"
 msgstr ""
 
-#: src/pulse.c:1352
+#: src/pulse.c:1335
 msgid ""
 "\n"
 "Connection to pulse audio was reset.\n"
 msgstr ""
 
-#: src/colourspace.c:1100
+#: src/colourspace.c:1092
 msgid "unclamped"
 msgstr ""
 
-#: src/colourspace.c:1101
+#: src/colourspace.c:1093
 msgid "clamped"
 msgstr ""
 
-#: src/omc-learn.c:195
+#: src/omc-learn.c:191
 #, c-format
 msgid "Responding to joystick events from %s\n"
 msgstr ""
 
-#: src/omc-learn.c:289
+#: src/omc-learn.c:279
 msgid "Creating ALSA seq port..."
 msgstr ""
 
-#: src/omc-learn.c:325
+#: src/omc-learn.c:313
 #, c-format
 msgid "Responding to MIDI events from %s\n"
 msgstr ""
 
-#: src/omc-learn.c:568
+#: src/omc-learn.c:554
 msgid "data"
 msgstr "data"
 
-#: src/omc-learn.c:571
+#: src/omc-learn.c:557
 msgid "velocity"
 msgstr "hastighed"
 
-#: src/omc-learn.c:572
+#: src/omc-learn.c:558
 msgid "note"
 msgstr "note"
 
-#: src/omc-learn.c:574 src/omc-learn.c:736 src/omc-learn.c:1105
-#: src/omc-learn.c:1591 src/omc-learn.c:1640
+#: src/omc-learn.c:560 src/omc-learn.c:724 src/omc-learn.c:1092
+#: src/omc-learn.c:1581 src/omc-learn.c:1630
 msgid "value"
 msgstr "værdi"
 
-#: src/omc-learn.c:576
+#: src/omc-learn.c:562
 msgid "state"
 msgstr ""
 
-#: src/omc-learn.c:688
+#: src/omc-learn.c:674
 msgid "variable"
 msgstr "variabel"
 
-#: src/omc-learn.c:1001
+#: src/omc-learn.c:989
 msgid "Vars."
 msgstr ""
 
-#: src/omc-learn.c:1054
+#: src/omc-learn.c:1041
 #, c-format
 msgid "MIDI ch %d note on"
 msgstr ""
 
-#: src/omc-learn.c:1058
+#: src/omc-learn.c:1045
 #, c-format
 msgid "MIDI ch %d note off"
 msgstr ""
 
-#: src/omc-learn.c:1062
+#: src/omc-learn.c:1049
 #, c-format
 msgid "MIDI ch %d controller %d"
 msgstr ""
 
-#: src/omc-learn.c:1066
+#: src/omc-learn.c:1053
 #, c-format
 msgid "MIDI ch %d pitch bend"
 msgstr ""
 
-#: src/omc-learn.c:1070
+#: src/omc-learn.c:1057
 #, c-format
 msgid "MIDI ch %d pgm change"
 msgstr ""
 
-#: src/omc-learn.c:1073
+#: src/omc-learn.c:1060
 #, c-format
 msgid "Joystick button %d"
 msgstr ""
 
-#: src/omc-learn.c:1076
+#: src/omc-learn.c:1063
 #, c-format
 msgid "Joystick axis %d"
 msgstr ""
 
-#: src/omc-learn.c:1113
+#: src/omc-learn.c:1100
 msgid "x"
 msgstr "x"
 
-#: src/omc-learn.c:1122
+#: src/omc-learn.c:1109
 msgid "range"
 msgstr ""
 
-#: src/omc-learn.c:1143
+#: src/omc-learn.c:1130
 msgid "+ offset1"
 msgstr ""
 
-#: src/omc-learn.c:1161
+#: src/omc-learn.c:1150
 msgid "* scale"
 msgstr ""
 
-#: src/omc-learn.c:1179
+#: src/omc-learn.c:1170
 msgid "+ offset2"
 msgstr ""
 
-#: src/omc-learn.c:1280
+#: src/omc-learn.c:1270
 msgid ""
 "\n"
 "Click OK to delete all entries\n"
 msgstr ""
 
-#: src/omc-learn.c:1318
+#: src/omc-learn.c:1308
 msgid "LiVES: OMC learner"
 msgstr ""
 
-#: src/omc-learn.c:1334
+#: src/omc-learn.c:1324
 msgid "Clear _unmatched"
 msgstr ""
 
-#: src/omc-learn.c:1345
+#: src/omc-learn.c:1335
 msgid "_Delete all"
 msgstr "_Slet alle"
 
-#: src/omc-learn.c:1411
+#: src/omc-learn.c:1401
 msgid "Start video playback"
 msgstr "Start video playback"
 
-#: src/omc-learn.c:1414
+#: src/omc-learn.c:1404
 msgid "Stop video playback"
 msgstr "Stop video playback"
 
-#: src/omc-learn.c:1418
+#: src/omc-learn.c:1408
 msgid "Clip select <clipnum>"
 msgstr ""
 
-#: src/omc-learn.c:1419
+#: src/omc-learn.c:1409
 msgid "Switch foreground clip to the nth valid clip"
 msgstr ""
 
-#: src/omc-learn.c:1423
+#: src/omc-learn.c:1413
 msgid "Play forwards"
 msgstr ""
 
-#: src/omc-learn.c:1424
+#: src/omc-learn.c:1414
 msgid "Play video in a forwards direction"
 msgstr ""
 
-#: src/omc-learn.c:1427
+#: src/omc-learn.c:1417
 msgid "Play backwards"
 msgstr ""
 
-#: src/omc-learn.c:1428
+#: src/omc-learn.c:1418
 msgid "Play video in a backwards direction"
 msgstr ""
 
-#: src/omc-learn.c:1431
+#: src/omc-learn.c:1421
 msgid "Reverse playback direction"
 msgstr ""
 
-#: src/omc-learn.c:1432
+#: src/omc-learn.c:1422
 msgid "Reverse direction of video playback"
 msgstr ""
 
-#: src/omc-learn.c:1435
+#: src/omc-learn.c:1425
 msgid "Play video faster"
 msgstr "Afspil video hurtigere"
 
-#: src/omc-learn.c:1436
+#: src/omc-learn.c:1426
 msgid "Play video at a slightly faster rate"
 msgstr ""
 
-#: src/omc-learn.c:1439
+#: src/omc-learn.c:1429
 msgid "Play video slower"
 msgstr "Afspil video langsommere"
 
-#: src/omc-learn.c:1440
+#: src/omc-learn.c:1430
 msgid "Play video at a slightly slower rate"
 msgstr ""
 
-#: src/omc-learn.c:1443
+#: src/omc-learn.c:1433
 msgid "Toggle video freeze"
 msgstr ""
 
-#: src/omc-learn.c:1444
+#: src/omc-learn.c:1434
 msgid "Freeze video, or if already frozen, unfreeze it"
 msgstr ""
 
-#: src/omc-learn.c:1447
+#: src/omc-learn.c:1437
 msgid "Set video framerate to <fps>"
 msgstr ""
 
-#: src/omc-learn.c:1448
+#: src/omc-learn.c:1438
 msgid "Set framerate of foreground clip to <float fps>"
 msgstr ""
 
-#: src/omc-learn.c:1452
+#: src/omc-learn.c:1442
 msgid "Start recording"
 msgstr "Start optagelse"
 
-#: src/omc-learn.c:1455
+#: src/omc-learn.c:1445
 msgid "Stop recording"
 msgstr "Stop optagelse"
 
-#: src/omc-learn.c:1458
+#: src/omc-learn.c:1448
 msgid "Toggle recording state"
 msgstr ""
 
-#: src/omc-learn.c:1461
+#: src/omc-learn.c:1451
 msgid "Swap foreground and background clips"
 msgstr ""
 
-#: src/omc-learn.c:1463
+#: src/omc-learn.c:1453
 msgid "Reset effect keys"
 msgstr ""
 
-#: src/omc-learn.c:1464
+#: src/omc-learn.c:1454
 msgid "Switch all effects off."
 msgstr ""
 
-#: src/omc-learn.c:1467
+#: src/omc-learn.c:1457
 msgid "Enable effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1471
+#: src/omc-learn.c:1461
 msgid "Disable effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1475
+#: src/omc-learn.c:1465
 msgid "Toggle effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1479
+#: src/omc-learn.c:1469
 msgid "Set parameter value <key> <pnum> = <value>"
 msgstr ""
 
-#: src/omc-learn.c:1480
+#: src/omc-learn.c:1470
 msgid "Set <value> of pth (numerical) parameter for effect key <key>."
 msgstr ""
 
-#: src/omc-learn.c:1484
+#: src/omc-learn.c:1474
 msgid "Switch foreground to next clip"
 msgstr ""
 
-#: src/omc-learn.c:1487
+#: src/omc-learn.c:1477
 msgid "Switch foreground to previous clip"
 msgstr ""
 
-#: src/omc-learn.c:1490
+#: src/omc-learn.c:1480
 msgid "Set video framerate to ratio <fps_ratio>"
 msgstr ""
 
-#: src/omc-learn.c:1491
+#: src/omc-learn.c:1481
 msgid "Set framerate ratio of foreground clip to <float fps_ratio>"
 msgstr ""
 
-#: src/omc-learn.c:1495
+#: src/omc-learn.c:1485
 msgid "Retrigger clip <clipnum>"
 msgstr ""
 
-#: src/omc-learn.c:1496
+#: src/omc-learn.c:1486
 msgid ""
 "Switch foreground clip to the nth valid clip, and reset the frame number"
 msgstr ""
 
-#: src/omc-learn.c:1500
+#: src/omc-learn.c:1490
 msgid "Cycle to next mode for effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1504
+#: src/omc-learn.c:1494
 msgid "Cycle to previous mode for effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1508
+#: src/omc-learn.c:1498
 msgid "Set playback plugin parameter value <pnum> = <value>"
 msgstr ""
 
-#: src/omc-learn.c:1509
+#: src/omc-learn.c:1499
 msgid "Set <value> of pth parameter for the playback plugin."
 msgstr ""
 
 #. TRANSLATORS: short form of "clip number"
-#: src/omc-learn.c:1536 src/omc-learn.c:1607
+#: src/omc-learn.c:1526 src/omc-learn.c:1597
 msgid "clipnum"
 msgstr ""
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1545
+#: src/omc-learn.c:1535
 msgid "fps"
 msgstr "fps"
 
 #. TRANSLATORS: as in keyboard key
-#: src/omc-learn.c:1553 src/omc-learn.c:1560 src/omc-learn.c:1567
-#: src/omc-learn.c:1575 src/omc-learn.c:1615 src/omc-learn.c:1623
+#: src/omc-learn.c:1543 src/omc-learn.c:1550 src/omc-learn.c:1557
+#: src/omc-learn.c:1565 src/omc-learn.c:1605 src/omc-learn.c:1613
 msgid "key"
 msgstr "nøgle"
 
 #. TRANSLATORS: short form of "parameter number"
-#: src/omc-learn.c:1583 src/omc-learn.c:1632
+#: src/omc-learn.c:1573 src/omc-learn.c:1622
 msgid "pnum"
 msgstr "pnum"
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1599
+#: src/omc-learn.c:1589
 msgid "fps_ratio"
 msgstr ""
 
-#: src/omc-learn.c:2443
+#: src/omc-learn.c:2417
 #, c-format
 msgid "Saving device mapping to file %s..."
 msgstr ""
 
-#: src/omc-learn.c:2527
+#: src/omc-learn.c:2498
 #, c-format
 msgid ""
 "\n"
@@ -9796,7 +9801,7 @@
 "%s\n"
 msgstr ""
 
-#: src/omc-learn.c:2534
+#: src/omc-learn.c:2505
 #, c-format
 msgid ""
 "\n"
@@ -9809,12 +9814,12 @@
 "Ugyldig version i fil\n"
 "%s\n"
 
-#: src/omc-learn.c:2571
+#: src/omc-learn.c:2541
 #, c-format
 msgid "Loading device mapping from file %s..."
 msgstr ""
 
-#: src/omc-learn.c:2576
+#: src/omc-learn.c:2544
 #, c-format
 msgid ""
 "\n"
@@ -9829,12 +9834,12 @@
 "%s\n"
 "Fejlkode %d\n"
 
-#: src/videodev.c:547
+#: src/videodev.c:539
 #, c-format
 msgid "Unable to open device %s\n"
 msgstr ""
 
-#: src/videodev.c:564
+#: src/videodev.c:554
 #, c-format
 msgid "Opened device %s\n"
 msgstr ""
@@ -10540,9 +10545,22 @@
 #~ msgid "$file"
 #~ msgstr "$fil"
 
+#, fuzzy
+#~ msgid "LiVES audio error."
+#~ msgstr "LiVES: - Indstillinger"
+
 #~ msgid "$error"
 #~ msgstr "$fejl"
 
+#~ msgid "Pause"
+#~ msgstr "Pause"
+
+#~ msgid "Start frame"
+#~ msgstr "Start ramme"
+
+#~ msgid "End frame"
+#~ msgstr "Slut ramme"
+
 #, fuzzy
 #~ msgid "_Open"
 #~ msgstr "_Åbn..."

LiVES-2.2.8.tar.bz2/po/de_DE.po -> LiVES-2.4.1.tar.bz2/po/de_DE.po Changed

@@ -2,21 +2,20 @@
 msgstr ""
 "Project-Id-Version: Lives 0.9.5\n"
 "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n"
-"POT-Creation-Date: 2015-02-08 17:18-0300\n"
-"PO-Revision-Date: 2013-11-30 14:32+0000\n"
-"Last-Translator: h3ndrik <Unknown>\n"
+"POT-Creation-Date: 2015-08-09 14:52-0300\n"
+"PO-Revision-Date: 2015-04-05 16:14+0000\n"
+"Last-Translator: Michael Kohl <rolf.michael.kohl@googlemail.com>\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: 2013-11-30 14:36+0000\n"
-"X-Generator: Launchpad (build 16856)\n"
+"X-Launchpad-Export-Date: 2015-05-03 15:41+0000\n"
+"X-Generator: Launchpad (build 17474)\n"
 "X-Poedit-Country: GERMANY\n"
 "X-Poedit-Language: German\n"
 
-#. TRANSLATORS: do not translate this message
-#: src/main.c:118
+#: src/main.c:128
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -25,22 +24,22 @@
 "http://lives.sourceforge.net/TRANS-README.txt"
 msgstr ""
 
-#: src/main.c:134
+#: src/main.c:153
 #, c-format
 msgid "%s Warning: %s\n"
 msgstr "%s Warnung: %s\n"
 
-#: src/main.c:138
+#: src/main.c:157
 #, c-format
 msgid "%s Critical error: %s\n"
 msgstr "%s Kritischer Fehler: %s\n"
 
-#: src/main.c:139
+#: src/main.c:158
 #, c-format
 msgid "%s Fatal error: %s\n"
 msgstr "%s Fataler Fehler: %s\n"
 
-#: src/main.c:176
+#: src/main.c:198
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -55,7 +54,7 @@
 "Danke. Projektwiederherstellung sollte beim nächsten Start von LiVES möglich "
 "sein.\n"
 
-#: src/main.c:177
+#: src/main.c:199
 msgid ""
 "\n"
 "\n"
@@ -67,7 +66,7 @@
 "Absturzberichte bitte mit Details über das Betriebssystem, Distribution und "
 "die LiVES-Version versehen ("
 
-#: src/main.c:180
+#: src/main.c:203
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -75,7 +74,7 @@
 "und die Informationen, die unten angezeigt werden:\n"
 "\n"
 
-#: src/main.c:184
+#: src/main.c:206
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
@@ -85,83 +84,83 @@
 "um weitere Informationen zu sammeln\n"
 "\n"
 
-#: src/main.c:192
+#: src/main.c:216
 msgid "Preserving set.\n"
 msgstr "Set wird erhalten.\n"
 
-#: src/main.c:636
+#: src/main.c:691
 msgid "Resizing"
 msgstr "Skalieren"
 
-#: src/main.c:643
+#: src/main.c:698
 msgid "_Resize All Frames"
 msgstr "Alle Frames _skalieren"
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:895
+#: src/main.c:948
 msgid "Any"
 msgstr "Beliebig"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:897
+#: src/main.c:950
 msgid "None"
 msgstr "Kein(e)"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:899
+#: src/main.c:952
 msgid "recommended"
 msgstr "empfohlen"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:901
+#: src/main.c:954
 msgid "disabled !"
 msgstr "deaktiviert!"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:903
+#: src/main.c:956
 msgid "**The current layout**"
 msgstr "**Momentanes Layout**"
 
 #. TRANSLATORS: adjective for "Built in" type effects
-#: src/main.c:905
+#: src/main.c:958
 msgid "Builtin"
 msgstr "Eingebaut"
 
 #. TRANSLATORS: adjective for "Custom" type effects
-#: src/main.c:907
+#: src/main.c:960
 msgid "Custom"
 msgstr "Benutzerdefiniert"
 
 #. TRANSLATORS: adjective for "Test" type effects
-#: src/main.c:909
+#: src/main.c:962
 msgid "Test"
 msgstr "Test"
 
-#: src/main.c:1054
+#: src/main.c:1107
 msgid "Foreground"
-msgstr ""
+msgstr "Vordergrund"
 
-#: src/main.c:1055
+#: src/main.c:1108
 msgid "Background"
-msgstr ""
+msgstr "Hintergrund"
 
-#: src/main.c:1566
+#: src/main.c:1624
 msgid "Loading realtime effect plugins..."
 msgstr "Lade Echtzeit-Effekt Plugins..."
 
-#: src/main.c:1631
+#: src/main.c:1690
 msgid "Starting jack audio server..."
 msgstr "Jack Audio Server wird gestartet..."
 
-#: src/main.c:1633
+#: src/main.c:1692
 msgid "Starting jack transport server..."
 msgstr "Jack Transport Server wird gestartet..."
 
-#: src/main.c:1634
+#: src/main.c:1693
 msgid "Connecting to jack transport server..."
 msgstr "Verbindung zum Jack Transport Server wird hergestellt..."
 
-#: src/main.c:1663
+#: src/main.c:1723
 #, c-format
 msgid ""
 "\n"
@@ -182,114 +181,114 @@
 "Alternativ, Versuchen Sie LiVES entweder mit der Option \"-jackopts 16\" zu "
 "starten, oder "
 
-#: src/main.c:1697
+#: src/main.c:1758
 msgid "Starting pulse audio server..."
 msgstr "PulseAudio Server wird gestartet..."
 
-#: src/main.c:1765
+#: src/main.c:1825
 msgid "Checking optional dependencies:"
 msgstr "Optionale Abhängigkeiten werden überprüft:"
 
-#: src/main.c:1766
+#: src/main.c:1826
 msgid "mplayer...detected..."
-msgstr ""
+msgstr "mplayer...gefunden..."
 
-#: src/main.c:1767
+#: src/main.c:1827
 msgid "mplayer...NOT DETECTED..."
-msgstr ""
+msgstr "mplayer...NICHT GEFUNDEN..."
 
-#: src/main.c:1768
+#: src/main.c:1828
 #, fuzzy
 msgid "mplayer2...detected..."
-msgstr "Pulse Audio...gefunden..."
+msgstr "mplayer...gefunden..."
 
-#: src/main.c:1769
+#: src/main.c:1829
 #, fuzzy
 msgid "mplayer2...NOT DETECTED..."
-msgstr "Pulse Audio...NICHT GEFUNDEN..."
+msgstr "mplayer...NICHT GEFUNDEN..."
 
-#: src/main.c:1770
+#: src/main.c:1830
 msgid "convert...detected..."
-msgstr ""
+msgstr "convert...gefunden..."
 
-#: src/main.c:1771
+#: src/main.c:1831
 msgid "convert...NOT DETECTED..."
-msgstr ""
+msgstr "convert...NICHT GEFUNDEN..."
 
-#: src/main.c:1772
+#: src/main.c:1832
 msgid "composite...detected..."
-msgstr ""
+msgstr "composite...gefunden..."
 
-#: src/main.c:1773
+#: src/main.c:1833
 msgid "composite...NOT DETECTED..."
-msgstr ""
+msgstr "composite...NICHT GEFUNDEN..."
 
-#: src/main.c:1774
+#: src/main.c:1834
 msgid "sox...detected\n"
-msgstr ""
+msgstr "sox...gefunden\n"
 
-#: src/main.c:1775
+#: src/main.c:1835
 msgid "sox...NOT DETECTED\n"
-msgstr ""
+msgstr "sox...NICHT GEFUNDEN\n"
 
-#: src/main.c:1776
+#: src/main.c:1836
 msgid "cdda2wav...detected..."
-msgstr ""
+msgstr "cdda2wav...gefunden..."
 
-#: src/main.c:1777
+#: src/main.c:1837
 msgid "cdda2wav...NOT DETECTED..."
-msgstr ""
+msgstr "cdda2wav...NICHT GEFUNDEN..."
 
-#: src/main.c:1778
+#: src/main.c:1838
 msgid "jackd...detected..."
-msgstr ""
+msgstr "jackd...gefunden..."
 
-#: src/main.c:1779
+#: src/main.c:1839
 msgid "jackd...NOT DETECTED..."
-msgstr ""
+msgstr "jackd...NICHT GEFUNDEN..."
 
-#: src/main.c:1780
+#: src/main.c:1840
 msgid "pulse audio...detected..."
 msgstr "Pulse Audio...gefunden..."
 
-#: src/main.c:1781
+#: src/main.c:1841
 msgid "pulse audio...NOT DETECTED..."
 msgstr "Pulse Audio...NICHT GEFUNDEN..."
 
-#: src/main.c:1782
+#: src/main.c:1842
 msgid "python...detected..."
-msgstr ""
+msgstr "python...gefunden..."
 
-#: src/main.c:1783
+#: src/main.c:1843
 msgid "python...NOT DETECTED..."
-msgstr ""
+msgstr "python...NICHT GEFUNDEN..."
 
-#: src/main.c:1784
+#: src/main.c:1844
 msgid "dvgrab...detected..."
-msgstr ""
+msgstr "dvgrab...gefunden..."
 
-#: src/main.c:1785
+#: src/main.c:1845
 msgid "dvgrab...NOT DETECTED..."
-msgstr ""
+msgstr "dvgrab...NICHT GEFUNDEN..."
 
-#: src/main.c:1786
+#: src/main.c:1846
 msgid "xwininfo...detected..."
-msgstr ""
+msgstr "xwininfo...gefunden..."
 
-#: src/main.c:1787
+#: src/main.c:1847
 msgid "xwininfo...NOT DETECTED..."
-msgstr ""
+msgstr "xwininfo...NICHT GEFUNDEN..."
 
-#: src/main.c:1793
+#: src/main.c:1853
 #, c-format
 msgid "Windows version %04X"
-msgstr ""
+msgstr "Windows Version %04X"
 
-#: src/main.c:1795
+#: src/main.c:1855
 msgid "UNKNOWN - please patch me !"
 msgstr ""
 
-#: src/main.c:1799
+#: src/main.c:1859
 #, c-format
 msgid ""
 "\n"
@@ -297,63 +296,63 @@
 "Window manager reports as \"%s\"; "
 msgstr ""
 
-#: src/main.c:1802
+#: src/main.c:1862
 #, c-format
 msgid "number of monitors detected: %d\n"
-msgstr ""
+msgstr "Anzahl an Bildschirmen erkannt: %d\n"
 
-#: src/main.c:1805
+#: src/main.c:1865
 #, c-format
 msgid "Number of CPUs detected: %d "
-msgstr ""
+msgstr "Anzahl an Prozessoren erkannt: %d "
 
-#: src/main.c:1808 src/multitrack.c:4902
+#: src/main.c:1868 src/multitrack.c:5068
 msgid "little endian"
-msgstr ""
+msgstr "Little Endian"
 
-#: src/main.c:1809 src/multitrack.c:4901
+#: src/main.c:1869 src/multitrack.c:5067
 msgid "big endian"
-msgstr ""
+msgstr "Big Endian"
 
-#: src/main.c:1810
+#: src/main.c:1870
 #, c-format
 msgid "(%d bits, %s)\n"
-msgstr ""
+msgstr "(%d Bits, %s)\n"
 
-#: src/main.c:1814
+#: src/main.c:1874
 msgid "GUI type is: "
 msgstr ""
 
-#: src/main.c:1818
+#: src/main.c:1878
 #, c-format
 msgid "GTK+ version %d.%d.%d (compiled with %d.%d.%d)"
-msgstr ""
+msgstr "GTK+ Version %d.%d.%d (kompiliert mit %d.%d.%d)"
 
-#: src/main.c:1840
+#: src/main.c:1900
 msgid ", with cairo support"
-msgstr ""
+msgstr ", mit cairo Unterstützung"
 
-#: src/main.c:1847
+#: src/main.c:1907
 #, c-format
 msgid "Temp directory is %s\n"
 msgstr ""
 
-#: src/main.c:1851
+#: src/main.c:1911
 msgid ""
 "WARNING - this version of LiVES was compiled without either\n"
 "jack or pulse audio support.\n"
 "Many audio features will be unavailable.\n"
 msgstr ""
 
-#: src/main.c:1854
+#: src/main.c:1914
 msgid "Compiled with jack support, good !\n"
 msgstr ""
 
-#: src/main.c:1857
+#: src/main.c:1917
 msgid "Compiled with pulse audio support, wonderful !\n"
 msgstr ""
 
-#: src/main.c:1861
+#: src/main.c:1921
 #, c-format
 msgid ""
 "Welcome to LiVES version %s.\n"
@@ -362,136 +361,141 @@
 "Willkommen bei LiVES Version %s.\n"
 "\n"
 
-#: src/main.c:2306
+#: src/main.c:2380
 #, c-format
 msgid ""
 "\n"
 "Startup syntax is: %s [opts] [filename [start_time] [frames]]\n"
 msgstr ""
 
-#: src/main.c:2307
+#: src/main.c:2381
 msgid "Where: filename is the name of a media file or backup file.\n"
 msgstr ""
 
-#: src/main.c:2308
+#: src/main.c:2382
 msgid "start_time : filename start time in seconds\n"
 msgstr ""
 
-#: src/main.c:2309
+#: src/main.c:2383
 msgid "frames : maximum number of frames to open\n"
 msgstr ""
 
-#: src/main.c:2311
+#: src/main.c:2385
 msgid "opts can be:\n"
 msgstr ""
 
-#: src/main.c:2312
+#: src/main.c:2386
 msgid "-help            : show this help text and exit\n"
 msgstr "-help            : Diese Hilfe anzeigen und beenden\n"
 
-#: src/main.c:2313
+#: src/main.c:2387
 msgid "-tmpdir <tempdir>: use alternate working directory (e.g /var/ramdisk)\n"
 msgstr ""
 
-#: src/main.c:2314
+#: src/main.c:2388
 msgid "-set <setname>   : autoload clip set setname\n"
 msgstr ""
 
-#: src/main.c:2315
+#: src/main.c:2389
 msgid "-noset           : do not load any set on startup\n"
 msgstr ""
 
-#: src/main.c:2316
+#: src/main.c:2390
 msgid "-norecover       : force no-loading of crash recovery\n"
 msgstr ""
 
-#: src/main.c:2317
+#: src/main.c:2391
 msgid "-recover         : force loading of crash recovery\n"
 msgstr "-recover : Erzwungenes laden der Absturz-Wiederherstellung\n"
 
-#: src/main.c:2318
-msgid "-nothreaddialog  : doe nothing - retained for backwards compatibility\n"
+#: src/main.c:2392
+msgid ""
+"-nothreaddialog  : does nothing - retained for backwards compatibility\n"
 msgstr ""
 
-#: src/main.c:2319
+#: src/main.c:2393
 msgid "-nogui           : do not show the gui\n"
 msgstr "-nogui           : Das GUI nicht anzeigen\n"
 
-#: src/main.c:2320
+#: src/main.c:2394
 msgid "-nosplash        : do not show the splash window\n"
 msgstr ""
 
-#: src/main.c:2321
+#: src/main.c:2395
 msgid "-noplaywin       : do not show the play window\n"
 msgstr ""
 
-#: src/main.c:2322
+#: src/main.c:2396
+msgid "-noninteractive  : disable menu interactivity\n"
+msgstr ""
+
+#: src/main.c:2397
 msgid "-startup-ce      : start in clip editor mode\n"
 msgstr ""
 
-#: src/main.c:2323
+#: src/main.c:2398
 msgid "-startup-mt      : start in multitrack mode\n"
 msgstr ""
 
-#: src/main.c:2324
+#: src/main.c:2399
 msgid ""
 "-fxmodesmax <n>  : allow <n> modes per effect key (minimum is 1, default is "
 "8)\n"
 msgstr ""
 
-#: src/main.c:2326
+#: src/main.c:2401
 msgid "-oscstart <port> : start OSC listener on UDP port <port>\n"
 msgstr ""
 
-#: src/main.c:2327
+#: src/main.c:2402
 msgid "-nooscstart      : do not start OSC listener\n"
 msgstr ""
 
-#: src/main.c:2329
+#: src/main.c:2404
 msgid ""
 "-aplayer <ap>    : start with selected audio player. <ap> can be mplayer, "
 "mplayer2"
 msgstr ""
 
 #. TRANSLATORS: pulse (audio)
-#: src/main.c:2332
+#: src/main.c:2407
 msgid ", pulse"
 msgstr ", pulse"
 
-#: src/main.c:2335
+#: src/main.c:2410
 msgid ", sox or jack\n"
 msgstr ", sox oder jack\n"
 
-#: src/main.c:2336
+#: src/main.c:2412
 msgid ""
 "-jackopts <opts>    : opts is a bitmap of jack startup options [1 = jack "
 "transport client, 2 = jack transport master, 4 = start jack transport "
 "server, 8 = pause audio when video paused, 16 = start jack audio server] \n"
 msgstr ""
 
-#: src/main.c:2338
+#: src/main.c:2414
 msgid " or sox\n"
 msgstr " oder sox\n"
 
-#: src/main.c:2340
+#: src/main.c:2416
 msgid "-devicemap <mapname>          : autoload devicemap\n"
 msgstr ""
 
-#: src/main.c:2341
+#: src/main.c:2418
 msgid ""
 "-vppdefaults <file>          : load video playback plugin defaults from "
 "<file> (Note: only sets the settings, not the plugin type)\n"
 msgstr ""
 
-#: src/main.c:2342
+#: src/main.c:2419
 msgid "-debug            : try to debug crashes (requires 'gdb' installed)\n"
 msgstr "-debug : Versuchen, Probleme zu finden ('gdb' muss installiert sein)\n"
 
-#: src/main.c:2373 src/gui.c:1128
+#: src/main.c:2449 src/gui.c:1127
 msgid "Starting GUI..."
 msgstr "Starte das GUI..."
 
-#: src/main.c:2396
+#: src/main.c:2475
 #, c-format
 msgid ""
 "\n"
@@ -502,7 +506,7 @@
 "(Maybe you need to change the value of <prefix_dir> in your %s file)\n"
 msgstr ""
 
-#: src/main.c:2410
+#: src/main.c:2492
 #, c-format
 msgid ""
 "\n"
@@ -510,7 +514,7 @@
 "Please make sure you have write access to %s and try again.\n"
 msgstr ""
 
-#: src/main.c:2415
+#: src/main.c:2498
 msgid ""
 "\n"
 "`smogrify` must be in your path, and be executable\n"
@@ -519,7 +523,7 @@
 "before running LiVES.\n"
 msgstr ""
 
-#: src/main.c:2421
+#: src/main.c:2504
 #, c-format
 msgid ""
 "\n"
@@ -529,7 +533,7 @@
 "Please check the file permissions for this file and try again.\n"
 msgstr ""
 
-#: src/main.c:2428
+#: src/main.c:2512
 #, c-format
 msgid ""
 "\n"
@@ -540,7 +544,7 @@
 "and try again.\n"
 msgstr ""
 
-#: src/main.c:2438
+#: src/main.c:2522
 #, c-format
 msgid ""
 "Please check the <tempdir> setting in \n"
@@ -548,7 +552,7 @@
 "and try again.\n"
 msgstr ""
 
-#: src/main.c:2445
+#: src/main.c:2528
 #, c-format
 msgid ""
 "\n"
@@ -558,7 +562,7 @@
 "%s"
 msgstr ""
 
-#: src/main.c:2453
+#: src/main.c:2536
 msgid ""
 "\n"
 "An incorrect version of smogrify was found in your path.\n"
@@ -569,49 +573,49 @@
 "Thankyou.\n"
 msgstr ""
 
-#: src/main.c:2458
+#: src/main.c:2541
 msgid ""
 "\n"
 "LiVES currently requires 'mplayer', 'mplayer2' or 'sox' to function. Please "
 "install one or other of these, and try again.\n"
 msgstr ""
 
-#: src/main.c:2462
+#: src/main.c:2546
 msgid ""
 "\n"
 "LiVES currently requires both 'mplayer' or 'mplayer2' and 'sox' to function. "
 "Please install these, and try again.\n"
 msgstr ""
 
-#: src/main.c:2472
+#: src/main.c:2556
 msgid ""
 "\n"
 "LiVES was unable to locate 'mplayer' or 'mplayer2'. You may wish to install "
 "either one to use LiVES more fully.\n"
 msgstr ""
 
-#: src/main.c:2475
+#: src/main.c:2561
 msgid ""
 "\n"
 "LiVES was unable to locate 'convert'. You should install convert and image-"
 "magick if you want to use rendered effects.\n"
 msgstr ""
 
-#: src/main.c:2478
+#: src/main.c:2566
 msgid ""
 "\n"
 "LiVES was unable to locate 'composite'. You should install composite and "
 "image-magick if you want to use the merge function.\n"
 msgstr ""
 
-#: src/main.c:2481
+#: src/main.c:2570
 msgid ""
 "\n"
 "LiVES was unable to locate 'sox'. Some audio features may not work. You "
 "should install 'sox'.\n"
 msgstr ""
 
-#: src/main.c:2484
+#: src/main.c:2575
 #, c-format
 msgid ""
 "\n"
@@ -622,59 +626,59 @@
 "You may need to change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/main.c:2611
+#: src/main.c:2707
 #, c-format
 msgid "Autoloading set %s..."
 msgstr ""
 
 #. TRANSLATORS: localised name may be used here
-#: src/main.c:2781 src/interface.c:738
+#: src/main.c:2902
 msgid "LiVES"
 msgstr "LiVES"
 
-#: src/main.c:2948
+#: src/main.c:3066
 #, c-format
 msgid "Invalid audio player %s\n"
 msgstr "Ungültiger Audiospieler %s\n"
 
-#: src/main.c:3077
+#: src/main.c:3214
 #, c-format
 msgid "LiVES-%s: <Untitled%d> %dx%d : %d frames %d bpp %.3f fps"
 msgstr ""
 
-#: src/main.c:3082
+#: src/main.c:3219
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : ??? frames ??? bpp %.3f fps"
 msgstr ""
 
-#: src/main.c:3086
+#: src/main.c:3222
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : %d frames %d bpp %.3f fps"
 msgstr ""
 
-#: src/main.c:3094
+#: src/main.c:3229
 #, c-format
 msgid "LiVES-%s: <No File>"
 msgstr "LiVES-%s: <Keine Datei>"
 
 #. TRANSLATORS: rec(ord)
-#: src/main.c:5085
+#: src/main.c:5201
 #, c-format
 msgid "rec %9d/%d"
 msgstr "rec %9d/%d"
 
 #. TRANSLATORS: out of memory (rec(ord))
-#: src/main.c:5091
+#: src/main.c:5206
 #, c-format
 msgid "!rec %9d/%d"
 msgstr ""
 
-#: src/main.c:5398 src/main.c:5399 src/gui.c:2110 src/gui.c:3220
-#: src/saveplay.c:2336
+#: src/main.c:5500 src/main.c:5501 src/gui.c:2108 src/gui.c:3331
+#: src/saveplay.c:2315
 msgid "Play"
 msgstr "Wiedergabe"
 
-#: src/main.c:6128
+#: src/main.c:6216
 msgid ""
 "LiVES was unable to capture this image\n"
 "\n"
@@ -682,35 +686,35 @@
 "LiVES konnte das Bild nicht aufnehmen\n"
 "\n"
 
-#: src/main.c:6250
+#: src/main.c:6345
 #, c-format
 msgid "Closed file %s\n"
 msgstr "Datei %s geschlossen\n"
 
-#: src/main.c:6452 src/gui.c:648 src/utils.c:4312 src/utils.c:4344
-#: src/saveplay.c:3550 src/multitrack.c:4510 src/multitrack.c:6268
+#: src/main.c:6542 src/gui.c:647 src/utils.c:4256 src/utils.c:4286
+#: src/saveplay.c:3500 src/multitrack.c:4678 src/multitrack.c:6447
 msgid "_Undo"
 msgstr "_Rückgängig"
 
-#: src/main.c:6453 src/gui.c:666 src/utils.c:4313 src/utils.c:4345
-#: src/saveplay.c:3551 src/multitrack.c:4531 src/multitrack.c:6293
+#: src/main.c:6543 src/gui.c:665 src/utils.c:4257 src/utils.c:4287
+#: src/saveplay.c:3501 src/multitrack.c:4698 src/multitrack.c:6472
 msgid "_Redo"
 msgstr "_Wiederherstellen"
 
-#: src/main.c:6493 src/interface.c:470 src/gui.c:2326 src/preferences.c:2357
-#: src/resample.c:1516
+#: src/main.c:6583 src/interface.c:457 src/gui.c:2324 src/preferences.c:2391
+#: src/resample.c:1488
 msgid "Video"
 msgstr "Video"
 
-#: src/main.c:6494 src/interface.c:483 src/gui.c:2351
+#: src/main.c:6584 src/interface.c:470 src/gui.c:2348
 msgid "Left Audio"
 msgstr "Links Audio"
 
-#: src/main.c:6495 src/gui.c:2375
+#: src/main.c:6585 src/gui.c:2371
 msgid "Right Audio"
 msgstr "Rechts Audio"
 
-#: src/main.c:6540
+#: src/main.c:6630
 msgid ""
 "\n"
 "\n"
@@ -719,11 +723,11 @@
 "Please adjust the playback options in Preferences and try again.\n"
 msgstr ""
 
-#: src/main.c:7051 src/plugins.c:1502
+#: src/main.c:7134 src/plugins.c:1468
 msgid "LiVES: - Play Window"
 msgstr ""
 
-#: src/startup.c:25
+#: src/startup.c:24
 #, c-format
 msgid ""
 "A directory named\n"
@@ -733,7 +737,7 @@
 "(Free space = %s)\n"
 msgstr ""
 
-#: src/startup.c:32
+#: src/startup.c:29
 #, c-format
 msgid ""
 "A directory named\n"
@@ -743,7 +747,7 @@
 "Please select another location.\n"
 msgstr ""
 
-#: src/startup.c:49
+#: src/startup.c:46
 #, c-format
 msgid ""
 "\n"
@@ -754,7 +758,7 @@
 "(Free space = %s)"
 msgstr ""
 
-#: src/startup.c:54
+#: src/startup.c:50
 #, c-format
 msgid ""
 "\n"
@@ -763,54 +767,54 @@
 "Please try again and choose a different location.\n"
 msgstr ""
 
-#: src/startup.c:96
+#: src/startup.c:92
 msgid "Directory name is too long !"
 msgstr "Ordnername ist zu lang!"
 
-#: src/startup.c:223
+#: src/startup.c:216
 msgid ""
 "LiVES FAILED TO START YOUR SELECTED AUDIO PLAYER !\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:230
+#: src/startup.c:222
 msgid ""
 "Before starting LiVES, you need to choose an audio player.\n"
 "\n"
 "PULSE AUDIO is recommended for most users"
 msgstr ""
 
-#: src/startup.c:233
+#: src/startup.c:225
 msgid ""
 ", but this version of LiVES was not compiled with pulse audio support.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:236
+#: src/startup.c:229
 msgid ""
 ", but you do not have pulse audio installed on your system.\n"
 " You are advised to install pulse audio first before running LiVES.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:241
+#: src/startup.c:233
 msgid "JACK audio is recommended for pro users"
 msgstr ""
 
-#: src/startup.c:244
+#: src/startup.c:236
 msgid ""
 ", but this version of LiVES was not compiled with jack audio support.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:247
+#: src/startup.c:239
 msgid ""
 ", but you do not have jackd installed. You may wish to install jackd first "
 "before running LiVES.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:250
+#: src/startup.c:242
 msgid ""
 ", but may prevent LiVES from starting on some systems.\n"
 "If LiVES will not start with jack, you can restart and try with another "
@@ -818,159 +822,159 @@
 "\n"
 msgstr ""
 
-#: src/startup.c:254
+#: src/startup.c:246
 msgid "SOX may be used if neither of the preceding players work, "
 msgstr ""
 
-#: src/startup.c:257
+#: src/startup.c:249
 msgid ""
 "but some audio features will be disabled.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:260
+#: src/startup.c:251
 msgid ""
 "but you do not have sox installed.\n"
 "You are advised to install it before running LiVES.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:264
+#: src/startup.c:255
 msgid ""
 "The MPLAYER/MPLAYER2 audio player is only recommended for testing purposes.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:281
+#: src/startup.c:271
 msgid "LiVES: - Choose an audio player"
 msgstr ""
 
-#: src/startup.c:298
+#: src/startup.c:288
 msgid "Use _pulse audio player"
 msgstr ""
 
-#: src/startup.c:320
+#: src/startup.c:310
 msgid "Use _jack audio player"
 msgstr ""
 
-#: src/startup.c:340
+#: src/startup.c:330
 msgid "Use _sox audio player"
 msgstr ""
 
-#: src/startup.c:361
+#: src/startup.c:351
 msgid "Use _mplayer audio player"
 msgstr ""
 
-#: src/startup.c:381
+#: src/startup.c:371
 msgid "Use _mplayer2 audio player"
 msgstr ""
 
-#: src/startup.c:405 src/startup.c:580 src/interface.c:1506
+#: src/startup.c:395 src/startup.c:569 src/interface.c:1398
 msgid "_Next"
 msgstr ""
 
-#: src/startup.c:445
+#: src/startup.c:435
 msgid "Skipped"
 msgstr "Übersprungen"
 
-#: src/startup.c:460
+#: src/startup.c:450
 msgid "Passed"
 msgstr ""
 
-#: src/startup.c:493
+#: src/startup.c:483
 msgid "Failed"
 msgstr "Fehlgeschlagen"
 
-#: src/startup.c:552
+#: src/startup.c:542
 msgid "LiVES: - Testing Configuration"
 msgstr ""
 
-#: src/startup.c:555
+#: src/startup.c:544
 msgid "LiVES: - Troubleshoot"
 msgstr ""
 
-#: src/startup.c:568
+#: src/startup.c:557
 msgid "LiVES will now run some basic configuration tests\n"
 msgstr "LiVES wird nun einige grundsätzliche Konfigurationstests durchführen\n"
 
-#: src/startup.c:603
+#: src/startup.c:591
 msgid "Checking for \"sox\" presence"
 msgstr ""
 
-#: src/startup.c:607
+#: src/startup.c:595
 msgid ""
 "You should install sox to be able to use all the audio features in LiVES"
 msgstr ""
 
-#: src/startup.c:615
+#: src/startup.c:602
 msgid "Checking if sox can convert audio"
 msgstr ""
 
-#: src/startup.c:638
+#: src/startup.c:625
 msgid "Unable to allocate 176400 bytes memory."
 msgstr ""
 
-#: src/startup.c:653
+#: src/startup.c:639
 #, c-format
 msgid "Unable to write to: %s"
 msgstr ""
 
-#: src/startup.c:667 src/startup.c:807
+#: src/startup.c:653 src/startup.c:789
 #, c-format
 msgid "Command failed: %s"
 msgstr "Befehl fehlgeschlagen: %s"
 
-#: src/startup.c:689
+#: src/startup.c:675
 msgid "You should install sox_fmt_all or similar"
 msgstr ""
 
-#: src/startup.c:717
+#: src/startup.c:703
 msgid "Checking for \"mplayer\" presence"
 msgstr ""
 
-#: src/startup.c:721
+#: src/startup.c:707
 msgid ""
 "You should install mplayer or mplayer2 to be able to use all the decoding "
 "features in LiVES"
 msgstr ""
 
-#: src/startup.c:747
+#: src/startup.c:732
 msgid "Checking if mplayer can convert audio"
 msgstr ""
 
-#: src/startup.c:768
+#: src/startup.c:751
 msgid "You should install mplayer or mplayer2 with pcm/wav support"
 msgstr ""
 
-#: src/startup.c:785
+#: src/startup.c:767
 msgid "Checking if mplayer can decode to png/alpha"
 msgstr ""
 
-#: src/startup.c:828
+#: src/startup.c:810
 msgid "You may wish to upgrade mplayer to a newer version"
 msgstr ""
 
-#: src/startup.c:854
+#: src/startup.c:836
 msgid "Checking if mplayer can decode to jpeg"
 msgstr ""
 
-#: src/startup.c:882
+#: src/startup.c:862
 msgid "You should install mplayer with either png/alpha or jpeg support"
 msgstr ""
 
-#: src/startup.c:883
+#: src/startup.c:863
 msgid "You may wish to add jpeg output support to mplayer"
 msgstr ""
 
-#: src/startup.c:892
+#: src/startup.c:872
 msgid "Checking for \"convert\" presence"
 msgstr ""
 
-#: src/startup.c:896
+#: src/startup.c:876
 msgid "Install imageMagick to be able to use all of the rendered effects"
 msgstr ""
 
-#: src/startup.c:909
+#: src/startup.c:889
 msgid ""
 "\n"
 "\n"
@@ -978,7 +982,7 @@
 "Preferences/Decoding.    \n"
 msgstr ""
 
-#: src/startup.c:915
+#: src/startup.c:894
 msgid ""
 "\n"
 "\n"
@@ -986,49 +990,49 @@
 "continue    \n"
 msgstr ""
 
-#: src/startup.c:949
+#: src/startup.c:928
 msgid ""
 "\n"
 "\n"
 "Finally, you can choose the default startup interface for LiVES.\n"
 msgstr ""
 
-#: src/startup.c:950
+#: src/startup.c:929
 msgid ""
 "\n"
 "\n"
 "LiVES has two main interfaces and you can start up with either of them.\n"
 msgstr ""
 
-#: src/startup.c:951
+#: src/startup.c:930
 msgid ""
 "\n"
 "\n"
 "The default can always be changed later from Preferences.\n"
 msgstr ""
 
-#: src/startup.c:961
+#: src/startup.c:940
 msgid "LiVES: - Choose the startup interface"
 msgstr ""
 
-#: src/startup.c:972
+#: src/startup.c:951
 msgid "Start in _Clip Edit mode"
 msgstr ""
 
-#: src/startup.c:975
+#: src/startup.c:954
 msgid "This is the best choice for simple editing tasks and for VJs\n"
 msgstr ""
 
-#: src/startup.c:981
+#: src/startup.c:960
 msgid "Start in _Multitrack mode"
 msgstr ""
 
-#: src/startup.c:983
+#: src/startup.c:962
 msgid ""
 "This is a better choice for complex editing tasks involving multiple clips.\n"
 msgstr ""
 
-#: src/startup.c:992
+#: src/startup.c:971
 msgid "_Finish"
 msgstr "_Fertig"
 
@@ -1045,35 +1049,35 @@
 msgid "Apply _Deinterlace"
 msgstr ""
 
-#: src/interface.c:66
+#: src/interface.c:65
 msgid "If this is set, frames will be deinterlaced as they are imported."
 msgstr ""
 
-#: src/interface.c:113 src/callbacks.c:9623 src/callbacks.c:9646
-#: src/callbacks.c:9647 src/gui.c:3223 src/gui.c:3821 src/saveplay.c:2339
-#: src/saveplay.c:3138 src/dialogs.c:1514 src/dialogs.c:1515
-#: src/dialogs.c:1746 src/dialogs.c:1747 src/framedraw.c:238
-#: src/multitrack.c:8031
+#: src/interface.c:106 src/callbacks.c:9542 src/callbacks.c:9564
+#: src/callbacks.c:9565 src/gui.c:3333 src/gui.c:3946 src/saveplay.c:2317
+#: src/saveplay.c:3097 src/dialogs.c:1575 src/dialogs.c:1576
+#: src/dialogs.c:1804 src/dialogs.c:1805 src/framedraw.c:236
+#: src/multitrack.c:8210
 msgid "Preview"
 msgstr "Vorschau"
 
-#: src/interface.c:132
+#: src/interface.c:125
 msgid "Click here to _Preview any selected video, image or audio file"
 msgstr ""
 
-#: src/interface.c:135
+#: src/interface.c:127
 msgid "Click here to _Preview any selected audio file"
 msgstr ""
 
-#: src/interface.c:138
+#: src/interface.c:129
 msgid "Click here to _Preview the video"
 msgstr ""
 
-#: src/interface.c:181 src/dialogs.c:2542
+#: src/interface.c:169 src/dialogs.c:2621
 msgid "LiVES: - Processing..."
 msgstr "LiVES: - Verarbeiten..."
 
-#: src/interface.c:217
+#: src/interface.c:205
 msgid ""
 "\n"
 "\n"
@@ -1082,8 +1086,8 @@
 "Remember to switch off effects (ctrl-0) afterwards !"
 msgstr ""
 
-#: src/interface.c:222 src/callbacks.c:9373 src/callbacks.c:9420
-#: src/dialogs.c:2570
+#: src/interface.c:210 src/callbacks.c:9283 src/callbacks.c:9332
+#: src/dialogs.c:2649
 msgid ""
 "\n"
 "Please Wait"
@@ -1091,188 +1095,178 @@
 "\n"
 "Bitte Warten"
 
-#: src/interface.c:242
+#: src/interface.c:230
 msgid "Show Details"
 msgstr ""
 
-#: src/interface.c:254 src/dialogs.c:2584
+#: src/interface.c:242 src/dialogs.c:2663
 msgid "_Enough"
 msgstr "_Genug"
 
-#: src/interface.c:255 src/framedraw.c:278
+#: src/interface.c:243 src/framedraw.c:276
 msgid "_Preview"
 msgstr "_Vorschau"
 
-#: src/interface.c:257
+#: src/interface.c:245 src/callbacks.c:9282 src/callbacks.c:9330
 msgid "Paus_e"
 msgstr "Paus_e"
 
-#: src/interface.c:258 src/callbacks.c:9417
+#: src/interface.c:246 src/callbacks.c:9329
 msgid "Pause/_Enough"
 msgstr "Pause/_Genug"
 
-#: src/interface.c:285
+#: src/interface.c:273
 msgid "_Cancel"
 msgstr "_Abbrechen"
 
-#: src/interface.c:374
+#: src/interface.c:361
 #, c-format
 msgid "LiVES: - %s"
 msgstr ""
 
-#: src/interface.c:376
+#: src/interface.c:363
 msgid "LiVES: - Multitrack details"
 msgstr ""
 
-#: src/interface.c:407
+#: src/interface.c:394
 msgid "Format"
 msgstr ""
 
-#: src/interface.c:412
+#: src/interface.c:399
 msgid "Frame size"
 msgstr ""
 
-#: src/interface.c:417
+#: src/interface.c:404
 msgid "File size"
 msgstr "Dateigröße"
 
-#: src/interface.c:418
+#: src/interface.c:405
 msgid "Byte size"
 msgstr ""
 
-#: src/interface.c:423 src/interface.c:1891
+#: src/interface.c:410 src/interface.c:1760
 msgid "FPS"
 msgstr "FPS"
 
-#: src/interface.c:428
+#: src/interface.c:415
 msgid "Frames"
 msgstr ""
 
-#: src/interface.c:429
+#: src/interface.c:416
 msgid "Events"
 msgstr "Ereignisse"
 
-#: src/interface.c:434 src/interface.c:500 src/interface.c:542
+#: src/interface.c:421 src/interface.c:486 src/interface.c:528
 msgid "Total time"
 msgstr "Gesamtdauer"
 
-#: src/interface.c:486 src/resample.c:1488
+#: src/interface.c:472 src/resample.c:1460
 msgid "Audio"
 msgstr "Audio"
 
-#: src/interface.c:511 src/interface.c:553
+#: src/interface.c:497 src/interface.c:539
 msgid "Rate/size"
 msgstr ""
 
-#: src/interface.c:530
+#: src/interface.c:516
 msgid "Right audio"
 msgstr "Rechtes Audio"
 
-#: src/interface.c:622
+#: src/interface.c:607
 msgid "LiVES: - Encoding options"
 msgstr ""
 
-#: src/interface.c:636
+#: src/interface.c:621
 msgid "<------------- (Check the box to re_size as suggested)"
 msgstr ""
 
-#: src/interface.c:637
+#: src/interface.c:622
 msgid "<------------- (Check the box to use the _size recommendation)"
 msgstr ""
 
-#: src/interface.c:662
+#: src/interface.c:646
 msgid "Use _letterboxing to maintain aspect ratio (optional)"
 msgstr ""
 
-#: src/interface.c:663
+#: src/interface.c:647
 msgid ""
 "Draw black rectangles either above or to the sides of the image, to prevent "
 "it from stretching."
 msgstr ""
 
-#: src/interface.c:694
+#: src/interface.c:677
 msgid "Keep _my settings"
 msgstr "_Meine Einstellungen behalten"
 
-#: src/interface.c:695
+#: src/interface.c:678
 msgid "Use _recommended settings"
 msgstr "_Empfohlene Einstellungen benutzen"
 
-#: src/interface.c:775 src/dialogs.c:114
-msgid ""
-"Do _not show this warning any more\n"
-"(can be turned back on from Preferences/Warnings)"
-msgstr ""
-
-#: src/interface.c:787
-msgid "Show _Details"
-msgstr "_Details anzeigen"
-
-#: src/interface.c:881
+#: src/interface.c:769
 msgid "_Close Window"
 msgstr "Fenster _schließen"
 
-#: src/interface.c:883
+#: src/interface.c:771
 msgid "_Save to file"
 msgstr "In _Datei speichern"
 
-#: src/interface.c:928
+#: src/interface.c:816
 msgid "LiVES: - Insert"
 msgstr "LiVES: - Einfügen"
 
-#: src/interface.c:945
+#: src/interface.c:833
 msgid "_Number of times to insert"
 msgstr ""
 
-#: src/interface.c:954
+#: src/interface.c:842
 msgid "_Insert to fit audio"
 msgstr ""
 
-#: src/interface.c:968
+#: src/interface.c:856
 msgid "Insert _before selection"
 msgstr "_Vor der Auswah einfügen"
 
-#: src/interface.c:970
+#: src/interface.c:858
 msgid "Insert clipboard before selected frames"
 msgstr ""
 
-#: src/interface.c:986
+#: src/interface.c:875
 msgid "Insert _after selection"
 msgstr "_Nach der Auswahl einfügen"
 
-#: src/interface.c:988
+#: src/interface.c:877
 msgid "Insert clipboard after selected frames"
 msgstr ""
 
-#: src/interface.c:999
+#: src/interface.c:888
 msgid "Insert _with sound"
 msgstr ""
 
-#: src/interface.c:1012
+#: src/interface.c:901
 msgid "Insert with_out sound"
 msgstr ""
 
-#: src/interface.c:1093
+#: src/interface.c:985
 msgid "LiVES: - Open Selection"
 msgstr "LiVES: - Auswahl öffnen"
 
-#: src/interface.c:1111
+#: src/interface.c:1004
 msgid "Selection start time (sec)"
 msgstr ""
 
-#: src/interface.c:1117
+#: src/interface.c:1010
 msgid "Number of frames to open"
 msgstr ""
 
-#: src/interface.c:1193
+#: src/interface.c:1088
 msgid "LiVES: - Open Location"
 msgstr "LiVES: - Ort öffnen"
 
-#: src/interface.c:1195
+#: src/interface.c:1090
 msgid "LiVES: - Open Youtube Clip"
 msgstr "LiVES: - Youtube Clip öffnen"
 
-#: src/interface.c:1213
+#: src/interface.c:1109
 msgid ""
 "\n"
 "\n"
@@ -1282,7 +1276,7 @@
 "\n"
 msgstr ""
 
-#: src/interface.c:1216
+#: src/interface.c:1112
 msgid ""
 "\n"
 "\n"
@@ -1291,7 +1285,7 @@
 "\n"
 msgstr ""
 
-#: src/interface.c:1220
+#: src/interface.c:1116
 msgid ""
 "Enter the URL of the clip below.\n"
 "E.g: http://www.youtube.com/watch?v=WCR6f6WzjP8\n"
@@ -1301,55 +1295,55 @@
 "Z.B: http://www.youtube.com/watch?v=WCR6f6WzjP8\n"
 "\n"
 
-#: src/interface.c:1231
+#: src/interface.c:1127
 msgid "URL : "
 msgstr "URL : "
 
-#: src/interface.c:1231
+#: src/interface.c:1127
 msgid "Youtube URL : "
 msgstr "Youtube URL : "
 
-#: src/interface.c:1235
+#: src/interface.c:1131
 msgid "Do not send bandwidth information"
 msgstr ""
 
-#: src/interface.c:1237
+#: src/interface.c:1133
 msgid "Try this setting if you are having problems getting a stream"
 msgstr ""
 
-#: src/interface.c:1258
+#: src/interface.c:1155
 msgid "Download to _Directory : "
 msgstr ""
 
-#: src/interface.c:1276
+#: src/interface.c:1173
 msgid "Download _File Name : "
 msgstr ""
 
-#: src/interface.c:1281
+#: src/interface.c:1178
 msgid ".webm"
 msgstr ".webm"
 
-#: src/interface.c:1359
+#: src/interface.c:1256
 msgid "LiVES: - Rename Clip"
 msgstr "LiVES: - Clip umbenennen"
 
-#: src/interface.c:1362
-msgid "LiVES: - Enter Set Name"
+#: src/interface.c:1258
+msgid "LiVES: - Enter Set Name to Save as"
 msgstr ""
 
-#: src/interface.c:1365
+#: src/interface.c:1260
 msgid "LiVES: - Enter a Set Name to Reload"
 msgstr ""
 
-#: src/interface.c:1368
+#: src/interface.c:1262
 msgid "LiVES: - Choose a Working Directory"
 msgstr ""
 
-#: src/interface.c:1371
+#: src/interface.c:1264
 msgid "LiVES: - Rename Current Track"
 msgstr ""
 
-#: src/interface.c:1391
+#: src/interface.c:1283
 msgid ""
 "You need to enter a name for the current clip set.\n"
 "This will allow you reload the layout with the same clips later.\n"
@@ -1357,354 +1351,354 @@
 "LiVES will remind you to save the clip set later when you try to exit.\n"
 msgstr ""
 
-#: src/interface.c:1397
+#: src/interface.c:1289
 msgid ""
 "In order to export this project, you must enter a name for this clip set.\n"
 "This will also be used for the project name.\n"
 msgstr ""
 
-#: src/interface.c:1404
+#: src/interface.c:1296
 msgid ""
 "Welcome to LiVES !\n"
 "This startup wizard will guide you through the\n"
 "initial install so that you can get the most from this application.\n"
 msgstr ""
 
-#: src/interface.c:1408
+#: src/interface.c:1300
 msgid ""
 "\n"
 "First of all you need to choose a working directory for LiVES.\n"
 "This should be a directory with plenty of disk space available.\n"
 msgstr ""
 
-#: src/interface.c:1427
+#: src/interface.c:1317
 msgid "New name "
 msgstr "Neuer Name "
 
-#: src/interface.c:1430
+#: src/interface.c:1319
 msgid "Set name "
 msgstr ""
 
-#: src/interface.c:1550
+#: src/interface.c:1435
 msgid "Use def_aults"
 msgstr ""
 
-#: src/interface.c:1553 src/interface.c:1840 src/preferences.c:2515
-#: src/preferences.c:2697
+#: src/interface.c:1437 src/interface.c:1709 src/preferences.c:2550
+#: src/preferences.c:2739
 msgid "_Advanced"
 msgstr "E_rweitert"
 
-#: src/interface.c:1604
+#: src/interface.c:1487
 msgid "LiVES:- Select input device"
 msgstr ""
 
-#: src/interface.c:1622
+#: src/interface.c:1504
 msgid "Select input device:"
 msgstr ""
 
-#: src/interface.c:1686
+#: src/interface.c:1568
 msgid "LiVES:- Load CD Track"
 msgstr ""
 
-#: src/interface.c:1689
+#: src/interface.c:1570
 msgid "LiVES:- Select DVD Title/Chapter"
 msgstr ""
 
-#: src/interface.c:1692
+#: src/interface.c:1572
 msgid "LiVES:- Select VCD Title"
 msgstr ""
 
-#: src/interface.c:1695
+#: src/interface.c:1574
 msgid "LiVES:- Change Maximum Visible Tracks"
 msgstr ""
 
-#: src/interface.c:1698
+#: src/interface.c:1576
 msgid "LiVES:- Device details"
 msgstr ""
 
-#: src/interface.c:1721
+#: src/interface.c:1598
 #, c-format
 msgid "Track to load (from %s)"
 msgstr ""
 
-#: src/interface.c:1724
+#: src/interface.c:1600
 msgid "DVD Title"
 msgstr "DVD Titel"
 
-#: src/interface.c:1727
+#: src/interface.c:1602
 msgid "VCD Title"
 msgstr "VCD Titel"
 
-#: src/interface.c:1730
+#: src/interface.c:1604
 msgid "Maximum number of tracks to display"
 msgstr ""
 
-#: src/interface.c:1733
+#: src/interface.c:1606
 msgid "Device:        /dev/video"
 msgstr "Gerät:        /dev/video"
 
-#: src/interface.c:1736
+#: src/interface.c:1608
 msgid "Device:        fw:"
 msgstr "Gerät:        fw:"
 
-#: src/interface.c:1771
+#: src/interface.c:1641
 msgid "Chapter  "
 msgstr "Kapitel  "
 
-#: src/interface.c:1776
+#: src/interface.c:1645
 msgid "Channel  "
 msgstr "Kanal  "
 
-#: src/interface.c:1791
+#: src/interface.c:1660
 msgid "Audio ID  "
 msgstr ""
 
-#: src/interface.c:1857
+#: src/interface.c:1726
 msgid "Input number"
 msgstr ""
 
-#: src/interface.c:1865
+#: src/interface.c:1734
 msgid "Use default width, height and FPS"
 msgstr ""
 
-#: src/interface.c:1879
+#: src/interface.c:1748
 msgid "Width"
 msgstr "Breite"
 
-#: src/interface.c:1885
+#: src/interface.c:1754
 msgid "Height"
 msgstr "Höhe"
 
-#: src/interface.c:1899
+#: src/interface.c:1768
 msgid "_Driver"
 msgstr "_Treiber"
 
-#: src/interface.c:1902
+#: src/interface.c:1771
 msgid "_Output format"
 msgstr "_Ausgabeformat"
 
-#: src/interface.c:1998
+#: src/interface.c:1865
 msgid "LiVES:- Fade Audio In"
 msgstr ""
 
-#: src/interface.c:2001
+#: src/interface.c:1867
 msgid "LiVES:- Fade Audio Out"
 msgstr ""
 
-#: src/interface.c:2017
+#: src/interface.c:1883
 msgid "Fade in over  "
 msgstr ""
 
-#: src/interface.c:2018
+#: src/interface.c:1884
 msgid "first"
 msgstr ""
 
-#: src/interface.c:2021
+#: src/interface.c:1886
 msgid "Fade out over  "
 msgstr ""
 
-#: src/interface.c:2022
+#: src/interface.c:1887
 msgid "last"
 msgstr ""
 
-#: src/interface.c:2044
+#: src/interface.c:1909
 msgid "seconds."
 msgstr "Sekunden."
 
-#: src/interface.c:2052 src/saveplay.c:1507
+#: src/interface.c:1917 src/saveplay.c:1484
 msgid "selection"
 msgstr ""
 
-#: src/interface.c:2092
+#: src/interface.c:1956
 msgid "LiVES: - File Comments (optional)"
 msgstr ""
 
-#: src/interface.c:2107
+#: src/interface.c:1971
 msgid "Title/Name : "
 msgstr ""
 
-#: src/interface.c:2114
+#: src/interface.c:1978
 msgid "Author/Artist : "
 msgstr ""
 
-#: src/interface.c:2121
+#: src/interface.c:1985
 msgid "Comments : "
 msgstr ""
 
-#: src/interface.c:2151
+#: src/interface.c:2015
 msgid "_Options"
 msgstr ""
 
-#: src/interface.c:2158
+#: src/interface.c:2022
 msgid "Save _subtitles to file"
 msgstr ""
 
-#: src/interface.c:2170
+#: src/interface.c:2033
 msgid "Subtitle file"
 msgstr ""
 
-#: src/interface.c:2172
+#: src/interface.c:2035
 msgid "Browse..."
 msgstr ""
 
-#: src/interface.c:2255
+#: src/interface.c:2132
 msgid "LiVES: - choose a device"
 msgstr ""
 
-#: src/interface.c:2259
+#: src/interface.c:2135
 msgid "LiVES: - choose a directory"
 msgstr ""
 
-#: src/interface.c:2262
+#: src/interface.c:2137
 msgid "LiVES: - choose a file"
 msgstr ""
 
-#: src/interface.c:2445
+#: src/interface.c:2381
 msgid "LiVES: - Cancel/Discard/Save"
 msgstr ""
 
-#: src/interface.c:2460
+#: src/interface.c:2397
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has not been saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:2463
+#: src/interface.c:2400
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has been changed since the last save.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:2467
+#: src/interface.c:2404
 msgid ""
 "You are about to exit LiVES.\n"
 "The current clip set can be saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:2468
+#: src/interface.c:2405
 msgid ""
 "The current clip set has not been saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:2472
+#: src/interface.c:2408
 msgid ""
 "The current layout has not been saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:2475
+#: src/interface.c:2410
 msgid ""
 "The current layout has *not* been changed since it was last saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:2480
+#: src/interface.c:2415
 msgid ""
 "The current layout contains generated frames and cannot be retained.\n"
 "You may wish to render it before exiting multitrack mode.\n"
 msgstr ""
 
-#: src/interface.c:2483
+#: src/interface.c:2418
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout contains generated frames and cannot be retained.\n"
 "What do you wish to do ?"
 msgstr ""
 
-#: src/interface.c:2496
+#: src/interface.c:2431
 msgid "Clip set _name"
 msgstr ""
 
-#: src/interface.c:2502
+#: src/interface.c:2437
 msgid "_Auto reload next time"
 msgstr ""
 
-#: src/interface.c:2538 src/interface.c:2547
+#: src/interface.c:2473 src/interface.c:2482
 msgid "_Wipe layout"
 msgstr ""
 
-#: src/interface.c:2539
+#: src/interface.c:2474
 msgid "_Ignore changes"
 msgstr ""
 
-#: src/interface.c:2540
+#: src/interface.c:2475
 msgid "_Delete clip set"
 msgstr ""
 
-#: src/interface.c:2541
+#: src/interface.c:2476
 msgid "_Delete layout"
 msgstr ""
 
-#: src/interface.c:2545
+#: src/interface.c:2480
 msgid "_Save layout"
 msgstr ""
 
-#: src/interface.c:2546
+#: src/interface.c:2481
 msgid "_Save clip set"
 msgstr ""
 
-#: src/interface.c:2565
+#: src/interface.c:2502
 msgid ""
 "\n"
 "LiVES has detected a multitrack layout from a previous session.\n"
 "Would you like to try and recover it ?\n"
 msgstr ""
 
-#: src/interface.c:2589
+#: src/interface.c:2528
 msgid "LiVES: - Disk Recovery Options"
 msgstr ""
 
-#: src/interface.c:2608
+#: src/interface.c:2549
 msgid "Delete _Orphaned Clips"
 msgstr ""
 
-#: src/interface.c:2609
+#: src/interface.c:2550
 msgid "Delete any clips which are not currently loaded or part of a set"
 msgstr ""
 
-#: src/interface.c:2622
+#: src/interface.c:2564
 msgid "Clear _Backup Files from Closed Clips"
 msgstr ""
 
-#: src/interface.c:2633
+#: src/interface.c:2575
 msgid "Remove Sets which have _Layouts but no Clips"
 msgstr ""
 
-#: src/interface.c:2644
+#: src/interface.c:2586
 msgid "_Reset to Defaults"
 msgstr ""
 
-#: src/interface.c:2651
+#: src/interface.c:2593
 msgid "_Accept"
 msgstr ""
 
-#: src/callbacks.c:198
+#: src/callbacks.c:208
 #, c-format
 msgid "Saving as set %s..."
 msgstr ""
 
-#: src/callbacks.c:833
+#: src/callbacks.c:852
 msgid "Please enter the name of the file to save the clip as.\n"
 msgstr ""
 
-#: src/callbacks.c:841
+#: src/callbacks.c:860
 msgid "Please enter a valid URL for the download.\n"
 msgstr ""
 
-#: src/callbacks.c:867
+#: src/callbacks.c:886
 #, c-format
 msgid "Downloading %s to %s..."
 msgstr ""
 
-#: src/callbacks.c:895
+#: src/callbacks.c:912
 msgid "Downloading clip"
 msgstr ""
 
-#: src/callbacks.c:933
+#: src/callbacks.c:950
 msgid ""
 "\n"
 "LiVES was unable to download the clip.\n"
@@ -1712,17 +1706,17 @@
 "the latest youtube-dl installed.\n"
 msgstr ""
 
-#: src/callbacks.c:1114 src/callbacks.c:1149
+#: src/callbacks.c:1131 src/callbacks.c:1166
 msgid "This file"
 msgstr ""
 
-#: src/callbacks.c:1115
+#: src/callbacks.c:1132
 msgid ""
 ",\n"
 " - including the current layout - "
 msgstr ""
 
-#: src/callbacks.c:1117
+#: src/callbacks.c:1134
 #, c-format
 msgid ""
 "\n"
@@ -1732,7 +1726,7 @@
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1119
+#: src/callbacks.c:1136
 #, c-format
 msgid ""
 "\n"
@@ -1742,20 +1736,20 @@
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1150
+#: src/callbacks.c:1167
 msgid ""
 "Changes made to this clip have not been saved or backed up.\n"
 "\n"
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1343
+#: src/callbacks.c:1356
 msgid ""
 "\n"
 "Invalid project file.\n"
 msgstr ""
 
-#: src/callbacks.c:1356
+#: src/callbacks.c:1370
 #, c-format
 msgid ""
 "\n"
@@ -1768,33 +1762,33 @@
 "Once you have done this, you will be able to import the new project.\n"
 msgstr ""
 
-#: src/callbacks.c:1366
+#: src/callbacks.c:1381
 #, c-format
 msgid "Importing the project %s as set %s..."
 msgstr ""
 
-#: src/callbacks.c:1386
+#: src/callbacks.c:1399
 msgid "Importing project"
 msgstr ""
 
-#: src/callbacks.c:1472
+#: src/callbacks.c:1481
 #, c-format
 msgid "Exporting project %s..."
 msgstr ""
 
-#: src/callbacks.c:1490
+#: src/callbacks.c:1497
 msgid "Exporting project"
 msgstr ""
 
-#: src/callbacks.c:1506
+#: src/callbacks.c:1513
 msgid "Backup as .lv1 file"
 msgstr ""
 
-#: src/callbacks.c:1522
+#: src/callbacks.c:1529
 msgid "Restore .lv1 file"
 msgstr ""
 
-#: src/callbacks.c:1664
+#: src/callbacks.c:1671
 msgid ""
 "\n"
 "\n"
@@ -1802,72 +1796,77 @@
 "Are you sure ?\n"
 msgstr ""
 
-#: src/callbacks.c:1725
+#: src/callbacks.c:1732
 #, c-format
 msgid "Deleting set %s..."
 msgstr ""
 
-#: src/callbacks.c:1727
+#: src/callbacks.c:1734
 msgid "Deleting set..."
 msgstr ""
 
-#: src/callbacks.c:1731
+#: src/callbacks.c:1738
 msgid "Deleting set"
 msgstr ""
 
-#: src/callbacks.c:1739
+#: src/callbacks.c:1746
 #, c-format
 msgid "Set %s was permanently deleted from the disk.\n"
 msgstr ""
 
-#: src/callbacks.c:1787 src/callbacks.c:11764
+#: src/callbacks.c:1792 src/callbacks.c:11676
 msgid "Insert Silence"
 msgstr ""
 
-#: src/callbacks.c:1840 src/callbacks.c:1923 src/callbacks.c:2086
+#: src/callbacks.c:1844 src/callbacks.c:1927 src/callbacks.c:2089
 msgid "Undoing"
 msgstr ""
 
-#: src/callbacks.c:1936 src/callbacks.c:2147
+#: src/callbacks.c:1940 src/callbacks.c:2150
 msgid "Restoring audio..."
 msgstr ""
 
-#: src/callbacks.c:1952
+#: src/callbacks.c:1956
 msgid "Clearing frame images"
 msgstr ""
 
-#: src/callbacks.c:1985
+#: src/callbacks.c:1988
 msgid "Deleting excess frames"
 msgstr ""
 
-#: src/callbacks.c:2229
+#: src/callbacks.c:2232
 #, c-format
 msgid "Length of video is now %d frames at %.3f frames per second.\n"
 msgstr ""
 
-#: src/callbacks.c:2233 src/resample.c:683 src/resample.c:2166
+#: src/callbacks.c:2235 src/resample.c:678 src/resample.c:2133
 #, c-format
 msgid "Clipboard was resampled to %d frames.\n"
 msgstr ""
 
-#: src/callbacks.c:2394 src/callbacks.c:2423
+#: src/callbacks.c:2396 src/callbacks.c:2425
 msgid "Redoing"
 msgstr ""
 
-#: src/callbacks.c:2462
+#: src/callbacks.c:2472
+#, c-format
+msgid "Copying frames %d to %d (with sound) to the clipboard..."
+msgstr ""
+
+#: src/callbacks.c:2474
 #, c-format
-msgid "Copying frames %d to %d%s to the clipboard..."
+msgid "Copying frames %d to %d to the clipboard..."
 msgstr ""
 
-#: src/callbacks.c:2525
+#: src/callbacks.c:2526
 msgid "Copying to the clipboard"
 msgstr ""
 
-#: src/callbacks.c:2600
+#: src/callbacks.c:2601
 msgid "Cut"
 msgstr ""
 
-#: src/callbacks.c:2641 src/callbacks.c:3068 src/callbacks.c:8026
+#: src/callbacks.c:2641 src/callbacks.c:3063 src/callbacks.c:7631
 msgid "Pulling frames from clipboard"
 msgstr ""
 
@@ -1876,22 +1875,22 @@
 msgid "Pasting %d frames to new clip %s..."
 msgstr ""
 
-#: src/callbacks.c:2678
+#: src/callbacks.c:2676
 msgid "Pasting"
 msgstr ""
 
-#: src/callbacks.c:2694
+#: src/callbacks.c:2692
 msgid "...added audio..."
 msgstr ""
 
-#: src/callbacks.c:2778
+#: src/callbacks.c:2775
 msgid ""
 "This operation requires resizing or converting of frames.\n"
 "Please install 'convert' from the Image-magick package, and then restart "
 "LiVES.\n"
 msgstr ""
 
-#: src/callbacks.c:2795
+#: src/callbacks.c:2793
 msgid ""
 "\n"
 "\n"
@@ -1900,31 +1899,31 @@
 "the 'Trim Audio' function from the Audio menu."
 msgstr ""
 
-#: src/callbacks.c:2819
+#: src/callbacks.c:2817
 msgid ""
 "LiVES cannot insert because the audio rates do not match.\n"
 "Please install 'sox', and try again."
 msgstr ""
 
-#: src/callbacks.c:2838
+#: src/callbacks.c:2835
 msgid ""
 "\n"
 "Insertion will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:2888 src/callbacks.c:11692
+#: src/callbacks.c:2883 src/callbacks.c:11606
 msgid ""
 "\n"
 "Insertion will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:2996 src/callbacks.c:3025
+#: src/callbacks.c:2987 src/callbacks.c:3016
 msgid "Resampling clipboard audio"
 msgstr ""
 
-#: src/callbacks.c:3041
+#: src/callbacks.c:3032
 msgid ""
 "\n"
 "\n"
@@ -1932,7 +1931,7 @@
 "Clipboard audio has been erased.\n"
 msgstr ""
 
-#: src/callbacks.c:3055
+#: src/callbacks.c:3045
 msgid ""
 "\n"
 "\n"
@@ -1941,86 +1940,86 @@
 "using unchanged audio ?\n"
 msgstr ""
 
-#: src/callbacks.c:3137 src/callbacks.c:3311
+#: src/callbacks.c:3132 src/callbacks.c:3299
 #, c-format
 msgid "Inserting %d%s frames from the clipboard..."
 msgstr ""
 
-#: src/callbacks.c:3162 src/callbacks.c:3236 src/callbacks.c:3339
+#: src/callbacks.c:3155 src/callbacks.c:3224 src/callbacks.c:3325
 msgid "Inserting"
 msgstr ""
 
-#: src/callbacks.c:3193
+#: src/callbacks.c:3187
 #, c-format
 msgid "Inserting %d times from the clipboard%s..."
 msgstr ""
 
-#: src/callbacks.c:3200
+#: src/callbacks.c:3191
 #, c-format
 msgid "Inserting %d frames from the clipboard%s..."
 msgstr ""
 
-#: src/callbacks.c:3418
+#: src/callbacks.c:3404
 msgid "Insert"
 msgstr ""
 
-#: src/callbacks.c:3486
+#: src/callbacks.c:3471
 msgid ""
 "\n"
 "Deleting all frames will close this file.\n"
 "Are you sure ?"
 msgstr ""
 
-#: src/callbacks.c:3495
+#: src/callbacks.c:3480
 msgid ""
 "\n"
 "Deletion will cause missing frames in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3515 src/callbacks.c:10920 src/callbacks.c:11162
-#: src/callbacks.c:11228
+#: src/callbacks.c:3500 src/callbacks.c:10851 src/callbacks.c:11087
+#: src/callbacks.c:11152
 msgid ""
 "\n"
 "Deletion will cause missing audio in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3534
+#: src/callbacks.c:3519
 msgid ""
 "\n"
 "Deletion will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3553 src/callbacks.c:11210
+#: src/callbacks.c:3538 src/callbacks.c:11134
 msgid ""
 "\n"
 "Deletion will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3611
+#: src/callbacks.c:3597
 #, c-format
 msgid "Deleting frames %d to %d%s..."
 msgstr ""
 
-#: src/callbacks.c:3636
+#: src/callbacks.c:3619
 msgid "Deleting"
 msgstr ""
 
-#: src/callbacks.c:3717
+#: src/callbacks.c:3699
 msgid "Delete"
 msgstr ""
 
-#: src/callbacks.c:3738
+#: src/callbacks.c:3717
 msgid ""
 "\n"
 "\n"
 "Selection is locked.\n"
 msgstr ""
 
-#: src/callbacks.c:4092
+#: src/callbacks.c:4056
 msgid ""
 "Ready to record. Use 'control' and cursor keys during playback to record "
 "your performance.\n"
@@ -2028,11 +2027,11 @@
 "play.)\n"
 msgstr ""
 
-#: src/callbacks.c:4098
+#: src/callbacks.c:4061
 msgid "Record cancelled.\n"
 msgstr ""
 
-#: src/callbacks.c:4237
+#: src/callbacks.c:4197
 #, c-format
 msgid ""
 "\n"
@@ -2041,7 +2040,7 @@
 "%s\n"
 msgstr ""
 
-#: src/callbacks.c:4241
+#: src/callbacks.c:4200
 #, c-format
 msgid ""
 "\n"
@@ -2050,7 +2049,7 @@
 "The plugin may be broken or not installed correctly."
 msgstr ""
 
-#: src/callbacks.c:4571
+#: src/callbacks.c:4532
 #, c-format
 msgid ""
 "Saving the set will cause copies of all loaded clips to remain on the disk"
@@ -2059,22 +2058,22 @@
 "Please press 'Cancel' if that is not what you want.\n"
 msgstr ""
 
-#: src/callbacks.c:4654
+#: src/callbacks.c:4617
 #, c-format
 msgid "Saving set %s"
 msgstr ""
 
-#: src/callbacks.c:5005
+#: src/callbacks.c:4964
 #, c-format
 msgid "Loading clips from set %s"
 msgstr ""
 
-#: src/callbacks.c:5093
+#: src/callbacks.c:5051
 #, c-format
 msgid "%d clips and %d layouts were recovered from set (%s).\n"
 msgstr ""
 
-#: src/callbacks.c:5312
+#: src/callbacks.c:5259
 msgid ""
 "LiVES will attempt to recover some disk space.\n"
 "You should ONLY run this if you have no other copies of LiVES running on "
@@ -2082,24 +2081,24 @@
 "Click OK to proceed.\n"
 msgstr ""
 
-#: src/callbacks.c:5317
+#: src/callbacks.c:5264
 msgid "Cleaning up disk space..."
 msgstr ""
 
-#: src/callbacks.c:5387
+#: src/callbacks.c:5334
 msgid "Recovering disk space"
 msgstr ""
 
-#: src/callbacks.c:5439
+#: src/callbacks.c:5386
 #, c-format
 msgid "%s of disk space was recovered.\n"
 msgstr ""
 
-#: src/callbacks.c:5482
+#: src/callbacks.c:5428
 msgid "Resetting frame rates and frame values..."
 msgstr ""
 
-#: src/callbacks.c:5523
+#: src/callbacks.c:5469
 #, c-format
 msgid ""
 "\n"
@@ -2107,68 +2106,68 @@
 "Internal: %s (%d bpp) / %s\n"
 msgstr ""
 
-#: src/callbacks.c:5525
+#: src/callbacks.c:5471
 msgid "buffered"
 msgstr ""
 
-#: src/callbacks.c:5538 src/callbacks.c:5557 src/callbacks.c:5575
-#: src/callbacks.c:5609
+#: src/callbacks.c:5484 src/callbacks.c:5502 src/callbacks.c:5518
+#: src/callbacks.c:5551
 msgid ""
 "\n"
 "  Opening..."
 msgstr ""
 
-#: src/callbacks.c:5545
+#: src/callbacks.c:5490
 #, c-format
 msgid ""
 "\n"
 "(%d virtual)"
 msgstr ""
 
-#: src/callbacks.c:5548
+#: src/callbacks.c:5493
 #, c-format
 msgid ""
 "\n"
 "(%d decoded)"
 msgstr ""
 
-#: src/callbacks.c:5560 src/callbacks.c:5578 src/callbacks.c:5612
+#: src/callbacks.c:5504 src/callbacks.c:5520 src/callbacks.c:5553
 #, c-format
 msgid ""
 "\n"
 "  %.2f sec."
 msgstr ""
 
-#: src/callbacks.c:5569
+#: src/callbacks.c:5512
 msgid ""
 "\n"
 "  Unknown"
 msgstr ""
 
-#: src/callbacks.c:5582 src/callbacks.c:5596
+#: src/callbacks.c:5524 src/callbacks.c:5538
 msgid "unsigned"
 msgstr ""
 
-#: src/callbacks.c:5583 src/callbacks.c:5597
+#: src/callbacks.c:5525 src/callbacks.c:5539
 msgid "signed"
 msgstr ""
 
-#: src/callbacks.c:5585 src/callbacks.c:5599
+#: src/callbacks.c:5527 src/callbacks.c:5541
 msgid "big-endian"
 msgstr ""
 
-#: src/callbacks.c:5586 src/callbacks.c:5600
+#: src/callbacks.c:5528 src/callbacks.c:5542
 msgid "little-endian"
 msgstr ""
 
-#: src/callbacks.c:5588 src/callbacks.c:5602
+#: src/callbacks.c:5530 src/callbacks.c:5544
 #, c-format
 msgid ""
 "  %d Hz %d bit\n"
 "%s %s"
 msgstr ""
 
-#: src/callbacks.c:5707
+#: src/callbacks.c:5647
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -2185,15 +2184,15 @@
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA.\n"
 msgstr ""
 
-#: src/callbacks.c:5721
+#: src/callbacks.c:5661
 msgid "A video editor and VJ program."
 msgstr ""
 
-#: src/callbacks.c:5722
+#: src/callbacks.c:5662
 msgid "About LiVES"
 msgstr ""
 
-#: src/callbacks.c:5724
+#: src/callbacks.c:5664
 msgid "translator_credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -2206,7 +2205,7 @@
 "  milan https://launchpad.net/~milan-fox\n"
 "  salsaman https://launchpad.net/~salsaman"
 
-#: src/callbacks.c:5758
+#: src/callbacks.c:5699
 #, c-format
 msgid ""
 "LiVES Version %s\n"
@@ -2220,14 +2219,14 @@
 "Homepage: http://lives.sourceforge.net"
 msgstr ""
 
-#: src/callbacks.c:6037
+#: src/callbacks.c:5996
 msgid ""
 "\n"
 "\n"
 "You need to install mplayer or mplayer2 to be able to preview this file.\n"
 msgstr ""
 
-#: src/callbacks.c:6040
+#: src/callbacks.c:5998
 msgid ""
 "\n"
 "\n"
@@ -2235,215 +2234,206 @@
 "this file.\n"
 msgstr ""
 
-#: src/callbacks.c:6423 src/callbacks.c:8289
-msgid ""
-"\n"
-"Loading new audio may cause missing audio in some multitrack layouts.\n"
-"Are you sure you wish to continue ?\n"
-"."
-msgstr ""
-
-#: src/callbacks.c:6523
-#, c-format
-msgid "Opening audio %s, type %s..."
-msgstr ""
-
-#: src/callbacks.c:6556 src/saveplay.c:480
-msgid "Opening audio"
-msgstr ""
-
-#: src/callbacks.c:6565 src/callbacks.c:6612 src/callbacks.c:8387
-#: src/callbacks.c:8429 src/callbacks.c:8472 src/callbacks.c:10846
-msgid "Cancelling"
-msgstr ""
-
-#: src/callbacks.c:6660 src/callbacks.c:8514 src/callbacks.c:10876
-#: src/callbacks.c:11563
-msgid "Committing audio"
-msgstr ""
-
-#: src/callbacks.c:6672 src/callbacks.c:8546
-msgid "New Audio"
-msgstr ""
-
-#: src/callbacks.c:6779
+#: src/callbacks.c:6459
 #, c-format
 msgid ""
 "Text was saved as\n"
 "%s\n"
 msgstr ""
 
-#: src/callbacks.c:6951 src/saveplay.c:3618
-#, c-format
-msgid "%d frames are enough !\n"
-msgstr ""
-
-#: src/callbacks.c:7050
+#: src/callbacks.c:6706
 msgid "LiVES: - Encoder debug output"
 msgstr ""
 
-#: src/callbacks.c:7087 src/gui.c:1922
+#: src/callbacks.c:6743 src/gui.c:1921
 msgid "Fullscreen playback (f)"
 msgstr ""
 
-#: src/callbacks.c:7089
+#: src/callbacks.c:6744
 msgid "Fullscreen playback off (f)"
 msgstr ""
 
-#: src/callbacks.c:7188 src/callbacks.c:7336 src/callbacks.c:7664
-#: src/callbacks.c:7681 src/gui.c:3712 src/saveplay.c:2467 src/saveplay.c:2501
-#: src/saveplay.c:3115 src/saveplay.c:3220 src/saveplay.c:3239
-#: src/multitrack.c:9340 src/multitrack.c:11060
+#: src/callbacks.c:6841 src/callbacks.c:6983 src/callbacks.c:7283
+#: src/callbacks.c:7298 src/gui.c:3838 src/saveplay.c:2442 src/saveplay.c:2475
+#: src/saveplay.c:3074 src/saveplay.c:3178 src/saveplay.c:3197
+#: src/multitrack.c:9526 src/multitrack.c:11288
 #, c-format
 msgid " (%d %% scale)"
 msgstr ""
 
-#: src/callbacks.c:7190 src/callbacks.c:7338 src/callbacks.c:7666
-#: src/gui.c:3716 src/saveplay.c:2469 src/saveplay.c:2503
+#: src/callbacks.c:6843 src/callbacks.c:6985 src/callbacks.c:7285
+#: src/gui.c:3842 src/saveplay.c:2444 src/saveplay.c:2477
 #, c-format
 msgid "LiVES: - Play Window%s"
 msgstr ""
 
-#: src/callbacks.c:7302 src/gui.c:1907
+#: src/callbacks.c:6950 src/gui.c:1906
 msgid "Double size (d)"
 msgstr ""
 
-#: src/callbacks.c:7309
+#: src/callbacks.c:6956
 msgid "Single size (d)"
 msgstr ""
 
-#: src/callbacks.c:7442 src/callbacks.c:7443
+#: src/callbacks.c:7087 src/callbacks.c:7088
 msgid "Hide the play window (s)"
 msgstr ""
 
-#: src/callbacks.c:7452 src/gui.c:1746
+#: src/callbacks.c:7096 src/gui.c:1744
 msgid "Show the play window (s)"
 msgstr ""
 
-#: src/callbacks.c:7453 src/gui.c:1896
+#: src/callbacks.c:7097 src/gui.c:1895
 msgid "Play in separate window (s)"
 msgstr ""
 
-#: src/callbacks.c:7535 src/gui.c:4060 src/saveplay.c:2498
+#: src/callbacks.c:7175 src/gui.c:4169 src/saveplay.c:2472
 msgid "LiVES: - Streaming"
 msgstr ""
 
-#: src/callbacks.c:7778
+#: src/callbacks.c:7388
 msgid "Switch continuous looping off (o)"
 msgstr ""
 
-#: src/callbacks.c:7785 src/gui.c:1795
+#: src/callbacks.c:7394 src/gui.c:1793
 msgid "Switch continuous looping on (o)"
 msgstr ""
 
-#: src/callbacks.c:7837
+#: src/callbacks.c:7444
 #, c-format
 msgid "Audio volume (%.2f)"
 msgstr ""
 
-#: src/callbacks.c:7876 src/callbacks.c:7877 src/gui.c:3640
+#: src/callbacks.c:7483 src/callbacks.c:7484 src/gui.c:3766
 msgid "Unmute the audio (z)"
 msgstr ""
 
-#: src/callbacks.c:7888 src/callbacks.c:7889 src/gui.c:1808 src/gui.c:3639
+#: src/callbacks.c:7494 src/callbacks.c:7495 src/gui.c:1806 src/gui.c:3765
 msgid "Mute the audio (z)"
 msgstr ""
 
-#: src/callbacks.c:8038
+#: src/callbacks.c:7643
 msgid "Reversing clipboard..."
 msgstr ""
 
-#: src/callbacks.c:8052
+#: src/callbacks.c:7657
 msgid "Reversing clipboard"
 msgstr ""
 
-#: src/callbacks.c:8084
+#: src/callbacks.c:7689
 msgid "LiVES: Load subtitles from..."
 msgstr ""
 
-#: src/callbacks.c:8151 src/saveplay.c:970
+#: src/callbacks.c:7753 src/saveplay.c:956
 #, c-format
 msgid "Loaded subtitle file: %s\n"
 msgstr ""
 
-#: src/callbacks.c:8220
+#: src/callbacks.c:7821
 msgid "Subtitles were erased.\n"
 msgstr ""
 
-#: src/callbacks.c:8239
+#: src/callbacks.c:7843
 msgid "LiVES: - Select Audio File"
 msgstr ""
 
-#: src/callbacks.c:8250
+#: src/callbacks.c:7878 src/callbacks.c:8232
+msgid ""
+"\n"
+"Loading new audio may cause missing audio in some multitrack layouts.\n"
+"Are you sure you wish to continue ?\n"
+"."
+msgstr ""
+
+#: src/callbacks.c:7989
+#, c-format
+msgid "Opening audio %s, type %s..."
+msgstr ""
+
+#: src/callbacks.c:8023 src/saveplay.c:477
+msgid "Opening audio"
+msgstr ""
+
+#: src/callbacks.c:8032 src/callbacks.c:8083 src/callbacks.c:8327
+#: src/callbacks.c:8369 src/callbacks.c:8412 src/callbacks.c:10766
+msgid "Cancelling"
+msgstr ""
+
+#: src/callbacks.c:8137 src/callbacks.c:8454 src/callbacks.c:10803
+#: src/callbacks.c:11477
+msgid "Committing audio"
+msgstr ""
+
+#: src/callbacks.c:8153 src/callbacks.c:8484
+msgid "New Audio"
+msgstr ""
+
+#: src/callbacks.c:8194
 msgid "Please set your CD play device in Tools | Preferences | Misc\n"
 msgstr ""
 
-#: src/callbacks.c:8321
+#: src/callbacks.c:8264
 #, c-format
 msgid "Opening CD track %d from %s..."
 msgstr ""
 
-#: src/callbacks.c:8326
+#: src/callbacks.c:8267
 #, c-format
 msgid "CD track %d"
 msgstr ""
 
-#: src/callbacks.c:8373
+#: src/callbacks.c:8313
 msgid "Opening CD track..."
 msgstr ""
 
-#: src/callbacks.c:8415 src/callbacks.c:8461
+#: src/callbacks.c:8355 src/callbacks.c:8401
 msgid "Error loading CD track\n"
 msgstr ""
 
-#: src/callbacks.c:8584
+#: src/callbacks.c:8518
 msgid "layout errors"
 msgstr ""
 
-#: src/callbacks.c:8595
+#: src/callbacks.c:8529
 msgid "Close _Window"
 msgstr ""
 
-#: src/callbacks.c:8606
+#: src/callbacks.c:8540
 msgid "Clear _Errors"
 msgstr ""
 
-#: src/callbacks.c:8617
+#: src/callbacks.c:8551
 msgid "_Delete affected layouts"
 msgstr ""
 
-#: src/callbacks.c:9343 src/callbacks.c:9388
+#: src/callbacks.c:9253 src/callbacks.c:9298
 msgid "Resume"
 msgstr ""
 
-#: src/callbacks.c:9344
+#: src/callbacks.c:9254
 msgid ""
 "\n"
 "Paused\n"
 "(click Resume to continue processing)"
 msgstr ""
 
-#: src/callbacks.c:9345 src/callbacks.c:9406
+#: src/callbacks.c:9255 src/callbacks.c:9315
 msgid "paused..."
 msgstr ""
 
-#: src/callbacks.c:9372 src/callbacks.c:9418
-msgid "Pause"
-msgstr ""
-
-#: src/callbacks.c:9374 src/callbacks.c:9421
+#: src/callbacks.c:9284 src/callbacks.c:9333
 msgid "resumed..."
 msgstr ""
 
-#: src/callbacks.c:9393
+#: src/callbacks.c:9303
 msgid "Keep"
 msgstr ""
 
-#: src/callbacks.c:9396
+#: src/callbacks.c:9305
 msgid "Enough"
 msgstr ""
 
-#: src/callbacks.c:9401
+#: src/callbacks.c:9310
 #, c-format
 msgid ""
 "\n"
@@ -2452,28 +2442,28 @@
 "(click Resume to continue processing)"
 msgstr ""
 
-#: src/callbacks.c:9419
+#: src/callbacks.c:9331
 msgid "Cancel"
 msgstr ""
 
-#: src/callbacks.c:9558
+#: src/callbacks.c:9478
 msgid "Stop"
 msgstr ""
 
-#: src/callbacks.c:10053 src/multitrack.c:13247
+#: src/callbacks.c:9968 src/multitrack.c:13489
 msgid "LiVES: Selected frame"
 msgstr ""
 
-#: src/callbacks.c:10061
+#: src/callbacks.c:9976
 msgid "_Save frame as..."
 msgstr ""
 
-#: src/callbacks.c:10290
+#: src/callbacks.c:10202
 #, c-format
 msgid "Audio is ahead of video by %.4f secs. at frame %d, with fps %.4f\n"
 msgstr ""
 
-#: src/callbacks.c:10347
+#: src/callbacks.c:10255
 msgid ""
 "\n"
 "\n"
@@ -2482,7 +2472,7 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10353
+#: src/callbacks.c:10261
 msgid ""
 "\n"
 "\n"
@@ -2490,13 +2480,13 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10429 src/callbacks.c:11479
+#: src/callbacks.c:10334 src/callbacks.c:11395
 msgid ""
 "\n"
 "Record time must be greater than 0.\n"
 msgstr ""
 
-#: src/callbacks.c:10440
+#: src/callbacks.c:10346
 msgid ""
 "Capture an External Window:\n"
 "\n"
@@ -2505,17 +2495,17 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10445
+#: src/callbacks.c:10351
 msgid "External window was released.\n"
 msgstr ""
 
-#: src/callbacks.c:10479
+#: src/callbacks.c:10385
 msgid ""
 "Click on a Window to Capture it\n"
 "Press 'q' to stop recording"
 msgstr ""
 
-#: src/callbacks.c:10513
+#: src/callbacks.c:10419
 #, c-format
 msgid ""
 "\n"
@@ -2525,19 +2515,19 @@
 "(Default of %.3f frames per second will be used.)\n"
 msgstr ""
 
-#: src/callbacks.c:10539
+#: src/callbacks.c:10443
 msgid "LiVES was unable to capture this window. Sorry.\n"
 msgstr ""
 
-#: src/callbacks.c:10695
+#: src/callbacks.c:10601
 msgid "Export Selected Audio as..."
 msgstr ""
 
-#: src/callbacks.c:10699
+#: src/callbacks.c:10604
 msgid "Export Audio as..."
 msgstr ""
 
-#: src/callbacks.c:10714
+#: src/callbacks.c:10619
 msgid ""
 "\n"
 "\n"
@@ -2546,1033 +2536,1033 @@
 "rate.\n"
 msgstr ""
 
-#: src/callbacks.c:10720
+#: src/callbacks.c:10625
 #, c-format
 msgid "Exporting audio frames %d to %d as %s..."
 msgstr ""
 
-#: src/callbacks.c:10725
+#: src/callbacks.c:10629
 #, c-format
 msgid "Exporting audio as %s..."
 msgstr ""
 
-#: src/callbacks.c:10751
+#: src/callbacks.c:10655
 msgid "Exporting audio"
 msgstr ""
 
-#: src/callbacks.c:10782
+#: src/callbacks.c:10695
 msgid "LiVES: - Append Audio File"
 msgstr ""
 
-#: src/callbacks.c:10825
+#: src/callbacks.c:10739
 #, c-format
 msgid "Appending audio file %s..."
 msgstr ""
 
-#: src/callbacks.c:10836
+#: src/callbacks.c:10756
 msgid "Appending audio"
 msgstr ""
 
-#: src/callbacks.c:10892
+#: src/callbacks.c:10818
 msgid "Append Audio"
 msgstr ""
 
-#: src/callbacks.c:10952
+#: src/callbacks.c:10883
 #, c-format
 msgid "Padding audio to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10954
+#: src/callbacks.c:10885
 #, c-format
 msgid "Trimming audio from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10973
+#: src/callbacks.c:10904
 msgid "Trimming/Padding audio"
 msgstr ""
 
-#: src/callbacks.c:10981
+#: src/callbacks.c:10912
 msgid "Trim/Pad Audio"
 msgstr ""
 
-#: src/callbacks.c:11055
+#: src/callbacks.c:10982
 msgid "Fading audio in"
 msgstr ""
 
-#: src/callbacks.c:11056
+#: src/callbacks.c:10983
 msgid "Fade audio in"
 msgstr ""
 
-#: src/callbacks.c:11061
+#: src/callbacks.c:10987
 msgid "Fading audio out"
 msgstr ""
 
-#: src/callbacks.c:11062
+#: src/callbacks.c:10988
 msgid "Fade audio out"
 msgstr ""
 
-#: src/callbacks.c:11085
+#: src/callbacks.c:11011
 #, c-format
 msgid "%s over %.1f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11087
+#: src/callbacks.c:11013
 #, c-format
 msgid "%s from time %.2f seconds to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11094
+#: src/callbacks.c:11020
 msgid "Fading audio..."
 msgstr ""
 
-#: src/callbacks.c:11194
+#: src/callbacks.c:11119
 msgid ""
 "\n"
 "Deleting all audio will close this file.\n"
 "Are you sure ?"
 msgstr ""
 
-#: src/callbacks.c:11197
+#: src/callbacks.c:11122
 msgid "Deleting all audio..."
 msgstr ""
 
-#: src/callbacks.c:11203
+#: src/callbacks.c:11127
 #, c-format
 msgid "Deleting audio from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11290
+#: src/callbacks.c:11214
 msgid "Deleting Audio"
 msgstr ""
 
-#: src/callbacks.c:11297
+#: src/callbacks.c:11221
 msgid "Delete Audio"
 msgstr ""
 
-#: src/callbacks.c:11636
+#: src/callbacks.c:11550
 msgid "Record new audio"
 msgstr ""
 
-#: src/callbacks.c:11725
+#: src/callbacks.c:11640
 #, c-format
 msgid "Inserting silence from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11754
+#: src/callbacks.c:11666
 msgid "Inserting Silence"
 msgstr ""
 
-#: src/merge.c:85
+#: src/merge.c:96
 msgid "LiVES: - Merge"
 msgstr ""
 
-#: src/merge.c:102
+#: src/merge.c:113
 #, c-format
 msgid "Merge Clipboard [ %d Frames ]       With Selection [ %d Frames ]"
 msgstr ""
 
-#: src/merge.c:107
+#: src/merge.c:118
 #, c-format
 msgid ""
 "Merge Clipboard [ %d Frames (resampled) ]       With Selection [ %d Frames ]"
 msgstr ""
 
-#: src/merge.c:118
+#: src/merge.c:130
 msgid "Align _Starts"
 msgstr ""
 
-#: src/merge.c:123
+#: src/merge.c:135
 msgid "Align _Ends"
 msgstr ""
 
-#: src/merge.c:134
+#: src/merge.c:146
 msgid "What to do with extra clipboard frames -"
 msgstr ""
 
-#: src/merge.c:137
+#: src/merge.c:149
 msgid "_Insert Frames"
 msgstr ""
 
-#: src/merge.c:143
+#: src/merge.c:155
 msgid "_Drop Frames"
 msgstr ""
 
-#: src/merge.c:149
+#: src/merge.c:160
 msgid "Number of Times to Loop Clipboard"
 msgstr ""
 
-#: src/merge.c:160
+#: src/merge.c:171
 msgid "_Loop Clipboard to Fit Selection"
 msgstr ""
 
-#: src/merge.c:173
+#: src/merge.c:184
 msgid "_Transition Method:"
 msgstr ""
 
-#: src/merge.c:394
+#: src/merge.c:395
 msgid "Merging clipboard with selection..."
 msgstr ""
 
-#: src/merge.c:551
+#: src/merge.c:539
 msgid "Merge done.\n"
 msgstr ""
 
-#: src/gui.c:123
+#: src/gui.c:122
 msgid "_Custom Generators"
 msgstr ""
 
-#: src/gui.c:124
+#: src/gui.c:123
 msgid "_Custom Effects"
 msgstr ""
 
-#: src/gui.c:125
+#: src/gui.c:124
 msgid "Custom _Utilities"
 msgstr ""
 
-#: src/gui.c:352 src/multitrack.c:5964
+#: src/gui.c:351 src/multitrack.c:6143
 msgid "_File"
 msgstr ""
 
-#: src/gui.c:367 src/multitrack.c:5989
+#: src/gui.c:366 src/multitrack.c:6168
 msgid "_Open File/Directory"
 msgstr ""
 
-#: src/gui.c:373
+#: src/gui.c:372
 msgid "O_pen Part of File..."
 msgstr ""
 
-#: src/gui.c:379 src/gui.c:383 src/multitrack.c:6006 src/multitrack.c:6023
-#: src/multitrack.c:6028
+#: src/gui.c:378 src/gui.c:382 src/multitrack.c:6185 src/multitrack.c:6202
+#: src/multitrack.c:6207
 msgid "Open _Location/Stream..."
 msgstr ""
 
-#: src/gui.c:393 src/multitrack.c:6016
+#: src/gui.c:392 src/multitrack.c:6195
 msgid "Open _Youtube Clip..."
 msgstr ""
 
-#: src/gui.c:404
+#: src/gui.c:403
 msgid "Import from _dvd/vcd..."
 msgstr ""
 
-#: src/gui.c:413
+#: src/gui.c:412
 msgid "Import from _dvd"
 msgstr ""
 
-#: src/gui.c:416
+#: src/gui.c:415
 msgid "Import from _vcd"
 msgstr ""
 
-#: src/gui.c:419
+#: src/gui.c:418
 msgid "_Import from Firewire"
 msgstr ""
 
-#: src/gui.c:428 src/multitrack.c:6086
+#: src/gui.c:427 src/multitrack.c:6265
 msgid "Import from _Firewire Device (dv)"
 msgstr ""
 
-#: src/gui.c:429 src/multitrack.c:6094
+#: src/gui.c:428 src/multitrack.c:6273
 msgid "Import from _Firewire Device (hdv)"
 msgstr ""
 
-#: src/gui.c:457
+#: src/gui.c:456
 msgid "_Add Webcam/TV card..."
 msgstr ""
 
-#: src/gui.c:476
+#: src/gui.c:475
 msgid "Add _Unicap Device"
 msgstr ""
 
-#: src/gui.c:486
+#: src/gui.c:485
 msgid "Add Live _Firewire Device"
 msgstr ""
 
-#: src/gui.c:495
+#: src/gui.c:494
 msgid "Add _TV Device"
 msgstr ""
 
-#: src/gui.c:510 src/multitrack.c:6117
+#: src/gui.c:509 src/multitrack.c:6296
 msgid "_Recent Files..."
 msgstr ""
 
-#: src/gui.c:560 src/multitrack.c:6177
+#: src/gui.c:559 src/multitrack.c:6356
 msgid "_Reload Clip Set..."
 msgstr ""
 
-#: src/gui.c:564 src/multitrack.c:6185
+#: src/gui.c:563 src/multitrack.c:6364
 msgid "Close/Sa_ve All Clips"
 msgstr ""
 
-#: src/gui.c:575
+#: src/gui.c:574
 msgid "_Encode Clip As..."
 msgstr ""
 
-#: src/gui.c:577
+#: src/gui.c:576
 msgid "Encode _Selection As..."
 msgstr ""
 
-#: src/gui.c:584
+#: src/gui.c:583
 msgid "_Close This Clip"
 msgstr ""
 
-#: src/gui.c:595
+#: src/gui.c:594
 msgid "_Backup Clip as .lv1..."
 msgstr ""
 
-#: src/gui.c:604
+#: src/gui.c:603
 msgid "_Restore Clip from .lv1..."
 msgstr ""
 
-#: src/gui.c:615
+#: src/gui.c:614
 msgid "Encode/Load/Backup _with Sound"
 msgstr ""
 
-#: src/gui.c:620
+#: src/gui.c:619
 msgid "Auto load subtitles"
 msgstr ""
 
-#: src/gui.c:628 src/multitrack.c:6224
+#: src/gui.c:627 src/multitrack.c:6403
 msgid "Clean _up Diskspace"
 msgstr ""
 
-#: src/gui.c:636 src/multitrack.c:6257
+#: src/gui.c:635 src/multitrack.c:6436
 msgid "_Edit"
 msgstr ""
 
-#: src/gui.c:685
+#: src/gui.c:684
 msgid "_MULTITRACK mode"
 msgstr ""
 
-#: src/gui.c:696
+#: src/gui.c:695
 msgid "_Copy Selection"
 msgstr ""
 
-#: src/gui.c:705
+#: src/gui.c:704
 msgid "Cu_t Selection"
 msgstr ""
 
-#: src/gui.c:714
+#: src/gui.c:713
 msgid "_Insert from Clipboard..."
 msgstr ""
 
-#: src/gui.c:730
+#: src/gui.c:729
 msgid "Paste as _New"
 msgstr ""
 
-#: src/gui.c:739
+#: src/gui.c:738
 msgid "_Merge Clipboard with Selection..."
 msgstr ""
 
-#: src/gui.c:746
+#: src/gui.c:745
 msgid "_Delete Selection"
 msgstr ""
 
-#: src/gui.c:764
+#: src/gui.c:763
 msgid "Decouple _Video from Audio"
 msgstr ""
 
-#: src/gui.c:772
+#: src/gui.c:771
 msgid "_Select..."
 msgstr ""
 
-#: src/gui.c:786
+#: src/gui.c:785
 msgid "Select _All Frames"
 msgstr ""
 
-#: src/gui.c:794
+#: src/gui.c:793
 msgid "_Start Frame Only"
 msgstr ""
 
-#: src/gui.c:802
+#: src/gui.c:801
 msgid "_End Frame Only"
 msgstr ""
 
-#: src/gui.c:813
+#: src/gui.c:812
 msgid "Select from _First Frame"
 msgstr ""
 
-#: src/gui.c:817
+#: src/gui.c:816
 msgid "Select to _Last Frame"
 msgstr ""
 
-#: src/gui.c:821
+#: src/gui.c:820
 msgid "Select Last Insertion/_Merge"
 msgstr ""
 
-#: src/gui.c:825
+#: src/gui.c:824
 msgid "Select Last _Effect"
 msgstr ""
 
-#: src/gui.c:829
+#: src/gui.c:828
 msgid "_Invert Selection"
 msgstr ""
 
-#: src/gui.c:837
+#: src/gui.c:836
 msgid "_Lock Selection Width"
 msgstr ""
 
-#: src/gui.c:842 src/multitrack.c:6409
+#: src/gui.c:841 src/multitrack.c:6591
 msgid "_Play"
 msgstr ""
 
-#: src/gui.c:854
+#: src/gui.c:853
 msgid "_Play All"
 msgstr ""
 
-#: src/gui.c:869
+#: src/gui.c:868
 msgid "Pla_y Selection"
 msgstr ""
 
-#: src/gui.c:877
+#: src/gui.c:876
 msgid "Play _Clipboard"
 msgstr ""
 
-#: src/gui.c:899 src/multitrack.c:6441
+#: src/gui.c:898 src/multitrack.c:6623
 msgid "_Stop"
 msgstr ""
 
-#: src/gui.c:914 src/multitrack.c:6453
+#: src/gui.c:913 src/multitrack.c:6635
 msgid "Re_wind"
 msgstr ""
 
-#: src/gui.c:946 src/multitrack.c:6471
+#: src/gui.c:945 src/multitrack.c:6653
 msgid "_Full Screen"
 msgstr ""
 
-#: src/gui.c:955
+#: src/gui.c:954
 msgid "_Double Size"
 msgstr ""
 
-#: src/gui.c:963 src/multitrack.c:6479
+#: src/gui.c:962 src/multitrack.c:6661
 msgid "Play in _Separate Window"
 msgstr ""
 
-#: src/gui.c:972
+#: src/gui.c:971
 msgid "_Blank Background"
 msgstr ""
 
-#: src/gui.c:979
+#: src/gui.c:978
 msgid "(Auto)_loop Video (to fit audio track)"
 msgstr ""
 
-#: src/gui.c:988 src/multitrack.c:6487
+#: src/gui.c:987 src/multitrack.c:6669
 msgid "L_oop Continuously"
 msgstr ""
 
-#: src/gui.c:997
+#: src/gui.c:996
 msgid "Pin_g Pong Loops"
 msgstr ""
 
-#: src/gui.c:1005 src/multitrack.c:6495
+#: src/gui.c:1004 src/multitrack.c:6677
 msgid "_Mute"
 msgstr ""
 
-#: src/gui.c:1017
+#: src/gui.c:1016
 msgid "Separate Window 'S_ticky' Mode"
 msgstr ""
 
-#: src/gui.c:1025
+#: src/gui.c:1024
 msgid "S_how Frame Counter"
 msgstr ""
 
-#: src/gui.c:1035
+#: src/gui.c:1034
 msgid "Show Subtitles"
 msgstr ""
 
-#: src/gui.c:1045
+#: src/gui.c:1044
 msgid "Letterbox mode"
 msgstr ""
 
-#: src/gui.c:1051 src/multitrack.c:6507
+#: src/gui.c:1050 src/multitrack.c:6689
 msgid "Effect_s"
 msgstr ""
 
-#: src/gui.c:1054
+#: src/gui.c:1053
 msgid "Effects are applied to the current selection."
 msgstr ""
 
-#: src/gui.c:1067
+#: src/gui.c:1066
 msgid "_Run Test Rendered Effect/Tool/Generator..."
 msgstr ""
 
-#: src/gui.c:1072 src/multitrack.c:7123
+#: src/gui.c:1071 src/multitrack.c:7299
 msgid "_Tools"
 msgstr ""
 
-#: src/gui.c:1075
+#: src/gui.c:1074
 msgid "Tools are applied to complete clips."
 msgstr ""
 
-#: src/gui.c:1085
+#: src/gui.c:1084
 msgid "_Reverse Clipboard"
-msgstr ""
+msgstr "_Bildfolge der Zwischenablage umkehren"
 
-#: src/gui.c:1094
+#: src/gui.c:1093
 msgid "_Change Playback/Save Speed..."
 msgstr ""
 
-#: src/gui.c:1099
+#: src/gui.c:1098
 msgid "Resample _Video to New Frame Rate..."
 msgstr ""
 
-#: src/gui.c:1105
+#: src/gui.c:1104
 msgid "_Utilities"
 msgstr ""
 
-#: src/gui.c:1110
+#: src/gui.c:1109
 msgid "Custom _Tools"
 msgstr ""
 
-#: src/gui.c:1116 src/multitrack.c:7149
+#: src/gui.c:1115 src/multitrack.c:7325
 msgid "_Generate"
 msgstr ""
 
-#: src/gui.c:1126
+#: src/gui.c:1125
 msgid "Loading rendered effect plugins..."
 msgstr ""
 
-#: src/gui.c:1139
+#: src/gui.c:1138
 msgid "Load _Subtitles from File..."
 msgstr ""
 
-#: src/gui.c:1144
+#: src/gui.c:1143
 msgid "Erase subtitles"
 msgstr ""
 
-#: src/gui.c:1152 src/multitrack.c:7158
+#: src/gui.c:1151 src/multitrack.c:7334
 msgid "Capture _External Window... "
 msgstr ""
 
-#: src/gui.c:1159 src/multitrack.c:7173
+#: src/gui.c:1158 src/multitrack.c:7349
 msgid "_Preferences..."
 msgstr ""
 
-#: src/gui.c:1172
+#: src/gui.c:1171
 msgid "_Audio"
 msgstr ""
 
-#: src/gui.c:1184
+#: src/gui.c:1183
 msgid "Load _New Audio for Clip..."
 msgstr ""
 
-#: src/gui.c:1190
+#: src/gui.c:1189
 msgid "Load _CD Track..."
 msgstr ""
 
-#: src/gui.c:1191
+#: src/gui.c:1190
 msgid "E_ject CD"
 msgstr ""
 
-#: src/gui.c:1205
+#: src/gui.c:1204
 msgid "Record E_xternal Audio..."
 msgstr ""
 
-#: src/gui.c:1218
+#: src/gui.c:1217
 msgid "to New _Clip..."
 msgstr ""
 
-#: src/gui.c:1222
+#: src/gui.c:1221
 msgid "to _Selection"
 msgstr ""
 
-#: src/gui.c:1230
+#: src/gui.c:1229
 msgid "Fade Audio _In..."
 msgstr ""
 
-#: src/gui.c:1234
+#: src/gui.c:1233
 msgid "Fade Audio _Out..."
 msgstr ""
 
-#: src/gui.c:1244
+#: src/gui.c:1243
 msgid "_Export Audio..."
 msgstr ""
 
-#: src/gui.c:1257
+#: src/gui.c:1256
 msgid "Export _Selected Audio..."
 msgstr ""
 
-#: src/gui.c:1261
+#: src/gui.c:1260
 msgid "Export _All Audio..."
 msgstr ""
 
-#: src/gui.c:1265
+#: src/gui.c:1264
 msgid "_Append Audio..."
 msgstr ""
 
-#: src/gui.c:1270
+#: src/gui.c:1269
 msgid "_Trim/Pad Audio..."
 msgstr ""
 
-#: src/gui.c:1283
+#: src/gui.c:1282
 msgid "Trim/Pad Audio to _Selection"
 msgstr ""
 
-#: src/gui.c:1288
+#: src/gui.c:1287
 msgid "Trim/Pad Audio from Beginning to _Play Start"
 msgstr ""
 
-#: src/gui.c:1293
+#: src/gui.c:1292
 msgid "_Delete Audio..."
 msgstr ""
 
-#: src/gui.c:1306
+#: src/gui.c:1305
 msgid "Delete _Selected Audio"
 msgstr ""
 
-#: src/gui.c:1310
+#: src/gui.c:1309
 msgid "Delete _All Audio"
 msgstr ""
 
-#: src/gui.c:1314
+#: src/gui.c:1313
 msgid "Insert _Silence in Selection"
 msgstr ""
 
-#: src/gui.c:1319
+#: src/gui.c:1318
 msgid "_Resample Audio..."
 msgstr ""
 
-#: src/gui.c:1324
+#: src/gui.c:1323
 msgid "_Info"
 msgstr ""
 
-#: src/gui.c:1336
+#: src/gui.c:1335
 msgid "Show Clip _Info"
 msgstr ""
 
-#: src/gui.c:1344
+#: src/gui.c:1343
 msgid "Show/_Edit File Comments"
 msgstr ""
 
-#: src/gui.c:1349
+#: src/gui.c:1348
 msgid "Show _Clipboard Info"
 msgstr ""
 
-#: src/gui.c:1360 src/multitrack.c:7286
+#: src/gui.c:1359 src/multitrack.c:7462
 msgid "Show _Messages"
 msgstr ""
 
-#: src/gui.c:1364 src/multitrack.c:7365
+#: src/gui.c:1363 src/multitrack.c:7541
 msgid "Show _Layout Errors"
 msgstr ""
 
-#: src/gui.c:1369 src/multitrack.c:7263
+#: src/gui.c:1368 src/multitrack.c:7439
 msgid "_Clips"
 msgstr ""
 
-#: src/gui.c:1381
+#: src/gui.c:1380
 msgid "_Rename Current Clip in Menu..."
 msgstr ""
 
-#: src/gui.c:1399
+#: src/gui.c:1398
 msgid "A_dvanced"
 msgstr ""
 
-#: src/gui.c:1412
+#: src/gui.c:1411
 msgid "_RFX Effects/Tools/Utilities"
 msgstr ""
 
-#: src/gui.c:1424
+#: src/gui.c:1423
 msgid "_New Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1428
+#: src/gui.c:1427
 msgid "_Copy RFX Script to Test..."
 msgstr ""
 
-#: src/gui.c:1432
+#: src/gui.c:1431
 msgid "_Edit Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1436
+#: src/gui.c:1435
 msgid "Rena_me Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1440
+#: src/gui.c:1439
 msgid "_Delete Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1450
+#: src/gui.c:1449
 msgid "_Promote Test Rendered Effect/Tool/Generator..."
 msgstr ""
 
-#: src/gui.c:1457
+#: src/gui.c:1456
 msgid "_Import Custom RFX script..."
 msgstr ""
 
-#: src/gui.c:1461
+#: src/gui.c:1460
 msgid "E_xport Custom RFX script..."
 msgstr ""
 
-#: src/gui.c:1465
+#: src/gui.c:1464
 msgid "De_lete Custom RFX Script..."
 msgstr ""
 
-#: src/gui.c:1472
+#: src/gui.c:1471
 msgid "Re_build all RFX plugins"
 msgstr ""
 
-#: src/gui.c:1501
+#: src/gui.c:1498
 msgid "Receive _LiVES stream from..."
 msgstr ""
 
-#: src/gui.c:1506
+#: src/gui.c:1503
 msgid "_Send LiVES stream to..."
 msgstr ""
 
-#: src/gui.c:1515
+#: src/gui.c:1512
 #, c-format
 msgid "Open _yuv4mpeg stream on %sstream.yuv..."
 msgstr ""
 
-#: src/gui.c:1536
+#: src/gui.c:1534
 msgid "_Import Project (.lv2)..."
 msgstr ""
 
-#: src/gui.c:1540
+#: src/gui.c:1538
 msgid "E_xport Project (.lv2)..."
 msgstr ""
 
-#: src/gui.c:1545
+#: src/gui.c:1543
 msgid "_VJ"
 msgstr ""
 
-#: src/gui.c:1557
+#: src/gui.c:1555
 msgid "Real Time _Effect Mapping"
 msgstr ""
 
-#: src/gui.c:1563
+#: src/gui.c:1561
 msgid "Bind real time effects to ctrl-number keys."
 msgstr ""
 
-#: src/gui.c:1565
+#: src/gui.c:1563
 msgid "Set Real Time Effect _Defaults"
 msgstr ""
 
-#: src/gui.c:1567
+#: src/gui.c:1565
 msgid "Set default parameter values for real time effects."
 msgstr ""
 
-#: src/gui.c:1580
+#: src/gui.c:1578
 msgid "Save Real Time Effect _Defaults"
 msgstr ""
 
-#: src/gui.c:1583
+#: src/gui.c:1581
 msgid ""
 "Save real time effect defaults so they will be restored each time you use "
 "LiVES."
 msgstr ""
 
-#: src/gui.c:1589
+#: src/gui.c:1587
 msgid "_Reset all playback speeds and positions"
 msgstr ""
 
-#: src/gui.c:1592
+#: src/gui.c:1590
 msgid ""
 "Reset all playback positions to frame 1, and reset all playback frame rates."
 msgstr ""
 
-#: src/gui.c:1594
+#: src/gui.c:1592
 msgid "_MIDI/joystick interface"
 msgstr ""
 
-#: src/gui.c:1609
+#: src/gui.c:1607
 msgid "_MIDI/joystick learner..."
 msgstr ""
 
-#: src/gui.c:1614
+#: src/gui.c:1612
 msgid "_Save device mapping..."
 msgstr ""
 
-#: src/gui.c:1620
+#: src/gui.c:1618
 msgid "_Load device mapping..."
 msgstr ""
 
-#: src/gui.c:1628
+#: src/gui.c:1626
 msgid "Show VJ _Keys"
 msgstr ""
 
-#: src/gui.c:1632
+#: src/gui.c:1630
 msgid "To_ys"
 msgstr ""
 
-#: src/gui.c:1644
+#: src/gui.c:1642
 msgid "_None"
 msgstr ""
 
-#: src/gui.c:1652
+#: src/gui.c:1650
 msgid "_Autolives"
 msgstr ""
 
-#: src/gui.c:1657
+#: src/gui.c:1655
 msgid "_Mad Frames"
 msgstr ""
 
-#: src/gui.c:1662
+#: src/gui.c:1660
 msgid "_LiVES TV (broadband)"
 msgstr ""
 
-#: src/gui.c:1672 src/multitrack.c:7387
+#: src/gui.c:1670 src/multitrack.c:7563
 msgid "_Help"
 msgstr ""
 
-#: src/gui.c:1684 src/multitrack.c:7407
+#: src/gui.c:1682 src/multitrack.c:7583
 msgid "_Manual (opens in browser)"
 msgstr ""
 
-#: src/gui.c:1691 src/multitrack.c:7416
+#: src/gui.c:1689 src/multitrack.c:7592
 msgid "_Donate to the project !"
 msgstr ""
 
-#: src/gui.c:1695 src/multitrack.c:7420
+#: src/gui.c:1693 src/multitrack.c:7596
 msgid "_Email the author"
 msgstr ""
 
-#: src/gui.c:1699 src/multitrack.c:7424
+#: src/gui.c:1697 src/multitrack.c:7600
 msgid "Report a _bug"
 msgstr ""
 
-#: src/gui.c:1703 src/multitrack.c:7428
+#: src/gui.c:1701 src/multitrack.c:7604
 msgid "Suggest a _feature"
 msgstr ""
 
-#: src/gui.c:1707 src/multitrack.c:7432
+#: src/gui.c:1705 src/multitrack.c:7608
 msgid "Assist with _translating"
 msgstr ""
 
-#: src/gui.c:1714 src/multitrack.c:7439
+#: src/gui.c:1712 src/multitrack.c:7615
 msgid "_Troubleshoot"
 msgstr ""
 
-#: src/gui.c:1718 src/multitrack.c:7443
+#: src/gui.c:1716 src/multitrack.c:7619
 msgid "_About"
 msgstr ""
 
-#: src/gui.c:1752
+#: src/gui.c:1750
 msgid "Rewind to start (w)"
 msgstr ""
 
-#: src/gui.c:1760 src/multitrack.c:16720
+#: src/gui.c:1758 src/multitrack.c:17010
 msgid "Play all (p)"
 msgstr ""
 
-#: src/gui.c:1768 src/gui.c:1877
+#: src/gui.c:1766 src/gui.c:1876
 msgid "Stop playback (q)"
 msgstr ""
 
-#: src/gui.c:1779
+#: src/gui.c:1777
 msgid "Play selection (y)"
 msgstr ""
 
-#: src/gui.c:1832
+#: src/gui.c:1829
 msgid "Volume"
 msgstr ""
 
-#: src/gui.c:1854
+#: src/gui.c:1853
 msgid "Audio volume (1.00)"
 msgstr ""
 
-#: src/gui.c:1883
+#: src/gui.c:1882
 msgid "Unblank background (b)"
 msgstr ""
 
-#: src/gui.c:1929
+#: src/gui.c:1928
 msgid "Play slower (ctrl-down)"
 msgstr ""
 
-#: src/gui.c:1935
+#: src/gui.c:1934
 msgid "Play faster (ctrl-up)"
 msgstr ""
 
-#: src/gui.c:1942
+#: src/gui.c:1941
 msgid "Skip back (ctrl-left)"
 msgstr ""
 
-#: src/gui.c:1948
+#: src/gui.c:1947
 msgid "Skip forward (ctrl-right)"
 msgstr ""
 
-#: src/gui.c:1954
+#: src/gui.c:1953
 msgid "Show clip info (i)"
 msgstr ""
 
-#: src/gui.c:1960
+#: src/gui.c:1959
 msgid "Hide this toolbar"
 msgstr ""
 
-#: src/gui.c:1962
+#: src/gui.c:1961
 msgid ""
 "Press \"s\" to toggle separate play window for improved performance, \"q\" "
 "to stop."
 msgstr ""
 
 #. TRANSLATORS: please keep the translated string the same length
-#: src/gui.c:1995
+#: src/gui.c:1994
 msgid "     Video playback speed (frames per second)        "
 msgstr ""
 
-#: src/gui.c:2009
+#: src/gui.c:2008
 msgid "Vary the video speed"
 msgstr ""
 
-#: src/gui.c:2092 src/gui.c:3218
+#: src/gui.c:2090 src/gui.c:3329
 msgid "First Frame"
 msgstr ""
 
-#: src/gui.c:2193 src/gui.c:3226
+#: src/gui.c:2191 src/gui.c:3336
 msgid "Last Frame"
 msgstr ""
 
-#: src/gui.c:2210
+#: src/gui.c:2208
 msgid "The first selected frame in this clip"
 msgstr ""
 
-#: src/gui.c:2248
+#: src/gui.c:2246
 msgid "The last selected frame in this clip"
 msgstr ""
 
-#: src/gui.c:2532
+#: src/gui.c:2546
 msgid "Starting...\n"
 msgstr ""
 
-#: src/gui.c:3074
+#: src/gui.c:3181
 msgid "    Press 'q' to stop recording.  DO NOT COVER THE PLAY WINDOW !   "
 msgstr ""
 
-#: src/gui.c:3521
+#: src/gui.c:3643
 msgid "Frame number to preview"
 msgstr ""
 
-#: src/gui.c:3538
+#: src/gui.c:3660
 msgid "_Free"
 msgstr ""
 
-#: src/gui.c:3539
+#: src/gui.c:3661
 msgid "Free choice of frame number"
 msgstr ""
 
-#: src/gui.c:3543
+#: src/gui.c:3666
 msgid "_Start"
 msgstr ""
 
-#: src/gui.c:3544
+#: src/gui.c:3667
 msgid "Frame number is linked to start frame"
 msgstr ""
 
-#: src/gui.c:3551
+#: src/gui.c:3675
 msgid "_End"
 msgstr ""
 
-#: src/gui.c:3552
+#: src/gui.c:3676
 msgid "Frame number is linked to end frame"
 msgstr ""
 
-#: src/gui.c:3559
+#: src/gui.c:3684
 msgid "_Pointer"
 msgstr ""
 
-#: src/gui.c:3560
+#: src/gui.c:3685
 msgid "Frame number is linked to playback pointer"
 msgstr ""
 
-#: src/gui.c:3581
+#: src/gui.c:3707
 msgid "Rewind"
 msgstr ""
 
-#: src/gui.c:3592 src/dialogs.c:894 src/dialogs.c:896 src/dialogs.c:1817
-#: src/dialogs.c:1819
+#: src/gui.c:3718 src/dialogs.c:960 src/dialogs.c:962 src/dialogs.c:1873
+#: src/dialogs.c:1875
 msgid "Play all"
 msgstr ""
 
-#: src/gui.c:3605
+#: src/gui.c:3731
 msgid "Play Selection"
 msgstr ""
 
-#: src/gui.c:3619
+#: src/gui.c:3745
 msgid "Loop On/Off"
 msgstr ""
 
-#: src/gui.c:3693
+#: src/gui.c:3819
 msgid "Start _recording"
 msgstr ""
 
-#: src/gui.c:3698
+#: src/gui.c:3824
 msgid "Stop _recording"
 msgstr ""
 
-#: src/gui.c:3703
+#: src/gui.c:3829
 msgid "_Record Performance"
 msgstr ""
 
-#: src/gui.c:3851
+#: src/gui.c:3974
 msgid "Hide Play Window"
 msgstr ""
 
-#: src/gui.c:4232
+#: src/gui.c:4333
 msgid "Show Play Window"
 msgstr ""
 
-#: src/ce_thumbs.c:222
+#: src/ce_thumbs.c:242
 #, c-format
 msgid "Mapped to ctrl-%d"
 msgstr ""
 
-#: src/ce_thumbs.c:276 src/effects.c:85 src/preferences.c:3195
+#: src/ce_thumbs.c:296 src/effects.c:86 src/preferences.c:3247
 msgid "Effects"
 msgstr ""
 
-#: src/ce_thumbs.c:279 src/multitrack.c:5615
+#: src/ce_thumbs.c:299 src/multitrack.c:5791
 msgid "Clips"
 msgstr ""
 
-#: src/ce_thumbs.c:303
+#: src/ce_thumbs.c:323
 #, c-format
 msgid "Show / apply effects to %s\n"
 msgstr ""
 
-#: src/ce_thumbs.c:315
+#: src/ce_thumbs.c:335
 #, c-format
 msgid "Select clip for %s\n"
 msgstr ""
 
-#: src/ce_thumbs.c:515
+#: src/ce_thumbs.c:536
 msgid "_Pin"
 msgstr ""
 
-#: src/ce_thumbs.c:515
+#: src/ce_thumbs.c:537
 msgid "Pin the parameter box to the window"
 msgstr ""
 
 #. TRANSLATORS: Exabytes
-#: src/utils.c:794
+#: src/utils.c:800
 #, c-format
 msgid "%.2f EB"
 msgstr ""
 
 #. TRANSLATORS: Petabytes
-#: src/utils.c:798
+#: src/utils.c:803
 #, c-format
 msgid "%.2f PB"
 msgstr ""
 
 #. TRANSLATORS: Terabytes
-#: src/utils.c:802
+#: src/utils.c:806
 #, c-format
 msgid "%.2f TB"
 msgstr ""
 
 #. TRANSLATORS: Gigabytes
-#: src/utils.c:806
+#: src/utils.c:809
 #, c-format
 msgid "%.2f GB"
 msgstr ""
 
 #. TRANSLATORS: Megabytes
-#: src/utils.c:810
+#: src/utils.c:812
 #, c-format
 msgid "%.2f MB"
 msgstr ""
 
 #. TRANSLATORS: Kilobytes (1024 bytes)
-#: src/utils.c:814
+#: src/utils.c:815
 #, c-format
 msgid "%.2f KiB"
 msgstr ""
@@ -3582,7 +3572,7 @@
 msgid "%d bytes"
 msgstr ""
 
-#: src/utils.c:1841
+#: src/utils.c:1835
 msgid "Clearing the clipboard"
 msgstr ""
 
@@ -3594,81 +3584,81 @@
 "Switched to clip %s\n"
 msgstr ""
 
-#: src/utils.c:1880
+#: src/utils.c:1877
 msgid ""
 "\n"
 "==============================\n"
 "Switched to empty clip\n"
 msgstr ""
 
-#: src/utils.c:1917
+#: src/utils.c:1916
 msgid "(blank)"
 msgstr ""
 
-#: src/utils.c:1920
+#: src/utils.c:1919
 #, c-format
 msgid ""
 "The set name has been changed from %s to %s. Affected layouts have been "
 "updated accordingly\n"
 msgstr ""
 
-#: src/utils.c:1928
+#: src/utils.c:1927
 #, c-format
 msgid ""
 "The clip %s is missing from this set.\n"
 "It is required by the following layouts:\n"
 msgstr ""
 
-#: src/utils.c:1932
+#: src/utils.c:1931
 #, c-format
 msgid ""
 "The clip %s has been closed.\n"
 "It is required by the following layouts:\n"
 msgstr ""
 
-#: src/utils.c:1937
+#: src/utils.c:1936
 #, c-format
 msgid ""
 "Frames have been shifted in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1942
+#: src/utils.c:1941
 #, c-format
 msgid ""
 "Frames have been deleted from the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1947
+#: src/utils.c:1946
 #, c-format
 msgid ""
 "Audio has been deleted from the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1952
+#: src/utils.c:1951
 #, c-format
 msgid ""
 "Audio has been shifted in clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1957
+#: src/utils.c:1956
 #, c-format
 msgid ""
 "Audio has been altered in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1962
+#: src/utils.c:1961
 #, c-format
 msgid ""
 "Frames have been altered in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:2135
+#: src/utils.c:2134
 #, c-format
 msgid ""
 "Set %s\n"
@@ -3676,7 +3666,7 @@
 "by another copy of LiVES.\n"
 msgstr ""
 
-#: src/utils.c:2142
+#: src/utils.c:2140
 #, c-format
 msgid ""
 "\n"
@@ -3722,67 +3712,67 @@
 msgid "Removing layout %s\n"
 msgstr ""
 
-#: src/utils.c:3014
+#: src/utils.c:2996
 msgid "Video [opening...]"
 msgstr ""
 
-#: src/utils.c:3018
+#: src/utils.c:2999
 #, c-format
 msgid "Video [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:3022
+#: src/utils.c:3002
 msgid "(Undefined)"
 msgstr ""
 
-#: src/utils.c:3025
+#: src/utils.c:3004
 msgid "(No video)"
 msgstr ""
 
-#: src/utils.c:3032
+#: src/utils.c:3011
 msgid "(No audio)"
 msgstr ""
 
-#: src/utils.c:3037
+#: src/utils.c:3015
 msgid "Mono  [opening...]"
 msgstr ""
 
-#: src/utils.c:3040
+#: src/utils.c:3017
 msgid "Left Audio [opening...]"
 msgstr ""
 
-#: src/utils.c:3045
+#: src/utils.c:3021
 #, c-format
 msgid "Mono [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:3048
+#: src/utils.c:3023
 #, c-format
 msgid "Left Audio [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:3056
+#: src/utils.c:3031
 msgid "Right Audio [opening...]"
 msgstr ""
 
-#: src/utils.c:3059
+#: src/utils.c:3033
 #, c-format
 msgid "Right Audio [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:3506
+#: src/utils.c:3472
 msgid "LiVES cannot switch to mplayer whilst clips are loading."
 msgstr ""
 
-#: src/utils.c:3559
+#: src/utils.c:3525
 msgid "LiVES cannot switch to mplayer2 whilst clips are loading."
 msgstr ""
 
-#: src/utils.c:3809
+#: src/utils.c:3775
 msgid "Cleaning up clip"
 msgstr ""
 
-#: src/utils.c:3913
+#: src/utils.c:3874
 #, c-format
 msgid ""
 "\n"
@@ -3792,30 +3782,29 @@
 "Overwrite ?\n"
 msgstr ""
 
-#: src/utils.c:4305 src/utils.c:4337 src/multitrack.c:4503
+#: src/utils.c:4250 src/utils.c:4280 src/multitrack.c:4672
 #, c-format
 msgid "_Undo %s"
 msgstr ""
 
-#: src/utils.c:4306 src/utils.c:4338 src/multitrack.c:4525
+#: src/utils.c:4251 src/utils.c:4281 src/multitrack.c:4693
 #, c-format
 msgid "_Redo %s"
 msgstr ""
 
-#: src/utils.c:4363
+#: src/utils.c:4305
 msgid "-------------Selection------------"
 msgstr ""
 
-#. TRANSLATORS: - try to keep the text of the middle part the same length, by deleting "-" if necessary
-#: src/utils.c:4371
+#: src/utils.c:4313
 msgid " sec ] ----------Selection---------- [ "
 msgstr ""
 
-#: src/utils.c:4371
+#: src/utils.c:4314
 msgid " frames ] ----------"
 msgstr ""
 
-#: src/utils.c:5360
+#: src/utils.c:5302
 msgid ""
 "Your version of mplayer/ffmpeg may be broken !\n"
 "See http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2071\n"
@@ -3826,11 +3815,11 @@
 "Try running Help/Troubleshoot for more information."
 msgstr ""
 
-#: src/saveplay.c:178
+#: src/saveplay.c:179
 msgid "Examining file header"
 msgstr ""
 
-#: src/saveplay.c:315 src/saveplay.c:789
+#: src/saveplay.c:316 src/saveplay.c:779
 #, c-format
 msgid "Opening %s"
 msgstr ""
@@ -3840,36 +3829,36 @@
 msgid "Opening %s start time %.2f sec. frames %d"
 msgstr ""
 
-#: src/saveplay.c:326 src/saveplay.c:4001
+#: src/saveplay.c:326 src/saveplay.c:3927
 msgid " without sound"
 msgstr ""
 
-#: src/saveplay.c:396
+#: src/saveplay.c:395
 #, c-format
 msgid "Opening audio for %s"
 msgstr ""
 
-#: src/saveplay.c:557
+#: src/saveplay.c:554
 #, c-format
 msgid "Auto trimming %.2f seconds of audio at start..."
 msgstr ""
 
-#: src/saveplay.c:567
+#: src/saveplay.c:562
 #, c-format
 msgid "Auto trimming %.2f seconds of audio at end..."
 msgstr ""
 
-#: src/saveplay.c:584
+#: src/saveplay.c:577
 #, c-format
 msgid "Auto padding with %.2f seconds of silence at start..."
 msgstr ""
 
-#: src/saveplay.c:599
+#: src/saveplay.c:590
 #, c-format
 msgid "Auto padding with %.2f seconds of silence at end..."
 msgstr ""
 
-#: src/saveplay.c:671
+#: src/saveplay.c:661
 #, c-format
 msgid ""
 "\n"
@@ -3881,11 +3870,11 @@
 "Are you sure you wish to continue ?"
 msgstr ""
 
-#: src/saveplay.c:685
+#: src/saveplay.c:676
 msgid " - please be patient."
 msgstr ""
 
-#: src/saveplay.c:938
+#: src/saveplay.c:926
 msgid ""
 "\n"
 "\n"
@@ -3893,14 +3882,14 @@
 "Please check the terminal window for more details.\n"
 msgstr ""
 
-#: src/saveplay.c:940
+#: src/saveplay.c:928
 msgid ""
 "\n"
 "\n"
 "You may need to install mplayer to open this file.\n"
 msgstr ""
 
-#: src/saveplay.c:948
+#: src/saveplay.c:934
 msgid ""
 "\n"
 "\n"
@@ -3908,29 +3897,29 @@
 "Tools|Preferences|Decoding\n"
 msgstr ""
 
-#: src/saveplay.c:1014
+#: src/saveplay.c:995
 msgid "Adding image..."
 msgstr ""
 
-#: src/saveplay.c:1108
+#: src/saveplay.c:1089
 #, c-format
 msgid "Subtitles were saved as %s\n"
 msgstr ""
 
-#: src/saveplay.c:1192
+#: src/saveplay.c:1171
 #, c-format
 msgid "LiVES: Save Frame %d as..."
 msgstr ""
 
-#: src/saveplay.c:1195
+#: src/saveplay.c:1174
 msgid "LiVES: Save Frame as..."
 msgstr ""
 
-#: src/saveplay.c:1322
+#: src/saveplay.c:1303
 msgid "LiVES: Save Clip as..."
 msgstr ""
 
-#: src/saveplay.c:1390
+#: src/saveplay.c:1369
 msgid ""
 "Saving your video could lead to a loss of quality !\n"
 "You are strongly advised to 'Save As' to a new file.\n"
@@ -3938,67 +3927,67 @@
 "Do you still wish to continue ?"
 msgstr ""
 
-#: src/saveplay.c:1517 src/saveplay.c:1683 src/saveplay.c:1762
-#: src/saveplay.c:4014
+#: src/saveplay.c:1494 src/saveplay.c:1659 src/saveplay.c:1738
+#: src/saveplay.c:3940
 msgid "Pulling frames from clip"
 msgstr ""
 
-#: src/saveplay.c:1588 src/saveplay.c:1727
+#: src/saveplay.c:1565 src/saveplay.c:1703
 msgid "Linking selection"
 msgstr ""
 
-#: src/saveplay.c:1779
+#: src/saveplay.c:1755
 msgid " (with no sound)\n"
 msgstr ""
 
-#: src/saveplay.c:1786
+#: src/saveplay.c:1761
 #, c-format
 msgid "Saving frames %d to %d%s as \"%s\" : encoder = %s : format = %s..."
 msgstr ""
 
-#: src/saveplay.c:1790
+#: src/saveplay.c:1765
 #, c-format
 msgid "Saving frames 1 to %d%s as \"%s\" : encoder %s : format = %s..."
 msgstr ""
 
-#: src/saveplay.c:1909
+#: src/saveplay.c:1890
 msgid "Saving [can take a long time]"
 msgstr ""
 
-#: src/saveplay.c:2057
+#: src/saveplay.c:2044
 msgid ""
 "\n"
 "\n"
 "Encoder error - output file was not created !\n"
 msgstr ""
 
-#: src/saveplay.c:2094
+#: src/saveplay.c:2081
 msgid "Clearing letterbox"
 msgstr ""
 
-#: src/saveplay.c:2183
+#: src/saveplay.c:2168
 #, c-format
 msgid "File size was %s\n"
 msgstr ""
 
-#: src/saveplay.c:2284
+#: src/saveplay.c:2265
 msgid "recording aborted by preview.\n"
 msgstr ""
 
-#: src/saveplay.c:2288
+#: src/saveplay.c:2268
 msgid "recording aborted by clipboard playback.\n"
 msgstr ""
 
-#: src/saveplay.c:2291
+#: src/saveplay.c:2270
 msgid "Recording performance..."
 msgstr ""
 
-#: src/saveplay.c:3293
+#: src/saveplay.c:3251
 #, c-format
 msgid "Average FPS was %.4f\n"
 msgstr ""
 
-#: src/saveplay.c:3299
+#: src/saveplay.c:3256
 msgid ""
 "\n"
 "\n"
@@ -4007,16 +3996,21 @@
 "and resize all frames to the current size.\n"
 msgstr ""
 
-#: src/saveplay.c:3479
+#: src/saveplay.c:3429
 msgid "Unknown"
 msgstr ""
 
-#: src/saveplay.c:3588 src/saveplay.c:4585
+#: src/saveplay.c:3538 src/saveplay.c:4502
 #, c-format
 msgid "Untitled%d"
 msgstr ""
 
-#: src/saveplay.c:3633
+#: src/saveplay.c:3567
+#, c-format
+msgid "%d frames are enough !\n"
+msgstr ""
+
+#: src/saveplay.c:3579
 #, c-format
 msgid ""
 "\n"
@@ -4024,7 +4018,7 @@
 "Bad things may happen with this clip.\n"
 msgstr ""
 
-#: src/saveplay.c:3723
+#: src/saveplay.c:3667
 #, c-format
 msgid ""
 "\n"
@@ -4032,73 +4026,73 @@
 "Default can be set in Tools | Preferences | Misc.\n"
 msgstr ""
 
-#: src/saveplay.c:3735
+#: src/saveplay.c:3677
 #, c-format
 msgid "Playback speed was adjusted to %.3f frames per second to fit audio.\n"
 msgstr ""
 
-#: src/saveplay.c:3754
+#: src/saveplay.c:3694
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d *bpp=Greyscale* fps=%.3f\n"
 "Audio:"
 msgstr ""
 
-#: src/saveplay.c:3758 src/saveplay.c:4762
+#: src/saveplay.c:3698 src/saveplay.c:4671
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d bpp=%d fps=%.3f\n"
 "Audio:"
 msgstr ""
 
-#: src/saveplay.c:3762 src/saveplay.c:4766
+#: src/saveplay.c:3703 src/saveplay.c:4676
 #, c-format
 msgid "%s none\n"
 msgstr ""
 
-#: src/saveplay.c:3774
+#: src/saveplay.c:3714
 #, c-format
 msgid " - Author: %s\n"
 msgstr ""
 
-#: src/saveplay.c:3779
+#: src/saveplay.c:3717
 #, c-format
 msgid " - Title: %s\n"
 msgstr ""
 
-#: src/saveplay.c:3784
+#: src/saveplay.c:3720
 #, c-format
 msgid " - Comment: %s\n"
 msgstr ""
 
-#: src/saveplay.c:3897
+#: src/saveplay.c:3829
 #, c-format
 msgid "Saving frame %d as %s..."
 msgstr ""
 
-#: src/saveplay.c:3996
+#: src/saveplay.c:3924
 #, c-format
 msgid "Backing up %s to %s"
 msgstr ""
 
-#: src/saveplay.c:4049
+#: src/saveplay.c:3975
 msgid "Backing up"
 msgstr ""
 
-#: src/saveplay.c:4083
+#: src/saveplay.c:4009
 msgid "performance data was backed up..."
 msgstr ""
 
-#: src/saveplay.c:4661
+#: src/saveplay.c:4574
 #, c-format
 msgid "Restoring %s..."
 msgstr ""
 
-#: src/saveplay.c:4692
+#: src/saveplay.c:4603
 msgid "Restoring"
 msgstr ""
 
-#: src/saveplay.c:4714
+#: src/saveplay.c:4625
 #, c-format
 msgid ""
 "\n"
@@ -4108,22 +4102,22 @@
 msgstr ""
 
 #. TRANSLATORS: rec(ord) %.2f M(ega)B(ytes)
-#: src/saveplay.c:5207
+#: src/saveplay.c:5118
 #, c-format
 msgid "rec %.2f MB"
 msgstr ""
 
-#: src/saveplay.c:5213
+#: src/saveplay.c:5123
 #, c-format
 msgid "!rec %.2f MB"
 msgstr ""
 
 #. TRANSLATORS: rec(ord) ?? M(ega)B(ytes)
-#: src/saveplay.c:5216
+#: src/saveplay.c:5126
 msgid "rec ?? MB"
 msgstr ""
 
-#: src/saveplay.c:5241
+#: src/saveplay.c:5151
 #, c-format
 msgid ""
 "\n"
@@ -4131,54 +4125,74 @@
 "Record stop level can be set in Preferences.\n"
 msgstr ""
 
-#: src/saveplay.c:5535
+#: src/saveplay.c:5447
 msgid ""
 "\n"
 "Files from a previous run of LiVES were found.\n"
 "Do you want to attempt to recover them ?\n"
 msgstr ""
 
-#: src/saveplay.c:5557
+#: src/saveplay.c:5469
 msgid "Recovering files"
 msgstr ""
 
-#: src/saveplay.c:5560
+#: src/saveplay.c:5472
 msgid "Recovering files..."
 msgstr ""
 
-#: src/dialogs.c:72
+#: src/dialogs.c:71
 msgid "Show affected _layouts"
 msgstr ""
 
-#: src/dialogs.c:128
+#: src/dialogs.c:113
+msgid ""
+"Do _not show this warning any more\n"
+"(can be turned back on from Preferences/Warnings)"
+msgstr ""
+
+#: src/dialogs.c:127
 msgid "_Recover disk space"
 msgstr ""
 
-#: src/dialogs.c:143
+#: src/dialogs.c:142
 msgid " _Advanced Settings >>"
 msgstr ""
 
-#: src/dialogs.c:184
+#: src/dialogs.c:183 src/dialogs.c:221
 msgid "LiVES: - Warning !"
 msgstr ""
 
 #: src/dialogs.c:194
+#, fuzzy
+msgid "LiVES: - Error !"
+msgstr "LiVES: - Einfügen"
+
+#: src/dialogs.c:204
+#, fuzzy
+msgid "LiVES: - Information"
+msgstr "LiVES: - Ort öffnen"
+
+#: src/dialogs.c:230
 msgid "LiVES: - Question"
 msgstr ""
 
-#: src/dialogs.c:204
+#: src/dialogs.c:239
 msgid "LiVES: - File Error"
 msgstr ""
 
-#: src/dialogs.c:208
+#: src/dialogs.c:241
 msgid "_Abort"
 msgstr ""
 
-#: src/dialogs.c:213
+#: src/dialogs.c:246
 msgid "_Retry"
 msgstr ""
 
-#: src/dialogs.c:597
+#: src/dialogs.c:306
+msgid "Show _Details"
+msgstr "_Details anzeigen"
+
+#: src/dialogs.c:657
 #, c-format
 msgid ""
 "FREE SPACE IN THE PARTITION CONTAINING\n"
@@ -4189,7 +4203,7 @@
 "(Disk warning levels can be configured in Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:615
+#: src/dialogs.c:676
 #, c-format
 msgid ""
 "Free space in the partition containing\n"
@@ -4201,11 +4215,11 @@
 "Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:627
+#: src/dialogs.c:688
 msgid "Audio players cannot be switched during playback."
 msgstr ""
 
-#: src/dialogs.c:632
+#: src/dialogs.c:694
 msgid ""
 "\n"
 "\n"
@@ -4213,46 +4227,46 @@
 "Please try closing some other applications first.\n"
 msgstr ""
 
-#: src/dialogs.c:752
+#: src/dialogs.c:820
 msgid "Processing has been paused."
 msgstr ""
 
-#: src/dialogs.c:937
+#: src/dialogs.c:1002
 #, c-format
 msgid ""
 "\n"
 "%s%d%% done. Time remaining: %u sec%s\n"
 msgstr ""
 
-#: src/dialogs.c:1335
+#: src/dialogs.c:1391
 #, c-format
 msgid ""
 "\n"
 "%d/%d frames opened. Time remaining %u sec.\n"
 msgstr ""
 
-#: src/dialogs.c:1337
+#: src/dialogs.c:1393
 #, c-format
 msgid ""
 "\n"
 "%d/%d frames opened.\n"
 msgstr ""
 
-#: src/dialogs.c:1341
+#: src/dialogs.c:1396
 #, c-format
 msgid ""
 "\n"
 "%d frames opened.\n"
 msgstr ""
 
-#: src/dialogs.c:1940
+#: src/dialogs.c:1993
 #, c-format
 msgid ""
 "\n"
 "Time remaining: %d sec"
 msgstr ""
 
-#: src/dialogs.c:1988
+#: src/dialogs.c:2040
 #, c-format
 msgid ""
 "\n"
@@ -4260,7 +4274,7 @@
 "Please close a file and then try again."
 msgstr ""
 
-#: src/dialogs.c:1994
+#: src/dialogs.c:2047
 #, c-format
 msgid ""
 "LiVES was unable to write to its temporary directory.\n"
@@ -4272,27 +4286,27 @@
 "Please make sure you can write to this directory."
 msgstr ""
 
-#: src/dialogs.c:2005
+#: src/dialogs.c:2059
 msgid ""
 "\n"
 "LiVES currently requires either 'mplayer', 'mplayer2', or 'sox' to function. "
 "Please install one or other of these, and try again.\n"
 msgstr ""
 
-#: src/dialogs.c:2010
+#: src/dialogs.c:2064
 msgid ""
 "Audio was not loaded; please install mplayer or mplayer2 if you expected "
 "audio for this clip.\n"
 msgstr ""
 
-#: src/dialogs.c:2014
+#: src/dialogs.c:2069
 msgid ""
 "Audio resampling is required for this format.\n"
 "Please install 'sox'\n"
 "Or switch to another encoder format in Tools | Preferences | Encoding\n"
 msgstr ""
 
-#: src/dialogs.c:2019
+#: src/dialogs.c:2075
 msgid ""
 "\n"
 "\n"
@@ -4300,19 +4314,19 @@
 "Please set the audio codec in Tools|Preferences|Encoding\n"
 msgstr ""
 
-#: src/dialogs.c:2024
+#: src/dialogs.c:2080
 msgid ""
 "This layout includes generated frames.\n"
 "It cannot be saved, you must render it to a clip first.\n"
 msgstr ""
 
-#: src/dialogs.c:2029
+#: src/dialogs.c:2085
 msgid ""
 "This layout includes generated or recorded audio.\n"
 "It cannot be saved, you must render it to a clip first.\n"
 msgstr ""
 
-#: src/dialogs.c:2039 src/dialogs.c:2137
+#: src/dialogs.c:2095 src/dialogs.c:2189
 #, c-format
 msgid ""
 "\n"
@@ -4320,83 +4334,83 @@
 "Due to restrictions in the %s format\n"
 msgstr ""
 
-#: src/dialogs.c:2059
+#: src/dialogs.c:2115
 msgid ""
 "LiVES recommends the following settings:\n"
 "\n"
 msgstr ""
 
-#: src/dialogs.c:2065 src/dialogs.c:2174 src/resample.c:850
+#: src/dialogs.c:2121 src/dialogs.c:2225 src/resample.c:839
 msgid ", signed"
 msgstr ""
 
-#: src/dialogs.c:2066 src/dialogs.c:2175 src/resample.c:853
+#: src/dialogs.c:2122 src/dialogs.c:2226 src/resample.c:841
 msgid ", unsigned"
 msgstr ""
 
-#: src/dialogs.c:2070 src/dialogs.c:2179 src/resample.c:858
+#: src/dialogs.c:2126 src/dialogs.c:2230 src/resample.c:846
 msgid ", little-endian"
 msgstr ""
 
-#: src/dialogs.c:2071 src/dialogs.c:2180 src/resample.c:861
+#: src/dialogs.c:2127 src/dialogs.c:2231 src/resample.c:848
 msgid ", big-endian"
 msgstr ""
 
-#: src/dialogs.c:2077
+#: src/dialogs.c:2132
 #, c-format
 msgid "Use an audio rate of %d Hz%s%s\n"
 msgstr ""
 
-#: src/dialogs.c:2085
+#: src/dialogs.c:2140
 #, c-format
 msgid "Set video rate to %.3f frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:2089
+#: src/dialogs.c:2143
 #, c-format
 msgid "Set video rate to %d:%d frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:2094 src/dialogs.c:2209
+#: src/dialogs.c:2148 src/dialogs.c:2258
 #, c-format
 msgid "Set video size to %d x %d pixels\n"
 msgstr ""
 
-#: src/dialogs.c:2102 src/dialogs.c:2208
+#: src/dialogs.c:2156 src/dialogs.c:2257
 msgid ""
 "\n"
 "You may wish to:\n"
 msgstr ""
 
-#: src/dialogs.c:2105 src/dialogs.c:2200
+#: src/dialogs.c:2159 src/dialogs.c:2249
 #, c-format
 msgid "resize video to %d x %d pixels\n"
 msgstr ""
 
-#: src/dialogs.c:2110
+#: src/dialogs.c:2163
 msgid "disable audio, since the target encoder cannot encode audio\n"
 msgstr ""
 
-#: src/dialogs.c:2170
+#: src/dialogs.c:2221
 msgid "LiVES must:\n"
 msgstr ""
 
-#: src/dialogs.c:2185
+#: src/dialogs.c:2235
 #, c-format
 msgid "resample audio to %d Hz%s%s\n"
 msgstr ""
 
-#: src/dialogs.c:2192
+#: src/dialogs.c:2242
 #, c-format
 msgid "resample video to %.3f frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:2196
+#: src/dialogs.c:2245
 #, c-format
 msgid "resample video to %d:%d frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:2215
+#: src/dialogs.c:2263
 msgid ""
 "\n"
 "You will be able to undo these changes afterwards.\n"
@@ -4405,14 +4419,14 @@
 "\n"
 msgstr ""
 
-#: src/dialogs.c:2218
+#: src/dialogs.c:2265
 msgid ""
 "\n"
 "Changes applied to the selection will not be permanent.\n"
 "\n"
 msgstr ""
 
-#: src/dialogs.c:2237
+#: src/dialogs.c:2285
 msgid ""
 "\n"
 "\n"
@@ -4421,7 +4435,7 @@
 "Try recording for just a selection of the file."
 msgstr ""
 
-#: src/dialogs.c:2244
+#: src/dialogs.c:2293
 msgid ""
 "The playback speed (fps), or the audio rate\n"
 " of the clipboard does not match\n"
@@ -4432,7 +4446,7 @@
 "Please press Cancel to abort the insert, or OK to continue."
 msgstr ""
 
-#: src/dialogs.c:2253
+#: src/dialogs.c:2304
 #, c-format
 msgid ""
 "When opening a yuvmpeg stream, you should first create a fifo file in:\n"
@@ -4445,11 +4459,11 @@
 "click Cancel."
 msgstr ""
 
-#: src/dialogs.c:2305
+#: src/dialogs.c:2356
 msgid "Show Keys"
 msgstr ""
 
-#: src/dialogs.c:2306
+#: src/dialogs.c:2358
 msgid ""
 "You can use the following keys during playback to control LiVES:-\n"
 "\n"
@@ -4491,11 +4505,11 @@
 "g                             ping pong loops\n"
 msgstr ""
 
-#: src/dialogs.c:2313
+#: src/dialogs.c:2365
 msgid "Multitrack Keys"
 msgstr ""
 
-#: src/dialogs.c:2314
+#: src/dialogs.c:2367
 msgid ""
 "You can use the following keys to control the multitrack window:-\n"
 "\n"
@@ -4517,18 +4531,18 @@
 "For other keys, see the menus.\n"
 msgstr ""
 
-#: src/dialogs.c:2322
+#: src/dialogs.c:2375
 msgid "Message History"
 msgstr ""
 
-#: src/dialogs.c:2335
+#: src/dialogs.c:2388
 #, c-format
 msgid ""
 "After upgrading/installing, you may need to adjust the <prefix_dir> setting "
 "in your %s file"
 msgstr ""
 
-#: src/dialogs.c:2344
+#: src/dialogs.c:2399
 #, c-format
 msgid ""
 "\n"
@@ -4539,25 +4553,25 @@
 "or change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/dialogs.c:2352
+#: src/dialogs.c:2408
 msgid ""
 "Sorry, unknown audio type.\n"
 "\n"
 " (Filenames must end in .mp3, .ogg, .wav, .mod, .xm or .it)"
 msgstr ""
 
-#: src/dialogs.c:2353
+#: src/dialogs.c:2409
 msgid "failed (unknown type)\n"
 msgstr ""
 
-#: src/dialogs.c:2358
+#: src/dialogs.c:2415
 msgid ""
 "\n"
 "Do you wish to remove the layout files associated with this set ?\n"
 "(They will not be usable without the set).\n"
 msgstr ""
 
-#: src/dialogs.c:2363
+#: src/dialogs.c:2421
 #, c-format
 msgid ""
 "\n"
@@ -4566,7 +4580,7 @@
 "Click Cancel to pick a new name.\n"
 msgstr ""
 
-#: src/dialogs.c:2370
+#: src/dialogs.c:2429
 msgid ""
 "\n"
 "Frames from this clip are used in some multitrack layouts.\n"
@@ -4574,7 +4588,7 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2374
+#: src/dialogs.c:2433
 msgid ""
 "\n"
 "Audio from this clip is used in some multitrack layouts.\n"
@@ -4582,7 +4596,7 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2378
+#: src/dialogs.c:2438
 #, c-format
 msgid ""
 "\n"
@@ -4593,7 +4607,7 @@
 "Otherwise click Cancel to skip loading this file.\n"
 msgstr ""
 
-#: src/dialogs.c:2385
+#: src/dialogs.c:2446
 #, c-format
 msgid ""
 "\n"
@@ -4603,7 +4617,7 @@
 "The clip could not be loaded.\n"
 msgstr ""
 
-#: src/dialogs.c:2392
+#: src/dialogs.c:2455
 msgid ""
 "\n"
 "Dear user, the jack developers decided to remove the -Z option from jackd.\n"
@@ -4611,7 +4625,7 @@
 "Alternately, select a different audio player in Preferences.\n"
 msgstr ""
 
-#: src/dialogs.c:2396
+#: src/dialogs.c:2460
 msgid ""
 "\n"
 "Unable to start up jack. Please ensure that alsa is set up correctly on your "
@@ -4620,13 +4634,13 @@
 "Automatic jack startup will be disabled now.\n"
 msgstr ""
 
-#: src/dialogs.c:2402
+#: src/dialogs.c:2466
 msgid ""
 "\n"
 "Unable to connect to jack server. Please start jack before starting LiVES\n"
 msgstr ""
 
-#: src/dialogs.c:2411
+#: src/dialogs.c:2475
 #, c-format
 msgid ""
 "\n"
@@ -4637,13 +4651,13 @@
 "%s\n"
 msgstr ""
 
-#: src/dialogs.c:2418
+#: src/dialogs.c:2482
 msgid ""
 "\n"
 "Alternately, you can restart LiVES and select another audio player.\n"
 msgstr ""
 
-#: src/dialogs.c:2423
+#: src/dialogs.c:2488
 #, c-format
 msgid ""
 "\n"
@@ -4653,7 +4667,7 @@
 "It is recommended to increase it to at least %d MB"
 msgstr ""
 
-#: src/dialogs.c:2429
+#: src/dialogs.c:2496
 #, c-format
 msgid ""
 "\n"
@@ -4662,7 +4676,7 @@
 "Do you wish to delete them ?\n"
 msgstr ""
 
-#: src/dialogs.c:2436
+#: src/dialogs.c:2504
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for multitrack undo.\n"
@@ -4670,7 +4684,7 @@
 "using Preferences/Multitrack/Undo Memory\n"
 msgstr ""
 
-#: src/dialogs.c:2440
+#: src/dialogs.c:2508
 msgid ""
 "\n"
 "Out of memory for undo.\n"
@@ -4678,63 +4692,63 @@
 "using Preferences/Multitrack/Undo Memory\n"
 msgstr ""
 
-#: src/dialogs.c:2444
+#: src/dialogs.c:2512
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for the multitrack undo buffer.\n"
 msgstr ""
 
-#: src/dialogs.c:2446
+#: src/dialogs.c:2514
 msgid "or enter a smaller value.\n"
 msgstr ""
 
-#: src/dialogs.c:2448
+#: src/dialogs.c:2516
 msgid "Try again from the clip editor, try closing some other applications\n"
 msgstr ""
 
-#: src/dialogs.c:2449
+#: src/dialogs.c:2517
 msgid "Try closing some other applications\n"
 msgstr ""
 
-#: src/dialogs.c:2460
+#: src/dialogs.c:2529
 msgid ""
 "Multitrack is set to 0 audio channels, but this layout has audio.\n"
 "You should adjust the audio settings from the Tools menu.\n"
 msgstr ""
 
-#: src/dialogs.c:2464
+#: src/dialogs.c:2534
 msgid ""
 "The current layout has audio, so audio channels may not be set to zero.\n"
 msgstr ""
 
-#: src/dialogs.c:2468
+#: src/dialogs.c:2539
 msgid ""
 "Multitrack audio preview is only available with the\n"
 "\"jack\" or \"pulse audio\" audio player.\n"
 "You can set this in Tools|Preferences|Playback."
 msgstr ""
 
-#: src/dialogs.c:2472
+#: src/dialogs.c:2545
 msgid ""
 "Errors were detected in the layout (which may be due to transferring from "
 "another system, or from an older version of LiVES).\n"
 "Should I try to repair the disk copy of the layout ?\n"
 msgstr ""
 
-#: src/dialogs.c:2476
+#: src/dialogs.c:2549
 msgid ""
 "LiVES was unable to load the layout.\n"
 "Sorry.\n"
 msgstr ""
 
-#: src/dialogs.c:2482
+#: src/dialogs.c:2555
 msgid ""
 "\n"
 "\n"
 "Audio rate must be greater than 0.\n"
 msgstr ""
 
-#: src/dialogs.c:2486
+#: src/dialogs.c:2559
 msgid ""
 "\n"
 "Event list will be very large\n"
@@ -4742,14 +4756,14 @@
 "Are you sure you wish to view it ?\n"
 msgstr ""
 
-#: src/dialogs.c:2491
+#: src/dialogs.c:2564
 msgid ""
 "\n"
 "\n"
 "You must install 'dvgrab' to use this function.\n"
 msgstr ""
 
-#: src/dialogs.c:2496
+#: src/dialogs.c:2570
 msgid ""
 "\n"
 "\n"
@@ -4758,25 +4772,25 @@
 "You may need to select one of these in Tools/Preferences/Playback.\n"
 msgstr ""
 
-#: src/dialogs.c:2500
+#: src/dialogs.c:2574
 msgid "Video playback plugin failed to initialise palette !\n"
 msgstr ""
 
-#: src/dialogs.c:2504
+#: src/dialogs.c:2579
 msgid "Decoder plugin failed to initialise palette !\n"
 msgstr ""
 
-#: src/dialogs.c:2509
+#: src/dialogs.c:2584
 msgid "Unable to set framerate of video plugin\n"
 msgstr ""
 
-#: src/dialogs.c:2514
+#: src/dialogs.c:2590
 msgid ""
 "After a crash, it is advisable to clean up the disk with\n"
 "File|Clean up disk space\n"
 msgstr ""
 
-#: src/dialogs.c:2526
+#: src/dialogs.c:2604
 #, c-format
 msgid ""
 "Stream frame size is too large for your network buffers.\n"
@@ -4785,33 +4799,33 @@
 "echo %d > /proc/sys/net/core/rmem_max\n"
 msgstr ""
 
-#: src/dialogs.c:2714
+#: src/dialogs.c:2800
 msgid "cancelled.\n"
 msgstr ""
 
-#: src/dialogs.c:2721
+#: src/dialogs.c:2805
 msgid "failed.\n"
 msgstr ""
 
-#: src/dialogs.c:2728
+#: src/dialogs.c:2810
 msgid "done.\n"
 msgstr ""
 
-#: src/dialogs.c:2732
+#: src/dialogs.c:2814
 msgid "error in file. Failed.\n"
 msgstr ""
 
-#: src/dialogs.c:2766 src/dialogs.c:2815 src/dialogs.c:2839
+#: src/dialogs.c:2848 src/dialogs.c:2897 src/dialogs.c:2921
 #, c-format
 msgid "Additional info: %s\n"
 msgstr ""
 
-#: src/dialogs.c:2769
+#: src/dialogs.c:2851
 #, c-format
 msgid "The error value was %d%s\n"
 msgstr ""
 
-#: src/dialogs.c:2772
+#: src/dialogs.c:2854
 #, c-format
 msgid ""
 "\n"
@@ -4821,7 +4835,7 @@
 "%s%s%s"
 msgstr ""
 
-#: src/dialogs.c:2818
+#: src/dialogs.c:2900
 #, c-format
 msgid ""
 "\n"
@@ -4831,7 +4845,7 @@
 "%s"
 msgstr ""
 
-#: src/dialogs.c:2842
+#: src/dialogs.c:2924
 #, c-format
 msgid ""
 "\n"
@@ -4841,7 +4855,7 @@
 "%s"
 msgstr ""
 
-#: src/dialogs.c:2886
+#: src/dialogs.c:2968
 #, c-format
 msgid ""
 "\n"
@@ -4850,7 +4864,7 @@
 "Please check for possible error causes.\n"
 msgstr ""
 
-#: src/dialogs.c:2890
+#: src/dialogs.c:2971
 #, c-format
 msgid ""
 "\n"
@@ -4860,7 +4874,7 @@
 "%s.\n"
 msgstr ""
 
-#: src/dialogs.c:2921
+#: src/dialogs.c:3002
 #, c-format
 msgid ""
 "\n"
@@ -4869,7 +4883,7 @@
 "Please check for possible error causes.\n"
 msgstr ""
 
-#: src/dialogs.c:2925
+#: src/dialogs.c:3005
 #, c-format
 msgid ""
 "\n"
@@ -4879,12 +4893,12 @@
 "%s.\n"
 msgstr ""
 
-#: src/dialogs.c:2993
+#: src/dialogs.c:3073
 #, c-format
 msgid "Value for \"%s\" could not be read."
 msgstr ""
 
-#: src/dialogs.c:3011
+#: src/dialogs.c:3091
 #, c-format
 msgid ""
 "\n"
@@ -4893,7 +4907,7 @@
 "Please check your system for errors.\n"
 msgstr ""
 
-#: src/dialogs.c:3020
+#: src/dialogs.c:3100
 #, c-format
 msgid ""
 "\n"
@@ -4902,7 +4916,7 @@
 "Please check the file permissions and try again."
 msgstr ""
 
-#: src/dialogs.c:3027
+#: src/dialogs.c:3109
 #, c-format
 msgid ""
 "\n"
@@ -4911,7 +4925,7 @@
 "Please check the directory permissions and try again."
 msgstr ""
 
-#: src/dialogs.c:3034
+#: src/dialogs.c:3116
 #, c-format
 msgid ""
 "\n"
@@ -4919,14 +4933,14 @@
 "%s\n"
 msgstr ""
 
-#: src/dialogs.c:3041
+#: src/dialogs.c:3123
 msgid ""
 "\n"
 "Abort and exit immediately from LiVES\n"
 "Are you sure ?\n"
 msgstr ""
 
-#: src/dialogs.c:3047
+#: src/dialogs.c:3129
 #, c-format
 msgid ""
 "\n"
@@ -4934,13 +4948,13 @@
 "Please select another encoder from the list.\n"
 msgstr ""
 
-#: src/dialogs.c:3056
+#: src/dialogs.c:3139
 msgid ""
 "\n"
 "This card is already in use and cannot be opened multiple times.\n"
 msgstr ""
 
-#: src/dialogs.c:3061
+#: src/dialogs.c:3145
 #, c-format
 msgid ""
 "\n"
@@ -4950,27 +4964,27 @@
 "- Check if the device actually exists.\n"
 msgstr ""
 
-#: src/dialogs.c:3068
+#: src/dialogs.c:3153
 msgid ""
 "\n"
 "This file already has subtitles loaded.\n"
 "Do you wish to overwrite the existing subtitles ?\n"
 msgstr ""
 
-#: src/dialogs.c:3072
+#: src/dialogs.c:3157
 msgid ""
 "\n"
 "LiVES currently only supports subtitles of type .srt and .sub.\n"
 msgstr ""
 
-#: src/dialogs.c:3076
+#: src/dialogs.c:3161
 msgid ""
 "\n"
 "Erase all subtitles from this clip.\n"
 "Are you sure ?\n"
 msgstr ""
 
-#: src/dialogs.c:3082
+#: src/dialogs.c:3168
 #, c-format
 msgid ""
 "\n"
@@ -4979,14 +4993,14 @@
 "or OK to continue and save as type \"%s\"\n"
 msgstr ""
 
-#: src/dialogs.c:3089
+#: src/dialogs.c:3176
 msgid ""
 "\n"
 "Do you wish to move the current clip sets to the new directory ?\n"
 "(If unsure, click Yes)\n"
 msgstr ""
 
-#: src/dialogs.c:3093
+#: src/dialogs.c:3181
 #, c-format
 msgid ""
 "\n"
@@ -4997,19 +5011,19 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:3099
+#: src/dialogs.c:3188
 msgid ""
 "\n"
 "No video input devices could be found.\n"
 msgstr ""
 
-#: src/dialogs.c:3103
+#: src/dialogs.c:3192
 msgid ""
 "\n"
 "All video input devices are already in use.\n"
 msgstr ""
 
-#: src/dialogs.c:3107
+#: src/dialogs.c:3196
 msgid ""
 "\n"
 "\n"
@@ -5017,15 +5031,14 @@
 "DO NOT SHUT DOWN OR CLOSE LIVES !\n"
 msgstr ""
 
-#: src/dialogs.c:3127
+#: src/dialogs.c:3203
 #, c-format
 msgid ""
 "No clips were recovered for set (%s).\n"
 "Please check the spelling of the set name and try again.\n"
 msgstr ""
 
-#. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:3136
+#: src/dialogs.c:3214
 #, c-format
 msgid ""
 "\n"
@@ -5037,7 +5050,7 @@
 msgstr ""
 
 #. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:3144
+#: src/dialogs.c:3222
 #, c-format
 msgid ""
 "\n"
@@ -5046,34 +5059,34 @@
 "\n"
 msgstr ""
 
-#: src/dialogs.c:3150
+#: src/dialogs.c:3228
 msgid ""
 "\n"
 "You must have autolives.pl installed and in your path to use this toy.\n"
 "Consult your package distributor.\n"
 msgstr ""
 
-#: src/dialogs.c:3154
+#: src/dialogs.c:3232
 msgid ""
 "\n"
 "You must have a minimum of one clip loaded to use this toy.\n"
 msgstr ""
 
-#: src/dialogs.c:3158
+#: src/dialogs.c:3236
 msgid ""
 "\n"
 "LiVES lost its connection to jack and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:3162
+#: src/dialogs.c:3240
 msgid ""
 "\n"
 "LiVES lost its connection to pulseaudio and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:3175
+#: src/dialogs.c:3254
 #, c-format
 msgid ""
 "\n"
@@ -5082,543 +5095,543 @@
 "Do you wish to allow this (for this session only) ?\n"
 msgstr ""
 
-#: src/effects.c:60
+#: src/effects.c:61
 msgid "generator"
 msgstr ""
 
-#: src/effects.c:61
+#: src/effects.c:62
 msgid "Generators"
 msgstr ""
 
-#: src/effects.c:63
+#: src/effects.c:64
 msgid "audio generator"
 msgstr ""
 
-#: src/effects.c:64
+#: src/effects.c:65
 msgid "Audio Generators"
 msgstr ""
 
-#: src/effects.c:66
+#: src/effects.c:67
 msgid "audio/video generator"
 msgstr ""
 
-#: src/effects.c:67
+#: src/effects.c:68
 msgid "Audio/Video Generators"
 msgstr ""
 
-#: src/effects.c:69
+#: src/effects.c:70
 msgid "data generator"
 msgstr ""
 
-#: src/effects.c:70
+#: src/effects.c:71
 msgid "Data Generators"
 msgstr ""
 
-#: src/effects.c:72
+#: src/effects.c:73
 msgid "data visualiser"
 msgstr ""
 
-#: src/effects.c:73
+#: src/effects.c:74
 msgid "Data Visualisers"
 msgstr ""
 
-#: src/effects.c:75
+#: src/effects.c:76
 msgid "data processor"
 msgstr ""
 
-#: src/effects.c:76
+#: src/effects.c:77
 msgid "Data Processors"
 msgstr ""
 
-#: src/effects.c:78
+#: src/effects.c:79
 msgid "data source"
 msgstr ""
 
-#: src/effects.c:79
+#: src/effects.c:80
 msgid "Data Sources"
 msgstr ""
 
-#: src/effects.c:81
+#: src/effects.c:82
 msgid "transition"
 msgstr ""
 
-#: src/effects.c:82
+#: src/effects.c:83
 msgid "Transitions"
 msgstr ""
 
-#: src/effects.c:84
+#: src/effects.c:85
 msgid "effect"
 msgstr ""
 
-#: src/effects.c:87 src/rfx-builder.c:187
+#: src/effects.c:88 src/rfx-builder.c:187
 msgid "utility"
 msgstr ""
 
-#: src/effects.c:88
+#: src/effects.c:89
 msgid "Utilities"
 msgstr ""
 
-#: src/effects.c:90
+#: src/effects.c:91
 msgid "compositor"
 msgstr ""
 
-#: src/effects.c:91
+#: src/effects.c:92
 msgid "Compositors"
 msgstr ""
 
-#: src/effects.c:93
+#: src/effects.c:94
 msgid "tap"
 msgstr ""
 
-#: src/effects.c:94
+#: src/effects.c:95
 msgid "Taps"
 msgstr ""
 
-#: src/effects.c:96
+#: src/effects.c:97
 msgid "splitter"
 msgstr ""
 
-#: src/effects.c:97
+#: src/effects.c:98
 msgid "Splitters"
 msgstr ""
 
-#: src/effects.c:99
+#: src/effects.c:100
 msgid "converter"
 msgstr ""
 
-#: src/effects.c:100
+#: src/effects.c:101
 msgid "Converters"
 msgstr ""
 
-#: src/effects.c:102
+#: src/effects.c:103
 msgid "analyser"
 msgstr ""
 
-#: src/effects.c:103
+#: src/effects.c:104
 msgid "Analysers"
 msgstr ""
 
-#: src/effects.c:108
+#: src/effects.c:109
 msgid "audio/video"
 msgstr ""
 
-#: src/effects.c:109
+#: src/effects.c:110
 msgid "Audio/Video Transitions"
 msgstr ""
 
-#: src/effects.c:111
+#: src/effects.c:112
 msgid "video only"
 msgstr ""
 
-#: src/effects.c:112
+#: src/effects.c:113
 msgid "Video only Transitions"
 msgstr ""
 
-#: src/effects.c:114 src/multitrack.c:10740
+#: src/effects.c:115 src/multitrack.c:10962
 msgid "audio only"
 msgstr ""
 
-#: src/effects.c:115
+#: src/effects.c:116
 msgid "Audio only Transitions"
 msgstr ""
 
-#: src/effects.c:117 src/effects.c:120 src/multitrack.c:18757
+#: src/effects.c:118 src/effects.c:121 src/multitrack.c:19097
 msgid "audio"
 msgstr ""
 
-#: src/effects.c:118
+#: src/effects.c:119
 msgid "Audio Mixers"
 msgstr ""
 
-#: src/effects.c:121
+#: src/effects.c:122
 msgid "Audio Effects"
 msgstr ""
 
-#: src/effects.c:123
+#: src/effects.c:124
 msgid "video"
 msgstr ""
 
-#: src/effects.c:124
+#: src/effects.c:125
 msgid "Video Effects"
 msgstr ""
 
-#: src/effects.c:126
+#: src/effects.c:127
 msgid "audio volume controller"
 msgstr ""
 
-#: src/effects.c:127
+#: src/effects.c:128
 msgid "Audio Volume Controllers"
 msgstr ""
 
-#: src/effects.c:129
+#: src/effects.c:130
 msgid "video analyser"
 msgstr ""
 
-#: src/effects.c:130
+#: src/effects.c:131
 msgid "Video analysers"
 msgstr ""
 
-#: src/effects.c:132
+#: src/effects.c:133
 msgid "audio analyser"
 msgstr ""
 
-#: src/effects.c:133
+#: src/effects.c:134
 msgid "Audio Analysers"
 msgstr ""
 
-#: src/effects.c:137 src/plugins.c:2559 src/plugins.c:2573
+#: src/effects.c:138 src/plugins.c:2507 src/plugins.c:2521
 msgid "unknown"
 msgstr ""
 
-#: src/effects.c:238
+#: src/effects.c:235
 #, c-format
 msgid "%s all frames..."
 msgstr ""
 
-#: src/effects.c:243
+#: src/effects.c:239
 #, c-format
 msgid "%s clipboard into frames %d to %d..."
 msgstr ""
 
-#: src/effects.c:250
+#: src/effects.c:245
 #, c-format
 msgid "%s to clipboard..."
 msgstr ""
 
-#: src/effects.c:254
+#: src/effects.c:248
 #, c-format
 msgid "%s to new clip..."
 msgstr ""
 
-#: src/effects.c:259
+#: src/effects.c:252
 #, c-format
 msgid "%s frames %d to %d..."
 msgstr ""
 
-#: src/effects.c:290
+#: src/effects.c:283
 #, c-format
 msgid "%s clipboard with selection"
 msgstr ""
 
-#: src/effects.c:295
+#: src/effects.c:287
 #, c-format
 msgid "%s to clipboard"
 msgstr ""
 
-#: src/effects.c:299
+#: src/effects.c:290
 #, c-format
 msgid "%s to new clip"
 msgstr ""
 
-#: src/effects.c:304
+#: src/effects.c:294
 #, c-format
 msgid "%s frames %d to %d"
 msgstr ""
 
-#: src/effects.c:456 src/effects.c:523
+#: src/effects.c:443 src/effects.c:507
 msgid ""
 "\n"
 "No frames were generated.\n"
 msgstr ""
 
-#: src/effects-weed.c:431
+#: src/effects-weed.c:452
 msgid "integer"
 msgstr ""
 
-#: src/effects-weed.c:432
+#: src/effects-weed.c:454
 msgid "int64"
 msgstr ""
 
-#: src/effects-weed.c:433
+#: src/effects-weed.c:456
 msgid "boolean"
 msgstr ""
 
-#: src/effects-weed.c:434
+#: src/effects-weed.c:458
 msgid "double"
 msgstr ""
 
-#: src/effects-weed.c:435
+#: src/effects-weed.c:460
 msgid "string"
 msgstr ""
 
-#: src/effects-weed.c:436
+#: src/effects-weed.c:462
 msgid "pointer"
 msgstr ""
 
-#: src/effects-weed.c:4591
+#: src/effects-weed.c:4581
 #, c-format
 msgid "Error: plugin %s has no weed_setup() function.\n"
 msgstr ""
 
-#: src/effects-weed.c:4606
+#: src/effects-weed.c:4595
 #, c-format
 msgid "No usable filters found in plugin %s\n"
 msgstr ""
 
-#: src/effects-weed.c:4680
+#: src/effects-weed.c:4668
 #, c-format
 msgid "Found duplicate plugin %s"
 msgstr ""
 
-#: src/effects-weed.c:4734
+#: src/effects-weed.c:4723
 #, c-format
 msgid ""
 "Info: Unable to load plugin %s\n"
 "Error was: %s\n"
 msgstr ""
 
-#: src/effects-weed.c:4737 src/effects-weed.c:5858
+#: src/effects-weed.c:4726 src/effects-weed.c:5847
 msgid "Some plugin directories"
 msgstr ""
 
 #. TRANSLATORS: example " - LADSPA plugins -"
-#: src/effects-weed.c:4812 src/rte_window.c:2105
+#: src/effects-weed.c:4801 src/rte_window.c:2107
 #, c-format
 msgid " - %s plugins -"
 msgstr ""
 
-#: src/effects-weed.c:5012
+#: src/effects-weed.c:4998
 #, c-format
 msgid "Successfully loaded %d Weed filters\n"
 msgstr ""
 
-#: src/effects-weed.c:5177
+#: src/effects-weed.c:5162
 #, c-format
 msgid "Invalid compound effect %s - has conflicting target_fps\n"
 msgstr ""
 
-#: src/effects-weed.c:5197
+#: src/effects-weed.c:5182
 #, c-format
 msgid "Invalid compound effect %s - has multiple transition parameters\n"
 msgstr ""
 
-#: src/effects-weed.c:5211
+#: src/effects-weed.c:5196
 #, c-format
 msgid "Invalid compound effect %s - has multiple master volume parameters\n"
 msgstr ""
 
-#: src/effects-weed.c:5346
+#: src/effects-weed.c:5329
 #, c-format
 msgid "Invalid compound effect %s - must have >1 sub filters\n"
 msgstr ""
 
-#: src/effects-weed.c:5366
+#: src/effects-weed.c:5349
 #, c-format
 msgid "Invalid effect %s found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5381
+#: src/effects-weed.c:5364
 #, c-format
 msgid "Invalid default found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5392
+#: src/effects-weed.c:5375
 #, c-format
 msgid "Invalid filter %d for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5406
+#: src/effects-weed.c:5389
 #, c-format
 msgid "Invalid param %d for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5433
+#: src/effects-weed.c:5416
 #, c-format
 msgid ""
 "Invalid number of values for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5467
+#: src/effects-weed.c:5450
 #, c-format
 msgid ""
 "Invalid non-boolean value for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5500
+#: src/effects-weed.c:5483
 #, c-format
 msgid "Invalid param link found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5511
+#: src/effects-weed.c:5494
 #, c-format
 msgid ""
 "Invalid out filter %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5529
+#: src/effects-weed.c:5513
 #, c-format
 msgid ""
 "Invalid out param %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5541
+#: src/effects-weed.c:5526
 #, c-format
 msgid ""
 "Invalid non-boolean value for autoscale found in compound effect %s, line "
 "%d\n"
 msgstr ""
 
-#: src/effects-weed.c:5552
+#: src/effects-weed.c:5537
 #, c-format
 msgid ""
 "Invalid in filter %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5566
+#: src/effects-weed.c:5552
 #, c-format
 msgid ""
 "Invalid in param %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5594
+#: src/effects-weed.c:5581
 #, c-format
 msgid "Invalid channel link found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5605
+#: src/effects-weed.c:5592
 #, c-format
 msgid ""
 "Invalid out filter %d for link channels found in compound effect %s, line "
 "%d\n"
 msgstr ""
 
-#: src/effects-weed.c:5623
+#: src/effects-weed.c:5611
 #, c-format
 msgid ""
 "Invalid out channel %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5633
+#: src/effects-weed.c:5622
 #, c-format
 msgid ""
 "Invalid in filter %d for link channels found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5651
+#: src/effects-weed.c:5641
 #, c-format
 msgid ""
 "Invalid in channel %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5687
+#: src/effects-weed.c:5678
 #, c-format
 msgid "Compound:%s"
 msgstr ""
 
-#: src/effects-weed.c:5758
+#: src/effects-weed.c:5749
 #, c-format
 msgid "Successfully loaded %d compound filters\n"
 msgstr ""
 
-#: src/effects-weed.c:6591
+#: src/effects-weed.c:6570
 #, c-format
 msgid "Effect %s cannot be used with this audio player.\n"
 msgstr ""
 
-#: src/effects-weed.c:6737
+#: src/effects-weed.c:6718
 #, c-format
 msgid "Failed to start instance %s, error code %d\n"
 msgstr ""
 
-#: src/effects-weed.c:6814
+#: src/effects-weed.c:6797
 #, c-format
 msgid "Unable to start generator %s\n"
 msgstr ""
 
-#: src/effects-weed.c:7621
+#: src/effects-weed.c:7607
 #, c-format
 msgid "Failed to start generator %s\n"
 msgstr ""
 
-#: src/effects-weed.c:7718
+#: src/effects-weed.c:7701
 #, c-format
 msgid "Failed to start generator %s, error %d\n"
 msgstr ""
 
-#: src/effects-weed.c:9012
+#: src/effects-weed.c:8993
 #, c-format
 msgid "%s [unstable] (%s)"
 msgstr ""
 
-#: src/effects-data.c:3278
+#: src/effects-data.c:3234
 #, c-format
 msgid "ACTIVATE (%s)"
 msgstr ""
 
-#: src/effects-data.c:3548
+#: src/effects-data.c:3501
 msgid "ACTIVATE"
 msgstr ""
 
-#: src/effects-data.c:3876
+#: src/effects-data.c:3829
 #, c-format
 msgid "Key slot %d"
 msgstr ""
 
-#: src/effects-data.c:3998
+#: src/effects-data.c:3951
 msgid "Autoscale"
 msgstr ""
 
-#: src/effects-data.c:4089
+#: src/effects-data.c:4042
 msgid "Add another connection for this output parameter"
 msgstr ""
 
-#: src/effects-data.c:4102 src/effects-data.c:4151
+#: src/effects-data.c:4055 src/effects-data.c:4104
 msgid "Delete this connection"
 msgstr ""
 
-#: src/effects-data.c:4138
+#: src/effects-data.c:4091
 msgid "Add another connection for this output channel"
 msgstr ""
 
-#: src/effects-data.c:4223
+#: src/effects-data.c:4176
 msgid "Connected to -->"
 msgstr ""
 
-#: src/effects-data.c:4243
+#: src/effects-data.c:4196
 #, c-format
 msgid "%s - Alpha Channel Connections"
 msgstr ""
 
-#: src/effects-data.c:4316
+#: src/effects-data.c:4269
 #, c-format
 msgid "%s - Parameter Data Connections"
 msgstr ""
 
-#: src/effects-data.c:4336
+#: src/effects-data.c:4289
 msgid "Autoscale All"
 msgstr ""
 
-#: src/effects-data.c:4361 src/effects-data.c:4890
+#: src/effects-data.c:4314 src/effects-data.c:4841
 msgid "ACTIVATED"
 msgstr ""
 
-#: src/effects-data.c:4774
+#: src/effects-data.c:4726
 msgid "LiVES: - Parameter and Alpha Channel Connections"
 msgstr ""
 
-#: src/effects-data.c:4785
+#: src/effects-data.c:4736
 msgid "Auto Connect Channels"
 msgstr ""
 
-#: src/effects-data.c:4797
+#: src/effects-data.c:4748
 msgid "Auto Connect Parameters"
 msgstr ""
 
-#: src/effects-data.c:4807
+#: src/effects-data.c:4758
 msgid "Disconnect All"
 msgstr ""
 
-#: src/effects-data.c:4875
+#: src/effects-data.c:4826
 #, c-format
 msgid "Input channel is already connected from (%d,%d) %s"
 msgstr ""
 
-#: src/effects-data.c:4891
+#: src/effects-data.c:4842
 #, c-format
 msgid "Input parameter is already connected from (%d,%d) %s"
 msgstr ""
 
-#: src/effects-data.c:4899
+#: src/effects-data.c:4851
 msgid "Input and output parameters are not compatible"
 msgstr ""
 
@@ -5630,43 +5643,43 @@
 msgid "_Reset Values"
 msgstr ""
 
-#: src/framedraw.c:267
+#: src/framedraw.c:265
 msgid "_Frame"
 msgstr ""
 
-#: src/paramspecial.c:266
+#: src/paramspecial.c:259
 msgid "Maintain _Aspect Ratio"
 msgstr ""
 
-#: src/paramspecial.c:267
+#: src/paramspecial.c:260
 msgid "Maintain aspect ratio of original frame"
 msgstr ""
 
-#: src/paramspecial.c:341
+#: src/paramspecial.c:335
 msgid "Display Password"
 msgstr ""
 
-#: src/paramwindow.c:450
+#: src/paramwindow.c:447
 msgid "Transition _In"
 msgstr ""
 
-#: src/paramwindow.c:452
+#: src/paramwindow.c:449
 msgid "Click to set the transition parameter to show only the front frame"
 msgstr ""
 
-#: src/paramwindow.c:474
+#: src/paramwindow.c:472
 msgid "Crossfade audio"
 msgstr ""
 
-#: src/paramwindow.c:475
+#: src/paramwindow.c:473
 msgid "Check the box to make audio transition with the video"
 msgstr ""
 
-#: src/paramwindow.c:493
+#: src/paramwindow.c:492
 msgid "Transition _Out"
 msgstr ""
 
-#: src/paramwindow.c:495
+#: src/paramwindow.c:494
 msgid "Click to set the transition parameter to show only the rear frame"
 msgstr ""
 
@@ -5679,23 +5692,23 @@
 msgid "%s : size"
 msgstr ""
 
-#: src/paramwindow.c:598
+#: src/paramwindow.c:597
 msgid "New size (pixels)"
 msgstr ""
 
-#: src/paramwindow.c:617 src/plugins.c:997
+#: src/paramwindow.c:616 src/plugins.c:973
 msgid "_Width"
 msgstr "_Breite"
 
-#: src/paramwindow.c:636 src/plugins.c:1003
+#: src/paramwindow.c:635 src/plugins.c:979
 msgid "_Height"
 msgstr "_Höhe"
 
-#: src/paramwindow.c:684
+#: src/paramwindow.c:683
 msgid "Generate to _Clipboard"
 msgstr ""
 
-#: src/paramwindow.c:686
+#: src/paramwindow.c:685
 msgid "Generate frames to the clipboard"
 msgstr ""
 
@@ -5707,7 +5720,7 @@
 msgid "Generate frames to a new clip"
 msgstr ""
 
-#: src/paramwindow.c:822
+#: src/paramwindow.c:824
 #, c-format
 msgid ""
 "\n"
@@ -5715,71 +5728,71 @@
 "\n"
 msgstr ""
 
-#: src/paramwindow.c:920 src/paramwindow.c:930
+#: src/paramwindow.c:934 src/paramwindow.c:942
 msgid "Set as default"
 msgstr ""
 
-#: src/paramwindow.c:922 src/paramwindow.c:938
+#: src/paramwindow.c:936 src/paramwindow.c:950
 msgid "Reset"
 msgstr ""
 
-#: src/paramwindow.c:932 src/rte_window.c:2401 src/omc-learn.c:1357
+#: src/paramwindow.c:944 src/rte_window.c:2394 src/omc-learn.c:1347
 msgid "Close _window"
 msgstr ""
 
-#: src/paramwindow.c:1337
+#: src/paramwindow.c:1340
 msgid "No parameters"
 msgstr ""
 
-#: src/paramwindow.c:1419
+#: src/paramwindow.c:1424
 msgid "Invalid parameter"
 msgstr ""
 
-#: src/paramwindow.c:1611
+#: src/paramwindow.c:1610
 msgid "LiVES: - Select Colour"
 msgstr ""
 
-#: src/paramwindow.c:1616
+#: src/paramwindow.c:1615
 msgid "Click to set the colour"
 msgstr ""
 
-#: src/paramwindow.c:1628
+#: src/paramwindow.c:1626
 msgid "_Red"
 msgstr ""
 
-#: src/paramwindow.c:1629
+#: src/paramwindow.c:1627
 msgid "The red value (0 - 255)"
 msgstr ""
 
-#: src/paramwindow.c:1632
+#: src/paramwindow.c:1630
 msgid "_Green"
 msgstr ""
 
-#: src/paramwindow.c:1633
+#: src/paramwindow.c:1631
 msgid "The green value (0 - 255)"
 msgstr ""
 
-#: src/paramwindow.c:1636
+#: src/paramwindow.c:1634
 msgid "_Blue"
 msgstr ""
 
-#: src/paramwindow.c:1637
+#: src/paramwindow.c:1635
 msgid "The blue value (0 - 255)"
 msgstr ""
 
-#: src/plugins.c:85
+#: src/plugins.c:86
 #, c-format
 msgid ""
 "\n"
 "Plugin error: %s failed with code %d"
 msgstr ""
 
-#: src/plugins.c:87
+#: src/plugins.c:88
 #, c-format
 msgid " : message was %s\n"
 msgstr ""
 
-#: src/plugins.c:387
+#: src/plugins.c:375
 #, c-format
 msgid ""
 "\n"
@@ -5789,17 +5802,17 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/plugins.c:397
+#: src/plugins.c:385
 #, c-format
 msgid "Updating video playback plugin defaults in %s\n"
 msgstr ""
 
-#: src/plugins.c:452
+#: src/plugins.c:444
 #, c-format
 msgid "Loading video playback plugin defaults from %s..."
 msgstr ""
 
-#: src/plugins.c:515
+#: src/plugins.c:505
 #, c-format
 msgid ""
 "\n"
@@ -5809,32 +5822,32 @@
 "\n"
 msgstr ""
 
-#: src/plugins.c:855
+#: src/plugins.c:836
 #, c-format
 msgid "Saving playback plugin defaults to %s..."
 msgstr ""
 
-#: src/plugins.c:962
+#: src/plugins.c:939
 msgid "_FPS"
 msgstr ""
 
-#: src/plugins.c:963
+#: src/plugins.c:940
 msgid "Fixed framerate for plugin.\n"
 msgstr ""
 
-#: src/plugins.c:1032
+#: src/plugins.c:1008
 msgid "_Colourspace"
 msgstr ""
 
-#: src/plugins.c:1033
+#: src/plugins.c:1009
 msgid "Colourspace input to the plugin.\n"
 msgstr ""
 
-#: src/plugins.c:1089
+#: src/plugins.c:1065
 msgid "Save settings to an alternate file.\n"
 msgstr ""
 
-#: src/plugins.c:1206
+#: src/plugins.c:1182
 #, c-format
 msgid ""
 "\n"
@@ -5843,7 +5856,7 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/plugins.c:1252
+#: src/plugins.c:1228
 #, c-format
 msgid ""
 "\n"
@@ -5853,38 +5866,38 @@
 "Unable to use it.\n"
 msgstr ""
 
-#: src/plugins.c:1265
+#: src/plugins.c:1241
 #, c-format
 msgid ""
 "Video playback plugin failed to initialise.\n"
 "Error was: %s\n"
 msgstr ""
 
-#: src/plugins.c:1461
+#: src/plugins.c:1428
 msgid ""
 "\n"
 "Warning ! Video playback plugin will not send key presses. Keyboard may be "
 "disabled during plugin use !\n"
 msgstr ""
 
-#: src/plugins.c:1465
+#: src/plugins.c:1433
 #, c-format
 msgid ""
 "*** Using %s plugin for fs playback, agreed to use palette type %d ( %s ). "
 "***\n"
 msgstr ""
 
-#: src/plugins.c:1571
+#: src/plugins.c:1537
 #, c-format
 msgid "Audio stream unable to use preferred format '%s'\n"
 msgstr ""
 
-#: src/plugins.c:1579
+#: src/plugins.c:1543
 #, c-format
 msgid "Using format '%s' instead.\n"
 msgstr ""
 
-#: src/plugins.c:1616
+#: src/plugins.c:1579
 #, c-format
 msgid ""
 "LiVES was unable to find its encoder plugins. Please make sure you have the "
@@ -5893,7 +5906,7 @@
 "or change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/plugins.c:1624
+#: src/plugins.c:1589
 #, c-format
 msgid ""
 "LiVES did not receive a response from the encoder plugin called '%s'.\n"
@@ -5902,11 +5915,11 @@
 "or switch to another plugin using Tools|Preferences|Encoding\n"
 msgstr ""
 
-#: src/plugins.c:2032
+#: src/plugins.c:1987
 msgid "Unable to resize, please install imageMagick\n"
 msgstr ""
 
-#: src/plugins.c:2231
+#: src/plugins.c:2183
 #, c-format
 msgid ""
 "\n"
@@ -5914,12 +5927,12 @@
 "No decoders found in %s !\n"
 msgstr ""
 
-#: src/plugins.c:2415
+#: src/plugins.c:2369
 #, c-format
 msgid " using %s"
 msgstr ""
 
-#: src/plugins.c:2499
+#: src/plugins.c:2451
 #, c-format
 msgid ""
 "\n"
@@ -5928,7 +5941,7 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/plugins.c:2522
+#: src/plugins.c:2472
 #, c-format
 msgid ""
 "\n"
@@ -5938,24 +5951,24 @@
 "Unable to use it.\n"
 msgstr ""
 
-#: src/plugins.c:2564
+#: src/plugins.c:2512
 msgid "/unknown"
 msgstr ""
 
-#: src/plugins.c:2651
+#: src/plugins.c:2598
 msgid "LiVES: - Decoder Plugins"
 msgstr ""
 
-#: src/plugins.c:2669
+#: src/plugins.c:2616
 msgid "Enabled Video Decoders (uncheck to disable)"
 msgstr ""
 
-#: src/plugins.c:2726
+#: src/plugins.c:2672
 #, c-format
 msgid "Failed to load %s, transitions may not resize.\n"
 msgstr ""
 
-#: src/plugins.c:3854
+#: src/plugins.c:3797
 #, c-format
 msgid "%s advanced settings"
 msgstr ""
@@ -5964,15 +5977,15 @@
 msgid "LiVES: - New Test RFX"
 msgstr ""
 
-#: src/rfx-builder.c:136
+#: src/rfx-builder.c:135
 msgid "LiVES: - Edit Test RFX"
 msgstr ""
 
-#: src/rfx-builder.c:166
+#: src/rfx-builder.c:165
 msgid "Type:"
 msgstr ""
 
-#: src/rfx-builder.c:184
+#: src/rfx-builder.c:183
 msgid "tool"
 msgstr ""
 
@@ -5984,130 +5997,130 @@
 msgid "The name of the plugin. No spaces allowed."
 msgstr ""
 
-#: src/rfx-builder.c:201
+#: src/rfx-builder.c:202
 msgid "Version:       "
 msgstr ""
 
-#: src/rfx-builder.c:203
+#: src/rfx-builder.c:204
 msgid "The script version."
 msgstr ""
 
-#: src/rfx-builder.c:210
+#: src/rfx-builder.c:212
 msgid "    Author:       "
 msgstr ""
 
-#: src/rfx-builder.c:211
+#: src/rfx-builder.c:213
 msgid "The script author."
 msgstr ""
 
-#: src/rfx-builder.c:217
+#: src/rfx-builder.c:220
 msgid "    URL (optional):       "
 msgstr ""
 
-#: src/rfx-builder.c:218
+#: src/rfx-builder.c:221
 msgid "URL for the plugin maintainer."
 msgstr ""
 
-#: src/rfx-builder.c:226
+#: src/rfx-builder.c:230
 msgid "Menu text:    "
 msgstr ""
 
-#: src/rfx-builder.c:227
+#: src/rfx-builder.c:231
 msgid "The text to show in the menu."
 msgstr ""
 
-#: src/rfx-builder.c:239
+#: src/rfx-builder.c:244
 msgid "Action description:        "
 msgstr ""
 
-#: src/rfx-builder.c:241
+#: src/rfx-builder.c:246
 msgid "Describe what the plugin is doing. E.g. \"Edge detecting\""
-msgstr ""
+msgstr "Beschreiben Sie, was die Erweiterung macht. Z.B. \"Kantenerkennung\""
 
-#: src/rfx-builder.c:246
+#: src/rfx-builder.c:251
 msgid "Minimum frames:"
 msgstr ""
 
-#: src/rfx-builder.c:249
+#: src/rfx-builder.c:254
 msgid ""
 "Minimum number of frames this effect/tool can be applied to. Normally 1."
 msgstr ""
 
-#: src/rfx-builder.c:260
+#: src/rfx-builder.c:265
 msgid "_Requirements..."
 msgstr ""
 
-#: src/rfx-builder.c:263
+#: src/rfx-builder.c:268
 msgid "Enter any binaries required by the plugin."
 msgstr ""
 
-#: src/rfx-builder.c:267
+#: src/rfx-builder.c:272
 msgid "_Properties..."
 msgstr ""
 
-#: src/rfx-builder.c:270
+#: src/rfx-builder.c:275
 msgid "Set properties for the plugin. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:274
+#: src/rfx-builder.c:279
 msgid "_Parameters..."
 msgstr ""
 
-#: src/rfx-builder.c:277
+#: src/rfx-builder.c:282
 msgid "Set up parameters used in pre/loop/post/trigger code. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:281
+#: src/rfx-builder.c:286
 msgid "Parameter _Window Hints..."
 msgstr ""
 
-#: src/rfx-builder.c:284
+#: src/rfx-builder.c:289
 msgid "Set hints about how to lay out the parameter window. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:290
+#: src/rfx-builder.c:295
 msgid "_Language code:"
 msgstr ""
 
-#: src/rfx-builder.c:291
+#: src/rfx-builder.c:296
 msgid "Language for pre/loop/post/triggers. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:300
+#: src/rfx-builder.c:305
 msgid "_Pre loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:303
+#: src/rfx-builder.c:308
 msgid "Code to be executed before the loop. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:307
+#: src/rfx-builder.c:312
 msgid "_Loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:310
+#: src/rfx-builder.c:315
 msgid "Loop code to be applied to each frame."
 msgstr ""
 
-#: src/rfx-builder.c:314
+#: src/rfx-builder.c:319
 msgid "_Post loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:317
+#: src/rfx-builder.c:322
 msgid "Code to be executed after the loop. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:321
+#: src/rfx-builder.c:326
 msgid "_Trigger code..."
 msgstr ""
 
-#: src/rfx-builder.c:324
+#: src/rfx-builder.c:329
 msgid ""
 "Set trigger code for when the parameter window is shown, or when a parameter "
 "is changed. Optional (except for Utilities)."
 msgstr ""
 
-#: src/rfx-builder.c:421
+#: src/rfx-builder.c:426
 #, c-format
 msgid ""
 "\n"
@@ -6117,55 +6130,55 @@
 "%s\n"
 msgstr ""
 
-#: src/rfx-builder.c:544
+#: src/rfx-builder.c:541
 msgid "LiVES: - RFX Requirements"
 msgstr ""
 
-#: src/rfx-builder.c:548
+#: src/rfx-builder.c:544
 msgid "LiVES: - RFX Parameters"
 msgstr ""
 
-#: src/rfx-builder.c:552
+#: src/rfx-builder.c:547
 msgid "LiVES: - RFX Parameter Window Hints"
 msgstr ""
 
-#: src/rfx-builder.c:556
+#: src/rfx-builder.c:550
 msgid "LiVES: - RFX Triggers"
 msgstr ""
 
-#: src/rfx-builder.c:622
+#: src/rfx-builder.c:613
 msgid "_New Entry"
 msgstr ""
 
-#: src/rfx-builder.c:625
+#: src/rfx-builder.c:616
 msgid "_Edit Entry"
 msgstr ""
 
-#: src/rfx-builder.c:628
+#: src/rfx-builder.c:619
 msgid "_Remove Entry"
 msgstr ""
 
-#: src/rfx-builder.c:632
+#: src/rfx-builder.c:623
 msgid "Move _Up"
 msgstr ""
 
-#: src/rfx-builder.c:635
+#: src/rfx-builder.c:626
 msgid "Move _Down"
 msgstr ""
 
-#: src/rfx-builder.c:1004
+#: src/rfx-builder.c:984
 msgid "LiVES: - RFX Properties"
 msgstr ""
 
-#: src/rfx-builder.c:1013
+#: src/rfx-builder.c:993
 msgid "_Slow (hint to GUI)"
 msgstr ""
 
-#: src/rfx-builder.c:1024
+#: src/rfx-builder.c:1004
 msgid "_Batch mode generator"
 msgstr ""
 
-#: src/rfx-builder.c:1831
+#: src/rfx-builder.c:1790
 msgid ""
 "\n"
 "\n"
@@ -6174,7 +6187,7 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:1875
+#: src/rfx-builder.c:1834
 msgid ""
 "\n"
 "\n"
@@ -6182,219 +6195,219 @@
 "Please check the trigger code.\n"
 msgstr ""
 
-#: src/rfx-builder.c:1994
+#: src/rfx-builder.c:1950
 msgid "LiVES: - New RFX Parameter"
 msgstr ""
 
-#: src/rfx-builder.c:1997
+#: src/rfx-builder.c:1952
 msgid "LiVES: - Edit RFX Parameter"
 msgstr ""
 
-#: src/rfx-builder.c:2013
+#: src/rfx-builder.c:1968
 msgid "_Name:    "
 msgstr ""
 
-#: src/rfx-builder.c:2016
+#: src/rfx-builder.c:1971
 msgid "Name of the parameter, must be unique in the plugin."
 msgstr ""
 
-#: src/rfx-builder.c:2025
+#: src/rfx-builder.c:1981
 msgid "_Label:    "
 msgstr ""
 
-#: src/rfx-builder.c:2028
+#: src/rfx-builder.c:1984
 msgid ""
 "Label to be shown by the parameter. An underscore represents mnemonic "
 "accelerator."
 msgstr ""
 
-#: src/rfx-builder.c:2039
+#: src/rfx-builder.c:1996
 msgid "_Type:         "
 msgstr ""
 
-#: src/rfx-builder.c:2040
+#: src/rfx-builder.c:1997
 msgid "Parameter type (select from list)."
 msgstr ""
 
-#: src/rfx-builder.c:2073
+#: src/rfx-builder.c:2029
 msgid "Decimal _places: "
 msgstr ""
 
-#: src/rfx-builder.c:2082 src/rfx-builder.c:2477 src/rfx-builder.c:2495
+#: src/rfx-builder.c:2038 src/rfx-builder.c:2430 src/rfx-builder.c:2447
 msgid "_Default value:    "
 msgstr ""
 
-#: src/rfx-builder.c:2098
+#: src/rfx-builder.c:2054
 msgid "_Default: "
 msgstr ""
 
-#: src/rfx-builder.c:2132
+#: src/rfx-builder.c:2087
 msgid "Button _Group: "
 msgstr ""
 
-#: src/rfx-builder.c:2134
+#: src/rfx-builder.c:2089
 msgid "A non-zero value can be used to group radio buttons."
 msgstr ""
 
-#: src/rfx-builder.c:2142 src/rfx-builder.c:2478
+#: src/rfx-builder.c:2097 src/rfx-builder.c:2431
 msgid "_Minimum value: "
 msgstr ""
 
-#: src/rfx-builder.c:2148 src/rfx-builder.c:2479
+#: src/rfx-builder.c:2103 src/rfx-builder.c:2432
 msgid "Ma_ximum value: "
 msgstr ""
 
-#: src/rfx-builder.c:2157
+#: src/rfx-builder.c:2113
 msgid "     _Step size:   "
 msgstr ""
 
-#: src/rfx-builder.c:2160
+#: src/rfx-builder.c:2117
 msgid ""
 "How much the parameter is adjusted when the spinbutton arrows are pressed."
 msgstr ""
 
-#: src/rfx-builder.c:2171
+#: src/rfx-builder.c:2129
 msgid "_Wrap value"
 msgstr ""
 
-#: src/rfx-builder.c:2172
+#: src/rfx-builder.c:2131
 msgid "Whether the value wraps max->min and min->max."
 msgstr ""
 
-#: src/rfx-builder.c:2470
+#: src/rfx-builder.c:2424
 msgid "Set _values"
 msgstr ""
 
-#: src/rfx-builder.c:2512
+#: src/rfx-builder.c:2463
 msgid "Default _Red:  "
 msgstr ""
 
-#: src/rfx-builder.c:2513
+#: src/rfx-builder.c:2464
 msgid "Default _Green:"
 msgstr ""
 
-#: src/rfx-builder.c:2514
+#: src/rfx-builder.c:2465
 msgid "Default _Blue: "
 msgstr ""
 
-#: src/rfx-builder.c:2538
+#: src/rfx-builder.c:2488
 msgid "Set _default"
 msgstr ""
 
-#: src/rfx-builder.c:2540
+#: src/rfx-builder.c:2490
 msgid "Default value:  "
 msgstr ""
 
-#: src/rfx-builder.c:2541
+#: src/rfx-builder.c:2491
 msgid "Maximum length (chars): "
 msgstr ""
 
-#: src/rfx-builder.c:2576
+#: src/rfx-builder.c:2526
 msgid "LiVES: - New RFX Parameter Window Hint"
 msgstr ""
 
-#: src/rfx-builder.c:2579
+#: src/rfx-builder.c:2528
 msgid "LiVES: - Edit RFX Parameter Window Hint"
 msgstr ""
 
-#: src/rfx-builder.c:2622
+#: src/rfx-builder.c:2569
 msgid "_Keyword:         "
 msgstr ""
 
-#: src/rfx-builder.c:2639
+#: src/rfx-builder.c:2586
 msgid "Special _Type:         "
 msgstr ""
 
-#: src/rfx-builder.c:2656
+#: src/rfx-builder.c:2602
 msgid "Special _Subtype:         "
 msgstr ""
 
-#: src/rfx-builder.c:2667 src/rfx-builder.c:2706
+#: src/rfx-builder.c:2613 src/rfx-builder.c:2651
 msgid "Row:    "
 msgstr ""
 
-#: src/rfx-builder.c:2732
+#: src/rfx-builder.c:2676
 #, c-format
 msgid "Linked parameters (%d):    "
 msgstr ""
 
-#: src/rfx-builder.c:2749
+#: src/rfx-builder.c:2693
 msgid "Linked parameters (4):    "
 msgstr ""
 
-#: src/rfx-builder.c:2752
+#: src/rfx-builder.c:2695
 msgid "Linked parameters (2):    "
 msgstr ""
 
-#: src/rfx-builder.c:2777
+#: src/rfx-builder.c:2720
 msgid "LiVES: - New RFX Trigger"
 msgstr ""
 
-#: src/rfx-builder.c:2780
+#: src/rfx-builder.c:2722
 msgid "LiVES: - Edit RFX Trigger"
 msgstr ""
 
-#: src/rfx-builder.c:2808
+#: src/rfx-builder.c:2750
 msgid "When:         "
 msgstr ""
 
-#: src/rfx-builder.c:2904
+#: src/rfx-builder.c:2846
 msgid "LiVES: - Pre Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:2911
+#: src/rfx-builder.c:2853
 msgid "LiVES: - Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:2918
+#: src/rfx-builder.c:2860
 msgid "LiVES: - Post Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:2931
+#: src/rfx-builder.c:2873
 #, c-format
 msgid "LiVES: - Default text (max length %d)"
 msgstr ""
 
-#: src/rfx-builder.c:2944
+#: src/rfx-builder.c:2885
 msgid "LiVES: - Enter values, one per line"
 msgstr ""
 
-#: src/rfx-builder.c:3055
+#: src/rfx-builder.c:2996
 msgid ""
 "\n"
 "\n"
 "Name must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3060
+#: src/rfx-builder.c:3001
 msgid ""
 "\n"
 "\n"
 "Name must not contain spaces.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3065
+#: src/rfx-builder.c:3006
 msgid ""
 "\n"
 "\n"
 "Menu text must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3071
+#: src/rfx-builder.c:3012
 msgid ""
 "\n"
 "\n"
 "Action description must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3076
+#: src/rfx-builder.c:3017
 msgid ""
 "\n"
 "\n"
 "Author must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3085 src/rfx-builder.c:4339
+#: src/rfx-builder.c:3026 src/rfx-builder.c:4253
 msgid ""
 "\n"
 "\n"
@@ -6402,28 +6415,28 @@
 "Name must be unique.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3092
+#: src/rfx-builder.c:3033
 msgid ""
 "\n"
 "\n"
 "Loop code should not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3098
+#: src/rfx-builder.c:3039
 msgid ""
 "\n"
 "\n"
 "Trigger code should not be blank for a utility.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3111
+#: src/rfx-builder.c:3052
 msgid ""
 "\n"
 "\n"
 "Parameter name must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3117
+#: src/rfx-builder.c:3058
 msgid ""
 "\n"
 "\n"
@@ -6432,41 +6445,41 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:3171
+#: src/rfx-builder.c:3111
 #, c-format
 msgid "Writing script file %s..."
 msgstr ""
 
-#: src/rfx-builder.c:3477
+#: src/rfx-builder.c:3411
 msgid "No <define> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3484 src/rfx-builder.c:3493
+#: src/rfx-builder.c:3418 src/rfx-builder.c:3427
 msgid "Bad script version.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3505
+#: src/rfx-builder.c:3439
 msgid "No <name> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3513
+#: src/rfx-builder.c:3447
 msgid "No <version> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3522
+#: src/rfx-builder.c:3456
 msgid "No <author> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3536
+#: src/rfx-builder.c:3470
 msgid "No <description> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3540
+#: src/rfx-builder.c:3474
 #, c-format
 msgid "Bad description. (%s)\n"
 msgstr ""
 
-#: src/rfx-builder.c:3702
+#: src/rfx-builder.c:3627
 #, c-format
 msgid ""
 "\n"
@@ -6476,27 +6489,27 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:3859
+#: src/rfx-builder.c:3780
 msgid "Rebuilding all RFX scripts...builtin..."
 msgstr ""
 
-#: src/rfx-builder.c:3860
+#: src/rfx-builder.c:3781
 msgid "Rebuilding scripts"
 msgstr ""
 
-#: src/rfx-builder.c:3868
+#: src/rfx-builder.c:3789
 msgid "custom..."
 msgstr ""
 
-#: src/rfx-builder.c:3872
+#: src/rfx-builder.c:3793
 msgid "test..."
 msgstr ""
 
-#: src/rfx-builder.c:3878
+#: src/rfx-builder.c:3799
 msgid "rebuilding dynamic menu entries..."
 msgstr ""
 
-#: src/rfx-builder.c:3905 src/rfx-builder.c:3912
+#: src/rfx-builder.c:3826 src/rfx-builder.c:3834
 #, c-format
 msgid ""
 "\n"
@@ -6505,7 +6518,7 @@
 "Please check this program is in your path and executable.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3951
+#: src/rfx-builder.c:3874
 #, c-format
 msgid ""
 "\n"
@@ -6515,12 +6528,12 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:3960
+#: src/rfx-builder.c:3884
 #, c-format
 msgid "Deleting rfx script %s..."
 msgstr ""
 
-#: src/rfx-builder.c:3980
+#: src/rfx-builder.c:3902
 #, c-format
 msgid ""
 "\n"
@@ -6530,7 +6543,7 @@
 "Error code was %d\n"
 msgstr ""
 
-#: src/rfx-builder.c:4016
+#: src/rfx-builder.c:3938
 #, c-format
 msgid ""
 "\n"
@@ -6540,12 +6553,12 @@
 "Please delete it first, or rename the test script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4027
+#: src/rfx-builder.c:3950
 #, c-format
 msgid "Promoting rfx test plugin %s to custom..."
 msgstr ""
 
-#: src/rfx-builder.c:4044
+#: src/rfx-builder.c:3965
 #, c-format
 msgid ""
 "\n"
@@ -6556,20 +6569,20 @@
 "Return code was %d (%s)\n"
 msgstr ""
 
-#: src/rfx-builder.c:4070
+#: src/rfx-builder.c:3990
 msgid "LiVES: - Export Script to..."
 msgstr ""
 
-#: src/rfx-builder.c:4077 src/rfx-builder.c:4156
+#: src/rfx-builder.c:3997 src/rfx-builder.c:4074
 #, c-format
 msgid "Copying %s to %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4105
+#: src/rfx-builder.c:4024
 msgid "LiVES: Import Script from..."
 msgstr ""
 
-#: src/rfx-builder.c:4148
+#: src/rfx-builder.c:4067
 #, c-format
 msgid ""
 "\n"
@@ -6579,43 +6592,43 @@
 "Please delete it first, or rename the import script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4249
+#: src/rfx-builder.c:4166
 msgid "LiVES: - Copy RFX Script"
 msgstr ""
 
-#: src/rfx-builder.c:4251
+#: src/rfx-builder.c:4168
 msgid "_From type:    "
 msgstr ""
 
-#: src/rfx-builder.c:4258
+#: src/rfx-builder.c:4175
 msgid "   Script:    "
 msgstr ""
 
-#: src/rfx-builder.c:4267
+#: src/rfx-builder.c:4183
 msgid "LiVES: - Rename test RFX Script"
 msgstr ""
 
-#: src/rfx-builder.c:4268
+#: src/rfx-builder.c:4184
 msgid "From script: "
 msgstr ""
 
-#: src/rfx-builder.c:4273
+#: src/rfx-builder.c:4188
 msgid "LiVES: - RFX Script name"
 msgstr ""
 
-#: src/rfx-builder.c:4274
+#: src/rfx-builder.c:4189
 msgid "Script name: "
 msgstr ""
 
-#: src/rfx-builder.c:4294
+#: src/rfx-builder.c:4209
 msgid "New name: "
 msgstr ""
 
-#: src/rfx-builder.c:4297
+#: src/rfx-builder.c:4212
 msgid "New script name: "
 msgstr ""
 
-#: src/rfx-builder.c:4372
+#: src/rfx-builder.c:4286
 msgid ""
 "\n"
 "\n"
@@ -6623,12 +6636,12 @@
 "Script name must be unique.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4384
+#: src/rfx-builder.c:4297
 #, c-format
 msgid "Renaming RFX test script %s to %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4390
+#: src/rfx-builder.c:4302
 #, c-format
 msgid ""
 "\n"
@@ -6639,21 +6652,21 @@
 "Return code was %d\n"
 msgstr ""
 
-#: src/rfx-builder.c:4610
+#: src/rfx-builder.c:4518
 msgid "_Apply Real Time Effects to Selection"
 msgstr ""
 
-#: src/rfx-builder.c:4664
+#: src/rfx-builder.c:4572
 #, c-format
 msgid "Loading rendered effect %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4766
+#: src/rfx-builder.c:4674
 msgid ""
 "See: VJ - show VJ keys. Set the realtime effects, and then apply them here."
 msgstr ""
 
-#: src/preferences.c:359
+#: src/preferences.c:351
 msgid ""
 "\n"
 "\n"
@@ -6661,7 +6674,7 @@
 "full screen, separate window (fs) mode\n"
 msgstr ""
 
-#: src/preferences.c:408
+#: src/preferences.c:400
 msgid ""
 "\n"
 "\n"
@@ -6669,7 +6682,7 @@
 "(Free space = UNKNOWN)"
 msgstr ""
 
-#: src/preferences.c:412
+#: src/preferences.c:403
 #, c-format
 msgid ""
 "\n"
@@ -6678,14 +6691,14 @@
 "(Free space = %s)"
 msgstr ""
 
-#: src/preferences.c:416
+#: src/preferences.c:408
 msgid ""
 "The temp directory is LiVES working directory where opened clips and sets "
 "are stored.\n"
 "It should be in a partition with plenty of free disk space.\n"
 msgstr ""
 
-#: src/preferences.c:784
+#: src/preferences.c:839
 #, c-format
 msgid ""
 "Unable to create or write to the new temporary directory.\n"
@@ -6696,7 +6709,7 @@
 "The directory will not be changed now.\n"
 msgstr ""
 
-#: src/preferences.c:786
+#: src/preferences.c:843
 #, c-format
 msgid ""
 "Unable to create or write to the new temporary directory.\n"
@@ -6706,7 +6719,7 @@
 "The directory will not be changed now.\n"
 msgstr ""
 
-#: src/preferences.c:798
+#: src/preferences.c:856
 msgid ""
 "You have chosen to change the temporary directory.\n"
 "Please make sure you have no other copies of LiVES open.\n"
@@ -6718,20 +6731,20 @@
 "original setting."
 msgstr ""
 
-#: src/preferences.c:1169
+#: src/preferences.c:1221
 msgid ""
 "\n"
 "Unable to switch audio players to jack - jackd must be installed first.\n"
 "See http://jackaudio.org\n"
 msgstr ""
 
-#: src/preferences.c:1175
+#: src/preferences.c:1226
 msgid ""
 "\n"
 "Switching audio players requires restart (jackd must not be running)\n"
 msgstr ""
 
-#: src/preferences.c:1202
+#: src/preferences.c:1253
 msgid ""
 "\n"
 "Unable to switch audio players to pulse audio\n"
@@ -6739,814 +6752,814 @@
 "See http://www.pulseaudio.org\n"
 msgstr ""
 
-#: src/preferences.c:1502
+#: src/preferences.c:1544
 msgid "PCM (highest quality; largest files)"
 msgstr ""
 
-#: src/preferences.c:2063
+#: src/preferences.c:2096
 msgid "LiVES: - Preferences"
 msgstr ""
 
-#: src/preferences.c:2142
+#: src/preferences.c:2177
 msgid "Open file selection maximised"
 msgstr ""
 
-#: src/preferences.c:2149
+#: src/preferences.c:2184
 msgid "Show recent files in the File menu"
 msgstr ""
 
-#: src/preferences.c:2158
+#: src/preferences.c:2193
 msgid "Stop screensaver on playback    "
 msgstr ""
 
-#: src/preferences.c:2165
+#: src/preferences.c:2200
 msgid "Open main window maximised"
 msgstr ""
 
-#: src/preferences.c:2173
+#: src/preferences.c:2208
 msgid "Show toolbar when background is blanked"
 msgstr ""
 
-#: src/preferences.c:2181
+#: src/preferences.c:2216
 msgid "Allow mouse wheel to switch clips"
 msgstr ""
 
-#: src/preferences.c:2192
+#: src/preferences.c:2227
 msgid "Shrink previews to fit in interface"
 msgstr ""
 
-#: src/preferences.c:2202
+#: src/preferences.c:2237
 msgid "Startup mode:"
 msgstr ""
 
-#: src/preferences.c:2206
+#: src/preferences.c:2241
 msgid "_Clip editor"
 msgstr ""
 
-#: src/preferences.c:2210
+#: src/preferences.c:2245
 msgid "_Multitrack mode"
 msgstr ""
 
-#: src/preferences.c:2234
+#: src/preferences.c:2268
 msgid "Multi-head support"
 msgstr ""
 
-#: src/preferences.c:2242
+#: src/preferences.c:2276
 msgid " monitor number for LiVES interface"
 msgstr ""
 
-#: src/preferences.c:2248
+#: src/preferences.c:2282
 msgid " monitor number for playback"
 msgstr ""
 
-#: src/preferences.c:2260
+#: src/preferences.c:2294
 msgid ""
 "A setting of 0 means use all available monitors (only works with some "
 "playback plugins)."
 msgstr ""
 
-#: src/preferences.c:2270
+#: src/preferences.c:2304
 msgid "Force single monitor"
 msgstr ""
 
-#: src/preferences.c:2271
+#: src/preferences.c:2305
 msgid "Ignore all except the first monitor."
 msgstr ""
 
-#: src/preferences.c:2293
+#: src/preferences.c:2327
 msgid "Show clip thumbnails during playback"
 msgstr ""
 
-#: src/preferences.c:2306
+#: src/preferences.c:2340
 msgid "GUI"
 msgstr ""
 
-#: src/preferences.c:2321
+#: src/preferences.c:2355
 msgid "When entering Multitrack mode:"
 msgstr ""
 
-#: src/preferences.c:2330
+#: src/preferences.c:2364
 msgid "_Prompt me for width, height, fps and audio settings"
 msgstr ""
 
-#: src/preferences.c:2336
+#: src/preferences.c:2370
 msgid "_Always use the following values:"
 msgstr ""
 
-#: src/preferences.c:2345
+#: src/preferences.c:2379
 msgid "Use these same _values for rendering a new clip"
 msgstr ""
 
-#: src/preferences.c:2370
+#: src/preferences.c:2404
 msgid "_Width           "
 msgstr ""
 
-#: src/preferences.c:2375
+#: src/preferences.c:2409
 msgid "          _Height      "
 msgstr ""
 
-#: src/preferences.c:2379
+#: src/preferences.c:2413
 msgid "          _FPS"
 msgstr ""
 
-#: src/preferences.c:2387
+#: src/preferences.c:2421
 msgid "Enable backing audio track"
 msgstr ""
 
-#: src/preferences.c:2394
+#: src/preferences.c:2428
 msgid "Audio track per video track"
 msgstr ""
 
-#: src/preferences.c:2423
+#: src/preferences.c:2457
 msgid "    _Undo buffer size (MB)    "
 msgstr ""
 
-#: src/preferences.c:2432
+#: src/preferences.c:2466
 msgid "_Exit multitrack mode after rendering"
 msgstr ""
 
-#: src/preferences.c:2440
+#: src/preferences.c:2474
 msgid "Auto backup layouts"
 msgstr ""
 
-#: src/preferences.c:2445
+#: src/preferences.c:2479
 msgid "_Every"
 msgstr ""
 
-#: src/preferences.c:2453
+#: src/preferences.c:2487
 msgid "seconds"
 msgstr ""
 
-#: src/preferences.c:2461
+#: src/preferences.c:2495
 msgid "After every _change"
 msgstr ""
 
-#: src/preferences.c:2467
+#: src/preferences.c:2501
 msgid "_Never"
 msgstr ""
 
-#: src/preferences.c:2490
+#: src/preferences.c:2523
 msgid "Multitrack/Render"
 msgstr ""
 
-#: src/preferences.c:2508
+#: src/preferences.c:2541
 msgid "Use instant opening when possible"
 msgstr ""
 
-#: src/preferences.c:2509
+#: src/preferences.c:2543
 msgid "Enable instant opening of some file types using decoder plugins"
 msgstr ""
 
-#: src/preferences.c:2531
+#: src/preferences.c:2567
 msgid "Video open command (fallback)"
 msgstr ""
 
-#: src/preferences.c:2543
+#: src/preferences.c:2579
 msgid "Open/render compression"
 msgstr ""
 
-#: src/preferences.c:2546
+#: src/preferences.c:2582
 msgid " %     ( lower = slower, larger files; for jpeg, higher quality )"
 msgstr ""
 
-#: src/preferences.c:2558
+#: src/preferences.c:2594
 msgid "Default image format"
 msgstr ""
 
-#: src/preferences.c:2562
+#: src/preferences.c:2598
 msgid "_jpeg"
 msgstr ""
 
-#: src/preferences.c:2565
+#: src/preferences.c:2601
 msgid "_png"
 msgstr ""
 
-#: src/preferences.c:2572
+#: src/preferences.c:2608
 msgid "(Check Help/Troubleshoot to see which image formats are supported)"
 msgstr ""
 
-#: src/preferences.c:2580
+#: src/preferences.c:2616
 msgid "Enable automatic deinterlacing when possible"
 msgstr ""
 
-#: src/preferences.c:2582
+#: src/preferences.c:2619
 msgid "Automatically deinterlace frames when a plugin suggests it"
 msgstr ""
 
-#: src/preferences.c:2593
+#: src/preferences.c:2632
 msgid "Automatic trimming / padding of audio when possible"
 msgstr ""
 
-#: src/preferences.c:2595
+#: src/preferences.c:2634
 msgid "Automatically trim or pad audio when a plugin suggests it"
 msgstr ""
 
-#: src/preferences.c:2606
+#: src/preferences.c:2646
 msgid "Ignore blank borders when possible"
 msgstr ""
 
-#: src/preferences.c:2608
+#: src/preferences.c:2648
 msgid "Clip any blank borders from frames where possible"
 msgstr ""
 
-#: src/preferences.c:2619
+#: src/preferences.c:2660
 msgid "When opening multiple files, concatenate images into one clip"
 msgstr ""
 
-#: src/preferences.c:2629
+#: src/preferences.c:2670
 msgid "Decoding"
 msgstr ""
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:2652
+#: src/preferences.c:2693
 msgid "Low - can improve performance on slower machines"
 msgstr ""
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:2654
+#: src/preferences.c:2695
 msgid "Normal - recommended for most users"
 msgstr ""
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:2656
+#: src/preferences.c:2697
 msgid "High - can improve quality on very fast machines"
 msgstr ""
 
-#: src/preferences.c:2659
+#: src/preferences.c:2700
 msgid "Preview _quality"
 msgstr ""
 
-#: src/preferences.c:2660
+#: src/preferences.c:2701
 msgid "The preview quality for video playback - affects resizing"
 msgstr ""
 
-#: src/preferences.c:2675
+#: src/preferences.c:2717
 msgid "_Show FPS statistics"
 msgstr ""
 
-#: src/preferences.c:2694
+#: src/preferences.c:2736
 msgid "_Plugin"
 msgstr ""
 
-#: src/preferences.c:2718
+#: src/preferences.c:2760
 msgid "Stream audio"
 msgstr ""
 
-#: src/preferences.c:2721
+#: src/preferences.c:2763
 msgid "Stream audio to playback plugin"
 msgstr ""
 
-#: src/preferences.c:2734
+#: src/preferences.c:2778
 msgid "Record player output"
 msgstr ""
 
-#: src/preferences.c:2737
+#: src/preferences.c:2781
 msgid "Record output from player instead of input to player"
 msgstr ""
 
-#: src/preferences.c:2744
+#: src/preferences.c:2789
 msgid "VIDEO"
 msgstr ""
 
-#: src/preferences.c:2787
+#: src/preferences.c:2833
 msgid "_Player"
 msgstr ""
 
-#: src/preferences.c:2792
+#: src/preferences.c:2838
 msgid "(See also the Jack Integration tab for jack startup options)"
 msgstr ""
 
-#: src/preferences.c:2819
+#: src/preferences.c:2865
 msgid "mplayer"
 msgstr ""
 
-#: src/preferences.c:2830
+#: src/preferences.c:2876
 msgid "mplayer2"
 msgstr ""
 
-#: src/preferences.c:2833
+#: src/preferences.c:2879
 msgid "Audio play _command"
 msgstr ""
 
-#: src/preferences.c:2840
+#: src/preferences.c:2886
 msgid "- internal -"
 msgstr ""
 
-#: src/preferences.c:2849
+#: src/preferences.c:2895
 msgid "Audio follows video _rate/direction"
 msgstr ""
 
-#: src/preferences.c:2857
+#: src/preferences.c:2903
 msgid "Audio follows _clip switches"
 msgstr ""
 
-#: src/preferences.c:2864
+#: src/preferences.c:2910
 msgid "Source:"
 msgstr ""
 
-#: src/preferences.c:2868
+#: src/preferences.c:2914
 msgid "_Internal"
 msgstr ""
 
-#: src/preferences.c:2873
+#: src/preferences.c:2919
 msgid "_External (requires jack or pulse audio player)"
 msgstr ""
 
-#: src/preferences.c:2892
+#: src/preferences.c:2940
 msgid "AUDIO"
 msgstr ""
 
-#: src/preferences.c:2902
+#: src/preferences.c:2950
 msgid "Playback"
 msgstr ""
 
-#: src/preferences.c:2925
+#: src/preferences.c:2973
 msgid ""
 "Record audio when capturing an e_xternal window\n"
 " (requires jack or pulse audio)"
 msgstr ""
 
-#: src/preferences.c:2940
+#: src/preferences.c:2988
 msgid "      What to record when 'r' is pressed   "
 msgstr ""
 
-#: src/preferences.c:2949
+#: src/preferences.c:2997
 msgid "_Frame changes"
 msgstr ""
 
-#: src/preferences.c:2964
+#: src/preferences.c:3012
 msgid "F_PS changes"
 msgstr ""
 
-#: src/preferences.c:2982
+#: src/preferences.c:3030
 msgid "_Real time effects"
 msgstr ""
 
-#: src/preferences.c:2993
+#: src/preferences.c:3041
 msgid "_Clip switches"
 msgstr ""
 
-#: src/preferences.c:3004
+#: src/preferences.c:3052
 msgid "_Audio (requires jack or pulse audio player)"
 msgstr ""
 
-#: src/preferences.c:3024
+#: src/preferences.c:3072
 msgid "Pause recording if free disk space falls below"
 msgstr ""
 
 #. TRANSLATORS: gigabytes
-#: src/preferences.c:3030
+#: src/preferences.c:3078
 msgid "GB"
 msgstr ""
 
-#: src/preferences.c:3037
+#: src/preferences.c:3085
 msgid "Recording"
 msgstr ""
 
-#: src/preferences.c:3055
+#: src/preferences.c:3103
 msgid "Encoder"
 msgstr ""
 
-#: src/preferences.c:3090
+#: src/preferences.c:3137
 msgid "Output format"
 msgstr ""
 
-#: src/preferences.c:3106
+#: src/preferences.c:3153
 msgid "Audio codec"
 msgstr ""
 
-#: src/preferences.c:3119
+#: src/preferences.c:3165
 msgid "Encoding"
 msgstr ""
 
-#: src/preferences.c:3134
+#: src/preferences.c:3180
 msgid "Use _antialiasing when resizing"
 msgstr ""
 
-#: src/preferences.c:3143
+#: src/preferences.c:3189
 msgid "Number of _real time effect keys"
 msgstr ""
 
-#: src/preferences.c:3145
+#: src/preferences.c:3192
 msgid ""
 "The number of \"virtual\" real time effect keys. They can be controlled "
 "through the real time effects window, or via network (OSC)."
 msgstr ""
 
-#: src/preferences.c:3152
+#: src/preferences.c:3199
 msgid "Use _threads where possible when applying effects"
 msgstr ""
 
-#: src/preferences.c:3159
+#: src/preferences.c:3207
 msgid "Number of _threads"
 msgstr ""
 
-#: src/preferences.c:3172
+#: src/preferences.c:3221
 msgid "Restart is required if any of the following paths are changed:"
 msgstr ""
 
-#: src/preferences.c:3182
+#: src/preferences.c:3231
 msgid "Weed plugin path"
 msgstr ""
 
-#: src/preferences.c:3184
+#: src/preferences.c:3234
 msgid "Frei0r plugin path"
 msgstr ""
 
-#: src/preferences.c:3186
+#: src/preferences.c:3237
 msgid "LADSPA plugin path"
 msgstr ""
 
-#: src/preferences.c:3209
+#: src/preferences.c:3261
 msgid "      Video load directory (default)      "
 msgstr ""
 
-#: src/preferences.c:3215
+#: src/preferences.c:3267
 msgid "      Video save directory (default) "
 msgstr ""
 
-#: src/preferences.c:3221
+#: src/preferences.c:3273
 msgid "      Audio load directory (default) "
 msgstr ""
 
-#: src/preferences.c:3227
+#: src/preferences.c:3279
 msgid "      Image directory (default) "
 msgstr ""
 
-#: src/preferences.c:3233
+#: src/preferences.c:3285
 msgid "      Backup/Restore directory (default) "
 msgstr ""
 
-#: src/preferences.c:3239
+#: src/preferences.c:3291
 msgid "      Temp directory (do not remove) "
 msgstr ""
 
-#: src/preferences.c:3252
+#: src/preferences.c:3304
 msgid "The default directory for loading video clips from"
 msgstr ""
 
-#: src/preferences.c:3277
+#: src/preferences.c:3329
 msgid "The default directory for saving encoded clips to"
 msgstr ""
 
-#: src/preferences.c:3285
+#: src/preferences.c:3337
 msgid "The default directory for loading and saving audio"
 msgstr ""
 
-#: src/preferences.c:3293
+#: src/preferences.c:3345
 msgid "The default directory for saving frameshots to"
 msgstr ""
 
-#: src/preferences.c:3301
+#: src/preferences.c:3353
 msgid "The default directory for backing up/restoring single clips"
 msgstr ""
 
-#: src/preferences.c:3309
+#: src/preferences.c:3361
 msgid "LiVES working directory."
 msgstr ""
 
-#: src/preferences.c:3359
+#: src/preferences.c:3412
 msgid "Directories"
 msgstr ""
 
-#: src/preferences.c:3374
+#: src/preferences.c:3427
 msgid "Warn if diskspace falls below: "
 msgstr ""
 
-#: src/preferences.c:3380 src/preferences.c:3394
+#: src/preferences.c:3433 src/preferences.c:3447
 msgid " MB [set to 0 to disable]"
 msgstr ""
 
-#: src/preferences.c:3389
+#: src/preferences.c:3442
 msgid "Diskspace critical level: "
 msgstr ""
 
-#: src/preferences.c:3407
+#: src/preferences.c:3461
 msgid ""
 "Warn on Insert / Merge if _frame rate of clipboard does not match frame rate "
 "of selection"
 msgstr ""
 
-#: src/preferences.c:3417
+#: src/preferences.c:3471
 msgid "Warn on Open if file _size exceeds "
 msgstr ""
 
-#: src/preferences.c:3425
+#: src/preferences.c:3479
 msgid " MB"
 msgstr ""
 
-#: src/preferences.c:3432
+#: src/preferences.c:3486
 msgid "Show a warning before saving a se_t"
 msgstr ""
 
-#: src/preferences.c:3442
+#: src/preferences.c:3496
 msgid ""
 "Show a warning if _mplayer/mplayer2, sox, composite or convert is not found "
 "when LiVES is started."
 msgstr ""
 
-#: src/preferences.c:3452
+#: src/preferences.c:3506
 msgid "Show a warning if no _rendered effects are found at startup."
 msgstr ""
 
-#: src/preferences.c:3464
+#: src/preferences.c:3518
 msgid "Show a warning if no _encoder plugins are found at startup."
 msgstr ""
 
-#: src/preferences.c:3474
+#: src/preferences.c:3528
 msgid "Show a warning if a _duplicate set name is entered."
 msgstr ""
 
-#: src/preferences.c:3485
+#: src/preferences.c:3539
 msgid "When a set is loaded, warn if clips are missing from _layouts."
 msgstr ""
 
-#: src/preferences.c:3495
+#: src/preferences.c:3550
 msgid "Warn if a clip used in a layout is about to be closed."
 msgstr ""
 
-#: src/preferences.c:3505
+#: src/preferences.c:3561
 msgid "Warn if frames used in a layout are about to be deleted."
 msgstr ""
 
-#: src/preferences.c:3515
+#: src/preferences.c:3572
 msgid "Warn if frames used in a layout are about to be shifted."
 msgstr ""
 
-#: src/preferences.c:3525
+#: src/preferences.c:3583
 msgid "Warn if frames used in a layout are about to be altered."
 msgstr ""
 
-#: src/preferences.c:3535
+#: src/preferences.c:3594
 msgid "Warn if audio used in a layout is about to be deleted."
 msgstr ""
 
-#: src/preferences.c:3546
+#: src/preferences.c:3606
 msgid "Warn if audio used in a layout is about to be shifted."
 msgstr ""
 
-#: src/preferences.c:3556
+#: src/preferences.c:3617
 msgid "Warn if audio used in a layout is about to be altered."
 msgstr ""
 
-#: src/preferences.c:3566
+#: src/preferences.c:3628
 msgid "Popup layout errors after clip changes."
 msgstr ""
 
-#: src/preferences.c:3577
+#: src/preferences.c:3639
 msgid "Warn if the layout has not been saved when leaving multitrack mode."
 msgstr ""
 
-#: src/preferences.c:3588
+#: src/preferences.c:3650
 msgid ""
 "Warn if multitrack has no audio channels, and a layout with audio is loaded."
 msgstr ""
 
-#: src/preferences.c:3598
+#: src/preferences.c:3660
 msgid ""
 "Warn if multitrack has audio channels, and your audio player is not \"jack\" "
 "or \"pulse audio\"."
 msgstr ""
 
-#: src/preferences.c:3610
+#: src/preferences.c:3672
 msgid "Show info message after importing from firewire device."
 msgstr ""
 
-#: src/preferences.c:3626
+#: src/preferences.c:3688
 msgid "Show a warning before opening a yuv4mpeg stream (advanced)."
 msgstr ""
 
-#: src/preferences.c:3639
+#: src/preferences.c:3701
 msgid "Show a warning when multitrack is low on backup space."
 msgstr ""
 
-#: src/preferences.c:3650
+#: src/preferences.c:3713
 msgid "Show a warning advising cleaning of disk space after a crash."
 msgstr ""
 
-#: src/preferences.c:3661
+#: src/preferences.c:3725
 msgid "Show a warning if unable to connect to pulseaudio player."
 msgstr ""
 
-#: src/preferences.c:3673
+#: src/preferences.c:3737
 msgid "Show a warning before wiping a layout which has unsaved changes."
 msgstr ""
 
-#: src/preferences.c:3685
+#: src/preferences.c:3749
 msgid "Warnings"
 msgstr ""
 
-#: src/preferences.c:3703
+#: src/preferences.c:3767
 msgid "Midi synch (requires the files midistart and midistop)"
 msgstr ""
 
-#: src/preferences.c:3715
+#: src/preferences.c:3779
 msgid "When inserting/merging frames:  "
 msgstr ""
 
-#: src/preferences.c:3719
+#: src/preferences.c:3783
 msgid "_Speed Up/Slow Down Insertion"
 msgstr ""
 
-#: src/preferences.c:3723
+#: src/preferences.c:3787
 msgid "_Resample Insertion"
 msgstr ""
 
-#: src/preferences.c:3730
+#: src/preferences.c:3794
 msgid "CD device           "
 msgstr ""
 
-#: src/preferences.c:3733
+#: src/preferences.c:3797
 msgid "LiVES can load audio tracks from this CD"
 msgstr ""
 
-#: src/preferences.c:3746
+#: src/preferences.c:3813
 msgid "Default FPS        "
 msgstr ""
 
-#: src/preferences.c:3749
+#: src/preferences.c:3816
 msgid "Frames per second to use when none is specified"
 msgstr ""
 
-#: src/preferences.c:3757
+#: src/preferences.c:3825
 msgid "Misc"
 msgstr ""
 
-#: src/preferences.c:3782
+#: src/preferences.c:3850
 msgid "New theme:           "
 msgstr ""
 
-#: src/preferences.c:3800
+#: src/preferences.c:3867
 msgid "Themes"
 msgstr ""
 
-#: src/preferences.c:3815
+#: src/preferences.c:3882
 msgid "Download bandwidth (Kb/s)       "
 msgstr ""
 
-#: src/preferences.c:3823
+#: src/preferences.c:3890
 msgid "LiVES must be compiled without \"configure --disable-OSC\" to use OMC"
 msgstr ""
 
-#: src/preferences.c:3833
+#: src/preferences.c:3900
 msgid "OMC remote control enabled"
 msgstr ""
 
-#: src/preferences.c:3841
+#: src/preferences.c:3908
 msgid "UDP port       "
 msgstr ""
 
-#: src/preferences.c:3850
+#: src/preferences.c:3917
 msgid "Start OMC on startup"
 msgstr ""
 
-#: src/preferences.c:3870
+#: src/preferences.c:3937
 msgid "Streaming/Networking"
 msgstr ""
 
-#: src/preferences.c:3882
+#: src/preferences.c:3949
 msgid "Jack transport"
 msgstr ""
 
-#: src/preferences.c:3886
+#: src/preferences.c:3953
 msgid ""
 "LiVES must be compiled with jack/transport.h and jack/jack.h present to use "
 "jack transport"
 msgstr ""
 
-#: src/preferences.c:3892
+#: src/preferences.c:3959
 msgid "Jack _transport config file"
 msgstr ""
 
-#: src/preferences.c:3899 src/preferences.c:3989
+#: src/preferences.c:3967 src/preferences.c:4058
 msgid "Start _server on LiVES startup"
 msgstr ""
 
-#: src/preferences.c:3911
+#: src/preferences.c:3979
 msgid "Jack transport _master (start and stop)"
 msgstr ""
 
-#: src/preferences.c:3921
+#: src/preferences.c:3989
 msgid "Jack transport _client (start and stop)"
 msgstr ""
 
-#: src/preferences.c:3935
+#: src/preferences.c:4003
 msgid "Jack transport sets start position"
 msgstr ""
 
-#: src/preferences.c:3952
+#: src/preferences.c:4020
 msgid "Jack transport timebase slave"
 msgstr ""
 
-#: src/preferences.c:3963
+#: src/preferences.c:4031
 msgid "(See also Playback -> Audio follows video rate/direction)"
 msgstr ""
 
-#: src/preferences.c:3971
+#: src/preferences.c:4039
 msgid "Jack audio"
 msgstr ""
 
-#: src/preferences.c:3975
+#: src/preferences.c:4043
 msgid "LiVES must be compiled with jack/jack.h present to use jack audio"
 msgstr ""
 
-#: src/preferences.c:3978
+#: src/preferences.c:4046
 msgid ""
 "You MUST set the audio player to \"jack\" in the Playback tab to use jack "
 "audio"
 msgstr ""
 
-#: src/preferences.c:3984
+#: src/preferences.c:4052
 msgid "Jack _audio server config file"
 msgstr ""
 
-#: src/preferences.c:3996
+#: src/preferences.c:4065
 msgid "Play audio even when transport is _paused"
 msgstr ""
 
-#: src/preferences.c:4008
+#: src/preferences.c:4077
 msgid "Automatically connect to System Out ports when 'playing' External Audio"
 msgstr ""
 
-#: src/preferences.c:4021
+#: src/preferences.c:4090
 msgid "Jack Integration"
 msgstr ""
 
-#: src/preferences.c:4035
+#: src/preferences.c:4104
 msgid "Events to respond to:"
 msgstr ""
 
-#: src/preferences.c:4044
+#: src/preferences.c:4113
 msgid "_Joystick events"
 msgstr ""
 
-#: src/preferences.c:4051
+#: src/preferences.c:4120
 msgid "_Joystick device"
 msgstr ""
 
-#: src/preferences.c:4053
+#: src/preferences.c:4122
 msgid "The joystick device, e.g. /dev/input/js0"
 msgstr ""
 
-#: src/preferences.c:4071
+#: src/preferences.c:4142
 msgid "_MIDI events"
 msgstr ""
 
-#: src/preferences.c:4080
+#: src/preferences.c:4151
 msgid "Use _ALSA MIDI (recommended)"
 msgstr ""
 
-#: src/preferences.c:4082
+#: src/preferences.c:4153
 msgid "Create an ALSA MIDI port which other MIDI devices can be connected to"
 msgstr ""
 
-#: src/preferences.c:4090
+#: src/preferences.c:4162
 msgid "Use _raw MIDI"
 msgstr ""
 
-#: src/preferences.c:4092
+#: src/preferences.c:4164
 msgid "Read directly from the MIDI device"
 msgstr ""
 
-#: src/preferences.c:4104
+#: src/preferences.c:4177
 msgid "_MIDI device"
 msgstr ""
 
-#: src/preferences.c:4106
+#: src/preferences.c:4179
 msgid "The MIDI device, e.g. /dev/input/midi0"
 msgstr ""
 
-#: src/preferences.c:4118
+#: src/preferences.c:4193
 msgid "Advanced"
 msgstr ""
 
-#: src/preferences.c:4124
+#: src/preferences.c:4199
 msgid "MIDI check _rate"
 msgstr ""
 
-#: src/preferences.c:4127
+#: src/preferences.c:4203
 msgid ""
 "Number of MIDI checks per keyboard tick. Increasing this may improve MIDI "
 "responsiveness, but may slow down playback."
 msgstr ""
 
-#: src/preferences.c:4134
+#: src/preferences.c:4211
 msgid "MIDI repeat"
 msgstr ""
 
-#: src/preferences.c:4137
+#: src/preferences.c:4214
 msgid "Number of non-reads allowed between succesive reads."
 msgstr ""
 
-#: src/preferences.c:4140
+#: src/preferences.c:4218
 msgid "(Warning: setting this value too high can slow down playback.)"
 msgstr ""
 
-#: src/preferences.c:4159
+#: src/preferences.c:4237
 msgid "MIDI/Joystick learner"
 msgstr ""
 
-#: src/preferences.c:4499
+#: src/preferences.c:4679
 msgid ""
 "\n"
 "LiVES will now shut down. You need to restart it for the directory change to "
@@ -7554,214 +7567,214 @@
 "Click OK to continue.\n"
 msgstr ""
 
-#: src/preferences.c:4523
+#: src/preferences.c:4703
 msgid ""
 "For the directory change to take effect LiVES will restart when preferences "
 "dialog closes."
 msgstr ""
 
-#: src/preferences.c:4527
+#: src/preferences.c:4707
 msgid "Theme changes will not take effect until the next time you start LiVES."
 msgstr ""
 
-#: src/preferences.c:4531
+#: src/preferences.c:4711
 msgid "Jack options will not take effect until the next time you start LiVES."
 msgstr ""
 
-#: src/osc.c:2585
+#: src/osc.c:2616
 #, c-format
 msgid "Syncing to external framerate of %.8f frames per second.\n"
 msgstr ""
 
-#: src/osc.c:6746
+#: src/osc.c:6938
 msgid "Cannot initialize OSC receiver\n"
 msgstr ""
 
-#: src/osc.c:6770
+#: src/osc.c:6961
 #, c-format
 msgid "WARNING: Cannot start OSC server at UDP port %d\n"
 msgstr ""
 
-#: src/osc.c:6775
+#: src/osc.c:6963
 #, c-format
 msgid "Started OSC server at UDP port %d\n"
 msgstr ""
 
-#: src/osc.c:6890
+#: src/osc.c:7076
 #, c-format
 msgid "Cannot start OSC/UDP server at port %d \n"
 msgstr ""
 
-#: src/resample.c:125 src/resample.c:304
+#: src/resample.c:131 src/resample.c:305
 #, c-format
 msgid "Resizing frames 1 to %d"
 msgstr ""
 
-#: src/resample.c:140 src/resample.c:318
+#: src/resample.c:145 src/resample.c:318
 #, c-format
 msgid "Resizing/letterboxing frames 1 to %d"
 msgstr ""
 
-#: src/resample.c:361 src/resample.c:385
+#: src/resample.c:360 src/resample.c:384
 msgid "Resize"
 msgstr ""
 
-#: src/resample.c:395
+#: src/resample.c:394
 msgid "Resample/Resize"
 msgstr ""
 
-#: src/resample.c:680
+#: src/resample.c:676
 #, c-format
 msgid "Length of video is now %d frames.\n"
 msgstr ""
 
-#: src/resample.c:745
+#: src/resample.c:737
 msgid ""
 "\n"
 "\n"
 "New rate must be greater than 0\n"
 msgstr ""
 
-#: src/resample.c:797 src/resample.c:813
+#: src/resample.c:788 src/resample.c:803
 msgid "Resampling audio"
 msgstr ""
 
-#: src/resample.c:831
+#: src/resample.c:821
 msgid "LiVES was unable to resample the audio as requested.\n"
 msgstr ""
 
-#: src/resample.c:833 src/resample.c:837
+#: src/resample.c:823 src/resample.c:827
 msgid "Resample Audio"
 msgstr ""
 
-#: src/resample.c:845
+#: src/resample.c:835
 #, c-format
 msgid "Audio was resampled to %d Hz, %d channels, %d bit"
 msgstr ""
 
-#: src/resample.c:1034
+#: src/resample.c:1016
 #, c-format
 msgid "Resampling video at %.8f frames per second..."
 msgstr ""
 
-#: src/resample.c:1037
+#: src/resample.c:1018
 #, c-format
 msgid "Resampling video at %.3f frames per second..."
 msgstr ""
 
-#: src/resample.c:1068
+#: src/resample.c:1049
 msgid "Reordering error !\n"
 msgstr ""
 
-#: src/resample.c:1079
+#: src/resample.c:1060
 msgid "Resample"
 msgstr ""
 
-#: src/resample.c:1192
+#: src/resample.c:1173
 msgid "LiVES: - Resample Audio"
 msgstr ""
 
-#: src/resample.c:1195
+#: src/resample.c:1175
 msgid "LiVES: - Insert Silence"
 msgstr ""
 
-#: src/resample.c:1198
+#: src/resample.c:1177
 msgid "LiVES: - New Clip Audio"
 msgstr ""
 
-#: src/resample.c:1201
+#: src/resample.c:1179
 msgid "LiVES: - External Clip Settings"
 msgstr ""
 
-#: src/resample.c:1238 src/resample.c:1358
+#: src/resample.c:1215 src/resample.c:1332
 msgid "Rate (Hz) "
 msgstr ""
 
-#: src/resample.c:1245 src/resample.c:1372
+#: src/resample.c:1222 src/resample.c:1346
 msgid "Channels"
 msgstr ""
 
-#: src/resample.c:1252
+#: src/resample.c:1229
 msgid "Sample Size "
 msgstr ""
 
-#: src/resample.c:1268 src/resample.c:1425
+#: src/resample.c:1245 src/resample.c:1399
 msgid "Signed"
 msgstr ""
 
-#: src/resample.c:1274 src/resample.c:1435
+#: src/resample.c:1251 src/resample.c:1409
 msgid "Unsigned"
 msgstr ""
 
-#: src/resample.c:1297 src/resample.c:1460
+#: src/resample.c:1273 src/resample.c:1433
 msgid "Little Endian"
 msgstr ""
 
-#: src/resample.c:1303 src/resample.c:1468
+#: src/resample.c:1279 src/resample.c:1441
 msgid "Big Endian"
 msgstr ""
 
-#: src/resample.c:1315
+#: src/resample.c:1290
 msgid "Current"
 msgstr ""
 
-#: src/resample.c:1340
+#: src/resample.c:1315
 msgid "_Enable audio"
 msgstr ""
 
-#: src/resample.c:1372
+#: src/resample.c:1346
 msgid "_Channels"
 msgstr ""
 
-#: src/resample.c:1394
+#: src/resample.c:1368
 msgid "_Sample Size"
 msgstr ""
 
-#: src/resample.c:1394
+#: src/resample.c:1368
 msgid "Sample Size"
 msgstr ""
 
-#: src/resample.c:1489
+#: src/resample.c:1461
 msgid "New"
 msgstr ""
 
-#: src/resample.c:1512
+#: src/resample.c:1484
 msgid "_Frames Per Second "
 msgstr ""
 
-#: src/resample.c:1530
+#: src/resample.c:1502
 msgid "Record for maximum:  "
 msgstr ""
 
-#: src/resample.c:1533
+#: src/resample.c:1505
 msgid " hours  "
 msgstr ""
 
-#: src/resample.c:1536
+#: src/resample.c:1508
 msgid " minutes  "
 msgstr ""
 
-#: src/resample.c:1538
+#: src/resample.c:1510
 msgid " seconds  "
 msgstr ""
 
-#: src/resample.c:1545
+#: src/resample.c:1517
 msgid "Unlimited"
 msgstr ""
 
-#: src/resample.c:1561
+#: src/resample.c:1533
 msgid "Click OK to begin recording, or Cancel to quit."
 msgstr ""
 
-#: src/resample.c:1670
+#: src/resample.c:1638
 msgid "LiVES: - Change playback speed"
 msgstr ""
 
-#: src/resample.c:1673
+#: src/resample.c:1640
 msgid "LiVES: - Resample Video"
 msgstr ""
 
-#: src/resample.c:1696
+#: src/resample.c:1663
 #, c-format
 msgid ""
 "\n"
@@ -7772,7 +7785,7 @@
 "in _frames per second"
 msgstr ""
 
-#: src/resample.c:1701
+#: src/resample.c:1667
 #, c-format
 msgid ""
 "\n"
@@ -7783,89 +7796,89 @@
 "in frames per second"
 msgstr ""
 
-#: src/resample.c:1723
+#: src/resample.c:1688
 msgid "OR enter the desired clip length in _seconds"
 msgstr ""
 
-#: src/resample.c:1745
+#: src/resample.c:1710
 msgid "Change the _audio speed as well"
 msgstr ""
 
-#: src/resample.c:1846
+#: src/resample.c:1810
 msgid ""
 "\n"
 "Speeding up the clip will cause missing frames in some multitrack layouts.\n"
 "Are you sure you wish to change the speed ?\n"
 msgstr ""
 
-#: src/resample.c:1863
+#: src/resample.c:1829
 msgid ""
 "\n"
 "Speeding up the clip will cause missing audio in some multitrack layouts.\n"
 "Are you sure you wish to change the speed ?\n"
 msgstr ""
 
-#: src/resample.c:1878
+#: src/resample.c:1847
 msgid ""
 "\n"
 "Changing the speed will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/resample.c:1892
+#: src/resample.c:1863
 msgid ""
 "\n"
 "Changing the speed will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/resample.c:1938
+#: src/resample.c:1911
 msgid "Speed Change"
 msgstr ""
 
-#: src/resample.c:1947
+#: src/resample.c:1920
 #, c-format
 msgid "Changed playback speed to %.3f frames per second and audio to %d Hz.\n"
 msgstr ""
 
-#: src/resample.c:1950
+#: src/resample.c:1922
 #, c-format
 msgid "Changed playback speed to %.3f frames per second.\n"
 msgstr ""
 
-#: src/resample.c:2035
+#: src/resample.c:2006
 msgid "Resampling video"
 msgstr ""
 
-#: src/resample.c:2042 src/resample.c:2160 src/resample.c:2182
+#: src/resample.c:2012 src/resample.c:2127 src/resample.c:2148
 msgid "Resampling clipboard video"
 msgstr ""
 
-#: src/resample.c:2047
+#: src/resample.c:2016
 msgid "Reordering frames"
 msgstr ""
 
-#: src/resample.c:2056
+#: src/resample.c:2025
 msgid ""
 "\n"
 "\n"
 "LiVES was unable to reorder the frames."
 msgstr ""
 
-#: src/resample.c:2104
+#: src/resample.c:2071
 msgid "Deordering frames"
 msgstr ""
 
-#: src/resample.c:2199
+#: src/resample.c:2165
 msgid "resampling error..."
 msgstr ""
 
-#: src/rte_window.c:85 src/rte_window.c:1708
+#: src/rte_window.c:124 src/rte_window.c:1709
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
-#: src/rte_window.c:112
+#: src/rte_window.c:150
 msgid ""
 "\n"
 "\n"
@@ -7875,7 +7888,7 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:426
+#: src/rte_window.c:460
 msgid ""
 "\n"
 "\n"
@@ -7883,19 +7896,19 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:432
+#: src/rte_window.c:466
 #, c-format
 msgid "Saving keymap to %s\n"
 msgstr ""
 
-#: src/rte_window.c:439
+#: src/rte_window.c:471
 #, c-format
 msgid ""
 "\n"
 "Updating keymap file %s..."
 msgstr ""
 
-#: src/rte_window.c:446
+#: src/rte_window.c:477
 #, c-format
 msgid ""
 "\n"
@@ -7905,12 +7918,12 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/rte_window.c:526
+#: src/rte_window.c:556
 #, c-format
 msgid "Saving real time effect defaults to %s..."
 msgstr ""
 
-#: src/rte_window.c:535
+#: src/rte_window.c:563
 #, c-format
 msgid ""
 "\n"
@@ -7920,22 +7933,22 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/rte_window.c:632
+#: src/rte_window.c:657
 #, c-format
 msgid "Loading real time effect defaults from %s..."
 msgstr ""
 
-#: src/rte_window.c:681
+#: src/rte_window.c:701
 #, c-format
 msgid "Loading generator default sizes from %s..."
 msgstr ""
 
-#: src/rte_window.c:1306
+#: src/rte_window.c:1319
 #, c-format
 msgid "Loading default keymap from %s..."
 msgstr ""
 
-#: src/rte_window.c:1329
+#: src/rte_window.c:1339
 #, c-format
 msgid ""
 "\n"
@@ -7945,48 +7958,48 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/rte_window.c:1403
+#: src/rte_window.c:1412
 #, c-format
 msgid "Invalid line %d in %s\n"
 msgstr ""
 
-#: src/rte_window.c:1483
+#: src/rte_window.c:1490
 #, c-format
 msgid "Invalid key %d in %s\n"
 msgstr ""
 
-#: src/rte_window.c:1498
+#: src/rte_window.c:1505
 #, c-format
 msgid "Invalid effect %s in %s\n"
 msgstr ""
 
-#: src/rte_window.c:1517
+#: src/rte_window.c:1524
 #, c-format
 msgid "Unknown effect %s in %s\n"
 msgstr ""
 
-#: src/rte_window.c:1535
+#: src/rte_window.c:1542
 #, c-format
 msgid ""
 "This version of LiVES cannot mix generators/non-generators on the same key "
 "(%d) !\n"
 msgstr ""
 
-#: src/rte_window.c:1547
+#: src/rte_window.c:1554
 #, c-format
 msgid "Too many effects bound to key %d.\n"
 msgstr ""
 
-#: src/rte_window.c:1587
+#: src/rte_window.c:1593
 msgid "update required.\n"
 msgstr ""
 
-#: src/rte_window.c:1603
+#: src/rte_window.c:1607
 #, c-format
 msgid "Loading data connection map from %s..."
 msgstr ""
 
-#: src/rte_window.c:1612
+#: src/rte_window.c:1614
 msgid ""
 "\n"
 "\n"
@@ -7994,41 +8007,41 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:1691
+#: src/rte_window.c:1692
 #, c-format
 msgid "LiVES: Information for %s"
 msgstr ""
 
-#: src/rte_window.c:1704
+#: src/rte_window.c:1705
 #, c-format
 msgid "Effect name: %s"
 msgstr ""
 
-#: src/rte_window.c:1712
+#: src/rte_window.c:1713
 #, c-format
 msgid "Plugin name: %s"
 msgstr ""
 
-#: src/rte_window.c:1716
+#: src/rte_window.c:1717
 #, c-format
 msgid "Author: %s"
 msgstr ""
 
-#: src/rte_window.c:1721
+#: src/rte_window.c:1722
 #, c-format
 msgid "and: %s"
 msgstr ""
 
-#: src/rte_window.c:1726
+#: src/rte_window.c:1727
 #, c-format
 msgid "Version: %d"
 msgstr ""
 
-#: src/rte_window.c:1734
+#: src/rte_window.c:1735
 msgid "Description: "
 msgstr ""
 
-#: src/rte_window.c:1960
+#: src/rte_window.c:1963
 msgid ""
 "\n"
 "\n"
@@ -8037,69 +8050,69 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:2024
+#: src/rte_window.c:2027
 #, c-format
 msgid "LiVES could not locate the effect %s.\n"
 msgstr ""
 
-#: src/rte_window.c:2225
+#: src/rte_window.c:2216
 msgid "LiVES: Real time effect mapping"
 msgstr ""
 
-#: src/rte_window.c:2257
+#: src/rte_window.c:2248
 #, c-format
 msgid "Ctrl-%d"
 msgstr ""
 
-#: src/rte_window.c:2264
+#: src/rte_window.c:2255
 msgid "Key active"
 msgstr ""
 
-#: src/rte_window.c:2279
+#: src/rte_window.c:2271
 msgid "Key grab"
 msgstr ""
 
-#: src/rte_window.c:2280
+#: src/rte_window.c:2272
 msgid "Grab keyboard for this effect key"
 msgstr ""
 
-#: src/rte_window.c:2290
+#: src/rte_window.c:2283
 msgid "_Clear all effects"
 msgstr ""
 
-#: src/rte_window.c:2304
+#: src/rte_window.c:2297
 msgid "Mode active"
 msgstr ""
 
-#: src/rte_window.c:2314 src/multitrack.c:8568
+#: src/rte_window.c:2307 src/multitrack.c:8762
 msgid "Info"
 msgstr ""
 
-#: src/rte_window.c:2315
+#: src/rte_window.c:2308
 msgid "Set Parameters"
 msgstr ""
 
-#: src/rte_window.c:2316
+#: src/rte_window.c:2309
 msgid "Set Connections"
 msgstr ""
 
-#: src/rte_window.c:2317
+#: src/rte_window.c:2310
 msgid "Clear"
 msgstr ""
 
-#: src/rte_window.c:2326
+#: src/rte_window.c:2319
 msgid "Effect name:"
 msgstr ""
 
-#: src/rte_window.c:2391
+#: src/rte_window.c:2384
 msgid "_Save as default keymap"
 msgstr ""
 
-#: src/rte_window.c:2396
+#: src/rte_window.c:2389
 msgid "_Load default keymap"
 msgstr ""
 
-#: src/rte_window.c:2840
+#: src/rte_window.c:2833
 #, c-format
 msgid ""
 "Unable to create default keymap file: %s\n"
@@ -8157,86 +8170,86 @@
 msgid "none\n"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:494
+#: src/lives-yuv4mpeg.c:493
 #, c-format
 msgid ""
 "Unable to set display framerate to %.3f fps.\n"
 "\n"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:503
+#: src/lives-yuv4mpeg.c:502
 #, c-format
 msgid "Unable to open yuv4mpeg out stream %s\n"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:628
+#: src/lives-yuv4mpeg.c:626
 #, c-format
 msgid "TV card %d"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:713
+#: src/lives-yuv4mpeg.c:710
 #, c-format
 msgid "Opened TV card %d (%s)"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:760
+#: src/lives-yuv4mpeg.c:757
 #, c-format
 msgid "Firewire card %d"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:796
+#: src/lives-yuv4mpeg.c:793
 #, c-format
 msgid "Opened firewire card %d"
 msgstr ""
 
-#: src/multitrack.c:666
+#: src/multitrack.c:736
 msgid "Auto backup"
 msgstr ""
 
-#: src/multitrack.c:868
+#: src/multitrack.c:935
 msgid "Backing audio"
 msgstr ""
 
-#: src/multitrack.c:1435
+#: src/multitrack.c:1515
 #, c-format
 msgid "%s : parameters for %s"
 msgstr ""
 
-#: src/multitrack.c:1809 src/multitrack.c:3483
+#: src/multitrack.c:1881 src/multitrack.c:3635
 #, c-format
 msgid "Current track: %s (layer %d)\n"
 msgstr ""
 
-#: src/multitrack.c:1813 src/multitrack.c:3484
+#: src/multitrack.c:1885 src/multitrack.c:3637
 msgid "Current track: Backing audio\n"
 msgstr ""
 
-#: src/multitrack.c:1814
+#: src/multitrack.c:1886
 #, c-format
 msgid "Current track: Layer %d audio\n"
 msgstr ""
 
-#: src/multitrack.c:1817
+#: src/multitrack.c:1889
 #, c-format
 msgid "%.2f sec.\n"
 msgstr ""
 
-#: src/multitrack.c:1822 src/multitrack.c:3490
+#: src/multitrack.c:1894 src/multitrack.c:3643
 #, c-format
 msgid "Source: %s"
 msgstr ""
 
-#: src/multitrack.c:1825 src/multitrack.c:3492
+#: src/multitrack.c:1897 src/multitrack.c:3645
 msgid "Right click for context menu.\n"
 msgstr ""
 
-#: src/multitrack.c:1827
+#: src/multitrack.c:1899
 msgid ""
 "Double click on a block\n"
 "to select it."
 msgstr ""
 
-#: src/multitrack.c:3312
+#: src/multitrack.c:3452
 msgid ""
 "\n"
 "\n"
@@ -8245,7 +8258,7 @@
 "right or double clicking on it.\n"
 msgstr ""
 
-#: src/multitrack.c:3315
+#: src/multitrack.c:3455
 msgid ""
 "\n"
 "\n"
@@ -8253,14 +8266,14 @@
 "Select an effect in FX stack first to view its parameters.\n"
 msgstr ""
 
-#: src/multitrack.c:3318
+#: src/multitrack.c:3458
 msgid ""
 "\n"
 "\n"
 "No clips loaded.\n"
 msgstr ""
 
-#: src/multitrack.c:3321
+#: src/multitrack.c:3462
 msgid ""
 "You must select two video tracks\n"
 "and a time region\n"
@@ -8270,7 +8283,7 @@
 "before inserting clips into the timeline."
 msgstr ""
 
-#: src/multitrack.c:3324
+#: src/multitrack.c:3465
 msgid ""
 "\n"
 "\n"
@@ -8279,210 +8292,210 @@
 "to apply compositors.\n"
 msgstr ""
 
-#: src/multitrack.c:3487
+#: src/multitrack.c:3640
 #, c-format
 msgid "%.2f sec. to %.2f sec.\n"
 msgstr ""
 
-#: src/multitrack.c:3493
+#: src/multitrack.c:3646
 msgid ""
 "Single click on timeline\n"
 "to select a frame.\n"
 msgstr ""
 
-#: src/multitrack.c:3711 src/multitrack.c:6790
+#: src/multitrack.c:3858 src/multitrack.c:6972
 #, c-format
 msgid "%s [unstable]"
 msgstr ""
 
-#: src/multitrack.c:3822
+#: src/multitrack.c:3973
 msgid ""
 "You can click and drag\n"
 "below the timeline"
 msgstr ""
 
-#: src/multitrack.c:3823
+#: src/multitrack.c:3974
 msgid "to select a time region.\n"
 msgstr ""
 
-#: src/multitrack.c:3985
+#: src/multitrack.c:4137
 msgid "LiVES: Selected clip"
 msgstr ""
 
-#: src/multitrack.c:3993
+#: src/multitrack.c:4145
 msgid "_Adjust start and end points"
 msgstr ""
 
-#: src/multitrack.c:4002
+#: src/multitrack.c:4154
 msgid "_Edit/encode in clip editor"
 msgstr ""
 
-#: src/multitrack.c:4009
+#: src/multitrack.c:4161
 msgid "_Show clip information"
 msgstr ""
 
-#: src/multitrack.c:4016
+#: src/multitrack.c:4168
 msgid "_Close this clip"
 msgstr ""
 
-#: src/multitrack.c:4236
+#: src/multitrack.c:4388
 msgid "Audio mixer (ctrl-m)"
 msgstr ""
 
-#: src/multitrack.c:4336
+#: src/multitrack.c:4488
 msgid "Single click on timeline"
 msgstr ""
 
-#: src/multitrack.c:4337
+#: src/multitrack.c:4489
 msgid "to select a frame."
 msgstr ""
 
-#: src/multitrack.c:4338
+#: src/multitrack.c:4490
 msgid "Double click or right click on timeline"
 msgstr ""
 
-#: src/multitrack.c:4339
+#: src/multitrack.c:4491
 msgid "to select a block."
 msgstr ""
 
-#: src/multitrack.c:4340
+#: src/multitrack.c:4492
 msgid "Clips can be dragged"
 msgstr ""
 
-#: src/multitrack.c:4341
+#: src/multitrack.c:4493
 msgid "onto the timeline."
 msgstr ""
 
-#: src/multitrack.c:4343
+#: src/multitrack.c:4495
 msgid "Mouse mode is: Move"
 msgstr ""
 
-#: src/multitrack.c:4344
+#: src/multitrack.c:4496
 msgid "clips can be moved around."
 msgstr ""
 
-#: src/multitrack.c:4349
+#: src/multitrack.c:4500
 msgid "Mouse mode is: Select."
 msgstr ""
 
-#: src/multitrack.c:4350
+#: src/multitrack.c:4501
 msgid "Drag with mouse on timeline"
 msgstr ""
 
-#: src/multitrack.c:4351
+#: src/multitrack.c:4502
 msgid "to select tracks and time."
 msgstr ""
 
-#: src/multitrack.c:4362
+#: src/multitrack.c:4509
 msgid "_Insert mode: Normal"
 msgstr ""
 
-#: src/multitrack.c:4378
+#: src/multitrack.c:4537
 msgid "_Mouse mode: Move"
 msgstr ""
 
-#: src/multitrack.c:4382
+#: src/multitrack.c:4540
 msgid "_Mouse mode: Select"
 msgstr ""
 
-#: src/multitrack.c:4405 src/multitrack.c:7925
+#: src/multitrack.c:4563 src/multitrack.c:8104
 msgid "Gravity: Normal"
 msgstr ""
 
-#: src/multitrack.c:4409
+#: src/multitrack.c:4565
 msgid "Gravity: Left"
 msgstr ""
 
-#: src/multitrack.c:4414
+#: src/multitrack.c:4569
 msgid "Gravity: Right"
 msgstr ""
 
-#: src/multitrack.c:4416
+#: src/multitrack.c:4570
 msgid "Close _last gap(s) in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:4419
+#: src/multitrack.c:4572
 msgid "Close _first gap(s) in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:4458
+#: src/multitrack.c:4627
 msgid "Close gaps"
 msgstr ""
 
-#: src/multitrack.c:4460
+#: src/multitrack.c:4629
 msgid "Move block"
 msgstr ""
 
-#: src/multitrack.c:4462
+#: src/multitrack.c:4631
 msgid "Move audio block"
 msgstr ""
 
-#: src/multitrack.c:4464
+#: src/multitrack.c:4633
 msgid "Delete block"
 msgstr ""
 
-#: src/multitrack.c:4466
+#: src/multitrack.c:4635
 msgid "Delete audio block"
 msgstr ""
 
-#: src/multitrack.c:4468
+#: src/multitrack.c:4637
 msgid "Split tracks"
 msgstr ""
 
-#: src/multitrack.c:4470
+#: src/multitrack.c:4639
 msgid "Split block"
 msgstr ""
 
-#: src/multitrack.c:4473
+#: src/multitrack.c:4642
 #, c-format
 msgid "Apply %s"
 msgstr ""
 
-#: src/multitrack.c:4478
+#: src/multitrack.c:4647
 #, c-format
 msgid "Delete %s"
 msgstr ""
 
-#: src/multitrack.c:4482
+#: src/multitrack.c:4651
 msgid "Insert block"
 msgstr ""
 
-#: src/multitrack.c:4484
+#: src/multitrack.c:4653
 msgid "Insert gap"
 msgstr ""
 
-#: src/multitrack.c:4486
+#: src/multitrack.c:4655
 msgid "Insert audio block"
 msgstr ""
 
-#: src/multitrack.c:4488
+#: src/multitrack.c:4657
 msgid "Effect order change"
 msgstr ""
 
-#: src/multitrack.c:4898
+#: src/multitrack.c:5064
 msgid "unsigned "
 msgstr ""
 
-#: src/multitrack.c:4899
+#: src/multitrack.c:5065
 msgid "signed "
 msgstr ""
 
-#: src/multitrack.c:4904
+#: src/multitrack.c:5071
 #, c-format
 msgid ""
 "Multitrack values set to %.3f fps, frame size %d x %d, audio channels %d, "
 "audio rate %d, audio sample size %d, %s.\n"
 msgstr ""
 
-#: src/multitrack.c:4938
+#: src/multitrack.c:5104
 msgid "invalid event list. Failed.\n"
 msgstr ""
 
-#: src/multitrack.c:4944
+#: src/multitrack.c:5110
 msgid "event list has invalid fps. Failed.\n"
 msgstr ""
 
-#: src/multitrack.c:4953
+#: src/multitrack.c:5122
 #, c-format
 msgid ""
 "\n"
@@ -8492,7 +8505,7 @@
 "then load in the new set from the File menu.\n"
 msgstr ""
 
-#: src/multitrack.c:4993
+#: src/multitrack.c:5163
 #, c-format
 msgid ""
 "\n"
@@ -8500,600 +8513,592 @@
 "It cannot be loaded.\n"
 msgstr ""
 
-#: src/multitrack.c:5329 src/multitrack.c:5338 src/multitrack.c:21133
+#: src/multitrack.c:5452
 msgid "Layout was wiped.\n"
 msgstr ""
 
-#: src/multitrack.c:5374
+#: src/multitrack.c:5547
 #, c-format
 msgid "LiVES-%s: Multitrack %dx%d : %d bpp %.3f fps"
 msgstr ""
 
-#: src/multitrack.c:5617
+#: src/multitrack.c:5793
 msgid "In/out"
 msgstr ""
 
-#: src/multitrack.c:5619
+#: src/multitrack.c:5795
 msgid "FX stack"
 msgstr ""
 
-#: src/multitrack.c:5627 src/omc-learn.c:673
+#: src/multitrack.c:5803 src/omc-learn.c:659
 msgid "Params."
 msgstr ""
 
-#: src/multitrack.c:5978
+#: src/multitrack.c:6157
 msgid "_Open..."
 msgstr ""
 
-#: src/multitrack.c:5996
+#: src/multitrack.c:6175
 msgid "O_pen File Selection..."
 msgstr ""
 
-#: src/multitrack.c:6040
+#: src/multitrack.c:6219
 msgid "Import Selection from _dvd/vcd..."
 msgstr ""
 
-#: src/multitrack.c:6050
+#: src/multitrack.c:6229
 msgid "Import Selection from _dvd"
 msgstr ""
 
-#: src/multitrack.c:6060
+#: src/multitrack.c:6239
 msgid "Import Selection from _vcd"
 msgstr ""
 
-#: src/multitrack.c:6076
+#: src/multitrack.c:6255
 msgid "_Import from Device"
 msgstr ""
 
-#: src/multitrack.c:6103
+#: src/multitrack.c:6282
 msgid "_Close the selected clip"
 msgstr ""
 
-#: src/multitrack.c:6198
+#: src/multitrack.c:6377
 msgid "_Save layout as..."
 msgstr ""
 
-#: src/multitrack.c:6206
+#: src/multitrack.c:6385
 msgid "_Load layout..."
 msgstr ""
 
-#: src/multitrack.c:6210
+#: src/multitrack.c:6389
 msgid "_Wipe/Delete layout..."
 msgstr ""
 
-#: src/multitrack.c:6236
+#: src/multitrack.c:6415
 msgid "_Ignore width, height and audio values from loaded layouts"
 msgstr ""
 
-#: src/multitrack.c:6240
+#: src/multitrack.c:6419
 msgid "Auto load _subtitles with clips"
 msgstr ""
 
-#: src/multitrack.c:6322
+#: src/multitrack.c:6501
 msgid "_CLIP EDITOR"
 msgstr ""
 
-#: src/multitrack.c:6334
+#: src/multitrack.c:6513
 msgid "_Adjust selected clip start/end points"
 msgstr ""
 
-#: src/multitrack.c:6343
+#: src/multitrack.c:6522
 msgid "_Insert selected clip"
 msgstr ""
 
-#: src/multitrack.c:6355
+#: src/multitrack.c:6534
 msgid "_Insert selected clip audio"
 msgstr ""
 
-#: src/multitrack.c:6364
+#: src/multitrack.c:6543
 msgid "_Delete selected block"
 msgstr ""
 
-#: src/multitrack.c:6373
+#: src/multitrack.c:6555
 msgid "_Jump to previous block boundary"
 msgstr ""
 
-#: src/multitrack.c:6382
+#: src/multitrack.c:6564
 msgid "_Jump to next block boundary"
 msgstr ""
 
-#: src/multitrack.c:6395
+#: src/multitrack.c:6577
 msgid "Clear _marks from timeline"
 msgstr ""
 
-#: src/multitrack.c:6403
+#: src/multitrack.c:6585
 msgid "Ignore selection limits when inserting"
 msgstr ""
 
-#: src/multitrack.c:6420 src/multitrack.c:16719
+#: src/multitrack.c:6602 src/multitrack.c:17009
 msgid "_Play from Timeline Position"
 msgstr ""
 
-#: src/multitrack.c:6434
+#: src/multitrack.c:6616
 msgid "Pla_y selected time only"
 msgstr ""
 
-#: src/multitrack.c:6518
+#: src/multitrack.c:6700
 msgid "_Move effects with blocks"
 msgstr ""
 
-#: src/multitrack.c:6531
+#: src/multitrack.c:6713
 msgid "Select _autotransition effect..."
 msgstr ""
 
-#: src/multitrack.c:6542
+#: src/multitrack.c:6724
 msgid "Crossfade audio with autotransition"
 msgstr ""
 
-#: src/multitrack.c:6550
+#: src/multitrack.c:6732
 msgid "View/_Edit selected effect"
 msgstr ""
 
-#: src/multitrack.c:6554
+#: src/multitrack.c:6736
 msgid "_Delete selected effect"
 msgstr ""
 
-#: src/multitrack.c:6562
+#: src/multitrack.c:6744
 msgid "Apply effect to _block..."
 msgstr ""
 
-#: src/multitrack.c:6619
+#: src/multitrack.c:6801
 msgid "Apply effect to _region..."
 msgstr ""
 
-#: src/multitrack.c:6885
+#: src/multitrack.c:7061
 msgid "_Tracks"
 msgstr ""
 
-#: src/multitrack.c:6896
+#: src/multitrack.c:7072
 msgid "Rename current track"
 msgstr ""
 
-#: src/multitrack.c:6904
+#: src/multitrack.c:7080
 msgid "Make _Backing Audio current track"
 msgstr ""
 
-#: src/multitrack.c:6915
+#: src/multitrack.c:7091
 msgid "Add Video Track at _Rear"
 msgstr ""
 
-#: src/multitrack.c:6923
+#: src/multitrack.c:7099
 msgid "Add Video Track at _Front"
 msgstr ""
 
-#: src/multitrack.c:6936
+#: src/multitrack.c:7112
 msgid "_Split current track at cursor"
 msgstr ""
 
-#: src/multitrack.c:6948
+#: src/multitrack.c:7124
 msgid "_Split selected video tracks"
 msgstr ""
 
-#: src/multitrack.c:6961
+#: src/multitrack.c:7137
 msgid "Insert gap in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:6969
+#: src/multitrack.c:7145
 msgid "Insert gap in current track/selected time"
 msgstr ""
 
-#: src/multitrack.c:6981
+#: src/multitrack.c:7157
 msgid "Close all _gaps in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:7007
+#: src/multitrack.c:7183
 msgid "Se_lection"
 msgstr ""
 
-#: src/multitrack.c:7018
+#: src/multitrack.c:7194
 msgid "_Select Current Track"
 msgstr ""
 
-#: src/multitrack.c:7025
+#: src/multitrack.c:7201
 msgid "Select _all video tracks"
 msgstr ""
 
-#: src/multitrack.c:7032
+#: src/multitrack.c:7208
 msgid "Select _no video tracks"
 msgstr ""
 
-#: src/multitrack.c:7039
+#: src/multitrack.c:7215
 msgid "Select all _time"
 msgstr ""
 
-#: src/multitrack.c:7050
+#: src/multitrack.c:7226
 msgid "Select from _zero time"
 msgstr ""
 
-#: src/multitrack.c:7057
+#: src/multitrack.c:7233
 msgid "Select to _end time"
 msgstr ""
 
-#: src/multitrack.c:7064
+#: src/multitrack.c:7240
 msgid "_Copy..."
 msgstr ""
 
-#: src/multitrack.c:7075
+#: src/multitrack.c:7251
 msgid "_Timecode to region start"
 msgstr ""
 
-#: src/multitrack.c:7082
+#: src/multitrack.c:7258
 msgid "_Timecode to region end"
 msgstr ""
 
-#: src/multitrack.c:7089
+#: src/multitrack.c:7265
 msgid "_Region start to timecode"
 msgstr ""
 
-#: src/multitrack.c:7096
+#: src/multitrack.c:7272
 msgid "_Region end to timecode"
 msgstr ""
 
-#: src/multitrack.c:7110
+#: src/multitrack.c:7286
 msgid "Select/deselect block at current track/time"
 msgstr ""
 
-#: src/multitrack.c:7135
+#: src/multitrack.c:7311
 msgid "_Change width, height and audio values..."
 msgstr ""
 
-#: src/multitrack.c:7194
+#: src/multitrack.c:7370
 msgid "_Render"
 msgstr ""
 
-#: src/multitrack.c:7205
+#: src/multitrack.c:7381
 msgid "_Render all to new clip"
 msgstr ""
 
-#: src/multitrack.c:7220
+#: src/multitrack.c:7396
 msgid "Render _video"
 msgstr ""
 
-#: src/multitrack.c:7225
+#: src/multitrack.c:7401
 msgid "Render _audio"
 msgstr ""
 
-#: src/multitrack.c:7235
+#: src/multitrack.c:7411
 msgid "_Normalise rendered audio"
 msgstr ""
 
-#: src/multitrack.c:7242
+#: src/multitrack.c:7418
 msgid "_Pre-render audio"
 msgstr ""
 
-#: src/multitrack.c:7251
+#: src/multitrack.c:7427
 msgid "_View"
 msgstr ""
 
-#: src/multitrack.c:7270
+#: src/multitrack.c:7446
 msgid "Block _In/out points"
 msgstr ""
 
-#: src/multitrack.c:7279
+#: src/multitrack.c:7455
 msgid "_Effects at current"
 msgstr ""
 
-#: src/multitrack.c:7297
+#: src/multitrack.c:7473
 msgid "Audio parameters"
 msgstr ""
 
-#: src/multitrack.c:7308
+#: src/multitrack.c:7484
 msgid "Show backing _audio track"
 msgstr ""
 
-#: src/multitrack.c:7312
+#: src/multitrack.c:7488
 msgid "Compact view"
 msgstr ""
 
-#: src/multitrack.c:7320
+#: src/multitrack.c:7496
 msgid "Maximum tracks to display..."
 msgstr ""
 
-#: src/multitrack.c:7327
+#: src/multitrack.c:7503
 msgid "Scroll to follow playback"
 msgstr ""
 
-#: src/multitrack.c:7331
+#: src/multitrack.c:7507
 msgid "_Center on cursor"
 msgstr ""
 
-#: src/multitrack.c:7338
+#: src/multitrack.c:7514
 msgid "_Zoom in"
 msgstr ""
 
-#: src/multitrack.c:7349
+#: src/multitrack.c:7525
 msgid "_Zoom out"
 msgstr ""
 
-#: src/multitrack.c:7361
+#: src/multitrack.c:7537
 msgid "Multitrack _details"
 msgstr ""
 
-#: src/multitrack.c:7374
+#: src/multitrack.c:7550
 msgid "_Event Window"
 msgstr ""
 
-#: src/multitrack.c:7378
+#: src/multitrack.c:7554
 msgid "_Event Window (selected time only)"
 msgstr ""
 
-#: src/multitrack.c:7382
+#: src/multitrack.c:7558
 msgid "_Show FRAME events"
 msgstr ""
 
-#: src/multitrack.c:7399
+#: src/multitrack.c:7575
 msgid "_Show multitrack keys"
 msgstr ""
 
-#: src/multitrack.c:7468
+#: src/multitrack.c:7644
 msgid "Mouse mode: _Move"
 msgstr ""
 
-#: src/multitrack.c:7476
+#: src/multitrack.c:7652
 msgid "Mouse mode: _Select"
 msgstr ""
 
-#: src/multitrack.c:7505
+#: src/multitrack.c:7681
 msgid "Insert mode: _Normal"
 msgstr ""
 
-#: src/multitrack.c:7733
+#: src/multitrack.c:7909
 msgid "Insert with _audio"
 msgstr ""
 
-#: src/multitrack.c:7734
+#: src/multitrack.c:7910
 msgid ""
 "Select whether video clips are inserted and moved with their audio or not"
 msgstr ""
 
-#: src/multitrack.c:7829
+#: src/multitrack.c:8007
 msgid "Select _overlap"
 msgstr ""
 
-#: src/multitrack.c:7830
+#: src/multitrack.c:8008
 msgid ""
 "Select whether timeline selection snaps to overlap between selected tracks "
 "or not"
 msgstr ""
 
-#: src/multitrack.c:7894 src/multitrack.c:14198
+#: src/multitrack.c:8073 src/multitrack.c:14422
 msgid "Expanded View (d)"
 msgstr ""
 
-#: src/multitrack.c:7897 src/multitrack.c:14205
+#: src/multitrack.c:8076 src/multitrack.c:14428
 msgid "Compact View (d)"
 msgstr ""
 
-#: src/multitrack.c:7939
+#: src/multitrack.c:8118
 msgid "Gravity: _Normal"
 msgstr ""
 
-#: src/multitrack.c:7952
+#: src/multitrack.c:8131
 msgid "Gravity: _Left"
 msgstr ""
 
-#: src/multitrack.c:7967
+#: src/multitrack.c:8146
 msgid "Gravity: _Right"
 msgstr ""
 
-#: src/multitrack.c:8297
+#: src/multitrack.c:8496
 msgid "_Apply"
 msgstr ""
 
-#: src/multitrack.c:8319
+#: src/multitrack.c:8518
 msgid "Time"
 msgstr ""
 
-#: src/multitrack.c:8333
+#: src/multitrack.c:8532
 msgid "_Del. node"
 msgstr ""
 
-#: src/multitrack.c:8341
+#: src/multitrack.c:8540
 msgid "_Next node"
 msgstr ""
 
-#: src/multitrack.c:8349
+#: src/multitrack.c:8548
 msgid "_Prev node"
 msgstr ""
 
-#: src/multitrack.c:8373
+#: src/multitrack.c:8574
 msgid "_Reverse playback  "
 msgstr ""
 
-#: src/multitrack.c:8395
+#: src/multitrack.c:8596
 msgid "_Velocity  "
 msgstr ""
 
-#: src/multitrack.c:8464
+#: src/multitrack.c:8664
 msgid "Anchor _start"
 msgstr ""
 
-#: src/multitrack.c:8465
+#: src/multitrack.c:8665
 msgid "Anchor the start point to the timeline"
 msgstr ""
 
-#: src/multitrack.c:8481
-msgid "Start frame"
-msgstr ""
-
-#: src/multitrack.c:8533
+#: src/multitrack.c:8728
 msgid "Anchor _end"
 msgstr ""
 
-#: src/multitrack.c:8534
+#: src/multitrack.c:8729
 msgid "Anchor the end point to the timeline"
 msgstr ""
 
-#: src/multitrack.c:8546
-msgid "End frame"
-msgstr ""
-
-#: src/multitrack.c:8739
+#: src/multitrack.c:8929
 msgid "Scroll"
 msgstr ""
 
-#: src/multitrack.c:9316
+#: src/multitrack.c:9502
 msgid ""
 "\n"
 "==============================\n"
 "Switched to Clip Edit mode\n"
 msgstr ""
 
-#: src/multitrack.c:9502
+#: src/multitrack.c:9708
 msgid "Timeline (seconds)"
 msgstr ""
 
-#: src/multitrack.c:9984
+#: src/multitrack.c:10202
 msgid " Backing audio"
 msgstr ""
 
-#: src/multitrack.c:9987
+#: src/multitrack.c:10204
 #, c-format
 msgid " Layer %d audio"
 msgstr ""
 
-#: src/multitrack.c:9995
+#: src/multitrack.c:10212
 msgid "Show/hide audio details"
 msgstr ""
 
-#: src/multitrack.c:10010 src/multitrack.c:10232
+#: src/multitrack.c:10227 src/multitrack.c:10452
 #, c-format
 msgid "Layer %d audio"
 msgstr ""
 
-#: src/multitrack.c:10144 src/multitrack.c:10261
+#: src/multitrack.c:10353 src/multitrack.c:10481
 #, c-format
 msgid "%s (layer %d)"
 msgstr ""
 
-#: src/multitrack.c:10184
+#: src/multitrack.c:10403
 msgid "Select track"
 msgstr ""
 
-#: src/multitrack.c:10188
+#: src/multitrack.c:10407
 msgid "Show/hide audio"
 msgstr ""
 
-#: src/multitrack.c:10194
+#: src/multitrack.c:10413
 #, c-format
 msgid "Video %d"
 msgstr ""
 
-#: src/multitrack.c:10233
+#: src/multitrack.c:10453
 #, c-format
 msgid " %s"
 msgstr ""
 
-#: src/multitrack.c:10346
+#: src/multitrack.c:10574
 msgid "LiVES: Selected effect"
 msgstr ""
 
-#: src/multitrack.c:10358
+#: src/multitrack.c:10586
 msgid "_View/Edit this effect"
 msgstr ""
 
-#: src/multitrack.c:10361
+#: src/multitrack.c:10588
 msgid "_View this effect"
 msgstr ""
 
-#: src/multitrack.c:10369
+#: src/multitrack.c:10596
 msgid "_Delete this effect"
 msgstr ""
 
-#: src/multitrack.c:10422
+#: src/multitrack.c:10648
 msgid "Cannot insert after this effect"
 msgstr ""
 
-#: src/multitrack.c:10451
+#: src/multitrack.c:10677
 msgid "This effect cannot be moved"
 msgstr ""
 
-#: src/multitrack.c:10499
+#: src/multitrack.c:10724
 #, c-format
 msgid "  %d to %d selected  "
 msgstr ""
 
-#: src/multitrack.c:10502 src/multitrack.c:10746
+#: src/multitrack.c:10727 src/multitrack.c:10968
 #, c-format
 msgid "%.2f sec."
 msgstr ""
 
-#: src/multitrack.c:10717
+#: src/multitrack.c:10940
 #, c-format
 msgid "%d frames"
 msgstr ""
 
-#: src/multitrack.c:11070
+#: src/multitrack.c:11299
 msgid ""
 "\n"
 "==============================\n"
 "Switched to Multitrack mode\n"
 msgstr ""
 
-#: src/multitrack.c:12691
+#: src/multitrack.c:12939
 msgid "Drag the time slider to where you"
 msgstr ""
 
-#: src/multitrack.c:12692
+#: src/multitrack.c:12940
 msgid "want to set effect parameters"
 msgstr ""
 
-#: src/multitrack.c:12693
+#: src/multitrack.c:12941
 msgid "Set parameters, then click \"Apply\"\n"
 msgstr ""
 
-#: src/multitrack.c:12694
+#: src/multitrack.c:12942
 msgid ""
 "NODES are points where parameters\n"
 "have been set.\n"
 "Nodes can be deleted."
 msgstr ""
 
-#: src/multitrack.c:12697
+#: src/multitrack.c:12944
 msgid "Effect has no parameters.\n"
 msgstr ""
 
-#: src/multitrack.c:12788
+#: src/multitrack.c:13033
 #, c-format
 msgid "%s output"
 msgstr ""
 
-#: src/multitrack.c:12794 src/multitrack.c:12804
+#: src/multitrack.c:13038 src/multitrack.c:13046
 #, c-format
 msgid "layer %d"
 msgstr ""
 
-#: src/multitrack.c:12796 src/multitrack.c:12806
+#: src/multitrack.c:13039 src/multitrack.c:13047
 msgid "audio track"
 msgstr ""
 
-#: src/multitrack.c:12797
+#: src/multitrack.c:13040
 #, c-format
 msgid "%s to %s"
 msgstr ""
 
-#: src/multitrack.c:12807
+#: src/multitrack.c:13048
 #, c-format
 msgid "%s from %s"
 msgstr ""
 
-#: src/multitrack.c:12860
+#: src/multitrack.c:13099
 msgid "_Prev filter map"
 msgstr ""
 
-#: src/multitrack.c:12871
+#: src/multitrack.c:13110
 msgid "Insert _before"
 msgstr ""
 
-#: src/multitrack.c:12881
+#: src/multitrack.c:13120
 msgid "Insert _after"
 msgstr ""
 
-#: src/multitrack.c:12896
+#: src/multitrack.c:13134
 msgid "_Next filter map"
 msgstr ""
 
-#: src/multitrack.c:12911
+#: src/multitrack.c:13148
 msgid ""
 "\n"
 "\n"
@@ -9101,271 +9106,271 @@
 "current time.\n"
 msgstr ""
 
-#: src/multitrack.c:12929
+#: src/multitrack.c:13166
 msgid ""
 "Drag a compositor anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:12936
+#: src/multitrack.c:13173
 msgid ""
 "Drag a transition anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:12944
+#: src/multitrack.c:13181
 msgid ""
 "Effects can be dragged\n"
 "onto blocks on the timeline."
 msgstr ""
 
-#: src/multitrack.c:13166
+#: src/multitrack.c:13406
 msgid "LiVES: Selected block/frame"
 msgstr ""
 
-#: src/multitrack.c:13173
+#: src/multitrack.c:13413
 msgid "_Select this block"
 msgstr ""
 
-#: src/multitrack.c:13183
+#: src/multitrack.c:13423
 msgid "_Split block here"
 msgstr ""
 
-#: src/multitrack.c:13191
+#: src/multitrack.c:13431
 msgid "List _effects here"
 msgstr ""
 
-#: src/multitrack.c:13200 src/multitrack.c:13277
+#: src/multitrack.c:13440 src/multitrack.c:13518
 #, c-format
 msgid "_Adjust %s"
 msgstr ""
 
-#: src/multitrack.c:13215
+#: src/multitrack.c:13455
 msgid "_Delete this block"
 msgstr ""
 
-#: src/multitrack.c:13258
+#: src/multitrack.c:13500
 msgid "_Insert here"
 msgstr ""
 
-#: src/multitrack.c:13264
+#: src/multitrack.c:13505
 msgid "_Insert audio here"
 msgstr ""
 
-#: src/multitrack.c:14801
+#: src/multitrack.c:15017
 #, c-format
 msgid "Inserted gap in selected tracks from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:14835
+#: src/multitrack.c:15048
 #, c-format
 msgid "Inserted gap in track %s from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15036
+#: src/multitrack.c:15244
 #, c-format
 msgid "Undid %s\n"
 msgstr ""
 
-#: src/multitrack.c:15235
+#: src/multitrack.c:15445
 #, c-format
 msgid "Redid %s\n"
 msgstr ""
 
-#: src/multitrack.c:15268
+#: src/multitrack.c:15475
 msgid ""
 "\n"
 " (variable)"
 msgstr ""
 
-#: src/multitrack.c:15502 src/multitrack.c:15614 src/multitrack.c:18736
-#: src/multitrack.c:18748
+#: src/multitrack.c:15710 src/multitrack.c:15823 src/multitrack.c:19077
+#: src/multitrack.c:19089
 #, c-format
 msgid "track %s"
 msgstr ""
 
-#: src/multitrack.c:15507 src/multitrack.c:15619 src/multitrack.c:18741
+#: src/multitrack.c:15715 src/multitrack.c:15828 src/multitrack.c:19082
 #, c-format
 msgid "tracks %s and %s"
 msgstr ""
 
-#: src/multitrack.c:15513 src/multitrack.c:15625 src/multitrack.c:18751
+#: src/multitrack.c:15721 src/multitrack.c:15834 src/multitrack.c:19091
 msgid "selected tracks"
 msgstr ""
 
-#: src/multitrack.c:15516
+#: src/multitrack.c:15726
 #, c-format
 msgid "Added %s %s to %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15550
+#: src/multitrack.c:15760
 #, c-format
 msgid "Added effect %s to track %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15631
+#: src/multitrack.c:15845
 #, c-format
 msgid "Deleted %s %s from %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15935
+#: src/multitrack.c:16143
 #, c-format
 msgid "rendered %d frames to new clip.\n"
 msgstr ""
 
-#: src/multitrack.c:16025
+#: src/multitrack.c:16230
 msgid "Cleaning up..."
 msgstr ""
 
-#: src/multitrack.c:16712
+#: src/multitrack.c:17003
 msgid "_Pause"
 msgstr ""
 
-#: src/multitrack.c:16713
+#: src/multitrack.c:17004
 msgid "Pause (p)"
 msgstr ""
 
-#: src/multitrack.c:16856
+#: src/multitrack.c:17151
 msgid "Press 'm' during playback"
 msgstr ""
 
-#: src/multitrack.c:16857
+#: src/multitrack.c:17152
 msgid "to make a mark on the timeline"
 msgstr ""
 
-#: src/multitrack.c:17154
+#: src/multitrack.c:17498
 #, c-format
 msgid ""
 "Inserted audio %.4f to %.4f from clip %s into backing audio from time %.4f "
 "to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:17414
+#: src/multitrack.c:17759
 #, c-format
 msgid ""
 "Inserted frames %d to %d from clip %s into track %s from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:17998
+#: src/multitrack.c:18332
 #, c-format
 msgid ""
 "Time region %.3f to %.3f\n"
 "selected.\n"
 msgstr ""
 
-#: src/multitrack.c:18002
+#: src/multitrack.c:18336
 msgid ""
 "select one or more tracks\n"
 "to create a region.\n"
 msgstr ""
 
-#: src/multitrack.c:18004
+#: src/multitrack.c:18337
 #, c-format
 msgid "%d video tracks selected.\n"
 msgstr ""
 
-#: src/multitrack.c:18006
+#: src/multitrack.c:18339
 msgid ""
 "Double click on timeline\n"
 "to deselect time region."
 msgstr ""
 
-#: src/multitrack.c:18013
+#: src/multitrack.c:18346
 msgid ""
 "Single click on an effect\n"
 "to select it."
 msgstr ""
 
-#: src/multitrack.c:18014
+#: src/multitrack.c:18347
 msgid ""
 "Double click on an effect\n"
 "to edit it."
 msgstr ""
 
-#: src/multitrack.c:18015
+#: src/multitrack.c:18348
 msgid ""
 "Right click on an effect\n"
 "for context menu.\n"
 msgstr ""
 
-#: src/multitrack.c:18017
+#: src/multitrack.c:18350
 msgid ""
 "Effect order can be changed at\n"
 "FILTER MAPS"
 msgstr ""
 
-#: src/multitrack.c:18024
+#: src/multitrack.c:18357
 msgid ""
 "You can select an effect,\n"
 "then use the INSERT BEFORE"
 msgstr ""
 
-#: src/multitrack.c:18025
+#: src/multitrack.c:18358
 msgid "or INSERT AFTER buttons to move it."
 msgstr ""
 
-#: src/multitrack.c:18307 src/multitrack.c:18320
+#: src/multitrack.c:18639 src/multitrack.c:18652
 msgid "Click on another effect,"
 msgstr ""
 
-#: src/multitrack.c:18308 src/multitrack.c:18321
+#: src/multitrack.c:18640 src/multitrack.c:18653
 msgid ""
 "and the selected one\n"
 "will be inserted"
 msgstr ""
 
-#: src/multitrack.c:18309
+#: src/multitrack.c:18641
 msgid "after it.\n"
 msgstr ""
 
-#: src/multitrack.c:18322
+#: src/multitrack.c:18654
 msgid "before it.\n"
 msgstr ""
 
-#: src/multitrack.c:18551
+#: src/multitrack.c:18889
 #, c-format
 msgid "Removed parameter values for effect %s at time %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:18759
+#: src/multitrack.c:19100
 #, c-format
 msgid "Set parameter values for %s %s on %s at time %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:19251 src/multitrack.c:20873
+#: src/multitrack.c:19630 src/multitrack.c:21195
 msgid "_Autoreload each time"
 msgstr ""
 
-#: src/multitrack.c:19323
+#: src/multitrack.c:19702
 msgid "Saving layout"
 msgstr ""
 
-#: src/multitrack.c:19345
+#: src/multitrack.c:19725
 #, c-format
 msgid "Saved layout to %s\n"
 msgstr ""
 
-#: src/multitrack.c:20783
+#: src/multitrack.c:21125
 msgid "clips and frames"
 msgstr ""
 
-#: src/multitrack.c:20787
+#: src/multitrack.c:21128
 msgid "clips"
 msgstr ""
 
-#: src/multitrack.c:20790
+#: src/multitrack.c:21130
 msgid "frames"
 msgstr ""
 
-#: src/multitrack.c:20800
+#: src/multitrack.c:21140
 msgid ""
 "\n"
 "Auto reload layout.\n"
 msgstr ""
 
-#: src/multitrack.c:20803
+#: src/multitrack.c:21143
 #, c-format
 msgid ""
 "%s\n"
@@ -9373,100 +9378,100 @@
 "Therefore it could not be loaded properly.\n"
 msgstr ""
 
-#: src/multitrack.c:20920
+#: src/multitrack.c:21284
 msgid "auto backup"
 msgstr ""
 
-#: src/multitrack.c:20923
+#: src/multitrack.c:21287
 #, c-format
 msgid ""
 "\n"
 "Unable to load layout file %s\n"
 msgstr ""
 
-#: src/multitrack.c:20944
+#: src/multitrack.c:21308
 #, c-format
 msgid "Loading layout from %s..."
 msgstr ""
 
-#: src/multitrack.c:20978
+#: src/multitrack.c:21338
 #, c-format
 msgid "Got %d events...processing..."
 msgstr ""
 
-#: src/multitrack.c:20991
+#: src/multitrack.c:21349
 msgid "Checking and rebuilding event list"
 msgstr ""
 
-#: src/multitrack.c:21017
+#: src/multitrack.c:21374
 #, c-format
 msgid "%d errors detected.\n"
-msgstr ""
+msgstr "%d Fehler erkannt.\n"
 
-#: src/multitrack.c:21068
+#: src/multitrack.c:21422
 #, c-format
 msgid "Multitrack fps set to %.3f\n"
 msgstr ""
 
-#: src/multitrack.c:21225
+#: src/multitrack.c:21576
 msgid ""
 "The current layout has changes which have not been saved.\n"
 "Are you sure you wish to wipe it ?\n"
 msgstr ""
 
-#: src/multitrack.c:22047
+#: src/multitrack.c:22385
 msgid "LiVES: Multitrack audio mixer"
 msgstr ""
 
-#: src/multitrack.c:22077
+#: src/multitrack.c:22414
 msgid "_Reset values"
 msgstr ""
 
-#: src/multitrack.c:22081
+#: src/multitrack.c:22418
 msgid "_Close mixer"
 msgstr ""
 
-#: src/multitrack.c:22130
+#: src/multitrack.c:22466
 msgid ""
 "_Invert backing audio\n"
 "and layer volumes"
 msgstr ""
 
-#: src/multitrack.c:22132
+#: src/multitrack.c:22468
 msgid "Adjust backing and layer audio values so that they sum to 1.0"
 msgstr ""
 
-#: src/multitrack.c:22175
+#: src/multitrack.c:22510
 msgid "_Gang layer audio"
 msgstr ""
 
-#: src/multitrack.c:22177
+#: src/multitrack.c:22512
 msgid "Adjust all layer audio values to the same value"
 msgstr ""
 
-#: src/jack.c:104
+#: src/jack.c:102
 msgid "JACK server started\n"
 msgstr ""
 
-#: src/jack.c:1284 src/jack.c:1353
+#: src/jack.c:1265 src/jack.c:1334
 msgid "Unable to connect to JACK server\n"
 msgstr ""
 
-#: src/jack.c:1512
+#: src/jack.c:1491
 msgid "Started jack audio subsystem.\n"
 msgstr ""
 
-#: src/jack.c:1623
+#: src/jack.c:1600
 msgid "Started jack audio reader.\n"
 msgstr ""
 
-#: src/jack.c:1838
+#: src/jack.c:1815
 msgid ""
 "\n"
 "Connection to jack audio was reset.\n"
 msgstr ""
 
-#: src/pulse.c:87
+#: src/pulse.c:88
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -9474,7 +9479,7 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:92
+#: src/pulse.c:94
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -9482,7 +9487,7 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:96
+#: src/pulse.c:99
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -9490,335 +9495,335 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:101
+#: src/pulse.c:104
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
 msgstr ""
 
-#: src/pulse.c:107
+#: src/pulse.c:109
 msgid "LiVES will exit and you can choose another audio player.\n"
 msgstr ""
 
-#: src/pulse.c:1352
+#: src/pulse.c:1335
 msgid ""
 "\n"
 "Connection to pulse audio was reset.\n"
 msgstr ""
 
-#: src/colourspace.c:1100
+#: src/colourspace.c:1092
 msgid "unclamped"
 msgstr ""
 
-#: src/colourspace.c:1101
+#: src/colourspace.c:1093
 msgid "clamped"
 msgstr ""
 
-#: src/omc-learn.c:195
+#: src/omc-learn.c:191
 #, c-format
 msgid "Responding to joystick events from %s\n"
 msgstr ""
 
-#: src/omc-learn.c:289
+#: src/omc-learn.c:279
 msgid "Creating ALSA seq port..."
 msgstr ""
 
-#: src/omc-learn.c:325
+#: src/omc-learn.c:313
 #, c-format
 msgid "Responding to MIDI events from %s\n"
 msgstr ""
 
-#: src/omc-learn.c:568
+#: src/omc-learn.c:554
 msgid "data"
 msgstr ""
 
-#: src/omc-learn.c:571
+#: src/omc-learn.c:557
 msgid "velocity"
 msgstr ""
 
-#: src/omc-learn.c:572
+#: src/omc-learn.c:558
 msgid "note"
 msgstr ""
 
-#: src/omc-learn.c:574 src/omc-learn.c:736 src/omc-learn.c:1105
-#: src/omc-learn.c:1591 src/omc-learn.c:1640
+#: src/omc-learn.c:560 src/omc-learn.c:724 src/omc-learn.c:1092
+#: src/omc-learn.c:1581 src/omc-learn.c:1630
 msgid "value"
 msgstr ""
 
-#: src/omc-learn.c:576
+#: src/omc-learn.c:562
 msgid "state"
 msgstr ""
 
-#: src/omc-learn.c:688
+#: src/omc-learn.c:674
 msgid "variable"
 msgstr ""
 
-#: src/omc-learn.c:1001
+#: src/omc-learn.c:989
 msgid "Vars."
 msgstr ""
 
-#: src/omc-learn.c:1054
+#: src/omc-learn.c:1041
 #, c-format
 msgid "MIDI ch %d note on"
 msgstr ""
 
-#: src/omc-learn.c:1058
+#: src/omc-learn.c:1045
 #, c-format
 msgid "MIDI ch %d note off"
 msgstr ""
 
-#: src/omc-learn.c:1062
+#: src/omc-learn.c:1049
 #, c-format
 msgid "MIDI ch %d controller %d"
 msgstr ""
 
-#: src/omc-learn.c:1066
+#: src/omc-learn.c:1053
 #, c-format
 msgid "MIDI ch %d pitch bend"
 msgstr ""
 
-#: src/omc-learn.c:1070
+#: src/omc-learn.c:1057
 #, c-format
 msgid "MIDI ch %d pgm change"
 msgstr ""
 
-#: src/omc-learn.c:1073
+#: src/omc-learn.c:1060
 #, c-format
 msgid "Joystick button %d"
 msgstr ""
 
-#: src/omc-learn.c:1076
+#: src/omc-learn.c:1063
 #, c-format
 msgid "Joystick axis %d"
 msgstr ""
 
-#: src/omc-learn.c:1113
+#: src/omc-learn.c:1100
 msgid "x"
 msgstr ""
 
-#: src/omc-learn.c:1122
+#: src/omc-learn.c:1109
 msgid "range"
 msgstr ""
 
-#: src/omc-learn.c:1143
+#: src/omc-learn.c:1130
 msgid "+ offset1"
 msgstr ""
 
-#: src/omc-learn.c:1161
+#: src/omc-learn.c:1150
 msgid "* scale"
 msgstr ""
 
-#: src/omc-learn.c:1179
+#: src/omc-learn.c:1170
 msgid "+ offset2"
 msgstr ""
 
-#: src/omc-learn.c:1280
+#: src/omc-learn.c:1270
 msgid ""
 "\n"
 "Click OK to delete all entries\n"
 msgstr ""
 
-#: src/omc-learn.c:1318
+#: src/omc-learn.c:1308
 msgid "LiVES: OMC learner"
 msgstr ""
 
-#: src/omc-learn.c:1334
+#: src/omc-learn.c:1324
 msgid "Clear _unmatched"
 msgstr ""
 
-#: src/omc-learn.c:1345
+#: src/omc-learn.c:1335
 msgid "_Delete all"
 msgstr ""
 
-#: src/omc-learn.c:1411
+#: src/omc-learn.c:1401
 msgid "Start video playback"
 msgstr ""
 
-#: src/omc-learn.c:1414
+#: src/omc-learn.c:1404
 msgid "Stop video playback"
 msgstr ""
 
-#: src/omc-learn.c:1418
+#: src/omc-learn.c:1408
 msgid "Clip select <clipnum>"
 msgstr ""
 
-#: src/omc-learn.c:1419
+#: src/omc-learn.c:1409
 msgid "Switch foreground clip to the nth valid clip"
 msgstr ""
 
-#: src/omc-learn.c:1423
+#: src/omc-learn.c:1413
 msgid "Play forwards"
 msgstr ""
 
-#: src/omc-learn.c:1424
+#: src/omc-learn.c:1414
 msgid "Play video in a forwards direction"
 msgstr ""
 
-#: src/omc-learn.c:1427
+#: src/omc-learn.c:1417
 msgid "Play backwards"
 msgstr ""
 
-#: src/omc-learn.c:1428
+#: src/omc-learn.c:1418
 msgid "Play video in a backwards direction"
 msgstr ""
 
-#: src/omc-learn.c:1431
+#: src/omc-learn.c:1421
 msgid "Reverse playback direction"
 msgstr ""
 
-#: src/omc-learn.c:1432
+#: src/omc-learn.c:1422
 msgid "Reverse direction of video playback"
 msgstr ""
 
-#: src/omc-learn.c:1435
+#: src/omc-learn.c:1425
 msgid "Play video faster"
 msgstr ""
 
-#: src/omc-learn.c:1436
+#: src/omc-learn.c:1426
 msgid "Play video at a slightly faster rate"
 msgstr ""
 
-#: src/omc-learn.c:1439
+#: src/omc-learn.c:1429
 msgid "Play video slower"
 msgstr ""
 
-#: src/omc-learn.c:1440
+#: src/omc-learn.c:1430
 msgid "Play video at a slightly slower rate"
 msgstr ""
 
-#: src/omc-learn.c:1443
+#: src/omc-learn.c:1433
 msgid "Toggle video freeze"
 msgstr ""
 
-#: src/omc-learn.c:1444
+#: src/omc-learn.c:1434
 msgid "Freeze video, or if already frozen, unfreeze it"
 msgstr ""
 
-#: src/omc-learn.c:1447
+#: src/omc-learn.c:1437
 msgid "Set video framerate to <fps>"
 msgstr ""
 
-#: src/omc-learn.c:1448
+#: src/omc-learn.c:1438
 msgid "Set framerate of foreground clip to <float fps>"
 msgstr ""
 
-#: src/omc-learn.c:1452
+#: src/omc-learn.c:1442
 msgid "Start recording"
 msgstr ""
 
-#: src/omc-learn.c:1455
+#: src/omc-learn.c:1445
 msgid "Stop recording"
 msgstr ""
 
-#: src/omc-learn.c:1458
+#: src/omc-learn.c:1448
 msgid "Toggle recording state"
 msgstr ""
 
-#: src/omc-learn.c:1461
+#: src/omc-learn.c:1451
 msgid "Swap foreground and background clips"
 msgstr ""
 
-#: src/omc-learn.c:1463
+#: src/omc-learn.c:1453
 msgid "Reset effect keys"
 msgstr ""
 
-#: src/omc-learn.c:1464
+#: src/omc-learn.c:1454
 msgid "Switch all effects off."
 msgstr ""
 
-#: src/omc-learn.c:1467
+#: src/omc-learn.c:1457
 msgid "Enable effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1471
+#: src/omc-learn.c:1461
 msgid "Disable effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1475
+#: src/omc-learn.c:1465
 msgid "Toggle effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1479
+#: src/omc-learn.c:1469
 msgid "Set parameter value <key> <pnum> = <value>"
 msgstr ""
 
-#: src/omc-learn.c:1480
+#: src/omc-learn.c:1470
 msgid "Set <value> of pth (numerical) parameter for effect key <key>."
 msgstr ""
 
-#: src/omc-learn.c:1484
+#: src/omc-learn.c:1474
 msgid "Switch foreground to next clip"
 msgstr ""
 
-#: src/omc-learn.c:1487
+#: src/omc-learn.c:1477
 msgid "Switch foreground to previous clip"
 msgstr ""
 
-#: src/omc-learn.c:1490
+#: src/omc-learn.c:1480
 msgid "Set video framerate to ratio <fps_ratio>"
 msgstr ""
 
-#: src/omc-learn.c:1491
+#: src/omc-learn.c:1481
 msgid "Set framerate ratio of foreground clip to <float fps_ratio>"
 msgstr ""
 
-#: src/omc-learn.c:1495
+#: src/omc-learn.c:1485
 msgid "Retrigger clip <clipnum>"
 msgstr ""
 
-#: src/omc-learn.c:1496
+#: src/omc-learn.c:1486
 msgid ""
 "Switch foreground clip to the nth valid clip, and reset the frame number"
 msgstr ""
 
-#: src/omc-learn.c:1500
+#: src/omc-learn.c:1490
 msgid "Cycle to next mode for effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1504
+#: src/omc-learn.c:1494
 msgid "Cycle to previous mode for effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1508
+#: src/omc-learn.c:1498
 msgid "Set playback plugin parameter value <pnum> = <value>"
 msgstr ""
 
-#: src/omc-learn.c:1509
+#: src/omc-learn.c:1499
 msgid "Set <value> of pth parameter for the playback plugin."
 msgstr ""
 
 #. TRANSLATORS: short form of "clip number"
-#: src/omc-learn.c:1536 src/omc-learn.c:1607
+#: src/omc-learn.c:1526 src/omc-learn.c:1597
 msgid "clipnum"
 msgstr ""
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1545
+#: src/omc-learn.c:1535
 msgid "fps"
 msgstr ""
 
 #. TRANSLATORS: as in keyboard key
-#: src/omc-learn.c:1553 src/omc-learn.c:1560 src/omc-learn.c:1567
-#: src/omc-learn.c:1575 src/omc-learn.c:1615 src/omc-learn.c:1623
+#: src/omc-learn.c:1543 src/omc-learn.c:1550 src/omc-learn.c:1557
+#: src/omc-learn.c:1565 src/omc-learn.c:1605 src/omc-learn.c:1613
 msgid "key"
 msgstr ""
 
 #. TRANSLATORS: short form of "parameter number"
-#: src/omc-learn.c:1583 src/omc-learn.c:1632
+#: src/omc-learn.c:1573 src/omc-learn.c:1622
 msgid "pnum"
 msgstr ""
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1599
+#: src/omc-learn.c:1589
 msgid "fps_ratio"
 msgstr ""
 
-#: src/omc-learn.c:2443
+#: src/omc-learn.c:2417
 #, c-format
 msgid "Saving device mapping to file %s..."
 msgstr ""
 
-#: src/omc-learn.c:2527
+#: src/omc-learn.c:2498
 #, c-format
 msgid ""
 "\n"
@@ -9827,7 +9832,7 @@
 "%s\n"
 msgstr ""
 
-#: src/omc-learn.c:2534
+#: src/omc-learn.c:2505
 #, c-format
 msgid ""
 "\n"
@@ -9836,12 +9841,12 @@
 "%s\n"
 msgstr ""
 
-#: src/omc-learn.c:2571
+#: src/omc-learn.c:2541
 #, c-format
 msgid "Loading device mapping from file %s..."
 msgstr ""
 
-#: src/omc-learn.c:2576
+#: src/omc-learn.c:2544
 #, c-format
 msgid ""
 "\n"
@@ -9851,19 +9856,19 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/videodev.c:547
+#: src/videodev.c:539
 #, c-format
 msgid "Unable to open device %s\n"
 msgstr ""
 
-#: src/videodev.c:564
+#: src/videodev.c:554
 #, c-format
 msgid "Opened device %s\n"
 msgstr ""
 
 #, fuzzy
-#~ msgid "Blank frames"
-#~ msgstr "Skalieren"
+#~ msgid "Blank _Colour"
+#~ msgstr "Hintergrund"
 
 #, fuzzy
 #~ msgid "Block _height"
@@ -9874,6 +9879,10 @@
 #~ msgstr "_Höhe"
 
 #, fuzzy
+#~ msgid "Border _Colour"
+#~ msgstr "Hintergrund"
+
+#, fuzzy
 #~ msgid "Clipboard _over selection"
 #~ msgstr "_Nach der Auswahl einfügen"
 
@@ -9882,36 +9891,18 @@
 #~ msgstr "_Nach der Auswahl einfügen"
 
 #, fuzzy
-#~ msgid "Colorize"
-#~ msgstr "Skalieren"
-
-#, fuzzy
 #~ msgid "Colorizing"
 #~ msgstr "Skalieren"
 
-#, fuzzy
-#~ msgid "Colour cycle"
-#~ msgstr "Skalieren"
-
-#, fuzzy
-#~ msgid "Colour cycling"
-#~ msgstr "Skalieren"
-
-#, fuzzy
-#~ msgid "Colour filter"
-#~ msgstr "Skalieren"
-
-#, fuzzy
-#~ msgid "Colour filtering"
-#~ msgstr "Skalieren"
+#~ msgid "Edge detect"
+#~ msgstr "Kantenerkennung"
 
-#, fuzzy
-#~ msgid "Colour replace"
-#~ msgstr "Skalieren"
+#~ msgid "Edge detecting"
+#~ msgstr "Kantenerkennung"
 
 #, fuzzy
-#~ msgid "Fina_l frame"
-#~ msgstr "Skalieren"
+#~ msgid "Fade _colour"
+#~ msgstr "Hintergrund"
 
 #, fuzzy
 #~ msgid "Frame _height"
@@ -9922,46 +9913,6 @@
 #~ msgstr "_Höhe"
 
 #, fuzzy
-#~ msgid "Frames _per second (FPS)"
-#~ msgstr "Sekunden."
-
-#, fuzzy
-#~ msgid "Generate blank frames"
-#~ msgstr "Skalieren"
-
-#, fuzzy
-#~ msgid "Generate clip from image"
-#~ msgstr "Skalieren"
-
-#, fuzzy
-#~ msgid "Generate coloured frames"
-#~ msgstr "Skalieren"
-
-#, fuzzy
-#~ msgid "Generate title frames"
-#~ msgstr "Skalieren"
-
-#, fuzzy
-#~ msgid "Generating blank frames"
-#~ msgstr "Skalieren"
-
-#, fuzzy
-#~ msgid "Generating clip from image"
-#~ msgstr "Skalieren"
-
-#, fuzzy
-#~ msgid "Generating coloured frames"
-#~ msgstr "Skalieren"
-
-#, fuzzy
-#~ msgid "Generating title frames"
-#~ msgstr "Skalieren"
-
-#, fuzzy
-#~ msgid "Normalize"
-#~ msgstr "Skalieren"
-
-#, fuzzy
 #~ msgid "Normalizing"
 #~ msgstr "Skalieren"
 
@@ -9982,34 +9933,30 @@
 #~ msgstr "Übersprungen"
 
 #, fuzzy
-#~ msgid "Solarize"
+#~ msgid "Solarizing"
 #~ msgstr "Skalieren"
 
 #, fuzzy
-#~ msgid "Solarizing"
-#~ msgstr "Skalieren"
+#~ msgid "_Background Colour"
+#~ msgstr "Hintergrund"
 
 #, fuzzy
-#~ msgid "_First frame"
-#~ msgstr "Skalieren"
+#~ msgid "_Background colour"
+#~ msgstr "Hintergrund"
 
 #, fuzzy
-#~ msgid "_Frames per second"
-#~ msgstr "Sekunden."
+#~ msgid "_End Colour"
+#~ msgstr "Hintergrund"
 
 #, fuzzy
-#~ msgid "_Frames"
-#~ msgstr "Skalieren"
+#~ msgid "_Frames per second"
+#~ msgstr "Sekunden."
 
 #, fuzzy
 #~ msgid "_Point size"
 #~ msgstr "Dateigröße"
 
 #, fuzzy
-#~ msgid "_Random colour each frame"
-#~ msgstr "Skalieren"
-
-#, fuzzy
 #~ msgid "_Right"
 #~ msgstr "_Höhe"
 
@@ -10018,48 +9965,47 @@
 #~ msgstr "_Nach der Auswahl einfügen"
 
 #, fuzzy
-#~ msgid "_Skip ahead"
-#~ msgstr "Übersprungen"
+#~ msgid "_Sigma end"
+#~ msgstr "Big Endian"
 
 #, fuzzy
-#~ msgid "_Skip"
-#~ msgstr "Übersprungen"
+#~ msgid "_Sigma start"
+#~ msgstr "Big Endian"
 
 #, fuzzy
-#~ msgid "_Time (seconds)"
-#~ msgstr "Sekunden."
+#~ msgid "_Skip ahead"
+#~ msgstr "Übersprungen"
 
 #, fuzzy
-#~ msgid "blank_frames"
-#~ msgstr "Skalieren"
+#~ msgid "_Skip"
+#~ msgstr "Übersprungen"
 
 #, fuzzy
-#~ msgid "colorize"
-#~ msgstr "Skalieren"
+#~ msgid "_Source Colour"
+#~ msgstr "Hintergrund"
 
 #, fuzzy
-#~ msgid "colour_filter"
-#~ msgstr "Skalieren"
+#~ msgid "_Start Colour"
+#~ msgstr "Hintergrund"
 
 #, fuzzy
-#~ msgid "colour_replace"
-#~ msgstr "Skalieren"
+#~ msgid "_Stroke colour"
+#~ msgstr "Hintergrund"
 
 #, fuzzy
-#~ msgid "gen_blank_frames"
-#~ msgstr "Skalieren"
+#~ msgid "_Target Colour"
+#~ msgstr "Hintergrund"
 
 #, fuzzy
-#~ msgid "gen_clip_from_image"
-#~ msgstr "Skalieren"
+#~ msgid "_Time (seconds)"
+#~ msgstr "Sekunden."
 
 #, fuzzy
-#~ msgid "gen_coloured_frames"
-#~ msgstr "Skalieren"
+#~ msgid "_Top left is clipboard"
+#~ msgstr "_Bildfolge der Zwischenablage umkehren"
 
-#, fuzzy
-#~ msgid "normalize"
-#~ msgstr "Skalieren"
+#~ msgid "edge_detect"
+#~ msgstr "Kanten_erkennung"
 
 #, fuzzy
 #~ msgid "posterize"
@@ -10070,18 +10016,6 @@
 #~ msgstr "Dateigröße"
 
 #, fuzzy
-#~ msgid "skip_forwards"
-#~ msgstr "Übersprungen"
-
-#, fuzzy
-#~ msgid "solarize"
-#~ msgstr "Skalieren"
-
-#, fuzzy
-#~ msgid "trim_frames"
-#~ msgstr "Skalieren"
-
-#, fuzzy
 #~ msgid "Unable to open output file !"
 #~ msgstr ""
 #~ "LiVES konnte das Bild nicht aufnehmen\n"
@@ -10104,3 +10038,7 @@
 #~ msgstr ""
 #~ "LiVES konnte das Bild nicht aufnehmen\n"
 #~ "\n"
+
+#, fuzzy
+#~ msgid "LiVES audio error."
+#~ msgstr "LiVES: - Einfügen"

LiVES-2.2.8.tar.bz2/po/en_GB.po -> LiVES-2.4.1.tar.bz2/po/en_GB.po Changed

@@ -7,19 +7,18 @@
 msgstr ""
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n"
-"POT-Creation-Date: 2015-02-08 17:18-0300\n"
-"PO-Revision-Date: 2013-11-23 20:55+0000\n"
+"POT-Creation-Date: 2015-08-09 14:52-0300\n"
+"PO-Revision-Date: 2015-04-16 10:52+0000\n"
 "Last-Translator: Andi Chandler <Unknown>\n"
 "Language-Team: English (United Kingdom) <en_GB@li.org>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-13 13:13+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2015-05-03 15:40+0000\n"
+"X-Generator: Launchpad (build 17474)\n"
 
-#. TRANSLATORS: do not translate this message
-#: src/main.c:118
+#: src/main.c:128
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -33,22 +32,22 @@
 "All translators should read the LiVES translation notes at\n"
 "http://lives.sourceforge.net/TRANS-README.txt"
 
-#: src/main.c:134
+#: src/main.c:153
 #, c-format
 msgid "%s Warning: %s\n"
 msgstr "%s Warning: %s\n"
 
-#: src/main.c:138
+#: src/main.c:157
 #, c-format
 msgid "%s Critical error: %s\n"
 msgstr "%s Critical error: %s\n"
 
-#: src/main.c:139
+#: src/main.c:158
 #, c-format
 msgid "%s Fatal error: %s\n"
 msgstr "%s Fatal error: %s\n"
 
-#: src/main.c:176
+#: src/main.c:198
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -62,7 +61,7 @@
 "group_id=64341&atid=507139\n"
 "Thanks. Recovery should be possible if you restart LiVES.\n"
 
-#: src/main.c:177
+#: src/main.c:199
 msgid ""
 "\n"
 "\n"
@@ -74,7 +73,7 @@
 "When reporting crashes, please include details of your operating system, "
 "distribution, and the LiVES version ("
 
-#: src/main.c:180
+#: src/main.c:203
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -82,7 +81,7 @@
 "and any information shown below:\n"
 "\n"
 
-#: src/main.c:184
+#: src/main.c:206
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
@@ -92,83 +91,83 @@
 "information.\n"
 "\n"
 
-#: src/main.c:192
+#: src/main.c:216
 msgid "Preserving set.\n"
 msgstr "Preserving set.\n"
 
-#: src/main.c:636
+#: src/main.c:691
 msgid "Resizing"
 msgstr "Resizing"
 
-#: src/main.c:643
+#: src/main.c:698
 msgid "_Resize All Frames"
 msgstr "_Resize All Frames"
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:895
+#: src/main.c:948
 msgid "Any"
 msgstr "Any"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:897
+#: src/main.c:950
 msgid "None"
 msgstr "None"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:899
+#: src/main.c:952
 msgid "recommended"
 msgstr "recommended"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:901
+#: src/main.c:954
 msgid "disabled !"
 msgstr "disabled !"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:903
+#: src/main.c:956
 msgid "**The current layout**"
 msgstr "**The current layout**"
 
 #. TRANSLATORS: adjective for "Built in" type effects
-#: src/main.c:905
+#: src/main.c:958
 msgid "Builtin"
 msgstr "Builtin"
 
 #. TRANSLATORS: adjective for "Custom" type effects
-#: src/main.c:907
+#: src/main.c:960
 msgid "Custom"
 msgstr "Custom"
 
 #. TRANSLATORS: adjective for "Test" type effects
-#: src/main.c:909
+#: src/main.c:962
 msgid "Test"
 msgstr "Test"
 
-#: src/main.c:1054
+#: src/main.c:1107
 msgid "Foreground"
 msgstr "Foreground"
 
-#: src/main.c:1055
+#: src/main.c:1108
 msgid "Background"
 msgstr "Background"
 
-#: src/main.c:1566
+#: src/main.c:1624
 msgid "Loading realtime effect plugins..."
 msgstr "Loading realtime effect plugins..."
 
-#: src/main.c:1631
+#: src/main.c:1690
 msgid "Starting jack audio server..."
 msgstr "Starting jack audio server..."
 
-#: src/main.c:1633
+#: src/main.c:1692
 msgid "Starting jack transport server..."
 msgstr "Starting jack transport server..."
 
-#: src/main.c:1634
+#: src/main.c:1693
 msgid "Connecting to jack transport server..."
 msgstr "Connecting to jack transport server..."
 
-#: src/main.c:1663
+#: src/main.c:1723
 #, c-format
 msgid ""
 "\n"
@@ -187,114 +186,114 @@
 "\n"
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 
-#: src/main.c:1697
+#: src/main.c:1758
 msgid "Starting pulse audio server..."
 msgstr "Starting pulse audio server..."
 
-#: src/main.c:1765
+#: src/main.c:1825
 msgid "Checking optional dependencies:"
 msgstr "Checking optional dependencies:"
 
-#: src/main.c:1766
+#: src/main.c:1826
 msgid "mplayer...detected..."
 msgstr "mplayer...detected..."
 
-#: src/main.c:1767
+#: src/main.c:1827
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...NOT DETECTED..."
 
-#: src/main.c:1768
+#: src/main.c:1828
 #, fuzzy
 msgid "mplayer2...detected..."
 msgstr "mplayer...detected..."
 
-#: src/main.c:1769
+#: src/main.c:1829
 #, fuzzy
 msgid "mplayer2...NOT DETECTED..."
 msgstr "mplayer...NOT DETECTED..."
 
-#: src/main.c:1770
+#: src/main.c:1830
 msgid "convert...detected..."
 msgstr "convert...detected..."
 
-#: src/main.c:1771
+#: src/main.c:1831
 msgid "convert...NOT DETECTED..."
 msgstr "convert...NOT DETECTED..."
 
-#: src/main.c:1772
+#: src/main.c:1832
 msgid "composite...detected..."
 msgstr "composite...detected..."
 
-#: src/main.c:1773
+#: src/main.c:1833
 msgid "composite...NOT DETECTED..."
 msgstr "composite...NOT DETECTED..."
 
-#: src/main.c:1774
+#: src/main.c:1834
 msgid "sox...detected\n"
 msgstr "sox...detected\n"
 
-#: src/main.c:1775
+#: src/main.c:1835
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...NOT DETECTED\n"
 
-#: src/main.c:1776
+#: src/main.c:1836
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...detected..."
 
-#: src/main.c:1777
+#: src/main.c:1837
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...NOT DETECTED..."
 
-#: src/main.c:1778
+#: src/main.c:1838
 msgid "jackd...detected..."
 msgstr "jackd...detected..."
 
-#: src/main.c:1779
+#: src/main.c:1839
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...NOT DETECTED..."
 
-#: src/main.c:1780
+#: src/main.c:1840
 msgid "pulse audio...detected..."
 msgstr "pulse audio...detected..."
 
-#: src/main.c:1781
+#: src/main.c:1841
 msgid "pulse audio...NOT DETECTED..."
 msgstr "pulse audio...NOT DETECTED..."
 
-#: src/main.c:1782
+#: src/main.c:1842
 msgid "python...detected..."
 msgstr "python...detected..."
 
-#: src/main.c:1783
+#: src/main.c:1843
 msgid "python...NOT DETECTED..."
 msgstr "python...NOT DETECTED..."
 
-#: src/main.c:1784
+#: src/main.c:1844
 msgid "dvgrab...detected..."
 msgstr "dvgrab...detected..."
 
-#: src/main.c:1785
+#: src/main.c:1845
 msgid "dvgrab...NOT DETECTED..."
 msgstr "dvgrab...NOT DETECTED..."
 
-#: src/main.c:1786
+#: src/main.c:1846
 msgid "xwininfo...detected..."
 msgstr "xwininfo...detected..."
 
-#: src/main.c:1787
+#: src/main.c:1847
 msgid "xwininfo...NOT DETECTED..."
 msgstr "xwininfo...NOT DETECTED..."
 
-#: src/main.c:1793
+#: src/main.c:1853
 #, c-format
 msgid "Windows version %04X"
 msgstr "Windows version %04X"
 
-#: src/main.c:1795
+#: src/main.c:1855
 msgid "UNKNOWN - please patch me !"
 msgstr "UNKNOWN - please patch me !"
 
-#: src/main.c:1799
+#: src/main.c:1859
 #, c-format
 msgid ""
 "\n"
@@ -305,48 +304,48 @@
 "\n"
 "Window manager reports as \"%s\"; "
 
-#: src/main.c:1802
+#: src/main.c:1862
 #, c-format
 msgid "number of monitors detected: %d\n"
 msgstr "number of monitors detected: %d\n"
 
-#: src/main.c:1805
+#: src/main.c:1865
 #, c-format
 msgid "Number of CPUs detected: %d "
 msgstr "Number of CPUs detected: %d "
 
-#: src/main.c:1808 src/multitrack.c:4902
+#: src/main.c:1868 src/multitrack.c:5068
 msgid "little endian"
 msgstr "little endian"
 
-#: src/main.c:1809 src/multitrack.c:4901
+#: src/main.c:1869 src/multitrack.c:5067
 msgid "big endian"
 msgstr "big endian"
 
-#: src/main.c:1810
+#: src/main.c:1870
 #, c-format
 msgid "(%d bits, %s)\n"
 msgstr "(%d bits, %s)\n"
 
-#: src/main.c:1814
+#: src/main.c:1874
 msgid "GUI type is: "
 msgstr "GUI type is: "
 
-#: src/main.c:1818
+#: src/main.c:1878
 #, c-format
 msgid "GTK+ version %d.%d.%d (compiled with %d.%d.%d)"
 msgstr "GTK+ version %d.%d.%d (compiled with %d.%d.%d)"
 
-#: src/main.c:1840
+#: src/main.c:1900
 msgid ", with cairo support"
 msgstr ", with cairo support"
 
-#: src/main.c:1847
+#: src/main.c:1907
 #, c-format
 msgid "Temp directory is %s\n"
 msgstr "Temp directory is %s\n"
 
-#: src/main.c:1851
+#: src/main.c:1911
 msgid ""
 "WARNING - this version of LiVES was compiled without either\n"
 "jack or pulse audio support.\n"
@@ -356,15 +355,15 @@
 "jack or pulse audio support.\n"
 "Many audio features will be unavailable.\n"
 
-#: src/main.c:1854
+#: src/main.c:1914
 msgid "Compiled with jack support, good !\n"
 msgstr "Compiled with jack support, good !\n"
 
-#: src/main.c:1857
+#: src/main.c:1917
 msgid "Compiled with pulse audio support, wonderful !\n"
 msgstr "Compiled with pulse audio support, wonderful !\n"
 
-#: src/main.c:1861
+#: src/main.c:1921
 #, c-format
 msgid ""
 "Welcome to LiVES version %s.\n"
@@ -373,7 +372,7 @@
 "Welcome to LiVES version %s.\n"
 "\n"
 
-#: src/main.c:2306
+#: src/main.c:2380
 #, c-format
 msgid ""
 "\n"
@@ -382,73 +381,79 @@
 "\n"
 "Startup syntax is: %s [opts] [filename [start_time] [frames]]\n"
 
-#: src/main.c:2307
+#: src/main.c:2381
 msgid "Where: filename is the name of a media file or backup file.\n"
 msgstr "Where: filename is the name of a media file or backup file.\n"
 
-#: src/main.c:2308
+#: src/main.c:2382
 msgid "start_time : filename start time in seconds\n"
 msgstr "start_time : filename start time in seconds\n"
 
-#: src/main.c:2309
+#: src/main.c:2383
 msgid "frames : maximum number of frames to open\n"
 msgstr "frames : maximum number of frames to open\n"
 
-#: src/main.c:2311
+#: src/main.c:2385
 msgid "opts can be:\n"
 msgstr "opts can be:\n"
 
-#: src/main.c:2312
+#: src/main.c:2386
 msgid "-help            : show this help text and exit\n"
 msgstr "-help            : show this help text and exit\n"
 
-#: src/main.c:2313
+#: src/main.c:2387
 msgid "-tmpdir <tempdir>: use alternate working directory (e.g /var/ramdisk)\n"
 msgstr ""
 "-tmpdir <tempdir>: use alternate working directory (e.g /var/ramdisk)\n"
 
-#: src/main.c:2314
+#: src/main.c:2388
 msgid "-set <setname>   : autoload clip set setname\n"
 msgstr "-set <setname>   : autoload clip set setname\n"
 
-#: src/main.c:2315
+#: src/main.c:2389
 msgid "-noset           : do not load any set on startup\n"
 msgstr "-noset           : do not load any set on startup\n"
 
-#: src/main.c:2316
+#: src/main.c:2390
 msgid "-norecover       : force no-loading of crash recovery\n"
 msgstr "-norecover       : force no-loading of crash recovery\n"
 
-#: src/main.c:2317
+#: src/main.c:2391
 msgid "-recover         : force loading of crash recovery\n"
 msgstr "-recover         : force loading of crash recovery\n"
 
-#: src/main.c:2318
-msgid "-nothreaddialog  : doe nothing - retained for backwards compatibility\n"
+#: src/main.c:2392
+#, fuzzy
+msgid ""
+"-nothreaddialog  : does nothing - retained for backwards compatibility\n"
 msgstr ""
 "-nothreaddialog  : does nothing - retained for backwards compatibility\n"
 
-#: src/main.c:2319
+#: src/main.c:2393
 msgid "-nogui           : do not show the gui\n"
 msgstr "-nogui           : do not show the gui\n"
 
-#: src/main.c:2320
+#: src/main.c:2394
 msgid "-nosplash        : do not show the splash window\n"
 msgstr "-nosplash        : do not show the splash window\n"
 
-#: src/main.c:2321
+#: src/main.c:2395
 msgid "-noplaywin       : do not show the play window\n"
 msgstr "-noplaywin       : do not show the play window\n"
 
-#: src/main.c:2322
+#: src/main.c:2396
+msgid "-noninteractive  : disable menu interactivity\n"
+msgstr ""
+
+#: src/main.c:2397
 msgid "-startup-ce      : start in clip editor mode\n"
 msgstr "-startup-ce      : start in clip editor mode\n"
 
-#: src/main.c:2323
+#: src/main.c:2398
 msgid "-startup-mt      : start in multitrack mode\n"
 msgstr "-startup-mt      : start in multitrack mode\n"
 
-#: src/main.c:2324
+#: src/main.c:2399
 msgid ""
 "-fxmodesmax <n>  : allow <n> modes per effect key (minimum is 1, default is "
 "8)\n"
@@ -456,15 +461,15 @@
 "-fxmodesmax <n>  : allow <n> modes per effect key (minimum is 1, default is "
 "8)\n"
 
-#: src/main.c:2326
+#: src/main.c:2401
 msgid "-oscstart <port> : start OSC listener on UDP port <port>\n"
 msgstr "-oscstart <port> : start OSC listener on UDP port <port>\n"
 
-#: src/main.c:2327
+#: src/main.c:2402
 msgid "-nooscstart      : do not start OSC listener\n"
 msgstr "-nooscstart      : do not start OSC listener\n"
 
-#: src/main.c:2329
+#: src/main.c:2404
 #, fuzzy
 msgid ""
 "-aplayer <ap>    : start with selected audio player. <ap> can be mplayer, "
@@ -473,15 +478,15 @@
 "-aplayer <ap>    : start with selected audio player. <ap> may be mplayer"
 
 #. TRANSLATORS: pulse (audio)
-#: src/main.c:2332
+#: src/main.c:2407
 msgid ", pulse"
 msgstr ", pulse"
 
-#: src/main.c:2335
+#: src/main.c:2410
 msgid ", sox or jack\n"
 msgstr ", sox or jack\n"
 
-#: src/main.c:2336
+#: src/main.c:2412
 msgid ""
 "-jackopts <opts>    : opts is a bitmap of jack startup options [1 = jack "
 "transport client, 2 = jack transport master, 4 = start jack transport "
@@ -491,15 +496,15 @@
 "transport client, 2 = jack transport master, 4 = start jack transport "
 "server, 8 = pause audio when video paused, 16 = start jack audio server] \n"
 
-#: src/main.c:2338
+#: src/main.c:2414
 msgid " or sox\n"
 msgstr " or sox\n"
 
-#: src/main.c:2340
+#: src/main.c:2416
 msgid "-devicemap <mapname>          : autoload devicemap\n"
 msgstr "-devicemap <mapname>          : autoload devicemap\n"
 
-#: src/main.c:2341
+#: src/main.c:2418
 msgid ""
 "-vppdefaults <file>          : load video playback plugin defaults from "
 "<file> (Note: only sets the settings, not the plugin type)\n"
@@ -507,15 +512,15 @@
 "-vppdefaults <file>          : load video playback plugin defaults from "
 "<file> (Note: only sets the settings, not the plugin type)\n"
 
-#: src/main.c:2342
+#: src/main.c:2419
 msgid "-debug            : try to debug crashes (requires 'gdb' installed)\n"
 msgstr "-debug            : try to debug crashes (requires 'gdb' installed)\n"
 
-#: src/main.c:2373 src/gui.c:1128
+#: src/main.c:2449 src/gui.c:1127
 msgid "Starting GUI..."
 msgstr "Starting GUI..."
 
-#: src/main.c:2396
+#: src/main.c:2475
 #, c-format
 msgid ""
 "\n"
@@ -532,7 +537,7 @@
 "%s/%s.\n"
 "(Maybe you need to change the value of <prefix_dir> in your %s file)\n"
 
-#: src/main.c:2410
+#: src/main.c:2492
 #, c-format
 msgid ""
 "\n"
@@ -543,7 +548,7 @@
 "LiVES was unable to write a small file to %s\n"
 "Please make sure you have write access to %s and try again.\n"
 
-#: src/main.c:2415
+#: src/main.c:2498
 msgid ""
 "\n"
 "`smogrify` must be in your path, and be executable\n"
@@ -557,7 +562,7 @@
 "Please review the README file which came with this package\n"
 "before running LiVES.\n"
 
-#: src/main.c:2421
+#: src/main.c:2504
 #, c-format
 msgid ""
 "\n"
@@ -572,7 +577,7 @@
 "\n"
 "Please check the file permissions for this file and try again.\n"
 
-#: src/main.c:2428
+#: src/main.c:2512
 #, c-format
 msgid ""
 "\n"
@@ -589,7 +594,7 @@
 "Please check the file permissions for this file and directory\n"
 "and try again.\n"
 
-#: src/main.c:2438
+#: src/main.c:2522
 #, c-format
 msgid ""
 "Please check the <tempdir> setting in \n"
@@ -600,7 +605,7 @@
 "%s\n"
 "and try again.\n"
 
-#: src/main.c:2445
+#: src/main.c:2528
 #, c-format
 msgid ""
 "\n"
@@ -615,7 +620,7 @@
 "\n"
 "%s"
 
-#: src/main.c:2453
+#: src/main.c:2536
 msgid ""
 "\n"
 "An incorrect version of smogrify was found in your path.\n"
@@ -633,7 +638,7 @@
 "\n"
 "Thankyou.\n"
 
-#: src/main.c:2458
+#: src/main.c:2541
 #, fuzzy
 msgid ""
 "\n"
@@ -644,7 +649,7 @@
 "LiVES currently requires either 'mplayer' or 'sox' to function. Please "
 "install one or other of these, and try again.\n"
 
-#: src/main.c:2462
+#: src/main.c:2546
 #, fuzzy
 msgid ""
 "\n"
@@ -655,7 +660,7 @@
 "LiVES currently requires both 'mplayer' and 'sox' to function. Please "
 "install these, and try again.\n"
 
-#: src/main.c:2472
+#: src/main.c:2556
 #, fuzzy
 msgid ""
 "\n"
@@ -666,7 +671,7 @@
 "LiVES was unable to locate 'mplayer'. You may wish to install mplayer to use "
 "LiVES more fully.\n"
 
-#: src/main.c:2475
+#: src/main.c:2561
 msgid ""
 "\n"
 "LiVES was unable to locate 'convert'. You should install convert and image-"
@@ -676,7 +681,7 @@
 "LiVES was unable to locate 'convert'. You should install convert and image-"
 "magick if you want to use rendered effects.\n"
 
-#: src/main.c:2478
+#: src/main.c:2566
 msgid ""
 "\n"
 "LiVES was unable to locate 'composite'. You should install composite and "
@@ -686,7 +691,7 @@
 "LiVES was unable to locate 'composite'. You should install composite and "
 "image-magick if you want to use the merge function.\n"
 
-#: src/main.c:2481
+#: src/main.c:2570
 msgid ""
 "\n"
 "LiVES was unable to locate 'sox'. Some audio features may not work. You "
@@ -696,7 +701,7 @@
 "LiVES was unable to locate 'sox'. Some audio features may not work. You "
 "should install 'sox'.\n"
 
-#: src/main.c:2484
+#: src/main.c:2575
 #, c-format
 msgid ""
 "\n"
@@ -713,59 +718,59 @@
 "You will not be able to 'Save' without them.\n"
 "You may need to change the value of <lib_dir> in %s\n"
 
-#: src/main.c:2611
+#: src/main.c:2707
 #, c-format
 msgid "Autoloading set %s..."
 msgstr "Autoloading set %s..."
 
 #. TRANSLATORS: localised name may be used here
-#: src/main.c:2781 src/interface.c:738
+#: src/main.c:2902
 msgid "LiVES"
 msgstr "LiVES"
 
-#: src/main.c:2948
+#: src/main.c:3066
 #, c-format
 msgid "Invalid audio player %s\n"
 msgstr "Invalid audio player %s\n"
 
-#: src/main.c:3077
+#: src/main.c:3214
 #, c-format
 msgid "LiVES-%s: <Untitled%d> %dx%d : %d frames %d bpp %.3f fps"
 msgstr "LiVES-%s: <Untitled%d> %dx%d : %d frames %d bpp %.3f fps"
 
-#: src/main.c:3082
+#: src/main.c:3219
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : ??? frames ??? bpp %.3f fps"
 msgstr "LiVES-%s: <%s> %dx%d : ??? frames ??? bpp %.3f fps"
 
-#: src/main.c:3086
+#: src/main.c:3222
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : %d frames %d bpp %.3f fps"
 msgstr "LiVES-%s: <%s> %dx%d : %d frames %d bpp %.3f fps"
 
-#: src/main.c:3094
+#: src/main.c:3229
 #, c-format
 msgid "LiVES-%s: <No File>"
 msgstr "LiVES-%s: <No File>"
 
 #. TRANSLATORS: rec(ord)
-#: src/main.c:5085
+#: src/main.c:5201
 #, c-format
 msgid "rec %9d/%d"
 msgstr "rec %9d/%d"
 
 #. TRANSLATORS: out of memory (rec(ord))
-#: src/main.c:5091
+#: src/main.c:5206
 #, c-format
 msgid "!rec %9d/%d"
 msgstr "!rec %9d/%d"
 
-#: src/main.c:5398 src/main.c:5399 src/gui.c:2110 src/gui.c:3220
-#: src/saveplay.c:2336
+#: src/main.c:5500 src/main.c:5501 src/gui.c:2108 src/gui.c:3331
+#: src/saveplay.c:2315
 msgid "Play"
 msgstr "Play"
 
-#: src/main.c:6128
+#: src/main.c:6216
 msgid ""
 "LiVES was unable to capture this image\n"
 "\n"
@@ -773,35 +778,35 @@
 "LiVES was unable to capture this image\n"
 "\n"
 
-#: src/main.c:6250
+#: src/main.c:6345
 #, c-format
 msgid "Closed file %s\n"
 msgstr "Closed file %s\n"
 
-#: src/main.c:6452 src/gui.c:648 src/utils.c:4312 src/utils.c:4344
-#: src/saveplay.c:3550 src/multitrack.c:4510 src/multitrack.c:6268
+#: src/main.c:6542 src/gui.c:647 src/utils.c:4256 src/utils.c:4286
+#: src/saveplay.c:3500 src/multitrack.c:4678 src/multitrack.c:6447
 msgid "_Undo"
 msgstr "_Undo"
 
-#: src/main.c:6453 src/gui.c:666 src/utils.c:4313 src/utils.c:4345
-#: src/saveplay.c:3551 src/multitrack.c:4531 src/multitrack.c:6293
+#: src/main.c:6543 src/gui.c:665 src/utils.c:4257 src/utils.c:4287
+#: src/saveplay.c:3501 src/multitrack.c:4698 src/multitrack.c:6472
 msgid "_Redo"
 msgstr "_Redo"
 
-#: src/main.c:6493 src/interface.c:470 src/gui.c:2326 src/preferences.c:2357
-#: src/resample.c:1516
+#: src/main.c:6583 src/interface.c:457 src/gui.c:2324 src/preferences.c:2391
+#: src/resample.c:1488
 msgid "Video"
 msgstr "Video"
 
-#: src/main.c:6494 src/interface.c:483 src/gui.c:2351
+#: src/main.c:6584 src/interface.c:470 src/gui.c:2348
 msgid "Left Audio"
 msgstr "Left Audio"
 
-#: src/main.c:6495 src/gui.c:2375
+#: src/main.c:6585 src/gui.c:2371
 msgid "Right Audio"
 msgstr "Right Audio"
 
-#: src/main.c:6540
+#: src/main.c:6630
 #, fuzzy
 msgid ""
 "\n"
@@ -816,11 +821,11 @@
 "mplayer.\n"
 "Please adjust the playback options in Preferences and try again.\n"
 
-#: src/main.c:7051 src/plugins.c:1502
+#: src/main.c:7134 src/plugins.c:1468
 msgid "LiVES: - Play Window"
 msgstr "LiVES: - Play Window"
 
-#: src/startup.c:25
+#: src/startup.c:24
 #, c-format
 msgid ""
 "A directory named\n"
@@ -835,7 +840,7 @@
 "\n"
 "(Free space = %s)\n"
 
-#: src/startup.c:32
+#: src/startup.c:29
 #, c-format
 msgid ""
 "A directory named\n"
@@ -850,7 +855,7 @@
 "LiVES could not write to this directory or read its free space.\n"
 "Please select another location.\n"
 
-#: src/startup.c:49
+#: src/startup.c:46
 #, c-format
 msgid ""
 "\n"
@@ -867,7 +872,7 @@
 "\n"
 "(Free space = %s)"
 
-#: src/startup.c:54
+#: src/startup.c:50
 #, c-format
 msgid ""
 "\n"
@@ -880,11 +885,11 @@
 "%s\n"
 "Please try again and choose a different location.\n"
 
-#: src/startup.c:96
+#: src/startup.c:92
 msgid "Directory name is too long !"
 msgstr "Directory name is too long !"
 
-#: src/startup.c:223
+#: src/startup.c:216
 msgid ""
 "LiVES FAILED TO START YOUR SELECTED AUDIO PLAYER !\n"
 "\n"
@@ -892,7 +897,7 @@
 "LiVES FAILED TO START YOUR SELECTED AUDIO PLAYER !\n"
 "\n"
 
-#: src/startup.c:230
+#: src/startup.c:222
 msgid ""
 "Before starting LiVES, you need to choose an audio player.\n"
 "\n"
@@ -902,7 +907,7 @@
 "\n"
 "PULSE AUDIO is recommended for most users"
 
-#: src/startup.c:233
+#: src/startup.c:225
 msgid ""
 ", but this version of LiVES was not compiled with pulse audio support.\n"
 "\n"
@@ -910,7 +915,7 @@
 ", but this version of LiVES was not compiled with pulse audio support.\n"
 "\n"
 
-#: src/startup.c:236
+#: src/startup.c:229
 msgid ""
 ", but you do not have pulse audio installed on your system.\n"
 " You are advised to install pulse audio first before running LiVES.\n"
@@ -920,11 +925,11 @@
 " You are advised to install pulse audio first before running LiVES.\n"
 "\n"
 
-#: src/startup.c:241
+#: src/startup.c:233
 msgid "JACK audio is recommended for pro users"
 msgstr "JACK audio is recommended for pro users"
 
-#: src/startup.c:244
+#: src/startup.c:236
 msgid ""
 ", but this version of LiVES was not compiled with jack audio support.\n"
 "\n"
@@ -932,7 +937,7 @@
 ", but this version of LiVES was not compiled with jack audio support.\n"
 "\n"
 
-#: src/startup.c:247
+#: src/startup.c:239
 msgid ""
 ", but you do not have jackd installed. You may wish to install jackd first "
 "before running LiVES.\n"
@@ -942,7 +947,7 @@
 "before running LiVES.\n"
 "\n"
 
-#: src/startup.c:250
+#: src/startup.c:242
 msgid ""
 ", but may prevent LiVES from starting on some systems.\n"
 "If LiVES will not start with jack, you can restart and try with another "
@@ -954,11 +959,11 @@
 "audio player instead.\n"
 "\n"
 
-#: src/startup.c:254
+#: src/startup.c:246
 msgid "SOX may be used if neither of the preceding players work, "
 msgstr "SOX may be used if neither of the preceding players work, "
 
-#: src/startup.c:257
+#: src/startup.c:249
 msgid ""
 "but some audio features will be disabled.\n"
 "\n"
@@ -966,7 +971,7 @@
 "but some audio features will be disabled.\n"
 "\n"
 
-#: src/startup.c:260
+#: src/startup.c:251
 msgid ""
 "but you do not have sox installed.\n"
 "You are advised to install it before running LiVES.\n"
@@ -976,7 +981,7 @@
 "You are advised to install it before running LiVES.\n"
 "\n"
 
-#: src/startup.c:264
+#: src/startup.c:255
 #, fuzzy
 msgid ""
 "The MPLAYER/MPLAYER2 audio player is only recommended for testing purposes.\n"
@@ -985,96 +990,96 @@
 "The MPLAYER audio player is only recommended for testing purposes.\n"
 "\n"
 
-#: src/startup.c:281
+#: src/startup.c:271
 msgid "LiVES: - Choose an audio player"
 msgstr "LiVES: - Choose an audio player"
 
-#: src/startup.c:298
+#: src/startup.c:288
 msgid "Use _pulse audio player"
 msgstr "Use _pulse audio player"
 
-#: src/startup.c:320
+#: src/startup.c:310
 msgid "Use _jack audio player"
 msgstr "Use _jack audio player"
 
-#: src/startup.c:340
+#: src/startup.c:330
 msgid "Use _sox audio player"
 msgstr "Use _sox audio player"
 
-#: src/startup.c:361
+#: src/startup.c:351
 msgid "Use _mplayer audio player"
 msgstr "Use _mplayer audio player"
 
-#: src/startup.c:381
+#: src/startup.c:371
 #, fuzzy
 msgid "Use _mplayer2 audio player"
 msgstr "Use _mplayer audio player"
 
-#: src/startup.c:405 src/startup.c:580 src/interface.c:1506
+#: src/startup.c:395 src/startup.c:569 src/interface.c:1398
 msgid "_Next"
 msgstr "_Next"
 
-#: src/startup.c:445
+#: src/startup.c:435
 msgid "Skipped"
 msgstr "Skipped"
 
-#: src/startup.c:460
+#: src/startup.c:450
 msgid "Passed"
 msgstr "Passed"
 
-#: src/startup.c:493
+#: src/startup.c:483
 msgid "Failed"
 msgstr "Failed"
 
-#: src/startup.c:552
+#: src/startup.c:542
 msgid "LiVES: - Testing Configuration"
 msgstr "LiVES: - Testing Configuration"
 
-#: src/startup.c:555
+#: src/startup.c:544
 msgid "LiVES: - Troubleshoot"
 msgstr "LiVES: - Troubleshoot"
 
-#: src/startup.c:568
+#: src/startup.c:557
 msgid "LiVES will now run some basic configuration tests\n"
 msgstr "LiVES will now run some basic configuration tests\n"
 
-#: src/startup.c:603
+#: src/startup.c:591
 msgid "Checking for \"sox\" presence"
 msgstr "Checking for \"sox\" presence"
 
-#: src/startup.c:607
+#: src/startup.c:595
 msgid ""
 "You should install sox to be able to use all the audio features in LiVES"
 msgstr ""
 "You should install sox, to be able to use all the audio features in LiVES"
 
-#: src/startup.c:615
+#: src/startup.c:602
 msgid "Checking if sox can convert audio"
 msgstr "Checking if sox can convert audio"
 
-#: src/startup.c:638
+#: src/startup.c:625
 msgid "Unable to allocate 176400 bytes memory."
 msgstr "Unable to allocate 176400 bytes memory."
 
-#: src/startup.c:653
+#: src/startup.c:639
 #, c-format
 msgid "Unable to write to: %s"
 msgstr "Unable to write to: %s"
 
-#: src/startup.c:667 src/startup.c:807
+#: src/startup.c:653 src/startup.c:789
 #, c-format
 msgid "Command failed: %s"
 msgstr "Command failed: %s"
 
-#: src/startup.c:689
+#: src/startup.c:675
 msgid "You should install sox_fmt_all or similar"
 msgstr "You should install sox_fmt_all or similar"
 
-#: src/startup.c:717
+#: src/startup.c:703
 msgid "Checking for \"mplayer\" presence"
 msgstr "Checking for \"mplayer\" presence"
 
-#: src/startup.c:721
+#: src/startup.c:707
 #, fuzzy
 msgid ""
 "You should install mplayer or mplayer2 to be able to use all the decoding "
@@ -1083,44 +1088,44 @@
 "You should install mplayer, to be able to use all the decoding features in "
 "LiVES"
 
-#: src/startup.c:747
+#: src/startup.c:732
 msgid "Checking if mplayer can convert audio"
 msgstr "Checking if mplayer can convert audio"
 
-#: src/startup.c:768
+#: src/startup.c:751
 #, fuzzy
 msgid "You should install mplayer or mplayer2 with pcm/wav support"
 msgstr "You should install mplayer with pcm/wav support"
 
-#: src/startup.c:785
+#: src/startup.c:767
 msgid "Checking if mplayer can decode to png/alpha"
 msgstr "Checking if mplayer can decode to png/alpha"
 
-#: src/startup.c:828
+#: src/startup.c:810
 msgid "You may wish to upgrade mplayer to a newer version"
 msgstr "You may wish to upgrade mplayer to a newer version"
 
-#: src/startup.c:854
+#: src/startup.c:836
 msgid "Checking if mplayer can decode to jpeg"
 msgstr "Checking if mplayer can decode to jpeg"
 
-#: src/startup.c:882
+#: src/startup.c:862
 msgid "You should install mplayer with either png/alpha or jpeg support"
 msgstr "You should install mplayer with either png/alpha or jpeg support"
 
-#: src/startup.c:883
+#: src/startup.c:863
 msgid "You may wish to add jpeg output support to mplayer"
 msgstr "You may wish to add jpeg output support to mplayer"
 
-#: src/startup.c:892
+#: src/startup.c:872
 msgid "Checking for \"convert\" presence"
 msgstr "Checking for \"convert\" presence"
 
-#: src/startup.c:896
+#: src/startup.c:876
 msgid "Install imageMagick to be able to use all of the rendered effects"
 msgstr "Install imageMagick, to be able to use all of the rendered effects"
 
-#: src/startup.c:909
+#: src/startup.c:889
 msgid ""
 "\n"
 "\n"
@@ -1132,7 +1137,7 @@
 "    Image decoding type has been switched to jpeg. You can revert this in "
 "Preferences/Decoding.    \n"
 
-#: src/startup.c:915
+#: src/startup.c:894
 msgid ""
 "\n"
 "\n"
@@ -1144,7 +1149,7 @@
 "    Click Cancel to exit and install any missing components, or Next to "
 "continue    \n"
 
-#: src/startup.c:949
+#: src/startup.c:928
 msgid ""
 "\n"
 "\n"
@@ -1154,7 +1159,7 @@
 "\n"
 "Finally, you can choose the default startup interface for LiVES.\n"
 
-#: src/startup.c:950
+#: src/startup.c:929
 msgid ""
 "\n"
 "\n"
@@ -1164,7 +1169,7 @@
 "\n"
 "LiVES has two main interfaces and you can start up with either of them.\n"
 
-#: src/startup.c:951
+#: src/startup.c:930
 msgid ""
 "\n"
 "\n"
@@ -1174,29 +1179,29 @@
 "\n"
 "The default can always be changed later from Preferences.\n"
 
-#: src/startup.c:961
+#: src/startup.c:940
 msgid "LiVES: - Choose the startup interface"
 msgstr "LiVES: - Choose the startup interface"
 
-#: src/startup.c:972
+#: src/startup.c:951
 msgid "Start in _Clip Edit mode"
 msgstr "Start in _Clip Edit mode"
 
-#: src/startup.c:975
+#: src/startup.c:954
 msgid "This is the best choice for simple editing tasks and for VJs\n"
 msgstr "This is the best choice for simple editing tasks and for VJs\n"
 
-#: src/startup.c:981
+#: src/startup.c:960
 msgid "Start in _Multitrack mode"
 msgstr "Start in _Multitrack mode"
 
-#: src/startup.c:983
+#: src/startup.c:962
 msgid ""
 "This is a better choice for complex editing tasks involving multiple clips.\n"
 msgstr ""
 "This is a better choice for complex editing tasks involving multiple clips.\n"
 
-#: src/startup.c:992
+#: src/startup.c:971
 msgid "_Finish"
 msgstr "_Finish"
 
@@ -1213,35 +1218,35 @@
 msgid "Apply _Deinterlace"
 msgstr "Apply _Deinterlace"
 
-#: src/interface.c:66
+#: src/interface.c:65
 msgid "If this is set, frames will be deinterlaced as they are imported."
 msgstr "If this is set, frames will be deinterlaced as they are imported."
 
-#: src/interface.c:113 src/callbacks.c:9623 src/callbacks.c:9646
-#: src/callbacks.c:9647 src/gui.c:3223 src/gui.c:3821 src/saveplay.c:2339
-#: src/saveplay.c:3138 src/dialogs.c:1514 src/dialogs.c:1515
-#: src/dialogs.c:1746 src/dialogs.c:1747 src/framedraw.c:238
-#: src/multitrack.c:8031
+#: src/interface.c:106 src/callbacks.c:9542 src/callbacks.c:9564
+#: src/callbacks.c:9565 src/gui.c:3333 src/gui.c:3946 src/saveplay.c:2317
+#: src/saveplay.c:3097 src/dialogs.c:1575 src/dialogs.c:1576
+#: src/dialogs.c:1804 src/dialogs.c:1805 src/framedraw.c:236
+#: src/multitrack.c:8210
 msgid "Preview"
 msgstr "Preview"
 
-#: src/interface.c:132
+#: src/interface.c:125
 msgid "Click here to _Preview any selected video, image or audio file"
 msgstr "Click here to _Preview any selected video, image or audio file"
 
-#: src/interface.c:135
+#: src/interface.c:127
 msgid "Click here to _Preview any selected audio file"
 msgstr "Click here to _Preview any selected audio file"
 
-#: src/interface.c:138
+#: src/interface.c:129
 msgid "Click here to _Preview the video"
 msgstr "Click here to _Preview the video"
 
-#: src/interface.c:181 src/dialogs.c:2542
+#: src/interface.c:169 src/dialogs.c:2621
 msgid "LiVES: - Processing..."
 msgstr "LiVES: - Processing..."
 
-#: src/interface.c:217
+#: src/interface.c:205
 msgid ""
 "\n"
 "\n"
@@ -1255,8 +1260,8 @@
 "\n"
 "Remember to switch off effects (ctrl-0) afterwards !"
 
-#: src/interface.c:222 src/callbacks.c:9373 src/callbacks.c:9420
-#: src/dialogs.c:2570
+#: src/interface.c:210 src/callbacks.c:9283 src/callbacks.c:9332
+#: src/dialogs.c:2649
 msgid ""
 "\n"
 "Please Wait"
@@ -1264,100 +1269,100 @@
 "\n"
 "Please Wait"
 
-#: src/interface.c:242
+#: src/interface.c:230
 msgid "Show Details"
 msgstr "Show Details"
 
-#: src/interface.c:254 src/dialogs.c:2584
+#: src/interface.c:242 src/dialogs.c:2663
 msgid "_Enough"
 msgstr "_Enough"
 
-#: src/interface.c:255 src/framedraw.c:278
+#: src/interface.c:243 src/framedraw.c:276
 msgid "_Preview"
 msgstr "_Preview"
 
-#: src/interface.c:257
+#: src/interface.c:245 src/callbacks.c:9282 src/callbacks.c:9330
 msgid "Paus_e"
 msgstr "Paus_e"
 
-#: src/interface.c:258 src/callbacks.c:9417
+#: src/interface.c:246 src/callbacks.c:9329
 msgid "Pause/_Enough"
 msgstr "Pause/_Enough"
 
-#: src/interface.c:285
+#: src/interface.c:273
 msgid "_Cancel"
 msgstr "_Cancel"
 
-#: src/interface.c:374
+#: src/interface.c:361
 #, c-format
 msgid "LiVES: - %s"
 msgstr "LiVES: - %s"
 
-#: src/interface.c:376
+#: src/interface.c:363
 msgid "LiVES: - Multitrack details"
 msgstr "LiVES: - Multitrack details"
 
-#: src/interface.c:407
+#: src/interface.c:394
 msgid "Format"
 msgstr "Format"
 
-#: src/interface.c:412
+#: src/interface.c:399
 msgid "Frame size"
 msgstr "Frame size"
 
-#: src/interface.c:417
+#: src/interface.c:404
 msgid "File size"
 msgstr "File size"
 
-#: src/interface.c:418
+#: src/interface.c:405
 msgid "Byte size"
 msgstr "Byte size"
 
-#: src/interface.c:423 src/interface.c:1891
+#: src/interface.c:410 src/interface.c:1760
 msgid "FPS"
 msgstr "FPS"
 
-#: src/interface.c:428
+#: src/interface.c:415
 msgid "Frames"
 msgstr "Frames"
 
-#: src/interface.c:429
+#: src/interface.c:416
 msgid "Events"
 msgstr "Events"
 
-#: src/interface.c:434 src/interface.c:500 src/interface.c:542
+#: src/interface.c:421 src/interface.c:486 src/interface.c:528
 msgid "Total time"
 msgstr "Total time"
 
-#: src/interface.c:486 src/resample.c:1488
+#: src/interface.c:472 src/resample.c:1460
 msgid "Audio"
 msgstr "Audio"
 
-#: src/interface.c:511 src/interface.c:553
+#: src/interface.c:497 src/interface.c:539
 msgid "Rate/size"
 msgstr "Rate/size"
 
-#: src/interface.c:530
+#: src/interface.c:516
 msgid "Right audio"
 msgstr "Right audio"
 
-#: src/interface.c:622
+#: src/interface.c:607
 msgid "LiVES: - Encoding options"
 msgstr "LiVES: - Encoding options"
 
-#: src/interface.c:636
+#: src/interface.c:621
 msgid "<------------- (Check the box to re_size as suggested)"
 msgstr "<------------- (Check the box to re_size as suggested)"
 
-#: src/interface.c:637
+#: src/interface.c:622
 msgid "<------------- (Check the box to use the _size recommendation)"
 msgstr "<------------- (Check the box to use the _size recommendation)"
 
-#: src/interface.c:662
+#: src/interface.c:646
 msgid "Use _letterboxing to maintain aspect ratio (optional)"
 msgstr "Use _letterboxing to maintain aspect ratio (optional)"
 
-#: src/interface.c:663
+#: src/interface.c:647
 msgid ""
 "Draw black rectangles either above or to the sides of the image, to prevent "
 "it from stretching."
@@ -1365,91 +1370,79 @@
 "Draw black rectangles either above or to the sides of the image, to prevent "
 "it from stretching."
 
-#: src/interface.c:694
+#: src/interface.c:677
 msgid "Keep _my settings"
 msgstr "Keep _my settings"
 
-#: src/interface.c:695
+#: src/interface.c:678
 msgid "Use _recommended settings"
 msgstr "Use _recommended settings"
 
-#: src/interface.c:775 src/dialogs.c:114
-msgid ""
-"Do _not show this warning any more\n"
-"(can be turned back on from Preferences/Warnings)"
-msgstr ""
-"Do _not show this warning any more\n"
-"(can be turned back on from Preferences/Warnings)"
-
-#: src/interface.c:787
-msgid "Show _Details"
-msgstr "Show _Details"
-
-#: src/interface.c:881
+#: src/interface.c:769
 msgid "_Close Window"
 msgstr "_Close Window"
 
-#: src/interface.c:883
+#: src/interface.c:771
 msgid "_Save to file"
 msgstr "_Save to file"
 
-#: src/interface.c:928
+#: src/interface.c:816
 msgid "LiVES: - Insert"
 msgstr "LiVES: - Insert"
 
-#: src/interface.c:945
+#: src/interface.c:833
 msgid "_Number of times to insert"
 msgstr "_Number of times to insert"
 
-#: src/interface.c:954
+#: src/interface.c:842
 msgid "_Insert to fit audio"
 msgstr "_Insert to fit audio"
 
-#: src/interface.c:968
+#: src/interface.c:856
 msgid "Insert _before selection"
 msgstr "Insert _before selection"
 
-#: src/interface.c:970
+#: src/interface.c:858
 msgid "Insert clipboard before selected frames"
 msgstr "Insert clipboard before selected frames"
 
-#: src/interface.c:986
+#: src/interface.c:875
 msgid "Insert _after selection"
 msgstr "Insert _after selection"
 
-#: src/interface.c:988
+#: src/interface.c:877
 msgid "Insert clipboard after selected frames"
 msgstr "Insert clipboard after selected frames"
 
-#: src/interface.c:999
+#: src/interface.c:888
 msgid "Insert _with sound"
 msgstr "Insert _with sound"
 
-#: src/interface.c:1012
+#: src/interface.c:901
 msgid "Insert with_out sound"
 msgstr "Insert with_out sound"
 
-#: src/interface.c:1093
+#: src/interface.c:985
 msgid "LiVES: - Open Selection"
 msgstr "LiVES: - Open Selection"
 
-#: src/interface.c:1111
+#: src/interface.c:1004
 msgid "Selection start time (sec)"
 msgstr "Selection start time (sec)"
 
-#: src/interface.c:1117
+#: src/interface.c:1010
 msgid "Number of frames to open"
 msgstr "Number of frames to open"
 
-#: src/interface.c:1193
+#: src/interface.c:1088
 msgid "LiVES: - Open Location"
 msgstr "LiVES: - Open Location"
 
-#: src/interface.c:1195
+#: src/interface.c:1090
 msgid "LiVES: - Open Youtube Clip"
 msgstr "LiVES: - Open Youtube Clip"
 
-#: src/interface.c:1213
+#: src/interface.c:1109
 msgid ""
 "\n"
 "\n"
@@ -1465,7 +1458,7 @@
 "Also make sure you have set your bandwidth in Preferences|Streaming\n"
 "\n"
 
-#: src/interface.c:1216
+#: src/interface.c:1112
 msgid ""
 "\n"
 "\n"
@@ -1479,7 +1472,7 @@
 "Please make sure you have the latest version of that tool installed.\n"
 "\n"
 
-#: src/interface.c:1220
+#: src/interface.c:1116
 msgid ""
 "Enter the URL of the clip below.\n"
 "E.g: http://www.youtube.com/watch?v=WCR6f6WzjP8\n"
@@ -1489,55 +1482,56 @@
 "E.g: https://www.youtube.com/watch?v=WCR6f6WzjP8\n"
 "\n"
 
-#: src/interface.c:1231
+#: src/interface.c:1127
 msgid "URL : "
 msgstr "URL : "
 
-#: src/interface.c:1231
+#: src/interface.c:1127
 msgid "Youtube URL : "
 msgstr "Youtube URL : "
 
-#: src/interface.c:1235
+#: src/interface.c:1131
 msgid "Do not send bandwidth information"
 msgstr "Do not send bandwidth information"
 
-#: src/interface.c:1237
+#: src/interface.c:1133
 msgid "Try this setting if you are having problems getting a stream"
 msgstr "Try this setting if you are having problems getting a stream"
 
-#: src/interface.c:1258
+#: src/interface.c:1155
 msgid "Download to _Directory : "
 msgstr "Download to _Directory : "
 
-#: src/interface.c:1276
+#: src/interface.c:1173
 msgid "Download _File Name : "
 msgstr "Download _File Name : "
 
-#: src/interface.c:1281
+#: src/interface.c:1178
 msgid ".webm"
 msgstr ".webm"
 
-#: src/interface.c:1359
+#: src/interface.c:1256
 msgid "LiVES: - Rename Clip"
 msgstr "LiVES: - Rename Clip"
 
-#: src/interface.c:1362
-msgid "LiVES: - Enter Set Name"
-msgstr "LiVES: - Enter Set Name"
+#: src/interface.c:1258
+#, fuzzy
+msgid "LiVES: - Enter Set Name to Save as"
+msgstr "LiVES: - Enter a Set Name to Reload"
 
-#: src/interface.c:1365
+#: src/interface.c:1260
 msgid "LiVES: - Enter a Set Name to Reload"
 msgstr "LiVES: - Enter a Set Name to Reload"
 
-#: src/interface.c:1368
+#: src/interface.c:1262
 msgid "LiVES: - Choose a Working Directory"
 msgstr "LiVES: - Choose a Working Directory"
 
-#: src/interface.c:1371
+#: src/interface.c:1264
 msgid "LiVES: - Rename Current Track"
 msgstr "LiVES: - Rename Current Track"
 
-#: src/interface.c:1391
+#: src/interface.c:1283
 msgid ""
 "You need to enter a name for the current clip set.\n"
 "This will allow you reload the layout with the same clips later.\n"
@@ -1549,7 +1543,7 @@
 "Please enter the set name you wish to use.\n"
 "LiVES will remind you to save the clip set later when you try to exit.\n"
 
-#: src/interface.c:1397
+#: src/interface.c:1289
 msgid ""
 "In order to export this project, you must enter a name for this clip set.\n"
 "This will also be used for the project name.\n"
@@ -1557,7 +1551,7 @@
 "In order to export this project, you must enter a name for this clip set.\n"
 "This will also be used for the project name.\n"
 
-#: src/interface.c:1404
+#: src/interface.c:1296
 msgid ""
 "Welcome to LiVES !\n"
 "This startup wizard will guide you through the\n"
@@ -1567,7 +1561,7 @@
 "This startup wizard will guide you through the\n"
 "initial install so that you can get the most from this application.\n"
 
-#: src/interface.c:1408
+#: src/interface.c:1300
 msgid ""
 "\n"
 "First of all you need to choose a working directory for LiVES.\n"
@@ -1577,193 +1571,193 @@
 "First of all you need to choose a working directory for LiVES.\n"
 "This should be a directory with plenty of disk space available.\n"
 
-#: src/interface.c:1427
+#: src/interface.c:1317
 msgid "New name "
 msgstr "New name "
 
-#: src/interface.c:1430
+#: src/interface.c:1319
 msgid "Set name "
 msgstr "Set name "
 
-#: src/interface.c:1550
+#: src/interface.c:1435
 msgid "Use def_aults"
 msgstr "Use def_aults"
 
-#: src/interface.c:1553 src/interface.c:1840 src/preferences.c:2515
-#: src/preferences.c:2697
+#: src/interface.c:1437 src/interface.c:1709 src/preferences.c:2550
+#: src/preferences.c:2739
 msgid "_Advanced"
 msgstr "_Advanced"
 
-#: src/interface.c:1604
+#: src/interface.c:1487
 msgid "LiVES:- Select input device"
 msgstr "LiVES:- Select input device"
 
-#: src/interface.c:1622
+#: src/interface.c:1504
 msgid "Select input device:"
 msgstr "Select input device:"
 
-#: src/interface.c:1686
+#: src/interface.c:1568
 msgid "LiVES:- Load CD Track"
 msgstr "LiVES:- Load CD Track"
 
-#: src/interface.c:1689
+#: src/interface.c:1570
 msgid "LiVES:- Select DVD Title/Chapter"
 msgstr "LiVES:- Select DVD Title/Chapter"
 
-#: src/interface.c:1692
+#: src/interface.c:1572
 msgid "LiVES:- Select VCD Title"
 msgstr "LiVES:- Select VCD Title"
 
-#: src/interface.c:1695
+#: src/interface.c:1574
 msgid "LiVES:- Change Maximum Visible Tracks"
 msgstr "LiVES:- Change Maximum Visible Tracks"
 
-#: src/interface.c:1698
+#: src/interface.c:1576
 msgid "LiVES:- Device details"
 msgstr "LiVES:- Device details"
 
-#: src/interface.c:1721
+#: src/interface.c:1598
 #, c-format
 msgid "Track to load (from %s)"
 msgstr "Track to load (from %s)"
 
-#: src/interface.c:1724
+#: src/interface.c:1600
 msgid "DVD Title"
 msgstr "DVD Title"
 
-#: src/interface.c:1727
+#: src/interface.c:1602
 msgid "VCD Title"
 msgstr "VCD Title"
 
-#: src/interface.c:1730
+#: src/interface.c:1604
 msgid "Maximum number of tracks to display"
 msgstr "Maximum number of tracks to display"
 
-#: src/interface.c:1733
+#: src/interface.c:1606
 msgid "Device:        /dev/video"
 msgstr "Device:        /dev/video"
 
-#: src/interface.c:1736
+#: src/interface.c:1608
 msgid "Device:        fw:"
 msgstr "Device:        fw:"
 
-#: src/interface.c:1771
+#: src/interface.c:1641
 msgid "Chapter  "
 msgstr "Chapter  "
 
-#: src/interface.c:1776
+#: src/interface.c:1645
 msgid "Channel  "
 msgstr "Channel  "
 
-#: src/interface.c:1791
+#: src/interface.c:1660
 msgid "Audio ID  "
 msgstr "Audio ID  "
 
-#: src/interface.c:1857
+#: src/interface.c:1726
 msgid "Input number"
 msgstr "Input number"
 
-#: src/interface.c:1865
+#: src/interface.c:1734
 msgid "Use default width, height and FPS"
 msgstr "Use default width, height and FPS"
 
-#: src/interface.c:1879
+#: src/interface.c:1748
 msgid "Width"
 msgstr "Width"
 
-#: src/interface.c:1885
+#: src/interface.c:1754
 msgid "Height"
 msgstr "Height"
 
-#: src/interface.c:1899
+#: src/interface.c:1768
 msgid "_Driver"
 msgstr "_Driver"
 
-#: src/interface.c:1902
+#: src/interface.c:1771
 msgid "_Output format"
 msgstr "_Output format"
 
-#: src/interface.c:1998
+#: src/interface.c:1865
 msgid "LiVES:- Fade Audio In"
 msgstr "LiVES:- Fade Audio In"
 
-#: src/interface.c:2001
+#: src/interface.c:1867
 msgid "LiVES:- Fade Audio Out"
 msgstr "LiVES:- Fade Audio Out"
 
-#: src/interface.c:2017
+#: src/interface.c:1883
 msgid "Fade in over  "
 msgstr "Fade in over  "
 
-#: src/interface.c:2018
+#: src/interface.c:1884
 msgid "first"
 msgstr "first"
 
-#: src/interface.c:2021
+#: src/interface.c:1886
 msgid "Fade out over  "
 msgstr "Fade out over  "
 
-#: src/interface.c:2022
+#: src/interface.c:1887
 msgid "last"
 msgstr "last"
 
-#: src/interface.c:2044
+#: src/interface.c:1909
 msgid "seconds."
 msgstr "seconds."
 
-#: src/interface.c:2052 src/saveplay.c:1507
+#: src/interface.c:1917 src/saveplay.c:1484
 msgid "selection"
 msgstr "selection"
 
-#: src/interface.c:2092
+#: src/interface.c:1956
 msgid "LiVES: - File Comments (optional)"
 msgstr "LiVES: - File Comments (optional)"
 
-#: src/interface.c:2107
+#: src/interface.c:1971
 msgid "Title/Name : "
 msgstr "Title/Name : "
 
-#: src/interface.c:2114
+#: src/interface.c:1978
 msgid "Author/Artist : "
 msgstr "Author/Artist : "
 
-#: src/interface.c:2121
+#: src/interface.c:1985
 msgid "Comments : "
 msgstr "Comments : "
 
-#: src/interface.c:2151
+#: src/interface.c:2015
 msgid "_Options"
 msgstr "_Options"
 
-#: src/interface.c:2158
+#: src/interface.c:2022
 msgid "Save _subtitles to file"
 msgstr "Save _subtitles to file"
 
-#: src/interface.c:2170
+#: src/interface.c:2033
 msgid "Subtitle file"
 msgstr "Subtitle file"
 
-#: src/interface.c:2172
+#: src/interface.c:2035
 msgid "Browse..."
 msgstr "Browse..."
 
-#: src/interface.c:2255
+#: src/interface.c:2132
 msgid "LiVES: - choose a device"
 msgstr "LiVES: - choose a device"
 
-#: src/interface.c:2259
+#: src/interface.c:2135
 msgid "LiVES: - choose a directory"
 msgstr "LiVES: - choose a directory"
 
-#: src/interface.c:2262
+#: src/interface.c:2137
 msgid "LiVES: - choose a file"
 msgstr "LiVES: - choose a file"
 
-#: src/interface.c:2445
+#: src/interface.c:2381
 msgid "LiVES: - Cancel/Discard/Save"
 msgstr "LiVES: - Cancel/Discard/Save"
 
-#: src/interface.c:2460
+#: src/interface.c:2397
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has not been saved.\n"
@@ -1773,7 +1767,7 @@
 "The current layout has not been saved.\n"
 "What would you like to do ?\n"
 
-#: src/interface.c:2463
+#: src/interface.c:2400
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has been changed since the last save.\n"
@@ -1783,7 +1777,7 @@
 "The current layout has been changed since the last save.\n"
 "What would you like to do ?\n"
 
-#: src/interface.c:2467
+#: src/interface.c:2404
 msgid ""
 "You are about to exit LiVES.\n"
 "The current clip set can be saved.\n"
@@ -1793,7 +1787,7 @@
 "The current clip set can be saved.\n"
 "What would you like to do ?\n"
 
-#: src/interface.c:2468
+#: src/interface.c:2405
 msgid ""
 "The current clip set has not been saved.\n"
 "What would you like to do ?\n"
@@ -1801,7 +1795,7 @@
 "The current clip set has not been saved.\n"
 "What would you like to do ?\n"
 
-#: src/interface.c:2472
+#: src/interface.c:2408
 msgid ""
 "The current layout has not been saved.\n"
 "What would you like to do ?\n"
@@ -1809,7 +1803,7 @@
 "The current layout has not been saved.\n"
 "What would you like to do ?\n"
 
-#: src/interface.c:2475
+#: src/interface.c:2410
 msgid ""
 "The current layout has *not* been changed since it was last saved.\n"
 "What would you like to do ?\n"
@@ -1817,7 +1811,7 @@
 "The current layout has *not* been changed since it was last saved.\n"
 "What would you like to do ?\n"
 
-#: src/interface.c:2480
+#: src/interface.c:2415
 msgid ""
 "The current layout contains generated frames and cannot be retained.\n"
 "You may wish to render it before exiting multitrack mode.\n"
@@ -1825,7 +1819,7 @@
 "The current layout contains generated frames and cannot be retained.\n"
 "You may wish to render it before exiting multitrack mode.\n"
 
-#: src/interface.c:2483
+#: src/interface.c:2418
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout contains generated frames and cannot be retained.\n"
@@ -1835,39 +1829,39 @@
 "The current layout contains generated frames and cannot be retained.\n"
 "What do you wish to do ?"
 
-#: src/interface.c:2496
+#: src/interface.c:2431
 msgid "Clip set _name"
 msgstr "Clip set _name"
 
-#: src/interface.c:2502
+#: src/interface.c:2437
 msgid "_Auto reload next time"
 msgstr "_Auto reload next time"
 
-#: src/interface.c:2538 src/interface.c:2547
+#: src/interface.c:2473 src/interface.c:2482
 msgid "_Wipe layout"
 msgstr "_Wipe layout"
 
-#: src/interface.c:2539
+#: src/interface.c:2474
 msgid "_Ignore changes"
 msgstr "_Ignore changes"
 
-#: src/interface.c:2540
+#: src/interface.c:2475
 msgid "_Delete clip set"
 msgstr "_Delete clip set"
 
-#: src/interface.c:2541
+#: src/interface.c:2476
 msgid "_Delete layout"
 msgstr "_Delete layout"
 
-#: src/interface.c:2545
+#: src/interface.c:2480
 msgid "_Save layout"
 msgstr "_Save layout"
 
-#: src/interface.c:2546
+#: src/interface.c:2481
 msgid "_Save clip set"
 msgstr "_Save clip set"
 
-#: src/interface.c:2565
+#: src/interface.c:2502
 msgid ""
 "\n"
 "LiVES has detected a multitrack layout from a previous session.\n"
@@ -1877,57 +1871,57 @@
 "LiVES has detected a multitrack layout from a previous session.\n"
 "Would you like to try and recover it ?\n"
 
-#: src/interface.c:2589
+#: src/interface.c:2528
 msgid "LiVES: - Disk Recovery Options"
 msgstr "LiVES: - Disk Recovery Options"
 
-#: src/interface.c:2608
+#: src/interface.c:2549
 msgid "Delete _Orphaned Clips"
 msgstr "Delete _Orphaned Clips"
 
-#: src/interface.c:2609
+#: src/interface.c:2550
 msgid "Delete any clips which are not currently loaded or part of a set"
-msgstr ""
+msgstr "Delete any clips which are not currently loaded or part of a set"
 
-#: src/interface.c:2622
+#: src/interface.c:2564
 msgid "Clear _Backup Files from Closed Clips"
 msgstr "Clear _Backup Files from Closed Clips"
 
-#: src/interface.c:2633
+#: src/interface.c:2575
 msgid "Remove Sets which have _Layouts but no Clips"
 msgstr "Remove Sets which have _Layouts but no Clips"
 
-#: src/interface.c:2644
+#: src/interface.c:2586
 msgid "_Reset to Defaults"
 msgstr "_Reset to Defaults"
 
-#: src/interface.c:2651
+#: src/interface.c:2593
 msgid "_Accept"
 msgstr "_Accept"
 
-#: src/callbacks.c:198
+#: src/callbacks.c:208
 #, c-format
 msgid "Saving as set %s..."
 msgstr "Saving as set %s..."
 
-#: src/callbacks.c:833
+#: src/callbacks.c:852
 msgid "Please enter the name of the file to save the clip as.\n"
 msgstr "Please enter the name of the file to save the clip as.\n"
 
-#: src/callbacks.c:841
+#: src/callbacks.c:860
 msgid "Please enter a valid URL for the download.\n"
 msgstr "Please enter a valid URL for the download.\n"
 
-#: src/callbacks.c:867
+#: src/callbacks.c:886
 #, c-format
 msgid "Downloading %s to %s..."
 msgstr "Downloading %s to %s..."
 
-#: src/callbacks.c:895
+#: src/callbacks.c:912
 msgid "Downloading clip"
 msgstr "Downloading clip..."
 
-#: src/callbacks.c:933
+#: src/callbacks.c:950
 msgid ""
 "\n"
 "LiVES was unable to download the clip.\n"
@@ -1939,11 +1933,11 @@
 "Please check the clip URL and make sure you have \n"
 "the latest youtube-dl installed.\n"
 
-#: src/callbacks.c:1114 src/callbacks.c:1149
+#: src/callbacks.c:1131 src/callbacks.c:1166
 msgid "This file"
 msgstr "This file"
 
-#: src/callbacks.c:1115
+#: src/callbacks.c:1132
 msgid ""
 ",\n"
 " - including the current layout - "
@@ -1951,7 +1945,7 @@
 ",\n"
 " - including the current layout - "
 
-#: src/callbacks.c:1117
+#: src/callbacks.c:1134
 #, c-format
 msgid ""
 "\n"
@@ -1966,7 +1960,7 @@
 "\n"
 "Really close it ?"
 
-#: src/callbacks.c:1119
+#: src/callbacks.c:1136
 #, c-format
 msgid ""
 "\n"
@@ -1981,7 +1975,7 @@
 "\n"
 "Really close it ?"
 
-#: src/callbacks.c:1150
+#: src/callbacks.c:1167
 msgid ""
 "Changes made to this clip have not been saved or backed up.\n"
 "\n"
@@ -1991,7 +1985,7 @@
 "\n"
 "Really close it ?"
 
-#: src/callbacks.c:1343
+#: src/callbacks.c:1356
 msgid ""
 "\n"
 "Invalid project file.\n"
@@ -1999,7 +1993,7 @@
 "\n"
 "Invalid project file.\n"
 
-#: src/callbacks.c:1356
+#: src/callbacks.c:1370
 #, c-format
 msgid ""
 "\n"
@@ -2020,33 +2014,33 @@
 "then File|Close/Save all Clips and provide a new set name or discard it.\n"
 "Once you have done this, you will be able to import the new project.\n"
 
-#: src/callbacks.c:1366
+#: src/callbacks.c:1381
 #, c-format
 msgid "Importing the project %s as set %s..."
 msgstr "Importing the project %s as set %s..."
 
-#: src/callbacks.c:1386
+#: src/callbacks.c:1399
 msgid "Importing project"
 msgstr "Importing project"
 
-#: src/callbacks.c:1472
+#: src/callbacks.c:1481
 #, c-format
 msgid "Exporting project %s..."
 msgstr "Exporting project %s..."
 
-#: src/callbacks.c:1490
+#: src/callbacks.c:1497
 msgid "Exporting project"
 msgstr "Exporting project"
 
-#: src/callbacks.c:1506
+#: src/callbacks.c:1513
 msgid "Backup as .lv1 file"
 msgstr "Backup as .lv1 file"
 
-#: src/callbacks.c:1522
+#: src/callbacks.c:1529
 msgid "Restore .lv1 file"
 msgstr "Restore .lv1 file"
 
-#: src/callbacks.c:1664
+#: src/callbacks.c:1671
 msgid ""
 "\n"
 "\n"
@@ -2058,89 +2052,94 @@
 "Set will be deleted from the disk.\n"
 "Are you sure ?\n"
 
-#: src/callbacks.c:1725
+#: src/callbacks.c:1732
 #, c-format
 msgid "Deleting set %s..."
 msgstr "Deleting set %s..."
 
-#: src/callbacks.c:1727
+#: src/callbacks.c:1734
 msgid "Deleting set..."
 msgstr "Deleting set..."
 
-#: src/callbacks.c:1731
+#: src/callbacks.c:1738
 msgid "Deleting set"
 msgstr "Deleting set"
 
-#: src/callbacks.c:1739
+#: src/callbacks.c:1746
 #, c-format
 msgid "Set %s was permanently deleted from the disk.\n"
 msgstr "Set %s was permanently deleted from the disk.\n"
 
-#: src/callbacks.c:1787 src/callbacks.c:11764
+#: src/callbacks.c:1792 src/callbacks.c:11676
 msgid "Insert Silence"
 msgstr "Insert Silence"
 
-#: src/callbacks.c:1840 src/callbacks.c:1923 src/callbacks.c:2086
+#: src/callbacks.c:1844 src/callbacks.c:1927 src/callbacks.c:2089
 msgid "Undoing"
 msgstr "Undoing"
 
-#: src/callbacks.c:1936 src/callbacks.c:2147
+#: src/callbacks.c:1940 src/callbacks.c:2150
 msgid "Restoring audio..."
 msgstr "Restoring audio..."
 
-#: src/callbacks.c:1952
+#: src/callbacks.c:1956
 msgid "Clearing frame images"
 msgstr "Clearing frame images"
 
-#: src/callbacks.c:1985
+#: src/callbacks.c:1988
 msgid "Deleting excess frames"
 msgstr "Deleting excess frames"
 
-#: src/callbacks.c:2229
+#: src/callbacks.c:2232
 #, c-format
 msgid "Length of video is now %d frames at %.3f frames per second.\n"
 msgstr "Length of video is now %d frames at %.3f frames per second.\n"
 
-#: src/callbacks.c:2233 src/resample.c:683 src/resample.c:2166
+#: src/callbacks.c:2235 src/resample.c:678 src/resample.c:2133
 #, c-format
 msgid "Clipboard was resampled to %d frames.\n"
 msgstr "Clipboard was resampled to %d frames.\n"
 
-#: src/callbacks.c:2394 src/callbacks.c:2423
+#: src/callbacks.c:2396 src/callbacks.c:2425
 msgid "Redoing"
 msgstr "Re-doing"
 
-#: src/callbacks.c:2462
-#, c-format
-msgid "Copying frames %d to %d%s to the clipboard..."
+#: src/callbacks.c:2472
+#, fuzzy, c-format
+msgid "Copying frames %d to %d (with sound) to the clipboard..."
 msgstr "Copying frames %d to %d%s to the clipboard..."
 
-#: src/callbacks.c:2525
+#: src/callbacks.c:2474
+#, fuzzy, c-format
+msgid "Copying frames %d to %d to the clipboard..."
+msgstr "Copying frames %d to %d%s to the clipboard..."
+
+#: src/callbacks.c:2526
 msgid "Copying to the clipboard"
 msgstr "Copying to the clipboard"
 
-#: src/callbacks.c:2600
+#: src/callbacks.c:2601
 msgid "Cut"
 msgstr "Cut"
 
-#: src/callbacks.c:2641 src/callbacks.c:3068 src/callbacks.c:8026
+#: src/callbacks.c:2641 src/callbacks.c:3063 src/callbacks.c:7631
 msgid "Pulling frames from clipboard"
-msgstr ""
+msgstr "Pulling frames from clipboard"
 
 #: src/callbacks.c:2654
 #, c-format
 msgid "Pasting %d frames to new clip %s..."
 msgstr "Pasting %d frames to new clip %s..."
 
-#: src/callbacks.c:2678
+#: src/callbacks.c:2676
 msgid "Pasting"
 msgstr "Pasting"
 
-#: src/callbacks.c:2694
+#: src/callbacks.c:2692
 msgid "...added audio..."
 msgstr "...added audio..."
 
-#: src/callbacks.c:2778
+#: src/callbacks.c:2775
 msgid ""
 "This operation requires resizing or converting of frames.\n"
 "Please install 'convert' from the Image-magick package, and then restart "
@@ -2150,7 +2149,7 @@
 "Please install 'convert' from the Image-magick package, and then restart "
 "LiVES.\n"
 
-#: src/callbacks.c:2795
+#: src/callbacks.c:2793
 msgid ""
 "\n"
 "\n"
@@ -2164,7 +2163,7 @@
 "Try selecting all frames, and then using \n"
 "the 'Trim Audio' function from the Audio menu."
 
-#: src/callbacks.c:2819
+#: src/callbacks.c:2817
 msgid ""
 "LiVES cannot insert because the audio rates do not match.\n"
 "Please install 'sox', and try again."
@@ -2172,7 +2171,7 @@
 "LiVES cannot insert because the audio rates do not match.\n"
 "Please install 'sox', and try again."
 
-#: src/callbacks.c:2838
+#: src/callbacks.c:2835
 msgid ""
 "\n"
 "Insertion will cause frames to shift in some multitrack layouts.\n"
@@ -2182,7 +2181,7 @@
 "Insertion will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 
-#: src/callbacks.c:2888 src/callbacks.c:11692
+#: src/callbacks.c:2883 src/callbacks.c:11606
 msgid ""
 "\n"
 "Insertion will cause audio to shift in some multitrack layouts.\n"
@@ -2192,11 +2191,11 @@
 "Insertion will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 
-#: src/callbacks.c:2996 src/callbacks.c:3025
+#: src/callbacks.c:2987 src/callbacks.c:3016
 msgid "Resampling clipboard audio"
 msgstr "Resampling clipboard audio"
 
-#: src/callbacks.c:3041
+#: src/callbacks.c:3032
 msgid ""
 "\n"
 "\n"
@@ -2208,7 +2207,7 @@
 "LiVES was unable to resample the clipboard audio. \n"
 "Clipboard audio has been erased.\n"
 
-#: src/callbacks.c:3055
+#: src/callbacks.c:3045
 msgid ""
 "\n"
 "\n"
@@ -2222,30 +2221,30 @@
 "Do you wish to continue with the insert \n"
 "using unchanged audio ?\n"
 
-#: src/callbacks.c:3137 src/callbacks.c:3311
+#: src/callbacks.c:3132 src/callbacks.c:3299
 #, c-format
 msgid "Inserting %d%s frames from the clipboard..."
 msgstr "Inserting %d%s frames from the clipboard..."
 
-#: src/callbacks.c:3162 src/callbacks.c:3236 src/callbacks.c:3339
+#: src/callbacks.c:3155 src/callbacks.c:3224 src/callbacks.c:3325
 msgid "Inserting"
 msgstr "Inserting"
 
-#: src/callbacks.c:3193
+#: src/callbacks.c:3187
 #, c-format
 msgid "Inserting %d times from the clipboard%s..."
 msgstr "Inserting %d times from the clipboard%s..."
 
-#: src/callbacks.c:3200
+#: src/callbacks.c:3191
 #, c-format
 msgid "Inserting %d frames from the clipboard%s..."
 msgstr "Inserting %d frames from the clipboard%s..."
 
-#: src/callbacks.c:3418
+#: src/callbacks.c:3404
 msgid "Insert"
 msgstr "Insert"
 
-#: src/callbacks.c:3486
+#: src/callbacks.c:3471
 msgid ""
 "\n"
 "Deleting all frames will close this file.\n"
@@ -2255,7 +2254,7 @@
 "Deleting all frames will close this file.\n"
 "Are you sure ?"
 
-#: src/callbacks.c:3495
+#: src/callbacks.c:3480
 msgid ""
 "\n"
 "Deletion will cause missing frames in some multitrack layouts.\n"
@@ -2265,8 +2264,8 @@
 "Deletion will cause missing frames in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 
-#: src/callbacks.c:3515 src/callbacks.c:10920 src/callbacks.c:11162
-#: src/callbacks.c:11228
+#: src/callbacks.c:3500 src/callbacks.c:10851 src/callbacks.c:11087
+#: src/callbacks.c:11152
 msgid ""
 "\n"
 "Deletion will cause missing audio in some multitrack layouts.\n"
@@ -2276,7 +2275,7 @@
 "Deletion will cause missing audio in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 
-#: src/callbacks.c:3534
+#: src/callbacks.c:3519
 msgid ""
 "\n"
 "Deletion will cause frames to shift in some multitrack layouts.\n"
@@ -2286,7 +2285,7 @@
 "Deletion will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 
-#: src/callbacks.c:3553 src/callbacks.c:11210
+#: src/callbacks.c:3538 src/callbacks.c:11134
 msgid ""
 "\n"
 "Deletion will cause audio to shift in some multitrack layouts.\n"
@@ -2296,20 +2295,20 @@
 "Deletion will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 
-#: src/callbacks.c:3611
+#: src/callbacks.c:3597
 #, c-format
 msgid "Deleting frames %d to %d%s..."
 msgstr "Deleting frames %d to %d%s..."
 
-#: src/callbacks.c:3636
+#: src/callbacks.c:3619
 msgid "Deleting"
 msgstr "Deleting"
 
-#: src/callbacks.c:3717
+#: src/callbacks.c:3699
 msgid "Delete"
 msgstr "Delete"
 
-#: src/callbacks.c:3738
+#: src/callbacks.c:3717
 msgid ""
 "\n"
 "\n"
@@ -2319,7 +2318,7 @@
 "\n"
 "Selection is locked.\n"
 
-#: src/callbacks.c:4092
+#: src/callbacks.c:4056
 msgid ""
 "Ready to record. Use 'control' and cursor keys during playback to record "
 "your performance.\n"
@@ -2331,11 +2330,11 @@
 "(To cancel, press 'r' or click on Play|Record Performance again before you "
 "play.)\n"
 
-#: src/callbacks.c:4098
+#: src/callbacks.c:4061
 msgid "Record cancelled.\n"
 msgstr "Record cancelled.\n"
 
-#: src/callbacks.c:4237
+#: src/callbacks.c:4197
 #, c-format
 msgid ""
 "\n"
@@ -2348,7 +2347,7 @@
 "The '%s' plugin reports:\n"
 "%s\n"
 
-#: src/callbacks.c:4241
+#: src/callbacks.c:4200
 #, c-format
 msgid ""
 "\n"
@@ -2361,7 +2360,7 @@
 "Unable to find the 'init' method in the %s plugin.\n"
 "The plugin may be broken or not installed correctly."
 
-#: src/callbacks.c:4571
+#: src/callbacks.c:4532
 #, c-format
 msgid ""
 "Saving the set will cause copies of all loaded clips to remain on the disk"
@@ -2374,22 +2373,22 @@
 "\n"
 "Please press 'Cancel' if that is not what you want.\n"
 
-#: src/callbacks.c:4654
+#: src/callbacks.c:4617
 #, c-format
 msgid "Saving set %s"
 msgstr "Saving set %s"
 
-#: src/callbacks.c:5005
+#: src/callbacks.c:4964
 #, c-format
 msgid "Loading clips from set %s"
 msgstr "Loading clips from set %s"
 
-#: src/callbacks.c:5093
+#: src/callbacks.c:5051
 #, c-format
 msgid "%d clips and %d layouts were recovered from set (%s).\n"
 msgstr "%d clips and %d layouts were recovered from set (%s).\n"
 
-#: src/callbacks.c:5312
+#: src/callbacks.c:5259
 msgid ""
 "LiVES will attempt to recover some disk space.\n"
 "You should ONLY run this if you have no other copies of LiVES running on "
@@ -2401,37 +2400,40 @@
 "this machine.\n"
 "Click OK to proceed.\n"
 
-#: src/callbacks.c:5317
+#: src/callbacks.c:5264
 msgid "Cleaning up disk space..."
 msgstr "Cleaning up disk space..."
 
-#: src/callbacks.c:5387
+#: src/callbacks.c:5334
 msgid "Recovering disk space"
 msgstr "Recovering disk space..."
 
-#: src/callbacks.c:5439
+#: src/callbacks.c:5386
 #, c-format
 msgid "%s of disk space was recovered.\n"
 msgstr "%s of disk space was recovered.\n"
 
-#: src/callbacks.c:5482
+#: src/callbacks.c:5428
 msgid "Resetting frame rates and frame values..."
 msgstr "Resetting frame rates and frame values..."
 
-#: src/callbacks.c:5523
+#: src/callbacks.c:5469
 #, c-format
 msgid ""
 "\n"
 "External: %s\n"
 "Internal: %s (%d bpp) / %s\n"
 msgstr ""
+"\n"
+"External: %s\n"
+"Internal: %s (%d bpp) / %s\n"
 
-#: src/callbacks.c:5525
+#: src/callbacks.c:5471
 msgid "buffered"
 msgstr "buffered"
 
-#: src/callbacks.c:5538 src/callbacks.c:5557 src/callbacks.c:5575
-#: src/callbacks.c:5609
+#: src/callbacks.c:5484 src/callbacks.c:5502 src/callbacks.c:5518
+#: src/callbacks.c:5551
 msgid ""
 "\n"
 "  Opening..."
@@ -2439,7 +2441,7 @@
 "\n"
 "  Opening..."
 
-#: src/callbacks.c:5545
+#: src/callbacks.c:5490
 #, c-format
 msgid ""
 "\n"
@@ -2448,7 +2450,7 @@
 "\n"
 "(%d virtual)"
 
-#: src/callbacks.c:5548
+#: src/callbacks.c:5493
 #, c-format
 msgid ""
 "\n"
@@ -2457,7 +2459,7 @@
 "\n"
 "(%d decoded)"
 
-#: src/callbacks.c:5560 src/callbacks.c:5578 src/callbacks.c:5612
+#: src/callbacks.c:5504 src/callbacks.c:5520 src/callbacks.c:5553
 #, c-format
 msgid ""
 "\n"
@@ -2466,7 +2468,7 @@
 "\n"
 "  %.2f sec."
 
-#: src/callbacks.c:5569
+#: src/callbacks.c:5512
 msgid ""
 "\n"
 "  Unknown"
@@ -2474,23 +2476,23 @@
 "\n"
 "  Unknown"
 
-#: src/callbacks.c:5582 src/callbacks.c:5596
+#: src/callbacks.c:5524 src/callbacks.c:5538
 msgid "unsigned"
 msgstr "unsigned"
 
-#: src/callbacks.c:5583 src/callbacks.c:5597
+#: src/callbacks.c:5525 src/callbacks.c:5539
 msgid "signed"
 msgstr "signed"
 
-#: src/callbacks.c:5585 src/callbacks.c:5599
+#: src/callbacks.c:5527 src/callbacks.c:5541
 msgid "big-endian"
 msgstr "big-endian"
 
-#: src/callbacks.c:5586 src/callbacks.c:5600
+#: src/callbacks.c:5528 src/callbacks.c:5542
 msgid "little-endian"
 msgstr "little-endian"
 
-#: src/callbacks.c:5588 src/callbacks.c:5602
+#: src/callbacks.c:5530 src/callbacks.c:5544
 #, c-format
 msgid ""
 "  %d Hz %d bit\n"
@@ -2499,7 +2501,7 @@
 "  %d Hz %d bit\n"
 "%s %s"
 
-#: src/callbacks.c:5707
+#: src/callbacks.c:5647
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -2529,15 +2531,15 @@
 "along with this program; if not, write to the Free Software\n"
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA.\n"
 
-#: src/callbacks.c:5721
+#: src/callbacks.c:5661
 msgid "A video editor and VJ program."
 msgstr "A video editor and VJ program."
 
-#: src/callbacks.c:5722
+#: src/callbacks.c:5662
 msgid "About LiVES"
 msgstr "About LiVES"
 
-#: src/callbacks.c:5724
+#: src/callbacks.c:5664
 msgid "translator_credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -2547,7 +2549,7 @@
 "  Robert Readman https://launchpad.net/~robert-readman\n"
 "  salsaman https://launchpad.net/~salsaman"
 
-#: src/callbacks.c:5758
+#: src/callbacks.c:5699
 #, c-format
 msgid ""
 "LiVES Version %s\n"
@@ -2570,7 +2572,7 @@
 "salsaman@gmail.com\n"
 "Homepage: http://lives.sourceforge.net"
 
-#: src/callbacks.c:6037
+#: src/callbacks.c:5996
 #, fuzzy
 msgid ""
 "\n"
@@ -2581,7 +2583,7 @@
 "\n"
 "You need to install mplayer or imageMagick to be able to preview this file.\n"
 
-#: src/callbacks.c:6040
+#: src/callbacks.c:5998
 #, fuzzy
 msgid ""
 "\n"
@@ -2593,42 +2595,7 @@
 "\n"
 "You need to install mplayer or imageMagick to be able to preview this file.\n"
 
-#: src/callbacks.c:6423 src/callbacks.c:8289
-msgid ""
-"\n"
-"Loading new audio may cause missing audio in some multitrack layouts.\n"
-"Are you sure you wish to continue ?\n"
-"."
-msgstr ""
-"\n"
-"Loading new audio may cause missing audio in some multitrack layouts.\n"
-"Are you sure you wish to continue ?\n"
-"."
-
-#: src/callbacks.c:6523
-#, c-format
-msgid "Opening audio %s, type %s..."
-msgstr "Opening audio %s, type %s..."
-
-#: src/callbacks.c:6556 src/saveplay.c:480
-msgid "Opening audio"
-msgstr "Opening audio"
-
-#: src/callbacks.c:6565 src/callbacks.c:6612 src/callbacks.c:8387
-#: src/callbacks.c:8429 src/callbacks.c:8472 src/callbacks.c:10846
-msgid "Cancelling"
-msgstr "Cancelling"
-
-#: src/callbacks.c:6660 src/callbacks.c:8514 src/callbacks.c:10876
-#: src/callbacks.c:11563
-msgid "Committing audio"
-msgstr "Committing audio"
-
-#: src/callbacks.c:6672 src/callbacks.c:8546
-msgid "New Audio"
-msgstr "New Audio"
-
-#: src/callbacks.c:6779
+#: src/callbacks.c:6459
 #, c-format
 msgid ""
 "Text was saved as\n"
@@ -2637,150 +2604,180 @@
 "Text was saved as\n"
 "%s\n"
 
-#: src/callbacks.c:6951 src/saveplay.c:3618
-#, c-format
-msgid "%d frames are enough !\n"
-msgstr "%d frames are enough !\n"
-
-#: src/callbacks.c:7050
+#: src/callbacks.c:6706
 msgid "LiVES: - Encoder debug output"
 msgstr "LiVES: - Encoder debug output"
 
-#: src/callbacks.c:7087 src/gui.c:1922
+#: src/callbacks.c:6743 src/gui.c:1921
 msgid "Fullscreen playback (f)"
 msgstr "Fullscreen playback (f)"
 
-#: src/callbacks.c:7089
+#: src/callbacks.c:6744
 msgid "Fullscreen playback off (f)"
 msgstr "Fullscreen playback off (f)"
 
-#: src/callbacks.c:7188 src/callbacks.c:7336 src/callbacks.c:7664
-#: src/callbacks.c:7681 src/gui.c:3712 src/saveplay.c:2467 src/saveplay.c:2501
-#: src/saveplay.c:3115 src/saveplay.c:3220 src/saveplay.c:3239
-#: src/multitrack.c:9340 src/multitrack.c:11060
+#: src/callbacks.c:6841 src/callbacks.c:6983 src/callbacks.c:7283
+#: src/callbacks.c:7298 src/gui.c:3838 src/saveplay.c:2442 src/saveplay.c:2475
+#: src/saveplay.c:3074 src/saveplay.c:3178 src/saveplay.c:3197
+#: src/multitrack.c:9526 src/multitrack.c:11288
 #, c-format
 msgid " (%d %% scale)"
 msgstr " (%d %% scale)"
 
-#: src/callbacks.c:7190 src/callbacks.c:7338 src/callbacks.c:7666
-#: src/gui.c:3716 src/saveplay.c:2469 src/saveplay.c:2503
+#: src/callbacks.c:6843 src/callbacks.c:6985 src/callbacks.c:7285
+#: src/gui.c:3842 src/saveplay.c:2444 src/saveplay.c:2477
 #, c-format
 msgid "LiVES: - Play Window%s"
 msgstr "LiVES: - Play Window%s"
 
-#: src/callbacks.c:7302 src/gui.c:1907
+#: src/callbacks.c:6950 src/gui.c:1906
 msgid "Double size (d)"
 msgstr "Double size (d)"
 
-#: src/callbacks.c:7309
+#: src/callbacks.c:6956
 msgid "Single size (d)"
 msgstr "Single size (d)"
 
-#: src/callbacks.c:7442 src/callbacks.c:7443
+#: src/callbacks.c:7087 src/callbacks.c:7088
 msgid "Hide the play window (s)"
 msgstr "Hide the play window (s)"
 
-#: src/callbacks.c:7452 src/gui.c:1746
+#: src/callbacks.c:7096 src/gui.c:1744
 msgid "Show the play window (s)"
 msgstr "Show the play window (s)"
 
-#: src/callbacks.c:7453 src/gui.c:1896
+#: src/callbacks.c:7097 src/gui.c:1895
 msgid "Play in separate window (s)"
 msgstr "Play in separate window (s)"
 
-#: src/callbacks.c:7535 src/gui.c:4060 src/saveplay.c:2498
+#: src/callbacks.c:7175 src/gui.c:4169 src/saveplay.c:2472
 msgid "LiVES: - Streaming"
 msgstr "LiVES: - Streaming"
 
-#: src/callbacks.c:7778
+#: src/callbacks.c:7388
 msgid "Switch continuous looping off (o)"
 msgstr "Switch continuous looping off (o)"
 
-#: src/callbacks.c:7785 src/gui.c:1795
+#: src/callbacks.c:7394 src/gui.c:1793
 msgid "Switch continuous looping on (o)"
 msgstr "Switch continuous looping on (o)"
 
-#: src/callbacks.c:7837
+#: src/callbacks.c:7444
 #, c-format
 msgid "Audio volume (%.2f)"
 msgstr "Audio volume (%.2f)"
 
-#: src/callbacks.c:7876 src/callbacks.c:7877 src/gui.c:3640
+#: src/callbacks.c:7483 src/callbacks.c:7484 src/gui.c:3766
 msgid "Unmute the audio (z)"
 msgstr "Unmute the audio (z)"
 
-#: src/callbacks.c:7888 src/callbacks.c:7889 src/gui.c:1808 src/gui.c:3639
+#: src/callbacks.c:7494 src/callbacks.c:7495 src/gui.c:1806 src/gui.c:3765
 msgid "Mute the audio (z)"
 msgstr "Mute the audio (z)"
 
-#: src/callbacks.c:8038
+#: src/callbacks.c:7643
 msgid "Reversing clipboard..."
 msgstr "Reversing clipboard..."
 
-#: src/callbacks.c:8052
+#: src/callbacks.c:7657
 msgid "Reversing clipboard"
 msgstr "Reversing clipboard"
 
-#: src/callbacks.c:8084
+#: src/callbacks.c:7689
 msgid "LiVES: Load subtitles from..."
 msgstr "LiVES: Load subtitles from..."
 
-#: src/callbacks.c:8151 src/saveplay.c:970
+#: src/callbacks.c:7753 src/saveplay.c:956
 #, c-format
 msgid "Loaded subtitle file: %s\n"
 msgstr "Loaded subtitle file: %s\n"
 
-#: src/callbacks.c:8220
+#: src/callbacks.c:7821
 msgid "Subtitles were erased.\n"
 msgstr "Subtitles were erased.\n"
 
-#: src/callbacks.c:8239
+#: src/callbacks.c:7843
 msgid "LiVES: - Select Audio File"
 msgstr "LiVES: - Select Audio File"
 
-#: src/callbacks.c:8250
+#: src/callbacks.c:7878 src/callbacks.c:8232
+msgid ""
+"\n"
+"Loading new audio may cause missing audio in some multitrack layouts.\n"
+"Are you sure you wish to continue ?\n"
+"."
+msgstr ""
+"\n"
+"Loading new audio may cause missing audio in some multitrack layouts.\n"
+"Are you sure you wish to continue ?\n"
+"."
+
+#: src/callbacks.c:7989
+#, c-format
+msgid "Opening audio %s, type %s..."
+msgstr "Opening audio %s, type %s..."
+
+#: src/callbacks.c:8023 src/saveplay.c:477
+msgid "Opening audio"
+msgstr "Opening audio"
+
+#: src/callbacks.c:8032 src/callbacks.c:8083 src/callbacks.c:8327
+#: src/callbacks.c:8369 src/callbacks.c:8412 src/callbacks.c:10766
+msgid "Cancelling"
+msgstr "Cancelling"
+
+#: src/callbacks.c:8137 src/callbacks.c:8454 src/callbacks.c:10803
+#: src/callbacks.c:11477
+msgid "Committing audio"
+msgstr "Committing audio"
+
+#: src/callbacks.c:8153 src/callbacks.c:8484
+msgid "New Audio"
+msgstr "New Audio"
+
+#: src/callbacks.c:8194
 msgid "Please set your CD play device in Tools | Preferences | Misc\n"
 msgstr "Please set your CD play device in Tools | Preferences | Misc\n"
 
-#: src/callbacks.c:8321
+#: src/callbacks.c:8264
 #, c-format
 msgid "Opening CD track %d from %s..."
 msgstr "Opening CD track %d from %s..."
 
-#: src/callbacks.c:8326
+#: src/callbacks.c:8267
 #, c-format
 msgid "CD track %d"
 msgstr "CD track %d"
 
-#: src/callbacks.c:8373
+#: src/callbacks.c:8313
 msgid "Opening CD track..."
 msgstr "Opening CD track..."
 
-#: src/callbacks.c:8415 src/callbacks.c:8461
+#: src/callbacks.c:8355 src/callbacks.c:8401
 msgid "Error loading CD track\n"
 msgstr "Error loading CD track\n"
 
-#: src/callbacks.c:8584
+#: src/callbacks.c:8518
 msgid "layout errors"
 msgstr "layout errors"
 
-#: src/callbacks.c:8595
+#: src/callbacks.c:8529
 msgid "Close _Window"
 msgstr "Close _Window"
 
-#: src/callbacks.c:8606
+#: src/callbacks.c:8540
 msgid "Clear _Errors"
 msgstr "Clear _Errors"
 
-#: src/callbacks.c:8617
+#: src/callbacks.c:8551
 msgid "_Delete affected layouts"
 msgstr "_Delete affected layouts"
 
-#: src/callbacks.c:9343 src/callbacks.c:9388
+#: src/callbacks.c:9253 src/callbacks.c:9298
 msgid "Resume"
 msgstr "Resume"
 
-#: src/callbacks.c:9344
+#: src/callbacks.c:9254
 msgid ""
 "\n"
 "Paused\n"
@@ -2790,27 +2787,23 @@
 "Paused\n"
 "(click Resume to continue processing)"
 
-#: src/callbacks.c:9345 src/callbacks.c:9406
+#: src/callbacks.c:9255 src/callbacks.c:9315
 msgid "paused..."
 msgstr "paused..."
 
-#: src/callbacks.c:9372 src/callbacks.c:9418
-msgid "Pause"
-msgstr "Pause"
-
-#: src/callbacks.c:9374 src/callbacks.c:9421
+#: src/callbacks.c:9284 src/callbacks.c:9333
 msgid "resumed..."
 msgstr "resumed..."
 
-#: src/callbacks.c:9393
+#: src/callbacks.c:9303
 msgid "Keep"
 msgstr "Keep"
 
-#: src/callbacks.c:9396
+#: src/callbacks.c:9305
 msgid "Enough"
 msgstr "Enough"
 
-#: src/callbacks.c:9401
+#: src/callbacks.c:9310
 #, c-format
 msgid ""
 "\n"
@@ -2823,28 +2816,28 @@
 "(click %s to keep what you have and stop)\n"
 "(click Resume to continue processing)"
 
-#: src/callbacks.c:9419
+#: src/callbacks.c:9331
 msgid "Cancel"
 msgstr "Cancel"
 
-#: src/callbacks.c:9558
+#: src/callbacks.c:9478
 msgid "Stop"
 msgstr "Stop"
 
-#: src/callbacks.c:10053 src/multitrack.c:13247
+#: src/callbacks.c:9968 src/multitrack.c:13489
 msgid "LiVES: Selected frame"
 msgstr "LiVES: Selected frame"
 
-#: src/callbacks.c:10061
+#: src/callbacks.c:9976
 msgid "_Save frame as..."
 msgstr "_Save frame as..."
 
-#: src/callbacks.c:10290
+#: src/callbacks.c:10202
 #, c-format
 msgid "Audio is ahead of video by %.4f secs. at frame %d, with fps %.4f\n"
 msgstr "Audio is ahead of video by %.4f secs at frame %d, with fps %.4f\n"
 
-#: src/callbacks.c:10347
+#: src/callbacks.c:10255
 msgid ""
 "\n"
 "\n"
@@ -2858,7 +2851,7 @@
 "Please send a patch to get it working on other platforms.\n"
 "\n"
 
-#: src/callbacks.c:10353
+#: src/callbacks.c:10261
 msgid ""
 "\n"
 "\n"
@@ -2870,7 +2863,7 @@
 "You must install \"xwininfo\" before you can use this feature\n"
 "\n"
 
-#: src/callbacks.c:10429 src/callbacks.c:11479
+#: src/callbacks.c:10334 src/callbacks.c:11395
 msgid ""
 "\n"
 "Record time must be greater than 0.\n"
@@ -2878,7 +2871,7 @@
 "\n"
 "Record time must be greater than 0.\n"
 
-#: src/callbacks.c:10440
+#: src/callbacks.c:10346
 msgid ""
 "Capture an External Window:\n"
 "\n"
@@ -2892,11 +2885,11 @@
 "Click 'Cancel' to cancel\n"
 "\n"
 
-#: src/callbacks.c:10445
+#: src/callbacks.c:10351
 msgid "External window was released.\n"
 msgstr "External window was released.\n"
 
-#: src/callbacks.c:10479
+#: src/callbacks.c:10385
 msgid ""
 "Click on a Window to Capture it\n"
 "Press 'q' to stop recording"
@@ -2904,7 +2897,7 @@
 "Click on a Window to Capture it\n"
 "Press 'q' to stop recording"
 
-#: src/callbacks.c:10513
+#: src/callbacks.c:10419
 #, c-format
 msgid ""
 "\n"
@@ -2919,19 +2912,19 @@
 "Stop or 'q' to finish.\n"
 "(Default of %.3f frames per second will be used.)\n"
 
-#: src/callbacks.c:10539
+#: src/callbacks.c:10443
 msgid "LiVES was unable to capture this window. Sorry.\n"
 msgstr "LiVES was unable to capture this window. Sorry.\n"
 
-#: src/callbacks.c:10695
+#: src/callbacks.c:10601
 msgid "Export Selected Audio as..."
 msgstr "Export Selected Audio as..."
 
-#: src/callbacks.c:10699
+#: src/callbacks.c:10604
 msgid "Export Audio as..."
 msgstr "Export Audio as..."
 
-#: src/callbacks.c:10714
+#: src/callbacks.c:10619
 msgid ""
 "\n"
 "\n"
@@ -2945,86 +2938,86 @@
 "Click 'OK' to export at the new speed, or 'Cancel' to export at the original "
 "rate.\n"
 
-#: src/callbacks.c:10720
+#: src/callbacks.c:10625
 #, c-format
 msgid "Exporting audio frames %d to %d as %s..."
 msgstr "Exporting audio frames %d to %d as %s..."
 
-#: src/callbacks.c:10725
+#: src/callbacks.c:10629
 #, c-format
 msgid "Exporting audio as %s..."
 msgstr "Exporting audio as %s..."
 
-#: src/callbacks.c:10751
+#: src/callbacks.c:10655
 msgid "Exporting audio"
 msgstr "Exporting audio"
 
-#: src/callbacks.c:10782
+#: src/callbacks.c:10695
 msgid "LiVES: - Append Audio File"
 msgstr "LiVES: - Append Audio File"
 
-#: src/callbacks.c:10825
+#: src/callbacks.c:10739
 #, c-format
 msgid "Appending audio file %s..."
 msgstr "Appending audio file %s..."
 
-#: src/callbacks.c:10836
+#: src/callbacks.c:10756
 msgid "Appending audio"
 msgstr "Appending audio"
 
-#: src/callbacks.c:10892
+#: src/callbacks.c:10818
 msgid "Append Audio"
 msgstr "Append Audio"
 
-#: src/callbacks.c:10952
+#: src/callbacks.c:10883
 #, c-format
 msgid "Padding audio to %.2f seconds..."
 msgstr "Padding audio to %.2f seconds..."
 
-#: src/callbacks.c:10954
+#: src/callbacks.c:10885
 #, c-format
 msgid "Trimming audio from %.2f to %.2f seconds..."
 msgstr "Trimming audio from %.2f to %.2f seconds..."
 
-#: src/callbacks.c:10973
+#: src/callbacks.c:10904
 msgid "Trimming/Padding audio"
 msgstr "Trimming/Padding audio"
 
-#: src/callbacks.c:10981
+#: src/callbacks.c:10912
 msgid "Trim/Pad Audio"
 msgstr "Trim/Pad Audio"
 
-#: src/callbacks.c:11055
+#: src/callbacks.c:10982
 msgid "Fading audio in"
 msgstr "Fading audio in"
 
-#: src/callbacks.c:11056
+#: src/callbacks.c:10983
 msgid "Fade audio in"
 msgstr "Fade audio in"
 
-#: src/callbacks.c:11061
+#: src/callbacks.c:10987
 msgid "Fading audio out"
 msgstr "Fading audio out"
 
-#: src/callbacks.c:11062
+#: src/callbacks.c:10988
 msgid "Fade audio out"
 msgstr "Fade audio out"
 
-#: src/callbacks.c:11085
+#: src/callbacks.c:11011
 #, c-format
 msgid "%s over %.1f seconds..."
 msgstr "%s over %.1f seconds..."
 
-#: src/callbacks.c:11087
+#: src/callbacks.c:11013
 #, c-format
 msgid "%s from time %.2f seconds to %.2f seconds..."
 msgstr "%s from time %.2f seconds to %.2f seconds..."
 
-#: src/callbacks.c:11094
+#: src/callbacks.c:11020
 msgid "Fading audio..."
 msgstr "Fading audio..."
 
-#: src/callbacks.c:11194
+#: src/callbacks.c:11119
 msgid ""
 "\n"
 "Deleting all audio will close this file.\n"
@@ -3034,631 +3027,631 @@
 "Deleting all audio will close this file.\n"
 "Are you sure ?"
 
-#: src/callbacks.c:11197
+#: src/callbacks.c:11122
 msgid "Deleting all audio..."
 msgstr "Deleting all audio..."
 
-#: src/callbacks.c:11203
+#: src/callbacks.c:11127
 #, c-format
 msgid "Deleting audio from %.2f to %.2f seconds..."
 msgstr "Deleting audio from %.2f to %.2f seconds..."
 
-#: src/callbacks.c:11290
+#: src/callbacks.c:11214
 msgid "Deleting Audio"
 msgstr "Deleting Audio"
 
-#: src/callbacks.c:11297
+#: src/callbacks.c:11221
 msgid "Delete Audio"
 msgstr "Delete Audio"
 
-#: src/callbacks.c:11636
+#: src/callbacks.c:11550
 msgid "Record new audio"
 msgstr "Record new audio"
 
-#: src/callbacks.c:11725
+#: src/callbacks.c:11640
 #, c-format
 msgid "Inserting silence from %.2f to %.2f seconds..."
 msgstr "Inserting silence from %.2f to %.2f seconds..."
 
-#: src/callbacks.c:11754
+#: src/callbacks.c:11666
 msgid "Inserting Silence"
 msgstr "Inserting Silence"
 
-#: src/merge.c:85
+#: src/merge.c:96
 msgid "LiVES: - Merge"
 msgstr "LiVES: - Merge"
 
-#: src/merge.c:102
+#: src/merge.c:113
 #, c-format
 msgid "Merge Clipboard [ %d Frames ]       With Selection [ %d Frames ]"
 msgstr "Merge Clipboard [ %d Frames ]       With Selection [ %d Frames ]"
 
-#: src/merge.c:107
+#: src/merge.c:118
 #, c-format
 msgid ""
 "Merge Clipboard [ %d Frames (resampled) ]       With Selection [ %d Frames ]"
 msgstr ""
 "Merge Clipboard [ %d Frames (resampled) ]       With Selection [ %d Frames ]"
 
-#: src/merge.c:118
+#: src/merge.c:130
 msgid "Align _Starts"
 msgstr "Align _Starts"
 
-#: src/merge.c:123
+#: src/merge.c:135
 msgid "Align _Ends"
 msgstr "Align _Ends"
 
-#: src/merge.c:134
+#: src/merge.c:146
 msgid "What to do with extra clipboard frames -"
 msgstr "What to do with extra clipboard frames -"
 
-#: src/merge.c:137
+#: src/merge.c:149
 msgid "_Insert Frames"
 msgstr "_Insert Frames"
 
-#: src/merge.c:143
+#: src/merge.c:155
 msgid "_Drop Frames"
 msgstr "_Drop Frames"
 
-#: src/merge.c:149
+#: src/merge.c:160
 msgid "Number of Times to Loop Clipboard"
 msgstr "Number of Times to Loop Clipboard"
 
-#: src/merge.c:160
+#: src/merge.c:171
 msgid "_Loop Clipboard to Fit Selection"
 msgstr "_Loop Clipboard to Fit Selection"
 
-#: src/merge.c:173
+#: src/merge.c:184
 msgid "_Transition Method:"
 msgstr "_Transition Method:"
 
-#: src/merge.c:394
+#: src/merge.c:395
 msgid "Merging clipboard with selection..."
 msgstr "Merging clipboard with selection..."
 
-#: src/merge.c:551
+#: src/merge.c:539
 msgid "Merge done.\n"
 msgstr "Merge done.\n"
 
-#: src/gui.c:123
+#: src/gui.c:122
 msgid "_Custom Generators"
 msgstr "_Custom Generators"
 
-#: src/gui.c:124
+#: src/gui.c:123
 msgid "_Custom Effects"
 msgstr "_Custom Effects"
 
-#: src/gui.c:125
+#: src/gui.c:124
 msgid "Custom _Utilities"
 msgstr "Custom _Utilities"
 
-#: src/gui.c:352 src/multitrack.c:5964
+#: src/gui.c:351 src/multitrack.c:6143
 msgid "_File"
 msgstr "_File"
 
-#: src/gui.c:367 src/multitrack.c:5989
+#: src/gui.c:366 src/multitrack.c:6168
 msgid "_Open File/Directory"
 msgstr "_Open File/Directory"
 
-#: src/gui.c:373
+#: src/gui.c:372
 msgid "O_pen Part of File..."
 msgstr "O_pen Part of File..."
 
-#: src/gui.c:379 src/gui.c:383 src/multitrack.c:6006 src/multitrack.c:6023
-#: src/multitrack.c:6028
+#: src/gui.c:378 src/gui.c:382 src/multitrack.c:6185 src/multitrack.c:6202
+#: src/multitrack.c:6207
 msgid "Open _Location/Stream..."
 msgstr "Open _Location/Stream..."
 
-#: src/gui.c:393 src/multitrack.c:6016
+#: src/gui.c:392 src/multitrack.c:6195
 msgid "Open _Youtube Clip..."
 msgstr "Open _Youtube Clip..."
 
-#: src/gui.c:404
+#: src/gui.c:403
 msgid "Import from _dvd/vcd..."
 msgstr "Import from _dvd/vcd..."
 
-#: src/gui.c:413
+#: src/gui.c:412
 msgid "Import from _dvd"
 msgstr "Import from _dvd"
 
-#: src/gui.c:416
+#: src/gui.c:415
 msgid "Import from _vcd"
 msgstr "Import from _vcd"
 
-#: src/gui.c:419
+#: src/gui.c:418
 msgid "_Import from Firewire"
 msgstr "_Import from Firewire"
 
-#: src/gui.c:428 src/multitrack.c:6086
+#: src/gui.c:427 src/multitrack.c:6265
 msgid "Import from _Firewire Device (dv)"
 msgstr "Import from _Firewire Device (dv)"
 
-#: src/gui.c:429 src/multitrack.c:6094
+#: src/gui.c:428 src/multitrack.c:6273
 msgid "Import from _Firewire Device (hdv)"
 msgstr "Import from _Firewire Device (hdv)"
 
-#: src/gui.c:457
+#: src/gui.c:456
 msgid "_Add Webcam/TV card..."
 msgstr "_Add Webcam/TV card..."
 
-#: src/gui.c:476
+#: src/gui.c:475
 msgid "Add _Unicap Device"
 msgstr "Add _Unicap Device"
 
-#: src/gui.c:486
+#: src/gui.c:485
 msgid "Add Live _Firewire Device"
 msgstr "Add Live _Firewire Device"
 
-#: src/gui.c:495
+#: src/gui.c:494
 msgid "Add _TV Device"
 msgstr "Add _TV Device"
 
-#: src/gui.c:510 src/multitrack.c:6117
+#: src/gui.c:509 src/multitrack.c:6296
 msgid "_Recent Files..."
 msgstr "_Recent Files..."
 
-#: src/gui.c:560 src/multitrack.c:6177
+#: src/gui.c:559 src/multitrack.c:6356
 msgid "_Reload Clip Set..."
 msgstr "_Reload Clip Set..."
 
-#: src/gui.c:564 src/multitrack.c:6185
+#: src/gui.c:563 src/multitrack.c:6364
 msgid "Close/Sa_ve All Clips"
 msgstr "Close/Sa_ve All Clips"
 
-#: src/gui.c:575
+#: src/gui.c:574
 msgid "_Encode Clip As..."
 msgstr "_Encode Clip As..."
 
-#: src/gui.c:577
+#: src/gui.c:576
 msgid "Encode _Selection As..."
 msgstr "Encode _Selection As..."
 
-#: src/gui.c:584
+#: src/gui.c:583
 msgid "_Close This Clip"
 msgstr "_Close This Clip"
 
-#: src/gui.c:595
+#: src/gui.c:594
 msgid "_Backup Clip as .lv1..."
 msgstr "_Backup Clip as .lv1..."
 
-#: src/gui.c:604
+#: src/gui.c:603
 msgid "_Restore Clip from .lv1..."
 msgstr "_Restore Clip from .lv1..."
 
-#: src/gui.c:615
+#: src/gui.c:614
 msgid "Encode/Load/Backup _with Sound"
 msgstr "Encode/Load/Backup _with Sound"
 
-#: src/gui.c:620
+#: src/gui.c:619
 msgid "Auto load subtitles"
 msgstr "Auto load subtitles"
 
-#: src/gui.c:628 src/multitrack.c:6224
+#: src/gui.c:627 src/multitrack.c:6403
 msgid "Clean _up Diskspace"
 msgstr "Clean _up Diskspace"
 
-#: src/gui.c:636 src/multitrack.c:6257
+#: src/gui.c:635 src/multitrack.c:6436
 msgid "_Edit"
 msgstr "_Edit"
 
-#: src/gui.c:685
+#: src/gui.c:684
 msgid "_MULTITRACK mode"
 msgstr "_MULTITRACK mode"
 
-#: src/gui.c:696
+#: src/gui.c:695
 msgid "_Copy Selection"
 msgstr "_Copy Selection"
 
-#: src/gui.c:705
+#: src/gui.c:704
 msgid "Cu_t Selection"
 msgstr "Cu_t Selection"
 
-#: src/gui.c:714
+#: src/gui.c:713
 msgid "_Insert from Clipboard..."
 msgstr "_Insert from Clipboard..."
 
-#: src/gui.c:730
+#: src/gui.c:729
 msgid "Paste as _New"
 msgstr "Paste as _New"
 
-#: src/gui.c:739
+#: src/gui.c:738
 msgid "_Merge Clipboard with Selection..."
 msgstr "_Merge Clipboard with Selection..."
 
-#: src/gui.c:746
+#: src/gui.c:745
 msgid "_Delete Selection"
 msgstr "_Delete Selection"
 
-#: src/gui.c:764
+#: src/gui.c:763
 msgid "Decouple _Video from Audio"
 msgstr "Decouple _Video from Audio"
 
-#: src/gui.c:772
+#: src/gui.c:771
 msgid "_Select..."
 msgstr "_Select..."
 
-#: src/gui.c:786
+#: src/gui.c:785
 msgid "Select _All Frames"
 msgstr "Select _All Frames"
 
-#: src/gui.c:794
+#: src/gui.c:793
 msgid "_Start Frame Only"
 msgstr "_Start Frame Only"
 
-#: src/gui.c:802
+#: src/gui.c:801
 msgid "_End Frame Only"
 msgstr "_End Frame Only"
 
-#: src/gui.c:813
+#: src/gui.c:812
 msgid "Select from _First Frame"
 msgstr "Select from _First Frame"
 
-#: src/gui.c:817
+#: src/gui.c:816
 msgid "Select to _Last Frame"
 msgstr "Select to _Last Frame"
 
-#: src/gui.c:821
+#: src/gui.c:820
 msgid "Select Last Insertion/_Merge"
 msgstr "Select Last Insertion/_Merge"
 
-#: src/gui.c:825
+#: src/gui.c:824
 msgid "Select Last _Effect"
 msgstr "Select Last _Effect"
 
-#: src/gui.c:829
+#: src/gui.c:828
 msgid "_Invert Selection"
 msgstr "_Invert Selection"
 
-#: src/gui.c:837
+#: src/gui.c:836
 msgid "_Lock Selection Width"
 msgstr "_Lock Selection Width"
 
-#: src/gui.c:842 src/multitrack.c:6409
+#: src/gui.c:841 src/multitrack.c:6591
 msgid "_Play"
 msgstr "_Play"
 
-#: src/gui.c:854
+#: src/gui.c:853
 msgid "_Play All"
 msgstr "_Play All"
 
-#: src/gui.c:869
+#: src/gui.c:868
 msgid "Pla_y Selection"
 msgstr "Pla_y Selection"
 
-#: src/gui.c:877
+#: src/gui.c:876
 msgid "Play _Clipboard"
 msgstr "Play _Clipboard"
 
-#: src/gui.c:899 src/multitrack.c:6441
+#: src/gui.c:898 src/multitrack.c:6623
 msgid "_Stop"
 msgstr "_Stop"
 
-#: src/gui.c:914 src/multitrack.c:6453
+#: src/gui.c:913 src/multitrack.c:6635
 msgid "Re_wind"
 msgstr "Re_wind"
 
-#: src/gui.c:946 src/multitrack.c:6471
+#: src/gui.c:945 src/multitrack.c:6653
 msgid "_Full Screen"
 msgstr "_Full Screen"
 
-#: src/gui.c:955
+#: src/gui.c:954
 msgid "_Double Size"
 msgstr "_Double Size"
 
-#: src/gui.c:963 src/multitrack.c:6479
+#: src/gui.c:962 src/multitrack.c:6661
 msgid "Play in _Separate Window"
 msgstr "Play in _Separate Window"
 
-#: src/gui.c:972
+#: src/gui.c:971
 msgid "_Blank Background"
 msgstr "_Blank Background"
 
-#: src/gui.c:979
+#: src/gui.c:978
 msgid "(Auto)_loop Video (to fit audio track)"
 msgstr "(Auto)_loop Video (to fit audio track)"
 
-#: src/gui.c:988 src/multitrack.c:6487
+#: src/gui.c:987 src/multitrack.c:6669
 msgid "L_oop Continuously"
 msgstr "L_oop Continuously"
 
-#: src/gui.c:997
+#: src/gui.c:996
 msgid "Pin_g Pong Loops"
 msgstr "Pin_g Pong Loops"
 
-#: src/gui.c:1005 src/multitrack.c:6495
+#: src/gui.c:1004 src/multitrack.c:6677
 msgid "_Mute"
 msgstr "_Mute"
 
-#: src/gui.c:1017
+#: src/gui.c:1016
 msgid "Separate Window 'S_ticky' Mode"
 msgstr "Separate Window 'S_ticky' Mode"
 
-#: src/gui.c:1025
+#: src/gui.c:1024
 msgid "S_how Frame Counter"
 msgstr "S_how Frame Counter"
 
-#: src/gui.c:1035
+#: src/gui.c:1034
 msgid "Show Subtitles"
 msgstr "Show Subtitles"
 
-#: src/gui.c:1045
+#: src/gui.c:1044
 msgid "Letterbox mode"
 msgstr "Letterbox mode"
 
-#: src/gui.c:1051 src/multitrack.c:6507
+#: src/gui.c:1050 src/multitrack.c:6689
 msgid "Effect_s"
 msgstr "Effect_s"
 
-#: src/gui.c:1054
+#: src/gui.c:1053
 msgid "Effects are applied to the current selection."
 msgstr "Effects are applied to the current selection."
 
-#: src/gui.c:1067
+#: src/gui.c:1066
 msgid "_Run Test Rendered Effect/Tool/Generator..."
 msgstr "_Run Test Rendered Effect/Tool/Generator..."
 
-#: src/gui.c:1072 src/multitrack.c:7123
+#: src/gui.c:1071 src/multitrack.c:7299
 msgid "_Tools"
 msgstr "_Tools"
 
-#: src/gui.c:1075
+#: src/gui.c:1074
 msgid "Tools are applied to complete clips."
 msgstr "Tools are applied to complete clips."
 
-#: src/gui.c:1085
+#: src/gui.c:1084
 msgid "_Reverse Clipboard"
 msgstr "_Reverse Clipboard"
 
-#: src/gui.c:1094
+#: src/gui.c:1093
 msgid "_Change Playback/Save Speed..."
 msgstr "_Change Playback/Save Speed..."
 
-#: src/gui.c:1099
+#: src/gui.c:1098
 msgid "Resample _Video to New Frame Rate..."
 msgstr "Resample _Video to New Frame Rate..."
 
-#: src/gui.c:1105
+#: src/gui.c:1104
 msgid "_Utilities"
 msgstr "_Utilities"
 
-#: src/gui.c:1110
+#: src/gui.c:1109
 msgid "Custom _Tools"
 msgstr "Custom _Tools"
 
-#: src/gui.c:1116 src/multitrack.c:7149
+#: src/gui.c:1115 src/multitrack.c:7325
 msgid "_Generate"
 msgstr "_Generate"
 
-#: src/gui.c:1126
+#: src/gui.c:1125
 msgid "Loading rendered effect plugins..."
 msgstr "Loading rendered effect plugins..."
 
-#: src/gui.c:1139
+#: src/gui.c:1138
 msgid "Load _Subtitles from File..."
 msgstr "Load _Subtitles from File..."
 
-#: src/gui.c:1144
+#: src/gui.c:1143
 msgid "Erase subtitles"
 msgstr "Erase subtitles"
 
-#: src/gui.c:1152 src/multitrack.c:7158
+#: src/gui.c:1151 src/multitrack.c:7334
 msgid "Capture _External Window... "
 msgstr "Capture _External Window... "
 
-#: src/gui.c:1159 src/multitrack.c:7173
+#: src/gui.c:1158 src/multitrack.c:7349
 msgid "_Preferences..."
 msgstr "_Preferences..."
 
-#: src/gui.c:1172
+#: src/gui.c:1171
 msgid "_Audio"
 msgstr "_Audio"
 
-#: src/gui.c:1184
+#: src/gui.c:1183
 msgid "Load _New Audio for Clip..."
 msgstr "Load _New Audio for Clip..."
 
-#: src/gui.c:1190
+#: src/gui.c:1189
 msgid "Load _CD Track..."
 msgstr "Load _CD Track..."
 
-#: src/gui.c:1191
+#: src/gui.c:1190
 msgid "E_ject CD"
 msgstr "E_ject CD"
 
-#: src/gui.c:1205
+#: src/gui.c:1204
 msgid "Record E_xternal Audio..."
 msgstr "Record E_xternal Audio..."
 
-#: src/gui.c:1218
+#: src/gui.c:1217
 msgid "to New _Clip..."
 msgstr "to New _Clip..."
 
-#: src/gui.c:1222
+#: src/gui.c:1221
 msgid "to _Selection"
 msgstr "to _Selection"
 
-#: src/gui.c:1230
+#: src/gui.c:1229
 msgid "Fade Audio _In..."
 msgstr "Fade Audio _In..."
 
-#: src/gui.c:1234
+#: src/gui.c:1233
 msgid "Fade Audio _Out..."
 msgstr "Fade Audio _Out..."
 
-#: src/gui.c:1244
+#: src/gui.c:1243
 msgid "_Export Audio..."
 msgstr "_Export Audio..."
 
-#: src/gui.c:1257
+#: src/gui.c:1256
 msgid "Export _Selected Audio..."
 msgstr "Export _Selected Audio..."
 
-#: src/gui.c:1261
+#: src/gui.c:1260
 msgid "Export _All Audio..."
 msgstr "Export _All Audio..."
 
-#: src/gui.c:1265
+#: src/gui.c:1264
 msgid "_Append Audio..."
 msgstr "_Append Audio..."
 
-#: src/gui.c:1270
+#: src/gui.c:1269
 msgid "_Trim/Pad Audio..."
 msgstr "_Trim/Pad Audio..."
 
-#: src/gui.c:1283
+#: src/gui.c:1282
 msgid "Trim/Pad Audio to _Selection"
 msgstr "Trim/Pad Audio to _Selection"
 
-#: src/gui.c:1288
+#: src/gui.c:1287
 msgid "Trim/Pad Audio from Beginning to _Play Start"
 msgstr "Trim/Pad Audio from Beginning to _Play Start"
 
-#: src/gui.c:1293
+#: src/gui.c:1292
 msgid "_Delete Audio..."
 msgstr "_Delete Audio..."
 
-#: src/gui.c:1306
+#: src/gui.c:1305
 msgid "Delete _Selected Audio"
 msgstr "Delete _Selected Audio"
 
-#: src/gui.c:1310
+#: src/gui.c:1309
 msgid "Delete _All Audio"
 msgstr "Delete _All Audio"
 
-#: src/gui.c:1314
+#: src/gui.c:1313
 msgid "Insert _Silence in Selection"
 msgstr "Insert _Silence in Selection"
 
-#: src/gui.c:1319
+#: src/gui.c:1318
 msgid "_Resample Audio..."
 msgstr "_Resample Audio..."
 
-#: src/gui.c:1324
+#: src/gui.c:1323
 msgid "_Info"
 msgstr "_Info"
 
-#: src/gui.c:1336
+#: src/gui.c:1335
 msgid "Show Clip _Info"
 msgstr "Show Clip _Info"
 
-#: src/gui.c:1344
+#: src/gui.c:1343
 msgid "Show/_Edit File Comments"
 msgstr "Show/_Edit File Comments"
 
-#: src/gui.c:1349
+#: src/gui.c:1348
 msgid "Show _Clipboard Info"
 msgstr "Show _Clipboard Info"
 
-#: src/gui.c:1360 src/multitrack.c:7286
+#: src/gui.c:1359 src/multitrack.c:7462
 msgid "Show _Messages"
 msgstr "Show _Messages"
 
-#: src/gui.c:1364 src/multitrack.c:7365
+#: src/gui.c:1363 src/multitrack.c:7541
 msgid "Show _Layout Errors"
 msgstr "Show _Layout Errors"
 
-#: src/gui.c:1369 src/multitrack.c:7263
+#: src/gui.c:1368 src/multitrack.c:7439
 msgid "_Clips"
 msgstr "_Clips"
 
-#: src/gui.c:1381
+#: src/gui.c:1380
 msgid "_Rename Current Clip in Menu..."
 msgstr "_Rename Current Clip in Menu..."
 
-#: src/gui.c:1399
+#: src/gui.c:1398
 msgid "A_dvanced"
 msgstr "A_dvanced"
 
-#: src/gui.c:1412
+#: src/gui.c:1411
 msgid "_RFX Effects/Tools/Utilities"
 msgstr "_RFX Effects/Tools/Utilities"
 
-#: src/gui.c:1424
+#: src/gui.c:1423
 msgid "_New Test RFX Script..."
 msgstr "_New Test RFX Script..."
 
-#: src/gui.c:1428
+#: src/gui.c:1427
 msgid "_Copy RFX Script to Test..."
 msgstr "_Copy RFX Script to Test..."
 
-#: src/gui.c:1432
+#: src/gui.c:1431
 msgid "_Edit Test RFX Script..."
 msgstr "_Edit Test RFX Script..."
 
-#: src/gui.c:1436
+#: src/gui.c:1435
 msgid "Rena_me Test RFX Script..."
 msgstr "Rena_me Test RFX Script..."
 
-#: src/gui.c:1440
+#: src/gui.c:1439
 msgid "_Delete Test RFX Script..."
 msgstr "_Delete Test RFX Script..."
 
-#: src/gui.c:1450
+#: src/gui.c:1449
 msgid "_Promote Test Rendered Effect/Tool/Generator..."
 msgstr "_Promote Test Rendered Effect/Tool/Generator..."
 
-#: src/gui.c:1457
+#: src/gui.c:1456
 msgid "_Import Custom RFX script..."
 msgstr "_Import Custom RFX script..."
 
-#: src/gui.c:1461
+#: src/gui.c:1460
 msgid "E_xport Custom RFX script..."
 msgstr "E_xport Custom RFX script..."
 
-#: src/gui.c:1465
+#: src/gui.c:1464
 msgid "De_lete Custom RFX Script..."
 msgstr "De_lete Custom RFX Script..."
 
-#: src/gui.c:1472
+#: src/gui.c:1471
 msgid "Re_build all RFX plugins"
 msgstr "Re_build all RFX plugins"
 
-#: src/gui.c:1501
+#: src/gui.c:1498
 msgid "Receive _LiVES stream from..."
 msgstr "Receive _LiVES stream from..."
 
-#: src/gui.c:1506
+#: src/gui.c:1503
 msgid "_Send LiVES stream to..."
 msgstr "_Send LiVES stream to..."
 
-#: src/gui.c:1515
+#: src/gui.c:1512
 #, c-format
 msgid "Open _yuv4mpeg stream on %sstream.yuv..."
 msgstr "Open _yuv4mpeg stream on %sstream.yuv..."
 
-#: src/gui.c:1536
+#: src/gui.c:1534
 msgid "_Import Project (.lv2)..."
 msgstr "_Import Project (.lv2)..."
 
-#: src/gui.c:1540
+#: src/gui.c:1538
 msgid "E_xport Project (.lv2)..."
 msgstr "E_xport Project (.lv2)..."
 
-#: src/gui.c:1545
+#: src/gui.c:1543
 msgid "_VJ"
 msgstr "_VJ"
 
-#: src/gui.c:1557
+#: src/gui.c:1555
 msgid "Real Time _Effect Mapping"
 msgstr "Real Time _Effect Mapping"
 
-#: src/gui.c:1563
+#: src/gui.c:1561
 msgid "Bind real time effects to ctrl-number keys."
 msgstr "Bind real time effects to ctrl-number keys."
 
-#: src/gui.c:1565
+#: src/gui.c:1563
 msgid "Set Real Time Effect _Defaults"
 msgstr "Set Real Time Effect _Defaults"
 
-#: src/gui.c:1567
+#: src/gui.c:1565
 msgid "Set default parameter values for real time effects."
 msgstr "Set default parameter values for real time effects."
 
-#: src/gui.c:1580
+#: src/gui.c:1578
 msgid "Save Real Time Effect _Defaults"
 msgstr "Save Real Time Effect _Defaults"
 
-#: src/gui.c:1583
+#: src/gui.c:1581
 msgid ""
 "Save real time effect defaults so they will be restored each time you use "
 "LiVES."
@@ -3666,145 +3659,145 @@
 "Save real time effect defaults so they will be restored each time you use "
 "LiVES."
 
-#: src/gui.c:1589
+#: src/gui.c:1587
 msgid "_Reset all playback speeds and positions"
 msgstr "_Reset all playback speeds and positions"
 
-#: src/gui.c:1592
+#: src/gui.c:1590
 msgid ""
 "Reset all playback positions to frame 1, and reset all playback frame rates."
 msgstr ""
 "Reset all playback positions to frame 1, and reset all playback frame rates."
 
-#: src/gui.c:1594
+#: src/gui.c:1592
 msgid "_MIDI/joystick interface"
 msgstr "_MIDI/joystick interface"
 
-#: src/gui.c:1609
+#: src/gui.c:1607
 msgid "_MIDI/joystick learner..."
 msgstr "_MIDI/joystick learner..."
 
-#: src/gui.c:1614
+#: src/gui.c:1612
 msgid "_Save device mapping..."
 msgstr "_Save device mapping..."
 
-#: src/gui.c:1620
+#: src/gui.c:1618
 msgid "_Load device mapping..."
 msgstr "_Load device mapping..."
 
-#: src/gui.c:1628
+#: src/gui.c:1626
 msgid "Show VJ _Keys"
 msgstr "Show VJ _Keys"
 
-#: src/gui.c:1632
+#: src/gui.c:1630
 msgid "To_ys"
 msgstr "To_ys"
 
-#: src/gui.c:1644
+#: src/gui.c:1642
 msgid "_None"
 msgstr "_None"
 
-#: src/gui.c:1652
+#: src/gui.c:1650
 msgid "_Autolives"
 msgstr "_Autolives"
 
-#: src/gui.c:1657
+#: src/gui.c:1655
 msgid "_Mad Frames"
 msgstr "_Mad Frames"
 
-#: src/gui.c:1662
+#: src/gui.c:1660
 msgid "_LiVES TV (broadband)"
 msgstr "_LiVES TV (broadband)"
 
-#: src/gui.c:1672 src/multitrack.c:7387
+#: src/gui.c:1670 src/multitrack.c:7563
 msgid "_Help"
 msgstr "_Help"
 
-#: src/gui.c:1684 src/multitrack.c:7407
+#: src/gui.c:1682 src/multitrack.c:7583
 msgid "_Manual (opens in browser)"
 msgstr "_Manual (opens in browser)"
 
-#: src/gui.c:1691 src/multitrack.c:7416
+#: src/gui.c:1689 src/multitrack.c:7592
 msgid "_Donate to the project !"
 msgstr "_Donate to the project !"
 
-#: src/gui.c:1695 src/multitrack.c:7420
+#: src/gui.c:1693 src/multitrack.c:7596
 msgid "_Email the author"
 msgstr "_Email the author"
 
-#: src/gui.c:1699 src/multitrack.c:7424
+#: src/gui.c:1697 src/multitrack.c:7600
 msgid "Report a _bug"
 msgstr "Report a _bug"
 
-#: src/gui.c:1703 src/multitrack.c:7428
+#: src/gui.c:1701 src/multitrack.c:7604
 msgid "Suggest a _feature"
 msgstr "Suggest a _feature"
 
-#: src/gui.c:1707 src/multitrack.c:7432
+#: src/gui.c:1705 src/multitrack.c:7608
 msgid "Assist with _translating"
 msgstr "Assist with _translating"
 
-#: src/gui.c:1714 src/multitrack.c:7439
+#: src/gui.c:1712 src/multitrack.c:7615
 msgid "_Troubleshoot"
 msgstr "_Troubleshoot"
 
-#: src/gui.c:1718 src/multitrack.c:7443
+#: src/gui.c:1716 src/multitrack.c:7619
 msgid "_About"
 msgstr "_About"
 
-#: src/gui.c:1752
+#: src/gui.c:1750
 msgid "Rewind to start (w)"
 msgstr "Rewind to start (w)"
 
-#: src/gui.c:1760 src/multitrack.c:16720
+#: src/gui.c:1758 src/multitrack.c:17010
 msgid "Play all (p)"
 msgstr "Play all (p)"
 
-#: src/gui.c:1768 src/gui.c:1877
+#: src/gui.c:1766 src/gui.c:1876
 msgid "Stop playback (q)"
 msgstr "Stop playback (q)"
 
-#: src/gui.c:1779
+#: src/gui.c:1777
 msgid "Play selection (y)"
 msgstr "Play selection (y)"
 
-#: src/gui.c:1832
+#: src/gui.c:1829
 msgid "Volume"
 msgstr "Volume"
 
-#: src/gui.c:1854
+#: src/gui.c:1853
 msgid "Audio volume (1.00)"
 msgstr "Audio volume (1.00)"
 
-#: src/gui.c:1883
+#: src/gui.c:1882
 msgid "Unblank background (b)"
 msgstr "Unblank background (b)"
 
-#: src/gui.c:1929
+#: src/gui.c:1928
 msgid "Play slower (ctrl-down)"
 msgstr "Play slower (ctrl-down)"
 
-#: src/gui.c:1935
+#: src/gui.c:1934
 msgid "Play faster (ctrl-up)"
 msgstr "Play faster (ctrl-up)"
 
-#: src/gui.c:1942
+#: src/gui.c:1941
 msgid "Skip back (ctrl-left)"
 msgstr "Skip back (ctrl-left)"
 
-#: src/gui.c:1948
+#: src/gui.c:1947
 msgid "Skip forward (ctrl-right)"
 msgstr "Skip forward (ctrl-right)"
 
-#: src/gui.c:1954
+#: src/gui.c:1953
 msgid "Show clip info (i)"
 msgstr "Show clip info (i)"
 
-#: src/gui.c:1960
+#: src/gui.c:1959
 msgid "Hide this toolbar"
 msgstr "Hide this toolbar"
 
-#: src/gui.c:1962
+#: src/gui.c:1961
 msgid ""
 "Press \"s\" to toggle separate play window for improved performance, \"q\" "
 "to stop."
@@ -3813,174 +3806,174 @@
 "to stop."
 
 #. TRANSLATORS: please keep the translated string the same length
-#: src/gui.c:1995
+#: src/gui.c:1994
 msgid "     Video playback speed (frames per second)        "
 msgstr "     Video playback speed (frames per second)        "
 
-#: src/gui.c:2009
+#: src/gui.c:2008
 msgid "Vary the video speed"
 msgstr "Vary the video speed"
 
-#: src/gui.c:2092 src/gui.c:3218
+#: src/gui.c:2090 src/gui.c:3329
 msgid "First Frame"
 msgstr "First Frame"
 
-#: src/gui.c:2193 src/gui.c:3226
+#: src/gui.c:2191 src/gui.c:3336
 msgid "Last Frame"
 msgstr "Last Frame"
 
-#: src/gui.c:2210
+#: src/gui.c:2208
 msgid "The first selected frame in this clip"
 msgstr "The first selected frame in this clip"
 
-#: src/gui.c:2248
+#: src/gui.c:2246
 msgid "The last selected frame in this clip"
 msgstr "The last selected frame in this clip"
 
-#: src/gui.c:2532
+#: src/gui.c:2546
 msgid "Starting...\n"
 msgstr "Starting...\n"
 
-#: src/gui.c:3074
+#: src/gui.c:3181
 msgid "    Press 'q' to stop recording.  DO NOT COVER THE PLAY WINDOW !   "
 msgstr "    Press 'q' to stop recording.  DO NOT COVER THE PLAY WINDOW !   "
 
-#: src/gui.c:3521
+#: src/gui.c:3643
 msgid "Frame number to preview"
 msgstr "Frame number to preview"
 
-#: src/gui.c:3538
+#: src/gui.c:3660
 msgid "_Free"
 msgstr "_Free"
 
-#: src/gui.c:3539
+#: src/gui.c:3661
 msgid "Free choice of frame number"
 msgstr "Free choice of frame number"
 
-#: src/gui.c:3543
+#: src/gui.c:3666
 msgid "_Start"
 msgstr "_Start"
 
-#: src/gui.c:3544
+#: src/gui.c:3667
 msgid "Frame number is linked to start frame"
 msgstr "Frame number is linked to start frame"
 
-#: src/gui.c:3551
+#: src/gui.c:3675
 msgid "_End"
 msgstr "_End"
 
-#: src/gui.c:3552
+#: src/gui.c:3676
 msgid "Frame number is linked to end frame"
 msgstr "Frame number is linked to end frame"
 
-#: src/gui.c:3559
+#: src/gui.c:3684
 msgid "_Pointer"
 msgstr "_Pointer"
 
-#: src/gui.c:3560
+#: src/gui.c:3685
 msgid "Frame number is linked to playback pointer"
 msgstr "Frame number is linked to playback pointer"
 
-#: src/gui.c:3581
+#: src/gui.c:3707
 msgid "Rewind"
 msgstr "Rewind"
 
-#: src/gui.c:3592 src/dialogs.c:894 src/dialogs.c:896 src/dialogs.c:1817
-#: src/dialogs.c:1819
+#: src/gui.c:3718 src/dialogs.c:960 src/dialogs.c:962 src/dialogs.c:1873
+#: src/dialogs.c:1875
 msgid "Play all"
 msgstr "Play all"
 
-#: src/gui.c:3605
+#: src/gui.c:3731
 msgid "Play Selection"
 msgstr "Play Selection"
 
-#: src/gui.c:3619
+#: src/gui.c:3745
 msgid "Loop On/Off"
 msgstr "Loop On/Off"
 
-#: src/gui.c:3693
+#: src/gui.c:3819
 msgid "Start _recording"
 msgstr "Start _recording"
 
-#: src/gui.c:3698
+#: src/gui.c:3824
 msgid "Stop _recording"
 msgstr "Stop _recording"
 
-#: src/gui.c:3703
+#: src/gui.c:3829
 msgid "_Record Performance"
 msgstr "_Record Performance"
 
-#: src/gui.c:3851
+#: src/gui.c:3974
 msgid "Hide Play Window"
 msgstr "Hide Play Window"
 
-#: src/gui.c:4232
+#: src/gui.c:4333
 msgid "Show Play Window"
 msgstr "Show Play Window"
 
-#: src/ce_thumbs.c:222
+#: src/ce_thumbs.c:242
 #, c-format
 msgid "Mapped to ctrl-%d"
 msgstr "Mapped to ctrl-%d"
 
-#: src/ce_thumbs.c:276 src/effects.c:85 src/preferences.c:3195
+#: src/ce_thumbs.c:296 src/effects.c:86 src/preferences.c:3247
 msgid "Effects"
 msgstr "Effects"
 
-#: src/ce_thumbs.c:279 src/multitrack.c:5615
+#: src/ce_thumbs.c:299 src/multitrack.c:5791
 msgid "Clips"
 msgstr "Clips"
 
-#: src/ce_thumbs.c:303
+#: src/ce_thumbs.c:323
 #, c-format
 msgid "Show / apply effects to %s\n"
 msgstr "Show / apply effects to %s\n"
 
-#: src/ce_thumbs.c:315
+#: src/ce_thumbs.c:335
 #, c-format
 msgid "Select clip for %s\n"
 msgstr "Select clip for %s\n"
 
-#: src/ce_thumbs.c:515
+#: src/ce_thumbs.c:536
 msgid "_Pin"
 msgstr "_Pin"
 
-#: src/ce_thumbs.c:515
+#: src/ce_thumbs.c:537
 msgid "Pin the parameter box to the window"
 msgstr "Pin the parameter box to the window"
 
 #. TRANSLATORS: Exabytes
-#: src/utils.c:794
+#: src/utils.c:800
 #, c-format
 msgid "%.2f EB"
 msgstr "%.2f EB"
 
 #. TRANSLATORS: Petabytes
-#: src/utils.c:798
+#: src/utils.c:803
 #, c-format
 msgid "%.2f PB"
 msgstr "%.2f PB"
 
 #. TRANSLATORS: Terabytes
-#: src/utils.c:802
+#: src/utils.c:806
 #, c-format
 msgid "%.2f TB"
 msgstr "%.2f TB"
 
 #. TRANSLATORS: Gigabytes
-#: src/utils.c:806
+#: src/utils.c:809
 #, c-format
 msgid "%.2f GB"
 msgstr "%.2f GB"
 
 #. TRANSLATORS: Megabytes
-#: src/utils.c:810
+#: src/utils.c:812
 #, c-format
 msgid "%.2f MB"
 msgstr "%.2f MB"
 
 #. TRANSLATORS: Kilobytes (1024 bytes)
-#: src/utils.c:814
+#: src/utils.c:815
 #, c-format
 msgid "%.2f KiB"
 msgstr "%.2f KiB"
@@ -3990,7 +3983,7 @@
 msgid "%d bytes"
 msgstr "%d bytes"
 
-#: src/utils.c:1841
+#: src/utils.c:1835
 msgid "Clearing the clipboard"
 msgstr "Clearing the clipboard"
 
@@ -4005,7 +3998,7 @@
 "==============================\n"
 "Switched to clip %s\n"
 
-#: src/utils.c:1880
+#: src/utils.c:1877
 msgid ""
 "\n"
 "==============================\n"
@@ -4015,11 +4008,11 @@
 "==============================\n"
 "Switched to empty clip\n"
 
-#: src/utils.c:1917
+#: src/utils.c:1916
 msgid "(blank)"
 msgstr "(blank)"
 
-#: src/utils.c:1920
+#: src/utils.c:1919
 #, c-format
 msgid ""
 "The set name has been changed from %s to %s. Affected layouts have been "
@@ -4028,7 +4021,7 @@
 "The set name has been changed from %s to %s. Affected layouts have been "
 "updated accordingly\n"
 
-#: src/utils.c:1928
+#: src/utils.c:1927
 #, c-format
 msgid ""
 "The clip %s is missing from this set.\n"
@@ -4037,7 +4030,7 @@
 "The clip %s is missing from this set.\n"
 "It is required by the following layouts:\n"
 
-#: src/utils.c:1932
+#: src/utils.c:1931
 #, c-format
 msgid ""
 "The clip %s has been closed.\n"
@@ -4046,7 +4039,7 @@
 "The clip %s has been closed.\n"
 "It is required by the following layouts:\n"
 
-#: src/utils.c:1937
+#: src/utils.c:1936
 #, c-format
 msgid ""
 "Frames have been shifted in the clip %s.\n"
@@ -4055,7 +4048,7 @@
 "Frames have been shifted in the clip %s.\n"
 "The following layouts are affected:\n"
 
-#: src/utils.c:1942
+#: src/utils.c:1941
 #, c-format
 msgid ""
 "Frames have been deleted from the clip %s.\n"
@@ -4064,7 +4057,7 @@
 "Frames have been deleted from the clip %s.\n"
 "The following layouts are affected:\n"
 
-#: src/utils.c:1947
+#: src/utils.c:1946
 #, c-format
 msgid ""
 "Audio has been deleted from the clip %s.\n"
@@ -4073,7 +4066,7 @@
 "Audio has been deleted from the clip %s.\n"
 "The following layouts are affected:\n"
 
-#: src/utils.c:1952
+#: src/utils.c:1951
 #, c-format
 msgid ""
 "Audio has been shifted in clip %s.\n"
@@ -4082,7 +4075,7 @@
 "Audio has been shifted in clip %s.\n"
 "The following layouts are affected:\n"
 
-#: src/utils.c:1957
+#: src/utils.c:1956
 #, c-format
 msgid ""
 "Audio has been altered in the clip %s.\n"
@@ -4091,7 +4084,7 @@
 "Audio has been altered in the clip %s.\n"
 "The following layouts are affected:\n"
 
-#: src/utils.c:1962
+#: src/utils.c:1961
 #, c-format
 msgid ""
 "Frames have been altered in the clip %s.\n"
@@ -4100,7 +4093,7 @@
 "Frames have been altered in the clip %s.\n"
 "The following layouts are affected:\n"
 
-#: src/utils.c:2135
+#: src/utils.c:2134
 #, c-format
 msgid ""
 "Set %s\n"
@@ -4111,7 +4104,7 @@
 "cannot be opened, as it is in use\n"
 "by another copy of LiVES.\n"
 
-#: src/utils.c:2142
+#: src/utils.c:2140
 #, c-format
 msgid ""
 "\n"
@@ -4171,68 +4164,68 @@
 msgid "Removing layout %s\n"
 msgstr "Removing layout %s\n"
 
-#: src/utils.c:3014
+#: src/utils.c:2996
 msgid "Video [opening...]"
 msgstr "Video [opening...]"
 
-#: src/utils.c:3018
+#: src/utils.c:2999
 #, c-format
 msgid "Video [%.2f sec]"
 msgstr "Video [%.2f sec]"
 
-#: src/utils.c:3022
+#: src/utils.c:3002
 msgid "(Undefined)"
 msgstr "(Undefined)"
 
-#: src/utils.c:3025
+#: src/utils.c:3004
 msgid "(No video)"
 msgstr "(No video)"
 
-#: src/utils.c:3032
+#: src/utils.c:3011
 msgid "(No audio)"
 msgstr "(No audio)"
 
-#: src/utils.c:3037
+#: src/utils.c:3015
 msgid "Mono  [opening...]"
 msgstr "Mono  [opening...]"
 
-#: src/utils.c:3040
+#: src/utils.c:3017
 msgid "Left Audio [opening...]"
 msgstr "Left Audio [opening...]"
 
-#: src/utils.c:3045
+#: src/utils.c:3021
 #, c-format
 msgid "Mono [%.2f sec]"
 msgstr "Mono [%.2f sec]"
 
-#: src/utils.c:3048
+#: src/utils.c:3023
 #, c-format
 msgid "Left Audio [%.2f sec]"
 msgstr "Left Audio [%.2f sec]"
 
-#: src/utils.c:3056
+#: src/utils.c:3031
 msgid "Right Audio [opening...]"
 msgstr "Right Audio [opening...]"
 
-#: src/utils.c:3059
+#: src/utils.c:3033
 #, c-format
 msgid "Right Audio [%.2f sec]"
 msgstr "Right Audio [%.2f sec]"
 
-#: src/utils.c:3506
+#: src/utils.c:3472
 msgid "LiVES cannot switch to mplayer whilst clips are loading."
 msgstr "LiVES cannot switch to mplayer whilst clips are loading."
 
-#: src/utils.c:3559
+#: src/utils.c:3525
 #, fuzzy
 msgid "LiVES cannot switch to mplayer2 whilst clips are loading."
 msgstr "LiVES cannot switch to mplayer whilst clips are loading."
 
-#: src/utils.c:3809
+#: src/utils.c:3775
 msgid "Cleaning up clip"
 msgstr "Cleaning up clip"
 
-#: src/utils.c:3913
+#: src/utils.c:3874
 #, c-format
 msgid ""
 "\n"
@@ -4247,30 +4240,29 @@
 "\n"
 "Overwrite ?\n"
 
-#: src/utils.c:4305 src/utils.c:4337 src/multitrack.c:4503
+#: src/utils.c:4250 src/utils.c:4280 src/multitrack.c:4672
 #, c-format
 msgid "_Undo %s"
 msgstr "_Undo %s"
 
-#: src/utils.c:4306 src/utils.c:4338 src/multitrack.c:4525
+#: src/utils.c:4251 src/utils.c:4281 src/multitrack.c:4693
 #, c-format
 msgid "_Redo %s"
 msgstr "_Redo %s"
 
-#: src/utils.c:4363
+#: src/utils.c:4305
 msgid "-------------Selection------------"
 msgstr "-------------Selection------------"
 
-#. TRANSLATORS: - try to keep the text of the middle part the same length, by deleting "-" if necessary
-#: src/utils.c:4371
+#: src/utils.c:4313
 msgid " sec ] ----------Selection---------- [ "
 msgstr " sec ] ----------Selection---------- [ "
 
-#: src/utils.c:4371
+#: src/utils.c:4314
 msgid " frames ] ----------"
 msgstr " frames ] ----------"
 
-#: src/utils.c:5360
+#: src/utils.c:5302
 msgid ""
 "Your version of mplayer/ffmpeg may be broken !\n"
 "See http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2071\n"
@@ -4288,11 +4280,11 @@
 "\n"
 "Try running Help/Troubleshoot for more information."
 
-#: src/saveplay.c:178
+#: src/saveplay.c:179
 msgid "Examining file header"
 msgstr "Examining file header"
 
-#: src/saveplay.c:315 src/saveplay.c:789
+#: src/saveplay.c:316 src/saveplay.c:779
 #, c-format
 msgid "Opening %s"
 msgstr "Opening %s"
@@ -4302,36 +4294,36 @@
 msgid "Opening %s start time %.2f sec. frames %d"
 msgstr "Opening %s start time %.2f sec. frames %d"
 
-#: src/saveplay.c:326 src/saveplay.c:4001
+#: src/saveplay.c:326 src/saveplay.c:3927
 msgid " without sound"
 msgstr " without sound"
 
-#: src/saveplay.c:396
+#: src/saveplay.c:395
 #, c-format
 msgid "Opening audio for %s"
 msgstr "Opening audio for %s"
 
-#: src/saveplay.c:557
+#: src/saveplay.c:554
 #, c-format
 msgid "Auto trimming %.2f seconds of audio at start..."
 msgstr "Auto trimming %.2f seconds of audio at start..."
 
-#: src/saveplay.c:567
+#: src/saveplay.c:562
 #, c-format
 msgid "Auto trimming %.2f seconds of audio at end..."
 msgstr "Auto trimming %.2f seconds of audio at end..."
 
-#: src/saveplay.c:584
+#: src/saveplay.c:577
 #, c-format
 msgid "Auto padding with %.2f seconds of silence at start..."
 msgstr "Auto padding with %.2f seconds of silence at start..."
 
-#: src/saveplay.c:599
+#: src/saveplay.c:590
 #, c-format
 msgid "Auto padding with %.2f seconds of silence at end..."
 msgstr ""
 
-#: src/saveplay.c:671
+#: src/saveplay.c:661
 #, c-format
 msgid ""
 "\n"
@@ -4350,11 +4342,11 @@
 "\n"
 "Are you sure you wish to continue ?"
 
-#: src/saveplay.c:685
+#: src/saveplay.c:676
 msgid " - please be patient."
 msgstr " - please be patient."
 
-#: src/saveplay.c:938
+#: src/saveplay.c:926
 msgid ""
 "\n"
 "\n"
@@ -4366,7 +4358,7 @@
 "LiVES was unable to extract either video or audio.\n"
 "Please check the terminal window for more details.\n"
 
-#: src/saveplay.c:940
+#: src/saveplay.c:928
 msgid ""
 "\n"
 "\n"
@@ -4376,7 +4368,7 @@
 "\n"
 "You may need to install mplayer to open this file.\n"
 
-#: src/saveplay.c:948
+#: src/saveplay.c:934
 msgid ""
 "\n"
 "\n"
@@ -4388,29 +4380,29 @@
 "Please check the setting of Video open command in\n"
 "Tools|Preferences|Decoding\n"
 
-#: src/saveplay.c:1014
+#: src/saveplay.c:995
 msgid "Adding image..."
 msgstr "Adding image..."
 
-#: src/saveplay.c:1108
+#: src/saveplay.c:1089
 #, c-format
 msgid "Subtitles were saved as %s\n"
 msgstr "Subtitles were saved as %s\n"
 
-#: src/saveplay.c:1192
+#: src/saveplay.c:1171
 #, c-format
 msgid "LiVES: Save Frame %d as..."
 msgstr "LiVES: Save Frame %d as..."
 
-#: src/saveplay.c:1195
+#: src/saveplay.c:1174
 msgid "LiVES: Save Frame as..."
 msgstr "LiVES: Save Frame as..."
 
-#: src/saveplay.c:1322
+#: src/saveplay.c:1303
 msgid "LiVES: Save Clip as..."
 msgstr "LiVES: Save Clip as..."
 
-#: src/saveplay.c:1390
+#: src/saveplay.c:1369
 msgid ""
 "Saving your video could lead to a loss of quality !\n"
 "You are strongly advised to 'Save As' to a new file.\n"
@@ -4422,34 +4414,34 @@
 "\n"
 "Do you still wish to continue ?"
 
-#: src/saveplay.c:1517 src/saveplay.c:1683 src/saveplay.c:1762
-#: src/saveplay.c:4014
+#: src/saveplay.c:1494 src/saveplay.c:1659 src/saveplay.c:1738
+#: src/saveplay.c:3940
 msgid "Pulling frames from clip"
 msgstr "Pulling frames from clip"
 
-#: src/saveplay.c:1588 src/saveplay.c:1727
+#: src/saveplay.c:1565 src/saveplay.c:1703
 msgid "Linking selection"
 msgstr "Linking selection"
 
-#: src/saveplay.c:1779
+#: src/saveplay.c:1755
 msgid " (with no sound)\n"
 msgstr " (with no sound)\n"
 
-#: src/saveplay.c:1786
+#: src/saveplay.c:1761
 #, c-format
 msgid "Saving frames %d to %d%s as \"%s\" : encoder = %s : format = %s..."
 msgstr "Saving frames %d to %d%s as \"%s\" : encoder = %s : format = %s..."
 
-#: src/saveplay.c:1790
+#: src/saveplay.c:1765
 #, c-format
 msgid "Saving frames 1 to %d%s as \"%s\" : encoder %s : format = %s..."
 msgstr "Saving frames 1 to %d%s as \"%s\" : encoder %s : format = %s..."
 
-#: src/saveplay.c:1909
+#: src/saveplay.c:1890
 msgid "Saving [can take a long time]"
 msgstr "Saving [can take a long time]"
 
-#: src/saveplay.c:2057
+#: src/saveplay.c:2044
 msgid ""
 "\n"
 "\n"
@@ -4459,33 +4451,33 @@
 "\n"
 "Encoder error - output file was not created !\n"
 
-#: src/saveplay.c:2094
+#: src/saveplay.c:2081
 msgid "Clearing letterbox"
 msgstr "Clearing letterbox..."
 
-#: src/saveplay.c:2183
+#: src/saveplay.c:2168
 #, c-format
 msgid "File size was %s\n"
 msgstr "File size was %s\n"
 
-#: src/saveplay.c:2284
+#: src/saveplay.c:2265
 msgid "recording aborted by preview.\n"
 msgstr "recording aborted by preview.\n"
 
-#: src/saveplay.c:2288
+#: src/saveplay.c:2268
 msgid "recording aborted by clipboard playback.\n"
 msgstr "recording aborted by clipboard playback.\n"
 
-#: src/saveplay.c:2291
+#: src/saveplay.c:2270
 msgid "Recording performance..."
 msgstr "Recording performance..."
 
-#: src/saveplay.c:3293
+#: src/saveplay.c:3251
 #, c-format
 msgid "Average FPS was %.4f\n"
 msgstr "Average FPS was %.4f\n"
 
-#: src/saveplay.c:3299
+#: src/saveplay.c:3256
 msgid ""
 "\n"
 "\n"
@@ -4499,16 +4491,21 @@
 "You should click on Tools--->Resize All\n"
 "and resize all frames to the current size.\n"
 
-#: src/saveplay.c:3479
+#: src/saveplay.c:3429
 msgid "Unknown"
 msgstr "Unknown"
 
-#: src/saveplay.c:3588 src/saveplay.c:4585
+#: src/saveplay.c:3538 src/saveplay.c:4502
 #, c-format
 msgid "Untitled%d"
 msgstr "Untitled%d"
 
-#: src/saveplay.c:3633
+#: src/saveplay.c:3567
+#, c-format
+msgid "%d frames are enough !\n"
+msgstr "%d frames are enough !\n"
+
+#: src/saveplay.c:3579
 #, c-format
 msgid ""
 "\n"
@@ -4519,7 +4516,7 @@
 "Error getting file info for clip %s.\n"
 "Bad things may happen with this clip.\n"
 
-#: src/saveplay.c:3723
+#: src/saveplay.c:3667
 #, c-format
 msgid ""
 "\n"
@@ -4530,12 +4527,12 @@
 "Playback speed not found or invalid ! Using default fps of %.3f fps. \n"
 "Default can be set in Tools | Preferences | Misc.\n"
 
-#: src/saveplay.c:3735
+#: src/saveplay.c:3677
 #, c-format
 msgid "Playback speed was adjusted to %.3f frames per second to fit audio.\n"
 msgstr "Playback speed was adjusted to %.3f frames per second to fit audio.\n"
 
-#: src/saveplay.c:3754
+#: src/saveplay.c:3694
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d *bpp=Greyscale* fps=%.3f\n"
@@ -4544,7 +4541,7 @@
 "Frames=%d type=%s size=%dx%d *bpp=Greyscale* fps=%.3f\n"
 "Audio:"
 
-#: src/saveplay.c:3758 src/saveplay.c:4762
+#: src/saveplay.c:3698 src/saveplay.c:4671
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d bpp=%d fps=%.3f\n"
@@ -4553,54 +4550,54 @@
 "Frames=%d type=%s size=%dx%d bpp=%d fps=%.3f\n"
 "Audio:"
 
-#: src/saveplay.c:3762 src/saveplay.c:4766
+#: src/saveplay.c:3703 src/saveplay.c:4676
 #, c-format
 msgid "%s none\n"
 msgstr "%s none\n"
 
-#: src/saveplay.c:3774
+#: src/saveplay.c:3714
 #, c-format
 msgid " - Author: %s\n"
 msgstr " - Author: %s\n"
 
-#: src/saveplay.c:3779
+#: src/saveplay.c:3717
 #, c-format
 msgid " - Title: %s\n"
 msgstr " - Title: %s\n"
 
-#: src/saveplay.c:3784
+#: src/saveplay.c:3720
 #, c-format
 msgid " - Comment: %s\n"
 msgstr " - Comment: %s\n"
 
-#: src/saveplay.c:3897
+#: src/saveplay.c:3829
 #, c-format
 msgid "Saving frame %d as %s..."
 msgstr "Saving frame %d as %s..."
 
-#: src/saveplay.c:3996
+#: src/saveplay.c:3924
 #, c-format
 msgid "Backing up %s to %s"
 msgstr "Backing up %s to %s"
 
-#: src/saveplay.c:4049
+#: src/saveplay.c:3975
 msgid "Backing up"
 msgstr "Backing up"
 
-#: src/saveplay.c:4083
+#: src/saveplay.c:4009
 msgid "performance data was backed up..."
 msgstr "performance data was backed up..."
 
-#: src/saveplay.c:4661
+#: src/saveplay.c:4574
 #, c-format
 msgid "Restoring %s..."
 msgstr "Restoring %s..."
 
-#: src/saveplay.c:4692
+#: src/saveplay.c:4603
 msgid "Restoring"
 msgstr "Restoring"
 
-#: src/saveplay.c:4714
+#: src/saveplay.c:4625
 #, c-format
 msgid ""
 "\n"
@@ -4614,22 +4611,22 @@
 "LiVES was unable to restore it.\n"
 
 #. TRANSLATORS: rec(ord) %.2f M(ega)B(ytes)
-#: src/saveplay.c:5207
+#: src/saveplay.c:5118
 #, c-format
 msgid "rec %.2f MB"
 msgstr "rec %.2f MB"
 
-#: src/saveplay.c:5213
+#: src/saveplay.c:5123
 #, c-format
 msgid "!rec %.2f MB"
 msgstr "!rec %.2f MB"
 
 #. TRANSLATORS: rec(ord) ?? M(ega)B(ytes)
-#: src/saveplay.c:5216
+#: src/saveplay.c:5126
 msgid "rec ?? MB"
 msgstr "rec ?? MB"
 
-#: src/saveplay.c:5241
+#: src/saveplay.c:5151
 #, c-format
 msgid ""
 "\n"
@@ -4640,7 +4637,7 @@
 "RECORDING WAS PAUSED BECAUSE FREE DISK SPACE in %s IS BELOW %d GB !\n"
 "Record stop level can be set in Preferences.\n"
 
-#: src/saveplay.c:5535
+#: src/saveplay.c:5447
 msgid ""
 "\n"
 "Files from a previous run of LiVES were found.\n"
@@ -4650,47 +4647,69 @@
 "Files from a previous run of LiVES were found.\n"
 "Do you want to attempt to recover them ?\n"
 
-#: src/saveplay.c:5557
+#: src/saveplay.c:5469
 msgid "Recovering files"
 msgstr "Recovering files"
 
-#: src/saveplay.c:5560
+#: src/saveplay.c:5472
 msgid "Recovering files..."
 msgstr "Recovering files..."
 
-#: src/dialogs.c:72
+#: src/dialogs.c:71
 msgid "Show affected _layouts"
 msgstr "Show affected _layouts"
 
-#: src/dialogs.c:128
+#: src/dialogs.c:113
+msgid ""
+"Do _not show this warning any more\n"
+"(can be turned back on from Preferences/Warnings)"
+msgstr ""
+"Do _not show this warning any more\n"
+"(can be turned back on from Preferences/Warnings)"
+
+#: src/dialogs.c:127
 msgid "_Recover disk space"
 msgstr "_Recover disk space"
 
-#: src/dialogs.c:143
+#: src/dialogs.c:142
 msgid " _Advanced Settings >>"
 msgstr " _Advanced Settings >>"
 
-#: src/dialogs.c:184
+#: src/dialogs.c:183 src/dialogs.c:221
 msgid "LiVES: - Warning !"
 msgstr "LiVES: - Warning !"
 
 #: src/dialogs.c:194
+#, fuzzy
+msgid "LiVES: - Error !"
+msgstr "LiVES: - File Error"
+
+#: src/dialogs.c:204
+#, fuzzy
+msgid "LiVES: - Information"
+msgstr "LiVES: Information for %s"
+
+#: src/dialogs.c:230
 msgid "LiVES: - Question"
 msgstr "LiVES: - Question"
 
-#: src/dialogs.c:204
+#: src/dialogs.c:239
 msgid "LiVES: - File Error"
 msgstr "LiVES: - File Error"
 
-#: src/dialogs.c:208
+#: src/dialogs.c:241
 msgid "_Abort"
 msgstr "_Abort"
 
-#: src/dialogs.c:213
+#: src/dialogs.c:246
 msgid "_Retry"
 msgstr "_Retry"
 
-#: src/dialogs.c:597
+#: src/dialogs.c:306
+msgid "Show _Details"
+msgstr "Show _Details"
+
+#: src/dialogs.c:657
 #, c-format
 msgid ""
 "FREE SPACE IN THE PARTITION CONTAINING\n"
@@ -4707,7 +4726,7 @@
 "\n"
 "(Disk warning levels can be configured in Preferences.)"
 
-#: src/dialogs.c:615
+#: src/dialogs.c:676
 #, c-format
 msgid ""
 "Free space in the partition containing\n"
@@ -4726,11 +4745,11 @@
 "(Next warning will be shown at %s. Disk warning levels can be configured in "
 "Preferences.)"
 
-#: src/dialogs.c:627
+#: src/dialogs.c:688
 msgid "Audio players cannot be switched during playback."
 msgstr "Audio players cannot be switched during playback."
 
-#: src/dialogs.c:632
+#: src/dialogs.c:694
 msgid ""
 "\n"
 "\n"
@@ -4742,11 +4761,11 @@
 "LiVES was unable to perform this operation due to unsufficient memory.\n"
 "Please try closing some other applications first.\n"
 
-#: src/dialogs.c:752
+#: src/dialogs.c:820
 msgid "Processing has been paused."
 msgstr "Processing has been paused."
 
-#: src/dialogs.c:937
+#: src/dialogs.c:1002
 #, c-format
 msgid ""
 "\n"
@@ -4755,7 +4774,7 @@
 "\n"
 "%s%d%% done. Time remaining: %u sec%s\n"
 
-#: src/dialogs.c:1335
+#: src/dialogs.c:1391
 #, c-format
 msgid ""
 "\n"
@@ -4764,7 +4783,7 @@
 "\n"
 "%d/%d frames opened. Time remaining %u sec.\n"
 
-#: src/dialogs.c:1337
+#: src/dialogs.c:1393
 #, c-format
 msgid ""
 "\n"
@@ -4773,7 +4792,7 @@
 "\n"
 "%d/%d frames opened.\n"
 
-#: src/dialogs.c:1341
+#: src/dialogs.c:1396
 #, c-format
 msgid ""
 "\n"
@@ -4782,7 +4801,7 @@
 "\n"
 "%d frames opened.\n"
 
-#: src/dialogs.c:1940
+#: src/dialogs.c:1993
 #, c-format
 msgid ""
 "\n"
@@ -4791,7 +4810,7 @@
 "\n"
 "Time remaining: %d sec"
 
-#: src/dialogs.c:1988
+#: src/dialogs.c:2040
 #, c-format
 msgid ""
 "\n"
@@ -4802,7 +4821,7 @@
 "Sorry, LiVES can only open %d files at once.\n"
 "Please close a file and then try again."
 
-#: src/dialogs.c:1994
+#: src/dialogs.c:2047
 #, c-format
 msgid ""
 "LiVES was unable to write to its temporary directory.\n"
@@ -4821,7 +4840,7 @@
 "\n"
 "Please make sure you can write to this directory."
 
-#: src/dialogs.c:2005
+#: src/dialogs.c:2059
 #, fuzzy
 msgid ""
 "\n"
@@ -4832,7 +4851,7 @@
 "LiVES currently requires either 'mplayer' or 'sox' to function. Please "
 "install one or other of these, and try again.\n"
 
-#: src/dialogs.c:2010
+#: src/dialogs.c:2064
 #, fuzzy
 msgid ""
 "Audio was not loaded; please install mplayer or mplayer2 if you expected "
@@ -4841,7 +4860,7 @@
 "Audio was not loaded; please install mplayer if you expected audio for this "
 "clip.\n"
 
-#: src/dialogs.c:2014
+#: src/dialogs.c:2069
 msgid ""
 "Audio resampling is required for this format.\n"
 "Please install 'sox'\n"
@@ -4851,7 +4870,7 @@
 "Please install 'sox'\n"
 "Or switch to another encoder format in Tools | Preferences | Encoding\n"
 
-#: src/dialogs.c:2019
+#: src/dialogs.c:2075
 msgid ""
 "\n"
 "\n"
@@ -4863,7 +4882,7 @@
 "This encoder/format cannot use the requested audio codec.\n"
 "Please set the audio codec in Tools|Preferences|Encoding\n"
 
-#: src/dialogs.c:2024
+#: src/dialogs.c:2080
 msgid ""
 "This layout includes generated frames.\n"
 "It cannot be saved, you must render it to a clip first.\n"
@@ -4871,7 +4890,7 @@
 "This layout includes generated frames.\n"
 "It cannot be saved, you must render it to a clip first.\n"
 
-#: src/dialogs.c:2029
+#: src/dialogs.c:2085
 msgid ""
 "This layout includes generated or recorded audio.\n"
 "It cannot be saved, you must render it to a clip first.\n"
@@ -4879,7 +4898,7 @@
 "This layout includes generated or recorded audio.\n"
 "It cannot be saved, you must render it to a clip first.\n"
 
-#: src/dialogs.c:2039 src/dialogs.c:2137
+#: src/dialogs.c:2095 src/dialogs.c:2189
 #, c-format
 msgid ""
 "\n"
@@ -4890,7 +4909,7 @@
 "\n"
 "Due to restrictions in the %s format\n"
 
-#: src/dialogs.c:2059
+#: src/dialogs.c:2115
 msgid ""
 "LiVES recommends the following settings:\n"
 "\n"
@@ -4898,43 +4917,43 @@
 "LiVES recommends the following settings:\n"
 "\n"
 
-#: src/dialogs.c:2065 src/dialogs.c:2174 src/resample.c:850
+#: src/dialogs.c:2121 src/dialogs.c:2225 src/resample.c:839
 msgid ", signed"
 msgstr ", signed"
 
-#: src/dialogs.c:2066 src/dialogs.c:2175 src/resample.c:853
+#: src/dialogs.c:2122 src/dialogs.c:2226 src/resample.c:841
 msgid ", unsigned"
 msgstr ", unsigned"
 
-#: src/dialogs.c:2070 src/dialogs.c:2179 src/resample.c:858
+#: src/dialogs.c:2126 src/dialogs.c:2230 src/resample.c:846
 msgid ", little-endian"
 msgstr ", little-endian"
 
-#: src/dialogs.c:2071 src/dialogs.c:2180 src/resample.c:861
+#: src/dialogs.c:2127 src/dialogs.c:2231 src/resample.c:848
 msgid ", big-endian"
 msgstr ", big-endian"
 
-#: src/dialogs.c:2077
+#: src/dialogs.c:2132
 #, c-format
 msgid "Use an audio rate of %d Hz%s%s\n"
 msgstr "Use an audio rate of %d Hz%s%s\n"
 
-#: src/dialogs.c:2085
+#: src/dialogs.c:2140
 #, c-format
 msgid "Set video rate to %.3f frames per second\n"
 msgstr "Set video rate to %.3f frames per second\n"
 
-#: src/dialogs.c:2089
+#: src/dialogs.c:2143
 #, c-format
 msgid "Set video rate to %d:%d frames per second\n"
 msgstr "Set video rate to %d:%d frames per second\n"
 
-#: src/dialogs.c:2094 src/dialogs.c:2209
+#: src/dialogs.c:2148 src/dialogs.c:2258
 #, c-format
 msgid "Set video size to %d x %d pixels\n"
 msgstr "Set video size to %d x %d pixels\n"
 
-#: src/dialogs.c:2102 src/dialogs.c:2208
+#: src/dialogs.c:2156 src/dialogs.c:2257
 msgid ""
 "\n"
 "You may wish to:\n"
@@ -4942,35 +4961,35 @@
 "\n"
 "You may wish to:\n"
 
-#: src/dialogs.c:2105 src/dialogs.c:2200
+#: src/dialogs.c:2159 src/dialogs.c:2249
 #, c-format
 msgid "resize video to %d x %d pixels\n"
 msgstr "resize video to %d x %d pixels\n"
 
-#: src/dialogs.c:2110
+#: src/dialogs.c:2163
 msgid "disable audio, since the target encoder cannot encode audio\n"
 msgstr "disable audio, since the target encoder cannot encode audio\n"
 
-#: src/dialogs.c:2170
+#: src/dialogs.c:2221
 msgid "LiVES must:\n"
 msgstr "LiVES must:\n"
 
-#: src/dialogs.c:2185
+#: src/dialogs.c:2235
 #, c-format
 msgid "resample audio to %d Hz%s%s\n"
 msgstr "resample audio to %d Hz%s%s\n"
 
-#: src/dialogs.c:2192
+#: src/dialogs.c:2242
 #, c-format
 msgid "resample video to %.3f frames per second\n"
 msgstr "resample video to %.3f frames per second\n"
 
-#: src/dialogs.c:2196
+#: src/dialogs.c:2245
 #, c-format
 msgid "resample video to %d:%d frames per second\n"
 msgstr "resample video to %d:%d frames per second\n"
 
-#: src/dialogs.c:2215
+#: src/dialogs.c:2263
 msgid ""
 "\n"
 "You will be able to undo these changes afterwards.\n"
@@ -4984,7 +5003,7 @@
 "Click `OK` to proceed, `Cancel` to abort.\n"
 "\n"
 
-#: src/dialogs.c:2218
+#: src/dialogs.c:2265
 msgid ""
 "\n"
 "Changes applied to the selection will not be permanent.\n"
@@ -4994,7 +5013,7 @@
 "Changes applied to the selection will not be permanent.\n"
 "\n"
 
-#: src/dialogs.c:2237
+#: src/dialogs.c:2285
 msgid ""
 "\n"
 "\n"
@@ -5008,7 +5027,7 @@
 "memory available.\n"
 "Try recording for just a selection of the file."
 
-#: src/dialogs.c:2244
+#: src/dialogs.c:2293
 msgid ""
 "The playback speed (fps), or the audio rate\n"
 " of the clipboard does not match\n"
@@ -5026,7 +5045,7 @@
 "\n"
 "Please press Cancel to abort the insert, or OK to continue."
 
-#: src/dialogs.c:2253
+#: src/dialogs.c:2304
 #, c-format
 msgid ""
 "When opening a yuvmpeg stream, you should first create a fifo file in:\n"
@@ -5047,11 +5066,11 @@
 "You should only click OK if you understand what you are doing, otherwise, "
 "click Cancel."
 
-#: src/dialogs.c:2305
+#: src/dialogs.c:2356
 msgid "Show Keys"
 msgstr "Show Keys"
 
-#: src/dialogs.c:2306
+#: src/dialogs.c:2358
 msgid ""
 "You can use the following keys during playback to control LiVES:-\n"
 "\n"
@@ -5131,11 +5150,11 @@
 "d                             double size\n"
 "g                             ping pong loops\n"
 
-#: src/dialogs.c:2313
+#: src/dialogs.c:2365
 msgid "Multitrack Keys"
 msgstr "Multitrack Keys"
 
-#: src/dialogs.c:2314
+#: src/dialogs.c:2367
 msgid ""
 "You can use the following keys to control the multitrack window:-\n"
 "\n"
@@ -5175,11 +5194,11 @@
 "\n"
 "For other keys, see the menus.\n"
 
-#: src/dialogs.c:2322
+#: src/dialogs.c:2375
 msgid "Message History"
 msgstr "Message History"
 
-#: src/dialogs.c:2335
+#: src/dialogs.c:2388
 #, c-format
 msgid ""
 "After upgrading/installing, you may need to adjust the <prefix_dir> setting "
@@ -5188,7 +5207,7 @@
 "After upgrading/installing, you may need to adjust the <prefix_dir> setting "
 "in your %s file"
 
-#: src/dialogs.c:2344
+#: src/dialogs.c:2399
 #, c-format
 msgid ""
 "\n"
@@ -5205,7 +5224,7 @@
 "%s%s%s\n"
 "or change the value of <lib_dir> in %s\n"
 
-#: src/dialogs.c:2352
+#: src/dialogs.c:2408
 msgid ""
 "Sorry, unknown audio type.\n"
 "\n"
@@ -5215,11 +5234,11 @@
 "\n"
 " (Filenames must end in .mp3, .ogg, .wav, .mod, .xm or .it)"
 
-#: src/dialogs.c:2353
+#: src/dialogs.c:2409
 msgid "failed (unknown type)\n"
 msgstr "failed (unknown type)\n"
 
-#: src/dialogs.c:2358
+#: src/dialogs.c:2415
 msgid ""
 "\n"
 "Do you wish to remove the layout files associated with this set ?\n"
@@ -5229,7 +5248,7 @@
 "Do you wish to remove the layout files associated with this set?\n"
 "(They will not be usable without the set).\n"
 
-#: src/dialogs.c:2363
+#: src/dialogs.c:2421
 #, c-format
 msgid ""
 "\n"
@@ -5242,7 +5261,7 @@
 "Click OK to add the current clips and layouts to the existing set.\n"
 "Click Cancel to pick a new name.\n"
 
-#: src/dialogs.c:2370
+#: src/dialogs.c:2429
 msgid ""
 "\n"
 "Frames from this clip are used in some multitrack layouts.\n"
@@ -5254,7 +5273,7 @@
 "Are you sure you wish to continue ?\n"
 "."
 
-#: src/dialogs.c:2374
+#: src/dialogs.c:2433
 msgid ""
 "\n"
 "Audio from this clip is used in some multitrack layouts.\n"
@@ -5266,7 +5285,7 @@
 "Are you sure you wish to continue ?\n"
 "."
 
-#: src/dialogs.c:2378
+#: src/dialogs.c:2438
 #, c-format
 msgid ""
 "\n"
@@ -5283,7 +5302,7 @@
 "If this file has been moved, click 'OK' to browse to the new location.\n"
 "Otherwise, click 'Cancel' to skip loading this file.\n"
 
-#: src/dialogs.c:2385
+#: src/dialogs.c:2446
 #, c-format
 msgid ""
 "\n"
@@ -5298,7 +5317,7 @@
 "%s\n"
 "The clip could not be loaded.\n"
 
-#: src/dialogs.c:2392
+#: src/dialogs.c:2455
 msgid ""
 "\n"
 "Dear user, the jack developers decided to remove the -Z option from jackd.\n"
@@ -5310,7 +5329,7 @@
 "Please check your ~/.jackdrc file and remove this option if present.\n"
 "Alternately, select a different audio player in Preferences.\n"
 
-#: src/dialogs.c:2396
+#: src/dialogs.c:2460
 msgid ""
 "\n"
 "Unable to start up jack. Please ensure that alsa is set up correctly on your "
@@ -5324,7 +5343,7 @@
 "and also that the soundcard is not in use by another program.\n"
 "Automatic jack startup will be disabled now.\n"
 
-#: src/dialogs.c:2402
+#: src/dialogs.c:2466
 msgid ""
 "\n"
 "Unable to connect to jack server. Please start jack before starting LiVES\n"
@@ -5332,7 +5351,7 @@
 "\n"
 "Unable to connect to jack server. Please start jack before starting LiVES.\n"
 
-#: src/dialogs.c:2411
+#: src/dialogs.c:2475
 #, c-format
 msgid ""
 "\n"
@@ -5349,7 +5368,7 @@
 "\n"
 "%s\n"
 
-#: src/dialogs.c:2418
+#: src/dialogs.c:2482
 msgid ""
 "\n"
 "Alternately, you can restart LiVES and select another audio player.\n"
@@ -5357,7 +5376,7 @@
 "\n"
 "Alternately, you can restart LiVES and select another audio player.\n"
 
-#: src/dialogs.c:2423
+#: src/dialogs.c:2488
 #, c-format
 msgid ""
 "\n"
@@ -5372,7 +5391,7 @@
 "You can increase the value in Preferences/Multitrack.\n"
 "It is recommended to increase it to at least %d MB"
 
-#: src/dialogs.c:2429
+#: src/dialogs.c:2496
 #, c-format
 msgid ""
 "\n"
@@ -5385,7 +5404,7 @@
 "It is recommended that you delete them.\n"
 "Do you wish to delete them ?\n"
 
-#: src/dialogs.c:2436
+#: src/dialogs.c:2504
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for multitrack undo.\n"
@@ -5397,7 +5416,7 @@
 "Either close some other applications, or reduce the undo memory\n"
 "using Preferences/Multitrack/Undo Memory\n"
 
-#: src/dialogs.c:2440
+#: src/dialogs.c:2508
 msgid ""
 "\n"
 "Out of memory for undo.\n"
@@ -5409,7 +5428,7 @@
 "You may need to increase the undo memory\n"
 "using Preferences/Multitrack/Undo Memory\n"
 
-#: src/dialogs.c:2444
+#: src/dialogs.c:2512
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for the multitrack undo buffer.\n"
@@ -5417,19 +5436,19 @@
 "\n"
 "LiVES was unable to reserve enough memory for the multitrack undo buffer.\n"
 
-#: src/dialogs.c:2446
+#: src/dialogs.c:2514
 msgid "or enter a smaller value.\n"
 msgstr "or enter a smaller value.\n"
 
-#: src/dialogs.c:2448
+#: src/dialogs.c:2516
 msgid "Try again from the clip editor, try closing some other applications\n"
 msgstr "Try again from the clip editor, try closing some other applications\n"
 
-#: src/dialogs.c:2449
+#: src/dialogs.c:2517
 msgid "Try closing some other applications\n"
 msgstr "Try closing some other applications\n"
 
-#: src/dialogs.c:2460
+#: src/dialogs.c:2529
 msgid ""
 "Multitrack is set to 0 audio channels, but this layout has audio.\n"
 "You should adjust the audio settings from the Tools menu.\n"
@@ -5437,13 +5456,13 @@
 "Multitrack is set to 0 audio channels, but this layout has audio.\n"
 "You should adjust the audio settings from the Tools menu.\n"
 
-#: src/dialogs.c:2464
+#: src/dialogs.c:2534
 msgid ""
 "The current layout has audio, so audio channels may not be set to zero.\n"
 msgstr ""
 "The current layout has audio, so audio channels may not be set to zero.\n"
 
-#: src/dialogs.c:2468
+#: src/dialogs.c:2539
 msgid ""
 "Multitrack audio preview is only available with the\n"
 "\"jack\" or \"pulse audio\" audio player.\n"
@@ -5453,7 +5472,7 @@
 "\"jack\" or \"pulse audio\" audio player.\n"
 "You can set this in Tools|Preferences|Playback."
 
-#: src/dialogs.c:2472
+#: src/dialogs.c:2545
 msgid ""
 "Errors were detected in the layout (which may be due to transferring from "
 "another system, or from an older version of LiVES).\n"
@@ -5463,7 +5482,7 @@
 "another system, or from an older version of LiVES).\n"
 "Should I try to repair the disk copy of the layout ?\n"
 
-#: src/dialogs.c:2476
+#: src/dialogs.c:2549
 msgid ""
 "LiVES was unable to load the layout.\n"
 "Sorry.\n"
@@ -5471,7 +5490,7 @@
 "LiVES was unable to load the layout.\n"
 "Sorry.\n"
 
-#: src/dialogs.c:2482
+#: src/dialogs.c:2555
 msgid ""
 "\n"
 "\n"
@@ -5481,7 +5500,7 @@
 "\n"
 "Audio rate must be greater than 0.\n"
 
-#: src/dialogs.c:2486
+#: src/dialogs.c:2559
 msgid ""
 "\n"
 "Event list will be very large\n"
@@ -5493,7 +5512,7 @@
 "and may take a long time to display.\n"
 "Are you sure you wish to view it ?\n"
 
-#: src/dialogs.c:2491
+#: src/dialogs.c:2564
 msgid ""
 "\n"
 "\n"
@@ -5503,7 +5522,7 @@
 "\n"
 "You must install 'dvgrab' to use this function.\n"
 
-#: src/dialogs.c:2496
+#: src/dialogs.c:2570
 msgid ""
 "\n"
 "\n"
@@ -5517,19 +5536,19 @@
 "the \"jack\" or the \"pulse audio\" audio player.\n"
 "You may need to select one of these in Tools/Preferences/Playback.\n"
 
-#: src/dialogs.c:2500
+#: src/dialogs.c:2574
 msgid "Video playback plugin failed to initialise palette !\n"
 msgstr "Video playback plugin failed to initialise palette !\n"
 
-#: src/dialogs.c:2504
+#: src/dialogs.c:2579
 msgid "Decoder plugin failed to initialise palette !\n"
 msgstr "Decoder plugin failed to initialise palette !\n"
 
-#: src/dialogs.c:2509
+#: src/dialogs.c:2584
 msgid "Unable to set framerate of video plugin\n"
 msgstr "Unable to set framerate of video plugin\n"
 
-#: src/dialogs.c:2514
+#: src/dialogs.c:2590
 msgid ""
 "After a crash, it is advisable to clean up the disk with\n"
 "File|Clean up disk space\n"
@@ -5537,7 +5556,7 @@
 "After a crash, it is advisable to clean up the disk with\n"
 "File|Clean up disk space\n"
 
-#: src/dialogs.c:2526
+#: src/dialogs.c:2604
 #, c-format
 msgid ""
 "Stream frame size is too large for your network buffers.\n"
@@ -5550,33 +5569,33 @@
 "\n"
 "echo %d > /proc/sys/net/core/rmem_max\n"
 
-#: src/dialogs.c:2714
+#: src/dialogs.c:2800
 msgid "cancelled.\n"
 msgstr "cancelled.\n"
 
-#: src/dialogs.c:2721
+#: src/dialogs.c:2805
 msgid "failed.\n"
 msgstr "failed.\n"
 
-#: src/dialogs.c:2728
+#: src/dialogs.c:2810
 msgid "done.\n"
 msgstr "done.\n"
 
-#: src/dialogs.c:2732
+#: src/dialogs.c:2814
 msgid "error in file. Failed.\n"
 msgstr "error in file. Failed.\n"
 
-#: src/dialogs.c:2766 src/dialogs.c:2815 src/dialogs.c:2839
+#: src/dialogs.c:2848 src/dialogs.c:2897 src/dialogs.c:2921
 #, c-format
 msgid "Additional info: %s\n"
 msgstr "Additional info: %s\n"
 
-#: src/dialogs.c:2769
+#: src/dialogs.c:2851
 #, c-format
 msgid "The error value was %d%s\n"
 msgstr "The error value was %d%s\n"
 
-#: src/dialogs.c:2772
+#: src/dialogs.c:2854
 #, c-format
 msgid ""
 "\n"
@@ -5591,7 +5610,7 @@
 "Please check your system for errors.\n"
 "%s%s%s"
 
-#: src/dialogs.c:2818
+#: src/dialogs.c:2900
 #, c-format
 msgid ""
 "\n"
@@ -5606,7 +5625,7 @@
 "Please check for possible error causes.\n"
 "%s"
 
-#: src/dialogs.c:2842
+#: src/dialogs.c:2924
 #, c-format
 msgid ""
 "\n"
@@ -5621,7 +5640,7 @@
 "Please check for possible error causes.\n"
 "%s"
 
-#: src/dialogs.c:2886
+#: src/dialogs.c:2968
 #, c-format
 msgid ""
 "\n"
@@ -5634,7 +5653,7 @@
 "%s\n"
 "Please check for possible error causes.\n"
 
-#: src/dialogs.c:2890
+#: src/dialogs.c:2971
 #, c-format
 msgid ""
 "\n"
@@ -5649,7 +5668,7 @@
 "The error was\n"
 "%s.\n"
 
-#: src/dialogs.c:2921
+#: src/dialogs.c:3002
 #, c-format
 msgid ""
 "\n"
@@ -5662,7 +5681,7 @@
 "%s\n"
 "Please check for possible error causes.\n"
 
-#: src/dialogs.c:2925
+#: src/dialogs.c:3005
 #, c-format
 msgid ""
 "\n"
@@ -5677,12 +5696,12 @@
 "The error was\n"
 "%s.\n"
 
-#: src/dialogs.c:2993
+#: src/dialogs.c:3073
 #, c-format
 msgid "Value for \"%s\" could not be read."
 msgstr "Value for \"%s\" could not be read."
 
-#: src/dialogs.c:3011
+#: src/dialogs.c:3091
 #, c-format
 msgid ""
 "\n"
@@ -5695,7 +5714,7 @@
 "%s\n"
 "Please check your system for errors.\n"
 
-#: src/dialogs.c:3020
+#: src/dialogs.c:3100
 #, c-format
 msgid ""
 "\n"
@@ -5708,7 +5727,7 @@
 "%s\n"
 "Please check the file permissions and try again."
 
-#: src/dialogs.c:3027
+#: src/dialogs.c:3109
 #, c-format
 msgid ""
 "\n"
@@ -5721,7 +5740,7 @@
 "%s\n"
 "Please check the directory permissions and try again."
 
-#: src/dialogs.c:3034
+#: src/dialogs.c:3116
 #, c-format
 msgid ""
 "\n"
@@ -5732,7 +5751,7 @@
 "LiVES was unable to read from the directory:\n"
 "%s\n"
 
-#: src/dialogs.c:3041
+#: src/dialogs.c:3123
 msgid ""
 "\n"
 "Abort and exit immediately from LiVES\n"
@@ -5742,7 +5761,7 @@
 "Abort and exit immediately from LiVES\n"
 "Are you sure?\n"
 
-#: src/dialogs.c:3047
+#: src/dialogs.c:3129
 #, c-format
 msgid ""
 "\n"
@@ -5753,7 +5772,7 @@
 "The %s cannot encode clips with image type %s.\n"
 "Please select another encoder from the list.\n"
 
-#: src/dialogs.c:3056
+#: src/dialogs.c:3139
 msgid ""
 "\n"
 "This card is already in use and cannot be opened multiple times.\n"
@@ -5761,7 +5780,7 @@
 "\n"
 "This card is already in use and cannot be opened multiple times.\n"
 
-#: src/dialogs.c:3061
+#: src/dialogs.c:3145
 #, c-format
 msgid ""
 "\n"
@@ -5776,7 +5795,7 @@
 "- Check if this device is in use by another program.\n"
 "- Check if the device actually exists.\n"
 
-#: src/dialogs.c:3068
+#: src/dialogs.c:3153
 msgid ""
 "\n"
 "This file already has subtitles loaded.\n"
@@ -5786,7 +5805,7 @@
 "This file already has subtitles loaded.\n"
 "Do you wish to overwrite the existing subtitles ?\n"
 
-#: src/dialogs.c:3072
+#: src/dialogs.c:3157
 msgid ""
 "\n"
 "LiVES currently only supports subtitles of type .srt and .sub.\n"
@@ -5794,7 +5813,7 @@
 "\n"
 "LiVES currently only supports subtitles of type .srt and .sub.\n"
 
-#: src/dialogs.c:3076
+#: src/dialogs.c:3161
 msgid ""
 "\n"
 "Erase all subtitles from this clip.\n"
@@ -5804,7 +5823,7 @@
 "Erase all subtitles from this clip.\n"
 "Are you sure ?\n"
 
-#: src/dialogs.c:3082
+#: src/dialogs.c:3168
 #, c-format
 msgid ""
 "\n"
@@ -5817,7 +5836,7 @@
 "Click 'Cancel' to set another file name\n"
 "or 'OK' to continue and save as type \"%s\"\n"
 
-#: src/dialogs.c:3089
+#: src/dialogs.c:3176
 msgid ""
 "\n"
 "Do you wish to move the current clip sets to the new directory ?\n"
@@ -5827,7 +5846,7 @@
 "Do you wish to move the current clip sets to the new directory ?\n"
 "(If unsure, click Yes)\n"
 
-#: src/dialogs.c:3093
+#: src/dialogs.c:3181
 #, c-format
 msgid ""
 "\n"
@@ -5843,7 +5862,7 @@
 "You are strongly advised to close the other copy, before clicking 'OK' to "
 "continue."
 
-#: src/dialogs.c:3099
+#: src/dialogs.c:3188
 msgid ""
 "\n"
 "No video input devices could be found.\n"
@@ -5851,7 +5870,7 @@
 "\n"
 "No video input devices could be found.\n"
 
-#: src/dialogs.c:3103
+#: src/dialogs.c:3192
 msgid ""
 "\n"
 "All video input devices are already in use.\n"
@@ -5859,7 +5878,7 @@
 "\n"
 "All video input devices are already in use.\n"
 
-#: src/dialogs.c:3107
+#: src/dialogs.c:3196
 msgid ""
 "\n"
 "\n"
@@ -5871,7 +5890,7 @@
 "CLEANING AND COPYING FILES. THIS MAY TAKE SOME TIME.\n"
 "DO NOT SHUT DOWN OR CLOSE LIVES !\n"
 
-#: src/dialogs.c:3127
+#: src/dialogs.c:3203
 #, c-format
 msgid ""
 "No clips were recovered for set (%s).\n"
@@ -5880,8 +5899,7 @@
 "No clips were recovered for set (%s).\n"
 "Please check the spelling of the set name and try again.\n"
 
-#. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:3136
+#: src/dialogs.c:3214
 #, c-format
 msgid ""
 "\n"
@@ -5899,7 +5917,7 @@
 "File -> Clean up Diskspace\n"
 
 #. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:3144
+#: src/dialogs.c:3222
 #, c-format
 msgid ""
 "\n"
@@ -5912,7 +5930,7 @@
 "Welcome to LiVES version %s !\n"
 "\n"
 
-#: src/dialogs.c:3150
+#: src/dialogs.c:3228
 msgid ""
 "\n"
 "You must have autolives.pl installed and in your path to use this toy.\n"
@@ -5922,7 +5940,7 @@
 "You must have autolives.pl installed and in your path to use this toy.\n"
 "Consult your package distributor.\n"
 
-#: src/dialogs.c:3154
+#: src/dialogs.c:3232
 msgid ""
 "\n"
 "You must have a minimum of one clip loaded to use this toy.\n"
@@ -5930,7 +5948,7 @@
 "\n"
 "You must have a minimum of one clip loaded to use this toy.\n"
 
-#: src/dialogs.c:3158
+#: src/dialogs.c:3236
 msgid ""
 "\n"
 "LiVES lost its connection to jack and was unable to reconnect.\n"
@@ -5940,7 +5958,7 @@
 "LiVES lost its connection to jack and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 
-#: src/dialogs.c:3162
+#: src/dialogs.c:3240
 msgid ""
 "\n"
 "LiVES lost its connection to pulseaudio and was unable to reconnect.\n"
@@ -5950,7 +5968,7 @@
 "LiVES lost its connection to pulseaudio and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 
-#: src/dialogs.c:3175
+#: src/dialogs.c:3254
 #, c-format
 msgid ""
 "\n"
@@ -5963,240 +5981,240 @@
 "to let other applications connect to it.\n"
 "Do you wish to allow this (for this session only) ?\n"
 
-#: src/effects.c:60
+#: src/effects.c:61
 msgid "generator"
 msgstr "generator"
 
-#: src/effects.c:61
+#: src/effects.c:62
 msgid "Generators"
 msgstr "Generators"
 
-#: src/effects.c:63
+#: src/effects.c:64
 msgid "audio generator"
 msgstr "audio generator"
 
-#: src/effects.c:64
+#: src/effects.c:65
 msgid "Audio Generators"
 msgstr "Audio Generators"
 
-#: src/effects.c:66
+#: src/effects.c:67
 msgid "audio/video generator"
 msgstr "audio/video generator"
 
-#: src/effects.c:67
+#: src/effects.c:68
 msgid "Audio/Video Generators"
 msgstr "Audio/Video Generators"
 
-#: src/effects.c:69
+#: src/effects.c:70
 msgid "data generator"
 msgstr "Data generator"
 
-#: src/effects.c:70
+#: src/effects.c:71
 msgid "Data Generators"
 msgstr "Data Generators"
 
-#: src/effects.c:72
+#: src/effects.c:73
 msgid "data visualiser"
 msgstr "data visualiser"
 
-#: src/effects.c:73
+#: src/effects.c:74
 msgid "Data Visualisers"
 msgstr "Data Visualisers"
 
-#: src/effects.c:75
+#: src/effects.c:76
 msgid "data processor"
 msgstr "data processor"
 
-#: src/effects.c:76
+#: src/effects.c:77
 msgid "Data Processors"
 msgstr "Data Processors"
 
-#: src/effects.c:78
+#: src/effects.c:79
 msgid "data source"
 msgstr "data source"
 
-#: src/effects.c:79
+#: src/effects.c:80
 msgid "Data Sources"
 msgstr "Data Sources"
 
-#: src/effects.c:81
+#: src/effects.c:82
 msgid "transition"
 msgstr "transition"
 
-#: src/effects.c:82
+#: src/effects.c:83
 msgid "Transitions"
 msgstr "Transitions"
 
-#: src/effects.c:84
+#: src/effects.c:85
 msgid "effect"
 msgstr "effect"
 
-#: src/effects.c:87 src/rfx-builder.c:187
+#: src/effects.c:88 src/rfx-builder.c:187
 msgid "utility"
 msgstr "utility"
 
-#: src/effects.c:88
+#: src/effects.c:89
 msgid "Utilities"
 msgstr "Utilities"
 
-#: src/effects.c:90
+#: src/effects.c:91
 msgid "compositor"
 msgstr "compositor"
 
-#: src/effects.c:91
+#: src/effects.c:92
 msgid "Compositors"
 msgstr "Compositors"
 
-#: src/effects.c:93
+#: src/effects.c:94
 msgid "tap"
 msgstr "tap"
 
-#: src/effects.c:94
+#: src/effects.c:95
 msgid "Taps"
 msgstr "Taps"
 
-#: src/effects.c:96
+#: src/effects.c:97
 msgid "splitter"
 msgstr "splitter"
 
-#: src/effects.c:97
+#: src/effects.c:98
 msgid "Splitters"
 msgstr "Splitters"
 
-#: src/effects.c:99
+#: src/effects.c:100
 msgid "converter"
 msgstr "converter"
 
-#: src/effects.c:100
+#: src/effects.c:101
 msgid "Converters"
 msgstr "Converters"
 
-#: src/effects.c:102
+#: src/effects.c:103
 msgid "analyser"
 msgstr "analyser"
 
-#: src/effects.c:103
+#: src/effects.c:104
 msgid "Analysers"
 msgstr "Analysers"
 
-#: src/effects.c:108
+#: src/effects.c:109
 msgid "audio/video"
 msgstr "audio/video"
 
-#: src/effects.c:109
+#: src/effects.c:110
 msgid "Audio/Video Transitions"
 msgstr "Audio/Video Transitions"
 
-#: src/effects.c:111
+#: src/effects.c:112
 msgid "video only"
 msgstr "video only"
 
-#: src/effects.c:112
+#: src/effects.c:113
 msgid "Video only Transitions"
 msgstr "Video only Transitions"
 
-#: src/effects.c:114 src/multitrack.c:10740
+#: src/effects.c:115 src/multitrack.c:10962
 msgid "audio only"
 msgstr "audio only"
 
-#: src/effects.c:115
+#: src/effects.c:116
 msgid "Audio only Transitions"
 msgstr "Audio only Transitions"
 
-#: src/effects.c:117 src/effects.c:120 src/multitrack.c:18757
+#: src/effects.c:118 src/effects.c:121 src/multitrack.c:19097
 msgid "audio"
 msgstr "audio"
 
-#: src/effects.c:118
+#: src/effects.c:119
 msgid "Audio Mixers"
 msgstr "Audio Mixers"
 
-#: src/effects.c:121
+#: src/effects.c:122
 msgid "Audio Effects"
 msgstr "Audio Effects"
 
-#: src/effects.c:123
+#: src/effects.c:124
 msgid "video"
 msgstr "video"
 
-#: src/effects.c:124
+#: src/effects.c:125
 msgid "Video Effects"
 msgstr "Video Effects"
 
-#: src/effects.c:126
+#: src/effects.c:127
 msgid "audio volume controller"
 msgstr "audio volume controller"
 
-#: src/effects.c:127
+#: src/effects.c:128
 msgid "Audio Volume Controllers"
 msgstr "Audio Volume Controllers"
 
-#: src/effects.c:129
+#: src/effects.c:130
 msgid "video analyser"
 msgstr "video analyser"
 
-#: src/effects.c:130
+#: src/effects.c:131
 msgid "Video analysers"
 msgstr "Video analysers"
 
-#: src/effects.c:132
+#: src/effects.c:133
 msgid "audio analyser"
 msgstr "audio analyser"
 
-#: src/effects.c:133
+#: src/effects.c:134
 msgid "Audio Analysers"
 msgstr "Audio Analysers"
 
-#: src/effects.c:137 src/plugins.c:2559 src/plugins.c:2573
+#: src/effects.c:138 src/plugins.c:2507 src/plugins.c:2521
 msgid "unknown"
 msgstr "unknown"
 
-#: src/effects.c:238
+#: src/effects.c:235
 #, c-format
 msgid "%s all frames..."
 msgstr "%s all frames..."
 
-#: src/effects.c:243
+#: src/effects.c:239
 #, c-format
 msgid "%s clipboard into frames %d to %d..."
 msgstr "%s clipboard into frames %d to %d..."
 
-#: src/effects.c:250
+#: src/effects.c:245
 #, c-format
 msgid "%s to clipboard..."
 msgstr "%s to clipboard..."
 
-#: src/effects.c:254
+#: src/effects.c:248
 #, c-format
 msgid "%s to new clip..."
 msgstr "%s to new clip..."
 
-#: src/effects.c:259
+#: src/effects.c:252
 #, c-format
 msgid "%s frames %d to %d..."
 msgstr "%s frames %d to %d..."
 
-#: src/effects.c:290
+#: src/effects.c:283
 #, c-format
 msgid "%s clipboard with selection"
 msgstr "%s clipboard with selection"
 
-#: src/effects.c:295
+#: src/effects.c:287
 #, c-format
 msgid "%s to clipboard"
 msgstr "%s to clipboard"
 
-#: src/effects.c:299
+#: src/effects.c:290
 #, c-format
 msgid "%s to new clip"
 msgstr "%s to new clip"
 
-#: src/effects.c:304
+#: src/effects.c:294
 #, c-format
 msgid "%s frames %d to %d"
 msgstr "%s frames %d to %d"
 
-#: src/effects.c:456 src/effects.c:523
+#: src/effects.c:443 src/effects.c:507
 msgid ""
 "\n"
 "No frames were generated.\n"
@@ -6204,46 +6222,46 @@
 "\n"
 "No frames were generated.\n"
 
-#: src/effects-weed.c:431
+#: src/effects-weed.c:452
 msgid "integer"
 msgstr "integer"
 
-#: src/effects-weed.c:432
+#: src/effects-weed.c:454
 msgid "int64"
 msgstr "int64"
 
-#: src/effects-weed.c:433
+#: src/effects-weed.c:456
 msgid "boolean"
 msgstr "boolean"
 
-#: src/effects-weed.c:434
+#: src/effects-weed.c:458
 msgid "double"
 msgstr "double"
 
-#: src/effects-weed.c:435
+#: src/effects-weed.c:460
 msgid "string"
 msgstr "string"
 
-#: src/effects-weed.c:436
+#: src/effects-weed.c:462
 msgid "pointer"
 msgstr "pointer"
 
-#: src/effects-weed.c:4591
+#: src/effects-weed.c:4581
 #, c-format
 msgid "Error: plugin %s has no weed_setup() function.\n"
 msgstr "Error: plugin %s has no weed_setup() function.\n"
 
-#: src/effects-weed.c:4606
+#: src/effects-weed.c:4595
 #, c-format
 msgid "No usable filters found in plugin %s\n"
 msgstr "No usable filters found in plugin %s\n"
 
-#: src/effects-weed.c:4680
+#: src/effects-weed.c:4668
 #, c-format
 msgid "Found duplicate plugin %s"
 msgstr "Found duplicate plugin %s"
 
-#: src/effects-weed.c:4734
+#: src/effects-weed.c:4723
 #, c-format
 msgid ""
 "Info: Unable to load plugin %s\n"
@@ -6252,258 +6270,270 @@
 "Info: Unable to load plugin %s\n"
 "Error was: %s\n"
 
-#: src/effects-weed.c:4737 src/effects-weed.c:5858
+#: src/effects-weed.c:4726 src/effects-weed.c:5847
 msgid "Some plugin directories"
 msgstr "Some plugin directories"
 
 #. TRANSLATORS: example " - LADSPA plugins -"
-#: src/effects-weed.c:4812 src/rte_window.c:2105
+#: src/effects-weed.c:4801 src/rte_window.c:2107
 #, c-format
 msgid " - %s plugins -"
 msgstr " - %s plugins -"
 
-#: src/effects-weed.c:5012
+#: src/effects-weed.c:4998
 #, c-format
 msgid "Successfully loaded %d Weed filters\n"
 msgstr "Successfully loaded %d Weed filters\n"
 
-#: src/effects-weed.c:5177
+#: src/effects-weed.c:5162
 #, c-format
 msgid "Invalid compound effect %s - has conflicting target_fps\n"
 msgstr "Invalid compound effect %s - has conflicting target_fps\n"
 
-#: src/effects-weed.c:5197
+#: src/effects-weed.c:5182
 #, c-format
 msgid "Invalid compound effect %s - has multiple transition parameters\n"
 msgstr "Invalid compound effect %s - has multiple transition parameters\n"
 
-#: src/effects-weed.c:5211
+#: src/effects-weed.c:5196
 #, c-format
 msgid "Invalid compound effect %s - has multiple master volume parameters\n"
 msgstr "Invalid compound effect %s - has multiple master volume parameters\n"
 
-#: src/effects-weed.c:5346
+#: src/effects-weed.c:5329
 #, c-format
 msgid "Invalid compound effect %s - must have >1 sub filters\n"
 msgstr "Invalid compound effect %s - must have >1 sub filters\n"
 
-#: src/effects-weed.c:5366
+#: src/effects-weed.c:5349
 #, c-format
 msgid "Invalid effect %s found in compound effect %s, line %d\n"
 msgstr "Invalid effect %s found in compound effect %s, line %d\n"
 
-#: src/effects-weed.c:5381
+#: src/effects-weed.c:5364
 #, c-format
 msgid "Invalid default found in compound effect %s, line %d\n"
 msgstr "Invalid default found in compound effect %s, line %d\n"
 
-#: src/effects-weed.c:5392
+#: src/effects-weed.c:5375
 #, c-format
 msgid "Invalid filter %d for defaults found in compound effect %s, line %d\n"
-msgstr ""
+msgstr "Invalid filter %d for defaults found in compound effect %s, line %d\n"
 
-#: src/effects-weed.c:5406
+#: src/effects-weed.c:5389
 #, c-format
 msgid "Invalid param %d for defaults found in compound effect %s, line %d\n"
-msgstr ""
+msgstr "Invalid param %d for defaults found in compound effect %s, line %d\n"
 
-#: src/effects-weed.c:5433
+#: src/effects-weed.c:5416
 #, c-format
 msgid ""
 "Invalid number of values for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5467
+#: src/effects-weed.c:5450
 #, c-format
 msgid ""
 "Invalid non-boolean value for defaults found in compound effect %s, line %d\n"
 msgstr ""
+"Invalid non-boolean value for defaults found in compound effect %s, line %d\n"
 
-#: src/effects-weed.c:5500
+#: src/effects-weed.c:5483
 #, c-format
 msgid "Invalid param link found in compound effect %s, line %d\n"
-msgstr ""
+msgstr "Invalid param link found in compound effect %s, line %d\n"
 
-#: src/effects-weed.c:5511
+#: src/effects-weed.c:5494
 #, c-format
 msgid ""
 "Invalid out filter %d for link params found in compound effect %s, line %d\n"
 msgstr ""
+"Invalid out filter %d for link params found in compound effect %s, line %d\n"
 
-#: src/effects-weed.c:5529
+#: src/effects-weed.c:5513
 #, c-format
 msgid ""
 "Invalid out param %d for link params found in compound effect %s, line %d\n"
 msgstr ""
+"Invalid out param %d for link params found in compound effect %s, line %d\n"
 
-#: src/effects-weed.c:5541
+#: src/effects-weed.c:5526
 #, c-format
 msgid ""
 "Invalid non-boolean value for autoscale found in compound effect %s, line "
 "%d\n"
 msgstr ""
+"Invalid non-boolean value for autoscale found in compound effect %s, line "
+"%d\n"
 
-#: src/effects-weed.c:5552
+#: src/effects-weed.c:5537
 #, c-format
 msgid ""
 "Invalid in filter %d for link params found in compound effect %s, line %d\n"
 msgstr ""
+"Invalid in filter %d for link params found in compound effect %s, line %d\n"
 
-#: src/effects-weed.c:5566
+#: src/effects-weed.c:5552
 #, c-format
 msgid ""
 "Invalid in param %d for link params found in compound effect %s, line %d\n"
 msgstr ""
+"Invalid in param %d for link params found in compound effect %s, line %d\n"
 
-#: src/effects-weed.c:5594
+#: src/effects-weed.c:5581
 #, c-format
 msgid "Invalid channel link found in compound effect %s, line %d\n"
-msgstr ""
+msgstr "Invalid channel link found in compound effect %s, line %d\n"
 
-#: src/effects-weed.c:5605
+#: src/effects-weed.c:5592
 #, c-format
 msgid ""
 "Invalid out filter %d for link channels found in compound effect %s, line "
 "%d\n"
 msgstr ""
+"Invalid out filter %d for link channels found in compound effect %s, line "
+"%d\n"
 
-#: src/effects-weed.c:5623
+#: src/effects-weed.c:5611
 #, c-format
 msgid ""
 "Invalid out channel %d for link params found in compound effect %s, line %d\n"
 msgstr ""
+"Invalid out channel %d for link params found in compound effect %s, line %d\n"
 
-#: src/effects-weed.c:5633
+#: src/effects-weed.c:5622
 #, c-format
 msgid ""
 "Invalid in filter %d for link channels found in compound effect %s, line %d\n"
 msgstr ""
+"Invalid in filter %d for link channels found in compound effect %s, line %d\n"
 
-#: src/effects-weed.c:5651
+#: src/effects-weed.c:5641
 #, c-format
 msgid ""
 "Invalid in channel %d for link params found in compound effect %s, line %d\n"
 msgstr ""
+"Invalid in channel %d for link params found in compound effect %s, line %d\n"
 
-#: src/effects-weed.c:5687
+#: src/effects-weed.c:5678
 #, c-format
 msgid "Compound:%s"
-msgstr ""
+msgstr "Compound:%s"
 
-#: src/effects-weed.c:5758
+#: src/effects-weed.c:5749
 #, c-format
 msgid "Successfully loaded %d compound filters\n"
 msgstr ""
 
-#: src/effects-weed.c:6591
+#: src/effects-weed.c:6570
 #, c-format
 msgid "Effect %s cannot be used with this audio player.\n"
 msgstr ""
 
-#: src/effects-weed.c:6737
+#: src/effects-weed.c:6718
 #, c-format
 msgid "Failed to start instance %s, error code %d\n"
 msgstr "Failed to start instance %s, error code %d\n"
 
-#: src/effects-weed.c:6814
+#: src/effects-weed.c:6797
 #, c-format
 msgid "Unable to start generator %s\n"
 msgstr "Unable to start generator %s\n"
 
-#: src/effects-weed.c:7621
+#: src/effects-weed.c:7607
 #, c-format
 msgid "Failed to start generator %s\n"
 msgstr "Failed to start generator %s\n"
 
-#: src/effects-weed.c:7718
+#: src/effects-weed.c:7701
 #, c-format
 msgid "Failed to start generator %s, error %d\n"
 msgstr "Failed to start generator %s, error %d\n"
 
-#: src/effects-weed.c:9012
+#: src/effects-weed.c:8993
 #, c-format
 msgid "%s [unstable] (%s)"
 msgstr "%s [unstable] (%s)"
 
-#: src/effects-data.c:3278
+#: src/effects-data.c:3234
 #, c-format
 msgid "ACTIVATE (%s)"
 msgstr ""
 
-#: src/effects-data.c:3548
+#: src/effects-data.c:3501
 msgid "ACTIVATE"
 msgstr ""
 
-#: src/effects-data.c:3876
+#: src/effects-data.c:3829
 #, c-format
 msgid "Key slot %d"
 msgstr ""
 
-#: src/effects-data.c:3998
+#: src/effects-data.c:3951
 msgid "Autoscale"
 msgstr ""
 
-#: src/effects-data.c:4089
+#: src/effects-data.c:4042
 msgid "Add another connection for this output parameter"
 msgstr ""
 
-#: src/effects-data.c:4102 src/effects-data.c:4151
+#: src/effects-data.c:4055 src/effects-data.c:4104
 msgid "Delete this connection"
 msgstr ""
 
-#: src/effects-data.c:4138
+#: src/effects-data.c:4091
 msgid "Add another connection for this output channel"
 msgstr ""
 
-#: src/effects-data.c:4223
+#: src/effects-data.c:4176
 msgid "Connected to -->"
 msgstr ""
 
-#: src/effects-data.c:4243
+#: src/effects-data.c:4196
 #, c-format
 msgid "%s - Alpha Channel Connections"
 msgstr ""
 
-#: src/effects-data.c:4316
+#: src/effects-data.c:4269
 #, c-format
 msgid "%s - Parameter Data Connections"
 msgstr ""
 
-#: src/effects-data.c:4336
+#: src/effects-data.c:4289
 msgid "Autoscale All"
 msgstr ""
 
-#: src/effects-data.c:4361 src/effects-data.c:4890
+#: src/effects-data.c:4314 src/effects-data.c:4841
 msgid "ACTIVATED"
 msgstr ""
 
-#: src/effects-data.c:4774
+#: src/effects-data.c:4726
 msgid "LiVES: - Parameter and Alpha Channel Connections"
 msgstr ""
 
-#: src/effects-data.c:4785
+#: src/effects-data.c:4736
 msgid "Auto Connect Channels"
 msgstr ""
 
-#: src/effects-data.c:4797
+#: src/effects-data.c:4748
 msgid "Auto Connect Parameters"
 msgstr ""
 
-#: src/effects-data.c:4807
+#: src/effects-data.c:4758
 msgid "Disconnect All"
 msgstr ""
 
-#: src/effects-data.c:4875
+#: src/effects-data.c:4826
 #, c-format
 msgid "Input channel is already connected from (%d,%d) %s"
 msgstr ""
 
-#: src/effects-data.c:4891
+#: src/effects-data.c:4842
 #, c-format
 msgid "Input parameter is already connected from (%d,%d) %s"
 msgstr ""
 
-#: src/effects-data.c:4899
+#: src/effects-data.c:4851
 msgid "Input and output parameters are not compatible"
 msgstr ""
 
@@ -6515,43 +6545,43 @@
 msgid "_Reset Values"
 msgstr "_Reset Values"
 
-#: src/framedraw.c:267
+#: src/framedraw.c:265
 msgid "_Frame"
 msgstr ""
 
-#: src/paramspecial.c:266
+#: src/paramspecial.c:259
 msgid "Maintain _Aspect Ratio"
 msgstr "Maintain _Aspect Ratio"
 
-#: src/paramspecial.c:267
+#: src/paramspecial.c:260
 msgid "Maintain aspect ratio of original frame"
 msgstr "Maintain aspect ratio of original frame"
 
-#: src/paramspecial.c:341
+#: src/paramspecial.c:335
 msgid "Display Password"
 msgstr "Display Password"
 
-#: src/paramwindow.c:450
+#: src/paramwindow.c:447
 msgid "Transition _In"
 msgstr "Transition _In"
 
-#: src/paramwindow.c:452
+#: src/paramwindow.c:449
 msgid "Click to set the transition parameter to show only the front frame"
 msgstr ""
 
-#: src/paramwindow.c:474
+#: src/paramwindow.c:472
 msgid "Crossfade audio"
 msgstr "Crossfade audio"
 
-#: src/paramwindow.c:475
+#: src/paramwindow.c:473
 msgid "Check the box to make audio transition with the video"
 msgstr "Check the box to make audio transition with the video"
 
-#: src/paramwindow.c:493
+#: src/paramwindow.c:492
 msgid "Transition _Out"
 msgstr "Transition _Out"
 
-#: src/paramwindow.c:495
+#: src/paramwindow.c:494
 msgid "Click to set the transition parameter to show only the rear frame"
 msgstr ""
 
@@ -6564,23 +6594,23 @@
 msgid "%s : size"
 msgstr "%s : size"
 
-#: src/paramwindow.c:598
+#: src/paramwindow.c:597
 msgid "New size (pixels)"
 msgstr "New size (pixels)"
 
-#: src/paramwindow.c:617 src/plugins.c:997
+#: src/paramwindow.c:616 src/plugins.c:973
 msgid "_Width"
 msgstr "_Width"
 
-#: src/paramwindow.c:636 src/plugins.c:1003
+#: src/paramwindow.c:635 src/plugins.c:979
 msgid "_Height"
 msgstr "_Height"
 
-#: src/paramwindow.c:684
+#: src/paramwindow.c:683
 msgid "Generate to _Clipboard"
 msgstr "Generate to _Clipboard"
 
-#: src/paramwindow.c:686
+#: src/paramwindow.c:685
 msgid "Generate frames to the clipboard"
 msgstr "Generate frames to the clipboard"
 
@@ -6592,7 +6622,7 @@
 msgid "Generate frames to a new clip"
 msgstr "Generate frames to a new clip"
 
-#: src/paramwindow.c:822
+#: src/paramwindow.c:824
 #, c-format
 msgid ""
 "\n"
@@ -6603,59 +6633,59 @@
 "You must select at least %d frames to use this effect.\n"
 "\n"
 
-#: src/paramwindow.c:920 src/paramwindow.c:930
+#: src/paramwindow.c:934 src/paramwindow.c:942
 msgid "Set as default"
 msgstr "Set as default"
 
-#: src/paramwindow.c:922 src/paramwindow.c:938
+#: src/paramwindow.c:936 src/paramwindow.c:950
 msgid "Reset"
 msgstr "Reset"
 
-#: src/paramwindow.c:932 src/rte_window.c:2401 src/omc-learn.c:1357
+#: src/paramwindow.c:944 src/rte_window.c:2394 src/omc-learn.c:1347
 msgid "Close _window"
 msgstr "Close _window"
 
-#: src/paramwindow.c:1337
+#: src/paramwindow.c:1340
 msgid "No parameters"
 msgstr "No parameters"
 
-#: src/paramwindow.c:1419
+#: src/paramwindow.c:1424
 msgid "Invalid parameter"
 msgstr "Invalid parameter"
 
-#: src/paramwindow.c:1611
+#: src/paramwindow.c:1610
 msgid "LiVES: - Select Colour"
 msgstr "LiVES: - Select Colour"
 
-#: src/paramwindow.c:1616
+#: src/paramwindow.c:1615
 msgid "Click to set the colour"
 msgstr "Click to set the colour"
 
-#: src/paramwindow.c:1628
+#: src/paramwindow.c:1626
 msgid "_Red"
 msgstr "_Red"
 
-#: src/paramwindow.c:1629
+#: src/paramwindow.c:1627
 msgid "The red value (0 - 255)"
 msgstr "The red value (0 - 255)"
 
-#: src/paramwindow.c:1632
+#: src/paramwindow.c:1630
 msgid "_Green"
 msgstr "_Green"
 
-#: src/paramwindow.c:1633
+#: src/paramwindow.c:1631
 msgid "The green value (0 - 255)"
 msgstr "The green value (0 - 255)"
 
-#: src/paramwindow.c:1636
+#: src/paramwindow.c:1634
 msgid "_Blue"
 msgstr "_Blue"
 
-#: src/paramwindow.c:1637
+#: src/paramwindow.c:1635
 msgid "The blue value (0 - 255)"
 msgstr "The blue value (0 - 255)"
 
-#: src/plugins.c:85
+#: src/plugins.c:86
 #, c-format
 msgid ""
 "\n"
@@ -6664,12 +6694,12 @@
 "\n"
 "Plugin error: %s failed with code %d"
 
-#: src/plugins.c:87
+#: src/plugins.c:88
 #, c-format
 msgid " : message was %s\n"
 msgstr " : message was %s\n"
 
-#: src/plugins.c:387
+#: src/plugins.c:375
 #, c-format
 msgid ""
 "\n"
@@ -6684,17 +6714,17 @@
 "%s\n"
 "Error code %d\n"
 
-#: src/plugins.c:397
+#: src/plugins.c:385
 #, c-format
 msgid "Updating video playback plugin defaults in %s\n"
 msgstr "Updating video playback plugin defaults in %s\n"
 
-#: src/plugins.c:452
+#: src/plugins.c:444
 #, c-format
 msgid "Loading video playback plugin defaults from %s..."
 msgstr "Loading video playback plugin defaults from %s..."
 
-#: src/plugins.c:515
+#: src/plugins.c:505
 #, c-format
 msgid ""
 "\n"
@@ -6709,32 +6739,32 @@
 " Tools|Preferences|Playback|Playback Plugins Advanced\n"
 "\n"
 
-#: src/plugins.c:855
+#: src/plugins.c:836
 #, c-format
 msgid "Saving playback plugin defaults to %s..."
 msgstr "Saving playback plugin defaults to %s..."
 
-#: src/plugins.c:962
+#: src/plugins.c:939
 msgid "_FPS"
 msgstr "_FPS"
 
-#: src/plugins.c:963
+#: src/plugins.c:940
 msgid "Fixed framerate for plugin.\n"
 msgstr "Fixed framerate for plugin.\n"
 
-#: src/plugins.c:1032
+#: src/plugins.c:1008
 msgid "_Colourspace"
 msgstr "_Colourspace"
 
-#: src/plugins.c:1033
+#: src/plugins.c:1009
 msgid "Colourspace input to the plugin.\n"
 msgstr "Colourspace input to the plugin.\n"
 
-#: src/plugins.c:1089
+#: src/plugins.c:1065
 msgid "Save settings to an alternate file.\n"
 msgstr "Save settings to an alternate file.\n"
 
-#: src/plugins.c:1206
+#: src/plugins.c:1182
 #, c-format
 msgid ""
 "\n"
@@ -6747,7 +6777,7 @@
 "Failed to open playback plugin %s\n"
 "Error was %s\n"
 
-#: src/plugins.c:1252
+#: src/plugins.c:1228
 #, c-format
 msgid ""
 "\n"
@@ -6762,7 +6792,7 @@
 "is missing a mandatory function.\n"
 "Unable to use it.\n"
 
-#: src/plugins.c:1265
+#: src/plugins.c:1241
 #, c-format
 msgid ""
 "Video playback plugin failed to initialise.\n"
@@ -6771,7 +6801,7 @@
 "Video playback plugin failed to initialise.\n"
 "Error was: %s\n"
 
-#: src/plugins.c:1461
+#: src/plugins.c:1428
 msgid ""
 "\n"
 "Warning ! Video playback plugin will not send key presses. Keyboard may be "
@@ -6781,7 +6811,7 @@
 "Warning ! Video playback plugin will not send key presses. Keyboard may be "
 "disabled during plugin use !\n"
 
-#: src/plugins.c:1465
+#: src/plugins.c:1433
 #, c-format
 msgid ""
 "*** Using %s plugin for fs playback, agreed to use palette type %d ( %s ). "
@@ -6790,17 +6820,17 @@
 "*** Using %s plugin for fs playback, agreed to use palette type %d ( %s ). "
 "***\n"
 
-#: src/plugins.c:1571
+#: src/plugins.c:1537
 #, c-format
 msgid "Audio stream unable to use preferred format '%s'\n"
 msgstr "Audio stream unable to use preferred format '%s'\n"
 
-#: src/plugins.c:1579
+#: src/plugins.c:1543
 #, c-format
 msgid "Using format '%s' instead.\n"
 msgstr "Using '%s' format instead.\n"
 
-#: src/plugins.c:1616
+#: src/plugins.c:1579
 #, c-format
 msgid ""
 "LiVES was unable to find its encoder plugins. Please make sure you have the "
@@ -6809,7 +6839,7 @@
 "or change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/plugins.c:1624
+#: src/plugins.c:1589
 #, c-format
 msgid ""
 "LiVES did not receive a response from the encoder plugin called '%s'.\n"
@@ -6822,11 +6852,11 @@
 "%s%s%s\n"
 "or switch to another plugin using Tools|Preferences|Encoding\n"
 
-#: src/plugins.c:2032
+#: src/plugins.c:1987
 msgid "Unable to resize, please install imageMagick\n"
 msgstr "Unable to resize, please install imageMagick\n"
 
-#: src/plugins.c:2231
+#: src/plugins.c:2183
 #, c-format
 msgid ""
 "\n"
@@ -6834,12 +6864,12 @@
 "No decoders found in %s !\n"
 msgstr ""
 
-#: src/plugins.c:2415
+#: src/plugins.c:2369
 #, c-format
 msgid " using %s"
 msgstr ""
 
-#: src/plugins.c:2499
+#: src/plugins.c:2451
 #, c-format
 msgid ""
 "\n"
@@ -6852,7 +6882,7 @@
 "Failed to open decoder plugin %s\n"
 "Error was %s\n"
 
-#: src/plugins.c:2522
+#: src/plugins.c:2472
 #, c-format
 msgid ""
 "\n"
@@ -6867,24 +6897,24 @@
 "is missing a mandatory function.\n"
 "Unable to use it.\n"
 
-#: src/plugins.c:2564
+#: src/plugins.c:2512
 msgid "/unknown"
 msgstr "/unknown"
 
-#: src/plugins.c:2651
+#: src/plugins.c:2598
 msgid "LiVES: - Decoder Plugins"
 msgstr "LiVES: - Decoder Plugins"
 
-#: src/plugins.c:2669
+#: src/plugins.c:2616
 msgid "Enabled Video Decoders (uncheck to disable)"
 msgstr "Enabled Video Decoders (uncheck to disable)"
 
-#: src/plugins.c:2726
+#: src/plugins.c:2672
 #, c-format
 msgid "Failed to load %s, transitions may not resize.\n"
 msgstr "Failed to load %s, transitions may not resize.\n"
 
-#: src/plugins.c:3854
+#: src/plugins.c:3797
 #, c-format
 msgid "%s advanced settings"
 msgstr "%s advanced settings"
@@ -6893,15 +6923,15 @@
 msgid "LiVES: - New Test RFX"
 msgstr "LiVES: - New Test RFX"
 
-#: src/rfx-builder.c:136
+#: src/rfx-builder.c:135
 msgid "LiVES: - Edit Test RFX"
 msgstr "LiVES: - Edit Test RFX"
 
-#: src/rfx-builder.c:166
+#: src/rfx-builder.c:165
 msgid "Type:"
 msgstr "Type:"
 
-#: src/rfx-builder.c:184
+#: src/rfx-builder.c:183
 msgid "tool"
 msgstr ""
 
@@ -6913,125 +6943,125 @@
 msgid "The name of the plugin. No spaces allowed."
 msgstr "The name of the plugin. No spaces allowed."
 
-#: src/rfx-builder.c:201
+#: src/rfx-builder.c:202
 msgid "Version:       "
 msgstr "Version:       "
 
-#: src/rfx-builder.c:203
+#: src/rfx-builder.c:204
 msgid "The script version."
 msgstr "The script version."
 
-#: src/rfx-builder.c:210
+#: src/rfx-builder.c:212
 msgid "    Author:       "
 msgstr "    Author:       "
 
-#: src/rfx-builder.c:211
+#: src/rfx-builder.c:213
 msgid "The script author."
 msgstr "The script author."
 
-#: src/rfx-builder.c:217
+#: src/rfx-builder.c:220
 msgid "    URL (optional):       "
 msgstr "    URL (optional):       "
 
-#: src/rfx-builder.c:218
+#: src/rfx-builder.c:221
 msgid "URL for the plugin maintainer."
 msgstr "URL for the plugin maintainer."
 
-#: src/rfx-builder.c:226
+#: src/rfx-builder.c:230
 msgid "Menu text:    "
 msgstr "Menu text:    "
 
-#: src/rfx-builder.c:227
+#: src/rfx-builder.c:231
 msgid "The text to show in the menu."
 msgstr "The text to show in the menu."
 
-#: src/rfx-builder.c:239
+#: src/rfx-builder.c:244
 msgid "Action description:        "
 msgstr "Action description:        "
 
-#: src/rfx-builder.c:241
+#: src/rfx-builder.c:246
 msgid "Describe what the plugin is doing. E.g. \"Edge detecting\""
 msgstr "Describe what the plugin is doing. E.g. \"Edge detecting\""
 
-#: src/rfx-builder.c:246
+#: src/rfx-builder.c:251
 msgid "Minimum frames:"
 msgstr "Minimum frames:"
 
-#: src/rfx-builder.c:249
+#: src/rfx-builder.c:254
 msgid ""
 "Minimum number of frames this effect/tool can be applied to. Normally 1."
 msgstr ""
 "Minimum number of frames this effect/tool can be applied to. Normally 1."
 
-#: src/rfx-builder.c:260
+#: src/rfx-builder.c:265
 msgid "_Requirements..."
 msgstr "_Requirements..."
 
-#: src/rfx-builder.c:263
+#: src/rfx-builder.c:268
 msgid "Enter any binaries required by the plugin."
 msgstr "Enter any binaries required by the plugin."
 
-#: src/rfx-builder.c:267
+#: src/rfx-builder.c:272
 msgid "_Properties..."
 msgstr "_Properties..."
 
-#: src/rfx-builder.c:270
+#: src/rfx-builder.c:275
 msgid "Set properties for the plugin. Optional."
 msgstr "Set properties for the plugin. Optional."
 
-#: src/rfx-builder.c:274
+#: src/rfx-builder.c:279
 msgid "_Parameters..."
 msgstr "_Parameters..."
 
-#: src/rfx-builder.c:277
+#: src/rfx-builder.c:282
 msgid "Set up parameters used in pre/loop/post/trigger code. Optional."
 msgstr "Set up parameters used in pre/loop/post/trigger code. Optional."
 
-#: src/rfx-builder.c:281
+#: src/rfx-builder.c:286
 msgid "Parameter _Window Hints..."
 msgstr "Parameter _Window Hints..."
 
-#: src/rfx-builder.c:284
+#: src/rfx-builder.c:289
 msgid "Set hints about how to lay out the parameter window. Optional."
 msgstr "Set hints about how to lay out the parameter window. Optional."
 
-#: src/rfx-builder.c:290
+#: src/rfx-builder.c:295
 msgid "_Language code:"
 msgstr ""
 
-#: src/rfx-builder.c:291
+#: src/rfx-builder.c:296
 msgid "Language for pre/loop/post/triggers. Optional."
 msgstr "Language for pre/loop/post/triggers. Optional."
 
-#: src/rfx-builder.c:300
+#: src/rfx-builder.c:305
 msgid "_Pre loop code..."
 msgstr "_Pre loop code..."
 
-#: src/rfx-builder.c:303
+#: src/rfx-builder.c:308
 msgid "Code to be executed before the loop. Optional."
 msgstr "Code to be executed before the loop. Optional."
 
-#: src/rfx-builder.c:307
+#: src/rfx-builder.c:312
 msgid "_Loop code..."
 msgstr "_Loop code..."
 
-#: src/rfx-builder.c:310
+#: src/rfx-builder.c:315
 msgid "Loop code to be applied to each frame."
 msgstr "Loop code to be applied to each frame."
 
-#: src/rfx-builder.c:314
+#: src/rfx-builder.c:319
 msgid "_Post loop code..."
 msgstr "_Post loop code..."
 
-#: src/rfx-builder.c:317
+#: src/rfx-builder.c:322
 msgid "Code to be executed after the loop. Optional."
 msgstr "Code to be executed after the loop. Optional."
 
-#: src/rfx-builder.c:321
+#: src/rfx-builder.c:326
 msgid "_Trigger code..."
 msgstr "_Trigger code..."
 
-#: src/rfx-builder.c:324
+#: src/rfx-builder.c:329
 msgid ""
 "Set trigger code for when the parameter window is shown, or when a parameter "
 "is changed. Optional (except for Utilities)."
@@ -7039,7 +7069,7 @@
 "Set trigger code for when the parameter window is shown, or when a parameter "
 "is changed. Optional (except for Utilities)."
 
-#: src/rfx-builder.c:421
+#: src/rfx-builder.c:426
 #, c-format
 msgid ""
 "\n"
@@ -7054,55 +7084,55 @@
 "%s\n"
 "%s\n"
 
-#: src/rfx-builder.c:544
+#: src/rfx-builder.c:541
 msgid "LiVES: - RFX Requirements"
 msgstr "LiVES: - RFX Requirements"
 
-#: src/rfx-builder.c:548
+#: src/rfx-builder.c:544
 msgid "LiVES: - RFX Parameters"
 msgstr "LiVES: - RFX Parameters"
 
-#: src/rfx-builder.c:552
+#: src/rfx-builder.c:547
 msgid "LiVES: - RFX Parameter Window Hints"
 msgstr "LiVES: - RFX Parameter Window Hints"
 
-#: src/rfx-builder.c:556
+#: src/rfx-builder.c:550
 msgid "LiVES: - RFX Triggers"
 msgstr "LiVES: - RFX Triggers"
 
-#: src/rfx-builder.c:622
+#: src/rfx-builder.c:613
 msgid "_New Entry"
 msgstr "_New Entry"
 
-#: src/rfx-builder.c:625
+#: src/rfx-builder.c:616
 msgid "_Edit Entry"
 msgstr "_Edit Entry"
 
-#: src/rfx-builder.c:628
+#: src/rfx-builder.c:619
 msgid "_Remove Entry"
 msgstr "_Remove Entry"
 
-#: src/rfx-builder.c:632
+#: src/rfx-builder.c:623
 msgid "Move _Up"
 msgstr "Move _Up"
 
-#: src/rfx-builder.c:635
+#: src/rfx-builder.c:626
 msgid "Move _Down"
 msgstr "Move _Down"
 
-#: src/rfx-builder.c:1004
+#: src/rfx-builder.c:984
 msgid "LiVES: - RFX Properties"
 msgstr "LiVES: - RFX Properties"
 
-#: src/rfx-builder.c:1013
+#: src/rfx-builder.c:993
 msgid "_Slow (hint to GUI)"
 msgstr "_Slow (hint to GUI)"
 
-#: src/rfx-builder.c:1024
+#: src/rfx-builder.c:1004
 msgid "_Batch mode generator"
 msgstr "_Batch mode generator"
 
-#: src/rfx-builder.c:1831
+#: src/rfx-builder.c:1790
 msgid ""
 "\n"
 "\n"
@@ -7116,7 +7146,7 @@
 "Please remove the trigger first.\n"
 "\n"
 
-#: src/rfx-builder.c:1875
+#: src/rfx-builder.c:1834
 msgid ""
 "\n"
 "\n"
@@ -7128,27 +7158,27 @@
 "Some triggers were adjusted.\n"
 "Please check the trigger code.\n"
 
-#: src/rfx-builder.c:1994
+#: src/rfx-builder.c:1950
 msgid "LiVES: - New RFX Parameter"
 msgstr "LiVES: - New RFX Parameter"
 
-#: src/rfx-builder.c:1997
+#: src/rfx-builder.c:1952
 msgid "LiVES: - Edit RFX Parameter"
 msgstr "LiVES: - Edit RFX Parameter"
 
-#: src/rfx-builder.c:2013
+#: src/rfx-builder.c:1968
 msgid "_Name:    "
 msgstr "_Name:    "
 
-#: src/rfx-builder.c:2016
+#: src/rfx-builder.c:1971
 msgid "Name of the parameter, must be unique in the plugin."
 msgstr "Name of the parameter, must be unique in the plugin."
 
-#: src/rfx-builder.c:2025
+#: src/rfx-builder.c:1981
 msgid "_Label:    "
 msgstr "_Label:    "
 
-#: src/rfx-builder.c:2028
+#: src/rfx-builder.c:1984
 msgid ""
 "Label to be shown by the parameter. An underscore represents mnemonic "
 "accelerator."
@@ -7156,159 +7186,159 @@
 "Label to be shown by the parameter. An underscore represents mnemonic "
 "accelerator."
 
-#: src/rfx-builder.c:2039
+#: src/rfx-builder.c:1996
 msgid "_Type:         "
 msgstr "_Type:         "
 
-#: src/rfx-builder.c:2040
+#: src/rfx-builder.c:1997
 msgid "Parameter type (select from list)."
 msgstr "Parameter type (select from list)."
 
-#: src/rfx-builder.c:2073
+#: src/rfx-builder.c:2029
 msgid "Decimal _places: "
 msgstr "Decimal _places: "
 
-#: src/rfx-builder.c:2082 src/rfx-builder.c:2477 src/rfx-builder.c:2495
+#: src/rfx-builder.c:2038 src/rfx-builder.c:2430 src/rfx-builder.c:2447
 msgid "_Default value:    "
 msgstr "_Default value:    "
 
-#: src/rfx-builder.c:2098
+#: src/rfx-builder.c:2054
 msgid "_Default: "
 msgstr "_Default: "
 
-#: src/rfx-builder.c:2132
+#: src/rfx-builder.c:2087
 msgid "Button _Group: "
 msgstr "Button _Group: "
 
-#: src/rfx-builder.c:2134
+#: src/rfx-builder.c:2089
 msgid "A non-zero value can be used to group radio buttons."
 msgstr "A non-zero value can be used to group radio buttons."
 
-#: src/rfx-builder.c:2142 src/rfx-builder.c:2478
+#: src/rfx-builder.c:2097 src/rfx-builder.c:2431
 msgid "_Minimum value: "
 msgstr "_Minimum value: "
 
-#: src/rfx-builder.c:2148 src/rfx-builder.c:2479
+#: src/rfx-builder.c:2103 src/rfx-builder.c:2432
 msgid "Ma_ximum value: "
 msgstr "Ma_ximum value: "
 
-#: src/rfx-builder.c:2157
+#: src/rfx-builder.c:2113
 msgid "     _Step size:   "
 msgstr "     _Step size:   "
 
-#: src/rfx-builder.c:2160
+#: src/rfx-builder.c:2117
 msgid ""
 "How much the parameter is adjusted when the spinbutton arrows are pressed."
 msgstr ""
 "How much the parameter is adjusted when the spinbutton arrows are pressed."
 
-#: src/rfx-builder.c:2171
+#: src/rfx-builder.c:2129
 msgid "_Wrap value"
 msgstr ""
 
-#: src/rfx-builder.c:2172
+#: src/rfx-builder.c:2131
 msgid "Whether the value wraps max->min and min->max."
 msgstr "Whether the value wraps max->min and min->max."
 
-#: src/rfx-builder.c:2470
+#: src/rfx-builder.c:2424
 msgid "Set _values"
 msgstr "Set _values"
 
-#: src/rfx-builder.c:2512
+#: src/rfx-builder.c:2463
 msgid "Default _Red:  "
 msgstr "Default _Red:  "
 
-#: src/rfx-builder.c:2513
+#: src/rfx-builder.c:2464
 msgid "Default _Green:"
 msgstr "Default _Green:"
 
-#: src/rfx-builder.c:2514
+#: src/rfx-builder.c:2465
 msgid "Default _Blue: "
 msgstr "Default _Blue: "
 
-#: src/rfx-builder.c:2538
+#: src/rfx-builder.c:2488
 msgid "Set _default"
 msgstr "Set _default"
 
-#: src/rfx-builder.c:2540
+#: src/rfx-builder.c:2490
 msgid "Default value:  "
 msgstr "Default value:  "
 
-#: src/rfx-builder.c:2541
+#: src/rfx-builder.c:2491
 msgid "Maximum length (chars): "
 msgstr "Maximum length (chars): "
 
-#: src/rfx-builder.c:2576
+#: src/rfx-builder.c:2526
 msgid "LiVES: - New RFX Parameter Window Hint"
 msgstr "LiVES: - New RFX Parameter Window Hint"
 
-#: src/rfx-builder.c:2579
+#: src/rfx-builder.c:2528
 msgid "LiVES: - Edit RFX Parameter Window Hint"
 msgstr "LiVES: - Edit RFX Parameter Window Hint"
 
-#: src/rfx-builder.c:2622
+#: src/rfx-builder.c:2569
 msgid "_Keyword:         "
 msgstr ""
 
-#: src/rfx-builder.c:2639
+#: src/rfx-builder.c:2586
 msgid "Special _Type:         "
 msgstr ""
 
-#: src/rfx-builder.c:2656
+#: src/rfx-builder.c:2602
 msgid "Special _Subtype:         "
 msgstr ""
 
-#: src/rfx-builder.c:2667 src/rfx-builder.c:2706
+#: src/rfx-builder.c:2613 src/rfx-builder.c:2651
 msgid "Row:    "
 msgstr "Row:    "
 
-#: src/rfx-builder.c:2732
+#: src/rfx-builder.c:2676
 #, c-format
 msgid "Linked parameters (%d):    "
 msgstr "Linked parameters (%d):    "
 
-#: src/rfx-builder.c:2749
+#: src/rfx-builder.c:2693
 msgid "Linked parameters (4):    "
 msgstr "Linked parameters (4):    "
 
-#: src/rfx-builder.c:2752
+#: src/rfx-builder.c:2695
 msgid "Linked parameters (2):    "
 msgstr "Linked parameters (2):    "
 
-#: src/rfx-builder.c:2777
+#: src/rfx-builder.c:2720
 msgid "LiVES: - New RFX Trigger"
 msgstr "LiVES: - New RFX Trigger"
 
-#: src/rfx-builder.c:2780
+#: src/rfx-builder.c:2722
 msgid "LiVES: - Edit RFX Trigger"
 msgstr "LiVES: - Edit RFX Trigger"
 
-#: src/rfx-builder.c:2808
+#: src/rfx-builder.c:2750
 msgid "When:         "
 msgstr "When:         "
 
-#: src/rfx-builder.c:2904
+#: src/rfx-builder.c:2846
 msgid "LiVES: - Pre Loop Code"
 msgstr "LiVES: - Pre Loop Code"
 
-#: src/rfx-builder.c:2911
+#: src/rfx-builder.c:2853
 msgid "LiVES: - Loop Code"
 msgstr "LiVES: - Loop Code"
 
-#: src/rfx-builder.c:2918
+#: src/rfx-builder.c:2860
 msgid "LiVES: - Post Loop Code"
 msgstr "LiVES: - Post Loop Code"
 
-#: src/rfx-builder.c:2931
+#: src/rfx-builder.c:2873
 #, c-format
 msgid "LiVES: - Default text (max length %d)"
 msgstr "LiVES: - Default text (max length %d)"
 
-#: src/rfx-builder.c:2944
+#: src/rfx-builder.c:2885
 msgid "LiVES: - Enter values, one per line"
 msgstr "LiVES: - Enter values, one per line"
 
-#: src/rfx-builder.c:3055
+#: src/rfx-builder.c:2996
 msgid ""
 "\n"
 "\n"
@@ -7318,7 +7348,7 @@
 "\n"
 "Name must not be blank.\n"
 
-#: src/rfx-builder.c:3060
+#: src/rfx-builder.c:3001
 msgid ""
 "\n"
 "\n"
@@ -7328,7 +7358,7 @@
 "\n"
 "Name must not contain spaces.\n"
 
-#: src/rfx-builder.c:3065
+#: src/rfx-builder.c:3006
 msgid ""
 "\n"
 "\n"
@@ -7338,7 +7368,7 @@
 "\n"
 "Menu text must not be blank.\n"
 
-#: src/rfx-builder.c:3071
+#: src/rfx-builder.c:3012
 msgid ""
 "\n"
 "\n"
@@ -7348,7 +7378,7 @@
 "\n"
 "Action description must not be blank.\n"
 
-#: src/rfx-builder.c:3076
+#: src/rfx-builder.c:3017
 msgid ""
 "\n"
 "\n"
@@ -7358,7 +7388,7 @@
 "\n"
 "Author must not be blank.\n"
 
-#: src/rfx-builder.c:3085 src/rfx-builder.c:4339
+#: src/rfx-builder.c:3026 src/rfx-builder.c:4253
 msgid ""
 "\n"
 "\n"
@@ -7370,7 +7400,7 @@
 "There is already a plugin with this name.\n"
 "Name must be unique.\n"
 
-#: src/rfx-builder.c:3092
+#: src/rfx-builder.c:3033
 msgid ""
 "\n"
 "\n"
@@ -7380,7 +7410,7 @@
 "\n"
 "Loop code should not be blank.\n"
 
-#: src/rfx-builder.c:3098
+#: src/rfx-builder.c:3039
 msgid ""
 "\n"
 "\n"
@@ -7390,7 +7420,7 @@
 "\n"
 "Trigger code should not be blank for a utility.\n"
 
-#: src/rfx-builder.c:3111
+#: src/rfx-builder.c:3052
 msgid ""
 "\n"
 "\n"
@@ -7400,7 +7430,7 @@
 "\n"
 "Parameter name must not be blank.\n"
 
-#: src/rfx-builder.c:3117
+#: src/rfx-builder.c:3058
 msgid ""
 "\n"
 "\n"
@@ -7414,41 +7444,41 @@
 "plugin.\n"
 "\n"
 
-#: src/rfx-builder.c:3171
+#: src/rfx-builder.c:3111
 #, c-format
 msgid "Writing script file %s..."
 msgstr "Writing script file %s..."
 
-#: src/rfx-builder.c:3477
+#: src/rfx-builder.c:3411
 msgid "No <define> section found in script.\n"
 msgstr "No <define> section found in script.\n"
 
-#: src/rfx-builder.c:3484 src/rfx-builder.c:3493
+#: src/rfx-builder.c:3418 src/rfx-builder.c:3427
 msgid "Bad script version.\n"
 msgstr "Bad script version.\n"
 
-#: src/rfx-builder.c:3505
+#: src/rfx-builder.c:3439
 msgid "No <name> section found in script.\n"
 msgstr "No <name> section found in script.\n"
 
-#: src/rfx-builder.c:3513
+#: src/rfx-builder.c:3447
 msgid "No <version> section found in script.\n"
 msgstr "No <version> section found in script.\n"
 
-#: src/rfx-builder.c:3522
+#: src/rfx-builder.c:3456
 msgid "No <author> section found in script.\n"
 msgstr "No <author> section found in script.\n"
 
-#: src/rfx-builder.c:3536
+#: src/rfx-builder.c:3470
 msgid "No <description> section found in script.\n"
 msgstr "No <description> section found in script.\n"
 
-#: src/rfx-builder.c:3540
+#: src/rfx-builder.c:3474
 #, c-format
 msgid "Bad description. (%s)\n"
 msgstr "Bad description. (%s)\n"
 
-#: src/rfx-builder.c:3702
+#: src/rfx-builder.c:3627
 #, c-format
 msgid ""
 "\n"
@@ -7463,27 +7493,27 @@
 "found in script.\n"
 "\n"
 
-#: src/rfx-builder.c:3859
+#: src/rfx-builder.c:3780
 msgid "Rebuilding all RFX scripts...builtin..."
 msgstr "Rebuilding all RFX scripts...builtin..."
 
-#: src/rfx-builder.c:3860
+#: src/rfx-builder.c:3781
 msgid "Rebuilding scripts"
 msgstr "Rebuilding scripts"
 
-#: src/rfx-builder.c:3868
+#: src/rfx-builder.c:3789
 msgid "custom..."
 msgstr "custom..."
 
-#: src/rfx-builder.c:3872
+#: src/rfx-builder.c:3793
 msgid "test..."
 msgstr "test..."
 
-#: src/rfx-builder.c:3878
+#: src/rfx-builder.c:3799
 msgid "rebuilding dynamic menu entries..."
 msgstr "rebuilding dynamic menu entries..."
 
-#: src/rfx-builder.c:3905 src/rfx-builder.c:3912
+#: src/rfx-builder.c:3826 src/rfx-builder.c:3834
 #, c-format
 msgid ""
 "\n"
@@ -7496,7 +7526,7 @@
 "LiVES was unable to find the program %s.\n"
 "Please check this program is in your path and executable.\n"
 
-#: src/rfx-builder.c:3951
+#: src/rfx-builder.c:3874
 #, c-format
 msgid ""
 "\n"
@@ -7511,12 +7541,12 @@
 "%s ?\n"
 "\n"
 
-#: src/rfx-builder.c:3960
+#: src/rfx-builder.c:3884
 #, c-format
 msgid "Deleting rfx script %s..."
 msgstr "Deleting rfx script %s..."
 
-#: src/rfx-builder.c:3980
+#: src/rfx-builder.c:3902
 #, c-format
 msgid ""
 "\n"
@@ -7531,7 +7561,7 @@
 "%s\n"
 "Error code was %d\n"
 
-#: src/rfx-builder.c:4016
+#: src/rfx-builder.c:3938
 #, c-format
 msgid ""
 "\n"
@@ -7546,12 +7576,12 @@
 "already exists.\n"
 "Please delete it first, or rename the test script.\n"
 
-#: src/rfx-builder.c:4027
+#: src/rfx-builder.c:3950
 #, c-format
 msgid "Promoting rfx test plugin %s to custom..."
 msgstr "Promoting rfx test plugin %s to custom..."
 
-#: src/rfx-builder.c:4044
+#: src/rfx-builder.c:3965
 #, c-format
 msgid ""
 "\n"
@@ -7562,20 +7592,20 @@
 "Return code was %d (%s)\n"
 msgstr ""
 
-#: src/rfx-builder.c:4070
+#: src/rfx-builder.c:3990
 msgid "LiVES: - Export Script to..."
 msgstr ""
 
-#: src/rfx-builder.c:4077 src/rfx-builder.c:4156
+#: src/rfx-builder.c:3997 src/rfx-builder.c:4074
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "Copying %s to %s..."
 
-#: src/rfx-builder.c:4105
+#: src/rfx-builder.c:4024
 msgid "LiVES: Import Script from..."
 msgstr ""
 
-#: src/rfx-builder.c:4148
+#: src/rfx-builder.c:4067
 #, c-format
 msgid ""
 "\n"
@@ -7590,43 +7620,43 @@
 "already exists.\n"
 "Please delete it first, or rename the import script.\n"
 
-#: src/rfx-builder.c:4249
+#: src/rfx-builder.c:4166
 msgid "LiVES: - Copy RFX Script"
 msgstr "LiVES: - Copy RFX Script"
 
-#: src/rfx-builder.c:4251
+#: src/rfx-builder.c:4168
 msgid "_From type:    "
 msgstr ""
 
-#: src/rfx-builder.c:4258
+#: src/rfx-builder.c:4175
 msgid "   Script:    "
 msgstr "   Script:    "
 
-#: src/rfx-builder.c:4267
+#: src/rfx-builder.c:4183
 msgid "LiVES: - Rename test RFX Script"
 msgstr "LiVES: - Rename test RFX Script"
 
-#: src/rfx-builder.c:4268
+#: src/rfx-builder.c:4184
 msgid "From script: "
 msgstr "From script: "
 
-#: src/rfx-builder.c:4273
+#: src/rfx-builder.c:4188
 msgid "LiVES: - RFX Script name"
 msgstr "LiVES: - RFX Script name"
 
-#: src/rfx-builder.c:4274
+#: src/rfx-builder.c:4189
 msgid "Script name: "
 msgstr "Script name: "
 
-#: src/rfx-builder.c:4294
+#: src/rfx-builder.c:4209
 msgid "New name: "
 msgstr "New name: "
 
-#: src/rfx-builder.c:4297
+#: src/rfx-builder.c:4212
 msgid "New script name: "
 msgstr "New script name: "
 
-#: src/rfx-builder.c:4372
+#: src/rfx-builder.c:4286
 msgid ""
 "\n"
 "\n"
@@ -7638,12 +7668,12 @@
 "There is already a test script with this name.\n"
 "Script name must be unique.\n"
 
-#: src/rfx-builder.c:4384
+#: src/rfx-builder.c:4297
 #, c-format
 msgid "Renaming RFX test script %s to %s..."
 msgstr "Renaming RFX test script %s to %s..."
 
-#: src/rfx-builder.c:4390
+#: src/rfx-builder.c:4302
 #, c-format
 msgid ""
 "\n"
@@ -7660,22 +7690,22 @@
 "%s\n"
 "Return code was %d\n"
 
-#: src/rfx-builder.c:4610
+#: src/rfx-builder.c:4518
 msgid "_Apply Real Time Effects to Selection"
 msgstr "_Apply Real Time Effects to Selection"
 
-#: src/rfx-builder.c:4664
+#: src/rfx-builder.c:4572
 #, c-format
 msgid "Loading rendered effect %s..."
 msgstr "Loading rendered effect %s..."
 
-#: src/rfx-builder.c:4766
+#: src/rfx-builder.c:4674
 msgid ""
 "See: VJ - show VJ keys. Set the realtime effects, and then apply them here."
 msgstr ""
 "See: VJ - show VJ keys. Set the realtime effects, and then apply them here."
 
-#: src/preferences.c:359
+#: src/preferences.c:351
 msgid ""
 "\n"
 "\n"
@@ -7687,7 +7717,7 @@
 "Video playback plugins are only activated in\n"
 "full screen, separate window (fs) mode\n"
 
-#: src/preferences.c:408
+#: src/preferences.c:400
 msgid ""
 "\n"
 "\n"
@@ -7699,7 +7729,7 @@
 "\n"
 "(Free space = UNKNOWN)"
 
-#: src/preferences.c:412
+#: src/preferences.c:403
 #, c-format
 msgid ""
 "\n"
@@ -7712,14 +7742,14 @@
 "\n"
 "(Free space = %s)"
 
-#: src/preferences.c:416
+#: src/preferences.c:408
 msgid ""
 "The temp directory is LiVES working directory where opened clips and sets "
 "are stored.\n"
 "It should be in a partition with plenty of free disk space.\n"
 msgstr ""
 
-#: src/preferences.c:784
+#: src/preferences.c:839
 #, c-format
 msgid ""
 "Unable to create or write to the new temporary directory.\n"
@@ -7730,7 +7760,7 @@
 "The directory will not be changed now.\n"
 msgstr ""
 
-#: src/preferences.c:786
+#: src/preferences.c:843
 #, c-format
 msgid ""
 "Unable to create or write to the new temporary directory.\n"
@@ -7740,7 +7770,7 @@
 "The directory will not be changed now.\n"
 msgstr ""
 
-#: src/preferences.c:798
+#: src/preferences.c:856
 msgid ""
 "You have chosen to change the temporary directory.\n"
 "Please make sure you have no other copies of LiVES open.\n"
@@ -7760,7 +7790,7 @@
 "Alternatively, press Cancel to restore the temporary directory to its "
 "original setting."
 
-#: src/preferences.c:1169
+#: src/preferences.c:1221
 msgid ""
 "\n"
 "Unable to switch audio players to jack - jackd must be installed first.\n"
@@ -7770,7 +7800,7 @@
 "Unable to switch audio players to jack - jackd must be installed first.\n"
 "See http://jackaudio.org\n"
 
-#: src/preferences.c:1175
+#: src/preferences.c:1226
 msgid ""
 "\n"
 "Switching audio players requires restart (jackd must not be running)\n"
@@ -7778,7 +7808,7 @@
 "\n"
 "Switching audio players requires restart (jackd must not be running)\n"
 
-#: src/preferences.c:1202
+#: src/preferences.c:1253
 msgid ""
 "\n"
 "Unable to switch audio players to pulse audio\n"
@@ -7790,67 +7820,67 @@
 "pulseaudio must be installed first.\n"
 "See http://www.pulseaudio.org\n"
 
-#: src/preferences.c:1502
+#: src/preferences.c:1544
 msgid "PCM (highest quality; largest files)"
 msgstr "PCM (highest quality; largest files)"
 
-#: src/preferences.c:2063
+#: src/preferences.c:2096
 msgid "LiVES: - Preferences"
 msgstr "LiVES: - Preferences"
 
-#: src/preferences.c:2142
+#: src/preferences.c:2177
 msgid "Open file selection maximised"
 msgstr "Open file selection maximised"
 
-#: src/preferences.c:2149
+#: src/preferences.c:2184
 msgid "Show recent files in the File menu"
 msgstr "Show recent files in the File menu"
 
-#: src/preferences.c:2158
+#: src/preferences.c:2193
 msgid "Stop screensaver on playback    "
 msgstr "Stop screensaver on playback    "
 
-#: src/preferences.c:2165
+#: src/preferences.c:2200
 msgid "Open main window maximised"
 msgstr "Open main window maximised"
 
-#: src/preferences.c:2173
+#: src/preferences.c:2208
 msgid "Show toolbar when background is blanked"
 msgstr "Show toolbar when background is blanked"
 
-#: src/preferences.c:2181
+#: src/preferences.c:2216
 msgid "Allow mouse wheel to switch clips"
 msgstr "Allow mouse wheel to switch clips"
 
-#: src/preferences.c:2192
+#: src/preferences.c:2227
 msgid "Shrink previews to fit in interface"
 msgstr "Shrink previews to fit in interface"
 
-#: src/preferences.c:2202
+#: src/preferences.c:2237
 msgid "Startup mode:"
 msgstr "Startup mode:"
 
-#: src/preferences.c:2206
+#: src/preferences.c:2241
 msgid "_Clip editor"
 msgstr "_Clip editor"
 
-#: src/preferences.c:2210
+#: src/preferences.c:2245
 msgid "_Multitrack mode"
 msgstr "_Multitrack mode"
 
-#: src/preferences.c:2234
+#: src/preferences.c:2268
 msgid "Multi-head support"
 msgstr "Multi-head support"
 
-#: src/preferences.c:2242
+#: src/preferences.c:2276
 msgid " monitor number for LiVES interface"
 msgstr " monitor number for LiVES interface"
 
-#: src/preferences.c:2248
+#: src/preferences.c:2282
 msgid " monitor number for playback"
 msgstr " monitor number for playback"
 
-#: src/preferences.c:2260
+#: src/preferences.c:2294
 msgid ""
 "A setting of 0 means use all available monitors (only works with some "
 "playback plugins)."
@@ -7858,263 +7888,263 @@
 "A setting of 0 means use all available monitors (only works with some "
 "playback plugins)."
 
-#: src/preferences.c:2270
+#: src/preferences.c:2304
 msgid "Force single monitor"
 msgstr "Force single monitor"
 
-#: src/preferences.c:2271
+#: src/preferences.c:2305
 msgid "Ignore all except the first monitor."
 msgstr ""
 
-#: src/preferences.c:2293
+#: src/preferences.c:2327
 msgid "Show clip thumbnails during playback"
 msgstr ""
 
-#: src/preferences.c:2306
+#: src/preferences.c:2340
 msgid "GUI"
 msgstr "GUI"
 
-#: src/preferences.c:2321
+#: src/preferences.c:2355
 msgid "When entering Multitrack mode:"
 msgstr "When entering Multitrack mode:"
 
-#: src/preferences.c:2330
+#: src/preferences.c:2364
 msgid "_Prompt me for width, height, fps and audio settings"
 msgstr "_Prompt me for width, height, fps and audio settings"
 
-#: src/preferences.c:2336
+#: src/preferences.c:2370
 msgid "_Always use the following values:"
 msgstr "_Always use the following values:"
 
-#: src/preferences.c:2345
+#: src/preferences.c:2379
 msgid "Use these same _values for rendering a new clip"
 msgstr "Use these same _values for rendering a new clip"
 
-#: src/preferences.c:2370
+#: src/preferences.c:2404
 msgid "_Width           "
 msgstr "_Width           "
 
-#: src/preferences.c:2375
+#: src/preferences.c:2409
 msgid "          _Height      "
 msgstr "          _Height      "
 
-#: src/preferences.c:2379
+#: src/preferences.c:2413
 msgid "          _FPS"
 msgstr "          _FPS"
 
-#: src/preferences.c:2387
+#: src/preferences.c:2421
 msgid "Enable backing audio track"
 msgstr "Enable backing audio track"
 
-#: src/preferences.c:2394
+#: src/preferences.c:2428
 msgid "Audio track per video track"
 msgstr "Audio track per video track"
 
-#: src/preferences.c:2423
+#: src/preferences.c:2457
 msgid "    _Undo buffer size (MB)    "
 msgstr "    _Undo buffer size (MB)    "
 
-#: src/preferences.c:2432
+#: src/preferences.c:2466
 msgid "_Exit multitrack mode after rendering"
 msgstr "_Exit multitrack mode after rendering"
 
-#: src/preferences.c:2440
+#: src/preferences.c:2474
 msgid "Auto backup layouts"
 msgstr "Auto backup layouts"
 
-#: src/preferences.c:2445
+#: src/preferences.c:2479
 msgid "_Every"
 msgstr "_Every"
 
-#: src/preferences.c:2453
+#: src/preferences.c:2487
 msgid "seconds"
 msgstr "seconds"
 
-#: src/preferences.c:2461
+#: src/preferences.c:2495
 msgid "After every _change"
 msgstr "After every _change"
 
-#: src/preferences.c:2467
+#: src/preferences.c:2501
 msgid "_Never"
 msgstr "_Never"
 
-#: src/preferences.c:2490
+#: src/preferences.c:2523
 msgid "Multitrack/Render"
 msgstr "Multitrack/Render"
 
-#: src/preferences.c:2508
+#: src/preferences.c:2541
 msgid "Use instant opening when possible"
 msgstr "Use instant opening when possible"
 
-#: src/preferences.c:2509
+#: src/preferences.c:2543
 msgid "Enable instant opening of some file types using decoder plugins"
 msgstr "Enable instant opening of some file types using decoder plugins"
 
-#: src/preferences.c:2531
+#: src/preferences.c:2567
 msgid "Video open command (fallback)"
 msgstr ""
 
-#: src/preferences.c:2543
+#: src/preferences.c:2579
 msgid "Open/render compression"
 msgstr ""
 
-#: src/preferences.c:2546
+#: src/preferences.c:2582
 msgid " %     ( lower = slower, larger files; for jpeg, higher quality )"
 msgstr " %     ( lower = slower, larger files; for jpeg, higher quality )"
 
-#: src/preferences.c:2558
+#: src/preferences.c:2594
 msgid "Default image format"
 msgstr ""
 
-#: src/preferences.c:2562
+#: src/preferences.c:2598
 msgid "_jpeg"
 msgstr "_jpeg"
 
-#: src/preferences.c:2565
+#: src/preferences.c:2601
 msgid "_png"
 msgstr "_png"
 
-#: src/preferences.c:2572
+#: src/preferences.c:2608
 msgid "(Check Help/Troubleshoot to see which image formats are supported)"
 msgstr "(Check Help/Troubleshoot to see which image formats are supported)"
 
-#: src/preferences.c:2580
+#: src/preferences.c:2616
 msgid "Enable automatic deinterlacing when possible"
 msgstr "Enable automatic deinterlacing when possible"
 
-#: src/preferences.c:2582
+#: src/preferences.c:2619
 msgid "Automatically deinterlace frames when a plugin suggests it"
 msgstr "Automatically deinterlace frames when a plugin suggests it"
 
-#: src/preferences.c:2593
+#: src/preferences.c:2632
 msgid "Automatic trimming / padding of audio when possible"
 msgstr ""
 
-#: src/preferences.c:2595
+#: src/preferences.c:2634
 msgid "Automatically trim or pad audio when a plugin suggests it"
 msgstr ""
 
-#: src/preferences.c:2606
+#: src/preferences.c:2646
 msgid "Ignore blank borders when possible"
 msgstr "Ignore blank borders when possible"
 
-#: src/preferences.c:2608
+#: src/preferences.c:2648
 msgid "Clip any blank borders from frames where possible"
 msgstr "Clip any blank borders from frames where possible"
 
-#: src/preferences.c:2619
+#: src/preferences.c:2660
 msgid "When opening multiple files, concatenate images into one clip"
 msgstr "When opening multiple files, concatenate images into one clip"
 
-#: src/preferences.c:2629
+#: src/preferences.c:2670
 msgid "Decoding"
 msgstr "Decoding"
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:2652
+#: src/preferences.c:2693
 msgid "Low - can improve performance on slower machines"
 msgstr "Low - can improve performance on slower machines"
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:2654
+#: src/preferences.c:2695
 msgid "Normal - recommended for most users"
 msgstr "Normal - recommended for most users"
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:2656
+#: src/preferences.c:2697
 msgid "High - can improve quality on very fast machines"
 msgstr "High - can improve quality on very fast machines"
 
-#: src/preferences.c:2659
+#: src/preferences.c:2700
 msgid "Preview _quality"
 msgstr "Preview _quality"
 
-#: src/preferences.c:2660
+#: src/preferences.c:2701
 msgid "The preview quality for video playback - affects resizing"
 msgstr "The preview quality for video playback - affects resizing"
 
-#: src/preferences.c:2675
+#: src/preferences.c:2717
 msgid "_Show FPS statistics"
 msgstr "_Show FPS statistics"
 
-#: src/preferences.c:2694
+#: src/preferences.c:2736
 msgid "_Plugin"
 msgstr "_Plugin"
 
-#: src/preferences.c:2718
+#: src/preferences.c:2760
 msgid "Stream audio"
 msgstr "Stream audio"
 
-#: src/preferences.c:2721
+#: src/preferences.c:2763
 msgid "Stream audio to playback plugin"
 msgstr "Stream audio to playback plugin"
 
-#: src/preferences.c:2734
+#: src/preferences.c:2778
 msgid "Record player output"
 msgstr ""
 
-#: src/preferences.c:2737
+#: src/preferences.c:2781
 msgid "Record output from player instead of input to player"
 msgstr ""
 
-#: src/preferences.c:2744
+#: src/preferences.c:2789
 msgid "VIDEO"
 msgstr "VIDEO"
 
-#: src/preferences.c:2787
+#: src/preferences.c:2833
 msgid "_Player"
 msgstr "_Player"
 
-#: src/preferences.c:2792
+#: src/preferences.c:2838
 msgid "(See also the Jack Integration tab for jack startup options)"
 msgstr "(See also the Jack Integration tab for jack startup options)"
 
-#: src/preferences.c:2819
+#: src/preferences.c:2865
 msgid "mplayer"
 msgstr "mplayer"
 
-#: src/preferences.c:2830
+#: src/preferences.c:2876
 #, fuzzy
 msgid "mplayer2"
 msgstr "mplayer"
 
-#: src/preferences.c:2833
+#: src/preferences.c:2879
 msgid "Audio play _command"
 msgstr "Audio play _command"
 
-#: src/preferences.c:2840
+#: src/preferences.c:2886
 msgid "- internal -"
 msgstr "- internal -"
 
-#: src/preferences.c:2849
+#: src/preferences.c:2895
 msgid "Audio follows video _rate/direction"
 msgstr "Audio follows video _rate/direction"
 
-#: src/preferences.c:2857
+#: src/preferences.c:2903
 msgid "Audio follows _clip switches"
 msgstr "Audio follows _clip switches"
 
-#: src/preferences.c:2864
+#: src/preferences.c:2910
 msgid "Source:"
 msgstr ""
 
-#: src/preferences.c:2868
+#: src/preferences.c:2914
 msgid "_Internal"
 msgstr ""
 
-#: src/preferences.c:2873
+#: src/preferences.c:2919
 msgid "_External (requires jack or pulse audio player)"
 msgstr ""
 
-#: src/preferences.c:2892
+#: src/preferences.c:2940
 msgid "AUDIO"
 msgstr "AUDIO"
 
-#: src/preferences.c:2902
+#: src/preferences.c:2950
 msgid "Playback"
 msgstr "Playback"
 
-#: src/preferences.c:2925
+#: src/preferences.c:2973
 msgid ""
 "Record audio when capturing an e_xternal window\n"
 " (requires jack or pulse audio)"
@@ -8122,68 +8152,68 @@
 "Record audio when capturing an e_xternal window\n"
 " (requires jack or pulse audio)"
 
-#: src/preferences.c:2940
+#: src/preferences.c:2988
 msgid "      What to record when 'r' is pressed   "
 msgstr "      What to record when 'r' is pressed   "
 
-#: src/preferences.c:2949
+#: src/preferences.c:2997
 msgid "_Frame changes"
 msgstr "_Frame changes"
 
-#: src/preferences.c:2964
+#: src/preferences.c:3012
 msgid "F_PS changes"
 msgstr "F_PS changes"
 
-#: src/preferences.c:2982
+#: src/preferences.c:3030
 msgid "_Real time effects"
 msgstr "_Real time effects"
 
-#: src/preferences.c:2993
+#: src/preferences.c:3041
 msgid "_Clip switches"
 msgstr "_Clip switches"
 
-#: src/preferences.c:3004
+#: src/preferences.c:3052
 msgid "_Audio (requires jack or pulse audio player)"
 msgstr ""
 
-#: src/preferences.c:3024
+#: src/preferences.c:3072
 msgid "Pause recording if free disk space falls below"
 msgstr "Pause recording if free disk space falls below:"
 
 #. TRANSLATORS: gigabytes
-#: src/preferences.c:3030
+#: src/preferences.c:3078
 msgid "GB"
 msgstr "GB"
 
-#: src/preferences.c:3037
+#: src/preferences.c:3085
 msgid "Recording"
 msgstr "Recording"
 
-#: src/preferences.c:3055
+#: src/preferences.c:3103
 msgid "Encoder"
 msgstr ""
 
-#: src/preferences.c:3090
+#: src/preferences.c:3137
 msgid "Output format"
 msgstr "Output format"
 
-#: src/preferences.c:3106
+#: src/preferences.c:3153
 msgid "Audio codec"
 msgstr "Audio codec"
 
-#: src/preferences.c:3119
+#: src/preferences.c:3165
 msgid "Encoding"
 msgstr "Encoding"
 
-#: src/preferences.c:3134
+#: src/preferences.c:3180
 msgid "Use _antialiasing when resizing"
 msgstr "Use _antialiasing when resizing"
 
-#: src/preferences.c:3143
+#: src/preferences.c:3189
 msgid "Number of _real time effect keys"
 msgstr "Number of _real time effect keys"
 
-#: src/preferences.c:3145
+#: src/preferences.c:3192
 msgid ""
 "The number of \"virtual\" real time effect keys. They can be controlled "
 "through the real time effects window, or via network (OSC)."
@@ -8191,95 +8221,95 @@
 "The number of \"virtual\" real time effect keys. They can be controlled "
 "through the real time effects window, or via network (OSC)."
 
-#: src/preferences.c:3152
+#: src/preferences.c:3199
 msgid "Use _threads where possible when applying effects"
 msgstr "Use _threads where possible when applying effects"
 
-#: src/preferences.c:3159
+#: src/preferences.c:3207
 msgid "Number of _threads"
 msgstr "Number of _threads"
 
-#: src/preferences.c:3172
+#: src/preferences.c:3221
 msgid "Restart is required if any of the following paths are changed:"
 msgstr ""
 
-#: src/preferences.c:3182
+#: src/preferences.c:3231
 msgid "Weed plugin path"
 msgstr ""
 
-#: src/preferences.c:3184
+#: src/preferences.c:3234
 msgid "Frei0r plugin path"
 msgstr ""
 
-#: src/preferences.c:3186
+#: src/preferences.c:3237
 msgid "LADSPA plugin path"
 msgstr ""
 
-#: src/preferences.c:3209
+#: src/preferences.c:3261
 msgid "      Video load directory (default)      "
 msgstr "      Video load directory (default)      "
 
-#: src/preferences.c:3215
+#: src/preferences.c:3267
 msgid "      Video save directory (default) "
 msgstr "      Video save directory (default) "
 
-#: src/preferences.c:3221
+#: src/preferences.c:3273
 msgid "      Audio load directory (default) "
 msgstr "      Audio load directory (default) "
 
-#: src/preferences.c:3227
+#: src/preferences.c:3279
 msgid "      Image directory (default) "
 msgstr "      Image directory (default) "
 
-#: src/preferences.c:3233
+#: src/preferences.c:3285
 msgid "      Backup/Restore directory (default) "
 msgstr "      Backup/Restore directory (default) "
 
-#: src/preferences.c:3239
+#: src/preferences.c:3291
 msgid "      Temp directory (do not remove) "
 msgstr "      Temp directory (do not remove) "
 
-#: src/preferences.c:3252
+#: src/preferences.c:3304
 msgid "The default directory for loading video clips from"
 msgstr "The default directory for loading video clips from"
 
-#: src/preferences.c:3277
+#: src/preferences.c:3329
 msgid "The default directory for saving encoded clips to"
 msgstr "The default directory for saving encoded clips to"
 
-#: src/preferences.c:3285
+#: src/preferences.c:3337
 msgid "The default directory for loading and saving audio"
 msgstr "The default directory for loading and saving audio"
 
-#: src/preferences.c:3293
+#: src/preferences.c:3345
 msgid "The default directory for saving frameshots to"
 msgstr "The default directory for saving frameshots to"
 
-#: src/preferences.c:3301
+#: src/preferences.c:3353
 msgid "The default directory for backing up/restoring single clips"
 msgstr "The default directory for backing up/restoring single clips"
 
-#: src/preferences.c:3309
+#: src/preferences.c:3361
 msgid "LiVES working directory."
 msgstr "LiVES working directory."
 
-#: src/preferences.c:3359
+#: src/preferences.c:3412
 msgid "Directories"
 msgstr "Directories"
 
-#: src/preferences.c:3374
+#: src/preferences.c:3427
 msgid "Warn if diskspace falls below: "
 msgstr "Warn if diskspace falls below: "
 
-#: src/preferences.c:3380 src/preferences.c:3394
+#: src/preferences.c:3433 src/preferences.c:3447
 msgid " MB [set to 0 to disable]"
 msgstr " MB [set to 0 to disable]"
 
-#: src/preferences.c:3389
+#: src/preferences.c:3442
 msgid "Diskspace critical level: "
 msgstr "Diskspace critical level: "
 
-#: src/preferences.c:3407
+#: src/preferences.c:3461
 msgid ""
 "Warn on Insert / Merge if _frame rate of clipboard does not match frame rate "
 "of selection"
@@ -8287,19 +8317,19 @@
 "Warn on Insert / Merge if _frame rate of clipboard does not match frame rate "
 "of selection"
 
-#: src/preferences.c:3417
+#: src/preferences.c:3471
 msgid "Warn on Open if file _size exceeds "
 msgstr "Warn on Open if file _size exceeds "
 
-#: src/preferences.c:3425
+#: src/preferences.c:3479
 msgid " MB"
 msgstr " MB"
 
-#: src/preferences.c:3432
+#: src/preferences.c:3486
 msgid "Show a warning before saving a se_t"
 msgstr "Show a warning before saving a se_t"
 
-#: src/preferences.c:3442
+#: src/preferences.c:3496
 #, fuzzy
 msgid ""
 "Show a warning if _mplayer/mplayer2, sox, composite or convert is not found "
@@ -8308,65 +8338,65 @@
 "Show a warning if _mplayer, sox, composite or convert is not found when "
 "LiVES is started."
 
-#: src/preferences.c:3452
+#: src/preferences.c:3506
 msgid "Show a warning if no _rendered effects are found at startup."
 msgstr "Show a warning if no _rendered effects are found at startup."
 
-#: src/preferences.c:3464
+#: src/preferences.c:3518
 msgid "Show a warning if no _encoder plugins are found at startup."
 msgstr "Show a warning if no _encoder plugins are found at startup."
 
-#: src/preferences.c:3474
+#: src/preferences.c:3528
 msgid "Show a warning if a _duplicate set name is entered."
 msgstr "Show a warning if a _duplicate set name is entered."
 
-#: src/preferences.c:3485
+#: src/preferences.c:3539
 msgid "When a set is loaded, warn if clips are missing from _layouts."
 msgstr "When a set is loaded, warn if clips are missing from _layouts."
 
-#: src/preferences.c:3495
+#: src/preferences.c:3550
 msgid "Warn if a clip used in a layout is about to be closed."
 msgstr "Warn if a clip used in a layout is about to be closed."
 
-#: src/preferences.c:3505
+#: src/preferences.c:3561
 msgid "Warn if frames used in a layout are about to be deleted."
 msgstr "Warn if frames used in a layout are about to be deleted."
 
-#: src/preferences.c:3515
+#: src/preferences.c:3572
 msgid "Warn if frames used in a layout are about to be shifted."
 msgstr "Warn if frames used in a layout are about to be shifted."
 
-#: src/preferences.c:3525
+#: src/preferences.c:3583
 msgid "Warn if frames used in a layout are about to be altered."
 msgstr "Warn if frames used in a layout are about to be altered."
 
-#: src/preferences.c:3535
+#: src/preferences.c:3594
 msgid "Warn if audio used in a layout is about to be deleted."
 msgstr "Warn if audio used in a layout is about to be deleted."
 
-#: src/preferences.c:3546
+#: src/preferences.c:3606
 msgid "Warn if audio used in a layout is about to be shifted."
 msgstr "Warn if audio used in a layout is about to be shifted."
 
-#: src/preferences.c:3556
+#: src/preferences.c:3617
 msgid "Warn if audio used in a layout is about to be altered."
 msgstr "Warn if audio used in a layout is about to be altered."
 
-#: src/preferences.c:3566
+#: src/preferences.c:3628
 msgid "Popup layout errors after clip changes."
 msgstr "Popup layout errors after clip changes."
 
-#: src/preferences.c:3577
+#: src/preferences.c:3639
 msgid "Warn if the layout has not been saved when leaving multitrack mode."
 msgstr "Warn if the layout has not been saved when leaving multitrack mode."
 
-#: src/preferences.c:3588
+#: src/preferences.c:3650
 msgid ""
 "Warn if multitrack has no audio channels, and a layout with audio is loaded."
 msgstr ""
 "Warn if multitrack has no audio channels, and a layout with audio is loaded."
 
-#: src/preferences.c:3598
+#: src/preferences.c:3660
 msgid ""
 "Warn if multitrack has audio channels, and your audio player is not \"jack\" "
 "or \"pulse audio\"."
@@ -8374,107 +8404,107 @@
 "Warn if multitrack has audio channels, and your audio player is not \"jack\" "
 "or \"pulse audio\"."
 
-#: src/preferences.c:3610
+#: src/preferences.c:3672
 msgid "Show info message after importing from firewire device."
 msgstr "Show info message after importing from firewire device."
 
-#: src/preferences.c:3626
+#: src/preferences.c:3688
 msgid "Show a warning before opening a yuv4mpeg stream (advanced)."
 msgstr "Show a warning before opening a yuv4mpeg stream (advanced)."
 
-#: src/preferences.c:3639
+#: src/preferences.c:3701
 msgid "Show a warning when multitrack is low on backup space."
 msgstr "Show a warning when multitrack is low on backup space."
 
-#: src/preferences.c:3650
+#: src/preferences.c:3713
 msgid "Show a warning advising cleaning of disk space after a crash."
 msgstr "Show a warning advising cleaning of disk space after a crash."
 
-#: src/preferences.c:3661
+#: src/preferences.c:3725
 msgid "Show a warning if unable to connect to pulseaudio player."
 msgstr "Show a warning if unable to connect to pulseaudio player."
 
-#: src/preferences.c:3673
+#: src/preferences.c:3737
 msgid "Show a warning before wiping a layout which has unsaved changes."
 msgstr ""
 
-#: src/preferences.c:3685
+#: src/preferences.c:3749
 msgid "Warnings"
 msgstr "Warnings"
 
-#: src/preferences.c:3703
+#: src/preferences.c:3767
 msgid "Midi synch (requires the files midistart and midistop)"
 msgstr "Midi synch (requires the files midistart and midistop)"
 
-#: src/preferences.c:3715
+#: src/preferences.c:3779
 msgid "When inserting/merging frames:  "
 msgstr "When inserting/merging frames:  "
 
-#: src/preferences.c:3719
+#: src/preferences.c:3783
 msgid "_Speed Up/Slow Down Insertion"
 msgstr "_Speed Up/Slow Down Insertion"
 
-#: src/preferences.c:3723
+#: src/preferences.c:3787
 msgid "_Resample Insertion"
 msgstr "_Resample Insertion"
 
-#: src/preferences.c:3730
+#: src/preferences.c:3794
 msgid "CD device           "
 msgstr "CD device           "
 
-#: src/preferences.c:3733
+#: src/preferences.c:3797
 msgid "LiVES can load audio tracks from this CD"
 msgstr "LiVES can load audio tracks from this CD"
 
-#: src/preferences.c:3746
+#: src/preferences.c:3813
 msgid "Default FPS        "
 msgstr "Default FPS        "
 
-#: src/preferences.c:3749
+#: src/preferences.c:3816
 msgid "Frames per second to use when none is specified"
 msgstr "Frames per second to use when none is specified"
 
-#: src/preferences.c:3757
+#: src/preferences.c:3825
 msgid "Misc"
 msgstr "Misc"
 
-#: src/preferences.c:3782
+#: src/preferences.c:3850
 msgid "New theme:           "
 msgstr "New theme:           "
 
-#: src/preferences.c:3800
+#: src/preferences.c:3867
 msgid "Themes"
 msgstr "Themes"
 
-#: src/preferences.c:3815
+#: src/preferences.c:3882
 msgid "Download bandwidth (Kb/s)       "
 msgstr "Download bandwidth (Kb/s)       "
 
-#: src/preferences.c:3823
+#: src/preferences.c:3890
 msgid "LiVES must be compiled without \"configure --disable-OSC\" to use OMC"
 msgstr "LiVES must be compiled without \"configure --disable-OSC\" to use OMC"
 
-#: src/preferences.c:3833
+#: src/preferences.c:3900
 msgid "OMC remote control enabled"
 msgstr "OMC remote control enabled"
 
-#: src/preferences.c:3841
+#: src/preferences.c:3908
 msgid "UDP port       "
 msgstr "UDP port       "
 
-#: src/preferences.c:3850
+#: src/preferences.c:3917
 msgid "Start OMC on startup"
 msgstr "Start OMC on startup"
 
-#: src/preferences.c:3870
+#: src/preferences.c:3937
 msgid "Streaming/Networking"
 msgstr "Streaming/Networking"
 
-#: src/preferences.c:3882
+#: src/preferences.c:3949
 msgid "Jack transport"
 msgstr "Jack transport"
 
-#: src/preferences.c:3886
+#: src/preferences.c:3953
 msgid ""
 "LiVES must be compiled with jack/transport.h and jack/jack.h present to use "
 "jack transport"
@@ -8482,43 +8512,43 @@
 "LiVES must be compiled with jack/transport.h and jack/jack.h present to use "
 "jack transport"
 
-#: src/preferences.c:3892
+#: src/preferences.c:3959
 msgid "Jack _transport config file"
 msgstr "Jack _transport config file"
 
-#: src/preferences.c:3899 src/preferences.c:3989
+#: src/preferences.c:3967 src/preferences.c:4058
 msgid "Start _server on LiVES startup"
 msgstr "Start _server on LiVES startup"
 
-#: src/preferences.c:3911
+#: src/preferences.c:3979
 msgid "Jack transport _master (start and stop)"
 msgstr "Jack transport _master (start and stop)"
 
-#: src/preferences.c:3921
+#: src/preferences.c:3989
 msgid "Jack transport _client (start and stop)"
 msgstr "Jack transport _client (start and stop)"
 
-#: src/preferences.c:3935
+#: src/preferences.c:4003
 msgid "Jack transport sets start position"
 msgstr "Jack transport sets start position"
 
-#: src/preferences.c:3952
+#: src/preferences.c:4020
 msgid "Jack transport timebase slave"
 msgstr "Jack transport timebase slave"
 
-#: src/preferences.c:3963
+#: src/preferences.c:4031
 msgid "(See also Playback -> Audio follows video rate/direction)"
 msgstr "(See also Playback -> Audio follows video rate/direction)"
 
-#: src/preferences.c:3971
+#: src/preferences.c:4039
 msgid "Jack audio"
 msgstr "Jack audio"
 
-#: src/preferences.c:3975
+#: src/preferences.c:4043
 msgid "LiVES must be compiled with jack/jack.h present to use jack audio"
 msgstr "LiVES must be compiled with jack/jack.h present to use jack audio"
 
-#: src/preferences.c:3978
+#: src/preferences.c:4046
 msgid ""
 "You MUST set the audio player to \"jack\" in the Playback tab to use jack "
 "audio"
@@ -8526,75 +8556,75 @@
 "You MUST set the audio player to \"jack\" in the Playback tab to use jack "
 "audio"
 
-#: src/preferences.c:3984
+#: src/preferences.c:4052
 msgid "Jack _audio server config file"
 msgstr "Jack _audio server config file"
 
-#: src/preferences.c:3996
+#: src/preferences.c:4065
 msgid "Play audio even when transport is _paused"
 msgstr "Play audio even when transport is _paused"
 
-#: src/preferences.c:4008
+#: src/preferences.c:4077
 msgid "Automatically connect to System Out ports when 'playing' External Audio"
 msgstr ""
 
-#: src/preferences.c:4021
+#: src/preferences.c:4090
 msgid "Jack Integration"
 msgstr "Jack Integration"
 
-#: src/preferences.c:4035
+#: src/preferences.c:4104
 msgid "Events to respond to:"
 msgstr "Events to respond to:"
 
-#: src/preferences.c:4044
+#: src/preferences.c:4113
 msgid "_Joystick events"
 msgstr "_Joystick events"
 
-#: src/preferences.c:4051
+#: src/preferences.c:4120
 msgid "_Joystick device"
 msgstr "_Joystick device"
 
-#: src/preferences.c:4053
+#: src/preferences.c:4122
 msgid "The joystick device, e.g. /dev/input/js0"
 msgstr "The joystick device, e.g. /dev/input/js0"
 
-#: src/preferences.c:4071
+#: src/preferences.c:4142
 msgid "_MIDI events"
 msgstr "_MIDI events"
 
-#: src/preferences.c:4080
+#: src/preferences.c:4151
 msgid "Use _ALSA MIDI (recommended)"
 msgstr "Use _ALSA MIDI (recommended)"
 
-#: src/preferences.c:4082
+#: src/preferences.c:4153
 msgid "Create an ALSA MIDI port which other MIDI devices can be connected to"
 msgstr "Create an ALSA MIDI port which other MIDI devices can be connected to"
 
-#: src/preferences.c:4090
+#: src/preferences.c:4162
 msgid "Use _raw MIDI"
 msgstr "Use _raw MIDI"
 
-#: src/preferences.c:4092
+#: src/preferences.c:4164
 msgid "Read directly from the MIDI device"
 msgstr "Read directly from the MIDI device"
 
-#: src/preferences.c:4104
+#: src/preferences.c:4177
 msgid "_MIDI device"
 msgstr "_MIDI device"
 
-#: src/preferences.c:4106
+#: src/preferences.c:4179
 msgid "The MIDI device, e.g. /dev/input/midi0"
 msgstr "The MIDI device, e.g. /dev/input/midi0"
 
-#: src/preferences.c:4118
+#: src/preferences.c:4193
 msgid "Advanced"
 msgstr "Advanced"
 
-#: src/preferences.c:4124
+#: src/preferences.c:4199
 msgid "MIDI check _rate"
 msgstr "MIDI check _rate"
 
-#: src/preferences.c:4127
+#: src/preferences.c:4203
 msgid ""
 "Number of MIDI checks per keyboard tick. Increasing this may improve MIDI "
 "responsiveness, but may slow down playback."
@@ -8602,23 +8632,23 @@
 "Number of MIDI checks per keyboard tick. Increasing this may improve MIDI "
 "responsiveness, but may slow down playback."
 
-#: src/preferences.c:4134
+#: src/preferences.c:4211
 msgid "MIDI repeat"
 msgstr "MIDI repeat"
 
-#: src/preferences.c:4137
+#: src/preferences.c:4214
 msgid "Number of non-reads allowed between succesive reads."
 msgstr "Number of non-reads allowed between succesive reads."
 
-#: src/preferences.c:4140
+#: src/preferences.c:4218
 msgid "(Warning: setting this value too high can slow down playback.)"
 msgstr "(Warning: setting this value too high can slow down playback.)"
 
-#: src/preferences.c:4159
+#: src/preferences.c:4237
 msgid "MIDI/Joystick learner"
 msgstr "MIDI/Joystick learner"
 
-#: src/preferences.c:4499
+#: src/preferences.c:4679
 msgid ""
 "\n"
 "LiVES will now shut down. You need to restart it for the directory change to "
@@ -8630,7 +8660,7 @@
 "take effect.\n"
 "Click OK to continue.\n"
 
-#: src/preferences.c:4523
+#: src/preferences.c:4703
 msgid ""
 "For the directory change to take effect LiVES will restart when preferences "
 "dialog closes."
@@ -8638,63 +8668,63 @@
 "For the directory change to take effect, LiVES will restart when the "
 "Preferences dialogue closes."
 
-#: src/preferences.c:4527
+#: src/preferences.c:4707
 msgid "Theme changes will not take effect until the next time you start LiVES."
 msgstr ""
 "Theme changes will not take effect until the next time you start LiVES."
 
-#: src/preferences.c:4531
+#: src/preferences.c:4711
 msgid "Jack options will not take effect until the next time you start LiVES."
 msgstr "Jack options will not take effect until the next time you start LiVES."
 
-#: src/osc.c:2585
+#: src/osc.c:2616
 #, c-format
 msgid "Syncing to external framerate of %.8f frames per second.\n"
 msgstr "Syncing to external framerate of %.8f frames per second.\n"
 
-#: src/osc.c:6746
+#: src/osc.c:6938
 msgid "Cannot initialize OSC receiver\n"
 msgstr "Cannot initialise OSC receiver\n"
 
-#: src/osc.c:6770
+#: src/osc.c:6961
 #, c-format
 msgid "WARNING: Cannot start OSC server at UDP port %d\n"
 msgstr "WARNING: Cannot start OSC server at UDP port %d\n"
 
-#: src/osc.c:6775
+#: src/osc.c:6963
 #, c-format
 msgid "Started OSC server at UDP port %d\n"
 msgstr "Started OSC server at UDP port %d\n"
 
-#: src/osc.c:6890
+#: src/osc.c:7076
 #, c-format
 msgid "Cannot start OSC/UDP server at port %d \n"
 msgstr "Cannot start OSC/UDP server at port %d \n"
 
-#: src/resample.c:125 src/resample.c:304
+#: src/resample.c:131 src/resample.c:305
 #, c-format
 msgid "Resizing frames 1 to %d"
 msgstr "Resizing frames 1 to %d"
 
-#: src/resample.c:140 src/resample.c:318
+#: src/resample.c:145 src/resample.c:318
 #, c-format
 msgid "Resizing/letterboxing frames 1 to %d"
 msgstr "Resizing/letterboxing frames 1 to %d"
 
-#: src/resample.c:361 src/resample.c:385
+#: src/resample.c:360 src/resample.c:384
 msgid "Resize"
 msgstr "Resize"
 
-#: src/resample.c:395
+#: src/resample.c:394
 msgid "Resample/Resize"
 msgstr "Resample/Resize"
 
-#: src/resample.c:680
+#: src/resample.c:676
 #, c-format
 msgid "Length of video is now %d frames.\n"
 msgstr "Length of video is now %d frames.\n"
 
-#: src/resample.c:745
+#: src/resample.c:737
 msgid ""
 "\n"
 "\n"
@@ -8704,146 +8734,146 @@
 "\n"
 "New rate must be greater than 0\n"
 
-#: src/resample.c:797 src/resample.c:813
+#: src/resample.c:788 src/resample.c:803
 msgid "Resampling audio"
 msgstr "Resampling audio"
 
-#: src/resample.c:831
+#: src/resample.c:821
 msgid "LiVES was unable to resample the audio as requested.\n"
 msgstr "LiVES was unable to resample the audio as requested.\n"
 
-#: src/resample.c:833 src/resample.c:837
+#: src/resample.c:823 src/resample.c:827
 msgid "Resample Audio"
 msgstr "Resample Audio"
 
-#: src/resample.c:845
+#: src/resample.c:835
 #, c-format
 msgid "Audio was resampled to %d Hz, %d channels, %d bit"
 msgstr "Audio was resampled to %d Hz, %d channels, %d bit"
 
-#: src/resample.c:1034
+#: src/resample.c:1016
 #, c-format
 msgid "Resampling video at %.8f frames per second..."
 msgstr "Resampling video at %.8f frames per second..."
 
-#: src/resample.c:1037
+#: src/resample.c:1018
 #, c-format
 msgid "Resampling video at %.3f frames per second..."
 msgstr "Resampling video at %.3f frames per second..."
 
-#: src/resample.c:1068
+#: src/resample.c:1049
 msgid "Reordering error !\n"
 msgstr "Reordering error !\n"
 
-#: src/resample.c:1079
+#: src/resample.c:1060
 msgid "Resample"
 msgstr "Resample"
 
-#: src/resample.c:1192
+#: src/resample.c:1173
 msgid "LiVES: - Resample Audio"
 msgstr "LiVES: - Resample Audio"
 
-#: src/resample.c:1195
+#: src/resample.c:1175
 msgid "LiVES: - Insert Silence"
 msgstr "LiVES: - Insert Silence"
 
-#: src/resample.c:1198
+#: src/resample.c:1177
 msgid "LiVES: - New Clip Audio"
 msgstr "LiVES: - New Clip Audio"
 
-#: src/resample.c:1201
+#: src/resample.c:1179
 msgid "LiVES: - External Clip Settings"
 msgstr "LiVES: - External Clip Settings"
 
-#: src/resample.c:1238 src/resample.c:1358
+#: src/resample.c:1215 src/resample.c:1332
 msgid "Rate (Hz) "
 msgstr "Rate (Hz) "
 
-#: src/resample.c:1245 src/resample.c:1372
+#: src/resample.c:1222 src/resample.c:1346
 msgid "Channels"
 msgstr ""
 
-#: src/resample.c:1252
+#: src/resample.c:1229
 msgid "Sample Size "
 msgstr ""
 
-#: src/resample.c:1268 src/resample.c:1425
+#: src/resample.c:1245 src/resample.c:1399
 msgid "Signed"
 msgstr "Signed"
 
-#: src/resample.c:1274 src/resample.c:1435
+#: src/resample.c:1251 src/resample.c:1409
 msgid "Unsigned"
 msgstr "Unsigned"
 
-#: src/resample.c:1297 src/resample.c:1460
+#: src/resample.c:1273 src/resample.c:1433
 msgid "Little Endian"
 msgstr "Little Endian"
 
-#: src/resample.c:1303 src/resample.c:1468
+#: src/resample.c:1279 src/resample.c:1441
 msgid "Big Endian"
 msgstr "Big Endian"
 
-#: src/resample.c:1315
+#: src/resample.c:1290
 msgid "Current"
 msgstr "Current"
 
-#: src/resample.c:1340
+#: src/resample.c:1315
 msgid "_Enable audio"
 msgstr "_Enable audio"
 
-#: src/resample.c:1372
+#: src/resample.c:1346
 msgid "_Channels"
 msgstr ""
 
-#: src/resample.c:1394
+#: src/resample.c:1368
 msgid "_Sample Size"
 msgstr ""
 
-#: src/resample.c:1394
+#: src/resample.c:1368
 msgid "Sample Size"
 msgstr ""
 
-#: src/resample.c:1489
+#: src/resample.c:1461
 msgid "New"
 msgstr "New"
 
-#: src/resample.c:1512
+#: src/resample.c:1484
 msgid "_Frames Per Second "
 msgstr "_Frames Per Second "
 
-#: src/resample.c:1530
+#: src/resample.c:1502
 msgid "Record for maximum:  "
 msgstr "Record for maximum:  "
 
-#: src/resample.c:1533
+#: src/resample.c:1505
 msgid " hours  "
 msgstr " hours  "
 
-#: src/resample.c:1536
+#: src/resample.c:1508
 msgid " minutes  "
 msgstr " minutes  "
 
-#: src/resample.c:1538
+#: src/resample.c:1510
 msgid " seconds  "
 msgstr " seconds  "
 
-#: src/resample.c:1545
+#: src/resample.c:1517
 msgid "Unlimited"
 msgstr "Unlimited"
 
-#: src/resample.c:1561
+#: src/resample.c:1533
 msgid "Click OK to begin recording, or Cancel to quit."
 msgstr "Click OK to begin recording, or Cancel to quit."
 
-#: src/resample.c:1670
+#: src/resample.c:1638
 msgid "LiVES: - Change playback speed"
 msgstr "LiVES: - Change playback speed"
 
-#: src/resample.c:1673
+#: src/resample.c:1640
 msgid "LiVES: - Resample Video"
 msgstr "LiVES: - Resample Video"
 
-#: src/resample.c:1696
+#: src/resample.c:1663
 #, c-format
 msgid ""
 "\n"
@@ -8860,7 +8890,7 @@
 "Please enter the desired playback speed\n"
 "in _frames per second"
 
-#: src/resample.c:1701
+#: src/resample.c:1667
 #, c-format
 msgid ""
 "\n"
@@ -8877,15 +8907,15 @@
 "Please enter the _resampled rate\n"
 "in frames per second"
 
-#: src/resample.c:1723
+#: src/resample.c:1688
 msgid "OR enter the desired clip length in _seconds"
 msgstr "OR enter the desired clip length in _seconds"
 
-#: src/resample.c:1745
+#: src/resample.c:1710
 msgid "Change the _audio speed as well"
 msgstr "Change the _audio speed as well"
 
-#: src/resample.c:1846
+#: src/resample.c:1810
 msgid ""
 "\n"
 "Speeding up the clip will cause missing frames in some multitrack layouts.\n"
@@ -8895,7 +8925,7 @@
 "Speeding up the clip will cause missing frames in some multitrack layouts.\n"
 "Are you sure you wish to change the speed ?\n"
 
-#: src/resample.c:1863
+#: src/resample.c:1829
 msgid ""
 "\n"
 "Speeding up the clip will cause missing audio in some multitrack layouts.\n"
@@ -8905,7 +8935,7 @@
 "Speeding up the clip will cause missing audio in some multitrack layouts.\n"
 "Are you sure you wish to change the speed ?\n"
 
-#: src/resample.c:1878
+#: src/resample.c:1847
 msgid ""
 "\n"
 "Changing the speed will cause frames to shift in some multitrack layouts.\n"
@@ -8915,7 +8945,7 @@
 "Changing the speed will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 
-#: src/resample.c:1892
+#: src/resample.c:1863
 msgid ""
 "\n"
 "Changing the speed will cause audio to shift in some multitrack layouts.\n"
@@ -8925,33 +8955,33 @@
 "Changing the speed will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 
-#: src/resample.c:1938
+#: src/resample.c:1911
 msgid "Speed Change"
 msgstr "Speed Change"
 
-#: src/resample.c:1947
+#: src/resample.c:1920
 #, c-format
 msgid "Changed playback speed to %.3f frames per second and audio to %d Hz.\n"
 msgstr "Changed playback speed to %.3f frames per second and audio to %d Hz.\n"
 
-#: src/resample.c:1950
+#: src/resample.c:1922
 #, c-format
 msgid "Changed playback speed to %.3f frames per second.\n"
 msgstr "Changed playback speed to %.3f frames per second.\n"
 
-#: src/resample.c:2035
+#: src/resample.c:2006
 msgid "Resampling video"
 msgstr "Resampling video"
 
-#: src/resample.c:2042 src/resample.c:2160 src/resample.c:2182
+#: src/resample.c:2012 src/resample.c:2127 src/resample.c:2148
 msgid "Resampling clipboard video"
 msgstr "Resampling clipboard video"
 
-#: src/resample.c:2047
+#: src/resample.c:2016
 msgid "Reordering frames"
 msgstr "Reordering frames"
 
-#: src/resample.c:2056
+#: src/resample.c:2025
 msgid ""
 "\n"
 "\n"
@@ -8961,20 +8991,20 @@
 "\n"
 "LiVES was unable to reorder the frames."
 
-#: src/resample.c:2104
+#: src/resample.c:2071
 msgid "Deordering frames"
 msgstr "Deordering frames"
 
-#: src/resample.c:2199
+#: src/resample.c:2165
 msgid "resampling error..."
 msgstr "resampling error..."
 
-#: src/rte_window.c:85 src/rte_window.c:1708
+#: src/rte_window.c:124 src/rte_window.c:1709
 #, c-format
 msgid "Type: %s"
 msgstr "Type: %s"
 
-#: src/rte_window.c:112
+#: src/rte_window.c:150
 msgid ""
 "\n"
 "\n"
@@ -8990,7 +9020,7 @@
 "Are you sure ?\n"
 "\n"
 
-#: src/rte_window.c:426
+#: src/rte_window.c:460
 msgid ""
 "\n"
 "\n"
@@ -9002,12 +9032,12 @@
 "Click 'OK' to save this keymap as your default\n"
 "\n"
 
-#: src/rte_window.c:432
+#: src/rte_window.c:466
 #, c-format
 msgid "Saving keymap to %s\n"
 msgstr "Saving keymap to %s\n"
 
-#: src/rte_window.c:439
+#: src/rte_window.c:471
 #, c-format
 msgid ""
 "\n"
@@ -9016,7 +9046,7 @@
 "\n"
 "Updating keymap file %s..."
 
-#: src/rte_window.c:446
+#: src/rte_window.c:477
 #, c-format
 msgid ""
 "\n"
@@ -9031,12 +9061,12 @@
 "%s\n"
 "Error was %s\n"
 
-#: src/rte_window.c:526
+#: src/rte_window.c:556
 #, c-format
 msgid "Saving real time effect defaults to %s..."
 msgstr "Saving real time effect defaults to %s..."
 
-#: src/rte_window.c:535
+#: src/rte_window.c:563
 #, c-format
 msgid ""
 "\n"
@@ -9051,22 +9081,22 @@
 "%s\n"
 "Error code %d\n"
 
-#: src/rte_window.c:632
+#: src/rte_window.c:657
 #, c-format
 msgid "Loading real time effect defaults from %s..."
 msgstr "Loading real time effect defaults from %s..."
 
-#: src/rte_window.c:681
+#: src/rte_window.c:701
 #, c-format
 msgid "Loading generator default sizes from %s..."
 msgstr "Loading generator default sizes from %s..."
 
-#: src/rte_window.c:1306
+#: src/rte_window.c:1319
 #, c-format
 msgid "Loading default keymap from %s..."
 msgstr "Loading default keymap from %s..."
 
-#: src/rte_window.c:1329
+#: src/rte_window.c:1339
 #, c-format
 msgid ""
 "\n"
@@ -9081,27 +9111,27 @@
 "%s\n"
 "Error code %d\n"
 
-#: src/rte_window.c:1403
+#: src/rte_window.c:1412
 #, c-format
 msgid "Invalid line %d in %s\n"
 msgstr "Invalid line %d in %s\n"
 
-#: src/rte_window.c:1483
+#: src/rte_window.c:1490
 #, c-format
 msgid "Invalid key %d in %s\n"
 msgstr "Invalid key %d in %s\n"
 
-#: src/rte_window.c:1498
+#: src/rte_window.c:1505
 #, c-format
 msgid "Invalid effect %s in %s\n"
 msgstr "Invalid effect %s in %s\n"
 
-#: src/rte_window.c:1517
+#: src/rte_window.c:1524
 #, c-format
 msgid "Unknown effect %s in %s\n"
 msgstr "Unknown effect %s in %s\n"
 
-#: src/rte_window.c:1535
+#: src/rte_window.c:1542
 #, c-format
 msgid ""
 "This version of LiVES cannot mix generators/non-generators on the same key "
@@ -9110,21 +9140,21 @@
 "This version of LiVES cannot mix generators/non-generators on the same key "
 "(%d) !\n"
 
-#: src/rte_window.c:1547
+#: src/rte_window.c:1554
 #, c-format
 msgid "Too many effects bound to key %d.\n"
 msgstr "Too many effects bound to key %d.\n"
 
-#: src/rte_window.c:1587
+#: src/rte_window.c:1593
 msgid "update required.\n"
 msgstr "update required.\n"
 
-#: src/rte_window.c:1603
+#: src/rte_window.c:1607
 #, c-format
 msgid "Loading data connection map from %s..."
 msgstr ""
 
-#: src/rte_window.c:1612
+#: src/rte_window.c:1614
 msgid ""
 "\n"
 "\n"
@@ -9136,41 +9166,41 @@
 "Some effects could not be located.\n"
 "\n"
 
-#: src/rte_window.c:1691
+#: src/rte_window.c:1692
 #, c-format
 msgid "LiVES: Information for %s"
 msgstr "LiVES: Information for %s"
 
-#: src/rte_window.c:1704
+#: src/rte_window.c:1705
 #, c-format
 msgid "Effect name: %s"
 msgstr "Effect name: %s"
 
-#: src/rte_window.c:1712
+#: src/rte_window.c:1713
 #, c-format
 msgid "Plugin name: %s"
 msgstr "Plugin name: %s"
 
-#: src/rte_window.c:1716
+#: src/rte_window.c:1717
 #, c-format
 msgid "Author: %s"
 msgstr "Author: %s"
 
-#: src/rte_window.c:1721
+#: src/rte_window.c:1722
 #, c-format
 msgid "and: %s"
 msgstr ""
 
-#: src/rte_window.c:1726
+#: src/rte_window.c:1727
 #, c-format
 msgid "Version: %d"
 msgstr "Version: %d"
 
-#: src/rte_window.c:1734
+#: src/rte_window.c:1735
 msgid "Description: "
 msgstr "Description: "
 
-#: src/rte_window.c:1960
+#: src/rte_window.c:1963
 msgid ""
 "\n"
 "\n"
@@ -9184,69 +9214,69 @@
 "generators on the same key.\n"
 "\n"
 
-#: src/rte_window.c:2024
+#: src/rte_window.c:2027
 #, c-format
 msgid "LiVES could not locate the effect %s.\n"
 msgstr "LiVES could not locate the effect %s.\n"
 
-#: src/rte_window.c:2225
+#: src/rte_window.c:2216
 msgid "LiVES: Real time effect mapping"
 msgstr "LiVES: Real time effect mapping"
 
-#: src/rte_window.c:2257
+#: src/rte_window.c:2248
 #, c-format
 msgid "Ctrl-%d"
 msgstr "Ctrl-%d"
 
-#: src/rte_window.c:2264
+#: src/rte_window.c:2255
 msgid "Key active"
 msgstr "Key active"
 
-#: src/rte_window.c:2279
+#: src/rte_window.c:2271
 msgid "Key grab"
 msgstr "Key grab"
 
-#: src/rte_window.c:2280
+#: src/rte_window.c:2272
 msgid "Grab keyboard for this effect key"
 msgstr "Grab keyboard for this effect key"
 
-#: src/rte_window.c:2290
+#: src/rte_window.c:2283
 msgid "_Clear all effects"
 msgstr "_Clear all effects"
 
-#: src/rte_window.c:2304
+#: src/rte_window.c:2297
 msgid "Mode active"
 msgstr "Mode active"
 
-#: src/rte_window.c:2314 src/multitrack.c:8568
+#: src/rte_window.c:2307 src/multitrack.c:8762
 msgid "Info"
 msgstr "Info"
 
-#: src/rte_window.c:2315
+#: src/rte_window.c:2308
 msgid "Set Parameters"
 msgstr "Set Parameters"
 
-#: src/rte_window.c:2316
+#: src/rte_window.c:2309
 msgid "Set Connections"
 msgstr ""
 
-#: src/rte_window.c:2317
+#: src/rte_window.c:2310
 msgid "Clear"
 msgstr "Clear"
 
-#: src/rte_window.c:2326
+#: src/rte_window.c:2319
 msgid "Effect name:"
 msgstr "Effect name:"
 
-#: src/rte_window.c:2391
+#: src/rte_window.c:2384
 msgid "_Save as default keymap"
 msgstr "_Save as default keymap"
 
-#: src/rte_window.c:2396
+#: src/rte_window.c:2389
 msgid "_Load default keymap"
 msgstr "_Load default keymap"
 
-#: src/rte_window.c:2840
+#: src/rte_window.c:2833
 #, c-format
 msgid ""
 "Unable to create default keymap file: %s\n"
@@ -9306,7 +9336,7 @@
 msgid "none\n"
 msgstr "none\n"
 
-#: src/lives-yuv4mpeg.c:494
+#: src/lives-yuv4mpeg.c:493
 #, c-format
 msgid ""
 "Unable to set display framerate to %.3f fps.\n"
@@ -9315,73 +9345,73 @@
 "Unable to set display framerate to %.3f fps.\n"
 "\n"
 
-#: src/lives-yuv4mpeg.c:503
+#: src/lives-yuv4mpeg.c:502
 #, c-format
 msgid "Unable to open yuv4mpeg out stream %s\n"
 msgstr "Unable to open yuv4mpeg out stream %s\n"
 
-#: src/lives-yuv4mpeg.c:628
+#: src/lives-yuv4mpeg.c:626
 #, c-format
 msgid "TV card %d"
 msgstr "TV card %d"
 
-#: src/lives-yuv4mpeg.c:713
+#: src/lives-yuv4mpeg.c:710
 #, c-format
 msgid "Opened TV card %d (%s)"
 msgstr "Opened TV card %d (%s)"
 
-#: src/lives-yuv4mpeg.c:760
+#: src/lives-yuv4mpeg.c:757
 #, c-format
 msgid "Firewire card %d"
 msgstr "Firewire card %d"
 
-#: src/lives-yuv4mpeg.c:796
+#: src/lives-yuv4mpeg.c:793
 #, c-format
 msgid "Opened firewire card %d"
 msgstr "Opened firewire card %d"
 
-#: src/multitrack.c:666
+#: src/multitrack.c:736
 msgid "Auto backup"
 msgstr "Auto backup"
 
-#: src/multitrack.c:868
+#: src/multitrack.c:935
 msgid "Backing audio"
 msgstr "Backing audio"
 
-#: src/multitrack.c:1435
+#: src/multitrack.c:1515
 #, c-format
 msgid "%s : parameters for %s"
 msgstr ""
 
-#: src/multitrack.c:1809 src/multitrack.c:3483
+#: src/multitrack.c:1881 src/multitrack.c:3635
 #, c-format
 msgid "Current track: %s (layer %d)\n"
 msgstr "Current track: %s (layer %d)\n"
 
-#: src/multitrack.c:1813 src/multitrack.c:3484
+#: src/multitrack.c:1885 src/multitrack.c:3637
 msgid "Current track: Backing audio\n"
 msgstr "Current track: Backing audio\n"
 
-#: src/multitrack.c:1814
+#: src/multitrack.c:1886
 #, c-format
 msgid "Current track: Layer %d audio\n"
 msgstr "Current track: Layer %d audio\n"
 
-#: src/multitrack.c:1817
+#: src/multitrack.c:1889
 #, c-format
 msgid "%.2f sec.\n"
 msgstr "%.2f sec.\n"
 
-#: src/multitrack.c:1822 src/multitrack.c:3490
+#: src/multitrack.c:1894 src/multitrack.c:3643
 #, c-format
 msgid "Source: %s"
 msgstr "Source: %s"
 
-#: src/multitrack.c:1825 src/multitrack.c:3492
+#: src/multitrack.c:1897 src/multitrack.c:3645
 msgid "Right click for context menu.\n"
 msgstr "Right click for context menu.\n"
 
-#: src/multitrack.c:1827
+#: src/multitrack.c:1899
 msgid ""
 "Double click on a block\n"
 "to select it."
@@ -9389,7 +9419,7 @@
 "Double click on a block\n"
 "to select it."
 
-#: src/multitrack.c:3312
+#: src/multitrack.c:3452
 msgid ""
 "\n"
 "\n"
@@ -9403,7 +9433,7 @@
 "in the timeline by\n"
 "right or double clicking on it.\n"
 
-#: src/multitrack.c:3315
+#: src/multitrack.c:3455
 msgid ""
 "\n"
 "\n"
@@ -9415,7 +9445,7 @@
 "No effect selected.\n"
 "Select an effect in FX stack first, to view its parameters.\n"
 
-#: src/multitrack.c:3318
+#: src/multitrack.c:3458
 msgid ""
 "\n"
 "\n"
@@ -9425,7 +9455,7 @@
 "\n"
 "No clips loaded.\n"
 
-#: src/multitrack.c:3321
+#: src/multitrack.c:3462
 msgid ""
 "You must select two video tracks\n"
 "and a time region\n"
@@ -9441,7 +9471,7 @@
 "Alternately, you can enable Autotransitions from the Effects menu,\n"
 "before inserting clips into the timeline."
 
-#: src/multitrack.c:3324
+#: src/multitrack.c:3465
 msgid ""
 "\n"
 "\n"
@@ -9455,12 +9485,12 @@
 "and a time region\n"
 "to apply compositors.\n"
 
-#: src/multitrack.c:3487
+#: src/multitrack.c:3640
 #, c-format
 msgid "%.2f sec. to %.2f sec.\n"
 msgstr "%.2f sec. to %.2f sec.\n"
 
-#: src/multitrack.c:3493
+#: src/multitrack.c:3646
 msgid ""
 "Single click on timeline\n"
 "to select a frame.\n"
@@ -9468,12 +9498,12 @@
 "Single click on timeline\n"
 "to select a frame.\n"
 
-#: src/multitrack.c:3711 src/multitrack.c:6790
+#: src/multitrack.c:3858 src/multitrack.c:6972
 #, c-format
 msgid "%s [unstable]"
 msgstr "%s [unstable]"
 
-#: src/multitrack.c:3822
+#: src/multitrack.c:3973
 msgid ""
 "You can click and drag\n"
 "below the timeline"
@@ -9481,173 +9511,173 @@
 "You can click and drag\n"
 "below the timeline"
 
-#: src/multitrack.c:3823
+#: src/multitrack.c:3974
 msgid "to select a time region.\n"
 msgstr "to select a time region.\n"
 
-#: src/multitrack.c:3985
+#: src/multitrack.c:4137
 msgid "LiVES: Selected clip"
 msgstr "LiVES: Selected clip"
 
-#: src/multitrack.c:3993
+#: src/multitrack.c:4145
 msgid "_Adjust start and end points"
 msgstr "_Adjust start and end points"
 
-#: src/multitrack.c:4002
+#: src/multitrack.c:4154
 msgid "_Edit/encode in clip editor"
 msgstr "_Edit/encode in clip editor"
 
-#: src/multitrack.c:4009
+#: src/multitrack.c:4161
 msgid "_Show clip information"
 msgstr "_Show clip information"
 
-#: src/multitrack.c:4016
+#: src/multitrack.c:4168
 msgid "_Close this clip"
 msgstr "_Close this clip"
 
-#: src/multitrack.c:4236
+#: src/multitrack.c:4388
 msgid "Audio mixer (ctrl-m)"
 msgstr "Audio mixer (ctrl-m)"
 
-#: src/multitrack.c:4336
+#: src/multitrack.c:4488
 msgid "Single click on timeline"
 msgstr "Single click on timeline"
 
-#: src/multitrack.c:4337
+#: src/multitrack.c:4489
 msgid "to select a frame."
 msgstr "to select a frame."
 
-#: src/multitrack.c:4338
+#: src/multitrack.c:4490
 msgid "Double click or right click on timeline"
 msgstr "Double click or right click on timeline"
 
-#: src/multitrack.c:4339
+#: src/multitrack.c:4491
 msgid "to select a block."
 msgstr "to select a block."
 
-#: src/multitrack.c:4340
+#: src/multitrack.c:4492
 msgid "Clips can be dragged"
 msgstr "Clips can be dragged"
 
-#: src/multitrack.c:4341
+#: src/multitrack.c:4493
 msgid "onto the timeline."
 msgstr "onto the timeline."
 
-#: src/multitrack.c:4343
+#: src/multitrack.c:4495
 msgid "Mouse mode is: Move"
 msgstr "Mouse mode is: Move"
 
-#: src/multitrack.c:4344
+#: src/multitrack.c:4496
 msgid "clips can be moved around."
 msgstr "clips can be moved around."
 
-#: src/multitrack.c:4349
+#: src/multitrack.c:4500
 msgid "Mouse mode is: Select."
 msgstr "Mouse mode is: Select."
 
-#: src/multitrack.c:4350
+#: src/multitrack.c:4501
 msgid "Drag with mouse on timeline"
 msgstr "Drag with mouse on timeline"
 
-#: src/multitrack.c:4351
+#: src/multitrack.c:4502
 msgid "to select tracks and time."
 msgstr "to select tracks and time."
 
-#: src/multitrack.c:4362
+#: src/multitrack.c:4509
 msgid "_Insert mode: Normal"
 msgstr "_Insert mode: Normal"
 
-#: src/multitrack.c:4378
+#: src/multitrack.c:4537
 msgid "_Mouse mode: Move"
 msgstr "_Mouse mode: Move"
 
-#: src/multitrack.c:4382
+#: src/multitrack.c:4540
 msgid "_Mouse mode: Select"
 msgstr "_Mouse mode: Select"
 
-#: src/multitrack.c:4405 src/multitrack.c:7925
+#: src/multitrack.c:4563 src/multitrack.c:8104
 msgid "Gravity: Normal"
 msgstr ""
 
-#: src/multitrack.c:4409
+#: src/multitrack.c:4565
 msgid "Gravity: Left"
 msgstr ""
 
-#: src/multitrack.c:4414
+#: src/multitrack.c:4569
 msgid "Gravity: Right"
 msgstr ""
 
-#: src/multitrack.c:4416
+#: src/multitrack.c:4570
 msgid "Close _last gap(s) in selected tracks/time"
 msgstr "Close _last gap(s) in selected tracks/time"
 
-#: src/multitrack.c:4419
+#: src/multitrack.c:4572
 msgid "Close _first gap(s) in selected tracks/time"
 msgstr "Close _first gap(s) in selected tracks/time"
 
-#: src/multitrack.c:4458
+#: src/multitrack.c:4627
 msgid "Close gaps"
 msgstr "Close gaps"
 
-#: src/multitrack.c:4460
+#: src/multitrack.c:4629
 msgid "Move block"
 msgstr "Move block"
 
-#: src/multitrack.c:4462
+#: src/multitrack.c:4631
 msgid "Move audio block"
 msgstr "Move audio block"
 
-#: src/multitrack.c:4464
+#: src/multitrack.c:4633
 msgid "Delete block"
 msgstr "Delete block"
 
-#: src/multitrack.c:4466
+#: src/multitrack.c:4635
 msgid "Delete audio block"
 msgstr "Delete audio block"
 
-#: src/multitrack.c:4468
+#: src/multitrack.c:4637
 msgid "Split tracks"
 msgstr "Split tracks"
 
-#: src/multitrack.c:4470
+#: src/multitrack.c:4639
 msgid "Split block"
 msgstr "Split block"
 
-#: src/multitrack.c:4473
+#: src/multitrack.c:4642
 #, c-format
 msgid "Apply %s"
 msgstr "Apply %s"
 
-#: src/multitrack.c:4478
+#: src/multitrack.c:4647
 #, c-format
 msgid "Delete %s"
 msgstr "Delete %s"
 
-#: src/multitrack.c:4482
+#: src/multitrack.c:4651
 msgid "Insert block"
 msgstr "Insert block"
 
-#: src/multitrack.c:4484
+#: src/multitrack.c:4653
 msgid "Insert gap"
 msgstr "Insert gap"
 
-#: src/multitrack.c:4486
+#: src/multitrack.c:4655
 msgid "Insert audio block"
 msgstr "Insert audio block"
 
-#: src/multitrack.c:4488
+#: src/multitrack.c:4657
 msgid "Effect order change"
 msgstr "Effect order change"
 
-#: src/multitrack.c:4898
+#: src/multitrack.c:5064
 msgid "unsigned "
 msgstr "unsigned "
 
-#: src/multitrack.c:4899
+#: src/multitrack.c:5065
 msgid "signed "
 msgstr "signed "
 
-#: src/multitrack.c:4904
+#: src/multitrack.c:5071
 #, c-format
 msgid ""
 "Multitrack values set to %.3f fps, frame size %d x %d, audio channels %d, "
@@ -9656,15 +9686,15 @@
 "Multitrack values set to %.3f fps, frame size %d x %d, audio channels %d, "
 "audio rate %d, audio sample size %d, %s.\n"
 
-#: src/multitrack.c:4938
+#: src/multitrack.c:5104
 msgid "invalid event list. Failed.\n"
 msgstr "invalid event list. Failed.\n"
 
-#: src/multitrack.c:4944
+#: src/multitrack.c:5110
 msgid "event list has invalid fps. Failed.\n"
 msgstr "event list has invalid fps. Failed.\n"
 
-#: src/multitrack.c:4953
+#: src/multitrack.c:5122
 #, c-format
 msgid ""
 "\n"
@@ -9679,7 +9709,7 @@
 "close the current set,\n"
 "then load in the new set from the File menu.\n"
 
-#: src/multitrack.c:4993
+#: src/multitrack.c:5163
 #, c-format
 msgid ""
 "\n"
@@ -9690,358 +9720,358 @@
 "This has an invalid number of audio channels (%d) for LiVES.\n"
 "It cannot be loaded.\n"
 
-#: src/multitrack.c:5329 src/multitrack.c:5338 src/multitrack.c:21133
+#: src/multitrack.c:5452
 msgid "Layout was wiped.\n"
 msgstr "Layout was wiped.\n"
 
-#: src/multitrack.c:5374
+#: src/multitrack.c:5547
 #, c-format
 msgid "LiVES-%s: Multitrack %dx%d : %d bpp %.3f fps"
 msgstr "LiVES-%s: Multitrack %dx%d : %d bpp %.3f fps"
 
-#: src/multitrack.c:5617
+#: src/multitrack.c:5793
 msgid "In/out"
 msgstr "In/out"
 
-#: src/multitrack.c:5619
+#: src/multitrack.c:5795
 msgid "FX stack"
 msgstr "FX stack"
 
-#: src/multitrack.c:5627 src/omc-learn.c:673
+#: src/multitrack.c:5803 src/omc-learn.c:659
 msgid "Params."
 msgstr "Params."
 
-#: src/multitrack.c:5978
+#: src/multitrack.c:6157
 msgid "_Open..."
 msgstr "_Open..."
 
-#: src/multitrack.c:5996
+#: src/multitrack.c:6175
 msgid "O_pen File Selection..."
 msgstr "O_pen File Selection..."
 
-#: src/multitrack.c:6040
+#: src/multitrack.c:6219
 msgid "Import Selection from _dvd/vcd..."
 msgstr "Import Selection from _dvd/vcd..."
 
-#: src/multitrack.c:6050
+#: src/multitrack.c:6229
 msgid "Import Selection from _dvd"
 msgstr "Import Selection from _dvd"
 
-#: src/multitrack.c:6060
+#: src/multitrack.c:6239
 msgid "Import Selection from _vcd"
 msgstr "Import Selection from _vcd"
 
-#: src/multitrack.c:6076
+#: src/multitrack.c:6255
 msgid "_Import from Device"
 msgstr "_Import from Device"
 
-#: src/multitrack.c:6103
+#: src/multitrack.c:6282
 msgid "_Close the selected clip"
 msgstr "_Close the selected clip"
 
-#: src/multitrack.c:6198
+#: src/multitrack.c:6377
 msgid "_Save layout as..."
 msgstr "_Save layout as..."
 
-#: src/multitrack.c:6206
+#: src/multitrack.c:6385
 msgid "_Load layout..."
 msgstr "_Load layout..."
 
-#: src/multitrack.c:6210
+#: src/multitrack.c:6389
 msgid "_Wipe/Delete layout..."
 msgstr "_Wipe/Delete layout..."
 
-#: src/multitrack.c:6236
+#: src/multitrack.c:6415
 msgid "_Ignore width, height and audio values from loaded layouts"
 msgstr "_Ignore width, height and audio values from loaded layouts"
 
-#: src/multitrack.c:6240
+#: src/multitrack.c:6419
 msgid "Auto load _subtitles with clips"
 msgstr "Auto load _subtitles with clips"
 
-#: src/multitrack.c:6322
+#: src/multitrack.c:6501
 msgid "_CLIP EDITOR"
 msgstr "_CLIP EDITOR"
 
-#: src/multitrack.c:6334
+#: src/multitrack.c:6513
 msgid "_Adjust selected clip start/end points"
 msgstr "_Adjust selected clip start/end points"
 
-#: src/multitrack.c:6343
+#: src/multitrack.c:6522
 msgid "_Insert selected clip"
 msgstr "_Insert selected clip"
 
-#: src/multitrack.c:6355
+#: src/multitrack.c:6534
 msgid "_Insert selected clip audio"
 msgstr "_Insert selected clip audio"
 
-#: src/multitrack.c:6364
+#: src/multitrack.c:6543
 msgid "_Delete selected block"
 msgstr "_Delete selected block"
 
-#: src/multitrack.c:6373
+#: src/multitrack.c:6555
 msgid "_Jump to previous block boundary"
 msgstr "_Jump to previous block boundary"
 
-#: src/multitrack.c:6382
+#: src/multitrack.c:6564
 msgid "_Jump to next block boundary"
 msgstr "_Jump to next block boundary"
 
-#: src/multitrack.c:6395
+#: src/multitrack.c:6577
 msgid "Clear _marks from timeline"
 msgstr "Clear _marks from timeline"
 
-#: src/multitrack.c:6403
+#: src/multitrack.c:6585
 msgid "Ignore selection limits when inserting"
 msgstr "Ignore selection limits when inserting"
 
-#: src/multitrack.c:6420 src/multitrack.c:16719
+#: src/multitrack.c:6602 src/multitrack.c:17009
 msgid "_Play from Timeline Position"
 msgstr "_Play from Timeline Position"
 
-#: src/multitrack.c:6434
+#: src/multitrack.c:6616
 msgid "Pla_y selected time only"
 msgstr "Pla_y selected time only"
 
-#: src/multitrack.c:6518
+#: src/multitrack.c:6700
 msgid "_Move effects with blocks"
 msgstr "_Move effects with blocks"
 
-#: src/multitrack.c:6531
+#: src/multitrack.c:6713
 msgid "Select _autotransition effect..."
 msgstr "Select _autotransition effect..."
 
-#: src/multitrack.c:6542
+#: src/multitrack.c:6724
 msgid "Crossfade audio with autotransition"
 msgstr ""
 
-#: src/multitrack.c:6550
+#: src/multitrack.c:6732
 msgid "View/_Edit selected effect"
 msgstr "View/_Edit selected effect"
 
-#: src/multitrack.c:6554
+#: src/multitrack.c:6736
 msgid "_Delete selected effect"
 msgstr "_Delete selected effect"
 
-#: src/multitrack.c:6562
+#: src/multitrack.c:6744
 msgid "Apply effect to _block..."
 msgstr "Apply effect to _block..."
 
-#: src/multitrack.c:6619
+#: src/multitrack.c:6801
 msgid "Apply effect to _region..."
 msgstr "Apply effect to _region..."
 
-#: src/multitrack.c:6885
+#: src/multitrack.c:7061
 msgid "_Tracks"
 msgstr "_Tracks"
 
-#: src/multitrack.c:6896
+#: src/multitrack.c:7072
 msgid "Rename current track"
 msgstr ""
 
-#: src/multitrack.c:6904
+#: src/multitrack.c:7080
 msgid "Make _Backing Audio current track"
 msgstr "Make _Backing Audio current track"
 
-#: src/multitrack.c:6915
+#: src/multitrack.c:7091
 msgid "Add Video Track at _Rear"
 msgstr "Add Video Track at _Rear"
 
-#: src/multitrack.c:6923
+#: src/multitrack.c:7099
 msgid "Add Video Track at _Front"
 msgstr "Add Video Track at _Front"
 
-#: src/multitrack.c:6936
+#: src/multitrack.c:7112
 msgid "_Split current track at cursor"
 msgstr "_Split current track at cursor"
 
-#: src/multitrack.c:6948
+#: src/multitrack.c:7124
 msgid "_Split selected video tracks"
 msgstr "_Split selected video tracks"
 
-#: src/multitrack.c:6961
+#: src/multitrack.c:7137
 msgid "Insert gap in selected tracks/time"
 msgstr "Insert gap in selected tracks/time"
 
-#: src/multitrack.c:6969
+#: src/multitrack.c:7145
 msgid "Insert gap in current track/selected time"
 msgstr "Insert gap in current track/selected time"
 
-#: src/multitrack.c:6981
+#: src/multitrack.c:7157
 msgid "Close all _gaps in selected tracks/time"
 msgstr "Close all _gaps in selected tracks/time"
 
-#: src/multitrack.c:7007
+#: src/multitrack.c:7183
 msgid "Se_lection"
 msgstr "Se_lection"
 
-#: src/multitrack.c:7018
+#: src/multitrack.c:7194
 msgid "_Select Current Track"
 msgstr "_Select Current Track"
 
-#: src/multitrack.c:7025
+#: src/multitrack.c:7201
 msgid "Select _all video tracks"
 msgstr "Select _all video tracks"
 
-#: src/multitrack.c:7032
+#: src/multitrack.c:7208
 msgid "Select _no video tracks"
 msgstr "Select _no video tracks"
 
-#: src/multitrack.c:7039
+#: src/multitrack.c:7215
 msgid "Select all _time"
 msgstr "Select all _time"
 
-#: src/multitrack.c:7050
+#: src/multitrack.c:7226
 msgid "Select from _zero time"
 msgstr "Select from _zero time"
 
-#: src/multitrack.c:7057
+#: src/multitrack.c:7233
 msgid "Select to _end time"
 msgstr "Select to _end time"
 
-#: src/multitrack.c:7064
+#: src/multitrack.c:7240
 msgid "_Copy..."
 msgstr "_Copy..."
 
-#: src/multitrack.c:7075
+#: src/multitrack.c:7251
 msgid "_Timecode to region start"
 msgstr "_Timecode to region start"
 
-#: src/multitrack.c:7082
+#: src/multitrack.c:7258
 msgid "_Timecode to region end"
 msgstr "_Timecode to region end"
 
-#: src/multitrack.c:7089
+#: src/multitrack.c:7265
 msgid "_Region start to timecode"
 msgstr "_Region start to timecode"
 
-#: src/multitrack.c:7096
+#: src/multitrack.c:7272
 msgid "_Region end to timecode"
 msgstr "_Region end to timecode"
 
-#: src/multitrack.c:7110
+#: src/multitrack.c:7286
 msgid "Select/deselect block at current track/time"
 msgstr ""
 
-#: src/multitrack.c:7135
+#: src/multitrack.c:7311
 msgid "_Change width, height and audio values..."
 msgstr "_Change width, height and audio values..."
 
-#: src/multitrack.c:7194
+#: src/multitrack.c:7370
 msgid "_Render"
 msgstr "_Render"
 
-#: src/multitrack.c:7205
+#: src/multitrack.c:7381
 msgid "_Render all to new clip"
 msgstr "_Render all to new clip"
 
-#: src/multitrack.c:7220
+#: src/multitrack.c:7396
 msgid "Render _video"
 msgstr "Render _video"
 
-#: src/multitrack.c:7225
+#: src/multitrack.c:7401
 msgid "Render _audio"
 msgstr "Render _audio"
 
-#: src/multitrack.c:7235
+#: src/multitrack.c:7411
 msgid "_Normalise rendered audio"
 msgstr "_Normalise rendered audio"
 
-#: src/multitrack.c:7242
+#: src/multitrack.c:7418
 msgid "_Pre-render audio"
 msgstr "_Pre-render audio"
 
-#: src/multitrack.c:7251
+#: src/multitrack.c:7427
 msgid "_View"
 msgstr "_View"
 
-#: src/multitrack.c:7270
+#: src/multitrack.c:7446
 msgid "Block _In/out points"
 msgstr "Block _In/out points"
 
-#: src/multitrack.c:7279
+#: src/multitrack.c:7455
 msgid "_Effects at current"
 msgstr "_Effects at current"
 
-#: src/multitrack.c:7297
+#: src/multitrack.c:7473
 msgid "Audio parameters"
 msgstr "Audio parameters"
 
-#: src/multitrack.c:7308
+#: src/multitrack.c:7484
 msgid "Show backing _audio track"
 msgstr "Show backing _audio track"
 
-#: src/multitrack.c:7312
+#: src/multitrack.c:7488
 msgid "Compact view"
 msgstr "Compact view"
 
-#: src/multitrack.c:7320
+#: src/multitrack.c:7496
 msgid "Maximum tracks to display..."
 msgstr "Maximum tracks to display..."
 
-#: src/multitrack.c:7327
+#: src/multitrack.c:7503
 msgid "Scroll to follow playback"
 msgstr "Scroll to follow playback"
 
-#: src/multitrack.c:7331
+#: src/multitrack.c:7507
 msgid "_Center on cursor"
 msgstr "_Centre on cursor"
 
-#: src/multitrack.c:7338
+#: src/multitrack.c:7514
 msgid "_Zoom in"
 msgstr "_Zoom in"
 
-#: src/multitrack.c:7349
+#: src/multitrack.c:7525
 msgid "_Zoom out"
 msgstr "_Zoom out"
 
-#: src/multitrack.c:7361
+#: src/multitrack.c:7537
 msgid "Multitrack _details"
 msgstr "Multitrack _details"
 
-#: src/multitrack.c:7374
+#: src/multitrack.c:7550
 msgid "_Event Window"
 msgstr "_Event Window"
 
-#: src/multitrack.c:7378
+#: src/multitrack.c:7554
 msgid "_Event Window (selected time only)"
 msgstr "_Event Window (selected time only)"
 
-#: src/multitrack.c:7382
+#: src/multitrack.c:7558
 msgid "_Show FRAME events"
 msgstr "_Show FRAME events"
 
-#: src/multitrack.c:7399
+#: src/multitrack.c:7575
 msgid "_Show multitrack keys"
 msgstr "_Show multitrack keys"
 
-#: src/multitrack.c:7468
+#: src/multitrack.c:7644
 msgid "Mouse mode: _Move"
 msgstr "Mouse mode: _Move"
 
-#: src/multitrack.c:7476
+#: src/multitrack.c:7652
 msgid "Mouse mode: _Select"
 msgstr "Mouse mode: _Select"
 
-#: src/multitrack.c:7505
+#: src/multitrack.c:7681
 msgid "Insert mode: _Normal"
 msgstr "Insert mode: _Normal"
 
-#: src/multitrack.c:7733
+#: src/multitrack.c:7909
 msgid "Insert with _audio"
 msgstr "Insert with _audio"
 
-#: src/multitrack.c:7734
+#: src/multitrack.c:7910
 msgid ""
 "Select whether video clips are inserted and moved with their audio or not"
 msgstr ""
 "Select whether video clips are inserted and moved with their audio or not"
 
-#: src/multitrack.c:7829
+#: src/multitrack.c:8007
 msgid "Select _overlap"
 msgstr "Select _overlap"
 
-#: src/multitrack.c:7830
+#: src/multitrack.c:8008
 msgid ""
 "Select whether timeline selection snaps to overlap between selected tracks "
 "or not"
@@ -10049,83 +10079,75 @@
 "Select whether timeline selection snaps to overlap between selected tracks "
 "or not"
 
-#: src/multitrack.c:7894 src/multitrack.c:14198
+#: src/multitrack.c:8073 src/multitrack.c:14422
 msgid "Expanded View (d)"
 msgstr "Expanded View (d)"
 
-#: src/multitrack.c:7897 src/multitrack.c:14205
+#: src/multitrack.c:8076 src/multitrack.c:14428
 msgid "Compact View (d)"
 msgstr "Compact View (d)"
 
-#: src/multitrack.c:7939
+#: src/multitrack.c:8118
 msgid "Gravity: _Normal"
 msgstr "Gravity: _Normal"
 
-#: src/multitrack.c:7952
+#: src/multitrack.c:8131
 msgid "Gravity: _Left"
 msgstr "Gravity: _Left"
 
-#: src/multitrack.c:7967
+#: src/multitrack.c:8146
 msgid "Gravity: _Right"
 msgstr "Gravity: _Right"
 
-#: src/multitrack.c:8297
+#: src/multitrack.c:8496
 msgid "_Apply"
 msgstr "_Apply"
 
-#: src/multitrack.c:8319
+#: src/multitrack.c:8518
 msgid "Time"
 msgstr "Time"
 
-#: src/multitrack.c:8333
+#: src/multitrack.c:8532
 msgid "_Del. node"
 msgstr "_Del. node"
 
-#: src/multitrack.c:8341
+#: src/multitrack.c:8540
 msgid "_Next node"
 msgstr "_Next node"
 
-#: src/multitrack.c:8349
+#: src/multitrack.c:8548
 msgid "_Prev node"
 msgstr "_Prev node"
 
-#: src/multitrack.c:8373
+#: src/multitrack.c:8574
 msgid "_Reverse playback  "
 msgstr "_Reverse playback  "
 
-#: src/multitrack.c:8395
+#: src/multitrack.c:8596
 msgid "_Velocity  "
 msgstr "_Velocity  "
 
-#: src/multitrack.c:8464
+#: src/multitrack.c:8664
 msgid "Anchor _start"
 msgstr "Anchor _start"
 
-#: src/multitrack.c:8465
+#: src/multitrack.c:8665
 msgid "Anchor the start point to the timeline"
 msgstr "Anchor the start point to the timeline"
 
-#: src/multitrack.c:8481
-msgid "Start frame"
-msgstr "Start frame"
-
-#: src/multitrack.c:8533
+#: src/multitrack.c:8728
 msgid "Anchor _end"
 msgstr "Anchor _end"
 
-#: src/multitrack.c:8534
+#: src/multitrack.c:8729
 msgid "Anchor the end point to the timeline"
 msgstr "Anchor the end point to the timeline"
 
-#: src/multitrack.c:8546
-msgid "End frame"
-msgstr "End frame"
-
-#: src/multitrack.c:8739
+#: src/multitrack.c:8929
 msgid "Scroll"
 msgstr "Scroll"
 
-#: src/multitrack.c:9316
+#: src/multitrack.c:9502
 msgid ""
 "\n"
 "==============================\n"
@@ -10135,91 +10157,91 @@
 "==============================\n"
 "Switched to Clip Edit mode\n"
 
-#: src/multitrack.c:9502
+#: src/multitrack.c:9708
 msgid "Timeline (seconds)"
 msgstr "Timeline (seconds)"
 
-#: src/multitrack.c:9984
+#: src/multitrack.c:10202
 msgid " Backing audio"
 msgstr " Backing audio"
 
-#: src/multitrack.c:9987
+#: src/multitrack.c:10204
 #, c-format
 msgid " Layer %d audio"
 msgstr " Layer %d audio"
 
-#: src/multitrack.c:9995
+#: src/multitrack.c:10212
 msgid "Show/hide audio details"
 msgstr "Show/hide audio details"
 
-#: src/multitrack.c:10010 src/multitrack.c:10232
+#: src/multitrack.c:10227 src/multitrack.c:10452
 #, c-format
 msgid "Layer %d audio"
 msgstr "Layer %d audio"
 
-#: src/multitrack.c:10144 src/multitrack.c:10261
+#: src/multitrack.c:10353 src/multitrack.c:10481
 #, c-format
 msgid "%s (layer %d)"
 msgstr "%s (layer %d)"
 
-#: src/multitrack.c:10184
+#: src/multitrack.c:10403
 msgid "Select track"
 msgstr "Select track"
 
-#: src/multitrack.c:10188
+#: src/multitrack.c:10407
 msgid "Show/hide audio"
 msgstr "Show/hide audio"
 
-#: src/multitrack.c:10194
+#: src/multitrack.c:10413
 #, c-format
 msgid "Video %d"
 msgstr "Video %d"
 
-#: src/multitrack.c:10233
+#: src/multitrack.c:10453
 #, c-format
 msgid " %s"
 msgstr " %s"
 
-#: src/multitrack.c:10346
+#: src/multitrack.c:10574
 msgid "LiVES: Selected effect"
 msgstr "LiVES: Selected effect"
 
-#: src/multitrack.c:10358
+#: src/multitrack.c:10586
 msgid "_View/Edit this effect"
 msgstr "_View/Edit this effect"
 
-#: src/multitrack.c:10361
+#: src/multitrack.c:10588
 msgid "_View this effect"
 msgstr "_View this effect"
 
-#: src/multitrack.c:10369
+#: src/multitrack.c:10596
 msgid "_Delete this effect"
 msgstr "_Delete this effect"
 
-#: src/multitrack.c:10422
+#: src/multitrack.c:10648
 msgid "Cannot insert after this effect"
 msgstr "Cannot insert after this effect"
 
-#: src/multitrack.c:10451
+#: src/multitrack.c:10677
 msgid "This effect cannot be moved"
 msgstr "This effect cannot be moved"
 
-#: src/multitrack.c:10499
+#: src/multitrack.c:10724
 #, c-format
 msgid "  %d to %d selected  "
 msgstr "  %d to %d selected  "
 
-#: src/multitrack.c:10502 src/multitrack.c:10746
+#: src/multitrack.c:10727 src/multitrack.c:10968
 #, c-format
 msgid "%.2f sec."
 msgstr "%.2f sec."
 
-#: src/multitrack.c:10717
+#: src/multitrack.c:10940
 #, c-format
 msgid "%d frames"
 msgstr "%d frames"
 
-#: src/multitrack.c:11070
+#: src/multitrack.c:11299
 msgid ""
 "\n"
 "==============================\n"
@@ -10229,19 +10251,19 @@
 "==============================\n"
 "Switched to Multitrack mode\n"
 
-#: src/multitrack.c:12691
+#: src/multitrack.c:12939
 msgid "Drag the time slider to where you"
 msgstr "Drag the time slider to where you"
 
-#: src/multitrack.c:12692
+#: src/multitrack.c:12940
 msgid "want to set effect parameters"
 msgstr "want to set effect parameters"
 
-#: src/multitrack.c:12693
+#: src/multitrack.c:12941
 msgid "Set parameters, then click \"Apply\"\n"
 msgstr "Set parameters, then click \"Apply\"\n"
 
-#: src/multitrack.c:12694
+#: src/multitrack.c:12942
 msgid ""
 "NODES are points where parameters\n"
 "have been set.\n"
@@ -10251,51 +10273,51 @@
 "have been set.\n"
 "Nodes can be deleted."
 
-#: src/multitrack.c:12697
+#: src/multitrack.c:12944
 msgid "Effect has no parameters.\n"
 msgstr "Effect has no parameters.\n"
 
-#: src/multitrack.c:12788
+#: src/multitrack.c:13033
 #, c-format
 msgid "%s output"
 msgstr "%s output"
 
-#: src/multitrack.c:12794 src/multitrack.c:12804
+#: src/multitrack.c:13038 src/multitrack.c:13046
 #, c-format
 msgid "layer %d"
 msgstr "layer %d"
 
-#: src/multitrack.c:12796 src/multitrack.c:12806
+#: src/multitrack.c:13039 src/multitrack.c:13047
 msgid "audio track"
 msgstr "audio track"
 
-#: src/multitrack.c:12797
+#: src/multitrack.c:13040
 #, c-format
 msgid "%s to %s"
 msgstr "%s to %s"
 
-#: src/multitrack.c:12807
+#: src/multitrack.c:13048
 #, c-format
 msgid "%s from %s"
 msgstr ""
 
-#: src/multitrack.c:12860
+#: src/multitrack.c:13099
 msgid "_Prev filter map"
 msgstr "_Prev filter map"
 
-#: src/multitrack.c:12871
+#: src/multitrack.c:13110
 msgid "Insert _before"
 msgstr "Insert _before"
 
-#: src/multitrack.c:12881
+#: src/multitrack.c:13120
 msgid "Insert _after"
 msgstr "Insert _after"
 
-#: src/multitrack.c:12896
+#: src/multitrack.c:13134
 msgid "_Next filter map"
 msgstr "_Next filter map"
 
-#: src/multitrack.c:12911
+#: src/multitrack.c:13148
 msgid ""
 "\n"
 "\n"
@@ -10307,7 +10329,7 @@
 "No effects at current track,\n"
 "current time.\n"
 
-#: src/multitrack.c:12929
+#: src/multitrack.c:13166
 msgid ""
 "Drag a compositor anywhere\n"
 "on the timeline\n"
@@ -10317,7 +10339,7 @@
 "on the timeline\n"
 "to apply it to the selected region."
 
-#: src/multitrack.c:12936
+#: src/multitrack.c:13173
 msgid ""
 "Drag a transition anywhere\n"
 "on the timeline\n"
@@ -10327,7 +10349,7 @@
 "on the timeline\n"
 "to apply it to the selected region."
 
-#: src/multitrack.c:12944
+#: src/multitrack.c:13181
 msgid ""
 "Effects can be dragged\n"
 "onto blocks on the timeline."
@@ -10335,60 +10357,60 @@
 "Effects can be dragged\n"
 "onto blocks on the timeline."
 
-#: src/multitrack.c:13166
+#: src/multitrack.c:13406
 msgid "LiVES: Selected block/frame"
 msgstr "LiVES: Selected block/frame"
 
-#: src/multitrack.c:13173
+#: src/multitrack.c:13413
 msgid "_Select this block"
 msgstr "_Select this block"
 
-#: src/multitrack.c:13183
+#: src/multitrack.c:13423
 msgid "_Split block here"
 msgstr "_Split block here"
 
-#: src/multitrack.c:13191
+#: src/multitrack.c:13431
 msgid "List _effects here"
 msgstr "List _effects here"
 
-#: src/multitrack.c:13200 src/multitrack.c:13277
+#: src/multitrack.c:13440 src/multitrack.c:13518
 #, c-format
 msgid "_Adjust %s"
 msgstr "_Adjust %s"
 
-#: src/multitrack.c:13215
+#: src/multitrack.c:13455
 msgid "_Delete this block"
 msgstr "_Delete this block"
 
-#: src/multitrack.c:13258
+#: src/multitrack.c:13500
 msgid "_Insert here"
 msgstr "_Insert here"
 
-#: src/multitrack.c:13264
+#: src/multitrack.c:13505
 msgid "_Insert audio here"
 msgstr "_Insert audio here"
 
-#: src/multitrack.c:14801
+#: src/multitrack.c:15017
 #, c-format
 msgid "Inserted gap in selected tracks from time %.4f to %.4f\n"
 msgstr "Inserted gap in selected tracks from time %.4f to %.4f\n"
 
-#: src/multitrack.c:14835
+#: src/multitrack.c:15048
 #, c-format
 msgid "Inserted gap in track %s from time %.4f to %.4f\n"
 msgstr "Inserted gap in track %s from time %.4f to %.4f\n"
 
-#: src/multitrack.c:15036
+#: src/multitrack.c:15244
 #, c-format
 msgid "Undid %s\n"
 msgstr "Undid %s\n"
 
-#: src/multitrack.c:15235
+#: src/multitrack.c:15445
 #, c-format
 msgid "Redid %s\n"
 msgstr "Redid %s\n"
 
-#: src/multitrack.c:15268
+#: src/multitrack.c:15475
 msgid ""
 "\n"
 " (variable)"
@@ -10396,62 +10418,62 @@
 "\n"
 " (variable)"
 
-#: src/multitrack.c:15502 src/multitrack.c:15614 src/multitrack.c:18736
-#: src/multitrack.c:18748
+#: src/multitrack.c:15710 src/multitrack.c:15823 src/multitrack.c:19077
+#: src/multitrack.c:19089
 #, c-format
 msgid "track %s"
 msgstr "track %s"
 
-#: src/multitrack.c:15507 src/multitrack.c:15619 src/multitrack.c:18741
+#: src/multitrack.c:15715 src/multitrack.c:15828 src/multitrack.c:19082
 #, c-format
 msgid "tracks %s and %s"
 msgstr "tracks %s and %s"
 
-#: src/multitrack.c:15513 src/multitrack.c:15625 src/multitrack.c:18751
+#: src/multitrack.c:15721 src/multitrack.c:15834 src/multitrack.c:19091
 msgid "selected tracks"
 msgstr "selected tracks"
 
-#: src/multitrack.c:15516
+#: src/multitrack.c:15726
 #, c-format
 msgid "Added %s %s to %s from %.4f to %.4f\n"
 msgstr "Added %s %s to %s from %.4f to %.4f\n"
 
-#: src/multitrack.c:15550
+#: src/multitrack.c:15760
 #, c-format
 msgid "Added effect %s to track %s from %.4f to %.4f\n"
 msgstr "Added effect %s to track %s from %.4f to %.4f\n"
 
-#: src/multitrack.c:15631
+#: src/multitrack.c:15845
 #, c-format
 msgid "Deleted %s %s from %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15935
+#: src/multitrack.c:16143
 #, c-format
 msgid "rendered %d frames to new clip.\n"
 msgstr "rendered %d frames to new clip.\n"
 
-#: src/multitrack.c:16025
+#: src/multitrack.c:16230
 msgid "Cleaning up..."
 msgstr "Cleaning up..."
 
-#: src/multitrack.c:16712
+#: src/multitrack.c:17003
 msgid "_Pause"
 msgstr "_Pause"
 
-#: src/multitrack.c:16713
+#: src/multitrack.c:17004
 msgid "Pause (p)"
 msgstr "Pause (p)"
 
-#: src/multitrack.c:16856
+#: src/multitrack.c:17151
 msgid "Press 'm' during playback"
 msgstr "Press 'm' during playback"
 
-#: src/multitrack.c:16857
+#: src/multitrack.c:17152
 msgid "to make a mark on the timeline"
 msgstr "to make a mark on the timeline"
 
-#: src/multitrack.c:17154
+#: src/multitrack.c:17498
 #, c-format
 msgid ""
 "Inserted audio %.4f to %.4f from clip %s into backing audio from time %.4f "
@@ -10460,14 +10482,14 @@
 "Inserted audio %.4f to %.4f from clip %s into backing audio from time %.4f "
 "to %.4f\n"
 
-#: src/multitrack.c:17414
+#: src/multitrack.c:17759
 #, c-format
 msgid ""
 "Inserted frames %d to %d from clip %s into track %s from time %.4f to %.4f\n"
 msgstr ""
 "Inserted frames %d to %d from clip %s into track %s from time %.4f to %.4f\n"
 
-#: src/multitrack.c:17998
+#: src/multitrack.c:18332
 #, c-format
 msgid ""
 "Time region %.3f to %.3f\n"
@@ -10476,7 +10498,7 @@
 "Time region %.3f to %.3f\n"
 "selected.\n"
 
-#: src/multitrack.c:18002
+#: src/multitrack.c:18336
 msgid ""
 "select one or more tracks\n"
 "to create a region.\n"
@@ -10484,12 +10506,12 @@
 "select one or more tracks\n"
 "to create a region.\n"
 
-#: src/multitrack.c:18004
+#: src/multitrack.c:18337
 #, c-format
 msgid "%d video tracks selected.\n"
 msgstr "%d video tracks selected.\n"
 
-#: src/multitrack.c:18006
+#: src/multitrack.c:18339
 msgid ""
 "Double click on timeline\n"
 "to deselect time region."
@@ -10497,7 +10519,7 @@
 "Double click on timeline\n"
 "to deselect time region."
 
-#: src/multitrack.c:18013
+#: src/multitrack.c:18346
 msgid ""
 "Single click on an effect\n"
 "to select it."
@@ -10505,7 +10527,7 @@
 "Single click on an effect\n"
 "to select it."
 
-#: src/multitrack.c:18014
+#: src/multitrack.c:18347
 msgid ""
 "Double click on an effect\n"
 "to edit it."
@@ -10513,7 +10535,7 @@
 "Double click on an effect\n"
 "to edit it."
 
-#: src/multitrack.c:18015
+#: src/multitrack.c:18348
 msgid ""
 "Right click on an effect\n"
 "for context menu.\n"
@@ -10521,7 +10543,7 @@
 "Right click on an effect\n"
 "for context menu.\n"
 
-#: src/multitrack.c:18017
+#: src/multitrack.c:18350
 msgid ""
 "Effect order can be changed at\n"
 "FILTER MAPS"
@@ -10529,7 +10551,7 @@
 "Effect order can be changed at\n"
 "FILTER MAPS"
 
-#: src/multitrack.c:18024
+#: src/multitrack.c:18357
 msgid ""
 "You can select an effect,\n"
 "then use the INSERT BEFORE"
@@ -10537,15 +10559,15 @@
 "You can select an effect,\n"
 "then use the INSERT BEFORE"
 
-#: src/multitrack.c:18025
+#: src/multitrack.c:18358
 msgid "or INSERT AFTER buttons to move it."
 msgstr "or INSERT AFTER buttons to move it."
 
-#: src/multitrack.c:18307 src/multitrack.c:18320
+#: src/multitrack.c:18639 src/multitrack.c:18652
 msgid "Click on another effect,"
 msgstr "Click on another effect,"
 
-#: src/multitrack.c:18308 src/multitrack.c:18321
+#: src/multitrack.c:18640 src/multitrack.c:18653
 msgid ""
 "and the selected one\n"
 "will be inserted"
@@ -10553,50 +10575,50 @@
 "and the selected one\n"
 "will be inserted"
 
-#: src/multitrack.c:18309
+#: src/multitrack.c:18641
 msgid "after it.\n"
 msgstr "after it.\n"
 
-#: src/multitrack.c:18322
+#: src/multitrack.c:18654
 msgid "before it.\n"
 msgstr "before it.\n"
 
-#: src/multitrack.c:18551
+#: src/multitrack.c:18889
 #, c-format
 msgid "Removed parameter values for effect %s at time %.4f\n"
 msgstr "Removed parameter values for effect %s at time %.4f\n"
 
-#: src/multitrack.c:18759
+#: src/multitrack.c:19100
 #, c-format
 msgid "Set parameter values for %s %s on %s at time %.4f\n"
 msgstr "Set parameter values for %s %s on %s at time %.4f\n"
 
-#: src/multitrack.c:19251 src/multitrack.c:20873
+#: src/multitrack.c:19630 src/multitrack.c:21195
 msgid "_Autoreload each time"
 msgstr "_Autoreload each time"
 
-#: src/multitrack.c:19323
+#: src/multitrack.c:19702
 msgid "Saving layout"
 msgstr ""
 
-#: src/multitrack.c:19345
+#: src/multitrack.c:19725
 #, c-format
 msgid "Saved layout to %s\n"
 msgstr "Saved layout to %s\n"
 
-#: src/multitrack.c:20783
+#: src/multitrack.c:21125
 msgid "clips and frames"
 msgstr "clips and frames"
 
-#: src/multitrack.c:20787
+#: src/multitrack.c:21128
 msgid "clips"
 msgstr "clips"
 
-#: src/multitrack.c:20790
+#: src/multitrack.c:21130
 msgid "frames"
 msgstr "frames"
 
-#: src/multitrack.c:20800
+#: src/multitrack.c:21140
 msgid ""
 "\n"
 "Auto reload layout.\n"
@@ -10604,7 +10626,7 @@
 "\n"
 "Auto reload layout.\n"
 
-#: src/multitrack.c:20803
+#: src/multitrack.c:21143
 #, c-format
 msgid ""
 "%s\n"
@@ -10615,11 +10637,11 @@
 "Some %s are missing from the layout%s\n"
 "Therefore it could not be loaded properly.\n"
 
-#: src/multitrack.c:20920
+#: src/multitrack.c:21284
 msgid "auto backup"
 msgstr "auto backup"
 
-#: src/multitrack.c:20923
+#: src/multitrack.c:21287
 #, c-format
 msgid ""
 "\n"
@@ -10628,49 +10650,49 @@
 "\n"
 "Unable to load layout file %s\n"
 
-#: src/multitrack.c:20944
+#: src/multitrack.c:21308
 #, c-format
 msgid "Loading layout from %s..."
 msgstr "Loading layout from %s..."
 
-#: src/multitrack.c:20978
+#: src/multitrack.c:21338
 #, c-format
 msgid "Got %d events...processing..."
 msgstr "Got %d events...processing..."
 
-#: src/multitrack.c:20991
+#: src/multitrack.c:21349
 msgid "Checking and rebuilding event list"
 msgstr "Checking and rebuilding event list"
 
-#: src/multitrack.c:21017
+#: src/multitrack.c:21374
 #, c-format
 msgid "%d errors detected.\n"
 msgstr "%d errors detected.\n"
 
-#: src/multitrack.c:21068
+#: src/multitrack.c:21422
 #, c-format
 msgid "Multitrack fps set to %.3f\n"
 msgstr "Multitrack fps set to %.3f\n"
 
-#: src/multitrack.c:21225
+#: src/multitrack.c:21576
 msgid ""
 "The current layout has changes which have not been saved.\n"
 "Are you sure you wish to wipe it ?\n"
 msgstr ""
 
-#: src/multitrack.c:22047
+#: src/multitrack.c:22385
 msgid "LiVES: Multitrack audio mixer"
 msgstr "LiVES: Multitrack audio mixer"
 
-#: src/multitrack.c:22077
+#: src/multitrack.c:22414
 msgid "_Reset values"
 msgstr "_Reset values"
 
-#: src/multitrack.c:22081
+#: src/multitrack.c:22418
 msgid "_Close mixer"
 msgstr "_Close mixer"
 
-#: src/multitrack.c:22130
+#: src/multitrack.c:22466
 msgid ""
 "_Invert backing audio\n"
 "and layer volumes"
@@ -10678,35 +10700,35 @@
 "_Invert backing audio\n"
 "and layer volumes"
 
-#: src/multitrack.c:22132
+#: src/multitrack.c:22468
 msgid "Adjust backing and layer audio values so that they sum to 1.0"
 msgstr "Adjust backing and layer audio values so that they sum to 1.0"
 
-#: src/multitrack.c:22175
+#: src/multitrack.c:22510
 msgid "_Gang layer audio"
 msgstr "_Gang layer audio"
 
-#: src/multitrack.c:22177
+#: src/multitrack.c:22512
 msgid "Adjust all layer audio values to the same value"
 msgstr "Adjust all layer audio values to the same value"
 
-#: src/jack.c:104
+#: src/jack.c:102
 msgid "JACK server started\n"
 msgstr "JACK server started\n"
 
-#: src/jack.c:1284 src/jack.c:1353
+#: src/jack.c:1265 src/jack.c:1334
 msgid "Unable to connect to JACK server\n"
 msgstr "Unable to connect to JACK server.\n"
 
-#: src/jack.c:1512
+#: src/jack.c:1491
 msgid "Started jack audio subsystem.\n"
 msgstr "Started jack audio subsystem.\n"
 
-#: src/jack.c:1623
+#: src/jack.c:1600
 msgid "Started jack audio reader.\n"
 msgstr "Started jack audio reader.\n"
 
-#: src/jack.c:1838
+#: src/jack.c:1815
 msgid ""
 "\n"
 "Connection to jack audio was reset.\n"
@@ -10714,7 +10736,7 @@
 "\n"
 "Connection to jack audio was reset.\n"
 
-#: src/pulse.c:87
+#: src/pulse.c:88
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -10726,7 +10748,7 @@
 "Falling back to sox audio player.\n"
 "You can change this in Preferences/Playback.\n"
 
-#: src/pulse.c:92
+#: src/pulse.c:94
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -10738,7 +10760,7 @@
 "Falling back to mplayer audio player.\n"
 "You can change this in Preferences/Playback.\n"
 
-#: src/pulse.c:96
+#: src/pulse.c:99
 #, fuzzy
 msgid ""
 "\n"
@@ -10751,7 +10773,7 @@
 "Falling back to mplayer audio player.\n"
 "You can change this in Preferences/Playback.\n"
 
-#: src/pulse.c:101
+#: src/pulse.c:104
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -10759,11 +10781,11 @@
 "\n"
 "Unable to connect to pulse audio server.\n"
 
-#: src/pulse.c:107
+#: src/pulse.c:109
 msgid "LiVES will exit and you can choose another audio player.\n"
 msgstr "LiVES will exit and you can choose another audio player.\n"
 
-#: src/pulse.c:1352
+#: src/pulse.c:1335
 msgid ""
 "\n"
 "Connection to pulse audio was reset.\n"
@@ -10771,113 +10793,113 @@
 "\n"
 "Connection to pulse audio was reset.\n"
 
-#: src/colourspace.c:1100
+#: src/colourspace.c:1092
 msgid "unclamped"
 msgstr "unclamped"
 
-#: src/colourspace.c:1101
+#: src/colourspace.c:1093
 msgid "clamped"
 msgstr "clamped"
 
-#: src/omc-learn.c:195
+#: src/omc-learn.c:191
 #, c-format
 msgid "Responding to joystick events from %s\n"
 msgstr "Responding to joystick events from %s\n"
 
-#: src/omc-learn.c:289
+#: src/omc-learn.c:279
 msgid "Creating ALSA seq port..."
 msgstr "Creating ALSA seq port..."
 
-#: src/omc-learn.c:325
+#: src/omc-learn.c:313
 #, c-format
 msgid "Responding to MIDI events from %s\n"
 msgstr "Responding to MIDI events from %s\n"
 
-#: src/omc-learn.c:568
+#: src/omc-learn.c:554
 msgid "data"
 msgstr "data"
 
-#: src/omc-learn.c:571
+#: src/omc-learn.c:557
 msgid "velocity"
 msgstr "velocity"
 
-#: src/omc-learn.c:572
+#: src/omc-learn.c:558
 msgid "note"
 msgstr "note"
 
-#: src/omc-learn.c:574 src/omc-learn.c:736 src/omc-learn.c:1105
-#: src/omc-learn.c:1591 src/omc-learn.c:1640
+#: src/omc-learn.c:560 src/omc-learn.c:724 src/omc-learn.c:1092
+#: src/omc-learn.c:1581 src/omc-learn.c:1630
 msgid "value"
 msgstr "value"
 
-#: src/omc-learn.c:576
+#: src/omc-learn.c:562
 msgid "state"
 msgstr "state"
 
-#: src/omc-learn.c:688
+#: src/omc-learn.c:674
 msgid "variable"
 msgstr "variable"
 
-#: src/omc-learn.c:1001
+#: src/omc-learn.c:989
 msgid "Vars."
 msgstr "Vars."
 
-#: src/omc-learn.c:1054
+#: src/omc-learn.c:1041
 #, c-format
 msgid "MIDI ch %d note on"
 msgstr "MIDI ch %d note on"
 
-#: src/omc-learn.c:1058
+#: src/omc-learn.c:1045
 #, c-format
 msgid "MIDI ch %d note off"
 msgstr "MIDI ch %d note off"
 
-#: src/omc-learn.c:1062
+#: src/omc-learn.c:1049
 #, c-format
 msgid "MIDI ch %d controller %d"
 msgstr "MIDI ch %d controller %d"
 
-#: src/omc-learn.c:1066
+#: src/omc-learn.c:1053
 #, c-format
 msgid "MIDI ch %d pitch bend"
 msgstr "MIDI ch %d pitch bend"
 
-#: src/omc-learn.c:1070
+#: src/omc-learn.c:1057
 #, c-format
 msgid "MIDI ch %d pgm change"
 msgstr "MIDI ch %d pgm change"
 
-#: src/omc-learn.c:1073
+#: src/omc-learn.c:1060
 #, c-format
 msgid "Joystick button %d"
 msgstr "Joystick button %d"
 
-#: src/omc-learn.c:1076
+#: src/omc-learn.c:1063
 #, c-format
 msgid "Joystick axis %d"
 msgstr "Joystick axis %d"
 
-#: src/omc-learn.c:1113
+#: src/omc-learn.c:1100
 msgid "x"
 msgstr "x"
 
-#: src/omc-learn.c:1122
+#: src/omc-learn.c:1109
 msgid "range"
 msgstr "range"
 
-#: src/omc-learn.c:1143
+#: src/omc-learn.c:1130
 msgid "+ offset1"
 msgstr "+ offset1"
 
-#: src/omc-learn.c:1161
+#: src/omc-learn.c:1150
 msgid "* scale"
 msgstr "* scale"
 
-#: src/omc-learn.c:1179
+#: src/omc-learn.c:1170
 msgid "+ offset2"
 msgstr "+ offset2"
 
-#: src/omc-learn.c:1280
+#: src/omc-learn.c:1270
 msgid ""
 "\n"
 "Click OK to delete all entries\n"
@@ -10885,208 +10907,208 @@
 "\n"
 "Click OK to delete all entries\n"
 
-#: src/omc-learn.c:1318
+#: src/omc-learn.c:1308
 msgid "LiVES: OMC learner"
 msgstr "LiVES: OMC learner"
 
-#: src/omc-learn.c:1334
+#: src/omc-learn.c:1324
 msgid "Clear _unmatched"
 msgstr "Clear _unmatched"
 
-#: src/omc-learn.c:1345
+#: src/omc-learn.c:1335
 msgid "_Delete all"
 msgstr "_Delete all"
 
-#: src/omc-learn.c:1411
+#: src/omc-learn.c:1401
 msgid "Start video playback"
 msgstr "Start video playback"
 
-#: src/omc-learn.c:1414
+#: src/omc-learn.c:1404
 msgid "Stop video playback"
 msgstr "Stop video playback"
 
-#: src/omc-learn.c:1418
+#: src/omc-learn.c:1408
 msgid "Clip select <clipnum>"
 msgstr "Clip select <clipnum>"
 
-#: src/omc-learn.c:1419
+#: src/omc-learn.c:1409
 msgid "Switch foreground clip to the nth valid clip"
 msgstr "Switch foreground clip to the nth valid clip"
 
-#: src/omc-learn.c:1423
+#: src/omc-learn.c:1413
 msgid "Play forwards"
 msgstr "Play forwards"
 
-#: src/omc-learn.c:1424
+#: src/omc-learn.c:1414
 msgid "Play video in a forwards direction"
 msgstr "Play video in a forwards direction"
 
-#: src/omc-learn.c:1427
+#: src/omc-learn.c:1417
 msgid "Play backwards"
 msgstr "Play backwards"
 
-#: src/omc-learn.c:1428
+#: src/omc-learn.c:1418
 msgid "Play video in a backwards direction"
 msgstr "Play video in a backwards direction"
 
-#: src/omc-learn.c:1431
+#: src/omc-learn.c:1421
 msgid "Reverse playback direction"
 msgstr "Reverse playback direction"
 
-#: src/omc-learn.c:1432
+#: src/omc-learn.c:1422
 msgid "Reverse direction of video playback"
 msgstr "Reverse direction of video playback"
 
-#: src/omc-learn.c:1435
+#: src/omc-learn.c:1425
 msgid "Play video faster"
 msgstr "Play video faster"
 
-#: src/omc-learn.c:1436
+#: src/omc-learn.c:1426
 msgid "Play video at a slightly faster rate"
 msgstr "Play video at a slightly faster rate"
 
-#: src/omc-learn.c:1439
+#: src/omc-learn.c:1429
 msgid "Play video slower"
 msgstr "Play video slower"
 
-#: src/omc-learn.c:1440
+#: src/omc-learn.c:1430
 msgid "Play video at a slightly slower rate"
 msgstr "Play video at a slightly slower rate"
 
-#: src/omc-learn.c:1443
+#: src/omc-learn.c:1433
 msgid "Toggle video freeze"
 msgstr "Toggle video freeze"
 
-#: src/omc-learn.c:1444
+#: src/omc-learn.c:1434
 msgid "Freeze video, or if already frozen, unfreeze it"
 msgstr "Freeze video, or if already frozen, unfreeze it"
 
-#: src/omc-learn.c:1447
+#: src/omc-learn.c:1437
 msgid "Set video framerate to <fps>"
 msgstr "Set video framerate to <fps>"
 
-#: src/omc-learn.c:1448
+#: src/omc-learn.c:1438
 msgid "Set framerate of foreground clip to <float fps>"
 msgstr "Set framerate of foreground clip to <float fps>"
 
-#: src/omc-learn.c:1452
+#: src/omc-learn.c:1442
 msgid "Start recording"
 msgstr "Start recording"
 
-#: src/omc-learn.c:1455
+#: src/omc-learn.c:1445
 msgid "Stop recording"
 msgstr "Stop recording"
 
-#: src/omc-learn.c:1458
+#: src/omc-learn.c:1448
 msgid "Toggle recording state"
 msgstr "Toggle recording state"
 
-#: src/omc-learn.c:1461
+#: src/omc-learn.c:1451
 msgid "Swap foreground and background clips"
 msgstr "Swap foreground and background clips"
 
-#: src/omc-learn.c:1463
+#: src/omc-learn.c:1453
 msgid "Reset effect keys"
 msgstr "Reset effect keys"
 
-#: src/omc-learn.c:1464
+#: src/omc-learn.c:1454
 msgid "Switch all effects off."
 msgstr "Switch all effects off."
 
-#: src/omc-learn.c:1467
+#: src/omc-learn.c:1457
 msgid "Enable effect key <key>"
 msgstr "Enable effect key <key>"
 
-#: src/omc-learn.c:1471
+#: src/omc-learn.c:1461
 msgid "Disable effect key <key>"
 msgstr "Disable effect key <key>"
 
-#: src/omc-learn.c:1475
+#: src/omc-learn.c:1465
 msgid "Toggle effect key <key>"
 msgstr "Toggle effect key <key>"
 
-#: src/omc-learn.c:1479
+#: src/omc-learn.c:1469
 msgid "Set parameter value <key> <pnum> = <value>"
 msgstr "Set parameter value <key> <pnum> = <value>"
 
-#: src/omc-learn.c:1480
+#: src/omc-learn.c:1470
 msgid "Set <value> of pth (numerical) parameter for effect key <key>."
 msgstr "Set <value> of pth (numerical) parameter for effect key <key>."
 
-#: src/omc-learn.c:1484
+#: src/omc-learn.c:1474
 msgid "Switch foreground to next clip"
 msgstr "Switch foreground to next clip"
 
-#: src/omc-learn.c:1487
+#: src/omc-learn.c:1477
 msgid "Switch foreground to previous clip"
 msgstr "Switch foreground to previous clip"
 
-#: src/omc-learn.c:1490
+#: src/omc-learn.c:1480
 msgid "Set video framerate to ratio <fps_ratio>"
 msgstr "Set video framerate to ratio <fps_ratio>"
 
-#: src/omc-learn.c:1491
+#: src/omc-learn.c:1481
 msgid "Set framerate ratio of foreground clip to <float fps_ratio>"
 msgstr "Set framerate ratio of foreground clip to <float fps_ratio>"
 
-#: src/omc-learn.c:1495
+#: src/omc-learn.c:1485
 msgid "Retrigger clip <clipnum>"
 msgstr "Retrigger clip <clipnum>"
 
-#: src/omc-learn.c:1496
+#: src/omc-learn.c:1486
 msgid ""
 "Switch foreground clip to the nth valid clip, and reset the frame number"
 msgstr ""
 "Switch foreground clip to the nth valid clip, and reset the frame number"
 
-#: src/omc-learn.c:1500
+#: src/omc-learn.c:1490
 msgid "Cycle to next mode for effect key <key>"
 msgstr "Cycle to next mode for effect key <key>"
 
-#: src/omc-learn.c:1504
+#: src/omc-learn.c:1494
 msgid "Cycle to previous mode for effect key <key>"
 msgstr "Cycle to previous mode for effect key <key>"
 
-#: src/omc-learn.c:1508
+#: src/omc-learn.c:1498
 msgid "Set playback plugin parameter value <pnum> = <value>"
 msgstr ""
 
-#: src/omc-learn.c:1509
+#: src/omc-learn.c:1499
 msgid "Set <value> of pth parameter for the playback plugin."
 msgstr ""
 
 #. TRANSLATORS: short form of "clip number"
-#: src/omc-learn.c:1536 src/omc-learn.c:1607
+#: src/omc-learn.c:1526 src/omc-learn.c:1597
 msgid "clipnum"
 msgstr "clipnum"
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1545
+#: src/omc-learn.c:1535
 msgid "fps"
 msgstr "fps"
 
 #. TRANSLATORS: as in keyboard key
-#: src/omc-learn.c:1553 src/omc-learn.c:1560 src/omc-learn.c:1567
-#: src/omc-learn.c:1575 src/omc-learn.c:1615 src/omc-learn.c:1623
+#: src/omc-learn.c:1543 src/omc-learn.c:1550 src/omc-learn.c:1557
+#: src/omc-learn.c:1565 src/omc-learn.c:1605 src/omc-learn.c:1613
 msgid "key"
 msgstr "key"
 
 #. TRANSLATORS: short form of "parameter number"
-#: src/omc-learn.c:1583 src/omc-learn.c:1632
+#: src/omc-learn.c:1573 src/omc-learn.c:1622
 msgid "pnum"
 msgstr "pnum"
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1599
+#: src/omc-learn.c:1589
 msgid "fps_ratio"
 msgstr "fps_ratio"
 
-#: src/omc-learn.c:2443
+#: src/omc-learn.c:2417
 #, c-format
 msgid "Saving device mapping to file %s..."
 msgstr "Saving device mapping to file %s..."
 
-#: src/omc-learn.c:2527
+#: src/omc-learn.c:2498
 #, c-format
 msgid ""
 "\n"
@@ -11099,7 +11121,7 @@
 "Error parsing file\n"
 "%s\n"
 
-#: src/omc-learn.c:2534
+#: src/omc-learn.c:2505
 #, c-format
 msgid ""
 "\n"
@@ -11112,12 +11134,12 @@
 "Invalid version in file\n"
 "%s\n"
 
-#: src/omc-learn.c:2571
+#: src/omc-learn.c:2541
 #, c-format
 msgid "Loading device mapping from file %s..."
 msgstr "Loading device mapping from file %s..."
 
-#: src/omc-learn.c:2576
+#: src/omc-learn.c:2544
 #, c-format
 msgid ""
 "\n"
@@ -11132,12 +11154,12 @@
 "%s\n"
 "Error code %d\n"
 
-#: src/videodev.c:547
+#: src/videodev.c:539
 #, c-format
 msgid "Unable to open device %s\n"
 msgstr "Unable to open device %s\n"
 
-#: src/videodev.c:564
+#: src/videodev.c:554
 #, c-format
 msgid "Opened device %s\n"
 msgstr "Opened device %s\n"
@@ -11155,10 +11177,6 @@
 #~ msgstr "_Adjust %s"
 
 #, fuzzy
-#~ msgid "Adjusting noise on"
-#~ msgstr "_Adjust %s"
-
-#, fuzzy
 #~ msgid "Blank _Colour"
 #~ msgstr "S_how Frame Counter"
 
@@ -11383,10 +11401,6 @@
 #~ msgstr "Deleting excess frames"
 
 #, fuzzy
-#~ msgid "Hue _end"
-#~ msgstr "Fade audio in"
-
-#, fuzzy
 #~ msgid "Hue _start"
 #~ msgstr "_Start"
 
@@ -11395,18 +11409,10 @@
 #~ msgstr "_Frame changes"
 
 #, fuzzy
-#~ msgid "Hue end"
-#~ msgstr "Fade audio in"
-
-#, fuzzy
 #~ msgid "Hue start"
 #~ msgstr "_Start"
 
 #, fuzzy
-#~ msgid "Modulate (BSH)"
-#~ msgstr "Pasting"
-
-#, fuzzy
 #~ msgid "Modulating"
 #~ msgstr "Pasting"
 
@@ -11419,10 +11425,6 @@
 #~ msgstr "Pasting"
 
 #, fuzzy
-#~ msgid "Normalize"
-#~ msgstr "Resizing"
-
-#, fuzzy
 #~ msgid "Normalizing"
 #~ msgstr "Resizing"
 
@@ -11531,14 +11533,6 @@
 #~ msgstr "Anchor _start"
 
 #, fuzzy
-#~ msgid "Swirl"
-#~ msgstr "Anchor _start"
-
-#, fuzzy
-#~ msgid "Swirling"
-#~ msgstr "Anchor _start"
-
-#, fuzzy
 #~ msgid "Tunnel"
 #~ msgstr "Cancelling"
 
@@ -11567,18 +11561,10 @@
 #~ msgstr "Jack transport"
 
 #, fuzzy
-#~ msgid "_Calculate"
-#~ msgstr "S_how Frame Counter"
-
-#, fuzzy
 #~ msgid "_Cycle Start"
 #~ msgstr "_Start"
 
 #, fuzzy
-#~ msgid "_Decrease Contrast"
-#~ msgstr "_Adjust %s"
-
-#, fuzzy
 #~ msgid "_End Colour"
 #~ msgstr "_Colourspace"
 
@@ -11587,10 +11573,6 @@
 #~ msgstr "_End Frame Only"
 
 #, fuzzy
-#~ msgid "_Fade level"
-#~ msgstr "Fade audio in"
-
-#, fuzzy
 #~ msgid "_Fade start"
 #~ msgstr "_Start"
 
@@ -11603,10 +11585,6 @@
 #~ msgstr "First Frame"
 
 #, fuzzy
-#~ msgid "_Flash for"
-#~ msgstr "Fade audio out"
-
-#, fuzzy
 #~ msgid "_Frames per second"
 #~ msgstr "_Frames Per Second "
 
@@ -11615,10 +11593,6 @@
 #~ msgstr "Frames"
 
 #, fuzzy
-#~ msgid "_Hold for"
-#~ msgstr "Fade audio out"
-
-#, fuzzy
 #~ msgid "_Image File"
 #~ msgstr "_File"
 
@@ -11627,10 +11601,6 @@
 #~ msgstr "_File"
 
 #, fuzzy
-#~ msgid "_Increase Contrast"
-#~ msgstr "_Adjust %s"
-
-#, fuzzy
 #~ msgid "_Link start and end colours"
 #~ msgstr "_Adjust start and end points"
 
@@ -11655,18 +11625,10 @@
 #~ msgstr "_Pointer"
 
 #, fuzzy
-#~ msgid "_Radius end"
-#~ msgstr "_Start"
-
-#, fuzzy
 #~ msgid "_Radius start"
 #~ msgstr "_Start"
 
 #, fuzzy
-#~ msgid "_Radius"
-#~ msgstr "_Start"
-
-#, fuzzy
 #~ msgid "_Random colour each frame"
 #~ msgstr "Deleting excess frames"
 
@@ -11791,10 +11753,6 @@
 #~ msgstr "Fade audio out"
 
 #, fuzzy
-#~ msgid "frame_calculator"
-#~ msgstr "S_how Frame Counter"
-
-#, fuzzy
 #~ msgid "gamma_change"
 #~ msgstr "_Frame changes"
 
@@ -11815,18 +11773,6 @@
 #~ msgstr "F_PS changes"
 
 #, fuzzy
-#~ msgid "modulate"
-#~ msgstr "Pasting"
-
-#, fuzzy
-#~ msgid "negate"
-#~ msgstr "Pasting"
-
-#, fuzzy
-#~ msgid "normalize"
-#~ msgstr "Resizing"
-
-#, fuzzy
 #~ msgid "pixilate"
 #~ msgstr "Pasting"
 
@@ -11859,10 +11805,6 @@
 #~ msgstr "Stop recording"
 
 #, fuzzy
-#~ msgid "swirl"
-#~ msgstr "Anchor _start"
-
-#, fuzzy
 #~ msgid "transition_bwthresh"
 #~ msgstr "transition"
 
@@ -11928,9 +11870,8 @@
 #~ msgid "LiVES audio error."
 #~ msgstr "LiVES: - File Error"
 
-#, fuzzy
-#~ msgid "_Open"
-#~ msgstr "_Open..."
+#~ msgid "LiVES: - Enter Set Name"
+#~ msgstr "LiVES: - Enter Set Name"
 
 #~ msgid ""
 #~ "\n"
@@ -11940,3 +11881,6 @@
 #~ "\n"
 #~ "\n"
 #~ "You need to install mplayer to be able to preview this file.\n"
+
+#~ msgid "Pause"
+#~ msgstr "Pause"

LiVES-2.2.8.tar.bz2/po/es.po -> LiVES-2.4.1.tar.bz2/po/es.po Changed

@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n"
-"POT-Creation-Date: 2015-02-08 17:18-0300\n"
+"POT-Creation-Date: 2015-08-09 14:52-0300\n"
 "PO-Revision-Date: 2014-01-01 22:33+0000\n"
 "Last-Translator: Adolfo Jayme <fitoschido@gmail.com>\n"
 "Language-Team: Spanish <es@li.org>\n"
@@ -18,8 +18,7 @@
 "X-Launchpad-Export-Date: 2014-04-13 13:12+0000\n"
 "X-Generator: Launchpad (build 16976)\n"
 
-#. TRANSLATORS: do not translate this message
-#: src/main.c:118
+#: src/main.c:128
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -33,22 +32,22 @@
 "All translators should read the LiVES translation notes at\n"
 "http://lives.sourceforge.net/TRANS-README.txt"
 
-#: src/main.c:134
+#: src/main.c:153
 #, c-format
 msgid "%s Warning: %s\n"
 msgstr "%s Aviso: %s\n"
 
-#: src/main.c:138
+#: src/main.c:157
 #, c-format
 msgid "%s Critical error: %s\n"
 msgstr "%s Error crítico: %s\n"
 
-#: src/main.c:139
+#: src/main.c:158
 #, c-format
 msgid "%s Fatal error: %s\n"
 msgstr "%s Error grave: %s\n"
 
-#: src/main.c:176
+#: src/main.c:198
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -62,7 +61,7 @@
 "group_id=64341&atid=507139\n"
 "Gracias. Debería poder recuperar su sesión reiniciando LiVES.\n"
 
-#: src/main.c:177
+#: src/main.c:199
 msgid ""
 "\n"
 "\n"
@@ -74,7 +73,7 @@
 "Cuando informe del problema, incluya detalles de su sistema operativo, "
 "distribución, y la versión de LiVES ("
 
-#: src/main.c:180
+#: src/main.c:203
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -82,7 +81,7 @@
 "y la información mostrada debajo:\n"
 "\n"
 
-#: src/main.c:184
+#: src/main.c:206
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
@@ -92,83 +91,83 @@
 "información.\n"
 "\n"
 
-#: src/main.c:192
+#: src/main.c:216
 msgid "Preserving set.\n"
 msgstr "Preservando el conjunto.\n"
 
-#: src/main.c:636
+#: src/main.c:691
 msgid "Resizing"
 msgstr "Redimensionando"
 
-#: src/main.c:643
+#: src/main.c:698
 msgid "_Resize All Frames"
 msgstr "_Redimensionar todos los cuadros"
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:895
+#: src/main.c:948
 msgid "Any"
 msgstr "Cualquiera"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:897
+#: src/main.c:950
 msgid "None"
 msgstr "Ninguno"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:899
+#: src/main.c:952
 msgid "recommended"
 msgstr "recomendado"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:901
+#: src/main.c:954
 msgid "disabled !"
 msgstr "desactivado"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:903
+#: src/main.c:956
 msgid "**The current layout**"
 msgstr "**La disposición actual**"
 
 #. TRANSLATORS: adjective for "Built in" type effects
-#: src/main.c:905
+#: src/main.c:958
 msgid "Builtin"
 msgstr "Integrado"
 
 #. TRANSLATORS: adjective for "Custom" type effects
-#: src/main.c:907
+#: src/main.c:960
 msgid "Custom"
 msgstr "Personalizado"
 
 #. TRANSLATORS: adjective for "Test" type effects
-#: src/main.c:909
+#: src/main.c:962
 msgid "Test"
 msgstr "Prueba"
 
-#: src/main.c:1054
+#: src/main.c:1107
 msgid "Foreground"
 msgstr "Frente"
 
-#: src/main.c:1055
+#: src/main.c:1108
 msgid "Background"
 msgstr "Fondo"
 
-#: src/main.c:1566
+#: src/main.c:1624
 msgid "Loading realtime effect plugins..."
 msgstr "Cargando complementos de efectos en tiempo real..."
 
-#: src/main.c:1631
+#: src/main.c:1690
 msgid "Starting jack audio server..."
 msgstr "Iniciando el servidor de audio jack..."
 
-#: src/main.c:1633
+#: src/main.c:1692
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1634
+#: src/main.c:1693
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1663
+#: src/main.c:1723
 #, c-format
 msgid ""
 "\n"
@@ -180,114 +179,114 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1697
+#: src/main.c:1758
 msgid "Starting pulse audio server..."
 msgstr "Iniciando servidor PulseAudio..."
 
-#: src/main.c:1765
+#: src/main.c:1825
 msgid "Checking optional dependencies:"
 msgstr "Comprobando dependencias opcionales:"
 
-#: src/main.c:1766
+#: src/main.c:1826
 msgid "mplayer...detected..."
 msgstr "mplayer... detectado..."
 
-#: src/main.c:1767
+#: src/main.c:1827
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer... NO DETECTADO..."
 
-#: src/main.c:1768
+#: src/main.c:1828
 #, fuzzy
 msgid "mplayer2...detected..."
 msgstr "mplayer... detectado..."
 
-#: src/main.c:1769
+#: src/main.c:1829
 #, fuzzy
 msgid "mplayer2...NOT DETECTED..."
 msgstr "mplayer... NO DETECTADO..."
 
-#: src/main.c:1770
+#: src/main.c:1830
 msgid "convert...detected..."
 msgstr "convert... Detectado..."
 
-#: src/main.c:1771
+#: src/main.c:1831
 msgid "convert...NOT DETECTED..."
 msgstr "convert... NO DETECTADO..."
 
-#: src/main.c:1772
+#: src/main.c:1832
 msgid "composite...detected..."
 msgstr "composite... detectado..."
 
-#: src/main.c:1773
+#: src/main.c:1833
 msgid "composite...NOT DETECTED..."
 msgstr "composite... NO DETECTADO..."
 
-#: src/main.c:1774
+#: src/main.c:1834
 msgid "sox...detected\n"
 msgstr "sox... detectado\n"
 
-#: src/main.c:1775
+#: src/main.c:1835
 msgid "sox...NOT DETECTED\n"
 msgstr "sox... NO DETECTADO\n"
 
-#: src/main.c:1776
+#: src/main.c:1836
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav... detectado..."
 
-#: src/main.c:1777
+#: src/main.c:1837
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav... NO DETECTADO..."
 
-#: src/main.c:1778
+#: src/main.c:1838
 msgid "jackd...detected..."
 msgstr "jackd... detectado..."
 
-#: src/main.c:1779
+#: src/main.c:1839
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd... NO DETECTADO..."
 
-#: src/main.c:1780
+#: src/main.c:1840
 msgid "pulse audio...detected..."
 msgstr "pulse audio...detectado..."
 
-#: src/main.c:1781
+#: src/main.c:1841
 msgid "pulse audio...NOT DETECTED..."
 msgstr "pulse audio...NO DETECTADO..."
 
-#: src/main.c:1782
+#: src/main.c:1842
 msgid "python...detected..."
 msgstr "python... detectado..."
 
-#: src/main.c:1783
+#: src/main.c:1843
 msgid "python...NOT DETECTED..."
 msgstr "python... NO DETECTADO..."
 
-#: src/main.c:1784
+#: src/main.c:1844
 msgid "dvgrab...detected..."
 msgstr "dvgrab... detectado..."
 
-#: src/main.c:1785
+#: src/main.c:1845
 msgid "dvgrab...NOT DETECTED..."
 msgstr "dvgrab... NO DETECTADO..."
 
-#: src/main.c:1786
+#: src/main.c:1846
 msgid "xwininfo...detected..."
 msgstr "xwininfo... detectado..."
 
-#: src/main.c:1787
+#: src/main.c:1847
 msgid "xwininfo...NOT DETECTED..."
 msgstr "xwininfo... NO DETECTADO..."
 
-#: src/main.c:1793
+#: src/main.c:1853
 #, c-format
 msgid "Windows version %04X"
 msgstr "Versión de Windows %04X"
 
-#: src/main.c:1795
+#: src/main.c:1855
 msgid "UNKNOWN - please patch me !"
 msgstr ""
 
-#: src/main.c:1799
+#: src/main.c:1859
 #, c-format
 msgid ""
 "\n"
@@ -298,48 +297,48 @@
 "\n"
 "El gestor de ventanas se reporta como «%s»; "
 
-#: src/main.c:1802
+#: src/main.c:1862
 #, c-format
 msgid "number of monitors detected: %d\n"
 msgstr "número de monitores detectados: %d\n"
 
-#: src/main.c:1805
+#: src/main.c:1865
 #, c-format
 msgid "Number of CPUs detected: %d "
 msgstr "Cantidad de CPU detectadas: %d "
 
-#: src/main.c:1808 src/multitrack.c:4902
+#: src/main.c:1868 src/multitrack.c:5068
 msgid "little endian"
 msgstr ""
 
-#: src/main.c:1809 src/multitrack.c:4901
+#: src/main.c:1869 src/multitrack.c:5067
 msgid "big endian"
 msgstr ""
 
-#: src/main.c:1810
+#: src/main.c:1870
 #, c-format
 msgid "(%d bits, %s)\n"
 msgstr "(%d bits, %s)\n"
 
-#: src/main.c:1814
+#: src/main.c:1874
 msgid "GUI type is: "
 msgstr "El tipo de IGU es: "
 
-#: src/main.c:1818
+#: src/main.c:1878
 #, c-format
 msgid "GTK+ version %d.%d.%d (compiled with %d.%d.%d)"
 msgstr "Versión de GTK+ %d.%d.%d (compilada con %d.%d.%d)"
 
-#: src/main.c:1840
+#: src/main.c:1900
 msgid ", with cairo support"
 msgstr ", compatible con Cairo"
 
-#: src/main.c:1847
+#: src/main.c:1907
 #, c-format
 msgid "Temp directory is %s\n"
 msgstr "El directorio temporal es %s\n"
 
-#: src/main.c:1851
+#: src/main.c:1911
 msgid ""
 "WARNING - this version of LiVES was compiled without either\n"
 "jack or pulse audio support.\n"
@@ -349,15 +348,15 @@
 "para jack o pulse audio.\n"
 "No estarán disponibles muchas funciones de sonido.\n"
 
-#: src/main.c:1854
+#: src/main.c:1914
 msgid "Compiled with jack support, good !\n"
 msgstr "Compilado con soporte para jack, ¡bien!\n"
 
-#: src/main.c:1857
+#: src/main.c:1917
 msgid "Compiled with pulse audio support, wonderful !\n"
 msgstr "Se compiló con compatibilidad con PulseAudio, ¡fantástico!\n"
 
-#: src/main.c:1861
+#: src/main.c:1921
 #, c-format
 msgid ""
 "Welcome to LiVES version %s.\n"
@@ -366,7 +365,7 @@
 "Bienvenido a LiVES versión %s.\n"
 "\n"
 
-#: src/main.c:2306
+#: src/main.c:2380
 #, c-format
 msgid ""
 "\n"
@@ -375,86 +374,91 @@
 "\n"
 "La sintaxis de inicio es: %s [opts] [nombredearchivo [start_time] [frames]]\n"
 
-#: src/main.c:2307
+#: src/main.c:2381
 msgid "Where: filename is the name of a media file or backup file.\n"
 msgstr ""
 "Donde: nombredearchivo es el nombre de un archivo multimedia o de respaldo.\n"
 
-#: src/main.c:2308
+#: src/main.c:2382
 msgid "start_time : filename start time in seconds\n"
 msgstr "tiempo_inicio: tiempo de inicio del nombre de archivo en segundos\n"
 
-#: src/main.c:2309
+#: src/main.c:2383
 msgid "frames : maximum number of frames to open\n"
 msgstr "cuadros: número máximo de cuadros a abrir\n"
 
-#: src/main.c:2311
+#: src/main.c:2385
 msgid "opts can be:\n"
 msgstr "los opcionales pueden ser:\n"
 
-#: src/main.c:2312
+#: src/main.c:2386
 msgid "-help            : show this help text and exit\n"
 msgstr "help: muestra este texto de ayuda y sale\n"
 
-#: src/main.c:2313
+#: src/main.c:2387
 msgid "-tmpdir <tempdir>: use alternate working directory (e.g /var/ramdisk)\n"
 msgstr ""
 
-#: src/main.c:2314
+#: src/main.c:2388
 msgid "-set <setname>   : autoload clip set setname\n"
 msgstr "-set <nombredeset>: autocarga un clip set nombredeset\n"
 
-#: src/main.c:2315
+#: src/main.c:2389
 msgid "-noset           : do not load any set on startup\n"
 msgstr "-noset: no carga ningún ser al iniciar\n"
 
-#: src/main.c:2316
+#: src/main.c:2390
 msgid "-norecover       : force no-loading of crash recovery\n"
 msgstr "-norecover: fuerza la no restauración post crash\n"
 
-#: src/main.c:2317
+#: src/main.c:2391
 msgid "-recover         : force loading of crash recovery\n"
 msgstr "-recover: fuerza la recuperación post crash\n"
 
-#: src/main.c:2318
-msgid "-nothreaddialog  : doe nothing - retained for backwards compatibility\n"
+#: src/main.c:2392
+msgid ""
+"-nothreaddialog  : does nothing - retained for backwards compatibility\n"
 msgstr ""
 
-#: src/main.c:2319
+#: src/main.c:2393
 msgid "-nogui           : do not show the gui\n"
 msgstr "-nogui: no muestra la interfaz gráfica\n"
 
-#: src/main.c:2320
+#: src/main.c:2394
 msgid "-nosplash        : do not show the splash window\n"
 msgstr "-nosplash        : no mostrar la pantalla de inicio\n"
 
-#: src/main.c:2321
+#: src/main.c:2395
 msgid "-noplaywin       : do not show the play window\n"
 msgstr "-noplaywin       : no mostrar la ventana de reproducción\n"
 
-#: src/main.c:2322
+#: src/main.c:2396
+msgid "-noninteractive  : disable menu interactivity\n"
+msgstr ""
+
+#: src/main.c:2397
 msgid "-startup-ce      : start in clip editor mode\n"
 msgstr "-startup-ce : inicia en modo editor de copiado.\n"
 
-#: src/main.c:2323
+#: src/main.c:2398
 msgid "-startup-mt      : start in multitrack mode\n"
 msgstr "-startup-mt : inicia en modo multipista.\n"
 
-#: src/main.c:2324
+#: src/main.c:2399
 msgid ""
 "-fxmodesmax <n>  : allow <n> modes per effect key (minimum is 1, default is "
 "8)\n"
 msgstr ""
 
-#: src/main.c:2326
+#: src/main.c:2401
 msgid "-oscstart <port> : start OSC listener on UDP port <port>\n"
 msgstr "-oscstart <puerto>: inicia la escucha OSC en el puerto UDP <port>\n"
 
-#: src/main.c:2327
+#: src/main.c:2402
 msgid "-nooscstart      : do not start OSC listener\n"
 msgstr "-nooscstart: no inicia la escucha OSC\n"
 
-#: src/main.c:2329
+#: src/main.c:2404
 #, fuzzy
 msgid ""
 "-aplayer <ap>    : start with selected audio player. <ap> can be mplayer, "
@@ -464,15 +468,15 @@
 "ser mplayer"
 
 #. TRANSLATORS: pulse (audio)
-#: src/main.c:2332
+#: src/main.c:2407
 msgid ", pulse"
 msgstr ", pulse"
 
-#: src/main.c:2335
+#: src/main.c:2410
 msgid ", sox or jack\n"
 msgstr ", sox o jack\n"
 
-#: src/main.c:2336
+#: src/main.c:2412
 msgid ""
 "-jackopts <opts>    : opts is a bitmap of jack startup options [1 = jack "
 "transport client, 2 = jack transport master, 4 = start jack transport "
@@ -483,29 +487,29 @@
 "maestro, 4 = iniciar servidor de transporte de jack, 8 = pausar audio cuando "
 "vídeo sea pausado, 16 = inicar servidor de audio jack] \n"
 
-#: src/main.c:2338
+#: src/main.c:2414
 msgid " or sox\n"
 msgstr " o sox\n"
 
-#: src/main.c:2340
+#: src/main.c:2416
 msgid "-devicemap <mapname>          : autoload devicemap\n"
 msgstr "-mapadispositivos <nombremapa>  : autocargar mapadispositivos\n"
 
-#: src/main.c:2341
+#: src/main.c:2418
 msgid ""
 "-vppdefaults <file>          : load video playback plugin defaults from "
 "<file> (Note: only sets the settings, not the plugin type)\n"
 msgstr ""
 
-#: src/main.c:2342
+#: src/main.c:2419
 msgid "-debug            : try to debug crashes (requires 'gdb' installed)\n"
 msgstr "-depurar: trata de errores de depuración (requiere 'gdb' instalado)\n"
 
-#: src/main.c:2373 src/gui.c:1128
+#: src/main.c:2449 src/gui.c:1127
 msgid "Starting GUI..."
 msgstr "Iniciando GUI..."
 
-#: src/main.c:2396
+#: src/main.c:2475
 #, c-format
 msgid ""
 "\n"
@@ -522,7 +526,7 @@
 "%s/%s.\n"
 "(Quizá necesite cambiar el valor de <prefix_dir> en su archivo %s)\n"
 
-#: src/main.c:2410
+#: src/main.c:2492
 #, c-format
 msgid ""
 "\n"
@@ -533,7 +537,7 @@
 "LiVES no pudo crear un archivo pequeño en %s\n"
 "Asegúrese de que tiene acceso de escritura a %s e inténtelo de nuevo.\n"
 
-#: src/main.c:2415
+#: src/main.c:2498
 msgid ""
 "\n"
 "`smogrify` must be in your path, and be executable\n"
@@ -547,7 +551,7 @@
 "Por favor, lea el archivo README que viene con este paquete\n"
 "antes de iniciar LiVES.\n"
 
-#: src/main.c:2421
+#: src/main.c:2504
 #, c-format
 msgid ""
 "\n"
@@ -557,7 +561,7 @@
 "Please check the file permissions for this file and try again.\n"
 msgstr ""
 
-#: src/main.c:2428
+#: src/main.c:2512
 #, c-format
 msgid ""
 "\n"
@@ -568,7 +572,7 @@
 "and try again.\n"
 msgstr ""
 
-#: src/main.c:2438
+#: src/main.c:2522
 #, c-format
 msgid ""
 "Please check the <tempdir> setting in \n"
@@ -576,7 +580,7 @@
 "and try again.\n"
 msgstr ""
 
-#: src/main.c:2445
+#: src/main.c:2528
 #, c-format
 msgid ""
 "\n"
@@ -591,7 +595,7 @@
 "\n"
 "%s"
 
-#: src/main.c:2453
+#: src/main.c:2536
 msgid ""
 "\n"
 "An incorrect version of smogrify was found in your path.\n"
@@ -609,7 +613,7 @@
 "\n"
 "Gracias.\n"
 
-#: src/main.c:2458
+#: src/main.c:2541
 #, fuzzy
 msgid ""
 "\n"
@@ -620,7 +624,7 @@
 "LiVES requiere actualmente de 'mplayer' o 'sox' para funcionar. Por favor, "
 "instale alguno de ellos, e intente nuevamente.\n"
 
-#: src/main.c:2462
+#: src/main.c:2546
 #, fuzzy
 msgid ""
 "\n"
@@ -631,7 +635,7 @@
 "LiVES requiere actualmente de 'mplayer' o 'sox' para funcionar. Por favor, "
 "instale alguno de ellos, e intente nuevamente.\n"
 
-#: src/main.c:2472
+#: src/main.c:2556
 #, fuzzy
 msgid ""
 "\n"
@@ -642,7 +646,7 @@
 "LiVES no pudo encontrar 'mplayer'. Puede que usted desee instalar mplayer "
 "para usar LiVES de manera más completa.\n"
 
-#: src/main.c:2475
+#: src/main.c:2561
 msgid ""
 "\n"
 "LiVES was unable to locate 'convert'. You should install convert and image-"
@@ -652,7 +656,7 @@
 "LiVES no pudo encontrar 'convert'. Debe instalar convert e image-magick si "
 "desea utilizar efectos de renderizado.\n"
 
-#: src/main.c:2478
+#: src/main.c:2566
 msgid ""
 "\n"
 "LiVES was unable to locate 'composite'. You should install composite and "
@@ -662,7 +666,7 @@
 "LiVES no pudo encontrar 'composite'. Debe instalar composite e image-magick "
 "si desea utilizar la función fusionar.\n"
 
-#: src/main.c:2481
+#: src/main.c:2570
 msgid ""
 "\n"
 "LiVES was unable to locate 'sox'. Some audio features may not work. You "
@@ -672,7 +676,7 @@
 "LiVES no pudo encontrar 'sox'. Puede que lgunas características de audio no "
 "funcionen. Debe instalar 'sox'.\n"
 
-#: src/main.c:2484
+#: src/main.c:2575
 #, c-format
 msgid ""
 "\n"
@@ -683,59 +687,59 @@
 "You may need to change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/main.c:2611
+#: src/main.c:2707
 #, c-format
 msgid "Autoloading set %s..."
 msgstr "Autocargando conjunto %s..."
 
 #. TRANSLATORS: localised name may be used here
-#: src/main.c:2781 src/interface.c:738
+#: src/main.c:2902
 msgid "LiVES"
 msgstr "LiVES"
 
-#: src/main.c:2948
+#: src/main.c:3066
 #, c-format
 msgid "Invalid audio player %s\n"
 msgstr "Reproductor de audio no válido %s\n"
 
-#: src/main.c:3077
+#: src/main.c:3214
 #, c-format
 msgid "LiVES-%s: <Untitled%d> %dx%d : %d frames %d bpp %.3f fps"
 msgstr "LiVES-%s: <%d Sintítulo> %dx%d : %d cuadros %d bpp %.3f cps"
 
-#: src/main.c:3082
+#: src/main.c:3219
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : ??? frames ??? bpp %.3f fps"
 msgstr "LiVES-%s: <%s> %dx%d : ??? cuadros ??? bpp %.3f cps"
 
-#: src/main.c:3086
+#: src/main.c:3222
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : %d frames %d bpp %.3f fps"
 msgstr "LiVES-%s: <%s> %dx%d : %d cuadros %d bpp %.3f cps"
 
-#: src/main.c:3094
+#: src/main.c:3229
 #, c-format
 msgid "LiVES-%s: <No File>"
 msgstr "LiVES-%s: <No hay archivo>"
 
 #. TRANSLATORS: rec(ord)
-#: src/main.c:5085
+#: src/main.c:5201
 #, c-format
 msgid "rec %9d/%d"
 msgstr "rec %9d/%d"
 
 #. TRANSLATORS: out of memory (rec(ord))
-#: src/main.c:5091
+#: src/main.c:5206
 #, c-format
 msgid "!rec %9d/%d"
 msgstr "!rec %9d/%d"
 
-#: src/main.c:5398 src/main.c:5399 src/gui.c:2110 src/gui.c:3220
-#: src/saveplay.c:2336
+#: src/main.c:5500 src/main.c:5501 src/gui.c:2108 src/gui.c:3331
+#: src/saveplay.c:2315
 msgid "Play"
 msgstr "Reproducir"
 
-#: src/main.c:6128
+#: src/main.c:6216
 msgid ""
 "LiVES was unable to capture this image\n"
 "\n"
@@ -743,35 +747,35 @@
 "LiVES no pudo capturar esta imagen\n"
 "\n"
 
-#: src/main.c:6250
+#: src/main.c:6345
 #, c-format
 msgid "Closed file %s\n"
 msgstr "Archivo %s cerrado\n"
 
-#: src/main.c:6452 src/gui.c:648 src/utils.c:4312 src/utils.c:4344
-#: src/saveplay.c:3550 src/multitrack.c:4510 src/multitrack.c:6268
+#: src/main.c:6542 src/gui.c:647 src/utils.c:4256 src/utils.c:4286
+#: src/saveplay.c:3500 src/multitrack.c:4678 src/multitrack.c:6447
 msgid "_Undo"
 msgstr "_Deshacer"
 
-#: src/main.c:6453 src/gui.c:666 src/utils.c:4313 src/utils.c:4345
-#: src/saveplay.c:3551 src/multitrack.c:4531 src/multitrack.c:6293
+#: src/main.c:6543 src/gui.c:665 src/utils.c:4257 src/utils.c:4287
+#: src/saveplay.c:3501 src/multitrack.c:4698 src/multitrack.c:6472
 msgid "_Redo"
 msgstr "_Rehacer"
 
-#: src/main.c:6493 src/interface.c:470 src/gui.c:2326 src/preferences.c:2357
-#: src/resample.c:1516
+#: src/main.c:6583 src/interface.c:457 src/gui.c:2324 src/preferences.c:2391
+#: src/resample.c:1488
 msgid "Video"
 msgstr "Vídeo"
 
-#: src/main.c:6494 src/interface.c:483 src/gui.c:2351
+#: src/main.c:6584 src/interface.c:470 src/gui.c:2348
 msgid "Left Audio"
 msgstr "Audio izquierda"
 
-#: src/main.c:6495 src/gui.c:2375
+#: src/main.c:6585 src/gui.c:2371
 msgid "Right Audio"
 msgstr "Audio derecha"
 
-#: src/main.c:6540
+#: src/main.c:6630
 #, fuzzy
 msgid ""
 "\n"
@@ -787,11 +791,11 @@
 "Por favor, ajuste las opciones de reproducción en Preferencias e intente "
 "nuevamente.\n"
 
-#: src/main.c:7051 src/plugins.c:1502
+#: src/main.c:7134 src/plugins.c:1468
 msgid "LiVES: - Play Window"
 msgstr "LiVES: - Ventana de reproducción"
 
-#: src/startup.c:25
+#: src/startup.c:24
 #, c-format
 msgid ""
 "A directory named\n"
@@ -801,7 +805,7 @@
 "(Free space = %s)\n"
 msgstr ""
 
-#: src/startup.c:32
+#: src/startup.c:29
 #, c-format
 msgid ""
 "A directory named\n"
@@ -811,7 +815,7 @@
 "Please select another location.\n"
 msgstr ""
 
-#: src/startup.c:49
+#: src/startup.c:46
 #, c-format
 msgid ""
 "\n"
@@ -822,7 +826,7 @@
 "(Free space = %s)"
 msgstr ""
 
-#: src/startup.c:54
+#: src/startup.c:50
 #, c-format
 msgid ""
 "\n"
@@ -831,11 +835,11 @@
 "Please try again and choose a different location.\n"
 msgstr ""
 
-#: src/startup.c:96
+#: src/startup.c:92
 msgid "Directory name is too long !"
 msgstr "¡El nombre del directorio es demasiado largo!"
 
-#: src/startup.c:223
+#: src/startup.c:216
 msgid ""
 "LiVES FAILED TO START YOUR SELECTED AUDIO PLAYER !\n"
 "\n"
@@ -843,14 +847,14 @@
 "LiVES FALLO AL INICIAR EL REPRODUCTOR DE AUDIO SELECCIONADO!\n"
 "\n"
 
-#: src/startup.c:230
+#: src/startup.c:222
 msgid ""
 "Before starting LiVES, you need to choose an audio player.\n"
 "\n"
 "PULSE AUDIO is recommended for most users"
 msgstr "Antes de iniciar LiVES, necesita escoger un reproductor de audio."
 
-#: src/startup.c:233
+#: src/startup.c:225
 msgid ""
 ", but this version of LiVES was not compiled with pulse audio support.\n"
 "\n"
@@ -858,7 +862,7 @@
 ", pero esta versión de LiVES no fue compilada con soporte para pulse audio.\n"
 "\n"
 
-#: src/startup.c:236
+#: src/startup.c:229
 msgid ""
 ", but you do not have pulse audio installed on your system.\n"
 " You are advised to install pulse audio first before running LiVES.\n"
@@ -869,11 +873,11 @@
 "LiVES\n"
 "\n"
 
-#: src/startup.c:241
+#: src/startup.c:233
 msgid "JACK audio is recommended for pro users"
 msgstr "JACK audio es recomendado para usuarios profesionales"
 
-#: src/startup.c:244
+#: src/startup.c:236
 msgid ""
 ", but this version of LiVES was not compiled with jack audio support.\n"
 "\n"
@@ -881,7 +885,7 @@
 ", pero esta versión de LiVES no fue compilada con soporte para jack audio\n"
 "\n"
 
-#: src/startup.c:247
+#: src/startup.c:239
 msgid ""
 ", but you do not have jackd installed. You may wish to install jackd first "
 "before running LiVES.\n"
@@ -891,7 +895,7 @@
 "primero antes de ejecutar LiVES.\n"
 "\n"
 
-#: src/startup.c:250
+#: src/startup.c:242
 msgid ""
 ", but may prevent LiVES from starting on some systems.\n"
 "If LiVES will not start with jack, you can restart and try with another "
@@ -903,11 +907,11 @@
 "reproductor de audio en su lugar.\n"
 "\n"
 
-#: src/startup.c:254
+#: src/startup.c:246
 msgid "SOX may be used if neither of the preceding players work, "
 msgstr "SOX puede utilizarse si ninguno de los sistemas  anteriores trabajan, "
 
-#: src/startup.c:257
+#: src/startup.c:249
 msgid ""
 "but some audio features will be disabled.\n"
 "\n"
@@ -915,7 +919,7 @@
 "pero algunas características de audio se desactivarán.\n"
 "\n"
 
-#: src/startup.c:260
+#: src/startup.c:251
 msgid ""
 "but you do not have sox installed.\n"
 "You are advised to install it before running LiVES.\n"
@@ -925,7 +929,7 @@
 "Se recomienda instalarlo antes de ejecutar LiVES\n"
 "\n"
 
-#: src/startup.c:264
+#: src/startup.c:255
 #, fuzzy
 msgid ""
 "The MPLAYER/MPLAYER2 audio player is only recommended for testing purposes.\n"
@@ -935,97 +939,97 @@
 "prueba.\n"
 "\n"
 
-#: src/startup.c:281
+#: src/startup.c:271
 msgid "LiVES: - Choose an audio player"
 msgstr "LiVES: - Seleccione un reproductor de audio"
 
-#: src/startup.c:298
+#: src/startup.c:288
 msgid "Use _pulse audio player"
 msgstr "Usar reproductor _pulse audio"
 
-#: src/startup.c:320
+#: src/startup.c:310
 msgid "Use _jack audio player"
 msgstr "Utilizar el reproductor de audio _jack"
 
-#: src/startup.c:340
+#: src/startup.c:330
 msgid "Use _sox audio player"
 msgstr "Usar reproductor _sox audio"
 
-#: src/startup.c:361
+#: src/startup.c:351
 msgid "Use _mplayer audio player"
 msgstr "Usar reproductor _mplayer audio"
 
-#: src/startup.c:381
+#: src/startup.c:371
 #, fuzzy
 msgid "Use _mplayer2 audio player"
 msgstr "Usar reproductor _mplayer audio"
 
-#: src/startup.c:405 src/startup.c:580 src/interface.c:1506
+#: src/startup.c:395 src/startup.c:569 src/interface.c:1398
 msgid "_Next"
 msgstr "_Siguiente"
 
-#: src/startup.c:445
+#: src/startup.c:435
 msgid "Skipped"
 msgstr "Ignorado"
 
-#: src/startup.c:460
+#: src/startup.c:450
 msgid "Passed"
 msgstr "Correcto"
 
-#: src/startup.c:493
+#: src/startup.c:483
 msgid "Failed"
 msgstr "Fallido"
 
-#: src/startup.c:552
+#: src/startup.c:542
 msgid "LiVES: - Testing Configuration"
 msgstr "LiVES: - Configuración de prueba"
 
-#: src/startup.c:555
+#: src/startup.c:544
 msgid "LiVES: - Troubleshoot"
 msgstr "LiVES: - Resolución de problemas"
 
-#: src/startup.c:568
+#: src/startup.c:557
 msgid "LiVES will now run some basic configuration tests\n"
 msgstr "LiVES ahora ejecutará algunas pruebas básicas de configuración\n"
 
-#: src/startup.c:603
+#: src/startup.c:591
 msgid "Checking for \"sox\" presence"
 msgstr "Comprobando la presencia de «sox»"
 
-#: src/startup.c:607
+#: src/startup.c:595
 msgid ""
 "You should install sox to be able to use all the audio features in LiVES"
 msgstr ""
 "Debería instalar sox para poder utilizar todas las características de audio "
 "en LiVES"
 
-#: src/startup.c:615
+#: src/startup.c:602
 msgid "Checking if sox can convert audio"
 msgstr "Verificando si sox puede convertir audio"
 
-#: src/startup.c:638
+#: src/startup.c:625
 msgid "Unable to allocate 176400 bytes memory."
 msgstr ""
 
-#: src/startup.c:653
+#: src/startup.c:639
 #, c-format
 msgid "Unable to write to: %s"
 msgstr "No se pudo escribir en: %s"
 
-#: src/startup.c:667 src/startup.c:807
+#: src/startup.c:653 src/startup.c:789
 #, c-format
 msgid "Command failed: %s"
 msgstr "Ha fallado la orden: %s"
 
-#: src/startup.c:689
+#: src/startup.c:675
 msgid "You should install sox_fmt_all or similar"
 msgstr "Debería instalar sox_fmt_all o similares"
 
-#: src/startup.c:717
+#: src/startup.c:703
 msgid "Checking for \"mplayer\" presence"
 msgstr "Comprobando la presencia de «mplayer»"
 
-#: src/startup.c:721
+#: src/startup.c:707
 #, fuzzy
 msgid ""
 "You should install mplayer or mplayer2 to be able to use all the decoding "
@@ -1034,44 +1038,44 @@
 "Debería instalar mplayer para poder utilizar todas las opciones de "
 "decodificación en LiVES"
 
-#: src/startup.c:747
+#: src/startup.c:732
 msgid "Checking if mplayer can convert audio"
 msgstr "Comprobando si mplayer puede convertir audio"
 
-#: src/startup.c:768
+#: src/startup.c:751
 #, fuzzy
 msgid "You should install mplayer or mplayer2 with pcm/wav support"
 msgstr "Debería instalar  mplayer con soporte pcm/wav"
 
-#: src/startup.c:785
+#: src/startup.c:767
 msgid "Checking if mplayer can decode to png/alpha"
 msgstr "Comprobando si mplayer puede descodificar a png/alpha"
 
-#: src/startup.c:828
+#: src/startup.c:810
 msgid "You may wish to upgrade mplayer to a newer version"
 msgstr "Tal vez desee actualizar mplayer a una versión nueva"
 
-#: src/startup.c:854
+#: src/startup.c:836
 msgid "Checking if mplayer can decode to jpeg"
 msgstr "Comprobando si mplayer puede descodificar a jpeg"
 
-#: src/startup.c:882
+#: src/startup.c:862
 msgid "You should install mplayer with either png/alpha or jpeg support"
 msgstr "Debería instalar mplayer con otro soporte de png/alpha o jpeg"
 
-#: src/startup.c:883
+#: src/startup.c:863
 msgid "You may wish to add jpeg output support to mplayer"
 msgstr "Tal vez desee añadir soporte de salida jpeg a mplayer"
 
-#: src/startup.c:892
+#: src/startup.c:872
 msgid "Checking for \"convert\" presence"
 msgstr "Verificando la presencia de «convert»"
 
-#: src/startup.c:896
+#: src/startup.c:876
 msgid "Install imageMagick to be able to use all of the rendered effects"
 msgstr "Instale imageMagick para poder usar todos los efectos renderizados"
 
-#: src/startup.c:909
+#: src/startup.c:889
 msgid ""
 "\n"
 "\n"
@@ -1079,7 +1083,7 @@
 "Preferences/Decoding.    \n"
 msgstr ""
 
-#: src/startup.c:915
+#: src/startup.c:894
 msgid ""
 "\n"
 "\n"
@@ -1091,7 +1095,7 @@
 "    Pulse Cancelar para salir e instalar cualquier componente faltante, o "
 "Siguiente para continuar    \n"
 
-#: src/startup.c:949
+#: src/startup.c:928
 msgid ""
 "\n"
 "\n"
@@ -1101,7 +1105,7 @@
 "\n"
 "Finalmente, puede elegir la interfaz de inicio por defecto para LiVES.\n"
 
-#: src/startup.c:950
+#: src/startup.c:929
 msgid ""
 "\n"
 "\n"
@@ -1112,7 +1116,7 @@
 "LiVES tiene dos interfaces principales y puede iniciar con cualquiera de "
 "ellas.\n"
 
-#: src/startup.c:951
+#: src/startup.c:930
 msgid ""
 "\n"
 "\n"
@@ -1122,30 +1126,30 @@
 "\n"
 "Lo predeterminado siempre puede cambiarse después en Preferencias.\n"
 
-#: src/startup.c:961
+#: src/startup.c:940
 msgid "LiVES: - Choose the startup interface"
 msgstr "LiVES: - Elija la interfaz de inicio"
 
-#: src/startup.c:972
+#: src/startup.c:951
 msgid "Start in _Clip Edit mode"
 msgstr ""
 
-#: src/startup.c:975
+#: src/startup.c:954
 msgid "This is the best choice for simple editing tasks and for VJs\n"
 msgstr ""
 
-#: src/startup.c:981
+#: src/startup.c:960
 msgid "Start in _Multitrack mode"
 msgstr "Inicie en modo _multipista"
 
-#: src/startup.c:983
+#: src/startup.c:962
 msgid ""
 "This is a better choice for complex editing tasks involving multiple clips.\n"
 msgstr ""
 "Esta es una mejor opción para tareas de edición complejas que impliquen "
 "varios clips.\n"
 
-#: src/startup.c:992
+#: src/startup.c:971
 msgid "_Finish"
 msgstr "_Terminar"
 
@@ -1162,38 +1166,38 @@
 msgid "Apply _Deinterlace"
 msgstr ""
 
-#: src/interface.c:66
+#: src/interface.c:65
 msgid "If this is set, frames will be deinterlaced as they are imported."
 msgstr ""
 "Si esto se elige, los cuadros serán desentrelazados mientras son importados."
 
-#: src/interface.c:113 src/callbacks.c:9623 src/callbacks.c:9646
-#: src/callbacks.c:9647 src/gui.c:3223 src/gui.c:3821 src/saveplay.c:2339
-#: src/saveplay.c:3138 src/dialogs.c:1514 src/dialogs.c:1515
-#: src/dialogs.c:1746 src/dialogs.c:1747 src/framedraw.c:238
-#: src/multitrack.c:8031
+#: src/interface.c:106 src/callbacks.c:9542 src/callbacks.c:9564
+#: src/callbacks.c:9565 src/gui.c:3333 src/gui.c:3946 src/saveplay.c:2317
+#: src/saveplay.c:3097 src/dialogs.c:1575 src/dialogs.c:1576
+#: src/dialogs.c:1804 src/dialogs.c:1805 src/framedraw.c:236
+#: src/multitrack.c:8210
 msgid "Preview"
 msgstr "Previsualización"
 
-#: src/interface.c:132
+#: src/interface.c:125
 msgid "Click here to _Preview any selected video, image or audio file"
 msgstr ""
 "Clic aquí para _Preview cualquier archivo de audio, imagen o video "
 "seleccionado."
 
-#: src/interface.c:135
+#: src/interface.c:127
 msgid "Click here to _Preview any selected audio file"
 msgstr "Clic aquí para _Preview cualquier archivo de audio seleccionado"
 
-#: src/interface.c:138
+#: src/interface.c:129
 msgid "Click here to _Preview the video"
 msgstr "Clic aquí para _Preview el vídeo"
 
-#: src/interface.c:181 src/dialogs.c:2542
+#: src/interface.c:169 src/dialogs.c:2621
 msgid "LiVES: - Processing..."
 msgstr "LiVES: - Procesando..."
 
-#: src/interface.c:217
+#: src/interface.c:205
 msgid ""
 "\n"
 "\n"
@@ -1207,8 +1211,8 @@
 "\n"
 "¡Recuerde desactivar los efectos (ctrl-0) después!"
 
-#: src/interface.c:222 src/callbacks.c:9373 src/callbacks.c:9420
-#: src/dialogs.c:2570
+#: src/interface.c:210 src/callbacks.c:9283 src/callbacks.c:9332
+#: src/dialogs.c:2649
 msgid ""
 "\n"
 "Please Wait"
@@ -1216,190 +1220,178 @@
 "\n"
 "Por favor, espere."
 
-#: src/interface.c:242
+#: src/interface.c:230
 msgid "Show Details"
 msgstr "Mostrar detalles"
 
-#: src/interface.c:254 src/dialogs.c:2584
+#: src/interface.c:242 src/dialogs.c:2663
 msgid "_Enough"
 msgstr "_Suficiente"
 
-#: src/interface.c:255 src/framedraw.c:278
+#: src/interface.c:243 src/framedraw.c:276
 msgid "_Preview"
 msgstr "_Previsualizar"
 
-#: src/interface.c:257
+#: src/interface.c:245 src/callbacks.c:9282 src/callbacks.c:9330
 msgid "Paus_e"
 msgstr "Pau_sa"
 
-#: src/interface.c:258 src/callbacks.c:9417
+#: src/interface.c:246 src/callbacks.c:9329
 msgid "Pause/_Enough"
 msgstr ""
 
-#: src/interface.c:285
+#: src/interface.c:273
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: src/interface.c:374
+#: src/interface.c:361
 #, c-format
 msgid "LiVES: - %s"
 msgstr ""
 
-#: src/interface.c:376
+#: src/interface.c:363
 msgid "LiVES: - Multitrack details"
 msgstr ""
 
-#: src/interface.c:407
+#: src/interface.c:394
 msgid "Format"
 msgstr "Formatear"
 
-#: src/interface.c:412
+#: src/interface.c:399
 msgid "Frame size"
 msgstr "Tamaño del fotograma"
 
-#: src/interface.c:417
+#: src/interface.c:404
 msgid "File size"
 msgstr "Tamaño de archivo"
 
-#: src/interface.c:418
+#: src/interface.c:405
 msgid "Byte size"
 msgstr "Tamaño de byte"
 
-#: src/interface.c:423 src/interface.c:1891
+#: src/interface.c:410 src/interface.c:1760
 msgid "FPS"
 msgstr "CPS"
 
-#: src/interface.c:428
+#: src/interface.c:415
 msgid "Frames"
 msgstr "Fotogramas"
 
-#: src/interface.c:429
+#: src/interface.c:416
 msgid "Events"
 msgstr "Eventos"
 
-#: src/interface.c:434 src/interface.c:500 src/interface.c:542
+#: src/interface.c:421 src/interface.c:486 src/interface.c:528
 msgid "Total time"
 msgstr "Tiempo total"
 
-#: src/interface.c:486 src/resample.c:1488
+#: src/interface.c:472 src/resample.c:1460
 msgid "Audio"
 msgstr "Audio"
 
-#: src/interface.c:511 src/interface.c:553
+#: src/interface.c:497 src/interface.c:539
 msgid "Rate/size"
 msgstr "Tasa/tamaño"
 
-#: src/interface.c:530
+#: src/interface.c:516
 msgid "Right audio"
 msgstr "Audio derecho"
 
-#: src/interface.c:622
+#: src/interface.c:607
 msgid "LiVES: - Encoding options"
 msgstr "LiVES: - Opciones de codificación"
 
-#: src/interface.c:636
+#: src/interface.c:621
 msgid "<------------- (Check the box to re_size as suggested)"
 msgstr ""
 
-#: src/interface.c:637
+#: src/interface.c:622
 msgid "<------------- (Check the box to use the _size recommendation)"
 msgstr ""
 
-#: src/interface.c:662
+#: src/interface.c:646
 msgid "Use _letterboxing to maintain aspect ratio (optional)"
 msgstr ""
 
-#: src/interface.c:663
+#: src/interface.c:647
 msgid ""
 "Draw black rectangles either above or to the sides of the image, to prevent "
 "it from stretching."
 msgstr ""
 
-#: src/interface.c:694
+#: src/interface.c:677
 msgid "Keep _my settings"
 msgstr "Guardar _mis configuraciones"
 
-#: src/interface.c:695
+#: src/interface.c:678
 msgid "Use _recommended settings"
 msgstr "Utilizar las configuraciones _recomendadas"
 
-#: src/interface.c:775 src/dialogs.c:114
-msgid ""
-"Do _not show this warning any more\n"
-"(can be turned back on from Preferences/Warnings)"
-msgstr ""
-"_No mostrar esta alerta nunca más\n"
-"(puede restaurarse desde Preferencias/Alertas)"
-
-#: src/interface.c:787
-msgid "Show _Details"
-msgstr "Mostrar _detalles"
-
-#: src/interface.c:881
+#: src/interface.c:769
 msgid "_Close Window"
 msgstr "_Cerrar Ventana"
 
-#: src/interface.c:883
+#: src/interface.c:771
 msgid "_Save to file"
 msgstr "_Guardar en archivo"
 
-#: src/interface.c:928
+#: src/interface.c:816
 msgid "LiVES: - Insert"
 msgstr "LiVES: - Insertar"
 
-#: src/interface.c:945
+#: src/interface.c:833
 msgid "_Number of times to insert"
 msgstr "_Número de veces a insertar"
 
-#: src/interface.c:954
+#: src/interface.c:842
 msgid "_Insert to fit audio"
 msgstr "_Insertar para ajustarse al audio"
 
-#: src/interface.c:968
+#: src/interface.c:856
 msgid "Insert _before selection"
 msgstr "Insertar _antes de la selección"
 
-#: src/interface.c:970
+#: src/interface.c:858
 msgid "Insert clipboard before selected frames"
 msgstr "Insertar el portapapeles antes de los cuadros seleccionados"
 
-#: src/interface.c:986
+#: src/interface.c:875
 msgid "Insert _after selection"
 msgstr "Insertar _luego de la selección"
 
-#: src/interface.c:988
+#: src/interface.c:877
 msgid "Insert clipboard after selected frames"
 msgstr "Insertar el portapapeles luego de los cuadros seleccionados"
 
-#: src/interface.c:999
+#: src/interface.c:888
 msgid "Insert _with sound"
 msgstr "Insertar _con sonido"
 
-#: src/interface.c:1012
+#: src/interface.c:901
 msgid "Insert with_out sound"
 msgstr "Insert _sin sonido"
 
-#: src/interface.c:1093
+#: src/interface.c:985
 msgid "LiVES: - Open Selection"
 msgstr "Abrir seleccion"
 
-#: src/interface.c:1111
+#: src/interface.c:1004
 msgid "Selection start time (sec)"
 msgstr ""
 
-#: src/interface.c:1117
+#: src/interface.c:1010
 msgid "Number of frames to open"
 msgstr ""
 
-#: src/interface.c:1193
+#: src/interface.c:1088
 msgid "LiVES: - Open Location"
 msgstr "LiVES: - Abrir Lugar"
 
-#: src/interface.c:1195
+#: src/interface.c:1090
 msgid "LiVES: - Open Youtube Clip"
 msgstr ""
 
-#: src/interface.c:1213
+#: src/interface.c:1109
 msgid ""
 "\n"
 "\n"
@@ -1416,7 +1408,7 @@
 "Streaming\n"
 "\n"
 
-#: src/interface.c:1216
+#: src/interface.c:1112
 msgid ""
 "\n"
 "\n"
@@ -1425,63 +1417,64 @@
 "\n"
 msgstr ""
 
-#: src/interface.c:1220
+#: src/interface.c:1116
 msgid ""
 "Enter the URL of the clip below.\n"
 "E.g: http://www.youtube.com/watch?v=WCR6f6WzjP8\n"
 "\n"
 msgstr ""
 
-#: src/interface.c:1231
+#: src/interface.c:1127
 msgid "URL : "
 msgstr "URL : "
 
-#: src/interface.c:1231
+#: src/interface.c:1127
 msgid "Youtube URL : "
 msgstr "URL de YouTube: "
 
-#: src/interface.c:1235
+#: src/interface.c:1131
 msgid "Do not send bandwidth information"
 msgstr "No enviar información de ancho de banda"
 
-#: src/interface.c:1237
+#: src/interface.c:1133
 msgid "Try this setting if you are having problems getting a stream"
 msgstr ""
 "Intente esta configuración si está teniendo problemas al obtener un stream"
 
-#: src/interface.c:1258
+#: src/interface.c:1155
 msgid "Download to _Directory : "
 msgstr ""
 
-#: src/interface.c:1276
+#: src/interface.c:1173
 msgid "Download _File Name : "
 msgstr ""
 
-#: src/interface.c:1281
+#: src/interface.c:1178
 msgid ".webm"
 msgstr ""
 
-#: src/interface.c:1359
+#: src/interface.c:1256
 msgid "LiVES: - Rename Clip"
 msgstr "LIVES: Renombrar Clip"
 
-#: src/interface.c:1362
-msgid "LiVES: - Enter Set Name"
+#: src/interface.c:1258
+#, fuzzy
+msgid "LiVES: - Enter Set Name to Save as"
 msgstr "LiVES: - Introduzca el Nombre"
 
-#: src/interface.c:1365
+#: src/interface.c:1260
 msgid "LiVES: - Enter a Set Name to Reload"
 msgstr ""
 
-#: src/interface.c:1368
+#: src/interface.c:1262
 msgid "LiVES: - Choose a Working Directory"
 msgstr "LiVES: - Elija un directorio de trabajo"
 
-#: src/interface.c:1371
+#: src/interface.c:1264
 msgid "LiVES: - Rename Current Track"
 msgstr ""
 
-#: src/interface.c:1391
+#: src/interface.c:1283
 msgid ""
 "You need to enter a name for the current clip set.\n"
 "This will allow you reload the layout with the same clips later.\n"
@@ -1493,7 +1486,7 @@
 "Por favor, ingrese el nombre de set que desee utilizar.\n"
 "LiVES le recomendará guardar el set de clips cuando intente salir.\n"
 
-#: src/interface.c:1397
+#: src/interface.c:1289
 msgid ""
 "In order to export this project, you must enter a name for this clip set.\n"
 "This will also be used for the project name.\n"
@@ -1502,7 +1495,7 @@
 "clip.\n"
 "Este será el utilizado para el nombre del proyecto.\n"
 
-#: src/interface.c:1404
+#: src/interface.c:1296
 msgid ""
 "Welcome to LiVES !\n"
 "This startup wizard will guide you through the\n"
@@ -1513,200 +1506,200 @@
 "instalación inicial de forma que obtenga el máximo rendimiento de esta "
 "aplicación.\n"
 
-#: src/interface.c:1408
+#: src/interface.c:1300
 msgid ""
 "\n"
 "First of all you need to choose a working directory for LiVES.\n"
 "This should be a directory with plenty of disk space available.\n"
 msgstr ""
 
-#: src/interface.c:1427
+#: src/interface.c:1317
 msgid "New name "
 msgstr "Nuevo Nombre "
 
-#: src/interface.c:1430
+#: src/interface.c:1319
 msgid "Set name "
 msgstr "Seleccione el nombre "
 
-#: src/interface.c:1550
+#: src/interface.c:1435
 msgid "Use def_aults"
 msgstr "Usar p_redeterminados"
 
-#: src/interface.c:1553 src/interface.c:1840 src/preferences.c:2515
-#: src/preferences.c:2697
+#: src/interface.c:1437 src/interface.c:1709 src/preferences.c:2550
+#: src/preferences.c:2739
 msgid "_Advanced"
 msgstr "_Avanzadas"
 
-#: src/interface.c:1604
+#: src/interface.c:1487
 msgid "LiVES:- Select input device"
 msgstr "LiVES:- Seleccionar dispositivo de entrada"
 
-#: src/interface.c:1622
+#: src/interface.c:1504
 msgid "Select input device:"
 msgstr "Seleccione dispositivo de entrada:"
 
-#: src/interface.c:1686
+#: src/interface.c:1568
 msgid "LiVES:- Load CD Track"
 msgstr "LIVES:- Carga una pista del CD"
 
-#: src/interface.c:1689
+#: src/interface.c:1570
 msgid "LiVES:- Select DVD Title/Chapter"
 msgstr "LIVES:- Seleccione el Titulo/Capitulo del DVD"
 
-#: src/interface.c:1692
+#: src/interface.c:1572
 msgid "LiVES:- Select VCD Title"
 msgstr "LIVES:- Seleccione el Titulo del VCD"
 
-#: src/interface.c:1695
+#: src/interface.c:1574
 msgid "LiVES:- Change Maximum Visible Tracks"
 msgstr "LiVES:- Cambiar el Máximo de Pistas Visibles"
 
-#: src/interface.c:1698
+#: src/interface.c:1576
 msgid "LiVES:- Device details"
 msgstr "LiVES:- Detalles del dispositivo"
 
-#: src/interface.c:1721
+#: src/interface.c:1598
 #, c-format
 msgid "Track to load (from %s)"
 msgstr "Pistas a cargar (de %s)"
 
-#: src/interface.c:1724
+#: src/interface.c:1600
 msgid "DVD Title"
 msgstr "Título de DVD"
 
-#: src/interface.c:1727
+#: src/interface.c:1602
 msgid "VCD Title"
 msgstr "Título de VCD"
 
-#: src/interface.c:1730
+#: src/interface.c:1604
 msgid "Maximum number of tracks to display"
 msgstr "Número máximo de pistas a mostrar"
 
-#: src/interface.c:1733
+#: src/interface.c:1606
 msgid "Device:        /dev/video"
 msgstr "Dispositivo: /dev/video"
 
-#: src/interface.c:1736
+#: src/interface.c:1608
 msgid "Device:        fw:"
 msgstr "Dispositivo: fw:"
 
-#: src/interface.c:1771
+#: src/interface.c:1641
 msgid "Chapter  "
 msgstr "Cápitulo  "
 
-#: src/interface.c:1776
+#: src/interface.c:1645
 msgid "Channel  "
 msgstr "Canal  "
 
-#: src/interface.c:1791
+#: src/interface.c:1660
 msgid "Audio ID  "
 msgstr "Audio ID  "
 
-#: src/interface.c:1857
+#: src/interface.c:1726
 msgid "Input number"
 msgstr "Ingresar número"
 
-#: src/interface.c:1865
+#: src/interface.c:1734
 msgid "Use default width, height and FPS"
 msgstr "Usar el ancho, altura y FPS por defecto"
 
-#: src/interface.c:1879
+#: src/interface.c:1748
 msgid "Width"
 msgstr "Anchura"
 
-#: src/interface.c:1885
+#: src/interface.c:1754
 msgid "Height"
 msgstr "Altura"
 
-#: src/interface.c:1899
+#: src/interface.c:1768
 msgid "_Driver"
 msgstr ""
 
-#: src/interface.c:1902
+#: src/interface.c:1771
 msgid "_Output format"
 msgstr ""
 
-#: src/interface.c:1998
+#: src/interface.c:1865
 msgid "LiVES:- Fade Audio In"
 msgstr "LiVES:- Audio Fade In"
 
-#: src/interface.c:2001
+#: src/interface.c:1867
 msgid "LiVES:- Fade Audio Out"
 msgstr "LiVES:- Audio Fade Out"
 
-#: src/interface.c:2017
+#: src/interface.c:1883
 msgid "Fade in over  "
 msgstr "Finalizó el fade in  "
 
-#: src/interface.c:2018
+#: src/interface.c:1884
 msgid "first"
 msgstr "primero"
 
-#: src/interface.c:2021
+#: src/interface.c:1886
 msgid "Fade out over  "
 msgstr "Finalizó el fade out  "
 
-#: src/interface.c:2022
+#: src/interface.c:1887
 msgid "last"
 msgstr "último"
 
-#: src/interface.c:2044
+#: src/interface.c:1909
 msgid "seconds."
 msgstr "segundos"
 
-#: src/interface.c:2052 src/saveplay.c:1507
+#: src/interface.c:1917 src/saveplay.c:1484
 msgid "selection"
 msgstr "selección"
 
-#: src/interface.c:2092
+#: src/interface.c:1956
 msgid "LiVES: - File Comments (optional)"
 msgstr "LiVES: - Comentarios de archivo (opcional)"
 
-#: src/interface.c:2107
+#: src/interface.c:1971
 msgid "Title/Name : "
 msgstr "Título/Nombre: "
 
-#: src/interface.c:2114
+#: src/interface.c:1978
 msgid "Author/Artist : "
 msgstr "Autor/Artista : "
 
-#: src/interface.c:2121
+#: src/interface.c:1985
 msgid "Comments : "
 msgstr "Comentarios : "
 
-#: src/interface.c:2151
+#: src/interface.c:2015
 msgid "_Options"
 msgstr "_Opciones"
 
-#: src/interface.c:2158
+#: src/interface.c:2022
 msgid "Save _subtitles to file"
 msgstr "Guardar _subtítulos a archivo"
 
-#: src/interface.c:2170
+#: src/interface.c:2033
 msgid "Subtitle file"
 msgstr "Archivo de subtítulos"
 
-#: src/interface.c:2172
+#: src/interface.c:2035
 msgid "Browse..."
 msgstr "Examinar..."
 
-#: src/interface.c:2255
+#: src/interface.c:2132
 msgid "LiVES: - choose a device"
 msgstr ""
 
-#: src/interface.c:2259
+#: src/interface.c:2135
 msgid "LiVES: - choose a directory"
 msgstr ""
 
-#: src/interface.c:2262
+#: src/interface.c:2137
 msgid "LiVES: - choose a file"
 msgstr ""
 
-#: src/interface.c:2445
+#: src/interface.c:2381
 msgid "LiVES: - Cancel/Discard/Save"
 msgstr "LiVES: - Cancelar/Desechar/Guardar"
 
-#: src/interface.c:2460
+#: src/interface.c:2397
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has not been saved.\n"
@@ -1716,7 +1709,7 @@
 "La disposición actual no ha sido guardada.\n"
 "¿Qué desea hacer?\n"
 
-#: src/interface.c:2463
+#: src/interface.c:2400
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has been changed since the last save.\n"
@@ -1726,7 +1719,7 @@
 "La disposición actual se ha modificado desde el último resguardo.\n"
 "¿Qué desea hacer?\n"
 
-#: src/interface.c:2467
+#: src/interface.c:2404
 msgid ""
 "You are about to exit LiVES.\n"
 "The current clip set can be saved.\n"
@@ -1736,7 +1729,7 @@
 "El set de clips actual no ha sido guardado.\n"
 "¿Qué desea hacer?\n"
 
-#: src/interface.c:2468
+#: src/interface.c:2405
 msgid ""
 "The current clip set has not been saved.\n"
 "What would you like to do ?\n"
@@ -1744,7 +1737,7 @@
 "El set de clips actual no ha sido guardado.\n"
 "¿Qué desea hacer?\n"
 
-#: src/interface.c:2472
+#: src/interface.c:2408
 msgid ""
 "The current layout has not been saved.\n"
 "What would you like to do ?\n"
@@ -1752,58 +1745,58 @@
 "La disposición actual no ha sido guardada.\n"
 "¿Qué desea hacer?\n"
 
-#: src/interface.c:2475
+#: src/interface.c:2410
 msgid ""
 "The current layout has *not* been changed since it was last saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:2480
+#: src/interface.c:2415
 msgid ""
 "The current layout contains generated frames and cannot be retained.\n"
 "You may wish to render it before exiting multitrack mode.\n"
 msgstr ""
 
-#: src/interface.c:2483
+#: src/interface.c:2418
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout contains generated frames and cannot be retained.\n"
 "What do you wish to do ?"
 msgstr ""
 
-#: src/interface.c:2496
+#: src/interface.c:2431
 msgid "Clip set _name"
 msgstr "_Nombre de set de clips"
 
-#: src/interface.c:2502
+#: src/interface.c:2437
 msgid "_Auto reload next time"
 msgstr "_Auto carga la próxima vez"
 
-#: src/interface.c:2538 src/interface.c:2547
+#: src/interface.c:2473 src/interface.c:2482
 msgid "_Wipe layout"
 msgstr "_Limpiar disposiciones"
 
-#: src/interface.c:2539
+#: src/interface.c:2474
 msgid "_Ignore changes"
 msgstr "_Ignorar cambios"
 
-#: src/interface.c:2540
+#: src/interface.c:2475
 msgid "_Delete clip set"
 msgstr "_Borrar set de clips"
 
-#: src/interface.c:2541
+#: src/interface.c:2476
 msgid "_Delete layout"
 msgstr "_Borrar disposiciones"
 
-#: src/interface.c:2545
+#: src/interface.c:2480
 msgid "_Save layout"
 msgstr "_Guardar disposiciones"
 
-#: src/interface.c:2546
+#: src/interface.c:2481
 msgid "_Save clip set"
 msgstr "_Guardar set de clips"
 
-#: src/interface.c:2565
+#: src/interface.c:2502
 msgid ""
 "\n"
 "LiVES has detected a multitrack layout from a previous session.\n"
@@ -1813,57 +1806,57 @@
 "LiVES ha detectado un proyecto multipista de una sesión anterior.\n"
 "¿Te gustaría intentar recuperarlo?\n"
 
-#: src/interface.c:2589
+#: src/interface.c:2528
 msgid "LiVES: - Disk Recovery Options"
 msgstr ""
 
-#: src/interface.c:2608
+#: src/interface.c:2549
 msgid "Delete _Orphaned Clips"
 msgstr ""
 
-#: src/interface.c:2609
+#: src/interface.c:2550
 msgid "Delete any clips which are not currently loaded or part of a set"
 msgstr ""
 
-#: src/interface.c:2622
+#: src/interface.c:2564
 msgid "Clear _Backup Files from Closed Clips"
 msgstr ""
 
-#: src/interface.c:2633
+#: src/interface.c:2575
 msgid "Remove Sets which have _Layouts but no Clips"
 msgstr ""
 
-#: src/interface.c:2644
+#: src/interface.c:2586
 msgid "_Reset to Defaults"
 msgstr ""
 
-#: src/interface.c:2651
+#: src/interface.c:2593
 msgid "_Accept"
 msgstr ""
 
-#: src/callbacks.c:198
+#: src/callbacks.c:208
 #, c-format
 msgid "Saving as set %s..."
 msgstr "Guardando como set %s..."
 
-#: src/callbacks.c:833
+#: src/callbacks.c:852
 msgid "Please enter the name of the file to save the clip as.\n"
 msgstr ""
 
-#: src/callbacks.c:841
+#: src/callbacks.c:860
 msgid "Please enter a valid URL for the download.\n"
 msgstr ""
 
-#: src/callbacks.c:867
+#: src/callbacks.c:886
 #, c-format
 msgid "Downloading %s to %s..."
 msgstr ""
 
-#: src/callbacks.c:895
+#: src/callbacks.c:912
 msgid "Downloading clip"
 msgstr ""
 
-#: src/callbacks.c:933
+#: src/callbacks.c:950
 msgid ""
 "\n"
 "LiVES was unable to download the clip.\n"
@@ -1871,11 +1864,11 @@
 "the latest youtube-dl installed.\n"
 msgstr ""
 
-#: src/callbacks.c:1114 src/callbacks.c:1149
+#: src/callbacks.c:1131 src/callbacks.c:1166
 msgid "This file"
 msgstr "Este archivo"
 
-#: src/callbacks.c:1115
+#: src/callbacks.c:1132
 msgid ""
 ",\n"
 " - including the current layout - "
@@ -1883,7 +1876,7 @@
 ",\n"
 " - incluir la interfaz actial - "
 
-#: src/callbacks.c:1117
+#: src/callbacks.c:1134
 #, c-format
 msgid ""
 "\n"
@@ -1893,7 +1886,7 @@
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1119
+#: src/callbacks.c:1136
 #, c-format
 msgid ""
 "\n"
@@ -1903,14 +1896,14 @@
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1150
+#: src/callbacks.c:1167
 msgid ""
 "Changes made to this clip have not been saved or backed up.\n"
 "\n"
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1343
+#: src/callbacks.c:1356
 msgid ""
 "\n"
 "Invalid project file.\n"
@@ -1918,7 +1911,7 @@
 "\n"
 "Archivo de proyecto inválido.\n"
 
-#: src/callbacks.c:1356
+#: src/callbacks.c:1370
 #, c-format
 msgid ""
 "\n"
@@ -1939,33 +1932,33 @@
 "set, o descártelo.\n"
 "Una vez que haya hecho esto, podrá importar el nuevo proyecto.\n"
 
-#: src/callbacks.c:1366
+#: src/callbacks.c:1381
 #, c-format
 msgid "Importing the project %s as set %s..."
 msgstr "Importando el proyecto %s como set %s..."
 
-#: src/callbacks.c:1386
+#: src/callbacks.c:1399
 msgid "Importing project"
 msgstr "Iportando proyecto"
 
-#: src/callbacks.c:1472
+#: src/callbacks.c:1481
 #, c-format
 msgid "Exporting project %s..."
 msgstr "Exportando proyecto como %s..."
 
-#: src/callbacks.c:1490
+#: src/callbacks.c:1497
 msgid "Exporting project"
 msgstr "Exportando proyecto"
 
-#: src/callbacks.c:1506
+#: src/callbacks.c:1513
 msgid "Backup as .lv1 file"
 msgstr "Resguardar como archivo .lv1"
 
-#: src/callbacks.c:1522
+#: src/callbacks.c:1529
 msgid "Restore .lv1 file"
 msgstr "Restaurar archivo .lv1"
 
-#: src/callbacks.c:1664
+#: src/callbacks.c:1671
 msgid ""
 "\n"
 "\n"
@@ -1977,73 +1970,78 @@
 "El set será borrado del disco.\n"
 "¿Está seguro?\n"
 
-#: src/callbacks.c:1725
+#: src/callbacks.c:1732
 #, c-format
 msgid "Deleting set %s..."
 msgstr ""
 
-#: src/callbacks.c:1727
+#: src/callbacks.c:1734
 msgid "Deleting set..."
 msgstr "Borrando set..."
 
-#: src/callbacks.c:1731
+#: src/callbacks.c:1738
 msgid "Deleting set"
 msgstr "Borrando set"
 
-#: src/callbacks.c:1739
+#: src/callbacks.c:1746
 #, c-format
 msgid "Set %s was permanently deleted from the disk.\n"
 msgstr "El set %s ha sido borrado definitivamente del disco.\n"
 
-#: src/callbacks.c:1787 src/callbacks.c:11764
+#: src/callbacks.c:1792 src/callbacks.c:11676
 msgid "Insert Silence"
 msgstr "Insertar Silencio"
 
-#: src/callbacks.c:1840 src/callbacks.c:1923 src/callbacks.c:2086
+#: src/callbacks.c:1844 src/callbacks.c:1927 src/callbacks.c:2089
 msgid "Undoing"
 msgstr "Deshaciendo"
 
-#: src/callbacks.c:1936 src/callbacks.c:2147
+#: src/callbacks.c:1940 src/callbacks.c:2150
 msgid "Restoring audio..."
 msgstr "Restaurando audio..."
 
-#: src/callbacks.c:1952
+#: src/callbacks.c:1956
 msgid "Clearing frame images"
 msgstr "Limpiando imagenes de cuadro"
 
-#: src/callbacks.c:1985
+#: src/callbacks.c:1988
 msgid "Deleting excess frames"
 msgstr "Borrando cuadros sobrantes"
 
-#: src/callbacks.c:2229
+#: src/callbacks.c:2232
 #, c-format
 msgid "Length of video is now %d frames at %.3f frames per second.\n"
 msgstr ""
 "La longitud del video es ahora de %d cuadros a %.3f cuadros por segundo.\n"
 
-#: src/callbacks.c:2233 src/resample.c:683 src/resample.c:2166
+#: src/callbacks.c:2235 src/resample.c:678 src/resample.c:2133
 #, c-format
 msgid "Clipboard was resampled to %d frames.\n"
 msgstr "El portapapeles fue resampleado a %d cuadros.\n"
 
-#: src/callbacks.c:2394 src/callbacks.c:2423
+#: src/callbacks.c:2396 src/callbacks.c:2425
 msgid "Redoing"
 msgstr "Rehaciendo"
 
-#: src/callbacks.c:2462
-#, c-format
-msgid "Copying frames %d to %d%s to the clipboard..."
+#: src/callbacks.c:2472
+#, fuzzy, c-format
+msgid "Copying frames %d to %d (with sound) to the clipboard..."
+msgstr "Copiando cuadros %d a %d%s al portapapeles"
+
+#: src/callbacks.c:2474
+#, fuzzy, c-format
+msgid "Copying frames %d to %d to the clipboard..."
 msgstr "Copiando cuadros %d a %d%s al portapapeles"
 
-#: src/callbacks.c:2525
+#: src/callbacks.c:2526
 msgid "Copying to the clipboard"
 msgstr "Copiando al portapapeles"
 
-#: src/callbacks.c:2600
+#: src/callbacks.c:2601
 msgid "Cut"
 msgstr "Cortar"
 
-#: src/callbacks.c:2641 src/callbacks.c:3068 src/callbacks.c:8026
+#: src/callbacks.c:2641 src/callbacks.c:3063 src/callbacks.c:7631
 msgid "Pulling frames from clipboard"
 msgstr ""
 
@@ -2052,15 +2050,15 @@
 msgid "Pasting %d frames to new clip %s..."
 msgstr ""
 
-#: src/callbacks.c:2678
+#: src/callbacks.c:2676
 msgid "Pasting"
 msgstr "Pegando"
 
-#: src/callbacks.c:2694
+#: src/callbacks.c:2692
 msgid "...added audio..."
 msgstr "...audio añadido..."
 
-#: src/callbacks.c:2778
+#: src/callbacks.c:2775
 msgid ""
 "This operation requires resizing or converting of frames.\n"
 "Please install 'convert' from the Image-magick package, and then restart "
@@ -2071,7 +2069,7 @@
 "Por favor instale el \"convertidor\" en el paquete de imagen magica y, a "
 "continuación, reinicie LiVES.\n"
 
-#: src/callbacks.c:2795
+#: src/callbacks.c:2793
 msgid ""
 "\n"
 "\n"
@@ -2085,7 +2083,7 @@
 "Intente seleccionar todos los fotogramas, y luego use \n"
 "la función 'Cortar Audio'  desde el menu de Audio"
 
-#: src/callbacks.c:2819
+#: src/callbacks.c:2817
 msgid ""
 "LiVES cannot insert because the audio rates do not match.\n"
 "Please install 'sox', and try again."
@@ -2093,7 +2091,7 @@
 "LiVES no puede insertar porque las tasas de audio no coinciden.\n"
 "Por favor instale 'sox', y vuelva a intentarlo."
 
-#: src/callbacks.c:2838
+#: src/callbacks.c:2835
 msgid ""
 "\n"
 "Insertion will cause frames to shift in some multitrack layouts.\n"
@@ -2103,7 +2101,7 @@
 "La inserción cambiará el audio en el diseño multipista.\n"
 "¿Está seguro que desea continuar?\n"
 
-#: src/callbacks.c:2888 src/callbacks.c:11692
+#: src/callbacks.c:2883 src/callbacks.c:11606
 msgid ""
 "\n"
 "Insertion will cause audio to shift in some multitrack layouts.\n"
@@ -2113,11 +2111,11 @@
 "La inserción cambiará el audio en el diseño multipista.\n"
 "¿Está seguro que desea continuar?\n"
 
-#: src/callbacks.c:2996 src/callbacks.c:3025
+#: src/callbacks.c:2987 src/callbacks.c:3016
 msgid "Resampling clipboard audio"
 msgstr "Reconvirtiendo el audio"
 
-#: src/callbacks.c:3041
+#: src/callbacks.c:3032
 msgid ""
 "\n"
 "\n"
@@ -2129,7 +2127,7 @@
 "LIVES no puede reconvertir el portapapeles del audio seleccionado.\n"
 "La selección de audio será borrrada\n"
 
-#: src/callbacks.c:3055
+#: src/callbacks.c:3045
 msgid ""
 "\n"
 "\n"
@@ -2142,30 +2140,30 @@
 "LIVES no pudo reconvertir el portapapeles de audio.\n"
 "¿Desea continuar con la inserción del audio no convertido?\n"
 
-#: src/callbacks.c:3137 src/callbacks.c:3311
+#: src/callbacks.c:3132 src/callbacks.c:3299
 #, c-format
 msgid "Inserting %d%s frames from the clipboard..."
 msgstr "Insertando %d%s fotogramas desde el portapapeles..."
 
-#: src/callbacks.c:3162 src/callbacks.c:3236 src/callbacks.c:3339
+#: src/callbacks.c:3155 src/callbacks.c:3224 src/callbacks.c:3325
 msgid "Inserting"
 msgstr "Insertando"
 
-#: src/callbacks.c:3193
+#: src/callbacks.c:3187
 #, c-format
 msgid "Inserting %d times from the clipboard%s..."
 msgstr "Insertando %d veces desde el portapapeles%s..."
 
-#: src/callbacks.c:3200
+#: src/callbacks.c:3191
 #, c-format
 msgid "Inserting %d frames from the clipboard%s..."
 msgstr "Insertando %d fotogramas desde el portapapeles%s..."
 
-#: src/callbacks.c:3418
+#: src/callbacks.c:3404
 msgid "Insert"
 msgstr "Insertar"
 
-#: src/callbacks.c:3486
+#: src/callbacks.c:3471
 msgid ""
 "\n"
 "Deleting all frames will close this file.\n"
@@ -2175,7 +2173,7 @@
 "La eliminación de todos los fotogramas cerrará este archivo.\n"
 "¿Está seguro?"
 
-#: src/callbacks.c:3495
+#: src/callbacks.c:3480
 msgid ""
 "\n"
 "Deletion will cause missing frames in some multitrack layouts.\n"
@@ -2185,8 +2183,8 @@
 "La eliminación causará la pérdida de fotogramas en el diseño multipista.\n"
 "¿Está seguro que desea continuar?\n"
 
-#: src/callbacks.c:3515 src/callbacks.c:10920 src/callbacks.c:11162
-#: src/callbacks.c:11228
+#: src/callbacks.c:3500 src/callbacks.c:10851 src/callbacks.c:11087
+#: src/callbacks.c:11152
 msgid ""
 "\n"
 "Deletion will cause missing audio in some multitrack layouts.\n"
@@ -2196,7 +2194,7 @@
 "La eliminación causará la pérdida de audio en el diseño multipista.\n"
 "¿Está seguro que desea continuar?\n"
 
-#: src/callbacks.c:3534
+#: src/callbacks.c:3519
 msgid ""
 "\n"
 "Deletion will cause frames to shift in some multitrack layouts.\n"
@@ -2207,7 +2205,7 @@
 "multipista.\n"
 "¿Está seguro que desea continuar?\n"
 
-#: src/callbacks.c:3553 src/callbacks.c:11210
+#: src/callbacks.c:3538 src/callbacks.c:11134
 msgid ""
 "\n"
 "Deletion will cause audio to shift in some multitrack layouts.\n"
@@ -2217,20 +2215,20 @@
 "La eliminación causará el cambio del audio en el diseño multipista.\n"
 "¿Está seguro que desea continuar?\n"
 
-#: src/callbacks.c:3611
+#: src/callbacks.c:3597
 #, c-format
 msgid "Deleting frames %d to %d%s..."
 msgstr "Eliminando fotogramas %d a %d%s..."
 
-#: src/callbacks.c:3636
+#: src/callbacks.c:3619
 msgid "Deleting"
 msgstr "Eliminando"
 
-#: src/callbacks.c:3717
+#: src/callbacks.c:3699
 msgid "Delete"
 msgstr "Eliminar"
 
-#: src/callbacks.c:3738
+#: src/callbacks.c:3717
 msgid ""
 "\n"
 "\n"
@@ -2240,7 +2238,7 @@
 "\n"
 "La selección está bloqueada.\n"
 
-#: src/callbacks.c:4092
+#: src/callbacks.c:4056
 msgid ""
 "Ready to record. Use 'control' and cursor keys during playback to record "
 "your performance.\n"
@@ -2252,11 +2250,11 @@
 "(Para cancelar, pulse 'r' o haga clic en Reproducir | Grabar Sesión antes de "
 "empezar la reproducción.)\n"
 
-#: src/callbacks.c:4098
+#: src/callbacks.c:4061
 msgid "Record cancelled.\n"
 msgstr "Grabación cancelada.\n"
 
-#: src/callbacks.c:4237
+#: src/callbacks.c:4197
 #, c-format
 msgid ""
 "\n"
@@ -2269,7 +2267,7 @@
 "El '% s' informe del plugin:\n"
 "%s\n"
 
-#: src/callbacks.c:4241
+#: src/callbacks.c:4200
 #, c-format
 msgid ""
 "\n"
@@ -2282,7 +2280,7 @@
 "No se puede encontrar el  el método 'init' en el % s plugin.\n"
 "El plug-in puede estar roto o no instalado correctamente."
 
-#: src/callbacks.c:4571
+#: src/callbacks.c:4532
 #, c-format
 msgid ""
 "Saving the set will cause copies of all loaded clips to remain on the disk"
@@ -2295,22 +2293,22 @@
 "\n"
 "Por favor, pulse \"Cancelar\" en caso que no sea lo que usted desea.\n"
 
-#: src/callbacks.c:4654
+#: src/callbacks.c:4617
 #, c-format
 msgid "Saving set %s"
 msgstr "Guardando la selección% s"
 
-#: src/callbacks.c:5005
+#: src/callbacks.c:4964
 #, c-format
 msgid "Loading clips from set %s"
 msgstr "Cargando clips desde la selección%s"
 
-#: src/callbacks.c:5093
+#: src/callbacks.c:5051
 #, c-format
 msgid "%d clips and %d layouts were recovered from set (%s).\n"
 msgstr ""
 
-#: src/callbacks.c:5312
+#: src/callbacks.c:5259
 msgid ""
 "LiVES will attempt to recover some disk space.\n"
 "You should ONLY run this if you have no other copies of LiVES running on "
@@ -2322,24 +2320,24 @@
 "corriendo en esta máquina.\n"
 "Haga clic en Aceptar para continuar.\n"
 
-#: src/callbacks.c:5317
+#: src/callbacks.c:5264
 msgid "Cleaning up disk space..."
 msgstr "Limpiando espacio en el disco..."
 
-#: src/callbacks.c:5387
+#: src/callbacks.c:5334
 msgid "Recovering disk space"
 msgstr ""
 
-#: src/callbacks.c:5439
+#: src/callbacks.c:5386
 #, c-format
 msgid "%s of disk space was recovered.\n"
 msgstr ""
 
-#: src/callbacks.c:5482
+#: src/callbacks.c:5428
 msgid "Resetting frame rates and frame values..."
 msgstr "Reestablecimiento de tipos de frame y valores de frame..."
 
-#: src/callbacks.c:5523
+#: src/callbacks.c:5469
 #, c-format
 msgid ""
 "\n"
@@ -2347,12 +2345,12 @@
 "Internal: %s (%d bpp) / %s\n"
 msgstr ""
 
-#: src/callbacks.c:5525
+#: src/callbacks.c:5471
 msgid "buffered"
 msgstr "almacenado"
 
-#: src/callbacks.c:5538 src/callbacks.c:5557 src/callbacks.c:5575
-#: src/callbacks.c:5609
+#: src/callbacks.c:5484 src/callbacks.c:5502 src/callbacks.c:5518
+#: src/callbacks.c:5551
 msgid ""
 "\n"
 "  Opening..."
@@ -2360,7 +2358,7 @@
 "\n"
 "  Abriendo..."
 
-#: src/callbacks.c:5545
+#: src/callbacks.c:5490
 #, c-format
 msgid ""
 "\n"
@@ -2369,7 +2367,7 @@
 "\n"
 "(%d virtual)"
 
-#: src/callbacks.c:5548
+#: src/callbacks.c:5493
 #, c-format
 msgid ""
 "\n"
@@ -2378,7 +2376,7 @@
 "\n"
 "(%d decodificado)"
 
-#: src/callbacks.c:5560 src/callbacks.c:5578 src/callbacks.c:5612
+#: src/callbacks.c:5504 src/callbacks.c:5520 src/callbacks.c:5553
 #, c-format
 msgid ""
 "\n"
@@ -2387,7 +2385,7 @@
 "\n"
 "  %.2f seg."
 
-#: src/callbacks.c:5569
+#: src/callbacks.c:5512
 msgid ""
 "\n"
 "  Unknown"
@@ -2395,23 +2393,23 @@
 "\n"
 "  Desconocido"
 
-#: src/callbacks.c:5582 src/callbacks.c:5596
+#: src/callbacks.c:5524 src/callbacks.c:5538
 msgid "unsigned"
 msgstr "no firmado"
 
-#: src/callbacks.c:5583 src/callbacks.c:5597
+#: src/callbacks.c:5525 src/callbacks.c:5539
 msgid "signed"
 msgstr "firmado"
 
-#: src/callbacks.c:5585 src/callbacks.c:5599
+#: src/callbacks.c:5527 src/callbacks.c:5541
 msgid "big-endian"
 msgstr "big-endian"
 
-#: src/callbacks.c:5586 src/callbacks.c:5600
+#: src/callbacks.c:5528 src/callbacks.c:5542
 msgid "little-endian"
 msgstr "little-endian"
 
-#: src/callbacks.c:5588 src/callbacks.c:5602
+#: src/callbacks.c:5530 src/callbacks.c:5544
 #, c-format
 msgid ""
 "  %d Hz %d bit\n"
@@ -2420,7 +2418,7 @@
 "  %d Hz %d bit\n"
 "%s %s"
 
-#: src/callbacks.c:5707
+#: src/callbacks.c:5647
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -2437,15 +2435,15 @@
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA.\n"
 msgstr ""
 
-#: src/callbacks.c:5721
+#: src/callbacks.c:5661
 msgid "A video editor and VJ program."
 msgstr "Un editor de vídeo y programa VJ."
 
-#: src/callbacks.c:5722
+#: src/callbacks.c:5662
 msgid "About LiVES"
 msgstr ""
 
-#: src/callbacks.c:5724
+#: src/callbacks.c:5664
 msgid "translator_credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -2453,7 +2451,7 @@
 "  Guybrush88 https://launchpad.net/~guybrush\n"
 "  nitrofurano https://launchpad.net/~nitrofurano-3t"
 
-#: src/callbacks.c:5758
+#: src/callbacks.c:5699
 #, c-format
 msgid ""
 "LiVES Version %s\n"
@@ -2467,7 +2465,7 @@
 "Homepage: http://lives.sourceforge.net"
 msgstr ""
 
-#: src/callbacks.c:6037
+#: src/callbacks.c:5996
 #, fuzzy
 msgid ""
 "\n"
@@ -2478,7 +2476,7 @@
 "\n"
 "Necesita instalar mplayer para poder previsualizar este archivo.\n"
 
-#: src/callbacks.c:6040
+#: src/callbacks.c:5998
 #, fuzzy
 msgid ""
 "\n"
@@ -2490,194 +2488,189 @@
 "\n"
 "Necesita instalar mplayer para poder previsualizar este archivo.\n"
 
-#: src/callbacks.c:6423 src/callbacks.c:8289
-msgid ""
-"\n"
-"Loading new audio may cause missing audio in some multitrack layouts.\n"
-"Are you sure you wish to continue ?\n"
-"."
-msgstr ""
-"\n"
-"La carga de nuevo audio puede causar la pérdida de audio en algunos diseños "
-"multipista.\n"
-"¿Está seguro de continuar?"
-
-#: src/callbacks.c:6523
-#, c-format
-msgid "Opening audio %s, type %s..."
-msgstr "Abriendo audio % s, tipo % s..."
-
-#: src/callbacks.c:6556 src/saveplay.c:480
-msgid "Opening audio"
-msgstr "Abriendo audio"
-
-#: src/callbacks.c:6565 src/callbacks.c:6612 src/callbacks.c:8387
-#: src/callbacks.c:8429 src/callbacks.c:8472 src/callbacks.c:10846
-msgid "Cancelling"
-msgstr "Cancelando"
-
-#: src/callbacks.c:6660 src/callbacks.c:8514 src/callbacks.c:10876
-#: src/callbacks.c:11563
-msgid "Committing audio"
-msgstr "Procesando audio"
-
-#: src/callbacks.c:6672 src/callbacks.c:8546
-msgid "New Audio"
-msgstr "Nuevo Sonido"
-
-#: src/callbacks.c:6779
+#: src/callbacks.c:6459
 #, c-format
 msgid ""
 "Text was saved as\n"
 "%s\n"
 msgstr ""
 
-#: src/callbacks.c:6951 src/saveplay.c:3618
-#, c-format
-msgid "%d frames are enough !\n"
-msgstr "¡%d fotogramas son suficientes !\n"
-
-#: src/callbacks.c:7050
+#: src/callbacks.c:6706
 msgid "LiVES: - Encoder debug output"
 msgstr "LiVES: - Codificar la salida del depurador"
 
-#: src/callbacks.c:7087 src/gui.c:1922
+#: src/callbacks.c:6743 src/gui.c:1921
 msgid "Fullscreen playback (f)"
 msgstr "Reproducción en pantalla completa (f)"
 
-#: src/callbacks.c:7089
+#: src/callbacks.c:6744
 msgid "Fullscreen playback off (f)"
 msgstr "Apagar reproducción en pantalla completa (f)"
 
-#: src/callbacks.c:7188 src/callbacks.c:7336 src/callbacks.c:7664
-#: src/callbacks.c:7681 src/gui.c:3712 src/saveplay.c:2467 src/saveplay.c:2501
-#: src/saveplay.c:3115 src/saveplay.c:3220 src/saveplay.c:3239
-#: src/multitrack.c:9340 src/multitrack.c:11060
+#: src/callbacks.c:6841 src/callbacks.c:6983 src/callbacks.c:7283
+#: src/callbacks.c:7298 src/gui.c:3838 src/saveplay.c:2442 src/saveplay.c:2475
+#: src/saveplay.c:3074 src/saveplay.c:3178 src/saveplay.c:3197
+#: src/multitrack.c:9526 src/multitrack.c:11288
 #, c-format
 msgid " (%d %% scale)"
 msgstr ""
 
-#: src/callbacks.c:7190 src/callbacks.c:7338 src/callbacks.c:7666
-#: src/gui.c:3716 src/saveplay.c:2469 src/saveplay.c:2503
+#: src/callbacks.c:6843 src/callbacks.c:6985 src/callbacks.c:7285
+#: src/gui.c:3842 src/saveplay.c:2444 src/saveplay.c:2477
 #, c-format
 msgid "LiVES: - Play Window%s"
 msgstr ""
 
-#: src/callbacks.c:7302 src/gui.c:1907
+#: src/callbacks.c:6950 src/gui.c:1906
 msgid "Double size (d)"
 msgstr "Tamaño doble (d)"
 
-#: src/callbacks.c:7309
+#: src/callbacks.c:6956
 msgid "Single size (d)"
 msgstr "Tamaño simple (d)"
 
-#: src/callbacks.c:7442 src/callbacks.c:7443
+#: src/callbacks.c:7087 src/callbacks.c:7088
 msgid "Hide the play window (s)"
 msgstr "Ocultar la ventana de reporducción (s)"
 
-#: src/callbacks.c:7452 src/gui.c:1746
+#: src/callbacks.c:7096 src/gui.c:1744
 msgid "Show the play window (s)"
 msgstr "Mostrar la ventana de reproducción (s)"
 
-#: src/callbacks.c:7453 src/gui.c:1896
+#: src/callbacks.c:7097 src/gui.c:1895
 msgid "Play in separate window (s)"
 msgstr "Reproduci en una ventana separada (s)"
 
-#: src/callbacks.c:7535 src/gui.c:4060 src/saveplay.c:2498
+#: src/callbacks.c:7175 src/gui.c:4169 src/saveplay.c:2472
 msgid "LiVES: - Streaming"
 msgstr "LiVES: - Streaming"
 
-#: src/callbacks.c:7778
+#: src/callbacks.c:7388
 msgid "Switch continuous looping off (o)"
 msgstr "Apagar el bucle continuo"
 
-#: src/callbacks.c:7785 src/gui.c:1795
+#: src/callbacks.c:7394 src/gui.c:1793
 msgid "Switch continuous looping on (o)"
 msgstr "Encender el bucle continuo"
 
-#: src/callbacks.c:7837
+#: src/callbacks.c:7444
 #, c-format
 msgid "Audio volume (%.2f)"
 msgstr "Volimen del audio (%.2f)"
 
-#: src/callbacks.c:7876 src/callbacks.c:7877 src/gui.c:3640
+#: src/callbacks.c:7483 src/callbacks.c:7484 src/gui.c:3766
 msgid "Unmute the audio (z)"
 msgstr "Desactivar silencio de audio (z)"
 
-#: src/callbacks.c:7888 src/callbacks.c:7889 src/gui.c:1808 src/gui.c:3639
+#: src/callbacks.c:7494 src/callbacks.c:7495 src/gui.c:1806 src/gui.c:3765
 msgid "Mute the audio (z)"
 msgstr "Activar silencio de audio (z)"
 
-#: src/callbacks.c:8038
+#: src/callbacks.c:7643
 msgid "Reversing clipboard..."
 msgstr "Invertir el portapapeles..."
 
-#: src/callbacks.c:8052
+#: src/callbacks.c:7657
 msgid "Reversing clipboard"
 msgstr "Invertir el portapapeles"
 
-#: src/callbacks.c:8084
+#: src/callbacks.c:7689
 msgid "LiVES: Load subtitles from..."
 msgstr ""
 
-#: src/callbacks.c:8151 src/saveplay.c:970
+#: src/callbacks.c:7753 src/saveplay.c:956
 #, c-format
 msgid "Loaded subtitle file: %s\n"
 msgstr "Cargado el archivo de subtítulos: %s\n"
 
-#: src/callbacks.c:8220
+#: src/callbacks.c:7821
 msgid "Subtitles were erased.\n"
 msgstr "Los subtítulos se han eliminado.\n"
 
-#: src/callbacks.c:8239
+#: src/callbacks.c:7843
 msgid "LiVES: - Select Audio File"
 msgstr ""
 
-#: src/callbacks.c:8250
+#: src/callbacks.c:7878 src/callbacks.c:8232
+msgid ""
+"\n"
+"Loading new audio may cause missing audio in some multitrack layouts.\n"
+"Are you sure you wish to continue ?\n"
+"."
+msgstr ""
+"\n"
+"La carga de nuevo audio puede causar la pérdida de audio en algunos diseños "
+"multipista.\n"
+"¿Está seguro de continuar?"
+
+#: src/callbacks.c:7989
+#, c-format
+msgid "Opening audio %s, type %s..."
+msgstr "Abriendo audio % s, tipo % s..."
+
+#: src/callbacks.c:8023 src/saveplay.c:477
+msgid "Opening audio"
+msgstr "Abriendo audio"
+
+#: src/callbacks.c:8032 src/callbacks.c:8083 src/callbacks.c:8327
+#: src/callbacks.c:8369 src/callbacks.c:8412 src/callbacks.c:10766
+msgid "Cancelling"
+msgstr "Cancelando"
+
+#: src/callbacks.c:8137 src/callbacks.c:8454 src/callbacks.c:10803
+#: src/callbacks.c:11477
+msgid "Committing audio"
+msgstr "Procesando audio"
+
+#: src/callbacks.c:8153 src/callbacks.c:8484
+msgid "New Audio"
+msgstr "Nuevo Sonido"
+
+#: src/callbacks.c:8194
 msgid "Please set your CD play device in Tools | Preferences | Misc\n"
 msgstr ""
 "Por favor, configure su dispositivo de reproducción de CD en Herramientas | "
 "Preferencias | Varios\n"
 
-#: src/callbacks.c:8321
+#: src/callbacks.c:8264
 #, c-format
 msgid "Opening CD track %d from %s..."
 msgstr "Abriendo la pista del CD %d desde %s"
 
-#: src/callbacks.c:8326
+#: src/callbacks.c:8267
 #, c-format
 msgid "CD track %d"
 msgstr "Pista del CD %d"
 
-#: src/callbacks.c:8373
+#: src/callbacks.c:8313
 msgid "Opening CD track..."
 msgstr "Abriendo la pista del CD..."
 
-#: src/callbacks.c:8415 src/callbacks.c:8461
+#: src/callbacks.c:8355 src/callbacks.c:8401
 msgid "Error loading CD track\n"
 msgstr "Error cargando la pista del CD\n"
 
-#: src/callbacks.c:8584
+#: src/callbacks.c:8518
 msgid "layout errors"
 msgstr "errores de diseño"
 
-#: src/callbacks.c:8595
+#: src/callbacks.c:8529
 msgid "Close _Window"
 msgstr "Cerrar_Ventana"
 
-#: src/callbacks.c:8606
+#: src/callbacks.c:8540
 msgid "Clear _Errors"
 msgstr "Borrar_Errores"
 
-#: src/callbacks.c:8617
+#: src/callbacks.c:8551
 msgid "_Delete affected layouts"
 msgstr "_Borrar Diseños Afectados"
 
-#: src/callbacks.c:9343 src/callbacks.c:9388
+#: src/callbacks.c:9253 src/callbacks.c:9298
 msgid "Resume"
 msgstr "Reanudar"
 
-#: src/callbacks.c:9344
+#: src/callbacks.c:9254
 msgid ""
 "\n"
 "Paused\n"
@@ -2687,27 +2680,23 @@
 "Pausado\n"
 "(pulse Reanudar para continuar el proceso)"
 
-#: src/callbacks.c:9345 src/callbacks.c:9406
+#: src/callbacks.c:9255 src/callbacks.c:9315
 msgid "paused..."
 msgstr "pausado..."
 
-#: src/callbacks.c:9372 src/callbacks.c:9418
-msgid "Pause"
-msgstr "Pausar"
-
-#: src/callbacks.c:9374 src/callbacks.c:9421
+#: src/callbacks.c:9284 src/callbacks.c:9333
 msgid "resumed..."
 msgstr "resumido..."
 
-#: src/callbacks.c:9393
+#: src/callbacks.c:9303
 msgid "Keep"
 msgstr "Conservar"
 
-#: src/callbacks.c:9396
+#: src/callbacks.c:9305
 msgid "Enough"
 msgstr "Suficiente"
 
-#: src/callbacks.c:9401
+#: src/callbacks.c:9310
 #, c-format
 msgid ""
 "\n"
@@ -2716,28 +2705,28 @@
 "(click Resume to continue processing)"
 msgstr ""
 
-#: src/callbacks.c:9419
+#: src/callbacks.c:9331
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/callbacks.c:9558
+#: src/callbacks.c:9478
 msgid "Stop"
 msgstr ""
 
-#: src/callbacks.c:10053 src/multitrack.c:13247
+#: src/callbacks.c:9968 src/multitrack.c:13489
 msgid "LiVES: Selected frame"
 msgstr ""
 
-#: src/callbacks.c:10061
+#: src/callbacks.c:9976
 msgid "_Save frame as..."
 msgstr ""
 
-#: src/callbacks.c:10290
+#: src/callbacks.c:10202
 #, c-format
 msgid "Audio is ahead of video by %.4f secs. at frame %d, with fps %.4f\n"
 msgstr ""
 
-#: src/callbacks.c:10347
+#: src/callbacks.c:10255
 msgid ""
 "\n"
 "\n"
@@ -2746,7 +2735,7 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10353
+#: src/callbacks.c:10261
 msgid ""
 "\n"
 "\n"
@@ -2758,7 +2747,7 @@
 "Debes instalar \"xwininfo\" antes de poder usar esta característica\n"
 "\n"
 
-#: src/callbacks.c:10429 src/callbacks.c:11479
+#: src/callbacks.c:10334 src/callbacks.c:11395
 msgid ""
 "\n"
 "Record time must be greater than 0.\n"
@@ -2766,7 +2755,7 @@
 "\n"
 "El tiempo de grabación debe ser mayor a 0\n"
 
-#: src/callbacks.c:10440
+#: src/callbacks.c:10346
 msgid ""
 "Capture an External Window:\n"
 "\n"
@@ -2777,11 +2766,11 @@
 "capturar una ventana independiente\n"
 "\n"
 
-#: src/callbacks.c:10445
+#: src/callbacks.c:10351
 msgid "External window was released.\n"
 msgstr "Fue liberada una Ventana Externa\n"
 
-#: src/callbacks.c:10479
+#: src/callbacks.c:10385
 msgid ""
 "Click on a Window to Capture it\n"
 "Press 'q' to stop recording"
@@ -2789,7 +2778,7 @@
 "Click en una ventana para relizar una captura\n"
 "Presione 'q' para detener la grabación"
 
-#: src/callbacks.c:10513
+#: src/callbacks.c:10419
 #, c-format
 msgid ""
 "\n"
@@ -2804,19 +2793,19 @@
 "Parar o 'q' para detener.\n"
 "( Se usará la frecuencia predeterminada de %.3f cuadros por segundo.)\n"
 
-#: src/callbacks.c:10539
+#: src/callbacks.c:10443
 msgid "LiVES was unable to capture this window. Sorry.\n"
 msgstr "LiVES no pudo capturar esta ventana. Disculpe.\n"
 
-#: src/callbacks.c:10695
+#: src/callbacks.c:10601
 msgid "Export Selected Audio as..."
 msgstr "Exportar el Audio Seleccionado como..."
 
-#: src/callbacks.c:10699
+#: src/callbacks.c:10604
 msgid "Export Audio as..."
 msgstr "Exportar el Audio como..."
 
-#: src/callbacks.c:10714
+#: src/callbacks.c:10619
 msgid ""
 "\n"
 "\n"
@@ -2830,86 +2819,86 @@
 "Presione 'OK' para exportar con la nueva velocidad, o 'Cancelar' para "
 "exportar a la velocidad original.\n"
 
-#: src/callbacks.c:10720
+#: src/callbacks.c:10625
 #, c-format
 msgid "Exporting audio frames %d to %d as %s..."
 msgstr "Exportando los cuadros de audio %d a %d como %s"
 
-#: src/callbacks.c:10725
+#: src/callbacks.c:10629
 #, c-format
 msgid "Exporting audio as %s..."
 msgstr "Exportando el audio como %s..."
 
-#: src/callbacks.c:10751
+#: src/callbacks.c:10655
 msgid "Exporting audio"
 msgstr "Exportando el audio"
 
-#: src/callbacks.c:10782
+#: src/callbacks.c:10695
 msgid "LiVES: - Append Audio File"
 msgstr ""
 
-#: src/callbacks.c:10825
+#: src/callbacks.c:10739
 #, c-format
 msgid "Appending audio file %s..."
 msgstr "Incluyendo archivo de audio %s..."
 
-#: src/callbacks.c:10836
+#: src/callbacks.c:10756
 msgid "Appending audio"
 msgstr "Adjuntando audio"
 
-#: src/callbacks.c:10892
+#: src/callbacks.c:10818
 msgid "Append Audio"
 msgstr "Añadir audio"
 
-#: src/callbacks.c:10952
+#: src/callbacks.c:10883
 #, c-format
 msgid "Padding audio to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10954
+#: src/callbacks.c:10885
 #, c-format
 msgid "Trimming audio from %.2f to %.2f seconds..."
 msgstr "Recortando el audio desde el segundo %.2f hasta el segundo %.2f..."
 
-#: src/callbacks.c:10973
+#: src/callbacks.c:10904
 msgid "Trimming/Padding audio"
 msgstr "Recortando/Rellenando audio"
 
-#: src/callbacks.c:10981
+#: src/callbacks.c:10912
 msgid "Trim/Pad Audio"
 msgstr "Recortar/Rellenar Audio"
 
-#: src/callbacks.c:11055
+#: src/callbacks.c:10982
 msgid "Fading audio in"
 msgstr "Aumentando el volúmen de audio"
 
-#: src/callbacks.c:11056
+#: src/callbacks.c:10983
 msgid "Fade audio in"
 msgstr "Fundido entrada de audio"
 
-#: src/callbacks.c:11061
+#: src/callbacks.c:10987
 msgid "Fading audio out"
 msgstr "Fundiendo salida de audio"
 
-#: src/callbacks.c:11062
+#: src/callbacks.c:10988
 msgid "Fade audio out"
 msgstr "Fundido de salida de audio"
 
-#: src/callbacks.c:11085
+#: src/callbacks.c:11011
 #, c-format
 msgid "%s over %.1f seconds..."
 msgstr "%s sobre %.1f segundos"
 
-#: src/callbacks.c:11087
+#: src/callbacks.c:11013
 #, c-format
 msgid "%s from time %.2f seconds to %.2f seconds..."
 msgstr "%s de tiempo %.2f segundos a %.2f segundos..."
 
-#: src/callbacks.c:11094
+#: src/callbacks.c:11020
 msgid "Fading audio..."
 msgstr "Desvaneciendo audio..."
 
-#: src/callbacks.c:11194
+#: src/callbacks.c:11119
 msgid ""
 "\n"
 "Deleting all audio will close this file.\n"
@@ -2919,633 +2908,633 @@
 "Borrar todo el audio cerrará el archivo.\n"
 "Está seguro ?"
 
-#: src/callbacks.c:11197
+#: src/callbacks.c:11122
 msgid "Deleting all audio..."
 msgstr "Eliminando todo el audio..."
 
-#: src/callbacks.c:11203
+#: src/callbacks.c:11127
 #, c-format
 msgid "Deleting audio from %.2f to %.2f seconds..."
 msgstr "eliminando el audio desde el segundo %.2f hasta %.2f..."
 
-#: src/callbacks.c:11290
+#: src/callbacks.c:11214
 msgid "Deleting Audio"
 msgstr "Eliminando el Audio"
 
-#: src/callbacks.c:11297
+#: src/callbacks.c:11221
 msgid "Delete Audio"
 msgstr "Borrar Audio"
 
-#: src/callbacks.c:11636
+#: src/callbacks.c:11550
 msgid "Record new audio"
 msgstr "Grabar nuevo audio"
 
-#: src/callbacks.c:11725
+#: src/callbacks.c:11640
 #, c-format
 msgid "Inserting silence from %.2f to %.2f seconds..."
 msgstr "Insertando silencio desde el segundo %.2f al %.2f..."
 
-#: src/callbacks.c:11754
+#: src/callbacks.c:11666
 msgid "Inserting Silence"
 msgstr "Insertando Silencio"
 
-#: src/merge.c:85
+#: src/merge.c:96
 msgid "LiVES: - Merge"
 msgstr "LiVES:- Unir"
 
-#: src/merge.c:102
+#: src/merge.c:113
 #, c-format
 msgid "Merge Clipboard [ %d Frames ]       With Selection [ %d Frames ]"
 msgstr "Unir Portapapeles [ %d Cuadros ] con la Selección [ %d Cuadros ]"
 
-#: src/merge.c:107
+#: src/merge.c:118
 #, c-format
 msgid ""
 "Merge Clipboard [ %d Frames (resampled) ]       With Selection [ %d Frames ]"
 msgstr ""
 "Unir Portapapeles [ %d Cuadros (resampleado) con la Selección [ %d Cuadros ]"
 
-#: src/merge.c:118
+#: src/merge.c:130
 msgid "Align _Starts"
 msgstr "Alineando _Comienzos"
 
-#: src/merge.c:123
+#: src/merge.c:135
 msgid "Align _Ends"
 msgstr "Alineando _Finales"
 
-#: src/merge.c:134
+#: src/merge.c:146
 msgid "What to do with extra clipboard frames -"
 msgstr "Qué hacer con los cuadros extras en el portapapeles -"
 
-#: src/merge.c:137
+#: src/merge.c:149
 msgid "_Insert Frames"
 msgstr "_Insertar Cuadros"
 
-#: src/merge.c:143
+#: src/merge.c:155
 msgid "_Drop Frames"
 msgstr "_Desechar Frames"
 
-#: src/merge.c:149
+#: src/merge.c:160
 msgid "Number of Times to Loop Clipboard"
 msgstr ""
 
-#: src/merge.c:160
+#: src/merge.c:171
 msgid "_Loop Clipboard to Fit Selection"
 msgstr "Repetir e_l portapapeles para ajustar la selección"
 
-#: src/merge.c:173
+#: src/merge.c:184
 msgid "_Transition Method:"
 msgstr "_Método de Transición:"
 
-#: src/merge.c:394
+#: src/merge.c:395
 msgid "Merging clipboard with selection..."
 msgstr "Uniendo el portapapeles con la selección..."
 
-#: src/merge.c:551
+#: src/merge.c:539
 msgid "Merge done.\n"
 msgstr "Unión terminada.\n"
 
-#: src/gui.c:123
+#: src/gui.c:122
 msgid "_Custom Generators"
 msgstr "Ge_neradores personalizados..."
 
-#: src/gui.c:124
+#: src/gui.c:123
 msgid "_Custom Effects"
 msgstr "_Efectos personalizados"
 
-#: src/gui.c:125
+#: src/gui.c:124
 msgid "Custom _Utilities"
 msgstr "_Utilidades personalizadas"
 
-#: src/gui.c:352 src/multitrack.c:5964
+#: src/gui.c:351 src/multitrack.c:6143
 msgid "_File"
 msgstr "_Archivo"
 
-#: src/gui.c:367 src/multitrack.c:5989
+#: src/gui.c:366 src/multitrack.c:6168
 msgid "_Open File/Directory"
 msgstr "_Abrir Archivo/Directorio"
 
-#: src/gui.c:373
+#: src/gui.c:372
 msgid "O_pen Part of File..."
 msgstr "A_brir parte de archivo..."
 
-#: src/gui.c:379 src/gui.c:383 src/multitrack.c:6006 src/multitrack.c:6023
-#: src/multitrack.c:6028
+#: src/gui.c:378 src/gui.c:382 src/multitrack.c:6185 src/multitrack.c:6202
+#: src/multitrack.c:6207
 msgid "Open _Location/Stream..."
 msgstr "Abrir _localización/flujo..."
 
-#: src/gui.c:393 src/multitrack.c:6016
+#: src/gui.c:392 src/multitrack.c:6195
 msgid "Open _Youtube Clip..."
 msgstr ""
 
-#: src/gui.c:404
+#: src/gui.c:403
 msgid "Import from _dvd/vcd..."
 msgstr "Importar desde _DVD/VCD..."
 
-#: src/gui.c:413
+#: src/gui.c:412
 msgid "Import from _dvd"
 msgstr "Importar desde _DVD"
 
-#: src/gui.c:416
+#: src/gui.c:415
 msgid "Import from _vcd"
 msgstr "Importar desde _VCD"
 
-#: src/gui.c:419
+#: src/gui.c:418
 msgid "_Import from Firewire"
 msgstr "_Importar desde Firewire"
 
-#: src/gui.c:428 src/multitrack.c:6086
+#: src/gui.c:427 src/multitrack.c:6265
 msgid "Import from _Firewire Device (dv)"
 msgstr "Importar de _Dispositivo Firewire (dv)"
 
-#: src/gui.c:429 src/multitrack.c:6094
+#: src/gui.c:428 src/multitrack.c:6273
 msgid "Import from _Firewire Device (hdv)"
 msgstr "Importar de _Dispositivo Firewire (hdv)"
 
-#: src/gui.c:457
+#: src/gui.c:456
 msgid "_Add Webcam/TV card..."
 msgstr "_Añadir cámara web/tarjeta de TV..."
 
-#: src/gui.c:476
+#: src/gui.c:475
 msgid "Add _Unicap Device"
 msgstr "Añadir dispositivo _Unicap"
 
-#: src/gui.c:486
+#: src/gui.c:485
 msgid "Add Live _Firewire Device"
 msgstr ""
 
-#: src/gui.c:495
+#: src/gui.c:494
 msgid "Add _TV Device"
 msgstr ""
 
-#: src/gui.c:510 src/multitrack.c:6117
+#: src/gui.c:509 src/multitrack.c:6296
 msgid "_Recent Files..."
 msgstr "_Archivos Recientes..."
 
-#: src/gui.c:560 src/multitrack.c:6177
+#: src/gui.c:559 src/multitrack.c:6356
 msgid "_Reload Clip Set..."
 msgstr ""
 
-#: src/gui.c:564 src/multitrack.c:6185
+#: src/gui.c:563 src/multitrack.c:6364
 msgid "Close/Sa_ve All Clips"
 msgstr "Cerrar y Guardar todos los clips"
 
-#: src/gui.c:575
+#: src/gui.c:574
 msgid "_Encode Clip As..."
 msgstr "_Codificar clip como..."
 
-#: src/gui.c:577
+#: src/gui.c:576
 msgid "Encode _Selection As..."
 msgstr "Codificar _Selección Como..."
 
-#: src/gui.c:584
+#: src/gui.c:583
 msgid "_Close This Clip"
 msgstr "_Cerrar Este Clip"
 
-#: src/gui.c:595
+#: src/gui.c:594
 msgid "_Backup Clip as .lv1..."
 msgstr "_Respaldar Clip como .lv1..."
 
-#: src/gui.c:604
+#: src/gui.c:603
 msgid "_Restore Clip from .lv1..."
 msgstr "_Recuperar Clip desde .lv1..."
 
-#: src/gui.c:615
+#: src/gui.c:614
 msgid "Encode/Load/Backup _with Sound"
 msgstr "Codificar/Cargar/Respaldar _con Sonido"
 
-#: src/gui.c:620
+#: src/gui.c:619
 msgid "Auto load subtitles"
 msgstr "Cargar subtítulos automáticamente"
 
-#: src/gui.c:628 src/multitrack.c:6224
+#: src/gui.c:627 src/multitrack.c:6403
 msgid "Clean _up Diskspace"
 msgstr "Liberar espacio en disco"
 
-#: src/gui.c:636 src/multitrack.c:6257
+#: src/gui.c:635 src/multitrack.c:6436
 msgid "_Edit"
 msgstr "_Editar"
 
-#: src/gui.c:685
+#: src/gui.c:684
 msgid "_MULTITRACK mode"
 msgstr "_modo MULTIPISTAS"
 
-#: src/gui.c:696
+#: src/gui.c:695
 msgid "_Copy Selection"
 msgstr "_Copiar Selección"
 
-#: src/gui.c:705
+#: src/gui.c:704
 msgid "Cu_t Selection"
 msgstr "Cortar _Selección"
 
-#: src/gui.c:714
+#: src/gui.c:713
 msgid "_Insert from Clipboard..."
 msgstr "_Insertar desde el Portapapeles"
 
-#: src/gui.c:730
+#: src/gui.c:729
 msgid "Paste as _New"
 msgstr "Pegar como _Nuevo"
 
-#: src/gui.c:739
+#: src/gui.c:738
 msgid "_Merge Clipboard with Selection..."
 msgstr "_Unir contenido del Portapapeles con la Selección..."
 
-#: src/gui.c:746
+#: src/gui.c:745
 msgid "_Delete Selection"
 msgstr "_Borrar la Selección"
 
-#: src/gui.c:764
+#: src/gui.c:763
 msgid "Decouple _Video from Audio"
 msgstr "Separar _Video del Audio"
 
-#: src/gui.c:772
+#: src/gui.c:771
 msgid "_Select..."
 msgstr "_Seleccionar…"
 
-#: src/gui.c:786
+#: src/gui.c:785
 msgid "Select _All Frames"
 msgstr "Seleccionar _Todos los Cuadros"
 
-#: src/gui.c:794
+#: src/gui.c:793
 msgid "_Start Frame Only"
 msgstr "_Solo Primer Fotograma"
 
-#: src/gui.c:802
+#: src/gui.c:801
 msgid "_End Frame Only"
 msgstr "_Solo Ultimo Fotograma"
 
-#: src/gui.c:813
+#: src/gui.c:812
 msgid "Select from _First Frame"
 msgstr "Seleccionar desde _Primer Cuadro"
 
-#: src/gui.c:817
+#: src/gui.c:816
 msgid "Select to _Last Frame"
 msgstr "Seleccionar al _Último Cuadro"
 
-#: src/gui.c:821
+#: src/gui.c:820
 msgid "Select Last Insertion/_Merge"
 msgstr "Seleccionar Última Inserción/_Unión"
 
-#: src/gui.c:825
+#: src/gui.c:824
 msgid "Select Last _Effect"
 msgstr "Seleccionar Último _Efecto"
 
-#: src/gui.c:829
+#: src/gui.c:828
 msgid "_Invert Selection"
 msgstr "_Invertir selección"
 
-#: src/gui.c:837
+#: src/gui.c:836
 msgid "_Lock Selection Width"
 msgstr "_Encadenar Selección Con"
 
-#: src/gui.c:842 src/multitrack.c:6409
+#: src/gui.c:841 src/multitrack.c:6591
 msgid "_Play"
 msgstr "_Reproducir"
 
-#: src/gui.c:854
+#: src/gui.c:853
 msgid "_Play All"
 msgstr "_Reproducir Todo"
 
-#: src/gui.c:869
+#: src/gui.c:868
 msgid "Pla_y Selection"
 msgstr "_Reproducir Selección"
 
-#: src/gui.c:877
+#: src/gui.c:876
 msgid "Play _Clipboard"
 msgstr "Reproducir _Portapapeles"
 
-#: src/gui.c:899 src/multitrack.c:6441
+#: src/gui.c:898 src/multitrack.c:6623
 msgid "_Stop"
 msgstr "_Detener"
 
-#: src/gui.c:914 src/multitrack.c:6453
+#: src/gui.c:913 src/multitrack.c:6635
 msgid "Re_wind"
 msgstr "_Rebobinar"
 
-#: src/gui.c:946 src/multitrack.c:6471
+#: src/gui.c:945 src/multitrack.c:6653
 msgid "_Full Screen"
 msgstr "_Pantalla completa"
 
-#: src/gui.c:955
+#: src/gui.c:954
 msgid "_Double Size"
 msgstr "_Duplicar el Tamaño"
 
-#: src/gui.c:963 src/multitrack.c:6479
+#: src/gui.c:962 src/multitrack.c:6661
 msgid "Play in _Separate Window"
 msgstr "Reproducir en _Ventana Independiente"
 
-#: src/gui.c:972
+#: src/gui.c:971
 msgid "_Blank Background"
 msgstr "_Fondo en Blanco"
 
-#: src/gui.c:979
+#: src/gui.c:978
 msgid "(Auto)_loop Video (to fit audio track)"
 msgstr "(Auto)_Repetir Video (Ajustar al track de audio)"
 
-#: src/gui.c:988 src/multitrack.c:6487
+#: src/gui.c:987 src/multitrack.c:6669
 msgid "L_oop Continuously"
 msgstr "Reproducir Continuamente"
 
-#: src/gui.c:997
+#: src/gui.c:996
 msgid "Pin_g Pong Loops"
 msgstr ""
 
-#: src/gui.c:1005 src/multitrack.c:6495
+#: src/gui.c:1004 src/multitrack.c:6677
 msgid "_Mute"
 msgstr "_Silenciar"
 
-#: src/gui.c:1017
+#: src/gui.c:1016
 msgid "Separate Window 'S_ticky' Mode"
 msgstr "Separar Ventana Modo 'S_ticky'"
 
-#: src/gui.c:1025
+#: src/gui.c:1024
 msgid "S_how Frame Counter"
 msgstr "_Mostrar Contador de Cuadros"
 
-#: src/gui.c:1035
+#: src/gui.c:1034
 msgid "Show Subtitles"
 msgstr "Mostrar subtítulos"
 
-#: src/gui.c:1045
+#: src/gui.c:1044
 msgid "Letterbox mode"
 msgstr ""
 
-#: src/gui.c:1051 src/multitrack.c:6507
+#: src/gui.c:1050 src/multitrack.c:6689
 msgid "Effect_s"
 msgstr "_Efectos"
 
-#: src/gui.c:1054
+#: src/gui.c:1053
 msgid "Effects are applied to the current selection."
 msgstr "Efectos aplicados a la selección actual"
 
-#: src/gui.c:1067
+#: src/gui.c:1066
 msgid "_Run Test Rendered Effect/Tool/Generator..."
 msgstr ""
 
-#: src/gui.c:1072 src/multitrack.c:7123
+#: src/gui.c:1071 src/multitrack.c:7299
 msgid "_Tools"
 msgstr "_Herramientas"
 
-#: src/gui.c:1075
+#: src/gui.c:1074
 msgid "Tools are applied to complete clips."
 msgstr ""
 
-#: src/gui.c:1085
+#: src/gui.c:1084
 msgid "_Reverse Clipboard"
 msgstr ""
 
-#: src/gui.c:1094
+#: src/gui.c:1093
 msgid "_Change Playback/Save Speed..."
 msgstr "_Cambiar velocidad de Reproducción/Guardar..."
 
-#: src/gui.c:1099
+#: src/gui.c:1098
 msgid "Resample _Video to New Frame Rate..."
 msgstr ""
 
-#: src/gui.c:1105
+#: src/gui.c:1104
 msgid "_Utilities"
 msgstr "_Utilidades"
 
-#: src/gui.c:1110
+#: src/gui.c:1109
 msgid "Custom _Tools"
 msgstr "Herramien_tas personalizadas"
 
-#: src/gui.c:1116 src/multitrack.c:7149
+#: src/gui.c:1115 src/multitrack.c:7325
 msgid "_Generate"
 msgstr "_Generar"
 
-#: src/gui.c:1126
+#: src/gui.c:1125
 msgid "Loading rendered effect plugins..."
 msgstr "Cargando agregados con efectos renderizados"
 
-#: src/gui.c:1139
+#: src/gui.c:1138
 msgid "Load _Subtitles from File..."
 msgstr "Cargar _subtítulos desde archivo..."
 
-#: src/gui.c:1144
+#: src/gui.c:1143
 msgid "Erase subtitles"
 msgstr "Eliminar subtítulos"
 
-#: src/gui.c:1152 src/multitrack.c:7158
+#: src/gui.c:1151 src/multitrack.c:7334
 msgid "Capture _External Window... "
 msgstr "Capturar ventana _externa... "
 
-#: src/gui.c:1159 src/multitrack.c:7173
+#: src/gui.c:1158 src/multitrack.c:7349
 msgid "_Preferences..."
 msgstr "_Preferencias..."
 
-#: src/gui.c:1172
+#: src/gui.c:1171
 msgid "_Audio"
 msgstr "_Audio"
 
-#: src/gui.c:1184
+#: src/gui.c:1183
 msgid "Load _New Audio for Clip..."
 msgstr "Cargar _Nuevo Audio para Clip..."
 
-#: src/gui.c:1190
+#: src/gui.c:1189
 msgid "Load _CD Track..."
 msgstr "Cargar _Pista del CD..."
 
-#: src/gui.c:1191
+#: src/gui.c:1190
 msgid "E_ject CD"
 msgstr "Expulsar CD"
 
-#: src/gui.c:1205
+#: src/gui.c:1204
 msgid "Record E_xternal Audio..."
 msgstr "Grabar _Audio Externo..."
 
-#: src/gui.c:1218
+#: src/gui.c:1217
 msgid "to New _Clip..."
 msgstr "a un Nuevo _Clip"
 
-#: src/gui.c:1222
+#: src/gui.c:1221
 msgid "to _Selection"
 msgstr "a la _selección"
 
-#: src/gui.c:1230
+#: src/gui.c:1229
 msgid "Fade Audio _In..."
 msgstr "Desvaneceer entrada de aud_io..."
 
-#: src/gui.c:1234
+#: src/gui.c:1233
 msgid "Fade Audio _Out..."
 msgstr "Desvanecer salida de audi_o..."
 
-#: src/gui.c:1244
+#: src/gui.c:1243
 msgid "_Export Audio..."
 msgstr "_Exportar Audio..."
 
-#: src/gui.c:1257
+#: src/gui.c:1256
 msgid "Export _Selected Audio..."
 msgstr "Exportar _Audio Seleccionado..."
 
-#: src/gui.c:1261
+#: src/gui.c:1260
 msgid "Export _All Audio..."
 msgstr "Exportar _Todo el Audio..."
 
-#: src/gui.c:1265
+#: src/gui.c:1264
 msgid "_Append Audio..."
 msgstr "_Añadir Audio"
 
-#: src/gui.c:1270
+#: src/gui.c:1269
 msgid "_Trim/Pad Audio..."
 msgstr ""
 
-#: src/gui.c:1283
+#: src/gui.c:1282
 msgid "Trim/Pad Audio to _Selection"
 msgstr ""
 
-#: src/gui.c:1288
+#: src/gui.c:1287
 msgid "Trim/Pad Audio from Beginning to _Play Start"
 msgstr ""
 
-#: src/gui.c:1293
+#: src/gui.c:1292
 msgid "_Delete Audio..."
 msgstr "_Eliminar Audio"
 
-#: src/gui.c:1306
+#: src/gui.c:1305
 msgid "Delete _Selected Audio"
 msgstr "Eliminar _Audio Seleccionado"
 
-#: src/gui.c:1310
+#: src/gui.c:1309
 msgid "Delete _All Audio"
 msgstr "Eliminar _Todo el Audio"
 
-#: src/gui.c:1314
+#: src/gui.c:1313
 msgid "Insert _Silence in Selection"
 msgstr "Insertar _Silencio en la Selección"
 
-#: src/gui.c:1319
+#: src/gui.c:1318
 msgid "_Resample Audio..."
 msgstr "_Resamplear Audio..."
 
-#: src/gui.c:1324
+#: src/gui.c:1323
 msgid "_Info"
 msgstr "_Información"
 
-#: src/gui.c:1336
+#: src/gui.c:1335
 msgid "Show Clip _Info"
 msgstr "Mostrar Información del _Clip"
 
-#: src/gui.c:1344
+#: src/gui.c:1343
 msgid "Show/_Edit File Comments"
 msgstr "Mostrar/_Editar Comentarios del Archivo"
 
-#: src/gui.c:1349
+#: src/gui.c:1348
 msgid "Show _Clipboard Info"
 msgstr "Mostrar _Información del Portapapeles"
 
-#: src/gui.c:1360 src/multitrack.c:7286
+#: src/gui.c:1359 src/multitrack.c:7462
 msgid "Show _Messages"
 msgstr "Mostrar _Mensajes"
 
-#: src/gui.c:1364 src/multitrack.c:7365
+#: src/gui.c:1363 src/multitrack.c:7541
 msgid "Show _Layout Errors"
 msgstr ""
 
-#: src/gui.c:1369 src/multitrack.c:7263
+#: src/gui.c:1368 src/multitrack.c:7439
 msgid "_Clips"
 msgstr "_Clips"
 
-#: src/gui.c:1381
+#: src/gui.c:1380
 msgid "_Rename Current Clip in Menu..."
 msgstr "_Renombrar el Clip Actual en el Menú..."
 
-#: src/gui.c:1399
+#: src/gui.c:1398
 msgid "A_dvanced"
 msgstr "_Avanzado"
 
-#: src/gui.c:1412
+#: src/gui.c:1411
 msgid "_RFX Effects/Tools/Utilities"
 msgstr "_RFX Efectos/Herramientas/Utilidades"
 
-#: src/gui.c:1424
+#: src/gui.c:1423
 msgid "_New Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1428
+#: src/gui.c:1427
 msgid "_Copy RFX Script to Test..."
 msgstr ""
 
-#: src/gui.c:1432
+#: src/gui.c:1431
 msgid "_Edit Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1436
+#: src/gui.c:1435
 msgid "Rena_me Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1440
+#: src/gui.c:1439
 msgid "_Delete Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1450
+#: src/gui.c:1449
 msgid "_Promote Test Rendered Effect/Tool/Generator..."
 msgstr ""
 
-#: src/gui.c:1457
+#: src/gui.c:1456
 msgid "_Import Custom RFX script..."
 msgstr "_Importar Script  RFX Personalizado"
 
-#: src/gui.c:1461
+#: src/gui.c:1460
 msgid "E_xport Custom RFX script..."
 msgstr "E_xportar Script RFX Personalizado..."
 
-#: src/gui.c:1465
+#: src/gui.c:1464
 msgid "De_lete Custom RFX Script..."
 msgstr "Borrar Script RFX Persona_lizado..."
 
-#: src/gui.c:1472
+#: src/gui.c:1471
 msgid "Re_build all RFX plugins"
 msgstr "Reconstruir todos los agregados RFX"
 
-#: src/gui.c:1501
+#: src/gui.c:1498
 msgid "Receive _LiVES stream from..."
 msgstr "Recibir flujo _LiVES desde..."
 
-#: src/gui.c:1506
+#: src/gui.c:1503
 msgid "_Send LiVES stream to..."
 msgstr "_Enviar el flujo LiVES a..."
 
-#: src/gui.c:1515
+#: src/gui.c:1512
 #, c-format
 msgid "Open _yuv4mpeg stream on %sstream.yuv..."
 msgstr "Abrir el flujo yuv4mpeg en %sstream.yuv..."
 
-#: src/gui.c:1536
+#: src/gui.c:1534
 msgid "_Import Project (.lv2)..."
 msgstr "_Importar Proyecto (.lv2)..."
 
-#: src/gui.c:1540
+#: src/gui.c:1538
 msgid "E_xport Project (.lv2)..."
 msgstr "E_xportar proyecto (.lv2)..."
 
-#: src/gui.c:1545
+#: src/gui.c:1543
 msgid "_VJ"
 msgstr "_VJ"
 
-#: src/gui.c:1557
+#: src/gui.c:1555
 msgid "Real Time _Effect Mapping"
 msgstr ""
 
-#: src/gui.c:1563
+#: src/gui.c:1561
 msgid "Bind real time effects to ctrl-number keys."
 msgstr "Enlazar efectos de tiempo real a ctrl-teclas de números"
 
-#: src/gui.c:1565
+#: src/gui.c:1563
 msgid "Set Real Time Effect _Defaults"
 msgstr "establecer Efecto en Tiempo Real _por defecto"
 
-#: src/gui.c:1567
+#: src/gui.c:1565
 msgid "Set default parameter values for real time effects."
 msgstr ""
 "Establecer los valores por defecto de los parámetros para los Efectos en "
 "Tiempo Real."
 
-#: src/gui.c:1580
+#: src/gui.c:1578
 msgid "Save Real Time Effect _Defaults"
 msgstr "Guardar los Efectos en Tiempo Real por defecto"
 
-#: src/gui.c:1583
+#: src/gui.c:1581
 msgid ""
 "Save real time effect defaults so they will be restored each time you use "
 "LiVES."
@@ -3553,322 +3542,322 @@
 "Guardar los Efectos en Tiempo Real por defecto de tal manera de recargarlos "
 "cada vez que use LiVES."
 
-#: src/gui.c:1589
+#: src/gui.c:1587
 msgid "_Reset all playback speeds and positions"
 msgstr "_Resetear todas las velocidades y posiciones de reproducción"
 
-#: src/gui.c:1592
+#: src/gui.c:1590
 msgid ""
 "Reset all playback positions to frame 1, and reset all playback frame rates."
 msgstr ""
 "Restablecer todas las posiciones de reproducción al cuadro 1, y restablecer "
 "todas las velocidades de fotogramas de reproducción."
 
-#: src/gui.c:1594
+#: src/gui.c:1592
 msgid "_MIDI/joystick interface"
 msgstr "Interfaz _MIDI/joystick"
 
-#: src/gui.c:1609
+#: src/gui.c:1607
 msgid "_MIDI/joystick learner..."
 msgstr ""
 
-#: src/gui.c:1614
+#: src/gui.c:1612
 msgid "_Save device mapping..."
 msgstr ""
 
-#: src/gui.c:1620
+#: src/gui.c:1618
 msgid "_Load device mapping..."
 msgstr ""
 
-#: src/gui.c:1628
+#: src/gui.c:1626
 msgid "Show VJ _Keys"
 msgstr "Mostrar _claves de VJ"
 
-#: src/gui.c:1632
+#: src/gui.c:1630
 msgid "To_ys"
 msgstr "_Herramientas"
 
-#: src/gui.c:1644
+#: src/gui.c:1642
 msgid "_None"
 msgstr "_Ninguno"
 
-#: src/gui.c:1652
+#: src/gui.c:1650
 msgid "_Autolives"
 msgstr ""
 
-#: src/gui.c:1657
+#: src/gui.c:1655
 msgid "_Mad Frames"
 msgstr ""
 
-#: src/gui.c:1662
+#: src/gui.c:1660
 msgid "_LiVES TV (broadband)"
 msgstr "_LiVES TV (banda ancha)"
 
-#: src/gui.c:1672 src/multitrack.c:7387
+#: src/gui.c:1670 src/multitrack.c:7563
 msgid "_Help"
 msgstr "Ay_uda"
 
-#: src/gui.c:1684 src/multitrack.c:7407
+#: src/gui.c:1682 src/multitrack.c:7583
 msgid "_Manual (opens in browser)"
 msgstr "_Manual (se abre en el navegador)"
 
-#: src/gui.c:1691 src/multitrack.c:7416
+#: src/gui.c:1689 src/multitrack.c:7592
 msgid "_Donate to the project !"
 msgstr "_Donar al Proyecto!"
 
-#: src/gui.c:1695 src/multitrack.c:7420
+#: src/gui.c:1693 src/multitrack.c:7596
 msgid "_Email the author"
 msgstr "_Email al Autor"
 
-#: src/gui.c:1699 src/multitrack.c:7424
+#: src/gui.c:1697 src/multitrack.c:7600
 msgid "Report a _bug"
 msgstr "Reportar un _fallo"
 
-#: src/gui.c:1703 src/multitrack.c:7428
+#: src/gui.c:1701 src/multitrack.c:7604
 msgid "Suggest a _feature"
 msgstr "Sugerir una característica"
 
-#: src/gui.c:1707 src/multitrack.c:7432
+#: src/gui.c:1705 src/multitrack.c:7608
 msgid "Assist with _translating"
 msgstr ""
 
-#: src/gui.c:1714 src/multitrack.c:7439
+#: src/gui.c:1712 src/multitrack.c:7615
 msgid "_Troubleshoot"
 msgstr ""
 
-#: src/gui.c:1718 src/multitrack.c:7443
+#: src/gui.c:1716 src/multitrack.c:7619
 msgid "_About"
 msgstr "_Acerca de"
 
-#: src/gui.c:1752
+#: src/gui.c:1750
 msgid "Rewind to start (w)"
 msgstr "Rebobinar para empezar (w)"
 
-#: src/gui.c:1760 src/multitrack.c:16720
+#: src/gui.c:1758 src/multitrack.c:17010
 msgid "Play all (p)"
 msgstr "Reproducir todo (p)"
 
-#: src/gui.c:1768 src/gui.c:1877
+#: src/gui.c:1766 src/gui.c:1876
 msgid "Stop playback (q)"
 msgstr "Detener la Reproducción (q)"
 
-#: src/gui.c:1779
+#: src/gui.c:1777
 msgid "Play selection (y)"
 msgstr "Reproducir la Selección (y)"
 
-#: src/gui.c:1832
+#: src/gui.c:1829
 msgid "Volume"
 msgstr "Volúmen"
 
-#: src/gui.c:1854
+#: src/gui.c:1853
 msgid "Audio volume (1.00)"
 msgstr "Volumen de Audio (1.00)"
 
-#: src/gui.c:1883
+#: src/gui.c:1882
 msgid "Unblank background (b)"
 msgstr ""
 
-#: src/gui.c:1929
+#: src/gui.c:1928
 msgid "Play slower (ctrl-down)"
 msgstr "Reproducción más Lenta (ctrl-abajo)"
 
-#: src/gui.c:1935
+#: src/gui.c:1934
 msgid "Play faster (ctrl-up)"
 msgstr "Reproducción más Rápida (ctrl-arriba)"
 
-#: src/gui.c:1942
+#: src/gui.c:1941
 msgid "Skip back (ctrl-left)"
 msgstr "Anterior (ctrl-izquierda)"
 
-#: src/gui.c:1948
+#: src/gui.c:1947
 msgid "Skip forward (ctrl-right)"
 msgstr "Siguiente (ctrl-derecha)"
 
-#: src/gui.c:1954
+#: src/gui.c:1953
 msgid "Show clip info (i)"
 msgstr ""
 
-#: src/gui.c:1960
+#: src/gui.c:1959
 msgid "Hide this toolbar"
 msgstr "Ocultar esta Barra"
 
-#: src/gui.c:1962
+#: src/gui.c:1961
 msgid ""
 "Press \"s\" to toggle separate play window for improved performance, \"q\" "
 "to stop."
 msgstr ""
 
 #. TRANSLATORS: please keep the translated string the same length
-#: src/gui.c:1995
+#: src/gui.c:1994
 msgid "     Video playback speed (frames per second)        "
 msgstr ""
 
-#: src/gui.c:2009
+#: src/gui.c:2008
 msgid "Vary the video speed"
 msgstr "Variar la velocidad del video"
 
-#: src/gui.c:2092 src/gui.c:3218
+#: src/gui.c:2090 src/gui.c:3329
 msgid "First Frame"
 msgstr "Primer Frame"
 
-#: src/gui.c:2193 src/gui.c:3226
+#: src/gui.c:2191 src/gui.c:3336
 msgid "Last Frame"
 msgstr "Último Frame"
 
-#: src/gui.c:2210
+#: src/gui.c:2208
 msgid "The first selected frame in this clip"
 msgstr "el primer Frame seleccionado en este clip"
 
-#: src/gui.c:2248
+#: src/gui.c:2246
 msgid "The last selected frame in this clip"
 msgstr "el último Frame seleccionado en este clip"
 
-#: src/gui.c:2532
+#: src/gui.c:2546
 msgid "Starting...\n"
 msgstr "Arrancando...\n"
 
-#: src/gui.c:3074
+#: src/gui.c:3181
 msgid "    Press 'q' to stop recording.  DO NOT COVER THE PLAY WINDOW !   "
 msgstr ""
 "    Presione 'q' para detener la grabación.  NO CUBRA LA VENTANA DE "
 "GRABACIÓN! !   "
 
-#: src/gui.c:3521
+#: src/gui.c:3643
 msgid "Frame number to preview"
 msgstr ""
 
-#: src/gui.c:3538
+#: src/gui.c:3660
 msgid "_Free"
 msgstr "_Libre"
 
-#: src/gui.c:3539
+#: src/gui.c:3661
 msgid "Free choice of frame number"
 msgstr ""
 
-#: src/gui.c:3543
+#: src/gui.c:3666
 msgid "_Start"
 msgstr "_Inicio"
 
-#: src/gui.c:3544
+#: src/gui.c:3667
 msgid "Frame number is linked to start frame"
 msgstr ""
 
-#: src/gui.c:3551
+#: src/gui.c:3675
 msgid "_End"
 msgstr "Fin"
 
-#: src/gui.c:3552
+#: src/gui.c:3676
 msgid "Frame number is linked to end frame"
 msgstr ""
 
-#: src/gui.c:3559
+#: src/gui.c:3684
 msgid "_Pointer"
 msgstr ""
 
-#: src/gui.c:3560
+#: src/gui.c:3685
 msgid "Frame number is linked to playback pointer"
 msgstr ""
 
-#: src/gui.c:3581
+#: src/gui.c:3707
 msgid "Rewind"
 msgstr "Retroceder"
 
-#: src/gui.c:3592 src/dialogs.c:894 src/dialogs.c:896 src/dialogs.c:1817
-#: src/dialogs.c:1819
+#: src/gui.c:3718 src/dialogs.c:960 src/dialogs.c:962 src/dialogs.c:1873
+#: src/dialogs.c:1875
 msgid "Play all"
 msgstr "Reproduce todo"
 
-#: src/gui.c:3605
+#: src/gui.c:3731
 msgid "Play Selection"
 msgstr "Reproducir Selección"
 
-#: src/gui.c:3619
+#: src/gui.c:3745
 msgid "Loop On/Off"
 msgstr "Repetir Si/No"
 
-#: src/gui.c:3693
+#: src/gui.c:3819
 msgid "Start _recording"
 msgstr "Comenzar a Grabar"
 
-#: src/gui.c:3698
+#: src/gui.c:3824
 msgid "Stop _recording"
 msgstr "Detener Grabación"
 
-#: src/gui.c:3703
+#: src/gui.c:3829
 msgid "_Record Performance"
 msgstr "Grabar Performance"
 
-#: src/gui.c:3851
+#: src/gui.c:3974
 msgid "Hide Play Window"
 msgstr "Esconder Ventana de reproducción"
 
-#: src/gui.c:4232
+#: src/gui.c:4333
 msgid "Show Play Window"
 msgstr "Mostrar ventana De Reproducción"
 
-#: src/ce_thumbs.c:222
+#: src/ce_thumbs.c:242
 #, c-format
 msgid "Mapped to ctrl-%d"
 msgstr ""
 
-#: src/ce_thumbs.c:276 src/effects.c:85 src/preferences.c:3195
+#: src/ce_thumbs.c:296 src/effects.c:86 src/preferences.c:3247
 msgid "Effects"
 msgstr "Efectos"
 
-#: src/ce_thumbs.c:279 src/multitrack.c:5615
+#: src/ce_thumbs.c:299 src/multitrack.c:5791
 msgid "Clips"
 msgstr ""
 
-#: src/ce_thumbs.c:303
+#: src/ce_thumbs.c:323
 #, c-format
 msgid "Show / apply effects to %s\n"
 msgstr ""
 
-#: src/ce_thumbs.c:315
+#: src/ce_thumbs.c:335
 #, c-format
 msgid "Select clip for %s\n"
 msgstr ""
 
-#: src/ce_thumbs.c:515
+#: src/ce_thumbs.c:536
 msgid "_Pin"
 msgstr ""
 
-#: src/ce_thumbs.c:515
+#: src/ce_thumbs.c:537
 msgid "Pin the parameter box to the window"
 msgstr ""
 
 #. TRANSLATORS: Exabytes
-#: src/utils.c:794
+#: src/utils.c:800
 #, c-format
 msgid "%.2f EB"
 msgstr ""
 
 #. TRANSLATORS: Petabytes
-#: src/utils.c:798
+#: src/utils.c:803
 #, c-format
 msgid "%.2f PB"
 msgstr ""
 
 #. TRANSLATORS: Terabytes
-#: src/utils.c:802
+#: src/utils.c:806
 #, c-format
 msgid "%.2f TB"
 msgstr ""
 
 #. TRANSLATORS: Gigabytes
-#: src/utils.c:806
+#: src/utils.c:809
 #, c-format
 msgid "%.2f GB"
 msgstr ""
 
 #. TRANSLATORS: Megabytes
-#: src/utils.c:810
+#: src/utils.c:812
 #, c-format
 msgid "%.2f MB"
 msgstr ""
 
 #. TRANSLATORS: Kilobytes (1024 bytes)
-#: src/utils.c:814
+#: src/utils.c:815
 #, c-format
 msgid "%.2f KiB"
 msgstr ""
@@ -3878,7 +3867,7 @@
 msgid "%d bytes"
 msgstr ""
 
-#: src/utils.c:1841
+#: src/utils.c:1835
 msgid "Clearing the clipboard"
 msgstr "Limpiar Portapapeles"
 
@@ -3890,18 +3879,18 @@
 "Switched to clip %s\n"
 msgstr ""
 
-#: src/utils.c:1880
+#: src/utils.c:1877
 msgid ""
 "\n"
 "==============================\n"
 "Switched to empty clip\n"
 msgstr ""
 
-#: src/utils.c:1917
+#: src/utils.c:1916
 msgid "(blank)"
 msgstr ""
 
-#: src/utils.c:1920
+#: src/utils.c:1919
 #, c-format
 msgid ""
 "The set name has been changed from %s to %s. Affected layouts have been "
@@ -3910,7 +3899,7 @@
 "El nombre del conjunto se ha cambiado de %s a %s. Los Diseños afectadas han "
 "sido actualizado en consecuencia\n"
 
-#: src/utils.c:1928
+#: src/utils.c:1927
 #, c-format
 msgid ""
 "The clip %s is missing from this set.\n"
@@ -3919,56 +3908,56 @@
 "El clip% s no se encuentra en este conjunto.\n"
 "Es requerido por las disposiciones siguientes:\n"
 
-#: src/utils.c:1932
+#: src/utils.c:1931
 #, c-format
 msgid ""
 "The clip %s has been closed.\n"
 "It is required by the following layouts:\n"
 msgstr ""
 
-#: src/utils.c:1937
+#: src/utils.c:1936
 #, c-format
 msgid ""
 "Frames have been shifted in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1942
+#: src/utils.c:1941
 #, c-format
 msgid ""
 "Frames have been deleted from the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1947
+#: src/utils.c:1946
 #, c-format
 msgid ""
 "Audio has been deleted from the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1952
+#: src/utils.c:1951
 #, c-format
 msgid ""
 "Audio has been shifted in clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1957
+#: src/utils.c:1956
 #, c-format
 msgid ""
 "Audio has been altered in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1962
+#: src/utils.c:1961
 #, c-format
 msgid ""
 "Frames have been altered in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:2135
+#: src/utils.c:2134
 #, c-format
 msgid ""
 "Set %s\n"
@@ -3979,7 +3968,7 @@
 "No se pudo abrir, esta siendo usado\n"
 "por otra copia de LiVES.\n"
 
-#: src/utils.c:2142
+#: src/utils.c:2140
 #, c-format
 msgid ""
 "\n"
@@ -4035,67 +4024,67 @@
 msgid "Removing layout %s\n"
 msgstr ""
 
-#: src/utils.c:3014
+#: src/utils.c:2996
 msgid "Video [opening...]"
 msgstr "Video [abriendo...]"
 
-#: src/utils.c:3018
+#: src/utils.c:2999
 #, c-format
 msgid "Video [%.2f sec]"
 msgstr "Video [%.2f sec]"
 
-#: src/utils.c:3022
+#: src/utils.c:3002
 msgid "(Undefined)"
 msgstr "(Indefinido)"
 
-#: src/utils.c:3025
+#: src/utils.c:3004
 msgid "(No video)"
 msgstr "(No video)"
 
-#: src/utils.c:3032
+#: src/utils.c:3011
 msgid "(No audio)"
 msgstr "(No audio)"
 
-#: src/utils.c:3037
+#: src/utils.c:3015
 msgid "Mono  [opening...]"
 msgstr "Mono  [Abriendo...]"
 
-#: src/utils.c:3040
+#: src/utils.c:3017
 msgid "Left Audio [opening...]"
 msgstr "Audio Izquierdo [Abriendo...]"
 
-#: src/utils.c:3045
+#: src/utils.c:3021
 #, c-format
 msgid "Mono [%.2f sec]"
 msgstr "Mono [%.2f sec]"
 
-#: src/utils.c:3048
+#: src/utils.c:3023
 #, c-format
 msgid "Left Audio [%.2f sec]"
 msgstr "Audio Izquierdo [%.2f sec]"
 
-#: src/utils.c:3056
+#: src/utils.c:3031
 msgid "Right Audio [opening...]"
 msgstr "Audio Derecho [Abriendo...]"
 
-#: src/utils.c:3059
+#: src/utils.c:3033
 #, c-format
 msgid "Right Audio [%.2f sec]"
 msgstr "Audio Derecho [%.2f sec]"
 
-#: src/utils.c:3506
+#: src/utils.c:3472
 msgid "LiVES cannot switch to mplayer whilst clips are loading."
 msgstr ""
 
-#: src/utils.c:3559
+#: src/utils.c:3525
 msgid "LiVES cannot switch to mplayer2 whilst clips are loading."
 msgstr ""
 
-#: src/utils.c:3809
+#: src/utils.c:3775
 msgid "Cleaning up clip"
 msgstr ""
 
-#: src/utils.c:3913
+#: src/utils.c:3874
 #, c-format
 msgid ""
 "\n"
@@ -4110,30 +4099,29 @@
 "\n"
 "Sobreescribir ?\n"
 
-#: src/utils.c:4305 src/utils.c:4337 src/multitrack.c:4503
+#: src/utils.c:4250 src/utils.c:4280 src/multitrack.c:4672
 #, c-format
 msgid "_Undo %s"
 msgstr "_Deshacer %s"
 
-#: src/utils.c:4306 src/utils.c:4338 src/multitrack.c:4525
+#: src/utils.c:4251 src/utils.c:4281 src/multitrack.c:4693
 #, c-format
 msgid "_Redo %s"
 msgstr "_Rehacer %s"
 
-#: src/utils.c:4363
+#: src/utils.c:4305
 msgid "-------------Selection------------"
 msgstr "-------------Selección------------"
 
-#. TRANSLATORS: - try to keep the text of the middle part the same length, by deleting "-" if necessary
-#: src/utils.c:4371
+#: src/utils.c:4313
 msgid " sec ] ----------Selection---------- [ "
 msgstr " seg ] ----------Selección---------- [ "
 
-#: src/utils.c:4371
+#: src/utils.c:4314
 msgid " frames ] ----------"
 msgstr " frames ] ----------"
 
-#: src/utils.c:5360
+#: src/utils.c:5302
 msgid ""
 "Your version of mplayer/ffmpeg may be broken !\n"
 "See http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2071\n"
@@ -4144,11 +4132,11 @@
 "Try running Help/Troubleshoot for more information."
 msgstr ""
 
-#: src/saveplay.c:178
+#: src/saveplay.c:179
 msgid "Examining file header"
 msgstr "Examinando cabeceras..."
 
-#: src/saveplay.c:315 src/saveplay.c:789
+#: src/saveplay.c:316 src/saveplay.c:779
 #, c-format
 msgid "Opening %s"
 msgstr "Abriendo %s"
@@ -4158,36 +4146,36 @@
 msgid "Opening %s start time %.2f sec. frames %d"
 msgstr "Abriendo %s start time %.2f sec. frames %d"
 
-#: src/saveplay.c:326 src/saveplay.c:4001
+#: src/saveplay.c:326 src/saveplay.c:3927
 msgid " without sound"
 msgstr " Sin sounido"
 
-#: src/saveplay.c:396
+#: src/saveplay.c:395
 #, c-format
 msgid "Opening audio for %s"
 msgstr "Apertura de audio para %s"
 
-#: src/saveplay.c:557
+#: src/saveplay.c:554
 #, c-format
 msgid "Auto trimming %.2f seconds of audio at start..."
 msgstr ""
 
-#: src/saveplay.c:567
+#: src/saveplay.c:562
 #, c-format
 msgid "Auto trimming %.2f seconds of audio at end..."
 msgstr ""
 
-#: src/saveplay.c:584
+#: src/saveplay.c:577
 #, c-format
 msgid "Auto padding with %.2f seconds of silence at start..."
 msgstr ""
 
-#: src/saveplay.c:599
+#: src/saveplay.c:590
 #, c-format
 msgid "Auto padding with %.2f seconds of silence at end..."
 msgstr ""
 
-#: src/saveplay.c:671
+#: src/saveplay.c:661
 #, c-format
 msgid ""
 "\n"
@@ -4199,11 +4187,11 @@
 "Are you sure you wish to continue ?"
 msgstr ""
 
-#: src/saveplay.c:685
+#: src/saveplay.c:676
 msgid " - please be patient."
 msgstr " - Por favor sea Paciente"
 
-#: src/saveplay.c:938
+#: src/saveplay.c:926
 msgid ""
 "\n"
 "\n"
@@ -4215,7 +4203,7 @@
 "LiVES  es incapaz de extraer ya sea vídeo o audio.\n"
 "Por favor, consulte la ventana del terminal para más detalles.\n"
 
-#: src/saveplay.c:940
+#: src/saveplay.c:928
 msgid ""
 "\n"
 "\n"
@@ -4225,7 +4213,7 @@
 "\n"
 "Puede que necesite instalar MPlayer para abrir este archivo.\n"
 
-#: src/saveplay.c:948
+#: src/saveplay.c:934
 msgid ""
 "\n"
 "\n"
@@ -4233,29 +4221,29 @@
 "Tools|Preferences|Decoding\n"
 msgstr ""
 
-#: src/saveplay.c:1014
+#: src/saveplay.c:995
 msgid "Adding image..."
 msgstr ""
 
-#: src/saveplay.c:1108
+#: src/saveplay.c:1089
 #, c-format
 msgid "Subtitles were saved as %s\n"
 msgstr ""
 
-#: src/saveplay.c:1192
+#: src/saveplay.c:1171
 #, c-format
 msgid "LiVES: Save Frame %d as..."
 msgstr ""
 
-#: src/saveplay.c:1195
+#: src/saveplay.c:1174
 msgid "LiVES: Save Frame as..."
 msgstr ""
 
-#: src/saveplay.c:1322
+#: src/saveplay.c:1303
 msgid "LiVES: Save Clip as..."
 msgstr ""
 
-#: src/saveplay.c:1390
+#: src/saveplay.c:1369
 msgid ""
 "Saving your video could lead to a loss of quality !\n"
 "You are strongly advised to 'Save As' to a new file.\n"
@@ -4263,34 +4251,34 @@
 "Do you still wish to continue ?"
 msgstr ""
 
-#: src/saveplay.c:1517 src/saveplay.c:1683 src/saveplay.c:1762
-#: src/saveplay.c:4014
+#: src/saveplay.c:1494 src/saveplay.c:1659 src/saveplay.c:1738
+#: src/saveplay.c:3940
 msgid "Pulling frames from clip"
 msgstr "Tomando cuadros del clip"
 
-#: src/saveplay.c:1588 src/saveplay.c:1727
+#: src/saveplay.c:1565 src/saveplay.c:1703
 msgid "Linking selection"
 msgstr ""
 
-#: src/saveplay.c:1779
+#: src/saveplay.c:1755
 msgid " (with no sound)\n"
 msgstr " (sin sonido)\n"
 
-#: src/saveplay.c:1786
+#: src/saveplay.c:1761
 #, c-format
 msgid "Saving frames %d to %d%s as \"%s\" : encoder = %s : format = %s..."
 msgstr ""
 
-#: src/saveplay.c:1790
+#: src/saveplay.c:1765
 #, c-format
 msgid "Saving frames 1 to %d%s as \"%s\" : encoder %s : format = %s..."
 msgstr ""
 
-#: src/saveplay.c:1909
+#: src/saveplay.c:1890
 msgid "Saving [can take a long time]"
 msgstr ""
 
-#: src/saveplay.c:2057
+#: src/saveplay.c:2044
 msgid ""
 "\n"
 "\n"
@@ -4300,33 +4288,33 @@
 "\n"
 "error de codificación - archivo no creado!\n"
 
-#: src/saveplay.c:2094
+#: src/saveplay.c:2081
 msgid "Clearing letterbox"
 msgstr ""
 
-#: src/saveplay.c:2183
+#: src/saveplay.c:2168
 #, c-format
 msgid "File size was %s\n"
 msgstr ""
 
-#: src/saveplay.c:2284
+#: src/saveplay.c:2265
 msgid "recording aborted by preview.\n"
 msgstr "grabación abortada por la visualización.\n"
 
-#: src/saveplay.c:2288
+#: src/saveplay.c:2268
 msgid "recording aborted by clipboard playback.\n"
 msgstr "grabación abortada por la reproducción del portapapeles.\n"
 
-#: src/saveplay.c:2291
+#: src/saveplay.c:2270
 msgid "Recording performance..."
 msgstr "Grabando Performance..."
 
-#: src/saveplay.c:3293
+#: src/saveplay.c:3251
 #, c-format
 msgid "Average FPS was %.4f\n"
 msgstr "el promedio de FPS fue %.4f\n"
 
-#: src/saveplay.c:3299
+#: src/saveplay.c:3256
 msgid ""
 "\n"
 "\n"
@@ -4340,16 +4328,21 @@
 "Debes cliquear en Herramientas--->Redimensinar todo\n"
 "y ajusta todos los cuadros al tamaño actual.\n"
 
-#: src/saveplay.c:3479
+#: src/saveplay.c:3429
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: src/saveplay.c:3588 src/saveplay.c:4585
+#: src/saveplay.c:3538 src/saveplay.c:4502
 #, c-format
 msgid "Untitled%d"
 msgstr "Sin título%d"
 
-#: src/saveplay.c:3633
+#: src/saveplay.c:3567
+#, c-format
+msgid "%d frames are enough !\n"
+msgstr "¡%d fotogramas son suficientes !\n"
+
+#: src/saveplay.c:3579
 #, c-format
 msgid ""
 "\n"
@@ -4357,7 +4350,7 @@
 "Bad things may happen with this clip.\n"
 msgstr ""
 
-#: src/saveplay.c:3723
+#: src/saveplay.c:3667
 #, c-format
 msgid ""
 "\n"
@@ -4365,73 +4358,73 @@
 "Default can be set in Tools | Preferences | Misc.\n"
 msgstr ""
 
-#: src/saveplay.c:3735
+#: src/saveplay.c:3677
 #, c-format
 msgid "Playback speed was adjusted to %.3f frames per second to fit audio.\n"
 msgstr ""
 
-#: src/saveplay.c:3754
+#: src/saveplay.c:3694
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d *bpp=Greyscale* fps=%.3f\n"
 "Audio:"
 msgstr ""
 
-#: src/saveplay.c:3758 src/saveplay.c:4762
+#: src/saveplay.c:3698 src/saveplay.c:4671
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d bpp=%d fps=%.3f\n"
 "Audio:"
 msgstr ""
 
-#: src/saveplay.c:3762 src/saveplay.c:4766
+#: src/saveplay.c:3703 src/saveplay.c:4676
 #, c-format
 msgid "%s none\n"
 msgstr ""
 
-#: src/saveplay.c:3774
+#: src/saveplay.c:3714
 #, c-format
 msgid " - Author: %s\n"
 msgstr ""
 
-#: src/saveplay.c:3779
+#: src/saveplay.c:3717
 #, c-format
 msgid " - Title: %s\n"
 msgstr ""
 
-#: src/saveplay.c:3784
+#: src/saveplay.c:3720
 #, c-format
 msgid " - Comment: %s\n"
 msgstr " - Comentario: %s\n"
 
-#: src/saveplay.c:3897
+#: src/saveplay.c:3829
 #, c-format
 msgid "Saving frame %d as %s..."
 msgstr "Guardando cuadro %d como %s..."
 
-#: src/saveplay.c:3996
+#: src/saveplay.c:3924
 #, c-format
 msgid "Backing up %s to %s"
 msgstr "Creando respaldo  %s a %s"
 
-#: src/saveplay.c:4049
+#: src/saveplay.c:3975
 msgid "Backing up"
 msgstr "Creando copia de respaldo"
 
-#: src/saveplay.c:4083
+#: src/saveplay.c:4009
 msgid "performance data was backed up..."
 msgstr ""
 
-#: src/saveplay.c:4661
+#: src/saveplay.c:4574
 #, c-format
 msgid "Restoring %s..."
 msgstr "Restaurando %s..."
 
-#: src/saveplay.c:4692
+#: src/saveplay.c:4603
 msgid "Restoring"
 msgstr "Restaurando"
 
-#: src/saveplay.c:4714
+#: src/saveplay.c:4625
 #, c-format
 msgid ""
 "\n"
@@ -4445,22 +4438,22 @@
 "Imposible recuperarlo.\n"
 
 #. TRANSLATORS: rec(ord) %.2f M(ega)B(ytes)
-#: src/saveplay.c:5207
+#: src/saveplay.c:5118
 #, c-format
 msgid "rec %.2f MB"
 msgstr ""
 
-#: src/saveplay.c:5213
+#: src/saveplay.c:5123
 #, c-format
 msgid "!rec %.2f MB"
 msgstr ""
 
 #. TRANSLATORS: rec(ord) ?? M(ega)B(ytes)
-#: src/saveplay.c:5216
+#: src/saveplay.c:5126
 msgid "rec ?? MB"
 msgstr ""
 
-#: src/saveplay.c:5241
+#: src/saveplay.c:5151
 #, c-format
 msgid ""
 "\n"
@@ -4468,7 +4461,7 @@
 "Record stop level can be set in Preferences.\n"
 msgstr ""
 
-#: src/saveplay.c:5535
+#: src/saveplay.c:5447
 msgid ""
 "\n"
 "Files from a previous run of LiVES were found.\n"
@@ -4478,47 +4471,69 @@
 "Se encontraron archivos de una sesión previa.\n"
 "Desea intentar recobrarlos?\n"
 
-#: src/saveplay.c:5557
+#: src/saveplay.c:5469
 msgid "Recovering files"
 msgstr "Recuperando archivos"
 
-#: src/saveplay.c:5560
+#: src/saveplay.c:5472
 msgid "Recovering files..."
 msgstr ""
 
-#: src/dialogs.c:72
+#: src/dialogs.c:71
 msgid "Show affected _layouts"
 msgstr ""
 
-#: src/dialogs.c:128
+#: src/dialogs.c:113
+msgid ""
+"Do _not show this warning any more\n"
+"(can be turned back on from Preferences/Warnings)"
+msgstr ""
+"_No mostrar esta alerta nunca más\n"
+"(puede restaurarse desde Preferencias/Alertas)"
+
+#: src/dialogs.c:127
 msgid "_Recover disk space"
 msgstr ""
 
-#: src/dialogs.c:143
+#: src/dialogs.c:142
 msgid " _Advanced Settings >>"
 msgstr ""
 
-#: src/dialogs.c:184
+#: src/dialogs.c:183 src/dialogs.c:221
 msgid "LiVES: - Warning !"
 msgstr "LiVES: - Advertencia !"
 
 #: src/dialogs.c:194
+#, fuzzy
+msgid "LiVES: - Error !"
+msgstr "LiVES: - Advertencia !"
+
+#: src/dialogs.c:204
+#, fuzzy
+msgid "LiVES: - Information"
+msgstr "LiVES: - Abrir Lugar"
+
+#: src/dialogs.c:230
 msgid "LiVES: - Question"
 msgstr ""
 
-#: src/dialogs.c:204
+#: src/dialogs.c:239
 msgid "LiVES: - File Error"
 msgstr ""
 
-#: src/dialogs.c:208
+#: src/dialogs.c:241
 msgid "_Abort"
 msgstr ""
 
-#: src/dialogs.c:213
+#: src/dialogs.c:246
 msgid "_Retry"
 msgstr ""
 
-#: src/dialogs.c:597
+#: src/dialogs.c:306
+msgid "Show _Details"
+msgstr "Mostrar _detalles"
+
+#: src/dialogs.c:657
 #, c-format
 msgid ""
 "FREE SPACE IN THE PARTITION CONTAINING\n"
@@ -4529,7 +4544,7 @@
 "(Disk warning levels can be configured in Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:615
+#: src/dialogs.c:676
 #, c-format
 msgid ""
 "Free space in the partition containing\n"
@@ -4541,11 +4556,11 @@
 "Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:627
+#: src/dialogs.c:688
 msgid "Audio players cannot be switched during playback."
 msgstr "El reproductor de audio no se puede cambiar durante la reproducción"
 
-#: src/dialogs.c:632
+#: src/dialogs.c:694
 msgid ""
 "\n"
 "\n"
@@ -4557,46 +4572,46 @@
 "LiVES no pudo realizar esta operación debido a la insuficiencia de memoria.\n"
 "Por favor pruebe cerrando otras aplicaciónes.\n"
 
-#: src/dialogs.c:752
+#: src/dialogs.c:820
 msgid "Processing has been paused."
 msgstr ""
 
-#: src/dialogs.c:937
+#: src/dialogs.c:1002
 #, c-format
 msgid ""
 "\n"
 "%s%d%% done. Time remaining: %u sec%s\n"
 msgstr ""
 
-#: src/dialogs.c:1335
+#: src/dialogs.c:1391
 #, c-format
 msgid ""
 "\n"
 "%d/%d frames opened. Time remaining %u sec.\n"
 msgstr ""
 
-#: src/dialogs.c:1337
+#: src/dialogs.c:1393
 #, c-format
 msgid ""
 "\n"
 "%d/%d frames opened.\n"
 msgstr ""
 
-#: src/dialogs.c:1341
+#: src/dialogs.c:1396
 #, c-format
 msgid ""
 "\n"
 "%d frames opened.\n"
 msgstr ""
 
-#: src/dialogs.c:1940
+#: src/dialogs.c:1993
 #, c-format
 msgid ""
 "\n"
 "Time remaining: %d sec"
 msgstr ""
 
-#: src/dialogs.c:1988
+#: src/dialogs.c:2040
 #, c-format
 msgid ""
 "\n"
@@ -4604,7 +4619,7 @@
 "Please close a file and then try again."
 msgstr ""
 
-#: src/dialogs.c:1994
+#: src/dialogs.c:2047
 #, c-format
 msgid ""
 "LiVES was unable to write to its temporary directory.\n"
@@ -4616,7 +4631,7 @@
 "Please make sure you can write to this directory."
 msgstr ""
 
-#: src/dialogs.c:2005
+#: src/dialogs.c:2059
 #, fuzzy
 msgid ""
 "\n"
@@ -4627,20 +4642,20 @@
 "LiVES requiere actualmente de 'mplayer' o 'sox' para funcionar. Por favor, "
 "instale alguno de ellos, e intente nuevamente.\n"
 
-#: src/dialogs.c:2010
+#: src/dialogs.c:2064
 msgid ""
 "Audio was not loaded; please install mplayer or mplayer2 if you expected "
 "audio for this clip.\n"
 msgstr ""
 
-#: src/dialogs.c:2014
+#: src/dialogs.c:2069
 msgid ""
 "Audio resampling is required for this format.\n"
 "Please install 'sox'\n"
 "Or switch to another encoder format in Tools | Preferences | Encoding\n"
 msgstr ""
 
-#: src/dialogs.c:2019
+#: src/dialogs.c:2075
 msgid ""
 "\n"
 "\n"
@@ -4648,19 +4663,19 @@
 "Please set the audio codec in Tools|Preferences|Encoding\n"
 msgstr ""
 
-#: src/dialogs.c:2024
+#: src/dialogs.c:2080
 msgid ""
 "This layout includes generated frames.\n"
 "It cannot be saved, you must render it to a clip first.\n"
 msgstr ""
 
-#: src/dialogs.c:2029
+#: src/dialogs.c:2085
 msgid ""
 "This layout includes generated or recorded audio.\n"
 "It cannot be saved, you must render it to a clip first.\n"
 msgstr ""
 
-#: src/dialogs.c:2039 src/dialogs.c:2137
+#: src/dialogs.c:2095 src/dialogs.c:2189
 #, c-format
 msgid ""
 "\n"
@@ -4668,83 +4683,83 @@
 "Due to restrictions in the %s format\n"
 msgstr ""
 
-#: src/dialogs.c:2059
+#: src/dialogs.c:2115
 msgid ""
 "LiVES recommends the following settings:\n"
 "\n"
 msgstr ""
 
-#: src/dialogs.c:2065 src/dialogs.c:2174 src/resample.c:850
+#: src/dialogs.c:2121 src/dialogs.c:2225 src/resample.c:839
 msgid ", signed"
 msgstr ""
 
-#: src/dialogs.c:2066 src/dialogs.c:2175 src/resample.c:853
+#: src/dialogs.c:2122 src/dialogs.c:2226 src/resample.c:841
 msgid ", unsigned"
 msgstr ""
 
-#: src/dialogs.c:2070 src/dialogs.c:2179 src/resample.c:858
+#: src/dialogs.c:2126 src/dialogs.c:2230 src/resample.c:846
 msgid ", little-endian"
 msgstr ""
 
-#: src/dialogs.c:2071 src/dialogs.c:2180 src/resample.c:861
+#: src/dialogs.c:2127 src/dialogs.c:2231 src/resample.c:848
 msgid ", big-endian"
 msgstr ""
 
-#: src/dialogs.c:2077
+#: src/dialogs.c:2132
 #, c-format
 msgid "Use an audio rate of %d Hz%s%s\n"
 msgstr ""
 
-#: src/dialogs.c:2085
+#: src/dialogs.c:2140
 #, c-format
 msgid "Set video rate to %.3f frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:2089
+#: src/dialogs.c:2143
 #, c-format
 msgid "Set video rate to %d:%d frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:2094 src/dialogs.c:2209
+#: src/dialogs.c:2148 src/dialogs.c:2258
 #, c-format
 msgid "Set video size to %d x %d pixels\n"
 msgstr ""
 
-#: src/dialogs.c:2102 src/dialogs.c:2208
+#: src/dialogs.c:2156 src/dialogs.c:2257
 msgid ""
 "\n"
 "You may wish to:\n"
 msgstr ""
 
-#: src/dialogs.c:2105 src/dialogs.c:2200
+#: src/dialogs.c:2159 src/dialogs.c:2249
 #, c-format
 msgid "resize video to %d x %d pixels\n"
 msgstr ""
 
-#: src/dialogs.c:2110
+#: src/dialogs.c:2163
 msgid "disable audio, since the target encoder cannot encode audio\n"
 msgstr ""
 
-#: src/dialogs.c:2170
+#: src/dialogs.c:2221
 msgid "LiVES must:\n"
 msgstr ""
 
-#: src/dialogs.c:2185
+#: src/dialogs.c:2235
 #, c-format
 msgid "resample audio to %d Hz%s%s\n"
 msgstr ""
 
-#: src/dialogs.c:2192
+#: src/dialogs.c:2242
 #, c-format
 msgid "resample video to %.3f frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:2196
+#: src/dialogs.c:2245
 #, c-format
 msgid "resample video to %d:%d frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:2215
+#: src/dialogs.c:2263
 msgid ""
 "\n"
 "You will be able to undo these changes afterwards.\n"
@@ -4753,14 +4768,14 @@
 "\n"
 msgstr ""
 
-#: src/dialogs.c:2218
+#: src/dialogs.c:2265
 msgid ""
 "\n"
 "Changes applied to the selection will not be permanent.\n"
 "\n"
 msgstr ""
 
-#: src/dialogs.c:2237
+#: src/dialogs.c:2285
 msgid ""
 "\n"
 "\n"
@@ -4769,7 +4784,7 @@
 "Try recording for just a selection of the file."
 msgstr ""
 
-#: src/dialogs.c:2244
+#: src/dialogs.c:2293
 msgid ""
 "The playback speed (fps), or the audio rate\n"
 " of the clipboard does not match\n"
@@ -4780,7 +4795,7 @@
 "Please press Cancel to abort the insert, or OK to continue."
 msgstr ""
 
-#: src/dialogs.c:2253
+#: src/dialogs.c:2304
 #, c-format
 msgid ""
 "When opening a yuvmpeg stream, you should first create a fifo file in:\n"
@@ -4793,11 +4808,11 @@
 "click Cancel."
 msgstr ""
 
-#: src/dialogs.c:2305
+#: src/dialogs.c:2356
 msgid "Show Keys"
 msgstr ""
 
-#: src/dialogs.c:2306
+#: src/dialogs.c:2358
 msgid ""
 "You can use the following keys during playback to control LiVES:-\n"
 "\n"
@@ -4839,11 +4854,11 @@
 "g                             ping pong loops\n"
 msgstr ""
 
-#: src/dialogs.c:2313
+#: src/dialogs.c:2365
 msgid "Multitrack Keys"
 msgstr ""
 
-#: src/dialogs.c:2314
+#: src/dialogs.c:2367
 msgid ""
 "You can use the following keys to control the multitrack window:-\n"
 "\n"
@@ -4865,18 +4880,18 @@
 "For other keys, see the menus.\n"
 msgstr ""
 
-#: src/dialogs.c:2322
+#: src/dialogs.c:2375
 msgid "Message History"
 msgstr "Hirtorial de mensajes"
 
-#: src/dialogs.c:2335
+#: src/dialogs.c:2388
 #, c-format
 msgid ""
 "After upgrading/installing, you may need to adjust the <prefix_dir> setting "
 "in your %s file"
 msgstr ""
 
-#: src/dialogs.c:2344
+#: src/dialogs.c:2399
 #, c-format
 msgid ""
 "\n"
@@ -4887,25 +4902,25 @@
 "or change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/dialogs.c:2352
+#: src/dialogs.c:2408
 msgid ""
 "Sorry, unknown audio type.\n"
 "\n"
 " (Filenames must end in .mp3, .ogg, .wav, .mod, .xm or .it)"
 msgstr ""
 
-#: src/dialogs.c:2353
+#: src/dialogs.c:2409
 msgid "failed (unknown type)\n"
 msgstr ""
 
-#: src/dialogs.c:2358
+#: src/dialogs.c:2415
 msgid ""
 "\n"
 "Do you wish to remove the layout files associated with this set ?\n"
 "(They will not be usable without the set).\n"
 msgstr ""
 
-#: src/dialogs.c:2363
+#: src/dialogs.c:2421
 #, c-format
 msgid ""
 "\n"
@@ -4914,7 +4929,7 @@
 "Click Cancel to pick a new name.\n"
 msgstr ""
 
-#: src/dialogs.c:2370
+#: src/dialogs.c:2429
 msgid ""
 "\n"
 "Frames from this clip are used in some multitrack layouts.\n"
@@ -4922,7 +4937,7 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2374
+#: src/dialogs.c:2433
 msgid ""
 "\n"
 "Audio from this clip is used in some multitrack layouts.\n"
@@ -4930,7 +4945,7 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2378
+#: src/dialogs.c:2438
 #, c-format
 msgid ""
 "\n"
@@ -4941,7 +4956,7 @@
 "Otherwise click Cancel to skip loading this file.\n"
 msgstr ""
 
-#: src/dialogs.c:2385
+#: src/dialogs.c:2446
 #, c-format
 msgid ""
 "\n"
@@ -4951,7 +4966,7 @@
 "The clip could not be loaded.\n"
 msgstr ""
 
-#: src/dialogs.c:2392
+#: src/dialogs.c:2455
 msgid ""
 "\n"
 "Dear user, the jack developers decided to remove the -Z option from jackd.\n"
@@ -4959,7 +4974,7 @@
 "Alternately, select a different audio player in Preferences.\n"
 msgstr ""
 
-#: src/dialogs.c:2396
+#: src/dialogs.c:2460
 msgid ""
 "\n"
 "Unable to start up jack. Please ensure that alsa is set up correctly on your "
@@ -4968,13 +4983,13 @@
 "Automatic jack startup will be disabled now.\n"
 msgstr ""
 
-#: src/dialogs.c:2402
+#: src/dialogs.c:2466
 msgid ""
 "\n"
 "Unable to connect to jack server. Please start jack before starting LiVES\n"
 msgstr ""
 
-#: src/dialogs.c:2411
+#: src/dialogs.c:2475
 #, c-format
 msgid ""
 "\n"
@@ -4985,7 +5000,7 @@
 "%s\n"
 msgstr ""
 
-#: src/dialogs.c:2418
+#: src/dialogs.c:2482
 msgid ""
 "\n"
 "Alternately, you can restart LiVES and select another audio player.\n"
@@ -4994,7 +5009,7 @@
 "Alternativamente puedes  cerrar y volver a abrir LiVES  y seleccionar otro "
 "reproductor de audio.\n"
 
-#: src/dialogs.c:2423
+#: src/dialogs.c:2488
 #, c-format
 msgid ""
 "\n"
@@ -5004,7 +5019,7 @@
 "It is recommended to increase it to at least %d MB"
 msgstr ""
 
-#: src/dialogs.c:2429
+#: src/dialogs.c:2496
 #, c-format
 msgid ""
 "\n"
@@ -5013,7 +5028,7 @@
 "Do you wish to delete them ?\n"
 msgstr ""
 
-#: src/dialogs.c:2436
+#: src/dialogs.c:2504
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for multitrack undo.\n"
@@ -5021,7 +5036,7 @@
 "using Preferences/Multitrack/Undo Memory\n"
 msgstr ""
 
-#: src/dialogs.c:2440
+#: src/dialogs.c:2508
 msgid ""
 "\n"
 "Out of memory for undo.\n"
@@ -5029,63 +5044,63 @@
 "using Preferences/Multitrack/Undo Memory\n"
 msgstr ""
 
-#: src/dialogs.c:2444
+#: src/dialogs.c:2512
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for the multitrack undo buffer.\n"
 msgstr ""
 
-#: src/dialogs.c:2446
+#: src/dialogs.c:2514
 msgid "or enter a smaller value.\n"
 msgstr ""
 
-#: src/dialogs.c:2448
+#: src/dialogs.c:2516
 msgid "Try again from the clip editor, try closing some other applications\n"
 msgstr ""
 
-#: src/dialogs.c:2449
+#: src/dialogs.c:2517
 msgid "Try closing some other applications\n"
 msgstr "Pruebe cerrando otras aplicaciónes\n"
 
-#: src/dialogs.c:2460
+#: src/dialogs.c:2529
 msgid ""
 "Multitrack is set to 0 audio channels, but this layout has audio.\n"
 "You should adjust the audio settings from the Tools menu.\n"
 msgstr ""
 
-#: src/dialogs.c:2464
+#: src/dialogs.c:2534
 msgid ""
 "The current layout has audio, so audio channels may not be set to zero.\n"
 msgstr ""
 
-#: src/dialogs.c:2468
+#: src/dialogs.c:2539
 msgid ""
 "Multitrack audio preview is only available with the\n"
 "\"jack\" or \"pulse audio\" audio player.\n"
 "You can set this in Tools|Preferences|Playback."
 msgstr ""
 
-#: src/dialogs.c:2472
+#: src/dialogs.c:2545
 msgid ""
 "Errors were detected in the layout (which may be due to transferring from "
 "another system, or from an older version of LiVES).\n"
 "Should I try to repair the disk copy of the layout ?\n"
 msgstr ""
 
-#: src/dialogs.c:2476
+#: src/dialogs.c:2549
 msgid ""
 "LiVES was unable to load the layout.\n"
 "Sorry.\n"
 msgstr ""
 
-#: src/dialogs.c:2482
+#: src/dialogs.c:2555
 msgid ""
 "\n"
 "\n"
 "Audio rate must be greater than 0.\n"
 msgstr ""
 
-#: src/dialogs.c:2486
+#: src/dialogs.c:2559
 msgid ""
 "\n"
 "Event list will be very large\n"
@@ -5093,7 +5108,7 @@
 "Are you sure you wish to view it ?\n"
 msgstr ""
 
-#: src/dialogs.c:2491
+#: src/dialogs.c:2564
 msgid ""
 "\n"
 "\n"
@@ -5103,7 +5118,7 @@
 "\n"
 "Debe instalar 'dvgrab' para usar esta función.\n"
 
-#: src/dialogs.c:2496
+#: src/dialogs.c:2570
 msgid ""
 "\n"
 "\n"
@@ -5112,25 +5127,25 @@
 "You may need to select one of these in Tools/Preferences/Playback.\n"
 msgstr ""
 
-#: src/dialogs.c:2500
+#: src/dialogs.c:2574
 msgid "Video playback plugin failed to initialise palette !\n"
 msgstr ""
 
-#: src/dialogs.c:2504
+#: src/dialogs.c:2579
 msgid "Decoder plugin failed to initialise palette !\n"
 msgstr ""
 
-#: src/dialogs.c:2509
+#: src/dialogs.c:2584
 msgid "Unable to set framerate of video plugin\n"
 msgstr ""
 
-#: src/dialogs.c:2514
+#: src/dialogs.c:2590
 msgid ""
 "After a crash, it is advisable to clean up the disk with\n"
 "File|Clean up disk space\n"
 msgstr ""
 
-#: src/dialogs.c:2526
+#: src/dialogs.c:2604
 #, c-format
 msgid ""
 "Stream frame size is too large for your network buffers.\n"
@@ -5139,33 +5154,33 @@
 "echo %d > /proc/sys/net/core/rmem_max\n"
 msgstr ""
 
-#: src/dialogs.c:2714
+#: src/dialogs.c:2800
 msgid "cancelled.\n"
 msgstr "Cancelado.\n"
 
-#: src/dialogs.c:2721
+#: src/dialogs.c:2805
 msgid "failed.\n"
 msgstr "fracasó.\n"
 
-#: src/dialogs.c:2728
+#: src/dialogs.c:2810
 msgid "done.\n"
 msgstr "hecho.\n"
 
-#: src/dialogs.c:2732
+#: src/dialogs.c:2814
 msgid "error in file. Failed.\n"
 msgstr "error en el archivo.\n"
 
-#: src/dialogs.c:2766 src/dialogs.c:2815 src/dialogs.c:2839
+#: src/dialogs.c:2848 src/dialogs.c:2897 src/dialogs.c:2921
 #, c-format
 msgid "Additional info: %s\n"
 msgstr ""
 
-#: src/dialogs.c:2769
+#: src/dialogs.c:2851
 #, c-format
 msgid "The error value was %d%s\n"
 msgstr ""
 
-#: src/dialogs.c:2772
+#: src/dialogs.c:2854
 #, c-format
 msgid ""
 "\n"
@@ -5175,7 +5190,7 @@
 "%s%s%s"
 msgstr ""
 
-#: src/dialogs.c:2818
+#: src/dialogs.c:2900
 #, c-format
 msgid ""
 "\n"
@@ -5185,7 +5200,7 @@
 "%s"
 msgstr ""
 
-#: src/dialogs.c:2842
+#: src/dialogs.c:2924
 #, c-format
 msgid ""
 "\n"
@@ -5195,7 +5210,7 @@
 "%s"
 msgstr ""
 
-#: src/dialogs.c:2886
+#: src/dialogs.c:2968
 #, c-format
 msgid ""
 "\n"
@@ -5204,7 +5219,7 @@
 "Please check for possible error causes.\n"
 msgstr ""
 
-#: src/dialogs.c:2890
+#: src/dialogs.c:2971
 #, c-format
 msgid ""
 "\n"
@@ -5214,7 +5229,7 @@
 "%s.\n"
 msgstr ""
 
-#: src/dialogs.c:2921
+#: src/dialogs.c:3002
 #, c-format
 msgid ""
 "\n"
@@ -5223,7 +5238,7 @@
 "Please check for possible error causes.\n"
 msgstr ""
 
-#: src/dialogs.c:2925
+#: src/dialogs.c:3005
 #, c-format
 msgid ""
 "\n"
@@ -5233,12 +5248,12 @@
 "%s.\n"
 msgstr ""
 
-#: src/dialogs.c:2993
+#: src/dialogs.c:3073
 #, c-format
 msgid "Value for \"%s\" could not be read."
 msgstr ""
 
-#: src/dialogs.c:3011
+#: src/dialogs.c:3091
 #, c-format
 msgid ""
 "\n"
@@ -5247,7 +5262,7 @@
 "Please check your system for errors.\n"
 msgstr ""
 
-#: src/dialogs.c:3020
+#: src/dialogs.c:3100
 #, c-format
 msgid ""
 "\n"
@@ -5256,7 +5271,7 @@
 "Please check the file permissions and try again."
 msgstr ""
 
-#: src/dialogs.c:3027
+#: src/dialogs.c:3109
 #, c-format
 msgid ""
 "\n"
@@ -5265,7 +5280,7 @@
 "Please check the directory permissions and try again."
 msgstr ""
 
-#: src/dialogs.c:3034
+#: src/dialogs.c:3116
 #, c-format
 msgid ""
 "\n"
@@ -5273,14 +5288,14 @@
 "%s\n"
 msgstr ""
 
-#: src/dialogs.c:3041
+#: src/dialogs.c:3123
 msgid ""
 "\n"
 "Abort and exit immediately from LiVES\n"
 "Are you sure ?\n"
 msgstr ""
 
-#: src/dialogs.c:3047
+#: src/dialogs.c:3129
 #, c-format
 msgid ""
 "\n"
@@ -5288,13 +5303,13 @@
 "Please select another encoder from the list.\n"
 msgstr ""
 
-#: src/dialogs.c:3056
+#: src/dialogs.c:3139
 msgid ""
 "\n"
 "This card is already in use and cannot be opened multiple times.\n"
 msgstr ""
 
-#: src/dialogs.c:3061
+#: src/dialogs.c:3145
 #, c-format
 msgid ""
 "\n"
@@ -5304,27 +5319,27 @@
 "- Check if the device actually exists.\n"
 msgstr ""
 
-#: src/dialogs.c:3068
+#: src/dialogs.c:3153
 msgid ""
 "\n"
 "This file already has subtitles loaded.\n"
 "Do you wish to overwrite the existing subtitles ?\n"
 msgstr ""
 
-#: src/dialogs.c:3072
+#: src/dialogs.c:3157
 msgid ""
 "\n"
 "LiVES currently only supports subtitles of type .srt and .sub.\n"
 msgstr ""
 
-#: src/dialogs.c:3076
+#: src/dialogs.c:3161
 msgid ""
 "\n"
 "Erase all subtitles from this clip.\n"
 "Are you sure ?\n"
 msgstr ""
 
-#: src/dialogs.c:3082
+#: src/dialogs.c:3168
 #, c-format
 msgid ""
 "\n"
@@ -5333,14 +5348,14 @@
 "or OK to continue and save as type \"%s\"\n"
 msgstr ""
 
-#: src/dialogs.c:3089
+#: src/dialogs.c:3176
 msgid ""
 "\n"
 "Do you wish to move the current clip sets to the new directory ?\n"
 "(If unsure, click Yes)\n"
 msgstr ""
 
-#: src/dialogs.c:3093
+#: src/dialogs.c:3181
 #, c-format
 msgid ""
 "\n"
@@ -5351,19 +5366,19 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:3099
+#: src/dialogs.c:3188
 msgid ""
 "\n"
 "No video input devices could be found.\n"
 msgstr ""
 
-#: src/dialogs.c:3103
+#: src/dialogs.c:3192
 msgid ""
 "\n"
 "All video input devices are already in use.\n"
 msgstr ""
 
-#: src/dialogs.c:3107
+#: src/dialogs.c:3196
 msgid ""
 "\n"
 "\n"
@@ -5371,15 +5386,14 @@
 "DO NOT SHUT DOWN OR CLOSE LIVES !\n"
 msgstr ""
 
-#: src/dialogs.c:3127
+#: src/dialogs.c:3203
 #, c-format
 msgid ""
 "No clips were recovered for set (%s).\n"
 "Please check the spelling of the set name and try again.\n"
 msgstr ""
 
-#. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:3136
+#: src/dialogs.c:3214
 #, c-format
 msgid ""
 "\n"
@@ -5391,7 +5405,7 @@
 msgstr ""
 
 #. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:3144
+#: src/dialogs.c:3222
 #, c-format
 msgid ""
 "\n"
@@ -5400,34 +5414,34 @@
 "\n"
 msgstr ""
 
-#: src/dialogs.c:3150
+#: src/dialogs.c:3228
 msgid ""
 "\n"
 "You must have autolives.pl installed and in your path to use this toy.\n"
 "Consult your package distributor.\n"
 msgstr ""
 
-#: src/dialogs.c:3154
+#: src/dialogs.c:3232
 msgid ""
 "\n"
 "You must have a minimum of one clip loaded to use this toy.\n"
 msgstr ""
 
-#: src/dialogs.c:3158
+#: src/dialogs.c:3236
 msgid ""
 "\n"
 "LiVES lost its connection to jack and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:3162
+#: src/dialogs.c:3240
 msgid ""
 "\n"
 "LiVES lost its connection to pulseaudio and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:3175
+#: src/dialogs.c:3254
 #, c-format
 msgid ""
 "\n"
@@ -5436,240 +5450,240 @@
 "Do you wish to allow this (for this session only) ?\n"
 msgstr ""
 
-#: src/effects.c:60
+#: src/effects.c:61
 msgid "generator"
 msgstr "generador"
 
-#: src/effects.c:61
+#: src/effects.c:62
 msgid "Generators"
 msgstr "generadores"
 
-#: src/effects.c:63
+#: src/effects.c:64
 msgid "audio generator"
 msgstr ""
 
-#: src/effects.c:64
+#: src/effects.c:65
 msgid "Audio Generators"
 msgstr ""
 
-#: src/effects.c:66
+#: src/effects.c:67
 msgid "audio/video generator"
 msgstr ""
 
-#: src/effects.c:67
+#: src/effects.c:68
 msgid "Audio/Video Generators"
 msgstr ""
 
-#: src/effects.c:69
+#: src/effects.c:70
 msgid "data generator"
 msgstr ""
 
-#: src/effects.c:70
+#: src/effects.c:71
 msgid "Data Generators"
 msgstr ""
 
-#: src/effects.c:72
+#: src/effects.c:73
 msgid "data visualiser"
 msgstr ""
 
-#: src/effects.c:73
+#: src/effects.c:74
 msgid "Data Visualisers"
 msgstr ""
 
-#: src/effects.c:75
+#: src/effects.c:76
 msgid "data processor"
 msgstr ""
 
-#: src/effects.c:76
+#: src/effects.c:77
 msgid "Data Processors"
 msgstr ""
 
-#: src/effects.c:78
+#: src/effects.c:79
 msgid "data source"
 msgstr ""
 
-#: src/effects.c:79
+#: src/effects.c:80
 msgid "Data Sources"
 msgstr ""
 
-#: src/effects.c:81
+#: src/effects.c:82
 msgid "transition"
 msgstr "transiciones"
 
-#: src/effects.c:82
+#: src/effects.c:83
 msgid "Transitions"
 msgstr "Transiciones"
 
-#: src/effects.c:84
+#: src/effects.c:85
 msgid "effect"
 msgstr "efecto"
 
-#: src/effects.c:87 src/rfx-builder.c:187
+#: src/effects.c:88 src/rfx-builder.c:187
 msgid "utility"
 msgstr "utilidad"
 
-#: src/effects.c:88
+#: src/effects.c:89
 msgid "Utilities"
 msgstr "Utilidades"
 
-#: src/effects.c:90
+#: src/effects.c:91
 msgid "compositor"
 msgstr "compositor"
 
-#: src/effects.c:91
+#: src/effects.c:92
 msgid "Compositors"
 msgstr ""
 
-#: src/effects.c:93
+#: src/effects.c:94
 msgid "tap"
 msgstr ""
 
-#: src/effects.c:94
+#: src/effects.c:95
 msgid "Taps"
 msgstr ""
 
-#: src/effects.c:96
+#: src/effects.c:97
 msgid "splitter"
 msgstr "separador"
 
-#: src/effects.c:97
+#: src/effects.c:98
 msgid "Splitters"
 msgstr "Separadores"
 
-#: src/effects.c:99
+#: src/effects.c:100
 msgid "converter"
 msgstr "conversor"
 
-#: src/effects.c:100
+#: src/effects.c:101
 msgid "Converters"
 msgstr "Conversores"
 
-#: src/effects.c:102
+#: src/effects.c:103
 msgid "analyser"
 msgstr ""
 
-#: src/effects.c:103
+#: src/effects.c:104
 msgid "Analysers"
 msgstr ""
 
-#: src/effects.c:108
+#: src/effects.c:109
 msgid "audio/video"
 msgstr ""
 
-#: src/effects.c:109
+#: src/effects.c:110
 msgid "Audio/Video Transitions"
 msgstr "Transiciónes de Audio/Video"
 
-#: src/effects.c:111
+#: src/effects.c:112
 msgid "video only"
 msgstr ""
 
-#: src/effects.c:112
+#: src/effects.c:113
 msgid "Video only Transitions"
 msgstr "Transición solo de video"
 
-#: src/effects.c:114 src/multitrack.c:10740
+#: src/effects.c:115 src/multitrack.c:10962
 msgid "audio only"
 msgstr ""
 
-#: src/effects.c:115
+#: src/effects.c:116
 msgid "Audio only Transitions"
 msgstr "Transición solo de audio"
 
-#: src/effects.c:117 src/effects.c:120 src/multitrack.c:18757
+#: src/effects.c:118 src/effects.c:121 src/multitrack.c:19097
 msgid "audio"
 msgstr "audio"
 
-#: src/effects.c:118
+#: src/effects.c:119
 msgid "Audio Mixers"
 msgstr "Mezcladores de audio"
 
-#: src/effects.c:121
+#: src/effects.c:122
 msgid "Audio Effects"
 msgstr ""
 
-#: src/effects.c:123
+#: src/effects.c:124
 msgid "video"
 msgstr ""
 
-#: src/effects.c:124
+#: src/effects.c:125
 msgid "Video Effects"
 msgstr ""
 
-#: src/effects.c:126
+#: src/effects.c:127
 msgid "audio volume controller"
 msgstr "control de volumen de audio"
 
-#: src/effects.c:127
+#: src/effects.c:128
 msgid "Audio Volume Controllers"
 msgstr "Controles de volumen de audio"
 
-#: src/effects.c:129
+#: src/effects.c:130
 msgid "video analyser"
 msgstr ""
 
-#: src/effects.c:130
+#: src/effects.c:131
 msgid "Video analysers"
 msgstr ""
 
-#: src/effects.c:132
+#: src/effects.c:133
 msgid "audio analyser"
 msgstr ""
 
-#: src/effects.c:133
+#: src/effects.c:134
 msgid "Audio Analysers"
 msgstr ""
 
-#: src/effects.c:137 src/plugins.c:2559 src/plugins.c:2573
+#: src/effects.c:138 src/plugins.c:2507 src/plugins.c:2521
 msgid "unknown"
 msgstr "desconocido"
 
-#: src/effects.c:238
+#: src/effects.c:235
 #, c-format
 msgid "%s all frames..."
 msgstr ""
 
-#: src/effects.c:243
+#: src/effects.c:239
 #, c-format
 msgid "%s clipboard into frames %d to %d..."
 msgstr ""
 
-#: src/effects.c:250
+#: src/effects.c:245
 #, c-format
 msgid "%s to clipboard..."
 msgstr ""
 
-#: src/effects.c:254
+#: src/effects.c:248
 #, c-format
 msgid "%s to new clip..."
 msgstr ""
 
-#: src/effects.c:259
+#: src/effects.c:252
 #, c-format
 msgid "%s frames %d to %d..."
 msgstr ""
 
-#: src/effects.c:290
+#: src/effects.c:283
 #, c-format
 msgid "%s clipboard with selection"
 msgstr ""
 
-#: src/effects.c:295
+#: src/effects.c:287
 #, c-format
 msgid "%s to clipboard"
 msgstr ""
 
-#: src/effects.c:299
+#: src/effects.c:290
 #, c-format
 msgid "%s to new clip"
 msgstr ""
 
-#: src/effects.c:304
+#: src/effects.c:294
 #, c-format
 msgid "%s frames %d to %d"
 msgstr ""
 
-#: src/effects.c:456 src/effects.c:523
+#: src/effects.c:443 src/effects.c:507
 msgid ""
 "\n"
 "No frames were generated.\n"
@@ -5677,304 +5691,304 @@
 "\n"
 "No se generaron cuadros\n"
 
-#: src/effects-weed.c:431
+#: src/effects-weed.c:452
 msgid "integer"
 msgstr ""
 
-#: src/effects-weed.c:432
+#: src/effects-weed.c:454
 msgid "int64"
 msgstr ""
 
-#: src/effects-weed.c:433
+#: src/effects-weed.c:456
 msgid "boolean"
 msgstr ""
 
-#: src/effects-weed.c:434
+#: src/effects-weed.c:458
 msgid "double"
 msgstr ""
 
-#: src/effects-weed.c:435
+#: src/effects-weed.c:460
 msgid "string"
 msgstr ""
 
-#: src/effects-weed.c:436
+#: src/effects-weed.c:462
 msgid "pointer"
 msgstr ""
 
-#: src/effects-weed.c:4591
+#: src/effects-weed.c:4581
 #, c-format
 msgid "Error: plugin %s has no weed_setup() function.\n"
 msgstr "Error: plugin %s has no weed_setup() function.\n"
 
-#: src/effects-weed.c:4606
+#: src/effects-weed.c:4595
 #, c-format
 msgid "No usable filters found in plugin %s\n"
 msgstr ""
 
-#: src/effects-weed.c:4680
+#: src/effects-weed.c:4668
 #, c-format
 msgid "Found duplicate plugin %s"
 msgstr ""
 
-#: src/effects-weed.c:4734
+#: src/effects-weed.c:4723
 #, c-format
 msgid ""
 "Info: Unable to load plugin %s\n"
 "Error was: %s\n"
 msgstr ""
 
-#: src/effects-weed.c:4737 src/effects-weed.c:5858
+#: src/effects-weed.c:4726 src/effects-weed.c:5847
 msgid "Some plugin directories"
 msgstr ""
 
 #. TRANSLATORS: example " - LADSPA plugins -"
-#: src/effects-weed.c:4812 src/rte_window.c:2105
+#: src/effects-weed.c:4801 src/rte_window.c:2107
 #, c-format
 msgid " - %s plugins -"
 msgstr ""
 
-#: src/effects-weed.c:5012
+#: src/effects-weed.c:4998
 #, c-format
 msgid "Successfully loaded %d Weed filters\n"
 msgstr ""
 
-#: src/effects-weed.c:5177
+#: src/effects-weed.c:5162
 #, c-format
 msgid "Invalid compound effect %s - has conflicting target_fps\n"
 msgstr ""
 
-#: src/effects-weed.c:5197
+#: src/effects-weed.c:5182
 #, c-format
 msgid "Invalid compound effect %s - has multiple transition parameters\n"
 msgstr ""
 
-#: src/effects-weed.c:5211
+#: src/effects-weed.c:5196
 #, c-format
 msgid "Invalid compound effect %s - has multiple master volume parameters\n"
 msgstr ""
 
-#: src/effects-weed.c:5346
+#: src/effects-weed.c:5329
 #, c-format
 msgid "Invalid compound effect %s - must have >1 sub filters\n"
 msgstr ""
 
-#: src/effects-weed.c:5366
+#: src/effects-weed.c:5349
 #, c-format
 msgid "Invalid effect %s found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5381
+#: src/effects-weed.c:5364
 #, c-format
 msgid "Invalid default found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5392
+#: src/effects-weed.c:5375
 #, c-format
 msgid "Invalid filter %d for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5406
+#: src/effects-weed.c:5389
 #, c-format
 msgid "Invalid param %d for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5433
+#: src/effects-weed.c:5416
 #, c-format
 msgid ""
 "Invalid number of values for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5467
+#: src/effects-weed.c:5450
 #, c-format
 msgid ""
 "Invalid non-boolean value for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5500
+#: src/effects-weed.c:5483
 #, c-format
 msgid "Invalid param link found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5511
+#: src/effects-weed.c:5494
 #, c-format
 msgid ""
 "Invalid out filter %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5529
+#: src/effects-weed.c:5513
 #, c-format
 msgid ""
 "Invalid out param %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5541
+#: src/effects-weed.c:5526
 #, c-format
 msgid ""
 "Invalid non-boolean value for autoscale found in compound effect %s, line "
 "%d\n"
 msgstr ""
 
-#: src/effects-weed.c:5552
+#: src/effects-weed.c:5537
 #, c-format
 msgid ""
 "Invalid in filter %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5566
+#: src/effects-weed.c:5552
 #, c-format
 msgid ""
 "Invalid in param %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5594
+#: src/effects-weed.c:5581
 #, c-format
 msgid "Invalid channel link found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5605
+#: src/effects-weed.c:5592
 #, c-format
 msgid ""
 "Invalid out filter %d for link channels found in compound effect %s, line "
 "%d\n"
 msgstr ""
 
-#: src/effects-weed.c:5623
+#: src/effects-weed.c:5611
 #, c-format
 msgid ""
 "Invalid out channel %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5633
+#: src/effects-weed.c:5622
 #, c-format
 msgid ""
 "Invalid in filter %d for link channels found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5651
+#: src/effects-weed.c:5641
 #, c-format
 msgid ""
 "Invalid in channel %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5687
+#: src/effects-weed.c:5678
 #, c-format
 msgid "Compound:%s"
 msgstr ""
 
-#: src/effects-weed.c:5758
+#: src/effects-weed.c:5749
 #, c-format
 msgid "Successfully loaded %d compound filters\n"
 msgstr ""
 
-#: src/effects-weed.c:6591
+#: src/effects-weed.c:6570
 #, c-format
 msgid "Effect %s cannot be used with this audio player.\n"
 msgstr ""
 
-#: src/effects-weed.c:6737
+#: src/effects-weed.c:6718
 #, c-format
 msgid "Failed to start instance %s, error code %d\n"
 msgstr ""
 
-#: src/effects-weed.c:6814
+#: src/effects-weed.c:6797
 #, c-format
 msgid "Unable to start generator %s\n"
 msgstr ""
 
-#: src/effects-weed.c:7621
+#: src/effects-weed.c:7607
 #, c-format
 msgid "Failed to start generator %s\n"
 msgstr ""
 
-#: src/effects-weed.c:7718
+#: src/effects-weed.c:7701
 #, c-format
 msgid "Failed to start generator %s, error %d\n"
 msgstr ""
 
-#: src/effects-weed.c:9012
+#: src/effects-weed.c:8993
 #, c-format
 msgid "%s [unstable] (%s)"
 msgstr ""
 
-#: src/effects-data.c:3278
+#: src/effects-data.c:3234
 #, c-format
 msgid "ACTIVATE (%s)"
 msgstr ""
 
-#: src/effects-data.c:3548
+#: src/effects-data.c:3501
 msgid "ACTIVATE"
 msgstr ""
 
-#: src/effects-data.c:3876
+#: src/effects-data.c:3829
 #, c-format
 msgid "Key slot %d"
 msgstr ""
 
-#: src/effects-data.c:3998
+#: src/effects-data.c:3951
 msgid "Autoscale"
 msgstr ""
 
-#: src/effects-data.c:4089
+#: src/effects-data.c:4042
 msgid "Add another connection for this output parameter"
 msgstr ""
 
-#: src/effects-data.c:4102 src/effects-data.c:4151
+#: src/effects-data.c:4055 src/effects-data.c:4104
 msgid "Delete this connection"
 msgstr ""
 
-#: src/effects-data.c:4138
+#: src/effects-data.c:4091
 msgid "Add another connection for this output channel"
 msgstr ""
 
-#: src/effects-data.c:4223
+#: src/effects-data.c:4176
 msgid "Connected to -->"
 msgstr ""
 
-#: src/effects-data.c:4243
+#: src/effects-data.c:4196
 #, c-format
 msgid "%s - Alpha Channel Connections"
 msgstr ""
 
-#: src/effects-data.c:4316
+#: src/effects-data.c:4269
 #, c-format
 msgid "%s - Parameter Data Connections"
 msgstr ""
 
-#: src/effects-data.c:4336
+#: src/effects-data.c:4289
 msgid "Autoscale All"
 msgstr ""
 
-#: src/effects-data.c:4361 src/effects-data.c:4890
+#: src/effects-data.c:4314 src/effects-data.c:4841
 msgid "ACTIVATED"
 msgstr ""
 
-#: src/effects-data.c:4774
+#: src/effects-data.c:4726
 msgid "LiVES: - Parameter and Alpha Channel Connections"
 msgstr ""
 
-#: src/effects-data.c:4785
+#: src/effects-data.c:4736
 msgid "Auto Connect Channels"
 msgstr ""
 
-#: src/effects-data.c:4797
+#: src/effects-data.c:4748
 msgid "Auto Connect Parameters"
 msgstr ""
 
-#: src/effects-data.c:4807
+#: src/effects-data.c:4758
 msgid "Disconnect All"
 msgstr ""
 
-#: src/effects-data.c:4875
+#: src/effects-data.c:4826
 #, c-format
 msgid "Input channel is already connected from (%d,%d) %s"
 msgstr ""
 
-#: src/effects-data.c:4891
+#: src/effects-data.c:4842
 #, c-format
 msgid "Input parameter is already connected from (%d,%d) %s"
 msgstr ""
 
-#: src/effects-data.c:4899
+#: src/effects-data.c:4851
 msgid "Input and output parameters are not compatible"
 msgstr ""
 
@@ -5986,43 +6000,43 @@
 msgid "_Reset Values"
 msgstr ""
 
-#: src/framedraw.c:267
+#: src/framedraw.c:265
 msgid "_Frame"
 msgstr ""
 
-#: src/paramspecial.c:266
+#: src/paramspecial.c:259
 msgid "Maintain _Aspect Ratio"
 msgstr ""
 
-#: src/paramspecial.c:267
+#: src/paramspecial.c:260
 msgid "Maintain aspect ratio of original frame"
 msgstr ""
 
-#: src/paramspecial.c:341
+#: src/paramspecial.c:335
 msgid "Display Password"
 msgstr ""
 
-#: src/paramwindow.c:450
+#: src/paramwindow.c:447
 msgid "Transition _In"
 msgstr ""
 
-#: src/paramwindow.c:452
+#: src/paramwindow.c:449
 msgid "Click to set the transition parameter to show only the front frame"
 msgstr ""
 
-#: src/paramwindow.c:474
+#: src/paramwindow.c:472
 msgid "Crossfade audio"
 msgstr ""
 
-#: src/paramwindow.c:475
+#: src/paramwindow.c:473
 msgid "Check the box to make audio transition with the video"
 msgstr ""
 
-#: src/paramwindow.c:493
+#: src/paramwindow.c:492
 msgid "Transition _Out"
 msgstr ""
 
-#: src/paramwindow.c:495
+#: src/paramwindow.c:494
 msgid "Click to set the transition parameter to show only the rear frame"
 msgstr ""
 
@@ -6035,23 +6049,23 @@
 msgid "%s : size"
 msgstr ""
 
-#: src/paramwindow.c:598
+#: src/paramwindow.c:597
 msgid "New size (pixels)"
 msgstr ""
 
-#: src/paramwindow.c:617 src/plugins.c:997
+#: src/paramwindow.c:616 src/plugins.c:973
 msgid "_Width"
 msgstr "_Anchura"
 
-#: src/paramwindow.c:636 src/plugins.c:1003
+#: src/paramwindow.c:635 src/plugins.c:979
 msgid "_Height"
 msgstr "A_ltura"
 
-#: src/paramwindow.c:684
+#: src/paramwindow.c:683
 msgid "Generate to _Clipboard"
 msgstr "Generar en el _portapapeles"
 
-#: src/paramwindow.c:686
+#: src/paramwindow.c:685
 msgid "Generate frames to the clipboard"
 msgstr ""
 
@@ -6063,7 +6077,7 @@
 msgid "Generate frames to a new clip"
 msgstr ""
 
-#: src/paramwindow.c:822
+#: src/paramwindow.c:824
 #, c-format
 msgid ""
 "\n"
@@ -6071,71 +6085,71 @@
 "\n"
 msgstr ""
 
-#: src/paramwindow.c:920 src/paramwindow.c:930
+#: src/paramwindow.c:934 src/paramwindow.c:942
 msgid "Set as default"
 msgstr "Establecer como predeterminado"
 
-#: src/paramwindow.c:922 src/paramwindow.c:938
+#: src/paramwindow.c:936 src/paramwindow.c:950
 msgid "Reset"
 msgstr ""
 
-#: src/paramwindow.c:932 src/rte_window.c:2401 src/omc-learn.c:1357
+#: src/paramwindow.c:944 src/rte_window.c:2394 src/omc-learn.c:1347
 msgid "Close _window"
 msgstr "_Cerrar ventana"
 
-#: src/paramwindow.c:1337
+#: src/paramwindow.c:1340
 msgid "No parameters"
 msgstr "Sin parametros"
 
-#: src/paramwindow.c:1419
+#: src/paramwindow.c:1424
 msgid "Invalid parameter"
 msgstr "Parámetro inválido"
 
-#: src/paramwindow.c:1611
+#: src/paramwindow.c:1610
 msgid "LiVES: - Select Colour"
 msgstr "LiVES: - Seleccionar Color"
 
-#: src/paramwindow.c:1616
+#: src/paramwindow.c:1615
 msgid "Click to set the colour"
 msgstr "Click para seleccionar colour"
 
-#: src/paramwindow.c:1628
+#: src/paramwindow.c:1626
 msgid "_Red"
 msgstr ""
 
-#: src/paramwindow.c:1629
+#: src/paramwindow.c:1627
 msgid "The red value (0 - 255)"
 msgstr "Valor de Rojo (0 - 255)"
 
-#: src/paramwindow.c:1632
+#: src/paramwindow.c:1630
 msgid "_Green"
 msgstr ""
 
-#: src/paramwindow.c:1633
+#: src/paramwindow.c:1631
 msgid "The green value (0 - 255)"
 msgstr "Valor de Verde (0 - 255)"
 
-#: src/paramwindow.c:1636
+#: src/paramwindow.c:1634
 msgid "_Blue"
 msgstr ""
 
-#: src/paramwindow.c:1637
+#: src/paramwindow.c:1635
 msgid "The blue value (0 - 255)"
 msgstr "Valor de Azul (0 - 255)"
 
-#: src/plugins.c:85
+#: src/plugins.c:86
 #, c-format
 msgid ""
 "\n"
 "Plugin error: %s failed with code %d"
 msgstr ""
 
-#: src/plugins.c:87
+#: src/plugins.c:88
 #, c-format
 msgid " : message was %s\n"
 msgstr ""
 
-#: src/plugins.c:387
+#: src/plugins.c:375
 #, c-format
 msgid ""
 "\n"
@@ -6145,17 +6159,17 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/plugins.c:397
+#: src/plugins.c:385
 #, c-format
 msgid "Updating video playback plugin defaults in %s\n"
 msgstr ""
 
-#: src/plugins.c:452
+#: src/plugins.c:444
 #, c-format
 msgid "Loading video playback plugin defaults from %s..."
 msgstr ""
 
-#: src/plugins.c:515
+#: src/plugins.c:505
 #, c-format
 msgid ""
 "\n"
@@ -6165,32 +6179,32 @@
 "\n"
 msgstr ""
 
-#: src/plugins.c:855
+#: src/plugins.c:836
 #, c-format
 msgid "Saving playback plugin defaults to %s..."
 msgstr ""
 
-#: src/plugins.c:962
+#: src/plugins.c:939
 msgid "_FPS"
 msgstr "_FPS"
 
-#: src/plugins.c:963
+#: src/plugins.c:940
 msgid "Fixed framerate for plugin.\n"
 msgstr ""
 
-#: src/plugins.c:1032
+#: src/plugins.c:1008
 msgid "_Colourspace"
 msgstr ""
 
-#: src/plugins.c:1033
+#: src/plugins.c:1009
 msgid "Colourspace input to the plugin.\n"
 msgstr ""
 
-#: src/plugins.c:1089
+#: src/plugins.c:1065
 msgid "Save settings to an alternate file.\n"
 msgstr ""
 
-#: src/plugins.c:1206
+#: src/plugins.c:1182
 #, c-format
 msgid ""
 "\n"
@@ -6199,7 +6213,7 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/plugins.c:1252
+#: src/plugins.c:1228
 #, c-format
 msgid ""
 "\n"
@@ -6209,38 +6223,38 @@
 "Unable to use it.\n"
 msgstr ""
 
-#: src/plugins.c:1265
+#: src/plugins.c:1241
 #, c-format
 msgid ""
 "Video playback plugin failed to initialise.\n"
 "Error was: %s\n"
 msgstr ""
 
-#: src/plugins.c:1461
+#: src/plugins.c:1428
 msgid ""
 "\n"
 "Warning ! Video playback plugin will not send key presses. Keyboard may be "
 "disabled during plugin use !\n"
 msgstr ""
 
-#: src/plugins.c:1465
+#: src/plugins.c:1433
 #, c-format
 msgid ""
 "*** Using %s plugin for fs playback, agreed to use palette type %d ( %s ). "
 "***\n"
 msgstr ""
 
-#: src/plugins.c:1571
+#: src/plugins.c:1537
 #, c-format
 msgid "Audio stream unable to use preferred format '%s'\n"
 msgstr ""
 
-#: src/plugins.c:1579
+#: src/plugins.c:1543
 #, c-format
 msgid "Using format '%s' instead.\n"
 msgstr ""
 
-#: src/plugins.c:1616
+#: src/plugins.c:1579
 #, c-format
 msgid ""
 "LiVES was unable to find its encoder plugins. Please make sure you have the "
@@ -6249,7 +6263,7 @@
 "or change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/plugins.c:1624
+#: src/plugins.c:1589
 #, c-format
 msgid ""
 "LiVES did not receive a response from the encoder plugin called '%s'.\n"
@@ -6258,11 +6272,11 @@
 "or switch to another plugin using Tools|Preferences|Encoding\n"
 msgstr ""
 
-#: src/plugins.c:2032
+#: src/plugins.c:1987
 msgid "Unable to resize, please install imageMagick\n"
 msgstr ""
 
-#: src/plugins.c:2231
+#: src/plugins.c:2183
 #, c-format
 msgid ""
 "\n"
@@ -6270,12 +6284,12 @@
 "No decoders found in %s !\n"
 msgstr ""
 
-#: src/plugins.c:2415
+#: src/plugins.c:2369
 #, c-format
 msgid " using %s"
 msgstr ""
 
-#: src/plugins.c:2499
+#: src/plugins.c:2451
 #, c-format
 msgid ""
 "\n"
@@ -6284,7 +6298,7 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/plugins.c:2522
+#: src/plugins.c:2472
 #, c-format
 msgid ""
 "\n"
@@ -6294,24 +6308,24 @@
 "Unable to use it.\n"
 msgstr ""
 
-#: src/plugins.c:2564
+#: src/plugins.c:2512
 msgid "/unknown"
 msgstr ""
 
-#: src/plugins.c:2651
+#: src/plugins.c:2598
 msgid "LiVES: - Decoder Plugins"
 msgstr ""
 
-#: src/plugins.c:2669
+#: src/plugins.c:2616
 msgid "Enabled Video Decoders (uncheck to disable)"
 msgstr ""
 
-#: src/plugins.c:2726
+#: src/plugins.c:2672
 #, c-format
 msgid "Failed to load %s, transitions may not resize.\n"
 msgstr ""
 
-#: src/plugins.c:3854
+#: src/plugins.c:3797
 #, c-format
 msgid "%s advanced settings"
 msgstr ""
@@ -6320,15 +6334,15 @@
 msgid "LiVES: - New Test RFX"
 msgstr ""
 
-#: src/rfx-builder.c:136
+#: src/rfx-builder.c:135
 msgid "LiVES: - Edit Test RFX"
 msgstr ""
 
-#: src/rfx-builder.c:166
+#: src/rfx-builder.c:165
 msgid "Type:"
 msgstr "Tipo:"
 
-#: src/rfx-builder.c:184
+#: src/rfx-builder.c:183
 msgid "tool"
 msgstr ""
 
@@ -6340,130 +6354,130 @@
 msgid "The name of the plugin. No spaces allowed."
 msgstr "El nombre del plugin no admite espacios"
 
-#: src/rfx-builder.c:201
+#: src/rfx-builder.c:202
 msgid "Version:       "
 msgstr "Versión:       "
 
-#: src/rfx-builder.c:203
+#: src/rfx-builder.c:204
 msgid "The script version."
 msgstr "Versión del script."
 
-#: src/rfx-builder.c:210
+#: src/rfx-builder.c:212
 msgid "    Author:       "
 msgstr "    Autor:       "
 
-#: src/rfx-builder.c:211
+#: src/rfx-builder.c:213
 msgid "The script author."
 msgstr "Autor del script"
 
-#: src/rfx-builder.c:217
+#: src/rfx-builder.c:220
 msgid "    URL (optional):       "
 msgstr "    URL (opcional):       "
 
-#: src/rfx-builder.c:218
+#: src/rfx-builder.c:221
 msgid "URL for the plugin maintainer."
 msgstr ""
 
-#: src/rfx-builder.c:226
+#: src/rfx-builder.c:230
 msgid "Menu text:    "
 msgstr ""
 
-#: src/rfx-builder.c:227
+#: src/rfx-builder.c:231
 msgid "The text to show in the menu."
 msgstr "El texto a mostrar en el menú."
 
-#: src/rfx-builder.c:239
+#: src/rfx-builder.c:244
 msgid "Action description:        "
 msgstr "Descripción:        "
 
-#: src/rfx-builder.c:241
+#: src/rfx-builder.c:246
 msgid "Describe what the plugin is doing. E.g. \"Edge detecting\""
 msgstr "Describe lo que el plugin hace. Por ejemplo, Edge \"detectar\""
 
-#: src/rfx-builder.c:246
+#: src/rfx-builder.c:251
 msgid "Minimum frames:"
 msgstr ""
 
-#: src/rfx-builder.c:249
+#: src/rfx-builder.c:254
 msgid ""
 "Minimum number of frames this effect/tool can be applied to. Normally 1."
 msgstr ""
 
-#: src/rfx-builder.c:260
+#: src/rfx-builder.c:265
 msgid "_Requirements..."
 msgstr "_Requisitos..."
 
-#: src/rfx-builder.c:263
+#: src/rfx-builder.c:268
 msgid "Enter any binaries required by the plugin."
 msgstr ""
 
-#: src/rfx-builder.c:267
+#: src/rfx-builder.c:272
 msgid "_Properties..."
 msgstr "_Propiedades..."
 
-#: src/rfx-builder.c:270
+#: src/rfx-builder.c:275
 msgid "Set properties for the plugin. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:274
+#: src/rfx-builder.c:279
 msgid "_Parameters..."
 msgstr "_Parametros..."
 
-#: src/rfx-builder.c:277
+#: src/rfx-builder.c:282
 msgid "Set up parameters used in pre/loop/post/trigger code. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:281
+#: src/rfx-builder.c:286
 msgid "Parameter _Window Hints..."
 msgstr ""
 
-#: src/rfx-builder.c:284
+#: src/rfx-builder.c:289
 msgid "Set hints about how to lay out the parameter window. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:290
+#: src/rfx-builder.c:295
 msgid "_Language code:"
 msgstr ""
 
-#: src/rfx-builder.c:291
+#: src/rfx-builder.c:296
 msgid "Language for pre/loop/post/triggers. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:300
+#: src/rfx-builder.c:305
 msgid "_Pre loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:303
+#: src/rfx-builder.c:308
 msgid "Code to be executed before the loop. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:307
+#: src/rfx-builder.c:312
 msgid "_Loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:310
+#: src/rfx-builder.c:315
 msgid "Loop code to be applied to each frame."
 msgstr ""
 
-#: src/rfx-builder.c:314
+#: src/rfx-builder.c:319
 msgid "_Post loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:317
+#: src/rfx-builder.c:322
 msgid "Code to be executed after the loop. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:321
+#: src/rfx-builder.c:326
 msgid "_Trigger code..."
 msgstr ""
 
-#: src/rfx-builder.c:324
+#: src/rfx-builder.c:329
 msgid ""
 "Set trigger code for when the parameter window is shown, or when a parameter "
 "is changed. Optional (except for Utilities)."
 msgstr ""
 
-#: src/rfx-builder.c:421
+#: src/rfx-builder.c:426
 #, c-format
 msgid ""
 "\n"
@@ -6473,55 +6487,55 @@
 "%s\n"
 msgstr ""
 
-#: src/rfx-builder.c:544
+#: src/rfx-builder.c:541
 msgid "LiVES: - RFX Requirements"
 msgstr ""
 
-#: src/rfx-builder.c:548
+#: src/rfx-builder.c:544
 msgid "LiVES: - RFX Parameters"
 msgstr ""
 
-#: src/rfx-builder.c:552
+#: src/rfx-builder.c:547
 msgid "LiVES: - RFX Parameter Window Hints"
 msgstr ""
 
-#: src/rfx-builder.c:556
+#: src/rfx-builder.c:550
 msgid "LiVES: - RFX Triggers"
 msgstr ""
 
-#: src/rfx-builder.c:622
+#: src/rfx-builder.c:613
 msgid "_New Entry"
 msgstr "_Nueva Entrada"
 
-#: src/rfx-builder.c:625
+#: src/rfx-builder.c:616
 msgid "_Edit Entry"
 msgstr ""
 
-#: src/rfx-builder.c:628
+#: src/rfx-builder.c:619
 msgid "_Remove Entry"
 msgstr "Bo_rrar Entrada"
 
-#: src/rfx-builder.c:632
+#: src/rfx-builder.c:623
 msgid "Move _Up"
 msgstr "Mover _Arriba"
 
-#: src/rfx-builder.c:635
+#: src/rfx-builder.c:626
 msgid "Move _Down"
 msgstr "Mover _Abajo"
 
-#: src/rfx-builder.c:1004
+#: src/rfx-builder.c:984
 msgid "LiVES: - RFX Properties"
 msgstr ""
 
-#: src/rfx-builder.c:1013
+#: src/rfx-builder.c:993
 msgid "_Slow (hint to GUI)"
 msgstr ""
 
-#: src/rfx-builder.c:1024
+#: src/rfx-builder.c:1004
 msgid "_Batch mode generator"
 msgstr ""
 
-#: src/rfx-builder.c:1831
+#: src/rfx-builder.c:1790
 msgid ""
 "\n"
 "\n"
@@ -6530,7 +6544,7 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:1875
+#: src/rfx-builder.c:1834
 msgid ""
 "\n"
 "\n"
@@ -6538,184 +6552,184 @@
 "Please check the trigger code.\n"
 msgstr ""
 
-#: src/rfx-builder.c:1994
+#: src/rfx-builder.c:1950
 msgid "LiVES: - New RFX Parameter"
 msgstr ""
 
-#: src/rfx-builder.c:1997
+#: src/rfx-builder.c:1952
 msgid "LiVES: - Edit RFX Parameter"
 msgstr ""
 
-#: src/rfx-builder.c:2013
+#: src/rfx-builder.c:1968
 msgid "_Name:    "
 msgstr ""
 
-#: src/rfx-builder.c:2016
+#: src/rfx-builder.c:1971
 msgid "Name of the parameter, must be unique in the plugin."
 msgstr ""
 
-#: src/rfx-builder.c:2025
+#: src/rfx-builder.c:1981
 msgid "_Label:    "
 msgstr ""
 
-#: src/rfx-builder.c:2028
+#: src/rfx-builder.c:1984
 msgid ""
 "Label to be shown by the parameter. An underscore represents mnemonic "
 "accelerator."
 msgstr ""
 
-#: src/rfx-builder.c:2039
+#: src/rfx-builder.c:1996
 msgid "_Type:         "
 msgstr ""
 
-#: src/rfx-builder.c:2040
+#: src/rfx-builder.c:1997
 msgid "Parameter type (select from list)."
 msgstr ""
 
-#: src/rfx-builder.c:2073
+#: src/rfx-builder.c:2029
 msgid "Decimal _places: "
 msgstr ""
 
-#: src/rfx-builder.c:2082 src/rfx-builder.c:2477 src/rfx-builder.c:2495
+#: src/rfx-builder.c:2038 src/rfx-builder.c:2430 src/rfx-builder.c:2447
 msgid "_Default value:    "
 msgstr ""
 
-#: src/rfx-builder.c:2098
+#: src/rfx-builder.c:2054
 msgid "_Default: "
 msgstr ""
 
-#: src/rfx-builder.c:2132
+#: src/rfx-builder.c:2087
 msgid "Button _Group: "
 msgstr ""
 
-#: src/rfx-builder.c:2134
+#: src/rfx-builder.c:2089
 msgid "A non-zero value can be used to group radio buttons."
 msgstr ""
 
-#: src/rfx-builder.c:2142 src/rfx-builder.c:2478
+#: src/rfx-builder.c:2097 src/rfx-builder.c:2431
 msgid "_Minimum value: "
 msgstr ""
 
-#: src/rfx-builder.c:2148 src/rfx-builder.c:2479
+#: src/rfx-builder.c:2103 src/rfx-builder.c:2432
 msgid "Ma_ximum value: "
 msgstr ""
 
-#: src/rfx-builder.c:2157
+#: src/rfx-builder.c:2113
 msgid "     _Step size:   "
 msgstr ""
 
-#: src/rfx-builder.c:2160
+#: src/rfx-builder.c:2117
 msgid ""
 "How much the parameter is adjusted when the spinbutton arrows are pressed."
 msgstr ""
 
-#: src/rfx-builder.c:2171
+#: src/rfx-builder.c:2129
 msgid "_Wrap value"
 msgstr ""
 
-#: src/rfx-builder.c:2172
+#: src/rfx-builder.c:2131
 msgid "Whether the value wraps max->min and min->max."
 msgstr ""
 
-#: src/rfx-builder.c:2470
+#: src/rfx-builder.c:2424
 msgid "Set _values"
 msgstr ""
 
-#: src/rfx-builder.c:2512
+#: src/rfx-builder.c:2463
 msgid "Default _Red:  "
 msgstr ""
 
-#: src/rfx-builder.c:2513
+#: src/rfx-builder.c:2464
 msgid "Default _Green:"
 msgstr ""
 
-#: src/rfx-builder.c:2514
+#: src/rfx-builder.c:2465
 msgid "Default _Blue: "
 msgstr ""
 
-#: src/rfx-builder.c:2538
+#: src/rfx-builder.c:2488
 msgid "Set _default"
 msgstr ""
 
-#: src/rfx-builder.c:2540
+#: src/rfx-builder.c:2490
 msgid "Default value:  "
 msgstr ""
 
-#: src/rfx-builder.c:2541
+#: src/rfx-builder.c:2491
 msgid "Maximum length (chars): "
 msgstr ""
 
-#: src/rfx-builder.c:2576
+#: src/rfx-builder.c:2526
 msgid "LiVES: - New RFX Parameter Window Hint"
 msgstr ""
 
-#: src/rfx-builder.c:2579
+#: src/rfx-builder.c:2528
 msgid "LiVES: - Edit RFX Parameter Window Hint"
 msgstr ""
 
-#: src/rfx-builder.c:2622
+#: src/rfx-builder.c:2569
 msgid "_Keyword:         "
 msgstr ""
 
-#: src/rfx-builder.c:2639
+#: src/rfx-builder.c:2586
 msgid "Special _Type:         "
 msgstr ""
 
-#: src/rfx-builder.c:2656
+#: src/rfx-builder.c:2602
 msgid "Special _Subtype:         "
 msgstr ""
 
-#: src/rfx-builder.c:2667 src/rfx-builder.c:2706
+#: src/rfx-builder.c:2613 src/rfx-builder.c:2651
 msgid "Row:    "
 msgstr ""
 
-#: src/rfx-builder.c:2732
+#: src/rfx-builder.c:2676
 #, c-format
 msgid "Linked parameters (%d):    "
 msgstr ""
 
-#: src/rfx-builder.c:2749
+#: src/rfx-builder.c:2693
 msgid "Linked parameters (4):    "
 msgstr ""
 
-#: src/rfx-builder.c:2752
+#: src/rfx-builder.c:2695
 msgid "Linked parameters (2):    "
 msgstr ""
 
-#: src/rfx-builder.c:2777
+#: src/rfx-builder.c:2720
 msgid "LiVES: - New RFX Trigger"
 msgstr ""
 
-#: src/rfx-builder.c:2780
+#: src/rfx-builder.c:2722
 msgid "LiVES: - Edit RFX Trigger"
 msgstr ""
 
-#: src/rfx-builder.c:2808
+#: src/rfx-builder.c:2750
 msgid "When:         "
 msgstr ""
 
-#: src/rfx-builder.c:2904
+#: src/rfx-builder.c:2846
 msgid "LiVES: - Pre Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:2911
+#: src/rfx-builder.c:2853
 msgid "LiVES: - Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:2918
+#: src/rfx-builder.c:2860
 msgid "LiVES: - Post Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:2931
+#: src/rfx-builder.c:2873
 #, c-format
 msgid "LiVES: - Default text (max length %d)"
 msgstr ""
 
-#: src/rfx-builder.c:2944
+#: src/rfx-builder.c:2885
 msgid "LiVES: - Enter values, one per line"
 msgstr ""
 
-#: src/rfx-builder.c:3055
+#: src/rfx-builder.c:2996
 msgid ""
 "\n"
 "\n"
@@ -6725,7 +6739,7 @@
 "\n"
 "El nombre no debe estar en blanco.\n"
 
-#: src/rfx-builder.c:3060
+#: src/rfx-builder.c:3001
 msgid ""
 "\n"
 "\n"
@@ -6735,28 +6749,28 @@
 "\n"
 "El nombre no debe contener espacios.\n"
 
-#: src/rfx-builder.c:3065
+#: src/rfx-builder.c:3006
 msgid ""
 "\n"
 "\n"
 "Menu text must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3071
+#: src/rfx-builder.c:3012
 msgid ""
 "\n"
 "\n"
 "Action description must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3076
+#: src/rfx-builder.c:3017
 msgid ""
 "\n"
 "\n"
 "Author must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3085 src/rfx-builder.c:4339
+#: src/rfx-builder.c:3026 src/rfx-builder.c:4253
 msgid ""
 "\n"
 "\n"
@@ -6764,28 +6778,28 @@
 "Name must be unique.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3092
+#: src/rfx-builder.c:3033
 msgid ""
 "\n"
 "\n"
 "Loop code should not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3098
+#: src/rfx-builder.c:3039
 msgid ""
 "\n"
 "\n"
 "Trigger code should not be blank for a utility.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3111
+#: src/rfx-builder.c:3052
 msgid ""
 "\n"
 "\n"
 "Parameter name must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3117
+#: src/rfx-builder.c:3058
 msgid ""
 "\n"
 "\n"
@@ -6794,41 +6808,41 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:3171
+#: src/rfx-builder.c:3111
 #, c-format
 msgid "Writing script file %s..."
 msgstr ""
 
-#: src/rfx-builder.c:3477
+#: src/rfx-builder.c:3411
 msgid "No <define> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3484 src/rfx-builder.c:3493
+#: src/rfx-builder.c:3418 src/rfx-builder.c:3427
 msgid "Bad script version.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3505
+#: src/rfx-builder.c:3439
 msgid "No <name> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3513
+#: src/rfx-builder.c:3447
 msgid "No <version> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3522
+#: src/rfx-builder.c:3456
 msgid "No <author> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3536
+#: src/rfx-builder.c:3470
 msgid "No <description> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3540
+#: src/rfx-builder.c:3474
 #, c-format
 msgid "Bad description. (%s)\n"
 msgstr ""
 
-#: src/rfx-builder.c:3702
+#: src/rfx-builder.c:3627
 #, c-format
 msgid ""
 "\n"
@@ -6838,27 +6852,27 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:3859
+#: src/rfx-builder.c:3780
 msgid "Rebuilding all RFX scripts...builtin..."
 msgstr ""
 
-#: src/rfx-builder.c:3860
+#: src/rfx-builder.c:3781
 msgid "Rebuilding scripts"
 msgstr ""
 
-#: src/rfx-builder.c:3868
+#: src/rfx-builder.c:3789
 msgid "custom..."
 msgstr ""
 
-#: src/rfx-builder.c:3872
+#: src/rfx-builder.c:3793
 msgid "test..."
 msgstr ""
 
-#: src/rfx-builder.c:3878
+#: src/rfx-builder.c:3799
 msgid "rebuilding dynamic menu entries..."
 msgstr ""
 
-#: src/rfx-builder.c:3905 src/rfx-builder.c:3912
+#: src/rfx-builder.c:3826 src/rfx-builder.c:3834
 #, c-format
 msgid ""
 "\n"
@@ -6867,7 +6881,7 @@
 "Please check this program is in your path and executable.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3951
+#: src/rfx-builder.c:3874
 #, c-format
 msgid ""
 "\n"
@@ -6877,12 +6891,12 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:3960
+#: src/rfx-builder.c:3884
 #, c-format
 msgid "Deleting rfx script %s..."
 msgstr ""
 
-#: src/rfx-builder.c:3980
+#: src/rfx-builder.c:3902
 #, c-format
 msgid ""
 "\n"
@@ -6892,7 +6906,7 @@
 "Error code was %d\n"
 msgstr ""
 
-#: src/rfx-builder.c:4016
+#: src/rfx-builder.c:3938
 #, c-format
 msgid ""
 "\n"
@@ -6902,12 +6916,12 @@
 "Please delete it first, or rename the test script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4027
+#: src/rfx-builder.c:3950
 #, c-format
 msgid "Promoting rfx test plugin %s to custom..."
 msgstr ""
 
-#: src/rfx-builder.c:4044
+#: src/rfx-builder.c:3965
 #, c-format
 msgid ""
 "\n"
@@ -6918,20 +6932,20 @@
 "Return code was %d (%s)\n"
 msgstr ""
 
-#: src/rfx-builder.c:4070
+#: src/rfx-builder.c:3990
 msgid "LiVES: - Export Script to..."
 msgstr ""
 
-#: src/rfx-builder.c:4077 src/rfx-builder.c:4156
+#: src/rfx-builder.c:3997 src/rfx-builder.c:4074
 #, c-format
 msgid "Copying %s to %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4105
+#: src/rfx-builder.c:4024
 msgid "LiVES: Import Script from..."
 msgstr ""
 
-#: src/rfx-builder.c:4148
+#: src/rfx-builder.c:4067
 #, c-format
 msgid ""
 "\n"
@@ -6941,43 +6955,43 @@
 "Please delete it first, or rename the import script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4249
+#: src/rfx-builder.c:4166
 msgid "LiVES: - Copy RFX Script"
 msgstr ""
 
-#: src/rfx-builder.c:4251
+#: src/rfx-builder.c:4168
 msgid "_From type:    "
 msgstr ""
 
-#: src/rfx-builder.c:4258
+#: src/rfx-builder.c:4175
 msgid "   Script:    "
 msgstr ""
 
-#: src/rfx-builder.c:4267
+#: src/rfx-builder.c:4183
 msgid "LiVES: - Rename test RFX Script"
 msgstr ""
 
-#: src/rfx-builder.c:4268
+#: src/rfx-builder.c:4184
 msgid "From script: "
 msgstr ""
 
-#: src/rfx-builder.c:4273
+#: src/rfx-builder.c:4188
 msgid "LiVES: - RFX Script name"
 msgstr ""
 
-#: src/rfx-builder.c:4274
+#: src/rfx-builder.c:4189
 msgid "Script name: "
 msgstr ""
 
-#: src/rfx-builder.c:4294
+#: src/rfx-builder.c:4209
 msgid "New name: "
 msgstr ""
 
-#: src/rfx-builder.c:4297
+#: src/rfx-builder.c:4212
 msgid "New script name: "
 msgstr ""
 
-#: src/rfx-builder.c:4372
+#: src/rfx-builder.c:4286
 msgid ""
 "\n"
 "\n"
@@ -6985,12 +6999,12 @@
 "Script name must be unique.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4384
+#: src/rfx-builder.c:4297
 #, c-format
 msgid "Renaming RFX test script %s to %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4390
+#: src/rfx-builder.c:4302
 #, c-format
 msgid ""
 "\n"
@@ -7001,21 +7015,21 @@
 "Return code was %d\n"
 msgstr ""
 
-#: src/rfx-builder.c:4610
+#: src/rfx-builder.c:4518
 msgid "_Apply Real Time Effects to Selection"
 msgstr ""
 
-#: src/rfx-builder.c:4664
+#: src/rfx-builder.c:4572
 #, c-format
 msgid "Loading rendered effect %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4766
+#: src/rfx-builder.c:4674
 msgid ""
 "See: VJ - show VJ keys. Set the realtime effects, and then apply them here."
 msgstr ""
 
-#: src/preferences.c:359
+#: src/preferences.c:351
 msgid ""
 "\n"
 "\n"
@@ -7023,7 +7037,7 @@
 "full screen, separate window (fs) mode\n"
 msgstr ""
 
-#: src/preferences.c:408
+#: src/preferences.c:400
 msgid ""
 "\n"
 "\n"
@@ -7031,7 +7045,7 @@
 "(Free space = UNKNOWN)"
 msgstr ""
 
-#: src/preferences.c:412
+#: src/preferences.c:403
 #, c-format
 msgid ""
 "\n"
@@ -7040,14 +7054,14 @@
 "(Free space = %s)"
 msgstr ""
 
-#: src/preferences.c:416
+#: src/preferences.c:408
 msgid ""
 "The temp directory is LiVES working directory where opened clips and sets "
 "are stored.\n"
 "It should be in a partition with plenty of free disk space.\n"
 msgstr ""
 
-#: src/preferences.c:784
+#: src/preferences.c:839
 #, c-format
 msgid ""
 "Unable to create or write to the new temporary directory.\n"
@@ -7058,7 +7072,7 @@
 "The directory will not be changed now.\n"
 msgstr ""
 
-#: src/preferences.c:786
+#: src/preferences.c:843
 #, c-format
 msgid ""
 "Unable to create or write to the new temporary directory.\n"
@@ -7068,7 +7082,7 @@
 "The directory will not be changed now.\n"
 msgstr ""
 
-#: src/preferences.c:798
+#: src/preferences.c:856
 msgid ""
 "You have chosen to change the temporary directory.\n"
 "Please make sure you have no other copies of LiVES open.\n"
@@ -7080,20 +7094,20 @@
 "original setting."
 msgstr ""
 
-#: src/preferences.c:1169
+#: src/preferences.c:1221
 msgid ""
 "\n"
 "Unable to switch audio players to jack - jackd must be installed first.\n"
 "See http://jackaudio.org\n"
 msgstr ""
 
-#: src/preferences.c:1175
+#: src/preferences.c:1226
 msgid ""
 "\n"
 "Switching audio players requires restart (jackd must not be running)\n"
 msgstr ""
 
-#: src/preferences.c:1202
+#: src/preferences.c:1253
 msgid ""
 "\n"
 "Unable to switch audio players to pulse audio\n"
@@ -7101,815 +7115,815 @@
 "See http://www.pulseaudio.org\n"
 msgstr ""
 
-#: src/preferences.c:1502
+#: src/preferences.c:1544
 msgid "PCM (highest quality; largest files)"
 msgstr ""
 
-#: src/preferences.c:2063
+#: src/preferences.c:2096
 msgid "LiVES: - Preferences"
 msgstr ""
 
-#: src/preferences.c:2142
+#: src/preferences.c:2177
 msgid "Open file selection maximised"
 msgstr ""
 
-#: src/preferences.c:2149
+#: src/preferences.c:2184
 msgid "Show recent files in the File menu"
 msgstr ""
 
-#: src/preferences.c:2158
+#: src/preferences.c:2193
 msgid "Stop screensaver on playback    "
 msgstr ""
 
-#: src/preferences.c:2165
+#: src/preferences.c:2200
 msgid "Open main window maximised"
 msgstr ""
 
-#: src/preferences.c:2173
+#: src/preferences.c:2208
 msgid "Show toolbar when background is blanked"
 msgstr ""
 
-#: src/preferences.c:2181
+#: src/preferences.c:2216
 msgid "Allow mouse wheel to switch clips"
 msgstr ""
 
-#: src/preferences.c:2192
+#: src/preferences.c:2227
 msgid "Shrink previews to fit in interface"
 msgstr ""
 
-#: src/preferences.c:2202
+#: src/preferences.c:2237
 msgid "Startup mode:"
 msgstr ""
 
-#: src/preferences.c:2206
+#: src/preferences.c:2241
 msgid "_Clip editor"
 msgstr ""
 
-#: src/preferences.c:2210
+#: src/preferences.c:2245
 msgid "_Multitrack mode"
 msgstr ""
 
-#: src/preferences.c:2234
+#: src/preferences.c:2268
 msgid "Multi-head support"
 msgstr ""
 
-#: src/preferences.c:2242
+#: src/preferences.c:2276
 msgid " monitor number for LiVES interface"
 msgstr ""
 
-#: src/preferences.c:2248
+#: src/preferences.c:2282
 msgid " monitor number for playback"
 msgstr ""
 
-#: src/preferences.c:2260
+#: src/preferences.c:2294
 msgid ""
 "A setting of 0 means use all available monitors (only works with some "
 "playback plugins)."
 msgstr ""
 
-#: src/preferences.c:2270
+#: src/preferences.c:2304
 msgid "Force single monitor"
 msgstr ""
 
-#: src/preferences.c:2271
+#: src/preferences.c:2305
 msgid "Ignore all except the first monitor."
 msgstr ""
 
-#: src/preferences.c:2293
+#: src/preferences.c:2327
 msgid "Show clip thumbnails during playback"
 msgstr ""
 
-#: src/preferences.c:2306
+#: src/preferences.c:2340
 msgid "GUI"
 msgstr "IGU"
 
-#: src/preferences.c:2321
+#: src/preferences.c:2355
 msgid "When entering Multitrack mode:"
 msgstr ""
 
-#: src/preferences.c:2330
+#: src/preferences.c:2364
 msgid "_Prompt me for width, height, fps and audio settings"
 msgstr ""
 
-#: src/preferences.c:2336
+#: src/preferences.c:2370
 msgid "_Always use the following values:"
 msgstr ""
 
-#: src/preferences.c:2345
+#: src/preferences.c:2379
 msgid "Use these same _values for rendering a new clip"
 msgstr ""
 
-#: src/preferences.c:2370
+#: src/preferences.c:2404
 msgid "_Width           "
 msgstr ""
 
-#: src/preferences.c:2375
+#: src/preferences.c:2409
 msgid "          _Height      "
 msgstr ""
 
-#: src/preferences.c:2379
+#: src/preferences.c:2413
 msgid "          _FPS"
 msgstr ""
 
-#: src/preferences.c:2387
+#: src/preferences.c:2421
 msgid "Enable backing audio track"
 msgstr ""
 
-#: src/preferences.c:2394
+#: src/preferences.c:2428
 msgid "Audio track per video track"
 msgstr ""
 
-#: src/preferences.c:2423
+#: src/preferences.c:2457
 msgid "    _Undo buffer size (MB)    "
 msgstr ""
 
-#: src/preferences.c:2432
+#: src/preferences.c:2466
 msgid "_Exit multitrack mode after rendering"
 msgstr ""
 
-#: src/preferences.c:2440
+#: src/preferences.c:2474
 msgid "Auto backup layouts"
 msgstr ""
 
-#: src/preferences.c:2445
+#: src/preferences.c:2479
 msgid "_Every"
 msgstr ""
 
-#: src/preferences.c:2453
+#: src/preferences.c:2487
 msgid "seconds"
 msgstr "segundos"
 
-#: src/preferences.c:2461
+#: src/preferences.c:2495
 msgid "After every _change"
 msgstr ""
 
-#: src/preferences.c:2467
+#: src/preferences.c:2501
 msgid "_Never"
 msgstr "_Nunca"
 
-#: src/preferences.c:2490
+#: src/preferences.c:2523
 msgid "Multitrack/Render"
 msgstr ""
 
-#: src/preferences.c:2508
+#: src/preferences.c:2541
 msgid "Use instant opening when possible"
 msgstr ""
 
-#: src/preferences.c:2509
+#: src/preferences.c:2543
 msgid "Enable instant opening of some file types using decoder plugins"
 msgstr ""
 
-#: src/preferences.c:2531
+#: src/preferences.c:2567
 msgid "Video open command (fallback)"
 msgstr ""
 
-#: src/preferences.c:2543
+#: src/preferences.c:2579
 msgid "Open/render compression"
 msgstr ""
 
-#: src/preferences.c:2546
+#: src/preferences.c:2582
 msgid " %     ( lower = slower, larger files; for jpeg, higher quality )"
 msgstr ""
 
-#: src/preferences.c:2558
+#: src/preferences.c:2594
 msgid "Default image format"
 msgstr ""
 
-#: src/preferences.c:2562
+#: src/preferences.c:2598
 msgid "_jpeg"
 msgstr "_jpeg"
 
-#: src/preferences.c:2565
+#: src/preferences.c:2601
 msgid "_png"
 msgstr "_png"
 
-#: src/preferences.c:2572
+#: src/preferences.c:2608
 msgid "(Check Help/Troubleshoot to see which image formats are supported)"
 msgstr ""
 
-#: src/preferences.c:2580
+#: src/preferences.c:2616
 msgid "Enable automatic deinterlacing when possible"
 msgstr ""
 
-#: src/preferences.c:2582
+#: src/preferences.c:2619
 msgid "Automatically deinterlace frames when a plugin suggests it"
 msgstr ""
 
-#: src/preferences.c:2593
+#: src/preferences.c:2632
 msgid "Automatic trimming / padding of audio when possible"
 msgstr ""
 
-#: src/preferences.c:2595
+#: src/preferences.c:2634
 msgid "Automatically trim or pad audio when a plugin suggests it"
 msgstr ""
 
-#: src/preferences.c:2606
+#: src/preferences.c:2646
 msgid "Ignore blank borders when possible"
 msgstr ""
 
-#: src/preferences.c:2608
+#: src/preferences.c:2648
 msgid "Clip any blank borders from frames where possible"
 msgstr ""
 
-#: src/preferences.c:2619
+#: src/preferences.c:2660
 msgid "When opening multiple files, concatenate images into one clip"
 msgstr ""
 
-#: src/preferences.c:2629
+#: src/preferences.c:2670
 msgid "Decoding"
 msgstr "Decodificando"
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:2652
+#: src/preferences.c:2693
 msgid "Low - can improve performance on slower machines"
 msgstr ""
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:2654
+#: src/preferences.c:2695
 msgid "Normal - recommended for most users"
 msgstr ""
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:2656
+#: src/preferences.c:2697
 msgid "High - can improve quality on very fast machines"
 msgstr ""
 
-#: src/preferences.c:2659
+#: src/preferences.c:2700
 msgid "Preview _quality"
 msgstr ""
 
-#: src/preferences.c:2660
+#: src/preferences.c:2701
 msgid "The preview quality for video playback - affects resizing"
 msgstr ""
 
-#: src/preferences.c:2675
+#: src/preferences.c:2717
 msgid "_Show FPS statistics"
 msgstr ""
 
-#: src/preferences.c:2694
+#: src/preferences.c:2736
 msgid "_Plugin"
 msgstr "Com_plemento"
 
-#: src/preferences.c:2718
+#: src/preferences.c:2760
 msgid "Stream audio"
 msgstr ""
 
-#: src/preferences.c:2721
+#: src/preferences.c:2763
 msgid "Stream audio to playback plugin"
 msgstr ""
 
-#: src/preferences.c:2734
+#: src/preferences.c:2778
 msgid "Record player output"
 msgstr ""
 
-#: src/preferences.c:2737
+#: src/preferences.c:2781
 msgid "Record output from player instead of input to player"
 msgstr ""
 
-#: src/preferences.c:2744
+#: src/preferences.c:2789
 msgid "VIDEO"
 msgstr "VÍDEO"
 
-#: src/preferences.c:2787
+#: src/preferences.c:2833
 msgid "_Player"
 msgstr "_Reproductor"
 
-#: src/preferences.c:2792
+#: src/preferences.c:2838
 msgid "(See also the Jack Integration tab for jack startup options)"
 msgstr ""
 
-#: src/preferences.c:2819
+#: src/preferences.c:2865
 msgid "mplayer"
 msgstr "mplayer"
 
-#: src/preferences.c:2830
+#: src/preferences.c:2876
 #, fuzzy
 msgid "mplayer2"
 msgstr "mplayer"
 
-#: src/preferences.c:2833
+#: src/preferences.c:2879
 msgid "Audio play _command"
 msgstr ""
 
-#: src/preferences.c:2840
+#: src/preferences.c:2886
 msgid "- internal -"
 msgstr ""
 
-#: src/preferences.c:2849
+#: src/preferences.c:2895
 msgid "Audio follows video _rate/direction"
 msgstr ""
 
-#: src/preferences.c:2857
+#: src/preferences.c:2903
 msgid "Audio follows _clip switches"
 msgstr ""
 
-#: src/preferences.c:2864
+#: src/preferences.c:2910
 msgid "Source:"
 msgstr ""
 
-#: src/preferences.c:2868
+#: src/preferences.c:2914
 msgid "_Internal"
 msgstr ""
 
-#: src/preferences.c:2873
+#: src/preferences.c:2919
 msgid "_External (requires jack or pulse audio player)"
 msgstr ""
 
-#: src/preferences.c:2892
+#: src/preferences.c:2940
 msgid "AUDIO"
 msgstr ""
 
-#: src/preferences.c:2902
+#: src/preferences.c:2950
 msgid "Playback"
 msgstr "Reproducción"
 
-#: src/preferences.c:2925
+#: src/preferences.c:2973
 msgid ""
 "Record audio when capturing an e_xternal window\n"
 " (requires jack or pulse audio)"
 msgstr ""
 
-#: src/preferences.c:2940
+#: src/preferences.c:2988
 msgid "      What to record when 'r' is pressed   "
 msgstr ""
 
-#: src/preferences.c:2949
+#: src/preferences.c:2997
 msgid "_Frame changes"
 msgstr ""
 
-#: src/preferences.c:2964
+#: src/preferences.c:3012
 msgid "F_PS changes"
 msgstr ""
 
-#: src/preferences.c:2982
+#: src/preferences.c:3030
 msgid "_Real time effects"
 msgstr ""
 
-#: src/preferences.c:2993
+#: src/preferences.c:3041
 msgid "_Clip switches"
 msgstr ""
 
-#: src/preferences.c:3004
+#: src/preferences.c:3052
 msgid "_Audio (requires jack or pulse audio player)"
 msgstr ""
 
-#: src/preferences.c:3024
+#: src/preferences.c:3072
 msgid "Pause recording if free disk space falls below"
 msgstr ""
 
 #. TRANSLATORS: gigabytes
-#: src/preferences.c:3030
+#: src/preferences.c:3078
 msgid "GB"
 msgstr ""
 
-#: src/preferences.c:3037
+#: src/preferences.c:3085
 msgid "Recording"
 msgstr "Grabando"
 
-#: src/preferences.c:3055
+#: src/preferences.c:3103
 msgid "Encoder"
 msgstr ""
 
-#: src/preferences.c:3090
+#: src/preferences.c:3137
 msgid "Output format"
 msgstr "Formato de Salida"
 
-#: src/preferences.c:3106
+#: src/preferences.c:3153
 msgid "Audio codec"
 msgstr "Códec de audio"
 
-#: src/preferences.c:3119
+#: src/preferences.c:3165
 msgid "Encoding"
 msgstr "Codificación"
 
-#: src/preferences.c:3134
+#: src/preferences.c:3180
 msgid "Use _antialiasing when resizing"
 msgstr ""
 
-#: src/preferences.c:3143
+#: src/preferences.c:3189
 msgid "Number of _real time effect keys"
 msgstr ""
 
-#: src/preferences.c:3145
+#: src/preferences.c:3192
 msgid ""
 "The number of \"virtual\" real time effect keys. They can be controlled "
 "through the real time effects window, or via network (OSC)."
 msgstr ""
 
-#: src/preferences.c:3152
+#: src/preferences.c:3199
 msgid "Use _threads where possible when applying effects"
 msgstr ""
 
-#: src/preferences.c:3159
+#: src/preferences.c:3207
 msgid "Number of _threads"
 msgstr ""
 
-#: src/preferences.c:3172
+#: src/preferences.c:3221
 msgid "Restart is required if any of the following paths are changed:"
 msgstr ""
 
-#: src/preferences.c:3182
+#: src/preferences.c:3231
 msgid "Weed plugin path"
 msgstr ""
 
-#: src/preferences.c:3184
+#: src/preferences.c:3234
 msgid "Frei0r plugin path"
 msgstr ""
 
-#: src/preferences.c:3186
+#: src/preferences.c:3237
 msgid "LADSPA plugin path"
 msgstr ""
 
-#: src/preferences.c:3209
+#: src/preferences.c:3261
 msgid "      Video load directory (default)      "
 msgstr ""
 
-#: src/preferences.c:3215
+#: src/preferences.c:3267
 msgid "      Video save directory (default) "
 msgstr ""
 
-#: src/preferences.c:3221
+#: src/preferences.c:3273
 msgid "      Audio load directory (default) "
 msgstr ""
 
-#: src/preferences.c:3227
+#: src/preferences.c:3279
 msgid "      Image directory (default) "
 msgstr ""
 
-#: src/preferences.c:3233
+#: src/preferences.c:3285
 msgid "      Backup/Restore directory (default) "
 msgstr ""
 
-#: src/preferences.c:3239
+#: src/preferences.c:3291
 msgid "      Temp directory (do not remove) "
 msgstr ""
 
-#: src/preferences.c:3252
+#: src/preferences.c:3304
 msgid "The default directory for loading video clips from"
 msgstr ""
 
-#: src/preferences.c:3277
+#: src/preferences.c:3329
 msgid "The default directory for saving encoded clips to"
 msgstr ""
 
-#: src/preferences.c:3285
+#: src/preferences.c:3337
 msgid "The default directory for loading and saving audio"
 msgstr ""
 
-#: src/preferences.c:3293
+#: src/preferences.c:3345
 msgid "The default directory for saving frameshots to"
 msgstr ""
 
-#: src/preferences.c:3301
+#: src/preferences.c:3353
 msgid "The default directory for backing up/restoring single clips"
 msgstr ""
 
-#: src/preferences.c:3309
+#: src/preferences.c:3361
 msgid "LiVES working directory."
 msgstr ""
 
-#: src/preferences.c:3359
+#: src/preferences.c:3412
 msgid "Directories"
 msgstr "Carpetas"
 
-#: src/preferences.c:3374
+#: src/preferences.c:3427
 msgid "Warn if diskspace falls below: "
 msgstr ""
 
-#: src/preferences.c:3380 src/preferences.c:3394
+#: src/preferences.c:3433 src/preferences.c:3447
 msgid " MB [set to 0 to disable]"
 msgstr ""
 
-#: src/preferences.c:3389
+#: src/preferences.c:3442
 msgid "Diskspace critical level: "
 msgstr ""
 
-#: src/preferences.c:3407
+#: src/preferences.c:3461
 msgid ""
 "Warn on Insert / Merge if _frame rate of clipboard does not match frame rate "
 "of selection"
 msgstr ""
 
-#: src/preferences.c:3417
+#: src/preferences.c:3471
 msgid "Warn on Open if file _size exceeds "
 msgstr ""
 
-#: src/preferences.c:3425
+#: src/preferences.c:3479
 msgid " MB"
 msgstr " MB"
 
-#: src/preferences.c:3432
+#: src/preferences.c:3486
 msgid "Show a warning before saving a se_t"
 msgstr ""
 
-#: src/preferences.c:3442
+#: src/preferences.c:3496
 msgid ""
 "Show a warning if _mplayer/mplayer2, sox, composite or convert is not found "
 "when LiVES is started."
 msgstr ""
 
-#: src/preferences.c:3452
+#: src/preferences.c:3506
 msgid "Show a warning if no _rendered effects are found at startup."
 msgstr ""
 
-#: src/preferences.c:3464
+#: src/preferences.c:3518
 msgid "Show a warning if no _encoder plugins are found at startup."
 msgstr ""
 
-#: src/preferences.c:3474
+#: src/preferences.c:3528
 msgid "Show a warning if a _duplicate set name is entered."
 msgstr ""
 
-#: src/preferences.c:3485
+#: src/preferences.c:3539
 msgid "When a set is loaded, warn if clips are missing from _layouts."
 msgstr ""
 
-#: src/preferences.c:3495
+#: src/preferences.c:3550
 msgid "Warn if a clip used in a layout is about to be closed."
 msgstr ""
 
-#: src/preferences.c:3505
+#: src/preferences.c:3561
 msgid "Warn if frames used in a layout are about to be deleted."
 msgstr ""
 
-#: src/preferences.c:3515
+#: src/preferences.c:3572
 msgid "Warn if frames used in a layout are about to be shifted."
 msgstr ""
 
-#: src/preferences.c:3525
+#: src/preferences.c:3583
 msgid "Warn if frames used in a layout are about to be altered."
 msgstr ""
 
-#: src/preferences.c:3535
+#: src/preferences.c:3594
 msgid "Warn if audio used in a layout is about to be deleted."
 msgstr ""
 
-#: src/preferences.c:3546
+#: src/preferences.c:3606
 msgid "Warn if audio used in a layout is about to be shifted."
 msgstr ""
 
-#: src/preferences.c:3556
+#: src/preferences.c:3617
 msgid "Warn if audio used in a layout is about to be altered."
 msgstr ""
 
-#: src/preferences.c:3566
+#: src/preferences.c:3628
 msgid "Popup layout errors after clip changes."
 msgstr ""
 
-#: src/preferences.c:3577
+#: src/preferences.c:3639
 msgid "Warn if the layout has not been saved when leaving multitrack mode."
 msgstr ""
 
-#: src/preferences.c:3588
+#: src/preferences.c:3650
 msgid ""
 "Warn if multitrack has no audio channels, and a layout with audio is loaded."
 msgstr ""
 
-#: src/preferences.c:3598
+#: src/preferences.c:3660
 msgid ""
 "Warn if multitrack has audio channels, and your audio player is not \"jack\" "
 "or \"pulse audio\"."
 msgstr ""
 
-#: src/preferences.c:3610
+#: src/preferences.c:3672
 msgid "Show info message after importing from firewire device."
 msgstr ""
 
-#: src/preferences.c:3626
+#: src/preferences.c:3688
 msgid "Show a warning before opening a yuv4mpeg stream (advanced)."
 msgstr ""
 
-#: src/preferences.c:3639
+#: src/preferences.c:3701
 msgid "Show a warning when multitrack is low on backup space."
 msgstr ""
 
-#: src/preferences.c:3650
+#: src/preferences.c:3713
 msgid "Show a warning advising cleaning of disk space after a crash."
 msgstr ""
 
-#: src/preferences.c:3661
+#: src/preferences.c:3725
 msgid "Show a warning if unable to connect to pulseaudio player."
 msgstr ""
 
-#: src/preferences.c:3673
+#: src/preferences.c:3737
 msgid "Show a warning before wiping a layout which has unsaved changes."
 msgstr ""
 
-#: src/preferences.c:3685
+#: src/preferences.c:3749
 msgid "Warnings"
 msgstr "Advertencias"
 
-#: src/preferences.c:3703
+#: src/preferences.c:3767
 msgid "Midi synch (requires the files midistart and midistop)"
 msgstr ""
 
-#: src/preferences.c:3715
+#: src/preferences.c:3779
 msgid "When inserting/merging frames:  "
 msgstr ""
 
-#: src/preferences.c:3719
+#: src/preferences.c:3783
 msgid "_Speed Up/Slow Down Insertion"
 msgstr ""
 
-#: src/preferences.c:3723
+#: src/preferences.c:3787
 msgid "_Resample Insertion"
 msgstr ""
 
-#: src/preferences.c:3730
+#: src/preferences.c:3794
 msgid "CD device           "
 msgstr ""
 
-#: src/preferences.c:3733
+#: src/preferences.c:3797
 msgid "LiVES can load audio tracks from this CD"
 msgstr ""
 
-#: src/preferences.c:3746
+#: src/preferences.c:3813
 msgid "Default FPS        "
 msgstr ""
 
-#: src/preferences.c:3749
+#: src/preferences.c:3816
 msgid "Frames per second to use when none is specified"
 msgstr ""
 
-#: src/preferences.c:3757
+#: src/preferences.c:3825
 msgid "Misc"
 msgstr "Varios"
 
-#: src/preferences.c:3782
+#: src/preferences.c:3850
 msgid "New theme:           "
 msgstr "Nuevo tema:           "
 
-#: src/preferences.c:3800
+#: src/preferences.c:3867
 msgid "Themes"
 msgstr "Temas"
 
-#: src/preferences.c:3815
+#: src/preferences.c:3882
 msgid "Download bandwidth (Kb/s)       "
 msgstr ""
 
-#: src/preferences.c:3823
+#: src/preferences.c:3890
 msgid "LiVES must be compiled without \"configure --disable-OSC\" to use OMC"
 msgstr ""
 
-#: src/preferences.c:3833
+#: src/preferences.c:3900
 msgid "OMC remote control enabled"
 msgstr ""
 
-#: src/preferences.c:3841
+#: src/preferences.c:3908
 msgid "UDP port       "
 msgstr "puerto UDP       "
 
-#: src/preferences.c:3850
+#: src/preferences.c:3917
 msgid "Start OMC on startup"
 msgstr ""
 
-#: src/preferences.c:3870
+#: src/preferences.c:3937
 msgid "Streaming/Networking"
 msgstr ""
 
-#: src/preferences.c:3882
+#: src/preferences.c:3949
 msgid "Jack transport"
 msgstr ""
 
-#: src/preferences.c:3886
+#: src/preferences.c:3953
 msgid ""
 "LiVES must be compiled with jack/transport.h and jack/jack.h present to use "
 "jack transport"
 msgstr ""
 
-#: src/preferences.c:3892
+#: src/preferences.c:3959
 msgid "Jack _transport config file"
 msgstr ""
 
-#: src/preferences.c:3899 src/preferences.c:3989
+#: src/preferences.c:3967 src/preferences.c:4058
 msgid "Start _server on LiVES startup"
 msgstr ""
 
-#: src/preferences.c:3911
+#: src/preferences.c:3979
 msgid "Jack transport _master (start and stop)"
 msgstr ""
 
-#: src/preferences.c:3921
+#: src/preferences.c:3989
 msgid "Jack transport _client (start and stop)"
 msgstr ""
 
-#: src/preferences.c:3935
+#: src/preferences.c:4003
 msgid "Jack transport sets start position"
 msgstr ""
 
-#: src/preferences.c:3952
+#: src/preferences.c:4020
 msgid "Jack transport timebase slave"
 msgstr ""
 
-#: src/preferences.c:3963
+#: src/preferences.c:4031
 msgid "(See also Playback -> Audio follows video rate/direction)"
 msgstr ""
 
-#: src/preferences.c:3971
+#: src/preferences.c:4039
 msgid "Jack audio"
 msgstr ""
 
-#: src/preferences.c:3975
+#: src/preferences.c:4043
 msgid "LiVES must be compiled with jack/jack.h present to use jack audio"
 msgstr ""
 
-#: src/preferences.c:3978
+#: src/preferences.c:4046
 msgid ""
 "You MUST set the audio player to \"jack\" in the Playback tab to use jack "
 "audio"
 msgstr ""
 
-#: src/preferences.c:3984
+#: src/preferences.c:4052
 msgid "Jack _audio server config file"
 msgstr ""
 
-#: src/preferences.c:3996
+#: src/preferences.c:4065
 msgid "Play audio even when transport is _paused"
 msgstr ""
 
-#: src/preferences.c:4008
+#: src/preferences.c:4077
 msgid "Automatically connect to System Out ports when 'playing' External Audio"
 msgstr ""
 
-#: src/preferences.c:4021
+#: src/preferences.c:4090
 msgid "Jack Integration"
 msgstr ""
 
-#: src/preferences.c:4035
+#: src/preferences.c:4104
 msgid "Events to respond to:"
 msgstr ""
 
-#: src/preferences.c:4044
+#: src/preferences.c:4113
 msgid "_Joystick events"
 msgstr ""
 
-#: src/preferences.c:4051
+#: src/preferences.c:4120
 msgid "_Joystick device"
 msgstr ""
 
-#: src/preferences.c:4053
+#: src/preferences.c:4122
 msgid "The joystick device, e.g. /dev/input/js0"
 msgstr ""
 
-#: src/preferences.c:4071
+#: src/preferences.c:4142
 msgid "_MIDI events"
 msgstr ""
 
-#: src/preferences.c:4080
+#: src/preferences.c:4151
 msgid "Use _ALSA MIDI (recommended)"
 msgstr ""
 
-#: src/preferences.c:4082
+#: src/preferences.c:4153
 msgid "Create an ALSA MIDI port which other MIDI devices can be connected to"
 msgstr ""
 
-#: src/preferences.c:4090
+#: src/preferences.c:4162
 msgid "Use _raw MIDI"
 msgstr ""
 
-#: src/preferences.c:4092
+#: src/preferences.c:4164
 msgid "Read directly from the MIDI device"
 msgstr ""
 
-#: src/preferences.c:4104
+#: src/preferences.c:4177
 msgid "_MIDI device"
 msgstr ""
 
-#: src/preferences.c:4106
+#: src/preferences.c:4179
 msgid "The MIDI device, e.g. /dev/input/midi0"
 msgstr ""
 
-#: src/preferences.c:4118
+#: src/preferences.c:4193
 msgid "Advanced"
 msgstr "Avanzadas"
 
-#: src/preferences.c:4124
+#: src/preferences.c:4199
 msgid "MIDI check _rate"
 msgstr ""
 
-#: src/preferences.c:4127
+#: src/preferences.c:4203
 msgid ""
 "Number of MIDI checks per keyboard tick. Increasing this may improve MIDI "
 "responsiveness, but may slow down playback."
 msgstr ""
 
-#: src/preferences.c:4134
+#: src/preferences.c:4211
 msgid "MIDI repeat"
 msgstr ""
 
-#: src/preferences.c:4137
+#: src/preferences.c:4214
 msgid "Number of non-reads allowed between succesive reads."
 msgstr ""
 
-#: src/preferences.c:4140
+#: src/preferences.c:4218
 msgid "(Warning: setting this value too high can slow down playback.)"
 msgstr ""
 
-#: src/preferences.c:4159
+#: src/preferences.c:4237
 msgid "MIDI/Joystick learner"
 msgstr ""
 
-#: src/preferences.c:4499
+#: src/preferences.c:4679
 msgid ""
 "\n"
 "LiVES will now shut down. You need to restart it for the directory change to "
@@ -7917,214 +7931,214 @@
 "Click OK to continue.\n"
 msgstr ""
 
-#: src/preferences.c:4523
+#: src/preferences.c:4703
 msgid ""
 "For the directory change to take effect LiVES will restart when preferences "
 "dialog closes."
 msgstr ""
 
-#: src/preferences.c:4527
+#: src/preferences.c:4707
 msgid "Theme changes will not take effect until the next time you start LiVES."
 msgstr ""
 
-#: src/preferences.c:4531
+#: src/preferences.c:4711
 msgid "Jack options will not take effect until the next time you start LiVES."
 msgstr ""
 
-#: src/osc.c:2585
+#: src/osc.c:2616
 #, c-format
 msgid "Syncing to external framerate of %.8f frames per second.\n"
 msgstr ""
 
-#: src/osc.c:6746
+#: src/osc.c:6938
 msgid "Cannot initialize OSC receiver\n"
 msgstr ""
 
-#: src/osc.c:6770
+#: src/osc.c:6961
 #, c-format
 msgid "WARNING: Cannot start OSC server at UDP port %d\n"
 msgstr ""
 
-#: src/osc.c:6775
+#: src/osc.c:6963
 #, c-format
 msgid "Started OSC server at UDP port %d\n"
 msgstr ""
 
-#: src/osc.c:6890
+#: src/osc.c:7076
 #, c-format
 msgid "Cannot start OSC/UDP server at port %d \n"
 msgstr ""
 
-#: src/resample.c:125 src/resample.c:304
+#: src/resample.c:131 src/resample.c:305
 #, c-format
 msgid "Resizing frames 1 to %d"
 msgstr "Redimensionar cuadros 1 a %d"
 
-#: src/resample.c:140 src/resample.c:318
+#: src/resample.c:145 src/resample.c:318
 #, c-format
 msgid "Resizing/letterboxing frames 1 to %d"
 msgstr ""
 
-#: src/resample.c:361 src/resample.c:385
+#: src/resample.c:360 src/resample.c:384
 msgid "Resize"
 msgstr "Redimensionar"
 
-#: src/resample.c:395
+#: src/resample.c:394
 msgid "Resample/Resize"
 msgstr "Resamplear/Reescalar"
 
-#: src/resample.c:680
+#: src/resample.c:676
 #, c-format
 msgid "Length of video is now %d frames.\n"
 msgstr "La longitud del video es ahora de %d cuadros.\n"
 
-#: src/resample.c:745
+#: src/resample.c:737
 msgid ""
 "\n"
 "\n"
 "New rate must be greater than 0\n"
 msgstr ""
 
-#: src/resample.c:797 src/resample.c:813
+#: src/resample.c:788 src/resample.c:803
 msgid "Resampling audio"
 msgstr ""
 
-#: src/resample.c:831
+#: src/resample.c:821
 msgid "LiVES was unable to resample the audio as requested.\n"
 msgstr ""
 
-#: src/resample.c:833 src/resample.c:837
+#: src/resample.c:823 src/resample.c:827
 msgid "Resample Audio"
 msgstr "Resamplear Audio"
 
-#: src/resample.c:845
+#: src/resample.c:835
 #, c-format
 msgid "Audio was resampled to %d Hz, %d channels, %d bit"
 msgstr ""
 
-#: src/resample.c:1034
+#: src/resample.c:1016
 #, c-format
 msgid "Resampling video at %.8f frames per second..."
 msgstr "Resamplear video at %.8f cuadros por segundo..."
 
-#: src/resample.c:1037
+#: src/resample.c:1018
 #, c-format
 msgid "Resampling video at %.3f frames per second..."
 msgstr "Remuestreo de video at %.3f cuadros por segundo..."
 
-#: src/resample.c:1068
+#: src/resample.c:1049
 msgid "Reordering error !\n"
 msgstr ""
 
-#: src/resample.c:1079
+#: src/resample.c:1060
 msgid "Resample"
 msgstr "Remuestreo"
 
-#: src/resample.c:1192
+#: src/resample.c:1173
 msgid "LiVES: - Resample Audio"
 msgstr ""
 
-#: src/resample.c:1195
+#: src/resample.c:1175
 msgid "LiVES: - Insert Silence"
 msgstr "LiVES: - Insertar Silencio"
 
-#: src/resample.c:1198
+#: src/resample.c:1177
 msgid "LiVES: - New Clip Audio"
 msgstr ""
 
-#: src/resample.c:1201
+#: src/resample.c:1179
 msgid "LiVES: - External Clip Settings"
 msgstr ""
 
-#: src/resample.c:1238 src/resample.c:1358
+#: src/resample.c:1215 src/resample.c:1332
 msgid "Rate (Hz) "
 msgstr ""
 
-#: src/resample.c:1245 src/resample.c:1372
+#: src/resample.c:1222 src/resample.c:1346
 msgid "Channels"
 msgstr ""
 
-#: src/resample.c:1252
+#: src/resample.c:1229
 msgid "Sample Size "
 msgstr ""
 
-#: src/resample.c:1268 src/resample.c:1425
+#: src/resample.c:1245 src/resample.c:1399
 msgid "Signed"
 msgstr "Firmado"
 
-#: src/resample.c:1274 src/resample.c:1435
+#: src/resample.c:1251 src/resample.c:1409
 msgid "Unsigned"
 msgstr "No firmado"
 
-#: src/resample.c:1297 src/resample.c:1460
+#: src/resample.c:1273 src/resample.c:1433
 msgid "Little Endian"
 msgstr ""
 
-#: src/resample.c:1303 src/resample.c:1468
+#: src/resample.c:1279 src/resample.c:1441
 msgid "Big Endian"
 msgstr ""
 
-#: src/resample.c:1315
+#: src/resample.c:1290
 msgid "Current"
 msgstr "Actual"
 
-#: src/resample.c:1340
+#: src/resample.c:1315
 msgid "_Enable audio"
 msgstr ""
 
-#: src/resample.c:1372
+#: src/resample.c:1346
 msgid "_Channels"
 msgstr ""
 
-#: src/resample.c:1394
+#: src/resample.c:1368
 msgid "_Sample Size"
 msgstr ""
 
-#: src/resample.c:1394
+#: src/resample.c:1368
 msgid "Sample Size"
 msgstr ""
 
-#: src/resample.c:1489
+#: src/resample.c:1461
 msgid "New"
 msgstr "Nuevo"
 
-#: src/resample.c:1512
+#: src/resample.c:1484
 msgid "_Frames Per Second "
 msgstr ""
 
-#: src/resample.c:1530
+#: src/resample.c:1502
 msgid "Record for maximum:  "
 msgstr ""
 
-#: src/resample.c:1533
+#: src/resample.c:1505
 msgid " hours  "
 msgstr " horas  "
 
-#: src/resample.c:1536
+#: src/resample.c:1508
 msgid " minutes  "
 msgstr " minutos  "
 
-#: src/resample.c:1538
+#: src/resample.c:1510
 msgid " seconds  "
 msgstr " segundos  "
 
-#: src/resample.c:1545
+#: src/resample.c:1517
 msgid "Unlimited"
 msgstr "Ilimitado"
 
-#: src/resample.c:1561
+#: src/resample.c:1533
 msgid "Click OK to begin recording, or Cancel to quit."
 msgstr ""
 
-#: src/resample.c:1670
+#: src/resample.c:1638
 msgid "LiVES: - Change playback speed"
 msgstr ""
 
-#: src/resample.c:1673
+#: src/resample.c:1640
 msgid "LiVES: - Resample Video"
 msgstr ""
 
-#: src/resample.c:1696
+#: src/resample.c:1663
 #, c-format
 msgid ""
 "\n"
@@ -8135,7 +8149,7 @@
 "in _frames per second"
 msgstr ""
 
-#: src/resample.c:1701
+#: src/resample.c:1667
 #, c-format
 msgid ""
 "\n"
@@ -8146,89 +8160,89 @@
 "in frames per second"
 msgstr ""
 
-#: src/resample.c:1723
+#: src/resample.c:1688
 msgid "OR enter the desired clip length in _seconds"
 msgstr ""
 
-#: src/resample.c:1745
+#: src/resample.c:1710
 msgid "Change the _audio speed as well"
 msgstr ""
 
-#: src/resample.c:1846
+#: src/resample.c:1810
 msgid ""
 "\n"
 "Speeding up the clip will cause missing frames in some multitrack layouts.\n"
 "Are you sure you wish to change the speed ?\n"
 msgstr ""
 
-#: src/resample.c:1863
+#: src/resample.c:1829
 msgid ""
 "\n"
 "Speeding up the clip will cause missing audio in some multitrack layouts.\n"
 "Are you sure you wish to change the speed ?\n"
 msgstr ""
 
-#: src/resample.c:1878
+#: src/resample.c:1847
 msgid ""
 "\n"
 "Changing the speed will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/resample.c:1892
+#: src/resample.c:1863
 msgid ""
 "\n"
 "Changing the speed will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/resample.c:1938
+#: src/resample.c:1911
 msgid "Speed Change"
 msgstr "Cambiar Velocidad"
 
-#: src/resample.c:1947
+#: src/resample.c:1920
 #, c-format
 msgid "Changed playback speed to %.3f frames per second and audio to %d Hz.\n"
 msgstr ""
 
-#: src/resample.c:1950
+#: src/resample.c:1922
 #, c-format
 msgid "Changed playback speed to %.3f frames per second.\n"
 msgstr ""
 
-#: src/resample.c:2035
+#: src/resample.c:2006
 msgid "Resampling video"
 msgstr ""
 
-#: src/resample.c:2042 src/resample.c:2160 src/resample.c:2182
+#: src/resample.c:2012 src/resample.c:2127 src/resample.c:2148
 msgid "Resampling clipboard video"
 msgstr ""
 
-#: src/resample.c:2047
+#: src/resample.c:2016
 msgid "Reordering frames"
 msgstr "Reordenando cuadros"
 
-#: src/resample.c:2056
+#: src/resample.c:2025
 msgid ""
 "\n"
 "\n"
 "LiVES was unable to reorder the frames."
 msgstr ""
 
-#: src/resample.c:2104
+#: src/resample.c:2071
 msgid "Deordering frames"
 msgstr "Desordenando cuadros"
 
-#: src/resample.c:2199
+#: src/resample.c:2165
 msgid "resampling error..."
 msgstr ""
 
-#: src/rte_window.c:85 src/rte_window.c:1708
+#: src/rte_window.c:124 src/rte_window.c:1709
 #, c-format
 msgid "Type: %s"
 msgstr "Tipo: %s"
 
-#: src/rte_window.c:112
+#: src/rte_window.c:150
 msgid ""
 "\n"
 "\n"
@@ -8238,7 +8252,7 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:426
+#: src/rte_window.c:460
 msgid ""
 "\n"
 "\n"
@@ -8246,19 +8260,19 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:432
+#: src/rte_window.c:466
 #, c-format
 msgid "Saving keymap to %s\n"
 msgstr ""
 
-#: src/rte_window.c:439
+#: src/rte_window.c:471
 #, c-format
 msgid ""
 "\n"
 "Updating keymap file %s..."
 msgstr ""
 
-#: src/rte_window.c:446
+#: src/rte_window.c:477
 #, c-format
 msgid ""
 "\n"
@@ -8268,12 +8282,12 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/rte_window.c:526
+#: src/rte_window.c:556
 #, c-format
 msgid "Saving real time effect defaults to %s..."
 msgstr ""
 
-#: src/rte_window.c:535
+#: src/rte_window.c:563
 #, c-format
 msgid ""
 "\n"
@@ -8283,22 +8297,22 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/rte_window.c:632
+#: src/rte_window.c:657
 #, c-format
 msgid "Loading real time effect defaults from %s..."
 msgstr ""
 
-#: src/rte_window.c:681
+#: src/rte_window.c:701
 #, c-format
 msgid "Loading generator default sizes from %s..."
 msgstr ""
 
-#: src/rte_window.c:1306
+#: src/rte_window.c:1319
 #, c-format
 msgid "Loading default keymap from %s..."
 msgstr ""
 
-#: src/rte_window.c:1329
+#: src/rte_window.c:1339
 #, c-format
 msgid ""
 "\n"
@@ -8308,48 +8322,48 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/rte_window.c:1403
+#: src/rte_window.c:1412
 #, c-format
 msgid "Invalid line %d in %s\n"
 msgstr ""
 
-#: src/rte_window.c:1483
+#: src/rte_window.c:1490
 #, c-format
 msgid "Invalid key %d in %s\n"
 msgstr ""
 
-#: src/rte_window.c:1498
+#: src/rte_window.c:1505
 #, c-format
 msgid "Invalid effect %s in %s\n"
 msgstr ""
 
-#: src/rte_window.c:1517
+#: src/rte_window.c:1524
 #, c-format
 msgid "Unknown effect %s in %s\n"
 msgstr ""
 
-#: src/rte_window.c:1535
+#: src/rte_window.c:1542
 #, c-format
 msgid ""
 "This version of LiVES cannot mix generators/non-generators on the same key "
 "(%d) !\n"
 msgstr ""
 
-#: src/rte_window.c:1547
+#: src/rte_window.c:1554
 #, c-format
 msgid "Too many effects bound to key %d.\n"
 msgstr ""
 
-#: src/rte_window.c:1587
+#: src/rte_window.c:1593
 msgid "update required.\n"
 msgstr ""
 
-#: src/rte_window.c:1603
+#: src/rte_window.c:1607
 #, c-format
 msgid "Loading data connection map from %s..."
 msgstr ""
 
-#: src/rte_window.c:1612
+#: src/rte_window.c:1614
 msgid ""
 "\n"
 "\n"
@@ -8357,41 +8371,41 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:1691
+#: src/rte_window.c:1692
 #, c-format
 msgid "LiVES: Information for %s"
 msgstr ""
 
-#: src/rte_window.c:1704
+#: src/rte_window.c:1705
 #, c-format
 msgid "Effect name: %s"
 msgstr ""
 
-#: src/rte_window.c:1712
+#: src/rte_window.c:1713
 #, c-format
 msgid "Plugin name: %s"
 msgstr ""
 
-#: src/rte_window.c:1716
+#: src/rte_window.c:1717
 #, c-format
 msgid "Author: %s"
 msgstr "Autor: %s"
 
-#: src/rte_window.c:1721
+#: src/rte_window.c:1722
 #, c-format
 msgid "and: %s"
 msgstr ""
 
-#: src/rte_window.c:1726
+#: src/rte_window.c:1727
 #, c-format
 msgid "Version: %d"
 msgstr ""
 
-#: src/rte_window.c:1734
+#: src/rte_window.c:1735
 msgid "Description: "
 msgstr "Descripción: "
 
-#: src/rte_window.c:1960
+#: src/rte_window.c:1963
 msgid ""
 "\n"
 "\n"
@@ -8400,69 +8414,69 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:2024
+#: src/rte_window.c:2027
 #, c-format
 msgid "LiVES could not locate the effect %s.\n"
 msgstr ""
 
-#: src/rte_window.c:2225
+#: src/rte_window.c:2216
 msgid "LiVES: Real time effect mapping"
 msgstr ""
 
-#: src/rte_window.c:2257
+#: src/rte_window.c:2248
 #, c-format
 msgid "Ctrl-%d"
 msgstr "Ctrl-%d"
 
-#: src/rte_window.c:2264
+#: src/rte_window.c:2255
 msgid "Key active"
 msgstr ""
 
-#: src/rte_window.c:2279
+#: src/rte_window.c:2271
 msgid "Key grab"
 msgstr ""
 
-#: src/rte_window.c:2280
+#: src/rte_window.c:2272
 msgid "Grab keyboard for this effect key"
 msgstr ""
 
-#: src/rte_window.c:2290
+#: src/rte_window.c:2283
 msgid "_Clear all effects"
 msgstr ""
 
-#: src/rte_window.c:2304
+#: src/rte_window.c:2297
 msgid "Mode active"
 msgstr ""
 
-#: src/rte_window.c:2314 src/multitrack.c:8568
+#: src/rte_window.c:2307 src/multitrack.c:8762
 msgid "Info"
 msgstr "Información"
 
-#: src/rte_window.c:2315
+#: src/rte_window.c:2308
 msgid "Set Parameters"
 msgstr ""
 
-#: src/rte_window.c:2316
+#: src/rte_window.c:2309
 msgid "Set Connections"
 msgstr ""
 
-#: src/rte_window.c:2317
+#: src/rte_window.c:2310
 msgid "Clear"
 msgstr "Limpiar"
 
-#: src/rte_window.c:2326
+#: src/rte_window.c:2319
 msgid "Effect name:"
 msgstr ""
 
-#: src/rte_window.c:2391
+#: src/rte_window.c:2384
 msgid "_Save as default keymap"
 msgstr ""
 
-#: src/rte_window.c:2396
+#: src/rte_window.c:2389
 msgid "_Load default keymap"
 msgstr ""
 
-#: src/rte_window.c:2840
+#: src/rte_window.c:2833
 #, c-format
 msgid ""
 "Unable to create default keymap file: %s\n"
@@ -8520,86 +8534,86 @@
 msgid "none\n"
 msgstr "Nada\n"
 
-#: src/lives-yuv4mpeg.c:494
+#: src/lives-yuv4mpeg.c:493
 #, c-format
 msgid ""
 "Unable to set display framerate to %.3f fps.\n"
 "\n"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:503
+#: src/lives-yuv4mpeg.c:502
 #, c-format
 msgid "Unable to open yuv4mpeg out stream %s\n"
 msgstr "Imposible abrir flujo de salida yuv4mpeg %s\n"
 
-#: src/lives-yuv4mpeg.c:628
+#: src/lives-yuv4mpeg.c:626
 #, c-format
 msgid "TV card %d"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:713
+#: src/lives-yuv4mpeg.c:710
 #, c-format
 msgid "Opened TV card %d (%s)"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:760
+#: src/lives-yuv4mpeg.c:757
 #, c-format
 msgid "Firewire card %d"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:796
+#: src/lives-yuv4mpeg.c:793
 #, c-format
 msgid "Opened firewire card %d"
 msgstr ""
 
-#: src/multitrack.c:666
+#: src/multitrack.c:736
 msgid "Auto backup"
 msgstr ""
 
-#: src/multitrack.c:868
+#: src/multitrack.c:935
 msgid "Backing audio"
 msgstr ""
 
-#: src/multitrack.c:1435
+#: src/multitrack.c:1515
 #, c-format
 msgid "%s : parameters for %s"
 msgstr ""
 
-#: src/multitrack.c:1809 src/multitrack.c:3483
+#: src/multitrack.c:1881 src/multitrack.c:3635
 #, c-format
 msgid "Current track: %s (layer %d)\n"
 msgstr ""
 
-#: src/multitrack.c:1813 src/multitrack.c:3484
+#: src/multitrack.c:1885 src/multitrack.c:3637
 msgid "Current track: Backing audio\n"
 msgstr ""
 
-#: src/multitrack.c:1814
+#: src/multitrack.c:1886
 #, c-format
 msgid "Current track: Layer %d audio\n"
 msgstr ""
 
-#: src/multitrack.c:1817
+#: src/multitrack.c:1889
 #, c-format
 msgid "%.2f sec.\n"
 msgstr ""
 
-#: src/multitrack.c:1822 src/multitrack.c:3490
+#: src/multitrack.c:1894 src/multitrack.c:3643
 #, c-format
 msgid "Source: %s"
 msgstr "Origen: %s"
 
-#: src/multitrack.c:1825 src/multitrack.c:3492
+#: src/multitrack.c:1897 src/multitrack.c:3645
 msgid "Right click for context menu.\n"
 msgstr ""
 
-#: src/multitrack.c:1827
+#: src/multitrack.c:1899
 msgid ""
 "Double click on a block\n"
 "to select it."
 msgstr ""
 
-#: src/multitrack.c:3312
+#: src/multitrack.c:3452
 msgid ""
 "\n"
 "\n"
@@ -8608,7 +8622,7 @@
 "right or double clicking on it.\n"
 msgstr ""
 
-#: src/multitrack.c:3315
+#: src/multitrack.c:3455
 msgid ""
 "\n"
 "\n"
@@ -8616,14 +8630,14 @@
 "Select an effect in FX stack first to view its parameters.\n"
 msgstr ""
 
-#: src/multitrack.c:3318
+#: src/multitrack.c:3458
 msgid ""
 "\n"
 "\n"
 "No clips loaded.\n"
 msgstr ""
 
-#: src/multitrack.c:3321
+#: src/multitrack.c:3462
 msgid ""
 "You must select two video tracks\n"
 "and a time region\n"
@@ -8633,7 +8647,7 @@
 "before inserting clips into the timeline."
 msgstr ""
 
-#: src/multitrack.c:3324
+#: src/multitrack.c:3465
 msgid ""
 "\n"
 "\n"
@@ -8642,210 +8656,210 @@
 "to apply compositors.\n"
 msgstr ""
 
-#: src/multitrack.c:3487
+#: src/multitrack.c:3640
 #, c-format
 msgid "%.2f sec. to %.2f sec.\n"
 msgstr ""
 
-#: src/multitrack.c:3493
+#: src/multitrack.c:3646
 msgid ""
 "Single click on timeline\n"
 "to select a frame.\n"
 msgstr ""
 
-#: src/multitrack.c:3711 src/multitrack.c:6790
+#: src/multitrack.c:3858 src/multitrack.c:6972
 #, c-format
 msgid "%s [unstable]"
 msgstr ""
 
-#: src/multitrack.c:3822
+#: src/multitrack.c:3973
 msgid ""
 "You can click and drag\n"
 "below the timeline"
 msgstr ""
 
-#: src/multitrack.c:3823
+#: src/multitrack.c:3974
 msgid "to select a time region.\n"
 msgstr "para seleccionar una región de tiempo.\n"
 
-#: src/multitrack.c:3985
+#: src/multitrack.c:4137
 msgid "LiVES: Selected clip"
 msgstr ""
 
-#: src/multitrack.c:3993
+#: src/multitrack.c:4145
 msgid "_Adjust start and end points"
 msgstr ""
 
-#: src/multitrack.c:4002
+#: src/multitrack.c:4154
 msgid "_Edit/encode in clip editor"
 msgstr ""
 
-#: src/multitrack.c:4009
+#: src/multitrack.c:4161
 msgid "_Show clip information"
 msgstr ""
 
-#: src/multitrack.c:4016
+#: src/multitrack.c:4168
 msgid "_Close this clip"
 msgstr ""
 
-#: src/multitrack.c:4236
+#: src/multitrack.c:4388
 msgid "Audio mixer (ctrl-m)"
 msgstr "Mezclador de Audio (ctrl-m)"
 
-#: src/multitrack.c:4336
+#: src/multitrack.c:4488
 msgid "Single click on timeline"
 msgstr ""
 
-#: src/multitrack.c:4337
+#: src/multitrack.c:4489
 msgid "to select a frame."
 msgstr ""
 
-#: src/multitrack.c:4338
+#: src/multitrack.c:4490
 msgid "Double click or right click on timeline"
 msgstr ""
 
-#: src/multitrack.c:4339
+#: src/multitrack.c:4491
 msgid "to select a block."
 msgstr ""
 
-#: src/multitrack.c:4340
+#: src/multitrack.c:4492
 msgid "Clips can be dragged"
 msgstr ""
 
-#: src/multitrack.c:4341
+#: src/multitrack.c:4493
 msgid "onto the timeline."
 msgstr ""
 
-#: src/multitrack.c:4343
+#: src/multitrack.c:4495
 msgid "Mouse mode is: Move"
 msgstr ""
 
-#: src/multitrack.c:4344
+#: src/multitrack.c:4496
 msgid "clips can be moved around."
 msgstr ""
 
-#: src/multitrack.c:4349
+#: src/multitrack.c:4500
 msgid "Mouse mode is: Select."
 msgstr ""
 
-#: src/multitrack.c:4350
+#: src/multitrack.c:4501
 msgid "Drag with mouse on timeline"
 msgstr ""
 
-#: src/multitrack.c:4351
+#: src/multitrack.c:4502
 msgid "to select tracks and time."
 msgstr ""
 
-#: src/multitrack.c:4362
+#: src/multitrack.c:4509
 msgid "_Insert mode: Normal"
 msgstr ""
 
-#: src/multitrack.c:4378
+#: src/multitrack.c:4537
 msgid "_Mouse mode: Move"
 msgstr ""
 
-#: src/multitrack.c:4382
+#: src/multitrack.c:4540
 msgid "_Mouse mode: Select"
 msgstr ""
 
-#: src/multitrack.c:4405 src/multitrack.c:7925
+#: src/multitrack.c:4563 src/multitrack.c:8104
 msgid "Gravity: Normal"
 msgstr ""
 
-#: src/multitrack.c:4409
+#: src/multitrack.c:4565
 msgid "Gravity: Left"
 msgstr ""
 
-#: src/multitrack.c:4414
+#: src/multitrack.c:4569
 msgid "Gravity: Right"
 msgstr ""
 
-#: src/multitrack.c:4416
+#: src/multitrack.c:4570
 msgid "Close _last gap(s) in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:4419
+#: src/multitrack.c:4572
 msgid "Close _first gap(s) in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:4458
+#: src/multitrack.c:4627
 msgid "Close gaps"
 msgstr "Cerrar huecos"
 
-#: src/multitrack.c:4460
+#: src/multitrack.c:4629
 msgid "Move block"
 msgstr ""
 
-#: src/multitrack.c:4462
+#: src/multitrack.c:4631
 msgid "Move audio block"
 msgstr ""
 
-#: src/multitrack.c:4464
+#: src/multitrack.c:4633
 msgid "Delete block"
 msgstr "Eliminar bloque"
 
-#: src/multitrack.c:4466
+#: src/multitrack.c:4635
 msgid "Delete audio block"
 msgstr ""
 
-#: src/multitrack.c:4468
+#: src/multitrack.c:4637
 msgid "Split tracks"
 msgstr "Separar pistas"
 
-#: src/multitrack.c:4470
+#: src/multitrack.c:4639
 msgid "Split block"
 msgstr ""
 
-#: src/multitrack.c:4473
+#: src/multitrack.c:4642
 #, c-format
 msgid "Apply %s"
 msgstr "Aplicar %s"
 
-#: src/multitrack.c:4478
+#: src/multitrack.c:4647
 #, c-format
 msgid "Delete %s"
 msgstr "Borrar %s"
 
-#: src/multitrack.c:4482
+#: src/multitrack.c:4651
 msgid "Insert block"
 msgstr ""
 
-#: src/multitrack.c:4484
+#: src/multitrack.c:4653
 msgid "Insert gap"
 msgstr ""
 
-#: src/multitrack.c:4486
+#: src/multitrack.c:4655
 msgid "Insert audio block"
 msgstr ""
 
-#: src/multitrack.c:4488
+#: src/multitrack.c:4657
 msgid "Effect order change"
 msgstr ""
 
-#: src/multitrack.c:4898
+#: src/multitrack.c:5064
 msgid "unsigned "
 msgstr ""
 
-#: src/multitrack.c:4899
+#: src/multitrack.c:5065
 msgid "signed "
 msgstr ""
 
-#: src/multitrack.c:4904
+#: src/multitrack.c:5071
 #, c-format
 msgid ""
 "Multitrack values set to %.3f fps, frame size %d x %d, audio channels %d, "
 "audio rate %d, audio sample size %d, %s.\n"
 msgstr ""
 
-#: src/multitrack.c:4938
+#: src/multitrack.c:5104
 msgid "invalid event list. Failed.\n"
 msgstr ""
 
-#: src/multitrack.c:4944
+#: src/multitrack.c:5110
 msgid "event list has invalid fps. Failed.\n"
 msgstr ""
 
-#: src/multitrack.c:4953
+#: src/multitrack.c:5122
 #, c-format
 msgid ""
 "\n"
@@ -8855,7 +8869,7 @@
 "then load in the new set from the File menu.\n"
 msgstr ""
 
-#: src/multitrack.c:4993
+#: src/multitrack.c:5163
 #, c-format
 msgid ""
 "\n"
@@ -8863,600 +8877,592 @@
 "It cannot be loaded.\n"
 msgstr ""
 
-#: src/multitrack.c:5329 src/multitrack.c:5338 src/multitrack.c:21133
+#: src/multitrack.c:5452
 msgid "Layout was wiped.\n"
 msgstr ""
 
-#: src/multitrack.c:5374
+#: src/multitrack.c:5547
 #, c-format
 msgid "LiVES-%s: Multitrack %dx%d : %d bpp %.3f fps"
 msgstr ""
 
-#: src/multitrack.c:5617
+#: src/multitrack.c:5793
 msgid "In/out"
 msgstr "Entrada/Salida"
 
-#: src/multitrack.c:5619
+#: src/multitrack.c:5795
 msgid "FX stack"
 msgstr ""
 
-#: src/multitrack.c:5627 src/omc-learn.c:673
+#: src/multitrack.c:5803 src/omc-learn.c:659
 msgid "Params."
 msgstr "Parám."
 
-#: src/multitrack.c:5978
+#: src/multitrack.c:6157
 msgid "_Open..."
 msgstr ""
 
-#: src/multitrack.c:5996
+#: src/multitrack.c:6175
 msgid "O_pen File Selection..."
 msgstr "Abriendo selección de archivos..."
 
-#: src/multitrack.c:6040
+#: src/multitrack.c:6219
 msgid "Import Selection from _dvd/vcd..."
 msgstr "Importar Selección desde _dvd/vcd..."
 
-#: src/multitrack.c:6050
+#: src/multitrack.c:6229
 msgid "Import Selection from _dvd"
 msgstr "Import Selección desde _dvd"
 
-#: src/multitrack.c:6060
+#: src/multitrack.c:6239
 msgid "Import Selection from _vcd"
 msgstr "Importar Selección desde _vcd"
 
-#: src/multitrack.c:6076
+#: src/multitrack.c:6255
 msgid "_Import from Device"
 msgstr "_Importar desde Dispositivo"
 
-#: src/multitrack.c:6103
+#: src/multitrack.c:6282
 msgid "_Close the selected clip"
 msgstr ""
 
-#: src/multitrack.c:6198
+#: src/multitrack.c:6377
 msgid "_Save layout as..."
 msgstr ""
 
-#: src/multitrack.c:6206
+#: src/multitrack.c:6385
 msgid "_Load layout..."
 msgstr ""
 
-#: src/multitrack.c:6210
+#: src/multitrack.c:6389
 msgid "_Wipe/Delete layout..."
 msgstr ""
 
-#: src/multitrack.c:6236
+#: src/multitrack.c:6415
 msgid "_Ignore width, height and audio values from loaded layouts"
 msgstr ""
 
-#: src/multitrack.c:6240
+#: src/multitrack.c:6419
 msgid "Auto load _subtitles with clips"
 msgstr ""
 
-#: src/multitrack.c:6322
+#: src/multitrack.c:6501
 msgid "_CLIP EDITOR"
 msgstr ""
 
-#: src/multitrack.c:6334
+#: src/multitrack.c:6513
 msgid "_Adjust selected clip start/end points"
 msgstr ""
 
-#: src/multitrack.c:6343
+#: src/multitrack.c:6522
 msgid "_Insert selected clip"
 msgstr ""
 
-#: src/multitrack.c:6355
+#: src/multitrack.c:6534
 msgid "_Insert selected clip audio"
 msgstr ""
 
-#: src/multitrack.c:6364
+#: src/multitrack.c:6543
 msgid "_Delete selected block"
 msgstr ""
 
-#: src/multitrack.c:6373
+#: src/multitrack.c:6555
 msgid "_Jump to previous block boundary"
 msgstr ""
 
-#: src/multitrack.c:6382
+#: src/multitrack.c:6564
 msgid "_Jump to next block boundary"
 msgstr ""
 
-#: src/multitrack.c:6395
+#: src/multitrack.c:6577
 msgid "Clear _marks from timeline"
 msgstr ""
 
-#: src/multitrack.c:6403
+#: src/multitrack.c:6585
 msgid "Ignore selection limits when inserting"
 msgstr ""
 
-#: src/multitrack.c:6420 src/multitrack.c:16719
+#: src/multitrack.c:6602 src/multitrack.c:17009
 msgid "_Play from Timeline Position"
 msgstr ""
 
-#: src/multitrack.c:6434
+#: src/multitrack.c:6616
 msgid "Pla_y selected time only"
 msgstr ""
 
-#: src/multitrack.c:6518
+#: src/multitrack.c:6700
 msgid "_Move effects with blocks"
 msgstr ""
 
-#: src/multitrack.c:6531
+#: src/multitrack.c:6713
 msgid "Select _autotransition effect..."
 msgstr ""
 
-#: src/multitrack.c:6542
+#: src/multitrack.c:6724
 msgid "Crossfade audio with autotransition"
 msgstr ""
 
-#: src/multitrack.c:6550
+#: src/multitrack.c:6732
 msgid "View/_Edit selected effect"
 msgstr ""
 
-#: src/multitrack.c:6554
+#: src/multitrack.c:6736
 msgid "_Delete selected effect"
 msgstr ""
 
-#: src/multitrack.c:6562
+#: src/multitrack.c:6744
 msgid "Apply effect to _block..."
 msgstr ""
 
-#: src/multitrack.c:6619
+#: src/multitrack.c:6801
 msgid "Apply effect to _region..."
 msgstr ""
 
-#: src/multitrack.c:6885
+#: src/multitrack.c:7061
 msgid "_Tracks"
 msgstr "Pis_tas"
 
-#: src/multitrack.c:6896
+#: src/multitrack.c:7072
 msgid "Rename current track"
 msgstr ""
 
-#: src/multitrack.c:6904
+#: src/multitrack.c:7080
 msgid "Make _Backing Audio current track"
 msgstr ""
 
-#: src/multitrack.c:6915
+#: src/multitrack.c:7091
 msgid "Add Video Track at _Rear"
 msgstr ""
 
-#: src/multitrack.c:6923
+#: src/multitrack.c:7099
 msgid "Add Video Track at _Front"
 msgstr ""
 
-#: src/multitrack.c:6936
+#: src/multitrack.c:7112
 msgid "_Split current track at cursor"
 msgstr ""
 
-#: src/multitrack.c:6948
+#: src/multitrack.c:7124
 msgid "_Split selected video tracks"
 msgstr ""
 
-#: src/multitrack.c:6961
+#: src/multitrack.c:7137
 msgid "Insert gap in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:6969
+#: src/multitrack.c:7145
 msgid "Insert gap in current track/selected time"
 msgstr ""
 
-#: src/multitrack.c:6981
+#: src/multitrack.c:7157
 msgid "Close all _gaps in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:7007
+#: src/multitrack.c:7183
 msgid "Se_lection"
 msgstr "Se_lección"
 
-#: src/multitrack.c:7018
+#: src/multitrack.c:7194
 msgid "_Select Current Track"
 msgstr ""
 
-#: src/multitrack.c:7025
+#: src/multitrack.c:7201
 msgid "Select _all video tracks"
 msgstr ""
 
-#: src/multitrack.c:7032
+#: src/multitrack.c:7208
 msgid "Select _no video tracks"
 msgstr ""
 
-#: src/multitrack.c:7039
+#: src/multitrack.c:7215
 msgid "Select all _time"
 msgstr ""
 
-#: src/multitrack.c:7050
+#: src/multitrack.c:7226
 msgid "Select from _zero time"
 msgstr ""
 
-#: src/multitrack.c:7057
+#: src/multitrack.c:7233
 msgid "Select to _end time"
 msgstr ""
 
-#: src/multitrack.c:7064
+#: src/multitrack.c:7240
 msgid "_Copy..."
 msgstr "_Copiar..."
 
-#: src/multitrack.c:7075
+#: src/multitrack.c:7251
 msgid "_Timecode to region start"
 msgstr ""
 
-#: src/multitrack.c:7082
+#: src/multitrack.c:7258
 msgid "_Timecode to region end"
 msgstr ""
 
-#: src/multitrack.c:7089
+#: src/multitrack.c:7265
 msgid "_Region start to timecode"
 msgstr ""
 
-#: src/multitrack.c:7096
+#: src/multitrack.c:7272
 msgid "_Region end to timecode"
 msgstr ""
 
-#: src/multitrack.c:7110
+#: src/multitrack.c:7286
 msgid "Select/deselect block at current track/time"
 msgstr ""
 
-#: src/multitrack.c:7135
+#: src/multitrack.c:7311
 msgid "_Change width, height and audio values..."
 msgstr "_Cambiar ancho, alto y volumen de audio..."
 
-#: src/multitrack.c:7194
+#: src/multitrack.c:7370
 msgid "_Render"
 msgstr "_Renderizar"
 
-#: src/multitrack.c:7205
+#: src/multitrack.c:7381
 msgid "_Render all to new clip"
 msgstr ""
 
-#: src/multitrack.c:7220
+#: src/multitrack.c:7396
 msgid "Render _video"
 msgstr ""
 
-#: src/multitrack.c:7225
+#: src/multitrack.c:7401
 msgid "Render _audio"
 msgstr ""
 
-#: src/multitrack.c:7235
+#: src/multitrack.c:7411
 msgid "_Normalise rendered audio"
 msgstr ""
 
-#: src/multitrack.c:7242
+#: src/multitrack.c:7418
 msgid "_Pre-render audio"
 msgstr ""
 
-#: src/multitrack.c:7251
+#: src/multitrack.c:7427
 msgid "_View"
 msgstr "_Ver"
 
-#: src/multitrack.c:7270
+#: src/multitrack.c:7446
 msgid "Block _In/out points"
 msgstr ""
 
-#: src/multitrack.c:7279
+#: src/multitrack.c:7455
 msgid "_Effects at current"
 msgstr ""
 
-#: src/multitrack.c:7297
+#: src/multitrack.c:7473
 msgid "Audio parameters"
 msgstr "Parametros de Audio"
 
-#: src/multitrack.c:7308
+#: src/multitrack.c:7484
 msgid "Show backing _audio track"
 msgstr ""
 
-#: src/multitrack.c:7312
+#: src/multitrack.c:7488
 msgid "Compact view"
 msgstr "Vista compacta"
 
-#: src/multitrack.c:7320
+#: src/multitrack.c:7496
 msgid "Maximum tracks to display..."
 msgstr ""
 
-#: src/multitrack.c:7327
+#: src/multitrack.c:7503
 msgid "Scroll to follow playback"
 msgstr ""
 
-#: src/multitrack.c:7331
+#: src/multitrack.c:7507
 msgid "_Center on cursor"
 msgstr ""
 
-#: src/multitrack.c:7338
+#: src/multitrack.c:7514
 msgid "_Zoom in"
 msgstr "_Zoom Más"
 
-#: src/multitrack.c:7349
+#: src/multitrack.c:7525
 msgid "_Zoom out"
 msgstr "_Zoom Menos"
 
-#: src/multitrack.c:7361
+#: src/multitrack.c:7537
 msgid "Multitrack _details"
 msgstr ""
 
-#: src/multitrack.c:7374
+#: src/multitrack.c:7550
 msgid "_Event Window"
 msgstr ""
 
-#: src/multitrack.c:7378
+#: src/multitrack.c:7554
 msgid "_Event Window (selected time only)"
 msgstr ""
 
-#: src/multitrack.c:7382
+#: src/multitrack.c:7558
 msgid "_Show FRAME events"
 msgstr ""
 
-#: src/multitrack.c:7399
+#: src/multitrack.c:7575
 msgid "_Show multitrack keys"
 msgstr ""
 
-#: src/multitrack.c:7468
+#: src/multitrack.c:7644
 msgid "Mouse mode: _Move"
 msgstr ""
 
-#: src/multitrack.c:7476
+#: src/multitrack.c:7652
 msgid "Mouse mode: _Select"
 msgstr ""
 
-#: src/multitrack.c:7505
+#: src/multitrack.c:7681
 msgid "Insert mode: _Normal"
 msgstr ""
 
-#: src/multitrack.c:7733
+#: src/multitrack.c:7909
 msgid "Insert with _audio"
 msgstr ""
 
-#: src/multitrack.c:7734
+#: src/multitrack.c:7910
 msgid ""
 "Select whether video clips are inserted and moved with their audio or not"
 msgstr ""
 
-#: src/multitrack.c:7829
+#: src/multitrack.c:8007
 msgid "Select _overlap"
 msgstr ""
 
-#: src/multitrack.c:7830
+#: src/multitrack.c:8008
 msgid ""
 "Select whether timeline selection snaps to overlap between selected tracks "
 "or not"
 msgstr ""
 
-#: src/multitrack.c:7894 src/multitrack.c:14198
+#: src/multitrack.c:8073 src/multitrack.c:14422
 msgid "Expanded View (d)"
 msgstr ""
 
-#: src/multitrack.c:7897 src/multitrack.c:14205
+#: src/multitrack.c:8076 src/multitrack.c:14428
 msgid "Compact View (d)"
 msgstr ""
 
-#: src/multitrack.c:7939
+#: src/multitrack.c:8118
 msgid "Gravity: _Normal"
 msgstr ""
 
-#: src/multitrack.c:7952
+#: src/multitrack.c:8131
 msgid "Gravity: _Left"
 msgstr ""
 
-#: src/multitrack.c:7967
+#: src/multitrack.c:8146
 msgid "Gravity: _Right"
 msgstr ""
 
-#: src/multitrack.c:8297
+#: src/multitrack.c:8496
 msgid "_Apply"
 msgstr "_Aplicar"
 
-#: src/multitrack.c:8319
+#: src/multitrack.c:8518
 msgid "Time"
 msgstr ""
 
-#: src/multitrack.c:8333
+#: src/multitrack.c:8532
 msgid "_Del. node"
 msgstr ""
 
-#: src/multitrack.c:8341
+#: src/multitrack.c:8540
 msgid "_Next node"
 msgstr ""
 
-#: src/multitrack.c:8349
+#: src/multitrack.c:8548
 msgid "_Prev node"
 msgstr ""
 
-#: src/multitrack.c:8373
+#: src/multitrack.c:8574
 msgid "_Reverse playback  "
 msgstr ""
 
-#: src/multitrack.c:8395
+#: src/multitrack.c:8596
 msgid "_Velocity  "
 msgstr ""
 
-#: src/multitrack.c:8464
+#: src/multitrack.c:8664
 msgid "Anchor _start"
 msgstr ""
 
-#: src/multitrack.c:8465
+#: src/multitrack.c:8665
 msgid "Anchor the start point to the timeline"
 msgstr ""
 
-#: src/multitrack.c:8481
-msgid "Start frame"
-msgstr "Empezar en el fotograma"
-
-#: src/multitrack.c:8533
+#: src/multitrack.c:8728
 msgid "Anchor _end"
 msgstr ""
 
-#: src/multitrack.c:8534
+#: src/multitrack.c:8729
 msgid "Anchor the end point to the timeline"
 msgstr ""
 
-#: src/multitrack.c:8546
-msgid "End frame"
-msgstr "Terminar en el fotograma"
-
-#: src/multitrack.c:8739
+#: src/multitrack.c:8929
 msgid "Scroll"
 msgstr "Desplazador"
 
-#: src/multitrack.c:9316
+#: src/multitrack.c:9502
 msgid ""
 "\n"
 "==============================\n"
 "Switched to Clip Edit mode\n"
 msgstr ""
 
-#: src/multitrack.c:9502
+#: src/multitrack.c:9708
 msgid "Timeline (seconds)"
 msgstr ""
 
-#: src/multitrack.c:9984
+#: src/multitrack.c:10202
 msgid " Backing audio"
 msgstr ""
 
-#: src/multitrack.c:9987
+#: src/multitrack.c:10204
 #, c-format
 msgid " Layer %d audio"
 msgstr ""
 
-#: src/multitrack.c:9995
+#: src/multitrack.c:10212
 msgid "Show/hide audio details"
 msgstr ""
 
-#: src/multitrack.c:10010 src/multitrack.c:10232
+#: src/multitrack.c:10227 src/multitrack.c:10452
 #, c-format
 msgid "Layer %d audio"
 msgstr ""
 
-#: src/multitrack.c:10144 src/multitrack.c:10261
+#: src/multitrack.c:10353 src/multitrack.c:10481
 #, c-format
 msgid "%s (layer %d)"
 msgstr ""
 
-#: src/multitrack.c:10184
+#: src/multitrack.c:10403
 msgid "Select track"
 msgstr ""
 
-#: src/multitrack.c:10188
+#: src/multitrack.c:10407
 msgid "Show/hide audio"
 msgstr ""
 
-#: src/multitrack.c:10194
+#: src/multitrack.c:10413
 #, c-format
 msgid "Video %d"
 msgstr ""
 
-#: src/multitrack.c:10233
+#: src/multitrack.c:10453
 #, c-format
 msgid " %s"
 msgstr " %s"
 
-#: src/multitrack.c:10346
+#: src/multitrack.c:10574
 msgid "LiVES: Selected effect"
 msgstr ""
 
-#: src/multitrack.c:10358
+#: src/multitrack.c:10586
 msgid "_View/Edit this effect"
 msgstr ""
 
-#: src/multitrack.c:10361
+#: src/multitrack.c:10588
 msgid "_View this effect"
 msgstr ""
 
-#: src/multitrack.c:10369
+#: src/multitrack.c:10596
 msgid "_Delete this effect"
 msgstr ""
 
-#: src/multitrack.c:10422
+#: src/multitrack.c:10648
 msgid "Cannot insert after this effect"
 msgstr ""
 
-#: src/multitrack.c:10451
+#: src/multitrack.c:10677
 msgid "This effect cannot be moved"
 msgstr ""
 
-#: src/multitrack.c:10499
+#: src/multitrack.c:10724
 #, c-format
 msgid "  %d to %d selected  "
 msgstr ""
 
-#: src/multitrack.c:10502 src/multitrack.c:10746
+#: src/multitrack.c:10727 src/multitrack.c:10968
 #, c-format
 msgid "%.2f sec."
 msgstr ""
 
-#: src/multitrack.c:10717
+#: src/multitrack.c:10940
 #, c-format
 msgid "%d frames"
 msgstr "%d cuadros"
 
-#: src/multitrack.c:11070
+#: src/multitrack.c:11299
 msgid ""
 "\n"
 "==============================\n"
 "Switched to Multitrack mode\n"
 msgstr ""
 
-#: src/multitrack.c:12691
+#: src/multitrack.c:12939
 msgid "Drag the time slider to where you"
 msgstr ""
 
-#: src/multitrack.c:12692
+#: src/multitrack.c:12940
 msgid "want to set effect parameters"
 msgstr ""
 
-#: src/multitrack.c:12693
+#: src/multitrack.c:12941
 msgid "Set parameters, then click \"Apply\"\n"
 msgstr ""
 
-#: src/multitrack.c:12694
+#: src/multitrack.c:12942
 msgid ""
 "NODES are points where parameters\n"
 "have been set.\n"
 "Nodes can be deleted."
 msgstr ""
 
-#: src/multitrack.c:12697
+#: src/multitrack.c:12944
 msgid "Effect has no parameters.\n"
 msgstr ""
 
-#: src/multitrack.c:12788
+#: src/multitrack.c:13033
 #, c-format
 msgid "%s output"
 msgstr ""
 
-#: src/multitrack.c:12794 src/multitrack.c:12804
+#: src/multitrack.c:13038 src/multitrack.c:13046
 #, c-format
 msgid "layer %d"
 msgstr ""
 
-#: src/multitrack.c:12796 src/multitrack.c:12806
+#: src/multitrack.c:13039 src/multitrack.c:13047
 msgid "audio track"
 msgstr ""
 
-#: src/multitrack.c:12797
+#: src/multitrack.c:13040
 #, c-format
 msgid "%s to %s"
 msgstr "%s a %s"
 
-#: src/multitrack.c:12807
+#: src/multitrack.c:13048
 #, c-format
 msgid "%s from %s"
 msgstr ""
 
-#: src/multitrack.c:12860
+#: src/multitrack.c:13099
 msgid "_Prev filter map"
 msgstr ""
 
-#: src/multitrack.c:12871
+#: src/multitrack.c:13110
 msgid "Insert _before"
 msgstr ""
 
-#: src/multitrack.c:12881
+#: src/multitrack.c:13120
 msgid "Insert _after"
 msgstr ""
 
-#: src/multitrack.c:12896
+#: src/multitrack.c:13134
 msgid "_Next filter map"
 msgstr ""
 
-#: src/multitrack.c:12911
+#: src/multitrack.c:13148
 msgid ""
 "\n"
 "\n"
@@ -9464,271 +9470,271 @@
 "current time.\n"
 msgstr ""
 
-#: src/multitrack.c:12929
+#: src/multitrack.c:13166
 msgid ""
 "Drag a compositor anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:12936
+#: src/multitrack.c:13173
 msgid ""
 "Drag a transition anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:12944
+#: src/multitrack.c:13181
 msgid ""
 "Effects can be dragged\n"
 "onto blocks on the timeline."
 msgstr ""
 
-#: src/multitrack.c:13166
+#: src/multitrack.c:13406
 msgid "LiVES: Selected block/frame"
 msgstr ""
 
-#: src/multitrack.c:13173
+#: src/multitrack.c:13413
 msgid "_Select this block"
 msgstr ""
 
-#: src/multitrack.c:13183
+#: src/multitrack.c:13423
 msgid "_Split block here"
 msgstr ""
 
-#: src/multitrack.c:13191
+#: src/multitrack.c:13431
 msgid "List _effects here"
 msgstr ""
 
-#: src/multitrack.c:13200 src/multitrack.c:13277
+#: src/multitrack.c:13440 src/multitrack.c:13518
 #, c-format
 msgid "_Adjust %s"
 msgstr ""
 
-#: src/multitrack.c:13215
+#: src/multitrack.c:13455
 msgid "_Delete this block"
 msgstr ""
 
-#: src/multitrack.c:13258
+#: src/multitrack.c:13500
 msgid "_Insert here"
 msgstr ""
 
-#: src/multitrack.c:13264
+#: src/multitrack.c:13505
 msgid "_Insert audio here"
 msgstr ""
 
-#: src/multitrack.c:14801
+#: src/multitrack.c:15017
 #, c-format
 msgid "Inserted gap in selected tracks from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:14835
+#: src/multitrack.c:15048
 #, c-format
 msgid "Inserted gap in track %s from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15036
+#: src/multitrack.c:15244
 #, c-format
 msgid "Undid %s\n"
 msgstr ""
 
-#: src/multitrack.c:15235
+#: src/multitrack.c:15445
 #, c-format
 msgid "Redid %s\n"
 msgstr ""
 
-#: src/multitrack.c:15268
+#: src/multitrack.c:15475
 msgid ""
 "\n"
 " (variable)"
 msgstr ""
 
-#: src/multitrack.c:15502 src/multitrack.c:15614 src/multitrack.c:18736
-#: src/multitrack.c:18748
+#: src/multitrack.c:15710 src/multitrack.c:15823 src/multitrack.c:19077
+#: src/multitrack.c:19089
 #, c-format
 msgid "track %s"
 msgstr ""
 
-#: src/multitrack.c:15507 src/multitrack.c:15619 src/multitrack.c:18741
+#: src/multitrack.c:15715 src/multitrack.c:15828 src/multitrack.c:19082
 #, c-format
 msgid "tracks %s and %s"
 msgstr ""
 
-#: src/multitrack.c:15513 src/multitrack.c:15625 src/multitrack.c:18751
+#: src/multitrack.c:15721 src/multitrack.c:15834 src/multitrack.c:19091
 msgid "selected tracks"
 msgstr ""
 
-#: src/multitrack.c:15516
+#: src/multitrack.c:15726
 #, c-format
 msgid "Added %s %s to %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15550
+#: src/multitrack.c:15760
 #, c-format
 msgid "Added effect %s to track %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15631
+#: src/multitrack.c:15845
 #, c-format
 msgid "Deleted %s %s from %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15935
+#: src/multitrack.c:16143
 #, c-format
 msgid "rendered %d frames to new clip.\n"
 msgstr ""
 
-#: src/multitrack.c:16025
+#: src/multitrack.c:16230
 msgid "Cleaning up..."
 msgstr ""
 
-#: src/multitrack.c:16712
+#: src/multitrack.c:17003
 msgid "_Pause"
 msgstr "_Pausar"
 
-#: src/multitrack.c:16713
+#: src/multitrack.c:17004
 msgid "Pause (p)"
 msgstr ""
 
-#: src/multitrack.c:16856
+#: src/multitrack.c:17151
 msgid "Press 'm' during playback"
 msgstr ""
 
-#: src/multitrack.c:16857
+#: src/multitrack.c:17152
 msgid "to make a mark on the timeline"
 msgstr ""
 
-#: src/multitrack.c:17154
+#: src/multitrack.c:17498
 #, c-format
 msgid ""
 "Inserted audio %.4f to %.4f from clip %s into backing audio from time %.4f "
 "to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:17414
+#: src/multitrack.c:17759
 #, c-format
 msgid ""
 "Inserted frames %d to %d from clip %s into track %s from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:17998
+#: src/multitrack.c:18332
 #, c-format
 msgid ""
 "Time region %.3f to %.3f\n"
 "selected.\n"
 msgstr ""
 
-#: src/multitrack.c:18002
+#: src/multitrack.c:18336
 msgid ""
 "select one or more tracks\n"
 "to create a region.\n"
 msgstr ""
 
-#: src/multitrack.c:18004
+#: src/multitrack.c:18337
 #, c-format
 msgid "%d video tracks selected.\n"
 msgstr ""
 
-#: src/multitrack.c:18006
+#: src/multitrack.c:18339
 msgid ""
 "Double click on timeline\n"
 "to deselect time region."
 msgstr ""
 
-#: src/multitrack.c:18013
+#: src/multitrack.c:18346
 msgid ""
 "Single click on an effect\n"
 "to select it."
 msgstr ""
 
-#: src/multitrack.c:18014
+#: src/multitrack.c:18347
 msgid ""
 "Double click on an effect\n"
 "to edit it."
 msgstr ""
 
-#: src/multitrack.c:18015
+#: src/multitrack.c:18348
 msgid ""
 "Right click on an effect\n"
 "for context menu.\n"
 msgstr ""
 
-#: src/multitrack.c:18017
+#: src/multitrack.c:18350
 msgid ""
 "Effect order can be changed at\n"
 "FILTER MAPS"
 msgstr ""
 
-#: src/multitrack.c:18024
+#: src/multitrack.c:18357
 msgid ""
 "You can select an effect,\n"
 "then use the INSERT BEFORE"
 msgstr ""
 
-#: src/multitrack.c:18025
+#: src/multitrack.c:18358
 msgid "or INSERT AFTER buttons to move it."
 msgstr "o INSERTAR DESPUÉS para moverlo"
 
-#: src/multitrack.c:18307 src/multitrack.c:18320
+#: src/multitrack.c:18639 src/multitrack.c:18652
 msgid "Click on another effect,"
 msgstr ""
 
-#: src/multitrack.c:18308 src/multitrack.c:18321
+#: src/multitrack.c:18640 src/multitrack.c:18653
 msgid ""
 "and the selected one\n"
 "will be inserted"
 msgstr ""
 
-#: src/multitrack.c:18309
+#: src/multitrack.c:18641
 msgid "after it.\n"
 msgstr "después de él\n"
 
-#: src/multitrack.c:18322
+#: src/multitrack.c:18654
 msgid "before it.\n"
 msgstr "antes de él\n"
 
-#: src/multitrack.c:18551
+#: src/multitrack.c:18889
 #, c-format
 msgid "Removed parameter values for effect %s at time %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:18759
+#: src/multitrack.c:19100
 #, c-format
 msgid "Set parameter values for %s %s on %s at time %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:19251 src/multitrack.c:20873
+#: src/multitrack.c:19630 src/multitrack.c:21195
 msgid "_Autoreload each time"
 msgstr "_Autocargar cada vez"
 
-#: src/multitrack.c:19323
+#: src/multitrack.c:19702
 msgid "Saving layout"
 msgstr ""
 
-#: src/multitrack.c:19345
+#: src/multitrack.c:19725
 #, c-format
 msgid "Saved layout to %s\n"
 msgstr ""
 
-#: src/multitrack.c:20783
+#: src/multitrack.c:21125
 msgid "clips and frames"
 msgstr ""
 
-#: src/multitrack.c:20787
+#: src/multitrack.c:21128
 msgid "clips"
 msgstr ""
 
-#: src/multitrack.c:20790
+#: src/multitrack.c:21130
 msgid "frames"
 msgstr "fotogramas"
 
-#: src/multitrack.c:20800
+#: src/multitrack.c:21140
 msgid ""
 "\n"
 "Auto reload layout.\n"
 msgstr ""
 
-#: src/multitrack.c:20803
+#: src/multitrack.c:21143
 #, c-format
 msgid ""
 "%s\n"
@@ -9736,100 +9742,100 @@
 "Therefore it could not be loaded properly.\n"
 msgstr ""
 
-#: src/multitrack.c:20920
+#: src/multitrack.c:21284
 msgid "auto backup"
 msgstr ""
 
-#: src/multitrack.c:20923
+#: src/multitrack.c:21287
 #, c-format
 msgid ""
 "\n"
 "Unable to load layout file %s\n"
 msgstr ""
 
-#: src/multitrack.c:20944
+#: src/multitrack.c:21308
 #, c-format
 msgid "Loading layout from %s..."
 msgstr "Cargando disposición desde %s..."
 
-#: src/multitrack.c:20978
+#: src/multitrack.c:21338
 #, c-format
 msgid "Got %d events...processing..."
 msgstr ""
 
-#: src/multitrack.c:20991
+#: src/multitrack.c:21349
 msgid "Checking and rebuilding event list"
 msgstr ""
 
-#: src/multitrack.c:21017
+#: src/multitrack.c:21374
 #, c-format
 msgid "%d errors detected.\n"
 msgstr "%d errores detectados.\n"
 
-#: src/multitrack.c:21068
+#: src/multitrack.c:21422
 #, c-format
 msgid "Multitrack fps set to %.3f\n"
 msgstr ""
 
-#: src/multitrack.c:21225
+#: src/multitrack.c:21576
 msgid ""
 "The current layout has changes which have not been saved.\n"
 "Are you sure you wish to wipe it ?\n"
 msgstr ""
 
-#: src/multitrack.c:22047
+#: src/multitrack.c:22385
 msgid "LiVES: Multitrack audio mixer"
 msgstr "LiVES: Mezclador de audio multipista"
 
-#: src/multitrack.c:22077
+#: src/multitrack.c:22414
 msgid "_Reset values"
 msgstr "_Restablecer valores"
 
-#: src/multitrack.c:22081
+#: src/multitrack.c:22418
 msgid "_Close mixer"
 msgstr ""
 
-#: src/multitrack.c:22130
+#: src/multitrack.c:22466
 msgid ""
 "_Invert backing audio\n"
 "and layer volumes"
 msgstr ""
 
-#: src/multitrack.c:22132
+#: src/multitrack.c:22468
 msgid "Adjust backing and layer audio values so that they sum to 1.0"
 msgstr ""
 
-#: src/multitrack.c:22175
+#: src/multitrack.c:22510
 msgid "_Gang layer audio"
 msgstr ""
 
-#: src/multitrack.c:22177
+#: src/multitrack.c:22512
 msgid "Adjust all layer audio values to the same value"
 msgstr "Ajustar todas las capas de valores de sonido al mismo valor"
 
-#: src/jack.c:104
+#: src/jack.c:102
 msgid "JACK server started\n"
 msgstr "Servidor JACK iniciado\n"
 
-#: src/jack.c:1284 src/jack.c:1353
+#: src/jack.c:1265 src/jack.c:1334
 msgid "Unable to connect to JACK server\n"
 msgstr "Imposible conectar al servidor JACK\n"
 
-#: src/jack.c:1512
+#: src/jack.c:1491
 msgid "Started jack audio subsystem.\n"
 msgstr ""
 
-#: src/jack.c:1623
+#: src/jack.c:1600
 msgid "Started jack audio reader.\n"
 msgstr ""
 
-#: src/jack.c:1838
+#: src/jack.c:1815
 msgid ""
 "\n"
 "Connection to jack audio was reset.\n"
 msgstr ""
 
-#: src/pulse.c:87
+#: src/pulse.c:88
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -9837,7 +9843,7 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:92
+#: src/pulse.c:94
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -9845,7 +9851,7 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:96
+#: src/pulse.c:99
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -9853,335 +9859,335 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:101
+#: src/pulse.c:104
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
 msgstr ""
 
-#: src/pulse.c:107
+#: src/pulse.c:109
 msgid "LiVES will exit and you can choose another audio player.\n"
 msgstr ""
 
-#: src/pulse.c:1352
+#: src/pulse.c:1335
 msgid ""
 "\n"
 "Connection to pulse audio was reset.\n"
 msgstr ""
 
-#: src/colourspace.c:1100
+#: src/colourspace.c:1092
 msgid "unclamped"
 msgstr ""
 
-#: src/colourspace.c:1101
+#: src/colourspace.c:1093
 msgid "clamped"
 msgstr ""
 
-#: src/omc-learn.c:195
+#: src/omc-learn.c:191
 #, c-format
 msgid "Responding to joystick events from %s\n"
 msgstr ""
 
-#: src/omc-learn.c:289
+#: src/omc-learn.c:279
 msgid "Creating ALSA seq port..."
 msgstr ""
 
-#: src/omc-learn.c:325
+#: src/omc-learn.c:313
 #, c-format
 msgid "Responding to MIDI events from %s\n"
 msgstr ""
 
-#: src/omc-learn.c:568
+#: src/omc-learn.c:554
 msgid "data"
 msgstr "datos"
 
-#: src/omc-learn.c:571
+#: src/omc-learn.c:557
 msgid "velocity"
 msgstr "velocidad"
 
-#: src/omc-learn.c:572
+#: src/omc-learn.c:558
 msgid "note"
 msgstr "nota"
 
-#: src/omc-learn.c:574 src/omc-learn.c:736 src/omc-learn.c:1105
-#: src/omc-learn.c:1591 src/omc-learn.c:1640
+#: src/omc-learn.c:560 src/omc-learn.c:724 src/omc-learn.c:1092
+#: src/omc-learn.c:1581 src/omc-learn.c:1630
 msgid "value"
 msgstr "valor"
 
-#: src/omc-learn.c:576
+#: src/omc-learn.c:562
 msgid "state"
 msgstr "estado"
 
-#: src/omc-learn.c:688
+#: src/omc-learn.c:674
 msgid "variable"
 msgstr "variable"
 
-#: src/omc-learn.c:1001
+#: src/omc-learn.c:989
 msgid "Vars."
 msgstr "Var."
 
-#: src/omc-learn.c:1054
+#: src/omc-learn.c:1041
 #, c-format
 msgid "MIDI ch %d note on"
 msgstr ""
 
-#: src/omc-learn.c:1058
+#: src/omc-learn.c:1045
 #, c-format
 msgid "MIDI ch %d note off"
 msgstr ""
 
-#: src/omc-learn.c:1062
+#: src/omc-learn.c:1049
 #, c-format
 msgid "MIDI ch %d controller %d"
 msgstr ""
 
-#: src/omc-learn.c:1066
+#: src/omc-learn.c:1053
 #, c-format
 msgid "MIDI ch %d pitch bend"
 msgstr ""
 
-#: src/omc-learn.c:1070
+#: src/omc-learn.c:1057
 #, c-format
 msgid "MIDI ch %d pgm change"
 msgstr ""
 
-#: src/omc-learn.c:1073
+#: src/omc-learn.c:1060
 #, c-format
 msgid "Joystick button %d"
 msgstr ""
 
-#: src/omc-learn.c:1076
+#: src/omc-learn.c:1063
 #, c-format
 msgid "Joystick axis %d"
 msgstr ""
 
-#: src/omc-learn.c:1113
+#: src/omc-learn.c:1100
 msgid "x"
 msgstr "x"
 
-#: src/omc-learn.c:1122
+#: src/omc-learn.c:1109
 msgid "range"
 msgstr "intervalo"
 
-#: src/omc-learn.c:1143
+#: src/omc-learn.c:1130
 msgid "+ offset1"
 msgstr ""
 
-#: src/omc-learn.c:1161
+#: src/omc-learn.c:1150
 msgid "* scale"
 msgstr ""
 
-#: src/omc-learn.c:1179
+#: src/omc-learn.c:1170
 msgid "+ offset2"
 msgstr ""
 
-#: src/omc-learn.c:1280
+#: src/omc-learn.c:1270
 msgid ""
 "\n"
 "Click OK to delete all entries\n"
 msgstr ""
 
-#: src/omc-learn.c:1318
+#: src/omc-learn.c:1308
 msgid "LiVES: OMC learner"
 msgstr ""
 
-#: src/omc-learn.c:1334
+#: src/omc-learn.c:1324
 msgid "Clear _unmatched"
 msgstr ""
 
-#: src/omc-learn.c:1345
+#: src/omc-learn.c:1335
 msgid "_Delete all"
 msgstr "_Borrar todo"
 
-#: src/omc-learn.c:1411
+#: src/omc-learn.c:1401
 msgid "Start video playback"
 msgstr ""
 
-#: src/omc-learn.c:1414
+#: src/omc-learn.c:1404
 msgid "Stop video playback"
 msgstr ""
 
-#: src/omc-learn.c:1418
+#: src/omc-learn.c:1408
 msgid "Clip select <clipnum>"
 msgstr ""
 
-#: src/omc-learn.c:1419
+#: src/omc-learn.c:1409
 msgid "Switch foreground clip to the nth valid clip"
 msgstr ""
 
-#: src/omc-learn.c:1423
+#: src/omc-learn.c:1413
 msgid "Play forwards"
 msgstr ""
 
-#: src/omc-learn.c:1424
+#: src/omc-learn.c:1414
 msgid "Play video in a forwards direction"
 msgstr ""
 
-#: src/omc-learn.c:1427
+#: src/omc-learn.c:1417
 msgid "Play backwards"
 msgstr ""
 
-#: src/omc-learn.c:1428
+#: src/omc-learn.c:1418
 msgid "Play video in a backwards direction"
 msgstr ""
 
-#: src/omc-learn.c:1431
+#: src/omc-learn.c:1421
 msgid "Reverse playback direction"
 msgstr ""
 
-#: src/omc-learn.c:1432
+#: src/omc-learn.c:1422
 msgid "Reverse direction of video playback"
 msgstr ""
 
-#: src/omc-learn.c:1435
+#: src/omc-learn.c:1425
 msgid "Play video faster"
 msgstr "Reproducir vídeo rápido"
 
-#: src/omc-learn.c:1436
+#: src/omc-learn.c:1426
 msgid "Play video at a slightly faster rate"
 msgstr ""
 
-#: src/omc-learn.c:1439
+#: src/omc-learn.c:1429
 msgid "Play video slower"
 msgstr "Reproducir vídeo lento"
 
-#: src/omc-learn.c:1440
+#: src/omc-learn.c:1430
 msgid "Play video at a slightly slower rate"
 msgstr ""
 
-#: src/omc-learn.c:1443
+#: src/omc-learn.c:1433
 msgid "Toggle video freeze"
 msgstr ""
 
-#: src/omc-learn.c:1444
+#: src/omc-learn.c:1434
 msgid "Freeze video, or if already frozen, unfreeze it"
 msgstr ""
 
-#: src/omc-learn.c:1447
+#: src/omc-learn.c:1437
 msgid "Set video framerate to <fps>"
 msgstr ""
 
-#: src/omc-learn.c:1448
+#: src/omc-learn.c:1438
 msgid "Set framerate of foreground clip to <float fps>"
 msgstr ""
 
-#: src/omc-learn.c:1452
+#: src/omc-learn.c:1442
 msgid "Start recording"
 msgstr "Iniciar grabación"
 
-#: src/omc-learn.c:1455
+#: src/omc-learn.c:1445
 msgid "Stop recording"
 msgstr "Detener la grabación"
 
-#: src/omc-learn.c:1458
+#: src/omc-learn.c:1448
 msgid "Toggle recording state"
 msgstr ""
 
-#: src/omc-learn.c:1461
+#: src/omc-learn.c:1451
 msgid "Swap foreground and background clips"
 msgstr ""
 
-#: src/omc-learn.c:1463
+#: src/omc-learn.c:1453
 msgid "Reset effect keys"
 msgstr ""
 
-#: src/omc-learn.c:1464
+#: src/omc-learn.c:1454
 msgid "Switch all effects off."
 msgstr ""
 
-#: src/omc-learn.c:1467
+#: src/omc-learn.c:1457
 msgid "Enable effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1471
+#: src/omc-learn.c:1461
 msgid "Disable effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1475
+#: src/omc-learn.c:1465
 msgid "Toggle effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1479
+#: src/omc-learn.c:1469
 msgid "Set parameter value <key> <pnum> = <value>"
 msgstr ""
 
-#: src/omc-learn.c:1480
+#: src/omc-learn.c:1470
 msgid "Set <value> of pth (numerical) parameter for effect key <key>."
 msgstr ""
 
-#: src/omc-learn.c:1484
+#: src/omc-learn.c:1474
 msgid "Switch foreground to next clip"
 msgstr ""
 
-#: src/omc-learn.c:1487
+#: src/omc-learn.c:1477
 msgid "Switch foreground to previous clip"
 msgstr ""
 
-#: src/omc-learn.c:1490
+#: src/omc-learn.c:1480
 msgid "Set video framerate to ratio <fps_ratio>"
 msgstr ""
 
-#: src/omc-learn.c:1491
+#: src/omc-learn.c:1481
 msgid "Set framerate ratio of foreground clip to <float fps_ratio>"
 msgstr ""
 
-#: src/omc-learn.c:1495
+#: src/omc-learn.c:1485
 msgid "Retrigger clip <clipnum>"
 msgstr ""
 
-#: src/omc-learn.c:1496
+#: src/omc-learn.c:1486
 msgid ""
 "Switch foreground clip to the nth valid clip, and reset the frame number"
 msgstr ""
 
-#: src/omc-learn.c:1500
+#: src/omc-learn.c:1490
 msgid "Cycle to next mode for effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1504
+#: src/omc-learn.c:1494
 msgid "Cycle to previous mode for effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1508
+#: src/omc-learn.c:1498
 msgid "Set playback plugin parameter value <pnum> = <value>"
 msgstr ""
 
-#: src/omc-learn.c:1509
+#: src/omc-learn.c:1499
 msgid "Set <value> of pth parameter for the playback plugin."
 msgstr ""
 
 #. TRANSLATORS: short form of "clip number"
-#: src/omc-learn.c:1536 src/omc-learn.c:1607
+#: src/omc-learn.c:1526 src/omc-learn.c:1597
 msgid "clipnum"
 msgstr ""
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1545
+#: src/omc-learn.c:1535
 msgid "fps"
 msgstr "fps"
 
 #. TRANSLATORS: as in keyboard key
-#: src/omc-learn.c:1553 src/omc-learn.c:1560 src/omc-learn.c:1567
-#: src/omc-learn.c:1575 src/omc-learn.c:1615 src/omc-learn.c:1623
+#: src/omc-learn.c:1543 src/omc-learn.c:1550 src/omc-learn.c:1557
+#: src/omc-learn.c:1565 src/omc-learn.c:1605 src/omc-learn.c:1613
 msgid "key"
 msgstr "clave"
 
 #. TRANSLATORS: short form of "parameter number"
-#: src/omc-learn.c:1583 src/omc-learn.c:1632
+#: src/omc-learn.c:1573 src/omc-learn.c:1622
 msgid "pnum"
 msgstr "pnum"
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1599
+#: src/omc-learn.c:1589
 msgid "fps_ratio"
 msgstr "fps_ratio"
 
-#: src/omc-learn.c:2443
+#: src/omc-learn.c:2417
 #, c-format
 msgid "Saving device mapping to file %s..."
 msgstr ""
 
-#: src/omc-learn.c:2527
+#: src/omc-learn.c:2498
 #, c-format
 msgid ""
 "\n"
@@ -10190,7 +10196,7 @@
 "%s\n"
 msgstr ""
 
-#: src/omc-learn.c:2534
+#: src/omc-learn.c:2505
 #, c-format
 msgid ""
 "\n"
@@ -10199,12 +10205,12 @@
 "%s\n"
 msgstr ""
 
-#: src/omc-learn.c:2571
+#: src/omc-learn.c:2541
 #, c-format
 msgid "Loading device mapping from file %s..."
 msgstr ""
 
-#: src/omc-learn.c:2576
+#: src/omc-learn.c:2544
 #, c-format
 msgid ""
 "\n"
@@ -10214,12 +10220,12 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/videodev.c:547
+#: src/videodev.c:539
 #, c-format
 msgid "Unable to open device %s\n"
 msgstr ""
 
-#: src/videodev.c:564
+#: src/videodev.c:554
 #, c-format
 msgid "Opened device %s\n"
 msgstr ""
@@ -10917,3 +10923,12 @@
 #, fuzzy
 #~ msgid "LiVES audio error."
 #~ msgstr "LiVES:- Audio Fade In"
+
+#~ msgid "Pause"
+#~ msgstr "Pausar"
+
+#~ msgid "Start frame"
+#~ msgstr "Empezar en el fotograma"
+
+#~ msgid "End frame"
+#~ msgstr "Terminar en el fotograma"

LiVES-2.2.8.tar.bz2/po/et.po -> LiVES-2.4.1.tar.bz2/po/et.po Changed

@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n"
-"POT-Creation-Date: 2015-02-08 17:18-0300\n"
+"POT-Creation-Date: 2015-08-09 14:52-0300\n"
 "PO-Revision-Date: 2013-03-14 12:31+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -18,8 +18,7 @@
 "X-Launchpad-Export-Date: 2013-03-28 10:42+0000\n"
 "X-Generator: Launchpad (build 16546)\n"
 
-#. TRANSLATORS: do not translate this message
-#: src/main.c:118
+#: src/main.c:128
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -28,22 +27,22 @@
 "http://lives.sourceforge.net/TRANS-README.txt"
 msgstr ""
 
-#: src/main.c:134
+#: src/main.c:153
 #, c-format
 msgid "%s Warning: %s\n"
 msgstr ""
 
-#: src/main.c:138
+#: src/main.c:157
 #, c-format
 msgid "%s Critical error: %s\n"
 msgstr ""
 
-#: src/main.c:139
+#: src/main.c:158
 #, c-format
 msgid "%s Fatal error: %s\n"
 msgstr ""
 
-#: src/main.c:176
+#: src/main.c:198
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -57,7 +56,7 @@
 "group_id=64341&atid=507139\n"
 "Aitäh. Peaks olema võimalik progress taastada LiVES-i taaskäivitusel.\n"
 
-#: src/main.c:177
+#: src/main.c:199
 msgid ""
 "\n"
 "\n"
@@ -69,7 +68,7 @@
 "Vigadest teatades, palun lisage infot oma operatsioonisüsteemist, jaotusest "
 "ja LiVES-i versioonist ("
 
-#: src/main.c:180
+#: src/main.c:203
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -77,7 +76,7 @@
 "ja mis tahes allpool esitatud teave:\n"
 "\n"
 
-#: src/main.c:184
+#: src/main.c:206
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
@@ -87,84 +86,84 @@
 "infot.\n"
 "\n"
 
-#: src/main.c:192
+#: src/main.c:216
 msgid "Preserving set.\n"
 msgstr "Valiku säilitamine.\n"
 
-#: src/main.c:636
+#: src/main.c:691
 msgid "Resizing"
 msgstr "Mõõtmete muutmine"
 
-#: src/main.c:643
+#: src/main.c:698
 msgid "_Resize All Frames"
 msgstr "_kõikide kaadrite suuruse muutmine"
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:895
+#: src/main.c:948
 msgid "Any"
 msgstr "Kõik"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:897
+#: src/main.c:950
 msgid "None"
 msgstr "Pole"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:899
+#: src/main.c:952
 msgid "recommended"
 msgstr "soovitatav"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:901
+#: src/main.c:954
 msgid "disabled !"
 msgstr "keelatud !"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:903
+#: src/main.c:956
 msgid "**The current layout**"
 msgstr "**Praegune skeem**"
 
 #. TRANSLATORS: adjective for "Built in" type effects
-#: src/main.c:905
+#: src/main.c:958
 msgid "Builtin"
 msgstr "Sisseehitatud"
 
 #. TRANSLATORS: adjective for "Custom" type effects
-#: src/main.c:907
+#: src/main.c:960
 msgid "Custom"
 msgstr "Kohandatud"
 
 #. TRANSLATORS: adjective for "Test" type effects
-#: src/main.c:909
+#: src/main.c:962
 msgid "Test"
 msgstr "Testi"
 
-#: src/main.c:1054
+#: src/main.c:1107
 msgid "Foreground"
 msgstr ""
 
-#: src/main.c:1055
+#: src/main.c:1108
 #, fuzzy
 msgid "Background"
 msgstr "_Alusta"
 
-#: src/main.c:1566
+#: src/main.c:1624
 msgid "Loading realtime effect plugins..."
 msgstr "Laen reaalaja efektide pluginaid..."
 
-#: src/main.c:1631
+#: src/main.c:1690
 msgid "Starting jack audio server..."
 msgstr "Heli serveri jack käivitamine..."
 
-#: src/main.c:1633
+#: src/main.c:1692
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1634
+#: src/main.c:1693
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1663
+#: src/main.c:1723
 #, c-format
 msgid ""
 "\n"
@@ -176,114 +175,114 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1697
+#: src/main.c:1758
 msgid "Starting pulse audio server..."
 msgstr "Heli serveri pulse käivitamine..."
 
-#: src/main.c:1765
+#: src/main.c:1825
 msgid "Checking optional dependencies:"
 msgstr ""
 
-#: src/main.c:1766
+#: src/main.c:1826
 msgid "mplayer...detected..."
 msgstr "mplayer...tuvastatud..."
 
-#: src/main.c:1767
+#: src/main.c:1827
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...ei tuvastatud..."
 
-#: src/main.c:1768
+#: src/main.c:1828
 #, fuzzy
 msgid "mplayer2...detected..."
 msgstr "mplayer...tuvastatud..."
 
-#: src/main.c:1769
+#: src/main.c:1829
 #, fuzzy
 msgid "mplayer2...NOT DETECTED..."
 msgstr "mplayer...ei tuvastatud..."
 
-#: src/main.c:1770
+#: src/main.c:1830
 msgid "convert...detected..."
 msgstr "konverdi...tuvastatud..."
 
-#: src/main.c:1771
+#: src/main.c:1831
 msgid "convert...NOT DETECTED..."
 msgstr "konversioon...ei tuvastatud..."
 
-#: src/main.c:1772
+#: src/main.c:1832
 msgid "composite...detected..."
 msgstr "komposiit...tuvastatud.."
 
-#: src/main.c:1773
+#: src/main.c:1833
 msgid "composite...NOT DETECTED..."
 msgstr "komposiit...ei tuvastatud..."
 
-#: src/main.c:1774
+#: src/main.c:1834
 msgid "sox...detected\n"
 msgstr "sox...tuvastatud\n"
 
-#: src/main.c:1775
+#: src/main.c:1835
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...ei tuvastatud\n"
 
-#: src/main.c:1776
+#: src/main.c:1836
 msgid "cdda2wav...detected..."
 msgstr ""
 
-#: src/main.c:1777
+#: src/main.c:1837
 msgid "cdda2wav...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1778
+#: src/main.c:1838
 msgid "jackd...detected..."
 msgstr ""
 
-#: src/main.c:1779
+#: src/main.c:1839
 msgid "jackd...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1780
+#: src/main.c:1840
 msgid "pulse audio...detected..."
 msgstr ""
 
-#: src/main.c:1781
+#: src/main.c:1841
 msgid "pulse audio...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1782
+#: src/main.c:1842
 msgid "python...detected..."
 msgstr ""
 
-#: src/main.c:1783
+#: src/main.c:1843
 msgid "python...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1784
+#: src/main.c:1844
 msgid "dvgrab...detected..."
 msgstr ""
 
-#: src/main.c:1785
+#: src/main.c:1845
 msgid "dvgrab...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1786
+#: src/main.c:1846
 msgid "xwininfo...detected..."
 msgstr ""
 
-#: src/main.c:1787
+#: src/main.c:1847
 msgid "xwininfo...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1793
+#: src/main.c:1853
 #, c-format
 msgid "Windows version %04X"
 msgstr ""
 
-#: src/main.c:1795
+#: src/main.c:1855
 msgid "UNKNOWN - please patch me !"
 msgstr ""
 
-#: src/main.c:1799
+#: src/main.c:1859
 #, c-format
 msgid ""
 "\n"
@@ -291,199 +290,204 @@
 "Window manager reports as \"%s\"; "
 msgstr ""
 
-#: src/main.c:1802
+#: src/main.c:1862
 #, c-format
 msgid "number of monitors detected: %d\n"
 msgstr ""
 
-#: src/main.c:1805
+#: src/main.c:1865
 #, c-format
 msgid "Number of CPUs detected: %d "
 msgstr ""
 
-#: src/main.c:1808 src/multitrack.c:4902
+#: src/main.c:1868 src/multitrack.c:5068
 msgid "little endian"
 msgstr ""
 
-#: src/main.c:1809 src/multitrack.c:4901
+#: src/main.c:1869 src/multitrack.c:5067
 msgid "big endian"
 msgstr ""
 
-#: src/main.c:1810
+#: src/main.c:1870
 #, c-format
 msgid "(%d bits, %s)\n"
 msgstr ""
 
-#: src/main.c:1814
+#: src/main.c:1874
 msgid "GUI type is: "
 msgstr ""
 
-#: src/main.c:1818
+#: src/main.c:1878
 #, c-format
 msgid "GTK+ version %d.%d.%d (compiled with %d.%d.%d)"
 msgstr ""
 
-#: src/main.c:1840
+#: src/main.c:1900
 msgid ", with cairo support"
 msgstr ""
 
-#: src/main.c:1847
+#: src/main.c:1907
 #, c-format
 msgid "Temp directory is %s\n"
 msgstr ""
 
-#: src/main.c:1851
+#: src/main.c:1911
 msgid ""
 "WARNING - this version of LiVES was compiled without either\n"
 "jack or pulse audio support.\n"
 "Many audio features will be unavailable.\n"
 msgstr ""
 
-#: src/main.c:1854
+#: src/main.c:1914
 msgid "Compiled with jack support, good !\n"
 msgstr ""
 
-#: src/main.c:1857
+#: src/main.c:1917
 msgid "Compiled with pulse audio support, wonderful !\n"
 msgstr ""
 
-#: src/main.c:1861
+#: src/main.c:1921
 #, c-format
 msgid ""
 "Welcome to LiVES version %s.\n"
 "\n"
 msgstr ""
 
-#: src/main.c:2306
+#: src/main.c:2380
 #, c-format
 msgid ""
 "\n"
 "Startup syntax is: %s [opts] [filename [start_time] [frames]]\n"
 msgstr ""
 
-#: src/main.c:2307
+#: src/main.c:2381
 msgid "Where: filename is the name of a media file or backup file.\n"
 msgstr ""
 
-#: src/main.c:2308
+#: src/main.c:2382
 msgid "start_time : filename start time in seconds\n"
 msgstr ""
 
-#: src/main.c:2309
+#: src/main.c:2383
 msgid "frames : maximum number of frames to open\n"
 msgstr ""
 
-#: src/main.c:2311
+#: src/main.c:2385
 msgid "opts can be:\n"
 msgstr ""
 
-#: src/main.c:2312
+#: src/main.c:2386
 msgid "-help            : show this help text and exit\n"
 msgstr ""
 
-#: src/main.c:2313
+#: src/main.c:2387
 msgid "-tmpdir <tempdir>: use alternate working directory (e.g /var/ramdisk)\n"
 msgstr ""
 
-#: src/main.c:2314
+#: src/main.c:2388
 msgid "-set <setname>   : autoload clip set setname\n"
 msgstr ""
 
-#: src/main.c:2315
+#: src/main.c:2389
 msgid "-noset           : do not load any set on startup\n"
 msgstr ""
 
-#: src/main.c:2316
+#: src/main.c:2390
 msgid "-norecover       : force no-loading of crash recovery\n"
 msgstr ""
 
-#: src/main.c:2317
+#: src/main.c:2391
 msgid "-recover         : force loading of crash recovery\n"
 msgstr ""
 
-#: src/main.c:2318
-msgid "-nothreaddialog  : doe nothing - retained for backwards compatibility\n"
+#: src/main.c:2392
+msgid ""
+"-nothreaddialog  : does nothing - retained for backwards compatibility\n"
 msgstr ""
 
-#: src/main.c:2319
+#: src/main.c:2393
 msgid "-nogui           : do not show the gui\n"
 msgstr ""
 
-#: src/main.c:2320
+#: src/main.c:2394
 msgid "-nosplash        : do not show the splash window\n"
 msgstr ""
 
-#: src/main.c:2321
+#: src/main.c:2395
 msgid "-noplaywin       : do not show the play window\n"
 msgstr ""
 
-#: src/main.c:2322
+#: src/main.c:2396
+msgid "-noninteractive  : disable menu interactivity\n"
+msgstr ""
+
+#: src/main.c:2397
 msgid "-startup-ce      : start in clip editor mode\n"
 msgstr ""
 
-#: src/main.c:2323
+#: src/main.c:2398
 msgid "-startup-mt      : start in multitrack mode\n"
 msgstr ""
 
-#: src/main.c:2324
+#: src/main.c:2399
 msgid ""
 "-fxmodesmax <n>  : allow <n> modes per effect key (minimum is 1, default is "
 "8)\n"
 msgstr ""
 
-#: src/main.c:2326
+#: src/main.c:2401
 msgid "-oscstart <port> : start OSC listener on UDP port <port>\n"
 msgstr ""
 
-#: src/main.c:2327
+#: src/main.c:2402
 msgid "-nooscstart      : do not start OSC listener\n"
 msgstr ""
 
-#: src/main.c:2329
+#: src/main.c:2404
 msgid ""
 "-aplayer <ap>    : start with selected audio player. <ap> can be mplayer, "
 "mplayer2"
 msgstr ""
 
 #. TRANSLATORS: pulse (audio)
-#: src/main.c:2332
+#: src/main.c:2407
 msgid ", pulse"
 msgstr ""
 
-#: src/main.c:2335
+#: src/main.c:2410
 msgid ", sox or jack\n"
 msgstr ""
 
-#: src/main.c:2336
+#: src/main.c:2412
 msgid ""
 "-jackopts <opts>    : opts is a bitmap of jack startup options [1 = jack "
 "transport client, 2 = jack transport master, 4 = start jack transport "
 "server, 8 = pause audio when video paused, 16 = start jack audio server] \n"
 msgstr ""
 
-#: src/main.c:2338
+#: src/main.c:2414
 msgid " or sox\n"
 msgstr ""
 
-#: src/main.c:2340
+#: src/main.c:2416
 msgid "-devicemap <mapname>          : autoload devicemap\n"
 msgstr ""
 
-#: src/main.c:2341
+#: src/main.c:2418
 msgid ""
 "-vppdefaults <file>          : load video playback plugin defaults from "
 "<file> (Note: only sets the settings, not the plugin type)\n"
 msgstr ""
 
-#: src/main.c:2342
+#: src/main.c:2419
 msgid "-debug            : try to debug crashes (requires 'gdb' installed)\n"
 msgstr ""
 
-#: src/main.c:2373 src/gui.c:1128
+#: src/main.c:2449 src/gui.c:1127
 msgid "Starting GUI..."
 msgstr ""
 
-#: src/main.c:2396
+#: src/main.c:2475
 #, c-format
 msgid ""
 "\n"
@@ -494,7 +498,7 @@
 "(Maybe you need to change the value of <prefix_dir> in your %s file)\n"
 msgstr ""
 
-#: src/main.c:2410
+#: src/main.c:2492
 #, c-format
 msgid ""
 "\n"
@@ -502,7 +506,7 @@
 "Please make sure you have write access to %s and try again.\n"
 msgstr ""
 
-#: src/main.c:2415
+#: src/main.c:2498
 msgid ""
 "\n"
 "`smogrify` must be in your path, and be executable\n"
@@ -511,7 +515,7 @@
 "before running LiVES.\n"
 msgstr ""
 
-#: src/main.c:2421
+#: src/main.c:2504
 #, c-format
 msgid ""
 "\n"
@@ -521,7 +525,7 @@
 "Please check the file permissions for this file and try again.\n"
 msgstr ""
 
-#: src/main.c:2428
+#: src/main.c:2512
 #, c-format
 msgid ""
 "\n"
@@ -532,7 +536,7 @@
 "and try again.\n"
 msgstr ""
 
-#: src/main.c:2438
+#: src/main.c:2522
 #, c-format
 msgid ""
 "Please check the <tempdir> setting in \n"
@@ -540,7 +544,7 @@
 "and try again.\n"
 msgstr ""
 
-#: src/main.c:2445
+#: src/main.c:2528
 #, c-format
 msgid ""
 "\n"
@@ -550,7 +554,7 @@
 "%s"
 msgstr ""
 
-#: src/main.c:2453
+#: src/main.c:2536
 msgid ""
 "\n"
 "An incorrect version of smogrify was found in your path.\n"
@@ -561,49 +565,49 @@
 "Thankyou.\n"
 msgstr ""
 
-#: src/main.c:2458
+#: src/main.c:2541
 msgid ""
 "\n"
 "LiVES currently requires 'mplayer', 'mplayer2' or 'sox' to function. Please "
 "install one or other of these, and try again.\n"
 msgstr ""
 
-#: src/main.c:2462
+#: src/main.c:2546
 msgid ""
 "\n"
 "LiVES currently requires both 'mplayer' or 'mplayer2' and 'sox' to function. "
 "Please install these, and try again.\n"
 msgstr ""
 
-#: src/main.c:2472
+#: src/main.c:2556
 msgid ""
 "\n"
 "LiVES was unable to locate 'mplayer' or 'mplayer2'. You may wish to install "
 "either one to use LiVES more fully.\n"
 msgstr ""
 
-#: src/main.c:2475
+#: src/main.c:2561
 msgid ""
 "\n"
 "LiVES was unable to locate 'convert'. You should install convert and image-"
 "magick if you want to use rendered effects.\n"
 msgstr ""
 
-#: src/main.c:2478
+#: src/main.c:2566
 msgid ""
 "\n"
 "LiVES was unable to locate 'composite'. You should install composite and "
 "image-magick if you want to use the merge function.\n"
 msgstr ""
 
-#: src/main.c:2481
+#: src/main.c:2570
 msgid ""
 "\n"
 "LiVES was unable to locate 'sox'. Some audio features may not work. You "
 "should install 'sox'.\n"
 msgstr ""
 
-#: src/main.c:2484
+#: src/main.c:2575
 #, c-format
 msgid ""
 "\n"
@@ -614,93 +618,93 @@
 "You may need to change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/main.c:2611
+#: src/main.c:2707
 #, c-format
 msgid "Autoloading set %s..."
 msgstr ""
 
 #. TRANSLATORS: localised name may be used here
-#: src/main.c:2781 src/interface.c:738
+#: src/main.c:2902
 msgid "LiVES"
 msgstr ""
 
-#: src/main.c:2948
+#: src/main.c:3066
 #, c-format
 msgid "Invalid audio player %s\n"
 msgstr ""
 
-#: src/main.c:3077
+#: src/main.c:3214
 #, c-format
 msgid "LiVES-%s: <Untitled%d> %dx%d : %d frames %d bpp %.3f fps"
 msgstr ""
 
-#: src/main.c:3082
+#: src/main.c:3219
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : ??? frames ??? bpp %.3f fps"
 msgstr ""
 
-#: src/main.c:3086
+#: src/main.c:3222
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : %d frames %d bpp %.3f fps"
 msgstr ""
 
-#: src/main.c:3094
+#: src/main.c:3229
 #, c-format
 msgid "LiVES-%s: <No File>"
 msgstr ""
 
 #. TRANSLATORS: rec(ord)
-#: src/main.c:5085
+#: src/main.c:5201
 #, c-format
 msgid "rec %9d/%d"
 msgstr ""
 
 #. TRANSLATORS: out of memory (rec(ord))
-#: src/main.c:5091
+#: src/main.c:5206
 #, c-format
 msgid "!rec %9d/%d"
 msgstr ""
 
-#: src/main.c:5398 src/main.c:5399 src/gui.c:2110 src/gui.c:3220
-#: src/saveplay.c:2336
+#: src/main.c:5500 src/main.c:5501 src/gui.c:2108 src/gui.c:3331
+#: src/saveplay.c:2315
 msgid "Play"
 msgstr "Esita"
 
-#: src/main.c:6128
+#: src/main.c:6216
 msgid ""
 "LiVES was unable to capture this image\n"
 "\n"
 msgstr ""
 
-#: src/main.c:6250
+#: src/main.c:6345
 #, c-format
 msgid "Closed file %s\n"
 msgstr ""
 
-#: src/main.c:6452 src/gui.c:648 src/utils.c:4312 src/utils.c:4344
-#: src/saveplay.c:3550 src/multitrack.c:4510 src/multitrack.c:6268
+#: src/main.c:6542 src/gui.c:647 src/utils.c:4256 src/utils.c:4286
+#: src/saveplay.c:3500 src/multitrack.c:4678 src/multitrack.c:6447
 msgid "_Undo"
 msgstr "Võta _tagasi"
 
-#: src/main.c:6453 src/gui.c:666 src/utils.c:4313 src/utils.c:4345
-#: src/saveplay.c:3551 src/multitrack.c:4531 src/multitrack.c:6293
+#: src/main.c:6543 src/gui.c:665 src/utils.c:4257 src/utils.c:4287
+#: src/saveplay.c:3501 src/multitrack.c:4698 src/multitrack.c:6472
 msgid "_Redo"
 msgstr "_Taasta"
 
-#: src/main.c:6493 src/interface.c:470 src/gui.c:2326 src/preferences.c:2357
-#: src/resample.c:1516
+#: src/main.c:6583 src/interface.c:457 src/gui.c:2324 src/preferences.c:2391
+#: src/resample.c:1488
 msgid "Video"
 msgstr "Video"
 
-#: src/main.c:6494 src/interface.c:483 src/gui.c:2351
+#: src/main.c:6584 src/interface.c:470 src/gui.c:2348
 msgid "Left Audio"
 msgstr ""
 
-#: src/main.c:6495 src/gui.c:2375
+#: src/main.c:6585 src/gui.c:2371
 msgid "Right Audio"
 msgstr ""
 
-#: src/main.c:6540
+#: src/main.c:6630
 msgid ""
 "\n"
 "\n"
@@ -709,11 +713,11 @@
 "Please adjust the playback options in Preferences and try again.\n"
 msgstr ""
 
-#: src/main.c:7051 src/plugins.c:1502
+#: src/main.c:7134 src/plugins.c:1468
 msgid "LiVES: - Play Window"
 msgstr ""
 
-#: src/startup.c:25
+#: src/startup.c:24
 #, c-format
 msgid ""
 "A directory named\n"
@@ -723,7 +727,7 @@
 "(Free space = %s)\n"
 msgstr ""
 
-#: src/startup.c:32
+#: src/startup.c:29
 #, c-format
 msgid ""
 "A directory named\n"
@@ -733,7 +737,7 @@
 "Please select another location.\n"
 msgstr ""
 
-#: src/startup.c:49
+#: src/startup.c:46
 #, c-format
 msgid ""
 "\n"
@@ -744,7 +748,7 @@
 "(Free space = %s)"
 msgstr ""
 
-#: src/startup.c:54
+#: src/startup.c:50
 #, c-format
 msgid ""
 "\n"
@@ -753,54 +757,54 @@
 "Please try again and choose a different location.\n"
 msgstr ""
 
-#: src/startup.c:96
+#: src/startup.c:92
 msgid "Directory name is too long !"
 msgstr ""
 
-#: src/startup.c:223
+#: src/startup.c:216
 msgid ""
 "LiVES FAILED TO START YOUR SELECTED AUDIO PLAYER !\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:230
+#: src/startup.c:222
 msgid ""
 "Before starting LiVES, you need to choose an audio player.\n"
 "\n"
 "PULSE AUDIO is recommended for most users"
 msgstr ""
 
-#: src/startup.c:233
+#: src/startup.c:225
 msgid ""
 ", but this version of LiVES was not compiled with pulse audio support.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:236
+#: src/startup.c:229
 msgid ""
 ", but you do not have pulse audio installed on your system.\n"
 " You are advised to install pulse audio first before running LiVES.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:241
+#: src/startup.c:233
 msgid "JACK audio is recommended for pro users"
 msgstr ""
 
-#: src/startup.c:244
+#: src/startup.c:236
 msgid ""
 ", but this version of LiVES was not compiled with jack audio support.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:247
+#: src/startup.c:239
 msgid ""
 ", but you do not have jackd installed. You may wish to install jackd first "
 "before running LiVES.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:250
+#: src/startup.c:242
 msgid ""
 ", but may prevent LiVES from starting on some systems.\n"
 "If LiVES will not start with jack, you can restart and try with another "
@@ -808,159 +812,159 @@
 "\n"
 msgstr ""
 
-#: src/startup.c:254
+#: src/startup.c:246
 msgid "SOX may be used if neither of the preceding players work, "
 msgstr ""
 
-#: src/startup.c:257
+#: src/startup.c:249
 msgid ""
 "but some audio features will be disabled.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:260
+#: src/startup.c:251
 msgid ""
 "but you do not have sox installed.\n"
 "You are advised to install it before running LiVES.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:264
+#: src/startup.c:255
 msgid ""
 "The MPLAYER/MPLAYER2 audio player is only recommended for testing purposes.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:281
+#: src/startup.c:271
 msgid "LiVES: - Choose an audio player"
 msgstr ""
 
-#: src/startup.c:298
+#: src/startup.c:288
 msgid "Use _pulse audio player"
 msgstr ""
 
-#: src/startup.c:320
+#: src/startup.c:310
 msgid "Use _jack audio player"
 msgstr ""
 
-#: src/startup.c:340
+#: src/startup.c:330
 msgid "Use _sox audio player"
 msgstr ""
 
-#: src/startup.c:361
+#: src/startup.c:351
 msgid "Use _mplayer audio player"
 msgstr ""
 
-#: src/startup.c:381
+#: src/startup.c:371
 msgid "Use _mplayer2 audio player"
 msgstr ""
 
-#: src/startup.c:405 src/startup.c:580 src/interface.c:1506
+#: src/startup.c:395 src/startup.c:569 src/interface.c:1398
 msgid "_Next"
 msgstr ""
 
-#: src/startup.c:445
+#: src/startup.c:435
 msgid "Skipped"
 msgstr ""
 
-#: src/startup.c:460
+#: src/startup.c:450
 msgid "Passed"
 msgstr ""
 
-#: src/startup.c:493
+#: src/startup.c:483
 msgid "Failed"
 msgstr ""
 
-#: src/startup.c:552
+#: src/startup.c:542
 msgid "LiVES: - Testing Configuration"
 msgstr ""
 
-#: src/startup.c:555
+#: src/startup.c:544
 msgid "LiVES: - Troubleshoot"
 msgstr ""
 
-#: src/startup.c:568
+#: src/startup.c:557
 msgid "LiVES will now run some basic configuration tests\n"
 msgstr ""
 
-#: src/startup.c:603
+#: src/startup.c:591
 msgid "Checking for \"sox\" presence"
 msgstr ""
 
-#: src/startup.c:607
+#: src/startup.c:595
 msgid ""
 "You should install sox to be able to use all the audio features in LiVES"
 msgstr ""
 
-#: src/startup.c:615
+#: src/startup.c:602
 msgid "Checking if sox can convert audio"
 msgstr ""
 
-#: src/startup.c:638
+#: src/startup.c:625
 msgid "Unable to allocate 176400 bytes memory."
 msgstr ""
 
-#: src/startup.c:653
+#: src/startup.c:639
 #, c-format
 msgid "Unable to write to: %s"
 msgstr ""
 
-#: src/startup.c:667 src/startup.c:807
+#: src/startup.c:653 src/startup.c:789
 #, c-format
 msgid "Command failed: %s"
 msgstr ""
 
-#: src/startup.c:689
+#: src/startup.c:675
 msgid "You should install sox_fmt_all or similar"
 msgstr ""
 
-#: src/startup.c:717
+#: src/startup.c:703
 msgid "Checking for \"mplayer\" presence"
 msgstr ""
 
-#: src/startup.c:721
+#: src/startup.c:707
 msgid ""
 "You should install mplayer or mplayer2 to be able to use all the decoding "
 "features in LiVES"
 msgstr ""
 
-#: src/startup.c:747
+#: src/startup.c:732
 msgid "Checking if mplayer can convert audio"
 msgstr ""
 
-#: src/startup.c:768
+#: src/startup.c:751
 msgid "You should install mplayer or mplayer2 with pcm/wav support"
 msgstr ""
 
-#: src/startup.c:785
+#: src/startup.c:767
 msgid "Checking if mplayer can decode to png/alpha"
 msgstr ""
 
-#: src/startup.c:828
+#: src/startup.c:810
 msgid "You may wish to upgrade mplayer to a newer version"
 msgstr ""
 
-#: src/startup.c:854
+#: src/startup.c:836
 msgid "Checking if mplayer can decode to jpeg"
 msgstr ""
 
-#: src/startup.c:882
+#: src/startup.c:862
 msgid "You should install mplayer with either png/alpha or jpeg support"
 msgstr ""
 
-#: src/startup.c:883
+#: src/startup.c:863
 msgid "You may wish to add jpeg output support to mplayer"
 msgstr ""
 
-#: src/startup.c:892
+#: src/startup.c:872
 msgid "Checking for \"convert\" presence"
 msgstr ""
 
-#: src/startup.c:896
+#: src/startup.c:876
 msgid "Install imageMagick to be able to use all of the rendered effects"
 msgstr ""
 
-#: src/startup.c:909
+#: src/startup.c:889
 msgid ""
 "\n"
 "\n"
@@ -968,7 +972,7 @@
 "Preferences/Decoding.    \n"
 msgstr ""
 
-#: src/startup.c:915
+#: src/startup.c:894
 msgid ""
 "\n"
 "\n"
@@ -976,49 +980,49 @@
 "continue    \n"
 msgstr ""
 
-#: src/startup.c:949
+#: src/startup.c:928
 msgid ""
 "\n"
 "\n"
 "Finally, you can choose the default startup interface for LiVES.\n"
 msgstr ""
 
-#: src/startup.c:950
+#: src/startup.c:929
 msgid ""
 "\n"
 "\n"
 "LiVES has two main interfaces and you can start up with either of them.\n"
 msgstr ""
 
-#: src/startup.c:951
+#: src/startup.c:930
 msgid ""
 "\n"
 "\n"
 "The default can always be changed later from Preferences.\n"
 msgstr ""
 
-#: src/startup.c:961
+#: src/startup.c:940
 msgid "LiVES: - Choose the startup interface"
 msgstr ""
 
-#: src/startup.c:972
+#: src/startup.c:951
 msgid "Start in _Clip Edit mode"
 msgstr ""
 
-#: src/startup.c:975
+#: src/startup.c:954
 msgid "This is the best choice for simple editing tasks and for VJs\n"
 msgstr ""
 
-#: src/startup.c:981
+#: src/startup.c:960
 msgid "Start in _Multitrack mode"
 msgstr ""
 
-#: src/startup.c:983
+#: src/startup.c:962
 msgid ""
 "This is a better choice for complex editing tasks involving multiple clips.\n"
 msgstr ""
 
-#: src/startup.c:992
+#: src/startup.c:971
 msgid "_Finish"
 msgstr ""
 
@@ -1035,35 +1039,35 @@
 msgid "Apply _Deinterlace"
 msgstr ""
 
-#: src/interface.c:66
+#: src/interface.c:65
 msgid "If this is set, frames will be deinterlaced as they are imported."
 msgstr ""
 
-#: src/interface.c:113 src/callbacks.c:9623 src/callbacks.c:9646
-#: src/callbacks.c:9647 src/gui.c:3223 src/gui.c:3821 src/saveplay.c:2339
-#: src/saveplay.c:3138 src/dialogs.c:1514 src/dialogs.c:1515
-#: src/dialogs.c:1746 src/dialogs.c:1747 src/framedraw.c:238
-#: src/multitrack.c:8031
+#: src/interface.c:106 src/callbacks.c:9542 src/callbacks.c:9564
+#: src/callbacks.c:9565 src/gui.c:3333 src/gui.c:3946 src/saveplay.c:2317
+#: src/saveplay.c:3097 src/dialogs.c:1575 src/dialogs.c:1576
+#: src/dialogs.c:1804 src/dialogs.c:1805 src/framedraw.c:236
+#: src/multitrack.c:8210
 msgid "Preview"
 msgstr "Eelvaade"
 
-#: src/interface.c:132
+#: src/interface.c:125
 msgid "Click here to _Preview any selected video, image or audio file"
 msgstr ""
 
-#: src/interface.c:135
+#: src/interface.c:127
 msgid "Click here to _Preview any selected audio file"
 msgstr ""
 
-#: src/interface.c:138
+#: src/interface.c:129
 msgid "Click here to _Preview the video"
 msgstr ""
 
-#: src/interface.c:181 src/dialogs.c:2542
+#: src/interface.c:169 src/dialogs.c:2621
 msgid "LiVES: - Processing..."
 msgstr ""
 
-#: src/interface.c:217
+#: src/interface.c:205
 msgid ""
 "\n"
 "\n"
@@ -1072,8 +1076,8 @@
 "Remember to switch off effects (ctrl-0) afterwards !"
 msgstr ""
 
-#: src/interface.c:222 src/callbacks.c:9373 src/callbacks.c:9420
-#: src/dialogs.c:2570
+#: src/interface.c:210 src/callbacks.c:9283 src/callbacks.c:9332
+#: src/dialogs.c:2649
 msgid ""
 "\n"
 "Please Wait"
@@ -1081,188 +1085,178 @@
 "\n"
 "Palun oota"
 
-#: src/interface.c:242
+#: src/interface.c:230
 msgid "Show Details"
 msgstr ""
 
-#: src/interface.c:254 src/dialogs.c:2584
+#: src/interface.c:242 src/dialogs.c:2663
 msgid "_Enough"
 msgstr ""
 
-#: src/interface.c:255 src/framedraw.c:278
+#: src/interface.c:243 src/framedraw.c:276
 msgid "_Preview"
 msgstr "_Eelvaade"
 
-#: src/interface.c:257
+#: src/interface.c:245 src/callbacks.c:9282 src/callbacks.c:9330
 msgid "Paus_e"
 msgstr ""
 
-#: src/interface.c:258 src/callbacks.c:9417
+#: src/interface.c:246 src/callbacks.c:9329
 msgid "Pause/_Enough"
 msgstr ""
 
-#: src/interface.c:285
+#: src/interface.c:273
 msgid "_Cancel"
 msgstr "_Katkesta"
 
-#: src/interface.c:374
+#: src/interface.c:361
 #, c-format
 msgid "LiVES: - %s"
 msgstr ""
 
-#: src/interface.c:376
+#: src/interface.c:363
 msgid "LiVES: - Multitrack details"
 msgstr ""
 
-#: src/interface.c:407
+#: src/interface.c:394
 msgid "Format"
 msgstr "Vorming"
 
-#: src/interface.c:412
+#: src/interface.c:399
 msgid "Frame size"
 msgstr "Raami suurus"
 
-#: src/interface.c:417
+#: src/interface.c:404
 msgid "File size"
 msgstr "Failisuurus"
 
-#: src/interface.c:418
+#: src/interface.c:405
 msgid "Byte size"
 msgstr ""
 
-#: src/interface.c:423 src/interface.c:1891
+#: src/interface.c:410 src/interface.c:1760
 msgid "FPS"
 msgstr "FPS"
 
-#: src/interface.c:428
+#: src/interface.c:415
 msgid "Frames"
 msgstr "Raamid"
 
-#: src/interface.c:429
+#: src/interface.c:416
 msgid "Events"
 msgstr "Sündmused"
 
-#: src/interface.c:434 src/interface.c:500 src/interface.c:542
+#: src/interface.c:421 src/interface.c:486 src/interface.c:528
 msgid "Total time"
 msgstr "Aeg kokku"
 
-#: src/interface.c:486 src/resample.c:1488
+#: src/interface.c:472 src/resample.c:1460
 msgid "Audio"
 msgstr "Heli"
 
-#: src/interface.c:511 src/interface.c:553
+#: src/interface.c:497 src/interface.c:539
 msgid "Rate/size"
 msgstr ""
 
-#: src/interface.c:530
+#: src/interface.c:516
 msgid "Right audio"
 msgstr ""
 
-#: src/interface.c:622
+#: src/interface.c:607
 msgid "LiVES: - Encoding options"
 msgstr ""
 
-#: src/interface.c:636
+#: src/interface.c:621
 msgid "<------------- (Check the box to re_size as suggested)"
 msgstr ""
 
-#: src/interface.c:637
+#: src/interface.c:622
 msgid "<------------- (Check the box to use the _size recommendation)"
 msgstr ""
 
-#: src/interface.c:662
+#: src/interface.c:646
 msgid "Use _letterboxing to maintain aspect ratio (optional)"
 msgstr ""
 
-#: src/interface.c:663
+#: src/interface.c:647
 msgid ""
 "Draw black rectangles either above or to the sides of the image, to prevent "
 "it from stretching."
 msgstr ""
 
-#: src/interface.c:694
+#: src/interface.c:677
 msgid "Keep _my settings"
 msgstr ""
 
-#: src/interface.c:695
+#: src/interface.c:678
 msgid "Use _recommended settings"
 msgstr ""
 
-#: src/interface.c:775 src/dialogs.c:114
-msgid ""
-"Do _not show this warning any more\n"
-"(can be turned back on from Preferences/Warnings)"
-msgstr ""
-
-#: src/interface.c:787
-msgid "Show _Details"
-msgstr "Näita _detailisi"
-
-#: src/interface.c:881
+#: src/interface.c:769
 msgid "_Close Window"
 msgstr "_Sulge aken"
 
-#: src/interface.c:883
+#: src/interface.c:771
 msgid "_Save to file"
 msgstr ""
 
-#: src/interface.c:928
+#: src/interface.c:816
 msgid "LiVES: - Insert"
 msgstr ""
 
-#: src/interface.c:945
+#: src/interface.c:833
 msgid "_Number of times to insert"
 msgstr ""
 
-#: src/interface.c:954
+#: src/interface.c:842
 msgid "_Insert to fit audio"
 msgstr ""
 
-#: src/interface.c:968
+#: src/interface.c:856
 msgid "Insert _before selection"
 msgstr ""
 
-#: src/interface.c:970
+#: src/interface.c:858
 msgid "Insert clipboard before selected frames"
 msgstr ""
 
-#: src/interface.c:986
+#: src/interface.c:875
 msgid "Insert _after selection"
 msgstr ""
 
-#: src/interface.c:988
+#: src/interface.c:877
 msgid "Insert clipboard after selected frames"
 msgstr ""
 
-#: src/interface.c:999
+#: src/interface.c:888
 msgid "Insert _with sound"
 msgstr ""
 
-#: src/interface.c:1012
+#: src/interface.c:901
 msgid "Insert with_out sound"
 msgstr ""
 
-#: src/interface.c:1093
+#: src/interface.c:985
 msgid "LiVES: - Open Selection"
 msgstr ""
 
-#: src/interface.c:1111
+#: src/interface.c:1004
 msgid "Selection start time (sec)"
 msgstr ""
 
-#: src/interface.c:1117
+#: src/interface.c:1010
 msgid "Number of frames to open"
 msgstr ""
 
-#: src/interface.c:1193
+#: src/interface.c:1088
 msgid "LiVES: - Open Location"
 msgstr ""
 
-#: src/interface.c:1195
+#: src/interface.c:1090
 msgid "LiVES: - Open Youtube Clip"
 msgstr ""
 
-#: src/interface.c:1213
+#: src/interface.c:1109
 msgid ""
 "\n"
 "\n"
@@ -1272,7 +1266,7 @@
 "\n"
 msgstr ""
 
-#: src/interface.c:1216
+#: src/interface.c:1112
 msgid ""
 "\n"
 "\n"
@@ -1281,62 +1275,62 @@
 "\n"
 msgstr ""
 
-#: src/interface.c:1220
+#: src/interface.c:1116
 msgid ""
 "Enter the URL of the clip below.\n"
 "E.g: http://www.youtube.com/watch?v=WCR6f6WzjP8\n"
 "\n"
 msgstr ""
 
-#: src/interface.c:1231
+#: src/interface.c:1127
 msgid "URL : "
 msgstr "URL : "
 
-#: src/interface.c:1231
+#: src/interface.c:1127
 msgid "Youtube URL : "
 msgstr ""
 
-#: src/interface.c:1235
+#: src/interface.c:1131
 msgid "Do not send bandwidth information"
 msgstr ""
 
-#: src/interface.c:1237
+#: src/interface.c:1133
 msgid "Try this setting if you are having problems getting a stream"
 msgstr ""
 
-#: src/interface.c:1258
+#: src/interface.c:1155
 msgid "Download to _Directory : "
 msgstr ""
 
-#: src/interface.c:1276
+#: src/interface.c:1173
 msgid "Download _File Name : "
 msgstr ""
 
-#: src/interface.c:1281
+#: src/interface.c:1178
 msgid ".webm"
 msgstr ""
 
-#: src/interface.c:1359
+#: src/interface.c:1256
 msgid "LiVES: - Rename Clip"
 msgstr ""
 
-#: src/interface.c:1362
-msgid "LiVES: - Enter Set Name"
+#: src/interface.c:1258
+msgid "LiVES: - Enter Set Name to Save as"
 msgstr ""
 
-#: src/interface.c:1365
+#: src/interface.c:1260
 msgid "LiVES: - Enter a Set Name to Reload"
 msgstr ""
 
-#: src/interface.c:1368
+#: src/interface.c:1262
 msgid "LiVES: - Choose a Working Directory"
 msgstr ""
 
-#: src/interface.c:1371
+#: src/interface.c:1264
 msgid "LiVES: - Rename Current Track"
 msgstr ""
 
-#: src/interface.c:1391
+#: src/interface.c:1283
 msgid ""
 "You need to enter a name for the current clip set.\n"
 "This will allow you reload the layout with the same clips later.\n"
@@ -1344,354 +1338,354 @@
 "LiVES will remind you to save the clip set later when you try to exit.\n"
 msgstr ""
 
-#: src/interface.c:1397
+#: src/interface.c:1289
 msgid ""
 "In order to export this project, you must enter a name for this clip set.\n"
 "This will also be used for the project name.\n"
 msgstr ""
 
-#: src/interface.c:1404
+#: src/interface.c:1296
 msgid ""
 "Welcome to LiVES !\n"
 "This startup wizard will guide you through the\n"
 "initial install so that you can get the most from this application.\n"
 msgstr ""
 
-#: src/interface.c:1408
+#: src/interface.c:1300
 msgid ""
 "\n"
 "First of all you need to choose a working directory for LiVES.\n"
 "This should be a directory with plenty of disk space available.\n"
 msgstr ""
 
-#: src/interface.c:1427
+#: src/interface.c:1317
 msgid "New name "
 msgstr "Uus nimi "
 
-#: src/interface.c:1430
+#: src/interface.c:1319
 msgid "Set name "
 msgstr ""
 
-#: src/interface.c:1550
+#: src/interface.c:1435
 msgid "Use def_aults"
 msgstr ""
 
-#: src/interface.c:1553 src/interface.c:1840 src/preferences.c:2515
-#: src/preferences.c:2697
+#: src/interface.c:1437 src/interface.c:1709 src/preferences.c:2550
+#: src/preferences.c:2739
 msgid "_Advanced"
 msgstr "_Laiendatud"
 
-#: src/interface.c:1604
+#: src/interface.c:1487
 msgid "LiVES:- Select input device"
 msgstr ""
 
-#: src/interface.c:1622
+#: src/interface.c:1504
 msgid "Select input device:"
 msgstr ""
 
-#: src/interface.c:1686
+#: src/interface.c:1568
 msgid "LiVES:- Load CD Track"
 msgstr ""
 
-#: src/interface.c:1689
+#: src/interface.c:1570
 msgid "LiVES:- Select DVD Title/Chapter"
 msgstr ""
 
-#: src/interface.c:1692
+#: src/interface.c:1572
 msgid "LiVES:- Select VCD Title"
 msgstr ""
 
-#: src/interface.c:1695
+#: src/interface.c:1574
 msgid "LiVES:- Change Maximum Visible Tracks"
 msgstr ""
 
-#: src/interface.c:1698
+#: src/interface.c:1576
 msgid "LiVES:- Device details"
 msgstr ""
 
-#: src/interface.c:1721
+#: src/interface.c:1598
 #, c-format
 msgid "Track to load (from %s)"
 msgstr ""
 
-#: src/interface.c:1724
+#: src/interface.c:1600
 msgid "DVD Title"
 msgstr ""
 
-#: src/interface.c:1727
+#: src/interface.c:1602
 msgid "VCD Title"
 msgstr ""
 
-#: src/interface.c:1730
+#: src/interface.c:1604
 msgid "Maximum number of tracks to display"
 msgstr ""
 
-#: src/interface.c:1733
+#: src/interface.c:1606
 msgid "Device:        /dev/video"
 msgstr ""
 
-#: src/interface.c:1736
+#: src/interface.c:1608
 msgid "Device:        fw:"
 msgstr ""
 
-#: src/interface.c:1771
+#: src/interface.c:1641
 msgid "Chapter  "
 msgstr ""
 
-#: src/interface.c:1776
+#: src/interface.c:1645
 msgid "Channel  "
 msgstr ""
 
-#: src/interface.c:1791
+#: src/interface.c:1660
 msgid "Audio ID  "
 msgstr ""
 
-#: src/interface.c:1857
+#: src/interface.c:1726
 msgid "Input number"
 msgstr ""
 
-#: src/interface.c:1865
+#: src/interface.c:1734
 msgid "Use default width, height and FPS"
 msgstr ""
 
-#: src/interface.c:1879
+#: src/interface.c:1748
 msgid "Width"
 msgstr ""
 
-#: src/interface.c:1885
+#: src/interface.c:1754
 msgid "Height"
 msgstr ""
 
-#: src/interface.c:1899
+#: src/interface.c:1768
 msgid "_Driver"
 msgstr ""
 
-#: src/interface.c:1902
+#: src/interface.c:1771
 msgid "_Output format"
 msgstr ""
 
-#: src/interface.c:1998
+#: src/interface.c:1865
 msgid "LiVES:- Fade Audio In"
 msgstr ""
 
-#: src/interface.c:2001
+#: src/interface.c:1867
 msgid "LiVES:- Fade Audio Out"
 msgstr ""
 
-#: src/interface.c:2017
+#: src/interface.c:1883
 msgid "Fade in over  "
 msgstr ""
 
-#: src/interface.c:2018
+#: src/interface.c:1884
 msgid "first"
 msgstr "esimene"
 
-#: src/interface.c:2021
+#: src/interface.c:1886
 msgid "Fade out over  "
 msgstr ""
 
-#: src/interface.c:2022
+#: src/interface.c:1887
 msgid "last"
 msgstr "viimane"
 
-#: src/interface.c:2044
+#: src/interface.c:1909
 msgid "seconds."
 msgstr "sekundit."
 
-#: src/interface.c:2052 src/saveplay.c:1507
+#: src/interface.c:1917 src/saveplay.c:1484
 msgid "selection"
 msgstr "valik"
 
-#: src/interface.c:2092
+#: src/interface.c:1956
 msgid "LiVES: - File Comments (optional)"
 msgstr ""
 
-#: src/interface.c:2107
+#: src/interface.c:1971
 msgid "Title/Name : "
 msgstr ""
 
-#: src/interface.c:2114
+#: src/interface.c:1978
 msgid "Author/Artist : "
 msgstr ""
 
-#: src/interface.c:2121
+#: src/interface.c:1985
 msgid "Comments : "
 msgstr ""
 
-#: src/interface.c:2151
+#: src/interface.c:2015
 msgid "_Options"
 msgstr ""
 
-#: src/interface.c:2158
+#: src/interface.c:2022
 msgid "Save _subtitles to file"
 msgstr ""
 
-#: src/interface.c:2170
+#: src/interface.c:2033
 msgid "Subtitle file"
 msgstr ""
 
-#: src/interface.c:2172
+#: src/interface.c:2035
 msgid "Browse..."
 msgstr ""
 
-#: src/interface.c:2255
+#: src/interface.c:2132
 msgid "LiVES: - choose a device"
 msgstr ""
 
-#: src/interface.c:2259
+#: src/interface.c:2135
 msgid "LiVES: - choose a directory"
 msgstr ""
 
-#: src/interface.c:2262
+#: src/interface.c:2137
 msgid "LiVES: - choose a file"
 msgstr ""
 
-#: src/interface.c:2445
+#: src/interface.c:2381
 msgid "LiVES: - Cancel/Discard/Save"
 msgstr ""
 
-#: src/interface.c:2460
+#: src/interface.c:2397
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has not been saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:2463
+#: src/interface.c:2400
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has been changed since the last save.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:2467
+#: src/interface.c:2404
 msgid ""
 "You are about to exit LiVES.\n"
 "The current clip set can be saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:2468
+#: src/interface.c:2405
 msgid ""
 "The current clip set has not been saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:2472
+#: src/interface.c:2408
 msgid ""
 "The current layout has not been saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:2475
+#: src/interface.c:2410
 msgid ""
 "The current layout has *not* been changed since it was last saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:2480
+#: src/interface.c:2415
 msgid ""
 "The current layout contains generated frames and cannot be retained.\n"
 "You may wish to render it before exiting multitrack mode.\n"
 msgstr ""
 
-#: src/interface.c:2483
+#: src/interface.c:2418
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout contains generated frames and cannot be retained.\n"
 "What do you wish to do ?"
 msgstr ""
 
-#: src/interface.c:2496
+#: src/interface.c:2431
 msgid "Clip set _name"
 msgstr ""
 
-#: src/interface.c:2502
+#: src/interface.c:2437
 msgid "_Auto reload next time"
 msgstr ""
 
-#: src/interface.c:2538 src/interface.c:2547
+#: src/interface.c:2473 src/interface.c:2482
 msgid "_Wipe layout"
 msgstr ""
 
-#: src/interface.c:2539
+#: src/interface.c:2474
 msgid "_Ignore changes"
 msgstr ""
 
-#: src/interface.c:2540
+#: src/interface.c:2475
 msgid "_Delete clip set"
 msgstr ""
 
-#: src/interface.c:2541
+#: src/interface.c:2476
 msgid "_Delete layout"
 msgstr ""
 
-#: src/interface.c:2545
+#: src/interface.c:2480
 msgid "_Save layout"
 msgstr ""
 
-#: src/interface.c:2546
+#: src/interface.c:2481
 msgid "_Save clip set"
 msgstr ""
 
-#: src/interface.c:2565
+#: src/interface.c:2502
 msgid ""
 "\n"
 "LiVES has detected a multitrack layout from a previous session.\n"
 "Would you like to try and recover it ?\n"
 msgstr ""
 
-#: src/interface.c:2589
+#: src/interface.c:2528
 msgid "LiVES: - Disk Recovery Options"
 msgstr ""
 
-#: src/interface.c:2608
+#: src/interface.c:2549
 msgid "Delete _Orphaned Clips"
 msgstr ""
 
-#: src/interface.c:2609
+#: src/interface.c:2550
 msgid "Delete any clips which are not currently loaded or part of a set"
 msgstr ""
 
-#: src/interface.c:2622
+#: src/interface.c:2564
 msgid "Clear _Backup Files from Closed Clips"
 msgstr ""
 
-#: src/interface.c:2633
+#: src/interface.c:2575
 msgid "Remove Sets which have _Layouts but no Clips"
 msgstr ""
 
-#: src/interface.c:2644
+#: src/interface.c:2586
 msgid "_Reset to Defaults"
 msgstr ""
 
-#: src/interface.c:2651
+#: src/interface.c:2593
 msgid "_Accept"
 msgstr ""
 
-#: src/callbacks.c:198
+#: src/callbacks.c:208
 #, c-format
 msgid "Saving as set %s..."
 msgstr ""
 
-#: src/callbacks.c:833
+#: src/callbacks.c:852
 msgid "Please enter the name of the file to save the clip as.\n"
 msgstr ""
 
-#: src/callbacks.c:841
+#: src/callbacks.c:860
 msgid "Please enter a valid URL for the download.\n"
 msgstr ""
 
-#: src/callbacks.c:867
+#: src/callbacks.c:886
 #, c-format
 msgid "Downloading %s to %s..."
 msgstr ""
 
-#: src/callbacks.c:895
+#: src/callbacks.c:912
 msgid "Downloading clip"
 msgstr ""
 
-#: src/callbacks.c:933
+#: src/callbacks.c:950
 msgid ""
 "\n"
 "LiVES was unable to download the clip.\n"
@@ -1699,17 +1693,17 @@
 "the latest youtube-dl installed.\n"
 msgstr ""
 
-#: src/callbacks.c:1114 src/callbacks.c:1149
+#: src/callbacks.c:1131 src/callbacks.c:1166
 msgid "This file"
 msgstr "See fail"
 
-#: src/callbacks.c:1115
+#: src/callbacks.c:1132
 msgid ""
 ",\n"
 " - including the current layout - "
 msgstr ""
 
-#: src/callbacks.c:1117
+#: src/callbacks.c:1134
 #, c-format
 msgid ""
 "\n"
@@ -1719,7 +1713,7 @@
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1119
+#: src/callbacks.c:1136
 #, c-format
 msgid ""
 "\n"
@@ -1729,20 +1723,20 @@
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1150
+#: src/callbacks.c:1167
 msgid ""
 "Changes made to this clip have not been saved or backed up.\n"
 "\n"
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1343
+#: src/callbacks.c:1356
 msgid ""
 "\n"
 "Invalid project file.\n"
 msgstr ""
 
-#: src/callbacks.c:1356
+#: src/callbacks.c:1370
 #, c-format
 msgid ""
 "\n"
@@ -1755,33 +1749,33 @@
 "Once you have done this, you will be able to import the new project.\n"
 msgstr ""
 
-#: src/callbacks.c:1366
+#: src/callbacks.c:1381
 #, c-format
 msgid "Importing the project %s as set %s..."
 msgstr ""
 
-#: src/callbacks.c:1386
+#: src/callbacks.c:1399
 msgid "Importing project"
 msgstr ""
 
-#: src/callbacks.c:1472
+#: src/callbacks.c:1481
 #, c-format
 msgid "Exporting project %s..."
 msgstr ""
 
-#: src/callbacks.c:1490
+#: src/callbacks.c:1497
 msgid "Exporting project"
 msgstr ""
 
-#: src/callbacks.c:1506
+#: src/callbacks.c:1513
 msgid "Backup as .lv1 file"
 msgstr ""
 
-#: src/callbacks.c:1522
+#: src/callbacks.c:1529
 msgid "Restore .lv1 file"
 msgstr ""
 
-#: src/callbacks.c:1664
+#: src/callbacks.c:1671
 msgid ""
 "\n"
 "\n"
@@ -1789,72 +1783,77 @@
 "Are you sure ?\n"
 msgstr ""
 
-#: src/callbacks.c:1725
+#: src/callbacks.c:1732
 #, c-format
 msgid "Deleting set %s..."
 msgstr ""
 
-#: src/callbacks.c:1727
+#: src/callbacks.c:1734
 msgid "Deleting set..."
 msgstr ""
 
-#: src/callbacks.c:1731
+#: src/callbacks.c:1738
 msgid "Deleting set"
 msgstr ""
 
-#: src/callbacks.c:1739
+#: src/callbacks.c:1746
 #, c-format
 msgid "Set %s was permanently deleted from the disk.\n"
 msgstr ""
 
-#: src/callbacks.c:1787 src/callbacks.c:11764
+#: src/callbacks.c:1792 src/callbacks.c:11676
 msgid "Insert Silence"
 msgstr ""
 
-#: src/callbacks.c:1840 src/callbacks.c:1923 src/callbacks.c:2086
+#: src/callbacks.c:1844 src/callbacks.c:1927 src/callbacks.c:2089
 msgid "Undoing"
 msgstr ""
 
-#: src/callbacks.c:1936 src/callbacks.c:2147
+#: src/callbacks.c:1940 src/callbacks.c:2150
 msgid "Restoring audio..."
 msgstr ""
 
-#: src/callbacks.c:1952
+#: src/callbacks.c:1956
 msgid "Clearing frame images"
 msgstr ""
 
-#: src/callbacks.c:1985
+#: src/callbacks.c:1988
 msgid "Deleting excess frames"
 msgstr ""
 
-#: src/callbacks.c:2229
+#: src/callbacks.c:2232
 #, c-format
 msgid "Length of video is now %d frames at %.3f frames per second.\n"
 msgstr ""
 
-#: src/callbacks.c:2233 src/resample.c:683 src/resample.c:2166
+#: src/callbacks.c:2235 src/resample.c:678 src/resample.c:2133
 #, c-format
 msgid "Clipboard was resampled to %d frames.\n"
 msgstr ""
 
-#: src/callbacks.c:2394 src/callbacks.c:2423
+#: src/callbacks.c:2396 src/callbacks.c:2425
 msgid "Redoing"
 msgstr ""
 
-#: src/callbacks.c:2462
+#: src/callbacks.c:2472
 #, c-format
-msgid "Copying frames %d to %d%s to the clipboard..."
+msgid "Copying frames %d to %d (with sound) to the clipboard..."
 msgstr ""
 
-#: src/callbacks.c:2525
+#: src/callbacks.c:2474
+#, c-format
+msgid "Copying frames %d to %d to the clipboard..."
+msgstr ""
+
+#: src/callbacks.c:2526
 msgid "Copying to the clipboard"
 msgstr ""
 
-#: src/callbacks.c:2600
+#: src/callbacks.c:2601
 msgid "Cut"
 msgstr "Lõika"
 
-#: src/callbacks.c:2641 src/callbacks.c:3068 src/callbacks.c:8026
+#: src/callbacks.c:2641 src/callbacks.c:3063 src/callbacks.c:7631
 msgid "Pulling frames from clipboard"
 msgstr ""
 
@@ -1863,22 +1862,22 @@
 msgid "Pasting %d frames to new clip %s..."
 msgstr ""
 
-#: src/callbacks.c:2678
+#: src/callbacks.c:2676
 msgid "Pasting"
 msgstr "Kleebi"
 
-#: src/callbacks.c:2694
+#: src/callbacks.c:2692
 msgid "...added audio..."
 msgstr ""
 
-#: src/callbacks.c:2778
+#: src/callbacks.c:2775
 msgid ""
 "This operation requires resizing or converting of frames.\n"
 "Please install 'convert' from the Image-magick package, and then restart "
 "LiVES.\n"
 msgstr ""
 
-#: src/callbacks.c:2795
+#: src/callbacks.c:2793
 msgid ""
 "\n"
 "\n"
@@ -1887,31 +1886,31 @@
 "the 'Trim Audio' function from the Audio menu."
 msgstr ""
 
-#: src/callbacks.c:2819
+#: src/callbacks.c:2817
 msgid ""
 "LiVES cannot insert because the audio rates do not match.\n"
 "Please install 'sox', and try again."
 msgstr ""
 
-#: src/callbacks.c:2838
+#: src/callbacks.c:2835
 msgid ""
 "\n"
 "Insertion will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:2888 src/callbacks.c:11692
+#: src/callbacks.c:2883 src/callbacks.c:11606
 msgid ""
 "\n"
 "Insertion will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:2996 src/callbacks.c:3025
+#: src/callbacks.c:2987 src/callbacks.c:3016
 msgid "Resampling clipboard audio"
 msgstr ""
 
-#: src/callbacks.c:3041
+#: src/callbacks.c:3032
 msgid ""
 "\n"
 "\n"
@@ -1919,7 +1918,7 @@
 "Clipboard audio has been erased.\n"
 msgstr ""
 
-#: src/callbacks.c:3055
+#: src/callbacks.c:3045
 msgid ""
 "\n"
 "\n"
@@ -1928,86 +1927,86 @@
 "using unchanged audio ?\n"
 msgstr ""
 
-#: src/callbacks.c:3137 src/callbacks.c:3311
+#: src/callbacks.c:3132 src/callbacks.c:3299
 #, c-format
 msgid "Inserting %d%s frames from the clipboard..."
 msgstr ""
 
-#: src/callbacks.c:3162 src/callbacks.c:3236 src/callbacks.c:3339
+#: src/callbacks.c:3155 src/callbacks.c:3224 src/callbacks.c:3325
 msgid "Inserting"
 msgstr "Lisan"
 
-#: src/callbacks.c:3193
+#: src/callbacks.c:3187
 #, c-format
 msgid "Inserting %d times from the clipboard%s..."
 msgstr ""
 
-#: src/callbacks.c:3200
+#: src/callbacks.c:3191
 #, c-format
 msgid "Inserting %d frames from the clipboard%s..."
 msgstr ""
 
-#: src/callbacks.c:3418
+#: src/callbacks.c:3404
 msgid "Insert"
 msgstr "Lisa"
 
-#: src/callbacks.c:3486
+#: src/callbacks.c:3471
 msgid ""
 "\n"
 "Deleting all frames will close this file.\n"
 "Are you sure ?"
 msgstr ""
 
-#: src/callbacks.c:3495
+#: src/callbacks.c:3480
 msgid ""
 "\n"
 "Deletion will cause missing frames in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3515 src/callbacks.c:10920 src/callbacks.c:11162
-#: src/callbacks.c:11228
+#: src/callbacks.c:3500 src/callbacks.c:10851 src/callbacks.c:11087
+#: src/callbacks.c:11152
 msgid ""
 "\n"
 "Deletion will cause missing audio in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3534
+#: src/callbacks.c:3519
 msgid ""
 "\n"
 "Deletion will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3553 src/callbacks.c:11210
+#: src/callbacks.c:3538 src/callbacks.c:11134
 msgid ""
 "\n"
 "Deletion will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3611
+#: src/callbacks.c:3597
 #, c-format
 msgid "Deleting frames %d to %d%s..."
 msgstr ""
 
-#: src/callbacks.c:3636
+#: src/callbacks.c:3619
 msgid "Deleting"
 msgstr "Kustutamine"
 
-#: src/callbacks.c:3717
+#: src/callbacks.c:3699
 msgid "Delete"
 msgstr "Kustuta"
 
-#: src/callbacks.c:3738
+#: src/callbacks.c:3717
 msgid ""
 "\n"
 "\n"
 "Selection is locked.\n"
 msgstr ""
 
-#: src/callbacks.c:4092
+#: src/callbacks.c:4056
 msgid ""
 "Ready to record. Use 'control' and cursor keys during playback to record "
 "your performance.\n"
@@ -2015,11 +2014,11 @@
 "play.)\n"
 msgstr ""
 
-#: src/callbacks.c:4098
+#: src/callbacks.c:4061
 msgid "Record cancelled.\n"
 msgstr ""
 
-#: src/callbacks.c:4237
+#: src/callbacks.c:4197
 #, c-format
 msgid ""
 "\n"
@@ -2028,7 +2027,7 @@
 "%s\n"
 msgstr ""
 
-#: src/callbacks.c:4241
+#: src/callbacks.c:4200
 #, c-format
 msgid ""
 "\n"
@@ -2037,7 +2036,7 @@
 "The plugin may be broken or not installed correctly."
 msgstr ""
 
-#: src/callbacks.c:4571
+#: src/callbacks.c:4532
 #, c-format
 msgid ""
 "Saving the set will cause copies of all loaded clips to remain on the disk"
@@ -2046,22 +2045,22 @@
 "Please press 'Cancel' if that is not what you want.\n"
 msgstr ""
 
-#: src/callbacks.c:4654
+#: src/callbacks.c:4617
 #, c-format
 msgid "Saving set %s"
 msgstr ""
 
-#: src/callbacks.c:5005
+#: src/callbacks.c:4964
 #, c-format
 msgid "Loading clips from set %s"
 msgstr ""
 
-#: src/callbacks.c:5093
+#: src/callbacks.c:5051
 #, c-format
 msgid "%d clips and %d layouts were recovered from set (%s).\n"
 msgstr ""
 
-#: src/callbacks.c:5312
+#: src/callbacks.c:5259
 msgid ""
 "LiVES will attempt to recover some disk space.\n"
 "You should ONLY run this if you have no other copies of LiVES running on "
@@ -2069,24 +2068,24 @@
 "Click OK to proceed.\n"
 msgstr ""
 
-#: src/callbacks.c:5317
+#: src/callbacks.c:5264
 msgid "Cleaning up disk space..."
 msgstr ""
 
-#: src/callbacks.c:5387
+#: src/callbacks.c:5334
 msgid "Recovering disk space"
 msgstr ""
 
-#: src/callbacks.c:5439
+#: src/callbacks.c:5386
 #, c-format
 msgid "%s of disk space was recovered.\n"
 msgstr ""
 
-#: src/callbacks.c:5482
+#: src/callbacks.c:5428
 msgid "Resetting frame rates and frame values..."
 msgstr ""
 
-#: src/callbacks.c:5523
+#: src/callbacks.c:5469
 #, c-format
 msgid ""
 "\n"
@@ -2094,68 +2093,68 @@
 "Internal: %s (%d bpp) / %s\n"
 msgstr ""
 
-#: src/callbacks.c:5525
+#: src/callbacks.c:5471
 msgid "buffered"
 msgstr ""
 
-#: src/callbacks.c:5538 src/callbacks.c:5557 src/callbacks.c:5575
-#: src/callbacks.c:5609
+#: src/callbacks.c:5484 src/callbacks.c:5502 src/callbacks.c:5518
+#: src/callbacks.c:5551
 msgid ""
 "\n"
 "  Opening..."
 msgstr ""
 
-#: src/callbacks.c:5545
+#: src/callbacks.c:5490
 #, c-format
 msgid ""
 "\n"
 "(%d virtual)"
 msgstr ""
 
-#: src/callbacks.c:5548
+#: src/callbacks.c:5493
 #, c-format
 msgid ""
 "\n"
 "(%d decoded)"
 msgstr ""
 
-#: src/callbacks.c:5560 src/callbacks.c:5578 src/callbacks.c:5612
+#: src/callbacks.c:5504 src/callbacks.c:5520 src/callbacks.c:5553
 #, c-format
 msgid ""
 "\n"
 "  %.2f sec."
 msgstr ""
 
-#: src/callbacks.c:5569
+#: src/callbacks.c:5512
 msgid ""
 "\n"
 "  Unknown"
 msgstr ""
 
-#: src/callbacks.c:5582 src/callbacks.c:5596
+#: src/callbacks.c:5524 src/callbacks.c:5538
 msgid "unsigned"
 msgstr ""
 
-#: src/callbacks.c:5583 src/callbacks.c:5597
+#: src/callbacks.c:5525 src/callbacks.c:5539
 msgid "signed"
 msgstr ""
 
-#: src/callbacks.c:5585 src/callbacks.c:5599
+#: src/callbacks.c:5527 src/callbacks.c:5541
 msgid "big-endian"
 msgstr ""
 
-#: src/callbacks.c:5586 src/callbacks.c:5600
+#: src/callbacks.c:5528 src/callbacks.c:5542
 msgid "little-endian"
 msgstr ""
 
-#: src/callbacks.c:5588 src/callbacks.c:5602
+#: src/callbacks.c:5530 src/callbacks.c:5544
 #, c-format
 msgid ""
 "  %d Hz %d bit\n"
 "%s %s"
 msgstr ""
 
-#: src/callbacks.c:5707
+#: src/callbacks.c:5647
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -2172,15 +2171,15 @@
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA.\n"
 msgstr ""
 
-#: src/callbacks.c:5721
+#: src/callbacks.c:5661
 msgid "A video editor and VJ program."
 msgstr ""
 
-#: src/callbacks.c:5722
+#: src/callbacks.c:5662
 msgid "About LiVES"
 msgstr ""
 
-#: src/callbacks.c:5724
+#: src/callbacks.c:5664
 msgid "translator_credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -2188,7 +2187,7 @@
 "  Tarmo Ilves https://launchpad.net/~koolobus\n"
 "  lyyser https://launchpad.net/~lyyser"
 
-#: src/callbacks.c:5758
+#: src/callbacks.c:5699
 #, c-format
 msgid ""
 "LiVES Version %s\n"
@@ -2202,14 +2201,14 @@
 "Homepage: http://lives.sourceforge.net"
 msgstr ""
 
-#: src/callbacks.c:6037
+#: src/callbacks.c:5996
 msgid ""
 "\n"
 "\n"
 "You need to install mplayer or mplayer2 to be able to preview this file.\n"
 msgstr ""
 
-#: src/callbacks.c:6040
+#: src/callbacks.c:5998
 msgid ""
 "\n"
 "\n"
@@ -2217,215 +2216,206 @@
 "this file.\n"
 msgstr ""
 
-#: src/callbacks.c:6423 src/callbacks.c:8289
-msgid ""
-"\n"
-"Loading new audio may cause missing audio in some multitrack layouts.\n"
-"Are you sure you wish to continue ?\n"
-"."
-msgstr ""
-
-#: src/callbacks.c:6523
-#, c-format
-msgid "Opening audio %s, type %s..."
-msgstr ""
-
-#: src/callbacks.c:6556 src/saveplay.c:480
-msgid "Opening audio"
-msgstr ""
-
-#: src/callbacks.c:6565 src/callbacks.c:6612 src/callbacks.c:8387
-#: src/callbacks.c:8429 src/callbacks.c:8472 src/callbacks.c:10846
-msgid "Cancelling"
-msgstr "Tühistamine"
-
-#: src/callbacks.c:6660 src/callbacks.c:8514 src/callbacks.c:10876
-#: src/callbacks.c:11563
-msgid "Committing audio"
-msgstr ""
-
-#: src/callbacks.c:6672 src/callbacks.c:8546
-msgid "New Audio"
-msgstr ""
-
-#: src/callbacks.c:6779
+#: src/callbacks.c:6459
 #, c-format
 msgid ""
 "Text was saved as\n"
 "%s\n"
 msgstr ""
 
-#: src/callbacks.c:6951 src/saveplay.c:3618
-#, c-format
-msgid "%d frames are enough !\n"
-msgstr ""
-
-#: src/callbacks.c:7050
+#: src/callbacks.c:6706
 msgid "LiVES: - Encoder debug output"
 msgstr ""
 
-#: src/callbacks.c:7087 src/gui.c:1922
+#: src/callbacks.c:6743 src/gui.c:1921
 msgid "Fullscreen playback (f)"
 msgstr ""
 
-#: src/callbacks.c:7089
+#: src/callbacks.c:6744
 msgid "Fullscreen playback off (f)"
 msgstr ""
 
-#: src/callbacks.c:7188 src/callbacks.c:7336 src/callbacks.c:7664
-#: src/callbacks.c:7681 src/gui.c:3712 src/saveplay.c:2467 src/saveplay.c:2501
-#: src/saveplay.c:3115 src/saveplay.c:3220 src/saveplay.c:3239
-#: src/multitrack.c:9340 src/multitrack.c:11060
+#: src/callbacks.c:6841 src/callbacks.c:6983 src/callbacks.c:7283
+#: src/callbacks.c:7298 src/gui.c:3838 src/saveplay.c:2442 src/saveplay.c:2475
+#: src/saveplay.c:3074 src/saveplay.c:3178 src/saveplay.c:3197
+#: src/multitrack.c:9526 src/multitrack.c:11288
 #, c-format
 msgid " (%d %% scale)"
 msgstr ""
 
-#: src/callbacks.c:7190 src/callbacks.c:7338 src/callbacks.c:7666
-#: src/gui.c:3716 src/saveplay.c:2469 src/saveplay.c:2503
+#: src/callbacks.c:6843 src/callbacks.c:6985 src/callbacks.c:7285
+#: src/gui.c:3842 src/saveplay.c:2444 src/saveplay.c:2477
 #, c-format
 msgid "LiVES: - Play Window%s"
 msgstr ""
 
-#: src/callbacks.c:7302 src/gui.c:1907
+#: src/callbacks.c:6950 src/gui.c:1906
 msgid "Double size (d)"
 msgstr ""
 
-#: src/callbacks.c:7309
+#: src/callbacks.c:6956
 msgid "Single size (d)"
 msgstr ""
 
-#: src/callbacks.c:7442 src/callbacks.c:7443
+#: src/callbacks.c:7087 src/callbacks.c:7088
 msgid "Hide the play window (s)"
 msgstr ""
 
-#: src/callbacks.c:7452 src/gui.c:1746
+#: src/callbacks.c:7096 src/gui.c:1744
 msgid "Show the play window (s)"
 msgstr ""
 
-#: src/callbacks.c:7453 src/gui.c:1896
+#: src/callbacks.c:7097 src/gui.c:1895
 msgid "Play in separate window (s)"
 msgstr ""
 
-#: src/callbacks.c:7535 src/gui.c:4060 src/saveplay.c:2498
+#: src/callbacks.c:7175 src/gui.c:4169 src/saveplay.c:2472
 msgid "LiVES: - Streaming"
 msgstr ""
 
-#: src/callbacks.c:7778
+#: src/callbacks.c:7388
 msgid "Switch continuous looping off (o)"
 msgstr ""
 
-#: src/callbacks.c:7785 src/gui.c:1795
+#: src/callbacks.c:7394 src/gui.c:1793
 msgid "Switch continuous looping on (o)"
 msgstr ""
 
-#: src/callbacks.c:7837
+#: src/callbacks.c:7444
 #, c-format
 msgid "Audio volume (%.2f)"
 msgstr ""
 
-#: src/callbacks.c:7876 src/callbacks.c:7877 src/gui.c:3640
+#: src/callbacks.c:7483 src/callbacks.c:7484 src/gui.c:3766
 msgid "Unmute the audio (z)"
 msgstr ""
 
-#: src/callbacks.c:7888 src/callbacks.c:7889 src/gui.c:1808 src/gui.c:3639
+#: src/callbacks.c:7494 src/callbacks.c:7495 src/gui.c:1806 src/gui.c:3765
 msgid "Mute the audio (z)"
 msgstr ""
 
-#: src/callbacks.c:8038
+#: src/callbacks.c:7643
 msgid "Reversing clipboard..."
 msgstr ""
 
-#: src/callbacks.c:8052
+#: src/callbacks.c:7657
 msgid "Reversing clipboard"
 msgstr ""
 
-#: src/callbacks.c:8084
+#: src/callbacks.c:7689
 msgid "LiVES: Load subtitles from..."
 msgstr ""
 
-#: src/callbacks.c:8151 src/saveplay.c:970
+#: src/callbacks.c:7753 src/saveplay.c:956
 #, c-format
 msgid "Loaded subtitle file: %s\n"
 msgstr ""
 
-#: src/callbacks.c:8220
+#: src/callbacks.c:7821
 msgid "Subtitles were erased.\n"
 msgstr ""
 
-#: src/callbacks.c:8239
+#: src/callbacks.c:7843
 msgid "LiVES: - Select Audio File"
 msgstr ""
 
-#: src/callbacks.c:8250
+#: src/callbacks.c:7878 src/callbacks.c:8232
+msgid ""
+"\n"
+"Loading new audio may cause missing audio in some multitrack layouts.\n"
+"Are you sure you wish to continue ?\n"
+"."
+msgstr ""
+
+#: src/callbacks.c:7989
+#, c-format
+msgid "Opening audio %s, type %s..."
+msgstr ""
+
+#: src/callbacks.c:8023 src/saveplay.c:477
+msgid "Opening audio"
+msgstr ""
+
+#: src/callbacks.c:8032 src/callbacks.c:8083 src/callbacks.c:8327
+#: src/callbacks.c:8369 src/callbacks.c:8412 src/callbacks.c:10766
+msgid "Cancelling"
+msgstr "Tühistamine"
+
+#: src/callbacks.c:8137 src/callbacks.c:8454 src/callbacks.c:10803
+#: src/callbacks.c:11477
+msgid "Committing audio"
+msgstr ""
+
+#: src/callbacks.c:8153 src/callbacks.c:8484
+msgid "New Audio"
+msgstr ""
+
+#: src/callbacks.c:8194
 msgid "Please set your CD play device in Tools | Preferences | Misc\n"
 msgstr ""
 
-#: src/callbacks.c:8321
+#: src/callbacks.c:8264
 #, c-format
 msgid "Opening CD track %d from %s..."
 msgstr ""
 
-#: src/callbacks.c:8326
+#: src/callbacks.c:8267
 #, c-format
 msgid "CD track %d"
 msgstr ""
 
-#: src/callbacks.c:8373
+#: src/callbacks.c:8313
 msgid "Opening CD track..."
 msgstr ""
 
-#: src/callbacks.c:8415 src/callbacks.c:8461
+#: src/callbacks.c:8355 src/callbacks.c:8401
 msgid "Error loading CD track\n"
 msgstr ""
 
-#: src/callbacks.c:8584
+#: src/callbacks.c:8518
 msgid "layout errors"
 msgstr ""
 
-#: src/callbacks.c:8595
+#: src/callbacks.c:8529
 msgid "Close _Window"
 msgstr ""
 
-#: src/callbacks.c:8606
+#: src/callbacks.c:8540
 msgid "Clear _Errors"
 msgstr ""
 
-#: src/callbacks.c:8617
+#: src/callbacks.c:8551
 msgid "_Delete affected layouts"
 msgstr ""
 
-#: src/callbacks.c:9343 src/callbacks.c:9388
+#: src/callbacks.c:9253 src/callbacks.c:9298
 msgid "Resume"
 msgstr "Jätka"
 
-#: src/callbacks.c:9344
+#: src/callbacks.c:9254
 msgid ""
 "\n"
 "Paused\n"
 "(click Resume to continue processing)"
 msgstr ""
 
-#: src/callbacks.c:9345 src/callbacks.c:9406
+#: src/callbacks.c:9255 src/callbacks.c:9315
 msgid "paused..."
 msgstr ""
 
-#: src/callbacks.c:9372 src/callbacks.c:9418
-msgid "Pause"
-msgstr "Paus"
-
-#: src/callbacks.c:9374 src/callbacks.c:9421
+#: src/callbacks.c:9284 src/callbacks.c:9333
 msgid "resumed..."
 msgstr ""
 
-#: src/callbacks.c:9393
+#: src/callbacks.c:9303
 msgid "Keep"
 msgstr "Säilita"
 
-#: src/callbacks.c:9396
+#: src/callbacks.c:9305
 msgid "Enough"
 msgstr ""
 
-#: src/callbacks.c:9401
+#: src/callbacks.c:9310
 #, c-format
 msgid ""
 "\n"
@@ -2434,28 +2424,28 @@
 "(click Resume to continue processing)"
 msgstr ""
 
-#: src/callbacks.c:9419
+#: src/callbacks.c:9331
 msgid "Cancel"
 msgstr "Katkesta"
 
-#: src/callbacks.c:9558
+#: src/callbacks.c:9478
 msgid "Stop"
 msgstr ""
 
-#: src/callbacks.c:10053 src/multitrack.c:13247
+#: src/callbacks.c:9968 src/multitrack.c:13489
 msgid "LiVES: Selected frame"
 msgstr ""
 
-#: src/callbacks.c:10061
+#: src/callbacks.c:9976
 msgid "_Save frame as..."
 msgstr ""
 
-#: src/callbacks.c:10290
+#: src/callbacks.c:10202
 #, c-format
 msgid "Audio is ahead of video by %.4f secs. at frame %d, with fps %.4f\n"
 msgstr ""
 
-#: src/callbacks.c:10347
+#: src/callbacks.c:10255
 msgid ""
 "\n"
 "\n"
@@ -2464,7 +2454,7 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10353
+#: src/callbacks.c:10261
 msgid ""
 "\n"
 "\n"
@@ -2472,13 +2462,13 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10429 src/callbacks.c:11479
+#: src/callbacks.c:10334 src/callbacks.c:11395
 msgid ""
 "\n"
 "Record time must be greater than 0.\n"
 msgstr ""
 
-#: src/callbacks.c:10440
+#: src/callbacks.c:10346
 msgid ""
 "Capture an External Window:\n"
 "\n"
@@ -2487,17 +2477,17 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10445
+#: src/callbacks.c:10351
 msgid "External window was released.\n"
 msgstr ""
 
-#: src/callbacks.c:10479
+#: src/callbacks.c:10385
 msgid ""
 "Click on a Window to Capture it\n"
 "Press 'q' to stop recording"
 msgstr ""
 
-#: src/callbacks.c:10513
+#: src/callbacks.c:10419
 #, c-format
 msgid ""
 "\n"
@@ -2507,19 +2497,19 @@
 "(Default of %.3f frames per second will be used.)\n"
 msgstr ""
 
-#: src/callbacks.c:10539
+#: src/callbacks.c:10443
 msgid "LiVES was unable to capture this window. Sorry.\n"
 msgstr ""
 
-#: src/callbacks.c:10695
+#: src/callbacks.c:10601
 msgid "Export Selected Audio as..."
 msgstr ""
 
-#: src/callbacks.c:10699
+#: src/callbacks.c:10604
 msgid "Export Audio as..."
 msgstr ""
 
-#: src/callbacks.c:10714
+#: src/callbacks.c:10619
 msgid ""
 "\n"
 "\n"
@@ -2528,1033 +2518,1033 @@
 "rate.\n"
 msgstr ""
 
-#: src/callbacks.c:10720
+#: src/callbacks.c:10625
 #, c-format
 msgid "Exporting audio frames %d to %d as %s..."
 msgstr ""
 
-#: src/callbacks.c:10725
+#: src/callbacks.c:10629
 #, c-format
 msgid "Exporting audio as %s..."
 msgstr ""
 
-#: src/callbacks.c:10751
+#: src/callbacks.c:10655
 msgid "Exporting audio"
 msgstr ""
 
-#: src/callbacks.c:10782
+#: src/callbacks.c:10695
 msgid "LiVES: - Append Audio File"
 msgstr ""
 
-#: src/callbacks.c:10825
+#: src/callbacks.c:10739
 #, c-format
 msgid "Appending audio file %s..."
 msgstr ""
 
-#: src/callbacks.c:10836
+#: src/callbacks.c:10756
 msgid "Appending audio"
 msgstr ""
 
-#: src/callbacks.c:10892
+#: src/callbacks.c:10818
 msgid "Append Audio"
 msgstr ""
 
-#: src/callbacks.c:10952
+#: src/callbacks.c:10883
 #, c-format
 msgid "Padding audio to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10954
+#: src/callbacks.c:10885
 #, c-format
 msgid "Trimming audio from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10973
+#: src/callbacks.c:10904
 msgid "Trimming/Padding audio"
 msgstr ""
 
-#: src/callbacks.c:10981
+#: src/callbacks.c:10912
 msgid "Trim/Pad Audio"
 msgstr ""
 
-#: src/callbacks.c:11055
+#: src/callbacks.c:10982
 msgid "Fading audio in"
 msgstr ""
 
-#: src/callbacks.c:11056
+#: src/callbacks.c:10983
 msgid "Fade audio in"
 msgstr ""
 
-#: src/callbacks.c:11061
+#: src/callbacks.c:10987
 msgid "Fading audio out"
 msgstr ""
 
-#: src/callbacks.c:11062
+#: src/callbacks.c:10988
 msgid "Fade audio out"
 msgstr ""
 
-#: src/callbacks.c:11085
+#: src/callbacks.c:11011
 #, c-format
 msgid "%s over %.1f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11087
+#: src/callbacks.c:11013
 #, c-format
 msgid "%s from time %.2f seconds to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11094
+#: src/callbacks.c:11020
 msgid "Fading audio..."
 msgstr ""
 
-#: src/callbacks.c:11194
+#: src/callbacks.c:11119
 msgid ""
 "\n"
 "Deleting all audio will close this file.\n"
 "Are you sure ?"
 msgstr ""
 
-#: src/callbacks.c:11197
+#: src/callbacks.c:11122
 msgid "Deleting all audio..."
 msgstr ""
 
-#: src/callbacks.c:11203
+#: src/callbacks.c:11127
 #, c-format
 msgid "Deleting audio from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11290
+#: src/callbacks.c:11214
 msgid "Deleting Audio"
 msgstr ""
 
-#: src/callbacks.c:11297
+#: src/callbacks.c:11221
 msgid "Delete Audio"
 msgstr ""
 
-#: src/callbacks.c:11636
+#: src/callbacks.c:11550
 msgid "Record new audio"
 msgstr ""
 
-#: src/callbacks.c:11725
+#: src/callbacks.c:11640
 #, c-format
 msgid "Inserting silence from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11754
+#: src/callbacks.c:11666
 msgid "Inserting Silence"
 msgstr ""
 
-#: src/merge.c:85
+#: src/merge.c:96
 msgid "LiVES: - Merge"
 msgstr ""
 
-#: src/merge.c:102
+#: src/merge.c:113
 #, c-format
 msgid "Merge Clipboard [ %d Frames ]       With Selection [ %d Frames ]"
 msgstr ""
 
-#: src/merge.c:107
+#: src/merge.c:118
 #, c-format
 msgid ""
 "Merge Clipboard [ %d Frames (resampled) ]       With Selection [ %d Frames ]"
 msgstr ""
 
-#: src/merge.c:118
+#: src/merge.c:130
 msgid "Align _Starts"
 msgstr ""
 
-#: src/merge.c:123
+#: src/merge.c:135
 msgid "Align _Ends"
 msgstr ""
 
-#: src/merge.c:134
+#: src/merge.c:146
 msgid "What to do with extra clipboard frames -"
 msgstr ""
 
-#: src/merge.c:137
+#: src/merge.c:149
 msgid "_Insert Frames"
 msgstr ""
 
-#: src/merge.c:143
+#: src/merge.c:155
 msgid "_Drop Frames"
 msgstr ""
 
-#: src/merge.c:149
+#: src/merge.c:160
 msgid "Number of Times to Loop Clipboard"
 msgstr ""
 
-#: src/merge.c:160
+#: src/merge.c:171
 msgid "_Loop Clipboard to Fit Selection"
 msgstr ""
 
-#: src/merge.c:173
+#: src/merge.c:184
 msgid "_Transition Method:"
 msgstr ""
 
-#: src/merge.c:394
+#: src/merge.c:395
 msgid "Merging clipboard with selection..."
 msgstr ""
 
-#: src/merge.c:551
+#: src/merge.c:539
 msgid "Merge done.\n"
 msgstr ""
 
-#: src/gui.c:123
+#: src/gui.c:122
 msgid "_Custom Generators"
 msgstr ""
 
-#: src/gui.c:124
+#: src/gui.c:123
 msgid "_Custom Effects"
 msgstr ""
 
-#: src/gui.c:125
+#: src/gui.c:124
 msgid "Custom _Utilities"
 msgstr ""
 
-#: src/gui.c:352 src/multitrack.c:5964
+#: src/gui.c:351 src/multitrack.c:6143
 msgid "_File"
 msgstr "_Fail"
 
-#: src/gui.c:367 src/multitrack.c:5989
+#: src/gui.c:366 src/multitrack.c:6168
 msgid "_Open File/Directory"
 msgstr ""
 
-#: src/gui.c:373
+#: src/gui.c:372
 msgid "O_pen Part of File..."
 msgstr ""
 
-#: src/gui.c:379 src/gui.c:383 src/multitrack.c:6006 src/multitrack.c:6023
-#: src/multitrack.c:6028
+#: src/gui.c:378 src/gui.c:382 src/multitrack.c:6185 src/multitrack.c:6202
+#: src/multitrack.c:6207
 msgid "Open _Location/Stream..."
 msgstr ""
 
-#: src/gui.c:393 src/multitrack.c:6016
+#: src/gui.c:392 src/multitrack.c:6195
 msgid "Open _Youtube Clip..."
 msgstr ""
 
-#: src/gui.c:404
+#: src/gui.c:403
 msgid "Import from _dvd/vcd..."
 msgstr ""
 
-#: src/gui.c:413
+#: src/gui.c:412
 msgid "Import from _dvd"
 msgstr ""
 
-#: src/gui.c:416
+#: src/gui.c:415
 msgid "Import from _vcd"
 msgstr ""
 
-#: src/gui.c:419
+#: src/gui.c:418
 msgid "_Import from Firewire"
 msgstr ""
 
-#: src/gui.c:428 src/multitrack.c:6086
+#: src/gui.c:427 src/multitrack.c:6265
 msgid "Import from _Firewire Device (dv)"
 msgstr ""
 
-#: src/gui.c:429 src/multitrack.c:6094
+#: src/gui.c:428 src/multitrack.c:6273
 msgid "Import from _Firewire Device (hdv)"
 msgstr ""
 
-#: src/gui.c:457
+#: src/gui.c:456
 msgid "_Add Webcam/TV card..."
 msgstr ""
 
-#: src/gui.c:476
+#: src/gui.c:475
 msgid "Add _Unicap Device"
 msgstr ""
 
-#: src/gui.c:486
+#: src/gui.c:485
 msgid "Add Live _Firewire Device"
 msgstr ""
 
-#: src/gui.c:495
+#: src/gui.c:494
 msgid "Add _TV Device"
 msgstr ""
 
-#: src/gui.c:510 src/multitrack.c:6117
+#: src/gui.c:509 src/multitrack.c:6296
 msgid "_Recent Files..."
 msgstr ""
 
-#: src/gui.c:560 src/multitrack.c:6177
+#: src/gui.c:559 src/multitrack.c:6356
 msgid "_Reload Clip Set..."
 msgstr ""
 
-#: src/gui.c:564 src/multitrack.c:6185
+#: src/gui.c:563 src/multitrack.c:6364
 msgid "Close/Sa_ve All Clips"
 msgstr ""
 
-#: src/gui.c:575
+#: src/gui.c:574
 msgid "_Encode Clip As..."
 msgstr ""
 
-#: src/gui.c:577
+#: src/gui.c:576
 msgid "Encode _Selection As..."
 msgstr ""
 
-#: src/gui.c:584
+#: src/gui.c:583
 msgid "_Close This Clip"
 msgstr ""
 
-#: src/gui.c:595
+#: src/gui.c:594
 msgid "_Backup Clip as .lv1..."
 msgstr ""
 
-#: src/gui.c:604
+#: src/gui.c:603
 msgid "_Restore Clip from .lv1..."
 msgstr ""
 
-#: src/gui.c:615
+#: src/gui.c:614
 msgid "Encode/Load/Backup _with Sound"
 msgstr ""
 
-#: src/gui.c:620
+#: src/gui.c:619
 msgid "Auto load subtitles"
 msgstr ""
 
-#: src/gui.c:628 src/multitrack.c:6224
+#: src/gui.c:627 src/multitrack.c:6403
 msgid "Clean _up Diskspace"
 msgstr ""
 
-#: src/gui.c:636 src/multitrack.c:6257
+#: src/gui.c:635 src/multitrack.c:6436
 msgid "_Edit"
 msgstr "_Redigeeri"
 
-#: src/gui.c:685
+#: src/gui.c:684
 msgid "_MULTITRACK mode"
 msgstr ""
 
-#: src/gui.c:696
+#: src/gui.c:695
 msgid "_Copy Selection"
 msgstr ""
 
-#: src/gui.c:705
+#: src/gui.c:704
 msgid "Cu_t Selection"
 msgstr ""
 
-#: src/gui.c:714
+#: src/gui.c:713
 msgid "_Insert from Clipboard..."
 msgstr ""
 
-#: src/gui.c:730
+#: src/gui.c:729
 msgid "Paste as _New"
 msgstr ""
 
-#: src/gui.c:739
+#: src/gui.c:738
 msgid "_Merge Clipboard with Selection..."
 msgstr ""
 
-#: src/gui.c:746
+#: src/gui.c:745
 msgid "_Delete Selection"
 msgstr "_Kustuta valik"
 
-#: src/gui.c:764
+#: src/gui.c:763
 msgid "Decouple _Video from Audio"
 msgstr ""
 
-#: src/gui.c:772
+#: src/gui.c:771
 msgid "_Select..."
 msgstr "_Vali..."
 
-#: src/gui.c:786
+#: src/gui.c:785
 msgid "Select _All Frames"
 msgstr ""
 
-#: src/gui.c:794
+#: src/gui.c:793
 msgid "_Start Frame Only"
 msgstr ""
 
-#: src/gui.c:802
+#: src/gui.c:801
 msgid "_End Frame Only"
 msgstr ""
 
-#: src/gui.c:813
+#: src/gui.c:812
 msgid "Select from _First Frame"
 msgstr ""
 
-#: src/gui.c:817
+#: src/gui.c:816
 msgid "Select to _Last Frame"
 msgstr ""
 
-#: src/gui.c:821
+#: src/gui.c:820
 msgid "Select Last Insertion/_Merge"
 msgstr ""
 
-#: src/gui.c:825
+#: src/gui.c:824
 msgid "Select Last _Effect"
 msgstr ""
 
-#: src/gui.c:829
+#: src/gui.c:828
 msgid "_Invert Selection"
 msgstr "_Pööra valik"
 
-#: src/gui.c:837
+#: src/gui.c:836
 msgid "_Lock Selection Width"
 msgstr ""
 
-#: src/gui.c:842 src/multitrack.c:6409
+#: src/gui.c:841 src/multitrack.c:6591
 msgid "_Play"
 msgstr "_Esita"
 
-#: src/gui.c:854
+#: src/gui.c:853
 msgid "_Play All"
 msgstr ""
 
-#: src/gui.c:869
+#: src/gui.c:868
 msgid "Pla_y Selection"
 msgstr ""
 
-#: src/gui.c:877
+#: src/gui.c:876
 msgid "Play _Clipboard"
 msgstr ""
 
-#: src/gui.c:899 src/multitrack.c:6441
+#: src/gui.c:898 src/multitrack.c:6623
 msgid "_Stop"
 msgstr "_Peata"
 
-#: src/gui.c:914 src/multitrack.c:6453
+#: src/gui.c:913 src/multitrack.c:6635
 msgid "Re_wind"
 msgstr ""
 
-#: src/gui.c:946 src/multitrack.c:6471
+#: src/gui.c:945 src/multitrack.c:6653
 msgid "_Full Screen"
 msgstr "_Täisekraan"
 
-#: src/gui.c:955
+#: src/gui.c:954
 msgid "_Double Size"
 msgstr ""
 
-#: src/gui.c:963 src/multitrack.c:6479
+#: src/gui.c:962 src/multitrack.c:6661
 msgid "Play in _Separate Window"
 msgstr ""
 
-#: src/gui.c:972
+#: src/gui.c:971
 msgid "_Blank Background"
 msgstr ""
 
-#: src/gui.c:979
+#: src/gui.c:978
 msgid "(Auto)_loop Video (to fit audio track)"
 msgstr ""
 
-#: src/gui.c:988 src/multitrack.c:6487
+#: src/gui.c:987 src/multitrack.c:6669
 msgid "L_oop Continuously"
 msgstr ""
 
-#: src/gui.c:997
+#: src/gui.c:996
 msgid "Pin_g Pong Loops"
 msgstr ""
 
-#: src/gui.c:1005 src/multitrack.c:6495
+#: src/gui.c:1004 src/multitrack.c:6677
 msgid "_Mute"
 msgstr "_Tumm"
 
-#: src/gui.c:1017
+#: src/gui.c:1016
 msgid "Separate Window 'S_ticky' Mode"
 msgstr ""
 
-#: src/gui.c:1025
+#: src/gui.c:1024
 msgid "S_how Frame Counter"
 msgstr ""
 
-#: src/gui.c:1035
+#: src/gui.c:1034
 msgid "Show Subtitles"
 msgstr ""
 
-#: src/gui.c:1045
+#: src/gui.c:1044
 msgid "Letterbox mode"
 msgstr ""
 
-#: src/gui.c:1051 src/multitrack.c:6507
+#: src/gui.c:1050 src/multitrack.c:6689
 msgid "Effect_s"
 msgstr ""
 
-#: src/gui.c:1054
+#: src/gui.c:1053
 msgid "Effects are applied to the current selection."
 msgstr ""
 
-#: src/gui.c:1067
+#: src/gui.c:1066
 msgid "_Run Test Rendered Effect/Tool/Generator..."
 msgstr ""
 
-#: src/gui.c:1072 src/multitrack.c:7123
+#: src/gui.c:1071 src/multitrack.c:7299
 msgid "_Tools"
 msgstr "_Tööriistad"
 
-#: src/gui.c:1075
+#: src/gui.c:1074
 msgid "Tools are applied to complete clips."
 msgstr ""
 
-#: src/gui.c:1085
+#: src/gui.c:1084
 msgid "_Reverse Clipboard"
 msgstr ""
 
-#: src/gui.c:1094
+#: src/gui.c:1093
 msgid "_Change Playback/Save Speed..."
 msgstr ""
 
-#: src/gui.c:1099
+#: src/gui.c:1098
 msgid "Resample _Video to New Frame Rate..."
 msgstr ""
 
-#: src/gui.c:1105
+#: src/gui.c:1104
 msgid "_Utilities"
 msgstr "Üldkas_utatavad"
 
-#: src/gui.c:1110
+#: src/gui.c:1109
 msgid "Custom _Tools"
 msgstr ""
 
-#: src/gui.c:1116 src/multitrack.c:7149
+#: src/gui.c:1115 src/multitrack.c:7325
 msgid "_Generate"
 msgstr "_Genereeri"
 
-#: src/gui.c:1126
+#: src/gui.c:1125
 msgid "Loading rendered effect plugins..."
 msgstr ""
 
-#: src/gui.c:1139
+#: src/gui.c:1138
 msgid "Load _Subtitles from File..."
 msgstr ""
 
-#: src/gui.c:1144
+#: src/gui.c:1143
 msgid "Erase subtitles"
 msgstr ""
 
-#: src/gui.c:1152 src/multitrack.c:7158
+#: src/gui.c:1151 src/multitrack.c:7334
 msgid "Capture _External Window... "
 msgstr ""
 
-#: src/gui.c:1159 src/multitrack.c:7173
+#: src/gui.c:1158 src/multitrack.c:7349
 msgid "_Preferences..."
 msgstr ""
 
-#: src/gui.c:1172
+#: src/gui.c:1171
 msgid "_Audio"
 msgstr ""
 
-#: src/gui.c:1184
+#: src/gui.c:1183
 msgid "Load _New Audio for Clip..."
 msgstr ""
 
-#: src/gui.c:1190
+#: src/gui.c:1189
 msgid "Load _CD Track..."
 msgstr ""
 
-#: src/gui.c:1191
+#: src/gui.c:1190
 msgid "E_ject CD"
 msgstr ""
 
-#: src/gui.c:1205
+#: src/gui.c:1204
 msgid "Record E_xternal Audio..."
 msgstr ""
 
-#: src/gui.c:1218
+#: src/gui.c:1217
 msgid "to New _Clip..."
 msgstr ""
 
-#: src/gui.c:1222
+#: src/gui.c:1221
 msgid "to _Selection"
 msgstr ""
 
-#: src/gui.c:1230
+#: src/gui.c:1229
 msgid "Fade Audio _In..."
 msgstr ""
 
-#: src/gui.c:1234
+#: src/gui.c:1233
 msgid "Fade Audio _Out..."
 msgstr ""
 
-#: src/gui.c:1244
+#: src/gui.c:1243
 msgid "_Export Audio..."
 msgstr ""
 
-#: src/gui.c:1257
+#: src/gui.c:1256
 msgid "Export _Selected Audio..."
 msgstr ""
 
-#: src/gui.c:1261
+#: src/gui.c:1260
 msgid "Export _All Audio..."
 msgstr ""
 
-#: src/gui.c:1265
+#: src/gui.c:1264
 msgid "_Append Audio..."
 msgstr ""
 
-#: src/gui.c:1270
+#: src/gui.c:1269
 msgid "_Trim/Pad Audio..."
 msgstr ""
 
-#: src/gui.c:1283
+#: src/gui.c:1282
 msgid "Trim/Pad Audio to _Selection"
 msgstr ""
 
-#: src/gui.c:1288
+#: src/gui.c:1287
 msgid "Trim/Pad Audio from Beginning to _Play Start"
 msgstr ""
 
-#: src/gui.c:1293
+#: src/gui.c:1292
 msgid "_Delete Audio..."
 msgstr ""
 
-#: src/gui.c:1306
+#: src/gui.c:1305
 msgid "Delete _Selected Audio"
 msgstr ""
 
-#: src/gui.c:1310
+#: src/gui.c:1309
 msgid "Delete _All Audio"
 msgstr ""
 
-#: src/gui.c:1314
+#: src/gui.c:1313
 msgid "Insert _Silence in Selection"
 msgstr ""
 
-#: src/gui.c:1319
+#: src/gui.c:1318
 msgid "_Resample Audio..."
 msgstr ""
 
-#: src/gui.c:1324
+#: src/gui.c:1323
 msgid "_Info"
 msgstr "_Info"
 
-#: src/gui.c:1336
+#: src/gui.c:1335
 msgid "Show Clip _Info"
 msgstr ""
 
-#: src/gui.c:1344
+#: src/gui.c:1343
 msgid "Show/_Edit File Comments"
 msgstr ""
 
-#: src/gui.c:1349
+#: src/gui.c:1348
 msgid "Show _Clipboard Info"
 msgstr ""
 
-#: src/gui.c:1360 src/multitrack.c:7286
+#: src/gui.c:1359 src/multitrack.c:7462
 msgid "Show _Messages"
 msgstr ""
 
-#: src/gui.c:1364 src/multitrack.c:7365
+#: src/gui.c:1363 src/multitrack.c:7541
 msgid "Show _Layout Errors"
 msgstr ""
 
-#: src/gui.c:1369 src/multitrack.c:7263
+#: src/gui.c:1368 src/multitrack.c:7439
 msgid "_Clips"
 msgstr ""
 
-#: src/gui.c:1381
+#: src/gui.c:1380
 msgid "_Rename Current Clip in Menu..."
 msgstr ""
 
-#: src/gui.c:1399
+#: src/gui.c:1398
 msgid "A_dvanced"
 msgstr "_Eriline"
 
-#: src/gui.c:1412
+#: src/gui.c:1411
 msgid "_RFX Effects/Tools/Utilities"
 msgstr ""
 
-#: src/gui.c:1424
+#: src/gui.c:1423
 msgid "_New Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1428
+#: src/gui.c:1427
 msgid "_Copy RFX Script to Test..."
 msgstr ""
 
-#: src/gui.c:1432
+#: src/gui.c:1431
 msgid "_Edit Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1436
+#: src/gui.c:1435
 msgid "Rena_me Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1440
+#: src/gui.c:1439
 msgid "_Delete Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1450
+#: src/gui.c:1449
 msgid "_Promote Test Rendered Effect/Tool/Generator..."
 msgstr ""
 
-#: src/gui.c:1457
+#: src/gui.c:1456
 msgid "_Import Custom RFX script..."
 msgstr ""
 
-#: src/gui.c:1461
+#: src/gui.c:1460
 msgid "E_xport Custom RFX script..."
 msgstr ""
 
-#: src/gui.c:1465
+#: src/gui.c:1464
 msgid "De_lete Custom RFX Script..."
 msgstr ""
 
-#: src/gui.c:1472
+#: src/gui.c:1471
 msgid "Re_build all RFX plugins"
 msgstr ""
 
-#: src/gui.c:1501
+#: src/gui.c:1498
 msgid "Receive _LiVES stream from..."
 msgstr ""
 
-#: src/gui.c:1506
+#: src/gui.c:1503
 msgid "_Send LiVES stream to..."
 msgstr ""
 
-#: src/gui.c:1515
+#: src/gui.c:1512
 #, c-format
 msgid "Open _yuv4mpeg stream on %sstream.yuv..."
 msgstr ""
 
-#: src/gui.c:1536
+#: src/gui.c:1534
 msgid "_Import Project (.lv2)..."
 msgstr ""
 
-#: src/gui.c:1540
+#: src/gui.c:1538
 msgid "E_xport Project (.lv2)..."
 msgstr ""
 
-#: src/gui.c:1545
+#: src/gui.c:1543
 msgid "_VJ"
 msgstr "_VJ"
 
-#: src/gui.c:1557
+#: src/gui.c:1555
 msgid "Real Time _Effect Mapping"
 msgstr ""
 
-#: src/gui.c:1563
+#: src/gui.c:1561
 msgid "Bind real time effects to ctrl-number keys."
 msgstr ""
 
-#: src/gui.c:1565
+#: src/gui.c:1563
 msgid "Set Real Time Effect _Defaults"
 msgstr ""
 
-#: src/gui.c:1567
+#: src/gui.c:1565
 msgid "Set default parameter values for real time effects."
 msgstr ""
 
-#: src/gui.c:1580
+#: src/gui.c:1578
 msgid "Save Real Time Effect _Defaults"
 msgstr ""
 
-#: src/gui.c:1583
+#: src/gui.c:1581
 msgid ""
 "Save real time effect defaults so they will be restored each time you use "
 "LiVES."
 msgstr ""
 
-#: src/gui.c:1589
+#: src/gui.c:1587
 msgid "_Reset all playback speeds and positions"
 msgstr ""
 
-#: src/gui.c:1592
+#: src/gui.c:1590
 msgid ""
 "Reset all playback positions to frame 1, and reset all playback frame rates."
 msgstr ""
 
-#: src/gui.c:1594
+#: src/gui.c:1592
 msgid "_MIDI/joystick interface"
 msgstr ""
 
-#: src/gui.c:1609
+#: src/gui.c:1607
 msgid "_MIDI/joystick learner..."
 msgstr ""
 
-#: src/gui.c:1614
+#: src/gui.c:1612
 msgid "_Save device mapping..."
 msgstr ""
 
-#: src/gui.c:1620
+#: src/gui.c:1618
 msgid "_Load device mapping..."
 msgstr ""
 
-#: src/gui.c:1628
+#: src/gui.c:1626
 msgid "Show VJ _Keys"
 msgstr ""
 
-#: src/gui.c:1632
+#: src/gui.c:1630
 msgid "To_ys"
 msgstr ""
 
-#: src/gui.c:1644
+#: src/gui.c:1642
 msgid "_None"
 msgstr "_Puudub"
 
-#: src/gui.c:1652
+#: src/gui.c:1650
 msgid "_Autolives"
 msgstr ""
 
-#: src/gui.c:1657
+#: src/gui.c:1655
 msgid "_Mad Frames"
 msgstr ""
 
-#: src/gui.c:1662
+#: src/gui.c:1660
 msgid "_LiVES TV (broadband)"
 msgstr ""
 
-#: src/gui.c:1672 src/multitrack.c:7387
+#: src/gui.c:1670 src/multitrack.c:7563
 msgid "_Help"
 msgstr "_Abi"
 
-#: src/gui.c:1684 src/multitrack.c:7407
+#: src/gui.c:1682 src/multitrack.c:7583
 msgid "_Manual (opens in browser)"
 msgstr ""
 
-#: src/gui.c:1691 src/multitrack.c:7416
+#: src/gui.c:1689 src/multitrack.c:7592
 msgid "_Donate to the project !"
 msgstr ""
 
-#: src/gui.c:1695 src/multitrack.c:7420
+#: src/gui.c:1693 src/multitrack.c:7596
 msgid "_Email the author"
 msgstr ""
 
-#: src/gui.c:1699 src/multitrack.c:7424
+#: src/gui.c:1697 src/multitrack.c:7600
 msgid "Report a _bug"
 msgstr ""
 
-#: src/gui.c:1703 src/multitrack.c:7428
+#: src/gui.c:1701 src/multitrack.c:7604
 msgid "Suggest a _feature"
 msgstr ""
 
-#: src/gui.c:1707 src/multitrack.c:7432
+#: src/gui.c:1705 src/multitrack.c:7608
 msgid "Assist with _translating"
 msgstr ""
 
-#: src/gui.c:1714 src/multitrack.c:7439
+#: src/gui.c:1712 src/multitrack.c:7615
 msgid "_Troubleshoot"
 msgstr ""
 
-#: src/gui.c:1718 src/multitrack.c:7443
+#: src/gui.c:1716 src/multitrack.c:7619
 msgid "_About"
 msgstr "_Lähemalt"
 
-#: src/gui.c:1752
+#: src/gui.c:1750
 msgid "Rewind to start (w)"
 msgstr ""
 
-#: src/gui.c:1760 src/multitrack.c:16720
+#: src/gui.c:1758 src/multitrack.c:17010
 msgid "Play all (p)"
 msgstr ""
 
-#: src/gui.c:1768 src/gui.c:1877
+#: src/gui.c:1766 src/gui.c:1876
 msgid "Stop playback (q)"
 msgstr ""
 
-#: src/gui.c:1779
+#: src/gui.c:1777
 msgid "Play selection (y)"
 msgstr ""
 
-#: src/gui.c:1832
+#: src/gui.c:1829
 msgid "Volume"
 msgstr "Helitugevus"
 
-#: src/gui.c:1854
+#: src/gui.c:1853
 msgid "Audio volume (1.00)"
 msgstr ""
 
-#: src/gui.c:1883
+#: src/gui.c:1882
 msgid "Unblank background (b)"
 msgstr ""
 
-#: src/gui.c:1929
+#: src/gui.c:1928
 msgid "Play slower (ctrl-down)"
 msgstr ""
 
-#: src/gui.c:1935
+#: src/gui.c:1934
 msgid "Play faster (ctrl-up)"
 msgstr ""
 
-#: src/gui.c:1942
+#: src/gui.c:1941
 msgid "Skip back (ctrl-left)"
 msgstr ""
 
-#: src/gui.c:1948
+#: src/gui.c:1947
 msgid "Skip forward (ctrl-right)"
 msgstr ""
 
-#: src/gui.c:1954
+#: src/gui.c:1953
 msgid "Show clip info (i)"
 msgstr ""
 
-#: src/gui.c:1960
+#: src/gui.c:1959
 msgid "Hide this toolbar"
 msgstr ""
 
-#: src/gui.c:1962
+#: src/gui.c:1961
 msgid ""
 "Press \"s\" to toggle separate play window for improved performance, \"q\" "
 "to stop."
 msgstr ""
 
 #. TRANSLATORS: please keep the translated string the same length
-#: src/gui.c:1995
+#: src/gui.c:1994
 msgid "     Video playback speed (frames per second)        "
 msgstr ""
 
-#: src/gui.c:2009
+#: src/gui.c:2008
 msgid "Vary the video speed"
 msgstr ""
 
-#: src/gui.c:2092 src/gui.c:3218
+#: src/gui.c:2090 src/gui.c:3329
 msgid "First Frame"
 msgstr ""
 
-#: src/gui.c:2193 src/gui.c:3226
+#: src/gui.c:2191 src/gui.c:3336
 msgid "Last Frame"
 msgstr ""
 
-#: src/gui.c:2210
+#: src/gui.c:2208
 msgid "The first selected frame in this clip"
 msgstr ""
 
-#: src/gui.c:2248
+#: src/gui.c:2246
 msgid "The last selected frame in this clip"
 msgstr ""
 
-#: src/gui.c:2532
+#: src/gui.c:2546
 msgid "Starting...\n"
 msgstr ""
 
-#: src/gui.c:3074
+#: src/gui.c:3181
 msgid "    Press 'q' to stop recording.  DO NOT COVER THE PLAY WINDOW !   "
 msgstr ""
 
-#: src/gui.c:3521
+#: src/gui.c:3643
 msgid "Frame number to preview"
 msgstr ""
 
-#: src/gui.c:3538
+#: src/gui.c:3660
 msgid "_Free"
 msgstr "_Vaba"
 
-#: src/gui.c:3539
+#: src/gui.c:3661
 msgid "Free choice of frame number"
 msgstr ""
 
-#: src/gui.c:3543
+#: src/gui.c:3666
 msgid "_Start"
 msgstr "_Alusta"
 
-#: src/gui.c:3544
+#: src/gui.c:3667
 msgid "Frame number is linked to start frame"
 msgstr ""
 
-#: src/gui.c:3551
+#: src/gui.c:3675
 msgid "_End"
 msgstr ""
 
-#: src/gui.c:3552
+#: src/gui.c:3676
 msgid "Frame number is linked to end frame"
 msgstr ""
 
-#: src/gui.c:3559
+#: src/gui.c:3684
 msgid "_Pointer"
 msgstr ""
 
-#: src/gui.c:3560
+#: src/gui.c:3685
 msgid "Frame number is linked to playback pointer"
 msgstr ""
 
-#: src/gui.c:3581
+#: src/gui.c:3707
 msgid "Rewind"
 msgstr "Tagasikerimine"
 
-#: src/gui.c:3592 src/dialogs.c:894 src/dialogs.c:896 src/dialogs.c:1817
-#: src/dialogs.c:1819
+#: src/gui.c:3718 src/dialogs.c:960 src/dialogs.c:962 src/dialogs.c:1873
+#: src/dialogs.c:1875
 msgid "Play all"
 msgstr ""
 
-#: src/gui.c:3605
+#: src/gui.c:3731
 msgid "Play Selection"
 msgstr ""
 
-#: src/gui.c:3619
+#: src/gui.c:3745
 msgid "Loop On/Off"
 msgstr ""
 
-#: src/gui.c:3693
+#: src/gui.c:3819
 msgid "Start _recording"
 msgstr ""
 
-#: src/gui.c:3698
+#: src/gui.c:3824
 msgid "Stop _recording"
 msgstr ""
 
-#: src/gui.c:3703
+#: src/gui.c:3829
 msgid "_Record Performance"
 msgstr ""
 
-#: src/gui.c:3851
+#: src/gui.c:3974
 msgid "Hide Play Window"
 msgstr ""
 
-#: src/gui.c:4232
+#: src/gui.c:4333
 msgid "Show Play Window"
 msgstr ""
 
-#: src/ce_thumbs.c:222
+#: src/ce_thumbs.c:242
 #, c-format
 msgid "Mapped to ctrl-%d"
 msgstr ""
 
-#: src/ce_thumbs.c:276 src/effects.c:85 src/preferences.c:3195
+#: src/ce_thumbs.c:296 src/effects.c:86 src/preferences.c:3247
 msgid "Effects"
 msgstr "Efektid"
 
-#: src/ce_thumbs.c:279 src/multitrack.c:5615
+#: src/ce_thumbs.c:299 src/multitrack.c:5791
 msgid "Clips"
 msgstr ""
 
-#: src/ce_thumbs.c:303
+#: src/ce_thumbs.c:323
 #, c-format
 msgid "Show / apply effects to %s\n"
 msgstr ""
 
-#: src/ce_thumbs.c:315
+#: src/ce_thumbs.c:335
 #, c-format
 msgid "Select clip for %s\n"
 msgstr ""
 
-#: src/ce_thumbs.c:515
+#: src/ce_thumbs.c:536
 msgid "_Pin"
 msgstr ""
 
-#: src/ce_thumbs.c:515
+#: src/ce_thumbs.c:537
 msgid "Pin the parameter box to the window"
 msgstr ""
 
 #. TRANSLATORS: Exabytes
-#: src/utils.c:794
+#: src/utils.c:800
 #, c-format
 msgid "%.2f EB"
 msgstr ""
 
 #. TRANSLATORS: Petabytes
-#: src/utils.c:798
+#: src/utils.c:803
 #, c-format
 msgid "%.2f PB"
 msgstr ""
 
 #. TRANSLATORS: Terabytes
-#: src/utils.c:802
+#: src/utils.c:806
 #, c-format
 msgid "%.2f TB"
 msgstr ""
 
 #. TRANSLATORS: Gigabytes
-#: src/utils.c:806
+#: src/utils.c:809
 #, c-format
 msgid "%.2f GB"
 msgstr ""
 
 #. TRANSLATORS: Megabytes
-#: src/utils.c:810
+#: src/utils.c:812
 #, c-format
 msgid "%.2f MB"
 msgstr ""
 
 #. TRANSLATORS: Kilobytes (1024 bytes)
-#: src/utils.c:814
+#: src/utils.c:815
 #, c-format
 msgid "%.2f KiB"
 msgstr ""
@@ -3564,7 +3554,7 @@
 msgid "%d bytes"
 msgstr ""
 
-#: src/utils.c:1841
+#: src/utils.c:1835
 msgid "Clearing the clipboard"
 msgstr ""
 
@@ -3576,81 +3566,81 @@
 "Switched to clip %s\n"
 msgstr ""
 
-#: src/utils.c:1880
+#: src/utils.c:1877
 msgid ""
 "\n"
 "==============================\n"
 "Switched to empty clip\n"
 msgstr ""
 
-#: src/utils.c:1917
+#: src/utils.c:1916
 msgid "(blank)"
 msgstr ""
 
-#: src/utils.c:1920
+#: src/utils.c:1919
 #, c-format
 msgid ""
 "The set name has been changed from %s to %s. Affected layouts have been "
 "updated accordingly\n"
 msgstr ""
 
-#: src/utils.c:1928
+#: src/utils.c:1927
 #, c-format
 msgid ""
 "The clip %s is missing from this set.\n"
 "It is required by the following layouts:\n"
 msgstr ""
 
-#: src/utils.c:1932
+#: src/utils.c:1931
 #, c-format
 msgid ""
 "The clip %s has been closed.\n"
 "It is required by the following layouts:\n"
 msgstr ""
 
-#: src/utils.c:1937
+#: src/utils.c:1936
 #, c-format
 msgid ""
 "Frames have been shifted in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1942
+#: src/utils.c:1941
 #, c-format
 msgid ""
 "Frames have been deleted from the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1947
+#: src/utils.c:1946
 #, c-format
 msgid ""
 "Audio has been deleted from the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1952
+#: src/utils.c:1951
 #, c-format
 msgid ""
 "Audio has been shifted in clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1957
+#: src/utils.c:1956
 #, c-format
 msgid ""
 "Audio has been altered in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1962
+#: src/utils.c:1961
 #, c-format
 msgid ""
 "Frames have been altered in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:2135
+#: src/utils.c:2134
 #, c-format
 msgid ""
 "Set %s\n"
@@ -3658,7 +3648,7 @@
 "by another copy of LiVES.\n"
 msgstr ""
 
-#: src/utils.c:2142
+#: src/utils.c:2140
 #, c-format
 msgid ""
 "\n"
@@ -3704,67 +3694,67 @@
 msgid "Removing layout %s\n"
 msgstr ""
 
-#: src/utils.c:3014
+#: src/utils.c:2996
 msgid "Video [opening...]"
 msgstr ""
 
-#: src/utils.c:3018
+#: src/utils.c:2999
 #, c-format
 msgid "Video [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:3022
+#: src/utils.c:3002
 msgid "(Undefined)"
 msgstr ""
 
-#: src/utils.c:3025
+#: src/utils.c:3004
 msgid "(No video)"
 msgstr ""
 
-#: src/utils.c:3032
+#: src/utils.c:3011
 msgid "(No audio)"
 msgstr ""
 
-#: src/utils.c:3037
+#: src/utils.c:3015
 msgid "Mono  [opening...]"
 msgstr ""
 
-#: src/utils.c:3040
+#: src/utils.c:3017
 msgid "Left Audio [opening...]"
 msgstr ""
 
-#: src/utils.c:3045
+#: src/utils.c:3021
 #, c-format
 msgid "Mono [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:3048
+#: src/utils.c:3023
 #, c-format
 msgid "Left Audio [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:3056
+#: src/utils.c:3031
 msgid "Right Audio [opening...]"
 msgstr ""
 
-#: src/utils.c:3059
+#: src/utils.c:3033
 #, c-format
 msgid "Right Audio [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:3506
+#: src/utils.c:3472
 msgid "LiVES cannot switch to mplayer whilst clips are loading."
 msgstr ""
 
-#: src/utils.c:3559
+#: src/utils.c:3525
 msgid "LiVES cannot switch to mplayer2 whilst clips are loading."
 msgstr ""
 
-#: src/utils.c:3809
+#: src/utils.c:3775
 msgid "Cleaning up clip"
 msgstr ""
 
-#: src/utils.c:3913
+#: src/utils.c:3874
 #, c-format
 msgid ""
 "\n"
@@ -3774,30 +3764,29 @@
 "Overwrite ?\n"
 msgstr ""
 
-#: src/utils.c:4305 src/utils.c:4337 src/multitrack.c:4503
+#: src/utils.c:4250 src/utils.c:4280 src/multitrack.c:4672
 #, c-format
 msgid "_Undo %s"
 msgstr "_Võta tagasi %s"
 
-#: src/utils.c:4306 src/utils.c:4338 src/multitrack.c:4525
+#: src/utils.c:4251 src/utils.c:4281 src/multitrack.c:4693
 #, c-format
 msgid "_Redo %s"
 msgstr "_Tee uuesti %s"
 
-#: src/utils.c:4363
+#: src/utils.c:4305
 msgid "-------------Selection------------"
 msgstr ""
 
-#. TRANSLATORS: - try to keep the text of the middle part the same length, by deleting "-" if necessary
-#: src/utils.c:4371
+#: src/utils.c:4313
 msgid " sec ] ----------Selection---------- [ "
 msgstr ""
 
-#: src/utils.c:4371
+#: src/utils.c:4314
 msgid " frames ] ----------"
 msgstr ""
 
-#: src/utils.c:5360
+#: src/utils.c:5302
 msgid ""
 "Your version of mplayer/ffmpeg may be broken !\n"
 "See http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2071\n"
@@ -3808,11 +3797,11 @@
 "Try running Help/Troubleshoot for more information."
 msgstr ""
 
-#: src/saveplay.c:178
+#: src/saveplay.c:179
 msgid "Examining file header"
 msgstr ""
 
-#: src/saveplay.c:315 src/saveplay.c:789
+#: src/saveplay.c:316 src/saveplay.c:779
 #, c-format
 msgid "Opening %s"
 msgstr "Avamine %s"
@@ -3822,36 +3811,36 @@
 msgid "Opening %s start time %.2f sec. frames %d"
 msgstr ""
 
-#: src/saveplay.c:326 src/saveplay.c:4001
+#: src/saveplay.c:326 src/saveplay.c:3927
 msgid " without sound"
 msgstr ""
 
-#: src/saveplay.c:396
+#: src/saveplay.c:395
 #, c-format
 msgid "Opening audio for %s"
 msgstr ""
 
-#: src/saveplay.c:557
+#: src/saveplay.c:554
 #, c-format
 msgid "Auto trimming %.2f seconds of audio at start..."
 msgstr ""
 
-#: src/saveplay.c:567
+#: src/saveplay.c:562
 #, c-format
 msgid "Auto trimming %.2f seconds of audio at end..."
 msgstr ""
 
-#: src/saveplay.c:584
+#: src/saveplay.c:577
 #, c-format
 msgid "Auto padding with %.2f seconds of silence at start..."
 msgstr ""
 
-#: src/saveplay.c:599
+#: src/saveplay.c:590
 #, c-format
 msgid "Auto padding with %.2f seconds of silence at end..."
 msgstr ""
 
-#: src/saveplay.c:671
+#: src/saveplay.c:661
 #, c-format
 msgid ""
 "\n"
@@ -3863,11 +3852,11 @@
 "Are you sure you wish to continue ?"
 msgstr ""
 
-#: src/saveplay.c:685
+#: src/saveplay.c:676
 msgid " - please be patient."
 msgstr ""
 
-#: src/saveplay.c:938
+#: src/saveplay.c:926
 msgid ""
 "\n"
 "\n"
@@ -3875,14 +3864,14 @@
 "Please check the terminal window for more details.\n"
 msgstr ""
 
-#: src/saveplay.c:940
+#: src/saveplay.c:928
 msgid ""
 "\n"
 "\n"
 "You may need to install mplayer to open this file.\n"
 msgstr ""
 
-#: src/saveplay.c:948
+#: src/saveplay.c:934
 msgid ""
 "\n"
 "\n"
@@ -3890,29 +3879,29 @@
 "Tools|Preferences|Decoding\n"
 msgstr ""
 
-#: src/saveplay.c:1014
+#: src/saveplay.c:995
 msgid "Adding image..."
 msgstr ""
 
-#: src/saveplay.c:1108
+#: src/saveplay.c:1089
 #, c-format
 msgid "Subtitles were saved as %s\n"
 msgstr ""
 
-#: src/saveplay.c:1192
+#: src/saveplay.c:1171
 #, c-format
 msgid "LiVES: Save Frame %d as..."
 msgstr ""
 
-#: src/saveplay.c:1195
+#: src/saveplay.c:1174
 msgid "LiVES: Save Frame as..."
 msgstr ""
 
-#: src/saveplay.c:1322
+#: src/saveplay.c:1303
 msgid "LiVES: Save Clip as..."
 msgstr ""
 
-#: src/saveplay.c:1390
+#: src/saveplay.c:1369
 msgid ""
 "Saving your video could lead to a loss of quality !\n"
 "You are strongly advised to 'Save As' to a new file.\n"
@@ -3920,67 +3909,67 @@
 "Do you still wish to continue ?"
 msgstr ""
 
-#: src/saveplay.c:1517 src/saveplay.c:1683 src/saveplay.c:1762
-#: src/saveplay.c:4014
+#: src/saveplay.c:1494 src/saveplay.c:1659 src/saveplay.c:1738
+#: src/saveplay.c:3940
 msgid "Pulling frames from clip"
 msgstr ""
 
-#: src/saveplay.c:1588 src/saveplay.c:1727
+#: src/saveplay.c:1565 src/saveplay.c:1703
 msgid "Linking selection"
 msgstr ""
 
-#: src/saveplay.c:1779
+#: src/saveplay.c:1755
 msgid " (with no sound)\n"
 msgstr ""
 
-#: src/saveplay.c:1786
+#: src/saveplay.c:1761
 #, c-format
 msgid "Saving frames %d to %d%s as \"%s\" : encoder = %s : format = %s..."
 msgstr ""
 
-#: src/saveplay.c:1790
+#: src/saveplay.c:1765
 #, c-format
 msgid "Saving frames 1 to %d%s as \"%s\" : encoder %s : format = %s..."
 msgstr ""
 
-#: src/saveplay.c:1909
+#: src/saveplay.c:1890
 msgid "Saving [can take a long time]"
 msgstr ""
 
-#: src/saveplay.c:2057
+#: src/saveplay.c:2044
 msgid ""
 "\n"
 "\n"
 "Encoder error - output file was not created !\n"
 msgstr ""
 
-#: src/saveplay.c:2094
+#: src/saveplay.c:2081
 msgid "Clearing letterbox"
 msgstr ""
 
-#: src/saveplay.c:2183
+#: src/saveplay.c:2168
 #, c-format
 msgid "File size was %s\n"
 msgstr ""
 
-#: src/saveplay.c:2284
+#: src/saveplay.c:2265
 msgid "recording aborted by preview.\n"
 msgstr ""
 
-#: src/saveplay.c:2288
+#: src/saveplay.c:2268
 msgid "recording aborted by clipboard playback.\n"
 msgstr ""
 
-#: src/saveplay.c:2291
+#: src/saveplay.c:2270
 msgid "Recording performance..."
 msgstr ""
 
-#: src/saveplay.c:3293
+#: src/saveplay.c:3251
 #, c-format
 msgid "Average FPS was %.4f\n"
 msgstr ""
 
-#: src/saveplay.c:3299
+#: src/saveplay.c:3256
 msgid ""
 "\n"
 "\n"
@@ -3989,16 +3978,21 @@
 "and resize all frames to the current size.\n"
 msgstr ""
 
-#: src/saveplay.c:3479
+#: src/saveplay.c:3429
 msgid "Unknown"
 msgstr "Tundmatu"
 
-#: src/saveplay.c:3588 src/saveplay.c:4585
+#: src/saveplay.c:3538 src/saveplay.c:4502
 #, c-format
 msgid "Untitled%d"
 msgstr "Pealkirjata%d"
 
-#: src/saveplay.c:3633
+#: src/saveplay.c:3567
+#, c-format
+msgid "%d frames are enough !\n"
+msgstr ""
+
+#: src/saveplay.c:3579
 #, c-format
 msgid ""
 "\n"
@@ -4006,7 +4000,7 @@
 "Bad things may happen with this clip.\n"
 msgstr ""
 
-#: src/saveplay.c:3723
+#: src/saveplay.c:3667
 #, c-format
 msgid ""
 "\n"
@@ -4014,73 +4008,73 @@
 "Default can be set in Tools | Preferences | Misc.\n"
 msgstr ""
 
-#: src/saveplay.c:3735
+#: src/saveplay.c:3677
 #, c-format
 msgid "Playback speed was adjusted to %.3f frames per second to fit audio.\n"
 msgstr ""
 
-#: src/saveplay.c:3754
+#: src/saveplay.c:3694
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d *bpp=Greyscale* fps=%.3f\n"
 "Audio:"
 msgstr ""
 
-#: src/saveplay.c:3758 src/saveplay.c:4762
+#: src/saveplay.c:3698 src/saveplay.c:4671
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d bpp=%d fps=%.3f\n"
 "Audio:"
 msgstr ""
 
-#: src/saveplay.c:3762 src/saveplay.c:4766
+#: src/saveplay.c:3703 src/saveplay.c:4676
 #, c-format
 msgid "%s none\n"
 msgstr ""
 
-#: src/saveplay.c:3774
+#: src/saveplay.c:3714
 #, fuzzy, c-format
 msgid " - Author: %s\n"
 msgstr "Autor: %s"
 
-#: src/saveplay.c:3779
+#: src/saveplay.c:3717
 #, c-format
 msgid " - Title: %s\n"
 msgstr ""
 
-#: src/saveplay.c:3784
+#: src/saveplay.c:3720
 #, c-format
 msgid " - Comment: %s\n"
 msgstr ""
 
-#: src/saveplay.c:3897
+#: src/saveplay.c:3829
 #, c-format
 msgid "Saving frame %d as %s..."
 msgstr ""
 
-#: src/saveplay.c:3996
+#: src/saveplay.c:3924
 #, c-format
 msgid "Backing up %s to %s"
 msgstr ""
 
-#: src/saveplay.c:4049
+#: src/saveplay.c:3975
 msgid "Backing up"
 msgstr ""
 
-#: src/saveplay.c:4083
+#: src/saveplay.c:4009
 msgid "performance data was backed up..."
 msgstr ""
 
-#: src/saveplay.c:4661
+#: src/saveplay.c:4574
 #, c-format
 msgid "Restoring %s..."
 msgstr ""
 
-#: src/saveplay.c:4692
+#: src/saveplay.c:4603
 msgid "Restoring"
 msgstr "Taastamine"
 
-#: src/saveplay.c:4714
+#: src/saveplay.c:4625
 #, c-format
 msgid ""
 "\n"
@@ -4090,22 +4084,22 @@
 msgstr ""
 
 #. TRANSLATORS: rec(ord) %.2f M(ega)B(ytes)
-#: src/saveplay.c:5207
+#: src/saveplay.c:5118
 #, c-format
 msgid "rec %.2f MB"
 msgstr ""
 
-#: src/saveplay.c:5213
+#: src/saveplay.c:5123
 #, c-format
 msgid "!rec %.2f MB"
 msgstr ""
 
 #. TRANSLATORS: rec(ord) ?? M(ega)B(ytes)
-#: src/saveplay.c:5216
+#: src/saveplay.c:5126
 msgid "rec ?? MB"
 msgstr ""
 
-#: src/saveplay.c:5241
+#: src/saveplay.c:5151
 #, c-format
 msgid ""
 "\n"
@@ -4113,54 +4107,72 @@
 "Record stop level can be set in Preferences.\n"
 msgstr ""
 
-#: src/saveplay.c:5535
+#: src/saveplay.c:5447
 msgid ""
 "\n"
 "Files from a previous run of LiVES were found.\n"
 "Do you want to attempt to recover them ?\n"
 msgstr ""
 
-#: src/saveplay.c:5557
+#: src/saveplay.c:5469
 msgid "Recovering files"
 msgstr ""
 
-#: src/saveplay.c:5560
+#: src/saveplay.c:5472
 msgid "Recovering files..."
 msgstr ""
 
-#: src/dialogs.c:72
+#: src/dialogs.c:71
 msgid "Show affected _layouts"
 msgstr ""
 
-#: src/dialogs.c:128
+#: src/dialogs.c:113
+msgid ""
+"Do _not show this warning any more\n"
+"(can be turned back on from Preferences/Warnings)"
+msgstr ""
+
+#: src/dialogs.c:127
 msgid "_Recover disk space"
 msgstr ""
 
-#: src/dialogs.c:143
+#: src/dialogs.c:142
 msgid " _Advanced Settings >>"
 msgstr ""
 
-#: src/dialogs.c:184
+#: src/dialogs.c:183 src/dialogs.c:221
 msgid "LiVES: - Warning !"
 msgstr ""
 
 #: src/dialogs.c:194
-msgid "LiVES: - Question"
+msgid "LiVES: - Error !"
 msgstr ""
 
 #: src/dialogs.c:204
+msgid "LiVES: - Information"
+msgstr ""
+
+#: src/dialogs.c:230
+msgid "LiVES: - Question"
+msgstr ""
+
+#: src/dialogs.c:239
 msgid "LiVES: - File Error"
 msgstr ""
 
-#: src/dialogs.c:208
+#: src/dialogs.c:241
 msgid "_Abort"
 msgstr ""
 
-#: src/dialogs.c:213
+#: src/dialogs.c:246
 msgid "_Retry"
 msgstr ""
 
-#: src/dialogs.c:597
+#: src/dialogs.c:306
+msgid "Show _Details"
+msgstr "Näita _detailisi"
+
+#: src/dialogs.c:657
 #, c-format
 msgid ""
 "FREE SPACE IN THE PARTITION CONTAINING\n"
@@ -4171,7 +4183,7 @@
 "(Disk warning levels can be configured in Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:615
+#: src/dialogs.c:676
 #, c-format
 msgid ""
 "Free space in the partition containing\n"
@@ -4183,11 +4195,11 @@
 "Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:627
+#: src/dialogs.c:688
 msgid "Audio players cannot be switched during playback."
 msgstr ""
 
-#: src/dialogs.c:632
+#: src/dialogs.c:694
 msgid ""
 "\n"
 "\n"
@@ -4195,46 +4207,46 @@
 "Please try closing some other applications first.\n"
 msgstr ""
 
-#: src/dialogs.c:752
+#: src/dialogs.c:820
 msgid "Processing has been paused."
 msgstr ""
 
-#: src/dialogs.c:937
+#: src/dialogs.c:1002
 #, c-format
 msgid ""
 "\n"
 "%s%d%% done. Time remaining: %u sec%s\n"
 msgstr ""
 
-#: src/dialogs.c:1335
+#: src/dialogs.c:1391
 #, c-format
 msgid ""
 "\n"
 "%d/%d frames opened. Time remaining %u sec.\n"
 msgstr ""
 
-#: src/dialogs.c:1337
+#: src/dialogs.c:1393
 #, c-format
 msgid ""
 "\n"
 "%d/%d frames opened.\n"
 msgstr ""
 
-#: src/dialogs.c:1341
+#: src/dialogs.c:1396
 #, c-format
 msgid ""
 "\n"
 "%d frames opened.\n"
 msgstr ""
 
-#: src/dialogs.c:1940
+#: src/dialogs.c:1993
 #, c-format
 msgid ""
 "\n"
 "Time remaining: %d sec"
 msgstr ""
 
-#: src/dialogs.c:1988
+#: src/dialogs.c:2040
 #, c-format
 msgid ""
 "\n"
@@ -4242,7 +4254,7 @@
 "Please close a file and then try again."
 msgstr ""
 
-#: src/dialogs.c:1994
+#: src/dialogs.c:2047
 #, c-format
 msgid ""
 "LiVES was unable to write to its temporary directory.\n"
@@ -4254,27 +4266,27 @@
 "Please make sure you can write to this directory."
 msgstr ""
 
-#: src/dialogs.c:2005
+#: src/dialogs.c:2059
 msgid ""
 "\n"
 "LiVES currently requires either 'mplayer', 'mplayer2', or 'sox' to function. "
 "Please install one or other of these, and try again.\n"
 msgstr ""
 
-#: src/dialogs.c:2010
+#: src/dialogs.c:2064
 msgid ""
 "Audio was not loaded; please install mplayer or mplayer2 if you expected "
 "audio for this clip.\n"
 msgstr ""
 
-#: src/dialogs.c:2014
+#: src/dialogs.c:2069
 msgid ""
 "Audio resampling is required for this format.\n"
 "Please install 'sox'\n"
 "Or switch to another encoder format in Tools | Preferences | Encoding\n"
 msgstr ""
 
-#: src/dialogs.c:2019
+#: src/dialogs.c:2075
 msgid ""
 "\n"
 "\n"
@@ -4282,19 +4294,19 @@
 "Please set the audio codec in Tools|Preferences|Encoding\n"
 msgstr ""
 
-#: src/dialogs.c:2024
+#: src/dialogs.c:2080
 msgid ""
 "This layout includes generated frames.\n"
 "It cannot be saved, you must render it to a clip first.\n"
 msgstr ""
 
-#: src/dialogs.c:2029
+#: src/dialogs.c:2085
 msgid ""
 "This layout includes generated or recorded audio.\n"
 "It cannot be saved, you must render it to a clip first.\n"
 msgstr ""
 
-#: src/dialogs.c:2039 src/dialogs.c:2137
+#: src/dialogs.c:2095 src/dialogs.c:2189
 #, c-format
 msgid ""
 "\n"
@@ -4302,83 +4314,83 @@
 "Due to restrictions in the %s format\n"
 msgstr ""
 
-#: src/dialogs.c:2059
+#: src/dialogs.c:2115
 msgid ""
 "LiVES recommends the following settings:\n"
 "\n"
 msgstr ""
 
-#: src/dialogs.c:2065 src/dialogs.c:2174 src/resample.c:850
+#: src/dialogs.c:2121 src/dialogs.c:2225 src/resample.c:839
 msgid ", signed"
 msgstr ""
 
-#: src/dialogs.c:2066 src/dialogs.c:2175 src/resample.c:853
+#: src/dialogs.c:2122 src/dialogs.c:2226 src/resample.c:841
 msgid ", unsigned"
 msgstr ""
 
-#: src/dialogs.c:2070 src/dialogs.c:2179 src/resample.c:858
+#: src/dialogs.c:2126 src/dialogs.c:2230 src/resample.c:846
 msgid ", little-endian"
 msgstr ""
 
-#: src/dialogs.c:2071 src/dialogs.c:2180 src/resample.c:861
+#: src/dialogs.c:2127 src/dialogs.c:2231 src/resample.c:848
 msgid ", big-endian"
 msgstr ""
 
-#: src/dialogs.c:2077
+#: src/dialogs.c:2132
 #, c-format
 msgid "Use an audio rate of %d Hz%s%s\n"
 msgstr ""
 
-#: src/dialogs.c:2085
+#: src/dialogs.c:2140
 #, c-format
 msgid "Set video rate to %.3f frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:2089
+#: src/dialogs.c:2143
 #, c-format
 msgid "Set video rate to %d:%d frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:2094 src/dialogs.c:2209
+#: src/dialogs.c:2148 src/dialogs.c:2258
 #, c-format
 msgid "Set video size to %d x %d pixels\n"
 msgstr ""
 
-#: src/dialogs.c:2102 src/dialogs.c:2208
+#: src/dialogs.c:2156 src/dialogs.c:2257
 msgid ""
 "\n"
 "You may wish to:\n"
 msgstr ""
 
-#: src/dialogs.c:2105 src/dialogs.c:2200
+#: src/dialogs.c:2159 src/dialogs.c:2249
 #, c-format
 msgid "resize video to %d x %d pixels\n"
 msgstr ""
 
-#: src/dialogs.c:2110
+#: src/dialogs.c:2163
 msgid "disable audio, since the target encoder cannot encode audio\n"
 msgstr ""
 
-#: src/dialogs.c:2170
+#: src/dialogs.c:2221
 msgid "LiVES must:\n"
 msgstr ""
 
-#: src/dialogs.c:2185
+#: src/dialogs.c:2235
 #, c-format
 msgid "resample audio to %d Hz%s%s\n"
 msgstr ""
 
-#: src/dialogs.c:2192
+#: src/dialogs.c:2242
 #, c-format
 msgid "resample video to %.3f frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:2196
+#: src/dialogs.c:2245
 #, c-format
 msgid "resample video to %d:%d frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:2215
+#: src/dialogs.c:2263
 msgid ""
 "\n"
 "You will be able to undo these changes afterwards.\n"
@@ -4387,14 +4399,14 @@
 "\n"
 msgstr ""
 
-#: src/dialogs.c:2218
+#: src/dialogs.c:2265
 msgid ""
 "\n"
 "Changes applied to the selection will not be permanent.\n"
 "\n"
 msgstr ""
 
-#: src/dialogs.c:2237
+#: src/dialogs.c:2285
 msgid ""
 "\n"
 "\n"
@@ -4403,7 +4415,7 @@
 "Try recording for just a selection of the file."
 msgstr ""
 
-#: src/dialogs.c:2244
+#: src/dialogs.c:2293
 msgid ""
 "The playback speed (fps), or the audio rate\n"
 " of the clipboard does not match\n"
@@ -4414,7 +4426,7 @@
 "Please press Cancel to abort the insert, or OK to continue."
 msgstr ""
 
-#: src/dialogs.c:2253
+#: src/dialogs.c:2304
 #, c-format
 msgid ""
 "When opening a yuvmpeg stream, you should first create a fifo file in:\n"
@@ -4427,11 +4439,11 @@
 "click Cancel."
 msgstr ""
 
-#: src/dialogs.c:2305
+#: src/dialogs.c:2356
 msgid "Show Keys"
 msgstr ""
 
-#: src/dialogs.c:2306
+#: src/dialogs.c:2358
 msgid ""
 "You can use the following keys during playback to control LiVES:-\n"
 "\n"
@@ -4473,11 +4485,11 @@
 "g                             ping pong loops\n"
 msgstr ""
 
-#: src/dialogs.c:2313
+#: src/dialogs.c:2365
 msgid "Multitrack Keys"
 msgstr ""
 
-#: src/dialogs.c:2314
+#: src/dialogs.c:2367
 msgid ""
 "You can use the following keys to control the multitrack window:-\n"
 "\n"
@@ -4499,18 +4511,18 @@
 "For other keys, see the menus.\n"
 msgstr ""
 
-#: src/dialogs.c:2322
+#: src/dialogs.c:2375
 msgid "Message History"
 msgstr ""
 
-#: src/dialogs.c:2335
+#: src/dialogs.c:2388
 #, c-format
 msgid ""
 "After upgrading/installing, you may need to adjust the <prefix_dir> setting "
 "in your %s file"
 msgstr ""
 
-#: src/dialogs.c:2344
+#: src/dialogs.c:2399
 #, c-format
 msgid ""
 "\n"
@@ -4521,25 +4533,25 @@
 "or change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/dialogs.c:2352
+#: src/dialogs.c:2408
 msgid ""
 "Sorry, unknown audio type.\n"
 "\n"
 " (Filenames must end in .mp3, .ogg, .wav, .mod, .xm or .it)"
 msgstr ""
 
-#: src/dialogs.c:2353
+#: src/dialogs.c:2409
 msgid "failed (unknown type)\n"
 msgstr ""
 
-#: src/dialogs.c:2358
+#: src/dialogs.c:2415
 msgid ""
 "\n"
 "Do you wish to remove the layout files associated with this set ?\n"
 "(They will not be usable without the set).\n"
 msgstr ""
 
-#: src/dialogs.c:2363
+#: src/dialogs.c:2421
 #, c-format
 msgid ""
 "\n"
@@ -4548,7 +4560,7 @@
 "Click Cancel to pick a new name.\n"
 msgstr ""
 
-#: src/dialogs.c:2370
+#: src/dialogs.c:2429
 msgid ""
 "\n"
 "Frames from this clip are used in some multitrack layouts.\n"
@@ -4556,7 +4568,7 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2374
+#: src/dialogs.c:2433
 msgid ""
 "\n"
 "Audio from this clip is used in some multitrack layouts.\n"
@@ -4564,7 +4576,7 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2378
+#: src/dialogs.c:2438
 #, c-format
 msgid ""
 "\n"
@@ -4575,7 +4587,7 @@
 "Otherwise click Cancel to skip loading this file.\n"
 msgstr ""
 
-#: src/dialogs.c:2385
+#: src/dialogs.c:2446
 #, c-format
 msgid ""
 "\n"
@@ -4585,7 +4597,7 @@
 "The clip could not be loaded.\n"
 msgstr ""
 
-#: src/dialogs.c:2392
+#: src/dialogs.c:2455
 msgid ""
 "\n"
 "Dear user, the jack developers decided to remove the -Z option from jackd.\n"
@@ -4593,7 +4605,7 @@
 "Alternately, select a different audio player in Preferences.\n"
 msgstr ""
 
-#: src/dialogs.c:2396
+#: src/dialogs.c:2460
 msgid ""
 "\n"
 "Unable to start up jack. Please ensure that alsa is set up correctly on your "
@@ -4602,13 +4614,13 @@
 "Automatic jack startup will be disabled now.\n"
 msgstr ""
 
-#: src/dialogs.c:2402
+#: src/dialogs.c:2466
 msgid ""
 "\n"
 "Unable to connect to jack server. Please start jack before starting LiVES\n"
 msgstr ""
 
-#: src/dialogs.c:2411
+#: src/dialogs.c:2475
 #, c-format
 msgid ""
 "\n"
@@ -4619,13 +4631,13 @@
 "%s\n"
 msgstr ""
 
-#: src/dialogs.c:2418
+#: src/dialogs.c:2482
 msgid ""
 "\n"
 "Alternately, you can restart LiVES and select another audio player.\n"
 msgstr ""
 
-#: src/dialogs.c:2423
+#: src/dialogs.c:2488
 #, c-format
 msgid ""
 "\n"
@@ -4635,7 +4647,7 @@
 "It is recommended to increase it to at least %d MB"
 msgstr ""
 
-#: src/dialogs.c:2429
+#: src/dialogs.c:2496
 #, c-format
 msgid ""
 "\n"
@@ -4644,7 +4656,7 @@
 "Do you wish to delete them ?\n"
 msgstr ""
 
-#: src/dialogs.c:2436
+#: src/dialogs.c:2504
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for multitrack undo.\n"
@@ -4652,7 +4664,7 @@
 "using Preferences/Multitrack/Undo Memory\n"
 msgstr ""
 
-#: src/dialogs.c:2440
+#: src/dialogs.c:2508
 msgid ""
 "\n"
 "Out of memory for undo.\n"
@@ -4660,63 +4672,63 @@
 "using Preferences/Multitrack/Undo Memory\n"
 msgstr ""
 
-#: src/dialogs.c:2444
+#: src/dialogs.c:2512
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for the multitrack undo buffer.\n"
 msgstr ""
 
-#: src/dialogs.c:2446
+#: src/dialogs.c:2514
 msgid "or enter a smaller value.\n"
 msgstr ""
 
-#: src/dialogs.c:2448
+#: src/dialogs.c:2516
 msgid "Try again from the clip editor, try closing some other applications\n"
 msgstr ""
 
-#: src/dialogs.c:2449
+#: src/dialogs.c:2517
 msgid "Try closing some other applications\n"
 msgstr ""
 
-#: src/dialogs.c:2460
+#: src/dialogs.c:2529
 msgid ""
 "Multitrack is set to 0 audio channels, but this layout has audio.\n"
 "You should adjust the audio settings from the Tools menu.\n"
 msgstr ""
 
-#: src/dialogs.c:2464
+#: src/dialogs.c:2534
 msgid ""
 "The current layout has audio, so audio channels may not be set to zero.\n"
 msgstr ""
 
-#: src/dialogs.c:2468
+#: src/dialogs.c:2539
 msgid ""
 "Multitrack audio preview is only available with the\n"
 "\"jack\" or \"pulse audio\" audio player.\n"
 "You can set this in Tools|Preferences|Playback."
 msgstr ""
 
-#: src/dialogs.c:2472
+#: src/dialogs.c:2545
 msgid ""
 "Errors were detected in the layout (which may be due to transferring from "
 "another system, or from an older version of LiVES).\n"
 "Should I try to repair the disk copy of the layout ?\n"
 msgstr ""
 
-#: src/dialogs.c:2476
+#: src/dialogs.c:2549
 msgid ""
 "LiVES was unable to load the layout.\n"
 "Sorry.\n"
 msgstr ""
 
-#: src/dialogs.c:2482
+#: src/dialogs.c:2555
 msgid ""
 "\n"
 "\n"
 "Audio rate must be greater than 0.\n"
 msgstr ""
 
-#: src/dialogs.c:2486
+#: src/dialogs.c:2559
 msgid ""
 "\n"
 "Event list will be very large\n"
@@ -4724,14 +4736,14 @@
 "Are you sure you wish to view it ?\n"
 msgstr ""
 
-#: src/dialogs.c:2491
+#: src/dialogs.c:2564
 msgid ""
 "\n"
 "\n"
 "You must install 'dvgrab' to use this function.\n"
 msgstr ""
 
-#: src/dialogs.c:2496
+#: src/dialogs.c:2570
 msgid ""
 "\n"
 "\n"
@@ -4740,25 +4752,25 @@
 "You may need to select one of these in Tools/Preferences/Playback.\n"
 msgstr ""
 
-#: src/dialogs.c:2500
+#: src/dialogs.c:2574
 msgid "Video playback plugin failed to initialise palette !\n"
 msgstr ""
 
-#: src/dialogs.c:2504
+#: src/dialogs.c:2579
 msgid "Decoder plugin failed to initialise palette !\n"
 msgstr ""
 
-#: src/dialogs.c:2509
+#: src/dialogs.c:2584
 msgid "Unable to set framerate of video plugin\n"
 msgstr ""
 
-#: src/dialogs.c:2514
+#: src/dialogs.c:2590
 msgid ""
 "After a crash, it is advisable to clean up the disk with\n"
 "File|Clean up disk space\n"
 msgstr ""
 
-#: src/dialogs.c:2526
+#: src/dialogs.c:2604
 #, c-format
 msgid ""
 "Stream frame size is too large for your network buffers.\n"
@@ -4767,33 +4779,33 @@
 "echo %d > /proc/sys/net/core/rmem_max\n"
 msgstr ""
 
-#: src/dialogs.c:2714
+#: src/dialogs.c:2800
 msgid "cancelled.\n"
 msgstr ""
 
-#: src/dialogs.c:2721
+#: src/dialogs.c:2805
 msgid "failed.\n"
 msgstr ""
 
-#: src/dialogs.c:2728
+#: src/dialogs.c:2810
 msgid "done.\n"
 msgstr "tehtud.\n"
 
-#: src/dialogs.c:2732
+#: src/dialogs.c:2814
 msgid "error in file. Failed.\n"
 msgstr ""
 
-#: src/dialogs.c:2766 src/dialogs.c:2815 src/dialogs.c:2839
+#: src/dialogs.c:2848 src/dialogs.c:2897 src/dialogs.c:2921
 #, c-format
 msgid "Additional info: %s\n"
 msgstr ""
 
-#: src/dialogs.c:2769
+#: src/dialogs.c:2851
 #, c-format
 msgid "The error value was %d%s\n"
 msgstr ""
 
-#: src/dialogs.c:2772
+#: src/dialogs.c:2854
 #, c-format
 msgid ""
 "\n"
@@ -4803,7 +4815,7 @@
 "%s%s%s"
 msgstr ""
 
-#: src/dialogs.c:2818
+#: src/dialogs.c:2900
 #, c-format
 msgid ""
 "\n"
@@ -4813,7 +4825,7 @@
 "%s"
 msgstr ""
 
-#: src/dialogs.c:2842
+#: src/dialogs.c:2924
 #, c-format
 msgid ""
 "\n"
@@ -4823,7 +4835,7 @@
 "%s"
 msgstr ""
 
-#: src/dialogs.c:2886
+#: src/dialogs.c:2968
 #, c-format
 msgid ""
 "\n"
@@ -4832,7 +4844,7 @@
 "Please check for possible error causes.\n"
 msgstr ""
 
-#: src/dialogs.c:2890
+#: src/dialogs.c:2971
 #, c-format
 msgid ""
 "\n"
@@ -4842,7 +4854,7 @@
 "%s.\n"
 msgstr ""
 
-#: src/dialogs.c:2921
+#: src/dialogs.c:3002
 #, c-format
 msgid ""
 "\n"
@@ -4851,7 +4863,7 @@
 "Please check for possible error causes.\n"
 msgstr ""
 
-#: src/dialogs.c:2925
+#: src/dialogs.c:3005
 #, c-format
 msgid ""
 "\n"
@@ -4861,12 +4873,12 @@
 "%s.\n"
 msgstr ""
 
-#: src/dialogs.c:2993
+#: src/dialogs.c:3073
 #, c-format
 msgid "Value for \"%s\" could not be read."
 msgstr ""
 
-#: src/dialogs.c:3011
+#: src/dialogs.c:3091
 #, c-format
 msgid ""
 "\n"
@@ -4875,7 +4887,7 @@
 "Please check your system for errors.\n"
 msgstr ""
 
-#: src/dialogs.c:3020
+#: src/dialogs.c:3100
 #, c-format
 msgid ""
 "\n"
@@ -4884,7 +4896,7 @@
 "Please check the file permissions and try again."
 msgstr ""
 
-#: src/dialogs.c:3027
+#: src/dialogs.c:3109
 #, c-format
 msgid ""
 "\n"
@@ -4893,7 +4905,7 @@
 "Please check the directory permissions and try again."
 msgstr ""
 
-#: src/dialogs.c:3034
+#: src/dialogs.c:3116
 #, c-format
 msgid ""
 "\n"
@@ -4901,14 +4913,14 @@
 "%s\n"
 msgstr ""
 
-#: src/dialogs.c:3041
+#: src/dialogs.c:3123
 msgid ""
 "\n"
 "Abort and exit immediately from LiVES\n"
 "Are you sure ?\n"
 msgstr ""
 
-#: src/dialogs.c:3047
+#: src/dialogs.c:3129
 #, c-format
 msgid ""
 "\n"
@@ -4916,13 +4928,13 @@
 "Please select another encoder from the list.\n"
 msgstr ""
 
-#: src/dialogs.c:3056
+#: src/dialogs.c:3139
 msgid ""
 "\n"
 "This card is already in use and cannot be opened multiple times.\n"
 msgstr ""
 
-#: src/dialogs.c:3061
+#: src/dialogs.c:3145
 #, c-format
 msgid ""
 "\n"
@@ -4932,27 +4944,27 @@
 "- Check if the device actually exists.\n"
 msgstr ""
 
-#: src/dialogs.c:3068
+#: src/dialogs.c:3153
 msgid ""
 "\n"
 "This file already has subtitles loaded.\n"
 "Do you wish to overwrite the existing subtitles ?\n"
 msgstr ""
 
-#: src/dialogs.c:3072
+#: src/dialogs.c:3157
 msgid ""
 "\n"
 "LiVES currently only supports subtitles of type .srt and .sub.\n"
 msgstr ""
 
-#: src/dialogs.c:3076
+#: src/dialogs.c:3161
 msgid ""
 "\n"
 "Erase all subtitles from this clip.\n"
 "Are you sure ?\n"
 msgstr ""
 
-#: src/dialogs.c:3082
+#: src/dialogs.c:3168
 #, c-format
 msgid ""
 "\n"
@@ -4961,14 +4973,14 @@
 "or OK to continue and save as type \"%s\"\n"
 msgstr ""
 
-#: src/dialogs.c:3089
+#: src/dialogs.c:3176
 msgid ""
 "\n"
 "Do you wish to move the current clip sets to the new directory ?\n"
 "(If unsure, click Yes)\n"
 msgstr ""
 
-#: src/dialogs.c:3093
+#: src/dialogs.c:3181
 #, c-format
 msgid ""
 "\n"
@@ -4979,19 +4991,19 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:3099
+#: src/dialogs.c:3188
 msgid ""
 "\n"
 "No video input devices could be found.\n"
 msgstr ""
 
-#: src/dialogs.c:3103
+#: src/dialogs.c:3192
 msgid ""
 "\n"
 "All video input devices are already in use.\n"
 msgstr ""
 
-#: src/dialogs.c:3107
+#: src/dialogs.c:3196
 msgid ""
 "\n"
 "\n"
@@ -4999,15 +5011,14 @@
 "DO NOT SHUT DOWN OR CLOSE LIVES !\n"
 msgstr ""
 
-#: src/dialogs.c:3127
+#: src/dialogs.c:3203
 #, c-format
 msgid ""
 "No clips were recovered for set (%s).\n"
 "Please check the spelling of the set name and try again.\n"
 msgstr ""
 
-#. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:3136
+#: src/dialogs.c:3214
 #, c-format
 msgid ""
 "\n"
@@ -5019,7 +5030,7 @@
 msgstr ""
 
 #. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:3144
+#: src/dialogs.c:3222
 #, c-format
 msgid ""
 "\n"
@@ -5028,34 +5039,34 @@
 "\n"
 msgstr ""
 
-#: src/dialogs.c:3150
+#: src/dialogs.c:3228
 msgid ""
 "\n"
 "You must have autolives.pl installed and in your path to use this toy.\n"
 "Consult your package distributor.\n"
 msgstr ""
 
-#: src/dialogs.c:3154
+#: src/dialogs.c:3232
 msgid ""
 "\n"
 "You must have a minimum of one clip loaded to use this toy.\n"
 msgstr ""
 
-#: src/dialogs.c:3158
+#: src/dialogs.c:3236
 msgid ""
 "\n"
 "LiVES lost its connection to jack and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:3162
+#: src/dialogs.c:3240
 msgid ""
 "\n"
 "LiVES lost its connection to pulseaudio and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:3175
+#: src/dialogs.c:3254
 #, c-format
 msgid ""
 "\n"
@@ -5064,544 +5075,544 @@
 "Do you wish to allow this (for this session only) ?\n"
 msgstr ""
 
-#: src/effects.c:60
+#: src/effects.c:61
 msgid "generator"
 msgstr ""
 
-#: src/effects.c:61
+#: src/effects.c:62
 msgid "Generators"
 msgstr ""
 
-#: src/effects.c:63
+#: src/effects.c:64
 msgid "audio generator"
 msgstr ""
 
-#: src/effects.c:64
+#: src/effects.c:65
 msgid "Audio Generators"
 msgstr ""
 
-#: src/effects.c:66
+#: src/effects.c:67
 msgid "audio/video generator"
 msgstr ""
 
-#: src/effects.c:67
+#: src/effects.c:68
 msgid "Audio/Video Generators"
 msgstr ""
 
-#: src/effects.c:69
+#: src/effects.c:70
 msgid "data generator"
 msgstr ""
 
-#: src/effects.c:70
+#: src/effects.c:71
 msgid "Data Generators"
 msgstr ""
 
-#: src/effects.c:72
+#: src/effects.c:73
 msgid "data visualiser"
 msgstr ""
 
-#: src/effects.c:73
+#: src/effects.c:74
 msgid "Data Visualisers"
 msgstr ""
 
-#: src/effects.c:75
+#: src/effects.c:76
 msgid "data processor"
 msgstr ""
 
-#: src/effects.c:76
+#: src/effects.c:77
 msgid "Data Processors"
 msgstr ""
 
-#: src/effects.c:78
+#: src/effects.c:79
 msgid "data source"
 msgstr ""
 
-#: src/effects.c:79
+#: src/effects.c:80
 msgid "Data Sources"
 msgstr ""
 
-#: src/effects.c:81
+#: src/effects.c:82
 msgid "transition"
 msgstr ""
 
-#: src/effects.c:82
+#: src/effects.c:83
 msgid "Transitions"
 msgstr "Siirded"
 
-#: src/effects.c:84
+#: src/effects.c:85
 msgid "effect"
 msgstr "efekt"
 
-#: src/effects.c:87 src/rfx-builder.c:187
+#: src/effects.c:88 src/rfx-builder.c:187
 msgid "utility"
 msgstr ""
 
-#: src/effects.c:88
+#: src/effects.c:89
 msgid "Utilities"
 msgstr "Tööriistad"
 
-#: src/effects.c:90
+#: src/effects.c:91
 msgid "compositor"
 msgstr ""
 
-#: src/effects.c:91
+#: src/effects.c:92
 msgid "Compositors"
 msgstr ""
 
-#: src/effects.c:93
+#: src/effects.c:94
 msgid "tap"
 msgstr ""
 
-#: src/effects.c:94
+#: src/effects.c:95
 msgid "Taps"
 msgstr ""
 
-#: src/effects.c:96
+#: src/effects.c:97
 msgid "splitter"
 msgstr "eraldaja"
 
-#: src/effects.c:97
+#: src/effects.c:98
 msgid "Splitters"
 msgstr ""
 
-#: src/effects.c:99
+#: src/effects.c:100
 msgid "converter"
 msgstr ""
 
-#: src/effects.c:100
+#: src/effects.c:101
 msgid "Converters"
 msgstr ""
 
-#: src/effects.c:102
+#: src/effects.c:103
 msgid "analyser"
 msgstr ""
 
-#: src/effects.c:103
+#: src/effects.c:104
 msgid "Analysers"
 msgstr ""
 
-#: src/effects.c:108
+#: src/effects.c:109
 msgid "audio/video"
 msgstr ""
 
-#: src/effects.c:109
+#: src/effects.c:110
 msgid "Audio/Video Transitions"
 msgstr ""
 
-#: src/effects.c:111
+#: src/effects.c:112
 msgid "video only"
 msgstr ""
 
-#: src/effects.c:112
+#: src/effects.c:113
 msgid "Video only Transitions"
 msgstr ""
 
-#: src/effects.c:114 src/multitrack.c:10740
+#: src/effects.c:115 src/multitrack.c:10962
 msgid "audio only"
 msgstr ""
 
-#: src/effects.c:115
+#: src/effects.c:116
 msgid "Audio only Transitions"
 msgstr ""
 
-#: src/effects.c:117 src/effects.c:120 src/multitrack.c:18757
+#: src/effects.c:118 src/effects.c:121 src/multitrack.c:19097
 msgid "audio"
 msgstr "audio"
 
-#: src/effects.c:118
+#: src/effects.c:119
 msgid "Audio Mixers"
 msgstr ""
 
-#: src/effects.c:121
+#: src/effects.c:122
 msgid "Audio Effects"
 msgstr ""
 
-#: src/effects.c:123
+#: src/effects.c:124
 msgid "video"
 msgstr ""
 
-#: src/effects.c:124
+#: src/effects.c:125
 msgid "Video Effects"
 msgstr ""
 
-#: src/effects.c:126
+#: src/effects.c:127
 msgid "audio volume controller"
 msgstr ""
 
-#: src/effects.c:127
+#: src/effects.c:128
 msgid "Audio Volume Controllers"
 msgstr ""
 
-#: src/effects.c:129
+#: src/effects.c:130
 msgid "video analyser"
 msgstr ""
 
-#: src/effects.c:130
+#: src/effects.c:131
 msgid "Video analysers"
 msgstr ""
 
-#: src/effects.c:132
+#: src/effects.c:133
 msgid "audio analyser"
 msgstr ""
 
-#: src/effects.c:133
+#: src/effects.c:134
 msgid "Audio Analysers"
 msgstr ""
 
-#: src/effects.c:137 src/plugins.c:2559 src/plugins.c:2573
+#: src/effects.c:138 src/plugins.c:2507 src/plugins.c:2521
 msgid "unknown"
 msgstr "teadmata"
 
-#: src/effects.c:238
+#: src/effects.c:235
 #, c-format
 msgid "%s all frames..."
 msgstr ""
 
-#: src/effects.c:243
+#: src/effects.c:239
 #, c-format
 msgid "%s clipboard into frames %d to %d..."
 msgstr ""
 
-#: src/effects.c:250
+#: src/effects.c:245
 #, c-format
 msgid "%s to clipboard..."
 msgstr ""
 
-#: src/effects.c:254
+#: src/effects.c:248
 #, c-format
 msgid "%s to new clip..."
 msgstr ""
 
-#: src/effects.c:259
+#: src/effects.c:252
 #, c-format
 msgid "%s frames %d to %d..."
 msgstr ""
 
-#: src/effects.c:290
+#: src/effects.c:283
 #, c-format
 msgid "%s clipboard with selection"
 msgstr ""
 
-#: src/effects.c:295
+#: src/effects.c:287
 #, c-format
 msgid "%s to clipboard"
 msgstr ""
 
-#: src/effects.c:299
+#: src/effects.c:290
 #, c-format
 msgid "%s to new clip"
 msgstr ""
 
-#: src/effects.c:304
+#: src/effects.c:294
 #, c-format
 msgid "%s frames %d to %d"
 msgstr ""
 
-#: src/effects.c:456 src/effects.c:523
+#: src/effects.c:443 src/effects.c:507
 msgid ""
 "\n"
 "No frames were generated.\n"
 msgstr ""
 
-#: src/effects-weed.c:431
+#: src/effects-weed.c:452
 msgid "integer"
 msgstr ""
 
-#: src/effects-weed.c:432
+#: src/effects-weed.c:454
 msgid "int64"
 msgstr ""
 
-#: src/effects-weed.c:433
+#: src/effects-weed.c:456
 msgid "boolean"
 msgstr ""
 
-#: src/effects-weed.c:434
+#: src/effects-weed.c:458
 msgid "double"
 msgstr ""
 
-#: src/effects-weed.c:435
+#: src/effects-weed.c:460
 msgid "string"
 msgstr ""
 
-#: src/effects-weed.c:436
+#: src/effects-weed.c:462
 msgid "pointer"
 msgstr ""
 
-#: src/effects-weed.c:4591
+#: src/effects-weed.c:4581
 #, c-format
 msgid "Error: plugin %s has no weed_setup() function.\n"
 msgstr ""
 
-#: src/effects-weed.c:4606
+#: src/effects-weed.c:4595
 #, c-format
 msgid "No usable filters found in plugin %s\n"
 msgstr ""
 
-#: src/effects-weed.c:4680
+#: src/effects-weed.c:4668
 #, c-format
 msgid "Found duplicate plugin %s"
 msgstr ""
 
-#: src/effects-weed.c:4734
+#: src/effects-weed.c:4723
 #, c-format
 msgid ""
 "Info: Unable to load plugin %s\n"
 "Error was: %s\n"
 msgstr ""
 
-#: src/effects-weed.c:4737 src/effects-weed.c:5858
+#: src/effects-weed.c:4726 src/effects-weed.c:5847
 msgid "Some plugin directories"
 msgstr ""
 
 #. TRANSLATORS: example " - LADSPA plugins -"
-#: src/effects-weed.c:4812 src/rte_window.c:2105
+#: src/effects-weed.c:4801 src/rte_window.c:2107
 #, c-format
 msgid " - %s plugins -"
 msgstr ""
 
-#: src/effects-weed.c:5012
+#: src/effects-weed.c:4998
 #, c-format
 msgid "Successfully loaded %d Weed filters\n"
 msgstr ""
 
-#: src/effects-weed.c:5177
+#: src/effects-weed.c:5162
 #, c-format
 msgid "Invalid compound effect %s - has conflicting target_fps\n"
 msgstr ""
 
-#: src/effects-weed.c:5197
+#: src/effects-weed.c:5182
 #, c-format
 msgid "Invalid compound effect %s - has multiple transition parameters\n"
 msgstr ""
 
-#: src/effects-weed.c:5211
+#: src/effects-weed.c:5196
 #, c-format
 msgid "Invalid compound effect %s - has multiple master volume parameters\n"
 msgstr ""
 
-#: src/effects-weed.c:5346
+#: src/effects-weed.c:5329
 #, c-format
 msgid "Invalid compound effect %s - must have >1 sub filters\n"
 msgstr ""
 
-#: src/effects-weed.c:5366
+#: src/effects-weed.c:5349
 #, c-format
 msgid "Invalid effect %s found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5381
+#: src/effects-weed.c:5364
 #, c-format
 msgid "Invalid default found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5392
+#: src/effects-weed.c:5375
 #, c-format
 msgid "Invalid filter %d for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5406
+#: src/effects-weed.c:5389
 #, c-format
 msgid "Invalid param %d for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5433
+#: src/effects-weed.c:5416
 #, c-format
 msgid ""
 "Invalid number of values for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5467
+#: src/effects-weed.c:5450
 #, c-format
 msgid ""
 "Invalid non-boolean value for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5500
+#: src/effects-weed.c:5483
 #, c-format
 msgid "Invalid param link found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5511
+#: src/effects-weed.c:5494
 #, c-format
 msgid ""
 "Invalid out filter %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5529
+#: src/effects-weed.c:5513
 #, c-format
 msgid ""
 "Invalid out param %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5541
+#: src/effects-weed.c:5526
 #, c-format
 msgid ""
 "Invalid non-boolean value for autoscale found in compound effect %s, line "
 "%d\n"
 msgstr ""
 
-#: src/effects-weed.c:5552
+#: src/effects-weed.c:5537
 #, c-format
 msgid ""
 "Invalid in filter %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5566
+#: src/effects-weed.c:5552
 #, c-format
 msgid ""
 "Invalid in param %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5594
+#: src/effects-weed.c:5581
 #, c-format
 msgid "Invalid channel link found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5605
+#: src/effects-weed.c:5592
 #, c-format
 msgid ""
 "Invalid out filter %d for link channels found in compound effect %s, line "
 "%d\n"
 msgstr ""
 
-#: src/effects-weed.c:5623
+#: src/effects-weed.c:5611
 #, c-format
 msgid ""
 "Invalid out channel %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5633
+#: src/effects-weed.c:5622
 #, c-format
 msgid ""
 "Invalid in filter %d for link channels found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5651
+#: src/effects-weed.c:5641
 #, c-format
 msgid ""
 "Invalid in channel %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5687
+#: src/effects-weed.c:5678
 #, c-format
 msgid "Compound:%s"
 msgstr ""
 
-#: src/effects-weed.c:5758
+#: src/effects-weed.c:5749
 #, c-format
 msgid "Successfully loaded %d compound filters\n"
 msgstr ""
 
-#: src/effects-weed.c:6591
+#: src/effects-weed.c:6570
 #, c-format
 msgid "Effect %s cannot be used with this audio player.\n"
 msgstr ""
 
-#: src/effects-weed.c:6737
+#: src/effects-weed.c:6718
 #, c-format
 msgid "Failed to start instance %s, error code %d\n"
 msgstr ""
 
-#: src/effects-weed.c:6814
+#: src/effects-weed.c:6797
 #, c-format
 msgid "Unable to start generator %s\n"
 msgstr ""
 
-#: src/effects-weed.c:7621
+#: src/effects-weed.c:7607
 #, c-format
 msgid "Failed to start generator %s\n"
 msgstr ""
 
-#: src/effects-weed.c:7718
+#: src/effects-weed.c:7701
 #, c-format
 msgid "Failed to start generator %s, error %d\n"
 msgstr ""
 
-#: src/effects-weed.c:9012
+#: src/effects-weed.c:8993
 #, c-format
 msgid "%s [unstable] (%s)"
 msgstr ""
 
-#: src/effects-data.c:3278
+#: src/effects-data.c:3234
 #, c-format
 msgid "ACTIVATE (%s)"
 msgstr ""
 
-#: src/effects-data.c:3548
+#: src/effects-data.c:3501
 msgid "ACTIVATE"
 msgstr ""
 
-#: src/effects-data.c:3876
+#: src/effects-data.c:3829
 #, c-format
 msgid "Key slot %d"
 msgstr ""
 
-#: src/effects-data.c:3998
+#: src/effects-data.c:3951
 msgid "Autoscale"
 msgstr ""
 
-#: src/effects-data.c:4089
+#: src/effects-data.c:4042
 msgid "Add another connection for this output parameter"
 msgstr ""
 
-#: src/effects-data.c:4102 src/effects-data.c:4151
+#: src/effects-data.c:4055 src/effects-data.c:4104
 #, fuzzy
 msgid "Delete this connection"
 msgstr "_Kustuta valik"
 
-#: src/effects-data.c:4138
+#: src/effects-data.c:4091
 msgid "Add another connection for this output channel"
 msgstr ""
 
-#: src/effects-data.c:4223
+#: src/effects-data.c:4176
 msgid "Connected to -->"
 msgstr ""
 
-#: src/effects-data.c:4243
+#: src/effects-data.c:4196
 #, c-format
 msgid "%s - Alpha Channel Connections"
 msgstr ""
 
-#: src/effects-data.c:4316
+#: src/effects-data.c:4269
 #, c-format
 msgid "%s - Parameter Data Connections"
 msgstr ""
 
-#: src/effects-data.c:4336
+#: src/effects-data.c:4289
 msgid "Autoscale All"
 msgstr ""
 
-#: src/effects-data.c:4361 src/effects-data.c:4890
+#: src/effects-data.c:4314 src/effects-data.c:4841
 msgid "ACTIVATED"
 msgstr ""
 
-#: src/effects-data.c:4774
+#: src/effects-data.c:4726
 msgid "LiVES: - Parameter and Alpha Channel Connections"
 msgstr ""
 
-#: src/effects-data.c:4785
+#: src/effects-data.c:4736
 msgid "Auto Connect Channels"
 msgstr ""
 
-#: src/effects-data.c:4797
+#: src/effects-data.c:4748
 msgid "Auto Connect Parameters"
 msgstr ""
 
-#: src/effects-data.c:4807
+#: src/effects-data.c:4758
 msgid "Disconnect All"
 msgstr ""
 
-#: src/effects-data.c:4875
+#: src/effects-data.c:4826
 #, c-format
 msgid "Input channel is already connected from (%d,%d) %s"
 msgstr ""
 
-#: src/effects-data.c:4891
+#: src/effects-data.c:4842
 #, c-format
 msgid "Input parameter is already connected from (%d,%d) %s"
 msgstr ""
 
-#: src/effects-data.c:4899
+#: src/effects-data.c:4851
 msgid "Input and output parameters are not compatible"
 msgstr ""
 
@@ -5613,43 +5624,43 @@
 msgid "_Reset Values"
 msgstr ""
 
-#: src/framedraw.c:267
+#: src/framedraw.c:265
 msgid "_Frame"
 msgstr ""
 
-#: src/paramspecial.c:266
+#: src/paramspecial.c:259
 msgid "Maintain _Aspect Ratio"
 msgstr ""
 
-#: src/paramspecial.c:267
+#: src/paramspecial.c:260
 msgid "Maintain aspect ratio of original frame"
 msgstr ""
 
-#: src/paramspecial.c:341
+#: src/paramspecial.c:335
 msgid "Display Password"
 msgstr ""
 
-#: src/paramwindow.c:450
+#: src/paramwindow.c:447
 msgid "Transition _In"
 msgstr ""
 
-#: src/paramwindow.c:452
+#: src/paramwindow.c:449
 msgid "Click to set the transition parameter to show only the front frame"
 msgstr ""
 
-#: src/paramwindow.c:474
+#: src/paramwindow.c:472
 msgid "Crossfade audio"
 msgstr ""
 
-#: src/paramwindow.c:475
+#: src/paramwindow.c:473
 msgid "Check the box to make audio transition with the video"
 msgstr ""
 
-#: src/paramwindow.c:493
+#: src/paramwindow.c:492
 msgid "Transition _Out"
 msgstr ""
 
-#: src/paramwindow.c:495
+#: src/paramwindow.c:494
 msgid "Click to set the transition parameter to show only the rear frame"
 msgstr ""
 
@@ -5662,23 +5673,23 @@
 msgid "%s : size"
 msgstr ""
 
-#: src/paramwindow.c:598
+#: src/paramwindow.c:597
 msgid "New size (pixels)"
 msgstr ""
 
-#: src/paramwindow.c:617 src/plugins.c:997
+#: src/paramwindow.c:616 src/plugins.c:973
 msgid "_Width"
 msgstr "_Laius"
 
-#: src/paramwindow.c:636 src/plugins.c:1003
+#: src/paramwindow.c:635 src/plugins.c:979
 msgid "_Height"
 msgstr "_Kõrgus"
 
-#: src/paramwindow.c:684
+#: src/paramwindow.c:683
 msgid "Generate to _Clipboard"
 msgstr ""
 
-#: src/paramwindow.c:686
+#: src/paramwindow.c:685
 msgid "Generate frames to the clipboard"
 msgstr ""
 
@@ -5690,7 +5701,7 @@
 msgid "Generate frames to a new clip"
 msgstr ""
 
-#: src/paramwindow.c:822
+#: src/paramwindow.c:824
 #, c-format
 msgid ""
 "\n"
@@ -5698,71 +5709,71 @@
 "\n"
 msgstr ""
 
-#: src/paramwindow.c:920 src/paramwindow.c:930
+#: src/paramwindow.c:934 src/paramwindow.c:942
 msgid "Set as default"
 msgstr "Sea vaikeväärtuseks"
 
-#: src/paramwindow.c:922 src/paramwindow.c:938
+#: src/paramwindow.c:936 src/paramwindow.c:950
 msgid "Reset"
 msgstr ""
 
-#: src/paramwindow.c:932 src/rte_window.c:2401 src/omc-learn.c:1357
+#: src/paramwindow.c:944 src/rte_window.c:2394 src/omc-learn.c:1347
 msgid "Close _window"
 msgstr "Sulge aken"
 
-#: src/paramwindow.c:1337
+#: src/paramwindow.c:1340
 msgid "No parameters"
 msgstr ""
 
-#: src/paramwindow.c:1419
+#: src/paramwindow.c:1424
 msgid "Invalid parameter"
 msgstr ""
 
-#: src/paramwindow.c:1611
+#: src/paramwindow.c:1610
 msgid "LiVES: - Select Colour"
 msgstr ""
 
-#: src/paramwindow.c:1616
+#: src/paramwindow.c:1615
 msgid "Click to set the colour"
 msgstr ""
 
-#: src/paramwindow.c:1628
+#: src/paramwindow.c:1626
 msgid "_Red"
 msgstr ""
 
-#: src/paramwindow.c:1629
+#: src/paramwindow.c:1627
 msgid "The red value (0 - 255)"
 msgstr ""
 
-#: src/paramwindow.c:1632
+#: src/paramwindow.c:1630
 msgid "_Green"
 msgstr ""
 
-#: src/paramwindow.c:1633
+#: src/paramwindow.c:1631
 msgid "The green value (0 - 255)"
 msgstr ""
 
-#: src/paramwindow.c:1636
+#: src/paramwindow.c:1634
 msgid "_Blue"
 msgstr ""
 
-#: src/paramwindow.c:1637
+#: src/paramwindow.c:1635
 msgid "The blue value (0 - 255)"
 msgstr ""
 
-#: src/plugins.c:85
+#: src/plugins.c:86
 #, c-format
 msgid ""
 "\n"
 "Plugin error: %s failed with code %d"
 msgstr ""
 
-#: src/plugins.c:87
+#: src/plugins.c:88
 #, c-format
 msgid " : message was %s\n"
 msgstr ""
 
-#: src/plugins.c:387
+#: src/plugins.c:375
 #, c-format
 msgid ""
 "\n"
@@ -5772,17 +5783,17 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/plugins.c:397
+#: src/plugins.c:385
 #, c-format
 msgid "Updating video playback plugin defaults in %s\n"
 msgstr ""
 
-#: src/plugins.c:452
+#: src/plugins.c:444
 #, c-format
 msgid "Loading video playback plugin defaults from %s..."
 msgstr ""
 
-#: src/plugins.c:515
+#: src/plugins.c:505
 #, c-format
 msgid ""
 "\n"
@@ -5792,32 +5803,32 @@
 "\n"
 msgstr ""
 
-#: src/plugins.c:855
+#: src/plugins.c:836
 #, c-format
 msgid "Saving playback plugin defaults to %s..."
 msgstr ""
 
-#: src/plugins.c:962
+#: src/plugins.c:939
 msgid "_FPS"
 msgstr ""
 
-#: src/plugins.c:963
+#: src/plugins.c:940
 msgid "Fixed framerate for plugin.\n"
 msgstr ""
 
-#: src/plugins.c:1032
+#: src/plugins.c:1008
 msgid "_Colourspace"
 msgstr ""
 
-#: src/plugins.c:1033
+#: src/plugins.c:1009
 msgid "Colourspace input to the plugin.\n"
 msgstr ""
 
-#: src/plugins.c:1089
+#: src/plugins.c:1065
 msgid "Save settings to an alternate file.\n"
 msgstr ""
 
-#: src/plugins.c:1206
+#: src/plugins.c:1182
 #, c-format
 msgid ""
 "\n"
@@ -5826,7 +5837,7 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/plugins.c:1252
+#: src/plugins.c:1228
 #, c-format
 msgid ""
 "\n"
@@ -5836,38 +5847,38 @@
 "Unable to use it.\n"
 msgstr ""
 
-#: src/plugins.c:1265
+#: src/plugins.c:1241
 #, c-format
 msgid ""
 "Video playback plugin failed to initialise.\n"
 "Error was: %s\n"
 msgstr ""
 
-#: src/plugins.c:1461
+#: src/plugins.c:1428
 msgid ""
 "\n"
 "Warning ! Video playback plugin will not send key presses. Keyboard may be "
 "disabled during plugin use !\n"
 msgstr ""
 
-#: src/plugins.c:1465
+#: src/plugins.c:1433
 #, c-format
 msgid ""
 "*** Using %s plugin for fs playback, agreed to use palette type %d ( %s ). "
 "***\n"
 msgstr ""
 
-#: src/plugins.c:1571
+#: src/plugins.c:1537
 #, c-format
 msgid "Audio stream unable to use preferred format '%s'\n"
 msgstr ""
 
-#: src/plugins.c:1579
+#: src/plugins.c:1543
 #, c-format
 msgid "Using format '%s' instead.\n"
 msgstr ""
 
-#: src/plugins.c:1616
+#: src/plugins.c:1579
 #, c-format
 msgid ""
 "LiVES was unable to find its encoder plugins. Please make sure you have the "
@@ -5876,7 +5887,7 @@
 "or change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/plugins.c:1624
+#: src/plugins.c:1589
 #, c-format
 msgid ""
 "LiVES did not receive a response from the encoder plugin called '%s'.\n"
@@ -5885,11 +5896,11 @@
 "or switch to another plugin using Tools|Preferences|Encoding\n"
 msgstr ""
 
-#: src/plugins.c:2032
+#: src/plugins.c:1987
 msgid "Unable to resize, please install imageMagick\n"
 msgstr ""
 
-#: src/plugins.c:2231
+#: src/plugins.c:2183
 #, c-format
 msgid ""
 "\n"
@@ -5897,12 +5908,12 @@
 "No decoders found in %s !\n"
 msgstr ""
 
-#: src/plugins.c:2415
+#: src/plugins.c:2369
 #, fuzzy, c-format
 msgid " using %s"
 msgstr "Avamine %s"
 
-#: src/plugins.c:2499
+#: src/plugins.c:2451
 #, c-format
 msgid ""
 "\n"
@@ -5911,7 +5922,7 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/plugins.c:2522
+#: src/plugins.c:2472
 #, c-format
 msgid ""
 "\n"
@@ -5921,24 +5932,24 @@
 "Unable to use it.\n"
 msgstr ""
 
-#: src/plugins.c:2564
+#: src/plugins.c:2512
 msgid "/unknown"
 msgstr ""
 
-#: src/plugins.c:2651
+#: src/plugins.c:2598
 msgid "LiVES: - Decoder Plugins"
 msgstr ""
 
-#: src/plugins.c:2669
+#: src/plugins.c:2616
 msgid "Enabled Video Decoders (uncheck to disable)"
 msgstr ""
 
-#: src/plugins.c:2726
+#: src/plugins.c:2672
 #, c-format
 msgid "Failed to load %s, transitions may not resize.\n"
 msgstr ""
 
-#: src/plugins.c:3854
+#: src/plugins.c:3797
 #, c-format
 msgid "%s advanced settings"
 msgstr ""
@@ -5947,15 +5958,15 @@
 msgid "LiVES: - New Test RFX"
 msgstr ""
 
-#: src/rfx-builder.c:136
+#: src/rfx-builder.c:135
 msgid "LiVES: - Edit Test RFX"
 msgstr ""
 
-#: src/rfx-builder.c:166
+#: src/rfx-builder.c:165
 msgid "Type:"
 msgstr "Tüüp:"
 
-#: src/rfx-builder.c:184
+#: src/rfx-builder.c:183
 msgid "tool"
 msgstr ""
 
@@ -5967,130 +5978,130 @@
 msgid "The name of the plugin. No spaces allowed."
 msgstr ""
 
-#: src/rfx-builder.c:201
+#: src/rfx-builder.c:202
 msgid "Version:       "
 msgstr ""
 
-#: src/rfx-builder.c:203
+#: src/rfx-builder.c:204
 msgid "The script version."
 msgstr ""
 
-#: src/rfx-builder.c:210
+#: src/rfx-builder.c:212
 msgid "    Author:       "
 msgstr ""
 
-#: src/rfx-builder.c:211
+#: src/rfx-builder.c:213
 msgid "The script author."
 msgstr ""
 
-#: src/rfx-builder.c:217
+#: src/rfx-builder.c:220
 msgid "    URL (optional):       "
 msgstr ""
 
-#: src/rfx-builder.c:218
+#: src/rfx-builder.c:221
 msgid "URL for the plugin maintainer."
 msgstr ""
 
-#: src/rfx-builder.c:226
+#: src/rfx-builder.c:230
 msgid "Menu text:    "
 msgstr ""
 
-#: src/rfx-builder.c:227
+#: src/rfx-builder.c:231
 msgid "The text to show in the menu."
 msgstr ""
 
-#: src/rfx-builder.c:239
+#: src/rfx-builder.c:244
 msgid "Action description:        "
 msgstr ""
 
-#: src/rfx-builder.c:241
+#: src/rfx-builder.c:246
 msgid "Describe what the plugin is doing. E.g. \"Edge detecting\""
 msgstr ""
 
-#: src/rfx-builder.c:246
+#: src/rfx-builder.c:251
 msgid "Minimum frames:"
 msgstr ""
 
-#: src/rfx-builder.c:249
+#: src/rfx-builder.c:254
 msgid ""
 "Minimum number of frames this effect/tool can be applied to. Normally 1."
 msgstr ""
 
-#: src/rfx-builder.c:260
+#: src/rfx-builder.c:265
 msgid "_Requirements..."
 msgstr ""
 
-#: src/rfx-builder.c:263
+#: src/rfx-builder.c:268
 msgid "Enter any binaries required by the plugin."
 msgstr ""
 
-#: src/rfx-builder.c:267
+#: src/rfx-builder.c:272
 msgid "_Properties..."
 msgstr "_Omadused..."
 
-#: src/rfx-builder.c:270
+#: src/rfx-builder.c:275
 msgid "Set properties for the plugin. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:274
+#: src/rfx-builder.c:279
 msgid "_Parameters..."
 msgstr ""
 
-#: src/rfx-builder.c:277
+#: src/rfx-builder.c:282
 msgid "Set up parameters used in pre/loop/post/trigger code. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:281
+#: src/rfx-builder.c:286
 msgid "Parameter _Window Hints..."
 msgstr ""
 
-#: src/rfx-builder.c:284
+#: src/rfx-builder.c:289
 msgid "Set hints about how to lay out the parameter window. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:290
+#: src/rfx-builder.c:295
 msgid "_Language code:"
 msgstr ""
 
-#: src/rfx-builder.c:291
+#: src/rfx-builder.c:296
 msgid "Language for pre/loop/post/triggers. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:300
+#: src/rfx-builder.c:305
 msgid "_Pre loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:303
+#: src/rfx-builder.c:308
 msgid "Code to be executed before the loop. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:307
+#: src/rfx-builder.c:312
 msgid "_Loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:310
+#: src/rfx-builder.c:315
 msgid "Loop code to be applied to each frame."
 msgstr ""
 
-#: src/rfx-builder.c:314
+#: src/rfx-builder.c:319
 msgid "_Post loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:317
+#: src/rfx-builder.c:322
 msgid "Code to be executed after the loop. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:321
+#: src/rfx-builder.c:326
 msgid "_Trigger code..."
 msgstr ""
 
-#: src/rfx-builder.c:324
+#: src/rfx-builder.c:329
 msgid ""
 "Set trigger code for when the parameter window is shown, or when a parameter "
 "is changed. Optional (except for Utilities)."
 msgstr ""
 
-#: src/rfx-builder.c:421
+#: src/rfx-builder.c:426
 #, c-format
 msgid ""
 "\n"
@@ -6100,55 +6111,55 @@
 "%s\n"
 msgstr ""
 
-#: src/rfx-builder.c:544
+#: src/rfx-builder.c:541
 msgid "LiVES: - RFX Requirements"
 msgstr ""
 
-#: src/rfx-builder.c:548
+#: src/rfx-builder.c:544
 msgid "LiVES: - RFX Parameters"
 msgstr ""
 
-#: src/rfx-builder.c:552
+#: src/rfx-builder.c:547
 msgid "LiVES: - RFX Parameter Window Hints"
 msgstr ""
 
-#: src/rfx-builder.c:556
+#: src/rfx-builder.c:550
 msgid "LiVES: - RFX Triggers"
 msgstr ""
 
-#: src/rfx-builder.c:622
+#: src/rfx-builder.c:613
 msgid "_New Entry"
 msgstr ""
 
-#: src/rfx-builder.c:625
+#: src/rfx-builder.c:616
 msgid "_Edit Entry"
 msgstr ""
 
-#: src/rfx-builder.c:628
+#: src/rfx-builder.c:619
 msgid "_Remove Entry"
 msgstr ""
 
-#: src/rfx-builder.c:632
+#: src/rfx-builder.c:623
 msgid "Move _Up"
 msgstr "Liiguta ü_les"
 
-#: src/rfx-builder.c:635
+#: src/rfx-builder.c:626
 msgid "Move _Down"
 msgstr "Liiguta _alla"
 
-#: src/rfx-builder.c:1004
+#: src/rfx-builder.c:984
 msgid "LiVES: - RFX Properties"
 msgstr ""
 
-#: src/rfx-builder.c:1013
+#: src/rfx-builder.c:993
 msgid "_Slow (hint to GUI)"
 msgstr ""
 
-#: src/rfx-builder.c:1024
+#: src/rfx-builder.c:1004
 msgid "_Batch mode generator"
 msgstr ""
 
-#: src/rfx-builder.c:1831
+#: src/rfx-builder.c:1790
 msgid ""
 "\n"
 "\n"
@@ -6157,7 +6168,7 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:1875
+#: src/rfx-builder.c:1834
 msgid ""
 "\n"
 "\n"
@@ -6165,219 +6176,219 @@
 "Please check the trigger code.\n"
 msgstr ""
 
-#: src/rfx-builder.c:1994
+#: src/rfx-builder.c:1950
 msgid "LiVES: - New RFX Parameter"
 msgstr ""
 
-#: src/rfx-builder.c:1997
+#: src/rfx-builder.c:1952
 msgid "LiVES: - Edit RFX Parameter"
 msgstr ""
 
-#: src/rfx-builder.c:2013
+#: src/rfx-builder.c:1968
 msgid "_Name:    "
 msgstr ""
 
-#: src/rfx-builder.c:2016
+#: src/rfx-builder.c:1971
 msgid "Name of the parameter, must be unique in the plugin."
 msgstr ""
 
-#: src/rfx-builder.c:2025
+#: src/rfx-builder.c:1981
 msgid "_Label:    "
 msgstr ""
 
-#: src/rfx-builder.c:2028
+#: src/rfx-builder.c:1984
 msgid ""
 "Label to be shown by the parameter. An underscore represents mnemonic "
 "accelerator."
 msgstr ""
 
-#: src/rfx-builder.c:2039
+#: src/rfx-builder.c:1996
 msgid "_Type:         "
 msgstr ""
 
-#: src/rfx-builder.c:2040
+#: src/rfx-builder.c:1997
 msgid "Parameter type (select from list)."
 msgstr ""
 
-#: src/rfx-builder.c:2073
+#: src/rfx-builder.c:2029
 msgid "Decimal _places: "
 msgstr ""
 
-#: src/rfx-builder.c:2082 src/rfx-builder.c:2477 src/rfx-builder.c:2495
+#: src/rfx-builder.c:2038 src/rfx-builder.c:2430 src/rfx-builder.c:2447
 msgid "_Default value:    "
 msgstr ""
 
-#: src/rfx-builder.c:2098
+#: src/rfx-builder.c:2054
 msgid "_Default: "
 msgstr ""
 
-#: src/rfx-builder.c:2132
+#: src/rfx-builder.c:2087
 msgid "Button _Group: "
 msgstr ""
 
-#: src/rfx-builder.c:2134
+#: src/rfx-builder.c:2089
 msgid "A non-zero value can be used to group radio buttons."
 msgstr ""
 
-#: src/rfx-builder.c:2142 src/rfx-builder.c:2478
+#: src/rfx-builder.c:2097 src/rfx-builder.c:2431
 msgid "_Minimum value: "
 msgstr ""
 
-#: src/rfx-builder.c:2148 src/rfx-builder.c:2479
+#: src/rfx-builder.c:2103 src/rfx-builder.c:2432
 msgid "Ma_ximum value: "
 msgstr ""
 
-#: src/rfx-builder.c:2157
+#: src/rfx-builder.c:2113
 msgid "     _Step size:   "
 msgstr ""
 
-#: src/rfx-builder.c:2160
+#: src/rfx-builder.c:2117
 msgid ""
 "How much the parameter is adjusted when the spinbutton arrows are pressed."
 msgstr ""
 
-#: src/rfx-builder.c:2171
+#: src/rfx-builder.c:2129
 msgid "_Wrap value"
 msgstr ""
 
-#: src/rfx-builder.c:2172
+#: src/rfx-builder.c:2131
 msgid "Whether the value wraps max->min and min->max."
 msgstr ""
 
-#: src/rfx-builder.c:2470
+#: src/rfx-builder.c:2424
 msgid "Set _values"
 msgstr ""
 
-#: src/rfx-builder.c:2512
+#: src/rfx-builder.c:2463
 msgid "Default _Red:  "
 msgstr ""
 
-#: src/rfx-builder.c:2513
+#: src/rfx-builder.c:2464
 msgid "Default _Green:"
 msgstr ""
 
-#: src/rfx-builder.c:2514
+#: src/rfx-builder.c:2465
 msgid "Default _Blue: "
 msgstr ""
 
-#: src/rfx-builder.c:2538
+#: src/rfx-builder.c:2488
 msgid "Set _default"
 msgstr ""
 
-#: src/rfx-builder.c:2540
+#: src/rfx-builder.c:2490
 msgid "Default value:  "
 msgstr ""
 
-#: src/rfx-builder.c:2541
+#: src/rfx-builder.c:2491
 msgid "Maximum length (chars): "
 msgstr ""
 
-#: src/rfx-builder.c:2576
+#: src/rfx-builder.c:2526
 msgid "LiVES: - New RFX Parameter Window Hint"
 msgstr ""
 
-#: src/rfx-builder.c:2579
+#: src/rfx-builder.c:2528
 msgid "LiVES: - Edit RFX Parameter Window Hint"
 msgstr ""
 
-#: src/rfx-builder.c:2622
+#: src/rfx-builder.c:2569
 msgid "_Keyword:         "
 msgstr ""
 
-#: src/rfx-builder.c:2639
+#: src/rfx-builder.c:2586
 msgid "Special _Type:         "
 msgstr ""
 
-#: src/rfx-builder.c:2656
+#: src/rfx-builder.c:2602
 msgid "Special _Subtype:         "
 msgstr ""
 
-#: src/rfx-builder.c:2667 src/rfx-builder.c:2706
+#: src/rfx-builder.c:2613 src/rfx-builder.c:2651
 msgid "Row:    "
 msgstr ""
 
-#: src/rfx-builder.c:2732
+#: src/rfx-builder.c:2676
 #, c-format
 msgid "Linked parameters (%d):    "
 msgstr ""
 
-#: src/rfx-builder.c:2749
+#: src/rfx-builder.c:2693
 msgid "Linked parameters (4):    "
 msgstr ""
 
-#: src/rfx-builder.c:2752
+#: src/rfx-builder.c:2695
 msgid "Linked parameters (2):    "
 msgstr ""
 
-#: src/rfx-builder.c:2777
+#: src/rfx-builder.c:2720
 msgid "LiVES: - New RFX Trigger"
 msgstr ""
 
-#: src/rfx-builder.c:2780
+#: src/rfx-builder.c:2722
 msgid "LiVES: - Edit RFX Trigger"
 msgstr ""
 
-#: src/rfx-builder.c:2808
+#: src/rfx-builder.c:2750
 msgid "When:         "
 msgstr ""
 
-#: src/rfx-builder.c:2904
+#: src/rfx-builder.c:2846
 msgid "LiVES: - Pre Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:2911
+#: src/rfx-builder.c:2853
 msgid "LiVES: - Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:2918
+#: src/rfx-builder.c:2860
 msgid "LiVES: - Post Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:2931
+#: src/rfx-builder.c:2873
 #, c-format
 msgid "LiVES: - Default text (max length %d)"
 msgstr ""
 
-#: src/rfx-builder.c:2944
+#: src/rfx-builder.c:2885
 msgid "LiVES: - Enter values, one per line"
 msgstr ""
 
-#: src/rfx-builder.c:3055
+#: src/rfx-builder.c:2996
 msgid ""
 "\n"
 "\n"
 "Name must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3060
+#: src/rfx-builder.c:3001
 msgid ""
 "\n"
 "\n"
 "Name must not contain spaces.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3065
+#: src/rfx-builder.c:3006
 msgid ""
 "\n"
 "\n"
 "Menu text must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3071
+#: src/rfx-builder.c:3012
 msgid ""
 "\n"
 "\n"
 "Action description must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3076
+#: src/rfx-builder.c:3017
 msgid ""
 "\n"
 "\n"
 "Author must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3085 src/rfx-builder.c:4339
+#: src/rfx-builder.c:3026 src/rfx-builder.c:4253
 msgid ""
 "\n"
 "\n"
@@ -6385,28 +6396,28 @@
 "Name must be unique.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3092
+#: src/rfx-builder.c:3033
 msgid ""
 "\n"
 "\n"
 "Loop code should not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3098
+#: src/rfx-builder.c:3039
 msgid ""
 "\n"
 "\n"
 "Trigger code should not be blank for a utility.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3111
+#: src/rfx-builder.c:3052
 msgid ""
 "\n"
 "\n"
 "Parameter name must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3117
+#: src/rfx-builder.c:3058
 msgid ""
 "\n"
 "\n"
@@ -6415,41 +6426,41 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:3171
+#: src/rfx-builder.c:3111
 #, c-format
 msgid "Writing script file %s..."
 msgstr ""
 
-#: src/rfx-builder.c:3477
+#: src/rfx-builder.c:3411
 msgid "No <define> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3484 src/rfx-builder.c:3493
+#: src/rfx-builder.c:3418 src/rfx-builder.c:3427
 msgid "Bad script version.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3505
+#: src/rfx-builder.c:3439
 msgid "No <name> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3513
+#: src/rfx-builder.c:3447
 msgid "No <version> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3522
+#: src/rfx-builder.c:3456
 msgid "No <author> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3536
+#: src/rfx-builder.c:3470
 msgid "No <description> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3540
+#: src/rfx-builder.c:3474
 #, c-format
 msgid "Bad description. (%s)\n"
 msgstr ""
 
-#: src/rfx-builder.c:3702
+#: src/rfx-builder.c:3627
 #, c-format
 msgid ""
 "\n"
@@ -6459,27 +6470,27 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:3859
+#: src/rfx-builder.c:3780
 msgid "Rebuilding all RFX scripts...builtin..."
 msgstr ""
 
-#: src/rfx-builder.c:3860
+#: src/rfx-builder.c:3781
 msgid "Rebuilding scripts"
 msgstr ""
 
-#: src/rfx-builder.c:3868
+#: src/rfx-builder.c:3789
 msgid "custom..."
 msgstr ""
 
-#: src/rfx-builder.c:3872
+#: src/rfx-builder.c:3793
 msgid "test..."
 msgstr ""
 
-#: src/rfx-builder.c:3878
+#: src/rfx-builder.c:3799
 msgid "rebuilding dynamic menu entries..."
 msgstr ""
 
-#: src/rfx-builder.c:3905 src/rfx-builder.c:3912
+#: src/rfx-builder.c:3826 src/rfx-builder.c:3834
 #, c-format
 msgid ""
 "\n"
@@ -6488,7 +6499,7 @@
 "Please check this program is in your path and executable.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3951
+#: src/rfx-builder.c:3874
 #, c-format
 msgid ""
 "\n"
@@ -6498,12 +6509,12 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:3960
+#: src/rfx-builder.c:3884
 #, c-format
 msgid "Deleting rfx script %s..."
 msgstr ""
 
-#: src/rfx-builder.c:3980
+#: src/rfx-builder.c:3902
 #, c-format
 msgid ""
 "\n"
@@ -6513,7 +6524,7 @@
 "Error code was %d\n"
 msgstr ""
 
-#: src/rfx-builder.c:4016
+#: src/rfx-builder.c:3938
 #, c-format
 msgid ""
 "\n"
@@ -6523,12 +6534,12 @@
 "Please delete it first, or rename the test script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4027
+#: src/rfx-builder.c:3950
 #, c-format
 msgid "Promoting rfx test plugin %s to custom..."
 msgstr ""
 
-#: src/rfx-builder.c:4044
+#: src/rfx-builder.c:3965
 #, c-format
 msgid ""
 "\n"
@@ -6539,20 +6550,20 @@
 "Return code was %d (%s)\n"
 msgstr ""
 
-#: src/rfx-builder.c:4070
+#: src/rfx-builder.c:3990
 msgid "LiVES: - Export Script to..."
 msgstr ""
 
-#: src/rfx-builder.c:4077 src/rfx-builder.c:4156
+#: src/rfx-builder.c:3997 src/rfx-builder.c:4074
 #, c-format
 msgid "Copying %s to %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4105
+#: src/rfx-builder.c:4024
 msgid "LiVES: Import Script from..."
 msgstr ""
 
-#: src/rfx-builder.c:4148
+#: src/rfx-builder.c:4067
 #, c-format
 msgid ""
 "\n"
@@ -6562,43 +6573,43 @@
 "Please delete it first, or rename the import script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4249
+#: src/rfx-builder.c:4166
 msgid "LiVES: - Copy RFX Script"
 msgstr ""
 
-#: src/rfx-builder.c:4251
+#: src/rfx-builder.c:4168
 msgid "_From type:    "
 msgstr ""
 
-#: src/rfx-builder.c:4258
+#: src/rfx-builder.c:4175
 msgid "   Script:    "
 msgstr ""
 
-#: src/rfx-builder.c:4267
+#: src/rfx-builder.c:4183
 msgid "LiVES: - Rename test RFX Script"
 msgstr ""
 
-#: src/rfx-builder.c:4268
+#: src/rfx-builder.c:4184
 msgid "From script: "
 msgstr ""
 
-#: src/rfx-builder.c:4273
+#: src/rfx-builder.c:4188
 msgid "LiVES: - RFX Script name"
 msgstr ""
 
-#: src/rfx-builder.c:4274
+#: src/rfx-builder.c:4189
 msgid "Script name: "
 msgstr ""
 
-#: src/rfx-builder.c:4294
+#: src/rfx-builder.c:4209
 msgid "New name: "
 msgstr ""
 
-#: src/rfx-builder.c:4297
+#: src/rfx-builder.c:4212
 msgid "New script name: "
 msgstr ""
 
-#: src/rfx-builder.c:4372
+#: src/rfx-builder.c:4286
 msgid ""
 "\n"
 "\n"
@@ -6606,12 +6617,12 @@
 "Script name must be unique.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4384
+#: src/rfx-builder.c:4297
 #, c-format
 msgid "Renaming RFX test script %s to %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4390
+#: src/rfx-builder.c:4302
 #, c-format
 msgid ""
 "\n"
@@ -6622,21 +6633,21 @@
 "Return code was %d\n"
 msgstr ""
 
-#: src/rfx-builder.c:4610
+#: src/rfx-builder.c:4518
 msgid "_Apply Real Time Effects to Selection"
 msgstr ""
 
-#: src/rfx-builder.c:4664
+#: src/rfx-builder.c:4572
 #, c-format
 msgid "Loading rendered effect %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4766
+#: src/rfx-builder.c:4674
 msgid ""
 "See: VJ - show VJ keys. Set the realtime effects, and then apply them here."
 msgstr ""
 
-#: src/preferences.c:359
+#: src/preferences.c:351
 msgid ""
 "\n"
 "\n"
@@ -6644,7 +6655,7 @@
 "full screen, separate window (fs) mode\n"
 msgstr ""
 
-#: src/preferences.c:408
+#: src/preferences.c:400
 msgid ""
 "\n"
 "\n"
@@ -6652,7 +6663,7 @@
 "(Free space = UNKNOWN)"
 msgstr ""
 
-#: src/preferences.c:412
+#: src/preferences.c:403
 #, c-format
 msgid ""
 "\n"
@@ -6661,14 +6672,14 @@
 "(Free space = %s)"
 msgstr ""
 
-#: src/preferences.c:416
+#: src/preferences.c:408
 msgid ""
 "The temp directory is LiVES working directory where opened clips and sets "
 "are stored.\n"
 "It should be in a partition with plenty of free disk space.\n"
 msgstr ""
 
-#: src/preferences.c:784
+#: src/preferences.c:839
 #, c-format
 msgid ""
 "Unable to create or write to the new temporary directory.\n"
@@ -6679,7 +6690,7 @@
 "The directory will not be changed now.\n"
 msgstr ""
 
-#: src/preferences.c:786
+#: src/preferences.c:843
 #, c-format
 msgid ""
 "Unable to create or write to the new temporary directory.\n"
@@ -6689,7 +6700,7 @@
 "The directory will not be changed now.\n"
 msgstr ""
 
-#: src/preferences.c:798
+#: src/preferences.c:856
 msgid ""
 "You have chosen to change the temporary directory.\n"
 "Please make sure you have no other copies of LiVES open.\n"
@@ -6701,20 +6712,20 @@
 "original setting."
 msgstr ""
 
-#: src/preferences.c:1169
+#: src/preferences.c:1221
 msgid ""
 "\n"
 "Unable to switch audio players to jack - jackd must be installed first.\n"
 "See http://jackaudio.org\n"
 msgstr ""
 
-#: src/preferences.c:1175
+#: src/preferences.c:1226
 msgid ""
 "\n"
 "Switching audio players requires restart (jackd must not be running)\n"
 msgstr ""
 
-#: src/preferences.c:1202
+#: src/preferences.c:1253
 msgid ""
 "\n"
 "Unable to switch audio players to pulse audio\n"
@@ -6722,815 +6733,815 @@
 "See http://www.pulseaudio.org\n"
 msgstr ""
 
-#: src/preferences.c:1502
+#: src/preferences.c:1544
 msgid "PCM (highest quality; largest files)"
 msgstr ""
 
-#: src/preferences.c:2063
+#: src/preferences.c:2096
 msgid "LiVES: - Preferences"
 msgstr ""
 
-#: src/preferences.c:2142
+#: src/preferences.c:2177
 msgid "Open file selection maximised"
 msgstr ""
 
-#: src/preferences.c:2149
+#: src/preferences.c:2184
 msgid "Show recent files in the File menu"
 msgstr ""
 
-#: src/preferences.c:2158
+#: src/preferences.c:2193
 msgid "Stop screensaver on playback    "
 msgstr ""
 
-#: src/preferences.c:2165
+#: src/preferences.c:2200
 msgid "Open main window maximised"
 msgstr ""
 
-#: src/preferences.c:2173
+#: src/preferences.c:2208
 msgid "Show toolbar when background is blanked"
 msgstr ""
 
-#: src/preferences.c:2181
+#: src/preferences.c:2216
 msgid "Allow mouse wheel to switch clips"
 msgstr ""
 
-#: src/preferences.c:2192
+#: src/preferences.c:2227
 msgid "Shrink previews to fit in interface"
 msgstr ""
 
-#: src/preferences.c:2202
+#: src/preferences.c:2237
 msgid "Startup mode:"
 msgstr ""
 
-#: src/preferences.c:2206
+#: src/preferences.c:2241
 msgid "_Clip editor"
 msgstr ""
 
-#: src/preferences.c:2210
+#: src/preferences.c:2245
 msgid "_Multitrack mode"
 msgstr ""
 
-#: src/preferences.c:2234
+#: src/preferences.c:2268
 msgid "Multi-head support"
 msgstr ""
 
-#: src/preferences.c:2242
+#: src/preferences.c:2276
 msgid " monitor number for LiVES interface"
 msgstr ""
 
-#: src/preferences.c:2248
+#: src/preferences.c:2282
 msgid " monitor number for playback"
 msgstr ""
 
-#: src/preferences.c:2260
+#: src/preferences.c:2294
 msgid ""
 "A setting of 0 means use all available monitors (only works with some "
 "playback plugins)."
 msgstr ""
 
-#: src/preferences.c:2270
+#: src/preferences.c:2304
 msgid "Force single monitor"
 msgstr ""
 
-#: src/preferences.c:2271
+#: src/preferences.c:2305
 msgid "Ignore all except the first monitor."
 msgstr ""
 
-#: src/preferences.c:2293
+#: src/preferences.c:2327
 msgid "Show clip thumbnails during playback"
 msgstr ""
 
-#: src/preferences.c:2306
+#: src/preferences.c:2340
 msgid "GUI"
 msgstr "GUI"
 
-#: src/preferences.c:2321
+#: src/preferences.c:2355
 msgid "When entering Multitrack mode:"
 msgstr ""
 
-#: src/preferences.c:2330
+#: src/preferences.c:2364
 msgid "_Prompt me for width, height, fps and audio settings"
 msgstr ""
 
-#: src/preferences.c:2336
+#: src/preferences.c:2370
 msgid "_Always use the following values:"
 msgstr ""
 
-#: src/preferences.c:2345
+#: src/preferences.c:2379
 msgid "Use these same _values for rendering a new clip"
 msgstr ""
 
-#: src/preferences.c:2370
+#: src/preferences.c:2404
 msgid "_Width           "
 msgstr ""
 
-#: src/preferences.c:2375
+#: src/preferences.c:2409
 msgid "          _Height      "
 msgstr ""
 
-#: src/preferences.c:2379
+#: src/preferences.c:2413
 msgid "          _FPS"
 msgstr ""
 
-#: src/preferences.c:2387
+#: src/preferences.c:2421
 msgid "Enable backing audio track"
 msgstr ""
 
-#: src/preferences.c:2394
+#: src/preferences.c:2428
 msgid "Audio track per video track"
 msgstr ""
 
-#: src/preferences.c:2423
+#: src/preferences.c:2457
 msgid "    _Undo buffer size (MB)    "
 msgstr ""
 
-#: src/preferences.c:2432
+#: src/preferences.c:2466
 msgid "_Exit multitrack mode after rendering"
 msgstr ""
 
-#: src/preferences.c:2440
+#: src/preferences.c:2474
 msgid "Auto backup layouts"
 msgstr ""
 
-#: src/preferences.c:2445
+#: src/preferences.c:2479
 msgid "_Every"
 msgstr ""
 
-#: src/preferences.c:2453
+#: src/preferences.c:2487
 msgid "seconds"
 msgstr "sekundid"
 
-#: src/preferences.c:2461
+#: src/preferences.c:2495
 msgid "After every _change"
 msgstr ""
 
-#: src/preferences.c:2467
+#: src/preferences.c:2501
 msgid "_Never"
 msgstr "_Mitte kunagi"
 
-#: src/preferences.c:2490
+#: src/preferences.c:2523
 msgid "Multitrack/Render"
 msgstr ""
 
-#: src/preferences.c:2508
+#: src/preferences.c:2541
 msgid "Use instant opening when possible"
 msgstr ""
 
-#: src/preferences.c:2509
+#: src/preferences.c:2543
 msgid "Enable instant opening of some file types using decoder plugins"
 msgstr ""
 
-#: src/preferences.c:2531
+#: src/preferences.c:2567
 msgid "Video open command (fallback)"
 msgstr ""
 
-#: src/preferences.c:2543
+#: src/preferences.c:2579
 msgid "Open/render compression"
 msgstr ""
 
-#: src/preferences.c:2546
+#: src/preferences.c:2582
 msgid " %     ( lower = slower, larger files; for jpeg, higher quality )"
 msgstr ""
 
-#: src/preferences.c:2558
+#: src/preferences.c:2594
 msgid "Default image format"
 msgstr ""
 
-#: src/preferences.c:2562
+#: src/preferences.c:2598
 msgid "_jpeg"
 msgstr "_jpeg"
 
-#: src/preferences.c:2565
+#: src/preferences.c:2601
 msgid "_png"
 msgstr "_png"
 
-#: src/preferences.c:2572
+#: src/preferences.c:2608
 msgid "(Check Help/Troubleshoot to see which image formats are supported)"
 msgstr ""
 
-#: src/preferences.c:2580
+#: src/preferences.c:2616
 msgid "Enable automatic deinterlacing when possible"
 msgstr ""
 
-#: src/preferences.c:2582
+#: src/preferences.c:2619
 msgid "Automatically deinterlace frames when a plugin suggests it"
 msgstr ""
 
-#: src/preferences.c:2593
+#: src/preferences.c:2632
 msgid "Automatic trimming / padding of audio when possible"
 msgstr ""
 
-#: src/preferences.c:2595
+#: src/preferences.c:2634
 msgid "Automatically trim or pad audio when a plugin suggests it"
 msgstr ""
 
-#: src/preferences.c:2606
+#: src/preferences.c:2646
 msgid "Ignore blank borders when possible"
 msgstr ""
 
-#: src/preferences.c:2608
+#: src/preferences.c:2648
 msgid "Clip any blank borders from frames where possible"
 msgstr ""
 
-#: src/preferences.c:2619
+#: src/preferences.c:2660
 msgid "When opening multiple files, concatenate images into one clip"
 msgstr ""
 
-#: src/preferences.c:2629
+#: src/preferences.c:2670
 msgid "Decoding"
 msgstr ""
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:2652
+#: src/preferences.c:2693
 msgid "Low - can improve performance on slower machines"
 msgstr ""
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:2654
+#: src/preferences.c:2695
 msgid "Normal - recommended for most users"
 msgstr ""
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:2656
+#: src/preferences.c:2697
 msgid "High - can improve quality on very fast machines"
 msgstr ""
 
-#: src/preferences.c:2659
+#: src/preferences.c:2700
 msgid "Preview _quality"
 msgstr ""
 
-#: src/preferences.c:2660
+#: src/preferences.c:2701
 msgid "The preview quality for video playback - affects resizing"
 msgstr ""
 
-#: src/preferences.c:2675
+#: src/preferences.c:2717
 msgid "_Show FPS statistics"
 msgstr ""
 
-#: src/preferences.c:2694
+#: src/preferences.c:2736
 msgid "_Plugin"
 msgstr ""
 
-#: src/preferences.c:2718
+#: src/preferences.c:2760
 msgid "Stream audio"
 msgstr ""
 
-#: src/preferences.c:2721
+#: src/preferences.c:2763
 msgid "Stream audio to playback plugin"
 msgstr ""
 
-#: src/preferences.c:2734
+#: src/preferences.c:2778
 msgid "Record player output"
 msgstr ""
 
-#: src/preferences.c:2737
+#: src/preferences.c:2781
 msgid "Record output from player instead of input to player"
 msgstr ""
 
-#: src/preferences.c:2744
+#: src/preferences.c:2789
 msgid "VIDEO"
 msgstr "VIDEO"
 
-#: src/preferences.c:2787
+#: src/preferences.c:2833
 msgid "_Player"
 msgstr ""
 
-#: src/preferences.c:2792
+#: src/preferences.c:2838
 msgid "(See also the Jack Integration tab for jack startup options)"
 msgstr ""
 
-#: src/preferences.c:2819
+#: src/preferences.c:2865
 msgid "mplayer"
 msgstr "mplayer"
 
-#: src/preferences.c:2830
+#: src/preferences.c:2876
 #, fuzzy
 msgid "mplayer2"
 msgstr "mplayer"
 
-#: src/preferences.c:2833
+#: src/preferences.c:2879
 msgid "Audio play _command"
 msgstr ""
 
-#: src/preferences.c:2840
+#: src/preferences.c:2886
 msgid "- internal -"
 msgstr ""
 
-#: src/preferences.c:2849
+#: src/preferences.c:2895
 msgid "Audio follows video _rate/direction"
 msgstr ""
 
-#: src/preferences.c:2857
+#: src/preferences.c:2903
 msgid "Audio follows _clip switches"
 msgstr ""
 
-#: src/preferences.c:2864
+#: src/preferences.c:2910
 msgid "Source:"
 msgstr ""
 
-#: src/preferences.c:2868
+#: src/preferences.c:2914
 msgid "_Internal"
 msgstr ""
 
-#: src/preferences.c:2873
+#: src/preferences.c:2919
 msgid "_External (requires jack or pulse audio player)"
 msgstr ""
 
-#: src/preferences.c:2892
+#: src/preferences.c:2940
 msgid "AUDIO"
 msgstr ""
 
-#: src/preferences.c:2902
+#: src/preferences.c:2950
 msgid "Playback"
 msgstr "Taasesitus"
 
-#: src/preferences.c:2925
+#: src/preferences.c:2973
 msgid ""
 "Record audio when capturing an e_xternal window\n"
 " (requires jack or pulse audio)"
 msgstr ""
 
-#: src/preferences.c:2940
+#: src/preferences.c:2988
 msgid "      What to record when 'r' is pressed   "
 msgstr ""
 
-#: src/preferences.c:2949
+#: src/preferences.c:2997
 msgid "_Frame changes"
 msgstr ""
 
-#: src/preferences.c:2964
+#: src/preferences.c:3012
 msgid "F_PS changes"
 msgstr ""
 
-#: src/preferences.c:2982
+#: src/preferences.c:3030
 msgid "_Real time effects"
 msgstr ""
 
-#: src/preferences.c:2993
+#: src/preferences.c:3041
 msgid "_Clip switches"
 msgstr ""
 
-#: src/preferences.c:3004
+#: src/preferences.c:3052
 msgid "_Audio (requires jack or pulse audio player)"
 msgstr ""
 
-#: src/preferences.c:3024
+#: src/preferences.c:3072
 msgid "Pause recording if free disk space falls below"
 msgstr ""
 
 #. TRANSLATORS: gigabytes
-#: src/preferences.c:3030
+#: src/preferences.c:3078
 msgid "GB"
 msgstr ""
 
-#: src/preferences.c:3037
+#: src/preferences.c:3085
 msgid "Recording"
 msgstr "Salvestamine"
 
-#: src/preferences.c:3055
+#: src/preferences.c:3103
 msgid "Encoder"
 msgstr ""
 
-#: src/preferences.c:3090
+#: src/preferences.c:3137
 msgid "Output format"
 msgstr "Väljundi vorming"
 
-#: src/preferences.c:3106
+#: src/preferences.c:3153
 msgid "Audio codec"
 msgstr ""
 
-#: src/preferences.c:3119
+#: src/preferences.c:3165
 msgid "Encoding"
 msgstr "Kodeering"
 
-#: src/preferences.c:3134
+#: src/preferences.c:3180
 msgid "Use _antialiasing when resizing"
 msgstr ""
 
-#: src/preferences.c:3143
+#: src/preferences.c:3189
 msgid "Number of _real time effect keys"
 msgstr ""
 
-#: src/preferences.c:3145
+#: src/preferences.c:3192
 msgid ""
 "The number of \"virtual\" real time effect keys. They can be controlled "
 "through the real time effects window, or via network (OSC)."
 msgstr ""
 
-#: src/preferences.c:3152
+#: src/preferences.c:3199
 msgid "Use _threads where possible when applying effects"
 msgstr ""
 
-#: src/preferences.c:3159
+#: src/preferences.c:3207
 msgid "Number of _threads"
 msgstr ""
 
-#: src/preferences.c:3172
+#: src/preferences.c:3221
 msgid "Restart is required if any of the following paths are changed:"
 msgstr ""
 
-#: src/preferences.c:3182
+#: src/preferences.c:3231
 msgid "Weed plugin path"
 msgstr ""
 
-#: src/preferences.c:3184
+#: src/preferences.c:3234
 msgid "Frei0r plugin path"
 msgstr ""
 
-#: src/preferences.c:3186
+#: src/preferences.c:3237
 msgid "LADSPA plugin path"
 msgstr ""
 
-#: src/preferences.c:3209
+#: src/preferences.c:3261
 msgid "      Video load directory (default)      "
 msgstr ""
 
-#: src/preferences.c:3215
+#: src/preferences.c:3267
 msgid "      Video save directory (default) "
 msgstr ""
 
-#: src/preferences.c:3221
+#: src/preferences.c:3273
 msgid "      Audio load directory (default) "
 msgstr ""
 
-#: src/preferences.c:3227
+#: src/preferences.c:3279
 msgid "      Image directory (default) "
 msgstr ""
 
-#: src/preferences.c:3233
+#: src/preferences.c:3285
 msgid "      Backup/Restore directory (default) "
 msgstr ""
 
-#: src/preferences.c:3239
+#: src/preferences.c:3291
 msgid "      Temp directory (do not remove) "
 msgstr ""
 
-#: src/preferences.c:3252
+#: src/preferences.c:3304
 msgid "The default directory for loading video clips from"
 msgstr ""
 
-#: src/preferences.c:3277
+#: src/preferences.c:3329
 msgid "The default directory for saving encoded clips to"
 msgstr ""
 
-#: src/preferences.c:3285
+#: src/preferences.c:3337
 msgid "The default directory for loading and saving audio"
 msgstr ""
 
-#: src/preferences.c:3293
+#: src/preferences.c:3345
 msgid "The default directory for saving frameshots to"
 msgstr ""
 
-#: src/preferences.c:3301
+#: src/preferences.c:3353
 msgid "The default directory for backing up/restoring single clips"
 msgstr ""
 
-#: src/preferences.c:3309
+#: src/preferences.c:3361
 msgid "LiVES working directory."
 msgstr ""
 
-#: src/preferences.c:3359
+#: src/preferences.c:3412
 msgid "Directories"
 msgstr "Kataloogid"
 
-#: src/preferences.c:3374
+#: src/preferences.c:3427
 msgid "Warn if diskspace falls below: "
 msgstr ""
 
-#: src/preferences.c:3380 src/preferences.c:3394
+#: src/preferences.c:3433 src/preferences.c:3447
 msgid " MB [set to 0 to disable]"
 msgstr ""
 
-#: src/preferences.c:3389
+#: src/preferences.c:3442
 msgid "Diskspace critical level: "
 msgstr ""
 
-#: src/preferences.c:3407
+#: src/preferences.c:3461
 msgid ""
 "Warn on Insert / Merge if _frame rate of clipboard does not match frame rate "
 "of selection"
 msgstr ""
 
-#: src/preferences.c:3417
+#: src/preferences.c:3471
 msgid "Warn on Open if file _size exceeds "
 msgstr ""
 
-#: src/preferences.c:3425
+#: src/preferences.c:3479
 msgid " MB"
 msgstr " MB"
 
-#: src/preferences.c:3432
+#: src/preferences.c:3486
 msgid "Show a warning before saving a se_t"
 msgstr ""
 
-#: src/preferences.c:3442
+#: src/preferences.c:3496
 msgid ""
 "Show a warning if _mplayer/mplayer2, sox, composite or convert is not found "
 "when LiVES is started."
 msgstr ""
 
-#: src/preferences.c:3452
+#: src/preferences.c:3506
 msgid "Show a warning if no _rendered effects are found at startup."
 msgstr ""
 
-#: src/preferences.c:3464
+#: src/preferences.c:3518
 msgid "Show a warning if no _encoder plugins are found at startup."
 msgstr ""
 
-#: src/preferences.c:3474
+#: src/preferences.c:3528
 msgid "Show a warning if a _duplicate set name is entered."
 msgstr ""
 
-#: src/preferences.c:3485
+#: src/preferences.c:3539
 msgid "When a set is loaded, warn if clips are missing from _layouts."
 msgstr ""
 
-#: src/preferences.c:3495
+#: src/preferences.c:3550
 msgid "Warn if a clip used in a layout is about to be closed."
 msgstr ""
 
-#: src/preferences.c:3505
+#: src/preferences.c:3561
 msgid "Warn if frames used in a layout are about to be deleted."
 msgstr ""
 
-#: src/preferences.c:3515
+#: src/preferences.c:3572
 msgid "Warn if frames used in a layout are about to be shifted."
 msgstr ""
 
-#: src/preferences.c:3525
+#: src/preferences.c:3583
 msgid "Warn if frames used in a layout are about to be altered."
 msgstr ""
 
-#: src/preferences.c:3535
+#: src/preferences.c:3594
 msgid "Warn if audio used in a layout is about to be deleted."
 msgstr ""
 
-#: src/preferences.c:3546
+#: src/preferences.c:3606
 msgid "Warn if audio used in a layout is about to be shifted."
 msgstr ""
 
-#: src/preferences.c:3556
+#: src/preferences.c:3617
 msgid "Warn if audio used in a layout is about to be altered."
 msgstr ""
 
-#: src/preferences.c:3566
+#: src/preferences.c:3628
 msgid "Popup layout errors after clip changes."
 msgstr ""
 
-#: src/preferences.c:3577
+#: src/preferences.c:3639
 msgid "Warn if the layout has not been saved when leaving multitrack mode."
 msgstr ""
 
-#: src/preferences.c:3588
+#: src/preferences.c:3650
 msgid ""
 "Warn if multitrack has no audio channels, and a layout with audio is loaded."
 msgstr ""
 
-#: src/preferences.c:3598
+#: src/preferences.c:3660
 msgid ""
 "Warn if multitrack has audio channels, and your audio player is not \"jack\" "
 "or \"pulse audio\"."
 msgstr ""
 
-#: src/preferences.c:3610
+#: src/preferences.c:3672
 msgid "Show info message after importing from firewire device."
 msgstr ""
 
-#: src/preferences.c:3626
+#: src/preferences.c:3688
 msgid "Show a warning before opening a yuv4mpeg stream (advanced)."
 msgstr ""
 
-#: src/preferences.c:3639
+#: src/preferences.c:3701
 msgid "Show a warning when multitrack is low on backup space."
 msgstr ""
 
-#: src/preferences.c:3650
+#: src/preferences.c:3713
 msgid "Show a warning advising cleaning of disk space after a crash."
 msgstr ""
 
-#: src/preferences.c:3661
+#: src/preferences.c:3725
 msgid "Show a warning if unable to connect to pulseaudio player."
 msgstr ""
 
-#: src/preferences.c:3673
+#: src/preferences.c:3737
 msgid "Show a warning before wiping a layout which has unsaved changes."
 msgstr ""
 
-#: src/preferences.c:3685
+#: src/preferences.c:3749
 msgid "Warnings"
 msgstr "Hoiatused"
 
-#: src/preferences.c:3703
+#: src/preferences.c:3767
 msgid "Midi synch (requires the files midistart and midistop)"
 msgstr ""
 
-#: src/preferences.c:3715
+#: src/preferences.c:3779
 msgid "When inserting/merging frames:  "
 msgstr ""
 
-#: src/preferences.c:3719
+#: src/preferences.c:3783
 msgid "_Speed Up/Slow Down Insertion"
 msgstr ""
 
-#: src/preferences.c:3723
+#: src/preferences.c:3787
 msgid "_Resample Insertion"
 msgstr ""
 
-#: src/preferences.c:3730
+#: src/preferences.c:3794
 msgid "CD device           "
 msgstr ""
 
-#: src/preferences.c:3733
+#: src/preferences.c:3797
 msgid "LiVES can load audio tracks from this CD"
 msgstr ""
 
-#: src/preferences.c:3746
+#: src/preferences.c:3813
 msgid "Default FPS        "
 msgstr ""
 
-#: src/preferences.c:3749
+#: src/preferences.c:3816
 msgid "Frames per second to use when none is specified"
 msgstr ""
 
-#: src/preferences.c:3757
+#: src/preferences.c:3825
 msgid "Misc"
 msgstr "Muud"
 
-#: src/preferences.c:3782
+#: src/preferences.c:3850
 msgid "New theme:           "
 msgstr ""
 
-#: src/preferences.c:3800
+#: src/preferences.c:3867
 msgid "Themes"
 msgstr "Teemad"
 
-#: src/preferences.c:3815
+#: src/preferences.c:3882
 msgid "Download bandwidth (Kb/s)       "
 msgstr ""
 
-#: src/preferences.c:3823
+#: src/preferences.c:3890
 msgid "LiVES must be compiled without \"configure --disable-OSC\" to use OMC"
 msgstr ""
 
-#: src/preferences.c:3833
+#: src/preferences.c:3900
 msgid "OMC remote control enabled"
 msgstr ""
 
-#: src/preferences.c:3841
+#: src/preferences.c:3908
 msgid "UDP port       "
 msgstr ""
 
-#: src/preferences.c:3850
+#: src/preferences.c:3917
 msgid "Start OMC on startup"
 msgstr ""
 
-#: src/preferences.c:3870
+#: src/preferences.c:3937
 msgid "Streaming/Networking"
 msgstr ""
 
-#: src/preferences.c:3882
+#: src/preferences.c:3949
 msgid "Jack transport"
 msgstr ""
 
-#: src/preferences.c:3886
+#: src/preferences.c:3953
 msgid ""
 "LiVES must be compiled with jack/transport.h and jack/jack.h present to use "
 "jack transport"
 msgstr ""
 
-#: src/preferences.c:3892
+#: src/preferences.c:3959
 msgid "Jack _transport config file"
 msgstr ""
 
-#: src/preferences.c:3899 src/preferences.c:3989
+#: src/preferences.c:3967 src/preferences.c:4058
 msgid "Start _server on LiVES startup"
 msgstr ""
 
-#: src/preferences.c:3911
+#: src/preferences.c:3979
 msgid "Jack transport _master (start and stop)"
 msgstr ""
 
-#: src/preferences.c:3921
+#: src/preferences.c:3989
 msgid "Jack transport _client (start and stop)"
 msgstr ""
 
-#: src/preferences.c:3935
+#: src/preferences.c:4003
 msgid "Jack transport sets start position"
 msgstr ""
 
-#: src/preferences.c:3952
+#: src/preferences.c:4020
 msgid "Jack transport timebase slave"
 msgstr ""
 
-#: src/preferences.c:3963
+#: src/preferences.c:4031
 msgid "(See also Playback -> Audio follows video rate/direction)"
 msgstr ""
 
-#: src/preferences.c:3971
+#: src/preferences.c:4039
 msgid "Jack audio"
 msgstr ""
 
-#: src/preferences.c:3975
+#: src/preferences.c:4043
 msgid "LiVES must be compiled with jack/jack.h present to use jack audio"
 msgstr ""
 
-#: src/preferences.c:3978
+#: src/preferences.c:4046
 msgid ""
 "You MUST set the audio player to \"jack\" in the Playback tab to use jack "
 "audio"
 msgstr ""
 
-#: src/preferences.c:3984
+#: src/preferences.c:4052
 msgid "Jack _audio server config file"
 msgstr ""
 
-#: src/preferences.c:3996
+#: src/preferences.c:4065
 msgid "Play audio even when transport is _paused"
 msgstr ""
 
-#: src/preferences.c:4008
+#: src/preferences.c:4077
 msgid "Automatically connect to System Out ports when 'playing' External Audio"
 msgstr ""
 
-#: src/preferences.c:4021
+#: src/preferences.c:4090
 msgid "Jack Integration"
 msgstr ""
 
-#: src/preferences.c:4035
+#: src/preferences.c:4104
 msgid "Events to respond to:"
 msgstr ""
 
-#: src/preferences.c:4044
+#: src/preferences.c:4113
 msgid "_Joystick events"
 msgstr ""
 
-#: src/preferences.c:4051
+#: src/preferences.c:4120
 msgid "_Joystick device"
 msgstr ""
 
-#: src/preferences.c:4053
+#: src/preferences.c:4122
 msgid "The joystick device, e.g. /dev/input/js0"
 msgstr ""
 
-#: src/preferences.c:4071
+#: src/preferences.c:4142
 msgid "_MIDI events"
 msgstr ""
 
-#: src/preferences.c:4080
+#: src/preferences.c:4151
 msgid "Use _ALSA MIDI (recommended)"
 msgstr ""
 
-#: src/preferences.c:4082
+#: src/preferences.c:4153
 msgid "Create an ALSA MIDI port which other MIDI devices can be connected to"
 msgstr ""
 
-#: src/preferences.c:4090
+#: src/preferences.c:4162
 msgid "Use _raw MIDI"
 msgstr ""
 
-#: src/preferences.c:4092
+#: src/preferences.c:4164
 msgid "Read directly from the MIDI device"
 msgstr ""
 
-#: src/preferences.c:4104
+#: src/preferences.c:4177
 msgid "_MIDI device"
 msgstr ""
 
-#: src/preferences.c:4106
+#: src/preferences.c:4179
 msgid "The MIDI device, e.g. /dev/input/midi0"
 msgstr ""
 
-#: src/preferences.c:4118
+#: src/preferences.c:4193
 msgid "Advanced"
 msgstr "Muu"
 
-#: src/preferences.c:4124
+#: src/preferences.c:4199
 msgid "MIDI check _rate"
 msgstr ""
 
-#: src/preferences.c:4127
+#: src/preferences.c:4203
 msgid ""
 "Number of MIDI checks per keyboard tick. Increasing this may improve MIDI "
 "responsiveness, but may slow down playback."
 msgstr ""
 
-#: src/preferences.c:4134
+#: src/preferences.c:4211
 msgid "MIDI repeat"
 msgstr ""
 
-#: src/preferences.c:4137
+#: src/preferences.c:4214
 msgid "Number of non-reads allowed between succesive reads."
 msgstr ""
 
-#: src/preferences.c:4140
+#: src/preferences.c:4218
 msgid "(Warning: setting this value too high can slow down playback.)"
 msgstr ""
 
-#: src/preferences.c:4159
+#: src/preferences.c:4237
 msgid "MIDI/Joystick learner"
 msgstr ""
 
-#: src/preferences.c:4499
+#: src/preferences.c:4679
 msgid ""
 "\n"
 "LiVES will now shut down. You need to restart it for the directory change to "
@@ -7538,214 +7549,214 @@
 "Click OK to continue.\n"
 msgstr ""
 
-#: src/preferences.c:4523
+#: src/preferences.c:4703
 msgid ""
 "For the directory change to take effect LiVES will restart when preferences "
 "dialog closes."
 msgstr ""
 
-#: src/preferences.c:4527
+#: src/preferences.c:4707
 msgid "Theme changes will not take effect until the next time you start LiVES."
 msgstr ""
 
-#: src/preferences.c:4531
+#: src/preferences.c:4711
 msgid "Jack options will not take effect until the next time you start LiVES."
 msgstr ""
 
-#: src/osc.c:2585
+#: src/osc.c:2616
 #, c-format
 msgid "Syncing to external framerate of %.8f frames per second.\n"
 msgstr ""
 
-#: src/osc.c:6746
+#: src/osc.c:6938
 msgid "Cannot initialize OSC receiver\n"
 msgstr ""
 
-#: src/osc.c:6770
+#: src/osc.c:6961
 #, c-format
 msgid "WARNING: Cannot start OSC server at UDP port %d\n"
 msgstr ""
 
-#: src/osc.c:6775
+#: src/osc.c:6963
 #, c-format
 msgid "Started OSC server at UDP port %d\n"
 msgstr ""
 
-#: src/osc.c:6890
+#: src/osc.c:7076
 #, c-format
 msgid "Cannot start OSC/UDP server at port %d \n"
 msgstr ""
 
-#: src/resample.c:125 src/resample.c:304
+#: src/resample.c:131 src/resample.c:305
 #, c-format
 msgid "Resizing frames 1 to %d"
 msgstr ""
 
-#: src/resample.c:140 src/resample.c:318
+#: src/resample.c:145 src/resample.c:318
 #, c-format
 msgid "Resizing/letterboxing frames 1 to %d"
 msgstr ""
 
-#: src/resample.c:361 src/resample.c:385
+#: src/resample.c:360 src/resample.c:384
 msgid "Resize"
 msgstr "Suuruse muutmine"
 
-#: src/resample.c:395
+#: src/resample.c:394
 msgid "Resample/Resize"
 msgstr ""
 
-#: src/resample.c:680
+#: src/resample.c:676
 #, c-format
 msgid "Length of video is now %d frames.\n"
 msgstr ""
 
-#: src/resample.c:745
+#: src/resample.c:737
 msgid ""
 "\n"
 "\n"
 "New rate must be greater than 0\n"
 msgstr ""
 
-#: src/resample.c:797 src/resample.c:813
+#: src/resample.c:788 src/resample.c:803
 msgid "Resampling audio"
 msgstr ""
 
-#: src/resample.c:831
+#: src/resample.c:821
 msgid "LiVES was unable to resample the audio as requested.\n"
 msgstr ""
 
-#: src/resample.c:833 src/resample.c:837
+#: src/resample.c:823 src/resample.c:827
 msgid "Resample Audio"
 msgstr ""
 
-#: src/resample.c:845
+#: src/resample.c:835
 #, c-format
 msgid "Audio was resampled to %d Hz, %d channels, %d bit"
 msgstr ""
 
-#: src/resample.c:1034
+#: src/resample.c:1016
 #, c-format
 msgid "Resampling video at %.8f frames per second..."
 msgstr ""
 
-#: src/resample.c:1037
+#: src/resample.c:1018
 #, c-format
 msgid "Resampling video at %.3f frames per second..."
 msgstr ""
 
-#: src/resample.c:1068
+#: src/resample.c:1049
 msgid "Reordering error !\n"
 msgstr ""
 
-#: src/resample.c:1079
+#: src/resample.c:1060
 msgid "Resample"
 msgstr ""
 
-#: src/resample.c:1192
+#: src/resample.c:1173
 msgid "LiVES: - Resample Audio"
 msgstr ""
 
-#: src/resample.c:1195
+#: src/resample.c:1175
 msgid "LiVES: - Insert Silence"
 msgstr ""
 
-#: src/resample.c:1198
+#: src/resample.c:1177
 msgid "LiVES: - New Clip Audio"
 msgstr ""
 
-#: src/resample.c:1201
+#: src/resample.c:1179
 msgid "LiVES: - External Clip Settings"
 msgstr ""
 
-#: src/resample.c:1238 src/resample.c:1358
+#: src/resample.c:1215 src/resample.c:1332
 msgid "Rate (Hz) "
 msgstr ""
 
-#: src/resample.c:1245 src/resample.c:1372
+#: src/resample.c:1222 src/resample.c:1346
 msgid "Channels"
 msgstr ""
 
-#: src/resample.c:1252
+#: src/resample.c:1229
 msgid "Sample Size "
 msgstr ""
 
-#: src/resample.c:1268 src/resample.c:1425
+#: src/resample.c:1245 src/resample.c:1399
 msgid "Signed"
 msgstr ""
 
-#: src/resample.c:1274 src/resample.c:1435
+#: src/resample.c:1251 src/resample.c:1409
 msgid "Unsigned"
 msgstr ""
 
-#: src/resample.c:1297 src/resample.c:1460
+#: src/resample.c:1273 src/resample.c:1433
 msgid "Little Endian"
 msgstr ""
 
-#: src/resample.c:1303 src/resample.c:1468
+#: src/resample.c:1279 src/resample.c:1441
 msgid "Big Endian"
 msgstr ""
 
-#: src/resample.c:1315
+#: src/resample.c:1290
 msgid "Current"
 msgstr "Päevakajaline"
 
-#: src/resample.c:1340
+#: src/resample.c:1315
 msgid "_Enable audio"
 msgstr ""
 
-#: src/resample.c:1372
+#: src/resample.c:1346
 msgid "_Channels"
 msgstr ""
 
-#: src/resample.c:1394
+#: src/resample.c:1368
 msgid "_Sample Size"
 msgstr ""
 
-#: src/resample.c:1394
+#: src/resample.c:1368
 msgid "Sample Size"
 msgstr ""
 
-#: src/resample.c:1489
+#: src/resample.c:1461
 msgid "New"
 msgstr "Uus"
 
-#: src/resample.c:1512
+#: src/resample.c:1484
 msgid "_Frames Per Second "
 msgstr ""
 
-#: src/resample.c:1530
+#: src/resample.c:1502
 msgid "Record for maximum:  "
 msgstr ""
 
-#: src/resample.c:1533
+#: src/resample.c:1505
 msgid " hours  "
 msgstr ""
 
-#: src/resample.c:1536
+#: src/resample.c:1508
 msgid " minutes  "
 msgstr ""
 
-#: src/resample.c:1538
+#: src/resample.c:1510
 msgid " seconds  "
 msgstr ""
 
-#: src/resample.c:1545
+#: src/resample.c:1517
 msgid "Unlimited"
 msgstr "Pealkirjata"
 
-#: src/resample.c:1561
+#: src/resample.c:1533
 msgid "Click OK to begin recording, or Cancel to quit."
 msgstr ""
 
-#: src/resample.c:1670
+#: src/resample.c:1638
 msgid "LiVES: - Change playback speed"
 msgstr ""
 
-#: src/resample.c:1673
+#: src/resample.c:1640
 msgid "LiVES: - Resample Video"
 msgstr ""
 
-#: src/resample.c:1696
+#: src/resample.c:1663
 #, c-format
 msgid ""
 "\n"
@@ -7756,7 +7767,7 @@
 "in _frames per second"
 msgstr ""
 
-#: src/resample.c:1701
+#: src/resample.c:1667
 #, c-format
 msgid ""
 "\n"
@@ -7767,89 +7778,89 @@
 "in frames per second"
 msgstr ""
 
-#: src/resample.c:1723
+#: src/resample.c:1688
 msgid "OR enter the desired clip length in _seconds"
 msgstr ""
 
-#: src/resample.c:1745
+#: src/resample.c:1710
 msgid "Change the _audio speed as well"
 msgstr ""
 
-#: src/resample.c:1846
+#: src/resample.c:1810
 msgid ""
 "\n"
 "Speeding up the clip will cause missing frames in some multitrack layouts.\n"
 "Are you sure you wish to change the speed ?\n"
 msgstr ""
 
-#: src/resample.c:1863
+#: src/resample.c:1829
 msgid ""
 "\n"
 "Speeding up the clip will cause missing audio in some multitrack layouts.\n"
 "Are you sure you wish to change the speed ?\n"
 msgstr ""
 
-#: src/resample.c:1878
+#: src/resample.c:1847
 msgid ""
 "\n"
 "Changing the speed will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/resample.c:1892
+#: src/resample.c:1863
 msgid ""
 "\n"
 "Changing the speed will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/resample.c:1938
+#: src/resample.c:1911
 msgid "Speed Change"
 msgstr ""
 
-#: src/resample.c:1947
+#: src/resample.c:1920
 #, c-format
 msgid "Changed playback speed to %.3f frames per second and audio to %d Hz.\n"
 msgstr ""
 
-#: src/resample.c:1950
+#: src/resample.c:1922
 #, c-format
 msgid "Changed playback speed to %.3f frames per second.\n"
 msgstr ""
 
-#: src/resample.c:2035
+#: src/resample.c:2006
 msgid "Resampling video"
 msgstr ""
 
-#: src/resample.c:2042 src/resample.c:2160 src/resample.c:2182
+#: src/resample.c:2012 src/resample.c:2127 src/resample.c:2148
 msgid "Resampling clipboard video"
 msgstr ""
 
-#: src/resample.c:2047
+#: src/resample.c:2016
 msgid "Reordering frames"
 msgstr ""
 
-#: src/resample.c:2056
+#: src/resample.c:2025
 msgid ""
 "\n"
 "\n"
 "LiVES was unable to reorder the frames."
 msgstr ""
 
-#: src/resample.c:2104
+#: src/resample.c:2071
 msgid "Deordering frames"
 msgstr ""
 
-#: src/resample.c:2199
+#: src/resample.c:2165
 msgid "resampling error..."
 msgstr ""
 
-#: src/rte_window.c:85 src/rte_window.c:1708
+#: src/rte_window.c:124 src/rte_window.c:1709
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
-#: src/rte_window.c:112
+#: src/rte_window.c:150
 msgid ""
 "\n"
 "\n"
@@ -7859,7 +7870,7 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:426
+#: src/rte_window.c:460
 msgid ""
 "\n"
 "\n"
@@ -7867,19 +7878,19 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:432
+#: src/rte_window.c:466
 #, c-format
 msgid "Saving keymap to %s\n"
 msgstr ""
 
-#: src/rte_window.c:439
+#: src/rte_window.c:471
 #, c-format
 msgid ""
 "\n"
 "Updating keymap file %s..."
 msgstr ""
 
-#: src/rte_window.c:446
+#: src/rte_window.c:477
 #, c-format
 msgid ""
 "\n"
@@ -7889,12 +7900,12 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/rte_window.c:526
+#: src/rte_window.c:556
 #, c-format
 msgid "Saving real time effect defaults to %s..."
 msgstr ""
 
-#: src/rte_window.c:535
+#: src/rte_window.c:563
 #, c-format
 msgid ""
 "\n"
@@ -7904,22 +7915,22 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/rte_window.c:632
+#: src/rte_window.c:657
 #, c-format
 msgid "Loading real time effect defaults from %s..."
 msgstr ""
 
-#: src/rte_window.c:681
+#: src/rte_window.c:701
 #, c-format
 msgid "Loading generator default sizes from %s..."
 msgstr ""
 
-#: src/rte_window.c:1306
+#: src/rte_window.c:1319
 #, c-format
 msgid "Loading default keymap from %s..."
 msgstr ""
 
-#: src/rte_window.c:1329
+#: src/rte_window.c:1339
 #, c-format
 msgid ""
 "\n"
@@ -7929,48 +7940,48 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/rte_window.c:1403
+#: src/rte_window.c:1412
 #, c-format
 msgid "Invalid line %d in %s\n"
 msgstr ""
 
-#: src/rte_window.c:1483
+#: src/rte_window.c:1490
 #, c-format
 msgid "Invalid key %d in %s\n"
 msgstr ""
 
-#: src/rte_window.c:1498
+#: src/rte_window.c:1505
 #, c-format
 msgid "Invalid effect %s in %s\n"
 msgstr ""
 
-#: src/rte_window.c:1517
+#: src/rte_window.c:1524
 #, c-format
 msgid "Unknown effect %s in %s\n"
 msgstr ""
 
-#: src/rte_window.c:1535
+#: src/rte_window.c:1542
 #, c-format
 msgid ""
 "This version of LiVES cannot mix generators/non-generators on the same key "
 "(%d) !\n"
 msgstr ""
 
-#: src/rte_window.c:1547
+#: src/rte_window.c:1554
 #, c-format
 msgid "Too many effects bound to key %d.\n"
 msgstr ""
 
-#: src/rte_window.c:1587
+#: src/rte_window.c:1593
 msgid "update required.\n"
 msgstr ""
 
-#: src/rte_window.c:1603
+#: src/rte_window.c:1607
 #, c-format
 msgid "Loading data connection map from %s..."
 msgstr ""
 
-#: src/rte_window.c:1612
+#: src/rte_window.c:1614
 msgid ""
 "\n"
 "\n"
@@ -7978,41 +7989,41 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:1691
+#: src/rte_window.c:1692
 #, c-format
 msgid "LiVES: Information for %s"
 msgstr ""
 
-#: src/rte_window.c:1704
+#: src/rte_window.c:1705
 #, c-format
 msgid "Effect name: %s"
 msgstr ""
 
-#: src/rte_window.c:1712
+#: src/rte_window.c:1713
 #, c-format
 msgid "Plugin name: %s"
 msgstr ""
 
-#: src/rte_window.c:1716
+#: src/rte_window.c:1717
 #, c-format
 msgid "Author: %s"
 msgstr "Autor: %s"
 
-#: src/rte_window.c:1721
+#: src/rte_window.c:1722
 #, c-format
 msgid "and: %s"
 msgstr ""
 
-#: src/rte_window.c:1726
+#: src/rte_window.c:1727
 #, c-format
 msgid "Version: %d"
 msgstr ""
 
-#: src/rte_window.c:1734
+#: src/rte_window.c:1735
 msgid "Description: "
 msgstr "Kirjeldus: "
 
-#: src/rte_window.c:1960
+#: src/rte_window.c:1963
 msgid ""
 "\n"
 "\n"
@@ -8021,69 +8032,69 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:2024
+#: src/rte_window.c:2027
 #, c-format
 msgid "LiVES could not locate the effect %s.\n"
 msgstr ""
 
-#: src/rte_window.c:2225
+#: src/rte_window.c:2216
 msgid "LiVES: Real time effect mapping"
 msgstr ""
 
-#: src/rte_window.c:2257
+#: src/rte_window.c:2248
 #, c-format
 msgid "Ctrl-%d"
 msgstr ""
 
-#: src/rte_window.c:2264
+#: src/rte_window.c:2255
 msgid "Key active"
 msgstr ""
 
-#: src/rte_window.c:2279
+#: src/rte_window.c:2271
 msgid "Key grab"
 msgstr ""
 
-#: src/rte_window.c:2280
+#: src/rte_window.c:2272
 msgid "Grab keyboard for this effect key"
 msgstr ""
 
-#: src/rte_window.c:2290
+#: src/rte_window.c:2283
 msgid "_Clear all effects"
 msgstr ""
 
-#: src/rte_window.c:2304
+#: src/rte_window.c:2297
 msgid "Mode active"
 msgstr ""
 
-#: src/rte_window.c:2314 src/multitrack.c:8568
+#: src/rte_window.c:2307 src/multitrack.c:8762
 msgid "Info"
 msgstr "Andmed"
 
-#: src/rte_window.c:2315
+#: src/rte_window.c:2308
 msgid "Set Parameters"
 msgstr ""
 
-#: src/rte_window.c:2316
+#: src/rte_window.c:2309
 msgid "Set Connections"
 msgstr ""
 
-#: src/rte_window.c:2317
+#: src/rte_window.c:2310
 msgid "Clear"
 msgstr "Puhasta"
 
-#: src/rte_window.c:2326
+#: src/rte_window.c:2319
 msgid "Effect name:"
 msgstr ""
 
-#: src/rte_window.c:2391
+#: src/rte_window.c:2384
 msgid "_Save as default keymap"
 msgstr ""
 
-#: src/rte_window.c:2396
+#: src/rte_window.c:2389
 msgid "_Load default keymap"
 msgstr ""
 
-#: src/rte_window.c:2840
+#: src/rte_window.c:2833
 #, c-format
 msgid ""
 "Unable to create default keymap file: %s\n"
@@ -8141,86 +8152,86 @@
 msgid "none\n"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:494
+#: src/lives-yuv4mpeg.c:493
 #, c-format
 msgid ""
 "Unable to set display framerate to %.3f fps.\n"
 "\n"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:503
+#: src/lives-yuv4mpeg.c:502
 #, c-format
 msgid "Unable to open yuv4mpeg out stream %s\n"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:628
+#: src/lives-yuv4mpeg.c:626
 #, c-format
 msgid "TV card %d"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:713
+#: src/lives-yuv4mpeg.c:710
 #, c-format
 msgid "Opened TV card %d (%s)"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:760
+#: src/lives-yuv4mpeg.c:757
 #, c-format
 msgid "Firewire card %d"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:796
+#: src/lives-yuv4mpeg.c:793
 #, c-format
 msgid "Opened firewire card %d"
 msgstr ""
 
-#: src/multitrack.c:666
+#: src/multitrack.c:736
 msgid "Auto backup"
 msgstr ""
 
-#: src/multitrack.c:868
+#: src/multitrack.c:935
 msgid "Backing audio"
 msgstr ""
 
-#: src/multitrack.c:1435
+#: src/multitrack.c:1515
 #, c-format
 msgid "%s : parameters for %s"
 msgstr ""
 
-#: src/multitrack.c:1809 src/multitrack.c:3483
+#: src/multitrack.c:1881 src/multitrack.c:3635
 #, c-format
 msgid "Current track: %s (layer %d)\n"
 msgstr ""
 
-#: src/multitrack.c:1813 src/multitrack.c:3484
+#: src/multitrack.c:1885 src/multitrack.c:3637
 msgid "Current track: Backing audio\n"
 msgstr ""
 
-#: src/multitrack.c:1814
+#: src/multitrack.c:1886
 #, c-format
 msgid "Current track: Layer %d audio\n"
 msgstr ""
 
-#: src/multitrack.c:1817
+#: src/multitrack.c:1889
 #, c-format
 msgid "%.2f sec.\n"
 msgstr ""
 
-#: src/multitrack.c:1822 src/multitrack.c:3490
+#: src/multitrack.c:1894 src/multitrack.c:3643
 #, c-format
 msgid "Source: %s"
 msgstr ""
 
-#: src/multitrack.c:1825 src/multitrack.c:3492
+#: src/multitrack.c:1897 src/multitrack.c:3645
 msgid "Right click for context menu.\n"
 msgstr ""
 
-#: src/multitrack.c:1827
+#: src/multitrack.c:1899
 msgid ""
 "Double click on a block\n"
 "to select it."
 msgstr ""
 
-#: src/multitrack.c:3312
+#: src/multitrack.c:3452
 msgid ""
 "\n"
 "\n"
@@ -8229,7 +8240,7 @@
 "right or double clicking on it.\n"
 msgstr ""
 
-#: src/multitrack.c:3315
+#: src/multitrack.c:3455
 msgid ""
 "\n"
 "\n"
@@ -8237,14 +8248,14 @@
 "Select an effect in FX stack first to view its parameters.\n"
 msgstr ""
 
-#: src/multitrack.c:3318
+#: src/multitrack.c:3458
 msgid ""
 "\n"
 "\n"
 "No clips loaded.\n"
 msgstr ""
 
-#: src/multitrack.c:3321
+#: src/multitrack.c:3462
 msgid ""
 "You must select two video tracks\n"
 "and a time region\n"
@@ -8254,7 +8265,7 @@
 "before inserting clips into the timeline."
 msgstr ""
 
-#: src/multitrack.c:3324
+#: src/multitrack.c:3465
 msgid ""
 "\n"
 "\n"
@@ -8263,210 +8274,210 @@
 "to apply compositors.\n"
 msgstr ""
 
-#: src/multitrack.c:3487
+#: src/multitrack.c:3640
 #, c-format
 msgid "%.2f sec. to %.2f sec.\n"
 msgstr ""
 
-#: src/multitrack.c:3493
+#: src/multitrack.c:3646
 msgid ""
 "Single click on timeline\n"
 "to select a frame.\n"
 msgstr ""
 
-#: src/multitrack.c:3711 src/multitrack.c:6790
+#: src/multitrack.c:3858 src/multitrack.c:6972
 #, c-format
 msgid "%s [unstable]"
 msgstr ""
 
-#: src/multitrack.c:3822
+#: src/multitrack.c:3973
 msgid ""
 "You can click and drag\n"
 "below the timeline"
 msgstr ""
 
-#: src/multitrack.c:3823
+#: src/multitrack.c:3974
 msgid "to select a time region.\n"
 msgstr ""
 
-#: src/multitrack.c:3985
+#: src/multitrack.c:4137
 msgid "LiVES: Selected clip"
 msgstr ""
 
-#: src/multitrack.c:3993
+#: src/multitrack.c:4145
 msgid "_Adjust start and end points"
 msgstr ""
 
-#: src/multitrack.c:4002
+#: src/multitrack.c:4154
 msgid "_Edit/encode in clip editor"
 msgstr ""
 
-#: src/multitrack.c:4009
+#: src/multitrack.c:4161
 msgid "_Show clip information"
 msgstr ""
 
-#: src/multitrack.c:4016
+#: src/multitrack.c:4168
 msgid "_Close this clip"
 msgstr ""
 
-#: src/multitrack.c:4236
+#: src/multitrack.c:4388
 msgid "Audio mixer (ctrl-m)"
 msgstr ""
 
-#: src/multitrack.c:4336
+#: src/multitrack.c:4488
 msgid "Single click on timeline"
 msgstr ""
 
-#: src/multitrack.c:4337
+#: src/multitrack.c:4489
 msgid "to select a frame."
 msgstr ""
 
-#: src/multitrack.c:4338
+#: src/multitrack.c:4490
 msgid "Double click or right click on timeline"
 msgstr ""
 
-#: src/multitrack.c:4339
+#: src/multitrack.c:4491
 msgid "to select a block."
 msgstr ""
 
-#: src/multitrack.c:4340
+#: src/multitrack.c:4492
 msgid "Clips can be dragged"
 msgstr ""
 
-#: src/multitrack.c:4341
+#: src/multitrack.c:4493
 msgid "onto the timeline."
 msgstr ""
 
-#: src/multitrack.c:4343
+#: src/multitrack.c:4495
 msgid "Mouse mode is: Move"
 msgstr ""
 
-#: src/multitrack.c:4344
+#: src/multitrack.c:4496
 msgid "clips can be moved around."
 msgstr ""
 
-#: src/multitrack.c:4349
+#: src/multitrack.c:4500
 msgid "Mouse mode is: Select."
 msgstr ""
 
-#: src/multitrack.c:4350
+#: src/multitrack.c:4501
 msgid "Drag with mouse on timeline"
 msgstr ""
 
-#: src/multitrack.c:4351
+#: src/multitrack.c:4502
 msgid "to select tracks and time."
 msgstr ""
 
-#: src/multitrack.c:4362
+#: src/multitrack.c:4509
 msgid "_Insert mode: Normal"
 msgstr ""
 
-#: src/multitrack.c:4378
+#: src/multitrack.c:4537
 msgid "_Mouse mode: Move"
 msgstr ""
 
-#: src/multitrack.c:4382
+#: src/multitrack.c:4540
 msgid "_Mouse mode: Select"
 msgstr ""
 
-#: src/multitrack.c:4405 src/multitrack.c:7925
+#: src/multitrack.c:4563 src/multitrack.c:8104
 msgid "Gravity: Normal"
 msgstr ""
 
-#: src/multitrack.c:4409
+#: src/multitrack.c:4565
 msgid "Gravity: Left"
 msgstr ""
 
-#: src/multitrack.c:4414
+#: src/multitrack.c:4569
 msgid "Gravity: Right"
 msgstr ""
 
-#: src/multitrack.c:4416
+#: src/multitrack.c:4570
 msgid "Close _last gap(s) in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:4419
+#: src/multitrack.c:4572
 msgid "Close _first gap(s) in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:4458
+#: src/multitrack.c:4627
 msgid "Close gaps"
 msgstr ""
 
-#: src/multitrack.c:4460
+#: src/multitrack.c:4629
 msgid "Move block"
 msgstr ""
 
-#: src/multitrack.c:4462
+#: src/multitrack.c:4631
 msgid "Move audio block"
 msgstr ""
 
-#: src/multitrack.c:4464
+#: src/multitrack.c:4633
 msgid "Delete block"
 msgstr ""
 
-#: src/multitrack.c:4466
+#: src/multitrack.c:4635
 msgid "Delete audio block"
 msgstr ""
 
-#: src/multitrack.c:4468
+#: src/multitrack.c:4637
 msgid "Split tracks"
 msgstr ""
 
-#: src/multitrack.c:4470
+#: src/multitrack.c:4639
 msgid "Split block"
 msgstr ""
 
-#: src/multitrack.c:4473
+#: src/multitrack.c:4642
 #, c-format
 msgid "Apply %s"
 msgstr ""
 
-#: src/multitrack.c:4478
+#: src/multitrack.c:4647
 #, c-format
 msgid "Delete %s"
 msgstr ""
 
-#: src/multitrack.c:4482
+#: src/multitrack.c:4651
 msgid "Insert block"
 msgstr ""
 
-#: src/multitrack.c:4484
+#: src/multitrack.c:4653
 msgid "Insert gap"
 msgstr ""
 
-#: src/multitrack.c:4486
+#: src/multitrack.c:4655
 msgid "Insert audio block"
 msgstr ""
 
-#: src/multitrack.c:4488
+#: src/multitrack.c:4657
 msgid "Effect order change"
 msgstr ""
 
-#: src/multitrack.c:4898
+#: src/multitrack.c:5064
 msgid "unsigned "
 msgstr ""
 
-#: src/multitrack.c:4899
+#: src/multitrack.c:5065
 msgid "signed "
 msgstr ""
 
-#: src/multitrack.c:4904
+#: src/multitrack.c:5071
 #, c-format
 msgid ""
 "Multitrack values set to %.3f fps, frame size %d x %d, audio channels %d, "
 "audio rate %d, audio sample size %d, %s.\n"
 msgstr ""
 
-#: src/multitrack.c:4938
+#: src/multitrack.c:5104
 msgid "invalid event list. Failed.\n"
 msgstr ""
 
-#: src/multitrack.c:4944
+#: src/multitrack.c:5110
 msgid "event list has invalid fps. Failed.\n"
 msgstr ""
 
-#: src/multitrack.c:4953
+#: src/multitrack.c:5122
 #, c-format
 msgid ""
 "\n"
@@ -8476,7 +8487,7 @@
 "then load in the new set from the File menu.\n"
 msgstr ""
 
-#: src/multitrack.c:4993
+#: src/multitrack.c:5163
 #, c-format
 msgid ""
 "\n"
@@ -8484,600 +8495,592 @@
 "It cannot be loaded.\n"
 msgstr ""
 
-#: src/multitrack.c:5329 src/multitrack.c:5338 src/multitrack.c:21133
+#: src/multitrack.c:5452
 msgid "Layout was wiped.\n"
 msgstr ""
 
-#: src/multitrack.c:5374
+#: src/multitrack.c:5547
 #, c-format
 msgid "LiVES-%s: Multitrack %dx%d : %d bpp %.3f fps"
 msgstr ""
 
-#: src/multitrack.c:5617
+#: src/multitrack.c:5793
 msgid "In/out"
 msgstr ""
 
-#: src/multitrack.c:5619
+#: src/multitrack.c:5795
 msgid "FX stack"
 msgstr ""
 
-#: src/multitrack.c:5627 src/omc-learn.c:673
+#: src/multitrack.c:5803 src/omc-learn.c:659
 msgid "Params."
 msgstr ""
 
-#: src/multitrack.c:5978
+#: src/multitrack.c:6157
 msgid "_Open..."
 msgstr ""
 
-#: src/multitrack.c:5996
+#: src/multitrack.c:6175
 msgid "O_pen File Selection..."
 msgstr ""
 
-#: src/multitrack.c:6040
+#: src/multitrack.c:6219
 msgid "Import Selection from _dvd/vcd..."
 msgstr ""
 
-#: src/multitrack.c:6050
+#: src/multitrack.c:6229
 msgid "Import Selection from _dvd"
 msgstr ""
 
-#: src/multitrack.c:6060
+#: src/multitrack.c:6239
 msgid "Import Selection from _vcd"
 msgstr ""
 
-#: src/multitrack.c:6076
+#: src/multitrack.c:6255
 msgid "_Import from Device"
 msgstr ""
 
-#: src/multitrack.c:6103
+#: src/multitrack.c:6282
 msgid "_Close the selected clip"
 msgstr ""
 
-#: src/multitrack.c:6198
+#: src/multitrack.c:6377
 msgid "_Save layout as..."
 msgstr ""
 
-#: src/multitrack.c:6206
+#: src/multitrack.c:6385
 msgid "_Load layout..."
 msgstr ""
 
-#: src/multitrack.c:6210
+#: src/multitrack.c:6389
 msgid "_Wipe/Delete layout..."
 msgstr ""
 
-#: src/multitrack.c:6236
+#: src/multitrack.c:6415
 msgid "_Ignore width, height and audio values from loaded layouts"
 msgstr ""
 
-#: src/multitrack.c:6240
+#: src/multitrack.c:6419
 msgid "Auto load _subtitles with clips"
 msgstr ""
 
-#: src/multitrack.c:6322
+#: src/multitrack.c:6501
 msgid "_CLIP EDITOR"
 msgstr ""
 
-#: src/multitrack.c:6334
+#: src/multitrack.c:6513
 msgid "_Adjust selected clip start/end points"
 msgstr ""
 
-#: src/multitrack.c:6343
+#: src/multitrack.c:6522
 msgid "_Insert selected clip"
 msgstr ""
 
-#: src/multitrack.c:6355
+#: src/multitrack.c:6534
 msgid "_Insert selected clip audio"
 msgstr ""
 
-#: src/multitrack.c:6364
+#: src/multitrack.c:6543
 msgid "_Delete selected block"
 msgstr ""
 
-#: src/multitrack.c:6373
+#: src/multitrack.c:6555
 msgid "_Jump to previous block boundary"
 msgstr ""
 
-#: src/multitrack.c:6382
+#: src/multitrack.c:6564
 msgid "_Jump to next block boundary"
 msgstr ""
 
-#: src/multitrack.c:6395
+#: src/multitrack.c:6577
 msgid "Clear _marks from timeline"
 msgstr ""
 
-#: src/multitrack.c:6403
+#: src/multitrack.c:6585
 msgid "Ignore selection limits when inserting"
 msgstr ""
 
-#: src/multitrack.c:6420 src/multitrack.c:16719
+#: src/multitrack.c:6602 src/multitrack.c:17009
 msgid "_Play from Timeline Position"
 msgstr ""
 
-#: src/multitrack.c:6434
+#: src/multitrack.c:6616
 msgid "Pla_y selected time only"
 msgstr ""
 
-#: src/multitrack.c:6518
+#: src/multitrack.c:6700
 msgid "_Move effects with blocks"
 msgstr ""
 
-#: src/multitrack.c:6531
+#: src/multitrack.c:6713
 msgid "Select _autotransition effect..."
 msgstr ""
 
-#: src/multitrack.c:6542
+#: src/multitrack.c:6724
 msgid "Crossfade audio with autotransition"
 msgstr ""
 
-#: src/multitrack.c:6550
+#: src/multitrack.c:6732
 msgid "View/_Edit selected effect"
 msgstr ""
 
-#: src/multitrack.c:6554
+#: src/multitrack.c:6736
 msgid "_Delete selected effect"
 msgstr ""
 
-#: src/multitrack.c:6562
+#: src/multitrack.c:6744
 msgid "Apply effect to _block..."
 msgstr ""
 
-#: src/multitrack.c:6619
+#: src/multitrack.c:6801
 msgid "Apply effect to _region..."
 msgstr ""
 
-#: src/multitrack.c:6885
+#: src/multitrack.c:7061
 msgid "_Tracks"
 msgstr ""
 
-#: src/multitrack.c:6896
+#: src/multitrack.c:7072
 msgid "Rename current track"
 msgstr ""
 
-#: src/multitrack.c:6904
+#: src/multitrack.c:7080
 msgid "Make _Backing Audio current track"
 msgstr ""
 
-#: src/multitrack.c:6915
+#: src/multitrack.c:7091
 msgid "Add Video Track at _Rear"
 msgstr ""
 
-#: src/multitrack.c:6923
+#: src/multitrack.c:7099
 msgid "Add Video Track at _Front"
 msgstr ""
 
-#: src/multitrack.c:6936
+#: src/multitrack.c:7112
 msgid "_Split current track at cursor"
 msgstr ""
 
-#: src/multitrack.c:6948
+#: src/multitrack.c:7124
 msgid "_Split selected video tracks"
 msgstr ""
 
-#: src/multitrack.c:6961
+#: src/multitrack.c:7137
 msgid "Insert gap in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:6969
+#: src/multitrack.c:7145
 msgid "Insert gap in current track/selected time"
 msgstr ""
 
-#: src/multitrack.c:6981
+#: src/multitrack.c:7157
 msgid "Close all _gaps in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:7007
+#: src/multitrack.c:7183
 msgid "Se_lection"
 msgstr "_Valik"
 
-#: src/multitrack.c:7018
+#: src/multitrack.c:7194
 msgid "_Select Current Track"
 msgstr ""
 
-#: src/multitrack.c:7025
+#: src/multitrack.c:7201
 msgid "Select _all video tracks"
 msgstr ""
 
-#: src/multitrack.c:7032
+#: src/multitrack.c:7208
 msgid "Select _no video tracks"
 msgstr ""
 
-#: src/multitrack.c:7039
+#: src/multitrack.c:7215
 msgid "Select all _time"
 msgstr ""
 
-#: src/multitrack.c:7050
+#: src/multitrack.c:7226
 msgid "Select from _zero time"
 msgstr ""
 
-#: src/multitrack.c:7057
+#: src/multitrack.c:7233
 msgid "Select to _end time"
 msgstr ""
 
-#: src/multitrack.c:7064
+#: src/multitrack.c:7240
 msgid "_Copy..."
 msgstr "_Kopeeri..."
 
-#: src/multitrack.c:7075
+#: src/multitrack.c:7251
 msgid "_Timecode to region start"
 msgstr ""
 
-#: src/multitrack.c:7082
+#: src/multitrack.c:7258
 msgid "_Timecode to region end"
 msgstr ""
 
-#: src/multitrack.c:7089
+#: src/multitrack.c:7265
 msgid "_Region start to timecode"
 msgstr ""
 
-#: src/multitrack.c:7096
+#: src/multitrack.c:7272
 msgid "_Region end to timecode"
 msgstr ""
 
-#: src/multitrack.c:7110
+#: src/multitrack.c:7286
 msgid "Select/deselect block at current track/time"
 msgstr ""
 
-#: src/multitrack.c:7135
+#: src/multitrack.c:7311
 msgid "_Change width, height and audio values..."
 msgstr ""
 
-#: src/multitrack.c:7194
+#: src/multitrack.c:7370
 msgid "_Render"
 msgstr "_Genereerimine"
 
-#: src/multitrack.c:7205
+#: src/multitrack.c:7381
 msgid "_Render all to new clip"
 msgstr ""
 
-#: src/multitrack.c:7220
+#: src/multitrack.c:7396
 msgid "Render _video"
 msgstr ""
 
-#: src/multitrack.c:7225
+#: src/multitrack.c:7401
 msgid "Render _audio"
 msgstr ""
 
-#: src/multitrack.c:7235
+#: src/multitrack.c:7411
 msgid "_Normalise rendered audio"
 msgstr ""
 
-#: src/multitrack.c:7242
+#: src/multitrack.c:7418
 msgid "_Pre-render audio"
 msgstr ""
 
-#: src/multitrack.c:7251
+#: src/multitrack.c:7427
 msgid "_View"
 msgstr "_Vaade"
 
-#: src/multitrack.c:7270
+#: src/multitrack.c:7446
 msgid "Block _In/out points"
 msgstr ""
 
-#: src/multitrack.c:7279
+#: src/multitrack.c:7455
 msgid "_Effects at current"
 msgstr ""
 
-#: src/multitrack.c:7297
+#: src/multitrack.c:7473
 msgid "Audio parameters"
 msgstr ""
 
-#: src/multitrack.c:7308
+#: src/multitrack.c:7484
 msgid "Show backing _audio track"
 msgstr ""
 
-#: src/multitrack.c:7312
+#: src/multitrack.c:7488
 msgid "Compact view"
 msgstr "Tihe vaade"
 
-#: src/multitrack.c:7320
+#: src/multitrack.c:7496
 msgid "Maximum tracks to display..."
 msgstr ""
 
-#: src/multitrack.c:7327
+#: src/multitrack.c:7503
 msgid "Scroll to follow playback"
 msgstr ""
 
-#: src/multitrack.c:7331
+#: src/multitrack.c:7507
 msgid "_Center on cursor"
 msgstr ""
 
-#: src/multitrack.c:7338
+#: src/multitrack.c:7514
 msgid "_Zoom in"
 msgstr ""
 
-#: src/multitrack.c:7349
+#: src/multitrack.c:7525
 msgid "_Zoom out"
 msgstr ""
 
-#: src/multitrack.c:7361
+#: src/multitrack.c:7537
 msgid "Multitrack _details"
 msgstr ""
 
-#: src/multitrack.c:7374
+#: src/multitrack.c:7550
 msgid "_Event Window"
 msgstr ""
 
-#: src/multitrack.c:7378
+#: src/multitrack.c:7554
 msgid "_Event Window (selected time only)"
 msgstr ""
 
-#: src/multitrack.c:7382
+#: src/multitrack.c:7558
 msgid "_Show FRAME events"
 msgstr ""
 
-#: src/multitrack.c:7399
+#: src/multitrack.c:7575
 msgid "_Show multitrack keys"
 msgstr ""
 
-#: src/multitrack.c:7468
+#: src/multitrack.c:7644
 msgid "Mouse mode: _Move"
 msgstr ""
 
-#: src/multitrack.c:7476
+#: src/multitrack.c:7652
 msgid "Mouse mode: _Select"
 msgstr ""
 
-#: src/multitrack.c:7505
+#: src/multitrack.c:7681
 msgid "Insert mode: _Normal"
 msgstr ""
 
-#: src/multitrack.c:7733
+#: src/multitrack.c:7909
 msgid "Insert with _audio"
 msgstr ""
 
-#: src/multitrack.c:7734
+#: src/multitrack.c:7910
 msgid ""
 "Select whether video clips are inserted and moved with their audio or not"
 msgstr ""
 
-#: src/multitrack.c:7829
+#: src/multitrack.c:8007
 msgid "Select _overlap"
 msgstr ""
 
-#: src/multitrack.c:7830
+#: src/multitrack.c:8008
 msgid ""
 "Select whether timeline selection snaps to overlap between selected tracks "
 "or not"
 msgstr ""
 
-#: src/multitrack.c:7894 src/multitrack.c:14198
+#: src/multitrack.c:8073 src/multitrack.c:14422
 msgid "Expanded View (d)"
 msgstr ""
 
-#: src/multitrack.c:7897 src/multitrack.c:14205
+#: src/multitrack.c:8076 src/multitrack.c:14428
 msgid "Compact View (d)"
 msgstr ""
 
-#: src/multitrack.c:7939
+#: src/multitrack.c:8118
 msgid "Gravity: _Normal"
 msgstr ""
 
-#: src/multitrack.c:7952
+#: src/multitrack.c:8131
 msgid "Gravity: _Left"
 msgstr ""
 
-#: src/multitrack.c:7967
+#: src/multitrack.c:8146
 msgid "Gravity: _Right"
 msgstr ""
 
-#: src/multitrack.c:8297
+#: src/multitrack.c:8496
 msgid "_Apply"
 msgstr "_Rakenda"
 
-#: src/multitrack.c:8319
+#: src/multitrack.c:8518
 msgid "Time"
 msgstr ""
 
-#: src/multitrack.c:8333
+#: src/multitrack.c:8532
 msgid "_Del. node"
 msgstr ""
 
-#: src/multitrack.c:8341
+#: src/multitrack.c:8540
 msgid "_Next node"
 msgstr ""
 
-#: src/multitrack.c:8349
+#: src/multitrack.c:8548
 msgid "_Prev node"
 msgstr ""
 
-#: src/multitrack.c:8373
+#: src/multitrack.c:8574
 msgid "_Reverse playback  "
 msgstr ""
 
-#: src/multitrack.c:8395
+#: src/multitrack.c:8596
 msgid "_Velocity  "
 msgstr ""
 
-#: src/multitrack.c:8464
+#: src/multitrack.c:8664
 msgid "Anchor _start"
 msgstr ""
 
-#: src/multitrack.c:8465
+#: src/multitrack.c:8665
 msgid "Anchor the start point to the timeline"
 msgstr ""
 
-#: src/multitrack.c:8481
-msgid "Start frame"
-msgstr ""
-
-#: src/multitrack.c:8533
+#: src/multitrack.c:8728
 msgid "Anchor _end"
 msgstr ""
 
-#: src/multitrack.c:8534
+#: src/multitrack.c:8729
 msgid "Anchor the end point to the timeline"
 msgstr ""
 
-#: src/multitrack.c:8546
-msgid "End frame"
-msgstr ""
-
-#: src/multitrack.c:8739
+#: src/multitrack.c:8929
 msgid "Scroll"
 msgstr "Kerib"
 
-#: src/multitrack.c:9316
+#: src/multitrack.c:9502
 msgid ""
 "\n"
 "==============================\n"
 "Switched to Clip Edit mode\n"
 msgstr ""
 
-#: src/multitrack.c:9502
+#: src/multitrack.c:9708
 msgid "Timeline (seconds)"
 msgstr ""
 
-#: src/multitrack.c:9984
+#: src/multitrack.c:10202
 msgid " Backing audio"
 msgstr ""
 
-#: src/multitrack.c:9987
+#: src/multitrack.c:10204
 #, c-format
 msgid " Layer %d audio"
 msgstr ""
 
-#: src/multitrack.c:9995
+#: src/multitrack.c:10212
 msgid "Show/hide audio details"
 msgstr ""
 
-#: src/multitrack.c:10010 src/multitrack.c:10232
+#: src/multitrack.c:10227 src/multitrack.c:10452
 #, c-format
 msgid "Layer %d audio"
 msgstr ""
 
-#: src/multitrack.c:10144 src/multitrack.c:10261
+#: src/multitrack.c:10353 src/multitrack.c:10481
 #, c-format
 msgid "%s (layer %d)"
 msgstr ""
 
-#: src/multitrack.c:10184
+#: src/multitrack.c:10403
 msgid "Select track"
 msgstr ""
 
-#: src/multitrack.c:10188
+#: src/multitrack.c:10407
 msgid "Show/hide audio"
 msgstr ""
 
-#: src/multitrack.c:10194
+#: src/multitrack.c:10413
 #, c-format
 msgid "Video %d"
 msgstr ""
 
-#: src/multitrack.c:10233
+#: src/multitrack.c:10453
 #, c-format
 msgid " %s"
 msgstr " %s"
 
-#: src/multitrack.c:10346
+#: src/multitrack.c:10574
 msgid "LiVES: Selected effect"
 msgstr ""
 
-#: src/multitrack.c:10358
+#: src/multitrack.c:10586
 msgid "_View/Edit this effect"
 msgstr ""
 
-#: src/multitrack.c:10361
+#: src/multitrack.c:10588
 msgid "_View this effect"
 msgstr ""
 
-#: src/multitrack.c:10369
+#: src/multitrack.c:10596
 msgid "_Delete this effect"
 msgstr ""
 
-#: src/multitrack.c:10422
+#: src/multitrack.c:10648
 msgid "Cannot insert after this effect"
 msgstr ""
 
-#: src/multitrack.c:10451
+#: src/multitrack.c:10677
 msgid "This effect cannot be moved"
 msgstr ""
 
-#: src/multitrack.c:10499
+#: src/multitrack.c:10724
 #, c-format
 msgid "  %d to %d selected  "
 msgstr ""
 
-#: src/multitrack.c:10502 src/multitrack.c:10746
+#: src/multitrack.c:10727 src/multitrack.c:10968
 #, c-format
 msgid "%.2f sec."
 msgstr ""
 
-#: src/multitrack.c:10717
+#: src/multitrack.c:10940
 #, c-format
 msgid "%d frames"
 msgstr ""
 
-#: src/multitrack.c:11070
+#: src/multitrack.c:11299
 msgid ""
 "\n"
 "==============================\n"
 "Switched to Multitrack mode\n"
 msgstr ""
 
-#: src/multitrack.c:12691
+#: src/multitrack.c:12939
 msgid "Drag the time slider to where you"
 msgstr ""
 
-#: src/multitrack.c:12692
+#: src/multitrack.c:12940
 msgid "want to set effect parameters"
 msgstr ""
 
-#: src/multitrack.c:12693
+#: src/multitrack.c:12941
 msgid "Set parameters, then click \"Apply\"\n"
 msgstr ""
 
-#: src/multitrack.c:12694
+#: src/multitrack.c:12942
 msgid ""
 "NODES are points where parameters\n"
 "have been set.\n"
 "Nodes can be deleted."
 msgstr ""
 
-#: src/multitrack.c:12697
+#: src/multitrack.c:12944
 msgid "Effect has no parameters.\n"
 msgstr ""
 
-#: src/multitrack.c:12788
+#: src/multitrack.c:13033
 #, c-format
 msgid "%s output"
 msgstr ""
 
-#: src/multitrack.c:12794 src/multitrack.c:12804
+#: src/multitrack.c:13038 src/multitrack.c:13046
 #, c-format
 msgid "layer %d"
 msgstr ""
 
-#: src/multitrack.c:12796 src/multitrack.c:12806
+#: src/multitrack.c:13039 src/multitrack.c:13047
 msgid "audio track"
 msgstr ""
 
-#: src/multitrack.c:12797
+#: src/multitrack.c:13040
 #, c-format
 msgid "%s to %s"
 msgstr "%s kuni %s"
 
-#: src/multitrack.c:12807
+#: src/multitrack.c:13048
 #, c-format
 msgid "%s from %s"
 msgstr ""
 
-#: src/multitrack.c:12860
+#: src/multitrack.c:13099
 msgid "_Prev filter map"
 msgstr ""
 
-#: src/multitrack.c:12871
+#: src/multitrack.c:13110
 msgid "Insert _before"
 msgstr ""
 
-#: src/multitrack.c:12881
+#: src/multitrack.c:13120
 msgid "Insert _after"
 msgstr ""
 
-#: src/multitrack.c:12896
+#: src/multitrack.c:13134
 msgid "_Next filter map"
 msgstr ""
 
-#: src/multitrack.c:12911
+#: src/multitrack.c:13148
 msgid ""
 "\n"
 "\n"
@@ -9085,271 +9088,271 @@
 "current time.\n"
 msgstr ""
 
-#: src/multitrack.c:12929
+#: src/multitrack.c:13166
 msgid ""
 "Drag a compositor anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:12936
+#: src/multitrack.c:13173
 msgid ""
 "Drag a transition anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:12944
+#: src/multitrack.c:13181
 msgid ""
 "Effects can be dragged\n"
 "onto blocks on the timeline."
 msgstr ""
 
-#: src/multitrack.c:13166
+#: src/multitrack.c:13406
 msgid "LiVES: Selected block/frame"
 msgstr ""
 
-#: src/multitrack.c:13173
+#: src/multitrack.c:13413
 msgid "_Select this block"
 msgstr ""
 
-#: src/multitrack.c:13183
+#: src/multitrack.c:13423
 msgid "_Split block here"
 msgstr ""
 
-#: src/multitrack.c:13191
+#: src/multitrack.c:13431
 msgid "List _effects here"
 msgstr ""
 
-#: src/multitrack.c:13200 src/multitrack.c:13277
+#: src/multitrack.c:13440 src/multitrack.c:13518
 #, c-format
 msgid "_Adjust %s"
 msgstr ""
 
-#: src/multitrack.c:13215
+#: src/multitrack.c:13455
 msgid "_Delete this block"
 msgstr ""
 
-#: src/multitrack.c:13258
+#: src/multitrack.c:13500
 msgid "_Insert here"
 msgstr ""
 
-#: src/multitrack.c:13264
+#: src/multitrack.c:13505
 msgid "_Insert audio here"
 msgstr ""
 
-#: src/multitrack.c:14801
+#: src/multitrack.c:15017
 #, c-format
 msgid "Inserted gap in selected tracks from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:14835
+#: src/multitrack.c:15048
 #, c-format
 msgid "Inserted gap in track %s from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15036
+#: src/multitrack.c:15244
 #, c-format
 msgid "Undid %s\n"
 msgstr ""
 
-#: src/multitrack.c:15235
+#: src/multitrack.c:15445
 #, c-format
 msgid "Redid %s\n"
 msgstr ""
 
-#: src/multitrack.c:15268
+#: src/multitrack.c:15475
 msgid ""
 "\n"
 " (variable)"
 msgstr ""
 
-#: src/multitrack.c:15502 src/multitrack.c:15614 src/multitrack.c:18736
-#: src/multitrack.c:18748
+#: src/multitrack.c:15710 src/multitrack.c:15823 src/multitrack.c:19077
+#: src/multitrack.c:19089
 #, c-format
 msgid "track %s"
 msgstr ""
 
-#: src/multitrack.c:15507 src/multitrack.c:15619 src/multitrack.c:18741
+#: src/multitrack.c:15715 src/multitrack.c:15828 src/multitrack.c:19082
 #, c-format
 msgid "tracks %s and %s"
 msgstr ""
 
-#: src/multitrack.c:15513 src/multitrack.c:15625 src/multitrack.c:18751
+#: src/multitrack.c:15721 src/multitrack.c:15834 src/multitrack.c:19091
 msgid "selected tracks"
 msgstr ""
 
-#: src/multitrack.c:15516
+#: src/multitrack.c:15726
 #, c-format
 msgid "Added %s %s to %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15550
+#: src/multitrack.c:15760
 #, c-format
 msgid "Added effect %s to track %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15631
+#: src/multitrack.c:15845
 #, c-format
 msgid "Deleted %s %s from %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15935
+#: src/multitrack.c:16143
 #, c-format
 msgid "rendered %d frames to new clip.\n"
 msgstr ""
 
-#: src/multitrack.c:16025
+#: src/multitrack.c:16230
 msgid "Cleaning up..."
 msgstr "Puhastamine..."
 
-#: src/multitrack.c:16712
+#: src/multitrack.c:17003
 msgid "_Pause"
 msgstr "_Peata"
 
-#: src/multitrack.c:16713
+#: src/multitrack.c:17004
 msgid "Pause (p)"
 msgstr ""
 
-#: src/multitrack.c:16856
+#: src/multitrack.c:17151
 msgid "Press 'm' during playback"
 msgstr ""
 
-#: src/multitrack.c:16857
+#: src/multitrack.c:17152
 msgid "to make a mark on the timeline"
 msgstr ""
 
-#: src/multitrack.c:17154
+#: src/multitrack.c:17498
 #, c-format
 msgid ""
 "Inserted audio %.4f to %.4f from clip %s into backing audio from time %.4f "
 "to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:17414
+#: src/multitrack.c:17759
 #, c-format
 msgid ""
 "Inserted frames %d to %d from clip %s into track %s from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:17998
+#: src/multitrack.c:18332
 #, c-format
 msgid ""
 "Time region %.3f to %.3f\n"
 "selected.\n"
 msgstr ""
 
-#: src/multitrack.c:18002
+#: src/multitrack.c:18336
 msgid ""
 "select one or more tracks\n"
 "to create a region.\n"
 msgstr ""
 
-#: src/multitrack.c:18004
+#: src/multitrack.c:18337
 #, c-format
 msgid "%d video tracks selected.\n"
 msgstr ""
 
-#: src/multitrack.c:18006
+#: src/multitrack.c:18339
 msgid ""
 "Double click on timeline\n"
 "to deselect time region."
 msgstr ""
 
-#: src/multitrack.c:18013
+#: src/multitrack.c:18346
 msgid ""
 "Single click on an effect\n"
 "to select it."
 msgstr ""
 
-#: src/multitrack.c:18014
+#: src/multitrack.c:18347
 msgid ""
 "Double click on an effect\n"
 "to edit it."
 msgstr ""
 
-#: src/multitrack.c:18015
+#: src/multitrack.c:18348
 msgid ""
 "Right click on an effect\n"
 "for context menu.\n"
 msgstr ""
 
-#: src/multitrack.c:18017
+#: src/multitrack.c:18350
 msgid ""
 "Effect order can be changed at\n"
 "FILTER MAPS"
 msgstr ""
 
-#: src/multitrack.c:18024
+#: src/multitrack.c:18357
 msgid ""
 "You can select an effect,\n"
 "then use the INSERT BEFORE"
 msgstr ""
 
-#: src/multitrack.c:18025
+#: src/multitrack.c:18358
 msgid "or INSERT AFTER buttons to move it."
 msgstr ""
 
-#: src/multitrack.c:18307 src/multitrack.c:18320
+#: src/multitrack.c:18639 src/multitrack.c:18652
 msgid "Click on another effect,"
 msgstr ""
 
-#: src/multitrack.c:18308 src/multitrack.c:18321
+#: src/multitrack.c:18640 src/multitrack.c:18653
 msgid ""
 "and the selected one\n"
 "will be inserted"
 msgstr ""
 
-#: src/multitrack.c:18309
+#: src/multitrack.c:18641
 msgid "after it.\n"
 msgstr ""
 
-#: src/multitrack.c:18322
+#: src/multitrack.c:18654
 msgid "before it.\n"
 msgstr ""
 
-#: src/multitrack.c:18551
+#: src/multitrack.c:18889
 #, c-format
 msgid "Removed parameter values for effect %s at time %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:18759
+#: src/multitrack.c:19100
 #, c-format
 msgid "Set parameter values for %s %s on %s at time %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:19251 src/multitrack.c:20873
+#: src/multitrack.c:19630 src/multitrack.c:21195
 msgid "_Autoreload each time"
 msgstr ""
 
-#: src/multitrack.c:19323
+#: src/multitrack.c:19702
 msgid "Saving layout"
 msgstr ""
 
-#: src/multitrack.c:19345
+#: src/multitrack.c:19725
 #, c-format
 msgid "Saved layout to %s\n"
 msgstr ""
 
-#: src/multitrack.c:20783
+#: src/multitrack.c:21125
 msgid "clips and frames"
 msgstr ""
 
-#: src/multitrack.c:20787
+#: src/multitrack.c:21128
 msgid "clips"
 msgstr ""
 
-#: src/multitrack.c:20790
+#: src/multitrack.c:21130
 msgid "frames"
 msgstr "kaadrit"
 
-#: src/multitrack.c:20800
+#: src/multitrack.c:21140
 msgid ""
 "\n"
 "Auto reload layout.\n"
 msgstr ""
 
-#: src/multitrack.c:20803
+#: src/multitrack.c:21143
 #, c-format
 msgid ""
 "%s\n"
@@ -9357,100 +9360,100 @@
 "Therefore it could not be loaded properly.\n"
 msgstr ""
 
-#: src/multitrack.c:20920
+#: src/multitrack.c:21284
 msgid "auto backup"
 msgstr ""
 
-#: src/multitrack.c:20923
+#: src/multitrack.c:21287
 #, c-format
 msgid ""
 "\n"
 "Unable to load layout file %s\n"
 msgstr ""
 
-#: src/multitrack.c:20944
+#: src/multitrack.c:21308
 #, c-format
 msgid "Loading layout from %s..."
 msgstr ""
 
-#: src/multitrack.c:20978
+#: src/multitrack.c:21338
 #, c-format
 msgid "Got %d events...processing..."
 msgstr ""
 
-#: src/multitrack.c:20991
+#: src/multitrack.c:21349
 msgid "Checking and rebuilding event list"
 msgstr ""
 
-#: src/multitrack.c:21017
+#: src/multitrack.c:21374
 #, c-format
 msgid "%d errors detected.\n"
 msgstr ""
 
-#: src/multitrack.c:21068
+#: src/multitrack.c:21422
 #, c-format
 msgid "Multitrack fps set to %.3f\n"
 msgstr ""
 
-#: src/multitrack.c:21225
+#: src/multitrack.c:21576
 msgid ""
 "The current layout has changes which have not been saved.\n"
 "Are you sure you wish to wipe it ?\n"
 msgstr ""
 
-#: src/multitrack.c:22047
+#: src/multitrack.c:22385
 msgid "LiVES: Multitrack audio mixer"
 msgstr ""
 
-#: src/multitrack.c:22077
+#: src/multitrack.c:22414
 msgid "_Reset values"
 msgstr ""
 
-#: src/multitrack.c:22081
+#: src/multitrack.c:22418
 msgid "_Close mixer"
 msgstr ""
 
-#: src/multitrack.c:22130
+#: src/multitrack.c:22466
 msgid ""
 "_Invert backing audio\n"
 "and layer volumes"
 msgstr ""
 
-#: src/multitrack.c:22132
+#: src/multitrack.c:22468
 msgid "Adjust backing and layer audio values so that they sum to 1.0"
 msgstr ""
 
-#: src/multitrack.c:22175
+#: src/multitrack.c:22510
 msgid "_Gang layer audio"
 msgstr ""
 
-#: src/multitrack.c:22177
+#: src/multitrack.c:22512
 msgid "Adjust all layer audio values to the same value"
 msgstr ""
 
-#: src/jack.c:104
+#: src/jack.c:102
 msgid "JACK server started\n"
 msgstr ""
 
-#: src/jack.c:1284 src/jack.c:1353
+#: src/jack.c:1265 src/jack.c:1334
 msgid "Unable to connect to JACK server\n"
 msgstr ""
 
-#: src/jack.c:1512
+#: src/jack.c:1491
 msgid "Started jack audio subsystem.\n"
 msgstr ""
 
-#: src/jack.c:1623
+#: src/jack.c:1600
 msgid "Started jack audio reader.\n"
 msgstr ""
 
-#: src/jack.c:1838
+#: src/jack.c:1815
 msgid ""
 "\n"
 "Connection to jack audio was reset.\n"
 msgstr ""
 
-#: src/pulse.c:87
+#: src/pulse.c:88
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -9458,7 +9461,7 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:92
+#: src/pulse.c:94
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -9466,7 +9469,7 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:96
+#: src/pulse.c:99
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -9474,335 +9477,335 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:101
+#: src/pulse.c:104
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
 msgstr ""
 
-#: src/pulse.c:107
+#: src/pulse.c:109
 msgid "LiVES will exit and you can choose another audio player.\n"
 msgstr ""
 
-#: src/pulse.c:1352
+#: src/pulse.c:1335
 msgid ""
 "\n"
 "Connection to pulse audio was reset.\n"
 msgstr ""
 
-#: src/colourspace.c:1100
+#: src/colourspace.c:1092
 msgid "unclamped"
 msgstr ""
 
-#: src/colourspace.c:1101
+#: src/colourspace.c:1093
 msgid "clamped"
 msgstr ""
 
-#: src/omc-learn.c:195
+#: src/omc-learn.c:191
 #, c-format
 msgid "Responding to joystick events from %s\n"
 msgstr ""
 
-#: src/omc-learn.c:289
+#: src/omc-learn.c:279
 msgid "Creating ALSA seq port..."
 msgstr ""
 
-#: src/omc-learn.c:325
+#: src/omc-learn.c:313
 #, c-format
 msgid "Responding to MIDI events from %s\n"
 msgstr ""
 
-#: src/omc-learn.c:568
+#: src/omc-learn.c:554
 msgid "data"
 msgstr "andmed"
 
-#: src/omc-learn.c:571
+#: src/omc-learn.c:557
 msgid "velocity"
 msgstr "kiirus"
 
-#: src/omc-learn.c:572
+#: src/omc-learn.c:558
 msgid "note"
 msgstr "märkus"
 
-#: src/omc-learn.c:574 src/omc-learn.c:736 src/omc-learn.c:1105
-#: src/omc-learn.c:1591 src/omc-learn.c:1640
+#: src/omc-learn.c:560 src/omc-learn.c:724 src/omc-learn.c:1092
+#: src/omc-learn.c:1581 src/omc-learn.c:1630
 msgid "value"
 msgstr "väärtus"
 
-#: src/omc-learn.c:576
+#: src/omc-learn.c:562
 msgid "state"
 msgstr "maakond"
 
-#: src/omc-learn.c:688
+#: src/omc-learn.c:674
 msgid "variable"
 msgstr "muutuja"
 
-#: src/omc-learn.c:1001
+#: src/omc-learn.c:989
 msgid "Vars."
 msgstr ""
 
-#: src/omc-learn.c:1054
+#: src/omc-learn.c:1041
 #, c-format
 msgid "MIDI ch %d note on"
 msgstr ""
 
-#: src/omc-learn.c:1058
+#: src/omc-learn.c:1045
 #, c-format
 msgid "MIDI ch %d note off"
 msgstr ""
 
-#: src/omc-learn.c:1062
+#: src/omc-learn.c:1049
 #, c-format
 msgid "MIDI ch %d controller %d"
 msgstr ""
 
-#: src/omc-learn.c:1066
+#: src/omc-learn.c:1053
 #, c-format
 msgid "MIDI ch %d pitch bend"
 msgstr ""
 
-#: src/omc-learn.c:1070
+#: src/omc-learn.c:1057
 #, c-format
 msgid "MIDI ch %d pgm change"
 msgstr ""
 
-#: src/omc-learn.c:1073
+#: src/omc-learn.c:1060
 #, c-format
 msgid "Joystick button %d"
 msgstr ""
 
-#: src/omc-learn.c:1076
+#: src/omc-learn.c:1063
 #, c-format
 msgid "Joystick axis %d"
 msgstr ""
 
-#: src/omc-learn.c:1113
+#: src/omc-learn.c:1100
 msgid "x"
 msgstr "x"
 
-#: src/omc-learn.c:1122
+#: src/omc-learn.c:1109
 msgid "range"
 msgstr "vahemik"
 
-#: src/omc-learn.c:1143
+#: src/omc-learn.c:1130
 msgid "+ offset1"
 msgstr ""
 
-#: src/omc-learn.c:1161
+#: src/omc-learn.c:1150
 msgid "* scale"
 msgstr ""
 
-#: src/omc-learn.c:1179
+#: src/omc-learn.c:1170
 msgid "+ offset2"
 msgstr ""
 
-#: src/omc-learn.c:1280
+#: src/omc-learn.c:1270
 msgid ""
 "\n"
 "Click OK to delete all entries\n"
 msgstr ""
 
-#: src/omc-learn.c:1318
+#: src/omc-learn.c:1308
 msgid "LiVES: OMC learner"
 msgstr ""
 
-#: src/omc-learn.c:1334
+#: src/omc-learn.c:1324
 msgid "Clear _unmatched"
 msgstr ""
 
-#: src/omc-learn.c:1345
+#: src/omc-learn.c:1335
 msgid "_Delete all"
 msgstr "_Kustuta kõik"
 
-#: src/omc-learn.c:1411
+#: src/omc-learn.c:1401
 msgid "Start video playback"
 msgstr ""
 
-#: src/omc-learn.c:1414
+#: src/omc-learn.c:1404
 msgid "Stop video playback"
 msgstr ""
 
-#: src/omc-learn.c:1418
+#: src/omc-learn.c:1408
 msgid "Clip select <clipnum>"
 msgstr ""
 
-#: src/omc-learn.c:1419
+#: src/omc-learn.c:1409
 msgid "Switch foreground clip to the nth valid clip"
 msgstr ""
 
-#: src/omc-learn.c:1423
+#: src/omc-learn.c:1413
 msgid "Play forwards"
 msgstr ""
 
-#: src/omc-learn.c:1424
+#: src/omc-learn.c:1414
 msgid "Play video in a forwards direction"
 msgstr ""
 
-#: src/omc-learn.c:1427
+#: src/omc-learn.c:1417
 msgid "Play backwards"
 msgstr ""
 
-#: src/omc-learn.c:1428
+#: src/omc-learn.c:1418
 msgid "Play video in a backwards direction"
 msgstr ""
 
-#: src/omc-learn.c:1431
+#: src/omc-learn.c:1421
 msgid "Reverse playback direction"
 msgstr ""
 
-#: src/omc-learn.c:1432
+#: src/omc-learn.c:1422
 msgid "Reverse direction of video playback"
 msgstr ""
 
-#: src/omc-learn.c:1435
+#: src/omc-learn.c:1425
 msgid "Play video faster"
 msgstr ""
 
-#: src/omc-learn.c:1436
+#: src/omc-learn.c:1426
 msgid "Play video at a slightly faster rate"
 msgstr ""
 
-#: src/omc-learn.c:1439
+#: src/omc-learn.c:1429
 msgid "Play video slower"
 msgstr ""
 
-#: src/omc-learn.c:1440
+#: src/omc-learn.c:1430
 msgid "Play video at a slightly slower rate"
 msgstr ""
 
-#: src/omc-learn.c:1443
+#: src/omc-learn.c:1433
 msgid "Toggle video freeze"
 msgstr ""
 
-#: src/omc-learn.c:1444
+#: src/omc-learn.c:1434
 msgid "Freeze video, or if already frozen, unfreeze it"
 msgstr ""
 
-#: src/omc-learn.c:1447
+#: src/omc-learn.c:1437
 msgid "Set video framerate to <fps>"
 msgstr ""
 
-#: src/omc-learn.c:1448
+#: src/omc-learn.c:1438
 msgid "Set framerate of foreground clip to <float fps>"
 msgstr ""
 
-#: src/omc-learn.c:1452
+#: src/omc-learn.c:1442
 msgid "Start recording"
 msgstr ""
 
-#: src/omc-learn.c:1455
+#: src/omc-learn.c:1445
 msgid "Stop recording"
 msgstr ""
 
-#: src/omc-learn.c:1458
+#: src/omc-learn.c:1448
 msgid "Toggle recording state"
 msgstr ""
 
-#: src/omc-learn.c:1461
+#: src/omc-learn.c:1451
 msgid "Swap foreground and background clips"
 msgstr ""
 
-#: src/omc-learn.c:1463
+#: src/omc-learn.c:1453
 msgid "Reset effect keys"
 msgstr ""
 
-#: src/omc-learn.c:1464
+#: src/omc-learn.c:1454
 msgid "Switch all effects off."
 msgstr ""
 
-#: src/omc-learn.c:1467
+#: src/omc-learn.c:1457
 msgid "Enable effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1471
+#: src/omc-learn.c:1461
 msgid "Disable effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1475
+#: src/omc-learn.c:1465
 msgid "Toggle effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1479
+#: src/omc-learn.c:1469
 msgid "Set parameter value <key> <pnum> = <value>"
 msgstr ""
 
-#: src/omc-learn.c:1480
+#: src/omc-learn.c:1470
 msgid "Set <value> of pth (numerical) parameter for effect key <key>."
 msgstr ""
 
-#: src/omc-learn.c:1484
+#: src/omc-learn.c:1474
 msgid "Switch foreground to next clip"
 msgstr ""
 
-#: src/omc-learn.c:1487
+#: src/omc-learn.c:1477
 msgid "Switch foreground to previous clip"
 msgstr ""
 
-#: src/omc-learn.c:1490
+#: src/omc-learn.c:1480
 msgid "Set video framerate to ratio <fps_ratio>"
 msgstr ""
 
-#: src/omc-learn.c:1491
+#: src/omc-learn.c:1481
 msgid "Set framerate ratio of foreground clip to <float fps_ratio>"
 msgstr ""
 
-#: src/omc-learn.c:1495
+#: src/omc-learn.c:1485
 msgid "Retrigger clip <clipnum>"
 msgstr ""
 
-#: src/omc-learn.c:1496
+#: src/omc-learn.c:1486
 msgid ""
 "Switch foreground clip to the nth valid clip, and reset the frame number"
 msgstr ""
 
-#: src/omc-learn.c:1500
+#: src/omc-learn.c:1490
 msgid "Cycle to next mode for effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1504
+#: src/omc-learn.c:1494
 msgid "Cycle to previous mode for effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1508
+#: src/omc-learn.c:1498
 msgid "Set playback plugin parameter value <pnum> = <value>"
 msgstr ""
 
-#: src/omc-learn.c:1509
+#: src/omc-learn.c:1499
 msgid "Set <value> of pth parameter for the playback plugin."
 msgstr ""
 
 #. TRANSLATORS: short form of "clip number"
-#: src/omc-learn.c:1536 src/omc-learn.c:1607
+#: src/omc-learn.c:1526 src/omc-learn.c:1597
 msgid "clipnum"
 msgstr ""
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1545
+#: src/omc-learn.c:1535
 msgid "fps"
 msgstr "fps"
 
 #. TRANSLATORS: as in keyboard key
-#: src/omc-learn.c:1553 src/omc-learn.c:1560 src/omc-learn.c:1567
-#: src/omc-learn.c:1575 src/omc-learn.c:1615 src/omc-learn.c:1623
+#: src/omc-learn.c:1543 src/omc-learn.c:1550 src/omc-learn.c:1557
+#: src/omc-learn.c:1565 src/omc-learn.c:1605 src/omc-learn.c:1613
 msgid "key"
 msgstr "klahv"
 
 #. TRANSLATORS: short form of "parameter number"
-#: src/omc-learn.c:1583 src/omc-learn.c:1632
+#: src/omc-learn.c:1573 src/omc-learn.c:1622
 msgid "pnum"
 msgstr "pnum"
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1599
+#: src/omc-learn.c:1589
 msgid "fps_ratio"
 msgstr "fps_ratio"
 
-#: src/omc-learn.c:2443
+#: src/omc-learn.c:2417
 #, c-format
 msgid "Saving device mapping to file %s..."
 msgstr ""
 
-#: src/omc-learn.c:2527
+#: src/omc-learn.c:2498
 #, c-format
 msgid ""
 "\n"
@@ -9811,7 +9814,7 @@
 "%s\n"
 msgstr ""
 
-#: src/omc-learn.c:2534
+#: src/omc-learn.c:2505
 #, c-format
 msgid ""
 "\n"
@@ -9820,12 +9823,12 @@
 "%s\n"
 msgstr ""
 
-#: src/omc-learn.c:2571
+#: src/omc-learn.c:2541
 #, c-format
 msgid "Loading device mapping from file %s..."
 msgstr ""
 
-#: src/omc-learn.c:2576
+#: src/omc-learn.c:2544
 #, c-format
 msgid ""
 "\n"
@@ -9835,12 +9838,12 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/videodev.c:547
+#: src/videodev.c:539
 #, c-format
 msgid "Unable to open device %s\n"
 msgstr ""
 
-#: src/videodev.c:564
+#: src/videodev.c:554
 #, c-format
 msgid "Opened device %s\n"
 msgstr ""
@@ -10633,6 +10636,9 @@
 #~ msgid "$error"
 #~ msgstr "$error"
 
+#~ msgid "Pause"
+#~ msgstr "Paus"
+
 #~ msgid "                                                            "
 #~ msgstr "                                                            "

LiVES-2.2.8.tar.bz2/po/fi.po -> LiVES-2.4.1.tar.bz2/po/fi.po Changed

@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n"
-"POT-Creation-Date: 2015-02-08 17:18-0300\n"
+"POT-Creation-Date: 2015-08-09 14:52-0300\n"
 "PO-Revision-Date: 2013-03-14 12:31+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Finnish <fi@li.org>\n"
@@ -18,8 +18,7 @@
 "X-Launchpad-Export-Date: 2013-03-28 10:42+0000\n"
 "X-Generator: Launchpad (build 16546)\n"
 
-#. TRANSLATORS: do not translate this message
-#: src/main.c:118
+#: src/main.c:128
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -33,22 +32,22 @@
 "All translators should read the LiVES translation notes at\n"
 "http://lives.sourceforge.net/TRANS-README.txt"
 
-#: src/main.c:134
+#: src/main.c:153
 #, c-format
 msgid "%s Warning: %s\n"
 msgstr ""
 
-#: src/main.c:138
+#: src/main.c:157
 #, c-format
 msgid "%s Critical error: %s\n"
 msgstr ""
 
-#: src/main.c:139
+#: src/main.c:158
 #, c-format
 msgid "%s Fatal error: %s\n"
 msgstr ""
 
-#: src/main.c:176
+#: src/main.c:198
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -63,7 +62,7 @@
 "Kiitos. Palautumisen tulisi olla mahdollista uudelleen käynnistäessäsi "
 "ohjelman.\n"
 
-#: src/main.c:177
+#: src/main.c:199
 msgid ""
 "\n"
 "\n"
@@ -75,7 +74,7 @@
 "Raportoidessasi kaatumisista, sisällytä käyttöjärjestelmän tiedot, "
 "jakeluversio ja LiVESin versiotiedot ("
 
-#: src/main.c:180
+#: src/main.c:203
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -83,7 +82,7 @@
 "ja alla olevat tiedot:\n"
 "\n"
 
-#: src/main.c:184
+#: src/main.c:206
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
@@ -93,84 +92,84 @@
 "lisätietoja.\n"
 "\n"
 
-#: src/main.c:192
+#: src/main.c:216
 msgid "Preserving set.\n"
 msgstr "Säilytetään leikesarja.\n"
 
-#: src/main.c:636
+#: src/main.c:691
 msgid "Resizing"
 msgstr "Koon muutos"
 
-#: src/main.c:643
+#: src/main.c:698
 msgid "_Resize All Frames"
 msgstr "Muuta kaikkien kuvien k_okoa"
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:895
+#: src/main.c:948
 msgid "Any"
 msgstr "Mikä tahansa"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:897
+#: src/main.c:950
 msgid "None"
 msgstr "Ei mitään"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:899
+#: src/main.c:952
 msgid "recommended"
 msgstr "suositeltu"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:901
+#: src/main.c:954
 msgid "disabled !"
 msgstr "kytketty pois päältä!"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:903
+#: src/main.c:956
 msgid "**The current layout**"
 msgstr "**Nykyinen asettelu**"
 
 #. TRANSLATORS: adjective for "Built in" type effects
-#: src/main.c:905
+#: src/main.c:958
 msgid "Builtin"
 msgstr ""
 
 #. TRANSLATORS: adjective for "Custom" type effects
-#: src/main.c:907
+#: src/main.c:960
 msgid "Custom"
 msgstr "Mukauta"
 
 #. TRANSLATORS: adjective for "Test" type effects
-#: src/main.c:909
+#: src/main.c:962
 msgid "Test"
 msgstr "Kokeile"
 
-#: src/main.c:1054
+#: src/main.c:1107
 msgid "Foreground"
 msgstr ""
 
-#: src/main.c:1055
+#: src/main.c:1108
 #, fuzzy
 msgid "Background"
 msgstr "P_imennä tausta"
 
-#: src/main.c:1566
+#: src/main.c:1624
 msgid "Loading realtime effect plugins..."
 msgstr "Ladataan reaaliaikaiset tehosteliitännäiset..."
 
-#: src/main.c:1631
+#: src/main.c:1690
 msgid "Starting jack audio server..."
 msgstr "Käynnistetään jack-äänipalvelin..."
 
-#: src/main.c:1633
+#: src/main.c:1692
 msgid "Starting jack transport server..."
 msgstr "Käynnistetään jack-välityspalvelin..."
 
-#: src/main.c:1634
+#: src/main.c:1693
 msgid "Connecting to jack transport server..."
 msgstr "Yhdistetään jack-välityspalvelimeen..."
 
-#: src/main.c:1663
+#: src/main.c:1723
 #, c-format
 msgid ""
 "\n"
@@ -182,114 +181,114 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1697
+#: src/main.c:1758
 msgid "Starting pulse audio server..."
 msgstr "Käynnistetään pulse audio -palvelin..."
 
-#: src/main.c:1765
+#: src/main.c:1825
 msgid "Checking optional dependencies:"
 msgstr "Tarkistetaan valinnaiset riippuvuudet:"
 
-#: src/main.c:1766
+#: src/main.c:1826
 msgid "mplayer...detected..."
 msgstr "mplayer...havaittu..."
 
-#: src/main.c:1767
+#: src/main.c:1827
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...EI HAVAITTU..."
 
-#: src/main.c:1768
+#: src/main.c:1828
 #, fuzzy
 msgid "mplayer2...detected..."
 msgstr "mplayer...havaittu..."
 
-#: src/main.c:1769
+#: src/main.c:1829
 #, fuzzy
 msgid "mplayer2...NOT DETECTED..."
 msgstr "mplayer...EI HAVAITTU..."
 
-#: src/main.c:1770
+#: src/main.c:1830
 msgid "convert...detected..."
 msgstr "convert...havaittu..."
 
-#: src/main.c:1771
+#: src/main.c:1831
 msgid "convert...NOT DETECTED..."
 msgstr "convert...EI HAVAITTU..."
 
-#: src/main.c:1772
+#: src/main.c:1832
 msgid "composite...detected..."
 msgstr "composite...havaittu..."
 
-#: src/main.c:1773
+#: src/main.c:1833
 msgid "composite...NOT DETECTED..."
 msgstr "composite...EI HAVAITTU..."
 
-#: src/main.c:1774
+#: src/main.c:1834
 msgid "sox...detected\n"
 msgstr "sox...havaittu\n"
 
-#: src/main.c:1775
+#: src/main.c:1835
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...EI HAVAITTU\n"
 
-#: src/main.c:1776
+#: src/main.c:1836
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...havaittu..."
 
-#: src/main.c:1777
+#: src/main.c:1837
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...EI HAVAITTU..."
 
-#: src/main.c:1778
+#: src/main.c:1838
 msgid "jackd...detected..."
 msgstr "jackd...havaittu..."
 
-#: src/main.c:1779
+#: src/main.c:1839
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...EI HAVAITTU..."
 
-#: src/main.c:1780
+#: src/main.c:1840
 msgid "pulse audio...detected..."
 msgstr "pulse audio...havaittu..."
 
-#: src/main.c:1781
+#: src/main.c:1841
 msgid "pulse audio...NOT DETECTED..."
 msgstr "pulse audio...EI HAVAITTU..."
 
-#: src/main.c:1782
+#: src/main.c:1842
 msgid "python...detected..."
 msgstr "python...havaittu..."
 
-#: src/main.c:1783
+#: src/main.c:1843
 msgid "python...NOT DETECTED..."
 msgstr "python...EI HAVAITTU..."
 
-#: src/main.c:1784
+#: src/main.c:1844
 msgid "dvgrab...detected..."
 msgstr "dvgrab...havaittu..."
 
-#: src/main.c:1785
+#: src/main.c:1845
 msgid "dvgrab...NOT DETECTED..."
 msgstr "dvgrab...EI HAVAITTU..."
 
-#: src/main.c:1786
+#: src/main.c:1846
 msgid "xwininfo...detected..."
 msgstr "xwininfo...havaittu..."
 
-#: src/main.c:1787
+#: src/main.c:1847
 msgid "xwininfo...NOT DETECTED..."
 msgstr "xwininfo...EI HAVAITTU..."
 
-#: src/main.c:1793
+#: src/main.c:1853
 #, c-format
 msgid "Windows version %04X"
 msgstr ""
 
-#: src/main.c:1795
+#: src/main.c:1855
 msgid "UNKNOWN - please patch me !"
 msgstr "TUNTEMATON - ole hyvä ja korjaa minut !"
 
-#: src/main.c:1799
+#: src/main.c:1859
 #, c-format
 msgid ""
 "\n"
@@ -300,48 +299,48 @@
 "\n"
 "Ikkunointiohjelma ilmoitti olevansa \"%s\"; "
 
-#: src/main.c:1802
+#: src/main.c:1862
 #, c-format
 msgid "number of monitors detected: %d\n"
 msgstr "näyttöjä löydetty: %d\n"
 
-#: src/main.c:1805
+#: src/main.c:1865
 #, c-format
 msgid "Number of CPUs detected: %d "
 msgstr ""
 
-#: src/main.c:1808 src/multitrack.c:4902
+#: src/main.c:1868 src/multitrack.c:5068
 msgid "little endian"
 msgstr ""
 
-#: src/main.c:1809 src/multitrack.c:4901
+#: src/main.c:1869 src/multitrack.c:5067
 msgid "big endian"
 msgstr ""
 
-#: src/main.c:1810
+#: src/main.c:1870
 #, c-format
 msgid "(%d bits, %s)\n"
 msgstr ""
 
-#: src/main.c:1814
+#: src/main.c:1874
 msgid "GUI type is: "
 msgstr ""
 
-#: src/main.c:1818
+#: src/main.c:1878
 #, c-format
 msgid "GTK+ version %d.%d.%d (compiled with %d.%d.%d)"
 msgstr ""
 
-#: src/main.c:1840
+#: src/main.c:1900
 msgid ", with cairo support"
 msgstr ""
 
-#: src/main.c:1847
+#: src/main.c:1907
 #, c-format
 msgid "Temp directory is %s\n"
 msgstr "Tilapäishakemisto on %s\n"
 
-#: src/main.c:1851
+#: src/main.c:1911
 msgid ""
 "WARNING - this version of LiVES was compiled without either\n"
 "jack or pulse audio support.\n"
@@ -351,15 +350,15 @@
 "jack- tai pulse audio -tukea.\n"
 "Jotkut ääniominaisuudet eivät ole käytettävissä.\n"
 
-#: src/main.c:1854
+#: src/main.c:1914
 msgid "Compiled with jack support, good !\n"
 msgstr "Käännetty jack-tuella, hienoa!\n"
 
-#: src/main.c:1857
+#: src/main.c:1917
 msgid "Compiled with pulse audio support, wonderful !\n"
 msgstr "Käännetty pulse audio -tuella, loistavaa!\n"
 
-#: src/main.c:1861
+#: src/main.c:1921
 #, c-format
 msgid ""
 "Welcome to LiVES version %s.\n"
@@ -368,7 +367,7 @@
 "Tervetuloa LiVES-versioon %s.\n"
 "\n"
 
-#: src/main.c:2306
+#: src/main.c:2380
 #, c-format
 msgid ""
 "\n"
@@ -378,86 +377,91 @@
 "Käynnistyssyntaksi on: %s [valitsimet] [tiedostonimi [aloitusaika] "
 "[kehykset]]\n"
 
-#: src/main.c:2307
+#: src/main.c:2381
 msgid "Where: filename is the name of a media file or backup file.\n"
 msgstr ""
 "Missä: tiedostonimi on mediatiedoston tai varmuuskopiotiedoston nimi.\n"
 
-#: src/main.c:2308
+#: src/main.c:2382
 msgid "start_time : filename start time in seconds\n"
 msgstr "aloitusaika : tiedostonnimen aloitusaika sekunteina\n"
 
-#: src/main.c:2309
+#: src/main.c:2383
 msgid "frames : maximum number of frames to open\n"
 msgstr "kehykset : avattavien kehysten enimmäismäärä\n"
 
-#: src/main.c:2311
+#: src/main.c:2385
 msgid "opts can be:\n"
 msgstr "valitsimia voivat olla:\n"
 
-#: src/main.c:2312
+#: src/main.c:2386
 msgid "-help            : show this help text and exit\n"
 msgstr "-help            : näytä tämä ohjeteksti ja poistu\n"
 
-#: src/main.c:2313
+#: src/main.c:2387
 msgid "-tmpdir <tempdir>: use alternate working directory (e.g /var/ramdisk)\n"
 msgstr ""
 
-#: src/main.c:2314
+#: src/main.c:2388
 msgid "-set <setname>   : autoload clip set setname\n"
 msgstr "-set <leikenimi> : lataa automaattisesti leikesarja leikenimi\n"
 
-#: src/main.c:2315
+#: src/main.c:2389
 msgid "-noset           : do not load any set on startup\n"
 msgstr "-noset           : älä lataa leikesarjoja käynnistäessä\n"
 
-#: src/main.c:2316
+#: src/main.c:2390
 msgid "-norecover       : force no-loading of crash recovery\n"
 msgstr ""
 
-#: src/main.c:2317
+#: src/main.c:2391
 msgid "-recover         : force loading of crash recovery\n"
 msgstr "-recover : voimaan lastaus kaatua hyödyntämistä\n"
 
-#: src/main.c:2318
-msgid "-nothreaddialog  : doe nothing - retained for backwards compatibility\n"
+#: src/main.c:2392
+msgid ""
+"-nothreaddialog  : does nothing - retained for backwards compatibility\n"
 msgstr ""
 
-#: src/main.c:2319
+#: src/main.c:2393
 msgid "-nogui           : do not show the gui\n"
 msgstr "-nogui           : käynnistä ilman käyttöliittymää\n"
 
-#: src/main.c:2320
+#: src/main.c:2394
 msgid "-nosplash        : do not show the splash window\n"
 msgstr ""
 
-#: src/main.c:2321
+#: src/main.c:2395
 msgid "-noplaywin       : do not show the play window\n"
 msgstr ""
 
-#: src/main.c:2322
+#: src/main.c:2396
+msgid "-noninteractive  : disable menu interactivity\n"
+msgstr ""
+
+#: src/main.c:2397
 msgid "-startup-ce      : start in clip editor mode\n"
 msgstr "-startup-ce : alkaa clip editori-tilassa\n"
 
-#: src/main.c:2323
+#: src/main.c:2398
 msgid "-startup-mt      : start in multitrack mode\n"
 msgstr "-startum-mt : alkaa moniraitaäänityksen tilassa\n"
 
-#: src/main.c:2324
+#: src/main.c:2399
 msgid ""
 "-fxmodesmax <n>  : allow <n> modes per effect key (minimum is 1, default is "
 "8)\n"
 msgstr ""
 
-#: src/main.c:2326
+#: src/main.c:2401
 msgid "-oscstart <port> : start OSC listener on UDP port <port>\n"
 msgstr "-oscstart <portti> : käynnistä OSC-kuuntelin UDP-portissa <portti>\n"
 
-#: src/main.c:2327
+#: src/main.c:2402
 msgid "-nooscstart      : do not start OSC listener\n"
 msgstr "-nooscstart      : älä käynnistä OSC-kuuntelinta\n"
 
-#: src/main.c:2329
+#: src/main.c:2404
 #, fuzzy
 msgid ""
 "-aplayer <ap>    : start with selected audio player. <ap> can be mplayer, "
@@ -466,46 +470,46 @@
 "-aplayer <ap>    : käynnistä valitulla äänisoittimella. <ap> voi olla mplayer"
 
 #. TRANSLATORS: pulse (audio)
-#: src/main.c:2332
+#: src/main.c:2407
 msgid ", pulse"
 msgstr ", pulse"
 
-#: src/main.c:2335
+#: src/main.c:2410
 msgid ", sox or jack\n"
 msgstr ", sox tai jack\n"
 
-#: src/main.c:2336
+#: src/main.c:2412
 msgid ""
 "-jackopts <opts>    : opts is a bitmap of jack startup options [1 = jack "
 "transport client, 2 = jack transport master, 4 = start jack transport "
 "server, 8 = pause audio when video paused, 16 = start jack audio server] \n"
 msgstr ""
 
-#: src/main.c:2338
+#: src/main.c:2414
 msgid " or sox\n"
 msgstr " tai sox\n"
 
-#: src/main.c:2340
+#: src/main.c:2416
 msgid "-devicemap <mapname>          : autoload devicemap\n"
 msgstr "-devicemap <kartan nimi> : automaattisesti Kontti kartta\n"
 
-#: src/main.c:2341
+#: src/main.c:2418
 msgid ""
 "-vppdefaults <file>          : load video playback plugin defaults from "
 "<file> (Note: only sets the settings, not the plugin type)\n"
 msgstr ""
 
-#: src/main.c:2342
+#: src/main.c:2419
 msgid "-debug            : try to debug crashes (requires 'gdb' installed)\n"
 msgstr ""
 "-debug            : yritä jäljittää kaatumisen aiheuttavaa vikaa (\"gdb\" "
 "oltava asennettuna)\n"
 
-#: src/main.c:2373 src/gui.c:1128
+#: src/main.c:2449 src/gui.c:1127
 msgid "Starting GUI..."
 msgstr "Käynnistetään graafinen käyttöliittymä..."
 
-#: src/main.c:2396
+#: src/main.c:2475
 #, c-format
 msgid ""
 "\n"
@@ -516,7 +520,7 @@
 "(Maybe you need to change the value of <prefix_dir> in your %s file)\n"
 msgstr ""
 
-#: src/main.c:2410
+#: src/main.c:2492
 #, c-format
 msgid ""
 "\n"
@@ -524,7 +528,7 @@
 "Please make sure you have write access to %s and try again.\n"
 msgstr ""
 
-#: src/main.c:2415
+#: src/main.c:2498
 msgid ""
 "\n"
 "`smogrify` must be in your path, and be executable\n"
@@ -533,7 +537,7 @@
 "before running LiVES.\n"
 msgstr ""
 
-#: src/main.c:2421
+#: src/main.c:2504
 #, c-format
 msgid ""
 "\n"
@@ -543,7 +547,7 @@
 "Please check the file permissions for this file and try again.\n"
 msgstr ""
 
-#: src/main.c:2428
+#: src/main.c:2512
 #, c-format
 msgid ""
 "\n"
@@ -554,7 +558,7 @@
 "and try again.\n"
 msgstr ""
 
-#: src/main.c:2438
+#: src/main.c:2522
 #, c-format
 msgid ""
 "Please check the <tempdir> setting in \n"
@@ -562,7 +566,7 @@
 "and try again.\n"
 msgstr ""
 
-#: src/main.c:2445
+#: src/main.c:2528
 #, c-format
 msgid ""
 "\n"
@@ -577,7 +581,7 @@
 "\n"
 "%s"
 
-#: src/main.c:2453
+#: src/main.c:2536
 msgid ""
 "\n"
 "An incorrect version of smogrify was found in your path.\n"
@@ -588,21 +592,21 @@
 "Thankyou.\n"
 msgstr ""
 
-#: src/main.c:2458
+#: src/main.c:2541
 msgid ""
 "\n"
 "LiVES currently requires 'mplayer', 'mplayer2' or 'sox' to function. Please "
 "install one or other of these, and try again.\n"
 msgstr ""
 
-#: src/main.c:2462
+#: src/main.c:2546
 msgid ""
 "\n"
 "LiVES currently requires both 'mplayer' or 'mplayer2' and 'sox' to function. "
 "Please install these, and try again.\n"
 msgstr ""
 
-#: src/main.c:2472
+#: src/main.c:2556
 #, fuzzy
 msgid ""
 "\n"
@@ -613,7 +617,7 @@
 "LiVES ei löytänyt ohjelmaa \"mplayer\". Asenna mplayer jos haluat käyttää \n"
 "LiVESiä täysipainoisesti.\n"
 
-#: src/main.c:2475
+#: src/main.c:2561
 msgid ""
 "\n"
 "LiVES was unable to locate 'convert'. You should install convert and image-"
@@ -623,7 +627,7 @@
 "LiVES ei löytänyt \"convert\"-ohjelmaa. Asenna convert ja image-magick jos "
 "haluat käyttää hahmonnettuja tehosteita.\n"
 
-#: src/main.c:2478
+#: src/main.c:2566
 msgid ""
 "\n"
 "LiVES was unable to locate 'composite'. You should install composite and "
@@ -633,7 +637,7 @@
 "LiVES ei löytänyt \"composite\"-ohjelmaa. Asenna composite ja image-magick "
 "jos haluat käyttää yhdistä-toimintoa.\n"
 
-#: src/main.c:2481
+#: src/main.c:2570
 msgid ""
 "\n"
 "LiVES was unable to locate 'sox'. Some audio features may not work. You "
@@ -643,7 +647,7 @@
 "LiVES ei löytänyt ohjelmaa 'sox'. Jotkin ääniominaisuudet eivät välttämättä "
 "toimi. Sinun tulisi asentaa 'sox'.\n"
 
-#: src/main.c:2484
+#: src/main.c:2575
 #, c-format
 msgid ""
 "\n"
@@ -654,59 +658,59 @@
 "You may need to change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/main.c:2611
+#: src/main.c:2707
 #, c-format
 msgid "Autoloading set %s..."
 msgstr "Ladataan automaattisesti leikesarja %s..."
 
 #. TRANSLATORS: localised name may be used here
-#: src/main.c:2781 src/interface.c:738
+#: src/main.c:2902
 msgid "LiVES"
 msgstr "LiVES"
 
-#: src/main.c:2948
+#: src/main.c:3066
 #, c-format
 msgid "Invalid audio player %s\n"
 msgstr "Virheellinen musiikkisoitin %s\n"
 
-#: src/main.c:3077
+#: src/main.c:3214
 #, c-format
 msgid "LiVES-%s: <Untitled%d> %dx%d : %d frames %d bpp %.3f fps"
 msgstr "LiVES-%s: <Nimetön%d> %dx%d : %d kuvaa %d bpp %.3f fps"
 
-#: src/main.c:3082
+#: src/main.c:3219
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : ??? frames ??? bpp %.3f fps"
 msgstr "LiVES-%s: <%s> %dx%d : ??? kuvaa ??? bpp %.3f fps"
 
-#: src/main.c:3086
+#: src/main.c:3222
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : %d frames %d bpp %.3f fps"
 msgstr "LiVES-%s: <%s> %dx%d : %d kuvaa %d bpp %.3f fps"
 
-#: src/main.c:3094
+#: src/main.c:3229
 #, c-format
 msgid "LiVES-%s: <No File>"
 msgstr "LiVES-%s: <Ei tiedostoa>"
 
 #. TRANSLATORS: rec(ord)
-#: src/main.c:5085
+#: src/main.c:5201
 #, c-format
 msgid "rec %9d/%d"
 msgstr "rec %9d/%d"
 
 #. TRANSLATORS: out of memory (rec(ord))
-#: src/main.c:5091
+#: src/main.c:5206
 #, c-format
 msgid "!rec %9d/%d"
 msgstr ""
 
-#: src/main.c:5398 src/main.c:5399 src/gui.c:2110 src/gui.c:3220
-#: src/saveplay.c:2336
+#: src/main.c:5500 src/main.c:5501 src/gui.c:2108 src/gui.c:3331
+#: src/saveplay.c:2315
 msgid "Play"
 msgstr "Toista"
 
-#: src/main.c:6128
+#: src/main.c:6216
 msgid ""
 "LiVES was unable to capture this image\n"
 "\n"
@@ -714,35 +718,35 @@
 "LiVES ei pystynyt kaappaamaan tätä kuvaa\n"
 "\n"
 
-#: src/main.c:6250
+#: src/main.c:6345
 #, c-format
 msgid "Closed file %s\n"
 msgstr "Tiedosto %s suljettiin\n"
 
-#: src/main.c:6452 src/gui.c:648 src/utils.c:4312 src/utils.c:4344
-#: src/saveplay.c:3550 src/multitrack.c:4510 src/multitrack.c:6268
+#: src/main.c:6542 src/gui.c:647 src/utils.c:4256 src/utils.c:4286
+#: src/saveplay.c:3500 src/multitrack.c:4678 src/multitrack.c:6447
 msgid "_Undo"
 msgstr "Kum_oa"
 
-#: src/main.c:6453 src/gui.c:666 src/utils.c:4313 src/utils.c:4345
-#: src/saveplay.c:3551 src/multitrack.c:4531 src/multitrack.c:6293
+#: src/main.c:6543 src/gui.c:665 src/utils.c:4257 src/utils.c:4287
+#: src/saveplay.c:3501 src/multitrack.c:4698 src/multitrack.c:6472
 msgid "_Redo"
 msgstr "_Tee uudestaan"
 
-#: src/main.c:6493 src/interface.c:470 src/gui.c:2326 src/preferences.c:2357
-#: src/resample.c:1516
+#: src/main.c:6583 src/interface.c:457 src/gui.c:2324 src/preferences.c:2391
+#: src/resample.c:1488
 msgid "Video"
 msgstr "Video"
 
-#: src/main.c:6494 src/interface.c:483 src/gui.c:2351
+#: src/main.c:6584 src/interface.c:470 src/gui.c:2348
 msgid "Left Audio"
 msgstr "Vasen ääni"
 
-#: src/main.c:6495 src/gui.c:2375
+#: src/main.c:6585 src/gui.c:2371
 msgid "Right Audio"
 msgstr "Oikea ääni"
 
-#: src/main.c:6540
+#: src/main.c:6630
 msgid ""
 "\n"
 "\n"
@@ -751,11 +755,11 @@
 "Please adjust the playback options in Preferences and try again.\n"
 msgstr ""
 
-#: src/main.c:7051 src/plugins.c:1502
+#: src/main.c:7134 src/plugins.c:1468
 msgid "LiVES: - Play Window"
 msgstr "LiVES: - Toistoikkuna"
 
-#: src/startup.c:25
+#: src/startup.c:24
 #, c-format
 msgid ""
 "A directory named\n"
@@ -765,7 +769,7 @@
 "(Free space = %s)\n"
 msgstr ""
 
-#: src/startup.c:32
+#: src/startup.c:29
 #, c-format
 msgid ""
 "A directory named\n"
@@ -775,7 +779,7 @@
 "Please select another location.\n"
 msgstr ""
 
-#: src/startup.c:49
+#: src/startup.c:46
 #, c-format
 msgid ""
 "\n"
@@ -786,7 +790,7 @@
 "(Free space = %s)"
 msgstr ""
 
-#: src/startup.c:54
+#: src/startup.c:50
 #, c-format
 msgid ""
 "\n"
@@ -799,11 +803,11 @@
 "%s\n"
 "Valitse eri hakemisto ja yritä uudelleen.\n"
 
-#: src/startup.c:96
+#: src/startup.c:92
 msgid "Directory name is too long !"
 msgstr "Kansion nimi on liian pitkä!"
 
-#: src/startup.c:223
+#: src/startup.c:216
 msgid ""
 "LiVES FAILED TO START YOUR SELECTED AUDIO PLAYER !\n"
 "\n"
@@ -811,7 +815,7 @@
 "LiVES EI PYSTYNYT KÄYNNISTÄMÄÄN VALITSEMAASI ÄÄNISOITINTA!\n"
 "\n"
 
-#: src/startup.c:230
+#: src/startup.c:222
 msgid ""
 "Before starting LiVES, you need to choose an audio player.\n"
 "\n"
@@ -821,7 +825,7 @@
 "\n"
 "PULSE AUDIO on suositeltava useimmille käyttäjille"
 
-#: src/startup.c:233
+#: src/startup.c:225
 msgid ""
 ", but this version of LiVES was not compiled with pulse audio support.\n"
 "\n"
@@ -829,7 +833,7 @@
 ", mutta tätä LiVESin versiota ei ole käännetty pulse audio -tuella.\n"
 "\n"
 
-#: src/startup.c:236
+#: src/startup.c:229
 msgid ""
 ", but you do not have pulse audio installed on your system.\n"
 " You are advised to install pulse audio first before running LiVES.\n"
@@ -839,11 +843,11 @@
 " On suositeltavaa asentaa pulse audio ennen LiVESin käynnistystä.\n"
 "\n"
 
-#: src/startup.c:241
+#: src/startup.c:233
 msgid "JACK audio is recommended for pro users"
 msgstr "JACK audio on suositeltava edistyneemmille käyttäjille"
 
-#: src/startup.c:244
+#: src/startup.c:236
 msgid ""
 ", but this version of LiVES was not compiled with jack audio support.\n"
 "\n"
@@ -851,7 +855,7 @@
 ", mutta tätä LiVESin versiota ei ole käännetty jack audio -tuella.\n"
 "\n"
 
-#: src/startup.c:247
+#: src/startup.c:239
 msgid ""
 ", but you do not have jackd installed. You may wish to install jackd first "
 "before running LiVES.\n"
@@ -861,7 +865,7 @@
 "käynnistystä.\n"
 "\n"
 
-#: src/startup.c:250
+#: src/startup.c:242
 msgid ""
 ", but may prevent LiVES from starting on some systems.\n"
 "If LiVES will not start with jack, you can restart and try with another "
@@ -873,11 +877,11 @@
 "uudestaan ja kokeilla jotain muuta äänisoitinta.\n"
 "\n"
 
-#: src/startup.c:254
+#: src/startup.c:246
 msgid "SOX may be used if neither of the preceding players work, "
 msgstr "SOXia voi käyttää jos kumpikaan edellisistä soittimista ei toimi, "
 
-#: src/startup.c:257
+#: src/startup.c:249
 msgid ""
 "but some audio features will be disabled.\n"
 "\n"
@@ -885,7 +889,7 @@
 "mutta jotkut ääniominaisuudet eivät ole käytettävissä.\n"
 "\n"
 
-#: src/startup.c:260
+#: src/startup.c:251
 msgid ""
 "but you do not have sox installed.\n"
 "You are advised to install it before running LiVES.\n"
@@ -895,7 +899,7 @@
 "On suositeltavaa asentaa se ennen LiVESin käynnistystä.\n"
 "\n"
 
-#: src/startup.c:264
+#: src/startup.c:255
 #, fuzzy
 msgid ""
 "The MPLAYER/MPLAYER2 audio player is only recommended for testing purposes.\n"
@@ -904,138 +908,138 @@
 "MPLAYER-äänisoitinta suositellaan vain testaustarkoituksiin.\n"
 "\n"
 
-#: src/startup.c:281
+#: src/startup.c:271
 msgid "LiVES: - Choose an audio player"
 msgstr "LiVES: - Valitse äänisoitin"
 
-#: src/startup.c:298
+#: src/startup.c:288
 msgid "Use _pulse audio player"
 msgstr "Käytä _pulse-äänisoitinta"
 
-#: src/startup.c:320
+#: src/startup.c:310
 msgid "Use _jack audio player"
 msgstr "Käytä _jack-äänisoitinta"
 
-#: src/startup.c:340
+#: src/startup.c:330
 msgid "Use _sox audio player"
 msgstr "Käytä _sox-äänisoitinta"
 
-#: src/startup.c:361
+#: src/startup.c:351
 msgid "Use _mplayer audio player"
 msgstr "Käytä _mplayer-äänisoitinta"
 
-#: src/startup.c:381
+#: src/startup.c:371
 #, fuzzy
 msgid "Use _mplayer2 audio player"
 msgstr "Käytä _mplayer-äänisoitinta"
 
-#: src/startup.c:405 src/startup.c:580 src/interface.c:1506
+#: src/startup.c:395 src/startup.c:569 src/interface.c:1398
 msgid "_Next"
 msgstr "_Seuraava"
 
-#: src/startup.c:445
+#: src/startup.c:435
 msgid "Skipped"
 msgstr "Ohitettu"
 
-#: src/startup.c:460
+#: src/startup.c:450
 msgid "Passed"
 msgstr "Hyväksytty"
 
-#: src/startup.c:493
+#: src/startup.c:483
 msgid "Failed"
 msgstr "Epäonnistui"
 
-#: src/startup.c:552
+#: src/startup.c:542
 msgid "LiVES: - Testing Configuration"
 msgstr "LiVES: - Testaus asetukset"
 
-#: src/startup.c:555
+#: src/startup.c:544
 msgid "LiVES: - Troubleshoot"
 msgstr "LiVES: - Vianmääritys"
 
-#: src/startup.c:568
+#: src/startup.c:557
 msgid "LiVES will now run some basic configuration tests\n"
 msgstr ""
 
-#: src/startup.c:603
+#: src/startup.c:591
 msgid "Checking for \"sox\" presence"
 msgstr "Tarkistetaan löytyykö \"sox\""
 
-#: src/startup.c:607
+#: src/startup.c:595
 msgid ""
 "You should install sox to be able to use all the audio features in LiVES"
 msgstr ""
 
-#: src/startup.c:615
+#: src/startup.c:602
 msgid "Checking if sox can convert audio"
 msgstr "Tarkistetaan, voiko sox muuntaa ääntä"
 
-#: src/startup.c:638
+#: src/startup.c:625
 msgid "Unable to allocate 176400 bytes memory."
 msgstr ""
 
-#: src/startup.c:653
+#: src/startup.c:639
 #, c-format
 msgid "Unable to write to: %s"
 msgstr "Kirjoittaminen ei onnistu: %s"
 
-#: src/startup.c:667 src/startup.c:807
+#: src/startup.c:653 src/startup.c:789
 #, c-format
 msgid "Command failed: %s"
 msgstr "Komento epäonnistui: %s"
 
-#: src/startup.c:689
+#: src/startup.c:675
 msgid "You should install sox_fmt_all or similar"
 msgstr ""
 
-#: src/startup.c:717
+#: src/startup.c:703
 msgid "Checking for \"mplayer\" presence"
 msgstr "Tarkistetaan löytyykö \"mplayer\""
 
-#: src/startup.c:721
+#: src/startup.c:707
 msgid ""
 "You should install mplayer or mplayer2 to be able to use all the decoding "
 "features in LiVES"
 msgstr ""
 
-#: src/startup.c:747
+#: src/startup.c:732
 msgid "Checking if mplayer can convert audio"
 msgstr "Tarkistetaan, voiko mplayer muuntaa ääntä"
 
-#: src/startup.c:768
+#: src/startup.c:751
 #, fuzzy
 msgid "You should install mplayer or mplayer2 with pcm/wav support"
 msgstr "Sinun pitäisi asentaa mplayer pcm/wav tuella"
 
-#: src/startup.c:785
+#: src/startup.c:767
 msgid "Checking if mplayer can decode to png/alpha"
 msgstr "Tarkistetaan voiko mplayer purkaa png/aplhaa"
 
-#: src/startup.c:828
+#: src/startup.c:810
 msgid "You may wish to upgrade mplayer to a newer version"
 msgstr "Voit halutessasi päivittää mplayerin uudempaan versioon"
 
-#: src/startup.c:854
+#: src/startup.c:836
 msgid "Checking if mplayer can decode to jpeg"
 msgstr "Tarkistetaan voiko mplayer purkaa jpegiä."
 
-#: src/startup.c:882
+#: src/startup.c:862
 msgid "You should install mplayer with either png/alpha or jpeg support"
 msgstr ""
 
-#: src/startup.c:883
+#: src/startup.c:863
 msgid "You may wish to add jpeg output support to mplayer"
 msgstr ""
 
-#: src/startup.c:892
+#: src/startup.c:872
 msgid "Checking for \"convert\" presence"
 msgstr "Tarkistetaan löytyykö \"convert\""
 
-#: src/startup.c:896
+#: src/startup.c:876
 msgid "Install imageMagick to be able to use all of the rendered effects"
 msgstr ""
 
-#: src/startup.c:909
+#: src/startup.c:889
 msgid ""
 "\n"
 "\n"
@@ -1043,7 +1047,7 @@
 "Preferences/Decoding.    \n"
 msgstr ""
 
-#: src/startup.c:915
+#: src/startup.c:894
 msgid ""
 "\n"
 "\n"
@@ -1055,49 +1059,49 @@
 "    Napsauta Peru jos haluat lopettaa ja asentaa puuttuvat ohjelmat, tai "
 "Seuraava jatkaaksesi    \n"
 
-#: src/startup.c:949
+#: src/startup.c:928
 msgid ""
 "\n"
 "\n"
 "Finally, you can choose the default startup interface for LiVES.\n"
 msgstr ""
 
-#: src/startup.c:950
+#: src/startup.c:929
 msgid ""
 "\n"
 "\n"
 "LiVES has two main interfaces and you can start up with either of them.\n"
 msgstr ""
 
-#: src/startup.c:951
+#: src/startup.c:930
 msgid ""
 "\n"
 "\n"
 "The default can always be changed later from Preferences.\n"
 msgstr ""
 
-#: src/startup.c:961
+#: src/startup.c:940
 msgid "LiVES: - Choose the startup interface"
 msgstr "LiVES: - Valitse käynnistettävä käyttöliittymä"
 
-#: src/startup.c:972
+#: src/startup.c:951
 msgid "Start in _Clip Edit mode"
 msgstr "Käynnistä _Leikemuokkaustilaan"
 
-#: src/startup.c:975
+#: src/startup.c:954
 msgid "This is the best choice for simple editing tasks and for VJs\n"
 msgstr ""
 
-#: src/startup.c:981
+#: src/startup.c:960
 msgid "Start in _Multitrack mode"
 msgstr "Käynnistä _Multitrack-tilaan"
 
-#: src/startup.c:983
+#: src/startup.c:962
 msgid ""
 "This is a better choice for complex editing tasks involving multiple clips.\n"
 msgstr ""
 
-#: src/startup.c:992
+#: src/startup.c:971
 msgid "_Finish"
 msgstr "_Valmis"
 
@@ -1114,37 +1118,37 @@
 msgid "Apply _Deinterlace"
 msgstr ""
 
-#: src/interface.c:66
+#: src/interface.c:65
 msgid "If this is set, frames will be deinterlaced as they are imported."
 msgstr ""
 
-#: src/interface.c:113 src/callbacks.c:9623 src/callbacks.c:9646
-#: src/callbacks.c:9647 src/gui.c:3223 src/gui.c:3821 src/saveplay.c:2339
-#: src/saveplay.c:3138 src/dialogs.c:1514 src/dialogs.c:1515
-#: src/dialogs.c:1746 src/dialogs.c:1747 src/framedraw.c:238
-#: src/multitrack.c:8031
+#: src/interface.c:106 src/callbacks.c:9542 src/callbacks.c:9564
+#: src/callbacks.c:9565 src/gui.c:3333 src/gui.c:3946 src/saveplay.c:2317
+#: src/saveplay.c:3097 src/dialogs.c:1575 src/dialogs.c:1576
+#: src/dialogs.c:1804 src/dialogs.c:1805 src/framedraw.c:236
+#: src/multitrack.c:8210
 msgid "Preview"
 msgstr "Esikatselu"
 
-#: src/interface.c:132
+#: src/interface.c:125
 msgid "Click here to _Preview any selected video, image or audio file"
 msgstr ""
 "Napsauta tästä esi_katsellaksesi mitä tahansa valittua video-, kuva- tai "
 "äänitiedostoa"
 
-#: src/interface.c:135
+#: src/interface.c:127
 msgid "Click here to _Preview any selected audio file"
 msgstr "Napsauta tästä esi_kuunnellaksesi valittua äänitiedostoa"
 
-#: src/interface.c:138
+#: src/interface.c:129
 msgid "Click here to _Preview the video"
 msgstr "Klikkaa tästä _Esikatselu video"
 
-#: src/interface.c:181 src/dialogs.c:2542
+#: src/interface.c:169 src/dialogs.c:2621
 msgid "LiVES: - Processing..."
 msgstr "LiVES: - Käsitellään..."
 
-#: src/interface.c:217
+#: src/interface.c:205
 msgid ""
 "\n"
 "\n"
@@ -1158,8 +1162,8 @@
 "\n"
 "Muista poistaa tehosteet käytöstä (ctrl-0) myöhemmin!"
 
-#: src/interface.c:222 src/callbacks.c:9373 src/callbacks.c:9420
-#: src/dialogs.c:2570
+#: src/interface.c:210 src/callbacks.c:9283 src/callbacks.c:9332
+#: src/dialogs.c:2649
 msgid ""
 "\n"
 "Please Wait"
@@ -1167,190 +1171,178 @@
 "\n"
 "Odota hetki"
 
-#: src/interface.c:242
+#: src/interface.c:230
 msgid "Show Details"
 msgstr ""
 
-#: src/interface.c:254 src/dialogs.c:2584
+#: src/interface.c:242 src/dialogs.c:2663
 msgid "_Enough"
 msgstr "_Riittää jo"
 
-#: src/interface.c:255 src/framedraw.c:278
+#: src/interface.c:243 src/framedraw.c:276
 msgid "_Preview"
 msgstr "_Esikatselu"
 
-#: src/interface.c:257
+#: src/interface.c:245 src/callbacks.c:9282 src/callbacks.c:9330
 msgid "Paus_e"
 msgstr ""
 
-#: src/interface.c:258 src/callbacks.c:9417
+#: src/interface.c:246 src/callbacks.c:9329
 msgid "Pause/_Enough"
 msgstr ""
 
-#: src/interface.c:285
+#: src/interface.c:273
 msgid "_Cancel"
 msgstr "_Peruuta"
 
-#: src/interface.c:374
+#: src/interface.c:361
 #, c-format
 msgid "LiVES: - %s"
 msgstr ""
 
-#: src/interface.c:376
+#: src/interface.c:363
 msgid "LiVES: - Multitrack details"
 msgstr ""
 
-#: src/interface.c:407
+#: src/interface.c:394
 msgid "Format"
 msgstr "Formaatti"
 
-#: src/interface.c:412
+#: src/interface.c:399
 msgid "Frame size"
 msgstr "Kuvakoko"
 
-#: src/interface.c:417
+#: src/interface.c:404
 msgid "File size"
 msgstr "Tiedostokoko"
 
-#: src/interface.c:418
+#: src/interface.c:405
 msgid "Byte size"
 msgstr "Tavukoko"
 
-#: src/interface.c:423 src/interface.c:1891
+#: src/interface.c:410 src/interface.c:1760
 msgid "FPS"
 msgstr "FPS"
 
-#: src/interface.c:428
+#: src/interface.c:415
 msgid "Frames"
 msgstr "Kuvia"
 
-#: src/interface.c:429
+#: src/interface.c:416
 msgid "Events"
 msgstr "Tapahtumat"
 
-#: src/interface.c:434 src/interface.c:500 src/interface.c:542
+#: src/interface.c:421 src/interface.c:486 src/interface.c:528
 msgid "Total time"
 msgstr "Kokonaisaika"
 
-#: src/interface.c:486 src/resample.c:1488
+#: src/interface.c:472 src/resample.c:1460
 msgid "Audio"
 msgstr "Ääni"
 
-#: src/interface.c:511 src/interface.c:553
+#: src/interface.c:497 src/interface.c:539
 msgid "Rate/size"
 msgstr ""
 
-#: src/interface.c:530
+#: src/interface.c:516
 msgid "Right audio"
 msgstr "Oikea ääni"
 
-#: src/interface.c:622
+#: src/interface.c:607
 msgid "LiVES: - Encoding options"
 msgstr ""
 
-#: src/interface.c:636
+#: src/interface.c:621
 msgid "<------------- (Check the box to re_size as suggested)"
 msgstr ""
 
-#: src/interface.c:637
+#: src/interface.c:622
 msgid "<------------- (Check the box to use the _size recommendation)"
 msgstr ""
 
-#: src/interface.c:662
+#: src/interface.c:646
 msgid "Use _letterboxing to maintain aspect ratio (optional)"
 msgstr ""
 
-#: src/interface.c:663
+#: src/interface.c:647
 msgid ""
 "Draw black rectangles either above or to the sides of the image, to prevent "
 "it from stretching."
 msgstr ""
 
-#: src/interface.c:694
+#: src/interface.c:677
 msgid "Keep _my settings"
 msgstr "Pidä _Omat asetukset"
 
-#: src/interface.c:695
+#: src/interface.c:678
 msgid "Use _recommended settings"
 msgstr "Käytä _suositeltuja asetuksia"
 
-#: src/interface.c:775 src/dialogs.c:114
-msgid ""
-"Do _not show this warning any more\n"
-"(can be turned back on from Preferences/Warnings)"
-msgstr ""
-"_Älä näytä tätä varoitusta enää uudestaan\n"
-"(varoituksen voi laittaa takaisin päälle kohdasta Asetukset/Varoitukset)"
-
-#: src/interface.c:787
-msgid "Show _Details"
-msgstr "Näytä _tiedot"
-
-#: src/interface.c:881
+#: src/interface.c:769
 msgid "_Close Window"
 msgstr "_Sulje ikkuna"
 
-#: src/interface.c:883
+#: src/interface.c:771
 msgid "_Save to file"
 msgstr "_Tallenna tiedoston"
 
-#: src/interface.c:928
+#: src/interface.c:816
 msgid "LiVES: - Insert"
 msgstr "LiVES: - Lisäys"
 
-#: src/interface.c:945
+#: src/interface.c:833
 msgid "_Number of times to insert"
 msgstr "_Lisäyskertojen määrä"
 
-#: src/interface.c:954
+#: src/interface.c:842
 msgid "_Insert to fit audio"
 msgstr ""
 
-#: src/interface.c:968
+#: src/interface.c:856
 msgid "Insert _before selection"
 msgstr "Lisää valinnan _eteen"
 
-#: src/interface.c:970
+#: src/interface.c:858
 msgid "Insert clipboard before selected frames"
 msgstr "Lisää leikepöydän sisältö valittujen kuvien eteen"
 
-#: src/interface.c:986
+#: src/interface.c:875
 msgid "Insert _after selection"
 msgstr "Lisää valinnan _perään"
 
-#: src/interface.c:988
+#: src/interface.c:877
 msgid "Insert clipboard after selected frames"
 msgstr "Lisää leikepöydän sisältö valittujen kuvien perään"
 
-#: src/interface.c:999
+#: src/interface.c:888
 msgid "Insert _with sound"
 msgstr "Lisää äänen _kanssa"
 
-#: src/interface.c:1012
+#: src/interface.c:901
 msgid "Insert with_out sound"
 msgstr "Lisää _ilman ääntä"
 
-#: src/interface.c:1093
+#: src/interface.c:985
 msgid "LiVES: - Open Selection"
 msgstr "LiVES: - Avaa valinta"
 
-#: src/interface.c:1111
+#: src/interface.c:1004
 msgid "Selection start time (sec)"
 msgstr ""
 
-#: src/interface.c:1117
+#: src/interface.c:1010
 msgid "Number of frames to open"
 msgstr ""
 
-#: src/interface.c:1193
+#: src/interface.c:1088
 msgid "LiVES: - Open Location"
 msgstr "LiVES: - Avaa sijainti"
 
-#: src/interface.c:1195
+#: src/interface.c:1090
 msgid "LiVES: - Open Youtube Clip"
 msgstr ""
 
-#: src/interface.c:1213
+#: src/interface.c:1109
 msgid ""
 "\n"
 "\n"
@@ -1360,7 +1352,7 @@
 "\n"
 msgstr ""
 
-#: src/interface.c:1216
+#: src/interface.c:1112
 msgid ""
 "\n"
 "\n"
@@ -1369,62 +1361,63 @@
 "\n"
 msgstr ""
 
-#: src/interface.c:1220
+#: src/interface.c:1116
 msgid ""
 "Enter the URL of the clip below.\n"
 "E.g: http://www.youtube.com/watch?v=WCR6f6WzjP8\n"
 "\n"
 msgstr ""
 
-#: src/interface.c:1231
+#: src/interface.c:1127
 msgid "URL : "
 msgstr "URL : "
 
-#: src/interface.c:1231
+#: src/interface.c:1127
 msgid "Youtube URL : "
 msgstr ""
 
-#: src/interface.c:1235
+#: src/interface.c:1131
 msgid "Do not send bandwidth information"
 msgstr "Älä lähetä kaistanleveystietoja"
 
-#: src/interface.c:1237
+#: src/interface.c:1133
 msgid "Try this setting if you are having problems getting a stream"
 msgstr ""
 
-#: src/interface.c:1258
+#: src/interface.c:1155
 msgid "Download to _Directory : "
 msgstr ""
 
-#: src/interface.c:1276
+#: src/interface.c:1173
 msgid "Download _File Name : "
 msgstr ""
 
-#: src/interface.c:1281
+#: src/interface.c:1178
 msgid ".webm"
 msgstr ""
 
-#: src/interface.c:1359
+#: src/interface.c:1256
 msgid "LiVES: - Rename Clip"
 msgstr "LiVES: - Nimeä leike uudelleen"
 
-#: src/interface.c:1362
-msgid "LiVES: - Enter Set Name"
+#: src/interface.c:1258
+#, fuzzy
+msgid "LiVES: - Enter Set Name to Save as"
 msgstr "LiVES: - Nimeä leikesarja"
 
-#: src/interface.c:1365
+#: src/interface.c:1260
 msgid "LiVES: - Enter a Set Name to Reload"
 msgstr ""
 
-#: src/interface.c:1368
+#: src/interface.c:1262
 msgid "LiVES: - Choose a Working Directory"
 msgstr "LiVES: - Valitse työkansio"
 
-#: src/interface.c:1371
+#: src/interface.c:1264
 msgid "LiVES: - Rename Current Track"
 msgstr ""
 
-#: src/interface.c:1391
+#: src/interface.c:1283
 msgid ""
 "You need to enter a name for the current clip set.\n"
 "This will allow you reload the layout with the same clips later.\n"
@@ -1432,213 +1425,213 @@
 "LiVES will remind you to save the clip set later when you try to exit.\n"
 msgstr ""
 
-#: src/interface.c:1397
+#: src/interface.c:1289
 msgid ""
 "In order to export this project, you must enter a name for this clip set.\n"
 "This will also be used for the project name.\n"
 msgstr ""
 
-#: src/interface.c:1404
+#: src/interface.c:1296
 msgid ""
 "Welcome to LiVES !\n"
 "This startup wizard will guide you through the\n"
 "initial install so that you can get the most from this application.\n"
 msgstr ""
 
-#: src/interface.c:1408
+#: src/interface.c:1300
 msgid ""
 "\n"
 "First of all you need to choose a working directory for LiVES.\n"
 "This should be a directory with plenty of disk space available.\n"
 msgstr ""
 
-#: src/interface.c:1427
+#: src/interface.c:1317
 msgid "New name "
 msgstr "Uusi nimi "
 
-#: src/interface.c:1430
+#: src/interface.c:1319
 msgid "Set name "
 msgstr "Leikesarjan nimi "
 
-#: src/interface.c:1550
+#: src/interface.c:1435
 msgid "Use def_aults"
 msgstr ""
 
-#: src/interface.c:1553 src/interface.c:1840 src/preferences.c:2515
-#: src/preferences.c:2697
+#: src/interface.c:1437 src/interface.c:1709 src/preferences.c:2550
+#: src/preferences.c:2739
 msgid "_Advanced"
 msgstr "L_isäasetukset"
 
-#: src/interface.c:1604
+#: src/interface.c:1487
 msgid "LiVES:- Select input device"
 msgstr ""
 
-#: src/interface.c:1622
+#: src/interface.c:1504
 msgid "Select input device:"
 msgstr ""
 
-#: src/interface.c:1686
+#: src/interface.c:1568
 msgid "LiVES:- Load CD Track"
 msgstr "LiVES:- Lataa CD-kappale"
 
-#: src/interface.c:1689
+#: src/interface.c:1570
 msgid "LiVES:- Select DVD Title/Chapter"
 msgstr ""
 
-#: src/interface.c:1692
+#: src/interface.c:1572
 msgid "LiVES:- Select VCD Title"
 msgstr ""
 
-#: src/interface.c:1695
+#: src/interface.c:1574
 msgid "LiVES:- Change Maximum Visible Tracks"
 msgstr ""
 
-#: src/interface.c:1698
+#: src/interface.c:1576
 msgid "LiVES:- Device details"
 msgstr "LiVES:- Laitteen tiedot"
 
-#: src/interface.c:1721
+#: src/interface.c:1598
 #, c-format
 msgid "Track to load (from %s)"
 msgstr ""
 
-#: src/interface.c:1724
+#: src/interface.c:1600
 msgid "DVD Title"
 msgstr ""
 
-#: src/interface.c:1727
+#: src/interface.c:1602
 msgid "VCD Title"
 msgstr ""
 
-#: src/interface.c:1730
+#: src/interface.c:1604
 msgid "Maximum number of tracks to display"
 msgstr ""
 
-#: src/interface.c:1733
+#: src/interface.c:1606
 msgid "Device:        /dev/video"
 msgstr "Laite:        /dev/video"
 
-#: src/interface.c:1736
+#: src/interface.c:1608
 msgid "Device:        fw:"
 msgstr "Laite:        fw:"
 
-#: src/interface.c:1771
+#: src/interface.c:1641
 msgid "Chapter  "
 msgstr ""
 
-#: src/interface.c:1776
+#: src/interface.c:1645
 msgid "Channel  "
 msgstr "Kanava  "
 
-#: src/interface.c:1791
+#: src/interface.c:1660
 msgid "Audio ID  "
 msgstr ""
 
-#: src/interface.c:1857
+#: src/interface.c:1726
 msgid "Input number"
 msgstr ""
 
-#: src/interface.c:1865
+#: src/interface.c:1734
 msgid "Use default width, height and FPS"
 msgstr ""
 
-#: src/interface.c:1879
+#: src/interface.c:1748
 msgid "Width"
 msgstr "Leveys"
 
-#: src/interface.c:1885
+#: src/interface.c:1754
 msgid "Height"
 msgstr "Korkeus"
 
-#: src/interface.c:1899
+#: src/interface.c:1768
 msgid "_Driver"
 msgstr ""
 
-#: src/interface.c:1902
+#: src/interface.c:1771
 msgid "_Output format"
 msgstr ""
 
-#: src/interface.c:1998
+#: src/interface.c:1865
 msgid "LiVES:- Fade Audio In"
 msgstr "LiVES:- Häivytys äänen alkuun"
 
-#: src/interface.c:2001
+#: src/interface.c:1867
 msgid "LiVES:- Fade Audio Out"
 msgstr "LiVES:- Häivytys äänen loppuun"
 
-#: src/interface.c:2017
+#: src/interface.c:1883
 msgid "Fade in over  "
 msgstr "Häivytä alusta  "
 
-#: src/interface.c:2018
+#: src/interface.c:1884
 msgid "first"
 msgstr "ensimmäiset"
 
-#: src/interface.c:2021
+#: src/interface.c:1886
 msgid "Fade out over  "
 msgstr "Häivytä lopusta  "
 
-#: src/interface.c:2022
+#: src/interface.c:1887
 msgid "last"
 msgstr "viimeiset"
 
-#: src/interface.c:2044
+#: src/interface.c:1909
 msgid "seconds."
 msgstr "sekuntia."
 
-#: src/interface.c:2052 src/saveplay.c:1507
+#: src/interface.c:1917 src/saveplay.c:1484
 msgid "selection"
 msgstr "valinta"
 
-#: src/interface.c:2092
+#: src/interface.c:1956
 msgid "LiVES: - File Comments (optional)"
 msgstr "LiVES: - Tiedoston kommentit (valinnainen)"
 
-#: src/interface.c:2107
+#: src/interface.c:1971
 msgid "Title/Name : "
 msgstr "Otsikko/Nimi : "
 
-#: src/interface.c:2114
+#: src/interface.c:1978
 msgid "Author/Artist : "
 msgstr "Tekijä/esittäjä : "
 
-#: src/interface.c:2121
+#: src/interface.c:1985
 msgid "Comments : "
 msgstr "Kommentit : "
 
-#: src/interface.c:2151
+#: src/interface.c:2015
 msgid "_Options"
 msgstr ""
 
-#: src/interface.c:2158
+#: src/interface.c:2022
 msgid "Save _subtitles to file"
 msgstr ""
 
-#: src/interface.c:2170
+#: src/interface.c:2033
 msgid "Subtitle file"
 msgstr "Tekstitystiedosto"
 
-#: src/interface.c:2172
+#: src/interface.c:2035
 msgid "Browse..."
 msgstr ""
 
-#: src/interface.c:2255
+#: src/interface.c:2132
 msgid "LiVES: - choose a device"
 msgstr ""
 
-#: src/interface.c:2259
+#: src/interface.c:2135
 msgid "LiVES: - choose a directory"
 msgstr ""
 
-#: src/interface.c:2262
+#: src/interface.c:2137
 msgid "LiVES: - choose a file"
 msgstr ""
 
-#: src/interface.c:2445
+#: src/interface.c:2381
 msgid "LiVES: - Cancel/Discard/Save"
 msgstr "LiVES: - Peru/Hylkää/Tallenna"
 
-#: src/interface.c:2460
+#: src/interface.c:2397
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has not been saved.\n"
@@ -1648,7 +1641,7 @@
 "Nykyistä asettelua ei ole tallennettu.\n"
 "Mitä haluat tehdä?\n"
 
-#: src/interface.c:2463
+#: src/interface.c:2400
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has been changed since the last save.\n"
@@ -1658,7 +1651,7 @@
 "Nykyistä asettelua on muutettu viime tallennuksen jälkeen.\n"
 "Mitä haluat tehdä?\n"
 
-#: src/interface.c:2467
+#: src/interface.c:2404
 msgid ""
 "You are about to exit LiVES.\n"
 "The current clip set can be saved.\n"
@@ -1668,7 +1661,7 @@
 "Nykyinen leikesarja voidaan tallentaa.\n"
 "Mitä haluat tehdä?\n"
 
-#: src/interface.c:2468
+#: src/interface.c:2405
 msgid ""
 "The current clip set has not been saved.\n"
 "What would you like to do ?\n"
@@ -1676,7 +1669,7 @@
 "Nykyistä leikesarjaa ei ole tallennettu.\n"
 "Mitä haluat tehdä?\n"
 
-#: src/interface.c:2472
+#: src/interface.c:2408
 msgid ""
 "The current layout has not been saved.\n"
 "What would you like to do ?\n"
@@ -1684,7 +1677,7 @@
 "Nykyistä asettelua ei ole tallennettu.\n"
 "Mitä haluat tehdä?\n"
 
-#: src/interface.c:2475
+#: src/interface.c:2410
 #, fuzzy
 msgid ""
 "The current layout has *not* been changed since it was last saved.\n"
@@ -1693,52 +1686,52 @@
 "Nykyistä asettelua ei ole tallennettu.\n"
 "Mitä haluat tehdä?\n"
 
-#: src/interface.c:2480
+#: src/interface.c:2415
 msgid ""
 "The current layout contains generated frames and cannot be retained.\n"
 "You may wish to render it before exiting multitrack mode.\n"
 msgstr ""
 
-#: src/interface.c:2483
+#: src/interface.c:2418
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout contains generated frames and cannot be retained.\n"
 "What do you wish to do ?"
 msgstr ""
 
-#: src/interface.c:2496
+#: src/interface.c:2431
 msgid "Clip set _name"
 msgstr "Leikesarjan _nimi"
 
-#: src/interface.c:2502
+#: src/interface.c:2437
 msgid "_Auto reload next time"
 msgstr "Lataa _automaattisesti uudelleen seuraavalla kerralla"
 
-#: src/interface.c:2538 src/interface.c:2547
+#: src/interface.c:2473 src/interface.c:2482
 msgid "_Wipe layout"
 msgstr "_Poista asettelu"
 
-#: src/interface.c:2539
+#: src/interface.c:2474
 msgid "_Ignore changes"
 msgstr "_Hylkää muutokset"
 
-#: src/interface.c:2540
+#: src/interface.c:2475
 msgid "_Delete clip set"
 msgstr "_Poista leikesarja"
 
-#: src/interface.c:2541
+#: src/interface.c:2476
 msgid "_Delete layout"
 msgstr "_Poista asettelu"
 
-#: src/interface.c:2545
+#: src/interface.c:2480
 msgid "_Save layout"
 msgstr "_Tallenna asettelu"
 
-#: src/interface.c:2546
+#: src/interface.c:2481
 msgid "_Save clip set"
 msgstr "_Tallenna leikesarja"
 
-#: src/interface.c:2565
+#: src/interface.c:2502
 msgid ""
 "\n"
 "LiVES has detected a multitrack layout from a previous session.\n"
@@ -1748,57 +1741,57 @@
 "LiVES löysi multitrack-asettelun edellisen istunnon jäljiltä.\n"
 "Haluatko yrittää sen palautusta?\n"
 
-#: src/interface.c:2589
+#: src/interface.c:2528
 msgid "LiVES: - Disk Recovery Options"
 msgstr ""
 
-#: src/interface.c:2608
+#: src/interface.c:2549
 msgid "Delete _Orphaned Clips"
 msgstr ""
 
-#: src/interface.c:2609
+#: src/interface.c:2550
 msgid "Delete any clips which are not currently loaded or part of a set"
 msgstr ""
 
-#: src/interface.c:2622
+#: src/interface.c:2564
 msgid "Clear _Backup Files from Closed Clips"
 msgstr ""
 
-#: src/interface.c:2633
+#: src/interface.c:2575
 msgid "Remove Sets which have _Layouts but no Clips"
 msgstr ""
 
-#: src/interface.c:2644
+#: src/interface.c:2586
 msgid "_Reset to Defaults"
 msgstr ""
 
-#: src/interface.c:2651
+#: src/interface.c:2593
 msgid "_Accept"
 msgstr ""
 
-#: src/callbacks.c:198
+#: src/callbacks.c:208
 #, c-format
 msgid "Saving as set %s..."
 msgstr ""
 
-#: src/callbacks.c:833
+#: src/callbacks.c:852
 msgid "Please enter the name of the file to save the clip as.\n"
 msgstr ""
 
-#: src/callbacks.c:841
+#: src/callbacks.c:860
 msgid "Please enter a valid URL for the download.\n"
 msgstr ""
 
-#: src/callbacks.c:867
+#: src/callbacks.c:886
 #, c-format
 msgid "Downloading %s to %s..."
 msgstr ""
 
-#: src/callbacks.c:895
+#: src/callbacks.c:912
 msgid "Downloading clip"
 msgstr ""
 
-#: src/callbacks.c:933
+#: src/callbacks.c:950
 msgid ""
 "\n"
 "LiVES was unable to download the clip.\n"
@@ -1806,17 +1799,17 @@
 "the latest youtube-dl installed.\n"
 msgstr ""
 
-#: src/callbacks.c:1114 src/callbacks.c:1149
+#: src/callbacks.c:1131 src/callbacks.c:1166
 msgid "This file"
 msgstr "Tämä tiedosto"
 
-#: src/callbacks.c:1115
+#: src/callbacks.c:1132
 msgid ""
 ",\n"
 " - including the current layout - "
 msgstr ""
 
-#: src/callbacks.c:1117
+#: src/callbacks.c:1134
 #, c-format
 msgid ""
 "\n"
@@ -1826,7 +1819,7 @@
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1119
+#: src/callbacks.c:1136
 #, c-format
 msgid ""
 "\n"
@@ -1836,14 +1829,14 @@
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1150
+#: src/callbacks.c:1167
 msgid ""
 "Changes made to this clip have not been saved or backed up.\n"
 "\n"
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1343
+#: src/callbacks.c:1356
 msgid ""
 "\n"
 "Invalid project file.\n"
@@ -1851,7 +1844,7 @@
 "\n"
 "Virheellinen projektitiedosto.\n"
 
-#: src/callbacks.c:1356
+#: src/callbacks.c:1370
 #, c-format
 msgid ""
 "\n"
@@ -1864,33 +1857,33 @@
 "Once you have done this, you will be able to import the new project.\n"
 msgstr ""
 
-#: src/callbacks.c:1366
+#: src/callbacks.c:1381
 #, c-format
 msgid "Importing the project %s as set %s..."
 msgstr ""
 
-#: src/callbacks.c:1386
+#: src/callbacks.c:1399
 msgid "Importing project"
 msgstr ""
 
-#: src/callbacks.c:1472
+#: src/callbacks.c:1481
 #, c-format
 msgid "Exporting project %s..."
 msgstr ""
 
-#: src/callbacks.c:1490
+#: src/callbacks.c:1497
 msgid "Exporting project"
 msgstr ""
 
-#: src/callbacks.c:1506
+#: src/callbacks.c:1513
 msgid "Backup as .lv1 file"
 msgstr "Varmuuskopioi .lv1-tiedostoon"
 
-#: src/callbacks.c:1522
+#: src/callbacks.c:1529
 msgid "Restore .lv1 file"
 msgstr "Palauta .lv1-tiedosto"
 
-#: src/callbacks.c:1664
+#: src/callbacks.c:1671
 msgid ""
 "\n"
 "\n"
@@ -1902,72 +1895,77 @@
 "Leikesarja poistetaan levyltä.\n"
 "Haluatko varmasti tehdä tämän?\n"
 
-#: src/callbacks.c:1725
+#: src/callbacks.c:1732
 #, c-format
 msgid "Deleting set %s..."
 msgstr ""
 
-#: src/callbacks.c:1727
+#: src/callbacks.c:1734
 msgid "Deleting set..."
 msgstr "Poistetaan leikesarja..."
 
-#: src/callbacks.c:1731
+#: src/callbacks.c:1738
 msgid "Deleting set"
 msgstr "Poistetaan leikesarja"
 
-#: src/callbacks.c:1739
+#: src/callbacks.c:1746
 #, c-format
 msgid "Set %s was permanently deleted from the disk.\n"
 msgstr "Leikesarja %s poistettiin lopullisesti levyltä.\n"
 
-#: src/callbacks.c:1787 src/callbacks.c:11764
+#: src/callbacks.c:1792 src/callbacks.c:11676
 msgid "Insert Silence"
 msgstr ""
 
-#: src/callbacks.c:1840 src/callbacks.c:1923 src/callbacks.c:2086
+#: src/callbacks.c:1844 src/callbacks.c:1927 src/callbacks.c:2089
 msgid "Undoing"
 msgstr "Kumotaan"
 
-#: src/callbacks.c:1936 src/callbacks.c:2147
+#: src/callbacks.c:1940 src/callbacks.c:2150
 msgid "Restoring audio..."
 msgstr ""
 
-#: src/callbacks.c:1952
+#: src/callbacks.c:1956
 msgid "Clearing frame images"
 msgstr ""
 
-#: src/callbacks.c:1985
+#: src/callbacks.c:1988
 msgid "Deleting excess frames"
 msgstr ""
 
-#: src/callbacks.c:2229
+#: src/callbacks.c:2232
 #, c-format
 msgid "Length of video is now %d frames at %.3f frames per second.\n"
 msgstr "Videon pituus on nyt %d kuvaa nopeudella %.3f kuvaa sekunnissa.\n"
 
-#: src/callbacks.c:2233 src/resample.c:683 src/resample.c:2166
+#: src/callbacks.c:2235 src/resample.c:678 src/resample.c:2133
 #, c-format
 msgid "Clipboard was resampled to %d frames.\n"
 msgstr ""
 
-#: src/callbacks.c:2394 src/callbacks.c:2423
+#: src/callbacks.c:2396 src/callbacks.c:2425
 msgid "Redoing"
 msgstr ""
 
-#: src/callbacks.c:2462
-#, c-format
-msgid "Copying frames %d to %d%s to the clipboard..."
+#: src/callbacks.c:2472
+#, fuzzy, c-format
+msgid "Copying frames %d to %d (with sound) to the clipboard..."
+msgstr "Kopioidaan kuvat %d - %d%s leikepöydälle..."
+
+#: src/callbacks.c:2474
+#, fuzzy, c-format
+msgid "Copying frames %d to %d to the clipboard..."
 msgstr "Kopioidaan kuvat %d - %d%s leikepöydälle..."
 
-#: src/callbacks.c:2525
+#: src/callbacks.c:2526
 msgid "Copying to the clipboard"
 msgstr "Kopioidaan leikepöydälle"
 
-#: src/callbacks.c:2600
+#: src/callbacks.c:2601
 msgid "Cut"
 msgstr "Leikkaa"
 
-#: src/callbacks.c:2641 src/callbacks.c:3068 src/callbacks.c:8026
+#: src/callbacks.c:2641 src/callbacks.c:3063 src/callbacks.c:7631
 #, fuzzy
 msgid "Pulling frames from clipboard"
 msgstr "Lisätään %d%s kuvaa leikepöydältä..."
@@ -1977,22 +1975,22 @@
 msgid "Pasting %d frames to new clip %s..."
 msgstr ""
 
-#: src/callbacks.c:2678
+#: src/callbacks.c:2676
 msgid "Pasting"
 msgstr "Liitetään"
 
-#: src/callbacks.c:2694
+#: src/callbacks.c:2692
 msgid "...added audio..."
 msgstr ""
 
-#: src/callbacks.c:2778
+#: src/callbacks.c:2775
 msgid ""
 "This operation requires resizing or converting of frames.\n"
 "Please install 'convert' from the Image-magick package, and then restart "
 "LiVES.\n"
 msgstr ""
 
-#: src/callbacks.c:2795
+#: src/callbacks.c:2793
 msgid ""
 "\n"
 "\n"
@@ -2001,31 +1999,31 @@
 "the 'Trim Audio' function from the Audio menu."
 msgstr ""
 
-#: src/callbacks.c:2819
+#: src/callbacks.c:2817
 msgid ""
 "LiVES cannot insert because the audio rates do not match.\n"
 "Please install 'sox', and try again."
 msgstr ""
 
-#: src/callbacks.c:2838
+#: src/callbacks.c:2835
 msgid ""
 "\n"
 "Insertion will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:2888 src/callbacks.c:11692
+#: src/callbacks.c:2883 src/callbacks.c:11606
 msgid ""
 "\n"
 "Insertion will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:2996 src/callbacks.c:3025
+#: src/callbacks.c:2987 src/callbacks.c:3016
 msgid "Resampling clipboard audio"
 msgstr ""
 
-#: src/callbacks.c:3041
+#: src/callbacks.c:3032
 msgid ""
 "\n"
 "\n"
@@ -2033,7 +2031,7 @@
 "Clipboard audio has been erased.\n"
 msgstr ""
 
-#: src/callbacks.c:3055
+#: src/callbacks.c:3045
 msgid ""
 "\n"
 "\n"
@@ -2042,30 +2040,30 @@
 "using unchanged audio ?\n"
 msgstr ""
 
-#: src/callbacks.c:3137 src/callbacks.c:3311
+#: src/callbacks.c:3132 src/callbacks.c:3299
 #, c-format
 msgid "Inserting %d%s frames from the clipboard..."
 msgstr "Lisätään %d%s kuvaa leikepöydältä..."
 
-#: src/callbacks.c:3162 src/callbacks.c:3236 src/callbacks.c:3339
+#: src/callbacks.c:3155 src/callbacks.c:3224 src/callbacks.c:3325
 msgid "Inserting"
 msgstr "Lisätään"
 
-#: src/callbacks.c:3193
+#: src/callbacks.c:3187
 #, c-format
 msgid "Inserting %d times from the clipboard%s..."
 msgstr "Lisätään %d kertaa leikepöydältä%s..."
 
-#: src/callbacks.c:3200
+#: src/callbacks.c:3191
 #, c-format
 msgid "Inserting %d frames from the clipboard%s..."
 msgstr "Lisätään %d kuvaa leikepöydältä%s..."
 
-#: src/callbacks.c:3418
+#: src/callbacks.c:3404
 msgid "Insert"
 msgstr "Lisäys"
 
-#: src/callbacks.c:3486
+#: src/callbacks.c:3471
 msgid ""
 "\n"
 "Deleting all frames will close this file.\n"
@@ -2075,49 +2073,49 @@
 "Kaikkien kuvien poisto sulkee tämän tiedoston.\n"
 "Haluatko varmasti tehdä tämän?"
 
-#: src/callbacks.c:3495
+#: src/callbacks.c:3480
 msgid ""
 "\n"
 "Deletion will cause missing frames in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3515 src/callbacks.c:10920 src/callbacks.c:11162
-#: src/callbacks.c:11228
+#: src/callbacks.c:3500 src/callbacks.c:10851 src/callbacks.c:11087
+#: src/callbacks.c:11152
 msgid ""
 "\n"
 "Deletion will cause missing audio in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3534
+#: src/callbacks.c:3519
 msgid ""
 "\n"
 "Deletion will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3553 src/callbacks.c:11210
+#: src/callbacks.c:3538 src/callbacks.c:11134
 msgid ""
 "\n"
 "Deletion will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3611
+#: src/callbacks.c:3597
 #, c-format
 msgid "Deleting frames %d to %d%s..."
 msgstr "Poistetaan kuvat %d - %d%s..."
 
-#: src/callbacks.c:3636
+#: src/callbacks.c:3619
 msgid "Deleting"
 msgstr "Poistetaan"
 
-#: src/callbacks.c:3717
+#: src/callbacks.c:3699
 msgid "Delete"
 msgstr "Poisto"
 
-#: src/callbacks.c:3738
+#: src/callbacks.c:3717
 msgid ""
 "\n"
 "\n"
@@ -2127,7 +2125,7 @@
 "\n"
 "Valinta on lukittu.\n"
 
-#: src/callbacks.c:4092
+#: src/callbacks.c:4056
 msgid ""
 "Ready to record. Use 'control' and cursor keys during playback to record "
 "your performance.\n"
@@ -2135,11 +2133,11 @@
 "play.)\n"
 msgstr ""
 
-#: src/callbacks.c:4098
+#: src/callbacks.c:4061
 msgid "Record cancelled.\n"
 msgstr "Nauhoitus peruttu.\n"
 
-#: src/callbacks.c:4237
+#: src/callbacks.c:4197
 #, c-format
 msgid ""
 "\n"
@@ -2152,7 +2150,7 @@
 "'%s'-liitännäinen ilmoittaa:\n"
 "%s\n"
 
-#: src/callbacks.c:4241
+#: src/callbacks.c:4200
 #, c-format
 msgid ""
 "\n"
@@ -2165,7 +2163,7 @@
 "Liitännäisestä %s ei löytynyt 'init'-metodia.\n"
 "Liitännäinen saattaa olla rikki tai virheellisesti asennettu."
 
-#: src/callbacks.c:4571
+#: src/callbacks.c:4532
 #, c-format
 msgid ""
 "Saving the set will cause copies of all loaded clips to remain on the disk"
@@ -2174,22 +2172,22 @@
 "Please press 'Cancel' if that is not what you want.\n"
 msgstr ""
 
-#: src/callbacks.c:4654
+#: src/callbacks.c:4617
 #, c-format
 msgid "Saving set %s"
 msgstr "Tallennetaan leikesarja %s"
 
-#: src/callbacks.c:5005
+#: src/callbacks.c:4964
 #, c-format
 msgid "Loading clips from set %s"
 msgstr "Ladataan leikkeet leikesarjasta %s"
 
-#: src/callbacks.c:5093
+#: src/callbacks.c:5051
 #, c-format
 msgid "%d clips and %d layouts were recovered from set (%s).\n"
 msgstr ""
 
-#: src/callbacks.c:5312
+#: src/callbacks.c:5259
 msgid ""
 "LiVES will attempt to recover some disk space.\n"
 "You should ONLY run this if you have no other copies of LiVES running on "
@@ -2201,24 +2199,24 @@
 "kopioita LiVESistä.\n"
 "Napsauta OK jatkaaksesi.\n"
 
-#: src/callbacks.c:5317
+#: src/callbacks.c:5264
 msgid "Cleaning up disk space..."
 msgstr ""
 
-#: src/callbacks.c:5387
+#: src/callbacks.c:5334
 msgid "Recovering disk space"
 msgstr ""
 
-#: src/callbacks.c:5439
+#: src/callbacks.c:5386
 #, c-format
 msgid "%s of disk space was recovered.\n"
 msgstr ""
 
-#: src/callbacks.c:5482
+#: src/callbacks.c:5428
 msgid "Resetting frame rates and frame values..."
 msgstr ""
 
-#: src/callbacks.c:5523
+#: src/callbacks.c:5469
 #, c-format
 msgid ""
 "\n"
@@ -2226,12 +2224,12 @@
 "Internal: %s (%d bpp) / %s\n"
 msgstr ""
 
-#: src/callbacks.c:5525
+#: src/callbacks.c:5471
 msgid "buffered"
 msgstr ""
 
-#: src/callbacks.c:5538 src/callbacks.c:5557 src/callbacks.c:5575
-#: src/callbacks.c:5609
+#: src/callbacks.c:5484 src/callbacks.c:5502 src/callbacks.c:5518
+#: src/callbacks.c:5551
 msgid ""
 "\n"
 "  Opening..."
@@ -2239,28 +2237,28 @@
 "\n"
 "  Avataan..."
 
-#: src/callbacks.c:5545
+#: src/callbacks.c:5490
 #, c-format
 msgid ""
 "\n"
 "(%d virtual)"
 msgstr ""
 
-#: src/callbacks.c:5548
+#: src/callbacks.c:5493
 #, c-format
 msgid ""
 "\n"
 "(%d decoded)"
 msgstr ""
 
-#: src/callbacks.c:5560 src/callbacks.c:5578 src/callbacks.c:5612
+#: src/callbacks.c:5504 src/callbacks.c:5520 src/callbacks.c:5553
 #, c-format
 msgid ""
 "\n"
 "  %.2f sec."
 msgstr ""
 
-#: src/callbacks.c:5569
+#: src/callbacks.c:5512
 msgid ""
 "\n"
 "  Unknown"
@@ -2268,30 +2266,30 @@
 "\n"
 "  Tuntematon"
 
-#: src/callbacks.c:5582 src/callbacks.c:5596
+#: src/callbacks.c:5524 src/callbacks.c:5538
 msgid "unsigned"
 msgstr ""
 
-#: src/callbacks.c:5583 src/callbacks.c:5597
+#: src/callbacks.c:5525 src/callbacks.c:5539
 msgid "signed"
 msgstr ""
 
-#: src/callbacks.c:5585 src/callbacks.c:5599
+#: src/callbacks.c:5527 src/callbacks.c:5541
 msgid "big-endian"
 msgstr ""
 
-#: src/callbacks.c:5586 src/callbacks.c:5600
+#: src/callbacks.c:5528 src/callbacks.c:5542
 msgid "little-endian"
 msgstr ""
 
-#: src/callbacks.c:5588 src/callbacks.c:5602
+#: src/callbacks.c:5530 src/callbacks.c:5544
 #, c-format
 msgid ""
 "  %d Hz %d bit\n"
 "%s %s"
 msgstr ""
 
-#: src/callbacks.c:5707
+#: src/callbacks.c:5647
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -2308,15 +2306,15 @@
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA.\n"
 msgstr ""
 
-#: src/callbacks.c:5721
+#: src/callbacks.c:5661
 msgid "A video editor and VJ program."
 msgstr "Videomuokkain ja VJ-ohjelma."
 
-#: src/callbacks.c:5722
+#: src/callbacks.c:5662
 msgid "About LiVES"
 msgstr ""
 
-#: src/callbacks.c:5724
+#: src/callbacks.c:5664
 msgid "translator_credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -2325,7 +2323,7 @@
 "  Mikko Nissinen https://launchpad.net/~mikko\n"
 "  salsaman https://launchpad.net/~salsaman"
 
-#: src/callbacks.c:5758
+#: src/callbacks.c:5699
 #, c-format
 msgid ""
 "LiVES Version %s\n"
@@ -2339,7 +2337,7 @@
 "Homepage: http://lives.sourceforge.net"
 msgstr ""
 
-#: src/callbacks.c:6037
+#: src/callbacks.c:5996
 #, fuzzy
 msgid ""
 "\n"
@@ -2350,7 +2348,7 @@
 "\n"
 "Tämän tiedoston esikatselu onnistuu ainoastaan jos mplayer on asennettuna.\n"
 
-#: src/callbacks.c:6040
+#: src/callbacks.c:5998
 #, fuzzy
 msgid ""
 "\n"
@@ -2362,215 +2360,206 @@
 "\n"
 "Tämän tiedoston esikatselu onnistuu ainoastaan jos mplayer on asennettuna.\n"
 
-#: src/callbacks.c:6423 src/callbacks.c:8289
-msgid ""
-"\n"
-"Loading new audio may cause missing audio in some multitrack layouts.\n"
-"Are you sure you wish to continue ?\n"
-"."
-msgstr ""
-
-#: src/callbacks.c:6523
-#, c-format
-msgid "Opening audio %s, type %s..."
-msgstr "Avataan äänitiedosto %s, tyyppi %s..."
-
-#: src/callbacks.c:6556 src/saveplay.c:480
-msgid "Opening audio"
-msgstr "Avataan äänitiedosto"
-
-#: src/callbacks.c:6565 src/callbacks.c:6612 src/callbacks.c:8387
-#: src/callbacks.c:8429 src/callbacks.c:8472 src/callbacks.c:10846
-msgid "Cancelling"
-msgstr "Perutaan"
-
-#: src/callbacks.c:6660 src/callbacks.c:8514 src/callbacks.c:10876
-#: src/callbacks.c:11563
-msgid "Committing audio"
-msgstr ""
-
-#: src/callbacks.c:6672 src/callbacks.c:8546
-msgid "New Audio"
-msgstr "Uusi ääniraita"
-
-#: src/callbacks.c:6779
+#: src/callbacks.c:6459
 #, c-format
 msgid ""
 "Text was saved as\n"
 "%s\n"
 msgstr ""
 
-#: src/callbacks.c:6951 src/saveplay.c:3618
-#, c-format
-msgid "%d frames are enough !\n"
-msgstr ""
-
-#: src/callbacks.c:7050
+#: src/callbacks.c:6706
 msgid "LiVES: - Encoder debug output"
 msgstr ""
 
-#: src/callbacks.c:7087 src/gui.c:1922
+#: src/callbacks.c:6743 src/gui.c:1921
 msgid "Fullscreen playback (f)"
 msgstr ""
 
-#: src/callbacks.c:7089
+#: src/callbacks.c:6744
 msgid "Fullscreen playback off (f)"
 msgstr ""
 
-#: src/callbacks.c:7188 src/callbacks.c:7336 src/callbacks.c:7664
-#: src/callbacks.c:7681 src/gui.c:3712 src/saveplay.c:2467 src/saveplay.c:2501
-#: src/saveplay.c:3115 src/saveplay.c:3220 src/saveplay.c:3239
-#: src/multitrack.c:9340 src/multitrack.c:11060
+#: src/callbacks.c:6841 src/callbacks.c:6983 src/callbacks.c:7283
+#: src/callbacks.c:7298 src/gui.c:3838 src/saveplay.c:2442 src/saveplay.c:2475
+#: src/saveplay.c:3074 src/saveplay.c:3178 src/saveplay.c:3197
+#: src/multitrack.c:9526 src/multitrack.c:11288
 #, c-format
 msgid " (%d %% scale)"
 msgstr ""
 
-#: src/callbacks.c:7190 src/callbacks.c:7338 src/callbacks.c:7666
-#: src/gui.c:3716 src/saveplay.c:2469 src/saveplay.c:2503
+#: src/callbacks.c:6843 src/callbacks.c:6985 src/callbacks.c:7285
+#: src/gui.c:3842 src/saveplay.c:2444 src/saveplay.c:2477
 #, c-format
 msgid "LiVES: - Play Window%s"
 msgstr ""
 
-#: src/callbacks.c:7302 src/gui.c:1907
+#: src/callbacks.c:6950 src/gui.c:1906
 msgid "Double size (d)"
 msgstr ""
 
-#: src/callbacks.c:7309
+#: src/callbacks.c:6956
 msgid "Single size (d)"
 msgstr ""
 
-#: src/callbacks.c:7442 src/callbacks.c:7443
+#: src/callbacks.c:7087 src/callbacks.c:7088
 msgid "Hide the play window (s)"
 msgstr "Piilota toistoikkuna (s)"
 
-#: src/callbacks.c:7452 src/gui.c:1746
+#: src/callbacks.c:7096 src/gui.c:1744
 msgid "Show the play window (s)"
 msgstr "Näytä toistoikkuna (s)"
 
-#: src/callbacks.c:7453 src/gui.c:1896
+#: src/callbacks.c:7097 src/gui.c:1895
 msgid "Play in separate window (s)"
 msgstr "Toista erillisessä ikkunassa (s)"
 
-#: src/callbacks.c:7535 src/gui.c:4060 src/saveplay.c:2498
+#: src/callbacks.c:7175 src/gui.c:4169 src/saveplay.c:2472
 msgid "LiVES: - Streaming"
 msgstr ""
 
-#: src/callbacks.c:7778
+#: src/callbacks.c:7388
 msgid "Switch continuous looping off (o)"
 msgstr ""
 
-#: src/callbacks.c:7785 src/gui.c:1795
+#: src/callbacks.c:7394 src/gui.c:1793
 msgid "Switch continuous looping on (o)"
 msgstr ""
 
-#: src/callbacks.c:7837
+#: src/callbacks.c:7444
 #, c-format
 msgid "Audio volume (%.2f)"
 msgstr "Äänenvoimakkuus (%.2f)"
 
-#: src/callbacks.c:7876 src/callbacks.c:7877 src/gui.c:3640
+#: src/callbacks.c:7483 src/callbacks.c:7484 src/gui.c:3766
 msgid "Unmute the audio (z)"
 msgstr "Palauta ääni (z)"
 
-#: src/callbacks.c:7888 src/callbacks.c:7889 src/gui.c:1808 src/gui.c:3639
+#: src/callbacks.c:7494 src/callbacks.c:7495 src/gui.c:1806 src/gui.c:3765
 msgid "Mute the audio (z)"
 msgstr "Vaimenna ääni (z)"
 
-#: src/callbacks.c:8038
+#: src/callbacks.c:7643
 msgid "Reversing clipboard..."
 msgstr "Käännetään leikepöydän järjestys..."
 
-#: src/callbacks.c:8052
+#: src/callbacks.c:7657
 msgid "Reversing clipboard"
 msgstr "Käännetään leikepöydän järjestys"
 
-#: src/callbacks.c:8084
+#: src/callbacks.c:7689
 msgid "LiVES: Load subtitles from..."
 msgstr ""
 
-#: src/callbacks.c:8151 src/saveplay.c:970
+#: src/callbacks.c:7753 src/saveplay.c:956
 #, c-format
 msgid "Loaded subtitle file: %s\n"
 msgstr "Ladattiin tekstitystiedosto: %s\n"
 
-#: src/callbacks.c:8220
+#: src/callbacks.c:7821
 msgid "Subtitles were erased.\n"
 msgstr ""
 
-#: src/callbacks.c:8239
+#: src/callbacks.c:7843
 msgid "LiVES: - Select Audio File"
 msgstr ""
 
-#: src/callbacks.c:8250
+#: src/callbacks.c:7878 src/callbacks.c:8232
+msgid ""
+"\n"
+"Loading new audio may cause missing audio in some multitrack layouts.\n"
+"Are you sure you wish to continue ?\n"
+"."
+msgstr ""
+
+#: src/callbacks.c:7989
+#, c-format
+msgid "Opening audio %s, type %s..."
+msgstr "Avataan äänitiedosto %s, tyyppi %s..."
+
+#: src/callbacks.c:8023 src/saveplay.c:477
+msgid "Opening audio"
+msgstr "Avataan äänitiedosto"
+
+#: src/callbacks.c:8032 src/callbacks.c:8083 src/callbacks.c:8327
+#: src/callbacks.c:8369 src/callbacks.c:8412 src/callbacks.c:10766
+msgid "Cancelling"
+msgstr "Perutaan"
+
+#: src/callbacks.c:8137 src/callbacks.c:8454 src/callbacks.c:10803
+#: src/callbacks.c:11477
+msgid "Committing audio"
+msgstr ""
+
+#: src/callbacks.c:8153 src/callbacks.c:8484
+msgid "New Audio"
+msgstr "Uusi ääniraita"
+
+#: src/callbacks.c:8194
 msgid "Please set your CD play device in Tools | Preferences | Misc\n"
 msgstr "Määritä CD-soittolaite kohdasta Työkalut | Asetukset | Sekalaiset\n"
 
-#: src/callbacks.c:8321
+#: src/callbacks.c:8264
 #, c-format
 msgid "Opening CD track %d from %s..."
 msgstr ""
 
-#: src/callbacks.c:8326
+#: src/callbacks.c:8267
 #, c-format
 msgid "CD track %d"
 msgstr "CD-raita %d"
 
-#: src/callbacks.c:8373
+#: src/callbacks.c:8313
 msgid "Opening CD track..."
 msgstr "Avataan CD-raita..."
 
-#: src/callbacks.c:8415 src/callbacks.c:8461
+#: src/callbacks.c:8355 src/callbacks.c:8401
 msgid "Error loading CD track\n"
 msgstr "Virhe ladattaessa CD-raitaa\n"
 
-#: src/callbacks.c:8584
+#: src/callbacks.c:8518
 msgid "layout errors"
 msgstr ""
 
-#: src/callbacks.c:8595
+#: src/callbacks.c:8529
 msgid "Close _Window"
 msgstr "Sulje _ikkuna"
 
-#: src/callbacks.c:8606
+#: src/callbacks.c:8540
 msgid "Clear _Errors"
 msgstr ""
 
-#: src/callbacks.c:8617
+#: src/callbacks.c:8551
 msgid "_Delete affected layouts"
 msgstr ""
 
-#: src/callbacks.c:9343 src/callbacks.c:9388
+#: src/callbacks.c:9253 src/callbacks.c:9298
 msgid "Resume"
 msgstr "Jatka"
 
-#: src/callbacks.c:9344
+#: src/callbacks.c:9254
 msgid ""
 "\n"
 "Paused\n"
 "(click Resume to continue processing)"
 msgstr ""
 
-#: src/callbacks.c:9345 src/callbacks.c:9406
+#: src/callbacks.c:9255 src/callbacks.c:9315
 msgid "paused..."
 msgstr "pysäytetty..."
 
-#: src/callbacks.c:9372 src/callbacks.c:9418
-msgid "Pause"
-msgstr "Pysäytä"
-
-#: src/callbacks.c:9374 src/callbacks.c:9421
+#: src/callbacks.c:9284 src/callbacks.c:9333
 msgid "resumed..."
 msgstr "jatketaan..."
 
-#: src/callbacks.c:9393
+#: src/callbacks.c:9303
 msgid "Keep"
 msgstr "Pidä"
 
-#: src/callbacks.c:9396
+#: src/callbacks.c:9305
 msgid "Enough"
 msgstr ""
 
-#: src/callbacks.c:9401
+#: src/callbacks.c:9310
 #, c-format
 msgid ""
 "\n"
@@ -2579,28 +2568,28 @@
 "(click Resume to continue processing)"
 msgstr ""
 
-#: src/callbacks.c:9419
+#: src/callbacks.c:9331
 msgid "Cancel"
 msgstr "Peruuta"
 
-#: src/callbacks.c:9558
+#: src/callbacks.c:9478
 msgid "Stop"
 msgstr ""
 
-#: src/callbacks.c:10053 src/multitrack.c:13247
+#: src/callbacks.c:9968 src/multitrack.c:13489
 msgid "LiVES: Selected frame"
 msgstr ""
 
-#: src/callbacks.c:10061
+#: src/callbacks.c:9976
 msgid "_Save frame as..."
 msgstr ""
 
-#: src/callbacks.c:10290
+#: src/callbacks.c:10202
 #, c-format
 msgid "Audio is ahead of video by %.4f secs. at frame %d, with fps %.4f\n"
 msgstr ""
 
-#: src/callbacks.c:10347
+#: src/callbacks.c:10255
 msgid ""
 "\n"
 "\n"
@@ -2609,7 +2598,7 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10353
+#: src/callbacks.c:10261
 msgid ""
 "\n"
 "\n"
@@ -2621,7 +2610,7 @@
 "Tätä ominaisuutta voi käyttää vain jos \"xwininfo\" on asennettuna\n"
 "\n"
 
-#: src/callbacks.c:10429 src/callbacks.c:11479
+#: src/callbacks.c:10334 src/callbacks.c:11395
 msgid ""
 "\n"
 "Record time must be greater than 0.\n"
@@ -2629,7 +2618,7 @@
 "\n"
 "Tallennusajan tulee olla pidempi kuin 0.\n"
 
-#: src/callbacks.c:10440
+#: src/callbacks.c:10346
 msgid ""
 "Capture an External Window:\n"
 "\n"
@@ -2644,11 +2633,11 @@
 "Napsauta \"Peruuta\" peruaksesi toiminnon\n"
 "\n"
 
-#: src/callbacks.c:10445
+#: src/callbacks.c:10351
 msgid "External window was released.\n"
 msgstr "Ulkoinen ikkuna vapautettiin.\n"
 
-#: src/callbacks.c:10479
+#: src/callbacks.c:10385
 msgid ""
 "Click on a Window to Capture it\n"
 "Press 'q' to stop recording"
@@ -2656,7 +2645,7 @@
 "Napsauta haluamaasi ikkunaa kaapataksesi sen\n"
 "Paina \"q\" lopettaaksesi nauhoituksen."
 
-#: src/callbacks.c:10513
+#: src/callbacks.c:10419
 #, c-format
 msgid ""
 "\n"
@@ -2666,20 +2655,20 @@
 "(Default of %.3f frames per second will be used.)\n"
 msgstr ""
 
-#: src/callbacks.c:10539
+#: src/callbacks.c:10443
 msgid "LiVES was unable to capture this window. Sorry.\n"
 msgstr ""
 "LiVES ei pystynyt kaappaamaan tästä ikkunasta. Pahoittelemme tapahtunutta.\n"
 
-#: src/callbacks.c:10695
+#: src/callbacks.c:10601
 msgid "Export Selected Audio as..."
 msgstr "Vie valittu äänijakso tiedostoon..."
 
-#: src/callbacks.c:10699
+#: src/callbacks.c:10604
 msgid "Export Audio as..."
 msgstr "Vie ääniraita tiedostoon..."
 
-#: src/callbacks.c:10714
+#: src/callbacks.c:10619
 msgid ""
 "\n"
 "\n"
@@ -2693,86 +2682,86 @@
 "Napsauta \"OK\" viedäksesi uudella nopeudella, tai \"Peruuta\" viedäksesi "
 "alkuperäisellä nopeudella.\n"
 
-#: src/callbacks.c:10720
+#: src/callbacks.c:10625
 #, c-format
 msgid "Exporting audio frames %d to %d as %s..."
 msgstr "Viedään äänijakso %d - %d tiedostoon %s..."
 
-#: src/callbacks.c:10725
+#: src/callbacks.c:10629
 #, c-format
 msgid "Exporting audio as %s..."
 msgstr "Viedään ääniraita tiedostoon %s..."
 
-#: src/callbacks.c:10751
+#: src/callbacks.c:10655
 msgid "Exporting audio"
 msgstr "Viedään ääniraita"
 
-#: src/callbacks.c:10782
+#: src/callbacks.c:10695
 msgid "LiVES: - Append Audio File"
 msgstr ""
 
-#: src/callbacks.c:10825
+#: src/callbacks.c:10739
 #, c-format
 msgid "Appending audio file %s..."
 msgstr ""
 
-#: src/callbacks.c:10836
+#: src/callbacks.c:10756
 msgid "Appending audio"
 msgstr ""
 
-#: src/callbacks.c:10892
+#: src/callbacks.c:10818
 msgid "Append Audio"
 msgstr ""
 
-#: src/callbacks.c:10952
+#: src/callbacks.c:10883
 #, c-format
 msgid "Padding audio to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10954
+#: src/callbacks.c:10885
 #, c-format
 msgid "Trimming audio from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10973
+#: src/callbacks.c:10904
 msgid "Trimming/Padding audio"
 msgstr ""
 
-#: src/callbacks.c:10981
+#: src/callbacks.c:10912
 msgid "Trim/Pad Audio"
 msgstr ""
 
-#: src/callbacks.c:11055
+#: src/callbacks.c:10982
 msgid "Fading audio in"
 msgstr ""
 
-#: src/callbacks.c:11056
+#: src/callbacks.c:10983
 msgid "Fade audio in"
 msgstr ""
 
-#: src/callbacks.c:11061
+#: src/callbacks.c:10987
 msgid "Fading audio out"
 msgstr ""
 
-#: src/callbacks.c:11062
+#: src/callbacks.c:10988
 msgid "Fade audio out"
 msgstr ""
 
-#: src/callbacks.c:11085
+#: src/callbacks.c:11011
 #, c-format
 msgid "%s over %.1f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11087
+#: src/callbacks.c:11013
 #, c-format
 msgid "%s from time %.2f seconds to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11094
+#: src/callbacks.c:11020
 msgid "Fading audio..."
 msgstr ""
 
-#: src/callbacks.c:11194
+#: src/callbacks.c:11119
 msgid ""
 "\n"
 "Deleting all audio will close this file.\n"
@@ -2782,948 +2771,948 @@
 "Tämä tiedosto suljetaan jos koko ääniraita poistetaan.\n"
 "Haluatko varmasti tehdä tämän?"
 
-#: src/callbacks.c:11197
+#: src/callbacks.c:11122
 msgid "Deleting all audio..."
 msgstr "Poistetaan koko ääniraita..."
 
-#: src/callbacks.c:11203
+#: src/callbacks.c:11127
 #, c-format
 msgid "Deleting audio from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11290
+#: src/callbacks.c:11214
 msgid "Deleting Audio"
 msgstr "Poistetaan ääniraita"
 
-#: src/callbacks.c:11297
+#: src/callbacks.c:11221
 msgid "Delete Audio"
 msgstr ""
 
-#: src/callbacks.c:11636
+#: src/callbacks.c:11550
 msgid "Record new audio"
 msgstr ""
 
-#: src/callbacks.c:11725
+#: src/callbacks.c:11640
 #, c-format
 msgid "Inserting silence from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11754
+#: src/callbacks.c:11666
 msgid "Inserting Silence"
 msgstr ""
 
-#: src/merge.c:85
+#: src/merge.c:96
 msgid "LiVES: - Merge"
 msgstr ""
 
-#: src/merge.c:102
+#: src/merge.c:113
 #, c-format
 msgid "Merge Clipboard [ %d Frames ]       With Selection [ %d Frames ]"
 msgstr ""
 
-#: src/merge.c:107
+#: src/merge.c:118
 #, c-format
 msgid ""
 "Merge Clipboard [ %d Frames (resampled) ]       With Selection [ %d Frames ]"
 msgstr ""
 
-#: src/merge.c:118
+#: src/merge.c:130
 msgid "Align _Starts"
 msgstr ""
 
-#: src/merge.c:123
+#: src/merge.c:135
 msgid "Align _Ends"
 msgstr ""
 
-#: src/merge.c:134
+#: src/merge.c:146
 msgid "What to do with extra clipboard frames -"
 msgstr ""
 
-#: src/merge.c:137
+#: src/merge.c:149
 msgid "_Insert Frames"
 msgstr ""
 
-#: src/merge.c:143
+#: src/merge.c:155
 msgid "_Drop Frames"
 msgstr ""
 
-#: src/merge.c:149
+#: src/merge.c:160
 msgid "Number of Times to Loop Clipboard"
 msgstr ""
 
-#: src/merge.c:160
+#: src/merge.c:171
 msgid "_Loop Clipboard to Fit Selection"
 msgstr ""
 
-#: src/merge.c:173
+#: src/merge.c:184
 msgid "_Transition Method:"
 msgstr ""
 
-#: src/merge.c:394
+#: src/merge.c:395
 msgid "Merging clipboard with selection..."
 msgstr "Yhdistetään leikepöydän sisältö valintaan..."
 
-#: src/merge.c:551
+#: src/merge.c:539
 msgid "Merge done.\n"
 msgstr ""
 
-#: src/gui.c:123
+#: src/gui.c:122
 msgid "_Custom Generators"
 msgstr ""
 
-#: src/gui.c:124
+#: src/gui.c:123
 msgid "_Custom Effects"
 msgstr ""
 
-#: src/gui.c:125
+#: src/gui.c:124
 msgid "Custom _Utilities"
 msgstr ""
 
-#: src/gui.c:352 src/multitrack.c:5964
+#: src/gui.c:351 src/multitrack.c:6143
 msgid "_File"
 msgstr "_Tiedosto"
 
-#: src/gui.c:367 src/multitrack.c:5989
+#: src/gui.c:366 src/multitrack.c:6168
 msgid "_Open File/Directory"
 msgstr "_Avaa tiedosto/hakemisto"
 
-#: src/gui.c:373
+#: src/gui.c:372
 msgid "O_pen Part of File..."
 msgstr ""
 
-#: src/gui.c:379 src/gui.c:383 src/multitrack.c:6006 src/multitrack.c:6023
-#: src/multitrack.c:6028
+#: src/gui.c:378 src/gui.c:382 src/multitrack.c:6185 src/multitrack.c:6202
+#: src/multitrack.c:6207
 msgid "Open _Location/Stream..."
 msgstr "Avaa sijainti/suo_ratoisto..."
 
-#: src/gui.c:393 src/multitrack.c:6016
+#: src/gui.c:392 src/multitrack.c:6195
 msgid "Open _Youtube Clip..."
 msgstr ""
 
-#: src/gui.c:404
+#: src/gui.c:403
 msgid "Import from _dvd/vcd..."
 msgstr ""
 
-#: src/gui.c:413
+#: src/gui.c:412
 msgid "Import from _dvd"
 msgstr ""
 
-#: src/gui.c:416
+#: src/gui.c:415
 msgid "Import from _vcd"
 msgstr ""
 
-#: src/gui.c:419
+#: src/gui.c:418
 msgid "_Import from Firewire"
 msgstr ""
 
-#: src/gui.c:428 src/multitrack.c:6086
+#: src/gui.c:427 src/multitrack.c:6265
 msgid "Import from _Firewire Device (dv)"
 msgstr "Tuo Firewire-laitteelta (_dv)"
 
-#: src/gui.c:429 src/multitrack.c:6094
+#: src/gui.c:428 src/multitrack.c:6273
 msgid "Import from _Firewire Device (hdv)"
 msgstr "Tuo Firewire-laitteelta (_hdv)"
 
-#: src/gui.c:457
+#: src/gui.c:456
 msgid "_Add Webcam/TV card..."
 msgstr ""
 
-#: src/gui.c:476
+#: src/gui.c:475
 msgid "Add _Unicap Device"
 msgstr ""
 
-#: src/gui.c:486
+#: src/gui.c:485
 msgid "Add Live _Firewire Device"
 msgstr ""
 
-#: src/gui.c:495
+#: src/gui.c:494
 msgid "Add _TV Device"
 msgstr ""
 
-#: src/gui.c:510 src/multitrack.c:6117
+#: src/gui.c:509 src/multitrack.c:6296
 msgid "_Recent Files..."
 msgstr "_Viimeisimmät tiedostot..."
 
-#: src/gui.c:560 src/multitrack.c:6177
+#: src/gui.c:559 src/multitrack.c:6356
 msgid "_Reload Clip Set..."
 msgstr "Lataa leikesarja _uudestaan..."
 
-#: src/gui.c:564 src/multitrack.c:6185
+#: src/gui.c:563 src/multitrack.c:6364
 msgid "Close/Sa_ve All Clips"
 msgstr "Sulje/tallenna _kaikki leikkeet"
 
-#: src/gui.c:575
+#: src/gui.c:574
 msgid "_Encode Clip As..."
 msgstr ""
 
-#: src/gui.c:577
+#: src/gui.c:576
 msgid "Encode _Selection As..."
 msgstr "Tallenna _valinta nimellä..."
 
-#: src/gui.c:584
+#: src/gui.c:583
 msgid "_Close This Clip"
 msgstr "_Sulje tämä leike"
 
-#: src/gui.c:595
+#: src/gui.c:594
 msgid "_Backup Clip as .lv1..."
 msgstr "Var_muuskopioi leike .lv1-tiedostoon..."
 
-#: src/gui.c:604
+#: src/gui.c:603
 msgid "_Restore Clip from .lv1..."
 msgstr "_Palauta leike .lv1-tiedostosta..."
 
-#: src/gui.c:615
+#: src/gui.c:614
 msgid "Encode/Load/Backup _with Sound"
 msgstr "Tallenna/lataa/varmuuskopioi _äänen kanssa"
 
-#: src/gui.c:620
+#: src/gui.c:619
 msgid "Auto load subtitles"
 msgstr "Lataa tekstitykset automaattisesti"
 
-#: src/gui.c:628 src/multitrack.c:6224
+#: src/gui.c:627 src/multitrack.c:6403
 msgid "Clean _up Diskspace"
 msgstr "Siivoa lev_ytila"
 
-#: src/gui.c:636 src/multitrack.c:6257
+#: src/gui.c:635 src/multitrack.c:6436
 msgid "_Edit"
 msgstr "_Muokkaa"
 
-#: src/gui.c:685
+#: src/gui.c:684
 msgid "_MULTITRACK mode"
 msgstr "_MULTITRACK-tila"
 
-#: src/gui.c:696
+#: src/gui.c:695
 msgid "_Copy Selection"
 msgstr "_Kopioi valinta"
 
-#: src/gui.c:705
+#: src/gui.c:704
 msgid "Cu_t Selection"
 msgstr "_Leikkaa valinta"
 
-#: src/gui.c:714
+#: src/gui.c:713
 msgid "_Insert from Clipboard..."
 msgstr "L_isää leikepöydältä..."
 
-#: src/gui.c:730
+#: src/gui.c:729
 msgid "Paste as _New"
 msgstr "Liitä _uutena"
 
-#: src/gui.c:739
+#: src/gui.c:738
 msgid "_Merge Clipboard with Selection..."
 msgstr "_Yhdistä leikepöydän sisältö valintaan..."
 
-#: src/gui.c:746
+#: src/gui.c:745
 msgid "_Delete Selection"
 msgstr "_Poista valinta"
 
-#: src/gui.c:764
+#: src/gui.c:763
 msgid "Decouple _Video from Audio"
 msgstr "I_rrota video ääniraidasta"
 
-#: src/gui.c:772
+#: src/gui.c:771
 msgid "_Select..."
 msgstr "_Valitse..."
 
-#: src/gui.c:786
+#: src/gui.c:785
 msgid "Select _All Frames"
 msgstr "Valitse _kaikki kuvat"
 
-#: src/gui.c:794
+#: src/gui.c:793
 msgid "_Start Frame Only"
 msgstr "Vain _aloituskuva"
 
-#: src/gui.c:802
+#: src/gui.c:801
 msgid "_End Frame Only"
 msgstr "Vain _lopetuskuva"
 
-#: src/gui.c:813
+#: src/gui.c:812
 msgid "Select from _First Frame"
 msgstr "Valitse _ensimmäisestä kuvasta alkaen"
 
-#: src/gui.c:817
+#: src/gui.c:816
 msgid "Select to _Last Frame"
 msgstr "Valitse _viimeiseen kuvaan saakka"
 
-#: src/gui.c:821
+#: src/gui.c:820
 msgid "Select Last Insertion/_Merge"
 msgstr "Valitse viimeisin lisäys/_yhdistäminen"
 
-#: src/gui.c:825
+#: src/gui.c:824
 msgid "Select Last _Effect"
 msgstr "Valitse viimeisin _tehoste"
 
-#: src/gui.c:829
+#: src/gui.c:828
 msgid "_Invert Selection"
 msgstr "Tee k_äänteinen valinta"
 
-#: src/gui.c:837
+#: src/gui.c:836
 msgid "_Lock Selection Width"
 msgstr "Luki_tse valinnan leveys"
 
-#: src/gui.c:842 src/multitrack.c:6409
+#: src/gui.c:841 src/multitrack.c:6591
 msgid "_Play"
 msgstr "T_oisto"
 
-#: src/gui.c:854
+#: src/gui.c:853
 msgid "_Play All"
 msgstr "_Toista kaikki"
 
-#: src/gui.c:869
+#: src/gui.c:868
 msgid "Pla_y Selection"
 msgstr "Toista _valinta"
 
-#: src/gui.c:877
+#: src/gui.c:876
 msgid "Play _Clipboard"
 msgstr "Toista _leikepöydän sisältö"
 
-#: src/gui.c:899 src/multitrack.c:6441
+#: src/gui.c:898 src/multitrack.c:6623
 msgid "_Stop"
 msgstr "_Pysäytä"
 
-#: src/gui.c:914 src/multitrack.c:6453
+#: src/gui.c:913 src/multitrack.c:6635
 msgid "Re_wind"
 msgstr "Palaa _alkuun"
 
-#: src/gui.c:946 src/multitrack.c:6471
+#: src/gui.c:945 src/multitrack.c:6653
 msgid "_Full Screen"
 msgstr "K_okoruutu"
 
-#: src/gui.c:955
+#: src/gui.c:954
 msgid "_Double Size"
 msgstr "Kak_sinkertainen koko"
 
-#: src/gui.c:963 src/multitrack.c:6479
+#: src/gui.c:962 src/multitrack.c:6661
 msgid "Play in _Separate Window"
 msgstr "Toista _erillisessä ikkunassa"
 
-#: src/gui.c:972
+#: src/gui.c:971
 msgid "_Blank Background"
 msgstr "P_imennä tausta"
 
-#: src/gui.c:979
+#: src/gui.c:978
 msgid "(Auto)_loop Video (to fit audio track)"
 msgstr ""
 
-#: src/gui.c:988 src/multitrack.c:6487
+#: src/gui.c:987 src/multitrack.c:6669
 msgid "L_oop Continuously"
 msgstr "_Jatkuva silmukka"
 
-#: src/gui.c:997
+#: src/gui.c:996
 msgid "Pin_g Pong Loops"
 msgstr "Pin_g Pong -silmukka"
 
-#: src/gui.c:1005 src/multitrack.c:6495
+#: src/gui.c:1004 src/multitrack.c:6677
 msgid "_Mute"
 msgstr "_Vaimenna ääni"
 
-#: src/gui.c:1017
+#: src/gui.c:1016
 msgid "Separate Window 'S_ticky' Mode"
 msgstr ""
 
-#: src/gui.c:1025
+#: src/gui.c:1024
 msgid "S_how Frame Counter"
 msgstr "Näytä _kuvalaskuri"
 
-#: src/gui.c:1035
+#: src/gui.c:1034
 msgid "Show Subtitles"
 msgstr "Näytä tekstitykset"
 
-#: src/gui.c:1045
+#: src/gui.c:1044
 msgid "Letterbox mode"
 msgstr ""
 
-#: src/gui.c:1051 src/multitrack.c:6507
+#: src/gui.c:1050 src/multitrack.c:6689
 msgid "Effect_s"
 msgstr "T_ehosteet"
 
-#: src/gui.c:1054
+#: src/gui.c:1053
 msgid "Effects are applied to the current selection."
 msgstr "Tehosteet lisätään nykyiseen valintaan."
 
-#: src/gui.c:1067
+#: src/gui.c:1066
 msgid "_Run Test Rendered Effect/Tool/Generator..."
 msgstr ""
 
-#: src/gui.c:1072 src/multitrack.c:7123
+#: src/gui.c:1071 src/multitrack.c:7299
 msgid "_Tools"
 msgstr "T_yökalut"
 
-#: src/gui.c:1075
+#: src/gui.c:1074
 msgid "Tools are applied to complete clips."
 msgstr "Työkaluja käytetään kokonaisissa leikkeissä."
 
-#: src/gui.c:1085
+#: src/gui.c:1084
 msgid "_Reverse Clipboard"
 msgstr "Käännä leikepöydän _järjestys"
 
-#: src/gui.c:1094
+#: src/gui.c:1093
 msgid "_Change Playback/Save Speed..."
 msgstr "Muuta toisto/tallennus_nopeutta..."
 
-#: src/gui.c:1099
+#: src/gui.c:1098
 msgid "Resample _Video to New Frame Rate..."
 msgstr "Muunna _videon kuvanopeus..."
 
-#: src/gui.c:1105
+#: src/gui.c:1104
 msgid "_Utilities"
 msgstr "A_puvälineet"
 
-#: src/gui.c:1110
+#: src/gui.c:1109
 msgid "Custom _Tools"
 msgstr ""
 
-#: src/gui.c:1116 src/multitrack.c:7149
+#: src/gui.c:1115 src/multitrack.c:7325
 msgid "_Generate"
 msgstr "Lu_o"
 
-#: src/gui.c:1126
+#: src/gui.c:1125
 msgid "Loading rendered effect plugins..."
 msgstr "Ladataan hahmonnetut tehosteliitännäiset..."
 
-#: src/gui.c:1139
+#: src/gui.c:1138
 msgid "Load _Subtitles from File..."
 msgstr "Lataa _tekstitykset tiedostosta..."
 
-#: src/gui.c:1144
+#: src/gui.c:1143
 msgid "Erase subtitles"
 msgstr ""
 
-#: src/gui.c:1152 src/multitrack.c:7158
+#: src/gui.c:1151 src/multitrack.c:7334
 msgid "Capture _External Window... "
 msgstr "Kaappaa _ulkoisesta ikkunasta... "
 
-#: src/gui.c:1159 src/multitrack.c:7173
+#: src/gui.c:1158 src/multitrack.c:7349
 msgid "_Preferences..."
 msgstr "_Asetukset..."
 
-#: src/gui.c:1172
+#: src/gui.c:1171
 msgid "_Audio"
 msgstr "_Ääni"
 
-#: src/gui.c:1184
+#: src/gui.c:1183
 msgid "Load _New Audio for Clip..."
 msgstr "Lataa leikkeeseen _uusi ääniraita..."
 
-#: src/gui.c:1190
+#: src/gui.c:1189
 msgid "Load _CD Track..."
 msgstr "Lataa _CD-kappale..."
 
-#: src/gui.c:1191
+#: src/gui.c:1190
 msgid "E_ject CD"
 msgstr "P_oista CD"
 
-#: src/gui.c:1205
+#: src/gui.c:1204
 msgid "Record E_xternal Audio..."
 msgstr "_Nauhoita ulkoisesta lähteestä..."
 
-#: src/gui.c:1218
+#: src/gui.c:1217
 msgid "to New _Clip..."
 msgstr "Uuteen _leikkeeseen..."
 
-#: src/gui.c:1222
+#: src/gui.c:1221
 msgid "to _Selection"
 msgstr "_Valintaan"
 
-#: src/gui.c:1230
+#: src/gui.c:1229
 msgid "Fade Audio _In..."
 msgstr "Tee _alkuhäivytys..."
 
-#: src/gui.c:1234
+#: src/gui.c:1233
 msgid "Fade Audio _Out..."
 msgstr "Tee _loppuhäivytys..."
 
-#: src/gui.c:1244
+#: src/gui.c:1243
 msgid "_Export Audio..."
 msgstr "Vie _ääni..."
 
-#: src/gui.c:1257
+#: src/gui.c:1256
 msgid "Export _Selected Audio..."
 msgstr "Vie _valittu äänijakso..."
 
-#: src/gui.c:1261
+#: src/gui.c:1260
 msgid "Export _All Audio..."
 msgstr "Vie _koko ääniraita..."
 
-#: src/gui.c:1265
+#: src/gui.c:1264
 msgid "_Append Audio..."
 msgstr ""
 
-#: src/gui.c:1270
+#: src/gui.c:1269
 msgid "_Trim/Pad Audio..."
 msgstr ""
 
-#: src/gui.c:1283
+#: src/gui.c:1282
 msgid "Trim/Pad Audio to _Selection"
 msgstr ""
 
-#: src/gui.c:1288
+#: src/gui.c:1287
 msgid "Trim/Pad Audio from Beginning to _Play Start"
 msgstr ""
 
-#: src/gui.c:1293
+#: src/gui.c:1292
 msgid "_Delete Audio..."
 msgstr "_Poista ääni..."
 
-#: src/gui.c:1306
+#: src/gui.c:1305
 msgid "Delete _Selected Audio"
 msgstr "Poista _valittu äänijakso"
 
-#: src/gui.c:1310
+#: src/gui.c:1309
 msgid "Delete _All Audio"
 msgstr "Poista _koko ääniraita"
 
-#: src/gui.c:1314
+#: src/gui.c:1313
 msgid "Insert _Silence in Selection"
 msgstr ""
 
-#: src/gui.c:1319
+#: src/gui.c:1318
 msgid "_Resample Audio..."
 msgstr ""
 
-#: src/gui.c:1324
+#: src/gui.c:1323
 msgid "_Info"
 msgstr "T_iedot"
 
-#: src/gui.c:1336
+#: src/gui.c:1335
 msgid "Show Clip _Info"
 msgstr "Näytä leikkeen _tiedot"
 
-#: src/gui.c:1344
+#: src/gui.c:1343
 msgid "Show/_Edit File Comments"
 msgstr "Näytä/_muokkaa tiedostokommentteja"
 
-#: src/gui.c:1349
+#: src/gui.c:1348
 msgid "Show _Clipboard Info"
 msgstr "Näytä _leikepöydän tiedot"
 
-#: src/gui.c:1360 src/multitrack.c:7286
+#: src/gui.c:1359 src/multitrack.c:7462
 msgid "Show _Messages"
 msgstr "Näytä _viestit"
 
-#: src/gui.c:1364 src/multitrack.c:7365
+#: src/gui.c:1363 src/multitrack.c:7541
 msgid "Show _Layout Errors"
 msgstr "Näytä _asetteluvirheet"
 
-#: src/gui.c:1369 src/multitrack.c:7263
+#: src/gui.c:1368 src/multitrack.c:7439
 msgid "_Clips"
 msgstr "_Leikkeet"
 
-#: src/gui.c:1381
+#: src/gui.c:1380
 msgid "_Rename Current Clip in Menu..."
 msgstr "Nimeä nykyinen leike _uudelleen ikkunassa..."
 
-#: src/gui.c:1399
+#: src/gui.c:1398
 msgid "A_dvanced"
 msgstr "Li_sätyökalut"
 
-#: src/gui.c:1412
+#: src/gui.c:1411
 msgid "_RFX Effects/Tools/Utilities"
 msgstr "_RFX-tehosteet/työkalut/apuohjelmat"
 
-#: src/gui.c:1424
+#: src/gui.c:1423
 msgid "_New Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1428
+#: src/gui.c:1427
 msgid "_Copy RFX Script to Test..."
 msgstr ""
 
-#: src/gui.c:1432
+#: src/gui.c:1431
 msgid "_Edit Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1436
+#: src/gui.c:1435
 msgid "Rena_me Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1440
+#: src/gui.c:1439
 msgid "_Delete Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1450
+#: src/gui.c:1449
 msgid "_Promote Test Rendered Effect/Tool/Generator..."
 msgstr ""
 
-#: src/gui.c:1457
+#: src/gui.c:1456
 msgid "_Import Custom RFX script..."
 msgstr ""
 
-#: src/gui.c:1461
+#: src/gui.c:1460
 msgid "E_xport Custom RFX script..."
 msgstr ""
 
-#: src/gui.c:1465
+#: src/gui.c:1464
 msgid "De_lete Custom RFX Script..."
 msgstr ""
 
-#: src/gui.c:1472
+#: src/gui.c:1471
 msgid "Re_build all RFX plugins"
 msgstr ""
 
-#: src/gui.c:1501
+#: src/gui.c:1498
 msgid "Receive _LiVES stream from..."
 msgstr "_Vastaanota LiVES-suoratoisto..."
 
-#: src/gui.c:1506
+#: src/gui.c:1503
 msgid "_Send LiVES stream to..."
 msgstr "_Lähetä LiVES-suoratoisto..."
 
-#: src/gui.c:1515
+#: src/gui.c:1512
 #, c-format
 msgid "Open _yuv4mpeg stream on %sstream.yuv..."
 msgstr ""
 
-#: src/gui.c:1536
+#: src/gui.c:1534
 msgid "_Import Project (.lv2)..."
 msgstr "Tuo pro_jekti (.lv2)..."
 
-#: src/gui.c:1540
+#: src/gui.c:1538
 msgid "E_xport Project (.lv2)..."
 msgstr "V_ie projekti (.lv2)..."
 
-#: src/gui.c:1545
+#: src/gui.c:1543
 msgid "_VJ"
 msgstr "_VJ"
 
-#: src/gui.c:1557
+#: src/gui.c:1555
 msgid "Real Time _Effect Mapping"
 msgstr "Tosiaikaisten _tehosteiden näppäinsidokset"
 
-#: src/gui.c:1563
+#: src/gui.c:1561
 msgid "Bind real time effects to ctrl-number keys."
 msgstr "Sido tosiaikaiset tehosteet ctrl-numero-näppäinyhdistelmiin."
 
-#: src/gui.c:1565
+#: src/gui.c:1563
 msgid "Set Real Time Effect _Defaults"
 msgstr ""
 
-#: src/gui.c:1567
+#: src/gui.c:1565
 msgid "Set default parameter values for real time effects."
 msgstr ""
 
-#: src/gui.c:1580
+#: src/gui.c:1578
 msgid "Save Real Time Effect _Defaults"
 msgstr ""
 
-#: src/gui.c:1583
+#: src/gui.c:1581
 msgid ""
 "Save real time effect defaults so they will be restored each time you use "
 "LiVES."
 msgstr ""
 
-#: src/gui.c:1589
+#: src/gui.c:1587
 msgid "_Reset all playback speeds and positions"
 msgstr ""
 
-#: src/gui.c:1592
+#: src/gui.c:1590
 msgid ""
 "Reset all playback positions to frame 1, and reset all playback frame rates."
 msgstr ""
 
-#: src/gui.c:1594
+#: src/gui.c:1592
 msgid "_MIDI/joystick interface"
 msgstr ""
 
-#: src/gui.c:1609
+#: src/gui.c:1607
 msgid "_MIDI/joystick learner..."
 msgstr ""
 
-#: src/gui.c:1614
+#: src/gui.c:1612
 msgid "_Save device mapping..."
 msgstr ""
 
-#: src/gui.c:1620
+#: src/gui.c:1618
 msgid "_Load device mapping..."
 msgstr ""
 
-#: src/gui.c:1628
+#: src/gui.c:1626
 msgid "Show VJ _Keys"
 msgstr "Näytä VJ-_näppäimet"
 
-#: src/gui.c:1632
+#: src/gui.c:1630
 msgid "To_ys"
 msgstr "Leikki_kalut"
 
-#: src/gui.c:1644
+#: src/gui.c:1642
 msgid "_None"
 msgstr "_Ei mitään"
 
-#: src/gui.c:1652
+#: src/gui.c:1650
 msgid "_Autolives"
 msgstr ""
 
-#: src/gui.c:1657
+#: src/gui.c:1655
 msgid "_Mad Frames"
 msgstr "Le_vottomat kuvat"
 
-#: src/gui.c:1662
+#: src/gui.c:1660
 msgid "_LiVES TV (broadband)"
 msgstr "_LiVES TV (laajakaista)"
 
-#: src/gui.c:1672 src/multitrack.c:7387
+#: src/gui.c:1670 src/multitrack.c:7563
 msgid "_Help"
 msgstr "O_hje"
 
-#: src/gui.c:1684 src/multitrack.c:7407
+#: src/gui.c:1682 src/multitrack.c:7583
 msgid "_Manual (opens in browser)"
 msgstr "Käyttöo_hje (avautuu selaimessa)"
 
-#: src/gui.c:1691 src/multitrack.c:7416
+#: src/gui.c:1689 src/multitrack.c:7592
 msgid "_Donate to the project !"
 msgstr "Tee _lahjoitus projektille!"
 
-#: src/gui.c:1695 src/multitrack.c:7420
+#: src/gui.c:1693 src/multitrack.c:7596
 msgid "_Email the author"
 msgstr "Lähetä _postia tekijälle"
 
-#: src/gui.c:1699 src/multitrack.c:7424
+#: src/gui.c:1697 src/multitrack.c:7600
 msgid "Report a _bug"
 msgstr "Tee _vikailmoitus"
 
-#: src/gui.c:1703 src/multitrack.c:7428
+#: src/gui.c:1701 src/multitrack.c:7604
 msgid "Suggest a _feature"
 msgstr "Ehdota _ominaisuutta"
 
-#: src/gui.c:1707 src/multitrack.c:7432
+#: src/gui.c:1705 src/multitrack.c:7608
 msgid "Assist with _translating"
 msgstr "Auta _kääntämisessä"
 
-#: src/gui.c:1714 src/multitrack.c:7439
+#: src/gui.c:1712 src/multitrack.c:7615
 msgid "_Troubleshoot"
 msgstr ""
 
-#: src/gui.c:1718 src/multitrack.c:7443
+#: src/gui.c:1716 src/multitrack.c:7619
 msgid "_About"
 msgstr "_Tietoja ohjelmasta"
 
-#: src/gui.c:1752
+#: src/gui.c:1750
 msgid "Rewind to start (w)"
 msgstr "Palaa alkuun (w)"
 
-#: src/gui.c:1760 src/multitrack.c:16720
+#: src/gui.c:1758 src/multitrack.c:17010
 msgid "Play all (p)"
 msgstr "Toista kaikki (p)"
 
-#: src/gui.c:1768 src/gui.c:1877
+#: src/gui.c:1766 src/gui.c:1876
 msgid "Stop playback (q)"
 msgstr "Pysäytä toisto (q)"
 
-#: src/gui.c:1779
+#: src/gui.c:1777
 msgid "Play selection (y)"
 msgstr "Toista valinta (y)"
 
-#: src/gui.c:1832
+#: src/gui.c:1829
 msgid "Volume"
 msgstr "Äänenvoimakkuus"
 
-#: src/gui.c:1854
+#: src/gui.c:1853
 msgid "Audio volume (1.00)"
 msgstr "Äänenvoimakkuus (1.00)"
 
-#: src/gui.c:1883
+#: src/gui.c:1882
 msgid "Unblank background (b)"
 msgstr ""
 
-#: src/gui.c:1929
+#: src/gui.c:1928
 msgid "Play slower (ctrl-down)"
 msgstr "Toista hitaammin (ctrl-alas)"
 
-#: src/gui.c:1935
+#: src/gui.c:1934
 msgid "Play faster (ctrl-up)"
 msgstr "Toista nopeammin (ctrl-ylös)"
 
-#: src/gui.c:1942
+#: src/gui.c:1941
 msgid "Skip back (ctrl-left)"
 msgstr ""
 
-#: src/gui.c:1948
+#: src/gui.c:1947
 msgid "Skip forward (ctrl-right)"
 msgstr ""
 
-#: src/gui.c:1954
+#: src/gui.c:1953
 msgid "Show clip info (i)"
 msgstr "Näytä leikkeen tiedot (i)"
 
-#: src/gui.c:1960
+#: src/gui.c:1959
 msgid "Hide this toolbar"
 msgstr "Piilota tämä työkalurivi"
 
-#: src/gui.c:1962
+#: src/gui.c:1961
 msgid ""
 "Press \"s\" to toggle separate play window for improved performance, \"q\" "
 "to stop."
 msgstr ""
 
 #. TRANSLATORS: please keep the translated string the same length
-#: src/gui.c:1995
+#: src/gui.c:1994
 msgid "     Video playback speed (frames per second)        "
 msgstr "     Videon toistonopeus (kuvaa sekunnissa)        "
 
-#: src/gui.c:2009
+#: src/gui.c:2008
 msgid "Vary the video speed"
 msgstr ""
 
-#: src/gui.c:2092 src/gui.c:3218
+#: src/gui.c:2090 src/gui.c:3329
 msgid "First Frame"
 msgstr "Ensimmäinen kuva"
 
-#: src/gui.c:2193 src/gui.c:3226
+#: src/gui.c:2191 src/gui.c:3336
 msgid "Last Frame"
 msgstr "Viimeinen kuva"
 
-#: src/gui.c:2210
+#: src/gui.c:2208
 msgid "The first selected frame in this clip"
 msgstr "Ensimmäinen valittu kuva tässä leikkeessä"
 
-#: src/gui.c:2248
+#: src/gui.c:2246
 msgid "The last selected frame in this clip"
 msgstr "Viimeinen valittu kuva tässä leikkeessä"
 
-#: src/gui.c:2532
+#: src/gui.c:2546
 msgid "Starting...\n"
 msgstr "Käynnistetään...\n"
 
-#: src/gui.c:3074
+#: src/gui.c:3181
 msgid "    Press 'q' to stop recording.  DO NOT COVER THE PLAY WINDOW !   "
 msgstr ""
 "    Paina \"q\" pysäyttääksesi nauhoituksen.  ÄLÄ PEITÄ TOISTOIKKUNAA !   "
 
-#: src/gui.c:3521
+#: src/gui.c:3643
 msgid "Frame number to preview"
 msgstr ""
 
-#: src/gui.c:3538
+#: src/gui.c:3660
 msgid "_Free"
 msgstr "_Vapaana"
 
-#: src/gui.c:3539
+#: src/gui.c:3661
 msgid "Free choice of frame number"
 msgstr ""
 
-#: src/gui.c:3543
+#: src/gui.c:3666
 msgid "_Start"
 msgstr "_Käynnistä"
 
-#: src/gui.c:3544
+#: src/gui.c:3667
 msgid "Frame number is linked to start frame"
 msgstr ""
 
-#: src/gui.c:3551
+#: src/gui.c:3675
 msgid "_End"
 msgstr ""
 
-#: src/gui.c:3552
+#: src/gui.c:3676
 msgid "Frame number is linked to end frame"
 msgstr ""
 
-#: src/gui.c:3559
+#: src/gui.c:3684
 msgid "_Pointer"
 msgstr ""
 
-#: src/gui.c:3560
+#: src/gui.c:3685
 msgid "Frame number is linked to playback pointer"
 msgstr ""
 
-#: src/gui.c:3581
+#: src/gui.c:3707
 msgid "Rewind"
 msgstr "Takaisinkelaus"
 
-#: src/gui.c:3592 src/dialogs.c:894 src/dialogs.c:896 src/dialogs.c:1817
-#: src/dialogs.c:1819
+#: src/gui.c:3718 src/dialogs.c:960 src/dialogs.c:962 src/dialogs.c:1873
+#: src/dialogs.c:1875
 msgid "Play all"
 msgstr "Toista kaikki"
 
-#: src/gui.c:3605
+#: src/gui.c:3731
 msgid "Play Selection"
 msgstr "Toista valinta"
 
-#: src/gui.c:3619
+#: src/gui.c:3745
 msgid "Loop On/Off"
 msgstr ""
 
-#: src/gui.c:3693
+#: src/gui.c:3819
 msgid "Start _recording"
 msgstr "Aloita _nauhoitus"
 
-#: src/gui.c:3698
+#: src/gui.c:3824
 msgid "Stop _recording"
 msgstr "Pysäytä _nauhoitus"
 
-#: src/gui.c:3703
+#: src/gui.c:3829
 msgid "_Record Performance"
 msgstr ""
 
-#: src/gui.c:3851
+#: src/gui.c:3974
 msgid "Hide Play Window"
 msgstr "Piilota toistoikkuna"
 
-#: src/gui.c:4232
+#: src/gui.c:4333
 msgid "Show Play Window"
 msgstr "Näytä toistoikkuna"
 
-#: src/ce_thumbs.c:222
+#: src/ce_thumbs.c:242
 #, c-format
 msgid "Mapped to ctrl-%d"
 msgstr ""
 
-#: src/ce_thumbs.c:276 src/effects.c:85 src/preferences.c:3195
+#: src/ce_thumbs.c:296 src/effects.c:86 src/preferences.c:3247
 msgid "Effects"
 msgstr "Tehosteet"
 
-#: src/ce_thumbs.c:279 src/multitrack.c:5615
+#: src/ce_thumbs.c:299 src/multitrack.c:5791
 msgid "Clips"
 msgstr "Leikkeet"
 
-#: src/ce_thumbs.c:303
+#: src/ce_thumbs.c:323
 #, c-format
 msgid "Show / apply effects to %s\n"
 msgstr ""
 
-#: src/ce_thumbs.c:315
+#: src/ce_thumbs.c:335
 #, fuzzy, c-format
 msgid "Select clip for %s\n"
 msgstr "_Poista leikesarja"
 
-#: src/ce_thumbs.c:515
+#: src/ce_thumbs.c:536
 msgid "_Pin"
 msgstr ""
 
-#: src/ce_thumbs.c:515
+#: src/ce_thumbs.c:537
 msgid "Pin the parameter box to the window"
 msgstr ""
 
 #. TRANSLATORS: Exabytes
-#: src/utils.c:794
+#: src/utils.c:800
 #, c-format
 msgid "%.2f EB"
 msgstr ""
 
 #. TRANSLATORS: Petabytes
-#: src/utils.c:798
+#: src/utils.c:803
 #, c-format
 msgid "%.2f PB"
 msgstr ""
 
 #. TRANSLATORS: Terabytes
-#: src/utils.c:802
+#: src/utils.c:806
 #, c-format
 msgid "%.2f TB"
 msgstr ""
 
 #. TRANSLATORS: Gigabytes
-#: src/utils.c:806
+#: src/utils.c:809
 #, c-format
 msgid "%.2f GB"
 msgstr ""
 
 #. TRANSLATORS: Megabytes
-#: src/utils.c:810
+#: src/utils.c:812
 #, c-format
 msgid "%.2f MB"
 msgstr ""
 
 #. TRANSLATORS: Kilobytes (1024 bytes)
-#: src/utils.c:814
+#: src/utils.c:815
 #, c-format
 msgid "%.2f KiB"
 msgstr ""
@@ -3733,7 +3722,7 @@
 msgid "%d bytes"
 msgstr ""
 
-#: src/utils.c:1841
+#: src/utils.c:1835
 msgid "Clearing the clipboard"
 msgstr "Tyhjennetään leikepöytää"
 
@@ -3748,7 +3737,7 @@
 "==============================\n"
 "Vaihdettiin leikkeeseen %s\n"
 
-#: src/utils.c:1880
+#: src/utils.c:1877
 msgid ""
 "\n"
 "==============================\n"
@@ -3758,32 +3747,32 @@
 "==============================\n"
 "Vaihdettiin tyhjään leikkeeseen\n"
 
-#: src/utils.c:1917
+#: src/utils.c:1916
 msgid "(blank)"
 msgstr ""
 
-#: src/utils.c:1920
+#: src/utils.c:1919
 #, c-format
 msgid ""
 "The set name has been changed from %s to %s. Affected layouts have been "
 "updated accordingly\n"
 msgstr ""
 
-#: src/utils.c:1928
+#: src/utils.c:1927
 #, c-format
 msgid ""
 "The clip %s is missing from this set.\n"
 "It is required by the following layouts:\n"
 msgstr ""
 
-#: src/utils.c:1932
+#: src/utils.c:1931
 #, c-format
 msgid ""
 "The clip %s has been closed.\n"
 "It is required by the following layouts:\n"
 msgstr ""
 
-#: src/utils.c:1937
+#: src/utils.c:1936
 #, c-format
 msgid ""
 "Frames have been shifted in the clip %s.\n"
@@ -3792,7 +3781,7 @@
 "Leikkeen %s kuvia on siirrelty.\n"
 "Muutos vaikuttaa seuraaviin asetteluihin:\n"
 
-#: src/utils.c:1942
+#: src/utils.c:1941
 #, c-format
 msgid ""
 "Frames have been deleted from the clip %s.\n"
@@ -3801,7 +3790,7 @@
 "Leikkeestä %s on poistettu kuvia.\n"
 "Muutos vaikuttaa seuraaviin asetteluihin:\n"
 
-#: src/utils.c:1947
+#: src/utils.c:1946
 #, c-format
 msgid ""
 "Audio has been deleted from the clip %s.\n"
@@ -3810,7 +3799,7 @@
 "Leikkeestä %s on poistettu ääniraita.\n"
 "Muutos vaikuttaa seuraaviin asetteluihin:\n"
 
-#: src/utils.c:1952
+#: src/utils.c:1951
 #, c-format
 msgid ""
 "Audio has been shifted in clip %s.\n"
@@ -3819,7 +3808,7 @@
 "Leikkeen %s ääniraitaa on siirrelty.\n"
 "Muutos vaikuttaa seuraaviin asetteluihin:\n"
 
-#: src/utils.c:1957
+#: src/utils.c:1956
 #, c-format
 msgid ""
 "Audio has been altered in the clip %s.\n"
@@ -3828,7 +3817,7 @@
 "Leikkeen %s ääniraitaa on muutettu.\n"
 "Muutos vaikuttaa seuraaviin asetteluihin:\n"
 
-#: src/utils.c:1962
+#: src/utils.c:1961
 #, c-format
 msgid ""
 "Frames have been altered in the clip %s.\n"
@@ -3837,7 +3826,7 @@
 "Leikkeen %s kuviin on tehty muutoksia.\n"
 "Muutos vaikuttaa seuraaviin asetteluihin:\n"
 
-#: src/utils.c:2135
+#: src/utils.c:2134
 #, c-format
 msgid ""
 "Set %s\n"
@@ -3848,7 +3837,7 @@
 "ei voida avata, sillä se on toisen\n"
 "LiVES-kopion käytössä.\n"
 
-#: src/utils.c:2142
+#: src/utils.c:2140
 #, c-format
 msgid ""
 "\n"
@@ -3901,67 +3890,67 @@
 msgid "Removing layout %s\n"
 msgstr "Poistetaan asettelu %s\n"
 
-#: src/utils.c:3014
+#: src/utils.c:2996
 msgid "Video [opening...]"
 msgstr "Video [avataan...]"
 
-#: src/utils.c:3018
+#: src/utils.c:2999
 #, c-format
 msgid "Video [%.2f sec]"
 msgstr "Video [%.2f s]"
 
-#: src/utils.c:3022
+#: src/utils.c:3002
 msgid "(Undefined)"
 msgstr ""
 
-#: src/utils.c:3025
+#: src/utils.c:3004
 msgid "(No video)"
 msgstr "(Ei videoraitaa)"
 
-#: src/utils.c:3032
+#: src/utils.c:3011
 msgid "(No audio)"
 msgstr "(Ei ääniraitaa)"
 
-#: src/utils.c:3037
+#: src/utils.c:3015
 msgid "Mono  [opening...]"
 msgstr "Mono  [avataan...]"
 
-#: src/utils.c:3040
+#: src/utils.c:3017
 msgid "Left Audio [opening...]"
 msgstr "Vasen ääni [avataan...]"
 
-#: src/utils.c:3045
+#: src/utils.c:3021
 #, c-format
 msgid "Mono [%.2f sec]"
 msgstr "Mono [%.2f s]"
 
-#: src/utils.c:3048
+#: src/utils.c:3023
 #, c-format
 msgid "Left Audio [%.2f sec]"
 msgstr "Vasen ääni [%.2f s]"
 
-#: src/utils.c:3056
+#: src/utils.c:3031
 msgid "Right Audio [opening...]"
 msgstr "Oikea ääni [avataan...]"
 
-#: src/utils.c:3059
+#: src/utils.c:3033
 #, c-format
 msgid "Right Audio [%.2f sec]"
 msgstr "Oikea ääni [%.2f s]"
 
-#: src/utils.c:3506
+#: src/utils.c:3472
 msgid "LiVES cannot switch to mplayer whilst clips are loading."
 msgstr ""
 
-#: src/utils.c:3559
+#: src/utils.c:3525
 msgid "LiVES cannot switch to mplayer2 whilst clips are loading."
 msgstr ""
 
-#: src/utils.c:3809
+#: src/utils.c:3775
 msgid "Cleaning up clip"
 msgstr ""
 
-#: src/utils.c:3913
+#: src/utils.c:3874
 #, c-format
 msgid ""
 "\n"
@@ -3976,30 +3965,29 @@
 "\n"
 "Korvataanko se?\n"
 
-#: src/utils.c:4305 src/utils.c:4337 src/multitrack.c:4503
+#: src/utils.c:4250 src/utils.c:4280 src/multitrack.c:4672
 #, c-format
 msgid "_Undo %s"
 msgstr "Kum_oa %s"
 
-#: src/utils.c:4306 src/utils.c:4338 src/multitrack.c:4525
+#: src/utils.c:4251 src/utils.c:4281 src/multitrack.c:4693
 #, c-format
 msgid "_Redo %s"
 msgstr "Tee uu_destaan %s"
 
-#: src/utils.c:4363
+#: src/utils.c:4305
 msgid "-------------Selection------------"
 msgstr "-------------Valinta------------"
 
-#. TRANSLATORS: - try to keep the text of the middle part the same length, by deleting "-" if necessary
-#: src/utils.c:4371
+#: src/utils.c:4313
 msgid " sec ] ----------Selection---------- [ "
 msgstr " s ] ----------Valinta---------- [ "
 
-#: src/utils.c:4371
+#: src/utils.c:4314
 msgid " frames ] ----------"
 msgstr " kuvaa ] ----------"
 
-#: src/utils.c:5360
+#: src/utils.c:5302
 msgid ""
 "Your version of mplayer/ffmpeg may be broken !\n"
 "See http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2071\n"
@@ -4010,11 +3998,11 @@
 "Try running Help/Troubleshoot for more information."
 msgstr ""
 
-#: src/saveplay.c:178
+#: src/saveplay.c:179
 msgid "Examining file header"
 msgstr ""
 
-#: src/saveplay.c:315 src/saveplay.c:789
+#: src/saveplay.c:316 src/saveplay.c:779
 #, c-format
 msgid "Opening %s"
 msgstr "Avataan %s"
@@ -4024,36 +4012,36 @@
 msgid "Opening %s start time %.2f sec. frames %d"
 msgstr ""
 
-#: src/saveplay.c:326 src/saveplay.c:4001
+#: src/saveplay.c:326 src/saveplay.c:3927
 msgid " without sound"
 msgstr ""
 
-#: src/saveplay.c:396
+#: src/saveplay.c:395
 #, c-format
 msgid "Opening audio for %s"
 msgstr ""
 
-#: src/saveplay.c:557
+#: src/saveplay.c:554
 #, c-format
 msgid "Auto trimming %.2f seconds of audio at start..."
 msgstr ""
 
-#: src/saveplay.c:567
+#: src/saveplay.c:562
 #, c-format
 msgid "Auto trimming %.2f seconds of audio at end..."
 msgstr ""
 
-#: src/saveplay.c:584
+#: src/saveplay.c:577
 #, c-format
 msgid "Auto padding with %.2f seconds of silence at start..."
 msgstr ""
 
-#: src/saveplay.c:599
+#: src/saveplay.c:590
 #, c-format
 msgid "Auto padding with %.2f seconds of silence at end..."
 msgstr ""
 
-#: src/saveplay.c:671
+#: src/saveplay.c:661
 #, c-format
 msgid ""
 "\n"
@@ -4065,11 +4053,11 @@
 "Are you sure you wish to continue ?"
 msgstr ""
 
-#: src/saveplay.c:685
+#: src/saveplay.c:676
 msgid " - please be patient."
 msgstr ""
 
-#: src/saveplay.c:938
+#: src/saveplay.c:926
 msgid ""
 "\n"
 "\n"
@@ -4077,7 +4065,7 @@
 "Please check the terminal window for more details.\n"
 msgstr ""
 
-#: src/saveplay.c:940
+#: src/saveplay.c:928
 msgid ""
 "\n"
 "\n"
@@ -4087,7 +4075,7 @@
 "\n"
 "Tämän tiedoston avaaminen saattaa vaatia mplayerin asennuksen.\n"
 
-#: src/saveplay.c:948
+#: src/saveplay.c:934
 msgid ""
 "\n"
 "\n"
@@ -4095,29 +4083,29 @@
 "Tools|Preferences|Decoding\n"
 msgstr ""
 
-#: src/saveplay.c:1014
+#: src/saveplay.c:995
 msgid "Adding image..."
 msgstr ""
 
-#: src/saveplay.c:1108
+#: src/saveplay.c:1089
 #, c-format
 msgid "Subtitles were saved as %s\n"
 msgstr ""
 
-#: src/saveplay.c:1192
+#: src/saveplay.c:1171
 #, c-format
 msgid "LiVES: Save Frame %d as..."
 msgstr ""
 
-#: src/saveplay.c:1195
+#: src/saveplay.c:1174
 msgid "LiVES: Save Frame as..."
 msgstr ""
 
-#: src/saveplay.c:1322
+#: src/saveplay.c:1303
 msgid "LiVES: Save Clip as..."
 msgstr ""
 
-#: src/saveplay.c:1390
+#: src/saveplay.c:1369
 msgid ""
 "Saving your video could lead to a loss of quality !\n"
 "You are strongly advised to 'Save As' to a new file.\n"
@@ -4130,34 +4118,34 @@
 "\n"
 "Haluatko tästä huolimatta jatkaa?"
 
-#: src/saveplay.c:1517 src/saveplay.c:1683 src/saveplay.c:1762
-#: src/saveplay.c:4014
+#: src/saveplay.c:1494 src/saveplay.c:1659 src/saveplay.c:1738
+#: src/saveplay.c:3940
 msgid "Pulling frames from clip"
 msgstr ""
 
-#: src/saveplay.c:1588 src/saveplay.c:1727
+#: src/saveplay.c:1565 src/saveplay.c:1703
 msgid "Linking selection"
 msgstr ""
 
-#: src/saveplay.c:1779
+#: src/saveplay.c:1755
 msgid " (with no sound)\n"
 msgstr " (ilman ääntä)\n"
 
-#: src/saveplay.c:1786
+#: src/saveplay.c:1761
 #, c-format
 msgid "Saving frames %d to %d%s as \"%s\" : encoder = %s : format = %s..."
 msgstr ""
 
-#: src/saveplay.c:1790
+#: src/saveplay.c:1765
 #, c-format
 msgid "Saving frames 1 to %d%s as \"%s\" : encoder %s : format = %s..."
 msgstr ""
 
-#: src/saveplay.c:1909
+#: src/saveplay.c:1890
 msgid "Saving [can take a long time]"
 msgstr "Tallennetaan [saattaa kestää kauan]"
 
-#: src/saveplay.c:2057
+#: src/saveplay.c:2044
 msgid ""
 "\n"
 "\n"
@@ -4167,33 +4155,33 @@
 "\n"
 "Pakkausvirhe - tiedostoa ei luotu!\n"
 
-#: src/saveplay.c:2094
+#: src/saveplay.c:2081
 msgid "Clearing letterbox"
 msgstr ""
 
-#: src/saveplay.c:2183
+#: src/saveplay.c:2168
 #, c-format
 msgid "File size was %s\n"
 msgstr ""
 
-#: src/saveplay.c:2284
+#: src/saveplay.c:2265
 msgid "recording aborted by preview.\n"
 msgstr ""
 
-#: src/saveplay.c:2288
+#: src/saveplay.c:2268
 msgid "recording aborted by clipboard playback.\n"
 msgstr ""
 
-#: src/saveplay.c:2291
+#: src/saveplay.c:2270
 msgid "Recording performance..."
 msgstr ""
 
-#: src/saveplay.c:3293
+#: src/saveplay.c:3251
 #, c-format
 msgid "Average FPS was %.4f\n"
 msgstr ""
 
-#: src/saveplay.c:3299
+#: src/saveplay.c:3256
 msgid ""
 "\n"
 "\n"
@@ -4202,16 +4190,21 @@
 "and resize all frames to the current size.\n"
 msgstr ""
 
-#: src/saveplay.c:3479
+#: src/saveplay.c:3429
 msgid "Unknown"
 msgstr "Tuntematon"
 
-#: src/saveplay.c:3588 src/saveplay.c:4585
+#: src/saveplay.c:3538 src/saveplay.c:4502
 #, c-format
 msgid "Untitled%d"
 msgstr "Nimetön%d"
 
-#: src/saveplay.c:3633
+#: src/saveplay.c:3567
+#, c-format
+msgid "%d frames are enough !\n"
+msgstr ""
+
+#: src/saveplay.c:3579
 #, c-format
 msgid ""
 "\n"
@@ -4219,7 +4212,7 @@
 "Bad things may happen with this clip.\n"
 msgstr ""
 
-#: src/saveplay.c:3723
+#: src/saveplay.c:3667
 #, c-format
 msgid ""
 "\n"
@@ -4231,12 +4224,12 @@
 "fps. \n"
 "Oletusarvon voi asettaa kohdasta Työkalut | Asetukset | Sekalaiset.\n"
 
-#: src/saveplay.c:3735
+#: src/saveplay.c:3677
 #, c-format
 msgid "Playback speed was adjusted to %.3f frames per second to fit audio.\n"
 msgstr ""
 
-#: src/saveplay.c:3754
+#: src/saveplay.c:3694
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d *bpp=Greyscale* fps=%.3f\n"
@@ -4245,7 +4238,7 @@
 "Kuvia=%d tyyppi=%s koko=%dx%d *bpp=Harmaasävy* fps=%.3f\n"
 "Ääni:"
 
-#: src/saveplay.c:3758 src/saveplay.c:4762
+#: src/saveplay.c:3698 src/saveplay.c:4671
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d bpp=%d fps=%.3f\n"
@@ -4254,54 +4247,54 @@
 "Kuvia=%d tyyppi=%s koko=%dx%d bpp=%d fps=%.3f\n"
 "Ääni:"
 
-#: src/saveplay.c:3762 src/saveplay.c:4766
+#: src/saveplay.c:3703 src/saveplay.c:4676
 #, c-format
 msgid "%s none\n"
 msgstr ""
 
-#: src/saveplay.c:3774
+#: src/saveplay.c:3714
 #, fuzzy, c-format
 msgid " - Author: %s\n"
 msgstr "Tekijä: %s"
 
-#: src/saveplay.c:3779
+#: src/saveplay.c:3717
 #, fuzzy, c-format
 msgid " - Title: %s\n"
 msgstr " - Kommentti: %s\n"
 
-#: src/saveplay.c:3784
+#: src/saveplay.c:3720
 #, c-format
 msgid " - Comment: %s\n"
 msgstr " - Kommentti: %s\n"
 
-#: src/saveplay.c:3897
+#: src/saveplay.c:3829
 #, c-format
 msgid "Saving frame %d as %s..."
 msgstr "Tallennetaan kuva %d nimellä %s..."
 
-#: src/saveplay.c:3996
+#: src/saveplay.c:3924
 #, c-format
 msgid "Backing up %s to %s"
 msgstr "Varmuuskopioidaan %s tiedostoon %s"
 
-#: src/saveplay.c:4049
+#: src/saveplay.c:3975
 msgid "Backing up"
 msgstr "Varmuuskopioidaan"
 
-#: src/saveplay.c:4083
+#: src/saveplay.c:4009
 msgid "performance data was backed up..."
 msgstr ""
 
-#: src/saveplay.c:4661
+#: src/saveplay.c:4574
 #, c-format
 msgid "Restoring %s..."
 msgstr "Palautetaan %s..."
 
-#: src/saveplay.c:4692
+#: src/saveplay.c:4603
 msgid "Restoring"
 msgstr "Palautetaan"
 
-#: src/saveplay.c:4714
+#: src/saveplay.c:4625
 #, c-format
 msgid ""
 "\n"
@@ -4315,22 +4308,22 @@
 "LiVES ei pystynyt palauttamaan sitä.\n"
 
 #. TRANSLATORS: rec(ord) %.2f M(ega)B(ytes)
-#: src/saveplay.c:5207
+#: src/saveplay.c:5118
 #, c-format
 msgid "rec %.2f MB"
 msgstr ""
 
-#: src/saveplay.c:5213
+#: src/saveplay.c:5123
 #, c-format
 msgid "!rec %.2f MB"
 msgstr ""
 
 #. TRANSLATORS: rec(ord) ?? M(ega)B(ytes)
-#: src/saveplay.c:5216
+#: src/saveplay.c:5126
 msgid "rec ?? MB"
 msgstr ""
 
-#: src/saveplay.c:5241
+#: src/saveplay.c:5151
 #, c-format
 msgid ""
 "\n"
@@ -4338,7 +4331,7 @@
 "Record stop level can be set in Preferences.\n"
 msgstr ""
 
-#: src/saveplay.c:5535
+#: src/saveplay.c:5447
 msgid ""
 "\n"
 "Files from a previous run of LiVES were found.\n"
@@ -4348,47 +4341,69 @@
 "Edellisen LiVES-istunnon jäljiltä löytyi tiedostoja.\n"
 "Haluatko yrittää niiden palautusta?\n"
 
-#: src/saveplay.c:5557
+#: src/saveplay.c:5469
 msgid "Recovering files"
 msgstr "Palautetaan tiedostoja"
 
-#: src/saveplay.c:5560
+#: src/saveplay.c:5472
 msgid "Recovering files..."
 msgstr "Palautetaan tiedostoja..."
 
-#: src/dialogs.c:72
+#: src/dialogs.c:71
 msgid "Show affected _layouts"
 msgstr ""
 
-#: src/dialogs.c:128
+#: src/dialogs.c:113
+msgid ""
+"Do _not show this warning any more\n"
+"(can be turned back on from Preferences/Warnings)"
+msgstr ""
+"_Älä näytä tätä varoitusta enää uudestaan\n"
+"(varoituksen voi laittaa takaisin päälle kohdasta Asetukset/Varoitukset)"
+
+#: src/dialogs.c:127
 msgid "_Recover disk space"
 msgstr ""
 
-#: src/dialogs.c:143
+#: src/dialogs.c:142
 msgid " _Advanced Settings >>"
 msgstr ""
 
-#: src/dialogs.c:184
+#: src/dialogs.c:183 src/dialogs.c:221
 msgid "LiVES: - Warning !"
 msgstr "LiVES: - Varoitus!"
 
 #: src/dialogs.c:194
+#, fuzzy
+msgid "LiVES: - Error !"
+msgstr "LiVES: - Varoitus!"
+
+#: src/dialogs.c:204
+#, fuzzy
+msgid "LiVES: - Information"
+msgstr "LiVES: - Avaa sijainti"
+
+#: src/dialogs.c:230
 msgid "LiVES: - Question"
 msgstr ""
 
-#: src/dialogs.c:204
+#: src/dialogs.c:239
 msgid "LiVES: - File Error"
 msgstr ""
 
-#: src/dialogs.c:208
+#: src/dialogs.c:241
 msgid "_Abort"
 msgstr ""
 
-#: src/dialogs.c:213
+#: src/dialogs.c:246
 msgid "_Retry"
 msgstr ""
 
-#: src/dialogs.c:597
+#: src/dialogs.c:306
+msgid "Show _Details"
+msgstr "Näytä _tiedot"
+
+#: src/dialogs.c:657
 #, c-format
 msgid ""
 "FREE SPACE IN THE PARTITION CONTAINING\n"
@@ -4399,7 +4414,7 @@
 "(Disk warning levels can be configured in Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:615
+#: src/dialogs.c:676
 #, c-format
 msgid ""
 "Free space in the partition containing\n"
@@ -4411,11 +4426,11 @@
 "Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:627
+#: src/dialogs.c:688
 msgid "Audio players cannot be switched during playback."
 msgstr "Äänisoitinta ei voi vaihtaa toiston aikana."
 
-#: src/dialogs.c:632
+#: src/dialogs.c:694
 msgid ""
 "\n"
 "\n"
@@ -4427,18 +4442,18 @@
 "LiVES ei pystynyt suorittamaan tätä toimintoa muistin vähyyden vuoksi.\n"
 "Kokeile sulkea ensin muita sovelluksia.\n"
 
-#: src/dialogs.c:752
+#: src/dialogs.c:820
 msgid "Processing has been paused."
 msgstr ""
 
-#: src/dialogs.c:937
+#: src/dialogs.c:1002
 #, c-format
 msgid ""
 "\n"
 "%s%d%% done. Time remaining: %u sec%s\n"
 msgstr ""
 
-#: src/dialogs.c:1335
+#: src/dialogs.c:1391
 #, c-format
 msgid ""
 "\n"
@@ -4447,7 +4462,7 @@
 "\n"
 "%d/%d kuvaa avattu. Aikaa jäljellä %u s.\n"
 
-#: src/dialogs.c:1337
+#: src/dialogs.c:1393
 #, c-format
 msgid ""
 "\n"
@@ -4456,7 +4471,7 @@
 "\n"
 "%d/%d kuvaa avattu.\n"
 
-#: src/dialogs.c:1341
+#: src/dialogs.c:1396
 #, c-format
 msgid ""
 "\n"
@@ -4465,7 +4480,7 @@
 "\n"
 "%d kuvaa avattu.\n"
 
-#: src/dialogs.c:1940
+#: src/dialogs.c:1993
 #, c-format
 msgid ""
 "\n"
@@ -4474,7 +4489,7 @@
 "\n"
 "Aikaa jäljellä: %d s"
 
-#: src/dialogs.c:1988
+#: src/dialogs.c:2040
 #, c-format
 msgid ""
 "\n"
@@ -4485,7 +4500,7 @@
 "Valitettavasti LiVES voi avata vain %d tiedostoa kerralla.\n"
 "Sulje joku tiedosto ja yritä uudelleen."
 
-#: src/dialogs.c:1994
+#: src/dialogs.c:2047
 #, c-format
 msgid ""
 "LiVES was unable to write to its temporary directory.\n"
@@ -4504,27 +4519,27 @@
 "\n"
 "Varmista että sinulla on kirjoitusoikeus tähän kansioon."
 
-#: src/dialogs.c:2005
+#: src/dialogs.c:2059
 msgid ""
 "\n"
 "LiVES currently requires either 'mplayer', 'mplayer2', or 'sox' to function. "
 "Please install one or other of these, and try again.\n"
 msgstr ""
 
-#: src/dialogs.c:2010
+#: src/dialogs.c:2064
 msgid ""
 "Audio was not loaded; please install mplayer or mplayer2 if you expected "
 "audio for this clip.\n"
 msgstr ""
 
-#: src/dialogs.c:2014
+#: src/dialogs.c:2069
 msgid ""
 "Audio resampling is required for this format.\n"
 "Please install 'sox'\n"
 "Or switch to another encoder format in Tools | Preferences | Encoding\n"
 msgstr ""
 
-#: src/dialogs.c:2019
+#: src/dialogs.c:2075
 msgid ""
 "\n"
 "\n"
@@ -4532,19 +4547,19 @@
 "Please set the audio codec in Tools|Preferences|Encoding\n"
 msgstr ""
 
-#: src/dialogs.c:2024
+#: src/dialogs.c:2080
 msgid ""
 "This layout includes generated frames.\n"
 "It cannot be saved, you must render it to a clip first.\n"
 msgstr ""
 
-#: src/dialogs.c:2029
+#: src/dialogs.c:2085
 msgid ""
 "This layout includes generated or recorded audio.\n"
 "It cannot be saved, you must render it to a clip first.\n"
 msgstr ""
 
-#: src/dialogs.c:2039 src/dialogs.c:2137
+#: src/dialogs.c:2095 src/dialogs.c:2189
 #, c-format
 msgid ""
 "\n"
@@ -4555,7 +4570,7 @@
 "\n"
 "%s-formaatin rajoituksista johtuen\n"
 
-#: src/dialogs.c:2059
+#: src/dialogs.c:2115
 msgid ""
 "LiVES recommends the following settings:\n"
 "\n"
@@ -4563,77 +4578,77 @@
 "LiVES suosittelee seuraavia asetuksia:\n"
 "\n"
 
-#: src/dialogs.c:2065 src/dialogs.c:2174 src/resample.c:850
+#: src/dialogs.c:2121 src/dialogs.c:2225 src/resample.c:839
 msgid ", signed"
 msgstr ""
 
-#: src/dialogs.c:2066 src/dialogs.c:2175 src/resample.c:853
+#: src/dialogs.c:2122 src/dialogs.c:2226 src/resample.c:841
 msgid ", unsigned"
 msgstr ""
 
-#: src/dialogs.c:2070 src/dialogs.c:2179 src/resample.c:858
+#: src/dialogs.c:2126 src/dialogs.c:2230 src/resample.c:846
 msgid ", little-endian"
 msgstr ""
 
-#: src/dialogs.c:2071 src/dialogs.c:2180 src/resample.c:861
+#: src/dialogs.c:2127 src/dialogs.c:2231 src/resample.c:848
 msgid ", big-endian"
 msgstr ""
 
-#: src/dialogs.c:2077
+#: src/dialogs.c:2132
 #, c-format
 msgid "Use an audio rate of %d Hz%s%s\n"
 msgstr ""
 
-#: src/dialogs.c:2085
+#: src/dialogs.c:2140
 #, c-format
 msgid "Set video rate to %.3f frames per second\n"
 msgstr "Aseta videon nopeudeksi %.3f kuvaa sekunnissa\n"
 
-#: src/dialogs.c:2089
+#: src/dialogs.c:2143
 #, c-format
 msgid "Set video rate to %d:%d frames per second\n"
 msgstr "Aseta videon nopeudeksi %d:%d kuvaa sekunnissa\n"
 
-#: src/dialogs.c:2094 src/dialogs.c:2209
+#: src/dialogs.c:2148 src/dialogs.c:2258
 #, c-format
 msgid "Set video size to %d x %d pixels\n"
 msgstr "Aseta videon kooksi %d x %d pikseliä\n"
 
-#: src/dialogs.c:2102 src/dialogs.c:2208
+#: src/dialogs.c:2156 src/dialogs.c:2257
 msgid ""
 "\n"
 "You may wish to:\n"
 msgstr ""
 
-#: src/dialogs.c:2105 src/dialogs.c:2200
+#: src/dialogs.c:2159 src/dialogs.c:2249
 #, c-format
 msgid "resize video to %d x %d pixels\n"
 msgstr ""
 
-#: src/dialogs.c:2110
+#: src/dialogs.c:2163
 msgid "disable audio, since the target encoder cannot encode audio\n"
 msgstr ""
 
-#: src/dialogs.c:2170
+#: src/dialogs.c:2221
 msgid "LiVES must:\n"
 msgstr ""
 
-#: src/dialogs.c:2185
+#: src/dialogs.c:2235
 #, c-format
 msgid "resample audio to %d Hz%s%s\n"
 msgstr ""
 
-#: src/dialogs.c:2192
+#: src/dialogs.c:2242
 #, c-format
 msgid "resample video to %.3f frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:2196
+#: src/dialogs.c:2245
 #, c-format
 msgid "resample video to %d:%d frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:2215
+#: src/dialogs.c:2263
 msgid ""
 "\n"
 "You will be able to undo these changes afterwards.\n"
@@ -4647,7 +4662,7 @@
 "Napsauta \"OK\" jatkaaksesi, \"Peruuta\" keskeyttääksesi.\n"
 "\n"
 
-#: src/dialogs.c:2218
+#: src/dialogs.c:2265
 msgid ""
 "\n"
 "Changes applied to the selection will not be permanent.\n"
@@ -4657,7 +4672,7 @@
 "Valintaan tehdyt muutokset eivät ole pysyviä.\n"
 "\n"
 
-#: src/dialogs.c:2237
+#: src/dialogs.c:2285
 msgid ""
 "\n"
 "\n"
@@ -4666,7 +4681,7 @@
 "Try recording for just a selection of the file."
 msgstr ""
 
-#: src/dialogs.c:2244
+#: src/dialogs.c:2293
 msgid ""
 "The playback speed (fps), or the audio rate\n"
 " of the clipboard does not match\n"
@@ -4677,7 +4692,7 @@
 "Please press Cancel to abort the insert, or OK to continue."
 msgstr ""
 
-#: src/dialogs.c:2253
+#: src/dialogs.c:2304
 #, c-format
 msgid ""
 "When opening a yuvmpeg stream, you should first create a fifo file in:\n"
@@ -4690,11 +4705,11 @@
 "click Cancel."
 msgstr ""
 
-#: src/dialogs.c:2305
+#: src/dialogs.c:2356
 msgid "Show Keys"
 msgstr ""
 
-#: src/dialogs.c:2306
+#: src/dialogs.c:2358
 msgid ""
 "You can use the following keys during playback to control LiVES:-\n"
 "\n"
@@ -4736,11 +4751,11 @@
 "g                             ping pong loops\n"
 msgstr ""
 
-#: src/dialogs.c:2313
+#: src/dialogs.c:2365
 msgid "Multitrack Keys"
 msgstr "Multitrack-näppäimet"
 
-#: src/dialogs.c:2314
+#: src/dialogs.c:2367
 msgid ""
 "You can use the following keys to control the multitrack window:-\n"
 "\n"
@@ -4762,18 +4777,18 @@
 "For other keys, see the menus.\n"
 msgstr ""
 
-#: src/dialogs.c:2322
+#: src/dialogs.c:2375
 msgid "Message History"
 msgstr "Viestihistoria"
 
-#: src/dialogs.c:2335
+#: src/dialogs.c:2388
 #, c-format
 msgid ""
 "After upgrading/installing, you may need to adjust the <prefix_dir> setting "
 "in your %s file"
 msgstr ""
 
-#: src/dialogs.c:2344
+#: src/dialogs.c:2399
 #, c-format
 msgid ""
 "\n"
@@ -4784,25 +4799,25 @@
 "or change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/dialogs.c:2352
+#: src/dialogs.c:2408
 msgid ""
 "Sorry, unknown audio type.\n"
 "\n"
 " (Filenames must end in .mp3, .ogg, .wav, .mod, .xm or .it)"
 msgstr ""
 
-#: src/dialogs.c:2353
+#: src/dialogs.c:2409
 msgid "failed (unknown type)\n"
 msgstr ""
 
-#: src/dialogs.c:2358
+#: src/dialogs.c:2415
 msgid ""
 "\n"
 "Do you wish to remove the layout files associated with this set ?\n"
 "(They will not be usable without the set).\n"
 msgstr ""
 
-#: src/dialogs.c:2363
+#: src/dialogs.c:2421
 #, c-format
 msgid ""
 "\n"
@@ -4811,7 +4826,7 @@
 "Click Cancel to pick a new name.\n"
 msgstr ""
 
-#: src/dialogs.c:2370
+#: src/dialogs.c:2429
 msgid ""
 "\n"
 "Frames from this clip are used in some multitrack layouts.\n"
@@ -4823,7 +4838,7 @@
 "Haluatko varmasti jatkaa?\n"
 "."
 
-#: src/dialogs.c:2374
+#: src/dialogs.c:2433
 msgid ""
 "\n"
 "Audio from this clip is used in some multitrack layouts.\n"
@@ -4835,7 +4850,7 @@
 "Haluatko varmasti jatkaa?\n"
 "."
 
-#: src/dialogs.c:2378
+#: src/dialogs.c:2438
 #, c-format
 msgid ""
 "\n"
@@ -4846,7 +4861,7 @@
 "Otherwise click Cancel to skip loading this file.\n"
 msgstr ""
 
-#: src/dialogs.c:2385
+#: src/dialogs.c:2446
 #, c-format
 msgid ""
 "\n"
@@ -4856,7 +4871,7 @@
 "The clip could not be loaded.\n"
 msgstr ""
 
-#: src/dialogs.c:2392
+#: src/dialogs.c:2455
 msgid ""
 "\n"
 "Dear user, the jack developers decided to remove the -Z option from jackd.\n"
@@ -4864,7 +4879,7 @@
 "Alternately, select a different audio player in Preferences.\n"
 msgstr ""
 
-#: src/dialogs.c:2396
+#: src/dialogs.c:2460
 msgid ""
 "\n"
 "Unable to start up jack. Please ensure that alsa is set up correctly on your "
@@ -4873,13 +4888,13 @@
 "Automatic jack startup will be disabled now.\n"
 msgstr ""
 
-#: src/dialogs.c:2402
+#: src/dialogs.c:2466
 msgid ""
 "\n"
 "Unable to connect to jack server. Please start jack before starting LiVES\n"
 msgstr ""
 
-#: src/dialogs.c:2411
+#: src/dialogs.c:2475
 #, c-format
 msgid ""
 "\n"
@@ -4890,7 +4905,7 @@
 "%s\n"
 msgstr ""
 
-#: src/dialogs.c:2418
+#: src/dialogs.c:2482
 msgid ""
 "\n"
 "Alternately, you can restart LiVES and select another audio player.\n"
@@ -4899,7 +4914,7 @@
 "Voit myös käynnistää LiVESin uudelleen ja valita jonkun toisen "
 "äänisoittimen.\n"
 
-#: src/dialogs.c:2423
+#: src/dialogs.c:2488
 #, c-format
 msgid ""
 "\n"
@@ -4909,7 +4924,7 @@
 "It is recommended to increase it to at least %d MB"
 msgstr ""
 
-#: src/dialogs.c:2429
+#: src/dialogs.c:2496
 #, c-format
 msgid ""
 "\n"
@@ -4918,7 +4933,7 @@
 "Do you wish to delete them ?\n"
 msgstr ""
 
-#: src/dialogs.c:2436
+#: src/dialogs.c:2504
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for multitrack undo.\n"
@@ -4926,7 +4941,7 @@
 "using Preferences/Multitrack/Undo Memory\n"
 msgstr ""
 
-#: src/dialogs.c:2440
+#: src/dialogs.c:2508
 msgid ""
 "\n"
 "Out of memory for undo.\n"
@@ -4934,7 +4949,7 @@
 "using Preferences/Multitrack/Undo Memory\n"
 msgstr ""
 
-#: src/dialogs.c:2444
+#: src/dialogs.c:2512
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for the multitrack undo buffer.\n"
@@ -4943,57 +4958,57 @@
 "LiVES ei pystynyt varaamaan riittävästi muistia multitrack-tilan kumoa-"
 "toiminnolle.\n"
 
-#: src/dialogs.c:2446
+#: src/dialogs.c:2514
 msgid "or enter a smaller value.\n"
 msgstr "tai anna pienempi arvo.\n"
 
-#: src/dialogs.c:2448
+#: src/dialogs.c:2516
 msgid "Try again from the clip editor, try closing some other applications\n"
 msgstr ""
 
-#: src/dialogs.c:2449
+#: src/dialogs.c:2517
 msgid "Try closing some other applications\n"
 msgstr "Kokeile sulkea muita ohjelmia\n"
 
-#: src/dialogs.c:2460
+#: src/dialogs.c:2529
 msgid ""
 "Multitrack is set to 0 audio channels, but this layout has audio.\n"
 "You should adjust the audio settings from the Tools menu.\n"
 msgstr ""
 
-#: src/dialogs.c:2464
+#: src/dialogs.c:2534
 msgid ""
 "The current layout has audio, so audio channels may not be set to zero.\n"
 msgstr ""
 
-#: src/dialogs.c:2468
+#: src/dialogs.c:2539
 msgid ""
 "Multitrack audio preview is only available with the\n"
 "\"jack\" or \"pulse audio\" audio player.\n"
 "You can set this in Tools|Preferences|Playback."
 msgstr ""
 
-#: src/dialogs.c:2472
+#: src/dialogs.c:2545
 msgid ""
 "Errors were detected in the layout (which may be due to transferring from "
 "another system, or from an older version of LiVES).\n"
 "Should I try to repair the disk copy of the layout ?\n"
 msgstr ""
 
-#: src/dialogs.c:2476
+#: src/dialogs.c:2549
 msgid ""
 "LiVES was unable to load the layout.\n"
 "Sorry.\n"
 msgstr ""
 
-#: src/dialogs.c:2482
+#: src/dialogs.c:2555
 msgid ""
 "\n"
 "\n"
 "Audio rate must be greater than 0.\n"
 msgstr ""
 
-#: src/dialogs.c:2486
+#: src/dialogs.c:2559
 msgid ""
 "\n"
 "Event list will be very large\n"
@@ -5001,14 +5016,14 @@
 "Are you sure you wish to view it ?\n"
 msgstr ""
 
-#: src/dialogs.c:2491
+#: src/dialogs.c:2564
 msgid ""
 "\n"
 "\n"
 "You must install 'dvgrab' to use this function.\n"
 msgstr ""
 
-#: src/dialogs.c:2496
+#: src/dialogs.c:2570
 msgid ""
 "\n"
 "\n"
@@ -5017,25 +5032,25 @@
 "You may need to select one of these in Tools/Preferences/Playback.\n"
 msgstr ""
 
-#: src/dialogs.c:2500
+#: src/dialogs.c:2574
 msgid "Video playback plugin failed to initialise palette !\n"
 msgstr ""
 
-#: src/dialogs.c:2504
+#: src/dialogs.c:2579
 msgid "Decoder plugin failed to initialise palette !\n"
 msgstr ""
 
-#: src/dialogs.c:2509
+#: src/dialogs.c:2584
 msgid "Unable to set framerate of video plugin\n"
 msgstr ""
 
-#: src/dialogs.c:2514
+#: src/dialogs.c:2590
 msgid ""
 "After a crash, it is advisable to clean up the disk with\n"
 "File|Clean up disk space\n"
 msgstr ""
 
-#: src/dialogs.c:2526
+#: src/dialogs.c:2604
 #, c-format
 msgid ""
 "Stream frame size is too large for your network buffers.\n"
@@ -5044,33 +5059,33 @@
 "echo %d > /proc/sys/net/core/rmem_max\n"
 msgstr ""
 
-#: src/dialogs.c:2714
+#: src/dialogs.c:2800
 msgid "cancelled.\n"
 msgstr "peruttiin.\n"
 
-#: src/dialogs.c:2721
+#: src/dialogs.c:2805
 msgid "failed.\n"
 msgstr "epäonnistui.\n"
 
-#: src/dialogs.c:2728
+#: src/dialogs.c:2810
 msgid "done.\n"
 msgstr "valmis.\n"
 
-#: src/dialogs.c:2732
+#: src/dialogs.c:2814
 msgid "error in file. Failed.\n"
 msgstr ""
 
-#: src/dialogs.c:2766 src/dialogs.c:2815 src/dialogs.c:2839
+#: src/dialogs.c:2848 src/dialogs.c:2897 src/dialogs.c:2921
 #, c-format
 msgid "Additional info: %s\n"
 msgstr ""
 
-#: src/dialogs.c:2769
+#: src/dialogs.c:2851
 #, c-format
 msgid "The error value was %d%s\n"
 msgstr ""
 
-#: src/dialogs.c:2772
+#: src/dialogs.c:2854
 #, c-format
 msgid ""
 "\n"
@@ -5080,7 +5095,7 @@
 "%s%s%s"
 msgstr ""
 
-#: src/dialogs.c:2818
+#: src/dialogs.c:2900
 #, c-format
 msgid ""
 "\n"
@@ -5090,7 +5105,7 @@
 "%s"
 msgstr ""
 
-#: src/dialogs.c:2842
+#: src/dialogs.c:2924
 #, c-format
 msgid ""
 "\n"
@@ -5100,7 +5115,7 @@
 "%s"
 msgstr ""
 
-#: src/dialogs.c:2886
+#: src/dialogs.c:2968
 #, c-format
 msgid ""
 "\n"
@@ -5109,7 +5124,7 @@
 "Please check for possible error causes.\n"
 msgstr ""
 
-#: src/dialogs.c:2890
+#: src/dialogs.c:2971
 #, c-format
 msgid ""
 "\n"
@@ -5119,7 +5134,7 @@
 "%s.\n"
 msgstr ""
 
-#: src/dialogs.c:2921
+#: src/dialogs.c:3002
 #, c-format
 msgid ""
 "\n"
@@ -5128,7 +5143,7 @@
 "Please check for possible error causes.\n"
 msgstr ""
 
-#: src/dialogs.c:2925
+#: src/dialogs.c:3005
 #, c-format
 msgid ""
 "\n"
@@ -5138,12 +5153,12 @@
 "%s.\n"
 msgstr ""
 
-#: src/dialogs.c:2993
+#: src/dialogs.c:3073
 #, c-format
 msgid "Value for \"%s\" could not be read."
 msgstr ""
 
-#: src/dialogs.c:3011
+#: src/dialogs.c:3091
 #, c-format
 msgid ""
 "\n"
@@ -5152,7 +5167,7 @@
 "Please check your system for errors.\n"
 msgstr ""
 
-#: src/dialogs.c:3020
+#: src/dialogs.c:3100
 #, c-format
 msgid ""
 "\n"
@@ -5165,7 +5180,7 @@
 "%s\n"
 "Tarkista tiedoston käyttöoikeudet ja yritä uudestaan."
 
-#: src/dialogs.c:3027
+#: src/dialogs.c:3109
 #, c-format
 msgid ""
 "\n"
@@ -5174,7 +5189,7 @@
 "Please check the directory permissions and try again."
 msgstr ""
 
-#: src/dialogs.c:3034
+#: src/dialogs.c:3116
 #, c-format
 msgid ""
 "\n"
@@ -5182,14 +5197,14 @@
 "%s\n"
 msgstr ""
 
-#: src/dialogs.c:3041
+#: src/dialogs.c:3123
 msgid ""
 "\n"
 "Abort and exit immediately from LiVES\n"
 "Are you sure ?\n"
 msgstr ""
 
-#: src/dialogs.c:3047
+#: src/dialogs.c:3129
 #, c-format
 msgid ""
 "\n"
@@ -5197,13 +5212,13 @@
 "Please select another encoder from the list.\n"
 msgstr ""
 
-#: src/dialogs.c:3056
+#: src/dialogs.c:3139
 msgid ""
 "\n"
 "This card is already in use and cannot be opened multiple times.\n"
 msgstr ""
 
-#: src/dialogs.c:3061
+#: src/dialogs.c:3145
 #, c-format
 msgid ""
 "\n"
@@ -5213,27 +5228,27 @@
 "- Check if the device actually exists.\n"
 msgstr ""
 
-#: src/dialogs.c:3068
+#: src/dialogs.c:3153
 msgid ""
 "\n"
 "This file already has subtitles loaded.\n"
 "Do you wish to overwrite the existing subtitles ?\n"
 msgstr ""
 
-#: src/dialogs.c:3072
+#: src/dialogs.c:3157
 msgid ""
 "\n"
 "LiVES currently only supports subtitles of type .srt and .sub.\n"
 msgstr ""
 
-#: src/dialogs.c:3076
+#: src/dialogs.c:3161
 msgid ""
 "\n"
 "Erase all subtitles from this clip.\n"
 "Are you sure ?\n"
 msgstr ""
 
-#: src/dialogs.c:3082
+#: src/dialogs.c:3168
 #, c-format
 msgid ""
 "\n"
@@ -5242,14 +5257,14 @@
 "or OK to continue and save as type \"%s\"\n"
 msgstr ""
 
-#: src/dialogs.c:3089
+#: src/dialogs.c:3176
 msgid ""
 "\n"
 "Do you wish to move the current clip sets to the new directory ?\n"
 "(If unsure, click Yes)\n"
 msgstr ""
 
-#: src/dialogs.c:3093
+#: src/dialogs.c:3181
 #, c-format
 msgid ""
 "\n"
@@ -5260,19 +5275,19 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:3099
+#: src/dialogs.c:3188
 msgid ""
 "\n"
 "No video input devices could be found.\n"
 msgstr ""
 
-#: src/dialogs.c:3103
+#: src/dialogs.c:3192
 msgid ""
 "\n"
 "All video input devices are already in use.\n"
 msgstr ""
 
-#: src/dialogs.c:3107
+#: src/dialogs.c:3196
 msgid ""
 "\n"
 "\n"
@@ -5280,15 +5295,14 @@
 "DO NOT SHUT DOWN OR CLOSE LIVES !\n"
 msgstr ""
 
-#: src/dialogs.c:3127
+#: src/dialogs.c:3203
 #, c-format
 msgid ""
 "No clips were recovered for set (%s).\n"
 "Please check the spelling of the set name and try again.\n"
 msgstr ""
 
-#. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:3136
+#: src/dialogs.c:3214
 #, c-format
 msgid ""
 "\n"
@@ -5300,7 +5314,7 @@
 msgstr ""
 
 #. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:3144
+#: src/dialogs.c:3222
 #, c-format
 msgid ""
 "\n"
@@ -5309,34 +5323,34 @@
 "\n"
 msgstr ""
 
-#: src/dialogs.c:3150
+#: src/dialogs.c:3228
 msgid ""
 "\n"
 "You must have autolives.pl installed and in your path to use this toy.\n"
 "Consult your package distributor.\n"
 msgstr ""
 
-#: src/dialogs.c:3154
+#: src/dialogs.c:3232
 msgid ""
 "\n"
 "You must have a minimum of one clip loaded to use this toy.\n"
 msgstr ""
 
-#: src/dialogs.c:3158
+#: src/dialogs.c:3236
 msgid ""
 "\n"
 "LiVES lost its connection to jack and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:3162
+#: src/dialogs.c:3240
 msgid ""
 "\n"
 "LiVES lost its connection to pulseaudio and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:3175
+#: src/dialogs.c:3254
 #, c-format
 msgid ""
 "\n"
@@ -5345,285 +5359,285 @@
 "Do you wish to allow this (for this session only) ?\n"
 msgstr ""
 
-#: src/effects.c:60
+#: src/effects.c:61
 msgid "generator"
 msgstr ""
 
-#: src/effects.c:61
+#: src/effects.c:62
 msgid "Generators"
 msgstr ""
 
-#: src/effects.c:63
+#: src/effects.c:64
 msgid "audio generator"
 msgstr ""
 
-#: src/effects.c:64
+#: src/effects.c:65
 msgid "Audio Generators"
 msgstr ""
 
-#: src/effects.c:66
+#: src/effects.c:67
 msgid "audio/video generator"
 msgstr ""
 
-#: src/effects.c:67
+#: src/effects.c:68
 msgid "Audio/Video Generators"
 msgstr ""
 
-#: src/effects.c:69
+#: src/effects.c:70
 msgid "data generator"
 msgstr ""
 
-#: src/effects.c:70
+#: src/effects.c:71
 msgid "Data Generators"
 msgstr ""
 
-#: src/effects.c:72
+#: src/effects.c:73
 msgid "data visualiser"
 msgstr ""
 
-#: src/effects.c:73
+#: src/effects.c:74
 msgid "Data Visualisers"
 msgstr ""
 
-#: src/effects.c:75
+#: src/effects.c:76
 msgid "data processor"
 msgstr ""
 
-#: src/effects.c:76
+#: src/effects.c:77
 msgid "Data Processors"
 msgstr ""
 
-#: src/effects.c:78
+#: src/effects.c:79
 msgid "data source"
 msgstr ""
 
-#: src/effects.c:79
+#: src/effects.c:80
 msgid "Data Sources"
 msgstr ""
 
-#: src/effects.c:81
+#: src/effects.c:82
 msgid "transition"
 msgstr "vaihtuma"
 
-#: src/effects.c:82
+#: src/effects.c:83
 msgid "Transitions"
 msgstr "Vaihtumat"
 
-#: src/effects.c:84
+#: src/effects.c:85
 msgid "effect"
 msgstr "tehoste"
 
-#: src/effects.c:87 src/rfx-builder.c:187
+#: src/effects.c:88 src/rfx-builder.c:187
 msgid "utility"
 msgstr ""
 
-#: src/effects.c:88
+#: src/effects.c:89
 msgid "Utilities"
 msgstr "Apuohjelmat"
 
-#: src/effects.c:90
+#: src/effects.c:91
 msgid "compositor"
 msgstr ""
 
-#: src/effects.c:91
+#: src/effects.c:92
 msgid "Compositors"
 msgstr ""
 
-#: src/effects.c:93
+#: src/effects.c:94
 msgid "tap"
 msgstr ""
 
-#: src/effects.c:94
+#: src/effects.c:95
 msgid "Taps"
 msgstr ""
 
-#: src/effects.c:96
+#: src/effects.c:97
 msgid "splitter"
 msgstr ""
 
-#: src/effects.c:97
+#: src/effects.c:98
 msgid "Splitters"
 msgstr ""
 
-#: src/effects.c:99
+#: src/effects.c:100
 msgid "converter"
 msgstr ""
 
-#: src/effects.c:100
+#: src/effects.c:101
 msgid "Converters"
 msgstr ""
 
-#: src/effects.c:102
+#: src/effects.c:103
 msgid "analyser"
 msgstr ""
 
-#: src/effects.c:103
+#: src/effects.c:104
 msgid "Analysers"
 msgstr ""
 
-#: src/effects.c:108
+#: src/effects.c:109
 msgid "audio/video"
 msgstr ""
 
-#: src/effects.c:109
+#: src/effects.c:110
 msgid "Audio/Video Transitions"
 msgstr ""
 
-#: src/effects.c:111
+#: src/effects.c:112
 msgid "video only"
 msgstr ""
 
-#: src/effects.c:112
+#: src/effects.c:113
 msgid "Video only Transitions"
 msgstr ""
 
-#: src/effects.c:114 src/multitrack.c:10740
+#: src/effects.c:115 src/multitrack.c:10962
 msgid "audio only"
 msgstr ""
 
-#: src/effects.c:115
+#: src/effects.c:116
 msgid "Audio only Transitions"
 msgstr ""
 
-#: src/effects.c:117 src/effects.c:120 src/multitrack.c:18757
+#: src/effects.c:118 src/effects.c:121 src/multitrack.c:19097
 msgid "audio"
 msgstr ""
 
-#: src/effects.c:118
+#: src/effects.c:119
 msgid "Audio Mixers"
 msgstr ""
 
-#: src/effects.c:121
+#: src/effects.c:122
 msgid "Audio Effects"
 msgstr ""
 
-#: src/effects.c:123
+#: src/effects.c:124
 msgid "video"
 msgstr ""
 
-#: src/effects.c:124
+#: src/effects.c:125
 msgid "Video Effects"
 msgstr ""
 
-#: src/effects.c:126
+#: src/effects.c:127
 msgid "audio volume controller"
 msgstr ""
 
-#: src/effects.c:127
+#: src/effects.c:128
 msgid "Audio Volume Controllers"
 msgstr ""
 
-#: src/effects.c:129
+#: src/effects.c:130
 msgid "video analyser"
 msgstr ""
 
-#: src/effects.c:130
+#: src/effects.c:131
 msgid "Video analysers"
 msgstr ""
 
-#: src/effects.c:132
+#: src/effects.c:133
 msgid "audio analyser"
 msgstr ""
 
-#: src/effects.c:133
+#: src/effects.c:134
 msgid "Audio Analysers"
 msgstr ""
 
-#: src/effects.c:137 src/plugins.c:2559 src/plugins.c:2573
+#: src/effects.c:138 src/plugins.c:2507 src/plugins.c:2521
 msgid "unknown"
 msgstr "tuntematon"
 
-#: src/effects.c:238
+#: src/effects.c:235
 #, c-format
 msgid "%s all frames..."
 msgstr "%s kaikki kuvat..."
 
-#: src/effects.c:243
+#: src/effects.c:239
 #, c-format
 msgid "%s clipboard into frames %d to %d..."
 msgstr ""
 
-#: src/effects.c:250
+#: src/effects.c:245
 #, c-format
 msgid "%s to clipboard..."
 msgstr "%s leikepöydälle..."
 
-#: src/effects.c:254
+#: src/effects.c:248
 #, c-format
 msgid "%s to new clip..."
 msgstr "%s uuteen leikkeeseen..."
 
-#: src/effects.c:259
+#: src/effects.c:252
 #, c-format
 msgid "%s frames %d to %d..."
 msgstr "%s kuvat %d - %d..."
 
-#: src/effects.c:290
+#: src/effects.c:283
 #, c-format
 msgid "%s clipboard with selection"
 msgstr ""
 
-#: src/effects.c:295
+#: src/effects.c:287
 #, c-format
 msgid "%s to clipboard"
 msgstr "%s leikepöydälle"
 
-#: src/effects.c:299
+#: src/effects.c:290
 #, c-format
 msgid "%s to new clip"
 msgstr "%s uuteen leikkeeseen"
 
-#: src/effects.c:304
+#: src/effects.c:294
 #, c-format
 msgid "%s frames %d to %d"
 msgstr "%s kuvat %d - %d"
 
-#: src/effects.c:456 src/effects.c:523
+#: src/effects.c:443 src/effects.c:507
 msgid ""
 "\n"
 "No frames were generated.\n"
 msgstr ""
 
-#: src/effects-weed.c:431
+#: src/effects-weed.c:452
 msgid "integer"
 msgstr ""
 
-#: src/effects-weed.c:432
+#: src/effects-weed.c:454
 msgid "int64"
 msgstr ""
 
-#: src/effects-weed.c:433
+#: src/effects-weed.c:456
 msgid "boolean"
 msgstr ""
 
-#: src/effects-weed.c:434
+#: src/effects-weed.c:458
 msgid "double"
 msgstr ""
 
-#: src/effects-weed.c:435
+#: src/effects-weed.c:460
 msgid "string"
 msgstr ""
 
-#: src/effects-weed.c:436
+#: src/effects-weed.c:462
 msgid "pointer"
 msgstr ""
 
-#: src/effects-weed.c:4591
+#: src/effects-weed.c:4581
 #, c-format
 msgid "Error: plugin %s has no weed_setup() function.\n"
 msgstr "Virhe: %s-liitännäinen ei sisällä weed_setup()-toimintoa.\n"
 
-#: src/effects-weed.c:4606
+#: src/effects-weed.c:4595
 #, c-format
 msgid "No usable filters found in plugin %s\n"
 msgstr ""
 
-#: src/effects-weed.c:4680
+#: src/effects-weed.c:4668
 #, c-format
 msgid "Found duplicate plugin %s"
 msgstr ""
 
-#: src/effects-weed.c:4734
+#: src/effects-weed.c:4723
 #, c-format
 msgid ""
 "Info: Unable to load plugin %s\n"
@@ -5632,259 +5646,259 @@
 "Info: Liitännäistä %s ei voitu ladata\n"
 "Virheilmoitus oli: %s\n"
 
-#: src/effects-weed.c:4737 src/effects-weed.c:5858
+#: src/effects-weed.c:4726 src/effects-weed.c:5847
 msgid "Some plugin directories"
 msgstr ""
 
 #. TRANSLATORS: example " - LADSPA plugins -"
-#: src/effects-weed.c:4812 src/rte_window.c:2105
+#: src/effects-weed.c:4801 src/rte_window.c:2107
 #, c-format
 msgid " - %s plugins -"
 msgstr ""
 
-#: src/effects-weed.c:5012
+#: src/effects-weed.c:4998
 #, c-format
 msgid "Successfully loaded %d Weed filters\n"
 msgstr "Ladattu onnistuneesti %d Weed-suodatinta\n"
 
-#: src/effects-weed.c:5177
+#: src/effects-weed.c:5162
 #, c-format
 msgid "Invalid compound effect %s - has conflicting target_fps\n"
 msgstr ""
 
-#: src/effects-weed.c:5197
+#: src/effects-weed.c:5182
 #, c-format
 msgid "Invalid compound effect %s - has multiple transition parameters\n"
 msgstr ""
 
-#: src/effects-weed.c:5211
+#: src/effects-weed.c:5196
 #, c-format
 msgid "Invalid compound effect %s - has multiple master volume parameters\n"
 msgstr ""
 
-#: src/effects-weed.c:5346
+#: src/effects-weed.c:5329
 #, c-format
 msgid "Invalid compound effect %s - must have >1 sub filters\n"
 msgstr ""
 
-#: src/effects-weed.c:5366
+#: src/effects-weed.c:5349
 #, c-format
 msgid "Invalid effect %s found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5381
+#: src/effects-weed.c:5364
 #, c-format
 msgid "Invalid default found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5392
+#: src/effects-weed.c:5375
 #, c-format
 msgid "Invalid filter %d for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5406
+#: src/effects-weed.c:5389
 #, c-format
 msgid "Invalid param %d for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5433
+#: src/effects-weed.c:5416
 #, c-format
 msgid ""
 "Invalid number of values for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5467
+#: src/effects-weed.c:5450
 #, c-format
 msgid ""
 "Invalid non-boolean value for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5500
+#: src/effects-weed.c:5483
 #, c-format
 msgid "Invalid param link found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5511
+#: src/effects-weed.c:5494
 #, c-format
 msgid ""
 "Invalid out filter %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5529
+#: src/effects-weed.c:5513
 #, c-format
 msgid ""
 "Invalid out param %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5541
+#: src/effects-weed.c:5526
 #, c-format
 msgid ""
 "Invalid non-boolean value for autoscale found in compound effect %s, line "
 "%d\n"
 msgstr ""
 
-#: src/effects-weed.c:5552
+#: src/effects-weed.c:5537
 #, c-format
 msgid ""
 "Invalid in filter %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5566
+#: src/effects-weed.c:5552
 #, c-format
 msgid ""
 "Invalid in param %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5594
+#: src/effects-weed.c:5581
 #, c-format
 msgid "Invalid channel link found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5605
+#: src/effects-weed.c:5592
 #, c-format
 msgid ""
 "Invalid out filter %d for link channels found in compound effect %s, line "
 "%d\n"
 msgstr ""
 
-#: src/effects-weed.c:5623
+#: src/effects-weed.c:5611
 #, c-format
 msgid ""
 "Invalid out channel %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5633
+#: src/effects-weed.c:5622
 #, c-format
 msgid ""
 "Invalid in filter %d for link channels found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5651
+#: src/effects-weed.c:5641
 #, c-format
 msgid ""
 "Invalid in channel %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5687
+#: src/effects-weed.c:5678
 #, c-format
 msgid "Compound:%s"
 msgstr ""
 
-#: src/effects-weed.c:5758
+#: src/effects-weed.c:5749
 #, c-format
 msgid "Successfully loaded %d compound filters\n"
 msgstr ""
 
-#: src/effects-weed.c:6591
+#: src/effects-weed.c:6570
 #, c-format
 msgid "Effect %s cannot be used with this audio player.\n"
 msgstr ""
 
-#: src/effects-weed.c:6737
+#: src/effects-weed.c:6718
 #, c-format
 msgid "Failed to start instance %s, error code %d\n"
 msgstr ""
 
-#: src/effects-weed.c:6814
+#: src/effects-weed.c:6797
 #, c-format
 msgid "Unable to start generator %s\n"
 msgstr ""
 
-#: src/effects-weed.c:7621
+#: src/effects-weed.c:7607
 #, c-format
 msgid "Failed to start generator %s\n"
 msgstr ""
 
-#: src/effects-weed.c:7718
+#: src/effects-weed.c:7701
 #, c-format
 msgid "Failed to start generator %s, error %d\n"
 msgstr ""
 
-#: src/effects-weed.c:9012
+#: src/effects-weed.c:8993
 #, c-format
 msgid "%s [unstable] (%s)"
 msgstr ""
 
-#: src/effects-data.c:3278
+#: src/effects-data.c:3234
 #, c-format
 msgid "ACTIVATE (%s)"
 msgstr ""
 
-#: src/effects-data.c:3548
+#: src/effects-data.c:3501
 msgid "ACTIVATE"
 msgstr ""
 
-#: src/effects-data.c:3876
+#: src/effects-data.c:3829
 #, c-format
 msgid "Key slot %d"
 msgstr ""
 
-#: src/effects-data.c:3998
+#: src/effects-data.c:3951
 msgid "Autoscale"
 msgstr ""
 
-#: src/effects-data.c:4089
+#: src/effects-data.c:4042
 msgid "Add another connection for this output parameter"
 msgstr ""
 
-#: src/effects-data.c:4102 src/effects-data.c:4151
+#: src/effects-data.c:4055 src/effects-data.c:4104
 #, fuzzy
 msgid "Delete this connection"
 msgstr "_Poista tämä tehoste"
 
-#: src/effects-data.c:4138
+#: src/effects-data.c:4091
 msgid "Add another connection for this output channel"
 msgstr ""
 
-#: src/effects-data.c:4223
+#: src/effects-data.c:4176
 msgid "Connected to -->"
 msgstr ""
 
-#: src/effects-data.c:4243
+#: src/effects-data.c:4196
 #, c-format
 msgid "%s - Alpha Channel Connections"
 msgstr ""
 
-#: src/effects-data.c:4316
+#: src/effects-data.c:4269
 #, c-format
 msgid "%s - Parameter Data Connections"
 msgstr ""
 
-#: src/effects-data.c:4336
+#: src/effects-data.c:4289
 msgid "Autoscale All"
 msgstr ""
 
-#: src/effects-data.c:4361 src/effects-data.c:4890
+#: src/effects-data.c:4314 src/effects-data.c:4841
 msgid "ACTIVATED"
 msgstr ""
 
-#: src/effects-data.c:4774
+#: src/effects-data.c:4726
 msgid "LiVES: - Parameter and Alpha Channel Connections"
 msgstr ""
 
-#: src/effects-data.c:4785
+#: src/effects-data.c:4736
 msgid "Auto Connect Channels"
 msgstr ""
 
-#: src/effects-data.c:4797
+#: src/effects-data.c:4748
 msgid "Auto Connect Parameters"
 msgstr ""
 
-#: src/effects-data.c:4807
+#: src/effects-data.c:4758
 msgid "Disconnect All"
 msgstr ""
 
-#: src/effects-data.c:4875
+#: src/effects-data.c:4826
 #, c-format
 msgid "Input channel is already connected from (%d,%d) %s"
 msgstr ""
 
-#: src/effects-data.c:4891
+#: src/effects-data.c:4842
 #, c-format
 msgid "Input parameter is already connected from (%d,%d) %s"
 msgstr ""
 
-#: src/effects-data.c:4899
+#: src/effects-data.c:4851
 msgid "Input and output parameters are not compatible"
 msgstr ""
 
@@ -5896,43 +5910,43 @@
 msgid "_Reset Values"
 msgstr "_Palauta arvot"
 
-#: src/framedraw.c:267
+#: src/framedraw.c:265
 msgid "_Frame"
 msgstr ""
 
-#: src/paramspecial.c:266
+#: src/paramspecial.c:259
 msgid "Maintain _Aspect Ratio"
 msgstr "Säilytä kuva_suhde"
 
-#: src/paramspecial.c:267
+#: src/paramspecial.c:260
 msgid "Maintain aspect ratio of original frame"
 msgstr "Säilytä alkuperäinen kuvasuhde"
 
-#: src/paramspecial.c:341
+#: src/paramspecial.c:335
 msgid "Display Password"
 msgstr ""
 
-#: src/paramwindow.c:450
+#: src/paramwindow.c:447
 msgid "Transition _In"
 msgstr ""
 
-#: src/paramwindow.c:452
+#: src/paramwindow.c:449
 msgid "Click to set the transition parameter to show only the front frame"
 msgstr ""
 
-#: src/paramwindow.c:474
+#: src/paramwindow.c:472
 msgid "Crossfade audio"
 msgstr ""
 
-#: src/paramwindow.c:475
+#: src/paramwindow.c:473
 msgid "Check the box to make audio transition with the video"
 msgstr ""
 
-#: src/paramwindow.c:493
+#: src/paramwindow.c:492
 msgid "Transition _Out"
 msgstr ""
 
-#: src/paramwindow.c:495
+#: src/paramwindow.c:494
 msgid "Click to set the transition parameter to show only the rear frame"
 msgstr ""
 
@@ -5945,23 +5959,23 @@
 msgid "%s : size"
 msgstr ""
 
-#: src/paramwindow.c:598
+#: src/paramwindow.c:597
 msgid "New size (pixels)"
 msgstr "Uusi koko (pikseliä)"
 
-#: src/paramwindow.c:617 src/plugins.c:997
+#: src/paramwindow.c:616 src/plugins.c:973
 msgid "_Width"
 msgstr "_Leveys"
 
-#: src/paramwindow.c:636 src/plugins.c:1003
+#: src/paramwindow.c:635 src/plugins.c:979
 msgid "_Height"
 msgstr "_Korkeus"
 
-#: src/paramwindow.c:684
+#: src/paramwindow.c:683
 msgid "Generate to _Clipboard"
 msgstr "Luo leike_pöydälle"
 
-#: src/paramwindow.c:686
+#: src/paramwindow.c:685
 msgid "Generate frames to the clipboard"
 msgstr "Luo kuvat leikepöydälle"
 
@@ -5973,7 +5987,7 @@
 msgid "Generate frames to a new clip"
 msgstr "Luo kuvat uuteen leikkeeseen"
 
-#: src/paramwindow.c:822
+#: src/paramwindow.c:824
 #, c-format
 msgid ""
 "\n"
@@ -5985,71 +5999,71 @@
 "valittuna.\n"
 "\n"
 
-#: src/paramwindow.c:920 src/paramwindow.c:930
+#: src/paramwindow.c:934 src/paramwindow.c:942
 msgid "Set as default"
 msgstr "Aseta oletukseksi"
 
-#: src/paramwindow.c:922 src/paramwindow.c:938
+#: src/paramwindow.c:936 src/paramwindow.c:950
 msgid "Reset"
 msgstr ""
 
-#: src/paramwindow.c:932 src/rte_window.c:2401 src/omc-learn.c:1357
+#: src/paramwindow.c:944 src/rte_window.c:2394 src/omc-learn.c:1347
 msgid "Close _window"
 msgstr "Sulje _ikkuna"
 
-#: src/paramwindow.c:1337
+#: src/paramwindow.c:1340
 msgid "No parameters"
 msgstr "Ei arvoja"
 
-#: src/paramwindow.c:1419
+#: src/paramwindow.c:1424
 msgid "Invalid parameter"
 msgstr "Virheellinen arvo"
 
-#: src/paramwindow.c:1611
+#: src/paramwindow.c:1610
 msgid "LiVES: - Select Colour"
 msgstr "LiVES: - Valitse väri"
 
-#: src/paramwindow.c:1616
+#: src/paramwindow.c:1615
 msgid "Click to set the colour"
 msgstr "Napsauta asettaaksesi värin"
 
-#: src/paramwindow.c:1628
+#: src/paramwindow.c:1626
 msgid "_Red"
 msgstr ""
 
-#: src/paramwindow.c:1629
+#: src/paramwindow.c:1627
 msgid "The red value (0 - 255)"
 msgstr "Punaisen arvo (0 - 255)"
 
-#: src/paramwindow.c:1632
+#: src/paramwindow.c:1630
 msgid "_Green"
 msgstr ""
 
-#: src/paramwindow.c:1633
+#: src/paramwindow.c:1631
 msgid "The green value (0 - 255)"
 msgstr "Vihreän arvo (0 - 255)"
 
-#: src/paramwindow.c:1636
+#: src/paramwindow.c:1634
 msgid "_Blue"
 msgstr ""
 
-#: src/paramwindow.c:1637
+#: src/paramwindow.c:1635
 msgid "The blue value (0 - 255)"
 msgstr "Sinisen arvo (0 - 255)"
 
-#: src/plugins.c:85
+#: src/plugins.c:86
 #, c-format
 msgid ""
 "\n"
 "Plugin error: %s failed with code %d"
 msgstr ""
 
-#: src/plugins.c:87
+#: src/plugins.c:88
 #, c-format
 msgid " : message was %s\n"
 msgstr ""
 
-#: src/plugins.c:387
+#: src/plugins.c:375
 #, c-format
 msgid ""
 "\n"
@@ -6059,17 +6073,17 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/plugins.c:397
+#: src/plugins.c:385
 #, c-format
 msgid "Updating video playback plugin defaults in %s\n"
 msgstr ""
 
-#: src/plugins.c:452
+#: src/plugins.c:444
 #, c-format
 msgid "Loading video playback plugin defaults from %s..."
 msgstr ""
 
-#: src/plugins.c:515
+#: src/plugins.c:505
 #, c-format
 msgid ""
 "\n"
@@ -6079,32 +6093,32 @@
 "\n"
 msgstr ""
 
-#: src/plugins.c:855
+#: src/plugins.c:836
 #, c-format
 msgid "Saving playback plugin defaults to %s..."
 msgstr ""
 
-#: src/plugins.c:962
+#: src/plugins.c:939
 msgid "_FPS"
 msgstr ""
 
-#: src/plugins.c:963
+#: src/plugins.c:940
 msgid "Fixed framerate for plugin.\n"
 msgstr ""
 
-#: src/plugins.c:1032
+#: src/plugins.c:1008
 msgid "_Colourspace"
 msgstr ""
 
-#: src/plugins.c:1033
+#: src/plugins.c:1009
 msgid "Colourspace input to the plugin.\n"
 msgstr ""
 
-#: src/plugins.c:1089
+#: src/plugins.c:1065
 msgid "Save settings to an alternate file.\n"
 msgstr ""
 
-#: src/plugins.c:1206
+#: src/plugins.c:1182
 #, c-format
 msgid ""
 "\n"
@@ -6117,7 +6131,7 @@
 "Toistoliitännäistä %s ei voitu avata\n"
 "Virheilmoitus oli %s\n"
 
-#: src/plugins.c:1252
+#: src/plugins.c:1228
 #, c-format
 msgid ""
 "\n"
@@ -6132,38 +6146,38 @@
 "puuttuu pakollinen toiminto.\n"
 "Sitä ei voida käyttää.\n"
 
-#: src/plugins.c:1265
+#: src/plugins.c:1241
 #, c-format
 msgid ""
 "Video playback plugin failed to initialise.\n"
 "Error was: %s\n"
 msgstr ""
 
-#: src/plugins.c:1461
+#: src/plugins.c:1428
 msgid ""
 "\n"
 "Warning ! Video playback plugin will not send key presses. Keyboard may be "
 "disabled during plugin use !\n"
 msgstr ""
 
-#: src/plugins.c:1465
+#: src/plugins.c:1433
 #, c-format
 msgid ""
 "*** Using %s plugin for fs playback, agreed to use palette type %d ( %s ). "
 "***\n"
 msgstr ""
 
-#: src/plugins.c:1571
+#: src/plugins.c:1537
 #, c-format
 msgid "Audio stream unable to use preferred format '%s'\n"
 msgstr ""
 
-#: src/plugins.c:1579
+#: src/plugins.c:1543
 #, c-format
 msgid "Using format '%s' instead.\n"
 msgstr ""
 
-#: src/plugins.c:1616
+#: src/plugins.c:1579
 #, c-format
 msgid ""
 "LiVES was unable to find its encoder plugins. Please make sure you have the "
@@ -6172,7 +6186,7 @@
 "or change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/plugins.c:1624
+#: src/plugins.c:1589
 #, c-format
 msgid ""
 "LiVES did not receive a response from the encoder plugin called '%s'.\n"
@@ -6181,11 +6195,11 @@
 "or switch to another plugin using Tools|Preferences|Encoding\n"
 msgstr ""
 
-#: src/plugins.c:2032
+#: src/plugins.c:1987
 msgid "Unable to resize, please install imageMagick\n"
 msgstr "Koon muuttaminen ei onnistu, ole hyvä ja asenna imageMagick\n"
 
-#: src/plugins.c:2231
+#: src/plugins.c:2183
 #, c-format
 msgid ""
 "\n"
@@ -6193,12 +6207,12 @@
 "No decoders found in %s !\n"
 msgstr ""
 
-#: src/plugins.c:2415
+#: src/plugins.c:2369
 #, fuzzy, c-format
 msgid " using %s"
 msgstr "Avataan %s"
 
-#: src/plugins.c:2499
+#: src/plugins.c:2451
 #, c-format
 msgid ""
 "\n"
@@ -6207,7 +6221,7 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/plugins.c:2522
+#: src/plugins.c:2472
 #, c-format
 msgid ""
 "\n"
@@ -6217,24 +6231,24 @@
 "Unable to use it.\n"
 msgstr ""
 
-#: src/plugins.c:2564
+#: src/plugins.c:2512
 msgid "/unknown"
 msgstr ""
 
-#: src/plugins.c:2651
+#: src/plugins.c:2598
 msgid "LiVES: - Decoder Plugins"
 msgstr ""
 
-#: src/plugins.c:2669
+#: src/plugins.c:2616
 msgid "Enabled Video Decoders (uncheck to disable)"
 msgstr ""
 
-#: src/plugins.c:2726
+#: src/plugins.c:2672
 #, c-format
 msgid "Failed to load %s, transitions may not resize.\n"
 msgstr ""
 
-#: src/plugins.c:3854
+#: src/plugins.c:3797
 #, c-format
 msgid "%s advanced settings"
 msgstr ""
@@ -6243,15 +6257,15 @@
 msgid "LiVES: - New Test RFX"
 msgstr ""
 
-#: src/rfx-builder.c:136
+#: src/rfx-builder.c:135
 msgid "LiVES: - Edit Test RFX"
 msgstr ""
 
-#: src/rfx-builder.c:166
+#: src/rfx-builder.c:165
 msgid "Type:"
 msgstr "Tyyppi:"
 
-#: src/rfx-builder.c:184
+#: src/rfx-builder.c:183
 msgid "tool"
 msgstr ""
 
@@ -6263,130 +6277,130 @@
 msgid "The name of the plugin. No spaces allowed."
 msgstr "Liitännäisen nimi. Ei välilyöntejä nimeen."
 
-#: src/rfx-builder.c:201
+#: src/rfx-builder.c:202
 msgid "Version:       "
 msgstr "Versio:       "
 
-#: src/rfx-builder.c:203
+#: src/rfx-builder.c:204
 msgid "The script version."
 msgstr "Komentosarjan versio."
 
-#: src/rfx-builder.c:210
+#: src/rfx-builder.c:212
 msgid "    Author:       "
 msgstr "    Tekijä:       "
 
-#: src/rfx-builder.c:211
+#: src/rfx-builder.c:213
 msgid "The script author."
 msgstr "Komentosarjan tekijä."
 
-#: src/rfx-builder.c:217
+#: src/rfx-builder.c:220
 msgid "    URL (optional):       "
 msgstr "    URL (valinnainen):       "
 
-#: src/rfx-builder.c:218
+#: src/rfx-builder.c:221
 msgid "URL for the plugin maintainer."
 msgstr "Liitännäisen ylläpitäjän URL."
 
-#: src/rfx-builder.c:226
+#: src/rfx-builder.c:230
 msgid "Menu text:    "
 msgstr "Valikkoteksti:    "
 
-#: src/rfx-builder.c:227
+#: src/rfx-builder.c:231
 msgid "The text to show in the menu."
 msgstr "Valikossa näytettävä teksti."
 
-#: src/rfx-builder.c:239
+#: src/rfx-builder.c:244
 msgid "Action description:        "
 msgstr "Toiminnon kuvaus:        "
 
-#: src/rfx-builder.c:241
+#: src/rfx-builder.c:246
 msgid "Describe what the plugin is doing. E.g. \"Edge detecting\""
 msgstr "Kuvaile mitä liitännäinen tekee. Esim. \"Edge detecting\""
 
-#: src/rfx-builder.c:246
+#: src/rfx-builder.c:251
 msgid "Minimum frames:"
 msgstr ""
 
-#: src/rfx-builder.c:249
+#: src/rfx-builder.c:254
 msgid ""
 "Minimum number of frames this effect/tool can be applied to. Normally 1."
 msgstr ""
 
-#: src/rfx-builder.c:260
+#: src/rfx-builder.c:265
 msgid "_Requirements..."
 msgstr ""
 
-#: src/rfx-builder.c:263
+#: src/rfx-builder.c:268
 msgid "Enter any binaries required by the plugin."
 msgstr ""
 
-#: src/rfx-builder.c:267
+#: src/rfx-builder.c:272
 msgid "_Properties..."
 msgstr "_Ominaisuudet..."
 
-#: src/rfx-builder.c:270
+#: src/rfx-builder.c:275
 msgid "Set properties for the plugin. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:274
+#: src/rfx-builder.c:279
 msgid "_Parameters..."
 msgstr ""
 
-#: src/rfx-builder.c:277
+#: src/rfx-builder.c:282
 msgid "Set up parameters used in pre/loop/post/trigger code. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:281
+#: src/rfx-builder.c:286
 msgid "Parameter _Window Hints..."
 msgstr ""
 
-#: src/rfx-builder.c:284
+#: src/rfx-builder.c:289
 msgid "Set hints about how to lay out the parameter window. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:290
+#: src/rfx-builder.c:295
 msgid "_Language code:"
 msgstr ""
 
-#: src/rfx-builder.c:291
+#: src/rfx-builder.c:296
 msgid "Language for pre/loop/post/triggers. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:300
+#: src/rfx-builder.c:305
 msgid "_Pre loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:303
+#: src/rfx-builder.c:308
 msgid "Code to be executed before the loop. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:307
+#: src/rfx-builder.c:312
 msgid "_Loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:310
+#: src/rfx-builder.c:315
 msgid "Loop code to be applied to each frame."
 msgstr ""
 
-#: src/rfx-builder.c:314
+#: src/rfx-builder.c:319
 msgid "_Post loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:317
+#: src/rfx-builder.c:322
 msgid "Code to be executed after the loop. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:321
+#: src/rfx-builder.c:326
 msgid "_Trigger code..."
 msgstr ""
 
-#: src/rfx-builder.c:324
+#: src/rfx-builder.c:329
 msgid ""
 "Set trigger code for when the parameter window is shown, or when a parameter "
 "is changed. Optional (except for Utilities)."
 msgstr ""
 
-#: src/rfx-builder.c:421
+#: src/rfx-builder.c:426
 #, c-format
 msgid ""
 "\n"
@@ -6401,55 +6415,55 @@
 "%s\n"
 "%s\n"
 
-#: src/rfx-builder.c:544
+#: src/rfx-builder.c:541
 msgid "LiVES: - RFX Requirements"
 msgstr ""
 
-#: src/rfx-builder.c:548
+#: src/rfx-builder.c:544
 msgid "LiVES: - RFX Parameters"
 msgstr ""
 
-#: src/rfx-builder.c:552
+#: src/rfx-builder.c:547
 msgid "LiVES: - RFX Parameter Window Hints"
 msgstr ""
 
-#: src/rfx-builder.c:556
+#: src/rfx-builder.c:550
 msgid "LiVES: - RFX Triggers"
 msgstr ""
 
-#: src/rfx-builder.c:622
+#: src/rfx-builder.c:613
 msgid "_New Entry"
 msgstr ""
 
-#: src/rfx-builder.c:625
+#: src/rfx-builder.c:616
 msgid "_Edit Entry"
 msgstr ""
 
-#: src/rfx-builder.c:628
+#: src/rfx-builder.c:619
 msgid "_Remove Entry"
 msgstr "_Poista kohde"
 
-#: src/rfx-builder.c:632
+#: src/rfx-builder.c:623
 msgid "Move _Up"
 msgstr "Siirrä _ylös"
 
-#: src/rfx-builder.c:635
+#: src/rfx-builder.c:626
 msgid "Move _Down"
 msgstr "Siirrä _alas"
 
-#: src/rfx-builder.c:1004
+#: src/rfx-builder.c:984
 msgid "LiVES: - RFX Properties"
 msgstr ""
 
-#: src/rfx-builder.c:1013
+#: src/rfx-builder.c:993
 msgid "_Slow (hint to GUI)"
 msgstr ""
 
-#: src/rfx-builder.c:1024
+#: src/rfx-builder.c:1004
 msgid "_Batch mode generator"
 msgstr ""
 
-#: src/rfx-builder.c:1831
+#: src/rfx-builder.c:1790
 msgid ""
 "\n"
 "\n"
@@ -6458,7 +6472,7 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:1875
+#: src/rfx-builder.c:1834
 msgid ""
 "\n"
 "\n"
@@ -6466,184 +6480,184 @@
 "Please check the trigger code.\n"
 msgstr ""
 
-#: src/rfx-builder.c:1994
+#: src/rfx-builder.c:1950
 msgid "LiVES: - New RFX Parameter"
 msgstr "LiVES: - Uusi RFX-parameteri"
 
-#: src/rfx-builder.c:1997
+#: src/rfx-builder.c:1952
 msgid "LiVES: - Edit RFX Parameter"
 msgstr "LiVES: - Muokkaa RFX-parameteria"
 
-#: src/rfx-builder.c:2013
+#: src/rfx-builder.c:1968
 msgid "_Name:    "
 msgstr ""
 
-#: src/rfx-builder.c:2016
+#: src/rfx-builder.c:1971
 msgid "Name of the parameter, must be unique in the plugin."
 msgstr ""
 
-#: src/rfx-builder.c:2025
+#: src/rfx-builder.c:1981
 msgid "_Label:    "
 msgstr ""
 
-#: src/rfx-builder.c:2028
+#: src/rfx-builder.c:1984
 msgid ""
 "Label to be shown by the parameter. An underscore represents mnemonic "
 "accelerator."
 msgstr ""
 
-#: src/rfx-builder.c:2039
+#: src/rfx-builder.c:1996
 msgid "_Type:         "
 msgstr ""
 
-#: src/rfx-builder.c:2040
+#: src/rfx-builder.c:1997
 msgid "Parameter type (select from list)."
 msgstr ""
 
-#: src/rfx-builder.c:2073
+#: src/rfx-builder.c:2029
 msgid "Decimal _places: "
 msgstr ""
 
-#: src/rfx-builder.c:2082 src/rfx-builder.c:2477 src/rfx-builder.c:2495
+#: src/rfx-builder.c:2038 src/rfx-builder.c:2430 src/rfx-builder.c:2447
 msgid "_Default value:    "
 msgstr ""
 
-#: src/rfx-builder.c:2098
+#: src/rfx-builder.c:2054
 msgid "_Default: "
 msgstr ""
 
-#: src/rfx-builder.c:2132
+#: src/rfx-builder.c:2087
 msgid "Button _Group: "
 msgstr ""
 
-#: src/rfx-builder.c:2134
+#: src/rfx-builder.c:2089
 msgid "A non-zero value can be used to group radio buttons."
 msgstr ""
 
-#: src/rfx-builder.c:2142 src/rfx-builder.c:2478
+#: src/rfx-builder.c:2097 src/rfx-builder.c:2431
 msgid "_Minimum value: "
 msgstr ""
 
-#: src/rfx-builder.c:2148 src/rfx-builder.c:2479
+#: src/rfx-builder.c:2103 src/rfx-builder.c:2432
 msgid "Ma_ximum value: "
 msgstr ""
 
-#: src/rfx-builder.c:2157
+#: src/rfx-builder.c:2113
 msgid "     _Step size:   "
 msgstr ""
 
-#: src/rfx-builder.c:2160
+#: src/rfx-builder.c:2117
 msgid ""
 "How much the parameter is adjusted when the spinbutton arrows are pressed."
 msgstr ""
 
-#: src/rfx-builder.c:2171
+#: src/rfx-builder.c:2129
 msgid "_Wrap value"
 msgstr ""
 
-#: src/rfx-builder.c:2172
+#: src/rfx-builder.c:2131
 msgid "Whether the value wraps max->min and min->max."
 msgstr ""
 
-#: src/rfx-builder.c:2470
+#: src/rfx-builder.c:2424
 msgid "Set _values"
 msgstr ""
 
-#: src/rfx-builder.c:2512
+#: src/rfx-builder.c:2463
 msgid "Default _Red:  "
 msgstr ""
 
-#: src/rfx-builder.c:2513
+#: src/rfx-builder.c:2464
 msgid "Default _Green:"
 msgstr ""
 
-#: src/rfx-builder.c:2514
+#: src/rfx-builder.c:2465
 msgid "Default _Blue: "
 msgstr ""
 
-#: src/rfx-builder.c:2538
+#: src/rfx-builder.c:2488
 msgid "Set _default"
 msgstr ""
 
-#: src/rfx-builder.c:2540
+#: src/rfx-builder.c:2490
 msgid "Default value:  "
 msgstr "Oletusarvo:  "
 
-#: src/rfx-builder.c:2541
+#: src/rfx-builder.c:2491
 msgid "Maximum length (chars): "
 msgstr ""
 
-#: src/rfx-builder.c:2576
+#: src/rfx-builder.c:2526
 msgid "LiVES: - New RFX Parameter Window Hint"
 msgstr ""
 
-#: src/rfx-builder.c:2579
+#: src/rfx-builder.c:2528
 msgid "LiVES: - Edit RFX Parameter Window Hint"
 msgstr ""
 
-#: src/rfx-builder.c:2622
+#: src/rfx-builder.c:2569
 msgid "_Keyword:         "
 msgstr ""
 
-#: src/rfx-builder.c:2639
+#: src/rfx-builder.c:2586
 msgid "Special _Type:         "
 msgstr ""
 
-#: src/rfx-builder.c:2656
+#: src/rfx-builder.c:2602
 msgid "Special _Subtype:         "
 msgstr ""
 
-#: src/rfx-builder.c:2667 src/rfx-builder.c:2706
+#: src/rfx-builder.c:2613 src/rfx-builder.c:2651
 msgid "Row:    "
 msgstr ""
 
-#: src/rfx-builder.c:2732
+#: src/rfx-builder.c:2676
 #, c-format
 msgid "Linked parameters (%d):    "
 msgstr ""
 
-#: src/rfx-builder.c:2749
+#: src/rfx-builder.c:2693
 msgid "Linked parameters (4):    "
 msgstr ""
 
-#: src/rfx-builder.c:2752
+#: src/rfx-builder.c:2695
 msgid "Linked parameters (2):    "
 msgstr ""
 
-#: src/rfx-builder.c:2777
+#: src/rfx-builder.c:2720
 msgid "LiVES: - New RFX Trigger"
 msgstr ""
 
-#: src/rfx-builder.c:2780
+#: src/rfx-builder.c:2722
 msgid "LiVES: - Edit RFX Trigger"
 msgstr ""
 
-#: src/rfx-builder.c:2808
+#: src/rfx-builder.c:2750
 msgid "When:         "
 msgstr ""
 
-#: src/rfx-builder.c:2904
+#: src/rfx-builder.c:2846
 msgid "LiVES: - Pre Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:2911
+#: src/rfx-builder.c:2853
 msgid "LiVES: - Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:2918
+#: src/rfx-builder.c:2860
 msgid "LiVES: - Post Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:2931
+#: src/rfx-builder.c:2873
 #, c-format
 msgid "LiVES: - Default text (max length %d)"
 msgstr ""
 
-#: src/rfx-builder.c:2944
+#: src/rfx-builder.c:2885
 msgid "LiVES: - Enter values, one per line"
 msgstr ""
 
-#: src/rfx-builder.c:3055
+#: src/rfx-builder.c:2996
 msgid ""
 "\n"
 "\n"
@@ -6653,7 +6667,7 @@
 "\n"
 "Nimi ei saa olla tyhjä.\n"
 
-#: src/rfx-builder.c:3060
+#: src/rfx-builder.c:3001
 msgid ""
 "\n"
 "\n"
@@ -6663,7 +6677,7 @@
 "\n"
 "Nimi ei saa sisältää välilyöntejä.\n"
 
-#: src/rfx-builder.c:3065
+#: src/rfx-builder.c:3006
 msgid ""
 "\n"
 "\n"
@@ -6673,7 +6687,7 @@
 "\n"
 "Valikkoteksti ei saa olla tyhjä.\n"
 
-#: src/rfx-builder.c:3071
+#: src/rfx-builder.c:3012
 msgid ""
 "\n"
 "\n"
@@ -6683,14 +6697,14 @@
 "\n"
 "Toiminnon kuvaus ei saa olla tyhjä.\n"
 
-#: src/rfx-builder.c:3076
+#: src/rfx-builder.c:3017
 msgid ""
 "\n"
 "\n"
 "Author must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3085 src/rfx-builder.c:4339
+#: src/rfx-builder.c:3026 src/rfx-builder.c:4253
 msgid ""
 "\n"
 "\n"
@@ -6698,28 +6712,28 @@
 "Name must be unique.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3092
+#: src/rfx-builder.c:3033
 msgid ""
 "\n"
 "\n"
 "Loop code should not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3098
+#: src/rfx-builder.c:3039
 msgid ""
 "\n"
 "\n"
 "Trigger code should not be blank for a utility.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3111
+#: src/rfx-builder.c:3052
 msgid ""
 "\n"
 "\n"
 "Parameter name must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3117
+#: src/rfx-builder.c:3058
 msgid ""
 "\n"
 "\n"
@@ -6728,41 +6742,41 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:3171
+#: src/rfx-builder.c:3111
 #, c-format
 msgid "Writing script file %s..."
 msgstr ""
 
-#: src/rfx-builder.c:3477
+#: src/rfx-builder.c:3411
 msgid "No <define> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3484 src/rfx-builder.c:3493
+#: src/rfx-builder.c:3418 src/rfx-builder.c:3427
 msgid "Bad script version.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3505
+#: src/rfx-builder.c:3439
 msgid "No <name> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3513
+#: src/rfx-builder.c:3447
 msgid "No <version> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3522
+#: src/rfx-builder.c:3456
 msgid "No <author> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3536
+#: src/rfx-builder.c:3470
 msgid "No <description> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3540
+#: src/rfx-builder.c:3474
 #, c-format
 msgid "Bad description. (%s)\n"
 msgstr ""
 
-#: src/rfx-builder.c:3702
+#: src/rfx-builder.c:3627
 #, c-format
 msgid ""
 "\n"
@@ -6772,27 +6786,27 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:3859
+#: src/rfx-builder.c:3780
 msgid "Rebuilding all RFX scripts...builtin..."
 msgstr ""
 
-#: src/rfx-builder.c:3860
+#: src/rfx-builder.c:3781
 msgid "Rebuilding scripts"
 msgstr ""
 
-#: src/rfx-builder.c:3868
+#: src/rfx-builder.c:3789
 msgid "custom..."
 msgstr ""
 
-#: src/rfx-builder.c:3872
+#: src/rfx-builder.c:3793
 msgid "test..."
 msgstr ""
 
-#: src/rfx-builder.c:3878
+#: src/rfx-builder.c:3799
 msgid "rebuilding dynamic menu entries..."
 msgstr ""
 
-#: src/rfx-builder.c:3905 src/rfx-builder.c:3912
+#: src/rfx-builder.c:3826 src/rfx-builder.c:3834
 #, c-format
 msgid ""
 "\n"
@@ -6801,7 +6815,7 @@
 "Please check this program is in your path and executable.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3951
+#: src/rfx-builder.c:3874
 #, c-format
 msgid ""
 "\n"
@@ -6816,12 +6830,12 @@
 "%s?\n"
 "\n"
 
-#: src/rfx-builder.c:3960
+#: src/rfx-builder.c:3884
 #, c-format
 msgid "Deleting rfx script %s..."
 msgstr "Poistetaan rfx-komentosarja %s..."
 
-#: src/rfx-builder.c:3980
+#: src/rfx-builder.c:3902
 #, c-format
 msgid ""
 "\n"
@@ -6831,7 +6845,7 @@
 "Error code was %d\n"
 msgstr ""
 
-#: src/rfx-builder.c:4016
+#: src/rfx-builder.c:3938
 #, c-format
 msgid ""
 "\n"
@@ -6841,12 +6855,12 @@
 "Please delete it first, or rename the test script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4027
+#: src/rfx-builder.c:3950
 #, c-format
 msgid "Promoting rfx test plugin %s to custom..."
 msgstr ""
 
-#: src/rfx-builder.c:4044
+#: src/rfx-builder.c:3965
 #, c-format
 msgid ""
 "\n"
@@ -6857,20 +6871,20 @@
 "Return code was %d (%s)\n"
 msgstr ""
 
-#: src/rfx-builder.c:4070
+#: src/rfx-builder.c:3990
 msgid "LiVES: - Export Script to..."
 msgstr ""
 
-#: src/rfx-builder.c:4077 src/rfx-builder.c:4156
+#: src/rfx-builder.c:3997 src/rfx-builder.c:4074
 #, c-format
 msgid "Copying %s to %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4105
+#: src/rfx-builder.c:4024
 msgid "LiVES: Import Script from..."
 msgstr ""
 
-#: src/rfx-builder.c:4148
+#: src/rfx-builder.c:4067
 #, c-format
 msgid ""
 "\n"
@@ -6880,43 +6894,43 @@
 "Please delete it first, or rename the import script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4249
+#: src/rfx-builder.c:4166
 msgid "LiVES: - Copy RFX Script"
 msgstr ""
 
-#: src/rfx-builder.c:4251
+#: src/rfx-builder.c:4168
 msgid "_From type:    "
 msgstr ""
 
-#: src/rfx-builder.c:4258
+#: src/rfx-builder.c:4175
 msgid "   Script:    "
 msgstr ""
 
-#: src/rfx-builder.c:4267
+#: src/rfx-builder.c:4183
 msgid "LiVES: - Rename test RFX Script"
 msgstr ""
 
-#: src/rfx-builder.c:4268
+#: src/rfx-builder.c:4184
 msgid "From script: "
 msgstr ""
 
-#: src/rfx-builder.c:4273
+#: src/rfx-builder.c:4188
 msgid "LiVES: - RFX Script name"
 msgstr ""
 
-#: src/rfx-builder.c:4274
+#: src/rfx-builder.c:4189
 msgid "Script name: "
 msgstr ""
 
-#: src/rfx-builder.c:4294
+#: src/rfx-builder.c:4209
 msgid "New name: "
 msgstr "Uusi nimi: "
 
-#: src/rfx-builder.c:4297
+#: src/rfx-builder.c:4212
 msgid "New script name: "
 msgstr ""
 
-#: src/rfx-builder.c:4372
+#: src/rfx-builder.c:4286
 msgid ""
 "\n"
 "\n"
@@ -6924,12 +6938,12 @@
 "Script name must be unique.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4384
+#: src/rfx-builder.c:4297
 #, c-format
 msgid "Renaming RFX test script %s to %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4390
+#: src/rfx-builder.c:4302
 #, c-format
 msgid ""
 "\n"
@@ -6940,21 +6954,21 @@
 "Return code was %d\n"
 msgstr ""
 
-#: src/rfx-builder.c:4610
+#: src/rfx-builder.c:4518
 msgid "_Apply Real Time Effects to Selection"
 msgstr "_Käytä valinnassa tosiaikaisia tehosteita"
 
-#: src/rfx-builder.c:4664
+#: src/rfx-builder.c:4572
 #, c-format
 msgid "Loading rendered effect %s..."
 msgstr "Ladataan hahmonnettu tehoste %s..."
 
-#: src/rfx-builder.c:4766
+#: src/rfx-builder.c:4674
 msgid ""
 "See: VJ - show VJ keys. Set the realtime effects, and then apply them here."
 msgstr ""
 
-#: src/preferences.c:359
+#: src/preferences.c:351
 msgid ""
 "\n"
 "\n"
@@ -6962,7 +6976,7 @@
 "full screen, separate window (fs) mode\n"
 msgstr ""
 
-#: src/preferences.c:408
+#: src/preferences.c:400
 msgid ""
 "\n"
 "\n"
@@ -6970,7 +6984,7 @@
 "(Free space = UNKNOWN)"
 msgstr ""
 
-#: src/preferences.c:412
+#: src/preferences.c:403
 #, c-format
 msgid ""
 "\n"
@@ -6979,14 +6993,14 @@
 "(Free space = %s)"
 msgstr ""
 
-#: src/preferences.c:416
+#: src/preferences.c:408
 msgid ""
 "The temp directory is LiVES working directory where opened clips and sets "
 "are stored.\n"
 "It should be in a partition with plenty of free disk space.\n"
 msgstr ""
 
-#: src/preferences.c:784
+#: src/preferences.c:839
 #, c-format
 msgid ""
 "Unable to create or write to the new temporary directory.\n"
@@ -6997,7 +7011,7 @@
 "The directory will not be changed now.\n"
 msgstr ""
 
-#: src/preferences.c:786
+#: src/preferences.c:843
 #, c-format
 msgid ""
 "Unable to create or write to the new temporary directory.\n"
@@ -7007,7 +7021,7 @@
 "The directory will not be changed now.\n"
 msgstr ""
 
-#: src/preferences.c:798
+#: src/preferences.c:856
 msgid ""
 "You have chosen to change the temporary directory.\n"
 "Please make sure you have no other copies of LiVES open.\n"
@@ -7019,20 +7033,20 @@
 "original setting."
 msgstr ""
 
-#: src/preferences.c:1169
+#: src/preferences.c:1221
 msgid ""
 "\n"
 "Unable to switch audio players to jack - jackd must be installed first.\n"
 "See http://jackaudio.org\n"
 msgstr ""
 
-#: src/preferences.c:1175
+#: src/preferences.c:1226
 msgid ""
 "\n"
 "Switching audio players requires restart (jackd must not be running)\n"
 msgstr ""
 
-#: src/preferences.c:1202
+#: src/preferences.c:1253
 msgid ""
 "\n"
 "Unable to switch audio players to pulse audio\n"
@@ -7040,330 +7054,330 @@
 "See http://www.pulseaudio.org\n"
 msgstr ""
 
-#: src/preferences.c:1502
+#: src/preferences.c:1544
 msgid "PCM (highest quality; largest files)"
 msgstr "PCM (korkein laatu; suurimmat tiedostot)"
 
-#: src/preferences.c:2063
+#: src/preferences.c:2096
 msgid "LiVES: - Preferences"
 msgstr "LiVES: - Asetukset"
 
-#: src/preferences.c:2142
+#: src/preferences.c:2177
 msgid "Open file selection maximised"
 msgstr "Avaa tiedostovalinta suurennettuna"
 
-#: src/preferences.c:2149
+#: src/preferences.c:2184
 msgid "Show recent files in the File menu"
 msgstr "Näytä viimeisimmät tiedostot Tiedosto-valikossa"
 
-#: src/preferences.c:2158
+#: src/preferences.c:2193
 msgid "Stop screensaver on playback    "
 msgstr "Pysäytä näytönsäästäjä toistettaessa    "
 
-#: src/preferences.c:2165
+#: src/preferences.c:2200
 msgid "Open main window maximised"
 msgstr "Avaa pääikkuna suurennettuna"
 
-#: src/preferences.c:2173
+#: src/preferences.c:2208
 msgid "Show toolbar when background is blanked"
 msgstr "Näytä työkalurivi kun tausta on pimennetty"
 
-#: src/preferences.c:2181
+#: src/preferences.c:2216
 msgid "Allow mouse wheel to switch clips"
 msgstr "Käytä hiiren rullaa leikkeiden vaihtoon"
 
-#: src/preferences.c:2192
+#: src/preferences.c:2227
 msgid "Shrink previews to fit in interface"
 msgstr ""
 
-#: src/preferences.c:2202
+#: src/preferences.c:2237
 msgid "Startup mode:"
 msgstr ""
 
-#: src/preferences.c:2206
+#: src/preferences.c:2241
 msgid "_Clip editor"
 msgstr ""
 
-#: src/preferences.c:2210
+#: src/preferences.c:2245
 msgid "_Multitrack mode"
 msgstr ""
 
-#: src/preferences.c:2234
+#: src/preferences.c:2268
 msgid "Multi-head support"
 msgstr "Moninäyttötuki"
 
-#: src/preferences.c:2242
+#: src/preferences.c:2276
 msgid " monitor number for LiVES interface"
 msgstr " LiVES-käyttöliittymälle käytettävän näytön numero"
 
-#: src/preferences.c:2248
+#: src/preferences.c:2282
 msgid " monitor number for playback"
 msgstr " toistoon käytettävän näytön numero"
 
-#: src/preferences.c:2260
+#: src/preferences.c:2294
 msgid ""
 "A setting of 0 means use all available monitors (only works with some "
 "playback plugins)."
 msgstr ""
 
-#: src/preferences.c:2270
+#: src/preferences.c:2304
 msgid "Force single monitor"
 msgstr ""
 
-#: src/preferences.c:2271
+#: src/preferences.c:2305
 msgid "Ignore all except the first monitor."
 msgstr ""
 
-#: src/preferences.c:2293
+#: src/preferences.c:2327
 msgid "Show clip thumbnails during playback"
 msgstr ""
 
-#: src/preferences.c:2306
+#: src/preferences.c:2340
 msgid "GUI"
 msgstr "Käyttöliittymä"
 
-#: src/preferences.c:2321
+#: src/preferences.c:2355
 msgid "When entering Multitrack mode:"
 msgstr "Siirryttäessä Multitrack-tilaan:"
 
-#: src/preferences.c:2330
+#: src/preferences.c:2364
 msgid "_Prompt me for width, height, fps and audio settings"
 msgstr "_Kysy aina leveys-, korkeus-, fps- ja ääniasetukset"
 
-#: src/preferences.c:2336
+#: src/preferences.c:2370
 msgid "_Always use the following values:"
 msgstr "Käytä _aina seuraavia arvoja:"
 
-#: src/preferences.c:2345
+#: src/preferences.c:2379
 msgid "Use these same _values for rendering a new clip"
 msgstr ""
 
-#: src/preferences.c:2370
+#: src/preferences.c:2404
 msgid "_Width           "
 msgstr "_Leveys           "
 
-#: src/preferences.c:2375
+#: src/preferences.c:2409
 msgid "          _Height      "
 msgstr "          _Korkeus      "
 
-#: src/preferences.c:2379
+#: src/preferences.c:2413
 msgid "          _FPS"
 msgstr ""
 
-#: src/preferences.c:2387
+#: src/preferences.c:2421
 msgid "Enable backing audio track"
 msgstr ""
 
-#: src/preferences.c:2394
+#: src/preferences.c:2428
 msgid "Audio track per video track"
 msgstr ""
 
-#: src/preferences.c:2423
+#: src/preferences.c:2457
 msgid "    _Undo buffer size (MB)    "
 msgstr "    _Kumoa-puskurin koko (Mt)    "
 
-#: src/preferences.c:2432
+#: src/preferences.c:2466
 msgid "_Exit multitrack mode after rendering"
 msgstr ""
 
-#: src/preferences.c:2440
+#: src/preferences.c:2474
 msgid "Auto backup layouts"
 msgstr "Asetteluiden automaattitallennus"
 
-#: src/preferences.c:2445
+#: src/preferences.c:2479
 msgid "_Every"
 msgstr ""
 
-#: src/preferences.c:2453
+#: src/preferences.c:2487
 msgid "seconds"
 msgstr ""
 
-#: src/preferences.c:2461
+#: src/preferences.c:2495
 msgid "After every _change"
 msgstr "Jokaisen _muutoksen jälkeen"
 
-#: src/preferences.c:2467
+#: src/preferences.c:2501
 msgid "_Never"
 msgstr "_Ei koskaan"
 
-#: src/preferences.c:2490
+#: src/preferences.c:2523
 msgid "Multitrack/Render"
 msgstr ""
 
-#: src/preferences.c:2508
+#: src/preferences.c:2541
 msgid "Use instant opening when possible"
 msgstr ""
 
-#: src/preferences.c:2509
+#: src/preferences.c:2543
 msgid "Enable instant opening of some file types using decoder plugins"
 msgstr ""
 
-#: src/preferences.c:2531
+#: src/preferences.c:2567
 msgid "Video open command (fallback)"
 msgstr ""
 
-#: src/preferences.c:2543
+#: src/preferences.c:2579
 msgid "Open/render compression"
 msgstr ""
 
-#: src/preferences.c:2546
+#: src/preferences.c:2582
 msgid " %     ( lower = slower, larger files; for jpeg, higher quality )"
 msgstr ""
 
-#: src/preferences.c:2558
+#: src/preferences.c:2594
 msgid "Default image format"
 msgstr ""
 
-#: src/preferences.c:2562
+#: src/preferences.c:2598
 msgid "_jpeg"
 msgstr "_jpeg"
 
-#: src/preferences.c:2565
+#: src/preferences.c:2601
 msgid "_png"
 msgstr ""
 
-#: src/preferences.c:2572
+#: src/preferences.c:2608
 msgid "(Check Help/Troubleshoot to see which image formats are supported)"
 msgstr ""
 
-#: src/preferences.c:2580
+#: src/preferences.c:2616
 msgid "Enable automatic deinterlacing when possible"
 msgstr "Käytä automaattista lomituksenpoistoa mikäli mahdollista"
 
-#: src/preferences.c:2582
+#: src/preferences.c:2619
 msgid "Automatically deinterlace frames when a plugin suggests it"
 msgstr ""
 
-#: src/preferences.c:2593
+#: src/preferences.c:2632
 #, fuzzy
 msgid "Automatic trimming / padding of audio when possible"
 msgstr "Käytä automaattista lomituksenpoistoa mikäli mahdollista"
 
-#: src/preferences.c:2595
+#: src/preferences.c:2634
 msgid "Automatically trim or pad audio when a plugin suggests it"
 msgstr ""
 
-#: src/preferences.c:2606
+#: src/preferences.c:2646
 msgid "Ignore blank borders when possible"
 msgstr ""
 
-#: src/preferences.c:2608
+#: src/preferences.c:2648
 msgid "Clip any blank borders from frames where possible"
 msgstr ""
 
-#: src/preferences.c:2619
+#: src/preferences.c:2660
 msgid "When opening multiple files, concatenate images into one clip"
 msgstr "Avattaessa useita tiedostoja, ketjuta kuvat yhteen leikkeeseen"
 
-#: src/preferences.c:2629
+#: src/preferences.c:2670
 msgid "Decoding"
 msgstr ""
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:2652
+#: src/preferences.c:2693
 msgid "Low - can improve performance on slower machines"
 msgstr "Matala - parantaa suorituskykyä hitaammilla koneilla"
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:2654
+#: src/preferences.c:2695
 msgid "Normal - recommended for most users"
 msgstr "Normaali - suositeltava useimmille käyttäjille"
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:2656
+#: src/preferences.c:2697
 msgid "High - can improve quality on very fast machines"
 msgstr "Korkea - parantaa laatua nopeammilla koneilla"
 
-#: src/preferences.c:2659
+#: src/preferences.c:2700
 msgid "Preview _quality"
 msgstr "_Esikatselun laatu"
 
-#: src/preferences.c:2660
+#: src/preferences.c:2701
 msgid "The preview quality for video playback - affects resizing"
 msgstr ""
 
-#: src/preferences.c:2675
+#: src/preferences.c:2717
 msgid "_Show FPS statistics"
 msgstr "_Näytä FPS-tiedot"
 
-#: src/preferences.c:2694
+#: src/preferences.c:2736
 msgid "_Plugin"
 msgstr "_Liitännäinen"
 
-#: src/preferences.c:2718
+#: src/preferences.c:2760
 msgid "Stream audio"
 msgstr ""
 
-#: src/preferences.c:2721
+#: src/preferences.c:2763
 msgid "Stream audio to playback plugin"
 msgstr ""
 
-#: src/preferences.c:2734
+#: src/preferences.c:2778
 msgid "Record player output"
 msgstr ""
 
-#: src/preferences.c:2737
+#: src/preferences.c:2781
 msgid "Record output from player instead of input to player"
 msgstr ""
 
-#: src/preferences.c:2744
+#: src/preferences.c:2789
 msgid "VIDEO"
 msgstr "VIDEO"
 
-#: src/preferences.c:2787
+#: src/preferences.c:2833
 msgid "_Player"
 msgstr "_Soitin"
 
-#: src/preferences.c:2792
+#: src/preferences.c:2838
 msgid "(See also the Jack Integration tab for jack startup options)"
 msgstr ""
 
-#: src/preferences.c:2819
+#: src/preferences.c:2865
 msgid "mplayer"
 msgstr "mplayer"
 
-#: src/preferences.c:2830
+#: src/preferences.c:2876
 #, fuzzy
 msgid "mplayer2"
 msgstr "mplayer"
 
-#: src/preferences.c:2833
+#: src/preferences.c:2879
 msgid "Audio play _command"
 msgstr "Äänen soitto_komento"
 
-#: src/preferences.c:2840
+#: src/preferences.c:2886
 msgid "- internal -"
 msgstr "- sisäinen -"
 
-#: src/preferences.c:2849
+#: src/preferences.c:2895
 msgid "Audio follows video _rate/direction"
 msgstr ""
 
-#: src/preferences.c:2857
+#: src/preferences.c:2903
 msgid "Audio follows _clip switches"
 msgstr ""
 
-#: src/preferences.c:2864
+#: src/preferences.c:2910
 msgid "Source:"
 msgstr ""
 
-#: src/preferences.c:2868
+#: src/preferences.c:2914
 msgid "_Internal"
 msgstr ""
 
-#: src/preferences.c:2873
+#: src/preferences.c:2919
 msgid "_External (requires jack or pulse audio player)"
 msgstr ""
 
-#: src/preferences.c:2892
+#: src/preferences.c:2940
 msgid "AUDIO"
 msgstr "ÄÄNI"
 
-#: src/preferences.c:2902
+#: src/preferences.c:2950
 msgid "Playback"
 msgstr "Toisto"
 
-#: src/preferences.c:2925
+#: src/preferences.c:2973
 msgid ""
 "Record audio when capturing an e_xternal window\n"
 " (requires jack or pulse audio)"
@@ -7371,249 +7385,249 @@
 "Nauhoita ääni kaapattaessa _ulkoisesta ikkunasta\n"
 " (vaatii jack- tai pulse audion)"
 
-#: src/preferences.c:2940
+#: src/preferences.c:2988
 msgid "      What to record when 'r' is pressed   "
 msgstr "      Mitä nauhoitetaan kun \"r\" on painettu   "
 
-#: src/preferences.c:2949
+#: src/preferences.c:2997
 msgid "_Frame changes"
 msgstr ""
 
-#: src/preferences.c:2964
+#: src/preferences.c:3012
 msgid "F_PS changes"
 msgstr "_FPS-muutokset"
 
-#: src/preferences.c:2982
+#: src/preferences.c:3030
 msgid "_Real time effects"
 msgstr "_Tosiaikaiset tehosteet"
 
-#: src/preferences.c:2993
+#: src/preferences.c:3041
 msgid "_Clip switches"
 msgstr ""
 
-#: src/preferences.c:3004
+#: src/preferences.c:3052
 msgid "_Audio (requires jack or pulse audio player)"
 msgstr ""
 
-#: src/preferences.c:3024
+#: src/preferences.c:3072
 msgid "Pause recording if free disk space falls below"
 msgstr ""
 
 #. TRANSLATORS: gigabytes
-#: src/preferences.c:3030
+#: src/preferences.c:3078
 msgid "GB"
 msgstr ""
 
-#: src/preferences.c:3037
+#: src/preferences.c:3085
 msgid "Recording"
 msgstr "Nauhoitus"
 
-#: src/preferences.c:3055
+#: src/preferences.c:3103
 msgid "Encoder"
 msgstr ""
 
-#: src/preferences.c:3090
+#: src/preferences.c:3137
 msgid "Output format"
 msgstr "Tallennusmuoto"
 
-#: src/preferences.c:3106
+#: src/preferences.c:3153
 msgid "Audio codec"
 msgstr "Äänikoodekki"
 
-#: src/preferences.c:3119
+#: src/preferences.c:3165
 msgid "Encoding"
 msgstr "Pakkaus"
 
-#: src/preferences.c:3134
+#: src/preferences.c:3180
 msgid "Use _antialiasing when resizing"
 msgstr "Käytä kuva-alueen _pehmennystä kokoa muutettaessa"
 
-#: src/preferences.c:3143
+#: src/preferences.c:3189
 msgid "Number of _real time effect keys"
 msgstr "_Tehostenäppäimien lukumäärä"
 
-#: src/preferences.c:3145
+#: src/preferences.c:3192
 msgid ""
 "The number of \"virtual\" real time effect keys. They can be controlled "
 "through the real time effects window, or via network (OSC)."
 msgstr ""
 
-#: src/preferences.c:3152
+#: src/preferences.c:3199
 msgid "Use _threads where possible when applying effects"
 msgstr ""
 
-#: src/preferences.c:3159
+#: src/preferences.c:3207
 msgid "Number of _threads"
 msgstr ""
 
-#: src/preferences.c:3172
+#: src/preferences.c:3221
 msgid "Restart is required if any of the following paths are changed:"
 msgstr ""
 
-#: src/preferences.c:3182
+#: src/preferences.c:3231
 msgid "Weed plugin path"
 msgstr ""
 
-#: src/preferences.c:3184
+#: src/preferences.c:3234
 msgid "Frei0r plugin path"
 msgstr ""
 
-#: src/preferences.c:3186
+#: src/preferences.c:3237
 msgid "LADSPA plugin path"
 msgstr ""
 
-#: src/preferences.c:3209
+#: src/preferences.c:3261
 msgid "      Video load directory (default)      "
 msgstr "      Videoiden latauskansio (oletus)      "
 
-#: src/preferences.c:3215
+#: src/preferences.c:3267
 msgid "      Video save directory (default) "
 msgstr "      Videoiden tallennuskansio (oletus) "
 
-#: src/preferences.c:3221
+#: src/preferences.c:3273
 msgid "      Audio load directory (default) "
 msgstr "      Äänileikkeiden latauskansio (oletus) "
 
-#: src/preferences.c:3227
+#: src/preferences.c:3279
 msgid "      Image directory (default) "
 msgstr "      Kuvakansio (oletus) "
 
-#: src/preferences.c:3233
+#: src/preferences.c:3285
 msgid "      Backup/Restore directory (default) "
 msgstr "      Varmuuskopio/palautuskansio (oletus) "
 
-#: src/preferences.c:3239
+#: src/preferences.c:3291
 msgid "      Temp directory (do not remove) "
 msgstr "      Tilapäiskansio (älä poista) "
 
-#: src/preferences.c:3252
+#: src/preferences.c:3304
 msgid "The default directory for loading video clips from"
 msgstr "Oletuskansio josta videoleikkeet ladataan"
 
-#: src/preferences.c:3277
+#: src/preferences.c:3329
 msgid "The default directory for saving encoded clips to"
 msgstr "Oletuskansio johon pakatut leikkeet tallennetaan"
 
-#: src/preferences.c:3285
+#: src/preferences.c:3337
 msgid "The default directory for loading and saving audio"
 msgstr "Oletuskansio avattaville ja tallennettaville äänitiedostoille"
 
-#: src/preferences.c:3293
+#: src/preferences.c:3345
 msgid "The default directory for saving frameshots to"
 msgstr "Oletuskansio johon kuvaotokset tallennetaan"
 
-#: src/preferences.c:3301
+#: src/preferences.c:3353
 msgid "The default directory for backing up/restoring single clips"
 msgstr "Oletuskansio yksittäisten leikkeiden varmuuskopiointiin/palautukseen"
 
-#: src/preferences.c:3309
+#: src/preferences.c:3361
 msgid "LiVES working directory."
 msgstr "LiVESin työkansio."
 
-#: src/preferences.c:3359
+#: src/preferences.c:3412
 msgid "Directories"
 msgstr "Kansiot"
 
-#: src/preferences.c:3374
+#: src/preferences.c:3427
 msgid "Warn if diskspace falls below: "
 msgstr ""
 
-#: src/preferences.c:3380 src/preferences.c:3394
+#: src/preferences.c:3433 src/preferences.c:3447
 msgid " MB [set to 0 to disable]"
 msgstr ""
 
-#: src/preferences.c:3389
+#: src/preferences.c:3442
 msgid "Diskspace critical level: "
 msgstr ""
 
-#: src/preferences.c:3407
+#: src/preferences.c:3461
 msgid ""
 "Warn on Insert / Merge if _frame rate of clipboard does not match frame rate "
 "of selection"
 msgstr ""
 
-#: src/preferences.c:3417
+#: src/preferences.c:3471
 msgid "Warn on Open if file _size exceeds "
 msgstr "Varoita jos avattavan tiedoston _koko on yli "
 
-#: src/preferences.c:3425
+#: src/preferences.c:3479
 msgid " MB"
 msgstr " Mt"
 
-#: src/preferences.c:3432
+#: src/preferences.c:3486
 msgid "Show a warning before saving a se_t"
 msgstr "Näytä varoitus ennen leikesarjan _tallennusta"
 
-#: src/preferences.c:3442
+#: src/preferences.c:3496
 msgid ""
 "Show a warning if _mplayer/mplayer2, sox, composite or convert is not found "
 "when LiVES is started."
 msgstr ""
 
-#: src/preferences.c:3452
+#: src/preferences.c:3506
 msgid "Show a warning if no _rendered effects are found at startup."
 msgstr ""
 "Näytä varoitus jos _hahmonnettuja tehosteita ei löydy käynnistyksen "
 "yhteydessä."
 
-#: src/preferences.c:3464
+#: src/preferences.c:3518
 msgid "Show a warning if no _encoder plugins are found at startup."
 msgstr ""
 "Näytä varoitus jos _pakkausliitännäisiä ei löydy käynnistyksen yhteydessä."
 
-#: src/preferences.c:3474
+#: src/preferences.c:3528
 msgid "Show a warning if a _duplicate set name is entered."
 msgstr ""
 
-#: src/preferences.c:3485
+#: src/preferences.c:3539
 msgid "When a set is loaded, warn if clips are missing from _layouts."
 msgstr "Varoita leikesarjaa ladattaessa jos asetteluista puuttuu leikkeitä."
 
-#: src/preferences.c:3495
+#: src/preferences.c:3550
 msgid "Warn if a clip used in a layout is about to be closed."
 msgstr "Varoita jos asettelussa käytetty leike aiotaan sulkea."
 
-#: src/preferences.c:3505
+#: src/preferences.c:3561
 msgid "Warn if frames used in a layout are about to be deleted."
 msgstr "Varoita jos asettelussa käytettyjä kuvia aiotaan poistaa."
 
-#: src/preferences.c:3515
+#: src/preferences.c:3572
 msgid "Warn if frames used in a layout are about to be shifted."
 msgstr "Varoita jos asettelussa käytettyjä kuvia aiotaan siirtää."
 
-#: src/preferences.c:3525
+#: src/preferences.c:3583
 msgid "Warn if frames used in a layout are about to be altered."
 msgstr "Varoita jos asettelussa käytettyjä kuvia aiotaan muuttaa."
 
-#: src/preferences.c:3535
+#: src/preferences.c:3594
 msgid "Warn if audio used in a layout is about to be deleted."
 msgstr "Varoita jos asettelussa käytetty ääniraita aiotaan poistaa."
 
-#: src/preferences.c:3546
+#: src/preferences.c:3606
 msgid "Warn if audio used in a layout is about to be shifted."
 msgstr "Varoita jos asettelussa käytettyä ääniraitaa aiotaan siirtää."
 
-#: src/preferences.c:3556
+#: src/preferences.c:3617
 msgid "Warn if audio used in a layout is about to be altered."
 msgstr "Varoita jos asettelussa käytettyä ääniraitaa aiotaan muuttaa."
 
-#: src/preferences.c:3566
+#: src/preferences.c:3628
 msgid "Popup layout errors after clip changes."
 msgstr ""
 
-#: src/preferences.c:3577
+#: src/preferences.c:3639
 msgid "Warn if the layout has not been saved when leaving multitrack mode."
 msgstr ""
 "Varoita multitrack-tilasta poistuttaessa jos asettelua ei ole tallennettu."
 
-#: src/preferences.c:3588
+#: src/preferences.c:3650
 msgid ""
 "Warn if multitrack has no audio channels, and a layout with audio is loaded."
 msgstr ""
 "Varoita jos multitrack ei sisällä äänikanavia ja aiotaan ladata ääntä "
 "sisältävä asettelu."
 
-#: src/preferences.c:3598
+#: src/preferences.c:3660
 msgid ""
 "Warn if multitrack has audio channels, and your audio player is not \"jack\" "
 "or \"pulse audio\"."
@@ -7621,249 +7635,249 @@
 "Varoita jos multitrack sisältää äänikanavia ja äänisoittimeksi ei ole "
 "valittu \"jack\" tai \"pulse audio\"."
 
-#: src/preferences.c:3610
+#: src/preferences.c:3672
 msgid "Show info message after importing from firewire device."
 msgstr "Näytä ilmoitus firewire-laitteelta tuonnin jälkeen."
 
-#: src/preferences.c:3626
+#: src/preferences.c:3688
 msgid "Show a warning before opening a yuv4mpeg stream (advanced)."
 msgstr "Näytä varoitus ennen yuv4mpeg-suoratoiston avaamista (edistynyt)."
 
-#: src/preferences.c:3639
+#: src/preferences.c:3701
 msgid "Show a warning when multitrack is low on backup space."
 msgstr ""
 
-#: src/preferences.c:3650
+#: src/preferences.c:3713
 msgid "Show a warning advising cleaning of disk space after a crash."
 msgstr ""
 
-#: src/preferences.c:3661
+#: src/preferences.c:3725
 msgid "Show a warning if unable to connect to pulseaudio player."
 msgstr ""
 
-#: src/preferences.c:3673
+#: src/preferences.c:3737
 #, fuzzy
 msgid "Show a warning before wiping a layout which has unsaved changes."
 msgstr "Näytä varoitus ennen yuv4mpeg-suoratoiston avaamista (edistynyt)."
 
-#: src/preferences.c:3685
+#: src/preferences.c:3749
 msgid "Warnings"
 msgstr "Varoitukset"
 
-#: src/preferences.c:3703
+#: src/preferences.c:3767
 msgid "Midi synch (requires the files midistart and midistop)"
 msgstr "Midi-synkronointi (vaatii tiedostot midistart ja midistop)"
 
-#: src/preferences.c:3715
+#: src/preferences.c:3779
 msgid "When inserting/merging frames:  "
 msgstr ""
 
-#: src/preferences.c:3719
+#: src/preferences.c:3783
 msgid "_Speed Up/Slow Down Insertion"
 msgstr ""
 
-#: src/preferences.c:3723
+#: src/preferences.c:3787
 msgid "_Resample Insertion"
 msgstr ""
 
-#: src/preferences.c:3730
+#: src/preferences.c:3794
 msgid "CD device           "
 msgstr "CD-laite           "
 
-#: src/preferences.c:3733
+#: src/preferences.c:3797
 msgid "LiVES can load audio tracks from this CD"
 msgstr ""
 
-#: src/preferences.c:3746
+#: src/preferences.c:3813
 msgid "Default FPS        "
 msgstr ""
 
-#: src/preferences.c:3749
+#: src/preferences.c:3816
 msgid "Frames per second to use when none is specified"
 msgstr ""
 
-#: src/preferences.c:3757
+#: src/preferences.c:3825
 msgid "Misc"
 msgstr "Sekalaiset"
 
-#: src/preferences.c:3782
+#: src/preferences.c:3850
 msgid "New theme:           "
 msgstr "Uusi teema:           "
 
-#: src/preferences.c:3800
+#: src/preferences.c:3867
 msgid "Themes"
 msgstr "Teemat"
 
-#: src/preferences.c:3815
+#: src/preferences.c:3882
 msgid "Download bandwidth (Kb/s)       "
 msgstr "Latauksen kaistanleveys (Kb/s)       "
 
-#: src/preferences.c:3823
+#: src/preferences.c:3890
 msgid "LiVES must be compiled without \"configure --disable-OSC\" to use OMC"
 msgstr ""
 "LiVES täytyy kääntää ilman valitsinta \"configure --disable-OSC\" jotta OMC:"
 "tä voi käyttää"
 
-#: src/preferences.c:3833
+#: src/preferences.c:3900
 msgid "OMC remote control enabled"
 msgstr "Käytä OMC-etäohjausta"
 
-#: src/preferences.c:3841
+#: src/preferences.c:3908
 msgid "UDP port       "
 msgstr "UDP-portti       "
 
-#: src/preferences.c:3850
+#: src/preferences.c:3917
 msgid "Start OMC on startup"
 msgstr "Käynnistä OMC LiVESin käynnistyksen yhteydessä"
 
-#: src/preferences.c:3870
+#: src/preferences.c:3937
 msgid "Streaming/Networking"
 msgstr "Suoratoisto/Verkko"
 
-#: src/preferences.c:3882
+#: src/preferences.c:3949
 msgid "Jack transport"
 msgstr "Jack-välityspalvelu"
 
-#: src/preferences.c:3886
+#: src/preferences.c:3953
 msgid ""
 "LiVES must be compiled with jack/transport.h and jack/jack.h present to use "
 "jack transport"
 msgstr ""
 
-#: src/preferences.c:3892
+#: src/preferences.c:3959
 msgid "Jack _transport config file"
 msgstr "Jack-_välityspalvelun asetustiedosto"
 
-#: src/preferences.c:3899 src/preferences.c:3989
+#: src/preferences.c:3967 src/preferences.c:4058
 msgid "Start _server on LiVES startup"
 msgstr "Käynnistä _palvelin LiVESin käynnistyessä"
 
-#: src/preferences.c:3911
+#: src/preferences.c:3979
 msgid "Jack transport _master (start and stop)"
 msgstr ""
 
-#: src/preferences.c:3921
+#: src/preferences.c:3989
 msgid "Jack transport _client (start and stop)"
 msgstr ""
 
-#: src/preferences.c:3935
+#: src/preferences.c:4003
 msgid "Jack transport sets start position"
 msgstr ""
 
-#: src/preferences.c:3952
+#: src/preferences.c:4020
 msgid "Jack transport timebase slave"
 msgstr ""
 
-#: src/preferences.c:3963
+#: src/preferences.c:4031
 msgid "(See also Playback -> Audio follows video rate/direction)"
 msgstr ""
 
-#: src/preferences.c:3971
+#: src/preferences.c:4039
 msgid "Jack audio"
 msgstr ""
 
-#: src/preferences.c:3975
+#: src/preferences.c:4043
 msgid "LiVES must be compiled with jack/jack.h present to use jack audio"
 msgstr ""
 
-#: src/preferences.c:3978
+#: src/preferences.c:4046
 msgid ""
 "You MUST set the audio player to \"jack\" in the Playback tab to use jack "
 "audio"
 msgstr ""
 
-#: src/preferences.c:3984
+#: src/preferences.c:4052
 msgid "Jack _audio server config file"
 msgstr "Jack-_äänipalvelimen asetustiedosto"
 
-#: src/preferences.c:3996
+#: src/preferences.c:4065
 msgid "Play audio even when transport is _paused"
 msgstr ""
 
-#: src/preferences.c:4008
+#: src/preferences.c:4077
 msgid "Automatically connect to System Out ports when 'playing' External Audio"
 msgstr ""
 
-#: src/preferences.c:4021
+#: src/preferences.c:4090
 msgid "Jack Integration"
 msgstr ""
 
-#: src/preferences.c:4035
+#: src/preferences.c:4104
 msgid "Events to respond to:"
 msgstr ""
 
-#: src/preferences.c:4044
+#: src/preferences.c:4113
 msgid "_Joystick events"
 msgstr "_Peliohjaintapahtumat"
 
-#: src/preferences.c:4051
+#: src/preferences.c:4120
 msgid "_Joystick device"
 msgstr "_Peliohjainlaite"
 
-#: src/preferences.c:4053
+#: src/preferences.c:4122
 msgid "The joystick device, e.g. /dev/input/js0"
 msgstr "Peliohjainlaite, esim. /dev/input/js0"
 
-#: src/preferences.c:4071
+#: src/preferences.c:4142
 msgid "_MIDI events"
 msgstr "_MIDI-tapahtumat"
 
-#: src/preferences.c:4080
+#: src/preferences.c:4151
 msgid "Use _ALSA MIDI (recommended)"
 msgstr "Käytä _ALSA MIDIä (suositeltu)"
 
-#: src/preferences.c:4082
+#: src/preferences.c:4153
 msgid "Create an ALSA MIDI port which other MIDI devices can be connected to"
 msgstr "Luo ALSA MIDI-portti johon muut MIDI-laitteet voidaan yhdistää"
 
-#: src/preferences.c:4090
+#: src/preferences.c:4162
 msgid "Use _raw MIDI"
 msgstr ""
 
-#: src/preferences.c:4092
+#: src/preferences.c:4164
 msgid "Read directly from the MIDI device"
 msgstr "Lue suoraan MIDI-laitteelta"
 
-#: src/preferences.c:4104
+#: src/preferences.c:4177
 msgid "_MIDI device"
 msgstr "_MIDI-laite"
 
-#: src/preferences.c:4106
+#: src/preferences.c:4179
 msgid "The MIDI device, e.g. /dev/input/midi0"
 msgstr "MIDI-laite, esim. /dev/input/midi0"
 
-#: src/preferences.c:4118
+#: src/preferences.c:4193
 msgid "Advanced"
 msgstr "Lisäasetukset"
 
-#: src/preferences.c:4124
+#: src/preferences.c:4199
 msgid "MIDI check _rate"
 msgstr ""
 
-#: src/preferences.c:4127
+#: src/preferences.c:4203
 msgid ""
 "Number of MIDI checks per keyboard tick. Increasing this may improve MIDI "
 "responsiveness, but may slow down playback."
 msgstr ""
 
-#: src/preferences.c:4134
+#: src/preferences.c:4211
 msgid "MIDI repeat"
 msgstr ""
 
-#: src/preferences.c:4137
+#: src/preferences.c:4214
 msgid "Number of non-reads allowed between succesive reads."
 msgstr ""
 
-#: src/preferences.c:4140
+#: src/preferences.c:4218
 msgid "(Warning: setting this value too high can slow down playback.)"
 msgstr ""
 "(Varoitus: toisto saattaa hidastua jos tämä arvo asetetaan liian suureksi.)"
 
-#: src/preferences.c:4159
+#: src/preferences.c:4237
 msgid "MIDI/Joystick learner"
 msgstr ""
 
-#: src/preferences.c:4499
+#: src/preferences.c:4679
 msgid ""
 "\n"
 "LiVES will now shut down. You need to restart it for the directory change to "
@@ -7871,216 +7885,216 @@
 "Click OK to continue.\n"
 msgstr ""
 
-#: src/preferences.c:4523
+#: src/preferences.c:4703
 msgid ""
 "For the directory change to take effect LiVES will restart when preferences "
 "dialog closes."
 msgstr ""
 
-#: src/preferences.c:4527
+#: src/preferences.c:4707
 msgid "Theme changes will not take effect until the next time you start LiVES."
 msgstr ""
 "Teeman vaihdos tulee voimaan vasta seuraavalla LiVESin käynnistyskerralla."
 
-#: src/preferences.c:4531
+#: src/preferences.c:4711
 msgid "Jack options will not take effect until the next time you start LiVES."
 msgstr ""
 "Jack-asetukset tulevat voimaan vasta seuraavalla LiVEsin käynnistyskerralla."
 
-#: src/osc.c:2585
+#: src/osc.c:2616
 #, c-format
 msgid "Syncing to external framerate of %.8f frames per second.\n"
 msgstr ""
 
-#: src/osc.c:6746
+#: src/osc.c:6938
 msgid "Cannot initialize OSC receiver\n"
 msgstr ""
 
-#: src/osc.c:6770
+#: src/osc.c:6961
 #, c-format
 msgid "WARNING: Cannot start OSC server at UDP port %d\n"
 msgstr ""
 
-#: src/osc.c:6775
+#: src/osc.c:6963
 #, c-format
 msgid "Started OSC server at UDP port %d\n"
 msgstr ""
 
-#: src/osc.c:6890
+#: src/osc.c:7076
 #, c-format
 msgid "Cannot start OSC/UDP server at port %d \n"
 msgstr ""
 
-#: src/resample.c:125 src/resample.c:304
+#: src/resample.c:131 src/resample.c:305
 #, c-format
 msgid "Resizing frames 1 to %d"
 msgstr ""
 
-#: src/resample.c:140 src/resample.c:318
+#: src/resample.c:145 src/resample.c:318
 #, c-format
 msgid "Resizing/letterboxing frames 1 to %d"
 msgstr ""
 
-#: src/resample.c:361 src/resample.c:385
+#: src/resample.c:360 src/resample.c:384
 msgid "Resize"
 msgstr ""
 
-#: src/resample.c:395
+#: src/resample.c:394
 msgid "Resample/Resize"
 msgstr ""
 
-#: src/resample.c:680
+#: src/resample.c:676
 #, c-format
 msgid "Length of video is now %d frames.\n"
 msgstr "Videon pituus on nyt %d kuvaa.\n"
 
-#: src/resample.c:745
+#: src/resample.c:737
 msgid ""
 "\n"
 "\n"
 "New rate must be greater than 0\n"
 msgstr ""
 
-#: src/resample.c:797 src/resample.c:813
+#: src/resample.c:788 src/resample.c:803
 msgid "Resampling audio"
 msgstr ""
 
-#: src/resample.c:831
+#: src/resample.c:821
 msgid "LiVES was unable to resample the audio as requested.\n"
 msgstr ""
 
-#: src/resample.c:833 src/resample.c:837
+#: src/resample.c:823 src/resample.c:827
 msgid "Resample Audio"
 msgstr ""
 
-#: src/resample.c:845
+#: src/resample.c:835
 #, c-format
 msgid "Audio was resampled to %d Hz, %d channels, %d bit"
 msgstr ""
 
-#: src/resample.c:1034
+#: src/resample.c:1016
 #, c-format
 msgid "Resampling video at %.8f frames per second..."
 msgstr ""
 
-#: src/resample.c:1037
+#: src/resample.c:1018
 #, c-format
 msgid "Resampling video at %.3f frames per second..."
 msgstr ""
 
-#: src/resample.c:1068
+#: src/resample.c:1049
 msgid "Reordering error !\n"
 msgstr ""
 
-#: src/resample.c:1079
+#: src/resample.c:1060
 msgid "Resample"
 msgstr ""
 
-#: src/resample.c:1192
+#: src/resample.c:1173
 msgid "LiVES: - Resample Audio"
 msgstr ""
 
-#: src/resample.c:1195
+#: src/resample.c:1175
 msgid "LiVES: - Insert Silence"
 msgstr ""
 
-#: src/resample.c:1198
+#: src/resample.c:1177
 msgid "LiVES: - New Clip Audio"
 msgstr ""
 
-#: src/resample.c:1201
+#: src/resample.c:1179
 msgid "LiVES: - External Clip Settings"
 msgstr "LiVES: - Ulkoisen leikkeen asetukset"
 
-#: src/resample.c:1238 src/resample.c:1358
+#: src/resample.c:1215 src/resample.c:1332
 msgid "Rate (Hz) "
 msgstr "Taajuus (Hz) "
 
-#: src/resample.c:1245 src/resample.c:1372
+#: src/resample.c:1222 src/resample.c:1346
 msgid "Channels"
 msgstr ""
 
-#: src/resample.c:1252
+#: src/resample.c:1229
 msgid "Sample Size "
 msgstr ""
 
-#: src/resample.c:1268 src/resample.c:1425
+#: src/resample.c:1245 src/resample.c:1399
 msgid "Signed"
 msgstr ""
 
-#: src/resample.c:1274 src/resample.c:1435
+#: src/resample.c:1251 src/resample.c:1409
 msgid "Unsigned"
 msgstr ""
 
-#: src/resample.c:1297 src/resample.c:1460
+#: src/resample.c:1273 src/resample.c:1433
 msgid "Little Endian"
 msgstr ""
 
-#: src/resample.c:1303 src/resample.c:1468
+#: src/resample.c:1279 src/resample.c:1441
 msgid "Big Endian"
 msgstr ""
 
-#: src/resample.c:1315
+#: src/resample.c:1290
 msgid "Current"
 msgstr "Nykyinen"
 
-#: src/resample.c:1340
+#: src/resample.c:1315
 msgid "_Enable audio"
 msgstr ""
 
-#: src/resample.c:1372
+#: src/resample.c:1346
 msgid "_Channels"
 msgstr ""
 
-#: src/resample.c:1394
+#: src/resample.c:1368
 msgid "_Sample Size"
 msgstr ""
 
-#: src/resample.c:1394
+#: src/resample.c:1368
 msgid "Sample Size"
 msgstr ""
 
-#: src/resample.c:1489
+#: src/resample.c:1461
 msgid "New"
 msgstr "Uusi"
 
-#: src/resample.c:1512
+#: src/resample.c:1484
 msgid "_Frames Per Second "
 msgstr "_Kuvaa sekunnissa "
 
-#: src/resample.c:1530
+#: src/resample.c:1502
 msgid "Record for maximum:  "
 msgstr "Nauhoita korkeintaan:  "
 
-#: src/resample.c:1533
+#: src/resample.c:1505
 msgid " hours  "
 msgstr " tuntia  "
 
-#: src/resample.c:1536
+#: src/resample.c:1508
 msgid " minutes  "
 msgstr " minuuttia  "
 
-#: src/resample.c:1538
+#: src/resample.c:1510
 msgid " seconds  "
 msgstr " sekuntia  "
 
-#: src/resample.c:1545
+#: src/resample.c:1517
 msgid "Unlimited"
 msgstr "Rajoittamaton nauhoitus"
 
-#: src/resample.c:1561
+#: src/resample.c:1533
 msgid "Click OK to begin recording, or Cancel to quit."
 msgstr "Napsauta OK aloittaaksesi nauhoituksen, tai Peruuta lopettaaksesi."
 
-#: src/resample.c:1670
+#: src/resample.c:1638
 msgid "LiVES: - Change playback speed"
 msgstr "LiVES: - Muuta toistonopeutta"
 
-#: src/resample.c:1673
+#: src/resample.c:1640
 msgid "LiVES: - Resample Video"
 msgstr ""
 
-#: src/resample.c:1696
+#: src/resample.c:1663
 #, c-format
 msgid ""
 "\n"
@@ -8097,7 +8111,7 @@
 "Anna haluttu toistonopeus\n"
 "_kuvina sekunnissa"
 
-#: src/resample.c:1701
+#: src/resample.c:1667
 #, c-format
 msgid ""
 "\n"
@@ -8114,89 +8128,89 @@
 "Anna _uusi toistonopeus\n"
 "kuvina sekunnissa"
 
-#: src/resample.c:1723
+#: src/resample.c:1688
 msgid "OR enter the desired clip length in _seconds"
 msgstr "TAI anna haluttu leikkeen pituus _sekunteina"
 
-#: src/resample.c:1745
+#: src/resample.c:1710
 msgid "Change the _audio speed as well"
 msgstr "Muuta myös _äänen nopeutta"
 
-#: src/resample.c:1846
+#: src/resample.c:1810
 msgid ""
 "\n"
 "Speeding up the clip will cause missing frames in some multitrack layouts.\n"
 "Are you sure you wish to change the speed ?\n"
 msgstr ""
 
-#: src/resample.c:1863
+#: src/resample.c:1829
 msgid ""
 "\n"
 "Speeding up the clip will cause missing audio in some multitrack layouts.\n"
 "Are you sure you wish to change the speed ?\n"
 msgstr ""
 
-#: src/resample.c:1878
+#: src/resample.c:1847
 msgid ""
 "\n"
 "Changing the speed will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/resample.c:1892
+#: src/resample.c:1863
 msgid ""
 "\n"
 "Changing the speed will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/resample.c:1938
+#: src/resample.c:1911
 msgid "Speed Change"
 msgstr "Nopeuden muutos"
 
-#: src/resample.c:1947
+#: src/resample.c:1920
 #, c-format
 msgid "Changed playback speed to %.3f frames per second and audio to %d Hz.\n"
 msgstr ""
 
-#: src/resample.c:1950
+#: src/resample.c:1922
 #, c-format
 msgid "Changed playback speed to %.3f frames per second.\n"
 msgstr "Muutettiin toistonopeudeksi %.3f kuvaa sekunnissa.\n"
 
-#: src/resample.c:2035
+#: src/resample.c:2006
 msgid "Resampling video"
 msgstr ""
 
-#: src/resample.c:2042 src/resample.c:2160 src/resample.c:2182
+#: src/resample.c:2012 src/resample.c:2127 src/resample.c:2148
 msgid "Resampling clipboard video"
 msgstr ""
 
-#: src/resample.c:2047
+#: src/resample.c:2016
 msgid "Reordering frames"
 msgstr ""
 
-#: src/resample.c:2056
+#: src/resample.c:2025
 msgid ""
 "\n"
 "\n"
 "LiVES was unable to reorder the frames."
 msgstr ""
 
-#: src/resample.c:2104
+#: src/resample.c:2071
 msgid "Deordering frames"
 msgstr ""
 
-#: src/resample.c:2199
+#: src/resample.c:2165
 msgid "resampling error..."
 msgstr ""
 
-#: src/rte_window.c:85 src/rte_window.c:1708
+#: src/rte_window.c:124 src/rte_window.c:1709
 #, c-format
 msgid "Type: %s"
 msgstr "Tyyppi: %s"
 
-#: src/rte_window.c:112
+#: src/rte_window.c:150
 msgid ""
 "\n"
 "\n"
@@ -8206,7 +8220,7 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:426
+#: src/rte_window.c:460
 msgid ""
 "\n"
 "\n"
@@ -8218,12 +8232,12 @@
 "Napsauta \"OK\" tallentaaksesi tämän näppäinkartan oletuskartaksi\n"
 "\n"
 
-#: src/rte_window.c:432
+#: src/rte_window.c:466
 #, c-format
 msgid "Saving keymap to %s\n"
 msgstr "Tallennetaan näppäinkartta tiedostoon %s\n"
 
-#: src/rte_window.c:439
+#: src/rte_window.c:471
 #, c-format
 msgid ""
 "\n"
@@ -8232,7 +8246,7 @@
 "\n"
 "Päivitetään näppäinkarttatiedosto %s..."
 
-#: src/rte_window.c:446
+#: src/rte_window.c:477
 #, c-format
 msgid ""
 "\n"
@@ -8242,12 +8256,12 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/rte_window.c:526
+#: src/rte_window.c:556
 #, c-format
 msgid "Saving real time effect defaults to %s..."
 msgstr ""
 
-#: src/rte_window.c:535
+#: src/rte_window.c:563
 #, c-format
 msgid ""
 "\n"
@@ -8257,22 +8271,22 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/rte_window.c:632
+#: src/rte_window.c:657
 #, c-format
 msgid "Loading real time effect defaults from %s..."
 msgstr ""
 
-#: src/rte_window.c:681
+#: src/rte_window.c:701
 #, c-format
 msgid "Loading generator default sizes from %s..."
 msgstr ""
 
-#: src/rte_window.c:1306
+#: src/rte_window.c:1319
 #, c-format
 msgid "Loading default keymap from %s..."
 msgstr "Ladataan oletusnäppäimistökartta tiedostosta %s..."
 
-#: src/rte_window.c:1329
+#: src/rte_window.c:1339
 #, c-format
 msgid ""
 "\n"
@@ -8287,48 +8301,48 @@
 "%s\n"
 "Virhekoodi on %d\n"
 
-#: src/rte_window.c:1403
+#: src/rte_window.c:1412
 #, c-format
 msgid "Invalid line %d in %s\n"
 msgstr ""
 
-#: src/rte_window.c:1483
+#: src/rte_window.c:1490
 #, c-format
 msgid "Invalid key %d in %s\n"
 msgstr ""
 
-#: src/rte_window.c:1498
+#: src/rte_window.c:1505
 #, c-format
 msgid "Invalid effect %s in %s\n"
 msgstr ""
 
-#: src/rte_window.c:1517
+#: src/rte_window.c:1524
 #, c-format
 msgid "Unknown effect %s in %s\n"
 msgstr ""
 
-#: src/rte_window.c:1535
+#: src/rte_window.c:1542
 #, c-format
 msgid ""
 "This version of LiVES cannot mix generators/non-generators on the same key "
 "(%d) !\n"
 msgstr ""
 
-#: src/rte_window.c:1547
+#: src/rte_window.c:1554
 #, c-format
 msgid "Too many effects bound to key %d.\n"
 msgstr "Näppäimeen %d on sidottu liian monta tehostetta.\n"
 
-#: src/rte_window.c:1587
+#: src/rte_window.c:1593
 msgid "update required.\n"
 msgstr ""
 
-#: src/rte_window.c:1603
+#: src/rte_window.c:1607
 #, c-format
 msgid "Loading data connection map from %s..."
 msgstr ""
 
-#: src/rte_window.c:1612
+#: src/rte_window.c:1614
 msgid ""
 "\n"
 "\n"
@@ -8336,41 +8350,41 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:1691
+#: src/rte_window.c:1692
 #, c-format
 msgid "LiVES: Information for %s"
 msgstr ""
 
-#: src/rte_window.c:1704
+#: src/rte_window.c:1705
 #, c-format
 msgid "Effect name: %s"
 msgstr "Tehosteen nimi: %s"
 
-#: src/rte_window.c:1712
+#: src/rte_window.c:1713
 #, c-format
 msgid "Plugin name: %s"
 msgstr "Liitännäisen nimi: %s"
 
-#: src/rte_window.c:1716
+#: src/rte_window.c:1717
 #, c-format
 msgid "Author: %s"
 msgstr "Tekijä: %s"
 
-#: src/rte_window.c:1721
+#: src/rte_window.c:1722
 #, c-format
 msgid "and: %s"
 msgstr ""
 
-#: src/rte_window.c:1726
+#: src/rte_window.c:1727
 #, c-format
 msgid "Version: %d"
 msgstr "Versio: %d"
 
-#: src/rte_window.c:1734
+#: src/rte_window.c:1735
 msgid "Description: "
 msgstr "Kuvaus: "
 
-#: src/rte_window.c:1960
+#: src/rte_window.c:1963
 msgid ""
 "\n"
 "\n"
@@ -8379,69 +8393,69 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:2024
+#: src/rte_window.c:2027
 #, c-format
 msgid "LiVES could not locate the effect %s.\n"
 msgstr "LiVES ei löytänyt tehostetta %s.\n"
 
-#: src/rte_window.c:2225
+#: src/rte_window.c:2216
 msgid "LiVES: Real time effect mapping"
 msgstr "LiVES: Tosiaikaisten tehosteiden näppäinsidokset"
 
-#: src/rte_window.c:2257
+#: src/rte_window.c:2248
 #, c-format
 msgid "Ctrl-%d"
 msgstr "Ctrl-%d"
 
-#: src/rte_window.c:2264
+#: src/rte_window.c:2255
 msgid "Key active"
 msgstr ""
 
-#: src/rte_window.c:2279
+#: src/rte_window.c:2271
 msgid "Key grab"
 msgstr ""
 
-#: src/rte_window.c:2280
+#: src/rte_window.c:2272
 msgid "Grab keyboard for this effect key"
 msgstr ""
 
-#: src/rte_window.c:2290
+#: src/rte_window.c:2283
 msgid "_Clear all effects"
 msgstr "_Poista kaikki tehosteet"
 
-#: src/rte_window.c:2304
+#: src/rte_window.c:2297
 msgid "Mode active"
 msgstr "Käytössä"
 
-#: src/rte_window.c:2314 src/multitrack.c:8568
+#: src/rte_window.c:2307 src/multitrack.c:8762
 msgid "Info"
 msgstr "Tietoa"
 
-#: src/rte_window.c:2315
+#: src/rte_window.c:2308
 msgid "Set Parameters"
 msgstr "Määritä arvot"
 
-#: src/rte_window.c:2316
+#: src/rte_window.c:2309
 msgid "Set Connections"
 msgstr ""
 
-#: src/rte_window.c:2317
+#: src/rte_window.c:2310
 msgid "Clear"
 msgstr "Tyhjennä"
 
-#: src/rte_window.c:2326
+#: src/rte_window.c:2319
 msgid "Effect name:"
 msgstr "Tehosteen nimi:"
 
-#: src/rte_window.c:2391
+#: src/rte_window.c:2384
 msgid "_Save as default keymap"
 msgstr "_Tallenna oletuskartaksi"
 
-#: src/rte_window.c:2396
+#: src/rte_window.c:2389
 msgid "_Load default keymap"
 msgstr "_Lataa oletuskartta"
 
-#: src/rte_window.c:2840
+#: src/rte_window.c:2833
 #, c-format
 msgid ""
 "Unable to create default keymap file: %s\n"
@@ -8499,86 +8513,86 @@
 msgid "none\n"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:494
+#: src/lives-yuv4mpeg.c:493
 #, c-format
 msgid ""
 "Unable to set display framerate to %.3f fps.\n"
 "\n"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:503
+#: src/lives-yuv4mpeg.c:502
 #, c-format
 msgid "Unable to open yuv4mpeg out stream %s\n"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:628
+#: src/lives-yuv4mpeg.c:626
 #, c-format
 msgid "TV card %d"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:713
+#: src/lives-yuv4mpeg.c:710
 #, c-format
 msgid "Opened TV card %d (%s)"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:760
+#: src/lives-yuv4mpeg.c:757
 #, c-format
 msgid "Firewire card %d"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:796
+#: src/lives-yuv4mpeg.c:793
 #, c-format
 msgid "Opened firewire card %d"
 msgstr ""
 
-#: src/multitrack.c:666
+#: src/multitrack.c:736
 msgid "Auto backup"
 msgstr ""
 
-#: src/multitrack.c:868
+#: src/multitrack.c:935
 msgid "Backing audio"
 msgstr ""
 
-#: src/multitrack.c:1435
+#: src/multitrack.c:1515
 #, fuzzy, c-format
 msgid "%s : parameters for %s"
 msgstr "Ei arvoja"
 
-#: src/multitrack.c:1809 src/multitrack.c:3483
+#: src/multitrack.c:1881 src/multitrack.c:3635
 #, c-format
 msgid "Current track: %s (layer %d)\n"
 msgstr "Nykyinen raita: %s (taso %d)\n"
 
-#: src/multitrack.c:1813 src/multitrack.c:3484
+#: src/multitrack.c:1885 src/multitrack.c:3637
 msgid "Current track: Backing audio\n"
 msgstr ""
 
-#: src/multitrack.c:1814
+#: src/multitrack.c:1886
 #, c-format
 msgid "Current track: Layer %d audio\n"
 msgstr "Nykyinen raita: Tason %d ääni\n"
 
-#: src/multitrack.c:1817
+#: src/multitrack.c:1889
 #, c-format
 msgid "%.2f sec.\n"
 msgstr "%.2f s\n"
 
-#: src/multitrack.c:1822 src/multitrack.c:3490
+#: src/multitrack.c:1894 src/multitrack.c:3643
 #, c-format
 msgid "Source: %s"
 msgstr "Lähde: %s"
 
-#: src/multitrack.c:1825 src/multitrack.c:3492
+#: src/multitrack.c:1897 src/multitrack.c:3645
 msgid "Right click for context menu.\n"
 msgstr ""
 
-#: src/multitrack.c:1827
+#: src/multitrack.c:1899
 msgid ""
 "Double click on a block\n"
 "to select it."
 msgstr ""
 
-#: src/multitrack.c:3312
+#: src/multitrack.c:3452
 msgid ""
 "\n"
 "\n"
@@ -8587,7 +8601,7 @@
 "right or double clicking on it.\n"
 msgstr ""
 
-#: src/multitrack.c:3315
+#: src/multitrack.c:3455
 msgid ""
 "\n"
 "\n"
@@ -8595,7 +8609,7 @@
 "Select an effect in FX stack first to view its parameters.\n"
 msgstr ""
 
-#: src/multitrack.c:3318
+#: src/multitrack.c:3458
 msgid ""
 "\n"
 "\n"
@@ -8605,7 +8619,7 @@
 "\n"
 "Ei ladattuja leikkeitä.\n"
 
-#: src/multitrack.c:3321
+#: src/multitrack.c:3462
 msgid ""
 "You must select two video tracks\n"
 "and a time region\n"
@@ -8615,7 +8629,7 @@
 "before inserting clips into the timeline."
 msgstr ""
 
-#: src/multitrack.c:3324
+#: src/multitrack.c:3465
 msgid ""
 "\n"
 "\n"
@@ -8624,12 +8638,12 @@
 "to apply compositors.\n"
 msgstr ""
 
-#: src/multitrack.c:3487
+#: src/multitrack.c:3640
 #, c-format
 msgid "%.2f sec. to %.2f sec.\n"
 msgstr "%.2f s - %.2f s\n"
 
-#: src/multitrack.c:3493
+#: src/multitrack.c:3646
 msgid ""
 "Single click on timeline\n"
 "to select a frame.\n"
@@ -8637,199 +8651,199 @@
 "Napsauta kerran aikajanalla\n"
 "valitaksesi kuvan.\n"
 
-#: src/multitrack.c:3711 src/multitrack.c:6790
+#: src/multitrack.c:3858 src/multitrack.c:6972
 #, c-format
 msgid "%s [unstable]"
 msgstr ""
 
-#: src/multitrack.c:3822
+#: src/multitrack.c:3973
 msgid ""
 "You can click and drag\n"
 "below the timeline"
 msgstr ""
 
-#: src/multitrack.c:3823
+#: src/multitrack.c:3974
 msgid "to select a time region.\n"
 msgstr ""
 
-#: src/multitrack.c:3985
+#: src/multitrack.c:4137
 msgid "LiVES: Selected clip"
 msgstr ""
 
-#: src/multitrack.c:3993
+#: src/multitrack.c:4145
 msgid "_Adjust start and end points"
 msgstr ""
 
-#: src/multitrack.c:4002
+#: src/multitrack.c:4154
 msgid "_Edit/encode in clip editor"
 msgstr ""
 
-#: src/multitrack.c:4009
+#: src/multitrack.c:4161
 msgid "_Show clip information"
 msgstr "_Näytä leikkeen tiedot"
 
-#: src/multitrack.c:4016
+#: src/multitrack.c:4168
 msgid "_Close this clip"
 msgstr "_Sulje tämä leike"
 
-#: src/multitrack.c:4236
+#: src/multitrack.c:4388
 msgid "Audio mixer (ctrl-m)"
 msgstr "Äänimikseri (ctrl-m)"
 
-#: src/multitrack.c:4336
+#: src/multitrack.c:4488
 msgid "Single click on timeline"
 msgstr ""
 
-#: src/multitrack.c:4337
+#: src/multitrack.c:4489
 msgid "to select a frame."
 msgstr ""
 
-#: src/multitrack.c:4338
+#: src/multitrack.c:4490
 msgid "Double click or right click on timeline"
 msgstr ""
 
-#: src/multitrack.c:4339
+#: src/multitrack.c:4491
 msgid "to select a block."
 msgstr ""
 
-#: src/multitrack.c:4340
+#: src/multitrack.c:4492
 msgid "Clips can be dragged"
 msgstr "Leikkeitä voi raahata"
 
-#: src/multitrack.c:4341
+#: src/multitrack.c:4493
 msgid "onto the timeline."
 msgstr "aikajanalle."
 
-#: src/multitrack.c:4343
+#: src/multitrack.c:4495
 msgid "Mouse mode is: Move"
 msgstr "Hiiren tila on: Siirrä"
 
-#: src/multitrack.c:4344
+#: src/multitrack.c:4496
 msgid "clips can be moved around."
 msgstr ""
 
-#: src/multitrack.c:4349
+#: src/multitrack.c:4500
 msgid "Mouse mode is: Select."
 msgstr "Hiiren tila on: Valitse"
 
-#: src/multitrack.c:4350
+#: src/multitrack.c:4501
 msgid "Drag with mouse on timeline"
 msgstr ""
 
-#: src/multitrack.c:4351
+#: src/multitrack.c:4502
 msgid "to select tracks and time."
 msgstr ""
 
-#: src/multitrack.c:4362
+#: src/multitrack.c:4509
 msgid "_Insert mode: Normal"
 msgstr ""
 
-#: src/multitrack.c:4378
+#: src/multitrack.c:4537
 msgid "_Mouse mode: Move"
 msgstr "H_iiren tila: Siirrä"
 
-#: src/multitrack.c:4382
+#: src/multitrack.c:4540
 msgid "_Mouse mode: Select"
 msgstr "H_iiren tila: Valitse"
 
-#: src/multitrack.c:4405 src/multitrack.c:7925
+#: src/multitrack.c:4563 src/multitrack.c:8104
 msgid "Gravity: Normal"
 msgstr ""
 
-#: src/multitrack.c:4409
+#: src/multitrack.c:4565
 msgid "Gravity: Left"
 msgstr ""
 
-#: src/multitrack.c:4414
+#: src/multitrack.c:4569
 msgid "Gravity: Right"
 msgstr ""
 
-#: src/multitrack.c:4416
+#: src/multitrack.c:4570
 msgid "Close _last gap(s) in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:4419
+#: src/multitrack.c:4572
 msgid "Close _first gap(s) in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:4458
+#: src/multitrack.c:4627
 msgid "Close gaps"
 msgstr "Sulje välit"
 
-#: src/multitrack.c:4460
+#: src/multitrack.c:4629
 msgid "Move block"
 msgstr "Siirrä lohkoa"
 
-#: src/multitrack.c:4462
+#: src/multitrack.c:4631
 msgid "Move audio block"
 msgstr "Siirrä äänilohkoa"
 
-#: src/multitrack.c:4464
+#: src/multitrack.c:4633
 msgid "Delete block"
 msgstr "Poista lohko"
 
-#: src/multitrack.c:4466
+#: src/multitrack.c:4635
 msgid "Delete audio block"
 msgstr "Poista äänilohko"
 
-#: src/multitrack.c:4468
+#: src/multitrack.c:4637
 msgid "Split tracks"
 msgstr ""
 
-#: src/multitrack.c:4470
+#: src/multitrack.c:4639
 msgid "Split block"
 msgstr ""
 
-#: src/multitrack.c:4473
+#: src/multitrack.c:4642
 #, c-format
 msgid "Apply %s"
 msgstr ""
 
-#: src/multitrack.c:4478
+#: src/multitrack.c:4647
 #, c-format
 msgid "Delete %s"
 msgstr "Poista %s"
 
-#: src/multitrack.c:4482
+#: src/multitrack.c:4651
 msgid "Insert block"
 msgstr ""
 
-#: src/multitrack.c:4484
+#: src/multitrack.c:4653
 msgid "Insert gap"
 msgstr "Lisää väli"
 
-#: src/multitrack.c:4486
+#: src/multitrack.c:4655
 msgid "Insert audio block"
 msgstr ""
 
-#: src/multitrack.c:4488
+#: src/multitrack.c:4657
 msgid "Effect order change"
 msgstr ""
 
-#: src/multitrack.c:4898
+#: src/multitrack.c:5064
 msgid "unsigned "
 msgstr ""
 
-#: src/multitrack.c:4899
+#: src/multitrack.c:5065
 msgid "signed "
 msgstr ""
 
-#: src/multitrack.c:4904
+#: src/multitrack.c:5071
 #, c-format
 msgid ""
 "Multitrack values set to %.3f fps, frame size %d x %d, audio channels %d, "
 "audio rate %d, audio sample size %d, %s.\n"
 msgstr ""
 
-#: src/multitrack.c:4938
+#: src/multitrack.c:5104
 msgid "invalid event list. Failed.\n"
 msgstr ""
 
-#: src/multitrack.c:4944
+#: src/multitrack.c:5110
 msgid "event list has invalid fps. Failed.\n"
 msgstr ""
 
-#: src/multitrack.c:4953
+#: src/multitrack.c:5122
 #, c-format
 msgid ""
 "\n"
@@ -8839,7 +8853,7 @@
 "then load in the new set from the File menu.\n"
 msgstr ""
 
-#: src/multitrack.c:4993
+#: src/multitrack.c:5163
 #, c-format
 msgid ""
 "\n"
@@ -8847,439 +8861,431 @@
 "It cannot be loaded.\n"
 msgstr ""
 
-#: src/multitrack.c:5329 src/multitrack.c:5338 src/multitrack.c:21133
+#: src/multitrack.c:5452
 msgid "Layout was wiped.\n"
 msgstr ""
 
-#: src/multitrack.c:5374
+#: src/multitrack.c:5547
 #, c-format
 msgid "LiVES-%s: Multitrack %dx%d : %d bpp %.3f fps"
 msgstr "LiVES-%s: Multitrack %dx%d : %d bpp %.3f fps"
 
-#: src/multitrack.c:5617
+#: src/multitrack.c:5793
 msgid "In/out"
 msgstr ""
 
-#: src/multitrack.c:5619
+#: src/multitrack.c:5795
 msgid "FX stack"
 msgstr ""
 
-#: src/multitrack.c:5627 src/omc-learn.c:673
+#: src/multitrack.c:5803 src/omc-learn.c:659
 msgid "Params."
 msgstr ""
 
-#: src/multitrack.c:5978
+#: src/multitrack.c:6157
 msgid "_Open..."
 msgstr ""
 
-#: src/multitrack.c:5996
+#: src/multitrack.c:6175
 msgid "O_pen File Selection..."
 msgstr "A_vaa tiedostovalinta..."
 
-#: src/multitrack.c:6040
+#: src/multitrack.c:6219
 msgid "Import Selection from _dvd/vcd..."
 msgstr "Tuo valinta _dvd/vcd-levyltä..."
 
-#: src/multitrack.c:6050
+#: src/multitrack.c:6229
 msgid "Import Selection from _dvd"
 msgstr "Tuo valinta _dvd:ltä"
 
-#: src/multitrack.c:6060
+#: src/multitrack.c:6239
 msgid "Import Selection from _vcd"
 msgstr "Tuo valinta _vcd:ltä"
 
-#: src/multitrack.c:6076
+#: src/multitrack.c:6255
 msgid "_Import from Device"
 msgstr "Tuo _laitteelta"
 
-#: src/multitrack.c:6103
+#: src/multitrack.c:6282
 msgid "_Close the selected clip"
 msgstr ""
 
-#: src/multitrack.c:6198
+#: src/multitrack.c:6377
 msgid "_Save layout as..."
 msgstr "_Tallenna asettelu nimellä.."
 
-#: src/multitrack.c:6206
+#: src/multitrack.c:6385
 msgid "_Load layout..."
 msgstr "L_ataa asettelu..."
 
-#: src/multitrack.c:6210
+#: src/multitrack.c:6389
 msgid "_Wipe/Delete layout..."
 msgstr "_Pyyhi/poista asettelu..."
 
-#: src/multitrack.c:6236
+#: src/multitrack.c:6415
 msgid "_Ignore width, height and audio values from loaded layouts"
 msgstr ""
 
-#: src/multitrack.c:6240
+#: src/multitrack.c:6419
 msgid "Auto load _subtitles with clips"
 msgstr ""
 
-#: src/multitrack.c:6322
+#: src/multitrack.c:6501
 msgid "_CLIP EDITOR"
 msgstr "_LEIKEMUOKKAIN"
 
-#: src/multitrack.c:6334
+#: src/multitrack.c:6513
 msgid "_Adjust selected clip start/end points"
 msgstr "_Säädä valitun leikkeen aloitus/lopetuskohtaa"
 
-#: src/multitrack.c:6343
+#: src/multitrack.c:6522
 msgid "_Insert selected clip"
 msgstr "L_isää valittu leike"
 
-#: src/multitrack.c:6355
+#: src/multitrack.c:6534
 msgid "_Insert selected clip audio"
 msgstr "L_isää valittu äänileike"
 
-#: src/multitrack.c:6364
+#: src/multitrack.c:6543
 msgid "_Delete selected block"
 msgstr "_Poista valittu lohko"
 
-#: src/multitrack.c:6373
+#: src/multitrack.c:6555
 msgid "_Jump to previous block boundary"
 msgstr "Hyppää e_delliseen lohkorajaan"
 
-#: src/multitrack.c:6382
+#: src/multitrack.c:6564
 msgid "_Jump to next block boundary"
 msgstr "Hyppää s_euraavaan lohkorajaan"
 
-#: src/multitrack.c:6395
+#: src/multitrack.c:6577
 msgid "Clear _marks from timeline"
 msgstr "Poista aikajanan _merkit"
 
-#: src/multitrack.c:6403
+#: src/multitrack.c:6585
 msgid "Ignore selection limits when inserting"
 msgstr ""
 
-#: src/multitrack.c:6420 src/multitrack.c:16719
+#: src/multitrack.c:6602 src/multitrack.c:17009
 msgid "_Play from Timeline Position"
 msgstr "_Toista aikajanan sijainnista alkaen"
 
-#: src/multitrack.c:6434
+#: src/multitrack.c:6616
 msgid "Pla_y selected time only"
 msgstr ""
 
-#: src/multitrack.c:6518
+#: src/multitrack.c:6700
 msgid "_Move effects with blocks"
 msgstr ""
 
-#: src/multitrack.c:6531
+#: src/multitrack.c:6713
 msgid "Select _autotransition effect..."
 msgstr ""
 
-#: src/multitrack.c:6542
+#: src/multitrack.c:6724
 msgid "Crossfade audio with autotransition"
 msgstr ""
 
-#: src/multitrack.c:6550
+#: src/multitrack.c:6732
 msgid "View/_Edit selected effect"
 msgstr ""
 
-#: src/multitrack.c:6554
+#: src/multitrack.c:6736
 msgid "_Delete selected effect"
 msgstr "_Poista valittu tehoste"
 
-#: src/multitrack.c:6562
+#: src/multitrack.c:6744
 msgid "Apply effect to _block..."
 msgstr ""
 
-#: src/multitrack.c:6619
+#: src/multitrack.c:6801
 msgid "Apply effect to _region..."
 msgstr ""
 
-#: src/multitrack.c:6885
+#: src/multitrack.c:7061
 msgid "_Tracks"
 msgstr "_Raidat"
 
-#: src/multitrack.c:6896
+#: src/multitrack.c:7072
 msgid "Rename current track"
 msgstr ""
 
-#: src/multitrack.c:6904
+#: src/multitrack.c:7080
 msgid "Make _Backing Audio current track"
 msgstr ""
 
-#: src/multitrack.c:6915
+#: src/multitrack.c:7091
 msgid "Add Video Track at _Rear"
 msgstr ""
 
-#: src/multitrack.c:6923
+#: src/multitrack.c:7099
 msgid "Add Video Track at _Front"
 msgstr ""
 
-#: src/multitrack.c:6936
+#: src/multitrack.c:7112
 msgid "_Split current track at cursor"
 msgstr "Jaa nykyinen raita osiin _osoittimen kohdalta"
 
-#: src/multitrack.c:6948
+#: src/multitrack.c:7124
 msgid "_Split selected video tracks"
 msgstr "Jaa _valitut raidat osiin"
 
-#: src/multitrack.c:6961
+#: src/multitrack.c:7137
 msgid "Insert gap in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:6969
+#: src/multitrack.c:7145
 msgid "Insert gap in current track/selected time"
 msgstr ""
 
-#: src/multitrack.c:6981
+#: src/multitrack.c:7157
 msgid "Close all _gaps in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:7007
+#: src/multitrack.c:7183
 msgid "Se_lection"
 msgstr "Va_linnat"
 
-#: src/multitrack.c:7018
+#: src/multitrack.c:7194
 msgid "_Select Current Track"
 msgstr ""
 
-#: src/multitrack.c:7025
+#: src/multitrack.c:7201
 msgid "Select _all video tracks"
 msgstr "Valitse _kaikki videoraidat"
 
-#: src/multitrack.c:7032
+#: src/multitrack.c:7208
 msgid "Select _no video tracks"
 msgstr ""
 
-#: src/multitrack.c:7039
+#: src/multitrack.c:7215
 msgid "Select all _time"
 msgstr ""
 
-#: src/multitrack.c:7050
+#: src/multitrack.c:7226
 msgid "Select from _zero time"
 msgstr ""
 
-#: src/multitrack.c:7057
+#: src/multitrack.c:7233
 msgid "Select to _end time"
 msgstr ""
 
-#: src/multitrack.c:7064
+#: src/multitrack.c:7240
 msgid "_Copy..."
 msgstr "_Kopioi..."
 
-#: src/multitrack.c:7075
+#: src/multitrack.c:7251
 msgid "_Timecode to region start"
 msgstr ""
 
-#: src/multitrack.c:7082
+#: src/multitrack.c:7258
 msgid "_Timecode to region end"
 msgstr ""
 
-#: src/multitrack.c:7089
+#: src/multitrack.c:7265
 msgid "_Region start to timecode"
 msgstr ""
 
-#: src/multitrack.c:7096
+#: src/multitrack.c:7272
 msgid "_Region end to timecode"
 msgstr ""
 
-#: src/multitrack.c:7110
+#: src/multitrack.c:7286
 msgid "Select/deselect block at current track/time"
 msgstr ""
 
-#: src/multitrack.c:7135
+#: src/multitrack.c:7311
 msgid "_Change width, height and audio values..."
 msgstr "_Muuta leveys-, korkeus- ja ääniarvoja..."
 
-#: src/multitrack.c:7194
+#: src/multitrack.c:7370
 msgid "_Render"
 msgstr ""
 
-#: src/multitrack.c:7205
+#: src/multitrack.c:7381
 msgid "_Render all to new clip"
 msgstr ""
 
-#: src/multitrack.c:7220
+#: src/multitrack.c:7396
 msgid "Render _video"
 msgstr ""
 
-#: src/multitrack.c:7225
+#: src/multitrack.c:7401
 msgid "Render _audio"
 msgstr ""
 
-#: src/multitrack.c:7235
+#: src/multitrack.c:7411
 msgid "_Normalise rendered audio"
 msgstr ""
 
-#: src/multitrack.c:7242
+#: src/multitrack.c:7418
 msgid "_Pre-render audio"
 msgstr ""
 
-#: src/multitrack.c:7251
+#: src/multitrack.c:7427
 msgid "_View"
 msgstr "_Näytä"
 
-#: src/multitrack.c:7270
+#: src/multitrack.c:7446
 msgid "Block _In/out points"
 msgstr ""
 
-#: src/multitrack.c:7279
+#: src/multitrack.c:7455
 msgid "_Effects at current"
 msgstr ""
 
-#: src/multitrack.c:7297
+#: src/multitrack.c:7473
 msgid "Audio parameters"
 msgstr ""
 
-#: src/multitrack.c:7308
+#: src/multitrack.c:7484
 msgid "Show backing _audio track"
 msgstr ""
 
-#: src/multitrack.c:7312
+#: src/multitrack.c:7488
 msgid "Compact view"
 msgstr ""
 
-#: src/multitrack.c:7320
+#: src/multitrack.c:7496
 msgid "Maximum tracks to display..."
 msgstr ""
 
-#: src/multitrack.c:7327
+#: src/multitrack.c:7503
 msgid "Scroll to follow playback"
 msgstr ""
 
-#: src/multitrack.c:7331
+#: src/multitrack.c:7507
 msgid "_Center on cursor"
 msgstr ""
 
-#: src/multitrack.c:7338
+#: src/multitrack.c:7514
 msgid "_Zoom in"
 msgstr "L_ähennä"
 
-#: src/multitrack.c:7349
+#: src/multitrack.c:7525
 msgid "_Zoom out"
 msgstr "L_oitonna"
 
-#: src/multitrack.c:7361
+#: src/multitrack.c:7537
 msgid "Multitrack _details"
 msgstr "_Multitrack-tiedot"
 
-#: src/multitrack.c:7374
+#: src/multitrack.c:7550
 msgid "_Event Window"
 msgstr "_Tapahtumaikkuna"
 
-#: src/multitrack.c:7378
+#: src/multitrack.c:7554
 msgid "_Event Window (selected time only)"
 msgstr ""
 
-#: src/multitrack.c:7382
+#: src/multitrack.c:7558
 msgid "_Show FRAME events"
 msgstr ""
 
-#: src/multitrack.c:7399
+#: src/multitrack.c:7575
 msgid "_Show multitrack keys"
 msgstr "_Näytä multitrack-näppäimet"
 
-#: src/multitrack.c:7468
+#: src/multitrack.c:7644
 msgid "Mouse mode: _Move"
 msgstr "Hiiren tila: _Siirrä"
 
-#: src/multitrack.c:7476
+#: src/multitrack.c:7652
 msgid "Mouse mode: _Select"
 msgstr "Hiiren tila: _Valitse"
 
-#: src/multitrack.c:7505
+#: src/multitrack.c:7681
 msgid "Insert mode: _Normal"
 msgstr ""
 
-#: src/multitrack.c:7733
+#: src/multitrack.c:7909
 msgid "Insert with _audio"
 msgstr ""
 
-#: src/multitrack.c:7734
+#: src/multitrack.c:7910
 msgid ""
 "Select whether video clips are inserted and moved with their audio or not"
 msgstr ""
 
-#: src/multitrack.c:7829
+#: src/multitrack.c:8007
 msgid "Select _overlap"
 msgstr ""
 
-#: src/multitrack.c:7830
+#: src/multitrack.c:8008
 msgid ""
 "Select whether timeline selection snaps to overlap between selected tracks "
 "or not"
 msgstr ""
 
-#: src/multitrack.c:7894 src/multitrack.c:14198
+#: src/multitrack.c:8073 src/multitrack.c:14422
 msgid "Expanded View (d)"
 msgstr "Laajempi näkymä (d)"
 
-#: src/multitrack.c:7897 src/multitrack.c:14205
+#: src/multitrack.c:8076 src/multitrack.c:14428
 msgid "Compact View (d)"
 msgstr "Suppea näkymä (d)"
 
-#: src/multitrack.c:7939
+#: src/multitrack.c:8118
 msgid "Gravity: _Normal"
 msgstr ""
 
-#: src/multitrack.c:7952
+#: src/multitrack.c:8131
 msgid "Gravity: _Left"
 msgstr ""
 
-#: src/multitrack.c:7967
+#: src/multitrack.c:8146
 msgid "Gravity: _Right"
 msgstr ""
 
-#: src/multitrack.c:8297
+#: src/multitrack.c:8496
 msgid "_Apply"
 msgstr ""
 
-#: src/multitrack.c:8319
+#: src/multitrack.c:8518
 msgid "Time"
 msgstr ""
 
-#: src/multitrack.c:8333
+#: src/multitrack.c:8532
 msgid "_Del. node"
 msgstr ""
 
-#: src/multitrack.c:8341
+#: src/multitrack.c:8540
 msgid "_Next node"
 msgstr ""
 
-#: src/multitrack.c:8349
+#: src/multitrack.c:8548
 msgid "_Prev node"
 msgstr ""
 
-#: src/multitrack.c:8373
+#: src/multitrack.c:8574
 msgid "_Reverse playback  "
 msgstr ""
 
-#: src/multitrack.c:8395
+#: src/multitrack.c:8596
 msgid "_Velocity  "
 msgstr ""
 
-#: src/multitrack.c:8464
+#: src/multitrack.c:8664
 msgid "Anchor _start"
 msgstr ""
 
-#: src/multitrack.c:8465
+#: src/multitrack.c:8665
 msgid "Anchor the start point to the timeline"
 msgstr "Ankkuroi aloituspiste aikajanaan"
 
-#: src/multitrack.c:8481
-msgid "Start frame"
-msgstr "Aloituskuva"
-
-#: src/multitrack.c:8533
+#: src/multitrack.c:8728
 msgid "Anchor _end"
 msgstr ""
 
-#: src/multitrack.c:8534
+#: src/multitrack.c:8729
 msgid "Anchor the end point to the timeline"
 msgstr "Ankkuroi lopetuspiste aikajanaan"
 
-#: src/multitrack.c:8546
-msgid "End frame"
-msgstr "Lopetuskuva"
-
-#: src/multitrack.c:8739
+#: src/multitrack.c:8929
 msgid "Scroll"
 msgstr "Vieritys"
 
-#: src/multitrack.c:9316
+#: src/multitrack.c:9502
 msgid ""
 "\n"
 "==============================\n"
@@ -9289,91 +9295,91 @@
 "==============================\n"
 "Vaihdettiin leikemuokkaustilaan\n"
 
-#: src/multitrack.c:9502
+#: src/multitrack.c:9708
 msgid "Timeline (seconds)"
 msgstr "Aikajana (sekuntia)"
 
-#: src/multitrack.c:9984
+#: src/multitrack.c:10202
 msgid " Backing audio"
 msgstr ""
 
-#: src/multitrack.c:9987
+#: src/multitrack.c:10204
 #, c-format
 msgid " Layer %d audio"
 msgstr " Tason %d ääni"
 
-#: src/multitrack.c:9995
+#: src/multitrack.c:10212
 msgid "Show/hide audio details"
 msgstr ""
 
-#: src/multitrack.c:10010 src/multitrack.c:10232
+#: src/multitrack.c:10227 src/multitrack.c:10452
 #, c-format
 msgid "Layer %d audio"
 msgstr "Tason %d ääni"
 
-#: src/multitrack.c:10144 src/multitrack.c:10261
+#: src/multitrack.c:10353 src/multitrack.c:10481
 #, c-format
 msgid "%s (layer %d)"
 msgstr "%s (taso %d)"
 
-#: src/multitrack.c:10184
+#: src/multitrack.c:10403
 msgid "Select track"
 msgstr ""
 
-#: src/multitrack.c:10188
+#: src/multitrack.c:10407
 msgid "Show/hide audio"
 msgstr ""
 
-#: src/multitrack.c:10194
+#: src/multitrack.c:10413
 #, c-format
 msgid "Video %d"
 msgstr "Video %d"
 
-#: src/multitrack.c:10233
+#: src/multitrack.c:10453
 #, c-format
 msgid " %s"
 msgstr " %s"
 
-#: src/multitrack.c:10346
+#: src/multitrack.c:10574
 msgid "LiVES: Selected effect"
 msgstr ""
 
-#: src/multitrack.c:10358
+#: src/multitrack.c:10586
 msgid "_View/Edit this effect"
 msgstr ""
 
-#: src/multitrack.c:10361
+#: src/multitrack.c:10588
 msgid "_View this effect"
 msgstr ""
 
-#: src/multitrack.c:10369
+#: src/multitrack.c:10596
 msgid "_Delete this effect"
 msgstr "_Poista tämä tehoste"
 
-#: src/multitrack.c:10422
+#: src/multitrack.c:10648
 msgid "Cannot insert after this effect"
 msgstr ""
 
-#: src/multitrack.c:10451
+#: src/multitrack.c:10677
 msgid "This effect cannot be moved"
 msgstr "Tätä tehostetta ei voi siirtää"
 
-#: src/multitrack.c:10499
+#: src/multitrack.c:10724
 #, c-format
 msgid "  %d to %d selected  "
 msgstr "  %d - %d valittuna  "
 
-#: src/multitrack.c:10502 src/multitrack.c:10746
+#: src/multitrack.c:10727 src/multitrack.c:10968
 #, c-format
 msgid "%.2f sec."
 msgstr "%.2f s"
 
-#: src/multitrack.c:10717
+#: src/multitrack.c:10940
 #, c-format
 msgid "%d frames"
 msgstr "%d kuvaa"
 
-#: src/multitrack.c:11070
+#: src/multitrack.c:11299
 msgid ""
 "\n"
 "==============================\n"
@@ -9383,70 +9389,70 @@
 "==============================\n"
 "Vaihdettiin Multitrack-tilaan\n"
 
-#: src/multitrack.c:12691
+#: src/multitrack.c:12939
 msgid "Drag the time slider to where you"
 msgstr ""
 
-#: src/multitrack.c:12692
+#: src/multitrack.c:12940
 msgid "want to set effect parameters"
 msgstr ""
 
-#: src/multitrack.c:12693
+#: src/multitrack.c:12941
 msgid "Set parameters, then click \"Apply\"\n"
 msgstr ""
 
-#: src/multitrack.c:12694
+#: src/multitrack.c:12942
 msgid ""
 "NODES are points where parameters\n"
 "have been set.\n"
 "Nodes can be deleted."
 msgstr ""
 
-#: src/multitrack.c:12697
+#: src/multitrack.c:12944
 msgid "Effect has no parameters.\n"
 msgstr ""
 
-#: src/multitrack.c:12788
+#: src/multitrack.c:13033
 #, c-format
 msgid "%s output"
 msgstr ""
 
-#: src/multitrack.c:12794 src/multitrack.c:12804
+#: src/multitrack.c:13038 src/multitrack.c:13046
 #, c-format
 msgid "layer %d"
 msgstr ""
 
-#: src/multitrack.c:12796 src/multitrack.c:12806
+#: src/multitrack.c:13039 src/multitrack.c:13047
 msgid "audio track"
 msgstr ""
 
-#: src/multitrack.c:12797
+#: src/multitrack.c:13040
 #, c-format
 msgid "%s to %s"
 msgstr ""
 
-#: src/multitrack.c:12807
+#: src/multitrack.c:13048
 #, c-format
 msgid "%s from %s"
 msgstr ""
 
-#: src/multitrack.c:12860
+#: src/multitrack.c:13099
 msgid "_Prev filter map"
 msgstr ""
 
-#: src/multitrack.c:12871
+#: src/multitrack.c:13110
 msgid "Insert _before"
 msgstr ""
 
-#: src/multitrack.c:12881
+#: src/multitrack.c:13120
 msgid "Insert _after"
 msgstr ""
 
-#: src/multitrack.c:12896
+#: src/multitrack.c:13134
 msgid "_Next filter map"
 msgstr ""
 
-#: src/multitrack.c:12911
+#: src/multitrack.c:13148
 msgid ""
 "\n"
 "\n"
@@ -9454,21 +9460,21 @@
 "current time.\n"
 msgstr ""
 
-#: src/multitrack.c:12929
+#: src/multitrack.c:13166
 msgid ""
 "Drag a compositor anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:12936
+#: src/multitrack.c:13173
 msgid ""
 "Drag a transition anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:12944
+#: src/multitrack.c:13181
 msgid ""
 "Effects can be dragged\n"
 "onto blocks on the timeline."
@@ -9476,135 +9482,135 @@
 "Tehosteita voi raahata\n"
 "aikajanalla oleviin lohkoihin."
 
-#: src/multitrack.c:13166
+#: src/multitrack.c:13406
 msgid "LiVES: Selected block/frame"
 msgstr ""
 
-#: src/multitrack.c:13173
+#: src/multitrack.c:13413
 msgid "_Select this block"
 msgstr "_Valitse tämä lohko"
 
-#: src/multitrack.c:13183
+#: src/multitrack.c:13423
 msgid "_Split block here"
 msgstr "_Jaa lohko osiin tästä"
 
-#: src/multitrack.c:13191
+#: src/multitrack.c:13431
 msgid "List _effects here"
 msgstr ""
 
-#: src/multitrack.c:13200 src/multitrack.c:13277
+#: src/multitrack.c:13440 src/multitrack.c:13518
 #, c-format
 msgid "_Adjust %s"
 msgstr ""
 
-#: src/multitrack.c:13215
+#: src/multitrack.c:13455
 msgid "_Delete this block"
 msgstr "_Poista tämä lohko"
 
-#: src/multitrack.c:13258
+#: src/multitrack.c:13500
 msgid "_Insert here"
 msgstr ""
 
-#: src/multitrack.c:13264
+#: src/multitrack.c:13505
 msgid "_Insert audio here"
 msgstr ""
 
-#: src/multitrack.c:14801
+#: src/multitrack.c:15017
 #, c-format
 msgid "Inserted gap in selected tracks from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:14835
+#: src/multitrack.c:15048
 #, c-format
 msgid "Inserted gap in track %s from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15036
+#: src/multitrack.c:15244
 #, c-format
 msgid "Undid %s\n"
 msgstr ""
 
-#: src/multitrack.c:15235
+#: src/multitrack.c:15445
 #, c-format
 msgid "Redid %s\n"
 msgstr ""
 
-#: src/multitrack.c:15268
+#: src/multitrack.c:15475
 msgid ""
 "\n"
 " (variable)"
 msgstr ""
 
-#: src/multitrack.c:15502 src/multitrack.c:15614 src/multitrack.c:18736
-#: src/multitrack.c:18748
+#: src/multitrack.c:15710 src/multitrack.c:15823 src/multitrack.c:19077
+#: src/multitrack.c:19089
 #, c-format
 msgid "track %s"
 msgstr "raita %s"
 
-#: src/multitrack.c:15507 src/multitrack.c:15619 src/multitrack.c:18741
+#: src/multitrack.c:15715 src/multitrack.c:15828 src/multitrack.c:19082
 #, c-format
 msgid "tracks %s and %s"
 msgstr "raidat %s ja %s"
 
-#: src/multitrack.c:15513 src/multitrack.c:15625 src/multitrack.c:18751
+#: src/multitrack.c:15721 src/multitrack.c:15834 src/multitrack.c:19091
 msgid "selected tracks"
 msgstr "valitut raidat"
 
-#: src/multitrack.c:15516
+#: src/multitrack.c:15726
 #, c-format
 msgid "Added %s %s to %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15550
+#: src/multitrack.c:15760
 #, c-format
 msgid "Added effect %s to track %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15631
+#: src/multitrack.c:15845
 #, c-format
 msgid "Deleted %s %s from %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15935
+#: src/multitrack.c:16143
 #, c-format
 msgid "rendered %d frames to new clip.\n"
 msgstr ""
 
-#: src/multitrack.c:16025
+#: src/multitrack.c:16230
 msgid "Cleaning up..."
 msgstr "Siivotaan..."
 
-#: src/multitrack.c:16712
+#: src/multitrack.c:17003
 msgid "_Pause"
 msgstr ""
 
-#: src/multitrack.c:16713
+#: src/multitrack.c:17004
 msgid "Pause (p)"
 msgstr ""
 
-#: src/multitrack.c:16856
+#: src/multitrack.c:17151
 msgid "Press 'm' during playback"
 msgstr "Paina toiston aikana \"m\""
 
-#: src/multitrack.c:16857
+#: src/multitrack.c:17152
 msgid "to make a mark on the timeline"
 msgstr "tehdäksesi merkin aikajanalle"
 
-#: src/multitrack.c:17154
+#: src/multitrack.c:17498
 #, c-format
 msgid ""
 "Inserted audio %.4f to %.4f from clip %s into backing audio from time %.4f "
 "to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:17414
+#: src/multitrack.c:17759
 #, c-format
 msgid ""
 "Inserted frames %d to %d from clip %s into track %s from time %.4f to %.4f\n"
 msgstr ""
 "Lisättiin kuvat %d - %d leikkeestä %s raitaan %s aikaväliltä %.4f - %.4f\n"
 
-#: src/multitrack.c:17998
+#: src/multitrack.c:18332
 #, c-format
 msgid ""
 "Time region %.3f to %.3f\n"
@@ -9613,7 +9619,7 @@
 "Aikajakso %.3f - %.3f\n"
 "valittu.\n"
 
-#: src/multitrack.c:18002
+#: src/multitrack.c:18336
 msgid ""
 "select one or more tracks\n"
 "to create a region.\n"
@@ -9621,12 +9627,12 @@
 "valitse yksi tai useampia raitoja\n"
 "luodaksesi alueen.\n"
 
-#: src/multitrack.c:18004
+#: src/multitrack.c:18337
 #, c-format
 msgid "%d video tracks selected.\n"
 msgstr "%d videoraita(a) valittu.\n"
 
-#: src/multitrack.c:18006
+#: src/multitrack.c:18339
 msgid ""
 "Double click on timeline\n"
 "to deselect time region."
@@ -9634,7 +9640,7 @@
 "Kaksoisnapsauta aikajanaa\n"
 "poistaaksesi aikajakson valinnan."
 
-#: src/multitrack.c:18013
+#: src/multitrack.c:18346
 msgid ""
 "Single click on an effect\n"
 "to select it."
@@ -9642,7 +9648,7 @@
 "Napsauta tehostetta\n"
 "valitaksesi sen."
 
-#: src/multitrack.c:18014
+#: src/multitrack.c:18347
 msgid ""
 "Double click on an effect\n"
 "to edit it."
@@ -9650,7 +9656,7 @@
 "Kaksoisnapsauta tehostetta\n"
 "muokataksesi sitä."
 
-#: src/multitrack.c:18015
+#: src/multitrack.c:18348
 msgid ""
 "Right click on an effect\n"
 "for context menu.\n"
@@ -9658,83 +9664,83 @@
 "Napsauta tehostetta hiiren\n"
 "oikealla avataksesi pikavalikon.\n"
 
-#: src/multitrack.c:18017
+#: src/multitrack.c:18350
 msgid ""
 "Effect order can be changed at\n"
 "FILTER MAPS"
 msgstr ""
 
-#: src/multitrack.c:18024
+#: src/multitrack.c:18357
 msgid ""
 "You can select an effect,\n"
 "then use the INSERT BEFORE"
 msgstr ""
 
-#: src/multitrack.c:18025
+#: src/multitrack.c:18358
 msgid "or INSERT AFTER buttons to move it."
 msgstr ""
 
-#: src/multitrack.c:18307 src/multitrack.c:18320
+#: src/multitrack.c:18639 src/multitrack.c:18652
 msgid "Click on another effect,"
 msgstr ""
 
-#: src/multitrack.c:18308 src/multitrack.c:18321
+#: src/multitrack.c:18640 src/multitrack.c:18653
 msgid ""
 "and the selected one\n"
 "will be inserted"
 msgstr ""
 
-#: src/multitrack.c:18309
+#: src/multitrack.c:18641
 msgid "after it.\n"
 msgstr ""
 
-#: src/multitrack.c:18322
+#: src/multitrack.c:18654
 msgid "before it.\n"
 msgstr ""
 
-#: src/multitrack.c:18551
+#: src/multitrack.c:18889
 #, c-format
 msgid "Removed parameter values for effect %s at time %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:18759
+#: src/multitrack.c:19100
 #, c-format
 msgid "Set parameter values for %s %s on %s at time %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:19251 src/multitrack.c:20873
+#: src/multitrack.c:19630 src/multitrack.c:21195
 msgid "_Autoreload each time"
 msgstr ""
 
-#: src/multitrack.c:19323
+#: src/multitrack.c:19702
 #, fuzzy
 msgid "Saving layout"
 msgstr "_Tallenna asettelu"
 
-#: src/multitrack.c:19345
+#: src/multitrack.c:19725
 #, c-format
 msgid "Saved layout to %s\n"
 msgstr ""
 
-#: src/multitrack.c:20783
+#: src/multitrack.c:21125
 msgid "clips and frames"
 msgstr ""
 
-#: src/multitrack.c:20787
+#: src/multitrack.c:21128
 msgid "clips"
 msgstr ""
 
-#: src/multitrack.c:20790
+#: src/multitrack.c:21130
 msgid "frames"
 msgstr ""
 
-#: src/multitrack.c:20800
+#: src/multitrack.c:21140
 msgid ""
 "\n"
 "Auto reload layout.\n"
 msgstr ""
 
-#: src/multitrack.c:20803
+#: src/multitrack.c:21143
 #, c-format
 msgid ""
 "%s\n"
@@ -9742,11 +9748,11 @@
 "Therefore it could not be loaded properly.\n"
 msgstr ""
 
-#: src/multitrack.c:20920
+#: src/multitrack.c:21284
 msgid "auto backup"
 msgstr ""
 
-#: src/multitrack.c:20923
+#: src/multitrack.c:21287
 #, c-format
 msgid ""
 "\n"
@@ -9755,31 +9761,31 @@
 "\n"
 "Asettelutiedostoa %s ei voitu ladata\n"
 
-#: src/multitrack.c:20944
+#: src/multitrack.c:21308
 #, c-format
 msgid "Loading layout from %s..."
 msgstr ""
 
-#: src/multitrack.c:20978
+#: src/multitrack.c:21338
 #, c-format
 msgid "Got %d events...processing..."
 msgstr ""
 
-#: src/multitrack.c:20991
+#: src/multitrack.c:21349
 msgid "Checking and rebuilding event list"
 msgstr ""
 
-#: src/multitrack.c:21017
+#: src/multitrack.c:21374
 #, c-format
 msgid "%d errors detected.\n"
 msgstr "virheitä havaittu %d.\n"
 
-#: src/multitrack.c:21068
+#: src/multitrack.c:21422
 #, c-format
 msgid "Multitrack fps set to %.3f\n"
 msgstr ""
 
-#: src/multitrack.c:21225
+#: src/multitrack.c:21576
 #, fuzzy
 msgid ""
 "The current layout has changes which have not been saved.\n"
@@ -9788,59 +9794,59 @@
 "Nykyistä asettelua ei ole tallennettu.\n"
 "Mitä haluat tehdä?\n"
 
-#: src/multitrack.c:22047
+#: src/multitrack.c:22385
 msgid "LiVES: Multitrack audio mixer"
 msgstr "LiVES: Multitrack-äänimikseri"
 
-#: src/multitrack.c:22077
+#: src/multitrack.c:22414
 msgid "_Reset values"
 msgstr "_Palauta arvot"
 
-#: src/multitrack.c:22081
+#: src/multitrack.c:22418
 msgid "_Close mixer"
 msgstr "_Sulje mikseri"
 
-#: src/multitrack.c:22130
+#: src/multitrack.c:22466
 msgid ""
 "_Invert backing audio\n"
 "and layer volumes"
 msgstr ""
 
-#: src/multitrack.c:22132
+#: src/multitrack.c:22468
 msgid "Adjust backing and layer audio values so that they sum to 1.0"
 msgstr ""
 
-#: src/multitrack.c:22175
+#: src/multitrack.c:22510
 msgid "_Gang layer audio"
 msgstr ""
 
-#: src/multitrack.c:22177
+#: src/multitrack.c:22512
 msgid "Adjust all layer audio values to the same value"
 msgstr ""
 
-#: src/jack.c:104
+#: src/jack.c:102
 msgid "JACK server started\n"
 msgstr "JACK-palvelin käynnistetty\n"
 
-#: src/jack.c:1284 src/jack.c:1353
+#: src/jack.c:1265 src/jack.c:1334
 msgid "Unable to connect to JACK server\n"
 msgstr "JACK-palvelimeen ei voitu muodostaa yhteyttä\n"
 
-#: src/jack.c:1512
+#: src/jack.c:1491
 msgid "Started jack audio subsystem.\n"
 msgstr ""
 
-#: src/jack.c:1623
+#: src/jack.c:1600
 msgid "Started jack audio reader.\n"
 msgstr ""
 
-#: src/jack.c:1838
+#: src/jack.c:1815
 msgid ""
 "\n"
 "Connection to jack audio was reset.\n"
 msgstr ""
 
-#: src/pulse.c:87
+#: src/pulse.c:88
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -9848,7 +9854,7 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:92
+#: src/pulse.c:94
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -9856,7 +9862,7 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:96
+#: src/pulse.c:99
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -9864,335 +9870,335 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:101
+#: src/pulse.c:104
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
 msgstr ""
 
-#: src/pulse.c:107
+#: src/pulse.c:109
 msgid "LiVES will exit and you can choose another audio player.\n"
 msgstr ""
 
-#: src/pulse.c:1352
+#: src/pulse.c:1335
 msgid ""
 "\n"
 "Connection to pulse audio was reset.\n"
 msgstr ""
 
-#: src/colourspace.c:1100
+#: src/colourspace.c:1092
 msgid "unclamped"
 msgstr ""
 
-#: src/colourspace.c:1101
+#: src/colourspace.c:1093
 msgid "clamped"
 msgstr ""
 
-#: src/omc-learn.c:195
+#: src/omc-learn.c:191
 #, c-format
 msgid "Responding to joystick events from %s\n"
 msgstr ""
 
-#: src/omc-learn.c:289
+#: src/omc-learn.c:279
 msgid "Creating ALSA seq port..."
 msgstr ""
 
-#: src/omc-learn.c:325
+#: src/omc-learn.c:313
 #, c-format
 msgid "Responding to MIDI events from %s\n"
 msgstr ""
 
-#: src/omc-learn.c:568
+#: src/omc-learn.c:554
 msgid "data"
 msgstr ""
 
-#: src/omc-learn.c:571
+#: src/omc-learn.c:557
 msgid "velocity"
 msgstr ""
 
-#: src/omc-learn.c:572
+#: src/omc-learn.c:558
 msgid "note"
 msgstr ""
 
-#: src/omc-learn.c:574 src/omc-learn.c:736 src/omc-learn.c:1105
-#: src/omc-learn.c:1591 src/omc-learn.c:1640
+#: src/omc-learn.c:560 src/omc-learn.c:724 src/omc-learn.c:1092
+#: src/omc-learn.c:1581 src/omc-learn.c:1630
 msgid "value"
 msgstr "arvo"
 
-#: src/omc-learn.c:576
+#: src/omc-learn.c:562
 msgid "state"
 msgstr ""
 
-#: src/omc-learn.c:688
+#: src/omc-learn.c:674
 msgid "variable"
 msgstr ""
 
-#: src/omc-learn.c:1001
+#: src/omc-learn.c:989
 msgid "Vars."
 msgstr ""
 
-#: src/omc-learn.c:1054
+#: src/omc-learn.c:1041
 #, c-format
 msgid "MIDI ch %d note on"
 msgstr ""
 
-#: src/omc-learn.c:1058
+#: src/omc-learn.c:1045
 #, c-format
 msgid "MIDI ch %d note off"
 msgstr ""
 
-#: src/omc-learn.c:1062
+#: src/omc-learn.c:1049
 #, c-format
 msgid "MIDI ch %d controller %d"
 msgstr ""
 
-#: src/omc-learn.c:1066
+#: src/omc-learn.c:1053
 #, c-format
 msgid "MIDI ch %d pitch bend"
 msgstr ""
 
-#: src/omc-learn.c:1070
+#: src/omc-learn.c:1057
 #, c-format
 msgid "MIDI ch %d pgm change"
 msgstr ""
 
-#: src/omc-learn.c:1073
+#: src/omc-learn.c:1060
 #, c-format
 msgid "Joystick button %d"
 msgstr "Peliohjainpainike %d"
 
-#: src/omc-learn.c:1076
+#: src/omc-learn.c:1063
 #, c-format
 msgid "Joystick axis %d"
 msgstr "Peliohjainakseli %d"
 
-#: src/omc-learn.c:1113
+#: src/omc-learn.c:1100
 msgid "x"
 msgstr "x"
 
-#: src/omc-learn.c:1122
+#: src/omc-learn.c:1109
 msgid "range"
 msgstr "alue"
 
-#: src/omc-learn.c:1143
+#: src/omc-learn.c:1130
 msgid "+ offset1"
 msgstr ""
 
-#: src/omc-learn.c:1161
+#: src/omc-learn.c:1150
 msgid "* scale"
 msgstr ""
 
-#: src/omc-learn.c:1179
+#: src/omc-learn.c:1170
 msgid "+ offset2"
 msgstr ""
 
-#: src/omc-learn.c:1280
+#: src/omc-learn.c:1270
 msgid ""
 "\n"
 "Click OK to delete all entries\n"
 msgstr ""
 
-#: src/omc-learn.c:1318
+#: src/omc-learn.c:1308
 msgid "LiVES: OMC learner"
 msgstr "LiVES: OMC-koulutin"
 
-#: src/omc-learn.c:1334
+#: src/omc-learn.c:1324
 msgid "Clear _unmatched"
 msgstr ""
 
-#: src/omc-learn.c:1345
+#: src/omc-learn.c:1335
 msgid "_Delete all"
 msgstr "_Poista kaikki"
 
-#: src/omc-learn.c:1411
+#: src/omc-learn.c:1401
 msgid "Start video playback"
 msgstr "Käynnistä videotoisto"
 
-#: src/omc-learn.c:1414
+#: src/omc-learn.c:1404
 msgid "Stop video playback"
 msgstr "Pysäytä videotoisto"
 
-#: src/omc-learn.c:1418
+#: src/omc-learn.c:1408
 msgid "Clip select <clipnum>"
 msgstr "Valitse leike <leikenro>"
 
-#: src/omc-learn.c:1419
+#: src/omc-learn.c:1409
 msgid "Switch foreground clip to the nth valid clip"
 msgstr ""
 
-#: src/omc-learn.c:1423
+#: src/omc-learn.c:1413
 msgid "Play forwards"
 msgstr "Toista eteenpäin"
 
-#: src/omc-learn.c:1424
+#: src/omc-learn.c:1414
 msgid "Play video in a forwards direction"
 msgstr ""
 
-#: src/omc-learn.c:1427
+#: src/omc-learn.c:1417
 msgid "Play backwards"
 msgstr "Toista taaksepäin"
 
-#: src/omc-learn.c:1428
+#: src/omc-learn.c:1418
 msgid "Play video in a backwards direction"
 msgstr ""
 
-#: src/omc-learn.c:1431
+#: src/omc-learn.c:1421
 msgid "Reverse playback direction"
 msgstr "Käänteinen toistosuunta"
 
-#: src/omc-learn.c:1432
+#: src/omc-learn.c:1422
 msgid "Reverse direction of video playback"
 msgstr ""
 
-#: src/omc-learn.c:1435
+#: src/omc-learn.c:1425
 msgid "Play video faster"
 msgstr "Toista videota nopeammin"
 
-#: src/omc-learn.c:1436
+#: src/omc-learn.c:1426
 msgid "Play video at a slightly faster rate"
 msgstr ""
 
-#: src/omc-learn.c:1439
+#: src/omc-learn.c:1429
 msgid "Play video slower"
 msgstr "Toista videota hitaammin"
 
-#: src/omc-learn.c:1440
+#: src/omc-learn.c:1430
 msgid "Play video at a slightly slower rate"
 msgstr ""
 
-#: src/omc-learn.c:1443
+#: src/omc-learn.c:1433
 msgid "Toggle video freeze"
 msgstr ""
 
-#: src/omc-learn.c:1444
+#: src/omc-learn.c:1434
 msgid "Freeze video, or if already frozen, unfreeze it"
 msgstr ""
 
-#: src/omc-learn.c:1447
+#: src/omc-learn.c:1437
 msgid "Set video framerate to <fps>"
 msgstr ""
 
-#: src/omc-learn.c:1448
+#: src/omc-learn.c:1438
 msgid "Set framerate of foreground clip to <float fps>"
 msgstr ""
 
-#: src/omc-learn.c:1452
+#: src/omc-learn.c:1442
 msgid "Start recording"
 msgstr "Aloita nauhoitus"
 
-#: src/omc-learn.c:1455
+#: src/omc-learn.c:1445
 msgid "Stop recording"
 msgstr "Pysäytä nauhoitus"
 
-#: src/omc-learn.c:1458
+#: src/omc-learn.c:1448
 msgid "Toggle recording state"
 msgstr ""
 
-#: src/omc-learn.c:1461
+#: src/omc-learn.c:1451
 msgid "Swap foreground and background clips"
 msgstr ""
 
-#: src/omc-learn.c:1463
+#: src/omc-learn.c:1453
 msgid "Reset effect keys"
 msgstr ""
 
-#: src/omc-learn.c:1464
+#: src/omc-learn.c:1454
 msgid "Switch all effects off."
 msgstr ""
 
-#: src/omc-learn.c:1467
+#: src/omc-learn.c:1457
 msgid "Enable effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1471
+#: src/omc-learn.c:1461
 msgid "Disable effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1475
+#: src/omc-learn.c:1465
 msgid "Toggle effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1479
+#: src/omc-learn.c:1469
 msgid "Set parameter value <key> <pnum> = <value>"
 msgstr ""
 
-#: src/omc-learn.c:1480
+#: src/omc-learn.c:1470
 msgid "Set <value> of pth (numerical) parameter for effect key <key>."
 msgstr ""
 
-#: src/omc-learn.c:1484
+#: src/omc-learn.c:1474
 msgid "Switch foreground to next clip"
 msgstr ""
 
-#: src/omc-learn.c:1487
+#: src/omc-learn.c:1477
 msgid "Switch foreground to previous clip"
 msgstr ""
 
-#: src/omc-learn.c:1490
+#: src/omc-learn.c:1480
 msgid "Set video framerate to ratio <fps_ratio>"
 msgstr ""
 
-#: src/omc-learn.c:1491
+#: src/omc-learn.c:1481
 msgid "Set framerate ratio of foreground clip to <float fps_ratio>"
 msgstr ""
 
-#: src/omc-learn.c:1495
+#: src/omc-learn.c:1485
 msgid "Retrigger clip <clipnum>"
 msgstr ""
 
-#: src/omc-learn.c:1496
+#: src/omc-learn.c:1486
 msgid ""
 "Switch foreground clip to the nth valid clip, and reset the frame number"
 msgstr ""
 
-#: src/omc-learn.c:1500
+#: src/omc-learn.c:1490
 msgid "Cycle to next mode for effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1504
+#: src/omc-learn.c:1494
 msgid "Cycle to previous mode for effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1508
+#: src/omc-learn.c:1498
 msgid "Set playback plugin parameter value <pnum> = <value>"
 msgstr ""
 
-#: src/omc-learn.c:1509
+#: src/omc-learn.c:1499
 msgid "Set <value> of pth parameter for the playback plugin."
 msgstr ""
 
 #. TRANSLATORS: short form of "clip number"
-#: src/omc-learn.c:1536 src/omc-learn.c:1607
+#: src/omc-learn.c:1526 src/omc-learn.c:1597
 msgid "clipnum"
 msgstr ""
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1545
+#: src/omc-learn.c:1535
 msgid "fps"
 msgstr ""
 
 #. TRANSLATORS: as in keyboard key
-#: src/omc-learn.c:1553 src/omc-learn.c:1560 src/omc-learn.c:1567
-#: src/omc-learn.c:1575 src/omc-learn.c:1615 src/omc-learn.c:1623
+#: src/omc-learn.c:1543 src/omc-learn.c:1550 src/omc-learn.c:1557
+#: src/omc-learn.c:1565 src/omc-learn.c:1605 src/omc-learn.c:1613
 msgid "key"
 msgstr ""
 
 #. TRANSLATORS: short form of "parameter number"
-#: src/omc-learn.c:1583 src/omc-learn.c:1632
+#: src/omc-learn.c:1573 src/omc-learn.c:1622
 msgid "pnum"
 msgstr ""
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1599
+#: src/omc-learn.c:1589
 msgid "fps_ratio"
 msgstr ""
 
-#: src/omc-learn.c:2443
+#: src/omc-learn.c:2417
 #, c-format
 msgid "Saving device mapping to file %s..."
 msgstr ""
 
-#: src/omc-learn.c:2527
+#: src/omc-learn.c:2498
 #, c-format
 msgid ""
 "\n"
@@ -10205,7 +10211,7 @@
 "Virhe jäsenneltäessä tiedostoa\n"
 "%s\n"
 
-#: src/omc-learn.c:2534
+#: src/omc-learn.c:2505
 #, c-format
 msgid ""
 "\n"
@@ -10214,12 +10220,12 @@
 "%s\n"
 msgstr ""
 
-#: src/omc-learn.c:2571
+#: src/omc-learn.c:2541
 #, c-format
 msgid "Loading device mapping from file %s..."
 msgstr ""
 
-#: src/omc-learn.c:2576
+#: src/omc-learn.c:2544
 #, c-format
 msgid ""
 "\n"
@@ -10234,12 +10240,12 @@
 "%s\n"
 "Virhekoodi on %d\n"
 
-#: src/videodev.c:547
+#: src/videodev.c:539
 #, c-format
 msgid "Unable to open device %s\n"
 msgstr ""
 
-#: src/videodev.c:564
+#: src/videodev.c:554
 #, c-format
 msgid "Opened device %s\n"
 msgstr ""
@@ -11131,6 +11137,15 @@
 #~ msgid "$error"
 #~ msgstr "$error"
 
+#~ msgid "Pause"
+#~ msgstr "Pysäytä"
+
+#~ msgid "Start frame"
+#~ msgstr "Aloituskuva"
+
+#~ msgid "End frame"
+#~ msgstr "Lopetuskuva"
+
 #~ msgid "                                                            "
 #~ msgstr "                                                            "

LiVES-2.2.8.tar.bz2/po/fr.po -> LiVES-2.4.1.tar.bz2/po/fr.po Changed

@@ -9,21 +9,20 @@
 msgstr ""
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n"
-"POT-Creation-Date: 2015-02-08 17:18-0300\n"
-"PO-Revision-Date: 2013-03-14 12:31+0000\n"
-"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
+"POT-Creation-Date: 2015-08-09 14:52-0300\n"
+"PO-Revision-Date: 2015-04-13 18:06+0000\n"
+"Last-Translator: Jean Marc <Unknown>\n"
 "Language-Team: Français <kwizart@gmail.com>\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: 2013-03-28 10:42+0000\n"
-"X-Generator: Launchpad (build 16546)\n"
+"X-Launchpad-Export-Date: 2015-05-03 15:41+0000\n"
+"X-Generator: Launchpad (build 17474)\n"
 "X-Poedit-Country: FRANCE\n"
 "X-Poedit-Language: French\n"
 
-#. TRANSLATORS: do not translate this message
-#: src/main.c:118
+#: src/main.c:128
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -32,22 +31,22 @@
 "http://lives.sourceforge.net/TRANS-README.txt"
 msgstr ""
 
-#: src/main.c:134
+#: src/main.c:153
 #, c-format
 msgid "%s Warning: %s\n"
-msgstr ""
+msgstr "%s Avertissement : %s\n"
 
-#: src/main.c:138
+#: src/main.c:157
 #, c-format
 msgid "%s Critical error: %s\n"
-msgstr ""
+msgstr "%s Erreur critique : %s\n"
 
-#: src/main.c:139
+#: src/main.c:158
 #, c-format
 msgid "%s Fatal error: %s\n"
-msgstr ""
+msgstr "%s Erreur fatale : %s\n"
 
-#: src/main.c:176
+#: src/main.c:198
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -56,12 +55,12 @@
 "Thanks. Recovery should be possible if you restart LiVES.\n"
 msgstr ""
 "\n"
-"Malheureusement LIVES a crashé.\n"
-"Veuillez s'il vous plaît signaler ce bogue sur http://sourceforge.net/"
-"tracker/?group_id=64341&atid=507139\n"
+"Malheureusement LiVES a planté.\n"
+"Veuillez signaler ce bogue sur http://sourceforge.net/tracker/?"
+"group_id=64341&atid=507139\n"
 "Merci. Une récupération devrait être possible si vous redémarrez LiVES.\n"
 
-#: src/main.c:177
+#: src/main.c:199
 msgid ""
 "\n"
 "\n"
@@ -70,11 +69,10 @@
 msgstr ""
 "\n"
 "\n"
-"Lors des signalements de crashs, veuillez s'il vous plaît inclure les "
-"détails de votre système d'exploitation, la distribution, et la version de "
-"LiVES ("
+"Lors des signalements de plantages, veuillez inclure les détails de votre "
+"système d'exploitation, la distribution, et la version de LiVES ("
 
-#: src/main.c:180
+#: src/main.c:203
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -82,7 +80,7 @@
 "et toute autre information indiquée ci-dessous :\n"
 "\n"
 
-#: src/main.c:184
+#: src/main.c:206
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
@@ -92,84 +90,83 @@
 "recueillir plus d'informations.\n"
 "\n"
 
-#: src/main.c:192
+#: src/main.c:216
 msgid "Preserving set.\n"
 msgstr "Marque positionnée.\n"
 
-#: src/main.c:636
+#: src/main.c:691
 msgid "Resizing"
 msgstr "Recadrage"
 
-#: src/main.c:643
+#: src/main.c:698
 msgid "_Resize All Frames"
 msgstr "_Recadre Toutes Les Images"
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:895
+#: src/main.c:948
 msgid "Any"
 msgstr "Tous"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:897
+#: src/main.c:950
 msgid "None"
 msgstr "Aucun"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:899
+#: src/main.c:952
 msgid "recommended"
 msgstr "recommandé"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:901
+#: src/main.c:954
 msgid "disabled !"
-msgstr "désactivé !"
+msgstr "désactivé !"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:903
+#: src/main.c:956
 msgid "**The current layout**"
 msgstr "**La configuration actuelle**"
 
 #. TRANSLATORS: adjective for "Built in" type effects
-#: src/main.c:905
+#: src/main.c:958
 msgid "Builtin"
 msgstr "Intégré"
 
 #. TRANSLATORS: adjective for "Custom" type effects
-#: src/main.c:907
+#: src/main.c:960
 msgid "Custom"
 msgstr "Personnalisé"
 
 #. TRANSLATORS: adjective for "Test" type effects
-#: src/main.c:909
+#: src/main.c:962
 msgid "Test"
 msgstr "Essai"
 
-#: src/main.c:1054
+#: src/main.c:1107
 msgid "Foreground"
-msgstr ""
+msgstr "Premier plan"
 
-#: src/main.c:1055
-#, fuzzy
+#: src/main.c:1108
 msgid "Background"
-msgstr "_Cacher Arrière Plan"
+msgstr "Arrière plan"
 
-#: src/main.c:1566
+#: src/main.c:1624
 msgid "Loading realtime effect plugins..."
-msgstr "Chargement des plugins d'effets en temps réel"
+msgstr "Chargement des greffons d'effets en temps réel…"
 
-#: src/main.c:1631
+#: src/main.c:1690
 msgid "Starting jack audio server..."
 msgstr "Démarrage du serveur audio jack..."
 
-#: src/main.c:1633
+#: src/main.c:1692
 msgid "Starting jack transport server..."
-msgstr "Lancement du serveur de transport Jack..."
+msgstr "Démarrage du serveur de transport jack..."
 
-#: src/main.c:1634
+#: src/main.c:1693
 msgid "Connecting to jack transport server..."
-msgstr "Connexion au serveur de transport Jack..."
+msgstr "Connexion au serveur de transport jack..."
 
-#: src/main.c:1663
+#: src/main.c:1723
 #, c-format
 msgid ""
 "\n"
@@ -181,114 +178,114 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1697
+#: src/main.c:1758
 msgid "Starting pulse audio server..."
 msgstr "Initialisation du serveur audio pulse..."
 
-#: src/main.c:1765
+#: src/main.c:1825
 msgid "Checking optional dependencies:"
-msgstr "Verification des dépendances optionnelles:"
+msgstr "Vérification des dépendances optionnelles :"
 
-#: src/main.c:1766
+#: src/main.c:1826
 msgid "mplayer...detected..."
-msgstr "mplayer....détecté..."
+msgstr "mplayer... détecté..."
 
-#: src/main.c:1767
+#: src/main.c:1827
 msgid "mplayer...NOT DETECTED..."
-msgstr "mplayer...NON DÉTECTÉ..."
+msgstr "mplayer... NON DÉTECTÉ..."
 
-#: src/main.c:1768
+#: src/main.c:1828
 #, fuzzy
 msgid "mplayer2...detected..."
-msgstr "mplayer....détecté..."
+msgstr "mplayer... détecté..."
 
-#: src/main.c:1769
+#: src/main.c:1829
 #, fuzzy
 msgid "mplayer2...NOT DETECTED..."
-msgstr "mplayer...NON DÉTECTÉ..."
+msgstr "mplayer... NON DÉTECTÉ..."
 
-#: src/main.c:1770
+#: src/main.c:1830
 msgid "convert...detected..."
-msgstr "convert...détecté..."
+msgstr "convert... détecté..."
 
-#: src/main.c:1771
+#: src/main.c:1831
 msgid "convert...NOT DETECTED..."
-msgstr "convert...NON DÉTECTÉ..."
+msgstr "convert... NON DÉTECTÉ..."
 
-#: src/main.c:1772
+#: src/main.c:1832
 msgid "composite...detected..."
-msgstr "composite...détecté..."
+msgstr "composite... détecté..."
 
-#: src/main.c:1773
+#: src/main.c:1833
 msgid "composite...NOT DETECTED..."
-msgstr "composite...NON DÉTECTÉ..."
+msgstr "composite... NON DÉTECTÉ..."
 
-#: src/main.c:1774
+#: src/main.c:1834
 msgid "sox...detected\n"
-msgstr "sox...détecté\n"
+msgstr "sox... détecté\n"
 
-#: src/main.c:1775
+#: src/main.c:1835
 msgid "sox...NOT DETECTED\n"
-msgstr "sox...NON DÉTECTÉ\n"
+msgstr "sox... NON DÉTECTÉ\n"
 
-#: src/main.c:1776
+#: src/main.c:1836
 msgid "cdda2wav...detected..."
-msgstr "cdda2wav...détecté..."
+msgstr "cdda2wav... détecté..."
 
-#: src/main.c:1777
+#: src/main.c:1837
 msgid "cdda2wav...NOT DETECTED..."
-msgstr "cdda2wav...NON DÉTECTÉ..."
+msgstr "cdda2wav... NON DÉTECTÉ..."
 
-#: src/main.c:1778
+#: src/main.c:1838
 msgid "jackd...detected..."
-msgstr "jackd...détecté..."
+msgstr "jackd... détecté..."
 
-#: src/main.c:1779
+#: src/main.c:1839
 msgid "jackd...NOT DETECTED..."
-msgstr "jackd...NON DÉTECTÉ..."
+msgstr "jackd... NON DÉTECTÉ..."
 
-#: src/main.c:1780
+#: src/main.c:1840
 msgid "pulse audio...detected..."
-msgstr "pulse audio...détecté..."
+msgstr "pulse audio... détecté..."
 
-#: src/main.c:1781
+#: src/main.c:1841
 msgid "pulse audio...NOT DETECTED..."
-msgstr "pulse audio...NON DÉTECTÉ..."
+msgstr "pulse audio... NON DÉTECTÉ..."
 
-#: src/main.c:1782
+#: src/main.c:1842
 msgid "python...detected..."
-msgstr "python...détecté..."
+msgstr "python... détecté..."
 
-#: src/main.c:1783
+#: src/main.c:1843
 msgid "python...NOT DETECTED..."
-msgstr "python...NON DÉTECTÉ..."
+msgstr "python... NON DÉTECTÉ..."
 
-#: src/main.c:1784
+#: src/main.c:1844
 msgid "dvgrab...detected..."
-msgstr "dvgrab...détecté..."
+msgstr "dvgrab... détecté..."
 
-#: src/main.c:1785
+#: src/main.c:1845
 msgid "dvgrab...NOT DETECTED..."
-msgstr "dvgrab...NON DÉTECTÉ..."
+msgstr "dvgrab... NON DÉTECTÉ..."
 
-#: src/main.c:1786
+#: src/main.c:1846
 msgid "xwininfo...detected..."
-msgstr "xwininfo...détecté..."
+msgstr "xwininfo... détecté..."
 
-#: src/main.c:1787
+#: src/main.c:1847
 msgid "xwininfo...NOT DETECTED..."
-msgstr "xwininfo...NON DÉTECTÉ..."
+msgstr "xwininfo... NON DÉTECTÉ..."
 
-#: src/main.c:1793
+#: src/main.c:1853
 #, c-format
 msgid "Windows version %04X"
-msgstr ""
+msgstr "Windows version %04X"
 
-#: src/main.c:1795
+#: src/main.c:1855
 msgid "UNKNOWN - please patch me !"
 msgstr "INCONNU - veuillez me corriger !"
 
-#: src/main.c:1799
+#: src/main.c:1859
 #, c-format
 msgid ""
 "\n"
@@ -299,66 +296,66 @@
 "\n"
 "Le gestionnaire de fenêtres apparaît comme étant  \"%s\"; "
 
-#: src/main.c:1802
+#: src/main.c:1862
 #, c-format
 msgid "number of monitors detected: %d\n"
-msgstr "nombre d'écrans trouvés : %d\n"
+msgstr "nombre d'écrans détectés : %d\n"
 
-#: src/main.c:1805
+#: src/main.c:1865
 #, c-format
 msgid "Number of CPUs detected: %d "
-msgstr ""
+msgstr "nombre de CPU détectés : %d "
 
-#: src/main.c:1808 src/multitrack.c:4902
+#: src/main.c:1868 src/multitrack.c:5068
 msgid "little endian"
-msgstr "little endian"
+msgstr "petit boutien"
 
-#: src/main.c:1809 src/multitrack.c:4901
+#: src/main.c:1869 src/multitrack.c:5067
 msgid "big endian"
-msgstr "big endian"
+msgstr "grand boutien"
 
-#: src/main.c:1810
+#: src/main.c:1870
 #, c-format
 msgid "(%d bits, %s)\n"
-msgstr ""
+msgstr "(%d bits, %s)\n"
 
-#: src/main.c:1814
+#: src/main.c:1874
 msgid "GUI type is: "
 msgstr ""
 
-#: src/main.c:1818
+#: src/main.c:1878
 #, c-format
 msgid "GTK+ version %d.%d.%d (compiled with %d.%d.%d)"
-msgstr ""
+msgstr "GTK+ version %d.%d.%d (compilé avec %d.%d.%d)"
 
-#: src/main.c:1840
+#: src/main.c:1900
 msgid ", with cairo support"
-msgstr ""
+msgstr ", avec prise en charge cairo"
 
-#: src/main.c:1847
+#: src/main.c:1907
 #, c-format
 msgid "Temp directory is %s\n"
 msgstr "Le dossier temporaire est %s\n"
 
-#: src/main.c:1851
+#: src/main.c:1911
 msgid ""
 "WARNING - this version of LiVES was compiled without either\n"
 "jack or pulse audio support.\n"
 "Many audio features will be unavailable.\n"
 msgstr ""
-"ATTENTION - cette version de LiVES a été compilée sans \n"
+"ATTENTION - cette version de LiVES a été compilée sans\n"
 "prise en charge de jack ou de pulse audio.\n"
-"De nombreuses fonctionnalités ne seront pas disponibles.\n"
+"De nombreuses fonctions ne seront pas disponibles.\n"
 
-#: src/main.c:1854
+#: src/main.c:1914
 msgid "Compiled with jack support, good !\n"
-msgstr "Compilé avec le support de jack, bien !\n"
+msgstr "Compilé avec prise en charge de jack, bien !\n"
 
-#: src/main.c:1857
+#: src/main.c:1917
 msgid "Compiled with pulse audio support, wonderful !\n"
-msgstr "Compilé avec la prise en charge de Pulse Audio, génial !\n"
+msgstr "Compilé avec prise en charge de Pulse Audio, génial !\n"
 
-#: src/main.c:1861
+#: src/main.c:1921
 #, c-format
 msgid ""
 "Welcome to LiVES version %s.\n"
@@ -367,87 +364,93 @@
 "Bienvenue sur LiVES version %s.\n"
 "\n"
 
-#: src/main.c:2306
+#: src/main.c:2380
 #, c-format
 msgid ""
 "\n"
 "Startup syntax is: %s [opts] [filename [start_time] [frames]]\n"
 msgstr ""
 "\n"
-"La syntaxe de lancement est: %s [options] [nomfichier [start_time] "
+"La syntaxe de lancement est : %s [options] [nomfichier [start_time] "
 "[frames]]\n"
 
-#: src/main.c:2307
+#: src/main.c:2381
 msgid "Where: filename is the name of a media file or backup file.\n"
 msgstr ""
-"Où: le nom de fichier est est le nom d'un fichier média ou d'un fichier de "
+"Où : nomfichier est le nom d'un fichier média ou d'un fichier de "
 "sauvegarde.\n"
 
-#: src/main.c:2308
+#: src/main.c:2382
 msgid "start_time : filename start time in seconds\n"
-msgstr "start_time: temps du début du nom du fichier en secondes.\n"
+msgstr "start_time : temps de début de filename en secondes.\n"
 
-#: src/main.c:2309
+#: src/main.c:2383
 msgid "frames : maximum number of frames to open\n"
-msgstr "images : nombre maximal d'images à ouvrir\n"
+msgstr "frames : nombre maximal d'images à ouvrir\n"
 
-#: src/main.c:2311
+#: src/main.c:2385
 msgid "opts can be:\n"
-msgstr "opts peut être:\n"
+msgstr "opts peut être :\n"
 
-#: src/main.c:2312
+#: src/main.c:2386
 msgid "-help            : show this help text and exit\n"
-msgstr "-help : montre l'aide et quitte.\n"
+msgstr "-help : affiche l'aide et quitte.\n"
 
-#: src/main.c:2313
+#: src/main.c:2387
 msgid "-tmpdir <tempdir>: use alternate working directory (e.g /var/ramdisk)\n"
 msgstr ""
 "-tmpdir <repertoiretemporaire> : utiliser un autre répertoire de travail "
 "(ex : /var/ramdisk)\n"
 
-#: src/main.c:2314
+#: src/main.c:2388
 msgid "-set <setname>   : autoload clip set setname\n"
 msgstr ""
 "-set <nom_du_set> : charger automatiquement l'ensemble de clips nom_du_set\n"
 
-#: src/main.c:2315
+#: src/main.c:2389
 msgid "-noset           : do not load any set on startup\n"
 msgstr "-noset : ne charger aucun profil au démarrage\n"
 
-#: src/main.c:2316
+#: src/main.c:2390
 msgid "-norecover       : force no-loading of crash recovery\n"
 msgstr "-norecover : désactiver la récupération automatique en cas de crash\n"
 
-#: src/main.c:2317
+#: src/main.c:2391
 msgid "-recover         : force loading of crash recovery\n"
 msgstr ""
 "-recover         : force le chargement du recouvrement après un crash\n"
 
-#: src/main.c:2318
-msgid "-nothreaddialog  : doe nothing - retained for backwards compatibility\n"
+#: src/main.c:2392
+#, fuzzy
+msgid ""
+"-nothreaddialog  : does nothing - retained for backwards compatibility\n"
 msgstr "-nothreaddialog : ne fait rien (option conservée pour compatibilité)\n"
 
-#: src/main.c:2319
+#: src/main.c:2393
 msgid "-nogui           : do not show the gui\n"
 msgstr "-nogui : lance le programme sans l'interface graphique.\n"
 
-#: src/main.c:2320
+#: src/main.c:2394
 msgid "-nosplash        : do not show the splash window\n"
 msgstr "-nosplash : ne pas montrer la fenêtre de démarrage\n"
 
-#: src/main.c:2321
+#: src/main.c:2395
 msgid "-noplaywin       : do not show the play window\n"
 msgstr "-noplaywin : ne pas montrer la fenêtre de lecture\n"
 
-#: src/main.c:2322
+#: src/main.c:2396
+msgid "-noninteractive  : disable menu interactivity\n"
+msgstr ""
+
+#: src/main.c:2397
 msgid "-startup-ce      : start in clip editor mode\n"
 msgstr "-startup-ce : démarrer en mode éditeur de clip\n"
 
-#: src/main.c:2323
+#: src/main.c:2398
 msgid "-startup-mt      : start in multitrack mode\n"
 msgstr "-startup-mt : démarrer en mode multipiste\n"
 
-#: src/main.c:2324
+#: src/main.c:2399
 msgid ""
 "-fxmodesmax <n>  : allow <n> modes per effect key (minimum is 1, default is "
 "8)\n"
@@ -455,15 +458,15 @@
 "-fxmodesmax <n> : permet <n> modes par clé d'effet (minimum : 1, valeur par "
 "défaut : 8)\n"
 
-#: src/main.c:2326
+#: src/main.c:2401
 msgid "-oscstart <port> : start OSC listener on UDP port <port>\n"
 msgstr "-oscstart <port> : démarrer l'écoute de OSC sur le port UDP <port>\n"
 
-#: src/main.c:2327
+#: src/main.c:2402
 msgid "-nooscstart      : do not start OSC listener\n"
 msgstr "-nooscstart  : ne pas démarrer l'écouteur OSC\n"
 
-#: src/main.c:2329
+#: src/main.c:2404
 #, fuzzy
 msgid ""
 "-aplayer <ap>    : start with selected audio player. <ap> can be mplayer, "
@@ -473,15 +476,15 @@
 "peut être remplacé par mplayer"
 
 #. TRANSLATORS: pulse (audio)
-#: src/main.c:2332
+#: src/main.c:2407
 msgid ", pulse"
 msgstr ", pulse"
 
-#: src/main.c:2335
+#: src/main.c:2410
 msgid ", sox or jack\n"
 msgstr ", sox ou jack\n"
 
-#: src/main.c:2336
+#: src/main.c:2412
 msgid ""
 "-jackopts <opts>    : opts is a bitmap of jack startup options [1 = jack "
 "transport client, 2 = jack transport master, 4 = start jack transport "
@@ -492,17 +495,17 @@
 "serveur de transport jack, 8 = mettre l'audio en pause quand la vidéo est "
 "mise en pause, 16 = démarrer le serveur audio jack] \n"
 
-#: src/main.c:2338
+#: src/main.c:2414
 msgid " or sox\n"
 msgstr " ou sox\n"
 
-#: src/main.c:2340
+#: src/main.c:2416
 msgid "-devicemap <mapname>          : autoload devicemap\n"
 msgstr ""
 "-devicemap <mapname> : lancer automatiquement la cartographie des "
 "périphériques\n"
 
-#: src/main.c:2341
+#: src/main.c:2418
 msgid ""
 "-vppdefaults <file>          : load video playback plugin defaults from "
 "<file> (Note: only sets the settings, not the plugin type)\n"
@@ -511,15 +514,15 @@
 "lecture vidéo depuis <fichier> (Remarque : définit seulement la "
 "configuration, pas le type du plugin)\n"
 
-#: src/main.c:2342
+#: src/main.c:2419
 msgid "-debug            : try to debug crashes (requires 'gdb' installed)\n"
 msgstr "-debug : essayer de debugger les crashs (nécessite 'gdb' installé)\n"
 
-#: src/main.c:2373 src/gui.c:1128
+#: src/main.c:2449 src/gui.c:1127
 msgid "Starting GUI..."
 msgstr "Démarrage de l'interface graphique..."
 
-#: src/main.c:2396
+#: src/main.c:2475
 #, c-format
 msgid ""
 "\n"
@@ -530,7 +533,7 @@
 "(Maybe you need to change the value of <prefix_dir> in your %s file)\n"
 msgstr ""
 
-#: src/main.c:2410
+#: src/main.c:2492
 #, c-format
 msgid ""
 "\n"
@@ -538,7 +541,7 @@
 "Please make sure you have write access to %s and try again.\n"
 msgstr ""
 
-#: src/main.c:2415
+#: src/main.c:2498
 msgid ""
 "\n"
 "`smogrify` must be in your path, and be executable\n"
@@ -552,7 +555,7 @@
 "Relisez SVP le fichier README livré avec ce programme\n"
 "avant de lancer LiVES.\n"
 
-#: src/main.c:2421
+#: src/main.c:2504
 #, c-format
 msgid ""
 "\n"
@@ -562,7 +565,7 @@
 "Please check the file permissions for this file and try again.\n"
 msgstr ""
 
-#: src/main.c:2428
+#: src/main.c:2512
 #, c-format
 msgid ""
 "\n"
@@ -573,7 +576,7 @@
 "and try again.\n"
 msgstr ""
 
-#: src/main.c:2438
+#: src/main.c:2522
 #, c-format
 msgid ""
 "Please check the <tempdir> setting in \n"
@@ -581,7 +584,7 @@
 "and try again.\n"
 msgstr ""
 
-#: src/main.c:2445
+#: src/main.c:2528
 #, c-format
 msgid ""
 "\n"
@@ -596,7 +599,7 @@
 "\n"
 "%s"
 
-#: src/main.c:2453
+#: src/main.c:2536
 msgid ""
 "\n"
 "An incorrect version of smogrify was found in your path.\n"
@@ -614,7 +617,7 @@
 "\n"
 "Merci.\n"
 
-#: src/main.c:2458
+#: src/main.c:2541
 #, fuzzy
 msgid ""
 "\n"
@@ -625,7 +628,7 @@
 "Actuellement LiVES a besoin de 'Mplayer' ou 'Sox' pour fonctionner. "
 "Installez-en un des deux ou un autre et essayez à nouveau.\n"
 
-#: src/main.c:2462
+#: src/main.c:2546
 #, fuzzy
 msgid ""
 "\n"
@@ -636,7 +639,7 @@
 "Actuellement LiVES a besoin de 'Mplayer' ou 'Sox' pour fonctionner. "
 "Installez-en un des deux ou un autre et essayez à nouveau.\n"
 
-#: src/main.c:2472
+#: src/main.c:2556
 #, fuzzy
 msgid ""
 "\n"
@@ -647,7 +650,7 @@
 "LiVES n'arrive pas à trouver 'mplayer'. Vous devez installer mplayer pour "
 "utiliser LiVES pleinement.\n"
 
-#: src/main.c:2475
+#: src/main.c:2561
 msgid ""
 "\n"
 "LiVES was unable to locate 'convert'. You should install convert and image-"
@@ -657,7 +660,7 @@
 "LiVES n'arrive pas à trouver 'convert'. Vous devez installer convert qui est "
 "contenu dans ImageMagick si vous voulez utiliser les effets de rendu.\n"
 
-#: src/main.c:2478
+#: src/main.c:2566
 msgid ""
 "\n"
 "LiVES was unable to locate 'composite'. You should install composite and "
@@ -668,7 +671,7 @@
 "est contenu dans ImageMagick si vous voulez utiliser les fonctions de "
 "fusion.\n"
 
-#: src/main.c:2481
+#: src/main.c:2570
 msgid ""
 "\n"
 "LiVES was unable to locate 'sox'. Some audio features may not work. You "
@@ -678,7 +681,7 @@
 "Lives n'a pas pu trouver 'sox'. Certaines fonctions audios risquent de pas "
 "fonctionner. Vous devriez installer 'sox'.\n"
 
-#: src/main.c:2484
+#: src/main.c:2575
 #, c-format
 msgid ""
 "\n"
@@ -689,59 +692,59 @@
 "You may need to change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/main.c:2611
+#: src/main.c:2707
 #, c-format
 msgid "Autoloading set %s..."
 msgstr "En chargeant automatiquement le set %s..."
 
 #. TRANSLATORS: localised name may be used here
-#: src/main.c:2781 src/interface.c:738
+#: src/main.c:2902
 msgid "LiVES"
 msgstr "LiVES"
 
-#: src/main.c:2948
+#: src/main.c:3066
 #, c-format
 msgid "Invalid audio player %s\n"
 msgstr "Lecteur audio invalide %s\n"
 
-#: src/main.c:3077
+#: src/main.c:3214
 #, c-format
 msgid "LiVES-%s: <Untitled%d> %dx%d : %d frames %d bpp %.3f fps"
 msgstr "LiVES-%s: <Sans titre%d> %dx%d : %d cadres %d bpp %.3f fps"
 
-#: src/main.c:3082
+#: src/main.c:3219
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : ??? frames ??? bpp %.3f fps"
 msgstr "LiVES-%s: <%s> %dx%d : ??? cadres ??? bpp %.3f fps"
 
-#: src/main.c:3086
+#: src/main.c:3222
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : %d frames %d bpp %.3f fps"
 msgstr "LiVES-%s: <%s> %dx%d : %d cadres %d bpp %.3f fps"
 
-#: src/main.c:3094
+#: src/main.c:3229
 #, c-format
 msgid "LiVES-%s: <No File>"
 msgstr "LiVES-%s: <Pas de Fichier>"
 
 #. TRANSLATORS: rec(ord)
-#: src/main.c:5085
+#: src/main.c:5201
 #, c-format
 msgid "rec %9d/%d"
 msgstr "enr %9d/%d"
 
 #. TRANSLATORS: out of memory (rec(ord))
-#: src/main.c:5091
+#: src/main.c:5206
 #, c-format
 msgid "!rec %9d/%d"
 msgstr "!enr %9d/%d"
 
-#: src/main.c:5398 src/main.c:5399 src/gui.c:2110 src/gui.c:3220
-#: src/saveplay.c:2336
+#: src/main.c:5500 src/main.c:5501 src/gui.c:2108 src/gui.c:3331
+#: src/saveplay.c:2315
 msgid "Play"
 msgstr "Lecture"
 
-#: src/main.c:6128
+#: src/main.c:6216
 msgid ""
 "LiVES was unable to capture this image\n"
 "\n"
@@ -749,35 +752,35 @@
 "LiVES ne peut capturer cette image\n"
 "\n"
 
-#: src/main.c:6250
+#: src/main.c:6345
 #, c-format
 msgid "Closed file %s\n"
 msgstr "Fichier Fermé %s\n"
 
-#: src/main.c:6452 src/gui.c:648 src/utils.c:4312 src/utils.c:4344
-#: src/saveplay.c:3550 src/multitrack.c:4510 src/multitrack.c:6268
+#: src/main.c:6542 src/gui.c:647 src/utils.c:4256 src/utils.c:4286
+#: src/saveplay.c:3500 src/multitrack.c:4678 src/multitrack.c:6447
 msgid "_Undo"
 msgstr "_Annuler"
 
-#: src/main.c:6453 src/gui.c:666 src/utils.c:4313 src/utils.c:4345
-#: src/saveplay.c:3551 src/multitrack.c:4531 src/multitrack.c:6293
+#: src/main.c:6543 src/gui.c:665 src/utils.c:4257 src/utils.c:4287
+#: src/saveplay.c:3501 src/multitrack.c:4698 src/multitrack.c:6472
 msgid "_Redo"
 msgstr "_Rétablir"
 
-#: src/main.c:6493 src/interface.c:470 src/gui.c:2326 src/preferences.c:2357
-#: src/resample.c:1516
+#: src/main.c:6583 src/interface.c:457 src/gui.c:2324 src/preferences.c:2391
+#: src/resample.c:1488
 msgid "Video"
 msgstr "Vidéo"
 
-#: src/main.c:6494 src/interface.c:483 src/gui.c:2351
+#: src/main.c:6584 src/interface.c:470 src/gui.c:2348
 msgid "Left Audio"
 msgstr "Audio Gauche"
 
-#: src/main.c:6495 src/gui.c:2375
+#: src/main.c:6585 src/gui.c:2371
 msgid "Right Audio"
 msgstr "Audio Droite"
 
-#: src/main.c:6540
+#: src/main.c:6630
 #, fuzzy
 msgid ""
 "\n"
@@ -793,11 +796,11 @@
 "Changez SVP les options de lecture dans les Préférences et essayez à "
 "nouveau.\n"
 
-#: src/main.c:7051 src/plugins.c:1502
+#: src/main.c:7134 src/plugins.c:1468
 msgid "LiVES: - Play Window"
 msgstr "LiVES: - Fenêtre de Lecture"
 
-#: src/startup.c:25
+#: src/startup.c:24
 #, c-format
 msgid ""
 "A directory named\n"
@@ -812,7 +815,7 @@
 "\n"
 "(Espace disque restant = %s)\n"
 
-#: src/startup.c:32
+#: src/startup.c:29
 #, c-format
 msgid ""
 "A directory named\n"
@@ -828,7 +831,7 @@
 "restant.\n"
 "Choisissez un autre emplacement.\n"
 
-#: src/startup.c:49
+#: src/startup.c:46
 #, c-format
 msgid ""
 "\n"
@@ -845,7 +848,7 @@
 "\n"
 "(Espace disque restant = %s)"
 
-#: src/startup.c:54
+#: src/startup.c:50
 #, c-format
 msgid ""
 "\n"
@@ -858,11 +861,11 @@
 "%s\n"
 "Veuillez réessayer et choisir un autre répertoire\n"
 
-#: src/startup.c:96
+#: src/startup.c:92
 msgid "Directory name is too long !"
 msgstr "Le nom du dossier est trop long!"
 
-#: src/startup.c:223
+#: src/startup.c:216
 msgid ""
 "LiVES FAILED TO START YOUR SELECTED AUDIO PLAYER !\n"
 "\n"
@@ -870,7 +873,7 @@
 "LiVES A MANQUÉ LE DÉBUT DE TON LECTEUR AUDIO SÉLECTIONNÉ !\n"
 "\n"
 
-#: src/startup.c:230
+#: src/startup.c:222
 msgid ""
 "Before starting LiVES, you need to choose an audio player.\n"
 "\n"
@@ -880,7 +883,7 @@
 "\n"
 "PULSE AUDIO est recommandé pour la plupart des utilisateurs"
 
-#: src/startup.c:233
+#: src/startup.c:225
 msgid ""
 ", but this version of LiVES was not compiled with pulse audio support.\n"
 "\n"
@@ -889,7 +892,7 @@
 "pulse.\n"
 "\n"
 
-#: src/startup.c:236
+#: src/startup.c:229
 msgid ""
 ", but you do not have pulse audio installed on your system.\n"
 " You are advised to install pulse audio first before running LiVES.\n"
@@ -899,11 +902,11 @@
 " Vous devez l'installer avant de lancer LiVES.\n"
 "\n"
 
-#: src/startup.c:241
+#: src/startup.c:233
 msgid "JACK audio is recommended for pro users"
 msgstr "L'audio JACK est recomandé pour les utilisateurs professionnels"
 
-#: src/startup.c:244
+#: src/startup.c:236
 msgid ""
 ", but this version of LiVES was not compiled with jack audio support.\n"
 "\n"
@@ -912,7 +915,7 @@
 "l'audio jack.\n"
 "\n"
 
-#: src/startup.c:247
+#: src/startup.c:239
 msgid ""
 ", but you do not have jackd installed. You may wish to install jackd first "
 "before running LiVES.\n"
@@ -922,7 +925,7 @@
 "avant de lancer LiVES.\n"
 "\n"
 
-#: src/startup.c:250
+#: src/startup.c:242
 msgid ""
 ", but may prevent LiVES from starting on some systems.\n"
 "If LiVES will not start with jack, you can restart and try with another "
@@ -934,11 +937,11 @@
 "autre lecteur audio à la place\n"
 "\n"
 
-#: src/startup.c:254
+#: src/startup.c:246
 msgid "SOX may be used if neither of the preceding players work, "
 msgstr "SOX peut être utilisé si aucun des lecteurs précédents a fonctionné, "
 
-#: src/startup.c:257
+#: src/startup.c:249
 msgid ""
 "but some audio features will be disabled.\n"
 "\n"
@@ -946,14 +949,14 @@
 "mais certaines fonctionnalités audio serontdésactivées.\n"
 "\n"
 
-#: src/startup.c:260
+#: src/startup.c:251
 msgid ""
 "but you do not have sox installed.\n"
 "You are advised to install it before running LiVES.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:264
+#: src/startup.c:255
 #, fuzzy
 msgid ""
 "The MPLAYER/MPLAYER2 audio player is only recommended for testing purposes.\n"
@@ -962,97 +965,97 @@
 "Le lecteur audio MPLAYER est seulement recommandé dans le but de test.\n"
 "\n"
 
-#: src/startup.c:281
+#: src/startup.c:271
 msgid "LiVES: - Choose an audio player"
 msgstr "LiVES: - choisir un lecteur audio"
 
-#: src/startup.c:298
+#: src/startup.c:288
 msgid "Use _pulse audio player"
 msgstr "Utilise le lecteur audio _pulse"
 
-#: src/startup.c:320
+#: src/startup.c:310
 msgid "Use _jack audio player"
 msgstr "Utiliser le lecteur audio jack"
 
-#: src/startup.c:340
+#: src/startup.c:330
 msgid "Use _sox audio player"
 msgstr "Utilise le lecteur audio _sox"
 
-#: src/startup.c:361
+#: src/startup.c:351
 msgid "Use _mplayer audio player"
 msgstr "Utilise le lecteur audui _mplayer"
 
-#: src/startup.c:381
+#: src/startup.c:371
 #, fuzzy
 msgid "Use _mplayer2 audio player"
 msgstr "Utilise le lecteur audui _mplayer"
 
-#: src/startup.c:405 src/startup.c:580 src/interface.c:1506
+#: src/startup.c:395 src/startup.c:569 src/interface.c:1398
 msgid "_Next"
 msgstr "_Suivant"
 
-#: src/startup.c:445
+#: src/startup.c:435
 msgid "Skipped"
-msgstr ""
+msgstr "Ignoré"
 
-#: src/startup.c:460
+#: src/startup.c:450
 msgid "Passed"
 msgstr ""
 
-#: src/startup.c:493
+#: src/startup.c:483
 msgid "Failed"
 msgstr "Échoué"
 
-#: src/startup.c:552
+#: src/startup.c:542
 msgid "LiVES: - Testing Configuration"
 msgstr "LiVES: - Test de Configuration"
 
-#: src/startup.c:555
+#: src/startup.c:544
 msgid "LiVES: - Troubleshoot"
 msgstr "LiVES : - Dépannage"
 
-#: src/startup.c:568
+#: src/startup.c:557
 msgid "LiVES will now run some basic configuration tests\n"
 msgstr "LiVES va maintenant lancer quelques tests de configuration de base\n"
 
-#: src/startup.c:603
+#: src/startup.c:591
 msgid "Checking for \"sox\" presence"
 msgstr "Vérification de la présence de \"sox\""
 
-#: src/startup.c:607
+#: src/startup.c:595
 msgid ""
 "You should install sox to be able to use all the audio features in LiVES"
 msgstr ""
 "Vous devriez installer sox pour utiliser toutes les fonctionnalités audio de "
 "LiVES"
 
-#: src/startup.c:615
+#: src/startup.c:602
 msgid "Checking if sox can convert audio"
 msgstr "Vérifie si sox peut convertir du son"
 
-#: src/startup.c:638
+#: src/startup.c:625
 msgid "Unable to allocate 176400 bytes memory."
 msgstr "Impossible d'allouer 176400 octets en mémoire."
 
-#: src/startup.c:653
+#: src/startup.c:639
 #, c-format
 msgid "Unable to write to: %s"
 msgstr "Impossible d'écrire sur : %s"
 
-#: src/startup.c:667 src/startup.c:807
+#: src/startup.c:653 src/startup.c:789
 #, c-format
 msgid "Command failed: %s"
 msgstr "La commande a échoué : %s"
 
-#: src/startup.c:689
+#: src/startup.c:675
 msgid "You should install sox_fmt_all or similar"
 msgstr "Vous devriez installer sox_fmt_all ou équivalent"
 
-#: src/startup.c:717
+#: src/startup.c:703
 msgid "Checking for \"mplayer\" presence"
 msgstr "Vérifie si \"mplayer\" est présent"
 
-#: src/startup.c:721
+#: src/startup.c:707
 #, fuzzy
 msgid ""
 "You should install mplayer or mplayer2 to be able to use all the decoding "
@@ -1061,46 +1064,46 @@
 "Vous devriez installer mplayer pour pouvoir utiliser toutes les "
 "fonctionnalité de décodage de LiVES"
 
-#: src/startup.c:747
+#: src/startup.c:732
 msgid "Checking if mplayer can convert audio"
 msgstr "Vérifie si mplayer peut convertir du son"
 
-#: src/startup.c:768
+#: src/startup.c:751
 #, fuzzy
 msgid "You should install mplayer or mplayer2 with pcm/wav support"
 msgstr "Vous devriez installer mplayer avec la prise en charge de pcm/wav"
 
-#: src/startup.c:785
+#: src/startup.c:767
 msgid "Checking if mplayer can decode to png/alpha"
 msgstr "Vérifie si mplayer peut décoder en png/alpha"
 
-#: src/startup.c:828
+#: src/startup.c:810
 msgid "You may wish to upgrade mplayer to a newer version"
 msgstr "Il est suggéré d'utiliser une version plus récente de mplayer"
 
-#: src/startup.c:854
+#: src/startup.c:836
 msgid "Checking if mplayer can decode to jpeg"
 msgstr "Vérifie si mplayer peut décoder en jpeg"
 
-#: src/startup.c:882
+#: src/startup.c:862
 msgid "You should install mplayer with either png/alpha or jpeg support"
 msgstr ""
 "Vous devriez installer mplayer avec la prise en charge du jpeg ou du png/"
 "alpha"
 
-#: src/startup.c:883
+#: src/startup.c:863
 msgid "You may wish to add jpeg output support to mplayer"
 msgstr "Vous pouvez ajouter le support de sortie jpeg à mplayer"
 
-#: src/startup.c:892
+#: src/startup.c:872
 msgid "Checking for \"convert\" presence"
 msgstr "Vérification de la présence de la commande \"convert\""
 
-#: src/startup.c:896
+#: src/startup.c:876
 msgid "Install imageMagick to be able to use all of the rendered effects"
 msgstr "Installer imageMagick pour pouvoir utiliser tous les effets"
 
-#: src/startup.c:909
+#: src/startup.c:889
 msgid ""
 "\n"
 "\n"
@@ -1108,7 +1111,7 @@
 "Preferences/Decoding.    \n"
 msgstr ""
 
-#: src/startup.c:915
+#: src/startup.c:894
 msgid ""
 "\n"
 "\n"
@@ -1120,7 +1123,7 @@
 "    Cliquez sur Annuler pour quitter et installer les composants manquants, "
 "ou sur Suivant pour continuer    \n"
 
-#: src/startup.c:949
+#: src/startup.c:928
 msgid ""
 "\n"
 "\n"
@@ -1131,44 +1134,44 @@
 "Finalement, vous pouvez choisir L'interface de démarrage par défaut pour "
 "LiVES\n"
 
-#: src/startup.c:950
+#: src/startup.c:929
 msgid ""
 "\n"
 "\n"
 "LiVES has two main interfaces and you can start up with either of them.\n"
 msgstr ""
 
-#: src/startup.c:951
+#: src/startup.c:930
 msgid ""
 "\n"
 "\n"
 "The default can always be changed later from Preferences.\n"
 msgstr ""
 
-#: src/startup.c:961
+#: src/startup.c:940
 msgid "LiVES: - Choose the startup interface"
 msgstr ""
 
-#: src/startup.c:972
+#: src/startup.c:951
 msgid "Start in _Clip Edit mode"
 msgstr ""
 
-#: src/startup.c:975
+#: src/startup.c:954
 msgid "This is the best choice for simple editing tasks and for VJs\n"
 msgstr ""
 
-#: src/startup.c:981
+#: src/startup.c:960
 msgid "Start in _Multitrack mode"
 msgstr ""
 
-#: src/startup.c:983
+#: src/startup.c:962
 msgid ""
 "This is a better choice for complex editing tasks involving multiple clips.\n"
 msgstr ""
 
-#: src/startup.c:992
+#: src/startup.c:971
 msgid "_Finish"
-msgstr ""
+msgstr "_Terminer"
 
 #: src/interface.c:35
 msgid "Let LiVES set the _file extension"
@@ -1183,39 +1186,39 @@
 msgid "Apply _Deinterlace"
 msgstr ""
 
-#: src/interface.c:66
+#: src/interface.c:65
 msgid "If this is set, frames will be deinterlaced as they are imported."
 msgstr ""
 "Si vous sélectionnez cela, la vidéo sera désentrelacée durant son "
 "importation."
 
-#: src/interface.c:113 src/callbacks.c:9623 src/callbacks.c:9646
-#: src/callbacks.c:9647 src/gui.c:3223 src/gui.c:3821 src/saveplay.c:2339
-#: src/saveplay.c:3138 src/dialogs.c:1514 src/dialogs.c:1515
-#: src/dialogs.c:1746 src/dialogs.c:1747 src/framedraw.c:238
-#: src/multitrack.c:8031
+#: src/interface.c:106 src/callbacks.c:9542 src/callbacks.c:9564
+#: src/callbacks.c:9565 src/gui.c:3333 src/gui.c:3946 src/saveplay.c:2317
+#: src/saveplay.c:3097 src/dialogs.c:1575 src/dialogs.c:1576
+#: src/dialogs.c:1804 src/dialogs.c:1805 src/framedraw.c:236
+#: src/multitrack.c:8210
 msgid "Preview"
 msgstr "Voir"
 
-#: src/interface.c:132
+#: src/interface.c:125
 msgid "Click here to _Preview any selected video, image or audio file"
 msgstr ""
 "Cliquez ici pour _Prévisualiser tout fichier vidéo, image, ou audio "
 "sélectionné."
 
-#: src/interface.c:135
+#: src/interface.c:127
 msgid "Click here to _Preview any selected audio file"
 msgstr "Cliquez ici pour _Prévisualiser tout fichier audio sélectionné"
 
-#: src/interface.c:138
+#: src/interface.c:129
 msgid "Click here to _Preview the video"
 msgstr "Cliquez ici pour prévisualiser la vidéo."
 
-#: src/interface.c:181 src/dialogs.c:2542
+#: src/interface.c:169 src/dialogs.c:2621
 msgid "LiVES: - Processing..."
 msgstr "LiVES: - Traitement..."
 
-#: src/interface.c:217
+#: src/interface.c:205
 msgid ""
 "\n"
 "\n"
@@ -1229,8 +1232,8 @@
 "\n"
 "N'oubliez pas de désactiver les effets (ctrl-0) par la suite !"
 
-#: src/interface.c:222 src/callbacks.c:9373 src/callbacks.c:9420
-#: src/dialogs.c:2570
+#: src/interface.c:210 src/callbacks.c:9283 src/callbacks.c:9332
+#: src/dialogs.c:2649
 msgid ""
 "\n"
 "Please Wait"
@@ -1238,190 +1241,178 @@
 "\n"
 "Patientez SVP"
 
-#: src/interface.c:242
+#: src/interface.c:230
 msgid "Show Details"
-msgstr ""
+msgstr "Afficher les détails"
 
-#: src/interface.c:254 src/dialogs.c:2584
+#: src/interface.c:242 src/dialogs.c:2663
 msgid "_Enough"
 msgstr "_Assez"
 
-#: src/interface.c:255 src/framedraw.c:278
+#: src/interface.c:243 src/framedraw.c:276
 msgid "_Preview"
 msgstr "_Voir"
 
-#: src/interface.c:257
+#: src/interface.c:245 src/callbacks.c:9282 src/callbacks.c:9330
 msgid "Paus_e"
-msgstr ""
+msgstr "Paus_e"
 
-#: src/interface.c:258 src/callbacks.c:9417
+#: src/interface.c:246 src/callbacks.c:9329
 msgid "Pause/_Enough"
 msgstr ""
 
-#: src/interface.c:285
+#: src/interface.c:273
 msgid "_Cancel"
 msgstr "_Annuler"
 
-#: src/interface.c:374
+#: src/interface.c:361
 #, c-format
 msgid "LiVES: - %s"
-msgstr ""
+msgstr "LiVES : - %s"
 
-#: src/interface.c:376
+#: src/interface.c:363
 msgid "LiVES: - Multitrack details"
 msgstr ""
 
-#: src/interface.c:407
+#: src/interface.c:394
 msgid "Format"
 msgstr "Format"
 
-#: src/interface.c:412
+#: src/interface.c:399
 msgid "Frame size"
 msgstr "Taille de l'encadrement"
 
-#: src/interface.c:417
+#: src/interface.c:404
 msgid "File size"
 msgstr "Taille Fichier"
 
-#: src/interface.c:418
+#: src/interface.c:405
 msgid "Byte size"
 msgstr "Byte size"
 
-#: src/interface.c:423 src/interface.c:1891
+#: src/interface.c:410 src/interface.c:1760
 msgid "FPS"
 msgstr "IPS"
 
-#: src/interface.c:428
+#: src/interface.c:415
 msgid "Frames"
 msgstr "Images"
 
-#: src/interface.c:429
+#: src/interface.c:416
 msgid "Events"
 msgstr "Evènement"
 
-#: src/interface.c:434 src/interface.c:500 src/interface.c:542
+#: src/interface.c:421 src/interface.c:486 src/interface.c:528
 msgid "Total time"
 msgstr "Temps Total"
 
-#: src/interface.c:486 src/resample.c:1488
+#: src/interface.c:472 src/resample.c:1460
 msgid "Audio"
 msgstr "Audio"
 
-#: src/interface.c:511 src/interface.c:553
+#: src/interface.c:497 src/interface.c:539
 msgid "Rate/size"
 msgstr "Vitesse/taille"
 
-#: src/interface.c:530
+#: src/interface.c:516
 msgid "Right audio"
 msgstr "Audio droite"
 
-#: src/interface.c:622
+#: src/interface.c:607
 msgid "LiVES: - Encoding options"
 msgstr "LiVES: - Options d'encodage"
 
-#: src/interface.c:636
+#: src/interface.c:621
 msgid "<------------- (Check the box to re_size as suggested)"
 msgstr ""
 
-#: src/interface.c:637
+#: src/interface.c:622
 msgid "<------------- (Check the box to use the _size recommendation)"
 msgstr ""
 
-#: src/interface.c:662
+#: src/interface.c:646
 msgid "Use _letterboxing to maintain aspect ratio (optional)"
 msgstr ""
 
-#: src/interface.c:663
+#: src/interface.c:647
 msgid ""
 "Draw black rectangles either above or to the sides of the image, to prevent "
 "it from stretching."
 msgstr ""
 
-#: src/interface.c:694
+#: src/interface.c:677
 msgid "Keep _my settings"
 msgstr "Conserver mes réglages"
 
-#: src/interface.c:695
+#: src/interface.c:678
 msgid "Use _recommended settings"
 msgstr "Utilisé les paramètres recommandés"
 
-#: src/interface.c:775 src/dialogs.c:114
-msgid ""
-"Do _not show this warning any more\n"
-"(can be turned back on from Preferences/Warnings)"
-msgstr ""
-"Ne _plus afficher cet avertissement à nouveau\n"
-"(peut-être modifié depuis Préférences/Avertissements)"
-
-#: src/interface.c:787
-msgid "Show _Details"
-msgstr "Voir Les _Détails"
-
-#: src/interface.c:881
+#: src/interface.c:769
 msgid "_Close Window"
 msgstr "_Fermer la fenêtre"
 
-#: src/interface.c:883
+#: src/interface.c:771
 msgid "_Save to file"
 msgstr "_Sauve au fichier"
 
-#: src/interface.c:928
+#: src/interface.c:816
 msgid "LiVES: - Insert"
 msgstr "LiVES: - Insère"
 
-#: src/interface.c:945
+#: src/interface.c:833
 msgid "_Number of times to insert"
 msgstr "_Nombre de fois à insérer"
 
-#: src/interface.c:954
+#: src/interface.c:842
 msgid "_Insert to fit audio"
 msgstr "_Insère pour correspondre au son"
 
-#: src/interface.c:968
+#: src/interface.c:856
 msgid "Insert _before selection"
 msgstr "Insère _avant la sélection"
 
-#: src/interface.c:970
+#: src/interface.c:858
 msgid "Insert clipboard before selected frames"
 msgstr "Inserez le contenu du presse-papier avant la sélection"
 
-#: src/interface.c:986
+#: src/interface.c:875
 msgid "Insert _after selection"
 msgstr "Insère après la sélection"
 
-#: src/interface.c:988
+#: src/interface.c:877
 msgid "Insert clipboard after selected frames"
 msgstr "Insérer le contenu du presse-papier après la sélection"
 
-#: src/interface.c:999
+#: src/interface.c:888
 msgid "Insert _with sound"
 msgstr "Insère avec le _son"
 
-#: src/interface.c:1012
+#: src/interface.c:901
 msgid "Insert with_out sound"
 msgstr "Insère sans le son"
 
-#: src/interface.c:1093
+#: src/interface.c:985
 msgid "LiVES: - Open Selection"
 msgstr "LiVES: - Ouvrir Sélection"
 
-#: src/interface.c:1111
+#: src/interface.c:1004
 msgid "Selection start time (sec)"
 msgstr ""
 
-#: src/interface.c:1117
+#: src/interface.c:1010
 msgid "Number of frames to open"
 msgstr ""
 
-#: src/interface.c:1193
+#: src/interface.c:1088
 msgid "LiVES: - Open Location"
 msgstr "LiVES: - Ouvrir emplacement"
 
-#: src/interface.c:1195
+#: src/interface.c:1090
 msgid "LiVES: - Open Youtube Clip"
 msgstr ""
 
-#: src/interface.c:1213
+#: src/interface.c:1109
 msgid ""
 "\n"
 "\n"
@@ -1438,7 +1429,7 @@
 "Préférences|Streaming\n"
 "\n"
 
-#: src/interface.c:1216
+#: src/interface.c:1112
 msgid ""
 "\n"
 "\n"
@@ -1447,63 +1438,64 @@
 "\n"
 msgstr ""
 
-#: src/interface.c:1220
+#: src/interface.c:1116
 msgid ""
 "Enter the URL of the clip below.\n"
 "E.g: http://www.youtube.com/watch?v=WCR6f6WzjP8\n"
 "\n"
 msgstr ""
 
-#: src/interface.c:1231
+#: src/interface.c:1127
 msgid "URL : "
 msgstr "URL : "
 
-#: src/interface.c:1231
+#: src/interface.c:1127
 msgid "Youtube URL : "
 msgstr ""
 
-#: src/interface.c:1235
+#: src/interface.c:1131
 msgid "Do not send bandwidth information"
 msgstr "Ne pas envoyer les infos de bande passante"
 
-#: src/interface.c:1237
+#: src/interface.c:1133
 msgid "Try this setting if you are having problems getting a stream"
 msgstr ""
 "Essayez cette option si vous avez des problèmes de chargement sur un stream"
 
-#: src/interface.c:1258
+#: src/interface.c:1155
 msgid "Download to _Directory : "
 msgstr ""
 
-#: src/interface.c:1276
+#: src/interface.c:1173
 msgid "Download _File Name : "
 msgstr ""
 
-#: src/interface.c:1281
+#: src/interface.c:1178
 msgid ".webm"
-msgstr ""
+msgstr ".webm"
 
-#: src/interface.c:1359
+#: src/interface.c:1256
 msgid "LiVES: - Rename Clip"
 msgstr "LiVES: - Renommer Clip"
 
-#: src/interface.c:1362
-msgid "LiVES: - Enter Set Name"
+#: src/interface.c:1258
+#, fuzzy
+msgid "LiVES: - Enter Set Name to Save as"
 msgstr "LiVES: - Entrer le nom des paramètres"
 
-#: src/interface.c:1365
+#: src/interface.c:1260
 msgid "LiVES: - Enter a Set Name to Reload"
 msgstr ""
 
-#: src/interface.c:1368
+#: src/interface.c:1262
 msgid "LiVES: - Choose a Working Directory"
 msgstr "LiVES: - Choisissez un répertoire de travail"
 
-#: src/interface.c:1371
+#: src/interface.c:1264
 msgid "LiVES: - Rename Current Track"
 msgstr ""
 
-#: src/interface.c:1391
+#: src/interface.c:1283
 msgid ""
 "You need to enter a name for the current clip set.\n"
 "This will allow you reload the layout with the same clips later.\n"
@@ -1517,7 +1509,7 @@
 "LiVES va vous rappeler d'enregistrer le clip fixées ultérieurement lorsque "
 "vous essayez de quitter.\n"
 
-#: src/interface.c:1397
+#: src/interface.c:1289
 msgid ""
 "In order to export this project, you must enter a name for this clip set.\n"
 "This will also be used for the project name.\n"
@@ -1525,7 +1517,7 @@
 "Pour pouvoir exporter ce projet, il faut nommer cet ensemble de clips.\n"
 "Ce nom sera également utilisé comme nom du projet.\n"
 
-#: src/interface.c:1404
+#: src/interface.c:1296
 msgid ""
 "Welcome to LiVES !\n"
 "This startup wizard will guide you through the\n"
@@ -1536,200 +1528,200 @@
 "l'installation initiale afin que vous puissiez profiter au maximum de cette "
 "application.\n"
 
-#: src/interface.c:1408
+#: src/interface.c:1300
 msgid ""
 "\n"
 "First of all you need to choose a working directory for LiVES.\n"
 "This should be a directory with plenty of disk space available.\n"
 msgstr ""
 
-#: src/interface.c:1427
+#: src/interface.c:1317
 msgid "New name "
 msgstr "Nouveau Nom "
 
-#: src/interface.c:1430
+#: src/interface.c:1319
 msgid "Set name "
 msgstr "Indiquer nom "
 
-#: src/interface.c:1550
+#: src/interface.c:1435
 msgid "Use def_aults"
 msgstr ""
 
-#: src/interface.c:1553 src/interface.c:1840 src/preferences.c:2515
-#: src/preferences.c:2697
+#: src/interface.c:1437 src/interface.c:1709 src/preferences.c:2550
+#: src/preferences.c:2739
 msgid "_Advanced"
 msgstr "_Avancé"
 
-#: src/interface.c:1604
+#: src/interface.c:1487
 msgid "LiVES:- Select input device"
 msgstr ""
 
-#: src/interface.c:1622
+#: src/interface.c:1504
 msgid "Select input device:"
 msgstr ""
 
-#: src/interface.c:1686
+#: src/interface.c:1568
 msgid "LiVES:- Load CD Track"
 msgstr "LiVES:- Charger une piste CD"
 
-#: src/interface.c:1689
+#: src/interface.c:1570
 msgid "LiVES:- Select DVD Title/Chapter"
 msgstr "LiVES:- Sélectionne le titre/chapitre du DVD"
 
-#: src/interface.c:1692
+#: src/interface.c:1572
 msgid "LiVES:- Select VCD Title"
 msgstr "LiVES:- Sélectionne le titre VCD"
 
-#: src/interface.c:1695
+#: src/interface.c:1574
 msgid "LiVES:- Change Maximum Visible Tracks"
 msgstr "LiVES:- Changer le nombre de pistes affichées"
 
-#: src/interface.c:1698
+#: src/interface.c:1576
 msgid "LiVES:- Device details"
 msgstr ""
 
-#: src/interface.c:1721
+#: src/interface.c:1598
 #, c-format
 msgid "Track to load (from %s)"
 msgstr "Piste à charger (de %s)"
 
-#: src/interface.c:1724
+#: src/interface.c:1600
 msgid "DVD Title"
 msgstr "Titre DVD"
 
-#: src/interface.c:1727
+#: src/interface.c:1602
 msgid "VCD Title"
 msgstr "Titre VCD"
 
-#: src/interface.c:1730
+#: src/interface.c:1604
 msgid "Maximum number of tracks to display"
 msgstr "Nombre maximal de piste à afficher"
 
-#: src/interface.c:1733
+#: src/interface.c:1606
 msgid "Device:        /dev/video"
 msgstr ""
 
-#: src/interface.c:1736
+#: src/interface.c:1608
 msgid "Device:        fw:"
 msgstr ""
 
-#: src/interface.c:1771
+#: src/interface.c:1641
 msgid "Chapter  "
 msgstr "Chapitre  "
 
-#: src/interface.c:1776
+#: src/interface.c:1645
 msgid "Channel  "
-msgstr ""
+msgstr "Canal  "
 
-#: src/interface.c:1791
+#: src/interface.c:1660
 msgid "Audio ID  "
 msgstr "Audio ID  "
 
-#: src/interface.c:1857
+#: src/interface.c:1726
 msgid "Input number"
 msgstr ""
 
-#: src/interface.c:1865
+#: src/interface.c:1734
 msgid "Use default width, height and FPS"
 msgstr ""
 
-#: src/interface.c:1879
+#: src/interface.c:1748
 msgid "Width"
-msgstr ""
+msgstr "Largeur"
 
-#: src/interface.c:1885
+#: src/interface.c:1754
 msgid "Height"
-msgstr ""
+msgstr "Hauteur"
 
-#: src/interface.c:1899
+#: src/interface.c:1768
 msgid "_Driver"
-msgstr ""
+msgstr "_Pilote"
 
-#: src/interface.c:1902
+#: src/interface.c:1771
 msgid "_Output format"
-msgstr ""
+msgstr "Format de _sortie"
 
-#: src/interface.c:1998
+#: src/interface.c:1865
 msgid "LiVES:- Fade Audio In"
 msgstr "LiVES: - montée progressive du son (fondu d'ouverture)"
 
-#: src/interface.c:2001
+#: src/interface.c:1867
 msgid "LiVES:- Fade Audio Out"
 msgstr "LiVES: - Descente progressive (fondu de fermeture)"
 
-#: src/interface.c:2017
+#: src/interface.c:1883
 msgid "Fade in over  "
 msgstr ""
 
-#: src/interface.c:2018
+#: src/interface.c:1884
 msgid "first"
 msgstr "premier"
 
-#: src/interface.c:2021
+#: src/interface.c:1886
 msgid "Fade out over  "
 msgstr ""
 
-#: src/interface.c:2022
+#: src/interface.c:1887
 msgid "last"
 msgstr "dernier"
 
-#: src/interface.c:2044
+#: src/interface.c:1909
 msgid "seconds."
 msgstr "secondes."
 
-#: src/interface.c:2052 src/saveplay.c:1507
+#: src/interface.c:1917 src/saveplay.c:1484
 msgid "selection"
 msgstr "sélection"
 
-#: src/interface.c:2092
+#: src/interface.c:1956
 msgid "LiVES: - File Comments (optional)"
 msgstr "LiVES: - Commentaires Fichier (optionnel)"
 
-#: src/interface.c:2107
+#: src/interface.c:1971
 msgid "Title/Name : "
 msgstr "Titre/Nom : "
 
-#: src/interface.c:2114
+#: src/interface.c:1978
 msgid "Author/Artist : "
 msgstr "Auteur/Artiste : "
 
-#: src/interface.c:2121
+#: src/interface.c:1985
 msgid "Comments : "
 msgstr "Commentaires : "
 
-#: src/interface.c:2151
+#: src/interface.c:2015
 msgid "_Options"
-msgstr ""
+msgstr "_Options"
 
-#: src/interface.c:2158
+#: src/interface.c:2022
 msgid "Save _subtitles to file"
 msgstr ""
 
-#: src/interface.c:2170
+#: src/interface.c:2033
 msgid "Subtitle file"
 msgstr ""
 
-#: src/interface.c:2172
+#: src/interface.c:2035
 msgid "Browse..."
-msgstr ""
+msgstr "Parcourir..."
 
-#: src/interface.c:2255
+#: src/interface.c:2132
 msgid "LiVES: - choose a device"
 msgstr ""
 
-#: src/interface.c:2259
+#: src/interface.c:2135
 msgid "LiVES: - choose a directory"
 msgstr ""
 
-#: src/interface.c:2262
+#: src/interface.c:2137
 msgid "LiVES: - choose a file"
 msgstr ""
 
-#: src/interface.c:2445
+#: src/interface.c:2381
 msgid "LiVES: - Cancel/Discard/Save"
 msgstr "LiVES: - Annuler/Continuer/Sauvegarder"
 
-#: src/interface.c:2460
+#: src/interface.c:2397
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has not been saved.\n"
@@ -1739,7 +1731,7 @@
 "Votre travail n'a pas encore été sauvegardé.\n"
 "Que voulez vous faire ?\n"
 
-#: src/interface.c:2463
+#: src/interface.c:2400
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has been changed since the last save.\n"
@@ -1749,7 +1741,7 @@
 "Votre n'avez pas sauvergardé vos derniers changements.\n"
 "Que voulez vous faire ?\n"
 
-#: src/interface.c:2467
+#: src/interface.c:2404
 msgid ""
 "You are about to exit LiVES.\n"
 "The current clip set can be saved.\n"
@@ -1759,7 +1751,7 @@
 "Vous n'avez pas encore sauvegardé votre travail.\n"
 "Que voulez-vous faire ?\n"
 
-#: src/interface.c:2468
+#: src/interface.c:2405
 msgid ""
 "The current clip set has not been saved.\n"
 "What would you like to do ?\n"
@@ -1767,7 +1759,7 @@
 "Le clip current n'a pas été sauvé.\n"
 "Que voulez-vous faire ?\n"
 
-#: src/interface.c:2472
+#: src/interface.c:2408
 msgid ""
 "The current layout has not been saved.\n"
 "What would you like to do ?\n"
@@ -1775,17 +1767,13 @@
 "La disposition actuelle n'a pas étée sauvée.\n"
 "Que voulez-vous faire ?\n"
 
-#: src/interface.c:2475
-#, fuzzy
+#: src/interface.c:2410
 msgid ""
 "The current layout has *not* been changed since it was last saved.\n"
 "What would you like to do ?\n"
 msgstr ""
-"La disposition actuelle n'a pas étée modifiée depuis son dernier "
-"enregistrement.\n"
-"Que voulez-vous faire ?\n"
 
-#: src/interface.c:2480
+#: src/interface.c:2415
 msgid ""
 "The current layout contains generated frames and cannot be retained.\n"
 "You may wish to render it before exiting multitrack mode.\n"
@@ -1794,7 +1782,7 @@
 "être conservées.\n"
 "Vous peuvez tenir à rendre avant de quitter le mode multipiste.\n"
 
-#: src/interface.c:2483
+#: src/interface.c:2418
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout contains generated frames and cannot be retained.\n"
@@ -1805,96 +1793,96 @@
 "être conservés.\n"
 "Que souhaitez-vous faire ?"
 
-#: src/interface.c:2496
+#: src/interface.c:2431
 msgid "Clip set _name"
 msgstr "_Nom de l'ensemble de clips"
 
-#: src/interface.c:2502
+#: src/interface.c:2437
 msgid "_Auto reload next time"
 msgstr "Recharge _automatiquement la prochaine fois"
 
-#: src/interface.c:2538 src/interface.c:2547
+#: src/interface.c:2473 src/interface.c:2482
 msgid "_Wipe layout"
 msgstr "_Essuyez layout"
 
-#: src/interface.c:2539
+#: src/interface.c:2474
 msgid "_Ignore changes"
 msgstr "_Ignore les changements"
 
-#: src/interface.c:2540
+#: src/interface.c:2475
 msgid "_Delete clip set"
 msgstr "_Supprime l'ensemble de clips"
 
-#: src/interface.c:2541
+#: src/interface.c:2476
 msgid "_Delete layout"
 msgstr "_Supprime la disposition"
 
-#: src/interface.c:2545
+#: src/interface.c:2480
 msgid "_Save layout"
 msgstr "_Sauve la disposition"
 
-#: src/interface.c:2546
+#: src/interface.c:2481
 msgid "_Save clip set"
 msgstr "_Sauve l'ensemble de clips"
 
-#: src/interface.c:2565
+#: src/interface.c:2502
 msgid ""
 "\n"
 "LiVES has detected a multitrack layout from a previous session.\n"
 "Would you like to try and recover it ?\n"
 msgstr ""
 
-#: src/interface.c:2589
+#: src/interface.c:2528
 msgid "LiVES: - Disk Recovery Options"
 msgstr ""
 
-#: src/interface.c:2608
+#: src/interface.c:2549
 msgid "Delete _Orphaned Clips"
 msgstr ""
 
-#: src/interface.c:2609
+#: src/interface.c:2550
 msgid "Delete any clips which are not currently loaded or part of a set"
 msgstr ""
 
-#: src/interface.c:2622
+#: src/interface.c:2564
 msgid "Clear _Backup Files from Closed Clips"
 msgstr ""
 
-#: src/interface.c:2633
+#: src/interface.c:2575
 msgid "Remove Sets which have _Layouts but no Clips"
 msgstr ""
 
-#: src/interface.c:2644
+#: src/interface.c:2586
 msgid "_Reset to Defaults"
-msgstr ""
+msgstr "_Réinitialiser aux valeurs par défaut"
 
-#: src/interface.c:2651
+#: src/interface.c:2593
 msgid "_Accept"
-msgstr ""
+msgstr "_Accepter"
 
-#: src/callbacks.c:198
+#: src/callbacks.c:208
 #, c-format
 msgid "Saving as set %s..."
 msgstr "En sauvant comme l'ensemble %s..."
 
-#: src/callbacks.c:833
+#: src/callbacks.c:852
 msgid "Please enter the name of the file to save the clip as.\n"
 msgstr ""
 
-#: src/callbacks.c:841
+#: src/callbacks.c:860
 msgid "Please enter a valid URL for the download.\n"
 msgstr ""
 
-#: src/callbacks.c:867
+#: src/callbacks.c:886
 #, c-format
 msgid "Downloading %s to %s..."
 msgstr ""
 
-#: src/callbacks.c:895
+#: src/callbacks.c:912
 msgid "Downloading clip"
 msgstr ""
 
-#: src/callbacks.c:933
+#: src/callbacks.c:950
 msgid ""
 "\n"
 "LiVES was unable to download the clip.\n"
@@ -1902,11 +1890,11 @@
 "the latest youtube-dl installed.\n"
 msgstr ""
 
-#: src/callbacks.c:1114 src/callbacks.c:1149
+#: src/callbacks.c:1131 src/callbacks.c:1166
 msgid "This file"
 msgstr "Ce fichier"
 
-#: src/callbacks.c:1115
+#: src/callbacks.c:1132
 msgid ""
 ",\n"
 " - including the current layout - "
@@ -1914,7 +1902,7 @@
 ",\n"
 " - y compris la mise en page actuelle - "
 
-#: src/callbacks.c:1117
+#: src/callbacks.c:1134
 #, c-format
 msgid ""
 "\n"
@@ -1924,7 +1912,7 @@
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1119
+#: src/callbacks.c:1136
 #, c-format
 msgid ""
 "\n"
@@ -1934,14 +1922,14 @@
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1150
+#: src/callbacks.c:1167
 msgid ""
 "Changes made to this clip have not been saved or backed up.\n"
 "\n"
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1343
+#: src/callbacks.c:1356
 msgid ""
 "\n"
 "Invalid project file.\n"
@@ -1949,7 +1937,7 @@
 "\n"
 "Fichier de projet invalide.\n"
 
-#: src/callbacks.c:1356
+#: src/callbacks.c:1370
 #, c-format
 msgid ""
 "\n"
@@ -1962,33 +1950,33 @@
 "Once you have done this, you will be able to import the new project.\n"
 msgstr ""
 
-#: src/callbacks.c:1366
+#: src/callbacks.c:1381
 #, c-format
 msgid "Importing the project %s as set %s..."
 msgstr "Importer le projet %s en tant que %s..."
 
-#: src/callbacks.c:1386
+#: src/callbacks.c:1399
 msgid "Importing project"
 msgstr "importation du projet"
 
-#: src/callbacks.c:1472
+#: src/callbacks.c:1481
 #, c-format
 msgid "Exporting project %s..."
 msgstr "Exportation du projet %s..."
 
-#: src/callbacks.c:1490
+#: src/callbacks.c:1497
 msgid "Exporting project"
 msgstr "Exportation du projet"
 
-#: src/callbacks.c:1506
+#: src/callbacks.c:1513
 msgid "Backup as .lv1 file"
 msgstr "Sauvegarder comme fichier .lv1"
 
-#: src/callbacks.c:1522
+#: src/callbacks.c:1529
 msgid "Restore .lv1 file"
 msgstr "Restaurer fichier .lv1"
 
-#: src/callbacks.c:1664
+#: src/callbacks.c:1671
 msgid ""
 "\n"
 "\n"
@@ -2000,99 +1988,103 @@
 "L'ensemble sera supprimé du disque.\n"
 "Es-tu sûr ?\n"
 
-#: src/callbacks.c:1725
+#: src/callbacks.c:1732
 #, c-format
 msgid "Deleting set %s..."
 msgstr ""
 
-#: src/callbacks.c:1727
+#: src/callbacks.c:1734
 msgid "Deleting set..."
 msgstr "Suppression du set..."
 
-#: src/callbacks.c:1731
+#: src/callbacks.c:1738
 msgid "Deleting set"
 msgstr "Suppression du set"
 
-#: src/callbacks.c:1739
+#: src/callbacks.c:1746
 #, c-format
 msgid "Set %s was permanently deleted from the disk.\n"
 msgstr ""
 
-#: src/callbacks.c:1787 src/callbacks.c:11764
+#: src/callbacks.c:1792 src/callbacks.c:11676
 msgid "Insert Silence"
 msgstr "Insère Silence"
 
-#: src/callbacks.c:1840 src/callbacks.c:1923 src/callbacks.c:2086
+#: src/callbacks.c:1844 src/callbacks.c:1927 src/callbacks.c:2089
 msgid "Undoing"
 msgstr "Annulation"
 
-#: src/callbacks.c:1936 src/callbacks.c:2147
+#: src/callbacks.c:1940 src/callbacks.c:2150
 msgid "Restoring audio..."
 msgstr ""
 
-#: src/callbacks.c:1952
+#: src/callbacks.c:1956
 msgid "Clearing frame images"
 msgstr ""
 
-#: src/callbacks.c:1985
+#: src/callbacks.c:1988
 msgid "Deleting excess frames"
 msgstr ""
 
-#: src/callbacks.c:2229
+#: src/callbacks.c:2232
 #, c-format
 msgid "Length of video is now %d frames at %.3f frames per second.\n"
 msgstr ""
 "La longueur de la vidéo est maintenant de %d images à %.3f images par "
 "seconde.\n"
 
-#: src/callbacks.c:2233 src/resample.c:683 src/resample.c:2166
+#: src/callbacks.c:2235 src/resample.c:678 src/resample.c:2133
 #, c-format
 msgid "Clipboard was resampled to %d frames.\n"
 msgstr "Le presse-papiers a été reéchantillonne à %d images.\n"
 
-#: src/callbacks.c:2394 src/callbacks.c:2423
+#: src/callbacks.c:2396 src/callbacks.c:2425
 msgid "Redoing"
 msgstr "Refaire"
 
-#: src/callbacks.c:2462
-#, c-format
-msgid "Copying frames %d to %d%s to the clipboard..."
+#: src/callbacks.c:2472
+#, fuzzy, c-format
+msgid "Copying frames %d to %d (with sound) to the clipboard..."
 msgstr "Copie des images %d à %d%s vers le presse-papiers...."
 
-#: src/callbacks.c:2525
+#: src/callbacks.c:2474
+#, fuzzy, c-format
+msgid "Copying frames %d to %d to the clipboard..."
+msgstr "Copie des images %d à %d%s vers le presse-papiers...."
+
+#: src/callbacks.c:2526
 msgid "Copying to the clipboard"
 msgstr "Copie vers le presse-papiers"
 
-#: src/callbacks.c:2600
+#: src/callbacks.c:2601
 msgid "Cut"
 msgstr "Couper"
 
-#: src/callbacks.c:2641 src/callbacks.c:3068 src/callbacks.c:8026
-#, fuzzy
+#: src/callbacks.c:2641 src/callbacks.c:3063 src/callbacks.c:7631
 msgid "Pulling frames from clipboard"
-msgstr "Insère %d%s images depuis le Presse-papiers..."
+msgstr ""
 
 #: src/callbacks.c:2654
 #, c-format
 msgid "Pasting %d frames to new clip %s..."
 msgstr ""
 
-#: src/callbacks.c:2678
+#: src/callbacks.c:2676
 msgid "Pasting"
 msgstr "Collage"
 
-#: src/callbacks.c:2694
+#: src/callbacks.c:2692
 msgid "...added audio..."
 msgstr ""
 
-#: src/callbacks.c:2778
+#: src/callbacks.c:2775
 msgid ""
 "This operation requires resizing or converting of frames.\n"
 "Please install 'convert' from the Image-magick package, and then restart "
 "LiVES.\n"
 msgstr ""
 
-#: src/callbacks.c:2795
+#: src/callbacks.c:2793
 msgid ""
 "\n"
 "\n"
@@ -2106,31 +2098,31 @@
 "Essayez de sélectionner tous les cadres, et d'utiliser ensuite \n"
 "la fonction 'Taille Audio' dans le menu Audio."
 
-#: src/callbacks.c:2819
+#: src/callbacks.c:2817
 msgid ""
 "LiVES cannot insert because the audio rates do not match.\n"
 "Please install 'sox', and try again."
 msgstr ""
 
-#: src/callbacks.c:2838
+#: src/callbacks.c:2835
 msgid ""
 "\n"
 "Insertion will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:2888 src/callbacks.c:11692
+#: src/callbacks.c:2883 src/callbacks.c:11606
 msgid ""
 "\n"
 "Insertion will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:2996 src/callbacks.c:3025
+#: src/callbacks.c:2987 src/callbacks.c:3016
 msgid "Resampling clipboard audio"
 msgstr "Re-échantillonage de l'audio du Presse-papiers"
 
-#: src/callbacks.c:3041
+#: src/callbacks.c:3032
 msgid ""
 "\n"
 "\n"
@@ -2142,7 +2134,7 @@
 "LiVES est incapable de reéchantillonner l'audio du presse-papiers. \n"
 "Le Presse-papiers a été effacé.\n"
 
-#: src/callbacks.c:3055
+#: src/callbacks.c:3045
 msgid ""
 "\n"
 "\n"
@@ -2156,30 +2148,30 @@
 "Voulez-vous continuer avec cette insertion\n"
 "sans modifier l'audio ?\n"
 
-#: src/callbacks.c:3137 src/callbacks.c:3311
+#: src/callbacks.c:3132 src/callbacks.c:3299
 #, c-format
 msgid "Inserting %d%s frames from the clipboard..."
 msgstr "Insère %d%s images depuis le Presse-papiers..."
 
-#: src/callbacks.c:3162 src/callbacks.c:3236 src/callbacks.c:3339
+#: src/callbacks.c:3155 src/callbacks.c:3224 src/callbacks.c:3325
 msgid "Inserting"
 msgstr "Insertion"
 
-#: src/callbacks.c:3193
+#: src/callbacks.c:3187
 #, c-format
 msgid "Inserting %d times from the clipboard%s..."
 msgstr "Insère %d de temps depuis le Presse-papiers%s...."
 
-#: src/callbacks.c:3200
+#: src/callbacks.c:3191
 #, c-format
 msgid "Inserting %d frames from the clipboard%s..."
 msgstr "Insère %d images depuis le Presse-papiers%s...."
 
-#: src/callbacks.c:3418
+#: src/callbacks.c:3404
 msgid "Insert"
 msgstr "Insérer"
 
-#: src/callbacks.c:3486
+#: src/callbacks.c:3471
 msgid ""
 "\n"
 "Deleting all frames will close this file.\n"
@@ -2189,49 +2181,49 @@
 "L'effacement de toutes les images va fermer ce fichier.\n"
 "Êtes-vous certain de vouloir continuer ?"
 
-#: src/callbacks.c:3495
+#: src/callbacks.c:3480
 msgid ""
 "\n"
 "Deletion will cause missing frames in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3515 src/callbacks.c:10920 src/callbacks.c:11162
-#: src/callbacks.c:11228
+#: src/callbacks.c:3500 src/callbacks.c:10851 src/callbacks.c:11087
+#: src/callbacks.c:11152
 msgid ""
 "\n"
 "Deletion will cause missing audio in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3534
+#: src/callbacks.c:3519
 msgid ""
 "\n"
 "Deletion will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3553 src/callbacks.c:11210
+#: src/callbacks.c:3538 src/callbacks.c:11134
 msgid ""
 "\n"
 "Deletion will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3611
+#: src/callbacks.c:3597
 #, c-format
 msgid "Deleting frames %d to %d%s..."
 msgstr "Effacement des images %d à %d%s...."
 
-#: src/callbacks.c:3636
+#: src/callbacks.c:3619
 msgid "Deleting"
 msgstr "Effacement"
 
-#: src/callbacks.c:3717
+#: src/callbacks.c:3699
 msgid "Delete"
 msgstr "Effacer"
 
-#: src/callbacks.c:3738
+#: src/callbacks.c:3717
 msgid ""
 "\n"
 "\n"
@@ -2241,7 +2233,7 @@
 "\n"
 "La sélection est verrouillée.\n"
 
-#: src/callbacks.c:4092
+#: src/callbacks.c:4056
 msgid ""
 "Ready to record. Use 'control' and cursor keys during playback to record "
 "your performance.\n"
@@ -2249,11 +2241,11 @@
 "play.)\n"
 msgstr ""
 
-#: src/callbacks.c:4098
+#: src/callbacks.c:4061
 msgid "Record cancelled.\n"
 msgstr "Enregistrement annulé\n"
 
-#: src/callbacks.c:4237
+#: src/callbacks.c:4197
 #, c-format
 msgid ""
 "\n"
@@ -2266,7 +2258,7 @@
 "Le plugin '%s' a retourné :\n"
 "%s\n"
 
-#: src/callbacks.c:4241
+#: src/callbacks.c:4200
 #, c-format
 msgid ""
 "\n"
@@ -2279,7 +2271,7 @@
 "Impossible de trouver la méthode 'init' dans le plugin %s.\n"
 "Le plugin est défectueux ou mal installé."
 
-#: src/callbacks.c:4571
+#: src/callbacks.c:4532
 #, c-format
 msgid ""
 "Saving the set will cause copies of all loaded clips to remain on the disk"
@@ -2288,22 +2280,22 @@
 "Please press 'Cancel' if that is not what you want.\n"
 msgstr ""
 
-#: src/callbacks.c:4654
+#: src/callbacks.c:4617
 #, c-format
 msgid "Saving set %s"
 msgstr "Sauvegarde %s"
 
-#: src/callbacks.c:5005
+#: src/callbacks.c:4964
 #, c-format
 msgid "Loading clips from set %s"
 msgstr "Chargement des clips depuis %s"
 
-#: src/callbacks.c:5093
+#: src/callbacks.c:5051
 #, c-format
 msgid "%d clips and %d layouts were recovered from set (%s).\n"
 msgstr ""
 
-#: src/callbacks.c:5312
+#: src/callbacks.c:5259
 msgid ""
 "LiVES will attempt to recover some disk space.\n"
 "You should ONLY run this if you have no other copies of LiVES running on "
@@ -2315,24 +2307,24 @@
 "fonctionnant sur cette machine.\n"
 "Appuyer sur OK pour commercer.\n"
 
-#: src/callbacks.c:5317
+#: src/callbacks.c:5264
 msgid "Cleaning up disk space..."
 msgstr "Nettoyage de l'espace disque..."
 
-#: src/callbacks.c:5387
+#: src/callbacks.c:5334
 msgid "Recovering disk space"
 msgstr ""
 
-#: src/callbacks.c:5439
+#: src/callbacks.c:5386
 #, c-format
 msgid "%s of disk space was recovered.\n"
 msgstr ""
 
-#: src/callbacks.c:5482
+#: src/callbacks.c:5428
 msgid "Resetting frame rates and frame values..."
 msgstr ""
 
-#: src/callbacks.c:5523
+#: src/callbacks.c:5469
 #, c-format
 msgid ""
 "\n"
@@ -2340,12 +2332,12 @@
 "Internal: %s (%d bpp) / %s\n"
 msgstr ""
 
-#: src/callbacks.c:5525
+#: src/callbacks.c:5471
 msgid "buffered"
 msgstr ""
 
-#: src/callbacks.c:5538 src/callbacks.c:5557 src/callbacks.c:5575
-#: src/callbacks.c:5609
+#: src/callbacks.c:5484 src/callbacks.c:5502 src/callbacks.c:5518
+#: src/callbacks.c:5551
 msgid ""
 "\n"
 "  Opening..."
@@ -2353,7 +2345,7 @@
 "\n"
 "  Ouverture..."
 
-#: src/callbacks.c:5545
+#: src/callbacks.c:5490
 #, c-format
 msgid ""
 "\n"
@@ -2362,7 +2354,7 @@
 "\n"
 "(%d virtuaux)"
 
-#: src/callbacks.c:5548
+#: src/callbacks.c:5493
 #, c-format
 msgid ""
 "\n"
@@ -2371,7 +2363,7 @@
 "\n"
 "(%d decodés)"
 
-#: src/callbacks.c:5560 src/callbacks.c:5578 src/callbacks.c:5612
+#: src/callbacks.c:5504 src/callbacks.c:5520 src/callbacks.c:5553
 #, c-format
 msgid ""
 "\n"
@@ -2380,7 +2372,7 @@
 "\n"
 "  %.2f sec."
 
-#: src/callbacks.c:5569
+#: src/callbacks.c:5512
 msgid ""
 "\n"
 "  Unknown"
@@ -2388,23 +2380,23 @@
 "\n"
 "  Inconnu"
 
-#: src/callbacks.c:5582 src/callbacks.c:5596
+#: src/callbacks.c:5524 src/callbacks.c:5538
 msgid "unsigned"
 msgstr ""
 
-#: src/callbacks.c:5583 src/callbacks.c:5597
+#: src/callbacks.c:5525 src/callbacks.c:5539
 msgid "signed"
 msgstr "signé"
 
-#: src/callbacks.c:5585 src/callbacks.c:5599
+#: src/callbacks.c:5527 src/callbacks.c:5541
 msgid "big-endian"
 msgstr ""
 
-#: src/callbacks.c:5586 src/callbacks.c:5600
+#: src/callbacks.c:5528 src/callbacks.c:5542
 msgid "little-endian"
 msgstr ""
 
-#: src/callbacks.c:5588 src/callbacks.c:5602
+#: src/callbacks.c:5530 src/callbacks.c:5544
 #, c-format
 msgid ""
 "  %d Hz %d bit\n"
@@ -2413,7 +2405,7 @@
 "  %d Hz %d bit\n"
 "%s %s"
 
-#: src/callbacks.c:5707
+#: src/callbacks.c:5647
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -2430,27 +2422,27 @@
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA.\n"
 msgstr ""
 
-#: src/callbacks.c:5721
+#: src/callbacks.c:5661
 msgid "A video editor and VJ program."
 msgstr "Un éditeur de vidéo et VJ programme."
 
-#: src/callbacks.c:5722
+#: src/callbacks.c:5662
 msgid "About LiVES"
-msgstr ""
+msgstr "À propos de LiVES"
 
-#: src/callbacks.c:5724
+#: src/callbacks.c:5664
 msgid "translator_credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Guybrush88 https://launchpad.net/~guybrush\n"
-"  Mathieu MD https://launchpad.net/~mathieu.md\n"
+"  Jean Marc https://launchpad.net/~m-balthazar\n"
 "  Nicolas Chauvet https://launchpad.net/~kwizart\n"
-"  Pierre Slamich https://launchpad.net/~pierre-slamich\n"
-"  Vincent Lhote https://launchpad.net/~vincent.lhote\n"
-"  little jo https://launchpad.net/~littel-jo\n"
+"  Nicolas Delvaux https://launchpad.net/~malizor\n"
+"  Sylvie Gallet https://launchpad.net/~sylvie-gallet\n"
+"  Vincent Hatakeyama https://launchpad.net/~vincent.lhote\n"
 "  salsaman https://launchpad.net/~salsaman"
 
-#: src/callbacks.c:5758
+#: src/callbacks.c:5699
 #, c-format
 msgid ""
 "LiVES Version %s\n"
@@ -2464,7 +2456,7 @@
 "Homepage: http://lives.sourceforge.net"
 msgstr ""
 
-#: src/callbacks.c:6037
+#: src/callbacks.c:5996
 #, fuzzy
 msgid ""
 "\n"
@@ -2475,7 +2467,7 @@
 "\n"
 "Vous devez installer Mplayer pour pouvoir visionner ce fichier.\n"
 
-#: src/callbacks.c:6040
+#: src/callbacks.c:5998
 #, fuzzy
 msgid ""
 "\n"
@@ -2487,249 +2479,236 @@
 "\n"
 "Vous devez installer Mplayer pour pouvoir visionner ce fichier.\n"
 
-#: src/callbacks.c:6423 src/callbacks.c:8289
-msgid ""
-"\n"
-"Loading new audio may cause missing audio in some multitrack layouts.\n"
-"Are you sure you wish to continue ?\n"
-"."
-msgstr ""
-
-#: src/callbacks.c:6523
-#, c-format
-msgid "Opening audio %s, type %s..."
-msgstr "Ouverture de l'audio %s, type %s...."
-
-#: src/callbacks.c:6556 src/saveplay.c:480
-msgid "Opening audio"
-msgstr "Ouverture de l'audio"
-
-#: src/callbacks.c:6565 src/callbacks.c:6612 src/callbacks.c:8387
-#: src/callbacks.c:8429 src/callbacks.c:8472 src/callbacks.c:10846
-msgid "Cancelling"
-msgstr "Annulation"
-
-#: src/callbacks.c:6660 src/callbacks.c:8514 src/callbacks.c:10876
-#: src/callbacks.c:11563
-msgid "Committing audio"
-msgstr "Validation du son"
-
-#: src/callbacks.c:6672 src/callbacks.c:8546
-msgid "New Audio"
-msgstr "Nouveau Audio"
-
-#: src/callbacks.c:6779
+#: src/callbacks.c:6459
 #, c-format
 msgid ""
 "Text was saved as\n"
 "%s\n"
 msgstr ""
 
-#: src/callbacks.c:6951 src/saveplay.c:3618
-#, c-format
-msgid "%d frames are enough !\n"
-msgstr "%d images sont en trop !\n"
-
-#: src/callbacks.c:7050
+#: src/callbacks.c:6706
 msgid "LiVES: - Encoder debug output"
 msgstr ""
 
-#: src/callbacks.c:7087 src/gui.c:1922
+#: src/callbacks.c:6743 src/gui.c:1921
 msgid "Fullscreen playback (f)"
 msgstr "Lecture plein Écran (f)"
 
-#: src/callbacks.c:7089
+#: src/callbacks.c:6744
 msgid "Fullscreen playback off (f)"
 msgstr "Lecture plein Écran (f)"
 
-#: src/callbacks.c:7188 src/callbacks.c:7336 src/callbacks.c:7664
-#: src/callbacks.c:7681 src/gui.c:3712 src/saveplay.c:2467 src/saveplay.c:2501
-#: src/saveplay.c:3115 src/saveplay.c:3220 src/saveplay.c:3239
-#: src/multitrack.c:9340 src/multitrack.c:11060
+#: src/callbacks.c:6841 src/callbacks.c:6983 src/callbacks.c:7283
+#: src/callbacks.c:7298 src/gui.c:3838 src/saveplay.c:2442 src/saveplay.c:2475
+#: src/saveplay.c:3074 src/saveplay.c:3178 src/saveplay.c:3197
+#: src/multitrack.c:9526 src/multitrack.c:11288
 #, c-format
 msgid " (%d %% scale)"
 msgstr ""
 
-#: src/callbacks.c:7190 src/callbacks.c:7338 src/callbacks.c:7666
-#: src/gui.c:3716 src/saveplay.c:2469 src/saveplay.c:2503
+#: src/callbacks.c:6843 src/callbacks.c:6985 src/callbacks.c:7285
+#: src/gui.c:3842 src/saveplay.c:2444 src/saveplay.c:2477
 #, c-format
 msgid "LiVES: - Play Window%s"
 msgstr ""
 
-#: src/callbacks.c:7302 src/gui.c:1907
+#: src/callbacks.c:6950 src/gui.c:1906
 msgid "Double size (d)"
 msgstr "Taille Double (d)"
 
-#: src/callbacks.c:7309
+#: src/callbacks.c:6956
 msgid "Single size (d)"
 msgstr "Taille simple (d)"
 
-#: src/callbacks.c:7442 src/callbacks.c:7443
+#: src/callbacks.c:7087 src/callbacks.c:7088
 msgid "Hide the play window (s)"
 msgstr "Cacher la Fenêtre de Lecture (s)"
 
-#: src/callbacks.c:7452 src/gui.c:1746
+#: src/callbacks.c:7096 src/gui.c:1744
 msgid "Show the play window (s)"
 msgstr "Afficher la Fenêtre de Lecture (s)"
 
-#: src/callbacks.c:7453 src/gui.c:1896
+#: src/callbacks.c:7097 src/gui.c:1895
 msgid "Play in separate window (s)"
 msgstr "Lecture dans une Fenêtre séparée (s)"
 
-#: src/callbacks.c:7535 src/gui.c:4060 src/saveplay.c:2498
+#: src/callbacks.c:7175 src/gui.c:4169 src/saveplay.c:2472
 msgid "LiVES: - Streaming"
 msgstr ""
 
-#: src/callbacks.c:7778
+#: src/callbacks.c:7388
 msgid "Switch continuous looping off (o)"
 msgstr "Passer en boucle continue (o)"
 
-#: src/callbacks.c:7785 src/gui.c:1795
+#: src/callbacks.c:7394 src/gui.c:1793
 msgid "Switch continuous looping on (o)"
 msgstr "Passer en boucle continue (o)"
 
-#: src/callbacks.c:7837
+#: src/callbacks.c:7444
 #, c-format
 msgid "Audio volume (%.2f)"
 msgstr "Volume audio (%.2f)"
 
-#: src/callbacks.c:7876 src/callbacks.c:7877 src/gui.c:3640
+#: src/callbacks.c:7483 src/callbacks.c:7484 src/gui.c:3766
 msgid "Unmute the audio (z)"
 msgstr "Activer ll'audio (z)"
 
-#: src/callbacks.c:7888 src/callbacks.c:7889 src/gui.c:1808 src/gui.c:3639
+#: src/callbacks.c:7494 src/callbacks.c:7495 src/gui.c:1806 src/gui.c:3765
 msgid "Mute the audio (z)"
 msgstr "Désactiver l'audio (z)"
 
-#: src/callbacks.c:8038
+#: src/callbacks.c:7643
 msgid "Reversing clipboard..."
 msgstr "Inversement du Presse-papiers..."
 
-#: src/callbacks.c:8052
+#: src/callbacks.c:7657
 msgid "Reversing clipboard"
 msgstr "Inversement du presse-papiers"
 
-#: src/callbacks.c:8084
+#: src/callbacks.c:7689
 msgid "LiVES: Load subtitles from..."
 msgstr ""
 
-#: src/callbacks.c:8151 src/saveplay.c:970
+#: src/callbacks.c:7753 src/saveplay.c:956
 #, c-format
 msgid "Loaded subtitle file: %s\n"
 msgstr ""
 
-#: src/callbacks.c:8220
+#: src/callbacks.c:7821
 msgid "Subtitles were erased.\n"
 msgstr ""
 
-#: src/callbacks.c:8239
+#: src/callbacks.c:7843
 msgid "LiVES: - Select Audio File"
 msgstr ""
 
-#: src/callbacks.c:8250
+#: src/callbacks.c:7878 src/callbacks.c:8232
+msgid ""
+"\n"
+"Loading new audio may cause missing audio in some multitrack layouts.\n"
+"Are you sure you wish to continue ?\n"
+"."
+msgstr ""
+
+#: src/callbacks.c:7989
+#, c-format
+msgid "Opening audio %s, type %s..."
+msgstr "Ouverture de l'audio %s, type %s...."
+
+#: src/callbacks.c:8023 src/saveplay.c:477
+msgid "Opening audio"
+msgstr "Ouverture de l'audio"
+
+#: src/callbacks.c:8032 src/callbacks.c:8083 src/callbacks.c:8327
+#: src/callbacks.c:8369 src/callbacks.c:8412 src/callbacks.c:10766
+msgid "Cancelling"
+msgstr "Annulation"
+
+#: src/callbacks.c:8137 src/callbacks.c:8454 src/callbacks.c:10803
+#: src/callbacks.c:11477
+msgid "Committing audio"
+msgstr "Validation du son"
+
+#: src/callbacks.c:8153 src/callbacks.c:8484
+msgid "New Audio"
+msgstr "Nouveau Audio"
+
+#: src/callbacks.c:8194
 msgid "Please set your CD play device in Tools | Preferences | Misc\n"
 msgstr "Indiquez SVP votre lecteur CD dans Outils | Préférences | Divers\n"
 
-#: src/callbacks.c:8321
+#: src/callbacks.c:8264
 #, c-format
 msgid "Opening CD track %d from %s..."
 msgstr "Ouverture de la piste %d en provenance du CD %s..."
 
-#: src/callbacks.c:8326
+#: src/callbacks.c:8267
 #, c-format
 msgid "CD track %d"
 msgstr "Piste CD %d"
 
-#: src/callbacks.c:8373
+#: src/callbacks.c:8313
 msgid "Opening CD track..."
 msgstr "Ouverture de la piste CD...."
 
-#: src/callbacks.c:8415 src/callbacks.c:8461
+#: src/callbacks.c:8355 src/callbacks.c:8401
 msgid "Error loading CD track\n"
 msgstr "Erreur lors du chargement de la piste du CD\n"
 
-#: src/callbacks.c:8584
+#: src/callbacks.c:8518
 msgid "layout errors"
 msgstr "Erreurs de sortie"
 
-#: src/callbacks.c:8595
+#: src/callbacks.c:8529
 msgid "Close _Window"
 msgstr "Ferme La _Fenêtre"
 
-#: src/callbacks.c:8606
+#: src/callbacks.c:8540
 msgid "Clear _Errors"
 msgstr "Efface Les _Fautes"
 
-#: src/callbacks.c:8617
+#: src/callbacks.c:8551
 msgid "_Delete affected layouts"
 msgstr "_Supprime les dispositions concernées"
 
-#: src/callbacks.c:9343 src/callbacks.c:9388
+#: src/callbacks.c:9253 src/callbacks.c:9298
 msgid "Resume"
 msgstr "Reprendre"
 
-#: src/callbacks.c:9344
+#: src/callbacks.c:9254
 msgid ""
 "\n"
 "Paused\n"
 "(click Resume to continue processing)"
 msgstr ""
 
-#: src/callbacks.c:9345 src/callbacks.c:9406
+#: src/callbacks.c:9255 src/callbacks.c:9315
 msgid "paused..."
 msgstr "en attente..."
 
-#: src/callbacks.c:9372 src/callbacks.c:9418
-msgid "Pause"
-msgstr "Pause"
-
-#: src/callbacks.c:9374 src/callbacks.c:9421
+#: src/callbacks.c:9284 src/callbacks.c:9333
 msgid "resumed..."
 msgstr "reprise..."
 
-#: src/callbacks.c:9393
+#: src/callbacks.c:9303
 msgid "Keep"
 msgstr "Garder"
 
-#: src/callbacks.c:9396
+#: src/callbacks.c:9305
 msgid "Enough"
 msgstr ""
 
-#: src/callbacks.c:9401
-#, fuzzy, c-format
+#: src/callbacks.c:9310
+#, c-format
 msgid ""
 "\n"
 "Paused\n"
 "(click %s to keep what you have and stop)\n"
 "(click Resume to continue processing)"
 msgstr ""
-"\n"
-"En attente\n"
-"('Garder' pour garder ce qu'il y a et Arrêter)\n"
-"('Reprendre' pour continuer le traitement)"
 
-#: src/callbacks.c:9419
+#: src/callbacks.c:9331
 msgid "Cancel"
 msgstr "Annuler"
 
-#: src/callbacks.c:9558
+#: src/callbacks.c:9478
 msgid "Stop"
-msgstr ""
+msgstr "Arrêter"
 
-#: src/callbacks.c:10053 src/multitrack.c:13247
+#: src/callbacks.c:9968 src/multitrack.c:13489
 msgid "LiVES: Selected frame"
 msgstr "LiVES: Image sélectionnée"
 
-#: src/callbacks.c:10061
+#: src/callbacks.c:9976
 msgid "_Save frame as..."
 msgstr ""
 
-#: src/callbacks.c:10290
+#: src/callbacks.c:10202
 #, c-format
 msgid "Audio is ahead of video by %.4f secs. at frame %d, with fps %.4f\n"
 msgstr ""
 
-#: src/callbacks.c:10347
+#: src/callbacks.c:10255
 msgid ""
 "\n"
 "\n"
@@ -2738,7 +2717,7 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10353
+#: src/callbacks.c:10261
 msgid ""
 "\n"
 "\n"
@@ -2751,7 +2730,7 @@
 "fonctionnalité\n"
 "\n"
 
-#: src/callbacks.c:10429 src/callbacks.c:11479
+#: src/callbacks.c:10334 src/callbacks.c:11395
 msgid ""
 "\n"
 "Record time must be greater than 0.\n"
@@ -2759,7 +2738,7 @@
 "\n"
 "La nouvelle vitesse doit être supérieure à 0\n"
 
-#: src/callbacks.c:10440
+#: src/callbacks.c:10346
 msgid ""
 "Capture an External Window:\n"
 "\n"
@@ -2773,17 +2752,17 @@
 "Cliquez 'Annuler' pour annuler\n"
 "\n"
 
-#: src/callbacks.c:10445
+#: src/callbacks.c:10351
 msgid "External window was released.\n"
 msgstr "La fenêtre extérieure a été 'released'.\n"
 
-#: src/callbacks.c:10479
+#: src/callbacks.c:10385
 msgid ""
 "Click on a Window to Capture it\n"
 "Press 'q' to stop recording"
 msgstr ""
 
-#: src/callbacks.c:10513
+#: src/callbacks.c:10419
 #, c-format
 msgid ""
 "\n"
@@ -2799,19 +2778,19 @@
 "Arrêter ou 'q' pour terminer.\n"
 "(La valeur par défaut de %.3f images par seconde est utilisée.)\n"
 
-#: src/callbacks.c:10539
+#: src/callbacks.c:10443
 msgid "LiVES was unable to capture this window. Sorry.\n"
 msgstr "LiVES ne peut capturer cette fenêtre, Désolé.\n"
 
-#: src/callbacks.c:10695
+#: src/callbacks.c:10601
 msgid "Export Selected Audio as..."
 msgstr "Exporte Audio Sélectionné sous...."
 
-#: src/callbacks.c:10699
+#: src/callbacks.c:10604
 msgid "Export Audio as..."
 msgstr "Exporte Audio sous..."
 
-#: src/callbacks.c:10714
+#: src/callbacks.c:10619
 msgid ""
 "\n"
 "\n"
@@ -2825,86 +2804,86 @@
 "Cliquez 'OK' pour l'exporter à la nouvelle vitesse ou 'Annuler' pour "
 "l'exporter à la vitesse originale.\n"
 
-#: src/callbacks.c:10720
+#: src/callbacks.c:10625
 #, c-format
 msgid "Exporting audio frames %d to %d as %s..."
 msgstr "Exportation du son de la position %d à %d sous %s...."
 
-#: src/callbacks.c:10725
+#: src/callbacks.c:10629
 #, c-format
 msgid "Exporting audio as %s..."
 msgstr "Exporte son sous %s...."
 
-#: src/callbacks.c:10751
+#: src/callbacks.c:10655
 msgid "Exporting audio"
 msgstr "Exportation du son"
 
-#: src/callbacks.c:10782
+#: src/callbacks.c:10695
 msgid "LiVES: - Append Audio File"
 msgstr ""
 
-#: src/callbacks.c:10825
+#: src/callbacks.c:10739
 #, c-format
 msgid "Appending audio file %s..."
 msgstr "Ajout du fichier son %s..."
 
-#: src/callbacks.c:10836
+#: src/callbacks.c:10756
 msgid "Appending audio"
 msgstr "Ajout du fichier son"
 
-#: src/callbacks.c:10892
+#: src/callbacks.c:10818
 msgid "Append Audio"
 msgstr "Ajouter Audio"
 
-#: src/callbacks.c:10952
+#: src/callbacks.c:10883
 #, c-format
 msgid "Padding audio to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10954
+#: src/callbacks.c:10885
 #, c-format
 msgid "Trimming audio from %.2f to %.2f seconds..."
 msgstr "Ajuste audio de %.2f à %.2f secondes..."
 
-#: src/callbacks.c:10973
+#: src/callbacks.c:10904
 msgid "Trimming/Padding audio"
 msgstr "Ajustement/Complément audio"
 
-#: src/callbacks.c:10981
+#: src/callbacks.c:10912
 msgid "Trim/Pad Audio"
 msgstr "Ajuste/Délaie Audio"
 
-#: src/callbacks.c:11055
+#: src/callbacks.c:10982
 msgid "Fading audio in"
 msgstr "Fondu audio entrant"
 
-#: src/callbacks.c:11056
+#: src/callbacks.c:10983
 msgid "Fade audio in"
 msgstr "Fondu audio entrée"
 
-#: src/callbacks.c:11061
+#: src/callbacks.c:10987
 msgid "Fading audio out"
 msgstr "Fondu audio sortant"
 
-#: src/callbacks.c:11062
+#: src/callbacks.c:10988
 msgid "Fade audio out"
 msgstr "Fondu audio sortie"
 
-#: src/callbacks.c:11085
+#: src/callbacks.c:11011
 #, c-format
 msgid "%s over %.1f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11087
+#: src/callbacks.c:11013
 #, c-format
 msgid "%s from time %.2f seconds to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11094
+#: src/callbacks.c:11020
 msgid "Fading audio..."
 msgstr "Fondu audio..."
 
-#: src/callbacks.c:11194
+#: src/callbacks.c:11119
 msgid ""
 "\n"
 "Deleting all audio will close this file.\n"
@@ -2914,47 +2893,47 @@
 "L'effacement complet de l'audio va fermer ce fichier.\n"
 "Êtes-vous certain de vouloir continuer ?"
 
-#: src/callbacks.c:11197
+#: src/callbacks.c:11122
 msgid "Deleting all audio..."
 msgstr "Efface complet de l'audio..."
 
-#: src/callbacks.c:11203
+#: src/callbacks.c:11127
 #, c-format
 msgid "Deleting audio from %.2f to %.2f seconds..."
 msgstr "Effacement de l'audio de %.2f à %.2f secondes..."
 
-#: src/callbacks.c:11290
+#: src/callbacks.c:11214
 msgid "Deleting Audio"
 msgstr "Effacement du son"
 
-#: src/callbacks.c:11297
+#: src/callbacks.c:11221
 msgid "Delete Audio"
 msgstr "Efface Audio"
 
-#: src/callbacks.c:11636
+#: src/callbacks.c:11550
 msgid "Record new audio"
 msgstr "Enregistre de nouvel audio"
 
-#: src/callbacks.c:11725
+#: src/callbacks.c:11640
 #, c-format
 msgid "Inserting silence from %.2f to %.2f seconds..."
 msgstr "Insertion d'un silence de %.2f à %.2f secondes..."
 
-#: src/callbacks.c:11754
+#: src/callbacks.c:11666
 msgid "Inserting Silence"
 msgstr "Insertion Silence"
 
-#: src/merge.c:85
+#: src/merge.c:96
 msgid "LiVES: - Merge"
 msgstr "LiVES: - Union"
 
-#: src/merge.c:102
+#: src/merge.c:113
 #, c-format
 msgid "Merge Clipboard [ %d Frames ]       With Selection [ %d Frames ]"
 msgstr ""
 "Fusionner Presse-papiers [ %d Images ]       Avec la sélection [ %d Images ]"
 
-#: src/merge.c:107
+#: src/merge.c:118
 #, c-format
 msgid ""
 "Merge Clipboard [ %d Frames (resampled) ]       With Selection [ %d Frames ]"
@@ -2962,904 +2941,904 @@
 "Fusionner Presse-papiers [ %d Images (reéchantillonnées]       Avec la "
 "sélection [ %d Images ]"
 
-#: src/merge.c:118
+#: src/merge.c:130
 msgid "Align _Starts"
 msgstr "Aligner Début"
 
-#: src/merge.c:123
+#: src/merge.c:135
 msgid "Align _Ends"
 msgstr "Aligner Fin"
 
-#: src/merge.c:134
+#: src/merge.c:146
 msgid "What to do with extra clipboard frames -"
 msgstr "Que faire des images en plus du presse-papiers -"
 
-#: src/merge.c:137
+#: src/merge.c:149
 msgid "_Insert Frames"
 msgstr "_Insérer Images"
 
-#: src/merge.c:143
+#: src/merge.c:155
 msgid "_Drop Frames"
 msgstr "_Ignorer images"
 
-#: src/merge.c:149
+#: src/merge.c:160
 msgid "Number of Times to Loop Clipboard"
 msgstr "Nombre de relectures du Presse-papiers"
 
-#: src/merge.c:160
+#: src/merge.c:171
 msgid "_Loop Clipboard to Fit Selection"
 msgstr "Répéter _le Presse-papiers pour Correspondre à la Sélection"
 
-#: src/merge.c:173
+#: src/merge.c:184
 msgid "_Transition Method:"
 msgstr "Méthode de _Transition :"
 
-#: src/merge.c:394
+#: src/merge.c:395
 msgid "Merging clipboard with selection..."
 msgstr "Jonction du presse-papiers avec la sélection..."
 
-#: src/merge.c:551
+#: src/merge.c:539
 msgid "Merge done.\n"
 msgstr "Fusion terminée.\n"
 
-#: src/gui.c:123
+#: src/gui.c:122
 msgid "_Custom Generators"
 msgstr ""
 
-#: src/gui.c:124
+#: src/gui.c:123
 msgid "_Custom Effects"
 msgstr "Effets Personnalisés"
 
-#: src/gui.c:125
+#: src/gui.c:124
 msgid "Custom _Utilities"
 msgstr "_Utilitaires Personnalisés"
 
-#: src/gui.c:352 src/multitrack.c:5964
+#: src/gui.c:351 src/multitrack.c:6143
 msgid "_File"
 msgstr "_Fichier"
 
-#: src/gui.c:367 src/multitrack.c:5989
+#: src/gui.c:366 src/multitrack.c:6168
 msgid "_Open File/Directory"
 msgstr "_Ouvre Fichier/Répertoire"
 
-#: src/gui.c:373
+#: src/gui.c:372
 msgid "O_pen Part of File..."
 msgstr ""
 
-#: src/gui.c:379 src/gui.c:383 src/multitrack.c:6006 src/multitrack.c:6023
-#: src/multitrack.c:6028
+#: src/gui.c:378 src/gui.c:382 src/multitrack.c:6185 src/multitrack.c:6202
+#: src/multitrack.c:6207
 msgid "Open _Location/Stream..."
 msgstr "Ouvrir URL/Stream..."
 
-#: src/gui.c:393 src/multitrack.c:6016
+#: src/gui.c:392 src/multitrack.c:6195
 msgid "Open _Youtube Clip..."
 msgstr ""
 
-#: src/gui.c:404
+#: src/gui.c:403
 msgid "Import from _dvd/vcd..."
 msgstr ""
 
-#: src/gui.c:413
+#: src/gui.c:412
 msgid "Import from _dvd"
 msgstr ""
 
-#: src/gui.c:416
+#: src/gui.c:415
 msgid "Import from _vcd"
 msgstr ""
 
-#: src/gui.c:419
+#: src/gui.c:418
 msgid "_Import from Firewire"
 msgstr ""
 
-#: src/gui.c:428 src/multitrack.c:6086
+#: src/gui.c:427 src/multitrack.c:6265
 msgid "Import from _Firewire Device (dv)"
 msgstr "Importe depuis _Firewire périphérique (dv)"
 
-#: src/gui.c:429 src/multitrack.c:6094
+#: src/gui.c:428 src/multitrack.c:6273
 msgid "Import from _Firewire Device (hdv)"
 msgstr "Importe depuis _Firewire périphérique (hdv)"
 
-#: src/gui.c:457
+#: src/gui.c:456
 msgid "_Add Webcam/TV card..."
 msgstr ""
 
-#: src/gui.c:476
+#: src/gui.c:475
 msgid "Add _Unicap Device"
 msgstr ""
 
-#: src/gui.c:486
+#: src/gui.c:485
 msgid "Add Live _Firewire Device"
 msgstr ""
 
-#: src/gui.c:495
+#: src/gui.c:494
 msgid "Add _TV Device"
 msgstr ""
 
-#: src/gui.c:510 src/multitrack.c:6117
+#: src/gui.c:509 src/multitrack.c:6296
 msgid "_Recent Files..."
 msgstr "Fichiers _Récents...."
 
-#: src/gui.c:560 src/multitrack.c:6177
+#: src/gui.c:559 src/multitrack.c:6356
 msgid "_Reload Clip Set..."
 msgstr ""
 
-#: src/gui.c:564 src/multitrack.c:6185
+#: src/gui.c:563 src/multitrack.c:6364
 msgid "Close/Sa_ve All Clips"
 msgstr "Ferme / _Enregistre Tous Les Clips"
 
-#: src/gui.c:575
+#: src/gui.c:574
 msgid "_Encode Clip As..."
 msgstr ""
 
-#: src/gui.c:577
+#: src/gui.c:576
 msgid "Encode _Selection As..."
 msgstr ""
 
-#: src/gui.c:584
+#: src/gui.c:583
 msgid "_Close This Clip"
 msgstr "_Ferme Ce Clip"
 
-#: src/gui.c:595
+#: src/gui.c:594
 msgid "_Backup Clip as .lv1..."
 msgstr ""
 
-#: src/gui.c:604
+#: src/gui.c:603
 msgid "_Restore Clip from .lv1..."
 msgstr ""
 
-#: src/gui.c:615
+#: src/gui.c:614
 msgid "Encode/Load/Backup _with Sound"
 msgstr ""
 
-#: src/gui.c:620
+#: src/gui.c:619
 msgid "Auto load subtitles"
 msgstr ""
 
-#: src/gui.c:628 src/multitrack.c:6224
+#: src/gui.c:627 src/multitrack.c:6403
 msgid "Clean _up Diskspace"
 msgstr "Nettoyage de l'espace disque"
 
-#: src/gui.c:636 src/multitrack.c:6257
+#: src/gui.c:635 src/multitrack.c:6436
 msgid "_Edit"
 msgstr "_Édition"
 
-#: src/gui.c:685
+#: src/gui.c:684
 msgid "_MULTITRACK mode"
 msgstr "Mode multipistes"
 
-#: src/gui.c:696
+#: src/gui.c:695
 msgid "_Copy Selection"
 msgstr "_Copier Sélection"
 
-#: src/gui.c:705
+#: src/gui.c:704
 msgid "Cu_t Selection"
 msgstr "_Couper Sélection"
 
-#: src/gui.c:714
+#: src/gui.c:713
 msgid "_Insert from Clipboard..."
 msgstr "_Insérer depuis le Presse-papiers..."
 
-#: src/gui.c:730
+#: src/gui.c:729
 msgid "Paste as _New"
 msgstr "Coller comme _Nouveau"
 
-#: src/gui.c:739
+#: src/gui.c:738
 msgid "_Merge Clipboard with Selection..."
 msgstr "_Joindre le Presse-papiers avec la Sélection...."
 
-#: src/gui.c:746
+#: src/gui.c:745
 msgid "_Delete Selection"
 msgstr "_Effacer Sélection"
 
-#: src/gui.c:764
+#: src/gui.c:763
 msgid "Decouple _Video from Audio"
 msgstr "Dissocier _Vidéo de l'Audio"
 
-#: src/gui.c:772
+#: src/gui.c:771
 msgid "_Select..."
 msgstr "_Sélectionner..."
 
-#: src/gui.c:786
+#: src/gui.c:785
 msgid "Select _All Frames"
 msgstr "Sélectionner toutes les Images..."
 
-#: src/gui.c:794
+#: src/gui.c:793
 msgid "_Start Frame Only"
 msgstr "Première Image seulement"
 
-#: src/gui.c:802
+#: src/gui.c:801
 msgid "_End Frame Only"
 msgstr "_Dernière Image seulement"
 
-#: src/gui.c:813
+#: src/gui.c:812
 msgid "Select from _First Frame"
 msgstr "Sélection à partir de la première Image"
 
-#: src/gui.c:817
+#: src/gui.c:816
 msgid "Select to _Last Frame"
 msgstr "Sélection jusqu'à la Dernière Image"
 
-#: src/gui.c:821
+#: src/gui.c:820
 msgid "Select Last Insertion/_Merge"
 msgstr "Sélection dernière Insertion/Fusion"
 
-#: src/gui.c:825
+#: src/gui.c:824
 msgid "Select Last _Effect"
 msgstr "Sélection dernier _Effet"
 
-#: src/gui.c:829
+#: src/gui.c:828
 msgid "_Invert Selection"
 msgstr "_Inverser Sélection"
 
-#: src/gui.c:837
+#: src/gui.c:836
 msgid "_Lock Selection Width"
 msgstr "Verrouiller _Largeur Sélection"
 
-#: src/gui.c:842 src/multitrack.c:6409
+#: src/gui.c:841 src/multitrack.c:6591
 msgid "_Play"
 msgstr "_Lecture"
 
-#: src/gui.c:854
+#: src/gui.c:853
 msgid "_Play All"
 msgstr "Lecture Tout"
 
-#: src/gui.c:869
+#: src/gui.c:868
 msgid "Pla_y Selection"
 msgstr "Lecture Sélection"
 
-#: src/gui.c:877
+#: src/gui.c:876
 msgid "Play _Clipboard"
 msgstr "Lecture Presse-papiers"
 
-#: src/gui.c:899 src/multitrack.c:6441
+#: src/gui.c:898 src/multitrack.c:6623
 msgid "_Stop"
 msgstr "_Arrêter"
 
-#: src/gui.c:914 src/multitrack.c:6453
+#: src/gui.c:913 src/multitrack.c:6635
 msgid "Re_wind"
 msgstr "Rembobiner"
 
-#: src/gui.c:946 src/multitrack.c:6471
+#: src/gui.c:945 src/multitrack.c:6653
 msgid "_Full Screen"
 msgstr "_Plein Écran"
 
-#: src/gui.c:955
+#: src/gui.c:954
 msgid "_Double Size"
 msgstr "Taille Double"
 
-#: src/gui.c:963 src/multitrack.c:6479
+#: src/gui.c:962 src/multitrack.c:6661
 msgid "Play in _Separate Window"
 msgstr "Lecture dans une Fenêtre _Séparée"
 
-#: src/gui.c:972
+#: src/gui.c:971
 msgid "_Blank Background"
 msgstr "_Cacher Arrière Plan"
 
-#: src/gui.c:979
+#: src/gui.c:978
 msgid "(Auto)_loop Video (to fit audio track)"
 msgstr "(Auto)relecture Vidéo (pour correspondre à la piste audio)"
 
-#: src/gui.c:988 src/multitrack.c:6487
+#: src/gui.c:987 src/multitrack.c:6669
 msgid "L_oop Continuously"
 msgstr "Lecture Continue"
 
-#: src/gui.c:997
+#: src/gui.c:996
 msgid "Pin_g Pong Loops"
 msgstr "Pin_g Pong (Lecture Continue)"
 
-#: src/gui.c:1005 src/multitrack.c:6495
+#: src/gui.c:1004 src/multitrack.c:6677
 msgid "_Mute"
 msgstr "_Muet"
 
-#: src/gui.c:1017
+#: src/gui.c:1016
 msgid "Separate Window 'S_ticky' Mode"
 msgstr "Fenêtre mode 'S_ticky' séparée"
 
-#: src/gui.c:1025
+#: src/gui.c:1024
 msgid "S_how Frame Counter"
 msgstr "Afficher Compteur d'Image_s"
 
-#: src/gui.c:1035
+#: src/gui.c:1034
 msgid "Show Subtitles"
 msgstr ""
 
-#: src/gui.c:1045
+#: src/gui.c:1044
 msgid "Letterbox mode"
 msgstr ""
 
-#: src/gui.c:1051 src/multitrack.c:6507
+#: src/gui.c:1050 src/multitrack.c:6689
 msgid "Effect_s"
 msgstr "Effet_s"
 
-#: src/gui.c:1054
+#: src/gui.c:1053
 msgid "Effects are applied to the current selection."
 msgstr "Les effets sont appliqués à la sélection actuelle."
 
-#: src/gui.c:1067
+#: src/gui.c:1066
 msgid "_Run Test Rendered Effect/Tool/Generator..."
 msgstr ""
 
-#: src/gui.c:1072 src/multitrack.c:7123
+#: src/gui.c:1071 src/multitrack.c:7299
 msgid "_Tools"
 msgstr "_Outils"
 
-#: src/gui.c:1075
+#: src/gui.c:1074
 msgid "Tools are applied to complete clips."
 msgstr "Les outils s'appliquent aux clips en entier."
 
-#: src/gui.c:1085
+#: src/gui.c:1084
 msgid "_Reverse Clipboard"
 msgstr "Inve_rser contenu Presse-papiers"
 
-#: src/gui.c:1094
+#: src/gui.c:1093
 msgid "_Change Playback/Save Speed..."
 msgstr "_Change la vitesse de Playback/Sauvegarde"
 
-#: src/gui.c:1099
+#: src/gui.c:1098
 msgid "Resample _Video to New Frame Rate..."
 msgstr "Reéchantillonner la _Vidéo avec la Nouvelle Vitesse..."
 
-#: src/gui.c:1105
+#: src/gui.c:1104
 msgid "_Utilities"
 msgstr "_Utilitaires"
 
-#: src/gui.c:1110
+#: src/gui.c:1109
 msgid "Custom _Tools"
 msgstr "Outils Personnalisés"
 
-#: src/gui.c:1116 src/multitrack.c:7149
+#: src/gui.c:1115 src/multitrack.c:7325
 msgid "_Generate"
 msgstr "_Génère"
 
-#: src/gui.c:1126
+#: src/gui.c:1125
 msgid "Loading rendered effect plugins..."
 msgstr ""
 
-#: src/gui.c:1139
+#: src/gui.c:1138
 msgid "Load _Subtitles from File..."
 msgstr ""
 
-#: src/gui.c:1144
+#: src/gui.c:1143
 msgid "Erase subtitles"
 msgstr ""
 
-#: src/gui.c:1152 src/multitrack.c:7158
+#: src/gui.c:1151 src/multitrack.c:7334
 msgid "Capture _External Window... "
 msgstr "Capturer Fenêtre _Extérieure.... "
 
-#: src/gui.c:1159 src/multitrack.c:7173
+#: src/gui.c:1158 src/multitrack.c:7349
 msgid "_Preferences..."
 msgstr "_Préférences...."
 
-#: src/gui.c:1172
+#: src/gui.c:1171
 msgid "_Audio"
 msgstr "_Audio"
 
-#: src/gui.c:1184
+#: src/gui.c:1183
 msgid "Load _New Audio for Clip..."
 msgstr "Charge _Nouveau Son pour le Clip..."
 
-#: src/gui.c:1190
+#: src/gui.c:1189
 msgid "Load _CD Track..."
 msgstr "_Charger une piste CD...."
 
-#: src/gui.c:1191
+#: src/gui.c:1190
 msgid "E_ject CD"
 msgstr "Éjecter CD"
 
-#: src/gui.c:1205
+#: src/gui.c:1204
 msgid "Record E_xternal Audio..."
 msgstr "Enregistrement audio"
 
-#: src/gui.c:1218
+#: src/gui.c:1217
 msgid "to New _Clip..."
 msgstr "vers nouveau clip..."
 
-#: src/gui.c:1222
+#: src/gui.c:1221
 msgid "to _Selection"
 msgstr "vers Sélection"
 
-#: src/gui.c:1230
+#: src/gui.c:1229
 msgid "Fade Audio _In..."
 msgstr "Fondu audio entrant..."
 
-#: src/gui.c:1234
+#: src/gui.c:1233
 msgid "Fade Audio _Out..."
 msgstr "Fondu audio sortant..."
 
-#: src/gui.c:1244
+#: src/gui.c:1243
 msgid "_Export Audio..."
 msgstr "_Exporter Audio..."
 
-#: src/gui.c:1257
+#: src/gui.c:1256
 msgid "Export _Selected Audio..."
 msgstr "Exporte Audio _Sélectionné...."
 
-#: src/gui.c:1261
+#: src/gui.c:1260
 msgid "Export _All Audio..."
 msgstr "Exporter _Audio Complet...."
 
-#: src/gui.c:1265
+#: src/gui.c:1264
 msgid "_Append Audio..."
 msgstr "_Ajouter Audio..."
 
-#: src/gui.c:1270
+#: src/gui.c:1269
 msgid "_Trim/Pad Audio..."
 msgstr "_Ajuste/Délaie Audio..."
 
-#: src/gui.c:1283
+#: src/gui.c:1282
 msgid "Trim/Pad Audio to _Selection"
 msgstr "Ajuste/Délaie Audio vers la _Sélection"
 
-#: src/gui.c:1288
+#: src/gui.c:1287
 msgid "Trim/Pad Audio from Beginning to _Play Start"
 msgstr "Ajuste/Remplit l'Audio depuis le début jusqu'à Démarrer la Lecture"
 
-#: src/gui.c:1293
+#: src/gui.c:1292
 msgid "_Delete Audio..."
 msgstr "_Efface Audio..."
 
-#: src/gui.c:1306
+#: src/gui.c:1305
 msgid "Delete _Selected Audio"
 msgstr "_Effacer Audio Sélectionné"
 
-#: src/gui.c:1310
+#: src/gui.c:1309
 msgid "Delete _All Audio"
 msgstr "Efface Tout l'_Audio"
 
-#: src/gui.c:1314
+#: src/gui.c:1313
 msgid "Insert _Silence in Selection"
 msgstr "Insérer un silence dans la sélection"
 
-#: src/gui.c:1319
+#: src/gui.c:1318
 msgid "_Resample Audio..."
 msgstr "_Reéchantillonner Audio...."
 
-#: src/gui.c:1324
+#: src/gui.c:1323
 msgid "_Info"
 msgstr "_Informations"
 
-#: src/gui.c:1336
+#: src/gui.c:1335
 msgid "Show Clip _Info"
 msgstr ""
 
-#: src/gui.c:1344
+#: src/gui.c:1343
 msgid "Show/_Edit File Comments"
 msgstr "Afficher/_Éditer les Commentaires Fichier"
 
-#: src/gui.c:1349
+#: src/gui.c:1348
 msgid "Show _Clipboard Info"
 msgstr "Afficher Informations du Presse-papiers"
 
-#: src/gui.c:1360 src/multitrack.c:7286
+#: src/gui.c:1359 src/multitrack.c:7462
 msgid "Show _Messages"
 msgstr "Afficher Messages"
 
-#: src/gui.c:1364 src/multitrack.c:7365
+#: src/gui.c:1363 src/multitrack.c:7541
 msgid "Show _Layout Errors"
 msgstr "Afficher les erreurs de _mise en page"
 
-#: src/gui.c:1369 src/multitrack.c:7263
+#: src/gui.c:1368 src/multitrack.c:7439
 msgid "_Clips"
 msgstr "_Clips"
 
-#: src/gui.c:1381
+#: src/gui.c:1380
 msgid "_Rename Current Clip in Menu..."
 msgstr "_Renomme le Clip actuel dans le Menu..."
 
-#: src/gui.c:1399
+#: src/gui.c:1398
 msgid "A_dvanced"
 msgstr "A_vancé"
 
-#: src/gui.c:1412
+#: src/gui.c:1411
 msgid "_RFX Effects/Tools/Utilities"
 msgstr "Effets _RFX/Outils/Utilitaires"
 
-#: src/gui.c:1424
+#: src/gui.c:1423
 msgid "_New Test RFX Script..."
 msgstr "_Nouvel Essai de Script RFX..."
 
-#: src/gui.c:1428
+#: src/gui.c:1427
 msgid "_Copy RFX Script to Test..."
 msgstr "_Copie Script RFX vers Essai..."
 
-#: src/gui.c:1432
+#: src/gui.c:1431
 msgid "_Edit Test RFX Script..."
 msgstr "_Édite l'essai de Script RFX...."
 
-#: src/gui.c:1436
+#: src/gui.c:1435
 msgid "Rena_me Test RFX Script..."
 msgstr "_Renomme l'Essai de Script RFX...."
 
-#: src/gui.c:1440
+#: src/gui.c:1439
 msgid "_Delete Test RFX Script..."
 msgstr "Efface l'Essai de Script RFX...."
 
-#: src/gui.c:1450
+#: src/gui.c:1449
 msgid "_Promote Test Rendered Effect/Tool/Generator..."
 msgstr "_Promouvoir Effet Rendu Du Test/Outil/Générateur..."
 
-#: src/gui.c:1457
+#: src/gui.c:1456
 msgid "_Import Custom RFX script..."
 msgstr "_Importer un Script RFX Personnalisé..."
 
-#: src/gui.c:1461
+#: src/gui.c:1460
 msgid "E_xport Custom RFX script..."
 msgstr "E_xporter un Script RFX Personnalisé..."
 
-#: src/gui.c:1465
+#: src/gui.c:1464
 msgid "De_lete Custom RFX Script..."
 msgstr "Effacer un Script RFX Personnalisé..."
 
-#: src/gui.c:1472
+#: src/gui.c:1471
 msgid "Re_build all RFX plugins"
 msgstr "Régénère tous les plugins RFX"
 
-#: src/gui.c:1501
+#: src/gui.c:1498
 msgid "Receive _LiVES stream from..."
 msgstr "Recevoir les flux _LiVES depuis..."
 
-#: src/gui.c:1506
+#: src/gui.c:1503
 msgid "_Send LiVES stream to..."
 msgstr "Envoyer les flux LiVES vers..."
 
-#: src/gui.c:1515
+#: src/gui.c:1512
 #, c-format
 msgid "Open _yuv4mpeg stream on %sstream.yuv..."
 msgstr ""
 
-#: src/gui.c:1536
+#: src/gui.c:1534
 msgid "_Import Project (.lv2)..."
 msgstr "_Importe Projet (.lv2)..."
 
-#: src/gui.c:1540
+#: src/gui.c:1538
 msgid "E_xport Project (.lv2)..."
 msgstr "_Exporte Projet (.lv2)..."
 
-#: src/gui.c:1545
+#: src/gui.c:1543
 msgid "_VJ"
 msgstr "_VJ"
 
-#: src/gui.c:1557
+#: src/gui.c:1555
 msgid "Real Time _Effect Mapping"
 msgstr ""
 
-#: src/gui.c:1563
+#: src/gui.c:1561
 msgid "Bind real time effects to ctrl-number keys."
 msgstr "Lie les effets en temps réel aux touches ctrl-nombre."
 
-#: src/gui.c:1565
+#: src/gui.c:1563
 msgid "Set Real Time Effect _Defaults"
 msgstr ""
 
-#: src/gui.c:1567
+#: src/gui.c:1565
 msgid "Set default parameter values for real time effects."
 msgstr ""
 
-#: src/gui.c:1580
+#: src/gui.c:1578
 msgid "Save Real Time Effect _Defaults"
 msgstr ""
 
-#: src/gui.c:1583
+#: src/gui.c:1581
 msgid ""
 "Save real time effect defaults so they will be restored each time you use "
 "LiVES."
 msgstr ""
 
-#: src/gui.c:1589
+#: src/gui.c:1587
 msgid "_Reset all playback speeds and positions"
 msgstr "_Réinitialiser toutes les vitesses de lecture et les positions"
 
-#: src/gui.c:1592
+#: src/gui.c:1590
 msgid ""
 "Reset all playback positions to frame 1, and reset all playback frame rates."
 msgstr ""
 
-#: src/gui.c:1594
+#: src/gui.c:1592
 msgid "_MIDI/joystick interface"
 msgstr "Interface _MIDI/joystick"
 
-#: src/gui.c:1609
+#: src/gui.c:1607
 msgid "_MIDI/joystick learner..."
 msgstr "Apprenant _MIDI/joystick..."
 
-#: src/gui.c:1614
+#: src/gui.c:1612
 msgid "_Save device mapping..."
 msgstr ""
 
-#: src/gui.c:1620
+#: src/gui.c:1618
 msgid "_Load device mapping..."
 msgstr ""
 
-#: src/gui.c:1628
+#: src/gui.c:1626
 msgid "Show VJ _Keys"
 msgstr "Afficher Touches de Raccourci"
 
-#: src/gui.c:1632
+#: src/gui.c:1630
 msgid "To_ys"
 msgstr "J_ouets"
 
-#: src/gui.c:1644
+#: src/gui.c:1642
 msgid "_None"
 msgstr "_Aucun"
 
-#: src/gui.c:1652
+#: src/gui.c:1650
 msgid "_Autolives"
 msgstr ""
 
-#: src/gui.c:1657
+#: src/gui.c:1655
 msgid "_Mad Frames"
 msgstr "_Mauvaises Images"
 
-#: src/gui.c:1662
+#: src/gui.c:1660
 msgid "_LiVES TV (broadband)"
 msgstr "_LiVES TV (hertzienne)"
 
-#: src/gui.c:1672 src/multitrack.c:7387
+#: src/gui.c:1670 src/multitrack.c:7563
 msgid "_Help"
 msgstr "_Aide"
 
-#: src/gui.c:1684 src/multitrack.c:7407
+#: src/gui.c:1682 src/multitrack.c:7583
 msgid "_Manual (opens in browser)"
 msgstr "_Manuel (il s'ouvre dans le navigateur)"
 
-#: src/gui.c:1691 src/multitrack.c:7416
+#: src/gui.c:1689 src/multitrack.c:7592
 msgid "_Donate to the project !"
 msgstr "_Faites un don au projet !"
 
-#: src/gui.c:1695 src/multitrack.c:7420
+#: src/gui.c:1693 src/multitrack.c:7596
 msgid "_Email the author"
 msgstr "_Envoie une e-mail à l'auteur"
 
-#: src/gui.c:1699 src/multitrack.c:7424
+#: src/gui.c:1697 src/multitrack.c:7600
 msgid "Report a _bug"
 msgstr "Signale un _bug"
 
-#: src/gui.c:1703 src/multitrack.c:7428
+#: src/gui.c:1701 src/multitrack.c:7604
 msgid "Suggest a _feature"
 msgstr "Propose une nouvelle _fonctionnalité"
 
-#: src/gui.c:1707 src/multitrack.c:7432
+#: src/gui.c:1705 src/multitrack.c:7608
 msgid "Assist with _translating"
 msgstr "Aider à la _traduction"
 
-#: src/gui.c:1714 src/multitrack.c:7439
+#: src/gui.c:1712 src/multitrack.c:7615
 msgid "_Troubleshoot"
 msgstr "_Résolution de problèmes"
 
-#: src/gui.c:1718 src/multitrack.c:7443
+#: src/gui.c:1716 src/multitrack.c:7619
 msgid "_About"
-msgstr "_A propos"
+msgstr "_À propos"
 
-#: src/gui.c:1752
+#: src/gui.c:1750
 msgid "Rewind to start (w)"
 msgstr "Revenir au début (w)"
 
-#: src/gui.c:1760 src/multitrack.c:16720
+#: src/gui.c:1758 src/multitrack.c:17010
 msgid "Play all (p)"
 msgstr "Lecture de l'ensemble (p)"
 
-#: src/gui.c:1768 src/gui.c:1877
+#: src/gui.c:1766 src/gui.c:1876
 msgid "Stop playback (q)"
 msgstr "Arrête la lecture (q)"
 
-#: src/gui.c:1779
+#: src/gui.c:1777
 msgid "Play selection (y)"
 msgstr "Lecture Sélection (y)"
 
-#: src/gui.c:1832
+#: src/gui.c:1829
 msgid "Volume"
 msgstr "Volume"
 
-#: src/gui.c:1854
+#: src/gui.c:1853
 msgid "Audio volume (1.00)"
 msgstr "Volume audio (1.00)"
 
-#: src/gui.c:1883
+#: src/gui.c:1882
 msgid "Unblank background (b)"
 msgstr "Couleur d'arrière-plan (b)"
 
-#: src/gui.c:1929
+#: src/gui.c:1928
 msgid "Play slower (ctrl-down)"
 msgstr "Jouer plus lentement  (ctrl-bas)"
 
-#: src/gui.c:1935
+#: src/gui.c:1934
 msgid "Play faster (ctrl-up)"
 msgstr "Jouer plus rapidement (ctrl+haut)"
 
-#: src/gui.c:1942
+#: src/gui.c:1941
 msgid "Skip back (ctrl-left)"
 msgstr "Retour rapide (Ctrl+gauche)"
 
-#: src/gui.c:1948
+#: src/gui.c:1947
 msgid "Skip forward (ctrl-right)"
 msgstr "Avancer (ctrl+droit)"
 
-#: src/gui.c:1954
+#: src/gui.c:1953
 msgid "Show clip info (i)"
 msgstr ""
 
-#: src/gui.c:1960
+#: src/gui.c:1959
 msgid "Hide this toolbar"
 msgstr "Cache cette barre d'outils"
 
-#: src/gui.c:1962
+#: src/gui.c:1961
 msgid ""
 "Press \"s\" to toggle separate play window for improved performance, \"q\" "
 "to stop."
 msgstr ""
 
 #. TRANSLATORS: please keep the translated string the same length
-#: src/gui.c:1995
+#: src/gui.c:1994
 msgid "     Video playback speed (frames per second)        "
 msgstr "     Vitesse de vidéo (images par seconde)        "
 
-#: src/gui.c:2009
+#: src/gui.c:2008
 msgid "Vary the video speed"
 msgstr "Faire varier la vitesse de la vidéo"
 
-#: src/gui.c:2092 src/gui.c:3218
+#: src/gui.c:2090 src/gui.c:3329
 msgid "First Frame"
 msgstr "Première Image"
 
-#: src/gui.c:2193 src/gui.c:3226
+#: src/gui.c:2191 src/gui.c:3336
 msgid "Last Frame"
 msgstr "Dernière Image"
 
-#: src/gui.c:2210
+#: src/gui.c:2208
 msgid "The first selected frame in this clip"
 msgstr "Le cadre choisi en premier dans ce clip"
 
-#: src/gui.c:2248
+#: src/gui.c:2246
 msgid "The last selected frame in this clip"
 msgstr "Le cadre sélectionné dernier dans ce clip"
 
-#: src/gui.c:2532
+#: src/gui.c:2546
 msgid "Starting...\n"
 msgstr "Démarrage...\n"
 
-#: src/gui.c:3074
+#: src/gui.c:3181
 msgid "    Press 'q' to stop recording.  DO NOT COVER THE PLAY WINDOW !   "
 msgstr ""
 "    Appuyer sur 'q' pour arréter l'enregistrement. NE RECOUVREZ PAS LA "
 "FENÊTRE DE LECTURE !   "
 
-#: src/gui.c:3521
+#: src/gui.c:3643
 msgid "Frame number to preview"
 msgstr "Numéro de cadres pour prévisualiser"
 
-#: src/gui.c:3538
+#: src/gui.c:3660
 msgid "_Free"
 msgstr "_Libre"
 
-#: src/gui.c:3539
+#: src/gui.c:3661
 msgid "Free choice of frame number"
 msgstr ""
 
-#: src/gui.c:3543
+#: src/gui.c:3666
 msgid "_Start"
 msgstr "_Début"
 
-#: src/gui.c:3544
+#: src/gui.c:3667
 msgid "Frame number is linked to start frame"
 msgstr ""
 
-#: src/gui.c:3551
+#: src/gui.c:3675
 msgid "_End"
 msgstr "_Fin"
 
-#: src/gui.c:3552
+#: src/gui.c:3676
 msgid "Frame number is linked to end frame"
 msgstr ""
 
-#: src/gui.c:3559
+#: src/gui.c:3684
 msgid "_Pointer"
 msgstr "_Pointeur"
 
-#: src/gui.c:3560
+#: src/gui.c:3685
 msgid "Frame number is linked to playback pointer"
 msgstr ""
 
-#: src/gui.c:3581
+#: src/gui.c:3707
 msgid "Rewind"
 msgstr "Rembobiner"
 
-#: src/gui.c:3592 src/dialogs.c:894 src/dialogs.c:896 src/dialogs.c:1817
-#: src/dialogs.c:1819
+#: src/gui.c:3718 src/dialogs.c:960 src/dialogs.c:962 src/dialogs.c:1873
+#: src/dialogs.c:1875
 msgid "Play all"
 msgstr "Lecture de l'ensemble"
 
-#: src/gui.c:3605
+#: src/gui.c:3731
 msgid "Play Selection"
 msgstr "Lecture Sélection"
 
-#: src/gui.c:3619
+#: src/gui.c:3745
 msgid "Loop On/Off"
 msgstr "Boucle On/Off"
 
-#: src/gui.c:3693
+#: src/gui.c:3819
 msgid "Start _recording"
 msgstr "Démarrer l'enregistrement"
 
-#: src/gui.c:3698
+#: src/gui.c:3824
 msgid "Stop _recording"
 msgstr "Arréter l'enregistrement"
 
-#: src/gui.c:3703
+#: src/gui.c:3829
 msgid "_Record Performance"
 msgstr ""
 
-#: src/gui.c:3851
+#: src/gui.c:3974
 msgid "Hide Play Window"
 msgstr "Cacher la Fenêtre de Lecture"
 
-#: src/gui.c:4232
+#: src/gui.c:4333
 msgid "Show Play Window"
 msgstr "Afficher la Fenêtre de Lecture"
 
-#: src/ce_thumbs.c:222
+#: src/ce_thumbs.c:242
 #, c-format
 msgid "Mapped to ctrl-%d"
 msgstr ""
 
-#: src/ce_thumbs.c:276 src/effects.c:85 src/preferences.c:3195
+#: src/ce_thumbs.c:296 src/effects.c:86 src/preferences.c:3247
 msgid "Effects"
 msgstr "Effets"
 
-#: src/ce_thumbs.c:279 src/multitrack.c:5615
+#: src/ce_thumbs.c:299 src/multitrack.c:5791
 msgid "Clips"
-msgstr ""
+msgstr "Clips"
 
-#: src/ce_thumbs.c:303
+#: src/ce_thumbs.c:323
 #, c-format
 msgid "Show / apply effects to %s\n"
 msgstr ""
 
-#: src/ce_thumbs.c:315
-#, fuzzy, c-format
+#: src/ce_thumbs.c:335
+#, c-format
 msgid "Select clip for %s\n"
-msgstr "_Supprime l'ensemble de clips"
+msgstr ""
 
-#: src/ce_thumbs.c:515
+#: src/ce_thumbs.c:536
 msgid "_Pin"
 msgstr ""
 
-#: src/ce_thumbs.c:515
+#: src/ce_thumbs.c:537
 msgid "Pin the parameter box to the window"
 msgstr ""
 
 #. TRANSLATORS: Exabytes
-#: src/utils.c:794
+#: src/utils.c:800
 #, c-format
 msgid "%.2f EB"
 msgstr ""
 
 #. TRANSLATORS: Petabytes
-#: src/utils.c:798
+#: src/utils.c:803
 #, c-format
 msgid "%.2f PB"
 msgstr ""
 
 #. TRANSLATORS: Terabytes
-#: src/utils.c:802
+#: src/utils.c:806
 #, c-format
 msgid "%.2f TB"
 msgstr ""
 
 #. TRANSLATORS: Gigabytes
-#: src/utils.c:806
+#: src/utils.c:809
 #, c-format
 msgid "%.2f GB"
 msgstr ""
 
 #. TRANSLATORS: Megabytes
-#: src/utils.c:810
+#: src/utils.c:812
 #, c-format
 msgid "%.2f MB"
 msgstr ""
 
 #. TRANSLATORS: Kilobytes (1024 bytes)
-#: src/utils.c:814
+#: src/utils.c:815
 #, c-format
 msgid "%.2f KiB"
 msgstr ""
@@ -3869,7 +3848,7 @@
 msgid "%d bytes"
 msgstr ""
 
-#: src/utils.c:1841
+#: src/utils.c:1835
 msgid "Clearing the clipboard"
 msgstr "Effacement du presse-papiers"
 
@@ -3884,7 +3863,7 @@
 "==============================\n"
 "Basculé sur le clip %s\n"
 
-#: src/utils.c:1880
+#: src/utils.c:1877
 msgid ""
 "\n"
 "==============================\n"
@@ -3894,74 +3873,74 @@
 "==============================\n"
 "Basculé sur le clip vide\n"
 
-#: src/utils.c:1917
+#: src/utils.c:1916
 msgid "(blank)"
 msgstr "(vide)"
 
-#: src/utils.c:1920
+#: src/utils.c:1919
 #, c-format
 msgid ""
 "The set name has been changed from %s to %s. Affected layouts have been "
 "updated accordingly\n"
 msgstr ""
 
-#: src/utils.c:1928
+#: src/utils.c:1927
 #, c-format
 msgid ""
 "The clip %s is missing from this set.\n"
 "It is required by the following layouts:\n"
 msgstr ""
 
-#: src/utils.c:1932
+#: src/utils.c:1931
 #, c-format
 msgid ""
 "The clip %s has been closed.\n"
 "It is required by the following layouts:\n"
 msgstr ""
 
-#: src/utils.c:1937
+#: src/utils.c:1936
 #, c-format
 msgid ""
 "Frames have been shifted in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1942
+#: src/utils.c:1941
 #, c-format
 msgid ""
 "Frames have been deleted from the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1947
+#: src/utils.c:1946
 #, c-format
 msgid ""
 "Audio has been deleted from the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1952
+#: src/utils.c:1951
 #, c-format
 msgid ""
 "Audio has been shifted in clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1957
+#: src/utils.c:1956
 #, c-format
 msgid ""
 "Audio has been altered in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1962
+#: src/utils.c:1961
 #, c-format
 msgid ""
 "Frames have been altered in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:2135
+#: src/utils.c:2134
 #, c-format
 msgid ""
 "Set %s\n"
@@ -3969,7 +3948,7 @@
 "by another copy of LiVES.\n"
 msgstr ""
 
-#: src/utils.c:2142
+#: src/utils.c:2140
 #, c-format
 msgid ""
 "\n"
@@ -4019,72 +3998,72 @@
 msgid "Removing layout %s\n"
 msgstr ""
 
-#: src/utils.c:3014
+#: src/utils.c:2996
 msgid "Video [opening...]"
 msgstr "Vidéo [ouverture...]"
 
-#: src/utils.c:3018
+#: src/utils.c:2999
 #, c-format
 msgid "Video [%.2f sec]"
 msgstr "Vidéo [%.2f sec]"
 
-#: src/utils.c:3022
+#: src/utils.c:3002
 msgid "(Undefined)"
 msgstr "(Non Défini)"
 
-#: src/utils.c:3025
+#: src/utils.c:3004
 msgid "(No video)"
 msgstr "(Pas de vidéo)"
 
-#: src/utils.c:3032
+#: src/utils.c:3011
 msgid "(No audio)"
 msgstr "(Pas de son)"
 
-#: src/utils.c:3037
+#: src/utils.c:3015
 msgid "Mono  [opening...]"
 msgstr "Mono  [ouverture...]"
 
-#: src/utils.c:3040
+#: src/utils.c:3017
 msgid "Left Audio [opening...]"
 msgstr "Audio Gauche [ouverture...]"
 
-#: src/utils.c:3045
+#: src/utils.c:3021
 #, c-format
 msgid "Mono [%.2f sec]"
 msgstr "Mono [%.2f sec]"
 
-#: src/utils.c:3048
+#: src/utils.c:3023
 #, c-format
 msgid "Left Audio [%.2f sec]"
 msgstr "Audio Gauche [%.2f sec]"
 
-#: src/utils.c:3056
+#: src/utils.c:3031
 msgid "Right Audio [opening...]"
 msgstr "Audio Droit [ouverture...]"
 
-#: src/utils.c:3059
+#: src/utils.c:3033
 #, c-format
 msgid "Right Audio [%.2f sec]"
 msgstr "Audio Droit [%.2f sec]"
 
-#: src/utils.c:3506
+#: src/utils.c:3472
 msgid "LiVES cannot switch to mplayer whilst clips are loading."
 msgstr ""
 "LiVES ne peut basculer sur Mplayer lorsque un clip est en cours de "
 "chargement."
 
-#: src/utils.c:3559
+#: src/utils.c:3525
 #, fuzzy
 msgid "LiVES cannot switch to mplayer2 whilst clips are loading."
 msgstr ""
 "LiVES ne peut basculer sur Mplayer lorsque un clip est en cours de "
 "chargement."
 
-#: src/utils.c:3809
+#: src/utils.c:3775
 msgid "Cleaning up clip"
 msgstr "Remise en ordre du clip"
 
-#: src/utils.c:3913
+#: src/utils.c:3874
 #, c-format
 msgid ""
 "\n"
@@ -4099,30 +4078,29 @@
 "\n"
 "Écraser ?\n"
 
-#: src/utils.c:4305 src/utils.c:4337 src/multitrack.c:4503
+#: src/utils.c:4250 src/utils.c:4280 src/multitrack.c:4672
 #, c-format
 msgid "_Undo %s"
 msgstr "_Annuler %s"
 
-#: src/utils.c:4306 src/utils.c:4338 src/multitrack.c:4525
+#: src/utils.c:4251 src/utils.c:4281 src/multitrack.c:4693
 #, c-format
 msgid "_Redo %s"
 msgstr "_Rétablir %s"
 
-#: src/utils.c:4363
+#: src/utils.c:4305
 msgid "-------------Selection------------"
 msgstr "-------------Sélection------------"
 
-#. TRANSLATORS: - try to keep the text of the middle part the same length, by deleting "-" if necessary
-#: src/utils.c:4371
+#: src/utils.c:4313
 msgid " sec ] ----------Selection---------- [ "
 msgstr " sec ] ----------Sélection---------- [ "
 
-#: src/utils.c:4371
+#: src/utils.c:4314
 msgid " frames ] ----------"
 msgstr " images ] ----------"
 
-#: src/utils.c:5360
+#: src/utils.c:5302
 msgid ""
 "Your version of mplayer/ffmpeg may be broken !\n"
 "See http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2071\n"
@@ -4133,11 +4111,11 @@
 "Try running Help/Troubleshoot for more information."
 msgstr ""
 
-#: src/saveplay.c:178
+#: src/saveplay.c:179
 msgid "Examining file header"
 msgstr "Examiner l'en tête du fichier"
 
-#: src/saveplay.c:315 src/saveplay.c:789
+#: src/saveplay.c:316 src/saveplay.c:779
 #, c-format
 msgid "Opening %s"
 msgstr "Ouverture de %s"
@@ -4147,36 +4125,36 @@
 msgid "Opening %s start time %.2f sec. frames %d"
 msgstr "Ouverture de %s début %.2f sec. %d images"
 
-#: src/saveplay.c:326 src/saveplay.c:4001
+#: src/saveplay.c:326 src/saveplay.c:3927
 msgid " without sound"
 msgstr " sans le son"
 
-#: src/saveplay.c:396
+#: src/saveplay.c:395
 #, c-format
 msgid "Opening audio for %s"
 msgstr ""
 
-#: src/saveplay.c:557
+#: src/saveplay.c:554
 #, c-format
 msgid "Auto trimming %.2f seconds of audio at start..."
 msgstr ""
 
-#: src/saveplay.c:567
+#: src/saveplay.c:562
 #, c-format
 msgid "Auto trimming %.2f seconds of audio at end..."
 msgstr ""
 
-#: src/saveplay.c:584
+#: src/saveplay.c:577
 #, c-format
 msgid "Auto padding with %.2f seconds of silence at start..."
 msgstr ""
 
-#: src/saveplay.c:599
+#: src/saveplay.c:590
 #, c-format
 msgid "Auto padding with %.2f seconds of silence at end..."
 msgstr ""
 
-#: src/saveplay.c:671
+#: src/saveplay.c:661
 #, c-format
 msgid ""
 "\n"
@@ -4188,11 +4166,11 @@
 "Are you sure you wish to continue ?"
 msgstr ""
 
-#: src/saveplay.c:685
+#: src/saveplay.c:676
 msgid " - please be patient."
 msgstr " - soyez patient SVP."
 
-#: src/saveplay.c:938
+#: src/saveplay.c:926
 msgid ""
 "\n"
 "\n"
@@ -4204,7 +4182,7 @@
 "LiVES n'est pas capable d'extraire de la vidéo ou du son avec ce fichier.\n"
 "Vérifier dans le terminal pour plus de détails\n"
 
-#: src/saveplay.c:940
+#: src/saveplay.c:928
 msgid ""
 "\n"
 "\n"
@@ -4214,7 +4192,7 @@
 "\n"
 "Vous devez installer mplayer pour pouvoir visionner ce fichier.\n"
 
-#: src/saveplay.c:948
+#: src/saveplay.c:934
 msgid ""
 "\n"
 "\n"
@@ -4226,29 +4204,29 @@
 "Vérifiez SVP les paramètres de la commande d'ouverture Vidéo dans\n"
 "Outils|Préférences|Décodage\n"
 
-#: src/saveplay.c:1014
+#: src/saveplay.c:995
 msgid "Adding image..."
 msgstr ""
 
-#: src/saveplay.c:1108
+#: src/saveplay.c:1089
 #, c-format
 msgid "Subtitles were saved as %s\n"
 msgstr ""
 
-#: src/saveplay.c:1192
+#: src/saveplay.c:1171
 #, c-format
 msgid "LiVES: Save Frame %d as..."
 msgstr ""
 
-#: src/saveplay.c:1195
+#: src/saveplay.c:1174
 msgid "LiVES: Save Frame as..."
 msgstr ""
 
-#: src/saveplay.c:1322
+#: src/saveplay.c:1303
 msgid "LiVES: Save Clip as..."
 msgstr ""
 
-#: src/saveplay.c:1390
+#: src/saveplay.c:1369
 msgid ""
 "Saving your video could lead to a loss of quality !\n"
 "You are strongly advised to 'Save As' to a new file.\n"
@@ -4260,38 +4238,38 @@
 "\n"
 "Voulez-vous vraiment continuer ?"
 
-#: src/saveplay.c:1517 src/saveplay.c:1683 src/saveplay.c:1762
-#: src/saveplay.c:4014
+#: src/saveplay.c:1494 src/saveplay.c:1659 src/saveplay.c:1738
+#: src/saveplay.c:3940
 msgid "Pulling frames from clip"
 msgstr ""
 
-#: src/saveplay.c:1588 src/saveplay.c:1727
+#: src/saveplay.c:1565 src/saveplay.c:1703
 msgid "Linking selection"
 msgstr "Lier la sélection"
 
-#: src/saveplay.c:1779
+#: src/saveplay.c:1755
 msgid " (with no sound)\n"
 msgstr " (sans le son)\n"
 
-#: src/saveplay.c:1786
+#: src/saveplay.c:1761
 #, c-format
 msgid "Saving frames %d to %d%s as \"%s\" : encoder = %s : format = %s..."
 msgstr ""
 "Enregistrement des images %d à %d%s en tant que \"%s\" : encodeur = %s : "
 "format = %s..."
 
-#: src/saveplay.c:1790
+#: src/saveplay.c:1765
 #, c-format
 msgid "Saving frames 1 to %d%s as \"%s\" : encoder %s : format = %s..."
 msgstr ""
 "Enregistrement des images 1 à %d%s en tant que \"%s\" : encodeur = %s : "
 "format = %s..."
 
-#: src/saveplay.c:1909
+#: src/saveplay.c:1890
 msgid "Saving [can take a long time]"
 msgstr "Épargne [peut prendre un certain temps]"
 
-#: src/saveplay.c:2057
+#: src/saveplay.c:2044
 msgid ""
 "\n"
 "\n"
@@ -4301,33 +4279,33 @@
 "\n"
 "Erreur sur l'encodeur - fichier de sortie non créé !\n"
 
-#: src/saveplay.c:2094
+#: src/saveplay.c:2081
 msgid "Clearing letterbox"
 msgstr ""
 
-#: src/saveplay.c:2183
+#: src/saveplay.c:2168
 #, c-format
 msgid "File size was %s\n"
 msgstr ""
 
-#: src/saveplay.c:2284
+#: src/saveplay.c:2265
 msgid "recording aborted by preview.\n"
 msgstr "enregistrement annulé par la pré-visualisation.\n"
 
-#: src/saveplay.c:2288
+#: src/saveplay.c:2268
 msgid "recording aborted by clipboard playback.\n"
 msgstr ""
 
-#: src/saveplay.c:2291
+#: src/saveplay.c:2270
 msgid "Recording performance..."
 msgstr "Enregistrement de la représentation..."
 
-#: src/saveplay.c:3293
+#: src/saveplay.c:3251
 #, c-format
 msgid "Average FPS was %.4f\n"
 msgstr "Moyenne d'IPS = %.4f\n"
 
-#: src/saveplay.c:3299
+#: src/saveplay.c:3256
 msgid ""
 "\n"
 "\n"
@@ -4341,16 +4319,21 @@
 "Vous devez aller dans Outils--->Redimensionner toutes les images\n"
 "et redimensionner toutes les images aux dimensions actuelles.\n"
 
-#: src/saveplay.c:3479
+#: src/saveplay.c:3429
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: src/saveplay.c:3588 src/saveplay.c:4585
+#: src/saveplay.c:3538 src/saveplay.c:4502
 #, c-format
 msgid "Untitled%d"
 msgstr "Sans Nom%d"
 
-#: src/saveplay.c:3633
+#: src/saveplay.c:3567
+#, c-format
+msgid "%d frames are enough !\n"
+msgstr "%d images sont en trop !\n"
+
+#: src/saveplay.c:3579
 #, c-format
 msgid ""
 "\n"
@@ -4358,7 +4341,7 @@
 "Bad things may happen with this clip.\n"
 msgstr ""
 
-#: src/saveplay.c:3723
+#: src/saveplay.c:3667
 #, c-format
 msgid ""
 "\n"
@@ -4370,14 +4353,14 @@
 "%.3f ips. \n"
 "La valeur par défaut peut être fixée dans Outils|Préférences|Divers.\n"
 
-#: src/saveplay.c:3735
+#: src/saveplay.c:3677
 #, c-format
 msgid "Playback speed was adjusted to %.3f frames per second to fit audio.\n"
 msgstr ""
 "La vitesse de playback est ajustée à %.3f images par seconde pour "
 "correspondre au son.\n"
 
-#: src/saveplay.c:3754
+#: src/saveplay.c:3694
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d *bpp=Greyscale* fps=%.3f\n"
@@ -4386,61 +4369,61 @@
 "Cadres = %d genre = %s dimension = %d x %d *bpp = Greyscale* fps=%.3f\n"
 "Audio:"
 
-#: src/saveplay.c:3758 src/saveplay.c:4762
+#: src/saveplay.c:3698 src/saveplay.c:4671
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d bpp=%d fps=%.3f\n"
 "Audio:"
 msgstr ""
 
-#: src/saveplay.c:3762 src/saveplay.c:4766
+#: src/saveplay.c:3703 src/saveplay.c:4676
 #, c-format
 msgid "%s none\n"
 msgstr "aucun %s\n"
 
-#: src/saveplay.c:3774
-#, fuzzy, c-format
+#: src/saveplay.c:3714
+#, c-format
 msgid " - Author: %s\n"
-msgstr "Auteur/Artiste : %s"
+msgstr " - Auteur : %s\n"
 
-#: src/saveplay.c:3779
-#, fuzzy, c-format
+#: src/saveplay.c:3717
+#, c-format
 msgid " - Title: %s\n"
-msgstr " - Commentaires : %s\n"
+msgstr " - Titre : %s\n"
 
-#: src/saveplay.c:3784
+#: src/saveplay.c:3720
 #, c-format
 msgid " - Comment: %s\n"
 msgstr " - Commentaires : %s\n"
 
-#: src/saveplay.c:3897
+#: src/saveplay.c:3829
 #, c-format
 msgid "Saving frame %d as %s..."
 msgstr "Enregistre Image %d comme %s..."
 
-#: src/saveplay.c:3996
+#: src/saveplay.c:3924
 #, c-format
 msgid "Backing up %s to %s"
 msgstr "Sauvegarde %s à %s"
 
-#: src/saveplay.c:4049
+#: src/saveplay.c:3975
 msgid "Backing up"
 msgstr "Sauvegarde"
 
-#: src/saveplay.c:4083
+#: src/saveplay.c:4009
 msgid "performance data was backed up..."
 msgstr "les données de la représentation sont sauvegardées..."
 
-#: src/saveplay.c:4661
+#: src/saveplay.c:4574
 #, c-format
 msgid "Restoring %s..."
 msgstr "Restauration de %s..."
 
-#: src/saveplay.c:4692
+#: src/saveplay.c:4603
 msgid "Restoring"
 msgstr "Restauration"
 
-#: src/saveplay.c:4714
+#: src/saveplay.c:4625
 #, c-format
 msgid ""
 "\n"
@@ -4454,22 +4437,22 @@
 "LiVES est incapable de le restaurer.\n"
 
 #. TRANSLATORS: rec(ord) %.2f M(ega)B(ytes)
-#: src/saveplay.c:5207
+#: src/saveplay.c:5118
 #, c-format
 msgid "rec %.2f MB"
 msgstr ""
 
-#: src/saveplay.c:5213
+#: src/saveplay.c:5123
 #, c-format
 msgid "!rec %.2f MB"
 msgstr ""
 
 #. TRANSLATORS: rec(ord) ?? M(ega)B(ytes)
-#: src/saveplay.c:5216
+#: src/saveplay.c:5126
 msgid "rec ?? MB"
 msgstr ""
 
-#: src/saveplay.c:5241
+#: src/saveplay.c:5151
 #, c-format
 msgid ""
 "\n"
@@ -4477,7 +4460,7 @@
 "Record stop level can be set in Preferences.\n"
 msgstr ""
 
-#: src/saveplay.c:5535
+#: src/saveplay.c:5447
 msgid ""
 "\n"
 "Files from a previous run of LiVES were found.\n"
@@ -4487,47 +4470,69 @@
 "Des fichiers d'une précédente exécution de LiVES ont été trouvés.\n"
 "Voulez-vous essayer de les récupérer ?\n"
 
-#: src/saveplay.c:5557
+#: src/saveplay.c:5469
 msgid "Recovering files"
 msgstr "Récupération des fichiers"
 
-#: src/saveplay.c:5560
+#: src/saveplay.c:5472
 msgid "Recovering files..."
 msgstr "Récupération des fichiers..."
 
-#: src/dialogs.c:72
+#: src/dialogs.c:71
 msgid "Show affected _layouts"
 msgstr "Afficher les _mises en page touchés"
 
-#: src/dialogs.c:128
+#: src/dialogs.c:113
+msgid ""
+"Do _not show this warning any more\n"
+"(can be turned back on from Preferences/Warnings)"
+msgstr ""
+"Ne _plus afficher cet avertissement à nouveau\n"
+"(peut-être modifié depuis Préférences/Avertissements)"
+
+#: src/dialogs.c:127
 msgid "_Recover disk space"
 msgstr ""
 
-#: src/dialogs.c:143
+#: src/dialogs.c:142
 msgid " _Advanced Settings >>"
 msgstr ""
 
-#: src/dialogs.c:184
+#: src/dialogs.c:183 src/dialogs.c:221
 msgid "LiVES: - Warning !"
 msgstr "LiVES: - Attention !"
 
 #: src/dialogs.c:194
+#, fuzzy
+msgid "LiVES: - Error !"
+msgstr "LiVES: - Attention !"
+
+#: src/dialogs.c:204
+#, fuzzy
+msgid "LiVES: - Information"
+msgstr "LiVES: Informations pour %s"
+
+#: src/dialogs.c:230
 msgid "LiVES: - Question"
 msgstr ""
 
-#: src/dialogs.c:204
+#: src/dialogs.c:239
 msgid "LiVES: - File Error"
 msgstr ""
 
-#: src/dialogs.c:208
+#: src/dialogs.c:241
 msgid "_Abort"
-msgstr ""
+msgstr "A_nnuler"
 
-#: src/dialogs.c:213
+#: src/dialogs.c:246
 msgid "_Retry"
-msgstr ""
+msgstr "_Réessayer"
 
-#: src/dialogs.c:597
+#: src/dialogs.c:306
+msgid "Show _Details"
+msgstr "Voir Les _Détails"
+
+#: src/dialogs.c:657
 #, c-format
 msgid ""
 "FREE SPACE IN THE PARTITION CONTAINING\n"
@@ -4538,7 +4543,7 @@
 "(Disk warning levels can be configured in Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:615
+#: src/dialogs.c:676
 #, c-format
 msgid ""
 "Free space in the partition containing\n"
@@ -4550,11 +4555,11 @@
 "Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:627
+#: src/dialogs.c:688
 msgid "Audio players cannot be switched during playback."
 msgstr "Lecteurs audio ne peuvent pas être allumés pendant la lecture."
 
-#: src/dialogs.c:632
+#: src/dialogs.c:694
 msgid ""
 "\n"
 "\n"
@@ -4566,18 +4571,18 @@
 "LiVES ne peut terminer cette opération à cause d'un manque de mémoire.\n"
 "Essayez SVP de fermer d'autres applications.\n"
 
-#: src/dialogs.c:752
+#: src/dialogs.c:820
 msgid "Processing has been paused."
 msgstr ""
 
-#: src/dialogs.c:937
+#: src/dialogs.c:1002
 #, c-format
 msgid ""
 "\n"
 "%s%d%% done. Time remaining: %u sec%s\n"
 msgstr ""
 
-#: src/dialogs.c:1335
+#: src/dialogs.c:1391
 #, c-format
 msgid ""
 "\n"
@@ -4586,14 +4591,14 @@
 "\n"
 "%d/%d images ouvertes. Temps restant %u sec.\n"
 
-#: src/dialogs.c:1337
+#: src/dialogs.c:1393
 #, c-format
 msgid ""
 "\n"
 "%d/%d frames opened.\n"
 msgstr ""
 
-#: src/dialogs.c:1341
+#: src/dialogs.c:1396
 #, c-format
 msgid ""
 "\n"
@@ -4602,7 +4607,7 @@
 "\n"
 "%d images ouvertes.\n"
 
-#: src/dialogs.c:1940
+#: src/dialogs.c:1993
 #, c-format
 msgid ""
 "\n"
@@ -4611,7 +4616,7 @@
 "\n"
 "Temps restant: %d sec"
 
-#: src/dialogs.c:1988
+#: src/dialogs.c:2040
 #, c-format
 msgid ""
 "\n"
@@ -4622,7 +4627,7 @@
 "Désolé, LiVES ne peut ouvrir que %d fichiers à la fois.\n"
 "Fermez un fichier et essayez à nouveau."
 
-#: src/dialogs.c:1994
+#: src/dialogs.c:2047
 #, c-format
 msgid ""
 "LiVES was unable to write to its temporary directory.\n"
@@ -4641,7 +4646,7 @@
 "\n"
 "Assurez-vous que vous pouvez écrire dans ce répertoire."
 
-#: src/dialogs.c:2005
+#: src/dialogs.c:2059
 #, fuzzy
 msgid ""
 "\n"
@@ -4652,20 +4657,20 @@
 "Actuellement LiVES a besoin de 'Mplayer' ou 'Sox' pour fonctionner. "
 "Installez-en un des deux ou un autre et essayez à nouveau.\n"
 
-#: src/dialogs.c:2010
+#: src/dialogs.c:2064
 msgid ""
 "Audio was not loaded; please install mplayer or mplayer2 if you expected "
 "audio for this clip.\n"
 msgstr ""
 
-#: src/dialogs.c:2014
+#: src/dialogs.c:2069
 msgid ""
 "Audio resampling is required for this format.\n"
 "Please install 'sox'\n"
 "Or switch to another encoder format in Tools | Preferences | Encoding\n"
 msgstr ""
 
-#: src/dialogs.c:2019
+#: src/dialogs.c:2075
 msgid ""
 "\n"
 "\n"
@@ -4677,19 +4682,19 @@
 "Cet encodeur/format ne peut utiliser le codec audio demandé.\n"
 "Fixez SVP le codec audio dans Outils|Préférences|Encodage\n"
 
-#: src/dialogs.c:2024
+#: src/dialogs.c:2080
 msgid ""
 "This layout includes generated frames.\n"
 "It cannot be saved, you must render it to a clip first.\n"
 msgstr ""
 
-#: src/dialogs.c:2029
+#: src/dialogs.c:2085
 msgid ""
 "This layout includes generated or recorded audio.\n"
 "It cannot be saved, you must render it to a clip first.\n"
 msgstr ""
 
-#: src/dialogs.c:2039 src/dialogs.c:2137
+#: src/dialogs.c:2095 src/dialogs.c:2189
 #, c-format
 msgid ""
 "\n"
@@ -4700,7 +4705,7 @@
 "\n"
 "Provient de restrictions dans le format %s\n"
 
-#: src/dialogs.c:2059
+#: src/dialogs.c:2115
 msgid ""
 "LiVES recommends the following settings:\n"
 "\n"
@@ -4708,43 +4713,43 @@
 "LiVES recommande les paramètres suivants:\n"
 "\n"
 
-#: src/dialogs.c:2065 src/dialogs.c:2174 src/resample.c:850
+#: src/dialogs.c:2121 src/dialogs.c:2225 src/resample.c:839
 msgid ", signed"
 msgstr ", signé"
 
-#: src/dialogs.c:2066 src/dialogs.c:2175 src/resample.c:853
+#: src/dialogs.c:2122 src/dialogs.c:2226 src/resample.c:841
 msgid ", unsigned"
 msgstr ", non signé"
 
-#: src/dialogs.c:2070 src/dialogs.c:2179 src/resample.c:858
+#: src/dialogs.c:2126 src/dialogs.c:2230 src/resample.c:846
 msgid ", little-endian"
 msgstr ", little-endian"
 
-#: src/dialogs.c:2071 src/dialogs.c:2180 src/resample.c:861
+#: src/dialogs.c:2127 src/dialogs.c:2231 src/resample.c:848
 msgid ", big-endian"
 msgstr ", big-endian"
 
-#: src/dialogs.c:2077
+#: src/dialogs.c:2132
 #, c-format
 msgid "Use an audio rate of %d Hz%s%s\n"
 msgstr ""
 
-#: src/dialogs.c:2085
+#: src/dialogs.c:2140
 #, c-format
 msgid "Set video rate to %.3f frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:2089
+#: src/dialogs.c:2143
 #, c-format
 msgid "Set video rate to %d:%d frames per second\n"
 msgstr "Nombre d'images par secondes défini à %d:%d par seconde\n"
 
-#: src/dialogs.c:2094 src/dialogs.c:2209
+#: src/dialogs.c:2148 src/dialogs.c:2258
 #, c-format
 msgid "Set video size to %d x %d pixels\n"
 msgstr "Redimensionner vers %d x %d pixels\n"
 
-#: src/dialogs.c:2102 src/dialogs.c:2208
+#: src/dialogs.c:2156 src/dialogs.c:2257
 msgid ""
 "\n"
 "You may wish to:\n"
@@ -4752,35 +4757,35 @@
 "\n"
 "Vous voudriez :\n"
 
-#: src/dialogs.c:2105 src/dialogs.c:2200
+#: src/dialogs.c:2159 src/dialogs.c:2249
 #, c-format
 msgid "resize video to %d x %d pixels\n"
 msgstr "Redimensionner la video en %d x %d pixels\n"
 
-#: src/dialogs.c:2110
+#: src/dialogs.c:2163
 msgid "disable audio, since the target encoder cannot encode audio\n"
 msgstr ""
 
-#: src/dialogs.c:2170
+#: src/dialogs.c:2221
 msgid "LiVES must:\n"
 msgstr "LiVES doit:\n"
 
-#: src/dialogs.c:2185
+#: src/dialogs.c:2235
 #, c-format
 msgid "resample audio to %d Hz%s%s\n"
 msgstr ""
 
-#: src/dialogs.c:2192
+#: src/dialogs.c:2242
 #, c-format
 msgid "resample video to %.3f frames per second\n"
 msgstr "Rééchantillonage vidéo à %.3f images par seconde.\n"
 
-#: src/dialogs.c:2196
+#: src/dialogs.c:2245
 #, c-format
 msgid "resample video to %d:%d frames per second\n"
 msgstr "rééchantillonage video en %d:%d images par seconde\n"
 
-#: src/dialogs.c:2215
+#: src/dialogs.c:2263
 msgid ""
 "\n"
 "You will be able to undo these changes afterwards.\n"
@@ -4794,7 +4799,7 @@
 "Appuyer sur `OK` pour commencer, `Annuler` pour abandonner.\n"
 "\n"
 
-#: src/dialogs.c:2218
+#: src/dialogs.c:2265
 msgid ""
 "\n"
 "Changes applied to the selection will not be permanent.\n"
@@ -4804,7 +4809,7 @@
 "Les changements appliqués à la selection ne seront pas permanents.\n"
 "\n"
 
-#: src/dialogs.c:2237
+#: src/dialogs.c:2285
 msgid ""
 "\n"
 "\n"
@@ -4818,7 +4823,7 @@
 "\"moire disponible.\n"
 "Essayez d'enregistrer sur une partie du fichier."
 
-#: src/dialogs.c:2244
+#: src/dialogs.c:2293
 msgid ""
 "The playback speed (fps), or the audio rate\n"
 " of the clipboard does not match\n"
@@ -4836,8 +4841,8 @@
 "\n"
 "Cliquez sur Annuler pour abandonner ou OK pour continuer."
 
-#: src/dialogs.c:2253
-#, fuzzy, c-format
+#: src/dialogs.c:2304
+#, c-format
 msgid ""
 "When opening a yuvmpeg stream, you should first create a fifo file in:\n"
 "\n"
@@ -4848,17 +4853,12 @@
 "You should only click OK if you understand what you are doing, otherwise, "
 "click Cancel."
 msgstr ""
-"Lorsque un flux yuvmpeg est ouvert, vous devez d'abord créer un fichier fifo "
-"et écrire les images yuv4mpeg dedans.\n"
-"LiVES sera suspendu jusqu'à ce que des images soient reçues.\n"
-"N'appuyer sur OK que si vous comprenez ce que vous faites, sinon appuyer sur "
-"Annuler."
 
-#: src/dialogs.c:2305
+#: src/dialogs.c:2356
 msgid "Show Keys"
 msgstr "Afficher Touches"
 
-#: src/dialogs.c:2306
+#: src/dialogs.c:2358
 msgid ""
 "You can use the following keys during playback to control LiVES:-\n"
 "\n"
@@ -4940,11 +4940,11 @@
 "d taille double\n"
 "g boucles ping-pong\n"
 
-#: src/dialogs.c:2313
+#: src/dialogs.c:2365
 msgid "Multitrack Keys"
 msgstr "Clefs multipiste"
 
-#: src/dialogs.c:2314
+#: src/dialogs.c:2367
 msgid ""
 "You can use the following keys to control the multitrack window:-\n"
 "\n"
@@ -4966,18 +4966,18 @@
 "For other keys, see the menus.\n"
 msgstr ""
 
-#: src/dialogs.c:2322
+#: src/dialogs.c:2375
 msgid "Message History"
 msgstr "Historique des Messages"
 
-#: src/dialogs.c:2335
+#: src/dialogs.c:2388
 #, c-format
 msgid ""
 "After upgrading/installing, you may need to adjust the <prefix_dir> setting "
 "in your %s file"
 msgstr ""
 
-#: src/dialogs.c:2344
+#: src/dialogs.c:2399
 #, c-format
 msgid ""
 "\n"
@@ -4988,7 +4988,7 @@
 "or change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/dialogs.c:2352
+#: src/dialogs.c:2408
 msgid ""
 "Sorry, unknown audio type.\n"
 "\n"
@@ -4998,18 +4998,18 @@
 "\n"
 " (Les extensions doivent être du type .mp3, .ogg, .wav, .mod, .xm ou .it)"
 
-#: src/dialogs.c:2353
+#: src/dialogs.c:2409
 msgid "failed (unknown type)\n"
 msgstr "échoué (type de fichier inconnu)\n"
 
-#: src/dialogs.c:2358
+#: src/dialogs.c:2415
 msgid ""
 "\n"
 "Do you wish to remove the layout files associated with this set ?\n"
 "(They will not be usable without the set).\n"
 msgstr ""
 
-#: src/dialogs.c:2363
+#: src/dialogs.c:2421
 #, c-format
 msgid ""
 "\n"
@@ -5018,7 +5018,7 @@
 "Click Cancel to pick a new name.\n"
 msgstr ""
 
-#: src/dialogs.c:2370
+#: src/dialogs.c:2429
 msgid ""
 "\n"
 "Frames from this clip are used in some multitrack layouts.\n"
@@ -5026,7 +5026,7 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2374
+#: src/dialogs.c:2433
 msgid ""
 "\n"
 "Audio from this clip is used in some multitrack layouts.\n"
@@ -5034,7 +5034,7 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2378
+#: src/dialogs.c:2438
 #, c-format
 msgid ""
 "\n"
@@ -5045,7 +5045,7 @@
 "Otherwise click Cancel to skip loading this file.\n"
 msgstr ""
 
-#: src/dialogs.c:2385
+#: src/dialogs.c:2446
 #, c-format
 msgid ""
 "\n"
@@ -5055,7 +5055,7 @@
 "The clip could not be loaded.\n"
 msgstr ""
 
-#: src/dialogs.c:2392
+#: src/dialogs.c:2455
 msgid ""
 "\n"
 "Dear user, the jack developers decided to remove the -Z option from jackd.\n"
@@ -5063,7 +5063,7 @@
 "Alternately, select a different audio player in Preferences.\n"
 msgstr ""
 
-#: src/dialogs.c:2396
+#: src/dialogs.c:2460
 msgid ""
 "\n"
 "Unable to start up jack. Please ensure that alsa is set up correctly on your "
@@ -5072,13 +5072,13 @@
 "Automatic jack startup will be disabled now.\n"
 msgstr ""
 
-#: src/dialogs.c:2402
+#: src/dialogs.c:2466
 msgid ""
 "\n"
 "Unable to connect to jack server. Please start jack before starting LiVES\n"
 msgstr ""
 
-#: src/dialogs.c:2411
+#: src/dialogs.c:2475
 #, c-format
 msgid ""
 "\n"
@@ -5089,7 +5089,7 @@
 "%s\n"
 msgstr ""
 
-#: src/dialogs.c:2418
+#: src/dialogs.c:2482
 msgid ""
 "\n"
 "Alternately, you can restart LiVES and select another audio player.\n"
@@ -5097,7 +5097,7 @@
 "\n"
 "Sinon, vous pouvez redémarrer LiVES et sélectionner un autre lecteur audio.\n"
 
-#: src/dialogs.c:2423
+#: src/dialogs.c:2488
 #, c-format
 msgid ""
 "\n"
@@ -5107,7 +5107,7 @@
 "It is recommended to increase it to at least %d MB"
 msgstr ""
 
-#: src/dialogs.c:2429
+#: src/dialogs.c:2496
 #, c-format
 msgid ""
 "\n"
@@ -5116,7 +5116,7 @@
 "Do you wish to delete them ?\n"
 msgstr ""
 
-#: src/dialogs.c:2436
+#: src/dialogs.c:2504
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for multitrack undo.\n"
@@ -5124,7 +5124,7 @@
 "using Preferences/Multitrack/Undo Memory\n"
 msgstr ""
 
-#: src/dialogs.c:2440
+#: src/dialogs.c:2508
 msgid ""
 "\n"
 "Out of memory for undo.\n"
@@ -5132,7 +5132,7 @@
 "using Preferences/Multitrack/Undo Memory\n"
 msgstr ""
 
-#: src/dialogs.c:2444
+#: src/dialogs.c:2512
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for the multitrack undo buffer.\n"
@@ -5141,50 +5141,50 @@
 "LiVES ne peut allouer suffisamment de mémoire pour l'historique des "
 "opérations multipiste.\n"
 
-#: src/dialogs.c:2446
+#: src/dialogs.c:2514
 msgid "or enter a smaller value.\n"
 msgstr "ou entrer une valeur plug petite.\n"
 
-#: src/dialogs.c:2448
+#: src/dialogs.c:2516
 msgid "Try again from the clip editor, try closing some other applications\n"
 msgstr ""
 
-#: src/dialogs.c:2449
+#: src/dialogs.c:2517
 msgid "Try closing some other applications\n"
 msgstr ""
 
-#: src/dialogs.c:2460
+#: src/dialogs.c:2529
 msgid ""
 "Multitrack is set to 0 audio channels, but this layout has audio.\n"
 "You should adjust the audio settings from the Tools menu.\n"
 msgstr ""
 
-#: src/dialogs.c:2464
+#: src/dialogs.c:2534
 msgid ""
 "The current layout has audio, so audio channels may not be set to zero.\n"
 msgstr ""
 
-#: src/dialogs.c:2468
+#: src/dialogs.c:2539
 msgid ""
 "Multitrack audio preview is only available with the\n"
 "\"jack\" or \"pulse audio\" audio player.\n"
 "You can set this in Tools|Preferences|Playback."
 msgstr ""
 
-#: src/dialogs.c:2472
+#: src/dialogs.c:2545
 msgid ""
 "Errors were detected in the layout (which may be due to transferring from "
 "another system, or from an older version of LiVES).\n"
 "Should I try to repair the disk copy of the layout ?\n"
 msgstr ""
 
-#: src/dialogs.c:2476
+#: src/dialogs.c:2549
 msgid ""
 "LiVES was unable to load the layout.\n"
 "Sorry.\n"
 msgstr ""
 
-#: src/dialogs.c:2482
+#: src/dialogs.c:2555
 msgid ""
 "\n"
 "\n"
@@ -5194,7 +5194,7 @@
 "\n"
 "Le taux audio doit être supérieur à 0.\n"
 
-#: src/dialogs.c:2486
+#: src/dialogs.c:2559
 msgid ""
 "\n"
 "Event list will be very large\n"
@@ -5202,7 +5202,7 @@
 "Are you sure you wish to view it ?\n"
 msgstr ""
 
-#: src/dialogs.c:2491
+#: src/dialogs.c:2564
 msgid ""
 "\n"
 "\n"
@@ -5212,7 +5212,7 @@
 "\n"
 "Vous devez installer 'dvgrab' pour utiliser cette fonction.\n"
 
-#: src/dialogs.c:2496
+#: src/dialogs.c:2570
 msgid ""
 "\n"
 "\n"
@@ -5221,25 +5221,25 @@
 "You may need to select one of these in Tools/Preferences/Playback.\n"
 msgstr ""
 
-#: src/dialogs.c:2500
+#: src/dialogs.c:2574
 msgid "Video playback plugin failed to initialise palette !\n"
 msgstr ""
 
-#: src/dialogs.c:2504
+#: src/dialogs.c:2579
 msgid "Decoder plugin failed to initialise palette !\n"
 msgstr ""
 
-#: src/dialogs.c:2509
+#: src/dialogs.c:2584
 msgid "Unable to set framerate of video plugin\n"
 msgstr ""
 
-#: src/dialogs.c:2514
+#: src/dialogs.c:2590
 msgid ""
 "After a crash, it is advisable to clean up the disk with\n"
 "File|Clean up disk space\n"
 msgstr ""
 
-#: src/dialogs.c:2526
+#: src/dialogs.c:2604
 #, c-format
 msgid ""
 "Stream frame size is too large for your network buffers.\n"
@@ -5248,33 +5248,33 @@
 "echo %d > /proc/sys/net/core/rmem_max\n"
 msgstr ""
 
-#: src/dialogs.c:2714
+#: src/dialogs.c:2800
 msgid "cancelled.\n"
 msgstr "annulé.\n"
 
-#: src/dialogs.c:2721
+#: src/dialogs.c:2805
 msgid "failed.\n"
 msgstr "échoué.\n"
 
-#: src/dialogs.c:2728
+#: src/dialogs.c:2810
 msgid "done.\n"
 msgstr "terminé.\n"
 
-#: src/dialogs.c:2732
+#: src/dialogs.c:2814
 msgid "error in file. Failed.\n"
 msgstr "erreur dans le fichier. Echec.\n"
 
-#: src/dialogs.c:2766 src/dialogs.c:2815 src/dialogs.c:2839
+#: src/dialogs.c:2848 src/dialogs.c:2897 src/dialogs.c:2921
 #, c-format
 msgid "Additional info: %s\n"
 msgstr ""
 
-#: src/dialogs.c:2769
+#: src/dialogs.c:2851
 #, c-format
 msgid "The error value was %d%s\n"
 msgstr ""
 
-#: src/dialogs.c:2772
+#: src/dialogs.c:2854
 #, c-format
 msgid ""
 "\n"
@@ -5284,7 +5284,7 @@
 "%s%s%s"
 msgstr ""
 
-#: src/dialogs.c:2818
+#: src/dialogs.c:2900
 #, c-format
 msgid ""
 "\n"
@@ -5294,7 +5294,7 @@
 "%s"
 msgstr ""
 
-#: src/dialogs.c:2842
+#: src/dialogs.c:2924
 #, c-format
 msgid ""
 "\n"
@@ -5304,7 +5304,7 @@
 "%s"
 msgstr ""
 
-#: src/dialogs.c:2886
+#: src/dialogs.c:2968
 #, c-format
 msgid ""
 "\n"
@@ -5313,7 +5313,7 @@
 "Please check for possible error causes.\n"
 msgstr ""
 
-#: src/dialogs.c:2890
+#: src/dialogs.c:2971
 #, c-format
 msgid ""
 "\n"
@@ -5323,7 +5323,7 @@
 "%s.\n"
 msgstr ""
 
-#: src/dialogs.c:2921
+#: src/dialogs.c:3002
 #, c-format
 msgid ""
 "\n"
@@ -5332,7 +5332,7 @@
 "Please check for possible error causes.\n"
 msgstr ""
 
-#: src/dialogs.c:2925
+#: src/dialogs.c:3005
 #, c-format
 msgid ""
 "\n"
@@ -5342,12 +5342,12 @@
 "%s.\n"
 msgstr ""
 
-#: src/dialogs.c:2993
+#: src/dialogs.c:3073
 #, c-format
 msgid "Value for \"%s\" could not be read."
 msgstr ""
 
-#: src/dialogs.c:3011
+#: src/dialogs.c:3091
 #, c-format
 msgid ""
 "\n"
@@ -5356,7 +5356,7 @@
 "Please check your system for errors.\n"
 msgstr ""
 
-#: src/dialogs.c:3020
+#: src/dialogs.c:3100
 #, c-format
 msgid ""
 "\n"
@@ -5369,7 +5369,7 @@
 "%s\n"
 "Vérifiez les permissions du fichier et essayez à nouveau."
 
-#: src/dialogs.c:3027
+#: src/dialogs.c:3109
 #, c-format
 msgid ""
 "\n"
@@ -5378,7 +5378,7 @@
 "Please check the directory permissions and try again."
 msgstr ""
 
-#: src/dialogs.c:3034
+#: src/dialogs.c:3116
 #, c-format
 msgid ""
 "\n"
@@ -5386,14 +5386,14 @@
 "%s\n"
 msgstr ""
 
-#: src/dialogs.c:3041
+#: src/dialogs.c:3123
 msgid ""
 "\n"
 "Abort and exit immediately from LiVES\n"
 "Are you sure ?\n"
 msgstr ""
 
-#: src/dialogs.c:3047
+#: src/dialogs.c:3129
 #, c-format
 msgid ""
 "\n"
@@ -5401,13 +5401,13 @@
 "Please select another encoder from the list.\n"
 msgstr ""
 
-#: src/dialogs.c:3056
+#: src/dialogs.c:3139
 msgid ""
 "\n"
 "This card is already in use and cannot be opened multiple times.\n"
 msgstr ""
 
-#: src/dialogs.c:3061
+#: src/dialogs.c:3145
 #, c-format
 msgid ""
 "\n"
@@ -5417,27 +5417,27 @@
 "- Check if the device actually exists.\n"
 msgstr ""
 
-#: src/dialogs.c:3068
+#: src/dialogs.c:3153
 msgid ""
 "\n"
 "This file already has subtitles loaded.\n"
 "Do you wish to overwrite the existing subtitles ?\n"
 msgstr ""
 
-#: src/dialogs.c:3072
+#: src/dialogs.c:3157
 msgid ""
 "\n"
 "LiVES currently only supports subtitles of type .srt and .sub.\n"
 msgstr ""
 
-#: src/dialogs.c:3076
+#: src/dialogs.c:3161
 msgid ""
 "\n"
 "Erase all subtitles from this clip.\n"
 "Are you sure ?\n"
 msgstr ""
 
-#: src/dialogs.c:3082
+#: src/dialogs.c:3168
 #, c-format
 msgid ""
 "\n"
@@ -5446,14 +5446,14 @@
 "or OK to continue and save as type \"%s\"\n"
 msgstr ""
 
-#: src/dialogs.c:3089
+#: src/dialogs.c:3176
 msgid ""
 "\n"
 "Do you wish to move the current clip sets to the new directory ?\n"
 "(If unsure, click Yes)\n"
 msgstr ""
 
-#: src/dialogs.c:3093
+#: src/dialogs.c:3181
 #, c-format
 msgid ""
 "\n"
@@ -5464,19 +5464,19 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:3099
+#: src/dialogs.c:3188
 msgid ""
 "\n"
 "No video input devices could be found.\n"
 msgstr ""
 
-#: src/dialogs.c:3103
+#: src/dialogs.c:3192
 msgid ""
 "\n"
 "All video input devices are already in use.\n"
 msgstr ""
 
-#: src/dialogs.c:3107
+#: src/dialogs.c:3196
 msgid ""
 "\n"
 "\n"
@@ -5484,15 +5484,14 @@
 "DO NOT SHUT DOWN OR CLOSE LIVES !\n"
 msgstr ""
 
-#: src/dialogs.c:3127
+#: src/dialogs.c:3203
 #, c-format
 msgid ""
 "No clips were recovered for set (%s).\n"
 "Please check the spelling of the set name and try again.\n"
 msgstr ""
 
-#. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:3136
+#: src/dialogs.c:3214
 #, c-format
 msgid ""
 "\n"
@@ -5504,7 +5503,7 @@
 msgstr ""
 
 #. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:3144
+#: src/dialogs.c:3222
 #, c-format
 msgid ""
 "\n"
@@ -5513,34 +5512,34 @@
 "\n"
 msgstr ""
 
-#: src/dialogs.c:3150
+#: src/dialogs.c:3228
 msgid ""
 "\n"
 "You must have autolives.pl installed and in your path to use this toy.\n"
 "Consult your package distributor.\n"
 msgstr ""
 
-#: src/dialogs.c:3154
+#: src/dialogs.c:3232
 msgid ""
 "\n"
 "You must have a minimum of one clip loaded to use this toy.\n"
 msgstr ""
 
-#: src/dialogs.c:3158
+#: src/dialogs.c:3236
 msgid ""
 "\n"
 "LiVES lost its connection to jack and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:3162
+#: src/dialogs.c:3240
 msgid ""
 "\n"
 "LiVES lost its connection to pulseaudio and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:3175
+#: src/dialogs.c:3254
 #, c-format
 msgid ""
 "\n"
@@ -5549,285 +5548,285 @@
 "Do you wish to allow this (for this session only) ?\n"
 msgstr ""
 
-#: src/effects.c:60
+#: src/effects.c:61
 msgid "generator"
 msgstr "générateur"
 
-#: src/effects.c:61
+#: src/effects.c:62
 msgid "Generators"
 msgstr "Générateur"
 
-#: src/effects.c:63
+#: src/effects.c:64
 msgid "audio generator"
 msgstr ""
 
-#: src/effects.c:64
+#: src/effects.c:65
 msgid "Audio Generators"
 msgstr ""
 
-#: src/effects.c:66
+#: src/effects.c:67
 msgid "audio/video generator"
 msgstr ""
 
-#: src/effects.c:67
+#: src/effects.c:68
 msgid "Audio/Video Generators"
 msgstr ""
 
-#: src/effects.c:69
+#: src/effects.c:70
 msgid "data generator"
 msgstr ""
 
-#: src/effects.c:70
+#: src/effects.c:71
 msgid "Data Generators"
 msgstr ""
 
-#: src/effects.c:72
+#: src/effects.c:73
 msgid "data visualiser"
 msgstr ""
 
-#: src/effects.c:73
+#: src/effects.c:74
 msgid "Data Visualisers"
 msgstr ""
 
-#: src/effects.c:75
+#: src/effects.c:76
 msgid "data processor"
 msgstr ""
 
-#: src/effects.c:76
+#: src/effects.c:77
 msgid "Data Processors"
 msgstr ""
 
-#: src/effects.c:78
+#: src/effects.c:79
 msgid "data source"
 msgstr ""
 
-#: src/effects.c:79
+#: src/effects.c:80
 msgid "Data Sources"
 msgstr ""
 
-#: src/effects.c:81
+#: src/effects.c:82
 msgid "transition"
 msgstr "transition"
 
-#: src/effects.c:82
+#: src/effects.c:83
 msgid "Transitions"
 msgstr "Transitions"
 
-#: src/effects.c:84
+#: src/effects.c:85
 msgid "effect"
 msgstr "effets"
 
-#: src/effects.c:87 src/rfx-builder.c:187
+#: src/effects.c:88 src/rfx-builder.c:187
 msgid "utility"
 msgstr "Utilitaire"
 
-#: src/effects.c:88
+#: src/effects.c:89
 msgid "Utilities"
 msgstr "Utilitaires"
 
-#: src/effects.c:90
+#: src/effects.c:91
 msgid "compositor"
 msgstr "compositeur"
 
-#: src/effects.c:91
+#: src/effects.c:92
 msgid "Compositors"
 msgstr "Compositeurs"
 
-#: src/effects.c:93
+#: src/effects.c:94
 msgid "tap"
 msgstr "tap"
 
-#: src/effects.c:94
+#: src/effects.c:95
 msgid "Taps"
 msgstr ""
 
-#: src/effects.c:96
+#: src/effects.c:97
 msgid "splitter"
 msgstr "séparateur"
 
-#: src/effects.c:97
+#: src/effects.c:98
 msgid "Splitters"
 msgstr "Séparateurs"
 
-#: src/effects.c:99
+#: src/effects.c:100
 msgid "converter"
 msgstr ""
 
-#: src/effects.c:100
+#: src/effects.c:101
 msgid "Converters"
 msgstr "Convertisseurs"
 
-#: src/effects.c:102
+#: src/effects.c:103
 msgid "analyser"
 msgstr ""
 
-#: src/effects.c:103
+#: src/effects.c:104
 msgid "Analysers"
 msgstr ""
 
-#: src/effects.c:108
+#: src/effects.c:109
 msgid "audio/video"
-msgstr ""
+msgstr "audio/vidéo"
 
-#: src/effects.c:109
+#: src/effects.c:110
 msgid "Audio/Video Transitions"
 msgstr "Transitions Audio/Vidéo"
 
-#: src/effects.c:111
+#: src/effects.c:112
 msgid "video only"
 msgstr ""
 
-#: src/effects.c:112
+#: src/effects.c:113
 msgid "Video only Transitions"
 msgstr ""
 
-#: src/effects.c:114 src/multitrack.c:10740
+#: src/effects.c:115 src/multitrack.c:10962
 msgid "audio only"
 msgstr "audio seulement"
 
-#: src/effects.c:115
+#: src/effects.c:116
 msgid "Audio only Transitions"
 msgstr ""
 
-#: src/effects.c:117 src/effects.c:120 src/multitrack.c:18757
+#: src/effects.c:118 src/effects.c:121 src/multitrack.c:19097
 msgid "audio"
 msgstr "audio"
 
-#: src/effects.c:118
+#: src/effects.c:119
 msgid "Audio Mixers"
 msgstr "Mixers Audio"
 
-#: src/effects.c:121
+#: src/effects.c:122
 msgid "Audio Effects"
 msgstr ""
 
-#: src/effects.c:123
+#: src/effects.c:124
 msgid "video"
-msgstr ""
+msgstr "vidéo"
 
-#: src/effects.c:124
+#: src/effects.c:125
 msgid "Video Effects"
 msgstr ""
 
-#: src/effects.c:126
+#: src/effects.c:127
 msgid "audio volume controller"
 msgstr ""
 
-#: src/effects.c:127
+#: src/effects.c:128
 msgid "Audio Volume Controllers"
 msgstr ""
 
-#: src/effects.c:129
+#: src/effects.c:130
 msgid "video analyser"
 msgstr ""
 
-#: src/effects.c:130
+#: src/effects.c:131
 msgid "Video analysers"
 msgstr ""
 
-#: src/effects.c:132
+#: src/effects.c:133
 msgid "audio analyser"
 msgstr ""
 
-#: src/effects.c:133
+#: src/effects.c:134
 msgid "Audio Analysers"
 msgstr ""
 
-#: src/effects.c:137 src/plugins.c:2559 src/plugins.c:2573
+#: src/effects.c:138 src/plugins.c:2507 src/plugins.c:2521
 msgid "unknown"
 msgstr "inconnu"
 
-#: src/effects.c:238
+#: src/effects.c:235
 #, c-format
 msgid "%s all frames..."
 msgstr "%s toutes les images...."
 
-#: src/effects.c:243
+#: src/effects.c:239
 #, c-format
 msgid "%s clipboard into frames %d to %d..."
 msgstr "%s le presse-papiers dans les images %d à %d..."
 
-#: src/effects.c:250
+#: src/effects.c:245
 #, c-format
 msgid "%s to clipboard..."
 msgstr "%s vers le presse-papiers..."
 
-#: src/effects.c:254
+#: src/effects.c:248
 #, c-format
 msgid "%s to new clip..."
 msgstr "%s vers un nouveau clip..."
 
-#: src/effects.c:259
+#: src/effects.c:252
 #, c-format
 msgid "%s frames %d to %d..."
 msgstr "%s images %d à %d...."
 
-#: src/effects.c:290
+#: src/effects.c:283
 #, c-format
 msgid "%s clipboard with selection"
 msgstr "%s le presse-papiers avec la sélection"
 
-#: src/effects.c:295
+#: src/effects.c:287
 #, c-format
 msgid "%s to clipboard"
 msgstr "%s vers le presse-papiers"
 
-#: src/effects.c:299
+#: src/effects.c:290
 #, c-format
 msgid "%s to new clip"
 msgstr "%s vers un nouveau clip"
 
-#: src/effects.c:304
+#: src/effects.c:294
 #, c-format
 msgid "%s frames %d to %d"
 msgstr "%s images %d à %d"
 
-#: src/effects.c:456 src/effects.c:523
+#: src/effects.c:443 src/effects.c:507
 msgid ""
 "\n"
 "No frames were generated.\n"
 msgstr ""
 
-#: src/effects-weed.c:431
+#: src/effects-weed.c:452
 msgid "integer"
-msgstr ""
+msgstr "entier"
 
-#: src/effects-weed.c:432
+#: src/effects-weed.c:454
 msgid "int64"
 msgstr ""
 
-#: src/effects-weed.c:433
+#: src/effects-weed.c:456
 msgid "boolean"
-msgstr ""
+msgstr "booléen"
 
-#: src/effects-weed.c:434
+#: src/effects-weed.c:458
 msgid "double"
-msgstr ""
+msgstr "double"
 
-#: src/effects-weed.c:435
+#: src/effects-weed.c:460
 msgid "string"
-msgstr ""
+msgstr "chaîne de caractères"
 
-#: src/effects-weed.c:436
+#: src/effects-weed.c:462
 msgid "pointer"
-msgstr ""
+msgstr "pointeur"
 
-#: src/effects-weed.c:4591
+#: src/effects-weed.c:4581
 #, c-format
 msgid "Error: plugin %s has no weed_setup() function.\n"
 msgstr "Erreur: le greffon %s n'a pas de fonction weed_setup().\n"
 
-#: src/effects-weed.c:4606
+#: src/effects-weed.c:4595
 #, c-format
 msgid "No usable filters found in plugin %s\n"
 msgstr ""
 
-#: src/effects-weed.c:4680
+#: src/effects-weed.c:4668
 #, c-format
 msgid "Found duplicate plugin %s"
 msgstr ""
 
-#: src/effects-weed.c:4734
+#: src/effects-weed.c:4723
 #, c-format
 msgid ""
 "Info: Unable to load plugin %s\n"
@@ -5836,259 +5835,258 @@
 "Info: Impossible de charger le plugin %s\n"
 "L'erreur était: %s\n"
 
-#: src/effects-weed.c:4737 src/effects-weed.c:5858
+#: src/effects-weed.c:4726 src/effects-weed.c:5847
 msgid "Some plugin directories"
 msgstr ""
 
 #. TRANSLATORS: example " - LADSPA plugins -"
-#: src/effects-weed.c:4812 src/rte_window.c:2105
+#: src/effects-weed.c:4801 src/rte_window.c:2107
 #, c-format
 msgid " - %s plugins -"
 msgstr ""
 
-#: src/effects-weed.c:5012
+#: src/effects-weed.c:4998
 #, c-format
 msgid "Successfully loaded %d Weed filters\n"
 msgstr ""
 
-#: src/effects-weed.c:5177
+#: src/effects-weed.c:5162
 #, c-format
 msgid "Invalid compound effect %s - has conflicting target_fps\n"
 msgstr ""
 
-#: src/effects-weed.c:5197
+#: src/effects-weed.c:5182
 #, c-format
 msgid "Invalid compound effect %s - has multiple transition parameters\n"
 msgstr ""
 
-#: src/effects-weed.c:5211
+#: src/effects-weed.c:5196
 #, c-format
 msgid "Invalid compound effect %s - has multiple master volume parameters\n"
 msgstr ""
 
-#: src/effects-weed.c:5346
+#: src/effects-weed.c:5329
 #, c-format
 msgid "Invalid compound effect %s - must have >1 sub filters\n"
 msgstr ""
 
-#: src/effects-weed.c:5366
+#: src/effects-weed.c:5349
 #, c-format
 msgid "Invalid effect %s found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5381
+#: src/effects-weed.c:5364
 #, c-format
 msgid "Invalid default found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5392
+#: src/effects-weed.c:5375
 #, c-format
 msgid "Invalid filter %d for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5406
+#: src/effects-weed.c:5389
 #, c-format
 msgid "Invalid param %d for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5433
+#: src/effects-weed.c:5416
 #, c-format
 msgid ""
 "Invalid number of values for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5467
+#: src/effects-weed.c:5450
 #, c-format
 msgid ""
 "Invalid non-boolean value for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5500
+#: src/effects-weed.c:5483
 #, c-format
 msgid "Invalid param link found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5511
+#: src/effects-weed.c:5494
 #, c-format
 msgid ""
 "Invalid out filter %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5529
+#: src/effects-weed.c:5513
 #, c-format
 msgid ""
 "Invalid out param %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5541
+#: src/effects-weed.c:5526
 #, c-format
 msgid ""
 "Invalid non-boolean value for autoscale found in compound effect %s, line "
 "%d\n"
 msgstr ""
 
-#: src/effects-weed.c:5552
+#: src/effects-weed.c:5537
 #, c-format
 msgid ""
 "Invalid in filter %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5566
+#: src/effects-weed.c:5552
 #, c-format
 msgid ""
 "Invalid in param %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5594
+#: src/effects-weed.c:5581
 #, c-format
 msgid "Invalid channel link found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5605
+#: src/effects-weed.c:5592
 #, c-format
 msgid ""
 "Invalid out filter %d for link channels found in compound effect %s, line "
 "%d\n"
 msgstr ""
 
-#: src/effects-weed.c:5623
+#: src/effects-weed.c:5611
 #, c-format
 msgid ""
 "Invalid out channel %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5633
+#: src/effects-weed.c:5622
 #, c-format
 msgid ""
 "Invalid in filter %d for link channels found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5651
+#: src/effects-weed.c:5641
 #, c-format
 msgid ""
 "Invalid in channel %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5687
+#: src/effects-weed.c:5678
 #, c-format
 msgid "Compound:%s"
 msgstr ""
 
-#: src/effects-weed.c:5758
+#: src/effects-weed.c:5749
 #, c-format
 msgid "Successfully loaded %d compound filters\n"
 msgstr ""
 
-#: src/effects-weed.c:6591
+#: src/effects-weed.c:6570
 #, c-format
 msgid "Effect %s cannot be used with this audio player.\n"
 msgstr ""
 
-#: src/effects-weed.c:6737
+#: src/effects-weed.c:6718
 #, c-format
 msgid "Failed to start instance %s, error code %d\n"
 msgstr "Impossible de charger l'instance %s, code d'erreur %d\n"
 
-#: src/effects-weed.c:6814
+#: src/effects-weed.c:6797
 #, c-format
 msgid "Unable to start generator %s\n"
 msgstr "Impossible de charger le générateur %s\n"
 
-#: src/effects-weed.c:7621
+#: src/effects-weed.c:7607
 #, c-format
 msgid "Failed to start generator %s\n"
 msgstr "Impossible de démarrer le générateur %s.\n"
 
-#: src/effects-weed.c:7718
+#: src/effects-weed.c:7701
 #, c-format
 msgid "Failed to start generator %s, error %d\n"
 msgstr "Impossible de charger le générateur %s, erreur %d.\n"
 
-#: src/effects-weed.c:9012
+#: src/effects-weed.c:8993
 #, c-format
 msgid "%s [unstable] (%s)"
 msgstr ""
 
-#: src/effects-data.c:3278
+#: src/effects-data.c:3234
 #, c-format
 msgid "ACTIVATE (%s)"
 msgstr ""
 
-#: src/effects-data.c:3548
+#: src/effects-data.c:3501
 msgid "ACTIVATE"
 msgstr ""
 
-#: src/effects-data.c:3876
+#: src/effects-data.c:3829
 #, c-format
 msgid "Key slot %d"
 msgstr ""
 
-#: src/effects-data.c:3998
+#: src/effects-data.c:3951
 msgid "Autoscale"
 msgstr ""
 
-#: src/effects-data.c:4089
+#: src/effects-data.c:4042
 msgid "Add another connection for this output parameter"
 msgstr ""
 
-#: src/effects-data.c:4102 src/effects-data.c:4151
-#, fuzzy
+#: src/effects-data.c:4055 src/effects-data.c:4104
 msgid "Delete this connection"
-msgstr "_Supprimer cet effet"
+msgstr ""
 
-#: src/effects-data.c:4138
+#: src/effects-data.c:4091
 msgid "Add another connection for this output channel"
 msgstr ""
 
-#: src/effects-data.c:4223
+#: src/effects-data.c:4176
 msgid "Connected to -->"
 msgstr ""
 
-#: src/effects-data.c:4243
+#: src/effects-data.c:4196
 #, c-format
 msgid "%s - Alpha Channel Connections"
 msgstr ""
 
-#: src/effects-data.c:4316
+#: src/effects-data.c:4269
 #, c-format
 msgid "%s - Parameter Data Connections"
 msgstr ""
 
-#: src/effects-data.c:4336
+#: src/effects-data.c:4289
 msgid "Autoscale All"
 msgstr ""
 
-#: src/effects-data.c:4361 src/effects-data.c:4890
+#: src/effects-data.c:4314 src/effects-data.c:4841
 msgid "ACTIVATED"
 msgstr ""
 
-#: src/effects-data.c:4774
+#: src/effects-data.c:4726
 msgid "LiVES: - Parameter and Alpha Channel Connections"
 msgstr ""
 
-#: src/effects-data.c:4785
+#: src/effects-data.c:4736
 msgid "Auto Connect Channels"
 msgstr ""
 
-#: src/effects-data.c:4797
+#: src/effects-data.c:4748
 msgid "Auto Connect Parameters"
 msgstr ""
 
-#: src/effects-data.c:4807
+#: src/effects-data.c:4758
 msgid "Disconnect All"
-msgstr ""
+msgstr "Tout déconnecter"
 
-#: src/effects-data.c:4875
+#: src/effects-data.c:4826
 #, c-format
 msgid "Input channel is already connected from (%d,%d) %s"
 msgstr ""
 
-#: src/effects-data.c:4891
+#: src/effects-data.c:4842
 #, c-format
 msgid "Input parameter is already connected from (%d,%d) %s"
 msgstr ""
 
-#: src/effects-data.c:4899
+#: src/effects-data.c:4851
 msgid "Input and output parameters are not compatible"
 msgstr ""
 
@@ -6100,43 +6098,43 @@
 msgid "_Reset Values"
 msgstr "_Remise à Zéro des valeurs"
 
-#: src/framedraw.c:267
+#: src/framedraw.c:265
 msgid "_Frame"
 msgstr ""
 
-#: src/paramspecial.c:266
+#: src/paramspecial.c:259
 msgid "Maintain _Aspect Ratio"
 msgstr "M_aintenir Proportions"
 
-#: src/paramspecial.c:267
+#: src/paramspecial.c:260
 msgid "Maintain aspect ratio of original frame"
 msgstr "Maintenir les proportions originales"
 
-#: src/paramspecial.c:341
+#: src/paramspecial.c:335
 msgid "Display Password"
 msgstr ""
 
-#: src/paramwindow.c:450
+#: src/paramwindow.c:447
 msgid "Transition _In"
 msgstr "Transition d'entrée"
 
-#: src/paramwindow.c:452
+#: src/paramwindow.c:449
 msgid "Click to set the transition parameter to show only the front frame"
 msgstr ""
 
-#: src/paramwindow.c:474
+#: src/paramwindow.c:472
 msgid "Crossfade audio"
 msgstr ""
 
-#: src/paramwindow.c:475
+#: src/paramwindow.c:473
 msgid "Check the box to make audio transition with the video"
 msgstr ""
 
-#: src/paramwindow.c:493
+#: src/paramwindow.c:492
 msgid "Transition _Out"
 msgstr ""
 
-#: src/paramwindow.c:495
+#: src/paramwindow.c:494
 msgid "Click to set the transition parameter to show only the rear frame"
 msgstr ""
 
@@ -6149,23 +6147,23 @@
 msgid "%s : size"
 msgstr "%s : taille"
 
-#: src/paramwindow.c:598
+#: src/paramwindow.c:597
 msgid "New size (pixels)"
 msgstr "Nouvelle taille (pixels)"
 
-#: src/paramwindow.c:617 src/plugins.c:997
+#: src/paramwindow.c:616 src/plugins.c:973
 msgid "_Width"
 msgstr "Largeur"
 
-#: src/paramwindow.c:636 src/plugins.c:1003
+#: src/paramwindow.c:635 src/plugins.c:979
 msgid "_Height"
 msgstr "_Hauteur"
 
-#: src/paramwindow.c:684
+#: src/paramwindow.c:683
 msgid "Generate to _Clipboard"
 msgstr "Générer vers le presse-papiers"
 
-#: src/paramwindow.c:686
+#: src/paramwindow.c:685
 msgid "Generate frames to the clipboard"
 msgstr "Générer les images vers le Presse-papiers..."
 
@@ -6177,7 +6175,7 @@
 msgid "Generate frames to a new clip"
 msgstr "Générer les images vers un nouveau clip"
 
-#: src/paramwindow.c:822
+#: src/paramwindow.c:824
 #, c-format
 msgid ""
 "\n"
@@ -6188,59 +6186,59 @@
 "Vous devez sélectionner au moins %d images pour utiliser cet effet.\n"
 "\n"
 
-#: src/paramwindow.c:920 src/paramwindow.c:930
+#: src/paramwindow.c:934 src/paramwindow.c:942
 msgid "Set as default"
 msgstr "Utiliser par défault"
 
-#: src/paramwindow.c:922 src/paramwindow.c:938
+#: src/paramwindow.c:936 src/paramwindow.c:950
 msgid "Reset"
-msgstr ""
+msgstr "Réinitialiser"
 
-#: src/paramwindow.c:932 src/rte_window.c:2401 src/omc-learn.c:1357
+#: src/paramwindow.c:944 src/rte_window.c:2394 src/omc-learn.c:1347
 msgid "Close _window"
 msgstr "Fermer la fenêtre"
 
-#: src/paramwindow.c:1337
+#: src/paramwindow.c:1340
 msgid "No parameters"
 msgstr "Pas de paramètre"
 
-#: src/paramwindow.c:1419
+#: src/paramwindow.c:1424
 msgid "Invalid parameter"
 msgstr "Paramètre non valide"
 
-#: src/paramwindow.c:1611
+#: src/paramwindow.c:1610
 msgid "LiVES: - Select Colour"
 msgstr "LiVES:- Sélectionne Couleur"
 
-#: src/paramwindow.c:1616
+#: src/paramwindow.c:1615
 msgid "Click to set the colour"
 msgstr "Cliquez pour changer la couleur"
 
-#: src/paramwindow.c:1628
+#: src/paramwindow.c:1626
 msgid "_Red"
-msgstr ""
+msgstr "_Rouge"
 
-#: src/paramwindow.c:1629
+#: src/paramwindow.c:1627
 msgid "The red value (0 - 255)"
 msgstr "Valeur de rouge  (0 - 255)"
 
-#: src/paramwindow.c:1632
+#: src/paramwindow.c:1630
 msgid "_Green"
-msgstr ""
+msgstr "_Vert"
 
-#: src/paramwindow.c:1633
+#: src/paramwindow.c:1631
 msgid "The green value (0 - 255)"
 msgstr "Valeur de vert  (0 - 255)"
 
-#: src/paramwindow.c:1636
+#: src/paramwindow.c:1634
 msgid "_Blue"
-msgstr ""
+msgstr "_Bleu"
 
-#: src/paramwindow.c:1637
+#: src/paramwindow.c:1635
 msgid "The blue value (0 - 255)"
 msgstr "Valeur de bleu  (0 - 255)"
 
-#: src/plugins.c:85
+#: src/plugins.c:86
 #, c-format
 msgid ""
 "\n"
@@ -6249,12 +6247,12 @@
 "\n"
 "Erreur plugin : %s a échoué avec le code %d"
 
-#: src/plugins.c:87
+#: src/plugins.c:88
 #, c-format
 msgid " : message was %s\n"
 msgstr " : le message était %s\n"
 
-#: src/plugins.c:387
+#: src/plugins.c:375
 #, c-format
 msgid ""
 "\n"
@@ -6269,17 +6267,17 @@
 "%s\n"
 "Code d'erreur %d\n"
 
-#: src/plugins.c:397
+#: src/plugins.c:385
 #, c-format
 msgid "Updating video playback plugin defaults in %s\n"
 msgstr "Actualisation du module de lecture vidéo par défault depuis %s\n"
 
-#: src/plugins.c:452
+#: src/plugins.c:444
 #, c-format
 msgid "Loading video playback plugin defaults from %s..."
 msgstr "Chargement du module de lecture vidéo par défault depuis %s..."
 
-#: src/plugins.c:515
+#: src/plugins.c:505
 #, c-format
 msgid ""
 "\n"
@@ -6289,32 +6287,32 @@
 "\n"
 msgstr ""
 
-#: src/plugins.c:855
+#: src/plugins.c:836
 #, c-format
 msgid "Saving playback plugin defaults to %s..."
 msgstr ""
 
-#: src/plugins.c:962
+#: src/plugins.c:939
 msgid "_FPS"
 msgstr "_IPS"
 
-#: src/plugins.c:963
+#: src/plugins.c:940
 msgid "Fixed framerate for plugin.\n"
 msgstr ""
 
-#: src/plugins.c:1032
+#: src/plugins.c:1008
 msgid "_Colourspace"
 msgstr "Espace colorimétrique"
 
-#: src/plugins.c:1033
+#: src/plugins.c:1009
 msgid "Colourspace input to the plugin.\n"
 msgstr "Entré colorimétrique vers le plugin.\n"
 
-#: src/plugins.c:1089
+#: src/plugins.c:1065
 msgid "Save settings to an alternate file.\n"
 msgstr ""
 
-#: src/plugins.c:1206
+#: src/plugins.c:1182
 #, c-format
 msgid ""
 "\n"
@@ -6327,7 +6325,7 @@
 "Échec à l'ouverture du module de lecture %s\n"
 "L'erreur était %s\n"
 
-#: src/plugins.c:1252
+#: src/plugins.c:1228
 #, c-format
 msgid ""
 "\n"
@@ -6337,7 +6335,7 @@
 "Unable to use it.\n"
 msgstr ""
 
-#: src/plugins.c:1265
+#: src/plugins.c:1241
 #, c-format
 msgid ""
 "Video playback plugin failed to initialise.\n"
@@ -6346,31 +6344,31 @@
 "Échec à l'initialisation du module de lecture.\n"
 "L'erreur était: %s\n"
 
-#: src/plugins.c:1461
+#: src/plugins.c:1428
 msgid ""
 "\n"
 "Warning ! Video playback plugin will not send key presses. Keyboard may be "
 "disabled during plugin use !\n"
 msgstr ""
 
-#: src/plugins.c:1465
+#: src/plugins.c:1433
 #, c-format
 msgid ""
 "*** Using %s plugin for fs playback, agreed to use palette type %d ( %s ). "
 "***\n"
 msgstr ""
 
-#: src/plugins.c:1571
+#: src/plugins.c:1537
 #, c-format
 msgid "Audio stream unable to use preferred format '%s'\n"
 msgstr ""
 
-#: src/plugins.c:1579
+#: src/plugins.c:1543
 #, c-format
 msgid "Using format '%s' instead.\n"
 msgstr ""
 
-#: src/plugins.c:1616
+#: src/plugins.c:1579
 #, c-format
 msgid ""
 "LiVES was unable to find its encoder plugins. Please make sure you have the "
@@ -6379,7 +6377,7 @@
 "or change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/plugins.c:1624
+#: src/plugins.c:1589
 #, c-format
 msgid ""
 "LiVES did not receive a response from the encoder plugin called '%s'.\n"
@@ -6392,11 +6390,11 @@
 "%s%s%s\n"
 "ou basculez sur un autre plugin dans Outils|Préférences|Encodage\n"
 
-#: src/plugins.c:2032
+#: src/plugins.c:1987
 msgid "Unable to resize, please install imageMagick\n"
 msgstr ""
 
-#: src/plugins.c:2231
+#: src/plugins.c:2183
 #, c-format
 msgid ""
 "\n"
@@ -6404,12 +6402,12 @@
 "No decoders found in %s !\n"
 msgstr ""
 
-#: src/plugins.c:2415
-#, fuzzy, c-format
+#: src/plugins.c:2369
+#, c-format
 msgid " using %s"
-msgstr "Ouverture de %s"
+msgstr ""
 
-#: src/plugins.c:2499
+#: src/plugins.c:2451
 #, c-format
 msgid ""
 "\n"
@@ -6418,7 +6416,7 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/plugins.c:2522
+#: src/plugins.c:2472
 #, c-format
 msgid ""
 "\n"
@@ -6428,25 +6426,25 @@
 "Unable to use it.\n"
 msgstr ""
 
-#: src/plugins.c:2564
+#: src/plugins.c:2512
 msgid "/unknown"
 msgstr ""
 
-#: src/plugins.c:2651
+#: src/plugins.c:2598
 msgid "LiVES: - Decoder Plugins"
 msgstr ""
 
-#: src/plugins.c:2669
+#: src/plugins.c:2616
 msgid "Enabled Video Decoders (uncheck to disable)"
 msgstr ""
 
-#: src/plugins.c:2726
+#: src/plugins.c:2672
 #, c-format
 msgid "Failed to load %s, transitions may not resize.\n"
 msgstr ""
 "Chargement de %s échoué, les transitions ne peuvent être redimensionnées.\n"
 
-#: src/plugins.c:3854
+#: src/plugins.c:3797
 #, c-format
 msgid "%s advanced settings"
 msgstr "paramètres avancés %s"
@@ -6455,17 +6453,17 @@
 msgid "LiVES: - New Test RFX"
 msgstr "LiVES: - Nouvel Essai RFX"
 
-#: src/rfx-builder.c:136
+#: src/rfx-builder.c:135
 msgid "LiVES: - Edit Test RFX"
 msgstr "LiVES: - Édite l'Essai RFX"
 
-#: src/rfx-builder.c:166
+#: src/rfx-builder.c:165
 msgid "Type:"
 msgstr "Type :"
 
-#: src/rfx-builder.c:184
+#: src/rfx-builder.c:183
 msgid "tool"
-msgstr ""
+msgstr "outil"
 
 #: src/rfx-builder.c:192
 msgid "Name:          "
@@ -6475,125 +6473,125 @@
 msgid "The name of the plugin. No spaces allowed."
 msgstr "Le nom du plugin, Sans espaces."
 
-#: src/rfx-builder.c:201
+#: src/rfx-builder.c:202
 msgid "Version:       "
 msgstr "Version :       "
 
-#: src/rfx-builder.c:203
+#: src/rfx-builder.c:204
 msgid "The script version."
 msgstr "La version du script"
 
-#: src/rfx-builder.c:210
+#: src/rfx-builder.c:212
 msgid "    Author:       "
 msgstr "    Auteur :       "
 
-#: src/rfx-builder.c:211
+#: src/rfx-builder.c:213
 msgid "The script author."
 msgstr "L'auteur du script."
 
-#: src/rfx-builder.c:217
+#: src/rfx-builder.c:220
 msgid "    URL (optional):       "
 msgstr "    URL (optionel):       "
 
-#: src/rfx-builder.c:218
+#: src/rfx-builder.c:221
 msgid "URL for the plugin maintainer."
 msgstr "URL pour le mainteneur du plugin"
 
-#: src/rfx-builder.c:226
+#: src/rfx-builder.c:230
 msgid "Menu text:    "
 msgstr "Texte du Menu :    "
 
-#: src/rfx-builder.c:227
+#: src/rfx-builder.c:231
 msgid "The text to show in the menu."
 msgstr "Le texte à afficher dans le menu."
 
-#: src/rfx-builder.c:239
+#: src/rfx-builder.c:244
 msgid "Action description:        "
 msgstr "Description de l'action :        "
 
-#: src/rfx-builder.c:241
+#: src/rfx-builder.c:246
 msgid "Describe what the plugin is doing. E.g. \"Edge detecting\""
 msgstr "Décrivez ce que fait le plugin. Ex. \"Détection de Bords\""
 
-#: src/rfx-builder.c:246
+#: src/rfx-builder.c:251
 msgid "Minimum frames:"
 msgstr "Nombre d'images minimum :"
 
-#: src/rfx-builder.c:249
+#: src/rfx-builder.c:254
 msgid ""
 "Minimum number of frames this effect/tool can be applied to. Normally 1."
 msgstr "Le nombre minimum d'images pour cet effet/outil. Habituellement 1."
 
-#: src/rfx-builder.c:260
+#: src/rfx-builder.c:265
 msgid "_Requirements..."
 msgstr "A besoin de...."
 
-#: src/rfx-builder.c:263
+#: src/rfx-builder.c:268
 msgid "Enter any binaries required by the plugin."
 msgstr "Indiquez toutes les librairies d'on a besoin ce plugin."
 
-#: src/rfx-builder.c:267
+#: src/rfx-builder.c:272
 msgid "_Properties..."
 msgstr "_Propriétés...."
 
-#: src/rfx-builder.c:270
+#: src/rfx-builder.c:275
 msgid "Set properties for the plugin. Optional."
 msgstr "Fixer les propriétés pour ce plugin. Optionnel."
 
-#: src/rfx-builder.c:274
+#: src/rfx-builder.c:279
 msgid "_Parameters..."
 msgstr "_Paramètres...."
 
-#: src/rfx-builder.c:277
+#: src/rfx-builder.c:282
 msgid "Set up parameters used in pre/loop/post/trigger code. Optional."
 msgstr "Fixer les paramètres en code pre/loop/post/trigger. Optionnel."
 
-#: src/rfx-builder.c:281
+#: src/rfx-builder.c:286
 msgid "Parameter _Window Hints..."
 msgstr "Paramètres d'Info Bulle...."
 
-#: src/rfx-builder.c:284
+#: src/rfx-builder.c:289
 msgid "Set hints about how to lay out the parameter window. Optional."
 msgstr ""
 "Fixer les renseignements pour compléter la fenêtre des paramètres. Optionnel."
 
-#: src/rfx-builder.c:290
+#: src/rfx-builder.c:295
 msgid "_Language code:"
 msgstr ""
 
-#: src/rfx-builder.c:291
+#: src/rfx-builder.c:296
 msgid "Language for pre/loop/post/triggers. Optional."
 msgstr "Langage de programmation pour pre/loop/post/triggers. Optionnel."
 
-#: src/rfx-builder.c:300
+#: src/rfx-builder.c:305
 msgid "_Pre loop code..."
 msgstr "Code _Pre loop...."
 
-#: src/rfx-builder.c:303
+#: src/rfx-builder.c:308
 msgid "Code to be executed before the loop. Optional."
 msgstr "Code à exécuter avant la boucle (loop). Optionnel."
 
-#: src/rfx-builder.c:307
+#: src/rfx-builder.c:312
 msgid "_Loop code..."
 msgstr "Code Boucle..."
 
-#: src/rfx-builder.c:310
+#: src/rfx-builder.c:315
 msgid "Loop code to be applied to each frame."
 msgstr "Code de boucle appliqué à chaque image."
 
-#: src/rfx-builder.c:314
+#: src/rfx-builder.c:319
 msgid "_Post loop code..."
 msgstr "Code suivant la boucle...."
 
-#: src/rfx-builder.c:317
+#: src/rfx-builder.c:322
 msgid "Code to be executed after the loop. Optional."
 msgstr "Code devant être exécuté après la boucle. Optionnel."
 
-#: src/rfx-builder.c:321
+#: src/rfx-builder.c:326
 msgid "_Trigger code..."
 msgstr "Code _trigger..."
 
-#: src/rfx-builder.c:324
+#: src/rfx-builder.c:329
 msgid ""
 "Set trigger code for when the parameter window is shown, or when a parameter "
 "is changed. Optional (except for Utilities)."
@@ -6601,7 +6599,7 @@
 "Fixer le code trigger quand les paramètres de la fenêtre sont affichés ou "
 "lorsqu'un paramètre est changé. Optionnel (excepté pour les Utilitaires)."
 
-#: src/rfx-builder.c:421
+#: src/rfx-builder.c:426
 #, c-format
 msgid ""
 "\n"
@@ -6616,55 +6614,55 @@
 "%s\n"
 "%s\n"
 
-#: src/rfx-builder.c:544
+#: src/rfx-builder.c:541
 msgid "LiVES: - RFX Requirements"
 msgstr "LiVES: - Besoins RFX"
 
-#: src/rfx-builder.c:548
+#: src/rfx-builder.c:544
 msgid "LiVES: - RFX Parameters"
 msgstr "LiVES: - Paramètres RFX"
 
-#: src/rfx-builder.c:552
+#: src/rfx-builder.c:547
 msgid "LiVES: - RFX Parameter Window Hints"
 msgstr "LiVES: - Paramètres Info-Bulle de la fenêtre RFX"
 
-#: src/rfx-builder.c:556
+#: src/rfx-builder.c:550
 msgid "LiVES: - RFX Triggers"
 msgstr "LiVES: - Triggers RFX"
 
-#: src/rfx-builder.c:622
+#: src/rfx-builder.c:613
 msgid "_New Entry"
 msgstr "_Nouvelle Entrée"
 
-#: src/rfx-builder.c:625
+#: src/rfx-builder.c:616
 msgid "_Edit Entry"
 msgstr "_Édition Entrée"
 
-#: src/rfx-builder.c:628
+#: src/rfx-builder.c:619
 msgid "_Remove Entry"
 msgstr "Enlève_r Entrée"
 
-#: src/rfx-builder.c:632
+#: src/rfx-builder.c:623
 msgid "Move _Up"
 msgstr "Déplacer vers le _Haut"
 
-#: src/rfx-builder.c:635
+#: src/rfx-builder.c:626
 msgid "Move _Down"
 msgstr "Déplacer vers le _Bas"
 
-#: src/rfx-builder.c:1004
+#: src/rfx-builder.c:984
 msgid "LiVES: - RFX Properties"
 msgstr "LiVES: - Propriétés RFX"
 
-#: src/rfx-builder.c:1013
+#: src/rfx-builder.c:993
 msgid "_Slow (hint to GUI)"
 msgstr "Lent (avertir)"
 
-#: src/rfx-builder.c:1024
+#: src/rfx-builder.c:1004
 msgid "_Batch mode generator"
 msgstr ""
 
-#: src/rfx-builder.c:1831
+#: src/rfx-builder.c:1790
 msgid ""
 "\n"
 "\n"
@@ -6678,7 +6676,7 @@
 "Enlevez SVP le trigger en premier.\n"
 "\n"
 
-#: src/rfx-builder.c:1875
+#: src/rfx-builder.c:1834
 msgid ""
 "\n"
 "\n"
@@ -6690,27 +6688,27 @@
 "Quelques triggers ont été ajustés.\n"
 "Vérifiez SVP le code du trigger.\n"
 
-#: src/rfx-builder.c:1994
+#: src/rfx-builder.c:1950
 msgid "LiVES: - New RFX Parameter"
 msgstr "LiVES: - Nouveau Paramètre RFX"
 
-#: src/rfx-builder.c:1997
+#: src/rfx-builder.c:1952
 msgid "LiVES: - Edit RFX Parameter"
 msgstr "LiVES: - Édite le Paramètre RFX"
 
-#: src/rfx-builder.c:2013
+#: src/rfx-builder.c:1968
 msgid "_Name:    "
 msgstr "Nom:    "
 
-#: src/rfx-builder.c:2016
+#: src/rfx-builder.c:1971
 msgid "Name of the parameter, must be unique in the plugin."
 msgstr ""
 
-#: src/rfx-builder.c:2025
+#: src/rfx-builder.c:1981
 msgid "_Label:    "
 msgstr "Marque:    "
 
-#: src/rfx-builder.c:2028
+#: src/rfx-builder.c:1984
 msgid ""
 "Label to be shown by the parameter. An underscore represents mnemonic "
 "accelerator."
@@ -6718,160 +6716,160 @@
 "Étiquette devant être affichée par le paramètre. Un tiret bas « _ » indique "
 "le raccourci clavier."
 
-#: src/rfx-builder.c:2039
+#: src/rfx-builder.c:1996
 msgid "_Type:         "
 msgstr "_Genre:         "
 
-#: src/rfx-builder.c:2040
+#: src/rfx-builder.c:1997
 msgid "Parameter type (select from list)."
 msgstr "Typ de paramètre (sélection depuis la liste)."
 
-#: src/rfx-builder.c:2073
+#: src/rfx-builder.c:2029
 msgid "Decimal _places: "
 msgstr "_Places des décimales : "
 
-#: src/rfx-builder.c:2082 src/rfx-builder.c:2477 src/rfx-builder.c:2495
+#: src/rfx-builder.c:2038 src/rfx-builder.c:2430 src/rfx-builder.c:2447
 msgid "_Default value:    "
 msgstr "Valeur par défaut :    "
 
-#: src/rfx-builder.c:2098
+#: src/rfx-builder.c:2054
 msgid "_Default: "
 msgstr "Par défaut: "
 
-#: src/rfx-builder.c:2132
+#: src/rfx-builder.c:2087
 msgid "Button _Group: "
 msgstr "_Groupe de boutons : "
 
-#: src/rfx-builder.c:2134
+#: src/rfx-builder.c:2089
 msgid "A non-zero value can be used to group radio buttons."
 msgstr ""
 "Une valeur non égale à zéro peut être utilisée pour grouper les boutons "
 "radio."
 
-#: src/rfx-builder.c:2142 src/rfx-builder.c:2478
+#: src/rfx-builder.c:2097 src/rfx-builder.c:2431
 msgid "_Minimum value: "
 msgstr "Valeur _minimale: "
 
-#: src/rfx-builder.c:2148 src/rfx-builder.c:2479
+#: src/rfx-builder.c:2103 src/rfx-builder.c:2432
 msgid "Ma_ximum value: "
 msgstr "Valeur ma_ximale: "
 
-#: src/rfx-builder.c:2157
+#: src/rfx-builder.c:2113
 msgid "     _Step size:   "
 msgstr "     Taille du pas:   "
 
-#: src/rfx-builder.c:2160
+#: src/rfx-builder.c:2117
 msgid ""
 "How much the parameter is adjusted when the spinbutton arrows are pressed."
 msgstr ""
 
-#: src/rfx-builder.c:2171
+#: src/rfx-builder.c:2129
 msgid "_Wrap value"
 msgstr ""
 
-#: src/rfx-builder.c:2172
+#: src/rfx-builder.c:2131
 msgid "Whether the value wraps max->min and min->max."
 msgstr ""
 
-#: src/rfx-builder.c:2470
+#: src/rfx-builder.c:2424
 msgid "Set _values"
 msgstr "Pose _valeurs"
 
-#: src/rfx-builder.c:2512
+#: src/rfx-builder.c:2463
 msgid "Default _Red:  "
 msgstr "Défaut rouge:  "
 
-#: src/rfx-builder.c:2513
+#: src/rfx-builder.c:2464
 msgid "Default _Green:"
 msgstr "Défaut vert:"
 
-#: src/rfx-builder.c:2514
+#: src/rfx-builder.c:2465
 msgid "Default _Blue: "
 msgstr "Défaut bleu: "
 
-#: src/rfx-builder.c:2538
+#: src/rfx-builder.c:2488
 msgid "Set _default"
 msgstr "Définir par _défaut"
 
-#: src/rfx-builder.c:2540
+#: src/rfx-builder.c:2490
 msgid "Default value:  "
 msgstr "Valeur par défaut:  "
 
-#: src/rfx-builder.c:2541
+#: src/rfx-builder.c:2491
 msgid "Maximum length (chars): "
 msgstr "La longueur maximale du texte: "
 
-#: src/rfx-builder.c:2576
+#: src/rfx-builder.c:2526
 msgid "LiVES: - New RFX Parameter Window Hint"
 msgstr "LiVES: - Nouvelle Info-Bulle de Fenêtre RFX"
 
-#: src/rfx-builder.c:2579
+#: src/rfx-builder.c:2528
 msgid "LiVES: - Edit RFX Parameter Window Hint"
 msgstr "LiVES: - Édite Info-Bulle de Fenêtre RFX"
 
-#: src/rfx-builder.c:2622
+#: src/rfx-builder.c:2569
 msgid "_Keyword:         "
 msgstr ""
 
-#: src/rfx-builder.c:2639
+#: src/rfx-builder.c:2586
 msgid "Special _Type:         "
 msgstr ""
 
-#: src/rfx-builder.c:2656
+#: src/rfx-builder.c:2602
 msgid "Special _Subtype:         "
 msgstr ""
 
-#: src/rfx-builder.c:2667 src/rfx-builder.c:2706
+#: src/rfx-builder.c:2613 src/rfx-builder.c:2651
 msgid "Row:    "
 msgstr "Ligne :    "
 
-#: src/rfx-builder.c:2732
+#: src/rfx-builder.c:2676
 #, c-format
 msgid "Linked parameters (%d):    "
 msgstr "Paramètres liés (%d) :    "
 
-#: src/rfx-builder.c:2749
+#: src/rfx-builder.c:2693
 msgid "Linked parameters (4):    "
 msgstr "Paramètres liés (4) :    "
 
-#: src/rfx-builder.c:2752
+#: src/rfx-builder.c:2695
 msgid "Linked parameters (2):    "
 msgstr "Paramètres liés (2) :    "
 
-#: src/rfx-builder.c:2777
+#: src/rfx-builder.c:2720
 msgid "LiVES: - New RFX Trigger"
 msgstr "LiVES: - Nouveau Trigger RFX"
 
-#: src/rfx-builder.c:2780
+#: src/rfx-builder.c:2722
 msgid "LiVES: - Edit RFX Trigger"
 msgstr "LiVES: - Édite Trigger RFX"
 
-#: src/rfx-builder.c:2808
+#: src/rfx-builder.c:2750
 msgid "When:         "
 msgstr "Quand :         "
 
-#: src/rfx-builder.c:2904
+#: src/rfx-builder.c:2846
 msgid "LiVES: - Pre Loop Code"
 msgstr "LiVES: - Code précédant la Boucle"
 
-#: src/rfx-builder.c:2911
+#: src/rfx-builder.c:2853
 msgid "LiVES: - Loop Code"
 msgstr "LiVES: - Code de la Boucle"
 
-#: src/rfx-builder.c:2918
+#: src/rfx-builder.c:2860
 msgid "LiVES: - Post Loop Code"
 msgstr "LiVES: - Code suivant la Boucle"
 
-#: src/rfx-builder.c:2931
+#: src/rfx-builder.c:2873
 #, c-format
 msgid "LiVES: - Default text (max length %d)"
 msgstr "LiVES : - Texte par défaut (longueur max. : %d)"
 
-#: src/rfx-builder.c:2944
+#: src/rfx-builder.c:2885
 msgid "LiVES: - Enter values, one per line"
 msgstr "LiVES: - Entrer le nom des paramètres, un par ligne"
 
-#: src/rfx-builder.c:3055
+#: src/rfx-builder.c:2996
 msgid ""
 "\n"
 "\n"
@@ -6881,7 +6879,7 @@
 "\n"
 "Le nom ne doit pas être vide.\n"
 
-#: src/rfx-builder.c:3060
+#: src/rfx-builder.c:3001
 msgid ""
 "\n"
 "\n"
@@ -6891,7 +6889,7 @@
 "\n"
 "Le nom ne doit pas contenir d'espaces.\n"
 
-#: src/rfx-builder.c:3065
+#: src/rfx-builder.c:3006
 msgid ""
 "\n"
 "\n"
@@ -6901,7 +6899,7 @@
 "\n"
 "Le texte de menu ne doit pas être vide.\n"
 
-#: src/rfx-builder.c:3071
+#: src/rfx-builder.c:3012
 msgid ""
 "\n"
 "\n"
@@ -6911,7 +6909,7 @@
 "\n"
 "La description de l'action ne doit pas être vide.\n"
 
-#: src/rfx-builder.c:3076
+#: src/rfx-builder.c:3017
 msgid ""
 "\n"
 "\n"
@@ -6921,7 +6919,7 @@
 "\n"
 "L'auteur ne doit pas être vide.\n"
 
-#: src/rfx-builder.c:3085 src/rfx-builder.c:4339
+#: src/rfx-builder.c:3026 src/rfx-builder.c:4253
 msgid ""
 "\n"
 "\n"
@@ -6933,7 +6931,7 @@
 "Un plugin existe déjà avec ce nom.\n"
 "Le nom doit être unique.\n"
 
-#: src/rfx-builder.c:3092
+#: src/rfx-builder.c:3033
 msgid ""
 "\n"
 "\n"
@@ -6943,7 +6941,7 @@
 "\n"
 "Le code de boucle ne doit pas être vide.\n"
 
-#: src/rfx-builder.c:3098
+#: src/rfx-builder.c:3039
 msgid ""
 "\n"
 "\n"
@@ -6953,7 +6951,7 @@
 "\n"
 "Le code trigger ne doit pas être vide pour un utilitaire.\n"
 
-#: src/rfx-builder.c:3111
+#: src/rfx-builder.c:3052
 msgid ""
 "\n"
 "\n"
@@ -6963,7 +6961,7 @@
 "\n"
 "Le nom du paramètre ne doit pas être vide.\n"
 
-#: src/rfx-builder.c:3117
+#: src/rfx-builder.c:3058
 msgid ""
 "\n"
 "\n"
@@ -6977,41 +6975,41 @@
 "greffon doivent être uniques.\n"
 "\n"
 
-#: src/rfx-builder.c:3171
+#: src/rfx-builder.c:3111
 #, c-format
 msgid "Writing script file %s..."
 msgstr "Écriture du fichier script %s...."
 
-#: src/rfx-builder.c:3477
+#: src/rfx-builder.c:3411
 msgid "No <define> section found in script.\n"
 msgstr "Aucune section <define> trouvée dans le script.\n"
 
-#: src/rfx-builder.c:3484 src/rfx-builder.c:3493
+#: src/rfx-builder.c:3418 src/rfx-builder.c:3427
 msgid "Bad script version.\n"
 msgstr "Mauvaise version du Script.\n"
 
-#: src/rfx-builder.c:3505
+#: src/rfx-builder.c:3439
 msgid "No <name> section found in script.\n"
 msgstr "Pas de section <name> trouvée dans le script.\n"
 
-#: src/rfx-builder.c:3513
+#: src/rfx-builder.c:3447
 msgid "No <version> section found in script.\n"
 msgstr "Aucune section <version> trouvée dans le script.\n"
 
-#: src/rfx-builder.c:3522
+#: src/rfx-builder.c:3456
 msgid "No <author> section found in script.\n"
 msgstr "Aucune section <author> trouvée dans le script.\n"
 
-#: src/rfx-builder.c:3536
+#: src/rfx-builder.c:3470
 msgid "No <description> section found in script.\n"
 msgstr "Aucune section <description> trouvée dans le script.\n"
 
-#: src/rfx-builder.c:3540
+#: src/rfx-builder.c:3474
 #, c-format
 msgid "Bad description. (%s)\n"
 msgstr "Description érronnée. (%s)\n"
 
-#: src/rfx-builder.c:3702
+#: src/rfx-builder.c:3627
 #, c-format
 msgid ""
 "\n"
@@ -7026,27 +7024,27 @@
 "trouvé dans le script.\n"
 "\n"
 
-#: src/rfx-builder.c:3859
+#: src/rfx-builder.c:3780
 msgid "Rebuilding all RFX scripts...builtin..."
 msgstr "Régénère tous les scripts RFX....intégré..."
 
-#: src/rfx-builder.c:3860
+#: src/rfx-builder.c:3781
 msgid "Rebuilding scripts"
 msgstr "Regénère tous les scripts RFX"
 
-#: src/rfx-builder.c:3868
+#: src/rfx-builder.c:3789
 msgid "custom..."
 msgstr "personnalisé...."
 
-#: src/rfx-builder.c:3872
+#: src/rfx-builder.c:3793
 msgid "test..."
 msgstr "test...."
 
-#: src/rfx-builder.c:3878
+#: src/rfx-builder.c:3799
 msgid "rebuilding dynamic menu entries..."
 msgstr "régénère les entrées dynamiques des menus...."
 
-#: src/rfx-builder.c:3905 src/rfx-builder.c:3912
+#: src/rfx-builder.c:3826 src/rfx-builder.c:3834
 #, c-format
 msgid ""
 "\n"
@@ -7059,7 +7057,7 @@
 "LiVES est incapable de trouver le programme %s.\n"
 "Vérifiez SVP si ce programme est dans le path et  exécutable.\n"
 
-#: src/rfx-builder.c:3951
+#: src/rfx-builder.c:3874
 #, c-format
 msgid ""
 "\n"
@@ -7074,12 +7072,12 @@
 "%s ?\n"
 "\n"
 
-#: src/rfx-builder.c:3960
+#: src/rfx-builder.c:3884
 #, c-format
 msgid "Deleting rfx script %s..."
 msgstr "Effacement du script RFX %s...."
 
-#: src/rfx-builder.c:3980
+#: src/rfx-builder.c:3902
 #, c-format
 msgid ""
 "\n"
@@ -7094,7 +7092,7 @@
 "%s\n"
 "Le code d'erreur est %d\n"
 
-#: src/rfx-builder.c:4016
+#: src/rfx-builder.c:3938
 #, c-format
 msgid ""
 "\n"
@@ -7109,12 +7107,12 @@
 "existe déjà.\n"
 "Effacez-le en premier ou renommez le script test.\n"
 
-#: src/rfx-builder.c:4027
+#: src/rfx-builder.c:3950
 #, c-format
 msgid "Promoting rfx test plugin %s to custom..."
 msgstr "Passage du plugin rfx test %s vers personnalisé..."
 
-#: src/rfx-builder.c:4044
+#: src/rfx-builder.c:3965
 #, c-format
 msgid ""
 "\n"
@@ -7125,20 +7123,20 @@
 "Return code was %d (%s)\n"
 msgstr ""
 
-#: src/rfx-builder.c:4070
+#: src/rfx-builder.c:3990
 msgid "LiVES: - Export Script to..."
 msgstr ""
 
-#: src/rfx-builder.c:4077 src/rfx-builder.c:4156
+#: src/rfx-builder.c:3997 src/rfx-builder.c:4074
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "Copie de %s vers %s..."
 
-#: src/rfx-builder.c:4105
+#: src/rfx-builder.c:4024
 msgid "LiVES: Import Script from..."
 msgstr ""
 
-#: src/rfx-builder.c:4148
+#: src/rfx-builder.c:4067
 #, c-format
 msgid ""
 "\n"
@@ -7153,43 +7151,43 @@
 "existe déjà.\n"
 "Effacez-le en premier ou renommez le script d'import.\n"
 
-#: src/rfx-builder.c:4249
+#: src/rfx-builder.c:4166
 msgid "LiVES: - Copy RFX Script"
 msgstr "LiVES: - Copie Script RFX"
 
-#: src/rfx-builder.c:4251
+#: src/rfx-builder.c:4168
 msgid "_From type:    "
 msgstr ""
 
-#: src/rfx-builder.c:4258
+#: src/rfx-builder.c:4175
 msgid "   Script:    "
 msgstr "   Script :    "
 
-#: src/rfx-builder.c:4267
+#: src/rfx-builder.c:4183
 msgid "LiVES: - Rename test RFX Script"
 msgstr "LiVES: -Renomme l'Essai de Script RFX...."
 
-#: src/rfx-builder.c:4268
+#: src/rfx-builder.c:4184
 msgid "From script: "
 msgstr "Depuis Script : "
 
-#: src/rfx-builder.c:4273
+#: src/rfx-builder.c:4188
 msgid "LiVES: - RFX Script name"
 msgstr "LiVES: - Nom du Script RFX"
 
-#: src/rfx-builder.c:4274
+#: src/rfx-builder.c:4189
 msgid "Script name: "
 msgstr "Nom du script : "
 
-#: src/rfx-builder.c:4294
+#: src/rfx-builder.c:4209
 msgid "New name: "
 msgstr "Nouveau Nom : "
 
-#: src/rfx-builder.c:4297
+#: src/rfx-builder.c:4212
 msgid "New script name: "
 msgstr "Nouveau nom de script : "
 
-#: src/rfx-builder.c:4372
+#: src/rfx-builder.c:4286
 msgid ""
 "\n"
 "\n"
@@ -7201,12 +7199,12 @@
 "Un script de test existe déjà sous ce nom.\n"
 "Le nom de script doit être unique.\n"
 
-#: src/rfx-builder.c:4384
+#: src/rfx-builder.c:4297
 #, c-format
 msgid "Renaming RFX test script %s to %s..."
 msgstr "Renomme le script de test RFX de %s vers %s..."
 
-#: src/rfx-builder.c:4390
+#: src/rfx-builder.c:4302
 #, c-format
 msgid ""
 "\n"
@@ -7223,23 +7221,23 @@
 "%s\n"
 "Le code retourné est %d\n"
 
-#: src/rfx-builder.c:4610
+#: src/rfx-builder.c:4518
 msgid "_Apply Real Time Effects to Selection"
 msgstr "_Applique effets en temps réel à la sélection"
 
-#: src/rfx-builder.c:4664
+#: src/rfx-builder.c:4572
 #, c-format
 msgid "Loading rendered effect %s..."
 msgstr "Chargement de l'effet rendu %s..."
 
-#: src/rfx-builder.c:4766
+#: src/rfx-builder.c:4674
 msgid ""
 "See: VJ - show VJ keys. Set the realtime effects, and then apply them here."
 msgstr ""
 "Allez sur VJ - Afficher les touches VJ. Fixez les effets et appliquez-les "
 "ensuite ici."
 
-#: src/preferences.c:359
+#: src/preferences.c:351
 msgid ""
 "\n"
 "\n"
@@ -7251,7 +7249,7 @@
 "Les greffons de lecture vidéo sont uniquement activés en\n"
 "mode plein écran, fenêtre séparée (fs)\n"
 
-#: src/preferences.c:408
+#: src/preferences.c:400
 msgid ""
 "\n"
 "\n"
@@ -7263,7 +7261,7 @@
 "\n"
 "(Espace disque restant = INCONNU)"
 
-#: src/preferences.c:412
+#: src/preferences.c:403
 #, c-format
 msgid ""
 "\n"
@@ -7272,14 +7270,14 @@
 "(Free space = %s)"
 msgstr ""
 
-#: src/preferences.c:416
+#: src/preferences.c:408
 msgid ""
 "The temp directory is LiVES working directory where opened clips and sets "
 "are stored.\n"
 "It should be in a partition with plenty of free disk space.\n"
 msgstr ""
 
-#: src/preferences.c:784
+#: src/preferences.c:839
 #, c-format
 msgid ""
 "Unable to create or write to the new temporary directory.\n"
@@ -7290,7 +7288,7 @@
 "The directory will not be changed now.\n"
 msgstr ""
 
-#: src/preferences.c:786
+#: src/preferences.c:843
 #, c-format
 msgid ""
 "Unable to create or write to the new temporary directory.\n"
@@ -7300,7 +7298,7 @@
 "The directory will not be changed now.\n"
 msgstr ""
 
-#: src/preferences.c:798
+#: src/preferences.c:856
 msgid ""
 "You have chosen to change the temporary directory.\n"
 "Please make sure you have no other copies of LiVES open.\n"
@@ -7320,7 +7318,7 @@
 "Dans le cas contraire, cliquez sur Annuler pour retrouver le répertoire "
 "temporaire comme à l'origine."
 
-#: src/preferences.c:1169
+#: src/preferences.c:1221
 msgid ""
 "\n"
 "Unable to switch audio players to jack - jackd must be installed first.\n"
@@ -7331,7 +7329,7 @@
 "installé.\n"
 "Voir http://jackaudio.org\n"
 
-#: src/preferences.c:1175
+#: src/preferences.c:1226
 msgid ""
 "\n"
 "Switching audio players requires restart (jackd must not be running)\n"
@@ -7340,7 +7338,7 @@
 "Le changement de lecteur audio nécessite un redémarrage (jackd ne doit pas "
 "être lancé)\n"
 
-#: src/preferences.c:1202
+#: src/preferences.c:1253
 msgid ""
 "\n"
 "Unable to switch audio players to pulse audio\n"
@@ -7352,67 +7350,67 @@
 "d'abord être installé.\n"
 "Voir http://www.pulseaudio.org\n"
 
-#: src/preferences.c:1502
+#: src/preferences.c:1544
 msgid "PCM (highest quality; largest files)"
 msgstr "PCM (meilleure qualité ; plus gros fichiers)"
 
-#: src/preferences.c:2063
+#: src/preferences.c:2096
 msgid "LiVES: - Preferences"
 msgstr "LiVES: - Préférences"
 
-#: src/preferences.c:2142
+#: src/preferences.c:2177
 msgid "Open file selection maximised"
 msgstr "Ouvrir la sélection de fichiers maximisée"
 
-#: src/preferences.c:2149
+#: src/preferences.c:2184
 msgid "Show recent files in the File menu"
 msgstr "Afficher fichiers récents dans le menu fichier"
 
-#: src/preferences.c:2158
+#: src/preferences.c:2193
 msgid "Stop screensaver on playback    "
 msgstr "En lecture désactiver l'économiseur d'écran    "
 
-#: src/preferences.c:2165
+#: src/preferences.c:2200
 msgid "Open main window maximised"
 msgstr "Ouvrir la fenêtre principale maximisée"
 
-#: src/preferences.c:2173
+#: src/preferences.c:2208
 msgid "Show toolbar when background is blanked"
 msgstr "Afficher la barre d'outils lorsque l'arrière plan est ignoré"
 
-#: src/preferences.c:2181
+#: src/preferences.c:2216
 msgid "Allow mouse wheel to switch clips"
 msgstr "Faire défiler les clips avec la roulette de la souris"
 
-#: src/preferences.c:2192
+#: src/preferences.c:2227
 msgid "Shrink previews to fit in interface"
 msgstr "Réduire l'aperçu pour l'adapter à l'interface"
 
-#: src/preferences.c:2202
+#: src/preferences.c:2237
 msgid "Startup mode:"
 msgstr "Mode de démarrage :"
 
-#: src/preferences.c:2206
+#: src/preferences.c:2241
 msgid "_Clip editor"
 msgstr "Éditeur de _clips"
 
-#: src/preferences.c:2210
+#: src/preferences.c:2245
 msgid "_Multitrack mode"
 msgstr "Mode _multitrack"
 
-#: src/preferences.c:2234
+#: src/preferences.c:2268
 msgid "Multi-head support"
 msgstr "Support de plusieurs moniteurs"
 
-#: src/preferences.c:2242
+#: src/preferences.c:2276
 msgid " monitor number for LiVES interface"
 msgstr " Numéro du moniteur pour l'interface de LiVES"
 
-#: src/preferences.c:2248
+#: src/preferences.c:2282
 msgid " monitor number for playback"
 msgstr " numéro du moniteur pour la lecture"
 
-#: src/preferences.c:2260
+#: src/preferences.c:2294
 msgid ""
 "A setting of 0 means use all available monitors (only works with some "
 "playback plugins)."
@@ -7420,429 +7418,429 @@
 "Une valeur de 0 permet d'utiliser tous les moniteurs disponibles (ne "
 "fonctionne qu'avec certains greffons de lecture)."
 
-#: src/preferences.c:2270
+#: src/preferences.c:2304
 msgid "Force single monitor"
 msgstr "Force moniteur unique"
 
-#: src/preferences.c:2271
+#: src/preferences.c:2305
 msgid "Ignore all except the first monitor."
 msgstr ""
 
-#: src/preferences.c:2293
+#: src/preferences.c:2327
 msgid "Show clip thumbnails during playback"
 msgstr ""
 
-#: src/preferences.c:2306
+#: src/preferences.c:2340
 msgid "GUI"
 msgstr "Interface Graphique"
 
-#: src/preferences.c:2321
+#: src/preferences.c:2355
 msgid "When entering Multitrack mode:"
 msgstr "Lors du passage en mode Multitrack :"
 
-#: src/preferences.c:2330
+#: src/preferences.c:2364
 msgid "_Prompt me for width, height, fps and audio settings"
 msgstr "_M'avertir pour la largeur, la hauteur, fps et les réglages audio"
 
-#: src/preferences.c:2336
+#: src/preferences.c:2370
 msgid "_Always use the following values:"
 msgstr "Toujours utiliser les valeurs suivantes:"
 
-#: src/preferences.c:2345
+#: src/preferences.c:2379
 msgid "Use these same _values for rendering a new clip"
 msgstr "Utiliser ces mêmes _valeurs pour le rendu d'un nouveau clip"
 
-#: src/preferences.c:2370
+#: src/preferences.c:2404
 msgid "_Width           "
 msgstr "_Largeur           "
 
-#: src/preferences.c:2375
+#: src/preferences.c:2409
 msgid "          _Height      "
 msgstr "          _Taille      "
 
-#: src/preferences.c:2379
+#: src/preferences.c:2413
 msgid "          _FPS"
 msgstr "          _FPS"
 
-#: src/preferences.c:2387
+#: src/preferences.c:2421
 msgid "Enable backing audio track"
 msgstr ""
 
-#: src/preferences.c:2394
+#: src/preferences.c:2428
 msgid "Audio track per video track"
 msgstr "Piste audio par piste vidéo"
 
-#: src/preferences.c:2423
+#: src/preferences.c:2457
 msgid "    _Undo buffer size (MB)    "
 msgstr "    Taille du tampon d'annulation (Mo)    "
 
-#: src/preferences.c:2432
+#: src/preferences.c:2466
 msgid "_Exit multitrack mode after rendering"
 msgstr "Sortir du mode Multitrack après le r_endu"
 
-#: src/preferences.c:2440
+#: src/preferences.c:2474
 msgid "Auto backup layouts"
 msgstr "Sauvegarde automatique des agencements"
 
-#: src/preferences.c:2445
+#: src/preferences.c:2479
 msgid "_Every"
 msgstr "_Chaque"
 
-#: src/preferences.c:2453
+#: src/preferences.c:2487
 msgid "seconds"
 msgstr "secondes"
 
-#: src/preferences.c:2461
+#: src/preferences.c:2495
 msgid "After every _change"
 msgstr "Après chaque _changement"
 
-#: src/preferences.c:2467
+#: src/preferences.c:2501
 msgid "_Never"
 msgstr "_Jamais"
 
-#: src/preferences.c:2490
+#: src/preferences.c:2523
 msgid "Multitrack/Render"
 msgstr "Multi-piste/Render"
 
-#: src/preferences.c:2508
+#: src/preferences.c:2541
 msgid "Use instant opening when possible"
 msgstr "Utiliser l'ouverture instantanée si possible"
 
-#: src/preferences.c:2509
+#: src/preferences.c:2543
 msgid "Enable instant opening of some file types using decoder plugins"
 msgstr ""
 "Utiliser l'ouverture instantanée par greffons de décodage pour certains "
 "types de fichiers"
 
-#: src/preferences.c:2531
+#: src/preferences.c:2567
 msgid "Video open command (fallback)"
 msgstr ""
 
-#: src/preferences.c:2543
+#: src/preferences.c:2579
 msgid "Open/render compression"
 msgstr ""
 
-#: src/preferences.c:2546
+#: src/preferences.c:2582
 msgid " %     ( lower = slower, larger files; for jpeg, higher quality )"
 msgstr ""
 " %     (petit = plus lent, fichiers plus grands; pour jpeg, meilleure "
 "qualité)"
 
-#: src/preferences.c:2558
+#: src/preferences.c:2594
 msgid "Default image format"
 msgstr ""
 
-#: src/preferences.c:2562
+#: src/preferences.c:2598
 msgid "_jpeg"
 msgstr "_jpeg"
 
-#: src/preferences.c:2565
+#: src/preferences.c:2601
 msgid "_png"
 msgstr "_png"
 
-#: src/preferences.c:2572
+#: src/preferences.c:2608
 msgid "(Check Help/Troubleshoot to see which image formats are supported)"
 msgstr "(Voir Aide/Dépannage pour la liste des formats d'image compatibles)"
 
-#: src/preferences.c:2580
+#: src/preferences.c:2616
 msgid "Enable automatic deinterlacing when possible"
 msgstr ""
 
-#: src/preferences.c:2582
+#: src/preferences.c:2619
 msgid "Automatically deinterlace frames when a plugin suggests it"
 msgstr ""
 
-#: src/preferences.c:2593
+#: src/preferences.c:2632
 msgid "Automatic trimming / padding of audio when possible"
 msgstr ""
 
-#: src/preferences.c:2595
+#: src/preferences.c:2634
 msgid "Automatically trim or pad audio when a plugin suggests it"
 msgstr ""
 
-#: src/preferences.c:2606
+#: src/preferences.c:2646
 msgid "Ignore blank borders when possible"
 msgstr ""
 
-#: src/preferences.c:2608
+#: src/preferences.c:2648
 msgid "Clip any blank borders from frames where possible"
 msgstr ""
 
-#: src/preferences.c:2619
+#: src/preferences.c:2660
 msgid "When opening multiple files, concatenate images into one clip"
 msgstr ""
 
-#: src/preferences.c:2629
+#: src/preferences.c:2670
 msgid "Decoding"
 msgstr "Décodage"
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:2652
+#: src/preferences.c:2693
 msgid "Low - can improve performance on slower machines"
 msgstr "Basse - peut améliorer les performances sur des machines lentes"
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:2654
+#: src/preferences.c:2695
 msgid "Normal - recommended for most users"
 msgstr "Normale - recommandée pour la plupart des utilisateurs"
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:2656
+#: src/preferences.c:2697
 msgid "High - can improve quality on very fast machines"
 msgstr "Haute - peut améliorer la qualité sur des machines très rapides"
 
-#: src/preferences.c:2659
+#: src/preferences.c:2700
 msgid "Preview _quality"
 msgstr "Prévisualiser la qualité"
 
-#: src/preferences.c:2660
+#: src/preferences.c:2701
 msgid "The preview quality for video playback - affects resizing"
 msgstr ""
 "La qualité de l'aperçu pour la lecture vidéo - affecte le redimensionnement"
 
-#: src/preferences.c:2675
+#: src/preferences.c:2717
 msgid "_Show FPS statistics"
 msgstr "Affiche les Statistiques d'IP_S"
 
-#: src/preferences.c:2694
+#: src/preferences.c:2736
 msgid "_Plugin"
 msgstr "Greffon"
 
-#: src/preferences.c:2718
+#: src/preferences.c:2760
 msgid "Stream audio"
 msgstr ""
 
-#: src/preferences.c:2721
+#: src/preferences.c:2763
 msgid "Stream audio to playback plugin"
 msgstr ""
 
-#: src/preferences.c:2734
+#: src/preferences.c:2778
 msgid "Record player output"
 msgstr ""
 
-#: src/preferences.c:2737
+#: src/preferences.c:2781
 msgid "Record output from player instead of input to player"
 msgstr ""
 
-#: src/preferences.c:2744
+#: src/preferences.c:2789
 msgid "VIDEO"
 msgstr "VIDÉO"
 
-#: src/preferences.c:2787
+#: src/preferences.c:2833
 msgid "_Player"
 msgstr "_Lecteur"
 
-#: src/preferences.c:2792
+#: src/preferences.c:2838
 msgid "(See also the Jack Integration tab for jack startup options)"
 msgstr ""
 
-#: src/preferences.c:2819
+#: src/preferences.c:2865
 msgid "mplayer"
 msgstr "mplayer"
 
-#: src/preferences.c:2830
+#: src/preferences.c:2876
 #, fuzzy
 msgid "mplayer2"
 msgstr "mplayer"
 
-#: src/preferences.c:2833
+#: src/preferences.c:2879
 msgid "Audio play _command"
 msgstr "Commande de lecture audio"
 
-#: src/preferences.c:2840
+#: src/preferences.c:2886
 msgid "- internal -"
 msgstr "- interne -"
 
-#: src/preferences.c:2849
+#: src/preferences.c:2895
 msgid "Audio follows video _rate/direction"
 msgstr ""
 
-#: src/preferences.c:2857
+#: src/preferences.c:2903
 msgid "Audio follows _clip switches"
 msgstr ""
 
-#: src/preferences.c:2864
+#: src/preferences.c:2910
 msgid "Source:"
-msgstr ""
+msgstr "Source :"
 
-#: src/preferences.c:2868
+#: src/preferences.c:2914
 msgid "_Internal"
-msgstr ""
+msgstr "_Interne"
 
-#: src/preferences.c:2873
+#: src/preferences.c:2919
 msgid "_External (requires jack or pulse audio player)"
 msgstr ""
 
-#: src/preferences.c:2892
+#: src/preferences.c:2940
 msgid "AUDIO"
 msgstr "AUDIO"
 
-#: src/preferences.c:2902
+#: src/preferences.c:2950
 msgid "Playback"
 msgstr "Playback"
 
-#: src/preferences.c:2925
+#: src/preferences.c:2973
 msgid ""
 "Record audio when capturing an e_xternal window\n"
 " (requires jack or pulse audio)"
 msgstr ""
 
-#: src/preferences.c:2940
+#: src/preferences.c:2988
 msgid "      What to record when 'r' is pressed   "
 msgstr "      Quoi enregistrer lorsque 'r' pressé   "
 
-#: src/preferences.c:2949
+#: src/preferences.c:2997
 msgid "_Frame changes"
 msgstr "Changement d'images"
 
-#: src/preferences.c:2964
+#: src/preferences.c:3012
 msgid "F_PS changes"
 msgstr "Changement I_PS"
 
-#: src/preferences.c:2982
+#: src/preferences.c:3030
 msgid "_Real time effects"
 msgstr "Effets en temps _réel"
 
-#: src/preferences.c:2993
+#: src/preferences.c:3041
 msgid "_Clip switches"
 msgstr ""
 
-#: src/preferences.c:3004
+#: src/preferences.c:3052
 msgid "_Audio (requires jack or pulse audio player)"
 msgstr ""
 
-#: src/preferences.c:3024
+#: src/preferences.c:3072
 msgid "Pause recording if free disk space falls below"
 msgstr ""
 
 #. TRANSLATORS: gigabytes
-#: src/preferences.c:3030
+#: src/preferences.c:3078
 msgid "GB"
 msgstr ""
 
-#: src/preferences.c:3037
+#: src/preferences.c:3085
 msgid "Recording"
 msgstr "Enregistrement"
 
-#: src/preferences.c:3055
+#: src/preferences.c:3103
 msgid "Encoder"
-msgstr ""
+msgstr "Encodeur"
 
-#: src/preferences.c:3090
+#: src/preferences.c:3137
 msgid "Output format"
 msgstr "Format de sortie"
 
-#: src/preferences.c:3106
+#: src/preferences.c:3153
 msgid "Audio codec"
 msgstr "Codec audio"
 
-#: src/preferences.c:3119
+#: src/preferences.c:3165
 msgid "Encoding"
 msgstr "Encodage"
 
-#: src/preferences.c:3134
+#: src/preferences.c:3180
 msgid "Use _antialiasing when resizing"
 msgstr "Utiliser _antialias lors du redimensionnement"
 
-#: src/preferences.c:3143
+#: src/preferences.c:3189
 msgid "Number of _real time effect keys"
 msgstr "Nombre de touches pour les effets en temps _réel"
 
-#: src/preferences.c:3145
+#: src/preferences.c:3192
 msgid ""
 "The number of \"virtual\" real time effect keys. They can be controlled "
 "through the real time effects window, or via network (OSC)."
 msgstr ""
 
-#: src/preferences.c:3152
+#: src/preferences.c:3199
 msgid "Use _threads where possible when applying effects"
 msgstr ""
 
-#: src/preferences.c:3159
+#: src/preferences.c:3207
 msgid "Number of _threads"
 msgstr ""
 
-#: src/preferences.c:3172
+#: src/preferences.c:3221
 msgid "Restart is required if any of the following paths are changed:"
 msgstr ""
 
-#: src/preferences.c:3182
+#: src/preferences.c:3231
 msgid "Weed plugin path"
 msgstr ""
 
-#: src/preferences.c:3184
+#: src/preferences.c:3234
 msgid "Frei0r plugin path"
 msgstr ""
 
-#: src/preferences.c:3186
+#: src/preferences.c:3237
 msgid "LADSPA plugin path"
 msgstr ""
 
-#: src/preferences.c:3209
+#: src/preferences.c:3261
 msgid "      Video load directory (default)      "
 msgstr ""
 
-#: src/preferences.c:3215
+#: src/preferences.c:3267
 msgid "      Video save directory (default) "
 msgstr ""
 
-#: src/preferences.c:3221
+#: src/preferences.c:3273
 msgid "      Audio load directory (default) "
 msgstr ""
 
-#: src/preferences.c:3227
+#: src/preferences.c:3279
 msgid "      Image directory (default) "
 msgstr "      Répertoire des images (par défaut) "
 
-#: src/preferences.c:3233
+#: src/preferences.c:3285
 msgid "      Backup/Restore directory (default) "
 msgstr ""
 
-#: src/preferences.c:3239
+#: src/preferences.c:3291
 msgid "      Temp directory (do not remove) "
 msgstr "      Répertoire temporaire (ne pas supprimer) "
 
-#: src/preferences.c:3252
+#: src/preferences.c:3304
 msgid "The default directory for loading video clips from"
 msgstr ""
 
-#: src/preferences.c:3277
+#: src/preferences.c:3329
 msgid "The default directory for saving encoded clips to"
 msgstr ""
 
-#: src/preferences.c:3285
+#: src/preferences.c:3337
 msgid "The default directory for loading and saving audio"
 msgstr ""
 
-#: src/preferences.c:3293
+#: src/preferences.c:3345
 msgid "The default directory for saving frameshots to"
 msgstr ""
 
-#: src/preferences.c:3301
+#: src/preferences.c:3353
 msgid "The default directory for backing up/restoring single clips"
 msgstr ""
 
-#: src/preferences.c:3309
+#: src/preferences.c:3361
 msgid "LiVES working directory."
 msgstr "Répertoire de travail de LiVES."
 
-#: src/preferences.c:3359
+#: src/preferences.c:3412
 msgid "Directories"
 msgstr "Répertoires"
 
-#: src/preferences.c:3374
+#: src/preferences.c:3427
 msgid "Warn if diskspace falls below: "
 msgstr ""
 
-#: src/preferences.c:3380 src/preferences.c:3394
+#: src/preferences.c:3433 src/preferences.c:3447
 msgid " MB [set to 0 to disable]"
 msgstr ""
 
-#: src/preferences.c:3389
+#: src/preferences.c:3442
 msgid "Diskspace critical level: "
 msgstr ""
 
-#: src/preferences.c:3407
+#: src/preferences.c:3461
 msgid ""
 "Warn on Insert / Merge if _frame rate of clipboard does not match frame rate "
 "of selection"
@@ -7850,341 +7848,340 @@
 "Avertissement lors de l'Insertion / Union si le nb d'images par secondes du "
 "presse-papiers ne correspond pas à celui de la sélection"
 
-#: src/preferences.c:3417
+#: src/preferences.c:3471
 msgid "Warn on Open if file _size exceeds "
 msgstr "Avertissement à l'Ouverture si la taille dépasse "
 
-#: src/preferences.c:3425
+#: src/preferences.c:3479
 msgid " MB"
 msgstr " Mo"
 
-#: src/preferences.c:3432
+#: src/preferences.c:3486
 msgid "Show a warning before saving a se_t"
 msgstr "Afficher un avertissement avant d'enregistrer les paramètres"
 
-#: src/preferences.c:3442
+#: src/preferences.c:3496
 msgid ""
 "Show a warning if _mplayer/mplayer2, sox, composite or convert is not found "
 "when LiVES is started."
 msgstr ""
 
-#: src/preferences.c:3452
+#: src/preferences.c:3506
 msgid "Show a warning if no _rendered effects are found at startup."
 msgstr ""
 
-#: src/preferences.c:3464
+#: src/preferences.c:3518
 msgid "Show a warning if no _encoder plugins are found at startup."
 msgstr ""
 
-#: src/preferences.c:3474
+#: src/preferences.c:3528
 msgid "Show a warning if a _duplicate set name is entered."
 msgstr ""
 
-#: src/preferences.c:3485
+#: src/preferences.c:3539
 msgid "When a set is loaded, warn if clips are missing from _layouts."
 msgstr ""
 
-#: src/preferences.c:3495
+#: src/preferences.c:3550
 msgid "Warn if a clip used in a layout is about to be closed."
 msgstr ""
 
-#: src/preferences.c:3505
+#: src/preferences.c:3561
 msgid "Warn if frames used in a layout are about to be deleted."
 msgstr ""
 
-#: src/preferences.c:3515
+#: src/preferences.c:3572
 msgid "Warn if frames used in a layout are about to be shifted."
 msgstr ""
 "Avertir si les cadres utilisés dans une mise en page sont sur le point "
 "d'être déplacés."
 
-#: src/preferences.c:3525
+#: src/preferences.c:3583
 msgid "Warn if frames used in a layout are about to be altered."
 msgstr ""
 "Avertir si les cadres utilisés dans une mise en page sont sur le point "
 "d'être modifiés."
 
-#: src/preferences.c:3535
+#: src/preferences.c:3594
 msgid "Warn if audio used in a layout is about to be deleted."
 msgstr ""
 "Avertir si l'audio utilisé dans une mise en page est sur le point d'être "
 "supprimé."
 
-#: src/preferences.c:3546
+#: src/preferences.c:3606
 msgid "Warn if audio used in a layout is about to be shifted."
 msgstr ""
 "Avertir si l'audio utilisé dans une mise en page est sur le point d'être "
 "déplacé."
 
-#: src/preferences.c:3556
+#: src/preferences.c:3617
 msgid "Warn if audio used in a layout is about to be altered."
 msgstr ""
 "Avertir si l'audio utilisé dans une mise en page est sur le point d'être "
 "modifié."
 
-#: src/preferences.c:3566
+#: src/preferences.c:3628
 msgid "Popup layout errors after clip changes."
 msgstr ""
 
-#: src/preferences.c:3577
+#: src/preferences.c:3639
 msgid "Warn if the layout has not been saved when leaving multitrack mode."
 msgstr ""
 "Avertir si la mise en page n'a pas été enregistrée au moment de quitter le "
 "mode multipiste."
 
-#: src/preferences.c:3588
+#: src/preferences.c:3650
 msgid ""
 "Warn if multitrack has no audio channels, and a layout with audio is loaded."
 msgstr ""
 
-#: src/preferences.c:3598
+#: src/preferences.c:3660
 msgid ""
 "Warn if multitrack has audio channels, and your audio player is not \"jack\" "
 "or \"pulse audio\"."
 msgstr ""
 
-#: src/preferences.c:3610
+#: src/preferences.c:3672
 msgid "Show info message after importing from firewire device."
 msgstr "Afficher un message apres l'importation d'un périphérique firewire"
 
-#: src/preferences.c:3626
+#: src/preferences.c:3688
 msgid "Show a warning before opening a yuv4mpeg stream (advanced)."
 msgstr "Afficher un avertissement avant d'ouvrir un flux yuv4mpeg (avancé)."
 
-#: src/preferences.c:3639
+#: src/preferences.c:3701
 msgid "Show a warning when multitrack is low on backup space."
 msgstr ""
 
-#: src/preferences.c:3650
+#: src/preferences.c:3713
 msgid "Show a warning advising cleaning of disk space after a crash."
 msgstr ""
 
-#: src/preferences.c:3661
+#: src/preferences.c:3725
 msgid "Show a warning if unable to connect to pulseaudio player."
 msgstr ""
 
-#: src/preferences.c:3673
-#, fuzzy
+#: src/preferences.c:3737
 msgid "Show a warning before wiping a layout which has unsaved changes."
-msgstr "Afficher un avertissement avant d'ouvrir un flux yuv4mpeg (avancé)."
+msgstr ""
 
-#: src/preferences.c:3685
+#: src/preferences.c:3749
 msgid "Warnings"
 msgstr "Avertissements"
 
-#: src/preferences.c:3703
+#: src/preferences.c:3767
 msgid "Midi synch (requires the files midistart and midistop)"
 msgstr "Synthétiseur Midi (a besoin des fichiers midistart et midistop)"
 
-#: src/preferences.c:3715
+#: src/preferences.c:3779
 msgid "When inserting/merging frames:  "
 msgstr "Lors de l'insertion/fusion des images :  "
 
-#: src/preferences.c:3719
+#: src/preferences.c:3783
 msgid "_Speed Up/Slow Down Insertion"
 msgstr "Accélère/Ralentit Insertion"
 
-#: src/preferences.c:3723
+#: src/preferences.c:3787
 msgid "_Resample Insertion"
 msgstr "_Reéchantillonner l'Insertion"
 
-#: src/preferences.c:3730
+#: src/preferences.c:3794
 msgid "CD device           "
 msgstr "Lecteur CD           "
 
-#: src/preferences.c:3733
+#: src/preferences.c:3797
 msgid "LiVES can load audio tracks from this CD"
 msgstr "LIVES ne peut charger les pistes audio de ce CD"
 
-#: src/preferences.c:3746
+#: src/preferences.c:3813
 msgid "Default FPS        "
 msgstr "IPS par défaut        "
 
-#: src/preferences.c:3749
+#: src/preferences.c:3816
 msgid "Frames per second to use when none is specified"
 msgstr "Images par seconde à utiliser si aucun est sélectionné"
 
-#: src/preferences.c:3757
+#: src/preferences.c:3825
 msgid "Misc"
 msgstr "Divers"
 
-#: src/preferences.c:3782
+#: src/preferences.c:3850
 msgid "New theme:           "
 msgstr "Nouveau thème :           "
 
-#: src/preferences.c:3800
+#: src/preferences.c:3867
 msgid "Themes"
 msgstr "Thèmes"
 
-#: src/preferences.c:3815
+#: src/preferences.c:3882
 msgid "Download bandwidth (Kb/s)       "
 msgstr "Bande passante de Téléchargement (Ko/s)       "
 
-#: src/preferences.c:3823
+#: src/preferences.c:3890
 msgid "LiVES must be compiled without \"configure --disable-OSC\" to use OMC"
 msgstr ""
 
-#: src/preferences.c:3833
+#: src/preferences.c:3900
 msgid "OMC remote control enabled"
 msgstr "Contrôle distant OMC activé"
 
-#: src/preferences.c:3841
+#: src/preferences.c:3908
 msgid "UDP port       "
 msgstr "UDP port       "
 
-#: src/preferences.c:3850
+#: src/preferences.c:3917
 msgid "Start OMC on startup"
 msgstr "Lancer OMC au démarrage"
 
-#: src/preferences.c:3870
+#: src/preferences.c:3937
 msgid "Streaming/Networking"
 msgstr "Diffusion/Réseau"
 
-#: src/preferences.c:3882
+#: src/preferences.c:3949
 msgid "Jack transport"
 msgstr "Transport jack"
 
-#: src/preferences.c:3886
+#: src/preferences.c:3953
 msgid ""
 "LiVES must be compiled with jack/transport.h and jack/jack.h present to use "
 "jack transport"
 msgstr ""
 
-#: src/preferences.c:3892
+#: src/preferences.c:3959
 msgid "Jack _transport config file"
 msgstr "Fichier de configuration Jack _transport"
 
-#: src/preferences.c:3899 src/preferences.c:3989
+#: src/preferences.c:3967 src/preferences.c:4058
 msgid "Start _server on LiVES startup"
 msgstr "Lancement du _server au démarrage de LiVES"
 
-#: src/preferences.c:3911
+#: src/preferences.c:3979
 msgid "Jack transport _master (start and stop)"
 msgstr ""
 
-#: src/preferences.c:3921
+#: src/preferences.c:3989
 msgid "Jack transport _client (start and stop)"
 msgstr ""
 
-#: src/preferences.c:3935
+#: src/preferences.c:4003
 msgid "Jack transport sets start position"
 msgstr ""
 
-#: src/preferences.c:3952
+#: src/preferences.c:4020
 msgid "Jack transport timebase slave"
 msgstr ""
 
-#: src/preferences.c:3963
+#: src/preferences.c:4031
 msgid "(See also Playback -> Audio follows video rate/direction)"
 msgstr ""
 
-#: src/preferences.c:3971
+#: src/preferences.c:4039
 msgid "Jack audio"
 msgstr "Audio Jack"
 
-#: src/preferences.c:3975
+#: src/preferences.c:4043
 msgid "LiVES must be compiled with jack/jack.h present to use jack audio"
 msgstr ""
 
-#: src/preferences.c:3978
+#: src/preferences.c:4046
 msgid ""
 "You MUST set the audio player to \"jack\" in the Playback tab to use jack "
 "audio"
 msgstr ""
 
-#: src/preferences.c:3984
+#: src/preferences.c:4052
 msgid "Jack _audio server config file"
 msgstr ""
 
-#: src/preferences.c:3996
+#: src/preferences.c:4065
 msgid "Play audio even when transport is _paused"
 msgstr ""
 
-#: src/preferences.c:4008
+#: src/preferences.c:4077
 msgid "Automatically connect to System Out ports when 'playing' External Audio"
 msgstr ""
 
-#: src/preferences.c:4021
+#: src/preferences.c:4090
 msgid "Jack Integration"
 msgstr "Intégration de jack"
 
-#: src/preferences.c:4035
+#: src/preferences.c:4104
 msgid "Events to respond to:"
 msgstr ""
 
-#: src/preferences.c:4044
+#: src/preferences.c:4113
 msgid "_Joystick events"
 msgstr "Événements _joystick"
 
-#: src/preferences.c:4051
+#: src/preferences.c:4120
 msgid "_Joystick device"
 msgstr "Dispositif _joystick"
 
-#: src/preferences.c:4053
+#: src/preferences.c:4122
 msgid "The joystick device, e.g. /dev/input/js0"
 msgstr "Le dispositif joystick, par exemple /dev/input/js0"
 
-#: src/preferences.c:4071
+#: src/preferences.c:4142
 msgid "_MIDI events"
 msgstr "Événements _MIDI"
 
-#: src/preferences.c:4080
+#: src/preferences.c:4151
 msgid "Use _ALSA MIDI (recommended)"
 msgstr "Utilise _ALSA MIDI (recommandé)"
 
-#: src/preferences.c:4082
+#: src/preferences.c:4153
 msgid "Create an ALSA MIDI port which other MIDI devices can be connected to"
 msgstr ""
 
-#: src/preferences.c:4090
+#: src/preferences.c:4162
 msgid "Use _raw MIDI"
 msgstr ""
 
-#: src/preferences.c:4092
+#: src/preferences.c:4164
 msgid "Read directly from the MIDI device"
 msgstr "Lire directement depuis le périphérique MIDI"
 
-#: src/preferences.c:4104
+#: src/preferences.c:4177
 msgid "_MIDI device"
 msgstr "périphérique _MIDI"
 
-#: src/preferences.c:4106
+#: src/preferences.c:4179
 msgid "The MIDI device, e.g. /dev/input/midi0"
 msgstr "Le dispositif MIDI, par exemple /dev/input/midi0"
 
-#: src/preferences.c:4118
+#: src/preferences.c:4193
 msgid "Advanced"
 msgstr "Avancé"
 
-#: src/preferences.c:4124
+#: src/preferences.c:4199
 msgid "MIDI check _rate"
 msgstr ""
 
-#: src/preferences.c:4127
+#: src/preferences.c:4203
 msgid ""
 "Number of MIDI checks per keyboard tick. Increasing this may improve MIDI "
 "responsiveness, but may slow down playback."
 msgstr ""
 
-#: src/preferences.c:4134
+#: src/preferences.c:4211
 msgid "MIDI repeat"
 msgstr "Répétition MIDI"
 
-#: src/preferences.c:4137
+#: src/preferences.c:4214
 msgid "Number of non-reads allowed between succesive reads."
 msgstr ""
 
-#: src/preferences.c:4140
+#: src/preferences.c:4218
 msgid "(Warning: setting this value too high can slow down playback.)"
 msgstr ""
 "(Attention: la définition de cette valeur à un niveau trop élevé peut "
 "ralentir la lecture.)"
 
-#: src/preferences.c:4159
+#: src/preferences.c:4237
 msgid "MIDI/Joystick learner"
 msgstr ""
 
-#: src/preferences.c:4499
+#: src/preferences.c:4679
 msgid ""
 "\n"
 "LiVES will now shut down. You need to restart it for the directory change to "
@@ -8192,69 +8189,69 @@
 "Click OK to continue.\n"
 msgstr ""
 
-#: src/preferences.c:4523
+#: src/preferences.c:4703
 msgid ""
 "For the directory change to take effect LiVES will restart when preferences "
 "dialog closes."
 msgstr ""
 
-#: src/preferences.c:4527
+#: src/preferences.c:4707
 msgid "Theme changes will not take effect until the next time you start LiVES."
 msgstr ""
 "Les changements de thème ne prennent effet qu'après redémarrage de LiVES."
 
-#: src/preferences.c:4531
+#: src/preferences.c:4711
 msgid "Jack options will not take effect until the next time you start LiVES."
 msgstr "Les options de jack ne prennent effet qu'après redémarrage de LiVES."
 
-#: src/osc.c:2585
+#: src/osc.c:2616
 #, c-format
 msgid "Syncing to external framerate of %.8f frames per second.\n"
 msgstr "La longueur de la vidéo est maintenant de %.8f images par seconde.\n"
 
-#: src/osc.c:6746
+#: src/osc.c:6938
 msgid "Cannot initialize OSC receiver\n"
 msgstr "Ne peut initialiser le récepteur OSC\n"
 
-#: src/osc.c:6770
+#: src/osc.c:6961
 #, c-format
 msgid "WARNING: Cannot start OSC server at UDP port %d\n"
 msgstr ""
 
-#: src/osc.c:6775
+#: src/osc.c:6963
 #, c-format
 msgid "Started OSC server at UDP port %d\n"
 msgstr ""
 
-#: src/osc.c:6890
+#: src/osc.c:7076
 #, c-format
 msgid "Cannot start OSC/UDP server at port %d \n"
 msgstr ""
 
-#: src/resample.c:125 src/resample.c:304
+#: src/resample.c:131 src/resample.c:305
 #, c-format
 msgid "Resizing frames 1 to %d"
 msgstr "Redimensionnement de l'image 1 vers %d"
 
-#: src/resample.c:140 src/resample.c:318
+#: src/resample.c:145 src/resample.c:318
 #, c-format
 msgid "Resizing/letterboxing frames 1 to %d"
 msgstr ""
 
-#: src/resample.c:361 src/resample.c:385
+#: src/resample.c:360 src/resample.c:384
 msgid "Resize"
 msgstr "Retailler"
 
-#: src/resample.c:395
+#: src/resample.c:394
 msgid "Resample/Resize"
 msgstr "Rééchantillonner/Retailler"
 
-#: src/resample.c:680
+#: src/resample.c:676
 #, c-format
 msgid "Length of video is now %d frames.\n"
 msgstr "La longueur de la vidéo est maintenant de %d images.\n"
 
-#: src/resample.c:745
+#: src/resample.c:737
 msgid ""
 "\n"
 "\n"
@@ -8264,147 +8261,147 @@
 "\n"
 "La nouvelle vitesse doit être supérieure à 0\n"
 
-#: src/resample.c:797 src/resample.c:813
+#: src/resample.c:788 src/resample.c:803
 msgid "Resampling audio"
 msgstr "Reéchantillonage audio"
 
-#: src/resample.c:831
+#: src/resample.c:821
 msgid "LiVES was unable to resample the audio as requested.\n"
 msgstr "LiVES ne peut reéchantillonner l'audio comme demandé.\n"
 
-#: src/resample.c:833 src/resample.c:837
+#: src/resample.c:823 src/resample.c:827
 msgid "Resample Audio"
 msgstr "Reéchantillonner Audio"
 
-#: src/resample.c:845
+#: src/resample.c:835
 #, c-format
 msgid "Audio was resampled to %d Hz, %d channels, %d bit"
 msgstr "L'audio est reéchantillonné à %d Hz, %d canal/canaux, %d bit"
 
-#: src/resample.c:1034
+#: src/resample.c:1016
 #, c-format
 msgid "Resampling video at %.8f frames per second..."
 msgstr "La longueur de la vidéo est maintenant à  %.8f images par seconde..."
 
-#: src/resample.c:1037
+#: src/resample.c:1018
 #, c-format
 msgid "Resampling video at %.3f frames per second..."
 msgstr "La longueur de la vidéo est maintenant à %.3f images par seconde..."
 
-#: src/resample.c:1068
+#: src/resample.c:1049
 msgid "Reordering error !\n"
 msgstr "Erreur de réorganisation !\n"
 
-#: src/resample.c:1079
+#: src/resample.c:1060
 msgid "Resample"
 msgstr "Ré-echantilloner"
 
-#: src/resample.c:1192
+#: src/resample.c:1173
 msgid "LiVES: - Resample Audio"
 msgstr "LiVES: - Reéchantillonner Audio"
 
-#: src/resample.c:1195
+#: src/resample.c:1175
 msgid "LiVES: - Insert Silence"
 msgstr "LiVES: - Insère Silence"
 
-#: src/resample.c:1198
+#: src/resample.c:1177
 msgid "LiVES: - New Clip Audio"
 msgstr "LiVES: - Nouveau clip audio"
 
-#: src/resample.c:1201
+#: src/resample.c:1179
 msgid "LiVES: - External Clip Settings"
 msgstr "LiVES: - Paramètres du clip externe"
 
-#: src/resample.c:1238 src/resample.c:1358
+#: src/resample.c:1215 src/resample.c:1332
 msgid "Rate (Hz) "
 msgstr "Vitesse (Hz) "
 
-#: src/resample.c:1245 src/resample.c:1372
+#: src/resample.c:1222 src/resample.c:1346
 msgid "Channels"
-msgstr ""
+msgstr "Canaux"
 
-#: src/resample.c:1252
+#: src/resample.c:1229
 msgid "Sample Size "
 msgstr ""
 
-#: src/resample.c:1268 src/resample.c:1425
+#: src/resample.c:1245 src/resample.c:1399
 msgid "Signed"
 msgstr "Signé"
 
-#: src/resample.c:1274 src/resample.c:1435
+#: src/resample.c:1251 src/resample.c:1409
 msgid "Unsigned"
 msgstr "Non Signé"
 
-#: src/resample.c:1297 src/resample.c:1460
+#: src/resample.c:1273 src/resample.c:1433
 msgid "Little Endian"
 msgstr ""
 
-#: src/resample.c:1303 src/resample.c:1468
+#: src/resample.c:1279 src/resample.c:1441
 msgid "Big Endian"
 msgstr ""
 
-#: src/resample.c:1315
+#: src/resample.c:1290
 msgid "Current"
 msgstr "Courant"
 
-#: src/resample.c:1340
+#: src/resample.c:1315
 msgid "_Enable audio"
 msgstr "_Permet audio"
 
-#: src/resample.c:1372
+#: src/resample.c:1346
 msgid "_Channels"
-msgstr ""
+msgstr "_Canaux"
 
-#: src/resample.c:1394
+#: src/resample.c:1368
 msgid "_Sample Size"
 msgstr ""
 
-#: src/resample.c:1394
+#: src/resample.c:1368
 msgid "Sample Size"
-msgstr ""
+msgstr "Taille de l'échantillon"
 
-#: src/resample.c:1489
+#: src/resample.c:1461
 msgid "New"
 msgstr "Nouveau"
 
-#: src/resample.c:1512
+#: src/resample.c:1484
 msgid "_Frames Per Second "
 msgstr "Images par secondes "
 
-#: src/resample.c:1530
+#: src/resample.c:1502
 msgid "Record for maximum:  "
 msgstr "Valeur maximum possible pour l'enregistrement:  "
 
-#: src/resample.c:1533
+#: src/resample.c:1505
 msgid " hours  "
 msgstr " heures  "
 
-#: src/resample.c:1536
+#: src/resample.c:1508
 msgid " minutes  "
 msgstr " minutes  "
 
-#: src/resample.c:1538
+#: src/resample.c:1510
 msgid " seconds  "
 msgstr " secondes  "
 
-#: src/resample.c:1545
+#: src/resample.c:1517
 msgid "Unlimited"
 msgstr "Illimité"
 
-#: src/resample.c:1561
+#: src/resample.c:1533
 msgid "Click OK to begin recording, or Cancel to quit."
 msgstr ""
 "Cliquez sur OK pour commencer l'enregistrement, ou Annuler pour sortir."
 
-#: src/resample.c:1670
+#: src/resample.c:1638
 msgid "LiVES: - Change playback speed"
 msgstr "LiVES: - Change la vitesse de playback"
 
-#: src/resample.c:1673
+#: src/resample.c:1640
 msgid "LiVES: - Resample Video"
 msgstr "LiVES: - Reéchantillone Vidéo"
 
-#: src/resample.c:1696
+#: src/resample.c:1663
 #, c-format
 msgid ""
 "\n"
@@ -8415,7 +8412,7 @@
 "in _frames per second"
 msgstr ""
 
-#: src/resample.c:1701
+#: src/resample.c:1667
 #, c-format
 msgid ""
 "\n"
@@ -8426,69 +8423,69 @@
 "in frames per second"
 msgstr ""
 
-#: src/resample.c:1723
+#: src/resample.c:1688
 msgid "OR enter the desired clip length in _seconds"
 msgstr "OU entrez la durée désirée pour le clip en _secondes"
 
-#: src/resample.c:1745
+#: src/resample.c:1710
 msgid "Change the _audio speed as well"
 msgstr ""
 
-#: src/resample.c:1846
+#: src/resample.c:1810
 msgid ""
 "\n"
 "Speeding up the clip will cause missing frames in some multitrack layouts.\n"
 "Are you sure you wish to change the speed ?\n"
 msgstr ""
 
-#: src/resample.c:1863
+#: src/resample.c:1829
 msgid ""
 "\n"
 "Speeding up the clip will cause missing audio in some multitrack layouts.\n"
 "Are you sure you wish to change the speed ?\n"
 msgstr ""
 
-#: src/resample.c:1878
+#: src/resample.c:1847
 msgid ""
 "\n"
 "Changing the speed will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/resample.c:1892
+#: src/resample.c:1863
 msgid ""
 "\n"
 "Changing the speed will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/resample.c:1938
+#: src/resample.c:1911
 msgid "Speed Change"
 msgstr "Changement de vitesse"
 
-#: src/resample.c:1947
+#: src/resample.c:1920
 #, c-format
 msgid "Changed playback speed to %.3f frames per second and audio to %d Hz.\n"
 msgstr "Changé la vitesse de playback à %.3f ips et l'audio à %d Hz.\n"
 
-#: src/resample.c:1950
+#: src/resample.c:1922
 #, c-format
 msgid "Changed playback speed to %.3f frames per second.\n"
 msgstr "Changé la vitesse de playback à %.3f images par seconde.\n"
 
-#: src/resample.c:2035
+#: src/resample.c:2006
 msgid "Resampling video"
 msgstr "Reéchantillonage de la vidéo"
 
-#: src/resample.c:2042 src/resample.c:2160 src/resample.c:2182
+#: src/resample.c:2012 src/resample.c:2127 src/resample.c:2148
 msgid "Resampling clipboard video"
 msgstr "Reéchantillonage de la vidéo du presse-papiers"
 
-#: src/resample.c:2047
+#: src/resample.c:2016
 msgid "Reordering frames"
 msgstr "Réorganisation des images"
 
-#: src/resample.c:2056
+#: src/resample.c:2025
 msgid ""
 "\n"
 "\n"
@@ -8498,20 +8495,20 @@
 "\n"
 "LiVES n'est pas capable de réorganiser les images."
 
-#: src/resample.c:2104
+#: src/resample.c:2071
 msgid "Deordering frames"
 msgstr "Désorganisation des images"
 
-#: src/resample.c:2199
+#: src/resample.c:2165
 msgid "resampling error..."
 msgstr "erreur de reéchantillonage...."
 
-#: src/rte_window.c:85 src/rte_window.c:1708
+#: src/rte_window.c:124 src/rte_window.c:1709
 #, c-format
 msgid "Type: %s"
 msgstr "Type : %s"
 
-#: src/rte_window.c:112
+#: src/rte_window.c:150
 msgid ""
 "\n"
 "\n"
@@ -8521,7 +8518,7 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:426
+#: src/rte_window.c:460
 msgid ""
 "\n"
 "\n"
@@ -8533,12 +8530,12 @@
 "Cliquer sur 'OK' pour sauvegarder ce keymap en tant que defaut\n"
 "\n"
 
-#: src/rte_window.c:432
+#: src/rte_window.c:466
 #, c-format
 msgid "Saving keymap to %s\n"
 msgstr "Sauvegarde des raccourcis vers %s\n"
 
-#: src/rte_window.c:439
+#: src/rte_window.c:471
 #, c-format
 msgid ""
 "\n"
@@ -8547,7 +8544,7 @@
 "\n"
 "Actualiser le fichier keymap %s..."
 
-#: src/rte_window.c:446
+#: src/rte_window.c:477
 #, c-format
 msgid ""
 "\n"
@@ -8557,12 +8554,12 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/rte_window.c:526
+#: src/rte_window.c:556
 #, c-format
 msgid "Saving real time effect defaults to %s..."
 msgstr "Enregistre les effets temps réél par défault vers %s..."
 
-#: src/rte_window.c:535
+#: src/rte_window.c:563
 #, c-format
 msgid ""
 "\n"
@@ -8577,22 +8574,22 @@
 "%s\n"
 "Code d'erreur %d\n"
 
-#: src/rte_window.c:632
+#: src/rte_window.c:657
 #, c-format
 msgid "Loading real time effect defaults from %s..."
 msgstr "Chargement des effets temps réél par défault depuis %s ..."
 
-#: src/rte_window.c:681
+#: src/rte_window.c:701
 #, c-format
 msgid "Loading generator default sizes from %s..."
 msgstr ""
 
-#: src/rte_window.c:1306
+#: src/rte_window.c:1319
 #, c-format
 msgid "Loading default keymap from %s..."
 msgstr "Chargement du keymap par défaut depuis %s..."
 
-#: src/rte_window.c:1329
+#: src/rte_window.c:1339
 #, c-format
 msgid ""
 "\n"
@@ -8602,48 +8599,48 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/rte_window.c:1403
+#: src/rte_window.c:1412
 #, c-format
 msgid "Invalid line %d in %s\n"
 msgstr "Ligne invalide %d dans %s\n"
 
-#: src/rte_window.c:1483
+#: src/rte_window.c:1490
 #, c-format
 msgid "Invalid key %d in %s\n"
 msgstr "Clef invalide %d dans %s\n"
 
-#: src/rte_window.c:1498
+#: src/rte_window.c:1505
 #, c-format
 msgid "Invalid effect %s in %s\n"
 msgstr "Effet invalide %s dans %s\n"
 
-#: src/rte_window.c:1517
+#: src/rte_window.c:1524
 #, c-format
 msgid "Unknown effect %s in %s\n"
 msgstr ""
 
-#: src/rte_window.c:1535
+#: src/rte_window.c:1542
 #, c-format
 msgid ""
 "This version of LiVES cannot mix generators/non-generators on the same key "
 "(%d) !\n"
 msgstr ""
 
-#: src/rte_window.c:1547
+#: src/rte_window.c:1554
 #, c-format
 msgid "Too many effects bound to key %d.\n"
 msgstr "Trop effets liés à la clé %d.\n"
 
-#: src/rte_window.c:1587
+#: src/rte_window.c:1593
 msgid "update required.\n"
 msgstr "Actualisation requise.\n"
 
-#: src/rte_window.c:1603
+#: src/rte_window.c:1607
 #, c-format
 msgid "Loading data connection map from %s..."
 msgstr ""
 
-#: src/rte_window.c:1612
+#: src/rte_window.c:1614
 msgid ""
 "\n"
 "\n"
@@ -8655,41 +8652,41 @@
 "Certains effets ne peuvent être trouvés\n"
 "\n"
 
-#: src/rte_window.c:1691
+#: src/rte_window.c:1692
 #, c-format
 msgid "LiVES: Information for %s"
 msgstr "LiVES: Informations pour %s"
 
-#: src/rte_window.c:1704
+#: src/rte_window.c:1705
 #, c-format
 msgid "Effect name: %s"
 msgstr "Nom de l'effet: %s"
 
-#: src/rte_window.c:1712
+#: src/rte_window.c:1713
 #, c-format
 msgid "Plugin name: %s"
 msgstr "Nom du greffon: %s"
 
-#: src/rte_window.c:1716
+#: src/rte_window.c:1717
 #, c-format
 msgid "Author: %s"
 msgstr "Auteur/Artiste : %s"
 
-#: src/rte_window.c:1721
+#: src/rte_window.c:1722
 #, c-format
 msgid "and: %s"
-msgstr ""
+msgstr "et : %s"
 
-#: src/rte_window.c:1726
+#: src/rte_window.c:1727
 #, c-format
 msgid "Version: %d"
 msgstr "Version :  %d"
 
-#: src/rte_window.c:1734
+#: src/rte_window.c:1735
 msgid "Description: "
 msgstr "Description : "
 
-#: src/rte_window.c:1960
+#: src/rte_window.c:1963
 msgid ""
 "\n"
 "\n"
@@ -8698,69 +8695,69 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:2024
+#: src/rte_window.c:2027
 #, c-format
 msgid "LiVES could not locate the effect %s.\n"
 msgstr "LiVES ne peut pas localiser l'effet %s.\n"
 
-#: src/rte_window.c:2225
+#: src/rte_window.c:2216
 msgid "LiVES: Real time effect mapping"
 msgstr ""
 
-#: src/rte_window.c:2257
+#: src/rte_window.c:2248
 #, c-format
 msgid "Ctrl-%d"
 msgstr "Ctrl-%d"
 
-#: src/rte_window.c:2264
+#: src/rte_window.c:2255
 msgid "Key active"
 msgstr "Clef active"
 
-#: src/rte_window.c:2279
+#: src/rte_window.c:2271
 msgid "Key grab"
 msgstr "Capturer l'entrée clavier"
 
-#: src/rte_window.c:2280
+#: src/rte_window.c:2272
 msgid "Grab keyboard for this effect key"
 msgstr ""
 
-#: src/rte_window.c:2290
+#: src/rte_window.c:2283
 msgid "_Clear all effects"
 msgstr "_Vider tout les effets"
 
-#: src/rte_window.c:2304
+#: src/rte_window.c:2297
 msgid "Mode active"
 msgstr ""
 
-#: src/rte_window.c:2314 src/multitrack.c:8568
+#: src/rte_window.c:2307 src/multitrack.c:8762
 msgid "Info"
 msgstr "Informations"
 
-#: src/rte_window.c:2315
+#: src/rte_window.c:2308
 msgid "Set Parameters"
 msgstr "Paramètres"
 
-#: src/rte_window.c:2316
+#: src/rte_window.c:2309
 msgid "Set Connections"
 msgstr ""
 
-#: src/rte_window.c:2317
+#: src/rte_window.c:2310
 msgid "Clear"
 msgstr "Nettoyer"
 
-#: src/rte_window.c:2326
+#: src/rte_window.c:2319
 msgid "Effect name:"
 msgstr "Nom de l'effet:"
 
-#: src/rte_window.c:2391
+#: src/rte_window.c:2384
 msgid "_Save as default keymap"
 msgstr ""
 
-#: src/rte_window.c:2396
+#: src/rte_window.c:2389
 msgid "_Load default keymap"
 msgstr ""
 
-#: src/rte_window.c:2840
+#: src/rte_window.c:2833
 #, c-format
 msgid ""
 "Unable to create default keymap file: %s\n"
@@ -8776,9 +8773,8 @@
 msgstr ""
 
 #: src/lives-yuv4mpeg.c:205
-#, fuzzy
 msgid "Unable to read the stream header\n"
-msgstr "Impossible d'ouvrir le flux de sortie yuv4mpeg %s\n"
+msgstr ""
 
 #: src/lives-yuv4mpeg.c:221
 msgid "got header\n"
@@ -8813,92 +8809,92 @@
 
 #: src/lives-yuv4mpeg.c:426
 msgid "Audio: "
-msgstr ""
+msgstr "Audio : "
 
 #: src/lives-yuv4mpeg.c:429
 msgid "none\n"
 msgstr "aucun\n"
 
-#: src/lives-yuv4mpeg.c:494
+#: src/lives-yuv4mpeg.c:493
 #, c-format
 msgid ""
 "Unable to set display framerate to %.3f fps.\n"
 "\n"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:503
+#: src/lives-yuv4mpeg.c:502
 #, c-format
 msgid "Unable to open yuv4mpeg out stream %s\n"
 msgstr "Impossible d'ouvrir le flux de sortie yuv4mpeg %s\n"
 
-#: src/lives-yuv4mpeg.c:628
+#: src/lives-yuv4mpeg.c:626
 #, c-format
 msgid "TV card %d"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:713
+#: src/lives-yuv4mpeg.c:710
 #, c-format
 msgid "Opened TV card %d (%s)"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:760
+#: src/lives-yuv4mpeg.c:757
 #, c-format
 msgid "Firewire card %d"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:796
+#: src/lives-yuv4mpeg.c:793
 #, c-format
 msgid "Opened firewire card %d"
 msgstr ""
 
-#: src/multitrack.c:666
+#: src/multitrack.c:736
 msgid "Auto backup"
-msgstr ""
+msgstr "Sauvegarde automatique"
 
-#: src/multitrack.c:868
+#: src/multitrack.c:935
 msgid "Backing audio"
 msgstr ""
 
-#: src/multitrack.c:1435
-#, fuzzy, c-format
+#: src/multitrack.c:1515
+#, c-format
 msgid "%s : parameters for %s"
-msgstr "Pas de paramètre"
+msgstr ""
 
-#: src/multitrack.c:1809 src/multitrack.c:3483
+#: src/multitrack.c:1881 src/multitrack.c:3635
 #, c-format
 msgid "Current track: %s (layer %d)\n"
 msgstr ""
 
-#: src/multitrack.c:1813 src/multitrack.c:3484
+#: src/multitrack.c:1885 src/multitrack.c:3637
 msgid "Current track: Backing audio\n"
 msgstr ""
 
-#: src/multitrack.c:1814
+#: src/multitrack.c:1886
 #, c-format
 msgid "Current track: Layer %d audio\n"
 msgstr ""
 
-#: src/multitrack.c:1817
+#: src/multitrack.c:1889
 #, c-format
 msgid "%.2f sec.\n"
 msgstr "%.2f sec.\n"
 
-#: src/multitrack.c:1822 src/multitrack.c:3490
+#: src/multitrack.c:1894 src/multitrack.c:3643
 #, c-format
 msgid "Source: %s"
 msgstr "Source: %s"
 
-#: src/multitrack.c:1825 src/multitrack.c:3492
+#: src/multitrack.c:1897 src/multitrack.c:3645
 msgid "Right click for context menu.\n"
 msgstr "clic droit pour menu contextuel.\n"
 
-#: src/multitrack.c:1827
+#: src/multitrack.c:1899
 msgid ""
 "Double click on a block\n"
 "to select it."
 msgstr ""
 
-#: src/multitrack.c:3312
+#: src/multitrack.c:3452
 msgid ""
 "\n"
 "\n"
@@ -8907,7 +8903,7 @@
 "right or double clicking on it.\n"
 msgstr ""
 
-#: src/multitrack.c:3315
+#: src/multitrack.c:3455
 msgid ""
 "\n"
 "\n"
@@ -8915,14 +8911,14 @@
 "Select an effect in FX stack first to view its parameters.\n"
 msgstr ""
 
-#: src/multitrack.c:3318
+#: src/multitrack.c:3458
 msgid ""
 "\n"
 "\n"
 "No clips loaded.\n"
 msgstr ""
 
-#: src/multitrack.c:3321
+#: src/multitrack.c:3462
 msgid ""
 "You must select two video tracks\n"
 "and a time region\n"
@@ -8932,7 +8928,7 @@
 "before inserting clips into the timeline."
 msgstr ""
 
-#: src/multitrack.c:3324
+#: src/multitrack.c:3465
 msgid ""
 "\n"
 "\n"
@@ -8941,210 +8937,210 @@
 "to apply compositors.\n"
 msgstr ""
 
-#: src/multitrack.c:3487
+#: src/multitrack.c:3640
 #, c-format
 msgid "%.2f sec. to %.2f sec.\n"
 msgstr "%.2f sec. vers %.2f sec.\n"
 
-#: src/multitrack.c:3493
+#: src/multitrack.c:3646
 msgid ""
 "Single click on timeline\n"
 "to select a frame.\n"
 msgstr ""
 
-#: src/multitrack.c:3711 src/multitrack.c:6790
+#: src/multitrack.c:3858 src/multitrack.c:6972
 #, c-format
 msgid "%s [unstable]"
 msgstr ""
 
-#: src/multitrack.c:3822
+#: src/multitrack.c:3973
 msgid ""
 "You can click and drag\n"
 "below the timeline"
 msgstr ""
 
-#: src/multitrack.c:3823
+#: src/multitrack.c:3974
 msgid "to select a time region.\n"
 msgstr "Sélectionner une région temporelle.\n"
 
-#: src/multitrack.c:3985
+#: src/multitrack.c:4137
 msgid "LiVES: Selected clip"
 msgstr ""
 
-#: src/multitrack.c:3993
+#: src/multitrack.c:4145
 msgid "_Adjust start and end points"
 msgstr ""
 
-#: src/multitrack.c:4002
+#: src/multitrack.c:4154
 msgid "_Edit/encode in clip editor"
 msgstr ""
 
-#: src/multitrack.c:4009
+#: src/multitrack.c:4161
 msgid "_Show clip information"
 msgstr ""
 
-#: src/multitrack.c:4016
+#: src/multitrack.c:4168
 msgid "_Close this clip"
 msgstr ""
 
-#: src/multitrack.c:4236
+#: src/multitrack.c:4388
 msgid "Audio mixer (ctrl-m)"
 msgstr ""
 
-#: src/multitrack.c:4336
+#: src/multitrack.c:4488
 msgid "Single click on timeline"
 msgstr ""
 
-#: src/multitrack.c:4337
+#: src/multitrack.c:4489
 msgid "to select a frame."
 msgstr ""
 
-#: src/multitrack.c:4338
+#: src/multitrack.c:4490
 msgid "Double click or right click on timeline"
 msgstr ""
 
-#: src/multitrack.c:4339
+#: src/multitrack.c:4491
 msgid "to select a block."
 msgstr ""
 
-#: src/multitrack.c:4340
+#: src/multitrack.c:4492
 msgid "Clips can be dragged"
 msgstr ""
 
-#: src/multitrack.c:4341
+#: src/multitrack.c:4493
 msgid "onto the timeline."
 msgstr ""
 
-#: src/multitrack.c:4343
+#: src/multitrack.c:4495
 msgid "Mouse mode is: Move"
 msgstr ""
 
-#: src/multitrack.c:4344
+#: src/multitrack.c:4496
 msgid "clips can be moved around."
 msgstr ""
 
-#: src/multitrack.c:4349
+#: src/multitrack.c:4500
 msgid "Mouse mode is: Select."
 msgstr ""
 
-#: src/multitrack.c:4350
+#: src/multitrack.c:4501
 msgid "Drag with mouse on timeline"
 msgstr ""
 
-#: src/multitrack.c:4351
+#: src/multitrack.c:4502
 msgid "to select tracks and time."
 msgstr ""
 
-#: src/multitrack.c:4362
+#: src/multitrack.c:4509
 msgid "_Insert mode: Normal"
 msgstr ""
 
-#: src/multitrack.c:4378
+#: src/multitrack.c:4537
 msgid "_Mouse mode: Move"
 msgstr "_Mouse mode: Déplacement"
 
-#: src/multitrack.c:4382
+#: src/multitrack.c:4540
 msgid "_Mouse mode: Select"
 msgstr "_Mouse mode: Sélection"
 
-#: src/multitrack.c:4405 src/multitrack.c:7925
+#: src/multitrack.c:4563 src/multitrack.c:8104
 msgid "Gravity: Normal"
 msgstr ""
 
-#: src/multitrack.c:4409
+#: src/multitrack.c:4565
 msgid "Gravity: Left"
 msgstr ""
 
-#: src/multitrack.c:4414
+#: src/multitrack.c:4569
 msgid "Gravity: Right"
 msgstr ""
 
-#: src/multitrack.c:4416
+#: src/multitrack.c:4570
 msgid "Close _last gap(s) in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:4419
+#: src/multitrack.c:4572
 msgid "Close _first gap(s) in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:4458
+#: src/multitrack.c:4627
 msgid "Close gaps"
 msgstr "Fermer les"
 
-#: src/multitrack.c:4460
+#: src/multitrack.c:4629
 msgid "Move block"
 msgstr "Déplacer le block"
 
-#: src/multitrack.c:4462
+#: src/multitrack.c:4631
 msgid "Move audio block"
 msgstr "Déplacer le block audio"
 
-#: src/multitrack.c:4464
+#: src/multitrack.c:4633
 msgid "Delete block"
 msgstr "Effacer le block"
 
-#: src/multitrack.c:4466
+#: src/multitrack.c:4635
 msgid "Delete audio block"
 msgstr "Effacer Audio Sélectionné"
 
-#: src/multitrack.c:4468
+#: src/multitrack.c:4637
 msgid "Split tracks"
 msgstr "Séparer les pistes"
 
-#: src/multitrack.c:4470
+#: src/multitrack.c:4639
 msgid "Split block"
 msgstr "Séparer block"
 
-#: src/multitrack.c:4473
+#: src/multitrack.c:4642
 #, c-format
 msgid "Apply %s"
 msgstr "Appliquer %s"
 
-#: src/multitrack.c:4478
+#: src/multitrack.c:4647
 #, c-format
 msgid "Delete %s"
 msgstr "Effacer %s"
 
-#: src/multitrack.c:4482
+#: src/multitrack.c:4651
 msgid "Insert block"
 msgstr "Insère block"
 
-#: src/multitrack.c:4484
+#: src/multitrack.c:4653
 msgid "Insert gap"
 msgstr "Insertion silence"
 
-#: src/multitrack.c:4486
+#: src/multitrack.c:4655
 msgid "Insert audio block"
 msgstr "Insère un block audio"
 
-#: src/multitrack.c:4488
+#: src/multitrack.c:4657
 msgid "Effect order change"
 msgstr "Changement de l'ordre des effets"
 
-#: src/multitrack.c:4898
+#: src/multitrack.c:5064
 msgid "unsigned "
 msgstr "non signé "
 
-#: src/multitrack.c:4899
+#: src/multitrack.c:5065
 msgid "signed "
 msgstr "signé "
 
-#: src/multitrack.c:4904
+#: src/multitrack.c:5071
 #, c-format
 msgid ""
 "Multitrack values set to %.3f fps, frame size %d x %d, audio channels %d, "
 "audio rate %d, audio sample size %d, %s.\n"
 msgstr ""
 
-#: src/multitrack.c:4938
+#: src/multitrack.c:5104
 msgid "invalid event list. Failed.\n"
 msgstr "Liste d'évènement invalide. Échec.\n"
 
-#: src/multitrack.c:4944
+#: src/multitrack.c:5110
 msgid "event list has invalid fps. Failed.\n"
 msgstr "La liste d'évènements à un fps invalide. Échec.\n"
 
-#: src/multitrack.c:4953
+#: src/multitrack.c:5122
 #, c-format
 msgid ""
 "\n"
@@ -9154,7 +9150,7 @@
 "then load in the new set from the File menu.\n"
 msgstr ""
 
-#: src/multitrack.c:4993
+#: src/multitrack.c:5163
 #, c-format
 msgid ""
 "\n"
@@ -9165,441 +9161,433 @@
 "Il y a un nombre incompatible de piste audio (%d) pour LiVES.\n"
 "Il ne peut être chargé.\n"
 
-#: src/multitrack.c:5329 src/multitrack.c:5338 src/multitrack.c:21133
+#: src/multitrack.c:5452
 msgid "Layout was wiped.\n"
 msgstr ""
 
-#: src/multitrack.c:5374
+#: src/multitrack.c:5547
 #, c-format
 msgid "LiVES-%s: Multitrack %dx%d : %d bpp %.3f fps"
 msgstr ""
 
-#: src/multitrack.c:5617
+#: src/multitrack.c:5793
 msgid "In/out"
 msgstr ""
 
-#: src/multitrack.c:5619
+#: src/multitrack.c:5795
 msgid "FX stack"
 msgstr ""
 
-#: src/multitrack.c:5627 src/omc-learn.c:673
+#: src/multitrack.c:5803 src/omc-learn.c:659
 msgid "Params."
 msgstr ""
 
-#: src/multitrack.c:5978
+#: src/multitrack.c:6157
 msgid "_Open..."
-msgstr ""
+msgstr "_Ouvrir..."
 
-#: src/multitrack.c:5996
+#: src/multitrack.c:6175
 msgid "O_pen File Selection..."
 msgstr "Ouvrir Fichier Sélection...."
 
-#: src/multitrack.c:6040
+#: src/multitrack.c:6219
 msgid "Import Selection from _dvd/vcd..."
 msgstr "Importe Sélection depuis _dvd/vcd..."
 
-#: src/multitrack.c:6050
+#: src/multitrack.c:6229
 msgid "Import Selection from _dvd"
 msgstr "Importe Sélection depuis _dvd"
 
-#: src/multitrack.c:6060
+#: src/multitrack.c:6239
 msgid "Import Selection from _vcd"
 msgstr "Importe Sélection depuis _vcd"
 
-#: src/multitrack.c:6076
+#: src/multitrack.c:6255
 msgid "_Import from Device"
 msgstr "_Importe depuis Lecteur"
 
-#: src/multitrack.c:6103
+#: src/multitrack.c:6282
 msgid "_Close the selected clip"
 msgstr ""
 
-#: src/multitrack.c:6198
+#: src/multitrack.c:6377
 msgid "_Save layout as..."
 msgstr "_Sauve disposition comme..."
 
-#: src/multitrack.c:6206
+#: src/multitrack.c:6385
 msgid "_Load layout..."
 msgstr "_Charge disposition..."
 
-#: src/multitrack.c:6210
+#: src/multitrack.c:6389
 msgid "_Wipe/Delete layout..."
 msgstr ""
 
-#: src/multitrack.c:6236
+#: src/multitrack.c:6415
 msgid "_Ignore width, height and audio values from loaded layouts"
 msgstr ""
 "_Ignore la largeur, la hauteur et les valeurs audio à partir de mises en "
 "page chargée"
 
-#: src/multitrack.c:6240
+#: src/multitrack.c:6419
 msgid "Auto load _subtitles with clips"
 msgstr ""
 
-#: src/multitrack.c:6322
+#: src/multitrack.c:6501
 msgid "_CLIP EDITOR"
 msgstr "Éditeur de clip"
 
-#: src/multitrack.c:6334
+#: src/multitrack.c:6513
 msgid "_Adjust selected clip start/end points"
 msgstr ""
 
-#: src/multitrack.c:6343
+#: src/multitrack.c:6522
 msgid "_Insert selected clip"
 msgstr "Insérer le clip sélectionné"
 
-#: src/multitrack.c:6355
+#: src/multitrack.c:6534
 msgid "_Insert selected clip audio"
 msgstr "Insérer l'audio du clip sélectionné"
 
-#: src/multitrack.c:6364
+#: src/multitrack.c:6543
 msgid "_Delete selected block"
 msgstr "_Supprimer les blocs sélectionnés"
 
-#: src/multitrack.c:6373
+#: src/multitrack.c:6555
 msgid "_Jump to previous block boundary"
 msgstr "_Passe à la limite du bloc précédent"
 
-#: src/multitrack.c:6382
+#: src/multitrack.c:6564
 msgid "_Jump to next block boundary"
 msgstr "_Passe à la limite du bloc suivant"
 
-#: src/multitrack.c:6395
+#: src/multitrack.c:6577
 msgid "Clear _marks from timeline"
 msgstr "Nettoyer les balises depuis la ligne de temps."
 
-#: src/multitrack.c:6403
+#: src/multitrack.c:6585
 msgid "Ignore selection limits when inserting"
 msgstr "Ignore les limites de la sélection lors de l'insertion"
 
-#: src/multitrack.c:6420 src/multitrack.c:16719
+#: src/multitrack.c:6602 src/multitrack.c:17009
 msgid "_Play from Timeline Position"
 msgstr ""
 
-#: src/multitrack.c:6434
+#: src/multitrack.c:6616
 msgid "Pla_y selected time only"
 msgstr ""
 
-#: src/multitrack.c:6518
+#: src/multitrack.c:6700
 msgid "_Move effects with blocks"
 msgstr ""
 
-#: src/multitrack.c:6531
+#: src/multitrack.c:6713
 msgid "Select _autotransition effect..."
 msgstr ""
 
-#: src/multitrack.c:6542
+#: src/multitrack.c:6724
 msgid "Crossfade audio with autotransition"
 msgstr ""
 
-#: src/multitrack.c:6550
+#: src/multitrack.c:6732
 msgid "View/_Edit selected effect"
 msgstr "Voir/_Modifier l'effet sélectionné"
 
-#: src/multitrack.c:6554
+#: src/multitrack.c:6736
 msgid "_Delete selected effect"
 msgstr "_Supprime l'effet sélectionné"
 
-#: src/multitrack.c:6562
+#: src/multitrack.c:6744
 msgid "Apply effect to _block..."
 msgstr "Appliquer l'effet à _block..."
 
-#: src/multitrack.c:6619
+#: src/multitrack.c:6801
 msgid "Apply effect to _region..."
 msgstr ""
 
-#: src/multitrack.c:6885
+#: src/multitrack.c:7061
 msgid "_Tracks"
 msgstr "_Pistes"
 
-#: src/multitrack.c:6896
+#: src/multitrack.c:7072
 msgid "Rename current track"
 msgstr ""
 
-#: src/multitrack.c:6904
+#: src/multitrack.c:7080
 msgid "Make _Backing Audio current track"
 msgstr ""
 
-#: src/multitrack.c:6915
+#: src/multitrack.c:7091
 msgid "Add Video Track at _Rear"
 msgstr ""
 
-#: src/multitrack.c:6923
+#: src/multitrack.c:7099
 msgid "Add Video Track at _Front"
 msgstr ""
 
-#: src/multitrack.c:6936
+#: src/multitrack.c:7112
 msgid "_Split current track at cursor"
 msgstr "Séparer les pistes à la position du curseur"
 
-#: src/multitrack.c:6948
+#: src/multitrack.c:7124
 msgid "_Split selected video tracks"
 msgstr "Séparer les pistes vidéos sélectionnées"
 
-#: src/multitrack.c:6961
+#: src/multitrack.c:7137
 msgid "Insert gap in selected tracks/time"
 msgstr "Insérer un vide dans les pistes/temps sélectionné"
 
-#: src/multitrack.c:6969
+#: src/multitrack.c:7145
 msgid "Insert gap in current track/selected time"
 msgstr ""
 
-#: src/multitrack.c:6981
+#: src/multitrack.c:7157
 msgid "Close all _gaps in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:7007
+#: src/multitrack.c:7183
 msgid "Se_lection"
 msgstr "Sélection"
 
-#: src/multitrack.c:7018
+#: src/multitrack.c:7194
 msgid "_Select Current Track"
 msgstr "Sélectionner la piste actuelle"
 
-#: src/multitrack.c:7025
+#: src/multitrack.c:7201
 msgid "Select _all video tracks"
 msgstr "Sélectionne toutes les pistes vidéo"
 
-#: src/multitrack.c:7032
+#: src/multitrack.c:7208
 msgid "Select _no video tracks"
 msgstr ""
 
-#: src/multitrack.c:7039
+#: src/multitrack.c:7215
 msgid "Select all _time"
 msgstr "Sélectionner l'ensemble _time"
 
-#: src/multitrack.c:7050
+#: src/multitrack.c:7226
 msgid "Select from _zero time"
 msgstr "Sélectionne depuis _zero temps"
 
-#: src/multitrack.c:7057
+#: src/multitrack.c:7233
 msgid "Select to _end time"
 msgstr "Sélection jusqu'à la fin du temps"
 
-#: src/multitrack.c:7064
+#: src/multitrack.c:7240
 msgid "_Copy..."
 msgstr "_Copie..."
 
-#: src/multitrack.c:7075
+#: src/multitrack.c:7251
 msgid "_Timecode to region start"
 msgstr ""
 
-#: src/multitrack.c:7082
+#: src/multitrack.c:7258
 msgid "_Timecode to region end"
 msgstr ""
 
-#: src/multitrack.c:7089
+#: src/multitrack.c:7265
 msgid "_Region start to timecode"
 msgstr ""
 
-#: src/multitrack.c:7096
+#: src/multitrack.c:7272
 msgid "_Region end to timecode"
 msgstr ""
 
-#: src/multitrack.c:7110
+#: src/multitrack.c:7286
 msgid "Select/deselect block at current track/time"
 msgstr ""
 
-#: src/multitrack.c:7135
+#: src/multitrack.c:7311
 msgid "_Change width, height and audio values..."
 msgstr "_Modifie la largeur, la hauteur et les valeurs audio..."
 
-#: src/multitrack.c:7194
+#: src/multitrack.c:7370
 msgid "_Render"
 msgstr "_Rendu"
 
-#: src/multitrack.c:7205
+#: src/multitrack.c:7381
 msgid "_Render all to new clip"
 msgstr ""
 
-#: src/multitrack.c:7220
+#: src/multitrack.c:7396
 msgid "Render _video"
 msgstr ""
 
-#: src/multitrack.c:7225
+#: src/multitrack.c:7401
 msgid "Render _audio"
 msgstr ""
 
-#: src/multitrack.c:7235
+#: src/multitrack.c:7411
 msgid "_Normalise rendered audio"
 msgstr ""
 
-#: src/multitrack.c:7242
+#: src/multitrack.c:7418
 msgid "_Pre-render audio"
 msgstr ""
 
-#: src/multitrack.c:7251
+#: src/multitrack.c:7427
 msgid "_View"
 msgstr "Vue"
 
-#: src/multitrack.c:7270
+#: src/multitrack.c:7446
 msgid "Block _In/out points"
 msgstr ""
 
-#: src/multitrack.c:7279
+#: src/multitrack.c:7455
 msgid "_Effects at current"
 msgstr "Effets à la position courante"
 
-#: src/multitrack.c:7297
+#: src/multitrack.c:7473
 msgid "Audio parameters"
 msgstr "Paramètres audio"
 
-#: src/multitrack.c:7308
+#: src/multitrack.c:7484
 msgid "Show backing _audio track"
 msgstr ""
 
-#: src/multitrack.c:7312
+#: src/multitrack.c:7488
 msgid "Compact view"
 msgstr "Vue compacte"
 
-#: src/multitrack.c:7320
+#: src/multitrack.c:7496
 msgid "Maximum tracks to display..."
 msgstr "Pistes maximums à afficher..."
 
-#: src/multitrack.c:7327
+#: src/multitrack.c:7503
 msgid "Scroll to follow playback"
 msgstr ""
 
-#: src/multitrack.c:7331
+#: src/multitrack.c:7507
 msgid "_Center on cursor"
 msgstr "_Center le curseur"
 
-#: src/multitrack.c:7338
+#: src/multitrack.c:7514
 msgid "_Zoom in"
 msgstr ""
 
-#: src/multitrack.c:7349
+#: src/multitrack.c:7525
 msgid "_Zoom out"
 msgstr ""
 
-#: src/multitrack.c:7361
+#: src/multitrack.c:7537
 msgid "Multitrack _details"
 msgstr "Détails multipistes"
 
-#: src/multitrack.c:7374
+#: src/multitrack.c:7550
 msgid "_Event Window"
 msgstr "Fenêtre Des Événements"
 
-#: src/multitrack.c:7378
+#: src/multitrack.c:7554
 msgid "_Event Window (selected time only)"
 msgstr ""
 
-#: src/multitrack.c:7382
+#: src/multitrack.c:7558
 msgid "_Show FRAME events"
 msgstr ""
 
-#: src/multitrack.c:7399
+#: src/multitrack.c:7575
 msgid "_Show multitrack keys"
 msgstr ""
 
-#: src/multitrack.c:7468
+#: src/multitrack.c:7644
 msgid "Mouse mode: _Move"
 msgstr "Mouse mode: _Déplacement"
 
-#: src/multitrack.c:7476
+#: src/multitrack.c:7652
 msgid "Mouse mode: _Select"
 msgstr "Mouse mode: _Sélection"
 
-#: src/multitrack.c:7505
+#: src/multitrack.c:7681
 msgid "Insert mode: _Normal"
 msgstr ""
 
-#: src/multitrack.c:7733
+#: src/multitrack.c:7909
 msgid "Insert with _audio"
 msgstr ""
 
-#: src/multitrack.c:7734
+#: src/multitrack.c:7910
 msgid ""
 "Select whether video clips are inserted and moved with their audio or not"
 msgstr ""
 
-#: src/multitrack.c:7829
+#: src/multitrack.c:8007
 msgid "Select _overlap"
 msgstr ""
 
-#: src/multitrack.c:7830
+#: src/multitrack.c:8008
 msgid ""
 "Select whether timeline selection snaps to overlap between selected tracks "
 "or not"
 msgstr ""
 
-#: src/multitrack.c:7894 src/multitrack.c:14198
+#: src/multitrack.c:8073 src/multitrack.c:14422
 msgid "Expanded View (d)"
 msgstr "Vue étendue (d)"
 
-#: src/multitrack.c:7897 src/multitrack.c:14205
+#: src/multitrack.c:8076 src/multitrack.c:14428
 msgid "Compact View (d)"
 msgstr "Vue compacte (d)"
 
-#: src/multitrack.c:7939
+#: src/multitrack.c:8118
 msgid "Gravity: _Normal"
 msgstr ""
 
-#: src/multitrack.c:7952
+#: src/multitrack.c:8131
 msgid "Gravity: _Left"
 msgstr ""
 
-#: src/multitrack.c:7967
+#: src/multitrack.c:8146
 msgid "Gravity: _Right"
 msgstr ""
 
-#: src/multitrack.c:8297
+#: src/multitrack.c:8496
 msgid "_Apply"
 msgstr "_Appliquer"
 
-#: src/multitrack.c:8319
+#: src/multitrack.c:8518
 msgid "Time"
 msgstr "Temps"
 
-#: src/multitrack.c:8333
+#: src/multitrack.c:8532
 msgid "_Del. node"
 msgstr "_Supprimer le noeud"
 
-#: src/multitrack.c:8341
+#: src/multitrack.c:8540
 msgid "_Next node"
 msgstr "Noeud _suivant"
 
-#: src/multitrack.c:8349
+#: src/multitrack.c:8548
 msgid "_Prev node"
 msgstr "Noeud _précédent"
 
-#: src/multitrack.c:8373
+#: src/multitrack.c:8574
 msgid "_Reverse playback  "
 msgstr "Lecture inversée  "
 
-#: src/multitrack.c:8395
+#: src/multitrack.c:8596
 msgid "_Velocity  "
 msgstr "_Vitesse  "
 
-#: src/multitrack.c:8464
+#: src/multitrack.c:8664
 msgid "Anchor _start"
 msgstr ""
 
-#: src/multitrack.c:8465
+#: src/multitrack.c:8665
 msgid "Anchor the start point to the timeline"
 msgstr ""
 
-#: src/multitrack.c:8481
-msgid "Start frame"
-msgstr "Image de début"
-
-#: src/multitrack.c:8533
+#: src/multitrack.c:8728
 msgid "Anchor _end"
 msgstr ""
 
-#: src/multitrack.c:8534
+#: src/multitrack.c:8729
 msgid "Anchor the end point to the timeline"
 msgstr ""
 
-#: src/multitrack.c:8546
-msgid "End frame"
-msgstr "Image de fin"
-
-#: src/multitrack.c:8739
+#: src/multitrack.c:8929
 msgid "Scroll"
 msgstr "Défiler"
 
-#: src/multitrack.c:9316
+#: src/multitrack.c:9502
 msgid ""
 "\n"
 "==============================\n"
@@ -9609,91 +9597,91 @@
 "==============================\n"
 "Basculé dans le mode Édition du clip\n"
 
-#: src/multitrack.c:9502
+#: src/multitrack.c:9708
 msgid "Timeline (seconds)"
 msgstr "Timeline (seconds)"
 
-#: src/multitrack.c:9984
+#: src/multitrack.c:10202
 msgid " Backing audio"
 msgstr " Sauvegarde audio"
 
-#: src/multitrack.c:9987
+#: src/multitrack.c:10204
 #, c-format
 msgid " Layer %d audio"
 msgstr ""
 
-#: src/multitrack.c:9995
+#: src/multitrack.c:10212
 msgid "Show/hide audio details"
 msgstr "Montrer/cacher les détails audio"
 
-#: src/multitrack.c:10010 src/multitrack.c:10232
+#: src/multitrack.c:10227 src/multitrack.c:10452
 #, c-format
 msgid "Layer %d audio"
 msgstr ""
 
-#: src/multitrack.c:10144 src/multitrack.c:10261
+#: src/multitrack.c:10353 src/multitrack.c:10481
 #, c-format
 msgid "%s (layer %d)"
 msgstr "%s (couche %d)"
 
-#: src/multitrack.c:10184
+#: src/multitrack.c:10403
 msgid "Select track"
 msgstr "Sélectionner la piste"
 
-#: src/multitrack.c:10188
+#: src/multitrack.c:10407
 msgid "Show/hide audio"
 msgstr ""
 
-#: src/multitrack.c:10194
+#: src/multitrack.c:10413
 #, c-format
 msgid "Video %d"
 msgstr "Vidéo %d"
 
-#: src/multitrack.c:10233
+#: src/multitrack.c:10453
 #, c-format
 msgid " %s"
 msgstr " %s"
 
-#: src/multitrack.c:10346
+#: src/multitrack.c:10574
 msgid "LiVES: Selected effect"
 msgstr "LiVES:- Effet Sélectionné"
 
-#: src/multitrack.c:10358
+#: src/multitrack.c:10586
 msgid "_View/Edit this effect"
 msgstr "_Voir/Éditer cet effet"
 
-#: src/multitrack.c:10361
+#: src/multitrack.c:10588
 msgid "_View this effect"
 msgstr "_Voir cet effet"
 
-#: src/multitrack.c:10369
+#: src/multitrack.c:10596
 msgid "_Delete this effect"
 msgstr "_Supprimer cet effet"
 
-#: src/multitrack.c:10422
+#: src/multitrack.c:10648
 msgid "Cannot insert after this effect"
 msgstr "Insertion impossible après cet effet"
 
-#: src/multitrack.c:10451
+#: src/multitrack.c:10677
 msgid "This effect cannot be moved"
 msgstr "Cet effet ne peut pas être déplacé"
 
-#: src/multitrack.c:10499
+#: src/multitrack.c:10724
 #, c-format
 msgid "  %d to %d selected  "
 msgstr "  %d to %d sélectionné  "
 
-#: src/multitrack.c:10502 src/multitrack.c:10746
+#: src/multitrack.c:10727 src/multitrack.c:10968
 #, c-format
 msgid "%.2f sec."
 msgstr "%.2f sec."
 
-#: src/multitrack.c:10717
+#: src/multitrack.c:10940
 #, c-format
 msgid "%d frames"
 msgstr "%d images"
 
-#: src/multitrack.c:11070
+#: src/multitrack.c:11299
 msgid ""
 "\n"
 "==============================\n"
@@ -9703,70 +9691,70 @@
 "==============================\n"
 "Basculé dans le mode multipiste\n"
 
-#: src/multitrack.c:12691
+#: src/multitrack.c:12939
 msgid "Drag the time slider to where you"
 msgstr ""
 
-#: src/multitrack.c:12692
+#: src/multitrack.c:12940
 msgid "want to set effect parameters"
 msgstr ""
 
-#: src/multitrack.c:12693
+#: src/multitrack.c:12941
 msgid "Set parameters, then click \"Apply\"\n"
 msgstr ""
 
-#: src/multitrack.c:12694
+#: src/multitrack.c:12942
 msgid ""
 "NODES are points where parameters\n"
 "have been set.\n"
 "Nodes can be deleted."
 msgstr ""
 
-#: src/multitrack.c:12697
+#: src/multitrack.c:12944
 msgid "Effect has no parameters.\n"
 msgstr ""
 
-#: src/multitrack.c:12788
+#: src/multitrack.c:13033
 #, c-format
 msgid "%s output"
 msgstr "Sortie %s"
 
-#: src/multitrack.c:12794 src/multitrack.c:12804
+#: src/multitrack.c:13038 src/multitrack.c:13046
 #, c-format
 msgid "layer %d"
 msgstr "calque %d"
 
-#: src/multitrack.c:12796 src/multitrack.c:12806
+#: src/multitrack.c:13039 src/multitrack.c:13047
 msgid "audio track"
 msgstr "piste audio"
 
-#: src/multitrack.c:12797
+#: src/multitrack.c:13040
 #, c-format
 msgid "%s to %s"
 msgstr "%s vers %s"
 
-#: src/multitrack.c:12807
+#: src/multitrack.c:13048
 #, c-format
 msgid "%s from %s"
-msgstr ""
+msgstr "%s de %s"
 
-#: src/multitrack.c:12860
+#: src/multitrack.c:13099
 msgid "_Prev filter map"
 msgstr "Carte des filtres _précédente"
 
-#: src/multitrack.c:12871
+#: src/multitrack.c:13110
 msgid "Insert _before"
 msgstr "_Insérer avant"
 
-#: src/multitrack.c:12881
+#: src/multitrack.c:13120
 msgid "Insert _after"
 msgstr "Insère après"
 
-#: src/multitrack.c:12896
+#: src/multitrack.c:13134
 msgid "_Next filter map"
 msgstr "Carte des filtres _suivante"
 
-#: src/multitrack.c:12911
+#: src/multitrack.c:13148
 msgid ""
 "\n"
 "\n"
@@ -9774,80 +9762,80 @@
 "current time.\n"
 msgstr ""
 
-#: src/multitrack.c:12929
+#: src/multitrack.c:13166
 msgid ""
 "Drag a compositor anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:12936
+#: src/multitrack.c:13173
 msgid ""
 "Drag a transition anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:12944
+#: src/multitrack.c:13181
 msgid ""
 "Effects can be dragged\n"
 "onto blocks on the timeline."
 msgstr ""
 
-#: src/multitrack.c:13166
+#: src/multitrack.c:13406
 msgid "LiVES: Selected block/frame"
 msgstr "LiVES: block/image sélectionné"
 
-#: src/multitrack.c:13173
+#: src/multitrack.c:13413
 msgid "_Select this block"
 msgstr "Sélectionner ce block"
 
-#: src/multitrack.c:13183
+#: src/multitrack.c:13423
 msgid "_Split block here"
 msgstr "_Séparer les blocks à partir d'ici"
 
-#: src/multitrack.c:13191
+#: src/multitrack.c:13431
 msgid "List _effects here"
 msgstr "Lister les effets ici"
 
-#: src/multitrack.c:13200 src/multitrack.c:13277
+#: src/multitrack.c:13440 src/multitrack.c:13518
 #, c-format
 msgid "_Adjust %s"
 msgstr "_Ajuster %s"
 
-#: src/multitrack.c:13215
+#: src/multitrack.c:13455
 msgid "_Delete this block"
 msgstr "Ajuster ce block"
 
-#: src/multitrack.c:13258
+#: src/multitrack.c:13500
 msgid "_Insert here"
 msgstr "_Insérer ici"
 
-#: src/multitrack.c:13264
+#: src/multitrack.c:13505
 msgid "_Insert audio here"
 msgstr "_Insérer l'audio ici"
 
-#: src/multitrack.c:14801
+#: src/multitrack.c:15017
 #, c-format
 msgid "Inserted gap in selected tracks from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:14835
+#: src/multitrack.c:15048
 #, c-format
 msgid "Inserted gap in track %s from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15036
+#: src/multitrack.c:15244
 #, c-format
 msgid "Undid %s\n"
 msgstr "Défaire %s\n"
 
-#: src/multitrack.c:15235
+#: src/multitrack.c:15445
 #, c-format
 msgid "Redid %s\n"
 msgstr "Rétablir %s\n"
 
-#: src/multitrack.c:15268
+#: src/multitrack.c:15475
 msgid ""
 "\n"
 " (variable)"
@@ -9855,82 +9843,82 @@
 "\n"
 " (variable)"
 
-#: src/multitrack.c:15502 src/multitrack.c:15614 src/multitrack.c:18736
-#: src/multitrack.c:18748
+#: src/multitrack.c:15710 src/multitrack.c:15823 src/multitrack.c:19077
+#: src/multitrack.c:19089
 #, c-format
 msgid "track %s"
 msgstr "piste %s"
 
-#: src/multitrack.c:15507 src/multitrack.c:15619 src/multitrack.c:18741
+#: src/multitrack.c:15715 src/multitrack.c:15828 src/multitrack.c:19082
 #, c-format
 msgid "tracks %s and %s"
 msgstr "pistes %s et %s"
 
-#: src/multitrack.c:15513 src/multitrack.c:15625 src/multitrack.c:18751
+#: src/multitrack.c:15721 src/multitrack.c:15834 src/multitrack.c:19091
 msgid "selected tracks"
 msgstr "piste sélectionnés"
 
-#: src/multitrack.c:15516
+#: src/multitrack.c:15726
 #, c-format
 msgid "Added %s %s to %s from %.4f to %.4f\n"
 msgstr "Ajouté %s %s à %s depuis %.4f vers %.4f\n"
 
-#: src/multitrack.c:15550
+#: src/multitrack.c:15760
 #, c-format
 msgid "Added effect %s to track %s from %.4f to %.4f\n"
 msgstr "Effet %s ajouté vers la piste %s depuis %.4f vers %.4f\n"
 
-#: src/multitrack.c:15631
+#: src/multitrack.c:15845
 #, c-format
 msgid "Deleted %s %s from %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15935
+#: src/multitrack.c:16143
 #, c-format
 msgid "rendered %d frames to new clip.\n"
 msgstr "Rendre %d images dans le nouveau clip.\n"
 
-#: src/multitrack.c:16025
+#: src/multitrack.c:16230
 msgid "Cleaning up..."
 msgstr "Nettoyage en cours..."
 
-#: src/multitrack.c:16712
+#: src/multitrack.c:17003
 msgid "_Pause"
 msgstr "_Pause"
 
-#: src/multitrack.c:16713
+#: src/multitrack.c:17004
 msgid "Pause (p)"
 msgstr "Pause (p)"
 
-#: src/multitrack.c:16856
+#: src/multitrack.c:17151
 msgid "Press 'm' during playback"
 msgstr "Presser 'm' lors de la lecture"
 
-#: src/multitrack.c:16857
+#: src/multitrack.c:17152
 msgid "to make a mark on the timeline"
 msgstr "Faire une marque sur la ligne de temps"
 
-#: src/multitrack.c:17154
+#: src/multitrack.c:17498
 #, c-format
 msgid ""
 "Inserted audio %.4f to %.4f from clip %s into backing audio from time %.4f "
 "to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:17414
+#: src/multitrack.c:17759
 #, c-format
 msgid ""
 "Inserted frames %d to %d from clip %s into track %s from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:17998
+#: src/multitrack.c:18332
 #, c-format
 msgid ""
 "Time region %.3f to %.3f\n"
 "selected.\n"
 msgstr ""
 
-#: src/multitrack.c:18002
+#: src/multitrack.c:18336
 msgid ""
 "select one or more tracks\n"
 "to create a region.\n"
@@ -9938,12 +9926,12 @@
 "Sélectionner une ou plusieurs pistes\n"
 "Pour créer une région.\n"
 
-#: src/multitrack.c:18004
+#: src/multitrack.c:18337
 #, c-format
 msgid "%d video tracks selected.\n"
 msgstr "Piste vidéo %d sélectionnée.\n"
 
-#: src/multitrack.c:18006
+#: src/multitrack.c:18339
 msgid ""
 "Double click on timeline\n"
 "to deselect time region."
@@ -9951,7 +9939,7 @@
 "Double-cliquer sur l'échelle des temps\n"
 "pour déselectionner l'intervalle de temps."
 
-#: src/multitrack.c:18013
+#: src/multitrack.c:18346
 msgid ""
 "Single click on an effect\n"
 "to select it."
@@ -9959,7 +9947,7 @@
 "Cliquez sur un effet\n"
 "pour le sélectionner."
 
-#: src/multitrack.c:18014
+#: src/multitrack.c:18347
 msgid ""
 "Double click on an effect\n"
 "to edit it."
@@ -9967,7 +9955,7 @@
 "Double-cliquez sur un effet\n"
 "pour l'éditer."
 
-#: src/multitrack.c:18015
+#: src/multitrack.c:18348
 msgid ""
 "Right click on an effect\n"
 "for context menu.\n"
@@ -9975,83 +9963,82 @@
 "Cliquez droit sur un effet\n"
 "pour voir son menu contextuel.\n"
 
-#: src/multitrack.c:18017
+#: src/multitrack.c:18350
 msgid ""
 "Effect order can be changed at\n"
 "FILTER MAPS"
 msgstr ""
 
-#: src/multitrack.c:18024
+#: src/multitrack.c:18357
 msgid ""
 "You can select an effect,\n"
 "then use the INSERT BEFORE"
 msgstr ""
 
-#: src/multitrack.c:18025
+#: src/multitrack.c:18358
 msgid "or INSERT AFTER buttons to move it."
 msgstr "ou les boutons INSÉRER APRÈS pour le déplacer."
 
-#: src/multitrack.c:18307 src/multitrack.c:18320
+#: src/multitrack.c:18639 src/multitrack.c:18652
 msgid "Click on another effect,"
 msgstr ""
 
-#: src/multitrack.c:18308 src/multitrack.c:18321
+#: src/multitrack.c:18640 src/multitrack.c:18653
 msgid ""
 "and the selected one\n"
 "will be inserted"
 msgstr ""
 
-#: src/multitrack.c:18309
+#: src/multitrack.c:18641
 msgid "after it.\n"
 msgstr "apres lui.\n"
 
-#: src/multitrack.c:18322
+#: src/multitrack.c:18654
 msgid "before it.\n"
 msgstr "avant lui.\n"
 
-#: src/multitrack.c:18551
+#: src/multitrack.c:18889
 #, c-format
 msgid "Removed parameter values for effect %s at time %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:18759
+#: src/multitrack.c:19100
 #, c-format
 msgid "Set parameter values for %s %s on %s at time %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:19251 src/multitrack.c:20873
+#: src/multitrack.c:19630 src/multitrack.c:21195
 msgid "_Autoreload each time"
 msgstr "Recharger à chaque fois"
 
-#: src/multitrack.c:19323
-#, fuzzy
+#: src/multitrack.c:19702
 msgid "Saving layout"
-msgstr "_Sauve la disposition"
+msgstr ""
 
-#: src/multitrack.c:19345
+#: src/multitrack.c:19725
 #, c-format
 msgid "Saved layout to %s\n"
 msgstr ""
 
-#: src/multitrack.c:20783
+#: src/multitrack.c:21125
 msgid "clips and frames"
 msgstr "clips et images"
 
-#: src/multitrack.c:20787
+#: src/multitrack.c:21128
 msgid "clips"
 msgstr "clips"
 
-#: src/multitrack.c:20790
+#: src/multitrack.c:21130
 msgid "frames"
 msgstr "images"
 
-#: src/multitrack.c:20800
+#: src/multitrack.c:21140
 msgid ""
 "\n"
 "Auto reload layout.\n"
 msgstr ""
 
-#: src/multitrack.c:20803
+#: src/multitrack.c:21143
 #, c-format
 msgid ""
 "%s\n"
@@ -10059,103 +10046,100 @@
 "Therefore it could not be loaded properly.\n"
 msgstr ""
 
-#: src/multitrack.c:20920
+#: src/multitrack.c:21284
 msgid "auto backup"
 msgstr "sauvegarde automatique"
 
-#: src/multitrack.c:20923
+#: src/multitrack.c:21287
 #, c-format
 msgid ""
 "\n"
 "Unable to load layout file %s\n"
 msgstr ""
 
-#: src/multitrack.c:20944
+#: src/multitrack.c:21308
 #, c-format
 msgid "Loading layout from %s..."
 msgstr ""
 
-#: src/multitrack.c:20978
+#: src/multitrack.c:21338
 #, c-format
 msgid "Got %d events...processing..."
 msgstr "J'ai %d évènements... en pr..."
 
-#: src/multitrack.c:20991
+#: src/multitrack.c:21349
 msgid "Checking and rebuilding event list"
 msgstr ""
 
-#: src/multitrack.c:21017
+#: src/multitrack.c:21374
 #, c-format
 msgid "%d errors detected.\n"
 msgstr "%d erreurs détectées.\n"
 
-#: src/multitrack.c:21068
+#: src/multitrack.c:21422
 #, c-format
 msgid "Multitrack fps set to %.3f\n"
 msgstr ""
 
-#: src/multitrack.c:21225
-#, fuzzy
+#: src/multitrack.c:21576
 msgid ""
 "The current layout has changes which have not been saved.\n"
 "Are you sure you wish to wipe it ?\n"
 msgstr ""
-"La disposition actuelle n'a pas étée sauvée.\n"
-"Que voulez-vous faire ?\n"
 
-#: src/multitrack.c:22047
+#: src/multitrack.c:22385
 msgid "LiVES: Multitrack audio mixer"
 msgstr "LiVES: Mixer audio multi-piste"
 
-#: src/multitrack.c:22077
+#: src/multitrack.c:22414
 msgid "_Reset values"
 msgstr "_Remettre les valeurs"
 
-#: src/multitrack.c:22081
+#: src/multitrack.c:22418
 msgid "_Close mixer"
 msgstr "_Fermer la console"
 
-#: src/multitrack.c:22130
+#: src/multitrack.c:22466
 msgid ""
 "_Invert backing audio\n"
 "and layer volumes"
 msgstr ""
 
-#: src/multitrack.c:22132
+#: src/multitrack.c:22468
 msgid "Adjust backing and layer audio values so that they sum to 1.0"
 msgstr ""
 
-#: src/multitrack.c:22175
+#: src/multitrack.c:22510
 msgid "_Gang layer audio"
 msgstr ""
 
-#: src/multitrack.c:22177
+#: src/multitrack.c:22512
 msgid "Adjust all layer audio values to the same value"
 msgstr ""
 
-#: src/jack.c:104
+#: src/jack.c:102
 msgid "JACK server started\n"
 msgstr "Le serveur jack a bien démarré.\n"
 
-#: src/jack.c:1284 src/jack.c:1353
+#: src/jack.c:1265 src/jack.c:1334
 msgid "Unable to connect to JACK server\n"
 msgstr "Impossible de se connecter au serveur jack\n"
 
-#: src/jack.c:1512
+#: src/jack.c:1491
 msgid "Started jack audio subsystem.\n"
 msgstr ""
 
-#: src/jack.c:1623
+#: src/jack.c:1600
 msgid "Started jack audio reader.\n"
 msgstr ""
 
-#: src/jack.c:1838
+#: src/jack.c:1815
 msgid ""
 "\n"
 "Connection to jack audio was reset.\n"
 msgstr ""
 
-#: src/pulse.c:87
+#: src/pulse.c:88
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -10167,7 +10151,7 @@
 "Retour au lecteur audio sox.\n"
 "Vous pouvez changer cela dans Preferences/Lecture\n"
 
-#: src/pulse.c:92
+#: src/pulse.c:94
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -10179,7 +10163,7 @@
 "Retour au lecteur audio mplayer.\n"
 "Vous pouvez changer cela dans Preferences/Lecture\n"
 
-#: src/pulse.c:96
+#: src/pulse.c:99
 #, fuzzy
 msgid ""
 "\n"
@@ -10192,7 +10176,7 @@
 "Retour au lecteur audio mplayer.\n"
 "Vous pouvez changer cela dans Preferences/Lecture\n"
 
-#: src/pulse.c:101
+#: src/pulse.c:104
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -10200,11 +10184,11 @@
 "\n"
 "Impossible de se connecter au serveur pulse audio.\n"
 
-#: src/pulse.c:107
+#: src/pulse.c:109
 msgid "LiVES will exit and you can choose another audio player.\n"
 msgstr "LiVES se termine et vous pouvez choisir un autre lecteur audio.\n"
 
-#: src/pulse.c:1352
+#: src/pulse.c:1335
 msgid ""
 "\n"
 "Connection to pulse audio was reset.\n"
@@ -10212,319 +10196,319 @@
 "\n"
 "La connexion à pulse audio a été réinitialisée.\n"
 
-#: src/colourspace.c:1100
+#: src/colourspace.c:1092
 msgid "unclamped"
 msgstr ""
 
-#: src/colourspace.c:1101
+#: src/colourspace.c:1093
 msgid "clamped"
 msgstr ""
 
-#: src/omc-learn.c:195
+#: src/omc-learn.c:191
 #, c-format
 msgid "Responding to joystick events from %s\n"
 msgstr ""
 
-#: src/omc-learn.c:289
+#: src/omc-learn.c:279
 msgid "Creating ALSA seq port..."
 msgstr ""
 
-#: src/omc-learn.c:325
+#: src/omc-learn.c:313
 #, c-format
 msgid "Responding to MIDI events from %s\n"
 msgstr ""
 
-#: src/omc-learn.c:568
+#: src/omc-learn.c:554
 msgid "data"
 msgstr "données"
 
-#: src/omc-learn.c:571
+#: src/omc-learn.c:557
 msgid "velocity"
 msgstr "vitesse"
 
-#: src/omc-learn.c:572
+#: src/omc-learn.c:558
 msgid "note"
 msgstr "note"
 
-#: src/omc-learn.c:574 src/omc-learn.c:736 src/omc-learn.c:1105
-#: src/omc-learn.c:1591 src/omc-learn.c:1640
+#: src/omc-learn.c:560 src/omc-learn.c:724 src/omc-learn.c:1092
+#: src/omc-learn.c:1581 src/omc-learn.c:1630
 msgid "value"
 msgstr "valeur"
 
-#: src/omc-learn.c:576
+#: src/omc-learn.c:562
 msgid "state"
 msgstr "état"
 
-#: src/omc-learn.c:688
+#: src/omc-learn.c:674
 msgid "variable"
 msgstr "variable"
 
-#: src/omc-learn.c:1001
+#: src/omc-learn.c:989
 msgid "Vars."
 msgstr ""
 
-#: src/omc-learn.c:1054
+#: src/omc-learn.c:1041
 #, c-format
 msgid "MIDI ch %d note on"
 msgstr ""
 
-#: src/omc-learn.c:1058
+#: src/omc-learn.c:1045
 #, c-format
 msgid "MIDI ch %d note off"
 msgstr ""
 
-#: src/omc-learn.c:1062
+#: src/omc-learn.c:1049
 #, c-format
 msgid "MIDI ch %d controller %d"
 msgstr ""
 
-#: src/omc-learn.c:1066
+#: src/omc-learn.c:1053
 #, c-format
 msgid "MIDI ch %d pitch bend"
 msgstr ""
 
-#: src/omc-learn.c:1070
+#: src/omc-learn.c:1057
 #, c-format
 msgid "MIDI ch %d pgm change"
 msgstr ""
 
-#: src/omc-learn.c:1073
+#: src/omc-learn.c:1060
 #, c-format
 msgid "Joystick button %d"
 msgstr "Bouton joystick %d"
 
-#: src/omc-learn.c:1076
+#: src/omc-learn.c:1063
 #, c-format
 msgid "Joystick axis %d"
 msgstr "Axe joystick %d"
 
-#: src/omc-learn.c:1113
+#: src/omc-learn.c:1100
 msgid "x"
 msgstr "x"
 
-#: src/omc-learn.c:1122
+#: src/omc-learn.c:1109
 msgid "range"
 msgstr "intervalle"
 
-#: src/omc-learn.c:1143
+#: src/omc-learn.c:1130
 msgid "+ offset1"
 msgstr "+ offset1"
 
-#: src/omc-learn.c:1161
+#: src/omc-learn.c:1150
 msgid "* scale"
 msgstr "* scale"
 
-#: src/omc-learn.c:1179
+#: src/omc-learn.c:1170
 msgid "+ offset2"
 msgstr "+ offset2"
 
-#: src/omc-learn.c:1280
+#: src/omc-learn.c:1270
 msgid ""
 "\n"
 "Click OK to delete all entries\n"
 msgstr ""
 
-#: src/omc-learn.c:1318
+#: src/omc-learn.c:1308
 msgid "LiVES: OMC learner"
 msgstr "LiVES: apprenant OMC"
 
-#: src/omc-learn.c:1334
+#: src/omc-learn.c:1324
 msgid "Clear _unmatched"
 msgstr ""
 
-#: src/omc-learn.c:1345
+#: src/omc-learn.c:1335
 msgid "_Delete all"
 msgstr "Tout _supprimer"
 
-#: src/omc-learn.c:1411
+#: src/omc-learn.c:1401
 msgid "Start video playback"
 msgstr "Démarrez la lecture vidéo"
 
-#: src/omc-learn.c:1414
+#: src/omc-learn.c:1404
 msgid "Stop video playback"
 msgstr "Arrêtez la lecture vidéo"
 
-#: src/omc-learn.c:1418
+#: src/omc-learn.c:1408
 msgid "Clip select <clipnum>"
 msgstr ""
 
-#: src/omc-learn.c:1419
+#: src/omc-learn.c:1409
 msgid "Switch foreground clip to the nth valid clip"
 msgstr ""
 
-#: src/omc-learn.c:1423
+#: src/omc-learn.c:1413
 msgid "Play forwards"
 msgstr "Reproduire en avant"
 
-#: src/omc-learn.c:1424
+#: src/omc-learn.c:1414
 msgid "Play video in a forwards direction"
 msgstr "Lire une vidéo dans une direction vers l'avant"
 
-#: src/omc-learn.c:1427
+#: src/omc-learn.c:1417
 msgid "Play backwards"
 msgstr "Lecture arrière"
 
-#: src/omc-learn.c:1428
+#: src/omc-learn.c:1418
 msgid "Play video in a backwards direction"
 msgstr "Lire une vidéo dans une direction vers l'arrière"
 
-#: src/omc-learn.c:1431
+#: src/omc-learn.c:1421
 msgid "Reverse playback direction"
 msgstr ""
 
-#: src/omc-learn.c:1432
+#: src/omc-learn.c:1422
 msgid "Reverse direction of video playback"
 msgstr ""
 
-#: src/omc-learn.c:1435
+#: src/omc-learn.c:1425
 msgid "Play video faster"
 msgstr "Lecture vidéo plus rapide"
 
-#: src/omc-learn.c:1436
+#: src/omc-learn.c:1426
 msgid "Play video at a slightly faster rate"
 msgstr "Lire une vidéo à un rythme légèrement plus rapide"
 
-#: src/omc-learn.c:1439
+#: src/omc-learn.c:1429
 msgid "Play video slower"
 msgstr "Lecture vidéo lente"
 
-#: src/omc-learn.c:1440
+#: src/omc-learn.c:1430
 msgid "Play video at a slightly slower rate"
 msgstr "Lire une vidéo à un rythme légèrement plus lent"
 
-#: src/omc-learn.c:1443
+#: src/omc-learn.c:1433
 msgid "Toggle video freeze"
 msgstr ""
 
-#: src/omc-learn.c:1444
+#: src/omc-learn.c:1434
 msgid "Freeze video, or if already frozen, unfreeze it"
 msgstr ""
 
-#: src/omc-learn.c:1447
+#: src/omc-learn.c:1437
 msgid "Set video framerate to <fps>"
 msgstr ""
 
-#: src/omc-learn.c:1448
+#: src/omc-learn.c:1438
 msgid "Set framerate of foreground clip to <float fps>"
 msgstr ""
 
-#: src/omc-learn.c:1452
+#: src/omc-learn.c:1442
 msgid "Start recording"
 msgstr "Commencer l'enregistrement"
 
-#: src/omc-learn.c:1455
+#: src/omc-learn.c:1445
 msgid "Stop recording"
 msgstr "Arrêter l'enregistrement"
 
-#: src/omc-learn.c:1458
+#: src/omc-learn.c:1448
 msgid "Toggle recording state"
 msgstr ""
 
-#: src/omc-learn.c:1461
+#: src/omc-learn.c:1451
 msgid "Swap foreground and background clips"
 msgstr ""
 
-#: src/omc-learn.c:1463
+#: src/omc-learn.c:1453
 msgid "Reset effect keys"
 msgstr ""
 
-#: src/omc-learn.c:1464
+#: src/omc-learn.c:1454
 msgid "Switch all effects off."
 msgstr ""
 
-#: src/omc-learn.c:1467
+#: src/omc-learn.c:1457
 msgid "Enable effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1471
+#: src/omc-learn.c:1461
 msgid "Disable effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1475
+#: src/omc-learn.c:1465
 msgid "Toggle effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1479
+#: src/omc-learn.c:1469
 msgid "Set parameter value <key> <pnum> = <value>"
 msgstr ""
 
-#: src/omc-learn.c:1480
+#: src/omc-learn.c:1470
 msgid "Set <value> of pth (numerical) parameter for effect key <key>."
 msgstr ""
 
-#: src/omc-learn.c:1484
+#: src/omc-learn.c:1474
 msgid "Switch foreground to next clip"
 msgstr ""
 
-#: src/omc-learn.c:1487
+#: src/omc-learn.c:1477
 msgid "Switch foreground to previous clip"
 msgstr ""
 
-#: src/omc-learn.c:1490
+#: src/omc-learn.c:1480
 msgid "Set video framerate to ratio <fps_ratio>"
 msgstr ""
 
-#: src/omc-learn.c:1491
+#: src/omc-learn.c:1481
 msgid "Set framerate ratio of foreground clip to <float fps_ratio>"
 msgstr ""
 
-#: src/omc-learn.c:1495
+#: src/omc-learn.c:1485
 msgid "Retrigger clip <clipnum>"
 msgstr ""
 
-#: src/omc-learn.c:1496
+#: src/omc-learn.c:1486
 msgid ""
 "Switch foreground clip to the nth valid clip, and reset the frame number"
 msgstr ""
 
-#: src/omc-learn.c:1500
+#: src/omc-learn.c:1490
 msgid "Cycle to next mode for effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1504
+#: src/omc-learn.c:1494
 msgid "Cycle to previous mode for effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1508
+#: src/omc-learn.c:1498
 msgid "Set playback plugin parameter value <pnum> = <value>"
 msgstr ""
 
-#: src/omc-learn.c:1509
+#: src/omc-learn.c:1499
 msgid "Set <value> of pth parameter for the playback plugin."
 msgstr ""
 
 #. TRANSLATORS: short form of "clip number"
-#: src/omc-learn.c:1536 src/omc-learn.c:1607
+#: src/omc-learn.c:1526 src/omc-learn.c:1597
 msgid "clipnum"
 msgstr "clipnum"
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1545
+#: src/omc-learn.c:1535
 msgid "fps"
 msgstr "fps"
 
 #. TRANSLATORS: as in keyboard key
-#: src/omc-learn.c:1553 src/omc-learn.c:1560 src/omc-learn.c:1567
-#: src/omc-learn.c:1575 src/omc-learn.c:1615 src/omc-learn.c:1623
+#: src/omc-learn.c:1543 src/omc-learn.c:1550 src/omc-learn.c:1557
+#: src/omc-learn.c:1565 src/omc-learn.c:1605 src/omc-learn.c:1613
 msgid "key"
 msgstr "clé"
 
 #. TRANSLATORS: short form of "parameter number"
-#: src/omc-learn.c:1583 src/omc-learn.c:1632
+#: src/omc-learn.c:1573 src/omc-learn.c:1622
 msgid "pnum"
 msgstr "pnum"
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1599
+#: src/omc-learn.c:1589
 msgid "fps_ratio"
 msgstr "fps_ratio"
 
-#: src/omc-learn.c:2443
+#: src/omc-learn.c:2417
 #, c-format
 msgid "Saving device mapping to file %s..."
 msgstr ""
 
-#: src/omc-learn.c:2527
+#: src/omc-learn.c:2498
 #, c-format
 msgid ""
 "\n"
@@ -10533,7 +10517,7 @@
 "%s\n"
 msgstr ""
 
-#: src/omc-learn.c:2534
+#: src/omc-learn.c:2505
 #, c-format
 msgid ""
 "\n"
@@ -10546,12 +10530,12 @@
 "Version non valide dans le fichier\n"
 "%s\n"
 
-#: src/omc-learn.c:2571
+#: src/omc-learn.c:2541
 #, c-format
 msgid "Loading device mapping from file %s..."
 msgstr ""
 
-#: src/omc-learn.c:2576
+#: src/omc-learn.c:2544
 #, c-format
 msgid ""
 "\n"
@@ -10566,191 +10550,136 @@
 "%s\n"
 "Code erreur %d\n"
 
-#: src/videodev.c:547
+#: src/videodev.c:539
 #, c-format
 msgid "Unable to open device %s\n"
 msgstr "Impossible d'ouvrir le périphérique %s\n"
 
-#: src/videodev.c:564
+#: src/videodev.c:554
 #, c-format
 msgid "Opened device %s\n"
 msgstr ""
 
+#, fuzzy
 #~ msgid "180 _degrees             "
-#~ msgstr "180 _degrés             "
-
-#~ msgid "90 degrees _Anticlockwise"
-#~ msgstr "90 degrés Sens _Anti-Horaire"
-
-#~ msgid "90 degrees _Clockwise    "
-#~ msgstr "90 degrés Sens Horaire    "
-
-#~ msgid "Add _Border"
-#~ msgstr "Ajouter une _bordure"
-
-#~ msgid "Add noise"
-#~ msgstr "Ajouter du bruit"
+#~ msgstr "Lecteur CD           "
 
 #~ msgid "Adjust contrast"
-#~ msgstr "Ajustez le contraste"
+#~ msgstr "Ajuster le contraste"
 
+#, fuzzy
 #~ msgid "Adjusting contrast of"
-#~ msgstr "Ajustement du contraste"
-
-#~ msgid "Adjusting noise on"
-#~ msgstr "Ajustement du bruit sur"
-
-#~ msgid "Applying charcoal to"
-#~ msgstr "Application de l'effet charbon sur"
+#~ msgstr "Ajuster le contraste"
 
 #, fuzzy
-#~ msgid "Applying forward skip to"
-#~ msgstr "Application de l'effet charbon sur"
+#~ msgid "Adjusting noise on"
+#~ msgstr "Ajuster le contraste"
 
 #, fuzzy
-#~ msgid "Applying sepia to"
-#~ msgstr "Application de l'effet charbon sur"
-
-#~ msgid "B/W Threshold"
-#~ msgstr "Seuil Blanc/Noir"
-
-#~ msgid "B/W thresholding"
-#~ msgstr "Application du seuil Blanc/Noir"
-
 #~ msgid "Blank _Colour"
-#~ msgstr "_Couleur Vide"
+#~ msgstr "Afficher Compteur d'Image_s"
 
+#, fuzzy
 #~ msgid "Blank frames"
-#~ msgstr "Images vide"
+#~ msgstr "clips et images"
 
+#, fuzzy
 #~ msgid "Blanking"
-#~ msgstr "Masquage"
+#~ msgstr "Sauvegarde"
 
+#, fuzzy
 #~ msgid "Block _height"
-#~ msgstr "_Hauteur du bloc"
+#~ msgstr "_Hauteur"
 
+#, fuzzy
 #~ msgid "Block _width"
-#~ msgstr "_Largeur du bloc"
+#~ msgstr "_Hauteur"
 
+#, fuzzy
 #~ msgid "Blur"
-#~ msgstr "Brouiller"
+#~ msgstr "chaîne de caractères"
 
+#, fuzzy
 #~ msgid "Bluring"
-#~ msgstr "Brouillage"
+#~ msgstr "chaîne de caractères"
 
+#, fuzzy
 #~ msgid "Border _Colour"
-#~ msgstr "_Couleur de la bordure"
+#~ msgstr "Afficher Compteur d'Image_s"
 
+#, fuzzy
 #~ msgid "Brightness _end"
-#~ msgstr "_Fin de la luminosité"
+#~ msgstr "Aligner Début"
 
+#, fuzzy
 #~ msgid "Brightness _start"
-#~ msgstr "_Début de la luminosité"
+#~ msgstr "Aligner Début"
 
+#, fuzzy
 #~ msgid "Brightness change"
-#~ msgstr "Changement de la luminosité"
+#~ msgstr "_Ignore les changements"
 
+#, fuzzy
 #~ msgid "Brightness end"
-#~ msgstr "Fin de la luminosité"
+#~ msgstr "_Ignore les changements"
 
 #, fuzzy
 #~ msgid "Brightness start"
-#~ msgstr "_Début de la luminosité"
-
-#~ msgid "Centre _X"
-#~ msgstr "Centre _X"
-
-#~ msgid "Centre _Y"
-#~ msgstr "Centre _Y"
-
-#~ msgid "Changing brightness of"
-#~ msgstr "Modifier la luminosité de"
-
-#~ msgid "Changing gamma of"
-#~ msgstr "Modifier gamma de"
-
-#~ msgid "Changing hue of"
-#~ msgstr "Modifier la"
-
-#~ msgid "Changing saturation of"
-#~ msgstr "Modifier la saturation de"
-
-#~ msgid "Charcoal"
-#~ msgstr "Charbon"
+#~ msgstr "Aligner Début"
 
+#, fuzzy
 #~ msgid "Checkerboard"
-#~ msgstr "Damier"
+#~ msgstr "Enregistrement"
 
 #, fuzzy
 #~ msgid "Checkerboarding"
-#~ msgstr "Damier"
+#~ msgstr "Enregistrement"
 
+#, fuzzy
 #~ msgid "Clipboard _over selection"
-#~ msgstr "Presse-papiers au dessus de la sélection"
+#~ msgstr "%s le presse-papiers avec la sélection"
 
 #, fuzzy
 #~ msgid "Clipboard _under selection"
-#~ msgstr "Presse-papiers au dessus de la sélection"
+#~ msgstr "%s le presse-papiers avec la sélection"
 
 #~ msgid "Colorize"
-#~ msgstr "Colorise"
+#~ msgstr "Coloriser"
 
+#, fuzzy
 #~ msgid "Colorizing"
-#~ msgstr "Colorisation"
+#~ msgstr "Solarisation"
 
+#, fuzzy
 #~ msgid "Colour cycle"
-#~ msgstr "Cycle de Couleurs"
+#~ msgstr "Espace colorimétrique"
 
+#, fuzzy
 #~ msgid "Colour cycling"
-#~ msgstr "Variation de couleurs"
+#~ msgstr "Espace colorimétrique"
 
+#, fuzzy
 #~ msgid "Colour filter"
-#~ msgstr "Filtre de couleurs"
+#~ msgstr "Coloriser"
 
+#, fuzzy
 #~ msgid "Colour filtering"
-#~ msgstr "Filtrage de couleurs"
+#~ msgstr "Coloriser"
 
+#, fuzzy
 #~ msgid "Colour replace"
-#~ msgstr "Remplacement de couleur"
-
-#~ msgid "Constant noise level"
-#~ msgstr "Niveau de bruit constant"
+#~ msgstr "Espace colorimétrique"
 
+#, fuzzy
 #~ msgid "Cycle _Step"
-#~ msgstr "Incrément du Cycle"
+#~ msgstr "_Début"
 
 #~ msgid "Deinterlace"
 #~ msgstr "Désentrelacer"
 
+#, fuzzy
 #~ msgid "Deinterlacing"
-#~ msgstr "Détramage"
-
-#~ msgid "Despeckle"
-#~ msgstr "Adoucir les parasites"
-
-#~ msgid "Despeckling"
-#~ msgstr "Déparasitage"
-
-#~ msgid "Dream"
-#~ msgstr "Rêve"
-
-#~ msgid "Dreamifying"
-#~ msgstr "Application de l'effet Rêve"
-
-#~ msgid "E_nd %"
-#~ msgstr "Fin %s"
-
-#~ msgid "Edge detect"
-#~ msgstr "Détection des bords"
-
-#~ msgid "Edge detecting"
-#~ msgstr "Détection de bords"
-
-#~ msgid "Emboss"
-#~ msgstr "Embosser"
-
-#~ msgid "Embossing"
-#~ msgstr "Repoussage"
+#~ msgstr "Désentrelacer"
 
 #~ msgid "Enhance"
 #~ msgstr "Améliorer"
@@ -10760,50 +10689,51 @@
 
 #, fuzzy
 #~ msgid "Fade _colour"
-#~ msgstr "_Couleur cadre"
+#~ msgstr "Fondu audio sortie"
 
+#, fuzzy
 #~ msgid "Fade _end"
-#~ msgstr "Fin du fondu"
+#~ msgstr "Fondu audio entrée"
 
 #, fuzzy
 #~ msgid "Fade _in"
-#~ msgstr "Fin du fondu"
+#~ msgstr "Fondu audio entrée"
 
 #, fuzzy
 #~ msgid "Fade _out"
 #~ msgstr "Fondu audio sortie"
 
+#, fuzzy
 #~ msgid "Fade"
-#~ msgstr "Fondu"
+#~ msgstr "Fondu audio entrée"
 
 #, fuzzy
 #~ msgid "Fading video"
 #~ msgstr "Reéchantillonage de la vidéo"
 
+#, fuzzy
 #~ msgid "Fading"
-#~ msgstr "Application du fondu"
+#~ msgstr "Reéchantillonage de la vidéo"
 
+#, fuzzy
 #~ msgid "Fina_l frame"
-#~ msgstr "Dernière image"
+#~ msgstr "Image de fin"
 
 #, fuzzy
 #~ msgid "Flash _colour"
-#~ msgstr "_Couleur Vide"
-
-#~ msgid "Flip vertically"
-#~ msgstr "Retourner verticalement"
-
-#~ msgid "Flop horizontally"
-#~ msgstr "Retourner horizontalement"
+#~ msgstr "Fondu audio sortie"
 
+#, fuzzy
 #~ msgid "Frame Calculator"
-#~ msgstr "Calculatrice Des Cadres"
+#~ msgstr "Afficher Compteur d'Image_s"
 
+#, fuzzy
 #~ msgid "Frame _Colour"
-#~ msgstr "_Couleur cadre"
+#~ msgstr "Afficher Compteur d'Image_s"
 
+#, fuzzy
 #~ msgid "Frame _height"
-#~ msgstr "_Hauteur cadre"
+#~ msgstr "Taille de l'encadrement"
 
 #, fuzzy
 #~ msgid "Frame _in frame position of clipboard..."
@@ -10813,19 +10743,21 @@
 #~ msgid "Frame _in frame position of top frame..."
 #~ msgstr "Générer les images vers le Presse-papiers..."
 
+#, fuzzy
 #~ msgid "Frame _width"
-#~ msgstr "_Largeur cadre"
+#~ msgstr "Taille de l'encadrement"
 
+#, fuzzy
 #~ msgid "Frames _per second (FPS)"
-#~ msgstr "Images _par seconde (IPS)"
+#~ msgstr "Images par secondes "
 
 #, fuzzy
 #~ msgid "Gamma _end"
-#~ msgstr "Fin du fondu"
+#~ msgstr "Changement d'images"
 
 #, fuzzy
 #~ msgid "Gamma _start"
-#~ msgstr "Début Sigma"
+#~ msgstr "_Début"
 
 #, fuzzy
 #~ msgid "Gamma change"
@@ -10833,95 +10765,69 @@
 
 #, fuzzy
 #~ msgid "Generate blank frames"
-#~ msgstr "Générer des images colorées"
+#~ msgstr "Générer les images vers un nouveau clip"
 
+#, fuzzy
 #~ msgid "Generate clip from image"
-#~ msgstr "Générer clip de l'image"
+#~ msgstr "Générer vers le presse-papiers"
 
+#, fuzzy
 #~ msgid "Generate coloured frames"
-#~ msgstr "Générer des images colorées"
+#~ msgstr "Générer vers le presse-papiers"
 
 #, fuzzy
 #~ msgid "Generate title frames"
-#~ msgstr "Générer des images colorées"
+#~ msgstr "Générer les images vers un nouveau clip"
 
 #, fuzzy
 #~ msgid "Generating blank frames"
-#~ msgstr "Générer des images colorées"
+#~ msgstr "Réorganisation des images"
 
 #, fuzzy
 #~ msgid "Generating clip from image"
-#~ msgstr "Générer clip de l'image"
+#~ msgstr "Chargement des clips depuis %s"
 
 #, fuzzy
 #~ msgid "Generating coloured frames"
-#~ msgstr "Générer des images colorées"
+#~ msgstr "Réorganisation des images"
 
 #, fuzzy
 #~ msgid "Generating title frames"
-#~ msgstr "Générer des images colorées"
-
-#~ msgid "Horizontal flopping"
-#~ msgstr "Retournement horizontal"
-
-#~ msgid "Horizontal shifting"
-#~ msgstr "Décalage horizontal"
-
-#~ msgid "Hue _end"
-#~ msgstr "_Fin de la teinte"
+#~ msgstr "Réorganisation des images"
 
+#, fuzzy
 #~ msgid "Hue _start"
-#~ msgstr "_Début de la teinte"
+#~ msgstr "_Début"
 
+#, fuzzy
 #~ msgid "Hue change"
-#~ msgstr "Changement teinte"
-
-#~ msgid "Hue end"
-#~ msgstr "Fin de la teinte"
-
-#~ msgid "Hue start"
-#~ msgstr "Début de la teinte"
+#~ msgstr "Changement d'images"
 
 #, fuzzy
-#~ msgid "Image overlay"
-#~ msgstr "Superposition De Texte"
-
-#~ msgid "Jumble"
-#~ msgstr "Mélange"
-
-#~ msgid "Jumbling"
-#~ msgstr "Mélange"
-
-#~ msgid "Keep _Centered"
-#~ msgstr "Garder au _Centre"
+#~ msgid "Hue start"
+#~ msgstr "_Début"
 
 #~ msgid "L_eft"
-#~ msgstr "Gauche"
+#~ msgstr "G_auche"
 
+#, fuzzy
 #~ msgid "Making monochrome"
-#~ msgstr "Transformation en monochrome"
-
-#~ msgid "Modulate (BSH)"
-#~ msgstr "Module (BSH)"
+#~ msgstr "monochrome"
 
+#, fuzzy
 #~ msgid "Modulating"
-#~ msgstr "Modulation"
+#~ msgstr "Rotation"
 
 #~ msgid "Monochrome"
 #~ msgstr "Monochrome"
 
+#, fuzzy
 #~ msgid "Negate"
-#~ msgstr "Inverser"
-
-#~ msgid "Negating"
-#~ msgstr "Passe en Négatif"
-
-#~ msgid "Noise type"
-#~ msgstr "Type de bruit"
+#~ msgstr "Collage"
 
 #, fuzzy
-#~ msgid "Noisify"
-#~ msgstr "buitage"
+#~ msgid "Negating"
+#~ msgstr "Collage"
 
 #~ msgid "Normalize"
 #~ msgstr "Normaliser"
@@ -10929,84 +10835,67 @@
 #~ msgid "Normalizing"
 #~ msgstr "Normalisation"
 
+#, fuzzy
 #~ msgid "Number of _frames"
-#~ msgstr "Nombre de _cadres"
-
-#~ msgid "Photo/still"
-#~ msgstr "Photo/still"
+#~ msgstr "Nombre de touches pour les effets en temps _réel"
 
+#, fuzzy
 #~ msgid "Pixilate"
-#~ msgstr "Pixelliser"
+#~ msgstr "Collage"
 
+#, fuzzy
 #~ msgid "Pixilating"
-#~ msgstr "Pixellisation"
+#~ msgstr "Collage"
 
 #~ msgid "Posterize"
-#~ msgstr "Posteriser"
+#~ msgstr "Postériser"
 
+#, fuzzy
 #~ msgid "Posterizing"
-#~ msgstr "Postérisation"
-
-#~ msgid "Random zoom"
-#~ msgstr "Zoom aléatoire"
-
-#~ msgid "Random zooming"
-#~ msgstr "Zoom aléatoire"
-
-#~ msgid "Reduce noise"
-#~ msgstr "Réduire le bruit"
-
-#~ msgid "Reduction radius"
-#~ msgstr "Réduction du rayon"
+#~ msgstr "Postériser"
 
+#, fuzzy
 #~ msgid "Replacing colours in"
-#~ msgstr "Remplacement de couleurs dans"
+#~ msgstr "Re-échantillonage de l'audio du Presse-papiers"
 
+#, fuzzy
 #~ msgid "Resize All Frames"
-#~ msgstr "Redimensionne toutes les Images"
+#~ msgstr "_Recadre Toutes Les Images"
 
+#, fuzzy
 #~ msgid "Rotate Clip"
-#~ msgstr "Rotation du clip"
+#~ msgstr "Rotation"
 
 #~ msgid "Rotating"
 #~ msgstr "Rotation"
 
+#, fuzzy
 #~ msgid "S_tart %"
-#~ msgstr "Début %s"
+#~ msgstr "_Début"
 
+#, fuzzy
 #~ msgid "Saturation _end"
-#~ msgstr "_Fin de la saturation"
+#~ msgstr "Transition d'entrée"
 
+#, fuzzy
 #~ msgid "Saturation _start"
-#~ msgstr "_Début de la saturation"
+#~ msgstr "Lancer OMC au démarrage"
 
+#, fuzzy
 #~ msgid "Saturation change"
-#~ msgstr "Changement de la saturation"
+#~ msgstr "Transition d'entrée"
 
+#, fuzzy
 #~ msgid "Saturation end"
-#~ msgstr "Fin de la saturation"
+#~ msgstr "Transition d'entrée"
 
+#, fuzzy
 #~ msgid "Saturation start"
-#~ msgstr "Début de la saturation"
+#~ msgstr "Lancer OMC au démarrage"
 
 #~ msgid "Sepia"
 #~ msgstr "Sépia"
 
-#, fuzzy
-#~ msgid "Shift horizontally"
-#~ msgstr "Retourner horizontalement"
-
-#, fuzzy
-#~ msgid "Shift vertically"
-#~ msgstr "Retourner verticalement"
-
-#, fuzzy
-#~ msgid "Shrink/Expand"
-#~ msgstr "Réduction/Augmentation"
-
-#~ msgid "Shrinking/Expanding"
-#~ msgstr "Réduction/Augmentation"
-
 #~ msgid "Skip forward"
 #~ msgstr "Avance rapide"
 
@@ -11014,61 +10903,42 @@
 #~ msgstr "Solariser"
 
 #~ msgid "Solarizing"
-#~ msgstr "Surexposition"
-
-#~ msgid "Spin"
-#~ msgstr "Rotation"
-
-#~ msgid "Spinning"
-#~ msgstr "Retournerment"
+#~ msgstr "Solarisation"
 
+#, fuzzy
 #~ msgid "Splice"
-#~ msgstr "Épissure"
+#~ msgstr "Séparateurs"
 
+#, fuzzy
 #~ msgid "Splicing"
-#~ msgstr "Épissurage"
+#~ msgstr "Séparateurs"
 
+#, fuzzy
 #~ msgid "Spread"
-#~ msgstr "Extension"
+#~ msgstr "Arrêter l'enregistrement"
 
+#, fuzzy
 #~ msgid "Spreading"
-#~ msgstr "Étalement"
+#~ msgstr "Arrêter l'enregistrement"
 
+#, fuzzy
 #~ msgid "Step _Value"
-#~ msgstr "_Valeur dIncrément"
+#~ msgstr "Pose _valeurs"
 
+#, fuzzy
 #~ msgid "Step per _Frame"
-#~ msgstr "Incrément par Image"
+#~ msgstr "Image de début"
 
+#, fuzzy
 #~ msgid "Swirl _start"
-#~ msgstr "Début du remous"
-
-#~ msgid "Swirl s_tep"
-#~ msgstr "Incrémention du remous"
-
-#~ msgid "Swirl"
-#~ msgstr "Spirale"
-
-#~ msgid "Swirling"
-#~ msgstr "Applique les remous"
-
-#~ msgid "Text Overlay"
-#~ msgstr "Superposition De Texte"
-
-#~ msgid "Thres_hold"
-#~ msgstr "_Seuil"
-
-#~ msgid "Trim frames/Add border"
-#~ msgstr "Ajuste images/Ajoute bordure"
-
-#~ msgid "Trimming"
-#~ msgstr "Ajustement"
+#~ msgstr "_Début"
 
 #~ msgid "Tunnel"
 #~ msgstr "Tunnel"
 
+#, fuzzy
 #~ msgid "Tunneling"
-#~ msgstr "Applique l'effet Tunnel"
+#~ msgstr "Tunnel"
 
 #, fuzzy
 #~ msgid "Use _Natural Size"
@@ -11078,84 +10948,62 @@
 #~ msgid "Use _Natural image size"
 #~ msgstr "Utiliser _antialias lors du redimensionnement"
 
-#~ msgid "Vertical flipping"
-#~ msgstr "Retournement vertical"
-
-#~ msgid "Vertical shifting"
-#~ msgstr "Décalage vertical"
-
 #~ msgid "Wave"
-#~ msgstr "Ondulation"
-
-#~ msgid "Waving"
-#~ msgstr "Application de l'effet de Vague"
+#~ msgstr "Vague"
 
 #, fuzzy
 #~ msgid "_Background Colour"
-#~ msgstr "Couleur de Fin"
+#~ msgstr "Arrière plan"
 
 #, fuzzy
 #~ msgid "_Background colour"
-#~ msgstr "_Cacher Arrière Plan"
-
-#~ msgid "_Black and white camera"
-#~ msgstr "Caméra _noir et blanc"
+#~ msgstr "Arrière plan"
 
+#, fuzzy
 #~ msgid "_Black is transparent"
-#~ msgstr "Le _noir est transparent"
+#~ msgstr "Transport jack"
 
 #~ msgid "_Bottom"
 #~ msgstr "_Bas"
 
-#~ msgid "_Calculate"
-#~ msgstr "_Calculer"
-
+#, fuzzy
 #~ msgid "_Cycle Start"
-#~ msgstr "Début du _Cycle"
+#~ msgstr "_Début"
 
+#, fuzzy
 #~ msgid "_Decrease Contrast"
-#~ msgstr "_Diminue le Contraste"
+#~ msgstr "contraste"
 
+#, fuzzy
 #~ msgid "_End Colour"
-#~ msgstr "Couleur de Fin"
+#~ msgstr "Espace colorimétrique"
 
+#, fuzzy
 #~ msgid "_End amount"
-#~ msgstr "Quantité de Fin"
-
-#~ msgid "_Fade level"
-#~ msgstr "Niveau d'estompage"
+#~ msgstr "_Dernière Image seulement"
 
+#, fuzzy
 #~ msgid "_Fade start"
-#~ msgstr "Début du _Fondu"
+#~ msgstr "_Rayon"
 
 #, fuzzy
 #~ msgid "_Fill colour"
-#~ msgstr "Couleur de Fin"
-
-#~ msgid "_First frame"
-#~ msgstr "Première image"
+#~ msgstr "Fondu audio sortie"
 
 #, fuzzy
-#~ msgid "_Flash for"
-#~ msgstr "_Couleur Vide"
+#~ msgid "_First frame"
+#~ msgstr "Première Image"
 
 #~ msgid "_Font"
-#~ msgstr "_Fonte"
+#~ msgstr "_Police de caractères"
 
 #, fuzzy
 #~ msgid "_Frames per second"
 #~ msgstr "Images par secondes "
 
-#~ msgid "_Frames"
-#~ msgstr "_Cadres"
-
-#, fuzzy
-#~ msgid "_Hold for"
-#~ msgstr "_Couleur Vide"
-
 #, fuzzy
-#~ msgid "_Horizontal segments"
-#~ msgstr "Décalage horizontal"
+#~ msgid "_Frames"
+#~ msgstr "Images"
 
 #, fuzzy
 #~ msgid "_Image File"
@@ -11164,30 +11012,20 @@
 #~ msgid "_Image"
 #~ msgstr "_Image"
 
+#, fuzzy
 #~ msgid "_Increase Contrast"
-#~ msgstr "_Augmente le Contraste"
+#~ msgstr "contraste"
 
 #~ msgid "_Levels"
 #~ msgstr "_Niveaux"
 
-#~ msgid "_Link start and end colours"
-#~ msgstr "Relier couleurs du début et de la fin"
-
-#~ msgid "_Max zoom x 10"
-#~ msgstr "Zoom maxi x 10"
-
-#~ msgid "_Middle"
-#~ msgstr "_Milieu"
-
 #, fuzzy
-#~ msgid "_Midtone"
-#~ msgstr "_Milieu"
-
 #~ msgid "_Negate"
-#~ msgstr "_Inverser"
+#~ msgstr "Collage"
 
+#, fuzzy
 #~ msgid "_Number of frames"
-#~ msgstr "_Nombre des cadres"
+#~ msgstr "_Nombre de fois à insérer"
 
 #, fuzzy
 #~ msgid "_Offset X"
@@ -11197,8 +11035,9 @@
 #~ msgid "_Offset Y"
 #~ msgstr "+ offset1"
 
+#, fuzzy
 #~ msgid "_Other Center"
-#~ msgstr "Autre Centre"
+#~ msgstr "_Autre"
 
 #~ msgid "_Other"
 #~ msgstr "_Autre"
@@ -11207,272 +11046,208 @@
 #~ msgid "_Point size"
 #~ msgstr "_Pointeur"
 
+#, fuzzy
 #~ msgid "_Radius end"
-#~ msgstr "Fin du rayon"
+#~ msgstr "_Rayon"
 
+#, fuzzy
 #~ msgid "_Radius start"
-#~ msgstr "Début du _rayon"
+#~ msgstr "_Rayon"
 
 #~ msgid "_Radius"
 #~ msgstr "_Rayon"
 
+#, fuzzy
 #~ msgid "_Random colour each frame"
-#~ msgstr "Couleur aléatoire sur chaque image"
-
-#~ msgid "_Randomness"
-#~ msgstr "Plus Aléatoire"
+#~ msgstr "Réorganisation des images"
 
+#, fuzzy
 #~ msgid "_Right"
-#~ msgstr "_Droite"
+#~ msgstr "_Hauteur"
 
+#, fuzzy
 #~ msgid "_Rotate Selection by"
-#~ msgstr "_Rotation Sélection de"
-
-#~ msgid "_Shrink rotated window to fit frame size"
-#~ msgstr ""
-#~ "_Réduire la partie tournée pour correspondre aux dimensions de l'image"
+#~ msgstr "_Couper Sélection"
 
+#, fuzzy
 #~ msgid "_Sigma end"
-#~ msgstr "Fin Sigma"
+#~ msgstr "grand boutien"
 
+#, fuzzy
 #~ msgid "_Sigma start"
-#~ msgstr "Début Sigma"
+#~ msgstr "_Début"
 
 #, fuzzy
 #~ msgid "_Skip ahead"
-#~ msgstr "Ignorer"
+#~ msgstr "Ignoré"
 
+#, fuzzy
 #~ msgid "_Skip"
-#~ msgstr "Ignorer"
+#~ msgstr "Ignoré"
 
+#, fuzzy
 #~ msgid "_Source Colour"
-#~ msgstr "Couleur _Source"
+#~ msgstr "_Début"
 
+#, fuzzy
 #~ msgid "_Splice"
-#~ msgstr "_Épisse"
+#~ msgstr "Séparateurs"
 
+#, fuzzy
 #~ msgid "_Start Colour"
-#~ msgstr "Couleur de Début"
+#~ msgstr "_Début"
 
+#, fuzzy
 #~ msgid "_Start Value"
-#~ msgstr "Valeur de Départ"
+#~ msgstr "Image de début"
 
+#, fuzzy
 #~ msgid "_Start amount"
-#~ msgstr "Quantité de Départ"
+#~ msgstr "Première Image seulement"
 
 #, fuzzy
 #~ msgid "_Stroke colour"
-#~ msgstr "Couleur de Début"
+#~ msgstr "_Début"
 
 #, fuzzy
 #~ msgid "_Target Colour"
-#~ msgstr "Couleur de Début"
+#~ msgstr "_Début"
 
 #~ msgid "_Text"
 #~ msgstr "_Texte"
 
+#, fuzzy
 #~ msgid "_Time (seconds)"
-#~ msgstr "_Temps (secondes)"
+#~ msgstr "Timeline (seconds)"
 
 #, fuzzy
 #~ msgid "_Top left is clipboard"
 #~ msgstr "Copie vers le presse-papiers"
 
 #, fuzzy
-#~ msgid "_Vertical segments"
-#~ msgstr "Décalage vertical"
-
 #~ msgid "_Wavemax"
-#~ msgstr "Vague Maxi"
+#~ msgstr "Vague"
 
+#, fuzzy
 #~ msgid "_White is transparent"
-#~ msgstr "Le _Blanc est transparent"
-
-#~ msgid "_Wrap Around"
-#~ msgstr "Enrouler Autour"
+#~ msgstr "Transport jack"
 
+#, fuzzy
 #~ msgid "_X Center"
-#~ msgstr "Centre _X"
-
-#~ msgid "_X End"
-#~ msgstr "Fin _X"
+#~ msgstr "_Autre"
 
+#, fuzzy
 #~ msgid "_X Start"
-#~ msgstr "Début _X"
+#~ msgstr "_Début"
 
 #, fuzzy
 #~ msgid "_X offset"
 #~ msgstr "+ offset1"
 
+#, fuzzy
 #~ msgid "_Y Center"
-#~ msgstr "Centre _Y"
-
-#~ msgid "_Y End"
-#~ msgstr "Fin _Y"
+#~ msgstr "_Autre"
 
+#, fuzzy
 #~ msgid "_Y Start"
-#~ msgstr "Début _Y"
+#~ msgstr "_Début"
 
 #, fuzzy
 #~ msgid "_Y offset"
 #~ msgstr "+ offset1"
 
-#~ msgid "_degrees"
-#~ msgstr "_degrés"
-
-#~ msgid "_then"
-#~ msgstr "_puis"
-
 #, fuzzy
 #~ msgid "blank_frames"
-#~ msgstr "Images vide"
-
-#~ msgid "blur"
-#~ msgstr "flouter"
+#~ msgstr "images"
 
 #, fuzzy
 #~ msgid "brightness_change"
-#~ msgstr "Changement de la luminosité"
-
-#, fuzzy
-#~ msgid "charcoal"
-#~ msgstr "Charbon"
+#~ msgstr "_Ignore les changements"
 
-#, fuzzy
 #~ msgid "colorize"
-#~ msgstr "Colorise"
+#~ msgstr "coloriser"
 
 #, fuzzy
 #~ msgid "colour_filter"
-#~ msgstr "Filtre de couleurs"
+#~ msgstr "coloriser"
 
 #, fuzzy
 #~ msgid "colour_replace"
-#~ msgstr "Remplacement de couleur"
+#~ msgstr "Espace colorimétrique"
 
 #~ msgid "contrast"
 #~ msgstr "contraste"
 
-#~ msgid "cycle"
-#~ msgstr "boucler"
-
-#~ msgid "deinterlace"
-#~ msgstr "desentrelacement"
-
-#~ msgid "despeckle"
-#~ msgstr "déparasitage"
-
-#~ msgid "dream"
-#~ msgstr "rêve"
-
 #, fuzzy
-#~ msgid "edge_detect"
-#~ msgstr "Détection des bords"
-
-#~ msgid "emboss"
-#~ msgstr "relief"
+#~ msgid "deinterlace"
+#~ msgstr "Désentrelacer"
 
 #, fuzzy
 #~ msgid "enhance"
 #~ msgstr "Améliorer"
 
+#, fuzzy
 #~ msgid "every"
-#~ msgstr "tous les"
+#~ msgstr "_Chaque"
 
 #, fuzzy
 #~ msgid "fade_in_out"
 #~ msgstr "Fondu audio sortie"
 
 #, fuzzy
-#~ msgid "frame_calculator"
-#~ msgstr "Calculatrice Des Cadres"
-
-#, fuzzy
 #~ msgid "gamma_change"
 #~ msgstr "Changement d'images"
 
 #, fuzzy
 #~ msgid "gen_blank_frames"
-#~ msgstr "Images vide"
+#~ msgstr "images"
 
 #, fuzzy
 #~ msgid "gen_clip_from_image"
-#~ msgstr "Générer clip de l'image"
+#~ msgstr "Générer vers le presse-papiers"
 
 #, fuzzy
 #~ msgid "gen_coloured_frames"
-#~ msgstr "Générer des images colorées"
+#~ msgstr "Générer vers le presse-papiers"
 
 #, fuzzy
 #~ msgid "hue_change"
-#~ msgstr "Changement teinte"
-
-#, fuzzy
-#~ msgid "image_overlay"
-#~ msgstr "Superposition De Texte"
-
-#, fuzzy
-#~ msgid "jumble"
-#~ msgstr "Mélange"
+#~ msgstr "Changement I_PS"
 
 #, fuzzy
 #~ msgid "modulate"
-#~ msgstr "Modulation"
+#~ msgstr "Rotation"
 
 #~ msgid "monochrome"
 #~ msgstr "monochrome"
 
-#~ msgid "negate"
-#~ msgstr "négatif"
-
-#~ msgid "noisify"
-#~ msgstr "buitage"
-
 #, fuzzy
 #~ msgid "normalize"
 #~ msgstr "Normaliser"
 
 #, fuzzy
-#~ msgid "photo_still"
-#~ msgstr "Photo/still"
-
 #~ msgid "pixilate"
-#~ msgstr "pixélisation"
+#~ msgstr "Collage"
 
 #, fuzzy
 #~ msgid "posterize"
-#~ msgstr "Posteriser"
-
-#, fuzzy
-#~ msgid "randomzoom"
-#~ msgstr "Zoom aléatoire"
+#~ msgstr "Postériser"
 
 #~ msgid "resize"
 #~ msgstr "redimensionner"
 
+#, fuzzy
 #~ msgid "rotate"
-#~ msgstr "rotation"
+#~ msgstr "état"
 
 #, fuzzy
 #~ msgid "saturation_change"
-#~ msgstr "Changement de la saturation"
+#~ msgstr "Transition d'entrée"
 
 #~ msgid "sepia"
 #~ msgstr "sépia"
 
 #, fuzzy
-#~ msgid "shift_horizontal"
-#~ msgstr "Retourner horizontalement"
-
-#, fuzzy
-#~ msgid "shift_vertical"
-#~ msgstr "Retourner verticalement"
-
-#, fuzzy
-#~ msgid "shrink_expand"
-#~ msgstr "Réduction/Augmentation"
-
-#, fuzzy
 #~ msgid "skip_forwards"
 #~ msgstr "Avance rapide"
 
@@ -11480,16 +11255,9 @@
 #~ msgid "solarize"
 #~ msgstr "Solariser"
 
-#~ msgid "spin"
-#~ msgstr "boutrégl"
-
 #, fuzzy
 #~ msgid "spread"
-#~ msgstr "Extension"
-
-#, fuzzy
-#~ msgid "swirl"
-#~ msgstr "Spirale"
+#~ msgstr "Arrêter l'enregistrement"
 
 #, fuzzy
 #~ msgid "transition_bwthresh"
@@ -11497,7 +11265,7 @@
 
 #, fuzzy
 #~ msgid "transition_checkerboard"
-#~ msgstr "Damier"
+#~ msgstr "transition"
 
 #, fuzzy
 #~ msgid "transition_fade2"
@@ -11512,76 +11280,40 @@
 #~ msgstr "images"
 
 #~ msgid "tunnel"
-#~ msgstr "Tunnel"
+#~ msgstr "tunnel"
 
+#, fuzzy
 #~ msgid "Unable to open output file !"
-#~ msgstr "incapable d'ouvrir le fichier de sortie !"
+#~ msgstr "Impossible d'ouvrir le périphérique %s\n"
 
+#, fuzzy
 #~ msgid "LiVES could not write to $nfile."
-#~ msgstr "LiVES ne peut ecrire dans $nfile."
-
-#~ msgid "Unable to locate the program $rfx_builder_multi"
-#~ msgstr "Impossible de trouver le programme $rfx_builder_multi"
+#~ msgstr "LiVES ne peut pas localiser l'effet %s.\n"
 
-#~ msgid "This does not appear to be a valid video or image file"
-#~ msgstr "Cela ne semble pas un fichier d'image ou vidéo valide"
+#~ msgid " "
+#~ msgstr " "
 
+#, fuzzy
 #~ msgid "LiVES was unable to open it."
-#~ msgstr "LiVES ne peut l'ouvrir."
-
-#~ msgid "Check the terminal window for more details."
-#~ msgstr "Vérifier la fenêtre de terminal pour plus de détails."
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "LiVES n'est pas capable de réorganiser les images."
 
+#, fuzzy
 #~ msgid "Error creating new backup."
-#~ msgstr "Erreur lors de la création d'une nouvelle sauvegarde"
-
-#~ msgid "This does not appear to be a valid backup file"
-#~ msgstr "Ceci ne semble pas être un fichier de récupération valide"
+#~ msgstr "Erreur lors du chargement de la piste du CD\n"
 
+#, fuzzy
 #~ msgid "LiVES was not able to open the file"
-#~ msgstr "LiVES n'a pas été capable d'ouvrir le fichier"
-
-#~ msgid "$file"
-#~ msgstr "$file"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "LiVES n'est pas capable de réorganiser les images."
 
+#, fuzzy
 #~ msgid "LiVES audio error."
-#~ msgstr "LiVES erreur audio."
-
-#~ msgid "cdda2wav is required for this function."
-#~ msgstr "cdda2wav est nécessaire pour cette opération."
-
-#~ msgid "Please install it first."
-#~ msgstr "A installer au préalable."
-
-#~ msgid "You must set the CD device first in Preferences."
-#~ msgstr "Vous devez configurer le lecteur dans les Préférences."
-
-#~ msgid "$plugin_name failed:"
-#~ msgstr "$plugin_name échec:"
-
-#~ msgid "$error"
-#~ msgstr "$error"
-
-#~ msgid "                                                            "
-#~ msgstr "                                                            "
-
-#~ msgid "warning"
-#~ msgstr "attention"
-
-#~ msgid "LiVES: recover layout ?"
-#~ msgstr "LiVES: récupérer la disposition ?"
-
-#~ msgid "Couldn't find pixmap file: %s"
-#~ msgstr "Impossible de trouver le fichier image : %s"
-
-#~ msgid "No Description"
-#~ msgstr "Pas de Description"
-
-#~ msgid "Default value:    "
-#~ msgstr "Valeur par défaut :    "
-
-#~ msgid "Minimum value: "
-#~ msgstr "Valeur Minimum : "
+#~ msgstr "LiVES: - Attention !"
 
-#~ msgid "Maximum value: "
-#~ msgstr "Valeur Maximum : "
+#~ msgid "Pause"
+#~ msgstr "Pause"

LiVES-2.2.8.tar.bz2/po/gl.po -> LiVES-2.4.1.tar.bz2/po/gl.po Changed

@@ -2,24 +2,23 @@
 # Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008
 # This file is distributed under the same license as the lives package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2008.
-#
+# Miguel Anxo Bouzada <mbouzada@gmail.com>, 2015.
 msgid ""
 msgstr ""
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n"
-"POT-Creation-Date: 2015-02-08 17:18-0300\n"
-"PO-Revision-Date: 2013-03-14 12:31+0000\n"
-"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
-"Language-Team: Galician <gl@li.org>\n"
+"POT-Creation-Date: 2015-08-09 14:52-0300\n"
+"PO-Revision-Date: 2015-04-20 18:32+0000\n"
+"Last-Translator: Miguel Anxo Bouzada <mbouzada@gmail.com>\n"
+"Language-Team: Galician <proxecto@trasno.net>\n"
 "Language: gl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-28 10:42+0000\n"
-"X-Generator: Launchpad (build 16546)\n"
+"X-Launchpad-Export-Date: 2015-05-03 15:41+0000\n"
+"X-Generator: Launchpad (build 17474)\n"
 
-#. TRANSLATORS: do not translate this message
-#: src/main.c:118
+#: src/main.c:128
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -28,22 +27,22 @@
 "http://lives.sourceforge.net/TRANS-README.txt"
 msgstr ""
 
-#: src/main.c:134
+#: src/main.c:153
 #, c-format
 msgid "%s Warning: %s\n"
-msgstr ""
+msgstr "%s Aviso: %s\n"
 
-#: src/main.c:138
+#: src/main.c:157
 #, c-format
 msgid "%s Critical error: %s\n"
-msgstr ""
+msgstr "%s Erro crítico: %s\n"
 
-#: src/main.c:139
+#: src/main.c:158
 #, c-format
 msgid "%s Fatal error: %s\n"
-msgstr ""
+msgstr "%s Erro grave: %s\n"
 
-#: src/main.c:176
+#: src/main.c:198
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -52,12 +51,12 @@
 "Thanks. Recovery should be possible if you restart LiVES.\n"
 msgstr ""
 "\n"
-"Desafortunadamente LiVES caeu.\n"
-"Por favor reporte este erro no http://sourceforge.net/tracker/?"
+"Desafortunadamente LiVES quebrou.\n"
+"Informe deste erro en http://sourceforge.net/tracker/?"
 "group_id=64341&atid=507139\n"
-"Grazas. A recuperación debe ser posible se reinicia LiVES.\n"
+"Grazas. Deber ser posíbel a recuperación se reinicia LiVES.\n"
 
-#: src/main.c:177
+#: src/main.c:199
 msgid ""
 "\n"
 "\n"
@@ -66,105 +65,104 @@
 msgstr ""
 "\n"
 "\n"
-"Cando falla de información, por favor inclúa os detalles do seu sistema "
-"operativo, distribución, ea versión LiVES ("
+"Cando informe de quebras, inclúa os detalles do seu sistema operativo, "
+"distribución, e a versión de LiVES ("
 
-#: src/main.c:180
+#: src/main.c:203
 msgid ""
 "and any information shown below:\n"
 "\n"
 msgstr ""
-"e todas as informacións que aparecen a continuación:\n"
+"e calquera outra información amosada embaixo:\n"
 "\n"
 
-#: src/main.c:184
+#: src/main.c:206
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
 "\n"
 msgstr ""
-"Por favor, instalar e executar gdb vive coa opción -debug para recopilar "
-"máis información.\n"
+"Instale «gdb» e e execute LiVES coa opción -debug para recompilar máis "
+"información.\n"
 "\n"
 
-#: src/main.c:192
+#: src/main.c:216
 msgid "Preserving set.\n"
-msgstr "Preservar set.\n"
+msgstr "Preservar o conxunto.\n"
 
-#: src/main.c:636
+#: src/main.c:691
 msgid "Resizing"
 msgstr "Redimensionando"
 
-#: src/main.c:643
+#: src/main.c:698
 msgid "_Resize All Frames"
-msgstr "_Redimensionar todos os cadros"
+msgstr "_Redimensionar todos os fotogramas"
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:895
+#: src/main.c:948
 msgid "Any"
-msgstr "Calquer"
+msgstr "Calquera"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:897
+#: src/main.c:950
 msgid "None"
 msgstr "Ningún"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:899
+#: src/main.c:952
 msgid "recommended"
 msgstr "recomendado"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:901
+#: src/main.c:954
 msgid "disabled !"
-msgstr "minusválidos !"
+msgstr "desactivado !"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:903
+#: src/main.c:956
 msgid "**The current layout**"
 msgstr "** O esquema actual **"
 
 #. TRANSLATORS: adjective for "Built in" type effects
-#: src/main.c:905
+#: src/main.c:958
 msgid "Builtin"
 msgstr "Incorporado"
 
 #. TRANSLATORS: adjective for "Custom" type effects
-#: src/main.c:907
+#: src/main.c:960
 msgid "Custom"
 msgstr "Personalizado"
 
 #. TRANSLATORS: adjective for "Test" type effects
-#: src/main.c:909
+#: src/main.c:962
 msgid "Test"
 msgstr "Proba"
 
-#: src/main.c:1054
+#: src/main.c:1107
 msgid "Foreground"
-msgstr ""
+msgstr "Primeiro plano"
 
-#: src/main.c:1055
-#, fuzzy
+#: src/main.c:1108
 msgid "Background"
-msgstr "_Inicio"
+msgstr "Fondo"
 
-#: src/main.c:1566
+#: src/main.c:1624
 msgid "Loading realtime effect plugins..."
-msgstr ""
+msgstr "Cargando complementos de efectos en tempo real..."
 
-#: src/main.c:1631
+#: src/main.c:1690
 msgid "Starting jack audio server..."
-msgstr ""
+msgstr "Iniciando o servidor de son jack..."
 
-#: src/main.c:1633
+#: src/main.c:1692
 msgid "Starting jack transport server..."
-msgstr ""
+msgstr "Iniciando o servidor de transporte jack..."
 
-#: src/main.c:1634
+#: src/main.c:1693
 msgid "Connecting to jack transport server..."
-msgstr ""
+msgstr "Conectando co servidor de transporte jack..."
 
-#: src/main.c:1663
+#: src/main.c:1723
 #, c-format
 msgid ""
 "\n"
@@ -176,114 +174,114 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1697
+#: src/main.c:1758
 msgid "Starting pulse audio server..."
-msgstr ""
+msgstr "Iniciando o servidor pulse audio..."
 
-#: src/main.c:1765
+#: src/main.c:1825
 msgid "Checking optional dependencies:"
-msgstr "Comprobar dependencias opcionais:"
+msgstr "Comprobando as dependencias opcionais:"
 
-#: src/main.c:1766
+#: src/main.c:1826
 msgid "mplayer...detected..."
-msgstr "mplayer...detectados..."
+msgstr "mplayer...detectado..."
 
-#: src/main.c:1767
+#: src/main.c:1827
 msgid "mplayer...NOT DETECTED..."
-msgstr "mplayer...NON DETECTA..."
+msgstr "mplayer...NON DETECTADO..."
 
-#: src/main.c:1768
+#: src/main.c:1828
 #, fuzzy
 msgid "mplayer2...detected..."
-msgstr "mplayer...detectados..."
+msgstr "mplayer...detectado..."
 
-#: src/main.c:1769
+#: src/main.c:1829
 #, fuzzy
 msgid "mplayer2...NOT DETECTED..."
-msgstr "mplayer...NON DETECTA..."
+msgstr "mplayer...NON DETECTADO..."
 
-#: src/main.c:1770
+#: src/main.c:1830
 msgid "convert...detected..."
-msgstr "convert...detectados..."
+msgstr "convert...detectado..."
 
-#: src/main.c:1771
+#: src/main.c:1831
 msgid "convert...NOT DETECTED..."
-msgstr "convert...NON DETECTA..."
+msgstr "convert...NON DETECTADO..."
 
-#: src/main.c:1772
+#: src/main.c:1832
 msgid "composite...detected..."
 msgstr "composite...detectados..."
 
-#: src/main.c:1773
+#: src/main.c:1833
 msgid "composite...NOT DETECTED..."
-msgstr "composite...NON DETECTA..."
+msgstr "composite...NON DETECTADO..."
 
-#: src/main.c:1774
+#: src/main.c:1834
 msgid "sox...detected\n"
-msgstr "sox...detectados\n"
+msgstr "sox...detectado\n"
 
-#: src/main.c:1775
+#: src/main.c:1835
 msgid "sox...NOT DETECTED\n"
-msgstr "sox...NON DETECTA\n"
+msgstr "sox...NON DETECTADO\n"
 
-#: src/main.c:1776
+#: src/main.c:1836
 msgid "cdda2wav...detected..."
-msgstr "cdda2wav...detectados..."
+msgstr "cdda2wav...detectado..."
 
-#: src/main.c:1777
+#: src/main.c:1837
 msgid "cdda2wav...NOT DETECTED..."
-msgstr "cdda2wav...NON DETECTA..."
+msgstr "cdda2wav...NON DETECTADO..."
 
-#: src/main.c:1778
+#: src/main.c:1838
 msgid "jackd...detected..."
-msgstr "jackd...detectados..."
+msgstr "jackd...detectado..."
 
-#: src/main.c:1779
+#: src/main.c:1839
 msgid "jackd...NOT DETECTED..."
-msgstr "jackd...NON DETECTA..."
+msgstr "jackd...NON DETECTADO..."
 
-#: src/main.c:1780
+#: src/main.c:1840
 msgid "pulse audio...detected..."
-msgstr "pulse audio...detectados..."
+msgstr "pulse audio...detectado..."
 
-#: src/main.c:1781
+#: src/main.c:1841
 msgid "pulse audio...NOT DETECTED..."
 msgstr "pulse audio...NON DETECTA..."
 
-#: src/main.c:1782
+#: src/main.c:1842
 msgid "python...detected..."
-msgstr "python...detectados..."
+msgstr "python...detectado..."
 
-#: src/main.c:1783
+#: src/main.c:1843
 msgid "python...NOT DETECTED..."
-msgstr "python...NON DETECTA..."
+msgstr "python...NON DETECTADO..."
 
-#: src/main.c:1784
+#: src/main.c:1844
 msgid "dvgrab...detected..."
-msgstr "dvgrab...detectados..."
+msgstr "dvgrab...detectado..."
 
-#: src/main.c:1785
+#: src/main.c:1845
 msgid "dvgrab...NOT DETECTED..."
-msgstr "dvgrab...NON DETECTA..."
+msgstr "dvgrab...NON DETECTADO..."
 
-#: src/main.c:1786
+#: src/main.c:1846
 msgid "xwininfo...detected..."
-msgstr "xwininfo...detectados..."
+msgstr "xwininfo...detectado..."
 
-#: src/main.c:1787
+#: src/main.c:1847
 msgid "xwininfo...NOT DETECTED..."
-msgstr "xwininfo...NON DETECTA..."
+msgstr "xwininfo...NON DETECTADO..."
 
-#: src/main.c:1793
+#: src/main.c:1853
 #, c-format
 msgid "Windows version %04X"
-msgstr ""
+msgstr "Versión de Windows %04X"
 
-#: src/main.c:1795
+#: src/main.c:1855
 msgid "UNKNOWN - please patch me !"
-msgstr ""
+msgstr "DESCOÑECIDO - arranxe isto !"
 
-#: src/main.c:1799
+#: src/main.c:1859
 #, c-format
 msgid ""
 "\n"
@@ -292,206 +290,237 @@
 msgstr ""
 "\n"
 "\n"
-"Informes como xestor de xanelas \"%s\"; "
+"O xestor de xanelas é recoñecido como «%s»; "
 
-#: src/main.c:1802
+#: src/main.c:1862
 #, c-format
 msgid "number of monitors detected: %d\n"
 msgstr "número de monitores detectado: %d\n"
 
-#: src/main.c:1805
+#: src/main.c:1865
 #, c-format
 msgid "Number of CPUs detected: %d "
-msgstr ""
+msgstr "Número de CPU detectadas: %d "
 
-#: src/main.c:1808 src/multitrack.c:4902
+#: src/main.c:1868 src/multitrack.c:5068
 msgid "little endian"
-msgstr ""
+msgstr "little endian"
 
-#: src/main.c:1809 src/multitrack.c:4901
+#: src/main.c:1869 src/multitrack.c:5067
 msgid "big endian"
-msgstr ""
+msgstr "big endian"
 
-#: src/main.c:1810
+#: src/main.c:1870
 #, c-format
 msgid "(%d bits, %s)\n"
-msgstr ""
+msgstr "(%d bits, %s)\n"
 
-#: src/main.c:1814
+#: src/main.c:1874
 msgid "GUI type is: "
-msgstr ""
+msgstr "A interface é do tipo: "
 
-#: src/main.c:1818
+#: src/main.c:1878
 #, c-format
 msgid "GTK+ version %d.%d.%d (compiled with %d.%d.%d)"
-msgstr ""
+msgstr "GTK+ versión %d.%d.%d (compilado con %d.%d.%d)"
 
-#: src/main.c:1840
+#: src/main.c:1900
 msgid ", with cairo support"
-msgstr ""
+msgstr ", con compatibilidade con cairo"
 
-#: src/main.c:1847
+#: src/main.c:1907
 #, c-format
 msgid "Temp directory is %s\n"
-msgstr "Directorio temporal é %s\n"
+msgstr "O directorio temporal é %s\n"
 
-#: src/main.c:1851
+#: src/main.c:1911
 msgid ""
 "WARNING - this version of LiVES was compiled without either\n"
 "jack or pulse audio support.\n"
 "Many audio features will be unavailable.\n"
 msgstr ""
+"AVISO - esta versión de LiVES foi compilada sen compatibilidade\n"
+"con jack ou pulse audio.\n"
+"Moitas funcións de son non estarán dispoñíbeis.\n"
 
-#: src/main.c:1854
+#: src/main.c:1914
 msgid "Compiled with jack support, good !\n"
-msgstr "Feita con soporte a jack, boa !\n"
+msgstr "Compilado con compatibilidade con jack, perfecto !\n"
 
-#: src/main.c:1857
+#: src/main.c:1917
 msgid "Compiled with pulse audio support, wonderful !\n"
-msgstr "Feita con soporte a pulse audio, marabilloso !\n"
+msgstr "Compilado con compatibilidade con pulse audio, marabilloso !\n"
 
-#: src/main.c:1861
+#: src/main.c:1921
 #, c-format
 msgid ""
 "Welcome to LiVES version %s.\n"
 "\n"
 msgstr ""
-"Benvido á LiVES versión %s.\n"
+"Benvido/a á LiVES versión %s.\n"
 "\n"
 
-#: src/main.c:2306
+#: src/main.c:2380
 #, c-format
 msgid ""
 "\n"
 "Startup syntax is: %s [opts] [filename [start_time] [frames]]\n"
 msgstr ""
+"\n"
+"A sintaxe de inicio é: %s [opcións] [nome_ficheiro [momento_de_inicio] "
+"[fotogramas]]\n"
 
-#: src/main.c:2307
+#: src/main.c:2381
 msgid "Where: filename is the name of a media file or backup file.\n"
 msgstr ""
+"Onde: nome_ficheiro é o nome do ficheiro multimedia ou a copia de seguranza "
+"do ficheiro.\n"
 
-#: src/main.c:2308
+#: src/main.c:2382
 msgid "start_time : filename start time in seconds\n"
-msgstr ""
+msgstr "momento_de_inicio : momento do inicio de nome_ficheiro en segundos\n"
 
-#: src/main.c:2309
+#: src/main.c:2383
 msgid "frames : maximum number of frames to open\n"
-msgstr "frames : número máximo de cadros para abrir\n"
+msgstr "fotogramas : número máximo de fotogramas para abrir\n"
 
-#: src/main.c:2311
+#: src/main.c:2385
 msgid "opts can be:\n"
-msgstr "opts pode ser:\n"
+msgstr "opcións pode ser:\n"
 
-#: src/main.c:2312
+#: src/main.c:2386
 msgid "-help            : show this help text and exit\n"
-msgstr "-help : amosar esta axuda e sae\n"
+msgstr "-help              : amosa esta axuda e sae\n"
 
-#: src/main.c:2313
+#: src/main.c:2387
 msgid "-tmpdir <tempdir>: use alternate working directory (e.g /var/ramdisk)\n"
 msgstr ""
+"-tmpdir <dirtemp>  : usar un directorio de traballo alternativo (p. ex. /var/"
+"ramdisk)\n"
 
-#: src/main.c:2314
+#: src/main.c:2388
 msgid "-set <setname>   : autoload clip set setname\n"
 msgstr ""
+"-set <nomeconxunto>: cargar automaticamente o conxunto de fragmentos "
+"«nomeconxunto»\n"
 
-#: src/main.c:2315
+#: src/main.c:2389
 msgid "-noset           : do not load any set on startup\n"
-msgstr "-noset : non cargar ningún set na inicialización\n"
+msgstr "-noset             : non cargar ningún conxunto na inicialización\n"
 
-#: src/main.c:2316
+#: src/main.c:2390
 msgid "-norecover       : force no-loading of crash recovery\n"
-msgstr "-norecover : forza non carga de Recuperación\n"
+msgstr ""
+"-norecover         : forza que NON cargue a recuperación tras unha quebra\n"
 
-#: src/main.c:2317
+#: src/main.c:2391
 msgid "-recover         : force loading of crash recovery\n"
-msgstr ""
+msgstr "-recover           : forza a carga da recuperación tras unha quebra\n"
 
-#: src/main.c:2318
-msgid "-nothreaddialog  : doe nothing - retained for backwards compatibility\n"
+#: src/main.c:2392
+msgid ""
+"-nothreaddialog  : does nothing - retained for backwards compatibility\n"
 msgstr ""
 
-#: src/main.c:2319
+#: src/main.c:2393
 msgid "-nogui           : do not show the gui\n"
-msgstr "-nogui : non mostrar o gui\n"
+msgstr "-nogui             : non amosar a interface\n"
 
-#: src/main.c:2320
+#: src/main.c:2394
 msgid "-nosplash        : do not show the splash window\n"
-msgstr ""
+msgstr "-nosplash          : non amosar a xanela de inicio\n"
 
-#: src/main.c:2321
+#: src/main.c:2395
 msgid "-noplaywin       : do not show the play window\n"
+msgstr "-noplaywin         : non amosar a xanela de reprodución\n"
+
+#: src/main.c:2396
+msgid "-noninteractive  : disable menu interactivity\n"
 msgstr ""
 
-#: src/main.c:2322
+#: src/main.c:2397
 msgid "-startup-ce      : start in clip editor mode\n"
-msgstr "-startup-ce : iniciar no modo de editor clip\n"
+msgstr "-startup-ce        : iniciar no modo de edición de fragmentos\n"
 
-#: src/main.c:2323
+#: src/main.c:2398
 msgid "-startup-mt      : start in multitrack mode\n"
-msgstr ""
+msgstr "-startup-mt        : iniciar no modo miltipista\n"
 
-#: src/main.c:2324
+#: src/main.c:2399
 msgid ""
 "-fxmodesmax <n>  : allow <n> modes per effect key (minimum is 1, default is "
 "8)\n"
 msgstr ""
+"-fxmodesmax <n>    : permitir <n> modos por tecla de efecto (o mínimo é 1, o "
+"predeterminado é 8)\n"
 
-#: src/main.c:2326
+#: src/main.c:2401
 msgid "-oscstart <port> : start OSC listener on UDP port <port>\n"
-msgstr ""
+msgstr "-oscstart <porto>  : iniciar a escoita OSC no porto <porto> UDP\n"
 
-#: src/main.c:2327
+#: src/main.c:2402
 msgid "-nooscstart      : do not start OSC listener\n"
-msgstr ""
+msgstr "-nooscstart        : non iniciar a escoita OSC\n"
 
-#: src/main.c:2329
+#: src/main.c:2404
 #, fuzzy
 msgid ""
 "-aplayer <ap>    : start with selected audio player. <ap> can be mplayer, "
 "mplayer2"
 msgstr ""
-"-aplayer >ap> : comezar con lector de audio seleccionado. <ap> pode ser "
-"mplayer"
+"-aplayer <ap>      : iniciar co reprodutor de son seleccionado. <ap> pode "
+"ser mplayer"
 
 #. TRANSLATORS: pulse (audio)
-#: src/main.c:2332
+#: src/main.c:2407
 msgid ", pulse"
 msgstr ", pulse"
 
-#: src/main.c:2335
+#: src/main.c:2410
 msgid ", sox or jack\n"
 msgstr ", sox ou jack\n"
 
-#: src/main.c:2336
+#: src/main.c:2412
 msgid ""
 "-jackopts <opts>    : opts is a bitmap of jack startup options [1 = jack "
 "transport client, 2 = jack transport master, 4 = start jack transport "
 "server, 8 = pause audio when video paused, 16 = start jack audio server] \n"
 msgstr ""
+"-jackopts <ops>         : «ops» é unha máscara de bits coas opcións de "
+"inicio de jack [1 = transporte de jack como cliente, 2 = transporte de jack "
+"como mestre, 4 = iniciar servidor de transporte de jack, 8 = poñer en pausa "
+"o son cando o vídeo tamén sexa posto en pausa, 16 = iniciar o servidor de "
+"son jack] \n"
 
-#: src/main.c:2338
+#: src/main.c:2414
 msgid " or sox\n"
 msgstr " ou sox\n"
 
-#: src/main.c:2340
+#: src/main.c:2416
 msgid "-devicemap <mapname>          : autoload devicemap\n"
 msgstr ""
+"-devicemap <nomemapa>   : cargar automaticamente o mapa do dispositivo\n"
 
-#: src/main.c:2341
+#: src/main.c:2418
 msgid ""
 "-vppdefaults <file>          : load video playback plugin defaults from "
 "<file> (Note: only sets the settings, not the plugin type)\n"
 msgstr ""
+"-vppdefaults <ficheiro> : carga o engadido de reprodución de vídeo "
+"predeterminado desde <ficheiro> (Nota: só estabelece os axustes, non o tipo "
+"de engadido)\n"
 
-#: src/main.c:2342
+#: src/main.c:2419
 msgid "-debug            : try to debug crashes (requires 'gdb' installed)\n"
-msgstr "-debug : tentar depurar erros (require 'gdb' instalado)\n"
+msgstr ""
+"-debug                   : tentar depurar erros (require ter «gdb» "
+"instalado)\n"
 
-#: src/main.c:2373 src/gui.c:1128
+#: src/main.c:2449 src/gui.c:1127
 msgid "Starting GUI..."
-msgstr ""
+msgstr "Iniciando a interface..."
 
-#: src/main.c:2396
+#: src/main.c:2475
 #, c-format
 msgid ""
 "\n"
@@ -501,16 +530,25 @@
 "%s/%s.\n"
 "(Maybe you need to change the value of <prefix_dir> in your %s file)\n"
 msgstr ""
+"\n"
+"\n"
+"Non foi posíbel atopar o tema que solicitou. Asegúrese de que ten instalados "
+"os temas en\n"
+"%s/%s.\n"
+"(Quizais necesite cambiar o valor de <prefix_dir> no ficheiro %s)\n"
 
-#: src/main.c:2410
+#: src/main.c:2492
 #, c-format
 msgid ""
 "\n"
 "LiVES was unable to write a small file to %s\n"
 "Please make sure you have write access to %s and try again.\n"
 msgstr ""
+"\n"
+"LiVES non foi quen de crear un ficheiro pequeno en %s\n"
+"Asegúrese de que ten acceso de escritura a %s e tenteo de novo.\n"
 
-#: src/main.c:2415
+#: src/main.c:2498
 msgid ""
 "\n"
 "`smogrify` must be in your path, and be executable\n"
@@ -518,8 +556,13 @@
 "Please review the README file which came with this package\n"
 "before running LiVES.\n"
 msgstr ""
+"\n"
+"«smogrify» debe estar na súa ruta, e ten que ser executábel\n"
+"\n"
+"Lea o ficheiro README que ven con este paquete antes de\n"
+"iniciar LiVES.\n"
 
-#: src/main.c:2421
+#: src/main.c:2504
 #, c-format
 msgid ""
 "\n"
@@ -529,7 +572,7 @@
 "Please check the file permissions for this file and try again.\n"
 msgstr ""
 
-#: src/main.c:2428
+#: src/main.c:2512
 #, c-format
 msgid ""
 "\n"
@@ -540,15 +583,18 @@
 "and try again.\n"
 msgstr ""
 
-#: src/main.c:2438
+#: src/main.c:2522
 #, c-format
 msgid ""
 "Please check the <tempdir> setting in \n"
 "%s\n"
 "and try again.\n"
 msgstr ""
+"Comprobe o axuste do <dirtemp> en\n"
+"%s\n"
+"e tenteo de novo.\n"
 
-#: src/main.c:2445
+#: src/main.c:2528
 #, c-format
 msgid ""
 "\n"
@@ -557,8 +603,13 @@
 "\n"
 "%s"
 msgstr ""
+"\n"
+"LiVES non foi quen de empregar o directorio temporal\n"
+"%s\n"
+"\n"
+"%s"
 
-#: src/main.c:2453
+#: src/main.c:2536
 msgid ""
 "\n"
 "An incorrect version of smogrify was found in your path.\n"
@@ -568,50 +619,78 @@
 "\n"
 "Thankyou.\n"
 msgstr ""
+"\n"
+"Atopouse unha versión incorrecta de smogrify na súa ruta.\n"
+"\n"
+"Lea o ficheiro README que ven con este paquete antes de\n"
+"iniciar LiVES.\n"
+"\n"
+"Grazas.\n"
 
-#: src/main.c:2458
+#: src/main.c:2541
+#, fuzzy
 msgid ""
 "\n"
 "LiVES currently requires 'mplayer', 'mplayer2' or 'sox' to function. Please "
 "install one or other of these, and try again.\n"
 msgstr ""
+"\n"
+"LiVES require actualmente «mplayer» ou «sox» para funcionar. Instale un "
+"deles e tenteo de novo.\n"
 
-#: src/main.c:2462
+#: src/main.c:2546
+#, fuzzy
 msgid ""
 "\n"
 "LiVES currently requires both 'mplayer' or 'mplayer2' and 'sox' to function. "
 "Please install these, and try again.\n"
 msgstr ""
+"\n"
+"LiVES require actualmente «mplayer» e «sox» para funcionar. Instáleos e "
+"tenteo de novo.\n"
 
-#: src/main.c:2472
+#: src/main.c:2556
+#, fuzzy
 msgid ""
 "\n"
 "LiVES was unable to locate 'mplayer' or 'mplayer2'. You may wish to install "
 "either one to use LiVES more fully.\n"
 msgstr ""
+"\n"
+"LiVES non foi quen de atopar o «mplayer». É probábel que queira instalar o "
+"mplayer para usar LiVES dun xeito máis completo.\n"
 
-#: src/main.c:2475
+#: src/main.c:2561
 msgid ""
 "\n"
 "LiVES was unable to locate 'convert'. You should install convert and image-"
 "magick if you want to use rendered effects.\n"
 msgstr ""
+"\n"
+"LiVES non foi quen de atopar o «convert». Debe instalar convert e image-"
+"magick se quere utilizar efectos de renderizado.\n"
 
-#: src/main.c:2478
+#: src/main.c:2566
 msgid ""
 "\n"
 "LiVES was unable to locate 'composite'. You should install composite and "
 "image-magick if you want to use the merge function.\n"
 msgstr ""
+"\n"
+"LiVES non foi quen de atopar o «composite». Debe instalar composite e image-"
+"magick se quere utilizar a función de combinación.\n"
 
-#: src/main.c:2481
+#: src/main.c:2570
 msgid ""
 "\n"
 "LiVES was unable to locate 'sox'. Some audio features may not work. You "
 "should install 'sox'.\n"
 msgstr ""
+"\n"
+"LiVES non foi quen de atopar o «sox». É probábel que algunhas "
+"características de son no funcionen. Debe instalar «sox».\n"
 
-#: src/main.c:2484
+#: src/main.c:2575
 #, c-format
 msgid ""
 "\n"
@@ -622,95 +701,96 @@
 "You may need to change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/main.c:2611
+#: src/main.c:2707
 #, c-format
 msgid "Autoloading set %s..."
 msgstr ""
 
 #. TRANSLATORS: localised name may be used here
-#: src/main.c:2781 src/interface.c:738
+#: src/main.c:2902
 msgid "LiVES"
-msgstr ""
+msgstr "LiVES"
 
-#: src/main.c:2948
+#: src/main.c:3066
 #, c-format
 msgid "Invalid audio player %s\n"
-msgstr ""
+msgstr "Reprodutor de son incorrecto %s\n"
 
-#: src/main.c:3077
+#: src/main.c:3214
 #, c-format
 msgid "LiVES-%s: <Untitled%d> %dx%d : %d frames %d bpp %.3f fps"
-msgstr ""
+msgstr "LiVES-%s: <Untitled%d> %dx%d : %d fotogramas %d bpp %.3f fps"
 
-#: src/main.c:3082
+#: src/main.c:3219
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : ??? frames ??? bpp %.3f fps"
-msgstr ""
+msgstr "LiVES-%s: <%s> %dx%d : ??? fotogramas ??? bpp %.3f fps"
 
-#: src/main.c:3086
+#: src/main.c:3222
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : %d frames %d bpp %.3f fps"
-msgstr "LiVES-%s: <%s> %dx%d : %d cadros %d bpp %.3f fps"
+msgstr "LiVES-%s: <%s> %dx%d : %d fotogramas %d bpp %.3f fps"
 
-#: src/main.c:3094
+#: src/main.c:3229
 #, c-format
 msgid "LiVES-%s: <No File>"
-msgstr "LiVES-%s: <No ficheiro>"
+msgstr "LiVES-%s: <Non hai ficheiro>"
 
 #. TRANSLATORS: rec(ord)
-#: src/main.c:5085
+#: src/main.c:5201
 #, c-format
 msgid "rec %9d/%d"
 msgstr ""
 
 #. TRANSLATORS: out of memory (rec(ord))
-#: src/main.c:5091
+#: src/main.c:5206
 #, c-format
 msgid "!rec %9d/%d"
 msgstr ""
 
-#: src/main.c:5398 src/main.c:5399 src/gui.c:2110 src/gui.c:3220
-#: src/saveplay.c:2336
+#: src/main.c:5500 src/main.c:5501 src/gui.c:2108 src/gui.c:3331
+#: src/saveplay.c:2315
 msgid "Play"
 msgstr "Reproducir"
 
-#: src/main.c:6128
+#: src/main.c:6216
 msgid ""
 "LiVES was unable to capture this image\n"
 "\n"
 msgstr ""
-"LiVES non puido capturar esta foto\n"
+"LiVES non puido capturar esta imaxe\n"
 "\n"
 
-#: src/main.c:6250
+#: src/main.c:6345
 #, c-format
 msgid "Closed file %s\n"
 msgstr "Pechado o ficheiro %s\n"
 
-#: src/main.c:6452 src/gui.c:648 src/utils.c:4312 src/utils.c:4344
-#: src/saveplay.c:3550 src/multitrack.c:4510 src/multitrack.c:6268
+#: src/main.c:6542 src/gui.c:647 src/utils.c:4256 src/utils.c:4286
+#: src/saveplay.c:3500 src/multitrack.c:4678 src/multitrack.c:6447
 msgid "_Undo"
 msgstr "_Desfacer"
 
-#: src/main.c:6453 src/gui.c:666 src/utils.c:4313 src/utils.c:4345
-#: src/saveplay.c:3551 src/multitrack.c:4531 src/multitrack.c:6293
+#: src/main.c:6543 src/gui.c:665 src/utils.c:4257 src/utils.c:4287
+#: src/saveplay.c:3501 src/multitrack.c:4698 src/multitrack.c:6472
 msgid "_Redo"
 msgstr "_Refacer"
 
-#: src/main.c:6493 src/interface.c:470 src/gui.c:2326 src/preferences.c:2357
-#: src/resample.c:1516
+#: src/main.c:6583 src/interface.c:457 src/gui.c:2324 src/preferences.c:2391
+#: src/resample.c:1488
 msgid "Video"
 msgstr "Vídeo"
 
-#: src/main.c:6494 src/interface.c:483 src/gui.c:2351
+#: src/main.c:6584 src/interface.c:470 src/gui.c:2348
 msgid "Left Audio"
-msgstr ""
+msgstr "Son esquerdo"
 
-#: src/main.c:6495 src/gui.c:2375
+#: src/main.c:6585 src/gui.c:2371
 msgid "Right Audio"
-msgstr ""
+msgstr "Son dereito"
 
-#: src/main.c:6540
+#: src/main.c:6630
+#, fuzzy
 msgid ""
 "\n"
 "\n"
@@ -718,12 +798,17 @@
 "mplayer or mplayer2.\n"
 "Please adjust the playback options in Preferences and try again.\n"
 msgstr ""
+"\n"
+"\n"
+"LiVES non pode cambiar os fragmento ao abrirse se o reprodutor de son está "
+"configurado a mplayer.\n"
+"Axuste as opcións de reprodución en Preferencias e tenteo de novo.\n"
 
-#: src/main.c:7051 src/plugins.c:1502
+#: src/main.c:7134 src/plugins.c:1468
 msgid "LiVES: - Play Window"
-msgstr ""
+msgstr "LiVES: - Xanela de reprodución"
 
-#: src/startup.c:25
+#: src/startup.c:24
 #, c-format
 msgid ""
 "A directory named\n"
@@ -732,8 +817,13 @@
 "\n"
 "(Free space = %s)\n"
 msgstr ""
+"Xa existe un directorio chamado\n"
+"%s\n"
+"Quere usar este directorio aínda así ?\n"
+"\n"
+"(Espazo libre = %s)\n"
 
-#: src/startup.c:32
+#: src/startup.c:29
 #, c-format
 msgid ""
 "A directory named\n"
@@ -742,8 +832,12 @@
 "LiVES could not write to this directory or read its free space.\n"
 "Please select another location.\n"
 msgstr ""
+"Xa existe un directorio chamado\n"
+"%s\n"
+"LiVES non pode escribir neste directorio ou ler o espazo libre.\n"
+"Seleccione outra localización.\n"
 
-#: src/startup.c:49
+#: src/startup.c:46
 #, c-format
 msgid ""
 "\n"
@@ -753,8 +847,14 @@
 "\n"
 "(Free space = %s)"
 msgstr ""
+"\n"
+"Crear o directorio\n"
+"%s\n"
+"?\n"
+"\n"
+"(Espazo libre = %s)"
 
-#: src/startup.c:54
+#: src/startup.c:50
 #, c-format
 msgid ""
 "\n"
@@ -763,54 +863,54 @@
 "Please try again and choose a different location.\n"
 msgstr ""
 
-#: src/startup.c:96
+#: src/startup.c:92
 msgid "Directory name is too long !"
 msgstr ""
 
-#: src/startup.c:223
+#: src/startup.c:216
 msgid ""
 "LiVES FAILED TO START YOUR SELECTED AUDIO PLAYER !\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:230
+#: src/startup.c:222
 msgid ""
 "Before starting LiVES, you need to choose an audio player.\n"
 "\n"
 "PULSE AUDIO is recommended for most users"
 msgstr ""
 
-#: src/startup.c:233
+#: src/startup.c:225
 msgid ""
 ", but this version of LiVES was not compiled with pulse audio support.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:236
+#: src/startup.c:229
 msgid ""
 ", but you do not have pulse audio installed on your system.\n"
 " You are advised to install pulse audio first before running LiVES.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:241
+#: src/startup.c:233
 msgid "JACK audio is recommended for pro users"
 msgstr ""
 
-#: src/startup.c:244
+#: src/startup.c:236
 msgid ""
 ", but this version of LiVES was not compiled with jack audio support.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:247
+#: src/startup.c:239
 msgid ""
 ", but you do not have jackd installed. You may wish to install jackd first "
 "before running LiVES.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:250
+#: src/startup.c:242
 msgid ""
 ", but may prevent LiVES from starting on some systems.\n"
 "If LiVES will not start with jack, you can restart and try with another "
@@ -818,159 +918,159 @@
 "\n"
 msgstr ""
 
-#: src/startup.c:254
+#: src/startup.c:246
 msgid "SOX may be used if neither of the preceding players work, "
 msgstr ""
 
-#: src/startup.c:257
+#: src/startup.c:249
 msgid ""
 "but some audio features will be disabled.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:260
+#: src/startup.c:251
 msgid ""
 "but you do not have sox installed.\n"
 "You are advised to install it before running LiVES.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:264
+#: src/startup.c:255
 msgid ""
 "The MPLAYER/MPLAYER2 audio player is only recommended for testing purposes.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:281
+#: src/startup.c:271
 msgid "LiVES: - Choose an audio player"
 msgstr ""
 
-#: src/startup.c:298
+#: src/startup.c:288
 msgid "Use _pulse audio player"
 msgstr ""
 
-#: src/startup.c:320
+#: src/startup.c:310
 msgid "Use _jack audio player"
 msgstr ""
 
-#: src/startup.c:340
+#: src/startup.c:330
 msgid "Use _sox audio player"
 msgstr ""
 
-#: src/startup.c:361
+#: src/startup.c:351
 msgid "Use _mplayer audio player"
 msgstr ""
 
-#: src/startup.c:381
+#: src/startup.c:371
 msgid "Use _mplayer2 audio player"
 msgstr ""
 
-#: src/startup.c:405 src/startup.c:580 src/interface.c:1506
+#: src/startup.c:395 src/startup.c:569 src/interface.c:1398
 msgid "_Next"
 msgstr "_Seguinte"
 
-#: src/startup.c:445
+#: src/startup.c:435
 msgid "Skipped"
 msgstr ""
 
-#: src/startup.c:460
+#: src/startup.c:450
 msgid "Passed"
 msgstr ""
 
-#: src/startup.c:493
+#: src/startup.c:483
 msgid "Failed"
 msgstr ""
 
-#: src/startup.c:552
+#: src/startup.c:542
 msgid "LiVES: - Testing Configuration"
 msgstr ""
 
-#: src/startup.c:555
+#: src/startup.c:544
 msgid "LiVES: - Troubleshoot"
 msgstr ""
 
-#: src/startup.c:568
+#: src/startup.c:557
 msgid "LiVES will now run some basic configuration tests\n"
 msgstr ""
 
-#: src/startup.c:603
+#: src/startup.c:591
 msgid "Checking for \"sox\" presence"
 msgstr ""
 
-#: src/startup.c:607
+#: src/startup.c:595
 msgid ""
 "You should install sox to be able to use all the audio features in LiVES"
 msgstr ""
 
-#: src/startup.c:615
+#: src/startup.c:602
 msgid "Checking if sox can convert audio"
 msgstr ""
 
-#: src/startup.c:638
+#: src/startup.c:625
 msgid "Unable to allocate 176400 bytes memory."
 msgstr ""
 
-#: src/startup.c:653
+#: src/startup.c:639
 #, c-format
 msgid "Unable to write to: %s"
 msgstr ""
 
-#: src/startup.c:667 src/startup.c:807
+#: src/startup.c:653 src/startup.c:789
 #, c-format
 msgid "Command failed: %s"
 msgstr ""
 
-#: src/startup.c:689
+#: src/startup.c:675
 msgid "You should install sox_fmt_all or similar"
 msgstr ""
 
-#: src/startup.c:717
+#: src/startup.c:703
 msgid "Checking for \"mplayer\" presence"
 msgstr ""
 
-#: src/startup.c:721
+#: src/startup.c:707
 msgid ""
 "You should install mplayer or mplayer2 to be able to use all the decoding "
 "features in LiVES"
 msgstr ""
 
-#: src/startup.c:747
+#: src/startup.c:732
 msgid "Checking if mplayer can convert audio"
 msgstr ""
 
-#: src/startup.c:768
+#: src/startup.c:751
 msgid "You should install mplayer or mplayer2 with pcm/wav support"
 msgstr ""
 
-#: src/startup.c:785
+#: src/startup.c:767
 msgid "Checking if mplayer can decode to png/alpha"
 msgstr ""
 
-#: src/startup.c:828
+#: src/startup.c:810
 msgid "You may wish to upgrade mplayer to a newer version"
 msgstr ""
 
-#: src/startup.c:854
+#: src/startup.c:836
 msgid "Checking if mplayer can decode to jpeg"
 msgstr ""
 
-#: src/startup.c:882
+#: src/startup.c:862
 msgid "You should install mplayer with either png/alpha or jpeg support"
 msgstr ""
 
-#: src/startup.c:883
+#: src/startup.c:863
 msgid "You may wish to add jpeg output support to mplayer"
 msgstr ""
 
-#: src/startup.c:892
+#: src/startup.c:872
 msgid "Checking for \"convert\" presence"
 msgstr ""
 
-#: src/startup.c:896
+#: src/startup.c:876
 msgid "Install imageMagick to be able to use all of the rendered effects"
 msgstr ""
 
-#: src/startup.c:909
+#: src/startup.c:889
 msgid ""
 "\n"
 "\n"
@@ -978,7 +1078,7 @@
 "Preferences/Decoding.    \n"
 msgstr ""
 
-#: src/startup.c:915
+#: src/startup.c:894
 msgid ""
 "\n"
 "\n"
@@ -986,49 +1086,49 @@
 "continue    \n"
 msgstr ""
 
-#: src/startup.c:949
+#: src/startup.c:928
 msgid ""
 "\n"
 "\n"
 "Finally, you can choose the default startup interface for LiVES.\n"
 msgstr ""
 
-#: src/startup.c:950
+#: src/startup.c:929
 msgid ""
 "\n"
 "\n"
 "LiVES has two main interfaces and you can start up with either of them.\n"
 msgstr ""
 
-#: src/startup.c:951
+#: src/startup.c:930
 msgid ""
 "\n"
 "\n"
 "The default can always be changed later from Preferences.\n"
 msgstr ""
 
-#: src/startup.c:961
+#: src/startup.c:940
 msgid "LiVES: - Choose the startup interface"
 msgstr ""
 
-#: src/startup.c:972
+#: src/startup.c:951
 msgid "Start in _Clip Edit mode"
 msgstr ""
 
-#: src/startup.c:975
+#: src/startup.c:954
 msgid "This is the best choice for simple editing tasks and for VJs\n"
 msgstr ""
 
-#: src/startup.c:981
+#: src/startup.c:960
 msgid "Start in _Multitrack mode"
 msgstr ""
 
-#: src/startup.c:983
+#: src/startup.c:962
 msgid ""
 "This is a better choice for complex editing tasks involving multiple clips.\n"
 msgstr ""
 
-#: src/startup.c:992
+#: src/startup.c:971
 msgid "_Finish"
 msgstr ""
 
@@ -1045,35 +1145,35 @@
 msgid "Apply _Deinterlace"
 msgstr ""
 
-#: src/interface.c:66
+#: src/interface.c:65
 msgid "If this is set, frames will be deinterlaced as they are imported."
 msgstr ""
 
-#: src/interface.c:113 src/callbacks.c:9623 src/callbacks.c:9646
-#: src/callbacks.c:9647 src/gui.c:3223 src/gui.c:3821 src/saveplay.c:2339
-#: src/saveplay.c:3138 src/dialogs.c:1514 src/dialogs.c:1515
-#: src/dialogs.c:1746 src/dialogs.c:1747 src/framedraw.c:238
-#: src/multitrack.c:8031
+#: src/interface.c:106 src/callbacks.c:9542 src/callbacks.c:9564
+#: src/callbacks.c:9565 src/gui.c:3333 src/gui.c:3946 src/saveplay.c:2317
+#: src/saveplay.c:3097 src/dialogs.c:1575 src/dialogs.c:1576
+#: src/dialogs.c:1804 src/dialogs.c:1805 src/framedraw.c:236
+#: src/multitrack.c:8210
 msgid "Preview"
-msgstr "Previsualización"
+msgstr "Vista previa"
 
-#: src/interface.c:132
+#: src/interface.c:125
 msgid "Click here to _Preview any selected video, image or audio file"
 msgstr ""
 
-#: src/interface.c:135
+#: src/interface.c:127
 msgid "Click here to _Preview any selected audio file"
 msgstr ""
 
-#: src/interface.c:138
+#: src/interface.c:129
 msgid "Click here to _Preview the video"
 msgstr ""
 
-#: src/interface.c:181 src/dialogs.c:2542
+#: src/interface.c:169 src/dialogs.c:2621
 msgid "LiVES: - Processing..."
 msgstr "LiVES: - Procesamento da..."
 
-#: src/interface.c:217
+#: src/interface.c:205
 msgid ""
 "\n"
 "\n"
@@ -1087,199 +1187,187 @@
 "\n"
 "Lembre apagar efectos (ctrl) despois !"
 
-#: src/interface.c:222 src/callbacks.c:9373 src/callbacks.c:9420
-#: src/dialogs.c:2570
+#: src/interface.c:210 src/callbacks.c:9283 src/callbacks.c:9332
+#: src/dialogs.c:2649
 msgid ""
 "\n"
 "Please Wait"
 msgstr ""
 "\n"
-"Espere por favor"
+"Agarde"
 
-#: src/interface.c:242
+#: src/interface.c:230
 msgid "Show Details"
 msgstr ""
 
-#: src/interface.c:254 src/dialogs.c:2584
+#: src/interface.c:242 src/dialogs.c:2663
 msgid "_Enough"
 msgstr "_Suficiente"
 
-#: src/interface.c:255 src/framedraw.c:278
+#: src/interface.c:243 src/framedraw.c:276
 msgid "_Preview"
 msgstr "_Vista previa"
 
-#: src/interface.c:257
+#: src/interface.c:245 src/callbacks.c:9282 src/callbacks.c:9330
 msgid "Paus_e"
 msgstr ""
 
-#: src/interface.c:258 src/callbacks.c:9417
+#: src/interface.c:246 src/callbacks.c:9329
 msgid "Pause/_Enough"
 msgstr ""
 
-#: src/interface.c:285
+#: src/interface.c:273
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: src/interface.c:374
+#: src/interface.c:361
 #, c-format
 msgid "LiVES: - %s"
-msgstr ""
+msgstr "LiVES: - %s"
 
-#: src/interface.c:376
+#: src/interface.c:363
 msgid "LiVES: - Multitrack details"
 msgstr ""
 
-#: src/interface.c:407
+#: src/interface.c:394
 msgid "Format"
 msgstr "Formato"
 
-#: src/interface.c:412
+#: src/interface.c:399
 msgid "Frame size"
 msgstr "Tamaño do fotograma"
 
-#: src/interface.c:417
+#: src/interface.c:404
 msgid "File size"
 msgstr "Tamaño do ficheiro"
 
-#: src/interface.c:418
+#: src/interface.c:405
 msgid "Byte size"
 msgstr "Tamaño en bytes"
 
-#: src/interface.c:423 src/interface.c:1891
+#: src/interface.c:410 src/interface.c:1760
 msgid "FPS"
 msgstr "FPS"
 
-#: src/interface.c:428
+#: src/interface.c:415
 msgid "Frames"
 msgstr "Fotogramas"
 
-#: src/interface.c:429
+#: src/interface.c:416
 msgid "Events"
 msgstr "Eventos"
 
-#: src/interface.c:434 src/interface.c:500 src/interface.c:542
+#: src/interface.c:421 src/interface.c:486 src/interface.c:528
 msgid "Total time"
 msgstr "Tempo total"
 
-#: src/interface.c:486 src/resample.c:1488
+#: src/interface.c:472 src/resample.c:1460
 msgid "Audio"
 msgstr "Son"
 
-#: src/interface.c:511 src/interface.c:553
+#: src/interface.c:497 src/interface.c:539
 msgid "Rate/size"
 msgstr "Prezo/tamaño"
 
-#: src/interface.c:530
+#: src/interface.c:516
 msgid "Right audio"
 msgstr ""
 
-#: src/interface.c:622
+#: src/interface.c:607
 msgid "LiVES: - Encoding options"
 msgstr "LiVES: - Opcións de codificación"
 
-#: src/interface.c:636
+#: src/interface.c:621
 msgid "<------------- (Check the box to re_size as suggested)"
 msgstr ""
 
-#: src/interface.c:637
+#: src/interface.c:622
 msgid "<------------- (Check the box to use the _size recommendation)"
 msgstr ""
 
-#: src/interface.c:662
+#: src/interface.c:646
 msgid "Use _letterboxing to maintain aspect ratio (optional)"
 msgstr ""
 
-#: src/interface.c:663
+#: src/interface.c:647
 msgid ""
 "Draw black rectangles either above or to the sides of the image, to prevent "
 "it from stretching."
 msgstr ""
 
-#: src/interface.c:694
+#: src/interface.c:677
 msgid "Keep _my settings"
-msgstr "Manter _miñas opcións"
+msgstr "Manter as _miñas opcións"
 
-#: src/interface.c:695
+#: src/interface.c:678
 msgid "Use _recommended settings"
-msgstr "Usar configuración _recomendadas"
-
-#: src/interface.c:775 src/dialogs.c:114
-msgid ""
-"Do _not show this warning any more\n"
-"(can be turned back on from Preferences/Warnings)"
-msgstr ""
-"_Non mostrar este aviso máis\n"
-"(pode estar conectado de novo en Preferencias/Avisos)"
-
-#: src/interface.c:787
-msgid "Show _Details"
-msgstr "Amosar _Detalles"
+msgstr "Usar os axustes _recomendados"
 
-#: src/interface.c:881
+#: src/interface.c:769
 msgid "_Close Window"
 msgstr "_Pechar a xanela"
 
-#: src/interface.c:883
+#: src/interface.c:771
 msgid "_Save to file"
 msgstr "_Gardar o ficheiro"
 
-#: src/interface.c:928
+#: src/interface.c:816
 msgid "LiVES: - Insert"
 msgstr "LiVES: - Inserir"
 
-#: src/interface.c:945
+#: src/interface.c:833
 msgid "_Number of times to insert"
 msgstr "_Número de veces para introducir"
 
-#: src/interface.c:954
+#: src/interface.c:842
 msgid "_Insert to fit audio"
 msgstr ""
 
-#: src/interface.c:968
+#: src/interface.c:856
 msgid "Insert _before selection"
 msgstr "Inserir _antes da selección"
 
-#: src/interface.c:970
+#: src/interface.c:858
 msgid "Insert clipboard before selected frames"
 msgstr ""
 
-#: src/interface.c:986
+#: src/interface.c:875
 msgid "Insert _after selection"
-msgstr "Inserir _despois a selección"
+msgstr "Inserir a_pós a selección"
 
-#: src/interface.c:988
+#: src/interface.c:877
 msgid "Insert clipboard after selected frames"
 msgstr ""
 
-#: src/interface.c:999
+#: src/interface.c:888
 msgid "Insert _with sound"
 msgstr "Inserir _con son"
 
-#: src/interface.c:1012
+#: src/interface.c:901
 msgid "Insert with_out sound"
 msgstr "Insire _o sen son"
 
-#: src/interface.c:1093
+#: src/interface.c:985
 msgid "LiVES: - Open Selection"
 msgstr "LiVES: - Abrir Selección"
 
-#: src/interface.c:1111
+#: src/interface.c:1004
 msgid "Selection start time (sec)"
 msgstr ""
 
-#: src/interface.c:1117
+#: src/interface.c:1010
 msgid "Number of frames to open"
 msgstr ""
 
-#: src/interface.c:1193
+#: src/interface.c:1088
 msgid "LiVES: - Open Location"
-msgstr "LiVES: - Abrir Local"
+msgstr "LiVES: - Abrir a localización"
 
-#: src/interface.c:1195
+#: src/interface.c:1090
 msgid "LiVES: - Open Youtube Clip"
-msgstr ""
+msgstr "LiVES: - Abrir un fragmento do Youtube"
 
-#: src/interface.c:1213
+#: src/interface.c:1109
 msgid ""
 "\n"
 "\n"
@@ -1290,12 +1378,12 @@
 msgstr ""
 "\n"
 "\n"
-"Para abrir un fluxo, debe ter seguro que ten as bibliotecas correcta feita "
-"no mplayer.\n"
-"Tamén asegúrese de ter definido a súa banda Preferencias | Streaming\n"
+"Para abrir un fluxo, debe ter seguro que ten as bibliotecas correctas "
+"compiladas no mplayer.\n"
+"Asegúrese tamén de ter definido o seu largo de banda en Preferencias|Fluxo\n"
 "\n"
 
-#: src/interface.c:1216
+#: src/interface.c:1112
 msgid ""
 "\n"
 "\n"
@@ -1304,62 +1392,62 @@
 "\n"
 msgstr ""
 
-#: src/interface.c:1220
+#: src/interface.c:1116
 msgid ""
 "Enter the URL of the clip below.\n"
 "E.g: http://www.youtube.com/watch?v=WCR6f6WzjP8\n"
 "\n"
 msgstr ""
 
-#: src/interface.c:1231
+#: src/interface.c:1127
 msgid "URL : "
 msgstr "URL : "
 
-#: src/interface.c:1231
+#: src/interface.c:1127
 msgid "Youtube URL : "
-msgstr ""
+msgstr "URL do Youtube: "
 
-#: src/interface.c:1235
+#: src/interface.c:1131
 msgid "Do not send bandwidth information"
 msgstr "Non enviar información de ancho de banda"
 
-#: src/interface.c:1237
+#: src/interface.c:1133
 msgid "Try this setting if you are having problems getting a stream"
 msgstr "Probe esta configuración se está tendo problemas para obter un fluxo"
 
-#: src/interface.c:1258
+#: src/interface.c:1155
 msgid "Download to _Directory : "
 msgstr ""
 
-#: src/interface.c:1276
+#: src/interface.c:1173
 msgid "Download _File Name : "
 msgstr ""
 
-#: src/interface.c:1281
+#: src/interface.c:1178
 msgid ".webm"
-msgstr ""
+msgstr ".webm"
 
-#: src/interface.c:1359
+#: src/interface.c:1256
 msgid "LiVES: - Rename Clip"
 msgstr "LiVES: - Renomear Clip"
 
-#: src/interface.c:1362
-msgid "LiVES: - Enter Set Name"
+#: src/interface.c:1258
+msgid "LiVES: - Enter Set Name to Save as"
 msgstr ""
 
-#: src/interface.c:1365
+#: src/interface.c:1260
 msgid "LiVES: - Enter a Set Name to Reload"
 msgstr ""
 
-#: src/interface.c:1368
+#: src/interface.c:1262
 msgid "LiVES: - Choose a Working Directory"
 msgstr "LiVES: - Escolla un directorio de traballo"
 
-#: src/interface.c:1371
+#: src/interface.c:1264
 msgid "LiVES: - Rename Current Track"
 msgstr ""
 
-#: src/interface.c:1391
+#: src/interface.c:1283
 msgid ""
 "You need to enter a name for the current clip set.\n"
 "This will allow you reload the layout with the same clips later.\n"
@@ -1371,7 +1459,7 @@
 "Por favor, escriba o nome do xogo que quere usar.\n"
 "LiVES ha lembra-lo para gardar o xogo máis tarde, cando tenta saír.\n"
 
-#: src/interface.c:1397
+#: src/interface.c:1289
 msgid ""
 "In order to export this project, you must enter a name for this clip set.\n"
 "This will also be used for the project name.\n"
@@ -1379,7 +1467,7 @@
 "Para exportar este proxecto, ten que escribir un nome para este clip set.\n"
 "Esta será tamén usado para o nome do proxecto.\n"
 
-#: src/interface.c:1404
+#: src/interface.c:1296
 msgid ""
 "Welcome to LiVES !\n"
 "This startup wizard will guide you through the\n"
@@ -1389,214 +1477,214 @@
 "Este asistente de inicio ha guía a través do\n"
 "instalación inicial para que poda obter o máximo do presente solicitude.\n"
 
-#: src/interface.c:1408
+#: src/interface.c:1300
 msgid ""
 "\n"
 "First of all you need to choose a working directory for LiVES.\n"
 "This should be a directory with plenty of disk space available.\n"
 msgstr ""
 
-#: src/interface.c:1427
+#: src/interface.c:1317
 msgid "New name "
 msgstr "Novo nome "
 
-#: src/interface.c:1430
+#: src/interface.c:1319
 msgid "Set name "
 msgstr "Definir nome "
 
-#: src/interface.c:1550
+#: src/interface.c:1435
 msgid "Use def_aults"
 msgstr ""
 
-#: src/interface.c:1553 src/interface.c:1840 src/preferences.c:2515
-#: src/preferences.c:2697
+#: src/interface.c:1437 src/interface.c:1709 src/preferences.c:2550
+#: src/preferences.c:2739
 msgid "_Advanced"
 msgstr "_Advanzado"
 
-#: src/interface.c:1604
+#: src/interface.c:1487
 msgid "LiVES:- Select input device"
 msgstr ""
 
-#: src/interface.c:1622
+#: src/interface.c:1504
 msgid "Select input device:"
 msgstr ""
 
-#: src/interface.c:1686
+#: src/interface.c:1568
 msgid "LiVES:- Load CD Track"
 msgstr ""
 
-#: src/interface.c:1689
+#: src/interface.c:1570
 msgid "LiVES:- Select DVD Title/Chapter"
 msgstr ""
 
-#: src/interface.c:1692
+#: src/interface.c:1572
 msgid "LiVES:- Select VCD Title"
 msgstr ""
 
-#: src/interface.c:1695
+#: src/interface.c:1574
 msgid "LiVES:- Change Maximum Visible Tracks"
 msgstr ""
 
-#: src/interface.c:1698
+#: src/interface.c:1576
 msgid "LiVES:- Device details"
 msgstr ""
 
-#: src/interface.c:1721
+#: src/interface.c:1598
 #, c-format
 msgid "Track to load (from %s)"
 msgstr "Faixa de carga (de %s)"
 
-#: src/interface.c:1724
+#: src/interface.c:1600
 msgid "DVD Title"
 msgstr "Título DVD"
 
-#: src/interface.c:1727
+#: src/interface.c:1602
 msgid "VCD Title"
 msgstr "Título VCD"
 
-#: src/interface.c:1730
+#: src/interface.c:1604
 msgid "Maximum number of tracks to display"
 msgstr "Número máximo de pistas para amosar"
 
-#: src/interface.c:1733
+#: src/interface.c:1606
 msgid "Device:        /dev/video"
 msgstr ""
 
-#: src/interface.c:1736
+#: src/interface.c:1608
 msgid "Device:        fw:"
 msgstr ""
 
-#: src/interface.c:1771
+#: src/interface.c:1641
 msgid "Chapter  "
 msgstr "Capítulo  "
 
-#: src/interface.c:1776
+#: src/interface.c:1645
 msgid "Channel  "
 msgstr ""
 
-#: src/interface.c:1791
+#: src/interface.c:1660
 msgid "Audio ID  "
 msgstr ""
 
-#: src/interface.c:1857
+#: src/interface.c:1726
 msgid "Input number"
 msgstr ""
 
-#: src/interface.c:1865
+#: src/interface.c:1734
 msgid "Use default width, height and FPS"
 msgstr ""
 
-#: src/interface.c:1879
+#: src/interface.c:1748
 msgid "Width"
 msgstr ""
 
-#: src/interface.c:1885
+#: src/interface.c:1754
 msgid "Height"
 msgstr ""
 
-#: src/interface.c:1899
+#: src/interface.c:1768
 msgid "_Driver"
 msgstr ""
 
-#: src/interface.c:1902
+#: src/interface.c:1771
 msgid "_Output format"
 msgstr ""
 
-#: src/interface.c:1998
+#: src/interface.c:1865
 msgid "LiVES:- Fade Audio In"
 msgstr ""
 
-#: src/interface.c:2001
+#: src/interface.c:1867
 msgid "LiVES:- Fade Audio Out"
 msgstr ""
 
-#: src/interface.c:2017
+#: src/interface.c:1883
 msgid "Fade in over  "
 msgstr ""
 
-#: src/interface.c:2018
+#: src/interface.c:1884
 msgid "first"
 msgstr "primeiro"
 
-#: src/interface.c:2021
+#: src/interface.c:1886
 msgid "Fade out over  "
 msgstr ""
 
-#: src/interface.c:2022
+#: src/interface.c:1887
 msgid "last"
 msgstr "último"
 
-#: src/interface.c:2044
+#: src/interface.c:1909
 msgid "seconds."
 msgstr "segundos."
 
-#: src/interface.c:2052 src/saveplay.c:1507
+#: src/interface.c:1917 src/saveplay.c:1484
 msgid "selection"
 msgstr "selección"
 
-#: src/interface.c:2092
+#: src/interface.c:1956
 msgid "LiVES: - File Comments (optional)"
 msgstr "LiVES: - Comentarios Arquivo (opcional)"
 
-#: src/interface.c:2107
+#: src/interface.c:1971
 msgid "Title/Name : "
 msgstr "Título/Nome : "
 
-#: src/interface.c:2114
+#: src/interface.c:1978
 msgid "Author/Artist : "
 msgstr "Autor/Artista : "
 
-#: src/interface.c:2121
+#: src/interface.c:1985
 msgid "Comments : "
 msgstr "Comentarios : "
 
-#: src/interface.c:2151
+#: src/interface.c:2015
 msgid "_Options"
 msgstr ""
 
-#: src/interface.c:2158
+#: src/interface.c:2022
 msgid "Save _subtitles to file"
 msgstr ""
 
-#: src/interface.c:2170
+#: src/interface.c:2033
 msgid "Subtitle file"
 msgstr ""
 
-#: src/interface.c:2172
+#: src/interface.c:2035
 msgid "Browse..."
 msgstr ""
 
-#: src/interface.c:2255
+#: src/interface.c:2132
 msgid "LiVES: - choose a device"
 msgstr ""
 
-#: src/interface.c:2259
+#: src/interface.c:2135
 msgid "LiVES: - choose a directory"
 msgstr ""
 
-#: src/interface.c:2262
+#: src/interface.c:2137
 msgid "LiVES: - choose a file"
 msgstr ""
 
-#: src/interface.c:2445
+#: src/interface.c:2381
 msgid "LiVES: - Cancel/Discard/Save"
 msgstr "LiVES: - Cancelar/Rexeitar/Gardar"
 
-#: src/interface.c:2460
+#: src/interface.c:2397
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has not been saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:2463
+#: src/interface.c:2400
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has been changed since the last save.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:2467
+#: src/interface.c:2404
 msgid ""
 "You are about to exit LiVES.\n"
 "The current clip set can be saved.\n"
@@ -1606,7 +1694,7 @@
 "O conxunto clip actual pode ser salvado.\n"
 "Que desexa facer ?\n"
 
-#: src/interface.c:2468
+#: src/interface.c:2405
 msgid ""
 "The current clip set has not been saved.\n"
 "What would you like to do ?\n"
@@ -1614,7 +1702,7 @@
 "O conxunto clip actual non foi salvo.\n"
 "Que desexa facer ?\n"
 
-#: src/interface.c:2472
+#: src/interface.c:2408
 msgid ""
 "The current layout has not been saved.\n"
 "What would you like to do ?\n"
@@ -1622,120 +1710,117 @@
 "O esquema actual non foi salvo.\n"
 "Que desexa facer ?\n"
 
-#: src/interface.c:2475
-#, fuzzy
+#: src/interface.c:2410
 msgid ""
 "The current layout has *not* been changed since it was last saved.\n"
 "What would you like to do ?\n"
 msgstr ""
-"O actual trazado non cambiou desde que foi gardado por última vez.\n"
-"Que desexa facer ?\n"
 
-#: src/interface.c:2480
+#: src/interface.c:2415
 msgid ""
 "The current layout contains generated frames and cannot be retained.\n"
 "You may wish to render it before exiting multitrack mode.\n"
 msgstr ""
-"O esquema actual contén cadros xerados e non pode ser sostida.\n"
+"O esquema actual contén fotogramas xerados e non pode ser sostida.\n"
 "Se o desexa, pode facelo antes de saír do modo multi-pista.\n"
 
-#: src/interface.c:2483
+#: src/interface.c:2418
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout contains generated frames and cannot be retained.\n"
 "What do you wish to do ?"
 msgstr ""
 
-#: src/interface.c:2496
+#: src/interface.c:2431
 msgid "Clip set _name"
 msgstr ""
 
-#: src/interface.c:2502
+#: src/interface.c:2437
 msgid "_Auto reload next time"
 msgstr ""
 
-#: src/interface.c:2538 src/interface.c:2547
+#: src/interface.c:2473 src/interface.c:2482
 msgid "_Wipe layout"
 msgstr "_Limpar esquema"
 
-#: src/interface.c:2539
+#: src/interface.c:2474
 msgid "_Ignore changes"
 msgstr "_Ignorar as mudanzas"
 
-#: src/interface.c:2540
+#: src/interface.c:2475
 msgid "_Delete clip set"
 msgstr ""
 
-#: src/interface.c:2541
+#: src/interface.c:2476
 msgid "_Delete layout"
 msgstr "_Borrar esquema"
 
-#: src/interface.c:2545
+#: src/interface.c:2480
 msgid "_Save layout"
 msgstr "_Gardar esquema"
 
-#: src/interface.c:2546
+#: src/interface.c:2481
 msgid "_Save clip set"
 msgstr ""
 
-#: src/interface.c:2565
+#: src/interface.c:2502
 msgid ""
 "\n"
 "LiVES has detected a multitrack layout from a previous session.\n"
 "Would you like to try and recover it ?\n"
 msgstr ""
 
-#: src/interface.c:2589
+#: src/interface.c:2528
 msgid "LiVES: - Disk Recovery Options"
 msgstr ""
 
-#: src/interface.c:2608
+#: src/interface.c:2549
 msgid "Delete _Orphaned Clips"
 msgstr ""
 
-#: src/interface.c:2609
+#: src/interface.c:2550
 msgid "Delete any clips which are not currently loaded or part of a set"
 msgstr ""
 
-#: src/interface.c:2622
+#: src/interface.c:2564
 msgid "Clear _Backup Files from Closed Clips"
 msgstr ""
 
-#: src/interface.c:2633
+#: src/interface.c:2575
 msgid "Remove Sets which have _Layouts but no Clips"
 msgstr ""
 
-#: src/interface.c:2644
+#: src/interface.c:2586
 msgid "_Reset to Defaults"
 msgstr ""
 
-#: src/interface.c:2651
+#: src/interface.c:2593
 msgid "_Accept"
 msgstr ""
 
-#: src/callbacks.c:198
+#: src/callbacks.c:208
 #, c-format
 msgid "Saving as set %s..."
 msgstr ""
 
-#: src/callbacks.c:833
+#: src/callbacks.c:852
 msgid "Please enter the name of the file to save the clip as.\n"
 msgstr ""
 
-#: src/callbacks.c:841
+#: src/callbacks.c:860
 msgid "Please enter a valid URL for the download.\n"
 msgstr ""
 
-#: src/callbacks.c:867
+#: src/callbacks.c:886
 #, c-format
 msgid "Downloading %s to %s..."
 msgstr ""
 
-#: src/callbacks.c:895
+#: src/callbacks.c:912
 msgid "Downloading clip"
 msgstr ""
 
-#: src/callbacks.c:933
+#: src/callbacks.c:950
 msgid ""
 "\n"
 "LiVES was unable to download the clip.\n"
@@ -1743,11 +1828,11 @@
 "the latest youtube-dl installed.\n"
 msgstr ""
 
-#: src/callbacks.c:1114 src/callbacks.c:1149
+#: src/callbacks.c:1131 src/callbacks.c:1166
 msgid "This file"
 msgstr "Este ficheiro"
 
-#: src/callbacks.c:1115
+#: src/callbacks.c:1132
 msgid ""
 ",\n"
 " - including the current layout - "
@@ -1755,7 +1840,7 @@
 ",\n"
 " - Ata o esquema actual - "
 
-#: src/callbacks.c:1117
+#: src/callbacks.c:1134
 #, c-format
 msgid ""
 "\n"
@@ -1765,7 +1850,7 @@
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1119
+#: src/callbacks.c:1136
 #, c-format
 msgid ""
 "\n"
@@ -1775,14 +1860,14 @@
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1150
+#: src/callbacks.c:1167
 msgid ""
 "Changes made to this clip have not been saved or backed up.\n"
 "\n"
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1343
+#: src/callbacks.c:1356
 msgid ""
 "\n"
 "Invalid project file.\n"
@@ -1790,7 +1875,7 @@
 "\n"
 "Arquivo de proxecto non é válido.\n"
 
-#: src/callbacks.c:1356
+#: src/callbacks.c:1370
 #, c-format
 msgid ""
 "\n"
@@ -1803,33 +1888,33 @@
 "Once you have done this, you will be able to import the new project.\n"
 msgstr ""
 
-#: src/callbacks.c:1366
+#: src/callbacks.c:1381
 #, c-format
 msgid "Importing the project %s as set %s..."
 msgstr ""
 
-#: src/callbacks.c:1386
+#: src/callbacks.c:1399
 msgid "Importing project"
 msgstr ""
 
-#: src/callbacks.c:1472
+#: src/callbacks.c:1481
 #, c-format
 msgid "Exporting project %s..."
 msgstr ""
 
-#: src/callbacks.c:1490
+#: src/callbacks.c:1497
 msgid "Exporting project"
 msgstr ""
 
-#: src/callbacks.c:1506
+#: src/callbacks.c:1513
 msgid "Backup as .lv1 file"
 msgstr ""
 
-#: src/callbacks.c:1522
+#: src/callbacks.c:1529
 msgid "Restore .lv1 file"
 msgstr ""
 
-#: src/callbacks.c:1664
+#: src/callbacks.c:1671
 msgid ""
 "\n"
 "\n"
@@ -1837,72 +1922,77 @@
 "Are you sure ?\n"
 msgstr ""
 
-#: src/callbacks.c:1725
+#: src/callbacks.c:1732
 #, c-format
 msgid "Deleting set %s..."
 msgstr ""
 
-#: src/callbacks.c:1727
+#: src/callbacks.c:1734
 msgid "Deleting set..."
 msgstr ""
 
-#: src/callbacks.c:1731
+#: src/callbacks.c:1738
 msgid "Deleting set"
 msgstr ""
 
-#: src/callbacks.c:1739
+#: src/callbacks.c:1746
 #, c-format
 msgid "Set %s was permanently deleted from the disk.\n"
 msgstr ""
 
-#: src/callbacks.c:1787 src/callbacks.c:11764
+#: src/callbacks.c:1792 src/callbacks.c:11676
 msgid "Insert Silence"
 msgstr ""
 
-#: src/callbacks.c:1840 src/callbacks.c:1923 src/callbacks.c:2086
+#: src/callbacks.c:1844 src/callbacks.c:1927 src/callbacks.c:2089
 msgid "Undoing"
 msgstr "Desfacendo"
 
-#: src/callbacks.c:1936 src/callbacks.c:2147
+#: src/callbacks.c:1940 src/callbacks.c:2150
 msgid "Restoring audio..."
 msgstr ""
 
-#: src/callbacks.c:1952
+#: src/callbacks.c:1956
 msgid "Clearing frame images"
 msgstr ""
 
-#: src/callbacks.c:1985
+#: src/callbacks.c:1988
 msgid "Deleting excess frames"
 msgstr ""
 
-#: src/callbacks.c:2229
+#: src/callbacks.c:2232
 #, c-format
 msgid "Length of video is now %d frames at %.3f frames per second.\n"
 msgstr ""
 
-#: src/callbacks.c:2233 src/resample.c:683 src/resample.c:2166
+#: src/callbacks.c:2235 src/resample.c:678 src/resample.c:2133
 #, c-format
 msgid "Clipboard was resampled to %d frames.\n"
 msgstr ""
 
-#: src/callbacks.c:2394 src/callbacks.c:2423
+#: src/callbacks.c:2396 src/callbacks.c:2425
 msgid "Redoing"
 msgstr ""
 
-#: src/callbacks.c:2462
+#: src/callbacks.c:2472
 #, c-format
-msgid "Copying frames %d to %d%s to the clipboard..."
+msgid "Copying frames %d to %d (with sound) to the clipboard..."
 msgstr ""
 
-#: src/callbacks.c:2525
+#: src/callbacks.c:2474
+#, c-format
+msgid "Copying frames %d to %d to the clipboard..."
+msgstr ""
+
+#: src/callbacks.c:2526
 msgid "Copying to the clipboard"
 msgstr ""
 
-#: src/callbacks.c:2600
+#: src/callbacks.c:2601
 msgid "Cut"
 msgstr "Cortar"
 
-#: src/callbacks.c:2641 src/callbacks.c:3068 src/callbacks.c:8026
+#: src/callbacks.c:2641 src/callbacks.c:3063 src/callbacks.c:7631
 msgid "Pulling frames from clipboard"
 msgstr ""
 
@@ -1911,22 +2001,22 @@
 msgid "Pasting %d frames to new clip %s..."
 msgstr ""
 
-#: src/callbacks.c:2678
+#: src/callbacks.c:2676
 msgid "Pasting"
 msgstr ""
 
-#: src/callbacks.c:2694
+#: src/callbacks.c:2692
 msgid "...added audio..."
 msgstr ""
 
-#: src/callbacks.c:2778
+#: src/callbacks.c:2775
 msgid ""
 "This operation requires resizing or converting of frames.\n"
 "Please install 'convert' from the Image-magick package, and then restart "
 "LiVES.\n"
 msgstr ""
 
-#: src/callbacks.c:2795
+#: src/callbacks.c:2793
 msgid ""
 "\n"
 "\n"
@@ -1935,31 +2025,31 @@
 "the 'Trim Audio' function from the Audio menu."
 msgstr ""
 
-#: src/callbacks.c:2819
+#: src/callbacks.c:2817
 msgid ""
 "LiVES cannot insert because the audio rates do not match.\n"
 "Please install 'sox', and try again."
 msgstr ""
 
-#: src/callbacks.c:2838
+#: src/callbacks.c:2835
 msgid ""
 "\n"
 "Insertion will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:2888 src/callbacks.c:11692
+#: src/callbacks.c:2883 src/callbacks.c:11606
 msgid ""
 "\n"
 "Insertion will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:2996 src/callbacks.c:3025
+#: src/callbacks.c:2987 src/callbacks.c:3016
 msgid "Resampling clipboard audio"
 msgstr ""
 
-#: src/callbacks.c:3041
+#: src/callbacks.c:3032
 msgid ""
 "\n"
 "\n"
@@ -1967,7 +2057,7 @@
 "Clipboard audio has been erased.\n"
 msgstr ""
 
-#: src/callbacks.c:3055
+#: src/callbacks.c:3045
 msgid ""
 "\n"
 "\n"
@@ -1976,79 +2066,79 @@
 "using unchanged audio ?\n"
 msgstr ""
 
-#: src/callbacks.c:3137 src/callbacks.c:3311
+#: src/callbacks.c:3132 src/callbacks.c:3299
 #, c-format
 msgid "Inserting %d%s frames from the clipboard..."
 msgstr ""
 
-#: src/callbacks.c:3162 src/callbacks.c:3236 src/callbacks.c:3339
+#: src/callbacks.c:3155 src/callbacks.c:3224 src/callbacks.c:3325
 msgid "Inserting"
 msgstr "A inserir"
 
-#: src/callbacks.c:3193
+#: src/callbacks.c:3187
 #, c-format
 msgid "Inserting %d times from the clipboard%s..."
 msgstr ""
 
-#: src/callbacks.c:3200
+#: src/callbacks.c:3191
 #, c-format
 msgid "Inserting %d frames from the clipboard%s..."
 msgstr ""
 
-#: src/callbacks.c:3418
+#: src/callbacks.c:3404
 msgid "Insert"
 msgstr "Inserir"
 
-#: src/callbacks.c:3486
+#: src/callbacks.c:3471
 msgid ""
 "\n"
 "Deleting all frames will close this file.\n"
 "Are you sure ?"
 msgstr ""
 
-#: src/callbacks.c:3495
+#: src/callbacks.c:3480
 msgid ""
 "\n"
 "Deletion will cause missing frames in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3515 src/callbacks.c:10920 src/callbacks.c:11162
-#: src/callbacks.c:11228
+#: src/callbacks.c:3500 src/callbacks.c:10851 src/callbacks.c:11087
+#: src/callbacks.c:11152
 msgid ""
 "\n"
 "Deletion will cause missing audio in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3534
+#: src/callbacks.c:3519
 msgid ""
 "\n"
 "Deletion will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3553 src/callbacks.c:11210
+#: src/callbacks.c:3538 src/callbacks.c:11134
 msgid ""
 "\n"
 "Deletion will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3611
+#: src/callbacks.c:3597
 #, c-format
 msgid "Deleting frames %d to %d%s..."
 msgstr ""
 
-#: src/callbacks.c:3636
+#: src/callbacks.c:3619
 msgid "Deleting"
 msgstr "A borrar"
 
-#: src/callbacks.c:3717
+#: src/callbacks.c:3699
 msgid "Delete"
 msgstr "Borrar"
 
-#: src/callbacks.c:3738
+#: src/callbacks.c:3717
 msgid ""
 "\n"
 "\n"
@@ -2058,7 +2148,7 @@
 "\n"
 "Selección está bloqueado.\n"
 
-#: src/callbacks.c:4092
+#: src/callbacks.c:4056
 msgid ""
 "Ready to record. Use 'control' and cursor keys during playback to record "
 "your performance.\n"
@@ -2066,11 +2156,11 @@
 "play.)\n"
 msgstr ""
 
-#: src/callbacks.c:4098
+#: src/callbacks.c:4061
 msgid "Record cancelled.\n"
 msgstr ""
 
-#: src/callbacks.c:4237
+#: src/callbacks.c:4197
 #, c-format
 msgid ""
 "\n"
@@ -2079,7 +2169,7 @@
 "%s\n"
 msgstr ""
 
-#: src/callbacks.c:4241
+#: src/callbacks.c:4200
 #, c-format
 msgid ""
 "\n"
@@ -2088,7 +2178,7 @@
 "The plugin may be broken or not installed correctly."
 msgstr ""
 
-#: src/callbacks.c:4571
+#: src/callbacks.c:4532
 #, c-format
 msgid ""
 "Saving the set will cause copies of all loaded clips to remain on the disk"
@@ -2097,22 +2187,22 @@
 "Please press 'Cancel' if that is not what you want.\n"
 msgstr ""
 
-#: src/callbacks.c:4654
+#: src/callbacks.c:4617
 #, c-format
 msgid "Saving set %s"
 msgstr ""
 
-#: src/callbacks.c:5005
+#: src/callbacks.c:4964
 #, c-format
 msgid "Loading clips from set %s"
 msgstr ""
 
-#: src/callbacks.c:5093
+#: src/callbacks.c:5051
 #, c-format
 msgid "%d clips and %d layouts were recovered from set (%s).\n"
 msgstr ""
 
-#: src/callbacks.c:5312
+#: src/callbacks.c:5259
 msgid ""
 "LiVES will attempt to recover some disk space.\n"
 "You should ONLY run this if you have no other copies of LiVES running on "
@@ -2120,24 +2210,24 @@
 "Click OK to proceed.\n"
 msgstr ""
 
-#: src/callbacks.c:5317
+#: src/callbacks.c:5264
 msgid "Cleaning up disk space..."
 msgstr ""
 
-#: src/callbacks.c:5387
+#: src/callbacks.c:5334
 msgid "Recovering disk space"
 msgstr ""
 
-#: src/callbacks.c:5439
+#: src/callbacks.c:5386
 #, c-format
 msgid "%s of disk space was recovered.\n"
 msgstr ""
 
-#: src/callbacks.c:5482
+#: src/callbacks.c:5428
 msgid "Resetting frame rates and frame values..."
 msgstr ""
 
-#: src/callbacks.c:5523
+#: src/callbacks.c:5469
 #, c-format
 msgid ""
 "\n"
@@ -2145,12 +2235,12 @@
 "Internal: %s (%d bpp) / %s\n"
 msgstr ""
 
-#: src/callbacks.c:5525
+#: src/callbacks.c:5471
 msgid "buffered"
 msgstr ""
 
-#: src/callbacks.c:5538 src/callbacks.c:5557 src/callbacks.c:5575
-#: src/callbacks.c:5609
+#: src/callbacks.c:5484 src/callbacks.c:5502 src/callbacks.c:5518
+#: src/callbacks.c:5551
 msgid ""
 "\n"
 "  Opening..."
@@ -2158,28 +2248,28 @@
 "\n"
 "  Apertura..."
 
-#: src/callbacks.c:5545
+#: src/callbacks.c:5490
 #, c-format
 msgid ""
 "\n"
 "(%d virtual)"
 msgstr ""
 
-#: src/callbacks.c:5548
+#: src/callbacks.c:5493
 #, c-format
 msgid ""
 "\n"
 "(%d decoded)"
 msgstr ""
 
-#: src/callbacks.c:5560 src/callbacks.c:5578 src/callbacks.c:5612
+#: src/callbacks.c:5504 src/callbacks.c:5520 src/callbacks.c:5553
 #, c-format
 msgid ""
 "\n"
 "  %.2f sec."
 msgstr ""
 
-#: src/callbacks.c:5569
+#: src/callbacks.c:5512
 msgid ""
 "\n"
 "  Unknown"
@@ -2187,23 +2277,23 @@
 "\n"
 "  Descoñecido"
 
-#: src/callbacks.c:5582 src/callbacks.c:5596
+#: src/callbacks.c:5524 src/callbacks.c:5538
 msgid "unsigned"
 msgstr ""
 
-#: src/callbacks.c:5583 src/callbacks.c:5597
+#: src/callbacks.c:5525 src/callbacks.c:5539
 msgid "signed"
 msgstr ""
 
-#: src/callbacks.c:5585 src/callbacks.c:5599
+#: src/callbacks.c:5527 src/callbacks.c:5541
 msgid "big-endian"
 msgstr ""
 
-#: src/callbacks.c:5586 src/callbacks.c:5600
+#: src/callbacks.c:5528 src/callbacks.c:5542
 msgid "little-endian"
 msgstr ""
 
-#: src/callbacks.c:5588 src/callbacks.c:5602
+#: src/callbacks.c:5530 src/callbacks.c:5544
 #, c-format
 msgid ""
 "  %d Hz %d bit\n"
@@ -2212,7 +2302,7 @@
 "  %d Hz %d bit\n"
 "%s %s"
 
-#: src/callbacks.c:5707
+#: src/callbacks.c:5647
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -2229,23 +2319,24 @@
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA.\n"
 msgstr ""
 
-#: src/callbacks.c:5721
+#: src/callbacks.c:5661
 msgid "A video editor and VJ program."
 msgstr "Un editor de vídeo e un programa de VJ."
 
-#: src/callbacks.c:5722
+#: src/callbacks.c:5662
 msgid "About LiVES"
 msgstr ""
 
-#: src/callbacks.c:5724
+#: src/callbacks.c:5664
 msgid "translator_credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Guybrush88 https://launchpad.net/~guybrush\n"
+"  Miguel Anxo Bouzada https://launchpad.net/~mbouzada\n"
 "  nitrofurano https://launchpad.net/~nitrofurano-3t\n"
 "  salsaman https://launchpad.net/~salsaman"
 
-#: src/callbacks.c:5758
+#: src/callbacks.c:5699
 #, c-format
 msgid ""
 "LiVES Version %s\n"
@@ -2259,7 +2350,7 @@
 "Homepage: http://lives.sourceforge.net"
 msgstr ""
 
-#: src/callbacks.c:6037
+#: src/callbacks.c:5996
 #, fuzzy
 msgid ""
 "\n"
@@ -2270,7 +2361,7 @@
 "\n"
 "Ten que instalar o mplayer para ver o ficheiro.\n"
 
-#: src/callbacks.c:6040
+#: src/callbacks.c:5998
 #, fuzzy
 msgid ""
 "\n"
@@ -2282,249 +2373,236 @@
 "\n"
 "Ten que instalar o mplayer para ver o ficheiro.\n"
 
-#: src/callbacks.c:6423 src/callbacks.c:8289
-msgid ""
-"\n"
-"Loading new audio may cause missing audio in some multitrack layouts.\n"
-"Are you sure you wish to continue ?\n"
-"."
-msgstr ""
-
-#: src/callbacks.c:6523
-#, c-format
-msgid "Opening audio %s, type %s..."
-msgstr ""
-
-#: src/callbacks.c:6556 src/saveplay.c:480
-msgid "Opening audio"
-msgstr ""
-
-#: src/callbacks.c:6565 src/callbacks.c:6612 src/callbacks.c:8387
-#: src/callbacks.c:8429 src/callbacks.c:8472 src/callbacks.c:10846
-msgid "Cancelling"
-msgstr "Cancelando"
-
-#: src/callbacks.c:6660 src/callbacks.c:8514 src/callbacks.c:10876
-#: src/callbacks.c:11563
-msgid "Committing audio"
-msgstr ""
-
-#: src/callbacks.c:6672 src/callbacks.c:8546
-msgid "New Audio"
-msgstr "Nova Audio"
-
-#: src/callbacks.c:6779
+#: src/callbacks.c:6459
 #, c-format
 msgid ""
 "Text was saved as\n"
 "%s\n"
 msgstr ""
 
-#: src/callbacks.c:6951 src/saveplay.c:3618
-#, c-format
-msgid "%d frames are enough !\n"
-msgstr "%d  cadros son abondo !\n"
-
-#: src/callbacks.c:7050
+#: src/callbacks.c:6706
 msgid "LiVES: - Encoder debug output"
 msgstr ""
 
-#: src/callbacks.c:7087 src/gui.c:1922
+#: src/callbacks.c:6743 src/gui.c:1921
 msgid "Fullscreen playback (f)"
 msgstr ""
 
-#: src/callbacks.c:7089
+#: src/callbacks.c:6744
 msgid "Fullscreen playback off (f)"
 msgstr ""
 
-#: src/callbacks.c:7188 src/callbacks.c:7336 src/callbacks.c:7664
-#: src/callbacks.c:7681 src/gui.c:3712 src/saveplay.c:2467 src/saveplay.c:2501
-#: src/saveplay.c:3115 src/saveplay.c:3220 src/saveplay.c:3239
-#: src/multitrack.c:9340 src/multitrack.c:11060
+#: src/callbacks.c:6841 src/callbacks.c:6983 src/callbacks.c:7283
+#: src/callbacks.c:7298 src/gui.c:3838 src/saveplay.c:2442 src/saveplay.c:2475
+#: src/saveplay.c:3074 src/saveplay.c:3178 src/saveplay.c:3197
+#: src/multitrack.c:9526 src/multitrack.c:11288
 #, c-format
 msgid " (%d %% scale)"
 msgstr ""
 
-#: src/callbacks.c:7190 src/callbacks.c:7338 src/callbacks.c:7666
-#: src/gui.c:3716 src/saveplay.c:2469 src/saveplay.c:2503
+#: src/callbacks.c:6843 src/callbacks.c:6985 src/callbacks.c:7285
+#: src/gui.c:3842 src/saveplay.c:2444 src/saveplay.c:2477
 #, c-format
 msgid "LiVES: - Play Window%s"
 msgstr ""
 
-#: src/callbacks.c:7302 src/gui.c:1907
+#: src/callbacks.c:6950 src/gui.c:1906
 msgid "Double size (d)"
 msgstr ""
 
-#: src/callbacks.c:7309
+#: src/callbacks.c:6956
 msgid "Single size (d)"
 msgstr ""
 
-#: src/callbacks.c:7442 src/callbacks.c:7443
+#: src/callbacks.c:7087 src/callbacks.c:7088
 msgid "Hide the play window (s)"
 msgstr ""
 
-#: src/callbacks.c:7452 src/gui.c:1746
+#: src/callbacks.c:7096 src/gui.c:1744
 msgid "Show the play window (s)"
 msgstr "Mostrar a ventana de xogo (s)"
 
-#: src/callbacks.c:7453 src/gui.c:1896
+#: src/callbacks.c:7097 src/gui.c:1895
 msgid "Play in separate window (s)"
 msgstr "Xogar en xanela separada (s)"
 
-#: src/callbacks.c:7535 src/gui.c:4060 src/saveplay.c:2498
+#: src/callbacks.c:7175 src/gui.c:4169 src/saveplay.c:2472
 msgid "LiVES: - Streaming"
 msgstr ""
 
-#: src/callbacks.c:7778
+#: src/callbacks.c:7388
 msgid "Switch continuous looping off (o)"
 msgstr ""
 
-#: src/callbacks.c:7785 src/gui.c:1795
+#: src/callbacks.c:7394 src/gui.c:1793
 msgid "Switch continuous looping on (o)"
 msgstr ""
 
-#: src/callbacks.c:7837
+#: src/callbacks.c:7444
 #, c-format
 msgid "Audio volume (%.2f)"
 msgstr ""
 
-#: src/callbacks.c:7876 src/callbacks.c:7877 src/gui.c:3640
+#: src/callbacks.c:7483 src/callbacks.c:7484 src/gui.c:3766
 msgid "Unmute the audio (z)"
 msgstr "Reactivar o audio (z)"
 
-#: src/callbacks.c:7888 src/callbacks.c:7889 src/gui.c:1808 src/gui.c:3639
+#: src/callbacks.c:7494 src/callbacks.c:7495 src/gui.c:1806 src/gui.c:3765
 msgid "Mute the audio (z)"
 msgstr ""
 
-#: src/callbacks.c:8038
+#: src/callbacks.c:7643
 msgid "Reversing clipboard..."
 msgstr ""
 
-#: src/callbacks.c:8052
+#: src/callbacks.c:7657
 msgid "Reversing clipboard"
 msgstr ""
 
-#: src/callbacks.c:8084
+#: src/callbacks.c:7689
 msgid "LiVES: Load subtitles from..."
 msgstr ""
 
-#: src/callbacks.c:8151 src/saveplay.c:970
+#: src/callbacks.c:7753 src/saveplay.c:956
 #, c-format
 msgid "Loaded subtitle file: %s\n"
 msgstr ""
 
-#: src/callbacks.c:8220
+#: src/callbacks.c:7821
 msgid "Subtitles were erased.\n"
 msgstr ""
 
-#: src/callbacks.c:8239
+#: src/callbacks.c:7843
 msgid "LiVES: - Select Audio File"
 msgstr ""
 
-#: src/callbacks.c:8250
+#: src/callbacks.c:7878 src/callbacks.c:8232
+msgid ""
+"\n"
+"Loading new audio may cause missing audio in some multitrack layouts.\n"
+"Are you sure you wish to continue ?\n"
+"."
+msgstr ""
+
+#: src/callbacks.c:7989
+#, c-format
+msgid "Opening audio %s, type %s..."
+msgstr ""
+
+#: src/callbacks.c:8023 src/saveplay.c:477
+msgid "Opening audio"
+msgstr ""
+
+#: src/callbacks.c:8032 src/callbacks.c:8083 src/callbacks.c:8327
+#: src/callbacks.c:8369 src/callbacks.c:8412 src/callbacks.c:10766
+msgid "Cancelling"
+msgstr "Cancelando"
+
+#: src/callbacks.c:8137 src/callbacks.c:8454 src/callbacks.c:10803
+#: src/callbacks.c:11477
+msgid "Committing audio"
+msgstr ""
+
+#: src/callbacks.c:8153 src/callbacks.c:8484
+msgid "New Audio"
+msgstr "Nova Audio"
+
+#: src/callbacks.c:8194
 msgid "Please set your CD play device in Tools | Preferences | Misc\n"
 msgstr ""
 
-#: src/callbacks.c:8321
+#: src/callbacks.c:8264
 #, c-format
 msgid "Opening CD track %d from %s..."
 msgstr ""
 
-#: src/callbacks.c:8326
+#: src/callbacks.c:8267
 #, c-format
 msgid "CD track %d"
 msgstr ""
 
-#: src/callbacks.c:8373
+#: src/callbacks.c:8313
 msgid "Opening CD track..."
 msgstr ""
 
-#: src/callbacks.c:8415 src/callbacks.c:8461
+#: src/callbacks.c:8355 src/callbacks.c:8401
 msgid "Error loading CD track\n"
 msgstr ""
 
-#: src/callbacks.c:8584
+#: src/callbacks.c:8518
 msgid "layout errors"
 msgstr ""
 
-#: src/callbacks.c:8595
+#: src/callbacks.c:8529
 msgid "Close _Window"
 msgstr "Pechar _Fiestra"
 
-#: src/callbacks.c:8606
+#: src/callbacks.c:8540
 msgid "Clear _Errors"
 msgstr "Borrar _Erros"
 
-#: src/callbacks.c:8617
+#: src/callbacks.c:8551
 msgid "_Delete affected layouts"
 msgstr "_Eliminar esquemas afectado"
 
-#: src/callbacks.c:9343 src/callbacks.c:9388
+#: src/callbacks.c:9253 src/callbacks.c:9298
 msgid "Resume"
 msgstr "Continuar"
 
-#: src/callbacks.c:9344
+#: src/callbacks.c:9254
 msgid ""
 "\n"
 "Paused\n"
 "(click Resume to continue processing)"
 msgstr ""
 
-#: src/callbacks.c:9345 src/callbacks.c:9406
+#: src/callbacks.c:9255 src/callbacks.c:9315
 msgid "paused..."
 msgstr "pausa..."
 
-#: src/callbacks.c:9372 src/callbacks.c:9418
-msgid "Pause"
-msgstr "Pausa"
-
-#: src/callbacks.c:9374 src/callbacks.c:9421
+#: src/callbacks.c:9284 src/callbacks.c:9333
 msgid "resumed..."
 msgstr "retomar..."
 
-#: src/callbacks.c:9393
+#: src/callbacks.c:9303
 msgid "Keep"
 msgstr "Manter"
 
-#: src/callbacks.c:9396
+#: src/callbacks.c:9305
 msgid "Enough"
 msgstr ""
 
-#: src/callbacks.c:9401
-#, fuzzy, c-format
+#: src/callbacks.c:9310
+#, c-format
 msgid ""
 "\n"
 "Paused\n"
 "(click %s to keep what you have and stop)\n"
 "(click Resume to continue processing)"
 msgstr ""
-"\n"
-"Parado\n"
-"(prema En conserva para manter o que tes e deter)\n"
-"(preme Continuar para continuar procesamento)"
 
-#: src/callbacks.c:9419
+#: src/callbacks.c:9331
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/callbacks.c:9558
+#: src/callbacks.c:9478
 msgid "Stop"
 msgstr ""
 
-#: src/callbacks.c:10053 src/multitrack.c:13247
+#: src/callbacks.c:9968 src/multitrack.c:13489
 msgid "LiVES: Selected frame"
 msgstr ""
 
-#: src/callbacks.c:10061
+#: src/callbacks.c:9976
 msgid "_Save frame as..."
 msgstr ""
 
-#: src/callbacks.c:10290
+#: src/callbacks.c:10202
 #, c-format
 msgid "Audio is ahead of video by %.4f secs. at frame %d, with fps %.4f\n"
 msgstr ""
 
-#: src/callbacks.c:10347
+#: src/callbacks.c:10255
 msgid ""
 "\n"
 "\n"
@@ -2533,7 +2611,7 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10353
+#: src/callbacks.c:10261
 msgid ""
 "\n"
 "\n"
@@ -2541,13 +2619,13 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10429 src/callbacks.c:11479
+#: src/callbacks.c:10334 src/callbacks.c:11395
 msgid ""
 "\n"
 "Record time must be greater than 0.\n"
 msgstr ""
 
-#: src/callbacks.c:10440
+#: src/callbacks.c:10346
 msgid ""
 "Capture an External Window:\n"
 "\n"
@@ -2556,17 +2634,17 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10445
+#: src/callbacks.c:10351
 msgid "External window was released.\n"
 msgstr "Xanela externa foi liberado.\n"
 
-#: src/callbacks.c:10479
+#: src/callbacks.c:10385
 msgid ""
 "Click on a Window to Capture it\n"
 "Press 'q' to stop recording"
 msgstr ""
 
-#: src/callbacks.c:10513
+#: src/callbacks.c:10419
 #, c-format
 msgid ""
 "\n"
@@ -2576,19 +2654,19 @@
 "(Default of %.3f frames per second will be used.)\n"
 msgstr ""
 
-#: src/callbacks.c:10539
+#: src/callbacks.c:10443
 msgid "LiVES was unable to capture this window. Sorry.\n"
 msgstr ""
 
-#: src/callbacks.c:10695
+#: src/callbacks.c:10601
 msgid "Export Selected Audio as..."
 msgstr ""
 
-#: src/callbacks.c:10699
+#: src/callbacks.c:10604
 msgid "Export Audio as..."
 msgstr ""
 
-#: src/callbacks.c:10714
+#: src/callbacks.c:10619
 msgid ""
 "\n"
 "\n"
@@ -2597,1033 +2675,1033 @@
 "rate.\n"
 msgstr ""
 
-#: src/callbacks.c:10720
+#: src/callbacks.c:10625
 #, c-format
 msgid "Exporting audio frames %d to %d as %s..."
 msgstr ""
 
-#: src/callbacks.c:10725
+#: src/callbacks.c:10629
 #, c-format
 msgid "Exporting audio as %s..."
 msgstr ""
 
-#: src/callbacks.c:10751
+#: src/callbacks.c:10655
 msgid "Exporting audio"
 msgstr ""
 
-#: src/callbacks.c:10782
+#: src/callbacks.c:10695
 msgid "LiVES: - Append Audio File"
 msgstr ""
 
-#: src/callbacks.c:10825
+#: src/callbacks.c:10739
 #, c-format
 msgid "Appending audio file %s..."
 msgstr ""
 
-#: src/callbacks.c:10836
+#: src/callbacks.c:10756
 msgid "Appending audio"
 msgstr ""
 
-#: src/callbacks.c:10892
+#: src/callbacks.c:10818
 msgid "Append Audio"
 msgstr ""
 
-#: src/callbacks.c:10952
+#: src/callbacks.c:10883
 #, c-format
 msgid "Padding audio to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10954
+#: src/callbacks.c:10885
 #, c-format
 msgid "Trimming audio from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10973
+#: src/callbacks.c:10904
 msgid "Trimming/Padding audio"
 msgstr ""
 
-#: src/callbacks.c:10981
+#: src/callbacks.c:10912
 msgid "Trim/Pad Audio"
 msgstr ""
 
-#: src/callbacks.c:11055
+#: src/callbacks.c:10982
 msgid "Fading audio in"
 msgstr ""
 
-#: src/callbacks.c:11056
+#: src/callbacks.c:10983
 msgid "Fade audio in"
 msgstr ""
 
-#: src/callbacks.c:11061
+#: src/callbacks.c:10987
 msgid "Fading audio out"
 msgstr ""
 
-#: src/callbacks.c:11062
+#: src/callbacks.c:10988
 msgid "Fade audio out"
 msgstr ""
 
-#: src/callbacks.c:11085
+#: src/callbacks.c:11011
 #, c-format
 msgid "%s over %.1f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11087
+#: src/callbacks.c:11013
 #, c-format
 msgid "%s from time %.2f seconds to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11094
+#: src/callbacks.c:11020
 msgid "Fading audio..."
 msgstr ""
 
-#: src/callbacks.c:11194
+#: src/callbacks.c:11119
 msgid ""
 "\n"
 "Deleting all audio will close this file.\n"
 "Are you sure ?"
 msgstr ""
 
-#: src/callbacks.c:11197
+#: src/callbacks.c:11122
 msgid "Deleting all audio..."
 msgstr ""
 
-#: src/callbacks.c:11203
+#: src/callbacks.c:11127
 #, c-format
 msgid "Deleting audio from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11290
+#: src/callbacks.c:11214
 msgid "Deleting Audio"
 msgstr ""
 
-#: src/callbacks.c:11297
+#: src/callbacks.c:11221
 msgid "Delete Audio"
 msgstr ""
 
-#: src/callbacks.c:11636
+#: src/callbacks.c:11550
 msgid "Record new audio"
 msgstr ""
 
-#: src/callbacks.c:11725
+#: src/callbacks.c:11640
 #, c-format
 msgid "Inserting silence from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11754
+#: src/callbacks.c:11666
 msgid "Inserting Silence"
 msgstr ""
 
-#: src/merge.c:85
+#: src/merge.c:96
 msgid "LiVES: - Merge"
-msgstr ""
+msgstr "LiVES: - Combinar"
 
-#: src/merge.c:102
+#: src/merge.c:113
 #, c-format
 msgid "Merge Clipboard [ %d Frames ]       With Selection [ %d Frames ]"
 msgstr ""
 
-#: src/merge.c:107
+#: src/merge.c:118
 #, c-format
 msgid ""
 "Merge Clipboard [ %d Frames (resampled) ]       With Selection [ %d Frames ]"
 msgstr ""
 
-#: src/merge.c:118
+#: src/merge.c:130
 msgid "Align _Starts"
 msgstr ""
 
-#: src/merge.c:123
+#: src/merge.c:135
 msgid "Align _Ends"
 msgstr ""
 
-#: src/merge.c:134
+#: src/merge.c:146
 msgid "What to do with extra clipboard frames -"
 msgstr ""
 
-#: src/merge.c:137
+#: src/merge.c:149
 msgid "_Insert Frames"
 msgstr ""
 
-#: src/merge.c:143
+#: src/merge.c:155
 msgid "_Drop Frames"
 msgstr ""
 
-#: src/merge.c:149
+#: src/merge.c:160
 msgid "Number of Times to Loop Clipboard"
 msgstr ""
 
-#: src/merge.c:160
+#: src/merge.c:171
 msgid "_Loop Clipboard to Fit Selection"
 msgstr ""
 
-#: src/merge.c:173
+#: src/merge.c:184
 msgid "_Transition Method:"
 msgstr ""
 
-#: src/merge.c:394
+#: src/merge.c:395
 msgid "Merging clipboard with selection..."
 msgstr ""
 
-#: src/merge.c:551
+#: src/merge.c:539
 msgid "Merge done.\n"
-msgstr ""
+msgstr "feita a combinación.\n"
 
-#: src/gui.c:123
+#: src/gui.c:122
 msgid "_Custom Generators"
 msgstr ""
 
-#: src/gui.c:124
+#: src/gui.c:123
 msgid "_Custom Effects"
 msgstr ""
 
-#: src/gui.c:125
+#: src/gui.c:124
 msgid "Custom _Utilities"
 msgstr ""
 
-#: src/gui.c:352 src/multitrack.c:5964
+#: src/gui.c:351 src/multitrack.c:6143
 msgid "_File"
 msgstr "_Ficheiro"
 
-#: src/gui.c:367 src/multitrack.c:5989
+#: src/gui.c:366 src/multitrack.c:6168
 msgid "_Open File/Directory"
 msgstr ""
 
-#: src/gui.c:373
+#: src/gui.c:372
 msgid "O_pen Part of File..."
 msgstr ""
 
-#: src/gui.c:379 src/gui.c:383 src/multitrack.c:6006 src/multitrack.c:6023
-#: src/multitrack.c:6028
+#: src/gui.c:378 src/gui.c:382 src/multitrack.c:6185 src/multitrack.c:6202
+#: src/multitrack.c:6207
 msgid "Open _Location/Stream..."
 msgstr ""
 
-#: src/gui.c:393 src/multitrack.c:6016
+#: src/gui.c:392 src/multitrack.c:6195
 msgid "Open _Youtube Clip..."
 msgstr ""
 
-#: src/gui.c:404
+#: src/gui.c:403
 msgid "Import from _dvd/vcd..."
 msgstr ""
 
-#: src/gui.c:413
+#: src/gui.c:412
 msgid "Import from _dvd"
 msgstr ""
 
-#: src/gui.c:416
+#: src/gui.c:415
 msgid "Import from _vcd"
 msgstr ""
 
-#: src/gui.c:419
+#: src/gui.c:418
 msgid "_Import from Firewire"
 msgstr ""
 
-#: src/gui.c:428 src/multitrack.c:6086
+#: src/gui.c:427 src/multitrack.c:6265
 msgid "Import from _Firewire Device (dv)"
 msgstr ""
 
-#: src/gui.c:429 src/multitrack.c:6094
+#: src/gui.c:428 src/multitrack.c:6273
 msgid "Import from _Firewire Device (hdv)"
 msgstr ""
 
-#: src/gui.c:457
+#: src/gui.c:456
 msgid "_Add Webcam/TV card..."
 msgstr ""
 
-#: src/gui.c:476
+#: src/gui.c:475
 msgid "Add _Unicap Device"
 msgstr ""
 
-#: src/gui.c:486
+#: src/gui.c:485
 msgid "Add Live _Firewire Device"
 msgstr ""
 
-#: src/gui.c:495
+#: src/gui.c:494
 msgid "Add _TV Device"
 msgstr ""
 
-#: src/gui.c:510 src/multitrack.c:6117
+#: src/gui.c:509 src/multitrack.c:6296
 msgid "_Recent Files..."
 msgstr ""
 
-#: src/gui.c:560 src/multitrack.c:6177
+#: src/gui.c:559 src/multitrack.c:6356
 msgid "_Reload Clip Set..."
 msgstr ""
 
-#: src/gui.c:564 src/multitrack.c:6185
+#: src/gui.c:563 src/multitrack.c:6364
 msgid "Close/Sa_ve All Clips"
 msgstr ""
 
-#: src/gui.c:575
+#: src/gui.c:574
 msgid "_Encode Clip As..."
 msgstr ""
 
-#: src/gui.c:577
+#: src/gui.c:576
 msgid "Encode _Selection As..."
 msgstr ""
 
-#: src/gui.c:584
+#: src/gui.c:583
 msgid "_Close This Clip"
 msgstr ""
 
-#: src/gui.c:595
+#: src/gui.c:594
 msgid "_Backup Clip as .lv1..."
 msgstr ""
 
-#: src/gui.c:604
+#: src/gui.c:603
 msgid "_Restore Clip from .lv1..."
 msgstr ""
 
-#: src/gui.c:615
+#: src/gui.c:614
 msgid "Encode/Load/Backup _with Sound"
 msgstr ""
 
-#: src/gui.c:620
+#: src/gui.c:619
 msgid "Auto load subtitles"
 msgstr ""
 
-#: src/gui.c:628 src/multitrack.c:6224
+#: src/gui.c:627 src/multitrack.c:6403
 msgid "Clean _up Diskspace"
 msgstr ""
 
-#: src/gui.c:636 src/multitrack.c:6257
+#: src/gui.c:635 src/multitrack.c:6436
 msgid "_Edit"
 msgstr "_Editar"
 
-#: src/gui.c:685
+#: src/gui.c:684
 msgid "_MULTITRACK mode"
 msgstr ""
 
-#: src/gui.c:696
+#: src/gui.c:695
 msgid "_Copy Selection"
 msgstr ""
 
-#: src/gui.c:705
+#: src/gui.c:704
 msgid "Cu_t Selection"
 msgstr ""
 
-#: src/gui.c:714
+#: src/gui.c:713
 msgid "_Insert from Clipboard..."
 msgstr ""
 
-#: src/gui.c:730
+#: src/gui.c:729
 msgid "Paste as _New"
 msgstr ""
 
-#: src/gui.c:739
+#: src/gui.c:738
 msgid "_Merge Clipboard with Selection..."
-msgstr ""
+msgstr "_Combinar o portapapeis coa selección..."
 
-#: src/gui.c:746
+#: src/gui.c:745
 msgid "_Delete Selection"
-msgstr "_Borrar selección"
+msgstr "_Eliminar a selección"
 
-#: src/gui.c:764
+#: src/gui.c:763
 msgid "Decouple _Video from Audio"
 msgstr ""
 
-#: src/gui.c:772
+#: src/gui.c:771
 msgid "_Select..."
 msgstr "_Seleccionar..."
 
-#: src/gui.c:786
+#: src/gui.c:785
 msgid "Select _All Frames"
 msgstr ""
 
-#: src/gui.c:794
+#: src/gui.c:793
 msgid "_Start Frame Only"
 msgstr ""
 
-#: src/gui.c:802
+#: src/gui.c:801
 msgid "_End Frame Only"
 msgstr ""
 
-#: src/gui.c:813
+#: src/gui.c:812
 msgid "Select from _First Frame"
 msgstr ""
 
-#: src/gui.c:817
+#: src/gui.c:816
 msgid "Select to _Last Frame"
 msgstr ""
 
-#: src/gui.c:821
+#: src/gui.c:820
 msgid "Select Last Insertion/_Merge"
-msgstr ""
+msgstr "Seleccionar a última inserción/_Combinar"
 
-#: src/gui.c:825
+#: src/gui.c:824
 msgid "Select Last _Effect"
 msgstr ""
 
-#: src/gui.c:829
+#: src/gui.c:828
 msgid "_Invert Selection"
 msgstr "_Inverter selección"
 
-#: src/gui.c:837
+#: src/gui.c:836
 msgid "_Lock Selection Width"
 msgstr ""
 
-#: src/gui.c:842 src/multitrack.c:6409
+#: src/gui.c:841 src/multitrack.c:6591
 msgid "_Play"
 msgstr "_Reproducir"
 
-#: src/gui.c:854
+#: src/gui.c:853
 msgid "_Play All"
 msgstr ""
 
-#: src/gui.c:869
+#: src/gui.c:868
 msgid "Pla_y Selection"
 msgstr ""
 
-#: src/gui.c:877
+#: src/gui.c:876
 msgid "Play _Clipboard"
 msgstr ""
 
-#: src/gui.c:899 src/multitrack.c:6441
+#: src/gui.c:898 src/multitrack.c:6623
 msgid "_Stop"
 msgstr "_Deter"
 
-#: src/gui.c:914 src/multitrack.c:6453
+#: src/gui.c:913 src/multitrack.c:6635
 msgid "Re_wind"
 msgstr ""
 
-#: src/gui.c:946 src/multitrack.c:6471
+#: src/gui.c:945 src/multitrack.c:6653
 msgid "_Full Screen"
 msgstr "_Pantalla completa"
 
-#: src/gui.c:955
+#: src/gui.c:954
 msgid "_Double Size"
 msgstr ""
 
-#: src/gui.c:963 src/multitrack.c:6479
+#: src/gui.c:962 src/multitrack.c:6661
 msgid "Play in _Separate Window"
 msgstr ""
 
-#: src/gui.c:972
+#: src/gui.c:971
 msgid "_Blank Background"
 msgstr ""
 
-#: src/gui.c:979
+#: src/gui.c:978
 msgid "(Auto)_loop Video (to fit audio track)"
 msgstr ""
 
-#: src/gui.c:988 src/multitrack.c:6487
+#: src/gui.c:987 src/multitrack.c:6669
 msgid "L_oop Continuously"
 msgstr ""
 
-#: src/gui.c:997
+#: src/gui.c:996
 msgid "Pin_g Pong Loops"
 msgstr ""
 
-#: src/gui.c:1005 src/multitrack.c:6495
+#: src/gui.c:1004 src/multitrack.c:6677
 msgid "_Mute"
 msgstr "_Sen son"
 
-#: src/gui.c:1017
+#: src/gui.c:1016
 msgid "Separate Window 'S_ticky' Mode"
 msgstr ""
 
-#: src/gui.c:1025
+#: src/gui.c:1024
 msgid "S_how Frame Counter"
 msgstr ""
 
-#: src/gui.c:1035
+#: src/gui.c:1034
 msgid "Show Subtitles"
 msgstr ""
 
-#: src/gui.c:1045
+#: src/gui.c:1044
 msgid "Letterbox mode"
 msgstr ""
 
-#: src/gui.c:1051 src/multitrack.c:6507
+#: src/gui.c:1050 src/multitrack.c:6689
 msgid "Effect_s"
 msgstr ""
 
-#: src/gui.c:1054
+#: src/gui.c:1053
 msgid "Effects are applied to the current selection."
 msgstr ""
 
-#: src/gui.c:1067
+#: src/gui.c:1066
 msgid "_Run Test Rendered Effect/Tool/Generator..."
 msgstr ""
 
-#: src/gui.c:1072 src/multitrack.c:7123
+#: src/gui.c:1071 src/multitrack.c:7299
 msgid "_Tools"
 msgstr "_Ferramentas"
 
-#: src/gui.c:1075
+#: src/gui.c:1074
 msgid "Tools are applied to complete clips."
 msgstr ""
 
-#: src/gui.c:1085
+#: src/gui.c:1084
 msgid "_Reverse Clipboard"
 msgstr ""
 
-#: src/gui.c:1094
+#: src/gui.c:1093
 msgid "_Change Playback/Save Speed..."
 msgstr ""
 
-#: src/gui.c:1099
+#: src/gui.c:1098
 msgid "Resample _Video to New Frame Rate..."
 msgstr ""
 
-#: src/gui.c:1105
+#: src/gui.c:1104
 msgid "_Utilities"
 msgstr "_Utilidades"
 
-#: src/gui.c:1110
+#: src/gui.c:1109
 msgid "Custom _Tools"
 msgstr ""
 
-#: src/gui.c:1116 src/multitrack.c:7149
+#: src/gui.c:1115 src/multitrack.c:7325
 msgid "_Generate"
 msgstr "_Xerar"
 
-#: src/gui.c:1126
+#: src/gui.c:1125
 msgid "Loading rendered effect plugins..."
 msgstr ""
 
-#: src/gui.c:1139
+#: src/gui.c:1138
 msgid "Load _Subtitles from File..."
 msgstr ""
 
-#: src/gui.c:1144
+#: src/gui.c:1143
 msgid "Erase subtitles"
 msgstr ""
 
-#: src/gui.c:1152 src/multitrack.c:7158
+#: src/gui.c:1151 src/multitrack.c:7334
 msgid "Capture _External Window... "
 msgstr ""
 
-#: src/gui.c:1159 src/multitrack.c:7173
+#: src/gui.c:1158 src/multitrack.c:7349
 msgid "_Preferences..."
 msgstr "_Preferencias..."
 
-#: src/gui.c:1172
+#: src/gui.c:1171
 msgid "_Audio"
 msgstr ""
 
-#: src/gui.c:1184
+#: src/gui.c:1183
 msgid "Load _New Audio for Clip..."
 msgstr ""
 
-#: src/gui.c:1190
+#: src/gui.c:1189
 msgid "Load _CD Track..."
 msgstr ""
 
-#: src/gui.c:1191
+#: src/gui.c:1190
 msgid "E_ject CD"
 msgstr ""
 
-#: src/gui.c:1205
+#: src/gui.c:1204
 msgid "Record E_xternal Audio..."
 msgstr ""
 
-#: src/gui.c:1218
+#: src/gui.c:1217
 msgid "to New _Clip..."
 msgstr ""
 
-#: src/gui.c:1222
+#: src/gui.c:1221
 msgid "to _Selection"
 msgstr ""
 
-#: src/gui.c:1230
+#: src/gui.c:1229
 msgid "Fade Audio _In..."
 msgstr ""
 
-#: src/gui.c:1234
+#: src/gui.c:1233
 msgid "Fade Audio _Out..."
 msgstr ""
 
-#: src/gui.c:1244
+#: src/gui.c:1243
 msgid "_Export Audio..."
 msgstr ""
 
-#: src/gui.c:1257
+#: src/gui.c:1256
 msgid "Export _Selected Audio..."
 msgstr ""
 
-#: src/gui.c:1261
+#: src/gui.c:1260
 msgid "Export _All Audio..."
 msgstr ""
 
-#: src/gui.c:1265
+#: src/gui.c:1264
 msgid "_Append Audio..."
 msgstr ""
 
-#: src/gui.c:1270
+#: src/gui.c:1269
 msgid "_Trim/Pad Audio..."
 msgstr ""
 
-#: src/gui.c:1283
+#: src/gui.c:1282
 msgid "Trim/Pad Audio to _Selection"
 msgstr ""
 
-#: src/gui.c:1288
+#: src/gui.c:1287
 msgid "Trim/Pad Audio from Beginning to _Play Start"
 msgstr ""
 
-#: src/gui.c:1293
+#: src/gui.c:1292
 msgid "_Delete Audio..."
 msgstr ""
 
-#: src/gui.c:1306
+#: src/gui.c:1305
 msgid "Delete _Selected Audio"
 msgstr ""
 
-#: src/gui.c:1310
+#: src/gui.c:1309
 msgid "Delete _All Audio"
 msgstr ""
 
-#: src/gui.c:1314
+#: src/gui.c:1313
 msgid "Insert _Silence in Selection"
 msgstr ""
 
-#: src/gui.c:1319
+#: src/gui.c:1318
 msgid "_Resample Audio..."
 msgstr ""
 
-#: src/gui.c:1324
+#: src/gui.c:1323
 msgid "_Info"
 msgstr ""
 
-#: src/gui.c:1336
+#: src/gui.c:1335
 msgid "Show Clip _Info"
 msgstr ""
 
-#: src/gui.c:1344
+#: src/gui.c:1343
 msgid "Show/_Edit File Comments"
 msgstr ""
 
-#: src/gui.c:1349
+#: src/gui.c:1348
 msgid "Show _Clipboard Info"
 msgstr ""
 
-#: src/gui.c:1360 src/multitrack.c:7286
+#: src/gui.c:1359 src/multitrack.c:7462
 msgid "Show _Messages"
 msgstr ""
 
-#: src/gui.c:1364 src/multitrack.c:7365
+#: src/gui.c:1363 src/multitrack.c:7541
 msgid "Show _Layout Errors"
 msgstr ""
 
-#: src/gui.c:1369 src/multitrack.c:7263
+#: src/gui.c:1368 src/multitrack.c:7439
 msgid "_Clips"
 msgstr ""
 
-#: src/gui.c:1381
+#: src/gui.c:1380
 msgid "_Rename Current Clip in Menu..."
 msgstr ""
 
-#: src/gui.c:1399
+#: src/gui.c:1398
 msgid "A_dvanced"
 msgstr "_Avanzado"
 
-#: src/gui.c:1412
+#: src/gui.c:1411
 msgid "_RFX Effects/Tools/Utilities"
 msgstr ""
 
-#: src/gui.c:1424
+#: src/gui.c:1423
 msgid "_New Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1428
+#: src/gui.c:1427
 msgid "_Copy RFX Script to Test..."
 msgstr ""
 
-#: src/gui.c:1432
+#: src/gui.c:1431
 msgid "_Edit Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1436
+#: src/gui.c:1435
 msgid "Rena_me Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1440
+#: src/gui.c:1439
 msgid "_Delete Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1450
+#: src/gui.c:1449
 msgid "_Promote Test Rendered Effect/Tool/Generator..."
 msgstr ""
 
-#: src/gui.c:1457
+#: src/gui.c:1456
 msgid "_Import Custom RFX script..."
 msgstr ""
 
-#: src/gui.c:1461
+#: src/gui.c:1460
 msgid "E_xport Custom RFX script..."
 msgstr ""
 
-#: src/gui.c:1465
+#: src/gui.c:1464
 msgid "De_lete Custom RFX Script..."
 msgstr ""
 
-#: src/gui.c:1472
+#: src/gui.c:1471
 msgid "Re_build all RFX plugins"
 msgstr ""
 
-#: src/gui.c:1501
+#: src/gui.c:1498
 msgid "Receive _LiVES stream from..."
 msgstr ""
 
-#: src/gui.c:1506
+#: src/gui.c:1503
 msgid "_Send LiVES stream to..."
 msgstr ""
 
-#: src/gui.c:1515
+#: src/gui.c:1512
 #, c-format
 msgid "Open _yuv4mpeg stream on %sstream.yuv..."
 msgstr ""
 
-#: src/gui.c:1536
+#: src/gui.c:1534
 msgid "_Import Project (.lv2)..."
 msgstr ""
 
-#: src/gui.c:1540
+#: src/gui.c:1538
 msgid "E_xport Project (.lv2)..."
 msgstr ""
 
-#: src/gui.c:1545
+#: src/gui.c:1543
 msgid "_VJ"
 msgstr "_VJ"
 
-#: src/gui.c:1557
+#: src/gui.c:1555
 msgid "Real Time _Effect Mapping"
 msgstr ""
 
-#: src/gui.c:1563
+#: src/gui.c:1561
 msgid "Bind real time effects to ctrl-number keys."
 msgstr ""
 
-#: src/gui.c:1565
+#: src/gui.c:1563
 msgid "Set Real Time Effect _Defaults"
 msgstr ""
 
-#: src/gui.c:1567
+#: src/gui.c:1565
 msgid "Set default parameter values for real time effects."
 msgstr ""
 
-#: src/gui.c:1580
+#: src/gui.c:1578
 msgid "Save Real Time Effect _Defaults"
 msgstr ""
 
-#: src/gui.c:1583
+#: src/gui.c:1581
 msgid ""
 "Save real time effect defaults so they will be restored each time you use "
 "LiVES."
 msgstr ""
 
-#: src/gui.c:1589
+#: src/gui.c:1587
 msgid "_Reset all playback speeds and positions"
 msgstr ""
 
-#: src/gui.c:1592
+#: src/gui.c:1590
 msgid ""
 "Reset all playback positions to frame 1, and reset all playback frame rates."
 msgstr ""
 
-#: src/gui.c:1594
+#: src/gui.c:1592
 msgid "_MIDI/joystick interface"
 msgstr ""
 
-#: src/gui.c:1609
+#: src/gui.c:1607
 msgid "_MIDI/joystick learner..."
 msgstr ""
 
-#: src/gui.c:1614
+#: src/gui.c:1612
 msgid "_Save device mapping..."
 msgstr ""
 
-#: src/gui.c:1620
+#: src/gui.c:1618
 msgid "_Load device mapping..."
 msgstr ""
 
-#: src/gui.c:1628
+#: src/gui.c:1626
 msgid "Show VJ _Keys"
 msgstr ""
 
-#: src/gui.c:1632
+#: src/gui.c:1630
 msgid "To_ys"
 msgstr ""
 
-#: src/gui.c:1644
+#: src/gui.c:1642
 msgid "_None"
 msgstr "_Ningún"
 
-#: src/gui.c:1652
+#: src/gui.c:1650
 msgid "_Autolives"
 msgstr ""
 
-#: src/gui.c:1657
+#: src/gui.c:1655
 msgid "_Mad Frames"
 msgstr ""
 
-#: src/gui.c:1662
+#: src/gui.c:1660
 msgid "_LiVES TV (broadband)"
 msgstr ""
 
-#: src/gui.c:1672 src/multitrack.c:7387
+#: src/gui.c:1670 src/multitrack.c:7563
 msgid "_Help"
 msgstr "_Axuda"
 
-#: src/gui.c:1684 src/multitrack.c:7407
+#: src/gui.c:1682 src/multitrack.c:7583
 msgid "_Manual (opens in browser)"
 msgstr ""
 
-#: src/gui.c:1691 src/multitrack.c:7416
+#: src/gui.c:1689 src/multitrack.c:7592
 msgid "_Donate to the project !"
 msgstr ""
 
-#: src/gui.c:1695 src/multitrack.c:7420
+#: src/gui.c:1693 src/multitrack.c:7596
 msgid "_Email the author"
 msgstr ""
 
-#: src/gui.c:1699 src/multitrack.c:7424
+#: src/gui.c:1697 src/multitrack.c:7600
 msgid "Report a _bug"
 msgstr ""
 
-#: src/gui.c:1703 src/multitrack.c:7428
+#: src/gui.c:1701 src/multitrack.c:7604
 msgid "Suggest a _feature"
 msgstr ""
 
-#: src/gui.c:1707 src/multitrack.c:7432
+#: src/gui.c:1705 src/multitrack.c:7608
 msgid "Assist with _translating"
 msgstr ""
 
-#: src/gui.c:1714 src/multitrack.c:7439
+#: src/gui.c:1712 src/multitrack.c:7615
 msgid "_Troubleshoot"
 msgstr ""
 
-#: src/gui.c:1718 src/multitrack.c:7443
+#: src/gui.c:1716 src/multitrack.c:7619
 msgid "_About"
 msgstr "_Acerca de..."
 
-#: src/gui.c:1752
+#: src/gui.c:1750
 msgid "Rewind to start (w)"
 msgstr ""
 
-#: src/gui.c:1760 src/multitrack.c:16720
+#: src/gui.c:1758 src/multitrack.c:17010
 msgid "Play all (p)"
 msgstr ""
 
-#: src/gui.c:1768 src/gui.c:1877
+#: src/gui.c:1766 src/gui.c:1876
 msgid "Stop playback (q)"
 msgstr ""
 
-#: src/gui.c:1779
+#: src/gui.c:1777
 msgid "Play selection (y)"
 msgstr ""
 
-#: src/gui.c:1832
+#: src/gui.c:1829
 msgid "Volume"
 msgstr "Volume"
 
-#: src/gui.c:1854
+#: src/gui.c:1853
 msgid "Audio volume (1.00)"
 msgstr ""
 
-#: src/gui.c:1883
+#: src/gui.c:1882
 msgid "Unblank background (b)"
 msgstr ""
 
-#: src/gui.c:1929
+#: src/gui.c:1928
 msgid "Play slower (ctrl-down)"
 msgstr ""
 
-#: src/gui.c:1935
+#: src/gui.c:1934
 msgid "Play faster (ctrl-up)"
 msgstr ""
 
-#: src/gui.c:1942
+#: src/gui.c:1941
 msgid "Skip back (ctrl-left)"
 msgstr ""
 
-#: src/gui.c:1948
+#: src/gui.c:1947
 msgid "Skip forward (ctrl-right)"
 msgstr ""
 
-#: src/gui.c:1954
+#: src/gui.c:1953
 msgid "Show clip info (i)"
 msgstr ""
 
-#: src/gui.c:1960
+#: src/gui.c:1959
 msgid "Hide this toolbar"
 msgstr ""
 
-#: src/gui.c:1962
+#: src/gui.c:1961
 msgid ""
 "Press \"s\" to toggle separate play window for improved performance, \"q\" "
 "to stop."
 msgstr ""
 
 #. TRANSLATORS: please keep the translated string the same length
-#: src/gui.c:1995
+#: src/gui.c:1994
 msgid "     Video playback speed (frames per second)        "
 msgstr ""
 
-#: src/gui.c:2009
+#: src/gui.c:2008
 msgid "Vary the video speed"
 msgstr ""
 
-#: src/gui.c:2092 src/gui.c:3218
+#: src/gui.c:2090 src/gui.c:3329
 msgid "First Frame"
 msgstr ""
 
-#: src/gui.c:2193 src/gui.c:3226
+#: src/gui.c:2191 src/gui.c:3336
 msgid "Last Frame"
 msgstr ""
 
-#: src/gui.c:2210
+#: src/gui.c:2208
 msgid "The first selected frame in this clip"
 msgstr ""
 
-#: src/gui.c:2248
+#: src/gui.c:2246
 msgid "The last selected frame in this clip"
 msgstr ""
 
-#: src/gui.c:2532
+#: src/gui.c:2546
 msgid "Starting...\n"
 msgstr ""
 
-#: src/gui.c:3074
+#: src/gui.c:3181
 msgid "    Press 'q' to stop recording.  DO NOT COVER THE PLAY WINDOW !   "
 msgstr ""
 
-#: src/gui.c:3521
+#: src/gui.c:3643
 msgid "Frame number to preview"
 msgstr ""
 
-#: src/gui.c:3538
+#: src/gui.c:3660
 msgid "_Free"
 msgstr "_Libre"
 
-#: src/gui.c:3539
+#: src/gui.c:3661
 msgid "Free choice of frame number"
 msgstr ""
 
-#: src/gui.c:3543
+#: src/gui.c:3666
 msgid "_Start"
 msgstr "_Inicio"
 
-#: src/gui.c:3544
+#: src/gui.c:3667
 msgid "Frame number is linked to start frame"
 msgstr ""
 
-#: src/gui.c:3551
+#: src/gui.c:3675
 msgid "_End"
 msgstr ""
 
-#: src/gui.c:3552
+#: src/gui.c:3676
 msgid "Frame number is linked to end frame"
 msgstr ""
 
-#: src/gui.c:3559
+#: src/gui.c:3684
 msgid "_Pointer"
 msgstr ""
 
-#: src/gui.c:3560
+#: src/gui.c:3685
 msgid "Frame number is linked to playback pointer"
 msgstr ""
 
-#: src/gui.c:3581
+#: src/gui.c:3707
 msgid "Rewind"
 msgstr "Rebobinar"
 
-#: src/gui.c:3592 src/dialogs.c:894 src/dialogs.c:896 src/dialogs.c:1817
-#: src/dialogs.c:1819
+#: src/gui.c:3718 src/dialogs.c:960 src/dialogs.c:962 src/dialogs.c:1873
+#: src/dialogs.c:1875
 msgid "Play all"
 msgstr ""
 
-#: src/gui.c:3605
+#: src/gui.c:3731
 msgid "Play Selection"
 msgstr ""
 
-#: src/gui.c:3619
+#: src/gui.c:3745
 msgid "Loop On/Off"
 msgstr ""
 
-#: src/gui.c:3693
+#: src/gui.c:3819
 msgid "Start _recording"
 msgstr ""
 
-#: src/gui.c:3698
+#: src/gui.c:3824
 msgid "Stop _recording"
 msgstr ""
 
-#: src/gui.c:3703
+#: src/gui.c:3829
 msgid "_Record Performance"
 msgstr ""
 
-#: src/gui.c:3851
+#: src/gui.c:3974
 msgid "Hide Play Window"
 msgstr ""
 
-#: src/gui.c:4232
+#: src/gui.c:4333
 msgid "Show Play Window"
 msgstr ""
 
-#: src/ce_thumbs.c:222
+#: src/ce_thumbs.c:242
 #, c-format
 msgid "Mapped to ctrl-%d"
 msgstr ""
 
-#: src/ce_thumbs.c:276 src/effects.c:85 src/preferences.c:3195
+#: src/ce_thumbs.c:296 src/effects.c:86 src/preferences.c:3247
 msgid "Effects"
 msgstr "Efectos"
 
-#: src/ce_thumbs.c:279 src/multitrack.c:5615
+#: src/ce_thumbs.c:299 src/multitrack.c:5791
 msgid "Clips"
 msgstr ""
 
-#: src/ce_thumbs.c:303
+#: src/ce_thumbs.c:323
 #, c-format
 msgid "Show / apply effects to %s\n"
 msgstr ""
 
-#: src/ce_thumbs.c:315
+#: src/ce_thumbs.c:335
 #, c-format
 msgid "Select clip for %s\n"
 msgstr ""
 
-#: src/ce_thumbs.c:515
+#: src/ce_thumbs.c:536
 msgid "_Pin"
 msgstr ""
 
-#: src/ce_thumbs.c:515
+#: src/ce_thumbs.c:537
 msgid "Pin the parameter box to the window"
 msgstr ""
 
 #. TRANSLATORS: Exabytes
-#: src/utils.c:794
+#: src/utils.c:800
 #, c-format
 msgid "%.2f EB"
 msgstr ""
 
 #. TRANSLATORS: Petabytes
-#: src/utils.c:798
+#: src/utils.c:803
 #, c-format
 msgid "%.2f PB"
 msgstr ""
 
 #. TRANSLATORS: Terabytes
-#: src/utils.c:802
+#: src/utils.c:806
 #, c-format
 msgid "%.2f TB"
 msgstr ""
 
 #. TRANSLATORS: Gigabytes
-#: src/utils.c:806
+#: src/utils.c:809
 #, c-format
 msgid "%.2f GB"
 msgstr ""
 
 #. TRANSLATORS: Megabytes
-#: src/utils.c:810
+#: src/utils.c:812
 #, c-format
 msgid "%.2f MB"
 msgstr ""
 
 #. TRANSLATORS: Kilobytes (1024 bytes)
-#: src/utils.c:814
+#: src/utils.c:815
 #, c-format
 msgid "%.2f KiB"
 msgstr ""
@@ -3633,7 +3711,7 @@
 msgid "%d bytes"
 msgstr ""
 
-#: src/utils.c:1841
+#: src/utils.c:1835
 msgid "Clearing the clipboard"
 msgstr ""
 
@@ -3645,81 +3723,81 @@
 "Switched to clip %s\n"
 msgstr ""
 
-#: src/utils.c:1880
+#: src/utils.c:1877
 msgid ""
 "\n"
 "==============================\n"
 "Switched to empty clip\n"
 msgstr ""
 
-#: src/utils.c:1917
+#: src/utils.c:1916
 msgid "(blank)"
 msgstr ""
 
-#: src/utils.c:1920
+#: src/utils.c:1919
 #, c-format
 msgid ""
 "The set name has been changed from %s to %s. Affected layouts have been "
 "updated accordingly\n"
 msgstr ""
 
-#: src/utils.c:1928
+#: src/utils.c:1927
 #, c-format
 msgid ""
 "The clip %s is missing from this set.\n"
 "It is required by the following layouts:\n"
 msgstr ""
 
-#: src/utils.c:1932
+#: src/utils.c:1931
 #, c-format
 msgid ""
 "The clip %s has been closed.\n"
 "It is required by the following layouts:\n"
 msgstr ""
 
-#: src/utils.c:1937
+#: src/utils.c:1936
 #, c-format
 msgid ""
 "Frames have been shifted in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1942
+#: src/utils.c:1941
 #, c-format
 msgid ""
 "Frames have been deleted from the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1947
+#: src/utils.c:1946
 #, c-format
 msgid ""
 "Audio has been deleted from the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1952
+#: src/utils.c:1951
 #, c-format
 msgid ""
 "Audio has been shifted in clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1957
+#: src/utils.c:1956
 #, c-format
 msgid ""
 "Audio has been altered in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1962
+#: src/utils.c:1961
 #, c-format
 msgid ""
 "Frames have been altered in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:2135
+#: src/utils.c:2134
 #, c-format
 msgid ""
 "Set %s\n"
@@ -3727,7 +3805,7 @@
 "by another copy of LiVES.\n"
 msgstr ""
 
-#: src/utils.c:2142
+#: src/utils.c:2140
 #, c-format
 msgid ""
 "\n"
@@ -3773,67 +3851,67 @@
 msgid "Removing layout %s\n"
 msgstr ""
 
-#: src/utils.c:3014
+#: src/utils.c:2996
 msgid "Video [opening...]"
 msgstr ""
 
-#: src/utils.c:3018
+#: src/utils.c:2999
 #, c-format
 msgid "Video [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:3022
+#: src/utils.c:3002
 msgid "(Undefined)"
 msgstr ""
 
-#: src/utils.c:3025
+#: src/utils.c:3004
 msgid "(No video)"
 msgstr ""
 
-#: src/utils.c:3032
+#: src/utils.c:3011
 msgid "(No audio)"
 msgstr ""
 
-#: src/utils.c:3037
+#: src/utils.c:3015
 msgid "Mono  [opening...]"
 msgstr ""
 
-#: src/utils.c:3040
+#: src/utils.c:3017
 msgid "Left Audio [opening...]"
 msgstr ""
 
-#: src/utils.c:3045
+#: src/utils.c:3021
 #, c-format
 msgid "Mono [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:3048
+#: src/utils.c:3023
 #, c-format
 msgid "Left Audio [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:3056
+#: src/utils.c:3031
 msgid "Right Audio [opening...]"
 msgstr ""
 
-#: src/utils.c:3059
+#: src/utils.c:3033
 #, c-format
 msgid "Right Audio [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:3506
+#: src/utils.c:3472
 msgid "LiVES cannot switch to mplayer whilst clips are loading."
 msgstr ""
 
-#: src/utils.c:3559
+#: src/utils.c:3525
 msgid "LiVES cannot switch to mplayer2 whilst clips are loading."
 msgstr ""
 
-#: src/utils.c:3809
+#: src/utils.c:3775
 msgid "Cleaning up clip"
 msgstr ""
 
-#: src/utils.c:3913
+#: src/utils.c:3874
 #, c-format
 msgid ""
 "\n"
@@ -3843,30 +3921,29 @@
 "Overwrite ?\n"
 msgstr ""
 
-#: src/utils.c:4305 src/utils.c:4337 src/multitrack.c:4503
+#: src/utils.c:4250 src/utils.c:4280 src/multitrack.c:4672
 #, c-format
 msgid "_Undo %s"
 msgstr "_Desfacer %s"
 
-#: src/utils.c:4306 src/utils.c:4338 src/multitrack.c:4525
+#: src/utils.c:4251 src/utils.c:4281 src/multitrack.c:4693
 #, c-format
 msgid "_Redo %s"
 msgstr "_Refacer %s"
 
-#: src/utils.c:4363
+#: src/utils.c:4305
 msgid "-------------Selection------------"
 msgstr ""
 
-#. TRANSLATORS: - try to keep the text of the middle part the same length, by deleting "-" if necessary
-#: src/utils.c:4371
+#: src/utils.c:4313
 msgid " sec ] ----------Selection---------- [ "
 msgstr ""
 
-#: src/utils.c:4371
+#: src/utils.c:4314
 msgid " frames ] ----------"
 msgstr ""
 
-#: src/utils.c:5360
+#: src/utils.c:5302
 msgid ""
 "Your version of mplayer/ffmpeg may be broken !\n"
 "See http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2071\n"
@@ -3877,11 +3954,11 @@
 "Try running Help/Troubleshoot for more information."
 msgstr ""
 
-#: src/saveplay.c:178
+#: src/saveplay.c:179
 msgid "Examining file header"
 msgstr ""
 
-#: src/saveplay.c:315 src/saveplay.c:789
+#: src/saveplay.c:316 src/saveplay.c:779
 #, c-format
 msgid "Opening %s"
 msgstr "Abrindo %s"
@@ -3891,36 +3968,36 @@
 msgid "Opening %s start time %.2f sec. frames %d"
 msgstr ""
 
-#: src/saveplay.c:326 src/saveplay.c:4001
+#: src/saveplay.c:326 src/saveplay.c:3927
 msgid " without sound"
 msgstr ""
 
-#: src/saveplay.c:396
+#: src/saveplay.c:395
 #, c-format
 msgid "Opening audio for %s"
 msgstr ""
 
-#: src/saveplay.c:557
+#: src/saveplay.c:554
 #, c-format
 msgid "Auto trimming %.2f seconds of audio at start..."
 msgstr ""
 
-#: src/saveplay.c:567
+#: src/saveplay.c:562
 #, c-format
 msgid "Auto trimming %.2f seconds of audio at end..."
 msgstr ""
 
-#: src/saveplay.c:584
+#: src/saveplay.c:577
 #, c-format
 msgid "Auto padding with %.2f seconds of silence at start..."
 msgstr ""
 
-#: src/saveplay.c:599
+#: src/saveplay.c:590
 #, c-format
 msgid "Auto padding with %.2f seconds of silence at end..."
 msgstr ""
 
-#: src/saveplay.c:671
+#: src/saveplay.c:661
 #, c-format
 msgid ""
 "\n"
@@ -3932,11 +4009,11 @@
 "Are you sure you wish to continue ?"
 msgstr ""
 
-#: src/saveplay.c:685
+#: src/saveplay.c:676
 msgid " - please be patient."
 msgstr ""
 
-#: src/saveplay.c:938
+#: src/saveplay.c:926
 msgid ""
 "\n"
 "\n"
@@ -3944,14 +4021,14 @@
 "Please check the terminal window for more details.\n"
 msgstr ""
 
-#: src/saveplay.c:940
+#: src/saveplay.c:928
 msgid ""
 "\n"
 "\n"
 "You may need to install mplayer to open this file.\n"
 msgstr ""
 
-#: src/saveplay.c:948
+#: src/saveplay.c:934
 msgid ""
 "\n"
 "\n"
@@ -3959,29 +4036,29 @@
 "Tools|Preferences|Decoding\n"
 msgstr ""
 
-#: src/saveplay.c:1014
+#: src/saveplay.c:995
 msgid "Adding image..."
 msgstr ""
 
-#: src/saveplay.c:1108
+#: src/saveplay.c:1089
 #, c-format
 msgid "Subtitles were saved as %s\n"
 msgstr ""
 
-#: src/saveplay.c:1192
+#: src/saveplay.c:1171
 #, c-format
 msgid "LiVES: Save Frame %d as..."
 msgstr ""
 
-#: src/saveplay.c:1195
+#: src/saveplay.c:1174
 msgid "LiVES: Save Frame as..."
 msgstr ""
 
-#: src/saveplay.c:1322
+#: src/saveplay.c:1303
 msgid "LiVES: Save Clip as..."
 msgstr ""
 
-#: src/saveplay.c:1390
+#: src/saveplay.c:1369
 msgid ""
 "Saving your video could lead to a loss of quality !\n"
 "You are strongly advised to 'Save As' to a new file.\n"
@@ -3989,67 +4066,67 @@
 "Do you still wish to continue ?"
 msgstr ""
 
-#: src/saveplay.c:1517 src/saveplay.c:1683 src/saveplay.c:1762
-#: src/saveplay.c:4014
+#: src/saveplay.c:1494 src/saveplay.c:1659 src/saveplay.c:1738
+#: src/saveplay.c:3940
 msgid "Pulling frames from clip"
 msgstr ""
 
-#: src/saveplay.c:1588 src/saveplay.c:1727
+#: src/saveplay.c:1565 src/saveplay.c:1703
 msgid "Linking selection"
 msgstr ""
 
-#: src/saveplay.c:1779
+#: src/saveplay.c:1755
 msgid " (with no sound)\n"
 msgstr ""
 
-#: src/saveplay.c:1786
+#: src/saveplay.c:1761
 #, c-format
 msgid "Saving frames %d to %d%s as \"%s\" : encoder = %s : format = %s..."
 msgstr ""
 
-#: src/saveplay.c:1790
+#: src/saveplay.c:1765
 #, c-format
 msgid "Saving frames 1 to %d%s as \"%s\" : encoder %s : format = %s..."
 msgstr ""
 
-#: src/saveplay.c:1909
+#: src/saveplay.c:1890
 msgid "Saving [can take a long time]"
 msgstr ""
 
-#: src/saveplay.c:2057
+#: src/saveplay.c:2044
 msgid ""
 "\n"
 "\n"
 "Encoder error - output file was not created !\n"
 msgstr ""
 
-#: src/saveplay.c:2094
+#: src/saveplay.c:2081
 msgid "Clearing letterbox"
 msgstr ""
 
-#: src/saveplay.c:2183
+#: src/saveplay.c:2168
 #, c-format
 msgid "File size was %s\n"
 msgstr ""
 
-#: src/saveplay.c:2284
+#: src/saveplay.c:2265
 msgid "recording aborted by preview.\n"
 msgstr ""
 
-#: src/saveplay.c:2288
+#: src/saveplay.c:2268
 msgid "recording aborted by clipboard playback.\n"
 msgstr ""
 
-#: src/saveplay.c:2291
+#: src/saveplay.c:2270
 msgid "Recording performance..."
 msgstr ""
 
-#: src/saveplay.c:3293
+#: src/saveplay.c:3251
 #, c-format
 msgid "Average FPS was %.4f\n"
 msgstr ""
 
-#: src/saveplay.c:3299
+#: src/saveplay.c:3256
 msgid ""
 "\n"
 "\n"
@@ -4058,16 +4135,21 @@
 "and resize all frames to the current size.\n"
 msgstr ""
 
-#: src/saveplay.c:3479
+#: src/saveplay.c:3429
 msgid "Unknown"
 msgstr "Descoñecido"
 
-#: src/saveplay.c:3588 src/saveplay.c:4585
+#: src/saveplay.c:3538 src/saveplay.c:4502
 #, c-format
 msgid "Untitled%d"
 msgstr "Sentítulo%d"
 
-#: src/saveplay.c:3633
+#: src/saveplay.c:3567
+#, c-format
+msgid "%d frames are enough !\n"
+msgstr "%d  fotogramas son abondo !\n"
+
+#: src/saveplay.c:3579
 #, c-format
 msgid ""
 "\n"
@@ -4075,7 +4157,7 @@
 "Bad things may happen with this clip.\n"
 msgstr ""
 
-#: src/saveplay.c:3723
+#: src/saveplay.c:3667
 #, c-format
 msgid ""
 "\n"
@@ -4083,73 +4165,73 @@
 "Default can be set in Tools | Preferences | Misc.\n"
 msgstr ""
 
-#: src/saveplay.c:3735
+#: src/saveplay.c:3677
 #, c-format
 msgid "Playback speed was adjusted to %.3f frames per second to fit audio.\n"
 msgstr ""
 
-#: src/saveplay.c:3754
+#: src/saveplay.c:3694
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d *bpp=Greyscale* fps=%.3f\n"
 "Audio:"
 msgstr ""
 
-#: src/saveplay.c:3758 src/saveplay.c:4762
+#: src/saveplay.c:3698 src/saveplay.c:4671
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d bpp=%d fps=%.3f\n"
 "Audio:"
 msgstr ""
 
-#: src/saveplay.c:3762 src/saveplay.c:4766
+#: src/saveplay.c:3703 src/saveplay.c:4676
 #, c-format
 msgid "%s none\n"
 msgstr ""
 
-#: src/saveplay.c:3774
-#, fuzzy, c-format
+#: src/saveplay.c:3714
+#, c-format
 msgid " - Author: %s\n"
-msgstr "Autor: %s"
+msgstr ""
 
-#: src/saveplay.c:3779
+#: src/saveplay.c:3717
 #, c-format
 msgid " - Title: %s\n"
 msgstr ""
 
-#: src/saveplay.c:3784
+#: src/saveplay.c:3720
 #, c-format
 msgid " - Comment: %s\n"
 msgstr ""
 
-#: src/saveplay.c:3897
+#: src/saveplay.c:3829
 #, c-format
 msgid "Saving frame %d as %s..."
 msgstr ""
 
-#: src/saveplay.c:3996
+#: src/saveplay.c:3924
 #, c-format
 msgid "Backing up %s to %s"
 msgstr ""
 
-#: src/saveplay.c:4049
+#: src/saveplay.c:3975
 msgid "Backing up"
 msgstr ""
 
-#: src/saveplay.c:4083
+#: src/saveplay.c:4009
 msgid "performance data was backed up..."
 msgstr ""
 
-#: src/saveplay.c:4661
+#: src/saveplay.c:4574
 #, c-format
 msgid "Restoring %s..."
 msgstr ""
 
-#: src/saveplay.c:4692
+#: src/saveplay.c:4603
 msgid "Restoring"
 msgstr "A restaurar"
 
-#: src/saveplay.c:4714
+#: src/saveplay.c:4625
 #, c-format
 msgid ""
 "\n"
@@ -4159,22 +4241,22 @@
 msgstr ""
 
 #. TRANSLATORS: rec(ord) %.2f M(ega)B(ytes)
-#: src/saveplay.c:5207
+#: src/saveplay.c:5118
 #, c-format
 msgid "rec %.2f MB"
 msgstr ""
 
-#: src/saveplay.c:5213
+#: src/saveplay.c:5123
 #, c-format
 msgid "!rec %.2f MB"
 msgstr ""
 
 #. TRANSLATORS: rec(ord) ?? M(ega)B(ytes)
-#: src/saveplay.c:5216
+#: src/saveplay.c:5126
 msgid "rec ?? MB"
 msgstr ""
 
-#: src/saveplay.c:5241
+#: src/saveplay.c:5151
 #, c-format
 msgid ""
 "\n"
@@ -4182,54 +4264,76 @@
 "Record stop level can be set in Preferences.\n"
 msgstr ""
 
-#: src/saveplay.c:5535
+#: src/saveplay.c:5447
 msgid ""
 "\n"
 "Files from a previous run of LiVES were found.\n"
 "Do you want to attempt to recover them ?\n"
 msgstr ""
 
-#: src/saveplay.c:5557
+#: src/saveplay.c:5469
 msgid "Recovering files"
 msgstr ""
 
-#: src/saveplay.c:5560
+#: src/saveplay.c:5472
 msgid "Recovering files..."
 msgstr ""
 
-#: src/dialogs.c:72
+#: src/dialogs.c:71
 msgid "Show affected _layouts"
 msgstr ""
 
-#: src/dialogs.c:128
+#: src/dialogs.c:113
+msgid ""
+"Do _not show this warning any more\n"
+"(can be turned back on from Preferences/Warnings)"
+msgstr ""
+"_Non mostrar este aviso máis\n"
+"(pode estar conectado de novo en Preferencias/Avisos)"
+
+#: src/dialogs.c:127
 msgid "_Recover disk space"
 msgstr ""
 
-#: src/dialogs.c:143
+#: src/dialogs.c:142
 msgid " _Advanced Settings >>"
 msgstr ""
 
-#: src/dialogs.c:184
+#: src/dialogs.c:183 src/dialogs.c:221
 msgid "LiVES: - Warning !"
 msgstr ""
 
 #: src/dialogs.c:194
+#, fuzzy
+msgid "LiVES: - Error !"
+msgstr "LiVES: - %s"
+
+#: src/dialogs.c:204
+#, fuzzy
+msgid "LiVES: - Information"
+msgstr "LiVES: - Abrir a localización"
+
+#: src/dialogs.c:230
 msgid "LiVES: - Question"
 msgstr ""
 
-#: src/dialogs.c:204
+#: src/dialogs.c:239
 msgid "LiVES: - File Error"
 msgstr ""
 
-#: src/dialogs.c:208
+#: src/dialogs.c:241
 msgid "_Abort"
 msgstr ""
 
-#: src/dialogs.c:213
+#: src/dialogs.c:246
 msgid "_Retry"
 msgstr ""
 
-#: src/dialogs.c:597
+#: src/dialogs.c:306
+msgid "Show _Details"
+msgstr "Amosar os _detalles"
+
+#: src/dialogs.c:657
 #, c-format
 msgid ""
 "FREE SPACE IN THE PARTITION CONTAINING\n"
@@ -4240,7 +4344,7 @@
 "(Disk warning levels can be configured in Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:615
+#: src/dialogs.c:676
 #, c-format
 msgid ""
 "Free space in the partition containing\n"
@@ -4252,11 +4356,11 @@
 "Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:627
+#: src/dialogs.c:688
 msgid "Audio players cannot be switched during playback."
 msgstr ""
 
-#: src/dialogs.c:632
+#: src/dialogs.c:694
 msgid ""
 "\n"
 "\n"
@@ -4264,46 +4368,46 @@
 "Please try closing some other applications first.\n"
 msgstr ""
 
-#: src/dialogs.c:752
+#: src/dialogs.c:820
 msgid "Processing has been paused."
 msgstr ""
 
-#: src/dialogs.c:937
+#: src/dialogs.c:1002
 #, c-format
 msgid ""
 "\n"
 "%s%d%% done. Time remaining: %u sec%s\n"
 msgstr ""
 
-#: src/dialogs.c:1335
+#: src/dialogs.c:1391
 #, c-format
 msgid ""
 "\n"
 "%d/%d frames opened. Time remaining %u sec.\n"
 msgstr ""
 
-#: src/dialogs.c:1337
+#: src/dialogs.c:1393
 #, c-format
 msgid ""
 "\n"
 "%d/%d frames opened.\n"
 msgstr ""
 
-#: src/dialogs.c:1341
+#: src/dialogs.c:1396
 #, c-format
 msgid ""
 "\n"
 "%d frames opened.\n"
 msgstr ""
 
-#: src/dialogs.c:1940
+#: src/dialogs.c:1993
 #, c-format
 msgid ""
 "\n"
 "Time remaining: %d sec"
 msgstr ""
 
-#: src/dialogs.c:1988
+#: src/dialogs.c:2040
 #, c-format
 msgid ""
 "\n"
@@ -4311,7 +4415,7 @@
 "Please close a file and then try again."
 msgstr ""
 
-#: src/dialogs.c:1994
+#: src/dialogs.c:2047
 #, c-format
 msgid ""
 "LiVES was unable to write to its temporary directory.\n"
@@ -4323,27 +4427,31 @@
 "Please make sure you can write to this directory."
 msgstr ""
 
-#: src/dialogs.c:2005
+#: src/dialogs.c:2059
+#, fuzzy
 msgid ""
 "\n"
 "LiVES currently requires either 'mplayer', 'mplayer2', or 'sox' to function. "
 "Please install one or other of these, and try again.\n"
 msgstr ""
+"\n"
+"LiVES require actualmente «mplayer» ou «sox» para funcionar. Instale un "
+"deles e tenteo de novo.\n"
 
-#: src/dialogs.c:2010
+#: src/dialogs.c:2064
 msgid ""
 "Audio was not loaded; please install mplayer or mplayer2 if you expected "
 "audio for this clip.\n"
 msgstr ""
 
-#: src/dialogs.c:2014
+#: src/dialogs.c:2069
 msgid ""
 "Audio resampling is required for this format.\n"
 "Please install 'sox'\n"
 "Or switch to another encoder format in Tools | Preferences | Encoding\n"
 msgstr ""
 
-#: src/dialogs.c:2019
+#: src/dialogs.c:2075
 msgid ""
 "\n"
 "\n"
@@ -4351,19 +4459,19 @@
 "Please set the audio codec in Tools|Preferences|Encoding\n"
 msgstr ""
 
-#: src/dialogs.c:2024
+#: src/dialogs.c:2080
 msgid ""
 "This layout includes generated frames.\n"
 "It cannot be saved, you must render it to a clip first.\n"
 msgstr ""
 
-#: src/dialogs.c:2029
+#: src/dialogs.c:2085
 msgid ""
 "This layout includes generated or recorded audio.\n"
 "It cannot be saved, you must render it to a clip first.\n"
 msgstr ""
 
-#: src/dialogs.c:2039 src/dialogs.c:2137
+#: src/dialogs.c:2095 src/dialogs.c:2189
 #, c-format
 msgid ""
 "\n"
@@ -4371,83 +4479,83 @@
 "Due to restrictions in the %s format\n"
 msgstr ""
 
-#: src/dialogs.c:2059
+#: src/dialogs.c:2115
 msgid ""
 "LiVES recommends the following settings:\n"
 "\n"
 msgstr ""
 
-#: src/dialogs.c:2065 src/dialogs.c:2174 src/resample.c:850
+#: src/dialogs.c:2121 src/dialogs.c:2225 src/resample.c:839
 msgid ", signed"
 msgstr ""
 
-#: src/dialogs.c:2066 src/dialogs.c:2175 src/resample.c:853
+#: src/dialogs.c:2122 src/dialogs.c:2226 src/resample.c:841
 msgid ", unsigned"
 msgstr ""
 
-#: src/dialogs.c:2070 src/dialogs.c:2179 src/resample.c:858
+#: src/dialogs.c:2126 src/dialogs.c:2230 src/resample.c:846
 msgid ", little-endian"
 msgstr ""
 
-#: src/dialogs.c:2071 src/dialogs.c:2180 src/resample.c:861
+#: src/dialogs.c:2127 src/dialogs.c:2231 src/resample.c:848
 msgid ", big-endian"
 msgstr ""
 
-#: src/dialogs.c:2077
+#: src/dialogs.c:2132
 #, c-format
 msgid "Use an audio rate of %d Hz%s%s\n"
 msgstr ""
 
-#: src/dialogs.c:2085
+#: src/dialogs.c:2140
 #, c-format
 msgid "Set video rate to %.3f frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:2089
+#: src/dialogs.c:2143
 #, c-format
 msgid "Set video rate to %d:%d frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:2094 src/dialogs.c:2209
+#: src/dialogs.c:2148 src/dialogs.c:2258
 #, c-format
 msgid "Set video size to %d x %d pixels\n"
 msgstr ""
 
-#: src/dialogs.c:2102 src/dialogs.c:2208
+#: src/dialogs.c:2156 src/dialogs.c:2257
 msgid ""
 "\n"
 "You may wish to:\n"
 msgstr ""
 
-#: src/dialogs.c:2105 src/dialogs.c:2200
+#: src/dialogs.c:2159 src/dialogs.c:2249
 #, c-format
 msgid "resize video to %d x %d pixels\n"
 msgstr ""
 
-#: src/dialogs.c:2110
+#: src/dialogs.c:2163
 msgid "disable audio, since the target encoder cannot encode audio\n"
 msgstr ""
 
-#: src/dialogs.c:2170
+#: src/dialogs.c:2221
 msgid "LiVES must:\n"
 msgstr ""
 
-#: src/dialogs.c:2185
+#: src/dialogs.c:2235
 #, c-format
 msgid "resample audio to %d Hz%s%s\n"
 msgstr ""
 
-#: src/dialogs.c:2192
+#: src/dialogs.c:2242
 #, c-format
 msgid "resample video to %.3f frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:2196
+#: src/dialogs.c:2245
 #, c-format
 msgid "resample video to %d:%d frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:2215
+#: src/dialogs.c:2263
 msgid ""
 "\n"
 "You will be able to undo these changes afterwards.\n"
@@ -4456,14 +4564,14 @@
 "\n"
 msgstr ""
 
-#: src/dialogs.c:2218
+#: src/dialogs.c:2265
 msgid ""
 "\n"
 "Changes applied to the selection will not be permanent.\n"
 "\n"
 msgstr ""
 
-#: src/dialogs.c:2237
+#: src/dialogs.c:2285
 msgid ""
 "\n"
 "\n"
@@ -4472,7 +4580,7 @@
 "Try recording for just a selection of the file."
 msgstr ""
 
-#: src/dialogs.c:2244
+#: src/dialogs.c:2293
 msgid ""
 "The playback speed (fps), or the audio rate\n"
 " of the clipboard does not match\n"
@@ -4483,7 +4591,7 @@
 "Please press Cancel to abort the insert, or OK to continue."
 msgstr ""
 
-#: src/dialogs.c:2253
+#: src/dialogs.c:2304
 #, c-format
 msgid ""
 "When opening a yuvmpeg stream, you should first create a fifo file in:\n"
@@ -4496,11 +4604,11 @@
 "click Cancel."
 msgstr ""
 
-#: src/dialogs.c:2305
+#: src/dialogs.c:2356
 msgid "Show Keys"
 msgstr ""
 
-#: src/dialogs.c:2306
+#: src/dialogs.c:2358
 msgid ""
 "You can use the following keys during playback to control LiVES:-\n"
 "\n"
@@ -4542,11 +4650,11 @@
 "g                             ping pong loops\n"
 msgstr ""
 
-#: src/dialogs.c:2313
+#: src/dialogs.c:2365
 msgid "Multitrack Keys"
 msgstr ""
 
-#: src/dialogs.c:2314
+#: src/dialogs.c:2367
 msgid ""
 "You can use the following keys to control the multitrack window:-\n"
 "\n"
@@ -4568,18 +4676,18 @@
 "For other keys, see the menus.\n"
 msgstr ""
 
-#: src/dialogs.c:2322
+#: src/dialogs.c:2375
 msgid "Message History"
 msgstr ""
 
-#: src/dialogs.c:2335
+#: src/dialogs.c:2388
 #, c-format
 msgid ""
 "After upgrading/installing, you may need to adjust the <prefix_dir> setting "
 "in your %s file"
 msgstr ""
 
-#: src/dialogs.c:2344
+#: src/dialogs.c:2399
 #, c-format
 msgid ""
 "\n"
@@ -4590,25 +4698,25 @@
 "or change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/dialogs.c:2352
+#: src/dialogs.c:2408
 msgid ""
 "Sorry, unknown audio type.\n"
 "\n"
 " (Filenames must end in .mp3, .ogg, .wav, .mod, .xm or .it)"
 msgstr ""
 
-#: src/dialogs.c:2353
+#: src/dialogs.c:2409
 msgid "failed (unknown type)\n"
 msgstr ""
 
-#: src/dialogs.c:2358
+#: src/dialogs.c:2415
 msgid ""
 "\n"
 "Do you wish to remove the layout files associated with this set ?\n"
 "(They will not be usable without the set).\n"
 msgstr ""
 
-#: src/dialogs.c:2363
+#: src/dialogs.c:2421
 #, c-format
 msgid ""
 "\n"
@@ -4617,7 +4725,7 @@
 "Click Cancel to pick a new name.\n"
 msgstr ""
 
-#: src/dialogs.c:2370
+#: src/dialogs.c:2429
 msgid ""
 "\n"
 "Frames from this clip are used in some multitrack layouts.\n"
@@ -4625,7 +4733,7 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2374
+#: src/dialogs.c:2433
 msgid ""
 "\n"
 "Audio from this clip is used in some multitrack layouts.\n"
@@ -4633,7 +4741,7 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2378
+#: src/dialogs.c:2438
 #, c-format
 msgid ""
 "\n"
@@ -4644,7 +4752,7 @@
 "Otherwise click Cancel to skip loading this file.\n"
 msgstr ""
 
-#: src/dialogs.c:2385
+#: src/dialogs.c:2446
 #, c-format
 msgid ""
 "\n"
@@ -4654,7 +4762,7 @@
 "The clip could not be loaded.\n"
 msgstr ""
 
-#: src/dialogs.c:2392
+#: src/dialogs.c:2455
 msgid ""
 "\n"
 "Dear user, the jack developers decided to remove the -Z option from jackd.\n"
@@ -4662,7 +4770,7 @@
 "Alternately, select a different audio player in Preferences.\n"
 msgstr ""
 
-#: src/dialogs.c:2396
+#: src/dialogs.c:2460
 msgid ""
 "\n"
 "Unable to start up jack. Please ensure that alsa is set up correctly on your "
@@ -4671,13 +4779,13 @@
 "Automatic jack startup will be disabled now.\n"
 msgstr ""
 
-#: src/dialogs.c:2402
+#: src/dialogs.c:2466
 msgid ""
 "\n"
 "Unable to connect to jack server. Please start jack before starting LiVES\n"
 msgstr ""
 
-#: src/dialogs.c:2411
+#: src/dialogs.c:2475
 #, c-format
 msgid ""
 "\n"
@@ -4688,13 +4796,13 @@
 "%s\n"
 msgstr ""
 
-#: src/dialogs.c:2418
+#: src/dialogs.c:2482
 msgid ""
 "\n"
 "Alternately, you can restart LiVES and select another audio player.\n"
 msgstr ""
 
-#: src/dialogs.c:2423
+#: src/dialogs.c:2488
 #, c-format
 msgid ""
 "\n"
@@ -4704,7 +4812,7 @@
 "It is recommended to increase it to at least %d MB"
 msgstr ""
 
-#: src/dialogs.c:2429
+#: src/dialogs.c:2496
 #, c-format
 msgid ""
 "\n"
@@ -4713,7 +4821,7 @@
 "Do you wish to delete them ?\n"
 msgstr ""
 
-#: src/dialogs.c:2436
+#: src/dialogs.c:2504
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for multitrack undo.\n"
@@ -4721,7 +4829,7 @@
 "using Preferences/Multitrack/Undo Memory\n"
 msgstr ""
 
-#: src/dialogs.c:2440
+#: src/dialogs.c:2508
 msgid ""
 "\n"
 "Out of memory for undo.\n"
@@ -4729,63 +4837,63 @@
 "using Preferences/Multitrack/Undo Memory\n"
 msgstr ""
 
-#: src/dialogs.c:2444
+#: src/dialogs.c:2512
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for the multitrack undo buffer.\n"
 msgstr ""
 
-#: src/dialogs.c:2446
+#: src/dialogs.c:2514
 msgid "or enter a smaller value.\n"
 msgstr ""
 
-#: src/dialogs.c:2448
+#: src/dialogs.c:2516
 msgid "Try again from the clip editor, try closing some other applications\n"
 msgstr ""
 
-#: src/dialogs.c:2449
+#: src/dialogs.c:2517
 msgid "Try closing some other applications\n"
 msgstr ""
 
-#: src/dialogs.c:2460
+#: src/dialogs.c:2529
 msgid ""
 "Multitrack is set to 0 audio channels, but this layout has audio.\n"
 "You should adjust the audio settings from the Tools menu.\n"
 msgstr ""
 
-#: src/dialogs.c:2464
+#: src/dialogs.c:2534
 msgid ""
 "The current layout has audio, so audio channels may not be set to zero.\n"
 msgstr ""
 
-#: src/dialogs.c:2468
+#: src/dialogs.c:2539
 msgid ""
 "Multitrack audio preview is only available with the\n"
 "\"jack\" or \"pulse audio\" audio player.\n"
 "You can set this in Tools|Preferences|Playback."
 msgstr ""
 
-#: src/dialogs.c:2472
+#: src/dialogs.c:2545
 msgid ""
 "Errors were detected in the layout (which may be due to transferring from "
 "another system, or from an older version of LiVES).\n"
 "Should I try to repair the disk copy of the layout ?\n"
 msgstr ""
 
-#: src/dialogs.c:2476
+#: src/dialogs.c:2549
 msgid ""
 "LiVES was unable to load the layout.\n"
 "Sorry.\n"
 msgstr ""
 
-#: src/dialogs.c:2482
+#: src/dialogs.c:2555
 msgid ""
 "\n"
 "\n"
 "Audio rate must be greater than 0.\n"
 msgstr ""
 
-#: src/dialogs.c:2486
+#: src/dialogs.c:2559
 msgid ""
 "\n"
 "Event list will be very large\n"
@@ -4793,14 +4901,14 @@
 "Are you sure you wish to view it ?\n"
 msgstr ""
 
-#: src/dialogs.c:2491
+#: src/dialogs.c:2564
 msgid ""
 "\n"
 "\n"
 "You must install 'dvgrab' to use this function.\n"
 msgstr ""
 
-#: src/dialogs.c:2496
+#: src/dialogs.c:2570
 msgid ""
 "\n"
 "\n"
@@ -4809,25 +4917,25 @@
 "You may need to select one of these in Tools/Preferences/Playback.\n"
 msgstr ""
 
-#: src/dialogs.c:2500
+#: src/dialogs.c:2574
 msgid "Video playback plugin failed to initialise palette !\n"
 msgstr ""
 
-#: src/dialogs.c:2504
+#: src/dialogs.c:2579
 msgid "Decoder plugin failed to initialise palette !\n"
 msgstr ""
 
-#: src/dialogs.c:2509
+#: src/dialogs.c:2584
 msgid "Unable to set framerate of video plugin\n"
 msgstr ""
 
-#: src/dialogs.c:2514
+#: src/dialogs.c:2590
 msgid ""
 "After a crash, it is advisable to clean up the disk with\n"
 "File|Clean up disk space\n"
 msgstr ""
 
-#: src/dialogs.c:2526
+#: src/dialogs.c:2604
 #, c-format
 msgid ""
 "Stream frame size is too large for your network buffers.\n"
@@ -4836,33 +4944,33 @@
 "echo %d > /proc/sys/net/core/rmem_max\n"
 msgstr ""
 
-#: src/dialogs.c:2714
+#: src/dialogs.c:2800
 msgid "cancelled.\n"
 msgstr ""
 
-#: src/dialogs.c:2721
+#: src/dialogs.c:2805
 msgid "failed.\n"
 msgstr "fallou.\n"
 
-#: src/dialogs.c:2728
+#: src/dialogs.c:2810
 msgid "done.\n"
 msgstr "feito.\n"
 
-#: src/dialogs.c:2732
+#: src/dialogs.c:2814
 msgid "error in file. Failed.\n"
 msgstr ""
 
-#: src/dialogs.c:2766 src/dialogs.c:2815 src/dialogs.c:2839
+#: src/dialogs.c:2848 src/dialogs.c:2897 src/dialogs.c:2921
 #, c-format
 msgid "Additional info: %s\n"
 msgstr ""
 
-#: src/dialogs.c:2769
+#: src/dialogs.c:2851
 #, c-format
 msgid "The error value was %d%s\n"
 msgstr ""
 
-#: src/dialogs.c:2772
+#: src/dialogs.c:2854
 #, c-format
 msgid ""
 "\n"
@@ -4872,7 +4980,7 @@
 "%s%s%s"
 msgstr ""
 
-#: src/dialogs.c:2818
+#: src/dialogs.c:2900
 #, c-format
 msgid ""
 "\n"
@@ -4882,7 +4990,7 @@
 "%s"
 msgstr ""
 
-#: src/dialogs.c:2842
+#: src/dialogs.c:2924
 #, c-format
 msgid ""
 "\n"
@@ -4892,7 +5000,7 @@
 "%s"
 msgstr ""
 
-#: src/dialogs.c:2886
+#: src/dialogs.c:2968
 #, c-format
 msgid ""
 "\n"
@@ -4901,7 +5009,7 @@
 "Please check for possible error causes.\n"
 msgstr ""
 
-#: src/dialogs.c:2890
+#: src/dialogs.c:2971
 #, c-format
 msgid ""
 "\n"
@@ -4911,7 +5019,7 @@
 "%s.\n"
 msgstr ""
 
-#: src/dialogs.c:2921
+#: src/dialogs.c:3002
 #, c-format
 msgid ""
 "\n"
@@ -4920,7 +5028,7 @@
 "Please check for possible error causes.\n"
 msgstr ""
 
-#: src/dialogs.c:2925
+#: src/dialogs.c:3005
 #, c-format
 msgid ""
 "\n"
@@ -4930,12 +5038,12 @@
 "%s.\n"
 msgstr ""
 
-#: src/dialogs.c:2993
+#: src/dialogs.c:3073
 #, c-format
 msgid "Value for \"%s\" could not be read."
 msgstr ""
 
-#: src/dialogs.c:3011
+#: src/dialogs.c:3091
 #, c-format
 msgid ""
 "\n"
@@ -4944,7 +5052,7 @@
 "Please check your system for errors.\n"
 msgstr ""
 
-#: src/dialogs.c:3020
+#: src/dialogs.c:3100
 #, c-format
 msgid ""
 "\n"
@@ -4953,7 +5061,7 @@
 "Please check the file permissions and try again."
 msgstr ""
 
-#: src/dialogs.c:3027
+#: src/dialogs.c:3109
 #, c-format
 msgid ""
 "\n"
@@ -4962,7 +5070,7 @@
 "Please check the directory permissions and try again."
 msgstr ""
 
-#: src/dialogs.c:3034
+#: src/dialogs.c:3116
 #, c-format
 msgid ""
 "\n"
@@ -4970,14 +5078,14 @@
 "%s\n"
 msgstr ""
 
-#: src/dialogs.c:3041
+#: src/dialogs.c:3123
 msgid ""
 "\n"
 "Abort and exit immediately from LiVES\n"
 "Are you sure ?\n"
 msgstr ""
 
-#: src/dialogs.c:3047
+#: src/dialogs.c:3129
 #, c-format
 msgid ""
 "\n"
@@ -4985,13 +5093,13 @@
 "Please select another encoder from the list.\n"
 msgstr ""
 
-#: src/dialogs.c:3056
+#: src/dialogs.c:3139
 msgid ""
 "\n"
 "This card is already in use and cannot be opened multiple times.\n"
 msgstr ""
 
-#: src/dialogs.c:3061
+#: src/dialogs.c:3145
 #, c-format
 msgid ""
 "\n"
@@ -5001,27 +5109,27 @@
 "- Check if the device actually exists.\n"
 msgstr ""
 
-#: src/dialogs.c:3068
+#: src/dialogs.c:3153
 msgid ""
 "\n"
 "This file already has subtitles loaded.\n"
 "Do you wish to overwrite the existing subtitles ?\n"
 msgstr ""
 
-#: src/dialogs.c:3072
+#: src/dialogs.c:3157
 msgid ""
 "\n"
 "LiVES currently only supports subtitles of type .srt and .sub.\n"
 msgstr ""
 
-#: src/dialogs.c:3076
+#: src/dialogs.c:3161
 msgid ""
 "\n"
 "Erase all subtitles from this clip.\n"
 "Are you sure ?\n"
 msgstr ""
 
-#: src/dialogs.c:3082
+#: src/dialogs.c:3168
 #, c-format
 msgid ""
 "\n"
@@ -5030,14 +5138,14 @@
 "or OK to continue and save as type \"%s\"\n"
 msgstr ""
 
-#: src/dialogs.c:3089
+#: src/dialogs.c:3176
 msgid ""
 "\n"
 "Do you wish to move the current clip sets to the new directory ?\n"
 "(If unsure, click Yes)\n"
 msgstr ""
 
-#: src/dialogs.c:3093
+#: src/dialogs.c:3181
 #, c-format
 msgid ""
 "\n"
@@ -5048,19 +5156,19 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:3099
+#: src/dialogs.c:3188
 msgid ""
 "\n"
 "No video input devices could be found.\n"
 msgstr ""
 
-#: src/dialogs.c:3103
+#: src/dialogs.c:3192
 msgid ""
 "\n"
 "All video input devices are already in use.\n"
 msgstr ""
 
-#: src/dialogs.c:3107
+#: src/dialogs.c:3196
 msgid ""
 "\n"
 "\n"
@@ -5068,15 +5176,14 @@
 "DO NOT SHUT DOWN OR CLOSE LIVES !\n"
 msgstr ""
 
-#: src/dialogs.c:3127
+#: src/dialogs.c:3203
 #, c-format
 msgid ""
 "No clips were recovered for set (%s).\n"
 "Please check the spelling of the set name and try again.\n"
 msgstr ""
 
-#. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:3136
+#: src/dialogs.c:3214
 #, c-format
 msgid ""
 "\n"
@@ -5088,7 +5195,7 @@
 msgstr ""
 
 #. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:3144
+#: src/dialogs.c:3222
 #, c-format
 msgid ""
 "\n"
@@ -5097,34 +5204,34 @@
 "\n"
 msgstr ""
 
-#: src/dialogs.c:3150
+#: src/dialogs.c:3228
 msgid ""
 "\n"
 "You must have autolives.pl installed and in your path to use this toy.\n"
 "Consult your package distributor.\n"
 msgstr ""
 
-#: src/dialogs.c:3154
+#: src/dialogs.c:3232
 msgid ""
 "\n"
 "You must have a minimum of one clip loaded to use this toy.\n"
 msgstr ""
 
-#: src/dialogs.c:3158
+#: src/dialogs.c:3236
 msgid ""
 "\n"
 "LiVES lost its connection to jack and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:3162
+#: src/dialogs.c:3240
 msgid ""
 "\n"
 "LiVES lost its connection to pulseaudio and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:3175
+#: src/dialogs.c:3254
 #, c-format
 msgid ""
 "\n"
@@ -5133,544 +5240,543 @@
 "Do you wish to allow this (for this session only) ?\n"
 msgstr ""
 
-#: src/effects.c:60
+#: src/effects.c:61
 msgid "generator"
 msgstr ""
 
-#: src/effects.c:61
+#: src/effects.c:62
 msgid "Generators"
 msgstr ""
 
-#: src/effects.c:63
+#: src/effects.c:64
 msgid "audio generator"
 msgstr ""
 
-#: src/effects.c:64
+#: src/effects.c:65
 msgid "Audio Generators"
 msgstr ""
 
-#: src/effects.c:66
+#: src/effects.c:67
 msgid "audio/video generator"
 msgstr ""
 
-#: src/effects.c:67
+#: src/effects.c:68
 msgid "Audio/Video Generators"
 msgstr ""
 
-#: src/effects.c:69
+#: src/effects.c:70
 msgid "data generator"
 msgstr ""
 
-#: src/effects.c:70
+#: src/effects.c:71
 msgid "Data Generators"
 msgstr ""
 
-#: src/effects.c:72
+#: src/effects.c:73
 msgid "data visualiser"
 msgstr ""
 
-#: src/effects.c:73
+#: src/effects.c:74
 msgid "Data Visualisers"
 msgstr ""
 
-#: src/effects.c:75
+#: src/effects.c:76
 msgid "data processor"
 msgstr ""
 
-#: src/effects.c:76
+#: src/effects.c:77
 msgid "Data Processors"
 msgstr ""
 
-#: src/effects.c:78
+#: src/effects.c:79
 msgid "data source"
 msgstr ""
 
-#: src/effects.c:79
+#: src/effects.c:80
 msgid "Data Sources"
 msgstr ""
 
-#: src/effects.c:81
+#: src/effects.c:82
 msgid "transition"
 msgstr ""
 
-#: src/effects.c:82
+#: src/effects.c:83
 msgid "Transitions"
 msgstr "Transicións"
 
-#: src/effects.c:84
+#: src/effects.c:85
 msgid "effect"
 msgstr "efecto"
 
-#: src/effects.c:87 src/rfx-builder.c:187
+#: src/effects.c:88 src/rfx-builder.c:187
 msgid "utility"
 msgstr ""
 
-#: src/effects.c:88
+#: src/effects.c:89
 msgid "Utilities"
-msgstr "Utensilios"
+msgstr "Utilidades"
 
-#: src/effects.c:90
+#: src/effects.c:91
 msgid "compositor"
 msgstr ""
 
-#: src/effects.c:91
+#: src/effects.c:92
 msgid "Compositors"
 msgstr ""
 
-#: src/effects.c:93
+#: src/effects.c:94
 msgid "tap"
 msgstr ""
 
-#: src/effects.c:94
+#: src/effects.c:95
 msgid "Taps"
 msgstr ""
 
-#: src/effects.c:96
+#: src/effects.c:97
 msgid "splitter"
 msgstr "separador"
 
-#: src/effects.c:97
+#: src/effects.c:98
 msgid "Splitters"
 msgstr ""
 
-#: src/effects.c:99
+#: src/effects.c:100
 msgid "converter"
 msgstr ""
 
-#: src/effects.c:100
+#: src/effects.c:101
 msgid "Converters"
 msgstr ""
 
-#: src/effects.c:102
+#: src/effects.c:103
 msgid "analyser"
 msgstr ""
 
-#: src/effects.c:103
+#: src/effects.c:104
 msgid "Analysers"
 msgstr ""
 
-#: src/effects.c:108
+#: src/effects.c:109
 msgid "audio/video"
 msgstr ""
 
-#: src/effects.c:109
+#: src/effects.c:110
 msgid "Audio/Video Transitions"
 msgstr ""
 
-#: src/effects.c:111
+#: src/effects.c:112
 msgid "video only"
 msgstr ""
 
-#: src/effects.c:112
+#: src/effects.c:113
 msgid "Video only Transitions"
 msgstr ""
 
-#: src/effects.c:114 src/multitrack.c:10740
+#: src/effects.c:115 src/multitrack.c:10962
 msgid "audio only"
 msgstr ""
 
-#: src/effects.c:115
+#: src/effects.c:116
 msgid "Audio only Transitions"
 msgstr ""
 
-#: src/effects.c:117 src/effects.c:120 src/multitrack.c:18757
+#: src/effects.c:118 src/effects.c:121 src/multitrack.c:19097
 msgid "audio"
 msgstr "son"
 
-#: src/effects.c:118
+#: src/effects.c:119
 msgid "Audio Mixers"
 msgstr ""
 
-#: src/effects.c:121
+#: src/effects.c:122
 msgid "Audio Effects"
 msgstr ""
 
-#: src/effects.c:123
+#: src/effects.c:124
 msgid "video"
 msgstr ""
 
-#: src/effects.c:124
+#: src/effects.c:125
 msgid "Video Effects"
 msgstr ""
 
-#: src/effects.c:126
+#: src/effects.c:127
 msgid "audio volume controller"
 msgstr ""
 
-#: src/effects.c:127
+#: src/effects.c:128
 msgid "Audio Volume Controllers"
 msgstr ""
 
-#: src/effects.c:129
+#: src/effects.c:130
 msgid "video analyser"
 msgstr ""
 
-#: src/effects.c:130
+#: src/effects.c:131
 msgid "Video analysers"
 msgstr ""
 
-#: src/effects.c:132
+#: src/effects.c:133
 msgid "audio analyser"
 msgstr ""
 
-#: src/effects.c:133
+#: src/effects.c:134
 msgid "Audio Analysers"
 msgstr ""
 
-#: src/effects.c:137 src/plugins.c:2559 src/plugins.c:2573
+#: src/effects.c:138 src/plugins.c:2507 src/plugins.c:2521
 msgid "unknown"
 msgstr "descoñecido"
 
-#: src/effects.c:238
+#: src/effects.c:235
 #, c-format
 msgid "%s all frames..."
 msgstr ""
 
-#: src/effects.c:243
+#: src/effects.c:239
 #, c-format
 msgid "%s clipboard into frames %d to %d..."
 msgstr ""
 
-#: src/effects.c:250
+#: src/effects.c:245
 #, c-format
 msgid "%s to clipboard..."
 msgstr ""
 
-#: src/effects.c:254
+#: src/effects.c:248
 #, c-format
 msgid "%s to new clip..."
 msgstr ""
 
-#: src/effects.c:259
+#: src/effects.c:252
 #, c-format
 msgid "%s frames %d to %d..."
 msgstr ""
 
-#: src/effects.c:290
+#: src/effects.c:283
 #, c-format
 msgid "%s clipboard with selection"
 msgstr ""
 
-#: src/effects.c:295
+#: src/effects.c:287
 #, c-format
 msgid "%s to clipboard"
 msgstr ""
 
-#: src/effects.c:299
+#: src/effects.c:290
 #, c-format
 msgid "%s to new clip"
 msgstr ""
 
-#: src/effects.c:304
+#: src/effects.c:294
 #, c-format
 msgid "%s frames %d to %d"
 msgstr ""
 
-#: src/effects.c:456 src/effects.c:523
+#: src/effects.c:443 src/effects.c:507
 msgid ""
 "\n"
 "No frames were generated.\n"
 msgstr ""
 
-#: src/effects-weed.c:431
+#: src/effects-weed.c:452
 msgid "integer"
 msgstr ""
 
-#: src/effects-weed.c:432
+#: src/effects-weed.c:454
 msgid "int64"
 msgstr ""
 
-#: src/effects-weed.c:433
+#: src/effects-weed.c:456
 msgid "boolean"
 msgstr ""
 
-#: src/effects-weed.c:434
+#: src/effects-weed.c:458
 msgid "double"
 msgstr ""
 
-#: src/effects-weed.c:435
+#: src/effects-weed.c:460
 msgid "string"
 msgstr ""
 
-#: src/effects-weed.c:436
+#: src/effects-weed.c:462
 msgid "pointer"
 msgstr ""
 
-#: src/effects-weed.c:4591
+#: src/effects-weed.c:4581
 #, c-format
 msgid "Error: plugin %s has no weed_setup() function.\n"
 msgstr ""
 
-#: src/effects-weed.c:4606
+#: src/effects-weed.c:4595
 #, c-format
 msgid "No usable filters found in plugin %s\n"
 msgstr ""
 
-#: src/effects-weed.c:4680
+#: src/effects-weed.c:4668
 #, c-format
 msgid "Found duplicate plugin %s"
 msgstr ""
 
-#: src/effects-weed.c:4734
+#: src/effects-weed.c:4723
 #, c-format
 msgid ""
 "Info: Unable to load plugin %s\n"
 "Error was: %s\n"
 msgstr ""
 
-#: src/effects-weed.c:4737 src/effects-weed.c:5858
+#: src/effects-weed.c:4726 src/effects-weed.c:5847
 msgid "Some plugin directories"
 msgstr ""
 
 #. TRANSLATORS: example " - LADSPA plugins -"
-#: src/effects-weed.c:4812 src/rte_window.c:2105
+#: src/effects-weed.c:4801 src/rte_window.c:2107
 #, c-format
 msgid " - %s plugins -"
 msgstr ""
 
-#: src/effects-weed.c:5012
+#: src/effects-weed.c:4998
 #, c-format
 msgid "Successfully loaded %d Weed filters\n"
 msgstr ""
 
-#: src/effects-weed.c:5177
+#: src/effects-weed.c:5162
 #, c-format
 msgid "Invalid compound effect %s - has conflicting target_fps\n"
 msgstr ""
 
-#: src/effects-weed.c:5197
+#: src/effects-weed.c:5182
 #, c-format
 msgid "Invalid compound effect %s - has multiple transition parameters\n"
 msgstr ""
 
-#: src/effects-weed.c:5211
+#: src/effects-weed.c:5196
 #, c-format
 msgid "Invalid compound effect %s - has multiple master volume parameters\n"
 msgstr ""
 
-#: src/effects-weed.c:5346
+#: src/effects-weed.c:5329
 #, c-format
 msgid "Invalid compound effect %s - must have >1 sub filters\n"
 msgstr ""
 
-#: src/effects-weed.c:5366
+#: src/effects-weed.c:5349
 #, c-format
 msgid "Invalid effect %s found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5381
+#: src/effects-weed.c:5364
 #, c-format
 msgid "Invalid default found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5392
+#: src/effects-weed.c:5375
 #, c-format
 msgid "Invalid filter %d for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5406
+#: src/effects-weed.c:5389
 #, c-format
 msgid "Invalid param %d for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5433
+#: src/effects-weed.c:5416
 #, c-format
 msgid ""
 "Invalid number of values for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5467
+#: src/effects-weed.c:5450
 #, c-format
 msgid ""
 "Invalid non-boolean value for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5500
+#: src/effects-weed.c:5483
 #, c-format
 msgid "Invalid param link found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5511
+#: src/effects-weed.c:5494
 #, c-format
 msgid ""
 "Invalid out filter %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5529
+#: src/effects-weed.c:5513
 #, c-format
 msgid ""
 "Invalid out param %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5541
+#: src/effects-weed.c:5526
 #, c-format
 msgid ""
 "Invalid non-boolean value for autoscale found in compound effect %s, line "
 "%d\n"
 msgstr ""
 
-#: src/effects-weed.c:5552
+#: src/effects-weed.c:5537
 #, c-format
 msgid ""
 "Invalid in filter %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5566
+#: src/effects-weed.c:5552
 #, c-format
 msgid ""
 "Invalid in param %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5594
+#: src/effects-weed.c:5581
 #, c-format
 msgid "Invalid channel link found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5605
+#: src/effects-weed.c:5592
 #, c-format
 msgid ""
 "Invalid out filter %d for link channels found in compound effect %s, line "
 "%d\n"
 msgstr ""
 
-#: src/effects-weed.c:5623
+#: src/effects-weed.c:5611
 #, c-format
 msgid ""
 "Invalid out channel %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5633
+#: src/effects-weed.c:5622
 #, c-format
 msgid ""
 "Invalid in filter %d for link channels found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5651
+#: src/effects-weed.c:5641
 #, c-format
 msgid ""
 "Invalid in channel %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5687
+#: src/effects-weed.c:5678
 #, c-format
 msgid "Compound:%s"
 msgstr ""
 
-#: src/effects-weed.c:5758
+#: src/effects-weed.c:5749
 #, c-format
 msgid "Successfully loaded %d compound filters\n"
 msgstr ""
 
-#: src/effects-weed.c:6591
+#: src/effects-weed.c:6570
 #, c-format
 msgid "Effect %s cannot be used with this audio player.\n"
 msgstr ""
 
-#: src/effects-weed.c:6737
+#: src/effects-weed.c:6718
 #, c-format
 msgid "Failed to start instance %s, error code %d\n"
 msgstr ""
 
-#: src/effects-weed.c:6814
+#: src/effects-weed.c:6797
 #, c-format
 msgid "Unable to start generator %s\n"
 msgstr ""
 
-#: src/effects-weed.c:7621
+#: src/effects-weed.c:7607
 #, c-format
 msgid "Failed to start generator %s\n"
 msgstr ""
 
-#: src/effects-weed.c:7718
+#: src/effects-weed.c:7701
 #, c-format
 msgid "Failed to start generator %s, error %d\n"
 msgstr ""
 
-#: src/effects-weed.c:9012
+#: src/effects-weed.c:8993
 #, c-format
 msgid "%s [unstable] (%s)"
 msgstr ""
 
-#: src/effects-data.c:3278
+#: src/effects-data.c:3234
 #, c-format
 msgid "ACTIVATE (%s)"
 msgstr ""
 
-#: src/effects-data.c:3548
+#: src/effects-data.c:3501
 msgid "ACTIVATE"
 msgstr ""
 
-#: src/effects-data.c:3876
+#: src/effects-data.c:3829
 #, c-format
 msgid "Key slot %d"
 msgstr ""
 
-#: src/effects-data.c:3998
+#: src/effects-data.c:3951
 msgid "Autoscale"
 msgstr ""
 
-#: src/effects-data.c:4089
+#: src/effects-data.c:4042
 msgid "Add another connection for this output parameter"
 msgstr ""
 
-#: src/effects-data.c:4102 src/effects-data.c:4151
-#, fuzzy
+#: src/effects-data.c:4055 src/effects-data.c:4104
 msgid "Delete this connection"
-msgstr "_Borrar selección"
+msgstr ""
 
-#: src/effects-data.c:4138
+#: src/effects-data.c:4091
 msgid "Add another connection for this output channel"
 msgstr ""
 
-#: src/effects-data.c:4223
+#: src/effects-data.c:4176
 msgid "Connected to -->"
 msgstr ""
 
-#: src/effects-data.c:4243
+#: src/effects-data.c:4196
 #, c-format
 msgid "%s - Alpha Channel Connections"
 msgstr ""
 
-#: src/effects-data.c:4316
+#: src/effects-data.c:4269
 #, c-format
 msgid "%s - Parameter Data Connections"
 msgstr ""
 
-#: src/effects-data.c:4336
+#: src/effects-data.c:4289
 msgid "Autoscale All"
 msgstr ""
 
-#: src/effects-data.c:4361 src/effects-data.c:4890
+#: src/effects-data.c:4314 src/effects-data.c:4841
 msgid "ACTIVATED"
 msgstr ""
 
-#: src/effects-data.c:4774
+#: src/effects-data.c:4726
 msgid "LiVES: - Parameter and Alpha Channel Connections"
 msgstr ""
 
-#: src/effects-data.c:4785
+#: src/effects-data.c:4736
 msgid "Auto Connect Channels"
 msgstr ""
 
-#: src/effects-data.c:4797
+#: src/effects-data.c:4748
 msgid "Auto Connect Parameters"
 msgstr ""
 
-#: src/effects-data.c:4807
+#: src/effects-data.c:4758
 msgid "Disconnect All"
 msgstr ""
 
-#: src/effects-data.c:4875
+#: src/effects-data.c:4826
 #, c-format
 msgid "Input channel is already connected from (%d,%d) %s"
 msgstr ""
 
-#: src/effects-data.c:4891
+#: src/effects-data.c:4842
 #, c-format
 msgid "Input parameter is already connected from (%d,%d) %s"
 msgstr ""
 
-#: src/effects-data.c:4899
+#: src/effects-data.c:4851
 msgid "Input and output parameters are not compatible"
 msgstr ""
 
@@ -5682,43 +5788,43 @@
 msgid "_Reset Values"
 msgstr ""
 
-#: src/framedraw.c:267
+#: src/framedraw.c:265
 msgid "_Frame"
 msgstr ""
 
-#: src/paramspecial.c:266
+#: src/paramspecial.c:259
 msgid "Maintain _Aspect Ratio"
 msgstr ""
 
-#: src/paramspecial.c:267
+#: src/paramspecial.c:260
 msgid "Maintain aspect ratio of original frame"
 msgstr ""
 
-#: src/paramspecial.c:341
+#: src/paramspecial.c:335
 msgid "Display Password"
 msgstr ""
 
-#: src/paramwindow.c:450
+#: src/paramwindow.c:447
 msgid "Transition _In"
 msgstr ""
 
-#: src/paramwindow.c:452
+#: src/paramwindow.c:449
 msgid "Click to set the transition parameter to show only the front frame"
 msgstr ""
 
-#: src/paramwindow.c:474
+#: src/paramwindow.c:472
 msgid "Crossfade audio"
 msgstr ""
 
-#: src/paramwindow.c:475
+#: src/paramwindow.c:473
 msgid "Check the box to make audio transition with the video"
 msgstr ""
 
-#: src/paramwindow.c:493
+#: src/paramwindow.c:492
 msgid "Transition _Out"
 msgstr ""
 
-#: src/paramwindow.c:495
+#: src/paramwindow.c:494
 msgid "Click to set the transition parameter to show only the rear frame"
 msgstr ""
 
@@ -5731,23 +5837,23 @@
 msgid "%s : size"
 msgstr ""
 
-#: src/paramwindow.c:598
+#: src/paramwindow.c:597
 msgid "New size (pixels)"
 msgstr ""
 
-#: src/paramwindow.c:617 src/plugins.c:997
+#: src/paramwindow.c:616 src/plugins.c:973
 msgid "_Width"
 msgstr "_Largura"
 
-#: src/paramwindow.c:636 src/plugins.c:1003
+#: src/paramwindow.c:635 src/plugins.c:979
 msgid "_Height"
 msgstr "_Altura"
 
-#: src/paramwindow.c:684
+#: src/paramwindow.c:683
 msgid "Generate to _Clipboard"
 msgstr ""
 
-#: src/paramwindow.c:686
+#: src/paramwindow.c:685
 msgid "Generate frames to the clipboard"
 msgstr ""
 
@@ -5759,7 +5865,7 @@
 msgid "Generate frames to a new clip"
 msgstr ""
 
-#: src/paramwindow.c:822
+#: src/paramwindow.c:824
 #, c-format
 msgid ""
 "\n"
@@ -5767,71 +5873,71 @@
 "\n"
 msgstr ""
 
-#: src/paramwindow.c:920 src/paramwindow.c:930
+#: src/paramwindow.c:934 src/paramwindow.c:942
 msgid "Set as default"
 msgstr ""
 
-#: src/paramwindow.c:922 src/paramwindow.c:938
+#: src/paramwindow.c:936 src/paramwindow.c:950
 msgid "Reset"
 msgstr ""
 
-#: src/paramwindow.c:932 src/rte_window.c:2401 src/omc-learn.c:1357
+#: src/paramwindow.c:944 src/rte_window.c:2394 src/omc-learn.c:1347
 msgid "Close _window"
 msgstr ""
 
-#: src/paramwindow.c:1337
+#: src/paramwindow.c:1340
 msgid "No parameters"
 msgstr ""
 
-#: src/paramwindow.c:1419
+#: src/paramwindow.c:1424
 msgid "Invalid parameter"
 msgstr "O parámetro non é válido"
 
-#: src/paramwindow.c:1611
+#: src/paramwindow.c:1610
 msgid "LiVES: - Select Colour"
 msgstr ""
 
-#: src/paramwindow.c:1616
+#: src/paramwindow.c:1615
 msgid "Click to set the colour"
 msgstr ""
 
-#: src/paramwindow.c:1628
+#: src/paramwindow.c:1626
 msgid "_Red"
 msgstr ""
 
-#: src/paramwindow.c:1629
+#: src/paramwindow.c:1627
 msgid "The red value (0 - 255)"
 msgstr ""
 
-#: src/paramwindow.c:1632
+#: src/paramwindow.c:1630
 msgid "_Green"
 msgstr ""
 
-#: src/paramwindow.c:1633
+#: src/paramwindow.c:1631
 msgid "The green value (0 - 255)"
 msgstr ""
 
-#: src/paramwindow.c:1636
+#: src/paramwindow.c:1634
 msgid "_Blue"
 msgstr ""
 
-#: src/paramwindow.c:1637
+#: src/paramwindow.c:1635
 msgid "The blue value (0 - 255)"
 msgstr ""
 
-#: src/plugins.c:85
+#: src/plugins.c:86
 #, c-format
 msgid ""
 "\n"
 "Plugin error: %s failed with code %d"
 msgstr ""
 
-#: src/plugins.c:87
+#: src/plugins.c:88
 #, c-format
 msgid " : message was %s\n"
 msgstr ""
 
-#: src/plugins.c:387
+#: src/plugins.c:375
 #, c-format
 msgid ""
 "\n"
@@ -5841,17 +5947,17 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/plugins.c:397
+#: src/plugins.c:385
 #, c-format
 msgid "Updating video playback plugin defaults in %s\n"
 msgstr ""
 
-#: src/plugins.c:452
+#: src/plugins.c:444
 #, c-format
 msgid "Loading video playback plugin defaults from %s..."
 msgstr ""
 
-#: src/plugins.c:515
+#: src/plugins.c:505
 #, c-format
 msgid ""
 "\n"
@@ -5861,32 +5967,32 @@
 "\n"
 msgstr ""
 
-#: src/plugins.c:855
+#: src/plugins.c:836
 #, c-format
 msgid "Saving playback plugin defaults to %s..."
 msgstr ""
 
-#: src/plugins.c:962
+#: src/plugins.c:939
 msgid "_FPS"
 msgstr "_FPS"
 
-#: src/plugins.c:963
+#: src/plugins.c:940
 msgid "Fixed framerate for plugin.\n"
 msgstr ""
 
-#: src/plugins.c:1032
+#: src/plugins.c:1008
 msgid "_Colourspace"
 msgstr ""
 
-#: src/plugins.c:1033
+#: src/plugins.c:1009
 msgid "Colourspace input to the plugin.\n"
 msgstr ""
 
-#: src/plugins.c:1089
+#: src/plugins.c:1065
 msgid "Save settings to an alternate file.\n"
 msgstr ""
 
-#: src/plugins.c:1206
+#: src/plugins.c:1182
 #, c-format
 msgid ""
 "\n"
@@ -5895,7 +6001,7 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/plugins.c:1252
+#: src/plugins.c:1228
 #, c-format
 msgid ""
 "\n"
@@ -5905,38 +6011,38 @@
 "Unable to use it.\n"
 msgstr ""
 
-#: src/plugins.c:1265
+#: src/plugins.c:1241
 #, c-format
 msgid ""
 "Video playback plugin failed to initialise.\n"
 "Error was: %s\n"
 msgstr ""
 
-#: src/plugins.c:1461
+#: src/plugins.c:1428
 msgid ""
 "\n"
 "Warning ! Video playback plugin will not send key presses. Keyboard may be "
 "disabled during plugin use !\n"
 msgstr ""
 
-#: src/plugins.c:1465
+#: src/plugins.c:1433
 #, c-format
 msgid ""
 "*** Using %s plugin for fs playback, agreed to use palette type %d ( %s ). "
 "***\n"
 msgstr ""
 
-#: src/plugins.c:1571
+#: src/plugins.c:1537
 #, c-format
 msgid "Audio stream unable to use preferred format '%s'\n"
 msgstr ""
 
-#: src/plugins.c:1579
+#: src/plugins.c:1543
 #, c-format
 msgid "Using format '%s' instead.\n"
 msgstr ""
 
-#: src/plugins.c:1616
+#: src/plugins.c:1579
 #, c-format
 msgid ""
 "LiVES was unable to find its encoder plugins. Please make sure you have the "
@@ -5945,7 +6051,7 @@
 "or change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/plugins.c:1624
+#: src/plugins.c:1589
 #, c-format
 msgid ""
 "LiVES did not receive a response from the encoder plugin called '%s'.\n"
@@ -5954,11 +6060,11 @@
 "or switch to another plugin using Tools|Preferences|Encoding\n"
 msgstr ""
 
-#: src/plugins.c:2032
+#: src/plugins.c:1987
 msgid "Unable to resize, please install imageMagick\n"
 msgstr ""
 
-#: src/plugins.c:2231
+#: src/plugins.c:2183
 #, c-format
 msgid ""
 "\n"
@@ -5966,12 +6072,12 @@
 "No decoders found in %s !\n"
 msgstr ""
 
-#: src/plugins.c:2415
-#, fuzzy, c-format
+#: src/plugins.c:2369
+#, c-format
 msgid " using %s"
-msgstr "Abrindo %s"
+msgstr ""
 
-#: src/plugins.c:2499
+#: src/plugins.c:2451
 #, c-format
 msgid ""
 "\n"
@@ -5980,7 +6086,7 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/plugins.c:2522
+#: src/plugins.c:2472
 #, c-format
 msgid ""
 "\n"
@@ -5990,24 +6096,24 @@
 "Unable to use it.\n"
 msgstr ""
 
-#: src/plugins.c:2564
+#: src/plugins.c:2512
 msgid "/unknown"
 msgstr ""
 
-#: src/plugins.c:2651
+#: src/plugins.c:2598
 msgid "LiVES: - Decoder Plugins"
 msgstr ""
 
-#: src/plugins.c:2669
+#: src/plugins.c:2616
 msgid "Enabled Video Decoders (uncheck to disable)"
 msgstr ""
 
-#: src/plugins.c:2726
+#: src/plugins.c:2672
 #, c-format
 msgid "Failed to load %s, transitions may not resize.\n"
 msgstr ""
 
-#: src/plugins.c:3854
+#: src/plugins.c:3797
 #, c-format
 msgid "%s advanced settings"
 msgstr ""
@@ -6016,15 +6122,15 @@
 msgid "LiVES: - New Test RFX"
 msgstr ""
 
-#: src/rfx-builder.c:136
+#: src/rfx-builder.c:135
 msgid "LiVES: - Edit Test RFX"
 msgstr ""
 
-#: src/rfx-builder.c:166
+#: src/rfx-builder.c:165
 msgid "Type:"
 msgstr "Tipo:"
 
-#: src/rfx-builder.c:184
+#: src/rfx-builder.c:183
 msgid "tool"
 msgstr ""
 
@@ -6036,130 +6142,130 @@
 msgid "The name of the plugin. No spaces allowed."
 msgstr ""
 
-#: src/rfx-builder.c:201
+#: src/rfx-builder.c:202
 msgid "Version:       "
 msgstr ""
 
-#: src/rfx-builder.c:203
+#: src/rfx-builder.c:204
 msgid "The script version."
 msgstr ""
 
-#: src/rfx-builder.c:210
+#: src/rfx-builder.c:212
 msgid "    Author:       "
 msgstr ""
 
-#: src/rfx-builder.c:211
+#: src/rfx-builder.c:213
 msgid "The script author."
 msgstr ""
 
-#: src/rfx-builder.c:217
+#: src/rfx-builder.c:220
 msgid "    URL (optional):       "
 msgstr ""
 
-#: src/rfx-builder.c:218
+#: src/rfx-builder.c:221
 msgid "URL for the plugin maintainer."
 msgstr ""
 
-#: src/rfx-builder.c:226
+#: src/rfx-builder.c:230
 msgid "Menu text:    "
 msgstr ""
 
-#: src/rfx-builder.c:227
+#: src/rfx-builder.c:231
 msgid "The text to show in the menu."
 msgstr ""
 
-#: src/rfx-builder.c:239
+#: src/rfx-builder.c:244
 msgid "Action description:        "
 msgstr ""
 
-#: src/rfx-builder.c:241
+#: src/rfx-builder.c:246
 msgid "Describe what the plugin is doing. E.g. \"Edge detecting\""
 msgstr ""
 
-#: src/rfx-builder.c:246
+#: src/rfx-builder.c:251
 msgid "Minimum frames:"
 msgstr ""
 
-#: src/rfx-builder.c:249
+#: src/rfx-builder.c:254
 msgid ""
 "Minimum number of frames this effect/tool can be applied to. Normally 1."
 msgstr ""
 
-#: src/rfx-builder.c:260
+#: src/rfx-builder.c:265
 msgid "_Requirements..."
 msgstr ""
 
-#: src/rfx-builder.c:263
+#: src/rfx-builder.c:268
 msgid "Enter any binaries required by the plugin."
 msgstr ""
 
-#: src/rfx-builder.c:267
+#: src/rfx-builder.c:272
 msgid "_Properties..."
 msgstr "_Propiedades..."
 
-#: src/rfx-builder.c:270
+#: src/rfx-builder.c:275
 msgid "Set properties for the plugin. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:274
+#: src/rfx-builder.c:279
 msgid "_Parameters..."
 msgstr ""
 
-#: src/rfx-builder.c:277
+#: src/rfx-builder.c:282
 msgid "Set up parameters used in pre/loop/post/trigger code. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:281
+#: src/rfx-builder.c:286
 msgid "Parameter _Window Hints..."
 msgstr ""
 
-#: src/rfx-builder.c:284
+#: src/rfx-builder.c:289
 msgid "Set hints about how to lay out the parameter window. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:290
+#: src/rfx-builder.c:295
 msgid "_Language code:"
 msgstr ""
 
-#: src/rfx-builder.c:291
+#: src/rfx-builder.c:296
 msgid "Language for pre/loop/post/triggers. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:300
+#: src/rfx-builder.c:305
 msgid "_Pre loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:303
+#: src/rfx-builder.c:308
 msgid "Code to be executed before the loop. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:307
+#: src/rfx-builder.c:312
 msgid "_Loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:310
+#: src/rfx-builder.c:315
 msgid "Loop code to be applied to each frame."
 msgstr ""
 
-#: src/rfx-builder.c:314
+#: src/rfx-builder.c:319
 msgid "_Post loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:317
+#: src/rfx-builder.c:322
 msgid "Code to be executed after the loop. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:321
+#: src/rfx-builder.c:326
 msgid "_Trigger code..."
 msgstr ""
 
-#: src/rfx-builder.c:324
+#: src/rfx-builder.c:329
 msgid ""
 "Set trigger code for when the parameter window is shown, or when a parameter "
 "is changed. Optional (except for Utilities)."
 msgstr ""
 
-#: src/rfx-builder.c:421
+#: src/rfx-builder.c:426
 #, c-format
 msgid ""
 "\n"
@@ -6169,55 +6275,55 @@
 "%s\n"
 msgstr ""
 
-#: src/rfx-builder.c:544
+#: src/rfx-builder.c:541
 msgid "LiVES: - RFX Requirements"
 msgstr ""
 
-#: src/rfx-builder.c:548
+#: src/rfx-builder.c:544
 msgid "LiVES: - RFX Parameters"
 msgstr ""
 
-#: src/rfx-builder.c:552
+#: src/rfx-builder.c:547
 msgid "LiVES: - RFX Parameter Window Hints"
 msgstr ""
 
-#: src/rfx-builder.c:556
+#: src/rfx-builder.c:550
 msgid "LiVES: - RFX Triggers"
 msgstr ""
 
-#: src/rfx-builder.c:622
+#: src/rfx-builder.c:613
 msgid "_New Entry"
 msgstr ""
 
-#: src/rfx-builder.c:625
+#: src/rfx-builder.c:616
 msgid "_Edit Entry"
 msgstr ""
 
-#: src/rfx-builder.c:628
+#: src/rfx-builder.c:619
 msgid "_Remove Entry"
 msgstr ""
 
-#: src/rfx-builder.c:632
+#: src/rfx-builder.c:623
 msgid "Move _Up"
 msgstr "Mover _arriba"
 
-#: src/rfx-builder.c:635
+#: src/rfx-builder.c:626
 msgid "Move _Down"
 msgstr "Mover _abaixo"
 
-#: src/rfx-builder.c:1004
+#: src/rfx-builder.c:984
 msgid "LiVES: - RFX Properties"
 msgstr ""
 
-#: src/rfx-builder.c:1013
+#: src/rfx-builder.c:993
 msgid "_Slow (hint to GUI)"
 msgstr ""
 
-#: src/rfx-builder.c:1024
+#: src/rfx-builder.c:1004
 msgid "_Batch mode generator"
 msgstr ""
 
-#: src/rfx-builder.c:1831
+#: src/rfx-builder.c:1790
 msgid ""
 "\n"
 "\n"
@@ -6226,7 +6332,7 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:1875
+#: src/rfx-builder.c:1834
 msgid ""
 "\n"
 "\n"
@@ -6234,219 +6340,219 @@
 "Please check the trigger code.\n"
 msgstr ""
 
-#: src/rfx-builder.c:1994
+#: src/rfx-builder.c:1950
 msgid "LiVES: - New RFX Parameter"
 msgstr ""
 
-#: src/rfx-builder.c:1997
+#: src/rfx-builder.c:1952
 msgid "LiVES: - Edit RFX Parameter"
 msgstr ""
 
-#: src/rfx-builder.c:2013
+#: src/rfx-builder.c:1968
 msgid "_Name:    "
 msgstr ""
 
-#: src/rfx-builder.c:2016
+#: src/rfx-builder.c:1971
 msgid "Name of the parameter, must be unique in the plugin."
 msgstr ""
 
-#: src/rfx-builder.c:2025
+#: src/rfx-builder.c:1981
 msgid "_Label:    "
 msgstr ""
 
-#: src/rfx-builder.c:2028
+#: src/rfx-builder.c:1984
 msgid ""
 "Label to be shown by the parameter. An underscore represents mnemonic "
 "accelerator."
 msgstr ""
 
-#: src/rfx-builder.c:2039
+#: src/rfx-builder.c:1996
 msgid "_Type:         "
 msgstr ""
 
-#: src/rfx-builder.c:2040
+#: src/rfx-builder.c:1997
 msgid "Parameter type (select from list)."
 msgstr ""
 
-#: src/rfx-builder.c:2073
+#: src/rfx-builder.c:2029
 msgid "Decimal _places: "
 msgstr ""
 
-#: src/rfx-builder.c:2082 src/rfx-builder.c:2477 src/rfx-builder.c:2495
+#: src/rfx-builder.c:2038 src/rfx-builder.c:2430 src/rfx-builder.c:2447
 msgid "_Default value:    "
 msgstr ""
 
-#: src/rfx-builder.c:2098
+#: src/rfx-builder.c:2054
 msgid "_Default: "
 msgstr ""
 
-#: src/rfx-builder.c:2132
+#: src/rfx-builder.c:2087
 msgid "Button _Group: "
 msgstr ""
 
-#: src/rfx-builder.c:2134
+#: src/rfx-builder.c:2089
 msgid "A non-zero value can be used to group radio buttons."
 msgstr ""
 
-#: src/rfx-builder.c:2142 src/rfx-builder.c:2478
+#: src/rfx-builder.c:2097 src/rfx-builder.c:2431
 msgid "_Minimum value: "
 msgstr ""
 
-#: src/rfx-builder.c:2148 src/rfx-builder.c:2479
+#: src/rfx-builder.c:2103 src/rfx-builder.c:2432
 msgid "Ma_ximum value: "
 msgstr ""
 
-#: src/rfx-builder.c:2157
+#: src/rfx-builder.c:2113
 msgid "     _Step size:   "
 msgstr ""
 
-#: src/rfx-builder.c:2160
+#: src/rfx-builder.c:2117
 msgid ""
 "How much the parameter is adjusted when the spinbutton arrows are pressed."
 msgstr ""
 
-#: src/rfx-builder.c:2171
+#: src/rfx-builder.c:2129
 msgid "_Wrap value"
 msgstr ""
 
-#: src/rfx-builder.c:2172
+#: src/rfx-builder.c:2131
 msgid "Whether the value wraps max->min and min->max."
 msgstr ""
 
-#: src/rfx-builder.c:2470
+#: src/rfx-builder.c:2424
 msgid "Set _values"
 msgstr ""
 
-#: src/rfx-builder.c:2512
+#: src/rfx-builder.c:2463
 msgid "Default _Red:  "
 msgstr ""
 
-#: src/rfx-builder.c:2513
+#: src/rfx-builder.c:2464
 msgid "Default _Green:"
 msgstr ""
 
-#: src/rfx-builder.c:2514
+#: src/rfx-builder.c:2465
 msgid "Default _Blue: "
 msgstr ""
 
-#: src/rfx-builder.c:2538
+#: src/rfx-builder.c:2488
 msgid "Set _default"
 msgstr ""
 
-#: src/rfx-builder.c:2540
+#: src/rfx-builder.c:2490
 msgid "Default value:  "
 msgstr ""
 
-#: src/rfx-builder.c:2541
+#: src/rfx-builder.c:2491
 msgid "Maximum length (chars): "
 msgstr ""
 
-#: src/rfx-builder.c:2576
+#: src/rfx-builder.c:2526
 msgid "LiVES: - New RFX Parameter Window Hint"
 msgstr ""
 
-#: src/rfx-builder.c:2579
+#: src/rfx-builder.c:2528
 msgid "LiVES: - Edit RFX Parameter Window Hint"
 msgstr ""
 
-#: src/rfx-builder.c:2622
+#: src/rfx-builder.c:2569
 msgid "_Keyword:         "
 msgstr ""
 
-#: src/rfx-builder.c:2639
+#: src/rfx-builder.c:2586
 msgid "Special _Type:         "
 msgstr ""
 
-#: src/rfx-builder.c:2656
+#: src/rfx-builder.c:2602
 msgid "Special _Subtype:         "
 msgstr ""
 
-#: src/rfx-builder.c:2667 src/rfx-builder.c:2706
+#: src/rfx-builder.c:2613 src/rfx-builder.c:2651
 msgid "Row:    "
 msgstr ""
 
-#: src/rfx-builder.c:2732
+#: src/rfx-builder.c:2676
 #, c-format
 msgid "Linked parameters (%d):    "
 msgstr ""
 
-#: src/rfx-builder.c:2749
+#: src/rfx-builder.c:2693
 msgid "Linked parameters (4):    "
 msgstr ""
 
-#: src/rfx-builder.c:2752
+#: src/rfx-builder.c:2695
 msgid "Linked parameters (2):    "
 msgstr ""
 
-#: src/rfx-builder.c:2777
+#: src/rfx-builder.c:2720
 msgid "LiVES: - New RFX Trigger"
 msgstr ""
 
-#: src/rfx-builder.c:2780
+#: src/rfx-builder.c:2722
 msgid "LiVES: - Edit RFX Trigger"
 msgstr ""
 
-#: src/rfx-builder.c:2808
+#: src/rfx-builder.c:2750
 msgid "When:         "
 msgstr ""
 
-#: src/rfx-builder.c:2904
+#: src/rfx-builder.c:2846
 msgid "LiVES: - Pre Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:2911
+#: src/rfx-builder.c:2853
 msgid "LiVES: - Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:2918
+#: src/rfx-builder.c:2860
 msgid "LiVES: - Post Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:2931
+#: src/rfx-builder.c:2873
 #, c-format
 msgid "LiVES: - Default text (max length %d)"
 msgstr ""
 
-#: src/rfx-builder.c:2944
+#: src/rfx-builder.c:2885
 msgid "LiVES: - Enter values, one per line"
 msgstr ""
 
-#: src/rfx-builder.c:3055
+#: src/rfx-builder.c:2996
 msgid ""
 "\n"
 "\n"
 "Name must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3060
+#: src/rfx-builder.c:3001
 msgid ""
 "\n"
 "\n"
 "Name must not contain spaces.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3065
+#: src/rfx-builder.c:3006
 msgid ""
 "\n"
 "\n"
 "Menu text must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3071
+#: src/rfx-builder.c:3012
 msgid ""
 "\n"
 "\n"
 "Action description must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3076
+#: src/rfx-builder.c:3017
 msgid ""
 "\n"
 "\n"
 "Author must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3085 src/rfx-builder.c:4339
+#: src/rfx-builder.c:3026 src/rfx-builder.c:4253
 msgid ""
 "\n"
 "\n"
@@ -6454,28 +6560,28 @@
 "Name must be unique.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3092
+#: src/rfx-builder.c:3033
 msgid ""
 "\n"
 "\n"
 "Loop code should not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3098
+#: src/rfx-builder.c:3039
 msgid ""
 "\n"
 "\n"
 "Trigger code should not be blank for a utility.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3111
+#: src/rfx-builder.c:3052
 msgid ""
 "\n"
 "\n"
 "Parameter name must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3117
+#: src/rfx-builder.c:3058
 msgid ""
 "\n"
 "\n"
@@ -6484,41 +6590,41 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:3171
+#: src/rfx-builder.c:3111
 #, c-format
 msgid "Writing script file %s..."
 msgstr ""
 
-#: src/rfx-builder.c:3477
+#: src/rfx-builder.c:3411
 msgid "No <define> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3484 src/rfx-builder.c:3493
+#: src/rfx-builder.c:3418 src/rfx-builder.c:3427
 msgid "Bad script version.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3505
+#: src/rfx-builder.c:3439
 msgid "No <name> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3513
+#: src/rfx-builder.c:3447
 msgid "No <version> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3522
+#: src/rfx-builder.c:3456
 msgid "No <author> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3536
+#: src/rfx-builder.c:3470
 msgid "No <description> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3540
+#: src/rfx-builder.c:3474
 #, c-format
 msgid "Bad description. (%s)\n"
 msgstr ""
 
-#: src/rfx-builder.c:3702
+#: src/rfx-builder.c:3627
 #, c-format
 msgid ""
 "\n"
@@ -6528,27 +6634,27 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:3859
+#: src/rfx-builder.c:3780
 msgid "Rebuilding all RFX scripts...builtin..."
 msgstr ""
 
-#: src/rfx-builder.c:3860
+#: src/rfx-builder.c:3781
 msgid "Rebuilding scripts"
 msgstr ""
 
-#: src/rfx-builder.c:3868
+#: src/rfx-builder.c:3789
 msgid "custom..."
 msgstr ""
 
-#: src/rfx-builder.c:3872
+#: src/rfx-builder.c:3793
 msgid "test..."
 msgstr ""
 
-#: src/rfx-builder.c:3878
+#: src/rfx-builder.c:3799
 msgid "rebuilding dynamic menu entries..."
 msgstr ""
 
-#: src/rfx-builder.c:3905 src/rfx-builder.c:3912
+#: src/rfx-builder.c:3826 src/rfx-builder.c:3834
 #, c-format
 msgid ""
 "\n"
@@ -6557,7 +6663,7 @@
 "Please check this program is in your path and executable.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3951
+#: src/rfx-builder.c:3874
 #, c-format
 msgid ""
 "\n"
@@ -6567,12 +6673,12 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:3960
+#: src/rfx-builder.c:3884
 #, c-format
 msgid "Deleting rfx script %s..."
 msgstr ""
 
-#: src/rfx-builder.c:3980
+#: src/rfx-builder.c:3902
 #, c-format
 msgid ""
 "\n"
@@ -6582,7 +6688,7 @@
 "Error code was %d\n"
 msgstr ""
 
-#: src/rfx-builder.c:4016
+#: src/rfx-builder.c:3938
 #, c-format
 msgid ""
 "\n"
@@ -6592,12 +6698,12 @@
 "Please delete it first, or rename the test script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4027
+#: src/rfx-builder.c:3950
 #, c-format
 msgid "Promoting rfx test plugin %s to custom..."
 msgstr ""
 
-#: src/rfx-builder.c:4044
+#: src/rfx-builder.c:3965
 #, c-format
 msgid ""
 "\n"
@@ -6608,20 +6714,20 @@
 "Return code was %d (%s)\n"
 msgstr ""
 
-#: src/rfx-builder.c:4070
+#: src/rfx-builder.c:3990
 msgid "LiVES: - Export Script to..."
 msgstr ""
 
-#: src/rfx-builder.c:4077 src/rfx-builder.c:4156
+#: src/rfx-builder.c:3997 src/rfx-builder.c:4074
 #, c-format
 msgid "Copying %s to %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4105
+#: src/rfx-builder.c:4024
 msgid "LiVES: Import Script from..."
 msgstr ""
 
-#: src/rfx-builder.c:4148
+#: src/rfx-builder.c:4067
 #, c-format
 msgid ""
 "\n"
@@ -6631,43 +6737,43 @@
 "Please delete it first, or rename the import script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4249
+#: src/rfx-builder.c:4166
 msgid "LiVES: - Copy RFX Script"
 msgstr ""
 
-#: src/rfx-builder.c:4251
+#: src/rfx-builder.c:4168
 msgid "_From type:    "
 msgstr ""
 
-#: src/rfx-builder.c:4258
+#: src/rfx-builder.c:4175
 msgid "   Script:    "
 msgstr ""
 
-#: src/rfx-builder.c:4267
+#: src/rfx-builder.c:4183
 msgid "LiVES: - Rename test RFX Script"
 msgstr ""
 
-#: src/rfx-builder.c:4268
+#: src/rfx-builder.c:4184
 msgid "From script: "
 msgstr ""
 
-#: src/rfx-builder.c:4273
+#: src/rfx-builder.c:4188
 msgid "LiVES: - RFX Script name"
 msgstr ""
 
-#: src/rfx-builder.c:4274
+#: src/rfx-builder.c:4189
 msgid "Script name: "
 msgstr ""
 
-#: src/rfx-builder.c:4294
+#: src/rfx-builder.c:4209
 msgid "New name: "
 msgstr ""
 
-#: src/rfx-builder.c:4297
+#: src/rfx-builder.c:4212
 msgid "New script name: "
 msgstr ""
 
-#: src/rfx-builder.c:4372
+#: src/rfx-builder.c:4286
 msgid ""
 "\n"
 "\n"
@@ -6675,12 +6781,12 @@
 "Script name must be unique.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4384
+#: src/rfx-builder.c:4297
 #, c-format
 msgid "Renaming RFX test script %s to %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4390
+#: src/rfx-builder.c:4302
 #, c-format
 msgid ""
 "\n"
@@ -6691,21 +6797,21 @@
 "Return code was %d\n"
 msgstr ""
 
-#: src/rfx-builder.c:4610
+#: src/rfx-builder.c:4518
 msgid "_Apply Real Time Effects to Selection"
 msgstr ""
 
-#: src/rfx-builder.c:4664
+#: src/rfx-builder.c:4572
 #, c-format
 msgid "Loading rendered effect %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4766
+#: src/rfx-builder.c:4674
 msgid ""
 "See: VJ - show VJ keys. Set the realtime effects, and then apply them here."
 msgstr ""
 
-#: src/preferences.c:359
+#: src/preferences.c:351
 msgid ""
 "\n"
 "\n"
@@ -6713,7 +6819,7 @@
 "full screen, separate window (fs) mode\n"
 msgstr ""
 
-#: src/preferences.c:408
+#: src/preferences.c:400
 msgid ""
 "\n"
 "\n"
@@ -6721,7 +6827,7 @@
 "(Free space = UNKNOWN)"
 msgstr ""
 
-#: src/preferences.c:412
+#: src/preferences.c:403
 #, c-format
 msgid ""
 "\n"
@@ -6730,14 +6836,14 @@
 "(Free space = %s)"
 msgstr ""
 
-#: src/preferences.c:416
+#: src/preferences.c:408
 msgid ""
 "The temp directory is LiVES working directory where opened clips and sets "
 "are stored.\n"
 "It should be in a partition with plenty of free disk space.\n"
 msgstr ""
 
-#: src/preferences.c:784
+#: src/preferences.c:839
 #, c-format
 msgid ""
 "Unable to create or write to the new temporary directory.\n"
@@ -6748,7 +6854,7 @@
 "The directory will not be changed now.\n"
 msgstr ""
 
-#: src/preferences.c:786
+#: src/preferences.c:843
 #, c-format
 msgid ""
 "Unable to create or write to the new temporary directory.\n"
@@ -6758,7 +6864,7 @@
 "The directory will not be changed now.\n"
 msgstr ""
 
-#: src/preferences.c:798
+#: src/preferences.c:856
 msgid ""
 "You have chosen to change the temporary directory.\n"
 "Please make sure you have no other copies of LiVES open.\n"
@@ -6770,20 +6876,20 @@
 "original setting."
 msgstr ""
 
-#: src/preferences.c:1169
+#: src/preferences.c:1221
 msgid ""
 "\n"
 "Unable to switch audio players to jack - jackd must be installed first.\n"
 "See http://jackaudio.org\n"
 msgstr ""
 
-#: src/preferences.c:1175
+#: src/preferences.c:1226
 msgid ""
 "\n"
 "Switching audio players requires restart (jackd must not be running)\n"
 msgstr ""
 
-#: src/preferences.c:1202
+#: src/preferences.c:1253
 msgid ""
 "\n"
 "Unable to switch audio players to pulse audio\n"
@@ -6791,815 +6897,815 @@
 "See http://www.pulseaudio.org\n"
 msgstr ""
 
-#: src/preferences.c:1502
+#: src/preferences.c:1544
 msgid "PCM (highest quality; largest files)"
 msgstr ""
 
-#: src/preferences.c:2063
+#: src/preferences.c:2096
 msgid "LiVES: - Preferences"
 msgstr ""
 
-#: src/preferences.c:2142
+#: src/preferences.c:2177
 msgid "Open file selection maximised"
 msgstr ""
 
-#: src/preferences.c:2149
+#: src/preferences.c:2184
 msgid "Show recent files in the File menu"
 msgstr ""
 
-#: src/preferences.c:2158
+#: src/preferences.c:2193
 msgid "Stop screensaver on playback    "
 msgstr ""
 
-#: src/preferences.c:2165
+#: src/preferences.c:2200
 msgid "Open main window maximised"
 msgstr ""
 
-#: src/preferences.c:2173
+#: src/preferences.c:2208
 msgid "Show toolbar when background is blanked"
 msgstr ""
 
-#: src/preferences.c:2181
+#: src/preferences.c:2216
 msgid "Allow mouse wheel to switch clips"
 msgstr ""
 
-#: src/preferences.c:2192
+#: src/preferences.c:2227
 msgid "Shrink previews to fit in interface"
 msgstr ""
 
-#: src/preferences.c:2202
+#: src/preferences.c:2237
 msgid "Startup mode:"
 msgstr ""
 
-#: src/preferences.c:2206
+#: src/preferences.c:2241
 msgid "_Clip editor"
 msgstr ""
 
-#: src/preferences.c:2210
+#: src/preferences.c:2245
 msgid "_Multitrack mode"
 msgstr ""
 
-#: src/preferences.c:2234
+#: src/preferences.c:2268
 msgid "Multi-head support"
 msgstr ""
 
-#: src/preferences.c:2242
+#: src/preferences.c:2276
 msgid " monitor number for LiVES interface"
 msgstr ""
 
-#: src/preferences.c:2248
+#: src/preferences.c:2282
 msgid " monitor number for playback"
 msgstr ""
 
-#: src/preferences.c:2260
+#: src/preferences.c:2294
 msgid ""
 "A setting of 0 means use all available monitors (only works with some "
 "playback plugins)."
 msgstr ""
 
-#: src/preferences.c:2270
+#: src/preferences.c:2304
 msgid "Force single monitor"
 msgstr ""
 
-#: src/preferences.c:2271
+#: src/preferences.c:2305
 msgid "Ignore all except the first monitor."
 msgstr ""
 
-#: src/preferences.c:2293
+#: src/preferences.c:2327
 msgid "Show clip thumbnails during playback"
 msgstr ""
 
-#: src/preferences.c:2306
+#: src/preferences.c:2340
 msgid "GUI"
-msgstr "GUI"
+msgstr "Interface"
 
-#: src/preferences.c:2321
+#: src/preferences.c:2355
 msgid "When entering Multitrack mode:"
 msgstr ""
 
-#: src/preferences.c:2330
+#: src/preferences.c:2364
 msgid "_Prompt me for width, height, fps and audio settings"
 msgstr ""
 
-#: src/preferences.c:2336
+#: src/preferences.c:2370
 msgid "_Always use the following values:"
 msgstr ""
 
-#: src/preferences.c:2345
+#: src/preferences.c:2379
 msgid "Use these same _values for rendering a new clip"
 msgstr ""
 
-#: src/preferences.c:2370
+#: src/preferences.c:2404
 msgid "_Width           "
 msgstr ""
 
-#: src/preferences.c:2375
+#: src/preferences.c:2409
 msgid "          _Height      "
 msgstr ""
 
-#: src/preferences.c:2379
+#: src/preferences.c:2413
 msgid "          _FPS"
 msgstr ""
 
-#: src/preferences.c:2387
+#: src/preferences.c:2421
 msgid "Enable backing audio track"
 msgstr ""
 
-#: src/preferences.c:2394
+#: src/preferences.c:2428
 msgid "Audio track per video track"
 msgstr ""
 
-#: src/preferences.c:2423
+#: src/preferences.c:2457
 msgid "    _Undo buffer size (MB)    "
 msgstr ""
 
-#: src/preferences.c:2432
+#: src/preferences.c:2466
 msgid "_Exit multitrack mode after rendering"
 msgstr ""
 
-#: src/preferences.c:2440
+#: src/preferences.c:2474
 msgid "Auto backup layouts"
 msgstr ""
 
-#: src/preferences.c:2445
+#: src/preferences.c:2479
 msgid "_Every"
 msgstr ""
 
-#: src/preferences.c:2453
+#: src/preferences.c:2487
 msgid "seconds"
 msgstr "segundos"
 
-#: src/preferences.c:2461
+#: src/preferences.c:2495
 msgid "After every _change"
 msgstr ""
 
-#: src/preferences.c:2467
+#: src/preferences.c:2501
 msgid "_Never"
 msgstr "_Nunca"
 
-#: src/preferences.c:2490
+#: src/preferences.c:2523
 msgid "Multitrack/Render"
 msgstr ""
 
-#: src/preferences.c:2508
+#: src/preferences.c:2541
 msgid "Use instant opening when possible"
 msgstr ""
 
-#: src/preferences.c:2509
+#: src/preferences.c:2543
 msgid "Enable instant opening of some file types using decoder plugins"
 msgstr ""
 
-#: src/preferences.c:2531
+#: src/preferences.c:2567
 msgid "Video open command (fallback)"
 msgstr ""
 
-#: src/preferences.c:2543
+#: src/preferences.c:2579
 msgid "Open/render compression"
 msgstr ""
 
-#: src/preferences.c:2546
+#: src/preferences.c:2582
 msgid " %     ( lower = slower, larger files; for jpeg, higher quality )"
 msgstr ""
 
-#: src/preferences.c:2558
+#: src/preferences.c:2594
 msgid "Default image format"
 msgstr ""
 
-#: src/preferences.c:2562
+#: src/preferences.c:2598
 msgid "_jpeg"
 msgstr "_jpeg"
 
-#: src/preferences.c:2565
+#: src/preferences.c:2601
 msgid "_png"
 msgstr "_png"
 
-#: src/preferences.c:2572
+#: src/preferences.c:2608
 msgid "(Check Help/Troubleshoot to see which image formats are supported)"
 msgstr ""
 
-#: src/preferences.c:2580
+#: src/preferences.c:2616
 msgid "Enable automatic deinterlacing when possible"
 msgstr ""
 
-#: src/preferences.c:2582
+#: src/preferences.c:2619
 msgid "Automatically deinterlace frames when a plugin suggests it"
 msgstr ""
 
-#: src/preferences.c:2593
+#: src/preferences.c:2632
 msgid "Automatic trimming / padding of audio when possible"
 msgstr ""
 
-#: src/preferences.c:2595
+#: src/preferences.c:2634
 msgid "Automatically trim or pad audio when a plugin suggests it"
 msgstr ""
 
-#: src/preferences.c:2606
+#: src/preferences.c:2646
 msgid "Ignore blank borders when possible"
 msgstr ""
 
-#: src/preferences.c:2608
+#: src/preferences.c:2648
 msgid "Clip any blank borders from frames where possible"
 msgstr ""
 
-#: src/preferences.c:2619
+#: src/preferences.c:2660
 msgid "When opening multiple files, concatenate images into one clip"
 msgstr ""
 
-#: src/preferences.c:2629
+#: src/preferences.c:2670
 msgid "Decoding"
 msgstr ""
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:2652
+#: src/preferences.c:2693
 msgid "Low - can improve performance on slower machines"
 msgstr ""
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:2654
+#: src/preferences.c:2695
 msgid "Normal - recommended for most users"
 msgstr ""
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:2656
+#: src/preferences.c:2697
 msgid "High - can improve quality on very fast machines"
 msgstr ""
 
-#: src/preferences.c:2659
+#: src/preferences.c:2700
 msgid "Preview _quality"
 msgstr ""
 
-#: src/preferences.c:2660
+#: src/preferences.c:2701
 msgid "The preview quality for video playback - affects resizing"
 msgstr ""
 
-#: src/preferences.c:2675
+#: src/preferences.c:2717
 msgid "_Show FPS statistics"
 msgstr ""
 
-#: src/preferences.c:2694
+#: src/preferences.c:2736
 msgid "_Plugin"
 msgstr "_Complemento"
 
-#: src/preferences.c:2718
+#: src/preferences.c:2760
 msgid "Stream audio"
 msgstr ""
 
-#: src/preferences.c:2721
+#: src/preferences.c:2763
 msgid "Stream audio to playback plugin"
 msgstr ""
 
-#: src/preferences.c:2734
+#: src/preferences.c:2778
 msgid "Record player output"
 msgstr ""
 
-#: src/preferences.c:2737
+#: src/preferences.c:2781
 msgid "Record output from player instead of input to player"
 msgstr ""
 
-#: src/preferences.c:2744
+#: src/preferences.c:2789
 msgid "VIDEO"
 msgstr "VÍDEO"
 
-#: src/preferences.c:2787
+#: src/preferences.c:2833
 msgid "_Player"
 msgstr ""
 
-#: src/preferences.c:2792
+#: src/preferences.c:2838
 msgid "(See also the Jack Integration tab for jack startup options)"
 msgstr ""
 
-#: src/preferences.c:2819
+#: src/preferences.c:2865
 msgid "mplayer"
 msgstr "mplayer"
 
-#: src/preferences.c:2830
+#: src/preferences.c:2876
 #, fuzzy
 msgid "mplayer2"
 msgstr "mplayer"
 
-#: src/preferences.c:2833
+#: src/preferences.c:2879
 msgid "Audio play _command"
 msgstr ""
 
-#: src/preferences.c:2840
+#: src/preferences.c:2886
 msgid "- internal -"
 msgstr ""
 
-#: src/preferences.c:2849
+#: src/preferences.c:2895
 msgid "Audio follows video _rate/direction"
 msgstr ""
 
-#: src/preferences.c:2857
+#: src/preferences.c:2903
 msgid "Audio follows _clip switches"
 msgstr ""
 
-#: src/preferences.c:2864
+#: src/preferences.c:2910
 msgid "Source:"
 msgstr ""
 
-#: src/preferences.c:2868
+#: src/preferences.c:2914
 msgid "_Internal"
 msgstr ""
 
-#: src/preferences.c:2873
+#: src/preferences.c:2919
 msgid "_External (requires jack or pulse audio player)"
 msgstr ""
 
-#: src/preferences.c:2892
+#: src/preferences.c:2940
 msgid "AUDIO"
 msgstr ""
 
-#: src/preferences.c:2902
+#: src/preferences.c:2950
 msgid "Playback"
 msgstr "Reprodución"
 
-#: src/preferences.c:2925
+#: src/preferences.c:2973
 msgid ""
 "Record audio when capturing an e_xternal window\n"
 " (requires jack or pulse audio)"
 msgstr ""
 
-#: src/preferences.c:2940
+#: src/preferences.c:2988
 msgid "      What to record when 'r' is pressed   "
 msgstr ""
 
-#: src/preferences.c:2949
+#: src/preferences.c:2997
 msgid "_Frame changes"
 msgstr ""
 
-#: src/preferences.c:2964
+#: src/preferences.c:3012
 msgid "F_PS changes"
 msgstr ""
 
-#: src/preferences.c:2982
+#: src/preferences.c:3030
 msgid "_Real time effects"
 msgstr ""
 
-#: src/preferences.c:2993
+#: src/preferences.c:3041
 msgid "_Clip switches"
 msgstr ""
 
-#: src/preferences.c:3004
+#: src/preferences.c:3052
 msgid "_Audio (requires jack or pulse audio player)"
 msgstr ""
 
-#: src/preferences.c:3024
+#: src/preferences.c:3072
 msgid "Pause recording if free disk space falls below"
 msgstr ""
 
 #. TRANSLATORS: gigabytes
-#: src/preferences.c:3030
+#: src/preferences.c:3078
 msgid "GB"
 msgstr ""
 
-#: src/preferences.c:3037
+#: src/preferences.c:3085
 msgid "Recording"
 msgstr "Gravando"
 
-#: src/preferences.c:3055
+#: src/preferences.c:3103
 msgid "Encoder"
 msgstr ""
 
-#: src/preferences.c:3090
+#: src/preferences.c:3137
 msgid "Output format"
 msgstr ""
 
-#: src/preferences.c:3106
+#: src/preferences.c:3153
 msgid "Audio codec"
 msgstr ""
 
-#: src/preferences.c:3119
+#: src/preferences.c:3165
 msgid "Encoding"
 msgstr "Codificación"
 
-#: src/preferences.c:3134
+#: src/preferences.c:3180
 msgid "Use _antialiasing when resizing"
 msgstr ""
 
-#: src/preferences.c:3143
+#: src/preferences.c:3189
 msgid "Number of _real time effect keys"
 msgstr ""
 
-#: src/preferences.c:3145
+#: src/preferences.c:3192
 msgid ""
 "The number of \"virtual\" real time effect keys. They can be controlled "
 "through the real time effects window, or via network (OSC)."
 msgstr ""
 
-#: src/preferences.c:3152
+#: src/preferences.c:3199
 msgid "Use _threads where possible when applying effects"
 msgstr ""
 
-#: src/preferences.c:3159
+#: src/preferences.c:3207
 msgid "Number of _threads"
 msgstr ""
 
-#: src/preferences.c:3172
+#: src/preferences.c:3221
 msgid "Restart is required if any of the following paths are changed:"
 msgstr ""
 
-#: src/preferences.c:3182
+#: src/preferences.c:3231
 msgid "Weed plugin path"
 msgstr ""
 
-#: src/preferences.c:3184
+#: src/preferences.c:3234
 msgid "Frei0r plugin path"
 msgstr ""
 
-#: src/preferences.c:3186
+#: src/preferences.c:3237
 msgid "LADSPA plugin path"
 msgstr ""
 
-#: src/preferences.c:3209
+#: src/preferences.c:3261
 msgid "      Video load directory (default)      "
 msgstr ""
 
-#: src/preferences.c:3215
+#: src/preferences.c:3267
 msgid "      Video save directory (default) "
 msgstr ""
 
-#: src/preferences.c:3221
+#: src/preferences.c:3273
 msgid "      Audio load directory (default) "
 msgstr ""
 
-#: src/preferences.c:3227
+#: src/preferences.c:3279
 msgid "      Image directory (default) "
 msgstr ""
 
-#: src/preferences.c:3233
+#: src/preferences.c:3285
 msgid "      Backup/Restore directory (default) "
 msgstr ""
 
-#: src/preferences.c:3239
+#: src/preferences.c:3291
 msgid "      Temp directory (do not remove) "
 msgstr ""
 
-#: src/preferences.c:3252
+#: src/preferences.c:3304
 msgid "The default directory for loading video clips from"
 msgstr ""
 
-#: src/preferences.c:3277
+#: src/preferences.c:3329
 msgid "The default directory for saving encoded clips to"
 msgstr ""
 
-#: src/preferences.c:3285
+#: src/preferences.c:3337
 msgid "The default directory for loading and saving audio"
 msgstr ""
 
-#: src/preferences.c:3293
+#: src/preferences.c:3345
 msgid "The default directory for saving frameshots to"
 msgstr ""
 
-#: src/preferences.c:3301
+#: src/preferences.c:3353
 msgid "The default directory for backing up/restoring single clips"
 msgstr ""
 
-#: src/preferences.c:3309
+#: src/preferences.c:3361
 msgid "LiVES working directory."
 msgstr ""
 
-#: src/preferences.c:3359
+#: src/preferences.c:3412
 msgid "Directories"
 msgstr "Directorios"
 
-#: src/preferences.c:3374
+#: src/preferences.c:3427
 msgid "Warn if diskspace falls below: "
 msgstr ""
 
-#: src/preferences.c:3380 src/preferences.c:3394
+#: src/preferences.c:3433 src/preferences.c:3447
 msgid " MB [set to 0 to disable]"
 msgstr ""
 
-#: src/preferences.c:3389
+#: src/preferences.c:3442
 msgid "Diskspace critical level: "
 msgstr ""
 
-#: src/preferences.c:3407
+#: src/preferences.c:3461
 msgid ""
 "Warn on Insert / Merge if _frame rate of clipboard does not match frame rate "
 "of selection"
 msgstr ""
 
-#: src/preferences.c:3417
+#: src/preferences.c:3471
 msgid "Warn on Open if file _size exceeds "
 msgstr ""
 
-#: src/preferences.c:3425
+#: src/preferences.c:3479
 msgid " MB"
 msgstr " MB"
 
-#: src/preferences.c:3432
+#: src/preferences.c:3486
 msgid "Show a warning before saving a se_t"
 msgstr ""
 
-#: src/preferences.c:3442
+#: src/preferences.c:3496
 msgid ""
 "Show a warning if _mplayer/mplayer2, sox, composite or convert is not found "
 "when LiVES is started."
 msgstr ""
 
-#: src/preferences.c:3452
+#: src/preferences.c:3506
 msgid "Show a warning if no _rendered effects are found at startup."
 msgstr ""
 
-#: src/preferences.c:3464
+#: src/preferences.c:3518
 msgid "Show a warning if no _encoder plugins are found at startup."
 msgstr ""
 
-#: src/preferences.c:3474
+#: src/preferences.c:3528
 msgid "Show a warning if a _duplicate set name is entered."
 msgstr ""
 
-#: src/preferences.c:3485
+#: src/preferences.c:3539
 msgid "When a set is loaded, warn if clips are missing from _layouts."
 msgstr ""
 
-#: src/preferences.c:3495
+#: src/preferences.c:3550
 msgid "Warn if a clip used in a layout is about to be closed."
 msgstr ""
 
-#: src/preferences.c:3505
+#: src/preferences.c:3561
 msgid "Warn if frames used in a layout are about to be deleted."
 msgstr ""
 
-#: src/preferences.c:3515
+#: src/preferences.c:3572
 msgid "Warn if frames used in a layout are about to be shifted."
 msgstr ""
 
-#: src/preferences.c:3525
+#: src/preferences.c:3583
 msgid "Warn if frames used in a layout are about to be altered."
 msgstr ""
 
-#: src/preferences.c:3535
+#: src/preferences.c:3594
 msgid "Warn if audio used in a layout is about to be deleted."
 msgstr ""
 
-#: src/preferences.c:3546
+#: src/preferences.c:3606
 msgid "Warn if audio used in a layout is about to be shifted."
 msgstr ""
 
-#: src/preferences.c:3556
+#: src/preferences.c:3617
 msgid "Warn if audio used in a layout is about to be altered."
 msgstr ""
 
-#: src/preferences.c:3566
+#: src/preferences.c:3628
 msgid "Popup layout errors after clip changes."
 msgstr ""
 
-#: src/preferences.c:3577
+#: src/preferences.c:3639
 msgid "Warn if the layout has not been saved when leaving multitrack mode."
 msgstr ""
 
-#: src/preferences.c:3588
+#: src/preferences.c:3650
 msgid ""
 "Warn if multitrack has no audio channels, and a layout with audio is loaded."
 msgstr ""
 
-#: src/preferences.c:3598
+#: src/preferences.c:3660
 msgid ""
 "Warn if multitrack has audio channels, and your audio player is not \"jack\" "
 "or \"pulse audio\"."
 msgstr ""
 
-#: src/preferences.c:3610
+#: src/preferences.c:3672
 msgid "Show info message after importing from firewire device."
 msgstr ""
 
-#: src/preferences.c:3626
+#: src/preferences.c:3688
 msgid "Show a warning before opening a yuv4mpeg stream (advanced)."
 msgstr ""
 
-#: src/preferences.c:3639
+#: src/preferences.c:3701
 msgid "Show a warning when multitrack is low on backup space."
 msgstr ""
 
-#: src/preferences.c:3650
+#: src/preferences.c:3713
 msgid "Show a warning advising cleaning of disk space after a crash."
 msgstr ""
 
-#: src/preferences.c:3661
+#: src/preferences.c:3725
 msgid "Show a warning if unable to connect to pulseaudio player."
 msgstr ""
 
-#: src/preferences.c:3673
+#: src/preferences.c:3737
 msgid "Show a warning before wiping a layout which has unsaved changes."
 msgstr ""
 
-#: src/preferences.c:3685
+#: src/preferences.c:3749
 msgid "Warnings"
 msgstr "Advertencias"
 
-#: src/preferences.c:3703
+#: src/preferences.c:3767
 msgid "Midi synch (requires the files midistart and midistop)"
 msgstr ""
 
-#: src/preferences.c:3715
+#: src/preferences.c:3779
 msgid "When inserting/merging frames:  "
 msgstr ""
 
-#: src/preferences.c:3719
+#: src/preferences.c:3783
 msgid "_Speed Up/Slow Down Insertion"
 msgstr ""
 
-#: src/preferences.c:3723
+#: src/preferences.c:3787
 msgid "_Resample Insertion"
 msgstr ""
 
-#: src/preferences.c:3730
+#: src/preferences.c:3794
 msgid "CD device           "
 msgstr ""
 
-#: src/preferences.c:3733
+#: src/preferences.c:3797
 msgid "LiVES can load audio tracks from this CD"
 msgstr ""
 
-#: src/preferences.c:3746
+#: src/preferences.c:3813
 msgid "Default FPS        "
 msgstr ""
 
-#: src/preferences.c:3749
+#: src/preferences.c:3816
 msgid "Frames per second to use when none is specified"
 msgstr ""
 
-#: src/preferences.c:3757
+#: src/preferences.c:3825
 msgid "Misc"
 msgstr "Varios"
 
-#: src/preferences.c:3782
+#: src/preferences.c:3850
 msgid "New theme:           "
 msgstr ""
 
-#: src/preferences.c:3800
+#: src/preferences.c:3867
 msgid "Themes"
 msgstr "Temas"
 
-#: src/preferences.c:3815
+#: src/preferences.c:3882
 msgid "Download bandwidth (Kb/s)       "
 msgstr ""
 
-#: src/preferences.c:3823
+#: src/preferences.c:3890
 msgid "LiVES must be compiled without \"configure --disable-OSC\" to use OMC"
 msgstr ""
 
-#: src/preferences.c:3833
+#: src/preferences.c:3900
 msgid "OMC remote control enabled"
 msgstr ""
 
-#: src/preferences.c:3841
+#: src/preferences.c:3908
 msgid "UDP port       "
 msgstr ""
 
-#: src/preferences.c:3850
+#: src/preferences.c:3917
 msgid "Start OMC on startup"
 msgstr ""
 
-#: src/preferences.c:3870
+#: src/preferences.c:3937
 msgid "Streaming/Networking"
 msgstr ""
 
-#: src/preferences.c:3882
+#: src/preferences.c:3949
 msgid "Jack transport"
 msgstr ""
 
-#: src/preferences.c:3886
+#: src/preferences.c:3953
 msgid ""
 "LiVES must be compiled with jack/transport.h and jack/jack.h present to use "
 "jack transport"
 msgstr ""
 
-#: src/preferences.c:3892
+#: src/preferences.c:3959
 msgid "Jack _transport config file"
 msgstr ""
 
-#: src/preferences.c:3899 src/preferences.c:3989
+#: src/preferences.c:3967 src/preferences.c:4058
 msgid "Start _server on LiVES startup"
 msgstr ""
 
-#: src/preferences.c:3911
+#: src/preferences.c:3979
 msgid "Jack transport _master (start and stop)"
 msgstr ""
 
-#: src/preferences.c:3921
+#: src/preferences.c:3989
 msgid "Jack transport _client (start and stop)"
 msgstr ""
 
-#: src/preferences.c:3935
+#: src/preferences.c:4003
 msgid "Jack transport sets start position"
 msgstr ""
 
-#: src/preferences.c:3952
+#: src/preferences.c:4020
 msgid "Jack transport timebase slave"
 msgstr ""
 
-#: src/preferences.c:3963
+#: src/preferences.c:4031
 msgid "(See also Playback -> Audio follows video rate/direction)"
 msgstr ""
 
-#: src/preferences.c:3971
+#: src/preferences.c:4039
 msgid "Jack audio"
 msgstr ""
 
-#: src/preferences.c:3975
+#: src/preferences.c:4043
 msgid "LiVES must be compiled with jack/jack.h present to use jack audio"
 msgstr ""
 
-#: src/preferences.c:3978
+#: src/preferences.c:4046
 msgid ""
 "You MUST set the audio player to \"jack\" in the Playback tab to use jack "
 "audio"
 msgstr ""
 
-#: src/preferences.c:3984
+#: src/preferences.c:4052
 msgid "Jack _audio server config file"
 msgstr ""
 
-#: src/preferences.c:3996
+#: src/preferences.c:4065
 msgid "Play audio even when transport is _paused"
 msgstr ""
 
-#: src/preferences.c:4008
+#: src/preferences.c:4077
 msgid "Automatically connect to System Out ports when 'playing' External Audio"
 msgstr ""
 
-#: src/preferences.c:4021
+#: src/preferences.c:4090
 msgid "Jack Integration"
 msgstr ""
 
-#: src/preferences.c:4035
+#: src/preferences.c:4104
 msgid "Events to respond to:"
 msgstr ""
 
-#: src/preferences.c:4044
+#: src/preferences.c:4113
 msgid "_Joystick events"
 msgstr ""
 
-#: src/preferences.c:4051
+#: src/preferences.c:4120
 msgid "_Joystick device"
 msgstr ""
 
-#: src/preferences.c:4053
+#: src/preferences.c:4122
 msgid "The joystick device, e.g. /dev/input/js0"
 msgstr ""
 
-#: src/preferences.c:4071
+#: src/preferences.c:4142
 msgid "_MIDI events"
 msgstr ""
 
-#: src/preferences.c:4080
+#: src/preferences.c:4151
 msgid "Use _ALSA MIDI (recommended)"
 msgstr ""
 
-#: src/preferences.c:4082
+#: src/preferences.c:4153
 msgid "Create an ALSA MIDI port which other MIDI devices can be connected to"
 msgstr ""
 
-#: src/preferences.c:4090
+#: src/preferences.c:4162
 msgid "Use _raw MIDI"
 msgstr ""
 
-#: src/preferences.c:4092
+#: src/preferences.c:4164
 msgid "Read directly from the MIDI device"
 msgstr ""
 
-#: src/preferences.c:4104
+#: src/preferences.c:4177
 msgid "_MIDI device"
 msgstr ""
 
-#: src/preferences.c:4106
+#: src/preferences.c:4179
 msgid "The MIDI device, e.g. /dev/input/midi0"
 msgstr ""
 
-#: src/preferences.c:4118
+#: src/preferences.c:4193
 msgid "Advanced"
 msgstr "Avanzado"
 
-#: src/preferences.c:4124
+#: src/preferences.c:4199
 msgid "MIDI check _rate"
 msgstr ""
 
-#: src/preferences.c:4127
+#: src/preferences.c:4203
 msgid ""
 "Number of MIDI checks per keyboard tick. Increasing this may improve MIDI "
 "responsiveness, but may slow down playback."
 msgstr ""
 
-#: src/preferences.c:4134
+#: src/preferences.c:4211
 msgid "MIDI repeat"
 msgstr ""
 
-#: src/preferences.c:4137
+#: src/preferences.c:4214
 msgid "Number of non-reads allowed between succesive reads."
 msgstr ""
 
-#: src/preferences.c:4140
+#: src/preferences.c:4218
 msgid "(Warning: setting this value too high can slow down playback.)"
 msgstr ""
 
-#: src/preferences.c:4159
+#: src/preferences.c:4237
 msgid "MIDI/Joystick learner"
 msgstr ""
 
-#: src/preferences.c:4499
+#: src/preferences.c:4679
 msgid ""
 "\n"
 "LiVES will now shut down. You need to restart it for the directory change to "
@@ -7607,214 +7713,214 @@
 "Click OK to continue.\n"
 msgstr ""
 
-#: src/preferences.c:4523
+#: src/preferences.c:4703
 msgid ""
 "For the directory change to take effect LiVES will restart when preferences "
 "dialog closes."
 msgstr ""
 
-#: src/preferences.c:4527
+#: src/preferences.c:4707
 msgid "Theme changes will not take effect until the next time you start LiVES."
 msgstr ""
 
-#: src/preferences.c:4531
+#: src/preferences.c:4711
 msgid "Jack options will not take effect until the next time you start LiVES."
 msgstr ""
 
-#: src/osc.c:2585
+#: src/osc.c:2616
 #, c-format
 msgid "Syncing to external framerate of %.8f frames per second.\n"
 msgstr ""
 
-#: src/osc.c:6746
+#: src/osc.c:6938
 msgid "Cannot initialize OSC receiver\n"
 msgstr ""
 
-#: src/osc.c:6770
+#: src/osc.c:6961
 #, c-format
 msgid "WARNING: Cannot start OSC server at UDP port %d\n"
 msgstr ""
 
-#: src/osc.c:6775
+#: src/osc.c:6963
 #, c-format
 msgid "Started OSC server at UDP port %d\n"
 msgstr ""
 
-#: src/osc.c:6890
+#: src/osc.c:7076
 #, c-format
 msgid "Cannot start OSC/UDP server at port %d \n"
 msgstr ""
 
-#: src/resample.c:125 src/resample.c:304
+#: src/resample.c:131 src/resample.c:305
 #, c-format
 msgid "Resizing frames 1 to %d"
 msgstr ""
 
-#: src/resample.c:140 src/resample.c:318
+#: src/resample.c:145 src/resample.c:318
 #, c-format
 msgid "Resizing/letterboxing frames 1 to %d"
 msgstr ""
 
-#: src/resample.c:361 src/resample.c:385
+#: src/resample.c:360 src/resample.c:384
 msgid "Resize"
 msgstr "Redimensionar"
 
-#: src/resample.c:395
+#: src/resample.c:394
 msgid "Resample/Resize"
 msgstr ""
 
-#: src/resample.c:680
+#: src/resample.c:676
 #, c-format
 msgid "Length of video is now %d frames.\n"
 msgstr ""
 
-#: src/resample.c:745
+#: src/resample.c:737
 msgid ""
 "\n"
 "\n"
 "New rate must be greater than 0\n"
 msgstr ""
 
-#: src/resample.c:797 src/resample.c:813
+#: src/resample.c:788 src/resample.c:803
 msgid "Resampling audio"
 msgstr ""
 
-#: src/resample.c:831
+#: src/resample.c:821
 msgid "LiVES was unable to resample the audio as requested.\n"
 msgstr ""
 
-#: src/resample.c:833 src/resample.c:837
+#: src/resample.c:823 src/resample.c:827
 msgid "Resample Audio"
 msgstr ""
 
-#: src/resample.c:845
+#: src/resample.c:835
 #, c-format
 msgid "Audio was resampled to %d Hz, %d channels, %d bit"
 msgstr ""
 
-#: src/resample.c:1034
+#: src/resample.c:1016
 #, c-format
 msgid "Resampling video at %.8f frames per second..."
 msgstr ""
 
-#: src/resample.c:1037
+#: src/resample.c:1018
 #, c-format
 msgid "Resampling video at %.3f frames per second..."
 msgstr ""
 
-#: src/resample.c:1068
+#: src/resample.c:1049
 msgid "Reordering error !\n"
 msgstr ""
 
-#: src/resample.c:1079
+#: src/resample.c:1060
 msgid "Resample"
 msgstr "Remuestreo"
 
-#: src/resample.c:1192
+#: src/resample.c:1173
 msgid "LiVES: - Resample Audio"
 msgstr ""
 
-#: src/resample.c:1195
+#: src/resample.c:1175
 msgid "LiVES: - Insert Silence"
 msgstr ""
 
-#: src/resample.c:1198
+#: src/resample.c:1177
 msgid "LiVES: - New Clip Audio"
 msgstr ""
 
-#: src/resample.c:1201
+#: src/resample.c:1179
 msgid "LiVES: - External Clip Settings"
 msgstr ""
 
-#: src/resample.c:1238 src/resample.c:1358
+#: src/resample.c:1215 src/resample.c:1332
 msgid "Rate (Hz) "
 msgstr ""
 
-#: src/resample.c:1245 src/resample.c:1372
+#: src/resample.c:1222 src/resample.c:1346
 msgid "Channels"
 msgstr ""
 
-#: src/resample.c:1252
+#: src/resample.c:1229
 msgid "Sample Size "
 msgstr ""
 
-#: src/resample.c:1268 src/resample.c:1425
+#: src/resample.c:1245 src/resample.c:1399
 msgid "Signed"
 msgstr ""
 
-#: src/resample.c:1274 src/resample.c:1435
+#: src/resample.c:1251 src/resample.c:1409
 msgid "Unsigned"
 msgstr "Non asinado"
 
-#: src/resample.c:1297 src/resample.c:1460
+#: src/resample.c:1273 src/resample.c:1433
 msgid "Little Endian"
 msgstr ""
 
-#: src/resample.c:1303 src/resample.c:1468
+#: src/resample.c:1279 src/resample.c:1441
 msgid "Big Endian"
 msgstr ""
 
-#: src/resample.c:1315
+#: src/resample.c:1290
 msgid "Current"
 msgstr "Actual"
 
-#: src/resample.c:1340
+#: src/resample.c:1315
 msgid "_Enable audio"
 msgstr ""
 
-#: src/resample.c:1372
+#: src/resample.c:1346
 msgid "_Channels"
 msgstr ""
 
-#: src/resample.c:1394
+#: src/resample.c:1368
 msgid "_Sample Size"
 msgstr ""
 
-#: src/resample.c:1394
+#: src/resample.c:1368
 msgid "Sample Size"
 msgstr ""
 
-#: src/resample.c:1489
+#: src/resample.c:1461
 msgid "New"
 msgstr "Novo"
 
-#: src/resample.c:1512
+#: src/resample.c:1484
 msgid "_Frames Per Second "
 msgstr ""
 
-#: src/resample.c:1530
+#: src/resample.c:1502
 msgid "Record for maximum:  "
 msgstr ""
 
-#: src/resample.c:1533
+#: src/resample.c:1505
 msgid " hours  "
 msgstr ""
 
-#: src/resample.c:1536
+#: src/resample.c:1508
 msgid " minutes  "
 msgstr ""
 
-#: src/resample.c:1538
+#: src/resample.c:1510
 msgid " seconds  "
 msgstr ""
 
-#: src/resample.c:1545
+#: src/resample.c:1517
 msgid "Unlimited"
 msgstr "Ilimitado"
 
-#: src/resample.c:1561
+#: src/resample.c:1533
 msgid "Click OK to begin recording, or Cancel to quit."
 msgstr ""
 
-#: src/resample.c:1670
+#: src/resample.c:1638
 msgid "LiVES: - Change playback speed"
 msgstr ""
 
-#: src/resample.c:1673
+#: src/resample.c:1640
 msgid "LiVES: - Resample Video"
 msgstr ""
 
-#: src/resample.c:1696
+#: src/resample.c:1663
 #, c-format
 msgid ""
 "\n"
@@ -7825,7 +7931,7 @@
 "in _frames per second"
 msgstr ""
 
-#: src/resample.c:1701
+#: src/resample.c:1667
 #, c-format
 msgid ""
 "\n"
@@ -7836,89 +7942,89 @@
 "in frames per second"
 msgstr ""
 
-#: src/resample.c:1723
+#: src/resample.c:1688
 msgid "OR enter the desired clip length in _seconds"
 msgstr ""
 
-#: src/resample.c:1745
+#: src/resample.c:1710
 msgid "Change the _audio speed as well"
 msgstr ""
 
-#: src/resample.c:1846
+#: src/resample.c:1810
 msgid ""
 "\n"
 "Speeding up the clip will cause missing frames in some multitrack layouts.\n"
 "Are you sure you wish to change the speed ?\n"
 msgstr ""
 
-#: src/resample.c:1863
+#: src/resample.c:1829
 msgid ""
 "\n"
 "Speeding up the clip will cause missing audio in some multitrack layouts.\n"
 "Are you sure you wish to change the speed ?\n"
 msgstr ""
 
-#: src/resample.c:1878
+#: src/resample.c:1847
 msgid ""
 "\n"
 "Changing the speed will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/resample.c:1892
+#: src/resample.c:1863
 msgid ""
 "\n"
 "Changing the speed will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/resample.c:1938
+#: src/resample.c:1911
 msgid "Speed Change"
 msgstr ""
 
-#: src/resample.c:1947
+#: src/resample.c:1920
 #, c-format
 msgid "Changed playback speed to %.3f frames per second and audio to %d Hz.\n"
 msgstr ""
 
-#: src/resample.c:1950
+#: src/resample.c:1922
 #, c-format
 msgid "Changed playback speed to %.3f frames per second.\n"
 msgstr ""
 
-#: src/resample.c:2035
+#: src/resample.c:2006
 msgid "Resampling video"
 msgstr ""
 
-#: src/resample.c:2042 src/resample.c:2160 src/resample.c:2182
+#: src/resample.c:2012 src/resample.c:2127 src/resample.c:2148
 msgid "Resampling clipboard video"
 msgstr ""
 
-#: src/resample.c:2047
+#: src/resample.c:2016
 msgid "Reordering frames"
 msgstr ""
 
-#: src/resample.c:2056
+#: src/resample.c:2025
 msgid ""
 "\n"
 "\n"
 "LiVES was unable to reorder the frames."
 msgstr ""
 
-#: src/resample.c:2104
+#: src/resample.c:2071
 msgid "Deordering frames"
 msgstr ""
 
-#: src/resample.c:2199
+#: src/resample.c:2165
 msgid "resampling error..."
 msgstr ""
 
-#: src/rte_window.c:85 src/rte_window.c:1708
+#: src/rte_window.c:124 src/rte_window.c:1709
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
-#: src/rte_window.c:112
+#: src/rte_window.c:150
 msgid ""
 "\n"
 "\n"
@@ -7928,7 +8034,7 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:426
+#: src/rte_window.c:460
 msgid ""
 "\n"
 "\n"
@@ -7936,19 +8042,19 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:432
+#: src/rte_window.c:466
 #, c-format
 msgid "Saving keymap to %s\n"
 msgstr ""
 
-#: src/rte_window.c:439
+#: src/rte_window.c:471
 #, c-format
 msgid ""
 "\n"
 "Updating keymap file %s..."
 msgstr ""
 
-#: src/rte_window.c:446
+#: src/rte_window.c:477
 #, c-format
 msgid ""
 "\n"
@@ -7958,12 +8064,12 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/rte_window.c:526
+#: src/rte_window.c:556
 #, c-format
 msgid "Saving real time effect defaults to %s..."
 msgstr ""
 
-#: src/rte_window.c:535
+#: src/rte_window.c:563
 #, c-format
 msgid ""
 "\n"
@@ -7973,22 +8079,22 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/rte_window.c:632
+#: src/rte_window.c:657
 #, c-format
 msgid "Loading real time effect defaults from %s..."
 msgstr ""
 
-#: src/rte_window.c:681
+#: src/rte_window.c:701
 #, c-format
 msgid "Loading generator default sizes from %s..."
 msgstr ""
 
-#: src/rte_window.c:1306
+#: src/rte_window.c:1319
 #, c-format
 msgid "Loading default keymap from %s..."
 msgstr ""
 
-#: src/rte_window.c:1329
+#: src/rte_window.c:1339
 #, c-format
 msgid ""
 "\n"
@@ -7998,48 +8104,48 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/rte_window.c:1403
+#: src/rte_window.c:1412
 #, c-format
 msgid "Invalid line %d in %s\n"
 msgstr ""
 
-#: src/rte_window.c:1483
+#: src/rte_window.c:1490
 #, c-format
 msgid "Invalid key %d in %s\n"
 msgstr ""
 
-#: src/rte_window.c:1498
+#: src/rte_window.c:1505
 #, c-format
 msgid "Invalid effect %s in %s\n"
 msgstr ""
 
-#: src/rte_window.c:1517
+#: src/rte_window.c:1524
 #, c-format
 msgid "Unknown effect %s in %s\n"
 msgstr ""
 
-#: src/rte_window.c:1535
+#: src/rte_window.c:1542
 #, c-format
 msgid ""
 "This version of LiVES cannot mix generators/non-generators on the same key "
 "(%d) !\n"
 msgstr ""
 
-#: src/rte_window.c:1547
+#: src/rte_window.c:1554
 #, c-format
 msgid "Too many effects bound to key %d.\n"
 msgstr ""
 
-#: src/rte_window.c:1587
+#: src/rte_window.c:1593
 msgid "update required.\n"
 msgstr ""
 
-#: src/rte_window.c:1603
+#: src/rte_window.c:1607
 #, c-format
 msgid "Loading data connection map from %s..."
 msgstr ""
 
-#: src/rte_window.c:1612
+#: src/rte_window.c:1614
 msgid ""
 "\n"
 "\n"
@@ -8047,41 +8153,41 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:1691
+#: src/rte_window.c:1692
 #, c-format
 msgid "LiVES: Information for %s"
 msgstr ""
 
-#: src/rte_window.c:1704
+#: src/rte_window.c:1705
 #, c-format
 msgid "Effect name: %s"
 msgstr ""
 
-#: src/rte_window.c:1712
+#: src/rte_window.c:1713
 #, c-format
 msgid "Plugin name: %s"
 msgstr ""
 
-#: src/rte_window.c:1716
+#: src/rte_window.c:1717
 #, c-format
 msgid "Author: %s"
 msgstr "Autor: %s"
 
-#: src/rte_window.c:1721
+#: src/rte_window.c:1722
 #, c-format
 msgid "and: %s"
 msgstr ""
 
-#: src/rte_window.c:1726
+#: src/rte_window.c:1727
 #, c-format
 msgid "Version: %d"
 msgstr ""
 
-#: src/rte_window.c:1734
+#: src/rte_window.c:1735
 msgid "Description: "
 msgstr "Descrición: "
 
-#: src/rte_window.c:1960
+#: src/rte_window.c:1963
 msgid ""
 "\n"
 "\n"
@@ -8090,69 +8196,69 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:2024
+#: src/rte_window.c:2027
 #, c-format
 msgid "LiVES could not locate the effect %s.\n"
 msgstr ""
 
-#: src/rte_window.c:2225
+#: src/rte_window.c:2216
 msgid "LiVES: Real time effect mapping"
 msgstr ""
 
-#: src/rte_window.c:2257
+#: src/rte_window.c:2248
 #, c-format
 msgid "Ctrl-%d"
 msgstr "Ctrl-%d"
 
-#: src/rte_window.c:2264
+#: src/rte_window.c:2255
 msgid "Key active"
 msgstr ""
 
-#: src/rte_window.c:2279
+#: src/rte_window.c:2271
 msgid "Key grab"
 msgstr ""
 
-#: src/rte_window.c:2280
+#: src/rte_window.c:2272
 msgid "Grab keyboard for this effect key"
 msgstr ""
 
-#: src/rte_window.c:2290
+#: src/rte_window.c:2283
 msgid "_Clear all effects"
 msgstr ""
 
-#: src/rte_window.c:2304
+#: src/rte_window.c:2297
 msgid "Mode active"
 msgstr ""
 
-#: src/rte_window.c:2314 src/multitrack.c:8568
+#: src/rte_window.c:2307 src/multitrack.c:8762
 msgid "Info"
 msgstr ""
 
-#: src/rte_window.c:2315
+#: src/rte_window.c:2308
 msgid "Set Parameters"
 msgstr ""
 
-#: src/rte_window.c:2316
+#: src/rte_window.c:2309
 msgid "Set Connections"
 msgstr ""
 
-#: src/rte_window.c:2317
+#: src/rte_window.c:2310
 msgid "Clear"
 msgstr "Borrar"
 
-#: src/rte_window.c:2326
+#: src/rte_window.c:2319
 msgid "Effect name:"
 msgstr ""
 
-#: src/rte_window.c:2391
+#: src/rte_window.c:2384
 msgid "_Save as default keymap"
 msgstr ""
 
-#: src/rte_window.c:2396
+#: src/rte_window.c:2389
 msgid "_Load default keymap"
 msgstr ""
 
-#: src/rte_window.c:2840
+#: src/rte_window.c:2833
 #, c-format
 msgid ""
 "Unable to create default keymap file: %s\n"
@@ -8210,86 +8316,86 @@
 msgid "none\n"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:494
+#: src/lives-yuv4mpeg.c:493
 #, c-format
 msgid ""
 "Unable to set display framerate to %.3f fps.\n"
 "\n"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:503
+#: src/lives-yuv4mpeg.c:502
 #, c-format
 msgid "Unable to open yuv4mpeg out stream %s\n"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:628
+#: src/lives-yuv4mpeg.c:626
 #, c-format
 msgid "TV card %d"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:713
+#: src/lives-yuv4mpeg.c:710
 #, c-format
 msgid "Opened TV card %d (%s)"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:760
+#: src/lives-yuv4mpeg.c:757
 #, c-format
 msgid "Firewire card %d"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:796
+#: src/lives-yuv4mpeg.c:793
 #, c-format
 msgid "Opened firewire card %d"
 msgstr ""
 
-#: src/multitrack.c:666
+#: src/multitrack.c:736
 msgid "Auto backup"
 msgstr ""
 
-#: src/multitrack.c:868
+#: src/multitrack.c:935
 msgid "Backing audio"
 msgstr ""
 
-#: src/multitrack.c:1435
+#: src/multitrack.c:1515
 #, c-format
 msgid "%s : parameters for %s"
 msgstr ""
 
-#: src/multitrack.c:1809 src/multitrack.c:3483
+#: src/multitrack.c:1881 src/multitrack.c:3635
 #, c-format
 msgid "Current track: %s (layer %d)\n"
 msgstr ""
 
-#: src/multitrack.c:1813 src/multitrack.c:3484
+#: src/multitrack.c:1885 src/multitrack.c:3637
 msgid "Current track: Backing audio\n"
 msgstr ""
 
-#: src/multitrack.c:1814
+#: src/multitrack.c:1886
 #, c-format
 msgid "Current track: Layer %d audio\n"
 msgstr ""
 
-#: src/multitrack.c:1817
+#: src/multitrack.c:1889
 #, c-format
 msgid "%.2f sec.\n"
 msgstr ""
 
-#: src/multitrack.c:1822 src/multitrack.c:3490
+#: src/multitrack.c:1894 src/multitrack.c:3643
 #, c-format
 msgid "Source: %s"
 msgstr ""
 
-#: src/multitrack.c:1825 src/multitrack.c:3492
+#: src/multitrack.c:1897 src/multitrack.c:3645
 msgid "Right click for context menu.\n"
 msgstr ""
 
-#: src/multitrack.c:1827
+#: src/multitrack.c:1899
 msgid ""
 "Double click on a block\n"
 "to select it."
 msgstr ""
 
-#: src/multitrack.c:3312
+#: src/multitrack.c:3452
 msgid ""
 "\n"
 "\n"
@@ -8298,7 +8404,7 @@
 "right or double clicking on it.\n"
 msgstr ""
 
-#: src/multitrack.c:3315
+#: src/multitrack.c:3455
 msgid ""
 "\n"
 "\n"
@@ -8306,14 +8412,14 @@
 "Select an effect in FX stack first to view its parameters.\n"
 msgstr ""
 
-#: src/multitrack.c:3318
+#: src/multitrack.c:3458
 msgid ""
 "\n"
 "\n"
 "No clips loaded.\n"
 msgstr ""
 
-#: src/multitrack.c:3321
+#: src/multitrack.c:3462
 msgid ""
 "You must select two video tracks\n"
 "and a time region\n"
@@ -8323,7 +8429,7 @@
 "before inserting clips into the timeline."
 msgstr ""
 
-#: src/multitrack.c:3324
+#: src/multitrack.c:3465
 msgid ""
 "\n"
 "\n"
@@ -8332,210 +8438,210 @@
 "to apply compositors.\n"
 msgstr ""
 
-#: src/multitrack.c:3487
+#: src/multitrack.c:3640
 #, c-format
 msgid "%.2f sec. to %.2f sec.\n"
 msgstr ""
 
-#: src/multitrack.c:3493
+#: src/multitrack.c:3646
 msgid ""
 "Single click on timeline\n"
 "to select a frame.\n"
 msgstr ""
 
-#: src/multitrack.c:3711 src/multitrack.c:6790
+#: src/multitrack.c:3858 src/multitrack.c:6972
 #, c-format
 msgid "%s [unstable]"
 msgstr ""
 
-#: src/multitrack.c:3822
+#: src/multitrack.c:3973
 msgid ""
 "You can click and drag\n"
 "below the timeline"
 msgstr ""
 
-#: src/multitrack.c:3823
+#: src/multitrack.c:3974
 msgid "to select a time region.\n"
 msgstr ""
 
-#: src/multitrack.c:3985
+#: src/multitrack.c:4137
 msgid "LiVES: Selected clip"
 msgstr ""
 
-#: src/multitrack.c:3993
+#: src/multitrack.c:4145
 msgid "_Adjust start and end points"
 msgstr ""
 
-#: src/multitrack.c:4002
+#: src/multitrack.c:4154
 msgid "_Edit/encode in clip editor"
 msgstr ""
 
-#: src/multitrack.c:4009
+#: src/multitrack.c:4161
 msgid "_Show clip information"
 msgstr ""
 
-#: src/multitrack.c:4016
+#: src/multitrack.c:4168
 msgid "_Close this clip"
 msgstr ""
 
-#: src/multitrack.c:4236
+#: src/multitrack.c:4388
 msgid "Audio mixer (ctrl-m)"
 msgstr ""
 
-#: src/multitrack.c:4336
+#: src/multitrack.c:4488
 msgid "Single click on timeline"
 msgstr ""
 
-#: src/multitrack.c:4337
+#: src/multitrack.c:4489
 msgid "to select a frame."
 msgstr ""
 
-#: src/multitrack.c:4338
+#: src/multitrack.c:4490
 msgid "Double click or right click on timeline"
 msgstr ""
 
-#: src/multitrack.c:4339
+#: src/multitrack.c:4491
 msgid "to select a block."
 msgstr ""
 
-#: src/multitrack.c:4340
+#: src/multitrack.c:4492
 msgid "Clips can be dragged"
 msgstr ""
 
-#: src/multitrack.c:4341
+#: src/multitrack.c:4493
 msgid "onto the timeline."
 msgstr ""
 
-#: src/multitrack.c:4343
+#: src/multitrack.c:4495
 msgid "Mouse mode is: Move"
 msgstr ""
 
-#: src/multitrack.c:4344
+#: src/multitrack.c:4496
 msgid "clips can be moved around."
 msgstr ""
 
-#: src/multitrack.c:4349
+#: src/multitrack.c:4500
 msgid "Mouse mode is: Select."
 msgstr ""
 
-#: src/multitrack.c:4350
+#: src/multitrack.c:4501
 msgid "Drag with mouse on timeline"
 msgstr ""
 
-#: src/multitrack.c:4351
+#: src/multitrack.c:4502
 msgid "to select tracks and time."
 msgstr ""
 
-#: src/multitrack.c:4362
+#: src/multitrack.c:4509
 msgid "_Insert mode: Normal"
 msgstr ""
 
-#: src/multitrack.c:4378
+#: src/multitrack.c:4537
 msgid "_Mouse mode: Move"
 msgstr ""
 
-#: src/multitrack.c:4382
+#: src/multitrack.c:4540
 msgid "_Mouse mode: Select"
 msgstr ""
 
-#: src/multitrack.c:4405 src/multitrack.c:7925
+#: src/multitrack.c:4563 src/multitrack.c:8104
 msgid "Gravity: Normal"
 msgstr ""
 
-#: src/multitrack.c:4409
+#: src/multitrack.c:4565
 msgid "Gravity: Left"
 msgstr ""
 
-#: src/multitrack.c:4414
+#: src/multitrack.c:4569
 msgid "Gravity: Right"
 msgstr ""
 
-#: src/multitrack.c:4416
+#: src/multitrack.c:4570
 msgid "Close _last gap(s) in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:4419
+#: src/multitrack.c:4572
 msgid "Close _first gap(s) in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:4458
+#: src/multitrack.c:4627
 msgid "Close gaps"
 msgstr ""
 
-#: src/multitrack.c:4460
+#: src/multitrack.c:4629
 msgid "Move block"
 msgstr ""
 
-#: src/multitrack.c:4462
+#: src/multitrack.c:4631
 msgid "Move audio block"
 msgstr ""
 
-#: src/multitrack.c:4464
+#: src/multitrack.c:4633
 msgid "Delete block"
 msgstr ""
 
-#: src/multitrack.c:4466
+#: src/multitrack.c:4635
 msgid "Delete audio block"
 msgstr ""
 
-#: src/multitrack.c:4468
+#: src/multitrack.c:4637
 msgid "Split tracks"
 msgstr ""
 
-#: src/multitrack.c:4470
+#: src/multitrack.c:4639
 msgid "Split block"
 msgstr ""
 
-#: src/multitrack.c:4473
+#: src/multitrack.c:4642
 #, c-format
 msgid "Apply %s"
 msgstr ""
 
-#: src/multitrack.c:4478
+#: src/multitrack.c:4647
 #, c-format
 msgid "Delete %s"
 msgstr "Eliminar %s"
 
-#: src/multitrack.c:4482
+#: src/multitrack.c:4651
 msgid "Insert block"
 msgstr ""
 
-#: src/multitrack.c:4484
+#: src/multitrack.c:4653
 msgid "Insert gap"
 msgstr ""
 
-#: src/multitrack.c:4486
+#: src/multitrack.c:4655
 msgid "Insert audio block"
 msgstr ""
 
-#: src/multitrack.c:4488
+#: src/multitrack.c:4657
 msgid "Effect order change"
 msgstr ""
 
-#: src/multitrack.c:4898
+#: src/multitrack.c:5064
 msgid "unsigned "
 msgstr ""
 
-#: src/multitrack.c:4899
+#: src/multitrack.c:5065
 msgid "signed "
 msgstr ""
 
-#: src/multitrack.c:4904
+#: src/multitrack.c:5071
 #, c-format
 msgid ""
 "Multitrack values set to %.3f fps, frame size %d x %d, audio channels %d, "
 "audio rate %d, audio sample size %d, %s.\n"
 msgstr ""
 
-#: src/multitrack.c:4938
+#: src/multitrack.c:5104
 msgid "invalid event list. Failed.\n"
 msgstr ""
 
-#: src/multitrack.c:4944
+#: src/multitrack.c:5110
 msgid "event list has invalid fps. Failed.\n"
 msgstr ""
 
-#: src/multitrack.c:4953
+#: src/multitrack.c:5122
 #, c-format
 msgid ""
 "\n"
@@ -8545,7 +8651,7 @@
 "then load in the new set from the File menu.\n"
 msgstr ""
 
-#: src/multitrack.c:4993
+#: src/multitrack.c:5163
 #, c-format
 msgid ""
 "\n"
@@ -8553,600 +8659,592 @@
 "It cannot be loaded.\n"
 msgstr ""
 
-#: src/multitrack.c:5329 src/multitrack.c:5338 src/multitrack.c:21133
+#: src/multitrack.c:5452
 msgid "Layout was wiped.\n"
 msgstr ""
 
-#: src/multitrack.c:5374
+#: src/multitrack.c:5547
 #, c-format
 msgid "LiVES-%s: Multitrack %dx%d : %d bpp %.3f fps"
 msgstr ""
 
-#: src/multitrack.c:5617
+#: src/multitrack.c:5793
 msgid "In/out"
 msgstr ""
 
-#: src/multitrack.c:5619
+#: src/multitrack.c:5795
 msgid "FX stack"
 msgstr ""
 
-#: src/multitrack.c:5627 src/omc-learn.c:673
+#: src/multitrack.c:5803 src/omc-learn.c:659
 msgid "Params."
 msgstr ""
 
-#: src/multitrack.c:5978
+#: src/multitrack.c:6157
 msgid "_Open..."
 msgstr ""
 
-#: src/multitrack.c:5996
+#: src/multitrack.c:6175
 msgid "O_pen File Selection..."
 msgstr ""
 
-#: src/multitrack.c:6040
+#: src/multitrack.c:6219
 msgid "Import Selection from _dvd/vcd..."
 msgstr ""
 
-#: src/multitrack.c:6050
+#: src/multitrack.c:6229
 msgid "Import Selection from _dvd"
 msgstr ""
 
-#: src/multitrack.c:6060
+#: src/multitrack.c:6239
 msgid "Import Selection from _vcd"
 msgstr ""
 
-#: src/multitrack.c:6076
+#: src/multitrack.c:6255
 msgid "_Import from Device"
 msgstr ""
 
-#: src/multitrack.c:6103
+#: src/multitrack.c:6282
 msgid "_Close the selected clip"
 msgstr ""
 
-#: src/multitrack.c:6198
+#: src/multitrack.c:6377
 msgid "_Save layout as..."
 msgstr ""
 
-#: src/multitrack.c:6206
+#: src/multitrack.c:6385
 msgid "_Load layout..."
 msgstr ""
 
-#: src/multitrack.c:6210
+#: src/multitrack.c:6389
 msgid "_Wipe/Delete layout..."
 msgstr ""
 
-#: src/multitrack.c:6236
+#: src/multitrack.c:6415
 msgid "_Ignore width, height and audio values from loaded layouts"
 msgstr ""
 
-#: src/multitrack.c:6240
+#: src/multitrack.c:6419
 msgid "Auto load _subtitles with clips"
 msgstr ""
 
-#: src/multitrack.c:6322
+#: src/multitrack.c:6501
 msgid "_CLIP EDITOR"
 msgstr ""
 
-#: src/multitrack.c:6334
+#: src/multitrack.c:6513
 msgid "_Adjust selected clip start/end points"
 msgstr ""
 
-#: src/multitrack.c:6343
+#: src/multitrack.c:6522
 msgid "_Insert selected clip"
 msgstr ""
 
-#: src/multitrack.c:6355
+#: src/multitrack.c:6534
 msgid "_Insert selected clip audio"
 msgstr ""
 
-#: src/multitrack.c:6364
+#: src/multitrack.c:6543
 msgid "_Delete selected block"
 msgstr ""
 
-#: src/multitrack.c:6373
+#: src/multitrack.c:6555
 msgid "_Jump to previous block boundary"
 msgstr ""
 
-#: src/multitrack.c:6382
+#: src/multitrack.c:6564
 msgid "_Jump to next block boundary"
 msgstr ""
 
-#: src/multitrack.c:6395
+#: src/multitrack.c:6577
 msgid "Clear _marks from timeline"
 msgstr ""
 
-#: src/multitrack.c:6403
+#: src/multitrack.c:6585
 msgid "Ignore selection limits when inserting"
 msgstr ""
 
-#: src/multitrack.c:6420 src/multitrack.c:16719
+#: src/multitrack.c:6602 src/multitrack.c:17009
 msgid "_Play from Timeline Position"
 msgstr ""
 
-#: src/multitrack.c:6434
+#: src/multitrack.c:6616
 msgid "Pla_y selected time only"
 msgstr ""
 
-#: src/multitrack.c:6518
+#: src/multitrack.c:6700
 msgid "_Move effects with blocks"
 msgstr ""
 
-#: src/multitrack.c:6531
+#: src/multitrack.c:6713
 msgid "Select _autotransition effect..."
 msgstr ""
 
-#: src/multitrack.c:6542
+#: src/multitrack.c:6724
 msgid "Crossfade audio with autotransition"
 msgstr ""
 
-#: src/multitrack.c:6550
+#: src/multitrack.c:6732
 msgid "View/_Edit selected effect"
 msgstr ""
 
-#: src/multitrack.c:6554
+#: src/multitrack.c:6736
 msgid "_Delete selected effect"
 msgstr ""
 
-#: src/multitrack.c:6562
+#: src/multitrack.c:6744
 msgid "Apply effect to _block..."
 msgstr ""
 
-#: src/multitrack.c:6619
+#: src/multitrack.c:6801
 msgid "Apply effect to _region..."
 msgstr ""
 
-#: src/multitrack.c:6885
+#: src/multitrack.c:7061
 msgid "_Tracks"
 msgstr ""
 
-#: src/multitrack.c:6896
+#: src/multitrack.c:7072
 msgid "Rename current track"
 msgstr ""
 
-#: src/multitrack.c:6904
+#: src/multitrack.c:7080
 msgid "Make _Backing Audio current track"
 msgstr ""
 
-#: src/multitrack.c:6915
+#: src/multitrack.c:7091
 msgid "Add Video Track at _Rear"
 msgstr ""
 
-#: src/multitrack.c:6923
+#: src/multitrack.c:7099
 msgid "Add Video Track at _Front"
 msgstr ""
 
-#: src/multitrack.c:6936
+#: src/multitrack.c:7112
 msgid "_Split current track at cursor"
 msgstr ""
 
-#: src/multitrack.c:6948
+#: src/multitrack.c:7124
 msgid "_Split selected video tracks"
 msgstr ""
 
-#: src/multitrack.c:6961
+#: src/multitrack.c:7137
 msgid "Insert gap in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:6969
+#: src/multitrack.c:7145
 msgid "Insert gap in current track/selected time"
 msgstr ""
 
-#: src/multitrack.c:6981
+#: src/multitrack.c:7157
 msgid "Close all _gaps in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:7007
+#: src/multitrack.c:7183
 msgid "Se_lection"
 msgstr "_Selección"
 
-#: src/multitrack.c:7018
+#: src/multitrack.c:7194
 msgid "_Select Current Track"
 msgstr ""
 
-#: src/multitrack.c:7025
+#: src/multitrack.c:7201
 msgid "Select _all video tracks"
 msgstr ""
 
-#: src/multitrack.c:7032
+#: src/multitrack.c:7208
 msgid "Select _no video tracks"
 msgstr ""
 
-#: src/multitrack.c:7039
+#: src/multitrack.c:7215
 msgid "Select all _time"
 msgstr ""
 
-#: src/multitrack.c:7050
+#: src/multitrack.c:7226
 msgid "Select from _zero time"
 msgstr ""
 
-#: src/multitrack.c:7057
+#: src/multitrack.c:7233
 msgid "Select to _end time"
 msgstr ""
 
-#: src/multitrack.c:7064
+#: src/multitrack.c:7240
 msgid "_Copy..."
 msgstr "_Copiar..."
 
-#: src/multitrack.c:7075
+#: src/multitrack.c:7251
 msgid "_Timecode to region start"
 msgstr ""
 
-#: src/multitrack.c:7082
+#: src/multitrack.c:7258
 msgid "_Timecode to region end"
 msgstr ""
 
-#: src/multitrack.c:7089
+#: src/multitrack.c:7265
 msgid "_Region start to timecode"
 msgstr ""
 
-#: src/multitrack.c:7096
+#: src/multitrack.c:7272
 msgid "_Region end to timecode"
 msgstr ""
 
-#: src/multitrack.c:7110
+#: src/multitrack.c:7286
 msgid "Select/deselect block at current track/time"
 msgstr ""
 
-#: src/multitrack.c:7135
+#: src/multitrack.c:7311
 msgid "_Change width, height and audio values..."
 msgstr ""
 
-#: src/multitrack.c:7194
+#: src/multitrack.c:7370
 msgid "_Render"
 msgstr "_Renderizar"
 
-#: src/multitrack.c:7205
+#: src/multitrack.c:7381
 msgid "_Render all to new clip"
 msgstr ""
 
-#: src/multitrack.c:7220
+#: src/multitrack.c:7396
 msgid "Render _video"
 msgstr ""
 
-#: src/multitrack.c:7225
+#: src/multitrack.c:7401
 msgid "Render _audio"
 msgstr ""
 
-#: src/multitrack.c:7235
+#: src/multitrack.c:7411
 msgid "_Normalise rendered audio"
 msgstr ""
 
-#: src/multitrack.c:7242
+#: src/multitrack.c:7418
 msgid "_Pre-render audio"
 msgstr ""
 
-#: src/multitrack.c:7251
+#: src/multitrack.c:7427
 msgid "_View"
 msgstr "_Visualización"
 
-#: src/multitrack.c:7270
+#: src/multitrack.c:7446
 msgid "Block _In/out points"
 msgstr ""
 
-#: src/multitrack.c:7279
+#: src/multitrack.c:7455
 msgid "_Effects at current"
 msgstr ""
 
-#: src/multitrack.c:7297
+#: src/multitrack.c:7473
 msgid "Audio parameters"
 msgstr ""
 
-#: src/multitrack.c:7308
+#: src/multitrack.c:7484
 msgid "Show backing _audio track"
 msgstr ""
 
-#: src/multitrack.c:7312
+#: src/multitrack.c:7488
 msgid "Compact view"
 msgstr "Vista compacta"
 
-#: src/multitrack.c:7320
+#: src/multitrack.c:7496
 msgid "Maximum tracks to display..."
 msgstr ""
 
-#: src/multitrack.c:7327
+#: src/multitrack.c:7503
 msgid "Scroll to follow playback"
 msgstr ""
 
-#: src/multitrack.c:7331
+#: src/multitrack.c:7507
 msgid "_Center on cursor"
 msgstr ""
 
-#: src/multitrack.c:7338
+#: src/multitrack.c:7514
 msgid "_Zoom in"
 msgstr ""
 
-#: src/multitrack.c:7349
+#: src/multitrack.c:7525
 msgid "_Zoom out"
 msgstr ""
 
-#: src/multitrack.c:7361
+#: src/multitrack.c:7537
 msgid "Multitrack _details"
 msgstr ""
 
-#: src/multitrack.c:7374
+#: src/multitrack.c:7550
 msgid "_Event Window"
 msgstr ""
 
-#: src/multitrack.c:7378
+#: src/multitrack.c:7554
 msgid "_Event Window (selected time only)"
 msgstr ""
 
-#: src/multitrack.c:7382
+#: src/multitrack.c:7558
 msgid "_Show FRAME events"
 msgstr ""
 
-#: src/multitrack.c:7399
+#: src/multitrack.c:7575
 msgid "_Show multitrack keys"
 msgstr ""
 
-#: src/multitrack.c:7468
+#: src/multitrack.c:7644
 msgid "Mouse mode: _Move"
 msgstr ""
 
-#: src/multitrack.c:7476
+#: src/multitrack.c:7652
 msgid "Mouse mode: _Select"
 msgstr ""
 
-#: src/multitrack.c:7505
+#: src/multitrack.c:7681
 msgid "Insert mode: _Normal"
 msgstr ""
 
-#: src/multitrack.c:7733
+#: src/multitrack.c:7909
 msgid "Insert with _audio"
 msgstr ""
 
-#: src/multitrack.c:7734
+#: src/multitrack.c:7910
 msgid ""
 "Select whether video clips are inserted and moved with their audio or not"
 msgstr ""
 
-#: src/multitrack.c:7829
+#: src/multitrack.c:8007
 msgid "Select _overlap"
 msgstr ""
 
-#: src/multitrack.c:7830
+#: src/multitrack.c:8008
 msgid ""
 "Select whether timeline selection snaps to overlap between selected tracks "
 "or not"
 msgstr ""
 
-#: src/multitrack.c:7894 src/multitrack.c:14198
+#: src/multitrack.c:8073 src/multitrack.c:14422
 msgid "Expanded View (d)"
 msgstr ""
 
-#: src/multitrack.c:7897 src/multitrack.c:14205
+#: src/multitrack.c:8076 src/multitrack.c:14428
 msgid "Compact View (d)"
 msgstr ""
 
-#: src/multitrack.c:7939
+#: src/multitrack.c:8118
 msgid "Gravity: _Normal"
 msgstr ""
 
-#: src/multitrack.c:7952
+#: src/multitrack.c:8131
 msgid "Gravity: _Left"
 msgstr ""
 
-#: src/multitrack.c:7967
+#: src/multitrack.c:8146
 msgid "Gravity: _Right"
 msgstr ""
 
-#: src/multitrack.c:8297
+#: src/multitrack.c:8496
 msgid "_Apply"
 msgstr "_Aplicar"
 
-#: src/multitrack.c:8319
+#: src/multitrack.c:8518
 msgid "Time"
 msgstr ""
 
-#: src/multitrack.c:8333
+#: src/multitrack.c:8532
 msgid "_Del. node"
 msgstr ""
 
-#: src/multitrack.c:8341
+#: src/multitrack.c:8540
 msgid "_Next node"
 msgstr ""
 
-#: src/multitrack.c:8349
+#: src/multitrack.c:8548
 msgid "_Prev node"
 msgstr ""
 
-#: src/multitrack.c:8373
+#: src/multitrack.c:8574
 msgid "_Reverse playback  "
 msgstr ""
 
-#: src/multitrack.c:8395
+#: src/multitrack.c:8596
 msgid "_Velocity  "
 msgstr ""
 
-#: src/multitrack.c:8464
+#: src/multitrack.c:8664
 msgid "Anchor _start"
 msgstr ""
 
-#: src/multitrack.c:8465
+#: src/multitrack.c:8665
 msgid "Anchor the start point to the timeline"
 msgstr ""
 
-#: src/multitrack.c:8481
-msgid "Start frame"
-msgstr "Comezar no fotograma"
-
-#: src/multitrack.c:8533
+#: src/multitrack.c:8728
 msgid "Anchor _end"
 msgstr ""
 
-#: src/multitrack.c:8534
+#: src/multitrack.c:8729
 msgid "Anchor the end point to the timeline"
 msgstr ""
 
-#: src/multitrack.c:8546
-msgid "End frame"
-msgstr "Rematar no fotograma"
-
-#: src/multitrack.c:8739
+#: src/multitrack.c:8929
 msgid "Scroll"
 msgstr "Desprazar"
 
-#: src/multitrack.c:9316
+#: src/multitrack.c:9502
 msgid ""
 "\n"
 "==============================\n"
 "Switched to Clip Edit mode\n"
 msgstr ""
 
-#: src/multitrack.c:9502
+#: src/multitrack.c:9708
 msgid "Timeline (seconds)"
 msgstr ""
 
-#: src/multitrack.c:9984
+#: src/multitrack.c:10202
 msgid " Backing audio"
 msgstr ""
 
-#: src/multitrack.c:9987
+#: src/multitrack.c:10204
 #, c-format
 msgid " Layer %d audio"
 msgstr ""
 
-#: src/multitrack.c:9995
+#: src/multitrack.c:10212
 msgid "Show/hide audio details"
 msgstr ""
 
-#: src/multitrack.c:10010 src/multitrack.c:10232
+#: src/multitrack.c:10227 src/multitrack.c:10452
 #, c-format
 msgid "Layer %d audio"
 msgstr ""
 
-#: src/multitrack.c:10144 src/multitrack.c:10261
+#: src/multitrack.c:10353 src/multitrack.c:10481
 #, c-format
 msgid "%s (layer %d)"
 msgstr ""
 
-#: src/multitrack.c:10184
+#: src/multitrack.c:10403
 msgid "Select track"
 msgstr ""
 
-#: src/multitrack.c:10188
+#: src/multitrack.c:10407
 msgid "Show/hide audio"
 msgstr ""
 
-#: src/multitrack.c:10194
+#: src/multitrack.c:10413
 #, c-format
 msgid "Video %d"
 msgstr ""
 
-#: src/multitrack.c:10233
+#: src/multitrack.c:10453
 #, c-format
 msgid " %s"
 msgstr " %s"
 
-#: src/multitrack.c:10346
+#: src/multitrack.c:10574
 msgid "LiVES: Selected effect"
 msgstr ""
 
-#: src/multitrack.c:10358
+#: src/multitrack.c:10586
 msgid "_View/Edit this effect"
 msgstr ""
 
-#: src/multitrack.c:10361
+#: src/multitrack.c:10588
 msgid "_View this effect"
 msgstr ""
 
-#: src/multitrack.c:10369
+#: src/multitrack.c:10596
 msgid "_Delete this effect"
 msgstr ""
 
-#: src/multitrack.c:10422
+#: src/multitrack.c:10648
 msgid "Cannot insert after this effect"
 msgstr ""
 
-#: src/multitrack.c:10451
+#: src/multitrack.c:10677
 msgid "This effect cannot be moved"
 msgstr ""
 
-#: src/multitrack.c:10499
+#: src/multitrack.c:10724
 #, c-format
 msgid "  %d to %d selected  "
 msgstr ""
 
-#: src/multitrack.c:10502 src/multitrack.c:10746
+#: src/multitrack.c:10727 src/multitrack.c:10968
 #, c-format
 msgid "%.2f sec."
 msgstr ""
 
-#: src/multitrack.c:10717
+#: src/multitrack.c:10940
 #, c-format
 msgid "%d frames"
 msgstr ""
 
-#: src/multitrack.c:11070
+#: src/multitrack.c:11299
 msgid ""
 "\n"
 "==============================\n"
 "Switched to Multitrack mode\n"
 msgstr ""
 
-#: src/multitrack.c:12691
+#: src/multitrack.c:12939
 msgid "Drag the time slider to where you"
 msgstr ""
 
-#: src/multitrack.c:12692
+#: src/multitrack.c:12940
 msgid "want to set effect parameters"
 msgstr ""
 
-#: src/multitrack.c:12693
+#: src/multitrack.c:12941
 msgid "Set parameters, then click \"Apply\"\n"
 msgstr ""
 
-#: src/multitrack.c:12694
+#: src/multitrack.c:12942
 msgid ""
 "NODES are points where parameters\n"
 "have been set.\n"
 "Nodes can be deleted."
 msgstr ""
 
-#: src/multitrack.c:12697
+#: src/multitrack.c:12944
 msgid "Effect has no parameters.\n"
 msgstr ""
 
-#: src/multitrack.c:12788
+#: src/multitrack.c:13033
 #, c-format
 msgid "%s output"
 msgstr ""
 
-#: src/multitrack.c:12794 src/multitrack.c:12804
+#: src/multitrack.c:13038 src/multitrack.c:13046
 #, c-format
 msgid "layer %d"
 msgstr ""
 
-#: src/multitrack.c:12796 src/multitrack.c:12806
+#: src/multitrack.c:13039 src/multitrack.c:13047
 msgid "audio track"
 msgstr ""
 
-#: src/multitrack.c:12797
+#: src/multitrack.c:13040
 #, c-format
 msgid "%s to %s"
 msgstr "%s a %s"
 
-#: src/multitrack.c:12807
+#: src/multitrack.c:13048
 #, c-format
 msgid "%s from %s"
 msgstr ""
 
-#: src/multitrack.c:12860
+#: src/multitrack.c:13099
 msgid "_Prev filter map"
 msgstr ""
 
-#: src/multitrack.c:12871
+#: src/multitrack.c:13110
 msgid "Insert _before"
 msgstr ""
 
-#: src/multitrack.c:12881
+#: src/multitrack.c:13120
 msgid "Insert _after"
 msgstr ""
 
-#: src/multitrack.c:12896
+#: src/multitrack.c:13134
 msgid "_Next filter map"
 msgstr ""
 
-#: src/multitrack.c:12911
+#: src/multitrack.c:13148
 msgid ""
 "\n"
 "\n"
@@ -9154,272 +9252,271 @@
 "current time.\n"
 msgstr ""
 
-#: src/multitrack.c:12929
+#: src/multitrack.c:13166
 msgid ""
 "Drag a compositor anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:12936
+#: src/multitrack.c:13173
 msgid ""
 "Drag a transition anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:12944
+#: src/multitrack.c:13181
 msgid ""
 "Effects can be dragged\n"
 "onto blocks on the timeline."
 msgstr ""
 
-#: src/multitrack.c:13166
+#: src/multitrack.c:13406
 msgid "LiVES: Selected block/frame"
 msgstr ""
 
-#: src/multitrack.c:13173
+#: src/multitrack.c:13413
 msgid "_Select this block"
 msgstr ""
 
-#: src/multitrack.c:13183
+#: src/multitrack.c:13423
 msgid "_Split block here"
 msgstr ""
 
-#: src/multitrack.c:13191
+#: src/multitrack.c:13431
 msgid "List _effects here"
 msgstr ""
 
-#: src/multitrack.c:13200 src/multitrack.c:13277
+#: src/multitrack.c:13440 src/multitrack.c:13518
 #, c-format
 msgid "_Adjust %s"
 msgstr ""
 
-#: src/multitrack.c:13215
+#: src/multitrack.c:13455
 msgid "_Delete this block"
 msgstr ""
 
-#: src/multitrack.c:13258
+#: src/multitrack.c:13500
 msgid "_Insert here"
 msgstr ""
 
-#: src/multitrack.c:13264
+#: src/multitrack.c:13505
 msgid "_Insert audio here"
 msgstr ""
 
-#: src/multitrack.c:14801
+#: src/multitrack.c:15017
 #, c-format
 msgid "Inserted gap in selected tracks from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:14835
+#: src/multitrack.c:15048
 #, c-format
 msgid "Inserted gap in track %s from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15036
+#: src/multitrack.c:15244
 #, c-format
 msgid "Undid %s\n"
 msgstr ""
 
-#: src/multitrack.c:15235
+#: src/multitrack.c:15445
 #, c-format
 msgid "Redid %s\n"
 msgstr ""
 
-#: src/multitrack.c:15268
+#: src/multitrack.c:15475
 msgid ""
 "\n"
 " (variable)"
 msgstr ""
 
-#: src/multitrack.c:15502 src/multitrack.c:15614 src/multitrack.c:18736
-#: src/multitrack.c:18748
+#: src/multitrack.c:15710 src/multitrack.c:15823 src/multitrack.c:19077
+#: src/multitrack.c:19089
 #, c-format
 msgid "track %s"
 msgstr ""
 
-#: src/multitrack.c:15507 src/multitrack.c:15619 src/multitrack.c:18741
+#: src/multitrack.c:15715 src/multitrack.c:15828 src/multitrack.c:19082
 #, c-format
 msgid "tracks %s and %s"
 msgstr ""
 
-#: src/multitrack.c:15513 src/multitrack.c:15625 src/multitrack.c:18751
+#: src/multitrack.c:15721 src/multitrack.c:15834 src/multitrack.c:19091
 msgid "selected tracks"
 msgstr ""
 
-#: src/multitrack.c:15516
+#: src/multitrack.c:15726
 #, c-format
 msgid "Added %s %s to %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15550
+#: src/multitrack.c:15760
 #, c-format
 msgid "Added effect %s to track %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15631
+#: src/multitrack.c:15845
 #, c-format
 msgid "Deleted %s %s from %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15935
+#: src/multitrack.c:16143
 #, c-format
 msgid "rendered %d frames to new clip.\n"
 msgstr ""
 
-#: src/multitrack.c:16025
+#: src/multitrack.c:16230
 msgid "Cleaning up..."
 msgstr "Limpando..."
 
-#: src/multitrack.c:16712
+#: src/multitrack.c:17003
 msgid "_Pause"
 msgstr "_Pausa"
 
-#: src/multitrack.c:16713
+#: src/multitrack.c:17004
 msgid "Pause (p)"
 msgstr ""
 
-#: src/multitrack.c:16856
+#: src/multitrack.c:17151
 msgid "Press 'm' during playback"
 msgstr ""
 
-#: src/multitrack.c:16857
+#: src/multitrack.c:17152
 msgid "to make a mark on the timeline"
 msgstr ""
 
-#: src/multitrack.c:17154
+#: src/multitrack.c:17498
 #, c-format
 msgid ""
 "Inserted audio %.4f to %.4f from clip %s into backing audio from time %.4f "
 "to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:17414
+#: src/multitrack.c:17759
 #, c-format
 msgid ""
 "Inserted frames %d to %d from clip %s into track %s from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:17998
+#: src/multitrack.c:18332
 #, c-format
 msgid ""
 "Time region %.3f to %.3f\n"
 "selected.\n"
 msgstr ""
 
-#: src/multitrack.c:18002
+#: src/multitrack.c:18336
 msgid ""
 "select one or more tracks\n"
 "to create a region.\n"
 msgstr ""
 
-#: src/multitrack.c:18004
+#: src/multitrack.c:18337
 #, c-format
 msgid "%d video tracks selected.\n"
 msgstr ""
 
-#: src/multitrack.c:18006
+#: src/multitrack.c:18339
 msgid ""
 "Double click on timeline\n"
 "to deselect time region."
 msgstr ""
 
-#: src/multitrack.c:18013
+#: src/multitrack.c:18346
 msgid ""
 "Single click on an effect\n"
 "to select it."
 msgstr ""
 
-#: src/multitrack.c:18014
+#: src/multitrack.c:18347
 msgid ""
 "Double click on an effect\n"
 "to edit it."
 msgstr ""
 
-#: src/multitrack.c:18015
+#: src/multitrack.c:18348
 msgid ""
 "Right click on an effect\n"
 "for context menu.\n"
 msgstr ""
 
-#: src/multitrack.c:18017
+#: src/multitrack.c:18350
 msgid ""
 "Effect order can be changed at\n"
 "FILTER MAPS"
 msgstr ""
 
-#: src/multitrack.c:18024
+#: src/multitrack.c:18357
 msgid ""
 "You can select an effect,\n"
 "then use the INSERT BEFORE"
 msgstr ""
 
-#: src/multitrack.c:18025
+#: src/multitrack.c:18358
 msgid "or INSERT AFTER buttons to move it."
 msgstr ""
 
-#: src/multitrack.c:18307 src/multitrack.c:18320
+#: src/multitrack.c:18639 src/multitrack.c:18652
 msgid "Click on another effect,"
 msgstr ""
 
-#: src/multitrack.c:18308 src/multitrack.c:18321
+#: src/multitrack.c:18640 src/multitrack.c:18653
 msgid ""
 "and the selected one\n"
 "will be inserted"
 msgstr ""
 
-#: src/multitrack.c:18309
+#: src/multitrack.c:18641
 msgid "after it.\n"
 msgstr ""
 
-#: src/multitrack.c:18322
+#: src/multitrack.c:18654
 msgid "before it.\n"
 msgstr ""
 
-#: src/multitrack.c:18551
+#: src/multitrack.c:18889
 #, c-format
 msgid "Removed parameter values for effect %s at time %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:18759
+#: src/multitrack.c:19100
 #, c-format
 msgid "Set parameter values for %s %s on %s at time %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:19251 src/multitrack.c:20873
+#: src/multitrack.c:19630 src/multitrack.c:21195
 msgid "_Autoreload each time"
 msgstr ""
 
-#: src/multitrack.c:19323
-#, fuzzy
+#: src/multitrack.c:19702
 msgid "Saving layout"
-msgstr "_Gardar esquema"
+msgstr ""
 
-#: src/multitrack.c:19345
+#: src/multitrack.c:19725
 #, c-format
 msgid "Saved layout to %s\n"
 msgstr ""
 
-#: src/multitrack.c:20783
+#: src/multitrack.c:21125
 msgid "clips and frames"
 msgstr ""
 
-#: src/multitrack.c:20787
+#: src/multitrack.c:21128
 msgid "clips"
 msgstr ""
 
-#: src/multitrack.c:20790
+#: src/multitrack.c:21130
 msgid "frames"
-msgstr "cadros"
+msgstr "fotogramas"
 
-#: src/multitrack.c:20800
+#: src/multitrack.c:21140
 msgid ""
 "\n"
 "Auto reload layout.\n"
 msgstr ""
 
-#: src/multitrack.c:20803
+#: src/multitrack.c:21143
 #, c-format
 msgid ""
 "%s\n"
@@ -9427,103 +9524,100 @@
 "Therefore it could not be loaded properly.\n"
 msgstr ""
 
-#: src/multitrack.c:20920
+#: src/multitrack.c:21284
 msgid "auto backup"
 msgstr ""
 
-#: src/multitrack.c:20923
+#: src/multitrack.c:21287
 #, c-format
 msgid ""
 "\n"
 "Unable to load layout file %s\n"
 msgstr ""
 
-#: src/multitrack.c:20944
+#: src/multitrack.c:21308
 #, c-format
 msgid "Loading layout from %s..."
 msgstr ""
 
-#: src/multitrack.c:20978
+#: src/multitrack.c:21338
 #, c-format
 msgid "Got %d events...processing..."
 msgstr ""
 
-#: src/multitrack.c:20991
+#: src/multitrack.c:21349
 msgid "Checking and rebuilding event list"
 msgstr ""
 
-#: src/multitrack.c:21017
+#: src/multitrack.c:21374
 #, c-format
 msgid "%d errors detected.\n"
 msgstr ""
 
-#: src/multitrack.c:21068
+#: src/multitrack.c:21422
 #, c-format
 msgid "Multitrack fps set to %.3f\n"
 msgstr ""
 
-#: src/multitrack.c:21225
-#, fuzzy
+#: src/multitrack.c:21576
 msgid ""
 "The current layout has changes which have not been saved.\n"
 "Are you sure you wish to wipe it ?\n"
 msgstr ""
-"O esquema actual non foi salvo.\n"
-"Que desexa facer ?\n"
 
-#: src/multitrack.c:22047
+#: src/multitrack.c:22385
 msgid "LiVES: Multitrack audio mixer"
 msgstr ""
 
-#: src/multitrack.c:22077
+#: src/multitrack.c:22414
 msgid "_Reset values"
 msgstr ""
 
-#: src/multitrack.c:22081
+#: src/multitrack.c:22418
 msgid "_Close mixer"
 msgstr ""
 
-#: src/multitrack.c:22130
+#: src/multitrack.c:22466
 msgid ""
 "_Invert backing audio\n"
 "and layer volumes"
 msgstr ""
 
-#: src/multitrack.c:22132
+#: src/multitrack.c:22468
 msgid "Adjust backing and layer audio values so that they sum to 1.0"
 msgstr ""
 
-#: src/multitrack.c:22175
+#: src/multitrack.c:22510
 msgid "_Gang layer audio"
 msgstr ""
 
-#: src/multitrack.c:22177
+#: src/multitrack.c:22512
 msgid "Adjust all layer audio values to the same value"
 msgstr ""
 
-#: src/jack.c:104
+#: src/jack.c:102
 msgid "JACK server started\n"
 msgstr ""
 
-#: src/jack.c:1284 src/jack.c:1353
+#: src/jack.c:1265 src/jack.c:1334
 msgid "Unable to connect to JACK server\n"
 msgstr ""
 
-#: src/jack.c:1512
+#: src/jack.c:1491
 msgid "Started jack audio subsystem.\n"
 msgstr ""
 
-#: src/jack.c:1623
+#: src/jack.c:1600
 msgid "Started jack audio reader.\n"
 msgstr ""
 
-#: src/jack.c:1838
+#: src/jack.c:1815
 msgid ""
 "\n"
 "Connection to jack audio was reset.\n"
 msgstr ""
 
-#: src/pulse.c:87
+#: src/pulse.c:88
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -9531,7 +9625,7 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:92
+#: src/pulse.c:94
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -9539,7 +9633,7 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:96
+#: src/pulse.c:99
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -9547,335 +9641,335 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:101
+#: src/pulse.c:104
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
 msgstr ""
 
-#: src/pulse.c:107
+#: src/pulse.c:109
 msgid "LiVES will exit and you can choose another audio player.\n"
 msgstr ""
 
-#: src/pulse.c:1352
+#: src/pulse.c:1335
 msgid ""
 "\n"
 "Connection to pulse audio was reset.\n"
 msgstr ""
 
-#: src/colourspace.c:1100
+#: src/colourspace.c:1092
 msgid "unclamped"
 msgstr ""
 
-#: src/colourspace.c:1101
+#: src/colourspace.c:1093
 msgid "clamped"
 msgstr ""
 
-#: src/omc-learn.c:195
+#: src/omc-learn.c:191
 #, c-format
 msgid "Responding to joystick events from %s\n"
 msgstr ""
 
-#: src/omc-learn.c:289
+#: src/omc-learn.c:279
 msgid "Creating ALSA seq port..."
 msgstr ""
 
-#: src/omc-learn.c:325
+#: src/omc-learn.c:313
 #, c-format
 msgid "Responding to MIDI events from %s\n"
 msgstr ""
 
-#: src/omc-learn.c:568
+#: src/omc-learn.c:554
 msgid "data"
 msgstr "datos"
 
-#: src/omc-learn.c:571
+#: src/omc-learn.c:557
 msgid "velocity"
 msgstr "velocidade"
 
-#: src/omc-learn.c:572
+#: src/omc-learn.c:558
 msgid "note"
 msgstr "nota"
 
-#: src/omc-learn.c:574 src/omc-learn.c:736 src/omc-learn.c:1105
-#: src/omc-learn.c:1591 src/omc-learn.c:1640
+#: src/omc-learn.c:560 src/omc-learn.c:724 src/omc-learn.c:1092
+#: src/omc-learn.c:1581 src/omc-learn.c:1630
 msgid "value"
 msgstr "valor"
 
-#: src/omc-learn.c:576
+#: src/omc-learn.c:562
 msgid "state"
 msgstr "estado"
 
-#: src/omc-learn.c:688
+#: src/omc-learn.c:674
 msgid "variable"
 msgstr "variábel"
 
-#: src/omc-learn.c:1001
+#: src/omc-learn.c:989
 msgid "Vars."
 msgstr ""
 
-#: src/omc-learn.c:1054
+#: src/omc-learn.c:1041
 #, c-format
 msgid "MIDI ch %d note on"
 msgstr ""
 
-#: src/omc-learn.c:1058
+#: src/omc-learn.c:1045
 #, c-format
 msgid "MIDI ch %d note off"
 msgstr ""
 
-#: src/omc-learn.c:1062
+#: src/omc-learn.c:1049
 #, c-format
 msgid "MIDI ch %d controller %d"
 msgstr ""
 
-#: src/omc-learn.c:1066
+#: src/omc-learn.c:1053
 #, c-format
 msgid "MIDI ch %d pitch bend"
 msgstr ""
 
-#: src/omc-learn.c:1070
+#: src/omc-learn.c:1057
 #, c-format
 msgid "MIDI ch %d pgm change"
 msgstr ""
 
-#: src/omc-learn.c:1073
+#: src/omc-learn.c:1060
 #, c-format
 msgid "Joystick button %d"
 msgstr ""
 
-#: src/omc-learn.c:1076
+#: src/omc-learn.c:1063
 #, c-format
 msgid "Joystick axis %d"
 msgstr ""
 
-#: src/omc-learn.c:1113
+#: src/omc-learn.c:1100
 msgid "x"
 msgstr "x"
 
-#: src/omc-learn.c:1122
+#: src/omc-learn.c:1109
 msgid "range"
 msgstr "intervalo"
 
-#: src/omc-learn.c:1143
+#: src/omc-learn.c:1130
 msgid "+ offset1"
 msgstr ""
 
-#: src/omc-learn.c:1161
+#: src/omc-learn.c:1150
 msgid "* scale"
 msgstr ""
 
-#: src/omc-learn.c:1179
+#: src/omc-learn.c:1170
 msgid "+ offset2"
 msgstr ""
 
-#: src/omc-learn.c:1280
+#: src/omc-learn.c:1270
 msgid ""
 "\n"
 "Click OK to delete all entries\n"
 msgstr ""
 
-#: src/omc-learn.c:1318
+#: src/omc-learn.c:1308
 msgid "LiVES: OMC learner"
 msgstr ""
 
-#: src/omc-learn.c:1334
+#: src/omc-learn.c:1324
 msgid "Clear _unmatched"
 msgstr ""
 
-#: src/omc-learn.c:1345
+#: src/omc-learn.c:1335
 msgid "_Delete all"
 msgstr "_Borrar todo"
 
-#: src/omc-learn.c:1411
+#: src/omc-learn.c:1401
 msgid "Start video playback"
 msgstr ""
 
-#: src/omc-learn.c:1414
+#: src/omc-learn.c:1404
 msgid "Stop video playback"
 msgstr ""
 
-#: src/omc-learn.c:1418
+#: src/omc-learn.c:1408
 msgid "Clip select <clipnum>"
 msgstr ""
 
-#: src/omc-learn.c:1419
+#: src/omc-learn.c:1409
 msgid "Switch foreground clip to the nth valid clip"
 msgstr ""
 
-#: src/omc-learn.c:1423
+#: src/omc-learn.c:1413
 msgid "Play forwards"
 msgstr ""
 
-#: src/omc-learn.c:1424
+#: src/omc-learn.c:1414
 msgid "Play video in a forwards direction"
 msgstr ""
 
-#: src/omc-learn.c:1427
+#: src/omc-learn.c:1417
 msgid "Play backwards"
 msgstr ""
 
-#: src/omc-learn.c:1428
+#: src/omc-learn.c:1418
 msgid "Play video in a backwards direction"
 msgstr ""
 
-#: src/omc-learn.c:1431
+#: src/omc-learn.c:1421
 msgid "Reverse playback direction"
 msgstr ""
 
-#: src/omc-learn.c:1432
+#: src/omc-learn.c:1422
 msgid "Reverse direction of video playback"
 msgstr ""
 
-#: src/omc-learn.c:1435
+#: src/omc-learn.c:1425
 msgid "Play video faster"
 msgstr ""
 
-#: src/omc-learn.c:1436
+#: src/omc-learn.c:1426
 msgid "Play video at a slightly faster rate"
 msgstr ""
 
-#: src/omc-learn.c:1439
+#: src/omc-learn.c:1429
 msgid "Play video slower"
 msgstr ""
 
-#: src/omc-learn.c:1440
+#: src/omc-learn.c:1430
 msgid "Play video at a slightly slower rate"
 msgstr ""
 
-#: src/omc-learn.c:1443
+#: src/omc-learn.c:1433
 msgid "Toggle video freeze"
 msgstr ""
 
-#: src/omc-learn.c:1444
+#: src/omc-learn.c:1434
 msgid "Freeze video, or if already frozen, unfreeze it"
 msgstr ""
 
-#: src/omc-learn.c:1447
+#: src/omc-learn.c:1437
 msgid "Set video framerate to <fps>"
 msgstr ""
 
-#: src/omc-learn.c:1448
+#: src/omc-learn.c:1438
 msgid "Set framerate of foreground clip to <float fps>"
 msgstr ""
 
-#: src/omc-learn.c:1452
+#: src/omc-learn.c:1442
 msgid "Start recording"
 msgstr ""
 
-#: src/omc-learn.c:1455
+#: src/omc-learn.c:1445
 msgid "Stop recording"
 msgstr ""
 
-#: src/omc-learn.c:1458
+#: src/omc-learn.c:1448
 msgid "Toggle recording state"
 msgstr ""
 
-#: src/omc-learn.c:1461
+#: src/omc-learn.c:1451
 msgid "Swap foreground and background clips"
 msgstr ""
 
-#: src/omc-learn.c:1463
+#: src/omc-learn.c:1453
 msgid "Reset effect keys"
 msgstr ""
 
-#: src/omc-learn.c:1464
+#: src/omc-learn.c:1454
 msgid "Switch all effects off."
 msgstr ""
 
-#: src/omc-learn.c:1467
+#: src/omc-learn.c:1457
 msgid "Enable effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1471
+#: src/omc-learn.c:1461
 msgid "Disable effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1475
+#: src/omc-learn.c:1465
 msgid "Toggle effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1479
+#: src/omc-learn.c:1469
 msgid "Set parameter value <key> <pnum> = <value>"
 msgstr ""
 
-#: src/omc-learn.c:1480
+#: src/omc-learn.c:1470
 msgid "Set <value> of pth (numerical) parameter for effect key <key>."
 msgstr ""
 
-#: src/omc-learn.c:1484
+#: src/omc-learn.c:1474
 msgid "Switch foreground to next clip"
 msgstr ""
 
-#: src/omc-learn.c:1487
+#: src/omc-learn.c:1477
 msgid "Switch foreground to previous clip"
 msgstr ""
 
-#: src/omc-learn.c:1490
+#: src/omc-learn.c:1480
 msgid "Set video framerate to ratio <fps_ratio>"
 msgstr ""
 
-#: src/omc-learn.c:1491
+#: src/omc-learn.c:1481
 msgid "Set framerate ratio of foreground clip to <float fps_ratio>"
 msgstr ""
 
-#: src/omc-learn.c:1495
+#: src/omc-learn.c:1485
 msgid "Retrigger clip <clipnum>"
 msgstr ""
 
-#: src/omc-learn.c:1496
+#: src/omc-learn.c:1486
 msgid ""
 "Switch foreground clip to the nth valid clip, and reset the frame number"
 msgstr ""
 
-#: src/omc-learn.c:1500
+#: src/omc-learn.c:1490
 msgid "Cycle to next mode for effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1504
+#: src/omc-learn.c:1494
 msgid "Cycle to previous mode for effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1508
+#: src/omc-learn.c:1498
 msgid "Set playback plugin parameter value <pnum> = <value>"
 msgstr ""
 
-#: src/omc-learn.c:1509
+#: src/omc-learn.c:1499
 msgid "Set <value> of pth parameter for the playback plugin."
 msgstr ""
 
 #. TRANSLATORS: short form of "clip number"
-#: src/omc-learn.c:1536 src/omc-learn.c:1607
+#: src/omc-learn.c:1526 src/omc-learn.c:1597
 msgid "clipnum"
 msgstr "clipnum"
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1545
+#: src/omc-learn.c:1535
 msgid "fps"
 msgstr "fps"
 
 #. TRANSLATORS: as in keyboard key
-#: src/omc-learn.c:1553 src/omc-learn.c:1560 src/omc-learn.c:1567
-#: src/omc-learn.c:1575 src/omc-learn.c:1615 src/omc-learn.c:1623
+#: src/omc-learn.c:1543 src/omc-learn.c:1550 src/omc-learn.c:1557
+#: src/omc-learn.c:1565 src/omc-learn.c:1605 src/omc-learn.c:1613
 msgid "key"
 msgstr "chave"
 
 #. TRANSLATORS: short form of "parameter number"
-#: src/omc-learn.c:1583 src/omc-learn.c:1632
+#: src/omc-learn.c:1573 src/omc-learn.c:1622
 msgid "pnum"
 msgstr "pnum"
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1599
+#: src/omc-learn.c:1589
 msgid "fps_ratio"
 msgstr "fps_ratio"
 
-#: src/omc-learn.c:2443
+#: src/omc-learn.c:2417
 #, c-format
 msgid "Saving device mapping to file %s..."
 msgstr ""
 
-#: src/omc-learn.c:2527
+#: src/omc-learn.c:2498
 #, c-format
 msgid ""
 "\n"
@@ -9884,7 +9978,7 @@
 "%s\n"
 msgstr ""
 
-#: src/omc-learn.c:2534
+#: src/omc-learn.c:2505
 #, c-format
 msgid ""
 "\n"
@@ -9893,12 +9987,12 @@
 "%s\n"
 msgstr ""
 
-#: src/omc-learn.c:2571
+#: src/omc-learn.c:2541
 #, c-format
 msgid "Loading device mapping from file %s..."
 msgstr ""
 
-#: src/omc-learn.c:2576
+#: src/omc-learn.c:2544
 #, c-format
 msgid ""
 "\n"
@@ -9908,37 +10002,23 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/videodev.c:547
+#: src/videodev.c:539
 #, c-format
 msgid "Unable to open device %s\n"
 msgstr ""
 
-#: src/videodev.c:564
+#: src/videodev.c:554
 #, c-format
 msgid "Opened device %s\n"
 msgstr ""
 
-#~ msgid "Adjust contrast"
-#~ msgstr "Axustar o contraste"
-
-#, fuzzy
-#~ msgid "Adjusting contrast of"
-#~ msgstr "Axustar o contraste"
-
-#, fuzzy
-#~ msgid "Adjusting noise on"
-#~ msgstr "Axustar o contraste"
-
 #, fuzzy
 #~ msgid "Blank _Colour"
-#~ msgstr "_Inicio"
+#~ msgstr "Fondo"
 
 #, fuzzy
 #~ msgid "Blank frames"
-#~ msgstr "Rematar no fotograma"
-
-#~ msgid "Blanking"
-#~ msgstr "Baleirando"
+#~ msgstr "fotogramas"
 
 #, fuzzy
 #~ msgid "Block _height"
@@ -9948,15 +10028,9 @@
 #~ msgid "Block _width"
 #~ msgstr "_Altura"
 
-#~ msgid "Blur"
-#~ msgstr "Desenfoque"
-
-#~ msgid "Bluring"
-#~ msgstr "Desenfoquando"
-
 #, fuzzy
 #~ msgid "Border _Colour"
-#~ msgstr "_Inicio"
+#~ msgstr "Fondo"
 
 #, fuzzy
 #~ msgid "Brightness _end"
@@ -9978,135 +10052,47 @@
 #~ msgid "Brightness start"
 #~ msgstr "_Ignorar as mudanzas"
 
-#~ msgid "Charcoal"
-#~ msgstr "Carbón"
-
+#, fuzzy
 #~ msgid "Checkerboard"
-#~ msgstr "Tabuleiro de Xadrez"
+#~ msgstr "Gravando"
 
 #, fuzzy
 #~ msgid "Checkerboarding"
-#~ msgstr "Tabuleiro de Xadrez"
+#~ msgstr "Gravando"
 
 #, fuzzy
 #~ msgid "Clipboard _over selection"
-#~ msgstr "Inserir _despois a selección"
+#~ msgstr "_Combinar o portapapeis coa selección..."
 
 #, fuzzy
 #~ msgid "Clipboard _under selection"
-#~ msgstr "Inserir _despois a selección"
-
-#~ msgid "Colorize"
-#~ msgstr "Colorar"
+#~ msgstr "_Combinar o portapapeis coa selección..."
 
 #, fuzzy
 #~ msgid "Colorizing"
-#~ msgstr "Colorar"
-
-#, fuzzy
-#~ msgid "Colour cycle"
-#~ msgstr "Colorar"
-
-#, fuzzy
-#~ msgid "Colour cycling"
-#~ msgstr "Colorar"
-
-#, fuzzy
-#~ msgid "Colour filter"
-#~ msgstr "Colorar"
-
-#, fuzzy
-#~ msgid "Colour filtering"
-#~ msgstr "Colorar"
-
-#, fuzzy
-#~ msgid "Colour replace"
-#~ msgstr "Colorar"
+#~ msgstr "Redimensionando"
 
 #, fuzzy
 #~ msgid "Cycle _Step"
 #~ msgstr "_Inicio"
 
-#~ msgid "Deinterlace"
-#~ msgstr "Desentrelazar"
-
-#~ msgid "Deinterlacing"
-#~ msgstr "Desentrelazamento"
-
-#~ msgid "Despeckle"
-#~ msgstr "Desembarazar"
-
-#, fuzzy
-#~ msgid "Despeckling"
-#~ msgstr "Desembarazar"
-
-#~ msgid "Dream"
-#~ msgstr "Soño"
-
-#, fuzzy
-#~ msgid "Dreamifying"
-#~ msgstr "Soño"
-
-#~ msgid "Emboss"
-#~ msgstr "Elevar"
-
 #, fuzzy
-#~ msgid "Embossing"
-#~ msgstr "Elevar"
-
 #~ msgid "Enhance"
-#~ msgstr "Realzar"
+#~ msgstr "Cancelar"
 
 #, fuzzy
 #~ msgid "Enhancing"
-#~ msgstr "Realzar"
+#~ msgstr "Cancelar"
 
 #, fuzzy
 #~ msgid "Fade _colour"
-#~ msgstr "Esvaír"
-
-#, fuzzy
-#~ msgid "Fade _end"
-#~ msgstr "Esvaír"
-
-#, fuzzy
-#~ msgid "Fade _in"
-#~ msgstr "Esvaír"
-
-#, fuzzy
-#~ msgid "Fade _out"
-#~ msgstr "Esvaír"
-
-#~ msgid "Fade"
-#~ msgstr "Esvaír"
-
-#, fuzzy
-#~ msgid "Fading video"
-#~ msgstr "Fundido"
-
-#~ msgid "Fading"
-#~ msgstr "Fundido"
+#~ msgstr "Fondo"
 
 #, fuzzy
 #~ msgid "Fina_l frame"
 #~ msgstr "Rematar no fotograma"
 
 #, fuzzy
-#~ msgid "Flash _colour"
-#~ msgstr "Esvaír"
-
-#~ msgid "Flip vertically"
-#~ msgstr "Voltear verticalmente"
-
-#, fuzzy
-#~ msgid "Flop horizontally"
-#~ msgstr "Voltear verticalmente"
-
-#, fuzzy
-#~ msgid "Frame Calculator"
-#~ msgstr "_Inicio"
-
-#, fuzzy
 #~ msgid "Frame _Colour"
 #~ msgstr "_Inicio"
 
@@ -10119,14 +10105,6 @@
 #~ msgstr "Tamaño do fotograma"
 
 #, fuzzy
-#~ msgid "Frames _per second (FPS)"
-#~ msgstr "segundos"
-
-#, fuzzy
-#~ msgid "Gamma _end"
-#~ msgstr "Esvaír"
-
-#, fuzzy
 #~ msgid "Gamma _start"
 #~ msgstr "_Inicio"
 
@@ -10136,39 +10114,11 @@
 
 #, fuzzy
 #~ msgid "Generate blank frames"
-#~ msgstr "Rematar no fotograma"
-
-#, fuzzy
-#~ msgid "Generate clip from image"
-#~ msgstr "Rematar no fotograma"
-
-#, fuzzy
-#~ msgid "Generate coloured frames"
-#~ msgstr "Rematar no fotograma"
-
-#, fuzzy
-#~ msgid "Generate title frames"
-#~ msgstr "Rematar no fotograma"
+#~ msgstr "fotogramas"
 
 #, fuzzy
 #~ msgid "Generating blank frames"
-#~ msgstr "Rematar no fotograma"
-
-#, fuzzy
-#~ msgid "Generating clip from image"
-#~ msgstr "Rematar no fotograma"
-
-#, fuzzy
-#~ msgid "Generating coloured frames"
-#~ msgstr "Rematar no fotograma"
-
-#, fuzzy
-#~ msgid "Generating title frames"
-#~ msgstr "Rematar no fotograma"
-
-#, fuzzy
-#~ msgid "Hue _end"
-#~ msgstr "Esvaír"
+#~ msgstr "fotogramas"
 
 #, fuzzy
 #~ msgid "Hue _start"
@@ -10179,132 +10129,48 @@
 #~ msgstr "_Ignorar as mudanzas"
 
 #, fuzzy
-#~ msgid "Hue end"
-#~ msgstr "Esvaír"
-
-#, fuzzy
 #~ msgid "Hue start"
 #~ msgstr "_Inicio"
 
 #, fuzzy
-#~ msgid "Keep _Centered"
-#~ msgstr "_Outros"
-
-#, fuzzy
-#~ msgid "Making monochrome"
-#~ msgstr "Monocromático"
-
-#, fuzzy
-#~ msgid "Modulate (BSH)"
-#~ msgstr "Rotando"
-
-#, fuzzy
-#~ msgid "Modulating"
-#~ msgstr "Rotando"
-
-#~ msgid "Monochrome"
-#~ msgstr "Monocromático"
-
 #~ msgid "Negate"
-#~ msgstr "Negar"
+#~ msgstr "A borrar"
 
 #, fuzzy
 #~ msgid "Negating"
-#~ msgstr "Negar"
-
-#~ msgid "Normalize"
-#~ msgstr "Normalizar"
+#~ msgstr "A borrar"
 
+#, fuzzy
 #~ msgid "Normalizing"
-#~ msgstr "Normalizando"
+#~ msgstr "Redimensionando"
 
 #, fuzzy
 #~ msgid "Number of _frames"
 #~ msgstr "_Número de veces para introducir"
 
 #, fuzzy
-#~ msgid "Pixilate"
-#~ msgstr "Rotando"
-
-#, fuzzy
-#~ msgid "Pixilating"
-#~ msgstr "Rotando"
-
 #~ msgid "Posterize"
-#~ msgstr "Posterizar"
+#~ msgstr "Redimensionando"
 
 #, fuzzy
 #~ msgid "Posterizing"
-#~ msgstr "Posterizar"
+#~ msgstr "Redimensionando"
 
 #, fuzzy
 #~ msgid "Resize All Frames"
-#~ msgstr "_Redimensionar todos os cadros"
+#~ msgstr "_Redimensionar todos os fotogramas"
 
 #, fuzzy
-#~ msgid "Rotate Clip"
-#~ msgstr "Rotando"
-
 #~ msgid "Rotating"
-#~ msgstr "Rotando"
+#~ msgstr "A borrar"
 
 #, fuzzy
 #~ msgid "S_tart %"
 #~ msgstr "_Inicio"
 
 #, fuzzy
-#~ msgid "Saturation _end"
-#~ msgstr "Transicións"
-
-#, fuzzy
-#~ msgid "Saturation _start"
-#~ msgstr "Transicións"
-
-#, fuzzy
-#~ msgid "Saturation change"
-#~ msgstr "Transicións"
-
-#, fuzzy
-#~ msgid "Saturation end"
-#~ msgstr "Transicións"
-
-#, fuzzy
-#~ msgid "Saturation start"
-#~ msgstr "Transicións"
-
-#~ msgid "Sepia"
-#~ msgstr "Sepia"
-
-#, fuzzy
-#~ msgid "Shift horizontally"
-#~ msgstr "Voltear verticalmente"
-
-#, fuzzy
-#~ msgid "Shift vertically"
-#~ msgstr "Voltear verticalmente"
-
-#~ msgid "Skip forward"
-#~ msgstr "Saltar adiante"
-
-#~ msgid "Solarize"
-#~ msgstr "Solarizar"
-
-#, fuzzy
 #~ msgid "Solarizing"
-#~ msgstr "Solarizar"
-
-#~ msgid "Spin"
-#~ msgstr "Rodar"
-
-#, fuzzy
-#~ msgid "Spinning"
-#~ msgstr "Rodar"
-
-#~ msgid "Spread"
-#~ msgstr "Esparexer"
-
-#~ msgid "Spreading"
-#~ msgstr "Esparexendo"
+#~ msgstr "Redimensionando"
 
 #, fuzzy
 #~ msgid "Step _Value"
@@ -10316,87 +10182,45 @@
 
 #, fuzzy
 #~ msgid "Swirl _start"
-#~ msgstr "Remuíño"
-
-#, fuzzy
-#~ msgid "Swirl s_tep"
-#~ msgstr "Remuíño"
-
-#~ msgid "Swirl"
-#~ msgstr "Remuíño"
+#~ msgstr "_Inicio"
 
 #, fuzzy
-#~ msgid "Swirling"
-#~ msgstr "Remuíño"
-
 #~ msgid "Tunnel"
-#~ msgstr "Túnel"
+#~ msgstr "Cancelando"
 
 #, fuzzy
 #~ msgid "Tunneling"
-#~ msgstr "Túnel"
-
-#~ msgid "Wave"
-#~ msgstr "Onda"
-
-#~ msgid "Waving"
-#~ msgstr "Ondear"
+#~ msgstr "Cancelando"
 
 #, fuzzy
 #~ msgid "_Background Colour"
-#~ msgstr "_Inicio"
+#~ msgstr "Fondo"
 
 #, fuzzy
 #~ msgid "_Background colour"
-#~ msgstr "_Inicio"
-
-#~ msgid "_Bottom"
-#~ msgstr "A_baixo"
-
-#, fuzzy
-#~ msgid "_Calculate"
-#~ msgstr "_Inicio"
+#~ msgstr "Fondo"
 
 #, fuzzy
 #~ msgid "_Cycle Start"
 #~ msgstr "_Inicio"
 
 #, fuzzy
-#~ msgid "_Decrease Contrast"
-#~ msgstr "Axustar o contraste"
-
-#, fuzzy
 #~ msgid "_End Colour"
-#~ msgstr "_Inicio"
+#~ msgstr "Fondo"
 
 #, fuzzy
 #~ msgid "_End amount"
 #~ msgstr "Rematar no fotograma"
 
 #, fuzzy
-#~ msgid "_Fade level"
-#~ msgstr "Esvaír"
-
-#, fuzzy
 #~ msgid "_Fade start"
-#~ msgstr "_Raio"
-
-#, fuzzy
-#~ msgid "_Fill colour"
-#~ msgstr "Esvaír"
+#~ msgstr "_Inicio"
 
 #, fuzzy
 #~ msgid "_First frame"
 #~ msgstr "Comezar no fotograma"
 
 #, fuzzy
-#~ msgid "_Flash for"
-#~ msgstr "Esvaír"
-
-#~ msgid "_Font"
-#~ msgstr "_Tipo de letra"
-
-#, fuzzy
 #~ msgid "_Frames per second"
 #~ msgstr "segundos"
 
@@ -10405,10 +10229,6 @@
 #~ msgstr "Fotogramas"
 
 #, fuzzy
-#~ msgid "_Hold for"
-#~ msgstr "Esvaír"
-
-#, fuzzy
 #~ msgid "_Image File"
 #~ msgstr "_Ficheiro"
 
@@ -10417,66 +10237,38 @@
 #~ msgstr "_Ficheiro"
 
 #, fuzzy
-#~ msgid "_Increase Contrast"
-#~ msgstr "Axustar o contraste"
-
-#, fuzzy
 #~ msgid "_Negate"
-#~ msgstr "Negar"
+#~ msgstr "A borrar"
 
 #, fuzzy
 #~ msgid "_Number of frames"
 #~ msgstr "_Número de veces para introducir"
 
 #, fuzzy
-#~ msgid "_Other Center"
-#~ msgstr "_Outros"
-
-#~ msgid "_Other"
-#~ msgstr "_Outros"
-
-#, fuzzy
 #~ msgid "_Point size"
 #~ msgstr "Tamaño do ficheiro"
 
 #, fuzzy
-#~ msgid "_Radius end"
-#~ msgstr "_Raio"
-
-#, fuzzy
 #~ msgid "_Radius start"
-#~ msgstr "_Raio"
-
-#~ msgid "_Radius"
-#~ msgstr "_Raio"
+#~ msgstr "_Inicio"
 
 #, fuzzy
-#~ msgid "_Random colour each frame"
-#~ msgstr "Rematar no fotograma"
-
 #~ msgid "_Right"
-#~ msgstr "_Dereita"
+#~ msgstr "_Altura"
 
 #, fuzzy
 #~ msgid "_Rotate Selection by"
-#~ msgstr "_Borrar selección"
+#~ msgstr "_Eliminar a selección"
 
 #, fuzzy
 #~ msgid "_Sigma end"
-#~ msgstr "_Inicio"
+#~ msgstr "big endian"
 
 #, fuzzy
 #~ msgid "_Sigma start"
 #~ msgstr "_Inicio"
 
 #, fuzzy
-#~ msgid "_Skip ahead"
-#~ msgstr "_Saltar"
-
-#~ msgid "_Skip"
-#~ msgstr "_Saltar"
-
-#, fuzzy
 #~ msgid "_Source Colour"
 #~ msgstr "_Inicio"
 
@@ -10500,149 +10292,49 @@
 #~ msgid "_Target Colour"
 #~ msgstr "_Inicio"
 
-#~ msgid "_Text"
-#~ msgstr "_Texto"
-
 #, fuzzy
 #~ msgid "_Time (seconds)"
 #~ msgstr "segundos"
 
 #, fuzzy
-#~ msgid "_Wavemax"
-#~ msgstr "Onda"
-
-#~ msgid "_Wrap Around"
-#~ msgstr "_Dar a volta"
-
-#, fuzzy
-#~ msgid "_X Center"
-#~ msgstr "_Outros"
-
-#, fuzzy
 #~ msgid "_X Start"
 #~ msgstr "_Inicio"
 
 #, fuzzy
-#~ msgid "_Y Center"
-#~ msgstr "_Outros"
-
-#, fuzzy
 #~ msgid "_Y Start"
 #~ msgstr "_Inicio"
 
 #, fuzzy
 #~ msgid "blank_frames"
-#~ msgstr "cadros"
-
-#~ msgid "blur"
-#~ msgstr "emborrallar"
+#~ msgstr "fotogramas"
 
 #, fuzzy
 #~ msgid "brightness_change"
 #~ msgstr "_Ignorar as mudanzas"
 
 #, fuzzy
-#~ msgid "charcoal"
-#~ msgstr "Carbón"
-
-#, fuzzy
-#~ msgid "colorize"
-#~ msgstr "Colorar"
-
-#, fuzzy
-#~ msgid "colour_filter"
-#~ msgstr "Colorar"
-
-#, fuzzy
-#~ msgid "colour_replace"
-#~ msgstr "Colorar"
-
-#, fuzzy
-#~ msgid "contrast"
-#~ msgstr "Axustar o contraste"
-
-#~ msgid "cycle"
-#~ msgstr "ciclo"
-
-#, fuzzy
-#~ msgid "deinterlace"
-#~ msgstr "Desentrelazar"
-
-#, fuzzy
-#~ msgid "despeckle"
-#~ msgstr "Desembarazar"
-
-#, fuzzy
-#~ msgid "dream"
-#~ msgstr "Soño"
-
-#~ msgid "emboss"
-#~ msgstr "relevo"
-
-#, fuzzy
 #~ msgid "enhance"
-#~ msgstr "Realzar"
-
-#~ msgid "every"
-#~ msgstr "todas"
+#~ msgstr "Cancelar"
 
 #, fuzzy
-#~ msgid "fade_in_out"
-#~ msgstr "Esvaír"
-
-#~ msgid "fc"
-#~ msgstr "fc"
-
-#, fuzzy
-#~ msgid "frame_calculator"
-#~ msgstr "_Inicio"
-
-#, fuzzy
-#~ msgid "gamma_change"
-#~ msgstr "_Ignorar as mudanzas"
+#~ msgid "every"
+#~ msgstr "_Nunca"
 
 #, fuzzy
 #~ msgid "gen_blank_frames"
-#~ msgstr "cadros"
-
-#, fuzzy
-#~ msgid "gen_clip_from_image"
-#~ msgstr "Rematar no fotograma"
-
-#, fuzzy
-#~ msgid "gen_coloured_frames"
-#~ msgstr "cadros"
+#~ msgstr "fotogramas"
 
 #, fuzzy
 #~ msgid "hue_change"
 #~ msgstr "_Ignorar as mudanzas"
 
 #, fuzzy
-#~ msgid "modulate"
-#~ msgstr "Rotando"
-
-#, fuzzy
-#~ msgid "monochrome"
-#~ msgstr "Monocromático"
-
-#, fuzzy
-#~ msgid "negate"
-#~ msgstr "Negar"
-
-#, fuzzy
-#~ msgid "normalize"
-#~ msgstr "Normalizar"
-
-#, fuzzy
-#~ msgid "pixilate"
-#~ msgstr "Rotando"
-
-#, fuzzy
 #~ msgid "posterize"
-#~ msgstr "Posterizar"
+#~ msgstr "Redimensionando"
 
+#, fuzzy
 #~ msgid "resize"
-#~ msgstr "redimensionar"
+#~ msgstr "Redimensionar"
 
 #, fuzzy
 #~ msgid "rotate"
@@ -10652,43 +10344,13 @@
 #~ msgid "saturation_change"
 #~ msgstr "Transicións"
 
-#~ msgid "sepia"
-#~ msgstr "sepia"
-
-#, fuzzy
-#~ msgid "shift_horizontal"
-#~ msgstr "Voltear verticalmente"
-
-#, fuzzy
-#~ msgid "shift_vertical"
-#~ msgstr "Voltear verticalmente"
-
-#, fuzzy
-#~ msgid "skip_forwards"
-#~ msgstr "Saltar adiante"
-
-#, fuzzy
-#~ msgid "solarize"
-#~ msgstr "Solarizar"
-
-#~ msgid "spin"
-#~ msgstr "xiratorio"
-
-#, fuzzy
-#~ msgid "spread"
-#~ msgstr "Esparexer"
-
-#, fuzzy
-#~ msgid "swirl"
-#~ msgstr "Remuíño"
-
 #, fuzzy
 #~ msgid "transition_bwthresh"
 #~ msgstr "Transicións"
 
 #, fuzzy
 #~ msgid "transition_checkerboard"
-#~ msgstr "Tabuleiro de Xadrez"
+#~ msgstr "Transicións"
 
 #, fuzzy
 #~ msgid "transition_fade2"
@@ -10700,52 +10362,39 @@
 
 #, fuzzy
 #~ msgid "trim_frames"
-#~ msgstr "cadros"
+#~ msgstr "fotogramas"
 
+#, fuzzy
 #~ msgid "tunnel"
-#~ msgstr "túnel"
-
-#~ msgid "wave"
-#~ msgstr "onda"
+#~ msgstr "Cancelando"
 
+#, fuzzy
 #~ msgid "Unable to open output file !"
-#~ msgstr "Non se pode abrir o ficheiro de saída !"
+#~ msgstr ""
+#~ "LiVES non puido capturar esta imaxe\n"
+#~ "\n"
 
 #, fuzzy
 #~ msgid "LiVES could not write to $nfile."
 #~ msgstr ""
-#~ "LiVES non puido capturar esta foto\n"
+#~ "LiVES non puido capturar esta imaxe\n"
 #~ "\n"
 
 #, fuzzy
 #~ msgid "LiVES was unable to open it."
 #~ msgstr ""
-#~ "LiVES non puido capturar esta foto\n"
+#~ "LiVES non puido capturar esta imaxe\n"
 #~ "\n"
 
 #, fuzzy
 #~ msgid "LiVES was not able to open the file"
 #~ msgstr ""
-#~ "LiVES non puido capturar esta foto\n"
+#~ "LiVES non puido capturar esta imaxe\n"
 #~ "\n"
 
-#~ msgid "$file"
-#~ msgstr "$file"
-
-#~ msgid "$error"
-#~ msgstr "$error"
-
-#~ msgid "                                                            "
-#~ msgstr "                                                            "
-
-#~ msgid "warning"
-#~ msgstr "advertencia"
-
-#~ msgid "LiVES: recover layout ?"
-#~ msgstr "LiVES: recuperar esquema ?"
-
-#~ msgid "Couldn't find pixmap file: %s"
-#~ msgstr "Non se atopou o ficheiro de pixmap: %s"
+#, fuzzy
+#~ msgid "LiVES audio error."
+#~ msgstr "LiVES: - %s"
 
-#~ msgid "No Description"
-#~ msgstr "Sen descripción"
+#~ msgid "Pause"
+#~ msgstr "Pausa"

LiVES-2.2.8.tar.bz2/po/he.po -> LiVES-2.4.1.tar.bz2/po/he.po Changed

@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n"
-"POT-Creation-Date: 2015-02-08 17:18-0300\n"
+"POT-Creation-Date: 2015-08-09 14:52-0300\n"
 "PO-Revision-Date: 2013-03-14 12:31+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Hebrew <he@li.org>\n"
@@ -18,8 +18,7 @@
 "X-Launchpad-Export-Date: 2013-03-28 10:43+0000\n"
 "X-Generator: Launchpad (build 16546)\n"
 
-#. TRANSLATORS: do not translate this message
-#: src/main.c:118
+#: src/main.c:128
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -33,22 +32,22 @@
 "All translators should read the LiVES translation notes at\n"
 "http://lives.sourceforge.net/TRANS-README.txt"
 
-#: src/main.c:134
+#: src/main.c:153
 #, c-format
 msgid "%s Warning: %s\n"
 msgstr ""
 
-#: src/main.c:138
+#: src/main.c:157
 #, c-format
 msgid "%s Critical error: %s\n"
 msgstr ""
 
-#: src/main.c:139
+#: src/main.c:158
 #, c-format
 msgid "%s Fatal error: %s\n"
 msgstr ""
 
-#: src/main.c:176
+#: src/main.c:198
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -62,7 +61,7 @@
 "group_id=64341&atid=507139\n"
 "תודה. ניתן לשחזר את הנתונים שאבדו בהפעלה מחדש של LiVES.\n"
 
-#: src/main.c:177
+#: src/main.c:199
 msgid ""
 "\n"
 "\n"
@@ -74,7 +73,7 @@
 "בעת דיווח על קריסות, נא לכלול פרטים על מערכת ההפעלה שלך, ההפצה וגרסת ה־LiVES "
 "שבשימוש ("
 
-#: src/main.c:180
+#: src/main.c:203
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -82,7 +81,7 @@
 "וכל מידע זמין מוצג כאן:\n"
 "\n"
 
-#: src/main.c:184
+#: src/main.c:206
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
@@ -92,84 +91,84 @@
 "מידע.\n"
 "\n"
 
-#: src/main.c:192
+#: src/main.c:216
 msgid "Preserving set.\n"
 msgstr "מתבצע שימור האוסף.\n"
 
-#: src/main.c:636
+#: src/main.c:691
 msgid "Resizing"
 msgstr "שינוי גודל"
 
-#: src/main.c:643
+#: src/main.c:698
 msgid "_Resize All Frames"
 msgstr "_שינוי גודל כל השקופיות"
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:895
+#: src/main.c:948
 msgid "Any"
 msgstr "הכל"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:897
+#: src/main.c:950
 msgid "None"
 msgstr "ללא"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:899
+#: src/main.c:952
 msgid "recommended"
 msgstr "מומלץ"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:901
+#: src/main.c:954
 msgid "disabled !"
 msgstr "נוטרל !"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:903
+#: src/main.c:956
 msgid "**The current layout**"
 msgstr "**הפריסה הנוכחית**"
 
 #. TRANSLATORS: adjective for "Built in" type effects
-#: src/main.c:905
+#: src/main.c:958
 msgid "Builtin"
 msgstr "מובנה"
 
 #. TRANSLATORS: adjective for "Custom" type effects
-#: src/main.c:907
+#: src/main.c:960
 msgid "Custom"
 msgstr "מותאם אישית"
 
 #. TRANSLATORS: adjective for "Test" type effects
-#: src/main.c:909
+#: src/main.c:962
 msgid "Test"
 msgstr "בדיקה"
 
-#: src/main.c:1054
+#: src/main.c:1107
 msgid "Foreground"
 msgstr ""
 
-#: src/main.c:1055
+#: src/main.c:1108
 #, fuzzy
 msgid "Background"
 msgstr "רקע _שחור"
 
-#: src/main.c:1566
+#: src/main.c:1624
 msgid "Loading realtime effect plugins..."
 msgstr "מתבצעת טעינת תוספים לאפקטים בזמן אמת..."
 
-#: src/main.c:1631
+#: src/main.c:1690
 msgid "Starting jack audio server..."
 msgstr "מתבצעת הפעלת שרת השמע jack..."
 
-#: src/main.c:1633
+#: src/main.c:1692
 msgid "Starting jack transport server..."
 msgstr "מפעיל את שרת התעבורה של jack..."
 
-#: src/main.c:1634
+#: src/main.c:1693
 msgid "Connecting to jack transport server..."
 msgstr "מתחבר לשרת התעבורה של jack..."
 
-#: src/main.c:1663
+#: src/main.c:1723
 #, c-format
 msgid ""
 "\n"
@@ -181,114 +180,114 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1697
+#: src/main.c:1758
 msgid "Starting pulse audio server..."
 msgstr "מפעיל את שרת השמע Pulse..."
 
-#: src/main.c:1765
+#: src/main.c:1825
 msgid "Checking optional dependencies:"
 msgstr "מתבצעת בדיקת חבילות תלות אפשריות:"
 
-#: src/main.c:1766
+#: src/main.c:1826
 msgid "mplayer...detected..."
 msgstr "mplayer...זוהה..."
 
-#: src/main.c:1767
+#: src/main.c:1827
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...לא זוהה..."
 
-#: src/main.c:1768
+#: src/main.c:1828
 #, fuzzy
 msgid "mplayer2...detected..."
 msgstr "mplayer...זוהה..."
 
-#: src/main.c:1769
+#: src/main.c:1829
 #, fuzzy
 msgid "mplayer2...NOT DETECTED..."
 msgstr "mplayer...לא זוהה..."
 
-#: src/main.c:1770
+#: src/main.c:1830
 msgid "convert...detected..."
 msgstr "convert...זוהה..."
 
-#: src/main.c:1771
+#: src/main.c:1831
 msgid "convert...NOT DETECTED..."
 msgstr "convert...לא זוהה..."
 
-#: src/main.c:1772
+#: src/main.c:1832
 msgid "composite...detected..."
 msgstr "composite...זוהה..."
 
-#: src/main.c:1773
+#: src/main.c:1833
 msgid "composite...NOT DETECTED..."
 msgstr "composite...לא זוהה..."
 
-#: src/main.c:1774
+#: src/main.c:1834
 msgid "sox...detected\n"
 msgstr "sox...זוהה...\n"
 
-#: src/main.c:1775
+#: src/main.c:1835
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...לא זוהה...\n"
 
-#: src/main.c:1776
+#: src/main.c:1836
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...זוהה"
 
-#: src/main.c:1777
+#: src/main.c:1837
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...לא זוהה"
 
-#: src/main.c:1778
+#: src/main.c:1838
 msgid "jackd...detected..."
 msgstr "jackd...זוהה..."
 
-#: src/main.c:1779
+#: src/main.c:1839
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...לא זוהה..."
 
-#: src/main.c:1780
+#: src/main.c:1840
 msgid "pulse audio...detected..."
 msgstr "Pulse Audio...זוהה..."
 
-#: src/main.c:1781
+#: src/main.c:1841
 msgid "pulse audio...NOT DETECTED..."
 msgstr "Pulse Audio...לא זוהה..."
 
-#: src/main.c:1782
+#: src/main.c:1842
 msgid "python...detected..."
 msgstr "python...זוהה..."
 
-#: src/main.c:1783
+#: src/main.c:1843
 msgid "python...NOT DETECTED..."
 msgstr "python...לא זוהה..."
 
-#: src/main.c:1784
+#: src/main.c:1844
 msgid "dvgrab...detected..."
 msgstr "dvgrab...זוהה..."
 
-#: src/main.c:1785
+#: src/main.c:1845
 msgid "dvgrab...NOT DETECTED..."
 msgstr "dvgrab...לא זוהה..."
 
-#: src/main.c:1786
+#: src/main.c:1846
 msgid "xwininfo...detected..."
 msgstr "xwininfo...זוהה..."
 
-#: src/main.c:1787
+#: src/main.c:1847
 msgid "xwininfo...NOT DETECTED..."
 msgstr "xwininfo...לא זוהה..."
 
-#: src/main.c:1793
+#: src/main.c:1853
 #, c-format
 msgid "Windows version %04X"
 msgstr ""
 
-#: src/main.c:1795
+#: src/main.c:1855
 msgid "UNKNOWN - please patch me !"
 msgstr ""
 
-#: src/main.c:1799
+#: src/main.c:1859
 #, c-format
 msgid ""
 "\n"
@@ -299,48 +298,48 @@
 "\n"
 "מנהל החלונות המדווח הוא \"%s\"; "
 
-#: src/main.c:1802
+#: src/main.c:1862
 #, c-format
 msgid "number of monitors detected: %d\n"
 msgstr "מספר הצגים שזוהו: %d\n"
 
-#: src/main.c:1805
+#: src/main.c:1865
 #, c-format
 msgid "Number of CPUs detected: %d "
 msgstr ""
 
-#: src/main.c:1808 src/multitrack.c:4902
+#: src/main.c:1868 src/multitrack.c:5068
 msgid "little endian"
 msgstr "little endian"
 
-#: src/main.c:1809 src/multitrack.c:4901
+#: src/main.c:1869 src/multitrack.c:5067
 msgid "big endian"
 msgstr "big endian"
 
-#: src/main.c:1810
+#: src/main.c:1870
 #, c-format
 msgid "(%d bits, %s)\n"
 msgstr ""
 
-#: src/main.c:1814
+#: src/main.c:1874
 msgid "GUI type is: "
 msgstr ""
 
-#: src/main.c:1818
+#: src/main.c:1878
 #, c-format
 msgid "GTK+ version %d.%d.%d (compiled with %d.%d.%d)"
 msgstr ""
 
-#: src/main.c:1840
+#: src/main.c:1900
 msgid ", with cairo support"
 msgstr ""
 
-#: src/main.c:1847
+#: src/main.c:1907
 #, c-format
 msgid "Temp directory is %s\n"
 msgstr "התיקייה הזמנית היא %s\n"
 
-#: src/main.c:1851
+#: src/main.c:1911
 msgid ""
 "WARNING - this version of LiVES was compiled without either\n"
 "jack or pulse audio support.\n"
@@ -350,15 +349,15 @@
 "תמיכה ב־jack או ב־pulse audio.\n"
 "תכונות רבות הקשורות לשמע לא תהיינה זמינות.\n"
 
-#: src/main.c:1854
+#: src/main.c:1914
 msgid "Compiled with jack support, good !\n"
 msgstr "הודר עם תמיכה ב־jack, מצוין !\n"
 
-#: src/main.c:1857
+#: src/main.c:1917
 msgid "Compiled with pulse audio support, wonderful !\n"
 msgstr "הודר עם תמיכה ב־pulse audio, נהדר !\n"
 
-#: src/main.c:1861
+#: src/main.c:1921
 #, c-format
 msgid ""
 "Welcome to LiVES version %s.\n"
@@ -367,7 +366,7 @@
 "ברוכים הבאים ל־LiVES גרסה %s.\n"
 "\n"
 
-#: src/main.c:2306
+#: src/main.c:2380
 #, c-format
 msgid ""
 "\n"
@@ -376,85 +375,90 @@
 "\n"
 "תחביר ההתחלה הוא:%s [אפשרויות] [שם קובץ [זמן התחלה] [שקופיות]]\n"
 
-#: src/main.c:2307
+#: src/main.c:2381
 msgid "Where: filename is the name of a media file or backup file.\n"
 msgstr "היכן: שם הקובץ הוא שם קובץ מדיה או גיבוי.\n"
 
-#: src/main.c:2308
+#: src/main.c:2382
 msgid "start_time : filename start time in seconds\n"
 msgstr "זמן ההתחלה : זמן התחלת שם הקובץ הרצוי בשניות\n"
 
-#: src/main.c:2309
+#: src/main.c:2383
 msgid "frames : maximum number of frames to open\n"
 msgstr "שקופיות : מספר שקופיות מירבי לפתיחה\n"
 
-#: src/main.c:2311
+#: src/main.c:2385
 msgid "opts can be:\n"
 msgstr "האפשרויות יכולות להיות:\n"
 
-#: src/main.c:2312
+#: src/main.c:2386
 msgid "-help            : show this help text and exit\n"
 msgstr "-help : הצגת טקסט העזרה ויציאה מהתוכנית\n"
 
-#: src/main.c:2313
+#: src/main.c:2387
 msgid "-tmpdir <tempdir>: use alternate working directory (e.g /var/ramdisk)\n"
 msgstr ""
 
-#: src/main.c:2314
+#: src/main.c:2388
 msgid "-set <setname>   : autoload clip set setname\n"
 msgstr "-set <setname> : טעינה אוטומטית של אוסף הקטעים שהוגדרו כ־setname\n"
 
-#: src/main.c:2315
+#: src/main.c:2389
 msgid "-noset           : do not load any set on startup\n"
 msgstr "-noset : אין לטעון כל אוסף בהתחלה\n"
 
-#: src/main.c:2316
+#: src/main.c:2390
 msgid "-norecover       : force no-loading of crash recovery\n"
 msgstr "-norecover : אילוץ התוכנה לא  לטעון את שחזור הקריסה\n"
 
-#: src/main.c:2317
+#: src/main.c:2391
 msgid "-recover         : force loading of crash recovery\n"
 msgstr "-recover : אילוץ התוכנה לטעון את שחזור הקריסה\n"
 
-#: src/main.c:2318
-msgid "-nothreaddialog  : doe nothing - retained for backwards compatibility\n"
+#: src/main.c:2392
+msgid ""
+"-nothreaddialog  : does nothing - retained for backwards compatibility\n"
 msgstr ""
 
-#: src/main.c:2319
+#: src/main.c:2393
 msgid "-nogui           : do not show the gui\n"
 msgstr "-nogui : לא יוצג מנשק המשתמש הגרפי\n"
 
-#: src/main.c:2320
+#: src/main.c:2394
 msgid "-nosplash        : do not show the splash window\n"
 msgstr ""
 
-#: src/main.c:2321
+#: src/main.c:2395
 msgid "-noplaywin       : do not show the play window\n"
 msgstr ""
 
-#: src/main.c:2322
+#: src/main.c:2396
+msgid "-noninteractive  : disable menu interactivity\n"
+msgstr ""
+
+#: src/main.c:2397
 msgid "-startup-ce      : start in clip editor mode\n"
 msgstr "-startup-ce      : start in clip editor mode\n"
 
-#: src/main.c:2323
+#: src/main.c:2398
 msgid "-startup-mt      : start in multitrack mode\n"
 msgstr "-startup-mt      : start in multitrack mode\n"
 
-#: src/main.c:2324
+#: src/main.c:2399
 msgid ""
 "-fxmodesmax <n>  : allow <n> modes per effect key (minimum is 1, default is "
 "8)\n"
 msgstr ""
 
-#: src/main.c:2326
+#: src/main.c:2401
 msgid "-oscstart <port> : start OSC listener on UDP port <port>\n"
 msgstr "-oscstart <פתחה> : הפעלת מאזין ה־OSC ביציאת ה־UDP <פתחה>\n"
 
-#: src/main.c:2327
+#: src/main.c:2402
 msgid "-nooscstart      : do not start OSC listener\n"
 msgstr "-nooscstart : לא להפעיל את מאזין ה־OSC\n"
 
-#: src/main.c:2329
+#: src/main.c:2404
 #, fuzzy
 msgid ""
 "-aplayer <ap>    : start with selected audio player. <ap> can be mplayer, "
@@ -462,15 +466,15 @@
 msgstr "-aplayer <יישום> : הפעלת נגן המוזיקה הנבחר.<יישום> יכול להיות mplayer"
 
 #. TRANSLATORS: pulse (audio)
-#: src/main.c:2332
+#: src/main.c:2407
 msgid ", pulse"
 msgstr ", pulse"
 
-#: src/main.c:2335
+#: src/main.c:2410
 msgid ", sox or jack\n"
 msgstr ", sox או jack\n"
 
-#: src/main.c:2336
+#: src/main.c:2412
 msgid ""
 "-jackopts <opts>    : opts is a bitmap of jack startup options [1 = jack "
 "transport client, 2 = jack transport master, 4 = start jack transport "
@@ -480,29 +484,29 @@
 "transport client, 2 = jack transport master, 4 = start jack transport "
 "server, 8 = pause audio when video paused, 16 = start jack audio server] \n"
 
-#: src/main.c:2338
+#: src/main.c:2414
 msgid " or sox\n"
 msgstr " או sox\n"
 
-#: src/main.c:2340
+#: src/main.c:2416
 msgid "-devicemap <mapname>          : autoload devicemap\n"
 msgstr "-devicemap <mapname>          : autoload devicemap\n"
 
-#: src/main.c:2341
+#: src/main.c:2418
 msgid ""
 "-vppdefaults <file>          : load video playback plugin defaults from "
 "<file> (Note: only sets the settings, not the plugin type)\n"
 msgstr ""
 
-#: src/main.c:2342
+#: src/main.c:2419
 msgid "-debug            : try to debug crashes (requires 'gdb' installed)\n"
 msgstr "-debug            : try to debug crashes (requires 'gdb' installed)\n"
 
-#: src/main.c:2373 src/gui.c:1128
+#: src/main.c:2449 src/gui.c:1127
 msgid "Starting GUI..."
 msgstr "מפעיל את מנשק המשתמש הגרפי..."
 
-#: src/main.c:2396
+#: src/main.c:2475
 #, c-format
 msgid ""
 "\n"
@@ -513,7 +517,7 @@
 "(Maybe you need to change the value of <prefix_dir> in your %s file)\n"
 msgstr ""
 
-#: src/main.c:2410
+#: src/main.c:2492
 #, c-format
 msgid ""
 "\n"
@@ -521,7 +525,7 @@
 "Please make sure you have write access to %s and try again.\n"
 msgstr ""
 
-#: src/main.c:2415
+#: src/main.c:2498
 msgid ""
 "\n"
 "`smogrify` must be in your path, and be executable\n"
@@ -535,7 +539,7 @@
 "יש לסקרוא את קובץ ה־README המגיע עם חבילה זו\n"
 "לפני הרצת LiVES.\n"
 
-#: src/main.c:2421
+#: src/main.c:2504
 #, c-format
 msgid ""
 "\n"
@@ -545,7 +549,7 @@
 "Please check the file permissions for this file and try again.\n"
 msgstr ""
 
-#: src/main.c:2428
+#: src/main.c:2512
 #, c-format
 msgid ""
 "\n"
@@ -556,7 +560,7 @@
 "and try again.\n"
 msgstr ""
 
-#: src/main.c:2438
+#: src/main.c:2522
 #, c-format
 msgid ""
 "Please check the <tempdir> setting in \n"
@@ -564,7 +568,7 @@
 "and try again.\n"
 msgstr ""
 
-#: src/main.c:2445
+#: src/main.c:2528
 #, c-format
 msgid ""
 "\n"
@@ -574,7 +578,7 @@
 "%s"
 msgstr ""
 
-#: src/main.c:2453
+#: src/main.c:2536
 msgid ""
 "\n"
 "An incorrect version of smogrify was found in your path.\n"
@@ -592,7 +596,7 @@
 "\n"
 "תודה.\n"
 
-#: src/main.c:2458
+#: src/main.c:2541
 #, fuzzy
 msgid ""
 "\n"
@@ -603,7 +607,7 @@
 "LiVES מחייב שימוש ב־'mplayer' או 'sox' לפעולה תקינה. יש להתקין את אחד מאלה "
 "ולנסות שוב.\n"
 
-#: src/main.c:2462
+#: src/main.c:2546
 #, fuzzy
 msgid ""
 "\n"
@@ -614,7 +618,7 @@
 "LiVES מחייב שימוש ב־'mplayer' או 'sox' לפעולה תקינה. יש להתקין את אחד מאלה "
 "ולנסות שוב.\n"
 
-#: src/main.c:2472
+#: src/main.c:2556
 #, fuzzy
 msgid ""
 "\n"
@@ -625,7 +629,7 @@
 "ל־LiVES לא היתה אפשרות לאתר את 'mplayer'. באפשרותך להתקין את mplayer כדי "
 "להשתמש בתכונות נוספות של LiVES.\n"
 
-#: src/main.c:2475
+#: src/main.c:2561
 msgid ""
 "\n"
 "LiVES was unable to locate 'convert'. You should install convert and image-"
@@ -635,7 +639,7 @@
 "לא ניתן לאתר את 'convert'. ניתן להתקין את convert  ו־image-magick במידת "
 "הצורך באפקטים מוכנים.\n"
 
-#: src/main.c:2478
+#: src/main.c:2566
 msgid ""
 "\n"
 "LiVES was unable to locate 'composite'. You should install composite and "
@@ -645,7 +649,7 @@
 "לא ניתן לאתר את 'composite'. ניתן להתקין את composite ו־image-magick במידת "
 "הצורך בפונקציית merge.\n"
 
-#: src/main.c:2481
+#: src/main.c:2570
 msgid ""
 "\n"
 "LiVES was unable to locate 'sox'. Some audio features may not work. You "
@@ -655,7 +659,7 @@
 "ל־LiVES לא היתה אפשרות לאתר את 'sox'. תכונות מסויימות הקשורות לשמע לא יעבדו. "
 "ניתן להתקין את 'sox'.\n"
 
-#: src/main.c:2484
+#: src/main.c:2575
 #, c-format
 msgid ""
 "\n"
@@ -666,59 +670,59 @@
 "You may need to change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/main.c:2611
+#: src/main.c:2707
 #, c-format
 msgid "Autoloading set %s..."
 msgstr "מתבצעת טעינה אוטומטית של האוסף %s..."
 
 #. TRANSLATORS: localised name may be used here
-#: src/main.c:2781 src/interface.c:738
+#: src/main.c:2902
 msgid "LiVES"
 msgstr ""
 
-#: src/main.c:2948
+#: src/main.c:3066
 #, c-format
 msgid "Invalid audio player %s\n"
 msgstr "נגן שמע בלתי תקין %s\n"
 
-#: src/main.c:3077
+#: src/main.c:3214
 #, c-format
 msgid "LiVES-%s: <Untitled%d> %dx%d : %d frames %d bpp %.3f fps"
 msgstr "LiVES-%s <ללא שם%d> %dx%d : %d שקופיות %d bpp %.3f שקופיות לשנייה"
 
-#: src/main.c:3082
+#: src/main.c:3219
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : ??? frames ??? bpp %.3f fps"
 msgstr "LiVES-%s <%s> %dx%d : ??? שקופיות ??? bpp %.3f שקופיות לשנייה"
 
-#: src/main.c:3086
+#: src/main.c:3222
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : %d frames %d bpp %.3f fps"
 msgstr "LiVES-%s <%s> %dx%d : %d שקופיות %d bpp %.3f שקופיות לשנייה"
 
-#: src/main.c:3094
+#: src/main.c:3229
 #, c-format
 msgid "LiVES-%s: <No File>"
 msgstr "LiVES-%s <ללא קובץ>"
 
 #. TRANSLATORS: rec(ord)
-#: src/main.c:5085
+#: src/main.c:5201
 #, c-format
 msgid "rec %9d/%d"
 msgstr "הקלטה %9d/%d"
 
 #. TRANSLATORS: out of memory (rec(ord))
-#: src/main.c:5091
+#: src/main.c:5206
 #, c-format
 msgid "!rec %9d/%d"
 msgstr "!הקלטה %9d/%d"
 
-#: src/main.c:5398 src/main.c:5399 src/gui.c:2110 src/gui.c:3220
-#: src/saveplay.c:2336
+#: src/main.c:5500 src/main.c:5501 src/gui.c:2108 src/gui.c:3331
+#: src/saveplay.c:2315
 msgid "Play"
 msgstr "נגן"
 
-#: src/main.c:6128
+#: src/main.c:6216
 msgid ""
 "LiVES was unable to capture this image\n"
 "\n"
@@ -726,35 +730,35 @@
 "ל־LiVES לא הית אפשרות ללכוד תמונה זו\n"
 "\n"
 
-#: src/main.c:6250
+#: src/main.c:6345
 #, c-format
 msgid "Closed file %s\n"
 msgstr "הקובץ %s נסגר\n"
 
-#: src/main.c:6452 src/gui.c:648 src/utils.c:4312 src/utils.c:4344
-#: src/saveplay.c:3550 src/multitrack.c:4510 src/multitrack.c:6268
+#: src/main.c:6542 src/gui.c:647 src/utils.c:4256 src/utils.c:4286
+#: src/saveplay.c:3500 src/multitrack.c:4678 src/multitrack.c:6447
 msgid "_Undo"
 msgstr "_ביטול"
 
-#: src/main.c:6453 src/gui.c:666 src/utils.c:4313 src/utils.c:4345
-#: src/saveplay.c:3551 src/multitrack.c:4531 src/multitrack.c:6293
+#: src/main.c:6543 src/gui.c:665 src/utils.c:4257 src/utils.c:4287
+#: src/saveplay.c:3501 src/multitrack.c:4698 src/multitrack.c:6472
 msgid "_Redo"
 msgstr "ב_צע שוב"
 
-#: src/main.c:6493 src/interface.c:470 src/gui.c:2326 src/preferences.c:2357
-#: src/resample.c:1516
+#: src/main.c:6583 src/interface.c:457 src/gui.c:2324 src/preferences.c:2391
+#: src/resample.c:1488
 msgid "Video"
 msgstr "וידאו"
 
-#: src/main.c:6494 src/interface.c:483 src/gui.c:2351
+#: src/main.c:6584 src/interface.c:470 src/gui.c:2348
 msgid "Left Audio"
 msgstr "ערוץ שמע שמאלי"
 
-#: src/main.c:6495 src/gui.c:2375
+#: src/main.c:6585 src/gui.c:2371
 msgid "Right Audio"
 msgstr "ערוץ שמע ימני"
 
-#: src/main.c:6540
+#: src/main.c:6630
 #, fuzzy
 msgid ""
 "\n"
@@ -768,11 +772,11 @@
 "ל־LiVES אין אפשרות לעבור בין קטעים בעת הפתיחה באם נגן השמע מוגדר כ־mplayer.\n"
 "נא לכוון את אפשרויות הנגינה בהעדפות ולנסות שוב.\n"
 
-#: src/main.c:7051 src/plugins.c:1502
+#: src/main.c:7134 src/plugins.c:1468
 msgid "LiVES: - Play Window"
 msgstr "LiVES: - חלון הנגינה"
 
-#: src/startup.c:25
+#: src/startup.c:24
 #, c-format
 msgid ""
 "A directory named\n"
@@ -782,7 +786,7 @@
 "(Free space = %s)\n"
 msgstr ""
 
-#: src/startup.c:32
+#: src/startup.c:29
 #, c-format
 msgid ""
 "A directory named\n"
@@ -792,7 +796,7 @@
 "Please select another location.\n"
 msgstr ""
 
-#: src/startup.c:49
+#: src/startup.c:46
 #, c-format
 msgid ""
 "\n"
@@ -803,7 +807,7 @@
 "(Free space = %s)"
 msgstr ""
 
-#: src/startup.c:54
+#: src/startup.c:50
 #, c-format
 msgid ""
 "\n"
@@ -812,11 +816,11 @@
 "Please try again and choose a different location.\n"
 msgstr ""
 
-#: src/startup.c:96
+#: src/startup.c:92
 msgid "Directory name is too long !"
 msgstr "שם התיקייה ארוך מדי !"
 
-#: src/startup.c:223
+#: src/startup.c:216
 msgid ""
 "LiVES FAILED TO START YOUR SELECTED AUDIO PLAYER !\n"
 "\n"
@@ -824,7 +828,7 @@
 "ארע כשלון בנסיון להפעיל את נגן השמע שנבחר !\n"
 "\n"
 
-#: src/startup.c:230
+#: src/startup.c:222
 msgid ""
 "Before starting LiVES, you need to choose an audio player.\n"
 "\n"
@@ -834,7 +838,7 @@
 "\n"
 "Pulse Audio מומלץ לרוב המשתמשים."
 
-#: src/startup.c:233
+#: src/startup.c:225
 msgid ""
 ", but this version of LiVES was not compiled with pulse audio support.\n"
 "\n"
@@ -842,7 +846,7 @@
 ", אולם גרסה זו של LiVES לא הודרה עם תמיכה ב־pulse audio.\n"
 "\n"
 
-#: src/startup.c:236
+#: src/startup.c:229
 msgid ""
 ", but you do not have pulse audio installed on your system.\n"
 " You are advised to install pulse audio first before running LiVES.\n"
@@ -852,11 +856,11 @@
 " מומלץ להתקין אותו לפני הרצת LiVES.\n"
 "\n"
 
-#: src/startup.c:241
+#: src/startup.c:233
 msgid "JACK audio is recommended for pro users"
 msgstr "JACK מומלץ למשתמשים מקצועיים"
 
-#: src/startup.c:244
+#: src/startup.c:236
 msgid ""
 ", but this version of LiVES was not compiled with jack audio support.\n"
 "\n"
@@ -864,7 +868,7 @@
 ", אולם גרסה זו של LiVES לא הודרה עם תמיכה ב־jack.\n"
 "\n"
 
-#: src/startup.c:247
+#: src/startup.c:239
 msgid ""
 ", but you do not have jackd installed. You may wish to install jackd first "
 "before running LiVES.\n"
@@ -874,7 +878,7 @@
 "LiVES.\n"
 "\n"
 
-#: src/startup.c:250
+#: src/startup.c:242
 msgid ""
 ", but may prevent LiVES from starting on some systems.\n"
 "If LiVES will not start with jack, you can restart and try with another "
@@ -885,11 +889,11 @@
 "אם LiVES לא יפעל עם jack, ניתן להפעילו מחדש עם נגן שמע אחר.\n"
 "\n"
 
-#: src/startup.c:254
+#: src/startup.c:246
 msgid "SOX may be used if neither of the preceding players work, "
 msgstr "ניתן להשתמש ב־SOX אם אף אחד מהנגנים האחרים לא עובד, "
 
-#: src/startup.c:257
+#: src/startup.c:249
 msgid ""
 "but some audio features will be disabled.\n"
 "\n"
@@ -897,7 +901,7 @@
 "אולם תכונות מסוימות הקשורות לשמע ינוטרלו.\n"
 "\n"
 
-#: src/startup.c:260
+#: src/startup.c:251
 msgid ""
 "but you do not have sox installed.\n"
 "You are advised to install it before running LiVES.\n"
@@ -907,7 +911,7 @@
 "רצוי להתקינו לפני הרצת LiVES.\n"
 "\n"
 
-#: src/startup.c:264
+#: src/startup.c:255
 #, fuzzy
 msgid ""
 "The MPLAYER/MPLAYER2 audio player is only recommended for testing purposes.\n"
@@ -916,139 +920,139 @@
 "נגן השמע MPLAYER מומלץ רק למטרות בדיקה.\n"
 "\n"
 
-#: src/startup.c:281
+#: src/startup.c:271
 msgid "LiVES: - Choose an audio player"
 msgstr "LiVES: - בחירת נגן שמע"
 
-#: src/startup.c:298
+#: src/startup.c:288
 msgid "Use _pulse audio player"
 msgstr "שימוש בנגן השמע _pulse"
 
-#: src/startup.c:320
+#: src/startup.c:310
 msgid "Use _jack audio player"
 msgstr "שימוש בנגן השמע _jack"
 
-#: src/startup.c:340
+#: src/startup.c:330
 msgid "Use _sox audio player"
 msgstr "שימוש בנגן השמע _sox"
 
-#: src/startup.c:361
+#: src/startup.c:351
 msgid "Use _mplayer audio player"
 msgstr "שימוש בנגן השמע _mplayer"
 
-#: src/startup.c:381
+#: src/startup.c:371
 #, fuzzy
 msgid "Use _mplayer2 audio player"
 msgstr "שימוש בנגן השמע _mplayer"
 
-#: src/startup.c:405 src/startup.c:580 src/interface.c:1506
+#: src/startup.c:395 src/startup.c:569 src/interface.c:1398
 msgid "_Next"
 msgstr "_הבא"
 
-#: src/startup.c:445
+#: src/startup.c:435
 msgid "Skipped"
 msgstr "דולג"
 
-#: src/startup.c:460
+#: src/startup.c:450
 msgid "Passed"
 msgstr "עבר בהצלחה"
 
-#: src/startup.c:493
+#: src/startup.c:483
 msgid "Failed"
 msgstr "נכשל"
 
-#: src/startup.c:552
+#: src/startup.c:542
 msgid "LiVES: - Testing Configuration"
 msgstr "LiVES: - בודק את התצורה"
 
-#: src/startup.c:555
+#: src/startup.c:544
 msgid "LiVES: - Troubleshoot"
 msgstr "LiVES: - פתרון בעיות"
 
-#: src/startup.c:568
+#: src/startup.c:557
 msgid "LiVES will now run some basic configuration tests\n"
 msgstr "LiVES יריץ כעת מספר בדיקות תצורה בסיסיות\n"
 
-#: src/startup.c:603
+#: src/startup.c:591
 msgid "Checking for \"sox\" presence"
 msgstr "בודק האם \"sox\" מותקן"
 
-#: src/startup.c:607
+#: src/startup.c:595
 msgid ""
 "You should install sox to be able to use all the audio features in LiVES"
 msgstr "יש להתקין את sox כדי להשתמש בכל תכונות השמע ב־LiVES."
 
-#: src/startup.c:615
+#: src/startup.c:602
 msgid "Checking if sox can convert audio"
 msgstr "בודק האם sox יכול להמיר שמע"
 
-#: src/startup.c:638
+#: src/startup.c:625
 msgid "Unable to allocate 176400 bytes memory."
 msgstr ""
 
-#: src/startup.c:653
+#: src/startup.c:639
 #, c-format
 msgid "Unable to write to: %s"
 msgstr ""
 
-#: src/startup.c:667 src/startup.c:807
+#: src/startup.c:653 src/startup.c:789
 #, c-format
 msgid "Command failed: %s"
 msgstr ""
 
-#: src/startup.c:689
+#: src/startup.c:675
 msgid "You should install sox_fmt_all or similar"
 msgstr "יש להתקין את sox_fmt_all או דומה לו"
 
-#: src/startup.c:717
+#: src/startup.c:703
 msgid "Checking for \"mplayer\" presence"
 msgstr "בודק אם \"mplayer\" מותקן"
 
-#: src/startup.c:721
+#: src/startup.c:707
 #, fuzzy
 msgid ""
 "You should install mplayer or mplayer2 to be able to use all the decoding "
 "features in LiVES"
 msgstr "יש להתקין את mplayer כדי להשתמש בכל תכונות הפענוח של LiVES."
 
-#: src/startup.c:747
+#: src/startup.c:732
 msgid "Checking if mplayer can convert audio"
 msgstr "בודק אם mplayer יכול להמיר שמע"
 
-#: src/startup.c:768
+#: src/startup.c:751
 #, fuzzy
 msgid "You should install mplayer or mplayer2 with pcm/wav support"
 msgstr "יש להתקין את mplayer עם תמיכה ב־pcm/wav"
 
-#: src/startup.c:785
+#: src/startup.c:767
 msgid "Checking if mplayer can decode to png/alpha"
 msgstr "בודק אם mplayer יכול לפענח ל־png/alpha"
 
-#: src/startup.c:828
+#: src/startup.c:810
 msgid "You may wish to upgrade mplayer to a newer version"
 msgstr "אולי תבקשו לשדרג את mplayer לגרסה עדכנית יותר"
 
-#: src/startup.c:854
+#: src/startup.c:836
 msgid "Checking if mplayer can decode to jpeg"
 msgstr "בודק אם mplayer יכול לפענח ל־jpeg"
 
-#: src/startup.c:882
+#: src/startup.c:862
 msgid "You should install mplayer with either png/alpha or jpeg support"
 msgstr "יש להתקין את mplayer עם תמיכה ב־png/alpha או jpeg"
 
-#: src/startup.c:883
+#: src/startup.c:863
 msgid "You may wish to add jpeg output support to mplayer"
 msgstr "אולי תבקשו להוסיף תמיכה בפלט jpeg ל־mplayer"
 
-#: src/startup.c:892
+#: src/startup.c:872
 msgid "Checking for \"convert\" presence"
 msgstr "בודק האם \"convert\" מותקן"
 
-#: src/startup.c:896
+#: src/startup.c:876
 msgid "Install imageMagick to be able to use all of the rendered effects"
 msgstr "יש להתקין את imageMagick כדי להשתמש בכל האפקטים המוכנים"
 
-#: src/startup.c:909
+#: src/startup.c:889
 msgid ""
 "\n"
 "\n"
@@ -1056,7 +1060,7 @@
 "Preferences/Decoding.    \n"
 msgstr ""
 
-#: src/startup.c:915
+#: src/startup.c:894
 msgid ""
 "\n"
 "\n"
@@ -1068,7 +1072,7 @@
 "    לחצו על \"ביטול\" כדי לצאת ולהתקין את הרכיבים החסרים, או על \"הבא\" כדי "
 "להמשיך    \n"
 
-#: src/startup.c:949
+#: src/startup.c:928
 msgid ""
 "\n"
 "\n"
@@ -1078,7 +1082,7 @@
 "\n"
 "לבסוף, תוכלו לבחור את מנשק ההפעלה כברירת מחדל של LiVES.\n"
 
-#: src/startup.c:950
+#: src/startup.c:929
 msgid ""
 "\n"
 "\n"
@@ -1088,7 +1092,7 @@
 "\n"
 "ל־LiVES ישנם שני מנשקים ראשיים ותוכלו להפעילו עם כל אחד מהם.\n"
 
-#: src/startup.c:951
+#: src/startup.c:930
 msgid ""
 "\n"
 "\n"
@@ -1098,28 +1102,28 @@
 "\n"
 "ניתן לשנות את ברירת־המחדל בכל עת מההעדפות.\n"
 
-#: src/startup.c:961
+#: src/startup.c:940
 msgid "LiVES: - Choose the startup interface"
 msgstr "LiVES: - בחירת מנשק ההפעלה"
 
-#: src/startup.c:972
+#: src/startup.c:951
 msgid "Start in _Clip Edit mode"
 msgstr "הפעלה במצב _עריכת קטע"
 
-#: src/startup.c:975
+#: src/startup.c:954
 msgid "This is the best choice for simple editing tasks and for VJs\n"
 msgstr ""
 
-#: src/startup.c:981
+#: src/startup.c:960
 msgid "Start in _Multitrack mode"
 msgstr "הפעלה במצב _ריבוי רצועות"
 
-#: src/startup.c:983
+#: src/startup.c:962
 msgid ""
 "This is a better choice for complex editing tasks involving multiple clips.\n"
 msgstr "זוהי בחירה טובה יותר עבור משימות עריכה מורכבות שכוללות קטעים מרובים.\n"
 
-#: src/startup.c:992
+#: src/startup.c:971
 msgid "_Finish"
 msgstr "_סיום"
 
@@ -1136,35 +1140,35 @@
 msgid "Apply _Deinterlace"
 msgstr ""
 
-#: src/interface.c:66
+#: src/interface.c:65
 msgid "If this is set, frames will be deinterlaced as they are imported."
 msgstr "באם מוגדר, תבוצע פעולת deinterlace על השקופיות בעת הייבוא."
 
-#: src/interface.c:113 src/callbacks.c:9623 src/callbacks.c:9646
-#: src/callbacks.c:9647 src/gui.c:3223 src/gui.c:3821 src/saveplay.c:2339
-#: src/saveplay.c:3138 src/dialogs.c:1514 src/dialogs.c:1515
-#: src/dialogs.c:1746 src/dialogs.c:1747 src/framedraw.c:238
-#: src/multitrack.c:8031
+#: src/interface.c:106 src/callbacks.c:9542 src/callbacks.c:9564
+#: src/callbacks.c:9565 src/gui.c:3333 src/gui.c:3946 src/saveplay.c:2317
+#: src/saveplay.c:3097 src/dialogs.c:1575 src/dialogs.c:1576
+#: src/dialogs.c:1804 src/dialogs.c:1805 src/framedraw.c:236
+#: src/multitrack.c:8210
 msgid "Preview"
 msgstr "תצוגה מקדימה"
 
-#: src/interface.c:132
+#: src/interface.c:125
 msgid "Click here to _Preview any selected video, image or audio file"
 msgstr "יש ללחוץ כאן כדי _להציג כל קטע וידאו, תמונה או שמע שנבחרו"
 
-#: src/interface.c:135
+#: src/interface.c:127
 msgid "Click here to _Preview any selected audio file"
 msgstr "יש ללחוץ כאן כדי _להציג כל קטע שמע שנבחר"
 
-#: src/interface.c:138
+#: src/interface.c:129
 msgid "Click here to _Preview the video"
 msgstr "יש ללחוץ כאן כדי _להציג את הוידאו"
 
-#: src/interface.c:181 src/dialogs.c:2542
+#: src/interface.c:169 src/dialogs.c:2621
 msgid "LiVES: - Processing..."
 msgstr "LiVES: - בתהליכי עיבוד..."
 
-#: src/interface.c:217
+#: src/interface.c:205
 msgid ""
 "\n"
 "\n"
@@ -1178,8 +1182,8 @@
 "\n"
 "נא לזכור לכבות את האפקטים (Ctrl-0) לאחר מכן !"
 
-#: src/interface.c:222 src/callbacks.c:9373 src/callbacks.c:9420
-#: src/dialogs.c:2570
+#: src/interface.c:210 src/callbacks.c:9283 src/callbacks.c:9332
+#: src/dialogs.c:2649
 msgid ""
 "\n"
 "Please Wait"
@@ -1187,190 +1191,178 @@
 "\n"
 "נא להמתין"
 
-#: src/interface.c:242
+#: src/interface.c:230
 msgid "Show Details"
 msgstr ""
 
-#: src/interface.c:254 src/dialogs.c:2584
+#: src/interface.c:242 src/dialogs.c:2663
 msgid "_Enough"
 msgstr "_מספיק"
 
-#: src/interface.c:255 src/framedraw.c:278
+#: src/interface.c:243 src/framedraw.c:276
 msgid "_Preview"
 msgstr "_תצוגה מקדימה"
 
-#: src/interface.c:257
+#: src/interface.c:245 src/callbacks.c:9282 src/callbacks.c:9330
 msgid "Paus_e"
 msgstr "הש_הייה"
 
-#: src/interface.c:258 src/callbacks.c:9417
+#: src/interface.c:246 src/callbacks.c:9329
 msgid "Pause/_Enough"
 msgstr "השהייה/_מספיק"
 
-#: src/interface.c:285
+#: src/interface.c:273
 msgid "_Cancel"
 msgstr "_ביטול"
 
-#: src/interface.c:374
+#: src/interface.c:361
 #, c-format
 msgid "LiVES: - %s"
 msgstr ""
 
-#: src/interface.c:376
+#: src/interface.c:363
 msgid "LiVES: - Multitrack details"
 msgstr ""
 
-#: src/interface.c:407
+#: src/interface.c:394
 msgid "Format"
 msgstr "מבנה"
 
-#: src/interface.c:412
+#: src/interface.c:399
 msgid "Frame size"
 msgstr "גודל השקופית"
 
-#: src/interface.c:417
+#: src/interface.c:404
 msgid "File size"
 msgstr "גודל הקובץ"
 
-#: src/interface.c:418
+#: src/interface.c:405
 msgid "Byte size"
 msgstr "גודל הבית"
 
-#: src/interface.c:423 src/interface.c:1891
+#: src/interface.c:410 src/interface.c:1760
 msgid "FPS"
 msgstr "שקופיות לשנייה"
 
-#: src/interface.c:428
+#: src/interface.c:415
 msgid "Frames"
 msgstr "שקופיות"
 
-#: src/interface.c:429
+#: src/interface.c:416
 msgid "Events"
 msgstr "אירועים"
 
-#: src/interface.c:434 src/interface.c:500 src/interface.c:542
+#: src/interface.c:421 src/interface.c:486 src/interface.c:528
 msgid "Total time"
 msgstr "זמן כולל"
 
-#: src/interface.c:486 src/resample.c:1488
+#: src/interface.c:472 src/resample.c:1460
 msgid "Audio"
 msgstr "שמע"
 
-#: src/interface.c:511 src/interface.c:553
+#: src/interface.c:497 src/interface.c:539
 msgid "Rate/size"
 msgstr "קצב/גודל"
 
-#: src/interface.c:530
+#: src/interface.c:516
 msgid "Right audio"
 msgstr "ערוץ שמע ימני"
 
-#: src/interface.c:622
+#: src/interface.c:607
 msgid "LiVES: - Encoding options"
 msgstr "LiVES : - אפשרויות קידוד"
 
-#: src/interface.c:636
+#: src/interface.c:621
 msgid "<------------- (Check the box to re_size as suggested)"
 msgstr ""
 
-#: src/interface.c:637
+#: src/interface.c:622
 msgid "<------------- (Check the box to use the _size recommendation)"
 msgstr ""
 
-#: src/interface.c:662
+#: src/interface.c:646
 msgid "Use _letterboxing to maintain aspect ratio (optional)"
 msgstr ""
 
-#: src/interface.c:663
+#: src/interface.c:647
 msgid ""
 "Draw black rectangles either above or to the sides of the image, to prevent "
 "it from stretching."
 msgstr ""
 
-#: src/interface.c:694
+#: src/interface.c:677
 msgid "Keep _my settings"
 msgstr "ש_מירת ההגדרות האישיות"
 
-#: src/interface.c:695
+#: src/interface.c:678
 msgid "Use _recommended settings"
 msgstr "שימוש בהגדרות מ_ומלצות"
 
-#: src/interface.c:775 src/dialogs.c:114
-msgid ""
-"Do _not show this warning any more\n"
-"(can be turned back on from Preferences/Warnings)"
-msgstr ""
-"אין להציג אזהרה זאת עוד\n"
-"(ניתן להפעיל שוב תחת העדפות/אזהרות)"
-
-#: src/interface.c:787
-msgid "Show _Details"
-msgstr "הצגת _פרטים"
-
-#: src/interface.c:881
+#: src/interface.c:769
 msgid "_Close Window"
 msgstr "_סגירת החלון"
 
-#: src/interface.c:883
+#: src/interface.c:771
 msgid "_Save to file"
 msgstr "_שמירה לקובץ"
 
-#: src/interface.c:928
+#: src/interface.c:816
 msgid "LiVES: - Insert"
 msgstr "LiVES: - הוספה"
 
-#: src/interface.c:945
+#: src/interface.c:833
 msgid "_Number of times to insert"
 msgstr "_מספר הפעמים להוספה"
 
-#: src/interface.c:954
+#: src/interface.c:842
 msgid "_Insert to fit audio"
 msgstr "הוס_פה להתאמת הצליל"
 
-#: src/interface.c:968
+#: src/interface.c:856
 msgid "Insert _before selection"
 msgstr "הוספה _לפני הבחירה"
 
-#: src/interface.c:970
+#: src/interface.c:858
 msgid "Insert clipboard before selected frames"
 msgstr "הוספת תוכן לוח הגזירים לפני השקופיות הנבחרות"
 
-#: src/interface.c:986
+#: src/interface.c:875
 msgid "Insert _after selection"
 msgstr "הוספה ל_אחר הבחירה"
 
-#: src/interface.c:988
+#: src/interface.c:877
 msgid "Insert clipboard after selected frames"
 msgstr "הוספת תוכן לוח הגזירים לאחר השקופיות הנבחרות"
 
-#: src/interface.c:999
+#: src/interface.c:888
 msgid "Insert _with sound"
 msgstr "הוספה עם _צליל"
 
-#: src/interface.c:1012
+#: src/interface.c:901
 msgid "Insert with_out sound"
 msgstr "הוספה ל_לא צליל"
 
-#: src/interface.c:1093
+#: src/interface.c:985
 msgid "LiVES: - Open Selection"
 msgstr "LiVES: - פתיחת הבחירה"
 
-#: src/interface.c:1111
+#: src/interface.c:1004
 msgid "Selection start time (sec)"
 msgstr ""
 
-#: src/interface.c:1117
+#: src/interface.c:1010
 msgid "Number of frames to open"
 msgstr ""
 
-#: src/interface.c:1193
+#: src/interface.c:1088
 msgid "LiVES: - Open Location"
 msgstr "LiVES: - פתיחת מיקום"
 
-#: src/interface.c:1195
+#: src/interface.c:1090
 msgid "LiVES: - Open Youtube Clip"
 msgstr ""
 
-#: src/interface.c:1213
+#: src/interface.c:1109
 msgid ""
 "\n"
 "\n"
@@ -1385,7 +1377,7 @@
 "בנוסף, יש לוודא כי רוחב הפס העצמי הוגדר תחת העדפות|מדיה זורמת\n"
 "\n"
 
-#: src/interface.c:1216
+#: src/interface.c:1112
 msgid ""
 "\n"
 "\n"
@@ -1394,62 +1386,63 @@
 "\n"
 msgstr ""
 
-#: src/interface.c:1220
+#: src/interface.c:1116
 msgid ""
 "Enter the URL of the clip below.\n"
 "E.g: http://www.youtube.com/watch?v=WCR6f6WzjP8\n"
 "\n"
 msgstr ""
 
-#: src/interface.c:1231
+#: src/interface.c:1127
 msgid "URL : "
 msgstr "כתובת אינטרנט : "
 
-#: src/interface.c:1231
+#: src/interface.c:1127
 msgid "Youtube URL : "
 msgstr ""
 
-#: src/interface.c:1235
+#: src/interface.c:1131
 msgid "Do not send bandwidth information"
 msgstr "אין לשלוח מידע אודות רוחב הפס"
 
-#: src/interface.c:1237
+#: src/interface.c:1133
 msgid "Try this setting if you are having problems getting a stream"
 msgstr "ניתן לנסות הגדרה זו אם צצות בעיות בקבלת תזרים מדיה."
 
-#: src/interface.c:1258
+#: src/interface.c:1155
 msgid "Download to _Directory : "
 msgstr ""
 
-#: src/interface.c:1276
+#: src/interface.c:1173
 msgid "Download _File Name : "
 msgstr ""
 
-#: src/interface.c:1281
+#: src/interface.c:1178
 msgid ".webm"
 msgstr ""
 
-#: src/interface.c:1359
+#: src/interface.c:1256
 msgid "LiVES: - Rename Clip"
 msgstr "LiVES: -שינוי שם של קטע"
 
-#: src/interface.c:1362
-msgid "LiVES: - Enter Set Name"
+#: src/interface.c:1258
+#, fuzzy
+msgid "LiVES: - Enter Set Name to Save as"
 msgstr "LiVES: - הזנת שם לאוסף"
 
-#: src/interface.c:1365
+#: src/interface.c:1260
 msgid "LiVES: - Enter a Set Name to Reload"
 msgstr ""
 
-#: src/interface.c:1368
+#: src/interface.c:1262
 msgid "LiVES: - Choose a Working Directory"
 msgstr "LiVES: - בחר מדריך עבודה"
 
-#: src/interface.c:1371
+#: src/interface.c:1264
 msgid "LiVES: - Rename Current Track"
 msgstr ""
 
-#: src/interface.c:1391
+#: src/interface.c:1283
 msgid ""
 "You need to enter a name for the current clip set.\n"
 "This will allow you reload the layout with the same clips later.\n"
@@ -1461,7 +1454,7 @@
 "יש להזין את השם המבוקש עבור האוסף.\n"
 "ב־LiVES תופיע תזכורת לשמירת אוסף הקטעים עם כל נסיון ליציאה.\n"
 
-#: src/interface.c:1397
+#: src/interface.c:1289
 msgid ""
 "In order to export this project, you must enter a name for this clip set.\n"
 "This will also be used for the project name.\n"
@@ -1469,7 +1462,7 @@
 "על מנת לייצא מיזם זה, יש להזין שם עבור אוסף קטעים זה.\n"
 "השם ישמש כמו כן כשם המיזם.\n"
 
-#: src/interface.c:1404
+#: src/interface.c:1296
 msgid ""
 "Welcome to LiVES !\n"
 "This startup wizard will guide you through the\n"
@@ -1479,200 +1472,200 @@
 "אשף ההפעלה הזה ידריך אותך במהלך\n"
 "ההתקנה, כך שתוכל לקבל את המיטב מיישום זה.\n"
 
-#: src/interface.c:1408
+#: src/interface.c:1300
 msgid ""
 "\n"
 "First of all you need to choose a working directory for LiVES.\n"
 "This should be a directory with plenty of disk space available.\n"
 msgstr ""
 
-#: src/interface.c:1427
+#: src/interface.c:1317
 msgid "New name "
 msgstr "שם חדש "
 
-#: src/interface.c:1430
+#: src/interface.c:1319
 msgid "Set name "
 msgstr "שם האוסף "
 
-#: src/interface.c:1550
+#: src/interface.c:1435
 msgid "Use def_aults"
 msgstr "שימוש בברי_רות המחדל"
 
-#: src/interface.c:1553 src/interface.c:1840 src/preferences.c:2515
-#: src/preferences.c:2697
+#: src/interface.c:1437 src/interface.c:1709 src/preferences.c:2550
+#: src/preferences.c:2739
 msgid "_Advanced"
 msgstr "_מתקדם"
 
-#: src/interface.c:1604
+#: src/interface.c:1487
 msgid "LiVES:- Select input device"
 msgstr ""
 
-#: src/interface.c:1622
+#: src/interface.c:1504
 msgid "Select input device:"
 msgstr ""
 
-#: src/interface.c:1686
+#: src/interface.c:1568
 msgid "LiVES:- Load CD Track"
 msgstr "LiVES:- טעינת רצועה מהתקליטור"
 
-#: src/interface.c:1689
+#: src/interface.c:1570
 msgid "LiVES:- Select DVD Title/Chapter"
 msgstr "LiVES:- בחירת פרק/קטע מ־DVD"
 
-#: src/interface.c:1692
+#: src/interface.c:1572
 msgid "LiVES:- Select VCD Title"
 msgstr "LiVES:- בחירת קטע מ־VCD"
 
-#: src/interface.c:1695
+#: src/interface.c:1574
 msgid "LiVES:- Change Maximum Visible Tracks"
 msgstr "LiVES:- שינוי מספר הרצועות הגלויות המירבי"
 
-#: src/interface.c:1698
+#: src/interface.c:1576
 msgid "LiVES:- Device details"
 msgstr "LiVES:- נתוני התקן"
 
-#: src/interface.c:1721
+#: src/interface.c:1598
 #, c-format
 msgid "Track to load (from %s)"
 msgstr "רצועה לטעינה (מ־%s)"
 
-#: src/interface.c:1724
+#: src/interface.c:1600
 msgid "DVD Title"
 msgstr "כותרת ה־DVD"
 
-#: src/interface.c:1727
+#: src/interface.c:1602
 msgid "VCD Title"
 msgstr "כותרת ה־VCD"
 
-#: src/interface.c:1730
+#: src/interface.c:1604
 msgid "Maximum number of tracks to display"
 msgstr "מספר מירבי של רצועות לתצוגה"
 
-#: src/interface.c:1733
+#: src/interface.c:1606
 msgid "Device:        /dev/video"
 msgstr "התקן: /dev/video"
 
-#: src/interface.c:1736
+#: src/interface.c:1608
 msgid "Device:        fw:"
 msgstr "התקן: קושחה:"
 
-#: src/interface.c:1771
+#: src/interface.c:1641
 msgid "Chapter  "
 msgstr "פרק  "
 
-#: src/interface.c:1776
+#: src/interface.c:1645
 msgid "Channel  "
 msgstr "ערוץ  "
 
-#: src/interface.c:1791
+#: src/interface.c:1660
 msgid "Audio ID  "
 msgstr "מזהה השמע  "
 
-#: src/interface.c:1857
+#: src/interface.c:1726
 msgid "Input number"
 msgstr "מספר קלט"
 
-#: src/interface.c:1865
+#: src/interface.c:1734
 msgid "Use default width, height and FPS"
 msgstr "שימוש ברוחב, בגובה ובמספר השקופיות לשנייה המוגדרים כברירת מחדל"
 
-#: src/interface.c:1879
+#: src/interface.c:1748
 msgid "Width"
 msgstr "רוחב"
 
-#: src/interface.c:1885
+#: src/interface.c:1754
 msgid "Height"
 msgstr "גובה"
 
-#: src/interface.c:1899
+#: src/interface.c:1768
 msgid "_Driver"
 msgstr ""
 
-#: src/interface.c:1902
+#: src/interface.c:1771
 msgid "_Output format"
 msgstr ""
 
-#: src/interface.c:1998
+#: src/interface.c:1865
 msgid "LiVES:- Fade Audio In"
 msgstr "LiVES:- החלת אפקט עמעום פנימה על שמע"
 
-#: src/interface.c:2001
+#: src/interface.c:1867
 msgid "LiVES:- Fade Audio Out"
 msgstr "החלת אפקט עמעום עד להשתקה על שמע"
 
-#: src/interface.c:2017
+#: src/interface.c:1883
 msgid "Fade in over  "
 msgstr "החל אפקט עמעום פנימה מעבר  "
 
-#: src/interface.c:2018
+#: src/interface.c:1884
 msgid "first"
 msgstr "ראשון"
 
-#: src/interface.c:2021
+#: src/interface.c:1886
 msgid "Fade out over  "
 msgstr "החל אפקט עמעום עד להשתקה מעבר  "
 
-#: src/interface.c:2022
+#: src/interface.c:1887
 msgid "last"
 msgstr "אחרון"
 
-#: src/interface.c:2044
+#: src/interface.c:1909
 msgid "seconds."
 msgstr "שניות."
 
-#: src/interface.c:2052 src/saveplay.c:1507
+#: src/interface.c:1917 src/saveplay.c:1484
 msgid "selection"
 msgstr "בחירה"
 
-#: src/interface.c:2092
+#: src/interface.c:1956
 msgid "LiVES: - File Comments (optional)"
 msgstr "LiVES: - הערות קובץ (רשות)"
 
-#: src/interface.c:2107
+#: src/interface.c:1971
 msgid "Title/Name : "
 msgstr "כותרת/שם : "
 
-#: src/interface.c:2114
+#: src/interface.c:1978
 msgid "Author/Artist : "
 msgstr "יוצר/אמן : "
 
-#: src/interface.c:2121
+#: src/interface.c:1985
 msgid "Comments : "
 msgstr "הערות : "
 
-#: src/interface.c:2151
+#: src/interface.c:2015
 msgid "_Options"
 msgstr ""
 
-#: src/interface.c:2158
+#: src/interface.c:2022
 msgid "Save _subtitles to file"
 msgstr ""
 
-#: src/interface.c:2170
+#: src/interface.c:2033
 msgid "Subtitle file"
 msgstr ""
 
-#: src/interface.c:2172
+#: src/interface.c:2035
 msgid "Browse..."
 msgstr ""
 
-#: src/interface.c:2255
+#: src/interface.c:2132
 msgid "LiVES: - choose a device"
 msgstr ""
 
-#: src/interface.c:2259
+#: src/interface.c:2135
 msgid "LiVES: - choose a directory"
 msgstr ""
 
-#: src/interface.c:2262
+#: src/interface.c:2137
 msgid "LiVES: - choose a file"
 msgstr ""
 
-#: src/interface.c:2445
+#: src/interface.c:2381
 msgid "LiVES: - Cancel/Discard/Save"
 msgstr "LiVES: - ביטול/התעלמות/שמירה"
 
-#: src/interface.c:2460
+#: src/interface.c:2397
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has not been saved.\n"
@@ -1682,7 +1675,7 @@
 "הפריסה הנוכחית לא נשמרה.\n"
 "איזו פעולה יש לבצע?\n"
 
-#: src/interface.c:2463
+#: src/interface.c:2400
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has been changed since the last save.\n"
@@ -1692,7 +1685,7 @@
 "הפריסה הנוכחית שונתה מאז שנשמרה לאחרונה.\n"
 "איזו פעולה יש לבצע?\n"
 
-#: src/interface.c:2467
+#: src/interface.c:2404
 msgid ""
 "You are about to exit LiVES.\n"
 "The current clip set can be saved.\n"
@@ -1702,7 +1695,7 @@
 "ניתן לשמור את אוסף הקטעים הנוכחי.\n"
 "איזו פעולה יש לבצע?\n"
 
-#: src/interface.c:2468
+#: src/interface.c:2405
 msgid ""
 "The current clip set has not been saved.\n"
 "What would you like to do ?\n"
@@ -1710,7 +1703,7 @@
 "אוסף הקטעים הנוכחי לא נשמר.\n"
 "איזו פעולה יש לבצע ?\n"
 
-#: src/interface.c:2472
+#: src/interface.c:2408
 msgid ""
 "The current layout has not been saved.\n"
 "What would you like to do ?\n"
@@ -1718,7 +1711,7 @@
 "הפריסה הנוכחית לא נשמרה.\n"
 "איזור פעולה יש לבצע ?\n"
 
-#: src/interface.c:2475
+#: src/interface.c:2410
 #, fuzzy
 msgid ""
 "The current layout has *not* been changed since it was last saved.\n"
@@ -1727,7 +1720,7 @@
 "הפריסה הנוכחית השתנתה מאז שנשמרה לאחרונה.\n"
 "מה ברצונך לעשות ?\n"
 
-#: src/interface.c:2480
+#: src/interface.c:2415
 msgid ""
 "The current layout contains generated frames and cannot be retained.\n"
 "You may wish to render it before exiting multitrack mode.\n"
@@ -1735,7 +1728,7 @@
 "הפריסה הנוכחית מכילה שקופיות שנוצרו ולא ניתן לשמור אותן.\n"
 "מומלץ לעבד אותה לפני יציאה ממצב ריבוי־הרצועות\n"
 
-#: src/interface.c:2483
+#: src/interface.c:2418
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout contains generated frames and cannot be retained.\n"
@@ -1745,39 +1738,39 @@
 "הפריסה הנוכחית כוללת שקופיות שנוצרו ולא ניתן לשמור אותן.\n"
 "מה ברצונכם לעשות ?"
 
-#: src/interface.c:2496
+#: src/interface.c:2431
 msgid "Clip set _name"
 msgstr "_שם אוסף הקטעים"
 
-#: src/interface.c:2502
+#: src/interface.c:2437
 msgid "_Auto reload next time"
 msgstr "_טעינה אוטומטית בפעם הבאה"
 
-#: src/interface.c:2538 src/interface.c:2547
+#: src/interface.c:2473 src/interface.c:2482
 msgid "_Wipe layout"
 msgstr "_מחיקת פריסה"
 
-#: src/interface.c:2539
+#: src/interface.c:2474
 msgid "_Ignore changes"
 msgstr "ה_תעלמות מהשינויים"
 
-#: src/interface.c:2540
+#: src/interface.c:2475
 msgid "_Delete clip set"
 msgstr "_מחיקת אוסף הקטעים"
 
-#: src/interface.c:2541
+#: src/interface.c:2476
 msgid "_Delete layout"
 msgstr "_מחיקת פריסה"
 
-#: src/interface.c:2545
+#: src/interface.c:2480
 msgid "_Save layout"
 msgstr "שמירת _פריסה"
 
-#: src/interface.c:2546
+#: src/interface.c:2481
 msgid "_Save clip set"
 msgstr "שמירת אוסף ה_קטעים"
 
-#: src/interface.c:2565
+#: src/interface.c:2502
 msgid ""
 "\n"
 "LiVES has detected a multitrack layout from a previous session.\n"
@@ -1787,57 +1780,57 @@
 "LiVES זיהה פריסה מרובת־רצועות מהפעלה קודמת.\n"
 "האם ברצונך לנסות לשחזרה ?/n\n"
 
-#: src/interface.c:2589
+#: src/interface.c:2528
 msgid "LiVES: - Disk Recovery Options"
 msgstr ""
 
-#: src/interface.c:2608
+#: src/interface.c:2549
 msgid "Delete _Orphaned Clips"
 msgstr ""
 
-#: src/interface.c:2609
+#: src/interface.c:2550
 msgid "Delete any clips which are not currently loaded or part of a set"
 msgstr ""
 
-#: src/interface.c:2622
+#: src/interface.c:2564
 msgid "Clear _Backup Files from Closed Clips"
 msgstr ""
 
-#: src/interface.c:2633
+#: src/interface.c:2575
 msgid "Remove Sets which have _Layouts but no Clips"
 msgstr ""
 
-#: src/interface.c:2644
+#: src/interface.c:2586
 msgid "_Reset to Defaults"
 msgstr ""
 
-#: src/interface.c:2651
+#: src/interface.c:2593
 msgid "_Accept"
 msgstr ""
 
-#: src/callbacks.c:198
+#: src/callbacks.c:208
 #, c-format
 msgid "Saving as set %s..."
 msgstr "מתבצעת שמירה כאוסף %s..."
 
-#: src/callbacks.c:833
+#: src/callbacks.c:852
 msgid "Please enter the name of the file to save the clip as.\n"
 msgstr ""
 
-#: src/callbacks.c:841
+#: src/callbacks.c:860
 msgid "Please enter a valid URL for the download.\n"
 msgstr ""
 
-#: src/callbacks.c:867
+#: src/callbacks.c:886
 #, c-format
 msgid "Downloading %s to %s..."
 msgstr ""
 
-#: src/callbacks.c:895
+#: src/callbacks.c:912
 msgid "Downloading clip"
 msgstr ""
 
-#: src/callbacks.c:933
+#: src/callbacks.c:950
 msgid ""
 "\n"
 "LiVES was unable to download the clip.\n"
@@ -1845,11 +1838,11 @@
 "the latest youtube-dl installed.\n"
 msgstr ""
 
-#: src/callbacks.c:1114 src/callbacks.c:1149
+#: src/callbacks.c:1131 src/callbacks.c:1166
 msgid "This file"
 msgstr "קובץ זה"
 
-#: src/callbacks.c:1115
+#: src/callbacks.c:1132
 msgid ""
 ",\n"
 " - including the current layout - "
@@ -1857,7 +1850,7 @@
 ",\n"
 " - כולל הפריסה הנוכחית - "
 
-#: src/callbacks.c:1117
+#: src/callbacks.c:1134
 #, c-format
 msgid ""
 "\n"
@@ -1872,7 +1865,7 @@
 "\n"
 "האם לסגור אותו בכל־זאת?"
 
-#: src/callbacks.c:1119
+#: src/callbacks.c:1136
 #, c-format
 msgid ""
 "\n"
@@ -1887,14 +1880,14 @@
 "\n"
 "האם לסגור אותו?"
 
-#: src/callbacks.c:1150
+#: src/callbacks.c:1167
 msgid ""
 "Changes made to this clip have not been saved or backed up.\n"
 "\n"
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1343
+#: src/callbacks.c:1356
 msgid ""
 "\n"
 "Invalid project file.\n"
@@ -1902,7 +1895,7 @@
 "\n"
 "קובץ פרוייקט לא תקין.\n"
 
-#: src/callbacks.c:1356
+#: src/callbacks.c:1370
 #, c-format
 msgid ""
 "\n"
@@ -1922,33 +1915,33 @@
 "לאחר מכן קובץ|סגירה\\שמירת כל הקטעים ונתינת שם חדש לאוסף או ביטולו.\n"
 "בסיום תהליך זה ניתן לייבא את הפרויקט החדש.\n"
 
-#: src/callbacks.c:1366
+#: src/callbacks.c:1381
 #, c-format
 msgid "Importing the project %s as set %s..."
 msgstr "מתבצע ייבוא הפרוייקט %s כאוסף %s..."
 
-#: src/callbacks.c:1386
+#: src/callbacks.c:1399
 msgid "Importing project"
 msgstr "ייבוא פרוייקט"
 
-#: src/callbacks.c:1472
+#: src/callbacks.c:1481
 #, c-format
 msgid "Exporting project %s..."
 msgstr "מתבצע ייצוא הפרוייקט %s..."
 
-#: src/callbacks.c:1490
+#: src/callbacks.c:1497
 msgid "Exporting project"
 msgstr "ייצוא פרוייקט"
 
-#: src/callbacks.c:1506
+#: src/callbacks.c:1513
 msgid "Backup as .lv1 file"
 msgstr "גיבוי כקובץ .lv1"
 
-#: src/callbacks.c:1522
+#: src/callbacks.c:1529
 msgid "Restore .lv1 file"
 msgstr "שיחזור קובץ .lv1"
 
-#: src/callbacks.c:1664
+#: src/callbacks.c:1671
 msgid ""
 "\n"
 "\n"
@@ -1960,72 +1953,77 @@
 "האוסף יימחק מהכונן הקשיח.\n"
 "האם לבצע זאת ?\n"
 
-#: src/callbacks.c:1725
+#: src/callbacks.c:1732
 #, c-format
 msgid "Deleting set %s..."
 msgstr ""
 
-#: src/callbacks.c:1727
+#: src/callbacks.c:1734
 msgid "Deleting set..."
 msgstr "מתבצעת מחיקת האוסף..."
 
-#: src/callbacks.c:1731
+#: src/callbacks.c:1738
 msgid "Deleting set"
 msgstr "מחיקת אוסף"
 
-#: src/callbacks.c:1739
+#: src/callbacks.c:1746
 #, c-format
 msgid "Set %s was permanently deleted from the disk.\n"
 msgstr "האוסף %s נמחק לצמיתות מהכונן הקשיח.\n"
 
-#: src/callbacks.c:1787 src/callbacks.c:11764
+#: src/callbacks.c:1792 src/callbacks.c:11676
 msgid "Insert Silence"
 msgstr "הוספת שקט"
 
-#: src/callbacks.c:1840 src/callbacks.c:1923 src/callbacks.c:2086
+#: src/callbacks.c:1844 src/callbacks.c:1927 src/callbacks.c:2089
 msgid "Undoing"
 msgstr "ביטול פעולה"
 
-#: src/callbacks.c:1936 src/callbacks.c:2147
+#: src/callbacks.c:1940 src/callbacks.c:2150
 msgid "Restoring audio..."
 msgstr "שיחזור שמע..."
 
-#: src/callbacks.c:1952
+#: src/callbacks.c:1956
 msgid "Clearing frame images"
 msgstr "פינוי התמונות מהשקופיות"
 
-#: src/callbacks.c:1985
+#: src/callbacks.c:1988
 msgid "Deleting excess frames"
 msgstr ""
 
-#: src/callbacks.c:2229
+#: src/callbacks.c:2232
 #, c-format
 msgid "Length of video is now %d frames at %.3f frames per second.\n"
 msgstr "כעת אורך הוידאו הוא %d שקופיות ב־%.3f שקופיות לשנייה.\n"
 
-#: src/callbacks.c:2233 src/resample.c:683 src/resample.c:2166
+#: src/callbacks.c:2235 src/resample.c:678 src/resample.c:2133
 #, c-format
 msgid "Clipboard was resampled to %d frames.\n"
 msgstr "לוח הגזירים נדגם מחדש ל־%d שקופיות.\n"
 
-#: src/callbacks.c:2394 src/callbacks.c:2423
+#: src/callbacks.c:2396 src/callbacks.c:2425
 msgid "Redoing"
 msgstr "מבצע מחדש"
 
-#: src/callbacks.c:2462
-#, c-format
-msgid "Copying frames %d to %d%s to the clipboard..."
+#: src/callbacks.c:2472
+#, fuzzy, c-format
+msgid "Copying frames %d to %d (with sound) to the clipboard..."
+msgstr "מעתיק שקופיות מ־%d ־ל%d%s וללוח הגזירים..."
+
+#: src/callbacks.c:2474
+#, fuzzy, c-format
+msgid "Copying frames %d to %d to the clipboard..."
 msgstr "מעתיק שקופיות מ־%d ־ל%d%s וללוח הגזירים..."
 
-#: src/callbacks.c:2525
+#: src/callbacks.c:2526
 msgid "Copying to the clipboard"
 msgstr "מעתיק ללוח הגזירים"
 
-#: src/callbacks.c:2600
+#: src/callbacks.c:2601
 msgid "Cut"
 msgstr "גזירה"
 
-#: src/callbacks.c:2641 src/callbacks.c:3068 src/callbacks.c:8026
+#: src/callbacks.c:2641 src/callbacks.c:3063 src/callbacks.c:7631
 #, fuzzy
 msgid "Pulling frames from clipboard"
 msgstr "מושך שקופיות מהקטע"
@@ -2035,15 +2033,15 @@
 msgid "Pasting %d frames to new clip %s..."
 msgstr ""
 
-#: src/callbacks.c:2678
+#: src/callbacks.c:2676
 msgid "Pasting"
 msgstr "מדביק"
 
-#: src/callbacks.c:2694
+#: src/callbacks.c:2692
 msgid "...added audio..."
 msgstr ""
 
-#: src/callbacks.c:2778
+#: src/callbacks.c:2775
 msgid ""
 "This operation requires resizing or converting of frames.\n"
 "Please install 'convert' from the Image-magick package, and then restart "
@@ -2053,7 +2051,7 @@
 "נא להתקין את התסריט 'convert' מתוך החבילה Image-magic ולאחר מכן להפעיל מחדש "
 "את LiVES.\n"
 
-#: src/callbacks.c:2795
+#: src/callbacks.c:2793
 msgid ""
 "\n"
 "\n"
@@ -2067,7 +2065,7 @@
 "ניתן לנסות לבחור את כל השקופיות ולהשתמש \n"
 "ב־'סידור שמע' הניתן להפעלה מתפריט השמע."
 
-#: src/callbacks.c:2819
+#: src/callbacks.c:2817
 msgid ""
 "LiVES cannot insert because the audio rates do not match.\n"
 "Please install 'sox', and try again."
@@ -2075,7 +2073,7 @@
 "לא ניתן להוסיף את הקובץ המבוקש משום שקצב דגימות השמע לא מותאם.\n"
 "יש להתקין את 'sox' ולנסות שנית."
 
-#: src/callbacks.c:2838
+#: src/callbacks.c:2835
 msgid ""
 "\n"
 "Insertion will cause frames to shift in some multitrack layouts.\n"
@@ -2085,7 +2083,7 @@
 "הוספת הקובץ המבוקש תזיז את השקופיות בפריסות רב־רצועתיות מסוימות.\n"
 "האם ברצונך להמשיך ?\n"
 
-#: src/callbacks.c:2888 src/callbacks.c:11692
+#: src/callbacks.c:2883 src/callbacks.c:11606
 msgid ""
 "\n"
 "Insertion will cause audio to shift in some multitrack layouts.\n"
@@ -2095,11 +2093,11 @@
 "הוספת הקובץ המבוקש תזיז את השמע בפריסות רב־רצועתיות מסוימות.\n"
 "האם ברצונך להמשיך ?\n"
 
-#: src/callbacks.c:2996 src/callbacks.c:3025
+#: src/callbacks.c:2987 src/callbacks.c:3016
 msgid "Resampling clipboard audio"
 msgstr "דוגם מחדש את השמע בלוח הגזירים"
 
-#: src/callbacks.c:3041
+#: src/callbacks.c:3032
 msgid ""
 "\n"
 "\n"
@@ -2111,7 +2109,7 @@
 "לא הייתה אפשרות לדגום מחדש את השמע בלוח הגזירים. \n"
 "השמע בלוח הגזירים נמחק.\n"
 
-#: src/callbacks.c:3055
+#: src/callbacks.c:3045
 msgid ""
 "\n"
 "\n"
@@ -2125,30 +2123,30 @@
 "האם ברצונך להמשיך עם ההוספה  \n"
 "באמצעות שמע שלא שונה ?\n"
 
-#: src/callbacks.c:3137 src/callbacks.c:3311
+#: src/callbacks.c:3132 src/callbacks.c:3299
 #, c-format
 msgid "Inserting %d%s frames from the clipboard..."
 msgstr "מכניס %d%s שקופיות מלוח הגזירים..."
 
-#: src/callbacks.c:3162 src/callbacks.c:3236 src/callbacks.c:3339
+#: src/callbacks.c:3155 src/callbacks.c:3224 src/callbacks.c:3325
 msgid "Inserting"
 msgstr "מוסיף"
 
-#: src/callbacks.c:3193
+#: src/callbacks.c:3187
 #, c-format
 msgid "Inserting %d times from the clipboard%s..."
 msgstr "מכניס %d פעמים מלוח הגזירים %s..."
 
-#: src/callbacks.c:3200
+#: src/callbacks.c:3191
 #, c-format
 msgid "Inserting %d frames from the clipboard%s..."
 msgstr "מכניס %d שקופיות  מלוח הגזירים %s..."
 
-#: src/callbacks.c:3418
+#: src/callbacks.c:3404
 msgid "Insert"
 msgstr "הכנסה"
 
-#: src/callbacks.c:3486
+#: src/callbacks.c:3471
 msgid ""
 "\n"
 "Deleting all frames will close this file.\n"
@@ -2158,7 +2156,7 @@
 "מחיקת כל השקופיות תסגור את קובץ זה.\n"
 "האם ברצונך להמשיך ?"
 
-#: src/callbacks.c:3495
+#: src/callbacks.c:3480
 msgid ""
 "\n"
 "Deletion will cause missing frames in some multitrack layouts.\n"
@@ -2168,8 +2166,8 @@
 "עקב המחיקה תיתכנו שקופיות חסרות בפריסות רב־רצועתיות מסוימות.\n"
 "האם ברצונך להמשיך ?\n"
 
-#: src/callbacks.c:3515 src/callbacks.c:10920 src/callbacks.c:11162
-#: src/callbacks.c:11228
+#: src/callbacks.c:3500 src/callbacks.c:10851 src/callbacks.c:11087
+#: src/callbacks.c:11152
 msgid ""
 "\n"
 "Deletion will cause missing audio in some multitrack layouts.\n"
@@ -2179,7 +2177,7 @@
 "עקב המחיקה ייתכן שקטעי קול מסויימים יוחסרו בפריסות רב־רצועתיות מסוימות.\n"
 "האם ברצונך להמשיך ?\n"
 
-#: src/callbacks.c:3534
+#: src/callbacks.c:3519
 msgid ""
 "\n"
 "Deletion will cause frames to shift in some multitrack layouts.\n"
@@ -2189,7 +2187,7 @@
 "המחיקה תזיז את השקופיות בפריסות רב־רצועתיות מסוימות.\n"
 "האם ברצונך להמשיך ?\n"
 
-#: src/callbacks.c:3553 src/callbacks.c:11210
+#: src/callbacks.c:3538 src/callbacks.c:11134
 msgid ""
 "\n"
 "Deletion will cause audio to shift in some multitrack layouts.\n"
@@ -2199,20 +2197,20 @@
 "המחיקה תזיז את השמע בפריסות רב־רצועתיות מסוימות.\n"
 "האם ברצונך להמשיך ?\n"
 
-#: src/callbacks.c:3611
+#: src/callbacks.c:3597
 #, c-format
 msgid "Deleting frames %d to %d%s..."
 msgstr "מוחק את השקופיות %d ל־%d%s..."
 
-#: src/callbacks.c:3636
+#: src/callbacks.c:3619
 msgid "Deleting"
 msgstr "מוחק"
 
-#: src/callbacks.c:3717
+#: src/callbacks.c:3699
 msgid "Delete"
 msgstr "מחיקה"
 
-#: src/callbacks.c:3738
+#: src/callbacks.c:3717
 msgid ""
 "\n"
 "\n"
@@ -2222,7 +2220,7 @@
 "\n"
 "הבחירה נעולה.\n"
 
-#: src/callbacks.c:4092
+#: src/callbacks.c:4056
 msgid ""
 "Ready to record. Use 'control' and cursor keys during playback to record "
 "your performance.\n"
@@ -2232,11 +2230,11 @@
 "מוכן להקלטה. השתמש ב־'control' ובכפתורי העכבר בעת הנגינה להקלטת ביצועיך.\n"
 "(לביטול, הקש על 'r' או לחץ על נגן|הקלט ביצועים שוב לפני נגינה.)\n"
 
-#: src/callbacks.c:4098
+#: src/callbacks.c:4061
 msgid "Record cancelled.\n"
 msgstr "ההקלטה בוטלה.\n"
 
-#: src/callbacks.c:4237
+#: src/callbacks.c:4197
 #, c-format
 msgid ""
 "\n"
@@ -2249,7 +2247,7 @@
 "התוסף '%s' מדווח:\n"
 "%s\n"
 
-#: src/callbacks.c:4241
+#: src/callbacks.c:4200
 #, c-format
 msgid ""
 "\n"
@@ -2262,7 +2260,7 @@
 "לא ניתן למצוא את שיטת 'init' בתוסף %s.\n"
 "ייתן שהתוסף לא תקין או לא מותקן כראוי."
 
-#: src/callbacks.c:4571
+#: src/callbacks.c:4532
 #, c-format
 msgid ""
 "Saving the set will cause copies of all loaded clips to remain on the disk"
@@ -2274,22 +2272,22 @@
 "\n"
 "יש ללחוץ על 'ביטול' אם אין ברצונך לבצע את פעולה זו.\n"
 
-#: src/callbacks.c:4654
+#: src/callbacks.c:4617
 #, c-format
 msgid "Saving set %s"
 msgstr "שומר אוסף %s"
 
-#: src/callbacks.c:5005
+#: src/callbacks.c:4964
 #, c-format
 msgid "Loading clips from set %s"
 msgstr "טוען קטע מהאוסף %s"
 
-#: src/callbacks.c:5093
+#: src/callbacks.c:5051
 #, c-format
 msgid "%d clips and %d layouts were recovered from set (%s).\n"
 msgstr ""
 
-#: src/callbacks.c:5312
+#: src/callbacks.c:5259
 msgid ""
 "LiVES will attempt to recover some disk space.\n"
 "You should ONLY run this if you have no other copies of LiVES running on "
@@ -2300,24 +2298,24 @@
 "עליך להריץ זאת רק אם אין לך עותקים של LiVES הרצים על מכונה זו.\n"
 "לחץ על אישור בכדי להמשיך.\n"
 
-#: src/callbacks.c:5317
+#: src/callbacks.c:5264
 msgid "Cleaning up disk space..."
 msgstr "מנקה שטח כונן..."
 
-#: src/callbacks.c:5387
+#: src/callbacks.c:5334
 msgid "Recovering disk space"
 msgstr ""
 
-#: src/callbacks.c:5439
+#: src/callbacks.c:5386
 #, c-format
 msgid "%s of disk space was recovered.\n"
 msgstr ""
 
-#: src/callbacks.c:5482
+#: src/callbacks.c:5428
 msgid "Resetting frame rates and frame values..."
 msgstr "מאפס את קצבי וערכי השקופיות..."
 
-#: src/callbacks.c:5523
+#: src/callbacks.c:5469
 #, c-format
 msgid ""
 "\n"
@@ -2325,12 +2323,12 @@
 "Internal: %s (%d bpp) / %s\n"
 msgstr ""
 
-#: src/callbacks.c:5525
+#: src/callbacks.c:5471
 msgid "buffered"
 msgstr "נאגר"
 
-#: src/callbacks.c:5538 src/callbacks.c:5557 src/callbacks.c:5575
-#: src/callbacks.c:5609
+#: src/callbacks.c:5484 src/callbacks.c:5502 src/callbacks.c:5518
+#: src/callbacks.c:5551
 msgid ""
 "\n"
 "  Opening..."
@@ -2338,7 +2336,7 @@
 "\n"
 "  פותח..."
 
-#: src/callbacks.c:5545
+#: src/callbacks.c:5490
 #, c-format
 msgid ""
 "\n"
@@ -2347,7 +2345,7 @@
 "\n"
 "(%d מדומה)"
 
-#: src/callbacks.c:5548
+#: src/callbacks.c:5493
 #, c-format
 msgid ""
 "\n"
@@ -2356,7 +2354,7 @@
 "\n"
 "(%d פוענח)"
 
-#: src/callbacks.c:5560 src/callbacks.c:5578 src/callbacks.c:5612
+#: src/callbacks.c:5504 src/callbacks.c:5520 src/callbacks.c:5553
 #, c-format
 msgid ""
 "\n"
@@ -2365,7 +2363,7 @@
 "\n"
 "  %.2f שניות."
 
-#: src/callbacks.c:5569
+#: src/callbacks.c:5512
 msgid ""
 "\n"
 "  Unknown"
@@ -2373,23 +2371,23 @@
 "\n"
 "  לא ידוע"
 
-#: src/callbacks.c:5582 src/callbacks.c:5596
+#: src/callbacks.c:5524 src/callbacks.c:5538
 msgid "unsigned"
 msgstr "לא מסומן"
 
-#: src/callbacks.c:5583 src/callbacks.c:5597
+#: src/callbacks.c:5525 src/callbacks.c:5539
 msgid "signed"
 msgstr "מסומן"
 
-#: src/callbacks.c:5585 src/callbacks.c:5599
+#: src/callbacks.c:5527 src/callbacks.c:5541
 msgid "big-endian"
 msgstr "סידור בתים עולה"
 
-#: src/callbacks.c:5586 src/callbacks.c:5600
+#: src/callbacks.c:5528 src/callbacks.c:5542
 msgid "little-endian"
 msgstr "סידור בתים יורד"
 
-#: src/callbacks.c:5588 src/callbacks.c:5602
+#: src/callbacks.c:5530 src/callbacks.c:5544
 #, c-format
 msgid ""
 "  %d Hz %d bit\n"
@@ -2398,7 +2396,7 @@
 "  %d הרץ, %d סיביות\n"
 "%s %s"
 
-#: src/callbacks.c:5707
+#: src/callbacks.c:5647
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -2415,15 +2413,15 @@
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA.\n"
 msgstr ""
 
-#: src/callbacks.c:5721
+#: src/callbacks.c:5661
 msgid "A video editor and VJ program."
 msgstr "עורך וידאו ותוכנת VJ."
 
-#: src/callbacks.c:5722
+#: src/callbacks.c:5662
 msgid "About LiVES"
 msgstr ""
 
-#: src/callbacks.c:5724
+#: src/callbacks.c:5664
 msgid "translator_credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -2432,7 +2430,7 @@
 "  Yaron https://launchpad.net/~sh-yaron\n"
 "  salsaman https://launchpad.net/~salsaman"
 
-#: src/callbacks.c:5758
+#: src/callbacks.c:5699
 #, c-format
 msgid ""
 "LiVES Version %s\n"
@@ -2446,7 +2444,7 @@
 "Homepage: http://lives.sourceforge.net"
 msgstr ""
 
-#: src/callbacks.c:6037
+#: src/callbacks.c:5996
 #, fuzzy
 msgid ""
 "\n"
@@ -2457,7 +2455,7 @@
 "\n"
 "יש להתקין את mplayer בכדי להציג את קובץ זה.\n"
 
-#: src/callbacks.c:6040
+#: src/callbacks.c:5998
 #, fuzzy
 msgid ""
 "\n"
@@ -2469,191 +2467,186 @@
 "\n"
 "יש להתקין את mplayer בכדי להציג את קובץ זה.\n"
 
-#: src/callbacks.c:6423 src/callbacks.c:8289
-msgid ""
-"\n"
-"Loading new audio may cause missing audio in some multitrack layouts.\n"
-"Are you sure you wish to continue ?\n"
-"."
-msgstr ""
-"\n"
-"טעינת שמע חדש תגרום לאיבוד שמע בפריסות רב־רצועתיות מסוימות.\n"
-"האם ברצונך להמשיך ?"
-
-#: src/callbacks.c:6523
-#, c-format
-msgid "Opening audio %s, type %s..."
-msgstr "פותח שמע %s, סוג %s..."
-
-#: src/callbacks.c:6556 src/saveplay.c:480
-msgid "Opening audio"
-msgstr "פותח שמע"
-
-#: src/callbacks.c:6565 src/callbacks.c:6612 src/callbacks.c:8387
-#: src/callbacks.c:8429 src/callbacks.c:8472 src/callbacks.c:10846
-msgid "Cancelling"
-msgstr "מבטל"
-
-#: src/callbacks.c:6660 src/callbacks.c:8514 src/callbacks.c:10876
-#: src/callbacks.c:11563
-msgid "Committing audio"
-msgstr "מפקיד שמע"
-
-#: src/callbacks.c:6672 src/callbacks.c:8546
-msgid "New Audio"
-msgstr "שמע חדש"
-
-#: src/callbacks.c:6779
+#: src/callbacks.c:6459
 #, c-format
 msgid ""
 "Text was saved as\n"
 "%s\n"
 msgstr ""
 
-#: src/callbacks.c:6951 src/saveplay.c:3618
-#, c-format
-msgid "%d frames are enough !\n"
-msgstr "%d שקופיות מספיקות !\n"
-
-#: src/callbacks.c:7050
+#: src/callbacks.c:6706
 msgid "LiVES: - Encoder debug output"
 msgstr "LiVES: - פלט ניפוי שגיאות של המקודד"
 
-#: src/callbacks.c:7087 src/gui.c:1922
+#: src/callbacks.c:6743 src/gui.c:1921
 msgid "Fullscreen playback (f)"
 msgstr "נגינה במסך מלא (f)"
 
-#: src/callbacks.c:7089
+#: src/callbacks.c:6744
 msgid "Fullscreen playback off (f)"
 msgstr "כיבוי נגינה במסך מלא (f)"
 
-#: src/callbacks.c:7188 src/callbacks.c:7336 src/callbacks.c:7664
-#: src/callbacks.c:7681 src/gui.c:3712 src/saveplay.c:2467 src/saveplay.c:2501
-#: src/saveplay.c:3115 src/saveplay.c:3220 src/saveplay.c:3239
-#: src/multitrack.c:9340 src/multitrack.c:11060
+#: src/callbacks.c:6841 src/callbacks.c:6983 src/callbacks.c:7283
+#: src/callbacks.c:7298 src/gui.c:3838 src/saveplay.c:2442 src/saveplay.c:2475
+#: src/saveplay.c:3074 src/saveplay.c:3178 src/saveplay.c:3197
+#: src/multitrack.c:9526 src/multitrack.c:11288
 #, c-format
 msgid " (%d %% scale)"
 msgstr ""
 
-#: src/callbacks.c:7190 src/callbacks.c:7338 src/callbacks.c:7666
-#: src/gui.c:3716 src/saveplay.c:2469 src/saveplay.c:2503
+#: src/callbacks.c:6843 src/callbacks.c:6985 src/callbacks.c:7285
+#: src/gui.c:3842 src/saveplay.c:2444 src/saveplay.c:2477
 #, c-format
 msgid "LiVES: - Play Window%s"
 msgstr ""
 
-#: src/callbacks.c:7302 src/gui.c:1907
+#: src/callbacks.c:6950 src/gui.c:1906
 msgid "Double size (d)"
 msgstr "גודל כפול (d)"
 
-#: src/callbacks.c:7309
+#: src/callbacks.c:6956
 msgid "Single size (d)"
 msgstr "גודל יחיד (d)"
 
-#: src/callbacks.c:7442 src/callbacks.c:7443
+#: src/callbacks.c:7087 src/callbacks.c:7088
 msgid "Hide the play window (s)"
 msgstr "הסתרת חלון הנגינה (s)"
 
-#: src/callbacks.c:7452 src/gui.c:1746
+#: src/callbacks.c:7096 src/gui.c:1744
 msgid "Show the play window (s)"
 msgstr "הצגת חלון הנגינה (s)"
 
-#: src/callbacks.c:7453 src/gui.c:1896
+#: src/callbacks.c:7097 src/gui.c:1895
 msgid "Play in separate window (s)"
 msgstr "נגינה בחלון נפרד (s)"
 
-#: src/callbacks.c:7535 src/gui.c:4060 src/saveplay.c:2498
+#: src/callbacks.c:7175 src/gui.c:4169 src/saveplay.c:2472
 msgid "LiVES: - Streaming"
 msgstr ""
 
-#: src/callbacks.c:7778
+#: src/callbacks.c:7388
 msgid "Switch continuous looping off (o)"
 msgstr "כיבוי הלולאה המתמשכת (o)"
 
-#: src/callbacks.c:7785 src/gui.c:1795
+#: src/callbacks.c:7394 src/gui.c:1793
 msgid "Switch continuous looping on (o)"
 msgstr "הפעלת את הלולאה המתמשכת (o)"
 
-#: src/callbacks.c:7837
+#: src/callbacks.c:7444
 #, c-format
 msgid "Audio volume (%.2f)"
 msgstr "עוצמת הקול (%.2f)"
 
-#: src/callbacks.c:7876 src/callbacks.c:7877 src/gui.c:3640
+#: src/callbacks.c:7483 src/callbacks.c:7484 src/gui.c:3766
 msgid "Unmute the audio (z)"
 msgstr "הפעלת השמע שנית (z)"
 
-#: src/callbacks.c:7888 src/callbacks.c:7889 src/gui.c:1808 src/gui.c:3639
+#: src/callbacks.c:7494 src/callbacks.c:7495 src/gui.c:1806 src/gui.c:3765
 msgid "Mute the audio (z)"
 msgstr "השתקת השמע (z)"
 
-#: src/callbacks.c:8038
+#: src/callbacks.c:7643
 msgid "Reversing clipboard..."
 msgstr "הופך את לוח הגזירים..."
 
-#: src/callbacks.c:8052
+#: src/callbacks.c:7657
 msgid "Reversing clipboard"
 msgstr "הופך את לוח הגזירים"
 
-#: src/callbacks.c:8084
+#: src/callbacks.c:7689
 msgid "LiVES: Load subtitles from..."
 msgstr ""
 
-#: src/callbacks.c:8151 src/saveplay.c:970
+#: src/callbacks.c:7753 src/saveplay.c:956
 #, c-format
 msgid "Loaded subtitle file: %s\n"
 msgstr ""
 
-#: src/callbacks.c:8220
+#: src/callbacks.c:7821
 msgid "Subtitles were erased.\n"
 msgstr ""
 
-#: src/callbacks.c:8239
+#: src/callbacks.c:7843
 msgid "LiVES: - Select Audio File"
 msgstr ""
 
-#: src/callbacks.c:8250
+#: src/callbacks.c:7878 src/callbacks.c:8232
+msgid ""
+"\n"
+"Loading new audio may cause missing audio in some multitrack layouts.\n"
+"Are you sure you wish to continue ?\n"
+"."
+msgstr ""
+"\n"
+"טעינת שמע חדש תגרום לאיבוד שמע בפריסות רב־רצועתיות מסוימות.\n"
+"האם ברצונך להמשיך ?"
+
+#: src/callbacks.c:7989
+#, c-format
+msgid "Opening audio %s, type %s..."
+msgstr "פותח שמע %s, סוג %s..."
+
+#: src/callbacks.c:8023 src/saveplay.c:477
+msgid "Opening audio"
+msgstr "פותח שמע"
+
+#: src/callbacks.c:8032 src/callbacks.c:8083 src/callbacks.c:8327
+#: src/callbacks.c:8369 src/callbacks.c:8412 src/callbacks.c:10766
+msgid "Cancelling"
+msgstr "מבטל"
+
+#: src/callbacks.c:8137 src/callbacks.c:8454 src/callbacks.c:10803
+#: src/callbacks.c:11477
+msgid "Committing audio"
+msgstr "מפקיד שמע"
+
+#: src/callbacks.c:8153 src/callbacks.c:8484
+msgid "New Audio"
+msgstr "שמע חדש"
+
+#: src/callbacks.c:8194
 msgid "Please set your CD play device in Tools | Preferences | Misc\n"
 msgstr "נא לקבוע את התקן נגינת התקליטורים שלך בכלים | העדפות | שונות\n"
 
-#: src/callbacks.c:8321
+#: src/callbacks.c:8264
 #, c-format
 msgid "Opening CD track %d from %s..."
 msgstr "פותח רצועה %d מתקליטור %s..."
 
-#: src/callbacks.c:8326
+#: src/callbacks.c:8267
 #, c-format
 msgid "CD track %d"
 msgstr "רצועת תקליטור %d"
 
-#: src/callbacks.c:8373
+#: src/callbacks.c:8313
 msgid "Opening CD track..."
 msgstr "פותח רצועת תקליטור..."
 
-#: src/callbacks.c:8415 src/callbacks.c:8461
+#: src/callbacks.c:8355 src/callbacks.c:8401
 msgid "Error loading CD track\n"
 msgstr "שגיאה בטעינת רצועת תקליטור\n"
 
-#: src/callbacks.c:8584
+#: src/callbacks.c:8518
 msgid "layout errors"
 msgstr "שגיאות פריסה"
 
-#: src/callbacks.c:8595
+#: src/callbacks.c:8529
 msgid "Close _Window"
 msgstr "סגירת _חלון"
 
-#: src/callbacks.c:8606
+#: src/callbacks.c:8540
 msgid "Clear _Errors"
 msgstr "ניקוי _שגיאות"
 
-#: src/callbacks.c:8617
+#: src/callbacks.c:8551
 msgid "_Delete affected layouts"
 msgstr "_מחיקת פריסות ששונו"
 
-#: src/callbacks.c:9343 src/callbacks.c:9388
+#: src/callbacks.c:9253 src/callbacks.c:9298
 msgid "Resume"
 msgstr "המשך"
 
-#: src/callbacks.c:9344
+#: src/callbacks.c:9254
 msgid ""
 "\n"
 "Paused\n"
@@ -2663,27 +2656,23 @@
 "מושהה\n"
 "(יש ללחוץ על כפתור ההמשך כדי להמשיך בתהליך)"
 
-#: src/callbacks.c:9345 src/callbacks.c:9406
+#: src/callbacks.c:9255 src/callbacks.c:9315
 msgid "paused..."
 msgstr "מושהה..."
 
-#: src/callbacks.c:9372 src/callbacks.c:9418
-msgid "Pause"
-msgstr "השהיה"
-
-#: src/callbacks.c:9374 src/callbacks.c:9421
+#: src/callbacks.c:9284 src/callbacks.c:9333
 msgid "resumed..."
 msgstr "ממשיך..."
 
-#: src/callbacks.c:9393
+#: src/callbacks.c:9303
 msgid "Keep"
 msgstr "שמירה"
 
-#: src/callbacks.c:9396
+#: src/callbacks.c:9305
 msgid "Enough"
 msgstr "מספיק"
 
-#: src/callbacks.c:9401
+#: src/callbacks.c:9310
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2696,28 +2685,28 @@
 "(לחץ על כפתור השמירה כדי לשמור את העבודה ולהפסיק)\n"
 "(בנוסף, ישנה אפשרות ללחוץ על המשך כדי להמשיך בעיבוד)"
 
-#: src/callbacks.c:9419
+#: src/callbacks.c:9331
 msgid "Cancel"
 msgstr "ביטול"
 
-#: src/callbacks.c:9558
+#: src/callbacks.c:9478
 msgid "Stop"
 msgstr ""
 
-#: src/callbacks.c:10053 src/multitrack.c:13247
+#: src/callbacks.c:9968 src/multitrack.c:13489
 msgid "LiVES: Selected frame"
 msgstr "LiVES: שקופית נבחרת"
 
-#: src/callbacks.c:10061
+#: src/callbacks.c:9976
 msgid "_Save frame as..."
 msgstr ""
 
-#: src/callbacks.c:10290
+#: src/callbacks.c:10202
 #, c-format
 msgid "Audio is ahead of video by %.4f secs. at frame %d, with fps %.4f\n"
 msgstr ""
 
-#: src/callbacks.c:10347
+#: src/callbacks.c:10255
 msgid ""
 "\n"
 "\n"
@@ -2726,7 +2715,7 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10353
+#: src/callbacks.c:10261
 msgid ""
 "\n"
 "\n"
@@ -2738,7 +2727,7 @@
 "עליך להתקין את \"xwininfo\" כדי להשתמש בתכונה זו\n"
 "\n"
 
-#: src/callbacks.c:10429 src/callbacks.c:11479
+#: src/callbacks.c:10334 src/callbacks.c:11395
 msgid ""
 "\n"
 "Record time must be greater than 0.\n"
@@ -2746,7 +2735,7 @@
 "\n"
 "זמן ההקלטה חייב להיות גדול מ־0.\n"
 
-#: src/callbacks.c:10440
+#: src/callbacks.c:10346
 msgid ""
 "Capture an External Window:\n"
 "\n"
@@ -2760,11 +2749,11 @@
 "לאחר מכן ללחוץ על 'ביטול' לביטול\n"
 "\n"
 
-#: src/callbacks.c:10445
+#: src/callbacks.c:10351
 msgid "External window was released.\n"
 msgstr "החלון הנוסף שוחרר.\n"
 
-#: src/callbacks.c:10479
+#: src/callbacks.c:10385
 msgid ""
 "Click on a Window to Capture it\n"
 "Press 'q' to stop recording"
@@ -2772,7 +2761,7 @@
 "יש ללחוץ על חלון כדי ללכוד אותו\n"
 "יש ללחוץ על 'q' כדי להפסיק את ההקלטה"
 
-#: src/callbacks.c:10513
+#: src/callbacks.c:10419
 #, c-format
 msgid ""
 "\n"
@@ -2788,19 +2777,19 @@
 "\n"
 "(LiVES ישתמש בברירת המחדל: %.3f שקופיות לשנייה.)\n"
 
-#: src/callbacks.c:10539
+#: src/callbacks.c:10443
 msgid "LiVES was unable to capture this window. Sorry.\n"
 msgstr "LiVES כשל בלכידת חלון זה. עמכם הסליחה.\n"
 
-#: src/callbacks.c:10695
+#: src/callbacks.c:10601
 msgid "Export Selected Audio as..."
 msgstr "מייצא את השמע הנבחר כ..."
 
-#: src/callbacks.c:10699
+#: src/callbacks.c:10604
 msgid "Export Audio as..."
 msgstr "מייצא שמע כ..."
 
-#: src/callbacks.c:10714
+#: src/callbacks.c:10619
 msgid ""
 "\n"
 "\n"
@@ -2814,86 +2803,86 @@
 "יש ללחוץ על 'אישור' כדי לייצא במהירות החדשה,או על 'ביטול' לייצוא בקצב "
 "המקורי.\n"
 
-#: src/callbacks.c:10720
+#: src/callbacks.c:10625
 #, c-format
 msgid "Exporting audio frames %d to %d as %s..."
 msgstr "מייצא שקופיות שמע %d ל־%d כ־%s"
 
-#: src/callbacks.c:10725
+#: src/callbacks.c:10629
 #, c-format
 msgid "Exporting audio as %s..."
 msgstr "מייצא שמע כ־%s..."
 
-#: src/callbacks.c:10751
+#: src/callbacks.c:10655
 msgid "Exporting audio"
 msgstr "ייצוא שמע"
 
-#: src/callbacks.c:10782
+#: src/callbacks.c:10695
 msgid "LiVES: - Append Audio File"
 msgstr ""
 
-#: src/callbacks.c:10825
+#: src/callbacks.c:10739
 #, c-format
 msgid "Appending audio file %s..."
 msgstr "מצרף את קובץ השמע %s..."
 
-#: src/callbacks.c:10836
+#: src/callbacks.c:10756
 msgid "Appending audio"
 msgstr "מצרף שמע"
 
-#: src/callbacks.c:10892
+#: src/callbacks.c:10818
 msgid "Append Audio"
 msgstr "צירוף שמע"
 
-#: src/callbacks.c:10952
+#: src/callbacks.c:10883
 #, c-format
 msgid "Padding audio to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10954
+#: src/callbacks.c:10885
 #, c-format
 msgid "Trimming audio from %.2f to %.2f seconds..."
 msgstr "מתקן שמע מ־%.2f ל־%.2f שניות..."
 
-#: src/callbacks.c:10973
+#: src/callbacks.c:10904
 msgid "Trimming/Padding audio"
 msgstr "מתקן\\מרפד שמע"
 
-#: src/callbacks.c:10981
+#: src/callbacks.c:10912
 msgid "Trim/Pad Audio"
 msgstr "תיקון\\ריפוד שמע"
 
-#: src/callbacks.c:11055
+#: src/callbacks.c:10982
 msgid "Fading audio in"
 msgstr "מחיל אפקט Fade In על השמע"
 
-#: src/callbacks.c:11056
+#: src/callbacks.c:10983
 msgid "Fade audio in"
 msgstr "החלת אפקט Fade In על השמע"
 
-#: src/callbacks.c:11061
+#: src/callbacks.c:10987
 msgid "Fading audio out"
 msgstr "מחיל אפקט Fade Out על השמע"
 
-#: src/callbacks.c:11062
+#: src/callbacks.c:10988
 msgid "Fade audio out"
 msgstr "החלת אפקט Fade Out על השמע"
 
-#: src/callbacks.c:11085
+#: src/callbacks.c:11011
 #, c-format
 msgid "%s over %.1f seconds..."
 msgstr "%s מעל %.1f שניות..."
 
-#: src/callbacks.c:11087
+#: src/callbacks.c:11013
 #, c-format
 msgid "%s from time %.2f seconds to %.2f seconds..."
 msgstr "%s מזמן %.2f שניות ל־%.2f שניות..."
 
-#: src/callbacks.c:11094
+#: src/callbacks.c:11020
 msgid "Fading audio..."
 msgstr "מפעיל אפקט Fade על השמע"
 
-#: src/callbacks.c:11194
+#: src/callbacks.c:11119
 msgid ""
 "\n"
 "Deleting all audio will close this file.\n"
@@ -2903,631 +2892,631 @@
 "מחיקת כל השמע תסגור את קובץ זה.\n"
 "האם ברצונך להמשיך ?"
 
-#: src/callbacks.c:11197
+#: src/callbacks.c:11122
 msgid "Deleting all audio..."
 msgstr "מוחק את כל השמע"
 
-#: src/callbacks.c:11203
+#: src/callbacks.c:11127
 #, c-format
 msgid "Deleting audio from %.2f to %.2f seconds..."
 msgstr "מוחק שמע מ־%.2f ל־%.2f שניות..."
 
-#: src/callbacks.c:11290
+#: src/callbacks.c:11214
 msgid "Deleting Audio"
 msgstr "מוחק שמע"
 
-#: src/callbacks.c:11297
+#: src/callbacks.c:11221
 msgid "Delete Audio"
 msgstr "מחק שמע"
 
-#: src/callbacks.c:11636
+#: src/callbacks.c:11550
 msgid "Record new audio"
 msgstr "הקלט שמע חדש"
 
-#: src/callbacks.c:11725
+#: src/callbacks.c:11640
 #, c-format
 msgid "Inserting silence from %.2f to %.2f seconds..."
 msgstr "מכניס שקט מ־%.2f ל־%.2f שניות..."
 
-#: src/callbacks.c:11754
+#: src/callbacks.c:11666
 msgid "Inserting Silence"
 msgstr "מכניס שקט"
 
-#: src/merge.c:85
+#: src/merge.c:96
 msgid "LiVES: - Merge"
 msgstr "LiVES: - מיזוג"
 
-#: src/merge.c:102
+#: src/merge.c:113
 #, c-format
 msgid "Merge Clipboard [ %d Frames ]       With Selection [ %d Frames ]"
 msgstr "ניתן למזג את לוח הגזירים [%d שקופיות] עם הבחירה [%d שקופיות]"
 
-#: src/merge.c:107
+#: src/merge.c:118
 #, c-format
 msgid ""
 "Merge Clipboard [ %d Frames (resampled) ]       With Selection [ %d Frames ]"
 msgstr ""
 "ניתן למזג את לוח הגזירים [ %d שקופיות (נדגמו מחדש) ] עם הבחירה [ %d שקופיות ]"
 
-#: src/merge.c:118
+#: src/merge.c:130
 msgid "Align _Starts"
 msgstr "יישור_מתחיל"
 
-#: src/merge.c:123
+#: src/merge.c:135
 msgid "Align _Ends"
 msgstr "יישור _מסתיים"
 
-#: src/merge.c:134
+#: src/merge.c:146
 msgid "What to do with extra clipboard frames -"
 msgstr "מה לעשות עם שקופיות לוח הגזירים הנוספות -"
 
-#: src/merge.c:137
+#: src/merge.c:149
 msgid "_Insert Frames"
 msgstr "_הכנסת שקופיות"
 
-#: src/merge.c:143
+#: src/merge.c:155
 msgid "_Drop Frames"
 msgstr "_מחיקת שקופיות"
 
-#: src/merge.c:149
+#: src/merge.c:160
 msgid "Number of Times to Loop Clipboard"
 msgstr "מספר פעמים ללולאת לוח הגזירים_"
 
-#: src/merge.c:160
+#: src/merge.c:171
 msgid "_Loop Clipboard to Fit Selection"
 msgstr "_יצירת לולאת לוח גזירים כדי להתאימו לבחירה"
 
-#: src/merge.c:173
+#: src/merge.c:184
 msgid "_Transition Method:"
 msgstr "שיטת _מעבר"
 
-#: src/merge.c:394
+#: src/merge.c:395
 msgid "Merging clipboard with selection..."
 msgstr "מיזוג לוח הגזירים עם הבחירה..."
 
-#: src/merge.c:551
+#: src/merge.c:539
 msgid "Merge done.\n"
 msgstr "המיזוג הסתיים.\n"
 
-#: src/gui.c:123
+#: src/gui.c:122
 msgid "_Custom Generators"
 msgstr ""
 
-#: src/gui.c:124
+#: src/gui.c:123
 msgid "_Custom Effects"
 msgstr "אפקטים _מותאמים אישית"
 
-#: src/gui.c:125
+#: src/gui.c:124
 msgid "Custom _Utilities"
 msgstr "_כלי שירות מותאמים אישית"
 
-#: src/gui.c:352 src/multitrack.c:5964
+#: src/gui.c:351 src/multitrack.c:6143
 msgid "_File"
 msgstr "_קובץ"
 
-#: src/gui.c:367 src/multitrack.c:5989
+#: src/gui.c:366 src/multitrack.c:6168
 msgid "_Open File/Directory"
 msgstr "_פתיחת קובץ\\תיקייה"
 
-#: src/gui.c:373
+#: src/gui.c:372
 msgid "O_pen Part of File..."
 msgstr ""
 
-#: src/gui.c:379 src/gui.c:383 src/multitrack.c:6006 src/multitrack.c:6023
-#: src/multitrack.c:6028
+#: src/gui.c:378 src/gui.c:382 src/multitrack.c:6185 src/multitrack.c:6202
+#: src/multitrack.c:6207
 msgid "Open _Location/Stream..."
 msgstr "פתיחת מיקום\\זרם"
 
-#: src/gui.c:393 src/multitrack.c:6016
+#: src/gui.c:392 src/multitrack.c:6195
 msgid "Open _Youtube Clip..."
 msgstr ""
 
-#: src/gui.c:404
+#: src/gui.c:403
 msgid "Import from _dvd/vcd..."
 msgstr ""
 
-#: src/gui.c:413
+#: src/gui.c:412
 msgid "Import from _dvd"
 msgstr ""
 
-#: src/gui.c:416
+#: src/gui.c:415
 msgid "Import from _vcd"
 msgstr ""
 
-#: src/gui.c:419
+#: src/gui.c:418
 msgid "_Import from Firewire"
 msgstr ""
 
-#: src/gui.c:428 src/multitrack.c:6086
+#: src/gui.c:427 src/multitrack.c:6265
 msgid "Import from _Firewire Device (dv)"
 msgstr "ייבוא מהתקן _Firewire (DV)"
 
-#: src/gui.c:429 src/multitrack.c:6094
+#: src/gui.c:428 src/multitrack.c:6273
 msgid "Import from _Firewire Device (hdv)"
 msgstr "ייבוא מהתקן _Firewire (hdv)"
 
-#: src/gui.c:457
+#: src/gui.c:456
 msgid "_Add Webcam/TV card..."
 msgstr ""
 
-#: src/gui.c:476
+#: src/gui.c:475
 msgid "Add _Unicap Device"
 msgstr ""
 
-#: src/gui.c:486
+#: src/gui.c:485
 msgid "Add Live _Firewire Device"
 msgstr "הוספת התקן _Firewire חי"
 
-#: src/gui.c:495
+#: src/gui.c:494
 msgid "Add _TV Device"
 msgstr ""
 
-#: src/gui.c:510 src/multitrack.c:6117
+#: src/gui.c:509 src/multitrack.c:6296
 msgid "_Recent Files..."
 msgstr "קבצים _אחרונים..."
 
-#: src/gui.c:560 src/multitrack.c:6177
+#: src/gui.c:559 src/multitrack.c:6356
 msgid "_Reload Clip Set..."
 msgstr "_טעינת אוסף הקטעים..."
 
-#: src/gui.c:564 src/multitrack.c:6185
+#: src/gui.c:563 src/multitrack.c:6364
 msgid "Close/Sa_ve All Clips"
 msgstr "סגירת\\שמ_ירת כל הקטעים"
 
-#: src/gui.c:575
+#: src/gui.c:574
 msgid "_Encode Clip As..."
 msgstr "_קידוד הקטע כ..."
 
-#: src/gui.c:577
+#: src/gui.c:576
 msgid "Encode _Selection As..."
 msgstr "קידוד _בחירה כ..."
 
-#: src/gui.c:584
+#: src/gui.c:583
 msgid "_Close This Clip"
 msgstr "_סגירת  קטע זה"
 
-#: src/gui.c:595
+#: src/gui.c:594
 msgid "_Backup Clip as .lv1..."
 msgstr "_גיבוי הקטע כ־.lv1"
 
-#: src/gui.c:604
+#: src/gui.c:603
 msgid "_Restore Clip from .lv1..."
 msgstr "_שיחזור קטע מ־.lv1"
 
-#: src/gui.c:615
+#: src/gui.c:614
 msgid "Encode/Load/Backup _with Sound"
 msgstr "קידוד\\טעינה\\גיבוי _עם קול"
 
-#: src/gui.c:620
+#: src/gui.c:619
 msgid "Auto load subtitles"
 msgstr ""
 
-#: src/gui.c:628 src/multitrack.c:6224
+#: src/gui.c:627 src/multitrack.c:6403
 msgid "Clean _up Diskspace"
 msgstr "_ניקוי שטח כונן"
 
-#: src/gui.c:636 src/multitrack.c:6257
+#: src/gui.c:635 src/multitrack.c:6436
 msgid "_Edit"
 msgstr "ע_ריכה"
 
-#: src/gui.c:685
+#: src/gui.c:684
 msgid "_MULTITRACK mode"
 msgstr "מצב _רב־רצועתי"
 
-#: src/gui.c:696
+#: src/gui.c:695
 msgid "_Copy Selection"
 msgstr "העתקת בחירה"
 
-#: src/gui.c:705
+#: src/gui.c:704
 msgid "Cu_t Selection"
 msgstr "גזירת בחירה"
 
-#: src/gui.c:714
+#: src/gui.c:713
 msgid "_Insert from Clipboard..."
 msgstr "_הכנסה מלוח הגזירים..."
 
-#: src/gui.c:730
+#: src/gui.c:729
 msgid "Paste as _New"
 msgstr "הדבקה כ־_חדש"
 
-#: src/gui.c:739
+#: src/gui.c:738
 msgid "_Merge Clipboard with Selection..."
 msgstr "_מיזוג לוח הגזירים עם הבחירה"
 
-#: src/gui.c:746
+#: src/gui.c:745
 msgid "_Delete Selection"
 msgstr "_מחיקת בחירה"
 
-#: src/gui.c:764
+#: src/gui.c:763
 msgid "Decouple _Video from Audio"
 msgstr "הפרד את ה_וידאו מהשמע"
 
-#: src/gui.c:772
+#: src/gui.c:771
 msgid "_Select..."
 msgstr "_בחירה..."
 
-#: src/gui.c:786
+#: src/gui.c:785
 msgid "Select _All Frames"
 msgstr "בחירת _כל השקופיות"
 
-#: src/gui.c:794
+#: src/gui.c:793
 msgid "_Start Frame Only"
 msgstr "שקופית _התחלה בלבד"
 
-#: src/gui.c:802
+#: src/gui.c:801
 msgid "_End Frame Only"
 msgstr "שקופית _סיום בלבד"
 
-#: src/gui.c:813
+#: src/gui.c:812
 msgid "Select from _First Frame"
 msgstr "בחירה מהמסגרת _הראשונה"
 
-#: src/gui.c:817
+#: src/gui.c:816
 msgid "Select to _Last Frame"
 msgstr "בחירה למסגרת _האחרונה"
 
-#: src/gui.c:821
+#: src/gui.c:820
 msgid "Select Last Insertion/_Merge"
 msgstr "בחירת הכנסה אחרונה/_מיזוג"
 
-#: src/gui.c:825
+#: src/gui.c:824
 msgid "Select Last _Effect"
 msgstr "בחירת _האפקט האחרון"
 
-#: src/gui.c:829
+#: src/gui.c:828
 msgid "_Invert Selection"
 msgstr "_הפיכת בחירה"
 
-#: src/gui.c:837
+#: src/gui.c:836
 msgid "_Lock Selection Width"
 msgstr "_נעילת אורך הבחירה"
 
-#: src/gui.c:842 src/multitrack.c:6409
+#: src/gui.c:841 src/multitrack.c:6591
 msgid "_Play"
 msgstr "_נגינה"
 
-#: src/gui.c:854
+#: src/gui.c:853
 msgid "_Play All"
 msgstr "_נגן הכל"
 
-#: src/gui.c:869
+#: src/gui.c:868
 msgid "Pla_y Selection"
 msgstr "נג_ינת בחירה"
 
-#: src/gui.c:877
+#: src/gui.c:876
 msgid "Play _Clipboard"
 msgstr "נגינה מ_לוח הגזירים"
 
-#: src/gui.c:899 src/multitrack.c:6441
+#: src/gui.c:898 src/multitrack.c:6623
 msgid "_Stop"
 msgstr "_עצירה"
 
-#: src/gui.c:914 src/multitrack.c:6453
+#: src/gui.c:913 src/multitrack.c:6635
 msgid "Re_wind"
 msgstr "_העברה _קדימה"
 
-#: src/gui.c:946 src/multitrack.c:6471
+#: src/gui.c:945 src/multitrack.c:6653
 msgid "_Full Screen"
 msgstr "_מסך מלא"
 
-#: src/gui.c:955
+#: src/gui.c:954
 msgid "_Double Size"
 msgstr "גודל _כפול"
 
-#: src/gui.c:963 src/multitrack.c:6479
+#: src/gui.c:962 src/multitrack.c:6661
 msgid "Play in _Separate Window"
 msgstr "נגינה בחלון _נוסף"
 
-#: src/gui.c:972
+#: src/gui.c:971
 msgid "_Blank Background"
 msgstr "רקע _שחור"
 
-#: src/gui.c:979
+#: src/gui.c:978
 msgid "(Auto)_loop Video (to fit audio track)"
 msgstr "(אוטומטי) _יצירת לולאת וידאו (כדי להתאימו לרצועת השמע)"
 
-#: src/gui.c:988 src/multitrack.c:6487
+#: src/gui.c:987 src/multitrack.c:6669
 msgid "L_oop Continuously"
 msgstr "יצירת לולאה מתמשכת"
 
-#: src/gui.c:997
+#: src/gui.c:996
 msgid "Pin_g Pong Loops"
 msgstr "Pin_g Pong לולאות"
 
-#: src/gui.c:1005 src/multitrack.c:6495
+#: src/gui.c:1004 src/multitrack.c:6677
 msgid "_Mute"
 msgstr "_השתק"
 
-#: src/gui.c:1017
+#: src/gui.c:1016
 msgid "Separate Window 'S_ticky' Mode"
 msgstr "הפרדת חלון במצב 'ד_ביק'"
 
-#: src/gui.c:1025
+#: src/gui.c:1024
 msgid "S_how Frame Counter"
 msgstr "ה_צגת מונה השקופיות"
 
-#: src/gui.c:1035
+#: src/gui.c:1034
 msgid "Show Subtitles"
 msgstr ""
 
-#: src/gui.c:1045
+#: src/gui.c:1044
 msgid "Letterbox mode"
 msgstr ""
 
-#: src/gui.c:1051 src/multitrack.c:6507
+#: src/gui.c:1050 src/multitrack.c:6689
 msgid "Effect_s"
 msgstr "אפקט_ים"
 
-#: src/gui.c:1054
+#: src/gui.c:1053
 msgid "Effects are applied to the current selection."
 msgstr "האפקטים מוחלים על הבחירה הנוכחית"
 
-#: src/gui.c:1067
+#: src/gui.c:1066
 msgid "_Run Test Rendered Effect/Tool/Generator..."
 msgstr "_הרצת בדיקת האפקט, הכלי או המחולל..."
 
-#: src/gui.c:1072 src/multitrack.c:7123
+#: src/gui.c:1071 src/multitrack.c:7299
 msgid "_Tools"
 msgstr "_כלים"
 
-#: src/gui.c:1075
+#: src/gui.c:1074
 msgid "Tools are applied to complete clips."
 msgstr "הכלים חלים על קטעים שהושלמו."
 
-#: src/gui.c:1085
+#: src/gui.c:1084
 msgid "_Reverse Clipboard"
 msgstr "_הפיכת הגזירים"
 
-#: src/gui.c:1094
+#: src/gui.c:1093
 msgid "_Change Playback/Save Speed..."
 msgstr "_שינוי מהירות הנגינה או השמירה..."
 
-#: src/gui.c:1099
+#: src/gui.c:1098
 msgid "Resample _Video to New Frame Rate..."
 msgstr "_דגימה מחדש של ה_וידאו למהירות שקופיות חדשה..."
 
-#: src/gui.c:1105
+#: src/gui.c:1104
 msgid "_Utilities"
 msgstr "_כלי שירות"
 
-#: src/gui.c:1110
+#: src/gui.c:1109
 msgid "Custom _Tools"
 msgstr "_כלים מותאמים אישית"
 
-#: src/gui.c:1116 src/multitrack.c:7149
+#: src/gui.c:1115 src/multitrack.c:7325
 msgid "_Generate"
 msgstr "_ייצר"
 
-#: src/gui.c:1126
+#: src/gui.c:1125
 msgid "Loading rendered effect plugins..."
 msgstr "טעינת תוספים לאפקטים מוכנים..."
 
-#: src/gui.c:1139
+#: src/gui.c:1138
 msgid "Load _Subtitles from File..."
 msgstr ""
 
-#: src/gui.c:1144
+#: src/gui.c:1143
 msgid "Erase subtitles"
 msgstr ""
 
-#: src/gui.c:1152 src/multitrack.c:7158
+#: src/gui.c:1151 src/multitrack.c:7334
 msgid "Capture _External Window... "
 msgstr "לכידת חלון _חיצוני... "
 
-#: src/gui.c:1159 src/multitrack.c:7173
+#: src/gui.c:1158 src/multitrack.c:7349
 msgid "_Preferences..."
 msgstr "_העדפות..."
 
-#: src/gui.c:1172
+#: src/gui.c:1171
 msgid "_Audio"
 msgstr "_שמע"
 
-#: src/gui.c:1184
+#: src/gui.c:1183
 msgid "Load _New Audio for Clip..."
 msgstr "טעינת שמע _חדש לקטע"
 
-#: src/gui.c:1190
+#: src/gui.c:1189
 msgid "Load _CD Track..."
 msgstr "טעינת רצועה מ_תקליטור..."
 
-#: src/gui.c:1191
+#: src/gui.c:1190
 msgid "E_ject CD"
 msgstr "ה_וצאת תקליטור"
 
-#: src/gui.c:1205
+#: src/gui.c:1204
 msgid "Record E_xternal Audio..."
 msgstr "הקלטת שמע _חיצוני..."
 
-#: src/gui.c:1218
+#: src/gui.c:1217
 msgid "to New _Clip..."
 msgstr "ל_קטע חדש..."
 
-#: src/gui.c:1222
+#: src/gui.c:1221
 msgid "to _Selection"
 msgstr "ל_בחירה"
 
-#: src/gui.c:1230
+#: src/gui.c:1229
 msgid "Fade Audio _In..."
 msgstr "החלת אפקט Fade _In על השמע"
 
-#: src/gui.c:1234
+#: src/gui.c:1233
 msgid "Fade Audio _Out..."
 msgstr "החל אפקט Fade _Out על השמע..."
 
-#: src/gui.c:1244
+#: src/gui.c:1243
 msgid "_Export Audio..."
 msgstr "_ייצוא שמע..."
 
-#: src/gui.c:1257
+#: src/gui.c:1256
 msgid "Export _Selected Audio..."
 msgstr "_ייצוא שמע _נבחר..."
 
-#: src/gui.c:1261
+#: src/gui.c:1260
 msgid "Export _All Audio..."
 msgstr "ייצוא _כל השמע..."
 
-#: src/gui.c:1265
+#: src/gui.c:1264
 msgid "_Append Audio..."
 msgstr "_צירוף שמע..."
 
-#: src/gui.c:1270
+#: src/gui.c:1269
 msgid "_Trim/Pad Audio..."
 msgstr "_תיקון\\ריפוד שמע"
 
-#: src/gui.c:1283
+#: src/gui.c:1282
 msgid "Trim/Pad Audio to _Selection"
 msgstr "_תיקון\\ריפוד שמע ל_בחירה"
 
-#: src/gui.c:1288
+#: src/gui.c:1287
 msgid "Trim/Pad Audio from Beginning to _Play Start"
 msgstr "תיקון\\ריפוד שמע מההתחלה ל_תחילת הנגינה"
 
-#: src/gui.c:1293
+#: src/gui.c:1292
 msgid "_Delete Audio..."
 msgstr "_מחיקת שמע..."
 
-#: src/gui.c:1306
+#: src/gui.c:1305
 msgid "Delete _Selected Audio"
 msgstr "מחיקת שמע _נבחר"
 
-#: src/gui.c:1310
+#: src/gui.c:1309
 msgid "Delete _All Audio"
 msgstr "מחיקת  _כל השמע"
 
-#: src/gui.c:1314
+#: src/gui.c:1313
 msgid "Insert _Silence in Selection"
 msgstr "הכנסת _שקט לבחירה"
 
-#: src/gui.c:1319
+#: src/gui.c:1318
 msgid "_Resample Audio..."
 msgstr "_דגימת שמע מחדש"
 
-#: src/gui.c:1324
+#: src/gui.c:1323
 msgid "_Info"
 msgstr "_מידע"
 
-#: src/gui.c:1336
+#: src/gui.c:1335
 msgid "Show Clip _Info"
 msgstr "הצגת _מידע קטע"
 
-#: src/gui.c:1344
+#: src/gui.c:1343
 msgid "Show/_Edit File Comments"
 msgstr "הצגת\\_עריכת הערות הקובץ"
 
-#: src/gui.c:1349
+#: src/gui.c:1348
 msgid "Show _Clipboard Info"
 msgstr "הצגת מידע על _לוח הגזירים"
 
-#: src/gui.c:1360 src/multitrack.c:7286
+#: src/gui.c:1359 src/multitrack.c:7462
 msgid "Show _Messages"
 msgstr "הצגת _הודעות"
 
-#: src/gui.c:1364 src/multitrack.c:7365
+#: src/gui.c:1363 src/multitrack.c:7541
 msgid "Show _Layout Errors"
 msgstr "הצגת שגיאות _פריסה"
 
-#: src/gui.c:1369 src/multitrack.c:7263
+#: src/gui.c:1368 src/multitrack.c:7439
 msgid "_Clips"
 msgstr "_קטעים"
 
-#: src/gui.c:1381
+#: src/gui.c:1380
 msgid "_Rename Current Clip in Menu..."
 msgstr "_שינוי שם הקטע הנוכחי בתפריט..."
 
-#: src/gui.c:1399
+#: src/gui.c:1398
 msgid "A_dvanced"
 msgstr "מ_תקדם"
 
-#: src/gui.c:1412
+#: src/gui.c:1411
 msgid "_RFX Effects/Tools/Utilities"
 msgstr "אפקטים\\כלים\\כלי שירות של _RFX"
 
-#: src/gui.c:1424
+#: src/gui.c:1423
 msgid "_New Test RFX Script..."
 msgstr "תסריט בדיקת RFX _חדש..."
 
-#: src/gui.c:1428
+#: src/gui.c:1427
 msgid "_Copy RFX Script to Test..."
 msgstr "_העתקת תסריט RFX לבדיקה..."
 
-#: src/gui.c:1432
+#: src/gui.c:1431
 msgid "_Edit Test RFX Script..."
 msgstr "_עריכת תסריט בדיקת ה־RFX..."
 
-#: src/gui.c:1436
+#: src/gui.c:1435
 msgid "Rena_me Test RFX Script..."
 msgstr "שינוי _שם לתסריט בדיקת ה־RFX..."
 
-#: src/gui.c:1440
+#: src/gui.c:1439
 msgid "_Delete Test RFX Script..."
 msgstr "_מחקית תסריט בדיקת RFX..."
 
-#: src/gui.c:1450
+#: src/gui.c:1449
 msgid "_Promote Test Rendered Effect/Tool/Generator..."
 msgstr "העלאה לבדיקה של אפקט\\כלי\\מחולל מוכן..."
 
-#: src/gui.c:1457
+#: src/gui.c:1456
 msgid "_Import Custom RFX script..."
 msgstr "_ייבוא תסריט RFX מותאם אישית..."
 
-#: src/gui.c:1461
+#: src/gui.c:1460
 msgid "E_xport Custom RFX script..."
 msgstr "י_יצוא תסריט RFX מותאם אישית..."
 
-#: src/gui.c:1465
+#: src/gui.c:1464
 msgid "De_lete Custom RFX Script..."
 msgstr "מ_חיקת תסריט RFX מותאם אישית..."
 
-#: src/gui.c:1472
+#: src/gui.c:1471
 msgid "Re_build all RFX plugins"
 msgstr "בנ_ייה מחדש של כל תוספי ה־RFX"
 
-#: src/gui.c:1501
+#: src/gui.c:1498
 msgid "Receive _LiVES stream from..."
 msgstr "_קבלת זרימת _LiVES מ..."
 
-#: src/gui.c:1506
+#: src/gui.c:1503
 msgid "_Send LiVES stream to..."
 msgstr "_שליחת זרימת LiVES ל..."
 
-#: src/gui.c:1515
+#: src/gui.c:1512
 #, c-format
 msgid "Open _yuv4mpeg stream on %sstream.yuv..."
 msgstr "פתיחת זרימת _yuv4mpeg מ־%sstream.yuv..."
 
-#: src/gui.c:1536
+#: src/gui.c:1534
 msgid "_Import Project (.lv2)..."
 msgstr "_ייבוא פרויקט (.lv2)..."
 
-#: src/gui.c:1540
+#: src/gui.c:1538
 msgid "E_xport Project (.lv2)..."
 msgstr "יי_צוא פרויקט (.lv2)..."
 
-#: src/gui.c:1545
+#: src/gui.c:1543
 msgid "_VJ"
 msgstr "_VJ"
 
-#: src/gui.c:1557
+#: src/gui.c:1555
 msgid "Real Time _Effect Mapping"
 msgstr "מיפוי _אפקט בזמן אמת"
 
-#: src/gui.c:1563
+#: src/gui.c:1561
 msgid "Bind real time effects to ctrl-number keys."
 msgstr "שיוך אפקטים בזמן אמת למקשי ctrl-number"
 
-#: src/gui.c:1565
+#: src/gui.c:1563
 msgid "Set Real Time Effect _Defaults"
 msgstr "קביעת אפקט בזמן אמת ל_ברירת מחדל"
 
-#: src/gui.c:1567
+#: src/gui.c:1565
 msgid "Set default parameter values for real time effects."
 msgstr "קביעת ערך ברירת המחדל עבור אפקטים בזמת אמת."
 
-#: src/gui.c:1580
+#: src/gui.c:1578
 msgid "Save Real Time Effect _Defaults"
 msgstr "שמירת _ברירת המחדל של אפקטים בזמן אמת"
 
-#: src/gui.c:1583
+#: src/gui.c:1581
 msgid ""
 "Save real time effect defaults so they will be restored each time you use "
 "LiVES."
@@ -3535,144 +3524,144 @@
 "שמור את ברירת המחדל של אפקטים בזמן אמת כדי שיהיו ניתנים לשחזור בכל שימוש ב־"
 "LiVES."
 
-#: src/gui.c:1589
+#: src/gui.c:1587
 msgid "_Reset all playback speeds and positions"
 msgstr "_איפוס  כל מהירויות ומיקומי  הנגינה"
 
-#: src/gui.c:1592
+#: src/gui.c:1590
 msgid ""
 "Reset all playback positions to frame 1, and reset all playback frame rates."
 msgstr "איפוס את כל מיקומי הנגינה למסגרת 1 ואת כל מהירויות הנגינה."
 
-#: src/gui.c:1594
+#: src/gui.c:1592
 msgid "_MIDI/joystick interface"
 msgstr "מנשק _MIDI\\מוט היגוי"
 
-#: src/gui.c:1609
+#: src/gui.c:1607
 msgid "_MIDI/joystick learner..."
 msgstr "לומד _MIDI\\מוט היגוי"
 
-#: src/gui.c:1614
+#: src/gui.c:1612
 msgid "_Save device mapping..."
 msgstr "_שמירת מיפוי התקן..."
 
-#: src/gui.c:1620
+#: src/gui.c:1618
 msgid "_Load device mapping..."
 msgstr "_טעינת מיפוי התקן..."
 
-#: src/gui.c:1628
+#: src/gui.c:1626
 msgid "Show VJ _Keys"
 msgstr "הצגת _מקשי VJ"
 
-#: src/gui.c:1632
+#: src/gui.c:1630
 msgid "To_ys"
 msgstr "צעצ_ועים"
 
-#: src/gui.c:1644
+#: src/gui.c:1642
 msgid "_None"
 msgstr "_ללא"
 
-#: src/gui.c:1652
+#: src/gui.c:1650
 msgid "_Autolives"
 msgstr ""
 
-#: src/gui.c:1657
+#: src/gui.c:1655
 msgid "_Mad Frames"
 msgstr "_שיגוע שקופיות"
 
-#: src/gui.c:1662
+#: src/gui.c:1660
 msgid "_LiVES TV (broadband)"
 msgstr "טלוויזית _LiVES (פס רחב)"
 
-#: src/gui.c:1672 src/multitrack.c:7387
+#: src/gui.c:1670 src/multitrack.c:7563
 msgid "_Help"
 msgstr "_עזרה"
 
-#: src/gui.c:1684 src/multitrack.c:7407
+#: src/gui.c:1682 src/multitrack.c:7583
 msgid "_Manual (opens in browser)"
 msgstr "_מדריך (נפתח בדפדפן)"
 
-#: src/gui.c:1691 src/multitrack.c:7416
+#: src/gui.c:1689 src/multitrack.c:7592
 msgid "_Donate to the project !"
 msgstr "_תרומה למיזם"
 
-#: src/gui.c:1695 src/multitrack.c:7420
+#: src/gui.c:1693 src/multitrack.c:7596
 msgid "_Email the author"
 msgstr "_שליחת דוא\"ל לכותב התוכנה"
 
-#: src/gui.c:1699 src/multitrack.c:7424
+#: src/gui.c:1697 src/multitrack.c:7600
 msgid "Report a _bug"
 msgstr "דיווח על _באג"
 
-#: src/gui.c:1703 src/multitrack.c:7428
+#: src/gui.c:1701 src/multitrack.c:7604
 msgid "Suggest a _feature"
 msgstr "הצעת _תכונה חדשה"
 
-#: src/gui.c:1707 src/multitrack.c:7432
+#: src/gui.c:1705 src/multitrack.c:7608
 msgid "Assist with _translating"
 msgstr "לסייע _בתרגום"
 
-#: src/gui.c:1714 src/multitrack.c:7439
+#: src/gui.c:1712 src/multitrack.c:7615
 msgid "_Troubleshoot"
 msgstr "_איתור תקלות"
 
-#: src/gui.c:1718 src/multitrack.c:7443
+#: src/gui.c:1716 src/multitrack.c:7619
 msgid "_About"
 msgstr "_אודות"
 
-#: src/gui.c:1752
+#: src/gui.c:1750
 msgid "Rewind to start (w)"
 msgstr "חזרה להתחלה (w)"
 
-#: src/gui.c:1760 src/multitrack.c:16720
+#: src/gui.c:1758 src/multitrack.c:17010
 msgid "Play all (p)"
 msgstr "נגן הכל (p)"
 
-#: src/gui.c:1768 src/gui.c:1877
+#: src/gui.c:1766 src/gui.c:1876
 msgid "Stop playback (q)"
 msgstr "הפסקת נגינה (q)"
 
-#: src/gui.c:1779
+#: src/gui.c:1777
 msgid "Play selection (y)"
 msgstr "נגן בחירה (y)"
 
-#: src/gui.c:1832
+#: src/gui.c:1829
 msgid "Volume"
 msgstr "עוצמת קול"
 
-#: src/gui.c:1854
+#: src/gui.c:1853
 msgid "Audio volume (1.00)"
 msgstr "עוצמת שמע (1.00)"
 
-#: src/gui.c:1883
+#: src/gui.c:1882
 msgid "Unblank background (b)"
 msgstr "רקע שאינו ריק (b)"
 
-#: src/gui.c:1929
+#: src/gui.c:1928
 msgid "Play slower (ctrl-down)"
 msgstr "נגינה איטית יותר (ctrl-down)"
 
-#: src/gui.c:1935
+#: src/gui.c:1934
 msgid "Play faster (ctrl-up)"
 msgstr "נגינה מהירה יותר (ctrl-up)"
 
-#: src/gui.c:1942
+#: src/gui.c:1941
 msgid "Skip back (ctrl-left)"
 msgstr "דילוג אחורה (ctrl-left)"
 
-#: src/gui.c:1948
+#: src/gui.c:1947
 msgid "Skip forward (ctrl-right)"
 msgstr "דילוג קדימה (ctrl-right)"
 
-#: src/gui.c:1954
+#: src/gui.c:1953
 msgid "Show clip info (i)"
 msgstr "הצגת מידע על הקטע (i)"
 
-#: src/gui.c:1960
+#: src/gui.c:1959
 msgid "Hide this toolbar"
 msgstr "החבאת סרגל כלים זה"
 
-#: src/gui.c:1962
+#: src/gui.c:1961
 msgid ""
 "Press \"s\" to toggle separate play window for improved performance, \"q\" "
 "to stop."
@@ -3681,175 +3670,175 @@
 "על \"q\" כדי לעצור."
 
 #. TRANSLATORS: please keep the translated string the same length
-#: src/gui.c:1995
+#: src/gui.c:1994
 msgid "     Video playback speed (frames per second)        "
 msgstr "     מהירות נגינת הוידאו (שקופיות לשנייה)        "
 
-#: src/gui.c:2009
+#: src/gui.c:2008
 msgid "Vary the video speed"
 msgstr "שינוי מהירות הוידאו"
 
-#: src/gui.c:2092 src/gui.c:3218
+#: src/gui.c:2090 src/gui.c:3329
 msgid "First Frame"
 msgstr "שקופית ראשונה"
 
-#: src/gui.c:2193 src/gui.c:3226
+#: src/gui.c:2191 src/gui.c:3336
 msgid "Last Frame"
 msgstr "שקופית אחרונה"
 
-#: src/gui.c:2210
+#: src/gui.c:2208
 msgid "The first selected frame in this clip"
 msgstr "השקופית הראשונה שנבחרה בקטע זה"
 
-#: src/gui.c:2248
+#: src/gui.c:2246
 msgid "The last selected frame in this clip"
 msgstr "השקופית האחרונה שנבחרה בקטע זה"
 
-#: src/gui.c:2532
+#: src/gui.c:2546
 msgid "Starting...\n"
 msgstr "מתחיל...\n"
 
-#: src/gui.c:3074
+#: src/gui.c:3181
 msgid "    Press 'q' to stop recording.  DO NOT COVER THE PLAY WINDOW !   "
 msgstr ""
 "    יש ללחוץ על 'q' כדי להפסיק את ההקלטה. אין לכסות את חלון הנגינה !   "
 
-#: src/gui.c:3521
+#: src/gui.c:3643
 msgid "Frame number to preview"
 msgstr "מספר שקופיות להצגה"
 
-#: src/gui.c:3538
+#: src/gui.c:3660
 msgid "_Free"
 msgstr "_פנוי"
 
-#: src/gui.c:3539
+#: src/gui.c:3661
 msgid "Free choice of frame number"
 msgstr "בחירה חופשית של מספרי שקופיות"
 
-#: src/gui.c:3543
+#: src/gui.c:3666
 msgid "_Start"
 msgstr "_התחלה"
 
-#: src/gui.c:3544
+#: src/gui.c:3667
 msgid "Frame number is linked to start frame"
 msgstr "מספר השקופיות מקושר לשקופית ההתחלה"
 
-#: src/gui.c:3551
+#: src/gui.c:3675
 msgid "_End"
 msgstr "_סוף"
 
-#: src/gui.c:3552
+#: src/gui.c:3676
 msgid "Frame number is linked to end frame"
 msgstr "מספר השקופיות מקושר לשקופית הסיום"
 
-#: src/gui.c:3559
+#: src/gui.c:3684
 msgid "_Pointer"
 msgstr "_מצביע"
 
-#: src/gui.c:3560
+#: src/gui.c:3685
 msgid "Frame number is linked to playback pointer"
 msgstr "מספר השקופיות מקושר למצביע הנגינה"
 
-#: src/gui.c:3581
+#: src/gui.c:3707
 msgid "Rewind"
 msgstr "הרצה אחורנית"
 
-#: src/gui.c:3592 src/dialogs.c:894 src/dialogs.c:896 src/dialogs.c:1817
-#: src/dialogs.c:1819
+#: src/gui.c:3718 src/dialogs.c:960 src/dialogs.c:962 src/dialogs.c:1873
+#: src/dialogs.c:1875
 msgid "Play all"
 msgstr "נגן הכל"
 
-#: src/gui.c:3605
+#: src/gui.c:3731
 msgid "Play Selection"
 msgstr "נגינת בחירה"
 
-#: src/gui.c:3619
+#: src/gui.c:3745
 msgid "Loop On/Off"
 msgstr "הפעלת\\כיבוי לולאה"
 
-#: src/gui.c:3693
+#: src/gui.c:3819
 msgid "Start _recording"
 msgstr "התחלת _הקלטה"
 
-#: src/gui.c:3698
+#: src/gui.c:3824
 msgid "Stop _recording"
 msgstr "הפסקת _הקלטה"
 
-#: src/gui.c:3703
+#: src/gui.c:3829
 msgid "_Record Performance"
 msgstr "_הקלטת ביצועים"
 
-#: src/gui.c:3851
+#: src/gui.c:3974
 msgid "Hide Play Window"
 msgstr "החבאת חלון נגינה"
 
-#: src/gui.c:4232
+#: src/gui.c:4333
 msgid "Show Play Window"
 msgstr "הצגת חלון נגינה"
 
-#: src/ce_thumbs.c:222
+#: src/ce_thumbs.c:242
 #, c-format
 msgid "Mapped to ctrl-%d"
 msgstr ""
 
-#: src/ce_thumbs.c:276 src/effects.c:85 src/preferences.c:3195
+#: src/ce_thumbs.c:296 src/effects.c:86 src/preferences.c:3247
 msgid "Effects"
 msgstr "אפקטים"
 
-#: src/ce_thumbs.c:279 src/multitrack.c:5615
+#: src/ce_thumbs.c:299 src/multitrack.c:5791
 msgid "Clips"
 msgstr "קטעים"
 
-#: src/ce_thumbs.c:303
+#: src/ce_thumbs.c:323
 #, fuzzy, c-format
 msgid "Show / apply effects to %s\n"
 msgstr "כיבוי כל האפקטים."
 
-#: src/ce_thumbs.c:315
+#: src/ce_thumbs.c:335
 #, fuzzy, c-format
 msgid "Select clip for %s\n"
 msgstr "_מחיקת אוסף הקטעים"
 
-#: src/ce_thumbs.c:515
+#: src/ce_thumbs.c:536
 msgid "_Pin"
 msgstr ""
 
-#: src/ce_thumbs.c:515
+#: src/ce_thumbs.c:537
 msgid "Pin the parameter box to the window"
 msgstr ""
 
 #. TRANSLATORS: Exabytes
-#: src/utils.c:794
+#: src/utils.c:800
 #, c-format
 msgid "%.2f EB"
 msgstr ""
 
 #. TRANSLATORS: Petabytes
-#: src/utils.c:798
+#: src/utils.c:803
 #, c-format
 msgid "%.2f PB"
 msgstr ""
 
 #. TRANSLATORS: Terabytes
-#: src/utils.c:802
+#: src/utils.c:806
 #, c-format
 msgid "%.2f TB"
 msgstr ""
 
 #. TRANSLATORS: Gigabytes
-#: src/utils.c:806
+#: src/utils.c:809
 #, c-format
 msgid "%.2f GB"
 msgstr ""
 
 #. TRANSLATORS: Megabytes
-#: src/utils.c:810
+#: src/utils.c:812
 #, c-format
 msgid "%.2f MB"
 msgstr ""
 
 #. TRANSLATORS: Kilobytes (1024 bytes)
-#: src/utils.c:814
+#: src/utils.c:815
 #, c-format
 msgid "%.2f KiB"
 msgstr ""
@@ -3859,7 +3848,7 @@
 msgid "%d bytes"
 msgstr ""
 
-#: src/utils.c:1841
+#: src/utils.c:1835
 msgid "Clearing the clipboard"
 msgstr "מנקה את לוח הגזירים"
 
@@ -3874,7 +3863,7 @@
 "==============================\n"
 "מותג לקטע %s\n"
 
-#: src/utils.c:1880
+#: src/utils.c:1877
 msgid ""
 "\n"
 "==============================\n"
@@ -3884,18 +3873,18 @@
 "========================================\n"
 "מותג לקטע ריק\n"
 
-#: src/utils.c:1917
+#: src/utils.c:1916
 msgid "(blank)"
 msgstr "(ריק)"
 
-#: src/utils.c:1920
+#: src/utils.c:1919
 #, c-format
 msgid ""
 "The set name has been changed from %s to %s. Affected layouts have been "
 "updated accordingly\n"
 msgstr "שם האוסף שונה מ־%s ל־%s.  פריסות מושפעות עודכנו בהתאם\n"
 
-#: src/utils.c:1928
+#: src/utils.c:1927
 #, c-format
 msgid ""
 "The clip %s is missing from this set.\n"
@@ -3904,7 +3893,7 @@
 "הקטע %s חסר באוסף.\n"
 "הפריסות הבאות מחייבות שימוש בו:\n"
 
-#: src/utils.c:1932
+#: src/utils.c:1931
 #, c-format
 msgid ""
 "The clip %s has been closed.\n"
@@ -3913,7 +3902,7 @@
 "הקטע %s נסגר.\n"
 "הפריסות הבאות מחייבות שימוש בו:\n"
 
-#: src/utils.c:1937
+#: src/utils.c:1936
 #, c-format
 msgid ""
 "Frames have been shifted in the clip %s.\n"
@@ -3922,7 +3911,7 @@
 "השקופיות הוזחו מהקטע %s.\n"
 "הפריסות המושפעות הן:\n"
 
-#: src/utils.c:1942
+#: src/utils.c:1941
 #, c-format
 msgid ""
 "Frames have been deleted from the clip %s.\n"
@@ -3931,7 +3920,7 @@
 "השקופיות נמחקו מהקטע %s.\n"
 "הפריסות המושפעות הן:\n"
 
-#: src/utils.c:1947
+#: src/utils.c:1946
 #, c-format
 msgid ""
 "Audio has been deleted from the clip %s.\n"
@@ -3940,7 +3929,7 @@
 "השמע נמחק מהקטע %s.\n"
 "הפריסות המושפעות הן:\n"
 
-#: src/utils.c:1952
+#: src/utils.c:1951
 #, c-format
 msgid ""
 "Audio has been shifted in clip %s.\n"
@@ -3949,7 +3938,7 @@
 "השמע הוזז מהקטע %s.\n"
 "הפריסות המושפעות הן:\n"
 
-#: src/utils.c:1957
+#: src/utils.c:1956
 #, c-format
 msgid ""
 "Audio has been altered in the clip %s.\n"
@@ -3958,7 +3947,7 @@
 "השמע שונה בקטע %s.\n"
 "הפריסות המושפעות הן:\n"
 
-#: src/utils.c:1962
+#: src/utils.c:1961
 #, c-format
 msgid ""
 "Frames have been altered in the clip %s.\n"
@@ -3967,7 +3956,7 @@
 "השקופיות שונו בקטע %s.\n"
 "הפריסות המושפעות הן:\n"
 
-#: src/utils.c:2135
+#: src/utils.c:2134
 #, c-format
 msgid ""
 "Set %s\n"
@@ -3978,7 +3967,7 @@
 "לא נפתח משום שהוא בשימוש\n"
 "ע\"י עותק אחר של LiVES.\n"
 
-#: src/utils.c:2142
+#: src/utils.c:2140
 #, c-format
 msgid ""
 "\n"
@@ -4034,68 +4023,68 @@
 msgid "Removing layout %s\n"
 msgstr "מסיר פריסה %s\n"
 
-#: src/utils.c:3014
+#: src/utils.c:2996
 msgid "Video [opening...]"
 msgstr "וידאו [פותח...]"
 
-#: src/utils.c:3018
+#: src/utils.c:2999
 #, c-format
 msgid "Video [%.2f sec]"
 msgstr "וידאו[%.2f שניות]"
 
-#: src/utils.c:3022
+#: src/utils.c:3002
 msgid "(Undefined)"
 msgstr "(לא מוגדר)"
 
-#: src/utils.c:3025
+#: src/utils.c:3004
 msgid "(No video)"
 msgstr "(אין וידאו)"
 
-#: src/utils.c:3032
+#: src/utils.c:3011
 msgid "(No audio)"
 msgstr "(אין שמע)"
 
-#: src/utils.c:3037
+#: src/utils.c:3015
 msgid "Mono  [opening...]"
 msgstr "ערוץ אחד [פותח...]"
 
-#: src/utils.c:3040
+#: src/utils.c:3017
 msgid "Left Audio [opening...]"
 msgstr "ערוץ שמאלי [פותח...]"
 
-#: src/utils.c:3045
+#: src/utils.c:3021
 #, c-format
 msgid "Mono [%.2f sec]"
 msgstr "ערוץ אחד [%.2f שניות]"
 
-#: src/utils.c:3048
+#: src/utils.c:3023
 #, c-format
 msgid "Left Audio [%.2f sec]"
 msgstr "ערוץ שמאלי [%.2f שניות]"
 
-#: src/utils.c:3056
+#: src/utils.c:3031
 msgid "Right Audio [opening...]"
 msgstr "ערוץ ימני [פותח...]"
 
-#: src/utils.c:3059
+#: src/utils.c:3033
 #, c-format
 msgid "Right Audio [%.2f sec]"
 msgstr "ערוץ ימני [%.2f שניות]"
 
-#: src/utils.c:3506
+#: src/utils.c:3472
 msgid "LiVES cannot switch to mplayer whilst clips are loading."
 msgstr "אין אפשרות לשנות ל־mplayer כל עוד הקטעים בתהליך טעינה."
 
-#: src/utils.c:3559
+#: src/utils.c:3525
 #, fuzzy
 msgid "LiVES cannot switch to mplayer2 whilst clips are loading."
 msgstr "אין אפשרות לשנות ל־mplayer כל עוד הקטעים בתהליך טעינה."
 
-#: src/utils.c:3809
+#: src/utils.c:3775
 msgid "Cleaning up clip"
 msgstr "מנקה קטע"
 
-#: src/utils.c:3913
+#: src/utils.c:3874
 #, c-format
 msgid ""
 "\n"
@@ -4110,30 +4099,29 @@
 "\n"
 "לשכתבו ?\n"
 
-#: src/utils.c:4305 src/utils.c:4337 src/multitrack.c:4503
+#: src/utils.c:4250 src/utils.c:4280 src/multitrack.c:4672
 #, c-format
 msgid "_Undo %s"
 msgstr "_ביטול %s"
 
-#: src/utils.c:4306 src/utils.c:4338 src/multitrack.c:4525
+#: src/utils.c:4251 src/utils.c:4281 src/multitrack.c:4693
 #, c-format
 msgid "_Redo %s"
 msgstr "_ביצוע מחדש %s"
 
-#: src/utils.c:4363
+#: src/utils.c:4305
 msgid "-------------Selection------------"
 msgstr "------------בחירה----------"
 
-#. TRANSLATORS: - try to keep the text of the middle part the same length, by deleting "-" if necessary
-#: src/utils.c:4371
+#: src/utils.c:4313
 msgid " sec ] ----------Selection---------- [ "
 msgstr " שניות [ --------בחירה--------] "
 
-#: src/utils.c:4371
+#: src/utils.c:4314
 msgid " frames ] ----------"
 msgstr " שקופיות ] --------"
 
-#: src/utils.c:5360
+#: src/utils.c:5302
 msgid ""
 "Your version of mplayer/ffmpeg may be broken !\n"
 "See http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2071\n"
@@ -4144,11 +4132,11 @@
 "Try running Help/Troubleshoot for more information."
 msgstr ""
 
-#: src/saveplay.c:178
+#: src/saveplay.c:179
 msgid "Examining file header"
 msgstr "בוחן כותרת קובץ"
 
-#: src/saveplay.c:315 src/saveplay.c:789
+#: src/saveplay.c:316 src/saveplay.c:779
 #, c-format
 msgid "Opening %s"
 msgstr "פותח את %s"
@@ -4158,36 +4146,36 @@
 msgid "Opening %s start time %.2f sec. frames %d"
 msgstr "פותח את %s בזמן התחלה %.2f שניות. %d שקופיות"
 
-#: src/saveplay.c:326 src/saveplay.c:4001
+#: src/saveplay.c:326 src/saveplay.c:3927
 msgid " without sound"
 msgstr " ללא קול"
 
-#: src/saveplay.c:396
+#: src/saveplay.c:395
 #, c-format
 msgid "Opening audio for %s"
 msgstr "פותח שמע עבור %s"
 
-#: src/saveplay.c:557
+#: src/saveplay.c:554
 #, c-format
 msgid "Auto trimming %.2f seconds of audio at start..."
 msgstr ""
 
-#: src/saveplay.c:567
+#: src/saveplay.c:562
 #, fuzzy, c-format
 msgid "Auto trimming %.2f seconds of audio at end..."
 msgstr "%s מזמן %.2f שניות ל־%.2f שניות..."
 
-#: src/saveplay.c:584
+#: src/saveplay.c:577
 #, c-format
 msgid "Auto padding with %.2f seconds of silence at start..."
 msgstr ""
 
-#: src/saveplay.c:599
+#: src/saveplay.c:590
 #, c-format
 msgid "Auto padding with %.2f seconds of silence at end..."
 msgstr ""
 
-#: src/saveplay.c:671
+#: src/saveplay.c:661
 #, c-format
 msgid ""
 "\n"
@@ -4199,11 +4187,11 @@
 "Are you sure you wish to continue ?"
 msgstr ""
 
-#: src/saveplay.c:685
+#: src/saveplay.c:676
 msgid " - please be patient."
 msgstr " - נא להתאזר בסבלנות"
 
-#: src/saveplay.c:938
+#: src/saveplay.c:926
 msgid ""
 "\n"
 "\n"
@@ -4215,7 +4203,7 @@
 "אין אפשרות לחלץ שמע או וידאו אחרים.\n"
 "נא לבדוק את חלון המסוף לפרטים נוספים.\n"
 
-#: src/saveplay.c:940
+#: src/saveplay.c:928
 msgid ""
 "\n"
 "\n"
@@ -4225,7 +4213,7 @@
 "\n"
 "מחובתך להתקין את mplayer כדי לפתוח את קובץ זה.\n"
 
-#: src/saveplay.c:948
+#: src/saveplay.c:934
 msgid ""
 "\n"
 "\n"
@@ -4237,29 +4225,29 @@
 "נא לבדוק את הגדרות פקודת פתיחת הוידאו ב\n"
 "כלים|העדפות|פענוח\n"
 
-#: src/saveplay.c:1014
+#: src/saveplay.c:995
 msgid "Adding image..."
 msgstr ""
 
-#: src/saveplay.c:1108
+#: src/saveplay.c:1089
 #, c-format
 msgid "Subtitles were saved as %s\n"
 msgstr ""
 
-#: src/saveplay.c:1192
+#: src/saveplay.c:1171
 #, c-format
 msgid "LiVES: Save Frame %d as..."
 msgstr ""
 
-#: src/saveplay.c:1195
+#: src/saveplay.c:1174
 msgid "LiVES: Save Frame as..."
 msgstr ""
 
-#: src/saveplay.c:1322
+#: src/saveplay.c:1303
 msgid "LiVES: Save Clip as..."
 msgstr ""
 
-#: src/saveplay.c:1390
+#: src/saveplay.c:1369
 msgid ""
 "Saving your video could lead to a loss of quality !\n"
 "You are strongly advised to 'Save As' to a new file.\n"
@@ -4271,34 +4259,34 @@
 "\n"
 "האם ברצונך להמשיך אף על פי כן?"
 
-#: src/saveplay.c:1517 src/saveplay.c:1683 src/saveplay.c:1762
-#: src/saveplay.c:4014
+#: src/saveplay.c:1494 src/saveplay.c:1659 src/saveplay.c:1738
+#: src/saveplay.c:3940
 msgid "Pulling frames from clip"
 msgstr "מושך שקופיות מהקטע"
 
-#: src/saveplay.c:1588 src/saveplay.c:1727
+#: src/saveplay.c:1565 src/saveplay.c:1703
 msgid "Linking selection"
 msgstr "מקשר בחירה"
 
-#: src/saveplay.c:1779
+#: src/saveplay.c:1755
 msgid " (with no sound)\n"
 msgstr " (ללא קול)\n"
 
-#: src/saveplay.c:1786
+#: src/saveplay.c:1761
 #, c-format
 msgid "Saving frames %d to %d%s as \"%s\" : encoder = %s : format = %s..."
 msgstr "שומר שקופיות %d ל־%d%s כ־\"%s\" : מקודד = %s : סוג = %s..."
 
-#: src/saveplay.c:1790
+#: src/saveplay.c:1765
 #, c-format
 msgid "Saving frames 1 to %d%s as \"%s\" : encoder %s : format = %s..."
 msgstr "שומר שקופיות 1 ל־%d%s כ־\"%s\" : מקודד %s: סוג = %s..."
 
-#: src/saveplay.c:1909
+#: src/saveplay.c:1890
 msgid "Saving [can take a long time]"
 msgstr "שומר [עלול לקחת זמן רב]"
 
-#: src/saveplay.c:2057
+#: src/saveplay.c:2044
 msgid ""
 "\n"
 "\n"
@@ -4308,33 +4296,33 @@
 "\n"
 "שגיאת מקודד - קובץ הפלט לא נוצר !\n"
 
-#: src/saveplay.c:2094
+#: src/saveplay.c:2081
 msgid "Clearing letterbox"
 msgstr ""
 
-#: src/saveplay.c:2183
+#: src/saveplay.c:2168
 #, c-format
 msgid "File size was %s\n"
 msgstr ""
 
-#: src/saveplay.c:2284
+#: src/saveplay.c:2265
 msgid "recording aborted by preview.\n"
 msgstr "ההקלטה נעצרה ע\"י התצוגה המקדימה.\n"
 
-#: src/saveplay.c:2288
+#: src/saveplay.c:2268
 msgid "recording aborted by clipboard playback.\n"
 msgstr "ההקלטה נעצרה ע\"י נגינת לוח הגזירים.\n"
 
-#: src/saveplay.c:2291
+#: src/saveplay.c:2270
 msgid "Recording performance..."
 msgstr "מקליט ביצועים..."
 
-#: src/saveplay.c:3293
+#: src/saveplay.c:3251
 #, c-format
 msgid "Average FPS was %.4f\n"
 msgstr "קצב השקופיות לשנייה הממוצע היה %.4f\n"
 
-#: src/saveplay.c:3299
+#: src/saveplay.c:3256
 msgid ""
 "\n"
 "\n"
@@ -4348,16 +4336,21 @@
 "באפשרותך ללחוץ על כלים--->שנה גודל כולל\n"
 "ולשנות את גודלן של כל השקופיות לגודל הנוכחי\n"
 
-#: src/saveplay.c:3479
+#: src/saveplay.c:3429
 msgid "Unknown"
 msgstr "לא ידוע"
 
-#: src/saveplay.c:3588 src/saveplay.c:4585
+#: src/saveplay.c:3538 src/saveplay.c:4502
 #, c-format
 msgid "Untitled%d"
 msgstr "חסר כותרת%d"
 
-#: src/saveplay.c:3633
+#: src/saveplay.c:3567
+#, c-format
+msgid "%d frames are enough !\n"
+msgstr "%d שקופיות מספיקות !\n"
+
+#: src/saveplay.c:3579
 #, c-format
 msgid ""
 "\n"
@@ -4365,7 +4358,7 @@
 "Bad things may happen with this clip.\n"
 msgstr ""
 
-#: src/saveplay.c:3723
+#: src/saveplay.c:3667
 #, c-format
 msgid ""
 "\n"
@@ -4376,12 +4369,12 @@
 "מהירות הנגינה לא נכונה ! משתמש במהירות ברירת המחדל של %.3f שקופיות לשנייה. \n"
 "ניתן לקבוע את ברירת המחדל לערך אחר בכלים | העדפות | שונות.\n"
 
-#: src/saveplay.c:3735
+#: src/saveplay.c:3677
 #, c-format
 msgid "Playback speed was adjusted to %.3f frames per second to fit audio.\n"
 msgstr "מהירות הנגינה כוונה ל־%.3f שקופיות לשנייה כדי להתאימו לשמע.\n"
 
-#: src/saveplay.c:3754
+#: src/saveplay.c:3694
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d *bpp=Greyscale* fps=%.3f\n"
@@ -4391,7 +4384,7 @@
 "%.3f\n"
 "שמע:"
 
-#: src/saveplay.c:3758 src/saveplay.c:4762
+#: src/saveplay.c:3698 src/saveplay.c:4671
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d bpp=%d fps=%.3f\n"
@@ -4400,54 +4393,54 @@
 "שקופיות=%d סוג=%s גודל=%dx%d סיביות לפיקסל=%d שקופיות לשנייה=%.3f\n"
 "שמע:"
 
-#: src/saveplay.c:3762 src/saveplay.c:4766
+#: src/saveplay.c:3703 src/saveplay.c:4676
 #, c-format
 msgid "%s none\n"
 msgstr "ללא %s\n"
 
-#: src/saveplay.c:3774
+#: src/saveplay.c:3714
 #, fuzzy, c-format
 msgid " - Author: %s\n"
 msgstr "יוצר: %s"
 
-#: src/saveplay.c:3779
+#: src/saveplay.c:3717
 #, fuzzy, c-format
 msgid " - Title: %s\n"
 msgstr " - הערה: %s\n"
 
-#: src/saveplay.c:3784
+#: src/saveplay.c:3720
 #, c-format
 msgid " - Comment: %s\n"
 msgstr " - הערה: %s\n"
 
-#: src/saveplay.c:3897
+#: src/saveplay.c:3829
 #, c-format
 msgid "Saving frame %d as %s..."
 msgstr "שומר שקופית %d כ־%s..."
 
-#: src/saveplay.c:3996
+#: src/saveplay.c:3924
 #, c-format
 msgid "Backing up %s to %s"
 msgstr "מגבה את %s ל־%s"
 
-#: src/saveplay.c:4049
+#: src/saveplay.c:3975
 msgid "Backing up"
 msgstr "מגבה"
 
-#: src/saveplay.c:4083
+#: src/saveplay.c:4009
 msgid "performance data was backed up..."
 msgstr "נתוני הביצועים גובו..."
 
-#: src/saveplay.c:4661
+#: src/saveplay.c:4574
 #, c-format
 msgid "Restoring %s..."
 msgstr "משחזר את %s..."
 
-#: src/saveplay.c:4692
+#: src/saveplay.c:4603
 msgid "Restoring"
 msgstr "משחזר"
 
-#: src/saveplay.c:4714
+#: src/saveplay.c:4625
 #, c-format
 msgid ""
 "\n"
@@ -4461,22 +4454,22 @@
 "לא הייתה אפשרות לשחזרו.\n"
 
 #. TRANSLATORS: rec(ord) %.2f M(ega)B(ytes)
-#: src/saveplay.c:5207
+#: src/saveplay.c:5118
 #, c-format
 msgid "rec %.2f MB"
 msgstr "הקלטה %.2f מ\"ב"
 
-#: src/saveplay.c:5213
+#: src/saveplay.c:5123
 #, c-format
 msgid "!rec %.2f MB"
 msgstr "!הקלטה %.2f מ\"ב"
 
 #. TRANSLATORS: rec(ord) ?? M(ega)B(ytes)
-#: src/saveplay.c:5216
+#: src/saveplay.c:5126
 msgid "rec ?? MB"
 msgstr ""
 
-#: src/saveplay.c:5241
+#: src/saveplay.c:5151
 #, c-format
 msgid ""
 "\n"
@@ -4484,7 +4477,7 @@
 "Record stop level can be set in Preferences.\n"
 msgstr ""
 
-#: src/saveplay.c:5535
+#: src/saveplay.c:5447
 msgid ""
 "\n"
 "Files from a previous run of LiVES were found.\n"
@@ -4494,47 +4487,69 @@
 "נמצאו קבצים מהרצה קודמת של LiVES.\n"
 "האם ברצונך לשחזרם ?\n"
 
-#: src/saveplay.c:5557
+#: src/saveplay.c:5469
 msgid "Recovering files"
 msgstr "משחזר קבצים"
 
-#: src/saveplay.c:5560
+#: src/saveplay.c:5472
 msgid "Recovering files..."
 msgstr "משחזר קבצים..."
 
-#: src/dialogs.c:72
+#: src/dialogs.c:71
 msgid "Show affected _layouts"
 msgstr "הצגת פריסות _מושפעות"
 
-#: src/dialogs.c:128
+#: src/dialogs.c:113
+msgid ""
+"Do _not show this warning any more\n"
+"(can be turned back on from Preferences/Warnings)"
+msgstr ""
+"אין להציג אזהרה זאת עוד\n"
+"(ניתן להפעיל שוב תחת העדפות/אזהרות)"
+
+#: src/dialogs.c:127
 msgid "_Recover disk space"
 msgstr ""
 
-#: src/dialogs.c:143
+#: src/dialogs.c:142
 msgid " _Advanced Settings >>"
 msgstr ""
 
-#: src/dialogs.c:184
+#: src/dialogs.c:183 src/dialogs.c:221
 msgid "LiVES: - Warning !"
 msgstr "LiVES: - אזהרה !"
 
 #: src/dialogs.c:194
+#, fuzzy
+msgid "LiVES: - Error !"
+msgstr "LiVES: - אזהרה !"
+
+#: src/dialogs.c:204
+#, fuzzy
+msgid "LiVES: - Information"
+msgstr "LiVES: מידע עבור %s"
+
+#: src/dialogs.c:230
 msgid "LiVES: - Question"
 msgstr ""
 
-#: src/dialogs.c:204
+#: src/dialogs.c:239
 msgid "LiVES: - File Error"
 msgstr ""
 
-#: src/dialogs.c:208
+#: src/dialogs.c:241
 msgid "_Abort"
 msgstr ""
 
-#: src/dialogs.c:213
+#: src/dialogs.c:246
 msgid "_Retry"
 msgstr ""
 
-#: src/dialogs.c:597
+#: src/dialogs.c:306
+msgid "Show _Details"
+msgstr "הצגת _פרטים"
+
+#: src/dialogs.c:657
 #, c-format
 msgid ""
 "FREE SPACE IN THE PARTITION CONTAINING\n"
@@ -4545,7 +4560,7 @@
 "(Disk warning levels can be configured in Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:615
+#: src/dialogs.c:676
 #, c-format
 msgid ""
 "Free space in the partition containing\n"
@@ -4557,11 +4572,11 @@
 "Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:627
+#: src/dialogs.c:688
 msgid "Audio players cannot be switched during playback."
 msgstr "לא ניתן לבחור נגני שמע אחרים בזמן נגינה."
 
-#: src/dialogs.c:632
+#: src/dialogs.c:694
 msgid ""
 "\n"
 "\n"
@@ -4573,18 +4588,18 @@
 "ל־LiVES לא הייתה אפשרות לבצע פעולה זו בגלל נפח זיכרון מוגבל.\n"
 "נא לנסות לסגור יישומים אחרים קודם.\n"
 
-#: src/dialogs.c:752
+#: src/dialogs.c:820
 msgid "Processing has been paused."
 msgstr ""
 
-#: src/dialogs.c:937
+#: src/dialogs.c:1002
 #, c-format
 msgid ""
 "\n"
 "%s%d%% done. Time remaining: %u sec%s\n"
 msgstr ""
 
-#: src/dialogs.c:1335
+#: src/dialogs.c:1391
 #, c-format
 msgid ""
 "\n"
@@ -4593,7 +4608,7 @@
 "\n"
 "%d/%d שקופיות נפתחו. נותרו %u שניות.\n"
 
-#: src/dialogs.c:1337
+#: src/dialogs.c:1393
 #, c-format
 msgid ""
 "\n"
@@ -4602,7 +4617,7 @@
 "\n"
 "%d/%d שקופיות נפתחו.\n"
 
-#: src/dialogs.c:1341
+#: src/dialogs.c:1396
 #, c-format
 msgid ""
 "\n"
@@ -4611,7 +4626,7 @@
 "\n"
 "נפתחו %d שקופיות.\n"
 
-#: src/dialogs.c:1940
+#: src/dialogs.c:1993
 #, c-format
 msgid ""
 "\n"
@@ -4620,7 +4635,7 @@
 "\n"
 "הזמן שנותר: %d שניות"
 
-#: src/dialogs.c:1988
+#: src/dialogs.c:2040
 #, c-format
 msgid ""
 "\n"
@@ -4631,7 +4646,7 @@
 "מצטערים, LiVES יכול לפתוח רק %d קבצים בכל פעם.\n"
 "נא לסגור קובץ ולנסות שוב."
 
-#: src/dialogs.c:1994
+#: src/dialogs.c:2047
 #, c-format
 msgid ""
 "LiVES was unable to write to its temporary directory.\n"
@@ -4650,7 +4665,7 @@
 "\n"
 "נא לוודא שניתן לכתוב לתקייה זו."
 
-#: src/dialogs.c:2005
+#: src/dialogs.c:2059
 #, fuzzy
 msgid ""
 "\n"
@@ -4661,13 +4676,13 @@
 "LiVES מחייב שימוש ב־'mplayer' או 'sox' לפעולה תקינה. יש להתקין את אחד מאלה "
 "ולנסות שוב.\n"
 
-#: src/dialogs.c:2010
+#: src/dialogs.c:2064
 msgid ""
 "Audio was not loaded; please install mplayer or mplayer2 if you expected "
 "audio for this clip.\n"
 msgstr ""
 
-#: src/dialogs.c:2014
+#: src/dialogs.c:2069
 msgid ""
 "Audio resampling is required for this format.\n"
 "Please install 'sox'\n"
@@ -4677,7 +4692,7 @@
 "נא להתקין את החבילה 'sox'\n"
 "או לשנות מקודד בכלים | העדפות | קידוד\n"
 
-#: src/dialogs.c:2019
+#: src/dialogs.c:2075
 msgid ""
 "\n"
 "\n"
@@ -4689,7 +4704,7 @@
 "המקודד אינו יכול להשתמש במקודד השמע שסופק.\n"
 "נא לקבוע את מקודד השמע בכלים | העדפות | קידוד\n"
 
-#: src/dialogs.c:2024
+#: src/dialogs.c:2080
 msgid ""
 "This layout includes generated frames.\n"
 "It cannot be saved, you must render it to a clip first.\n"
@@ -4697,13 +4712,13 @@
 "פריסה זו כולל שקופיות מחוללות.\n"
 "לא ניתן לשמור אותה, עליך לאגדה לקטע קודם.\n"
 
-#: src/dialogs.c:2029
+#: src/dialogs.c:2085
 msgid ""
 "This layout includes generated or recorded audio.\n"
 "It cannot be saved, you must render it to a clip first.\n"
 msgstr ""
 
-#: src/dialogs.c:2039 src/dialogs.c:2137
+#: src/dialogs.c:2095 src/dialogs.c:2189
 #, c-format
 msgid ""
 "\n"
@@ -4714,7 +4729,7 @@
 "\n"
 "בגלל ההחמרה בסוג %s\n"
 
-#: src/dialogs.c:2059
+#: src/dialogs.c:2115
 msgid ""
 "LiVES recommends the following settings:\n"
 "\n"
@@ -4722,43 +4737,43 @@
 "אנו ממליצים על ההגדרות הבאות:\n"
 "\n"
 
-#: src/dialogs.c:2065 src/dialogs.c:2174 src/resample.c:850
+#: src/dialogs.c:2121 src/dialogs.c:2225 src/resample.c:839
 msgid ", signed"
 msgstr ", רשום"
 
-#: src/dialogs.c:2066 src/dialogs.c:2175 src/resample.c:853
+#: src/dialogs.c:2122 src/dialogs.c:2226 src/resample.c:841
 msgid ", unsigned"
 msgstr ", לא רשום"
 
-#: src/dialogs.c:2070 src/dialogs.c:2179 src/resample.c:858
+#: src/dialogs.c:2126 src/dialogs.c:2230 src/resample.c:846
 msgid ", little-endian"
 msgstr ", שימוש בנפח קטן"
 
-#: src/dialogs.c:2071 src/dialogs.c:2180 src/resample.c:861
+#: src/dialogs.c:2127 src/dialogs.c:2231 src/resample.c:848
 msgid ", big-endian"
 msgstr ", שימוש בנפח גדול"
 
-#: src/dialogs.c:2077
+#: src/dialogs.c:2132
 #, c-format
 msgid "Use an audio rate of %d Hz%s%s\n"
 msgstr ""
 
-#: src/dialogs.c:2085
+#: src/dialogs.c:2140
 #, c-format
 msgid "Set video rate to %.3f frames per second\n"
 msgstr "קביעת קצב הוידאו ל־%.3f שקופיות לשנייה\n"
 
-#: src/dialogs.c:2089
+#: src/dialogs.c:2143
 #, c-format
 msgid "Set video rate to %d:%d frames per second\n"
 msgstr "קביעת קצב הוידאו ל־%d:%d שקופיות לשנייה\n"
 
-#: src/dialogs.c:2094 src/dialogs.c:2209
+#: src/dialogs.c:2148 src/dialogs.c:2258
 #, c-format
 msgid "Set video size to %d x %d pixels\n"
 msgstr "קביעת גודל הוידאו ל־ %d על %d פיקסלים\n"
 
-#: src/dialogs.c:2102 src/dialogs.c:2208
+#: src/dialogs.c:2156 src/dialogs.c:2257
 msgid ""
 "\n"
 "You may wish to:\n"
@@ -4766,35 +4781,35 @@
 "\n"
 "באפשרותך:\n"
 
-#: src/dialogs.c:2105 src/dialogs.c:2200
+#: src/dialogs.c:2159 src/dialogs.c:2249
 #, c-format
 msgid "resize video to %d x %d pixels\n"
 msgstr "לשנות את גודל הוידאו ל־%d על %d פיקסלים\n"
 
-#: src/dialogs.c:2110
+#: src/dialogs.c:2163
 msgid "disable audio, since the target encoder cannot encode audio\n"
 msgstr "לנטרל את השמע, בגלל שמקודד המטרה אינו מקודד שמע\n"
 
-#: src/dialogs.c:2170
+#: src/dialogs.c:2221
 msgid "LiVES must:\n"
 msgstr "LiVES חייב:\n"
 
-#: src/dialogs.c:2185
+#: src/dialogs.c:2235
 #, c-format
 msgid "resample audio to %d Hz%s%s\n"
 msgstr ""
 
-#: src/dialogs.c:2192
+#: src/dialogs.c:2242
 #, c-format
 msgid "resample video to %.3f frames per second\n"
 msgstr "לדגום מחדש את הוידאו ל־%.3f שקופיות לשנייה\n"
 
-#: src/dialogs.c:2196
+#: src/dialogs.c:2245
 #, c-format
 msgid "resample video to %d:%d frames per second\n"
 msgstr "לדגום מחדש את הוידאו ל־%d:%d שקופיות לשנייה\n"
 
-#: src/dialogs.c:2215
+#: src/dialogs.c:2263
 msgid ""
 "\n"
 "You will be able to undo these changes afterwards.\n"
@@ -4808,7 +4823,7 @@
 "יש ללחוץ על `אישור` להמשך, או על `ביטול` לביטול.\n"
 "\n"
 
-#: src/dialogs.c:2218
+#: src/dialogs.c:2265
 msgid ""
 "\n"
 "Changes applied to the selection will not be permanent.\n"
@@ -4818,7 +4833,7 @@
 "השינויים שחלו לבחירה לא יהיו תמידיים.\n"
 "\n"
 
-#: src/dialogs.c:2237
+#: src/dialogs.c:2285
 msgid ""
 "\n"
 "\n"
@@ -4831,7 +4846,7 @@
 "לא הייתה אפשרות להקליט את הביצועים. כרגע אין מספיק נפח זיכרון פנוי.\n"
 "באפשרותך לנסות להקליט רק עבור בחירת הקובץ."
 
-#: src/dialogs.c:2244
+#: src/dialogs.c:2293
 msgid ""
 "The playback speed (fps), or the audio rate\n"
 " of the clipboard does not match\n"
@@ -4849,7 +4864,7 @@
 "\n"
 "יש ללחוץ על ביטול כדי לעצור את ההכנסה, או על אישור כדי להמשיך."
 
-#: src/dialogs.c:2253
+#: src/dialogs.c:2304
 #, fuzzy, c-format
 msgid ""
 "When opening a yuvmpeg stream, you should first create a fifo file in:\n"
@@ -4866,11 +4881,11 @@
 "LiVES יודיע לך כשהשקופיות יתקבלו.\n"
 "לחץ על אישור אם הבנת במה מדובר, אחרת, לחץ על ביטול."
 
-#: src/dialogs.c:2305
+#: src/dialogs.c:2356
 msgid "Show Keys"
 msgstr "הצגת מקשים"
 
-#: src/dialogs.c:2306
+#: src/dialogs.c:2358
 msgid ""
 "You can use the following keys during playback to control LiVES:-\n"
 "\n"
@@ -4950,11 +4965,11 @@
 "d                             גודל כפול\n"
 "g                             לולאת Ping Pong\n"
 
-#: src/dialogs.c:2313
+#: src/dialogs.c:2365
 msgid "Multitrack Keys"
 msgstr "מקשים רב־רצועתיים"
 
-#: src/dialogs.c:2314
+#: src/dialogs.c:2367
 msgid ""
 "You can use the following keys to control the multitrack window:-\n"
 "\n"
@@ -4976,18 +4991,18 @@
 "For other keys, see the menus.\n"
 msgstr ""
 
-#: src/dialogs.c:2322
+#: src/dialogs.c:2375
 msgid "Message History"
 msgstr "היסטורית הודעות"
 
-#: src/dialogs.c:2335
+#: src/dialogs.c:2388
 #, c-format
 msgid ""
 "After upgrading/installing, you may need to adjust the <prefix_dir> setting "
 "in your %s file"
 msgstr ""
 
-#: src/dialogs.c:2344
+#: src/dialogs.c:2399
 #, c-format
 msgid ""
 "\n"
@@ -4998,7 +5013,7 @@
 "or change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/dialogs.c:2352
+#: src/dialogs.c:2408
 msgid ""
 "Sorry, unknown audio type.\n"
 "\n"
@@ -5008,18 +5023,18 @@
 "\n"
 "(שמות הקבצים חייבים להסתיים ב: .mp3, .ogg, .wav, .mod, .xm או .it)"
 
-#: src/dialogs.c:2353
+#: src/dialogs.c:2409
 msgid "failed (unknown type)\n"
 msgstr "נכשל (סוג לא ידוע)\n"
 
-#: src/dialogs.c:2358
+#: src/dialogs.c:2415
 msgid ""
 "\n"
 "Do you wish to remove the layout files associated with this set ?\n"
 "(They will not be usable without the set).\n"
 msgstr ""
 
-#: src/dialogs.c:2363
+#: src/dialogs.c:2421
 #, c-format
 msgid ""
 "\n"
@@ -5032,7 +5047,7 @@
 "יש ללחוץ על אישור כדי להוסיף את הקטעים הנוכחיים והפריסות לאוסף הנוכחי. \n"
 "או לחילופין על ביטול כדי לבחור שם חדש.\n"
 
-#: src/dialogs.c:2370
+#: src/dialogs.c:2429
 msgid ""
 "\n"
 "Frames from this clip are used in some multitrack layouts.\n"
@@ -5044,7 +5059,7 @@
 "האם ברצונך להמשיך בכל זאת ?\n"
 "."
 
-#: src/dialogs.c:2374
+#: src/dialogs.c:2433
 msgid ""
 "\n"
 "Audio from this clip is used in some multitrack layouts.\n"
@@ -5056,7 +5071,7 @@
 "האם ברצונך להמשיך בכל זאת ?\n"
 "."
 
-#: src/dialogs.c:2378
+#: src/dialogs.c:2438
 #, c-format
 msgid ""
 "\n"
@@ -5067,7 +5082,7 @@
 "Otherwise click Cancel to skip loading this file.\n"
 msgstr ""
 
-#: src/dialogs.c:2385
+#: src/dialogs.c:2446
 #, c-format
 msgid ""
 "\n"
@@ -5082,7 +5097,7 @@
 "%s\n"
 "לא ניתן לאתר את הקטע.\n"
 
-#: src/dialogs.c:2392
+#: src/dialogs.c:2455
 msgid ""
 "\n"
 "Dear user, the jack developers decided to remove the -Z option from jackd.\n"
@@ -5090,7 +5105,7 @@
 "Alternately, select a different audio player in Preferences.\n"
 msgstr ""
 
-#: src/dialogs.c:2396
+#: src/dialogs.c:2460
 msgid ""
 "\n"
 "Unable to start up jack. Please ensure that alsa is set up correctly on your "
@@ -5099,13 +5114,13 @@
 "Automatic jack startup will be disabled now.\n"
 msgstr ""
 
-#: src/dialogs.c:2402
+#: src/dialogs.c:2466
 msgid ""
 "\n"
 "Unable to connect to jack server. Please start jack before starting LiVES\n"
 msgstr ""
 
-#: src/dialogs.c:2411
+#: src/dialogs.c:2475
 #, c-format
 msgid ""
 "\n"
@@ -5116,7 +5131,7 @@
 "%s\n"
 msgstr ""
 
-#: src/dialogs.c:2418
+#: src/dialogs.c:2482
 msgid ""
 "\n"
 "Alternately, you can restart LiVES and select another audio player.\n"
@@ -5124,7 +5139,7 @@
 "\n"
 "לחילופין, באפשרותך להפעיל מחדש את LiVES ולבחור בנגן שמע אחר.\n"
 
-#: src/dialogs.c:2423
+#: src/dialogs.c:2488
 #, c-format
 msgid ""
 "\n"
@@ -5139,7 +5154,7 @@
 "באפשרותך לשנות את הערך בהעדפות\\רב־רצועתי\n"
 "מומלץ לשנותו ללפחות %d מ\"ב"
 
-#: src/dialogs.c:2429
+#: src/dialogs.c:2496
 #, c-format
 msgid ""
 "\n"
@@ -5148,7 +5163,7 @@
 "Do you wish to delete them ?\n"
 msgstr ""
 
-#: src/dialogs.c:2436
+#: src/dialogs.c:2504
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for multitrack undo.\n"
@@ -5160,7 +5175,7 @@
 "ניתן לסגור יישומים אחדים, או להגדיל את מכסת הזיכרון\n"
 "בהעדפות\\רב־רצועתי\\זיכרון לביטול פעולות\n"
 
-#: src/dialogs.c:2440
+#: src/dialogs.c:2508
 msgid ""
 "\n"
 "Out of memory for undo.\n"
@@ -5172,7 +5187,7 @@
 "ייתכן ויהיה צורך להגדיל את מכסת הזיכרון\n"
 "בהעדפות\\רב־רצועתי\\זיכרון לביטול פעולות\n"
 
-#: src/dialogs.c:2444
+#: src/dialogs.c:2512
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for the multitrack undo buffer.\n"
@@ -5181,19 +5196,19 @@
 "ל־LiVES לא הייתה אפשרות להשתמש במספיק זיכרון לחוצץ ביטול פעולות רב־"
 "רצועתיות.\n"
 
-#: src/dialogs.c:2446
+#: src/dialogs.c:2514
 msgid "or enter a smaller value.\n"
 msgstr "או להכניס ערך קטן יותר.\n"
 
-#: src/dialogs.c:2448
+#: src/dialogs.c:2516
 msgid "Try again from the clip editor, try closing some other applications\n"
 msgstr "אפשר לנסות שוב מעורך הקטעים, או לנסות לסגור יישומים אחרים\n"
 
-#: src/dialogs.c:2449
+#: src/dialogs.c:2517
 msgid "Try closing some other applications\n"
 msgstr "ניתן לנסות לסגור יישומים אחרים\n"
 
-#: src/dialogs.c:2460
+#: src/dialogs.c:2529
 msgid ""
 "Multitrack is set to 0 audio channels, but this layout has audio.\n"
 "You should adjust the audio settings from the Tools menu.\n"
@@ -5201,12 +5216,12 @@
 "המצב הרב־רצועתי נקבע ל־0 ערוצי שמע, אבל פריסה זו מכילה שמע.\n"
 "באפשרותך לכוון את הגדרות השמע מתפריט הכלים.\n"
 
-#: src/dialogs.c:2464
+#: src/dialogs.c:2534
 msgid ""
 "The current layout has audio, so audio channels may not be set to zero.\n"
 msgstr "הפריסה הנוכחית מכילה אודיו, לכן לא מומלץ שמספר הערוצים ייקבע לאפס.\n"
 
-#: src/dialogs.c:2468
+#: src/dialogs.c:2539
 msgid ""
 "Multitrack audio preview is only available with the\n"
 "\"jack\" or \"pulse audio\" audio player.\n"
@@ -5216,7 +5231,7 @@
 "נגן השמע \"jack\" או \"pulse audio\".\n"
 "באפשרותך לקבוע זאת בתפריט כלים|העדפות|נגינה."
 
-#: src/dialogs.c:2472
+#: src/dialogs.c:2545
 msgid ""
 "Errors were detected in the layout (which may be due to transferring from "
 "another system, or from an older version of LiVES).\n"
@@ -5226,7 +5241,7 @@
 "של LiVES).\n"
 "האם לנסות לתקן את עותק הכונן של הפריסה ?\n"
 
-#: src/dialogs.c:2476
+#: src/dialogs.c:2549
 msgid ""
 "LiVES was unable to load the layout.\n"
 "Sorry.\n"
@@ -5234,7 +5249,7 @@
 "LiVES אין אפשרות לטעון את הפריסה.\n"
 "מצטער.\n"
 
-#: src/dialogs.c:2482
+#: src/dialogs.c:2555
 msgid ""
 "\n"
 "\n"
@@ -5244,7 +5259,7 @@
 "\n"
 "תדר השמע חייב להיות גדול מ־0.\n"
 
-#: src/dialogs.c:2486
+#: src/dialogs.c:2559
 msgid ""
 "\n"
 "Event list will be very large\n"
@@ -5256,7 +5271,7 @@
 "והצגתה עלולה לקחת זמן רב.\n"
 "האם ברצונך להציגה בכל זאת ?\n"
 
-#: src/dialogs.c:2491
+#: src/dialogs.c:2564
 msgid ""
 "\n"
 "\n"
@@ -5266,7 +5281,7 @@
 "\n"
 "מחובתך להתקין את 'dvgrab' כדי להשתמש בתכונה זו.\n"
 
-#: src/dialogs.c:2496
+#: src/dialogs.c:2570
 msgid ""
 "\n"
 "\n"
@@ -5280,25 +5295,25 @@
 "נגן השמע \"jack\" או \"pulse audio\".\n"
 "באפשרותך לבחור אחת מאפשרויות אלו בתפריט כלים|העדפות|נגינה.\n"
 
-#: src/dialogs.c:2500
+#: src/dialogs.c:2574
 msgid "Video playback plugin failed to initialise palette !\n"
 msgstr "תוסף נגינת הוידאו נכשל בהצגת הלוח !\n"
 
-#: src/dialogs.c:2504
+#: src/dialogs.c:2579
 msgid "Decoder plugin failed to initialise palette !\n"
 msgstr "תוסף המקודד נכשל בהצגת לוח הצבעים !\n"
 
-#: src/dialogs.c:2509
+#: src/dialogs.c:2584
 msgid "Unable to set framerate of video plugin\n"
 msgstr "ל־LiVES לא הייתה אפשרות לקבוע את קצב השקופיות של תוסף הוידאו\n"
 
-#: src/dialogs.c:2514
+#: src/dialogs.c:2590
 msgid ""
 "After a crash, it is advisable to clean up the disk with\n"
 "File|Clean up disk space\n"
 msgstr ""
 
-#: src/dialogs.c:2526
+#: src/dialogs.c:2604
 #, c-format
 msgid ""
 "Stream frame size is too large for your network buffers.\n"
@@ -5311,33 +5326,33 @@
 "\n"
 "echo %d > /proc/sys/net/core/rmnem_max\n"
 
-#: src/dialogs.c:2714
+#: src/dialogs.c:2800
 msgid "cancelled.\n"
 msgstr "בוטל.\n"
 
-#: src/dialogs.c:2721
+#: src/dialogs.c:2805
 msgid "failed.\n"
 msgstr "נכשל.\n"
 
-#: src/dialogs.c:2728
+#: src/dialogs.c:2810
 msgid "done.\n"
 msgstr "הסתיים.\n"
 
-#: src/dialogs.c:2732
+#: src/dialogs.c:2814
 msgid "error in file. Failed.\n"
 msgstr "שגיאה בקובץ. נכשל.\n"
 
-#: src/dialogs.c:2766 src/dialogs.c:2815 src/dialogs.c:2839
+#: src/dialogs.c:2848 src/dialogs.c:2897 src/dialogs.c:2921
 #, c-format
 msgid "Additional info: %s\n"
 msgstr ""
 
-#: src/dialogs.c:2769
+#: src/dialogs.c:2851
 #, c-format
 msgid "The error value was %d%s\n"
 msgstr ""
 
-#: src/dialogs.c:2772
+#: src/dialogs.c:2854
 #, c-format
 msgid ""
 "\n"
@@ -5347,7 +5362,7 @@
 "%s%s%s"
 msgstr ""
 
-#: src/dialogs.c:2818
+#: src/dialogs.c:2900
 #, c-format
 msgid ""
 "\n"
@@ -5357,7 +5372,7 @@
 "%s"
 msgstr ""
 
-#: src/dialogs.c:2842
+#: src/dialogs.c:2924
 #, c-format
 msgid ""
 "\n"
@@ -5367,7 +5382,7 @@
 "%s"
 msgstr ""
 
-#: src/dialogs.c:2886
+#: src/dialogs.c:2968
 #, c-format
 msgid ""
 "\n"
@@ -5376,7 +5391,7 @@
 "Please check for possible error causes.\n"
 msgstr ""
 
-#: src/dialogs.c:2890
+#: src/dialogs.c:2971
 #, c-format
 msgid ""
 "\n"
@@ -5386,7 +5401,7 @@
 "%s.\n"
 msgstr ""
 
-#: src/dialogs.c:2921
+#: src/dialogs.c:3002
 #, c-format
 msgid ""
 "\n"
@@ -5395,7 +5410,7 @@
 "Please check for possible error causes.\n"
 msgstr ""
 
-#: src/dialogs.c:2925
+#: src/dialogs.c:3005
 #, c-format
 msgid ""
 "\n"
@@ -5405,12 +5420,12 @@
 "%s.\n"
 msgstr ""
 
-#: src/dialogs.c:2993
+#: src/dialogs.c:3073
 #, c-format
 msgid "Value for \"%s\" could not be read."
 msgstr ""
 
-#: src/dialogs.c:3011
+#: src/dialogs.c:3091
 #, c-format
 msgid ""
 "\n"
@@ -5419,7 +5434,7 @@
 "Please check your system for errors.\n"
 msgstr ""
 
-#: src/dialogs.c:3020
+#: src/dialogs.c:3100
 #, c-format
 msgid ""
 "\n"
@@ -5432,7 +5447,7 @@
 "%s\n"
 "נא לבדוק את הרשאות הקובץ ולנסות שוב."
 
-#: src/dialogs.c:3027
+#: src/dialogs.c:3109
 #, c-format
 msgid ""
 "\n"
@@ -5441,7 +5456,7 @@
 "Please check the directory permissions and try again."
 msgstr ""
 
-#: src/dialogs.c:3034
+#: src/dialogs.c:3116
 #, c-format
 msgid ""
 "\n"
@@ -5449,14 +5464,14 @@
 "%s\n"
 msgstr ""
 
-#: src/dialogs.c:3041
+#: src/dialogs.c:3123
 msgid ""
 "\n"
 "Abort and exit immediately from LiVES\n"
 "Are you sure ?\n"
 msgstr ""
 
-#: src/dialogs.c:3047
+#: src/dialogs.c:3129
 #, c-format
 msgid ""
 "\n"
@@ -5464,13 +5479,13 @@
 "Please select another encoder from the list.\n"
 msgstr ""
 
-#: src/dialogs.c:3056
+#: src/dialogs.c:3139
 msgid ""
 "\n"
 "This card is already in use and cannot be opened multiple times.\n"
 msgstr ""
 
-#: src/dialogs.c:3061
+#: src/dialogs.c:3145
 #, c-format
 msgid ""
 "\n"
@@ -5480,27 +5495,27 @@
 "- Check if the device actually exists.\n"
 msgstr ""
 
-#: src/dialogs.c:3068
+#: src/dialogs.c:3153
 msgid ""
 "\n"
 "This file already has subtitles loaded.\n"
 "Do you wish to overwrite the existing subtitles ?\n"
 msgstr ""
 
-#: src/dialogs.c:3072
+#: src/dialogs.c:3157
 msgid ""
 "\n"
 "LiVES currently only supports subtitles of type .srt and .sub.\n"
 msgstr ""
 
-#: src/dialogs.c:3076
+#: src/dialogs.c:3161
 msgid ""
 "\n"
 "Erase all subtitles from this clip.\n"
 "Are you sure ?\n"
 msgstr ""
 
-#: src/dialogs.c:3082
+#: src/dialogs.c:3168
 #, c-format
 msgid ""
 "\n"
@@ -5509,14 +5524,14 @@
 "or OK to continue and save as type \"%s\"\n"
 msgstr ""
 
-#: src/dialogs.c:3089
+#: src/dialogs.c:3176
 msgid ""
 "\n"
 "Do you wish to move the current clip sets to the new directory ?\n"
 "(If unsure, click Yes)\n"
 msgstr ""
 
-#: src/dialogs.c:3093
+#: src/dialogs.c:3181
 #, c-format
 msgid ""
 "\n"
@@ -5527,19 +5542,19 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:3099
+#: src/dialogs.c:3188
 msgid ""
 "\n"
 "No video input devices could be found.\n"
 msgstr ""
 
-#: src/dialogs.c:3103
+#: src/dialogs.c:3192
 msgid ""
 "\n"
 "All video input devices are already in use.\n"
 msgstr ""
 
-#: src/dialogs.c:3107
+#: src/dialogs.c:3196
 msgid ""
 "\n"
 "\n"
@@ -5547,15 +5562,14 @@
 "DO NOT SHUT DOWN OR CLOSE LIVES !\n"
 msgstr ""
 
-#: src/dialogs.c:3127
+#: src/dialogs.c:3203
 #, c-format
 msgid ""
 "No clips were recovered for set (%s).\n"
 "Please check the spelling of the set name and try again.\n"
 msgstr ""
 
-#. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:3136
+#: src/dialogs.c:3214
 #, c-format
 msgid ""
 "\n"
@@ -5567,7 +5581,7 @@
 msgstr ""
 
 #. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:3144
+#: src/dialogs.c:3222
 #, c-format
 msgid ""
 "\n"
@@ -5576,34 +5590,34 @@
 "\n"
 msgstr ""
 
-#: src/dialogs.c:3150
+#: src/dialogs.c:3228
 msgid ""
 "\n"
 "You must have autolives.pl installed and in your path to use this toy.\n"
 "Consult your package distributor.\n"
 msgstr ""
 
-#: src/dialogs.c:3154
+#: src/dialogs.c:3232
 msgid ""
 "\n"
 "You must have a minimum of one clip loaded to use this toy.\n"
 msgstr ""
 
-#: src/dialogs.c:3158
+#: src/dialogs.c:3236
 msgid ""
 "\n"
 "LiVES lost its connection to jack and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:3162
+#: src/dialogs.c:3240
 msgid ""
 "\n"
 "LiVES lost its connection to pulseaudio and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:3175
+#: src/dialogs.c:3254
 #, c-format
 msgid ""
 "\n"
@@ -5612,240 +5626,240 @@
 "Do you wish to allow this (for this session only) ?\n"
 msgstr ""
 
-#: src/effects.c:60
+#: src/effects.c:61
 msgid "generator"
 msgstr "מחולל"
 
-#: src/effects.c:61
+#: src/effects.c:62
 msgid "Generators"
 msgstr "מחוללים"
 
-#: src/effects.c:63
+#: src/effects.c:64
 msgid "audio generator"
 msgstr ""
 
-#: src/effects.c:64
+#: src/effects.c:65
 msgid "Audio Generators"
 msgstr ""
 
-#: src/effects.c:66
+#: src/effects.c:67
 msgid "audio/video generator"
 msgstr ""
 
-#: src/effects.c:67
+#: src/effects.c:68
 msgid "Audio/Video Generators"
 msgstr ""
 
-#: src/effects.c:69
+#: src/effects.c:70
 msgid "data generator"
 msgstr ""
 
-#: src/effects.c:70
+#: src/effects.c:71
 msgid "Data Generators"
 msgstr ""
 
-#: src/effects.c:72
+#: src/effects.c:73
 msgid "data visualiser"
 msgstr ""
 
-#: src/effects.c:73
+#: src/effects.c:74
 msgid "Data Visualisers"
 msgstr ""
 
-#: src/effects.c:75
+#: src/effects.c:76
 msgid "data processor"
 msgstr ""
 
-#: src/effects.c:76
+#: src/effects.c:77
 msgid "Data Processors"
 msgstr ""
 
-#: src/effects.c:78
+#: src/effects.c:79
 msgid "data source"
 msgstr ""
 
-#: src/effects.c:79
+#: src/effects.c:80
 msgid "Data Sources"
 msgstr ""
 
-#: src/effects.c:81
+#: src/effects.c:82
 msgid "transition"
 msgstr "מעבר"
 
-#: src/effects.c:82
+#: src/effects.c:83
 msgid "Transitions"
 msgstr "מעברים"
 
-#: src/effects.c:84
+#: src/effects.c:85
 msgid "effect"
 msgstr "אפקט"
 
-#: src/effects.c:87 src/rfx-builder.c:187
+#: src/effects.c:88 src/rfx-builder.c:187
 msgid "utility"
 msgstr "כלי שירות"
 
-#: src/effects.c:88
+#: src/effects.c:89
 msgid "Utilities"
 msgstr "כלי שירות"
 
-#: src/effects.c:90
+#: src/effects.c:91
 msgid "compositor"
 msgstr "מחבר"
 
-#: src/effects.c:91
+#: src/effects.c:92
 msgid "Compositors"
 msgstr "מחברים"
 
-#: src/effects.c:93
+#: src/effects.c:94
 msgid "tap"
 msgstr "ברז"
 
-#: src/effects.c:94
+#: src/effects.c:95
 msgid "Taps"
 msgstr "ברזים"
 
-#: src/effects.c:96
+#: src/effects.c:97
 msgid "splitter"
 msgstr "מפצל"
 
-#: src/effects.c:97
+#: src/effects.c:98
 msgid "Splitters"
 msgstr "מפצלים"
 
-#: src/effects.c:99
+#: src/effects.c:100
 msgid "converter"
 msgstr "ממיר"
 
-#: src/effects.c:100
+#: src/effects.c:101
 msgid "Converters"
 msgstr "ממירים"
 
-#: src/effects.c:102
+#: src/effects.c:103
 msgid "analyser"
 msgstr ""
 
-#: src/effects.c:103
+#: src/effects.c:104
 msgid "Analysers"
 msgstr ""
 
-#: src/effects.c:108
+#: src/effects.c:109
 msgid "audio/video"
 msgstr "שמע/וידאו"
 
-#: src/effects.c:109
+#: src/effects.c:110
 msgid "Audio/Video Transitions"
 msgstr "מעברי וידאו\\שמע"
 
-#: src/effects.c:111
+#: src/effects.c:112
 msgid "video only"
 msgstr "וידאו בלבד"
 
-#: src/effects.c:112
+#: src/effects.c:113
 msgid "Video only Transitions"
 msgstr "מעברי וידאו בלבד"
 
-#: src/effects.c:114 src/multitrack.c:10740
+#: src/effects.c:115 src/multitrack.c:10962
 msgid "audio only"
 msgstr "שמע בלבד"
 
-#: src/effects.c:115
+#: src/effects.c:116
 msgid "Audio only Transitions"
 msgstr "מעברי שמע בלבד"
 
-#: src/effects.c:117 src/effects.c:120 src/multitrack.c:18757
+#: src/effects.c:118 src/effects.c:121 src/multitrack.c:19097
 msgid "audio"
 msgstr "שמע"
 
-#: src/effects.c:118
+#: src/effects.c:119
 msgid "Audio Mixers"
 msgstr "מערבלי שמע"
 
-#: src/effects.c:121
+#: src/effects.c:122
 msgid "Audio Effects"
 msgstr "ניהול פרוייקט"
 
-#: src/effects.c:123
+#: src/effects.c:124
 msgid "video"
 msgstr ""
 
-#: src/effects.c:124
+#: src/effects.c:125
 msgid "Video Effects"
 msgstr ""
 
-#: src/effects.c:126
+#: src/effects.c:127
 msgid "audio volume controller"
 msgstr "בקר עוצמת שמע"
 
-#: src/effects.c:127
+#: src/effects.c:128
 msgid "Audio Volume Controllers"
 msgstr "בקרי עוצמת שמע"
 
-#: src/effects.c:129
+#: src/effects.c:130
 msgid "video analyser"
 msgstr ""
 
-#: src/effects.c:130
+#: src/effects.c:131
 msgid "Video analysers"
 msgstr ""
 
-#: src/effects.c:132
+#: src/effects.c:133
 msgid "audio analyser"
 msgstr ""
 
-#: src/effects.c:133
+#: src/effects.c:134
 msgid "Audio Analysers"
 msgstr ""
 
-#: src/effects.c:137 src/plugins.c:2559 src/plugins.c:2573
+#: src/effects.c:138 src/plugins.c:2507 src/plugins.c:2521
 msgid "unknown"
 msgstr "לא ידוע"
 
-#: src/effects.c:238
+#: src/effects.c:235
 #, c-format
 msgid "%s all frames..."
 msgstr "%s כל השקופיות..."
 
-#: src/effects.c:243
+#: src/effects.c:239
 #, c-format
 msgid "%s clipboard into frames %d to %d..."
 msgstr "%s מלוח הגזירים לשקופיות %d ל־%d..."
 
-#: src/effects.c:250
+#: src/effects.c:245
 #, c-format
 msgid "%s to clipboard..."
 msgstr "%s ללוח הגזירים..."
 
-#: src/effects.c:254
+#: src/effects.c:248
 #, c-format
 msgid "%s to new clip..."
 msgstr "%s לקטע חדש..."
 
-#: src/effects.c:259
+#: src/effects.c:252
 #, c-format
 msgid "%s frames %d to %d..."
 msgstr "%s שקופיות %d ל־%d"
 
-#: src/effects.c:290
+#: src/effects.c:283
 #, c-format
 msgid "%s clipboard with selection"
 msgstr "%s לוח הגזירים עם בחירה"
 
-#: src/effects.c:295
+#: src/effects.c:287
 #, c-format
 msgid "%s to clipboard"
 msgstr "%s ללוח הגזירים"
 
-#: src/effects.c:299
+#: src/effects.c:290
 #, c-format
 msgid "%s to new clip"
 msgstr "%s לקטע חדש"
 
-#: src/effects.c:304
+#: src/effects.c:294
 #, c-format
 msgid "%s frames %d to %d"
 msgstr "%s שקופיות %d ל־%d"
 
-#: src/effects.c:456 src/effects.c:523
+#: src/effects.c:443 src/effects.c:507
 msgid ""
 "\n"
 "No frames were generated.\n"
@@ -5853,46 +5867,46 @@
 "\n"
 "לא נוצרו שקופיות.\n"
 
-#: src/effects-weed.c:431
+#: src/effects-weed.c:452
 msgid "integer"
 msgstr ""
 
-#: src/effects-weed.c:432
+#: src/effects-weed.c:454
 msgid "int64"
 msgstr ""
 
-#: src/effects-weed.c:433
+#: src/effects-weed.c:456
 msgid "boolean"
 msgstr ""
 
-#: src/effects-weed.c:434
+#: src/effects-weed.c:458
 msgid "double"
 msgstr ""
 
-#: src/effects-weed.c:435
+#: src/effects-weed.c:460
 msgid "string"
 msgstr ""
 
-#: src/effects-weed.c:436
+#: src/effects-weed.c:462
 msgid "pointer"
 msgstr ""
 
-#: src/effects-weed.c:4591
+#: src/effects-weed.c:4581
 #, c-format
 msgid "Error: plugin %s has no weed_setup() function.\n"
 msgstr "שגיאה: אין לתוסף %s אפשרות weed_setup();\n"
 
-#: src/effects-weed.c:4606
+#: src/effects-weed.c:4595
 #, c-format
 msgid "No usable filters found in plugin %s\n"
 msgstr ""
 
-#: src/effects-weed.c:4680
+#: src/effects-weed.c:4668
 #, c-format
 msgid "Found duplicate plugin %s"
 msgstr ""
 
-#: src/effects-weed.c:4734
+#: src/effects-weed.c:4723
 #, c-format
 msgid ""
 "Info: Unable to load plugin %s\n"
@@ -5901,259 +5915,259 @@
 "מידע: אין אפשרות לטעון את התוסף %s\n"
 "השגיאה הייתה: %s\n"
 
-#: src/effects-weed.c:4737 src/effects-weed.c:5858
+#: src/effects-weed.c:4726 src/effects-weed.c:5847
 msgid "Some plugin directories"
 msgstr ""
 
 #. TRANSLATORS: example " - LADSPA plugins -"
-#: src/effects-weed.c:4812 src/rte_window.c:2105
+#: src/effects-weed.c:4801 src/rte_window.c:2107
 #, c-format
 msgid " - %s plugins -"
 msgstr ""
 
-#: src/effects-weed.c:5012
+#: src/effects-weed.c:4998
 #, c-format
 msgid "Successfully loaded %d Weed filters\n"
 msgstr "%d רכיבי תכנה נטענו בהצלחה\n"
 
-#: src/effects-weed.c:5177
+#: src/effects-weed.c:5162
 #, c-format
 msgid "Invalid compound effect %s - has conflicting target_fps\n"
 msgstr ""
 
-#: src/effects-weed.c:5197
+#: src/effects-weed.c:5182
 #, c-format
 msgid "Invalid compound effect %s - has multiple transition parameters\n"
 msgstr ""
 
-#: src/effects-weed.c:5211
+#: src/effects-weed.c:5196
 #, c-format
 msgid "Invalid compound effect %s - has multiple master volume parameters\n"
 msgstr ""
 
-#: src/effects-weed.c:5346
+#: src/effects-weed.c:5329
 #, c-format
 msgid "Invalid compound effect %s - must have >1 sub filters\n"
 msgstr ""
 
-#: src/effects-weed.c:5366
+#: src/effects-weed.c:5349
 #, c-format
 msgid "Invalid effect %s found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5381
+#: src/effects-weed.c:5364
 #, c-format
 msgid "Invalid default found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5392
+#: src/effects-weed.c:5375
 #, c-format
 msgid "Invalid filter %d for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5406
+#: src/effects-weed.c:5389
 #, c-format
 msgid "Invalid param %d for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5433
+#: src/effects-weed.c:5416
 #, c-format
 msgid ""
 "Invalid number of values for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5467
+#: src/effects-weed.c:5450
 #, c-format
 msgid ""
 "Invalid non-boolean value for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5500
+#: src/effects-weed.c:5483
 #, c-format
 msgid "Invalid param link found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5511
+#: src/effects-weed.c:5494
 #, c-format
 msgid ""
 "Invalid out filter %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5529
+#: src/effects-weed.c:5513
 #, c-format
 msgid ""
 "Invalid out param %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5541
+#: src/effects-weed.c:5526
 #, c-format
 msgid ""
 "Invalid non-boolean value for autoscale found in compound effect %s, line "
 "%d\n"
 msgstr ""
 
-#: src/effects-weed.c:5552
+#: src/effects-weed.c:5537
 #, c-format
 msgid ""
 "Invalid in filter %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5566
+#: src/effects-weed.c:5552
 #, c-format
 msgid ""
 "Invalid in param %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5594
+#: src/effects-weed.c:5581
 #, c-format
 msgid "Invalid channel link found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5605
+#: src/effects-weed.c:5592
 #, c-format
 msgid ""
 "Invalid out filter %d for link channels found in compound effect %s, line "
 "%d\n"
 msgstr ""
 
-#: src/effects-weed.c:5623
+#: src/effects-weed.c:5611
 #, c-format
 msgid ""
 "Invalid out channel %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5633
+#: src/effects-weed.c:5622
 #, c-format
 msgid ""
 "Invalid in filter %d for link channels found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5651
+#: src/effects-weed.c:5641
 #, c-format
 msgid ""
 "Invalid in channel %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5687
+#: src/effects-weed.c:5678
 #, c-format
 msgid "Compound:%s"
 msgstr ""
 
-#: src/effects-weed.c:5758
+#: src/effects-weed.c:5749
 #, c-format
 msgid "Successfully loaded %d compound filters\n"
 msgstr ""
 
-#: src/effects-weed.c:6591
+#: src/effects-weed.c:6570
 #, c-format
 msgid "Effect %s cannot be used with this audio player.\n"
 msgstr ""
 
-#: src/effects-weed.c:6737
+#: src/effects-weed.c:6718
 #, c-format
 msgid "Failed to start instance %s, error code %d\n"
 msgstr "אירעה שגיאה בנסיון להתחלת המופע %s, קוד שגיאה %d\n"
 
-#: src/effects-weed.c:6814
+#: src/effects-weed.c:6797
 #, c-format
 msgid "Unable to start generator %s\n"
 msgstr "אין אפשרות להפעיל את המחולל %s\n"
 
-#: src/effects-weed.c:7621
+#: src/effects-weed.c:7607
 #, c-format
 msgid "Failed to start generator %s\n"
 msgstr "נכשל בנסיון להפעיל את המחולל %s\n"
 
-#: src/effects-weed.c:7718
+#: src/effects-weed.c:7701
 #, c-format
 msgid "Failed to start generator %s, error %d\n"
 msgstr "נכשל בנסיון להפעיל את המחולל %s, שגיאה %d\n"
 
-#: src/effects-weed.c:9012
+#: src/effects-weed.c:8993
 #, c-format
 msgid "%s [unstable] (%s)"
 msgstr ""
 
-#: src/effects-data.c:3278
+#: src/effects-data.c:3234
 #, c-format
 msgid "ACTIVATE (%s)"
 msgstr ""
 
-#: src/effects-data.c:3548
+#: src/effects-data.c:3501
 msgid "ACTIVATE"
 msgstr ""
 
-#: src/effects-data.c:3876
+#: src/effects-data.c:3829
 #, c-format
 msgid "Key slot %d"
 msgstr ""
 
-#: src/effects-data.c:3998
+#: src/effects-data.c:3951
 msgid "Autoscale"
 msgstr ""
 
-#: src/effects-data.c:4089
+#: src/effects-data.c:4042
 msgid "Add another connection for this output parameter"
 msgstr ""
 
-#: src/effects-data.c:4102 src/effects-data.c:4151
+#: src/effects-data.c:4055 src/effects-data.c:4104
 #, fuzzy
 msgid "Delete this connection"
 msgstr "_מחיקת אפקט זה"
 
-#: src/effects-data.c:4138
+#: src/effects-data.c:4091
 msgid "Add another connection for this output channel"
 msgstr ""
 
-#: src/effects-data.c:4223
+#: src/effects-data.c:4176
 msgid "Connected to -->"
 msgstr ""
 
-#: src/effects-data.c:4243
+#: src/effects-data.c:4196
 #, c-format
 msgid "%s - Alpha Channel Connections"
 msgstr ""
 
-#: src/effects-data.c:4316
+#: src/effects-data.c:4269
 #, c-format
 msgid "%s - Parameter Data Connections"
 msgstr ""
 
-#: src/effects-data.c:4336
+#: src/effects-data.c:4289
 msgid "Autoscale All"
 msgstr ""
 
-#: src/effects-data.c:4361 src/effects-data.c:4890
+#: src/effects-data.c:4314 src/effects-data.c:4841
 msgid "ACTIVATED"
 msgstr ""
 
-#: src/effects-data.c:4774
+#: src/effects-data.c:4726
 msgid "LiVES: - Parameter and Alpha Channel Connections"
 msgstr ""
 
-#: src/effects-data.c:4785
+#: src/effects-data.c:4736
 msgid "Auto Connect Channels"
 msgstr ""
 
-#: src/effects-data.c:4797
+#: src/effects-data.c:4748
 msgid "Auto Connect Parameters"
 msgstr ""
 
-#: src/effects-data.c:4807
+#: src/effects-data.c:4758
 msgid "Disconnect All"
 msgstr ""
 
-#: src/effects-data.c:4875
+#: src/effects-data.c:4826
 #, c-format
 msgid "Input channel is already connected from (%d,%d) %s"
 msgstr ""
 
-#: src/effects-data.c:4891
+#: src/effects-data.c:4842
 #, c-format
 msgid "Input parameter is already connected from (%d,%d) %s"
 msgstr ""
 
-#: src/effects-data.c:4899
+#: src/effects-data.c:4851
 msgid "Input and output parameters are not compatible"
 msgstr ""
 
@@ -6165,43 +6179,43 @@
 msgid "_Reset Values"
 msgstr "_איפוס ערכים"
 
-#: src/framedraw.c:267
+#: src/framedraw.c:265
 msgid "_Frame"
 msgstr ""
 
-#: src/paramspecial.c:266
+#: src/paramspecial.c:259
 msgid "Maintain _Aspect Ratio"
 msgstr "אחזקת ה_יחס"
 
-#: src/paramspecial.c:267
+#: src/paramspecial.c:260
 msgid "Maintain aspect ratio of original frame"
 msgstr "אחזקת היחס של השקופית המקורית"
 
-#: src/paramspecial.c:341
+#: src/paramspecial.c:335
 msgid "Display Password"
 msgstr ""
 
-#: src/paramwindow.c:450
+#: src/paramwindow.c:447
 msgid "Transition _In"
 msgstr "מעבר _פנימה"
 
-#: src/paramwindow.c:452
+#: src/paramwindow.c:449
 msgid "Click to set the transition parameter to show only the front frame"
 msgstr ""
 
-#: src/paramwindow.c:474
+#: src/paramwindow.c:472
 msgid "Crossfade audio"
 msgstr "החלת מעבר Crossfade על השמע"
 
-#: src/paramwindow.c:475
+#: src/paramwindow.c:473
 msgid "Check the box to make audio transition with the video"
 msgstr "יש ללחוץ על הקופסה כדי להחיל מעבר שמע עם הוידאו"
 
-#: src/paramwindow.c:493
+#: src/paramwindow.c:492
 msgid "Transition _Out"
 msgstr "מעבר _החוצה"
 
-#: src/paramwindow.c:495
+#: src/paramwindow.c:494
 msgid "Click to set the transition parameter to show only the rear frame"
 msgstr ""
 
@@ -6214,23 +6228,23 @@
 msgid "%s : size"
 msgstr "%s : גודל"
 
-#: src/paramwindow.c:598
+#: src/paramwindow.c:597
 msgid "New size (pixels)"
 msgstr "גודל חדש (פיקסלים)"
 
-#: src/paramwindow.c:617 src/plugins.c:997
+#: src/paramwindow.c:616 src/plugins.c:973
 msgid "_Width"
 msgstr "_רוחב"
 
-#: src/paramwindow.c:636 src/plugins.c:1003
+#: src/paramwindow.c:635 src/plugins.c:979
 msgid "_Height"
 msgstr "_גובה"
 
-#: src/paramwindow.c:684
+#: src/paramwindow.c:683
 msgid "Generate to _Clipboard"
 msgstr "יצירה ל_לוח הגזירים"
 
-#: src/paramwindow.c:686
+#: src/paramwindow.c:685
 msgid "Generate frames to the clipboard"
 msgstr "יצירת שקופיות ללוח הגזירים"
 
@@ -6242,7 +6256,7 @@
 msgid "Generate frames to a new clip"
 msgstr "יצירת שקופיות לקטע חדש"
 
-#: src/paramwindow.c:822
+#: src/paramwindow.c:824
 #, c-format
 msgid ""
 "\n"
@@ -6253,59 +6267,59 @@
 "מחובתך לבחור לפחות %d שקופיות כדי להשתמש באפקט זה.\n"
 "\n"
 
-#: src/paramwindow.c:920 src/paramwindow.c:930
+#: src/paramwindow.c:934 src/paramwindow.c:942
 msgid "Set as default"
 msgstr "קביעה כברירת מחדל"
 
-#: src/paramwindow.c:922 src/paramwindow.c:938
+#: src/paramwindow.c:936 src/paramwindow.c:950
 msgid "Reset"
 msgstr ""
 
-#: src/paramwindow.c:932 src/rte_window.c:2401 src/omc-learn.c:1357
+#: src/paramwindow.c:944 src/rte_window.c:2394 src/omc-learn.c:1347
 msgid "Close _window"
 msgstr "סגירת _חלון"
 
-#: src/paramwindow.c:1337
+#: src/paramwindow.c:1340
 msgid "No parameters"
 msgstr "אין פרמטרים"
 
-#: src/paramwindow.c:1419
+#: src/paramwindow.c:1424
 msgid "Invalid parameter"
 msgstr "פרמטר לא תקין"
 
-#: src/paramwindow.c:1611
+#: src/paramwindow.c:1610
 msgid "LiVES: - Select Colour"
 msgstr "LiVES: - בחירת צבע"
 
-#: src/paramwindow.c:1616
+#: src/paramwindow.c:1615
 msgid "Click to set the colour"
 msgstr "יש ללחוץ כאן כדי לבחור צבע"
 
-#: src/paramwindow.c:1628
+#: src/paramwindow.c:1626
 msgid "_Red"
 msgstr ""
 
-#: src/paramwindow.c:1629
+#: src/paramwindow.c:1627
 msgid "The red value (0 - 255)"
 msgstr "ערך האדום (0 - 255)"
 
-#: src/paramwindow.c:1632
+#: src/paramwindow.c:1630
 msgid "_Green"
 msgstr ""
 
-#: src/paramwindow.c:1633
+#: src/paramwindow.c:1631
 msgid "The green value (0 - 255)"
 msgstr "ערך הירוק(0 - 255)"
 
-#: src/paramwindow.c:1636
+#: src/paramwindow.c:1634
 msgid "_Blue"
 msgstr ""
 
-#: src/paramwindow.c:1637
+#: src/paramwindow.c:1635
 msgid "The blue value (0 - 255)"
 msgstr "ערך הכחול (0 - 255)"
 
-#: src/plugins.c:85
+#: src/plugins.c:86
 #, c-format
 msgid ""
 "\n"
@@ -6314,12 +6328,12 @@
 "\n"
 "שגיאת תוסף: %s נכשל עם הקוד %d"
 
-#: src/plugins.c:87
+#: src/plugins.c:88
 #, c-format
 msgid " : message was %s\n"
 msgstr " : ההודעה הייתה %s\n"
 
-#: src/plugins.c:387
+#: src/plugins.c:375
 #, c-format
 msgid ""
 "\n"
@@ -6334,17 +6348,17 @@
 "%s\n"
 "קוד שגיאה %d\n"
 
-#: src/plugins.c:397
+#: src/plugins.c:385
 #, c-format
 msgid "Updating video playback plugin defaults in %s\n"
 msgstr "מעדכן את ברירות המחדל של נגינת הוידאו ב%s\n"
 
-#: src/plugins.c:452
+#: src/plugins.c:444
 #, c-format
 msgid "Loading video playback plugin defaults from %s..."
 msgstr "טוען את ברירת המחדל של נגינת הוידאו מ%s..."
 
-#: src/plugins.c:515
+#: src/plugins.c:505
 #, c-format
 msgid ""
 "\n"
@@ -6359,32 +6373,32 @@
 "כלים|העדפות|תוספי נגינה מתקדמים\n"
 "\n"
 
-#: src/plugins.c:855
+#: src/plugins.c:836
 #, c-format
 msgid "Saving playback plugin defaults to %s..."
 msgstr ""
 
-#: src/plugins.c:962
+#: src/plugins.c:939
 msgid "_FPS"
 msgstr "_שקופיות לשנייה"
 
-#: src/plugins.c:963
+#: src/plugins.c:940
 msgid "Fixed framerate for plugin.\n"
 msgstr "קצב שקופיות קבוע לתוסף.\n"
 
-#: src/plugins.c:1032
+#: src/plugins.c:1008
 msgid "_Colourspace"
 msgstr "_מרחב צבעים"
 
-#: src/plugins.c:1033
+#: src/plugins.c:1009
 msgid "Colourspace input to the plugin.\n"
 msgstr "קלט מרחב צבעים לתוסף.\n"
 
-#: src/plugins.c:1089
+#: src/plugins.c:1065
 msgid "Save settings to an alternate file.\n"
 msgstr ""
 
-#: src/plugins.c:1206
+#: src/plugins.c:1182
 #, c-format
 msgid ""
 "\n"
@@ -6397,7 +6411,7 @@
 "כשל בנסיון לפתוח את תוסף הנגינה %s\n"
 "השגיאה הייתה %s\n"
 
-#: src/plugins.c:1252
+#: src/plugins.c:1228
 #, c-format
 msgid ""
 "\n"
@@ -6412,7 +6426,7 @@
 "אינו מכיל תכונה הכרחית.\n"
 "לכן,לא ניתן להשתמש בו.\n"
 
-#: src/plugins.c:1265
+#: src/plugins.c:1241
 #, c-format
 msgid ""
 "Video playback plugin failed to initialise.\n"
@@ -6421,7 +6435,7 @@
 "לא ניתן להפעיל את תוסף הנגינה.\n"
 "השגיאה הייתה: %s\n"
 
-#: src/plugins.c:1461
+#: src/plugins.c:1428
 msgid ""
 "\n"
 "Warning ! Video playback plugin will not send key presses. Keyboard may be "
@@ -6431,24 +6445,24 @@
 "אזהרה ! תוסף נגינת הוידאו לא ישלח לחיצות מקשים. המקלדת עלולה להיות מנוטרלת "
 "בזמן השימוש בו !\n"
 
-#: src/plugins.c:1465
+#: src/plugins.c:1433
 #, c-format
 msgid ""
 "*** Using %s plugin for fs playback, agreed to use palette type %d ( %s ). "
 "***\n"
 msgstr "*** שימוש בתוסף %s עבור נגינת fs, מאושר לסוג הלוח %d (%s). ***\n"
 
-#: src/plugins.c:1571
+#: src/plugins.c:1537
 #, c-format
 msgid "Audio stream unable to use preferred format '%s'\n"
 msgstr ""
 
-#: src/plugins.c:1579
+#: src/plugins.c:1543
 #, c-format
 msgid "Using format '%s' instead.\n"
 msgstr ""
 
-#: src/plugins.c:1616
+#: src/plugins.c:1579
 #, c-format
 msgid ""
 "LiVES was unable to find its encoder plugins. Please make sure you have the "
@@ -6457,7 +6471,7 @@
 "or change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/plugins.c:1624
+#: src/plugins.c:1589
 #, c-format
 msgid ""
 "LiVES did not receive a response from the encoder plugin called '%s'.\n"
@@ -6470,11 +6484,11 @@
 "%s%s%s\n"
 "או להחליף לתוסף אחר בכלים|העדפות|קידוד\n"
 
-#: src/plugins.c:2032
+#: src/plugins.c:1987
 msgid "Unable to resize, please install imageMagick\n"
 msgstr "אין אפשרות לשנות גודל, נא להתקין את imageMagick\n"
 
-#: src/plugins.c:2231
+#: src/plugins.c:2183
 #, c-format
 msgid ""
 "\n"
@@ -6482,12 +6496,12 @@
 "No decoders found in %s !\n"
 msgstr ""
 
-#: src/plugins.c:2415
+#: src/plugins.c:2369
 #, fuzzy, c-format
 msgid " using %s"
 msgstr "פותח את %s"
 
-#: src/plugins.c:2499
+#: src/plugins.c:2451
 #, c-format
 msgid ""
 "\n"
@@ -6500,7 +6514,7 @@
 "נכשל בנסיון לפתוח את תוסף המפענח %s\n"
 "השגיאה הייתה %s\n"
 
-#: src/plugins.c:2522
+#: src/plugins.c:2472
 #, c-format
 msgid ""
 "\n"
@@ -6515,24 +6529,24 @@
 "אינו מכיל אפשרות הכרחית.\n"
 "לא ניתן להשתמש בו.\n"
 
-#: src/plugins.c:2564
+#: src/plugins.c:2512
 msgid "/unknown"
 msgstr "\\לא ידוע"
 
-#: src/plugins.c:2651
+#: src/plugins.c:2598
 msgid "LiVES: - Decoder Plugins"
 msgstr ""
 
-#: src/plugins.c:2669
+#: src/plugins.c:2616
 msgid "Enabled Video Decoders (uncheck to disable)"
 msgstr ""
 
-#: src/plugins.c:2726
+#: src/plugins.c:2672
 #, c-format
 msgid "Failed to load %s, transitions may not resize.\n"
 msgstr "נכשל בטעינת %s, המעברים עלולים לא לשנות גודל.\n"
 
-#: src/plugins.c:3854
+#: src/plugins.c:3797
 #, c-format
 msgid "%s advanced settings"
 msgstr "הגדרות %s מתקדמות"
@@ -6541,15 +6555,15 @@
 msgid "LiVES: - New Test RFX"
 msgstr "LiVES: - בדיקת RFX חדשה"
 
-#: src/rfx-builder.c:136
+#: src/rfx-builder.c:135
 msgid "LiVES: - Edit Test RFX"
 msgstr "LiVES: - עריכת בדיקת RFX"
 
-#: src/rfx-builder.c:166
+#: src/rfx-builder.c:165
 msgid "Type:"
 msgstr "סוג:"
 
-#: src/rfx-builder.c:184
+#: src/rfx-builder.c:183
 msgid "tool"
 msgstr ""
 
@@ -6561,124 +6575,124 @@
 msgid "The name of the plugin. No spaces allowed."
 msgstr "שם התוסף. אין להשתמש ברווחים."
 
-#: src/rfx-builder.c:201
+#: src/rfx-builder.c:202
 msgid "Version:       "
 msgstr "גרסה:       "
 
-#: src/rfx-builder.c:203
+#: src/rfx-builder.c:204
 msgid "The script version."
 msgstr "גרסת התסריט."
 
-#: src/rfx-builder.c:210
+#: src/rfx-builder.c:212
 msgid "    Author:       "
 msgstr "    יוצר:       "
 
-#: src/rfx-builder.c:211
+#: src/rfx-builder.c:213
 msgid "The script author."
 msgstr "יוצר התסריט."
 
-#: src/rfx-builder.c:217
+#: src/rfx-builder.c:220
 msgid "    URL (optional):       "
 msgstr "    כתובת אינטרנט (רשות):       "
 
-#: src/rfx-builder.c:218
+#: src/rfx-builder.c:221
 msgid "URL for the plugin maintainer."
 msgstr "כתובת האינטרנט של מתחזק התוסף."
 
-#: src/rfx-builder.c:226
+#: src/rfx-builder.c:230
 msgid "Menu text:    "
 msgstr "טקסט התפריט:    "
 
-#: src/rfx-builder.c:227
+#: src/rfx-builder.c:231
 msgid "The text to show in the menu."
 msgstr "הטקסט להצגה בתפריט."
 
-#: src/rfx-builder.c:239
+#: src/rfx-builder.c:244
 msgid "Action description:        "
 msgstr "תיאור פעולה:        "
 
-#: src/rfx-builder.c:241
+#: src/rfx-builder.c:246
 msgid "Describe what the plugin is doing. E.g. \"Edge detecting\""
 msgstr "מה התוסף עושה. לדוגמה \"זיהוי פינות\""
 
-#: src/rfx-builder.c:246
+#: src/rfx-builder.c:251
 msgid "Minimum frames:"
 msgstr "מספר שקופיות מינימלי:"
 
-#: src/rfx-builder.c:249
+#: src/rfx-builder.c:254
 msgid ""
 "Minimum number of frames this effect/tool can be applied to. Normally 1."
 msgstr "מספר שקופיות מינימלי שניתן להחיל עליהם כלי\\אפקט . בד\"כ 1."
 
-#: src/rfx-builder.c:260
+#: src/rfx-builder.c:265
 msgid "_Requirements..."
 msgstr "_דרישות..."
 
-#: src/rfx-builder.c:263
+#: src/rfx-builder.c:268
 msgid "Enter any binaries required by the plugin."
 msgstr "כל קובץ שנדרש לפעולה תקינה של התוסף."
 
-#: src/rfx-builder.c:267
+#: src/rfx-builder.c:272
 msgid "_Properties..."
 msgstr "_מאפיינים..."
 
-#: src/rfx-builder.c:270
+#: src/rfx-builder.c:275
 msgid "Set properties for the plugin. Optional."
 msgstr "קביעת מאפיינים לתוסף. רשות."
 
-#: src/rfx-builder.c:274
+#: src/rfx-builder.c:279
 msgid "_Parameters..."
 msgstr "_פרמטרים..."
 
-#: src/rfx-builder.c:277
+#: src/rfx-builder.c:282
 msgid "Set up parameters used in pre/loop/post/trigger code. Optional."
 msgstr "קביעת פרמטרים לשימוש ב קוד לפני\\לולאה\\אחרי\\הוגדר. רשות."
 
-#: src/rfx-builder.c:281
+#: src/rfx-builder.c:286
 msgid "Parameter _Window Hints..."
 msgstr "הפרמטר _רמזי חלון..."
 
-#: src/rfx-builder.c:284
+#: src/rfx-builder.c:289
 msgid "Set hints about how to lay out the parameter window. Optional."
 msgstr "קביעת רמזים אודות כיצד להתכונן לפרמטר החלון. רשות."
 
-#: src/rfx-builder.c:290
+#: src/rfx-builder.c:295
 msgid "_Language code:"
 msgstr ""
 
-#: src/rfx-builder.c:291
+#: src/rfx-builder.c:296
 msgid "Language for pre/loop/post/triggers. Optional."
 msgstr "שפה ללפני\\לולאה\\אחרי\\אירועים. רשות."
 
-#: src/rfx-builder.c:300
+#: src/rfx-builder.c:305
 msgid "_Pre loop code..."
 msgstr "קוד _לפני לולאה..."
 
-#: src/rfx-builder.c:303
+#: src/rfx-builder.c:308
 msgid "Code to be executed before the loop. Optional."
 msgstr "קוד שיורץ לפני הלולאה. רשות."
 
-#: src/rfx-builder.c:307
+#: src/rfx-builder.c:312
 msgid "_Loop code..."
 msgstr "קוד _לולאה..."
 
-#: src/rfx-builder.c:310
+#: src/rfx-builder.c:315
 msgid "Loop code to be applied to each frame."
 msgstr "קוד לולאה שיוחל על כל שקופית."
 
-#: src/rfx-builder.c:314
+#: src/rfx-builder.c:319
 msgid "_Post loop code..."
 msgstr "קוד _אחרי לולאה..."
 
-#: src/rfx-builder.c:317
+#: src/rfx-builder.c:322
 msgid "Code to be executed after the loop. Optional."
 msgstr "קוד שיורץ אחרי הלולאה. רשות."
 
-#: src/rfx-builder.c:321
+#: src/rfx-builder.c:326
 msgid "_Trigger code..."
 msgstr "קוד _גורם..."
 
-#: src/rfx-builder.c:324
+#: src/rfx-builder.c:329
 msgid ""
 "Set trigger code for when the parameter window is shown, or when a parameter "
 "is changed. Optional (except for Utilities)."
@@ -6686,7 +6700,7 @@
 "קביעת קוד גורם עבור תרחיש שבו חלון הפרמטרים מוצג, או כאשר פרמטר שונה. רשות "
 "(צפוי לכלי שירות)."
 
-#: src/rfx-builder.c:421
+#: src/rfx-builder.c:426
 #, c-format
 msgid ""
 "\n"
@@ -6701,55 +6715,55 @@
 "%s\n"
 "%s\n"
 
-#: src/rfx-builder.c:544
+#: src/rfx-builder.c:541
 msgid "LiVES: - RFX Requirements"
 msgstr "LiVES: - דרישות RFX"
 
-#: src/rfx-builder.c:548
+#: src/rfx-builder.c:544
 msgid "LiVES: - RFX Parameters"
 msgstr "LiVES: - פרמטרים של RFX"
 
-#: src/rfx-builder.c:552
+#: src/rfx-builder.c:547
 msgid "LiVES: - RFX Parameter Window Hints"
 msgstr "LiVES: - פרמטר רמזי חלון של RFX"
 
-#: src/rfx-builder.c:556
+#: src/rfx-builder.c:550
 msgid "LiVES: - RFX Triggers"
 msgstr "LiVES: - גורמי RFX"
 
-#: src/rfx-builder.c:622
+#: src/rfx-builder.c:613
 msgid "_New Entry"
 msgstr "ערך _חדש"
 
-#: src/rfx-builder.c:625
+#: src/rfx-builder.c:616
 msgid "_Edit Entry"
 msgstr "_עריכת ערך"
 
-#: src/rfx-builder.c:628
+#: src/rfx-builder.c:619
 msgid "_Remove Entry"
 msgstr "_מחיקת ערך"
 
-#: src/rfx-builder.c:632
+#: src/rfx-builder.c:623
 msgid "Move _Up"
 msgstr "הזזה _למעלה"
 
-#: src/rfx-builder.c:635
+#: src/rfx-builder.c:626
 msgid "Move _Down"
 msgstr "הזזה _למטה"
 
-#: src/rfx-builder.c:1004
+#: src/rfx-builder.c:984
 msgid "LiVES: - RFX Properties"
 msgstr "LiVES: - מאפייני RFX"
 
-#: src/rfx-builder.c:1013
+#: src/rfx-builder.c:993
 msgid "_Slow (hint to GUI)"
 msgstr "_איטי (רמז למנשק המשתמש הגרפי)"
 
-#: src/rfx-builder.c:1024
+#: src/rfx-builder.c:1004
 msgid "_Batch mode generator"
 msgstr "מחולל מצב _אצווה"
 
-#: src/rfx-builder.c:1831
+#: src/rfx-builder.c:1790
 msgid ""
 "\n"
 "\n"
@@ -6763,7 +6777,7 @@
 "נא להסיר את הגורם קודם.\n"
 "\n"
 
-#: src/rfx-builder.c:1875
+#: src/rfx-builder.c:1834
 msgid ""
 "\n"
 "\n"
@@ -6775,184 +6789,184 @@
 "גורמים אחדים כוונו.\n"
 "נא לבדוק את קוד הגורם.\n"
 
-#: src/rfx-builder.c:1994
+#: src/rfx-builder.c:1950
 msgid "LiVES: - New RFX Parameter"
 msgstr "LiVES: - פרמטר RFX חדש"
 
-#: src/rfx-builder.c:1997
+#: src/rfx-builder.c:1952
 msgid "LiVES: - Edit RFX Parameter"
 msgstr "LiVES: - עריכת פרמטר RFX"
 
-#: src/rfx-builder.c:2013
+#: src/rfx-builder.c:1968
 msgid "_Name:    "
 msgstr "_שם:    "
 
-#: src/rfx-builder.c:2016
+#: src/rfx-builder.c:1971
 msgid "Name of the parameter, must be unique in the plugin."
 msgstr "שם הפרמטר, חייב להיות יחודי בתוסף."
 
-#: src/rfx-builder.c:2025
+#: src/rfx-builder.c:1981
 msgid "_Label:    "
 msgstr "_תווית:    "
 
-#: src/rfx-builder.c:2028
+#: src/rfx-builder.c:1984
 msgid ""
 "Label to be shown by the parameter. An underscore represents mnemonic "
 "accelerator."
 msgstr "תווית שתוצג ע\"י הפרמטר. ייחודיות מציגה מאיץ זיכרון."
 
-#: src/rfx-builder.c:2039
+#: src/rfx-builder.c:1996
 msgid "_Type:         "
 msgstr "_סוג:         "
 
-#: src/rfx-builder.c:2040
+#: src/rfx-builder.c:1997
 msgid "Parameter type (select from list)."
 msgstr "סוג פרמטר (ניתן לבחירה מרשימה)"
 
-#: src/rfx-builder.c:2073
+#: src/rfx-builder.c:2029
 msgid "Decimal _places: "
 msgstr "_מקומות שבר עשרוני: "
 
-#: src/rfx-builder.c:2082 src/rfx-builder.c:2477 src/rfx-builder.c:2495
+#: src/rfx-builder.c:2038 src/rfx-builder.c:2430 src/rfx-builder.c:2447
 msgid "_Default value:    "
 msgstr "ערך _ברירת מחדל:    "
 
-#: src/rfx-builder.c:2098
+#: src/rfx-builder.c:2054
 msgid "_Default: "
 msgstr "_ברירת מחדל: "
 
-#: src/rfx-builder.c:2132
+#: src/rfx-builder.c:2087
 msgid "Button _Group: "
 msgstr "_קבוצת כפתורים: "
 
-#: src/rfx-builder.c:2134
+#: src/rfx-builder.c:2089
 msgid "A non-zero value can be used to group radio buttons."
 msgstr "ערך גדול מ־0 הניתן לשימוש כדי לקבץ כפתורי רדיו."
 
-#: src/rfx-builder.c:2142 src/rfx-builder.c:2478
+#: src/rfx-builder.c:2097 src/rfx-builder.c:2431
 msgid "_Minimum value: "
 msgstr "ערך _מינימלי: "
 
-#: src/rfx-builder.c:2148 src/rfx-builder.c:2479
+#: src/rfx-builder.c:2103 src/rfx-builder.c:2432
 msgid "Ma_ximum value: "
 msgstr "ערך מקס_ימלי: "
 
-#: src/rfx-builder.c:2157
+#: src/rfx-builder.c:2113
 msgid "     _Step size:   "
 msgstr "     גודל _צעד:   "
 
-#: src/rfx-builder.c:2160
+#: src/rfx-builder.c:2117
 msgid ""
 "How much the parameter is adjusted when the spinbutton arrows are pressed."
 msgstr "כמה הפרמטר מכוון כאשר חצי כפתור הסחרור נלחצים."
 
-#: src/rfx-builder.c:2171
+#: src/rfx-builder.c:2129
 msgid "_Wrap value"
 msgstr ""
 
-#: src/rfx-builder.c:2172
+#: src/rfx-builder.c:2131
 msgid "Whether the value wraps max->min and min->max."
 msgstr "אם הערך גולש לגבול העליון-> דקה ודקה->גבול עליון."
 
-#: src/rfx-builder.c:2470
+#: src/rfx-builder.c:2424
 msgid "Set _values"
 msgstr "קביעת _ערכים"
 
-#: src/rfx-builder.c:2512
+#: src/rfx-builder.c:2463
 msgid "Default _Red:  "
 msgstr "ברירת מחדל של _אדום:  "
 
-#: src/rfx-builder.c:2513
+#: src/rfx-builder.c:2464
 msgid "Default _Green:"
 msgstr "ברירת מחדל של _ירוק:"
 
-#: src/rfx-builder.c:2514
+#: src/rfx-builder.c:2465
 msgid "Default _Blue: "
 msgstr "ברירת מחדל של _כחול: "
 
-#: src/rfx-builder.c:2538
+#: src/rfx-builder.c:2488
 msgid "Set _default"
 msgstr "קביעה כ_ברירת מחדל"
 
-#: src/rfx-builder.c:2540
+#: src/rfx-builder.c:2490
 msgid "Default value:  "
 msgstr "ערך ברירת מחדל  "
 
-#: src/rfx-builder.c:2541
+#: src/rfx-builder.c:2491
 msgid "Maximum length (chars): "
 msgstr "אורך מקסימלי (תווים): "
 
-#: src/rfx-builder.c:2576
+#: src/rfx-builder.c:2526
 msgid "LiVES: - New RFX Parameter Window Hint"
 msgstr "LiVES: - פרמטר RFX חדש של חלון רמז"
 
-#: src/rfx-builder.c:2579
+#: src/rfx-builder.c:2528
 msgid "LiVES: - Edit RFX Parameter Window Hint"
 msgstr "LiVES: - עריכת פרמטר RFX של חלון רמז"
 
-#: src/rfx-builder.c:2622
+#: src/rfx-builder.c:2569
 msgid "_Keyword:         "
 msgstr ""
 
-#: src/rfx-builder.c:2639
+#: src/rfx-builder.c:2586
 msgid "Special _Type:         "
 msgstr ""
 
-#: src/rfx-builder.c:2656
+#: src/rfx-builder.c:2602
 msgid "Special _Subtype:         "
 msgstr ""
 
-#: src/rfx-builder.c:2667 src/rfx-builder.c:2706
+#: src/rfx-builder.c:2613 src/rfx-builder.c:2651
 msgid "Row:    "
 msgstr "שורה:    "
 
-#: src/rfx-builder.c:2732
+#: src/rfx-builder.c:2676
 #, c-format
 msgid "Linked parameters (%d):    "
 msgstr "פרמטרים מקושרים (%d):    "
 
-#: src/rfx-builder.c:2749
+#: src/rfx-builder.c:2693
 msgid "Linked parameters (4):    "
 msgstr "פרמטרים מקושרים (4):    "
 
-#: src/rfx-builder.c:2752
+#: src/rfx-builder.c:2695
 msgid "Linked parameters (2):    "
 msgstr "פרמטרים מקושרים (2):    "
 
-#: src/rfx-builder.c:2777
+#: src/rfx-builder.c:2720
 msgid "LiVES: - New RFX Trigger"
 msgstr "LiVES: - גורם RFX חדש"
 
-#: src/rfx-builder.c:2780
+#: src/rfx-builder.c:2722
 msgid "LiVES: - Edit RFX Trigger"
 msgstr "LiVES: עריכת גורם RFX"
 
-#: src/rfx-builder.c:2808
+#: src/rfx-builder.c:2750
 msgid "When:         "
 msgstr "כאשר:         "
 
-#: src/rfx-builder.c:2904
+#: src/rfx-builder.c:2846
 msgid "LiVES: - Pre Loop Code"
 msgstr "LiVES: - קוד לפני לולאה"
 
-#: src/rfx-builder.c:2911
+#: src/rfx-builder.c:2853
 msgid "LiVES: - Loop Code"
 msgstr "LiVES: - קוד לולאה"
 
-#: src/rfx-builder.c:2918
+#: src/rfx-builder.c:2860
 msgid "LiVES: - Post Loop Code"
 msgstr "LiVES: - קוד אחרי לולאה"
 
-#: src/rfx-builder.c:2931
+#: src/rfx-builder.c:2873
 #, c-format
 msgid "LiVES: - Default text (max length %d)"
 msgstr "LiVES: -(%d טקסט ברירת מחדל (אורך מקסימלי"
 
-#: src/rfx-builder.c:2944
+#: src/rfx-builder.c:2885
 msgid "LiVES: - Enter values, one per line"
 msgstr "LiVES: - הכנסת ערכים, אחד בכל שורה"
 
-#: src/rfx-builder.c:3055
+#: src/rfx-builder.c:2996
 msgid ""
 "\n"
 "\n"
@@ -6962,7 +6976,7 @@
 "\n"
 "אין להכניס שם ריק.\n"
 
-#: src/rfx-builder.c:3060
+#: src/rfx-builder.c:3001
 msgid ""
 "\n"
 "\n"
@@ -6972,7 +6986,7 @@
 "\n"
 "אין להכניס רווחים לשם.\n"
 
-#: src/rfx-builder.c:3065
+#: src/rfx-builder.c:3006
 msgid ""
 "\n"
 "\n"
@@ -6982,7 +6996,7 @@
 "\n"
 "אין להשאיר את טקסט התפריט ריק.\n"
 
-#: src/rfx-builder.c:3071
+#: src/rfx-builder.c:3012
 msgid ""
 "\n"
 "\n"
@@ -6992,7 +7006,7 @@
 "\n"
 "אין להשאיר את תיאור הפעולה ריק.\n"
 
-#: src/rfx-builder.c:3076
+#: src/rfx-builder.c:3017
 msgid ""
 "\n"
 "\n"
@@ -7002,7 +7016,7 @@
 "\n"
 "אין להשאיר את שדה היוצר ריק.\n"
 
-#: src/rfx-builder.c:3085 src/rfx-builder.c:4339
+#: src/rfx-builder.c:3026 src/rfx-builder.c:4253
 msgid ""
 "\n"
 "\n"
@@ -7014,7 +7028,7 @@
 "כבר יש תוסף עם שם זה.\n"
 "השם חייב להיות ייחודי.\n"
 
-#: src/rfx-builder.c:3092
+#: src/rfx-builder.c:3033
 msgid ""
 "\n"
 "\n"
@@ -7024,7 +7038,7 @@
 "\n"
 "לא מומלץ להשאיר את קוד הלולאה ריק.\n"
 
-#: src/rfx-builder.c:3098
+#: src/rfx-builder.c:3039
 msgid ""
 "\n"
 "\n"
@@ -7034,7 +7048,7 @@
 "\n"
 "לא מומלץ להשאיר את קוד הגורם ריק עבור כלי שירות.\n"
 
-#: src/rfx-builder.c:3111
+#: src/rfx-builder.c:3052
 msgid ""
 "\n"
 "\n"
@@ -7044,7 +7058,7 @@
 "\n"
 "אין להשאיר את שם הפרמטר ריק.\n"
 
-#: src/rfx-builder.c:3117
+#: src/rfx-builder.c:3058
 msgid ""
 "\n"
 "\n"
@@ -7057,41 +7071,41 @@
 "אותרו כפילויות בשמות פרמטרים. שמות הפרמטרים חייבים להיות ייחודיים בתוסף.\n"
 "\n"
 
-#: src/rfx-builder.c:3171
+#: src/rfx-builder.c:3111
 #, c-format
 msgid "Writing script file %s..."
 msgstr "כותב קובץ תסריט %s..."
 
-#: src/rfx-builder.c:3477
+#: src/rfx-builder.c:3411
 msgid "No <define> section found in script.\n"
 msgstr "לא נמצא אזור <define> בתסריט.\n"
 
-#: src/rfx-builder.c:3484 src/rfx-builder.c:3493
+#: src/rfx-builder.c:3418 src/rfx-builder.c:3427
 msgid "Bad script version.\n"
 msgstr "גרסת תסריט שגויה.\n"
 
-#: src/rfx-builder.c:3505
+#: src/rfx-builder.c:3439
 msgid "No <name> section found in script.\n"
 msgstr "לא נמצא אזור <name> בתסריט.\n"
 
-#: src/rfx-builder.c:3513
+#: src/rfx-builder.c:3447
 msgid "No <version> section found in script.\n"
 msgstr "לא נמצא אזור <version> בתסריט.\n"
 
-#: src/rfx-builder.c:3522
+#: src/rfx-builder.c:3456
 msgid "No <author> section found in script.\n"
 msgstr "לא נמצא אזור <author> בתסריט.\n"
 
-#: src/rfx-builder.c:3536
+#: src/rfx-builder.c:3470
 msgid "No <description> section found in script.\n"
 msgstr "לא נמצא אזור <description> בתסריט.\n"
 
-#: src/rfx-builder.c:3540
+#: src/rfx-builder.c:3474
 #, c-format
 msgid "Bad description. (%s)\n"
 msgstr "תיאור גרוע (%s)\n"
 
-#: src/rfx-builder.c:3702
+#: src/rfx-builder.c:3627
 #, c-format
 msgid ""
 "\n"
@@ -7106,27 +7120,27 @@
 "נמצא בתסריט.\n"
 "\n"
 
-#: src/rfx-builder.c:3859
+#: src/rfx-builder.c:3780
 msgid "Rebuilding all RFX scripts...builtin..."
 msgstr "בונה מחדש את כל תסריטי ה־RFX...נבנה..."
 
-#: src/rfx-builder.c:3860
+#: src/rfx-builder.c:3781
 msgid "Rebuilding scripts"
 msgstr "בונה מחדש תסריטים"
 
-#: src/rfx-builder.c:3868
+#: src/rfx-builder.c:3789
 msgid "custom..."
 msgstr "מותאם אישית..."
 
-#: src/rfx-builder.c:3872
+#: src/rfx-builder.c:3793
 msgid "test..."
 msgstr "בדיקה..."
 
-#: src/rfx-builder.c:3878
+#: src/rfx-builder.c:3799
 msgid "rebuilding dynamic menu entries..."
 msgstr "בונה מחדש את ערכי התפריטים הפעילים..."
 
-#: src/rfx-builder.c:3905 src/rfx-builder.c:3912
+#: src/rfx-builder.c:3826 src/rfx-builder.c:3834
 #, c-format
 msgid ""
 "\n"
@@ -7139,7 +7153,7 @@
 "ל־LiVES לא הייתה אפשרות למצוא את התוכנה %s.\n"
 "נא לבדוק שתוכנה זו נמצאת בנתיב הנכון וכן בעלת הרשאות הרצה.\n"
 
-#: src/rfx-builder.c:3951
+#: src/rfx-builder.c:3874
 #, c-format
 msgid ""
 "\n"
@@ -7154,12 +7168,12 @@
 "%s ?\n"
 "\n"
 
-#: src/rfx-builder.c:3960
+#: src/rfx-builder.c:3884
 #, c-format
 msgid "Deleting rfx script %s..."
 msgstr "מוחק את תסריט הRFX %s..."
 
-#: src/rfx-builder.c:3980
+#: src/rfx-builder.c:3902
 #, c-format
 msgid ""
 "\n"
@@ -7174,7 +7188,7 @@
 "%s\n"
 "קוד השגיאה היה %d\n"
 
-#: src/rfx-builder.c:4016
+#: src/rfx-builder.c:3938
 #, c-format
 msgid ""
 "\n"
@@ -7189,12 +7203,12 @@
 "כבר קיים.\n"
 "נא למחוק אותו קודם, או לשנות את שם תסריט הבדיקה.\n"
 
-#: src/rfx-builder.c:4027
+#: src/rfx-builder.c:3950
 #, c-format
 msgid "Promoting rfx test plugin %s to custom..."
 msgstr "מקדם את תוסף הבדיקה של rfx %s למותאם אישית..."
 
-#: src/rfx-builder.c:4044
+#: src/rfx-builder.c:3965
 #, c-format
 msgid ""
 "\n"
@@ -7205,20 +7219,20 @@
 "Return code was %d (%s)\n"
 msgstr ""
 
-#: src/rfx-builder.c:4070
+#: src/rfx-builder.c:3990
 msgid "LiVES: - Export Script to..."
 msgstr ""
 
-#: src/rfx-builder.c:4077 src/rfx-builder.c:4156
+#: src/rfx-builder.c:3997 src/rfx-builder.c:4074
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "מעתיק את %s ל%s..."
 
-#: src/rfx-builder.c:4105
+#: src/rfx-builder.c:4024
 msgid "LiVES: Import Script from..."
 msgstr ""
 
-#: src/rfx-builder.c:4148
+#: src/rfx-builder.c:4067
 #, c-format
 msgid ""
 "\n"
@@ -7233,43 +7247,43 @@
 "כבר קיים.\n"
 "נא למחוק אותו קודם, או לשנות את שם תסריט הייבוא.\n"
 
-#: src/rfx-builder.c:4249
+#: src/rfx-builder.c:4166
 msgid "LiVES: - Copy RFX Script"
 msgstr "LiVES: העתקת תסריט RFX"
 
-#: src/rfx-builder.c:4251
+#: src/rfx-builder.c:4168
 msgid "_From type:    "
 msgstr ""
 
-#: src/rfx-builder.c:4258
+#: src/rfx-builder.c:4175
 msgid "   Script:    "
 msgstr "   תסריט:    "
 
-#: src/rfx-builder.c:4267
+#: src/rfx-builder.c:4183
 msgid "LiVES: - Rename test RFX Script"
 msgstr "LiVES: - שינוי שם תסריט RFX"
 
-#: src/rfx-builder.c:4268
+#: src/rfx-builder.c:4184
 msgid "From script: "
 msgstr "מתסריט: "
 
-#: src/rfx-builder.c:4273
+#: src/rfx-builder.c:4188
 msgid "LiVES: - RFX Script name"
 msgstr "LiVES: - שם תסריט RFX"
 
-#: src/rfx-builder.c:4274
+#: src/rfx-builder.c:4189
 msgid "Script name: "
 msgstr "שם תסריט: "
 
-#: src/rfx-builder.c:4294
+#: src/rfx-builder.c:4209
 msgid "New name: "
 msgstr "שם חדש: "
 
-#: src/rfx-builder.c:4297
+#: src/rfx-builder.c:4212
 msgid "New script name: "
 msgstr "שם תסריט חדש: "
 
-#: src/rfx-builder.c:4372
+#: src/rfx-builder.c:4286
 msgid ""
 "\n"
 "\n"
@@ -7281,12 +7295,12 @@
 "כבר יש תסריט בדיקה עם שם זה.\n"
 "שם התסריט חייב להיות ייחודי.\n"
 
-#: src/rfx-builder.c:4384
+#: src/rfx-builder.c:4297
 #, c-format
 msgid "Renaming RFX test script %s to %s..."
 msgstr "משנה את שם תסריט  בדיקת הRFX %s ל%s..."
 
-#: src/rfx-builder.c:4390
+#: src/rfx-builder.c:4302
 #, c-format
 msgid ""
 "\n"
@@ -7303,21 +7317,21 @@
 "%s\n"
 "הקוד שהוחזר היה %d\n"
 
-#: src/rfx-builder.c:4610
+#: src/rfx-builder.c:4518
 msgid "_Apply Real Time Effects to Selection"
 msgstr "_החלת אפקטים בזמן אמת על הבחירה"
 
-#: src/rfx-builder.c:4664
+#: src/rfx-builder.c:4572
 #, c-format
 msgid "Loading rendered effect %s..."
 msgstr "טוען אפקט מוכן %s..."
 
-#: src/rfx-builder.c:4766
+#: src/rfx-builder.c:4674
 msgid ""
 "See: VJ - show VJ keys. Set the realtime effects, and then apply them here."
 msgstr "ניתן לראות: VJ - הצגת מקשי VJ. קביעת אפקטים בזמן אמת והחלתם כאן."
 
-#: src/preferences.c:359
+#: src/preferences.c:351
 msgid ""
 "\n"
 "\n"
@@ -7329,7 +7343,7 @@
 "תוספי נגינת הוידאו מופעלים רק במצב\n"
 "מסך מלא וחלון נפרד (fs)\n"
 
-#: src/preferences.c:408
+#: src/preferences.c:400
 msgid ""
 "\n"
 "\n"
@@ -7337,7 +7351,7 @@
 "(Free space = UNKNOWN)"
 msgstr ""
 
-#: src/preferences.c:412
+#: src/preferences.c:403
 #, c-format
 msgid ""
 "\n"
@@ -7346,14 +7360,14 @@
 "(Free space = %s)"
 msgstr ""
 
-#: src/preferences.c:416
+#: src/preferences.c:408
 msgid ""
 "The temp directory is LiVES working directory where opened clips and sets "
 "are stored.\n"
 "It should be in a partition with plenty of free disk space.\n"
 msgstr ""
 
-#: src/preferences.c:784
+#: src/preferences.c:839
 #, c-format
 msgid ""
 "Unable to create or write to the new temporary directory.\n"
@@ -7364,7 +7378,7 @@
 "The directory will not be changed now.\n"
 msgstr ""
 
-#: src/preferences.c:786
+#: src/preferences.c:843
 #, c-format
 msgid ""
 "Unable to create or write to the new temporary directory.\n"
@@ -7374,7 +7388,7 @@
 "The directory will not be changed now.\n"
 msgstr ""
 
-#: src/preferences.c:798
+#: src/preferences.c:856
 msgid ""
 "You have chosen to change the temporary directory.\n"
 "Please make sure you have no other copies of LiVES open.\n"
@@ -7392,7 +7406,7 @@
 "\n"
 "לחילופין, ניתן ללחוץ על ביטול כדי לשחזר את התיקייה הזמנית להגדרתה המקורית."
 
-#: src/preferences.c:1169
+#: src/preferences.c:1221
 msgid ""
 "\n"
 "Unable to switch audio players to jack - jackd must be installed first.\n"
@@ -7402,7 +7416,7 @@
 "לא ניתן להחליף את נגן השמע לjack - jackd חייב להיות מותקן קודם.\n"
 "למידע נוסף, ניתן להיכנס לאתר http://jackaudio.org\n"
 
-#: src/preferences.c:1175
+#: src/preferences.c:1226
 msgid ""
 "\n"
 "Switching audio players requires restart (jackd must not be running)\n"
@@ -7410,7 +7424,7 @@
 "\n"
 "החלפת נגן השמע מחייבת הפעלה מחדש (אסור שjackd ירוץ)\n"
 
-#: src/preferences.c:1202
+#: src/preferences.c:1253
 msgid ""
 "\n"
 "Unable to switch audio players to pulse audio\n"
@@ -7422,399 +7436,399 @@
 "חובה להתקין את pulseaudio קודם.\n"
 "למידע נוסף: http://www.pulseaudio.org\n"
 
-#: src/preferences.c:1502
+#: src/preferences.c:1544
 msgid "PCM (highest quality; largest files)"
 msgstr "PCM(האיכות הגבוהה ביותר; הקבצים הגדולים ביותר)"
 
-#: src/preferences.c:2063
+#: src/preferences.c:2096
 msgid "LiVES: - Preferences"
 msgstr "LiVES: - העדפות"
 
-#: src/preferences.c:2142
+#: src/preferences.c:2177
 msgid "Open file selection maximised"
 msgstr "פתיחת בחירת קובץ בגודל מלא"
 
-#: src/preferences.c:2149
+#: src/preferences.c:2184
 msgid "Show recent files in the File menu"
 msgstr "הצגת הקבצים האחרונים בתפריט הקובץ"
 
-#: src/preferences.c:2158
+#: src/preferences.c:2193
 msgid "Stop screensaver on playback    "
 msgstr "הפסקת שומר המסך בעת נגינה    "
 
-#: src/preferences.c:2165
+#: src/preferences.c:2200
 msgid "Open main window maximised"
 msgstr "פתיחת החלון הראשי בגודל מלא"
 
-#: src/preferences.c:2173
+#: src/preferences.c:2208
 msgid "Show toolbar when background is blanked"
 msgstr "הצגת סרגל הכלים כשהרקע ריק"
 
-#: src/preferences.c:2181
+#: src/preferences.c:2216
 msgid "Allow mouse wheel to switch clips"
 msgstr "מתן אפשרות  להחלפת קטעים באמצעות גלגלת העכבר"
 
-#: src/preferences.c:2192
+#: src/preferences.c:2227
 msgid "Shrink previews to fit in interface"
 msgstr ""
 
-#: src/preferences.c:2202
+#: src/preferences.c:2237
 msgid "Startup mode:"
 msgstr "מצב עלייה:"
 
-#: src/preferences.c:2206
+#: src/preferences.c:2241
 msgid "_Clip editor"
 msgstr "_עורך קטעים"
 
-#: src/preferences.c:2210
+#: src/preferences.c:2245
 msgid "_Multitrack mode"
 msgstr "_מצב מרובה רצועות"
 
-#: src/preferences.c:2234
+#: src/preferences.c:2268
 msgid "Multi-head support"
 msgstr "תמיכה בריבוי צגים"
 
-#: src/preferences.c:2242
+#: src/preferences.c:2276
 msgid " monitor number for LiVES interface"
 msgstr " מספר צגים עבור הממשק של LiVES"
 
-#: src/preferences.c:2248
+#: src/preferences.c:2282
 msgid " monitor number for playback"
 msgstr " מספר צגים לנגינה"
 
-#: src/preferences.c:2260
+#: src/preferences.c:2294
 msgid ""
 "A setting of 0 means use all available monitors (only works with some "
 "playback plugins)."
 msgstr ""
 
-#: src/preferences.c:2270
+#: src/preferences.c:2304
 msgid "Force single monitor"
 msgstr "הכרחת שימוש בצג בודד"
 
-#: src/preferences.c:2271
+#: src/preferences.c:2305
 msgid "Ignore all except the first monitor."
 msgstr ""
 
-#: src/preferences.c:2293
+#: src/preferences.c:2327
 msgid "Show clip thumbnails during playback"
 msgstr ""
 
-#: src/preferences.c:2306
+#: src/preferences.c:2340
 msgid "GUI"
 msgstr "מנשק"
 
-#: src/preferences.c:2321
+#: src/preferences.c:2355
 msgid "When entering Multitrack mode:"
 msgstr "כאשר נכנסים למצב המרובה־רצועות:"
 
-#: src/preferences.c:2330
+#: src/preferences.c:2364
 msgid "_Prompt me for width, height, fps and audio settings"
 msgstr "_מתן אפשרות לקבוע  רוחב, גובה, שקופיות לשנייה והגדרות שמע"
 
-#: src/preferences.c:2336
+#: src/preferences.c:2370
 msgid "_Always use the following values:"
 msgstr "_שימוש בערכים הבאים:"
 
-#: src/preferences.c:2345
+#: src/preferences.c:2379
 msgid "Use these same _values for rendering a new clip"
 msgstr "שימוש באותם _ערכים עבור עיבוד הוידאו והשמע לקטע חדש"
 
-#: src/preferences.c:2370
+#: src/preferences.c:2404
 msgid "_Width           "
 msgstr "_רוחב           "
 
-#: src/preferences.c:2375
+#: src/preferences.c:2409
 msgid "          _Height      "
 msgstr "          _גובה      "
 
-#: src/preferences.c:2379
+#: src/preferences.c:2413
 msgid "          _FPS"
 msgstr ""
 
-#: src/preferences.c:2387
+#: src/preferences.c:2421
 msgid "Enable backing audio track"
 msgstr "הצגת רצועת מוזיקת רקע"
 
-#: src/preferences.c:2394
+#: src/preferences.c:2428
 msgid "Audio track per video track"
 msgstr "רצועת שמע לכל רצועת וידאו"
 
-#: src/preferences.c:2423
+#: src/preferences.c:2457
 msgid "    _Undo buffer size (MB)    "
 msgstr "    _ביטול גודל החוצץ (מ\"ב)    "
 
-#: src/preferences.c:2432
+#: src/preferences.c:2466
 msgid "_Exit multitrack mode after rendering"
 msgstr "_יציאה ממצב מרובה־רצועות אחרי עיבוד תמונה ושמע"
 
-#: src/preferences.c:2440
+#: src/preferences.c:2474
 msgid "Auto backup layouts"
 msgstr "גיבוי פריסות אוטומטי"
 
-#: src/preferences.c:2445
+#: src/preferences.c:2479
 msgid "_Every"
 msgstr "_בכל"
 
-#: src/preferences.c:2453
+#: src/preferences.c:2487
 msgid "seconds"
 msgstr "שניות"
 
-#: src/preferences.c:2461
+#: src/preferences.c:2495
 msgid "After every _change"
 msgstr "לאחר כל _שינוי"
 
-#: src/preferences.c:2467
+#: src/preferences.c:2501
 msgid "_Never"
 msgstr "_לעולם לא"
 
-#: src/preferences.c:2490
+#: src/preferences.c:2523
 msgid "Multitrack/Render"
 msgstr "ריבוי רצועות\\עיבוד תמונה ושמע"
 
-#: src/preferences.c:2508
+#: src/preferences.c:2541
 msgid "Use instant opening when possible"
 msgstr "שימוש בפתיחה מיידית כשהדבר אפשרי"
 
-#: src/preferences.c:2509
+#: src/preferences.c:2543
 msgid "Enable instant opening of some file types using decoder plugins"
 msgstr "אפשור פתיחה מיידית של סוגי קבצים מסויימים בעזרת תוספים למפענח"
 
-#: src/preferences.c:2531
+#: src/preferences.c:2567
 msgid "Video open command (fallback)"
 msgstr ""
 
-#: src/preferences.c:2543
+#: src/preferences.c:2579
 msgid "Open/render compression"
 msgstr ""
 
-#: src/preferences.c:2546
+#: src/preferences.c:2582
 msgid " %     ( lower = slower, larger files; for jpeg, higher quality )"
 msgstr ""
 " % ( נמוך יותר = איטי יותר, קבצים גדולים יותר; ל־jpeg, איכות גבוהה יותר )"
 
-#: src/preferences.c:2558
+#: src/preferences.c:2594
 msgid "Default image format"
 msgstr ""
 
-#: src/preferences.c:2562
+#: src/preferences.c:2598
 msgid "_jpeg"
 msgstr "_jpeg"
 
-#: src/preferences.c:2565
+#: src/preferences.c:2601
 msgid "_png"
 msgstr "_png"
 
-#: src/preferences.c:2572
+#: src/preferences.c:2608
 msgid "(Check Help/Troubleshoot to see which image formats are supported)"
 msgstr "עמרי"
 
-#: src/preferences.c:2580
+#: src/preferences.c:2616
 msgid "Enable automatic deinterlacing when possible"
 msgstr "אפשור פירוק אוטומטי כשהדבר אפשרי"
 
-#: src/preferences.c:2582
+#: src/preferences.c:2619
 msgid "Automatically deinterlace frames when a plugin suggests it"
 msgstr "אפשור פירוק שקופיות כאשר תוסף מבקש זאת"
 
-#: src/preferences.c:2593
+#: src/preferences.c:2632
 #, fuzzy
 msgid "Automatic trimming / padding of audio when possible"
 msgstr "אפשור פירוק אוטומטי כשהדבר אפשרי"
 
-#: src/preferences.c:2595
+#: src/preferences.c:2634
 #, fuzzy
 msgid "Automatically trim or pad audio when a plugin suggests it"
 msgstr "אפשור פירוק שקופיות כאשר תוסף מבקש זאת"
 
-#: src/preferences.c:2606
+#: src/preferences.c:2646
 msgid "Ignore blank borders when possible"
 msgstr ""
 
-#: src/preferences.c:2608
+#: src/preferences.c:2648
 msgid "Clip any blank borders from frames where possible"
 msgstr ""
 
-#: src/preferences.c:2619
+#: src/preferences.c:2660
 msgid "When opening multiple files, concatenate images into one clip"
 msgstr "בפתיחת קבצים מרובים, יש לאחד את התמונות לקטע אחד"
 
-#: src/preferences.c:2629
+#: src/preferences.c:2670
 msgid "Decoding"
 msgstr "פענוח"
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:2652
+#: src/preferences.c:2693
 msgid "Low - can improve performance on slower machines"
 msgstr "נמוך - יכול לשפר את הביצועים במחשבים איטיים יותר"
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:2654
+#: src/preferences.c:2695
 msgid "Normal - recommended for most users"
 msgstr "רגיל - מומלץ לרוב המשתמשים"
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:2656
+#: src/preferences.c:2697
 msgid "High - can improve quality on very fast machines"
 msgstr "גבוה - יכול לשפר את האיכות במחשבים מהירים מאד"
 
-#: src/preferences.c:2659
+#: src/preferences.c:2700
 msgid "Preview _quality"
 msgstr "_איכות תצוגה"
 
-#: src/preferences.c:2660
+#: src/preferences.c:2701
 msgid "The preview quality for video playback - affects resizing"
 msgstr "איכות תצוגת נגינת הוידאו - משפיע על שינויי גודל"
 
-#: src/preferences.c:2675
+#: src/preferences.c:2717
 msgid "_Show FPS statistics"
 msgstr "הצגת נתונים סטטיסטיים לגבי השקופיות לשנייה"
 
-#: src/preferences.c:2694
+#: src/preferences.c:2736
 msgid "_Plugin"
 msgstr "_תוסף"
 
-#: src/preferences.c:2718
+#: src/preferences.c:2760
 msgid "Stream audio"
 msgstr ""
 
-#: src/preferences.c:2721
+#: src/preferences.c:2763
 msgid "Stream audio to playback plugin"
 msgstr ""
 
-#: src/preferences.c:2734
+#: src/preferences.c:2778
 msgid "Record player output"
 msgstr ""
 
-#: src/preferences.c:2737
+#: src/preferences.c:2781
 msgid "Record output from player instead of input to player"
 msgstr ""
 
-#: src/preferences.c:2744
+#: src/preferences.c:2789
 msgid "VIDEO"
 msgstr "וידאו"
 
-#: src/preferences.c:2787
+#: src/preferences.c:2833
 msgid "_Player"
 msgstr "_נגן"
 
-#: src/preferences.c:2792
+#: src/preferences.c:2838
 msgid "(See also the Jack Integration tab for jack startup options)"
 msgstr ""
 
-#: src/preferences.c:2819
+#: src/preferences.c:2865
 msgid "mplayer"
 msgstr "mplayer"
 
-#: src/preferences.c:2830
+#: src/preferences.c:2876
 #, fuzzy
 msgid "mplayer2"
 msgstr "mplayer"
 
-#: src/preferences.c:2833
+#: src/preferences.c:2879
 msgid "Audio play _command"
 msgstr "_פקודת נגינת שמע"
 
-#: src/preferences.c:2840
+#: src/preferences.c:2886
 msgid "- internal -"
 msgstr "- פנימי -"
 
-#: src/preferences.c:2849
+#: src/preferences.c:2895
 msgid "Audio follows video _rate/direction"
 msgstr "התאמת השמע ל_קצב\\כיוון הוידאו"
 
-#: src/preferences.c:2857
+#: src/preferences.c:2903
 msgid "Audio follows _clip switches"
 msgstr "התאמת השמע למיתוג _קטעים"
 
-#: src/preferences.c:2864
+#: src/preferences.c:2910
 msgid "Source:"
 msgstr ""
 
-#: src/preferences.c:2868
+#: src/preferences.c:2914
 msgid "_Internal"
 msgstr ""
 
-#: src/preferences.c:2873
+#: src/preferences.c:2919
 msgid "_External (requires jack or pulse audio player)"
 msgstr ""
 
-#: src/preferences.c:2892
+#: src/preferences.c:2940
 msgid "AUDIO"
 msgstr "שמע"
 
-#: src/preferences.c:2902
+#: src/preferences.c:2950
 msgid "Playback"
 msgstr "נגינה"
 
-#: src/preferences.c:2925
+#: src/preferences.c:2973
 msgid ""
 "Record audio when capturing an e_xternal window\n"
 " (requires jack or pulse audio)"
 msgstr ""
 
-#: src/preferences.c:2940
+#: src/preferences.c:2988
 msgid "      What to record when 'r' is pressed   "
 msgstr "      מה להקליט כאשר 'r' נלחץ   "
 
-#: src/preferences.c:2949
+#: src/preferences.c:2997
 msgid "_Frame changes"
 msgstr "שינויי _שקופיות"
 
-#: src/preferences.c:2964
+#: src/preferences.c:3012
 msgid "F_PS changes"
 msgstr "שינויי ש_קופיות לשנייה"
 
-#: src/preferences.c:2982
+#: src/preferences.c:3030
 msgid "_Real time effects"
 msgstr "אפקטים בזמן _אמת"
 
-#: src/preferences.c:2993
+#: src/preferences.c:3041
 msgid "_Clip switches"
 msgstr "החלפה בין _קטעים"
 
-#: src/preferences.c:3004
+#: src/preferences.c:3052
 msgid "_Audio (requires jack or pulse audio player)"
 msgstr ""
 
-#: src/preferences.c:3024
+#: src/preferences.c:3072
 msgid "Pause recording if free disk space falls below"
 msgstr ""
 
 #. TRANSLATORS: gigabytes
-#: src/preferences.c:3030
+#: src/preferences.c:3078
 msgid "GB"
 msgstr "ג\"ב"
 
-#: src/preferences.c:3037
+#: src/preferences.c:3085
 msgid "Recording"
 msgstr "מקליט"
 
-#: src/preferences.c:3055
+#: src/preferences.c:3103
 msgid "Encoder"
 msgstr ""
 
-#: src/preferences.c:3090
+#: src/preferences.c:3137
 msgid "Output format"
 msgstr "סוג קובץ פלט"
 
-#: src/preferences.c:3106
+#: src/preferences.c:3153
 msgid "Audio codec"
 msgstr "מקודד שמע"
 
-#: src/preferences.c:3119
+#: src/preferences.c:3165
 msgid "Encoding"
 msgstr "מקודד"
 
-#: src/preferences.c:3134
+#: src/preferences.c:3180
 msgid "Use _antialiasing when resizing"
 msgstr "שימוש ב_החלקת עקומות בעת שינויי גודל"
 
-#: src/preferences.c:3143
+#: src/preferences.c:3189
 msgid "Number of _real time effect keys"
 msgstr "מספר מקשי אפקטים בזמן _אמת"
 
-#: src/preferences.c:3145
+#: src/preferences.c:3192
 msgid ""
 "The number of \"virtual\" real time effect keys. They can be controlled "
 "through the real time effects window, or via network (OSC)."
@@ -7822,176 +7836,176 @@
 "מספר מקשים \"מדומים\" של אפקטים בזמן אמת. ניתן לשלוט בהם דרך חלון האפקטים "
 "בזמן אמת, או דרך הרשת (OSC)."
 
-#: src/preferences.c:3152
+#: src/preferences.c:3199
 msgid "Use _threads where possible when applying effects"
 msgstr ""
 
-#: src/preferences.c:3159
+#: src/preferences.c:3207
 msgid "Number of _threads"
 msgstr ""
 
-#: src/preferences.c:3172
+#: src/preferences.c:3221
 msgid "Restart is required if any of the following paths are changed:"
 msgstr ""
 
-#: src/preferences.c:3182
+#: src/preferences.c:3231
 msgid "Weed plugin path"
 msgstr ""
 
-#: src/preferences.c:3184
+#: src/preferences.c:3234
 msgid "Frei0r plugin path"
 msgstr ""
 
-#: src/preferences.c:3186
+#: src/preferences.c:3237
 msgid "LADSPA plugin path"
 msgstr ""
 
-#: src/preferences.c:3209
+#: src/preferences.c:3261
 msgid "      Video load directory (default)      "
 msgstr "      תיקיית טעינת וידאו (ברירת מחדל)      "
 
-#: src/preferences.c:3215
+#: src/preferences.c:3267
 msgid "      Video save directory (default) "
 msgstr "      תיקיית שמירת וידאו (ברירת מחדל) "
 
-#: src/preferences.c:3221
+#: src/preferences.c:3273
 msgid "      Audio load directory (default) "
 msgstr "      תיקיית טעינת שמע (ברירת מחדל) "
 
-#: src/preferences.c:3227
+#: src/preferences.c:3279
 msgid "      Image directory (default) "
 msgstr "      תיקיית תמונה (ברירת מחדל) "
 
-#: src/preferences.c:3233
+#: src/preferences.c:3285
 msgid "      Backup/Restore directory (default) "
 msgstr "      גיבוי\\שחזור תיקייה (ברירת מחדל) "
 
-#: src/preferences.c:3239
+#: src/preferences.c:3291
 msgid "      Temp directory (do not remove) "
 msgstr "      תיקייה זמנית (אין להסירה) "
 
-#: src/preferences.c:3252
+#: src/preferences.c:3304
 msgid "The default directory for loading video clips from"
 msgstr "תיקיית ברירת המחדל ממנה טוענים קטעים"
 
-#: src/preferences.c:3277
+#: src/preferences.c:3329
 msgid "The default directory for saving encoded clips to"
 msgstr "תיקיית ברירת המחדל לשמירת קטעים מקודדים."
 
-#: src/preferences.c:3285
+#: src/preferences.c:3337
 msgid "The default directory for loading and saving audio"
 msgstr "תיקיית ברירת המחדל לטעינת ושמירת שמע"
 
-#: src/preferences.c:3293
+#: src/preferences.c:3345
 msgid "The default directory for saving frameshots to"
 msgstr "תיקיית ברירת המחדל לשמירת תצלומי שקופיות"
 
-#: src/preferences.c:3301
+#: src/preferences.c:3353
 msgid "The default directory for backing up/restoring single clips"
 msgstr "תיקיית ברירת המחדל לגיבוי\\שחזור קטעים בודדים"
 
-#: src/preferences.c:3309
+#: src/preferences.c:3361
 msgid "LiVES working directory."
 msgstr "תיקיית העבודה של LiVES."
 
-#: src/preferences.c:3359
+#: src/preferences.c:3412
 msgid "Directories"
 msgstr "תיקיות"
 
-#: src/preferences.c:3374
+#: src/preferences.c:3427
 msgid "Warn if diskspace falls below: "
 msgstr ""
 
-#: src/preferences.c:3380 src/preferences.c:3394
+#: src/preferences.c:3433 src/preferences.c:3447
 msgid " MB [set to 0 to disable]"
 msgstr ""
 
-#: src/preferences.c:3389
+#: src/preferences.c:3442
 msgid "Diskspace critical level: "
 msgstr ""
 
-#: src/preferences.c:3407
+#: src/preferences.c:3461
 msgid ""
 "Warn on Insert / Merge if _frame rate of clipboard does not match frame rate "
 "of selection"
 msgstr "אזהרה בהוספה\\מיזוג אם קצב ה_שקופיות לא מתאים לקצב של הבחירה"
 
-#: src/preferences.c:3417
+#: src/preferences.c:3471
 msgid "Warn on Open if file _size exceeds "
 msgstr "הצגת אזהרה בפתיחה אם _גודל הקובץ עובר את "
 
-#: src/preferences.c:3425
+#: src/preferences.c:3479
 msgid " MB"
 msgstr " מ\"ב"
 
-#: src/preferences.c:3432
+#: src/preferences.c:3486
 msgid "Show a warning before saving a se_t"
 msgstr "הצגת אזהרה לפני שמירת א_וסף"
 
-#: src/preferences.c:3442
+#: src/preferences.c:3496
 msgid ""
 "Show a warning if _mplayer/mplayer2, sox, composite or convert is not found "
 "when LiVES is started."
 msgstr ""
 
-#: src/preferences.c:3452
+#: src/preferences.c:3506
 msgid "Show a warning if no _rendered effects are found at startup."
 msgstr "הצגת אזהרה אם לא נמצאו אפקטים _מוכנים בהפעלה."
 
-#: src/preferences.c:3464
+#: src/preferences.c:3518
 msgid "Show a warning if no _encoder plugins are found at startup."
 msgstr "הצגת אזהרה אם לא נמצאו תוספים _למקודד בהפעלה."
 
-#: src/preferences.c:3474
+#: src/preferences.c:3528
 msgid "Show a warning if a _duplicate set name is entered."
 msgstr "הצגת אזהרה אם ישנה _כפילות בשם האוסף שהוכנס."
 
-#: src/preferences.c:3485
+#: src/preferences.c:3539
 msgid "When a set is loaded, warn if clips are missing from _layouts."
 msgstr "הצגת אזהרה לגבי קטעים חסרים ב_פריסות כשאוסף נטען."
 
-#: src/preferences.c:3495
+#: src/preferences.c:3550
 msgid "Warn if a clip used in a layout is about to be closed."
 msgstr "הצגת אזהרה אם קטע שנמצא באחת הפריסות עומד להיסגר."
 
-#: src/preferences.c:3505
+#: src/preferences.c:3561
 msgid "Warn if frames used in a layout are about to be deleted."
 msgstr "הצגת אזהרה אם שקופיות הנמצאות בשימוש ע\"י פריסה עומדות להימחק."
 
-#: src/preferences.c:3515
+#: src/preferences.c:3572
 msgid "Warn if frames used in a layout are about to be shifted."
 msgstr "הצגת אזהרה אם שקופיות הנמצאות בשימוש ע\"י פריסה עומדים לזוז."
 
-#: src/preferences.c:3525
+#: src/preferences.c:3583
 msgid "Warn if frames used in a layout are about to be altered."
 msgstr "הצגת אזהרה אם השקופיות הנמצאות בשימוש ע\"י פריסה עומדות להשתנות."
 
-#: src/preferences.c:3535
+#: src/preferences.c:3594
 msgid "Warn if audio used in a layout is about to be deleted."
 msgstr "הצגת אזהרה אם שמע הנמצא בשימוש ע\"י פריסה עומד להימחק."
 
-#: src/preferences.c:3546
+#: src/preferences.c:3606
 msgid "Warn if audio used in a layout is about to be shifted."
 msgstr "הצגת אזהרה אם שמע הנמצא בשימוש בפריסה עומד לזוז."
 
-#: src/preferences.c:3556
+#: src/preferences.c:3617
 msgid "Warn if audio used in a layout is about to be altered."
 msgstr "הצגת אזהרה אם שמע הנמצא בשימוש בפריסה עומד להשתנות."
 
-#: src/preferences.c:3566
+#: src/preferences.c:3628
 msgid "Popup layout errors after clip changes."
 msgstr ""
 
-#: src/preferences.c:3577
+#: src/preferences.c:3639
 msgid "Warn if the layout has not been saved when leaving multitrack mode."
 msgstr "הצגת אזהרה אם הפריסה לא נשמרה בעת יציאה ממצב ריבוי הרצועות"
 
-#: src/preferences.c:3588
+#: src/preferences.c:3650
 msgid ""
 "Warn if multitrack has no audio channels, and a layout with audio is loaded."
 msgstr "הצגת אזהרה אם ריבוי הרצועות אינו מכיל ערוצי שמע, ופריסה עם שמע נטענה."
 
-#: src/preferences.c:3598
+#: src/preferences.c:3660
 msgid ""
 "Warn if multitrack has audio channels, and your audio player is not \"jack\" "
 "or \"pulse audio\"."
@@ -7999,225 +8013,225 @@
 "הזהר אם ריבוי הרצועות מכיל ערוצי שמע ונגן השמע שלך אינו \"jack\" או \"pulse "
 "audio\"."
 
-#: src/preferences.c:3610
+#: src/preferences.c:3672
 msgid "Show info message after importing from firewire device."
 msgstr "הצגת הודעת מידע אחרי ייבוא מהתקן firewire"
 
-#: src/preferences.c:3626
+#: src/preferences.c:3688
 msgid "Show a warning before opening a yuv4mpeg stream (advanced)."
 msgstr "הצגת אזהרה לפני פתיחת זרימת yuv4mpeg (מתקדם)."
 
-#: src/preferences.c:3639
+#: src/preferences.c:3701
 msgid "Show a warning when multitrack is low on backup space."
 msgstr "הצגת אזהרה כשריבוי הרצועות דל בשטח גיבוי."
 
-#: src/preferences.c:3650
+#: src/preferences.c:3713
 msgid "Show a warning advising cleaning of disk space after a crash."
 msgstr "הצג אזהרה מייעץ ניקוי שטח דיסק לאחר התרסקות."
 
-#: src/preferences.c:3661
+#: src/preferences.c:3725
 msgid "Show a warning if unable to connect to pulseaudio player."
 msgstr ""
 
-#: src/preferences.c:3673
+#: src/preferences.c:3737
 #, fuzzy
 msgid "Show a warning before wiping a layout which has unsaved changes."
 msgstr "הצגת אזהרה לפני פתיחת זרימת yuv4mpeg (מתקדם)."
 
-#: src/preferences.c:3685
+#: src/preferences.c:3749
 msgid "Warnings"
 msgstr "אזהרות"
 
-#: src/preferences.c:3703
+#: src/preferences.c:3767
 msgid "Midi synch (requires the files midistart and midistop)"
 msgstr "סינכרון Midi (מחייב את הקבצים midistart ו־midistop)"
 
-#: src/preferences.c:3715
+#: src/preferences.c:3779
 msgid "When inserting/merging frames:  "
 msgstr "כאשר מוסיפים\\ממזגים שקופיות:  "
 
-#: src/preferences.c:3719
+#: src/preferences.c:3783
 msgid "_Speed Up/Slow Down Insertion"
 msgstr "_האצה\\האטה של התוספת"
 
-#: src/preferences.c:3723
+#: src/preferences.c:3787
 msgid "_Resample Insertion"
 msgstr "_דגימת התוספת מחדש"
 
-#: src/preferences.c:3730
+#: src/preferences.c:3794
 msgid "CD device           "
 msgstr "התקן תקליטורים           "
 
-#: src/preferences.c:3733
+#: src/preferences.c:3797
 msgid "LiVES can load audio tracks from this CD"
 msgstr "LiVES יכול לטעון רצועות שמע מתקליטור זה"
 
-#: src/preferences.c:3746
+#: src/preferences.c:3813
 msgid "Default FPS        "
 msgstr "ברירת מחדל של שקופיות לשנייה        "
 
-#: src/preferences.c:3749
+#: src/preferences.c:3816
 msgid "Frames per second to use when none is specified"
 msgstr "מספר שקופיות לשנייה לשימוש כאשר לא סופק אחר"
 
-#: src/preferences.c:3757
+#: src/preferences.c:3825
 msgid "Misc"
 msgstr "שונות"
 
-#: src/preferences.c:3782
+#: src/preferences.c:3850
 msgid "New theme:           "
 msgstr "ערכת נושא חדשה:           "
 
-#: src/preferences.c:3800
+#: src/preferences.c:3867
 msgid "Themes"
 msgstr "ערכות נושא"
 
-#: src/preferences.c:3815
+#: src/preferences.c:3882
 msgid "Download bandwidth (Kb/s)       "
 msgstr "רוחב פס הורדה (ק\"ב\\שנייה)       "
 
-#: src/preferences.c:3823
+#: src/preferences.c:3890
 msgid "LiVES must be compiled without \"configure --disable-OSC\" to use OMC"
 msgstr "חובה להדר את LiVES בלי \"configure --disable-OSC\" כדי להשתמש ב־OMC"
 
-#: src/preferences.c:3833
+#: src/preferences.c:3900
 msgid "OMC remote control enabled"
 msgstr "שליטה מרחוק על OMC מאופשרת"
 
-#: src/preferences.c:3841
+#: src/preferences.c:3908
 msgid "UDP port       "
 msgstr "פותחת UDP       "
 
-#: src/preferences.c:3850
+#: src/preferences.c:3917
 msgid "Start OMC on startup"
 msgstr "הפעלת OMC בהפעלת LiVES"
 
-#: src/preferences.c:3870
+#: src/preferences.c:3937
 msgid "Streaming/Networking"
 msgstr "זרימה\\רשת"
 
-#: src/preferences.c:3882
+#: src/preferences.c:3949
 msgid "Jack transport"
 msgstr "העברת Jack"
 
-#: src/preferences.c:3886
+#: src/preferences.c:3953
 msgid ""
 "LiVES must be compiled with jack/transport.h and jack/jack.h present to use "
 "jack transport"
 msgstr ""
 "חובה להדר את LiVES עם jack/transport.h וjack\\jack.h כדי להשתמש בהעברת Jack"
 
-#: src/preferences.c:3892
+#: src/preferences.c:3959
 msgid "Jack _transport config file"
 msgstr "קובץ הגדרות _תעבורת Jack"
 
-#: src/preferences.c:3899 src/preferences.c:3989
+#: src/preferences.c:3967 src/preferences.c:4058
 msgid "Start _server on LiVES startup"
 msgstr "הפעלת ה_שרת בהפעלת LiVES"
 
-#: src/preferences.c:3911
+#: src/preferences.c:3979
 msgid "Jack transport _master (start and stop)"
 msgstr ""
 
-#: src/preferences.c:3921
+#: src/preferences.c:3989
 msgid "Jack transport _client (start and stop)"
 msgstr ""
 
-#: src/preferences.c:3935
+#: src/preferences.c:4003
 msgid "Jack transport sets start position"
 msgstr ""
 
-#: src/preferences.c:3952
+#: src/preferences.c:4020
 msgid "Jack transport timebase slave"
 msgstr ""
 
-#: src/preferences.c:3963
+#: src/preferences.c:4031
 msgid "(See also Playback -> Audio follows video rate/direction)"
 msgstr ""
 
-#: src/preferences.c:3971
+#: src/preferences.c:4039
 msgid "Jack audio"
 msgstr "שמע Jack"
 
-#: src/preferences.c:3975
+#: src/preferences.c:4043
 msgid "LiVES must be compiled with jack/jack.h present to use jack audio"
 msgstr "חובה להדר את LiVES עם jack\\jack.h כדי להשתמש בשמע jack"
 
-#: src/preferences.c:3978
+#: src/preferences.c:4046
 msgid ""
 "You MUST set the audio player to \"jack\" in the Playback tab to use jack "
 "audio"
 msgstr "מחובתך לקבוע את נגן השמע ל\"jack\" בלשונית הנגינה כדי להשתמש בשמע jack"
 
-#: src/preferences.c:3984
+#: src/preferences.c:4052
 msgid "Jack _audio server config file"
 msgstr "קובץ הגדרות שרת ה_שמע Jack"
 
-#: src/preferences.c:3996
+#: src/preferences.c:4065
 msgid "Play audio even when transport is _paused"
 msgstr ""
 
-#: src/preferences.c:4008
+#: src/preferences.c:4077
 msgid "Automatically connect to System Out ports when 'playing' External Audio"
 msgstr ""
 
-#: src/preferences.c:4021
+#: src/preferences.c:4090
 msgid "Jack Integration"
 msgstr "שילוב עם Jack"
 
-#: src/preferences.c:4035
+#: src/preferences.c:4104
 msgid "Events to respond to:"
 msgstr "אירועים להגבה:"
 
-#: src/preferences.c:4044
+#: src/preferences.c:4113
 msgid "_Joystick events"
 msgstr "אירועי _מוט היגוי"
 
-#: src/preferences.c:4051
+#: src/preferences.c:4120
 msgid "_Joystick device"
 msgstr "התקן _מוט היגוי"
 
-#: src/preferences.c:4053
+#: src/preferences.c:4122
 msgid "The joystick device, e.g. /dev/input/js0"
 msgstr "התקן מוט ההיגוי, לדוגמה /dev/input/js0"
 
-#: src/preferences.c:4071
+#: src/preferences.c:4142
 msgid "_MIDI events"
 msgstr "אירועי _MIDI"
 
-#: src/preferences.c:4080
+#: src/preferences.c:4151
 msgid "Use _ALSA MIDI (recommended)"
 msgstr "שימוש ב־MIDI של _ALSA"
 
-#: src/preferences.c:4082
+#: src/preferences.c:4153
 msgid "Create an ALSA MIDI port which other MIDI devices can be connected to"
 msgstr "יצירת ערוץ MIDI ב־ALSA שאליו יכולים להתחבר התקני MIDI אחרים"
 
-#: src/preferences.c:4090
+#: src/preferences.c:4162
 msgid "Use _raw MIDI"
 msgstr "שימוש ב־MIDI לא דחוס"
 
-#: src/preferences.c:4092
+#: src/preferences.c:4164
 msgid "Read directly from the MIDI device"
 msgstr "קריאה ישירות מהתקן ה־MIDI"
 
-#: src/preferences.c:4104
+#: src/preferences.c:4177
 msgid "_MIDI device"
 msgstr "התקן _MIDI"
 
-#: src/preferences.c:4106
+#: src/preferences.c:4179
 msgid "The MIDI device, e.g. /dev/input/midi0"
 msgstr "התקן הMIDI, לדוגמה /dev/input/midi0"
 
-#: src/preferences.c:4118
+#: src/preferences.c:4193
 msgid "Advanced"
 msgstr "מתקדם"
 
-#: src/preferences.c:4124
+#: src/preferences.c:4199
 msgid "MIDI check _rate"
 msgstr "_תדר בדיקת MIDI"
 
-#: src/preferences.c:4127
+#: src/preferences.c:4203
 msgid ""
 "Number of MIDI checks per keyboard tick. Increasing this may improve MIDI "
 "responsiveness, but may slow down playback."
@@ -8225,23 +8239,23 @@
 "מספר בדיקות MIDI לכל נקישת מקלדת. העלאת התדר אולי תגרום לשיפור תגובות הMIDI, "
 "אבל עלולה להאט את הנגינה."
 
-#: src/preferences.c:4134
+#: src/preferences.c:4211
 msgid "MIDI repeat"
 msgstr "ביצוע חוזר של MIDI"
 
-#: src/preferences.c:4137
+#: src/preferences.c:4214
 msgid "Number of non-reads allowed between succesive reads."
 msgstr "מספר אי־קריאות מותר בין קריאות מוצלחות"
 
-#: src/preferences.c:4140
+#: src/preferences.c:4218
 msgid "(Warning: setting this value too high can slow down playback.)"
 msgstr "(אזהרה: הגדלה מוגזמת של ערך זה עלולה להאט את הנגינה.)"
 
-#: src/preferences.c:4159
+#: src/preferences.c:4237
 msgid "MIDI/Joystick learner"
 msgstr "לומד MIDI\\מוט היגוי"
 
-#: src/preferences.c:4499
+#: src/preferences.c:4679
 msgid ""
 "\n"
 "LiVES will now shut down. You need to restart it for the directory change to "
@@ -8252,68 +8266,68 @@
 "LiVES יכבה עכשיו. יש צורך להפעילו מחדש כדי ששינוי התיקייה יחול.\n"
 "נא ללחוץ על אישור.\n"
 
-#: src/preferences.c:4523
+#: src/preferences.c:4703
 msgid ""
 "For the directory change to take effect LiVES will restart when preferences "
 "dialog closes."
 msgstr ""
 
-#: src/preferences.c:4527
+#: src/preferences.c:4707
 msgid "Theme changes will not take effect until the next time you start LiVES."
 msgstr "שינויי ערכת הנושא לא ישפיעו עד הפעלת LiVES הבאה."
 
-#: src/preferences.c:4531
+#: src/preferences.c:4711
 msgid "Jack options will not take effect until the next time you start LiVES."
 msgstr "אפשרויות הJack לא יישתנו עד ההפעלה הבאה של LiVES."
 
-#: src/osc.c:2585
+#: src/osc.c:2616
 #, c-format
 msgid "Syncing to external framerate of %.8f frames per second.\n"
 msgstr "מסנכרן לקצב שקופיות חיצוני של %.8f שקופיות לשנייה.\n"
 
-#: src/osc.c:6746
+#: src/osc.c:6938
 msgid "Cannot initialize OSC receiver\n"
 msgstr "לא ניתן לאתחל את מקלט ה־OSC\n"
 
-#: src/osc.c:6770
+#: src/osc.c:6961
 #, c-format
 msgid "WARNING: Cannot start OSC server at UDP port %d\n"
 msgstr "אזהרה: לא ניתן להפעיל את שרת הOSC בפותחת הUDP %d\n"
 
-#: src/osc.c:6775
+#: src/osc.c:6963
 #, c-format
 msgid "Started OSC server at UDP port %d\n"
 msgstr "שרת הOSC הופעל בפותחת הUDP %d\n"
 
-#: src/osc.c:6890
+#: src/osc.c:7076
 #, c-format
 msgid "Cannot start OSC/UDP server at port %d \n"
 msgstr "לא ניתן להפעיל את שרת הOSC/UDP בפותחה %d \n"
 
-#: src/resample.c:125 src/resample.c:304
+#: src/resample.c:131 src/resample.c:305
 #, c-format
 msgid "Resizing frames 1 to %d"
 msgstr "משנה את גודל השקופיות 1 עד %d"
 
-#: src/resample.c:140 src/resample.c:318
+#: src/resample.c:145 src/resample.c:318
 #, c-format
 msgid "Resizing/letterboxing frames 1 to %d"
 msgstr ""
 
-#: src/resample.c:361 src/resample.c:385
+#: src/resample.c:360 src/resample.c:384
 msgid "Resize"
 msgstr "שינוי גודל"
 
-#: src/resample.c:395
+#: src/resample.c:394
 msgid "Resample/Resize"
 msgstr "דגימה מחדש"
 
-#: src/resample.c:680
+#: src/resample.c:676
 #, c-format
 msgid "Length of video is now %d frames.\n"
 msgstr "אורך הוידאו כעת הינו %d שקופיות.\n"
 
-#: src/resample.c:745
+#: src/resample.c:737
 msgid ""
 "\n"
 "\n"
@@ -8323,146 +8337,146 @@
 "\n"
 "הקצב החדש חייב להיות גדול מ0\n"
 
-#: src/resample.c:797 src/resample.c:813
+#: src/resample.c:788 src/resample.c:803
 msgid "Resampling audio"
 msgstr "דגימת שמע מחדש"
 
-#: src/resample.c:831
+#: src/resample.c:821
 msgid "LiVES was unable to resample the audio as requested.\n"
 msgstr "ל־LiVES לא הייתה אפשרות לדגום מחדש את השמע כפי שבוקש.\n"
 
-#: src/resample.c:833 src/resample.c:837
+#: src/resample.c:823 src/resample.c:827
 msgid "Resample Audio"
 msgstr "דגימת שמע מחדש"
 
-#: src/resample.c:845
+#: src/resample.c:835
 #, c-format
 msgid "Audio was resampled to %d Hz, %d channels, %d bit"
 msgstr "השמע נדגם מחדש ל%d ׁHz, %d ערוצים ו%d סיביות"
 
-#: src/resample.c:1034
+#: src/resample.c:1016
 #, c-format
 msgid "Resampling video at %.8f frames per second..."
 msgstr "דוגם את הוידאו מחדש ב%.8f שקופיות לשנייה"
 
-#: src/resample.c:1037
+#: src/resample.c:1018
 #, c-format
 msgid "Resampling video at %.3f frames per second..."
 msgstr "דוגם את הוידאו מחדש ב%.3f שקופיות לשנייה..."
 
-#: src/resample.c:1068
+#: src/resample.c:1049
 msgid "Reordering error !\n"
 msgstr "שגיאת סידור מחדש !\n"
 
-#: src/resample.c:1079
+#: src/resample.c:1060
 msgid "Resample"
 msgstr "דגימה מחדש"
 
-#: src/resample.c:1192
+#: src/resample.c:1173
 msgid "LiVES: - Resample Audio"
 msgstr "LiVES: דגימת שמע מחדש"
 
-#: src/resample.c:1195
+#: src/resample.c:1175
 msgid "LiVES: - Insert Silence"
 msgstr "LiVES: - הוספת שקט"
 
-#: src/resample.c:1198
+#: src/resample.c:1177
 msgid "LiVES: - New Clip Audio"
 msgstr "LiVES: - קטע שמע חדש"
 
-#: src/resample.c:1201
+#: src/resample.c:1179
 msgid "LiVES: - External Clip Settings"
 msgstr "LiVES: - הגדרות קטע חיצוני"
 
-#: src/resample.c:1238 src/resample.c:1358
+#: src/resample.c:1215 src/resample.c:1332
 msgid "Rate (Hz) "
 msgstr "קצב (Hz) "
 
-#: src/resample.c:1245 src/resample.c:1372
+#: src/resample.c:1222 src/resample.c:1346
 msgid "Channels"
 msgstr ""
 
-#: src/resample.c:1252
+#: src/resample.c:1229
 msgid "Sample Size "
 msgstr ""
 
-#: src/resample.c:1268 src/resample.c:1425
+#: src/resample.c:1245 src/resample.c:1399
 msgid "Signed"
 msgstr "חתום"
 
-#: src/resample.c:1274 src/resample.c:1435
+#: src/resample.c:1251 src/resample.c:1409
 msgid "Unsigned"
 msgstr "לא חתום"
 
-#: src/resample.c:1297 src/resample.c:1460
+#: src/resample.c:1273 src/resample.c:1433
 msgid "Little Endian"
 msgstr "Little Endian"
 
-#: src/resample.c:1303 src/resample.c:1468
+#: src/resample.c:1279 src/resample.c:1441
 msgid "Big Endian"
 msgstr "Big Endian"
 
-#: src/resample.c:1315
+#: src/resample.c:1290
 msgid "Current"
 msgstr "נוכחי"
 
-#: src/resample.c:1340
+#: src/resample.c:1315
 msgid "_Enable audio"
 msgstr "_הפעלת שמע"
 
-#: src/resample.c:1372
+#: src/resample.c:1346
 msgid "_Channels"
 msgstr ""
 
-#: src/resample.c:1394
+#: src/resample.c:1368
 msgid "_Sample Size"
 msgstr ""
 
-#: src/resample.c:1394
+#: src/resample.c:1368
 msgid "Sample Size"
 msgstr ""
 
-#: src/resample.c:1489
+#: src/resample.c:1461
 msgid "New"
 msgstr "חדש"
 
-#: src/resample.c:1512
+#: src/resample.c:1484
 msgid "_Frames Per Second "
 msgstr "_שקופיות לשנייה "
 
-#: src/resample.c:1530
+#: src/resample.c:1502
 msgid "Record for maximum:  "
 msgstr "זמן הקלטה מקסימלי:  "
 
-#: src/resample.c:1533
+#: src/resample.c:1505
 msgid " hours  "
 msgstr " שעות  "
 
-#: src/resample.c:1536
+#: src/resample.c:1508
 msgid " minutes  "
 msgstr " דקות  "
 
-#: src/resample.c:1538
+#: src/resample.c:1510
 msgid " seconds  "
 msgstr " שניות  "
 
-#: src/resample.c:1545
+#: src/resample.c:1517
 msgid "Unlimited"
 msgstr "בלתי־מוגבל"
 
-#: src/resample.c:1561
+#: src/resample.c:1533
 msgid "Click OK to begin recording, or Cancel to quit."
 msgstr "יש ללחוץ על אישור כדי להתחיל בהקלטה, או על ביטול כדי לצאת"
 
-#: src/resample.c:1670
+#: src/resample.c:1638
 msgid "LiVES: - Change playback speed"
 msgstr "LiVES: - שינוי מהירות הנגינה"
 
-#: src/resample.c:1673
+#: src/resample.c:1640
 msgid "LiVES: - Resample Video"
 msgstr "LiVES: - דגימת וידאו מחדש"
 
-#: src/resample.c:1696
+#: src/resample.c:1663
 #, c-format
 msgid ""
 "\n"
@@ -8479,7 +8493,7 @@
 "נא להכניס את מהירות הנגינה הרצויה\n"
 "ב _שקופיות"
 
-#: src/resample.c:1701
+#: src/resample.c:1667
 #, c-format
 msgid ""
 "\n"
@@ -8496,15 +8510,15 @@
 "נא להכניס את הקצב ש_נדגם מחדש\n"
 "בשקופיות לשנייה"
 
-#: src/resample.c:1723
+#: src/resample.c:1688
 msgid "OR enter the desired clip length in _seconds"
 msgstr "או להכניס את אורך הקטע הרצוי ב_שניות"
 
-#: src/resample.c:1745
+#: src/resample.c:1710
 msgid "Change the _audio speed as well"
 msgstr "שינוי מהירות ה_שמע בנוסף"
 
-#: src/resample.c:1846
+#: src/resample.c:1810
 msgid ""
 "\n"
 "Speeding up the clip will cause missing frames in some multitrack layouts.\n"
@@ -8514,7 +8528,7 @@
 "העלאת מהירות הקטע תגרום לשקופיות חסרות בפריסות מרובות־רצועות מסוימות.\n"
 "האם לשנות את המהירות?\n"
 
-#: src/resample.c:1863
+#: src/resample.c:1829
 msgid ""
 "\n"
 "Speeding up the clip will cause missing audio in some multitrack layouts.\n"
@@ -8524,47 +8538,47 @@
 "העלאת מהירות הקטע תגרום לשמע חסר בפריסות מרובות־רצועות מסוימות.\n"
 "האם לשנות את המהירות ?\n"
 
-#: src/resample.c:1878
+#: src/resample.c:1847
 msgid ""
 "\n"
 "Changing the speed will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/resample.c:1892
+#: src/resample.c:1863
 msgid ""
 "\n"
 "Changing the speed will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/resample.c:1938
+#: src/resample.c:1911
 msgid "Speed Change"
 msgstr "שינוי מהירות"
 
-#: src/resample.c:1947
+#: src/resample.c:1920
 #, c-format
 msgid "Changed playback speed to %.3f frames per second and audio to %d Hz.\n"
 msgstr "מהירות הנגינה שונתה ל%.3f שקופיות לשנייה והשמע שונה ל %d Hz.\n"
 
-#: src/resample.c:1950
+#: src/resample.c:1922
 #, c-format
 msgid "Changed playback speed to %.3f frames per second.\n"
 msgstr "מהירות הנגינה שונתה ל%.3f שקופיות לשנייה.\n"
 
-#: src/resample.c:2035
+#: src/resample.c:2006
 msgid "Resampling video"
 msgstr "דוגם מחדש וידאו"
 
-#: src/resample.c:2042 src/resample.c:2160 src/resample.c:2182
+#: src/resample.c:2012 src/resample.c:2127 src/resample.c:2148
 msgid "Resampling clipboard video"
 msgstr "דוגם מחדש את הוידאו הנמצא בלוח הגזירים"
 
-#: src/resample.c:2047
+#: src/resample.c:2016
 msgid "Reordering frames"
 msgstr "מסדר מחדש שקופיות"
 
-#: src/resample.c:2056
+#: src/resample.c:2025
 msgid ""
 "\n"
 "\n"
@@ -8574,20 +8588,20 @@
 "\n"
 "ל־LiVES לא הייתה אפשרות לסדר מחדש את השקופיות"
 
-#: src/resample.c:2104
+#: src/resample.c:2071
 msgid "Deordering frames"
 msgstr "יוצר אי־סדר בשקופיות"
 
-#: src/resample.c:2199
+#: src/resample.c:2165
 msgid "resampling error..."
 msgstr "שגיאת דגימה מחדש"
 
-#: src/rte_window.c:85 src/rte_window.c:1708
+#: src/rte_window.c:124 src/rte_window.c:1709
 #, c-format
 msgid "Type: %s"
 msgstr "סוג: %s"
 
-#: src/rte_window.c:112
+#: src/rte_window.c:150
 msgid ""
 "\n"
 "\n"
@@ -8603,7 +8617,7 @@
 "האם ברצונך לעשות זאת ?\n"
 "\n"
 
-#: src/rte_window.c:426
+#: src/rte_window.c:460
 msgid ""
 "\n"
 "\n"
@@ -8615,12 +8629,12 @@
 "יש ללחוץ על 'אישור' כדי לשמור את מפת המקשים כברירת מחדל\n"
 "\n"
 
-#: src/rte_window.c:432
+#: src/rte_window.c:466
 #, c-format
 msgid "Saving keymap to %s\n"
 msgstr "שומר מפת מקשים ל%s\n"
 
-#: src/rte_window.c:439
+#: src/rte_window.c:471
 #, c-format
 msgid ""
 "\n"
@@ -8629,7 +8643,7 @@
 "\n"
 "מעדכן את קובץ מפת המקשים %s..."
 
-#: src/rte_window.c:446
+#: src/rte_window.c:477
 #, c-format
 msgid ""
 "\n"
@@ -8639,12 +8653,12 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/rte_window.c:526
+#: src/rte_window.c:556
 #, c-format
 msgid "Saving real time effect defaults to %s..."
 msgstr "שומר את ברירת המחדל של האפקטים בזמן אמת ל%s..."
 
-#: src/rte_window.c:535
+#: src/rte_window.c:563
 #, c-format
 msgid ""
 "\n"
@@ -8659,22 +8673,22 @@
 "%s\n"
 "קוד שגיאה %d\n"
 
-#: src/rte_window.c:632
+#: src/rte_window.c:657
 #, c-format
 msgid "Loading real time effect defaults from %s..."
 msgstr "טוען את ברירות המחדל של האפקטים בזמן אמת מ%s..."
 
-#: src/rte_window.c:681
+#: src/rte_window.c:701
 #, c-format
 msgid "Loading generator default sizes from %s..."
 msgstr "טוען את גדלי ברירת המחדל של המחולל מ%s..."
 
-#: src/rte_window.c:1306
+#: src/rte_window.c:1319
 #, c-format
 msgid "Loading default keymap from %s..."
 msgstr "טוען את מפת המקשים המוגדרת כברירת מחדל מ%s..."
 
-#: src/rte_window.c:1329
+#: src/rte_window.c:1339
 #, c-format
 msgid ""
 "\n"
@@ -8689,48 +8703,48 @@
 "%s\n"
 "קוד שגיאה %d\n"
 
-#: src/rte_window.c:1403
+#: src/rte_window.c:1412
 #, c-format
 msgid "Invalid line %d in %s\n"
 msgstr "השורה %d ב%s לא תקינה\n"
 
-#: src/rte_window.c:1483
+#: src/rte_window.c:1490
 #, c-format
 msgid "Invalid key %d in %s\n"
 msgstr "המקש %d ב%s לא תקין\n"
 
-#: src/rte_window.c:1498
+#: src/rte_window.c:1505
 #, c-format
 msgid "Invalid effect %s in %s\n"
 msgstr "האפקט %s ב%s לא תקין\n"
 
-#: src/rte_window.c:1517
+#: src/rte_window.c:1524
 #, c-format
 msgid "Unknown effect %s in %s\n"
 msgstr ""
 
-#: src/rte_window.c:1535
+#: src/rte_window.c:1542
 #, c-format
 msgid ""
 "This version of LiVES cannot mix generators/non-generators on the same key "
 "(%d) !\n"
 msgstr "גרסה זו של LiVES לא יכולה לערבב מחוללים\\לא־מחוללים במקש אחד (%d) !\n"
 
-#: src/rte_window.c:1547
+#: src/rte_window.c:1554
 #, c-format
 msgid "Too many effects bound to key %d.\n"
 msgstr "יותר מדי אפקטים שויכו למקש %d.\n"
 
-#: src/rte_window.c:1587
+#: src/rte_window.c:1593
 msgid "update required.\n"
 msgstr "דרוש עדכון.\n"
 
-#: src/rte_window.c:1603
+#: src/rte_window.c:1607
 #, c-format
 msgid "Loading data connection map from %s..."
 msgstr ""
 
-#: src/rte_window.c:1612
+#: src/rte_window.c:1614
 msgid ""
 "\n"
 "\n"
@@ -8742,41 +8756,41 @@
 "לא ניתן לאתר אפקטים אחדים.\n"
 "\n"
 
-#: src/rte_window.c:1691
+#: src/rte_window.c:1692
 #, c-format
 msgid "LiVES: Information for %s"
 msgstr "LiVES: מידע עבור %s"
 
-#: src/rte_window.c:1704
+#: src/rte_window.c:1705
 #, c-format
 msgid "Effect name: %s"
 msgstr "שם אפקט: %s"
 
-#: src/rte_window.c:1712
+#: src/rte_window.c:1713
 #, c-format
 msgid "Plugin name: %s"
 msgstr "שם תוסף: %s"
 
-#: src/rte_window.c:1716
+#: src/rte_window.c:1717
 #, c-format
 msgid "Author: %s"
 msgstr "יוצר: %s"
 
-#: src/rte_window.c:1721
+#: src/rte_window.c:1722
 #, c-format
 msgid "and: %s"
 msgstr ""
 
-#: src/rte_window.c:1726
+#: src/rte_window.c:1727
 #, c-format
 msgid "Version: %d"
 msgstr "גרסה: %d"
 
-#: src/rte_window.c:1734
+#: src/rte_window.c:1735
 msgid "Description: "
 msgstr "תיאור: "
 
-#: src/rte_window.c:1960
+#: src/rte_window.c:1963
 msgid ""
 "\n"
 "\n"
@@ -8789,69 +8803,69 @@
 "גרסה זו של LiVES לא מאפשרת ערבוב של מחוללים ולא־מחוללים באותו מקש.\n"
 "\n"
 
-#: src/rte_window.c:2024
+#: src/rte_window.c:2027
 #, c-format
 msgid "LiVES could not locate the effect %s.\n"
 msgstr "לא ניתן לאתר את האפקט %s\n"
 
-#: src/rte_window.c:2225
+#: src/rte_window.c:2216
 msgid "LiVES: Real time effect mapping"
 msgstr "LiVES: מיפוי אפקט בזמן אמת"
 
-#: src/rte_window.c:2257
+#: src/rte_window.c:2248
 #, c-format
 msgid "Ctrl-%d"
 msgstr "Ctrl-%d"
 
-#: src/rte_window.c:2264
+#: src/rte_window.c:2255
 msgid "Key active"
 msgstr "מקש פעיל"
 
-#: src/rte_window.c:2279
+#: src/rte_window.c:2271
 msgid "Key grab"
 msgstr "קליטת מקש"
 
-#: src/rte_window.c:2280
+#: src/rte_window.c:2272
 msgid "Grab keyboard for this effect key"
 msgstr "קליטת המקלדת עבור מקש אפקט זה"
 
-#: src/rte_window.c:2290
+#: src/rte_window.c:2283
 msgid "_Clear all effects"
 msgstr "_ניקוי כל האפקטים"
 
-#: src/rte_window.c:2304
+#: src/rte_window.c:2297
 msgid "Mode active"
 msgstr "מצב פעיל"
 
-#: src/rte_window.c:2314 src/multitrack.c:8568
+#: src/rte_window.c:2307 src/multitrack.c:8762
 msgid "Info"
 msgstr "מידע"
 
-#: src/rte_window.c:2315
+#: src/rte_window.c:2308
 msgid "Set Parameters"
 msgstr "קביעת פרמטרים"
 
-#: src/rte_window.c:2316
+#: src/rte_window.c:2309
 msgid "Set Connections"
 msgstr ""
 
-#: src/rte_window.c:2317
+#: src/rte_window.c:2310
 msgid "Clear"
 msgstr "ניקוי"
 
-#: src/rte_window.c:2326
+#: src/rte_window.c:2319
 msgid "Effect name:"
 msgstr "שם אפקט:"
 
-#: src/rte_window.c:2391
+#: src/rte_window.c:2384
 msgid "_Save as default keymap"
 msgstr "_שמירה כברירת מחדל של מפת מקשים"
 
-#: src/rte_window.c:2396
+#: src/rte_window.c:2389
 msgid "_Load default keymap"
 msgstr "_טעינת מפת מקשים המוגדרת כברירת מחדל"
 
-#: src/rte_window.c:2840
+#: src/rte_window.c:2833
 #, c-format
 msgid ""
 "Unable to create default keymap file: %s\n"
@@ -8912,7 +8926,7 @@
 msgid "none\n"
 msgstr "ללא\n"
 
-#: src/lives-yuv4mpeg.c:494
+#: src/lives-yuv4mpeg.c:493
 #, c-format
 msgid ""
 "Unable to set display framerate to %.3f fps.\n"
@@ -8921,79 +8935,79 @@
 "לא ניתן לקבוע את קצב הצגת השקופיות ל%.3f שקופיות לשנייה.\n"
 "\n"
 
-#: src/lives-yuv4mpeg.c:503
+#: src/lives-yuv4mpeg.c:502
 #, c-format
 msgid "Unable to open yuv4mpeg out stream %s\n"
 msgstr "לא ניתן לפתוח את זרימת ה־yuv4mpeg היוצאת %s\n"
 
-#: src/lives-yuv4mpeg.c:628
+#: src/lives-yuv4mpeg.c:626
 #, c-format
 msgid "TV card %d"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:713
+#: src/lives-yuv4mpeg.c:710
 #, c-format
 msgid "Opened TV card %d (%s)"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:760
+#: src/lives-yuv4mpeg.c:757
 #, c-format
 msgid "Firewire card %d"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:796
+#: src/lives-yuv4mpeg.c:793
 #, c-format
 msgid "Opened firewire card %d"
 msgstr ""
 
-#: src/multitrack.c:666
+#: src/multitrack.c:736
 msgid "Auto backup"
 msgstr "גיבוי אוטומטי"
 
-#: src/multitrack.c:868
+#: src/multitrack.c:935
 msgid "Backing audio"
 msgstr "מוזיקת רקע"
 
-#: src/multitrack.c:1435
+#: src/multitrack.c:1515
 #, fuzzy, c-format
 msgid "%s : parameters for %s"
 msgstr "אין פרמטרים"
 
-#: src/multitrack.c:1809 src/multitrack.c:3483
+#: src/multitrack.c:1881 src/multitrack.c:3635
 #, c-format
 msgid "Current track: %s (layer %d)\n"
 msgstr "רצועה נוכחית: %s (שכבה %d)\n"
 
-#: src/multitrack.c:1813 src/multitrack.c:3484
+#: src/multitrack.c:1885 src/multitrack.c:3637
 msgid "Current track: Backing audio\n"
 msgstr "רצועה נוכחית: מוזיקת רקע\n"
 
-#: src/multitrack.c:1814
+#: src/multitrack.c:1886
 #, c-format
 msgid "Current track: Layer %d audio\n"
 msgstr "רצועה נוכחית: שמע השכבה %d\n"
 
-#: src/multitrack.c:1817
+#: src/multitrack.c:1889
 #, c-format
 msgid "%.2f sec.\n"
 msgstr "%.2f שניות.\n"
 
-#: src/multitrack.c:1822 src/multitrack.c:3490
+#: src/multitrack.c:1894 src/multitrack.c:3643
 #, c-format
 msgid "Source: %s"
 msgstr "מקור: %s"
 
-#: src/multitrack.c:1825 src/multitrack.c:3492
+#: src/multitrack.c:1897 src/multitrack.c:3645
 msgid "Right click for context menu.\n"
 msgstr "יש ללחוץ על לחצן העכבר הימני עבור תפריט אפשרויות.\n"
 
-#: src/multitrack.c:1827
+#: src/multitrack.c:1899
 msgid ""
 "Double click on a block\n"
 "to select it."
 msgstr ""
 
-#: src/multitrack.c:3312
+#: src/multitrack.c:3452
 msgid ""
 "\n"
 "\n"
@@ -9002,7 +9016,7 @@
 "right or double clicking on it.\n"
 msgstr ""
 
-#: src/multitrack.c:3315
+#: src/multitrack.c:3455
 msgid ""
 "\n"
 "\n"
@@ -9010,7 +9024,7 @@
 "Select an effect in FX stack first to view its parameters.\n"
 msgstr ""
 
-#: src/multitrack.c:3318
+#: src/multitrack.c:3458
 msgid ""
 "\n"
 "\n"
@@ -9020,7 +9034,7 @@
 "\n"
 "קליפים לא טעון.\n"
 
-#: src/multitrack.c:3321
+#: src/multitrack.c:3462
 msgid ""
 "You must select two video tracks\n"
 "and a time region\n"
@@ -9030,7 +9044,7 @@
 "before inserting clips into the timeline."
 msgstr ""
 
-#: src/multitrack.c:3324
+#: src/multitrack.c:3465
 msgid ""
 "\n"
 "\n"
@@ -9039,12 +9053,12 @@
 "to apply compositors.\n"
 msgstr ""
 
-#: src/multitrack.c:3487
+#: src/multitrack.c:3640
 #, c-format
 msgid "%.2f sec. to %.2f sec.\n"
 msgstr "%.2f שניות ל%.2f שניות.\n"
 
-#: src/multitrack.c:3493
+#: src/multitrack.c:3646
 msgid ""
 "Single click on timeline\n"
 "to select a frame.\n"
@@ -9052,184 +9066,184 @@
 "יש ללחוץ לחיצה בודדת על ציר הזמן\n"
 "כדי לבחור שקופית.\n"
 
-#: src/multitrack.c:3711 src/multitrack.c:6790
+#: src/multitrack.c:3858 src/multitrack.c:6972
 #, c-format
 msgid "%s [unstable]"
 msgstr ""
 
-#: src/multitrack.c:3822
+#: src/multitrack.c:3973
 msgid ""
 "You can click and drag\n"
 "below the timeline"
 msgstr ""
 
-#: src/multitrack.c:3823
+#: src/multitrack.c:3974
 msgid "to select a time region.\n"
 msgstr "כדי לבחור איזור זמן.\n"
 
-#: src/multitrack.c:3985
+#: src/multitrack.c:4137
 msgid "LiVES: Selected clip"
 msgstr "LiVES: קטע נבחר"
 
-#: src/multitrack.c:3993
+#: src/multitrack.c:4145
 msgid "_Adjust start and end points"
 msgstr ""
 
-#: src/multitrack.c:4002
+#: src/multitrack.c:4154
 msgid "_Edit/encode in clip editor"
 msgstr ""
 
-#: src/multitrack.c:4009
+#: src/multitrack.c:4161
 msgid "_Show clip information"
 msgstr "_הצג מידע קליפ"
 
-#: src/multitrack.c:4016
+#: src/multitrack.c:4168
 msgid "_Close this clip"
 msgstr "_סגירת קטע זה"
 
-#: src/multitrack.c:4236
+#: src/multitrack.c:4388
 msgid "Audio mixer (ctrl-m)"
 msgstr "מערבל שמע (ctrl-m)"
 
-#: src/multitrack.c:4336
+#: src/multitrack.c:4488
 msgid "Single click on timeline"
 msgstr "לחיצה בודדת על ציר הזמן"
 
-#: src/multitrack.c:4337
+#: src/multitrack.c:4489
 msgid "to select a frame."
 msgstr "כדי לבחור מסגרת."
 
-#: src/multitrack.c:4338
+#: src/multitrack.c:4490
 msgid "Double click or right click on timeline"
 msgstr ""
 
-#: src/multitrack.c:4339
+#: src/multitrack.c:4491
 msgid "to select a block."
 msgstr "כדי לבחור בלוק."
 
-#: src/multitrack.c:4340
+#: src/multitrack.c:4492
 msgid "Clips can be dragged"
 msgstr "ניתן לגרור קטעים"
 
-#: src/multitrack.c:4341
+#: src/multitrack.c:4493
 msgid "onto the timeline."
 msgstr "לציר הזמן."
 
-#: src/multitrack.c:4343
+#: src/multitrack.c:4495
 msgid "Mouse mode is: Move"
 msgstr "העכבר נמצא במצב: הזזה"
 
-#: src/multitrack.c:4344
+#: src/multitrack.c:4496
 msgid "clips can be moved around."
 msgstr "ניתן להזיז קטעים."
 
-#: src/multitrack.c:4349
+#: src/multitrack.c:4500
 msgid "Mouse mode is: Select."
 msgstr "העכבר נמצא במצב: בחירה."
 
-#: src/multitrack.c:4350
+#: src/multitrack.c:4501
 msgid "Drag with mouse on timeline"
 msgstr "ניתן לגרור עם העכבר את ציר הזמן"
 
-#: src/multitrack.c:4351
+#: src/multitrack.c:4502
 msgid "to select tracks and time."
 msgstr "כדי לבחור מסלולים הזמן."
 
-#: src/multitrack.c:4362
+#: src/multitrack.c:4509
 msgid "_Insert mode: Normal"
 msgstr ""
 
-#: src/multitrack.c:4378
+#: src/multitrack.c:4537
 msgid "_Mouse mode: Move"
 msgstr "מצב _עכבר: הזזה"
 
-#: src/multitrack.c:4382
+#: src/multitrack.c:4540
 msgid "_Mouse mode: Select"
 msgstr "מצב _עכבר: בחירה"
 
-#: src/multitrack.c:4405 src/multitrack.c:7925
+#: src/multitrack.c:4563 src/multitrack.c:8104
 msgid "Gravity: Normal"
 msgstr ""
 
-#: src/multitrack.c:4409
+#: src/multitrack.c:4565
 msgid "Gravity: Left"
 msgstr ""
 
-#: src/multitrack.c:4414
+#: src/multitrack.c:4569
 msgid "Gravity: Right"
 msgstr ""
 
-#: src/multitrack.c:4416
+#: src/multitrack.c:4570
 msgid "Close _last gap(s) in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:4419
+#: src/multitrack.c:4572
 msgid "Close _first gap(s) in selected tracks/time"
 msgstr "סגירת הרווחים הראשונים בזמן\\רצועות הנבחרות"
 
-#: src/multitrack.c:4458
+#: src/multitrack.c:4627
 msgid "Close gaps"
 msgstr "סגירת פערים"
 
-#: src/multitrack.c:4460
+#: src/multitrack.c:4629
 msgid "Move block"
 msgstr "הזזת מקטע"
 
-#: src/multitrack.c:4462
+#: src/multitrack.c:4631
 msgid "Move audio block"
 msgstr "הזזת מקטע שמע"
 
-#: src/multitrack.c:4464
+#: src/multitrack.c:4633
 msgid "Delete block"
 msgstr "מחיקת מקטע"
 
-#: src/multitrack.c:4466
+#: src/multitrack.c:4635
 msgid "Delete audio block"
 msgstr "מחיקת מקטע שמע"
 
-#: src/multitrack.c:4468
+#: src/multitrack.c:4637
 msgid "Split tracks"
 msgstr "פיצול רצועות"
 
-#: src/multitrack.c:4470
+#: src/multitrack.c:4639
 msgid "Split block"
 msgstr "פיצול מקטע"
 
-#: src/multitrack.c:4473
+#: src/multitrack.c:4642
 #, c-format
 msgid "Apply %s"
 msgstr "החלת %s"
 
-#: src/multitrack.c:4478
+#: src/multitrack.c:4647
 #, c-format
 msgid "Delete %s"
 msgstr "מחיקת %s"
 
-#: src/multitrack.c:4482
+#: src/multitrack.c:4651
 msgid "Insert block"
 msgstr "הוספת מקטע"
 
-#: src/multitrack.c:4484
+#: src/multitrack.c:4653
 msgid "Insert gap"
 msgstr "הוספת פער"
 
-#: src/multitrack.c:4486
+#: src/multitrack.c:4655
 msgid "Insert audio block"
 msgstr "הוספת מקטע שמע"
 
-#: src/multitrack.c:4488
+#: src/multitrack.c:4657
 msgid "Effect order change"
 msgstr "סדר שינוי האפקט"
 
-#: src/multitrack.c:4898
+#: src/multitrack.c:5064
 msgid "unsigned "
 msgstr "לא רשום "
 
-#: src/multitrack.c:4899
+#: src/multitrack.c:5065
 msgid "signed "
 msgstr "רשום "
 
-#: src/multitrack.c:4904
+#: src/multitrack.c:5071
 #, c-format
 msgid ""
 "Multitrack values set to %.3f fps, frame size %d x %d, audio channels %d, "
@@ -9238,15 +9252,15 @@
 "ערכי ריבוי הרצועות נקבעו ל %.3f שקופיות לשנייה, גודל שקופית %dx%d, %d ערוצי "
 "שמע, תדר שמע %d, גודל דגימת השמע %d, %s.\n"
 
-#: src/multitrack.c:4938
+#: src/multitrack.c:5104
 msgid "invalid event list. Failed.\n"
 msgstr "רשימת אירועים לא תקינה. נכשל.\n"
 
-#: src/multitrack.c:4944
+#: src/multitrack.c:5110
 msgid "event list has invalid fps. Failed.\n"
 msgstr "נמצא קצב שקופיות לשנייה לא תקין ברשימת האירועים. נכשל.\n"
 
-#: src/multitrack.c:4953
+#: src/multitrack.c:5122
 #, c-format
 msgid ""
 "\n"
@@ -9261,7 +9275,7 @@
 "לסגור את האוסף הנוכחי\n"
 "ולטעון את האוסף החדש מתפריט קובץ.\n"
 
-#: src/multitrack.c:4993
+#: src/multitrack.c:5163
 #, c-format
 msgid ""
 "\n"
@@ -9272,440 +9286,432 @@
 "זהו לא מספר ערוצי שמע תקין (%d) עבור LiVES.\n"
 "לא ניתן לטעון אותו..\n"
 
-#: src/multitrack.c:5329 src/multitrack.c:5338 src/multitrack.c:21133
+#: src/multitrack.c:5452
 msgid "Layout was wiped.\n"
 msgstr ""
 
-#: src/multitrack.c:5374
+#: src/multitrack.c:5547
 #, c-format
 msgid "LiVES-%s: Multitrack %dx%d : %d bpp %.3f fps"
 msgstr "LiVES-%s: ריבוי רצועות %dx%d : %d סיביות לפיקסל %.3f שקופיות לשנייה"
 
-#: src/multitrack.c:5617
+#: src/multitrack.c:5793
 msgid "In/out"
 msgstr ""
 
-#: src/multitrack.c:5619
+#: src/multitrack.c:5795
 msgid "FX stack"
 msgstr ""
 
-#: src/multitrack.c:5627 src/omc-learn.c:673
+#: src/multitrack.c:5803 src/omc-learn.c:659
 msgid "Params."
 msgstr "פרמטרים."
 
-#: src/multitrack.c:5978
+#: src/multitrack.c:6157
 msgid "_Open..."
 msgstr "_פתיחה..."
 
-#: src/multitrack.c:5996
+#: src/multitrack.c:6175
 msgid "O_pen File Selection..."
 msgstr "פ_תיחת בחירת הקובץ..."
 
-#: src/multitrack.c:6040
+#: src/multitrack.c:6219
 msgid "Import Selection from _dvd/vcd..."
 msgstr "ייבוא בחירה מ _DVD\\VCD"
 
-#: src/multitrack.c:6050
+#: src/multitrack.c:6229
 msgid "Import Selection from _dvd"
 msgstr "ייבוא בחירה מ_DVD"
 
-#: src/multitrack.c:6060
+#: src/multitrack.c:6239
 msgid "Import Selection from _vcd"
 msgstr "ייבוא בחירה מ_VCD"
 
-#: src/multitrack.c:6076
+#: src/multitrack.c:6255
 msgid "_Import from Device"
 msgstr "_ייבוא מהתקן"
 
-#: src/multitrack.c:6103
+#: src/multitrack.c:6282
 msgid "_Close the selected clip"
 msgstr "_סגור את הקליפ הנבחר"
 
-#: src/multitrack.c:6198
+#: src/multitrack.c:6377
 msgid "_Save layout as..."
 msgstr "_שמירת פריסה כ..."
 
-#: src/multitrack.c:6206
+#: src/multitrack.c:6385
 msgid "_Load layout..."
 msgstr "_טעינת פריסה..."
 
-#: src/multitrack.c:6210
+#: src/multitrack.c:6389
 msgid "_Wipe/Delete layout..."
 msgstr "_ניקוי\\מחיקת פריסה..."
 
-#: src/multitrack.c:6236
+#: src/multitrack.c:6415
 msgid "_Ignore width, height and audio values from loaded layouts"
 msgstr "_התעלמות מערכי רוחב,גובה ושמע הנמצאים בפריסות שנטענו"
 
-#: src/multitrack.c:6240
+#: src/multitrack.c:6419
 msgid "Auto load _subtitles with clips"
 msgstr ""
 
-#: src/multitrack.c:6322
+#: src/multitrack.c:6501
 msgid "_CLIP EDITOR"
 msgstr "_עורך הקטעים"
 
-#: src/multitrack.c:6334
+#: src/multitrack.c:6513
 msgid "_Adjust selected clip start/end points"
 msgstr ""
 
-#: src/multitrack.c:6343
+#: src/multitrack.c:6522
 msgid "_Insert selected clip"
 msgstr "_הוספת קטע נבחר"
 
-#: src/multitrack.c:6355
+#: src/multitrack.c:6534
 msgid "_Insert selected clip audio"
 msgstr "_הוספת השמע של הקטע הנבחר"
 
-#: src/multitrack.c:6364
+#: src/multitrack.c:6543
 msgid "_Delete selected block"
 msgstr "_מחיקת המקטע הנבחר"
 
-#: src/multitrack.c:6373
+#: src/multitrack.c:6555
 msgid "_Jump to previous block boundary"
 msgstr "_קפיצה לגבול המקטע הקודם"
 
-#: src/multitrack.c:6382
+#: src/multitrack.c:6564
 msgid "_Jump to next block boundary"
 msgstr "_קפיצה לגבול המקטע הבא"
 
-#: src/multitrack.c:6395
+#: src/multitrack.c:6577
 msgid "Clear _marks from timeline"
 msgstr "ניקוי _סימונים מציר הזמן"
 
-#: src/multitrack.c:6403
+#: src/multitrack.c:6585
 msgid "Ignore selection limits when inserting"
 msgstr "התעלמות ממגבלות הבחירה בהוספה"
 
-#: src/multitrack.c:6420 src/multitrack.c:16719
+#: src/multitrack.c:6602 src/multitrack.c:17009
 msgid "_Play from Timeline Position"
 msgstr "_נגינה מהמיקום בציר הזמן"
 
-#: src/multitrack.c:6434
+#: src/multitrack.c:6616
 msgid "Pla_y selected time only"
 msgstr ""
 
-#: src/multitrack.c:6518
+#: src/multitrack.c:6700
 msgid "_Move effects with blocks"
 msgstr "_הזזת האפקטים עם המקטעים"
 
-#: src/multitrack.c:6531
+#: src/multitrack.c:6713
 msgid "Select _autotransition effect..."
 msgstr ""
 
-#: src/multitrack.c:6542
+#: src/multitrack.c:6724
 #, fuzzy
 msgid "Crossfade audio with autotransition"
 msgstr "החלת מעבר Crossfade על השמע"
 
-#: src/multitrack.c:6550
+#: src/multitrack.c:6732
 msgid "View/_Edit selected effect"
 msgstr "הצגת\\_עריכת האפקט הנבחר"
 
-#: src/multitrack.c:6554
+#: src/multitrack.c:6736
 msgid "_Delete selected effect"
 msgstr "_מחיקת האפקט הנבחר"
 
-#: src/multitrack.c:6562
+#: src/multitrack.c:6744
 msgid "Apply effect to _block..."
 msgstr "החלת אפקט ל_מקטע..."
 
-#: src/multitrack.c:6619
+#: src/multitrack.c:6801
 msgid "Apply effect to _region..."
 msgstr "החלפ אפקט ל_איזור..."
 
-#: src/multitrack.c:6885
+#: src/multitrack.c:7061
 msgid "_Tracks"
 msgstr "_רצועות"
 
-#: src/multitrack.c:6896
+#: src/multitrack.c:7072
 msgid "Rename current track"
 msgstr ""
 
-#: src/multitrack.c:6904
+#: src/multitrack.c:7080
 msgid "Make _Backing Audio current track"
 msgstr "בחירת רצועת מוזיקת הרקע כנוכחית"
 
-#: src/multitrack.c:6915
+#: src/multitrack.c:7091
 msgid "Add Video Track at _Rear"
 msgstr "הוספת רצועת וידאו מ_אחור"
 
-#: src/multitrack.c:6923
+#: src/multitrack.c:7099
 msgid "Add Video Track at _Front"
 msgstr "הוספת רצועת וידאו מ_לפנים"
 
-#: src/multitrack.c:6936
+#: src/multitrack.c:7112
 msgid "_Split current track at cursor"
 msgstr "_פיצול הרצועה הנוכחית בסימון"
 
-#: src/multitrack.c:6948
+#: src/multitrack.c:7124
 msgid "_Split selected video tracks"
 msgstr "_פיצול רצועות הוידאו הנבחרות"
 
-#: src/multitrack.c:6961
+#: src/multitrack.c:7137
 msgid "Insert gap in selected tracks/time"
 msgstr "הכנסת רווח בזמן\\רצועות הנבחרות"
 
-#: src/multitrack.c:6969
+#: src/multitrack.c:7145
 msgid "Insert gap in current track/selected time"
 msgstr "הכנסת רווח ברצועה הנוכחית\\בזמן הנבחר"
 
-#: src/multitrack.c:6981
+#: src/multitrack.c:7157
 msgid "Close all _gaps in selected tracks/time"
 msgstr "סגירת כל ה_רווחים בזמן\\רצועות הנבחרות"
 
-#: src/multitrack.c:7007
+#: src/multitrack.c:7183
 msgid "Se_lection"
 msgstr "בח_ירה"
 
-#: src/multitrack.c:7018
+#: src/multitrack.c:7194
 msgid "_Select Current Track"
 msgstr "_בחירת הרצועה הנוכחית"
 
-#: src/multitrack.c:7025
+#: src/multitrack.c:7201
 msgid "Select _all video tracks"
 msgstr "בחירת _כל רצועות הוידאו"
 
-#: src/multitrack.c:7032
+#: src/multitrack.c:7208
 msgid "Select _no video tracks"
 msgstr "_ביטול סימון כל רצועות הוידאו"
 
-#: src/multitrack.c:7039
+#: src/multitrack.c:7215
 msgid "Select all _time"
 msgstr "בחירת הכל"
 
-#: src/multitrack.c:7050
+#: src/multitrack.c:7226
 msgid "Select from _zero time"
 msgstr "בחירה מ_ההתחלה"
 
-#: src/multitrack.c:7057
+#: src/multitrack.c:7233
 msgid "Select to _end time"
 msgstr "בחירה ל_סוף"
 
-#: src/multitrack.c:7064
+#: src/multitrack.c:7240
 msgid "_Copy..."
 msgstr "_העתקה..."
 
-#: src/multitrack.c:7075
+#: src/multitrack.c:7251
 msgid "_Timecode to region start"
 msgstr "_קוד זמן לתחילת האיזור"
 
-#: src/multitrack.c:7082
+#: src/multitrack.c:7258
 msgid "_Timecode to region end"
 msgstr "_קוד זמן לסיום האיזור"
 
-#: src/multitrack.c:7089
+#: src/multitrack.c:7265
 msgid "_Region start to timecode"
 msgstr "_התחלת האיזור לקוד זמן"
 
-#: src/multitrack.c:7096
+#: src/multitrack.c:7272
 msgid "_Region end to timecode"
 msgstr "_סיום האיזור לקוד זמן"
 
-#: src/multitrack.c:7110
+#: src/multitrack.c:7286
 msgid "Select/deselect block at current track/time"
 msgstr ""
 
-#: src/multitrack.c:7135
+#: src/multitrack.c:7311
 msgid "_Change width, height and audio values..."
 msgstr "_שינוי ערכי הרוחב, הגובה והשמע..."
 
-#: src/multitrack.c:7194
+#: src/multitrack.c:7370
 msgid "_Render"
 msgstr "_עיבוד"
 
-#: src/multitrack.c:7205
+#: src/multitrack.c:7381
 msgid "_Render all to new clip"
 msgstr "_עיבוד הכל לקטע חדש"
 
-#: src/multitrack.c:7220
+#: src/multitrack.c:7396
 msgid "Render _video"
 msgstr "עיבוד _וידאו"
 
-#: src/multitrack.c:7225
+#: src/multitrack.c:7401
 msgid "Render _audio"
 msgstr "עיבוד _שמע"
 
-#: src/multitrack.c:7235
+#: src/multitrack.c:7411
 msgid "_Normalise rendered audio"
 msgstr ""
 
-#: src/multitrack.c:7242
+#: src/multitrack.c:7418
 msgid "_Pre-render audio"
 msgstr "_קדם־עיבוד שמע"
 
-#: src/multitrack.c:7251
+#: src/multitrack.c:7427
 msgid "_View"
 msgstr "_תצוגה"
 
-#: src/multitrack.c:7270
+#: src/multitrack.c:7446
 msgid "Block _In/out points"
 msgstr "נקודות _כניסה\\יציאה של המקטע"
 
-#: src/multitrack.c:7279
+#: src/multitrack.c:7455
 msgid "_Effects at current"
 msgstr "_אפקטים בנוכחי"
 
-#: src/multitrack.c:7297
+#: src/multitrack.c:7473
 msgid "Audio parameters"
 msgstr "פרמטרי שמע"
 
-#: src/multitrack.c:7308
+#: src/multitrack.c:7484
 msgid "Show backing _audio track"
 msgstr "הצגת רצועת _מוזיקת רקע"
 
-#: src/multitrack.c:7312
+#: src/multitrack.c:7488
 msgid "Compact view"
 msgstr "תצוגה חסכנית"
 
-#: src/multitrack.c:7320
+#: src/multitrack.c:7496
 msgid "Maximum tracks to display..."
 msgstr "מספר רצועות מקסימלי להצגה..."
 
-#: src/multitrack.c:7327
+#: src/multitrack.c:7503
 msgid "Scroll to follow playback"
 msgstr "גלילה כדי לעקוב אחרי הנגינה"
 
-#: src/multitrack.c:7331
+#: src/multitrack.c:7507
 msgid "_Center on cursor"
 msgstr "_מרכוז על הסמן"
 
-#: src/multitrack.c:7338
+#: src/multitrack.c:7514
 msgid "_Zoom in"
 msgstr "_התקרבות"
 
-#: src/multitrack.c:7349
+#: src/multitrack.c:7525
 msgid "_Zoom out"
 msgstr "_התרחקות"
 
-#: src/multitrack.c:7361
+#: src/multitrack.c:7537
 msgid "Multitrack _details"
 msgstr "_נתוני ריבוי רצועות"
 
-#: src/multitrack.c:7374
+#: src/multitrack.c:7550
 msgid "_Event Window"
 msgstr "חלון _אירועים"
 
-#: src/multitrack.c:7378
+#: src/multitrack.c:7554
 msgid "_Event Window (selected time only)"
 msgstr "_חלון אירועים (בזמן הנבחר בלבד)"
 
-#: src/multitrack.c:7382
+#: src/multitrack.c:7558
 msgid "_Show FRAME events"
 msgstr "_הצגת אירועי שקופיות"
 
-#: src/multitrack.c:7399
+#: src/multitrack.c:7575
 msgid "_Show multitrack keys"
 msgstr "_הצגת מקשי ריבוי רצועות"
 
-#: src/multitrack.c:7468
+#: src/multitrack.c:7644
 msgid "Mouse mode: _Move"
 msgstr "מצב עכבר: _הזזה"
 
-#: src/multitrack.c:7476
+#: src/multitrack.c:7652
 msgid "Mouse mode: _Select"
 msgstr "מצב עכבר: _בחירה"
 
-#: src/multitrack.c:7505
+#: src/multitrack.c:7681
 msgid "Insert mode: _Normal"
 msgstr ""
 
-#: src/multitrack.c:7733
+#: src/multitrack.c:7909
 msgid "Insert with _audio"
 msgstr ""
 
-#: src/multitrack.c:7734
+#: src/multitrack.c:7910
 msgid ""
 "Select whether video clips are inserted and moved with their audio or not"
 msgstr ""
 
-#: src/multitrack.c:7829
+#: src/multitrack.c:8007
 msgid "Select _overlap"
 msgstr ""
 
-#: src/multitrack.c:7830
+#: src/multitrack.c:8008
 msgid ""
 "Select whether timeline selection snaps to overlap between selected tracks "
 "or not"
 msgstr ""
 
-#: src/multitrack.c:7894 src/multitrack.c:14198
+#: src/multitrack.c:8073 src/multitrack.c:14422
 msgid "Expanded View (d)"
 msgstr "תצוגה מורחבת (d)"
 
-#: src/multitrack.c:7897 src/multitrack.c:14205
+#: src/multitrack.c:8076 src/multitrack.c:14428
 msgid "Compact View (d)"
 msgstr "תצוגה חסכונית (d)"
 
-#: src/multitrack.c:7939
+#: src/multitrack.c:8118
 msgid "Gravity: _Normal"
 msgstr ""
 
-#: src/multitrack.c:7952
+#: src/multitrack.c:8131
 msgid "Gravity: _Left"
 msgstr ""
 
-#: src/multitrack.c:7967
+#: src/multitrack.c:8146
 msgid "Gravity: _Right"
 msgstr ""
 
-#: src/multitrack.c:8297
+#: src/multitrack.c:8496
 msgid "_Apply"
 msgstr "_החלה"
 
-#: src/multitrack.c:8319
+#: src/multitrack.c:8518
 msgid "Time"
 msgstr "זמן"
 
-#: src/multitrack.c:8333
+#: src/multitrack.c:8532
 msgid "_Del. node"
 msgstr "_מחיקת צומת"
 
-#: src/multitrack.c:8341
+#: src/multitrack.c:8540
 msgid "_Next node"
 msgstr "הצומת _הבא"
 
-#: src/multitrack.c:8349
+#: src/multitrack.c:8548
 msgid "_Prev node"
 msgstr "הצומת _הקודם"
 
-#: src/multitrack.c:8373
+#: src/multitrack.c:8574
 msgid "_Reverse playback  "
 msgstr "_היפוך נגינה  "
 
-#: src/multitrack.c:8395
+#: src/multitrack.c:8596
 msgid "_Velocity  "
 msgstr "_מהירות  "
 
-#: src/multitrack.c:8464
+#: src/multitrack.c:8664
 msgid "Anchor _start"
 msgstr "עוגן _התחלה"
 
-#: src/multitrack.c:8465
+#: src/multitrack.c:8665
 msgid "Anchor the start point to the timeline"
 msgstr "עיגון נקודת ההתחלה לציר הזמן"
 
-#: src/multitrack.c:8481
-msgid "Start frame"
-msgstr "שקופית התחלה"
-
-#: src/multitrack.c:8533
+#: src/multitrack.c:8728
 msgid "Anchor _end"
 msgstr "עוגן _סוף"
 
-#: src/multitrack.c:8534
+#: src/multitrack.c:8729
 msgid "Anchor the end point to the timeline"
 msgstr "עיגון נקודת הסיום לציר הזמן"
 
-#: src/multitrack.c:8546
-msgid "End frame"
-msgstr "שקופית סיום"
-
-#: src/multitrack.c:8739
+#: src/multitrack.c:8929
 msgid "Scroll"
 msgstr "גלילה"
 
-#: src/multitrack.c:9316
+#: src/multitrack.c:9502
 msgid ""
 "\n"
 "==============================\n"
@@ -9715,91 +9721,91 @@
 "==============================\n"
 "מותג למצב עריכת קטע\n"
 
-#: src/multitrack.c:9502
+#: src/multitrack.c:9708
 msgid "Timeline (seconds)"
 msgstr "ציר זמן (שניות)"
 
-#: src/multitrack.c:9984
+#: src/multitrack.c:10202
 msgid " Backing audio"
 msgstr " מוזיקת רקע"
 
-#: src/multitrack.c:9987
+#: src/multitrack.c:10204
 #, c-format
 msgid " Layer %d audio"
 msgstr " שמע בשכבה %d"
 
-#: src/multitrack.c:9995
+#: src/multitrack.c:10212
 msgid "Show/hide audio details"
 msgstr ""
 
-#: src/multitrack.c:10010 src/multitrack.c:10232
+#: src/multitrack.c:10227 src/multitrack.c:10452
 #, c-format
 msgid "Layer %d audio"
 msgstr "שמע בשכבה %d"
 
-#: src/multitrack.c:10144 src/multitrack.c:10261
+#: src/multitrack.c:10353 src/multitrack.c:10481
 #, c-format
 msgid "%s (layer %d)"
 msgstr "%s (שכבה %d)"
 
-#: src/multitrack.c:10184
+#: src/multitrack.c:10403
 msgid "Select track"
 msgstr "בחירת רצועה"
 
-#: src/multitrack.c:10188
+#: src/multitrack.c:10407
 msgid "Show/hide audio"
 msgstr ""
 
-#: src/multitrack.c:10194
+#: src/multitrack.c:10413
 #, c-format
 msgid "Video %d"
 msgstr "וידאו %d"
 
-#: src/multitrack.c:10233
+#: src/multitrack.c:10453
 #, c-format
 msgid " %s"
 msgstr " %s"
 
-#: src/multitrack.c:10346
+#: src/multitrack.c:10574
 msgid "LiVES: Selected effect"
 msgstr "LiVES: אפקט נבחר"
 
-#: src/multitrack.c:10358
+#: src/multitrack.c:10586
 msgid "_View/Edit this effect"
 msgstr "_הצגת\\עריכת אפקט זה"
 
-#: src/multitrack.c:10361
+#: src/multitrack.c:10588
 msgid "_View this effect"
 msgstr "_הצגת אפקט זה"
 
-#: src/multitrack.c:10369
+#: src/multitrack.c:10596
 msgid "_Delete this effect"
 msgstr "_מחיקת אפקט זה"
 
-#: src/multitrack.c:10422
+#: src/multitrack.c:10648
 msgid "Cannot insert after this effect"
 msgstr "לא ניתן להוסיף לאחר השפעה זו"
 
-#: src/multitrack.c:10451
+#: src/multitrack.c:10677
 msgid "This effect cannot be moved"
 msgstr "אפקט זה לא ניתן להעביר"
 
-#: src/multitrack.c:10499
+#: src/multitrack.c:10724
 #, c-format
 msgid "  %d to %d selected  "
 msgstr "  %d ל־%d נבחר...  "
 
-#: src/multitrack.c:10502 src/multitrack.c:10746
+#: src/multitrack.c:10727 src/multitrack.c:10968
 #, c-format
 msgid "%.2f sec."
 msgstr "%.2f שניות."
 
-#: src/multitrack.c:10717
+#: src/multitrack.c:10940
 #, c-format
 msgid "%d frames"
 msgstr "%d שקופיות"
 
-#: src/multitrack.c:11070
+#: src/multitrack.c:11299
 msgid ""
 "\n"
 "==============================\n"
@@ -9809,70 +9815,70 @@
 "==============================\n"
 "מותג למצב ריבוי רצועות\n"
 
-#: src/multitrack.c:12691
+#: src/multitrack.c:12939
 msgid "Drag the time slider to where you"
 msgstr ""
 
-#: src/multitrack.c:12692
+#: src/multitrack.c:12940
 msgid "want to set effect parameters"
 msgstr ""
 
-#: src/multitrack.c:12693
+#: src/multitrack.c:12941
 msgid "Set parameters, then click \"Apply\"\n"
 msgstr ""
 
-#: src/multitrack.c:12694
+#: src/multitrack.c:12942
 msgid ""
 "NODES are points where parameters\n"
 "have been set.\n"
 "Nodes can be deleted."
 msgstr ""
 
-#: src/multitrack.c:12697
+#: src/multitrack.c:12944
 msgid "Effect has no parameters.\n"
 msgstr "אפקט אין פרמטרים.\n"
 
-#: src/multitrack.c:12788
+#: src/multitrack.c:13033
 #, c-format
 msgid "%s output"
 msgstr "פלט %s"
 
-#: src/multitrack.c:12794 src/multitrack.c:12804
+#: src/multitrack.c:13038 src/multitrack.c:13046
 #, c-format
 msgid "layer %d"
 msgstr "שכבה %d"
 
-#: src/multitrack.c:12796 src/multitrack.c:12806
+#: src/multitrack.c:13039 src/multitrack.c:13047
 msgid "audio track"
 msgstr "רצועת שמע"
 
-#: src/multitrack.c:12797
+#: src/multitrack.c:13040
 #, c-format
 msgid "%s to %s"
 msgstr "%s ל־%s"
 
-#: src/multitrack.c:12807
+#: src/multitrack.c:13048
 #, c-format
 msgid "%s from %s"
 msgstr ""
 
-#: src/multitrack.c:12860
+#: src/multitrack.c:13099
 msgid "_Prev filter map"
 msgstr "מפת המסננים _הקודמת"
 
-#: src/multitrack.c:12871
+#: src/multitrack.c:13110
 msgid "Insert _before"
 msgstr "הוספה _לפני"
 
-#: src/multitrack.c:12881
+#: src/multitrack.c:13120
 msgid "Insert _after"
 msgstr "הוספה _אחרי"
 
-#: src/multitrack.c:12896
+#: src/multitrack.c:13134
 msgid "_Next filter map"
 msgstr "מפת המסננים _הבאה"
 
-#: src/multitrack.c:12911
+#: src/multitrack.c:13148
 msgid ""
 "\n"
 "\n"
@@ -9884,80 +9890,80 @@
 "אין השפעות על המסלול הנוכחי,\n"
 "הזמן הנוכחי.\n"
 
-#: src/multitrack.c:12929
+#: src/multitrack.c:13166
 msgid ""
 "Drag a compositor anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:12936
+#: src/multitrack.c:13173
 msgid ""
 "Drag a transition anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:12944
+#: src/multitrack.c:13181
 msgid ""
 "Effects can be dragged\n"
 "onto blocks on the timeline."
 msgstr ""
 
-#: src/multitrack.c:13166
+#: src/multitrack.c:13406
 msgid "LiVES: Selected block/frame"
 msgstr "LiVES: מקטע\\שקופית נבחרים"
 
-#: src/multitrack.c:13173
+#: src/multitrack.c:13413
 msgid "_Select this block"
 msgstr "_בחירת מקטע זה"
 
-#: src/multitrack.c:13183
+#: src/multitrack.c:13423
 msgid "_Split block here"
 msgstr "_פיצול המקטע כאן"
 
-#: src/multitrack.c:13191
+#: src/multitrack.c:13431
 msgid "List _effects here"
 msgstr "רשימת _האפקטים המוחלים כאן"
 
-#: src/multitrack.c:13200 src/multitrack.c:13277
+#: src/multitrack.c:13440 src/multitrack.c:13518
 #, c-format
 msgid "_Adjust %s"
 msgstr "_כיוון %s"
 
-#: src/multitrack.c:13215
+#: src/multitrack.c:13455
 msgid "_Delete this block"
 msgstr "_מחיקת מקטע זה"
 
-#: src/multitrack.c:13258
+#: src/multitrack.c:13500
 msgid "_Insert here"
 msgstr "_הוספה כאן"
 
-#: src/multitrack.c:13264
+#: src/multitrack.c:13505
 msgid "_Insert audio here"
 msgstr "_הוספת שמע כאן"
 
-#: src/multitrack.c:14801
+#: src/multitrack.c:15017
 #, c-format
 msgid "Inserted gap in selected tracks from time %.4f to %.4f\n"
 msgstr "נוסף מרווח ברצועות הנבחרות מהזמן %.4f ל־%.4f\n"
 
-#: src/multitrack.c:14835
+#: src/multitrack.c:15048
 #, c-format
 msgid "Inserted gap in track %s from time %.4f to %.4f\n"
 msgstr "נוסף מרווח ברצועה %s מהזמן %.4f ל־%.4f\n"
 
-#: src/multitrack.c:15036
+#: src/multitrack.c:15244
 #, c-format
 msgid "Undid %s\n"
 msgstr "ביטול הפעולה %s\n"
 
-#: src/multitrack.c:15235
+#: src/multitrack.c:15445
 #, c-format
 msgid "Redid %s\n"
 msgstr "ביצוע הפעולה %s מחדש\n"
 
-#: src/multitrack.c:15268
+#: src/multitrack.c:15475
 msgid ""
 "\n"
 " (variable)"
@@ -9965,82 +9971,82 @@
 "\n"
 " (משתנה)"
 
-#: src/multitrack.c:15502 src/multitrack.c:15614 src/multitrack.c:18736
-#: src/multitrack.c:18748
+#: src/multitrack.c:15710 src/multitrack.c:15823 src/multitrack.c:19077
+#: src/multitrack.c:19089
 #, c-format
 msgid "track %s"
 msgstr "הרצועה %s"
 
-#: src/multitrack.c:15507 src/multitrack.c:15619 src/multitrack.c:18741
+#: src/multitrack.c:15715 src/multitrack.c:15828 src/multitrack.c:19082
 #, c-format
 msgid "tracks %s and %s"
 msgstr "הרצועות %s ו־%s"
 
-#: src/multitrack.c:15513 src/multitrack.c:15625 src/multitrack.c:18751
+#: src/multitrack.c:15721 src/multitrack.c:15834 src/multitrack.c:19091
 msgid "selected tracks"
 msgstr "רצועות נבחרות"
 
-#: src/multitrack.c:15516
+#: src/multitrack.c:15726
 #, c-format
 msgid "Added %s %s to %s from %.4f to %.4f\n"
 msgstr "נוסף %s ל־%s ל־%s מ־%.4f ל־%.4f\n"
 
-#: src/multitrack.c:15550
+#: src/multitrack.c:15760
 #, c-format
 msgid "Added effect %s to track %s from %.4f to %.4f\n"
 msgstr "נוסף האפקט %s לרצועה %s מ־%.4f ל־%.4f\n"
 
-#: src/multitrack.c:15631
+#: src/multitrack.c:15845
 #, c-format
 msgid "Deleted %s %s from %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15935
+#: src/multitrack.c:16143
 #, c-format
 msgid "rendered %d frames to new clip.\n"
 msgstr "עובדו %d שקופיות לקטע חדש.\n"
 
-#: src/multitrack.c:16025
+#: src/multitrack.c:16230
 msgid "Cleaning up..."
 msgstr "מנקה..."
 
-#: src/multitrack.c:16712
+#: src/multitrack.c:17003
 msgid "_Pause"
 msgstr "_השהיה"
 
-#: src/multitrack.c:16713
+#: src/multitrack.c:17004
 msgid "Pause (p)"
 msgstr "השהיה (p)"
 
-#: src/multitrack.c:16856
+#: src/multitrack.c:17151
 msgid "Press 'm' during playback"
 msgstr "יש ללחוץ על 'm' בזמן נגינה"
 
-#: src/multitrack.c:16857
+#: src/multitrack.c:17152
 msgid "to make a mark on the timeline"
 msgstr "כדי לסמן את המיקום הנוכחי על ציר הזמן"
 
-#: src/multitrack.c:17154
+#: src/multitrack.c:17498
 #, c-format
 msgid ""
 "Inserted audio %.4f to %.4f from clip %s into backing audio from time %.4f "
 "to %.4f\n"
 msgstr "נוסף שמע %.4f ל־%.4f מהקטע %s למוזיקת הרקע מהזמן %.4f עד %.4f\n"
 
-#: src/multitrack.c:17414
+#: src/multitrack.c:17759
 #, c-format
 msgid ""
 "Inserted frames %d to %d from clip %s into track %s from time %.4f to %.4f\n"
 msgstr "נוספו שקופיות %d ל־%d מהקטע %s לרצועה %s מהזמן %.4f עד %.4f\n"
 
-#: src/multitrack.c:17998
+#: src/multitrack.c:18332
 #, c-format
 msgid ""
 "Time region %.3f to %.3f\n"
 "selected.\n"
 msgstr ""
 
-#: src/multitrack.c:18002
+#: src/multitrack.c:18336
 msgid ""
 "select one or more tracks\n"
 "to create a region.\n"
@@ -10048,106 +10054,106 @@
 "יש לבחור רצועה אחת או יותר\n"
 "כדי ליצור איזור.\n"
 
-#: src/multitrack.c:18004
+#: src/multitrack.c:18337
 #, c-format
 msgid "%d video tracks selected.\n"
 msgstr "נבחרו %d רצועות וידאו.\n"
 
-#: src/multitrack.c:18006
+#: src/multitrack.c:18339
 msgid ""
 "Double click on timeline\n"
 "to deselect time region."
 msgstr ""
 
-#: src/multitrack.c:18013
+#: src/multitrack.c:18346
 msgid ""
 "Single click on an effect\n"
 "to select it."
 msgstr ""
 
-#: src/multitrack.c:18014
+#: src/multitrack.c:18347
 msgid ""
 "Double click on an effect\n"
 "to edit it."
 msgstr ""
 
-#: src/multitrack.c:18015
+#: src/multitrack.c:18348
 msgid ""
 "Right click on an effect\n"
 "for context menu.\n"
 msgstr ""
 
-#: src/multitrack.c:18017
+#: src/multitrack.c:18350
 msgid ""
 "Effect order can be changed at\n"
 "FILTER MAPS"
 msgstr ""
 
-#: src/multitrack.c:18024
+#: src/multitrack.c:18357
 msgid ""
 "You can select an effect,\n"
 "then use the INSERT BEFORE"
 msgstr ""
 
-#: src/multitrack.c:18025
+#: src/multitrack.c:18358
 msgid "or INSERT AFTER buttons to move it."
 msgstr "או בכפתורי הכנסה אחרי כדי להזיזו."
 
-#: src/multitrack.c:18307 src/multitrack.c:18320
+#: src/multitrack.c:18639 src/multitrack.c:18652
 msgid "Click on another effect,"
 msgstr "לחץ על אפקט אחר,"
 
-#: src/multitrack.c:18308 src/multitrack.c:18321
+#: src/multitrack.c:18640 src/multitrack.c:18653
 msgid ""
 "and the selected one\n"
 "will be inserted"
 msgstr ""
 
-#: src/multitrack.c:18309
+#: src/multitrack.c:18641
 msgid "after it.\n"
 msgstr "אחריו.\n"
 
-#: src/multitrack.c:18322
+#: src/multitrack.c:18654
 msgid "before it.\n"
 msgstr "לפניו.\n"
 
-#: src/multitrack.c:18551
+#: src/multitrack.c:18889
 #, c-format
 msgid "Removed parameter values for effect %s at time %.4f\n"
 msgstr "הוסרו ערכי הפרמטר עבור האפקט %s בזמן %.4f\n"
 
-#: src/multitrack.c:18759
+#: src/multitrack.c:19100
 #, c-format
 msgid "Set parameter values for %s %s on %s at time %.4f\n"
 msgstr "ערכי הפרמטר נקבעו ל־%s %s על  %s בזמן %.4f\n"
 
-#: src/multitrack.c:19251 src/multitrack.c:20873
+#: src/multitrack.c:19630 src/multitrack.c:21195
 msgid "_Autoreload each time"
 msgstr "_טעינה אוטומטית מחדש כל פעם"
 
-#: src/multitrack.c:19323
+#: src/multitrack.c:19702
 #, fuzzy
 msgid "Saving layout"
 msgstr "שמירת _פריסה"
 
-#: src/multitrack.c:19345
+#: src/multitrack.c:19725
 #, c-format
 msgid "Saved layout to %s\n"
 msgstr "הפריסה נשמרה ל־%s\n"
 
-#: src/multitrack.c:20783
+#: src/multitrack.c:21125
 msgid "clips and frames"
 msgstr "קטעים ושקופיות"
 
-#: src/multitrack.c:20787
+#: src/multitrack.c:21128
 msgid "clips"
 msgstr "קטעים"
 
-#: src/multitrack.c:20790
+#: src/multitrack.c:21130
 msgid "frames"
 msgstr "שקופיות"
 
-#: src/multitrack.c:20800
+#: src/multitrack.c:21140
 msgid ""
 "\n"
 "Auto reload layout.\n"
@@ -10155,7 +10161,7 @@
 "\n"
 "טעינת פריסה אוטומטית.\n"
 
-#: src/multitrack.c:20803
+#: src/multitrack.c:21143
 #, c-format
 msgid ""
 "%s\n"
@@ -10166,11 +10172,11 @@
 "כמה %s אינם נמצאים בפריסה %s\n"
 "בעקבות כך הוא לא ייטען כראוי.\n"
 
-#: src/multitrack.c:20920
+#: src/multitrack.c:21284
 msgid "auto backup"
 msgstr ""
 
-#: src/multitrack.c:20923
+#: src/multitrack.c:21287
 #, c-format
 msgid ""
 "\n"
@@ -10179,31 +10185,31 @@
 "\n"
 "לא ניתן לטעון את קובץ הפריסה %s\n"
 
-#: src/multitrack.c:20944
+#: src/multitrack.c:21308
 #, c-format
 msgid "Loading layout from %s..."
 msgstr "טוען פריסה מ־%s..."
 
-#: src/multitrack.c:20978
+#: src/multitrack.c:21338
 #, c-format
 msgid "Got %d events...processing..."
 msgstr "התקבלו %d אירועים...מעבד..."
 
-#: src/multitrack.c:20991
+#: src/multitrack.c:21349
 msgid "Checking and rebuilding event list"
 msgstr "בודק ובונה מחדש את רשימת האירועים"
 
-#: src/multitrack.c:21017
+#: src/multitrack.c:21374
 #, c-format
 msgid "%d errors detected.\n"
 msgstr "אותרו %d שגיאות.\n"
 
-#: src/multitrack.c:21068
+#: src/multitrack.c:21422
 #, c-format
 msgid "Multitrack fps set to %.3f\n"
 msgstr "השקופיות לשנייה בריבוי הרצועות נקבעו ל־%.3f\n"
 
-#: src/multitrack.c:21225
+#: src/multitrack.c:21576
 #, fuzzy
 msgid ""
 "The current layout has changes which have not been saved.\n"
@@ -10212,19 +10218,19 @@
 "הפריסה הנוכחית לא נשמרה.\n"
 "איזור פעולה יש לבצע ?\n"
 
-#: src/multitrack.c:22047
+#: src/multitrack.c:22385
 msgid "LiVES: Multitrack audio mixer"
 msgstr "LiVES: מערבל שמע עבור ריבוי רצועות"
 
-#: src/multitrack.c:22077
+#: src/multitrack.c:22414
 msgid "_Reset values"
 msgstr "_איפוס ערכים"
 
-#: src/multitrack.c:22081
+#: src/multitrack.c:22418
 msgid "_Close mixer"
 msgstr "_סגירת המערבל"
 
-#: src/multitrack.c:22130
+#: src/multitrack.c:22466
 msgid ""
 "_Invert backing audio\n"
 "and layer volumes"
@@ -10232,41 +10238,41 @@
 "_היפוך מוזיקת הרקע\n"
 "ועוצמות השמע בשכבה"
 
-#: src/multitrack.c:22132
+#: src/multitrack.c:22468
 msgid "Adjust backing and layer audio values so that they sum to 1.0"
 msgstr "כיוון ערכי מוזיקת הרקע והשמע בשכבה כך שהם יגיעו לסכום 1.0"
 
-#: src/multitrack.c:22175
+#: src/multitrack.c:22510
 msgid "_Gang layer audio"
 msgstr "_חיבור שכבת השמע"
 
-#: src/multitrack.c:22177
+#: src/multitrack.c:22512
 msgid "Adjust all layer audio values to the same value"
 msgstr "כיוון כל ערכי שכבת השמע לאותו ערך"
 
-#: src/jack.c:104
+#: src/jack.c:102
 msgid "JACK server started\n"
 msgstr "הופעל שרת השמע JACK\n"
 
-#: src/jack.c:1284 src/jack.c:1353
+#: src/jack.c:1265 src/jack.c:1334
 msgid "Unable to connect to JACK server\n"
 msgstr "לא ניתן להתחבר לשרת השמע JACK\n"
 
-#: src/jack.c:1512
+#: src/jack.c:1491
 msgid "Started jack audio subsystem.\n"
 msgstr "הופעלה תת־מערכת השמע של jack.\n"
 
-#: src/jack.c:1623
+#: src/jack.c:1600
 msgid "Started jack audio reader.\n"
 msgstr "הופעל קורא השמע של jack.\n"
 
-#: src/jack.c:1838
+#: src/jack.c:1815
 msgid ""
 "\n"
 "Connection to jack audio was reset.\n"
 msgstr ""
 
-#: src/pulse.c:87
+#: src/pulse.c:88
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -10274,7 +10280,7 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:92
+#: src/pulse.c:94
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -10282,7 +10288,7 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:96
+#: src/pulse.c:99
 #, fuzzy
 msgid ""
 "\n"
@@ -10294,129 +10300,129 @@
 "נגן השמע \"jack\" או \"pulse audio\".\n"
 "באפשרותך לקבוע זאת בתפריט כלים|העדפות|נגינה."
 
-#: src/pulse.c:101
+#: src/pulse.c:104
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
 msgstr ""
 
-#: src/pulse.c:107
+#: src/pulse.c:109
 msgid "LiVES will exit and you can choose another audio player.\n"
 msgstr ""
 
-#: src/pulse.c:1352
+#: src/pulse.c:1335
 msgid ""
 "\n"
 "Connection to pulse audio was reset.\n"
 msgstr ""
 
-#: src/colourspace.c:1100
+#: src/colourspace.c:1092
 msgid "unclamped"
 msgstr "לחוץ"
 
-#: src/colourspace.c:1101
+#: src/colourspace.c:1093
 msgid "clamped"
 msgstr "לא לחוץ"
 
-#: src/omc-learn.c:195
+#: src/omc-learn.c:191
 #, c-format
 msgid "Responding to joystick events from %s\n"
 msgstr "מגיב לאירועי מוט היגוי מ־%s\n"
 
-#: src/omc-learn.c:289
+#: src/omc-learn.c:279
 msgid "Creating ALSA seq port..."
 msgstr "יוצר ערוץ Alsa seq..."
 
-#: src/omc-learn.c:325
+#: src/omc-learn.c:313
 #, c-format
 msgid "Responding to MIDI events from %s\n"
 msgstr "מגיב לאירועי MIDI מ־%s\n"
 
-#: src/omc-learn.c:568
+#: src/omc-learn.c:554
 msgid "data"
 msgstr "נתונים"
 
-#: src/omc-learn.c:571
+#: src/omc-learn.c:557
 msgid "velocity"
 msgstr "מהירות"
 
-#: src/omc-learn.c:572
+#: src/omc-learn.c:558
 msgid "note"
 msgstr "תו"
 
-#: src/omc-learn.c:574 src/omc-learn.c:736 src/omc-learn.c:1105
-#: src/omc-learn.c:1591 src/omc-learn.c:1640
+#: src/omc-learn.c:560 src/omc-learn.c:724 src/omc-learn.c:1092
+#: src/omc-learn.c:1581 src/omc-learn.c:1630
 msgid "value"
 msgstr "ערך"
 
-#: src/omc-learn.c:576
+#: src/omc-learn.c:562
 msgid "state"
 msgstr "מצב"
 
-#: src/omc-learn.c:688
+#: src/omc-learn.c:674
 msgid "variable"
 msgstr "משתנה"
 
-#: src/omc-learn.c:1001
+#: src/omc-learn.c:989
 msgid "Vars."
 msgstr "משתנים"
 
-#: src/omc-learn.c:1054
+#: src/omc-learn.c:1041
 #, c-format
 msgid "MIDI ch %d note on"
 msgstr "ערוץ MIDI %d תו דלוק"
 
-#: src/omc-learn.c:1058
+#: src/omc-learn.c:1045
 #, c-format
 msgid "MIDI ch %d note off"
 msgstr "ערוץ MIDI %d תו כבוי"
 
-#: src/omc-learn.c:1062
+#: src/omc-learn.c:1049
 #, c-format
 msgid "MIDI ch %d controller %d"
 msgstr "ערוץ MIDI %d בקר %d"
 
-#: src/omc-learn.c:1066
+#: src/omc-learn.c:1053
 #, c-format
 msgid "MIDI ch %d pitch bend"
 msgstr "גובה צליל של ערוץ ה־MIDI %d"
 
-#: src/omc-learn.c:1070
+#: src/omc-learn.c:1057
 #, c-format
 msgid "MIDI ch %d pgm change"
 msgstr ""
 
-#: src/omc-learn.c:1073
+#: src/omc-learn.c:1060
 #, c-format
 msgid "Joystick button %d"
 msgstr "כפתור %d במוט ההיגוי"
 
-#: src/omc-learn.c:1076
+#: src/omc-learn.c:1063
 #, c-format
 msgid "Joystick axis %d"
 msgstr "ידית %d במוט ההיגוי"
 
-#: src/omc-learn.c:1113
+#: src/omc-learn.c:1100
 msgid "x"
 msgstr "x"
 
-#: src/omc-learn.c:1122
+#: src/omc-learn.c:1109
 msgid "range"
 msgstr "טווח"
 
-#: src/omc-learn.c:1143
+#: src/omc-learn.c:1130
 msgid "+ offset1"
 msgstr "+ היסט 1"
 
-#: src/omc-learn.c:1161
+#: src/omc-learn.c:1150
 msgid "* scale"
 msgstr "* מידות"
 
-#: src/omc-learn.c:1179
+#: src/omc-learn.c:1170
 msgid "+ offset2"
 msgstr "+ היסט 2"
 
-#: src/omc-learn.c:1280
+#: src/omc-learn.c:1270
 msgid ""
 "\n"
 "Click OK to delete all entries\n"
@@ -10424,207 +10430,207 @@
 "\n"
 "יש ללחוץ על אישור כדי למחוק את כל הרשומות\n"
 
-#: src/omc-learn.c:1318
+#: src/omc-learn.c:1308
 msgid "LiVES: OMC learner"
 msgstr "LiVES: לומד OMC"
 
-#: src/omc-learn.c:1334
+#: src/omc-learn.c:1324
 msgid "Clear _unmatched"
 msgstr "ניקוי אירועים _לא מותאמים"
 
-#: src/omc-learn.c:1345
+#: src/omc-learn.c:1335
 msgid "_Delete all"
 msgstr "מ_חיקת הכל"
 
-#: src/omc-learn.c:1411
+#: src/omc-learn.c:1401
 msgid "Start video playback"
 msgstr "הפעלת נגינת וידאו"
 
-#: src/omc-learn.c:1414
+#: src/omc-learn.c:1404
 msgid "Stop video playback"
 msgstr "הפסקת נגינת הוידאו"
 
-#: src/omc-learn.c:1418
+#: src/omc-learn.c:1408
 msgid "Clip select <clipnum>"
 msgstr "בחירת הקטע <clipnum>"
 
-#: src/omc-learn.c:1419
+#: src/omc-learn.c:1409
 msgid "Switch foreground clip to the nth valid clip"
 msgstr "החלפת קטע הקדמה לקטע ה־nth התקין"
 
-#: src/omc-learn.c:1423
+#: src/omc-learn.c:1413
 msgid "Play forwards"
 msgstr "נגינה קדימה"
 
-#: src/omc-learn.c:1424
+#: src/omc-learn.c:1414
 msgid "Play video in a forwards direction"
 msgstr "נגינה בכיוון קדימה"
 
-#: src/omc-learn.c:1427
+#: src/omc-learn.c:1417
 msgid "Play backwards"
 msgstr "נגינה אחורה"
 
-#: src/omc-learn.c:1428
+#: src/omc-learn.c:1418
 msgid "Play video in a backwards direction"
 msgstr "נגינה בכיוון אחורה"
 
-#: src/omc-learn.c:1431
+#: src/omc-learn.c:1421
 msgid "Reverse playback direction"
 msgstr "היפוך כיוון הנגינה"
 
-#: src/omc-learn.c:1432
+#: src/omc-learn.c:1422
 msgid "Reverse direction of video playback"
 msgstr "היפוך כיוון נגינת הוידאו"
 
-#: src/omc-learn.c:1435
+#: src/omc-learn.c:1425
 msgid "Play video faster"
 msgstr "נגינת וידאו מהר יותר"
 
-#: src/omc-learn.c:1436
+#: src/omc-learn.c:1426
 msgid "Play video at a slightly faster rate"
 msgstr "נגינת הוידאו מעט יותר מהר"
 
-#: src/omc-learn.c:1439
+#: src/omc-learn.c:1429
 msgid "Play video slower"
 msgstr "נגינת וידאו לאט יותר"
 
-#: src/omc-learn.c:1440
+#: src/omc-learn.c:1430
 msgid "Play video at a slightly slower rate"
 msgstr "נגינת הוידאו מעט יותר לאט"
 
-#: src/omc-learn.c:1443
+#: src/omc-learn.c:1433
 msgid "Toggle video freeze"
 msgstr "שינוי קיפאון וידאו"
 
-#: src/omc-learn.c:1444
+#: src/omc-learn.c:1434
 msgid "Freeze video, or if already frozen, unfreeze it"
 msgstr "הקפאת וידאו או ביטול הקפאתו"
 
-#: src/omc-learn.c:1447
+#: src/omc-learn.c:1437
 msgid "Set video framerate to <fps>"
 msgstr "קביעת קצב השקופיות ל־<fps>"
 
-#: src/omc-learn.c:1448
+#: src/omc-learn.c:1438
 msgid "Set framerate of foreground clip to <float fps>"
 msgstr "קביעת קצב השקופיות של קטע הקדמה ל־<float fps>"
 
-#: src/omc-learn.c:1452
+#: src/omc-learn.c:1442
 msgid "Start recording"
 msgstr "התחלת הקלטה"
 
-#: src/omc-learn.c:1455
+#: src/omc-learn.c:1445
 msgid "Stop recording"
 msgstr "הפסקת הקלטה"
 
-#: src/omc-learn.c:1458
+#: src/omc-learn.c:1448
 msgid "Toggle recording state"
 msgstr "שינוי מצב הקלטה"
 
-#: src/omc-learn.c:1461
+#: src/omc-learn.c:1451
 msgid "Swap foreground and background clips"
 msgstr "החלפה בין קטעי הקדמה והרקע"
 
-#: src/omc-learn.c:1463
+#: src/omc-learn.c:1453
 msgid "Reset effect keys"
 msgstr "איפוס מקשי האפקטים"
 
-#: src/omc-learn.c:1464
+#: src/omc-learn.c:1454
 msgid "Switch all effects off."
 msgstr "כיבוי כל האפקטים."
 
-#: src/omc-learn.c:1467
+#: src/omc-learn.c:1457
 msgid "Enable effect key <key>"
 msgstr "הפעלת מקש האפקט <key>"
 
-#: src/omc-learn.c:1471
+#: src/omc-learn.c:1461
 msgid "Disable effect key <key>"
 msgstr "ביטול מקש האפקט <מקש>"
 
-#: src/omc-learn.c:1475
+#: src/omc-learn.c:1465
 msgid "Toggle effect key <key>"
 msgstr "החלפת מצב מקש האפקט <מקש>"
 
-#: src/omc-learn.c:1479
+#: src/omc-learn.c:1469
 msgid "Set parameter value <key> <pnum> = <value>"
 msgstr "הגדרת ערך לפרמטר <מקש> <מס_פרמטר> = <ערך>"
 
-#: src/omc-learn.c:1480
+#: src/omc-learn.c:1470
 msgid "Set <value> of pth (numerical) parameter for effect key <key>."
 msgstr ""
 
-#: src/omc-learn.c:1484
+#: src/omc-learn.c:1474
 msgid "Switch foreground to next clip"
 msgstr "החלפת הקדמה בסרטון הבא"
 
-#: src/omc-learn.c:1487
+#: src/omc-learn.c:1477
 msgid "Switch foreground to previous clip"
 msgstr "החלפת הקדמה בסרטון הקודם"
 
-#: src/omc-learn.c:1490
+#: src/omc-learn.c:1480
 msgid "Set video framerate to ratio <fps_ratio>"
 msgstr "הגדרת קצב השקופיות של הווידאו ליחס <יחס_fps>"
 
-#: src/omc-learn.c:1491
+#: src/omc-learn.c:1481
 msgid "Set framerate ratio of foreground clip to <float fps_ratio>"
 msgstr ""
 
-#: src/omc-learn.c:1495
+#: src/omc-learn.c:1485
 msgid "Retrigger clip <clipnum>"
 msgstr ""
 
-#: src/omc-learn.c:1496
+#: src/omc-learn.c:1486
 msgid ""
 "Switch foreground clip to the nth valid clip, and reset the frame number"
 msgstr ""
 
-#: src/omc-learn.c:1500
+#: src/omc-learn.c:1490
 msgid "Cycle to next mode for effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1504
+#: src/omc-learn.c:1494
 msgid "Cycle to previous mode for effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1508
+#: src/omc-learn.c:1498
 msgid "Set playback plugin parameter value <pnum> = <value>"
 msgstr ""
 
-#: src/omc-learn.c:1509
+#: src/omc-learn.c:1499
 msgid "Set <value> of pth parameter for the playback plugin."
 msgstr ""
 
 #. TRANSLATORS: short form of "clip number"
-#: src/omc-learn.c:1536 src/omc-learn.c:1607
+#: src/omc-learn.c:1526 src/omc-learn.c:1597
 msgid "clipnum"
 msgstr "מספר קטע"
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1545
+#: src/omc-learn.c:1535
 msgid "fps"
 msgstr "שקופיות לשניה"
 
 #. TRANSLATORS: as in keyboard key
-#: src/omc-learn.c:1553 src/omc-learn.c:1560 src/omc-learn.c:1567
-#: src/omc-learn.c:1575 src/omc-learn.c:1615 src/omc-learn.c:1623
+#: src/omc-learn.c:1543 src/omc-learn.c:1550 src/omc-learn.c:1557
+#: src/omc-learn.c:1565 src/omc-learn.c:1605 src/omc-learn.c:1613
 msgid "key"
 msgstr "מפתח"
 
 #. TRANSLATORS: short form of "parameter number"
-#: src/omc-learn.c:1583 src/omc-learn.c:1632
+#: src/omc-learn.c:1573 src/omc-learn.c:1622
 msgid "pnum"
 msgstr "מס_פרמטר"
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1599
+#: src/omc-learn.c:1589
 msgid "fps_ratio"
 msgstr "יחס_fps"
 
-#: src/omc-learn.c:2443
+#: src/omc-learn.c:2417
 #, c-format
 msgid "Saving device mapping to file %s..."
 msgstr "מתבצעת שמירת מיפוי ההתקן לקובץ %s..."
 
-#: src/omc-learn.c:2527
+#: src/omc-learn.c:2498
 #, c-format
 msgid ""
 "\n"
@@ -10637,7 +10643,7 @@
 "שגיאה בפענוח הקובץ\n"
 "%s\n"
 
-#: src/omc-learn.c:2534
+#: src/omc-learn.c:2505
 #, c-format
 msgid ""
 "\n"
@@ -10650,12 +10656,12 @@
 "גרסה לא תקינה בקובץ\n"
 "%s\n"
 
-#: src/omc-learn.c:2571
+#: src/omc-learn.c:2541
 #, c-format
 msgid "Loading device mapping from file %s..."
 msgstr "טוען מיפוי התקן מהקובץ %s..."
 
-#: src/omc-learn.c:2576
+#: src/omc-learn.c:2544
 #, c-format
 msgid ""
 "\n"
@@ -10670,12 +10676,12 @@
 "%s\n"
 "קוד שגיאה %d\n"
 
-#: src/videodev.c:547
+#: src/videodev.c:539
 #, c-format
 msgid "Unable to open device %s\n"
 msgstr ""
 
-#: src/videodev.c:564
+#: src/videodev.c:554
 #, c-format
 msgid "Opened device %s\n"
 msgstr ""
@@ -11657,6 +11663,15 @@
 #~ msgid "$error"
 #~ msgstr "$error"
 
+#~ msgid "Pause"
+#~ msgstr "השהיה"
+
+#~ msgid "Start frame"
+#~ msgstr "שקופית התחלה"
+
+#~ msgid "End frame"
+#~ msgstr "שקופית סיום"
+
 #, fuzzy
 #~ msgid "_Open"
 #~ msgstr "_פתיחה..."

LiVES-2.2.8.tar.bz2/po/hr.po -> LiVES-2.4.1.tar.bz2/po/hr.po Changed

@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n"
-"POT-Creation-Date: 2015-02-08 17:18-0300\n"
+"POT-Creation-Date: 2015-08-09 14:52-0300\n"
 "PO-Revision-Date: 2013-03-14 12:31+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Croatian <hr@li.org>\n"
@@ -18,8 +18,7 @@
 "X-Launchpad-Export-Date: 2013-03-28 10:41+0000\n"
 "X-Generator: Launchpad (build 16546)\n"
 
-#. TRANSLATORS: do not translate this message
-#: src/main.c:118
+#: src/main.c:128
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -28,22 +27,22 @@
 "http://lives.sourceforge.net/TRANS-README.txt"
 msgstr ""
 
-#: src/main.c:134
+#: src/main.c:153
 #, c-format
 msgid "%s Warning: %s\n"
 msgstr ""
 
-#: src/main.c:138
+#: src/main.c:157
 #, c-format
 msgid "%s Critical error: %s\n"
 msgstr ""
 
-#: src/main.c:139
+#: src/main.c:158
 #, c-format
 msgid "%s Fatal error: %s\n"
 msgstr ""
 
-#: src/main.c:176
+#: src/main.c:198
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -57,7 +56,7 @@
 "group_id=64341&atid=507139\n"
 "Hvala. Oporavak bi trebao biti moguće ako se ponovno LiVES.\n"
 
-#: src/main.c:177
+#: src/main.c:199
 msgid ""
 "\n"
 "\n"
@@ -69,7 +68,7 @@
 "Kada izvještavanje crashes, molimo uključite detalje vašeg operacijskog "
 "sustava, distribucije, a LiVES verzija ("
 
-#: src/main.c:180
+#: src/main.c:203
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -77,7 +76,7 @@
 "i sve podatke prikazane u nastavku:\n"
 "\n"
 
-#: src/main.c:184
+#: src/main.c:206
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
@@ -87,84 +86,84 @@
 "prikupljanja više infomacija.\n"
 "\n"
 
-#: src/main.c:192
+#: src/main.c:216
 msgid "Preserving set.\n"
 msgstr "Očuvanje set.\n"
 
-#: src/main.c:636
+#: src/main.c:691
 msgid "Resizing"
 msgstr "Promjena veličine"
 
-#: src/main.c:643
+#: src/main.c:698
 msgid "_Resize All Frames"
 msgstr ""
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:895
+#: src/main.c:948
 msgid "Any"
 msgstr "Bilo koji"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:897
+#: src/main.c:950
 msgid "None"
 msgstr "Nijedan"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:899
+#: src/main.c:952
 msgid "recommended"
 msgstr "preporučeno"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:901
+#: src/main.c:954
 msgid "disabled !"
 msgstr "isključeno !"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:903
+#: src/main.c:956
 msgid "**The current layout**"
 msgstr "**Trenutni izgled**"
 
 #. TRANSLATORS: adjective for "Built in" type effects
-#: src/main.c:905
+#: src/main.c:958
 msgid "Builtin"
 msgstr ""
 
 #. TRANSLATORS: adjective for "Custom" type effects
-#: src/main.c:907
+#: src/main.c:960
 msgid "Custom"
 msgstr ""
 
 #. TRANSLATORS: adjective for "Test" type effects
-#: src/main.c:909
+#: src/main.c:962
 msgid "Test"
 msgstr ""
 
-#: src/main.c:1054
+#: src/main.c:1107
 msgid "Foreground"
 msgstr ""
 
-#: src/main.c:1055
+#: src/main.c:1108
 #, fuzzy
 msgid "Background"
 msgstr "_Zanemari promjene"
 
-#: src/main.c:1566
+#: src/main.c:1624
 msgid "Loading realtime effect plugins..."
 msgstr "Učitavanje stvarnom efekt čep..."
 
-#: src/main.c:1631
+#: src/main.c:1690
 msgid "Starting jack audio server..."
 msgstr "Pokrećem jack audio poslužitelj..."
 
-#: src/main.c:1633
+#: src/main.c:1692
 msgid "Starting jack transport server..."
 msgstr "Pokrećem jack transport server..."
 
-#: src/main.c:1634
+#: src/main.c:1693
 msgid "Connecting to jack transport server..."
 msgstr "Spajanje na jack transport server..."
 
-#: src/main.c:1663
+#: src/main.c:1723
 #, c-format
 msgid ""
 "\n"
@@ -176,114 +175,114 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1697
+#: src/main.c:1758
 msgid "Starting pulse audio server..."
 msgstr "Pokrećem pulse audio poslužitelj..."
 
-#: src/main.c:1765
+#: src/main.c:1825
 msgid "Checking optional dependencies:"
 msgstr "Provjera izborno ovisnosti:"
 
-#: src/main.c:1766
+#: src/main.c:1826
 msgid "mplayer...detected..."
 msgstr "mplayer...pronađen..."
 
-#: src/main.c:1767
+#: src/main.c:1827
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...NIJE PRONAĐEN..."
 
-#: src/main.c:1768
+#: src/main.c:1828
 #, fuzzy
 msgid "mplayer2...detected..."
 msgstr "mplayer...pronađen..."
 
-#: src/main.c:1769
+#: src/main.c:1829
 #, fuzzy
 msgid "mplayer2...NOT DETECTED..."
 msgstr "mplayer...NIJE PRONAĐEN..."
 
-#: src/main.c:1770
+#: src/main.c:1830
 msgid "convert...detected..."
 msgstr "convert...pronađen..."
 
-#: src/main.c:1771
+#: src/main.c:1831
 msgid "convert...NOT DETECTED..."
 msgstr "convert...NIJE PRONAĐEN..."
 
-#: src/main.c:1772
+#: src/main.c:1832
 msgid "composite...detected..."
 msgstr "composite...otkriti..."
 
-#: src/main.c:1773
+#: src/main.c:1833
 msgid "composite...NOT DETECTED..."
 msgstr "composite...NIJE OTKRIVENA..."
 
-#: src/main.c:1774
+#: src/main.c:1834
 msgid "sox...detected\n"
 msgstr "sox...pronađen\n"
 
-#: src/main.c:1775
+#: src/main.c:1835
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...NIJE PRONAĐEN...\n"
 
-#: src/main.c:1776
+#: src/main.c:1836
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...pronađen..."
 
-#: src/main.c:1777
+#: src/main.c:1837
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...NIJE PRONAĐEN..."
 
-#: src/main.c:1778
+#: src/main.c:1838
 msgid "jackd...detected..."
 msgstr "jackd...pronađen..."
 
-#: src/main.c:1779
+#: src/main.c:1839
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...NIJE PRONAĐEN..."
 
-#: src/main.c:1780
+#: src/main.c:1840
 msgid "pulse audio...detected..."
 msgstr "pulse audio...otkriti..."
 
-#: src/main.c:1781
+#: src/main.c:1841
 msgid "pulse audio...NOT DETECTED..."
 msgstr "pulse audio...NIJE PRONAĐEN..."
 
-#: src/main.c:1782
+#: src/main.c:1842
 msgid "python...detected..."
 msgstr "python...otkriti..."
 
-#: src/main.c:1783
+#: src/main.c:1843
 msgid "python...NOT DETECTED..."
 msgstr "python......NIJE PRONAĐEN..."
 
-#: src/main.c:1784
+#: src/main.c:1844
 msgid "dvgrab...detected..."
 msgstr "dvgrab...otkriti..."
 
-#: src/main.c:1785
+#: src/main.c:1845
 msgid "dvgrab...NOT DETECTED..."
 msgstr "dvgrab...NIJE PRONAĐEN..."
 
-#: src/main.c:1786
+#: src/main.c:1846
 msgid "xwininfo...detected..."
 msgstr "xwininfo...otkriti..."
 
-#: src/main.c:1787
+#: src/main.c:1847
 msgid "xwininfo...NOT DETECTED..."
 msgstr "xwininfo...NIJE PRONAĐEN..."
 
-#: src/main.c:1793
+#: src/main.c:1853
 #, c-format
 msgid "Windows version %04X"
 msgstr ""
 
-#: src/main.c:1795
+#: src/main.c:1855
 msgid "UNKNOWN - please patch me !"
 msgstr ""
 
-#: src/main.c:1799
+#: src/main.c:1859
 #, c-format
 msgid ""
 "\n"
@@ -294,48 +293,48 @@
 "\n"
 "Uređivač prozora prijavljuje kao \"%s\"; "
 
-#: src/main.c:1802
+#: src/main.c:1862
 #, c-format
 msgid "number of monitors detected: %d\n"
 msgstr "Pronađen broj zaslona: %d\n"
 
-#: src/main.c:1805
+#: src/main.c:1865
 #, c-format
 msgid "Number of CPUs detected: %d "
 msgstr ""
 
-#: src/main.c:1808 src/multitrack.c:4902
+#: src/main.c:1868 src/multitrack.c:5068
 msgid "little endian"
 msgstr ""
 
-#: src/main.c:1809 src/multitrack.c:4901
+#: src/main.c:1869 src/multitrack.c:5067
 msgid "big endian"
 msgstr ""
 
-#: src/main.c:1810
+#: src/main.c:1870
 #, c-format
 msgid "(%d bits, %s)\n"
 msgstr ""
 
-#: src/main.c:1814
+#: src/main.c:1874
 msgid "GUI type is: "
 msgstr ""
 
-#: src/main.c:1818
+#: src/main.c:1878
 #, c-format
 msgid "GTK+ version %d.%d.%d (compiled with %d.%d.%d)"
 msgstr ""
 
-#: src/main.c:1840
+#: src/main.c:1900
 msgid ", with cairo support"
 msgstr ""
 
-#: src/main.c:1847
+#: src/main.c:1907
 #, c-format
 msgid "Temp directory is %s\n"
 msgstr "Temp direktorij je %s\n"
 
-#: src/main.c:1851
+#: src/main.c:1911
 msgid ""
 "WARNING - this version of LiVES was compiled without either\n"
 "jack or pulse audio support.\n"
@@ -345,15 +344,15 @@
 "jack ili pulse audio podršku.\n"
 "Mnogi audio značajke neće biti dostupna.\n"
 
-#: src/main.c:1854
+#: src/main.c:1914
 msgid "Compiled with jack support, good !\n"
 msgstr "Kompiliran s jack podrškom, dobro !\n"
 
-#: src/main.c:1857
+#: src/main.c:1917
 msgid "Compiled with pulse audio support, wonderful !\n"
 msgstr "Kompliliran s pulse audio podrškom, odlično !\n"
 
-#: src/main.c:1861
+#: src/main.c:1921
 #, c-format
 msgid ""
 "Welcome to LiVES version %s.\n"
@@ -362,136 +361,141 @@
 "Dobrodošli u LiVES verziju %s.\n"
 "\n"
 
-#: src/main.c:2306
+#: src/main.c:2380
 #, c-format
 msgid ""
 "\n"
 "Startup syntax is: %s [opts] [filename [start_time] [frames]]\n"
 msgstr ""
 
-#: src/main.c:2307
+#: src/main.c:2381
 msgid "Where: filename is the name of a media file or backup file.\n"
 msgstr ""
 
-#: src/main.c:2308
+#: src/main.c:2382
 msgid "start_time : filename start time in seconds\n"
 msgstr ""
 
-#: src/main.c:2309
+#: src/main.c:2383
 msgid "frames : maximum number of frames to open\n"
 msgstr "FRAMES : maksimalni broj okvira za otvaranje\n"
 
-#: src/main.c:2311
+#: src/main.c:2385
 msgid "opts can be:\n"
 msgstr "opts mogu biti:\n"
 
-#: src/main.c:2312
+#: src/main.c:2386
 msgid "-help            : show this help text and exit\n"
 msgstr "-help : pokaži ovaj tekst za pomoć i izađi\n"
 
-#: src/main.c:2313
+#: src/main.c:2387
 msgid "-tmpdir <tempdir>: use alternate working directory (e.g /var/ramdisk)\n"
 msgstr ""
 
-#: src/main.c:2314
+#: src/main.c:2388
 msgid "-set <setname>   : autoload clip set setname\n"
 msgstr ""
 
-#: src/main.c:2315
+#: src/main.c:2389
 msgid "-noset           : do not load any set on startup\n"
 msgstr "-noset : ne učitavanje bilo postaviti na početak\n"
 
-#: src/main.c:2316
+#: src/main.c:2390
 msgid "-norecover       : force no-loading of crash recovery\n"
 msgstr ""
 
-#: src/main.c:2317
+#: src/main.c:2391
 msgid "-recover         : force loading of crash recovery\n"
 msgstr ""
 
-#: src/main.c:2318
-msgid "-nothreaddialog  : doe nothing - retained for backwards compatibility\n"
+#: src/main.c:2392
+msgid ""
+"-nothreaddialog  : does nothing - retained for backwards compatibility\n"
 msgstr ""
 
-#: src/main.c:2319
+#: src/main.c:2393
 msgid "-nogui           : do not show the gui\n"
 msgstr "-nogui : nemoj prikazati korisničko grafičko sučelje\n"
 
-#: src/main.c:2320
+#: src/main.c:2394
 msgid "-nosplash        : do not show the splash window\n"
 msgstr ""
 
-#: src/main.c:2321
+#: src/main.c:2395
 msgid "-noplaywin       : do not show the play window\n"
 msgstr "-noplaywin       : ne pokazuju prozor igrati\n"
 
-#: src/main.c:2322
+#: src/main.c:2396
+msgid "-noninteractive  : disable menu interactivity\n"
+msgstr ""
+
+#: src/main.c:2397
 msgid "-startup-ce      : start in clip editor mode\n"
 msgstr ""
 
-#: src/main.c:2323
+#: src/main.c:2398
 msgid "-startup-mt      : start in multitrack mode\n"
 msgstr ""
 
-#: src/main.c:2324
+#: src/main.c:2399
 msgid ""
 "-fxmodesmax <n>  : allow <n> modes per effect key (minimum is 1, default is "
 "8)\n"
 msgstr ""
 
-#: src/main.c:2326
+#: src/main.c:2401
 msgid "-oscstart <port> : start OSC listener on UDP port <port>\n"
 msgstr ""
 
-#: src/main.c:2327
+#: src/main.c:2402
 msgid "-nooscstart      : do not start OSC listener\n"
 msgstr ""
 
-#: src/main.c:2329
+#: src/main.c:2404
 msgid ""
 "-aplayer <ap>    : start with selected audio player. <ap> can be mplayer, "
 "mplayer2"
 msgstr ""
 
 #. TRANSLATORS: pulse (audio)
-#: src/main.c:2332
+#: src/main.c:2407
 msgid ", pulse"
 msgstr ", pulse"
 
-#: src/main.c:2335
+#: src/main.c:2410
 msgid ", sox or jack\n"
 msgstr ", sox ili jack\n"
 
-#: src/main.c:2336
+#: src/main.c:2412
 msgid ""
 "-jackopts <opts>    : opts is a bitmap of jack startup options [1 = jack "
 "transport client, 2 = jack transport master, 4 = start jack transport "
 "server, 8 = pause audio when video paused, 16 = start jack audio server] \n"
 msgstr ""
 
-#: src/main.c:2338
+#: src/main.c:2414
 msgid " or sox\n"
 msgstr " ili sox\n"
 
-#: src/main.c:2340
+#: src/main.c:2416
 msgid "-devicemap <mapname>          : autoload devicemap\n"
 msgstr ""
 
-#: src/main.c:2341
+#: src/main.c:2418
 msgid ""
 "-vppdefaults <file>          : load video playback plugin defaults from "
 "<file> (Note: only sets the settings, not the plugin type)\n"
 msgstr ""
 
-#: src/main.c:2342
+#: src/main.c:2419
 msgid "-debug            : try to debug crashes (requires 'gdb' installed)\n"
 msgstr ""
 
-#: src/main.c:2373 src/gui.c:1128
+#: src/main.c:2449 src/gui.c:1127
 msgid "Starting GUI..."
 msgstr "Početna GUI..."
 
-#: src/main.c:2396
+#: src/main.c:2475
 #, c-format
 msgid ""
 "\n"
@@ -502,7 +506,7 @@
 "(Maybe you need to change the value of <prefix_dir> in your %s file)\n"
 msgstr ""
 
-#: src/main.c:2410
+#: src/main.c:2492
 #, c-format
 msgid ""
 "\n"
@@ -510,7 +514,7 @@
 "Please make sure you have write access to %s and try again.\n"
 msgstr ""
 
-#: src/main.c:2415
+#: src/main.c:2498
 msgid ""
 "\n"
 "`smogrify` must be in your path, and be executable\n"
@@ -519,7 +523,7 @@
 "before running LiVES.\n"
 msgstr ""
 
-#: src/main.c:2421
+#: src/main.c:2504
 #, c-format
 msgid ""
 "\n"
@@ -529,7 +533,7 @@
 "Please check the file permissions for this file and try again.\n"
 msgstr ""
 
-#: src/main.c:2428
+#: src/main.c:2512
 #, c-format
 msgid ""
 "\n"
@@ -540,7 +544,7 @@
 "and try again.\n"
 msgstr ""
 
-#: src/main.c:2438
+#: src/main.c:2522
 #, c-format
 msgid ""
 "Please check the <tempdir> setting in \n"
@@ -548,7 +552,7 @@
 "and try again.\n"
 msgstr ""
 
-#: src/main.c:2445
+#: src/main.c:2528
 #, c-format
 msgid ""
 "\n"
@@ -558,7 +562,7 @@
 "%s"
 msgstr ""
 
-#: src/main.c:2453
+#: src/main.c:2536
 msgid ""
 "\n"
 "An incorrect version of smogrify was found in your path.\n"
@@ -569,49 +573,49 @@
 "Thankyou.\n"
 msgstr ""
 
-#: src/main.c:2458
+#: src/main.c:2541
 msgid ""
 "\n"
 "LiVES currently requires 'mplayer', 'mplayer2' or 'sox' to function. Please "
 "install one or other of these, and try again.\n"
 msgstr ""
 
-#: src/main.c:2462
+#: src/main.c:2546
 msgid ""
 "\n"
 "LiVES currently requires both 'mplayer' or 'mplayer2' and 'sox' to function. "
 "Please install these, and try again.\n"
 msgstr ""
 
-#: src/main.c:2472
+#: src/main.c:2556
 msgid ""
 "\n"
 "LiVES was unable to locate 'mplayer' or 'mplayer2'. You may wish to install "
 "either one to use LiVES more fully.\n"
 msgstr ""
 
-#: src/main.c:2475
+#: src/main.c:2561
 msgid ""
 "\n"
 "LiVES was unable to locate 'convert'. You should install convert and image-"
 "magick if you want to use rendered effects.\n"
 msgstr ""
 
-#: src/main.c:2478
+#: src/main.c:2566
 msgid ""
 "\n"
 "LiVES was unable to locate 'composite'. You should install composite and "
 "image-magick if you want to use the merge function.\n"
 msgstr ""
 
-#: src/main.c:2481
+#: src/main.c:2570
 msgid ""
 "\n"
 "LiVES was unable to locate 'sox'. Some audio features may not work. You "
 "should install 'sox'.\n"
 msgstr ""
 
-#: src/main.c:2484
+#: src/main.c:2575
 #, c-format
 msgid ""
 "\n"
@@ -622,59 +626,59 @@
 "You may need to change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/main.c:2611
+#: src/main.c:2707
 #, c-format
 msgid "Autoloading set %s..."
 msgstr ""
 
 #. TRANSLATORS: localised name may be used here
-#: src/main.c:2781 src/interface.c:738
+#: src/main.c:2902
 msgid "LiVES"
 msgstr ""
 
-#: src/main.c:2948
+#: src/main.c:3066
 #, c-format
 msgid "Invalid audio player %s\n"
 msgstr ""
 
-#: src/main.c:3077
+#: src/main.c:3214
 #, c-format
 msgid "LiVES-%s: <Untitled%d> %dx%d : %d frames %d bpp %.3f fps"
 msgstr "LiVES-%s: <Bez naslova%d> %dx%d : %d okvira %d bpp %.3f fps"
 
-#: src/main.c:3082
+#: src/main.c:3219
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : ??? frames ??? bpp %.3f fps"
 msgstr "LiVES-%s: <%s> %dx%d : ??? okviri ??? bpp %.3f fps"
 
-#: src/main.c:3086
+#: src/main.c:3222
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : %d frames %d bpp %.3f fps"
 msgstr "LiVES-%s: <%s> %dx%d : %d okviri %d bpp %.3f fps"
 
-#: src/main.c:3094
+#: src/main.c:3229
 #, c-format
 msgid "LiVES-%s: <No File>"
 msgstr "LiVES-%s: <Nema datoteka>"
 
 #. TRANSLATORS: rec(ord)
-#: src/main.c:5085
+#: src/main.c:5201
 #, c-format
 msgid "rec %9d/%d"
 msgstr "rec %9d/%d"
 
 #. TRANSLATORS: out of memory (rec(ord))
-#: src/main.c:5091
+#: src/main.c:5206
 #, c-format
 msgid "!rec %9d/%d"
 msgstr "!rec %9d/%d"
 
-#: src/main.c:5398 src/main.c:5399 src/gui.c:2110 src/gui.c:3220
-#: src/saveplay.c:2336
+#: src/main.c:5500 src/main.c:5501 src/gui.c:2108 src/gui.c:3331
+#: src/saveplay.c:2315
 msgid "Play"
 msgstr "Reproduciraj"
 
-#: src/main.c:6128
+#: src/main.c:6216
 msgid ""
 "LiVES was unable to capture this image\n"
 "\n"
@@ -682,35 +686,35 @@
 "LiVES nije bio u mogućnosti to hvatanje ovu sliku\n"
 "\n"
 
-#: src/main.c:6250
+#: src/main.c:6345
 #, c-format
 msgid "Closed file %s\n"
 msgstr "Zatvoreno datoteke %s\n"
 
-#: src/main.c:6452 src/gui.c:648 src/utils.c:4312 src/utils.c:4344
-#: src/saveplay.c:3550 src/multitrack.c:4510 src/multitrack.c:6268
+#: src/main.c:6542 src/gui.c:647 src/utils.c:4256 src/utils.c:4286
+#: src/saveplay.c:3500 src/multitrack.c:4678 src/multitrack.c:6447
 msgid "_Undo"
 msgstr "_Poništi"
 
-#: src/main.c:6453 src/gui.c:666 src/utils.c:4313 src/utils.c:4345
-#: src/saveplay.c:3551 src/multitrack.c:4531 src/multitrack.c:6293
+#: src/main.c:6543 src/gui.c:665 src/utils.c:4257 src/utils.c:4287
+#: src/saveplay.c:3501 src/multitrack.c:4698 src/multitrack.c:6472
 msgid "_Redo"
 msgstr "_Ponovi"
 
-#: src/main.c:6493 src/interface.c:470 src/gui.c:2326 src/preferences.c:2357
-#: src/resample.c:1516
+#: src/main.c:6583 src/interface.c:457 src/gui.c:2324 src/preferences.c:2391
+#: src/resample.c:1488
 msgid "Video"
 msgstr "Video"
 
-#: src/main.c:6494 src/interface.c:483 src/gui.c:2351
+#: src/main.c:6584 src/interface.c:470 src/gui.c:2348
 msgid "Left Audio"
 msgstr ""
 
-#: src/main.c:6495 src/gui.c:2375
+#: src/main.c:6585 src/gui.c:2371
 msgid "Right Audio"
 msgstr ""
 
-#: src/main.c:6540
+#: src/main.c:6630
 msgid ""
 "\n"
 "\n"
@@ -719,11 +723,11 @@
 "Please adjust the playback options in Preferences and try again.\n"
 msgstr ""
 
-#: src/main.c:7051 src/plugins.c:1502
+#: src/main.c:7134 src/plugins.c:1468
 msgid "LiVES: - Play Window"
 msgstr ""
 
-#: src/startup.c:25
+#: src/startup.c:24
 #, c-format
 msgid ""
 "A directory named\n"
@@ -733,7 +737,7 @@
 "(Free space = %s)\n"
 msgstr ""
 
-#: src/startup.c:32
+#: src/startup.c:29
 #, c-format
 msgid ""
 "A directory named\n"
@@ -743,7 +747,7 @@
 "Please select another location.\n"
 msgstr ""
 
-#: src/startup.c:49
+#: src/startup.c:46
 #, c-format
 msgid ""
 "\n"
@@ -754,7 +758,7 @@
 "(Free space = %s)"
 msgstr ""
 
-#: src/startup.c:54
+#: src/startup.c:50
 #, c-format
 msgid ""
 "\n"
@@ -763,54 +767,54 @@
 "Please try again and choose a different location.\n"
 msgstr ""
 
-#: src/startup.c:96
+#: src/startup.c:92
 msgid "Directory name is too long !"
 msgstr "Imenik ime je predug!"
 
-#: src/startup.c:223
+#: src/startup.c:216
 msgid ""
 "LiVES FAILED TO START YOUR SELECTED AUDIO PLAYER !\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:230
+#: src/startup.c:222
 msgid ""
 "Before starting LiVES, you need to choose an audio player.\n"
 "\n"
 "PULSE AUDIO is recommended for most users"
 msgstr ""
 
-#: src/startup.c:233
+#: src/startup.c:225
 msgid ""
 ", but this version of LiVES was not compiled with pulse audio support.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:236
+#: src/startup.c:229
 msgid ""
 ", but you do not have pulse audio installed on your system.\n"
 " You are advised to install pulse audio first before running LiVES.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:241
+#: src/startup.c:233
 msgid "JACK audio is recommended for pro users"
 msgstr ""
 
-#: src/startup.c:244
+#: src/startup.c:236
 msgid ""
 ", but this version of LiVES was not compiled with jack audio support.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:247
+#: src/startup.c:239
 msgid ""
 ", but you do not have jackd installed. You may wish to install jackd first "
 "before running LiVES.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:250
+#: src/startup.c:242
 msgid ""
 ", but may prevent LiVES from starting on some systems.\n"
 "If LiVES will not start with jack, you can restart and try with another "
@@ -818,11 +822,11 @@
 "\n"
 msgstr ""
 
-#: src/startup.c:254
+#: src/startup.c:246
 msgid "SOX may be used if neither of the preceding players work, "
 msgstr "SOX mogu se koristiti ako niti jedan od prethodnih igrača radu, "
 
-#: src/startup.c:257
+#: src/startup.c:249
 msgid ""
 "but some audio features will be disabled.\n"
 "\n"
@@ -830,149 +834,149 @@
 "ali neke audio značajke bit će onemogućene.\n"
 "\n"
 
-#: src/startup.c:260
+#: src/startup.c:251
 msgid ""
 "but you do not have sox installed.\n"
 "You are advised to install it before running LiVES.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:264
+#: src/startup.c:255
 msgid ""
 "The MPLAYER/MPLAYER2 audio player is only recommended for testing purposes.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:281
+#: src/startup.c:271
 msgid "LiVES: - Choose an audio player"
 msgstr ""
 
-#: src/startup.c:298
+#: src/startup.c:288
 msgid "Use _pulse audio player"
 msgstr ""
 
-#: src/startup.c:320
+#: src/startup.c:310
 msgid "Use _jack audio player"
 msgstr ""
 
-#: src/startup.c:340
+#: src/startup.c:330
 msgid "Use _sox audio player"
 msgstr ""
 
-#: src/startup.c:361
+#: src/startup.c:351
 msgid "Use _mplayer audio player"
 msgstr ""
 
-#: src/startup.c:381
+#: src/startup.c:371
 msgid "Use _mplayer2 audio player"
 msgstr ""
 
-#: src/startup.c:405 src/startup.c:580 src/interface.c:1506
+#: src/startup.c:395 src/startup.c:569 src/interface.c:1398
 msgid "_Next"
 msgstr "_Slijedeće"
 
-#: src/startup.c:445
+#: src/startup.c:435
 msgid "Skipped"
 msgstr "Preskočen"
 
-#: src/startup.c:460
+#: src/startup.c:450
 msgid "Passed"
 msgstr "Prošao"
 
-#: src/startup.c:493
+#: src/startup.c:483
 msgid "Failed"
 msgstr "Nije uspjelo"
 
-#: src/startup.c:552
+#: src/startup.c:542
 msgid "LiVES: - Testing Configuration"
 msgstr ""
 
-#: src/startup.c:555
+#: src/startup.c:544
 msgid "LiVES: - Troubleshoot"
 msgstr "LiVES: - Rješavanje problema"
 
-#: src/startup.c:568
+#: src/startup.c:557
 msgid "LiVES will now run some basic configuration tests\n"
 msgstr ""
 
-#: src/startup.c:603
+#: src/startup.c:591
 msgid "Checking for \"sox\" presence"
 msgstr ""
 
-#: src/startup.c:607
+#: src/startup.c:595
 msgid ""
 "You should install sox to be able to use all the audio features in LiVES"
 msgstr ""
 
-#: src/startup.c:615
+#: src/startup.c:602
 msgid "Checking if sox can convert audio"
 msgstr ""
 
-#: src/startup.c:638
+#: src/startup.c:625
 msgid "Unable to allocate 176400 bytes memory."
 msgstr ""
 
-#: src/startup.c:653
+#: src/startup.c:639
 #, c-format
 msgid "Unable to write to: %s"
 msgstr ""
 
-#: src/startup.c:667 src/startup.c:807
+#: src/startup.c:653 src/startup.c:789
 #, c-format
 msgid "Command failed: %s"
 msgstr ""
 
-#: src/startup.c:689
+#: src/startup.c:675
 msgid "You should install sox_fmt_all or similar"
 msgstr ""
 
-#: src/startup.c:717
+#: src/startup.c:703
 msgid "Checking for \"mplayer\" presence"
 msgstr ""
 
-#: src/startup.c:721
+#: src/startup.c:707
 msgid ""
 "You should install mplayer or mplayer2 to be able to use all the decoding "
 "features in LiVES"
 msgstr ""
 
-#: src/startup.c:747
+#: src/startup.c:732
 msgid "Checking if mplayer can convert audio"
 msgstr ""
 
-#: src/startup.c:768
+#: src/startup.c:751
 msgid "You should install mplayer or mplayer2 with pcm/wav support"
 msgstr ""
 
-#: src/startup.c:785
+#: src/startup.c:767
 msgid "Checking if mplayer can decode to png/alpha"
 msgstr ""
 
-#: src/startup.c:828
+#: src/startup.c:810
 msgid "You may wish to upgrade mplayer to a newer version"
 msgstr "Vi svibanj želite nadograditi mplayer na noviju verziju"
 
-#: src/startup.c:854
+#: src/startup.c:836
 msgid "Checking if mplayer can decode to jpeg"
 msgstr ""
 
-#: src/startup.c:882
+#: src/startup.c:862
 msgid "You should install mplayer with either png/alpha or jpeg support"
 msgstr ""
 
-#: src/startup.c:883
+#: src/startup.c:863
 msgid "You may wish to add jpeg output support to mplayer"
 msgstr ""
 
-#: src/startup.c:892
+#: src/startup.c:872
 msgid "Checking for \"convert\" presence"
 msgstr ""
 
-#: src/startup.c:896
+#: src/startup.c:876
 msgid "Install imageMagick to be able to use all of the rendered effects"
 msgstr "Instalirajte ImageMagick da biste mogli koristiti sve donio efekte"
 
-#: src/startup.c:909
+#: src/startup.c:889
 msgid ""
 "\n"
 "\n"
@@ -980,7 +984,7 @@
 "Preferences/Decoding.    \n"
 msgstr ""
 
-#: src/startup.c:915
+#: src/startup.c:894
 msgid ""
 "\n"
 "\n"
@@ -992,7 +996,7 @@
 "    Kliknite na Odustani za izlaz i instalirati bilo koji nedostaju "
 "dijelovi, ili Sljedeće za nastavak    \n"
 
-#: src/startup.c:949
+#: src/startup.c:928
 msgid ""
 "\n"
 "\n"
@@ -1002,42 +1006,42 @@
 "\n"
 "Konačno, možete odabrati zadani sučelje za LiVES pokretanje.\n"
 
-#: src/startup.c:950
+#: src/startup.c:929
 msgid ""
 "\n"
 "\n"
 "LiVES has two main interfaces and you can start up with either of them.\n"
 msgstr ""
 
-#: src/startup.c:951
+#: src/startup.c:930
 msgid ""
 "\n"
 "\n"
 "The default can always be changed later from Preferences.\n"
 msgstr ""
 
-#: src/startup.c:961
+#: src/startup.c:940
 msgid "LiVES: - Choose the startup interface"
 msgstr "LiVES: - Odaberite pokretanja sučelja"
 
-#: src/startup.c:972
+#: src/startup.c:951
 msgid "Start in _Clip Edit mode"
 msgstr ""
 
-#: src/startup.c:975
+#: src/startup.c:954
 msgid "This is the best choice for simple editing tasks and for VJs\n"
 msgstr ""
 
-#: src/startup.c:981
+#: src/startup.c:960
 msgid "Start in _Multitrack mode"
 msgstr ""
 
-#: src/startup.c:983
+#: src/startup.c:962
 msgid ""
 "This is a better choice for complex editing tasks involving multiple clips.\n"
 msgstr ""
 
-#: src/startup.c:992
+#: src/startup.c:971
 msgid "_Finish"
 msgstr "_Završi"
 
@@ -1054,35 +1058,35 @@
 msgid "Apply _Deinterlace"
 msgstr ""
 
-#: src/interface.c:66
+#: src/interface.c:65
 msgid "If this is set, frames will be deinterlaced as they are imported."
 msgstr ""
 
-#: src/interface.c:113 src/callbacks.c:9623 src/callbacks.c:9646
-#: src/callbacks.c:9647 src/gui.c:3223 src/gui.c:3821 src/saveplay.c:2339
-#: src/saveplay.c:3138 src/dialogs.c:1514 src/dialogs.c:1515
-#: src/dialogs.c:1746 src/dialogs.c:1747 src/framedraw.c:238
-#: src/multitrack.c:8031
+#: src/interface.c:106 src/callbacks.c:9542 src/callbacks.c:9564
+#: src/callbacks.c:9565 src/gui.c:3333 src/gui.c:3946 src/saveplay.c:2317
+#: src/saveplay.c:3097 src/dialogs.c:1575 src/dialogs.c:1576
+#: src/dialogs.c:1804 src/dialogs.c:1805 src/framedraw.c:236
+#: src/multitrack.c:8210
 msgid "Preview"
 msgstr "Pregled"
 
-#: src/interface.c:132
+#: src/interface.c:125
 msgid "Click here to _Preview any selected video, image or audio file"
 msgstr ""
 
-#: src/interface.c:135
+#: src/interface.c:127
 msgid "Click here to _Preview any selected audio file"
 msgstr ""
 
-#: src/interface.c:138
+#: src/interface.c:129
 msgid "Click here to _Preview the video"
 msgstr ""
 
-#: src/interface.c:181 src/dialogs.c:2542
+#: src/interface.c:169 src/dialogs.c:2621
 msgid "LiVES: - Processing..."
 msgstr ""
 
-#: src/interface.c:217
+#: src/interface.c:205
 msgid ""
 "\n"
 "\n"
@@ -1091,8 +1095,8 @@
 "Remember to switch off effects (ctrl-0) afterwards !"
 msgstr ""
 
-#: src/interface.c:222 src/callbacks.c:9373 src/callbacks.c:9420
-#: src/dialogs.c:2570
+#: src/interface.c:210 src/callbacks.c:9283 src/callbacks.c:9332
+#: src/dialogs.c:2649
 msgid ""
 "\n"
 "Please Wait"
@@ -1100,188 +1104,178 @@
 "\n"
 "Pričekajte"
 
-#: src/interface.c:242
+#: src/interface.c:230
 msgid "Show Details"
 msgstr ""
 
-#: src/interface.c:254 src/dialogs.c:2584
+#: src/interface.c:242 src/dialogs.c:2663
 msgid "_Enough"
 msgstr "_Dovoljno"
 
-#: src/interface.c:255 src/framedraw.c:278
+#: src/interface.c:243 src/framedraw.c:276
 msgid "_Preview"
 msgstr "_Pregled"
 
-#: src/interface.c:257
+#: src/interface.c:245 src/callbacks.c:9282 src/callbacks.c:9330
 msgid "Paus_e"
 msgstr "Pauz_a"
 
-#: src/interface.c:258 src/callbacks.c:9417
+#: src/interface.c:246 src/callbacks.c:9329
 msgid "Pause/_Enough"
 msgstr "Pauza/_Dosta"
 
-#: src/interface.c:285
+#: src/interface.c:273
 msgid "_Cancel"
 msgstr "_Otkaži"
 
-#: src/interface.c:374
+#: src/interface.c:361
 #, c-format
 msgid "LiVES: - %s"
 msgstr ""
 
-#: src/interface.c:376
+#: src/interface.c:363
 msgid "LiVES: - Multitrack details"
 msgstr ""
 
-#: src/interface.c:407
+#: src/interface.c:394
 msgid "Format"
 msgstr "Oblik"
 
-#: src/interface.c:412
+#: src/interface.c:399
 msgid "Frame size"
 msgstr ""
 
-#: src/interface.c:417
+#: src/interface.c:404
 msgid "File size"
 msgstr "Veličina datoteke"
 
-#: src/interface.c:418
+#: src/interface.c:405
 msgid "Byte size"
 msgstr ""
 
-#: src/interface.c:423 src/interface.c:1891
+#: src/interface.c:410 src/interface.c:1760
 msgid "FPS"
 msgstr "FPS"
 
-#: src/interface.c:428
+#: src/interface.c:415
 msgid "Frames"
 msgstr "Okvira"
 
-#: src/interface.c:429
+#: src/interface.c:416
 msgid "Events"
 msgstr "Događaji"
 
-#: src/interface.c:434 src/interface.c:500 src/interface.c:542
+#: src/interface.c:421 src/interface.c:486 src/interface.c:528
 msgid "Total time"
 msgstr "Ukupno vrijeme"
 
-#: src/interface.c:486 src/resample.c:1488
+#: src/interface.c:472 src/resample.c:1460
 msgid "Audio"
 msgstr "Audio"
 
-#: src/interface.c:511 src/interface.c:553
+#: src/interface.c:497 src/interface.c:539
 msgid "Rate/size"
 msgstr "Ocijenite/veličina"
 
-#: src/interface.c:530
+#: src/interface.c:516
 msgid "Right audio"
 msgstr ""
 
-#: src/interface.c:622
+#: src/interface.c:607
 msgid "LiVES: - Encoding options"
 msgstr ""
 
-#: src/interface.c:636
+#: src/interface.c:621
 msgid "<------------- (Check the box to re_size as suggested)"
 msgstr ""
 
-#: src/interface.c:637
+#: src/interface.c:622
 msgid "<------------- (Check the box to use the _size recommendation)"
 msgstr ""
 
-#: src/interface.c:662
+#: src/interface.c:646
 msgid "Use _letterboxing to maintain aspect ratio (optional)"
 msgstr ""
 
-#: src/interface.c:663
+#: src/interface.c:647
 msgid ""
 "Draw black rectangles either above or to the sides of the image, to prevent "
 "it from stretching."
 msgstr ""
 
-#: src/interface.c:694
+#: src/interface.c:677
 msgid "Keep _my settings"
 msgstr "Držite _moje postavke"
 
-#: src/interface.c:695
+#: src/interface.c:678
 msgid "Use _recommended settings"
 msgstr "Koristi _preporučene postavke"
 
-#: src/interface.c:775 src/dialogs.c:114
-msgid ""
-"Do _not show this warning any more\n"
-"(can be turned back on from Preferences/Warnings)"
-msgstr ""
-
-#: src/interface.c:787
-msgid "Show _Details"
-msgstr "Prikaži _Detalje"
-
-#: src/interface.c:881
+#: src/interface.c:769
 msgid "_Close Window"
 msgstr "_Zatvori prozor"
 
-#: src/interface.c:883
+#: src/interface.c:771
 msgid "_Save to file"
 msgstr "_Spremi u datoteku"
 
-#: src/interface.c:928
+#: src/interface.c:816
 msgid "LiVES: - Insert"
 msgstr "LiVES: - Umetni"
 
-#: src/interface.c:945
+#: src/interface.c:833
 msgid "_Number of times to insert"
 msgstr "_Broj puta za umetanje"
 
-#: src/interface.c:954
+#: src/interface.c:842
 msgid "_Insert to fit audio"
 msgstr ""
 
-#: src/interface.c:968
+#: src/interface.c:856
 msgid "Insert _before selection"
 msgstr ""
 
-#: src/interface.c:970
+#: src/interface.c:858
 msgid "Insert clipboard before selected frames"
 msgstr ""
 
-#: src/interface.c:986
+#: src/interface.c:875
 msgid "Insert _after selection"
 msgstr ""
 
-#: src/interface.c:988
+#: src/interface.c:877
 msgid "Insert clipboard after selected frames"
 msgstr ""
 
-#: src/interface.c:999
+#: src/interface.c:888
 msgid "Insert _with sound"
 msgstr "Umetni _sa zvukom"
 
-#: src/interface.c:1012
+#: src/interface.c:901
 msgid "Insert with_out sound"
 msgstr "Umetni _bez zvuka"
 
-#: src/interface.c:1093
+#: src/interface.c:985
 msgid "LiVES: - Open Selection"
 msgstr "LiVES: - Otvori za odabir"
 
-#: src/interface.c:1111
+#: src/interface.c:1004
 msgid "Selection start time (sec)"
 msgstr ""
 
-#: src/interface.c:1117
+#: src/interface.c:1010
 msgid "Number of frames to open"
 msgstr ""
 
-#: src/interface.c:1193
+#: src/interface.c:1088
 msgid "LiVES: - Open Location"
 msgstr "LiVES: - Otvori Lokacija"
 
-#: src/interface.c:1195
+#: src/interface.c:1090
 msgid "LiVES: - Open Youtube Clip"
 msgstr ""
 
-#: src/interface.c:1213
+#: src/interface.c:1109
 msgid ""
 "\n"
 "\n"
@@ -1291,7 +1285,7 @@
 "\n"
 msgstr ""
 
-#: src/interface.c:1216
+#: src/interface.c:1112
 msgid ""
 "\n"
 "\n"
@@ -1300,62 +1294,63 @@
 "\n"
 msgstr ""
 
-#: src/interface.c:1220
+#: src/interface.c:1116
 msgid ""
 "Enter the URL of the clip below.\n"
 "E.g: http://www.youtube.com/watch?v=WCR6f6WzjP8\n"
 "\n"
 msgstr ""
 
-#: src/interface.c:1231
+#: src/interface.c:1127
 msgid "URL : "
 msgstr "URL : "
 
-#: src/interface.c:1231
+#: src/interface.c:1127
 msgid "Youtube URL : "
 msgstr ""
 
-#: src/interface.c:1235
+#: src/interface.c:1131
 msgid "Do not send bandwidth information"
 msgstr "Nemojte slati propusnost informacija"
 
-#: src/interface.c:1237
+#: src/interface.c:1133
 msgid "Try this setting if you are having problems getting a stream"
 msgstr "Isprobajte ovu postavku ako imate problema s dobivanje potok"
 
-#: src/interface.c:1258
+#: src/interface.c:1155
 msgid "Download to _Directory : "
 msgstr ""
 
-#: src/interface.c:1276
+#: src/interface.c:1173
 msgid "Download _File Name : "
 msgstr ""
 
-#: src/interface.c:1281
+#: src/interface.c:1178
 msgid ".webm"
 msgstr ""
 
-#: src/interface.c:1359
+#: src/interface.c:1256
 msgid "LiVES: - Rename Clip"
 msgstr "LiVES: - Preimenuj Clip"
 
-#: src/interface.c:1362
-msgid "LiVES: - Enter Set Name"
+#: src/interface.c:1258
+#, fuzzy
+msgid "LiVES: - Enter Set Name to Save as"
 msgstr "LiVES: - Unesite Postavi Naziv"
 
-#: src/interface.c:1365
+#: src/interface.c:1260
 msgid "LiVES: - Enter a Set Name to Reload"
 msgstr ""
 
-#: src/interface.c:1368
+#: src/interface.c:1262
 msgid "LiVES: - Choose a Working Directory"
 msgstr "LiVES: - Odaberite radni imenik"
 
-#: src/interface.c:1371
+#: src/interface.c:1264
 msgid "LiVES: - Rename Current Track"
 msgstr ""
 
-#: src/interface.c:1391
+#: src/interface.c:1283
 msgid ""
 "You need to enter a name for the current clip set.\n"
 "This will allow you reload the layout with the same clips later.\n"
@@ -1363,13 +1358,13 @@
 "LiVES will remind you to save the clip set later when you try to exit.\n"
 msgstr ""
 
-#: src/interface.c:1397
+#: src/interface.c:1289
 msgid ""
 "In order to export this project, you must enter a name for this clip set.\n"
 "This will also be used for the project name.\n"
 msgstr ""
 
-#: src/interface.c:1404
+#: src/interface.c:1296
 msgid ""
 "Welcome to LiVES !\n"
 "This startup wizard will guide you through the\n"
@@ -1379,214 +1374,214 @@
 "Ovo pokretanje čarobnjak će vas voditi kroz\n"
 "početno instalirati tako da možete dobiti najviše iz ovog programa.\n"
 
-#: src/interface.c:1408
+#: src/interface.c:1300
 msgid ""
 "\n"
 "First of all you need to choose a working directory for LiVES.\n"
 "This should be a directory with plenty of disk space available.\n"
 msgstr ""
 
-#: src/interface.c:1427
+#: src/interface.c:1317
 msgid "New name "
 msgstr "Novi naziv "
 
-#: src/interface.c:1430
+#: src/interface.c:1319
 msgid "Set name "
 msgstr ""
 
-#: src/interface.c:1550
+#: src/interface.c:1435
 msgid "Use def_aults"
 msgstr ""
 
-#: src/interface.c:1553 src/interface.c:1840 src/preferences.c:2515
-#: src/preferences.c:2697
+#: src/interface.c:1437 src/interface.c:1709 src/preferences.c:2550
+#: src/preferences.c:2739
 msgid "_Advanced"
 msgstr "_Napredno"
 
-#: src/interface.c:1604
+#: src/interface.c:1487
 msgid "LiVES:- Select input device"
 msgstr ""
 
-#: src/interface.c:1622
+#: src/interface.c:1504
 msgid "Select input device:"
 msgstr ""
 
-#: src/interface.c:1686
+#: src/interface.c:1568
 msgid "LiVES:- Load CD Track"
 msgstr ""
 
-#: src/interface.c:1689
+#: src/interface.c:1570
 msgid "LiVES:- Select DVD Title/Chapter"
 msgstr ""
 
-#: src/interface.c:1692
+#: src/interface.c:1572
 msgid "LiVES:- Select VCD Title"
 msgstr ""
 
-#: src/interface.c:1695
+#: src/interface.c:1574
 msgid "LiVES:- Change Maximum Visible Tracks"
 msgstr ""
 
-#: src/interface.c:1698
+#: src/interface.c:1576
 msgid "LiVES:- Device details"
 msgstr "LiVES:- Uređaj detalje"
 
-#: src/interface.c:1721
+#: src/interface.c:1598
 #, c-format
 msgid "Track to load (from %s)"
 msgstr ""
 
-#: src/interface.c:1724
+#: src/interface.c:1600
 msgid "DVD Title"
 msgstr ""
 
-#: src/interface.c:1727
+#: src/interface.c:1602
 msgid "VCD Title"
 msgstr ""
 
-#: src/interface.c:1730
+#: src/interface.c:1604
 msgid "Maximum number of tracks to display"
 msgstr ""
 
-#: src/interface.c:1733
+#: src/interface.c:1606
 msgid "Device:        /dev/video"
 msgstr ""
 
-#: src/interface.c:1736
+#: src/interface.c:1608
 msgid "Device:        fw:"
 msgstr ""
 
-#: src/interface.c:1771
+#: src/interface.c:1641
 msgid "Chapter  "
 msgstr "Poglavlje  "
 
-#: src/interface.c:1776
+#: src/interface.c:1645
 msgid "Channel  "
 msgstr "Kanal  "
 
-#: src/interface.c:1791
+#: src/interface.c:1660
 msgid "Audio ID  "
 msgstr ""
 
-#: src/interface.c:1857
+#: src/interface.c:1726
 msgid "Input number"
 msgstr ""
 
-#: src/interface.c:1865
+#: src/interface.c:1734
 msgid "Use default width, height and FPS"
 msgstr ""
 
-#: src/interface.c:1879
+#: src/interface.c:1748
 msgid "Width"
 msgstr "Širina"
 
-#: src/interface.c:1885
+#: src/interface.c:1754
 msgid "Height"
 msgstr "Visina"
 
-#: src/interface.c:1899
+#: src/interface.c:1768
 msgid "_Driver"
 msgstr ""
 
-#: src/interface.c:1902
+#: src/interface.c:1771
 msgid "_Output format"
 msgstr ""
 
-#: src/interface.c:1998
+#: src/interface.c:1865
 msgid "LiVES:- Fade Audio In"
 msgstr ""
 
-#: src/interface.c:2001
+#: src/interface.c:1867
 msgid "LiVES:- Fade Audio Out"
 msgstr ""
 
-#: src/interface.c:2017
+#: src/interface.c:1883
 msgid "Fade in over  "
 msgstr ""
 
-#: src/interface.c:2018
+#: src/interface.c:1884
 msgid "first"
 msgstr "prvi"
 
-#: src/interface.c:2021
+#: src/interface.c:1886
 msgid "Fade out over  "
 msgstr ""
 
-#: src/interface.c:2022
+#: src/interface.c:1887
 msgid "last"
 msgstr "posljednjoj"
 
-#: src/interface.c:2044
+#: src/interface.c:1909
 msgid "seconds."
 msgstr "sekundi."
 
-#: src/interface.c:2052 src/saveplay.c:1507
+#: src/interface.c:1917 src/saveplay.c:1484
 msgid "selection"
 msgstr ""
 
-#: src/interface.c:2092
+#: src/interface.c:1956
 msgid "LiVES: - File Comments (optional)"
 msgstr "LiVES: - Datoteka Komentari (opcionalno)"
 
-#: src/interface.c:2107
+#: src/interface.c:1971
 msgid "Title/Name : "
 msgstr "Naslov/Ime: "
 
-#: src/interface.c:2114
+#: src/interface.c:1978
 msgid "Author/Artist : "
 msgstr "Autor/Izvođač: "
 
-#: src/interface.c:2121
+#: src/interface.c:1985
 msgid "Comments : "
 msgstr "Komentari: "
 
-#: src/interface.c:2151
+#: src/interface.c:2015
 msgid "_Options"
 msgstr "_Mogućnosti"
 
-#: src/interface.c:2158
+#: src/interface.c:2022
 msgid "Save _subtitles to file"
 msgstr ""
 
-#: src/interface.c:2170
+#: src/interface.c:2033
 msgid "Subtitle file"
 msgstr "Podnaslov varalica"
 
-#: src/interface.c:2172
+#: src/interface.c:2035
 msgid "Browse..."
 msgstr "Pregledaj..."
 
-#: src/interface.c:2255
+#: src/interface.c:2132
 msgid "LiVES: - choose a device"
 msgstr ""
 
-#: src/interface.c:2259
+#: src/interface.c:2135
 msgid "LiVES: - choose a directory"
 msgstr ""
 
-#: src/interface.c:2262
+#: src/interface.c:2137
 msgid "LiVES: - choose a file"
 msgstr ""
 
-#: src/interface.c:2445
+#: src/interface.c:2381
 msgid "LiVES: - Cancel/Discard/Save"
 msgstr "LiVES: - Odustani/Odbaci/Spremi"
 
-#: src/interface.c:2460
+#: src/interface.c:2397
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has not been saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:2463
+#: src/interface.c:2400
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has been changed since the last save.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:2467
+#: src/interface.c:2404
 msgid ""
 "You are about to exit LiVES.\n"
 "The current clip set can be saved.\n"
@@ -1596,7 +1591,7 @@
 "Trenutni isječak set mogu biti spremljene.\n"
 "Što želite učiniti?\n"
 
-#: src/interface.c:2468
+#: src/interface.c:2405
 msgid ""
 "The current clip set has not been saved.\n"
 "What would you like to do ?\n"
@@ -1604,7 +1599,7 @@
 "Trenutni isječak set nije spremljena.\n"
 "Što želite učiniti?\n"
 
-#: src/interface.c:2472
+#: src/interface.c:2408
 msgid ""
 "The current layout has not been saved.\n"
 "What would you like to do ?\n"
@@ -1612,7 +1607,7 @@
 "Trenutni izgled nije spremljena.\n"
 "Što želite učiniti?\n"
 
-#: src/interface.c:2475
+#: src/interface.c:2410
 #, fuzzy
 msgid ""
 "The current layout has *not* been changed since it was last saved.\n"
@@ -1621,109 +1616,109 @@
 "Trenutni izgled nije spremljena.\n"
 "Što želite učiniti?\n"
 
-#: src/interface.c:2480
+#: src/interface.c:2415
 msgid ""
 "The current layout contains generated frames and cannot be retained.\n"
 "You may wish to render it before exiting multitrack mode.\n"
 msgstr ""
 
-#: src/interface.c:2483
+#: src/interface.c:2418
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout contains generated frames and cannot be retained.\n"
 "What do you wish to do ?"
 msgstr ""
 
-#: src/interface.c:2496
+#: src/interface.c:2431
 msgid "Clip set _name"
 msgstr ""
 
-#: src/interface.c:2502
+#: src/interface.c:2437
 msgid "_Auto reload next time"
 msgstr ""
 
-#: src/interface.c:2538 src/interface.c:2547
+#: src/interface.c:2473 src/interface.c:2482
 msgid "_Wipe layout"
 msgstr "_Obrišite izgled"
 
-#: src/interface.c:2539
+#: src/interface.c:2474
 msgid "_Ignore changes"
 msgstr "_Zanemari promjene"
 
-#: src/interface.c:2540
+#: src/interface.c:2475
 msgid "_Delete clip set"
 msgstr "_Izbriši isječak skup"
 
-#: src/interface.c:2541
+#: src/interface.c:2476
 msgid "_Delete layout"
 msgstr "_Brisanje izgled"
 
-#: src/interface.c:2545
+#: src/interface.c:2480
 msgid "_Save layout"
 msgstr "_Spremi izgled"
 
-#: src/interface.c:2546
+#: src/interface.c:2481
 msgid "_Save clip set"
 msgstr "_Spremi isječak skup"
 
-#: src/interface.c:2565
+#: src/interface.c:2502
 msgid ""
 "\n"
 "LiVES has detected a multitrack layout from a previous session.\n"
 "Would you like to try and recover it ?\n"
 msgstr ""
 
-#: src/interface.c:2589
+#: src/interface.c:2528
 msgid "LiVES: - Disk Recovery Options"
 msgstr ""
 
-#: src/interface.c:2608
+#: src/interface.c:2549
 msgid "Delete _Orphaned Clips"
 msgstr ""
 
-#: src/interface.c:2609
+#: src/interface.c:2550
 msgid "Delete any clips which are not currently loaded or part of a set"
 msgstr ""
 
-#: src/interface.c:2622
+#: src/interface.c:2564
 msgid "Clear _Backup Files from Closed Clips"
 msgstr ""
 
-#: src/interface.c:2633
+#: src/interface.c:2575
 msgid "Remove Sets which have _Layouts but no Clips"
 msgstr ""
 
-#: src/interface.c:2644
+#: src/interface.c:2586
 msgid "_Reset to Defaults"
 msgstr ""
 
-#: src/interface.c:2651
+#: src/interface.c:2593
 msgid "_Accept"
 msgstr ""
 
-#: src/callbacks.c:198
+#: src/callbacks.c:208
 #, c-format
 msgid "Saving as set %s..."
 msgstr ""
 
-#: src/callbacks.c:833
+#: src/callbacks.c:852
 msgid "Please enter the name of the file to save the clip as.\n"
 msgstr ""
 
-#: src/callbacks.c:841
+#: src/callbacks.c:860
 msgid "Please enter a valid URL for the download.\n"
 msgstr ""
 
-#: src/callbacks.c:867
+#: src/callbacks.c:886
 #, c-format
 msgid "Downloading %s to %s..."
 msgstr ""
 
-#: src/callbacks.c:895
+#: src/callbacks.c:912
 msgid "Downloading clip"
 msgstr ""
 
-#: src/callbacks.c:933
+#: src/callbacks.c:950
 msgid ""
 "\n"
 "LiVES was unable to download the clip.\n"
@@ -1731,11 +1726,11 @@
 "the latest youtube-dl installed.\n"
 msgstr ""
 
-#: src/callbacks.c:1114 src/callbacks.c:1149
+#: src/callbacks.c:1131 src/callbacks.c:1166
 msgid "This file"
 msgstr "Ova datoteka"
 
-#: src/callbacks.c:1115
+#: src/callbacks.c:1132
 msgid ""
 ",\n"
 " - including the current layout - "
@@ -1743,7 +1738,7 @@
 ",\n"
 " - uključujući i današnji izgled - "
 
-#: src/callbacks.c:1117
+#: src/callbacks.c:1134
 #, c-format
 msgid ""
 "\n"
@@ -1753,7 +1748,7 @@
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1119
+#: src/callbacks.c:1136
 #, c-format
 msgid ""
 "\n"
@@ -1768,14 +1763,14 @@
 "\n"
 "Stvarno je blizu?"
 
-#: src/callbacks.c:1150
+#: src/callbacks.c:1167
 msgid ""
 "Changes made to this clip have not been saved or backed up.\n"
 "\n"
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1343
+#: src/callbacks.c:1356
 msgid ""
 "\n"
 "Invalid project file.\n"
@@ -1783,7 +1778,7 @@
 "\n"
 "Neispravna datoteka projekt.\n"
 
-#: src/callbacks.c:1356
+#: src/callbacks.c:1370
 #, c-format
 msgid ""
 "\n"
@@ -1796,33 +1791,33 @@
 "Once you have done this, you will be able to import the new project.\n"
 msgstr ""
 
-#: src/callbacks.c:1366
+#: src/callbacks.c:1381
 #, c-format
 msgid "Importing the project %s as set %s..."
 msgstr ""
 
-#: src/callbacks.c:1386
+#: src/callbacks.c:1399
 msgid "Importing project"
 msgstr "Uvoz projekta"
 
-#: src/callbacks.c:1472
+#: src/callbacks.c:1481
 #, c-format
 msgid "Exporting project %s..."
 msgstr "Izvoz projekta %s..."
 
-#: src/callbacks.c:1490
+#: src/callbacks.c:1497
 msgid "Exporting project"
 msgstr "Izvoz projekta"
 
-#: src/callbacks.c:1506
+#: src/callbacks.c:1513
 msgid "Backup as .lv1 file"
 msgstr ""
 
-#: src/callbacks.c:1522
+#: src/callbacks.c:1529
 msgid "Restore .lv1 file"
 msgstr ""
 
-#: src/callbacks.c:1664
+#: src/callbacks.c:1671
 msgid ""
 "\n"
 "\n"
@@ -1830,72 +1825,77 @@
 "Are you sure ?\n"
 msgstr ""
 
-#: src/callbacks.c:1725
+#: src/callbacks.c:1732
 #, c-format
 msgid "Deleting set %s..."
 msgstr ""
 
-#: src/callbacks.c:1727
+#: src/callbacks.c:1734
 msgid "Deleting set..."
 msgstr ""
 
-#: src/callbacks.c:1731
+#: src/callbacks.c:1738
 msgid "Deleting set"
 msgstr ""
 
-#: src/callbacks.c:1739
+#: src/callbacks.c:1746
 #, c-format
 msgid "Set %s was permanently deleted from the disk.\n"
 msgstr ""
 
-#: src/callbacks.c:1787 src/callbacks.c:11764
+#: src/callbacks.c:1792 src/callbacks.c:11676
 msgid "Insert Silence"
 msgstr "Umetanje Tišina"
 
-#: src/callbacks.c:1840 src/callbacks.c:1923 src/callbacks.c:2086
+#: src/callbacks.c:1844 src/callbacks.c:1927 src/callbacks.c:2089
 msgid "Undoing"
 msgstr ""
 
-#: src/callbacks.c:1936 src/callbacks.c:2147
+#: src/callbacks.c:1940 src/callbacks.c:2150
 msgid "Restoring audio..."
 msgstr ""
 
-#: src/callbacks.c:1952
+#: src/callbacks.c:1956
 msgid "Clearing frame images"
 msgstr ""
 
-#: src/callbacks.c:1985
+#: src/callbacks.c:1988
 msgid "Deleting excess frames"
 msgstr ""
 
-#: src/callbacks.c:2229
+#: src/callbacks.c:2232
 #, c-format
 msgid "Length of video is now %d frames at %.3f frames per second.\n"
 msgstr ""
 
-#: src/callbacks.c:2233 src/resample.c:683 src/resample.c:2166
+#: src/callbacks.c:2235 src/resample.c:678 src/resample.c:2133
 #, c-format
 msgid "Clipboard was resampled to %d frames.\n"
 msgstr ""
 
-#: src/callbacks.c:2394 src/callbacks.c:2423
+#: src/callbacks.c:2396 src/callbacks.c:2425
 msgid "Redoing"
 msgstr ""
 
-#: src/callbacks.c:2462
+#: src/callbacks.c:2472
 #, c-format
-msgid "Copying frames %d to %d%s to the clipboard..."
+msgid "Copying frames %d to %d (with sound) to the clipboard..."
 msgstr ""
 
-#: src/callbacks.c:2525
+#: src/callbacks.c:2474
+#, c-format
+msgid "Copying frames %d to %d to the clipboard..."
+msgstr ""
+
+#: src/callbacks.c:2526
 msgid "Copying to the clipboard"
 msgstr ""
 
-#: src/callbacks.c:2600
+#: src/callbacks.c:2601
 msgid "Cut"
 msgstr "Izreži"
 
-#: src/callbacks.c:2641 src/callbacks.c:3068 src/callbacks.c:8026
+#: src/callbacks.c:2641 src/callbacks.c:3063 src/callbacks.c:7631
 msgid "Pulling frames from clipboard"
 msgstr ""
 
@@ -1904,22 +1904,22 @@
 msgid "Pasting %d frames to new clip %s..."
 msgstr ""
 
-#: src/callbacks.c:2678
+#: src/callbacks.c:2676
 msgid "Pasting"
 msgstr "Lijepljenje"
 
-#: src/callbacks.c:2694
+#: src/callbacks.c:2692
 msgid "...added audio..."
 msgstr "...dodao audio..."
 
-#: src/callbacks.c:2778
+#: src/callbacks.c:2775
 msgid ""
 "This operation requires resizing or converting of frames.\n"
 "Please install 'convert' from the Image-magick package, and then restart "
 "LiVES.\n"
 msgstr ""
 
-#: src/callbacks.c:2795
+#: src/callbacks.c:2793
 msgid ""
 "\n"
 "\n"
@@ -1928,31 +1928,31 @@
 "the 'Trim Audio' function from the Audio menu."
 msgstr ""
 
-#: src/callbacks.c:2819
+#: src/callbacks.c:2817
 msgid ""
 "LiVES cannot insert because the audio rates do not match.\n"
 "Please install 'sox', and try again."
 msgstr ""
 
-#: src/callbacks.c:2838
+#: src/callbacks.c:2835
 msgid ""
 "\n"
 "Insertion will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:2888 src/callbacks.c:11692
+#: src/callbacks.c:2883 src/callbacks.c:11606
 msgid ""
 "\n"
 "Insertion will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:2996 src/callbacks.c:3025
+#: src/callbacks.c:2987 src/callbacks.c:3016
 msgid "Resampling clipboard audio"
 msgstr ""
 
-#: src/callbacks.c:3041
+#: src/callbacks.c:3032
 msgid ""
 "\n"
 "\n"
@@ -1960,7 +1960,7 @@
 "Clipboard audio has been erased.\n"
 msgstr ""
 
-#: src/callbacks.c:3055
+#: src/callbacks.c:3045
 msgid ""
 "\n"
 "\n"
@@ -1969,79 +1969,79 @@
 "using unchanged audio ?\n"
 msgstr ""
 
-#: src/callbacks.c:3137 src/callbacks.c:3311
+#: src/callbacks.c:3132 src/callbacks.c:3299
 #, c-format
 msgid "Inserting %d%s frames from the clipboard..."
 msgstr ""
 
-#: src/callbacks.c:3162 src/callbacks.c:3236 src/callbacks.c:3339
+#: src/callbacks.c:3155 src/callbacks.c:3224 src/callbacks.c:3325
 msgid "Inserting"
 msgstr "Umetanje"
 
-#: src/callbacks.c:3193
+#: src/callbacks.c:3187
 #, c-format
 msgid "Inserting %d times from the clipboard%s..."
 msgstr ""
 
-#: src/callbacks.c:3200
+#: src/callbacks.c:3191
 #, c-format
 msgid "Inserting %d frames from the clipboard%s..."
 msgstr ""
 
-#: src/callbacks.c:3418
+#: src/callbacks.c:3404
 msgid "Insert"
 msgstr "Umetni"
 
-#: src/callbacks.c:3486
+#: src/callbacks.c:3471
 msgid ""
 "\n"
 "Deleting all frames will close this file.\n"
 "Are you sure ?"
 msgstr ""
 
-#: src/callbacks.c:3495
+#: src/callbacks.c:3480
 msgid ""
 "\n"
 "Deletion will cause missing frames in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3515 src/callbacks.c:10920 src/callbacks.c:11162
-#: src/callbacks.c:11228
+#: src/callbacks.c:3500 src/callbacks.c:10851 src/callbacks.c:11087
+#: src/callbacks.c:11152
 msgid ""
 "\n"
 "Deletion will cause missing audio in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3534
+#: src/callbacks.c:3519
 msgid ""
 "\n"
 "Deletion will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3553 src/callbacks.c:11210
+#: src/callbacks.c:3538 src/callbacks.c:11134
 msgid ""
 "\n"
 "Deletion will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3611
+#: src/callbacks.c:3597
 #, c-format
 msgid "Deleting frames %d to %d%s..."
 msgstr ""
 
-#: src/callbacks.c:3636
+#: src/callbacks.c:3619
 msgid "Deleting"
 msgstr "Brisanje"
 
-#: src/callbacks.c:3717
+#: src/callbacks.c:3699
 msgid "Delete"
 msgstr "Izbriši"
 
-#: src/callbacks.c:3738
+#: src/callbacks.c:3717
 msgid ""
 "\n"
 "\n"
@@ -2051,7 +2051,7 @@
 "\n"
 "Izbor je zaključana.\n"
 
-#: src/callbacks.c:4092
+#: src/callbacks.c:4056
 msgid ""
 "Ready to record. Use 'control' and cursor keys during playback to record "
 "your performance.\n"
@@ -2059,11 +2059,11 @@
 "play.)\n"
 msgstr ""
 
-#: src/callbacks.c:4098
+#: src/callbacks.c:4061
 msgid "Record cancelled.\n"
 msgstr "Snimanje otkazano.\n"
 
-#: src/callbacks.c:4237
+#: src/callbacks.c:4197
 #, c-format
 msgid ""
 "\n"
@@ -2072,7 +2072,7 @@
 "%s\n"
 msgstr ""
 
-#: src/callbacks.c:4241
+#: src/callbacks.c:4200
 #, c-format
 msgid ""
 "\n"
@@ -2081,7 +2081,7 @@
 "The plugin may be broken or not installed correctly."
 msgstr ""
 
-#: src/callbacks.c:4571
+#: src/callbacks.c:4532
 #, c-format
 msgid ""
 "Saving the set will cause copies of all loaded clips to remain on the disk"
@@ -2090,22 +2090,22 @@
 "Please press 'Cancel' if that is not what you want.\n"
 msgstr ""
 
-#: src/callbacks.c:4654
+#: src/callbacks.c:4617
 #, c-format
 msgid "Saving set %s"
 msgstr ""
 
-#: src/callbacks.c:5005
+#: src/callbacks.c:4964
 #, c-format
 msgid "Loading clips from set %s"
 msgstr ""
 
-#: src/callbacks.c:5093
+#: src/callbacks.c:5051
 #, c-format
 msgid "%d clips and %d layouts were recovered from set (%s).\n"
 msgstr ""
 
-#: src/callbacks.c:5312
+#: src/callbacks.c:5259
 msgid ""
 "LiVES will attempt to recover some disk space.\n"
 "You should ONLY run this if you have no other copies of LiVES running on "
@@ -2113,24 +2113,24 @@
 "Click OK to proceed.\n"
 msgstr ""
 
-#: src/callbacks.c:5317
+#: src/callbacks.c:5264
 msgid "Cleaning up disk space..."
 msgstr ""
 
-#: src/callbacks.c:5387
+#: src/callbacks.c:5334
 msgid "Recovering disk space"
 msgstr ""
 
-#: src/callbacks.c:5439
+#: src/callbacks.c:5386
 #, c-format
 msgid "%s of disk space was recovered.\n"
 msgstr ""
 
-#: src/callbacks.c:5482
+#: src/callbacks.c:5428
 msgid "Resetting frame rates and frame values..."
 msgstr ""
 
-#: src/callbacks.c:5523
+#: src/callbacks.c:5469
 #, c-format
 msgid ""
 "\n"
@@ -2138,39 +2138,39 @@
 "Internal: %s (%d bpp) / %s\n"
 msgstr ""
 
-#: src/callbacks.c:5525
+#: src/callbacks.c:5471
 msgid "buffered"
 msgstr ""
 
-#: src/callbacks.c:5538 src/callbacks.c:5557 src/callbacks.c:5575
-#: src/callbacks.c:5609
+#: src/callbacks.c:5484 src/callbacks.c:5502 src/callbacks.c:5518
+#: src/callbacks.c:5551
 msgid ""
 "\n"
 "  Opening..."
 msgstr ""
 
-#: src/callbacks.c:5545
+#: src/callbacks.c:5490
 #, c-format
 msgid ""
 "\n"
 "(%d virtual)"
 msgstr ""
 
-#: src/callbacks.c:5548
+#: src/callbacks.c:5493
 #, c-format
 msgid ""
 "\n"
 "(%d decoded)"
 msgstr ""
 
-#: src/callbacks.c:5560 src/callbacks.c:5578 src/callbacks.c:5612
+#: src/callbacks.c:5504 src/callbacks.c:5520 src/callbacks.c:5553
 #, c-format
 msgid ""
 "\n"
 "  %.2f sec."
 msgstr ""
 
-#: src/callbacks.c:5569
+#: src/callbacks.c:5512
 msgid ""
 "\n"
 "  Unknown"
@@ -2178,23 +2178,23 @@
 "\n"
 "  Nepoznat"
 
-#: src/callbacks.c:5582 src/callbacks.c:5596
+#: src/callbacks.c:5524 src/callbacks.c:5538
 msgid "unsigned"
 msgstr ""
 
-#: src/callbacks.c:5583 src/callbacks.c:5597
+#: src/callbacks.c:5525 src/callbacks.c:5539
 msgid "signed"
 msgstr ""
 
-#: src/callbacks.c:5585 src/callbacks.c:5599
+#: src/callbacks.c:5527 src/callbacks.c:5541
 msgid "big-endian"
 msgstr ""
 
-#: src/callbacks.c:5586 src/callbacks.c:5600
+#: src/callbacks.c:5528 src/callbacks.c:5542
 msgid "little-endian"
 msgstr ""
 
-#: src/callbacks.c:5588 src/callbacks.c:5602
+#: src/callbacks.c:5530 src/callbacks.c:5544
 #, c-format
 msgid ""
 "  %d Hz %d bit\n"
@@ -2203,7 +2203,7 @@
 "  %d Hz %d bit\n"
 "%s %s"
 
-#: src/callbacks.c:5707
+#: src/callbacks.c:5647
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -2220,22 +2220,22 @@
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA.\n"
 msgstr ""
 
-#: src/callbacks.c:5721
+#: src/callbacks.c:5661
 msgid "A video editor and VJ program."
 msgstr "Video editor i VJ programom."
 
-#: src/callbacks.c:5722
+#: src/callbacks.c:5662
 msgid "About LiVES"
 msgstr ""
 
-#: src/callbacks.c:5724
+#: src/callbacks.c:5664
 msgid "translator_credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Edgar Buršić https://launchpad.net/~edgar\n"
 "  salsaman https://launchpad.net/~salsaman"
 
-#: src/callbacks.c:5758
+#: src/callbacks.c:5699
 #, c-format
 msgid ""
 "LiVES Version %s\n"
@@ -2249,14 +2249,14 @@
 "Homepage: http://lives.sourceforge.net"
 msgstr ""
 
-#: src/callbacks.c:6037
+#: src/callbacks.c:5996
 msgid ""
 "\n"
 "\n"
 "You need to install mplayer or mplayer2 to be able to preview this file.\n"
 msgstr ""
 
-#: src/callbacks.c:6040
+#: src/callbacks.c:5998
 msgid ""
 "\n"
 "\n"
@@ -2264,188 +2264,183 @@
 "this file.\n"
 msgstr ""
 
-#: src/callbacks.c:6423 src/callbacks.c:8289
-msgid ""
-"\n"
-"Loading new audio may cause missing audio in some multitrack layouts.\n"
-"Are you sure you wish to continue ?\n"
-"."
-msgstr ""
-
-#: src/callbacks.c:6523
-#, c-format
-msgid "Opening audio %s, type %s..."
-msgstr ""
-
-#: src/callbacks.c:6556 src/saveplay.c:480
-msgid "Opening audio"
-msgstr ""
-
-#: src/callbacks.c:6565 src/callbacks.c:6612 src/callbacks.c:8387
-#: src/callbacks.c:8429 src/callbacks.c:8472 src/callbacks.c:10846
-msgid "Cancelling"
-msgstr "Otkazivanje"
-
-#: src/callbacks.c:6660 src/callbacks.c:8514 src/callbacks.c:10876
-#: src/callbacks.c:11563
-msgid "Committing audio"
-msgstr ""
-
-#: src/callbacks.c:6672 src/callbacks.c:8546
-msgid "New Audio"
-msgstr "Nova audio"
-
-#: src/callbacks.c:6779
+#: src/callbacks.c:6459
 #, c-format
 msgid ""
 "Text was saved as\n"
 "%s\n"
 msgstr ""
 
-#: src/callbacks.c:6951 src/saveplay.c:3618
-#, c-format
-msgid "%d frames are enough !\n"
-msgstr "%d okviri su dovoljno!\n"
-
-#: src/callbacks.c:7050
+#: src/callbacks.c:6706
 msgid "LiVES: - Encoder debug output"
 msgstr ""
 
-#: src/callbacks.c:7087 src/gui.c:1922
+#: src/callbacks.c:6743 src/gui.c:1921
 msgid "Fullscreen playback (f)"
 msgstr "Dionički reprodukcije (f)"
 
-#: src/callbacks.c:7089
+#: src/callbacks.c:6744
 msgid "Fullscreen playback off (f)"
 msgstr ""
 
-#: src/callbacks.c:7188 src/callbacks.c:7336 src/callbacks.c:7664
-#: src/callbacks.c:7681 src/gui.c:3712 src/saveplay.c:2467 src/saveplay.c:2501
-#: src/saveplay.c:3115 src/saveplay.c:3220 src/saveplay.c:3239
-#: src/multitrack.c:9340 src/multitrack.c:11060
+#: src/callbacks.c:6841 src/callbacks.c:6983 src/callbacks.c:7283
+#: src/callbacks.c:7298 src/gui.c:3838 src/saveplay.c:2442 src/saveplay.c:2475
+#: src/saveplay.c:3074 src/saveplay.c:3178 src/saveplay.c:3197
+#: src/multitrack.c:9526 src/multitrack.c:11288
 #, c-format
 msgid " (%d %% scale)"
 msgstr ""
 
-#: src/callbacks.c:7190 src/callbacks.c:7338 src/callbacks.c:7666
-#: src/gui.c:3716 src/saveplay.c:2469 src/saveplay.c:2503
+#: src/callbacks.c:6843 src/callbacks.c:6985 src/callbacks.c:7285
+#: src/gui.c:3842 src/saveplay.c:2444 src/saveplay.c:2477
 #, c-format
 msgid "LiVES: - Play Window%s"
 msgstr ""
 
-#: src/callbacks.c:7302 src/gui.c:1907
+#: src/callbacks.c:6950 src/gui.c:1906
 msgid "Double size (d)"
 msgstr ""
 
-#: src/callbacks.c:7309
+#: src/callbacks.c:6956
 msgid "Single size (d)"
 msgstr ""
 
-#: src/callbacks.c:7442 src/callbacks.c:7443
+#: src/callbacks.c:7087 src/callbacks.c:7088
 msgid "Hide the play window (s)"
 msgstr ""
 
-#: src/callbacks.c:7452 src/gui.c:1746
+#: src/callbacks.c:7096 src/gui.c:1744
 msgid "Show the play window (s)"
 msgstr ""
 
-#: src/callbacks.c:7453 src/gui.c:1896
+#: src/callbacks.c:7097 src/gui.c:1895
 msgid "Play in separate window (s)"
 msgstr "Igrajte u zasebnom prozoru (s)"
 
-#: src/callbacks.c:7535 src/gui.c:4060 src/saveplay.c:2498
+#: src/callbacks.c:7175 src/gui.c:4169 src/saveplay.c:2472
 msgid "LiVES: - Streaming"
 msgstr ""
 
-#: src/callbacks.c:7778
+#: src/callbacks.c:7388
 msgid "Switch continuous looping off (o)"
 msgstr ""
 
-#: src/callbacks.c:7785 src/gui.c:1795
+#: src/callbacks.c:7394 src/gui.c:1793
 msgid "Switch continuous looping on (o)"
 msgstr ""
 
-#: src/callbacks.c:7837
+#: src/callbacks.c:7444
 #, c-format
 msgid "Audio volume (%.2f)"
 msgstr ""
 
-#: src/callbacks.c:7876 src/callbacks.c:7877 src/gui.c:3640
+#: src/callbacks.c:7483 src/callbacks.c:7484 src/gui.c:3766
 msgid "Unmute the audio (z)"
 msgstr ""
 
-#: src/callbacks.c:7888 src/callbacks.c:7889 src/gui.c:1808 src/gui.c:3639
+#: src/callbacks.c:7494 src/callbacks.c:7495 src/gui.c:1806 src/gui.c:3765
 msgid "Mute the audio (z)"
 msgstr ""
 
-#: src/callbacks.c:8038
+#: src/callbacks.c:7643
 msgid "Reversing clipboard..."
 msgstr ""
 
-#: src/callbacks.c:8052
+#: src/callbacks.c:7657
 msgid "Reversing clipboard"
 msgstr ""
 
-#: src/callbacks.c:8084
+#: src/callbacks.c:7689
 msgid "LiVES: Load subtitles from..."
 msgstr ""
 
-#: src/callbacks.c:8151 src/saveplay.c:970
+#: src/callbacks.c:7753 src/saveplay.c:956
 #, c-format
 msgid "Loaded subtitle file: %s\n"
 msgstr ""
 
-#: src/callbacks.c:8220
+#: src/callbacks.c:7821
 msgid "Subtitles were erased.\n"
 msgstr "Titlovi su bili izbrisani.\n"
 
-#: src/callbacks.c:8239
+#: src/callbacks.c:7843
 msgid "LiVES: - Select Audio File"
 msgstr ""
 
-#: src/callbacks.c:8250
+#: src/callbacks.c:7878 src/callbacks.c:8232
+msgid ""
+"\n"
+"Loading new audio may cause missing audio in some multitrack layouts.\n"
+"Are you sure you wish to continue ?\n"
+"."
+msgstr ""
+
+#: src/callbacks.c:7989
+#, c-format
+msgid "Opening audio %s, type %s..."
+msgstr ""
+
+#: src/callbacks.c:8023 src/saveplay.c:477
+msgid "Opening audio"
+msgstr ""
+
+#: src/callbacks.c:8032 src/callbacks.c:8083 src/callbacks.c:8327
+#: src/callbacks.c:8369 src/callbacks.c:8412 src/callbacks.c:10766
+msgid "Cancelling"
+msgstr "Otkazivanje"
+
+#: src/callbacks.c:8137 src/callbacks.c:8454 src/callbacks.c:10803
+#: src/callbacks.c:11477
+msgid "Committing audio"
+msgstr ""
+
+#: src/callbacks.c:8153 src/callbacks.c:8484
+msgid "New Audio"
+msgstr "Nova audio"
+
+#: src/callbacks.c:8194
 msgid "Please set your CD play device in Tools | Preferences | Misc\n"
 msgstr ""
 
-#: src/callbacks.c:8321
+#: src/callbacks.c:8264
 #, c-format
 msgid "Opening CD track %d from %s..."
 msgstr ""
 
-#: src/callbacks.c:8326
+#: src/callbacks.c:8267
 #, c-format
 msgid "CD track %d"
 msgstr ""
 
-#: src/callbacks.c:8373
+#: src/callbacks.c:8313
 msgid "Opening CD track..."
 msgstr ""
 
-#: src/callbacks.c:8415 src/callbacks.c:8461
+#: src/callbacks.c:8355 src/callbacks.c:8401
 msgid "Error loading CD track\n"
 msgstr ""
 
-#: src/callbacks.c:8584
+#: src/callbacks.c:8518
 msgid "layout errors"
 msgstr ""
 
-#: src/callbacks.c:8595
+#: src/callbacks.c:8529
 msgid "Close _Window"
 msgstr "Zatvori _prozor"
 
-#: src/callbacks.c:8606
+#: src/callbacks.c:8540
 msgid "Clear _Errors"
 msgstr "Vedro _pogreške"
 
-#: src/callbacks.c:8617
+#: src/callbacks.c:8551
 msgid "_Delete affected layouts"
 msgstr "_Brisanje pogođene izgledima"
 
-#: src/callbacks.c:9343 src/callbacks.c:9388
+#: src/callbacks.c:9253 src/callbacks.c:9298
 msgid "Resume"
 msgstr "Nastavi"
 
-#: src/callbacks.c:9344
+#: src/callbacks.c:9254
 msgid ""
 "\n"
 "Paused\n"
@@ -2455,27 +2450,23 @@
 "Zaustavljeno\n"
 "(Kliknite na Nastavi za nastavak obrade)"
 
-#: src/callbacks.c:9345 src/callbacks.c:9406
+#: src/callbacks.c:9255 src/callbacks.c:9315
 msgid "paused..."
 msgstr "pauzirana..."
 
-#: src/callbacks.c:9372 src/callbacks.c:9418
-msgid "Pause"
-msgstr "Pauza"
-
-#: src/callbacks.c:9374 src/callbacks.c:9421
+#: src/callbacks.c:9284 src/callbacks.c:9333
 msgid "resumed..."
 msgstr "nastavio..."
 
-#: src/callbacks.c:9393
+#: src/callbacks.c:9303
 msgid "Keep"
 msgstr "Zadrži"
 
-#: src/callbacks.c:9396
+#: src/callbacks.c:9305
 msgid "Enough"
 msgstr "Dosta"
 
-#: src/callbacks.c:9401
+#: src/callbacks.c:9310
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2488,28 +2479,28 @@
 "(Kliknite Zadrži zadržati ono što imate i stop)\n"
 "(Kliknite na Nastavi za nastavak obrade)"
 
-#: src/callbacks.c:9419
+#: src/callbacks.c:9331
 msgid "Cancel"
 msgstr "Odustani"
 
-#: src/callbacks.c:9558
+#: src/callbacks.c:9478
 msgid "Stop"
 msgstr ""
 
-#: src/callbacks.c:10053 src/multitrack.c:13247
+#: src/callbacks.c:9968 src/multitrack.c:13489
 msgid "LiVES: Selected frame"
 msgstr ""
 
-#: src/callbacks.c:10061
+#: src/callbacks.c:9976
 msgid "_Save frame as..."
 msgstr ""
 
-#: src/callbacks.c:10290
+#: src/callbacks.c:10202
 #, c-format
 msgid "Audio is ahead of video by %.4f secs. at frame %d, with fps %.4f\n"
 msgstr ""
 
-#: src/callbacks.c:10347
+#: src/callbacks.c:10255
 msgid ""
 "\n"
 "\n"
@@ -2518,7 +2509,7 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10353
+#: src/callbacks.c:10261
 msgid ""
 "\n"
 "\n"
@@ -2526,13 +2517,13 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10429 src/callbacks.c:11479
+#: src/callbacks.c:10334 src/callbacks.c:11395
 msgid ""
 "\n"
 "Record time must be greater than 0.\n"
 msgstr ""
 
-#: src/callbacks.c:10440
+#: src/callbacks.c:10346
 msgid ""
 "Capture an External Window:\n"
 "\n"
@@ -2541,17 +2532,17 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10445
+#: src/callbacks.c:10351
 msgid "External window was released.\n"
 msgstr ""
 
-#: src/callbacks.c:10479
+#: src/callbacks.c:10385
 msgid ""
 "Click on a Window to Capture it\n"
 "Press 'q' to stop recording"
 msgstr ""
 
-#: src/callbacks.c:10513
+#: src/callbacks.c:10419
 #, c-format
 msgid ""
 "\n"
@@ -2561,19 +2552,19 @@
 "(Default of %.3f frames per second will be used.)\n"
 msgstr ""
 
-#: src/callbacks.c:10539
+#: src/callbacks.c:10443
 msgid "LiVES was unable to capture this window. Sorry.\n"
 msgstr ""
 
-#: src/callbacks.c:10695
+#: src/callbacks.c:10601
 msgid "Export Selected Audio as..."
 msgstr "Izvoz odabranih Audio kao..."
 
-#: src/callbacks.c:10699
+#: src/callbacks.c:10604
 msgid "Export Audio as..."
 msgstr "Izvoz Audio kao..."
 
-#: src/callbacks.c:10714
+#: src/callbacks.c:10619
 msgid ""
 "\n"
 "\n"
@@ -2582,1033 +2573,1033 @@
 "rate.\n"
 msgstr ""
 
-#: src/callbacks.c:10720
+#: src/callbacks.c:10625
 #, c-format
 msgid "Exporting audio frames %d to %d as %s..."
 msgstr ""
 
-#: src/callbacks.c:10725
+#: src/callbacks.c:10629
 #, c-format
 msgid "Exporting audio as %s..."
 msgstr ""
 
-#: src/callbacks.c:10751
+#: src/callbacks.c:10655
 msgid "Exporting audio"
 msgstr ""
 
-#: src/callbacks.c:10782
+#: src/callbacks.c:10695
 msgid "LiVES: - Append Audio File"
 msgstr ""
 
-#: src/callbacks.c:10825
+#: src/callbacks.c:10739
 #, c-format
 msgid "Appending audio file %s..."
 msgstr ""
 
-#: src/callbacks.c:10836
+#: src/callbacks.c:10756
 msgid "Appending audio"
 msgstr ""
 
-#: src/callbacks.c:10892
+#: src/callbacks.c:10818
 msgid "Append Audio"
 msgstr ""
 
-#: src/callbacks.c:10952
+#: src/callbacks.c:10883
 #, c-format
 msgid "Padding audio to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10954
+#: src/callbacks.c:10885
 #, c-format
 msgid "Trimming audio from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10973
+#: src/callbacks.c:10904
 msgid "Trimming/Padding audio"
 msgstr ""
 
-#: src/callbacks.c:10981
+#: src/callbacks.c:10912
 msgid "Trim/Pad Audio"
 msgstr ""
 
-#: src/callbacks.c:11055
+#: src/callbacks.c:10982
 msgid "Fading audio in"
 msgstr ""
 
-#: src/callbacks.c:11056
+#: src/callbacks.c:10983
 msgid "Fade audio in"
 msgstr ""
 
-#: src/callbacks.c:11061
+#: src/callbacks.c:10987
 msgid "Fading audio out"
 msgstr ""
 
-#: src/callbacks.c:11062
+#: src/callbacks.c:10988
 msgid "Fade audio out"
 msgstr ""
 
-#: src/callbacks.c:11085
+#: src/callbacks.c:11011
 #, c-format
 msgid "%s over %.1f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11087
+#: src/callbacks.c:11013
 #, c-format
 msgid "%s from time %.2f seconds to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11094
+#: src/callbacks.c:11020
 msgid "Fading audio..."
 msgstr ""
 
-#: src/callbacks.c:11194
+#: src/callbacks.c:11119
 msgid ""
 "\n"
 "Deleting all audio will close this file.\n"
 "Are you sure ?"
 msgstr ""
 
-#: src/callbacks.c:11197
+#: src/callbacks.c:11122
 msgid "Deleting all audio..."
 msgstr ""
 
-#: src/callbacks.c:11203
+#: src/callbacks.c:11127
 #, c-format
 msgid "Deleting audio from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11290
+#: src/callbacks.c:11214
 msgid "Deleting Audio"
 msgstr ""
 
-#: src/callbacks.c:11297
+#: src/callbacks.c:11221
 msgid "Delete Audio"
 msgstr ""
 
-#: src/callbacks.c:11636
+#: src/callbacks.c:11550
 msgid "Record new audio"
 msgstr ""
 
-#: src/callbacks.c:11725
+#: src/callbacks.c:11640
 #, c-format
 msgid "Inserting silence from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11754
+#: src/callbacks.c:11666
 msgid "Inserting Silence"
 msgstr ""
 
-#: src/merge.c:85
+#: src/merge.c:96
 msgid "LiVES: - Merge"
 msgstr ""
 
-#: src/merge.c:102
+#: src/merge.c:113
 #, c-format
 msgid "Merge Clipboard [ %d Frames ]       With Selection [ %d Frames ]"
 msgstr ""
 
-#: src/merge.c:107
+#: src/merge.c:118
 #, c-format
 msgid ""
 "Merge Clipboard [ %d Frames (resampled) ]       With Selection [ %d Frames ]"
 msgstr ""
 
-#: src/merge.c:118
+#: src/merge.c:130
 msgid "Align _Starts"
 msgstr ""
 
-#: src/merge.c:123
+#: src/merge.c:135
 msgid "Align _Ends"
 msgstr ""
 
-#: src/merge.c:134
+#: src/merge.c:146
 msgid "What to do with extra clipboard frames -"
 msgstr ""
 
-#: src/merge.c:137
+#: src/merge.c:149
 msgid "_Insert Frames"
 msgstr ""
 
-#: src/merge.c:143
+#: src/merge.c:155
 msgid "_Drop Frames"
 msgstr ""
 
-#: src/merge.c:149
+#: src/merge.c:160
 msgid "Number of Times to Loop Clipboard"
 msgstr ""
 
-#: src/merge.c:160
+#: src/merge.c:171
 msgid "_Loop Clipboard to Fit Selection"
 msgstr ""
 
-#: src/merge.c:173
+#: src/merge.c:184
 msgid "_Transition Method:"
 msgstr ""
 
-#: src/merge.c:394
+#: src/merge.c:395
 msgid "Merging clipboard with selection..."
 msgstr ""
 
-#: src/merge.c:551
+#: src/merge.c:539
 msgid "Merge done.\n"
 msgstr ""
 
-#: src/gui.c:123
+#: src/gui.c:122
 msgid "_Custom Generators"
 msgstr ""
 
-#: src/gui.c:124
+#: src/gui.c:123
 msgid "_Custom Effects"
 msgstr ""
 
-#: src/gui.c:125
+#: src/gui.c:124
 msgid "Custom _Utilities"
 msgstr ""
 
-#: src/gui.c:352 src/multitrack.c:5964
+#: src/gui.c:351 src/multitrack.c:6143
 msgid "_File"
 msgstr ""
 
-#: src/gui.c:367 src/multitrack.c:5989
+#: src/gui.c:366 src/multitrack.c:6168
 msgid "_Open File/Directory"
 msgstr ""
 
-#: src/gui.c:373
+#: src/gui.c:372
 msgid "O_pen Part of File..."
 msgstr ""
 
-#: src/gui.c:379 src/gui.c:383 src/multitrack.c:6006 src/multitrack.c:6023
-#: src/multitrack.c:6028
+#: src/gui.c:378 src/gui.c:382 src/multitrack.c:6185 src/multitrack.c:6202
+#: src/multitrack.c:6207
 msgid "Open _Location/Stream..."
 msgstr ""
 
-#: src/gui.c:393 src/multitrack.c:6016
+#: src/gui.c:392 src/multitrack.c:6195
 msgid "Open _Youtube Clip..."
 msgstr ""
 
-#: src/gui.c:404
+#: src/gui.c:403
 msgid "Import from _dvd/vcd..."
 msgstr ""
 
-#: src/gui.c:413
+#: src/gui.c:412
 msgid "Import from _dvd"
 msgstr ""
 
-#: src/gui.c:416
+#: src/gui.c:415
 msgid "Import from _vcd"
 msgstr ""
 
-#: src/gui.c:419
+#: src/gui.c:418
 msgid "_Import from Firewire"
 msgstr ""
 
-#: src/gui.c:428 src/multitrack.c:6086
+#: src/gui.c:427 src/multitrack.c:6265
 msgid "Import from _Firewire Device (dv)"
 msgstr ""
 
-#: src/gui.c:429 src/multitrack.c:6094
+#: src/gui.c:428 src/multitrack.c:6273
 msgid "Import from _Firewire Device (hdv)"
 msgstr ""
 
-#: src/gui.c:457
+#: src/gui.c:456
 msgid "_Add Webcam/TV card..."
 msgstr ""
 
-#: src/gui.c:476
+#: src/gui.c:475
 msgid "Add _Unicap Device"
 msgstr ""
 
-#: src/gui.c:486
+#: src/gui.c:485
 msgid "Add Live _Firewire Device"
 msgstr ""
 
-#: src/gui.c:495
+#: src/gui.c:494
 msgid "Add _TV Device"
 msgstr ""
 
-#: src/gui.c:510 src/multitrack.c:6117
+#: src/gui.c:509 src/multitrack.c:6296
 msgid "_Recent Files..."
 msgstr ""
 
-#: src/gui.c:560 src/multitrack.c:6177
+#: src/gui.c:559 src/multitrack.c:6356
 msgid "_Reload Clip Set..."
 msgstr ""
 
-#: src/gui.c:564 src/multitrack.c:6185
+#: src/gui.c:563 src/multitrack.c:6364
 msgid "Close/Sa_ve All Clips"
 msgstr ""
 
-#: src/gui.c:575
+#: src/gui.c:574
 msgid "_Encode Clip As..."
 msgstr ""
 
-#: src/gui.c:577
+#: src/gui.c:576
 msgid "Encode _Selection As..."
 msgstr ""
 
-#: src/gui.c:584
+#: src/gui.c:583
 msgid "_Close This Clip"
 msgstr ""
 
-#: src/gui.c:595
+#: src/gui.c:594
 msgid "_Backup Clip as .lv1..."
 msgstr ""
 
-#: src/gui.c:604
+#: src/gui.c:603
 msgid "_Restore Clip from .lv1..."
 msgstr ""
 
-#: src/gui.c:615
+#: src/gui.c:614
 msgid "Encode/Load/Backup _with Sound"
 msgstr ""
 
-#: src/gui.c:620
+#: src/gui.c:619
 msgid "Auto load subtitles"
 msgstr ""
 
-#: src/gui.c:628 src/multitrack.c:6224
+#: src/gui.c:627 src/multitrack.c:6403
 msgid "Clean _up Diskspace"
 msgstr ""
 
-#: src/gui.c:636 src/multitrack.c:6257
+#: src/gui.c:635 src/multitrack.c:6436
 msgid "_Edit"
 msgstr ""
 
-#: src/gui.c:685
+#: src/gui.c:684
 msgid "_MULTITRACK mode"
 msgstr ""
 
-#: src/gui.c:696
+#: src/gui.c:695
 msgid "_Copy Selection"
 msgstr ""
 
-#: src/gui.c:705
+#: src/gui.c:704
 msgid "Cu_t Selection"
 msgstr ""
 
-#: src/gui.c:714
+#: src/gui.c:713
 msgid "_Insert from Clipboard..."
 msgstr ""
 
-#: src/gui.c:730
+#: src/gui.c:729
 msgid "Paste as _New"
 msgstr ""
 
-#: src/gui.c:739
+#: src/gui.c:738
 msgid "_Merge Clipboard with Selection..."
 msgstr ""
 
-#: src/gui.c:746
+#: src/gui.c:745
 msgid "_Delete Selection"
 msgstr ""
 
-#: src/gui.c:764
+#: src/gui.c:763
 msgid "Decouple _Video from Audio"
 msgstr ""
 
-#: src/gui.c:772
+#: src/gui.c:771
 msgid "_Select..."
 msgstr ""
 
-#: src/gui.c:786
+#: src/gui.c:785
 msgid "Select _All Frames"
 msgstr ""
 
-#: src/gui.c:794
+#: src/gui.c:793
 msgid "_Start Frame Only"
 msgstr ""
 
-#: src/gui.c:802
+#: src/gui.c:801
 msgid "_End Frame Only"
 msgstr ""
 
-#: src/gui.c:813
+#: src/gui.c:812
 msgid "Select from _First Frame"
 msgstr ""
 
-#: src/gui.c:817
+#: src/gui.c:816
 msgid "Select to _Last Frame"
 msgstr ""
 
-#: src/gui.c:821
+#: src/gui.c:820
 msgid "Select Last Insertion/_Merge"
 msgstr ""
 
-#: src/gui.c:825
+#: src/gui.c:824
 msgid "Select Last _Effect"
 msgstr ""
 
-#: src/gui.c:829
+#: src/gui.c:828
 msgid "_Invert Selection"
 msgstr ""
 
-#: src/gui.c:837
+#: src/gui.c:836
 msgid "_Lock Selection Width"
 msgstr ""
 
-#: src/gui.c:842 src/multitrack.c:6409
+#: src/gui.c:841 src/multitrack.c:6591
 msgid "_Play"
 msgstr ""
 
-#: src/gui.c:854
+#: src/gui.c:853
 msgid "_Play All"
 msgstr ""
 
-#: src/gui.c:869
+#: src/gui.c:868
 msgid "Pla_y Selection"
 msgstr ""
 
-#: src/gui.c:877
+#: src/gui.c:876
 msgid "Play _Clipboard"
 msgstr ""
 
-#: src/gui.c:899 src/multitrack.c:6441
+#: src/gui.c:898 src/multitrack.c:6623
 msgid "_Stop"
 msgstr ""
 
-#: src/gui.c:914 src/multitrack.c:6453
+#: src/gui.c:913 src/multitrack.c:6635
 msgid "Re_wind"
 msgstr ""
 
-#: src/gui.c:946 src/multitrack.c:6471
+#: src/gui.c:945 src/multitrack.c:6653
 msgid "_Full Screen"
 msgstr ""
 
-#: src/gui.c:955
+#: src/gui.c:954
 msgid "_Double Size"
 msgstr ""
 
-#: src/gui.c:963 src/multitrack.c:6479
+#: src/gui.c:962 src/multitrack.c:6661
 msgid "Play in _Separate Window"
 msgstr ""
 
-#: src/gui.c:972
+#: src/gui.c:971
 msgid "_Blank Background"
 msgstr ""
 
-#: src/gui.c:979
+#: src/gui.c:978
 msgid "(Auto)_loop Video (to fit audio track)"
 msgstr ""
 
-#: src/gui.c:988 src/multitrack.c:6487
+#: src/gui.c:987 src/multitrack.c:6669
 msgid "L_oop Continuously"
 msgstr ""
 
-#: src/gui.c:997
+#: src/gui.c:996
 msgid "Pin_g Pong Loops"
 msgstr ""
 
-#: src/gui.c:1005 src/multitrack.c:6495
+#: src/gui.c:1004 src/multitrack.c:6677
 msgid "_Mute"
 msgstr ""
 
-#: src/gui.c:1017
+#: src/gui.c:1016
 msgid "Separate Window 'S_ticky' Mode"
 msgstr ""
 
-#: src/gui.c:1025
+#: src/gui.c:1024
 msgid "S_how Frame Counter"
 msgstr ""
 
-#: src/gui.c:1035
+#: src/gui.c:1034
 msgid "Show Subtitles"
 msgstr ""
 
-#: src/gui.c:1045
+#: src/gui.c:1044
 msgid "Letterbox mode"
 msgstr ""
 
-#: src/gui.c:1051 src/multitrack.c:6507
+#: src/gui.c:1050 src/multitrack.c:6689
 msgid "Effect_s"
 msgstr ""
 
-#: src/gui.c:1054
+#: src/gui.c:1053
 msgid "Effects are applied to the current selection."
 msgstr ""
 
-#: src/gui.c:1067
+#: src/gui.c:1066
 msgid "_Run Test Rendered Effect/Tool/Generator..."
 msgstr ""
 
-#: src/gui.c:1072 src/multitrack.c:7123
+#: src/gui.c:1071 src/multitrack.c:7299
 msgid "_Tools"
 msgstr ""
 
-#: src/gui.c:1075
+#: src/gui.c:1074
 msgid "Tools are applied to complete clips."
 msgstr ""
 
-#: src/gui.c:1085
+#: src/gui.c:1084
 msgid "_Reverse Clipboard"
 msgstr ""
 
-#: src/gui.c:1094
+#: src/gui.c:1093
 msgid "_Change Playback/Save Speed..."
 msgstr ""
 
-#: src/gui.c:1099
+#: src/gui.c:1098
 msgid "Resample _Video to New Frame Rate..."
 msgstr ""
 
-#: src/gui.c:1105
+#: src/gui.c:1104
 msgid "_Utilities"
 msgstr ""
 
-#: src/gui.c:1110
+#: src/gui.c:1109
 msgid "Custom _Tools"
 msgstr ""
 
-#: src/gui.c:1116 src/multitrack.c:7149
+#: src/gui.c:1115 src/multitrack.c:7325
 msgid "_Generate"
 msgstr ""
 
-#: src/gui.c:1126
+#: src/gui.c:1125
 msgid "Loading rendered effect plugins..."
 msgstr ""
 
-#: src/gui.c:1139
+#: src/gui.c:1138
 msgid "Load _Subtitles from File..."
 msgstr ""
 
-#: src/gui.c:1144
+#: src/gui.c:1143
 msgid "Erase subtitles"
 msgstr ""
 
-#: src/gui.c:1152 src/multitrack.c:7158
+#: src/gui.c:1151 src/multitrack.c:7334
 msgid "Capture _External Window... "
 msgstr ""
 
-#: src/gui.c:1159 src/multitrack.c:7173
+#: src/gui.c:1158 src/multitrack.c:7349
 msgid "_Preferences..."
 msgstr ""
 
-#: src/gui.c:1172
+#: src/gui.c:1171
 msgid "_Audio"
 msgstr ""
 
-#: src/gui.c:1184
+#: src/gui.c:1183
 msgid "Load _New Audio for Clip..."
 msgstr ""
 
-#: src/gui.c:1190
+#: src/gui.c:1189
 msgid "Load _CD Track..."
 msgstr ""
 
-#: src/gui.c:1191
+#: src/gui.c:1190
 msgid "E_ject CD"
 msgstr ""
 
-#: src/gui.c:1205
+#: src/gui.c:1204
 msgid "Record E_xternal Audio..."
 msgstr ""
 
-#: src/gui.c:1218
+#: src/gui.c:1217
 msgid "to New _Clip..."
 msgstr ""
 
-#: src/gui.c:1222
+#: src/gui.c:1221
 msgid "to _Selection"
 msgstr ""
 
-#: src/gui.c:1230
+#: src/gui.c:1229
 msgid "Fade Audio _In..."
 msgstr ""
 
-#: src/gui.c:1234
+#: src/gui.c:1233
 msgid "Fade Audio _Out..."
 msgstr ""
 
-#: src/gui.c:1244
+#: src/gui.c:1243
 msgid "_Export Audio..."
 msgstr ""
 
-#: src/gui.c:1257
+#: src/gui.c:1256
 msgid "Export _Selected Audio..."
 msgstr ""
 
-#: src/gui.c:1261
+#: src/gui.c:1260
 msgid "Export _All Audio..."
 msgstr ""
 
-#: src/gui.c:1265
+#: src/gui.c:1264
 msgid "_Append Audio..."
 msgstr ""
 
-#: src/gui.c:1270
+#: src/gui.c:1269
 msgid "_Trim/Pad Audio..."
 msgstr ""
 
-#: src/gui.c:1283
+#: src/gui.c:1282
 msgid "Trim/Pad Audio to _Selection"
 msgstr ""
 
-#: src/gui.c:1288
+#: src/gui.c:1287
 msgid "Trim/Pad Audio from Beginning to _Play Start"
 msgstr ""
 
-#: src/gui.c:1293
+#: src/gui.c:1292
 msgid "_Delete Audio..."
 msgstr ""
 
-#: src/gui.c:1306
+#: src/gui.c:1305
 msgid "Delete _Selected Audio"
 msgstr ""
 
-#: src/gui.c:1310
+#: src/gui.c:1309
 msgid "Delete _All Audio"
 msgstr ""
 
-#: src/gui.c:1314
+#: src/gui.c:1313
 msgid "Insert _Silence in Selection"
 msgstr ""
 
-#: src/gui.c:1319
+#: src/gui.c:1318
 msgid "_Resample Audio..."
 msgstr ""
 
-#: src/gui.c:1324
+#: src/gui.c:1323
 msgid "_Info"
 msgstr ""
 
-#: src/gui.c:1336
+#: src/gui.c:1335
 msgid "Show Clip _Info"
 msgstr ""
 
-#: src/gui.c:1344
+#: src/gui.c:1343
 msgid "Show/_Edit File Comments"
 msgstr ""
 
-#: src/gui.c:1349
+#: src/gui.c:1348
 msgid "Show _Clipboard Info"
 msgstr ""
 
-#: src/gui.c:1360 src/multitrack.c:7286
+#: src/gui.c:1359 src/multitrack.c:7462
 msgid "Show _Messages"
 msgstr ""
 
-#: src/gui.c:1364 src/multitrack.c:7365
+#: src/gui.c:1363 src/multitrack.c:7541
 msgid "Show _Layout Errors"
 msgstr ""
 
-#: src/gui.c:1369 src/multitrack.c:7263
+#: src/gui.c:1368 src/multitrack.c:7439
 msgid "_Clips"
 msgstr ""
 
-#: src/gui.c:1381
+#: src/gui.c:1380
 msgid "_Rename Current Clip in Menu..."
 msgstr ""
 
-#: src/gui.c:1399
+#: src/gui.c:1398
 msgid "A_dvanced"
 msgstr ""
 
-#: src/gui.c:1412
+#: src/gui.c:1411
 msgid "_RFX Effects/Tools/Utilities"
 msgstr ""
 
-#: src/gui.c:1424
+#: src/gui.c:1423
 msgid "_New Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1428
+#: src/gui.c:1427
 msgid "_Copy RFX Script to Test..."
 msgstr ""
 
-#: src/gui.c:1432
+#: src/gui.c:1431
 msgid "_Edit Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1436
+#: src/gui.c:1435
 msgid "Rena_me Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1440
+#: src/gui.c:1439
 msgid "_Delete Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1450
+#: src/gui.c:1449
 msgid "_Promote Test Rendered Effect/Tool/Generator..."
 msgstr ""
 
-#: src/gui.c:1457
+#: src/gui.c:1456
 msgid "_Import Custom RFX script..."
 msgstr ""
 
-#: src/gui.c:1461
+#: src/gui.c:1460
 msgid "E_xport Custom RFX script..."
 msgstr ""
 
-#: src/gui.c:1465
+#: src/gui.c:1464
 msgid "De_lete Custom RFX Script..."
 msgstr ""
 
-#: src/gui.c:1472
+#: src/gui.c:1471
 msgid "Re_build all RFX plugins"
 msgstr ""
 
-#: src/gui.c:1501
+#: src/gui.c:1498
 msgid "Receive _LiVES stream from..."
 msgstr ""
 
-#: src/gui.c:1506
+#: src/gui.c:1503
 msgid "_Send LiVES stream to..."
 msgstr ""
 
-#: src/gui.c:1515
+#: src/gui.c:1512
 #, c-format
 msgid "Open _yuv4mpeg stream on %sstream.yuv..."
 msgstr ""
 
-#: src/gui.c:1536
+#: src/gui.c:1534
 msgid "_Import Project (.lv2)..."
 msgstr ""
 
-#: src/gui.c:1540
+#: src/gui.c:1538
 msgid "E_xport Project (.lv2)..."
 msgstr ""
 
-#: src/gui.c:1545
+#: src/gui.c:1543
 msgid "_VJ"
 msgstr ""
 
-#: src/gui.c:1557
+#: src/gui.c:1555
 msgid "Real Time _Effect Mapping"
 msgstr ""
 
-#: src/gui.c:1563
+#: src/gui.c:1561
 msgid "Bind real time effects to ctrl-number keys."
 msgstr ""
 
-#: src/gui.c:1565
+#: src/gui.c:1563
 msgid "Set Real Time Effect _Defaults"
 msgstr ""
 
-#: src/gui.c:1567
+#: src/gui.c:1565
 msgid "Set default parameter values for real time effects."
 msgstr ""
 
-#: src/gui.c:1580
+#: src/gui.c:1578
 msgid "Save Real Time Effect _Defaults"
 msgstr ""
 
-#: src/gui.c:1583
+#: src/gui.c:1581
 msgid ""
 "Save real time effect defaults so they will be restored each time you use "
 "LiVES."
 msgstr ""
 
-#: src/gui.c:1589
+#: src/gui.c:1587
 msgid "_Reset all playback speeds and positions"
 msgstr ""
 
-#: src/gui.c:1592
+#: src/gui.c:1590
 msgid ""
 "Reset all playback positions to frame 1, and reset all playback frame rates."
 msgstr ""
 
-#: src/gui.c:1594
+#: src/gui.c:1592
 msgid "_MIDI/joystick interface"
 msgstr ""
 
-#: src/gui.c:1609
+#: src/gui.c:1607
 msgid "_MIDI/joystick learner..."
 msgstr ""
 
-#: src/gui.c:1614
+#: src/gui.c:1612
 msgid "_Save device mapping..."
 msgstr ""
 
-#: src/gui.c:1620
+#: src/gui.c:1618
 msgid "_Load device mapping..."
 msgstr ""
 
-#: src/gui.c:1628
+#: src/gui.c:1626
 msgid "Show VJ _Keys"
 msgstr ""
 
-#: src/gui.c:1632
+#: src/gui.c:1630
 msgid "To_ys"
 msgstr ""
 
-#: src/gui.c:1644
+#: src/gui.c:1642
 msgid "_None"
 msgstr ""
 
-#: src/gui.c:1652
+#: src/gui.c:1650
 msgid "_Autolives"
 msgstr ""
 
-#: src/gui.c:1657
+#: src/gui.c:1655
 msgid "_Mad Frames"
 msgstr ""
 
-#: src/gui.c:1662
+#: src/gui.c:1660
 msgid "_LiVES TV (broadband)"
 msgstr ""
 
-#: src/gui.c:1672 src/multitrack.c:7387
+#: src/gui.c:1670 src/multitrack.c:7563
 msgid "_Help"
 msgstr ""
 
-#: src/gui.c:1684 src/multitrack.c:7407
+#: src/gui.c:1682 src/multitrack.c:7583
 msgid "_Manual (opens in browser)"
 msgstr ""
 
-#: src/gui.c:1691 src/multitrack.c:7416
+#: src/gui.c:1689 src/multitrack.c:7592
 msgid "_Donate to the project !"
 msgstr ""
 
-#: src/gui.c:1695 src/multitrack.c:7420
+#: src/gui.c:1693 src/multitrack.c:7596
 msgid "_Email the author"
 msgstr ""
 
-#: src/gui.c:1699 src/multitrack.c:7424
+#: src/gui.c:1697 src/multitrack.c:7600
 msgid "Report a _bug"
 msgstr ""
 
-#: src/gui.c:1703 src/multitrack.c:7428
+#: src/gui.c:1701 src/multitrack.c:7604
 msgid "Suggest a _feature"
 msgstr ""
 
-#: src/gui.c:1707 src/multitrack.c:7432
+#: src/gui.c:1705 src/multitrack.c:7608
 msgid "Assist with _translating"
 msgstr ""
 
-#: src/gui.c:1714 src/multitrack.c:7439
+#: src/gui.c:1712 src/multitrack.c:7615
 msgid "_Troubleshoot"
 msgstr ""
 
-#: src/gui.c:1718 src/multitrack.c:7443
+#: src/gui.c:1716 src/multitrack.c:7619
 msgid "_About"
 msgstr ""
 
-#: src/gui.c:1752
+#: src/gui.c:1750
 msgid "Rewind to start (w)"
 msgstr ""
 
-#: src/gui.c:1760 src/multitrack.c:16720
+#: src/gui.c:1758 src/multitrack.c:17010
 msgid "Play all (p)"
 msgstr ""
 
-#: src/gui.c:1768 src/gui.c:1877
+#: src/gui.c:1766 src/gui.c:1876
 msgid "Stop playback (q)"
 msgstr ""
 
-#: src/gui.c:1779
+#: src/gui.c:1777
 msgid "Play selection (y)"
 msgstr ""
 
-#: src/gui.c:1832
+#: src/gui.c:1829
 msgid "Volume"
 msgstr ""
 
-#: src/gui.c:1854
+#: src/gui.c:1853
 msgid "Audio volume (1.00)"
 msgstr ""
 
-#: src/gui.c:1883
+#: src/gui.c:1882
 msgid "Unblank background (b)"
 msgstr ""
 
-#: src/gui.c:1929
+#: src/gui.c:1928
 msgid "Play slower (ctrl-down)"
 msgstr ""
 
-#: src/gui.c:1935
+#: src/gui.c:1934
 msgid "Play faster (ctrl-up)"
 msgstr ""
 
-#: src/gui.c:1942
+#: src/gui.c:1941
 msgid "Skip back (ctrl-left)"
 msgstr ""
 
-#: src/gui.c:1948
+#: src/gui.c:1947
 msgid "Skip forward (ctrl-right)"
 msgstr ""
 
-#: src/gui.c:1954
+#: src/gui.c:1953
 msgid "Show clip info (i)"
 msgstr ""
 
-#: src/gui.c:1960
+#: src/gui.c:1959
 msgid "Hide this toolbar"
 msgstr ""
 
-#: src/gui.c:1962
+#: src/gui.c:1961
 msgid ""
 "Press \"s\" to toggle separate play window for improved performance, \"q\" "
 "to stop."
 msgstr ""
 
 #. TRANSLATORS: please keep the translated string the same length
-#: src/gui.c:1995
+#: src/gui.c:1994
 msgid "     Video playback speed (frames per second)        "
 msgstr ""
 
-#: src/gui.c:2009
+#: src/gui.c:2008
 msgid "Vary the video speed"
 msgstr ""
 
-#: src/gui.c:2092 src/gui.c:3218
+#: src/gui.c:2090 src/gui.c:3329
 msgid "First Frame"
 msgstr ""
 
-#: src/gui.c:2193 src/gui.c:3226
+#: src/gui.c:2191 src/gui.c:3336
 msgid "Last Frame"
 msgstr ""
 
-#: src/gui.c:2210
+#: src/gui.c:2208
 msgid "The first selected frame in this clip"
 msgstr ""
 
-#: src/gui.c:2248
+#: src/gui.c:2246
 msgid "The last selected frame in this clip"
 msgstr ""
 
-#: src/gui.c:2532
+#: src/gui.c:2546
 msgid "Starting...\n"
 msgstr ""
 
-#: src/gui.c:3074
+#: src/gui.c:3181
 msgid "    Press 'q' to stop recording.  DO NOT COVER THE PLAY WINDOW !   "
 msgstr ""
 
-#: src/gui.c:3521
+#: src/gui.c:3643
 msgid "Frame number to preview"
 msgstr ""
 
-#: src/gui.c:3538
+#: src/gui.c:3660
 msgid "_Free"
 msgstr ""
 
-#: src/gui.c:3539
+#: src/gui.c:3661
 msgid "Free choice of frame number"
 msgstr ""
 
-#: src/gui.c:3543
+#: src/gui.c:3666
 msgid "_Start"
 msgstr ""
 
-#: src/gui.c:3544
+#: src/gui.c:3667
 msgid "Frame number is linked to start frame"
 msgstr ""
 
-#: src/gui.c:3551
+#: src/gui.c:3675
 msgid "_End"
 msgstr ""
 
-#: src/gui.c:3552
+#: src/gui.c:3676
 msgid "Frame number is linked to end frame"
 msgstr ""
 
-#: src/gui.c:3559
+#: src/gui.c:3684
 msgid "_Pointer"
 msgstr ""
 
-#: src/gui.c:3560
+#: src/gui.c:3685
 msgid "Frame number is linked to playback pointer"
 msgstr ""
 
-#: src/gui.c:3581
+#: src/gui.c:3707
 msgid "Rewind"
 msgstr ""
 
-#: src/gui.c:3592 src/dialogs.c:894 src/dialogs.c:896 src/dialogs.c:1817
-#: src/dialogs.c:1819
+#: src/gui.c:3718 src/dialogs.c:960 src/dialogs.c:962 src/dialogs.c:1873
+#: src/dialogs.c:1875
 msgid "Play all"
 msgstr ""
 
-#: src/gui.c:3605
+#: src/gui.c:3731
 msgid "Play Selection"
 msgstr ""
 
-#: src/gui.c:3619
+#: src/gui.c:3745
 msgid "Loop On/Off"
 msgstr ""
 
-#: src/gui.c:3693
+#: src/gui.c:3819
 msgid "Start _recording"
 msgstr ""
 
-#: src/gui.c:3698
+#: src/gui.c:3824
 msgid "Stop _recording"
 msgstr ""
 
-#: src/gui.c:3703
+#: src/gui.c:3829
 msgid "_Record Performance"
 msgstr ""
 
-#: src/gui.c:3851
+#: src/gui.c:3974
 msgid "Hide Play Window"
 msgstr ""
 
-#: src/gui.c:4232
+#: src/gui.c:4333
 msgid "Show Play Window"
 msgstr ""
 
-#: src/ce_thumbs.c:222
+#: src/ce_thumbs.c:242
 #, c-format
 msgid "Mapped to ctrl-%d"
 msgstr ""
 
-#: src/ce_thumbs.c:276 src/effects.c:85 src/preferences.c:3195
+#: src/ce_thumbs.c:296 src/effects.c:86 src/preferences.c:3247
 msgid "Effects"
 msgstr ""
 
-#: src/ce_thumbs.c:279 src/multitrack.c:5615
+#: src/ce_thumbs.c:299 src/multitrack.c:5791
 msgid "Clips"
 msgstr ""
 
-#: src/ce_thumbs.c:303
+#: src/ce_thumbs.c:323
 #, c-format
 msgid "Show / apply effects to %s\n"
 msgstr ""
 
-#: src/ce_thumbs.c:315
+#: src/ce_thumbs.c:335
 #, fuzzy, c-format
 msgid "Select clip for %s\n"
 msgstr "_Izbriši isječak skup"
 
-#: src/ce_thumbs.c:515
+#: src/ce_thumbs.c:536
 msgid "_Pin"
 msgstr ""
 
-#: src/ce_thumbs.c:515
+#: src/ce_thumbs.c:537
 msgid "Pin the parameter box to the window"
 msgstr ""
 
 #. TRANSLATORS: Exabytes
-#: src/utils.c:794
+#: src/utils.c:800
 #, c-format
 msgid "%.2f EB"
 msgstr ""
 
 #. TRANSLATORS: Petabytes
-#: src/utils.c:798
+#: src/utils.c:803
 #, c-format
 msgid "%.2f PB"
 msgstr ""
 
 #. TRANSLATORS: Terabytes
-#: src/utils.c:802
+#: src/utils.c:806
 #, c-format
 msgid "%.2f TB"
 msgstr ""
 
 #. TRANSLATORS: Gigabytes
-#: src/utils.c:806
+#: src/utils.c:809
 #, c-format
 msgid "%.2f GB"
 msgstr ""
 
 #. TRANSLATORS: Megabytes
-#: src/utils.c:810
+#: src/utils.c:812
 #, c-format
 msgid "%.2f MB"
 msgstr ""
 
 #. TRANSLATORS: Kilobytes (1024 bytes)
-#: src/utils.c:814
+#: src/utils.c:815
 #, c-format
 msgid "%.2f KiB"
 msgstr ""
@@ -3618,7 +3609,7 @@
 msgid "%d bytes"
 msgstr ""
 
-#: src/utils.c:1841
+#: src/utils.c:1835
 msgid "Clearing the clipboard"
 msgstr ""
 
@@ -3630,81 +3621,81 @@
 "Switched to clip %s\n"
 msgstr ""
 
-#: src/utils.c:1880
+#: src/utils.c:1877
 msgid ""
 "\n"
 "==============================\n"
 "Switched to empty clip\n"
 msgstr ""
 
-#: src/utils.c:1917
+#: src/utils.c:1916
 msgid "(blank)"
 msgstr ""
 
-#: src/utils.c:1920
+#: src/utils.c:1919
 #, c-format
 msgid ""
 "The set name has been changed from %s to %s. Affected layouts have been "
 "updated accordingly\n"
 msgstr ""
 
-#: src/utils.c:1928
+#: src/utils.c:1927
 #, c-format
 msgid ""
 "The clip %s is missing from this set.\n"
 "It is required by the following layouts:\n"
 msgstr ""
 
-#: src/utils.c:1932
+#: src/utils.c:1931
 #, c-format
 msgid ""
 "The clip %s has been closed.\n"
 "It is required by the following layouts:\n"
 msgstr ""
 
-#: src/utils.c:1937
+#: src/utils.c:1936
 #, c-format
 msgid ""
 "Frames have been shifted in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1942
+#: src/utils.c:1941
 #, c-format
 msgid ""
 "Frames have been deleted from the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1947
+#: src/utils.c:1946
 #, c-format
 msgid ""
 "Audio has been deleted from the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1952
+#: src/utils.c:1951
 #, c-format
 msgid ""
 "Audio has been shifted in clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1957
+#: src/utils.c:1956
 #, c-format
 msgid ""
 "Audio has been altered in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1962
+#: src/utils.c:1961
 #, c-format
 msgid ""
 "Frames have been altered in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:2135
+#: src/utils.c:2134
 #, c-format
 msgid ""
 "Set %s\n"
@@ -3712,7 +3703,7 @@
 "by another copy of LiVES.\n"
 msgstr ""
 
-#: src/utils.c:2142
+#: src/utils.c:2140
 #, c-format
 msgid ""
 "\n"
@@ -3758,67 +3749,67 @@
 msgid "Removing layout %s\n"
 msgstr ""
 
-#: src/utils.c:3014
+#: src/utils.c:2996
 msgid "Video [opening...]"
 msgstr ""
 
-#: src/utils.c:3018
+#: src/utils.c:2999
 #, c-format
 msgid "Video [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:3022
+#: src/utils.c:3002
 msgid "(Undefined)"
 msgstr ""
 
-#: src/utils.c:3025
+#: src/utils.c:3004
 msgid "(No video)"
 msgstr ""
 
-#: src/utils.c:3032
+#: src/utils.c:3011
 msgid "(No audio)"
 msgstr ""
 
-#: src/utils.c:3037
+#: src/utils.c:3015
 msgid "Mono  [opening...]"
 msgstr ""
 
-#: src/utils.c:3040
+#: src/utils.c:3017
 msgid "Left Audio [opening...]"
 msgstr ""
 
-#: src/utils.c:3045
+#: src/utils.c:3021
 #, c-format
 msgid "Mono [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:3048
+#: src/utils.c:3023
 #, c-format
 msgid "Left Audio [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:3056
+#: src/utils.c:3031
 msgid "Right Audio [opening...]"
 msgstr ""
 
-#: src/utils.c:3059
+#: src/utils.c:3033
 #, c-format
 msgid "Right Audio [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:3506
+#: src/utils.c:3472
 msgid "LiVES cannot switch to mplayer whilst clips are loading."
 msgstr ""
 
-#: src/utils.c:3559
+#: src/utils.c:3525
 msgid "LiVES cannot switch to mplayer2 whilst clips are loading."
 msgstr ""
 
-#: src/utils.c:3809
+#: src/utils.c:3775
 msgid "Cleaning up clip"
 msgstr ""
 
-#: src/utils.c:3913
+#: src/utils.c:3874
 #, c-format
 msgid ""
 "\n"
@@ -3828,30 +3819,29 @@
 "Overwrite ?\n"
 msgstr ""
 
-#: src/utils.c:4305 src/utils.c:4337 src/multitrack.c:4503
+#: src/utils.c:4250 src/utils.c:4280 src/multitrack.c:4672
 #, c-format
 msgid "_Undo %s"
 msgstr ""
 
-#: src/utils.c:4306 src/utils.c:4338 src/multitrack.c:4525
+#: src/utils.c:4251 src/utils.c:4281 src/multitrack.c:4693
 #, c-format
 msgid "_Redo %s"
 msgstr ""
 
-#: src/utils.c:4363
+#: src/utils.c:4305
 msgid "-------------Selection------------"
 msgstr ""
 
-#. TRANSLATORS: - try to keep the text of the middle part the same length, by deleting "-" if necessary
-#: src/utils.c:4371
+#: src/utils.c:4313
 msgid " sec ] ----------Selection---------- [ "
 msgstr ""
 
-#: src/utils.c:4371
+#: src/utils.c:4314
 msgid " frames ] ----------"
 msgstr ""
 
-#: src/utils.c:5360
+#: src/utils.c:5302
 msgid ""
 "Your version of mplayer/ffmpeg may be broken !\n"
 "See http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2071\n"
@@ -3862,11 +3852,11 @@
 "Try running Help/Troubleshoot for more information."
 msgstr ""
 
-#: src/saveplay.c:178
+#: src/saveplay.c:179
 msgid "Examining file header"
 msgstr ""
 
-#: src/saveplay.c:315 src/saveplay.c:789
+#: src/saveplay.c:316 src/saveplay.c:779
 #, c-format
 msgid "Opening %s"
 msgstr ""
@@ -3876,36 +3866,36 @@
 msgid "Opening %s start time %.2f sec. frames %d"
 msgstr ""
 
-#: src/saveplay.c:326 src/saveplay.c:4001
+#: src/saveplay.c:326 src/saveplay.c:3927
 msgid " without sound"
 msgstr ""
 
-#: src/saveplay.c:396
+#: src/saveplay.c:395
 #, c-format
 msgid "Opening audio for %s"
 msgstr ""
 
-#: src/saveplay.c:557
+#: src/saveplay.c:554
 #, c-format
 msgid "Auto trimming %.2f seconds of audio at start..."
 msgstr ""
 
-#: src/saveplay.c:567
+#: src/saveplay.c:562
 #, c-format
 msgid "Auto trimming %.2f seconds of audio at end..."
 msgstr ""
 
-#: src/saveplay.c:584
+#: src/saveplay.c:577
 #, c-format
 msgid "Auto padding with %.2f seconds of silence at start..."
 msgstr ""
 
-#: src/saveplay.c:599
+#: src/saveplay.c:590
 #, c-format
 msgid "Auto padding with %.2f seconds of silence at end..."
 msgstr ""
 
-#: src/saveplay.c:671
+#: src/saveplay.c:661
 #, c-format
 msgid ""
 "\n"
@@ -3917,11 +3907,11 @@
 "Are you sure you wish to continue ?"
 msgstr ""
 
-#: src/saveplay.c:685
+#: src/saveplay.c:676
 msgid " - please be patient."
 msgstr ""
 
-#: src/saveplay.c:938
+#: src/saveplay.c:926
 msgid ""
 "\n"
 "\n"
@@ -3929,14 +3919,14 @@
 "Please check the terminal window for more details.\n"
 msgstr ""
 
-#: src/saveplay.c:940
+#: src/saveplay.c:928
 msgid ""
 "\n"
 "\n"
 "You may need to install mplayer to open this file.\n"
 msgstr ""
 
-#: src/saveplay.c:948
+#: src/saveplay.c:934
 msgid ""
 "\n"
 "\n"
@@ -3944,29 +3934,29 @@
 "Tools|Preferences|Decoding\n"
 msgstr ""
 
-#: src/saveplay.c:1014
+#: src/saveplay.c:995
 msgid "Adding image..."
 msgstr ""
 
-#: src/saveplay.c:1108
+#: src/saveplay.c:1089
 #, c-format
 msgid "Subtitles were saved as %s\n"
 msgstr ""
 
-#: src/saveplay.c:1192
+#: src/saveplay.c:1171
 #, c-format
 msgid "LiVES: Save Frame %d as..."
 msgstr ""
 
-#: src/saveplay.c:1195
+#: src/saveplay.c:1174
 msgid "LiVES: Save Frame as..."
 msgstr ""
 
-#: src/saveplay.c:1322
+#: src/saveplay.c:1303
 msgid "LiVES: Save Clip as..."
 msgstr ""
 
-#: src/saveplay.c:1390
+#: src/saveplay.c:1369
 msgid ""
 "Saving your video could lead to a loss of quality !\n"
 "You are strongly advised to 'Save As' to a new file.\n"
@@ -3974,67 +3964,67 @@
 "Do you still wish to continue ?"
 msgstr ""
 
-#: src/saveplay.c:1517 src/saveplay.c:1683 src/saveplay.c:1762
-#: src/saveplay.c:4014
+#: src/saveplay.c:1494 src/saveplay.c:1659 src/saveplay.c:1738
+#: src/saveplay.c:3940
 msgid "Pulling frames from clip"
 msgstr ""
 
-#: src/saveplay.c:1588 src/saveplay.c:1727
+#: src/saveplay.c:1565 src/saveplay.c:1703
 msgid "Linking selection"
 msgstr ""
 
-#: src/saveplay.c:1779
+#: src/saveplay.c:1755
 msgid " (with no sound)\n"
 msgstr ""
 
-#: src/saveplay.c:1786
+#: src/saveplay.c:1761
 #, c-format
 msgid "Saving frames %d to %d%s as \"%s\" : encoder = %s : format = %s..."
 msgstr ""
 
-#: src/saveplay.c:1790
+#: src/saveplay.c:1765
 #, c-format
 msgid "Saving frames 1 to %d%s as \"%s\" : encoder %s : format = %s..."
 msgstr ""
 
-#: src/saveplay.c:1909
+#: src/saveplay.c:1890
 msgid "Saving [can take a long time]"
 msgstr ""
 
-#: src/saveplay.c:2057
+#: src/saveplay.c:2044
 msgid ""
 "\n"
 "\n"
 "Encoder error - output file was not created !\n"
 msgstr ""
 
-#: src/saveplay.c:2094
+#: src/saveplay.c:2081
 msgid "Clearing letterbox"
 msgstr ""
 
-#: src/saveplay.c:2183
+#: src/saveplay.c:2168
 #, c-format
 msgid "File size was %s\n"
 msgstr ""
 
-#: src/saveplay.c:2284
+#: src/saveplay.c:2265
 msgid "recording aborted by preview.\n"
 msgstr ""
 
-#: src/saveplay.c:2288
+#: src/saveplay.c:2268
 msgid "recording aborted by clipboard playback.\n"
 msgstr ""
 
-#: src/saveplay.c:2291
+#: src/saveplay.c:2270
 msgid "Recording performance..."
 msgstr ""
 
-#: src/saveplay.c:3293
+#: src/saveplay.c:3251
 #, c-format
 msgid "Average FPS was %.4f\n"
 msgstr ""
 
-#: src/saveplay.c:3299
+#: src/saveplay.c:3256
 msgid ""
 "\n"
 "\n"
@@ -4043,16 +4033,21 @@
 "and resize all frames to the current size.\n"
 msgstr ""
 
-#: src/saveplay.c:3479
+#: src/saveplay.c:3429
 msgid "Unknown"
 msgstr ""
 
-#: src/saveplay.c:3588 src/saveplay.c:4585
+#: src/saveplay.c:3538 src/saveplay.c:4502
 #, c-format
 msgid "Untitled%d"
 msgstr ""
 
-#: src/saveplay.c:3633
+#: src/saveplay.c:3567
+#, c-format
+msgid "%d frames are enough !\n"
+msgstr "%d okviri su dovoljno!\n"
+
+#: src/saveplay.c:3579
 #, c-format
 msgid ""
 "\n"
@@ -4060,7 +4055,7 @@
 "Bad things may happen with this clip.\n"
 msgstr ""
 
-#: src/saveplay.c:3723
+#: src/saveplay.c:3667
 #, c-format
 msgid ""
 "\n"
@@ -4068,73 +4063,73 @@
 "Default can be set in Tools | Preferences | Misc.\n"
 msgstr ""
 
-#: src/saveplay.c:3735
+#: src/saveplay.c:3677
 #, c-format
 msgid "Playback speed was adjusted to %.3f frames per second to fit audio.\n"
 msgstr ""
 
-#: src/saveplay.c:3754
+#: src/saveplay.c:3694
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d *bpp=Greyscale* fps=%.3f\n"
 "Audio:"
 msgstr ""
 
-#: src/saveplay.c:3758 src/saveplay.c:4762
+#: src/saveplay.c:3698 src/saveplay.c:4671
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d bpp=%d fps=%.3f\n"
 "Audio:"
 msgstr ""
 
-#: src/saveplay.c:3762 src/saveplay.c:4766
+#: src/saveplay.c:3703 src/saveplay.c:4676
 #, c-format
 msgid "%s none\n"
 msgstr ""
 
-#: src/saveplay.c:3774
+#: src/saveplay.c:3714
 #, c-format
 msgid " - Author: %s\n"
 msgstr ""
 
-#: src/saveplay.c:3779
+#: src/saveplay.c:3717
 #, c-format
 msgid " - Title: %s\n"
 msgstr ""
 
-#: src/saveplay.c:3784
+#: src/saveplay.c:3720
 #, c-format
 msgid " - Comment: %s\n"
 msgstr ""
 
-#: src/saveplay.c:3897
+#: src/saveplay.c:3829
 #, c-format
 msgid "Saving frame %d as %s..."
 msgstr ""
 
-#: src/saveplay.c:3996
+#: src/saveplay.c:3924
 #, c-format
 msgid "Backing up %s to %s"
 msgstr ""
 
-#: src/saveplay.c:4049
+#: src/saveplay.c:3975
 msgid "Backing up"
 msgstr ""
 
-#: src/saveplay.c:4083
+#: src/saveplay.c:4009
 msgid "performance data was backed up..."
 msgstr ""
 
-#: src/saveplay.c:4661
+#: src/saveplay.c:4574
 #, c-format
 msgid "Restoring %s..."
 msgstr ""
 
-#: src/saveplay.c:4692
+#: src/saveplay.c:4603
 msgid "Restoring"
 msgstr ""
 
-#: src/saveplay.c:4714
+#: src/saveplay.c:4625
 #, c-format
 msgid ""
 "\n"
@@ -4144,22 +4139,22 @@
 msgstr ""
 
 #. TRANSLATORS: rec(ord) %.2f M(ega)B(ytes)
-#: src/saveplay.c:5207
+#: src/saveplay.c:5118
 #, c-format
 msgid "rec %.2f MB"
 msgstr ""
 
-#: src/saveplay.c:5213
+#: src/saveplay.c:5123
 #, c-format
 msgid "!rec %.2f MB"
 msgstr ""
 
 #. TRANSLATORS: rec(ord) ?? M(ega)B(ytes)
-#: src/saveplay.c:5216
+#: src/saveplay.c:5126
 msgid "rec ?? MB"
 msgstr ""
 
-#: src/saveplay.c:5241
+#: src/saveplay.c:5151
 #, c-format
 msgid ""
 "\n"
@@ -4167,54 +4162,74 @@
 "Record stop level can be set in Preferences.\n"
 msgstr ""
 
-#: src/saveplay.c:5535
+#: src/saveplay.c:5447
 msgid ""
 "\n"
 "Files from a previous run of LiVES were found.\n"
 "Do you want to attempt to recover them ?\n"
 msgstr ""
 
-#: src/saveplay.c:5557
+#: src/saveplay.c:5469
 msgid "Recovering files"
 msgstr ""
 
-#: src/saveplay.c:5560
+#: src/saveplay.c:5472
 msgid "Recovering files..."
 msgstr ""
 
-#: src/dialogs.c:72
+#: src/dialogs.c:71
 msgid "Show affected _layouts"
 msgstr ""
 
-#: src/dialogs.c:128
+#: src/dialogs.c:113
+msgid ""
+"Do _not show this warning any more\n"
+"(can be turned back on from Preferences/Warnings)"
+msgstr ""
+
+#: src/dialogs.c:127
 msgid "_Recover disk space"
 msgstr ""
 
-#: src/dialogs.c:143
+#: src/dialogs.c:142
 msgid " _Advanced Settings >>"
 msgstr ""
 
-#: src/dialogs.c:184
+#: src/dialogs.c:183 src/dialogs.c:221
 msgid "LiVES: - Warning !"
 msgstr ""
 
 #: src/dialogs.c:194
+#, fuzzy
+msgid "LiVES: - Error !"
+msgstr "LiVES: - Umetni"
+
+#: src/dialogs.c:204
+#, fuzzy
+msgid "LiVES: - Information"
+msgstr "LiVES: - Otvori Lokacija"
+
+#: src/dialogs.c:230
 msgid "LiVES: - Question"
 msgstr ""
 
-#: src/dialogs.c:204
+#: src/dialogs.c:239
 msgid "LiVES: - File Error"
 msgstr ""
 
-#: src/dialogs.c:208
+#: src/dialogs.c:241
 msgid "_Abort"
 msgstr ""
 
-#: src/dialogs.c:213
+#: src/dialogs.c:246
 msgid "_Retry"
 msgstr ""
 
-#: src/dialogs.c:597
+#: src/dialogs.c:306
+msgid "Show _Details"
+msgstr "Prikaži _Detalje"
+
+#: src/dialogs.c:657
 #, c-format
 msgid ""
 "FREE SPACE IN THE PARTITION CONTAINING\n"
@@ -4225,7 +4240,7 @@
 "(Disk warning levels can be configured in Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:615
+#: src/dialogs.c:676
 #, c-format
 msgid ""
 "Free space in the partition containing\n"
@@ -4237,11 +4252,11 @@
 "Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:627
+#: src/dialogs.c:688
 msgid "Audio players cannot be switched during playback."
 msgstr ""
 
-#: src/dialogs.c:632
+#: src/dialogs.c:694
 msgid ""
 "\n"
 "\n"
@@ -4249,46 +4264,46 @@
 "Please try closing some other applications first.\n"
 msgstr ""
 
-#: src/dialogs.c:752
+#: src/dialogs.c:820
 msgid "Processing has been paused."
 msgstr ""
 
-#: src/dialogs.c:937
+#: src/dialogs.c:1002
 #, c-format
 msgid ""
 "\n"
 "%s%d%% done. Time remaining: %u sec%s\n"
 msgstr ""
 
-#: src/dialogs.c:1335
+#: src/dialogs.c:1391
 #, c-format
 msgid ""
 "\n"
 "%d/%d frames opened. Time remaining %u sec.\n"
 msgstr ""
 
-#: src/dialogs.c:1337
+#: src/dialogs.c:1393
 #, c-format
 msgid ""
 "\n"
 "%d/%d frames opened.\n"
 msgstr ""
 
-#: src/dialogs.c:1341
+#: src/dialogs.c:1396
 #, c-format
 msgid ""
 "\n"
 "%d frames opened.\n"
 msgstr ""
 
-#: src/dialogs.c:1940
+#: src/dialogs.c:1993
 #, c-format
 msgid ""
 "\n"
 "Time remaining: %d sec"
 msgstr ""
 
-#: src/dialogs.c:1988
+#: src/dialogs.c:2040
 #, c-format
 msgid ""
 "\n"
@@ -4296,7 +4311,7 @@
 "Please close a file and then try again."
 msgstr ""
 
-#: src/dialogs.c:1994
+#: src/dialogs.c:2047
 #, c-format
 msgid ""
 "LiVES was unable to write to its temporary directory.\n"
@@ -4308,27 +4323,27 @@
 "Please make sure you can write to this directory."
 msgstr ""
 
-#: src/dialogs.c:2005
+#: src/dialogs.c:2059
 msgid ""
 "\n"
 "LiVES currently requires either 'mplayer', 'mplayer2', or 'sox' to function. "
 "Please install one or other of these, and try again.\n"
 msgstr ""
 
-#: src/dialogs.c:2010
+#: src/dialogs.c:2064
 msgid ""
 "Audio was not loaded; please install mplayer or mplayer2 if you expected "
 "audio for this clip.\n"
 msgstr ""
 
-#: src/dialogs.c:2014
+#: src/dialogs.c:2069
 msgid ""
 "Audio resampling is required for this format.\n"
 "Please install 'sox'\n"
 "Or switch to another encoder format in Tools | Preferences | Encoding\n"
 msgstr ""
 
-#: src/dialogs.c:2019
+#: src/dialogs.c:2075
 msgid ""
 "\n"
 "\n"
@@ -4336,19 +4351,19 @@
 "Please set the audio codec in Tools|Preferences|Encoding\n"
 msgstr ""
 
-#: src/dialogs.c:2024
+#: src/dialogs.c:2080
 msgid ""
 "This layout includes generated frames.\n"
 "It cannot be saved, you must render it to a clip first.\n"
 msgstr ""
 
-#: src/dialogs.c:2029
+#: src/dialogs.c:2085
 msgid ""
 "This layout includes generated or recorded audio.\n"
 "It cannot be saved, you must render it to a clip first.\n"
 msgstr ""
 
-#: src/dialogs.c:2039 src/dialogs.c:2137
+#: src/dialogs.c:2095 src/dialogs.c:2189
 #, c-format
 msgid ""
 "\n"
@@ -4356,83 +4371,83 @@
 "Due to restrictions in the %s format\n"
 msgstr ""
 
-#: src/dialogs.c:2059
+#: src/dialogs.c:2115
 msgid ""
 "LiVES recommends the following settings:\n"
 "\n"
 msgstr ""
 
-#: src/dialogs.c:2065 src/dialogs.c:2174 src/resample.c:850
+#: src/dialogs.c:2121 src/dialogs.c:2225 src/resample.c:839
 msgid ", signed"
 msgstr ""
 
-#: src/dialogs.c:2066 src/dialogs.c:2175 src/resample.c:853
+#: src/dialogs.c:2122 src/dialogs.c:2226 src/resample.c:841
 msgid ", unsigned"
 msgstr ""
 
-#: src/dialogs.c:2070 src/dialogs.c:2179 src/resample.c:858
+#: src/dialogs.c:2126 src/dialogs.c:2230 src/resample.c:846
 msgid ", little-endian"
 msgstr ""
 
-#: src/dialogs.c:2071 src/dialogs.c:2180 src/resample.c:861
+#: src/dialogs.c:2127 src/dialogs.c:2231 src/resample.c:848
 msgid ", big-endian"
 msgstr ""
 
-#: src/dialogs.c:2077
+#: src/dialogs.c:2132
 #, c-format
 msgid "Use an audio rate of %d Hz%s%s\n"
 msgstr ""
 
-#: src/dialogs.c:2085
+#: src/dialogs.c:2140
 #, c-format
 msgid "Set video rate to %.3f frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:2089
+#: src/dialogs.c:2143
 #, c-format
 msgid "Set video rate to %d:%d frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:2094 src/dialogs.c:2209
+#: src/dialogs.c:2148 src/dialogs.c:2258
 #, c-format
 msgid "Set video size to %d x %d pixels\n"
 msgstr ""
 
-#: src/dialogs.c:2102 src/dialogs.c:2208
+#: src/dialogs.c:2156 src/dialogs.c:2257
 msgid ""
 "\n"
 "You may wish to:\n"
 msgstr ""
 
-#: src/dialogs.c:2105 src/dialogs.c:2200
+#: src/dialogs.c:2159 src/dialogs.c:2249
 #, c-format
 msgid "resize video to %d x %d pixels\n"
 msgstr ""
 
-#: src/dialogs.c:2110
+#: src/dialogs.c:2163
 msgid "disable audio, since the target encoder cannot encode audio\n"
 msgstr ""
 
-#: src/dialogs.c:2170
+#: src/dialogs.c:2221
 msgid "LiVES must:\n"
 msgstr ""
 
-#: src/dialogs.c:2185
+#: src/dialogs.c:2235
 #, c-format
 msgid "resample audio to %d Hz%s%s\n"
 msgstr ""
 
-#: src/dialogs.c:2192
+#: src/dialogs.c:2242
 #, c-format
 msgid "resample video to %.3f frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:2196
+#: src/dialogs.c:2245
 #, c-format
 msgid "resample video to %d:%d frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:2215
+#: src/dialogs.c:2263
 msgid ""
 "\n"
 "You will be able to undo these changes afterwards.\n"
@@ -4441,14 +4456,14 @@
 "\n"
 msgstr ""
 
-#: src/dialogs.c:2218
+#: src/dialogs.c:2265
 msgid ""
 "\n"
 "Changes applied to the selection will not be permanent.\n"
 "\n"
 msgstr ""
 
-#: src/dialogs.c:2237
+#: src/dialogs.c:2285
 msgid ""
 "\n"
 "\n"
@@ -4457,7 +4472,7 @@
 "Try recording for just a selection of the file."
 msgstr ""
 
-#: src/dialogs.c:2244
+#: src/dialogs.c:2293
 msgid ""
 "The playback speed (fps), or the audio rate\n"
 " of the clipboard does not match\n"
@@ -4468,7 +4483,7 @@
 "Please press Cancel to abort the insert, or OK to continue."
 msgstr ""
 
-#: src/dialogs.c:2253
+#: src/dialogs.c:2304
 #, c-format
 msgid ""
 "When opening a yuvmpeg stream, you should first create a fifo file in:\n"
@@ -4481,11 +4496,11 @@
 "click Cancel."
 msgstr ""
 
-#: src/dialogs.c:2305
+#: src/dialogs.c:2356
 msgid "Show Keys"
 msgstr ""
 
-#: src/dialogs.c:2306
+#: src/dialogs.c:2358
 msgid ""
 "You can use the following keys during playback to control LiVES:-\n"
 "\n"
@@ -4527,11 +4542,11 @@
 "g                             ping pong loops\n"
 msgstr ""
 
-#: src/dialogs.c:2313
+#: src/dialogs.c:2365
 msgid "Multitrack Keys"
 msgstr ""
 
-#: src/dialogs.c:2314
+#: src/dialogs.c:2367
 msgid ""
 "You can use the following keys to control the multitrack window:-\n"
 "\n"
@@ -4553,18 +4568,18 @@
 "For other keys, see the menus.\n"
 msgstr ""
 
-#: src/dialogs.c:2322
+#: src/dialogs.c:2375
 msgid "Message History"
 msgstr ""
 
-#: src/dialogs.c:2335
+#: src/dialogs.c:2388
 #, c-format
 msgid ""
 "After upgrading/installing, you may need to adjust the <prefix_dir> setting "
 "in your %s file"
 msgstr ""
 
-#: src/dialogs.c:2344
+#: src/dialogs.c:2399
 #, c-format
 msgid ""
 "\n"
@@ -4575,25 +4590,25 @@
 "or change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/dialogs.c:2352
+#: src/dialogs.c:2408
 msgid ""
 "Sorry, unknown audio type.\n"
 "\n"
 " (Filenames must end in .mp3, .ogg, .wav, .mod, .xm or .it)"
 msgstr ""
 
-#: src/dialogs.c:2353
+#: src/dialogs.c:2409
 msgid "failed (unknown type)\n"
 msgstr ""
 
-#: src/dialogs.c:2358
+#: src/dialogs.c:2415
 msgid ""
 "\n"
 "Do you wish to remove the layout files associated with this set ?\n"
 "(They will not be usable without the set).\n"
 msgstr ""
 
-#: src/dialogs.c:2363
+#: src/dialogs.c:2421
 #, c-format
 msgid ""
 "\n"
@@ -4602,7 +4617,7 @@
 "Click Cancel to pick a new name.\n"
 msgstr ""
 
-#: src/dialogs.c:2370
+#: src/dialogs.c:2429
 msgid ""
 "\n"
 "Frames from this clip are used in some multitrack layouts.\n"
@@ -4610,7 +4625,7 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2374
+#: src/dialogs.c:2433
 msgid ""
 "\n"
 "Audio from this clip is used in some multitrack layouts.\n"
@@ -4618,7 +4633,7 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2378
+#: src/dialogs.c:2438
 #, c-format
 msgid ""
 "\n"
@@ -4629,7 +4644,7 @@
 "Otherwise click Cancel to skip loading this file.\n"
 msgstr ""
 
-#: src/dialogs.c:2385
+#: src/dialogs.c:2446
 #, c-format
 msgid ""
 "\n"
@@ -4639,7 +4654,7 @@
 "The clip could not be loaded.\n"
 msgstr ""
 
-#: src/dialogs.c:2392
+#: src/dialogs.c:2455
 msgid ""
 "\n"
 "Dear user, the jack developers decided to remove the -Z option from jackd.\n"
@@ -4647,7 +4662,7 @@
 "Alternately, select a different audio player in Preferences.\n"
 msgstr ""
 
-#: src/dialogs.c:2396
+#: src/dialogs.c:2460
 msgid ""
 "\n"
 "Unable to start up jack. Please ensure that alsa is set up correctly on your "
@@ -4656,13 +4671,13 @@
 "Automatic jack startup will be disabled now.\n"
 msgstr ""
 
-#: src/dialogs.c:2402
+#: src/dialogs.c:2466
 msgid ""
 "\n"
 "Unable to connect to jack server. Please start jack before starting LiVES\n"
 msgstr ""
 
-#: src/dialogs.c:2411
+#: src/dialogs.c:2475
 #, c-format
 msgid ""
 "\n"
@@ -4673,13 +4688,13 @@
 "%s\n"
 msgstr ""
 
-#: src/dialogs.c:2418
+#: src/dialogs.c:2482
 msgid ""
 "\n"
 "Alternately, you can restart LiVES and select another audio player.\n"
 msgstr ""
 
-#: src/dialogs.c:2423
+#: src/dialogs.c:2488
 #, c-format
 msgid ""
 "\n"
@@ -4689,7 +4704,7 @@
 "It is recommended to increase it to at least %d MB"
 msgstr ""
 
-#: src/dialogs.c:2429
+#: src/dialogs.c:2496
 #, c-format
 msgid ""
 "\n"
@@ -4698,7 +4713,7 @@
 "Do you wish to delete them ?\n"
 msgstr ""
 
-#: src/dialogs.c:2436
+#: src/dialogs.c:2504
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for multitrack undo.\n"
@@ -4706,7 +4721,7 @@
 "using Preferences/Multitrack/Undo Memory\n"
 msgstr ""
 
-#: src/dialogs.c:2440
+#: src/dialogs.c:2508
 msgid ""
 "\n"
 "Out of memory for undo.\n"
@@ -4714,63 +4729,63 @@
 "using Preferences/Multitrack/Undo Memory\n"
 msgstr ""
 
-#: src/dialogs.c:2444
+#: src/dialogs.c:2512
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for the multitrack undo buffer.\n"
 msgstr ""
 
-#: src/dialogs.c:2446
+#: src/dialogs.c:2514
 msgid "or enter a smaller value.\n"
 msgstr ""
 
-#: src/dialogs.c:2448
+#: src/dialogs.c:2516
 msgid "Try again from the clip editor, try closing some other applications\n"
 msgstr ""
 
-#: src/dialogs.c:2449
+#: src/dialogs.c:2517
 msgid "Try closing some other applications\n"
 msgstr ""
 
-#: src/dialogs.c:2460
+#: src/dialogs.c:2529
 msgid ""
 "Multitrack is set to 0 audio channels, but this layout has audio.\n"
 "You should adjust the audio settings from the Tools menu.\n"
 msgstr ""
 
-#: src/dialogs.c:2464
+#: src/dialogs.c:2534
 msgid ""
 "The current layout has audio, so audio channels may not be set to zero.\n"
 msgstr ""
 
-#: src/dialogs.c:2468
+#: src/dialogs.c:2539
 msgid ""
 "Multitrack audio preview is only available with the\n"
 "\"jack\" or \"pulse audio\" audio player.\n"
 "You can set this in Tools|Preferences|Playback."
 msgstr ""
 
-#: src/dialogs.c:2472
+#: src/dialogs.c:2545
 msgid ""
 "Errors were detected in the layout (which may be due to transferring from "
 "another system, or from an older version of LiVES).\n"
 "Should I try to repair the disk copy of the layout ?\n"
 msgstr ""
 
-#: src/dialogs.c:2476
+#: src/dialogs.c:2549
 msgid ""
 "LiVES was unable to load the layout.\n"
 "Sorry.\n"
 msgstr ""
 
-#: src/dialogs.c:2482
+#: src/dialogs.c:2555
 msgid ""
 "\n"
 "\n"
 "Audio rate must be greater than 0.\n"
 msgstr ""
 
-#: src/dialogs.c:2486
+#: src/dialogs.c:2559
 msgid ""
 "\n"
 "Event list will be very large\n"
@@ -4778,14 +4793,14 @@
 "Are you sure you wish to view it ?\n"
 msgstr ""
 
-#: src/dialogs.c:2491
+#: src/dialogs.c:2564
 msgid ""
 "\n"
 "\n"
 "You must install 'dvgrab' to use this function.\n"
 msgstr ""
 
-#: src/dialogs.c:2496
+#: src/dialogs.c:2570
 msgid ""
 "\n"
 "\n"
@@ -4794,25 +4809,25 @@
 "You may need to select one of these in Tools/Preferences/Playback.\n"
 msgstr ""
 
-#: src/dialogs.c:2500
+#: src/dialogs.c:2574
 msgid "Video playback plugin failed to initialise palette !\n"
 msgstr ""
 
-#: src/dialogs.c:2504
+#: src/dialogs.c:2579
 msgid "Decoder plugin failed to initialise palette !\n"
 msgstr ""
 
-#: src/dialogs.c:2509
+#: src/dialogs.c:2584
 msgid "Unable to set framerate of video plugin\n"
 msgstr ""
 
-#: src/dialogs.c:2514
+#: src/dialogs.c:2590
 msgid ""
 "After a crash, it is advisable to clean up the disk with\n"
 "File|Clean up disk space\n"
 msgstr ""
 
-#: src/dialogs.c:2526
+#: src/dialogs.c:2604
 #, c-format
 msgid ""
 "Stream frame size is too large for your network buffers.\n"
@@ -4821,33 +4836,33 @@
 "echo %d > /proc/sys/net/core/rmem_max\n"
 msgstr ""
 
-#: src/dialogs.c:2714
+#: src/dialogs.c:2800
 msgid "cancelled.\n"
 msgstr ""
 
-#: src/dialogs.c:2721
+#: src/dialogs.c:2805
 msgid "failed.\n"
 msgstr ""
 
-#: src/dialogs.c:2728
+#: src/dialogs.c:2810
 msgid "done.\n"
 msgstr ""
 
-#: src/dialogs.c:2732
+#: src/dialogs.c:2814
 msgid "error in file. Failed.\n"
 msgstr ""
 
-#: src/dialogs.c:2766 src/dialogs.c:2815 src/dialogs.c:2839
+#: src/dialogs.c:2848 src/dialogs.c:2897 src/dialogs.c:2921
 #, c-format
 msgid "Additional info: %s\n"
 msgstr ""
 
-#: src/dialogs.c:2769
+#: src/dialogs.c:2851
 #, c-format
 msgid "The error value was %d%s\n"
 msgstr ""
 
-#: src/dialogs.c:2772
+#: src/dialogs.c:2854
 #, c-format
 msgid ""
 "\n"
@@ -4857,7 +4872,7 @@
 "%s%s%s"
 msgstr ""
 
-#: src/dialogs.c:2818
+#: src/dialogs.c:2900
 #, c-format
 msgid ""
 "\n"
@@ -4867,7 +4882,7 @@
 "%s"
 msgstr ""
 
-#: src/dialogs.c:2842
+#: src/dialogs.c:2924
 #, c-format
 msgid ""
 "\n"
@@ -4877,7 +4892,7 @@
 "%s"
 msgstr ""
 
-#: src/dialogs.c:2886
+#: src/dialogs.c:2968
 #, c-format
 msgid ""
 "\n"
@@ -4886,7 +4901,7 @@
 "Please check for possible error causes.\n"
 msgstr ""
 
-#: src/dialogs.c:2890
+#: src/dialogs.c:2971
 #, c-format
 msgid ""
 "\n"
@@ -4896,7 +4911,7 @@
 "%s.\n"
 msgstr ""
 
-#: src/dialogs.c:2921
+#: src/dialogs.c:3002
 #, c-format
 msgid ""
 "\n"
@@ -4905,7 +4920,7 @@
 "Please check for possible error causes.\n"
 msgstr ""
 
-#: src/dialogs.c:2925
+#: src/dialogs.c:3005
 #, c-format
 msgid ""
 "\n"
@@ -4915,12 +4930,12 @@
 "%s.\n"
 msgstr ""
 
-#: src/dialogs.c:2993
+#: src/dialogs.c:3073
 #, c-format
 msgid "Value for \"%s\" could not be read."
 msgstr ""
 
-#: src/dialogs.c:3011
+#: src/dialogs.c:3091
 #, c-format
 msgid ""
 "\n"
@@ -4929,7 +4944,7 @@
 "Please check your system for errors.\n"
 msgstr ""
 
-#: src/dialogs.c:3020
+#: src/dialogs.c:3100
 #, c-format
 msgid ""
 "\n"
@@ -4938,7 +4953,7 @@
 "Please check the file permissions and try again."
 msgstr ""
 
-#: src/dialogs.c:3027
+#: src/dialogs.c:3109
 #, c-format
 msgid ""
 "\n"
@@ -4947,7 +4962,7 @@
 "Please check the directory permissions and try again."
 msgstr ""
 
-#: src/dialogs.c:3034
+#: src/dialogs.c:3116
 #, c-format
 msgid ""
 "\n"
@@ -4955,14 +4970,14 @@
 "%s\n"
 msgstr ""
 
-#: src/dialogs.c:3041
+#: src/dialogs.c:3123
 msgid ""
 "\n"
 "Abort and exit immediately from LiVES\n"
 "Are you sure ?\n"
 msgstr ""
 
-#: src/dialogs.c:3047
+#: src/dialogs.c:3129
 #, c-format
 msgid ""
 "\n"
@@ -4970,13 +4985,13 @@
 "Please select another encoder from the list.\n"
 msgstr ""
 
-#: src/dialogs.c:3056
+#: src/dialogs.c:3139
 msgid ""
 "\n"
 "This card is already in use and cannot be opened multiple times.\n"
 msgstr ""
 
-#: src/dialogs.c:3061
+#: src/dialogs.c:3145
 #, c-format
 msgid ""
 "\n"
@@ -4986,27 +5001,27 @@
 "- Check if the device actually exists.\n"
 msgstr ""
 
-#: src/dialogs.c:3068
+#: src/dialogs.c:3153
 msgid ""
 "\n"
 "This file already has subtitles loaded.\n"
 "Do you wish to overwrite the existing subtitles ?\n"
 msgstr ""
 
-#: src/dialogs.c:3072
+#: src/dialogs.c:3157
 msgid ""
 "\n"
 "LiVES currently only supports subtitles of type .srt and .sub.\n"
 msgstr ""
 
-#: src/dialogs.c:3076
+#: src/dialogs.c:3161
 msgid ""
 "\n"
 "Erase all subtitles from this clip.\n"
 "Are you sure ?\n"
 msgstr ""
 
-#: src/dialogs.c:3082
+#: src/dialogs.c:3168
 #, c-format
 msgid ""
 "\n"
@@ -5015,14 +5030,14 @@
 "or OK to continue and save as type \"%s\"\n"
 msgstr ""
 
-#: src/dialogs.c:3089
+#: src/dialogs.c:3176
 msgid ""
 "\n"
 "Do you wish to move the current clip sets to the new directory ?\n"
 "(If unsure, click Yes)\n"
 msgstr ""
 
-#: src/dialogs.c:3093
+#: src/dialogs.c:3181
 #, c-format
 msgid ""
 "\n"
@@ -5033,19 +5048,19 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:3099
+#: src/dialogs.c:3188
 msgid ""
 "\n"
 "No video input devices could be found.\n"
 msgstr ""
 
-#: src/dialogs.c:3103
+#: src/dialogs.c:3192
 msgid ""
 "\n"
 "All video input devices are already in use.\n"
 msgstr ""
 
-#: src/dialogs.c:3107
+#: src/dialogs.c:3196
 msgid ""
 "\n"
 "\n"
@@ -5053,15 +5068,14 @@
 "DO NOT SHUT DOWN OR CLOSE LIVES !\n"
 msgstr ""
 
-#: src/dialogs.c:3127
+#: src/dialogs.c:3203
 #, c-format
 msgid ""
 "No clips were recovered for set (%s).\n"
 "Please check the spelling of the set name and try again.\n"
 msgstr ""
 
-#. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:3136
+#: src/dialogs.c:3214
 #, c-format
 msgid ""
 "\n"
@@ -5073,7 +5087,7 @@
 msgstr ""
 
 #. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:3144
+#: src/dialogs.c:3222
 #, c-format
 msgid ""
 "\n"
@@ -5082,34 +5096,34 @@
 "\n"
 msgstr ""
 
-#: src/dialogs.c:3150
+#: src/dialogs.c:3228
 msgid ""
 "\n"
 "You must have autolives.pl installed and in your path to use this toy.\n"
 "Consult your package distributor.\n"
 msgstr ""
 
-#: src/dialogs.c:3154
+#: src/dialogs.c:3232
 msgid ""
 "\n"
 "You must have a minimum of one clip loaded to use this toy.\n"
 msgstr ""
 
-#: src/dialogs.c:3158
+#: src/dialogs.c:3236
 msgid ""
 "\n"
 "LiVES lost its connection to jack and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:3162
+#: src/dialogs.c:3240
 msgid ""
 "\n"
 "LiVES lost its connection to pulseaudio and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:3175
+#: src/dialogs.c:3254
 #, c-format
 msgid ""
 "\n"
@@ -5118,543 +5132,543 @@
 "Do you wish to allow this (for this session only) ?\n"
 msgstr ""
 
-#: src/effects.c:60
+#: src/effects.c:61
 msgid "generator"
 msgstr ""
 
-#: src/effects.c:61
+#: src/effects.c:62
 msgid "Generators"
 msgstr ""
 
-#: src/effects.c:63
+#: src/effects.c:64
 msgid "audio generator"
 msgstr ""
 
-#: src/effects.c:64
+#: src/effects.c:65
 msgid "Audio Generators"
 msgstr ""
 
-#: src/effects.c:66
+#: src/effects.c:67
 msgid "audio/video generator"
 msgstr ""
 
-#: src/effects.c:67
+#: src/effects.c:68
 msgid "Audio/Video Generators"
 msgstr ""
 
-#: src/effects.c:69
+#: src/effects.c:70
 msgid "data generator"
 msgstr ""
 
-#: src/effects.c:70
+#: src/effects.c:71
 msgid "Data Generators"
 msgstr ""
 
-#: src/effects.c:72
+#: src/effects.c:73
 msgid "data visualiser"
 msgstr ""
 
-#: src/effects.c:73
+#: src/effects.c:74
 msgid "Data Visualisers"
 msgstr ""
 
-#: src/effects.c:75
+#: src/effects.c:76
 msgid "data processor"
 msgstr ""
 
-#: src/effects.c:76
+#: src/effects.c:77
 msgid "Data Processors"
 msgstr ""
 
-#: src/effects.c:78
+#: src/effects.c:79
 msgid "data source"
 msgstr ""
 
-#: src/effects.c:79
+#: src/effects.c:80
 msgid "Data Sources"
 msgstr ""
 
-#: src/effects.c:81
+#: src/effects.c:82
 msgid "transition"
 msgstr ""
 
-#: src/effects.c:82
+#: src/effects.c:83
 msgid "Transitions"
 msgstr ""
 
-#: src/effects.c:84
+#: src/effects.c:85
 msgid "effect"
 msgstr ""
 
-#: src/effects.c:87 src/rfx-builder.c:187
+#: src/effects.c:88 src/rfx-builder.c:187
 msgid "utility"
 msgstr ""
 
-#: src/effects.c:88
+#: src/effects.c:89
 msgid "Utilities"
 msgstr ""
 
-#: src/effects.c:90
+#: src/effects.c:91
 msgid "compositor"
 msgstr ""
 
-#: src/effects.c:91
+#: src/effects.c:92
 msgid "Compositors"
 msgstr ""
 
-#: src/effects.c:93
+#: src/effects.c:94
 msgid "tap"
 msgstr ""
 
-#: src/effects.c:94
+#: src/effects.c:95
 msgid "Taps"
 msgstr ""
 
-#: src/effects.c:96
+#: src/effects.c:97
 msgid "splitter"
 msgstr ""
 
-#: src/effects.c:97
+#: src/effects.c:98
 msgid "Splitters"
 msgstr ""
 
-#: src/effects.c:99
+#: src/effects.c:100
 msgid "converter"
 msgstr ""
 
-#: src/effects.c:100
+#: src/effects.c:101
 msgid "Converters"
 msgstr ""
 
-#: src/effects.c:102
+#: src/effects.c:103
 msgid "analyser"
 msgstr ""
 
-#: src/effects.c:103
+#: src/effects.c:104
 msgid "Analysers"
 msgstr ""
 
-#: src/effects.c:108
+#: src/effects.c:109
 msgid "audio/video"
 msgstr ""
 
-#: src/effects.c:109
+#: src/effects.c:110
 msgid "Audio/Video Transitions"
 msgstr ""
 
-#: src/effects.c:111
+#: src/effects.c:112
 msgid "video only"
 msgstr ""
 
-#: src/effects.c:112
+#: src/effects.c:113
 msgid "Video only Transitions"
 msgstr ""
 
-#: src/effects.c:114 src/multitrack.c:10740
+#: src/effects.c:115 src/multitrack.c:10962
 msgid "audio only"
 msgstr ""
 
-#: src/effects.c:115
+#: src/effects.c:116
 msgid "Audio only Transitions"
 msgstr ""
 
-#: src/effects.c:117 src/effects.c:120 src/multitrack.c:18757
+#: src/effects.c:118 src/effects.c:121 src/multitrack.c:19097
 msgid "audio"
 msgstr ""
 
-#: src/effects.c:118
+#: src/effects.c:119
 msgid "Audio Mixers"
 msgstr ""
 
-#: src/effects.c:121
+#: src/effects.c:122
 msgid "Audio Effects"
 msgstr ""
 
-#: src/effects.c:123
+#: src/effects.c:124
 msgid "video"
 msgstr ""
 
-#: src/effects.c:124
+#: src/effects.c:125
 msgid "Video Effects"
 msgstr ""
 
-#: src/effects.c:126
+#: src/effects.c:127
 msgid "audio volume controller"
 msgstr ""
 
-#: src/effects.c:127
+#: src/effects.c:128
 msgid "Audio Volume Controllers"
 msgstr ""
 
-#: src/effects.c:129
+#: src/effects.c:130
 msgid "video analyser"
 msgstr ""
 
-#: src/effects.c:130
+#: src/effects.c:131
 msgid "Video analysers"
 msgstr ""
 
-#: src/effects.c:132
+#: src/effects.c:133
 msgid "audio analyser"
 msgstr ""
 
-#: src/effects.c:133
+#: src/effects.c:134
 msgid "Audio Analysers"
 msgstr ""
 
-#: src/effects.c:137 src/plugins.c:2559 src/plugins.c:2573
+#: src/effects.c:138 src/plugins.c:2507 src/plugins.c:2521
 msgid "unknown"
 msgstr ""
 
-#: src/effects.c:238
+#: src/effects.c:235
 #, c-format
 msgid "%s all frames..."
 msgstr ""
 
-#: src/effects.c:243
+#: src/effects.c:239
 #, c-format
 msgid "%s clipboard into frames %d to %d..."
 msgstr ""
 
-#: src/effects.c:250
+#: src/effects.c:245
 #, c-format
 msgid "%s to clipboard..."
 msgstr ""
 
-#: src/effects.c:254
+#: src/effects.c:248
 #, c-format
 msgid "%s to new clip..."
 msgstr ""
 
-#: src/effects.c:259
+#: src/effects.c:252
 #, c-format
 msgid "%s frames %d to %d..."
 msgstr ""
 
-#: src/effects.c:290
+#: src/effects.c:283
 #, c-format
 msgid "%s clipboard with selection"
 msgstr ""
 
-#: src/effects.c:295
+#: src/effects.c:287
 #, c-format
 msgid "%s to clipboard"
 msgstr ""
 
-#: src/effects.c:299
+#: src/effects.c:290
 #, c-format
 msgid "%s to new clip"
 msgstr ""
 
-#: src/effects.c:304
+#: src/effects.c:294
 #, c-format
 msgid "%s frames %d to %d"
 msgstr ""
 
-#: src/effects.c:456 src/effects.c:523
+#: src/effects.c:443 src/effects.c:507
 msgid ""
 "\n"
 "No frames were generated.\n"
 msgstr ""
 
-#: src/effects-weed.c:431
+#: src/effects-weed.c:452
 msgid "integer"
 msgstr ""
 
-#: src/effects-weed.c:432
+#: src/effects-weed.c:454
 msgid "int64"
 msgstr ""
 
-#: src/effects-weed.c:433
+#: src/effects-weed.c:456
 msgid "boolean"
 msgstr ""
 
-#: src/effects-weed.c:434
+#: src/effects-weed.c:458
 msgid "double"
 msgstr ""
 
-#: src/effects-weed.c:435
+#: src/effects-weed.c:460
 msgid "string"
 msgstr ""
 
-#: src/effects-weed.c:436
+#: src/effects-weed.c:462
 msgid "pointer"
 msgstr ""
 
-#: src/effects-weed.c:4591
+#: src/effects-weed.c:4581
 #, c-format
 msgid "Error: plugin %s has no weed_setup() function.\n"
 msgstr ""
 
-#: src/effects-weed.c:4606
+#: src/effects-weed.c:4595
 #, c-format
 msgid "No usable filters found in plugin %s\n"
 msgstr ""
 
-#: src/effects-weed.c:4680
+#: src/effects-weed.c:4668
 #, c-format
 msgid "Found duplicate plugin %s"
 msgstr ""
 
-#: src/effects-weed.c:4734
+#: src/effects-weed.c:4723
 #, c-format
 msgid ""
 "Info: Unable to load plugin %s\n"
 "Error was: %s\n"
 msgstr ""
 
-#: src/effects-weed.c:4737 src/effects-weed.c:5858
+#: src/effects-weed.c:4726 src/effects-weed.c:5847
 msgid "Some plugin directories"
 msgstr ""
 
 #. TRANSLATORS: example " - LADSPA plugins -"
-#: src/effects-weed.c:4812 src/rte_window.c:2105
+#: src/effects-weed.c:4801 src/rte_window.c:2107
 #, c-format
 msgid " - %s plugins -"
 msgstr ""
 
-#: src/effects-weed.c:5012
+#: src/effects-weed.c:4998
 #, c-format
 msgid "Successfully loaded %d Weed filters\n"
 msgstr ""
 
-#: src/effects-weed.c:5177
+#: src/effects-weed.c:5162
 #, c-format
 msgid "Invalid compound effect %s - has conflicting target_fps\n"
 msgstr ""
 
-#: src/effects-weed.c:5197
+#: src/effects-weed.c:5182
 #, c-format
 msgid "Invalid compound effect %s - has multiple transition parameters\n"
 msgstr ""
 
-#: src/effects-weed.c:5211
+#: src/effects-weed.c:5196
 #, c-format
 msgid "Invalid compound effect %s - has multiple master volume parameters\n"
 msgstr ""
 
-#: src/effects-weed.c:5346
+#: src/effects-weed.c:5329
 #, c-format
 msgid "Invalid compound effect %s - must have >1 sub filters\n"
 msgstr ""
 
-#: src/effects-weed.c:5366
+#: src/effects-weed.c:5349
 #, c-format
 msgid "Invalid effect %s found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5381
+#: src/effects-weed.c:5364
 #, c-format
 msgid "Invalid default found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5392
+#: src/effects-weed.c:5375
 #, c-format
 msgid "Invalid filter %d for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5406
+#: src/effects-weed.c:5389
 #, c-format
 msgid "Invalid param %d for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5433
+#: src/effects-weed.c:5416
 #, c-format
 msgid ""
 "Invalid number of values for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5467
+#: src/effects-weed.c:5450
 #, c-format
 msgid ""
 "Invalid non-boolean value for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5500
+#: src/effects-weed.c:5483
 #, c-format
 msgid "Invalid param link found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5511
+#: src/effects-weed.c:5494
 #, c-format
 msgid ""
 "Invalid out filter %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5529
+#: src/effects-weed.c:5513
 #, c-format
 msgid ""
 "Invalid out param %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5541
+#: src/effects-weed.c:5526
 #, c-format
 msgid ""
 "Invalid non-boolean value for autoscale found in compound effect %s, line "
 "%d\n"
 msgstr ""
 
-#: src/effects-weed.c:5552
+#: src/effects-weed.c:5537
 #, c-format
 msgid ""
 "Invalid in filter %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5566
+#: src/effects-weed.c:5552
 #, c-format
 msgid ""
 "Invalid in param %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5594
+#: src/effects-weed.c:5581
 #, c-format
 msgid "Invalid channel link found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5605
+#: src/effects-weed.c:5592
 #, c-format
 msgid ""
 "Invalid out filter %d for link channels found in compound effect %s, line "
 "%d\n"
 msgstr ""
 
-#: src/effects-weed.c:5623
+#: src/effects-weed.c:5611
 #, c-format
 msgid ""
 "Invalid out channel %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5633
+#: src/effects-weed.c:5622
 #, c-format
 msgid ""
 "Invalid in filter %d for link channels found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5651
+#: src/effects-weed.c:5641
 #, c-format
 msgid ""
 "Invalid in channel %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5687
+#: src/effects-weed.c:5678
 #, c-format
 msgid "Compound:%s"
 msgstr ""
 
-#: src/effects-weed.c:5758
+#: src/effects-weed.c:5749
 #, c-format
 msgid "Successfully loaded %d compound filters\n"
 msgstr ""
 
-#: src/effects-weed.c:6591
+#: src/effects-weed.c:6570
 #, c-format
 msgid "Effect %s cannot be used with this audio player.\n"
 msgstr ""
 
-#: src/effects-weed.c:6737
+#: src/effects-weed.c:6718
 #, c-format
 msgid "Failed to start instance %s, error code %d\n"
 msgstr ""
 
-#: src/effects-weed.c:6814
+#: src/effects-weed.c:6797
 #, c-format
 msgid "Unable to start generator %s\n"
 msgstr ""
 
-#: src/effects-weed.c:7621
+#: src/effects-weed.c:7607
 #, c-format
 msgid "Failed to start generator %s\n"
 msgstr ""
 
-#: src/effects-weed.c:7718
+#: src/effects-weed.c:7701
 #, c-format
 msgid "Failed to start generator %s, error %d\n"
 msgstr ""
 
-#: src/effects-weed.c:9012
+#: src/effects-weed.c:8993
 #, c-format
 msgid "%s [unstable] (%s)"
 msgstr ""
 
-#: src/effects-data.c:3278
+#: src/effects-data.c:3234
 #, c-format
 msgid "ACTIVATE (%s)"
 msgstr ""
 
-#: src/effects-data.c:3548
+#: src/effects-data.c:3501
 msgid "ACTIVATE"
 msgstr ""
 
-#: src/effects-data.c:3876
+#: src/effects-data.c:3829
 #, c-format
 msgid "Key slot %d"
 msgstr ""
 
-#: src/effects-data.c:3998
+#: src/effects-data.c:3951
 msgid "Autoscale"
 msgstr ""
 
-#: src/effects-data.c:4089
+#: src/effects-data.c:4042
 msgid "Add another connection for this output parameter"
 msgstr ""
 
-#: src/effects-data.c:4102 src/effects-data.c:4151
+#: src/effects-data.c:4055 src/effects-data.c:4104
 msgid "Delete this connection"
 msgstr ""
 
-#: src/effects-data.c:4138
+#: src/effects-data.c:4091
 msgid "Add another connection for this output channel"
 msgstr ""
 
-#: src/effects-data.c:4223
+#: src/effects-data.c:4176
 msgid "Connected to -->"
 msgstr ""
 
-#: src/effects-data.c:4243
+#: src/effects-data.c:4196
 #, c-format
 msgid "%s - Alpha Channel Connections"
 msgstr ""
 
-#: src/effects-data.c:4316
+#: src/effects-data.c:4269
 #, c-format
 msgid "%s - Parameter Data Connections"
 msgstr ""
 
-#: src/effects-data.c:4336
+#: src/effects-data.c:4289
 msgid "Autoscale All"
 msgstr ""
 
-#: src/effects-data.c:4361 src/effects-data.c:4890
+#: src/effects-data.c:4314 src/effects-data.c:4841
 msgid "ACTIVATED"
 msgstr ""
 
-#: src/effects-data.c:4774
+#: src/effects-data.c:4726
 msgid "LiVES: - Parameter and Alpha Channel Connections"
 msgstr ""
 
-#: src/effects-data.c:4785
+#: src/effects-data.c:4736
 msgid "Auto Connect Channels"
 msgstr ""
 
-#: src/effects-data.c:4797
+#: src/effects-data.c:4748
 msgid "Auto Connect Parameters"
 msgstr ""
 
-#: src/effects-data.c:4807
+#: src/effects-data.c:4758
 msgid "Disconnect All"
 msgstr ""
 
-#: src/effects-data.c:4875
+#: src/effects-data.c:4826
 #, c-format
 msgid "Input channel is already connected from (%d,%d) %s"
 msgstr ""
 
-#: src/effects-data.c:4891
+#: src/effects-data.c:4842
 #, c-format
 msgid "Input parameter is already connected from (%d,%d) %s"
 msgstr ""
 
-#: src/effects-data.c:4899
+#: src/effects-data.c:4851
 msgid "Input and output parameters are not compatible"
 msgstr ""
 
@@ -5666,43 +5680,43 @@
 msgid "_Reset Values"
 msgstr ""
 
-#: src/framedraw.c:267
+#: src/framedraw.c:265
 msgid "_Frame"
 msgstr ""
 
-#: src/paramspecial.c:266
+#: src/paramspecial.c:259
 msgid "Maintain _Aspect Ratio"
 msgstr ""
 
-#: src/paramspecial.c:267
+#: src/paramspecial.c:260
 msgid "Maintain aspect ratio of original frame"
 msgstr ""
 
-#: src/paramspecial.c:341
+#: src/paramspecial.c:335
 msgid "Display Password"
 msgstr ""
 
-#: src/paramwindow.c:450
+#: src/paramwindow.c:447
 msgid "Transition _In"
 msgstr ""
 
-#: src/paramwindow.c:452
+#: src/paramwindow.c:449
 msgid "Click to set the transition parameter to show only the front frame"
 msgstr ""
 
-#: src/paramwindow.c:474
+#: src/paramwindow.c:472
 msgid "Crossfade audio"
 msgstr ""
 
-#: src/paramwindow.c:475
+#: src/paramwindow.c:473
 msgid "Check the box to make audio transition with the video"
 msgstr ""
 
-#: src/paramwindow.c:493
+#: src/paramwindow.c:492
 msgid "Transition _Out"
 msgstr ""
 
-#: src/paramwindow.c:495
+#: src/paramwindow.c:494
 msgid "Click to set the transition parameter to show only the rear frame"
 msgstr ""
 
@@ -5715,23 +5729,23 @@
 msgid "%s : size"
 msgstr ""
 
-#: src/paramwindow.c:598
+#: src/paramwindow.c:597
 msgid "New size (pixels)"
 msgstr ""
 
-#: src/paramwindow.c:617 src/plugins.c:997
+#: src/paramwindow.c:616 src/plugins.c:973
 msgid "_Width"
 msgstr ""
 
-#: src/paramwindow.c:636 src/plugins.c:1003
+#: src/paramwindow.c:635 src/plugins.c:979
 msgid "_Height"
 msgstr ""
 
-#: src/paramwindow.c:684
+#: src/paramwindow.c:683
 msgid "Generate to _Clipboard"
 msgstr ""
 
-#: src/paramwindow.c:686
+#: src/paramwindow.c:685
 msgid "Generate frames to the clipboard"
 msgstr ""
 
@@ -5743,7 +5757,7 @@
 msgid "Generate frames to a new clip"
 msgstr ""
 
-#: src/paramwindow.c:822
+#: src/paramwindow.c:824
 #, c-format
 msgid ""
 "\n"
@@ -5751,71 +5765,71 @@
 "\n"
 msgstr ""
 
-#: src/paramwindow.c:920 src/paramwindow.c:930
+#: src/paramwindow.c:934 src/paramwindow.c:942
 msgid "Set as default"
 msgstr ""
 
-#: src/paramwindow.c:922 src/paramwindow.c:938
+#: src/paramwindow.c:936 src/paramwindow.c:950
 msgid "Reset"
 msgstr ""
 
-#: src/paramwindow.c:932 src/rte_window.c:2401 src/omc-learn.c:1357
+#: src/paramwindow.c:944 src/rte_window.c:2394 src/omc-learn.c:1347
 msgid "Close _window"
 msgstr ""
 
-#: src/paramwindow.c:1337
+#: src/paramwindow.c:1340
 msgid "No parameters"
 msgstr ""
 
-#: src/paramwindow.c:1419
+#: src/paramwindow.c:1424
 msgid "Invalid parameter"
 msgstr ""
 
-#: src/paramwindow.c:1611
+#: src/paramwindow.c:1610
 msgid "LiVES: - Select Colour"
 msgstr ""
 
-#: src/paramwindow.c:1616
+#: src/paramwindow.c:1615
 msgid "Click to set the colour"
 msgstr ""
 
-#: src/paramwindow.c:1628
+#: src/paramwindow.c:1626
 msgid "_Red"
 msgstr ""
 
-#: src/paramwindow.c:1629
+#: src/paramwindow.c:1627
 msgid "The red value (0 - 255)"
 msgstr ""
 
-#: src/paramwindow.c:1632
+#: src/paramwindow.c:1630
 msgid "_Green"
 msgstr ""
 
-#: src/paramwindow.c:1633
+#: src/paramwindow.c:1631
 msgid "The green value (0 - 255)"
 msgstr ""
 
-#: src/paramwindow.c:1636
+#: src/paramwindow.c:1634
 msgid "_Blue"
 msgstr ""
 
-#: src/paramwindow.c:1637
+#: src/paramwindow.c:1635
 msgid "The blue value (0 - 255)"
 msgstr ""
 
-#: src/plugins.c:85
+#: src/plugins.c:86
 #, c-format
 msgid ""
 "\n"
 "Plugin error: %s failed with code %d"
 msgstr ""
 
-#: src/plugins.c:87
+#: src/plugins.c:88
 #, c-format
 msgid " : message was %s\n"
 msgstr ""
 
-#: src/plugins.c:387
+#: src/plugins.c:375
 #, c-format
 msgid ""
 "\n"
@@ -5825,17 +5839,17 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/plugins.c:397
+#: src/plugins.c:385
 #, c-format
 msgid "Updating video playback plugin defaults in %s\n"
 msgstr ""
 
-#: src/plugins.c:452
+#: src/plugins.c:444
 #, c-format
 msgid "Loading video playback plugin defaults from %s..."
 msgstr ""
 
-#: src/plugins.c:515
+#: src/plugins.c:505
 #, c-format
 msgid ""
 "\n"
@@ -5845,32 +5859,32 @@
 "\n"
 msgstr ""
 
-#: src/plugins.c:855
+#: src/plugins.c:836
 #, c-format
 msgid "Saving playback plugin defaults to %s..."
 msgstr ""
 
-#: src/plugins.c:962
+#: src/plugins.c:939
 msgid "_FPS"
 msgstr ""
 
-#: src/plugins.c:963
+#: src/plugins.c:940
 msgid "Fixed framerate for plugin.\n"
 msgstr ""
 
-#: src/plugins.c:1032
+#: src/plugins.c:1008
 msgid "_Colourspace"
 msgstr ""
 
-#: src/plugins.c:1033
+#: src/plugins.c:1009
 msgid "Colourspace input to the plugin.\n"
 msgstr ""
 
-#: src/plugins.c:1089
+#: src/plugins.c:1065
 msgid "Save settings to an alternate file.\n"
 msgstr ""
 
-#: src/plugins.c:1206
+#: src/plugins.c:1182
 #, c-format
 msgid ""
 "\n"
@@ -5879,7 +5893,7 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/plugins.c:1252
+#: src/plugins.c:1228
 #, c-format
 msgid ""
 "\n"
@@ -5889,38 +5903,38 @@
 "Unable to use it.\n"
 msgstr ""
 
-#: src/plugins.c:1265
+#: src/plugins.c:1241
 #, c-format
 msgid ""
 "Video playback plugin failed to initialise.\n"
 "Error was: %s\n"
 msgstr ""
 
-#: src/plugins.c:1461
+#: src/plugins.c:1428
 msgid ""
 "\n"
 "Warning ! Video playback plugin will not send key presses. Keyboard may be "
 "disabled during plugin use !\n"
 msgstr ""
 
-#: src/plugins.c:1465
+#: src/plugins.c:1433
 #, c-format
 msgid ""
 "*** Using %s plugin for fs playback, agreed to use palette type %d ( %s ). "
 "***\n"
 msgstr ""
 
-#: src/plugins.c:1571
+#: src/plugins.c:1537
 #, c-format
 msgid "Audio stream unable to use preferred format '%s'\n"
 msgstr ""
 
-#: src/plugins.c:1579
+#: src/plugins.c:1543
 #, c-format
 msgid "Using format '%s' instead.\n"
 msgstr ""
 
-#: src/plugins.c:1616
+#: src/plugins.c:1579
 #, c-format
 msgid ""
 "LiVES was unable to find its encoder plugins. Please make sure you have the "
@@ -5929,7 +5943,7 @@
 "or change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/plugins.c:1624
+#: src/plugins.c:1589
 #, c-format
 msgid ""
 "LiVES did not receive a response from the encoder plugin called '%s'.\n"
@@ -5938,11 +5952,11 @@
 "or switch to another plugin using Tools|Preferences|Encoding\n"
 msgstr ""
 
-#: src/plugins.c:2032
+#: src/plugins.c:1987
 msgid "Unable to resize, please install imageMagick\n"
 msgstr ""
 
-#: src/plugins.c:2231
+#: src/plugins.c:2183
 #, c-format
 msgid ""
 "\n"
@@ -5950,12 +5964,12 @@
 "No decoders found in %s !\n"
 msgstr ""
 
-#: src/plugins.c:2415
+#: src/plugins.c:2369
 #, c-format
 msgid " using %s"
 msgstr ""
 
-#: src/plugins.c:2499
+#: src/plugins.c:2451
 #, c-format
 msgid ""
 "\n"
@@ -5964,7 +5978,7 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/plugins.c:2522
+#: src/plugins.c:2472
 #, c-format
 msgid ""
 "\n"
@@ -5974,24 +5988,24 @@
 "Unable to use it.\n"
 msgstr ""
 
-#: src/plugins.c:2564
+#: src/plugins.c:2512
 msgid "/unknown"
 msgstr ""
 
-#: src/plugins.c:2651
+#: src/plugins.c:2598
 msgid "LiVES: - Decoder Plugins"
 msgstr ""
 
-#: src/plugins.c:2669
+#: src/plugins.c:2616
 msgid "Enabled Video Decoders (uncheck to disable)"
 msgstr ""
 
-#: src/plugins.c:2726
+#: src/plugins.c:2672
 #, c-format
 msgid "Failed to load %s, transitions may not resize.\n"
 msgstr ""
 
-#: src/plugins.c:3854
+#: src/plugins.c:3797
 #, c-format
 msgid "%s advanced settings"
 msgstr ""
@@ -6000,15 +6014,15 @@
 msgid "LiVES: - New Test RFX"
 msgstr ""
 
-#: src/rfx-builder.c:136
+#: src/rfx-builder.c:135
 msgid "LiVES: - Edit Test RFX"
 msgstr ""
 
-#: src/rfx-builder.c:166
+#: src/rfx-builder.c:165
 msgid "Type:"
 msgstr ""
 
-#: src/rfx-builder.c:184
+#: src/rfx-builder.c:183
 msgid "tool"
 msgstr ""
 
@@ -6020,130 +6034,130 @@
 msgid "The name of the plugin. No spaces allowed."
 msgstr ""
 
-#: src/rfx-builder.c:201
+#: src/rfx-builder.c:202
 msgid "Version:       "
 msgstr ""
 
-#: src/rfx-builder.c:203
+#: src/rfx-builder.c:204
 msgid "The script version."
 msgstr ""
 
-#: src/rfx-builder.c:210
+#: src/rfx-builder.c:212
 msgid "    Author:       "
 msgstr ""
 
-#: src/rfx-builder.c:211
+#: src/rfx-builder.c:213
 msgid "The script author."
 msgstr ""
 
-#: src/rfx-builder.c:217
+#: src/rfx-builder.c:220
 msgid "    URL (optional):       "
 msgstr ""
 
-#: src/rfx-builder.c:218
+#: src/rfx-builder.c:221
 msgid "URL for the plugin maintainer."
 msgstr ""
 
-#: src/rfx-builder.c:226
+#: src/rfx-builder.c:230
 msgid "Menu text:    "
 msgstr ""
 
-#: src/rfx-builder.c:227
+#: src/rfx-builder.c:231
 msgid "The text to show in the menu."
 msgstr ""
 
-#: src/rfx-builder.c:239
+#: src/rfx-builder.c:244
 msgid "Action description:        "
 msgstr ""
 
-#: src/rfx-builder.c:241
+#: src/rfx-builder.c:246
 msgid "Describe what the plugin is doing. E.g. \"Edge detecting\""
 msgstr ""
 
-#: src/rfx-builder.c:246
+#: src/rfx-builder.c:251
 msgid "Minimum frames:"
 msgstr ""
 
-#: src/rfx-builder.c:249
+#: src/rfx-builder.c:254
 msgid ""
 "Minimum number of frames this effect/tool can be applied to. Normally 1."
 msgstr ""
 
-#: src/rfx-builder.c:260
+#: src/rfx-builder.c:265
 msgid "_Requirements..."
 msgstr ""
 
-#: src/rfx-builder.c:263
+#: src/rfx-builder.c:268
 msgid "Enter any binaries required by the plugin."
 msgstr ""
 
-#: src/rfx-builder.c:267
+#: src/rfx-builder.c:272
 msgid "_Properties..."
 msgstr ""
 
-#: src/rfx-builder.c:270
+#: src/rfx-builder.c:275
 msgid "Set properties for the plugin. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:274
+#: src/rfx-builder.c:279
 msgid "_Parameters..."
 msgstr ""
 
-#: src/rfx-builder.c:277
+#: src/rfx-builder.c:282
 msgid "Set up parameters used in pre/loop/post/trigger code. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:281
+#: src/rfx-builder.c:286
 msgid "Parameter _Window Hints..."
 msgstr ""
 
-#: src/rfx-builder.c:284
+#: src/rfx-builder.c:289
 msgid "Set hints about how to lay out the parameter window. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:290
+#: src/rfx-builder.c:295
 msgid "_Language code:"
 msgstr ""
 
-#: src/rfx-builder.c:291
+#: src/rfx-builder.c:296
 msgid "Language for pre/loop/post/triggers. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:300
+#: src/rfx-builder.c:305
 msgid "_Pre loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:303
+#: src/rfx-builder.c:308
 msgid "Code to be executed before the loop. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:307
+#: src/rfx-builder.c:312
 msgid "_Loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:310
+#: src/rfx-builder.c:315
 msgid "Loop code to be applied to each frame."
 msgstr ""
 
-#: src/rfx-builder.c:314
+#: src/rfx-builder.c:319
 msgid "_Post loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:317
+#: src/rfx-builder.c:322
 msgid "Code to be executed after the loop. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:321
+#: src/rfx-builder.c:326
 msgid "_Trigger code..."
 msgstr ""
 
-#: src/rfx-builder.c:324
+#: src/rfx-builder.c:329
 msgid ""
 "Set trigger code for when the parameter window is shown, or when a parameter "
 "is changed. Optional (except for Utilities)."
 msgstr ""
 
-#: src/rfx-builder.c:421
+#: src/rfx-builder.c:426
 #, c-format
 msgid ""
 "\n"
@@ -6153,55 +6167,55 @@
 "%s\n"
 msgstr ""
 
-#: src/rfx-builder.c:544
+#: src/rfx-builder.c:541
 msgid "LiVES: - RFX Requirements"
 msgstr ""
 
-#: src/rfx-builder.c:548
+#: src/rfx-builder.c:544
 msgid "LiVES: - RFX Parameters"
 msgstr ""
 
-#: src/rfx-builder.c:552
+#: src/rfx-builder.c:547
 msgid "LiVES: - RFX Parameter Window Hints"
 msgstr ""
 
-#: src/rfx-builder.c:556
+#: src/rfx-builder.c:550
 msgid "LiVES: - RFX Triggers"
 msgstr ""
 
-#: src/rfx-builder.c:622
+#: src/rfx-builder.c:613
 msgid "_New Entry"
 msgstr ""
 
-#: src/rfx-builder.c:625
+#: src/rfx-builder.c:616
 msgid "_Edit Entry"
 msgstr ""
 
-#: src/rfx-builder.c:628
+#: src/rfx-builder.c:619
 msgid "_Remove Entry"
 msgstr ""
 
-#: src/rfx-builder.c:632
+#: src/rfx-builder.c:623
 msgid "Move _Up"
 msgstr ""
 
-#: src/rfx-builder.c:635
+#: src/rfx-builder.c:626
 msgid "Move _Down"
 msgstr ""
 
-#: src/rfx-builder.c:1004
+#: src/rfx-builder.c:984
 msgid "LiVES: - RFX Properties"
 msgstr ""
 
-#: src/rfx-builder.c:1013
+#: src/rfx-builder.c:993
 msgid "_Slow (hint to GUI)"
 msgstr ""
 
-#: src/rfx-builder.c:1024
+#: src/rfx-builder.c:1004
 msgid "_Batch mode generator"
 msgstr ""
 
-#: src/rfx-builder.c:1831
+#: src/rfx-builder.c:1790
 msgid ""
 "\n"
 "\n"
@@ -6210,7 +6224,7 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:1875
+#: src/rfx-builder.c:1834
 msgid ""
 "\n"
 "\n"
@@ -6218,219 +6232,219 @@
 "Please check the trigger code.\n"
 msgstr ""
 
-#: src/rfx-builder.c:1994
+#: src/rfx-builder.c:1950
 msgid "LiVES: - New RFX Parameter"
 msgstr ""
 
-#: src/rfx-builder.c:1997
+#: src/rfx-builder.c:1952
 msgid "LiVES: - Edit RFX Parameter"
 msgstr ""
 
-#: src/rfx-builder.c:2013
+#: src/rfx-builder.c:1968
 msgid "_Name:    "
 msgstr ""
 
-#: src/rfx-builder.c:2016
+#: src/rfx-builder.c:1971
 msgid "Name of the parameter, must be unique in the plugin."
 msgstr ""
 
-#: src/rfx-builder.c:2025
+#: src/rfx-builder.c:1981
 msgid "_Label:    "
 msgstr ""
 
-#: src/rfx-builder.c:2028
+#: src/rfx-builder.c:1984
 msgid ""
 "Label to be shown by the parameter. An underscore represents mnemonic "
 "accelerator."
 msgstr ""
 
-#: src/rfx-builder.c:2039
+#: src/rfx-builder.c:1996
 msgid "_Type:         "
 msgstr ""
 
-#: src/rfx-builder.c:2040
+#: src/rfx-builder.c:1997
 msgid "Parameter type (select from list)."
 msgstr ""
 
-#: src/rfx-builder.c:2073
+#: src/rfx-builder.c:2029
 msgid "Decimal _places: "
 msgstr ""
 
-#: src/rfx-builder.c:2082 src/rfx-builder.c:2477 src/rfx-builder.c:2495
+#: src/rfx-builder.c:2038 src/rfx-builder.c:2430 src/rfx-builder.c:2447
 msgid "_Default value:    "
 msgstr ""
 
-#: src/rfx-builder.c:2098
+#: src/rfx-builder.c:2054
 msgid "_Default: "
 msgstr ""
 
-#: src/rfx-builder.c:2132
+#: src/rfx-builder.c:2087
 msgid "Button _Group: "
 msgstr ""
 
-#: src/rfx-builder.c:2134
+#: src/rfx-builder.c:2089
 msgid "A non-zero value can be used to group radio buttons."
 msgstr ""
 
-#: src/rfx-builder.c:2142 src/rfx-builder.c:2478
+#: src/rfx-builder.c:2097 src/rfx-builder.c:2431
 msgid "_Minimum value: "
 msgstr ""
 
-#: src/rfx-builder.c:2148 src/rfx-builder.c:2479
+#: src/rfx-builder.c:2103 src/rfx-builder.c:2432
 msgid "Ma_ximum value: "
 msgstr ""
 
-#: src/rfx-builder.c:2157
+#: src/rfx-builder.c:2113
 msgid "     _Step size:   "
 msgstr ""
 
-#: src/rfx-builder.c:2160
+#: src/rfx-builder.c:2117
 msgid ""
 "How much the parameter is adjusted when the spinbutton arrows are pressed."
 msgstr ""
 
-#: src/rfx-builder.c:2171
+#: src/rfx-builder.c:2129
 msgid "_Wrap value"
 msgstr ""
 
-#: src/rfx-builder.c:2172
+#: src/rfx-builder.c:2131
 msgid "Whether the value wraps max->min and min->max."
 msgstr ""
 
-#: src/rfx-builder.c:2470
+#: src/rfx-builder.c:2424
 msgid "Set _values"
 msgstr ""
 
-#: src/rfx-builder.c:2512
+#: src/rfx-builder.c:2463
 msgid "Default _Red:  "
 msgstr ""
 
-#: src/rfx-builder.c:2513
+#: src/rfx-builder.c:2464
 msgid "Default _Green:"
 msgstr ""
 
-#: src/rfx-builder.c:2514
+#: src/rfx-builder.c:2465
 msgid "Default _Blue: "
 msgstr ""
 
-#: src/rfx-builder.c:2538
+#: src/rfx-builder.c:2488
 msgid "Set _default"
 msgstr ""
 
-#: src/rfx-builder.c:2540
+#: src/rfx-builder.c:2490
 msgid "Default value:  "
 msgstr ""
 
-#: src/rfx-builder.c:2541
+#: src/rfx-builder.c:2491
 msgid "Maximum length (chars): "
 msgstr ""
 
-#: src/rfx-builder.c:2576
+#: src/rfx-builder.c:2526
 msgid "LiVES: - New RFX Parameter Window Hint"
 msgstr ""
 
-#: src/rfx-builder.c:2579
+#: src/rfx-builder.c:2528
 msgid "LiVES: - Edit RFX Parameter Window Hint"
 msgstr ""
 
-#: src/rfx-builder.c:2622
+#: src/rfx-builder.c:2569
 msgid "_Keyword:         "
 msgstr ""
 
-#: src/rfx-builder.c:2639
+#: src/rfx-builder.c:2586
 msgid "Special _Type:         "
 msgstr ""
 
-#: src/rfx-builder.c:2656
+#: src/rfx-builder.c:2602
 msgid "Special _Subtype:         "
 msgstr ""
 
-#: src/rfx-builder.c:2667 src/rfx-builder.c:2706
+#: src/rfx-builder.c:2613 src/rfx-builder.c:2651
 msgid "Row:    "
 msgstr ""
 
-#: src/rfx-builder.c:2732
+#: src/rfx-builder.c:2676
 #, c-format
 msgid "Linked parameters (%d):    "
 msgstr ""
 
-#: src/rfx-builder.c:2749
+#: src/rfx-builder.c:2693
 msgid "Linked parameters (4):    "
 msgstr ""
 
-#: src/rfx-builder.c:2752
+#: src/rfx-builder.c:2695
 msgid "Linked parameters (2):    "
 msgstr ""
 
-#: src/rfx-builder.c:2777
+#: src/rfx-builder.c:2720
 msgid "LiVES: - New RFX Trigger"
 msgstr ""
 
-#: src/rfx-builder.c:2780
+#: src/rfx-builder.c:2722
 msgid "LiVES: - Edit RFX Trigger"
 msgstr ""
 
-#: src/rfx-builder.c:2808
+#: src/rfx-builder.c:2750
 msgid "When:         "
 msgstr ""
 
-#: src/rfx-builder.c:2904
+#: src/rfx-builder.c:2846
 msgid "LiVES: - Pre Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:2911
+#: src/rfx-builder.c:2853
 msgid "LiVES: - Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:2918
+#: src/rfx-builder.c:2860
 msgid "LiVES: - Post Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:2931
+#: src/rfx-builder.c:2873
 #, c-format
 msgid "LiVES: - Default text (max length %d)"
 msgstr ""
 
-#: src/rfx-builder.c:2944
+#: src/rfx-builder.c:2885
 msgid "LiVES: - Enter values, one per line"
 msgstr ""
 
-#: src/rfx-builder.c:3055
+#: src/rfx-builder.c:2996
 msgid ""
 "\n"
 "\n"
 "Name must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3060
+#: src/rfx-builder.c:3001
 msgid ""
 "\n"
 "\n"
 "Name must not contain spaces.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3065
+#: src/rfx-builder.c:3006
 msgid ""
 "\n"
 "\n"
 "Menu text must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3071
+#: src/rfx-builder.c:3012
 msgid ""
 "\n"
 "\n"
 "Action description must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3076
+#: src/rfx-builder.c:3017
 msgid ""
 "\n"
 "\n"
 "Author must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3085 src/rfx-builder.c:4339
+#: src/rfx-builder.c:3026 src/rfx-builder.c:4253
 msgid ""
 "\n"
 "\n"
@@ -6438,28 +6452,28 @@
 "Name must be unique.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3092
+#: src/rfx-builder.c:3033
 msgid ""
 "\n"
 "\n"
 "Loop code should not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3098
+#: src/rfx-builder.c:3039
 msgid ""
 "\n"
 "\n"
 "Trigger code should not be blank for a utility.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3111
+#: src/rfx-builder.c:3052
 msgid ""
 "\n"
 "\n"
 "Parameter name must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3117
+#: src/rfx-builder.c:3058
 msgid ""
 "\n"
 "\n"
@@ -6468,41 +6482,41 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:3171
+#: src/rfx-builder.c:3111
 #, c-format
 msgid "Writing script file %s..."
 msgstr ""
 
-#: src/rfx-builder.c:3477
+#: src/rfx-builder.c:3411
 msgid "No <define> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3484 src/rfx-builder.c:3493
+#: src/rfx-builder.c:3418 src/rfx-builder.c:3427
 msgid "Bad script version.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3505
+#: src/rfx-builder.c:3439
 msgid "No <name> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3513
+#: src/rfx-builder.c:3447
 msgid "No <version> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3522
+#: src/rfx-builder.c:3456
 msgid "No <author> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3536
+#: src/rfx-builder.c:3470
 msgid "No <description> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3540
+#: src/rfx-builder.c:3474
 #, c-format
 msgid "Bad description. (%s)\n"
 msgstr ""
 
-#: src/rfx-builder.c:3702
+#: src/rfx-builder.c:3627
 #, c-format
 msgid ""
 "\n"
@@ -6512,27 +6526,27 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:3859
+#: src/rfx-builder.c:3780
 msgid "Rebuilding all RFX scripts...builtin..."
 msgstr ""
 
-#: src/rfx-builder.c:3860
+#: src/rfx-builder.c:3781
 msgid "Rebuilding scripts"
 msgstr ""
 
-#: src/rfx-builder.c:3868
+#: src/rfx-builder.c:3789
 msgid "custom..."
 msgstr ""
 
-#: src/rfx-builder.c:3872
+#: src/rfx-builder.c:3793
 msgid "test..."
 msgstr ""
 
-#: src/rfx-builder.c:3878
+#: src/rfx-builder.c:3799
 msgid "rebuilding dynamic menu entries..."
 msgstr ""
 
-#: src/rfx-builder.c:3905 src/rfx-builder.c:3912
+#: src/rfx-builder.c:3826 src/rfx-builder.c:3834
 #, c-format
 msgid ""
 "\n"
@@ -6541,7 +6555,7 @@
 "Please check this program is in your path and executable.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3951
+#: src/rfx-builder.c:3874
 #, c-format
 msgid ""
 "\n"
@@ -6551,12 +6565,12 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:3960
+#: src/rfx-builder.c:3884
 #, c-format
 msgid "Deleting rfx script %s..."
 msgstr ""
 
-#: src/rfx-builder.c:3980
+#: src/rfx-builder.c:3902
 #, c-format
 msgid ""
 "\n"
@@ -6566,7 +6580,7 @@
 "Error code was %d\n"
 msgstr ""
 
-#: src/rfx-builder.c:4016
+#: src/rfx-builder.c:3938
 #, c-format
 msgid ""
 "\n"
@@ -6576,12 +6590,12 @@
 "Please delete it first, or rename the test script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4027
+#: src/rfx-builder.c:3950
 #, c-format
 msgid "Promoting rfx test plugin %s to custom..."
 msgstr ""
 
-#: src/rfx-builder.c:4044
+#: src/rfx-builder.c:3965
 #, c-format
 msgid ""
 "\n"
@@ -6592,20 +6606,20 @@
 "Return code was %d (%s)\n"
 msgstr ""
 
-#: src/rfx-builder.c:4070
+#: src/rfx-builder.c:3990
 msgid "LiVES: - Export Script to..."
 msgstr ""
 
-#: src/rfx-builder.c:4077 src/rfx-builder.c:4156
+#: src/rfx-builder.c:3997 src/rfx-builder.c:4074
 #, c-format
 msgid "Copying %s to %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4105
+#: src/rfx-builder.c:4024
 msgid "LiVES: Import Script from..."
 msgstr ""
 
-#: src/rfx-builder.c:4148
+#: src/rfx-builder.c:4067
 #, c-format
 msgid ""
 "\n"
@@ -6615,43 +6629,43 @@
 "Please delete it first, or rename the import script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4249
+#: src/rfx-builder.c:4166
 msgid "LiVES: - Copy RFX Script"
 msgstr ""
 
-#: src/rfx-builder.c:4251
+#: src/rfx-builder.c:4168
 msgid "_From type:    "
 msgstr ""
 
-#: src/rfx-builder.c:4258
+#: src/rfx-builder.c:4175
 msgid "   Script:    "
 msgstr ""
 
-#: src/rfx-builder.c:4267
+#: src/rfx-builder.c:4183
 msgid "LiVES: - Rename test RFX Script"
 msgstr ""
 
-#: src/rfx-builder.c:4268
+#: src/rfx-builder.c:4184
 msgid "From script: "
 msgstr ""
 
-#: src/rfx-builder.c:4273
+#: src/rfx-builder.c:4188
 msgid "LiVES: - RFX Script name"
 msgstr ""
 
-#: src/rfx-builder.c:4274
+#: src/rfx-builder.c:4189
 msgid "Script name: "
 msgstr ""
 
-#: src/rfx-builder.c:4294
+#: src/rfx-builder.c:4209
 msgid "New name: "
 msgstr ""
 
-#: src/rfx-builder.c:4297
+#: src/rfx-builder.c:4212
 msgid "New script name: "
 msgstr ""
 
-#: src/rfx-builder.c:4372
+#: src/rfx-builder.c:4286
 msgid ""
 "\n"
 "\n"
@@ -6659,12 +6673,12 @@
 "Script name must be unique.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4384
+#: src/rfx-builder.c:4297
 #, c-format
 msgid "Renaming RFX test script %s to %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4390
+#: src/rfx-builder.c:4302
 #, c-format
 msgid ""
 "\n"
@@ -6675,21 +6689,21 @@
 "Return code was %d\n"
 msgstr ""
 
-#: src/rfx-builder.c:4610
+#: src/rfx-builder.c:4518
 msgid "_Apply Real Time Effects to Selection"
 msgstr ""
 
-#: src/rfx-builder.c:4664
+#: src/rfx-builder.c:4572
 #, c-format
 msgid "Loading rendered effect %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4766
+#: src/rfx-builder.c:4674
 msgid ""
 "See: VJ - show VJ keys. Set the realtime effects, and then apply them here."
 msgstr ""
 
-#: src/preferences.c:359
+#: src/preferences.c:351
 msgid ""
 "\n"
 "\n"
@@ -6697,7 +6711,7 @@
 "full screen, separate window (fs) mode\n"
 msgstr ""
 
-#: src/preferences.c:408
+#: src/preferences.c:400
 msgid ""
 "\n"
 "\n"
@@ -6705,7 +6719,7 @@
 "(Free space = UNKNOWN)"
 msgstr ""
 
-#: src/preferences.c:412
+#: src/preferences.c:403
 #, c-format
 msgid ""
 "\n"
@@ -6714,14 +6728,14 @@
 "(Free space = %s)"
 msgstr ""
 
-#: src/preferences.c:416
+#: src/preferences.c:408
 msgid ""
 "The temp directory is LiVES working directory where opened clips and sets "
 "are stored.\n"
 "It should be in a partition with plenty of free disk space.\n"
 msgstr ""
 
-#: src/preferences.c:784
+#: src/preferences.c:839
 #, c-format
 msgid ""
 "Unable to create or write to the new temporary directory.\n"
@@ -6732,7 +6746,7 @@
 "The directory will not be changed now.\n"
 msgstr ""
 
-#: src/preferences.c:786
+#: src/preferences.c:843
 #, c-format
 msgid ""
 "Unable to create or write to the new temporary directory.\n"
@@ -6742,7 +6756,7 @@
 "The directory will not be changed now.\n"
 msgstr ""
 
-#: src/preferences.c:798
+#: src/preferences.c:856
 msgid ""
 "You have chosen to change the temporary directory.\n"
 "Please make sure you have no other copies of LiVES open.\n"
@@ -6754,20 +6768,20 @@
 "original setting."
 msgstr ""
 
-#: src/preferences.c:1169
+#: src/preferences.c:1221
 msgid ""
 "\n"
 "Unable to switch audio players to jack - jackd must be installed first.\n"
 "See http://jackaudio.org\n"
 msgstr ""
 
-#: src/preferences.c:1175
+#: src/preferences.c:1226
 msgid ""
 "\n"
 "Switching audio players requires restart (jackd must not be running)\n"
 msgstr ""
 
-#: src/preferences.c:1202
+#: src/preferences.c:1253
 msgid ""
 "\n"
 "Unable to switch audio players to pulse audio\n"
@@ -6775,814 +6789,814 @@
 "See http://www.pulseaudio.org\n"
 msgstr ""
 
-#: src/preferences.c:1502
+#: src/preferences.c:1544
 msgid "PCM (highest quality; largest files)"
 msgstr ""
 
-#: src/preferences.c:2063
+#: src/preferences.c:2096
 msgid "LiVES: - Preferences"
 msgstr ""
 
-#: src/preferences.c:2142
+#: src/preferences.c:2177
 msgid "Open file selection maximised"
 msgstr ""
 
-#: src/preferences.c:2149
+#: src/preferences.c:2184
 msgid "Show recent files in the File menu"
 msgstr ""
 
-#: src/preferences.c:2158
+#: src/preferences.c:2193
 msgid "Stop screensaver on playback    "
 msgstr ""
 
-#: src/preferences.c:2165
+#: src/preferences.c:2200
 msgid "Open main window maximised"
 msgstr ""
 
-#: src/preferences.c:2173
+#: src/preferences.c:2208
 msgid "Show toolbar when background is blanked"
 msgstr ""
 
-#: src/preferences.c:2181
+#: src/preferences.c:2216
 msgid "Allow mouse wheel to switch clips"
 msgstr ""
 
-#: src/preferences.c:2192
+#: src/preferences.c:2227
 msgid "Shrink previews to fit in interface"
 msgstr ""
 
-#: src/preferences.c:2202
+#: src/preferences.c:2237
 msgid "Startup mode:"
 msgstr ""
 
-#: src/preferences.c:2206
+#: src/preferences.c:2241
 msgid "_Clip editor"
 msgstr ""
 
-#: src/preferences.c:2210
+#: src/preferences.c:2245
 msgid "_Multitrack mode"
 msgstr ""
 
-#: src/preferences.c:2234
+#: src/preferences.c:2268
 msgid "Multi-head support"
 msgstr ""
 
-#: src/preferences.c:2242
+#: src/preferences.c:2276
 msgid " monitor number for LiVES interface"
 msgstr ""
 
-#: src/preferences.c:2248
+#: src/preferences.c:2282
 msgid " monitor number for playback"
 msgstr ""
 
-#: src/preferences.c:2260
+#: src/preferences.c:2294
 msgid ""
 "A setting of 0 means use all available monitors (only works with some "
 "playback plugins)."
 msgstr ""
 
-#: src/preferences.c:2270
+#: src/preferences.c:2304
 msgid "Force single monitor"
 msgstr ""
 
-#: src/preferences.c:2271
+#: src/preferences.c:2305
 msgid "Ignore all except the first monitor."
 msgstr ""
 
-#: src/preferences.c:2293
+#: src/preferences.c:2327
 msgid "Show clip thumbnails during playback"
 msgstr ""
 
-#: src/preferences.c:2306
+#: src/preferences.c:2340
 msgid "GUI"
 msgstr ""
 
-#: src/preferences.c:2321
+#: src/preferences.c:2355
 msgid "When entering Multitrack mode:"
 msgstr ""
 
-#: src/preferences.c:2330
+#: src/preferences.c:2364
 msgid "_Prompt me for width, height, fps and audio settings"
 msgstr ""
 
-#: src/preferences.c:2336
+#: src/preferences.c:2370
 msgid "_Always use the following values:"
 msgstr ""
 
-#: src/preferences.c:2345
+#: src/preferences.c:2379
 msgid "Use these same _values for rendering a new clip"
 msgstr ""
 
-#: src/preferences.c:2370
+#: src/preferences.c:2404
 msgid "_Width           "
 msgstr ""
 
-#: src/preferences.c:2375
+#: src/preferences.c:2409
 msgid "          _Height      "
 msgstr ""
 
-#: src/preferences.c:2379
+#: src/preferences.c:2413
 msgid "          _FPS"
 msgstr ""
 
-#: src/preferences.c:2387
+#: src/preferences.c:2421
 msgid "Enable backing audio track"
 msgstr ""
 
-#: src/preferences.c:2394
+#: src/preferences.c:2428
 msgid "Audio track per video track"
 msgstr ""
 
-#: src/preferences.c:2423
+#: src/preferences.c:2457
 msgid "    _Undo buffer size (MB)    "
 msgstr ""
 
-#: src/preferences.c:2432
+#: src/preferences.c:2466
 msgid "_Exit multitrack mode after rendering"
 msgstr ""
 
-#: src/preferences.c:2440
+#: src/preferences.c:2474
 msgid "Auto backup layouts"
 msgstr ""
 
-#: src/preferences.c:2445
+#: src/preferences.c:2479
 msgid "_Every"
 msgstr ""
 
-#: src/preferences.c:2453
+#: src/preferences.c:2487
 msgid "seconds"
 msgstr ""
 
-#: src/preferences.c:2461
+#: src/preferences.c:2495
 msgid "After every _change"
 msgstr ""
 
-#: src/preferences.c:2467
+#: src/preferences.c:2501
 msgid "_Never"
 msgstr ""
 
-#: src/preferences.c:2490
+#: src/preferences.c:2523
 msgid "Multitrack/Render"
 msgstr ""
 
-#: src/preferences.c:2508
+#: src/preferences.c:2541
 msgid "Use instant opening when possible"
 msgstr ""
 
-#: src/preferences.c:2509
+#: src/preferences.c:2543
 msgid "Enable instant opening of some file types using decoder plugins"
 msgstr ""
 
-#: src/preferences.c:2531
+#: src/preferences.c:2567
 msgid "Video open command (fallback)"
 msgstr ""
 
-#: src/preferences.c:2543
+#: src/preferences.c:2579
 msgid "Open/render compression"
 msgstr ""
 
-#: src/preferences.c:2546
+#: src/preferences.c:2582
 msgid " %     ( lower = slower, larger files; for jpeg, higher quality )"
 msgstr ""
 
-#: src/preferences.c:2558
+#: src/preferences.c:2594
 msgid "Default image format"
 msgstr ""
 
-#: src/preferences.c:2562
+#: src/preferences.c:2598
 msgid "_jpeg"
 msgstr ""
 
-#: src/preferences.c:2565
+#: src/preferences.c:2601
 msgid "_png"
 msgstr ""
 
-#: src/preferences.c:2572
+#: src/preferences.c:2608
 msgid "(Check Help/Troubleshoot to see which image formats are supported)"
 msgstr ""
 
-#: src/preferences.c:2580
+#: src/preferences.c:2616
 msgid "Enable automatic deinterlacing when possible"
 msgstr ""
 
-#: src/preferences.c:2582
+#: src/preferences.c:2619
 msgid "Automatically deinterlace frames when a plugin suggests it"
 msgstr ""
 
-#: src/preferences.c:2593
+#: src/preferences.c:2632
 msgid "Automatic trimming / padding of audio when possible"
 msgstr ""
 
-#: src/preferences.c:2595
+#: src/preferences.c:2634
 msgid "Automatically trim or pad audio when a plugin suggests it"
 msgstr ""
 
-#: src/preferences.c:2606
+#: src/preferences.c:2646
 msgid "Ignore blank borders when possible"
 msgstr ""
 
-#: src/preferences.c:2608
+#: src/preferences.c:2648
 msgid "Clip any blank borders from frames where possible"
 msgstr ""
 
-#: src/preferences.c:2619
+#: src/preferences.c:2660
 msgid "When opening multiple files, concatenate images into one clip"
 msgstr ""
 
-#: src/preferences.c:2629
+#: src/preferences.c:2670
 msgid "Decoding"
 msgstr ""
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:2652
+#: src/preferences.c:2693
 msgid "Low - can improve performance on slower machines"
 msgstr ""
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:2654
+#: src/preferences.c:2695
 msgid "Normal - recommended for most users"
 msgstr ""
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:2656
+#: src/preferences.c:2697
 msgid "High - can improve quality on very fast machines"
 msgstr ""
 
-#: src/preferences.c:2659
+#: src/preferences.c:2700
 msgid "Preview _quality"
 msgstr ""
 
-#: src/preferences.c:2660
+#: src/preferences.c:2701
 msgid "The preview quality for video playback - affects resizing"
 msgstr ""
 
-#: src/preferences.c:2675
+#: src/preferences.c:2717
 msgid "_Show FPS statistics"
 msgstr ""
 
-#: src/preferences.c:2694
+#: src/preferences.c:2736
 msgid "_Plugin"
 msgstr ""
 
-#: src/preferences.c:2718
+#: src/preferences.c:2760
 msgid "Stream audio"
 msgstr ""
 
-#: src/preferences.c:2721
+#: src/preferences.c:2763
 msgid "Stream audio to playback plugin"
 msgstr ""
 
-#: src/preferences.c:2734
+#: src/preferences.c:2778
 msgid "Record player output"
 msgstr ""
 
-#: src/preferences.c:2737
+#: src/preferences.c:2781
 msgid "Record output from player instead of input to player"
 msgstr ""
 
-#: src/preferences.c:2744
+#: src/preferences.c:2789
 msgid "VIDEO"
 msgstr ""
 
-#: src/preferences.c:2787
+#: src/preferences.c:2833
 msgid "_Player"
 msgstr ""
 
-#: src/preferences.c:2792
+#: src/preferences.c:2838
 msgid "(See also the Jack Integration tab for jack startup options)"
 msgstr ""
 
-#: src/preferences.c:2819
+#: src/preferences.c:2865
 msgid "mplayer"
 msgstr ""
 
-#: src/preferences.c:2830
+#: src/preferences.c:2876
 msgid "mplayer2"
 msgstr ""
 
-#: src/preferences.c:2833
+#: src/preferences.c:2879
 msgid "Audio play _command"
 msgstr ""
 
-#: src/preferences.c:2840
+#: src/preferences.c:2886
 msgid "- internal -"
 msgstr ""
 
-#: src/preferences.c:2849
+#: src/preferences.c:2895
 msgid "Audio follows video _rate/direction"
 msgstr ""
 
-#: src/preferences.c:2857
+#: src/preferences.c:2903
 msgid "Audio follows _clip switches"
 msgstr ""
 
-#: src/preferences.c:2864
+#: src/preferences.c:2910
 msgid "Source:"
 msgstr ""
 
-#: src/preferences.c:2868
+#: src/preferences.c:2914
 msgid "_Internal"
 msgstr ""
 
-#: src/preferences.c:2873
+#: src/preferences.c:2919
 msgid "_External (requires jack or pulse audio player)"
 msgstr ""
 
-#: src/preferences.c:2892
+#: src/preferences.c:2940
 msgid "AUDIO"
 msgstr ""
 
-#: src/preferences.c:2902
+#: src/preferences.c:2950
 msgid "Playback"
 msgstr ""
 
-#: src/preferences.c:2925
+#: src/preferences.c:2973
 msgid ""
 "Record audio when capturing an e_xternal window\n"
 " (requires jack or pulse audio)"
 msgstr ""
 
-#: src/preferences.c:2940
+#: src/preferences.c:2988
 msgid "      What to record when 'r' is pressed   "
 msgstr ""
 
-#: src/preferences.c:2949
+#: src/preferences.c:2997
 msgid "_Frame changes"
 msgstr ""
 
-#: src/preferences.c:2964
+#: src/preferences.c:3012
 msgid "F_PS changes"
 msgstr ""
 
-#: src/preferences.c:2982
+#: src/preferences.c:3030
 msgid "_Real time effects"
 msgstr ""
 
-#: src/preferences.c:2993
+#: src/preferences.c:3041
 msgid "_Clip switches"
 msgstr ""
 
-#: src/preferences.c:3004
+#: src/preferences.c:3052
 msgid "_Audio (requires jack or pulse audio player)"
 msgstr ""
 
-#: src/preferences.c:3024
+#: src/preferences.c:3072
 msgid "Pause recording if free disk space falls below"
 msgstr ""
 
 #. TRANSLATORS: gigabytes
-#: src/preferences.c:3030
+#: src/preferences.c:3078
 msgid "GB"
 msgstr ""
 
-#: src/preferences.c:3037
+#: src/preferences.c:3085
 msgid "Recording"
 msgstr ""
 
-#: src/preferences.c:3055
+#: src/preferences.c:3103
 msgid "Encoder"
 msgstr ""
 
-#: src/preferences.c:3090
+#: src/preferences.c:3137
 msgid "Output format"
 msgstr ""
 
-#: src/preferences.c:3106
+#: src/preferences.c:3153
 msgid "Audio codec"
 msgstr ""
 
-#: src/preferences.c:3119
+#: src/preferences.c:3165
 msgid "Encoding"
 msgstr ""
 
-#: src/preferences.c:3134
+#: src/preferences.c:3180
 msgid "Use _antialiasing when resizing"
 msgstr ""
 
-#: src/preferences.c:3143
+#: src/preferences.c:3189
 msgid "Number of _real time effect keys"
 msgstr ""
 
-#: src/preferences.c:3145
+#: src/preferences.c:3192
 msgid ""
 "The number of \"virtual\" real time effect keys. They can be controlled "
 "through the real time effects window, or via network (OSC)."
 msgstr ""
 
-#: src/preferences.c:3152
+#: src/preferences.c:3199
 msgid "Use _threads where possible when applying effects"
 msgstr ""
 
-#: src/preferences.c:3159
+#: src/preferences.c:3207
 msgid "Number of _threads"
 msgstr ""
 
-#: src/preferences.c:3172
+#: src/preferences.c:3221
 msgid "Restart is required if any of the following paths are changed:"
 msgstr ""
 
-#: src/preferences.c:3182
+#: src/preferences.c:3231
 msgid "Weed plugin path"
 msgstr ""
 
-#: src/preferences.c:3184
+#: src/preferences.c:3234
 msgid "Frei0r plugin path"
 msgstr ""
 
-#: src/preferences.c:3186
+#: src/preferences.c:3237
 msgid "LADSPA plugin path"
 msgstr ""
 
-#: src/preferences.c:3209
+#: src/preferences.c:3261
 msgid "      Video load directory (default)      "
 msgstr ""
 
-#: src/preferences.c:3215
+#: src/preferences.c:3267
 msgid "      Video save directory (default) "
 msgstr ""
 
-#: src/preferences.c:3221
+#: src/preferences.c:3273
 msgid "      Audio load directory (default) "
 msgstr ""
 
-#: src/preferences.c:3227
+#: src/preferences.c:3279
 msgid "      Image directory (default) "
 msgstr ""
 
-#: src/preferences.c:3233
+#: src/preferences.c:3285
 msgid "      Backup/Restore directory (default) "
 msgstr ""
 
-#: src/preferences.c:3239
+#: src/preferences.c:3291
 msgid "      Temp directory (do not remove) "
 msgstr ""
 
-#: src/preferences.c:3252
+#: src/preferences.c:3304
 msgid "The default directory for loading video clips from"
 msgstr ""
 
-#: src/preferences.c:3277
+#: src/preferences.c:3329
 msgid "The default directory for saving encoded clips to"
 msgstr ""
 
-#: src/preferences.c:3285
+#: src/preferences.c:3337
 msgid "The default directory for loading and saving audio"
 msgstr ""
 
-#: src/preferences.c:3293
+#: src/preferences.c:3345
 msgid "The default directory for saving frameshots to"
 msgstr ""
 
-#: src/preferences.c:3301
+#: src/preferences.c:3353
 msgid "The default directory for backing up/restoring single clips"
 msgstr ""
 
-#: src/preferences.c:3309
+#: src/preferences.c:3361
 msgid "LiVES working directory."
 msgstr ""
 
-#: src/preferences.c:3359
+#: src/preferences.c:3412
 msgid "Directories"
 msgstr ""
 
-#: src/preferences.c:3374
+#: src/preferences.c:3427
 msgid "Warn if diskspace falls below: "
 msgstr ""
 
-#: src/preferences.c:3380 src/preferences.c:3394
+#: src/preferences.c:3433 src/preferences.c:3447
 msgid " MB [set to 0 to disable]"
 msgstr ""
 
-#: src/preferences.c:3389
+#: src/preferences.c:3442
 msgid "Diskspace critical level: "
 msgstr ""
 
-#: src/preferences.c:3407
+#: src/preferences.c:3461
 msgid ""
 "Warn on Insert / Merge if _frame rate of clipboard does not match frame rate "
 "of selection"
 msgstr ""
 
-#: src/preferences.c:3417
+#: src/preferences.c:3471
 msgid "Warn on Open if file _size exceeds "
 msgstr ""
 
-#: src/preferences.c:3425
+#: src/preferences.c:3479
 msgid " MB"
 msgstr ""
 
-#: src/preferences.c:3432
+#: src/preferences.c:3486
 msgid "Show a warning before saving a se_t"
 msgstr ""
 
-#: src/preferences.c:3442
+#: src/preferences.c:3496
 msgid ""
 "Show a warning if _mplayer/mplayer2, sox, composite or convert is not found "
 "when LiVES is started."
 msgstr ""
 
-#: src/preferences.c:3452
+#: src/preferences.c:3506
 msgid "Show a warning if no _rendered effects are found at startup."
 msgstr ""
 
-#: src/preferences.c:3464
+#: src/preferences.c:3518
 msgid "Show a warning if no _encoder plugins are found at startup."
 msgstr ""
 
-#: src/preferences.c:3474
+#: src/preferences.c:3528
 msgid "Show a warning if a _duplicate set name is entered."
 msgstr ""
 
-#: src/preferences.c:3485
+#: src/preferences.c:3539
 msgid "When a set is loaded, warn if clips are missing from _layouts."
 msgstr ""
 
-#: src/preferences.c:3495
+#: src/preferences.c:3550
 msgid "Warn if a clip used in a layout is about to be closed."
 msgstr ""
 
-#: src/preferences.c:3505
+#: src/preferences.c:3561
 msgid "Warn if frames used in a layout are about to be deleted."
 msgstr ""
 
-#: src/preferences.c:3515
+#: src/preferences.c:3572
 msgid "Warn if frames used in a layout are about to be shifted."
 msgstr ""
 
-#: src/preferences.c:3525
+#: src/preferences.c:3583
 msgid "Warn if frames used in a layout are about to be altered."
 msgstr ""
 
-#: src/preferences.c:3535
+#: src/preferences.c:3594
 msgid "Warn if audio used in a layout is about to be deleted."
 msgstr ""
 
-#: src/preferences.c:3546
+#: src/preferences.c:3606
 msgid "Warn if audio used in a layout is about to be shifted."
 msgstr ""
 
-#: src/preferences.c:3556
+#: src/preferences.c:3617
 msgid "Warn if audio used in a layout is about to be altered."
 msgstr ""
 
-#: src/preferences.c:3566
+#: src/preferences.c:3628
 msgid "Popup layout errors after clip changes."
 msgstr ""
 
-#: src/preferences.c:3577
+#: src/preferences.c:3639
 msgid "Warn if the layout has not been saved when leaving multitrack mode."
 msgstr ""
 
-#: src/preferences.c:3588
+#: src/preferences.c:3650
 msgid ""
 "Warn if multitrack has no audio channels, and a layout with audio is loaded."
 msgstr ""
 
-#: src/preferences.c:3598
+#: src/preferences.c:3660
 msgid ""
 "Warn if multitrack has audio channels, and your audio player is not \"jack\" "
 "or \"pulse audio\"."
 msgstr ""
 
-#: src/preferences.c:3610
+#: src/preferences.c:3672
 msgid "Show info message after importing from firewire device."
 msgstr ""
 
-#: src/preferences.c:3626
+#: src/preferences.c:3688
 msgid "Show a warning before opening a yuv4mpeg stream (advanced)."
 msgstr ""
 
-#: src/preferences.c:3639
+#: src/preferences.c:3701
 msgid "Show a warning when multitrack is low on backup space."
 msgstr ""
 
-#: src/preferences.c:3650
+#: src/preferences.c:3713
 msgid "Show a warning advising cleaning of disk space after a crash."
 msgstr ""
 
-#: src/preferences.c:3661
+#: src/preferences.c:3725
 msgid "Show a warning if unable to connect to pulseaudio player."
 msgstr ""
 
-#: src/preferences.c:3673
+#: src/preferences.c:3737
 msgid "Show a warning before wiping a layout which has unsaved changes."
 msgstr ""
 
-#: src/preferences.c:3685
+#: src/preferences.c:3749
 msgid "Warnings"
 msgstr ""
 
-#: src/preferences.c:3703
+#: src/preferences.c:3767
 msgid "Midi synch (requires the files midistart and midistop)"
 msgstr ""
 
-#: src/preferences.c:3715
+#: src/preferences.c:3779
 msgid "When inserting/merging frames:  "
 msgstr ""
 
-#: src/preferences.c:3719
+#: src/preferences.c:3783
 msgid "_Speed Up/Slow Down Insertion"
 msgstr ""
 
-#: src/preferences.c:3723
+#: src/preferences.c:3787
 msgid "_Resample Insertion"
 msgstr ""
 
-#: src/preferences.c:3730
+#: src/preferences.c:3794
 msgid "CD device           "
 msgstr ""
 
-#: src/preferences.c:3733
+#: src/preferences.c:3797
 msgid "LiVES can load audio tracks from this CD"
 msgstr ""
 
-#: src/preferences.c:3746
+#: src/preferences.c:3813
 msgid "Default FPS        "
 msgstr ""
 
-#: src/preferences.c:3749
+#: src/preferences.c:3816
 msgid "Frames per second to use when none is specified"
 msgstr ""
 
-#: src/preferences.c:3757
+#: src/preferences.c:3825
 msgid "Misc"
 msgstr ""
 
-#: src/preferences.c:3782
+#: src/preferences.c:3850
 msgid "New theme:           "
 msgstr ""
 
-#: src/preferences.c:3800
+#: src/preferences.c:3867
 msgid "Themes"
 msgstr ""
 
-#: src/preferences.c:3815
+#: src/preferences.c:3882
 msgid "Download bandwidth (Kb/s)       "
 msgstr ""
 
-#: src/preferences.c:3823
+#: src/preferences.c:3890
 msgid "LiVES must be compiled without \"configure --disable-OSC\" to use OMC"
 msgstr ""
 
-#: src/preferences.c:3833
+#: src/preferences.c:3900
 msgid "OMC remote control enabled"
 msgstr ""
 
-#: src/preferences.c:3841
+#: src/preferences.c:3908
 msgid "UDP port       "
 msgstr ""
 
-#: src/preferences.c:3850
+#: src/preferences.c:3917
 msgid "Start OMC on startup"
 msgstr ""
 
-#: src/preferences.c:3870
+#: src/preferences.c:3937
 msgid "Streaming/Networking"
 msgstr ""
 
-#: src/preferences.c:3882
+#: src/preferences.c:3949
 msgid "Jack transport"
 msgstr ""
 
-#: src/preferences.c:3886
+#: src/preferences.c:3953
 msgid ""
 "LiVES must be compiled with jack/transport.h and jack/jack.h present to use "
 "jack transport"
 msgstr ""
 
-#: src/preferences.c:3892
+#: src/preferences.c:3959
 msgid "Jack _transport config file"
 msgstr ""
 
-#: src/preferences.c:3899 src/preferences.c:3989
+#: src/preferences.c:3967 src/preferences.c:4058
 msgid "Start _server on LiVES startup"
 msgstr ""
 
-#: src/preferences.c:3911
+#: src/preferences.c:3979
 msgid "Jack transport _master (start and stop)"
 msgstr ""
 
-#: src/preferences.c:3921
+#: src/preferences.c:3989
 msgid "Jack transport _client (start and stop)"
 msgstr ""
 
-#: src/preferences.c:3935
+#: src/preferences.c:4003
 msgid "Jack transport sets start position"
 msgstr ""
 
-#: src/preferences.c:3952
+#: src/preferences.c:4020
 msgid "Jack transport timebase slave"
 msgstr ""
 
-#: src/preferences.c:3963
+#: src/preferences.c:4031
 msgid "(See also Playback -> Audio follows video rate/direction)"
 msgstr ""
 
-#: src/preferences.c:3971
+#: src/preferences.c:4039
 msgid "Jack audio"
 msgstr ""
 
-#: src/preferences.c:3975
+#: src/preferences.c:4043
 msgid "LiVES must be compiled with jack/jack.h present to use jack audio"
 msgstr ""
 
-#: src/preferences.c:3978
+#: src/preferences.c:4046
 msgid ""
 "You MUST set the audio player to \"jack\" in the Playback tab to use jack "
 "audio"
 msgstr ""
 
-#: src/preferences.c:3984
+#: src/preferences.c:4052
 msgid "Jack _audio server config file"
 msgstr ""
 
-#: src/preferences.c:3996
+#: src/preferences.c:4065
 msgid "Play audio even when transport is _paused"
 msgstr ""
 
-#: src/preferences.c:4008
+#: src/preferences.c:4077
 msgid "Automatically connect to System Out ports when 'playing' External Audio"
 msgstr ""
 
-#: src/preferences.c:4021
+#: src/preferences.c:4090
 msgid "Jack Integration"
 msgstr ""
 
-#: src/preferences.c:4035
+#: src/preferences.c:4104
 msgid "Events to respond to:"
 msgstr ""
 
-#: src/preferences.c:4044
+#: src/preferences.c:4113
 msgid "_Joystick events"
 msgstr ""
 
-#: src/preferences.c:4051
+#: src/preferences.c:4120
 msgid "_Joystick device"
 msgstr ""
 
-#: src/preferences.c:4053
+#: src/preferences.c:4122
 msgid "The joystick device, e.g. /dev/input/js0"
 msgstr ""
 
-#: src/preferences.c:4071
+#: src/preferences.c:4142
 msgid "_MIDI events"
 msgstr ""
 
-#: src/preferences.c:4080
+#: src/preferences.c:4151
 msgid "Use _ALSA MIDI (recommended)"
 msgstr ""
 
-#: src/preferences.c:4082
+#: src/preferences.c:4153
 msgid "Create an ALSA MIDI port which other MIDI devices can be connected to"
 msgstr ""
 
-#: src/preferences.c:4090
+#: src/preferences.c:4162
 msgid "Use _raw MIDI"
 msgstr ""
 
-#: src/preferences.c:4092
+#: src/preferences.c:4164
 msgid "Read directly from the MIDI device"
 msgstr ""
 
-#: src/preferences.c:4104
+#: src/preferences.c:4177
 msgid "_MIDI device"
 msgstr ""
 
-#: src/preferences.c:4106
+#: src/preferences.c:4179
 msgid "The MIDI device, e.g. /dev/input/midi0"
 msgstr ""
 
-#: src/preferences.c:4118
+#: src/preferences.c:4193
 msgid "Advanced"
 msgstr ""
 
-#: src/preferences.c:4124
+#: src/preferences.c:4199
 msgid "MIDI check _rate"
 msgstr ""
 
-#: src/preferences.c:4127
+#: src/preferences.c:4203
 msgid ""
 "Number of MIDI checks per keyboard tick. Increasing this may improve MIDI "
 "responsiveness, but may slow down playback."
 msgstr ""
 
-#: src/preferences.c:4134
+#: src/preferences.c:4211
 msgid "MIDI repeat"
 msgstr ""
 
-#: src/preferences.c:4137
+#: src/preferences.c:4214
 msgid "Number of non-reads allowed between succesive reads."
 msgstr ""
 
-#: src/preferences.c:4140
+#: src/preferences.c:4218
 msgid "(Warning: setting this value too high can slow down playback.)"
 msgstr ""
 
-#: src/preferences.c:4159
+#: src/preferences.c:4237
 msgid "MIDI/Joystick learner"
 msgstr ""
 
-#: src/preferences.c:4499
+#: src/preferences.c:4679
 msgid ""
 "\n"
 "LiVES will now shut down. You need to restart it for the directory change to "
@@ -7590,214 +7604,214 @@
 "Click OK to continue.\n"
 msgstr ""
 
-#: src/preferences.c:4523
+#: src/preferences.c:4703
 msgid ""
 "For the directory change to take effect LiVES will restart when preferences "
 "dialog closes."
 msgstr ""
 
-#: src/preferences.c:4527
+#: src/preferences.c:4707
 msgid "Theme changes will not take effect until the next time you start LiVES."
 msgstr ""
 
-#: src/preferences.c:4531
+#: src/preferences.c:4711
 msgid "Jack options will not take effect until the next time you start LiVES."
 msgstr ""
 
-#: src/osc.c:2585
+#: src/osc.c:2616
 #, c-format
 msgid "Syncing to external framerate of %.8f frames per second.\n"
 msgstr ""
 
-#: src/osc.c:6746
+#: src/osc.c:6938
 msgid "Cannot initialize OSC receiver\n"
 msgstr ""
 
-#: src/osc.c:6770
+#: src/osc.c:6961
 #, c-format
 msgid "WARNING: Cannot start OSC server at UDP port %d\n"
 msgstr ""
 
-#: src/osc.c:6775
+#: src/osc.c:6963
 #, c-format
 msgid "Started OSC server at UDP port %d\n"
 msgstr ""
 
-#: src/osc.c:6890
+#: src/osc.c:7076
 #, c-format
 msgid "Cannot start OSC/UDP server at port %d \n"
 msgstr ""
 
-#: src/resample.c:125 src/resample.c:304
+#: src/resample.c:131 src/resample.c:305
 #, c-format
 msgid "Resizing frames 1 to %d"
 msgstr ""
 
-#: src/resample.c:140 src/resample.c:318
+#: src/resample.c:145 src/resample.c:318
 #, c-format
 msgid "Resizing/letterboxing frames 1 to %d"
 msgstr ""
 
-#: src/resample.c:361 src/resample.c:385
+#: src/resample.c:360 src/resample.c:384
 msgid "Resize"
 msgstr ""
 
-#: src/resample.c:395
+#: src/resample.c:394
 msgid "Resample/Resize"
 msgstr ""
 
-#: src/resample.c:680
+#: src/resample.c:676
 #, c-format
 msgid "Length of video is now %d frames.\n"
 msgstr ""
 
-#: src/resample.c:745
+#: src/resample.c:737
 msgid ""
 "\n"
 "\n"
 "New rate must be greater than 0\n"
 msgstr ""
 
-#: src/resample.c:797 src/resample.c:813
+#: src/resample.c:788 src/resample.c:803
 msgid "Resampling audio"
 msgstr ""
 
-#: src/resample.c:831
+#: src/resample.c:821
 msgid "LiVES was unable to resample the audio as requested.\n"
 msgstr ""
 
-#: src/resample.c:833 src/resample.c:837
+#: src/resample.c:823 src/resample.c:827
 msgid "Resample Audio"
 msgstr ""
 
-#: src/resample.c:845
+#: src/resample.c:835
 #, c-format
 msgid "Audio was resampled to %d Hz, %d channels, %d bit"
 msgstr ""
 
-#: src/resample.c:1034
+#: src/resample.c:1016
 #, c-format
 msgid "Resampling video at %.8f frames per second..."
 msgstr ""
 
-#: src/resample.c:1037
+#: src/resample.c:1018
 #, c-format
 msgid "Resampling video at %.3f frames per second..."
 msgstr ""
 
-#: src/resample.c:1068
+#: src/resample.c:1049
 msgid "Reordering error !\n"
 msgstr ""
 
-#: src/resample.c:1079
+#: src/resample.c:1060
 msgid "Resample"
 msgstr ""
 
-#: src/resample.c:1192
+#: src/resample.c:1173
 msgid "LiVES: - Resample Audio"
 msgstr ""
 
-#: src/resample.c:1195
+#: src/resample.c:1175
 msgid "LiVES: - Insert Silence"
 msgstr ""
 
-#: src/resample.c:1198
+#: src/resample.c:1177
 msgid "LiVES: - New Clip Audio"
 msgstr ""
 
-#: src/resample.c:1201
+#: src/resample.c:1179
 msgid "LiVES: - External Clip Settings"
 msgstr ""
 
-#: src/resample.c:1238 src/resample.c:1358
+#: src/resample.c:1215 src/resample.c:1332
 msgid "Rate (Hz) "
 msgstr ""
 
-#: src/resample.c:1245 src/resample.c:1372
+#: src/resample.c:1222 src/resample.c:1346
 msgid "Channels"
 msgstr ""
 
-#: src/resample.c:1252
+#: src/resample.c:1229
 msgid "Sample Size "
 msgstr ""
 
-#: src/resample.c:1268 src/resample.c:1425
+#: src/resample.c:1245 src/resample.c:1399
 msgid "Signed"
 msgstr ""
 
-#: src/resample.c:1274 src/resample.c:1435
+#: src/resample.c:1251 src/resample.c:1409
 msgid "Unsigned"
 msgstr ""
 
-#: src/resample.c:1297 src/resample.c:1460
+#: src/resample.c:1273 src/resample.c:1433
 msgid "Little Endian"
 msgstr ""
 
-#: src/resample.c:1303 src/resample.c:1468
+#: src/resample.c:1279 src/resample.c:1441
 msgid "Big Endian"
 msgstr ""
 
-#: src/resample.c:1315
+#: src/resample.c:1290
 msgid "Current"
 msgstr ""
 
-#: src/resample.c:1340
+#: src/resample.c:1315
 msgid "_Enable audio"
 msgstr ""
 
-#: src/resample.c:1372
+#: src/resample.c:1346
 msgid "_Channels"
 msgstr ""
 
-#: src/resample.c:1394
+#: src/resample.c:1368
 msgid "_Sample Size"
 msgstr ""
 
-#: src/resample.c:1394
+#: src/resample.c:1368
 msgid "Sample Size"
 msgstr ""
 
-#: src/resample.c:1489
+#: src/resample.c:1461
 msgid "New"
 msgstr ""
 
-#: src/resample.c:1512
+#: src/resample.c:1484
 msgid "_Frames Per Second "
 msgstr ""
 
-#: src/resample.c:1530
+#: src/resample.c:1502
 msgid "Record for maximum:  "
 msgstr ""
 
-#: src/resample.c:1533
+#: src/resample.c:1505
 msgid " hours  "
 msgstr ""
 
-#: src/resample.c:1536
+#: src/resample.c:1508
 msgid " minutes  "
 msgstr ""
 
-#: src/resample.c:1538
+#: src/resample.c:1510
 msgid " seconds  "
 msgstr ""
 
-#: src/resample.c:1545
+#: src/resample.c:1517
 msgid "Unlimited"
 msgstr ""
 
-#: src/resample.c:1561
+#: src/resample.c:1533
 msgid "Click OK to begin recording, or Cancel to quit."
 msgstr ""
 
-#: src/resample.c:1670
+#: src/resample.c:1638
 msgid "LiVES: - Change playback speed"
 msgstr ""
 
-#: src/resample.c:1673
+#: src/resample.c:1640
 msgid "LiVES: - Resample Video"
 msgstr ""
 
-#: src/resample.c:1696
+#: src/resample.c:1663
 #, c-format
 msgid ""
 "\n"
@@ -7808,7 +7822,7 @@
 "in _frames per second"
 msgstr ""
 
-#: src/resample.c:1701
+#: src/resample.c:1667
 #, c-format
 msgid ""
 "\n"
@@ -7819,89 +7833,89 @@
 "in frames per second"
 msgstr ""
 
-#: src/resample.c:1723
+#: src/resample.c:1688
 msgid "OR enter the desired clip length in _seconds"
 msgstr ""
 
-#: src/resample.c:1745
+#: src/resample.c:1710
 msgid "Change the _audio speed as well"
 msgstr ""
 
-#: src/resample.c:1846
+#: src/resample.c:1810
 msgid ""
 "\n"
 "Speeding up the clip will cause missing frames in some multitrack layouts.\n"
 "Are you sure you wish to change the speed ?\n"
 msgstr ""
 
-#: src/resample.c:1863
+#: src/resample.c:1829
 msgid ""
 "\n"
 "Speeding up the clip will cause missing audio in some multitrack layouts.\n"
 "Are you sure you wish to change the speed ?\n"
 msgstr ""
 
-#: src/resample.c:1878
+#: src/resample.c:1847
 msgid ""
 "\n"
 "Changing the speed will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/resample.c:1892
+#: src/resample.c:1863
 msgid ""
 "\n"
 "Changing the speed will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/resample.c:1938
+#: src/resample.c:1911
 msgid "Speed Change"
 msgstr ""
 
-#: src/resample.c:1947
+#: src/resample.c:1920
 #, c-format
 msgid "Changed playback speed to %.3f frames per second and audio to %d Hz.\n"
 msgstr ""
 
-#: src/resample.c:1950
+#: src/resample.c:1922
 #, c-format
 msgid "Changed playback speed to %.3f frames per second.\n"
 msgstr ""
 
-#: src/resample.c:2035
+#: src/resample.c:2006
 msgid "Resampling video"
 msgstr ""
 
-#: src/resample.c:2042 src/resample.c:2160 src/resample.c:2182
+#: src/resample.c:2012 src/resample.c:2127 src/resample.c:2148
 msgid "Resampling clipboard video"
 msgstr ""
 
-#: src/resample.c:2047
+#: src/resample.c:2016
 msgid "Reordering frames"
 msgstr ""
 
-#: src/resample.c:2056
+#: src/resample.c:2025
 msgid ""
 "\n"
 "\n"
 "LiVES was unable to reorder the frames."
 msgstr ""
 
-#: src/resample.c:2104
+#: src/resample.c:2071
 msgid "Deordering frames"
 msgstr ""
 
-#: src/resample.c:2199
+#: src/resample.c:2165
 msgid "resampling error..."
 msgstr ""
 
-#: src/rte_window.c:85 src/rte_window.c:1708
+#: src/rte_window.c:124 src/rte_window.c:1709
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
-#: src/rte_window.c:112
+#: src/rte_window.c:150
 msgid ""
 "\n"
 "\n"
@@ -7911,7 +7925,7 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:426
+#: src/rte_window.c:460
 msgid ""
 "\n"
 "\n"
@@ -7919,19 +7933,19 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:432
+#: src/rte_window.c:466
 #, c-format
 msgid "Saving keymap to %s\n"
 msgstr ""
 
-#: src/rte_window.c:439
+#: src/rte_window.c:471
 #, c-format
 msgid ""
 "\n"
 "Updating keymap file %s..."
 msgstr ""
 
-#: src/rte_window.c:446
+#: src/rte_window.c:477
 #, c-format
 msgid ""
 "\n"
@@ -7941,12 +7955,12 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/rte_window.c:526
+#: src/rte_window.c:556
 #, c-format
 msgid "Saving real time effect defaults to %s..."
 msgstr ""
 
-#: src/rte_window.c:535
+#: src/rte_window.c:563
 #, c-format
 msgid ""
 "\n"
@@ -7956,22 +7970,22 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/rte_window.c:632
+#: src/rte_window.c:657
 #, c-format
 msgid "Loading real time effect defaults from %s..."
 msgstr ""
 
-#: src/rte_window.c:681
+#: src/rte_window.c:701
 #, c-format
 msgid "Loading generator default sizes from %s..."
 msgstr ""
 
-#: src/rte_window.c:1306
+#: src/rte_window.c:1319
 #, c-format
 msgid "Loading default keymap from %s..."
 msgstr ""
 
-#: src/rte_window.c:1329
+#: src/rte_window.c:1339
 #, c-format
 msgid ""
 "\n"
@@ -7981,48 +7995,48 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/rte_window.c:1403
+#: src/rte_window.c:1412
 #, c-format
 msgid "Invalid line %d in %s\n"
 msgstr ""
 
-#: src/rte_window.c:1483
+#: src/rte_window.c:1490
 #, c-format
 msgid "Invalid key %d in %s\n"
 msgstr ""
 
-#: src/rte_window.c:1498
+#: src/rte_window.c:1505
 #, c-format
 msgid "Invalid effect %s in %s\n"
 msgstr ""
 
-#: src/rte_window.c:1517
+#: src/rte_window.c:1524
 #, c-format
 msgid "Unknown effect %s in %s\n"
 msgstr ""
 
-#: src/rte_window.c:1535
+#: src/rte_window.c:1542
 #, c-format
 msgid ""
 "This version of LiVES cannot mix generators/non-generators on the same key "
 "(%d) !\n"
 msgstr ""
 
-#: src/rte_window.c:1547
+#: src/rte_window.c:1554
 #, c-format
 msgid "Too many effects bound to key %d.\n"
 msgstr ""
 
-#: src/rte_window.c:1587
+#: src/rte_window.c:1593
 msgid "update required.\n"
 msgstr ""
 
-#: src/rte_window.c:1603
+#: src/rte_window.c:1607
 #, c-format
 msgid "Loading data connection map from %s..."
 msgstr ""
 
-#: src/rte_window.c:1612
+#: src/rte_window.c:1614
 msgid ""
 "\n"
 "\n"
@@ -8030,41 +8044,41 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:1691
+#: src/rte_window.c:1692
 #, c-format
 msgid "LiVES: Information for %s"
 msgstr ""
 
-#: src/rte_window.c:1704
+#: src/rte_window.c:1705
 #, c-format
 msgid "Effect name: %s"
 msgstr ""
 
-#: src/rte_window.c:1712
+#: src/rte_window.c:1713
 #, c-format
 msgid "Plugin name: %s"
 msgstr ""
 
-#: src/rte_window.c:1716
+#: src/rte_window.c:1717
 #, c-format
 msgid "Author: %s"
 msgstr ""
 
-#: src/rte_window.c:1721
+#: src/rte_window.c:1722
 #, c-format
 msgid "and: %s"
 msgstr ""
 
-#: src/rte_window.c:1726
+#: src/rte_window.c:1727
 #, c-format
 msgid "Version: %d"
 msgstr ""
 
-#: src/rte_window.c:1734
+#: src/rte_window.c:1735
 msgid "Description: "
 msgstr ""
 
-#: src/rte_window.c:1960
+#: src/rte_window.c:1963
 msgid ""
 "\n"
 "\n"
@@ -8073,69 +8087,69 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:2024
+#: src/rte_window.c:2027
 #, c-format
 msgid "LiVES could not locate the effect %s.\n"
 msgstr ""
 
-#: src/rte_window.c:2225
+#: src/rte_window.c:2216
 msgid "LiVES: Real time effect mapping"
 msgstr ""
 
-#: src/rte_window.c:2257
+#: src/rte_window.c:2248
 #, c-format
 msgid "Ctrl-%d"
 msgstr ""
 
-#: src/rte_window.c:2264
+#: src/rte_window.c:2255
 msgid "Key active"
 msgstr ""
 
-#: src/rte_window.c:2279
+#: src/rte_window.c:2271
 msgid "Key grab"
 msgstr ""
 
-#: src/rte_window.c:2280
+#: src/rte_window.c:2272
 msgid "Grab keyboard for this effect key"
 msgstr ""
 
-#: src/rte_window.c:2290
+#: src/rte_window.c:2283
 msgid "_Clear all effects"
 msgstr ""
 
-#: src/rte_window.c:2304
+#: src/rte_window.c:2297
 msgid "Mode active"
 msgstr ""
 
-#: src/rte_window.c:2314 src/multitrack.c:8568
+#: src/rte_window.c:2307 src/multitrack.c:8762
 msgid "Info"
 msgstr ""
 
-#: src/rte_window.c:2315
+#: src/rte_window.c:2308
 msgid "Set Parameters"
 msgstr ""
 
-#: src/rte_window.c:2316
+#: src/rte_window.c:2309
 msgid "Set Connections"
 msgstr ""
 
-#: src/rte_window.c:2317
+#: src/rte_window.c:2310
 msgid "Clear"
 msgstr ""
 
-#: src/rte_window.c:2326
+#: src/rte_window.c:2319
 msgid "Effect name:"
 msgstr ""
 
-#: src/rte_window.c:2391
+#: src/rte_window.c:2384
 msgid "_Save as default keymap"
 msgstr ""
 
-#: src/rte_window.c:2396
+#: src/rte_window.c:2389
 msgid "_Load default keymap"
 msgstr ""
 
-#: src/rte_window.c:2840
+#: src/rte_window.c:2833
 #, c-format
 msgid ""
 "Unable to create default keymap file: %s\n"
@@ -8193,86 +8207,86 @@
 msgid "none\n"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:494
+#: src/lives-yuv4mpeg.c:493
 #, c-format
 msgid ""
 "Unable to set display framerate to %.3f fps.\n"
 "\n"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:503
+#: src/lives-yuv4mpeg.c:502
 #, c-format
 msgid "Unable to open yuv4mpeg out stream %s\n"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:628
+#: src/lives-yuv4mpeg.c:626
 #, c-format
 msgid "TV card %d"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:713
+#: src/lives-yuv4mpeg.c:710
 #, c-format
 msgid "Opened TV card %d (%s)"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:760
+#: src/lives-yuv4mpeg.c:757
 #, c-format
 msgid "Firewire card %d"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:796
+#: src/lives-yuv4mpeg.c:793
 #, c-format
 msgid "Opened firewire card %d"
 msgstr ""
 
-#: src/multitrack.c:666
+#: src/multitrack.c:736
 msgid "Auto backup"
 msgstr ""
 
-#: src/multitrack.c:868
+#: src/multitrack.c:935
 msgid "Backing audio"
 msgstr ""
 
-#: src/multitrack.c:1435
+#: src/multitrack.c:1515
 #, c-format
 msgid "%s : parameters for %s"
 msgstr ""
 
-#: src/multitrack.c:1809 src/multitrack.c:3483
+#: src/multitrack.c:1881 src/multitrack.c:3635
 #, c-format
 msgid "Current track: %s (layer %d)\n"
 msgstr ""
 
-#: src/multitrack.c:1813 src/multitrack.c:3484
+#: src/multitrack.c:1885 src/multitrack.c:3637
 msgid "Current track: Backing audio\n"
 msgstr ""
 
-#: src/multitrack.c:1814
+#: src/multitrack.c:1886
 #, c-format
 msgid "Current track: Layer %d audio\n"
 msgstr ""
 
-#: src/multitrack.c:1817
+#: src/multitrack.c:1889
 #, c-format
 msgid "%.2f sec.\n"
 msgstr ""
 
-#: src/multitrack.c:1822 src/multitrack.c:3490
+#: src/multitrack.c:1894 src/multitrack.c:3643
 #, c-format
 msgid "Source: %s"
 msgstr ""
 
-#: src/multitrack.c:1825 src/multitrack.c:3492
+#: src/multitrack.c:1897 src/multitrack.c:3645
 msgid "Right click for context menu.\n"
 msgstr ""
 
-#: src/multitrack.c:1827
+#: src/multitrack.c:1899
 msgid ""
 "Double click on a block\n"
 "to select it."
 msgstr ""
 
-#: src/multitrack.c:3312
+#: src/multitrack.c:3452
 msgid ""
 "\n"
 "\n"
@@ -8281,7 +8295,7 @@
 "right or double clicking on it.\n"
 msgstr ""
 
-#: src/multitrack.c:3315
+#: src/multitrack.c:3455
 msgid ""
 "\n"
 "\n"
@@ -8289,14 +8303,14 @@
 "Select an effect in FX stack first to view its parameters.\n"
 msgstr ""
 
-#: src/multitrack.c:3318
+#: src/multitrack.c:3458
 msgid ""
 "\n"
 "\n"
 "No clips loaded.\n"
 msgstr ""
 
-#: src/multitrack.c:3321
+#: src/multitrack.c:3462
 msgid ""
 "You must select two video tracks\n"
 "and a time region\n"
@@ -8306,7 +8320,7 @@
 "before inserting clips into the timeline."
 msgstr ""
 
-#: src/multitrack.c:3324
+#: src/multitrack.c:3465
 msgid ""
 "\n"
 "\n"
@@ -8315,210 +8329,210 @@
 "to apply compositors.\n"
 msgstr ""
 
-#: src/multitrack.c:3487
+#: src/multitrack.c:3640
 #, c-format
 msgid "%.2f sec. to %.2f sec.\n"
 msgstr ""
 
-#: src/multitrack.c:3493
+#: src/multitrack.c:3646
 msgid ""
 "Single click on timeline\n"
 "to select a frame.\n"
 msgstr ""
 
-#: src/multitrack.c:3711 src/multitrack.c:6790
+#: src/multitrack.c:3858 src/multitrack.c:6972
 #, c-format
 msgid "%s [unstable]"
 msgstr ""
 
-#: src/multitrack.c:3822
+#: src/multitrack.c:3973
 msgid ""
 "You can click and drag\n"
 "below the timeline"
 msgstr ""
 
-#: src/multitrack.c:3823
+#: src/multitrack.c:3974
 msgid "to select a time region.\n"
 msgstr ""
 
-#: src/multitrack.c:3985
+#: src/multitrack.c:4137
 msgid "LiVES: Selected clip"
 msgstr ""
 
-#: src/multitrack.c:3993
+#: src/multitrack.c:4145
 msgid "_Adjust start and end points"
 msgstr ""
 
-#: src/multitrack.c:4002
+#: src/multitrack.c:4154
 msgid "_Edit/encode in clip editor"
 msgstr ""
 
-#: src/multitrack.c:4009
+#: src/multitrack.c:4161
 msgid "_Show clip information"
 msgstr ""
 
-#: src/multitrack.c:4016
+#: src/multitrack.c:4168
 msgid "_Close this clip"
 msgstr ""
 
-#: src/multitrack.c:4236
+#: src/multitrack.c:4388
 msgid "Audio mixer (ctrl-m)"
 msgstr ""
 
-#: src/multitrack.c:4336
+#: src/multitrack.c:4488
 msgid "Single click on timeline"
 msgstr ""
 
-#: src/multitrack.c:4337
+#: src/multitrack.c:4489
 msgid "to select a frame."
 msgstr ""
 
-#: src/multitrack.c:4338
+#: src/multitrack.c:4490
 msgid "Double click or right click on timeline"
 msgstr ""
 
-#: src/multitrack.c:4339
+#: src/multitrack.c:4491
 msgid "to select a block."
 msgstr ""
 
-#: src/multitrack.c:4340
+#: src/multitrack.c:4492
 msgid "Clips can be dragged"
 msgstr ""
 
-#: src/multitrack.c:4341
+#: src/multitrack.c:4493
 msgid "onto the timeline."
 msgstr ""
 
-#: src/multitrack.c:4343
+#: src/multitrack.c:4495
 msgid "Mouse mode is: Move"
 msgstr ""
 
-#: src/multitrack.c:4344
+#: src/multitrack.c:4496
 msgid "clips can be moved around."
 msgstr ""
 
-#: src/multitrack.c:4349
+#: src/multitrack.c:4500
 msgid "Mouse mode is: Select."
 msgstr ""
 
-#: src/multitrack.c:4350
+#: src/multitrack.c:4501
 msgid "Drag with mouse on timeline"
 msgstr ""
 
-#: src/multitrack.c:4351
+#: src/multitrack.c:4502
 msgid "to select tracks and time."
 msgstr ""
 
-#: src/multitrack.c:4362
+#: src/multitrack.c:4509
 msgid "_Insert mode: Normal"
 msgstr ""
 
-#: src/multitrack.c:4378
+#: src/multitrack.c:4537
 msgid "_Mouse mode: Move"
 msgstr ""
 
-#: src/multitrack.c:4382
+#: src/multitrack.c:4540
 msgid "_Mouse mode: Select"
 msgstr ""
 
-#: src/multitrack.c:4405 src/multitrack.c:7925
+#: src/multitrack.c:4563 src/multitrack.c:8104
 msgid "Gravity: Normal"
 msgstr ""
 
-#: src/multitrack.c:4409
+#: src/multitrack.c:4565
 msgid "Gravity: Left"
 msgstr ""
 
-#: src/multitrack.c:4414
+#: src/multitrack.c:4569
 msgid "Gravity: Right"
 msgstr ""
 
-#: src/multitrack.c:4416
+#: src/multitrack.c:4570
 msgid "Close _last gap(s) in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:4419
+#: src/multitrack.c:4572
 msgid "Close _first gap(s) in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:4458
+#: src/multitrack.c:4627
 msgid "Close gaps"
 msgstr ""
 
-#: src/multitrack.c:4460
+#: src/multitrack.c:4629
 msgid "Move block"
 msgstr ""
 
-#: src/multitrack.c:4462
+#: src/multitrack.c:4631
 msgid "Move audio block"
 msgstr ""
 
-#: src/multitrack.c:4464
+#: src/multitrack.c:4633
 msgid "Delete block"
 msgstr ""
 
-#: src/multitrack.c:4466
+#: src/multitrack.c:4635
 msgid "Delete audio block"
 msgstr ""
 
-#: src/multitrack.c:4468
+#: src/multitrack.c:4637
 msgid "Split tracks"
 msgstr ""
 
-#: src/multitrack.c:4470
+#: src/multitrack.c:4639
 msgid "Split block"
 msgstr ""
 
-#: src/multitrack.c:4473
+#: src/multitrack.c:4642
 #, c-format
 msgid "Apply %s"
 msgstr ""
 
-#: src/multitrack.c:4478
+#: src/multitrack.c:4647
 #, c-format
 msgid "Delete %s"
 msgstr ""
 
-#: src/multitrack.c:4482
+#: src/multitrack.c:4651
 msgid "Insert block"
 msgstr ""
 
-#: src/multitrack.c:4484
+#: src/multitrack.c:4653
 msgid "Insert gap"
 msgstr ""
 
-#: src/multitrack.c:4486
+#: src/multitrack.c:4655
 msgid "Insert audio block"
 msgstr ""
 
-#: src/multitrack.c:4488
+#: src/multitrack.c:4657
 msgid "Effect order change"
 msgstr ""
 
-#: src/multitrack.c:4898
+#: src/multitrack.c:5064
 msgid "unsigned "
 msgstr ""
 
-#: src/multitrack.c:4899
+#: src/multitrack.c:5065
 msgid "signed "
 msgstr ""
 
-#: src/multitrack.c:4904
+#: src/multitrack.c:5071
 #, c-format
 msgid ""
 "Multitrack values set to %.3f fps, frame size %d x %d, audio channels %d, "
 "audio rate %d, audio sample size %d, %s.\n"
 msgstr ""
 
-#: src/multitrack.c:4938
+#: src/multitrack.c:5104
 msgid "invalid event list. Failed.\n"
 msgstr ""
 
-#: src/multitrack.c:4944
+#: src/multitrack.c:5110
 msgid "event list has invalid fps. Failed.\n"
 msgstr ""
 
-#: src/multitrack.c:4953
+#: src/multitrack.c:5122
 #, c-format
 msgid ""
 "\n"
@@ -8528,7 +8542,7 @@
 "then load in the new set from the File menu.\n"
 msgstr ""
 
-#: src/multitrack.c:4993
+#: src/multitrack.c:5163
 #, c-format
 msgid ""
 "\n"
@@ -8536,600 +8550,592 @@
 "It cannot be loaded.\n"
 msgstr ""
 
-#: src/multitrack.c:5329 src/multitrack.c:5338 src/multitrack.c:21133
+#: src/multitrack.c:5452
 msgid "Layout was wiped.\n"
 msgstr ""
 
-#: src/multitrack.c:5374
+#: src/multitrack.c:5547
 #, c-format
 msgid "LiVES-%s: Multitrack %dx%d : %d bpp %.3f fps"
 msgstr ""
 
-#: src/multitrack.c:5617
+#: src/multitrack.c:5793
 msgid "In/out"
 msgstr ""
 
-#: src/multitrack.c:5619
+#: src/multitrack.c:5795
 msgid "FX stack"
 msgstr ""
 
-#: src/multitrack.c:5627 src/omc-learn.c:673
+#: src/multitrack.c:5803 src/omc-learn.c:659
 msgid "Params."
 msgstr ""
 
-#: src/multitrack.c:5978
+#: src/multitrack.c:6157
 msgid "_Open..."
 msgstr ""
 
-#: src/multitrack.c:5996
+#: src/multitrack.c:6175
 msgid "O_pen File Selection..."
 msgstr ""
 
-#: src/multitrack.c:6040
+#: src/multitrack.c:6219
 msgid "Import Selection from _dvd/vcd..."
 msgstr ""
 
-#: src/multitrack.c:6050
+#: src/multitrack.c:6229
 msgid "Import Selection from _dvd"
 msgstr ""
 
-#: src/multitrack.c:6060
+#: src/multitrack.c:6239
 msgid "Import Selection from _vcd"
 msgstr ""
 
-#: src/multitrack.c:6076
+#: src/multitrack.c:6255
 msgid "_Import from Device"
 msgstr ""
 
-#: src/multitrack.c:6103
+#: src/multitrack.c:6282
 msgid "_Close the selected clip"
 msgstr ""
 
-#: src/multitrack.c:6198
+#: src/multitrack.c:6377
 msgid "_Save layout as..."
 msgstr ""
 
-#: src/multitrack.c:6206
+#: src/multitrack.c:6385
 msgid "_Load layout..."
 msgstr ""
 
-#: src/multitrack.c:6210
+#: src/multitrack.c:6389
 msgid "_Wipe/Delete layout..."
 msgstr ""
 
-#: src/multitrack.c:6236
+#: src/multitrack.c:6415
 msgid "_Ignore width, height and audio values from loaded layouts"
 msgstr ""
 
-#: src/multitrack.c:6240
+#: src/multitrack.c:6419
 msgid "Auto load _subtitles with clips"
 msgstr ""
 
-#: src/multitrack.c:6322
+#: src/multitrack.c:6501
 msgid "_CLIP EDITOR"
 msgstr ""
 
-#: src/multitrack.c:6334
+#: src/multitrack.c:6513
 msgid "_Adjust selected clip start/end points"
 msgstr ""
 
-#: src/multitrack.c:6343
+#: src/multitrack.c:6522
 msgid "_Insert selected clip"
 msgstr ""
 
-#: src/multitrack.c:6355
+#: src/multitrack.c:6534
 msgid "_Insert selected clip audio"
 msgstr ""
 
-#: src/multitrack.c:6364
+#: src/multitrack.c:6543
 msgid "_Delete selected block"
 msgstr ""
 
-#: src/multitrack.c:6373
+#: src/multitrack.c:6555
 msgid "_Jump to previous block boundary"
 msgstr ""
 
-#: src/multitrack.c:6382
+#: src/multitrack.c:6564
 msgid "_Jump to next block boundary"
 msgstr ""
 
-#: src/multitrack.c:6395
+#: src/multitrack.c:6577
 msgid "Clear _marks from timeline"
 msgstr ""
 
-#: src/multitrack.c:6403
+#: src/multitrack.c:6585
 msgid "Ignore selection limits when inserting"
 msgstr ""
 
-#: src/multitrack.c:6420 src/multitrack.c:16719
+#: src/multitrack.c:6602 src/multitrack.c:17009
 msgid "_Play from Timeline Position"
 msgstr ""
 
-#: src/multitrack.c:6434
+#: src/multitrack.c:6616
 msgid "Pla_y selected time only"
 msgstr ""
 
-#: src/multitrack.c:6518
+#: src/multitrack.c:6700
 msgid "_Move effects with blocks"
 msgstr ""
 
-#: src/multitrack.c:6531
+#: src/multitrack.c:6713
 msgid "Select _autotransition effect..."
 msgstr ""
 
-#: src/multitrack.c:6542
+#: src/multitrack.c:6724
 msgid "Crossfade audio with autotransition"
 msgstr ""
 
-#: src/multitrack.c:6550
+#: src/multitrack.c:6732
 msgid "View/_Edit selected effect"
 msgstr ""
 
-#: src/multitrack.c:6554
+#: src/multitrack.c:6736
 msgid "_Delete selected effect"
 msgstr ""
 
-#: src/multitrack.c:6562
+#: src/multitrack.c:6744
 msgid "Apply effect to _block..."
 msgstr ""
 
-#: src/multitrack.c:6619
+#: src/multitrack.c:6801
 msgid "Apply effect to _region..."
 msgstr ""
 
-#: src/multitrack.c:6885
+#: src/multitrack.c:7061
 msgid "_Tracks"
 msgstr ""
 
-#: src/multitrack.c:6896
+#: src/multitrack.c:7072
 msgid "Rename current track"
 msgstr ""
 
-#: src/multitrack.c:6904
+#: src/multitrack.c:7080
 msgid "Make _Backing Audio current track"
 msgstr ""
 
-#: src/multitrack.c:6915
+#: src/multitrack.c:7091
 msgid "Add Video Track at _Rear"
 msgstr ""
 
-#: src/multitrack.c:6923
+#: src/multitrack.c:7099
 msgid "Add Video Track at _Front"
 msgstr ""
 
-#: src/multitrack.c:6936
+#: src/multitrack.c:7112
 msgid "_Split current track at cursor"
 msgstr ""
 
-#: src/multitrack.c:6948
+#: src/multitrack.c:7124
 msgid "_Split selected video tracks"
 msgstr ""
 
-#: src/multitrack.c:6961
+#: src/multitrack.c:7137
 msgid "Insert gap in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:6969
+#: src/multitrack.c:7145
 msgid "Insert gap in current track/selected time"
 msgstr ""
 
-#: src/multitrack.c:6981
+#: src/multitrack.c:7157
 msgid "Close all _gaps in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:7007
+#: src/multitrack.c:7183
 msgid "Se_lection"
 msgstr ""
 
-#: src/multitrack.c:7018
+#: src/multitrack.c:7194
 msgid "_Select Current Track"
 msgstr ""
 
-#: src/multitrack.c:7025
+#: src/multitrack.c:7201
 msgid "Select _all video tracks"
 msgstr ""
 
-#: src/multitrack.c:7032
+#: src/multitrack.c:7208
 msgid "Select _no video tracks"
 msgstr ""
 
-#: src/multitrack.c:7039
+#: src/multitrack.c:7215
 msgid "Select all _time"
 msgstr ""
 
-#: src/multitrack.c:7050
+#: src/multitrack.c:7226
 msgid "Select from _zero time"
 msgstr ""
 
-#: src/multitrack.c:7057
+#: src/multitrack.c:7233
 msgid "Select to _end time"
 msgstr ""
 
-#: src/multitrack.c:7064
+#: src/multitrack.c:7240
 msgid "_Copy..."
 msgstr ""
 
-#: src/multitrack.c:7075
+#: src/multitrack.c:7251
 msgid "_Timecode to region start"
 msgstr ""
 
-#: src/multitrack.c:7082
+#: src/multitrack.c:7258
 msgid "_Timecode to region end"
 msgstr ""
 
-#: src/multitrack.c:7089
+#: src/multitrack.c:7265
 msgid "_Region start to timecode"
 msgstr ""
 
-#: src/multitrack.c:7096
+#: src/multitrack.c:7272
 msgid "_Region end to timecode"
 msgstr ""
 
-#: src/multitrack.c:7110
+#: src/multitrack.c:7286
 msgid "Select/deselect block at current track/time"
 msgstr ""
 
-#: src/multitrack.c:7135
+#: src/multitrack.c:7311
 msgid "_Change width, height and audio values..."
 msgstr ""
 
-#: src/multitrack.c:7194
+#: src/multitrack.c:7370
 msgid "_Render"
 msgstr ""
 
-#: src/multitrack.c:7205
+#: src/multitrack.c:7381
 msgid "_Render all to new clip"
 msgstr ""
 
-#: src/multitrack.c:7220
+#: src/multitrack.c:7396
 msgid "Render _video"
 msgstr ""
 
-#: src/multitrack.c:7225
+#: src/multitrack.c:7401
 msgid "Render _audio"
 msgstr ""
 
-#: src/multitrack.c:7235
+#: src/multitrack.c:7411
 msgid "_Normalise rendered audio"
 msgstr ""
 
-#: src/multitrack.c:7242
+#: src/multitrack.c:7418
 msgid "_Pre-render audio"
 msgstr ""
 
-#: src/multitrack.c:7251
+#: src/multitrack.c:7427
 msgid "_View"
 msgstr ""
 
-#: src/multitrack.c:7270
+#: src/multitrack.c:7446
 msgid "Block _In/out points"
 msgstr ""
 
-#: src/multitrack.c:7279
+#: src/multitrack.c:7455
 msgid "_Effects at current"
 msgstr ""
 
-#: src/multitrack.c:7297
+#: src/multitrack.c:7473
 msgid "Audio parameters"
 msgstr ""
 
-#: src/multitrack.c:7308
+#: src/multitrack.c:7484
 msgid "Show backing _audio track"
 msgstr ""
 
-#: src/multitrack.c:7312
+#: src/multitrack.c:7488
 msgid "Compact view"
 msgstr ""
 
-#: src/multitrack.c:7320
+#: src/multitrack.c:7496
 msgid "Maximum tracks to display..."
 msgstr ""
 
-#: src/multitrack.c:7327
+#: src/multitrack.c:7503
 msgid "Scroll to follow playback"
 msgstr ""
 
-#: src/multitrack.c:7331
+#: src/multitrack.c:7507
 msgid "_Center on cursor"
 msgstr ""
 
-#: src/multitrack.c:7338
+#: src/multitrack.c:7514
 msgid "_Zoom in"
 msgstr ""
 
-#: src/multitrack.c:7349
+#: src/multitrack.c:7525
 msgid "_Zoom out"
 msgstr ""
 
-#: src/multitrack.c:7361
+#: src/multitrack.c:7537
 msgid "Multitrack _details"
 msgstr ""
 
-#: src/multitrack.c:7374
+#: src/multitrack.c:7550
 msgid "_Event Window"
 msgstr ""
 
-#: src/multitrack.c:7378
+#: src/multitrack.c:7554
 msgid "_Event Window (selected time only)"
 msgstr ""
 
-#: src/multitrack.c:7382
+#: src/multitrack.c:7558
 msgid "_Show FRAME events"
 msgstr ""
 
-#: src/multitrack.c:7399
+#: src/multitrack.c:7575
 msgid "_Show multitrack keys"
 msgstr ""
 
-#: src/multitrack.c:7468
+#: src/multitrack.c:7644
 msgid "Mouse mode: _Move"
 msgstr ""
 
-#: src/multitrack.c:7476
+#: src/multitrack.c:7652
 msgid "Mouse mode: _Select"
 msgstr ""
 
-#: src/multitrack.c:7505
+#: src/multitrack.c:7681
 msgid "Insert mode: _Normal"
 msgstr ""
 
-#: src/multitrack.c:7733
+#: src/multitrack.c:7909
 msgid "Insert with _audio"
 msgstr ""
 
-#: src/multitrack.c:7734
+#: src/multitrack.c:7910
 msgid ""
 "Select whether video clips are inserted and moved with their audio or not"
 msgstr ""
 
-#: src/multitrack.c:7829
+#: src/multitrack.c:8007
 msgid "Select _overlap"
 msgstr ""
 
-#: src/multitrack.c:7830
+#: src/multitrack.c:8008
 msgid ""
 "Select whether timeline selection snaps to overlap between selected tracks "
 "or not"
 msgstr ""
 
-#: src/multitrack.c:7894 src/multitrack.c:14198
+#: src/multitrack.c:8073 src/multitrack.c:14422
 msgid "Expanded View (d)"
 msgstr ""
 
-#: src/multitrack.c:7897 src/multitrack.c:14205
+#: src/multitrack.c:8076 src/multitrack.c:14428
 msgid "Compact View (d)"
 msgstr ""
 
-#: src/multitrack.c:7939
+#: src/multitrack.c:8118
 msgid "Gravity: _Normal"
 msgstr ""
 
-#: src/multitrack.c:7952
+#: src/multitrack.c:8131
 msgid "Gravity: _Left"
 msgstr ""
 
-#: src/multitrack.c:7967
+#: src/multitrack.c:8146
 msgid "Gravity: _Right"
 msgstr ""
 
-#: src/multitrack.c:8297
+#: src/multitrack.c:8496
 msgid "_Apply"
 msgstr ""
 
-#: src/multitrack.c:8319
+#: src/multitrack.c:8518
 msgid "Time"
 msgstr ""
 
-#: src/multitrack.c:8333
+#: src/multitrack.c:8532
 msgid "_Del. node"
 msgstr ""
 
-#: src/multitrack.c:8341
+#: src/multitrack.c:8540
 msgid "_Next node"
 msgstr ""
 
-#: src/multitrack.c:8349
+#: src/multitrack.c:8548
 msgid "_Prev node"
 msgstr ""
 
-#: src/multitrack.c:8373
+#: src/multitrack.c:8574
 msgid "_Reverse playback  "
 msgstr ""
 
-#: src/multitrack.c:8395
+#: src/multitrack.c:8596
 msgid "_Velocity  "
 msgstr ""
 
-#: src/multitrack.c:8464
+#: src/multitrack.c:8664
 msgid "Anchor _start"
 msgstr ""
 
-#: src/multitrack.c:8465
+#: src/multitrack.c:8665
 msgid "Anchor the start point to the timeline"
 msgstr ""
 
-#: src/multitrack.c:8481
-msgid "Start frame"
-msgstr ""
-
-#: src/multitrack.c:8533
+#: src/multitrack.c:8728
 msgid "Anchor _end"
 msgstr ""
 
-#: src/multitrack.c:8534
+#: src/multitrack.c:8729
 msgid "Anchor the end point to the timeline"
 msgstr ""
 
-#: src/multitrack.c:8546
-msgid "End frame"
-msgstr ""
-
-#: src/multitrack.c:8739
+#: src/multitrack.c:8929
 msgid "Scroll"
 msgstr ""
 
-#: src/multitrack.c:9316
+#: src/multitrack.c:9502
 msgid ""
 "\n"
 "==============================\n"
 "Switched to Clip Edit mode\n"
 msgstr ""
 
-#: src/multitrack.c:9502
+#: src/multitrack.c:9708
 msgid "Timeline (seconds)"
 msgstr ""
 
-#: src/multitrack.c:9984
+#: src/multitrack.c:10202
 msgid " Backing audio"
 msgstr ""
 
-#: src/multitrack.c:9987
+#: src/multitrack.c:10204
 #, c-format
 msgid " Layer %d audio"
 msgstr ""
 
-#: src/multitrack.c:9995
+#: src/multitrack.c:10212
 msgid "Show/hide audio details"
 msgstr ""
 
-#: src/multitrack.c:10010 src/multitrack.c:10232
+#: src/multitrack.c:10227 src/multitrack.c:10452
 #, c-format
 msgid "Layer %d audio"
 msgstr ""
 
-#: src/multitrack.c:10144 src/multitrack.c:10261
+#: src/multitrack.c:10353 src/multitrack.c:10481
 #, c-format
 msgid "%s (layer %d)"
 msgstr ""
 
-#: src/multitrack.c:10184
+#: src/multitrack.c:10403
 msgid "Select track"
 msgstr ""
 
-#: src/multitrack.c:10188
+#: src/multitrack.c:10407
 msgid "Show/hide audio"
 msgstr ""
 
-#: src/multitrack.c:10194
+#: src/multitrack.c:10413
 #, c-format
 msgid "Video %d"
 msgstr ""
 
-#: src/multitrack.c:10233
+#: src/multitrack.c:10453
 #, c-format
 msgid " %s"
 msgstr ""
 
-#: src/multitrack.c:10346
+#: src/multitrack.c:10574
 msgid "LiVES: Selected effect"
 msgstr ""
 
-#: src/multitrack.c:10358
+#: src/multitrack.c:10586
 msgid "_View/Edit this effect"
 msgstr ""
 
-#: src/multitrack.c:10361
+#: src/multitrack.c:10588
 msgid "_View this effect"
 msgstr ""
 
-#: src/multitrack.c:10369
+#: src/multitrack.c:10596
 msgid "_Delete this effect"
 msgstr ""
 
-#: src/multitrack.c:10422
+#: src/multitrack.c:10648
 msgid "Cannot insert after this effect"
 msgstr ""
 
-#: src/multitrack.c:10451
+#: src/multitrack.c:10677
 msgid "This effect cannot be moved"
 msgstr ""
 
-#: src/multitrack.c:10499
+#: src/multitrack.c:10724
 #, c-format
 msgid "  %d to %d selected  "
 msgstr ""
 
-#: src/multitrack.c:10502 src/multitrack.c:10746
+#: src/multitrack.c:10727 src/multitrack.c:10968
 #, c-format
 msgid "%.2f sec."
 msgstr ""
 
-#: src/multitrack.c:10717
+#: src/multitrack.c:10940
 #, c-format
 msgid "%d frames"
 msgstr ""
 
-#: src/multitrack.c:11070
+#: src/multitrack.c:11299
 msgid ""
 "\n"
 "==============================\n"
 "Switched to Multitrack mode\n"
 msgstr ""
 
-#: src/multitrack.c:12691
+#: src/multitrack.c:12939
 msgid "Drag the time slider to where you"
 msgstr ""
 
-#: src/multitrack.c:12692
+#: src/multitrack.c:12940
 msgid "want to set effect parameters"
 msgstr ""
 
-#: src/multitrack.c:12693
+#: src/multitrack.c:12941
 msgid "Set parameters, then click \"Apply\"\n"
 msgstr ""
 
-#: src/multitrack.c:12694
+#: src/multitrack.c:12942
 msgid ""
 "NODES are points where parameters\n"
 "have been set.\n"
 "Nodes can be deleted."
 msgstr ""
 
-#: src/multitrack.c:12697
+#: src/multitrack.c:12944
 msgid "Effect has no parameters.\n"
 msgstr ""
 
-#: src/multitrack.c:12788
+#: src/multitrack.c:13033
 #, c-format
 msgid "%s output"
 msgstr ""
 
-#: src/multitrack.c:12794 src/multitrack.c:12804
+#: src/multitrack.c:13038 src/multitrack.c:13046
 #, c-format
 msgid "layer %d"
 msgstr ""
 
-#: src/multitrack.c:12796 src/multitrack.c:12806
+#: src/multitrack.c:13039 src/multitrack.c:13047
 msgid "audio track"
 msgstr ""
 
-#: src/multitrack.c:12797
+#: src/multitrack.c:13040
 #, c-format
 msgid "%s to %s"
 msgstr ""
 
-#: src/multitrack.c:12807
+#: src/multitrack.c:13048
 #, c-format
 msgid "%s from %s"
 msgstr ""
 
-#: src/multitrack.c:12860
+#: src/multitrack.c:13099
 msgid "_Prev filter map"
 msgstr ""
 
-#: src/multitrack.c:12871
+#: src/multitrack.c:13110
 msgid "Insert _before"
 msgstr ""
 
-#: src/multitrack.c:12881
+#: src/multitrack.c:13120
 msgid "Insert _after"
 msgstr ""
 
-#: src/multitrack.c:12896
+#: src/multitrack.c:13134
 msgid "_Next filter map"
 msgstr ""
 
-#: src/multitrack.c:12911
+#: src/multitrack.c:13148
 msgid ""
 "\n"
 "\n"
@@ -9137,272 +9143,272 @@
 "current time.\n"
 msgstr ""
 
-#: src/multitrack.c:12929
+#: src/multitrack.c:13166
 msgid ""
 "Drag a compositor anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:12936
+#: src/multitrack.c:13173
 msgid ""
 "Drag a transition anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:12944
+#: src/multitrack.c:13181
 msgid ""
 "Effects can be dragged\n"
 "onto blocks on the timeline."
 msgstr ""
 
-#: src/multitrack.c:13166
+#: src/multitrack.c:13406
 msgid "LiVES: Selected block/frame"
 msgstr ""
 
-#: src/multitrack.c:13173
+#: src/multitrack.c:13413
 msgid "_Select this block"
 msgstr ""
 
-#: src/multitrack.c:13183
+#: src/multitrack.c:13423
 msgid "_Split block here"
 msgstr ""
 
-#: src/multitrack.c:13191
+#: src/multitrack.c:13431
 msgid "List _effects here"
 msgstr ""
 
-#: src/multitrack.c:13200 src/multitrack.c:13277
+#: src/multitrack.c:13440 src/multitrack.c:13518
 #, c-format
 msgid "_Adjust %s"
 msgstr ""
 
-#: src/multitrack.c:13215
+#: src/multitrack.c:13455
 msgid "_Delete this block"
 msgstr ""
 
-#: src/multitrack.c:13258
+#: src/multitrack.c:13500
 msgid "_Insert here"
 msgstr ""
 
-#: src/multitrack.c:13264
+#: src/multitrack.c:13505
 msgid "_Insert audio here"
 msgstr ""
 
-#: src/multitrack.c:14801
+#: src/multitrack.c:15017
 #, c-format
 msgid "Inserted gap in selected tracks from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:14835
+#: src/multitrack.c:15048
 #, c-format
 msgid "Inserted gap in track %s from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15036
+#: src/multitrack.c:15244
 #, c-format
 msgid "Undid %s\n"
 msgstr ""
 
-#: src/multitrack.c:15235
+#: src/multitrack.c:15445
 #, c-format
 msgid "Redid %s\n"
 msgstr ""
 
-#: src/multitrack.c:15268
+#: src/multitrack.c:15475
 msgid ""
 "\n"
 " (variable)"
 msgstr ""
 
-#: src/multitrack.c:15502 src/multitrack.c:15614 src/multitrack.c:18736
-#: src/multitrack.c:18748
+#: src/multitrack.c:15710 src/multitrack.c:15823 src/multitrack.c:19077
+#: src/multitrack.c:19089
 #, c-format
 msgid "track %s"
 msgstr ""
 
-#: src/multitrack.c:15507 src/multitrack.c:15619 src/multitrack.c:18741
+#: src/multitrack.c:15715 src/multitrack.c:15828 src/multitrack.c:19082
 #, c-format
 msgid "tracks %s and %s"
 msgstr ""
 
-#: src/multitrack.c:15513 src/multitrack.c:15625 src/multitrack.c:18751
+#: src/multitrack.c:15721 src/multitrack.c:15834 src/multitrack.c:19091
 msgid "selected tracks"
 msgstr ""
 
-#: src/multitrack.c:15516
+#: src/multitrack.c:15726
 #, c-format
 msgid "Added %s %s to %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15550
+#: src/multitrack.c:15760
 #, c-format
 msgid "Added effect %s to track %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15631
+#: src/multitrack.c:15845
 #, c-format
 msgid "Deleted %s %s from %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15935
+#: src/multitrack.c:16143
 #, c-format
 msgid "rendered %d frames to new clip.\n"
 msgstr ""
 
-#: src/multitrack.c:16025
+#: src/multitrack.c:16230
 msgid "Cleaning up..."
 msgstr ""
 
-#: src/multitrack.c:16712
+#: src/multitrack.c:17003
 msgid "_Pause"
 msgstr ""
 
-#: src/multitrack.c:16713
+#: src/multitrack.c:17004
 msgid "Pause (p)"
 msgstr ""
 
-#: src/multitrack.c:16856
+#: src/multitrack.c:17151
 msgid "Press 'm' during playback"
 msgstr ""
 
-#: src/multitrack.c:16857
+#: src/multitrack.c:17152
 msgid "to make a mark on the timeline"
 msgstr ""
 
-#: src/multitrack.c:17154
+#: src/multitrack.c:17498
 #, c-format
 msgid ""
 "Inserted audio %.4f to %.4f from clip %s into backing audio from time %.4f "
 "to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:17414
+#: src/multitrack.c:17759
 #, c-format
 msgid ""
 "Inserted frames %d to %d from clip %s into track %s from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:17998
+#: src/multitrack.c:18332
 #, c-format
 msgid ""
 "Time region %.3f to %.3f\n"
 "selected.\n"
 msgstr ""
 
-#: src/multitrack.c:18002
+#: src/multitrack.c:18336
 msgid ""
 "select one or more tracks\n"
 "to create a region.\n"
 msgstr ""
 
-#: src/multitrack.c:18004
+#: src/multitrack.c:18337
 #, c-format
 msgid "%d video tracks selected.\n"
 msgstr ""
 
-#: src/multitrack.c:18006
+#: src/multitrack.c:18339
 msgid ""
 "Double click on timeline\n"
 "to deselect time region."
 msgstr ""
 
-#: src/multitrack.c:18013
+#: src/multitrack.c:18346
 msgid ""
 "Single click on an effect\n"
 "to select it."
 msgstr ""
 
-#: src/multitrack.c:18014
+#: src/multitrack.c:18347
 msgid ""
 "Double click on an effect\n"
 "to edit it."
 msgstr ""
 
-#: src/multitrack.c:18015
+#: src/multitrack.c:18348
 msgid ""
 "Right click on an effect\n"
 "for context menu.\n"
 msgstr ""
 
-#: src/multitrack.c:18017
+#: src/multitrack.c:18350
 msgid ""
 "Effect order can be changed at\n"
 "FILTER MAPS"
 msgstr ""
 
-#: src/multitrack.c:18024
+#: src/multitrack.c:18357
 msgid ""
 "You can select an effect,\n"
 "then use the INSERT BEFORE"
 msgstr ""
 
-#: src/multitrack.c:18025
+#: src/multitrack.c:18358
 msgid "or INSERT AFTER buttons to move it."
 msgstr ""
 
-#: src/multitrack.c:18307 src/multitrack.c:18320
+#: src/multitrack.c:18639 src/multitrack.c:18652
 msgid "Click on another effect,"
 msgstr ""
 
-#: src/multitrack.c:18308 src/multitrack.c:18321
+#: src/multitrack.c:18640 src/multitrack.c:18653
 msgid ""
 "and the selected one\n"
 "will be inserted"
 msgstr ""
 
-#: src/multitrack.c:18309
+#: src/multitrack.c:18641
 msgid "after it.\n"
 msgstr ""
 
-#: src/multitrack.c:18322
+#: src/multitrack.c:18654
 msgid "before it.\n"
 msgstr ""
 
-#: src/multitrack.c:18551
+#: src/multitrack.c:18889
 #, c-format
 msgid "Removed parameter values for effect %s at time %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:18759
+#: src/multitrack.c:19100
 #, c-format
 msgid "Set parameter values for %s %s on %s at time %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:19251 src/multitrack.c:20873
+#: src/multitrack.c:19630 src/multitrack.c:21195
 msgid "_Autoreload each time"
 msgstr ""
 
-#: src/multitrack.c:19323
+#: src/multitrack.c:19702
 #, fuzzy
 msgid "Saving layout"
 msgstr "_Spremi izgled"
 
-#: src/multitrack.c:19345
+#: src/multitrack.c:19725
 #, c-format
 msgid "Saved layout to %s\n"
 msgstr ""
 
-#: src/multitrack.c:20783
+#: src/multitrack.c:21125
 msgid "clips and frames"
 msgstr ""
 
-#: src/multitrack.c:20787
+#: src/multitrack.c:21128
 msgid "clips"
 msgstr ""
 
-#: src/multitrack.c:20790
+#: src/multitrack.c:21130
 msgid "frames"
 msgstr ""
 
-#: src/multitrack.c:20800
+#: src/multitrack.c:21140
 msgid ""
 "\n"
 "Auto reload layout.\n"
 msgstr ""
 
-#: src/multitrack.c:20803
+#: src/multitrack.c:21143
 #, c-format
 msgid ""
 "%s\n"
@@ -9410,42 +9416,42 @@
 "Therefore it could not be loaded properly.\n"
 msgstr ""
 
-#: src/multitrack.c:20920
+#: src/multitrack.c:21284
 msgid "auto backup"
 msgstr ""
 
-#: src/multitrack.c:20923
+#: src/multitrack.c:21287
 #, c-format
 msgid ""
 "\n"
 "Unable to load layout file %s\n"
 msgstr ""
 
-#: src/multitrack.c:20944
+#: src/multitrack.c:21308
 #, c-format
 msgid "Loading layout from %s..."
 msgstr ""
 
-#: src/multitrack.c:20978
+#: src/multitrack.c:21338
 #, c-format
 msgid "Got %d events...processing..."
 msgstr ""
 
-#: src/multitrack.c:20991
+#: src/multitrack.c:21349
 msgid "Checking and rebuilding event list"
 msgstr ""
 
-#: src/multitrack.c:21017
+#: src/multitrack.c:21374
 #, c-format
 msgid "%d errors detected.\n"
 msgstr ""
 
-#: src/multitrack.c:21068
+#: src/multitrack.c:21422
 #, c-format
 msgid "Multitrack fps set to %.3f\n"
 msgstr ""
 
-#: src/multitrack.c:21225
+#: src/multitrack.c:21576
 #, fuzzy
 msgid ""
 "The current layout has changes which have not been saved.\n"
@@ -9454,59 +9460,59 @@
 "Trenutni izgled nije spremljena.\n"
 "Što želite učiniti?\n"
 
-#: src/multitrack.c:22047
+#: src/multitrack.c:22385
 msgid "LiVES: Multitrack audio mixer"
 msgstr ""
 
-#: src/multitrack.c:22077
+#: src/multitrack.c:22414
 msgid "_Reset values"
 msgstr ""
 
-#: src/multitrack.c:22081
+#: src/multitrack.c:22418
 msgid "_Close mixer"
 msgstr ""
 
-#: src/multitrack.c:22130
+#: src/multitrack.c:22466
 msgid ""
 "_Invert backing audio\n"
 "and layer volumes"
 msgstr ""
 
-#: src/multitrack.c:22132
+#: src/multitrack.c:22468
 msgid "Adjust backing and layer audio values so that they sum to 1.0"
 msgstr ""
 
-#: src/multitrack.c:22175
+#: src/multitrack.c:22510
 msgid "_Gang layer audio"
 msgstr ""
 
-#: src/multitrack.c:22177
+#: src/multitrack.c:22512
 msgid "Adjust all layer audio values to the same value"
 msgstr ""
 
-#: src/jack.c:104
+#: src/jack.c:102
 msgid "JACK server started\n"
 msgstr ""
 
-#: src/jack.c:1284 src/jack.c:1353
+#: src/jack.c:1265 src/jack.c:1334
 msgid "Unable to connect to JACK server\n"
 msgstr ""
 
-#: src/jack.c:1512
+#: src/jack.c:1491
 msgid "Started jack audio subsystem.\n"
 msgstr ""
 
-#: src/jack.c:1623
+#: src/jack.c:1600
 msgid "Started jack audio reader.\n"
 msgstr ""
 
-#: src/jack.c:1838
+#: src/jack.c:1815
 msgid ""
 "\n"
 "Connection to jack audio was reset.\n"
 msgstr ""
 
-#: src/pulse.c:87
+#: src/pulse.c:88
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -9514,7 +9520,7 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:92
+#: src/pulse.c:94
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -9522,7 +9528,7 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:96
+#: src/pulse.c:99
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -9530,335 +9536,335 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:101
+#: src/pulse.c:104
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
 msgstr ""
 
-#: src/pulse.c:107
+#: src/pulse.c:109
 msgid "LiVES will exit and you can choose another audio player.\n"
 msgstr ""
 
-#: src/pulse.c:1352
+#: src/pulse.c:1335
 msgid ""
 "\n"
 "Connection to pulse audio was reset.\n"
 msgstr ""
 
-#: src/colourspace.c:1100
+#: src/colourspace.c:1092
 msgid "unclamped"
 msgstr ""
 
-#: src/colourspace.c:1101
+#: src/colourspace.c:1093
 msgid "clamped"
 msgstr ""
 
-#: src/omc-learn.c:195
+#: src/omc-learn.c:191
 #, c-format
 msgid "Responding to joystick events from %s\n"
 msgstr ""
 
-#: src/omc-learn.c:289
+#: src/omc-learn.c:279
 msgid "Creating ALSA seq port..."
 msgstr ""
 
-#: src/omc-learn.c:325
+#: src/omc-learn.c:313
 #, c-format
 msgid "Responding to MIDI events from %s\n"
 msgstr ""
 
-#: src/omc-learn.c:568
+#: src/omc-learn.c:554
 msgid "data"
 msgstr ""
 
-#: src/omc-learn.c:571
+#: src/omc-learn.c:557
 msgid "velocity"
 msgstr ""
 
-#: src/omc-learn.c:572
+#: src/omc-learn.c:558
 msgid "note"
 msgstr ""
 
-#: src/omc-learn.c:574 src/omc-learn.c:736 src/omc-learn.c:1105
-#: src/omc-learn.c:1591 src/omc-learn.c:1640
+#: src/omc-learn.c:560 src/omc-learn.c:724 src/omc-learn.c:1092
+#: src/omc-learn.c:1581 src/omc-learn.c:1630
 msgid "value"
 msgstr ""
 
-#: src/omc-learn.c:576
+#: src/omc-learn.c:562
 msgid "state"
 msgstr ""
 
-#: src/omc-learn.c:688
+#: src/omc-learn.c:674
 msgid "variable"
 msgstr ""
 
-#: src/omc-learn.c:1001
+#: src/omc-learn.c:989
 msgid "Vars."
 msgstr ""
 
-#: src/omc-learn.c:1054
+#: src/omc-learn.c:1041
 #, c-format
 msgid "MIDI ch %d note on"
 msgstr ""
 
-#: src/omc-learn.c:1058
+#: src/omc-learn.c:1045
 #, c-format
 msgid "MIDI ch %d note off"
 msgstr ""
 
-#: src/omc-learn.c:1062
+#: src/omc-learn.c:1049
 #, c-format
 msgid "MIDI ch %d controller %d"
 msgstr ""
 
-#: src/omc-learn.c:1066
+#: src/omc-learn.c:1053
 #, c-format
 msgid "MIDI ch %d pitch bend"
 msgstr ""
 
-#: src/omc-learn.c:1070
+#: src/omc-learn.c:1057
 #, c-format
 msgid "MIDI ch %d pgm change"
 msgstr ""
 
-#: src/omc-learn.c:1073
+#: src/omc-learn.c:1060
 #, c-format
 msgid "Joystick button %d"
 msgstr ""
 
-#: src/omc-learn.c:1076
+#: src/omc-learn.c:1063
 #, c-format
 msgid "Joystick axis %d"
 msgstr ""
 
-#: src/omc-learn.c:1113
+#: src/omc-learn.c:1100
 msgid "x"
 msgstr ""
 
-#: src/omc-learn.c:1122
+#: src/omc-learn.c:1109
 msgid "range"
 msgstr ""
 
-#: src/omc-learn.c:1143
+#: src/omc-learn.c:1130
 msgid "+ offset1"
 msgstr ""
 
-#: src/omc-learn.c:1161
+#: src/omc-learn.c:1150
 msgid "* scale"
 msgstr ""
 
-#: src/omc-learn.c:1179
+#: src/omc-learn.c:1170
 msgid "+ offset2"
 msgstr ""
 
-#: src/omc-learn.c:1280
+#: src/omc-learn.c:1270
 msgid ""
 "\n"
 "Click OK to delete all entries\n"
 msgstr ""
 
-#: src/omc-learn.c:1318
+#: src/omc-learn.c:1308
 msgid "LiVES: OMC learner"
 msgstr ""
 
-#: src/omc-learn.c:1334
+#: src/omc-learn.c:1324
 msgid "Clear _unmatched"
 msgstr ""
 
-#: src/omc-learn.c:1345
+#: src/omc-learn.c:1335
 msgid "_Delete all"
 msgstr ""
 
-#: src/omc-learn.c:1411
+#: src/omc-learn.c:1401
 msgid "Start video playback"
 msgstr ""
 
-#: src/omc-learn.c:1414
+#: src/omc-learn.c:1404
 msgid "Stop video playback"
 msgstr ""
 
-#: src/omc-learn.c:1418
+#: src/omc-learn.c:1408
 msgid "Clip select <clipnum>"
 msgstr ""
 
-#: src/omc-learn.c:1419
+#: src/omc-learn.c:1409
 msgid "Switch foreground clip to the nth valid clip"
 msgstr ""
 
-#: src/omc-learn.c:1423
+#: src/omc-learn.c:1413
 msgid "Play forwards"
 msgstr ""
 
-#: src/omc-learn.c:1424
+#: src/omc-learn.c:1414
 msgid "Play video in a forwards direction"
 msgstr ""
 
-#: src/omc-learn.c:1427
+#: src/omc-learn.c:1417
 msgid "Play backwards"
 msgstr ""
 
-#: src/omc-learn.c:1428
+#: src/omc-learn.c:1418
 msgid "Play video in a backwards direction"
 msgstr ""
 
-#: src/omc-learn.c:1431
+#: src/omc-learn.c:1421
 msgid "Reverse playback direction"
 msgstr ""
 
-#: src/omc-learn.c:1432
+#: src/omc-learn.c:1422
 msgid "Reverse direction of video playback"
 msgstr ""
 
-#: src/omc-learn.c:1435
+#: src/omc-learn.c:1425
 msgid "Play video faster"
 msgstr ""
 
-#: src/omc-learn.c:1436
+#: src/omc-learn.c:1426
 msgid "Play video at a slightly faster rate"
 msgstr ""
 
-#: src/omc-learn.c:1439
+#: src/omc-learn.c:1429
 msgid "Play video slower"
 msgstr ""
 
-#: src/omc-learn.c:1440
+#: src/omc-learn.c:1430
 msgid "Play video at a slightly slower rate"
 msgstr ""
 
-#: src/omc-learn.c:1443
+#: src/omc-learn.c:1433
 msgid "Toggle video freeze"
 msgstr ""
 
-#: src/omc-learn.c:1444
+#: src/omc-learn.c:1434
 msgid "Freeze video, or if already frozen, unfreeze it"
 msgstr ""
 
-#: src/omc-learn.c:1447
+#: src/omc-learn.c:1437
 msgid "Set video framerate to <fps>"
 msgstr ""
 
-#: src/omc-learn.c:1448
+#: src/omc-learn.c:1438
 msgid "Set framerate of foreground clip to <float fps>"
 msgstr ""
 
-#: src/omc-learn.c:1452
+#: src/omc-learn.c:1442
 msgid "Start recording"
 msgstr ""
 
-#: src/omc-learn.c:1455
+#: src/omc-learn.c:1445
 msgid "Stop recording"
 msgstr ""
 
-#: src/omc-learn.c:1458
+#: src/omc-learn.c:1448
 msgid "Toggle recording state"
 msgstr ""
 
-#: src/omc-learn.c:1461
+#: src/omc-learn.c:1451
 msgid "Swap foreground and background clips"
 msgstr ""
 
-#: src/omc-learn.c:1463
+#: src/omc-learn.c:1453
 msgid "Reset effect keys"
 msgstr ""
 
-#: src/omc-learn.c:1464
+#: src/omc-learn.c:1454
 msgid "Switch all effects off."
 msgstr ""
 
-#: src/omc-learn.c:1467
+#: src/omc-learn.c:1457
 msgid "Enable effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1471
+#: src/omc-learn.c:1461
 msgid "Disable effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1475
+#: src/omc-learn.c:1465
 msgid "Toggle effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1479
+#: src/omc-learn.c:1469
 msgid "Set parameter value <key> <pnum> = <value>"
 msgstr ""
 
-#: src/omc-learn.c:1480
+#: src/omc-learn.c:1470
 msgid "Set <value> of pth (numerical) parameter for effect key <key>."
 msgstr ""
 
-#: src/omc-learn.c:1484
+#: src/omc-learn.c:1474
 msgid "Switch foreground to next clip"
 msgstr ""
 
-#: src/omc-learn.c:1487
+#: src/omc-learn.c:1477
 msgid "Switch foreground to previous clip"
 msgstr ""
 
-#: src/omc-learn.c:1490
+#: src/omc-learn.c:1480
 msgid "Set video framerate to ratio <fps_ratio>"
 msgstr ""
 
-#: src/omc-learn.c:1491
+#: src/omc-learn.c:1481
 msgid "Set framerate ratio of foreground clip to <float fps_ratio>"
 msgstr ""
 
-#: src/omc-learn.c:1495
+#: src/omc-learn.c:1485
 msgid "Retrigger clip <clipnum>"
 msgstr ""
 
-#: src/omc-learn.c:1496
+#: src/omc-learn.c:1486
 msgid ""
 "Switch foreground clip to the nth valid clip, and reset the frame number"
 msgstr ""
 
-#: src/omc-learn.c:1500
+#: src/omc-learn.c:1490
 msgid "Cycle to next mode for effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1504
+#: src/omc-learn.c:1494
 msgid "Cycle to previous mode for effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1508
+#: src/omc-learn.c:1498
 msgid "Set playback plugin parameter value <pnum> = <value>"
 msgstr ""
 
-#: src/omc-learn.c:1509
+#: src/omc-learn.c:1499
 msgid "Set <value> of pth parameter for the playback plugin."
 msgstr ""
 
 #. TRANSLATORS: short form of "clip number"
-#: src/omc-learn.c:1536 src/omc-learn.c:1607
+#: src/omc-learn.c:1526 src/omc-learn.c:1597
 msgid "clipnum"
 msgstr ""
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1545
+#: src/omc-learn.c:1535
 msgid "fps"
 msgstr ""
 
 #. TRANSLATORS: as in keyboard key
-#: src/omc-learn.c:1553 src/omc-learn.c:1560 src/omc-learn.c:1567
-#: src/omc-learn.c:1575 src/omc-learn.c:1615 src/omc-learn.c:1623
+#: src/omc-learn.c:1543 src/omc-learn.c:1550 src/omc-learn.c:1557
+#: src/omc-learn.c:1565 src/omc-learn.c:1605 src/omc-learn.c:1613
 msgid "key"
 msgstr ""
 
 #. TRANSLATORS: short form of "parameter number"
-#: src/omc-learn.c:1583 src/omc-learn.c:1632
+#: src/omc-learn.c:1573 src/omc-learn.c:1622
 msgid "pnum"
 msgstr ""
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1599
+#: src/omc-learn.c:1589
 msgid "fps_ratio"
 msgstr ""
 
-#: src/omc-learn.c:2443
+#: src/omc-learn.c:2417
 #, c-format
 msgid "Saving device mapping to file %s..."
 msgstr ""
 
-#: src/omc-learn.c:2527
+#: src/omc-learn.c:2498
 #, c-format
 msgid ""
 "\n"
@@ -9867,7 +9873,7 @@
 "%s\n"
 msgstr ""
 
-#: src/omc-learn.c:2534
+#: src/omc-learn.c:2505
 #, c-format
 msgid ""
 "\n"
@@ -9876,12 +9882,12 @@
 "%s\n"
 msgstr ""
 
-#: src/omc-learn.c:2571
+#: src/omc-learn.c:2541
 #, c-format
 msgid "Loading device mapping from file %s..."
 msgstr ""
 
-#: src/omc-learn.c:2576
+#: src/omc-learn.c:2544
 #, c-format
 msgid ""
 "\n"
@@ -9891,12 +9897,12 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/videodev.c:547
+#: src/videodev.c:539
 #, c-format
 msgid "Unable to open device %s\n"
 msgstr ""
 
-#: src/videodev.c:564
+#: src/videodev.c:554
 #, c-format
 msgid "Opened device %s\n"
 msgstr ""
@@ -10484,3 +10490,10 @@
 #~ msgstr ""
 #~ "LiVES nije bio u mogućnosti to hvatanje ovu sliku\n"
 #~ "\n"
+
+#, fuzzy
+#~ msgid "LiVES audio error."
+#~ msgstr "LiVES: - Umetni"
+
+#~ msgid "Pause"
+#~ msgstr "Pauza"

LiVES-2.2.8.tar.bz2/po/hu.po -> LiVES-2.4.1.tar.bz2/po/hu.po Changed

@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: hu\n"
 "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n"
-"POT-Creation-Date: 2015-02-08 17:18-0300\n"
+"POT-Creation-Date: 2015-08-09 14:52-0300\n"
 "PO-Revision-Date: 2012-08-08 08:49+0000\n"
 "Last-Translator: Krasznecz Zoltán <zoltan.krasznecz@gmail.com>\n"
 "Language-Team: Magyar <lisovszki@gmail.com>\n"
@@ -18,8 +18,7 @@
 "X-Launchpad-Export-Date: 2012-08-15 00:36+0000\n"
 "X-Generator: Launchpad (build 15801)\n"
 
-#. TRANSLATORS: do not translate this message
-#: src/main.c:118
+#: src/main.c:128
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -28,22 +27,22 @@
 "http://lives.sourceforge.net/TRANS-README.txt"
 msgstr ""
 
-#: src/main.c:134
+#: src/main.c:153
 #, c-format
 msgid "%s Warning: %s\n"
 msgstr ""
 
-#: src/main.c:138
+#: src/main.c:157
 #, c-format
 msgid "%s Critical error: %s\n"
 msgstr ""
 
-#: src/main.c:139
+#: src/main.c:158
 #, c-format
 msgid "%s Fatal error: %s\n"
 msgstr ""
 
-#: src/main.c:176
+#: src/main.c:198
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -57,7 +56,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:177
+#: src/main.c:199
 msgid ""
 "\n"
 "\n"
@@ -69,7 +68,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:180
+#: src/main.c:203
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -77,7 +76,7 @@
 "és minden lent szereplő információt:\n"
 "\n"
 
-#: src/main.c:184
+#: src/main.c:206
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
@@ -87,84 +86,84 @@
 "beiktatásával, hogy további információkat tudhass meg.\n"
 "\n"
 
-#: src/main.c:192
+#: src/main.c:216
 msgid "Preserving set.\n"
 msgstr "Tartós beállítás.\n"
 
-#: src/main.c:636
+#: src/main.c:691
 msgid "Resizing"
 msgstr "Átméretezés"
 
-#: src/main.c:643
+#: src/main.c:698
 msgid "_Resize All Frames"
 msgstr "_Minden képkocka átméretezése"
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:895
+#: src/main.c:948
 msgid "Any"
 msgstr "Bármely"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:897
+#: src/main.c:950
 msgid "None"
 msgstr "Nincs"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:899
+#: src/main.c:952
 msgid "recommended"
 msgstr "ajánlott"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:901
+#: src/main.c:954
 msgid "disabled !"
 msgstr "tíltva!"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:903
+#: src/main.c:956
 msgid "**The current layout**"
 msgstr "**A jelenlegi kimenet**"
 
 #. TRANSLATORS: adjective for "Built in" type effects
-#: src/main.c:905
+#: src/main.c:958
 msgid "Builtin"
 msgstr "Beépített"
 
 #. TRANSLATORS: adjective for "Custom" type effects
-#: src/main.c:907
+#: src/main.c:960
 msgid "Custom"
 msgstr "Egyéni"
 
 #. TRANSLATORS: adjective for "Test" type effects
-#: src/main.c:909
+#: src/main.c:962
 msgid "Test"
 msgstr "Teszt"
 
-#: src/main.c:1054
+#: src/main.c:1107
 msgid "Foreground"
 msgstr ""
 
-#: src/main.c:1055
+#: src/main.c:1108
 #, fuzzy
 msgid "Background"
 msgstr "_Üres háttér"
 
-#: src/main.c:1566
+#: src/main.c:1624
 msgid "Loading realtime effect plugins..."
 msgstr "Az azonnali effektek betöltése..."
 
-#: src/main.c:1631
+#: src/main.c:1690
 msgid "Starting jack audio server..."
 msgstr "Jack audió szerver indítása"
 
-#: src/main.c:1633
+#: src/main.c:1692
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1634
+#: src/main.c:1693
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1663
+#: src/main.c:1723
 #, c-format
 msgid ""
 "\n"
@@ -176,114 +175,114 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1697
+#: src/main.c:1758
 msgid "Starting pulse audio server..."
 msgstr "Pulse audio szerver indítása..."
 
-#: src/main.c:1765
+#: src/main.c:1825
 msgid "Checking optional dependencies:"
 msgstr "Ajánlott függőségek ellenőrzése"
 
-#: src/main.c:1766
+#: src/main.c:1826
 msgid "mplayer...detected..."
 msgstr "mplayer...megtalálva"
 
-#: src/main.c:1767
+#: src/main.c:1827
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...NEM TALÁLOM.."
 
-#: src/main.c:1768
+#: src/main.c:1828
 #, fuzzy
 msgid "mplayer2...detected..."
 msgstr "mplayer...megtalálva"
 
-#: src/main.c:1769
+#: src/main.c:1829
 #, fuzzy
 msgid "mplayer2...NOT DETECTED..."
 msgstr "mplayer...NEM TALÁLOM.."
 
-#: src/main.c:1770
+#: src/main.c:1830
 msgid "convert...detected..."
 msgstr "convert...megtalálva"
 
-#: src/main.c:1771
+#: src/main.c:1831
 msgid "convert...NOT DETECTED..."
 msgstr "convert...NEM TALÁLOM"
 
-#: src/main.c:1772
+#: src/main.c:1832
 msgid "composite...detected..."
 msgstr "composite...megtalálva..."
 
-#: src/main.c:1773
+#: src/main.c:1833
 msgid "composite...NOT DETECTED..."
 msgstr "composite...NEM TALÁLOM"
 
-#: src/main.c:1774
+#: src/main.c:1834
 msgid "sox...detected\n"
 msgstr "sox...megtalálva\n"
 
-#: src/main.c:1775
+#: src/main.c:1835
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...NEM TALÁLOM\n"
 
-#: src/main.c:1776
+#: src/main.c:1836
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...megtalálva..."
 
-#: src/main.c:1777
+#: src/main.c:1837
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...NEM TALÁLOM..."
 
-#: src/main.c:1778
+#: src/main.c:1838
 msgid "jackd...detected..."
 msgstr "jackd...megtalálva..."
 
-#: src/main.c:1779
+#: src/main.c:1839
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...NEM TALÁLOM..."
 
-#: src/main.c:1780
+#: src/main.c:1840
 msgid "pulse audio...detected..."
 msgstr "pulse audio...megtalálva..."
 
-#: src/main.c:1781
+#: src/main.c:1841
 msgid "pulse audio...NOT DETECTED..."
 msgstr "pulse audio...NEM TALÁLOM..."
 
-#: src/main.c:1782
+#: src/main.c:1842
 msgid "python...detected..."
 msgstr "python...megtalálva..."
 
-#: src/main.c:1783
+#: src/main.c:1843
 msgid "python...NOT DETECTED..."
 msgstr "python...NEM TALÁLOM..."
 
-#: src/main.c:1784
+#: src/main.c:1844
 msgid "dvgrab...detected..."
 msgstr "dvgrab...megtalálva..."
 
-#: src/main.c:1785
+#: src/main.c:1845
 msgid "dvgrab...NOT DETECTED..."
 msgstr "dvgrab...NEM TALÁLOM..."
 
-#: src/main.c:1786
+#: src/main.c:1846
 msgid "xwininfo...detected..."
 msgstr "xwininfo...megtalálva..."
 
-#: src/main.c:1787
+#: src/main.c:1847
 msgid "xwininfo...NOT DETECTED..."
 msgstr "xwininfo...NEM TALÁLOM..."
 
-#: src/main.c:1793
+#: src/main.c:1853
 #, c-format
 msgid "Windows version %04X"
 msgstr ""
 
-#: src/main.c:1795
+#: src/main.c:1855
 msgid "UNKNOWN - please patch me !"
 msgstr ""
 
-#: src/main.c:1799
+#: src/main.c:1859
 #, c-format
 msgid ""
 "\n"
@@ -294,48 +293,48 @@
 "\n"
 "Az ablakkezelő jelenti: \"%s\"; "
 
-#: src/main.c:1802
+#: src/main.c:1862
 #, c-format
 msgid "number of monitors detected: %d\n"
 msgstr "monitorok száma: %d\n"
 
-#: src/main.c:1805
+#: src/main.c:1865
 #, fuzzy, c-format
 msgid "Number of CPUs detected: %d "
 msgstr "monitorok száma: %d\n"
 
-#: src/main.c:1808 src/multitrack.c:4902
+#: src/main.c:1868 src/multitrack.c:5068
 msgid "little endian"
 msgstr "kicsi endian"
 
-#: src/main.c:1809 src/multitrack.c:4901
+#: src/main.c:1869 src/multitrack.c:5067
 msgid "big endian"
 msgstr "nagy endian"
 
-#: src/main.c:1810
+#: src/main.c:1870
 #, c-format
 msgid "(%d bits, %s)\n"
 msgstr ""
 
-#: src/main.c:1814
+#: src/main.c:1874
 msgid "GUI type is: "
 msgstr ""
 
-#: src/main.c:1818
+#: src/main.c:1878
 #, c-format
 msgid "GTK+ version %d.%d.%d (compiled with %d.%d.%d)"
 msgstr ""
 
-#: src/main.c:1840
+#: src/main.c:1900
 msgid ", with cairo support"
 msgstr ""
 
-#: src/main.c:1847
+#: src/main.c:1907
 #, c-format
 msgid "Temp directory is %s\n"
 msgstr "Az átmeneti könyvtár: %s\n"
 
-#: src/main.c:1851
+#: src/main.c:1911
 msgid ""
 "WARNING - this version of LiVES was compiled without either\n"
 "jack or pulse audio support.\n"
@@ -345,15 +344,15 @@
 "jack hangrendszer nélkül lett szerkesztve.\n"
 "A legtöbb hangszerkesztési lehetőség nem lesz elérhető.\n"
 
-#: src/main.c:1854
+#: src/main.c:1914
 msgid "Compiled with jack support, good !\n"
 msgstr "Jack támogatással összeállítva. Jóó !\n"
 
-#: src/main.c:1857
+#: src/main.c:1917
 msgid "Compiled with pulse audio support, wonderful !\n"
 msgstr "Pulse audio támogatással összeszerkesztve. Csodálatos :)!\n"
 
-#: src/main.c:1861
+#: src/main.c:1921
 #, c-format
 msgid ""
 "Welcome to LiVES version %s.\n"
@@ -362,7 +361,7 @@
 "Légy üdvözölve a LiVES %s verziójában.\n"
 "\n"
 
-#: src/main.c:2306
+#: src/main.c:2380
 #, c-format
 msgid ""
 "\n"
@@ -371,85 +370,90 @@
 "\n"
 "Az indító szintax: %s [opts] [fájlnév [eleje] [képkockák]]\n"
 
-#: src/main.c:2307
+#: src/main.c:2381
 msgid "Where: filename is the name of a media file or backup file.\n"
 msgstr "Ahol: a fájlnév a média, vagy a biztonsági mentés fájl neve.\n"
 
-#: src/main.c:2308
+#: src/main.c:2382
 msgid "start_time : filename start time in seconds\n"
 msgstr "eleje : a fájlnév eleje másodpercben\n"
 
-#: src/main.c:2309
+#: src/main.c:2383
 msgid "frames : maximum number of frames to open\n"
 msgstr "képkockák : a maximálisan megnyitott képkockák száma\n"
 
-#: src/main.c:2311
+#: src/main.c:2385
 msgid "opts can be:\n"
 msgstr "opts lehet:\n"
 
-#: src/main.c:2312
+#: src/main.c:2386
 msgid "-help            : show this help text and exit\n"
 msgstr "-help             : mutasd ezt a súgó szöveget, majd lépj ki\n"
 
-#: src/main.c:2313
+#: src/main.c:2387
 msgid "-tmpdir <tempdir>: use alternate working directory (e.g /var/ramdisk)\n"
 msgstr ""
 
-#: src/main.c:2314
+#: src/main.c:2388
 msgid "-set <setname>   : autoload clip set setname\n"
 msgstr "-set<setname>    :automatikusan betölti a klip beállításait\n"
 
-#: src/main.c:2315
+#: src/main.c:2389
 msgid "-noset           : do not load any set on startup\n"
 msgstr "-noset           : ne töltsön be semmiféle beállítást az indításnál\n"
 
-#: src/main.c:2316
+#: src/main.c:2390
 msgid "-norecover       : force no-loading of crash recovery\n"
 msgstr "-norecover       : nem töltsön be sérült helyreállítást\n"
 
-#: src/main.c:2317
+#: src/main.c:2391
 msgid "-recover         : force loading of crash recovery\n"
 msgstr "-recover         : sérült visszaállítás betöltése\n"
 
-#: src/main.c:2318
-msgid "-nothreaddialog  : doe nothing - retained for backwards compatibility\n"
+#: src/main.c:2392
+msgid ""
+"-nothreaddialog  : does nothing - retained for backwards compatibility\n"
 msgstr ""
 
-#: src/main.c:2319
+#: src/main.c:2393
 msgid "-nogui           : do not show the gui\n"
 msgstr "-nogui           : ne legyen grafikus felület\n"
 
-#: src/main.c:2320
+#: src/main.c:2394
 msgid "-nosplash        : do not show the splash window\n"
 msgstr ""
 
-#: src/main.c:2321
+#: src/main.c:2395
 msgid "-noplaywin       : do not show the play window\n"
 msgstr ""
 
-#: src/main.c:2322
+#: src/main.c:2396
+msgid "-noninteractive  : disable menu interactivity\n"
+msgstr ""
+
+#: src/main.c:2397
 msgid "-startup-ce      : start in clip editor mode\n"
 msgstr "-startup-ce      : indítás klip szerkesztő módban\n"
 
-#: src/main.c:2323
+#: src/main.c:2398
 msgid "-startup-mt      : start in multitrack mode\n"
 msgstr "-startup-mt      : indítás multitrack módban\n"
 
-#: src/main.c:2324
+#: src/main.c:2399
 msgid ""
 "-fxmodesmax <n>  : allow <n> modes per effect key (minimum is 1, default is "
 "8)\n"
 msgstr ""
 
-#: src/main.c:2326
+#: src/main.c:2401
 msgid "-oscstart <port> : start OSC listener on UDP port <port>\n"
 msgstr "-oscstart <port> : OSC hallgató indítása az UDP porton <port>\n"
 
-#: src/main.c:2327
+#: src/main.c:2402
 msgid "-nooscstart      : do not start OSC listener\n"
 msgstr "-nooscstart      : ne indítsd el az OSC hallgatót\n"
 
-#: src/main.c:2329
+#: src/main.c:2404
 #, fuzzy
 msgid ""
 "-aplayer <ap>    : start with selected audio player. <ap> can be mplayer, "
@@ -459,15 +463,15 @@
 "mplayer"
 
 #. TRANSLATORS: pulse (audio)
-#: src/main.c:2332
+#: src/main.c:2407
 msgid ", pulse"
 msgstr ", pulse"
 
-#: src/main.c:2335
+#: src/main.c:2410
 msgid ", sox or jack\n"
 msgstr ", sox vagy jack\n"
 
-#: src/main.c:2336
+#: src/main.c:2412
 msgid ""
 "-jackopts <opts>    : opts is a bitmap of jack startup options [1 = jack "
 "transport client, 2 = jack transport master, 4 = start jack transport "
@@ -477,31 +481,31 @@
 "kliens, 2 = jack átvitel master, 4 = jack átviteli szerver indítása, 8 = "
 "hang szünetelése mikor a videó szünetel, 16 = jack hang szerver indítása] \n"
 
-#: src/main.c:2338
+#: src/main.c:2414
 msgid " or sox\n"
 msgstr " vagy sox\n"
 
-#: src/main.c:2340
+#: src/main.c:2416
 msgid "-devicemap <mapname>          : autoload devicemap\n"
 msgstr "-devicemap <mapneve> : automatikusan betölti a eszköztérképet\n"
 
-#: src/main.c:2341
+#: src/main.c:2418
 msgid ""
 "-vppdefaults <file>          : load video playback plugin defaults from "
 "<file> (Note: only sets the settings, not the plugin type)\n"
 msgstr ""
 
-#: src/main.c:2342
+#: src/main.c:2419
 msgid "-debug            : try to debug crashes (requires 'gdb' installed)\n"
 msgstr ""
 "-debug : megpróbálja kideríteni az összeomlás okát ('gdb' program megléte "
 "szükséges)\n"
 
-#: src/main.c:2373 src/gui.c:1128
+#: src/main.c:2449 src/gui.c:1127
 msgid "Starting GUI..."
 msgstr "Grafikus felhasználói felület indítása..."
 
-#: src/main.c:2396
+#: src/main.c:2475
 #, c-format
 msgid ""
 "\n"
@@ -512,7 +516,7 @@
 "(Maybe you need to change the value of <prefix_dir> in your %s file)\n"
 msgstr ""
 
-#: src/main.c:2410
+#: src/main.c:2492
 #, c-format
 msgid ""
 "\n"
@@ -520,7 +524,7 @@
 "Please make sure you have write access to %s and try again.\n"
 msgstr ""
 
-#: src/main.c:2415
+#: src/main.c:2498
 msgid ""
 "\n"
 "`smogrify` must be in your path, and be executable\n"
@@ -534,7 +538,7 @@
 "Kérlek olvasd el a README fájlt, hogy mi érkezik ezzel a csomaggal,\n"
 "mielött fiuttatnád a LiVES-t.\n"
 
-#: src/main.c:2421
+#: src/main.c:2504
 #, c-format
 msgid ""
 "\n"
@@ -544,7 +548,7 @@
 "Please check the file permissions for this file and try again.\n"
 msgstr ""
 
-#: src/main.c:2428
+#: src/main.c:2512
 #, c-format
 msgid ""
 "\n"
@@ -555,7 +559,7 @@
 "and try again.\n"
 msgstr ""
 
-#: src/main.c:2438
+#: src/main.c:2522
 #, c-format
 msgid ""
 "Please check the <tempdir> setting in \n"
@@ -563,7 +567,7 @@
 "and try again.\n"
 msgstr ""
 
-#: src/main.c:2445
+#: src/main.c:2528
 #, c-format
 msgid ""
 "\n"
@@ -573,7 +577,7 @@
 "%s"
 msgstr ""
 
-#: src/main.c:2453
+#: src/main.c:2536
 msgid ""
 "\n"
 "An incorrect version of smogrify was found in your path.\n"
@@ -591,7 +595,7 @@
 "\n"
 "Köszönöm.\n"
 
-#: src/main.c:2458
+#: src/main.c:2541
 #, fuzzy
 msgid ""
 "\n"
@@ -602,7 +606,7 @@
 "LiVES-nak szüksége van az 'mplayer' vagy a 'sox' valamelyikére. Kérlek "
 "telepíts egyet ezek közül, majd próbáld újra.\n"
 
-#: src/main.c:2462
+#: src/main.c:2546
 #, fuzzy
 msgid ""
 "\n"
@@ -613,7 +617,7 @@
 "LiVES-nak szüksége van az 'mplayer' vagy a 'sox' valamelyikére. Kérlek "
 "telepíts egyet ezek közül, majd próbáld újra.\n"
 
-#: src/main.c:2472
+#: src/main.c:2556
 #, fuzzy
 msgid ""
 "\n"
@@ -624,7 +628,7 @@
 "A LiVES nem találja az 'mplayert'. Ha azt szeretnéd, hogy jobban működjön a "
 "LiVES akkor telepítsd fel.\n"
 
-#: src/main.c:2475
+#: src/main.c:2561
 msgid ""
 "\n"
 "LiVES was unable to locate 'convert'. You should install convert and image-"
@@ -634,7 +638,7 @@
 "A LiVES nem találja a 'convert'-et. Fel kell telepítened a convert-et és az "
 "image-magick-et, ha szeretnéd használni a létrehozott effekteket.\n"
 
-#: src/main.c:2478
+#: src/main.c:2566
 msgid ""
 "\n"
 "LiVES was unable to locate 'composite'. You should install composite and "
@@ -644,7 +648,7 @@
 "A LiVES nem találja a 'composite'-ot. Fel kell telepítened az image-magic-"
 "kel együtt, ha szeretnéd használni az egyesítés funkciót.\n"
 
-#: src/main.c:2481
+#: src/main.c:2570
 msgid ""
 "\n"
 "LiVES was unable to locate 'sox'. Some audio features may not work. You "
@@ -654,7 +658,7 @@
 "A LiVES nem találja a 'sox'-ot. Néhány hang tulajdonság nem fog működni. "
 "Telepítsd fel a 'sox'-ot.\n"
 
-#: src/main.c:2484
+#: src/main.c:2575
 #, c-format
 msgid ""
 "\n"
@@ -665,59 +669,59 @@
 "You may need to change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/main.c:2611
+#: src/main.c:2707
 #, c-format
 msgid "Autoloading set %s..."
 msgstr "%s beállítás automatikus betöltése..."
 
 #. TRANSLATORS: localised name may be used here
-#: src/main.c:2781 src/interface.c:738
+#: src/main.c:2902
 msgid "LiVES"
 msgstr ""
 
-#: src/main.c:2948
+#: src/main.c:3066
 #, c-format
 msgid "Invalid audio player %s\n"
 msgstr "Érvénytelen zene lejátszó %s\n"
 
-#: src/main.c:3077
+#: src/main.c:3214
 #, c-format
 msgid "LiVES-%s: <Untitled%d> %dx%d : %d frames %d bpp %.3f fps"
 msgstr "LiVES-%s: <Névtelen%d> %dx%d : %d képkockák %d bpp %.3f fps"
 
-#: src/main.c:3082
+#: src/main.c:3219
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : ??? frames ??? bpp %.3f fps"
 msgstr "LiVES-%s: <%s> %dx%d : ??? képkocka ??? bpp %.3f fps"
 
-#: src/main.c:3086
+#: src/main.c:3222
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : %d frames %d bpp %.3f fps"
 msgstr "LiVES-%s: <%s> %dx%d : %d képkocka %d bpp %.3f fps"
 
-#: src/main.c:3094
+#: src/main.c:3229
 #, c-format
 msgid "LiVES-%s: <No File>"
 msgstr "LiVES-%s: <Nincs fájl>"
 
 #. TRANSLATORS: rec(ord)
-#: src/main.c:5085
+#: src/main.c:5201
 #, c-format
 msgid "rec %9d/%d"
 msgstr ""
 
 #. TRANSLATORS: out of memory (rec(ord))
-#: src/main.c:5091
+#: src/main.c:5206
 #, c-format
 msgid "!rec %9d/%d"
 msgstr ""
 
-#: src/main.c:5398 src/main.c:5399 src/gui.c:2110 src/gui.c:3220
-#: src/saveplay.c:2336
+#: src/main.c:5500 src/main.c:5501 src/gui.c:2108 src/gui.c:3331
+#: src/saveplay.c:2315
 msgid "Play"
 msgstr "Lejátszás"
 
-#: src/main.c:6128
+#: src/main.c:6216
 msgid ""
 "LiVES was unable to capture this image\n"
 "\n"
@@ -725,35 +729,35 @@
 "LiVES nem tudja rögzíteni ezt a képet\n"
 "\n"
 
-#: src/main.c:6250
+#: src/main.c:6345
 #, c-format
 msgid "Closed file %s\n"
 msgstr "%s fájl bezárva\n"
 
-#: src/main.c:6452 src/gui.c:648 src/utils.c:4312 src/utils.c:4344
-#: src/saveplay.c:3550 src/multitrack.c:4510 src/multitrack.c:6268
+#: src/main.c:6542 src/gui.c:647 src/utils.c:4256 src/utils.c:4286
+#: src/saveplay.c:3500 src/multitrack.c:4678 src/multitrack.c:6447
 msgid "_Undo"
 msgstr "_Visszavonás"
 
-#: src/main.c:6453 src/gui.c:666 src/utils.c:4313 src/utils.c:4345
-#: src/saveplay.c:3551 src/multitrack.c:4531 src/multitrack.c:6293
+#: src/main.c:6543 src/gui.c:665 src/utils.c:4257 src/utils.c:4287
+#: src/saveplay.c:3501 src/multitrack.c:4698 src/multitrack.c:6472
 msgid "_Redo"
 msgstr "Új_ra"
 
-#: src/main.c:6493 src/interface.c:470 src/gui.c:2326 src/preferences.c:2357
-#: src/resample.c:1516
+#: src/main.c:6583 src/interface.c:457 src/gui.c:2324 src/preferences.c:2391
+#: src/resample.c:1488
 msgid "Video"
 msgstr "Videó"
 
-#: src/main.c:6494 src/interface.c:483 src/gui.c:2351
+#: src/main.c:6584 src/interface.c:470 src/gui.c:2348
 msgid "Left Audio"
 msgstr "Bal oldali hang"
 
-#: src/main.c:6495 src/gui.c:2375
+#: src/main.c:6585 src/gui.c:2371
 msgid "Right Audio"
 msgstr "Jobb oldali hang"
 
-#: src/main.c:6540
+#: src/main.c:6630
 #, fuzzy
 msgid ""
 "\n"
@@ -768,11 +772,11 @@
 "lejátszó az mplayer.\n"
 "Kérlek állítsd be a lejátszási beállításokat, majd próbáld újra.\n"
 
-#: src/main.c:7051 src/plugins.c:1502
+#: src/main.c:7134 src/plugins.c:1468
 msgid "LiVES: - Play Window"
 msgstr "LiVES: - Lejátszó Ablak"
 
-#: src/startup.c:25
+#: src/startup.c:24
 #, c-format
 msgid ""
 "A directory named\n"
@@ -782,7 +786,7 @@
 "(Free space = %s)\n"
 msgstr ""
 
-#: src/startup.c:32
+#: src/startup.c:29
 #, c-format
 msgid ""
 "A directory named\n"
@@ -792,7 +796,7 @@
 "Please select another location.\n"
 msgstr ""
 
-#: src/startup.c:49
+#: src/startup.c:46
 #, c-format
 msgid ""
 "\n"
@@ -803,7 +807,7 @@
 "(Free space = %s)"
 msgstr ""
 
-#: src/startup.c:54
+#: src/startup.c:50
 #, c-format
 msgid ""
 "\n"
@@ -812,11 +816,11 @@
 "Please try again and choose a different location.\n"
 msgstr ""
 
-#: src/startup.c:96
+#: src/startup.c:92
 msgid "Directory name is too long !"
 msgstr ""
 
-#: src/startup.c:223
+#: src/startup.c:216
 msgid ""
 "LiVES FAILED TO START YOUR SELECTED AUDIO PLAYER !\n"
 "\n"
@@ -824,7 +828,7 @@
 "A LiVES-NAK NEM SIKERÜLT MEGNYITNI A KIVÁLASZTOT AUDIO LEJÁTSZÓT!\n"
 "\n"
 
-#: src/startup.c:230
+#: src/startup.c:222
 msgid ""
 "Before starting LiVES, you need to choose an audio player.\n"
 "\n"
@@ -834,7 +838,7 @@
 "\n"
 "PULSE AUDIO ajánlott a legtöbb felhasználónak"
 
-#: src/startup.c:233
+#: src/startup.c:225
 msgid ""
 ", but this version of LiVES was not compiled with pulse audio support.\n"
 "\n"
@@ -842,7 +846,7 @@
 ", de a LiVES ezen verziója sajnos pulse audio támogatás nélkül készült.\n"
 "\n"
 
-#: src/startup.c:236
+#: src/startup.c:229
 msgid ""
 ", but you do not have pulse audio installed on your system.\n"
 " You are advised to install pulse audio first before running LiVES.\n"
@@ -853,11 +857,11 @@
 "futtatása elött.\n"
 "\n"
 
-#: src/startup.c:241
+#: src/startup.c:233
 msgid "JACK audio is recommended for pro users"
 msgstr "JACK audio ajánlott a profi felhasználóknak"
 
-#: src/startup.c:244
+#: src/startup.c:236
 msgid ""
 ", but this version of LiVES was not compiled with jack audio support.\n"
 "\n"
@@ -866,7 +870,7 @@
 "beforgatva.\n"
 "\n"
 
-#: src/startup.c:247
+#: src/startup.c:239
 msgid ""
 ", but you do not have jackd installed. You may wish to install jackd first "
 "before running LiVES.\n"
@@ -876,7 +880,7 @@
 "mielött használnád a LiVES-t.\n"
 "\n"
 
-#: src/startup.c:250
+#: src/startup.c:242
 msgid ""
 ", but may prevent LiVES from starting on some systems.\n"
 "If LiVES will not start with jack, you can restart and try with another "
@@ -888,12 +892,12 @@
 "helyette.\n"
 "\n"
 
-#: src/startup.c:254
+#: src/startup.c:246
 msgid "SOX may be used if neither of the preceding players work, "
 msgstr ""
 "SOX esetleg használható abban az esetben, ha az előző lejátszó működik, "
 
-#: src/startup.c:257
+#: src/startup.c:249
 msgid ""
 "but some audio features will be disabled.\n"
 "\n"
@@ -901,7 +905,7 @@
 "de néhány  hangszerkesztési lehetőség le lesz tiltva.\n"
 "\n"
 
-#: src/startup.c:260
+#: src/startup.c:251
 msgid ""
 "but you do not have sox installed.\n"
 "You are advised to install it before running LiVES.\n"
@@ -911,7 +915,7 @@
 "Szeretnélek figyelmeztetni, hogy telepítsd a LiVES használata előtt.\n"
 "\n"
 
-#: src/startup.c:264
+#: src/startup.c:255
 #, fuzzy
 msgid ""
 "The MPLAYER/MPLAYER2 audio player is only recommended for testing purposes.\n"
@@ -920,137 +924,137 @@
 "Az MPLAYER lejátszó csak tesztelésre ajánlott.\n"
 "\n"
 
-#: src/startup.c:281
+#: src/startup.c:271
 msgid "LiVES: - Choose an audio player"
 msgstr "LiVES: - Válassz egy lejátszót"
 
-#: src/startup.c:298
+#: src/startup.c:288
 msgid "Use _pulse audio player"
 msgstr "_pulse lejátszó használata"
 
-#: src/startup.c:320
+#: src/startup.c:310
 msgid "Use _jack audio player"
 msgstr "_jack lejátszó használata"
 
-#: src/startup.c:340
+#: src/startup.c:330
 msgid "Use _sox audio player"
 msgstr "_sox lejátszó használata"
 
-#: src/startup.c:361
+#: src/startup.c:351
 msgid "Use _mplayer audio player"
 msgstr "_mplayer használata"
 
-#: src/startup.c:381
+#: src/startup.c:371
 #, fuzzy
 msgid "Use _mplayer2 audio player"
 msgstr "_mplayer használata"
 
-#: src/startup.c:405 src/startup.c:580 src/interface.c:1506
+#: src/startup.c:395 src/startup.c:569 src/interface.c:1398
 msgid "_Next"
 msgstr "_Következő"
 
-#: src/startup.c:445
+#: src/startup.c:435
 msgid "Skipped"
 msgstr ""
 
-#: src/startup.c:460
+#: src/startup.c:450
 msgid "Passed"
 msgstr ""
 
-#: src/startup.c:493
+#: src/startup.c:483
 msgid "Failed"
 msgstr ""
 
-#: src/startup.c:552
+#: src/startup.c:542
 msgid "LiVES: - Testing Configuration"
 msgstr ""
 
-#: src/startup.c:555
+#: src/startup.c:544
 msgid "LiVES: - Troubleshoot"
 msgstr ""
 
-#: src/startup.c:568
+#: src/startup.c:557
 msgid "LiVES will now run some basic configuration tests\n"
 msgstr ""
 
-#: src/startup.c:603
+#: src/startup.c:591
 msgid "Checking for \"sox\" presence"
 msgstr ""
 
-#: src/startup.c:607
+#: src/startup.c:595
 msgid ""
 "You should install sox to be able to use all the audio features in LiVES"
 msgstr ""
 
-#: src/startup.c:615
+#: src/startup.c:602
 msgid "Checking if sox can convert audio"
 msgstr ""
 
-#: src/startup.c:638
+#: src/startup.c:625
 msgid "Unable to allocate 176400 bytes memory."
 msgstr ""
 
-#: src/startup.c:653
+#: src/startup.c:639
 #, c-format
 msgid "Unable to write to: %s"
 msgstr ""
 
-#: src/startup.c:667 src/startup.c:807
+#: src/startup.c:653 src/startup.c:789
 #, c-format
 msgid "Command failed: %s"
 msgstr ""
 
-#: src/startup.c:689
+#: src/startup.c:675
 msgid "You should install sox_fmt_all or similar"
 msgstr ""
 
-#: src/startup.c:717
+#: src/startup.c:703
 msgid "Checking for \"mplayer\" presence"
 msgstr ""
 
-#: src/startup.c:721
+#: src/startup.c:707
 msgid ""
 "You should install mplayer or mplayer2 to be able to use all the decoding "
 "features in LiVES"
 msgstr ""
 
-#: src/startup.c:747
+#: src/startup.c:732
 msgid "Checking if mplayer can convert audio"
 msgstr ""
 
-#: src/startup.c:768
+#: src/startup.c:751
 msgid "You should install mplayer or mplayer2 with pcm/wav support"
 msgstr ""
 
-#: src/startup.c:785
+#: src/startup.c:767
 msgid "Checking if mplayer can decode to png/alpha"
 msgstr ""
 
-#: src/startup.c:828
+#: src/startup.c:810
 msgid "You may wish to upgrade mplayer to a newer version"
 msgstr ""
 
-#: src/startup.c:854
+#: src/startup.c:836
 msgid "Checking if mplayer can decode to jpeg"
 msgstr ""
 
-#: src/startup.c:882
+#: src/startup.c:862
 msgid "You should install mplayer with either png/alpha or jpeg support"
 msgstr ""
 
-#: src/startup.c:883
+#: src/startup.c:863
 msgid "You may wish to add jpeg output support to mplayer"
 msgstr ""
 
-#: src/startup.c:892
+#: src/startup.c:872
 msgid "Checking for \"convert\" presence"
 msgstr ""
 
-#: src/startup.c:896
+#: src/startup.c:876
 msgid "Install imageMagick to be able to use all of the rendered effects"
 msgstr ""
 
-#: src/startup.c:909
+#: src/startup.c:889
 msgid ""
 "\n"
 "\n"
@@ -1058,7 +1062,7 @@
 "Preferences/Decoding.    \n"
 msgstr ""
 
-#: src/startup.c:915
+#: src/startup.c:894
 msgid ""
 "\n"
 "\n"
@@ -1066,49 +1070,49 @@
 "continue    \n"
 msgstr ""
 
-#: src/startup.c:949
+#: src/startup.c:928
 msgid ""
 "\n"
 "\n"
 "Finally, you can choose the default startup interface for LiVES.\n"
 msgstr ""
 
-#: src/startup.c:950
+#: src/startup.c:929
 msgid ""
 "\n"
 "\n"
 "LiVES has two main interfaces and you can start up with either of them.\n"
 msgstr ""
 
-#: src/startup.c:951
+#: src/startup.c:930
 msgid ""
 "\n"
 "\n"
 "The default can always be changed later from Preferences.\n"
 msgstr ""
 
-#: src/startup.c:961
+#: src/startup.c:940
 msgid "LiVES: - Choose the startup interface"
 msgstr ""
 
-#: src/startup.c:972
+#: src/startup.c:951
 msgid "Start in _Clip Edit mode"
 msgstr ""
 
-#: src/startup.c:975
+#: src/startup.c:954
 msgid "This is the best choice for simple editing tasks and for VJs\n"
 msgstr ""
 
-#: src/startup.c:981
+#: src/startup.c:960
 msgid "Start in _Multitrack mode"
 msgstr ""
 
-#: src/startup.c:983
+#: src/startup.c:962
 msgid ""
 "This is a better choice for complex editing tasks involving multiple clips.\n"
 msgstr ""
 
-#: src/startup.c:992
+#: src/startup.c:971
 msgid "_Finish"
 msgstr ""
 
@@ -1126,37 +1130,37 @@
 msgid "Apply _Deinterlace"
 msgstr "Deinterlace engedélyezése"
 
-#: src/interface.c:66
+#: src/interface.c:65
 msgid "If this is set, frames will be deinterlaced as they are imported."
 msgstr ""
 "Ha ez be van állítva, a képkockák deinterlacelve lesznek amint importálják "
 "őket."
 
-#: src/interface.c:113 src/callbacks.c:9623 src/callbacks.c:9646
-#: src/callbacks.c:9647 src/gui.c:3223 src/gui.c:3821 src/saveplay.c:2339
-#: src/saveplay.c:3138 src/dialogs.c:1514 src/dialogs.c:1515
-#: src/dialogs.c:1746 src/dialogs.c:1747 src/framedraw.c:238
-#: src/multitrack.c:8031
+#: src/interface.c:106 src/callbacks.c:9542 src/callbacks.c:9564
+#: src/callbacks.c:9565 src/gui.c:3333 src/gui.c:3946 src/saveplay.c:2317
+#: src/saveplay.c:3097 src/dialogs.c:1575 src/dialogs.c:1576
+#: src/dialogs.c:1804 src/dialogs.c:1805 src/framedraw.c:236
+#: src/multitrack.c:8210
 msgid "Preview"
 msgstr "Előnézet"
 
-#: src/interface.c:132
+#: src/interface.c:125
 msgid "Click here to _Preview any selected video, image or audio file"
 msgstr "Kattints ide a kiválasztott video, kép vagy hang előnézetéhez"
 
-#: src/interface.c:135
+#: src/interface.c:127
 msgid "Click here to _Preview any selected audio file"
 msgstr "Kattints ide a kiválasztott hang előnézetéhez"
 
-#: src/interface.c:138
+#: src/interface.c:129
 msgid "Click here to _Preview the video"
 msgstr "Kattints ide a video előnézetéhez"
 
-#: src/interface.c:181 src/dialogs.c:2542
+#: src/interface.c:169 src/dialogs.c:2621
 msgid "LiVES: - Processing..."
 msgstr "LiVES: - Feldolgozás..."
 
-#: src/interface.c:217
+#: src/interface.c:205
 msgid ""
 "\n"
 "\n"
@@ -1170,8 +1174,8 @@
 "\n"
 "Ne felejtsd el kikapcsolni az effekteket (ctr-0) utána!"
 
-#: src/interface.c:222 src/callbacks.c:9373 src/callbacks.c:9420
-#: src/dialogs.c:2570
+#: src/interface.c:210 src/callbacks.c:9283 src/callbacks.c:9332
+#: src/dialogs.c:2649
 msgid ""
 "\n"
 "Please Wait"
@@ -1179,194 +1183,182 @@
 "\n"
 "Kis türelmet"
 
-#: src/interface.c:242
+#: src/interface.c:230
 #, fuzzy
 msgid "Show Details"
 msgstr "_Részletek megjelenítése"
 
-#: src/interface.c:254 src/dialogs.c:2584
+#: src/interface.c:242 src/dialogs.c:2663
 msgid "_Enough"
 msgstr "_Elég"
 
-#: src/interface.c:255 src/framedraw.c:278
+#: src/interface.c:243 src/framedraw.c:276
 msgid "_Preview"
 msgstr "_Előnézet"
 
-#: src/interface.c:257
+#: src/interface.c:245 src/callbacks.c:9282 src/callbacks.c:9330
 msgid "Paus_e"
 msgstr ""
 
-#: src/interface.c:258 src/callbacks.c:9417
+#: src/interface.c:246 src/callbacks.c:9329
 msgid "Pause/_Enough"
 msgstr ""
 
-#: src/interface.c:285
+#: src/interface.c:273
 msgid "_Cancel"
 msgstr "_Mégse"
 
-#: src/interface.c:374
+#: src/interface.c:361
 #, fuzzy, c-format
 msgid "LiVES: - %s"
 msgstr "LiVES: - Beszúrás"
 
-#: src/interface.c:376
+#: src/interface.c:363
 #, fuzzy
 msgid "LiVES: - Multitrack details"
 msgstr "Multitrack részletek"
 
-#: src/interface.c:407
+#: src/interface.c:394
 msgid "Format"
 msgstr "Formátum"
 
-#: src/interface.c:412
+#: src/interface.c:399
 msgid "Frame size"
 msgstr "Képkocka mérete"
 
-#: src/interface.c:417
+#: src/interface.c:404
 msgid "File size"
 msgstr "Fájl mérete"
 
-#: src/interface.c:418
+#: src/interface.c:405
 msgid "Byte size"
 msgstr "Bájt méret"
 
-#: src/interface.c:423 src/interface.c:1891
+#: src/interface.c:410 src/interface.c:1760
 msgid "FPS"
 msgstr "FPS"
 
-#: src/interface.c:428
+#: src/interface.c:415
 msgid "Frames"
 msgstr "Képkockák"
 
-#: src/interface.c:429
+#: src/interface.c:416
 msgid "Events"
 msgstr "Események"
 
-#: src/interface.c:434 src/interface.c:500 src/interface.c:542
+#: src/interface.c:421 src/interface.c:486 src/interface.c:528
 msgid "Total time"
 msgstr "Idő (összesen)"
 
-#: src/interface.c:486 src/resample.c:1488
+#: src/interface.c:472 src/resample.c:1460
 msgid "Audio"
 msgstr "Hang"
 
-#: src/interface.c:511 src/interface.c:553
+#: src/interface.c:497 src/interface.c:539
 msgid "Rate/size"
 msgstr "Sebesség/méret"
 
-#: src/interface.c:530
+#: src/interface.c:516
 msgid "Right audio"
 msgstr "Jobb oldali hang"
 
-#: src/interface.c:622
+#: src/interface.c:607
 msgid "LiVES: - Encoding options"
 msgstr "LiVES: - Kódolási beállítások"
 
-#: src/interface.c:636
+#: src/interface.c:621
 msgid "<------------- (Check the box to re_size as suggested)"
 msgstr ""
 
-#: src/interface.c:637
+#: src/interface.c:622
 msgid "<------------- (Check the box to use the _size recommendation)"
 msgstr ""
 
-#: src/interface.c:662
+#: src/interface.c:646
 msgid "Use _letterboxing to maintain aspect ratio (optional)"
 msgstr ""
 
-#: src/interface.c:663
+#: src/interface.c:647
 msgid ""
 "Draw black rectangles either above or to the sides of the image, to prevent "
 "it from stretching."
 msgstr ""
 
-#: src/interface.c:694
+#: src/interface.c:677
 msgid "Keep _my settings"
 msgstr "Tartsd meg a _beállításaim"
 
-#: src/interface.c:695
+#: src/interface.c:678
 msgid "Use _recommended settings"
 msgstr "Használd a _javasolt beállításokat"
 
-#: src/interface.c:775 src/dialogs.c:114
-msgid ""
-"Do _not show this warning any more\n"
-"(can be turned back on from Preferences/Warnings)"
-msgstr ""
-"_Ne mutasd ezt a figyelmeztetést többet\n"
-"(visszakapcsolható a beállítások/figyelmeztetések-nél)"
-
-#: src/interface.c:787
-msgid "Show _Details"
-msgstr "_Részletek megjelenítése"
-
-#: src/interface.c:881
+#: src/interface.c:769
 msgid "_Close Window"
 msgstr "Ablak _bezárása"
 
-#: src/interface.c:883
+#: src/interface.c:771
 msgid "_Save to file"
 msgstr "_Mentés fájlba"
 
-#: src/interface.c:928
+#: src/interface.c:816
 msgid "LiVES: - Insert"
 msgstr "LiVES: - Beszúrás"
 
-#: src/interface.c:945
+#: src/interface.c:833
 msgid "_Number of times to insert"
 msgstr "_A belillesztéshez idő száma"
 
-#: src/interface.c:954
+#: src/interface.c:842
 msgid "_Insert to fit audio"
 msgstr "_Beillesztés a megfeleő hanghoz"
 
-#: src/interface.c:968
+#: src/interface.c:856
 msgid "Insert _before selection"
 msgstr "Beszúrás a kijelölés _előtt:"
 
-#: src/interface.c:970
+#: src/interface.c:858
 msgid "Insert clipboard before selected frames"
 msgstr "Helyezd vágólapra mielőtt kijelölnéd a képkockákat"
 
-#: src/interface.c:986
+#: src/interface.c:875
 msgid "Insert _after selection"
 msgstr "Beszúrás a kijelölés _után:"
 
-#: src/interface.c:988
+#: src/interface.c:877
 msgid "Insert clipboard after selected frames"
 msgstr "Helyezd vágólapra miután kijelölted a képkockákat"
 
-#: src/interface.c:999
+#: src/interface.c:888
 msgid "Insert _with sound"
 msgstr "Beszúrás _hanggal"
 
-#: src/interface.c:1012
+#: src/interface.c:901
 msgid "Insert with_out sound"
 msgstr "Beszúrás hang _nélkül"
 
-#: src/interface.c:1093
+#: src/interface.c:985
 msgid "LiVES: - Open Selection"
 msgstr "LiVES: - Kijelölés megnyitása"
 
-#: src/interface.c:1111
+#: src/interface.c:1004
 #, fuzzy
 msgid "Selection start time (sec)"
 msgstr "    Kijelölés kezdete (másodperben)"
 
-#: src/interface.c:1117
+#: src/interface.c:1010
 #, fuzzy
 msgid "Number of frames to open"
 msgstr "    Megnyitott képkockák száma"
 
-#: src/interface.c:1193
+#: src/interface.c:1088
 msgid "LiVES: - Open Location"
 msgstr "LiVES: - Hely megnyitása"
 
-#: src/interface.c:1195
+#: src/interface.c:1090
 msgid "LiVES: - Open Youtube Clip"
 msgstr ""
 
-#: src/interface.c:1213
+#: src/interface.c:1109
 msgid ""
 "\n"
 "\n"
@@ -1382,7 +1374,7 @@
 "Ne feledd leellenőrini a beállításokat a beállítások|adatfolyamok menüben\n"
 "\n"
 
-#: src/interface.c:1216
+#: src/interface.c:1112
 msgid ""
 "\n"
 "\n"
@@ -1391,63 +1383,64 @@
 "\n"
 msgstr ""
 
-#: src/interface.c:1220
+#: src/interface.c:1116
 msgid ""
 "Enter the URL of the clip below.\n"
 "E.g: http://www.youtube.com/watch?v=WCR6f6WzjP8\n"
 "\n"
 msgstr ""
 
-#: src/interface.c:1231
+#: src/interface.c:1127
 msgid "URL : "
 msgstr "URL : "
 
-#: src/interface.c:1231
+#: src/interface.c:1127
 msgid "Youtube URL : "
 msgstr ""
 
-#: src/interface.c:1235
+#: src/interface.c:1131
 msgid "Do not send bandwidth information"
 msgstr "Ne küldd el a sávszélesség információkat"
 
-#: src/interface.c:1237
+#: src/interface.c:1133
 msgid "Try this setting if you are having problems getting a stream"
 msgstr "Próbáld ezt a beállítást, ha problémád van a lejátszással"
 
-#: src/interface.c:1258
+#: src/interface.c:1155
 msgid "Download to _Directory : "
 msgstr ""
 
-#: src/interface.c:1276
+#: src/interface.c:1173
 msgid "Download _File Name : "
 msgstr ""
 
-#: src/interface.c:1281
+#: src/interface.c:1178
 msgid ".webm"
 msgstr ""
 
-#: src/interface.c:1359
+#: src/interface.c:1256
 msgid "LiVES: - Rename Clip"
 msgstr "LiVES: - Klip átnevezése"
 
-#: src/interface.c:1362
-msgid "LiVES: - Enter Set Name"
+#: src/interface.c:1258
+#, fuzzy
+msgid "LiVES: - Enter Set Name to Save as"
 msgstr "LiVES: - Beállítás neve:"
 
-#: src/interface.c:1365
+#: src/interface.c:1260
 msgid "LiVES: - Enter a Set Name to Reload"
 msgstr ""
 
-#: src/interface.c:1368
+#: src/interface.c:1262
 msgid "LiVES: - Choose a Working Directory"
 msgstr ""
 
-#: src/interface.c:1371
+#: src/interface.c:1264
 #, fuzzy
 msgid "LiVES: - Rename Current Track"
 msgstr "LiVES: - Klip átnevezése"
 
-#: src/interface.c:1391
+#: src/interface.c:1283
 msgid ""
 "You need to enter a name for the current clip set.\n"
 "This will allow you reload the layout with the same clips later.\n"
@@ -1460,7 +1453,7 @@
 "A LiVES emlékeztetni fog, hogy kilépés elött ne felejtsd el elmenteni a "
 "beállításokat.\n"
 
-#: src/interface.c:1397
+#: src/interface.c:1289
 msgid ""
 "In order to export this project, you must enter a name for this clip set.\n"
 "This will also be used for the project name.\n"
@@ -1468,210 +1461,210 @@
 "A projekt exportálásához, be kell írnod egy nevet a klip beállításhoz.\n"
 "Ez lesz használva ehhez a projekthez.\n"
 
-#: src/interface.c:1404
+#: src/interface.c:1296
 msgid ""
 "Welcome to LiVES !\n"
 "This startup wizard will guide you through the\n"
 "initial install so that you can get the most from this application.\n"
 msgstr ""
 
-#: src/interface.c:1408
+#: src/interface.c:1300
 msgid ""
 "\n"
 "First of all you need to choose a working directory for LiVES.\n"
 "This should be a directory with plenty of disk space available.\n"
 msgstr ""
 
-#: src/interface.c:1427
+#: src/interface.c:1317
 msgid "New name "
 msgstr "Új név "
 
-#: src/interface.c:1430
+#: src/interface.c:1319
 msgid "Set name "
 msgstr "Beállítás név "
 
-#: src/interface.c:1550
+#: src/interface.c:1435
 msgid "Use def_aults"
 msgstr ""
 
-#: src/interface.c:1553 src/interface.c:1840 src/preferences.c:2515
-#: src/preferences.c:2697
+#: src/interface.c:1437 src/interface.c:1709 src/preferences.c:2550
+#: src/preferences.c:2739
 msgid "_Advanced"
 msgstr "_Haladó"
 
-#: src/interface.c:1604
+#: src/interface.c:1487
 msgid "LiVES:- Select input device"
 msgstr ""
 
-#: src/interface.c:1622
+#: src/interface.c:1504
 msgid "Select input device:"
 msgstr ""
 
-#: src/interface.c:1686
+#: src/interface.c:1568
 msgid "LiVES:- Load CD Track"
 msgstr "LiVES: - CD szám betöltése"
 
-#: src/interface.c:1689
+#: src/interface.c:1570
 msgid "LiVES:- Select DVD Title/Chapter"
 msgstr "LiVES: - DVD cím/fejezet kiválasztása"
 
-#: src/interface.c:1692
+#: src/interface.c:1572
 msgid "LiVES:- Select VCD Title"
 msgstr "LiVES: - VCD cím kiválasztása"
 
-#: src/interface.c:1695
+#: src/interface.c:1574
 msgid "LiVES:- Change Maximum Visible Tracks"
 msgstr "LiVES: - Maximálisan látható sávok megváltoztatása"
 
-#: src/interface.c:1698
+#: src/interface.c:1576
 msgid "LiVES:- Device details"
 msgstr ""
 
-#: src/interface.c:1721
+#: src/interface.c:1598
 #, c-format
 msgid "Track to load (from %s)"
 msgstr "Szám betöltése (innen:%s)"
 
-#: src/interface.c:1724
+#: src/interface.c:1600
 msgid "DVD Title"
 msgstr "DVD cím"
 
-#: src/interface.c:1727
+#: src/interface.c:1602
 msgid "VCD Title"
 msgstr "VCD cím"
 
-#: src/interface.c:1730
+#: src/interface.c:1604
 msgid "Maximum number of tracks to display"
 msgstr "Maximálisan megjelenített számok"
 
-#: src/interface.c:1733
+#: src/interface.c:1606
 msgid "Device:        /dev/video"
 msgstr ""
 
-#: src/interface.c:1736
+#: src/interface.c:1608
 msgid "Device:        fw:"
 msgstr ""
 
-#: src/interface.c:1771
+#: src/interface.c:1641
 msgid "Chapter  "
 msgstr "Fejezet  "
 
-#: src/interface.c:1776
+#: src/interface.c:1645
 msgid "Channel  "
 msgstr ""
 
-#: src/interface.c:1791
+#: src/interface.c:1660
 msgid "Audio ID  "
 msgstr "Hang ID  "
 
-#: src/interface.c:1857
+#: src/interface.c:1726
 msgid "Input number"
 msgstr ""
 
-#: src/interface.c:1865
+#: src/interface.c:1734
 msgid "Use default width, height and FPS"
 msgstr ""
 
-#: src/interface.c:1879
+#: src/interface.c:1748
 msgid "Width"
 msgstr ""
 
-#: src/interface.c:1885
+#: src/interface.c:1754
 msgid "Height"
 msgstr ""
 
-#: src/interface.c:1899
+#: src/interface.c:1768
 msgid "_Driver"
 msgstr ""
 
-#: src/interface.c:1902
+#: src/interface.c:1771
 msgid "_Output format"
 msgstr ""
 
-#: src/interface.c:1998
+#: src/interface.c:1865
 msgid "LiVES:- Fade Audio In"
 msgstr "LiVES: - Fokozatos hangerősödés"
 
-#: src/interface.c:2001
+#: src/interface.c:1867
 msgid "LiVES:- Fade Audio Out"
 msgstr "LiVES: - Fokozatos halkulás"
 
-#: src/interface.c:2017
+#: src/interface.c:1883
 msgid "Fade in over  "
 msgstr "Fokozatos hangerősödés végig  "
 
-#: src/interface.c:2018
+#: src/interface.c:1884
 msgid "first"
 msgstr "első"
 
-#: src/interface.c:2021
+#: src/interface.c:1886
 msgid "Fade out over  "
 msgstr "Fokozatos hanggyengülés végig  "
 
-#: src/interface.c:2022
+#: src/interface.c:1887
 msgid "last"
 msgstr "utolsó"
 
-#: src/interface.c:2044
+#: src/interface.c:1909
 msgid "seconds."
 msgstr "másodperc"
 
-#: src/interface.c:2052 src/saveplay.c:1507
+#: src/interface.c:1917 src/saveplay.c:1484
 msgid "selection"
 msgstr "kiválasztás"
 
-#: src/interface.c:2092
+#: src/interface.c:1956
 msgid "LiVES: - File Comments (optional)"
 msgstr "LiVES: - Fájl megjegyzések (opcionális)"
 
-#: src/interface.c:2107
+#: src/interface.c:1971
 msgid "Title/Name : "
 msgstr "Cím/név : "
 
-#: src/interface.c:2114
+#: src/interface.c:1978
 msgid "Author/Artist : "
 msgstr "Szerző/előadó : "
 
-#: src/interface.c:2121
+#: src/interface.c:1985
 msgid "Comments : "
 msgstr "Megjegyzések : "
 
-#: src/interface.c:2151
+#: src/interface.c:2015
 msgid "_Options"
 msgstr ""
 
-#: src/interface.c:2158
+#: src/interface.c:2022
 msgid "Save _subtitles to file"
 msgstr ""
 
-#: src/interface.c:2170
+#: src/interface.c:2033
 msgid "Subtitle file"
 msgstr ""
 
-#: src/interface.c:2172
+#: src/interface.c:2035
 msgid "Browse..."
 msgstr ""
 
-#: src/interface.c:2255
+#: src/interface.c:2132
 #, fuzzy
 msgid "LiVES: - choose a device"
 msgstr "LiVES: Válassz CD meghajtót"
 
-#: src/interface.c:2259
+#: src/interface.c:2135
 #, fuzzy
 msgid "LiVES: - choose a directory"
 msgstr "LiVES: válassz egy könyvtárt"
 
-#: src/interface.c:2262
+#: src/interface.c:2137
 #, fuzzy
 msgid "LiVES: - choose a file"
 msgstr "LiVES: válassz egy fájlt"
 
-#: src/interface.c:2445
+#: src/interface.c:2381
 msgid "LiVES: - Cancel/Discard/Save"
 msgstr "LiVES: - Mégse/eldobás/mentés"
 
-#: src/interface.c:2460
+#: src/interface.c:2397
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has not been saved.\n"
@@ -1681,7 +1674,7 @@
 "A jelenlegi kimenet nincs elmentve.\n"
 "Mit szeretnél tenni?\n"
 
-#: src/interface.c:2463
+#: src/interface.c:2400
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has been changed since the last save.\n"
@@ -1691,7 +1684,7 @@
 "A jelenlegi kimenet megváltozott az előző mentéshez képest.\n"
 "Mit szeretnél tenni?\n"
 
-#: src/interface.c:2467
+#: src/interface.c:2404
 msgid ""
 "You are about to exit LiVES.\n"
 "The current clip set can be saved.\n"
@@ -1701,7 +1694,7 @@
 "A jelenlegi klip beállítások elmenthetők.\n"
 "Mit szeretnél tenni?\n"
 
-#: src/interface.c:2468
+#: src/interface.c:2405
 msgid ""
 "The current clip set has not been saved.\n"
 "What would you like to do ?\n"
@@ -1709,7 +1702,7 @@
 "A jelenlegi klip beállítások nincsenek elmentve.\n"
 "Mit szeretnél tenni?\n"
 
-#: src/interface.c:2472
+#: src/interface.c:2408
 msgid ""
 "The current layout has not been saved.\n"
 "What would you like to do ?\n"
@@ -1717,7 +1710,7 @@
 "A jelenlegi kimenet még nincs elmentve.\n"
 "Mit szeretnél tenni?\n"
 
-#: src/interface.c:2475
+#: src/interface.c:2410
 #, fuzzy
 msgid ""
 "The current layout has *not* been changed since it was last saved.\n"
@@ -1726,7 +1719,7 @@
 "Az aktuális kimenet a legutóbbi mentés óta nem változott.\n"
 "Mit szeretnél tenni?\n"
 
-#: src/interface.c:2480
+#: src/interface.c:2415
 msgid ""
 "The current layout contains generated frames and cannot be retained.\n"
 "You may wish to render it before exiting multitrack mode.\n"
@@ -1735,7 +1728,7 @@
 "alkalmazni.\n"
 "mielőtt kilépnél a multitrack módból rendereld/fűzd össze/kódold.\n"
 
-#: src/interface.c:2483
+#: src/interface.c:2418
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout contains generated frames and cannot be retained.\n"
@@ -1746,39 +1739,39 @@
 "alkalmazni.\n"
 "Mit szeretnél tenni?"
 
-#: src/interface.c:2496
+#: src/interface.c:2431
 msgid "Clip set _name"
 msgstr "Klip beállítás _neve"
 
-#: src/interface.c:2502
+#: src/interface.c:2437
 msgid "_Auto reload next time"
 msgstr "_Automatikus újratöltés legközelebb"
 
-#: src/interface.c:2538 src/interface.c:2547
+#: src/interface.c:2473 src/interface.c:2482
 msgid "_Wipe layout"
 msgstr "_Kimenet törlése"
 
-#: src/interface.c:2539
+#: src/interface.c:2474
 msgid "_Ignore changes"
 msgstr "_Változtatások elvetése"
 
-#: src/interface.c:2540
+#: src/interface.c:2475
 msgid "_Delete clip set"
 msgstr "_Klip beállítás törlése"
 
-#: src/interface.c:2541
+#: src/interface.c:2476
 msgid "_Delete layout"
 msgstr "_Kimenet törlése"
 
-#: src/interface.c:2545
+#: src/interface.c:2480
 msgid "_Save layout"
 msgstr "_Kimenet mentése"
 
-#: src/interface.c:2546
+#: src/interface.c:2481
 msgid "_Save clip set"
 msgstr "_Klip beállítás mentése"
 
-#: src/interface.c:2565
+#: src/interface.c:2502
 msgid ""
 "\n"
 "LiVES has detected a multitrack layout from a previous session.\n"
@@ -1788,57 +1781,57 @@
 "A LiVES megtalált néhány előző anyagot.\n"
 "Szeretnéd megpróbálni helyreállítani?\n"
 
-#: src/interface.c:2589
+#: src/interface.c:2528
 msgid "LiVES: - Disk Recovery Options"
 msgstr ""
 
-#: src/interface.c:2608
+#: src/interface.c:2549
 msgid "Delete _Orphaned Clips"
 msgstr ""
 
-#: src/interface.c:2609
+#: src/interface.c:2550
 msgid "Delete any clips which are not currently loaded or part of a set"
 msgstr ""
 
-#: src/interface.c:2622
+#: src/interface.c:2564
 msgid "Clear _Backup Files from Closed Clips"
 msgstr ""
 
-#: src/interface.c:2633
+#: src/interface.c:2575
 msgid "Remove Sets which have _Layouts but no Clips"
 msgstr ""
 
-#: src/interface.c:2644
+#: src/interface.c:2586
 msgid "_Reset to Defaults"
 msgstr ""
 
-#: src/interface.c:2651
+#: src/interface.c:2593
 msgid "_Accept"
 msgstr ""
 
-#: src/callbacks.c:198
+#: src/callbacks.c:208
 #, c-format
 msgid "Saving as set %s..."
 msgstr "Mentés mint %s"
 
-#: src/callbacks.c:833
+#: src/callbacks.c:852
 msgid "Please enter the name of the file to save the clip as.\n"
 msgstr ""
 
-#: src/callbacks.c:841
+#: src/callbacks.c:860
 msgid "Please enter a valid URL for the download.\n"
 msgstr ""
 
-#: src/callbacks.c:867
+#: src/callbacks.c:886
 #, c-format
 msgid "Downloading %s to %s..."
 msgstr ""
 
-#: src/callbacks.c:895
+#: src/callbacks.c:912
 msgid "Downloading clip"
 msgstr ""
 
-#: src/callbacks.c:933
+#: src/callbacks.c:950
 msgid ""
 "\n"
 "LiVES was unable to download the clip.\n"
@@ -1846,11 +1839,11 @@
 "the latest youtube-dl installed.\n"
 msgstr ""
 
-#: src/callbacks.c:1114 src/callbacks.c:1149
+#: src/callbacks.c:1131 src/callbacks.c:1166
 msgid "This file"
 msgstr "Ez a fájl"
 
-#: src/callbacks.c:1115
+#: src/callbacks.c:1132
 msgid ""
 ",\n"
 " - including the current layout - "
@@ -1858,7 +1851,7 @@
 ",\n"
 " - tartalmazza az aktuális kimenetet - "
 
-#: src/callbacks.c:1117
+#: src/callbacks.c:1134
 #, c-format
 msgid ""
 "\n"
@@ -1873,7 +1866,7 @@
 "\n"
 "Biztosan bezárja?"
 
-#: src/callbacks.c:1119
+#: src/callbacks.c:1136
 #, c-format
 msgid ""
 "\n"
@@ -1888,14 +1881,14 @@
 "\n"
 "Biztosan bezárja?"
 
-#: src/callbacks.c:1150
+#: src/callbacks.c:1167
 msgid ""
 "Changes made to this clip have not been saved or backed up.\n"
 "\n"
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1343
+#: src/callbacks.c:1356
 msgid ""
 "\n"
 "Invalid project file.\n"
@@ -1903,7 +1896,7 @@
 "\n"
 "Érvénytelen projekt fájl.\n"
 
-#: src/callbacks.c:1356
+#: src/callbacks.c:1370
 #, c-format
 msgid ""
 "\n"
@@ -1925,33 +1918,33 @@
 "elveted.\n"
 "Ha kész vagy ezzel, akkor már importálhatod az új projektet.\n"
 
-#: src/callbacks.c:1366
+#: src/callbacks.c:1381
 #, c-format
 msgid "Importing the project %s as set %s..."
 msgstr "%s projekt importálása a %s beállítással..."
 
-#: src/callbacks.c:1386
+#: src/callbacks.c:1399
 msgid "Importing project"
 msgstr "Projekt importálása"
 
-#: src/callbacks.c:1472
+#: src/callbacks.c:1481
 #, c-format
 msgid "Exporting project %s..."
 msgstr "%s projekt exportálása..."
 
-#: src/callbacks.c:1490
+#: src/callbacks.c:1497
 msgid "Exporting project"
 msgstr "Projekt exportálása"
 
-#: src/callbacks.c:1506
+#: src/callbacks.c:1513
 msgid "Backup as .lv1 file"
 msgstr ".lv1 fájl biztonsági mentése"
 
-#: src/callbacks.c:1522
+#: src/callbacks.c:1529
 msgid "Restore .lv1 file"
 msgstr ".lv1 fájl helyreállítása"
 
-#: src/callbacks.c:1664
+#: src/callbacks.c:1671
 msgid ""
 "\n"
 "\n"
@@ -1963,72 +1956,77 @@
 "A beállítás törlődik a lemezről.\n"
 "Biztos vagy benne?\n"
 
-#: src/callbacks.c:1725
+#: src/callbacks.c:1732
 #, c-format
 msgid "Deleting set %s..."
 msgstr ""
 
-#: src/callbacks.c:1727
+#: src/callbacks.c:1734
 msgid "Deleting set..."
 msgstr "Beállítás törlése..."
 
-#: src/callbacks.c:1731
+#: src/callbacks.c:1738
 msgid "Deleting set"
 msgstr "Beállítás törlése"
 
-#: src/callbacks.c:1739
+#: src/callbacks.c:1746
 #, c-format
 msgid "Set %s was permanently deleted from the disk.\n"
 msgstr "%s beállítás törölve lett a lemezről.\n"
 
-#: src/callbacks.c:1787 src/callbacks.c:11764
+#: src/callbacks.c:1792 src/callbacks.c:11676
 msgid "Insert Silence"
 msgstr "Csend beszúrása"
 
-#: src/callbacks.c:1840 src/callbacks.c:1923 src/callbacks.c:2086
+#: src/callbacks.c:1844 src/callbacks.c:1927 src/callbacks.c:2089
 msgid "Undoing"
 msgstr "Kibontás"
 
-#: src/callbacks.c:1936 src/callbacks.c:2147
+#: src/callbacks.c:1940 src/callbacks.c:2150
 msgid "Restoring audio..."
 msgstr "Hang viszaállítás..."
 
-#: src/callbacks.c:1952
+#: src/callbacks.c:1956
 msgid "Clearing frame images"
 msgstr "Képkockák képeinek törlése"
 
-#: src/callbacks.c:1985
+#: src/callbacks.c:1988
 msgid "Deleting excess frames"
 msgstr "Felesleges képkockák törlése"
 
-#: src/callbacks.c:2229
+#: src/callbacks.c:2232
 #, c-format
 msgid "Length of video is now %d frames at %.3f frames per second.\n"
 msgstr "A videó hossza jelenleg %d képkocka, %.3f kocka/másodperccel.\n"
 
-#: src/callbacks.c:2233 src/resample.c:683 src/resample.c:2166
+#: src/callbacks.c:2235 src/resample.c:678 src/resample.c:2133
 #, c-format
 msgid "Clipboard was resampled to %d frames.\n"
 msgstr "A vágólap újramintázva %d képkockával.\n"
 
-#: src/callbacks.c:2394 src/callbacks.c:2423
+#: src/callbacks.c:2396 src/callbacks.c:2425
 msgid "Redoing"
 msgstr "Újra"
 
-#: src/callbacks.c:2462
-#, c-format
-msgid "Copying frames %d to %d%s to the clipboard..."
+#: src/callbacks.c:2472
+#, fuzzy, c-format
+msgid "Copying frames %d to %d (with sound) to the clipboard..."
+msgstr "%d képkockák másolása ide:%d%s a vágólapra..."
+
+#: src/callbacks.c:2474
+#, fuzzy, c-format
+msgid "Copying frames %d to %d to the clipboard..."
 msgstr "%d képkockák másolása ide:%d%s a vágólapra..."
 
-#: src/callbacks.c:2525
+#: src/callbacks.c:2526
 msgid "Copying to the clipboard"
 msgstr "Másolás a vágólapra"
 
-#: src/callbacks.c:2600
+#: src/callbacks.c:2601
 msgid "Cut"
 msgstr "Kivágás"
 
-#: src/callbacks.c:2641 src/callbacks.c:3068 src/callbacks.c:8026
+#: src/callbacks.c:2641 src/callbacks.c:3063 src/callbacks.c:7631
 #, fuzzy
 msgid "Pulling frames from clipboard"
 msgstr "Képkockák kiemelése a klipből"
@@ -2038,15 +2036,15 @@
 msgid "Pasting %d frames to new clip %s..."
 msgstr ""
 
-#: src/callbacks.c:2678
+#: src/callbacks.c:2676
 msgid "Pasting"
 msgstr "Beillesztés"
 
-#: src/callbacks.c:2694
+#: src/callbacks.c:2692
 msgid "...added audio..."
 msgstr ""
 
-#: src/callbacks.c:2778
+#: src/callbacks.c:2775
 msgid ""
 "This operation requires resizing or converting of frames.\n"
 "Please install 'convert' from the Image-magick package, and then restart "
@@ -2056,7 +2054,7 @@
 "Kérlek telepítsd fel a 'convert'-et az Image-magic csomagból, és indítsd "
 "újra a LiVES-t.\n"
 
-#: src/callbacks.c:2795
+#: src/callbacks.c:2793
 msgid ""
 "\n"
 "\n"
@@ -2070,7 +2068,7 @@
 "Próbáld meg azt, hogy kiválasztod az összes képkockát\n"
 "majd használd a 'Hang egyensúly' lehetőséget a hang menüből."
 
-#: src/callbacks.c:2819
+#: src/callbacks.c:2817
 msgid ""
 "LiVES cannot insert because the audio rates do not match.\n"
 "Please install 'sox', and try again."
@@ -2078,7 +2076,7 @@
 "A LiVES nem tudja beilleszteni, mert a hang ráták nem egyeznek.\n"
 "Kérlek telepítsd a 'sox'-ot, majd próbáld újra."
 
-#: src/callbacks.c:2838
+#: src/callbacks.c:2835
 msgid ""
 "\n"
 "Insertion will cause frames to shift in some multitrack layouts.\n"
@@ -2089,7 +2087,7 @@
 "multitrack kimenetbe.\n"
 "Biztosan folytatni szeretnéd?\n"
 
-#: src/callbacks.c:2888 src/callbacks.c:11692
+#: src/callbacks.c:2883 src/callbacks.c:11606
 msgid ""
 "\n"
 "Insertion will cause audio to shift in some multitrack layouts.\n"
@@ -2100,11 +2098,11 @@
 "kimenetbe.\n"
 "Biztosan folytatni szeretnéd?\n"
 
-#: src/callbacks.c:2996 src/callbacks.c:3025
+#: src/callbacks.c:2987 src/callbacks.c:3016
 msgid "Resampling clipboard audio"
 msgstr "Vágólap hang újramintázása"
 
-#: src/callbacks.c:3041
+#: src/callbacks.c:3032
 msgid ""
 "\n"
 "\n"
@@ -2116,7 +2114,7 @@
 "A LiVES nem képes újramintázni a vágólapi hangot. \n"
 "A vágólap hang törölve lesz.\n"
 
-#: src/callbacks.c:3055
+#: src/callbacks.c:3045
 msgid ""
 "\n"
 "\n"
@@ -2130,30 +2128,30 @@
 "Szeretnéd folytatni a beillesztést\n"
 "a változatlan hanggal?\n"
 
-#: src/callbacks.c:3137 src/callbacks.c:3311
+#: src/callbacks.c:3132 src/callbacks.c:3299
 #, c-format
 msgid "Inserting %d%s frames from the clipboard..."
 msgstr "%d%s képkockák beillesztése a vágólapról..."
 
-#: src/callbacks.c:3162 src/callbacks.c:3236 src/callbacks.c:3339
+#: src/callbacks.c:3155 src/callbacks.c:3224 src/callbacks.c:3325
 msgid "Inserting"
 msgstr "Beszúrás"
 
-#: src/callbacks.c:3193
+#: src/callbacks.c:3187
 #, c-format
 msgid "Inserting %d times from the clipboard%s..."
 msgstr "%d idők beillesztése a %s vágólapról..."
 
-#: src/callbacks.c:3200
+#: src/callbacks.c:3191
 #, c-format
 msgid "Inserting %d frames from the clipboard%s..."
 msgstr "%d képkockák beillesztése a %s vágólapról..."
 
-#: src/callbacks.c:3418
+#: src/callbacks.c:3404
 msgid "Insert"
 msgstr "Beszúrás"
 
-#: src/callbacks.c:3486
+#: src/callbacks.c:3471
 msgid ""
 "\n"
 "Deleting all frames will close this file.\n"
@@ -2163,7 +2161,7 @@
 "Minden kocka törlése a fájl bezárását eredményezi.\n"
 "Biztos vagy benne?"
 
-#: src/callbacks.c:3495
+#: src/callbacks.c:3480
 msgid ""
 "\n"
 "Deletion will cause missing frames in some multitrack layouts.\n"
@@ -2173,8 +2171,8 @@
 "A törlés hiányzó képkockákat eredményezhet a kimeneteken.\n"
 "Biztosan szeretnéd folytatni?\n"
 
-#: src/callbacks.c:3515 src/callbacks.c:10920 src/callbacks.c:11162
-#: src/callbacks.c:11228
+#: src/callbacks.c:3500 src/callbacks.c:10851 src/callbacks.c:11087
+#: src/callbacks.c:11152
 msgid ""
 "\n"
 "Deletion will cause missing audio in some multitrack layouts.\n"
@@ -2184,7 +2182,7 @@
 "A törlés hiányzó hangot eredményezhet a kimeneteken.\n"
 "Biztosan szeretnéd folytatni?\n"
 
-#: src/callbacks.c:3534
+#: src/callbacks.c:3519
 msgid ""
 "\n"
 "Deletion will cause frames to shift in some multitrack layouts.\n"
@@ -2195,7 +2193,7 @@
 "kimenetbe.\n"
 "Biztosan folytatni szeretnéd?\n"
 
-#: src/callbacks.c:3553 src/callbacks.c:11210
+#: src/callbacks.c:3538 src/callbacks.c:11134
 msgid ""
 "\n"
 "Deletion will cause audio to shift in some multitrack layouts.\n"
@@ -2206,20 +2204,20 @@
 "kimenetbe.\n"
 "Biztosan folytatni szeretnéd?\n"
 
-#: src/callbacks.c:3611
+#: src/callbacks.c:3597
 #, c-format
 msgid "Deleting frames %d to %d%s..."
 msgstr "%d képkockák törlése eddig: %d%s..."
 
-#: src/callbacks.c:3636
+#: src/callbacks.c:3619
 msgid "Deleting"
 msgstr "Törlés"
 
-#: src/callbacks.c:3717
+#: src/callbacks.c:3699
 msgid "Delete"
 msgstr "Törlés"
 
-#: src/callbacks.c:3738
+#: src/callbacks.c:3717
 msgid ""
 "\n"
 "\n"
@@ -2229,7 +2227,7 @@
 "\n"
 "Kijelölés zárolva.\n"
 
-#: src/callbacks.c:4092
+#: src/callbacks.c:4056
 msgid ""
 "Ready to record. Use 'control' and cursor keys during playback to record "
 "your performance.\n"
@@ -2241,11 +2239,11 @@
 "(A megszakításhoz nyomd meg az 'r' gombot, vagy a Lejátszás|előadás "
 "rögzítése gombot, mielött lejátszanád.)\n"
 
-#: src/callbacks.c:4098
+#: src/callbacks.c:4061
 msgid "Record cancelled.\n"
 msgstr "Felvétel megszakítva.\n"
 
-#: src/callbacks.c:4237
+#: src/callbacks.c:4197
 #, c-format
 msgid ""
 "\n"
@@ -2258,7 +2256,7 @@
 "A '%s' bővítmény jelentései:\n"
 "%s\n"
 
-#: src/callbacks.c:4241
+#: src/callbacks.c:4200
 #, c-format
 msgid ""
 "\n"
@@ -2271,7 +2269,7 @@
 "Nem találom az 'init' metódust a %s bővítményben.\n"
 "A bővítmény valószínüleg sérült, vagy nincs megfelelően feltelepítve."
 
-#: src/callbacks.c:4571
+#: src/callbacks.c:4532
 #, c-format
 msgid ""
 "Saving the set will cause copies of all loaded clips to remain on the disk"
@@ -2283,22 +2281,22 @@
 "\n"
 "Kérlek nyomj 'Mégse'-t, ha nem ezt szeretted volna.\n"
 
-#: src/callbacks.c:4654
+#: src/callbacks.c:4617
 #, c-format
 msgid "Saving set %s"
 msgstr "%s beállítás mentése"
 
-#: src/callbacks.c:5005
+#: src/callbacks.c:4964
 #, c-format
 msgid "Loading clips from set %s"
 msgstr "Klipek betöltése a %s beállításból"
 
-#: src/callbacks.c:5093
+#: src/callbacks.c:5051
 #, c-format
 msgid "%d clips and %d layouts were recovered from set (%s).\n"
 msgstr ""
 
-#: src/callbacks.c:5312
+#: src/callbacks.c:5259
 msgid ""
 "LiVES will attempt to recover some disk space.\n"
 "You should ONLY run this if you have no other copies of LiVES running on "
@@ -2309,24 +2307,24 @@
 "Csak akkor használd, ha nincs még egy futó példány a LiVES-ból a gépen.\n"
 "Jóváhagyáshoz nyomj 'OK'-t\n"
 
-#: src/callbacks.c:5317
+#: src/callbacks.c:5264
 msgid "Cleaning up disk space..."
 msgstr "Lemez terület felszabadítása..."
 
-#: src/callbacks.c:5387
+#: src/callbacks.c:5334
 msgid "Recovering disk space"
 msgstr ""
 
-#: src/callbacks.c:5439
+#: src/callbacks.c:5386
 #, c-format
 msgid "%s of disk space was recovered.\n"
 msgstr ""
 
-#: src/callbacks.c:5482
+#: src/callbacks.c:5428
 msgid "Resetting frame rates and frame values..."
 msgstr "Képkocka arány és képkocka értékek alapértékre állítása..."
 
-#: src/callbacks.c:5523
+#: src/callbacks.c:5469
 #, c-format
 msgid ""
 "\n"
@@ -2334,12 +2332,12 @@
 "Internal: %s (%d bpp) / %s\n"
 msgstr ""
 
-#: src/callbacks.c:5525
+#: src/callbacks.c:5471
 msgid "buffered"
 msgstr ""
 
-#: src/callbacks.c:5538 src/callbacks.c:5557 src/callbacks.c:5575
-#: src/callbacks.c:5609
+#: src/callbacks.c:5484 src/callbacks.c:5502 src/callbacks.c:5518
+#: src/callbacks.c:5551
 msgid ""
 "\n"
 "  Opening..."
@@ -2347,7 +2345,7 @@
 "\n"
 "  Megnyitás..."
 
-#: src/callbacks.c:5545
+#: src/callbacks.c:5490
 #, c-format
 msgid ""
 "\n"
@@ -2356,7 +2354,7 @@
 "\n"
 "(%d virtualis)"
 
-#: src/callbacks.c:5548
+#: src/callbacks.c:5493
 #, c-format
 msgid ""
 "\n"
@@ -2365,7 +2363,7 @@
 "\n"
 "(%d dekódolva)"
 
-#: src/callbacks.c:5560 src/callbacks.c:5578 src/callbacks.c:5612
+#: src/callbacks.c:5504 src/callbacks.c:5520 src/callbacks.c:5553
 #, c-format
 msgid ""
 "\n"
@@ -2374,7 +2372,7 @@
 "\n"
 "  %.2f mp."
 
-#: src/callbacks.c:5569
+#: src/callbacks.c:5512
 msgid ""
 "\n"
 "  Unknown"
@@ -2382,23 +2380,23 @@
 "\n"
 "  Ismeretlen"
 
-#: src/callbacks.c:5582 src/callbacks.c:5596
+#: src/callbacks.c:5524 src/callbacks.c:5538
 msgid "unsigned"
 msgstr "aláíratlan"
 
-#: src/callbacks.c:5583 src/callbacks.c:5597
+#: src/callbacks.c:5525 src/callbacks.c:5539
 msgid "signed"
 msgstr "aláírt"
 
-#: src/callbacks.c:5585 src/callbacks.c:5599
+#: src/callbacks.c:5527 src/callbacks.c:5541
 msgid "big-endian"
 msgstr "nagy-endian"
 
-#: src/callbacks.c:5586 src/callbacks.c:5600
+#: src/callbacks.c:5528 src/callbacks.c:5542
 msgid "little-endian"
 msgstr "kicsi endian"
 
-#: src/callbacks.c:5588 src/callbacks.c:5602
+#: src/callbacks.c:5530 src/callbacks.c:5544
 #, c-format
 msgid ""
 "  %d Hz %d bit\n"
@@ -2407,7 +2405,7 @@
 "  %d Hz %d bit\n"
 "%s %s"
 
-#: src/callbacks.c:5707
+#: src/callbacks.c:5647
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -2424,19 +2422,19 @@
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA.\n"
 msgstr ""
 
-#: src/callbacks.c:5721
+#: src/callbacks.c:5661
 msgid "A video editor and VJ program."
 msgstr "Videoszerkesztő és mixelő alkalmazás."
 
-#: src/callbacks.c:5722
+#: src/callbacks.c:5662
 msgid "About LiVES"
 msgstr ""
 
-#: src/callbacks.c:5724
+#: src/callbacks.c:5664
 msgid "translator_credits"
 msgstr ""
 
-#: src/callbacks.c:5758
+#: src/callbacks.c:5699
 #, c-format
 msgid ""
 "LiVES Version %s\n"
@@ -2450,7 +2448,7 @@
 "Homepage: http://lives.sourceforge.net"
 msgstr ""
 
-#: src/callbacks.c:6037
+#: src/callbacks.c:5996
 #, fuzzy
 msgid ""
 "\n"
@@ -2461,7 +2459,7 @@
 "\n"
 "A fájl előnézetéhez fel kell telepítened az mplayert.\n"
 
-#: src/callbacks.c:6040
+#: src/callbacks.c:5998
 #, fuzzy
 msgid ""
 "\n"
@@ -2473,223 +2471,214 @@
 "\n"
 "A fájl előnézetéhez fel kell telepítened az mplayert.\n"
 
-#: src/callbacks.c:6423 src/callbacks.c:8289
-msgid ""
-"\n"
-"Loading new audio may cause missing audio in some multitrack layouts.\n"
-"Are you sure you wish to continue ?\n"
-"."
-msgstr ""
-"\n"
-"Új hang betöltésekor a már korábban betöltött videófájlok hangja esetenként "
-"elnémulhat.\n"
-"Biztosan folytatni szeretnéd?\n"
-"."
-
-#: src/callbacks.c:6523
-#, c-format
-msgid "Opening audio %s, type %s..."
-msgstr "%s megnyitása, formátuma: %s..."
-
-#: src/callbacks.c:6556 src/saveplay.c:480
-msgid "Opening audio"
-msgstr "Hang megnyitása"
-
-#: src/callbacks.c:6565 src/callbacks.c:6612 src/callbacks.c:8387
-#: src/callbacks.c:8429 src/callbacks.c:8472 src/callbacks.c:10846
-msgid "Cancelling"
-msgstr "Megszakítás"
-
-#: src/callbacks.c:6660 src/callbacks.c:8514 src/callbacks.c:10876
-#: src/callbacks.c:11563
-msgid "Committing audio"
-msgstr "Hang hozzáadása"
-
-#: src/callbacks.c:6672 src/callbacks.c:8546
-msgid "New Audio"
-msgstr "Új hang"
-
-#: src/callbacks.c:6779
+#: src/callbacks.c:6459
 #, c-format
 msgid ""
 "Text was saved as\n"
 "%s\n"
 msgstr ""
 
-#: src/callbacks.c:6951 src/saveplay.c:3618
-#, c-format
-msgid "%d frames are enough !\n"
-msgstr "%d képkoca elég!\n"
-
-#: src/callbacks.c:7050
+#: src/callbacks.c:6706
 msgid "LiVES: - Encoder debug output"
 msgstr "LiVES: - Kódoló figyelő kimenet"
 
-#: src/callbacks.c:7087 src/gui.c:1922
+#: src/callbacks.c:6743 src/gui.c:1921
 msgid "Fullscreen playback (f)"
 msgstr "Teljes képernyős visszajátszás (f)"
 
-#: src/callbacks.c:7089
+#: src/callbacks.c:6744
 msgid "Fullscreen playback off (f)"
 msgstr "Teljes képernyős visszajátszás ki (f)"
 
-#: src/callbacks.c:7188 src/callbacks.c:7336 src/callbacks.c:7664
-#: src/callbacks.c:7681 src/gui.c:3712 src/saveplay.c:2467 src/saveplay.c:2501
-#: src/saveplay.c:3115 src/saveplay.c:3220 src/saveplay.c:3239
-#: src/multitrack.c:9340 src/multitrack.c:11060
+#: src/callbacks.c:6841 src/callbacks.c:6983 src/callbacks.c:7283
+#: src/callbacks.c:7298 src/gui.c:3838 src/saveplay.c:2442 src/saveplay.c:2475
+#: src/saveplay.c:3074 src/saveplay.c:3178 src/saveplay.c:3197
+#: src/multitrack.c:9526 src/multitrack.c:11288
 #, c-format
 msgid " (%d %% scale)"
 msgstr ""
 
-#: src/callbacks.c:7190 src/callbacks.c:7338 src/callbacks.c:7666
-#: src/gui.c:3716 src/saveplay.c:2469 src/saveplay.c:2503
+#: src/callbacks.c:6843 src/callbacks.c:6985 src/callbacks.c:7285
+#: src/gui.c:3842 src/saveplay.c:2444 src/saveplay.c:2477
 #, c-format
 msgid "LiVES: - Play Window%s"
 msgstr ""
 
-#: src/callbacks.c:7302 src/gui.c:1907
+#: src/callbacks.c:6950 src/gui.c:1906
 msgid "Double size (d)"
 msgstr "Dupla méret (d)"
 
-#: src/callbacks.c:7309
+#: src/callbacks.c:6956
 msgid "Single size (d)"
 msgstr "Normál méret (d)"
 
-#: src/callbacks.c:7442 src/callbacks.c:7443
+#: src/callbacks.c:7087 src/callbacks.c:7088
 msgid "Hide the play window (s)"
 msgstr "Lejátszó ablak(ok) elrejtése"
 
-#: src/callbacks.c:7452 src/gui.c:1746
+#: src/callbacks.c:7096 src/gui.c:1744
 msgid "Show the play window (s)"
 msgstr "Lejátszó ablak(ok) mutatása"
 
-#: src/callbacks.c:7453 src/gui.c:1896
+#: src/callbacks.c:7097 src/gui.c:1895
 msgid "Play in separate window (s)"
 msgstr "Lejátszás külön ablak(ok)ban"
 
-#: src/callbacks.c:7535 src/gui.c:4060 src/saveplay.c:2498
+#: src/callbacks.c:7175 src/gui.c:4169 src/saveplay.c:2472
 msgid "LiVES: - Streaming"
 msgstr ""
 
-#: src/callbacks.c:7778
+#: src/callbacks.c:7388
 msgid "Switch continuous looping off (o)"
 msgstr "Folytatólagos kötés kikapcsolása (o)"
 
-#: src/callbacks.c:7785 src/gui.c:1795
+#: src/callbacks.c:7394 src/gui.c:1793
 msgid "Switch continuous looping on (o)"
 msgstr "Folytatólagos kötés bekapcsolása (o)"
 
-#: src/callbacks.c:7837
+#: src/callbacks.c:7444
 #, c-format
 msgid "Audio volume (%.2f)"
 msgstr "Hangerő (%.2f)"
 
-#: src/callbacks.c:7876 src/callbacks.c:7877 src/gui.c:3640
+#: src/callbacks.c:7483 src/callbacks.c:7484 src/gui.c:3766
 msgid "Unmute the audio (z)"
 msgstr "Hang némítás ki (z)"
 
-#: src/callbacks.c:7888 src/callbacks.c:7889 src/gui.c:1808 src/gui.c:3639
+#: src/callbacks.c:7494 src/callbacks.c:7495 src/gui.c:1806 src/gui.c:3765
 msgid "Mute the audio (z)"
 msgstr "Hang némítás be (z)"
 
-#: src/callbacks.c:8038
+#: src/callbacks.c:7643
 msgid "Reversing clipboard..."
 msgstr "Vágólap megfordítása..."
 
-#: src/callbacks.c:8052
+#: src/callbacks.c:7657
 msgid "Reversing clipboard"
 msgstr "Vágólap megfordítása"
 
-#: src/callbacks.c:8084
+#: src/callbacks.c:7689
 msgid "LiVES: Load subtitles from..."
 msgstr ""
 
-#: src/callbacks.c:8151 src/saveplay.c:970
+#: src/callbacks.c:7753 src/saveplay.c:956
 #, c-format
 msgid "Loaded subtitle file: %s\n"
 msgstr ""
 
-#: src/callbacks.c:8220
+#: src/callbacks.c:7821
 msgid "Subtitles were erased.\n"
 msgstr ""
 
-#: src/callbacks.c:8239
+#: src/callbacks.c:7843
 #, fuzzy
 msgid "LiVES: - Select Audio File"
 msgstr "Hang fájl kiválasztása"
 
-#: src/callbacks.c:8250
+#: src/callbacks.c:7878 src/callbacks.c:8232
+msgid ""
+"\n"
+"Loading new audio may cause missing audio in some multitrack layouts.\n"
+"Are you sure you wish to continue ?\n"
+"."
+msgstr ""
+"\n"
+"Új hang betöltésekor a már korábban betöltött videófájlok hangja esetenként "
+"elnémulhat.\n"
+"Biztosan folytatni szeretnéd?\n"
+"."
+
+#: src/callbacks.c:7989
+#, c-format
+msgid "Opening audio %s, type %s..."
+msgstr "%s megnyitása, formátuma: %s..."
+
+#: src/callbacks.c:8023 src/saveplay.c:477
+msgid "Opening audio"
+msgstr "Hang megnyitása"
+
+#: src/callbacks.c:8032 src/callbacks.c:8083 src/callbacks.c:8327
+#: src/callbacks.c:8369 src/callbacks.c:8412 src/callbacks.c:10766
+msgid "Cancelling"
+msgstr "Megszakítás"
+
+#: src/callbacks.c:8137 src/callbacks.c:8454 src/callbacks.c:10803
+#: src/callbacks.c:11477
+msgid "Committing audio"
+msgstr "Hang hozzáadása"
+
+#: src/callbacks.c:8153 src/callbacks.c:8484
+msgid "New Audio"
+msgstr "Új hang"
+
+#: src/callbacks.c:8194
 msgid "Please set your CD play device in Tools | Preferences | Misc\n"
 msgstr ""
 "Kérlek állítsd be a CD lejátszó eszközöd az Eszközök | Beállítások | Vegyes "
 "menüben\n"
 
-#: src/callbacks.c:8321
+#: src/callbacks.c:8264
 #, c-format
 msgid "Opening CD track %d from %s..."
 msgstr "%d CD szám megnyitása innen: %s..."
 
-#: src/callbacks.c:8326
+#: src/callbacks.c:8267
 #, c-format
 msgid "CD track %d"
 msgstr "CD szám: %d"
 
-#: src/callbacks.c:8373
+#: src/callbacks.c:8313
 msgid "Opening CD track..."
 msgstr "CD szám megnyitása..."
 
-#: src/callbacks.c:8415 src/callbacks.c:8461
+#: src/callbacks.c:8355 src/callbacks.c:8401
 msgid "Error loading CD track\n"
 msgstr "Hiba a CD szám megnyitása közben\n"
 
-#: src/callbacks.c:8584
+#: src/callbacks.c:8518
 msgid "layout errors"
 msgstr "kimeneti hibák"
 
-#: src/callbacks.c:8595
+#: src/callbacks.c:8529
 msgid "Close _Window"
 msgstr "_Ablak bezárása"
 
-#: src/callbacks.c:8606
+#: src/callbacks.c:8540
 msgid "Clear _Errors"
 msgstr "_Hibák törlése"
 
-#: src/callbacks.c:8617
+#: src/callbacks.c:8551
 msgid "_Delete affected layouts"
 msgstr "_Érintett kimenetek törlése"
 
-#: src/callbacks.c:9343 src/callbacks.c:9388
+#: src/callbacks.c:9253 src/callbacks.c:9298
 msgid "Resume"
 msgstr "Folytatás"
 
-#: src/callbacks.c:9344
+#: src/callbacks.c:9254
 msgid ""
 "\n"
 "Paused\n"
 "(click Resume to continue processing)"
 msgstr ""
 
-#: src/callbacks.c:9345 src/callbacks.c:9406
+#: src/callbacks.c:9255 src/callbacks.c:9315
 msgid "paused..."
 msgstr "megállítva..."
 
-#: src/callbacks.c:9372 src/callbacks.c:9418
-msgid "Pause"
-msgstr "Megállítás"
-
-#: src/callbacks.c:9374 src/callbacks.c:9421
+#: src/callbacks.c:9284 src/callbacks.c:9333
 msgid "resumed..."
 msgstr "folytatva..."
 
-#: src/callbacks.c:9393
+#: src/callbacks.c:9303
 msgid "Keep"
 msgstr "Megtartás"
 
-#: src/callbacks.c:9396
+#: src/callbacks.c:9305
 msgid "Enough"
 msgstr ""
 
-#: src/callbacks.c:9401
+#: src/callbacks.c:9310
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2702,28 +2691,28 @@
 "(Kattints a 'Megtartás' gombra, hogy megtartsd amit készítettél)\n"
 "(Kattints a 'Folytatás' gombra, hogy folytatódjon a folyamat)"
 
-#: src/callbacks.c:9419
+#: src/callbacks.c:9331
 msgid "Cancel"
 msgstr "Mégse"
 
-#: src/callbacks.c:9558
+#: src/callbacks.c:9478
 msgid "Stop"
 msgstr ""
 
-#: src/callbacks.c:10053 src/multitrack.c:13247
+#: src/callbacks.c:9968 src/multitrack.c:13489
 msgid "LiVES: Selected frame"
 msgstr "LiVES: Kijelölt képkocka"
 
-#: src/callbacks.c:10061
+#: src/callbacks.c:9976
 msgid "_Save frame as..."
 msgstr ""
 
-#: src/callbacks.c:10290
+#: src/callbacks.c:10202
 #, c-format
 msgid "Audio is ahead of video by %.4f secs. at frame %d, with fps %.4f\n"
 msgstr ""
 
-#: src/callbacks.c:10347
+#: src/callbacks.c:10255
 msgid ""
 "\n"
 "\n"
@@ -2732,7 +2721,7 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10353
+#: src/callbacks.c:10261
 msgid ""
 "\n"
 "\n"
@@ -2744,7 +2733,7 @@
 "Fel kell telepítened az \"xwininfo\"-t ezen képesség használatához\n"
 "\n"
 
-#: src/callbacks.c:10429 src/callbacks.c:11479
+#: src/callbacks.c:10334 src/callbacks.c:11395
 msgid ""
 "\n"
 "Record time must be greater than 0.\n"
@@ -2752,7 +2741,7 @@
 "\n"
 "A rögzítési időnek nagyobbnak kell lennie 0-nál.\n"
 
-#: src/callbacks.c:10440
+#: src/callbacks.c:10346
 msgid ""
 "Capture an External Window:\n"
 "\n"
@@ -2766,11 +2755,11 @@
 "Nyomj 'Mégse'-t a megszakításhoz\n"
 "\n"
 
-#: src/callbacks.c:10445
+#: src/callbacks.c:10351
 msgid "External window was released.\n"
 msgstr "Külső ablak felszabadítva.\n"
 
-#: src/callbacks.c:10479
+#: src/callbacks.c:10385
 msgid ""
 "Click on a Window to Capture it\n"
 "Press 'q' to stop recording"
@@ -2778,7 +2767,7 @@
 "Kattints az ablakra a rögzítéshez\n"
 "nyomj 'q'-t a felvétel megállításához"
 
-#: src/callbacks.c:10513
+#: src/callbacks.c:10419
 #, c-format
 msgid ""
 "\n"
@@ -2793,19 +2782,19 @@
 "Stop vagy 'q' a befejezéshez.\n"
 "(Az alapértelmezett %.3f képkocka/másodperc lesz használva.)\n"
 
-#: src/callbacks.c:10539
+#: src/callbacks.c:10443
 msgid "LiVES was unable to capture this window. Sorry.\n"
 msgstr "A LiVES nem képes rögzíteni ezt az ablakot. Elnézést.\n"
 
-#: src/callbacks.c:10695
+#: src/callbacks.c:10601
 msgid "Export Selected Audio as..."
 msgstr "Kijelölt hang exportálása mint..."
 
-#: src/callbacks.c:10699
+#: src/callbacks.c:10604
 msgid "Export Audio as..."
 msgstr "Hang exportálása mint..."
 
-#: src/callbacks.c:10714
+#: src/callbacks.c:10619
 msgid ""
 "\n"
 "\n"
@@ -2818,87 +2807,87 @@
 "A hanglejátszás sebessége meg lett változtatva a klipben.\n"
 "'OK' az új sebesség exportálásához, vagy 'Mégse' az eredeti exportálásához.\n"
 
-#: src/callbacks.c:10720
+#: src/callbacks.c:10625
 #, c-format
 msgid "Exporting audio frames %d to %d as %s..."
 msgstr "%d hang exportálása ide: %d, mint: %s..."
 
-#: src/callbacks.c:10725
+#: src/callbacks.c:10629
 #, c-format
 msgid "Exporting audio as %s..."
 msgstr "Hang exportálása mint %s..."
 
-#: src/callbacks.c:10751
+#: src/callbacks.c:10655
 msgid "Exporting audio"
 msgstr "Hang exportálása"
 
-#: src/callbacks.c:10782
+#: src/callbacks.c:10695
 #, fuzzy
 msgid "LiVES: - Append Audio File"
 msgstr "Hang fájl hozzáfűzése..."
 
-#: src/callbacks.c:10825
+#: src/callbacks.c:10739
 #, c-format
 msgid "Appending audio file %s..."
 msgstr "%s hang fájl hozzáfűzése..."
 
-#: src/callbacks.c:10836
+#: src/callbacks.c:10756
 msgid "Appending audio"
 msgstr "Hang hozzáfűzése"
 
-#: src/callbacks.c:10892
+#: src/callbacks.c:10818
 msgid "Append Audio"
 msgstr "Hang hozzáfűzés"
 
-#: src/callbacks.c:10952
+#: src/callbacks.c:10883
 #, c-format
 msgid "Padding audio to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10954
+#: src/callbacks.c:10885
 #, c-format
 msgid "Trimming audio from %.2f to %.2f seconds..."
 msgstr "Hang vágása %.2f -től %.2f másodpercig..."
 
-#: src/callbacks.c:10973
+#: src/callbacks.c:10904
 msgid "Trimming/Padding audio"
 msgstr "Hang nyesés/kitöltés"
 
-#: src/callbacks.c:10981
+#: src/callbacks.c:10912
 msgid "Trim/Pad Audio"
 msgstr "Hangot nyes/kitölt"
 
-#: src/callbacks.c:11055
+#: src/callbacks.c:10982
 msgid "Fading audio in"
 msgstr "Fokozatosan erősödő hang"
 
-#: src/callbacks.c:11056
+#: src/callbacks.c:10983
 msgid "Fade audio in"
 msgstr "Fokozatosan erősödő hang"
 
-#: src/callbacks.c:11061
+#: src/callbacks.c:10987
 msgid "Fading audio out"
 msgstr "Fokozatosan halkuló hang"
 
-#: src/callbacks.c:11062
+#: src/callbacks.c:10988
 msgid "Fade audio out"
 msgstr "Fokozatosan halkuló hang"
 
-#: src/callbacks.c:11085
+#: src/callbacks.c:11011
 #, c-format
 msgid "%s over %.1f seconds..."
 msgstr "%s %.1f másodpercen túl..."
 
-#: src/callbacks.c:11087
+#: src/callbacks.c:11013
 #, c-format
 msgid "%s from time %.2f seconds to %.2f seconds..."
 msgstr "%s : %.2f másodperctől %.2f másodpercig..."
 
-#: src/callbacks.c:11094
+#: src/callbacks.c:11020
 msgid "Fading audio..."
 msgstr "Halkuló hang..."
 
-#: src/callbacks.c:11194
+#: src/callbacks.c:11119
 msgid ""
 "\n"
 "Deleting all audio will close this file.\n"
@@ -2908,47 +2897,47 @@
 "Az összes hang törlése bezárja a fájlt.\n"
 "Biztos vagy benne?"
 
-#: src/callbacks.c:11197
+#: src/callbacks.c:11122
 msgid "Deleting all audio..."
 msgstr "Minden hang törlése..."
 
-#: src/callbacks.c:11203
+#: src/callbacks.c:11127
 #, c-format
 msgid "Deleting audio from %.2f to %.2f seconds..."
 msgstr "Hang törlése %.2f-től %.2f másodpercig..."
 
-#: src/callbacks.c:11290
+#: src/callbacks.c:11214
 msgid "Deleting Audio"
 msgstr "Hang törlése"
 
-#: src/callbacks.c:11297
+#: src/callbacks.c:11221
 msgid "Delete Audio"
 msgstr "Hang törlése"
 
-#: src/callbacks.c:11636
+#: src/callbacks.c:11550
 msgid "Record new audio"
 msgstr "Új hang rögzítése"
 
-#: src/callbacks.c:11725
+#: src/callbacks.c:11640
 #, c-format
 msgid "Inserting silence from %.2f to %.2f seconds..."
 msgstr "Csend beszúrása a %.2f-től a %.2f másodpercig..."
 
-#: src/callbacks.c:11754
+#: src/callbacks.c:11666
 msgid "Inserting Silence"
 msgstr "Csend beszúrása"
 
-#: src/merge.c:85
+#: src/merge.c:96
 msgid "LiVES: - Merge"
 msgstr "LiVES: - Összeolvasztás"
 
-#: src/merge.c:102
+#: src/merge.c:113
 #, c-format
 msgid "Merge Clipboard [ %d Frames ]       With Selection [ %d Frames ]"
 msgstr ""
 "Vágólap összeolvasztása [ %d képkockák ]       A kijelölttel [ %d képkockák ]"
 
-#: src/merge.c:107
+#: src/merge.c:118
 #, c-format
 msgid ""
 "Merge Clipboard [ %d Frames (resampled) ]       With Selection [ %d Frames ]"
@@ -2956,585 +2945,585 @@
 "Vágólap összeolvasztása [ %d képkockák (újramintázott)]       A kijelölttel "
 "[ %d képkockák ]"
 
-#: src/merge.c:118
+#: src/merge.c:130
 msgid "Align _Starts"
 msgstr "_Kezdőpontok igazítása"
 
-#: src/merge.c:123
+#: src/merge.c:135
 msgid "Align _Ends"
 msgstr "_Végek igazítása"
 
-#: src/merge.c:134
+#: src/merge.c:146
 msgid "What to do with extra clipboard frames -"
 msgstr "Mit csináljak az extra vágólap képkockákkal -"
 
-#: src/merge.c:137
+#: src/merge.c:149
 msgid "_Insert Frames"
 msgstr "_Képkockák beillesztése"
 
-#: src/merge.c:143
+#: src/merge.c:155
 msgid "_Drop Frames"
 msgstr "_Képkockák eldobása"
 
-#: src/merge.c:149
+#: src/merge.c:160
 msgid "Number of Times to Loop Clipboard"
 msgstr "A vágólap ismétlődésének számai"
 
-#: src/merge.c:160
+#: src/merge.c:171
 msgid "_Loop Clipboard to Fit Selection"
 msgstr "_Vágólap ismétlése a jelen kijelöléshez"
 
-#: src/merge.c:173
+#: src/merge.c:184
 msgid "_Transition Method:"
 msgstr "_Átmenet metódusa:"
 
-#: src/merge.c:394
+#: src/merge.c:395
 msgid "Merging clipboard with selection..."
 msgstr "A vágólap összeolvasztása a kijelöltekkel..."
 
-#: src/merge.c:551
+#: src/merge.c:539
 msgid "Merge done.\n"
 msgstr "Összeolvasztás kész.\n"
 
-#: src/gui.c:123
+#: src/gui.c:122
 msgid "_Custom Generators"
 msgstr ""
 
-#: src/gui.c:124
+#: src/gui.c:123
 msgid "_Custom Effects"
 msgstr "_Egyéni effektek"
 
-#: src/gui.c:125
+#: src/gui.c:124
 msgid "Custom _Utilities"
 msgstr "Egyéni _segédprogramok"
 
-#: src/gui.c:352 src/multitrack.c:5964
+#: src/gui.c:351 src/multitrack.c:6143
 msgid "_File"
 msgstr "_Fájl"
 
-#: src/gui.c:367 src/multitrack.c:5989
+#: src/gui.c:366 src/multitrack.c:6168
 msgid "_Open File/Directory"
 msgstr "_Fájl/könyvtár megnyitása"
 
-#: src/gui.c:373
+#: src/gui.c:372
 msgid "O_pen Part of File..."
 msgstr ""
 
-#: src/gui.c:379 src/gui.c:383 src/multitrack.c:6006 src/multitrack.c:6023
-#: src/multitrack.c:6028
+#: src/gui.c:378 src/gui.c:382 src/multitrack.c:6185 src/multitrack.c:6202
+#: src/multitrack.c:6207
 msgid "Open _Location/Stream..."
 msgstr "_Hely/adatfolyam megnyitása..."
 
-#: src/gui.c:393 src/multitrack.c:6016
+#: src/gui.c:392 src/multitrack.c:6195
 msgid "Open _Youtube Clip..."
 msgstr ""
 
-#: src/gui.c:404
+#: src/gui.c:403
 msgid "Import from _dvd/vcd..."
 msgstr ""
 
-#: src/gui.c:413
+#: src/gui.c:412
 msgid "Import from _dvd"
 msgstr ""
 
-#: src/gui.c:416
+#: src/gui.c:415
 msgid "Import from _vcd"
 msgstr ""
 
-#: src/gui.c:419
+#: src/gui.c:418
 msgid "_Import from Firewire"
 msgstr ""
 
-#: src/gui.c:428 src/multitrack.c:6086
+#: src/gui.c:427 src/multitrack.c:6265
 msgid "Import from _Firewire Device (dv)"
 msgstr "Importálás innen: _firewire eszköz (dv)"
 
-#: src/gui.c:429 src/multitrack.c:6094
+#: src/gui.c:428 src/multitrack.c:6273
 msgid "Import from _Firewire Device (hdv)"
 msgstr "Importálás innen: _firewire eszköz (hdv)"
 
-#: src/gui.c:457
+#: src/gui.c:456
 msgid "_Add Webcam/TV card..."
 msgstr ""
 
-#: src/gui.c:476
+#: src/gui.c:475
 msgid "Add _Unicap Device"
 msgstr ""
 
-#: src/gui.c:486
+#: src/gui.c:485
 msgid "Add Live _Firewire Device"
 msgstr ""
 
-#: src/gui.c:495
+#: src/gui.c:494
 msgid "Add _TV Device"
 msgstr ""
 
-#: src/gui.c:510 src/multitrack.c:6117
+#: src/gui.c:509 src/multitrack.c:6296
 msgid "_Recent Files..."
 msgstr "_Legutóbbi fájlok..."
 
-#: src/gui.c:560 src/multitrack.c:6177
+#: src/gui.c:559 src/multitrack.c:6356
 msgid "_Reload Clip Set..."
 msgstr "_Klip beállítás újratöltése..."
 
-#: src/gui.c:564 src/multitrack.c:6185
+#: src/gui.c:563 src/multitrack.c:6364
 msgid "Close/Sa_ve All Clips"
 msgstr "_Bezárás/összes klip mentése"
 
-#: src/gui.c:575
+#: src/gui.c:574
 msgid "_Encode Clip As..."
 msgstr ""
 
-#: src/gui.c:577
+#: src/gui.c:576
 msgid "Encode _Selection As..."
 msgstr "_Kijelöltek kódolása mint..."
 
-#: src/gui.c:584
+#: src/gui.c:583
 msgid "_Close This Clip"
 msgstr "_Klip bezárása"
 
-#: src/gui.c:595
+#: src/gui.c:594
 msgid "_Backup Clip as .lv1..."
 msgstr "_Biztonsági mentés a klipről mint .lv01..."
 
-#: src/gui.c:604
+#: src/gui.c:603
 msgid "_Restore Clip from .lv1..."
 msgstr "_Klip helyreállítása .lv1..."
 
-#: src/gui.c:615
+#: src/gui.c:614
 msgid "Encode/Load/Backup _with Sound"
 msgstr "Kódolás/mentés _hanggal"
 
-#: src/gui.c:620
+#: src/gui.c:619
 msgid "Auto load subtitles"
 msgstr ""
 
-#: src/gui.c:628 src/multitrack.c:6224
+#: src/gui.c:627 src/multitrack.c:6403
 msgid "Clean _up Diskspace"
 msgstr "_Lemezterület felszabadítása"
 
-#: src/gui.c:636 src/multitrack.c:6257
+#: src/gui.c:635 src/multitrack.c:6436
 msgid "_Edit"
 msgstr "_Szerkesztés"
 
-#: src/gui.c:685
+#: src/gui.c:684
 msgid "_MULTITRACK mode"
 msgstr "_MULTITRACK mód"
 
-#: src/gui.c:696
+#: src/gui.c:695
 msgid "_Copy Selection"
 msgstr "_Kijelöltek másolása"
 
-#: src/gui.c:705
+#: src/gui.c:704
 msgid "Cu_t Selection"
 msgstr "_Kijelöltek kivágása"
 
-#: src/gui.c:714
+#: src/gui.c:713
 msgid "_Insert from Clipboard..."
 msgstr "_Beillesztés a vágólapról..."
 
-#: src/gui.c:730
+#: src/gui.c:729
 msgid "Paste as _New"
 msgstr "Beillesztés _újként"
 
-#: src/gui.c:739
+#: src/gui.c:738
 msgid "_Merge Clipboard with Selection..."
 msgstr "_Vágólap összeolvasztása a kijelöltekkel..."
 
-#: src/gui.c:746
+#: src/gui.c:745
 msgid "_Delete Selection"
 msgstr "_Kijelölés törlése"
 
-#: src/gui.c:764
+#: src/gui.c:763
 msgid "Decouple _Video from Audio"
 msgstr "_Videó elválasztása a hangtól"
 
-#: src/gui.c:772
+#: src/gui.c:771
 msgid "_Select..."
 msgstr "_Kijelölés..."
 
-#: src/gui.c:786
+#: src/gui.c:785
 msgid "Select _All Frames"
 msgstr "_Minden képkocka kijelölése"
 
-#: src/gui.c:794
+#: src/gui.c:793
 msgid "_Start Frame Only"
 msgstr "_Csak az első képkockát"
 
-#: src/gui.c:802
+#: src/gui.c:801
 msgid "_End Frame Only"
 msgstr "_Csak az utolsó képkockát"
 
-#: src/gui.c:813
+#: src/gui.c:812
 msgid "Select from _First Frame"
 msgstr "_Kijelölés az első képkockától"
 
-#: src/gui.c:817
+#: src/gui.c:816
 msgid "Select to _Last Frame"
 msgstr "_Kijelölés az utolsó képkockáig"
 
-#: src/gui.c:821
+#: src/gui.c:820
 msgid "Select Last Insertion/_Merge"
 msgstr "legutóbbi kijelölés kiválasztása/_összefűzés"
 
-#: src/gui.c:825
+#: src/gui.c:824
 msgid "Select Last _Effect"
 msgstr "_Utolsó effekt kiválasztása"
 
-#: src/gui.c:829
+#: src/gui.c:828
 msgid "_Invert Selection"
 msgstr "_Kijelölés megfordítása"
 
-#: src/gui.c:837
+#: src/gui.c:836
 msgid "_Lock Selection Width"
 msgstr "_Kijelöltek zárolása"
 
-#: src/gui.c:842 src/multitrack.c:6409
+#: src/gui.c:841 src/multitrack.c:6591
 msgid "_Play"
 msgstr "_Lejátszás"
 
-#: src/gui.c:854
+#: src/gui.c:853
 msgid "_Play All"
 msgstr "_Mind lejátszása"
 
-#: src/gui.c:869
+#: src/gui.c:868
 msgid "Pla_y Selection"
 msgstr "_Kijelöltek lejátszása"
 
-#: src/gui.c:877
+#: src/gui.c:876
 msgid "Play _Clipboard"
 msgstr "_Vágólap lejátszása"
 
-#: src/gui.c:899 src/multitrack.c:6441
+#: src/gui.c:898 src/multitrack.c:6623
 msgid "_Stop"
 msgstr "_Leállítás"
 
-#: src/gui.c:914 src/multitrack.c:6453
+#: src/gui.c:913 src/multitrack.c:6635
 msgid "Re_wind"
 msgstr "_Előre"
 
-#: src/gui.c:946 src/multitrack.c:6471
+#: src/gui.c:945 src/multitrack.c:6653
 msgid "_Full Screen"
 msgstr "_Teljes képernyő"
 
-#: src/gui.c:955
+#: src/gui.c:954
 msgid "_Double Size"
 msgstr "_Dupla méret"
 
-#: src/gui.c:963 src/multitrack.c:6479
+#: src/gui.c:962 src/multitrack.c:6661
 msgid "Play in _Separate Window"
 msgstr "Lejátszás _önálló ablakban"
 
-#: src/gui.c:972
+#: src/gui.c:971
 msgid "_Blank Background"
 msgstr "_Üres háttér"
 
-#: src/gui.c:979
+#: src/gui.c:978
 msgid "(Auto)_loop Video (to fit audio track)"
 msgstr "(Automatikus)_videó rendezés (hogy kitöltse a zenét)"
 
-#: src/gui.c:988 src/multitrack.c:6487
+#: src/gui.c:987 src/multitrack.c:6669
 msgid "L_oop Continuously"
 msgstr "_Folytatólagos hurok"
 
-#: src/gui.c:997
+#: src/gui.c:996
 msgid "Pin_g Pong Loops"
 msgstr "_Ping pong hurkok"
 
-#: src/gui.c:1005 src/multitrack.c:6495
+#: src/gui.c:1004 src/multitrack.c:6677
 msgid "_Mute"
 msgstr "_Elnémítás"
 
-#: src/gui.c:1017
+#: src/gui.c:1016
 msgid "Separate Window 'S_ticky' Mode"
 msgstr "Önálló ablak, 'r_agadós' mód"
 
-#: src/gui.c:1025
+#: src/gui.c:1024
 msgid "S_how Frame Counter"
 msgstr "_Mutasd a képkocka számlálót"
 
-#: src/gui.c:1035
+#: src/gui.c:1034
 msgid "Show Subtitles"
 msgstr ""
 
-#: src/gui.c:1045
+#: src/gui.c:1044
 msgid "Letterbox mode"
 msgstr ""
 
-#: src/gui.c:1051 src/multitrack.c:6507
+#: src/gui.c:1050 src/multitrack.c:6689
 msgid "Effect_s"
 msgstr "_Effektek"
 
-#: src/gui.c:1054
+#: src/gui.c:1053
 msgid "Effects are applied to the current selection."
 msgstr "Az effektek az aktuális kijelölésnél lesznek alkalmazva."
 
-#: src/gui.c:1067
+#: src/gui.c:1066
 msgid "_Run Test Rendered Effect/Tool/Generator..."
 msgstr "_Effekt/Eszköz/Generátor teszt futtatása..."
 
-#: src/gui.c:1072 src/multitrack.c:7123
+#: src/gui.c:1071 src/multitrack.c:7299
 msgid "_Tools"
 msgstr "_Eszközök"
 
-#: src/gui.c:1075
+#: src/gui.c:1074
 msgid "Tools are applied to complete clips."
 msgstr "Az eszközök csak a teljes klipekhez használhatók."
 
-#: src/gui.c:1085
+#: src/gui.c:1084
 msgid "_Reverse Clipboard"
 msgstr "_Fordított vágólap"
 
-#: src/gui.c:1094
+#: src/gui.c:1093
 msgid "_Change Playback/Save Speed..."
 msgstr "_Lejátszási/mentési sebesség megváltoztatása..."
 
-#: src/gui.c:1099
+#: src/gui.c:1098
 msgid "Resample _Video to New Frame Rate..."
 msgstr "_Video újramintázása új képarány értékre..."
 
-#: src/gui.c:1105
+#: src/gui.c:1104
 msgid "_Utilities"
 msgstr "_Segédprogramok"
 
-#: src/gui.c:1110
+#: src/gui.c:1109
 msgid "Custom _Tools"
 msgstr "Egyéni _eszközök"
 
-#: src/gui.c:1116 src/multitrack.c:7149
+#: src/gui.c:1115 src/multitrack.c:7325
 msgid "_Generate"
 msgstr "_Létrehozás"
 
-#: src/gui.c:1126
+#: src/gui.c:1125
 msgid "Loading rendered effect plugins..."
 msgstr "Effekt bővítmények betöltése..."
 
-#: src/gui.c:1139
+#: src/gui.c:1138
 msgid "Load _Subtitles from File..."
 msgstr ""
 
-#: src/gui.c:1144
+#: src/gui.c:1143
 msgid "Erase subtitles"
 msgstr ""
 
-#: src/gui.c:1152 src/multitrack.c:7158
+#: src/gui.c:1151 src/multitrack.c:7334
 msgid "Capture _External Window... "
 msgstr "Felvétel _külső ablakban... "
 
-#: src/gui.c:1159 src/multitrack.c:7173
+#: src/gui.c:1158 src/multitrack.c:7349
 msgid "_Preferences..."
 msgstr "_Beállítások..."
 
-#: src/gui.c:1172
+#: src/gui.c:1171
 msgid "_Audio"
 msgstr "_Hang"
 
-#: src/gui.c:1184
+#: src/gui.c:1183
 msgid "Load _New Audio for Clip..."
 msgstr "_Új hang betöltése a kliphez..."
 
-#: src/gui.c:1190
+#: src/gui.c:1189
 msgid "Load _CD Track..."
 msgstr "_CD szám betöltése..."
 
-#: src/gui.c:1191
+#: src/gui.c:1190
 msgid "E_ject CD"
 msgstr "_CD kiadása"
 
-#: src/gui.c:1205
+#: src/gui.c:1204
 msgid "Record E_xternal Audio..."
 msgstr "_Külső hang rögzítése..."
 
-#: src/gui.c:1218
+#: src/gui.c:1217
 msgid "to New _Clip..."
 msgstr "Az új _klipnek..."
 
-#: src/gui.c:1222
+#: src/gui.c:1221
 msgid "to _Selection"
 msgstr "a _kijelölteknek"
 
-#: src/gui.c:1230
+#: src/gui.c:1229
 msgid "Fade Audio _In..."
 msgstr "_Fokozatos hangerősödés..."
 
-#: src/gui.c:1234
+#: src/gui.c:1233
 msgid "Fade Audio _Out..."
 msgstr "_Fokozatos elhalkulás..."
 
-#: src/gui.c:1244
+#: src/gui.c:1243
 msgid "_Export Audio..."
 msgstr "_Hang exportálása..."
 
-#: src/gui.c:1257
+#: src/gui.c:1256
 msgid "Export _Selected Audio..."
 msgstr "_Kijelölt hang exportálása..."
 
-#: src/gui.c:1261
+#: src/gui.c:1260
 msgid "Export _All Audio..."
 msgstr "_Minden hang exportálása..."
 
-#: src/gui.c:1265
+#: src/gui.c:1264
 msgid "_Append Audio..."
 msgstr "_Hang hozzáfűzése..."
 
-#: src/gui.c:1270
+#: src/gui.c:1269
 msgid "_Trim/Pad Audio..."
 msgstr "_Hang nyesés/kitöltés..."
 
-#: src/gui.c:1283
+#: src/gui.c:1282
 msgid "Trim/Pad Audio to _Selection"
 msgstr "Hang nyesés/kitöltés a _kijelöltnek"
 
-#: src/gui.c:1288
+#: src/gui.c:1287
 msgid "Trim/Pad Audio from Beginning to _Play Start"
 msgstr "Hang nyesés/kitöltés az elejétől a _lejátszás Indításáig"
 
-#: src/gui.c:1293
+#: src/gui.c:1292
 msgid "_Delete Audio..."
 msgstr "_Hang törlése..."
 
-#: src/gui.c:1306
+#: src/gui.c:1305
 msgid "Delete _Selected Audio"
 msgstr "_Kijelölt hang törlése"
 
-#: src/gui.c:1310
+#: src/gui.c:1309
 msgid "Delete _All Audio"
 msgstr "_Minden hang törlése"
 
-#: src/gui.c:1314
+#: src/gui.c:1313
 msgid "Insert _Silence in Selection"
 msgstr "_Csend beszúrása a kijelölésbe"
 
-#: src/gui.c:1319
+#: src/gui.c:1318
 msgid "_Resample Audio..."
 msgstr "_Hang újramintázása..."
 
-#: src/gui.c:1324
+#: src/gui.c:1323
 msgid "_Info"
 msgstr "_Info"
 
-#: src/gui.c:1336
+#: src/gui.c:1335
 msgid "Show Clip _Info"
 msgstr "Klip tulajdonságainak mutatása"
 
-#: src/gui.c:1344
+#: src/gui.c:1343
 msgid "Show/_Edit File Comments"
 msgstr "Fájl kommentek megjelenítése/_szerkesztése"
 
-#: src/gui.c:1349
+#: src/gui.c:1348
 msgid "Show _Clipboard Info"
 msgstr "_Vágólap információ megjelenítése"
 
-#: src/gui.c:1360 src/multitrack.c:7286
+#: src/gui.c:1359 src/multitrack.c:7462
 msgid "Show _Messages"
 msgstr "_Üzenetek megjelenítése"
 
-#: src/gui.c:1364 src/multitrack.c:7365
+#: src/gui.c:1363 src/multitrack.c:7541
 msgid "Show _Layout Errors"
 msgstr "_Kimeneti hibák mutatása"
 
-#: src/gui.c:1369 src/multitrack.c:7263
+#: src/gui.c:1368 src/multitrack.c:7439
 msgid "_Clips"
 msgstr "_Klipek"
 
-#: src/gui.c:1381
+#: src/gui.c:1380
 msgid "_Rename Current Clip in Menu..."
 msgstr "_Klip átnevezése a menüben"
 
-#: src/gui.c:1399
+#: src/gui.c:1398
 msgid "A_dvanced"
 msgstr "_Haladó"
 
-#: src/gui.c:1412
+#: src/gui.c:1411
 msgid "_RFX Effects/Tools/Utilities"
 msgstr "_RFX Effektek/Eszközök/Segédprogramok"
 
-#: src/gui.c:1424
+#: src/gui.c:1423
 msgid "_New Test RFX Script..."
 msgstr "_Új teszt RFX szkript..."
 
-#: src/gui.c:1428
+#: src/gui.c:1427
 msgid "_Copy RFX Script to Test..."
 msgstr "_RFX szkript másolása a tesztbe..."
 
-#: src/gui.c:1432
+#: src/gui.c:1431
 msgid "_Edit Test RFX Script..."
 msgstr "_Teszt RFX szkript szerkesztése..."
 
-#: src/gui.c:1436
+#: src/gui.c:1435
 msgid "Rena_me Test RFX Script..."
 msgstr "_Teszt RFX szkript átnevezése..."
 
-#: src/gui.c:1440
+#: src/gui.c:1439
 msgid "_Delete Test RFX Script..."
 msgstr "_Teszt RFX szkript törlése..."
 
-#: src/gui.c:1450
+#: src/gui.c:1449
 msgid "_Promote Test Rendered Effect/Tool/Generator..."
 msgstr "_Effekt/Eszköz/Generátor teszt előrehozatala..."
 
-#: src/gui.c:1457
+#: src/gui.c:1456
 msgid "_Import Custom RFX script..."
 msgstr "_Egyéni RFX szkript importálása..."
 
-#: src/gui.c:1461
+#: src/gui.c:1460
 msgid "E_xport Custom RFX script..."
 msgstr "_Egyéni RFX szkript exportálása..."
 
-#: src/gui.c:1465
+#: src/gui.c:1464
 msgid "De_lete Custom RFX Script..."
 msgstr "_Egyéni RFX szkript törlése..."
 
-#: src/gui.c:1472
+#: src/gui.c:1471
 msgid "Re_build all RFX plugins"
 msgstr "_Az összes RFX bővítmény újraépítése"
 
-#: src/gui.c:1501
+#: src/gui.c:1498
 msgid "Receive _LiVES stream from..."
 msgstr "_LiVES adafolyam fogadása innen..."
 
-#: src/gui.c:1506
+#: src/gui.c:1503
 msgid "_Send LiVES stream to..."
 msgstr "_LiVES adadfolyam küldése ide..."
 
-#: src/gui.c:1515
+#: src/gui.c:1512
 #, c-format
 msgid "Open _yuv4mpeg stream on %sstream.yuv..."
 msgstr "_yuv4mpeg adatfolyam megnyitása ezen: %sstream.yuv..."
 
-#: src/gui.c:1536
+#: src/gui.c:1534
 msgid "_Import Project (.lv2)..."
 msgstr "_Projekt importálása (.lv2)..."
 
-#: src/gui.c:1540
+#: src/gui.c:1538
 msgid "E_xport Project (.lv2)..."
 msgstr "_Projekt exportálása (.lv2)..."
 
-#: src/gui.c:1545
+#: src/gui.c:1543
 msgid "_VJ"
 msgstr "_VJ"
 
-#: src/gui.c:1557
+#: src/gui.c:1555
 msgid "Real Time _Effect Mapping"
 msgstr "Valós idejű _effekt leképezés"
 
-#: src/gui.c:1563
+#: src/gui.c:1561
 msgid "Bind real time effects to ctrl-number keys."
 msgstr "A valós idejű effektek hozzárendelése a ctrl-szám billentyűkhöz."
 
-#: src/gui.c:1565
+#: src/gui.c:1563
 msgid "Set Real Time Effect _Defaults"
 msgstr "Alapértelmezett beállítások használata"
 
-#: src/gui.c:1567
+#: src/gui.c:1565
 msgid "Set default parameter values for real time effects."
 msgstr "Az alapértelmezett paraméter értékek beállítása."
 
-#: src/gui.c:1580
+#: src/gui.c:1578
 msgid "Save Real Time Effect _Defaults"
 msgstr "Beállítások mentése alapértelmezettként"
 
-#: src/gui.c:1583
+#: src/gui.c:1581
 msgid ""
 "Save real time effect defaults so they will be restored each time you use "
 "LiVES."
@@ -3542,322 +3531,322 @@
 "Mentsd el a valós idejű effekt alapbeállításait, így azok minden LiVES "
 "indításnál visszaállítódnak."
 
-#: src/gui.c:1589
+#: src/gui.c:1587
 msgid "_Reset all playback speeds and positions"
 msgstr "_Minden lejátszó sebesség és pozíció visszaállítása"
 
-#: src/gui.c:1592
+#: src/gui.c:1590
 msgid ""
 "Reset all playback positions to frame 1, and reset all playback frame rates."
 msgstr ""
 "Minden lejátszási helyzet visszaállítása az első képkockához, és minden "
 "képarány visszaállítása."
 
-#: src/gui.c:1594
+#: src/gui.c:1592
 msgid "_MIDI/joystick interface"
 msgstr "_MIDI/joystick felület"
 
-#: src/gui.c:1609
+#: src/gui.c:1607
 msgid "_MIDI/joystick learner..."
 msgstr "_MIDI/joystick oktató..."
 
-#: src/gui.c:1614
+#: src/gui.c:1612
 msgid "_Save device mapping..."
 msgstr "_Eszköz lista mentése..."
 
-#: src/gui.c:1620
+#: src/gui.c:1618
 msgid "_Load device mapping..."
 msgstr "_Eszköz lista betöltése..."
 
-#: src/gui.c:1628
+#: src/gui.c:1626
 msgid "Show VJ _Keys"
 msgstr "VJ _billenytűk mutatása"
 
-#: src/gui.c:1632
+#: src/gui.c:1630
 msgid "To_ys"
 msgstr "_Játékok"
 
-#: src/gui.c:1644
+#: src/gui.c:1642
 msgid "_None"
 msgstr "_Nincs"
 
-#: src/gui.c:1652
+#: src/gui.c:1650
 msgid "_Autolives"
 msgstr ""
 
-#: src/gui.c:1657
+#: src/gui.c:1655
 msgid "_Mad Frames"
 msgstr "_Őrült képkockák"
 
-#: src/gui.c:1662
+#: src/gui.c:1660
 msgid "_LiVES TV (broadband)"
 msgstr "_LiVES TV (szélessávú)"
 
-#: src/gui.c:1672 src/multitrack.c:7387
+#: src/gui.c:1670 src/multitrack.c:7563
 msgid "_Help"
 msgstr "_Súgó"
 
-#: src/gui.c:1684 src/multitrack.c:7407
+#: src/gui.c:1682 src/multitrack.c:7583
 msgid "_Manual (opens in browser)"
 msgstr "_Kézikönyv (böngészőben nyílik meg)"
 
-#: src/gui.c:1691 src/multitrack.c:7416
+#: src/gui.c:1689 src/multitrack.c:7592
 msgid "_Donate to the project !"
 msgstr "_Támogasd a projektet!"
 
-#: src/gui.c:1695 src/multitrack.c:7420
+#: src/gui.c:1693 src/multitrack.c:7596
 msgid "_Email the author"
 msgstr "_Levél a fejlesztőnek"
 
-#: src/gui.c:1699 src/multitrack.c:7424
+#: src/gui.c:1697 src/multitrack.c:7600
 msgid "Report a _bug"
 msgstr "Hiba bejelentése"
 
-#: src/gui.c:1703 src/multitrack.c:7428
+#: src/gui.c:1701 src/multitrack.c:7604
 msgid "Suggest a _feature"
 msgstr "_Képesség ajánlása a fejlesztőnek"
 
-#: src/gui.c:1707 src/multitrack.c:7432
+#: src/gui.c:1705 src/multitrack.c:7608
 msgid "Assist with _translating"
 msgstr "Segítség a _fordításban"
 
-#: src/gui.c:1714 src/multitrack.c:7439
+#: src/gui.c:1712 src/multitrack.c:7615
 msgid "_Troubleshoot"
 msgstr "_Hibaelhárítás"
 
-#: src/gui.c:1718 src/multitrack.c:7443
+#: src/gui.c:1716 src/multitrack.c:7619
 msgid "_About"
 msgstr "_Névjegy"
 
-#: src/gui.c:1752
+#: src/gui.c:1750
 msgid "Rewind to start (w)"
 msgstr "_Visszatekerés az elejére (w)"
 
-#: src/gui.c:1760 src/multitrack.c:16720
+#: src/gui.c:1758 src/multitrack.c:17010
 msgid "Play all (p)"
 msgstr "Mind lejátszása (p)"
 
-#: src/gui.c:1768 src/gui.c:1877
+#: src/gui.c:1766 src/gui.c:1876
 msgid "Stop playback (q)"
 msgstr "Leállítás (q)"
 
-#: src/gui.c:1779
+#: src/gui.c:1777
 msgid "Play selection (y)"
 msgstr "Kijelöltek lejátszása (y)"
 
-#: src/gui.c:1832
+#: src/gui.c:1829
 msgid "Volume"
 msgstr "Hangerő"
 
-#: src/gui.c:1854
+#: src/gui.c:1853
 msgid "Audio volume (1.00)"
 msgstr "Hangerő (1.00)"
 
-#: src/gui.c:1883
+#: src/gui.c:1882
 msgid "Unblank background (b)"
 msgstr "Üres háttér (b)"
 
-#: src/gui.c:1929
+#: src/gui.c:1928
 msgid "Play slower (ctrl-down)"
 msgstr "Lejátszás lassabban (ctrl-le)"
 
-#: src/gui.c:1935
+#: src/gui.c:1934
 msgid "Play faster (ctrl-up)"
 msgstr "Lejátszás gyorsabban (ctrl-fel)"
 
-#: src/gui.c:1942
+#: src/gui.c:1941
 msgid "Skip back (ctrl-left)"
 msgstr "Ugrás vissza (ctrl-bal)"
 
-#: src/gui.c:1948
+#: src/gui.c:1947
 msgid "Skip forward (ctrl-right)"
 msgstr "Ugrás előre (ctrl-jobb)"
 
-#: src/gui.c:1954
+#: src/gui.c:1953
 msgid "Show clip info (i)"
 msgstr "Klip tuajdonságainak megjelenítése (i)"
 
-#: src/gui.c:1960
+#: src/gui.c:1959
 msgid "Hide this toolbar"
 msgstr "Eszköztár elrejtése"
 
-#: src/gui.c:1962
+#: src/gui.c:1961
 msgid ""
 "Press \"s\" to toggle separate play window for improved performance, \"q\" "
 "to stop."
 msgstr ""
 
 #. TRANSLATORS: please keep the translated string the same length
-#: src/gui.c:1995
+#: src/gui.c:1994
 msgid "     Video playback speed (frames per second)        "
 msgstr "     Videó lejátszás sebessége (másodpercenkénti képkockák)        "
 
-#: src/gui.c:2009
+#: src/gui.c:2008
 msgid "Vary the video speed"
 msgstr "Videó sebesség változtatása"
 
-#: src/gui.c:2092 src/gui.c:3218
+#: src/gui.c:2090 src/gui.c:3329
 msgid "First Frame"
 msgstr "Első képkocka"
 
-#: src/gui.c:2193 src/gui.c:3226
+#: src/gui.c:2191 src/gui.c:3336
 msgid "Last Frame"
 msgstr "Utolsó képkocka"
 
-#: src/gui.c:2210
+#: src/gui.c:2208
 msgid "The first selected frame in this clip"
 msgstr "A legelső kijelölt képkocka ebben a klipben"
 
-#: src/gui.c:2248
+#: src/gui.c:2246
 msgid "The last selected frame in this clip"
 msgstr "Az utolsó kijelölt képkocka ebben a klipben"
 
-#: src/gui.c:2532
+#: src/gui.c:2546
 msgid "Starting...\n"
 msgstr "Indulás folyamatban...\n"
 
-#: src/gui.c:3074
+#: src/gui.c:3181
 msgid "    Press 'q' to stop recording.  DO NOT COVER THE PLAY WINDOW !   "
 msgstr ""
 "    Nyomj 'q'-t a felvétel leállításához.  NE TAKARD EL A LEJÁTSZÓ "
 "ABLAKOT!   "
 
-#: src/gui.c:3521
+#: src/gui.c:3643
 msgid "Frame number to preview"
 msgstr "Előnézeti képkockák száma"
 
-#: src/gui.c:3538
+#: src/gui.c:3660
 msgid "_Free"
 msgstr "_Szabad"
 
-#: src/gui.c:3539
+#: src/gui.c:3661
 msgid "Free choice of frame number"
 msgstr "Szabadon választható a mennyiség"
 
-#: src/gui.c:3543
+#: src/gui.c:3666
 msgid "_Start"
 msgstr "_Indítás"
 
-#: src/gui.c:3544
+#: src/gui.c:3667
 msgid "Frame number is linked to start frame"
 msgstr "Képkocka szám hozzárendelve az elsőhöz"
 
-#: src/gui.c:3551
+#: src/gui.c:3675
 msgid "_End"
 msgstr "_Befejezés"
 
-#: src/gui.c:3552
+#: src/gui.c:3676
 msgid "Frame number is linked to end frame"
 msgstr "Képkocka szám hozzálinkelve az utolsó képkockához"
 
-#: src/gui.c:3559
+#: src/gui.c:3684
 msgid "_Pointer"
 msgstr "_Mutató"
 
-#: src/gui.c:3560
+#: src/gui.c:3685
 msgid "Frame number is linked to playback pointer"
 msgstr "Képkocka mennyiség hozzárendelve a lejátszó mutatóhoz (csúszkához)"
 
-#: src/gui.c:3581
+#: src/gui.c:3707
 msgid "Rewind"
 msgstr "Visszatekerés"
 
-#: src/gui.c:3592 src/dialogs.c:894 src/dialogs.c:896 src/dialogs.c:1817
-#: src/dialogs.c:1819
+#: src/gui.c:3718 src/dialogs.c:960 src/dialogs.c:962 src/dialogs.c:1873
+#: src/dialogs.c:1875
 msgid "Play all"
 msgstr "Mind lejátszása"
 
-#: src/gui.c:3605
+#: src/gui.c:3731
 msgid "Play Selection"
 msgstr "Kijelölt rész lejátszása"
 
-#: src/gui.c:3619
+#: src/gui.c:3745
 msgid "Loop On/Off"
 msgstr "Ismétlődés Be/Ki"
 
-#: src/gui.c:3693
+#: src/gui.c:3819
 msgid "Start _recording"
 msgstr "_Felvétel indítása"
 
-#: src/gui.c:3698
+#: src/gui.c:3824
 msgid "Stop _recording"
 msgstr "_Felvétel leállítása"
 
-#: src/gui.c:3703
+#: src/gui.c:3829
 msgid "_Record Performance"
 msgstr "_Előadás felvétele"
 
-#: src/gui.c:3851
+#: src/gui.c:3974
 msgid "Hide Play Window"
 msgstr "Lejátszó ablak elrejtése"
 
-#: src/gui.c:4232
+#: src/gui.c:4333
 msgid "Show Play Window"
 msgstr "Lejátszó ablak megjelenítése"
 
-#: src/ce_thumbs.c:222
+#: src/ce_thumbs.c:242
 #, c-format
 msgid "Mapped to ctrl-%d"
 msgstr ""
 
-#: src/ce_thumbs.c:276 src/effects.c:85 src/preferences.c:3195
+#: src/ce_thumbs.c:296 src/effects.c:86 src/preferences.c:3247
 msgid "Effects"
 msgstr "Effektek"
 
-#: src/ce_thumbs.c:279 src/multitrack.c:5615
+#: src/ce_thumbs.c:299 src/multitrack.c:5791
 msgid "Clips"
 msgstr "Klipek"
 
-#: src/ce_thumbs.c:303
+#: src/ce_thumbs.c:323
 #, fuzzy, c-format
 msgid "Show / apply effects to %s\n"
 msgstr "Minden effekt kikapcsolása."
 
-#: src/ce_thumbs.c:315
+#: src/ce_thumbs.c:335
 #, fuzzy, c-format
 msgid "Select clip for %s\n"
 msgstr "_Klip beállítás törlése"
 
-#: src/ce_thumbs.c:515
+#: src/ce_thumbs.c:536
 msgid "_Pin"
 msgstr ""
 
-#: src/ce_thumbs.c:515
+#: src/ce_thumbs.c:537
 msgid "Pin the parameter box to the window"
 msgstr ""
 
 #. TRANSLATORS: Exabytes
-#: src/utils.c:794
+#: src/utils.c:800
 #, c-format
 msgid "%.2f EB"
 msgstr ""
 
 #. TRANSLATORS: Petabytes
-#: src/utils.c:798
+#: src/utils.c:803
 #, c-format
 msgid "%.2f PB"
 msgstr ""
 
 #. TRANSLATORS: Terabytes
-#: src/utils.c:802
+#: src/utils.c:806
 #, c-format
 msgid "%.2f TB"
 msgstr ""
 
 #. TRANSLATORS: Gigabytes
-#: src/utils.c:806
+#: src/utils.c:809
 #, c-format
 msgid "%.2f GB"
 msgstr ""
 
 #. TRANSLATORS: Megabytes
-#: src/utils.c:810
+#: src/utils.c:812
 #, c-format
 msgid "%.2f MB"
 msgstr ""
 
 #. TRANSLATORS: Kilobytes (1024 bytes)
-#: src/utils.c:814
+#: src/utils.c:815
 #, c-format
 msgid "%.2f KiB"
 msgstr ""
@@ -3867,7 +3856,7 @@
 msgid "%d bytes"
 msgstr ""
 
-#: src/utils.c:1841
+#: src/utils.c:1835
 msgid "Clearing the clipboard"
 msgstr "Vágólap letakarítása"
 
@@ -3882,7 +3871,7 @@
 "==============================\n"
 "Váltás a %s klipre\n"
 
-#: src/utils.c:1880
+#: src/utils.c:1877
 msgid ""
 "\n"
 "==============================\n"
@@ -3892,11 +3881,11 @@
 "==============================\n"
 "Váltás üres klipre\n"
 
-#: src/utils.c:1917
+#: src/utils.c:1916
 msgid "(blank)"
 msgstr "(üres)"
 
-#: src/utils.c:1920
+#: src/utils.c:1919
 #, c-format
 msgid ""
 "The set name has been changed from %s to %s. Affected layouts have been "
@@ -3905,7 +3894,7 @@
 "A beállítás neve %s-ről megváltozott %s-re. Az érintett kimenetek ennek "
 "megfelelően frissítve lettek.\n"
 
-#: src/utils.c:1928
+#: src/utils.c:1927
 #, c-format
 msgid ""
 "The clip %s is missing from this set.\n"
@@ -3914,7 +3903,7 @@
 "A %s klip hiányzik ebből a beállításból.\n"
 "Viszont szükséges a következő kimenetek miatt:\n"
 
-#: src/utils.c:1932
+#: src/utils.c:1931
 #, c-format
 msgid ""
 "The clip %s has been closed.\n"
@@ -3923,7 +3912,7 @@
 "A %s klip be lett zárva.\n"
 "Ez szükséges a következő kimenetek által:\n"
 
-#: src/utils.c:1937
+#: src/utils.c:1936
 #, c-format
 msgid ""
 "Frames have been shifted in the clip %s.\n"
@@ -3932,7 +3921,7 @@
 "A képkockák a %s-ben meg lettek változtatva.\n"
 "A következő kimenetek érintettek:\n"
 
-#: src/utils.c:1942
+#: src/utils.c:1941
 #, c-format
 msgid ""
 "Frames have been deleted from the clip %s.\n"
@@ -3941,7 +3930,7 @@
 "Képkockák ki lettek törölve a %s klipből.\n"
 "A következő kimenetek érintettek:\n"
 
-#: src/utils.c:1947
+#: src/utils.c:1946
 #, c-format
 msgid ""
 "Audio has been deleted from the clip %s.\n"
@@ -3950,7 +3939,7 @@
 "Hang törölve a %s klipből.\n"
 "A következő kimenetek érintettek:\n"
 
-#: src/utils.c:1952
+#: src/utils.c:1951
 #, c-format
 msgid ""
 "Audio has been shifted in clip %s.\n"
@@ -3959,7 +3948,7 @@
 "A hang meváltozott a %s klipben.\n"
 "A következő kimenetek érintettek:\n"
 
-#: src/utils.c:1957
+#: src/utils.c:1956
 #, c-format
 msgid ""
 "Audio has been altered in the clip %s.\n"
@@ -3968,7 +3957,7 @@
 "A hang meg lett változtatva a %s klipben.\n"
 "A következő kimenetek érintettek:\n"
 
-#: src/utils.c:1962
+#: src/utils.c:1961
 #, c-format
 msgid ""
 "Frames have been altered in the clip %s.\n"
@@ -3977,7 +3966,7 @@
 "A képkockák meg lettek változtatva a %s klipben.\n"
 "A következő kimenetek érintettek:\n"
 
-#: src/utils.c:2135
+#: src/utils.c:2134
 #, c-format
 msgid ""
 "Set %s\n"
@@ -3988,7 +3977,7 @@
 "nem lehet megnyitni, mivel azt a LiVES\n"
 "egy másik megnyitott példánya használja\n"
 
-#: src/utils.c:2142
+#: src/utils.c:2140
 #, c-format
 msgid ""
 "\n"
@@ -4044,70 +4033,70 @@
 msgid "Removing layout %s\n"
 msgstr "%s kimenet eltávolítása\n"
 
-#: src/utils.c:3014
+#: src/utils.c:2996
 msgid "Video [opening...]"
 msgstr "Videó [megnyitás...]"
 
-#: src/utils.c:3018
+#: src/utils.c:2999
 #, c-format
 msgid "Video [%.2f sec]"
 msgstr "Videó [%.2f másodperc]"
 
-#: src/utils.c:3022
+#: src/utils.c:3002
 msgid "(Undefined)"
 msgstr "(Nem definiált)"
 
-#: src/utils.c:3025
+#: src/utils.c:3004
 msgid "(No video)"
 msgstr "(Nincs videó)"
 
-#: src/utils.c:3032
+#: src/utils.c:3011
 msgid "(No audio)"
 msgstr "(Nincs hang)"
 
-#: src/utils.c:3037
+#: src/utils.c:3015
 msgid "Mono  [opening...]"
 msgstr "Monó  [megnyitás...]"
 
-#: src/utils.c:3040
+#: src/utils.c:3017
 msgid "Left Audio [opening...]"
 msgstr "Bal oldal [megnyitás...]"
 
-#: src/utils.c:3045
+#: src/utils.c:3021
 #, c-format
 msgid "Mono [%.2f sec]"
 msgstr "Monó [%.2f másodperc]"
 
-#: src/utils.c:3048
+#: src/utils.c:3023
 #, c-format
 msgid "Left Audio [%.2f sec]"
 msgstr "Bal oldal [%.2f másodperc]"
 
-#: src/utils.c:3056
+#: src/utils.c:3031
 msgid "Right Audio [opening...]"
 msgstr "Jobb oldal [megnyitás...]"
 
-#: src/utils.c:3059
+#: src/utils.c:3033
 #, c-format
 msgid "Right Audio [%.2f sec]"
 msgstr "Jobb oldal [%.2f másodperc]"
 
-#: src/utils.c:3506
+#: src/utils.c:3472
 msgid "LiVES cannot switch to mplayer whilst clips are loading."
 msgstr ""
 "LiVES addig nem képes átváltani az mplayerre, amíg a klipek be vannak töltve."
 
-#: src/utils.c:3559
+#: src/utils.c:3525
 #, fuzzy
 msgid "LiVES cannot switch to mplayer2 whilst clips are loading."
 msgstr ""
 "LiVES addig nem képes átváltani az mplayerre, amíg a klipek be vannak töltve."
 
-#: src/utils.c:3809
+#: src/utils.c:3775
 msgid "Cleaning up clip"
 msgstr "klip kipucolása"
 
-#: src/utils.c:3913
+#: src/utils.c:3874
 #, c-format
 msgid ""
 "\n"
@@ -4122,30 +4111,29 @@
 "\n"
 "Felülírod?\n"
 
-#: src/utils.c:4305 src/utils.c:4337 src/multitrack.c:4503
+#: src/utils.c:4250 src/utils.c:4280 src/multitrack.c:4672
 #, c-format
 msgid "_Undo %s"
 msgstr "_%s visszavonása"
 
-#: src/utils.c:4306 src/utils.c:4338 src/multitrack.c:4525
+#: src/utils.c:4251 src/utils.c:4281 src/multitrack.c:4693
 #, c-format
 msgid "_Redo %s"
 msgstr "\"%s\" _újra"
 
-#: src/utils.c:4363
+#: src/utils.c:4305
 msgid "-------------Selection------------"
 msgstr "-------------Kijelölés-------------"
 
-#. TRANSLATORS: - try to keep the text of the middle part the same length, by deleting "-" if necessary
-#: src/utils.c:4371
+#: src/utils.c:4313
 msgid " sec ] ----------Selection---------- [ "
 msgstr " mp ] ----------Kijelölés----------- [ "
 
-#: src/utils.c:4371
+#: src/utils.c:4314
 msgid " frames ] ----------"
 msgstr " képkockák ] ----------"
 
-#: src/utils.c:5360
+#: src/utils.c:5302
 msgid ""
 "Your version of mplayer/ffmpeg may be broken !\n"
 "See http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2071\n"
@@ -4156,11 +4144,11 @@
 "Try running Help/Troubleshoot for more information."
 msgstr ""
 
-#: src/saveplay.c:178
+#: src/saveplay.c:179
 msgid "Examining file header"
 msgstr "Fájl fejléc vizsgálata"
 
-#: src/saveplay.c:315 src/saveplay.c:789
+#: src/saveplay.c:316 src/saveplay.c:779
 #, c-format
 msgid "Opening %s"
 msgstr "%s megnyitása"
@@ -4170,36 +4158,36 @@
 msgid "Opening %s start time %.2f sec. frames %d"
 msgstr "%s megnyitása. Kezdés ideje %.2f mp. képkockák %d"
 
-#: src/saveplay.c:326 src/saveplay.c:4001
+#: src/saveplay.c:326 src/saveplay.c:3927
 msgid " without sound"
 msgstr " hang nélkül"
 
-#: src/saveplay.c:396
+#: src/saveplay.c:395
 #, c-format
 msgid "Opening audio for %s"
 msgstr "Hang megnyitása ehhez: %s"
 
-#: src/saveplay.c:557
+#: src/saveplay.c:554
 #, c-format
 msgid "Auto trimming %.2f seconds of audio at start..."
 msgstr ""
 
-#: src/saveplay.c:567
+#: src/saveplay.c:562
 #, fuzzy, c-format
 msgid "Auto trimming %.2f seconds of audio at end..."
 msgstr "%s : %.2f másodperctől %.2f másodpercig..."
 
-#: src/saveplay.c:584
+#: src/saveplay.c:577
 #, c-format
 msgid "Auto padding with %.2f seconds of silence at start..."
 msgstr ""
 
-#: src/saveplay.c:599
+#: src/saveplay.c:590
 #, c-format
 msgid "Auto padding with %.2f seconds of silence at end..."
 msgstr ""
 
-#: src/saveplay.c:671
+#: src/saveplay.c:661
 #, c-format
 msgid ""
 "\n"
@@ -4211,11 +4199,11 @@
 "Are you sure you wish to continue ?"
 msgstr ""
 
-#: src/saveplay.c:685
+#: src/saveplay.c:676
 msgid " - please be patient."
 msgstr " - kérlek légy türelemmel."
 
-#: src/saveplay.c:938
+#: src/saveplay.c:926
 msgid ""
 "\n"
 "\n"
@@ -4227,7 +4215,7 @@
 "A LiVES nem tud hang, vagy videó fájlt kitömöríteni.\n"
 "Kérlek nézd meg a terminál ablakot a további információkért.\n"
 
-#: src/saveplay.c:940
+#: src/saveplay.c:928
 msgid ""
 "\n"
 "\n"
@@ -4237,7 +4225,7 @@
 "\n"
 "Telepítened kell az mplayert a fájl megnyitásához.\n"
 
-#: src/saveplay.c:948
+#: src/saveplay.c:934
 msgid ""
 "\n"
 "\n"
@@ -4249,29 +4237,29 @@
 "Kérlek ellenőrizd a Videó megnyitó parancs beállításait az\n"
 "Eszközök|Beállítások|Kódolás menüben\n"
 
-#: src/saveplay.c:1014
+#: src/saveplay.c:995
 msgid "Adding image..."
 msgstr ""
 
-#: src/saveplay.c:1108
+#: src/saveplay.c:1089
 #, c-format
 msgid "Subtitles were saved as %s\n"
 msgstr ""
 
-#: src/saveplay.c:1192
+#: src/saveplay.c:1171
 #, c-format
 msgid "LiVES: Save Frame %d as..."
 msgstr ""
 
-#: src/saveplay.c:1195
+#: src/saveplay.c:1174
 msgid "LiVES: Save Frame as..."
 msgstr ""
 
-#: src/saveplay.c:1322
+#: src/saveplay.c:1303
 msgid "LiVES: Save Clip as..."
 msgstr ""
 
-#: src/saveplay.c:1390
+#: src/saveplay.c:1369
 msgid ""
 "Saving your video could lead to a loss of quality !\n"
 "You are strongly advised to 'Save As' to a new file.\n"
@@ -4283,36 +4271,36 @@
 "\n"
 "Még mindig akarod folytatni?"
 
-#: src/saveplay.c:1517 src/saveplay.c:1683 src/saveplay.c:1762
-#: src/saveplay.c:4014
+#: src/saveplay.c:1494 src/saveplay.c:1659 src/saveplay.c:1738
+#: src/saveplay.c:3940
 msgid "Pulling frames from clip"
 msgstr "Képkockák kiemelése a klipből"
 
-#: src/saveplay.c:1588 src/saveplay.c:1727
+#: src/saveplay.c:1565 src/saveplay.c:1703
 msgid "Linking selection"
 msgstr "Linkek létrehozása: kiválasztás"
 
-#: src/saveplay.c:1779
+#: src/saveplay.c:1755
 msgid " (with no sound)\n"
 msgstr " (hang nélkül)\n"
 
-#: src/saveplay.c:1786
+#: src/saveplay.c:1761
 #, c-format
 msgid "Saving frames %d to %d%s as \"%s\" : encoder = %s : format = %s..."
 msgstr ""
 "%d képkockák mentése ide: %d%s, mint \"%s\" : kódoló = %s : formátum = %s..."
 
-#: src/saveplay.c:1790
+#: src/saveplay.c:1765
 #, c-format
 msgid "Saving frames 1 to %d%s as \"%s\" : encoder %s : format = %s..."
 msgstr ""
 "Képkockák elmentése 1 től %d%s-ig mint \"%s\" : kódoló %s : formátum = %s..."
 
-#: src/saveplay.c:1909
+#: src/saveplay.c:1890
 msgid "Saving [can take a long time]"
 msgstr "Mentés [ sok időbe telhet]"
 
-#: src/saveplay.c:2057
+#: src/saveplay.c:2044
 msgid ""
 "\n"
 "\n"
@@ -4322,33 +4310,33 @@
 "\n"
 "Kódolási hiba - a kimeneti fájl nem készült el!\n"
 
-#: src/saveplay.c:2094
+#: src/saveplay.c:2081
 msgid "Clearing letterbox"
 msgstr ""
 
-#: src/saveplay.c:2183
+#: src/saveplay.c:2168
 #, c-format
 msgid "File size was %s\n"
 msgstr ""
 
-#: src/saveplay.c:2284
+#: src/saveplay.c:2265
 msgid "recording aborted by preview.\n"
 msgstr "felvétel megszakítva az előnézet miatt.\n"
 
-#: src/saveplay.c:2288
+#: src/saveplay.c:2268
 msgid "recording aborted by clipboard playback.\n"
 msgstr "felvétel megszakítva a vágólap visszajátszása miatt.\n"
 
-#: src/saveplay.c:2291
+#: src/saveplay.c:2270
 msgid "Recording performance..."
 msgstr "Felvétel minősége..."
 
-#: src/saveplay.c:3293
+#: src/saveplay.c:3251
 #, c-format
 msgid "Average FPS was %.4f\n"
 msgstr "Az átlagos FPS %.4f volt\n"
 
-#: src/saveplay.c:3299
+#: src/saveplay.c:3256
 msgid ""
 "\n"
 "\n"
@@ -4362,16 +4350,21 @@
 "Kattints rá az Eszközök--->Mind átméretezése\n"
 "opcióra, majd minden képkockát méretezz át a megfelelő méretre.\n"
 
-#: src/saveplay.c:3479
+#: src/saveplay.c:3429
 msgid "Unknown"
 msgstr "Ismeretlen"
 
-#: src/saveplay.c:3588 src/saveplay.c:4585
+#: src/saveplay.c:3538 src/saveplay.c:4502
 #, c-format
 msgid "Untitled%d"
 msgstr "Névtelen%d"
 
-#: src/saveplay.c:3633
+#: src/saveplay.c:3567
+#, c-format
+msgid "%d frames are enough !\n"
+msgstr "%d képkoca elég!\n"
+
+#: src/saveplay.c:3579
 #, c-format
 msgid ""
 "\n"
@@ -4379,7 +4372,7 @@
 "Bad things may happen with this clip.\n"
 msgstr ""
 
-#: src/saveplay.c:3723
+#: src/saveplay.c:3667
 #, c-format
 msgid ""
 "\n"
@@ -4392,14 +4385,14 @@
 "Az alapértelmezett sebesség beállítható az Eszközök | Beállítások | Vegyes "
 "részben.\n"
 
-#: src/saveplay.c:3735
+#: src/saveplay.c:3677
 #, c-format
 msgid "Playback speed was adjusted to %.3f frames per second to fit audio.\n"
 msgstr ""
 "A lejátszás sebessége %.3f fps-re lett beállítva, ezáltal a videó "
 "hozáilleszkedik a hanghoz.\n"
 
-#: src/saveplay.c:3754
+#: src/saveplay.c:3694
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d *bpp=Greyscale* fps=%.3f\n"
@@ -4408,7 +4401,7 @@
 "Képkockák=%d típus=%s méret=%dx%d *bpp=Greyscale* fps=%.3f\n"
 "Hang:"
 
-#: src/saveplay.c:3758 src/saveplay.c:4762
+#: src/saveplay.c:3698 src/saveplay.c:4671
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d bpp=%d fps=%.3f\n"
@@ -4417,54 +4410,54 @@
 "Képkockák=%d típus=%s méret=%dx%d bpp=%d fps=%.3f\n"
 "Hang:"
 
-#: src/saveplay.c:3762 src/saveplay.c:4766
+#: src/saveplay.c:3703 src/saveplay.c:4676
 #, c-format
 msgid "%s none\n"
 msgstr "%s nincs\n"
 
-#: src/saveplay.c:3774
+#: src/saveplay.c:3714
 #, fuzzy, c-format
 msgid " - Author: %s\n"
 msgstr "Szerző: %s"
 
-#: src/saveplay.c:3779
+#: src/saveplay.c:3717
 #, fuzzy, c-format
 msgid " - Title: %s\n"
 msgstr " - Megjegyzés: %s\n"
 
-#: src/saveplay.c:3784
+#: src/saveplay.c:3720
 #, c-format
 msgid " - Comment: %s\n"
 msgstr " - Megjegyzés: %s\n"
 
-#: src/saveplay.c:3897
+#: src/saveplay.c:3829
 #, c-format
 msgid "Saving frame %d as %s..."
 msgstr "%d képkocka mentése mint %s..."
 
-#: src/saveplay.c:3996
+#: src/saveplay.c:3924
 #, c-format
 msgid "Backing up %s to %s"
 msgstr "%s mentése eddig: %s"
 
-#: src/saveplay.c:4049
+#: src/saveplay.c:3975
 msgid "Backing up"
 msgstr "Mentés"
 
-#: src/saveplay.c:4083
+#: src/saveplay.c:4009
 msgid "performance data was backed up..."
 msgstr "minőségi adatok el lettek mentve..."
 
-#: src/saveplay.c:4661
+#: src/saveplay.c:4574
 #, c-format
 msgid "Restoring %s..."
 msgstr "%s helyreállítása..."
 
-#: src/saveplay.c:4692
+#: src/saveplay.c:4603
 msgid "Restoring"
 msgstr "Helyreállítás"
 
-#: src/saveplay.c:4714
+#: src/saveplay.c:4625
 #, c-format
 msgid ""
 "\n"
@@ -4478,22 +4471,22 @@
 "A LiVES nem tudja helyreállítani.\n"
 
 #. TRANSLATORS: rec(ord) %.2f M(ega)B(ytes)
-#: src/saveplay.c:5207
+#: src/saveplay.c:5118
 #, c-format
 msgid "rec %.2f MB"
 msgstr ""
 
-#: src/saveplay.c:5213
+#: src/saveplay.c:5123
 #, c-format
 msgid "!rec %.2f MB"
 msgstr ""
 
 #. TRANSLATORS: rec(ord) ?? M(ega)B(ytes)
-#: src/saveplay.c:5216
+#: src/saveplay.c:5126
 msgid "rec ?? MB"
 msgstr ""
 
-#: src/saveplay.c:5241
+#: src/saveplay.c:5151
 #, c-format
 msgid ""
 "\n"
@@ -4501,7 +4494,7 @@
 "Record stop level can be set in Preferences.\n"
 msgstr ""
 
-#: src/saveplay.c:5535
+#: src/saveplay.c:5447
 msgid ""
 "\n"
 "Files from a previous run of LiVES were found.\n"
@@ -4511,47 +4504,69 @@
 "A LiVES előző futtatásából előkerült néhány fájl.\n"
 "Szeretnéd helyreállítani őket?\n"
 
-#: src/saveplay.c:5557
+#: src/saveplay.c:5469
 msgid "Recovering files"
 msgstr "Fájlok visszaállítása"
 
-#: src/saveplay.c:5560
+#: src/saveplay.c:5472
 msgid "Recovering files..."
 msgstr "Visszaszerzés fájlokat..."
 
-#: src/dialogs.c:72
+#: src/dialogs.c:71
 msgid "Show affected _layouts"
 msgstr "Érintett _kimenetek megjelenítése"
 
-#: src/dialogs.c:128
+#: src/dialogs.c:113
+msgid ""
+"Do _not show this warning any more\n"
+"(can be turned back on from Preferences/Warnings)"
+msgstr ""
+"_Ne mutasd ezt a figyelmeztetést többet\n"
+"(visszakapcsolható a beállítások/figyelmeztetések-nél)"
+
+#: src/dialogs.c:127
 msgid "_Recover disk space"
 msgstr ""
 
-#: src/dialogs.c:143
+#: src/dialogs.c:142
 msgid " _Advanced Settings >>"
 msgstr ""
 
-#: src/dialogs.c:184
+#: src/dialogs.c:183 src/dialogs.c:221
 msgid "LiVES: - Warning !"
 msgstr "LiVES: - Figyelmeztetés!"
 
 #: src/dialogs.c:194
+#, fuzzy
+msgid "LiVES: - Error !"
+msgstr "LiVES: - Figyelmeztetés!"
+
+#: src/dialogs.c:204
+#, fuzzy
+msgid "LiVES: - Information"
+msgstr "LiVES: Információ erről: %s"
+
+#: src/dialogs.c:230
 msgid "LiVES: - Question"
 msgstr "LiVES: - Kérdés"
 
-#: src/dialogs.c:204
+#: src/dialogs.c:239
 msgid "LiVES: - File Error"
 msgstr ""
 
-#: src/dialogs.c:208
+#: src/dialogs.c:241
 msgid "_Abort"
 msgstr ""
 
-#: src/dialogs.c:213
+#: src/dialogs.c:246
 msgid "_Retry"
 msgstr ""
 
-#: src/dialogs.c:597
+#: src/dialogs.c:306
+msgid "Show _Details"
+msgstr "_Részletek megjelenítése"
+
+#: src/dialogs.c:657
 #, c-format
 msgid ""
 "FREE SPACE IN THE PARTITION CONTAINING\n"
@@ -4562,7 +4577,7 @@
 "(Disk warning levels can be configured in Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:615
+#: src/dialogs.c:676
 #, c-format
 msgid ""
 "Free space in the partition containing\n"
@@ -4574,11 +4589,11 @@
 "Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:627
+#: src/dialogs.c:688
 msgid "Audio players cannot be switched during playback."
 msgstr "Nem lehet zene lejátszót váltani a lejátszás alatt."
 
-#: src/dialogs.c:632
+#: src/dialogs.c:694
 msgid ""
 "\n"
 "\n"
@@ -4590,18 +4605,18 @@
 "A LiVES nem tudja ezt a műveletet elvégezni kellő memória hiányában.\n"
 "Kérlek próbálj meg néhány alkalmazást bezárni.\n"
 
-#: src/dialogs.c:752
+#: src/dialogs.c:820
 msgid "Processing has been paused."
 msgstr ""
 
-#: src/dialogs.c:937
+#: src/dialogs.c:1002
 #, c-format
 msgid ""
 "\n"
 "%s%d%% done. Time remaining: %u sec%s\n"
 msgstr ""
 
-#: src/dialogs.c:1335
+#: src/dialogs.c:1391
 #, c-format
 msgid ""
 "\n"
@@ -4610,14 +4625,14 @@
 "\n"
 "%d/%d képkocka megnyitva. A hátralévő idő %u másodperc.\n"
 
-#: src/dialogs.c:1337
+#: src/dialogs.c:1393
 #, c-format
 msgid ""
 "\n"
 "%d/%d frames opened.\n"
 msgstr ""
 
-#: src/dialogs.c:1341
+#: src/dialogs.c:1396
 #, c-format
 msgid ""
 "\n"
@@ -4626,7 +4641,7 @@
 "\n"
 "%d képkocka megnyitva.\n"
 
-#: src/dialogs.c:1940
+#: src/dialogs.c:1993
 #, c-format
 msgid ""
 "\n"
@@ -4635,7 +4650,7 @@
 "\n"
 "Hátralévő idő: %d mp"
 
-#: src/dialogs.c:1988
+#: src/dialogs.c:2040
 #, c-format
 msgid ""
 "\n"
@@ -4646,7 +4661,7 @@
 "Elnézést, de a LiVES csak %d fájlt tud megnyitni egyszerre.\n"
 "Kérlek zárj be egy fájlt, majd próbáld újra."
 
-#: src/dialogs.c:1994
+#: src/dialogs.c:2047
 #, c-format
 msgid ""
 "LiVES was unable to write to its temporary directory.\n"
@@ -4665,7 +4680,7 @@
 "\n"
 "Kérlek ellenőrizd az írási jogosultságaidat."
 
-#: src/dialogs.c:2005
+#: src/dialogs.c:2059
 #, fuzzy
 msgid ""
 "\n"
@@ -4676,13 +4691,13 @@
 "LiVES-nak szüksége van az 'mplayer' vagy a 'sox' valamelyikére. Kérlek "
 "telepíts egyet ezek közül, majd próbáld újra.\n"
 
-#: src/dialogs.c:2010
+#: src/dialogs.c:2064
 msgid ""
 "Audio was not loaded; please install mplayer or mplayer2 if you expected "
 "audio for this clip.\n"
 msgstr ""
 
-#: src/dialogs.c:2014
+#: src/dialogs.c:2069
 msgid ""
 "Audio resampling is required for this format.\n"
 "Please install 'sox'\n"
@@ -4692,7 +4707,7 @@
 "Kérlek telepítsd a 'sox'-ot,\n"
 "vagy válts egy másik kódolóra az Eszközök | Beállítások | Kódolás menüben\n"
 
-#: src/dialogs.c:2019
+#: src/dialogs.c:2075
 msgid ""
 "\n"
 "\n"
@@ -4704,7 +4719,7 @@
 "Ez a kódoló/formátum nem használható a kért hang kódekhez. \n"
 "Kérlek állítsd be a hang kódolót az Eszközök|Beállítások|kódolás menüben.\n"
 
-#: src/dialogs.c:2024
+#: src/dialogs.c:2080
 msgid ""
 "This layout includes generated frames.\n"
 "It cannot be saved, you must render it to a clip first.\n"
@@ -4712,13 +4727,13 @@
 "Ez a kimenet generált képkockákat tartalmaz.\n"
 "Nem menthető, először egy klippé kell alakítanod.\n"
 
-#: src/dialogs.c:2029
+#: src/dialogs.c:2085
 msgid ""
 "This layout includes generated or recorded audio.\n"
 "It cannot be saved, you must render it to a clip first.\n"
 msgstr ""
 
-#: src/dialogs.c:2039 src/dialogs.c:2137
+#: src/dialogs.c:2095 src/dialogs.c:2189
 #, c-format
 msgid ""
 "\n"
@@ -4729,7 +4744,7 @@
 "\n"
 "Kellő korlátozások a %s formátumban.\n"
 
-#: src/dialogs.c:2059
+#: src/dialogs.c:2115
 msgid ""
 "LiVES recommends the following settings:\n"
 "\n"
@@ -4737,43 +4752,43 @@
 "A LiVES a következő beállításokat ajánlja:\n"
 "\n"
 
-#: src/dialogs.c:2065 src/dialogs.c:2174 src/resample.c:850
+#: src/dialogs.c:2121 src/dialogs.c:2225 src/resample.c:839
 msgid ", signed"
 msgstr ", aláírt"
 
-#: src/dialogs.c:2066 src/dialogs.c:2175 src/resample.c:853
+#: src/dialogs.c:2122 src/dialogs.c:2226 src/resample.c:841
 msgid ", unsigned"
 msgstr ", aláíratlan"
 
-#: src/dialogs.c:2070 src/dialogs.c:2179 src/resample.c:858
+#: src/dialogs.c:2126 src/dialogs.c:2230 src/resample.c:846
 msgid ", little-endian"
 msgstr ", kicsi-endian"
 
-#: src/dialogs.c:2071 src/dialogs.c:2180 src/resample.c:861
+#: src/dialogs.c:2127 src/dialogs.c:2231 src/resample.c:848
 msgid ", big-endian"
 msgstr ", nagy-endian"
 
-#: src/dialogs.c:2077
+#: src/dialogs.c:2132
 #, c-format
 msgid "Use an audio rate of %d Hz%s%s\n"
 msgstr ""
 
-#: src/dialogs.c:2085
+#: src/dialogs.c:2140
 #, c-format
 msgid "Set video rate to %.3f frames per second\n"
 msgstr "Videó arány beállítása erre: %.3f fps-re\n"
 
-#: src/dialogs.c:2089
+#: src/dialogs.c:2143
 #, c-format
 msgid "Set video rate to %d:%d frames per second\n"
 msgstr "Videó arány beállítása erre: %d:%d fps-re\n"
 
-#: src/dialogs.c:2094 src/dialogs.c:2209
+#: src/dialogs.c:2148 src/dialogs.c:2258
 #, c-format
 msgid "Set video size to %d x %d pixels\n"
 msgstr "Videó méretének beállítása erre: %d x %d pixel\n"
 
-#: src/dialogs.c:2102 src/dialogs.c:2208
+#: src/dialogs.c:2156 src/dialogs.c:2257
 msgid ""
 "\n"
 "You may wish to:\n"
@@ -4781,35 +4796,35 @@
 "\n"
 "Szeretnéd:\n"
 
-#: src/dialogs.c:2105 src/dialogs.c:2200
+#: src/dialogs.c:2159 src/dialogs.c:2249
 #, c-format
 msgid "resize video to %d x %d pixels\n"
 msgstr "videó átméretezése %d x %d pixelre\n"
 
-#: src/dialogs.c:2110
+#: src/dialogs.c:2163
 msgid "disable audio, since the target encoder cannot encode audio\n"
 msgstr "hang letiltva, mivel a kijelölt kodek nem képes kezelni a hangot\n"
 
-#: src/dialogs.c:2170
+#: src/dialogs.c:2221
 msgid "LiVES must:\n"
 msgstr "A LiVES-nak szükséges a:\n"
 
-#: src/dialogs.c:2185
+#: src/dialogs.c:2235
 #, c-format
 msgid "resample audio to %d Hz%s%s\n"
 msgstr ""
 
-#: src/dialogs.c:2192
+#: src/dialogs.c:2242
 #, c-format
 msgid "resample video to %.3f frames per second\n"
 msgstr "videó újramintázása %.3f fps-re\n"
 
-#: src/dialogs.c:2196
+#: src/dialogs.c:2245
 #, c-format
 msgid "resample video to %d:%d frames per second\n"
 msgstr "videó újramintázása %d:%d fps-re\n"
 
-#: src/dialogs.c:2215
+#: src/dialogs.c:2263
 msgid ""
 "\n"
 "You will be able to undo these changes afterwards.\n"
@@ -4823,7 +4838,7 @@
 "'OK' a jóváhagyáshoz, 'Mégse' az elvetéshez.\n"
 "\n"
 
-#: src/dialogs.c:2218
+#: src/dialogs.c:2265
 msgid ""
 "\n"
 "Changes applied to the selection will not be permanent.\n"
@@ -4833,7 +4848,7 @@
 "A változások a kijelölésben nem lesznek maradandóak.\n"
 "\n"
 
-#: src/dialogs.c:2237
+#: src/dialogs.c:2285
 msgid ""
 "\n"
 "\n"
@@ -4847,7 +4862,7 @@
 "elérhető memória.\n"
 "Próbálj meg csak egy kijelölt részt rögzíteni a fájlból."
 
-#: src/dialogs.c:2244
+#: src/dialogs.c:2293
 msgid ""
 "The playback speed (fps), or the audio rate\n"
 " of the clipboard does not match\n"
@@ -4865,7 +4880,7 @@
 "\n"
 "Kérlek nyomj 'Mégse'-t a beillesztés megszakításához, 'OK'-t a folytatáshoz."
 
-#: src/dialogs.c:2253
+#: src/dialogs.c:2304
 #, fuzzy, c-format
 msgid ""
 "When opening a yuvmpeg stream, you should first create a fifo file in:\n"
@@ -4883,11 +4898,11 @@
 "Csak nyomj 'OK'-t ha tudod mit kell tenned, minden más esetben válaszd a "
 "'Mégse' opciót."
 
-#: src/dialogs.c:2305
+#: src/dialogs.c:2356
 msgid "Show Keys"
 msgstr "Billentyűk mutatása"
 
-#: src/dialogs.c:2306
+#: src/dialogs.c:2358
 msgid ""
 "You can use the following keys during playback to control LiVES:-\n"
 "\n"
@@ -4967,11 +4982,11 @@
 "d                             dupla méret\n"
 "g                             ping pong ismétlés\n"
 
-#: src/dialogs.c:2313
+#: src/dialogs.c:2365
 msgid "Multitrack Keys"
 msgstr "Multitrack billenytűk"
 
-#: src/dialogs.c:2314
+#: src/dialogs.c:2367
 msgid ""
 "You can use the following keys to control the multitrack window:-\n"
 "\n"
@@ -4993,18 +5008,18 @@
 "For other keys, see the menus.\n"
 msgstr ""
 
-#: src/dialogs.c:2322
+#: src/dialogs.c:2375
 msgid "Message History"
 msgstr "Üzenet előzmények"
 
-#: src/dialogs.c:2335
+#: src/dialogs.c:2388
 #, c-format
 msgid ""
 "After upgrading/installing, you may need to adjust the <prefix_dir> setting "
 "in your %s file"
 msgstr ""
 
-#: src/dialogs.c:2344
+#: src/dialogs.c:2399
 #, c-format
 msgid ""
 "\n"
@@ -5015,7 +5030,7 @@
 "or change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/dialogs.c:2352
+#: src/dialogs.c:2408
 msgid ""
 "Sorry, unknown audio type.\n"
 "\n"
@@ -5025,18 +5040,18 @@
 "\n"
 " (használható fájltípusok:.mp3, .ogg, .wav, .mod, .xm, .it)"
 
-#: src/dialogs.c:2353
+#: src/dialogs.c:2409
 msgid "failed (unknown type)\n"
 msgstr "nem sikerült (ismeretlen típus)\n"
 
-#: src/dialogs.c:2358
+#: src/dialogs.c:2415
 msgid ""
 "\n"
 "Do you wish to remove the layout files associated with this set ?\n"
 "(They will not be usable without the set).\n"
 msgstr ""
 
-#: src/dialogs.c:2363
+#: src/dialogs.c:2421
 #, c-format
 msgid ""
 "\n"
@@ -5050,7 +5065,7 @@
 "beállításhoz.\n"
 "'Mégse' egy új létrehozásához.\n"
 
-#: src/dialogs.c:2370
+#: src/dialogs.c:2429
 msgid ""
 "\n"
 "Frames from this clip are used in some multitrack layouts.\n"
@@ -5062,7 +5077,7 @@
 "Biztosan szeretnéd folytatni?\n"
 "."
 
-#: src/dialogs.c:2374
+#: src/dialogs.c:2433
 msgid ""
 "\n"
 "Audio from this clip is used in some multitrack layouts.\n"
@@ -5074,7 +5089,7 @@
 "Biztosan folytatni szeretnéd?\n"
 "."
 
-#: src/dialogs.c:2378
+#: src/dialogs.c:2438
 #, c-format
 msgid ""
 "\n"
@@ -5085,7 +5100,7 @@
 "Otherwise click Cancel to skip loading this file.\n"
 msgstr ""
 
-#: src/dialogs.c:2385
+#: src/dialogs.c:2446
 #, c-format
 msgid ""
 "\n"
@@ -5100,7 +5115,7 @@
 "%s\n"
 "A klipet nem lehet betölteni.\n"
 
-#: src/dialogs.c:2392
+#: src/dialogs.c:2455
 msgid ""
 "\n"
 "Dear user, the jack developers decided to remove the -Z option from jackd.\n"
@@ -5108,7 +5123,7 @@
 "Alternately, select a different audio player in Preferences.\n"
 msgstr ""
 
-#: src/dialogs.c:2396
+#: src/dialogs.c:2460
 msgid ""
 "\n"
 "Unable to start up jack. Please ensure that alsa is set up correctly on your "
@@ -5117,13 +5132,13 @@
 "Automatic jack startup will be disabled now.\n"
 msgstr ""
 
-#: src/dialogs.c:2402
+#: src/dialogs.c:2466
 msgid ""
 "\n"
 "Unable to connect to jack server. Please start jack before starting LiVES\n"
 msgstr ""
 
-#: src/dialogs.c:2411
+#: src/dialogs.c:2475
 #, c-format
 msgid ""
 "\n"
@@ -5134,7 +5149,7 @@
 "%s\n"
 msgstr ""
 
-#: src/dialogs.c:2418
+#: src/dialogs.c:2482
 msgid ""
 "\n"
 "Alternately, you can restart LiVES and select another audio player.\n"
@@ -5143,7 +5158,7 @@
 "Más megoldásként, indítsd újra a LiVES-t, majd válassz egy másik "
 "hangmeghajtót.\n"
 
-#: src/dialogs.c:2423
+#: src/dialogs.c:2488
 #, c-format
 msgid ""
 "\n"
@@ -5158,7 +5173,7 @@
 "Növelheted az értéket a Beállítások/Multitrac menüben.\n"
 "Az ajánlott érték legalább %d MB"
 
-#: src/dialogs.c:2429
+#: src/dialogs.c:2496
 #, c-format
 msgid ""
 "\n"
@@ -5167,7 +5182,7 @@
 "Do you wish to delete them ?\n"
 msgstr ""
 
-#: src/dialogs.c:2436
+#: src/dialogs.c:2504
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for multitrack undo.\n"
@@ -5179,7 +5194,7 @@
 "Zárj be néhány más alkalmazást a memória felszabadításához.\n"
 "Használd a Beállítások/Multitrack/Visszaállítási memória opciót\n"
 
-#: src/dialogs.c:2440
+#: src/dialogs.c:2508
 msgid ""
 "\n"
 "Out of memory for undo.\n"
@@ -5191,7 +5206,7 @@
 "Meg kell növelned a visszaállítási memóriát\n"
 "használd a Beállítások/Multitrack/Visszaállítási memóriát\n"
 
-#: src/dialogs.c:2444
+#: src/dialogs.c:2512
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for the multitrack undo buffer.\n"
@@ -5200,21 +5215,21 @@
 "A LiVES nem képes elég memóriát biztosítani a multitrack visszállító "
 "pufferéhez.\n"
 
-#: src/dialogs.c:2446
+#: src/dialogs.c:2514
 msgid "or enter a smaller value.\n"
 msgstr "vagy adj meg egy kisebb értéket.\n"
 
-#: src/dialogs.c:2448
+#: src/dialogs.c:2516
 msgid "Try again from the clip editor, try closing some other applications\n"
 msgstr ""
 "Próbáld meg ismét a klip szerkesztőböl. Próbálj meg bezárni néhány egyéb "
 "alkalmazást\n"
 
-#: src/dialogs.c:2449
+#: src/dialogs.c:2517
 msgid "Try closing some other applications\n"
 msgstr "Zárj be néhány egyéb alkalmazást\n"
 
-#: src/dialogs.c:2460
+#: src/dialogs.c:2529
 msgid ""
 "Multitrack is set to 0 audio channels, but this layout has audio.\n"
 "You should adjust the audio settings from the Tools menu.\n"
@@ -5222,13 +5237,13 @@
 "A Multitrack értéke 0 csatornát jelez, de a kimenetnek van hangja.\n"
 "Ellenőrizd a hang beállításokat az Eszközök menüben.\n"
 
-#: src/dialogs.c:2464
+#: src/dialogs.c:2534
 msgid ""
 "The current layout has audio, so audio channels may not be set to zero.\n"
 msgstr ""
 "A jelenlegi kimenetnek van hangja, ezért a csatornák száma nem lehet 0.\n"
 
-#: src/dialogs.c:2468
+#: src/dialogs.c:2539
 msgid ""
 "Multitrack audio preview is only available with the\n"
 "\"jack\" or \"pulse audio\" audio player.\n"
@@ -5238,7 +5253,7 @@
 "illetve \"pulse audio\" lejátszókkal lehetséges.\n"
 "Ezt beállíthatod az Eszközök|Beállítások|Lejátszás menüben."
 
-#: src/dialogs.c:2472
+#: src/dialogs.c:2545
 msgid ""
 "Errors were detected in the layout (which may be due to transferring from "
 "another system, or from an older version of LiVES).\n"
@@ -5248,7 +5263,7 @@
 "egy régebbi verziója miatt is).\n"
 "Megpróbálhatom megjavítani a kimenet másolatát?\n"
 
-#: src/dialogs.c:2476
+#: src/dialogs.c:2549
 msgid ""
 "LiVES was unable to load the layout.\n"
 "Sorry.\n"
@@ -5256,7 +5271,7 @@
 "A LiVES nem képes betölteni a kimenetet.\n"
 "Sajnálom.\n"
 
-#: src/dialogs.c:2482
+#: src/dialogs.c:2555
 msgid ""
 "\n"
 "\n"
@@ -5266,7 +5281,7 @@
 "\n"
 "A hang aránynak 0-nál nagyobbnak kell lennie.\n"
 
-#: src/dialogs.c:2486
+#: src/dialogs.c:2559
 msgid ""
 "\n"
 "Event list will be very large\n"
@@ -5278,7 +5293,7 @@
 "és sokáig tart megjeleníteni.\n"
 "Biztosan meg szeretnéd nézni?\n"
 
-#: src/dialogs.c:2491
+#: src/dialogs.c:2564
 msgid ""
 "\n"
 "\n"
@@ -5288,7 +5303,7 @@
 "\n"
 "Telepítened kell a 'dvgab'-et a funkció használatához.\n"
 
-#: src/dialogs.c:2496
+#: src/dialogs.c:2570
 msgid ""
 "\n"
 "\n"
@@ -5303,25 +5318,25 @@
 "Ki kell egyet választanod ezek közül az Eszközök/Beállítások/Lejátszás "
 "menüben.\n"
 
-#: src/dialogs.c:2500
+#: src/dialogs.c:2574
 msgid "Video playback plugin failed to initialise palette !\n"
 msgstr "A videólejátszó bővítmény nem tudja inicializálni a palettát!\n"
 
-#: src/dialogs.c:2504
+#: src/dialogs.c:2579
 msgid "Decoder plugin failed to initialise palette !\n"
 msgstr "Nem sikerült inicializálnia a palettát a dekóder bővítménynek!\n"
 
-#: src/dialogs.c:2509
+#: src/dialogs.c:2584
 msgid "Unable to set framerate of video plugin\n"
 msgstr "Nem lehet beállítani videó bővítmény képkocka arányát\n"
 
-#: src/dialogs.c:2514
+#: src/dialogs.c:2590
 msgid ""
 "After a crash, it is advisable to clean up the disk with\n"
 "File|Clean up disk space\n"
 msgstr "Öszeomlás után\n"
 
-#: src/dialogs.c:2526
+#: src/dialogs.c:2604
 #, c-format
 msgid ""
 "Stream frame size is too large for your network buffers.\n"
@@ -5334,33 +5349,33 @@
 "\n"
 "echo %d > /proc/sys/net/core/rmem_max\n"
 
-#: src/dialogs.c:2714
+#: src/dialogs.c:2800
 msgid "cancelled.\n"
 msgstr "megszakítva.\n"
 
-#: src/dialogs.c:2721
+#: src/dialogs.c:2805
 msgid "failed.\n"
 msgstr "nem sikerült.\n"
 
-#: src/dialogs.c:2728
+#: src/dialogs.c:2810
 msgid "done.\n"
 msgstr "kész.\n"
 
-#: src/dialogs.c:2732
+#: src/dialogs.c:2814
 msgid "error in file. Failed.\n"
 msgstr "hiba a fájlban. Sikertelen.\n"
 
-#: src/dialogs.c:2766 src/dialogs.c:2815 src/dialogs.c:2839
+#: src/dialogs.c:2848 src/dialogs.c:2897 src/dialogs.c:2921
 #, c-format
 msgid "Additional info: %s\n"
 msgstr ""
 
-#: src/dialogs.c:2769
+#: src/dialogs.c:2851
 #, c-format
 msgid "The error value was %d%s\n"
 msgstr ""
 
-#: src/dialogs.c:2772
+#: src/dialogs.c:2854
 #, c-format
 msgid ""
 "\n"
@@ -5370,7 +5385,7 @@
 "%s%s%s"
 msgstr ""
 
-#: src/dialogs.c:2818
+#: src/dialogs.c:2900
 #, c-format
 msgid ""
 "\n"
@@ -5380,7 +5395,7 @@
 "%s"
 msgstr ""
 
-#: src/dialogs.c:2842
+#: src/dialogs.c:2924
 #, c-format
 msgid ""
 "\n"
@@ -5390,7 +5405,7 @@
 "%s"
 msgstr ""
 
-#: src/dialogs.c:2886
+#: src/dialogs.c:2968
 #, c-format
 msgid ""
 "\n"
@@ -5399,7 +5414,7 @@
 "Please check for possible error causes.\n"
 msgstr ""
 
-#: src/dialogs.c:2890
+#: src/dialogs.c:2971
 #, c-format
 msgid ""
 "\n"
@@ -5409,7 +5424,7 @@
 "%s.\n"
 msgstr ""
 
-#: src/dialogs.c:2921
+#: src/dialogs.c:3002
 #, c-format
 msgid ""
 "\n"
@@ -5418,7 +5433,7 @@
 "Please check for possible error causes.\n"
 msgstr ""
 
-#: src/dialogs.c:2925
+#: src/dialogs.c:3005
 #, c-format
 msgid ""
 "\n"
@@ -5428,12 +5443,12 @@
 "%s.\n"
 msgstr ""
 
-#: src/dialogs.c:2993
+#: src/dialogs.c:3073
 #, c-format
 msgid "Value for \"%s\" could not be read."
 msgstr ""
 
-#: src/dialogs.c:3011
+#: src/dialogs.c:3091
 #, c-format
 msgid ""
 "\n"
@@ -5442,7 +5457,7 @@
 "Please check your system for errors.\n"
 msgstr ""
 
-#: src/dialogs.c:3020
+#: src/dialogs.c:3100
 #, c-format
 msgid ""
 "\n"
@@ -5455,7 +5470,7 @@
 "%s\n"
 "Kérlek ellenőrizd a jogosultságokat, majd próbáld meg ismét."
 
-#: src/dialogs.c:3027
+#: src/dialogs.c:3109
 #, c-format
 msgid ""
 "\n"
@@ -5464,7 +5479,7 @@
 "Please check the directory permissions and try again."
 msgstr ""
 
-#: src/dialogs.c:3034
+#: src/dialogs.c:3116
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -5475,14 +5490,14 @@
 "\n"
 "A LiVES nem képes újrarendezni a képkockákat."
 
-#: src/dialogs.c:3041
+#: src/dialogs.c:3123
 msgid ""
 "\n"
 "Abort and exit immediately from LiVES\n"
 "Are you sure ?\n"
 msgstr ""
 
-#: src/dialogs.c:3047
+#: src/dialogs.c:3129
 #, c-format
 msgid ""
 "\n"
@@ -5493,13 +5508,13 @@
 "A %s nem képes klipet készíteni ezekkel a képekkel: %s\n"
 "Kérlek válassz egy másik kódolót a listából.\n"
 
-#: src/dialogs.c:3056
+#: src/dialogs.c:3139
 msgid ""
 "\n"
 "This card is already in use and cannot be opened multiple times.\n"
 msgstr ""
 
-#: src/dialogs.c:3061
+#: src/dialogs.c:3145
 #, c-format
 msgid ""
 "\n"
@@ -5509,27 +5524,27 @@
 "- Check if the device actually exists.\n"
 msgstr ""
 
-#: src/dialogs.c:3068
+#: src/dialogs.c:3153
 msgid ""
 "\n"
 "This file already has subtitles loaded.\n"
 "Do you wish to overwrite the existing subtitles ?\n"
 msgstr ""
 
-#: src/dialogs.c:3072
+#: src/dialogs.c:3157
 msgid ""
 "\n"
 "LiVES currently only supports subtitles of type .srt and .sub.\n"
 msgstr ""
 
-#: src/dialogs.c:3076
+#: src/dialogs.c:3161
 msgid ""
 "\n"
 "Erase all subtitles from this clip.\n"
 "Are you sure ?\n"
 msgstr ""
 
-#: src/dialogs.c:3082
+#: src/dialogs.c:3168
 #, c-format
 msgid ""
 "\n"
@@ -5538,14 +5553,14 @@
 "or OK to continue and save as type \"%s\"\n"
 msgstr ""
 
-#: src/dialogs.c:3089
+#: src/dialogs.c:3176
 msgid ""
 "\n"
 "Do you wish to move the current clip sets to the new directory ?\n"
 "(If unsure, click Yes)\n"
 msgstr ""
 
-#: src/dialogs.c:3093
+#: src/dialogs.c:3181
 #, c-format
 msgid ""
 "\n"
@@ -5556,19 +5571,19 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:3099
+#: src/dialogs.c:3188
 msgid ""
 "\n"
 "No video input devices could be found.\n"
 msgstr ""
 
-#: src/dialogs.c:3103
+#: src/dialogs.c:3192
 msgid ""
 "\n"
 "All video input devices are already in use.\n"
 msgstr ""
 
-#: src/dialogs.c:3107
+#: src/dialogs.c:3196
 msgid ""
 "\n"
 "\n"
@@ -5576,15 +5591,14 @@
 "DO NOT SHUT DOWN OR CLOSE LIVES !\n"
 msgstr ""
 
-#: src/dialogs.c:3127
+#: src/dialogs.c:3203
 #, c-format
 msgid ""
 "No clips were recovered for set (%s).\n"
 "Please check the spelling of the set name and try again.\n"
 msgstr ""
 
-#. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:3136
+#: src/dialogs.c:3214
 #, c-format
 msgid ""
 "\n"
@@ -5596,7 +5610,7 @@
 msgstr ""
 
 #. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:3144
+#: src/dialogs.c:3222
 #, c-format
 msgid ""
 "\n"
@@ -5605,34 +5619,34 @@
 "\n"
 msgstr ""
 
-#: src/dialogs.c:3150
+#: src/dialogs.c:3228
 msgid ""
 "\n"
 "You must have autolives.pl installed and in your path to use this toy.\n"
 "Consult your package distributor.\n"
 msgstr ""
 
-#: src/dialogs.c:3154
+#: src/dialogs.c:3232
 msgid ""
 "\n"
 "You must have a minimum of one clip loaded to use this toy.\n"
 msgstr ""
 
-#: src/dialogs.c:3158
+#: src/dialogs.c:3236
 msgid ""
 "\n"
 "LiVES lost its connection to jack and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:3162
+#: src/dialogs.c:3240
 msgid ""
 "\n"
 "LiVES lost its connection to pulseaudio and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:3175
+#: src/dialogs.c:3254
 #, c-format
 msgid ""
 "\n"
@@ -5641,242 +5655,242 @@
 "Do you wish to allow this (for this session only) ?\n"
 msgstr ""
 
-#: src/effects.c:60
+#: src/effects.c:61
 msgid "generator"
 msgstr "generátor"
 
-#: src/effects.c:61
+#: src/effects.c:62
 msgid "Generators"
 msgstr "Generátorok"
 
-#: src/effects.c:63
+#: src/effects.c:64
 msgid "audio generator"
 msgstr ""
 
-#: src/effects.c:64
+#: src/effects.c:65
 msgid "Audio Generators"
 msgstr ""
 
-#: src/effects.c:66
+#: src/effects.c:67
 msgid "audio/video generator"
 msgstr ""
 
-#: src/effects.c:67
+#: src/effects.c:68
 msgid "Audio/Video Generators"
 msgstr ""
 
-#: src/effects.c:69
+#: src/effects.c:70
 msgid "data generator"
 msgstr ""
 
-#: src/effects.c:70
+#: src/effects.c:71
 msgid "Data Generators"
 msgstr ""
 
-#: src/effects.c:72
+#: src/effects.c:73
 msgid "data visualiser"
 msgstr ""
 
-#: src/effects.c:73
+#: src/effects.c:74
 msgid "Data Visualisers"
 msgstr ""
 
-#: src/effects.c:75
+#: src/effects.c:76
 msgid "data processor"
 msgstr ""
 
-#: src/effects.c:76
+#: src/effects.c:77
 msgid "Data Processors"
 msgstr ""
 
-#: src/effects.c:78
+#: src/effects.c:79
 msgid "data source"
 msgstr ""
 
-#: src/effects.c:79
+#: src/effects.c:80
 msgid "Data Sources"
 msgstr ""
 
-#: src/effects.c:81
+#: src/effects.c:82
 msgid "transition"
 msgstr "átmenet"
 
-#: src/effects.c:82
+#: src/effects.c:83
 msgid "Transitions"
 msgstr "Átmenetek"
 
-#: src/effects.c:84
+#: src/effects.c:85
 msgid "effect"
 msgstr "hatás"
 
-#: src/effects.c:87 src/rfx-builder.c:187
+#: src/effects.c:88 src/rfx-builder.c:187
 msgid "utility"
 msgstr "segédprogram"
 
-#: src/effects.c:88
+#: src/effects.c:89
 msgid "Utilities"
 msgstr "Segédprogramok"
 
-#: src/effects.c:90
+#: src/effects.c:91
 msgid "compositor"
 msgstr "compositor"
 
-#: src/effects.c:91
+#: src/effects.c:92
 msgid "Compositors"
 msgstr "Compositorok"
 
-#: src/effects.c:93
+#: src/effects.c:94
 msgid "tap"
 msgstr "csap"
 
-#: src/effects.c:94
+#: src/effects.c:95
 msgid "Taps"
 msgstr "Csapok"
 
-#: src/effects.c:96
+#: src/effects.c:97
 msgid "splitter"
 msgstr "osztó"
 
-#: src/effects.c:97
+#: src/effects.c:98
 msgid "Splitters"
 msgstr "Osztók"
 
-#: src/effects.c:99
+#: src/effects.c:100
 msgid "converter"
 msgstr "konvertáló"
 
-#: src/effects.c:100
+#: src/effects.c:101
 msgid "Converters"
 msgstr "Konvertálók"
 
-#: src/effects.c:102
+#: src/effects.c:103
 msgid "analyser"
 msgstr ""
 
-#: src/effects.c:103
+#: src/effects.c:104
 msgid "Analysers"
 msgstr ""
 
-#: src/effects.c:108
+#: src/effects.c:109
 msgid "audio/video"
 msgstr "hang/videó"
 
-#: src/effects.c:109
+#: src/effects.c:110
 msgid "Audio/Video Transitions"
 msgstr "Hang/videó átmenetek"
 
-#: src/effects.c:111
+#: src/effects.c:112
 msgid "video only"
 msgstr "csak videó"
 
-#: src/effects.c:112
+#: src/effects.c:113
 msgid "Video only Transitions"
 msgstr "Csak videó átmenetek"
 
-#: src/effects.c:114 src/multitrack.c:10740
+#: src/effects.c:115 src/multitrack.c:10962
 msgid "audio only"
 msgstr "csak hang"
 
-#: src/effects.c:115
+#: src/effects.c:116
 msgid "Audio only Transitions"
 msgstr "Csak hang átmenetek"
 
-#: src/effects.c:117 src/effects.c:120 src/multitrack.c:18757
+#: src/effects.c:118 src/effects.c:121 src/multitrack.c:19097
 msgid "audio"
 msgstr "hang"
 
-#: src/effects.c:118
+#: src/effects.c:119
 msgid "Audio Mixers"
 msgstr "Hang keverők"
 
-#: src/effects.c:121
+#: src/effects.c:122
 msgid "Audio Effects"
 msgstr "Hang effektek"
 
-#: src/effects.c:123
+#: src/effects.c:124
 #, fuzzy
 msgid "video"
 msgstr "Videó"
 
-#: src/effects.c:124
+#: src/effects.c:125
 #, fuzzy
 msgid "Video Effects"
 msgstr "Hang effektek"
 
-#: src/effects.c:126
+#: src/effects.c:127
 msgid "audio volume controller"
 msgstr "hangerőszabályzó"
 
-#: src/effects.c:127
+#: src/effects.c:128
 msgid "Audio Volume Controllers"
 msgstr "Hangerőszabályzók"
 
-#: src/effects.c:129
+#: src/effects.c:130
 msgid "video analyser"
 msgstr ""
 
-#: src/effects.c:130
+#: src/effects.c:131
 msgid "Video analysers"
 msgstr ""
 
-#: src/effects.c:132
+#: src/effects.c:133
 msgid "audio analyser"
 msgstr ""
 
-#: src/effects.c:133
+#: src/effects.c:134
 msgid "Audio Analysers"
 msgstr ""
 
-#: src/effects.c:137 src/plugins.c:2559 src/plugins.c:2573
+#: src/effects.c:138 src/plugins.c:2507 src/plugins.c:2521
 msgid "unknown"
 msgstr "ismeretlen"
 
-#: src/effects.c:238
+#: src/effects.c:235
 #, c-format
 msgid "%s all frames..."
 msgstr "%s összes képkocka..."
 
-#: src/effects.c:243
+#: src/effects.c:239
 #, c-format
 msgid "%s clipboard into frames %d to %d..."
 msgstr "%s vágólap %d képkockákban eddig: %d..."
 
-#: src/effects.c:250
+#: src/effects.c:245
 #, c-format
 msgid "%s to clipboard..."
 msgstr "%s a vágólapra..."
 
-#: src/effects.c:254
+#: src/effects.c:248
 #, c-format
 msgid "%s to new clip..."
 msgstr "%s az új klippbe..."
 
-#: src/effects.c:259
+#: src/effects.c:252
 #, c-format
 msgid "%s frames %d to %d..."
 msgstr "%s képkockák %d eddig %d..."
 
-#: src/effects.c:290
+#: src/effects.c:283
 #, c-format
 msgid "%s clipboard with selection"
 msgstr "%s vágólap kijelöléssel"
 
-#: src/effects.c:295
+#: src/effects.c:287
 #, c-format
 msgid "%s to clipboard"
 msgstr "%s a vágólapra"
 
-#: src/effects.c:299
+#: src/effects.c:290
 #, c-format
 msgid "%s to new clip"
 msgstr "%s az új klipbe"
 
-#: src/effects.c:304
+#: src/effects.c:294
 #, c-format
 msgid "%s frames %d to %d"
 msgstr "%s képkockák %d eddig %d"
 
-#: src/effects.c:456 src/effects.c:523
+#: src/effects.c:443 src/effects.c:507
 msgid ""
 "\n"
 "No frames were generated.\n"
@@ -5884,49 +5898,49 @@
 "\n"
 "Nincsenek képkockák generálva.\n"
 
-#: src/effects-weed.c:431
+#: src/effects-weed.c:452
 #, fuzzy
 msgid "integer"
 msgstr "_Mutató"
 
-#: src/effects-weed.c:432
+#: src/effects-weed.c:454
 msgid "int64"
 msgstr ""
 
-#: src/effects-weed.c:433
+#: src/effects-weed.c:456
 msgid "boolean"
 msgstr ""
 
-#: src/effects-weed.c:434
+#: src/effects-weed.c:458
 msgid "double"
 msgstr ""
 
-#: src/effects-weed.c:435
+#: src/effects-weed.c:460
 #, fuzzy
 msgid "string"
 msgstr "Helyreállítás"
 
-#: src/effects-weed.c:436
+#: src/effects-weed.c:462
 #, fuzzy
 msgid "pointer"
 msgstr "_Mutató"
 
-#: src/effects-weed.c:4591
+#: src/effects-weed.c:4581
 #, c-format
 msgid "Error: plugin %s has no weed_setup() function.\n"
 msgstr "Hiba: a(z) %s bővítménynek nincsenek beállításai.\n"
 
-#: src/effects-weed.c:4606
+#: src/effects-weed.c:4595
 #, c-format
 msgid "No usable filters found in plugin %s\n"
 msgstr ""
 
-#: src/effects-weed.c:4680
+#: src/effects-weed.c:4668
 #, c-format
 msgid "Found duplicate plugin %s"
 msgstr ""
 
-#: src/effects-weed.c:4734
+#: src/effects-weed.c:4723
 #, c-format
 msgid ""
 "Info: Unable to load plugin %s\n"
@@ -5935,263 +5949,263 @@
 "Információ: Nem lehet betölteni a következő bővítményt: %s\n"
 "A hiba a következő volt: %s\n"
 
-#: src/effects-weed.c:4737 src/effects-weed.c:5858
+#: src/effects-weed.c:4726 src/effects-weed.c:5847
 msgid "Some plugin directories"
 msgstr ""
 
 #. TRANSLATORS: example " - LADSPA plugins -"
-#: src/effects-weed.c:4812 src/rte_window.c:2105
+#: src/effects-weed.c:4801 src/rte_window.c:2107
 #, c-format
 msgid " - %s plugins -"
 msgstr ""
 
-#: src/effects-weed.c:5012
+#: src/effects-weed.c:4998
 #, c-format
 msgid "Successfully loaded %d Weed filters\n"
 msgstr "Sikeresen betöltött %d Weed szűrők\n"
 
-#: src/effects-weed.c:5177
+#: src/effects-weed.c:5162
 #, c-format
 msgid "Invalid compound effect %s - has conflicting target_fps\n"
 msgstr ""
 
-#: src/effects-weed.c:5197
+#: src/effects-weed.c:5182
 #, c-format
 msgid "Invalid compound effect %s - has multiple transition parameters\n"
 msgstr ""
 
-#: src/effects-weed.c:5211
+#: src/effects-weed.c:5196
 #, c-format
 msgid "Invalid compound effect %s - has multiple master volume parameters\n"
 msgstr ""
 
-#: src/effects-weed.c:5346
+#: src/effects-weed.c:5329
 #, c-format
 msgid "Invalid compound effect %s - must have >1 sub filters\n"
 msgstr ""
 
-#: src/effects-weed.c:5366
+#: src/effects-weed.c:5349
 #, fuzzy, c-format
 msgid "Invalid effect %s found in compound effect %s, line %d\n"
 msgstr "Érvénytelen %s effekt a %s-ben\n"
 
-#: src/effects-weed.c:5381
+#: src/effects-weed.c:5364
 #, fuzzy, c-format
 msgid "Invalid default found in compound effect %s, line %d\n"
 msgstr "Érvénytelen %s effekt a %s-ben\n"
 
-#: src/effects-weed.c:5392
+#: src/effects-weed.c:5375
 #, fuzzy, c-format
 msgid "Invalid filter %d for defaults found in compound effect %s, line %d\n"
 msgstr "Érvénytelen %s effekt a %s-ben\n"
 
-#: src/effects-weed.c:5406
+#: src/effects-weed.c:5389
 #, fuzzy, c-format
 msgid "Invalid param %d for defaults found in compound effect %s, line %d\n"
 msgstr "Érvénytelen %s effekt a %s-ben\n"
 
-#: src/effects-weed.c:5433
+#: src/effects-weed.c:5416
 #, fuzzy, c-format
 msgid ""
 "Invalid number of values for defaults found in compound effect %s, line %d\n"
 msgstr "Érvénytelen %s effekt a %s-ben\n"
 
-#: src/effects-weed.c:5467
+#: src/effects-weed.c:5450
 #, fuzzy, c-format
 msgid ""
 "Invalid non-boolean value for defaults found in compound effect %s, line %d\n"
 msgstr "Érvénytelen %s effekt a %s-ben\n"
 
-#: src/effects-weed.c:5500
+#: src/effects-weed.c:5483
 #, fuzzy, c-format
 msgid "Invalid param link found in compound effect %s, line %d\n"
 msgstr "Érvénytelen %s effekt a %s-ben\n"
 
-#: src/effects-weed.c:5511
+#: src/effects-weed.c:5494
 #, fuzzy, c-format
 msgid ""
 "Invalid out filter %d for link params found in compound effect %s, line %d\n"
 msgstr "Érvénytelen %s effekt a %s-ben\n"
 
-#: src/effects-weed.c:5529
+#: src/effects-weed.c:5513
 #, fuzzy, c-format
 msgid ""
 "Invalid out param %d for link params found in compound effect %s, line %d\n"
 msgstr "Érvénytelen %s effekt a %s-ben\n"
 
-#: src/effects-weed.c:5541
+#: src/effects-weed.c:5526
 #, fuzzy, c-format
 msgid ""
 "Invalid non-boolean value for autoscale found in compound effect %s, line "
 "%d\n"
 msgstr "Érvénytelen %s effekt a %s-ben\n"
 
-#: src/effects-weed.c:5552
+#: src/effects-weed.c:5537
 #, fuzzy, c-format
 msgid ""
 "Invalid in filter %d for link params found in compound effect %s, line %d\n"
 msgstr "Érvénytelen %s effekt a %s-ben\n"
 
-#: src/effects-weed.c:5566
+#: src/effects-weed.c:5552
 #, fuzzy, c-format
 msgid ""
 "Invalid in param %d for link params found in compound effect %s, line %d\n"
 msgstr "Érvénytelen %s effekt a %s-ben\n"
 
-#: src/effects-weed.c:5594
+#: src/effects-weed.c:5581
 #, fuzzy, c-format
 msgid "Invalid channel link found in compound effect %s, line %d\n"
 msgstr "Érvénytelen %s effekt a %s-ben\n"
 
-#: src/effects-weed.c:5605
+#: src/effects-weed.c:5592
 #, fuzzy, c-format
 msgid ""
 "Invalid out filter %d for link channels found in compound effect %s, line "
 "%d\n"
 msgstr "Érvénytelen %s effekt a %s-ben\n"
 
-#: src/effects-weed.c:5623
+#: src/effects-weed.c:5611
 #, fuzzy, c-format
 msgid ""
 "Invalid out channel %d for link params found in compound effect %s, line %d\n"
 msgstr "Érvénytelen %s effekt a %s-ben\n"
 
-#: src/effects-weed.c:5633
+#: src/effects-weed.c:5622
 #, fuzzy, c-format
 msgid ""
 "Invalid in filter %d for link channels found in compound effect %s, line %d\n"
 msgstr "Érvénytelen %s effekt a %s-ben\n"
 
-#: src/effects-weed.c:5651
+#: src/effects-weed.c:5641
 #, fuzzy, c-format
 msgid ""
 "Invalid in channel %d for link params found in compound effect %s, line %d\n"
 msgstr "Érvénytelen %s effekt a %s-ben\n"
 
-#: src/effects-weed.c:5687
+#: src/effects-weed.c:5678
 #, c-format
 msgid "Compound:%s"
 msgstr ""
 
-#: src/effects-weed.c:5758
+#: src/effects-weed.c:5749
 #, fuzzy, c-format
 msgid "Successfully loaded %d compound filters\n"
 msgstr "Sikeresen betöltött %d Weed szűrők\n"
 
-#: src/effects-weed.c:6591
+#: src/effects-weed.c:6570
 #, c-format
 msgid "Effect %s cannot be used with this audio player.\n"
 msgstr ""
 
-#: src/effects-weed.c:6737
+#: src/effects-weed.c:6718
 #, c-format
 msgid "Failed to start instance %s, error code %d\n"
 msgstr "Nem sikerült elindítani a(z) %s eseményt, hiba kód: %d\n"
 
-#: src/effects-weed.c:6814
+#: src/effects-weed.c:6797
 #, c-format
 msgid "Unable to start generator %s\n"
 msgstr "Nem lehet elindítani a %s generátort\n"
 
-#: src/effects-weed.c:7621
+#: src/effects-weed.c:7607
 #, c-format
 msgid "Failed to start generator %s\n"
 msgstr "Nem lehet elindítani a %s generátort\n"
 
-#: src/effects-weed.c:7718
+#: src/effects-weed.c:7701
 #, c-format
 msgid "Failed to start generator %s, error %d\n"
 msgstr "Nem lehet elindítani a %s generátort, %d hiba\n"
 
-#: src/effects-weed.c:9012
+#: src/effects-weed.c:8993
 #, c-format
 msgid "%s [unstable] (%s)"
 msgstr ""
 
-#: src/effects-data.c:3278
+#: src/effects-data.c:3234
 #, c-format
 msgid "ACTIVATE (%s)"
 msgstr ""
 
-#: src/effects-data.c:3548
+#: src/effects-data.c:3501
 msgid "ACTIVATE"
 msgstr ""
 
-#: src/effects-data.c:3876
+#: src/effects-data.c:3829
 #, c-format
 msgid "Key slot %d"
 msgstr ""
 
-#: src/effects-data.c:3998
+#: src/effects-data.c:3951
 #, fuzzy
 msgid "Autoscale"
 msgstr "* skála"
 
-#: src/effects-data.c:4089
+#: src/effects-data.c:4042
 msgid "Add another connection for this output parameter"
 msgstr ""
 
-#: src/effects-data.c:4102 src/effects-data.c:4151
+#: src/effects-data.c:4055 src/effects-data.c:4104
 #, fuzzy
 msgid "Delete this connection"
 msgstr "_Effekt törlése"
 
-#: src/effects-data.c:4138
+#: src/effects-data.c:4091
 msgid "Add another connection for this output channel"
 msgstr ""
 
-#: src/effects-data.c:4223
+#: src/effects-data.c:4176
 msgid "Connected to -->"
 msgstr ""
 
-#: src/effects-data.c:4243
+#: src/effects-data.c:4196
 #, fuzzy, c-format
 msgid "%s - Alpha Channel Connections"
 msgstr "LiVES: - RFX paraméter ablak tippek"
 
-#: src/effects-data.c:4316
+#: src/effects-data.c:4269
 #, fuzzy, c-format
 msgid "%s - Parameter Data Connections"
 msgstr "Ki_jelölés"
 
-#: src/effects-data.c:4336
+#: src/effects-data.c:4289
 msgid "Autoscale All"
 msgstr ""
 
-#: src/effects-data.c:4361 src/effects-data.c:4890
+#: src/effects-data.c:4314 src/effects-data.c:4841
 msgid "ACTIVATED"
 msgstr ""
 
-#: src/effects-data.c:4774
+#: src/effects-data.c:4726
 #, fuzzy
 msgid "LiVES: - Parameter and Alpha Channel Connections"
 msgstr "LiVES: - RFX paraméter ablak tippek"
 
-#: src/effects-data.c:4785
+#: src/effects-data.c:4736
 #, fuzzy
 msgid "Auto Connect Channels"
 msgstr "Ki_jelölés"
 
-#: src/effects-data.c:4797
+#: src/effects-data.c:4748
 #, fuzzy
 msgid "Auto Connect Parameters"
 msgstr "Paraméterek beállítása"
 
-#: src/effects-data.c:4807
+#: src/effects-data.c:4758
 msgid "Disconnect All"
 msgstr ""
 
-#: src/effects-data.c:4875
+#: src/effects-data.c:4826
 #, c-format
 msgid "Input channel is already connected from (%d,%d) %s"
 msgstr ""
 
-#: src/effects-data.c:4891
+#: src/effects-data.c:4842
 #, c-format
 msgid "Input parameter is already connected from (%d,%d) %s"
 msgstr ""
 
-#: src/effects-data.c:4899
+#: src/effects-data.c:4851
 msgid "Input and output parameters are not compatible"
 msgstr ""
 
@@ -6203,44 +6217,44 @@
 msgid "_Reset Values"
 msgstr "_Értékek visszaállítása"
 
-#: src/framedraw.c:267
+#: src/framedraw.c:265
 #, fuzzy
 msgid "_Frame"
 msgstr "_Képkockák"
 
-#: src/paramspecial.c:266
+#: src/paramspecial.c:259
 msgid "Maintain _Aspect Ratio"
 msgstr "_Képarány fenntartása"
 
-#: src/paramspecial.c:267
+#: src/paramspecial.c:260
 msgid "Maintain aspect ratio of original frame"
 msgstr "Eredeti képarány használata"
 
-#: src/paramspecial.c:341
+#: src/paramspecial.c:335
 msgid "Display Password"
 msgstr ""
 
-#: src/paramwindow.c:450
+#: src/paramwindow.c:447
 msgid "Transition _In"
 msgstr "Átmenet _Be"
 
-#: src/paramwindow.c:452
+#: src/paramwindow.c:449
 msgid "Click to set the transition parameter to show only the front frame"
 msgstr ""
 
-#: src/paramwindow.c:474
+#: src/paramwindow.c:472
 msgid "Crossfade audio"
 msgstr "Hang a hangban"
 
-#: src/paramwindow.c:475
+#: src/paramwindow.c:473
 msgid "Check the box to make audio transition with the video"
 msgstr "Pipa a kis dobozba a hang/videó átmenet készítéséhez"
 
-#: src/paramwindow.c:493
+#: src/paramwindow.c:492
 msgid "Transition _Out"
 msgstr "Átmenet _Ki"
 
-#: src/paramwindow.c:495
+#: src/paramwindow.c:494
 msgid "Click to set the transition parameter to show only the rear frame"
 msgstr ""
 
@@ -6253,23 +6267,23 @@
 msgid "%s : size"
 msgstr "%s : méret"
 
-#: src/paramwindow.c:598
+#: src/paramwindow.c:597
 msgid "New size (pixels)"
 msgstr "Új méret (képpont)"
 
-#: src/paramwindow.c:617 src/plugins.c:997
+#: src/paramwindow.c:616 src/plugins.c:973
 msgid "_Width"
 msgstr "_Szélesség"
 
-#: src/paramwindow.c:636 src/plugins.c:1003
+#: src/paramwindow.c:635 src/plugins.c:979
 msgid "_Height"
 msgstr "_Magasság"
 
-#: src/paramwindow.c:684
+#: src/paramwindow.c:683
 msgid "Generate to _Clipboard"
 msgstr "_A vágólapra"
 
-#: src/paramwindow.c:686
+#: src/paramwindow.c:685
 msgid "Generate frames to the clipboard"
 msgstr "Elkészítés a vágólapra"
 
@@ -6281,7 +6295,7 @@
 msgid "Generate frames to a new clip"
 msgstr "Képkockák elkészítése egy új klipbe"
 
-#: src/paramwindow.c:822
+#: src/paramwindow.c:824
 #, c-format
 msgid ""
 "\n"
@@ -6292,59 +6306,59 @@
 "Ki kell választanod legalább %d képkockát az effekt használatához.\n"
 "\n"
 
-#: src/paramwindow.c:920 src/paramwindow.c:930
+#: src/paramwindow.c:934 src/paramwindow.c:942
 msgid "Set as default"
 msgstr "Legyen ez az alapértelmezés"
 
-#: src/paramwindow.c:922 src/paramwindow.c:938
+#: src/paramwindow.c:936 src/paramwindow.c:950
 msgid "Reset"
 msgstr ""
 
-#: src/paramwindow.c:932 src/rte_window.c:2401 src/omc-learn.c:1357
+#: src/paramwindow.c:944 src/rte_window.c:2394 src/omc-learn.c:1347
 msgid "Close _window"
 msgstr "_Ablak bezárása"
 
-#: src/paramwindow.c:1337
+#: src/paramwindow.c:1340
 msgid "No parameters"
 msgstr "Nincsenek paraméterek"
 
-#: src/paramwindow.c:1419
+#: src/paramwindow.c:1424
 msgid "Invalid parameter"
 msgstr "Érvénytelen paraméter"
 
-#: src/paramwindow.c:1611
+#: src/paramwindow.c:1610
 msgid "LiVES: - Select Colour"
 msgstr "LiVES: - Szín Kiválasztása"
 
-#: src/paramwindow.c:1616
+#: src/paramwindow.c:1615
 msgid "Click to set the colour"
 msgstr "Kattintás a szín beállításához"
 
-#: src/paramwindow.c:1628
+#: src/paramwindow.c:1626
 msgid "_Red"
 msgstr ""
 
-#: src/paramwindow.c:1629
+#: src/paramwindow.c:1627
 msgid "The red value (0 - 255)"
 msgstr "A vörös értéke (0 - 255)"
 
-#: src/paramwindow.c:1632
+#: src/paramwindow.c:1630
 msgid "_Green"
 msgstr ""
 
-#: src/paramwindow.c:1633
+#: src/paramwindow.c:1631
 msgid "The green value (0 - 255)"
 msgstr "A zöld értéke (0 - 255)"
 
-#: src/paramwindow.c:1636
+#: src/paramwindow.c:1634
 msgid "_Blue"
 msgstr ""
 
-#: src/paramwindow.c:1637
+#: src/paramwindow.c:1635
 msgid "The blue value (0 - 255)"
 msgstr "A kék értéke (0 - 255)"
 
-#: src/plugins.c:85
+#: src/plugins.c:86
 #, c-format
 msgid ""
 "\n"
@@ -6353,12 +6367,12 @@
 "\n"
 "Bővítmény hiba: %s hiba, ezzel a kóddal: %d"
 
-#: src/plugins.c:87
+#: src/plugins.c:88
 #, c-format
 msgid " : message was %s\n"
 msgstr " : az üzenet ez volt: %s\n"
 
-#: src/plugins.c:387
+#: src/plugins.c:375
 #, c-format
 msgid ""
 "\n"
@@ -6373,17 +6387,17 @@
 "%s\n"
 "Hiba kód: %d\n"
 
-#: src/plugins.c:397
+#: src/plugins.c:385
 #, c-format
 msgid "Updating video playback plugin defaults in %s\n"
 msgstr "Videólejátszó bővítmény alapértelmezéseinek frissítése itt: %s\n"
 
-#: src/plugins.c:452
+#: src/plugins.c:444
 #, c-format
 msgid "Loading video playback plugin defaults from %s..."
 msgstr "Videólejátszó bővítmény alapértelmezéseinek betöltése innen: %s..."
 
-#: src/plugins.c:515
+#: src/plugins.c:505
 #, c-format
 msgid ""
 "\n"
@@ -6398,32 +6412,32 @@
 "Eszközök|Beállítások|Lejátszás|Haladó bővítmények menüben\n"
 "\n"
 
-#: src/plugins.c:855
+#: src/plugins.c:836
 #, c-format
 msgid "Saving playback plugin defaults to %s..."
 msgstr ""
 
-#: src/plugins.c:962
+#: src/plugins.c:939
 msgid "_FPS"
 msgstr "_FPS"
 
-#: src/plugins.c:963
+#: src/plugins.c:940
 msgid "Fixed framerate for plugin.\n"
 msgstr "Állandó képkocka-arány a bővítménynek.\n"
 
-#: src/plugins.c:1032
+#: src/plugins.c:1008
 msgid "_Colourspace"
 msgstr "_Színtér"
 
-#: src/plugins.c:1033
+#: src/plugins.c:1009
 msgid "Colourspace input to the plugin.\n"
 msgstr "Színtér bevitel a bővítménybe.\n"
 
-#: src/plugins.c:1089
+#: src/plugins.c:1065
 msgid "Save settings to an alternate file.\n"
 msgstr ""
 
-#: src/plugins.c:1206
+#: src/plugins.c:1182
 #, c-format
 msgid ""
 "\n"
@@ -6436,7 +6450,7 @@
 "Nem sikerült megnyitni ezt a bővítményt: %s\n"
 "A hiba oka %s\n"
 
-#: src/plugins.c:1252
+#: src/plugins.c:1228
 #, c-format
 msgid ""
 "\n"
@@ -6451,7 +6465,7 @@
 "hiányzik egy kötelező funkciója.\n"
 "Nem lehet használni.\n"
 
-#: src/plugins.c:1265
+#: src/plugins.c:1241
 #, c-format
 msgid ""
 "Video playback plugin failed to initialise.\n"
@@ -6460,7 +6474,7 @@
 "Nem sikerült inicializálni a bővítményt.\n"
 "A hiba oka: %s\n"
 
-#: src/plugins.c:1461
+#: src/plugins.c:1428
 msgid ""
 "\n"
 "Warning ! Video playback plugin will not send key presses. Keyboard may be "
@@ -6470,7 +6484,7 @@
 "Figyelmeztetés! A lejátszó bővítmény nem küld billentyű lenyomatokat. Lehet, "
 "hogy le van tiltva a billentyűzeted a bővítmény használata közben!\n"
 
-#: src/plugins.c:1465
+#: src/plugins.c:1433
 #, c-format
 msgid ""
 "*** Using %s plugin for fs playback, agreed to use palette type %d ( %s ). "
@@ -6479,17 +6493,17 @@
 "***%s bővítmény használata az fs lejátszáshoz, a %d (%s) paletta típus "
 "használata engedélyezve. ***\n"
 
-#: src/plugins.c:1571
+#: src/plugins.c:1537
 #, c-format
 msgid "Audio stream unable to use preferred format '%s'\n"
 msgstr ""
 
-#: src/plugins.c:1579
+#: src/plugins.c:1543
 #, c-format
 msgid "Using format '%s' instead.\n"
 msgstr ""
 
-#: src/plugins.c:1616
+#: src/plugins.c:1579
 #, c-format
 msgid ""
 "LiVES was unable to find its encoder plugins. Please make sure you have the "
@@ -6498,7 +6512,7 @@
 "or change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/plugins.c:1624
+#: src/plugins.c:1589
 #, c-format
 msgid ""
 "LiVES did not receive a response from the encoder plugin called '%s'.\n"
@@ -6511,11 +6525,11 @@
 "%s%s%s\n"
 "vagy válassz egy másik bővítményt az Eszközök|Beállítások|Kódolás menüben\n"
 
-#: src/plugins.c:2032
+#: src/plugins.c:1987
 msgid "Unable to resize, please install imageMagick\n"
 msgstr "Nem lehet átméretezni, kérlek telepítsd fel az imageMagick-et\n"
 
-#: src/plugins.c:2231
+#: src/plugins.c:2183
 #, c-format
 msgid ""
 "\n"
@@ -6523,12 +6537,12 @@
 "No decoders found in %s !\n"
 msgstr ""
 
-#: src/plugins.c:2415
+#: src/plugins.c:2369
 #, fuzzy, c-format
 msgid " using %s"
 msgstr "%s megnyitása"
 
-#: src/plugins.c:2499
+#: src/plugins.c:2451
 #, c-format
 msgid ""
 "\n"
@@ -6541,7 +6555,7 @@
 "Nem sikerült megnyitni a következő dekóder bővítményt: %s\n"
 "A hiba oka: %s\n"
 
-#: src/plugins.c:2522
+#: src/plugins.c:2472
 #, c-format
 msgid ""
 "\n"
@@ -6556,24 +6570,24 @@
 "hiányzik egy kötelező funkciója.\n"
 "Nem lehet használni.\n"
 
-#: src/plugins.c:2564
+#: src/plugins.c:2512
 msgid "/unknown"
 msgstr "/ismeretlen"
 
-#: src/plugins.c:2651
+#: src/plugins.c:2598
 msgid "LiVES: - Decoder Plugins"
 msgstr ""
 
-#: src/plugins.c:2669
+#: src/plugins.c:2616
 msgid "Enabled Video Decoders (uncheck to disable)"
 msgstr ""
 
-#: src/plugins.c:2726
+#: src/plugins.c:2672
 #, c-format
 msgid "Failed to load %s, transitions may not resize.\n"
 msgstr "Nem lehet betölteni ezt: %s, az átmenet nem lesz átméretezve.\n"
 
-#: src/plugins.c:3854
+#: src/plugins.c:3797
 #, c-format
 msgid "%s advanced settings"
 msgstr "%s haladó beállítások"
@@ -6582,15 +6596,15 @@
 msgid "LiVES: - New Test RFX"
 msgstr "LiVES: - Új teszt RFX"
 
-#: src/rfx-builder.c:136
+#: src/rfx-builder.c:135
 msgid "LiVES: - Edit Test RFX"
 msgstr "LiVES: - Teszt RFX szerkesztése"
 
-#: src/rfx-builder.c:166
+#: src/rfx-builder.c:165
 msgid "Type:"
 msgstr "Típus:"
 
-#: src/rfx-builder.c:184
+#: src/rfx-builder.c:183
 msgid "tool"
 msgstr ""
 
@@ -6602,126 +6616,126 @@
 msgid "The name of the plugin. No spaces allowed."
 msgstr "A bővitmény neve. Nincs elég hely."
 
-#: src/rfx-builder.c:201
+#: src/rfx-builder.c:202
 msgid "Version:       "
 msgstr "Verzió:       "
 
-#: src/rfx-builder.c:203
+#: src/rfx-builder.c:204
 msgid "The script version."
 msgstr "A szkript verzió."
 
-#: src/rfx-builder.c:210
+#: src/rfx-builder.c:212
 msgid "    Author:       "
 msgstr "    Szerző:       "
 
-#: src/rfx-builder.c:211
+#: src/rfx-builder.c:213
 msgid "The script author."
 msgstr "A szkript szerzője."
 
-#: src/rfx-builder.c:217
+#: src/rfx-builder.c:220
 msgid "    URL (optional):       "
 msgstr "    URL (opcionális):       "
 
-#: src/rfx-builder.c:218
+#: src/rfx-builder.c:221
 msgid "URL for the plugin maintainer."
 msgstr "A bővítmény karbatartójának URL-je."
 
-#: src/rfx-builder.c:226
+#: src/rfx-builder.c:230
 msgid "Menu text:    "
 msgstr "Menü szöveg:    "
 
-#: src/rfx-builder.c:227
+#: src/rfx-builder.c:231
 msgid "The text to show in the menu."
 msgstr "A szöveg, ami a menüben lesz."
 
-#: src/rfx-builder.c:239
+#: src/rfx-builder.c:244
 msgid "Action description:        "
 msgstr "Művelet leírás:        "
 
-#: src/rfx-builder.c:241
+#: src/rfx-builder.c:246
 msgid "Describe what the plugin is doing. E.g. \"Edge detecting\""
 msgstr "A bővítmény működésének leírása. PL.:\"Él detektálás\""
 
-#: src/rfx-builder.c:246
+#: src/rfx-builder.c:251
 msgid "Minimum frames:"
 msgstr "Minimum képkockák:"
 
-#: src/rfx-builder.c:249
+#: src/rfx-builder.c:254
 msgid ""
 "Minimum number of frames this effect/tool can be applied to. Normally 1."
 msgstr "Az effekt által alkalmazott minimum képkockák. Normál az 1."
 
-#: src/rfx-builder.c:260
+#: src/rfx-builder.c:265
 msgid "_Requirements..."
 msgstr "_Követelmények..."
 
-#: src/rfx-builder.c:263
+#: src/rfx-builder.c:268
 msgid "Enter any binaries required by the plugin."
 msgstr "Írj be bármilyen binárist, amit a bővítmény igényel."
 
-#: src/rfx-builder.c:267
+#: src/rfx-builder.c:272
 msgid "_Properties..."
 msgstr "_Tulajdonságok..."
 
-#: src/rfx-builder.c:270
+#: src/rfx-builder.c:275
 msgid "Set properties for the plugin. Optional."
 msgstr "A bővítmény tulajdonságainak beállítása. Opcionális."
 
-#: src/rfx-builder.c:274
+#: src/rfx-builder.c:279
 msgid "_Parameters..."
 msgstr "_Paraméterek..."
 
-#: src/rfx-builder.c:277
+#: src/rfx-builder.c:282
 msgid "Set up parameters used in pre/loop/post/trigger code. Optional."
 msgstr ""
 "A pre/loop/post/trigger kódok által használt parméterek beállítása. "
 "Opcionális."
 
-#: src/rfx-builder.c:281
+#: src/rfx-builder.c:286
 msgid "Parameter _Window Hints..."
 msgstr "Paraméter _Ablak tippek..."
 
-#: src/rfx-builder.c:284
+#: src/rfx-builder.c:289
 msgid "Set hints about how to lay out the parameter window. Optional."
 msgstr "Állítsd be, hogyan jelenjen meg a paraméter ablak. Opcionális."
 
-#: src/rfx-builder.c:290
+#: src/rfx-builder.c:295
 msgid "_Language code:"
 msgstr ""
 
-#: src/rfx-builder.c:291
+#: src/rfx-builder.c:296
 msgid "Language for pre/loop/post/triggers. Optional."
 msgstr "A pre/loop/post/triggers nyelve. Opcionális."
 
-#: src/rfx-builder.c:300
+#: src/rfx-builder.c:305
 msgid "_Pre loop code..."
 msgstr "_Elő ismétlődés kód..."
 
-#: src/rfx-builder.c:303
+#: src/rfx-builder.c:308
 msgid "Code to be executed before the loop. Optional."
 msgstr "A kód az ismétlődés előtt lesz végrehajtva. Opcionális."
 
-#: src/rfx-builder.c:307
+#: src/rfx-builder.c:312
 msgid "_Loop code..."
 msgstr "_Ismétlődés kód..."
 
-#: src/rfx-builder.c:310
+#: src/rfx-builder.c:315
 msgid "Loop code to be applied to each frame."
 msgstr "Ismétlődés kód minden képkockánál alkalmazva."
 
-#: src/rfx-builder.c:314
+#: src/rfx-builder.c:319
 msgid "_Post loop code..."
 msgstr "_Ismétlődés kód küldése..."
 
-#: src/rfx-builder.c:317
+#: src/rfx-builder.c:322
 msgid "Code to be executed after the loop. Optional."
 msgstr "A kód az ismétlés után lesz végrehajtva. Opcionális."
 
-#: src/rfx-builder.c:321
+#: src/rfx-builder.c:326
 msgid "_Trigger code..."
 msgstr "_Programindító kód..."
 
-#: src/rfx-builder.c:324
+#: src/rfx-builder.c:329
 msgid ""
 "Set trigger code for when the parameter window is shown, or when a parameter "
 "is changed. Optional (except for Utilities)."
@@ -6729,7 +6743,7 @@
 "Prigramindító kód beállítása, ha a paraméter ablak megjelenik, vagy amikor a "
 "paraméter megváltozik."
 
-#: src/rfx-builder.c:421
+#: src/rfx-builder.c:426
 #, c-format
 msgid ""
 "\n"
@@ -6744,55 +6758,55 @@
 "%s\n"
 "%s\n"
 
-#: src/rfx-builder.c:544
+#: src/rfx-builder.c:541
 msgid "LiVES: - RFX Requirements"
 msgstr "LiVES: - RFX követelmények"
 
-#: src/rfx-builder.c:548
+#: src/rfx-builder.c:544
 msgid "LiVES: - RFX Parameters"
 msgstr "LiVES: - RFX paraméterek"
 
-#: src/rfx-builder.c:552
+#: src/rfx-builder.c:547
 msgid "LiVES: - RFX Parameter Window Hints"
 msgstr "LiVES: - RFX paraméter ablak tippek"
 
-#: src/rfx-builder.c:556
+#: src/rfx-builder.c:550
 msgid "LiVES: - RFX Triggers"
 msgstr "LiVES: - RFX programindítók"
 
-#: src/rfx-builder.c:622
+#: src/rfx-builder.c:613
 msgid "_New Entry"
 msgstr "_Új bejegyzés"
 
-#: src/rfx-builder.c:625
+#: src/rfx-builder.c:616
 msgid "_Edit Entry"
 msgstr "_Bejegyzés szerkesztése"
 
-#: src/rfx-builder.c:628
+#: src/rfx-builder.c:619
 msgid "_Remove Entry"
 msgstr "_Bejegyzés eltávolítása"
 
-#: src/rfx-builder.c:632
+#: src/rfx-builder.c:623
 msgid "Move _Up"
 msgstr "Mozgatás _fel"
 
-#: src/rfx-builder.c:635
+#: src/rfx-builder.c:626
 msgid "Move _Down"
 msgstr "Mozgatás _le"
 
-#: src/rfx-builder.c:1004
+#: src/rfx-builder.c:984
 msgid "LiVES: - RFX Properties"
 msgstr "LiVES: - RFX tulajdonságok"
 
-#: src/rfx-builder.c:1013
+#: src/rfx-builder.c:993
 msgid "_Slow (hint to GUI)"
 msgstr "_Lassú"
 
-#: src/rfx-builder.c:1024
+#: src/rfx-builder.c:1004
 msgid "_Batch mode generator"
 msgstr "_Batch mód generátor"
 
-#: src/rfx-builder.c:1831
+#: src/rfx-builder.c:1790
 msgid ""
 "\n"
 "\n"
@@ -6806,7 +6820,7 @@
 "Előbb távolítsd el a programindítót.\n"
 "\n"
 
-#: src/rfx-builder.c:1875
+#: src/rfx-builder.c:1834
 msgid ""
 "\n"
 "\n"
@@ -6818,27 +6832,27 @@
 "Néhány programindító korrigálva lett.\n"
 "Kérlek ellenőrizd a kódot.\n"
 
-#: src/rfx-builder.c:1994
+#: src/rfx-builder.c:1950
 msgid "LiVES: - New RFX Parameter"
 msgstr "LiVES: - Új RFX paraméter"
 
-#: src/rfx-builder.c:1997
+#: src/rfx-builder.c:1952
 msgid "LiVES: - Edit RFX Parameter"
 msgstr "LiVES: - RFX paraméter szerkesztése"
 
-#: src/rfx-builder.c:2013
+#: src/rfx-builder.c:1968
 msgid "_Name:    "
 msgstr "_Név:    "
 
-#: src/rfx-builder.c:2016
+#: src/rfx-builder.c:1971
 msgid "Name of the parameter, must be unique in the plugin."
 msgstr "A paraméter neve, egyedinek kell lennie a bővítményben."
 
-#: src/rfx-builder.c:2025
+#: src/rfx-builder.c:1981
 msgid "_Label:    "
 msgstr "_Címke:    "
 
-#: src/rfx-builder.c:2028
+#: src/rfx-builder.c:1984
 msgid ""
 "Label to be shown by the parameter. An underscore represents mnemonic "
 "accelerator."
@@ -6846,161 +6860,161 @@
 "Egy címke mutatva lesz a paraméter által. Egy aláhúzott bemutatott mnemonic "
 "gyorsító."
 
-#: src/rfx-builder.c:2039
+#: src/rfx-builder.c:1996
 msgid "_Type:         "
 msgstr "_Típus:         "
 
-#: src/rfx-builder.c:2040
+#: src/rfx-builder.c:1997
 msgid "Parameter type (select from list)."
 msgstr "Paraméter típus (kijelölése a listából)."
 
-#: src/rfx-builder.c:2073
+#: src/rfx-builder.c:2029
 msgid "Decimal _places: "
 msgstr "Decimális _helyek: "
 
-#: src/rfx-builder.c:2082 src/rfx-builder.c:2477 src/rfx-builder.c:2495
+#: src/rfx-builder.c:2038 src/rfx-builder.c:2430 src/rfx-builder.c:2447
 msgid "_Default value:    "
 msgstr "_Alapértelmezett érték:    "
 
-#: src/rfx-builder.c:2098
+#: src/rfx-builder.c:2054
 msgid "_Default: "
 msgstr "_Alapértelmezett: "
 
-#: src/rfx-builder.c:2132
+#: src/rfx-builder.c:2087
 msgid "Button _Group: "
 msgstr "Gomb _csoport: "
 
-#: src/rfx-builder.c:2134
+#: src/rfx-builder.c:2089
 msgid "A non-zero value can be used to group radio buttons."
 msgstr "A nem-nulla érték használható a csoport rádió gombokhoz."
 
-#: src/rfx-builder.c:2142 src/rfx-builder.c:2478
+#: src/rfx-builder.c:2097 src/rfx-builder.c:2431
 msgid "_Minimum value: "
 msgstr "_Minimum érték: "
 
-#: src/rfx-builder.c:2148 src/rfx-builder.c:2479
+#: src/rfx-builder.c:2103 src/rfx-builder.c:2432
 msgid "Ma_ximum value: "
 msgstr "_Maximum érték: "
 
-#: src/rfx-builder.c:2157
+#: src/rfx-builder.c:2113
 msgid "     _Step size:   "
 msgstr "     _Lépés méret:   "
 
-#: src/rfx-builder.c:2160
+#: src/rfx-builder.c:2117
 msgid ""
 "How much the parameter is adjusted when the spinbutton arrows are pressed."
 msgstr ""
 "Mennyire van korrigálva a paraméter akkor, amikor a pörgöbomb nyilak le "
 "vannak nyomva."
 
-#: src/rfx-builder.c:2171
+#: src/rfx-builder.c:2129
 #, fuzzy
 msgid "_Wrap value"
 msgstr "_Körbe: "
 
-#: src/rfx-builder.c:2172
+#: src/rfx-builder.c:2131
 msgid "Whether the value wraps max->min and min->max."
 msgstr "Ha az érték max->min és min->max."
 
-#: src/rfx-builder.c:2470
+#: src/rfx-builder.c:2424
 msgid "Set _values"
 msgstr "_Értékek beállítása"
 
-#: src/rfx-builder.c:2512
+#: src/rfx-builder.c:2463
 msgid "Default _Red:  "
 msgstr "Alapértelmezett _vörös:  "
 
-#: src/rfx-builder.c:2513
+#: src/rfx-builder.c:2464
 msgid "Default _Green:"
 msgstr "Alapértelmezett _zöld:"
 
-#: src/rfx-builder.c:2514
+#: src/rfx-builder.c:2465
 msgid "Default _Blue: "
 msgstr "Alapértelmezett _kék: "
 
-#: src/rfx-builder.c:2538
+#: src/rfx-builder.c:2488
 msgid "Set _default"
 msgstr "_Alapértelmezett beállítása"
 
-#: src/rfx-builder.c:2540
+#: src/rfx-builder.c:2490
 msgid "Default value:  "
 msgstr "Alapértelmezett érték:  "
 
-#: src/rfx-builder.c:2541
+#: src/rfx-builder.c:2491
 msgid "Maximum length (chars): "
 msgstr "Maximum hossz (karakterek): "
 
-#: src/rfx-builder.c:2576
+#: src/rfx-builder.c:2526
 msgid "LiVES: - New RFX Parameter Window Hint"
 msgstr "LiVES: - Új RFX paraméter ablak tipp"
 
-#: src/rfx-builder.c:2579
+#: src/rfx-builder.c:2528
 msgid "LiVES: - Edit RFX Parameter Window Hint"
 msgstr "LiVES: - RFX paraméter ablak tipp szerkesztése"
 
-#: src/rfx-builder.c:2622
+#: src/rfx-builder.c:2569
 msgid "_Keyword:         "
 msgstr ""
 
-#: src/rfx-builder.c:2639
+#: src/rfx-builder.c:2586
 msgid "Special _Type:         "
 msgstr ""
 
-#: src/rfx-builder.c:2656
+#: src/rfx-builder.c:2602
 msgid "Special _Subtype:         "
 msgstr ""
 
-#: src/rfx-builder.c:2667 src/rfx-builder.c:2706
+#: src/rfx-builder.c:2613 src/rfx-builder.c:2651
 msgid "Row:    "
 msgstr "Sor:    "
 
-#: src/rfx-builder.c:2732
+#: src/rfx-builder.c:2676
 #, c-format
 msgid "Linked parameters (%d):    "
 msgstr "Kapcsolt paraméterek (%d):    "
 
-#: src/rfx-builder.c:2749
+#: src/rfx-builder.c:2693
 msgid "Linked parameters (4):    "
 msgstr "Kapcsolt paraméterek (4):    "
 
-#: src/rfx-builder.c:2752
+#: src/rfx-builder.c:2695
 msgid "Linked parameters (2):    "
 msgstr "Kapcsolt paraméterek (2):    "
 
-#: src/rfx-builder.c:2777
+#: src/rfx-builder.c:2720
 msgid "LiVES: - New RFX Trigger"
 msgstr "LiVES: - Új RFX programindító"
 
-#: src/rfx-builder.c:2780
+#: src/rfx-builder.c:2722
 msgid "LiVES: - Edit RFX Trigger"
 msgstr "LiVES: - RFX programindító szerkesztése"
 
-#: src/rfx-builder.c:2808
+#: src/rfx-builder.c:2750
 msgid "When:         "
 msgstr "Mikor:         "
 
-#: src/rfx-builder.c:2904
+#: src/rfx-builder.c:2846
 msgid "LiVES: - Pre Loop Code"
 msgstr "LiVES: - Elő ismétlődés kód"
 
-#: src/rfx-builder.c:2911
+#: src/rfx-builder.c:2853
 msgid "LiVES: - Loop Code"
 msgstr "LiVES: - Ismétlődés kód"
 
-#: src/rfx-builder.c:2918
+#: src/rfx-builder.c:2860
 msgid "LiVES: - Post Loop Code"
 msgstr "LiVES: - Ismétlődés kód küldése"
 
-#: src/rfx-builder.c:2931
+#: src/rfx-builder.c:2873
 #, c-format
 msgid "LiVES: - Default text (max length %d)"
 msgstr "LiVES: - Alapértelmezett szöveg (max. hossz %d)"
 
-#: src/rfx-builder.c:2944
+#: src/rfx-builder.c:2885
 msgid "LiVES: - Enter values, one per line"
 msgstr "LiVES: - Adj meg értékeket, soronként"
 
-#: src/rfx-builder.c:3055
+#: src/rfx-builder.c:2996
 msgid ""
 "\n"
 "\n"
@@ -7010,7 +7024,7 @@
 "\n"
 "A név nem lehet üres.\n"
 
-#: src/rfx-builder.c:3060
+#: src/rfx-builder.c:3001
 msgid ""
 "\n"
 "\n"
@@ -7020,7 +7034,7 @@
 "\n"
 "A név nem tartalmazhat szóközt.\n"
 
-#: src/rfx-builder.c:3065
+#: src/rfx-builder.c:3006
 msgid ""
 "\n"
 "\n"
@@ -7030,7 +7044,7 @@
 "\n"
 "A menü szöveg nem lehet üres.\n"
 
-#: src/rfx-builder.c:3071
+#: src/rfx-builder.c:3012
 msgid ""
 "\n"
 "\n"
@@ -7040,7 +7054,7 @@
 "\n"
 "A folyamat leírás nem lehet üres.\n"
 
-#: src/rfx-builder.c:3076
+#: src/rfx-builder.c:3017
 msgid ""
 "\n"
 "\n"
@@ -7050,7 +7064,7 @@
 "\n"
 "A szerző rész nem lehet üres.\n"
 
-#: src/rfx-builder.c:3085 src/rfx-builder.c:4339
+#: src/rfx-builder.c:3026 src/rfx-builder.c:4253
 msgid ""
 "\n"
 "\n"
@@ -7062,7 +7076,7 @@
 "Már létezik ezzel a névvel bővítmény.\n"
 "A névnek egyedinek kell lennie.\n"
 
-#: src/rfx-builder.c:3092
+#: src/rfx-builder.c:3033
 msgid ""
 "\n"
 "\n"
@@ -7072,7 +7086,7 @@
 "\n"
 "Ismétlödő kód nem lehet üres.\n"
 
-#: src/rfx-builder.c:3098
+#: src/rfx-builder.c:3039
 msgid ""
 "\n"
 "\n"
@@ -7082,7 +7096,7 @@
 "\n"
 "A programindító kódja nem lehet üres egy alkalmazásnak.\n"
 
-#: src/rfx-builder.c:3111
+#: src/rfx-builder.c:3052
 msgid ""
 "\n"
 "\n"
@@ -7092,7 +7106,7 @@
 "\n"
 "A paraméter nem lehet üres.\n"
 
-#: src/rfx-builder.c:3117
+#: src/rfx-builder.c:3058
 msgid ""
 "\n"
 "\n"
@@ -7106,41 +7120,41 @@
 "lennie a bővítményben.\n"
 "\n"
 
-#: src/rfx-builder.c:3171
+#: src/rfx-builder.c:3111
 #, c-format
 msgid "Writing script file %s..."
 msgstr "%s parancsfájl írása..."
 
-#: src/rfx-builder.c:3477
+#: src/rfx-builder.c:3411
 msgid "No <define> section found in script.\n"
 msgstr "Nem találtam <define> részt a parancsfájlban.\n"
 
-#: src/rfx-builder.c:3484 src/rfx-builder.c:3493
+#: src/rfx-builder.c:3418 src/rfx-builder.c:3427
 msgid "Bad script version.\n"
 msgstr "Rossz parancsfájl verzió.\n"
 
-#: src/rfx-builder.c:3505
+#: src/rfx-builder.c:3439
 msgid "No <name> section found in script.\n"
 msgstr "Nem találtam <name> szakaszt a parancsfájlban.\n"
 
-#: src/rfx-builder.c:3513
+#: src/rfx-builder.c:3447
 msgid "No <version> section found in script.\n"
 msgstr "Nem találtam <version> szakaszt a parancsfájlban.\n"
 
-#: src/rfx-builder.c:3522
+#: src/rfx-builder.c:3456
 msgid "No <author> section found in script.\n"
 msgstr "Nem találtam <author> szakaszt a parancsfájlban.\n"
 
-#: src/rfx-builder.c:3536
+#: src/rfx-builder.c:3470
 msgid "No <description> section found in script.\n"
 msgstr "Nem találtam <description> szakaszt a parancsfájlban.\n"
 
-#: src/rfx-builder.c:3540
+#: src/rfx-builder.c:3474
 #, c-format
 msgid "Bad description. (%s)\n"
 msgstr "Rossz leírás. (%s)\n"
 
-#: src/rfx-builder.c:3702
+#: src/rfx-builder.c:3627
 #, c-format
 msgid ""
 "\n"
@@ -7155,27 +7169,27 @@
 "találtam a parancsfájlban.\n"
 "\n"
 
-#: src/rfx-builder.c:3859
+#: src/rfx-builder.c:3780
 msgid "Rebuilding all RFX scripts...builtin..."
 msgstr "Összes RFX parancsfájl újraépítése...builtin...."
 
-#: src/rfx-builder.c:3860
+#: src/rfx-builder.c:3781
 msgid "Rebuilding scripts"
 msgstr "Parancsfájlok újraépítése"
 
-#: src/rfx-builder.c:3868
+#: src/rfx-builder.c:3789
 msgid "custom..."
 msgstr "egyéni..."
 
-#: src/rfx-builder.c:3872
+#: src/rfx-builder.c:3793
 msgid "test..."
 msgstr "teszt..."
 
-#: src/rfx-builder.c:3878
+#: src/rfx-builder.c:3799
 msgid "rebuilding dynamic menu entries..."
 msgstr "dinamikus menübejegyzések újraépítése..."
 
-#: src/rfx-builder.c:3905 src/rfx-builder.c:3912
+#: src/rfx-builder.c:3826 src/rfx-builder.c:3834
 #, c-format
 msgid ""
 "\n"
@@ -7188,7 +7202,7 @@
 "A LiVES nem képes megtalálni a %s programot.\n"
 "Kérlek ellenőrizd a program elérhetőségét, és futtathatóságát.\n"
 
-#: src/rfx-builder.c:3951
+#: src/rfx-builder.c:3874
 #, c-format
 msgid ""
 "\n"
@@ -7203,12 +7217,12 @@
 "parancsfájlokat?\n"
 "\n"
 
-#: src/rfx-builder.c:3960
+#: src/rfx-builder.c:3884
 #, c-format
 msgid "Deleting rfx script %s..."
 msgstr "%s rfx parancsfájlok törlése..."
 
-#: src/rfx-builder.c:3980
+#: src/rfx-builder.c:3902
 #, c-format
 msgid ""
 "\n"
@@ -7223,7 +7237,7 @@
 "parancsfájlt\n"
 "Hiba kód: %d\n"
 
-#: src/rfx-builder.c:4016
+#: src/rfx-builder.c:3938
 #, c-format
 msgid ""
 "\n"
@@ -7238,12 +7252,12 @@
 "már létezik.\n"
 "Először töröld ezt, vagy nevezd át.\n"
 
-#: src/rfx-builder.c:4027
+#: src/rfx-builder.c:3950
 #, c-format
 msgid "Promoting rfx test plugin %s to custom..."
 msgstr "%s rfx teszt bővítmény promotálása egyénire..."
 
-#: src/rfx-builder.c:4044
+#: src/rfx-builder.c:3965
 #, c-format
 msgid ""
 "\n"
@@ -7254,22 +7268,22 @@
 "Return code was %d (%s)\n"
 msgstr ""
 
-#: src/rfx-builder.c:4070
+#: src/rfx-builder.c:3990
 #, fuzzy
 msgid "LiVES: - Export Script to..."
 msgstr "Parancsfájl exportálása ide..."
 
-#: src/rfx-builder.c:4077 src/rfx-builder.c:4156
+#: src/rfx-builder.c:3997 src/rfx-builder.c:4074
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "%s másolása ide: %s..."
 
-#: src/rfx-builder.c:4105
+#: src/rfx-builder.c:4024
 #, fuzzy
 msgid "LiVES: Import Script from..."
 msgstr "Parancsfájl importálása innen..."
 
-#: src/rfx-builder.c:4148
+#: src/rfx-builder.c:4067
 #, c-format
 msgid ""
 "\n"
@@ -7284,43 +7298,43 @@
 "már létezik.\n"
 "Először töröld, vagy nevezd át az import parancsfájlt.\n"
 
-#: src/rfx-builder.c:4249
+#: src/rfx-builder.c:4166
 msgid "LiVES: - Copy RFX Script"
 msgstr "LiVES: - RFX parancsfájl másolása"
 
-#: src/rfx-builder.c:4251
+#: src/rfx-builder.c:4168
 msgid "_From type:    "
 msgstr ""
 
-#: src/rfx-builder.c:4258
+#: src/rfx-builder.c:4175
 msgid "   Script:    "
 msgstr "   Parancsfájl:    "
 
-#: src/rfx-builder.c:4267
+#: src/rfx-builder.c:4183
 msgid "LiVES: - Rename test RFX Script"
 msgstr "LiVES: - Teszt RFX parancsfájl átnevezése"
 
-#: src/rfx-builder.c:4268
+#: src/rfx-builder.c:4184
 msgid "From script: "
 msgstr "Parancsfájlból: "
 
-#: src/rfx-builder.c:4273
+#: src/rfx-builder.c:4188
 msgid "LiVES: - RFX Script name"
 msgstr "LiVES: - RFX parancsfájl név"
 
-#: src/rfx-builder.c:4274
+#: src/rfx-builder.c:4189
 msgid "Script name: "
 msgstr "Parancsfájl név: "
 
-#: src/rfx-builder.c:4294
+#: src/rfx-builder.c:4209
 msgid "New name: "
 msgstr "Új név: "
 
-#: src/rfx-builder.c:4297
+#: src/rfx-builder.c:4212
 msgid "New script name: "
 msgstr "Új parancsfájl név: "
 
-#: src/rfx-builder.c:4372
+#: src/rfx-builder.c:4286
 msgid ""
 "\n"
 "\n"
@@ -7332,12 +7346,12 @@
 "Már létezik teszt parancsfájl ezzel a névvel.\n"
 "A parancsfájl nevének egyénileg kell lennie.\n"
 
-#: src/rfx-builder.c:4384
+#: src/rfx-builder.c:4297
 #, c-format
 msgid "Renaming RFX test script %s to %s..."
 msgstr "%s RFX teszt parancsfájl átnevezése erre: %s..."
 
-#: src/rfx-builder.c:4390
+#: src/rfx-builder.c:4302
 #, c-format
 msgid ""
 "\n"
@@ -7354,23 +7368,23 @@
 "ide: %s\n"
 "A kód %d volt\n"
 
-#: src/rfx-builder.c:4610
+#: src/rfx-builder.c:4518
 msgid "_Apply Real Time Effects to Selection"
 msgstr "_Azonnali effekt alkalmazása a kijelöléshez"
 
-#: src/rfx-builder.c:4664
+#: src/rfx-builder.c:4572
 #, c-format
 msgid "Loading rendered effect %s..."
 msgstr "%s effekt betöltése..."
 
-#: src/rfx-builder.c:4766
+#: src/rfx-builder.c:4674
 msgid ""
 "See: VJ - show VJ keys. Set the realtime effects, and then apply them here."
 msgstr ""
 "Lásd: VJ - mutasd a VJ billentyűket. Állítsd be az azonnali effekteket, majd "
 "alkalmazd őket ott."
 
-#: src/preferences.c:359
+#: src/preferences.c:351
 msgid ""
 "\n"
 "\n"
@@ -7382,7 +7396,7 @@
 "A lejátszó bővítmények csak teljes képernyőn\n"
 "aktiválódnak, különálló ablak (fs) módban\n"
 
-#: src/preferences.c:408
+#: src/preferences.c:400
 msgid ""
 "\n"
 "\n"
@@ -7390,7 +7404,7 @@
 "(Free space = UNKNOWN)"
 msgstr ""
 
-#: src/preferences.c:412
+#: src/preferences.c:403
 #, c-format
 msgid ""
 "\n"
@@ -7399,14 +7413,14 @@
 "(Free space = %s)"
 msgstr ""
 
-#: src/preferences.c:416
+#: src/preferences.c:408
 msgid ""
 "The temp directory is LiVES working directory where opened clips and sets "
 "are stored.\n"
 "It should be in a partition with plenty of free disk space.\n"
 msgstr ""
 
-#: src/preferences.c:784
+#: src/preferences.c:839
 #, c-format
 msgid ""
 "Unable to create or write to the new temporary directory.\n"
@@ -7417,7 +7431,7 @@
 "The directory will not be changed now.\n"
 msgstr ""
 
-#: src/preferences.c:786
+#: src/preferences.c:843
 #, c-format
 msgid ""
 "Unable to create or write to the new temporary directory.\n"
@@ -7427,7 +7441,7 @@
 "The directory will not be changed now.\n"
 msgstr ""
 
-#: src/preferences.c:798
+#: src/preferences.c:856
 msgid ""
 "You have chosen to change the temporary directory.\n"
 "Please make sure you have no other copies of LiVES open.\n"
@@ -7447,7 +7461,7 @@
 "Más esetben nyomj 'Mégse'-t, hogy visszaállítsd az átmeneti könyvtárt az "
 "alap beállításra."
 
-#: src/preferences.c:1169
+#: src/preferences.c:1221
 msgid ""
 "\n"
 "Unable to switch audio players to jack - jackd must be installed first.\n"
@@ -7458,7 +7472,7 @@
 "jack-et.\n"
 "Lásd http://jackaudio.org\n"
 
-#: src/preferences.c:1175
+#: src/preferences.c:1226
 msgid ""
 "\n"
 "Switching audio players requires restart (jackd must not be running)\n"
@@ -7466,7 +7480,7 @@
 "\n"
 "A zene lejátszó váltás újraindítást igényel\n"
 
-#: src/preferences.c:1202
+#: src/preferences.c:1253
 msgid ""
 "\n"
 "Unable to switch audio players to pulse audio\n"
@@ -7478,344 +7492,344 @@
 "először fel kell telepíteni a pulseaudio-t.\n"
 "Bővebb info a http://www.pulseaudio.org oldalon található\n"
 
-#: src/preferences.c:1502
+#: src/preferences.c:1544
 msgid "PCM (highest quality; largest files)"
 msgstr "PCM (magas minőségű, nagy méretű fájlok)"
 
-#: src/preferences.c:2063
+#: src/preferences.c:2096
 msgid "LiVES: - Preferences"
 msgstr "LiVES: - Beállítások"
 
-#: src/preferences.c:2142
+#: src/preferences.c:2177
 msgid "Open file selection maximised"
 msgstr "Maximalizált fájl kiválasztás megnyitása"
 
-#: src/preferences.c:2149
+#: src/preferences.c:2184
 msgid "Show recent files in the File menu"
 msgstr "Előző fájlok mutatása a fájl menüben"
 
-#: src/preferences.c:2158
+#: src/preferences.c:2193
 msgid "Stop screensaver on playback    "
 msgstr "Képernyővédeő kikapcsolása a lejátszás alatt    "
 
-#: src/preferences.c:2165
+#: src/preferences.c:2200
 msgid "Open main window maximised"
 msgstr "Maximalizált fő ablak mutatása"
 
-#: src/preferences.c:2173
+#: src/preferences.c:2208
 msgid "Show toolbar when background is blanked"
 msgstr "Mutasd az eszköztárat, ha a háttér üres"
 
-#: src/preferences.c:2181
+#: src/preferences.c:2216
 msgid "Allow mouse wheel to switch clips"
 msgstr "Klipek váltása az egérgörgővel"
 
-#: src/preferences.c:2192
+#: src/preferences.c:2227
 msgid "Shrink previews to fit in interface"
 msgstr ""
 
-#: src/preferences.c:2202
+#: src/preferences.c:2237
 msgid "Startup mode:"
 msgstr "Indítási mód:"
 
-#: src/preferences.c:2206
+#: src/preferences.c:2241
 msgid "_Clip editor"
 msgstr "_Klip szerkesztő"
 
-#: src/preferences.c:2210
+#: src/preferences.c:2245
 msgid "_Multitrack mode"
 msgstr "_Multitrack mód"
 
-#: src/preferences.c:2234
+#: src/preferences.c:2268
 msgid "Multi-head support"
 msgstr "Multi-head támogatás"
 
-#: src/preferences.c:2242
+#: src/preferences.c:2276
 msgid " monitor number for LiVES interface"
 msgstr " LiVES felületéhez rendelt monitorok száma"
 
-#: src/preferences.c:2248
+#: src/preferences.c:2282
 msgid " monitor number for playback"
 msgstr " lejátszáshoz használt monitorok száma"
 
-#: src/preferences.c:2260
+#: src/preferences.c:2294
 msgid ""
 "A setting of 0 means use all available monitors (only works with some "
 "playback plugins)."
 msgstr ""
 
-#: src/preferences.c:2270
+#: src/preferences.c:2304
 msgid "Force single monitor"
 msgstr "Csak egyetlen monitor"
 
-#: src/preferences.c:2271
+#: src/preferences.c:2305
 msgid "Ignore all except the first monitor."
 msgstr ""
 
-#: src/preferences.c:2293
+#: src/preferences.c:2327
 msgid "Show clip thumbnails during playback"
 msgstr ""
 
-#: src/preferences.c:2306
+#: src/preferences.c:2340
 msgid "GUI"
 msgstr "GUI"
 
-#: src/preferences.c:2321
+#: src/preferences.c:2355
 msgid "When entering Multitrack mode:"
 msgstr "Amikor belépsz a multitrack módba:"
 
-#: src/preferences.c:2330
+#: src/preferences.c:2364
 msgid "_Prompt me for width, height, fps and audio settings"
 msgstr ""
 "_Értesíts a videó szélességi, hosszúsági értékeiről, fps-ről és a hang "
 "beállításokról"
 
-#: src/preferences.c:2336
+#: src/preferences.c:2370
 msgid "_Always use the following values:"
 msgstr "_Mindig a következő értékek használata:"
 
-#: src/preferences.c:2345
+#: src/preferences.c:2379
 msgid "Use these same _values for rendering a new clip"
 msgstr "Ugyanezen _értékek használata a klip megjelenítésénél is"
 
-#: src/preferences.c:2370
+#: src/preferences.c:2404
 msgid "_Width           "
 msgstr "_Szélesség           "
 
-#: src/preferences.c:2375
+#: src/preferences.c:2409
 msgid "          _Height      "
 msgstr "          _Magasság      "
 
-#: src/preferences.c:2379
+#: src/preferences.c:2413
 msgid "          _FPS"
 msgstr ""
 
-#: src/preferences.c:2387
+#: src/preferences.c:2421
 msgid "Enable backing audio track"
 msgstr "Zene a háttérben engedélyezve"
 
-#: src/preferences.c:2394
+#: src/preferences.c:2428
 msgid "Audio track per video track"
 msgstr "Egy hang egy videó"
 
-#: src/preferences.c:2423
+#: src/preferences.c:2457
 msgid "    _Undo buffer size (MB)    "
 msgstr "    _Puffer méret visszavonása (MB)    "
 
-#: src/preferences.c:2432
+#: src/preferences.c:2466
 msgid "_Exit multitrack mode after rendering"
 msgstr "_Kilépés a multitrack módból a megjelenítés után"
 
-#: src/preferences.c:2440
+#: src/preferences.c:2474
 msgid "Auto backup layouts"
 msgstr "Automata háttérkimenetek"
 
-#: src/preferences.c:2445
+#: src/preferences.c:2479
 msgid "_Every"
 msgstr "_Minden"
 
-#: src/preferences.c:2453
+#: src/preferences.c:2487
 msgid "seconds"
 msgstr "másodpercben"
 
-#: src/preferences.c:2461
+#: src/preferences.c:2495
 msgid "After every _change"
 msgstr "Minden _váltás után"
 
-#: src/preferences.c:2467
+#: src/preferences.c:2501
 msgid "_Never"
 msgstr "_Soha"
 
-#: src/preferences.c:2490
+#: src/preferences.c:2523
 msgid "Multitrack/Render"
 msgstr "Multitrack/renderelés"
 
-#: src/preferences.c:2508
+#: src/preferences.c:2541
 msgid "Use instant opening when possible"
 msgstr "Instant megnyitás használata ha lehetséges"
 
-#: src/preferences.c:2509
+#: src/preferences.c:2543
 msgid "Enable instant opening of some file types using decoder plugins"
 msgstr ""
 "Néhány dekóder bővítményt használó fájl instant megnyitásának engedélyezése"
 
-#: src/preferences.c:2531
+#: src/preferences.c:2567
 #, fuzzy
 msgid "Video open command (fallback)"
 msgstr "Videó megnyitás parancs             "
 
-#: src/preferences.c:2543
+#: src/preferences.c:2579
 #, fuzzy
 msgid "Open/render compression"
 msgstr "Tömörítés megnyitása/adása                  "
 
-#: src/preferences.c:2546
+#: src/preferences.c:2582
 msgid " %     ( lower = slower, larger files; for jpeg, higher quality )"
 msgstr ""
 " %      ( alacsonyabb = lassabb, hosszabb fájlok, jpeg-nek, magas minőség )"
 
-#: src/preferences.c:2558
+#: src/preferences.c:2594
 #, fuzzy
 msgid "Default image format"
 msgstr "Alapértelmezett kép formátum          "
 
-#: src/preferences.c:2562
+#: src/preferences.c:2598
 msgid "_jpeg"
 msgstr "_jpeg"
 
-#: src/preferences.c:2565
+#: src/preferences.c:2601
 msgid "_png"
 msgstr "_png"
 
-#: src/preferences.c:2572
+#: src/preferences.c:2608
 msgid "(Check Help/Troubleshoot to see which image formats are supported)"
 msgstr ""
 
-#: src/preferences.c:2580
+#: src/preferences.c:2616
 msgid "Enable automatic deinterlacing when possible"
 msgstr "Automatikus deinterlacing engedélyezése, ha lehetséges"
 
-#: src/preferences.c:2582
+#: src/preferences.c:2619
 msgid "Automatically deinterlace frames when a plugin suggests it"
 msgstr "Automatikus deinterlace képkockák, amikor a bővítmény kéri"
 
-#: src/preferences.c:2593
+#: src/preferences.c:2632
 #, fuzzy
 msgid "Automatic trimming / padding of audio when possible"
 msgstr "Automatikus deinterlacing engedélyezése, ha lehetséges"
 
-#: src/preferences.c:2595
+#: src/preferences.c:2634
 #, fuzzy
 msgid "Automatically trim or pad audio when a plugin suggests it"
 msgstr "Automatikus deinterlace képkockák, amikor a bővítmény kéri"
 
-#: src/preferences.c:2606
+#: src/preferences.c:2646
 msgid "Ignore blank borders when possible"
 msgstr ""
 
-#: src/preferences.c:2608
+#: src/preferences.c:2648
 msgid "Clip any blank borders from frames where possible"
 msgstr ""
 
-#: src/preferences.c:2619
+#: src/preferences.c:2660
 msgid "When opening multiple files, concatenate images into one clip"
 msgstr ""
 "Amikor összetett fájlokat nyitsz meg, akkor összefűzi a képeket egy klipbe"
 
-#: src/preferences.c:2629
+#: src/preferences.c:2670
 msgid "Decoding"
 msgstr "Dekódolás"
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:2652
+#: src/preferences.c:2693
 msgid "Low - can improve performance on slower machines"
 msgstr "Alacsony - kis teljesítményű gépekhez ajánlott"
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:2654
+#: src/preferences.c:2695
 msgid "Normal - recommended for most users"
 msgstr "Normál - a legtöbb felhasználónak ez ajánlott"
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:2656
+#: src/preferences.c:2697
 msgid "High - can improve quality on very fast machines"
 msgstr "Magas - csak nagyon erős gépekhez ajánljuk"
 
-#: src/preferences.c:2659
+#: src/preferences.c:2700
 msgid "Preview _quality"
 msgstr "Előnézet _minősége"
 
-#: src/preferences.c:2660
+#: src/preferences.c:2701
 msgid "The preview quality for video playback - affects resizing"
 msgstr "A videó lejátszás előnézeti minősége - hatással van az átméretezésre"
 
-#: src/preferences.c:2675
+#: src/preferences.c:2717
 msgid "_Show FPS statistics"
 msgstr "_FPS statisztika mutatása"
 
-#: src/preferences.c:2694
+#: src/preferences.c:2736
 msgid "_Plugin"
 msgstr "_Bővítmény"
 
-#: src/preferences.c:2718
+#: src/preferences.c:2760
 msgid "Stream audio"
 msgstr ""
 
-#: src/preferences.c:2721
+#: src/preferences.c:2763
 msgid "Stream audio to playback plugin"
 msgstr ""
 
-#: src/preferences.c:2734
+#: src/preferences.c:2778
 msgid "Record player output"
 msgstr ""
 
-#: src/preferences.c:2737
+#: src/preferences.c:2781
 msgid "Record output from player instead of input to player"
 msgstr ""
 
-#: src/preferences.c:2744
+#: src/preferences.c:2789
 msgid "VIDEO"
 msgstr "VIDEO"
 
-#: src/preferences.c:2787
+#: src/preferences.c:2833
 msgid "_Player"
 msgstr "_Lejátszó"
 
-#: src/preferences.c:2792
+#: src/preferences.c:2838
 msgid "(See also the Jack Integration tab for jack startup options)"
 msgstr "(Lásd még: Jack integrációs fül, a jack indítási opcióknál)"
 
-#: src/preferences.c:2819
+#: src/preferences.c:2865
 msgid "mplayer"
 msgstr "mplayer"
 
-#: src/preferences.c:2830
+#: src/preferences.c:2876
 #, fuzzy
 msgid "mplayer2"
 msgstr "mplayer"
 
-#: src/preferences.c:2833
+#: src/preferences.c:2879
 msgid "Audio play _command"
 msgstr "Hang lejátszás _parancs"
 
-#: src/preferences.c:2840
+#: src/preferences.c:2886
 msgid "- internal -"
 msgstr "- belső -"
 
-#: src/preferences.c:2849
+#: src/preferences.c:2895
 msgid "Audio follows video _rate/direction"
 msgstr "A hang követi a videó _arányt/irányt"
 
-#: src/preferences.c:2857
+#: src/preferences.c:2903
 msgid "Audio follows _clip switches"
 msgstr "A hang követi a _klip változásokat"
 
-#: src/preferences.c:2864
+#: src/preferences.c:2910
 #, fuzzy
 msgid "Source:"
 msgstr "Forrás: %s"
 
-#: src/preferences.c:2868
+#: src/preferences.c:2914
 #, fuzzy
 msgid "_Internal"
 msgstr "- belső -"
 
-#: src/preferences.c:2873
+#: src/preferences.c:2919
 #, fuzzy
 msgid "_External (requires jack or pulse audio player)"
 msgstr ""
 "Hang rögzítése külső ablak elkapásakor\n"
 "(jack vagy pulse audio szükséges hozzá)"
 
-#: src/preferences.c:2892
+#: src/preferences.c:2940
 msgid "AUDIO"
 msgstr "HANG"
 
-#: src/preferences.c:2902
+#: src/preferences.c:2950
 msgid "Playback"
 msgstr "Lejátszás"
 
-#: src/preferences.c:2925
+#: src/preferences.c:2973
 msgid ""
 "Record audio when capturing an e_xternal window\n"
 " (requires jack or pulse audio)"
@@ -7823,69 +7837,69 @@
 "Hang rögzítése külső ablak elkapásakor\n"
 "(jack vagy pulse audio szükséges hozzá)"
 
-#: src/preferences.c:2940
+#: src/preferences.c:2988
 msgid "      What to record when 'r' is pressed   "
 msgstr "      Mi legyen felvéve, amikor az 'r' le van nyomva   "
 
-#: src/preferences.c:2949
+#: src/preferences.c:2997
 msgid "_Frame changes"
 msgstr "_Képkocka változások"
 
-#: src/preferences.c:2964
+#: src/preferences.c:3012
 msgid "F_PS changes"
 msgstr "F_PS változások"
 
-#: src/preferences.c:2982
+#: src/preferences.c:3030
 msgid "_Real time effects"
 msgstr "_Azonnali effektek"
 
-#: src/preferences.c:2993
+#: src/preferences.c:3041
 msgid "_Clip switches"
 msgstr "_Klip váltók"
 
-#: src/preferences.c:3004
+#: src/preferences.c:3052
 msgid "_Audio (requires jack or pulse audio player)"
 msgstr ""
 
-#: src/preferences.c:3024
+#: src/preferences.c:3072
 msgid "Pause recording if free disk space falls below"
 msgstr ""
 
 #. TRANSLATORS: gigabytes
-#: src/preferences.c:3030
+#: src/preferences.c:3078
 msgid "GB"
 msgstr ""
 
-#: src/preferences.c:3037
+#: src/preferences.c:3085
 msgid "Recording"
 msgstr "Felvétel"
 
-#: src/preferences.c:3055
+#: src/preferences.c:3103
 #, fuzzy
 msgid "Encoder"
 msgstr "Kódolás"
 
-#: src/preferences.c:3090
+#: src/preferences.c:3137
 msgid "Output format"
 msgstr "Kimeneti formátum"
 
-#: src/preferences.c:3106
+#: src/preferences.c:3153
 msgid "Audio codec"
 msgstr "Hang kodek"
 
-#: src/preferences.c:3119
+#: src/preferences.c:3165
 msgid "Encoding"
 msgstr "Kódolás"
 
-#: src/preferences.c:3134
+#: src/preferences.c:3180
 msgid "Use _antialiasing when resizing"
 msgstr "_antialiasing használata az átméretezés alatt"
 
-#: src/preferences.c:3143
+#: src/preferences.c:3189
 msgid "Number of _real time effect keys"
 msgstr "Azonnali effekt effekt gombjainak a száma"
 
-#: src/preferences.c:3145
+#: src/preferences.c:3192
 msgid ""
 "The number of \"virtual\" real time effect keys. They can be controlled "
 "through the real time effects window, or via network (OSC)."
@@ -7893,95 +7907,95 @@
 "A \"virtuális\" azonnali effekt billentyűk száma. Ezeket az azonnali effekt "
 "ablakon, vagy a (OSC) hálózaton keresztül lehet vezérelni."
 
-#: src/preferences.c:3152
+#: src/preferences.c:3199
 msgid "Use _threads where possible when applying effects"
 msgstr ""
 
-#: src/preferences.c:3159
+#: src/preferences.c:3207
 msgid "Number of _threads"
 msgstr ""
 
-#: src/preferences.c:3172
+#: src/preferences.c:3221
 msgid "Restart is required if any of the following paths are changed:"
 msgstr ""
 
-#: src/preferences.c:3182
+#: src/preferences.c:3231
 msgid "Weed plugin path"
 msgstr ""
 
-#: src/preferences.c:3184
+#: src/preferences.c:3234
 msgid "Frei0r plugin path"
 msgstr ""
 
-#: src/preferences.c:3186
+#: src/preferences.c:3237
 msgid "LADSPA plugin path"
 msgstr ""
 
-#: src/preferences.c:3209
+#: src/preferences.c:3261
 msgid "      Video load directory (default)      "
 msgstr "      Videók helye (alapértelmezett)      "
 
-#: src/preferences.c:3215
+#: src/preferences.c:3267
 msgid "      Video save directory (default) "
 msgstr "      Mentés helye (alapértelmezett) "
 
-#: src/preferences.c:3221
+#: src/preferences.c:3273
 msgid "      Audio load directory (default) "
 msgstr "      Hangok lelőhelye :) (alapértelmezett) "
 
-#: src/preferences.c:3227
+#: src/preferences.c:3279
 msgid "      Image directory (default) "
 msgstr "      Képek helye (alapértelmezett) "
 
-#: src/preferences.c:3233
+#: src/preferences.c:3285
 msgid "      Backup/Restore directory (default) "
 msgstr "      Mentés/helyreálltás mappa  (alapértelmezett) "
 
-#: src/preferences.c:3239
+#: src/preferences.c:3291
 msgid "      Temp directory (do not remove) "
 msgstr "      Átmeneti könyvtár (ne távolítsd el) "
 
-#: src/preferences.c:3252
+#: src/preferences.c:3304
 msgid "The default directory for loading video clips from"
 msgstr "Az a könyvtár, ahonnan a videók alap esetben betöltődnek"
 
-#: src/preferences.c:3277
+#: src/preferences.c:3329
 msgid "The default directory for saving encoded clips to"
 msgstr "Az a könyvtár, ahová alap esetben a kódolt klippek mentésre kerülnek"
 
-#: src/preferences.c:3285
+#: src/preferences.c:3337
 msgid "The default directory for loading and saving audio"
 msgstr "Az a könyvtár, ahonnan betölti, illetve menti a hangokat a program"
 
-#: src/preferences.c:3293
+#: src/preferences.c:3345
 msgid "The default directory for saving frameshots to"
 msgstr "Az a könyvtár, ahová a pillanatképek mentésre kerülnek"
 
-#: src/preferences.c:3301
+#: src/preferences.c:3353
 msgid "The default directory for backing up/restoring single clips"
 msgstr "Klippek biztonsági mentésére/helyreállítására szolgáló mappa"
 
-#: src/preferences.c:3309
+#: src/preferences.c:3361
 msgid "LiVES working directory."
 msgstr "A LiVES munkakönyvtára"
 
-#: src/preferences.c:3359
+#: src/preferences.c:3412
 msgid "Directories"
 msgstr "Könyvtárak"
 
-#: src/preferences.c:3374
+#: src/preferences.c:3427
 msgid "Warn if diskspace falls below: "
 msgstr ""
 
-#: src/preferences.c:3380 src/preferences.c:3394
+#: src/preferences.c:3433 src/preferences.c:3447
 msgid " MB [set to 0 to disable]"
 msgstr ""
 
-#: src/preferences.c:3389
+#: src/preferences.c:3442
 msgid "Diskspace critical level: "
 msgstr ""
 
-#: src/preferences.c:3407
+#: src/preferences.c:3461
 msgid ""
 "Warn on Insert / Merge if _frame rate of clipboard does not match frame rate "
 "of selection"
@@ -7989,19 +8003,19 @@
 "Figyelmeztess a beillesztésnél / összeolvasztásnál, ha a vágólapon lévő "
 "képarány nem egyezik a kiválasztással"
 
-#: src/preferences.c:3417
+#: src/preferences.c:3471
 msgid "Warn on Open if file _size exceeds "
 msgstr "Figyelmeztess megnyitásnál, ha a fájl _méret túl nagy "
 
-#: src/preferences.c:3425
+#: src/preferences.c:3479
 msgid " MB"
 msgstr " MB"
 
-#: src/preferences.c:3432
+#: src/preferences.c:3486
 msgid "Show a warning before saving a se_t"
 msgstr "Figyelmeztess mielőtt elmentenék egy beállítást"
 
-#: src/preferences.c:3442
+#: src/preferences.c:3496
 #, fuzzy
 msgid ""
 "Show a warning if _mplayer/mplayer2, sox, composite or convert is not found "
@@ -8010,71 +8024,71 @@
 "Mutatnak figyelmeztetést, ha _mplayer, sox, composite vagy cnvert nem "
 "található, ha LiVES nem indul."
 
-#: src/preferences.c:3452
+#: src/preferences.c:3506
 msgid "Show a warning if no _rendered effects are found at startup."
 msgstr "Figyelmeztess, ha az indításkor nem található _renderelési effekt."
 
-#: src/preferences.c:3464
+#: src/preferences.c:3518
 msgid "Show a warning if no _encoder plugins are found at startup."
 msgstr "Figyelmeztess, ha az indításkor nem találhatók _kódoló bővítmények."
 
-#: src/preferences.c:3474
+#: src/preferences.c:3528
 msgid "Show a warning if a _duplicate set name is entered."
 msgstr "Figyelmeztess, ha _kettőzött beállítás név kerül beírásra"
 
-#: src/preferences.c:3485
+#: src/preferences.c:3539
 msgid "When a set is loaded, warn if clips are missing from _layouts."
 msgstr ""
 "Ha egy beállítás betöltődik, akkor figyelmeztess, ha a klipek hiányoznak a "
 "_kimenetekből."
 
-#: src/preferences.c:3495
+#: src/preferences.c:3550
 msgid "Warn if a clip used in a layout is about to be closed."
 msgstr "Figyelmeztess, ha egy klipet használó kimenetet készülök bezárni."
 
-#: src/preferences.c:3505
+#: src/preferences.c:3561
 msgid "Warn if frames used in a layout are about to be deleted."
 msgstr "Figyelmeztess, ha egy klipet használó kimenetet készülök törölni."
 
-#: src/preferences.c:3515
+#: src/preferences.c:3572
 msgid "Warn if frames used in a layout are about to be shifted."
 msgstr "Figyelmeztess, ha egy képkockákat használó kimenetről akarok váltani."
 
-#: src/preferences.c:3525
+#: src/preferences.c:3583
 msgid "Warn if frames used in a layout are about to be altered."
 msgstr ""
 "Figyelmeztess, ha egy képkockákat használó kimenetet akarok megváltoztatni."
 
-#: src/preferences.c:3535
+#: src/preferences.c:3594
 msgid "Warn if audio used in a layout is about to be deleted."
 msgstr "Figyelmeztess, ha egy hangot használó kimenetet akarok törölni."
 
-#: src/preferences.c:3546
+#: src/preferences.c:3606
 msgid "Warn if audio used in a layout is about to be shifted."
 msgstr "Figyelmeztess, ha egy hangot használó kimenetről akarok váltani."
 
-#: src/preferences.c:3556
+#: src/preferences.c:3617
 msgid "Warn if audio used in a layout is about to be altered."
 msgstr "Figyelmeztess, ha egy hangot használó kimenetet akarok megváltoztatni."
 
-#: src/preferences.c:3566
+#: src/preferences.c:3628
 msgid "Popup layout errors after clip changes."
 msgstr "Kimeneti hibák kijelzése a változtatások után."
 
-#: src/preferences.c:3577
+#: src/preferences.c:3639
 msgid "Warn if the layout has not been saved when leaving multitrack mode."
 msgstr ""
 "Figyelmeztess, ha egy elmentetlen kimenettel akarok kilépni a multitrack "
 "módból."
 
-#: src/preferences.c:3588
+#: src/preferences.c:3650
 msgid ""
 "Warn if multitrack has no audio channels, and a layout with audio is loaded."
 msgstr ""
 "Figyelmeztess, ha a multitracknek nincs hangja, viszont egy kimenet hanggal "
 "be van töltve."
 
-#: src/preferences.c:3598
+#: src/preferences.c:3660
 msgid ""
 "Warn if multitrack has audio channels, and your audio player is not \"jack\" "
 "or \"pulse audio\"."
@@ -8082,110 +8096,110 @@
 "Figyelmeztess, ha a multitrack rendelkezik hanggal és a lejátszó nem \"jack"
 "\" vagy \"pulse audio\""
 
-#: src/preferences.c:3610
+#: src/preferences.c:3672
 msgid "Show info message after importing from firewire device."
 msgstr "Üzenet megjelenítése a firewire eszközről való importálás után."
 
-#: src/preferences.c:3626
+#: src/preferences.c:3688
 msgid "Show a warning before opening a yuv4mpeg stream (advanced)."
 msgstr "Figyelmeztetés yuv4mpeg adatfolyam megnyitása előtt (haladó)."
 
-#: src/preferences.c:3639
+#: src/preferences.c:3701
 msgid "Show a warning when multitrack is low on backup space."
 msgstr "Figyelmeztetés helyszűkekor"
 
-#: src/preferences.c:3650
+#: src/preferences.c:3713
 msgid "Show a warning advising cleaning of disk space after a crash."
 msgstr "Lemez takarítási figyelmeztetés megjelenítése az összeomlás után."
 
-#: src/preferences.c:3661
+#: src/preferences.c:3725
 msgid "Show a warning if unable to connect to pulseaudio player."
 msgstr ""
 
-#: src/preferences.c:3673
+#: src/preferences.c:3737
 #, fuzzy
 msgid "Show a warning before wiping a layout which has unsaved changes."
 msgstr "Figyelmeztetés yuv4mpeg adatfolyam megnyitása előtt (haladó)."
 
-#: src/preferences.c:3685
+#: src/preferences.c:3749
 msgid "Warnings"
 msgstr "Figyelmeztetések"
 
-#: src/preferences.c:3703
+#: src/preferences.c:3767
 msgid "Midi synch (requires the files midistart and midistop)"
 msgstr "Midi szinkronizáció (midistart és midistop fájlok szükségesek)"
 
-#: src/preferences.c:3715
+#: src/preferences.c:3779
 msgid "When inserting/merging frames:  "
 msgstr "Képkockák beillesztésénél/összefűzésénél:  "
 
-#: src/preferences.c:3719
+#: src/preferences.c:3783
 msgid "_Speed Up/Slow Down Insertion"
 msgstr "Beillesztés _gyorsítása/lassítása"
 
-#: src/preferences.c:3723
+#: src/preferences.c:3787
 msgid "_Resample Insertion"
 msgstr "_Beillesztés újramintázása"
 
-#: src/preferences.c:3730
+#: src/preferences.c:3794
 msgid "CD device           "
 msgstr "CD eszköz           "
 
-#: src/preferences.c:3733
+#: src/preferences.c:3797
 msgid "LiVES can load audio tracks from this CD"
 msgstr "A LiVES képes betölteni számokat erről a CD-ről"
 
-#: src/preferences.c:3746
+#: src/preferences.c:3813
 msgid "Default FPS        "
 msgstr "Alapértelmezett FPS        "
 
-#: src/preferences.c:3749
+#: src/preferences.c:3816
 msgid "Frames per second to use when none is specified"
 msgstr "FPS lesz használva, ha nincs megadva más"
 
-#: src/preferences.c:3757
+#: src/preferences.c:3825
 msgid "Misc"
 msgstr "Egyéb"
 
-#: src/preferences.c:3782
+#: src/preferences.c:3850
 msgid "New theme:           "
 msgstr "Új téma:           "
 
-#: src/preferences.c:3800
+#: src/preferences.c:3867
 msgid "Themes"
 msgstr "Témák"
 
-#: src/preferences.c:3815
+#: src/preferences.c:3882
 msgid "Download bandwidth (Kb/s)       "
 msgstr "Letöltés sávszélessége (Kb/mp)       "
 
-#: src/preferences.c:3823
+#: src/preferences.c:3890
 msgid "LiVES must be compiled without \"configure --disable-OSC\" to use OMC"
 msgstr ""
 "A LiVES-t \"configure --disable-OSC)\" nélkül kell beállítani az OMC "
 "használatához"
 
-#: src/preferences.c:3833
+#: src/preferences.c:3900
 msgid "OMC remote control enabled"
 msgstr "OMC távvezérlés bekapcsolva"
 
-#: src/preferences.c:3841
+#: src/preferences.c:3908
 msgid "UDP port       "
 msgstr "UDP Port       "
 
-#: src/preferences.c:3850
+#: src/preferences.c:3917
 msgid "Start OMC on startup"
 msgstr "OMC indítása program induláskor"
 
-#: src/preferences.c:3870
+#: src/preferences.c:3937
 msgid "Streaming/Networking"
 msgstr "Adatfolyam/hálózat"
 
-#: src/preferences.c:3882
+#: src/preferences.c:3949
 msgid "Jack transport"
 msgstr "Jack átvitel"
 
-#: src/preferences.c:3886
+#: src/preferences.c:3953
 msgid ""
 "LiVES must be compiled with jack/transport.h and jack/jack.h present to use "
 "jack transport"
@@ -8193,44 +8207,44 @@
 "A jack átvitel használatáshoz a LiVES-t a jack/transport.h és jack/jack "
 "opcióval kell beállítani"
 
-#: src/preferences.c:3892
+#: src/preferences.c:3959
 msgid "Jack _transport config file"
 msgstr "Jack _átvitel beállításfájlja"
 
-#: src/preferences.c:3899 src/preferences.c:3989
+#: src/preferences.c:3967 src/preferences.c:4058
 msgid "Start _server on LiVES startup"
 msgstr "_Szerver indítása a LiVES indulásakor"
 
-#: src/preferences.c:3911
+#: src/preferences.c:3979
 msgid "Jack transport _master (start and stop)"
 msgstr "Jack átvitel _mester (indítás és leállítás)"
 
-#: src/preferences.c:3921
+#: src/preferences.c:3989
 msgid "Jack transport _client (start and stop)"
 msgstr "Jack átvitel _kliens (indítás és leállítás)"
 
-#: src/preferences.c:3935
+#: src/preferences.c:4003
 msgid "Jack transport sets start position"
 msgstr "Jack átvitel beállítások induló pozíciója"
 
-#: src/preferences.c:3952
+#: src/preferences.c:4020
 msgid "Jack transport timebase slave"
 msgstr ""
 
-#: src/preferences.c:3963
+#: src/preferences.c:4031
 msgid "(See also Playback -> Audio follows video rate/direction)"
 msgstr "(Lásd még: Lejátszás -> Hang kövesse a videó arányt/irányt)"
 
-#: src/preferences.c:3971
+#: src/preferences.c:4039
 msgid "Jack audio"
 msgstr "Jack hang"
 
-#: src/preferences.c:3975
+#: src/preferences.c:4043
 msgid "LiVES must be compiled with jack/jack.h present to use jack audio"
 msgstr ""
 "A jack hang használatához a LiVES-t a jack/jack.h opcióval kell beállítani"
 
-#: src/preferences.c:3978
+#: src/preferences.c:4046
 msgid ""
 "You MUST set the audio player to \"jack\" in the Playback tab to use jack "
 "audio"
@@ -8238,76 +8252,76 @@
 "A zenelejátszót a lejátszó ablakban a \"jack\"-re kell beállítanod a jack "
 "hang használatához"
 
-#: src/preferences.c:3984
+#: src/preferences.c:4052
 msgid "Jack _audio server config file"
 msgstr "Jack _hangszerver konfig fájl"
 
-#: src/preferences.c:3996
+#: src/preferences.c:4065
 msgid "Play audio even when transport is _paused"
 msgstr "Hang lejátszása az átvitel _szüneteltetésekor"
 
-#: src/preferences.c:4008
+#: src/preferences.c:4077
 msgid "Automatically connect to System Out ports when 'playing' External Audio"
 msgstr ""
 
-#: src/preferences.c:4021
+#: src/preferences.c:4090
 msgid "Jack Integration"
 msgstr "Jack integráció"
 
-#: src/preferences.c:4035
+#: src/preferences.c:4104
 msgid "Events to respond to:"
 msgstr "Események jelentése itt:"
 
-#: src/preferences.c:4044
+#: src/preferences.c:4113
 msgid "_Joystick events"
 msgstr "_Joystick műveletek"
 
-#: src/preferences.c:4051
+#: src/preferences.c:4120
 msgid "_Joystick device"
 msgstr "_Joystick eszköz"
 
-#: src/preferences.c:4053
+#: src/preferences.c:4122
 msgid "The joystick device, e.g. /dev/input/js0"
 msgstr "A joystick eszköz, Pl.: /dev/input/js0"
 
-#: src/preferences.c:4071
+#: src/preferences.c:4142
 msgid "_MIDI events"
 msgstr "_MIDI műveletek"
 
-#: src/preferences.c:4080
+#: src/preferences.c:4151
 msgid "Use _ALSA MIDI (recommended)"
 msgstr "_ALSA MIDI használata (ajánlott)"
 
-#: src/preferences.c:4082
+#: src/preferences.c:4153
 msgid "Create an ALSA MIDI port which other MIDI devices can be connected to"
 msgstr ""
 "ALSA MIDI port létrehozása, ahová más MIDI eszközöket lehet csatlakoztatni"
 
-#: src/preferences.c:4090
+#: src/preferences.c:4162
 msgid "Use _raw MIDI"
 msgstr "_raw MIDI használata"
 
-#: src/preferences.c:4092
+#: src/preferences.c:4164
 msgid "Read directly from the MIDI device"
 msgstr "Közvetlenül a MIDI eszközről olvass be"
 
-#: src/preferences.c:4104
+#: src/preferences.c:4177
 msgid "_MIDI device"
 msgstr "_MIDI eszköz"
 
-#: src/preferences.c:4106
+#: src/preferences.c:4179
 msgid "The MIDI device, e.g. /dev/input/midi0"
 msgstr "A MIDI eszköz Pl.: /dev/input/midi0"
 
-#: src/preferences.c:4118
+#: src/preferences.c:4193
 msgid "Advanced"
 msgstr "Haladó"
 
-#: src/preferences.c:4124
+#: src/preferences.c:4199
 msgid "MIDI check _rate"
 msgstr "MIDI ellenőrzési _időköz"
 
-#: src/preferences.c:4127
+#: src/preferences.c:4203
 msgid ""
 "Number of MIDI checks per keyboard tick. Increasing this may improve MIDI "
 "responsiveness, but may slow down playback."
@@ -8315,24 +8329,24 @@
 "MIDI ellenőrzések száma a billentyűzet leütésének arányában. Lelassíthatja a "
 "lejátszást."
 
-#: src/preferences.c:4134
+#: src/preferences.c:4211
 msgid "MIDI repeat"
 msgstr "MIDI ismétlés"
 
-#: src/preferences.c:4137
+#: src/preferences.c:4214
 msgid "Number of non-reads allowed between succesive reads."
 msgstr "Az olvasatlanok mennyisége a beolvasottak között."
 
-#: src/preferences.c:4140
+#: src/preferences.c:4218
 msgid "(Warning: setting this value too high can slow down playback.)"
 msgstr ""
 "(Figyelmeztetés: az érték túl magasra állítása lelassíthatja a lejátszást.)"
 
-#: src/preferences.c:4159
+#: src/preferences.c:4237
 msgid "MIDI/Joystick learner"
 msgstr "MIDI/joystick gyorstalpaló"
 
-#: src/preferences.c:4499
+#: src/preferences.c:4679
 msgid ""
 "\n"
 "LiVES will now shut down. You need to restart it for the directory change to "
@@ -8344,68 +8358,68 @@
 "lépéséhez.\n"
 "Nyomj 'OK'-t a folytatáshoz.\n"
 
-#: src/preferences.c:4523
+#: src/preferences.c:4703
 msgid ""
 "For the directory change to take effect LiVES will restart when preferences "
 "dialog closes."
 msgstr ""
 
-#: src/preferences.c:4527
+#: src/preferences.c:4707
 msgid "Theme changes will not take effect until the next time you start LiVES."
 msgstr "A téma változások csak a LiVES következő indításakor lépnek érvénybe."
 
-#: src/preferences.c:4531
+#: src/preferences.c:4711
 msgid "Jack options will not take effect until the next time you start LiVES."
 msgstr "A jack beállítások csak a LiVES következő indításakor lépnek érvénybe."
 
-#: src/osc.c:2585
+#: src/osc.c:2616
 #, c-format
 msgid "Syncing to external framerate of %.8f frames per second.\n"
 msgstr "A külső képkocka arány szinkronizálása %.8f fps-re.\n"
 
-#: src/osc.c:6746
+#: src/osc.c:6938
 msgid "Cannot initialize OSC receiver\n"
 msgstr "Nem tudom azonosítani az OSC fogadót\n"
 
-#: src/osc.c:6770
+#: src/osc.c:6961
 #, c-format
 msgid "WARNING: Cannot start OSC server at UDP port %d\n"
 msgstr "FIGYELMEZTETÉS: Nem tudom elindítani az OSC szervert a %d UDP porton\n"
 
-#: src/osc.c:6775
+#: src/osc.c:6963
 #, c-format
 msgid "Started OSC server at UDP port %d\n"
 msgstr "OSC szerver elindítva a %d UDP porton\n"
 
-#: src/osc.c:6890
+#: src/osc.c:7076
 #, c-format
 msgid "Cannot start OSC/UDP server at port %d \n"
 msgstr "Nem tudom elindítani az OSC/UDP szervert a %d porton \n"
 
-#: src/resample.c:125 src/resample.c:304
+#: src/resample.c:131 src/resample.c:305
 #, c-format
 msgid "Resizing frames 1 to %d"
 msgstr "Képkockák átméretezése 1-től %d-ig"
 
-#: src/resample.c:140 src/resample.c:318
+#: src/resample.c:145 src/resample.c:318
 #, c-format
 msgid "Resizing/letterboxing frames 1 to %d"
 msgstr ""
 
-#: src/resample.c:361 src/resample.c:385
+#: src/resample.c:360 src/resample.c:384
 msgid "Resize"
 msgstr "Átméretezés"
 
-#: src/resample.c:395
+#: src/resample.c:394
 msgid "Resample/Resize"
 msgstr "Újramintázás/átméretezés"
 
-#: src/resample.c:680
+#: src/resample.c:676
 #, c-format
 msgid "Length of video is now %d frames.\n"
 msgstr "A videó hossza most %d képkocka.\n"
 
-#: src/resample.c:745
+#: src/resample.c:737
 msgid ""
 "\n"
 "\n"
@@ -8415,151 +8429,151 @@
 "\n"
 "Az új aránynak 0-nál nagyobbnak kell lennie\n"
 
-#: src/resample.c:797 src/resample.c:813
+#: src/resample.c:788 src/resample.c:803
 msgid "Resampling audio"
 msgstr "Hang újramintázása"
 
-#: src/resample.c:831
+#: src/resample.c:821
 msgid "LiVES was unable to resample the audio as requested.\n"
 msgstr "LiVES nem képes a kért módon újramintázni a hangot.\n"
 
-#: src/resample.c:833 src/resample.c:837
+#: src/resample.c:823 src/resample.c:827
 msgid "Resample Audio"
 msgstr "Hang újramintázása"
 
-#: src/resample.c:845
+#: src/resample.c:835
 #, c-format
 msgid "Audio was resampled to %d Hz, %d channels, %d bit"
 msgstr "Hang újramintázva erre: %d Hz, %d csatorna, %d bit"
 
-#: src/resample.c:1034
+#: src/resample.c:1016
 #, c-format
 msgid "Resampling video at %.8f frames per second..."
 msgstr "Videó újramintázása %.8f fps-re..."
 
-#: src/resample.c:1037
+#: src/resample.c:1018
 #, c-format
 msgid "Resampling video at %.3f frames per second..."
 msgstr "Videó újramintázása %.3f fps-re..."
 
-#: src/resample.c:1068
+#: src/resample.c:1049
 msgid "Reordering error !\n"
 msgstr "Újrarendezés hiba!\n"
 
-#: src/resample.c:1079
+#: src/resample.c:1060
 msgid "Resample"
 msgstr "Újramintáz"
 
-#: src/resample.c:1192
+#: src/resample.c:1173
 msgid "LiVES: - Resample Audio"
 msgstr "LiVES: - Hang újramintázása"
 
-#: src/resample.c:1195
+#: src/resample.c:1175
 msgid "LiVES: - Insert Silence"
 msgstr "LiVES: - Csend beszúrása"
 
-#: src/resample.c:1198
+#: src/resample.c:1177
 msgid "LiVES: - New Clip Audio"
 msgstr "LiVES: - Új klip hang"
 
-#: src/resample.c:1201
+#: src/resample.c:1179
 msgid "LiVES: - External Clip Settings"
 msgstr "LiVES: - Külső klip beállítások"
 
-#: src/resample.c:1238 src/resample.c:1358
+#: src/resample.c:1215 src/resample.c:1332
 msgid "Rate (Hz) "
 msgstr "Frekvencia (Hz) "
 
-#: src/resample.c:1245 src/resample.c:1372
+#: src/resample.c:1222 src/resample.c:1346
 #, fuzzy
 msgid "Channels"
 msgstr "    Csatornák "
 
-#: src/resample.c:1252
+#: src/resample.c:1229
 #, fuzzy
 msgid "Sample Size "
 msgstr "    Minta méret "
 
-#: src/resample.c:1268 src/resample.c:1425
+#: src/resample.c:1245 src/resample.c:1399
 msgid "Signed"
 msgstr "Digitálisan aláírt"
 
-#: src/resample.c:1274 src/resample.c:1435
+#: src/resample.c:1251 src/resample.c:1409
 msgid "Unsigned"
 msgstr "Aláíratlan"
 
-#: src/resample.c:1297 src/resample.c:1460
+#: src/resample.c:1273 src/resample.c:1433
 msgid "Little Endian"
 msgstr "Kicsi endian"
 
-#: src/resample.c:1303 src/resample.c:1468
+#: src/resample.c:1279 src/resample.c:1441
 msgid "Big Endian"
 msgstr "Nagy endian"
 
-#: src/resample.c:1315
+#: src/resample.c:1290
 msgid "Current"
 msgstr "Jelenlegi"
 
-#: src/resample.c:1340
+#: src/resample.c:1315
 msgid "_Enable audio"
 msgstr "_Hang engedélyezése"
 
-#: src/resample.c:1372
+#: src/resample.c:1346
 #, fuzzy
 msgid "_Channels"
 msgstr "    _Csatornák "
 
-#: src/resample.c:1394
+#: src/resample.c:1368
 #, fuzzy
 msgid "_Sample Size"
 msgstr "    _Minta méret "
 
-#: src/resample.c:1394
+#: src/resample.c:1368
 #, fuzzy
 msgid "Sample Size"
 msgstr "    Minta méret "
 
-#: src/resample.c:1489
+#: src/resample.c:1461
 msgid "New"
 msgstr "Új"
 
-#: src/resample.c:1512
+#: src/resample.c:1484
 msgid "_Frames Per Second "
 msgstr "_Másodpercenkénti képkockák (FPS) "
 
-#: src/resample.c:1530
+#: src/resample.c:1502
 msgid "Record for maximum:  "
 msgstr "Maximális felvétel:  "
 
-#: src/resample.c:1533
+#: src/resample.c:1505
 msgid " hours  "
 msgstr " óra  "
 
-#: src/resample.c:1536
+#: src/resample.c:1508
 msgid " minutes  "
 msgstr " perc  "
 
-#: src/resample.c:1538
+#: src/resample.c:1510
 msgid " seconds  "
 msgstr " másodperc  "
 
-#: src/resample.c:1545
+#: src/resample.c:1517
 msgid "Unlimited"
 msgstr "Korlátlan"
 
-#: src/resample.c:1561
+#: src/resample.c:1533
 msgid "Click OK to begin recording, or Cancel to quit."
 msgstr "A felvétel kezdéséhez nyomj 'Ok'-t, vagy 'Mégse'-t a kilépéshez."
 
-#: src/resample.c:1670
+#: src/resample.c:1638
 msgid "LiVES: - Change playback speed"
 msgstr "LiVES: - Lejátszás sebességének megváltoztatása"
 
-#: src/resample.c:1673
+#: src/resample.c:1640
 msgid "LiVES: - Resample Video"
 msgstr "LiVES: - Videó újramintázása"
 
-#: src/resample.c:1696
+#: src/resample.c:1663
 #, c-format
 msgid ""
 "\n"
@@ -8576,7 +8590,7 @@
 "Kérlek add meg a kívánt sebesség értéket\n"
 "_fps-ben"
 
-#: src/resample.c:1701
+#: src/resample.c:1667
 #, c-format
 msgid ""
 "\n"
@@ -8593,15 +8607,15 @@
 "Kérlek add meg az _újramintázott sebesség\n"
 "értéket fps-ben"
 
-#: src/resample.c:1723
+#: src/resample.c:1688
 msgid "OR enter the desired clip length in _seconds"
 msgstr "VAGY add meg a kívánt klip hosszúságát _másodpercben"
 
-#: src/resample.c:1745
+#: src/resample.c:1710
 msgid "Change the _audio speed as well"
 msgstr "_Hang sebességének megváltoztatása, amennyire lehet"
 
-#: src/resample.c:1846
+#: src/resample.c:1810
 msgid ""
 "\n"
 "Speeding up the clip will cause missing frames in some multitrack layouts.\n"
@@ -8611,7 +8625,7 @@
 "A klip felgyorsítása hiányzó képkockákat eredményezhet.\n"
 "Biztosan meg szeretnéd változtatni a sebességet?\n"
 
-#: src/resample.c:1863
+#: src/resample.c:1829
 msgid ""
 "\n"
 "Speeding up the clip will cause missing audio in some multitrack layouts.\n"
@@ -8621,49 +8635,49 @@
 "A klip felgyorsítása hiányzó hangokat eredményezhet.\n"
 "Biztosan meg szeretnéd változtatni a sebességet?\n"
 
-#: src/resample.c:1878
+#: src/resample.c:1847
 msgid ""
 "\n"
 "Changing the speed will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/resample.c:1892
+#: src/resample.c:1863
 msgid ""
 "\n"
 "Changing the speed will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/resample.c:1938
+#: src/resample.c:1911
 msgid "Speed Change"
 msgstr "Sebesség módosítása"
 
-#: src/resample.c:1947
+#: src/resample.c:1920
 #, c-format
 msgid "Changed playback speed to %.3f frames per second and audio to %d Hz.\n"
 msgstr ""
 "A lejátszás sebességének megváltoztatása %.3f fps-re, a hangot pedig %d Hz-"
 "re.\n"
 
-#: src/resample.c:1950
+#: src/resample.c:1922
 #, c-format
 msgid "Changed playback speed to %.3f frames per second.\n"
 msgstr "A lejátszás sebességének megváltoztatása %.3f fps-re.\n"
 
-#: src/resample.c:2035
+#: src/resample.c:2006
 msgid "Resampling video"
 msgstr "Videó újramintázása"
 
-#: src/resample.c:2042 src/resample.c:2160 src/resample.c:2182
+#: src/resample.c:2012 src/resample.c:2127 src/resample.c:2148
 msgid "Resampling clipboard video"
 msgstr "Vágólap-videó újramintázása"
 
-#: src/resample.c:2047
+#: src/resample.c:2016
 msgid "Reordering frames"
 msgstr "Képkockák újrarendezése"
 
-#: src/resample.c:2056
+#: src/resample.c:2025
 msgid ""
 "\n"
 "\n"
@@ -8673,20 +8687,20 @@
 "\n"
 "A LiVES nem képes újrarendezni a képkockákat."
 
-#: src/resample.c:2104
+#: src/resample.c:2071
 msgid "Deordering frames"
 msgstr "Képkockák visszarendezése"
 
-#: src/resample.c:2199
+#: src/resample.c:2165
 msgid "resampling error..."
 msgstr "újramintavételezési hiba..."
 
-#: src/rte_window.c:85 src/rte_window.c:1708
+#: src/rte_window.c:124 src/rte_window.c:1709
 #, c-format
 msgid "Type: %s"
 msgstr "Típus: %s"
 
-#: src/rte_window.c:112
+#: src/rte_window.c:150
 msgid ""
 "\n"
 "\n"
@@ -8702,7 +8716,7 @@
 "Biztos vagy benne?\n"
 "\n"
 
-#: src/rte_window.c:426
+#: src/rte_window.c:460
 msgid ""
 "\n"
 "\n"
@@ -8714,12 +8728,12 @@
 "'Ok' a billentyűzet kiosztás alapértelmezettként való elmentéséhez\n"
 "\n"
 
-#: src/rte_window.c:432
+#: src/rte_window.c:466
 #, c-format
 msgid "Saving keymap to %s\n"
 msgstr "Billentyűzet kiosztás mentése ide: %s\n"
 
-#: src/rte_window.c:439
+#: src/rte_window.c:471
 #, c-format
 msgid ""
 "\n"
@@ -8728,7 +8742,7 @@
 "\n"
 "Billentyűzet kiosztás %s frissítése..."
 
-#: src/rte_window.c:446
+#: src/rte_window.c:477
 #, c-format
 msgid ""
 "\n"
@@ -8738,12 +8752,12 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/rte_window.c:526
+#: src/rte_window.c:556
 #, c-format
 msgid "Saving real time effect defaults to %s..."
 msgstr "Azonnali effekt alapértelmezéseinek mentése ide: %s..."
 
-#: src/rte_window.c:535
+#: src/rte_window.c:563
 #, c-format
 msgid ""
 "\n"
@@ -8758,22 +8772,22 @@
 "fájlt\n"
 "Hiba kód %d\n"
 
-#: src/rte_window.c:632
+#: src/rte_window.c:657
 #, c-format
 msgid "Loading real time effect defaults from %s..."
 msgstr "Azonnali effekt alapértelmezéseinek betöltése innen: %s..."
 
-#: src/rte_window.c:681
+#: src/rte_window.c:701
 #, c-format
 msgid "Loading generator default sizes from %s..."
 msgstr "Generátor alapértelmezett méretének betöltése innen: %s..."
 
-#: src/rte_window.c:1306
+#: src/rte_window.c:1319
 #, c-format
 msgid "Loading default keymap from %s..."
 msgstr "Alapértelmezett billentyűzet kiosztás betöltése innen: %s..."
 
-#: src/rte_window.c:1329
+#: src/rte_window.c:1339
 #, c-format
 msgid ""
 "\n"
@@ -8788,27 +8802,27 @@
 "fájlt\n"
 "Hiba kód %d\n"
 
-#: src/rte_window.c:1403
+#: src/rte_window.c:1412
 #, c-format
 msgid "Invalid line %d in %s\n"
 msgstr "Érvénytelen %d sor a %s-ben\n"
 
-#: src/rte_window.c:1483
+#: src/rte_window.c:1490
 #, c-format
 msgid "Invalid key %d in %s\n"
 msgstr "Érvénytelen %d kulcs a %s-ben\n"
 
-#: src/rte_window.c:1498
+#: src/rte_window.c:1505
 #, c-format
 msgid "Invalid effect %s in %s\n"
 msgstr "Érvénytelen %s effekt a %s-ben\n"
 
-#: src/rte_window.c:1517
+#: src/rte_window.c:1524
 #, c-format
 msgid "Unknown effect %s in %s\n"
 msgstr ""
 
-#: src/rte_window.c:1535
+#: src/rte_window.c:1542
 #, c-format
 msgid ""
 "This version of LiVES cannot mix generators/non-generators on the same key "
@@ -8817,21 +8831,21 @@
 "A LiVES ezen verziója nem tudja mixelni a generátorokat/nem-generátorokat "
 "ugyanazzal a billentyűvel (%d) !\n"
 
-#: src/rte_window.c:1547
+#: src/rte_window.c:1554
 #, c-format
 msgid "Too many effects bound to key %d.\n"
 msgstr "Túl sok effekt kötés van erre a gombra: %d.\n"
 
-#: src/rte_window.c:1587
+#: src/rte_window.c:1593
 msgid "update required.\n"
 msgstr "frissítés szükséges.\n"
 
-#: src/rte_window.c:1603
+#: src/rte_window.c:1607
 #, fuzzy, c-format
 msgid "Loading data connection map from %s..."
 msgstr "Alapértelmezett billentyűzet kiosztás betöltése innen: %s..."
 
-#: src/rte_window.c:1612
+#: src/rte_window.c:1614
 msgid ""
 "\n"
 "\n"
@@ -8843,41 +8857,41 @@
 "Néhány effektet nem találok.\n"
 "\n"
 
-#: src/rte_window.c:1691
+#: src/rte_window.c:1692
 #, c-format
 msgid "LiVES: Information for %s"
 msgstr "LiVES: Információ erről: %s"
 
-#: src/rte_window.c:1704
+#: src/rte_window.c:1705
 #, c-format
 msgid "Effect name: %s"
 msgstr "Effektus név: %s"
 
-#: src/rte_window.c:1712
+#: src/rte_window.c:1713
 #, c-format
 msgid "Plugin name: %s"
 msgstr "Bővítmény név: %s"
 
-#: src/rte_window.c:1716
+#: src/rte_window.c:1717
 #, c-format
 msgid "Author: %s"
 msgstr "Szerző: %s"
 
-#: src/rte_window.c:1721
+#: src/rte_window.c:1722
 #, c-format
 msgid "and: %s"
 msgstr ""
 
-#: src/rte_window.c:1726
+#: src/rte_window.c:1727
 #, c-format
 msgid "Version: %d"
 msgstr "Verzió: %d"
 
-#: src/rte_window.c:1734
+#: src/rte_window.c:1735
 msgid "Description: "
 msgstr "Leírás: "
 
-#: src/rte_window.c:1960
+#: src/rte_window.c:1963
 msgid ""
 "\n"
 "\n"
@@ -8891,70 +8905,70 @@
 "ugyanazzal a billentyűvel.\n"
 "\n"
 
-#: src/rte_window.c:2024
+#: src/rte_window.c:2027
 #, c-format
 msgid "LiVES could not locate the effect %s.\n"
 msgstr "LiVES nem találja a %s effektet.\n"
 
-#: src/rte_window.c:2225
+#: src/rte_window.c:2216
 msgid "LiVES: Real time effect mapping"
 msgstr "LiVES: Azonnali effekt leképezés"
 
-#: src/rte_window.c:2257
+#: src/rte_window.c:2248
 #, c-format
 msgid "Ctrl-%d"
 msgstr "Ctrl-%d"
 
-#: src/rte_window.c:2264
+#: src/rte_window.c:2255
 msgid "Key active"
 msgstr "Billentyű aktív"
 
-#: src/rte_window.c:2279
+#: src/rte_window.c:2271
 msgid "Key grab"
 msgstr "Billentyű elkapás"
 
-#: src/rte_window.c:2280
+#: src/rte_window.c:2272
 msgid "Grab keyboard for this effect key"
 msgstr "Effekthez rendelt billentyű"
 
-#: src/rte_window.c:2290
+#: src/rte_window.c:2283
 msgid "_Clear all effects"
 msgstr "_Minden effekt kitörlése"
 
-#: src/rte_window.c:2304
+#: src/rte_window.c:2297
 msgid "Mode active"
 msgstr "Mód aktív"
 
-#: src/rte_window.c:2314 src/multitrack.c:8568
+#: src/rte_window.c:2307 src/multitrack.c:8762
 msgid "Info"
 msgstr "Információ"
 
-#: src/rte_window.c:2315
+#: src/rte_window.c:2308
 msgid "Set Parameters"
 msgstr "Paraméterek beállítása"
 
-#: src/rte_window.c:2316
+#: src/rte_window.c:2309
 #, fuzzy
 msgid "Set Connections"
 msgstr "Ki_jelölés"
 
-#: src/rte_window.c:2317
+#: src/rte_window.c:2310
 msgid "Clear"
 msgstr "Törlés"
 
-#: src/rte_window.c:2326
+#: src/rte_window.c:2319
 msgid "Effect name:"
 msgstr "Effekt név:"
 
-#: src/rte_window.c:2391
+#: src/rte_window.c:2384
 msgid "_Save as default keymap"
 msgstr "_Mentés alapértelmezett billentyűzet kiosztásként"
 
-#: src/rte_window.c:2396
+#: src/rte_window.c:2389
 msgid "_Load default keymap"
 msgstr "_Alapértelmezett billentyűzet kiosztás betöltése"
 
-#: src/rte_window.c:2840
+#: src/rte_window.c:2833
 #, c-format
 msgid ""
 "Unable to create default keymap file: %s\n"
@@ -9015,7 +9029,7 @@
 msgid "none\n"
 msgstr "nincs\n"
 
-#: src/lives-yuv4mpeg.c:494
+#: src/lives-yuv4mpeg.c:493
 #, c-format
 msgid ""
 "Unable to set display framerate to %.3f fps.\n"
@@ -9024,73 +9038,73 @@
 "Nem lehet beállítani a megjelenített arányt %.3f fps-re.\n"
 "\n"
 
-#: src/lives-yuv4mpeg.c:503
+#: src/lives-yuv4mpeg.c:502
 #, c-format
 msgid "Unable to open yuv4mpeg out stream %s\n"
 msgstr "Nem lehet megnyitni a(z) %s yuv4mpeg kimenő adatfolyamot\n"
 
-#: src/lives-yuv4mpeg.c:628
+#: src/lives-yuv4mpeg.c:626
 #, c-format
 msgid "TV card %d"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:713
+#: src/lives-yuv4mpeg.c:710
 #, c-format
 msgid "Opened TV card %d (%s)"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:760
+#: src/lives-yuv4mpeg.c:757
 #, c-format
 msgid "Firewire card %d"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:796
+#: src/lives-yuv4mpeg.c:793
 #, c-format
 msgid "Opened firewire card %d"
 msgstr ""
 
-#: src/multitrack.c:666
+#: src/multitrack.c:736
 msgid "Auto backup"
 msgstr "Automatikus biztonsági mentés"
 
-#: src/multitrack.c:868
+#: src/multitrack.c:935
 msgid "Backing audio"
 msgstr "Háttérzene"
 
-#: src/multitrack.c:1435
+#: src/multitrack.c:1515
 #, fuzzy, c-format
 msgid "%s : parameters for %s"
 msgstr "Nincsenek paraméterek"
 
-#: src/multitrack.c:1809 src/multitrack.c:3483
+#: src/multitrack.c:1881 src/multitrack.c:3635
 #, c-format
 msgid "Current track: %s (layer %d)\n"
 msgstr "Jelenlegi szám: %s (%d réteg)\n"
 
-#: src/multitrack.c:1813 src/multitrack.c:3484
+#: src/multitrack.c:1885 src/multitrack.c:3637
 msgid "Current track: Backing audio\n"
 msgstr "Jelenlegi szám: Háttér hang\n"
 
-#: src/multitrack.c:1814
+#: src/multitrack.c:1886
 #, c-format
 msgid "Current track: Layer %d audio\n"
 msgstr "Aktuális szám: %d réteg hang\n"
 
-#: src/multitrack.c:1817
+#: src/multitrack.c:1889
 #, c-format
 msgid "%.2f sec.\n"
 msgstr "%.2f mp.\n"
 
-#: src/multitrack.c:1822 src/multitrack.c:3490
+#: src/multitrack.c:1894 src/multitrack.c:3643
 #, c-format
 msgid "Source: %s"
 msgstr "Forrás: %s"
 
-#: src/multitrack.c:1825 src/multitrack.c:3492
+#: src/multitrack.c:1897 src/multitrack.c:3645
 msgid "Right click for context menu.\n"
 msgstr "Jobb gomb a tartalom menüért.\n"
 
-#: src/multitrack.c:1827
+#: src/multitrack.c:1899
 msgid ""
 "Double click on a block\n"
 "to select it."
@@ -9098,7 +9112,7 @@
 "Kijelöléshez kattints kétszer\n"
 "a blokkra."
 
-#: src/multitrack.c:3312
+#: src/multitrack.c:3452
 msgid ""
 "\n"
 "\n"
@@ -9107,7 +9121,7 @@
 "right or double clicking on it.\n"
 msgstr ""
 
-#: src/multitrack.c:3315
+#: src/multitrack.c:3455
 msgid ""
 "\n"
 "\n"
@@ -9115,7 +9129,7 @@
 "Select an effect in FX stack first to view its parameters.\n"
 msgstr ""
 
-#: src/multitrack.c:3318
+#: src/multitrack.c:3458
 msgid ""
 "\n"
 "\n"
@@ -9125,7 +9139,7 @@
 "\n"
 "Nincsenek klipek betöltve.\n"
 
-#: src/multitrack.c:3321
+#: src/multitrack.c:3462
 msgid ""
 "You must select two video tracks\n"
 "and a time region\n"
@@ -9135,7 +9149,7 @@
 "before inserting clips into the timeline."
 msgstr ""
 
-#: src/multitrack.c:3324
+#: src/multitrack.c:3465
 msgid ""
 "\n"
 "\n"
@@ -9149,12 +9163,12 @@
 "kell kijelölnöd a kompozitorok\n"
 "alkalmazásához.\n"
 
-#: src/multitrack.c:3487
+#: src/multitrack.c:3640
 #, c-format
 msgid "%.2f sec. to %.2f sec.\n"
 msgstr "%.2f mp-től %.2f mp-ig.\n"
 
-#: src/multitrack.c:3493
+#: src/multitrack.c:3646
 msgid ""
 "Single click on timeline\n"
 "to select a frame.\n"
@@ -9162,12 +9176,12 @@
 "Egyszerű kattintás az idővonalra\n"
 "a képkocka kiválasztásához.\n"
 
-#: src/multitrack.c:3711 src/multitrack.c:6790
+#: src/multitrack.c:3858 src/multitrack.c:6972
 #, c-format
 msgid "%s [unstable]"
 msgstr ""
 
-#: src/multitrack.c:3822
+#: src/multitrack.c:3973
 msgid ""
 "You can click and drag\n"
 "below the timeline"
@@ -9175,176 +9189,176 @@
 "Csak egy klikk, és már húzhatod\n"
 "is alul az idővonalon"
 
-#: src/multitrack.c:3823
+#: src/multitrack.c:3974
 msgid "to select a time region.\n"
 msgstr ", hogy kijelölj egy idő területet.\n"
 
-#: src/multitrack.c:3985
+#: src/multitrack.c:4137
 msgid "LiVES: Selected clip"
 msgstr "LiVES: Kijelölt klip"
 
-#: src/multitrack.c:3993
+#: src/multitrack.c:4145
 msgid "_Adjust start and end points"
 msgstr "_Kezdő és végpont meghatározása"
 
-#: src/multitrack.c:4002
+#: src/multitrack.c:4154
 msgid "_Edit/encode in clip editor"
 msgstr "_Szerkesztés/kódolás a klip szerkesztőben"
 
-#: src/multitrack.c:4009
+#: src/multitrack.c:4161
 msgid "_Show clip information"
 msgstr "_Klip információk megjelenítése"
 
-#: src/multitrack.c:4016
+#: src/multitrack.c:4168
 msgid "_Close this clip"
 msgstr "_Klip bezárása"
 
-#: src/multitrack.c:4236
+#: src/multitrack.c:4388
 msgid "Audio mixer (ctrl-m)"
 msgstr "Keverő (ctrl-m)"
 
-#: src/multitrack.c:4336
+#: src/multitrack.c:4488
 msgid "Single click on timeline"
 msgstr "Egy kattintás az idővonalon"
 
-#: src/multitrack.c:4337
+#: src/multitrack.c:4489
 msgid "to select a frame."
 msgstr "egy képkocka kijelöléséhez."
 
-#: src/multitrack.c:4338
+#: src/multitrack.c:4490
 msgid "Double click or right click on timeline"
 msgstr ""
 
-#: src/multitrack.c:4339
+#: src/multitrack.c:4491
 msgid "to select a block."
 msgstr "egy blokk kijelöléslhez."
 
-#: src/multitrack.c:4340
+#: src/multitrack.c:4492
 msgid "Clips can be dragged"
 msgstr "A klipek kiemelhetők/mozgathatók"
 
-#: src/multitrack.c:4341
+#: src/multitrack.c:4493
 msgid "onto the timeline."
 msgstr "az idővonalon."
 
-#: src/multitrack.c:4343
+#: src/multitrack.c:4495
 msgid "Mouse mode is: Move"
 msgstr "Egér mód most: Mozgatás"
 
-#: src/multitrack.c:4344
+#: src/multitrack.c:4496
 msgid "clips can be moved around."
 msgstr "a klipek ide-oda mozgathatók."
 
-#: src/multitrack.c:4349
+#: src/multitrack.c:4500
 msgid "Mouse mode is: Select."
 msgstr "Egér mód most: Kijelöl."
 
-#: src/multitrack.c:4350
+#: src/multitrack.c:4501
 msgid "Drag with mouse on timeline"
 msgstr "Húzd az egérrel az idővonalon"
 
-#: src/multitrack.c:4351
+#: src/multitrack.c:4502
 msgid "to select tracks and time."
 msgstr "számok és az idő kijelöléséhez."
 
-#: src/multitrack.c:4362
+#: src/multitrack.c:4509
 msgid "_Insert mode: Normal"
 msgstr "_Illesztési mód: Normál"
 
-#: src/multitrack.c:4378
+#: src/multitrack.c:4537
 msgid "_Mouse mode: Move"
 msgstr "_Egér mód: mozgatás"
 
-#: src/multitrack.c:4382
+#: src/multitrack.c:4540
 msgid "_Mouse mode: Select"
 msgstr "_Egér mód: kijelölés"
 
-#: src/multitrack.c:4405 src/multitrack.c:7925
+#: src/multitrack.c:4563 src/multitrack.c:8104
 #, fuzzy
 msgid "Gravity: Normal"
 msgstr "_Gravitáció/súlyosság: Normál"
 
-#: src/multitrack.c:4409
+#: src/multitrack.c:4565
 #, fuzzy
 msgid "Gravity: Left"
 msgstr "_Gravitáció/súlyosság: Bal"
 
-#: src/multitrack.c:4414
+#: src/multitrack.c:4569
 #, fuzzy
 msgid "Gravity: Right"
 msgstr "_Gravitáció/súlyosság: Jobb"
 
-#: src/multitrack.c:4416
+#: src/multitrack.c:4570
 msgid "Close _last gap(s) in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:4419
+#: src/multitrack.c:4572
 msgid "Close _first gap(s) in selected tracks/time"
 msgstr "Az _első hézag(ok) bezárása a kijelöltekben"
 
-#: src/multitrack.c:4458
+#: src/multitrack.c:4627
 msgid "Close gaps"
 msgstr "Hézagok bezárása"
 
-#: src/multitrack.c:4460
+#: src/multitrack.c:4629
 msgid "Move block"
 msgstr "Tömb mozgatása"
 
-#: src/multitrack.c:4462
+#: src/multitrack.c:4631
 msgid "Move audio block"
 msgstr "Hang tömb mozgatása"
 
-#: src/multitrack.c:4464
+#: src/multitrack.c:4633
 msgid "Delete block"
 msgstr "Blokk törlése"
 
-#: src/multitrack.c:4466
+#: src/multitrack.c:4635
 msgid "Delete audio block"
 msgstr "Hang blokk törlése"
 
-#: src/multitrack.c:4468
+#: src/multitrack.c:4637
 msgid "Split tracks"
 msgstr "Megosztott számok"
 
-#: src/multitrack.c:4470
+#: src/multitrack.c:4639
 msgid "Split block"
 msgstr "Megosztott tömbök"
 
-#: src/multitrack.c:4473
+#: src/multitrack.c:4642
 #, c-format
 msgid "Apply %s"
 msgstr "Alkalmaz %s"
 
-#: src/multitrack.c:4478
+#: src/multitrack.c:4647
 #, c-format
 msgid "Delete %s"
 msgstr "%s törlése"
 
-#: src/multitrack.c:4482
+#: src/multitrack.c:4651
 msgid "Insert block"
 msgstr "Tömb beszúrása"
 
-#: src/multitrack.c:4484
+#: src/multitrack.c:4653
 msgid "Insert gap"
 msgstr "Beszúrás"
 
-#: src/multitrack.c:4486
+#: src/multitrack.c:4655
 msgid "Insert audio block"
 msgstr "Hang blokk beszúrása"
 
-#: src/multitrack.c:4488
+#: src/multitrack.c:4657
 msgid "Effect order change"
 msgstr "Effekt utasítás változás"
 
-#: src/multitrack.c:4898
+#: src/multitrack.c:5064
 msgid "unsigned "
 msgstr "aláíratlan "
 
-#: src/multitrack.c:4899
+#: src/multitrack.c:5065
 msgid "signed "
 msgstr "aláírt "
 
-#: src/multitrack.c:4904
+#: src/multitrack.c:5071
 #, c-format
 msgid ""
 "Multitrack values set to %.3f fps, frame size %d x %d, audio channels %d, "
@@ -9353,15 +9367,15 @@
 "Multitrack értékek beálítva erre: %.3f fps, képkocka méret %d x %d, hang "
 "csatornák %d, hang arány %d, hang minta méret %d, %s.\n"
 
-#: src/multitrack.c:4938
+#: src/multitrack.c:5104
 msgid "invalid event list. Failed.\n"
 msgstr "érvénytelen esemény lista. Sikertelen.\n"
 
-#: src/multitrack.c:4944
+#: src/multitrack.c:5110
 msgid "event list has invalid fps. Failed.\n"
 msgstr "esemény lista érvénytelen fps-t tartalmaz. Sikertelen.\n"
 
-#: src/multitrack.c:4953
+#: src/multitrack.c:5122
 #, c-format
 msgid ""
 "\n"
@@ -9376,7 +9390,7 @@
 "zárd be az aktuális beállítást,\n"
 "majd töltsd be az újat a fájl menüből.\n"
 
-#: src/multitrack.c:4993
+#: src/multitrack.c:5163
 #, c-format
 msgid ""
 "\n"
@@ -9387,363 +9401,363 @@
 "Ez egy LiVES számára érvénytelen hang (%d) csatorna számot tartalmaz.\n"
 "Nem lehet betölteni.\n"
 
-#: src/multitrack.c:5329 src/multitrack.c:5338 src/multitrack.c:21133
+#: src/multitrack.c:5452
 msgid "Layout was wiped.\n"
 msgstr "Kimenet törölve.\n"
 
-#: src/multitrack.c:5374
+#: src/multitrack.c:5547
 #, c-format
 msgid "LiVES-%s: Multitrack %dx%d : %d bpp %.3f fps"
 msgstr "LiVES-%s: Multitrack %dx%d : %d bpp %.3f fps"
 
-#: src/multitrack.c:5617
+#: src/multitrack.c:5793
 msgid "In/out"
 msgstr "Be/ki"
 
-#: src/multitrack.c:5619
+#: src/multitrack.c:5795
 msgid "FX stack"
 msgstr "FX halom"
 
-#: src/multitrack.c:5627 src/omc-learn.c:673
+#: src/multitrack.c:5803 src/omc-learn.c:659
 msgid "Params."
 msgstr "Paraméterek."
 
-#: src/multitrack.c:5978
+#: src/multitrack.c:6157
 msgid "_Open..."
 msgstr "_Megnyitás..."
 
-#: src/multitrack.c:5996
+#: src/multitrack.c:6175
 msgid "O_pen File Selection..."
 msgstr "_Kijelölt fájl megnyitása..."
 
-#: src/multitrack.c:6040
+#: src/multitrack.c:6219
 msgid "Import Selection from _dvd/vcd..."
 msgstr "Importálás innen: _dvd/vcd..."
 
-#: src/multitrack.c:6050
+#: src/multitrack.c:6229
 msgid "Import Selection from _dvd"
 msgstr "Importálás innen: _dvd"
 
-#: src/multitrack.c:6060
+#: src/multitrack.c:6239
 msgid "Import Selection from _vcd"
 msgstr "Importálás innen: _vcd"
 
-#: src/multitrack.c:6076
+#: src/multitrack.c:6255
 msgid "_Import from Device"
 msgstr "_Importálás eszközről"
 
-#: src/multitrack.c:6103
+#: src/multitrack.c:6282
 msgid "_Close the selected clip"
 msgstr "_Kijelölt klip bezárása"
 
-#: src/multitrack.c:6198
+#: src/multitrack.c:6377
 msgid "_Save layout as..."
 msgstr "_Kimenet mentése mint..."
 
-#: src/multitrack.c:6206
+#: src/multitrack.c:6385
 msgid "_Load layout..."
 msgstr "_Szerkezet betöltése"
 
-#: src/multitrack.c:6210
+#: src/multitrack.c:6389
 msgid "_Wipe/Delete layout..."
 msgstr "_Törlés/kimenet törlése..."
 
-#: src/multitrack.c:6236
+#: src/multitrack.c:6415
 msgid "_Ignore width, height and audio values from loaded layouts"
 msgstr ""
 "_Szélesség, magasság és hang értékek figyelmen kívűl hagyása az elmentett "
 "kimenetben"
 
-#: src/multitrack.c:6240
+#: src/multitrack.c:6419
 msgid "Auto load _subtitles with clips"
 msgstr ""
 
-#: src/multitrack.c:6322
+#: src/multitrack.c:6501
 msgid "_CLIP EDITOR"
 msgstr "_KLIP SZERKESZTŐ"
 
-#: src/multitrack.c:6334
+#: src/multitrack.c:6513
 msgid "_Adjust selected clip start/end points"
 msgstr "_Kiválasztott klip kezdő/végpontjának meghatározása"
 
-#: src/multitrack.c:6343
+#: src/multitrack.c:6522
 msgid "_Insert selected clip"
 msgstr "_Kijelölt klip beillesztése"
 
-#: src/multitrack.c:6355
+#: src/multitrack.c:6534
 msgid "_Insert selected clip audio"
 msgstr "_Kijelölt hang beillesztése"
 
-#: src/multitrack.c:6364
+#: src/multitrack.c:6543
 msgid "_Delete selected block"
 msgstr "_Kijelölt tömb törlése"
 
-#: src/multitrack.c:6373
+#: src/multitrack.c:6555
 msgid "_Jump to previous block boundary"
 msgstr "_Ugrás az előző tömb határra"
 
-#: src/multitrack.c:6382
+#: src/multitrack.c:6564
 msgid "_Jump to next block boundary"
 msgstr "_Ugrás a következő tömb határra"
 
-#: src/multitrack.c:6395
+#: src/multitrack.c:6577
 msgid "Clear _marks from timeline"
 msgstr "_Kijelölések eltávolítása az idővonalról"
 
-#: src/multitrack.c:6403
+#: src/multitrack.c:6585
 msgid "Ignore selection limits when inserting"
 msgstr "Kijelölési limit mellőzése beillesztéskor"
 
-#: src/multitrack.c:6420 src/multitrack.c:16719
+#: src/multitrack.c:6602 src/multitrack.c:17009
 msgid "_Play from Timeline Position"
 msgstr "_Lejátszás innen: Idővonal pozíció"
 
-#: src/multitrack.c:6434
+#: src/multitrack.c:6616
 msgid "Pla_y selected time only"
 msgstr ""
 
-#: src/multitrack.c:6518
+#: src/multitrack.c:6700
 msgid "_Move effects with blocks"
 msgstr "_Effektek mozgatása a tömbökkel"
 
-#: src/multitrack.c:6531
+#: src/multitrack.c:6713
 msgid "Select _autotransition effect..."
 msgstr ""
 
-#: src/multitrack.c:6542
+#: src/multitrack.c:6724
 #, fuzzy
 msgid "Crossfade audio with autotransition"
 msgstr "Hang a hangban"
 
-#: src/multitrack.c:6550
+#: src/multitrack.c:6732
 msgid "View/_Edit selected effect"
 msgstr "Kijelölt effekt megtekintése/_szerkesztése"
 
-#: src/multitrack.c:6554
+#: src/multitrack.c:6736
 msgid "_Delete selected effect"
 msgstr "_Kijelölt effekt eltávolítása"
 
-#: src/multitrack.c:6562
+#: src/multitrack.c:6744
 msgid "Apply effect to _block..."
 msgstr "Effekt alkalmazása a _tömbre..."
 
-#: src/multitrack.c:6619
+#: src/multitrack.c:6801
 msgid "Apply effect to _region..."
 msgstr "Effekt alkalmazása a _területre..."
 
-#: src/multitrack.c:6885
+#: src/multitrack.c:7061
 msgid "_Tracks"
 msgstr "_Sávok"
 
-#: src/multitrack.c:6896
+#: src/multitrack.c:7072
 #, fuzzy
 msgid "Rename current track"
 msgstr "_Jelenlegi sáv kiválasztása"
 
-#: src/multitrack.c:6904
+#: src/multitrack.c:7080
 msgid "Make _Backing Audio current track"
 msgstr "_Háttér zene készítése az aktuális számból"
 
-#: src/multitrack.c:6915
+#: src/multitrack.c:7091
 msgid "Add Video Track at _Rear"
 msgstr "Videó sáv hozzáadás _hátra"
 
-#: src/multitrack.c:6923
+#: src/multitrack.c:7099
 msgid "Add Video Track at _Front"
 msgstr "Videó sáv hozzáadás _előre"
 
-#: src/multitrack.c:6936
+#: src/multitrack.c:7112
 msgid "_Split current track at cursor"
 msgstr "_Sáv szétválasztása a kurzornál"
 
-#: src/multitrack.c:6948
+#: src/multitrack.c:7124
 msgid "_Split selected video tracks"
 msgstr "_Kijelölt videó sávok szétválasztása"
 
-#: src/multitrack.c:6961
+#: src/multitrack.c:7137
 msgid "Insert gap in selected tracks/time"
 msgstr "Hézag beillesztése a kijelölt számba"
 
-#: src/multitrack.c:6969
+#: src/multitrack.c:7145
 msgid "Insert gap in current track/selected time"
 msgstr "Hézag beszúrása a kijelölt számba/kiválasztott időnél"
 
-#: src/multitrack.c:6981
+#: src/multitrack.c:7157
 msgid "Close all _gaps in selected tracks/time"
 msgstr "Minden _hézag bezárása a kijelöltekben"
 
-#: src/multitrack.c:7007
+#: src/multitrack.c:7183
 msgid "Se_lection"
 msgstr "Ki_jelölés"
 
-#: src/multitrack.c:7018
+#: src/multitrack.c:7194
 msgid "_Select Current Track"
 msgstr "_Jelenlegi sáv kiválasztása"
 
-#: src/multitrack.c:7025
+#: src/multitrack.c:7201
 msgid "Select _all video tracks"
 msgstr "_Minden videó kijelölése"
 
-#: src/multitrack.c:7032
+#: src/multitrack.c:7208
 msgid "Select _no video tracks"
 msgstr "_A _nem videók kijelölése"
 
-#: src/multitrack.c:7039
+#: src/multitrack.c:7215
 msgid "Select all _time"
 msgstr "Teljes _idő kijelölése"
 
-#: src/multitrack.c:7050
+#: src/multitrack.c:7226
 msgid "Select from _zero time"
 msgstr "Kjelölés a _zero ponttól"
 
-#: src/multitrack.c:7057
+#: src/multitrack.c:7233
 msgid "Select to _end time"
 msgstr "Kijelölés a _záró pontig"
 
-#: src/multitrack.c:7064
+#: src/multitrack.c:7240
 msgid "_Copy..."
 msgstr "_Másolás..."
 
-#: src/multitrack.c:7075
+#: src/multitrack.c:7251
 msgid "_Timecode to region start"
 msgstr "_Időkód a terület indításhoz"
 
-#: src/multitrack.c:7082
+#: src/multitrack.c:7258
 msgid "_Timecode to region end"
 msgstr "_Időkód a terület végéhez"
 
-#: src/multitrack.c:7089
+#: src/multitrack.c:7265
 msgid "_Region start to timecode"
 msgstr "_Terület indítás az időkódhoz"
 
-#: src/multitrack.c:7096
+#: src/multitrack.c:7272
 msgid "_Region end to timecode"
 msgstr "_Terület vég az időkódhoz"
 
-#: src/multitrack.c:7110
+#: src/multitrack.c:7286
 msgid "Select/deselect block at current track/time"
 msgstr ""
 
-#: src/multitrack.c:7135
+#: src/multitrack.c:7311
 msgid "_Change width, height and audio values..."
 msgstr "_Szélességi, magassági és hang értékek módosítása..."
 
-#: src/multitrack.c:7194
+#: src/multitrack.c:7370
 msgid "_Render"
 msgstr "_Elkészítés"
 
-#: src/multitrack.c:7205
+#: src/multitrack.c:7381
 msgid "_Render all to new clip"
 msgstr "_Mindet új klipbe"
 
-#: src/multitrack.c:7220
+#: src/multitrack.c:7396
 msgid "Render _video"
 msgstr "_video elkészítése"
 
-#: src/multitrack.c:7225
+#: src/multitrack.c:7401
 msgid "Render _audio"
 msgstr "_hang átalakítása"
 
-#: src/multitrack.c:7235
+#: src/multitrack.c:7411
 msgid "_Normalise rendered audio"
 msgstr ""
 
-#: src/multitrack.c:7242
+#: src/multitrack.c:7418
 msgid "_Pre-render audio"
 msgstr "_Hang visszaállítása"
 
-#: src/multitrack.c:7251
+#: src/multitrack.c:7427
 msgid "_View"
 msgstr "_Nézet"
 
-#: src/multitrack.c:7270
+#: src/multitrack.c:7446
 msgid "Block _In/out points"
 msgstr "Tömb _be/ki pontjai"
 
-#: src/multitrack.c:7279
+#: src/multitrack.c:7455
 msgid "_Effects at current"
 msgstr "_Effektek - jelenlegi"
 
-#: src/multitrack.c:7297
+#: src/multitrack.c:7473
 msgid "Audio parameters"
 msgstr "_Hang paraméterek"
 
-#: src/multitrack.c:7308
+#: src/multitrack.c:7484
 msgid "Show backing _audio track"
 msgstr "_Háttér hang sáv mutatása"
 
-#: src/multitrack.c:7312
+#: src/multitrack.c:7488
 msgid "Compact view"
 msgstr "Apró nézet"
 
-#: src/multitrack.c:7320
+#: src/multitrack.c:7496
 msgid "Maximum tracks to display..."
 msgstr "Maximális megjelenített sáv..."
 
-#: src/multitrack.c:7327
+#: src/multitrack.c:7503
 msgid "Scroll to follow playback"
 msgstr "Görgetés a lejátszás követéséhez"
 
-#: src/multitrack.c:7331
+#: src/multitrack.c:7507
 msgid "_Center on cursor"
 msgstr "_Közép a kurzoron"
 
-#: src/multitrack.c:7338
+#: src/multitrack.c:7514
 msgid "_Zoom in"
 msgstr "_Nagyítás"
 
-#: src/multitrack.c:7349
+#: src/multitrack.c:7525
 msgid "_Zoom out"
 msgstr "_Kicsinyítés"
 
-#: src/multitrack.c:7361
+#: src/multitrack.c:7537
 msgid "Multitrack _details"
 msgstr "Multitrack _részletek"
 
-#: src/multitrack.c:7374
+#: src/multitrack.c:7550
 msgid "_Event Window"
 msgstr "_Esemény ablak"
 
-#: src/multitrack.c:7378
+#: src/multitrack.c:7554
 msgid "_Event Window (selected time only)"
 msgstr "_Folyamat ablak (csak a kijelölt ideig)"
 
-#: src/multitrack.c:7382
+#: src/multitrack.c:7558
 msgid "_Show FRAME events"
 msgstr "_KÉPKOCKA események megjelenítése"
 
-#: src/multitrack.c:7399
+#: src/multitrack.c:7575
 msgid "_Show multitrack keys"
 msgstr "_Multitrack billentyűk mutatása"
 
-#: src/multitrack.c:7468
+#: src/multitrack.c:7644
 msgid "Mouse mode: _Move"
 msgstr "Egér mód:  _Mozgatás"
 
-#: src/multitrack.c:7476
+#: src/multitrack.c:7652
 msgid "Mouse mode: _Select"
 msgstr "Egér mód: _Kijelölés"
 
-#: src/multitrack.c:7505
+#: src/multitrack.c:7681
 msgid "Insert mode: _Normal"
 msgstr "Illesztési mód: _Normál"
 
-#: src/multitrack.c:7733
+#: src/multitrack.c:7909
 msgid "Insert with _audio"
 msgstr "Beillesztés _hanggal"
 
-#: src/multitrack.c:7734
+#: src/multitrack.c:7910
 msgid ""
 "Select whether video clips are inserted and moved with their audio or not"
 msgstr ""
 "Kiválaszthatod, hogy a videók a hangjukkal együtt legyenek beillesztve/"
 "mozgatva, vagy azok nélkül"
 
-#: src/multitrack.c:7829
+#: src/multitrack.c:8007
 msgid "Select _overlap"
 msgstr "_Átfedés kiválasztása"
 
-#: src/multitrack.c:7830
+#: src/multitrack.c:8008
 msgid ""
 "Select whether timeline selection snaps to overlap between selected tracks "
 "or not"
@@ -9751,83 +9765,75 @@
 "Beállíthatod, hogy az kijelölt idővonalbilincsek átfedést biztosítsanak a "
 "kijelölt számok között vagy sem"
 
-#: src/multitrack.c:7894 src/multitrack.c:14198
+#: src/multitrack.c:8073 src/multitrack.c:14422
 msgid "Expanded View (d)"
 msgstr "Kitöltött nézet (d)"
 
-#: src/multitrack.c:7897 src/multitrack.c:14205
+#: src/multitrack.c:8076 src/multitrack.c:14428
 msgid "Compact View (d)"
 msgstr "Apró nézet (d)"
 
-#: src/multitrack.c:7939
+#: src/multitrack.c:8118
 msgid "Gravity: _Normal"
 msgstr "_Gravitáció/súlyosság: _Normál"
 
-#: src/multitrack.c:7952
+#: src/multitrack.c:8131
 msgid "Gravity: _Left"
 msgstr "_Gravitáció/súlyosság: _Bal"
 
-#: src/multitrack.c:7967
+#: src/multitrack.c:8146
 msgid "Gravity: _Right"
 msgstr "_Gravitáció/súlyosság: _Jobb"
 
-#: src/multitrack.c:8297
+#: src/multitrack.c:8496
 msgid "_Apply"
 msgstr "_Alkalmaz"
 
-#: src/multitrack.c:8319
+#: src/multitrack.c:8518
 msgid "Time"
 msgstr "Idő"
 
-#: src/multitrack.c:8333
+#: src/multitrack.c:8532
 msgid "_Del. node"
 msgstr "_Tartalom törlése"
 
-#: src/multitrack.c:8341
+#: src/multitrack.c:8540
 msgid "_Next node"
 msgstr "_Következő tartalom"
 
-#: src/multitrack.c:8349
+#: src/multitrack.c:8548
 msgid "_Prev node"
 msgstr "_Előző tartalom"
 
-#: src/multitrack.c:8373
+#: src/multitrack.c:8574
 msgid "_Reverse playback  "
 msgstr "_Lejátszás visszafelé  "
 
-#: src/multitrack.c:8395
+#: src/multitrack.c:8596
 msgid "_Velocity  "
 msgstr "_Sebesség  "
 
-#: src/multitrack.c:8464
+#: src/multitrack.c:8664
 msgid "Anchor _start"
 msgstr "_Indítási pont"
 
-#: src/multitrack.c:8465
+#: src/multitrack.c:8665
 msgid "Anchor the start point to the timeline"
 msgstr "Kezdőpont lefixálása az idővonalon"
 
-#: src/multitrack.c:8481
-msgid "Start frame"
-msgstr "Kezdő képkocka"
-
-#: src/multitrack.c:8533
+#: src/multitrack.c:8728
 msgid "Anchor _end"
 msgstr "Horgony _vége"
 
-#: src/multitrack.c:8534
+#: src/multitrack.c:8729
 msgid "Anchor the end point to the timeline"
 msgstr "A végpont megadása az idővonalon"
 
-#: src/multitrack.c:8546
-msgid "End frame"
-msgstr "Utolsó képkocka"
-
-#: src/multitrack.c:8739
+#: src/multitrack.c:8929
 msgid "Scroll"
 msgstr "Görgetés"
 
-#: src/multitrack.c:9316
+#: src/multitrack.c:9502
 msgid ""
 "\n"
 "==============================\n"
@@ -9837,91 +9843,91 @@
 "==============================\n"
 "Klip szerkesztő módba váltott\n"
 
-#: src/multitrack.c:9502
+#: src/multitrack.c:9708
 msgid "Timeline (seconds)"
 msgstr "Idővonal (másodpercek)"
 
-#: src/multitrack.c:9984
+#: src/multitrack.c:10202
 msgid " Backing audio"
 msgstr " Háttér hang"
 
-#: src/multitrack.c:9987
+#: src/multitrack.c:10204
 #, c-format
 msgid " Layer %d audio"
 msgstr " %d hang réteg"
 
-#: src/multitrack.c:9995
+#: src/multitrack.c:10212
 msgid "Show/hide audio details"
 msgstr "Hang információinak megjelenítése/eérejtése"
 
-#: src/multitrack.c:10010 src/multitrack.c:10232
+#: src/multitrack.c:10227 src/multitrack.c:10452
 #, c-format
 msgid "Layer %d audio"
 msgstr "%d hang réteg"
 
-#: src/multitrack.c:10144 src/multitrack.c:10261
+#: src/multitrack.c:10353 src/multitrack.c:10481
 #, c-format
 msgid "%s (layer %d)"
 msgstr "%s (réteg %d)"
 
-#: src/multitrack.c:10184
+#: src/multitrack.c:10403
 msgid "Select track"
 msgstr "Szám kiválasztása"
 
-#: src/multitrack.c:10188
+#: src/multitrack.c:10407
 msgid "Show/hide audio"
 msgstr "Hang megjelenítése/elrejtése"
 
-#: src/multitrack.c:10194
+#: src/multitrack.c:10413
 #, c-format
 msgid "Video %d"
 msgstr "Videó %d"
 
-#: src/multitrack.c:10233
+#: src/multitrack.c:10453
 #, c-format
 msgid " %s"
 msgstr " %s"
 
-#: src/multitrack.c:10346
+#: src/multitrack.c:10574
 msgid "LiVES: Selected effect"
 msgstr "LiVES: Kijelölt effekt"
 
-#: src/multitrack.c:10358
+#: src/multitrack.c:10586
 msgid "_View/Edit this effect"
 msgstr "_Nézet/effekt szerkesztése"
 
-#: src/multitrack.c:10361
+#: src/multitrack.c:10588
 msgid "_View this effect"
 msgstr "_Effekt megtekintése"
 
-#: src/multitrack.c:10369
+#: src/multitrack.c:10596
 msgid "_Delete this effect"
 msgstr "_Effekt törlése"
 
-#: src/multitrack.c:10422
+#: src/multitrack.c:10648
 msgid "Cannot insert after this effect"
 msgstr "Nem lehet beszúrni után ez a hatás"
 
-#: src/multitrack.c:10451
+#: src/multitrack.c:10677
 msgid "This effect cannot be moved"
 msgstr "Ez a hatás nem lehet mozgatni"
 
-#: src/multitrack.c:10499
+#: src/multitrack.c:10724
 #, c-format
 msgid "  %d to %d selected  "
 msgstr "  %d-tól %d-ig kijelölt  "
 
-#: src/multitrack.c:10502 src/multitrack.c:10746
+#: src/multitrack.c:10727 src/multitrack.c:10968
 #, c-format
 msgid "%.2f sec."
 msgstr "%.2f mp."
 
-#: src/multitrack.c:10717
+#: src/multitrack.c:10940
 #, c-format
 msgid "%d frames"
 msgstr "%d képkockák"
 
-#: src/multitrack.c:11070
+#: src/multitrack.c:11299
 msgid ""
 "\n"
 "==============================\n"
@@ -9931,19 +9937,19 @@
 "==============================\n"
 "Váltás Multitrack módra\n"
 
-#: src/multitrack.c:12691
+#: src/multitrack.c:12939
 msgid "Drag the time slider to where you"
 msgstr "Húzd oda az idő csúszkát ahol"
 
-#: src/multitrack.c:12692
+#: src/multitrack.c:12940
 msgid "want to set effect parameters"
 msgstr "be szeretnéd állítani az effekt paramétereit"
 
-#: src/multitrack.c:12693
+#: src/multitrack.c:12941
 msgid "Set parameters, then click \"Apply\"\n"
 msgstr "Állítsd be az értékeket, majd nyomd meg az \"Alkalmaz\" gombot\n"
 
-#: src/multitrack.c:12694
+#: src/multitrack.c:12942
 msgid ""
 "NODES are points where parameters\n"
 "have been set.\n"
@@ -9953,51 +9959,51 @@
 "a paraméterek be lettek állítva.\n"
 "A Nodes törölhető."
 
-#: src/multitrack.c:12697
+#: src/multitrack.c:12944
 msgid "Effect has no parameters.\n"
 msgstr "Az effektnek nincsenek értékei.\n"
 
-#: src/multitrack.c:12788
+#: src/multitrack.c:13033
 #, c-format
 msgid "%s output"
 msgstr "%s kimenet"
 
-#: src/multitrack.c:12794 src/multitrack.c:12804
+#: src/multitrack.c:13038 src/multitrack.c:13046
 #, c-format
 msgid "layer %d"
 msgstr "%d réteg"
 
-#: src/multitrack.c:12796 src/multitrack.c:12806
+#: src/multitrack.c:13039 src/multitrack.c:13047
 msgid "audio track"
 msgstr "zene szám"
 
-#: src/multitrack.c:12797
+#: src/multitrack.c:13040
 #, c-format
 msgid "%s to %s"
 msgstr "%s és %s között"
 
-#: src/multitrack.c:12807
+#: src/multitrack.c:13048
 #, c-format
 msgid "%s from %s"
 msgstr ""
 
-#: src/multitrack.c:12860
+#: src/multitrack.c:13099
 msgid "_Prev filter map"
 msgstr "_Előző szűrő térkép"
 
-#: src/multitrack.c:12871
+#: src/multitrack.c:13110
 msgid "Insert _before"
 msgstr "Beszúrás _előtte:"
 
-#: src/multitrack.c:12881
+#: src/multitrack.c:13120
 msgid "Insert _after"
 msgstr "Beszúrás _utána"
 
-#: src/multitrack.c:12896
+#: src/multitrack.c:13134
 msgid "_Next filter map"
 msgstr "_Következő szűrő térkép"
 
-#: src/multitrack.c:12911
+#: src/multitrack.c:13148
 msgid ""
 "\n"
 "\n"
@@ -10009,7 +10015,7 @@
 "Nincs effekt a jelenlegi klipnél,\n"
 "és időnél.\n"
 
-#: src/multitrack.c:12929
+#: src/multitrack.c:13166
 msgid ""
 "Drag a compositor anywhere\n"
 "on the timeline\n"
@@ -10019,7 +10025,7 @@
 "bárhol ahhoz, hogy\n"
 "alkalmazhasd a kijelölt területrre."
 
-#: src/multitrack.c:12936
+#: src/multitrack.c:13173
 msgid ""
 "Drag a transition anywhere\n"
 "on the timeline\n"
@@ -10029,7 +10035,7 @@
 "bárhol ahhoz, hogy\n"
 "alkalmazhasd a kijelölt területrre."
 
-#: src/multitrack.c:12944
+#: src/multitrack.c:13181
 msgid ""
 "Effects can be dragged\n"
 "onto blocks on the timeline."
@@ -10037,60 +10043,60 @@
 "Az effektek elhúzhatók\n"
 "a blokkokon az egész idővonalon."
 
-#: src/multitrack.c:13166
+#: src/multitrack.c:13406
 msgid "LiVES: Selected block/frame"
 msgstr "LiVES :Kijelölt tömb/képkocka"
 
-#: src/multitrack.c:13173
+#: src/multitrack.c:13413
 msgid "_Select this block"
 msgstr "_Tömb kiválasztása"
 
-#: src/multitrack.c:13183
+#: src/multitrack.c:13423
 msgid "_Split block here"
 msgstr "_Tömb szétválasztása itt"
 
-#: src/multitrack.c:13191
+#: src/multitrack.c:13431
 msgid "List _effects here"
 msgstr "_Effektek listázása itt"
 
-#: src/multitrack.c:13200 src/multitrack.c:13277
+#: src/multitrack.c:13440 src/multitrack.c:13518
 #, c-format
 msgid "_Adjust %s"
 msgstr "_Igazítás %s"
 
-#: src/multitrack.c:13215
+#: src/multitrack.c:13455
 msgid "_Delete this block"
 msgstr "_Tömb törlése"
 
-#: src/multitrack.c:13258
+#: src/multitrack.c:13500
 msgid "_Insert here"
 msgstr "_Beszúrás ide"
 
-#: src/multitrack.c:13264
+#: src/multitrack.c:13505
 msgid "_Insert audio here"
 msgstr "_Hang beszúrása ide"
 
-#: src/multitrack.c:14801
+#: src/multitrack.c:15017
 #, c-format
 msgid "Inserted gap in selected tracks from time %.4f to %.4f\n"
 msgstr "Beillesztett hézag a kijelölt számokban innentől: %.4f , idáig: %.4f\n"
 
-#: src/multitrack.c:14835
+#: src/multitrack.c:15048
 #, c-format
 msgid "Inserted gap in track %s from time %.4f to %.4f\n"
 msgstr "Beillesztett hézag itt: %s innentől: %4.f , idáig: %.4f\n"
 
-#: src/multitrack.c:15036
+#: src/multitrack.c:15244
 #, c-format
 msgid "Undid %s\n"
 msgstr "%s vissza\n"
 
-#: src/multitrack.c:15235
+#: src/multitrack.c:15445
 #, c-format
 msgid "Redid %s\n"
 msgstr "%s újra\n"
 
-#: src/multitrack.c:15268
+#: src/multitrack.c:15475
 msgid ""
 "\n"
 " (variable)"
@@ -10098,62 +10104,62 @@
 "\n"
 " (változó)"
 
-#: src/multitrack.c:15502 src/multitrack.c:15614 src/multitrack.c:18736
-#: src/multitrack.c:18748
+#: src/multitrack.c:15710 src/multitrack.c:15823 src/multitrack.c:19077
+#: src/multitrack.c:19089
 #, c-format
 msgid "track %s"
 msgstr "%s sáv"
 
-#: src/multitrack.c:15507 src/multitrack.c:15619 src/multitrack.c:18741
+#: src/multitrack.c:15715 src/multitrack.c:15828 src/multitrack.c:19082
 #, c-format
 msgid "tracks %s and %s"
 msgstr "%s és %s sávok"
 
-#: src/multitrack.c:15513 src/multitrack.c:15625 src/multitrack.c:18751
+#: src/multitrack.c:15721 src/multitrack.c:15834 src/multitrack.c:19091
 msgid "selected tracks"
 msgstr "kijelölt sávok"
 
-#: src/multitrack.c:15516
+#: src/multitrack.c:15726
 #, c-format
 msgid "Added %s %s to %s from %.4f to %.4f\n"
 msgstr "Hozzáadva %s %s eddig %s innen: %.4f eddig %.4f\n"
 
-#: src/multitrack.c:15550
+#: src/multitrack.c:15760
 #, c-format
 msgid "Added effect %s to track %s from %.4f to %.4f\n"
 msgstr "%s effekt hozzáadása  a%s sávhoz innentől: %.4f idáig %.4f\n"
 
-#: src/multitrack.c:15631
+#: src/multitrack.c:15845
 #, fuzzy, c-format
 msgid "Deleted %s %s from %s from %.4f to %.4f\n"
 msgstr "Hozzáadva %s %s eddig %s innen: %.4f eddig %.4f\n"
 
-#: src/multitrack.c:15935
+#: src/multitrack.c:16143
 #, c-format
 msgid "rendered %d frames to new clip.\n"
 msgstr "renderelt %d képkockák az új kliphez.\n"
 
-#: src/multitrack.c:16025
+#: src/multitrack.c:16230
 msgid "Cleaning up..."
 msgstr "Takarítás..."
 
-#: src/multitrack.c:16712
+#: src/multitrack.c:17003
 msgid "_Pause"
 msgstr "_Szünet"
 
-#: src/multitrack.c:16713
+#: src/multitrack.c:17004
 msgid "Pause (p)"
 msgstr "Szünet (p)"
 
-#: src/multitrack.c:16856
+#: src/multitrack.c:17151
 msgid "Press 'm' during playback"
 msgstr "Nyomd meg az 'm'-et a lejátszás alatt"
 
-#: src/multitrack.c:16857
+#: src/multitrack.c:17152
 msgid "to make a mark on the timeline"
 msgstr "hogy kijelölést tehess az idővonalra"
 
-#: src/multitrack.c:17154
+#: src/multitrack.c:17498
 #, c-format
 msgid ""
 "Inserted audio %.4f to %.4f from clip %s into backing audio from time %.4f "
@@ -10162,7 +10168,7 @@
 "Beillesztett %.4f hang ide: %.4f a %s klipből háttér hangnak a %.4f időtől, "
 "idáig: %.4f\n"
 
-#: src/multitrack.c:17414
+#: src/multitrack.c:17759
 #, c-format
 msgid ""
 "Inserted frames %d to %d from clip %s into track %s from time %.4f to %.4f\n"
@@ -10170,7 +10176,7 @@
 "Beillesztett %d képkockák ide:%d, %s klipből, a %s sávba a %.4f-től a %.4f-"
 "ig\n"
 
-#: src/multitrack.c:17998
+#: src/multitrack.c:18332
 #, c-format
 msgid ""
 "Time region %.3f to %.3f\n"
@@ -10179,7 +10185,7 @@
 "%.3f -től %.3f -ig\n"
 "kijelölve.\n"
 
-#: src/multitrack.c:18002
+#: src/multitrack.c:18336
 msgid ""
 "select one or more tracks\n"
 "to create a region.\n"
@@ -10187,12 +10193,12 @@
 "egy vagy több sáv kiválasztása\n"
 "egy terület létrehozásához.\n"
 
-#: src/multitrack.c:18004
+#: src/multitrack.c:18337
 #, c-format
 msgid "%d video tracks selected.\n"
 msgstr "%d videó sávok kijelölve.\n"
 
-#: src/multitrack.c:18006
+#: src/multitrack.c:18339
 msgid ""
 "Double click on timeline\n"
 "to deselect time region."
@@ -10200,7 +10206,7 @@
 "Dupla katt az idővonalo\n"
 "a kijelölés megszüntetéséhez."
 
-#: src/multitrack.c:18013
+#: src/multitrack.c:18346
 msgid ""
 "Single click on an effect\n"
 "to select it."
@@ -10208,7 +10214,7 @@
 "Kattints az effektre a\n"
 "kijelöléséhez."
 
-#: src/multitrack.c:18014
+#: src/multitrack.c:18347
 msgid ""
 "Double click on an effect\n"
 "to edit it."
@@ -10216,7 +10222,7 @@
 "Kattints duplán az effektre\n"
 "a szerkesztéséhez."
 
-#: src/multitrack.c:18015
+#: src/multitrack.c:18348
 msgid ""
 "Right click on an effect\n"
 "for context menu.\n"
@@ -10224,7 +10230,7 @@
 "Jobb egér gomb megnyomásával\n"
 "a context menübe lépsz.\n"
 
-#: src/multitrack.c:18017
+#: src/multitrack.c:18350
 msgid ""
 "Effect order can be changed at\n"
 "FILTER MAPS"
@@ -10232,21 +10238,21 @@
 "Az effekt utasítások megváltoztathatóak a\n"
 "SZŰRŐ TÉRKÉPEKNÉL"
 
-#: src/multitrack.c:18024
+#: src/multitrack.c:18357
 msgid ""
 "You can select an effect,\n"
 "then use the INSERT BEFORE"
 msgstr ""
 
-#: src/multitrack.c:18025
+#: src/multitrack.c:18358
 msgid "or INSERT AFTER buttons to move it."
 msgstr "vagy a BEILLESZTÉS UTÁNA gombot a mozgatásához."
 
-#: src/multitrack.c:18307 src/multitrack.c:18320
+#: src/multitrack.c:18639 src/multitrack.c:18652
 msgid "Click on another effect,"
 msgstr "Kattints egy másik effektre,"
 
-#: src/multitrack.c:18308 src/multitrack.c:18321
+#: src/multitrack.c:18640 src/multitrack.c:18653
 msgid ""
 "and the selected one\n"
 "will be inserted"
@@ -10254,51 +10260,51 @@
 "és a kiválasztott\n"
 "beillesztésre kerül"
 
-#: src/multitrack.c:18309
+#: src/multitrack.c:18641
 msgid "after it.\n"
 msgstr "ez után.\n"
 
-#: src/multitrack.c:18322
+#: src/multitrack.c:18654
 msgid "before it.\n"
 msgstr "ez előtt.\n"
 
-#: src/multitrack.c:18551
+#: src/multitrack.c:18889
 #, c-format
 msgid "Removed parameter values for effect %s at time %.4f\n"
 msgstr "%s effekt paraméterértékeinek eltávolítása a %.4f időnél\n"
 
-#: src/multitrack.c:18759
+#: src/multitrack.c:19100
 #, c-format
 msgid "Set parameter values for %s %s on %s at time %.4f\n"
 msgstr "Paraméter értékek beállításai erre: %s %s a %s-en %.4f-kor\n"
 
-#: src/multitrack.c:19251 src/multitrack.c:20873
+#: src/multitrack.c:19630 src/multitrack.c:21195
 msgid "_Autoreload each time"
 msgstr "_Autoújratöltés minden egyes alkalommal"
 
-#: src/multitrack.c:19323
+#: src/multitrack.c:19702
 #, fuzzy
 msgid "Saving layout"
 msgstr "_Kimenet mentése"
 
-#: src/multitrack.c:19345
+#: src/multitrack.c:19725
 #, c-format
 msgid "Saved layout to %s\n"
 msgstr "Kimenet mentése mint:%s\n"
 
-#: src/multitrack.c:20783
+#: src/multitrack.c:21125
 msgid "clips and frames"
 msgstr "klipek és képkockák"
 
-#: src/multitrack.c:20787
+#: src/multitrack.c:21128
 msgid "clips"
 msgstr "klipek"
 
-#: src/multitrack.c:20790
+#: src/multitrack.c:21130
 msgid "frames"
 msgstr "képkockák"
 
-#: src/multitrack.c:20800
+#: src/multitrack.c:21140
 msgid ""
 "\n"
 "Auto reload layout.\n"
@@ -10306,7 +10312,7 @@
 "\n"
 "Kimenet automatikus újratöltése.\n"
 
-#: src/multitrack.c:20803
+#: src/multitrack.c:21143
 #, c-format
 msgid ""
 "%s\n"
@@ -10317,11 +10323,11 @@
 "Néhány %s hiányzik a(z) %s kimenetből\n"
 "Ezért nem lehet megfelelően betölteni.\n"
 
-#: src/multitrack.c:20920
+#: src/multitrack.c:21284
 msgid "auto backup"
 msgstr "automatikus biztonsági mentés"
 
-#: src/multitrack.c:20923
+#: src/multitrack.c:21287
 #, c-format
 msgid ""
 "\n"
@@ -10330,31 +10336,31 @@
 "\n"
 "Nem lehet betölteni a %s kimeneti fájlt\n"
 
-#: src/multitrack.c:20944
+#: src/multitrack.c:21308
 #, c-format
 msgid "Loading layout from %s..."
 msgstr "Kimenet betöltése innen: %s...."
 
-#: src/multitrack.c:20978
+#: src/multitrack.c:21338
 #, c-format
 msgid "Got %d events...processing..."
 msgstr "%d események vannak...feldolgozás..."
 
-#: src/multitrack.c:20991
+#: src/multitrack.c:21349
 msgid "Checking and rebuilding event list"
 msgstr "Folyamat lista ellenőrzése és újratöltése"
 
-#: src/multitrack.c:21017
+#: src/multitrack.c:21374
 #, c-format
 msgid "%d errors detected.\n"
 msgstr "%d hibákat találtam.\n"
 
-#: src/multitrack.c:21068
+#: src/multitrack.c:21422
 #, c-format
 msgid "Multitrack fps set to %.3f\n"
 msgstr "Multitrack fps beállítása erre: %.3f\n"
 
-#: src/multitrack.c:21225
+#: src/multitrack.c:21576
 #, fuzzy
 msgid ""
 "The current layout has changes which have not been saved.\n"
@@ -10363,19 +10369,19 @@
 "A jelenlegi kimenet még nincs elmentve.\n"
 "Mit szeretnél tenni?\n"
 
-#: src/multitrack.c:22047
+#: src/multitrack.c:22385
 msgid "LiVES: Multitrack audio mixer"
 msgstr "LiVES: Multitrack hangkeverő"
 
-#: src/multitrack.c:22077
+#: src/multitrack.c:22414
 msgid "_Reset values"
 msgstr "_Értékek visszaállítása"
 
-#: src/multitrack.c:22081
+#: src/multitrack.c:22418
 msgid "_Close mixer"
 msgstr "_Keverő bezárása"
 
-#: src/multitrack.c:22130
+#: src/multitrack.c:22466
 msgid ""
 "_Invert backing audio\n"
 "and layer volumes"
@@ -10383,41 +10389,41 @@
 "_Háttér hang\n"
 "és szűrő hangértékek felcserélése"
 
-#: src/multitrack.c:22132
+#: src/multitrack.c:22468
 msgid "Adjust backing and layer audio values so that they sum to 1.0"
 msgstr "Háttér hang és hangréteg értékek megadása, amely összesen 1.0 lehet"
 
-#: src/multitrack.c:22175
+#: src/multitrack.c:22510
 msgid "_Gang layer audio"
 msgstr "_Gang hang réteg"
 
-#: src/multitrack.c:22177
+#: src/multitrack.c:22512
 msgid "Adjust all layer audio values to the same value"
 msgstr "Minden hang réteg értékének beállítása ugyanarra az értékre"
 
-#: src/jack.c:104
+#: src/jack.c:102
 msgid "JACK server started\n"
 msgstr "Jack szerver elindítva\n"
 
-#: src/jack.c:1284 src/jack.c:1353
+#: src/jack.c:1265 src/jack.c:1334
 msgid "Unable to connect to JACK server\n"
 msgstr "Nem tudok csatlakozni a JACK szerverre\n"
 
-#: src/jack.c:1512
+#: src/jack.c:1491
 msgid "Started jack audio subsystem.\n"
 msgstr "Jack hang alrendszer elindítva.\n"
 
-#: src/jack.c:1623
+#: src/jack.c:1600
 msgid "Started jack audio reader.\n"
 msgstr "Jack hang olvasó elindítva.\n"
 
-#: src/jack.c:1838
+#: src/jack.c:1815
 msgid ""
 "\n"
 "Connection to jack audio was reset.\n"
 msgstr ""
 
-#: src/pulse.c:87
+#: src/pulse.c:88
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -10425,7 +10431,7 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:92
+#: src/pulse.c:94
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -10433,7 +10439,7 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:96
+#: src/pulse.c:99
 #, fuzzy
 msgid ""
 "\n"
@@ -10445,129 +10451,129 @@
 "illetve \"pulse audio\" lejátszókkal lehetséges.\n"
 "Ezt beállíthatod az Eszközök|Beállítások|Lejátszás menüben."
 
-#: src/pulse.c:101
+#: src/pulse.c:104
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
 msgstr ""
 
-#: src/pulse.c:107
+#: src/pulse.c:109
 msgid "LiVES will exit and you can choose another audio player.\n"
 msgstr ""
 
-#: src/pulse.c:1352
+#: src/pulse.c:1335
 msgid ""
 "\n"
 "Connection to pulse audio was reset.\n"
 msgstr ""
 
-#: src/colourspace.c:1100
+#: src/colourspace.c:1092
 msgid "unclamped"
 msgstr "összefogatlan"
 
-#: src/colourspace.c:1101
+#: src/colourspace.c:1093
 msgid "clamped"
 msgstr "összefogott"
 
-#: src/omc-learn.c:195
+#: src/omc-learn.c:191
 #, c-format
 msgid "Responding to joystick events from %s\n"
 msgstr "Joystick műveletet észleltem innen: %s\n"
 
-#: src/omc-learn.c:289
+#: src/omc-learn.c:279
 msgid "Creating ALSA seq port..."
 msgstr "ALSA seq port létrehozása..."
 
-#: src/omc-learn.c:325
+#: src/omc-learn.c:313
 #, c-format
 msgid "Responding to MIDI events from %s\n"
 msgstr "MIDI műveletet észleltem innnen: %s\n"
 
-#: src/omc-learn.c:568
+#: src/omc-learn.c:554
 msgid "data"
 msgstr "adat"
 
-#: src/omc-learn.c:571
+#: src/omc-learn.c:557
 msgid "velocity"
 msgstr "sebesség"
 
-#: src/omc-learn.c:572
+#: src/omc-learn.c:558
 msgid "note"
 msgstr "feljegyzés"
 
-#: src/omc-learn.c:574 src/omc-learn.c:736 src/omc-learn.c:1105
-#: src/omc-learn.c:1591 src/omc-learn.c:1640
+#: src/omc-learn.c:560 src/omc-learn.c:724 src/omc-learn.c:1092
+#: src/omc-learn.c:1581 src/omc-learn.c:1630
 msgid "value"
 msgstr "érték"
 
-#: src/omc-learn.c:576
+#: src/omc-learn.c:562
 msgid "state"
 msgstr "állapot"
 
-#: src/omc-learn.c:688
+#: src/omc-learn.c:674
 msgid "variable"
 msgstr "változtatható"
 
-#: src/omc-learn.c:1001
+#: src/omc-learn.c:989
 msgid "Vars."
 msgstr "változatok."
 
-#: src/omc-learn.c:1054
+#: src/omc-learn.c:1041
 #, c-format
 msgid "MIDI ch %d note on"
 msgstr "%d MIDI csat. feljegyzés be"
 
-#: src/omc-learn.c:1058
+#: src/omc-learn.c:1045
 #, c-format
 msgid "MIDI ch %d note off"
 msgstr "%d MIDI csat. feljegyzés ki"
 
-#: src/omc-learn.c:1062
+#: src/omc-learn.c:1049
 #, c-format
 msgid "MIDI ch %d controller %d"
 msgstr "%d MIDI csat. %d vezérlő"
 
-#: src/omc-learn.c:1066
+#: src/omc-learn.c:1053
 #, c-format
 msgid "MIDI ch %d pitch bend"
 msgstr "%d MIDI csat. csúcs görbe"
 
-#: src/omc-learn.c:1070
+#: src/omc-learn.c:1057
 #, c-format
 msgid "MIDI ch %d pgm change"
 msgstr "%d MIDI csat pgm változó"
 
-#: src/omc-learn.c:1073
+#: src/omc-learn.c:1060
 #, c-format
 msgid "Joystick button %d"
 msgstr "%d Joystick gomb"
 
-#: src/omc-learn.c:1076
+#: src/omc-learn.c:1063
 #, c-format
 msgid "Joystick axis %d"
 msgstr "%d Joystick irány"
 
-#: src/omc-learn.c:1113
+#: src/omc-learn.c:1100
 msgid "x"
 msgstr "x"
 
-#: src/omc-learn.c:1122
+#: src/omc-learn.c:1109
 msgid "range"
 msgstr "érték határ"
 
-#: src/omc-learn.c:1143
+#: src/omc-learn.c:1130
 msgid "+ offset1"
 msgstr "+ eltolás1"
 
-#: src/omc-learn.c:1161
+#: src/omc-learn.c:1150
 msgid "* scale"
 msgstr "* skála"
 
-#: src/omc-learn.c:1179
+#: src/omc-learn.c:1170
 msgid "+ offset2"
 msgstr "+ eltolás2"
 
-#: src/omc-learn.c:1280
+#: src/omc-learn.c:1270
 msgid ""
 "\n"
 "Click OK to delete all entries\n"
@@ -10575,213 +10581,213 @@
 "\n"
 "A bejegyzések törléséhez nyomd meg az 'OK' gombot\n"
 
-#: src/omc-learn.c:1318
+#: src/omc-learn.c:1308
 msgid "LiVES: OMC learner"
 msgstr "LiVES: OMC oktató"
 
-#: src/omc-learn.c:1334
+#: src/omc-learn.c:1324
 msgid "Clear _unmatched"
 msgstr "_különbözők törlése"
 
-#: src/omc-learn.c:1345
+#: src/omc-learn.c:1335
 msgid "_Delete all"
 msgstr "_Mind törlése"
 
-#: src/omc-learn.c:1411
+#: src/omc-learn.c:1401
 msgid "Start video playback"
 msgstr "Videó visszajátszás indítása"
 
-#: src/omc-learn.c:1414
+#: src/omc-learn.c:1404
 msgid "Stop video playback"
 msgstr "Videó visszajátszás leállítása"
 
-#: src/omc-learn.c:1418
+#: src/omc-learn.c:1408
 msgid "Clip select <clipnum>"
 msgstr "<clipnum> klip kiválasztása"
 
-#: src/omc-learn.c:1419
+#: src/omc-learn.c:1409
 msgid "Switch foreground clip to the nth valid clip"
 msgstr "Előtérben lévő klip váltása az n-edikre"
 
-#: src/omc-learn.c:1423
+#: src/omc-learn.c:1413
 msgid "Play forwards"
 msgstr "Lejátszás előre"
 
-#: src/omc-learn.c:1424
+#: src/omc-learn.c:1414
 msgid "Play video in a forwards direction"
 msgstr "Videó lejátszása előrefelé"
 
-#: src/omc-learn.c:1427
+#: src/omc-learn.c:1417
 msgid "Play backwards"
 msgstr "Lejátszás visszafelé"
 
-#: src/omc-learn.c:1428
+#: src/omc-learn.c:1418
 msgid "Play video in a backwards direction"
 msgstr "Videó lejátszása visszafelé"
 
-#: src/omc-learn.c:1431
+#: src/omc-learn.c:1421
 msgid "Reverse playback direction"
 msgstr "Lejátszási irány megfordítása"
 
-#: src/omc-learn.c:1432
+#: src/omc-learn.c:1422
 msgid "Reverse direction of video playback"
 msgstr "Videó visszajátszás irányának megfordítása"
 
-#: src/omc-learn.c:1435
+#: src/omc-learn.c:1425
 msgid "Play video faster"
 msgstr "Videó lejátszása gyorsabban"
 
-#: src/omc-learn.c:1436
+#: src/omc-learn.c:1426
 msgid "Play video at a slightly faster rate"
 msgstr "Videó lejátszása egy kicsivel gyorsabb sebességgel"
 
-#: src/omc-learn.c:1439
+#: src/omc-learn.c:1429
 msgid "Play video slower"
 msgstr "Videó lejátszása lassabban"
 
-#: src/omc-learn.c:1440
+#: src/omc-learn.c:1430
 msgid "Play video at a slightly slower rate"
 msgstr "Videó lejátszása egy kicsivel lassabb tempóban"
 
-#: src/omc-learn.c:1443
+#: src/omc-learn.c:1433
 msgid "Toggle video freeze"
 msgstr "Videó megfagyasztása"
 
-#: src/omc-learn.c:1444
+#: src/omc-learn.c:1434
 msgid "Freeze video, or if already frozen, unfreeze it"
 msgstr ""
 "Megállítja a videót egy adott ponton, vagy ha már áll, akkor újraindítja"
 
-#: src/omc-learn.c:1447
+#: src/omc-learn.c:1437
 msgid "Set video framerate to <fps>"
 msgstr "Videó sebességének beállítása erre: <fps>"
 
-#: src/omc-learn.c:1448
+#: src/omc-learn.c:1438
 msgid "Set framerate of foreground clip to <float fps>"
 msgstr ""
 "Az előtérben lévő videó sebességének beállítása a megadott értékre <float "
 "fps>"
 
-#: src/omc-learn.c:1452
+#: src/omc-learn.c:1442
 msgid "Start recording"
 msgstr "Felvétel indítása"
 
-#: src/omc-learn.c:1455
+#: src/omc-learn.c:1445
 msgid "Stop recording"
 msgstr "Felvétel megállítása"
 
-#: src/omc-learn.c:1458
+#: src/omc-learn.c:1448
 msgid "Toggle recording state"
 msgstr "Váltás felvételi állásba"
 
-#: src/omc-learn.c:1461
+#: src/omc-learn.c:1451
 msgid "Swap foreground and background clips"
 msgstr "Előtérben lévő videók felcserélése a háttérben lévőkkel"
 
-#: src/omc-learn.c:1463
+#: src/omc-learn.c:1453
 msgid "Reset effect keys"
 msgstr "Effekt gombok alaphelyzetbe állítása"
 
-#: src/omc-learn.c:1464
+#: src/omc-learn.c:1454
 msgid "Switch all effects off."
 msgstr "Minden effekt kikapcsolása."
 
-#: src/omc-learn.c:1467
+#: src/omc-learn.c:1457
 msgid "Enable effect key <key>"
 msgstr "<key> effekt gomb engedélyezése"
 
-#: src/omc-learn.c:1471
+#: src/omc-learn.c:1461
 msgid "Disable effect key <key>"
 msgstr "<key> effekt gomb tiltása"
 
-#: src/omc-learn.c:1475
+#: src/omc-learn.c:1465
 msgid "Toggle effect key <key>"
 msgstr "Váltás erre: <key>"
 
-#: src/omc-learn.c:1479
+#: src/omc-learn.c:1469
 msgid "Set parameter value <key> <pnum> = <value>"
 msgstr "Értékek beállítása: <key> <pnum> = <value>"
 
-#: src/omc-learn.c:1480
+#: src/omc-learn.c:1470
 msgid "Set <value> of pth (numerical) parameter for effect key <key>."
 msgstr "<key> effekt gomb értékének beállítása: <value>."
 
-#: src/omc-learn.c:1484
+#: src/omc-learn.c:1474
 msgid "Switch foreground to next clip"
 msgstr "előtér váltás a következő klipnél"
 
-#: src/omc-learn.c:1487
+#: src/omc-learn.c:1477
 msgid "Switch foreground to previous clip"
 msgstr "előtér váltás az előző klipnél"
 
-#: src/omc-learn.c:1490
+#: src/omc-learn.c:1480
 msgid "Set video framerate to ratio <fps_ratio>"
 msgstr "Videó sebességének beállítása erre az arányra: <fps_ratio>"
 
-#: src/omc-learn.c:1491
+#: src/omc-learn.c:1481
 msgid "Set framerate ratio of foreground clip to <float fps_ratio>"
 msgstr ""
 "Előtérben lévő videó sebesség arányának beállítása erre: <float fps_ratio>"
 
-#: src/omc-learn.c:1495
+#: src/omc-learn.c:1485
 msgid "Retrigger clip <clipnum>"
 msgstr "<clipnum> újra"
 
-#: src/omc-learn.c:1496
+#: src/omc-learn.c:1486
 msgid ""
 "Switch foreground clip to the nth valid clip, and reset the frame number"
 msgstr ""
 "Előtérben lévő klip válltása az n-edik klipre, és a képkockák számának "
 "alapértékre való állítása"
 
-#: src/omc-learn.c:1500
+#: src/omc-learn.c:1490
 msgid "Cycle to next mode for effect key <key>"
 msgstr "<key> effekt gomb következő lehetősége"
 
-#: src/omc-learn.c:1504
+#: src/omc-learn.c:1494
 msgid "Cycle to previous mode for effect key <key>"
 msgstr "<key> effekt gomb elöző lehetősége"
 
-#: src/omc-learn.c:1508
+#: src/omc-learn.c:1498
 msgid "Set playback plugin parameter value <pnum> = <value>"
 msgstr ""
 
-#: src/omc-learn.c:1509
+#: src/omc-learn.c:1499
 msgid "Set <value> of pth parameter for the playback plugin."
 msgstr ""
 
 #. TRANSLATORS: short form of "clip number"
-#: src/omc-learn.c:1536 src/omc-learn.c:1607
+#: src/omc-learn.c:1526 src/omc-learn.c:1597
 msgid "clipnum"
 msgstr "klip sorszáma"
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1545
+#: src/omc-learn.c:1535
 msgid "fps"
 msgstr "fps (másodpercenkénti képkockák száma)"
 
 #. TRANSLATORS: as in keyboard key
-#: src/omc-learn.c:1553 src/omc-learn.c:1560 src/omc-learn.c:1567
-#: src/omc-learn.c:1575 src/omc-learn.c:1615 src/omc-learn.c:1623
+#: src/omc-learn.c:1543 src/omc-learn.c:1550 src/omc-learn.c:1557
+#: src/omc-learn.c:1565 src/omc-learn.c:1605 src/omc-learn.c:1613
 msgid "key"
 msgstr "gomb (billentyű)"
 
 #. TRANSLATORS: short form of "parameter number"
-#: src/omc-learn.c:1583 src/omc-learn.c:1632
+#: src/omc-learn.c:1573 src/omc-learn.c:1622
 msgid "pnum"
 msgstr "pszám"
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1599
+#: src/omc-learn.c:1589
 msgid "fps_ratio"
 msgstr "fps_arány"
 
-#: src/omc-learn.c:2443
+#: src/omc-learn.c:2417
 #, c-format
 msgid "Saving device mapping to file %s..."
 msgstr "Eszközlista mentése ebbe a fájlba: %s..."
 
-#: src/omc-learn.c:2527
+#: src/omc-learn.c:2498
 #, c-format
 msgid ""
 "\n"
@@ -10794,7 +10800,7 @@
 "%s\n"
 "fájl hiba\n"
 
-#: src/omc-learn.c:2534
+#: src/omc-learn.c:2505
 #, c-format
 msgid ""
 "\n"
@@ -10807,12 +10813,12 @@
 "Érvénytelen verzió itt:\n"
 "%s\n"
 
-#: src/omc-learn.c:2571
+#: src/omc-learn.c:2541
 #, c-format
 msgid "Loading device mapping from file %s..."
 msgstr "Eszközlista betöltése innen: %s..."
 
-#: src/omc-learn.c:2576
+#: src/omc-learn.c:2544
 #, c-format
 msgid ""
 "\n"
@@ -10827,12 +10833,12 @@
 "fájl megnyitása sikertelen\n"
 "Hiba kód: %d\n"
 
-#: src/videodev.c:547
+#: src/videodev.c:539
 #, c-format
 msgid "Unable to open device %s\n"
 msgstr ""
 
-#: src/videodev.c:564
+#: src/videodev.c:554
 #, c-format
 msgid "Opened device %s\n"
 msgstr ""
@@ -11785,6 +11791,15 @@
 #~ msgid "$error"
 #~ msgstr "$hiba"
 
+#~ msgid "Pause"
+#~ msgstr "Megállítás"
+
+#~ msgid "Start frame"
+#~ msgstr "Kezdő képkocka"
+
+#~ msgid "End frame"
+#~ msgstr "Utolsó képkocka"
+
 #, fuzzy
 #~ msgid "_Open"
 #~ msgstr "_Megnyitás..."

LiVES-2.2.8.tar.bz2/po/it.po -> LiVES-2.4.1.tar.bz2/po/it.po Changed

@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n"
-"POT-Creation-Date: 2015-02-08 17:18-0300\n"
+"POT-Creation-Date: 2015-08-09 14:52-0300\n"
 "PO-Revision-Date: 2013-03-14 12:31+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Italian <it@li.org>\n"
@@ -18,8 +18,7 @@
 "X-Launchpad-Export-Date: 2013-03-28 10:43+0000\n"
 "X-Generator: Launchpad (build 16546)\n"
 
-#. TRANSLATORS: do not translate this message
-#: src/main.c:118
+#: src/main.c:128
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -28,22 +27,22 @@
 "http://lives.sourceforge.net/TRANS-README.txt"
 msgstr ""
 
-#: src/main.c:134
+#: src/main.c:153
 #, c-format
 msgid "%s Warning: %s\n"
 msgstr ""
 
-#: src/main.c:138
+#: src/main.c:157
 #, c-format
 msgid "%s Critical error: %s\n"
 msgstr ""
 
-#: src/main.c:139
+#: src/main.c:158
 #, c-format
 msgid "%s Fatal error: %s\n"
 msgstr ""
 
-#: src/main.c:176
+#: src/main.c:198
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -57,7 +56,7 @@
 "group_id=64341&atid=507139\n"
 "Grazie. Dovrebbe essere possibile un recupero se riavvii LiVES.\n"
 
-#: src/main.c:177
+#: src/main.c:199
 msgid ""
 "\n"
 "\n"
@@ -69,7 +68,7 @@
 "Durante la segnalazione di crash, fornisci informazioni sul tuo sistema "
 "operativo, la distribuzione e la versione di LiVES ("
 
-#: src/main.c:180
+#: src/main.c:203
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -77,7 +76,7 @@
 "e qualsiasi altra informazione mostrata qua sotto:\n"
 "\n"
 
-#: src/main.c:184
+#: src/main.c:206
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
@@ -87,84 +86,84 @@
 "informazioni.\n"
 "\n"
 
-#: src/main.c:192
+#: src/main.c:216
 msgid "Preserving set.\n"
 msgstr "Preservazione del set in corso.\n"
 
-#: src/main.c:636
+#: src/main.c:691
 msgid "Resizing"
 msgstr "Ridimensionamento"
 
-#: src/main.c:643
+#: src/main.c:698
 msgid "_Resize All Frames"
 msgstr "_Ridimensiona tutti i fotogrammi"
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:895
+#: src/main.c:948
 msgid "Any"
 msgstr "Qualsiasi"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:897
+#: src/main.c:950
 msgid "None"
 msgstr "Nessuno"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:899
+#: src/main.c:952
 msgid "recommended"
 msgstr "consigliato"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:901
+#: src/main.c:954
 msgid "disabled !"
 msgstr "disabilitato !"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:903
+#: src/main.c:956
 msgid "**The current layout**"
 msgstr "**Il layout corrente**"
 
 #. TRANSLATORS: adjective for "Built in" type effects
-#: src/main.c:905
+#: src/main.c:958
 msgid "Builtin"
 msgstr "Integrato"
 
 #. TRANSLATORS: adjective for "Custom" type effects
-#: src/main.c:907
+#: src/main.c:960
 msgid "Custom"
 msgstr "Personalizzato"
 
 #. TRANSLATORS: adjective for "Test" type effects
-#: src/main.c:909
+#: src/main.c:962
 msgid "Test"
 msgstr "Test"
 
-#: src/main.c:1054
+#: src/main.c:1107
 msgid "Foreground"
 msgstr ""
 
-#: src/main.c:1055
+#: src/main.c:1108
 #, fuzzy
 msgid "Background"
 msgstr "Sfondo _Vuoto"
 
-#: src/main.c:1566
+#: src/main.c:1624
 msgid "Loading realtime effect plugins..."
 msgstr "Caricamento dei plugin degli effetti in tempo reale in corso..."
 
-#: src/main.c:1631
+#: src/main.c:1690
 msgid "Starting jack audio server..."
 msgstr "Avvio del server audio jack in corso..."
 
-#: src/main.c:1633
+#: src/main.c:1692
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1634
+#: src/main.c:1693
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1663
+#: src/main.c:1723
 #, c-format
 msgid ""
 "\n"
@@ -176,114 +175,114 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1697
+#: src/main.c:1758
 msgid "Starting pulse audio server..."
 msgstr "Avviando il server audio pulse..."
 
-#: src/main.c:1765
+#: src/main.c:1825
 msgid "Checking optional dependencies:"
 msgstr "Controllo delle dipendenze opzionali in corso:"
 
-#: src/main.c:1766
+#: src/main.c:1826
 msgid "mplayer...detected..."
 msgstr "mplayer...rilevato..."
 
-#: src/main.c:1767
+#: src/main.c:1827
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...NON RILEVATO..."
 
-#: src/main.c:1768
+#: src/main.c:1828
 #, fuzzy
 msgid "mplayer2...detected..."
 msgstr "mplayer...rilevato..."
 
-#: src/main.c:1769
+#: src/main.c:1829
 #, fuzzy
 msgid "mplayer2...NOT DETECTED..."
 msgstr "mplayer...NON RILEVATO..."
 
-#: src/main.c:1770
+#: src/main.c:1830
 msgid "convert...detected..."
 msgstr "convert...rilevato..."
 
-#: src/main.c:1771
+#: src/main.c:1831
 msgid "convert...NOT DETECTED..."
 msgstr "convert...NON RILEVATO..."
 
-#: src/main.c:1772
+#: src/main.c:1832
 msgid "composite...detected..."
 msgstr "composite...rilevato..."
 
-#: src/main.c:1773
+#: src/main.c:1833
 msgid "composite...NOT DETECTED..."
 msgstr "composite...NON RILEVATO..."
 
-#: src/main.c:1774
+#: src/main.c:1834
 msgid "sox...detected\n"
 msgstr "sox...rilevato...\n"
 
-#: src/main.c:1775
+#: src/main.c:1835
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...NON RILEVATO...\n"
 
-#: src/main.c:1776
+#: src/main.c:1836
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...rilevato..."
 
-#: src/main.c:1777
+#: src/main.c:1837
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...NON RILEVATO..."
 
-#: src/main.c:1778
+#: src/main.c:1838
 msgid "jackd...detected..."
 msgstr "jackd...rilevato..."
 
-#: src/main.c:1779
+#: src/main.c:1839
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...NON RILEVATO..."
 
-#: src/main.c:1780
+#: src/main.c:1840
 msgid "pulse audio...detected..."
 msgstr "audio pulse...rilevato..."
 
-#: src/main.c:1781
+#: src/main.c:1841
 msgid "pulse audio...NOT DETECTED..."
 msgstr "audio pulse...NON RILEVATO..."
 
-#: src/main.c:1782
+#: src/main.c:1842
 msgid "python...detected..."
 msgstr "python...rilevato..."
 
-#: src/main.c:1783
+#: src/main.c:1843
 msgid "python...NOT DETECTED..."
 msgstr "python...NON RILEVATO..."
 
-#: src/main.c:1784
+#: src/main.c:1844
 msgid "dvgrab...detected..."
 msgstr "dvgrab...rilevato..."
 
-#: src/main.c:1785
+#: src/main.c:1845
 msgid "dvgrab...NOT DETECTED..."
 msgstr "dvgrab...NON RILEVATO..."
 
-#: src/main.c:1786
+#: src/main.c:1846
 msgid "xwininfo...detected..."
 msgstr "xwininfo...rilevato..."
 
-#: src/main.c:1787
+#: src/main.c:1847
 msgid "xwininfo...NOT DETECTED..."
 msgstr "xwininfo...NON RILEVATO..."
 
-#: src/main.c:1793
+#: src/main.c:1853
 #, c-format
 msgid "Windows version %04X"
 msgstr ""
 
-#: src/main.c:1795
+#: src/main.c:1855
 msgid "UNKNOWN - please patch me !"
 msgstr ""
 
-#: src/main.c:1799
+#: src/main.c:1859
 #, c-format
 msgid ""
 "\n"
@@ -294,48 +293,48 @@
 "\n"
 "Il gestore delle finestre riporta come \"%s\"; "
 
-#: src/main.c:1802
+#: src/main.c:1862
 #, c-format
 msgid "number of monitors detected: %d\n"
 msgstr "numero di monitor rilevati: %d\n"
 
-#: src/main.c:1805
+#: src/main.c:1865
 #, c-format
 msgid "Number of CPUs detected: %d "
 msgstr ""
 
-#: src/main.c:1808 src/multitrack.c:4902
+#: src/main.c:1868 src/multitrack.c:5068
 msgid "little endian"
 msgstr "piccolo endian"
 
-#: src/main.c:1809 src/multitrack.c:4901
+#: src/main.c:1869 src/multitrack.c:5067
 msgid "big endian"
 msgstr "grosso endian"
 
-#: src/main.c:1810
+#: src/main.c:1870
 #, c-format
 msgid "(%d bits, %s)\n"
 msgstr ""
 
-#: src/main.c:1814
+#: src/main.c:1874
 msgid "GUI type is: "
 msgstr ""
 
-#: src/main.c:1818
+#: src/main.c:1878
 #, c-format
 msgid "GTK+ version %d.%d.%d (compiled with %d.%d.%d)"
 msgstr ""
 
-#: src/main.c:1840
+#: src/main.c:1900
 msgid ", with cairo support"
 msgstr ""
 
-#: src/main.c:1847
+#: src/main.c:1907
 #, c-format
 msgid "Temp directory is %s\n"
 msgstr "La directory temporanea è %s\n"
 
-#: src/main.c:1851
+#: src/main.c:1911
 msgid ""
 "WARNING - this version of LiVES was compiled without either\n"
 "jack or pulse audio support.\n"
@@ -345,15 +344,15 @@
 "o a jack o pulse audio.\n"
 "Molte funzioni audio non saranno disponibili.\n"
 
-#: src/main.c:1854
+#: src/main.c:1914
 msgid "Compiled with jack support, good !\n"
 msgstr "Compilato con il supporto jack, bene !\n"
 
-#: src/main.c:1857
+#: src/main.c:1917
 msgid "Compiled with pulse audio support, wonderful !\n"
 msgstr "Compilato con il supporto pulse audio, magnifico !\n"
 
-#: src/main.c:1861
+#: src/main.c:1921
 #, c-format
 msgid ""
 "Welcome to LiVES version %s.\n"
@@ -362,7 +361,7 @@
 "Benvenuti in LiVES versione %s.\n"
 "\n"
 
-#: src/main.c:2306
+#: src/main.c:2380
 #, c-format
 msgid ""
 "\n"
@@ -371,86 +370,91 @@
 "\n"
 "La sintassi dell'avvio è: %s [opts] [filename [start_time] [frames]]\n"
 
-#: src/main.c:2307
+#: src/main.c:2381
 msgid "Where: filename is the name of a media file or backup file.\n"
 msgstr ""
 "Dove: filename è il nome di un file multimediale o un file di backup.\n"
 
-#: src/main.c:2308
+#: src/main.c:2382
 msgid "start_time : filename start time in seconds\n"
 msgstr "start_time : tempo di avvio di filename in secondi\n"
 
-#: src/main.c:2309
+#: src/main.c:2383
 msgid "frames : maximum number of frames to open\n"
 msgstr "frames : numero massimo di fotogrammi da aprire\n"
 
-#: src/main.c:2311
+#: src/main.c:2385
 msgid "opts can be:\n"
 msgstr "opts può essere:\n"
 
-#: src/main.c:2312
+#: src/main.c:2386
 msgid "-help            : show this help text and exit\n"
 msgstr "-help : mostra questo testo di aiuto ed esce\n"
 
-#: src/main.c:2313
+#: src/main.c:2387
 msgid "-tmpdir <tempdir>: use alternate working directory (e.g /var/ramdisk)\n"
 msgstr ""
 
-#: src/main.c:2314
+#: src/main.c:2388
 msgid "-set <setname>   : autoload clip set setname\n"
 msgstr "-set <setname>   : carica automaticamente il nome set del set clip\n"
 
-#: src/main.c:2315
+#: src/main.c:2389
 msgid "-noset           : do not load any set on startup\n"
 msgstr "-noset : non caricare nessun set all'avvio\n"
 
-#: src/main.c:2316
+#: src/main.c:2390
 msgid "-norecover       : force no-loading of crash recovery\n"
 msgstr "-norecover : forza il non-caricamento del recupero da un crash\n"
 
-#: src/main.c:2317
+#: src/main.c:2391
 msgid "-recover         : force loading of crash recovery\n"
 msgstr "-recover : forza il caricamento del recupero da un crash\n"
 
-#: src/main.c:2318
-msgid "-nothreaddialog  : doe nothing - retained for backwards compatibility\n"
+#: src/main.c:2392
+msgid ""
+"-nothreaddialog  : does nothing - retained for backwards compatibility\n"
 msgstr ""
 
-#: src/main.c:2319
+#: src/main.c:2393
 msgid "-nogui           : do not show the gui\n"
 msgstr "-nogui : non mostrare la gui\n"
 
-#: src/main.c:2320
+#: src/main.c:2394
 msgid "-nosplash        : do not show the splash window\n"
 msgstr ""
 
-#: src/main.c:2321
+#: src/main.c:2395
 msgid "-noplaywin       : do not show the play window\n"
 msgstr ""
 
-#: src/main.c:2322
+#: src/main.c:2396
+msgid "-noninteractive  : disable menu interactivity\n"
+msgstr ""
+
+#: src/main.c:2397
 msgid "-startup-ce      : start in clip editor mode\n"
 msgstr "-startup-ce      : avvia in modalità editor clip\n"
 
-#: src/main.c:2323
+#: src/main.c:2398
 msgid "-startup-mt      : start in multitrack mode\n"
 msgstr "-startup-mt      : avvia in modalità multi-traccia\n"
 
-#: src/main.c:2324
+#: src/main.c:2399
 msgid ""
 "-fxmodesmax <n>  : allow <n> modes per effect key (minimum is 1, default is "
 "8)\n"
 msgstr ""
 
-#: src/main.c:2326
+#: src/main.c:2401
 msgid "-oscstart <port> : start OSC listener on UDP port <port>\n"
 msgstr "-oscstart <port> : avvia l'ascoltatore OSC sulla porta UDP <port>\n"
 
-#: src/main.c:2327
+#: src/main.c:2402
 msgid "-nooscstart      : do not start OSC listener\n"
 msgstr "-nooscstart      : non avviare l'ascoltatore OSC\n"
 
-#: src/main.c:2329
+#: src/main.c:2404
 #, fuzzy
 msgid ""
 "-aplayer <ap>    : start with selected audio player. <ap> can be mplayer, "
@@ -460,15 +464,15 @@
 "mplayer"
 
 #. TRANSLATORS: pulse (audio)
-#: src/main.c:2332
+#: src/main.c:2407
 msgid ", pulse"
 msgstr ", pulse"
 
-#: src/main.c:2335
+#: src/main.c:2410
 msgid ", sox or jack\n"
 msgstr ", sox o jack\n"
 
-#: src/main.c:2336
+#: src/main.c:2412
 msgid ""
 "-jackopts <opts>    : opts is a bitmap of jack startup options [1 = jack "
 "transport client, 2 = jack transport master, 4 = start jack transport "
@@ -479,31 +483,31 @@
 "trasporto jack, 8 = metti in pausa l'audio quando il video è in pausa, 16 = "
 "avvia il server audio jack] \n"
 
-#: src/main.c:2338
+#: src/main.c:2414
 msgid " or sox\n"
 msgstr " oppure sox\n"
 
-#: src/main.c:2340
+#: src/main.c:2416
 msgid "-devicemap <mapname>          : autoload devicemap\n"
 msgstr ""
 "-mappa dispositivo <mapname>          : carica automaticamente la mappa del "
 "dispositivo\n"
 
-#: src/main.c:2341
+#: src/main.c:2418
 msgid ""
 "-vppdefaults <file>          : load video playback plugin defaults from "
 "<file> (Note: only sets the settings, not the plugin type)\n"
 msgstr ""
 
-#: src/main.c:2342
+#: src/main.c:2419
 msgid "-debug            : try to debug crashes (requires 'gdb' installed)\n"
 msgstr "-debug : prova a risolvere dei crash\n"
 
-#: src/main.c:2373 src/gui.c:1128
+#: src/main.c:2449 src/gui.c:1127
 msgid "Starting GUI..."
 msgstr "Avviamento della GUI in corso..."
 
-#: src/main.c:2396
+#: src/main.c:2475
 #, c-format
 msgid ""
 "\n"
@@ -514,7 +518,7 @@
 "(Maybe you need to change the value of <prefix_dir> in your %s file)\n"
 msgstr ""
 
-#: src/main.c:2410
+#: src/main.c:2492
 #, c-format
 msgid ""
 "\n"
@@ -522,7 +526,7 @@
 "Please make sure you have write access to %s and try again.\n"
 msgstr ""
 
-#: src/main.c:2415
+#: src/main.c:2498
 msgid ""
 "\n"
 "`smogrify` must be in your path, and be executable\n"
@@ -536,7 +540,7 @@
 "Per piacere riguarda il file LEGGIMI che è arrivato con questo pacchetto\n"
 "prima di avviare LiVES.\n"
 
-#: src/main.c:2421
+#: src/main.c:2504
 #, c-format
 msgid ""
 "\n"
@@ -546,7 +550,7 @@
 "Please check the file permissions for this file and try again.\n"
 msgstr ""
 
-#: src/main.c:2428
+#: src/main.c:2512
 #, c-format
 msgid ""
 "\n"
@@ -557,7 +561,7 @@
 "and try again.\n"
 msgstr ""
 
-#: src/main.c:2438
+#: src/main.c:2522
 #, c-format
 msgid ""
 "Please check the <tempdir> setting in \n"
@@ -565,7 +569,7 @@
 "and try again.\n"
 msgstr ""
 
-#: src/main.c:2445
+#: src/main.c:2528
 #, c-format
 msgid ""
 "\n"
@@ -575,7 +579,7 @@
 "%s"
 msgstr ""
 
-#: src/main.c:2453
+#: src/main.c:2536
 msgid ""
 "\n"
 "An incorrect version of smogrify was found in your path.\n"
@@ -593,7 +597,7 @@
 "\n"
 "Grazie.\n"
 
-#: src/main.c:2458
+#: src/main.c:2541
 #, fuzzy
 msgid ""
 "\n"
@@ -604,7 +608,7 @@
 "LiVES attualmente richiede o 'mplayer' o 'sox' per funzionare. Per piacere "
 "installa uno o l'altro di questi, e prova ancora.\n"
 
-#: src/main.c:2462
+#: src/main.c:2546
 #, fuzzy
 msgid ""
 "\n"
@@ -615,7 +619,7 @@
 "LiVES attualmente richiede o 'mplayer' o 'sox' per funzionare. Per piacere "
 "installa uno o l'altro di questi, e prova ancora.\n"
 
-#: src/main.c:2472
+#: src/main.c:2556
 #, fuzzy
 msgid ""
 "\n"
@@ -626,7 +630,7 @@
 "LiVES non è stato in grado di trovare 'mplayer'. Dovresti installare mplayer "
 "per utilizzare LiVES in maniera più completa.\n"
 
-#: src/main.c:2475
+#: src/main.c:2561
 msgid ""
 "\n"
 "LiVES was unable to locate 'convert'. You should install convert and image-"
@@ -636,7 +640,7 @@
 "LiVES non è stato in grado di trovare 'convert'. Dovresti installare convert "
 "e image-magick se vuoi usare effetti renderizzati.\n"
 
-#: src/main.c:2478
+#: src/main.c:2566
 msgid ""
 "\n"
 "LiVES was unable to locate 'composite'. You should install composite and "
@@ -646,7 +650,7 @@
 "LiVES non è stato in grado di trovare 'composite'. Dovresti installare "
 "composite e image-magick se vuoi utilizzare la funzione di fusione.\n"
 
-#: src/main.c:2481
+#: src/main.c:2570
 msgid ""
 "\n"
 "LiVES was unable to locate 'sox'. Some audio features may not work. You "
@@ -656,7 +660,7 @@
 "LiVES non è stato in grado di trovare 'sox'. Alcune funzioni audio "
 "potrebbero non funzionare. Dovresti installare 'sox'.\n"
 
-#: src/main.c:2484
+#: src/main.c:2575
 #, c-format
 msgid ""
 "\n"
@@ -667,59 +671,59 @@
 "You may need to change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/main.c:2611
+#: src/main.c:2707
 #, c-format
 msgid "Autoloading set %s..."
 msgstr "Autocaricamento del set %s in corso..."
 
 #. TRANSLATORS: localised name may be used here
-#: src/main.c:2781 src/interface.c:738
+#: src/main.c:2902
 msgid "LiVES"
 msgstr ""
 
-#: src/main.c:2948
+#: src/main.c:3066
 #, c-format
 msgid "Invalid audio player %s\n"
 msgstr "Lettore audio %s non valido\n"
 
-#: src/main.c:3077
+#: src/main.c:3214
 #, c-format
 msgid "LiVES-%s: <Untitled%d> %dx%d : %d frames %d bpp %.3f fps"
 msgstr "LiVES-%s: <Senza titolo%d> %dx%d : %d fotogrammi %d bpp %.3f fps"
 
-#: src/main.c:3082
+#: src/main.c:3219
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : ??? frames ??? bpp %.3f fps"
 msgstr "LiVES-%s: <%s> %dx%d : ??? fotogrammi ??? bpp %.3f fps"
 
-#: src/main.c:3086
+#: src/main.c:3222
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : %d frames %d bpp %.3f fps"
 msgstr "LiVES-%s: <%s> %dx%d : %d fotogrammi %d bpp %.3f fps"
 
-#: src/main.c:3094
+#: src/main.c:3229
 #, c-format
 msgid "LiVES-%s: <No File>"
 msgstr "LiVES-%s: <Nessun File>"
 
 #. TRANSLATORS: rec(ord)
-#: src/main.c:5085
+#: src/main.c:5201
 #, c-format
 msgid "rec %9d/%d"
 msgstr "rec %9d/%d"
 
 #. TRANSLATORS: out of memory (rec(ord))
-#: src/main.c:5091
+#: src/main.c:5206
 #, c-format
 msgid "!rec %9d/%d"
 msgstr "!rec %9d/%d"
 
-#: src/main.c:5398 src/main.c:5399 src/gui.c:2110 src/gui.c:3220
-#: src/saveplay.c:2336
+#: src/main.c:5500 src/main.c:5501 src/gui.c:2108 src/gui.c:3331
+#: src/saveplay.c:2315
 msgid "Play"
 msgstr "Riproduci"
 
-#: src/main.c:6128
+#: src/main.c:6216
 msgid ""
 "LiVES was unable to capture this image\n"
 "\n"
@@ -727,35 +731,35 @@
 "LiVES non è stato in grado di catturare questa immagine\n"
 "\n"
 
-#: src/main.c:6250
+#: src/main.c:6345
 #, c-format
 msgid "Closed file %s\n"
 msgstr "Chiuso il file %s\n"
 
-#: src/main.c:6452 src/gui.c:648 src/utils.c:4312 src/utils.c:4344
-#: src/saveplay.c:3550 src/multitrack.c:4510 src/multitrack.c:6268
+#: src/main.c:6542 src/gui.c:647 src/utils.c:4256 src/utils.c:4286
+#: src/saveplay.c:3500 src/multitrack.c:4678 src/multitrack.c:6447
 msgid "_Undo"
 msgstr "_Annulla"
 
-#: src/main.c:6453 src/gui.c:666 src/utils.c:4313 src/utils.c:4345
-#: src/saveplay.c:3551 src/multitrack.c:4531 src/multitrack.c:6293
+#: src/main.c:6543 src/gui.c:665 src/utils.c:4257 src/utils.c:4287
+#: src/saveplay.c:3501 src/multitrack.c:4698 src/multitrack.c:6472
 msgid "_Redo"
 msgstr "_Ripeti"
 
-#: src/main.c:6493 src/interface.c:470 src/gui.c:2326 src/preferences.c:2357
-#: src/resample.c:1516
+#: src/main.c:6583 src/interface.c:457 src/gui.c:2324 src/preferences.c:2391
+#: src/resample.c:1488
 msgid "Video"
 msgstr "Video"
 
-#: src/main.c:6494 src/interface.c:483 src/gui.c:2351
+#: src/main.c:6584 src/interface.c:470 src/gui.c:2348
 msgid "Left Audio"
 msgstr "Audio Sinistro"
 
-#: src/main.c:6495 src/gui.c:2375
+#: src/main.c:6585 src/gui.c:2371
 msgid "Right Audio"
 msgstr "Audio Destro"
 
-#: src/main.c:6540
+#: src/main.c:6630
 #, fuzzy
 msgid ""
 "\n"
@@ -770,11 +774,11 @@
 "impostato su mplayer.\n"
 "Per piacere regola le opzioni di riproduzione in Preferenze e prova ancora.\n"
 
-#: src/main.c:7051 src/plugins.c:1502
+#: src/main.c:7134 src/plugins.c:1468
 msgid "LiVES: - Play Window"
 msgstr "LiVES: - Finestra Di Riproduzione"
 
-#: src/startup.c:25
+#: src/startup.c:24
 #, c-format
 msgid ""
 "A directory named\n"
@@ -784,7 +788,7 @@
 "(Free space = %s)\n"
 msgstr ""
 
-#: src/startup.c:32
+#: src/startup.c:29
 #, c-format
 msgid ""
 "A directory named\n"
@@ -794,7 +798,7 @@
 "Please select another location.\n"
 msgstr ""
 
-#: src/startup.c:49
+#: src/startup.c:46
 #, c-format
 msgid ""
 "\n"
@@ -805,7 +809,7 @@
 "(Free space = %s)"
 msgstr ""
 
-#: src/startup.c:54
+#: src/startup.c:50
 #, c-format
 msgid ""
 "\n"
@@ -814,11 +818,11 @@
 "Please try again and choose a different location.\n"
 msgstr ""
 
-#: src/startup.c:96
+#: src/startup.c:92
 msgid "Directory name is too long !"
 msgstr "Il nome della directory è troppo lungo."
 
-#: src/startup.c:223
+#: src/startup.c:216
 msgid ""
 "LiVES FAILED TO START YOUR SELECTED AUDIO PLAYER !\n"
 "\n"
@@ -826,7 +830,7 @@
 "LiVES HA FALLITO L'AVVIO DEL TUO LETTORE AUDIO SELEZIONATO !\n"
 "\n"
 
-#: src/startup.c:230
+#: src/startup.c:222
 msgid ""
 "Before starting LiVES, you need to choose an audio player.\n"
 "\n"
@@ -836,7 +840,7 @@
 "\n"
 "L'AUDIO PULSE è consigliato per la maggior parte degli utenti"
 
-#: src/startup.c:233
+#: src/startup.c:225
 msgid ""
 ", but this version of LiVES was not compiled with pulse audio support.\n"
 "\n"
@@ -845,7 +849,7 @@
 "pulse.\n"
 "\n"
 
-#: src/startup.c:236
+#: src/startup.c:229
 msgid ""
 ", but you do not have pulse audio installed on your system.\n"
 " You are advised to install pulse audio first before running LiVES.\n"
@@ -855,11 +859,11 @@
 "Se stato avvisato di installare pulse audio pirma di lanciare LiVES.\n"
 "\n"
 
-#: src/startup.c:241
+#: src/startup.c:233
 msgid "JACK audio is recommended for pro users"
 msgstr "L'audio JACK è consigliato per gli utenti avanzati"
 
-#: src/startup.c:244
+#: src/startup.c:236
 msgid ""
 ", but this version of LiVES was not compiled with jack audio support.\n"
 "\n"
@@ -868,7 +872,7 @@
 "jack.\n"
 "\n"
 
-#: src/startup.c:247
+#: src/startup.c:239
 msgid ""
 ", but you do not have jackd installed. You may wish to install jackd first "
 "before running LiVES.\n"
@@ -878,7 +882,7 @@
 "aviare LiVES.\n"
 "\n"
 
-#: src/startup.c:250
+#: src/startup.c:242
 msgid ""
 ", but may prevent LiVES from starting on some systems.\n"
 "If LiVES will not start with jack, you can restart and try with another "
@@ -890,11 +894,11 @@
 "altro lettore audio.\n"
 "\n"
 
-#: src/startup.c:254
+#: src/startup.c:246
 msgid "SOX may be used if neither of the preceding players work, "
 msgstr "SOX può essere utilizzato se nessuno dei lettori precedenti funziona, "
 
-#: src/startup.c:257
+#: src/startup.c:249
 msgid ""
 "but some audio features will be disabled.\n"
 "\n"
@@ -902,7 +906,7 @@
 "ma alcune funzioni audio saranno disabilitate.\n"
 "\n"
 
-#: src/startup.c:260
+#: src/startup.c:251
 msgid ""
 "but you do not have sox installed.\n"
 "You are advised to install it before running LiVES.\n"
@@ -912,7 +916,7 @@
 "Faresti meglio ad installarlo prima di avviare LiVES.\n"
 "\n"
 
-#: src/startup.c:264
+#: src/startup.c:255
 #, fuzzy
 msgid ""
 "The MPLAYER/MPLAYER2 audio player is only recommended for testing purposes.\n"
@@ -921,137 +925,137 @@
 "Il lettore audio MPLAYER è consigliato solamente per ragioni di test.\n"
 "\n"
 
-#: src/startup.c:281
+#: src/startup.c:271
 msgid "LiVES: - Choose an audio player"
 msgstr "LiVES: - Scegli un lettore audio"
 
-#: src/startup.c:298
+#: src/startup.c:288
 msgid "Use _pulse audio player"
 msgstr "Utilizza il lettore audio _pulse"
 
-#: src/startup.c:320
+#: src/startup.c:310
 msgid "Use _jack audio player"
 msgstr "Utilizza lettore audio _jack"
 
-#: src/startup.c:340
+#: src/startup.c:330
 msgid "Use _sox audio player"
 msgstr "Utilizza il lettore audio _sox"
 
-#: src/startup.c:361
+#: src/startup.c:351
 msgid "Use _mplayer audio player"
 msgstr "Utilizza il lettore audio _mplayer"
 
-#: src/startup.c:381
+#: src/startup.c:371
 #, fuzzy
 msgid "Use _mplayer2 audio player"
 msgstr "Utilizza il lettore audio _mplayer"
 
-#: src/startup.c:405 src/startup.c:580 src/interface.c:1506
+#: src/startup.c:395 src/startup.c:569 src/interface.c:1398
 msgid "_Next"
 msgstr "_Successivo"
 
-#: src/startup.c:445
+#: src/startup.c:435
 msgid "Skipped"
 msgstr "Saltato"
 
-#: src/startup.c:460
+#: src/startup.c:450
 msgid "Passed"
 msgstr "Superato"
 
-#: src/startup.c:493
+#: src/startup.c:483
 msgid "Failed"
 msgstr "Non riuscito"
 
-#: src/startup.c:552
+#: src/startup.c:542
 msgid "LiVES: - Testing Configuration"
 msgstr ""
 
-#: src/startup.c:555
+#: src/startup.c:544
 msgid "LiVES: - Troubleshoot"
 msgstr "LiVES: - Risoluzione problemi"
 
-#: src/startup.c:568
+#: src/startup.c:557
 msgid "LiVES will now run some basic configuration tests\n"
 msgstr "Adesso LiVES eseguirà alcuni testi di base sulla configurazione\n"
 
-#: src/startup.c:603
+#: src/startup.c:591
 msgid "Checking for \"sox\" presence"
 msgstr ""
 
-#: src/startup.c:607
+#: src/startup.c:595
 msgid ""
 "You should install sox to be able to use all the audio features in LiVES"
 msgstr ""
 
-#: src/startup.c:615
+#: src/startup.c:602
 msgid "Checking if sox can convert audio"
 msgstr ""
 
-#: src/startup.c:638
+#: src/startup.c:625
 msgid "Unable to allocate 176400 bytes memory."
 msgstr ""
 
-#: src/startup.c:653
+#: src/startup.c:639
 #, c-format
 msgid "Unable to write to: %s"
 msgstr ""
 
-#: src/startup.c:667 src/startup.c:807
+#: src/startup.c:653 src/startup.c:789
 #, c-format
 msgid "Command failed: %s"
 msgstr ""
 
-#: src/startup.c:689
+#: src/startup.c:675
 msgid "You should install sox_fmt_all or similar"
 msgstr ""
 
-#: src/startup.c:717
+#: src/startup.c:703
 msgid "Checking for \"mplayer\" presence"
 msgstr ""
 
-#: src/startup.c:721
+#: src/startup.c:707
 msgid ""
 "You should install mplayer or mplayer2 to be able to use all the decoding "
 "features in LiVES"
 msgstr ""
 
-#: src/startup.c:747
+#: src/startup.c:732
 msgid "Checking if mplayer can convert audio"
 msgstr ""
 
-#: src/startup.c:768
+#: src/startup.c:751
 msgid "You should install mplayer or mplayer2 with pcm/wav support"
 msgstr ""
 
-#: src/startup.c:785
+#: src/startup.c:767
 msgid "Checking if mplayer can decode to png/alpha"
 msgstr ""
 
-#: src/startup.c:828
+#: src/startup.c:810
 msgid "You may wish to upgrade mplayer to a newer version"
 msgstr ""
 
-#: src/startup.c:854
+#: src/startup.c:836
 msgid "Checking if mplayer can decode to jpeg"
 msgstr ""
 
-#: src/startup.c:882
+#: src/startup.c:862
 msgid "You should install mplayer with either png/alpha or jpeg support"
 msgstr ""
 
-#: src/startup.c:883
+#: src/startup.c:863
 msgid "You may wish to add jpeg output support to mplayer"
 msgstr ""
 
-#: src/startup.c:892
+#: src/startup.c:872
 msgid "Checking for \"convert\" presence"
 msgstr ""
 
-#: src/startup.c:896
+#: src/startup.c:876
 msgid "Install imageMagick to be able to use all of the rendered effects"
 msgstr ""
 
-#: src/startup.c:909
+#: src/startup.c:889
 msgid ""
 "\n"
 "\n"
@@ -1059,7 +1063,7 @@
 "Preferences/Decoding.    \n"
 msgstr ""
 
-#: src/startup.c:915
+#: src/startup.c:894
 msgid ""
 "\n"
 "\n"
@@ -1067,49 +1071,49 @@
 "continue    \n"
 msgstr ""
 
-#: src/startup.c:949
+#: src/startup.c:928
 msgid ""
 "\n"
 "\n"
 "Finally, you can choose the default startup interface for LiVES.\n"
 msgstr ""
 
-#: src/startup.c:950
+#: src/startup.c:929
 msgid ""
 "\n"
 "\n"
 "LiVES has two main interfaces and you can start up with either of them.\n"
 msgstr ""
 
-#: src/startup.c:951
+#: src/startup.c:930
 msgid ""
 "\n"
 "\n"
 "The default can always be changed later from Preferences.\n"
 msgstr ""
 
-#: src/startup.c:961
+#: src/startup.c:940
 msgid "LiVES: - Choose the startup interface"
 msgstr ""
 
-#: src/startup.c:972
+#: src/startup.c:951
 msgid "Start in _Clip Edit mode"
 msgstr ""
 
-#: src/startup.c:975
+#: src/startup.c:954
 msgid "This is the best choice for simple editing tasks and for VJs\n"
 msgstr ""
 
-#: src/startup.c:981
+#: src/startup.c:960
 msgid "Start in _Multitrack mode"
 msgstr ""
 
-#: src/startup.c:983
+#: src/startup.c:962
 msgid ""
 "This is a better choice for complex editing tasks involving multiple clips.\n"
 msgstr ""
 
-#: src/startup.c:992
+#: src/startup.c:971
 msgid "_Finish"
 msgstr ""
 
@@ -1126,38 +1130,38 @@
 msgid "Apply _Deinterlace"
 msgstr ""
 
-#: src/interface.c:66
+#: src/interface.c:65
 msgid "If this is set, frames will be deinterlaced as they are imported."
 msgstr ""
 "Se questo viene impostato, i fotogrammi verranno deinterlacciati appena "
 "vengono importati."
 
-#: src/interface.c:113 src/callbacks.c:9623 src/callbacks.c:9646
-#: src/callbacks.c:9647 src/gui.c:3223 src/gui.c:3821 src/saveplay.c:2339
-#: src/saveplay.c:3138 src/dialogs.c:1514 src/dialogs.c:1515
-#: src/dialogs.c:1746 src/dialogs.c:1747 src/framedraw.c:238
-#: src/multitrack.c:8031
+#: src/interface.c:106 src/callbacks.c:9542 src/callbacks.c:9564
+#: src/callbacks.c:9565 src/gui.c:3333 src/gui.c:3946 src/saveplay.c:2317
+#: src/saveplay.c:3097 src/dialogs.c:1575 src/dialogs.c:1576
+#: src/dialogs.c:1804 src/dialogs.c:1805 src/framedraw.c:236
+#: src/multitrack.c:8210
 msgid "Preview"
 msgstr "Anteprima"
 
-#: src/interface.c:132
+#: src/interface.c:125
 msgid "Click here to _Preview any selected video, image or audio file"
 msgstr ""
 "Clicca qui per vedere in An_teprima qualsiasi file video, immagine o audio"
 
-#: src/interface.c:135
+#: src/interface.c:127
 msgid "Click here to _Preview any selected audio file"
 msgstr "Clicca qui per vedere in _Anteprima qualsiasi file audio selezionato"
 
-#: src/interface.c:138
+#: src/interface.c:129
 msgid "Click here to _Preview the video"
 msgstr "Clicca qui per vedere in A_nteprima il video"
 
-#: src/interface.c:181 src/dialogs.c:2542
+#: src/interface.c:169 src/dialogs.c:2621
 msgid "LiVES: - Processing..."
 msgstr "LiVES - Elaborazione in corso..."
 
-#: src/interface.c:217
+#: src/interface.c:205
 msgid ""
 "\n"
 "\n"
@@ -1171,8 +1175,8 @@
 "\n"
 "Ricordati di disattivare gli effetti (ctrl-0) dopo !"
 
-#: src/interface.c:222 src/callbacks.c:9373 src/callbacks.c:9420
-#: src/dialogs.c:2570
+#: src/interface.c:210 src/callbacks.c:9283 src/callbacks.c:9332
+#: src/dialogs.c:2649
 msgid ""
 "\n"
 "Please Wait"
@@ -1180,190 +1184,178 @@
 "\n"
 "Per Piacere Attendi"
 
-#: src/interface.c:242
+#: src/interface.c:230
 msgid "Show Details"
 msgstr ""
 
-#: src/interface.c:254 src/dialogs.c:2584
+#: src/interface.c:242 src/dialogs.c:2663
 msgid "_Enough"
 msgstr "_Abbastanza"
 
-#: src/interface.c:255 src/framedraw.c:278
+#: src/interface.c:243 src/framedraw.c:276
 msgid "_Preview"
 msgstr "_Anteprima"
 
-#: src/interface.c:257
+#: src/interface.c:245 src/callbacks.c:9282 src/callbacks.c:9330
 msgid "Paus_e"
 msgstr ""
 
-#: src/interface.c:258 src/callbacks.c:9417
+#: src/interface.c:246 src/callbacks.c:9329
 msgid "Pause/_Enough"
 msgstr ""
 
-#: src/interface.c:285
+#: src/interface.c:273
 msgid "_Cancel"
 msgstr "_Annulla"
 
-#: src/interface.c:374
+#: src/interface.c:361
 #, c-format
 msgid "LiVES: - %s"
 msgstr ""
 
-#: src/interface.c:376
+#: src/interface.c:363
 msgid "LiVES: - Multitrack details"
 msgstr ""
 
-#: src/interface.c:407
+#: src/interface.c:394
 msgid "Format"
 msgstr "Formato"
 
-#: src/interface.c:412
+#: src/interface.c:399
 msgid "Frame size"
 msgstr "Dimensione fotogramma"
 
-#: src/interface.c:417
+#: src/interface.c:404
 msgid "File size"
 msgstr "Dimensione file"
 
-#: src/interface.c:418
+#: src/interface.c:405
 msgid "Byte size"
 msgstr "Dimensione byte"
 
-#: src/interface.c:423 src/interface.c:1891
+#: src/interface.c:410 src/interface.c:1760
 msgid "FPS"
 msgstr "FPS"
 
-#: src/interface.c:428
+#: src/interface.c:415
 msgid "Frames"
 msgstr "Fotogrammi"
 
-#: src/interface.c:429
+#: src/interface.c:416
 msgid "Events"
 msgstr "Eventi"
 
-#: src/interface.c:434 src/interface.c:500 src/interface.c:542
+#: src/interface.c:421 src/interface.c:486 src/interface.c:528
 msgid "Total time"
 msgstr "Tempo totale"
 
-#: src/interface.c:486 src/resample.c:1488
+#: src/interface.c:472 src/resample.c:1460
 msgid "Audio"
 msgstr "Audio"
 
-#: src/interface.c:511 src/interface.c:553
+#: src/interface.c:497 src/interface.c:539
 msgid "Rate/size"
 msgstr "Valore/dimensione"
 
-#: src/interface.c:530
+#: src/interface.c:516
 msgid "Right audio"
 msgstr "Audio destro"
 
-#: src/interface.c:622
+#: src/interface.c:607
 msgid "LiVES: - Encoding options"
 msgstr "LiVES: - Opzioni di codifica"
 
-#: src/interface.c:636
+#: src/interface.c:621
 msgid "<------------- (Check the box to re_size as suggested)"
 msgstr ""
 
-#: src/interface.c:637
+#: src/interface.c:622
 msgid "<------------- (Check the box to use the _size recommendation)"
 msgstr ""
 
-#: src/interface.c:662
+#: src/interface.c:646
 msgid "Use _letterboxing to maintain aspect ratio (optional)"
 msgstr ""
 
-#: src/interface.c:663
+#: src/interface.c:647
 msgid ""
 "Draw black rectangles either above or to the sides of the image, to prevent "
 "it from stretching."
 msgstr ""
 
-#: src/interface.c:694
+#: src/interface.c:677
 msgid "Keep _my settings"
 msgstr "Mantieni le _mie impostazioni"
 
-#: src/interface.c:695
+#: src/interface.c:678
 msgid "Use _recommended settings"
 msgstr "Utilizza impostazioni _raccomandate"
 
-#: src/interface.c:775 src/dialogs.c:114
-msgid ""
-"Do _not show this warning any more\n"
-"(can be turned back on from Preferences/Warnings)"
-msgstr ""
-"_Non mostrare più questo avviso\n"
-"(può essere riattivato da Preferenze/Avvisi)"
-
-#: src/interface.c:787
-msgid "Show _Details"
-msgstr "Mostra _Dettagli"
-
-#: src/interface.c:881
+#: src/interface.c:769
 msgid "_Close Window"
 msgstr "Chiudi _finestra"
 
-#: src/interface.c:883
+#: src/interface.c:771
 msgid "_Save to file"
 msgstr "_Salva nel file"
 
-#: src/interface.c:928
+#: src/interface.c:816
 msgid "LiVES: - Insert"
 msgstr "LiVES: - Inserisci"
 
-#: src/interface.c:945
+#: src/interface.c:833
 msgid "_Number of times to insert"
 msgstr "_Numero di volte da inserire"
 
-#: src/interface.c:954
+#: src/interface.c:842
 msgid "_Insert to fit audio"
 msgstr "_Inserisci per adattare all'audio"
 
-#: src/interface.c:968
+#: src/interface.c:856
 msgid "Insert _before selection"
 msgstr "Inserisci _prima della selezione"
 
-#: src/interface.c:970
+#: src/interface.c:858
 msgid "Insert clipboard before selected frames"
 msgstr "Inserisci appunti prima dei fotogrammi selezionati"
 
-#: src/interface.c:986
+#: src/interface.c:875
 msgid "Insert _after selection"
 msgstr "Inserisci _dopo la selezione"
 
-#: src/interface.c:988
+#: src/interface.c:877
 msgid "Insert clipboard after selected frames"
 msgstr "Inserisci gli appunti dopo i fotogrammi selezionati"
 
-#: src/interface.c:999
+#: src/interface.c:888
 msgid "Insert _with sound"
 msgstr "Inserisci _con suono"
 
-#: src/interface.c:1012
+#: src/interface.c:901
 msgid "Insert with_out sound"
 msgstr "Inserisci sen_za suono"
 
-#: src/interface.c:1093
+#: src/interface.c:985
 msgid "LiVES: - Open Selection"
 msgstr "LiVES: - Apri Selezione"
 
-#: src/interface.c:1111
+#: src/interface.c:1004
 msgid "Selection start time (sec)"
 msgstr ""
 
-#: src/interface.c:1117
+#: src/interface.c:1010
 msgid "Number of frames to open"
 msgstr ""
 
-#: src/interface.c:1193
+#: src/interface.c:1088
 msgid "LiVES: - Open Location"
 msgstr "LiVES: - Apri Posizione"
 
-#: src/interface.c:1195
+#: src/interface.c:1090
 msgid "LiVES: - Open Youtube Clip"
 msgstr ""
 
-#: src/interface.c:1213
+#: src/interface.c:1109
 msgid ""
 "\n"
 "\n"
@@ -1380,7 +1372,7 @@
 "Flussi\n"
 "\n"
 
-#: src/interface.c:1216
+#: src/interface.c:1112
 msgid ""
 "\n"
 "\n"
@@ -1389,63 +1381,64 @@
 "\n"
 msgstr ""
 
-#: src/interface.c:1220
+#: src/interface.c:1116
 msgid ""
 "Enter the URL of the clip below.\n"
 "E.g: http://www.youtube.com/watch?v=WCR6f6WzjP8\n"
 "\n"
 msgstr ""
 
-#: src/interface.c:1231
+#: src/interface.c:1127
 msgid "URL : "
 msgstr "URL : "
 
-#: src/interface.c:1231
+#: src/interface.c:1127
 msgid "Youtube URL : "
 msgstr ""
 
-#: src/interface.c:1235
+#: src/interface.c:1131
 msgid "Do not send bandwidth information"
 msgstr "Non inviare informazioni sulla larghezza della banda"
 
-#: src/interface.c:1237
+#: src/interface.c:1133
 msgid "Try this setting if you are having problems getting a stream"
 msgstr ""
 "Prova questa impostazione se stai avendo problemi ad ottenere un flusso"
 
-#: src/interface.c:1258
+#: src/interface.c:1155
 msgid "Download to _Directory : "
 msgstr ""
 
-#: src/interface.c:1276
+#: src/interface.c:1173
 msgid "Download _File Name : "
 msgstr ""
 
-#: src/interface.c:1281
+#: src/interface.c:1178
 msgid ".webm"
 msgstr ""
 
-#: src/interface.c:1359
+#: src/interface.c:1256
 msgid "LiVES: - Rename Clip"
 msgstr "LiVES: - Rinomina Clip"
 
-#: src/interface.c:1362
-msgid "LiVES: - Enter Set Name"
+#: src/interface.c:1258
+#, fuzzy
+msgid "LiVES: - Enter Set Name to Save as"
 msgstr "LiVES: - Inserisci Nome Set"
 
-#: src/interface.c:1365
+#: src/interface.c:1260
 msgid "LiVES: - Enter a Set Name to Reload"
 msgstr ""
 
-#: src/interface.c:1368
+#: src/interface.c:1262
 msgid "LiVES: - Choose a Working Directory"
 msgstr "LiVES: - Scegli una Directory Di Lavoro"
 
-#: src/interface.c:1371
+#: src/interface.c:1264
 msgid "LiVES: - Rename Current Track"
 msgstr ""
 
-#: src/interface.c:1391
+#: src/interface.c:1283
 msgid ""
 "You need to enter a name for the current clip set.\n"
 "This will allow you reload the layout with the same clips later.\n"
@@ -1457,7 +1450,7 @@
 "Per piacere inserisci il nome set che vuoi usare.\n"
 "LiVES ti ricorderà di salvare il set clip più tardi quando provi ad uscire.\n"
 
-#: src/interface.c:1397
+#: src/interface.c:1289
 msgid ""
 "In order to export this project, you must enter a name for this clip set.\n"
 "This will also be used for the project name.\n"
@@ -1466,7 +1459,7 @@
 "clip.\n"
 "Questo sarà anche usato per il nome del progetto.\n"
 
-#: src/interface.c:1404
+#: src/interface.c:1296
 msgid ""
 "Welcome to LiVES !\n"
 "This startup wizard will guide you through the\n"
@@ -1477,200 +1470,200 @@
 "l'installazione iniziale così potrai ottenere il maggior numero di cose da "
 "questa applicazione.\n"
 
-#: src/interface.c:1408
+#: src/interface.c:1300
 msgid ""
 "\n"
 "First of all you need to choose a working directory for LiVES.\n"
 "This should be a directory with plenty of disk space available.\n"
 msgstr ""
 
-#: src/interface.c:1427
+#: src/interface.c:1317
 msgid "New name "
 msgstr "Nuovo nome "
 
-#: src/interface.c:1430
+#: src/interface.c:1319
 msgid "Set name "
 msgstr "Nome set "
 
-#: src/interface.c:1550
+#: src/interface.c:1435
 msgid "Use def_aults"
 msgstr ""
 
-#: src/interface.c:1553 src/interface.c:1840 src/preferences.c:2515
-#: src/preferences.c:2697
+#: src/interface.c:1437 src/interface.c:1709 src/preferences.c:2550
+#: src/preferences.c:2739
 msgid "_Advanced"
 msgstr "_Avanzate"
 
-#: src/interface.c:1604
+#: src/interface.c:1487
 msgid "LiVES:- Select input device"
 msgstr ""
 
-#: src/interface.c:1622
+#: src/interface.c:1504
 msgid "Select input device:"
 msgstr ""
 
-#: src/interface.c:1686
+#: src/interface.c:1568
 msgid "LiVES:- Load CD Track"
 msgstr "LiVES:- Carica Traccia CD"
 
-#: src/interface.c:1689
+#: src/interface.c:1570
 msgid "LiVES:- Select DVD Title/Chapter"
 msgstr "LiVES:- Seleziona Titolo/Capitolo DVD"
 
-#: src/interface.c:1692
+#: src/interface.c:1572
 msgid "LiVES:- Select VCD Title"
 msgstr "LiVES:- Seleziona Titolo VCD"
 
-#: src/interface.c:1695
+#: src/interface.c:1574
 msgid "LiVES:- Change Maximum Visible Tracks"
 msgstr "LiVES:- Cambia Il Numero Massimo Di Tracce Visibili"
 
-#: src/interface.c:1698
+#: src/interface.c:1576
 msgid "LiVES:- Device details"
 msgstr ""
 
-#: src/interface.c:1721
+#: src/interface.c:1598
 #, c-format
 msgid "Track to load (from %s)"
 msgstr "Traccia da caricare (da %s)"
 
-#: src/interface.c:1724
+#: src/interface.c:1600
 msgid "DVD Title"
 msgstr "Titolo DVD"
 
-#: src/interface.c:1727
+#: src/interface.c:1602
 msgid "VCD Title"
 msgstr "Titolo VCD"
 
-#: src/interface.c:1730
+#: src/interface.c:1604
 msgid "Maximum number of tracks to display"
 msgstr "Numero massimo di tracce da mostrare"
 
-#: src/interface.c:1733
+#: src/interface.c:1606
 msgid "Device:        /dev/video"
 msgstr "Device: /dev/video"
 
-#: src/interface.c:1736
+#: src/interface.c:1608
 msgid "Device:        fw:"
 msgstr ""
 
-#: src/interface.c:1771
+#: src/interface.c:1641
 msgid "Chapter  "
 msgstr "Capitolo  "
 
-#: src/interface.c:1776
+#: src/interface.c:1645
 msgid "Channel  "
 msgstr ""
 
-#: src/interface.c:1791
+#: src/interface.c:1660
 msgid "Audio ID  "
 msgstr "ID audio  "
 
-#: src/interface.c:1857
+#: src/interface.c:1726
 msgid "Input number"
 msgstr ""
 
-#: src/interface.c:1865
+#: src/interface.c:1734
 msgid "Use default width, height and FPS"
 msgstr ""
 
-#: src/interface.c:1879
+#: src/interface.c:1748
 msgid "Width"
 msgstr ""
 
-#: src/interface.c:1885
+#: src/interface.c:1754
 msgid "Height"
 msgstr ""
 
-#: src/interface.c:1899
+#: src/interface.c:1768
 msgid "_Driver"
 msgstr ""
 
-#: src/interface.c:1902
+#: src/interface.c:1771
 msgid "_Output format"
 msgstr ""
 
-#: src/interface.c:1998
+#: src/interface.c:1865
 msgid "LiVES:- Fade Audio In"
 msgstr "LiVES:- Aumenta la dissolvenza dell'audio"
 
-#: src/interface.c:2001
+#: src/interface.c:1867
 msgid "LiVES:- Fade Audio Out"
 msgstr "LiVES:- diminuisci la dissolvenza dell'audio"
 
-#: src/interface.c:2017
+#: src/interface.c:1883
 msgid "Fade in over  "
 msgstr "Aumenta la dissolvenza oltre  "
 
-#: src/interface.c:2018
+#: src/interface.c:1884
 msgid "first"
 msgstr "primo"
 
-#: src/interface.c:2021
+#: src/interface.c:1886
 msgid "Fade out over  "
 msgstr "Diminuisci dissolvenza oltre  "
 
-#: src/interface.c:2022
+#: src/interface.c:1887
 msgid "last"
 msgstr "ultimo"
 
-#: src/interface.c:2044
+#: src/interface.c:1909
 msgid "seconds."
 msgstr "secondi."
 
-#: src/interface.c:2052 src/saveplay.c:1507
+#: src/interface.c:1917 src/saveplay.c:1484
 msgid "selection"
 msgstr "selezione"
 
-#: src/interface.c:2092
+#: src/interface.c:1956
 msgid "LiVES: - File Comments (optional)"
 msgstr "LiVES: - Commenti File (facoltativi)"
 
-#: src/interface.c:2107
+#: src/interface.c:1971
 msgid "Title/Name : "
 msgstr "Titolo/Nome : "
 
-#: src/interface.c:2114
+#: src/interface.c:1978
 msgid "Author/Artist : "
 msgstr "Autore/Artista : "
 
-#: src/interface.c:2121
+#: src/interface.c:1985
 msgid "Comments : "
 msgstr "Commenti : "
 
-#: src/interface.c:2151
+#: src/interface.c:2015
 msgid "_Options"
 msgstr ""
 
-#: src/interface.c:2158
+#: src/interface.c:2022
 msgid "Save _subtitles to file"
 msgstr ""
 
-#: src/interface.c:2170
+#: src/interface.c:2033
 msgid "Subtitle file"
 msgstr ""
 
-#: src/interface.c:2172
+#: src/interface.c:2035
 msgid "Browse..."
 msgstr ""
 
-#: src/interface.c:2255
+#: src/interface.c:2132
 msgid "LiVES: - choose a device"
 msgstr ""
 
-#: src/interface.c:2259
+#: src/interface.c:2135
 msgid "LiVES: - choose a directory"
 msgstr ""
 
-#: src/interface.c:2262
+#: src/interface.c:2137
 msgid "LiVES: - choose a file"
 msgstr ""
 
-#: src/interface.c:2445
+#: src/interface.c:2381
 msgid "LiVES: - Cancel/Discard/Save"
 msgstr "LiVES: - Annulla/Scarta/Salva"
 
-#: src/interface.c:2460
+#: src/interface.c:2397
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has not been saved.\n"
@@ -1680,7 +1673,7 @@
 "Il layout attuale non è stato salvato.\n"
 "Cosa vuoi fare ?\n"
 
-#: src/interface.c:2463
+#: src/interface.c:2400
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has been changed since the last save.\n"
@@ -1690,7 +1683,7 @@
 "Il layout attuale è stato modificato dall'ultimo salvataggio.\n"
 "Cosa vuoi fare ?\n"
 
-#: src/interface.c:2467
+#: src/interface.c:2404
 msgid ""
 "You are about to exit LiVES.\n"
 "The current clip set can be saved.\n"
@@ -1700,7 +1693,7 @@
 "Il clip attuale può essere salvato.\n"
 "Cosa vorresti fare ?\n"
 
-#: src/interface.c:2468
+#: src/interface.c:2405
 msgid ""
 "The current clip set has not been saved.\n"
 "What would you like to do ?\n"
@@ -1708,7 +1701,7 @@
 "Il clip attuale non è stato salvato.\n"
 "Cosa vorresti fare ?\n"
 
-#: src/interface.c:2472
+#: src/interface.c:2408
 msgid ""
 "The current layout has not been saved.\n"
 "What would you like to do ?\n"
@@ -1716,7 +1709,7 @@
 "Il layout attuale non è stato salvato.\n"
 "Cosa vorresti fare ?\n"
 
-#: src/interface.c:2475
+#: src/interface.c:2410
 #, fuzzy
 msgid ""
 "The current layout has *not* been changed since it was last saved.\n"
@@ -1725,7 +1718,7 @@
 "Il layout corrente non è cambiato dall'ultimo salvataggio.\n"
 "Cosa vorresti fare ?\n"
 
-#: src/interface.c:2480
+#: src/interface.c:2415
 msgid ""
 "The current layout contains generated frames and cannot be retained.\n"
 "You may wish to render it before exiting multitrack mode.\n"
@@ -1733,7 +1726,7 @@
 "Il layout corrente contiene frame generati e non può essere mantenuto.\n"
 "Potresti volere renderizzarlo prima di uscire dalla modalità multi-traccia.\n"
 
-#: src/interface.c:2483
+#: src/interface.c:2418
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout contains generated frames and cannot be retained.\n"
@@ -1743,39 +1736,39 @@
 "Il layout corrente contiene frame generati e non può essere mantenuto.\n"
 "Cosa desideri fare ?"
 
-#: src/interface.c:2496
+#: src/interface.c:2431
 msgid "Clip set _name"
 msgstr "_Nome set clip"
 
-#: src/interface.c:2502
+#: src/interface.c:2437
 msgid "_Auto reload next time"
 msgstr "Ricarica _automaticamente la prossima volta"
 
-#: src/interface.c:2538 src/interface.c:2547
+#: src/interface.c:2473 src/interface.c:2482
 msgid "_Wipe layout"
 msgstr "_Cancella layout"
 
-#: src/interface.c:2539
+#: src/interface.c:2474
 msgid "_Ignore changes"
 msgstr "_Ignora cambiamenti"
 
-#: src/interface.c:2540
+#: src/interface.c:2475
 msgid "_Delete clip set"
 msgstr "_Elimina set clip"
 
-#: src/interface.c:2541
+#: src/interface.c:2476
 msgid "_Delete layout"
 msgstr "_Elimina layout"
 
-#: src/interface.c:2545
+#: src/interface.c:2480
 msgid "_Save layout"
 msgstr "_Salva layout"
 
-#: src/interface.c:2546
+#: src/interface.c:2481
 msgid "_Save clip set"
 msgstr "_Salva set clip"
 
-#: src/interface.c:2565
+#: src/interface.c:2502
 msgid ""
 "\n"
 "LiVES has detected a multitrack layout from a previous session.\n"
@@ -1785,57 +1778,57 @@
 "LiVES ha riconosciuto un layout multi-traccia da una sessione precedente.\n"
 "Vuoi provare a recuperarlo ?\n"
 
-#: src/interface.c:2589
+#: src/interface.c:2528
 msgid "LiVES: - Disk Recovery Options"
 msgstr ""
 
-#: src/interface.c:2608
+#: src/interface.c:2549
 msgid "Delete _Orphaned Clips"
 msgstr ""
 
-#: src/interface.c:2609
+#: src/interface.c:2550
 msgid "Delete any clips which are not currently loaded or part of a set"
 msgstr ""
 
-#: src/interface.c:2622
+#: src/interface.c:2564
 msgid "Clear _Backup Files from Closed Clips"
 msgstr ""
 
-#: src/interface.c:2633
+#: src/interface.c:2575
 msgid "Remove Sets which have _Layouts but no Clips"
 msgstr ""
 
-#: src/interface.c:2644
+#: src/interface.c:2586
 msgid "_Reset to Defaults"
 msgstr ""
 
-#: src/interface.c:2651
+#: src/interface.c:2593
 msgid "_Accept"
 msgstr ""
 
-#: src/callbacks.c:198
+#: src/callbacks.c:208
 #, c-format
 msgid "Saving as set %s..."
 msgstr "Salvataggio in corso come set %s..."
 
-#: src/callbacks.c:833
+#: src/callbacks.c:852
 msgid "Please enter the name of the file to save the clip as.\n"
 msgstr ""
 
-#: src/callbacks.c:841
+#: src/callbacks.c:860
 msgid "Please enter a valid URL for the download.\n"
 msgstr ""
 
-#: src/callbacks.c:867
+#: src/callbacks.c:886
 #, c-format
 msgid "Downloading %s to %s..."
 msgstr ""
 
-#: src/callbacks.c:895
+#: src/callbacks.c:912
 msgid "Downloading clip"
 msgstr ""
 
-#: src/callbacks.c:933
+#: src/callbacks.c:950
 msgid ""
 "\n"
 "LiVES was unable to download the clip.\n"
@@ -1843,11 +1836,11 @@
 "the latest youtube-dl installed.\n"
 msgstr ""
 
-#: src/callbacks.c:1114 src/callbacks.c:1149
+#: src/callbacks.c:1131 src/callbacks.c:1166
 msgid "This file"
 msgstr "Questo file"
 
-#: src/callbacks.c:1115
+#: src/callbacks.c:1132
 msgid ""
 ",\n"
 " - including the current layout - "
@@ -1855,7 +1848,7 @@
 ",\n"
 " - incluso il layout corrente - "
 
-#: src/callbacks.c:1117
+#: src/callbacks.c:1134
 #, c-format
 msgid ""
 "\n"
@@ -1870,7 +1863,7 @@
 "\n"
 "Chiuderlo davvero ?"
 
-#: src/callbacks.c:1119
+#: src/callbacks.c:1136
 #, c-format
 msgid ""
 "\n"
@@ -1885,14 +1878,14 @@
 "\n"
 "Chiuderlo davvero ?"
 
-#: src/callbacks.c:1150
+#: src/callbacks.c:1167
 msgid ""
 "Changes made to this clip have not been saved or backed up.\n"
 "\n"
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1343
+#: src/callbacks.c:1356
 msgid ""
 "\n"
 "Invalid project file.\n"
@@ -1900,7 +1893,7 @@
 "\n"
 "File progetto non valido.\n"
 
-#: src/callbacks.c:1356
+#: src/callbacks.c:1370
 #, c-format
 msgid ""
 "\n"
@@ -1921,33 +1914,33 @@
 "poi File|Chiudi/Salva tutti i Clip e fornire un nuovo nome set o scartarlo.\n"
 "Appena hai fatto ciò, sarai in grado di importare il nuovo progetto.\n"
 
-#: src/callbacks.c:1366
+#: src/callbacks.c:1381
 #, c-format
 msgid "Importing the project %s as set %s..."
 msgstr "Importazione del progetto %s in corso come set %s..."
 
-#: src/callbacks.c:1386
+#: src/callbacks.c:1399
 msgid "Importing project"
 msgstr "Importazione del progetto in corso"
 
-#: src/callbacks.c:1472
+#: src/callbacks.c:1481
 #, c-format
 msgid "Exporting project %s..."
 msgstr "Esportazione del progetto %s in corso..."
 
-#: src/callbacks.c:1490
+#: src/callbacks.c:1497
 msgid "Exporting project"
 msgstr "Esportazione del progetto in corso"
 
-#: src/callbacks.c:1506
+#: src/callbacks.c:1513
 msgid "Backup as .lv1 file"
 msgstr "Crea un backup come file .lv1"
 
-#: src/callbacks.c:1522
+#: src/callbacks.c:1529
 msgid "Restore .lv1 file"
 msgstr "Ripristina file .lv1"
 
-#: src/callbacks.c:1664
+#: src/callbacks.c:1671
 msgid ""
 "\n"
 "\n"
@@ -1959,74 +1952,79 @@
 "Il set sarà eliminato dal disco.\n"
 "Sei sicuro ?\n"
 
-#: src/callbacks.c:1725
+#: src/callbacks.c:1732
 #, c-format
 msgid "Deleting set %s..."
 msgstr ""
 
-#: src/callbacks.c:1727
+#: src/callbacks.c:1734
 msgid "Deleting set..."
 msgstr "Eliminazione del set in corso..."
 
-#: src/callbacks.c:1731
+#: src/callbacks.c:1738
 msgid "Deleting set"
 msgstr "Eliminazione del set in corso"
 
-#: src/callbacks.c:1739
+#: src/callbacks.c:1746
 #, c-format
 msgid "Set %s was permanently deleted from the disk.\n"
 msgstr "Il set %s è stato eliminato definitivamente dal disco.\n"
 
-#: src/callbacks.c:1787 src/callbacks.c:11764
+#: src/callbacks.c:1792 src/callbacks.c:11676
 msgid "Insert Silence"
 msgstr "Inserisci Silenzio"
 
-#: src/callbacks.c:1840 src/callbacks.c:1923 src/callbacks.c:2086
+#: src/callbacks.c:1844 src/callbacks.c:1927 src/callbacks.c:2089
 msgid "Undoing"
 msgstr "Disfacendo"
 
-#: src/callbacks.c:1936 src/callbacks.c:2147
+#: src/callbacks.c:1940 src/callbacks.c:2150
 msgid "Restoring audio..."
 msgstr "Audio in ripristino ..."
 
-#: src/callbacks.c:1952
+#: src/callbacks.c:1956
 msgid "Clearing frame images"
 msgstr "Pulizia delle immagini dei fotogrammi in corso"
 
-#: src/callbacks.c:1985
+#: src/callbacks.c:1988
 msgid "Deleting excess frames"
 msgstr "Eliminazione dei fotogrammi in eccesso in corso"
 
-#: src/callbacks.c:2229
+#: src/callbacks.c:2232
 #, c-format
 msgid "Length of video is now %d frames at %.3f frames per second.\n"
 msgstr ""
 "La lunghezza del video è adesso di %d fotogrammi a %.3f fotogrammi al "
 "secondo.\n"
 
-#: src/callbacks.c:2233 src/resample.c:683 src/resample.c:2166
+#: src/callbacks.c:2235 src/resample.c:678 src/resample.c:2133
 #, c-format
 msgid "Clipboard was resampled to %d frames.\n"
 msgstr "Gli appunti sono stati ricampionati a %d fotogrammi.\n"
 
-#: src/callbacks.c:2394 src/callbacks.c:2423
+#: src/callbacks.c:2396 src/callbacks.c:2425
 msgid "Redoing"
 msgstr "Rifacimento in corso"
 
-#: src/callbacks.c:2462
-#, c-format
-msgid "Copying frames %d to %d%s to the clipboard..."
+#: src/callbacks.c:2472
+#, fuzzy, c-format
+msgid "Copying frames %d to %d (with sound) to the clipboard..."
+msgstr "Copia dei fotogrammi da %d a %d%s dagli appunti in corso..."
+
+#: src/callbacks.c:2474
+#, fuzzy, c-format
+msgid "Copying frames %d to %d to the clipboard..."
 msgstr "Copia dei fotogrammi da %d a %d%s dagli appunti in corso..."
 
-#: src/callbacks.c:2525
+#: src/callbacks.c:2526
 msgid "Copying to the clipboard"
 msgstr "Copia negli appunti in corso"
 
-#: src/callbacks.c:2600
+#: src/callbacks.c:2601
 msgid "Cut"
 msgstr "Taglia"
 
-#: src/callbacks.c:2641 src/callbacks.c:3068 src/callbacks.c:8026
+#: src/callbacks.c:2641 src/callbacks.c:3063 src/callbacks.c:7631
 #, fuzzy
 msgid "Pulling frames from clipboard"
 msgstr "Togliendo i fotogrammi dal clip"
@@ -2036,15 +2034,15 @@
 msgid "Pasting %d frames to new clip %s..."
 msgstr ""
 
-#: src/callbacks.c:2678
+#: src/callbacks.c:2676
 msgid "Pasting"
 msgstr "Incollamento in corso"
 
-#: src/callbacks.c:2694
+#: src/callbacks.c:2692
 msgid "...added audio..."
 msgstr ""
 
-#: src/callbacks.c:2778
+#: src/callbacks.c:2775
 msgid ""
 "This operation requires resizing or converting of frames.\n"
 "Please install 'convert' from the Image-magick package, and then restart "
@@ -2055,7 +2053,7 @@
 "Per piacere installa 'convert' dal pacchetto Image-magick, e poi riavvia "
 "LiVES.\n"
 
-#: src/callbacks.c:2795
+#: src/callbacks.c:2793
 msgid ""
 "\n"
 "\n"
@@ -2069,7 +2067,7 @@
 "Prova a selezionare tutti i fotogrammi, e poi usa \n"
 "la funzione 'Taglia Audio' dal menu Audio."
 
-#: src/callbacks.c:2819
+#: src/callbacks.c:2817
 msgid ""
 "LiVES cannot insert because the audio rates do not match.\n"
 "Please install 'sox', and try again."
@@ -2077,7 +2075,7 @@
 "LiVES non può inserire perché i rapporti audio non corrispondono.\n"
 "Per favore installa 'sox', e prova ancora."
 
-#: src/callbacks.c:2838
+#: src/callbacks.c:2835
 msgid ""
 "\n"
 "Insertion will cause frames to shift in some multitrack layouts.\n"
@@ -2088,7 +2086,7 @@
 "traccia.\n"
 "Sei sicuro di voler continuare ?\n"
 
-#: src/callbacks.c:2888 src/callbacks.c:11692
+#: src/callbacks.c:2883 src/callbacks.c:11606
 msgid ""
 "\n"
 "Insertion will cause audio to shift in some multitrack layouts.\n"
@@ -2099,11 +2097,11 @@
 "traccia.\n"
 "Sei sicuro di voler continuare ?\n"
 
-#: src/callbacks.c:2996 src/callbacks.c:3025
+#: src/callbacks.c:2987 src/callbacks.c:3016
 msgid "Resampling clipboard audio"
 msgstr "Ricampionando audio appunti"
 
-#: src/callbacks.c:3041
+#: src/callbacks.c:3032
 msgid ""
 "\n"
 "\n"
@@ -2115,7 +2113,7 @@
 "LiVES non è stato in gradi di ricampionare l'audio degli appunti. \n"
 "L'audio degli appunti è stato eliminato.\n"
 
-#: src/callbacks.c:3055
+#: src/callbacks.c:3045
 msgid ""
 "\n"
 "\n"
@@ -2129,30 +2127,30 @@
 "Vuoi continuare con l'inserimento \n"
 "utilizzando l'audio non cambiato ?\n"
 
-#: src/callbacks.c:3137 src/callbacks.c:3311
+#: src/callbacks.c:3132 src/callbacks.c:3299
 #, c-format
 msgid "Inserting %d%s frames from the clipboard..."
 msgstr "Inserimento di %d%s fotogrammi dagli appunti in corso..."
 
-#: src/callbacks.c:3162 src/callbacks.c:3236 src/callbacks.c:3339
+#: src/callbacks.c:3155 src/callbacks.c:3224 src/callbacks.c:3325
 msgid "Inserting"
 msgstr "Inserimento in corso"
 
-#: src/callbacks.c:3193
+#: src/callbacks.c:3187
 #, c-format
 msgid "Inserting %d times from the clipboard%s..."
 msgstr "Inserendo %d volte dagli appunti%s..."
 
-#: src/callbacks.c:3200
+#: src/callbacks.c:3191
 #, c-format
 msgid "Inserting %d frames from the clipboard%s..."
 msgstr "Inserimento di %d fotogrammi dagli appunti%s in corso..."
 
-#: src/callbacks.c:3418
+#: src/callbacks.c:3404
 msgid "Insert"
 msgstr "Inserisci"
 
-#: src/callbacks.c:3486
+#: src/callbacks.c:3471
 msgid ""
 "\n"
 "Deleting all frames will close this file.\n"
@@ -2162,7 +2160,7 @@
 "Eliminare tutti i fotogrammi chiuderà questo file.\n"
 "Sei sicuro ?"
 
-#: src/callbacks.c:3495
+#: src/callbacks.c:3480
 msgid ""
 "\n"
 "Deletion will cause missing frames in some multitrack layouts.\n"
@@ -2173,8 +2171,8 @@
 "traccia.\n"
 "Sei sicuro di voler continuare?\n"
 
-#: src/callbacks.c:3515 src/callbacks.c:10920 src/callbacks.c:11162
-#: src/callbacks.c:11228
+#: src/callbacks.c:3500 src/callbacks.c:10851 src/callbacks.c:11087
+#: src/callbacks.c:11152
 msgid ""
 "\n"
 "Deletion will cause missing audio in some multitrack layouts.\n"
@@ -2184,7 +2182,7 @@
 "L'eliminazione causerà dell'audio mancante in alcuni layout multitraccia.\n"
 "Sei sicuro di voler continuare?\n"
 
-#: src/callbacks.c:3534
+#: src/callbacks.c:3519
 msgid ""
 "\n"
 "Deletion will cause frames to shift in some multitrack layouts.\n"
@@ -2195,7 +2193,7 @@
 "traccia.\n"
 "Sei sicuro di voler continuare ?\n"
 
-#: src/callbacks.c:3553 src/callbacks.c:11210
+#: src/callbacks.c:3538 src/callbacks.c:11134
 msgid ""
 "\n"
 "Deletion will cause audio to shift in some multitrack layouts.\n"
@@ -2206,20 +2204,20 @@
 "multitraccia.\n"
 "Sei sicuro di voler continuare ?\n"
 
-#: src/callbacks.c:3611
+#: src/callbacks.c:3597
 #, c-format
 msgid "Deleting frames %d to %d%s..."
 msgstr "Eliminazione dei fotogrammi da %d a %d%s in corso..."
 
-#: src/callbacks.c:3636
+#: src/callbacks.c:3619
 msgid "Deleting"
 msgstr "Eliminazione in corso"
 
-#: src/callbacks.c:3717
+#: src/callbacks.c:3699
 msgid "Delete"
 msgstr "Elimina"
 
-#: src/callbacks.c:3738
+#: src/callbacks.c:3717
 msgid ""
 "\n"
 "\n"
@@ -2229,7 +2227,7 @@
 "\n"
 "La selezione è bloccata.\n"
 
-#: src/callbacks.c:4092
+#: src/callbacks.c:4056
 msgid ""
 "Ready to record. Use 'control' and cursor keys during playback to record "
 "your performance.\n"
@@ -2241,11 +2239,11 @@
 "(Per annullare, premi 'r' o clicca su Riproduci|Registra Esibizione ancora "
 "prima di riprodurre.)\n"
 
-#: src/callbacks.c:4098
+#: src/callbacks.c:4061
 msgid "Record cancelled.\n"
 msgstr "Registrazione annullata.\n"
 
-#: src/callbacks.c:4237
+#: src/callbacks.c:4197
 #, c-format
 msgid ""
 "\n"
@@ -2258,7 +2256,7 @@
 "Il plugin '%s' riporta:\n"
 "%s\n"
 
-#: src/callbacks.c:4241
+#: src/callbacks.c:4200
 #, c-format
 msgid ""
 "\n"
@@ -2271,7 +2269,7 @@
 "Non è stato possibile trovare il metodo 'init' nel plugin %s.\n"
 "Il plugin può essere corrotto o non installato correttamente."
 
-#: src/callbacks.c:4571
+#: src/callbacks.c:4532
 #, c-format
 msgid ""
 "Saving the set will cause copies of all loaded clips to remain on the disk"
@@ -2282,22 +2280,22 @@
 "Salvare il set farà in modo che copie tutti i clip caricati rimarranno sul "
 "disco%s.\n"
 
-#: src/callbacks.c:4654
+#: src/callbacks.c:4617
 #, c-format
 msgid "Saving set %s"
 msgstr "Salvataggio del set %s in corso"
 
-#: src/callbacks.c:5005
+#: src/callbacks.c:4964
 #, c-format
 msgid "Loading clips from set %s"
 msgstr "Caricamento dei clip dal set %s in corso"
 
-#: src/callbacks.c:5093
+#: src/callbacks.c:5051
 #, c-format
 msgid "%d clips and %d layouts were recovered from set (%s).\n"
 msgstr ""
 
-#: src/callbacks.c:5312
+#: src/callbacks.c:5259
 msgid ""
 "LiVES will attempt to recover some disk space.\n"
 "You should ONLY run this if you have no other copies of LiVES running on "
@@ -2309,24 +2307,24 @@
 "questa macchina.\n"
 "Clicca OK per procedere.\n"
 
-#: src/callbacks.c:5317
+#: src/callbacks.c:5264
 msgid "Cleaning up disk space..."
 msgstr "Pulizia dello spazio del disco in corso..."
 
-#: src/callbacks.c:5387
+#: src/callbacks.c:5334
 msgid "Recovering disk space"
 msgstr ""
 
-#: src/callbacks.c:5439
+#: src/callbacks.c:5386
 #, c-format
 msgid "%s of disk space was recovered.\n"
 msgstr ""
 
-#: src/callbacks.c:5482
+#: src/callbacks.c:5428
 msgid "Resetting frame rates and frame values..."
 msgstr "Resettando i rapporti e i valori dei fotogrammi..."
 
-#: src/callbacks.c:5523
+#: src/callbacks.c:5469
 #, c-format
 msgid ""
 "\n"
@@ -2334,12 +2332,12 @@
 "Internal: %s (%d bpp) / %s\n"
 msgstr ""
 
-#: src/callbacks.c:5525
+#: src/callbacks.c:5471
 msgid "buffered"
 msgstr ""
 
-#: src/callbacks.c:5538 src/callbacks.c:5557 src/callbacks.c:5575
-#: src/callbacks.c:5609
+#: src/callbacks.c:5484 src/callbacks.c:5502 src/callbacks.c:5518
+#: src/callbacks.c:5551
 msgid ""
 "\n"
 "  Opening..."
@@ -2347,7 +2345,7 @@
 "\n"
 "  Apertura in corso..."
 
-#: src/callbacks.c:5545
+#: src/callbacks.c:5490
 #, c-format
 msgid ""
 "\n"
@@ -2356,7 +2354,7 @@
 "\n"
 "(%d virtuale)"
 
-#: src/callbacks.c:5548
+#: src/callbacks.c:5493
 #, c-format
 msgid ""
 "\n"
@@ -2365,7 +2363,7 @@
 "\n"
 "(%d decodificato)"
 
-#: src/callbacks.c:5560 src/callbacks.c:5578 src/callbacks.c:5612
+#: src/callbacks.c:5504 src/callbacks.c:5520 src/callbacks.c:5553
 #, c-format
 msgid ""
 "\n"
@@ -2374,7 +2372,7 @@
 "\n"
 "  %.2f sec."
 
-#: src/callbacks.c:5569
+#: src/callbacks.c:5512
 msgid ""
 "\n"
 "  Unknown"
@@ -2382,23 +2380,23 @@
 "\n"
 "  Sconosciuto"
 
-#: src/callbacks.c:5582 src/callbacks.c:5596
+#: src/callbacks.c:5524 src/callbacks.c:5538
 msgid "unsigned"
 msgstr "non firmato"
 
-#: src/callbacks.c:5583 src/callbacks.c:5597
+#: src/callbacks.c:5525 src/callbacks.c:5539
 msgid "signed"
 msgstr "firmato"
 
-#: src/callbacks.c:5585 src/callbacks.c:5599
+#: src/callbacks.c:5527 src/callbacks.c:5541
 msgid "big-endian"
 msgstr "big-endian"
 
-#: src/callbacks.c:5586 src/callbacks.c:5600
+#: src/callbacks.c:5528 src/callbacks.c:5542
 msgid "little-endian"
 msgstr "little-endian"
 
-#: src/callbacks.c:5588 src/callbacks.c:5602
+#: src/callbacks.c:5530 src/callbacks.c:5544
 #, c-format
 msgid ""
 "  %d Hz %d bit\n"
@@ -2407,7 +2405,7 @@
 "  %d Hz %d bit\n"
 "%s %s"
 
-#: src/callbacks.c:5707
+#: src/callbacks.c:5647
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -2424,15 +2422,15 @@
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA.\n"
 msgstr ""
 
-#: src/callbacks.c:5721
+#: src/callbacks.c:5661
 msgid "A video editor and VJ program."
 msgstr "Un editor video e programma per VJ."
 
-#: src/callbacks.c:5722
+#: src/callbacks.c:5662
 msgid "About LiVES"
 msgstr ""
 
-#: src/callbacks.c:5724
+#: src/callbacks.c:5664
 msgid "translator_credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -2441,7 +2439,7 @@
 "  salsaman https://launchpad.net/~salsaman\n"
 "  supervinx https://launchpad.net/~supervinx"
 
-#: src/callbacks.c:5758
+#: src/callbacks.c:5699
 #, c-format
 msgid ""
 "LiVES Version %s\n"
@@ -2455,7 +2453,7 @@
 "Homepage: http://lives.sourceforge.net"
 msgstr ""
 
-#: src/callbacks.c:6037
+#: src/callbacks.c:5996
 #, fuzzy
 msgid ""
 "\n"
@@ -2467,7 +2465,7 @@
 "Devi installare mplayer per essere in grado di vedere l'anteprima di questo "
 "file.\n"
 
-#: src/callbacks.c:6040
+#: src/callbacks.c:5998
 #, fuzzy
 msgid ""
 "\n"
@@ -2480,223 +2478,214 @@
 "Devi installare mplayer per essere in grado di vedere l'anteprima di questo "
 "file.\n"
 
-#: src/callbacks.c:6423 src/callbacks.c:8289
-msgid ""
-"\n"
-"Loading new audio may cause missing audio in some multitrack layouts.\n"
-"Are you sure you wish to continue ?\n"
-"."
-msgstr ""
-"\n"
-"Caricare del nuovo audio può causare dell'audio mancante in alcuni layout "
-"multi-traccia.\n"
-"Sei sicuro di voler continuare ?\n"
-"\n"
-"."
-
-#: src/callbacks.c:6523
-#, c-format
-msgid "Opening audio %s, type %s..."
-msgstr "Apertura audio %s, tipo %s in corso..."
-
-#: src/callbacks.c:6556 src/saveplay.c:480
-msgid "Opening audio"
-msgstr "Apertura audio in corso"
-
-#: src/callbacks.c:6565 src/callbacks.c:6612 src/callbacks.c:8387
-#: src/callbacks.c:8429 src/callbacks.c:8472 src/callbacks.c:10846
-msgid "Cancelling"
-msgstr "Annullamento in corso"
-
-#: src/callbacks.c:6660 src/callbacks.c:8514 src/callbacks.c:10876
-#: src/callbacks.c:11563
-msgid "Committing audio"
-msgstr "Perpetramento dell'audio in corso"
-
-#: src/callbacks.c:6672 src/callbacks.c:8546
-msgid "New Audio"
-msgstr "Nuovo Audio"
-
-#: src/callbacks.c:6779
+#: src/callbacks.c:6459
 #, c-format
 msgid ""
 "Text was saved as\n"
 "%s\n"
 msgstr ""
 
-#: src/callbacks.c:6951 src/saveplay.c:3618
-#, c-format
-msgid "%d frames are enough !\n"
-msgstr "%d fotogrammi sono sufficienti !\n"
-
-#: src/callbacks.c:7050
+#: src/callbacks.c:6706
 msgid "LiVES: - Encoder debug output"
 msgstr "LiVES: - Output del debug del codificatore"
 
-#: src/callbacks.c:7087 src/gui.c:1922
+#: src/callbacks.c:6743 src/gui.c:1921
 msgid "Fullscreen playback (f)"
 msgstr "Riproduzione a schermo intero (f)"
 
-#: src/callbacks.c:7089
+#: src/callbacks.c:6744
 msgid "Fullscreen playback off (f)"
 msgstr "Riproduzione a schermo intero disattivata (f)"
 
-#: src/callbacks.c:7188 src/callbacks.c:7336 src/callbacks.c:7664
-#: src/callbacks.c:7681 src/gui.c:3712 src/saveplay.c:2467 src/saveplay.c:2501
-#: src/saveplay.c:3115 src/saveplay.c:3220 src/saveplay.c:3239
-#: src/multitrack.c:9340 src/multitrack.c:11060
+#: src/callbacks.c:6841 src/callbacks.c:6983 src/callbacks.c:7283
+#: src/callbacks.c:7298 src/gui.c:3838 src/saveplay.c:2442 src/saveplay.c:2475
+#: src/saveplay.c:3074 src/saveplay.c:3178 src/saveplay.c:3197
+#: src/multitrack.c:9526 src/multitrack.c:11288
 #, c-format
 msgid " (%d %% scale)"
 msgstr ""
 
-#: src/callbacks.c:7190 src/callbacks.c:7338 src/callbacks.c:7666
-#: src/gui.c:3716 src/saveplay.c:2469 src/saveplay.c:2503
+#: src/callbacks.c:6843 src/callbacks.c:6985 src/callbacks.c:7285
+#: src/gui.c:3842 src/saveplay.c:2444 src/saveplay.c:2477
 #, c-format
 msgid "LiVES: - Play Window%s"
 msgstr ""
 
-#: src/callbacks.c:7302 src/gui.c:1907
+#: src/callbacks.c:6950 src/gui.c:1906
 msgid "Double size (d)"
 msgstr "Dimensione doppia (d)"
 
-#: src/callbacks.c:7309
+#: src/callbacks.c:6956
 msgid "Single size (d)"
 msgstr "Dimensione singola (d)"
 
-#: src/callbacks.c:7442 src/callbacks.c:7443
+#: src/callbacks.c:7087 src/callbacks.c:7088
 msgid "Hide the play window (s)"
 msgstr "Nascondi la finestra di riproduzione (s)"
 
-#: src/callbacks.c:7452 src/gui.c:1746
+#: src/callbacks.c:7096 src/gui.c:1744
 msgid "Show the play window (s)"
 msgstr "Mostra la finestra di riproduzione (s)"
 
-#: src/callbacks.c:7453 src/gui.c:1896
+#: src/callbacks.c:7097 src/gui.c:1895
 msgid "Play in separate window (s)"
 msgstr "Riproduci in una finestra separata (s)"
 
-#: src/callbacks.c:7535 src/gui.c:4060 src/saveplay.c:2498
+#: src/callbacks.c:7175 src/gui.c:4169 src/saveplay.c:2472
 msgid "LiVES: - Streaming"
 msgstr ""
 
-#: src/callbacks.c:7778
+#: src/callbacks.c:7388
 msgid "Switch continuous looping off (o)"
 msgstr "Ripetizione continua: off (o)"
 
-#: src/callbacks.c:7785 src/gui.c:1795
+#: src/callbacks.c:7394 src/gui.c:1793
 msgid "Switch continuous looping on (o)"
 msgstr "Ripetizione continua: on (o)"
 
-#: src/callbacks.c:7837
+#: src/callbacks.c:7444
 #, c-format
 msgid "Audio volume (%.2f)"
 msgstr "Volume audio (%.2f)"
 
-#: src/callbacks.c:7876 src/callbacks.c:7877 src/gui.c:3640
+#: src/callbacks.c:7483 src/callbacks.c:7484 src/gui.c:3766
 msgid "Unmute the audio (z)"
 msgstr "Ripristina l'audio (z)"
 
-#: src/callbacks.c:7888 src/callbacks.c:7889 src/gui.c:1808 src/gui.c:3639
+#: src/callbacks.c:7494 src/callbacks.c:7495 src/gui.c:1806 src/gui.c:3765
 msgid "Mute the audio (z)"
 msgstr "Disattiva l'audio (z)"
 
-#: src/callbacks.c:8038
+#: src/callbacks.c:7643
 msgid "Reversing clipboard..."
 msgstr "Invertendo gli appunti..."
 
-#: src/callbacks.c:8052
+#: src/callbacks.c:7657
 msgid "Reversing clipboard"
 msgstr "Invertendo gli appunti"
 
-#: src/callbacks.c:8084
+#: src/callbacks.c:7689
 msgid "LiVES: Load subtitles from..."
 msgstr ""
 
-#: src/callbacks.c:8151 src/saveplay.c:970
+#: src/callbacks.c:7753 src/saveplay.c:956
 #, c-format
 msgid "Loaded subtitle file: %s\n"
 msgstr ""
 
-#: src/callbacks.c:8220
+#: src/callbacks.c:7821
 msgid "Subtitles were erased.\n"
 msgstr ""
 
-#: src/callbacks.c:8239
+#: src/callbacks.c:7843
 msgid "LiVES: - Select Audio File"
 msgstr ""
 
-#: src/callbacks.c:8250
+#: src/callbacks.c:7878 src/callbacks.c:8232
+msgid ""
+"\n"
+"Loading new audio may cause missing audio in some multitrack layouts.\n"
+"Are you sure you wish to continue ?\n"
+"."
+msgstr ""
+"\n"
+"Caricare del nuovo audio può causare dell'audio mancante in alcuni layout "
+"multi-traccia.\n"
+"Sei sicuro di voler continuare ?\n"
+"\n"
+"."
+
+#: src/callbacks.c:7989
+#, c-format
+msgid "Opening audio %s, type %s..."
+msgstr "Apertura audio %s, tipo %s in corso..."
+
+#: src/callbacks.c:8023 src/saveplay.c:477
+msgid "Opening audio"
+msgstr "Apertura audio in corso"
+
+#: src/callbacks.c:8032 src/callbacks.c:8083 src/callbacks.c:8327
+#: src/callbacks.c:8369 src/callbacks.c:8412 src/callbacks.c:10766
+msgid "Cancelling"
+msgstr "Annullamento in corso"
+
+#: src/callbacks.c:8137 src/callbacks.c:8454 src/callbacks.c:10803
+#: src/callbacks.c:11477
+msgid "Committing audio"
+msgstr "Perpetramento dell'audio in corso"
+
+#: src/callbacks.c:8153 src/callbacks.c:8484
+msgid "New Audio"
+msgstr "Nuovo Audio"
+
+#: src/callbacks.c:8194
 msgid "Please set your CD play device in Tools | Preferences | Misc\n"
 msgstr ""
 "Per piacere imposta il tuo dispositivo di riproduzione CD in Strumenti | "
 "Preferenze | Miste\n"
 
-#: src/callbacks.c:8321
+#: src/callbacks.c:8264
 #, c-format
 msgid "Opening CD track %d from %s..."
 msgstr "Apertura della traccia CD %d da %s in corso..."
 
-#: src/callbacks.c:8326
+#: src/callbacks.c:8267
 #, c-format
 msgid "CD track %d"
 msgstr "Traccia CD %d"
 
-#: src/callbacks.c:8373
+#: src/callbacks.c:8313
 msgid "Opening CD track..."
 msgstr "Apertura della traccia CD in corso..."
 
-#: src/callbacks.c:8415 src/callbacks.c:8461
+#: src/callbacks.c:8355 src/callbacks.c:8401
 msgid "Error loading CD track\n"
 msgstr "Errore durante il caricamento della traccia CD\n"
 
-#: src/callbacks.c:8584
+#: src/callbacks.c:8518
 msgid "layout errors"
 msgstr "errori di layout"
 
-#: src/callbacks.c:8595
+#: src/callbacks.c:8529
 msgid "Close _Window"
 msgstr "Chiudi _Finestra"
 
-#: src/callbacks.c:8606
+#: src/callbacks.c:8540
 msgid "Clear _Errors"
 msgstr "Pulisci _Errori"
 
-#: src/callbacks.c:8617
+#: src/callbacks.c:8551
 msgid "_Delete affected layouts"
 msgstr "_Elimina layout affetti"
 
-#: src/callbacks.c:9343 src/callbacks.c:9388
+#: src/callbacks.c:9253 src/callbacks.c:9298
 msgid "Resume"
 msgstr "Riprendi"
 
-#: src/callbacks.c:9344
+#: src/callbacks.c:9254
 msgid ""
 "\n"
 "Paused\n"
 "(click Resume to continue processing)"
 msgstr ""
 
-#: src/callbacks.c:9345 src/callbacks.c:9406
+#: src/callbacks.c:9255 src/callbacks.c:9315
 msgid "paused..."
 msgstr "in pausa..."
 
-#: src/callbacks.c:9372 src/callbacks.c:9418
-msgid "Pause"
-msgstr "Pausa"
-
-#: src/callbacks.c:9374 src/callbacks.c:9421
+#: src/callbacks.c:9284 src/callbacks.c:9333
 msgid "resumed..."
 msgstr "ripreso..."
 
-#: src/callbacks.c:9393
+#: src/callbacks.c:9303
 msgid "Keep"
 msgstr "Mantieni"
 
-#: src/callbacks.c:9396
+#: src/callbacks.c:9305
 msgid "Enough"
 msgstr ""
 
-#: src/callbacks.c:9401
+#: src/callbacks.c:9310
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2709,28 +2698,28 @@
 "(clicca Mantieni per mantenere quello che hai e interrompere)\n"
 "(clicca Riprendi per continuare il processo)"
 
-#: src/callbacks.c:9419
+#: src/callbacks.c:9331
 msgid "Cancel"
 msgstr "Annulla"
 
-#: src/callbacks.c:9558
+#: src/callbacks.c:9478
 msgid "Stop"
 msgstr ""
 
-#: src/callbacks.c:10053 src/multitrack.c:13247
+#: src/callbacks.c:9968 src/multitrack.c:13489
 msgid "LiVES: Selected frame"
 msgstr "LiVES: Fotogramma selezionato"
 
-#: src/callbacks.c:10061
+#: src/callbacks.c:9976
 msgid "_Save frame as..."
 msgstr ""
 
-#: src/callbacks.c:10290
+#: src/callbacks.c:10202
 #, c-format
 msgid "Audio is ahead of video by %.4f secs. at frame %d, with fps %.4f\n"
 msgstr ""
 
-#: src/callbacks.c:10347
+#: src/callbacks.c:10255
 msgid ""
 "\n"
 "\n"
@@ -2739,7 +2728,7 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10353
+#: src/callbacks.c:10261
 msgid ""
 "\n"
 "\n"
@@ -2751,7 +2740,7 @@
 "Devi installare \"xwininfo\" prima di poter usare questa funzione\n"
 "\n"
 
-#: src/callbacks.c:10429 src/callbacks.c:11479
+#: src/callbacks.c:10334 src/callbacks.c:11395
 msgid ""
 "\n"
 "Record time must be greater than 0.\n"
@@ -2759,7 +2748,7 @@
 "\n"
 "Il tempo della registrazione dev'essere maggiore di 0.\n"
 
-#: src/callbacks.c:10440
+#: src/callbacks.c:10346
 msgid ""
 "Capture an External Window:\n"
 "\n"
@@ -2773,11 +2762,11 @@
 "Clicca 'Annulla' per annullare\n"
 "\n"
 
-#: src/callbacks.c:10445
+#: src/callbacks.c:10351
 msgid "External window was released.\n"
 msgstr "La finestra esterna è stata rilasciata.\n"
 
-#: src/callbacks.c:10479
+#: src/callbacks.c:10385
 msgid ""
 "Click on a Window to Capture it\n"
 "Press 'q' to stop recording"
@@ -2785,7 +2774,7 @@
 "Clicca su una finestra per catturarla\n"
 "Premi 'q' per interrompere la registrazione"
 
-#: src/callbacks.c:10513
+#: src/callbacks.c:10419
 #, c-format
 msgid ""
 "\n"
@@ -2801,19 +2790,19 @@
 "Interrompi o 'q' per finire.\n"
 "(Verranno usati in maniera predefinita %.3f fotogrammi al secondo.)\n"
 
-#: src/callbacks.c:10539
+#: src/callbacks.c:10443
 msgid "LiVES was unable to capture this window. Sorry.\n"
 msgstr "LiVES non è stato in grado di catturare questa finestra. Spiacente.\n"
 
-#: src/callbacks.c:10695
+#: src/callbacks.c:10601
 msgid "Export Selected Audio as..."
 msgstr "Esporta Audio Selezionato come..."
 
-#: src/callbacks.c:10699
+#: src/callbacks.c:10604
 msgid "Export Audio as..."
 msgstr "Esporta Audio come..."
 
-#: src/callbacks.c:10714
+#: src/callbacks.c:10619
 msgid ""
 "\n"
 "\n"
@@ -2827,86 +2816,86 @@
 "Clicca 'OK' per esportare alla nuova velocità, o 'Annulla' per esportare al "
 "rapporto originale.\n"
 
-#: src/callbacks.c:10720
+#: src/callbacks.c:10625
 #, c-format
 msgid "Exporting audio frames %d to %d as %s..."
 msgstr "Esportazione dei fotogrammi audio da %d a %d come %s in corso..."
 
-#: src/callbacks.c:10725
+#: src/callbacks.c:10629
 #, c-format
 msgid "Exporting audio as %s..."
 msgstr "Esportazione del file audio come %s..."
 
-#: src/callbacks.c:10751
+#: src/callbacks.c:10655
 msgid "Exporting audio"
 msgstr "Esportazione audio in corso"
 
-#: src/callbacks.c:10782
+#: src/callbacks.c:10695
 msgid "LiVES: - Append Audio File"
 msgstr ""
 
-#: src/callbacks.c:10825
+#: src/callbacks.c:10739
 #, c-format
 msgid "Appending audio file %s..."
 msgstr "Accodamento file audio %s in corso..."
 
-#: src/callbacks.c:10836
+#: src/callbacks.c:10756
 msgid "Appending audio"
 msgstr "Accodamento audio in corso"
 
-#: src/callbacks.c:10892
+#: src/callbacks.c:10818
 msgid "Append Audio"
 msgstr "Accoda Audio"
 
-#: src/callbacks.c:10952
+#: src/callbacks.c:10883
 #, c-format
 msgid "Padding audio to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10954
+#: src/callbacks.c:10885
 #, c-format
 msgid "Trimming audio from %.2f to %.2f seconds..."
 msgstr "Tagliando l'audio da %.2f a %.2f secondi..."
 
-#: src/callbacks.c:10973
+#: src/callbacks.c:10904
 msgid "Trimming/Padding audio"
 msgstr "Riducendo/Espandendo audio"
 
-#: src/callbacks.c:10981
+#: src/callbacks.c:10912
 msgid "Trim/Pad Audio"
 msgstr "Riduci/Espandi Audio"
 
-#: src/callbacks.c:11055
+#: src/callbacks.c:10982
 msgid "Fading audio in"
 msgstr "Aumentando la dissolvenza dell'audio"
 
-#: src/callbacks.c:11056
+#: src/callbacks.c:10983
 msgid "Fade audio in"
 msgstr "Aumenta dissolvenza audio"
 
-#: src/callbacks.c:11061
+#: src/callbacks.c:10987
 msgid "Fading audio out"
 msgstr "Diminuendo la dissolvenza dell'audio"
 
-#: src/callbacks.c:11062
+#: src/callbacks.c:10988
 msgid "Fade audio out"
 msgstr "Diminuisci dissolvenza audio"
 
-#: src/callbacks.c:11085
+#: src/callbacks.c:11011
 #, c-format
 msgid "%s over %.1f seconds..."
 msgstr "%s oltre %.1f secondi..."
 
-#: src/callbacks.c:11087
+#: src/callbacks.c:11013
 #, c-format
 msgid "%s from time %.2f seconds to %.2f seconds..."
 msgstr "%s dal tempo %.2f secondi a %.2f secondi..."
 
-#: src/callbacks.c:11094
+#: src/callbacks.c:11020
 msgid "Fading audio..."
 msgstr "Dissolvenza dell'audio in corso..."
 
-#: src/callbacks.c:11194
+#: src/callbacks.c:11119
 msgid ""
 "\n"
 "Deleting all audio will close this file.\n"
@@ -2916,46 +2905,46 @@
 "Eliminare tutto l'audio chiuderà questo file.\n"
 "Sei sicuro ?"
 
-#: src/callbacks.c:11197
+#: src/callbacks.c:11122
 msgid "Deleting all audio..."
 msgstr "Eliminazione di tutto l'audio in corso..."
 
-#: src/callbacks.c:11203
+#: src/callbacks.c:11127
 #, c-format
 msgid "Deleting audio from %.2f to %.2f seconds..."
 msgstr "Eliminando l'audio da %.2f a %.2f secondi..."
 
-#: src/callbacks.c:11290
+#: src/callbacks.c:11214
 msgid "Deleting Audio"
 msgstr "Eliminazione Audio In Corso"
 
-#: src/callbacks.c:11297
+#: src/callbacks.c:11221
 msgid "Delete Audio"
 msgstr "Elimina audio"
 
-#: src/callbacks.c:11636
+#: src/callbacks.c:11550
 msgid "Record new audio"
 msgstr "Registra nuovo audio"
 
-#: src/callbacks.c:11725
+#: src/callbacks.c:11640
 #, c-format
 msgid "Inserting silence from %.2f to %.2f seconds..."
 msgstr "Inserimento silenzio da %.2f a %.2f secondi in corso..."
 
-#: src/callbacks.c:11754
+#: src/callbacks.c:11666
 msgid "Inserting Silence"
 msgstr "Inserimento Silenzio In Corso"
 
-#: src/merge.c:85
+#: src/merge.c:96
 msgid "LiVES: - Merge"
 msgstr "LiVES: - Unisci"
 
-#: src/merge.c:102
+#: src/merge.c:113
 #, c-format
 msgid "Merge Clipboard [ %d Frames ]       With Selection [ %d Frames ]"
 msgstr "Unisci Appunti [ %d Fotogrammi ] Con Selezione [ %d Fotogrammi ]"
 
-#: src/merge.c:107
+#: src/merge.c:118
 #, c-format
 msgid ""
 "Merge Clipboard [ %d Frames (resampled) ]       With Selection [ %d Frames ]"
@@ -2963,587 +2952,587 @@
 "Unisci Appunti [ %d Fotogrammi (ricampionati) ] Con Selezione [ %d "
 "Fotogrammi ]"
 
-#: src/merge.c:118
+#: src/merge.c:130
 msgid "Align _Starts"
 msgstr "Allinea I_nizi"
 
-#: src/merge.c:123
+#: src/merge.c:135
 msgid "Align _Ends"
 msgstr "Allinea _Finali"
 
-#: src/merge.c:134
+#: src/merge.c:146
 msgid "What to do with extra clipboard frames -"
 msgstr "Cosa fare con fotogrammi appunti extra -"
 
-#: src/merge.c:137
+#: src/merge.c:149
 msgid "_Insert Frames"
 msgstr "_Inserisci Fotogrammi"
 
-#: src/merge.c:143
+#: src/merge.c:155
 msgid "_Drop Frames"
 msgstr "_Abbandona Fotogrammi"
 
-#: src/merge.c:149
+#: src/merge.c:160
 msgid "Number of Times to Loop Clipboard"
 msgstr "Numero di Volte da Mandare In Loop gli Appunti"
 
-#: src/merge.c:160
+#: src/merge.c:171
 msgid "_Loop Clipboard to Fit Selection"
 msgstr "Manda in _Loop gli Appunti per Adattarli alla Selezione"
 
-#: src/merge.c:173
+#: src/merge.c:184
 msgid "_Transition Method:"
 msgstr "Metodo Di _Transizione:"
 
-#: src/merge.c:394
+#: src/merge.c:395
 msgid "Merging clipboard with selection..."
 msgstr "Fusione degli appunti con la selezione in corso..."
 
-#: src/merge.c:551
+#: src/merge.c:539
 msgid "Merge done.\n"
 msgstr "Fusione compiuta.\n"
 
-#: src/gui.c:123
+#: src/gui.c:122
 msgid "_Custom Generators"
 msgstr ""
 
-#: src/gui.c:124
+#: src/gui.c:123
 msgid "_Custom Effects"
 msgstr "Effetti _Personalizzati"
 
-#: src/gui.c:125
+#: src/gui.c:124
 msgid "Custom _Utilities"
 msgstr "U_tilità Personalizzate"
 
-#: src/gui.c:352 src/multitrack.c:5964
+#: src/gui.c:351 src/multitrack.c:6143
 msgid "_File"
 msgstr "_File"
 
-#: src/gui.c:367 src/multitrack.c:5989
+#: src/gui.c:366 src/multitrack.c:6168
 msgid "_Open File/Directory"
 msgstr "_Apri File/Directory"
 
-#: src/gui.c:373
+#: src/gui.c:372
 msgid "O_pen Part of File..."
 msgstr ""
 
-#: src/gui.c:379 src/gui.c:383 src/multitrack.c:6006 src/multitrack.c:6023
-#: src/multitrack.c:6028
+#: src/gui.c:378 src/gui.c:382 src/multitrack.c:6185 src/multitrack.c:6202
+#: src/multitrack.c:6207
 msgid "Open _Location/Stream..."
 msgstr "Apri _Posizione/Flusso..."
 
-#: src/gui.c:393 src/multitrack.c:6016
+#: src/gui.c:392 src/multitrack.c:6195
 msgid "Open _Youtube Clip..."
 msgstr ""
 
-#: src/gui.c:404
+#: src/gui.c:403
 msgid "Import from _dvd/vcd..."
 msgstr ""
 
-#: src/gui.c:413
+#: src/gui.c:412
 msgid "Import from _dvd"
 msgstr ""
 
-#: src/gui.c:416
+#: src/gui.c:415
 msgid "Import from _vcd"
 msgstr ""
 
-#: src/gui.c:419
+#: src/gui.c:418
 msgid "_Import from Firewire"
 msgstr ""
 
-#: src/gui.c:428 src/multitrack.c:6086
+#: src/gui.c:427 src/multitrack.c:6265
 msgid "Import from _Firewire Device (dv)"
 msgstr "Importa da Dispositivo _Firewire (dv)"
 
-#: src/gui.c:429 src/multitrack.c:6094
+#: src/gui.c:428 src/multitrack.c:6273
 msgid "Import from _Firewire Device (hdv)"
 msgstr "Importa da Dispositivo Fire_wire (hdv)"
 
-#: src/gui.c:457
+#: src/gui.c:456
 msgid "_Add Webcam/TV card..."
 msgstr ""
 
-#: src/gui.c:476
+#: src/gui.c:475
 msgid "Add _Unicap Device"
 msgstr ""
 
-#: src/gui.c:486
+#: src/gui.c:485
 msgid "Add Live _Firewire Device"
 msgstr ""
 
-#: src/gui.c:495
+#: src/gui.c:494
 msgid "Add _TV Device"
 msgstr ""
 
-#: src/gui.c:510 src/multitrack.c:6117
+#: src/gui.c:509 src/multitrack.c:6296
 msgid "_Recent Files..."
 msgstr "File _Recenti..."
 
-#: src/gui.c:560 src/multitrack.c:6177
+#: src/gui.c:559 src/multitrack.c:6356
 msgid "_Reload Clip Set..."
 msgstr "_Ricarica Set Clip..."
 
-#: src/gui.c:564 src/multitrack.c:6185
+#: src/gui.c:563 src/multitrack.c:6364
 msgid "Close/Sa_ve All Clips"
 msgstr "Chiudi/Sal_va Tutti I Clip"
 
-#: src/gui.c:575
+#: src/gui.c:574
 msgid "_Encode Clip As..."
 msgstr ""
 
-#: src/gui.c:577
+#: src/gui.c:576
 msgid "Encode _Selection As..."
 msgstr "Salva _Selezione Come..."
 
-#: src/gui.c:584
+#: src/gui.c:583
 msgid "_Close This Clip"
 msgstr "C_hiudi Questo Clip"
 
-#: src/gui.c:595
+#: src/gui.c:594
 msgid "_Backup Clip as .lv1..."
 msgstr "_Crea un Backup Del Clip come .lv1..."
 
-#: src/gui.c:604
+#: src/gui.c:603
 msgid "_Restore Clip from .lv1..."
 msgstr "_Ripristina Clip da .lv1..."
 
-#: src/gui.c:615
+#: src/gui.c:614
 msgid "Encode/Load/Backup _with Sound"
 msgstr "Salva/Carica/Crea Una Copia Di Backup _con Suono"
 
-#: src/gui.c:620
+#: src/gui.c:619
 msgid "Auto load subtitles"
 msgstr ""
 
-#: src/gui.c:628 src/multitrack.c:6224
+#: src/gui.c:627 src/multitrack.c:6403
 msgid "Clean _up Diskspace"
 msgstr "Pu_lisci Spazio Del Disco"
 
-#: src/gui.c:636 src/multitrack.c:6257
+#: src/gui.c:635 src/multitrack.c:6436
 msgid "_Edit"
 msgstr "_Modifica"
 
-#: src/gui.c:685
+#: src/gui.c:684
 msgid "_MULTITRACK mode"
 msgstr "Modalità _MULTI-TRACCIA"
 
-#: src/gui.c:696
+#: src/gui.c:695
 msgid "_Copy Selection"
 msgstr "_Copia Selezione"
 
-#: src/gui.c:705
+#: src/gui.c:704
 msgid "Cu_t Selection"
 msgstr "Ta_glia Selezione"
 
-#: src/gui.c:714
+#: src/gui.c:713
 msgid "_Insert from Clipboard..."
 msgstr "_Inserisci dagli Appunti..."
 
-#: src/gui.c:730
+#: src/gui.c:729
 msgid "Paste as _New"
 msgstr "Incolla come _Nuovo"
 
-#: src/gui.c:739
+#: src/gui.c:738
 msgid "_Merge Clipboard with Selection..."
 msgstr "_Fondi Appunti con la Selezione..."
 
-#: src/gui.c:746
+#: src/gui.c:745
 msgid "_Delete Selection"
 msgstr "_Elimina Selezione"
 
-#: src/gui.c:764
+#: src/gui.c:763
 msgid "Decouple _Video from Audio"
 msgstr "Scindi _Video da Audio"
 
-#: src/gui.c:772
+#: src/gui.c:771
 msgid "_Select..."
 msgstr "_Seleziona..."
 
-#: src/gui.c:786
+#: src/gui.c:785
 msgid "Select _All Frames"
 msgstr "Seleziona _Tutti I Fotogrammi"
 
-#: src/gui.c:794
+#: src/gui.c:793
 msgid "_Start Frame Only"
 msgstr "Solamente Il Fotogramma _Iniziale"
 
-#: src/gui.c:802
+#: src/gui.c:801
 msgid "_End Frame Only"
 msgstr "Solamente Il Fotogramma _Finale"
 
-#: src/gui.c:813
+#: src/gui.c:812
 msgid "Select from _First Frame"
 msgstr "Seleziona dal _Primo Fotogramma"
 
-#: src/gui.c:817
+#: src/gui.c:816
 msgid "Select to _Last Frame"
 msgstr "Seleziona dall'_Ultimo Fotogramma"
 
-#: src/gui.c:821
+#: src/gui.c:820
 msgid "Select Last Insertion/_Merge"
 msgstr "Seleziona Ultima Inser_zione/Fusione"
 
-#: src/gui.c:825
+#: src/gui.c:824
 msgid "Select Last _Effect"
 msgstr "Seleziona Ultimo _Effetto"
 
-#: src/gui.c:829
+#: src/gui.c:828
 msgid "_Invert Selection"
 msgstr "_Inverti Selezione"
 
-#: src/gui.c:837
+#: src/gui.c:836
 msgid "_Lock Selection Width"
 msgstr "_Blocca Larghezza Selezione"
 
-#: src/gui.c:842 src/multitrack.c:6409
+#: src/gui.c:841 src/multitrack.c:6591
 msgid "_Play"
 msgstr "_Riproduci"
 
-#: src/gui.c:854
+#: src/gui.c:853
 msgid "_Play All"
 msgstr "Ri_produci Tutto"
 
-#: src/gui.c:869
+#: src/gui.c:868
 msgid "Pla_y Selection"
 msgstr "Ripro_duci Selezione"
 
-#: src/gui.c:877
+#: src/gui.c:876
 msgid "Play _Clipboard"
 msgstr "Riproduci _Appunti"
 
-#: src/gui.c:899 src/multitrack.c:6441
+#: src/gui.c:898 src/multitrack.c:6623
 msgid "_Stop"
 msgstr "_Interrompi"
 
-#: src/gui.c:914 src/multitrack.c:6453
+#: src/gui.c:913 src/multitrack.c:6635
 msgid "Re_wind"
 msgstr "Riav_volgi"
 
-#: src/gui.c:946 src/multitrack.c:6471
+#: src/gui.c:945 src/multitrack.c:6653
 msgid "_Full Screen"
 msgstr "_Schermo Intero"
 
-#: src/gui.c:955
+#: src/gui.c:954
 msgid "_Double Size"
 msgstr "Dimensione _Doppia"
 
-#: src/gui.c:963 src/multitrack.c:6479
+#: src/gui.c:962 src/multitrack.c:6661
 msgid "Play in _Separate Window"
 msgstr "Riproduci in una Finestra _Separata"
 
-#: src/gui.c:972
+#: src/gui.c:971
 msgid "_Blank Background"
 msgstr "Sfondo _Vuoto"
 
-#: src/gui.c:979
+#: src/gui.c:978
 msgid "(Auto)_loop Video (to fit audio track)"
 msgstr ""
 "Manda In _Loop (Automaticamente) il Video (per adattarlo alla traccia audio)"
 
-#: src/gui.c:988 src/multitrack.c:6487
+#: src/gui.c:987 src/multitrack.c:6669
 msgid "L_oop Continuously"
 msgstr "R_ipeti Continuamente"
 
-#: src/gui.c:997
+#: src/gui.c:996
 msgid "Pin_g Pong Loops"
 msgstr "Riproduzioni Pin_g Pong"
 
-#: src/gui.c:1005 src/multitrack.c:6495
+#: src/gui.c:1004 src/multitrack.c:6677
 msgid "_Mute"
 msgstr "_Silenzioso"
 
-#: src/gui.c:1017
+#: src/gui.c:1016
 msgid "Separate Window 'S_ticky' Mode"
 msgstr "Separa Modalità 'A_ppiccicosa' Finestra"
 
-#: src/gui.c:1025
+#: src/gui.c:1024
 msgid "S_how Frame Counter"
 msgstr "_Mostrare contatore fotogrammi"
 
-#: src/gui.c:1035
+#: src/gui.c:1034
 msgid "Show Subtitles"
 msgstr ""
 
-#: src/gui.c:1045
+#: src/gui.c:1044
 msgid "Letterbox mode"
 msgstr ""
 
-#: src/gui.c:1051 src/multitrack.c:6507
+#: src/gui.c:1050 src/multitrack.c:6689
 msgid "Effect_s"
 msgstr "Ef_fetti"
 
-#: src/gui.c:1054
+#: src/gui.c:1053
 msgid "Effects are applied to the current selection."
 msgstr "Gli effetti sono applicati alla selezione attuale."
 
-#: src/gui.c:1067
+#: src/gui.c:1066
 msgid "_Run Test Rendered Effect/Tool/Generator..."
 msgstr "_Avvia Effetto Renderizzato/Strumento/Generatore..."
 
-#: src/gui.c:1072 src/multitrack.c:7123
+#: src/gui.c:1071 src/multitrack.c:7299
 msgid "_Tools"
 msgstr "_Strumenti"
 
-#: src/gui.c:1075
+#: src/gui.c:1074
 msgid "Tools are applied to complete clips."
 msgstr "Gli strumenti vengono applicati per completare i clip."
 
-#: src/gui.c:1085
+#: src/gui.c:1084
 msgid "_Reverse Clipboard"
 msgstr "_Inverti Appunti"
 
-#: src/gui.c:1094
+#: src/gui.c:1093
 msgid "_Change Playback/Save Speed..."
 msgstr "_Cambia Velocità di Salvataggio/Riproduzione..."
 
-#: src/gui.c:1099
+#: src/gui.c:1098
 msgid "Resample _Video to New Frame Rate..."
 msgstr "Ricampiona il _Video al Nuovo Rapporto Dei Fotogrammi..."
 
-#: src/gui.c:1105
+#: src/gui.c:1104
 msgid "_Utilities"
 msgstr "_Utilità"
 
-#: src/gui.c:1110
+#: src/gui.c:1109
 msgid "Custom _Tools"
 msgstr "Stru_menti Personalizzati"
 
-#: src/gui.c:1116 src/multitrack.c:7149
+#: src/gui.c:1115 src/multitrack.c:7325
 msgid "_Generate"
 msgstr "_Genera"
 
-#: src/gui.c:1126
+#: src/gui.c:1125
 msgid "Loading rendered effect plugins..."
 msgstr "Caricando i plugin degli effetti renderizzati..."
 
-#: src/gui.c:1139
+#: src/gui.c:1138
 msgid "Load _Subtitles from File..."
 msgstr ""
 
-#: src/gui.c:1144
+#: src/gui.c:1143
 msgid "Erase subtitles"
 msgstr ""
 
-#: src/gui.c:1152 src/multitrack.c:7158
+#: src/gui.c:1151 src/multitrack.c:7334
 msgid "Capture _External Window... "
 msgstr "Cattura Finestra _Esterna... "
 
-#: src/gui.c:1159 src/multitrack.c:7173
+#: src/gui.c:1158 src/multitrack.c:7349
 msgid "_Preferences..."
 msgstr "_Preferenze..."
 
-#: src/gui.c:1172
+#: src/gui.c:1171
 msgid "_Audio"
 msgstr "_Audio"
 
-#: src/gui.c:1184
+#: src/gui.c:1183
 msgid "Load _New Audio for Clip..."
 msgstr "Carica _Nuovo Audio per il Clip..."
 
-#: src/gui.c:1190
+#: src/gui.c:1189
 msgid "Load _CD Track..."
 msgstr "Carica Traccia _CD..."
 
-#: src/gui.c:1191
+#: src/gui.c:1190
 msgid "E_ject CD"
 msgstr "E_spelli CD"
 
-#: src/gui.c:1205
+#: src/gui.c:1204
 msgid "Record E_xternal Audio..."
 msgstr "Regista Audio Es_terno..."
 
-#: src/gui.c:1218
+#: src/gui.c:1217
 msgid "to New _Clip..."
 msgstr "nel Nuovo _Clip..."
 
-#: src/gui.c:1222
+#: src/gui.c:1221
 msgid "to _Selection"
 msgstr "nella _Selezione"
 
-#: src/gui.c:1230
+#: src/gui.c:1229
 msgid "Fade Audio _In..."
 msgstr "_Aumenta Dissolvenza Audio..."
 
-#: src/gui.c:1234
+#: src/gui.c:1233
 msgid "Fade Audio _Out..."
 msgstr "_Diminuisci Dissolvenza Audio..."
 
-#: src/gui.c:1244
+#: src/gui.c:1243
 msgid "_Export Audio..."
 msgstr "_Esporta Audio..."
 
-#: src/gui.c:1257
+#: src/gui.c:1256
 msgid "Export _Selected Audio..."
 msgstr "Esporta Audio _Selezionato..."
 
-#: src/gui.c:1261
+#: src/gui.c:1260
 msgid "Export _All Audio..."
 msgstr "Esporta _Tutto L'Audio..."
 
-#: src/gui.c:1265
+#: src/gui.c:1264
 msgid "_Append Audio..."
 msgstr "_Accoda Audio..."
 
-#: src/gui.c:1270
+#: src/gui.c:1269
 msgid "_Trim/Pad Audio..."
 msgstr "_Riduci/Ingrandisci Audio..."
 
-#: src/gui.c:1283
+#: src/gui.c:1282
 msgid "Trim/Pad Audio to _Selection"
 msgstr "Riduci/Ingrandisci Audio nella _Selezione"
 
-#: src/gui.c:1288
+#: src/gui.c:1287
 msgid "Trim/Pad Audio from Beginning to _Play Start"
 msgstr "Riduci/Ingrandisci Audio dall'Inizio all'Avvio Della _Riproduzione"
 
-#: src/gui.c:1293
+#: src/gui.c:1292
 msgid "_Delete Audio..."
 msgstr "_Elimina Audio..."
 
-#: src/gui.c:1306
+#: src/gui.c:1305
 msgid "Delete _Selected Audio"
 msgstr "Elimina Audio _Selezionato"
 
-#: src/gui.c:1310
+#: src/gui.c:1309
 msgid "Delete _All Audio"
 msgstr "Elimina _Tutto L'Audio"
 
-#: src/gui.c:1314
+#: src/gui.c:1313
 msgid "Insert _Silence in Selection"
 msgstr "Inserisci _Silenzio nella Selezione"
 
-#: src/gui.c:1319
+#: src/gui.c:1318
 msgid "_Resample Audio..."
 msgstr "_Ricampiona Audio..."
 
-#: src/gui.c:1324
+#: src/gui.c:1323
 msgid "_Info"
 msgstr "_Informazioni"
 
-#: src/gui.c:1336
+#: src/gui.c:1335
 msgid "Show Clip _Info"
 msgstr "Mostra _Informazioni Clip"
 
-#: src/gui.c:1344
+#: src/gui.c:1343
 msgid "Show/_Edit File Comments"
 msgstr "Mostra/_Modifica Commenti File"
 
-#: src/gui.c:1349
+#: src/gui.c:1348
 msgid "Show _Clipboard Info"
 msgstr "Mostra Informazioni _Appunti"
 
-#: src/gui.c:1360 src/multitrack.c:7286
+#: src/gui.c:1359 src/multitrack.c:7462
 msgid "Show _Messages"
 msgstr "Mostra M_essaggi"
 
-#: src/gui.c:1364 src/multitrack.c:7365
+#: src/gui.c:1363 src/multitrack.c:7541
 msgid "Show _Layout Errors"
 msgstr "Mostra Errori _Layout"
 
-#: src/gui.c:1369 src/multitrack.c:7263
+#: src/gui.c:1368 src/multitrack.c:7439
 msgid "_Clips"
 msgstr "_Clip"
 
-#: src/gui.c:1381
+#: src/gui.c:1380
 msgid "_Rename Current Clip in Menu..."
 msgstr "_Rinomina Clip Corrente nel Menu..."
 
-#: src/gui.c:1399
+#: src/gui.c:1398
 msgid "A_dvanced"
 msgstr "A_vanzate"
 
-#: src/gui.c:1412
+#: src/gui.c:1411
 msgid "_RFX Effects/Tools/Utilities"
 msgstr "Effetti _RFX/Strumenti/Utilità"
 
-#: src/gui.c:1424
+#: src/gui.c:1423
 msgid "_New Test RFX Script..."
 msgstr "_Nuovo Script Di Test RFX..."
 
-#: src/gui.c:1428
+#: src/gui.c:1427
 msgid "_Copy RFX Script to Test..."
 msgstr "_Copia Script RFX nel Test..."
 
-#: src/gui.c:1432
+#: src/gui.c:1431
 msgid "_Edit Test RFX Script..."
 msgstr "_Modifica Script Test RFX..."
 
-#: src/gui.c:1436
+#: src/gui.c:1435
 msgid "Rena_me Test RFX Script..."
 msgstr "Ri_nomina Script Test RFX..."
 
-#: src/gui.c:1440
+#: src/gui.c:1439
 msgid "_Delete Test RFX Script..."
 msgstr "_Elimina Script Test RFX..."
 
-#: src/gui.c:1450
+#: src/gui.c:1449
 msgid "_Promote Test Rendered Effect/Tool/Generator..."
 msgstr "_Promuovi Effetto Renderizzato Test/Strumento/Generatore..."
 
-#: src/gui.c:1457
+#: src/gui.c:1456
 msgid "_Import Custom RFX script..."
 msgstr "_Importa script RFX Personalizzato..."
 
-#: src/gui.c:1461
+#: src/gui.c:1460
 msgid "E_xport Custom RFX script..."
 msgstr "E_sporta script RFX Personalizzato..."
 
-#: src/gui.c:1465
+#: src/gui.c:1464
 msgid "De_lete Custom RFX Script..."
 msgstr "Eli_mina script RFX Personalizzato..."
 
-#: src/gui.c:1472
+#: src/gui.c:1471
 msgid "Re_build all RFX plugins"
 msgstr "Ri_costruisci tutti i plugin RFX"
 
-#: src/gui.c:1501
+#: src/gui.c:1498
 msgid "Receive _LiVES stream from..."
 msgstr "Ricevi flusso _LiVES da..."
 
-#: src/gui.c:1506
+#: src/gui.c:1503
 msgid "_Send LiVES stream to..."
 msgstr "_Invia flusso LiVES a..."
 
-#: src/gui.c:1515
+#: src/gui.c:1512
 #, c-format
 msgid "Open _yuv4mpeg stream on %sstream.yuv..."
 msgstr "Apri flusso _yuv4mpeg in %sstream.yuv..."
 
-#: src/gui.c:1536
+#: src/gui.c:1534
 msgid "_Import Project (.lv2)..."
 msgstr "_Importa Progetto (.lv2)..."
 
-#: src/gui.c:1540
+#: src/gui.c:1538
 msgid "E_xport Project (.lv2)..."
 msgstr "E_sporta Progetto (.lv2)..."
 
-#: src/gui.c:1545
+#: src/gui.c:1543
 msgid "_VJ"
 msgstr "_VJ"
 
-#: src/gui.c:1557
+#: src/gui.c:1555
 msgid "Real Time _Effect Mapping"
 msgstr "Mappatura _Effetto In Tempo Reale"
 
-#: src/gui.c:1563
+#: src/gui.c:1561
 msgid "Bind real time effects to ctrl-number keys."
 msgstr "Lega gli effetti in tempo reale ai tasti ctrl-numero."
 
-#: src/gui.c:1565
+#: src/gui.c:1563
 msgid "Set Real Time Effect _Defaults"
 msgstr "Imposta I _Predefiniti Dell'Effetto In Tempo Reale"
 
-#: src/gui.c:1567
+#: src/gui.c:1565
 msgid "Set default parameter values for real time effects."
 msgstr ""
 "Imposta i valori dei parametri predefiniti per gli effetti in tempo reale."
 
-#: src/gui.c:1580
+#: src/gui.c:1578
 msgid "Save Real Time Effect _Defaults"
 msgstr "Salva I _Predefiniti Dell'Effetto In Tempo Reale"
 
-#: src/gui.c:1583
+#: src/gui.c:1581
 msgid ""
 "Save real time effect defaults so they will be restored each time you use "
 "LiVES."
@@ -3551,146 +3540,146 @@
 "Salva i predefiniti degli effetti in tempo reale così verranno ripristinati "
 "ogni volta che usi LiVES."
 
-#: src/gui.c:1589
+#: src/gui.c:1587
 msgid "_Reset all playback speeds and positions"
 msgstr "_Azzera tutte le velocità e posizioni di riproduzione"
 
-#: src/gui.c:1592
+#: src/gui.c:1590
 msgid ""
 "Reset all playback positions to frame 1, and reset all playback frame rates."
 msgstr ""
 "Reimposta tutte le posizioni di riproduzione al fotogramma 1, e azzera tutti "
 "i rapporti dei fotogrammi di riproduzione."
 
-#: src/gui.c:1594
+#: src/gui.c:1592
 msgid "_MIDI/joystick interface"
 msgstr "Interfaccia _MIDI/joystick"
 
-#: src/gui.c:1609
+#: src/gui.c:1607
 msgid "_MIDI/joystick learner..."
 msgstr "Studente _MIDI/joystick..."
 
-#: src/gui.c:1614
+#: src/gui.c:1612
 msgid "_Save device mapping..."
 msgstr "_Salva mappatore dispositivo..."
 
-#: src/gui.c:1620
+#: src/gui.c:1618
 msgid "_Load device mapping..."
 msgstr "_Carica mappatore dispositivo..."
 
-#: src/gui.c:1628
+#: src/gui.c:1626
 msgid "Show VJ _Keys"
 msgstr "Mostra _Tasti VJ"
 
-#: src/gui.c:1632
+#: src/gui.c:1630
 msgid "To_ys"
 msgstr "_Giocattoli"
 
-#: src/gui.c:1644
+#: src/gui.c:1642
 msgid "_None"
 msgstr "_Niente"
 
-#: src/gui.c:1652
+#: src/gui.c:1650
 msgid "_Autolives"
 msgstr ""
 
-#: src/gui.c:1657
+#: src/gui.c:1655
 msgid "_Mad Frames"
 msgstr "Fotogrammi _Impazziti"
 
-#: src/gui.c:1662
+#: src/gui.c:1660
 msgid "_LiVES TV (broadband)"
 msgstr "_LiVES TV (banda larga)"
 
-#: src/gui.c:1672 src/multitrack.c:7387
+#: src/gui.c:1670 src/multitrack.c:7563
 msgid "_Help"
 msgstr "_Aiuto"
 
-#: src/gui.c:1684 src/multitrack.c:7407
+#: src/gui.c:1682 src/multitrack.c:7583
 msgid "_Manual (opens in browser)"
 msgstr "_Manuale (verrà aperto nel browser)"
 
-#: src/gui.c:1691 src/multitrack.c:7416
+#: src/gui.c:1689 src/multitrack.c:7592
 msgid "_Donate to the project !"
 msgstr "_Dona al progetto !"
 
-#: src/gui.c:1695 src/multitrack.c:7420
+#: src/gui.c:1693 src/multitrack.c:7596
 msgid "_Email the author"
 msgstr "_Contatta l'autore"
 
-#: src/gui.c:1699 src/multitrack.c:7424
+#: src/gui.c:1697 src/multitrack.c:7600
 msgid "Report a _bug"
 msgstr "Segnala un _bug"
 
-#: src/gui.c:1703 src/multitrack.c:7428
+#: src/gui.c:1701 src/multitrack.c:7604
 msgid "Suggest a _feature"
 msgstr "Suggerisci una _funzione"
 
-#: src/gui.c:1707 src/multitrack.c:7432
+#: src/gui.c:1705 src/multitrack.c:7608
 msgid "Assist with _translating"
 msgstr "Aiuta con le _traduzioni"
 
-#: src/gui.c:1714 src/multitrack.c:7439
+#: src/gui.c:1712 src/multitrack.c:7615
 msgid "_Troubleshoot"
 msgstr "_Risoluzione problemi"
 
-#: src/gui.c:1718 src/multitrack.c:7443
+#: src/gui.c:1716 src/multitrack.c:7619
 msgid "_About"
 msgstr "_Riguardo A..."
 
-#: src/gui.c:1752
+#: src/gui.c:1750
 msgid "Rewind to start (w)"
 msgstr "Riavvolgi all'inizio (w)"
 
-#: src/gui.c:1760 src/multitrack.c:16720
+#: src/gui.c:1758 src/multitrack.c:17010
 msgid "Play all (p)"
 msgstr "Riproduci tutto (p)"
 
-#: src/gui.c:1768 src/gui.c:1877
+#: src/gui.c:1766 src/gui.c:1876
 msgid "Stop playback (q)"
 msgstr "Interrompi riproduzione (q)"
 
-#: src/gui.c:1779
+#: src/gui.c:1777
 msgid "Play selection (y)"
 msgstr "Riproduci selezione (y)"
 
-#: src/gui.c:1832
+#: src/gui.c:1829
 msgid "Volume"
 msgstr "Volume"
 
-#: src/gui.c:1854
+#: src/gui.c:1853
 msgid "Audio volume (1.00)"
 msgstr "Volume audio (1.00)"
 
-#: src/gui.c:1883
+#: src/gui.c:1882
 msgid "Unblank background (b)"
 msgstr "Rendi non vuoto lo sfondo (b)"
 
-#: src/gui.c:1929
+#: src/gui.c:1928
 msgid "Play slower (ctrl-down)"
 msgstr "Riproduci più lentamente (ctrl-giù)"
 
-#: src/gui.c:1935
+#: src/gui.c:1934
 msgid "Play faster (ctrl-up)"
 msgstr "Riproduci più velocemente (ctrl-su)"
 
-#: src/gui.c:1942
+#: src/gui.c:1941
 msgid "Skip back (ctrl-left)"
 msgstr "Manda indietro (ctrl-sinistra)"
 
-#: src/gui.c:1948
+#: src/gui.c:1947
 msgid "Skip forward (ctrl-right)"
 msgstr "Manda avanti (ctrl-destra)"
 
-#: src/gui.c:1954
+#: src/gui.c:1953
 msgid "Show clip info (i)"
 msgstr "Mostra informazioni clip (i)"
 
-#: src/gui.c:1960
+#: src/gui.c:1959
 msgid "Hide this toolbar"
 msgstr "Nascondi questa barra degli strumenti"
 
-#: src/gui.c:1962
+#: src/gui.c:1961
 msgid ""
 "Press \"s\" to toggle separate play window for improved performance, \"q\" "
 "to stop."
@@ -3699,177 +3688,177 @@
 "performance migliorata, \"q\" per interrompere."
 
 #. TRANSLATORS: please keep the translated string the same length
-#: src/gui.c:1995
+#: src/gui.c:1994
 msgid "     Video playback speed (frames per second)        "
 msgstr ""
 "     Velocità di riproduzione del video (fotogrammi al secondo)        "
 
-#: src/gui.c:2009
+#: src/gui.c:2008
 msgid "Vary the video speed"
 msgstr "Varia la velocità del video"
 
-#: src/gui.c:2092 src/gui.c:3218
+#: src/gui.c:2090 src/gui.c:3329
 msgid "First Frame"
 msgstr "Primo Fotogramma"
 
-#: src/gui.c:2193 src/gui.c:3226
+#: src/gui.c:2191 src/gui.c:3336
 msgid "Last Frame"
 msgstr "Ultimo Fotogramma"
 
-#: src/gui.c:2210
+#: src/gui.c:2208
 msgid "The first selected frame in this clip"
 msgstr "Il primo fotogramma selezionato in questo clip"
 
-#: src/gui.c:2248
+#: src/gui.c:2246
 msgid "The last selected frame in this clip"
 msgstr "L'ultimo fotogramma selezionato in questo clip"
 
-#: src/gui.c:2532
+#: src/gui.c:2546
 msgid "Starting...\n"
 msgstr "Avvio in corso...\n"
 
-#: src/gui.c:3074
+#: src/gui.c:3181
 msgid "    Press 'q' to stop recording.  DO NOT COVER THE PLAY WINDOW !   "
 msgstr ""
 "    Premi 'q' per fermare la registrazione.  NON COPRIRE LA FINESTRA DI "
 "RIPRODUZIONE !   "
 
-#: src/gui.c:3521
+#: src/gui.c:3643
 msgid "Frame number to preview"
 msgstr "Numero di fotogrammi da vedere in anteprima"
 
-#: src/gui.c:3538
+#: src/gui.c:3660
 msgid "_Free"
 msgstr "_Libero"
 
-#: src/gui.c:3539
+#: src/gui.c:3661
 msgid "Free choice of frame number"
 msgstr "Scelta libera del numero di fotogrammi"
 
-#: src/gui.c:3543
+#: src/gui.c:3666
 msgid "_Start"
 msgstr "_Inizio"
 
-#: src/gui.c:3544
+#: src/gui.c:3667
 msgid "Frame number is linked to start frame"
 msgstr "Il numero di fotogrammi è collegato al fotogramma di partenza"
 
-#: src/gui.c:3551
+#: src/gui.c:3675
 msgid "_End"
 msgstr "_Fine"
 
-#: src/gui.c:3552
+#: src/gui.c:3676
 msgid "Frame number is linked to end frame"
 msgstr "Il numero di fotogrammi è collegato al fotogramma finale"
 
-#: src/gui.c:3559
+#: src/gui.c:3684
 msgid "_Pointer"
 msgstr "_Puntatore"
 
-#: src/gui.c:3560
+#: src/gui.c:3685
 msgid "Frame number is linked to playback pointer"
 msgstr "Il numero di fotogrammi è collegato al puntatore di riproduzione"
 
-#: src/gui.c:3581
+#: src/gui.c:3707
 msgid "Rewind"
 msgstr "Riavvolgi"
 
-#: src/gui.c:3592 src/dialogs.c:894 src/dialogs.c:896 src/dialogs.c:1817
-#: src/dialogs.c:1819
+#: src/gui.c:3718 src/dialogs.c:960 src/dialogs.c:962 src/dialogs.c:1873
+#: src/dialogs.c:1875
 msgid "Play all"
 msgstr "Riproduci tutto"
 
-#: src/gui.c:3605
+#: src/gui.c:3731
 msgid "Play Selection"
 msgstr "Riproduci Selezione"
 
-#: src/gui.c:3619
+#: src/gui.c:3745
 msgid "Loop On/Off"
 msgstr "Loop On/Off"
 
-#: src/gui.c:3693
+#: src/gui.c:3819
 msgid "Start _recording"
 msgstr "Incomincia la re_gistrazione"
 
-#: src/gui.c:3698
+#: src/gui.c:3824
 msgid "Stop _recording"
 msgstr "Interrompi la _registrazione"
 
-#: src/gui.c:3703
+#: src/gui.c:3829
 msgid "_Record Performance"
 msgstr "_Registra Esibizione"
 
-#: src/gui.c:3851
+#: src/gui.c:3974
 msgid "Hide Play Window"
 msgstr "Nascondi Finestra Di Riproduzione"
 
-#: src/gui.c:4232
+#: src/gui.c:4333
 msgid "Show Play Window"
 msgstr "Mostra Finestra Di Riproduzione"
 
-#: src/ce_thumbs.c:222
+#: src/ce_thumbs.c:242
 #, c-format
 msgid "Mapped to ctrl-%d"
 msgstr ""
 
-#: src/ce_thumbs.c:276 src/effects.c:85 src/preferences.c:3195
+#: src/ce_thumbs.c:296 src/effects.c:86 src/preferences.c:3247
 msgid "Effects"
 msgstr "Effetti"
 
-#: src/ce_thumbs.c:279 src/multitrack.c:5615
+#: src/ce_thumbs.c:299 src/multitrack.c:5791
 msgid "Clips"
 msgstr "Clip"
 
-#: src/ce_thumbs.c:303
+#: src/ce_thumbs.c:323
 #, fuzzy, c-format
 msgid "Show / apply effects to %s\n"
 msgstr "Disattiva tutti gli effetti."
 
-#: src/ce_thumbs.c:315
+#: src/ce_thumbs.c:335
 #, fuzzy, c-format
 msgid "Select clip for %s\n"
 msgstr "_Elimina set clip"
 
-#: src/ce_thumbs.c:515
+#: src/ce_thumbs.c:536
 msgid "_Pin"
 msgstr ""
 
-#: src/ce_thumbs.c:515
+#: src/ce_thumbs.c:537
 msgid "Pin the parameter box to the window"
 msgstr ""
 
 #. TRANSLATORS: Exabytes
-#: src/utils.c:794
+#: src/utils.c:800
 #, c-format
 msgid "%.2f EB"
 msgstr ""
 
 #. TRANSLATORS: Petabytes
-#: src/utils.c:798
+#: src/utils.c:803
 #, c-format
 msgid "%.2f PB"
 msgstr ""
 
 #. TRANSLATORS: Terabytes
-#: src/utils.c:802
+#: src/utils.c:806
 #, c-format
 msgid "%.2f TB"
 msgstr ""
 
 #. TRANSLATORS: Gigabytes
-#: src/utils.c:806
+#: src/utils.c:809
 #, c-format
 msgid "%.2f GB"
 msgstr ""
 
 #. TRANSLATORS: Megabytes
-#: src/utils.c:810
+#: src/utils.c:812
 #, c-format
 msgid "%.2f MB"
 msgstr ""
 
 #. TRANSLATORS: Kilobytes (1024 bytes)
-#: src/utils.c:814
+#: src/utils.c:815
 #, c-format
 msgid "%.2f KiB"
 msgstr ""
@@ -3879,7 +3868,7 @@
 msgid "%d bytes"
 msgstr ""
 
-#: src/utils.c:1841
+#: src/utils.c:1835
 msgid "Clearing the clipboard"
 msgstr "Pulizia degli appunti"
 
@@ -3894,7 +3883,7 @@
 "==============================\n"
 "Scambiato con il clip %s\n"
 
-#: src/utils.c:1880
+#: src/utils.c:1877
 msgid ""
 "\n"
 "==============================\n"
@@ -3904,11 +3893,11 @@
 "==============================\n"
 "Scambiato con un clip vuoto\n"
 
-#: src/utils.c:1917
+#: src/utils.c:1916
 msgid "(blank)"
 msgstr "(vuoto)"
 
-#: src/utils.c:1920
+#: src/utils.c:1919
 #, c-format
 msgid ""
 "The set name has been changed from %s to %s. Affected layouts have been "
@@ -3917,7 +3906,7 @@
 "Il nome del set è stato cambiato da %s a %s. I layout affetti sono stati "
 "aggiornati in maniera pertinente\n"
 
-#: src/utils.c:1928
+#: src/utils.c:1927
 #, c-format
 msgid ""
 "The clip %s is missing from this set.\n"
@@ -3926,7 +3915,7 @@
 "Il clip %s manca in questo set.\n"
 "È richiesto dai layout seguenti:\n"
 
-#: src/utils.c:1932
+#: src/utils.c:1931
 #, c-format
 msgid ""
 "The clip %s has been closed.\n"
@@ -3935,7 +3924,7 @@
 "Il clip %s è stato chiuso.\n"
 "È richiesto dai layout seguenti:\n"
 
-#: src/utils.c:1937
+#: src/utils.c:1936
 #, c-format
 msgid ""
 "Frames have been shifted in the clip %s.\n"
@@ -3944,7 +3933,7 @@
 "Dei fotogrammi sono stati spostati nel clip %s.\n"
 "I seguenti layout sono coinvolti:\n"
 
-#: src/utils.c:1942
+#: src/utils.c:1941
 #, c-format
 msgid ""
 "Frames have been deleted from the clip %s.\n"
@@ -3953,7 +3942,7 @@
 "Dei fotogrammi sono stati cancellati dal clip %s.\n"
 "I seguenti layout sono coinvolti:\n"
 
-#: src/utils.c:1947
+#: src/utils.c:1946
 #, c-format
 msgid ""
 "Audio has been deleted from the clip %s.\n"
@@ -3962,7 +3951,7 @@
 "L'audio è stato cancellato dal clip %s.\n"
 "I seguenti layout sono affetti:\n"
 
-#: src/utils.c:1952
+#: src/utils.c:1951
 #, c-format
 msgid ""
 "Audio has been shifted in clip %s.\n"
@@ -3971,7 +3960,7 @@
 "L'audio è stato spostato nel clip %s.\n"
 "I seguenti layout sono affetti:\n"
 
-#: src/utils.c:1957
+#: src/utils.c:1956
 #, c-format
 msgid ""
 "Audio has been altered in the clip %s.\n"
@@ -3980,7 +3969,7 @@
 "L'audio è stato alterato nel clip %s.\n"
 "I layout seguenti sono affetti:\n"
 
-#: src/utils.c:1962
+#: src/utils.c:1961
 #, c-format
 msgid ""
 "Frames have been altered in the clip %s.\n"
@@ -3989,7 +3978,7 @@
 "Dei fotogrammi sono stati alterati nel clip %s.\n"
 "I layout seguenti sono coinvolti:\n"
 
-#: src/utils.c:2135
+#: src/utils.c:2134
 #, c-format
 msgid ""
 "Set %s\n"
@@ -4000,7 +3989,7 @@
 "non può essere aperto, dato che sta venendo usato\n"
 "da un'altra copia di LiVES.\n"
 
-#: src/utils.c:2142
+#: src/utils.c:2140
 #, c-format
 msgid ""
 "\n"
@@ -4056,68 +4045,68 @@
 msgid "Removing layout %s\n"
 msgstr "Rimuovendo il layout %s\n"
 
-#: src/utils.c:3014
+#: src/utils.c:2996
 msgid "Video [opening...]"
 msgstr "Video [apertura in corso...]"
 
-#: src/utils.c:3018
+#: src/utils.c:2999
 #, c-format
 msgid "Video [%.2f sec]"
 msgstr "Video [%.2f secondi]"
 
-#: src/utils.c:3022
+#: src/utils.c:3002
 msgid "(Undefined)"
 msgstr "(Indefinito)"
 
-#: src/utils.c:3025
+#: src/utils.c:3004
 msgid "(No video)"
 msgstr "(Nessun video)"
 
-#: src/utils.c:3032
+#: src/utils.c:3011
 msgid "(No audio)"
 msgstr "(Nessun audio)"
 
-#: src/utils.c:3037
+#: src/utils.c:3015
 msgid "Mono  [opening...]"
 msgstr "Mono [apertura in corso...]"
 
-#: src/utils.c:3040
+#: src/utils.c:3017
 msgid "Left Audio [opening...]"
 msgstr "Audio Sinistro [apertura in corso...]"
 
-#: src/utils.c:3045
+#: src/utils.c:3021
 #, c-format
 msgid "Mono [%.2f sec]"
 msgstr "Mono [%.2f secondi]"
 
-#: src/utils.c:3048
+#: src/utils.c:3023
 #, c-format
 msgid "Left Audio [%.2f sec]"
 msgstr "Audio Sinistro [%.2f secondi]"
 
-#: src/utils.c:3056
+#: src/utils.c:3031
 msgid "Right Audio [opening...]"
 msgstr "Audio Destro [apertura in corso...]"
 
-#: src/utils.c:3059
+#: src/utils.c:3033
 #, c-format
 msgid "Right Audio [%.2f sec]"
 msgstr "Audio Destro [%.2f secondi]"
 
-#: src/utils.c:3506
+#: src/utils.c:3472
 msgid "LiVES cannot switch to mplayer whilst clips are loading."
 msgstr "LiVES non può passare a mplayer mentre i clip si stanno caricando."
 
-#: src/utils.c:3559
+#: src/utils.c:3525
 #, fuzzy
 msgid "LiVES cannot switch to mplayer2 whilst clips are loading."
 msgstr "LiVES non può passare a mplayer mentre i clip si stanno caricando."
 
-#: src/utils.c:3809
+#: src/utils.c:3775
 msgid "Cleaning up clip"
 msgstr "Pulizia del clip in corso"
 
-#: src/utils.c:3913
+#: src/utils.c:3874
 #, c-format
 msgid ""
 "\n"
@@ -4132,30 +4121,29 @@
 "\n"
 "Sovrascrivere ?\n"
 
-#: src/utils.c:4305 src/utils.c:4337 src/multitrack.c:4503
+#: src/utils.c:4250 src/utils.c:4280 src/multitrack.c:4672
 #, c-format
 msgid "_Undo %s"
 msgstr "_Annulla %s"
 
-#: src/utils.c:4306 src/utils.c:4338 src/multitrack.c:4525
+#: src/utils.c:4251 src/utils.c:4281 src/multitrack.c:4693
 #, c-format
 msgid "_Redo %s"
 msgstr "_Rifai %s"
 
-#: src/utils.c:4363
+#: src/utils.c:4305
 msgid "-------------Selection------------"
 msgstr "-------------Selezione------------"
 
-#. TRANSLATORS: - try to keep the text of the middle part the same length, by deleting "-" if necessary
-#: src/utils.c:4371
+#: src/utils.c:4313
 msgid " sec ] ----------Selection---------- [ "
 msgstr " secondi ] ----------Selezione---------- [ "
 
-#: src/utils.c:4371
+#: src/utils.c:4314
 msgid " frames ] ----------"
 msgstr " fotogrammi ] ----------"
 
-#: src/utils.c:5360
+#: src/utils.c:5302
 msgid ""
 "Your version of mplayer/ffmpeg may be broken !\n"
 "See http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2071\n"
@@ -4166,11 +4154,11 @@
 "Try running Help/Troubleshoot for more information."
 msgstr ""
 
-#: src/saveplay.c:178
+#: src/saveplay.c:179
 msgid "Examining file header"
 msgstr "Esaminando l'intestazione del file"
 
-#: src/saveplay.c:315 src/saveplay.c:789
+#: src/saveplay.c:316 src/saveplay.c:779
 #, c-format
 msgid "Opening %s"
 msgstr "Apertura di %s in corso"
@@ -4180,36 +4168,36 @@
 msgid "Opening %s start time %.2f sec. frames %d"
 msgstr "Aprendo %s tempo di partenza %.2f secondi %d fotogrammi"
 
-#: src/saveplay.c:326 src/saveplay.c:4001
+#: src/saveplay.c:326 src/saveplay.c:3927
 msgid " without sound"
 msgstr " senza suono"
 
-#: src/saveplay.c:396
+#: src/saveplay.c:395
 #, c-format
 msgid "Opening audio for %s"
 msgstr "Apertura dell'audio per %s in corso"
 
-#: src/saveplay.c:557
+#: src/saveplay.c:554
 #, c-format
 msgid "Auto trimming %.2f seconds of audio at start..."
 msgstr ""
 
-#: src/saveplay.c:567
+#: src/saveplay.c:562
 #, fuzzy, c-format
 msgid "Auto trimming %.2f seconds of audio at end..."
 msgstr "%s dal tempo %.2f secondi a %.2f secondi..."
 
-#: src/saveplay.c:584
+#: src/saveplay.c:577
 #, c-format
 msgid "Auto padding with %.2f seconds of silence at start..."
 msgstr ""
 
-#: src/saveplay.c:599
+#: src/saveplay.c:590
 #, c-format
 msgid "Auto padding with %.2f seconds of silence at end..."
 msgstr ""
 
-#: src/saveplay.c:671
+#: src/saveplay.c:661
 #, c-format
 msgid ""
 "\n"
@@ -4221,11 +4209,11 @@
 "Are you sure you wish to continue ?"
 msgstr ""
 
-#: src/saveplay.c:685
+#: src/saveplay.c:676
 msgid " - please be patient."
 msgstr " - per piacere sii paziente."
 
-#: src/saveplay.c:938
+#: src/saveplay.c:926
 msgid ""
 "\n"
 "\n"
@@ -4237,7 +4225,7 @@
 "LiVES non è stato in grado di estrarre il video oppure l'audio.\n"
 "Per piacere controlla la finestra del terminale per ulteriori dettagli.\n"
 
-#: src/saveplay.c:940
+#: src/saveplay.c:928
 msgid ""
 "\n"
 "\n"
@@ -4247,7 +4235,7 @@
 "\n"
 "Dovresti aver bisogno di installare mplayer per aprire questo file.\n"
 
-#: src/saveplay.c:948
+#: src/saveplay.c:934
 msgid ""
 "\n"
 "\n"
@@ -4259,29 +4247,29 @@
 "Per piacere controlla l'impostazione del comando dell'apertura del Video in\n"
 "Strumenti|Preferenze|Decodifica\n"
 
-#: src/saveplay.c:1014
+#: src/saveplay.c:995
 msgid "Adding image..."
 msgstr ""
 
-#: src/saveplay.c:1108
+#: src/saveplay.c:1089
 #, c-format
 msgid "Subtitles were saved as %s\n"
 msgstr ""
 
-#: src/saveplay.c:1192
+#: src/saveplay.c:1171
 #, c-format
 msgid "LiVES: Save Frame %d as..."
 msgstr ""
 
-#: src/saveplay.c:1195
+#: src/saveplay.c:1174
 msgid "LiVES: Save Frame as..."
 msgstr ""
 
-#: src/saveplay.c:1322
+#: src/saveplay.c:1303
 msgid "LiVES: Save Clip as..."
 msgstr ""
 
-#: src/saveplay.c:1390
+#: src/saveplay.c:1369
 msgid ""
 "Saving your video could lead to a loss of quality !\n"
 "You are strongly advised to 'Save As' to a new file.\n"
@@ -4293,38 +4281,38 @@
 "\n"
 "Vuoi continuare ancora ?"
 
-#: src/saveplay.c:1517 src/saveplay.c:1683 src/saveplay.c:1762
-#: src/saveplay.c:4014
+#: src/saveplay.c:1494 src/saveplay.c:1659 src/saveplay.c:1738
+#: src/saveplay.c:3940
 msgid "Pulling frames from clip"
 msgstr "Togliendo i fotogrammi dal clip"
 
-#: src/saveplay.c:1588 src/saveplay.c:1727
+#: src/saveplay.c:1565 src/saveplay.c:1703
 msgid "Linking selection"
 msgstr "Collegando la selezione"
 
-#: src/saveplay.c:1779
+#: src/saveplay.c:1755
 msgid " (with no sound)\n"
 msgstr " (con nessun suono)\n"
 
-#: src/saveplay.c:1786
+#: src/saveplay.c:1761
 #, c-format
 msgid "Saving frames %d to %d%s as \"%s\" : encoder = %s : format = %s..."
 msgstr ""
 "Salvando i fotogrammi da %d a %d%s come \"%s\" : codificatore = %s : formato "
 "= %s..."
 
-#: src/saveplay.c:1790
+#: src/saveplay.c:1765
 #, c-format
 msgid "Saving frames 1 to %d%s as \"%s\" : encoder %s : format = %s..."
 msgstr ""
 "Salvando i fotogrammi da 1 a %d%s come \"%s\" : codificatore = %s : formato "
 "= %s..."
 
-#: src/saveplay.c:1909
+#: src/saveplay.c:1890
 msgid "Saving [can take a long time]"
 msgstr "Salvataggio in corso [può impiegare molto tempo]"
 
-#: src/saveplay.c:2057
+#: src/saveplay.c:2044
 msgid ""
 "\n"
 "\n"
@@ -4334,33 +4322,33 @@
 "\n"
 "Errore del codificatore - il file di output non è stato creato !\n"
 
-#: src/saveplay.c:2094
+#: src/saveplay.c:2081
 msgid "Clearing letterbox"
 msgstr ""
 
-#: src/saveplay.c:2183
+#: src/saveplay.c:2168
 #, c-format
 msgid "File size was %s\n"
 msgstr ""
 
-#: src/saveplay.c:2284
+#: src/saveplay.c:2265
 msgid "recording aborted by preview.\n"
 msgstr "registrazione fermata dall'anteprima.\n"
 
-#: src/saveplay.c:2288
+#: src/saveplay.c:2268
 msgid "recording aborted by clipboard playback.\n"
 msgstr "registrazione fermata dalla riproduzione degli appunti.\n"
 
-#: src/saveplay.c:2291
+#: src/saveplay.c:2270
 msgid "Recording performance..."
 msgstr "Registrando l'esibizione..."
 
-#: src/saveplay.c:3293
+#: src/saveplay.c:3251
 #, c-format
 msgid "Average FPS was %.4f\n"
 msgstr "Gli FPS medi sono stati %.4f\n"
 
-#: src/saveplay.c:3299
+#: src/saveplay.c:3256
 msgid ""
 "\n"
 "\n"
@@ -4374,16 +4362,21 @@
 "Dovresti cliccare su Strumenti--->Ridimensiona Tutto\n"
 "e ridimensionare tutti i fotogrammi alla dimensione corrente.\n"
 
-#: src/saveplay.c:3479
+#: src/saveplay.c:3429
 msgid "Unknown"
 msgstr "Sconosciuto"
 
-#: src/saveplay.c:3588 src/saveplay.c:4585
+#: src/saveplay.c:3538 src/saveplay.c:4502
 #, c-format
 msgid "Untitled%d"
 msgstr "Senza titolo%d"
 
-#: src/saveplay.c:3633
+#: src/saveplay.c:3567
+#, c-format
+msgid "%d frames are enough !\n"
+msgstr "%d fotogrammi sono sufficienti !\n"
+
+#: src/saveplay.c:3579
 #, c-format
 msgid ""
 "\n"
@@ -4391,7 +4384,7 @@
 "Bad things may happen with this clip.\n"
 msgstr ""
 
-#: src/saveplay.c:3723
+#: src/saveplay.c:3667
 #, c-format
 msgid ""
 "\n"
@@ -4403,14 +4396,14 @@
 "predefinito di %.3f fps. \n"
 "Il predefinito può essere impostato in Strumenti | Preferenze | Miste.\n"
 
-#: src/saveplay.c:3735
+#: src/saveplay.c:3677
 #, c-format
 msgid "Playback speed was adjusted to %.3f frames per second to fit audio.\n"
 msgstr ""
 "La velocità di riproduzione è stata regolata a %.3f fotogrammi al secondo "
 "per adattarsi all'audio.\n"
 
-#: src/saveplay.c:3754
+#: src/saveplay.c:3694
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d *bpp=Greyscale* fps=%.3f\n"
@@ -4419,7 +4412,7 @@
 "Fotogrammi=%d tipo=%s dimensione=%dx%d *bpp=Greyscale* fps=%.3f\n"
 "Audio:"
 
-#: src/saveplay.c:3758 src/saveplay.c:4762
+#: src/saveplay.c:3698 src/saveplay.c:4671
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d bpp=%d fps=%.3f\n"
@@ -4428,54 +4421,54 @@
 "Fotogrammi=%d tipo=%s dimensione=%dx%d bpp=%d fps=%.3f\n"
 "Audio:"
 
-#: src/saveplay.c:3762 src/saveplay.c:4766
+#: src/saveplay.c:3703 src/saveplay.c:4676
 #, c-format
 msgid "%s none\n"
 msgstr "%s niente\n"
 
-#: src/saveplay.c:3774
+#: src/saveplay.c:3714
 #, fuzzy, c-format
 msgid " - Author: %s\n"
 msgstr "Autore: %s"
 
-#: src/saveplay.c:3779
+#: src/saveplay.c:3717
 #, fuzzy, c-format
 msgid " - Title: %s\n"
 msgstr " - Commento: %s\n"
 
-#: src/saveplay.c:3784
+#: src/saveplay.c:3720
 #, c-format
 msgid " - Comment: %s\n"
 msgstr " - Commento: %s\n"
 
-#: src/saveplay.c:3897
+#: src/saveplay.c:3829
 #, c-format
 msgid "Saving frame %d as %s..."
 msgstr "Salvataggio del fotogramma %d come %s in corso..."
 
-#: src/saveplay.c:3996
+#: src/saveplay.c:3924
 #, c-format
 msgid "Backing up %s to %s"
 msgstr "Creando un backup da %s a %s"
 
-#: src/saveplay.c:4049
+#: src/saveplay.c:3975
 msgid "Backing up"
 msgstr "Creando un backup"
 
-#: src/saveplay.c:4083
+#: src/saveplay.c:4009
 msgid "performance data was backed up..."
 msgstr "i dati dell'esibizione hanno ricevuto un backup..."
 
-#: src/saveplay.c:4661
+#: src/saveplay.c:4574
 #, c-format
 msgid "Restoring %s..."
 msgstr "Ripristinando %s..."
 
-#: src/saveplay.c:4692
+#: src/saveplay.c:4603
 msgid "Restoring"
 msgstr "Ripristino in corso"
 
-#: src/saveplay.c:4714
+#: src/saveplay.c:4625
 #, c-format
 msgid ""
 "\n"
@@ -4489,22 +4482,22 @@
 "LiVES non è stato in grado di ripristinarlo.\n"
 
 #. TRANSLATORS: rec(ord) %.2f M(ega)B(ytes)
-#: src/saveplay.c:5207
+#: src/saveplay.c:5118
 #, c-format
 msgid "rec %.2f MB"
 msgstr ""
 
-#: src/saveplay.c:5213
+#: src/saveplay.c:5123
 #, c-format
 msgid "!rec %.2f MB"
 msgstr ""
 
 #. TRANSLATORS: rec(ord) ?? M(ega)B(ytes)
-#: src/saveplay.c:5216
+#: src/saveplay.c:5126
 msgid "rec ?? MB"
 msgstr ""
 
-#: src/saveplay.c:5241
+#: src/saveplay.c:5151
 #, c-format
 msgid ""
 "\n"
@@ -4512,7 +4505,7 @@
 "Record stop level can be set in Preferences.\n"
 msgstr ""
 
-#: src/saveplay.c:5535
+#: src/saveplay.c:5447
 msgid ""
 "\n"
 "Files from a previous run of LiVES were found.\n"
@@ -4522,47 +4515,69 @@
 "Sono stati trovati dei file da un precedente avvio di LiVES.\n"
 "Vuoi provare a recuperarli?\n"
 
-#: src/saveplay.c:5557
+#: src/saveplay.c:5469
 msgid "Recovering files"
 msgstr "Recupero dei file in corso"
 
-#: src/saveplay.c:5560
+#: src/saveplay.c:5472
 msgid "Recovering files..."
 msgstr "Recupero dei file in corso..."
 
-#: src/dialogs.c:72
+#: src/dialogs.c:71
 msgid "Show affected _layouts"
 msgstr "Mostra i _layout colpiti"
 
-#: src/dialogs.c:128
+#: src/dialogs.c:113
+msgid ""
+"Do _not show this warning any more\n"
+"(can be turned back on from Preferences/Warnings)"
+msgstr ""
+"_Non mostrare più questo avviso\n"
+"(può essere riattivato da Preferenze/Avvisi)"
+
+#: src/dialogs.c:127
 msgid "_Recover disk space"
 msgstr ""
 
-#: src/dialogs.c:143
+#: src/dialogs.c:142
 msgid " _Advanced Settings >>"
 msgstr ""
 
-#: src/dialogs.c:184
+#: src/dialogs.c:183 src/dialogs.c:221
 msgid "LiVES: - Warning !"
 msgstr "LiVES: - Attenzione !"
 
 #: src/dialogs.c:194
+#, fuzzy
+msgid "LiVES: - Error !"
+msgstr "LiVES: - Attenzione !"
+
+#: src/dialogs.c:204
+#, fuzzy
+msgid "LiVES: - Information"
+msgstr "LiVES: Informazioni su %s"
+
+#: src/dialogs.c:230
 msgid "LiVES: - Question"
 msgstr ""
 
-#: src/dialogs.c:204
+#: src/dialogs.c:239
 msgid "LiVES: - File Error"
 msgstr ""
 
-#: src/dialogs.c:208
+#: src/dialogs.c:241
 msgid "_Abort"
 msgstr ""
 
-#: src/dialogs.c:213
+#: src/dialogs.c:246
 msgid "_Retry"
 msgstr ""
 
-#: src/dialogs.c:597
+#: src/dialogs.c:306
+msgid "Show _Details"
+msgstr "Mostra _Dettagli"
+
+#: src/dialogs.c:657
 #, c-format
 msgid ""
 "FREE SPACE IN THE PARTITION CONTAINING\n"
@@ -4573,7 +4588,7 @@
 "(Disk warning levels can be configured in Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:615
+#: src/dialogs.c:676
 #, c-format
 msgid ""
 "Free space in the partition containing\n"
@@ -4585,11 +4600,11 @@
 "Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:627
+#: src/dialogs.c:688
 msgid "Audio players cannot be switched during playback."
 msgstr "I lettori audio non possono essere scambiati durante la riproduzione."
 
-#: src/dialogs.c:632
+#: src/dialogs.c:694
 msgid ""
 "\n"
 "\n"
@@ -4602,18 +4617,18 @@
 "insufficiente.\n"
 "Per piacere prova a chiudere prima altre applicazioni.\n"
 
-#: src/dialogs.c:752
+#: src/dialogs.c:820
 msgid "Processing has been paused."
 msgstr ""
 
-#: src/dialogs.c:937
+#: src/dialogs.c:1002
 #, c-format
 msgid ""
 "\n"
 "%s%d%% done. Time remaining: %u sec%s\n"
 msgstr ""
 
-#: src/dialogs.c:1335
+#: src/dialogs.c:1391
 #, c-format
 msgid ""
 "\n"
@@ -4622,14 +4637,14 @@
 "\n"
 "%d/%d fotogrammi aperti. Tempo rimanente %u secondi.\n"
 
-#: src/dialogs.c:1337
+#: src/dialogs.c:1393
 #, c-format
 msgid ""
 "\n"
 "%d/%d frames opened.\n"
 msgstr ""
 
-#: src/dialogs.c:1341
+#: src/dialogs.c:1396
 #, c-format
 msgid ""
 "\n"
@@ -4638,7 +4653,7 @@
 "\n"
 "%d fotogrammi aperti.\n"
 
-#: src/dialogs.c:1940
+#: src/dialogs.c:1993
 #, c-format
 msgid ""
 "\n"
@@ -4647,7 +4662,7 @@
 "\n"
 "Tempo rimanente: %d secondi"
 
-#: src/dialogs.c:1988
+#: src/dialogs.c:2040
 #, c-format
 msgid ""
 "\n"
@@ -4658,7 +4673,7 @@
 "Spiacente, LiVES può aprire soltanto %d file alla volta.\n"
 "Per piacere chiudi un file e poi prova ancora."
 
-#: src/dialogs.c:1994
+#: src/dialogs.c:2047
 #, c-format
 msgid ""
 "LiVES was unable to write to its temporary directory.\n"
@@ -4677,7 +4692,7 @@
 "\n"
 "Per piacere assicurati di poter scrivere in questa directory."
 
-#: src/dialogs.c:2005
+#: src/dialogs.c:2059
 #, fuzzy
 msgid ""
 "\n"
@@ -4688,13 +4703,13 @@
 "LiVES attualmente richiede o 'mplayer' o 'sox' per funzionare. Per piacere "
 "installa uno o l'altro di questi, e prova ancora.\n"
 
-#: src/dialogs.c:2010
+#: src/dialogs.c:2064
 msgid ""
 "Audio was not loaded; please install mplayer or mplayer2 if you expected "
 "audio for this clip.\n"
 msgstr ""
 
-#: src/dialogs.c:2014
+#: src/dialogs.c:2069
 msgid ""
 "Audio resampling is required for this format.\n"
 "Please install 'sox'\n"
@@ -4705,7 +4720,7 @@
 "Oppure passa ad un altro formato di codifica in Strumenti | Preferenze | "
 "Codifica\n"
 
-#: src/dialogs.c:2019
+#: src/dialogs.c:2075
 msgid ""
 "\n"
 "\n"
@@ -4717,7 +4732,7 @@
 "Questo codificatore/formato non può utilizzare il codec audio richiesto.\n"
 "Per piacere imposta il codec audio in Strumenti|Preferenze|Codifica\n"
 
-#: src/dialogs.c:2024
+#: src/dialogs.c:2080
 msgid ""
 "This layout includes generated frames.\n"
 "It cannot be saved, you must render it to a clip first.\n"
@@ -4725,13 +4740,13 @@
 "Questo layout include fotogrammi generati.\n"
 "Non può essere salvato, devi prima renderizzarlo in un clip.\n"
 
-#: src/dialogs.c:2029
+#: src/dialogs.c:2085
 msgid ""
 "This layout includes generated or recorded audio.\n"
 "It cannot be saved, you must render it to a clip first.\n"
 msgstr ""
 
-#: src/dialogs.c:2039 src/dialogs.c:2137
+#: src/dialogs.c:2095 src/dialogs.c:2189
 #, c-format
 msgid ""
 "\n"
@@ -4742,7 +4757,7 @@
 "\n"
 "Grazie a restrizioni nel formato %s\n"
 
-#: src/dialogs.c:2059
+#: src/dialogs.c:2115
 msgid ""
 "LiVES recommends the following settings:\n"
 "\n"
@@ -4750,43 +4765,43 @@
 "LiVES raccomanda le seguenti impostazioni:\n"
 "\n"
 
-#: src/dialogs.c:2065 src/dialogs.c:2174 src/resample.c:850
+#: src/dialogs.c:2121 src/dialogs.c:2225 src/resample.c:839
 msgid ", signed"
 msgstr ", firmato"
 
-#: src/dialogs.c:2066 src/dialogs.c:2175 src/resample.c:853
+#: src/dialogs.c:2122 src/dialogs.c:2226 src/resample.c:841
 msgid ", unsigned"
 msgstr ", non firmato"
 
-#: src/dialogs.c:2070 src/dialogs.c:2179 src/resample.c:858
+#: src/dialogs.c:2126 src/dialogs.c:2230 src/resample.c:846
 msgid ", little-endian"
 msgstr ", piccolo-endian"
 
-#: src/dialogs.c:2071 src/dialogs.c:2180 src/resample.c:861
+#: src/dialogs.c:2127 src/dialogs.c:2231 src/resample.c:848
 msgid ", big-endian"
 msgstr ", grande-endian"
 
-#: src/dialogs.c:2077
+#: src/dialogs.c:2132
 #, c-format
 msgid "Use an audio rate of %d Hz%s%s\n"
 msgstr ""
 
-#: src/dialogs.c:2085
+#: src/dialogs.c:2140
 #, c-format
 msgid "Set video rate to %.3f frames per second\n"
 msgstr "Imposta il rapporto del video a %.3f fotogrammi al secondo\n"
 
-#: src/dialogs.c:2089
+#: src/dialogs.c:2143
 #, c-format
 msgid "Set video rate to %d:%d frames per second\n"
 msgstr "Imposta il valore del video a %.d:%d fotogrammi al secondo\n"
 
-#: src/dialogs.c:2094 src/dialogs.c:2209
+#: src/dialogs.c:2148 src/dialogs.c:2258
 #, c-format
 msgid "Set video size to %d x %d pixels\n"
 msgstr "Imposta la dimensione del video a %d x %d pixel\n"
 
-#: src/dialogs.c:2102 src/dialogs.c:2208
+#: src/dialogs.c:2156 src/dialogs.c:2257
 msgid ""
 "\n"
 "You may wish to:\n"
@@ -4794,37 +4809,37 @@
 "\n"
 "Potresti volere:\n"
 
-#: src/dialogs.c:2105 src/dialogs.c:2200
+#: src/dialogs.c:2159 src/dialogs.c:2249
 #, c-format
 msgid "resize video to %d x %d pixels\n"
 msgstr "ridimensionare il video a %d x %d pixel\n"
 
-#: src/dialogs.c:2110
+#: src/dialogs.c:2163
 msgid "disable audio, since the target encoder cannot encode audio\n"
 msgstr ""
 "disattivare l'audio, in quanto il codificatore bersaglio non può codificare "
 "l'audio\n"
 
-#: src/dialogs.c:2170
+#: src/dialogs.c:2221
 msgid "LiVES must:\n"
 msgstr "LiVES deve:\n"
 
-#: src/dialogs.c:2185
+#: src/dialogs.c:2235
 #, c-format
 msgid "resample audio to %d Hz%s%s\n"
 msgstr ""
 
-#: src/dialogs.c:2192
+#: src/dialogs.c:2242
 #, c-format
 msgid "resample video to %.3f frames per second\n"
 msgstr "ricampiona video a %.3f fotogrammi al secondo\n"
 
-#: src/dialogs.c:2196
+#: src/dialogs.c:2245
 #, c-format
 msgid "resample video to %d:%d frames per second\n"
 msgstr "ricampiona video a %d:%d frame al secondo\n"
 
-#: src/dialogs.c:2215
+#: src/dialogs.c:2263
 msgid ""
 "\n"
 "You will be able to undo these changes afterwards.\n"
@@ -4838,7 +4853,7 @@
 "Schiaccia `OK` per procedere, `Annulla` per uscire.\n"
 "\n"
 
-#: src/dialogs.c:2218
+#: src/dialogs.c:2265
 msgid ""
 "\n"
 "Changes applied to the selection will not be permanent.\n"
@@ -4848,7 +4863,7 @@
 "I cambiamenti applicati alla selezione non saranno permanenti.\n"
 "\n"
 
-#: src/dialogs.c:2237
+#: src/dialogs.c:2285
 msgid ""
 "\n"
 "\n"
@@ -4862,7 +4877,7 @@
 "disponibile è insufficiente.\n"
 "Prova a registrare solamente una selezione del file."
 
-#: src/dialogs.c:2244
+#: src/dialogs.c:2293
 msgid ""
 "The playback speed (fps), or the audio rate\n"
 " of the clipboard does not match\n"
@@ -4881,7 +4896,7 @@
 "oppure\n"
 "OK per continuare"
 
-#: src/dialogs.c:2253
+#: src/dialogs.c:2304
 #, fuzzy, c-format
 msgid ""
 "When opening a yuvmpeg stream, you should first create a fifo file in:\n"
@@ -4901,11 +4916,11 @@
 "altrimenti\n"
 "premere Annulla."
 
-#: src/dialogs.c:2305
+#: src/dialogs.c:2356
 msgid "Show Keys"
 msgstr "Mostra Tasti"
 
-#: src/dialogs.c:2306
+#: src/dialogs.c:2358
 msgid ""
 "You can use the following keys during playback to control LiVES:-\n"
 "\n"
@@ -4987,11 +5002,11 @@
 "d                             dimensione doppia\n"
 "g                             riproduzione ping pong\n"
 
-#: src/dialogs.c:2313
+#: src/dialogs.c:2365
 msgid "Multitrack Keys"
 msgstr "Tasti Multi-traccia"
 
-#: src/dialogs.c:2314
+#: src/dialogs.c:2367
 msgid ""
 "You can use the following keys to control the multitrack window:-\n"
 "\n"
@@ -5013,18 +5028,18 @@
 "For other keys, see the menus.\n"
 msgstr ""
 
-#: src/dialogs.c:2322
+#: src/dialogs.c:2375
 msgid "Message History"
 msgstr "Cronologia Messaggi"
 
-#: src/dialogs.c:2335
+#: src/dialogs.c:2388
 #, c-format
 msgid ""
 "After upgrading/installing, you may need to adjust the <prefix_dir> setting "
 "in your %s file"
 msgstr ""
 
-#: src/dialogs.c:2344
+#: src/dialogs.c:2399
 #, c-format
 msgid ""
 "\n"
@@ -5035,7 +5050,7 @@
 "or change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/dialogs.c:2352
+#: src/dialogs.c:2408
 msgid ""
 "Sorry, unknown audio type.\n"
 "\n"
@@ -5045,18 +5060,18 @@
 "\n"
 " (I nomi dei file devono finire in .mp3, .ogg, .wav, .mod, .xm oppure .it)"
 
-#: src/dialogs.c:2353
+#: src/dialogs.c:2409
 msgid "failed (unknown type)\n"
 msgstr "fallito (tipo sconosciuto)\n"
 
-#: src/dialogs.c:2358
+#: src/dialogs.c:2415
 msgid ""
 "\n"
 "Do you wish to remove the layout files associated with this set ?\n"
 "(They will not be usable without the set).\n"
 msgstr ""
 
-#: src/dialogs.c:2363
+#: src/dialogs.c:2421
 #, c-format
 msgid ""
 "\n"
@@ -5069,7 +5084,7 @@
 "Clicca OK per aggiungere i clip e i layout correnti al set esistente.\n"
 "Clicca Annulla per scegliere un nuovo nome.\n"
 
-#: src/dialogs.c:2370
+#: src/dialogs.c:2429
 msgid ""
 "\n"
 "Frames from this clip are used in some multitrack layouts.\n"
@@ -5081,7 +5096,7 @@
 "Sei sicuro di voler continuare ?\n"
 "."
 
-#: src/dialogs.c:2374
+#: src/dialogs.c:2433
 msgid ""
 "\n"
 "Audio from this clip is used in some multitrack layouts.\n"
@@ -5093,7 +5108,7 @@
 "Sei sicuro di voler continuare ?\n"
 "."
 
-#: src/dialogs.c:2378
+#: src/dialogs.c:2438
 #, c-format
 msgid ""
 "\n"
@@ -5104,7 +5119,7 @@
 "Otherwise click Cancel to skip loading this file.\n"
 msgstr ""
 
-#: src/dialogs.c:2385
+#: src/dialogs.c:2446
 #, c-format
 msgid ""
 "\n"
@@ -5119,7 +5134,7 @@
 "%s\n"
 "Il clip non è stato caricato.\n"
 
-#: src/dialogs.c:2392
+#: src/dialogs.c:2455
 msgid ""
 "\n"
 "Dear user, the jack developers decided to remove the -Z option from jackd.\n"
@@ -5127,7 +5142,7 @@
 "Alternately, select a different audio player in Preferences.\n"
 msgstr ""
 
-#: src/dialogs.c:2396
+#: src/dialogs.c:2460
 msgid ""
 "\n"
 "Unable to start up jack. Please ensure that alsa is set up correctly on your "
@@ -5136,13 +5151,13 @@
 "Automatic jack startup will be disabled now.\n"
 msgstr ""
 
-#: src/dialogs.c:2402
+#: src/dialogs.c:2466
 msgid ""
 "\n"
 "Unable to connect to jack server. Please start jack before starting LiVES\n"
 msgstr ""
 
-#: src/dialogs.c:2411
+#: src/dialogs.c:2475
 #, c-format
 msgid ""
 "\n"
@@ -5153,7 +5168,7 @@
 "%s\n"
 msgstr ""
 
-#: src/dialogs.c:2418
+#: src/dialogs.c:2482
 msgid ""
 "\n"
 "Alternately, you can restart LiVES and select another audio player.\n"
@@ -5161,7 +5176,7 @@
 "\n"
 "In alternativa, puoi riavviare LiVES e selezionare un altro lettore audio.\n"
 
-#: src/dialogs.c:2423
+#: src/dialogs.c:2488
 #, c-format
 msgid ""
 "\n"
@@ -5176,7 +5191,7 @@
 "Puoi aumentare il valore in Preferenze/Multi-traccia.\n"
 "È consigliato di aumentarlo ad almeno %d MB"
 
-#: src/dialogs.c:2429
+#: src/dialogs.c:2496
 #, c-format
 msgid ""
 "\n"
@@ -5185,7 +5200,7 @@
 "Do you wish to delete them ?\n"
 msgstr ""
 
-#: src/dialogs.c:2436
+#: src/dialogs.c:2504
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for multitrack undo.\n"
@@ -5199,7 +5214,7 @@
 "utilizzando Preferenze ->Multitraccia/Render->Memoria per l'annullamento "
 "(Undo)\n"
 
-#: src/dialogs.c:2440
+#: src/dialogs.c:2508
 msgid ""
 "\n"
 "Out of memory for undo.\n"
@@ -5211,7 +5226,7 @@
 "Dovresti aver bisogno di aumentare la memoria di annullamento\n"
 "utilizzando Preferenze/Multi-traccia/Memoria Di Annullamento\n"
 
-#: src/dialogs.c:2444
+#: src/dialogs.c:2512
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for the multitrack undo buffer.\n"
@@ -5220,20 +5235,20 @@
 "LiVES non è stato in grado di riservare abbastanza memoria per il buffer di "
 "annullamento della multi-traccia.\n"
 
-#: src/dialogs.c:2446
+#: src/dialogs.c:2514
 msgid "or enter a smaller value.\n"
 msgstr "o inserisci un valore più piccolo.\n"
 
-#: src/dialogs.c:2448
+#: src/dialogs.c:2516
 msgid "Try again from the clip editor, try closing some other applications\n"
 msgstr ""
 "Prova ancora dell'editor clip, prova chiudendo qualche altra applicazione\n"
 
-#: src/dialogs.c:2449
+#: src/dialogs.c:2517
 msgid "Try closing some other applications\n"
 msgstr "Prova a chiudere altre applicazioni\n"
 
-#: src/dialogs.c:2460
+#: src/dialogs.c:2529
 msgid ""
 "Multitrack is set to 0 audio channels, but this layout has audio.\n"
 "You should adjust the audio settings from the Tools menu.\n"
@@ -5242,14 +5257,14 @@
 "dell'audio.\n"
 "Dovresti regolare le impostazioni audio dal menu Strumenti.\n"
 
-#: src/dialogs.c:2464
+#: src/dialogs.c:2534
 msgid ""
 "The current layout has audio, so audio channels may not be set to zero.\n"
 msgstr ""
 "Il layout corrente contiene dell'audio, quindi i canali audio non possono "
 "essere impostati a zero.\n"
 
-#: src/dialogs.c:2468
+#: src/dialogs.c:2539
 msgid ""
 "Multitrack audio preview is only available with the\n"
 "\"jack\" or \"pulse audio\" audio player.\n"
@@ -5259,7 +5274,7 @@
 "lettore audio \"jack\" o \"pulse audio\".\n"
 "Puoi impostare ciò in Strumenti|Preferenze|Riproduzione."
 
-#: src/dialogs.c:2472
+#: src/dialogs.c:2545
 msgid ""
 "Errors were detected in the layout (which may be due to transferring from "
 "another system, or from an older version of LiVES).\n"
@@ -5269,7 +5284,7 @@
 "da un altro sistema o da una precedente versione di LiVES)\n"
 "Tentare di riparare la copia del layout presente sul disco ?\n"
 
-#: src/dialogs.c:2476
+#: src/dialogs.c:2549
 msgid ""
 "LiVES was unable to load the layout.\n"
 "Sorry.\n"
@@ -5277,7 +5292,7 @@
 "LiVES non è stato in grado di caricare il layout.\n"
 "Spiacente.\n"
 
-#: src/dialogs.c:2482
+#: src/dialogs.c:2555
 msgid ""
 "\n"
 "\n"
@@ -5287,7 +5302,7 @@
 "\n"
 "Il rapporto dell'audio dev'essere maggiore di 0.\n"
 
-#: src/dialogs.c:2486
+#: src/dialogs.c:2559
 msgid ""
 "\n"
 "Event list will be very large\n"
@@ -5299,7 +5314,7 @@
 "e può richiedere molto tempo mostrarlo.\n"
 "Sei sicuro di volerlo vedere ?\n"
 
-#: src/dialogs.c:2491
+#: src/dialogs.c:2564
 msgid ""
 "\n"
 "\n"
@@ -5309,7 +5324,7 @@
 "\n"
 "Devi installare 'dvgrab' per utilizzare questa funzione.\n"
 
-#: src/dialogs.c:2496
+#: src/dialogs.c:2570
 msgid ""
 "\n"
 "\n"
@@ -5324,22 +5339,22 @@
 "Potresti aver bisogno di selezionare uno di questi in Strumenti/Preferenze/"
 "Riproduzione.\n"
 
-#: src/dialogs.c:2500
+#: src/dialogs.c:2574
 msgid "Video playback plugin failed to initialise palette !\n"
 msgstr ""
 "Il plugin di riproduzione del video ha fallito l'inizializzazione della "
 "tavolozza !\n"
 
-#: src/dialogs.c:2504
+#: src/dialogs.c:2579
 msgid "Decoder plugin failed to initialise palette !\n"
 msgstr ""
 "Il plugin decodificatore ha fallito l'inizializzazione della tavolozza !\n"
 
-#: src/dialogs.c:2509
+#: src/dialogs.c:2584
 msgid "Unable to set framerate of video plugin\n"
 msgstr "Impossibile impostare il rapporto dei fotogrammi del plugin video\n"
 
-#: src/dialogs.c:2514
+#: src/dialogs.c:2590
 msgid ""
 "After a crash, it is advisable to clean up the disk with\n"
 "File|Clean up disk space\n"
@@ -5347,7 +5362,7 @@
 "Successivamente a un crash, è consigliabile pulire il disco con\n"
 "File|Pulisci spazio disco\n"
 
-#: src/dialogs.c:2526
+#: src/dialogs.c:2604
 #, c-format
 msgid ""
 "Stream frame size is too large for your network buffers.\n"
@@ -5361,33 +5376,33 @@
 "\n"
 "echo %d > /proc/sys/net/core/rmem_max\n"
 
-#: src/dialogs.c:2714
+#: src/dialogs.c:2800
 msgid "cancelled.\n"
 msgstr "annullato.\n"
 
-#: src/dialogs.c:2721
+#: src/dialogs.c:2805
 msgid "failed.\n"
 msgstr "fallito.\n"
 
-#: src/dialogs.c:2728
+#: src/dialogs.c:2810
 msgid "done.\n"
 msgstr "fatto.\n"
 
-#: src/dialogs.c:2732
+#: src/dialogs.c:2814
 msgid "error in file. Failed.\n"
 msgstr "errore nel file. Fallito.\n"
 
-#: src/dialogs.c:2766 src/dialogs.c:2815 src/dialogs.c:2839
+#: src/dialogs.c:2848 src/dialogs.c:2897 src/dialogs.c:2921
 #, c-format
 msgid "Additional info: %s\n"
 msgstr ""
 
-#: src/dialogs.c:2769
+#: src/dialogs.c:2851
 #, c-format
 msgid "The error value was %d%s\n"
 msgstr ""
 
-#: src/dialogs.c:2772
+#: src/dialogs.c:2854
 #, c-format
 msgid ""
 "\n"
@@ -5397,7 +5412,7 @@
 "%s%s%s"
 msgstr ""
 
-#: src/dialogs.c:2818
+#: src/dialogs.c:2900
 #, c-format
 msgid ""
 "\n"
@@ -5407,7 +5422,7 @@
 "%s"
 msgstr ""
 
-#: src/dialogs.c:2842
+#: src/dialogs.c:2924
 #, c-format
 msgid ""
 "\n"
@@ -5417,7 +5432,7 @@
 "%s"
 msgstr ""
 
-#: src/dialogs.c:2886
+#: src/dialogs.c:2968
 #, c-format
 msgid ""
 "\n"
@@ -5426,7 +5441,7 @@
 "Please check for possible error causes.\n"
 msgstr ""
 
-#: src/dialogs.c:2890
+#: src/dialogs.c:2971
 #, c-format
 msgid ""
 "\n"
@@ -5436,7 +5451,7 @@
 "%s.\n"
 msgstr ""
 
-#: src/dialogs.c:2921
+#: src/dialogs.c:3002
 #, c-format
 msgid ""
 "\n"
@@ -5445,7 +5460,7 @@
 "Please check for possible error causes.\n"
 msgstr ""
 
-#: src/dialogs.c:2925
+#: src/dialogs.c:3005
 #, c-format
 msgid ""
 "\n"
@@ -5455,12 +5470,12 @@
 "%s.\n"
 msgstr ""
 
-#: src/dialogs.c:2993
+#: src/dialogs.c:3073
 #, c-format
 msgid "Value for \"%s\" could not be read."
 msgstr ""
 
-#: src/dialogs.c:3011
+#: src/dialogs.c:3091
 #, c-format
 msgid ""
 "\n"
@@ -5469,7 +5484,7 @@
 "Please check your system for errors.\n"
 msgstr ""
 
-#: src/dialogs.c:3020
+#: src/dialogs.c:3100
 #, c-format
 msgid ""
 "\n"
@@ -5482,7 +5497,7 @@
 "%s\n"
 "Per favore controlla i permessi del file e prova ancora."
 
-#: src/dialogs.c:3027
+#: src/dialogs.c:3109
 #, c-format
 msgid ""
 "\n"
@@ -5495,7 +5510,7 @@
 "%s\n"
 "Per piacere controlla i permessi per la directory e prova di nuovo."
 
-#: src/dialogs.c:3034
+#: src/dialogs.c:3116
 #, c-format
 msgid ""
 "\n"
@@ -5503,14 +5518,14 @@
 "%s\n"
 msgstr ""
 
-#: src/dialogs.c:3041
+#: src/dialogs.c:3123
 msgid ""
 "\n"
 "Abort and exit immediately from LiVES\n"
 "Are you sure ?\n"
 msgstr ""
 
-#: src/dialogs.c:3047
+#: src/dialogs.c:3129
 #, c-format
 msgid ""
 "\n"
@@ -5521,13 +5536,13 @@
 "Il %s non può codificare clip con il tipo di immagine %s.\n"
 "Per piacere seleziona un altro codificatore dall'elenco.\n"
 
-#: src/dialogs.c:3056
+#: src/dialogs.c:3139
 msgid ""
 "\n"
 "This card is already in use and cannot be opened multiple times.\n"
 msgstr ""
 
-#: src/dialogs.c:3061
+#: src/dialogs.c:3145
 #, c-format
 msgid ""
 "\n"
@@ -5537,27 +5552,27 @@
 "- Check if the device actually exists.\n"
 msgstr ""
 
-#: src/dialogs.c:3068
+#: src/dialogs.c:3153
 msgid ""
 "\n"
 "This file already has subtitles loaded.\n"
 "Do you wish to overwrite the existing subtitles ?\n"
 msgstr ""
 
-#: src/dialogs.c:3072
+#: src/dialogs.c:3157
 msgid ""
 "\n"
 "LiVES currently only supports subtitles of type .srt and .sub.\n"
 msgstr ""
 
-#: src/dialogs.c:3076
+#: src/dialogs.c:3161
 msgid ""
 "\n"
 "Erase all subtitles from this clip.\n"
 "Are you sure ?\n"
 msgstr ""
 
-#: src/dialogs.c:3082
+#: src/dialogs.c:3168
 #, c-format
 msgid ""
 "\n"
@@ -5566,14 +5581,14 @@
 "or OK to continue and save as type \"%s\"\n"
 msgstr ""
 
-#: src/dialogs.c:3089
+#: src/dialogs.c:3176
 msgid ""
 "\n"
 "Do you wish to move the current clip sets to the new directory ?\n"
 "(If unsure, click Yes)\n"
 msgstr ""
 
-#: src/dialogs.c:3093
+#: src/dialogs.c:3181
 #, c-format
 msgid ""
 "\n"
@@ -5584,19 +5599,19 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:3099
+#: src/dialogs.c:3188
 msgid ""
 "\n"
 "No video input devices could be found.\n"
 msgstr ""
 
-#: src/dialogs.c:3103
+#: src/dialogs.c:3192
 msgid ""
 "\n"
 "All video input devices are already in use.\n"
 msgstr ""
 
-#: src/dialogs.c:3107
+#: src/dialogs.c:3196
 msgid ""
 "\n"
 "\n"
@@ -5604,15 +5619,14 @@
 "DO NOT SHUT DOWN OR CLOSE LIVES !\n"
 msgstr ""
 
-#: src/dialogs.c:3127
+#: src/dialogs.c:3203
 #, c-format
 msgid ""
 "No clips were recovered for set (%s).\n"
 "Please check the spelling of the set name and try again.\n"
 msgstr ""
 
-#. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:3136
+#: src/dialogs.c:3214
 #, c-format
 msgid ""
 "\n"
@@ -5624,7 +5638,7 @@
 msgstr ""
 
 #. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:3144
+#: src/dialogs.c:3222
 #, c-format
 msgid ""
 "\n"
@@ -5633,34 +5647,34 @@
 "\n"
 msgstr ""
 
-#: src/dialogs.c:3150
+#: src/dialogs.c:3228
 msgid ""
 "\n"
 "You must have autolives.pl installed and in your path to use this toy.\n"
 "Consult your package distributor.\n"
 msgstr ""
 
-#: src/dialogs.c:3154
+#: src/dialogs.c:3232
 msgid ""
 "\n"
 "You must have a minimum of one clip loaded to use this toy.\n"
 msgstr ""
 
-#: src/dialogs.c:3158
+#: src/dialogs.c:3236
 msgid ""
 "\n"
 "LiVES lost its connection to jack and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:3162
+#: src/dialogs.c:3240
 msgid ""
 "\n"
 "LiVES lost its connection to pulseaudio and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:3175
+#: src/dialogs.c:3254
 #, c-format
 msgid ""
 "\n"
@@ -5669,240 +5683,240 @@
 "Do you wish to allow this (for this session only) ?\n"
 msgstr ""
 
-#: src/effects.c:60
+#: src/effects.c:61
 msgid "generator"
 msgstr "generatore"
 
-#: src/effects.c:61
+#: src/effects.c:62
 msgid "Generators"
 msgstr "Generatori"
 
-#: src/effects.c:63
+#: src/effects.c:64
 msgid "audio generator"
 msgstr ""
 
-#: src/effects.c:64
+#: src/effects.c:65
 msgid "Audio Generators"
 msgstr ""
 
-#: src/effects.c:66
+#: src/effects.c:67
 msgid "audio/video generator"
 msgstr ""
 
-#: src/effects.c:67
+#: src/effects.c:68
 msgid "Audio/Video Generators"
 msgstr ""
 
-#: src/effects.c:69
+#: src/effects.c:70
 msgid "data generator"
 msgstr ""
 
-#: src/effects.c:70
+#: src/effects.c:71
 msgid "Data Generators"
 msgstr ""
 
-#: src/effects.c:72
+#: src/effects.c:73
 msgid "data visualiser"
 msgstr ""
 
-#: src/effects.c:73
+#: src/effects.c:74
 msgid "Data Visualisers"
 msgstr ""
 
-#: src/effects.c:75
+#: src/effects.c:76
 msgid "data processor"
 msgstr ""
 
-#: src/effects.c:76
+#: src/effects.c:77
 msgid "Data Processors"
 msgstr ""
 
-#: src/effects.c:78
+#: src/effects.c:79
 msgid "data source"
 msgstr ""
 
-#: src/effects.c:79
+#: src/effects.c:80
 msgid "Data Sources"
 msgstr ""
 
-#: src/effects.c:81
+#: src/effects.c:82
 msgid "transition"
 msgstr "transizione"
 
-#: src/effects.c:82
+#: src/effects.c:83
 msgid "Transitions"
 msgstr "Transizioni"
 
-#: src/effects.c:84
+#: src/effects.c:85
 msgid "effect"
 msgstr "effetto"
 
-#: src/effects.c:87 src/rfx-builder.c:187
+#: src/effects.c:88 src/rfx-builder.c:187
 msgid "utility"
 msgstr "utilità"
 
-#: src/effects.c:88
+#: src/effects.c:89
 msgid "Utilities"
 msgstr "Utilità"
 
-#: src/effects.c:90
+#: src/effects.c:91
 msgid "compositor"
 msgstr "compositore"
 
-#: src/effects.c:91
+#: src/effects.c:92
 msgid "Compositors"
 msgstr "Compositori"
 
-#: src/effects.c:93
+#: src/effects.c:94
 msgid "tap"
 msgstr "spina"
 
-#: src/effects.c:94
+#: src/effects.c:95
 msgid "Taps"
 msgstr "Spine"
 
-#: src/effects.c:96
+#: src/effects.c:97
 msgid "splitter"
 msgstr "cuneo"
 
-#: src/effects.c:97
+#: src/effects.c:98
 msgid "Splitters"
 msgstr "Cunei"
 
-#: src/effects.c:99
+#: src/effects.c:100
 msgid "converter"
 msgstr "convertitore"
 
-#: src/effects.c:100
+#: src/effects.c:101
 msgid "Converters"
 msgstr "Convertitori"
 
-#: src/effects.c:102
+#: src/effects.c:103
 msgid "analyser"
 msgstr ""
 
-#: src/effects.c:103
+#: src/effects.c:104
 msgid "Analysers"
 msgstr ""
 
-#: src/effects.c:108
+#: src/effects.c:109
 msgid "audio/video"
 msgstr "audio/video"
 
-#: src/effects.c:109
+#: src/effects.c:110
 msgid "Audio/Video Transitions"
 msgstr "Transizioni Audio/Video"
 
-#: src/effects.c:111
+#: src/effects.c:112
 msgid "video only"
 msgstr "solo video"
 
-#: src/effects.c:112
+#: src/effects.c:113
 msgid "Video only Transitions"
 msgstr "Transizioni solo Video"
 
-#: src/effects.c:114 src/multitrack.c:10740
+#: src/effects.c:115 src/multitrack.c:10962
 msgid "audio only"
 msgstr "solamente audio"
 
-#: src/effects.c:115
+#: src/effects.c:116
 msgid "Audio only Transitions"
 msgstr "Transizioni solo Audio"
 
-#: src/effects.c:117 src/effects.c:120 src/multitrack.c:18757
+#: src/effects.c:118 src/effects.c:121 src/multitrack.c:19097
 msgid "audio"
 msgstr "audio"
 
-#: src/effects.c:118
+#: src/effects.c:119
 msgid "Audio Mixers"
 msgstr "Mixer Audio"
 
-#: src/effects.c:121
+#: src/effects.c:122
 msgid "Audio Effects"
 msgstr "Effetti Audio"
 
-#: src/effects.c:123
+#: src/effects.c:124
 msgid "video"
 msgstr ""
 
-#: src/effects.c:124
+#: src/effects.c:125
 msgid "Video Effects"
 msgstr ""
 
-#: src/effects.c:126
+#: src/effects.c:127
 msgid "audio volume controller"
 msgstr "controllatore volume audio"
 
-#: src/effects.c:127
+#: src/effects.c:128
 msgid "Audio Volume Controllers"
 msgstr "Controllatori Volume Audio"
 
-#: src/effects.c:129
+#: src/effects.c:130
 msgid "video analyser"
 msgstr ""
 
-#: src/effects.c:130
+#: src/effects.c:131
 msgid "Video analysers"
 msgstr ""
 
-#: src/effects.c:132
+#: src/effects.c:133
 msgid "audio analyser"
 msgstr ""
 
-#: src/effects.c:133
+#: src/effects.c:134
 msgid "Audio Analysers"
 msgstr ""
 
-#: src/effects.c:137 src/plugins.c:2559 src/plugins.c:2573
+#: src/effects.c:138 src/plugins.c:2507 src/plugins.c:2521
 msgid "unknown"
 msgstr "sconosciuto"
 
-#: src/effects.c:238
+#: src/effects.c:235
 #, c-format
 msgid "%s all frames..."
 msgstr "%s tutti i fotogrammi..."
 
-#: src/effects.c:243
+#: src/effects.c:239
 #, c-format
 msgid "%s clipboard into frames %d to %d..."
 msgstr "%s appunti nei fotogrammi da %d a %d..."
 
-#: src/effects.c:250
+#: src/effects.c:245
 #, c-format
 msgid "%s to clipboard..."
 msgstr "%s negli appunti..."
 
-#: src/effects.c:254
+#: src/effects.c:248
 #, c-format
 msgid "%s to new clip..."
 msgstr "%s nel nuovo clip..."
 
-#: src/effects.c:259
+#: src/effects.c:252
 #, c-format
 msgid "%s frames %d to %d..."
 msgstr "%s fotogrammi da %d a %d..."
 
-#: src/effects.c:290
+#: src/effects.c:283
 #, c-format
 msgid "%s clipboard with selection"
 msgstr "%s appunti con selezione"
 
-#: src/effects.c:295
+#: src/effects.c:287
 #, c-format
 msgid "%s to clipboard"
 msgstr "%s negli appunti"
 
-#: src/effects.c:299
+#: src/effects.c:290
 #, c-format
 msgid "%s to new clip"
 msgstr "%s al nuovo clip"
 
-#: src/effects.c:304
+#: src/effects.c:294
 #, c-format
 msgid "%s frames %d to %d"
 msgstr "%s fotogrammi da %d a %d"
 
-#: src/effects.c:456 src/effects.c:523
+#: src/effects.c:443 src/effects.c:507
 msgid ""
 "\n"
 "No frames were generated.\n"
@@ -5910,46 +5924,46 @@
 "\n"
 "Nessun fotogramma è stato generato.\n"
 
-#: src/effects-weed.c:431
+#: src/effects-weed.c:452
 msgid "integer"
 msgstr ""
 
-#: src/effects-weed.c:432
+#: src/effects-weed.c:454
 msgid "int64"
 msgstr ""
 
-#: src/effects-weed.c:433
+#: src/effects-weed.c:456
 msgid "boolean"
 msgstr ""
 
-#: src/effects-weed.c:434
+#: src/effects-weed.c:458
 msgid "double"
 msgstr ""
 
-#: src/effects-weed.c:435
+#: src/effects-weed.c:460
 msgid "string"
 msgstr ""
 
-#: src/effects-weed.c:436
+#: src/effects-weed.c:462
 msgid "pointer"
 msgstr ""
 
-#: src/effects-weed.c:4591
+#: src/effects-weed.c:4581
 #, c-format
 msgid "Error: plugin %s has no weed_setup() function.\n"
 msgstr "Errore: il plugin %s non ha la funzione weed_setup().\n"
 
-#: src/effects-weed.c:4606
+#: src/effects-weed.c:4595
 #, c-format
 msgid "No usable filters found in plugin %s\n"
 msgstr ""
 
-#: src/effects-weed.c:4680
+#: src/effects-weed.c:4668
 #, c-format
 msgid "Found duplicate plugin %s"
 msgstr ""
 
-#: src/effects-weed.c:4734
+#: src/effects-weed.c:4723
 #, c-format
 msgid ""
 "Info: Unable to load plugin %s\n"
@@ -5958,259 +5972,259 @@
 "Informazioni: Non è stato possibile caricare il plugin %s\n"
 "L'errore è stato: %s\n"
 
-#: src/effects-weed.c:4737 src/effects-weed.c:5858
+#: src/effects-weed.c:4726 src/effects-weed.c:5847
 msgid "Some plugin directories"
 msgstr ""
 
 #. TRANSLATORS: example " - LADSPA plugins -"
-#: src/effects-weed.c:4812 src/rte_window.c:2105
+#: src/effects-weed.c:4801 src/rte_window.c:2107
 #, c-format
 msgid " - %s plugins -"
 msgstr ""
 
-#: src/effects-weed.c:5012
+#: src/effects-weed.c:4998
 #, c-format
 msgid "Successfully loaded %d Weed filters\n"
 msgstr "Caricati con successo %d filtri Weed\n"
 
-#: src/effects-weed.c:5177
+#: src/effects-weed.c:5162
 #, c-format
 msgid "Invalid compound effect %s - has conflicting target_fps\n"
 msgstr ""
 
-#: src/effects-weed.c:5197
+#: src/effects-weed.c:5182
 #, c-format
 msgid "Invalid compound effect %s - has multiple transition parameters\n"
 msgstr ""
 
-#: src/effects-weed.c:5211
+#: src/effects-weed.c:5196
 #, c-format
 msgid "Invalid compound effect %s - has multiple master volume parameters\n"
 msgstr ""
 
-#: src/effects-weed.c:5346
+#: src/effects-weed.c:5329
 #, c-format
 msgid "Invalid compound effect %s - must have >1 sub filters\n"
 msgstr ""
 
-#: src/effects-weed.c:5366
+#: src/effects-weed.c:5349
 #, c-format
 msgid "Invalid effect %s found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5381
+#: src/effects-weed.c:5364
 #, c-format
 msgid "Invalid default found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5392
+#: src/effects-weed.c:5375
 #, c-format
 msgid "Invalid filter %d for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5406
+#: src/effects-weed.c:5389
 #, c-format
 msgid "Invalid param %d for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5433
+#: src/effects-weed.c:5416
 #, c-format
 msgid ""
 "Invalid number of values for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5467
+#: src/effects-weed.c:5450
 #, c-format
 msgid ""
 "Invalid non-boolean value for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5500
+#: src/effects-weed.c:5483
 #, c-format
 msgid "Invalid param link found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5511
+#: src/effects-weed.c:5494
 #, c-format
 msgid ""
 "Invalid out filter %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5529
+#: src/effects-weed.c:5513
 #, c-format
 msgid ""
 "Invalid out param %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5541
+#: src/effects-weed.c:5526
 #, c-format
 msgid ""
 "Invalid non-boolean value for autoscale found in compound effect %s, line "
 "%d\n"
 msgstr ""
 
-#: src/effects-weed.c:5552
+#: src/effects-weed.c:5537
 #, c-format
 msgid ""
 "Invalid in filter %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5566
+#: src/effects-weed.c:5552
 #, c-format
 msgid ""
 "Invalid in param %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5594
+#: src/effects-weed.c:5581
 #, c-format
 msgid "Invalid channel link found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5605
+#: src/effects-weed.c:5592
 #, c-format
 msgid ""
 "Invalid out filter %d for link channels found in compound effect %s, line "
 "%d\n"
 msgstr ""
 
-#: src/effects-weed.c:5623
+#: src/effects-weed.c:5611
 #, c-format
 msgid ""
 "Invalid out channel %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5633
+#: src/effects-weed.c:5622
 #, c-format
 msgid ""
 "Invalid in filter %d for link channels found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5651
+#: src/effects-weed.c:5641
 #, c-format
 msgid ""
 "Invalid in channel %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5687
+#: src/effects-weed.c:5678
 #, c-format
 msgid "Compound:%s"
 msgstr ""
 
-#: src/effects-weed.c:5758
+#: src/effects-weed.c:5749
 #, c-format
 msgid "Successfully loaded %d compound filters\n"
 msgstr ""
 
-#: src/effects-weed.c:6591
+#: src/effects-weed.c:6570
 #, c-format
 msgid "Effect %s cannot be used with this audio player.\n"
 msgstr ""
 
-#: src/effects-weed.c:6737
+#: src/effects-weed.c:6718
 #, c-format
 msgid "Failed to start instance %s, error code %d\n"
 msgstr "Fallito l'avvio dell'istanza %s, codice errore %d\n"
 
-#: src/effects-weed.c:6814
+#: src/effects-weed.c:6797
 #, c-format
 msgid "Unable to start generator %s\n"
 msgstr "Non è stato possibile avviare il generatore %s\n"
 
-#: src/effects-weed.c:7621
+#: src/effects-weed.c:7607
 #, c-format
 msgid "Failed to start generator %s\n"
 msgstr "Fallito l'avvio del generatore %s\n"
 
-#: src/effects-weed.c:7718
+#: src/effects-weed.c:7701
 #, c-format
 msgid "Failed to start generator %s, error %d\n"
 msgstr "Fallito l'avvio del generatore %s, errore %d\n"
 
-#: src/effects-weed.c:9012
+#: src/effects-weed.c:8993
 #, c-format
 msgid "%s [unstable] (%s)"
 msgstr ""
 
-#: src/effects-data.c:3278
+#: src/effects-data.c:3234
 #, c-format
 msgid "ACTIVATE (%s)"
 msgstr ""
 
-#: src/effects-data.c:3548
+#: src/effects-data.c:3501
 msgid "ACTIVATE"
 msgstr ""
 
-#: src/effects-data.c:3876
+#: src/effects-data.c:3829
 #, c-format
 msgid "Key slot %d"
 msgstr ""
 
-#: src/effects-data.c:3998
+#: src/effects-data.c:3951
 msgid "Autoscale"
 msgstr ""
 
-#: src/effects-data.c:4089
+#: src/effects-data.c:4042
 msgid "Add another connection for this output parameter"
 msgstr ""
 
-#: src/effects-data.c:4102 src/effects-data.c:4151
+#: src/effects-data.c:4055 src/effects-data.c:4104
 #, fuzzy
 msgid "Delete this connection"
 msgstr "_Elimina questo effetto"
 
-#: src/effects-data.c:4138
+#: src/effects-data.c:4091
 msgid "Add another connection for this output channel"
 msgstr ""
 
-#: src/effects-data.c:4223
+#: src/effects-data.c:4176
 msgid "Connected to -->"
 msgstr ""
 
-#: src/effects-data.c:4243
+#: src/effects-data.c:4196
 #, c-format
 msgid "%s - Alpha Channel Connections"
 msgstr ""
 
-#: src/effects-data.c:4316
+#: src/effects-data.c:4269
 #, c-format
 msgid "%s - Parameter Data Connections"
 msgstr ""
 
-#: src/effects-data.c:4336
+#: src/effects-data.c:4289
 msgid "Autoscale All"
 msgstr ""
 
-#: src/effects-data.c:4361 src/effects-data.c:4890
+#: src/effects-data.c:4314 src/effects-data.c:4841
 msgid "ACTIVATED"
 msgstr ""
 
-#: src/effects-data.c:4774
+#: src/effects-data.c:4726
 msgid "LiVES: - Parameter and Alpha Channel Connections"
 msgstr ""
 
-#: src/effects-data.c:4785
+#: src/effects-data.c:4736
 msgid "Auto Connect Channels"
 msgstr ""
 
-#: src/effects-data.c:4797
+#: src/effects-data.c:4748
 msgid "Auto Connect Parameters"
 msgstr ""
 
-#: src/effects-data.c:4807
+#: src/effects-data.c:4758
 msgid "Disconnect All"
 msgstr ""
 
-#: src/effects-data.c:4875
+#: src/effects-data.c:4826
 #, c-format
 msgid "Input channel is already connected from (%d,%d) %s"
 msgstr ""
 
-#: src/effects-data.c:4891
+#: src/effects-data.c:4842
 #, c-format
 msgid "Input parameter is already connected from (%d,%d) %s"
 msgstr ""
 
-#: src/effects-data.c:4899
+#: src/effects-data.c:4851
 msgid "Input and output parameters are not compatible"
 msgstr ""
 
@@ -6222,43 +6236,43 @@
 msgid "_Reset Values"
 msgstr "_Azzera Valori"
 
-#: src/framedraw.c:267
+#: src/framedraw.c:265
 msgid "_Frame"
 msgstr ""
 
-#: src/paramspecial.c:266
+#: src/paramspecial.c:259
 msgid "Maintain _Aspect Ratio"
 msgstr "Mantieni Rapporto Dell'_Aspetto"
 
-#: src/paramspecial.c:267
+#: src/paramspecial.c:260
 msgid "Maintain aspect ratio of original frame"
 msgstr "Mantieni il rapporto dell'aspetto del fotogramma originale"
 
-#: src/paramspecial.c:341
+#: src/paramspecial.c:335
 msgid "Display Password"
 msgstr ""
 
-#: src/paramwindow.c:450
+#: src/paramwindow.c:447
 msgid "Transition _In"
 msgstr "_Maggiore Transizione"
 
-#: src/paramwindow.c:452
+#: src/paramwindow.c:449
 msgid "Click to set the transition parameter to show only the front frame"
 msgstr ""
 
-#: src/paramwindow.c:474
+#: src/paramwindow.c:472
 msgid "Crossfade audio"
 msgstr "Dissolvi l'audio in modo incrociato"
 
-#: src/paramwindow.c:475
+#: src/paramwindow.c:473
 msgid "Check the box to make audio transition with the video"
 msgstr "Spunta la casella per rendere la transizione dell'audio con il video"
 
-#: src/paramwindow.c:493
+#: src/paramwindow.c:492
 msgid "Transition _Out"
 msgstr "_Minore Transizione"
 
-#: src/paramwindow.c:495
+#: src/paramwindow.c:494
 msgid "Click to set the transition parameter to show only the rear frame"
 msgstr ""
 
@@ -6271,23 +6285,23 @@
 msgid "%s : size"
 msgstr "%s : dimensione"
 
-#: src/paramwindow.c:598
+#: src/paramwindow.c:597
 msgid "New size (pixels)"
 msgstr "Nuova dimensione (pixel)"
 
-#: src/paramwindow.c:617 src/plugins.c:997
+#: src/paramwindow.c:616 src/plugins.c:973
 msgid "_Width"
 msgstr "_Larghezza"
 
-#: src/paramwindow.c:636 src/plugins.c:1003
+#: src/paramwindow.c:635 src/plugins.c:979
 msgid "_Height"
 msgstr "_Altezza"
 
-#: src/paramwindow.c:684
+#: src/paramwindow.c:683
 msgid "Generate to _Clipboard"
 msgstr "Genera negli _Appunti"
 
-#: src/paramwindow.c:686
+#: src/paramwindow.c:685
 msgid "Generate frames to the clipboard"
 msgstr "Genera fotogrammi negli appunti"
 
@@ -6299,7 +6313,7 @@
 msgid "Generate frames to a new clip"
 msgstr "Genera fotogrammi in un nuovo clip"
 
-#: src/paramwindow.c:822
+#: src/paramwindow.c:824
 #, c-format
 msgid ""
 "\n"
@@ -6310,59 +6324,59 @@
 "Devi selezionare almeno %d fotogrammi per utilizzare questo effetto.\n"
 "\n"
 
-#: src/paramwindow.c:920 src/paramwindow.c:930
+#: src/paramwindow.c:934 src/paramwindow.c:942
 msgid "Set as default"
 msgstr "Imposta come predefinito"
 
-#: src/paramwindow.c:922 src/paramwindow.c:938
+#: src/paramwindow.c:936 src/paramwindow.c:950
 msgid "Reset"
 msgstr ""
 
-#: src/paramwindow.c:932 src/rte_window.c:2401 src/omc-learn.c:1357
+#: src/paramwindow.c:944 src/rte_window.c:2394 src/omc-learn.c:1347
 msgid "Close _window"
 msgstr "Chiudi _finestra"
 
-#: src/paramwindow.c:1337
+#: src/paramwindow.c:1340
 msgid "No parameters"
 msgstr "Nessun parametro"
 
-#: src/paramwindow.c:1419
+#: src/paramwindow.c:1424
 msgid "Invalid parameter"
 msgstr "Parametro non valido"
 
-#: src/paramwindow.c:1611
+#: src/paramwindow.c:1610
 msgid "LiVES: - Select Colour"
 msgstr "LiVES: - Seleziona Colore"
 
-#: src/paramwindow.c:1616
+#: src/paramwindow.c:1615
 msgid "Click to set the colour"
 msgstr "Clicca per impostare il colore"
 
-#: src/paramwindow.c:1628
+#: src/paramwindow.c:1626
 msgid "_Red"
 msgstr ""
 
-#: src/paramwindow.c:1629
+#: src/paramwindow.c:1627
 msgid "The red value (0 - 255)"
 msgstr "Il valore del rosso (da 0 a 255)"
 
-#: src/paramwindow.c:1632
+#: src/paramwindow.c:1630
 msgid "_Green"
 msgstr ""
 
-#: src/paramwindow.c:1633
+#: src/paramwindow.c:1631
 msgid "The green value (0 - 255)"
 msgstr "Il valore del verde (da 0 a 255)"
 
-#: src/paramwindow.c:1636
+#: src/paramwindow.c:1634
 msgid "_Blue"
 msgstr ""
 
-#: src/paramwindow.c:1637
+#: src/paramwindow.c:1635
 msgid "The blue value (0 - 255)"
 msgstr "Il valore del blu (da 0 a 255)"
 
-#: src/plugins.c:85
+#: src/plugins.c:86
 #, c-format
 msgid ""
 "\n"
@@ -6371,12 +6385,12 @@
 "\n"
 "Errore plugin: %s ha fallito con il codice %d"
 
-#: src/plugins.c:87
+#: src/plugins.c:88
 #, c-format
 msgid " : message was %s\n"
 msgstr " : il messaggio è stato %s\n"
 
-#: src/plugins.c:387
+#: src/plugins.c:375
 #, c-format
 msgid ""
 "\n"
@@ -6392,17 +6406,17 @@
 "%s\n"
 "Codice errore %d\n"
 
-#: src/plugins.c:397
+#: src/plugins.c:385
 #, c-format
 msgid "Updating video playback plugin defaults in %s\n"
 msgstr "Aggiornando i predefiniti del plugin di riproduzione del video in %s\n"
 
-#: src/plugins.c:452
+#: src/plugins.c:444
 #, c-format
 msgid "Loading video playback plugin defaults from %s..."
 msgstr "Caricando i predefiniti del plugin di riproduzione dei video da %s..."
 
-#: src/plugins.c:515
+#: src/plugins.c:505
 #, c-format
 msgid ""
 "\n"
@@ -6417,32 +6431,32 @@
 " Strumenti|Preferenze|Riproduzione|Riproduzione avanzata plugin\n"
 "\n"
 
-#: src/plugins.c:855
+#: src/plugins.c:836
 #, c-format
 msgid "Saving playback plugin defaults to %s..."
 msgstr ""
 
-#: src/plugins.c:962
+#: src/plugins.c:939
 msgid "_FPS"
 msgstr "_FPS"
 
-#: src/plugins.c:963
+#: src/plugins.c:940
 msgid "Fixed framerate for plugin.\n"
 msgstr "Corretto il rapporto di fotogrammi per il plugin.\n"
 
-#: src/plugins.c:1032
+#: src/plugins.c:1008
 msgid "_Colourspace"
 msgstr "_Spazio Del Colore"
 
-#: src/plugins.c:1033
+#: src/plugins.c:1009
 msgid "Colourspace input to the plugin.\n"
 msgstr "Input dello spazio del colore nel plugin.\n"
 
-#: src/plugins.c:1089
+#: src/plugins.c:1065
 msgid "Save settings to an alternate file.\n"
 msgstr ""
 
-#: src/plugins.c:1206
+#: src/plugins.c:1182
 #, c-format
 msgid ""
 "\n"
@@ -6455,7 +6469,7 @@
 "Fallita l'apertura del plugin di riproduzione %s\n"
 "L'errore è %s\n"
 
-#: src/plugins.c:1252
+#: src/plugins.c:1228
 #, c-format
 msgid ""
 "\n"
@@ -6470,7 +6484,7 @@
 "manca una funzione necessaria.\n"
 "Non è possibile utilizzarlo.\n"
 
-#: src/plugins.c:1265
+#: src/plugins.c:1241
 #, c-format
 msgid ""
 "Video playback plugin failed to initialise.\n"
@@ -6479,7 +6493,7 @@
 "Il plugin di riproduzione video ha fallito ad inizializzarsi.\n"
 "L'errore è: %s\n"
 
-#: src/plugins.c:1461
+#: src/plugins.c:1428
 msgid ""
 "\n"
 "Warning ! Video playback plugin will not send key presses. Keyboard may be "
@@ -6489,7 +6503,7 @@
 "Attenzione ! Il plugin di riproduzione video non notifica la pressione dei "
 "tasti. La tastiera potrà essere disabilitata durante l'uso del plugin !\n"
 
-#: src/plugins.c:1465
+#: src/plugins.c:1433
 #, c-format
 msgid ""
 "*** Using %s plugin for fs playback, agreed to use palette type %d ( %s ). "
@@ -6498,17 +6512,17 @@
 "*** Utilizzo il plugin %s per la riproduzione di  fs, utilizzando la palette "
 "%d ( %s ). ***\n"
 
-#: src/plugins.c:1571
+#: src/plugins.c:1537
 #, c-format
 msgid "Audio stream unable to use preferred format '%s'\n"
 msgstr ""
 
-#: src/plugins.c:1579
+#: src/plugins.c:1543
 #, c-format
 msgid "Using format '%s' instead.\n"
 msgstr ""
 
-#: src/plugins.c:1616
+#: src/plugins.c:1579
 #, c-format
 msgid ""
 "LiVES was unable to find its encoder plugins. Please make sure you have the "
@@ -6517,7 +6531,7 @@
 "or change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/plugins.c:1624
+#: src/plugins.c:1589
 #, c-format
 msgid ""
 "LiVES did not receive a response from the encoder plugin called '%s'.\n"
@@ -6530,12 +6544,12 @@
 "%s%s%s\n"
 "o cambiate plugin utilizzando Strumenti|Preferenze|Codifica\n"
 
-#: src/plugins.c:2032
+#: src/plugins.c:1987
 msgid "Unable to resize, please install imageMagick\n"
 msgstr ""
 "Non è stato possibile ridimensionare, per piacere installa imageMagick\n"
 
-#: src/plugins.c:2231
+#: src/plugins.c:2183
 #, c-format
 msgid ""
 "\n"
@@ -6543,12 +6557,12 @@
 "No decoders found in %s !\n"
 msgstr ""
 
-#: src/plugins.c:2415
+#: src/plugins.c:2369
 #, fuzzy, c-format
 msgid " using %s"
 msgstr "Apertura di %s in corso"
 
-#: src/plugins.c:2499
+#: src/plugins.c:2451
 #, c-format
 msgid ""
 "\n"
@@ -6561,7 +6575,7 @@
 "Fallita l'apertura del plugin decodificatore %s\n"
 "L'errore è stato %s\n"
 
-#: src/plugins.c:2522
+#: src/plugins.c:2472
 #, c-format
 msgid ""
 "\n"
@@ -6576,26 +6590,26 @@
 "manca una funzione necessaria.\n"
 "Impossibile usarlo.\n"
 
-#: src/plugins.c:2564
+#: src/plugins.c:2512
 msgid "/unknown"
 msgstr "/sconosciuto"
 
-#: src/plugins.c:2651
+#: src/plugins.c:2598
 msgid "LiVES: - Decoder Plugins"
 msgstr ""
 
-#: src/plugins.c:2669
+#: src/plugins.c:2616
 msgid "Enabled Video Decoders (uncheck to disable)"
 msgstr ""
 
-#: src/plugins.c:2726
+#: src/plugins.c:2672
 #, c-format
 msgid "Failed to load %s, transitions may not resize.\n"
 msgstr ""
 "Fallito il caricamento di %s, le transizioni non possono venire "
 "ridimensionate.\n"
 
-#: src/plugins.c:3854
+#: src/plugins.c:3797
 #, c-format
 msgid "%s advanced settings"
 msgstr "impostazioni avanzate %s"
@@ -6604,15 +6618,15 @@
 msgid "LiVES: - New Test RFX"
 msgstr "LiVES: - Nuovo Test RFX"
 
-#: src/rfx-builder.c:136
+#: src/rfx-builder.c:135
 msgid "LiVES: - Edit Test RFX"
 msgstr "LiVES: - Modifica Test RFX"
 
-#: src/rfx-builder.c:166
+#: src/rfx-builder.c:165
 msgid "Type:"
 msgstr "Tipo:"
 
-#: src/rfx-builder.c:184
+#: src/rfx-builder.c:183
 msgid "tool"
 msgstr ""
 
@@ -6624,129 +6638,129 @@
 msgid "The name of the plugin. No spaces allowed."
 msgstr "Il nome del plugin. Nessuno spazio permesso."
 
-#: src/rfx-builder.c:201
+#: src/rfx-builder.c:202
 msgid "Version:       "
 msgstr "Versione:       "
 
-#: src/rfx-builder.c:203
+#: src/rfx-builder.c:204
 msgid "The script version."
 msgstr "La versione dello script."
 
-#: src/rfx-builder.c:210
+#: src/rfx-builder.c:212
 msgid "    Author:       "
 msgstr "    Autore:       "
 
-#: src/rfx-builder.c:211
+#: src/rfx-builder.c:213
 msgid "The script author."
 msgstr "L'autore dello script."
 
-#: src/rfx-builder.c:217
+#: src/rfx-builder.c:220
 msgid "    URL (optional):       "
 msgstr "    URL (facoltativo):       "
 
-#: src/rfx-builder.c:218
+#: src/rfx-builder.c:221
 msgid "URL for the plugin maintainer."
 msgstr "URL del mantenitore del plugin."
 
-#: src/rfx-builder.c:226
+#: src/rfx-builder.c:230
 msgid "Menu text:    "
 msgstr "Testo del menu:    "
 
-#: src/rfx-builder.c:227
+#: src/rfx-builder.c:231
 msgid "The text to show in the menu."
 msgstr "Il testo da mostrare nel menu."
 
-#: src/rfx-builder.c:239
+#: src/rfx-builder.c:244
 msgid "Action description:        "
 msgstr "Descrizione dell'azione:        "
 
-#: src/rfx-builder.c:241
+#: src/rfx-builder.c:246
 msgid "Describe what the plugin is doing. E.g. \"Edge detecting\""
 msgstr "Descrivi cosa fa il plugin. Ad esempio \"Riconoscimento dei contorni\""
 
-#: src/rfx-builder.c:246
+#: src/rfx-builder.c:251
 msgid "Minimum frames:"
 msgstr "Fotogrammi minimi:"
 
-#: src/rfx-builder.c:249
+#: src/rfx-builder.c:254
 msgid ""
 "Minimum number of frames this effect/tool can be applied to. Normally 1."
 msgstr ""
 "Numero minimo di fotogrammi su cui questo effetto/strumento si può "
 "applicare. Di norma 1."
 
-#: src/rfx-builder.c:260
+#: src/rfx-builder.c:265
 msgid "_Requirements..."
 msgstr "_Requisiti..."
 
-#: src/rfx-builder.c:263
+#: src/rfx-builder.c:268
 msgid "Enter any binaries required by the plugin."
 msgstr "Inserisci qualsiasi binario richiesto dal plugin."
 
-#: src/rfx-builder.c:267
+#: src/rfx-builder.c:272
 msgid "_Properties..."
 msgstr "_Proprietà..."
 
-#: src/rfx-builder.c:270
+#: src/rfx-builder.c:275
 msgid "Set properties for the plugin. Optional."
 msgstr "Imposta le proprietà del plugin. Facoltativo."
 
-#: src/rfx-builder.c:274
+#: src/rfx-builder.c:279
 msgid "_Parameters..."
 msgstr "_Parametri..."
 
-#: src/rfx-builder.c:277
+#: src/rfx-builder.c:282
 msgid "Set up parameters used in pre/loop/post/trigger code. Optional."
 msgstr ""
 "Predispone i parametri utilizzati in /pre/loop/post/trigger code. "
 "Facoltativo."
 
-#: src/rfx-builder.c:281
+#: src/rfx-builder.c:286
 msgid "Parameter _Window Hints..."
 msgstr "Suggerimenti Della _Finestra Dei Parametri..."
 
-#: src/rfx-builder.c:284
+#: src/rfx-builder.c:289
 msgid "Set hints about how to lay out the parameter window. Optional."
 msgstr ""
 "Attiva i suggerimenti su come strutturare la finestra parametri. Facoltativo."
 
-#: src/rfx-builder.c:290
+#: src/rfx-builder.c:295
 msgid "_Language code:"
 msgstr ""
 
-#: src/rfx-builder.c:291
+#: src/rfx-builder.c:296
 msgid "Language for pre/loop/post/triggers. Optional."
 msgstr "Lingua perr pre/loop/post/triggers. Facoltativo."
 
-#: src/rfx-builder.c:300
+#: src/rfx-builder.c:305
 msgid "_Pre loop code..."
 msgstr "Codice _prima del loop..."
 
-#: src/rfx-builder.c:303
+#: src/rfx-builder.c:308
 msgid "Code to be executed before the loop. Optional."
 msgstr "Codice da eseguire prima del loop. Facoltativo."
 
-#: src/rfx-builder.c:307
+#: src/rfx-builder.c:312
 msgid "_Loop code..."
 msgstr "Codice _loop..."
 
-#: src/rfx-builder.c:310
+#: src/rfx-builder.c:315
 msgid "Loop code to be applied to each frame."
 msgstr "Il codice loop che deve essere applicato ad ogni fotogramma."
 
-#: src/rfx-builder.c:314
+#: src/rfx-builder.c:319
 msgid "_Post loop code..."
 msgstr "Codice _dopo il loop..."
 
-#: src/rfx-builder.c:317
+#: src/rfx-builder.c:322
 msgid "Code to be executed after the loop. Optional."
 msgstr "Codice da essere eseguito dopo il loop. Facoltativo."
 
-#: src/rfx-builder.c:321
+#: src/rfx-builder.c:326
 msgid "_Trigger code..."
 msgstr "Codice _trigger..."
 
-#: src/rfx-builder.c:324
+#: src/rfx-builder.c:329
 msgid ""
 "Set trigger code for when the parameter window is shown, or when a parameter "
 "is changed. Optional (except for Utilities)."
@@ -6755,7 +6769,7 @@
 "mostrata, o quando un parametro viene cambiato. Facoltativo (eccetto per le "
 "Utilità)."
 
-#: src/rfx-builder.c:421
+#: src/rfx-builder.c:426
 #, c-format
 msgid ""
 "\n"
@@ -6770,55 +6784,55 @@
 "%s\n"
 "%s\n"
 
-#: src/rfx-builder.c:544
+#: src/rfx-builder.c:541
 msgid "LiVES: - RFX Requirements"
 msgstr "LiVES: - Requisiti RFX"
 
-#: src/rfx-builder.c:548
+#: src/rfx-builder.c:544
 msgid "LiVES: - RFX Parameters"
 msgstr "LiVES: - Parametri RFX"
 
-#: src/rfx-builder.c:552
+#: src/rfx-builder.c:547
 msgid "LiVES: - RFX Parameter Window Hints"
 msgstr "LiVES: - Suggerimenti Finestra Parametri RFX"
 
-#: src/rfx-builder.c:556
+#: src/rfx-builder.c:550
 msgid "LiVES: - RFX Triggers"
 msgstr "LiVES: - Trigger RFX"
 
-#: src/rfx-builder.c:622
+#: src/rfx-builder.c:613
 msgid "_New Entry"
 msgstr "_Nuova Entrata"
 
-#: src/rfx-builder.c:625
+#: src/rfx-builder.c:616
 msgid "_Edit Entry"
 msgstr "_Modifica Entrata"
 
-#: src/rfx-builder.c:628
+#: src/rfx-builder.c:619
 msgid "_Remove Entry"
 msgstr "_Rimuovi Entrata"
 
-#: src/rfx-builder.c:632
+#: src/rfx-builder.c:623
 msgid "Move _Up"
 msgstr "Sposta In _Alto"
 
-#: src/rfx-builder.c:635
+#: src/rfx-builder.c:626
 msgid "Move _Down"
 msgstr "Sposta In _Basso"
 
-#: src/rfx-builder.c:1004
+#: src/rfx-builder.c:984
 msgid "LiVES: - RFX Properties"
 msgstr "LiVES: - Proprietà RFX"
 
-#: src/rfx-builder.c:1013
+#: src/rfx-builder.c:993
 msgid "_Slow (hint to GUI)"
 msgstr "_Lento (suggerimento per la GUI)"
 
-#: src/rfx-builder.c:1024
+#: src/rfx-builder.c:1004
 msgid "_Batch mode generator"
 msgstr "Generatore modalità _batch"
 
-#: src/rfx-builder.c:1831
+#: src/rfx-builder.c:1790
 msgid ""
 "\n"
 "\n"
@@ -6832,7 +6846,7 @@
 "Per piacere rimuovi il trigger prima.\n"
 "\n"
 
-#: src/rfx-builder.c:1875
+#: src/rfx-builder.c:1834
 msgid ""
 "\n"
 "\n"
@@ -6844,27 +6858,27 @@
 "Alcuni trigger sono stati regolati.\n"
 "Per piacere controlla il codice trigger.\n"
 
-#: src/rfx-builder.c:1994
+#: src/rfx-builder.c:1950
 msgid "LiVES: - New RFX Parameter"
 msgstr "LiVES: - Nuovo Parametro RFX"
 
-#: src/rfx-builder.c:1997
+#: src/rfx-builder.c:1952
 msgid "LiVES: - Edit RFX Parameter"
 msgstr "LiVES: - Modifica Parametro RFX"
 
-#: src/rfx-builder.c:2013
+#: src/rfx-builder.c:1968
 msgid "_Name:    "
 msgstr "_Nome:    "
 
-#: src/rfx-builder.c:2016
+#: src/rfx-builder.c:1971
 msgid "Name of the parameter, must be unique in the plugin."
 msgstr "Nome del parametro, deve essere univoco nel plugin."
 
-#: src/rfx-builder.c:2025
+#: src/rfx-builder.c:1981
 msgid "_Label:    "
 msgstr "_Etichetta:    "
 
-#: src/rfx-builder.c:2028
+#: src/rfx-builder.c:1984
 msgid ""
 "Label to be shown by the parameter. An underscore represents mnemonic "
 "accelerator."
@@ -6872,162 +6886,162 @@
 "Etichetta da mostrare con il parametro. Il carattere di sottolineature "
 "rappresenta la scorciatoia da tastiera."
 
-#: src/rfx-builder.c:2039
+#: src/rfx-builder.c:1996
 msgid "_Type:         "
 msgstr "_Tipo:         "
 
-#: src/rfx-builder.c:2040
+#: src/rfx-builder.c:1997
 msgid "Parameter type (select from list)."
 msgstr "Tipo del parametro (seleziona dall'elenco)."
 
-#: src/rfx-builder.c:2073
+#: src/rfx-builder.c:2029
 msgid "Decimal _places: "
 msgstr "_Luoghi decimali: "
 
-#: src/rfx-builder.c:2082 src/rfx-builder.c:2477 src/rfx-builder.c:2495
+#: src/rfx-builder.c:2038 src/rfx-builder.c:2430 src/rfx-builder.c:2447
 msgid "_Default value:    "
 msgstr "Valore _predefinito:    "
 
-#: src/rfx-builder.c:2098
+#: src/rfx-builder.c:2054
 msgid "_Default: "
 msgstr "_Predefinito: "
 
-#: src/rfx-builder.c:2132
+#: src/rfx-builder.c:2087
 msgid "Button _Group: "
 msgstr "_Gruppo Bottone: "
 
-#: src/rfx-builder.c:2134
+#: src/rfx-builder.c:2089
 msgid "A non-zero value can be used to group radio buttons."
 msgstr ""
 "Un valore diverso da zero può essere utilizzato per raggruppare i bottoni "
 "raggio."
 
-#: src/rfx-builder.c:2142 src/rfx-builder.c:2478
+#: src/rfx-builder.c:2097 src/rfx-builder.c:2431
 msgid "_Minimum value: "
 msgstr "Valore _minimo: "
 
-#: src/rfx-builder.c:2148 src/rfx-builder.c:2479
+#: src/rfx-builder.c:2103 src/rfx-builder.c:2432
 msgid "Ma_ximum value: "
 msgstr "Valore mas_simo: "
 
-#: src/rfx-builder.c:2157
+#: src/rfx-builder.c:2113
 msgid "     _Step size:   "
 msgstr "     Dimensione _cadenza:   "
 
-#: src/rfx-builder.c:2160
+#: src/rfx-builder.c:2117
 msgid ""
 "How much the parameter is adjusted when the spinbutton arrows are pressed."
 msgstr ""
 "Determina quanto il parametro è modificato quando si preme la freccia sul "
 "potenziometro."
 
-#: src/rfx-builder.c:2171
+#: src/rfx-builder.c:2129
 msgid "_Wrap value"
 msgstr ""
 
-#: src/rfx-builder.c:2172
+#: src/rfx-builder.c:2131
 msgid "Whether the value wraps max->min and min->max."
 msgstr "Se il valore avvolge massimo->minimo e minimo->massimo."
 
-#: src/rfx-builder.c:2470
+#: src/rfx-builder.c:2424
 msgid "Set _values"
 msgstr "Imposta _valori"
 
-#: src/rfx-builder.c:2512
+#: src/rfx-builder.c:2463
 msgid "Default _Red:  "
 msgstr "Predefinito _Rosso:  "
 
-#: src/rfx-builder.c:2513
+#: src/rfx-builder.c:2464
 msgid "Default _Green:"
 msgstr "Predefinito _Verde:"
 
-#: src/rfx-builder.c:2514
+#: src/rfx-builder.c:2465
 msgid "Default _Blue: "
 msgstr "Predefinito _Blu: "
 
-#: src/rfx-builder.c:2538
+#: src/rfx-builder.c:2488
 msgid "Set _default"
 msgstr "Imposta _predefinito"
 
-#: src/rfx-builder.c:2540
+#: src/rfx-builder.c:2490
 msgid "Default value:  "
 msgstr "Valore predefinito:  "
 
-#: src/rfx-builder.c:2541
+#: src/rfx-builder.c:2491
 msgid "Maximum length (chars): "
 msgstr "Lunghezza massima (caratteri): "
 
-#: src/rfx-builder.c:2576
+#: src/rfx-builder.c:2526
 msgid "LiVES: - New RFX Parameter Window Hint"
 msgstr "LiVES: - Nuovo Suggerimento Finestra Parametri RFX"
 
-#: src/rfx-builder.c:2579
+#: src/rfx-builder.c:2528
 msgid "LiVES: - Edit RFX Parameter Window Hint"
 msgstr "LiVES: - Modifica Suggerimento Finestra Parametri RFX"
 
-#: src/rfx-builder.c:2622
+#: src/rfx-builder.c:2569
 msgid "_Keyword:         "
 msgstr ""
 
-#: src/rfx-builder.c:2639
+#: src/rfx-builder.c:2586
 msgid "Special _Type:         "
 msgstr ""
 
-#: src/rfx-builder.c:2656
+#: src/rfx-builder.c:2602
 msgid "Special _Subtype:         "
 msgstr ""
 
-#: src/rfx-builder.c:2667 src/rfx-builder.c:2706
+#: src/rfx-builder.c:2613 src/rfx-builder.c:2651
 msgid "Row:    "
 msgstr "Righa:    "
 
-#: src/rfx-builder.c:2732
+#: src/rfx-builder.c:2676
 #, c-format
 msgid "Linked parameters (%d):    "
 msgstr "Parametri collegati (%d):    "
 
-#: src/rfx-builder.c:2749
+#: src/rfx-builder.c:2693
 msgid "Linked parameters (4):    "
 msgstr "Parametri collegati (4):    "
 
-#: src/rfx-builder.c:2752
+#: src/rfx-builder.c:2695
 msgid "Linked parameters (2):    "
 msgstr "Parametri collegati (2):    "
 
-#: src/rfx-builder.c:2777
+#: src/rfx-builder.c:2720
 msgid "LiVES: - New RFX Trigger"
 msgstr "LiVES: - Nuovo Trigger RFX"
 
-#: src/rfx-builder.c:2780
+#: src/rfx-builder.c:2722
 msgid "LiVES: - Edit RFX Trigger"
 msgstr "LiVES: - Modifica Trigger RFX"
 
-#: src/rfx-builder.c:2808
+#: src/rfx-builder.c:2750
 msgid "When:         "
 msgstr "Quando:         "
 
-#: src/rfx-builder.c:2904
+#: src/rfx-builder.c:2846
 msgid "LiVES: - Pre Loop Code"
 msgstr "LiVES: - Codice Prima Del Loop"
 
-#: src/rfx-builder.c:2911
+#: src/rfx-builder.c:2853
 msgid "LiVES: - Loop Code"
 msgstr "LiVES: - Codice Loop"
 
-#: src/rfx-builder.c:2918
+#: src/rfx-builder.c:2860
 msgid "LiVES: - Post Loop Code"
 msgstr "LiVES: - Codice Dopo Il Loop"
 
-#: src/rfx-builder.c:2931
+#: src/rfx-builder.c:2873
 #, c-format
 msgid "LiVES: - Default text (max length %d)"
 msgstr "LiVES: - Testo predefinito (lunghezza massima %d)"
 
-#: src/rfx-builder.c:2944
+#: src/rfx-builder.c:2885
 msgid "LiVES: - Enter values, one per line"
 msgstr "LiVES: - Inserisci valori, uno per linea"
 
-#: src/rfx-builder.c:3055
+#: src/rfx-builder.c:2996
 msgid ""
 "\n"
 "\n"
@@ -7037,7 +7051,7 @@
 "\n"
 "Il nome non dev'essere vuoto.\n"
 
-#: src/rfx-builder.c:3060
+#: src/rfx-builder.c:3001
 msgid ""
 "\n"
 "\n"
@@ -7047,7 +7061,7 @@
 "\n"
 "Il nome non deve contenere spazi.\n"
 
-#: src/rfx-builder.c:3065
+#: src/rfx-builder.c:3006
 msgid ""
 "\n"
 "\n"
@@ -7057,7 +7071,7 @@
 "\n"
 "Il testo del menu non dev'essere vuoto.\n"
 
-#: src/rfx-builder.c:3071
+#: src/rfx-builder.c:3012
 msgid ""
 "\n"
 "\n"
@@ -7067,7 +7081,7 @@
 "\n"
 "La descrizione dell'azione non dev'essere vuoto.\n"
 
-#: src/rfx-builder.c:3076
+#: src/rfx-builder.c:3017
 msgid ""
 "\n"
 "\n"
@@ -7077,7 +7091,7 @@
 "\n"
 "L'autore non dev'essere vuoto.\n"
 
-#: src/rfx-builder.c:3085 src/rfx-builder.c:4339
+#: src/rfx-builder.c:3026 src/rfx-builder.c:4253
 msgid ""
 "\n"
 "\n"
@@ -7089,7 +7103,7 @@
 "Esiste già un plugin con questo nome.\n"
 "Il nome dev'essere univoco.\n"
 
-#: src/rfx-builder.c:3092
+#: src/rfx-builder.c:3033
 msgid ""
 "\n"
 "\n"
@@ -7099,7 +7113,7 @@
 "\n"
 "Il codice loop non dev'essere vuoto.\n"
 
-#: src/rfx-builder.c:3098
+#: src/rfx-builder.c:3039
 msgid ""
 "\n"
 "\n"
@@ -7109,7 +7123,7 @@
 "\n"
 "Il codice del trigger non deve essere vuoto per un'utilità.\n"
 
-#: src/rfx-builder.c:3111
+#: src/rfx-builder.c:3052
 msgid ""
 "\n"
 "\n"
@@ -7119,7 +7133,7 @@
 "\n"
 "Il nome del parametro non dev'essere vuoto.\n"
 
-#: src/rfx-builder.c:3117
+#: src/rfx-builder.c:3058
 msgid ""
 "\n"
 "\n"
@@ -7133,41 +7147,41 @@
 "univoci in un plugin.\n"
 "\n"
 
-#: src/rfx-builder.c:3171
+#: src/rfx-builder.c:3111
 #, c-format
 msgid "Writing script file %s..."
 msgstr "Scrittura del file script %s in corso..."
 
-#: src/rfx-builder.c:3477
+#: src/rfx-builder.c:3411
 msgid "No <define> section found in script.\n"
 msgstr "Nessuna sezione <definisci> trovata nello script.\n"
 
-#: src/rfx-builder.c:3484 src/rfx-builder.c:3493
+#: src/rfx-builder.c:3418 src/rfx-builder.c:3427
 msgid "Bad script version.\n"
 msgstr "Versione script errata.\n"
 
-#: src/rfx-builder.c:3505
+#: src/rfx-builder.c:3439
 msgid "No <name> section found in script.\n"
 msgstr "Nessuna sezione <nome> trovata nello script.\n"
 
-#: src/rfx-builder.c:3513
+#: src/rfx-builder.c:3447
 msgid "No <version> section found in script.\n"
 msgstr "Nessuna sezione <versione> trovata nello script.\n"
 
-#: src/rfx-builder.c:3522
+#: src/rfx-builder.c:3456
 msgid "No <author> section found in script.\n"
 msgstr "Nessuna sezione <autore> trovata nello script.\n"
 
-#: src/rfx-builder.c:3536
+#: src/rfx-builder.c:3470
 msgid "No <description> section found in script.\n"
 msgstr "Nessuna sezione <descrizione> trovata nello script.\n"
 
-#: src/rfx-builder.c:3540
+#: src/rfx-builder.c:3474
 #, c-format
 msgid "Bad description. (%s)\n"
 msgstr "Descrizione errata. (%s)\n"
 
-#: src/rfx-builder.c:3702
+#: src/rfx-builder.c:3627
 #, c-format
 msgid ""
 "\n"
@@ -7182,27 +7196,27 @@
 "trovato nello script.\n"
 "\n"
 
-#: src/rfx-builder.c:3859
+#: src/rfx-builder.c:3780
 msgid "Rebuilding all RFX scripts...builtin..."
 msgstr "Ricostruendo tutti gli script RFX...integrato..."
 
-#: src/rfx-builder.c:3860
+#: src/rfx-builder.c:3781
 msgid "Rebuilding scripts"
 msgstr "Ricostruendo gli script"
 
-#: src/rfx-builder.c:3868
+#: src/rfx-builder.c:3789
 msgid "custom..."
 msgstr "personalizzato..."
 
-#: src/rfx-builder.c:3872
+#: src/rfx-builder.c:3793
 msgid "test..."
 msgstr "test..."
 
-#: src/rfx-builder.c:3878
+#: src/rfx-builder.c:3799
 msgid "rebuilding dynamic menu entries..."
 msgstr "ricostruendo entrate del menu dinamico..."
 
-#: src/rfx-builder.c:3905 src/rfx-builder.c:3912
+#: src/rfx-builder.c:3826 src/rfx-builder.c:3834
 #, c-format
 msgid ""
 "\n"
@@ -7216,7 +7230,7 @@
 "Per favore controlla se questo programma è nel tuo percorso ed è "
 "esecutibile.\n"
 
-#: src/rfx-builder.c:3951
+#: src/rfx-builder.c:3874
 #, c-format
 msgid ""
 "\n"
@@ -7231,12 +7245,12 @@
 "%s ?\n"
 "\n"
 
-#: src/rfx-builder.c:3960
+#: src/rfx-builder.c:3884
 #, c-format
 msgid "Deleting rfx script %s..."
 msgstr "Eliminazione dello script rfx %s in corso..."
 
-#: src/rfx-builder.c:3980
+#: src/rfx-builder.c:3902
 #, c-format
 msgid ""
 "\n"
@@ -7251,7 +7265,7 @@
 "%s\n"
 "Il codice dell'errore è %d\n"
 
-#: src/rfx-builder.c:4016
+#: src/rfx-builder.c:3938
 #, c-format
 msgid ""
 "\n"
@@ -7266,12 +7280,12 @@
 "esiste già.\n"
 "Per piacere eliminalo, o rinomina lo script test.\n"
 
-#: src/rfx-builder.c:4027
+#: src/rfx-builder.c:3950
 #, c-format
 msgid "Promoting rfx test plugin %s to custom..."
 msgstr "Promuovendo il plugin test rfx %s a personalizzato..."
 
-#: src/rfx-builder.c:4044
+#: src/rfx-builder.c:3965
 #, c-format
 msgid ""
 "\n"
@@ -7282,20 +7296,20 @@
 "Return code was %d (%s)\n"
 msgstr ""
 
-#: src/rfx-builder.c:4070
+#: src/rfx-builder.c:3990
 msgid "LiVES: - Export Script to..."
 msgstr ""
 
-#: src/rfx-builder.c:4077 src/rfx-builder.c:4156
+#: src/rfx-builder.c:3997 src/rfx-builder.c:4074
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "Copia di %s a %s in corso..."
 
-#: src/rfx-builder.c:4105
+#: src/rfx-builder.c:4024
 msgid "LiVES: Import Script from..."
 msgstr ""
 
-#: src/rfx-builder.c:4148
+#: src/rfx-builder.c:4067
 #, c-format
 msgid ""
 "\n"
@@ -7310,43 +7324,43 @@
 "esiste già.\n"
 "Per piacere eliminalo, o rinomina lo script di importazione.\n"
 
-#: src/rfx-builder.c:4249
+#: src/rfx-builder.c:4166
 msgid "LiVES: - Copy RFX Script"
 msgstr "LiVES: - Copia Script RFX"
 
-#: src/rfx-builder.c:4251
+#: src/rfx-builder.c:4168
 msgid "_From type:    "
 msgstr ""
 
-#: src/rfx-builder.c:4258
+#: src/rfx-builder.c:4175
 msgid "   Script:    "
 msgstr "   Script:    "
 
-#: src/rfx-builder.c:4267
+#: src/rfx-builder.c:4183
 msgid "LiVES: - Rename test RFX Script"
 msgstr "LiVES: - Rinomina lo Script test RFX"
 
-#: src/rfx-builder.c:4268
+#: src/rfx-builder.c:4184
 msgid "From script: "
 msgstr "Dallo script: "
 
-#: src/rfx-builder.c:4273
+#: src/rfx-builder.c:4188
 msgid "LiVES: - RFX Script name"
 msgstr "LiVES: - Nome Script RFX"
 
-#: src/rfx-builder.c:4274
+#: src/rfx-builder.c:4189
 msgid "Script name: "
 msgstr "Nome script: "
 
-#: src/rfx-builder.c:4294
+#: src/rfx-builder.c:4209
 msgid "New name: "
 msgstr "Nuovo nome: "
 
-#: src/rfx-builder.c:4297
+#: src/rfx-builder.c:4212
 msgid "New script name: "
 msgstr "Nuovo nome script: "
 
-#: src/rfx-builder.c:4372
+#: src/rfx-builder.c:4286
 msgid ""
 "\n"
 "\n"
@@ -7358,12 +7372,12 @@
 "C'è già uno script test con questo nome.\n"
 "Il nome dello script dev'essere univoco.\n"
 
-#: src/rfx-builder.c:4384
+#: src/rfx-builder.c:4297
 #, c-format
 msgid "Renaming RFX test script %s to %s..."
 msgstr "Rinominando lo script test RFX da %s a %s..."
 
-#: src/rfx-builder.c:4390
+#: src/rfx-builder.c:4302
 #, c-format
 msgid ""
 "\n"
@@ -7380,23 +7394,23 @@
 "%s\n"
 "Il codice di ritorno è %d\n"
 
-#: src/rfx-builder.c:4610
+#: src/rfx-builder.c:4518
 msgid "_Apply Real Time Effects to Selection"
 msgstr "_Applica Effetti In Tempo Reale alla Selezione"
 
-#: src/rfx-builder.c:4664
+#: src/rfx-builder.c:4572
 #, c-format
 msgid "Loading rendered effect %s..."
 msgstr "Caricando l'effetto renderizzato %s..."
 
-#: src/rfx-builder.c:4766
+#: src/rfx-builder.c:4674
 msgid ""
 "See: VJ - show VJ keys. Set the realtime effects, and then apply them here."
 msgstr ""
 "Guarda: VJ - mostra tasti VJ. Imposta gli eventi in tempo reale, e poi "
 "applicali qui."
 
-#: src/preferences.c:359
+#: src/preferences.c:351
 msgid ""
 "\n"
 "\n"
@@ -7408,7 +7422,7 @@
 "I plugin di riproduzione del video sono attivi solo nello\n"
 "schermo intero, modalità finestra separata (fs)\n"
 
-#: src/preferences.c:408
+#: src/preferences.c:400
 msgid ""
 "\n"
 "\n"
@@ -7416,7 +7430,7 @@
 "(Free space = UNKNOWN)"
 msgstr ""
 
-#: src/preferences.c:412
+#: src/preferences.c:403
 #, c-format
 msgid ""
 "\n"
@@ -7425,14 +7439,14 @@
 "(Free space = %s)"
 msgstr ""
 
-#: src/preferences.c:416
+#: src/preferences.c:408
 msgid ""
 "The temp directory is LiVES working directory where opened clips and sets "
 "are stored.\n"
 "It should be in a partition with plenty of free disk space.\n"
 msgstr ""
 
-#: src/preferences.c:784
+#: src/preferences.c:839
 #, c-format
 msgid ""
 "Unable to create or write to the new temporary directory.\n"
@@ -7443,7 +7457,7 @@
 "The directory will not be changed now.\n"
 msgstr ""
 
-#: src/preferences.c:786
+#: src/preferences.c:843
 #, c-format
 msgid ""
 "Unable to create or write to the new temporary directory.\n"
@@ -7453,7 +7467,7 @@
 "The directory will not be changed now.\n"
 msgstr ""
 
-#: src/preferences.c:798
+#: src/preferences.c:856
 msgid ""
 "You have chosen to change the temporary directory.\n"
 "Please make sure you have no other copies of LiVES open.\n"
@@ -7473,7 +7487,7 @@
 "In alternativa, premi Annulla per riportare la directory temporanea alla sua "
 "impostazione originaria."
 
-#: src/preferences.c:1169
+#: src/preferences.c:1221
 msgid ""
 "\n"
 "Unable to switch audio players to jack - jackd must be installed first.\n"
@@ -7484,7 +7498,7 @@
 "installare jackd.\n"
 "Consulta http://jackaudio.org\n"
 
-#: src/preferences.c:1175
+#: src/preferences.c:1226
 msgid ""
 "\n"
 "Switching audio players requires restart (jackd must not be running)\n"
@@ -7493,7 +7507,7 @@
 "Scambiare i lettori audio richiede il riavvio (jackd non deve essere in "
 "esecuzione)\n"
 
-#: src/preferences.c:1202
+#: src/preferences.c:1253
 msgid ""
 "\n"
 "Unable to switch audio players to pulse audio\n"
@@ -7505,341 +7519,341 @@
 "prima bisogna installare pulseaudio.\n"
 "Consulta http://www.pulseaudio.org\n"
 
-#: src/preferences.c:1502
+#: src/preferences.c:1544
 msgid "PCM (highest quality; largest files)"
 msgstr "PCM (qualità più alta; file più larghi)"
 
-#: src/preferences.c:2063
+#: src/preferences.c:2096
 msgid "LiVES: - Preferences"
 msgstr "LiVES: - Preferenze"
 
-#: src/preferences.c:2142
+#: src/preferences.c:2177
 msgid "Open file selection maximised"
 msgstr "Apri la selezione del file massimizzata"
 
-#: src/preferences.c:2149
+#: src/preferences.c:2184
 msgid "Show recent files in the File menu"
 msgstr "Mostra file recenti nel menu File"
 
-#: src/preferences.c:2158
+#: src/preferences.c:2193
 msgid "Stop screensaver on playback    "
 msgstr "Interrompi il salvaschermo durante la riproduzione    "
 
-#: src/preferences.c:2165
+#: src/preferences.c:2200
 msgid "Open main window maximised"
 msgstr "Apri la finestra principale massimizzata"
 
-#: src/preferences.c:2173
+#: src/preferences.c:2208
 msgid "Show toolbar when background is blanked"
 msgstr "Mostra la barra degli strumenti quando lo sfondo è reso vuoto"
 
-#: src/preferences.c:2181
+#: src/preferences.c:2216
 msgid "Allow mouse wheel to switch clips"
 msgstr "Permetti alla rotella del mouse di scambiare i clip"
 
-#: src/preferences.c:2192
+#: src/preferences.c:2227
 msgid "Shrink previews to fit in interface"
 msgstr ""
 
-#: src/preferences.c:2202
+#: src/preferences.c:2237
 msgid "Startup mode:"
 msgstr "Modalità di avvio:"
 
-#: src/preferences.c:2206
+#: src/preferences.c:2241
 msgid "_Clip editor"
 msgstr "Editor _clip"
 
-#: src/preferences.c:2210
+#: src/preferences.c:2245
 msgid "_Multitrack mode"
 msgstr "Modalità _multi-traccia"
 
-#: src/preferences.c:2234
+#: src/preferences.c:2268
 msgid "Multi-head support"
 msgstr "Supporto multi-testa"
 
-#: src/preferences.c:2242
+#: src/preferences.c:2276
 msgid " monitor number for LiVES interface"
 msgstr " numero di schermi per l'interfaccia di LiVES"
 
-#: src/preferences.c:2248
+#: src/preferences.c:2282
 msgid " monitor number for playback"
 msgstr " numero di schermi per la riproduzione"
 
-#: src/preferences.c:2260
+#: src/preferences.c:2294
 msgid ""
 "A setting of 0 means use all available monitors (only works with some "
 "playback plugins)."
 msgstr ""
 
-#: src/preferences.c:2270
+#: src/preferences.c:2304
 msgid "Force single monitor"
 msgstr "Forza schermo singolo"
 
-#: src/preferences.c:2271
+#: src/preferences.c:2305
 msgid "Ignore all except the first monitor."
 msgstr ""
 
-#: src/preferences.c:2293
+#: src/preferences.c:2327
 msgid "Show clip thumbnails during playback"
 msgstr ""
 
-#: src/preferences.c:2306
+#: src/preferences.c:2340
 msgid "GUI"
 msgstr "GUI"
 
-#: src/preferences.c:2321
+#: src/preferences.c:2355
 msgid "When entering Multitrack mode:"
 msgstr "Quando si entra nella modalità Multi-traccia:"
 
-#: src/preferences.c:2330
+#: src/preferences.c:2364
 msgid "_Prompt me for width, height, fps and audio settings"
 msgstr "_Suggeriscimi le impostazioni di audio, fps, larghezza e altezza"
 
-#: src/preferences.c:2336
+#: src/preferences.c:2370
 msgid "_Always use the following values:"
 msgstr "Utilizza _sempre i seguenti valori:"
 
-#: src/preferences.c:2345
+#: src/preferences.c:2379
 msgid "Use these same _values for rendering a new clip"
 msgstr "Utilizza questi stessi _valori per renderizzare un nuovo clip"
 
-#: src/preferences.c:2370
+#: src/preferences.c:2404
 msgid "_Width           "
 msgstr "_Larghezza           "
 
-#: src/preferences.c:2375
+#: src/preferences.c:2409
 msgid "          _Height      "
 msgstr "          _Altezza      "
 
-#: src/preferences.c:2379
+#: src/preferences.c:2413
 msgid "          _FPS"
 msgstr ""
 
-#: src/preferences.c:2387
+#: src/preferences.c:2421
 msgid "Enable backing audio track"
 msgstr "Abilita la traccia audio di supporto"
 
-#: src/preferences.c:2394
+#: src/preferences.c:2428
 msgid "Audio track per video track"
 msgstr "Traccia audio per traccia video"
 
-#: src/preferences.c:2423
+#: src/preferences.c:2457
 msgid "    _Undo buffer size (MB)    "
 msgstr "    _Annulla dimensione buffer (MB)    "
 
-#: src/preferences.c:2432
+#: src/preferences.c:2466
 msgid "_Exit multitrack mode after rendering"
 msgstr "_Abbandona la modalità multi-traccia dopo aver renderizzato"
 
-#: src/preferences.c:2440
+#: src/preferences.c:2474
 msgid "Auto backup layouts"
 msgstr "Recupera automaticamente i layout"
 
-#: src/preferences.c:2445
+#: src/preferences.c:2479
 msgid "_Every"
 msgstr "_Ogni"
 
-#: src/preferences.c:2453
+#: src/preferences.c:2487
 msgid "seconds"
 msgstr "secondi"
 
-#: src/preferences.c:2461
+#: src/preferences.c:2495
 msgid "After every _change"
 msgstr "Dopo ogni _cambiamento"
 
-#: src/preferences.c:2467
+#: src/preferences.c:2501
 msgid "_Never"
 msgstr "_Mai"
 
-#: src/preferences.c:2490
+#: src/preferences.c:2523
 msgid "Multitrack/Render"
 msgstr "Multi-traccia/Render"
 
-#: src/preferences.c:2508
+#: src/preferences.c:2541
 msgid "Use instant opening when possible"
 msgstr "Utilizza l'apertura istantanea quando possibile"
 
-#: src/preferences.c:2509
+#: src/preferences.c:2543
 msgid "Enable instant opening of some file types using decoder plugins"
 msgstr ""
 "Abilita l'apertura istantanea di alcuni tipi di file usando i plugin "
 "decodificatori"
 
-#: src/preferences.c:2531
+#: src/preferences.c:2567
 msgid "Video open command (fallback)"
 msgstr ""
 
-#: src/preferences.c:2543
+#: src/preferences.c:2579
 msgid "Open/render compression"
 msgstr ""
 
-#: src/preferences.c:2546
+#: src/preferences.c:2582
 msgid " %     ( lower = slower, larger files; for jpeg, higher quality )"
 msgstr ""
 " %     (più basso = più lento, file larghi; per jpeg, qualità più alta)"
 
-#: src/preferences.c:2558
+#: src/preferences.c:2594
 msgid "Default image format"
 msgstr ""
 
-#: src/preferences.c:2562
+#: src/preferences.c:2598
 msgid "_jpeg"
 msgstr "_jpeg"
 
-#: src/preferences.c:2565
+#: src/preferences.c:2601
 msgid "_png"
 msgstr "_png"
 
-#: src/preferences.c:2572
+#: src/preferences.c:2608
 msgid "(Check Help/Troubleshoot to see which image formats are supported)"
 msgstr ""
 "(Controlla in Aiuto/Risoluzione problemi per vedere quali formati di "
 "immagine sono supportati)"
 
-#: src/preferences.c:2580
+#: src/preferences.c:2616
 msgid "Enable automatic deinterlacing when possible"
 msgstr "Abilita il deinterlacciamento automatico quando possibile"
 
-#: src/preferences.c:2582
+#: src/preferences.c:2619
 msgid "Automatically deinterlace frames when a plugin suggests it"
 msgstr ""
 "Deinterlaccia automaticamente i fotogrammi quando un plugin lo suggerisce"
 
-#: src/preferences.c:2593
+#: src/preferences.c:2632
 #, fuzzy
 msgid "Automatic trimming / padding of audio when possible"
 msgstr "Abilita il deinterlacciamento automatico quando possibile"
 
-#: src/preferences.c:2595
+#: src/preferences.c:2634
 #, fuzzy
 msgid "Automatically trim or pad audio when a plugin suggests it"
 msgstr ""
 "Deinterlaccia automaticamente i fotogrammi quando un plugin lo suggerisce"
 
-#: src/preferences.c:2606
+#: src/preferences.c:2646
 msgid "Ignore blank borders when possible"
 msgstr ""
 
-#: src/preferences.c:2608
+#: src/preferences.c:2648
 msgid "Clip any blank borders from frames where possible"
 msgstr ""
 
-#: src/preferences.c:2619
+#: src/preferences.c:2660
 msgid "When opening multiple files, concatenate images into one clip"
 msgstr "Durante l'apertura di file multipli, concatena immagini in un clip"
 
-#: src/preferences.c:2629
+#: src/preferences.c:2670
 msgid "Decoding"
 msgstr "Decodifica"
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:2652
+#: src/preferences.c:2693
 msgid "Low - can improve performance on slower machines"
 msgstr "Bassa - può migliorare l'esibizione sulle macchine più lente"
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:2654
+#: src/preferences.c:2695
 msgid "Normal - recommended for most users"
 msgstr "Normale - consigliato per la maggior parte degli utenti"
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:2656
+#: src/preferences.c:2697
 msgid "High - can improve quality on very fast machines"
 msgstr "Alta - può migliorare la qualità sulle macchine molto veloci"
 
-#: src/preferences.c:2659
+#: src/preferences.c:2700
 msgid "Preview _quality"
 msgstr "Visualizza in anteprima la _qualità"
 
-#: src/preferences.c:2660
+#: src/preferences.c:2701
 msgid "The preview quality for video playback - affects resizing"
 msgstr ""
 "La qualità di anteprima per la riproduzione video - riguarda il "
 "ridimensionamento"
 
-#: src/preferences.c:2675
+#: src/preferences.c:2717
 msgid "_Show FPS statistics"
 msgstr "_Mostra statistiche FPS"
 
-#: src/preferences.c:2694
+#: src/preferences.c:2736
 msgid "_Plugin"
 msgstr "_Plugin"
 
-#: src/preferences.c:2718
+#: src/preferences.c:2760
 msgid "Stream audio"
 msgstr ""
 
-#: src/preferences.c:2721
+#: src/preferences.c:2763
 msgid "Stream audio to playback plugin"
 msgstr ""
 
-#: src/preferences.c:2734
+#: src/preferences.c:2778
 msgid "Record player output"
 msgstr ""
 
-#: src/preferences.c:2737
+#: src/preferences.c:2781
 msgid "Record output from player instead of input to player"
 msgstr ""
 
-#: src/preferences.c:2744
+#: src/preferences.c:2789
 msgid "VIDEO"
 msgstr "VIDEO"
 
-#: src/preferences.c:2787
+#: src/preferences.c:2833
 msgid "_Player"
 msgstr "_Lettore"
 
-#: src/preferences.c:2792
+#: src/preferences.c:2838
 msgid "(See also the Jack Integration tab for jack startup options)"
 msgstr ""
 "(Guarda anche la scheda Integrazione Jack per le opzioni di avvio di jack)"
 
-#: src/preferences.c:2819
+#: src/preferences.c:2865
 msgid "mplayer"
 msgstr "mplayer"
 
-#: src/preferences.c:2830
+#: src/preferences.c:2876
 #, fuzzy
 msgid "mplayer2"
 msgstr "mplayer"
 
-#: src/preferences.c:2833
+#: src/preferences.c:2879
 msgid "Audio play _command"
 msgstr "_Comando di riproduzione dell'audio"
 
-#: src/preferences.c:2840
+#: src/preferences.c:2886
 msgid "- internal -"
 msgstr "- interno -"
 
-#: src/preferences.c:2849
+#: src/preferences.c:2895
 msgid "Audio follows video _rate/direction"
 msgstr "L'audio segue il _valore/direzione del video"
 
-#: src/preferences.c:2857
+#: src/preferences.c:2903
 msgid "Audio follows _clip switches"
 msgstr "L'audio segue gli scambi dei _clip"
 
-#: src/preferences.c:2864
+#: src/preferences.c:2910
 msgid "Source:"
 msgstr ""
 
-#: src/preferences.c:2868
+#: src/preferences.c:2914
 msgid "_Internal"
 msgstr ""
 
-#: src/preferences.c:2873
+#: src/preferences.c:2919
 msgid "_External (requires jack or pulse audio player)"
 msgstr ""
 
-#: src/preferences.c:2892
+#: src/preferences.c:2940
 msgid "AUDIO"
 msgstr "AUDIO"
 
-#: src/preferences.c:2902
+#: src/preferences.c:2950
 msgid "Playback"
 msgstr "Riproduzione"
 
-#: src/preferences.c:2925
+#: src/preferences.c:2973
 msgid ""
 "Record audio when capturing an e_xternal window\n"
 " (requires jack or pulse audio)"
@@ -7847,68 +7861,68 @@
 "Registra l'audio durande la registrazione di una finestra es_terna\n"
 " (richiede jack o pulse audio)"
 
-#: src/preferences.c:2940
+#: src/preferences.c:2988
 msgid "      What to record when 'r' is pressed   "
 msgstr "      Cosa registrare quando 'r' è premuto   "
 
-#: src/preferences.c:2949
+#: src/preferences.c:2997
 msgid "_Frame changes"
 msgstr "Cambiamenti dei _fotogrammi"
 
-#: src/preferences.c:2964
+#: src/preferences.c:3012
 msgid "F_PS changes"
 msgstr "Cambiamenti degli F_PS"
 
-#: src/preferences.c:2982
+#: src/preferences.c:3030
 msgid "_Real time effects"
 msgstr "Effetti in tempo _reale"
 
-#: src/preferences.c:2993
+#: src/preferences.c:3041
 msgid "_Clip switches"
 msgstr "Scambi _clip"
 
-#: src/preferences.c:3004
+#: src/preferences.c:3052
 msgid "_Audio (requires jack or pulse audio player)"
 msgstr ""
 
-#: src/preferences.c:3024
+#: src/preferences.c:3072
 msgid "Pause recording if free disk space falls below"
 msgstr ""
 
 #. TRANSLATORS: gigabytes
-#: src/preferences.c:3030
+#: src/preferences.c:3078
 msgid "GB"
 msgstr "GB"
 
-#: src/preferences.c:3037
+#: src/preferences.c:3085
 msgid "Recording"
 msgstr "Registrazione in corso"
 
-#: src/preferences.c:3055
+#: src/preferences.c:3103
 msgid "Encoder"
 msgstr ""
 
-#: src/preferences.c:3090
+#: src/preferences.c:3137
 msgid "Output format"
 msgstr "Formato output"
 
-#: src/preferences.c:3106
+#: src/preferences.c:3153
 msgid "Audio codec"
 msgstr "Codec audio"
 
-#: src/preferences.c:3119
+#: src/preferences.c:3165
 msgid "Encoding"
 msgstr "Codificazione"
 
-#: src/preferences.c:3134
+#: src/preferences.c:3180
 msgid "Use _antialiasing when resizing"
 msgstr "Utilizza l'_antialiasing durante il ridimensionamento"
 
-#: src/preferences.c:3143
+#: src/preferences.c:3189
 msgid "Number of _real time effect keys"
 msgstr "Numero dei tasti degli effetti in tempo _reale"
 
-#: src/preferences.c:3145
+#: src/preferences.c:3192
 msgid ""
 "The number of \"virtual\" real time effect keys. They can be controlled "
 "through the real time effects window, or via network (OSC)."
@@ -7917,96 +7931,96 @@
 "essere controllati attraverso la finestra degli effetti in tempo reale, "
 "oppure tramite rete (OSC)."
 
-#: src/preferences.c:3152
+#: src/preferences.c:3199
 msgid "Use _threads where possible when applying effects"
 msgstr ""
 
-#: src/preferences.c:3159
+#: src/preferences.c:3207
 msgid "Number of _threads"
 msgstr ""
 
-#: src/preferences.c:3172
+#: src/preferences.c:3221
 msgid "Restart is required if any of the following paths are changed:"
 msgstr ""
 
-#: src/preferences.c:3182
+#: src/preferences.c:3231
 msgid "Weed plugin path"
 msgstr ""
 
-#: src/preferences.c:3184
+#: src/preferences.c:3234
 msgid "Frei0r plugin path"
 msgstr ""
 
-#: src/preferences.c:3186
+#: src/preferences.c:3237
 msgid "LADSPA plugin path"
 msgstr ""
 
-#: src/preferences.c:3209
+#: src/preferences.c:3261
 msgid "      Video load directory (default)      "
 msgstr "      Directory di caricamento dei video (predefinita)      "
 
-#: src/preferences.c:3215
+#: src/preferences.c:3267
 msgid "      Video save directory (default) "
 msgstr "      Directory di salvataggio dei video (predefinita) "
 
-#: src/preferences.c:3221
+#: src/preferences.c:3273
 msgid "      Audio load directory (default) "
 msgstr "      Directory di caricamento dell'audio (predefinita) "
 
-#: src/preferences.c:3227
+#: src/preferences.c:3279
 msgid "      Image directory (default) "
 msgstr "      Directory delle immagini (predefinita) "
 
-#: src/preferences.c:3233
+#: src/preferences.c:3285
 msgid "      Backup/Restore directory (default) "
 msgstr "      Directory di backup/ripristino (predefinita) "
 
-#: src/preferences.c:3239
+#: src/preferences.c:3291
 msgid "      Temp directory (do not remove) "
 msgstr "      Directory temporanea (non eliminare) "
 
-#: src/preferences.c:3252
+#: src/preferences.c:3304
 msgid "The default directory for loading video clips from"
 msgstr "La directory predefinita da cui caricare i clip video"
 
-#: src/preferences.c:3277
+#: src/preferences.c:3329
 msgid "The default directory for saving encoded clips to"
 msgstr "La directory predefinita in cui salvare i clip codificati"
 
-#: src/preferences.c:3285
+#: src/preferences.c:3337
 msgid "The default directory for loading and saving audio"
 msgstr "La directory predefinita per caricare e salvare l'audio"
 
-#: src/preferences.c:3293
+#: src/preferences.c:3345
 msgid "The default directory for saving frameshots to"
 msgstr "La directory predefinita in cui salvare le riprese"
 
-#: src/preferences.c:3301
+#: src/preferences.c:3353
 msgid "The default directory for backing up/restoring single clips"
 msgstr ""
 "La directory predefinita per ripristinare/fare il backup dei clip singoli"
 
-#: src/preferences.c:3309
+#: src/preferences.c:3361
 msgid "LiVES working directory."
 msgstr "Directory di lavoro di LiVES."
 
-#: src/preferences.c:3359
+#: src/preferences.c:3412
 msgid "Directories"
 msgstr "Directory"
 
-#: src/preferences.c:3374
+#: src/preferences.c:3427
 msgid "Warn if diskspace falls below: "
 msgstr ""
 
-#: src/preferences.c:3380 src/preferences.c:3394
+#: src/preferences.c:3433 src/preferences.c:3447
 msgid " MB [set to 0 to disable]"
 msgstr ""
 
-#: src/preferences.c:3389
+#: src/preferences.c:3442
 msgid "Diskspace critical level: "
 msgstr ""
 
-#: src/preferences.c:3407
+#: src/preferences.c:3461
 msgid ""
 "Warn on Insert / Merge if _frame rate of clipboard does not match frame rate "
 "of selection"
@@ -8014,19 +8028,19 @@
 "Avvisa in Inserisci / Unisci se il rapporto dei _fotogrammi degli appunti "
 "non coincide con il rapporto dei fotogrammi della selezione"
 
-#: src/preferences.c:3417
+#: src/preferences.c:3471
 msgid "Warn on Open if file _size exceeds "
 msgstr "Avvisa nell'Apertura se la _dimensione del file eccede "
 
-#: src/preferences.c:3425
+#: src/preferences.c:3479
 msgid " MB"
 msgstr " MB"
 
-#: src/preferences.c:3432
+#: src/preferences.c:3486
 msgid "Show a warning before saving a se_t"
 msgstr "Mostra un avviso prima di salvare un se_t"
 
-#: src/preferences.c:3442
+#: src/preferences.c:3496
 #, fuzzy
 msgid ""
 "Show a warning if _mplayer/mplayer2, sox, composite or convert is not found "
@@ -8035,73 +8049,73 @@
 "Mostra un avviso se _mplayer, sox, composit o convert non sono trovati "
 "quando LiVES viene avviato."
 
-#: src/preferences.c:3452
+#: src/preferences.c:3506
 msgid "Show a warning if no _rendered effects are found at startup."
 msgstr ""
 "Mostra un avviso se nessun effetto _renderizzato viene trovato all'avvio."
 
-#: src/preferences.c:3464
+#: src/preferences.c:3518
 msgid "Show a warning if no _encoder plugins are found at startup."
 msgstr ""
 "Mostra un avviso se nessun plugin _codificatore viene trovato all'avvio."
 
-#: src/preferences.c:3474
+#: src/preferences.c:3528
 msgid "Show a warning if a _duplicate set name is entered."
 msgstr "Mostra un avviso se un nome set _duplicato viene inserito."
 
-#: src/preferences.c:3485
+#: src/preferences.c:3539
 msgid "When a set is loaded, warn if clips are missing from _layouts."
 msgstr "Quando un set viene caricato, avvisa se dei clip mancano dai _layout."
 
-#: src/preferences.c:3495
+#: src/preferences.c:3550
 msgid "Warn if a clip used in a layout is about to be closed."
 msgstr "Avvisa se un clip usato in un layout sta per venire chiuso."
 
-#: src/preferences.c:3505
+#: src/preferences.c:3561
 msgid "Warn if frames used in a layout are about to be deleted."
 msgstr ""
 "Avvisa se dei fotogrammi utilizzati in un layout stanno per venire eliminati."
 
-#: src/preferences.c:3515
+#: src/preferences.c:3572
 msgid "Warn if frames used in a layout are about to be shifted."
 msgstr ""
 "Avvisa se dei fotogrammi utilizzati in un layout stanno per venire spostati."
 
-#: src/preferences.c:3525
+#: src/preferences.c:3583
 msgid "Warn if frames used in a layout are about to be altered."
 msgstr ""
 "Avvisa se dei fotogrammi utilizzati in un layout stanno per venire alterati."
 
-#: src/preferences.c:3535
+#: src/preferences.c:3594
 msgid "Warn if audio used in a layout is about to be deleted."
 msgstr "Avvisa se l'audio utilizzato in un layout sta per venire eliminato."
 
-#: src/preferences.c:3546
+#: src/preferences.c:3606
 msgid "Warn if audio used in a layout is about to be shifted."
 msgstr "Avvisa se l'audio utilizzato in un layout sta per venire spostato."
 
-#: src/preferences.c:3556
+#: src/preferences.c:3617
 msgid "Warn if audio used in a layout is about to be altered."
 msgstr "Avvisa se l'audio utilizzato in un layout sta per venire alterato."
 
-#: src/preferences.c:3566
+#: src/preferences.c:3628
 msgid "Popup layout errors after clip changes."
 msgstr ""
 
-#: src/preferences.c:3577
+#: src/preferences.c:3639
 msgid "Warn if the layout has not been saved when leaving multitrack mode."
 msgstr ""
 "Avvisa se il layout non è stato salvato quando si lascia la modalità multi-"
 "traccia."
 
-#: src/preferences.c:3588
+#: src/preferences.c:3650
 msgid ""
 "Warn if multitrack has no audio channels, and a layout with audio is loaded."
 msgstr ""
 "Avvisa se la multi-traccia non ha canali audio, e un layout con audio viene "
 "caricato"
 
-#: src/preferences.c:3598
+#: src/preferences.c:3660
 msgid ""
 "Warn if multitrack has audio channels, and your audio player is not \"jack\" "
 "or \"pulse audio\"."
@@ -8109,113 +8123,113 @@
 "Avvisa se la multi-traccia ha canali audio, e se il tuo lettore audio non è "
 "\"jack\" o \"pulse audio\"."
 
-#: src/preferences.c:3610
+#: src/preferences.c:3672
 msgid "Show info message after importing from firewire device."
 msgstr ""
 "Mostra un messaggio di informazioni dopo aver importato da un dispositivo "
 "firewire."
 
-#: src/preferences.c:3626
+#: src/preferences.c:3688
 msgid "Show a warning before opening a yuv4mpeg stream (advanced)."
 msgstr "Mostra un avviso prima di aprire un flusso yuv4mpeg (avanzato)."
 
-#: src/preferences.c:3639
+#: src/preferences.c:3701
 msgid "Show a warning when multitrack is low on backup space."
 msgstr "Mostra un avviso quando la multi-traccia ha poco spazio di backup."
 
-#: src/preferences.c:3650
+#: src/preferences.c:3713
 msgid "Show a warning advising cleaning of disk space after a crash."
 msgstr ""
 "Mostra un avviso che consigli di pulire lo spazio del disco dopo un crash."
 
-#: src/preferences.c:3661
+#: src/preferences.c:3725
 msgid "Show a warning if unable to connect to pulseaudio player."
 msgstr ""
 
-#: src/preferences.c:3673
+#: src/preferences.c:3737
 #, fuzzy
 msgid "Show a warning before wiping a layout which has unsaved changes."
 msgstr "Mostra un avviso prima di aprire un flusso yuv4mpeg (avanzato)."
 
-#: src/preferences.c:3685
+#: src/preferences.c:3749
 msgid "Warnings"
 msgstr "Avvisi"
 
-#: src/preferences.c:3703
+#: src/preferences.c:3767
 msgid "Midi synch (requires the files midistart and midistop)"
 msgstr "Sincronizzazione Midi (richiede i file midistart e midistop)"
 
-#: src/preferences.c:3715
+#: src/preferences.c:3779
 msgid "When inserting/merging frames:  "
 msgstr "Quando si inseriscono/uniscono fotogrammi:  "
 
-#: src/preferences.c:3719
+#: src/preferences.c:3783
 msgid "_Speed Up/Slow Down Insertion"
 msgstr "_Velocizza/Rallenta Inserzione"
 
-#: src/preferences.c:3723
+#: src/preferences.c:3787
 msgid "_Resample Insertion"
 msgstr "_Ricampiona Inserzione"
 
-#: src/preferences.c:3730
+#: src/preferences.c:3794
 msgid "CD device           "
 msgstr "Dispositivo CD           "
 
-#: src/preferences.c:3733
+#: src/preferences.c:3797
 msgid "LiVES can load audio tracks from this CD"
 msgstr "LiVES può caricare tracce audio da questo CD"
 
-#: src/preferences.c:3746
+#: src/preferences.c:3813
 msgid "Default FPS        "
 msgstr "FPS Predefinito        "
 
-#: src/preferences.c:3749
+#: src/preferences.c:3816
 msgid "Frames per second to use when none is specified"
 msgstr "Fotogrammi al secondo da usare quando non viene specificato nulla"
 
-#: src/preferences.c:3757
+#: src/preferences.c:3825
 msgid "Misc"
 msgstr "Varie"
 
-#: src/preferences.c:3782
+#: src/preferences.c:3850
 msgid "New theme:           "
 msgstr "Nuovo tema:           "
 
-#: src/preferences.c:3800
+#: src/preferences.c:3867
 msgid "Themes"
 msgstr "Temi"
 
-#: src/preferences.c:3815
+#: src/preferences.c:3882
 msgid "Download bandwidth (Kb/s)       "
 msgstr "Larghezza di banda dei download (Kb/s)       "
 
-#: src/preferences.c:3823
+#: src/preferences.c:3890
 msgid "LiVES must be compiled without \"configure --disable-OSC\" to use OMC"
 msgstr ""
 "LiVES dev'essere compilato senza \"configure --disable-OSC\" per utilizzare "
 "OMC"
 
-#: src/preferences.c:3833
+#: src/preferences.c:3900
 msgid "OMC remote control enabled"
 msgstr "Controllo remoto OMC abilitato"
 
-#: src/preferences.c:3841
+#: src/preferences.c:3908
 msgid "UDP port       "
 msgstr "Porta UDP       "
 
-#: src/preferences.c:3850
+#: src/preferences.c:3917
 msgid "Start OMC on startup"
 msgstr "Avvia OMC all'avvio"
 
-#: src/preferences.c:3870
+#: src/preferences.c:3937
 msgid "Streaming/Networking"
 msgstr "Streaming/Collegamento in rete"
 
-#: src/preferences.c:3882
+#: src/preferences.c:3949
 msgid "Jack transport"
 msgstr "Trasporto jack"
 
-#: src/preferences.c:3886
+#: src/preferences.c:3953
 msgid ""
 "LiVES must be compiled with jack/transport.h and jack/jack.h present to use "
 "jack transport"
@@ -8223,44 +8237,44 @@
 "LiVES dev'essere compilato con jack/transport.h e jack/jack.h presenti per "
 "usare trasporto jack"
 
-#: src/preferences.c:3892
+#: src/preferences.c:3959
 msgid "Jack _transport config file"
 msgstr "File di configurazione di _trasporto jack"
 
-#: src/preferences.c:3899 src/preferences.c:3989
+#: src/preferences.c:3967 src/preferences.c:4058
 msgid "Start _server on LiVES startup"
 msgstr "Avvia il _server all'avvio di LiVES"
 
-#: src/preferences.c:3911
+#: src/preferences.c:3979
 msgid "Jack transport _master (start and stop)"
 msgstr ""
 
-#: src/preferences.c:3921
+#: src/preferences.c:3989
 msgid "Jack transport _client (start and stop)"
 msgstr "_Client jack transport (inizio e fine)"
 
-#: src/preferences.c:3935
+#: src/preferences.c:4003
 msgid "Jack transport sets start position"
 msgstr "Jack transport imposta la posizione di avvio"
 
-#: src/preferences.c:3952
+#: src/preferences.c:4020
 msgid "Jack transport timebase slave"
 msgstr ""
 
-#: src/preferences.c:3963
+#: src/preferences.c:4031
 msgid "(See also Playback -> Audio follows video rate/direction)"
 msgstr ""
 
-#: src/preferences.c:3971
+#: src/preferences.c:4039
 msgid "Jack audio"
 msgstr "Audio jack"
 
-#: src/preferences.c:3975
+#: src/preferences.c:4043
 msgid "LiVES must be compiled with jack/jack.h present to use jack audio"
 msgstr ""
 "LiVES dev'essere compilato con presente jack/jack.h per usare l'audio jack"
 
-#: src/preferences.c:3978
+#: src/preferences.c:4046
 msgid ""
 "You MUST set the audio player to \"jack\" in the Playback tab to use jack "
 "audio"
@@ -8268,77 +8282,77 @@
 "DEVI impostare il lettore audio in \"jack\" nella scheda Playback per usare "
 "l'audio jack"
 
-#: src/preferences.c:3984
+#: src/preferences.c:4052
 msgid "Jack _audio server config file"
 msgstr "File di configurazione del server _audio jack"
 
-#: src/preferences.c:3996
+#: src/preferences.c:4065
 msgid "Play audio even when transport is _paused"
 msgstr "Riproduci l'audio anche quando transport è in _pausa"
 
-#: src/preferences.c:4008
+#: src/preferences.c:4077
 msgid "Automatically connect to System Out ports when 'playing' External Audio"
 msgstr ""
 
-#: src/preferences.c:4021
+#: src/preferences.c:4090
 msgid "Jack Integration"
 msgstr "Integrazione Jack"
 
-#: src/preferences.c:4035
+#: src/preferences.c:4104
 msgid "Events to respond to:"
 msgstr "Eventi a cui rispondere:"
 
-#: src/preferences.c:4044
+#: src/preferences.c:4113
 msgid "_Joystick events"
 msgstr "Eventi _joystick"
 
-#: src/preferences.c:4051
+#: src/preferences.c:4120
 msgid "_Joystick device"
 msgstr "Dispositivo _joystick"
 
-#: src/preferences.c:4053
+#: src/preferences.c:4122
 msgid "The joystick device, e.g. /dev/input/js0"
 msgstr "Il dispositivo joystick, per esempio /dev/input/js0"
 
-#: src/preferences.c:4071
+#: src/preferences.c:4142
 msgid "_MIDI events"
 msgstr "Eventi _MIDI"
 
-#: src/preferences.c:4080
+#: src/preferences.c:4151
 msgid "Use _ALSA MIDI (recommended)"
 msgstr "Utilizza _ALSA MIDI (consigliato)"
 
-#: src/preferences.c:4082
+#: src/preferences.c:4153
 msgid "Create an ALSA MIDI port which other MIDI devices can be connected to"
 msgstr ""
 "Crea una porta ALSA MIDI a cui gli altri dispositivi MIDI si possono "
 "connettere"
 
-#: src/preferences.c:4090
+#: src/preferences.c:4162
 msgid "Use _raw MIDI"
 msgstr "Utilizza MIDI _grezzo"
 
-#: src/preferences.c:4092
+#: src/preferences.c:4164
 msgid "Read directly from the MIDI device"
 msgstr "Leggi direttamente dal dispositivo MIDI"
 
-#: src/preferences.c:4104
+#: src/preferences.c:4177
 msgid "_MIDI device"
 msgstr "Dispositivo MI_DI"
 
-#: src/preferences.c:4106
+#: src/preferences.c:4179
 msgid "The MIDI device, e.g. /dev/input/midi0"
 msgstr "Il dispositivo MIDI, per esempio /dev/input/midi0"
 
-#: src/preferences.c:4118
+#: src/preferences.c:4193
 msgid "Advanced"
 msgstr "Avanzate"
 
-#: src/preferences.c:4124
+#: src/preferences.c:4199
 msgid "MIDI check _rate"
 msgstr "_Valore di controllo MIDI"
 
-#: src/preferences.c:4127
+#: src/preferences.c:4203
 msgid ""
 "Number of MIDI checks per keyboard tick. Increasing this may improve MIDI "
 "responsiveness, but may slow down playback."
@@ -8346,25 +8360,25 @@
 "Numero di controlli MIDI per battuta di tastiera. L'aumento di questo può "
 "migliorare la risposta MIDI, ma può rallentare la riproduzione."
 
-#: src/preferences.c:4134
+#: src/preferences.c:4211
 msgid "MIDI repeat"
 msgstr "Ripetizione MIDI"
 
-#: src/preferences.c:4137
+#: src/preferences.c:4214
 msgid "Number of non-reads allowed between succesive reads."
 msgstr "Numero di non-letture permesso tra letture successive."
 
-#: src/preferences.c:4140
+#: src/preferences.c:4218
 msgid "(Warning: setting this value too high can slow down playback.)"
 msgstr ""
 "(Attenzione: impostare questo valore troppo alto può rallentare la "
 "riproduzione.)"
 
-#: src/preferences.c:4159
+#: src/preferences.c:4237
 msgid "MIDI/Joystick learner"
 msgstr "Studente MIDI/joystick"
 
-#: src/preferences.c:4499
+#: src/preferences.c:4679
 msgid ""
 "\n"
 "LiVES will now shut down. You need to restart it for the directory change to "
@@ -8376,72 +8390,72 @@
 "della directory abbia effetto.\n"
 "Clicca OK per continuare.\n"
 
-#: src/preferences.c:4523
+#: src/preferences.c:4703
 msgid ""
 "For the directory change to take effect LiVES will restart when preferences "
 "dialog closes."
 msgstr ""
 
-#: src/preferences.c:4527
+#: src/preferences.c:4707
 msgid "Theme changes will not take effect until the next time you start LiVES."
 msgstr ""
 "I cambiamenti di tema non avranno effetto fino al prossimo avvio di LiVES."
 
-#: src/preferences.c:4531
+#: src/preferences.c:4711
 msgid "Jack options will not take effect until the next time you start LiVES."
 msgstr ""
 "Le opzioni di jack non avranno effetto fino al prossimo avvio di LiVES."
 
-#: src/osc.c:2585
+#: src/osc.c:2616
 #, c-format
 msgid "Syncing to external framerate of %.8f frames per second.\n"
 msgstr ""
 "Sincronizzando con il valore dei fotogrammi esterno di %.8f fotogrammi al "
 "secondo.\n"
 
-#: src/osc.c:6746
+#: src/osc.c:6938
 msgid "Cannot initialize OSC receiver\n"
 msgstr "Non è possibile inizializzare il ricevitore OSC\n"
 
-#: src/osc.c:6770
+#: src/osc.c:6961
 #, c-format
 msgid "WARNING: Cannot start OSC server at UDP port %d\n"
 msgstr "ATTENZIONE: Non è possibile avviare il server OSC sulla porta UDP %d\n"
 
-#: src/osc.c:6775
+#: src/osc.c:6963
 #, c-format
 msgid "Started OSC server at UDP port %d\n"
 msgstr "Avviato il server OSC sulla porta UDP %d\n"
 
-#: src/osc.c:6890
+#: src/osc.c:7076
 #, c-format
 msgid "Cannot start OSC/UDP server at port %d \n"
 msgstr "Non è possibile avviare il server OSC/UDP sulla porta %d \n"
 
-#: src/resample.c:125 src/resample.c:304
+#: src/resample.c:131 src/resample.c:305
 #, c-format
 msgid "Resizing frames 1 to %d"
 msgstr "Ridimensionamento dei fotogrammi da 1 a %d in corso"
 
-#: src/resample.c:140 src/resample.c:318
+#: src/resample.c:145 src/resample.c:318
 #, c-format
 msgid "Resizing/letterboxing frames 1 to %d"
 msgstr ""
 
-#: src/resample.c:361 src/resample.c:385
+#: src/resample.c:360 src/resample.c:384
 msgid "Resize"
 msgstr "Ridimensiona"
 
-#: src/resample.c:395
+#: src/resample.c:394
 msgid "Resample/Resize"
 msgstr "Ricampiona/Ridimensiona"
 
-#: src/resample.c:680
+#: src/resample.c:676
 #, c-format
 msgid "Length of video is now %d frames.\n"
 msgstr "La lunghezza del video è adesso di %d fotogrammi.\n"
 
-#: src/resample.c:745
+#: src/resample.c:737
 msgid ""
 "\n"
 "\n"
@@ -8451,146 +8465,146 @@
 "\n"
 "Il nuovo rapporto dev'essere maggiore di 0\n"
 
-#: src/resample.c:797 src/resample.c:813
+#: src/resample.c:788 src/resample.c:803
 msgid "Resampling audio"
 msgstr "Ricampionando l'audio"
 
-#: src/resample.c:831
+#: src/resample.c:821
 msgid "LiVES was unable to resample the audio as requested.\n"
 msgstr "LiVES non è stato in grado di ricampionare l'audio come richiesto.\n"
 
-#: src/resample.c:833 src/resample.c:837
+#: src/resample.c:823 src/resample.c:827
 msgid "Resample Audio"
 msgstr "Ricampiona Audio"
 
-#: src/resample.c:845
+#: src/resample.c:835
 #, c-format
 msgid "Audio was resampled to %d Hz, %d channels, %d bit"
 msgstr "L'audio è stato ricampionato a %d Hz, %d canali, %d bit"
 
-#: src/resample.c:1034
+#: src/resample.c:1016
 #, c-format
 msgid "Resampling video at %.8f frames per second..."
 msgstr "Ricampionando il video a %.8f fotogrammi al secondo..."
 
-#: src/resample.c:1037
+#: src/resample.c:1018
 #, c-format
 msgid "Resampling video at %.3f frames per second..."
 msgstr "Ricampionando il video a %.3f fotogrammi al secondo..."
 
-#: src/resample.c:1068
+#: src/resample.c:1049
 msgid "Reordering error !\n"
 msgstr "Errore di riordinamento !\n"
 
-#: src/resample.c:1079
+#: src/resample.c:1060
 msgid "Resample"
 msgstr "Ricampiona"
 
-#: src/resample.c:1192
+#: src/resample.c:1173
 msgid "LiVES: - Resample Audio"
 msgstr "LiVES: - Ricampiona Audio"
 
-#: src/resample.c:1195
+#: src/resample.c:1175
 msgid "LiVES: - Insert Silence"
 msgstr "LiVES: - Inserisci Silenzio"
 
-#: src/resample.c:1198
+#: src/resample.c:1177
 msgid "LiVES: - New Clip Audio"
 msgstr "LiVES: - Nuovo Audio Clip"
 
-#: src/resample.c:1201
+#: src/resample.c:1179
 msgid "LiVES: - External Clip Settings"
 msgstr "LiVES: - Impostazioni Clip Esterne"
 
-#: src/resample.c:1238 src/resample.c:1358
+#: src/resample.c:1215 src/resample.c:1332
 msgid "Rate (Hz) "
 msgstr "Valore (Hz) "
 
-#: src/resample.c:1245 src/resample.c:1372
+#: src/resample.c:1222 src/resample.c:1346
 msgid "Channels"
 msgstr ""
 
-#: src/resample.c:1252
+#: src/resample.c:1229
 msgid "Sample Size "
 msgstr ""
 
-#: src/resample.c:1268 src/resample.c:1425
+#: src/resample.c:1245 src/resample.c:1399
 msgid "Signed"
 msgstr "Firmato"
 
-#: src/resample.c:1274 src/resample.c:1435
+#: src/resample.c:1251 src/resample.c:1409
 msgid "Unsigned"
 msgstr "Non Firmato"
 
-#: src/resample.c:1297 src/resample.c:1460
+#: src/resample.c:1273 src/resample.c:1433
 msgid "Little Endian"
 msgstr "Piccolo Endian"
 
-#: src/resample.c:1303 src/resample.c:1468
+#: src/resample.c:1279 src/resample.c:1441
 msgid "Big Endian"
 msgstr "Grande Endian"
 
-#: src/resample.c:1315
+#: src/resample.c:1290
 msgid "Current"
 msgstr "Corrente"
 
-#: src/resample.c:1340
+#: src/resample.c:1315
 msgid "_Enable audio"
 msgstr "_Abilita audio"
 
-#: src/resample.c:1372
+#: src/resample.c:1346
 msgid "_Channels"
 msgstr ""
 
-#: src/resample.c:1394
+#: src/resample.c:1368
 msgid "_Sample Size"
 msgstr ""
 
-#: src/resample.c:1394
+#: src/resample.c:1368
 msgid "Sample Size"
 msgstr ""
 
-#: src/resample.c:1489
+#: src/resample.c:1461
 msgid "New"
 msgstr "Nuovo"
 
-#: src/resample.c:1512
+#: src/resample.c:1484
 msgid "_Frames Per Second "
 msgstr "_Fotogrammi Al Secondo "
 
-#: src/resample.c:1530
+#: src/resample.c:1502
 msgid "Record for maximum:  "
 msgstr "Registra per un massimo di:  "
 
-#: src/resample.c:1533
+#: src/resample.c:1505
 msgid " hours  "
 msgstr " ore  "
 
-#: src/resample.c:1536
+#: src/resample.c:1508
 msgid " minutes  "
 msgstr " minuti  "
 
-#: src/resample.c:1538
+#: src/resample.c:1510
 msgid " seconds  "
 msgstr " secondi  "
 
-#: src/resample.c:1545
+#: src/resample.c:1517
 msgid "Unlimited"
 msgstr "Illimitato"
 
-#: src/resample.c:1561
+#: src/resample.c:1533
 msgid "Click OK to begin recording, or Cancel to quit."
 msgstr "Clicca OK per iniziare a registrare, o Annulla per uscire."
 
-#: src/resample.c:1670
+#: src/resample.c:1638
 msgid "LiVES: - Change playback speed"
 msgstr "LiVES: - Cambia la velocità di riproduzione"
 
-#: src/resample.c:1673
+#: src/resample.c:1640
 msgid "LiVES: - Resample Video"
 msgstr "LiVES: - Ricampiona Video"
 
-#: src/resample.c:1696
+#: src/resample.c:1663
 #, c-format
 msgid ""
 "\n"
@@ -8607,7 +8621,7 @@
 "Per piacere inserisci la velocità di riproduzione desiderata\n"
 "in _fotogrammi al secondo"
 
-#: src/resample.c:1701
+#: src/resample.c:1667
 #, c-format
 msgid ""
 "\n"
@@ -8624,15 +8638,15 @@
 "Per piacere inserisci il valore _ricampionato\n"
 "in fotogrammi al secondo"
 
-#: src/resample.c:1723
+#: src/resample.c:1688
 msgid "OR enter the desired clip length in _seconds"
 msgstr "OPPURE inserisci la lunghezza desiderata del clip in _secondi"
 
-#: src/resample.c:1745
+#: src/resample.c:1710
 msgid "Change the _audio speed as well"
 msgstr "Cambia anche la velocità dell'_audio"
 
-#: src/resample.c:1846
+#: src/resample.c:1810
 msgid ""
 "\n"
 "Speeding up the clip will cause missing frames in some multitrack layouts.\n"
@@ -8643,7 +8657,7 @@
 "traccia.\n"
 "Sei sicuro di voler cambiare la velocità ?\n"
 
-#: src/resample.c:1863
+#: src/resample.c:1829
 msgid ""
 "\n"
 "Speeding up the clip will cause missing audio in some multitrack layouts.\n"
@@ -8654,49 +8668,49 @@
 "traccia.\n"
 "Sei sicuro di voler cambiare la velocità ?\n"
 
-#: src/resample.c:1878
+#: src/resample.c:1847
 msgid ""
 "\n"
 "Changing the speed will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/resample.c:1892
+#: src/resample.c:1863
 msgid ""
 "\n"
 "Changing the speed will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/resample.c:1938
+#: src/resample.c:1911
 msgid "Speed Change"
 msgstr "Cambiamento Della Velocità"
 
-#: src/resample.c:1947
+#: src/resample.c:1920
 #, c-format
 msgid "Changed playback speed to %.3f frames per second and audio to %d Hz.\n"
 msgstr ""
 "Cambiata la velocità di riproduzione in %.3f fotogrammi al secondo e l'audio "
 "in %d Hz.\n"
 
-#: src/resample.c:1950
+#: src/resample.c:1922
 #, c-format
 msgid "Changed playback speed to %.3f frames per second.\n"
 msgstr "Cambiata la velocità di riproduzione in %.3f fotogrammi al secondo.\n"
 
-#: src/resample.c:2035
+#: src/resample.c:2006
 msgid "Resampling video"
 msgstr "Ricampionando il video"
 
-#: src/resample.c:2042 src/resample.c:2160 src/resample.c:2182
+#: src/resample.c:2012 src/resample.c:2127 src/resample.c:2148
 msgid "Resampling clipboard video"
 msgstr "Ricampionando il video degli appunti"
 
-#: src/resample.c:2047
+#: src/resample.c:2016
 msgid "Reordering frames"
 msgstr "Riordinamento fotogrammi in corso"
 
-#: src/resample.c:2056
+#: src/resample.c:2025
 msgid ""
 "\n"
 "\n"
@@ -8706,20 +8720,20 @@
 "\n"
 "LiVES non è stato in grado di riordinare i fotogrammi."
 
-#: src/resample.c:2104
+#: src/resample.c:2071
 msgid "Deordering frames"
 msgstr "Disordinamento dei fotogrammi in corso"
 
-#: src/resample.c:2199
+#: src/resample.c:2165
 msgid "resampling error..."
 msgstr "ricampionando l'errore..."
 
-#: src/rte_window.c:85 src/rte_window.c:1708
+#: src/rte_window.c:124 src/rte_window.c:1709
 #, c-format
 msgid "Type: %s"
 msgstr "Tipo: %s"
 
-#: src/rte_window.c:112
+#: src/rte_window.c:150
 msgid ""
 "\n"
 "\n"
@@ -8735,7 +8749,7 @@
 "Sei sicuro ?\n"
 "\n"
 
-#: src/rte_window.c:426
+#: src/rte_window.c:460
 msgid ""
 "\n"
 "\n"
@@ -8747,12 +8761,12 @@
 "Clicca 'OK' per salvare questa mappa dei tasti come predefinita\n"
 "\n"
 
-#: src/rte_window.c:432
+#: src/rte_window.c:466
 #, c-format
 msgid "Saving keymap to %s\n"
 msgstr "Salvataggio della mappa dei tasti in %s\n"
 
-#: src/rte_window.c:439
+#: src/rte_window.c:471
 #, c-format
 msgid ""
 "\n"
@@ -8761,7 +8775,7 @@
 "\n"
 "Aggiornamento del file della mappa dei tasti %s in corso..."
 
-#: src/rte_window.c:446
+#: src/rte_window.c:477
 #, c-format
 msgid ""
 "\n"
@@ -8771,12 +8785,12 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/rte_window.c:526
+#: src/rte_window.c:556
 #, c-format
 msgid "Saving real time effect defaults to %s..."
 msgstr "Salvando i predefiniti degli effetti in tempo reale in %s..."
 
-#: src/rte_window.c:535
+#: src/rte_window.c:563
 #, c-format
 msgid ""
 "\n"
@@ -8791,22 +8805,22 @@
 "%s\n"
 "Codice errore %d\n"
 
-#: src/rte_window.c:632
+#: src/rte_window.c:657
 #, c-format
 msgid "Loading real time effect defaults from %s..."
 msgstr "Caricamento dei predefiniti degli effetti in tempo reale da %s..."
 
-#: src/rte_window.c:681
+#: src/rte_window.c:701
 #, c-format
 msgid "Loading generator default sizes from %s..."
 msgstr "Caricando le dimensioni predefinite del generatore da %s..."
 
-#: src/rte_window.c:1306
+#: src/rte_window.c:1319
 #, c-format
 msgid "Loading default keymap from %s..."
 msgstr "Caricamento della mappa dei tasti predefinita da %s..."
 
-#: src/rte_window.c:1329
+#: src/rte_window.c:1339
 #, c-format
 msgid ""
 "\n"
@@ -8821,27 +8835,27 @@
 "%s\n"
 "Codice errore %d\n"
 
-#: src/rte_window.c:1403
+#: src/rte_window.c:1412
 #, c-format
 msgid "Invalid line %d in %s\n"
 msgstr "Linea %d non valida in %s\n"
 
-#: src/rte_window.c:1483
+#: src/rte_window.c:1490
 #, c-format
 msgid "Invalid key %d in %s\n"
 msgstr "Tasto %d non valido in %s\n"
 
-#: src/rte_window.c:1498
+#: src/rte_window.c:1505
 #, c-format
 msgid "Invalid effect %s in %s\n"
 msgstr "Effetto %s non valido in %s\n"
 
-#: src/rte_window.c:1517
+#: src/rte_window.c:1524
 #, c-format
 msgid "Unknown effect %s in %s\n"
 msgstr ""
 
-#: src/rte_window.c:1535
+#: src/rte_window.c:1542
 #, c-format
 msgid ""
 "This version of LiVES cannot mix generators/non-generators on the same key "
@@ -8850,21 +8864,21 @@
 "Questa versione di LiVES non può mescolare generatori/non-generatori nello "
 "stesso tasto (%d) !\n"
 
-#: src/rte_window.c:1547
+#: src/rte_window.c:1554
 #, c-format
 msgid "Too many effects bound to key %d.\n"
 msgstr "Troppi effetti legati al tasto %d.\n"
 
-#: src/rte_window.c:1587
+#: src/rte_window.c:1593
 msgid "update required.\n"
 msgstr "aggiornamento richiesto.\n"
 
-#: src/rte_window.c:1603
+#: src/rte_window.c:1607
 #, c-format
 msgid "Loading data connection map from %s..."
 msgstr ""
 
-#: src/rte_window.c:1612
+#: src/rte_window.c:1614
 msgid ""
 "\n"
 "\n"
@@ -8876,41 +8890,41 @@
 "Alcuni effetti non sono stati trovati.\n"
 "\n"
 
-#: src/rte_window.c:1691
+#: src/rte_window.c:1692
 #, c-format
 msgid "LiVES: Information for %s"
 msgstr "LiVES: Informazioni su %s"
 
-#: src/rte_window.c:1704
+#: src/rte_window.c:1705
 #, c-format
 msgid "Effect name: %s"
 msgstr "Nome effetto: %s"
 
-#: src/rte_window.c:1712
+#: src/rte_window.c:1713
 #, c-format
 msgid "Plugin name: %s"
 msgstr "Nome plugin: %s"
 
-#: src/rte_window.c:1716
+#: src/rte_window.c:1717
 #, c-format
 msgid "Author: %s"
 msgstr "Autore: %s"
 
-#: src/rte_window.c:1721
+#: src/rte_window.c:1722
 #, c-format
 msgid "and: %s"
 msgstr ""
 
-#: src/rte_window.c:1726
+#: src/rte_window.c:1727
 #, c-format
 msgid "Version: %d"
 msgstr "Versione: %d"
 
-#: src/rte_window.c:1734
+#: src/rte_window.c:1735
 msgid "Description: "
 msgstr "Descrizione: "
 
-#: src/rte_window.c:1960
+#: src/rte_window.c:1963
 msgid ""
 "\n"
 "\n"
@@ -8924,69 +8938,69 @@
 "generatori nello stesso tasto.\n"
 "\n"
 
-#: src/rte_window.c:2024
+#: src/rte_window.c:2027
 #, c-format
 msgid "LiVES could not locate the effect %s.\n"
 msgstr "LiVES non è stato in grado di trovare l'effetto %s.\n"
 
-#: src/rte_window.c:2225
+#: src/rte_window.c:2216
 msgid "LiVES: Real time effect mapping"
 msgstr "LiVES: Mappatura degli effetti in tempo reale"
 
-#: src/rte_window.c:2257
+#: src/rte_window.c:2248
 #, c-format
 msgid "Ctrl-%d"
 msgstr "Ctrl-%d"
 
-#: src/rte_window.c:2264
+#: src/rte_window.c:2255
 msgid "Key active"
 msgstr "Tasto attivo"
 
-#: src/rte_window.c:2279
+#: src/rte_window.c:2271
 msgid "Key grab"
 msgstr "Blocco tasto"
 
-#: src/rte_window.c:2280
+#: src/rte_window.c:2272
 msgid "Grab keyboard for this effect key"
 msgstr "Blocca la tastiera per questo tasto effetto"
 
-#: src/rte_window.c:2290
+#: src/rte_window.c:2283
 msgid "_Clear all effects"
 msgstr "_Pulisci tutti gli effetti"
 
-#: src/rte_window.c:2304
+#: src/rte_window.c:2297
 msgid "Mode active"
 msgstr "Modalità in corso di esecuzione"
 
-#: src/rte_window.c:2314 src/multitrack.c:8568
+#: src/rte_window.c:2307 src/multitrack.c:8762
 msgid "Info"
 msgstr "Informazioni"
 
-#: src/rte_window.c:2315
+#: src/rte_window.c:2308
 msgid "Set Parameters"
 msgstr "Imposta Parametri"
 
-#: src/rte_window.c:2316
+#: src/rte_window.c:2309
 msgid "Set Connections"
 msgstr ""
 
-#: src/rte_window.c:2317
+#: src/rte_window.c:2310
 msgid "Clear"
 msgstr "Pulisci"
 
-#: src/rte_window.c:2326
+#: src/rte_window.c:2319
 msgid "Effect name:"
 msgstr "Nome effetto:"
 
-#: src/rte_window.c:2391
+#: src/rte_window.c:2384
 msgid "_Save as default keymap"
 msgstr "_Salva come mappa dei tasti predefinita"
 
-#: src/rte_window.c:2396
+#: src/rte_window.c:2389
 msgid "_Load default keymap"
 msgstr "_Carica mappa dei tasti predefinita"
 
-#: src/rte_window.c:2840
+#: src/rte_window.c:2833
 #, c-format
 msgid ""
 "Unable to create default keymap file: %s\n"
@@ -9048,7 +9062,7 @@
 msgid "none\n"
 msgstr "niente\n"
 
-#: src/lives-yuv4mpeg.c:494
+#: src/lives-yuv4mpeg.c:493
 #, c-format
 msgid ""
 "Unable to set display framerate to %.3f fps.\n"
@@ -9058,73 +9072,73 @@
 "visualizzazione a %.3f fps.\n"
 "\n"
 
-#: src/lives-yuv4mpeg.c:503
+#: src/lives-yuv4mpeg.c:502
 #, c-format
 msgid "Unable to open yuv4mpeg out stream %s\n"
 msgstr "Non è stato possibile aprire yuv4mpeg dal flusso %s\n"
 
-#: src/lives-yuv4mpeg.c:628
+#: src/lives-yuv4mpeg.c:626
 #, c-format
 msgid "TV card %d"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:713
+#: src/lives-yuv4mpeg.c:710
 #, c-format
 msgid "Opened TV card %d (%s)"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:760
+#: src/lives-yuv4mpeg.c:757
 #, c-format
 msgid "Firewire card %d"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:796
+#: src/lives-yuv4mpeg.c:793
 #, c-format
 msgid "Opened firewire card %d"
 msgstr ""
 
-#: src/multitrack.c:666
+#: src/multitrack.c:736
 msgid "Auto backup"
 msgstr "Backup automatico"
 
-#: src/multitrack.c:868
+#: src/multitrack.c:935
 msgid "Backing audio"
 msgstr "Audio di supporto"
 
-#: src/multitrack.c:1435
+#: src/multitrack.c:1515
 #, fuzzy, c-format
 msgid "%s : parameters for %s"
 msgstr "Nessun parametro"
 
-#: src/multitrack.c:1809 src/multitrack.c:3483
+#: src/multitrack.c:1881 src/multitrack.c:3635
 #, c-format
 msgid "Current track: %s (layer %d)\n"
 msgstr "Traccia corrente: %s (livello %d)\n"
 
-#: src/multitrack.c:1813 src/multitrack.c:3484
+#: src/multitrack.c:1885 src/multitrack.c:3637
 msgid "Current track: Backing audio\n"
 msgstr "Traccia corrente: Audio di supporto\n"
 
-#: src/multitrack.c:1814
+#: src/multitrack.c:1886
 #, c-format
 msgid "Current track: Layer %d audio\n"
 msgstr "Traccia corrente: Audio livello %d\n"
 
-#: src/multitrack.c:1817
+#: src/multitrack.c:1889
 #, c-format
 msgid "%.2f sec.\n"
 msgstr "%.2f secondi.\n"
 
-#: src/multitrack.c:1822 src/multitrack.c:3490
+#: src/multitrack.c:1894 src/multitrack.c:3643
 #, c-format
 msgid "Source: %s"
 msgstr "Fonte: %s"
 
-#: src/multitrack.c:1825 src/multitrack.c:3492
+#: src/multitrack.c:1897 src/multitrack.c:3645
 msgid "Right click for context menu.\n"
 msgstr "Clicca con il tasto destro per attivare il menu contestuale\n"
 
-#: src/multitrack.c:1827
+#: src/multitrack.c:1899
 msgid ""
 "Double click on a block\n"
 "to select it."
@@ -9132,7 +9146,7 @@
 "Clicca due volte su un blocco\n"
 "per selezionarlo."
 
-#: src/multitrack.c:3312
+#: src/multitrack.c:3452
 msgid ""
 "\n"
 "\n"
@@ -9141,7 +9155,7 @@
 "right or double clicking on it.\n"
 msgstr ""
 
-#: src/multitrack.c:3315
+#: src/multitrack.c:3455
 msgid ""
 "\n"
 "\n"
@@ -9149,7 +9163,7 @@
 "Select an effect in FX stack first to view its parameters.\n"
 msgstr ""
 
-#: src/multitrack.c:3318
+#: src/multitrack.c:3458
 msgid ""
 "\n"
 "\n"
@@ -9159,7 +9173,7 @@
 "\n"
 "Nessun clip caricato.\n"
 
-#: src/multitrack.c:3321
+#: src/multitrack.c:3462
 msgid ""
 "You must select two video tracks\n"
 "and a time region\n"
@@ -9169,7 +9183,7 @@
 "before inserting clips into the timeline."
 msgstr ""
 
-#: src/multitrack.c:3324
+#: src/multitrack.c:3465
 msgid ""
 "\n"
 "\n"
@@ -9183,12 +9197,12 @@
 "e una regione temporale\n"
 "per applicare i compositori.\n"
 
-#: src/multitrack.c:3487
+#: src/multitrack.c:3640
 #, c-format
 msgid "%.2f sec. to %.2f sec.\n"
 msgstr "Dal secondo %.2f al secondo %.2f.\n"
 
-#: src/multitrack.c:3493
+#: src/multitrack.c:3646
 msgid ""
 "Single click on timeline\n"
 "to select a frame.\n"
@@ -9196,12 +9210,12 @@
 "Click singolo sulla linea del tempo\n"
 "per selezionare un fotogramma.\n"
 
-#: src/multitrack.c:3711 src/multitrack.c:6790
+#: src/multitrack.c:3858 src/multitrack.c:6972
 #, c-format
 msgid "%s [unstable]"
 msgstr ""
 
-#: src/multitrack.c:3822
+#: src/multitrack.c:3973
 msgid ""
 "You can click and drag\n"
 "below the timeline"
@@ -9209,176 +9223,176 @@
 "Puoi cliccare e trascinare\n"
 "sotto la linea temporale"
 
-#: src/multitrack.c:3823
+#: src/multitrack.c:3974
 msgid "to select a time region.\n"
 msgstr "per selezionare una regione temporale.\n"
 
-#: src/multitrack.c:3985
+#: src/multitrack.c:4137
 msgid "LiVES: Selected clip"
 msgstr "LiVES: Clip selezionato"
 
-#: src/multitrack.c:3993
+#: src/multitrack.c:4145
 msgid "_Adjust start and end points"
 msgstr "_Regola i punti di inizio e di fine"
 
-#: src/multitrack.c:4002
+#: src/multitrack.c:4154
 msgid "_Edit/encode in clip editor"
 msgstr "_Modifica/codifica nell'editor clip"
 
-#: src/multitrack.c:4009
+#: src/multitrack.c:4161
 msgid "_Show clip information"
 msgstr "_Mostra informazioni sul clip"
 
-#: src/multitrack.c:4016
+#: src/multitrack.c:4168
 msgid "_Close this clip"
 msgstr "_Chiudi questo clip"
 
-#: src/multitrack.c:4236
+#: src/multitrack.c:4388
 msgid "Audio mixer (ctrl-m)"
 msgstr "Mixer audio (ctrl-m)"
 
-#: src/multitrack.c:4336
+#: src/multitrack.c:4488
 msgid "Single click on timeline"
 msgstr "Clicca una volta sulla linea temporale"
 
-#: src/multitrack.c:4337
+#: src/multitrack.c:4489
 msgid "to select a frame."
 msgstr "per selezionare un frame."
 
-#: src/multitrack.c:4338
+#: src/multitrack.c:4490
 msgid "Double click or right click on timeline"
 msgstr ""
 
-#: src/multitrack.c:4339
+#: src/multitrack.c:4491
 msgid "to select a block."
 msgstr "per selezionare un blocco."
 
-#: src/multitrack.c:4340
+#: src/multitrack.c:4492
 msgid "Clips can be dragged"
 msgstr "I clip possono venire trascinati"
 
-#: src/multitrack.c:4341
+#: src/multitrack.c:4493
 msgid "onto the timeline."
 msgstr "sulla linea temporale."
 
-#: src/multitrack.c:4343
+#: src/multitrack.c:4495
 msgid "Mouse mode is: Move"
 msgstr "La modalità del mouse è: Sposta"
 
-#: src/multitrack.c:4344
+#: src/multitrack.c:4496
 msgid "clips can be moved around."
 msgstr "i clip possono venire spostati in giro."
 
-#: src/multitrack.c:4349
+#: src/multitrack.c:4500
 msgid "Mouse mode is: Select."
 msgstr "La modalità del mouse è: Seleziona."
 
-#: src/multitrack.c:4350
+#: src/multitrack.c:4501
 msgid "Drag with mouse on timeline"
 msgstr "Trascina col mouse sulla linea temporale"
 
-#: src/multitrack.c:4351
+#: src/multitrack.c:4502
 msgid "to select tracks and time."
 msgstr "per selezionare tracce e tempo."
 
-#: src/multitrack.c:4362
+#: src/multitrack.c:4509
 msgid "_Insert mode: Normal"
 msgstr "_Modalità di inserimento: Normale"
 
-#: src/multitrack.c:4378
+#: src/multitrack.c:4537
 msgid "_Mouse mode: Move"
 msgstr "Modalità del _mouse: Sposta"
 
-#: src/multitrack.c:4382
+#: src/multitrack.c:4540
 msgid "_Mouse mode: Select"
 msgstr "Modalità del m_ouse: Seleziona"
 
-#: src/multitrack.c:4405 src/multitrack.c:7925
+#: src/multitrack.c:4563 src/multitrack.c:8104
 #, fuzzy
 msgid "Gravity: Normal"
 msgstr "_Gravità: Normale"
 
-#: src/multitrack.c:4409
+#: src/multitrack.c:4565
 #, fuzzy
 msgid "Gravity: Left"
 msgstr "_Gravità: Sinistra"
 
-#: src/multitrack.c:4414
+#: src/multitrack.c:4569
 #, fuzzy
 msgid "Gravity: Right"
 msgstr "_Gravità: Destra"
 
-#: src/multitrack.c:4416
+#: src/multitrack.c:4570
 msgid "Close _last gap(s) in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:4419
+#: src/multitrack.c:4572
 msgid "Close _first gap(s) in selected tracks/time"
 msgstr "Chiudi il/i primo/i intervallo/i nel tempo e nelle tracce selezionate"
 
-#: src/multitrack.c:4458
+#: src/multitrack.c:4627
 msgid "Close gaps"
 msgstr "Chiudi intervalli"
 
-#: src/multitrack.c:4460
+#: src/multitrack.c:4629
 msgid "Move block"
 msgstr "Sposta blocco"
 
-#: src/multitrack.c:4462
+#: src/multitrack.c:4631
 msgid "Move audio block"
 msgstr "Sposta blocco audio"
 
-#: src/multitrack.c:4464
+#: src/multitrack.c:4633
 msgid "Delete block"
 msgstr "Elimina blocco"
 
-#: src/multitrack.c:4466
+#: src/multitrack.c:4635
 msgid "Delete audio block"
 msgstr "Elimina blocco audio"
 
-#: src/multitrack.c:4468
+#: src/multitrack.c:4637
 msgid "Split tracks"
 msgstr "Dividi tracce"
 
-#: src/multitrack.c:4470
+#: src/multitrack.c:4639
 msgid "Split block"
 msgstr "Dividi blocco"
 
-#: src/multitrack.c:4473
+#: src/multitrack.c:4642
 #, c-format
 msgid "Apply %s"
 msgstr "Applica %s"
 
-#: src/multitrack.c:4478
+#: src/multitrack.c:4647
 #, c-format
 msgid "Delete %s"
 msgstr "Elimina %s"
 
-#: src/multitrack.c:4482
+#: src/multitrack.c:4651
 msgid "Insert block"
 msgstr "Inserisci blocco"
 
-#: src/multitrack.c:4484
+#: src/multitrack.c:4653
 msgid "Insert gap"
 msgstr "Inserisci intervallo"
 
-#: src/multitrack.c:4486
+#: src/multitrack.c:4655
 msgid "Insert audio block"
 msgstr "Inserisci blocco audio"
 
-#: src/multitrack.c:4488
+#: src/multitrack.c:4657
 msgid "Effect order change"
 msgstr "Cambiamento dell'ordine dell'effetto"
 
-#: src/multitrack.c:4898
+#: src/multitrack.c:5064
 msgid "unsigned "
 msgstr "non firmato "
 
-#: src/multitrack.c:4899
+#: src/multitrack.c:5065
 msgid "signed "
 msgstr "firmato "
 
-#: src/multitrack.c:4904
+#: src/multitrack.c:5071
 #, c-format
 msgid ""
 "Multitrack values set to %.3f fps, frame size %d x %d, audio channels %d, "
@@ -9387,15 +9401,15 @@
 "Valori multi-traccia impostati a %.3f fps, dimensione del fotogramma %d x "
 "%d, canali audio %d, tasso audio %d, dimensione audio di esempio %d, %s.\n"
 
-#: src/multitrack.c:4938
+#: src/multitrack.c:5104
 msgid "invalid event list. Failed.\n"
 msgstr "elenco di eventi non valido. Fallito.\n"
 
-#: src/multitrack.c:4944
+#: src/multitrack.c:5110
 msgid "event list has invalid fps. Failed.\n"
 msgstr "l'elenco degli eventi ha degli fps non validi. Fallito.\n"
 
-#: src/multitrack.c:4953
+#: src/multitrack.c:5122
 #, c-format
 msgid ""
 "\n"
@@ -9410,7 +9424,7 @@
 "chiudere il set corrente,\n"
 "quindi caricare nel nuovo set dal menù File.\n"
 
-#: src/multitrack.c:4993
+#: src/multitrack.c:5163
 #, c-format
 msgid ""
 "\n"
@@ -9421,440 +9435,432 @@
 "Questo ha un numero non valido di canali audio (%d) per LiVES.\n"
 "Non può essere caricato.\n"
 
-#: src/multitrack.c:5329 src/multitrack.c:5338 src/multitrack.c:21133
+#: src/multitrack.c:5452
 msgid "Layout was wiped.\n"
 msgstr "Il layout è stato eliminato.\n"
 
-#: src/multitrack.c:5374
+#: src/multitrack.c:5547
 #, c-format
 msgid "LiVES-%s: Multitrack %dx%d : %d bpp %.3f fps"
 msgstr "LiVES-%s: Multi-traccia %dx%d : %d bpp %.3f fps"
 
-#: src/multitrack.c:5617
+#: src/multitrack.c:5793
 msgid "In/out"
 msgstr ""
 
-#: src/multitrack.c:5619
+#: src/multitrack.c:5795
 msgid "FX stack"
 msgstr "Pila FX"
 
-#: src/multitrack.c:5627 src/omc-learn.c:673
+#: src/multitrack.c:5803 src/omc-learn.c:659
 msgid "Params."
 msgstr "Parametri"
 
-#: src/multitrack.c:5978
+#: src/multitrack.c:6157
 msgid "_Open..."
 msgstr "_Apri..."
 
-#: src/multitrack.c:5996
+#: src/multitrack.c:6175
 msgid "O_pen File Selection..."
 msgstr "A_pri Selezione File..."
 
-#: src/multitrack.c:6040
+#: src/multitrack.c:6219
 msgid "Import Selection from _dvd/vcd..."
 msgstr "Importa Selezione da _dvd/vcd..."
 
-#: src/multitrack.c:6050
+#: src/multitrack.c:6229
 msgid "Import Selection from _dvd"
 msgstr "Importa Selezione da d_vd"
 
-#: src/multitrack.c:6060
+#: src/multitrack.c:6239
 msgid "Import Selection from _vcd"
 msgstr "Importa Selezione da v_cd"
 
-#: src/multitrack.c:6076
+#: src/multitrack.c:6255
 msgid "_Import from Device"
 msgstr "I_mporta da Dispositivo"
 
-#: src/multitrack.c:6103
+#: src/multitrack.c:6282
 msgid "_Close the selected clip"
 msgstr "_Chiudi il clip selezionato"
 
-#: src/multitrack.c:6198
+#: src/multitrack.c:6377
 msgid "_Save layout as..."
 msgstr "_Salva layout come..."
 
-#: src/multitrack.c:6206
+#: src/multitrack.c:6385
 msgid "_Load layout..."
 msgstr "_Carica layout..."
 
-#: src/multitrack.c:6210
+#: src/multitrack.c:6389
 msgid "_Wipe/Delete layout..."
 msgstr "_Pulisci/Elimina layout..."
 
-#: src/multitrack.c:6236
+#: src/multitrack.c:6415
 msgid "_Ignore width, height and audio values from loaded layouts"
 msgstr "_Ignora larghezza, altezza e valori audio dai layout caricati"
 
-#: src/multitrack.c:6240
+#: src/multitrack.c:6419
 msgid "Auto load _subtitles with clips"
 msgstr ""
 
-#: src/multitrack.c:6322
+#: src/multitrack.c:6501
 msgid "_CLIP EDITOR"
 msgstr "EDITOR _CLIP"
 
-#: src/multitrack.c:6334
+#: src/multitrack.c:6513
 msgid "_Adjust selected clip start/end points"
 msgstr "_Regola i punti del clip selezionato di inizio/fine"
 
-#: src/multitrack.c:6343
+#: src/multitrack.c:6522
 msgid "_Insert selected clip"
 msgstr "_Inserisci clip selezionato"
 
-#: src/multitrack.c:6355
+#: src/multitrack.c:6534
 msgid "_Insert selected clip audio"
 msgstr "In_serisci audio clip selezionato"
 
-#: src/multitrack.c:6364
+#: src/multitrack.c:6543
 msgid "_Delete selected block"
 msgstr "_Elimina blocco selezionato"
 
-#: src/multitrack.c:6373
+#: src/multitrack.c:6555
 msgid "_Jump to previous block boundary"
 msgstr "_Vai al precedente blocco di confine"
 
-#: src/multitrack.c:6382
+#: src/multitrack.c:6564
 msgid "_Jump to next block boundary"
 msgstr "_Vai al prossimo blocco di confine"
 
-#: src/multitrack.c:6395
+#: src/multitrack.c:6577
 msgid "Clear _marks from timeline"
 msgstr "Pulisci _segni dalla linea del tempo"
 
-#: src/multitrack.c:6403
+#: src/multitrack.c:6585
 msgid "Ignore selection limits when inserting"
 msgstr "Ignora i limiti della selezione durante l'inserimento"
 
-#: src/multitrack.c:6420 src/multitrack.c:16719
+#: src/multitrack.c:6602 src/multitrack.c:17009
 msgid "_Play from Timeline Position"
 msgstr "_Riproduci dalla Posizione Sulla Linea Del Tempo"
 
-#: src/multitrack.c:6434
+#: src/multitrack.c:6616
 msgid "Pla_y selected time only"
 msgstr ""
 
-#: src/multitrack.c:6518
+#: src/multitrack.c:6700
 msgid "_Move effects with blocks"
 msgstr "_Muovi gli effetti con i blocchi"
 
-#: src/multitrack.c:6531
+#: src/multitrack.c:6713
 msgid "Select _autotransition effect..."
 msgstr ""
 
-#: src/multitrack.c:6542
+#: src/multitrack.c:6724
 #, fuzzy
 msgid "Crossfade audio with autotransition"
 msgstr "Dissolvi l'audio in modo incrociato"
 
-#: src/multitrack.c:6550
+#: src/multitrack.c:6732
 msgid "View/_Edit selected effect"
 msgstr "Visualizza/_Modifica l'effetto selezionato"
 
-#: src/multitrack.c:6554
+#: src/multitrack.c:6736
 msgid "_Delete selected effect"
 msgstr "_Elimina l'effetto selezionato"
 
-#: src/multitrack.c:6562
+#: src/multitrack.c:6744
 msgid "Apply effect to _block..."
 msgstr "Applica l'effetto al _blocco..."
 
-#: src/multitrack.c:6619
+#: src/multitrack.c:6801
 msgid "Apply effect to _region..."
 msgstr "Applica l'effetto alla _regione..."
 
-#: src/multitrack.c:6885
+#: src/multitrack.c:7061
 msgid "_Tracks"
 msgstr "_Tracce"
 
-#: src/multitrack.c:6896
+#: src/multitrack.c:7072
 msgid "Rename current track"
 msgstr ""
 
-#: src/multitrack.c:6904
+#: src/multitrack.c:7080
 msgid "Make _Backing Audio current track"
 msgstr "Rendi la traccia corrente Audio Di _Supporto"
 
-#: src/multitrack.c:6915
+#: src/multitrack.c:7091
 msgid "Add Video Track at _Rear"
 msgstr "Aggiungi Traccia Video al _Retro"
 
-#: src/multitrack.c:6923
+#: src/multitrack.c:7099
 msgid "Add Video Track at _Front"
 msgstr "Aggiungi Traccia Video al _Fronte"
 
-#: src/multitrack.c:6936
+#: src/multitrack.c:7112
 msgid "_Split current track at cursor"
 msgstr "_Dividi traccia corrente con il cursore"
 
-#: src/multitrack.c:6948
+#: src/multitrack.c:7124
 msgid "_Split selected video tracks"
 msgstr "_Dividi tracce video selezionate"
 
-#: src/multitrack.c:6961
+#: src/multitrack.c:7137
 msgid "Insert gap in selected tracks/time"
 msgstr "Inserisci intervallo nel tempo e nelle tracce selezionate"
 
-#: src/multitrack.c:6969
+#: src/multitrack.c:7145
 msgid "Insert gap in current track/selected time"
 msgstr "Inserisci intervallo nella traccia corrente/tempo selezionato"
 
-#: src/multitrack.c:6981
+#: src/multitrack.c:7157
 msgid "Close all _gaps in selected tracks/time"
 msgstr "Chiudi tutti gli _intervalli nel tempo/tracce selezionate"
 
-#: src/multitrack.c:7007
+#: src/multitrack.c:7183
 msgid "Se_lection"
 msgstr "Se_lezione"
 
-#: src/multitrack.c:7018
+#: src/multitrack.c:7194
 msgid "_Select Current Track"
 msgstr "_Seleziona Traccia Corrente"
 
-#: src/multitrack.c:7025
+#: src/multitrack.c:7201
 msgid "Select _all video tracks"
 msgstr "Seleziona _tutte le tracce video"
 
-#: src/multitrack.c:7032
+#: src/multitrack.c:7208
 msgid "Select _no video tracks"
 msgstr "_Deseleziona tutte le tracce video"
 
-#: src/multitrack.c:7039
+#: src/multitrack.c:7215
 msgid "Select all _time"
 msgstr "Seleziona tutto il _tempo"
 
-#: src/multitrack.c:7050
+#: src/multitrack.c:7226
 msgid "Select from _zero time"
 msgstr "Seleziona dal tempo _zero"
 
-#: src/multitrack.c:7057
+#: src/multitrack.c:7233
 msgid "Select to _end time"
 msgstr "Seleziona dal tempo _finale"
 
-#: src/multitrack.c:7064
+#: src/multitrack.c:7240
 msgid "_Copy..."
 msgstr "_Copia..."
 
-#: src/multitrack.c:7075
+#: src/multitrack.c:7251
 msgid "_Timecode to region start"
 msgstr "Codice _temporale all'inizio della regione"
 
-#: src/multitrack.c:7082
+#: src/multitrack.c:7258
 msgid "_Timecode to region end"
 msgstr "Codice _temporale alla fine della regione"
 
-#: src/multitrack.c:7089
+#: src/multitrack.c:7265
 msgid "_Region start to timecode"
 msgstr "Avvio della _regione al codice temporale"
 
-#: src/multitrack.c:7096
+#: src/multitrack.c:7272
 msgid "_Region end to timecode"
 msgstr "Fine della _regione al codice temporale"
 
-#: src/multitrack.c:7110
+#: src/multitrack.c:7286
 msgid "Select/deselect block at current track/time"
 msgstr ""
 
-#: src/multitrack.c:7135
+#: src/multitrack.c:7311
 msgid "_Change width, height and audio values..."
 msgstr "_Cambia larghezza, altezza e valori audio..."
 
-#: src/multitrack.c:7194
+#: src/multitrack.c:7370
 msgid "_Render"
 msgstr "_Renderizza"
 
-#: src/multitrack.c:7205
+#: src/multitrack.c:7381
 msgid "_Render all to new clip"
 msgstr "_Renderizza tutto nel nuovo clip"
 
-#: src/multitrack.c:7220
+#: src/multitrack.c:7396
 msgid "Render _video"
 msgstr "Renderizza _video"
 
-#: src/multitrack.c:7225
+#: src/multitrack.c:7401
 msgid "Render _audio"
 msgstr "Renderizza _audio"
 
-#: src/multitrack.c:7235
+#: src/multitrack.c:7411
 msgid "_Normalise rendered audio"
 msgstr ""
 
-#: src/multitrack.c:7242
+#: src/multitrack.c:7418
 msgid "_Pre-render audio"
 msgstr "_Pre-renderizza audo"
 
-#: src/multitrack.c:7251
+#: src/multitrack.c:7427
 msgid "_View"
 msgstr "_Visualizza"
 
-#: src/multitrack.c:7270
+#: src/multitrack.c:7446
 msgid "Block _In/out points"
 msgstr "Blocca punti _Dentro/fuori"
 
-#: src/multitrack.c:7279
+#: src/multitrack.c:7455
 msgid "_Effects at current"
 msgstr "_Effetti correnti"
 
-#: src/multitrack.c:7297
+#: src/multitrack.c:7473
 msgid "Audio parameters"
 msgstr "Parametri audio"
 
-#: src/multitrack.c:7308
+#: src/multitrack.c:7484
 msgid "Show backing _audio track"
 msgstr "Mostra traccia _audio di supporto"
 
-#: src/multitrack.c:7312
+#: src/multitrack.c:7488
 msgid "Compact view"
 msgstr "Visualizzazione compatta"
 
-#: src/multitrack.c:7320
+#: src/multitrack.c:7496
 msgid "Maximum tracks to display..."
 msgstr "Tracce massime da mostrare..."
 
-#: src/multitrack.c:7327
+#: src/multitrack.c:7503
 msgid "Scroll to follow playback"
 msgstr "Scorri per seguire la riproduzione"
 
-#: src/multitrack.c:7331
+#: src/multitrack.c:7507
 msgid "_Center on cursor"
 msgstr "_Centra sul cursore"
 
-#: src/multitrack.c:7338
+#: src/multitrack.c:7514
 msgid "_Zoom in"
 msgstr "_Ingrandisci"
 
-#: src/multitrack.c:7349
+#: src/multitrack.c:7525
 msgid "_Zoom out"
 msgstr "_Rimpicciolisci"
 
-#: src/multitrack.c:7361
+#: src/multitrack.c:7537
 msgid "Multitrack _details"
 msgstr "_Dettagli multi-traccia"
 
-#: src/multitrack.c:7374
+#: src/multitrack.c:7550
 msgid "_Event Window"
 msgstr "Finestra _Eventi"
 
-#: src/multitrack.c:7378
+#: src/multitrack.c:7554
 msgid "_Event Window (selected time only)"
 msgstr "Finestra _Eventi (solamente il tempo selezionato)"
 
-#: src/multitrack.c:7382
+#: src/multitrack.c:7558
 msgid "_Show FRAME events"
 msgstr "_Mostra eventi FRAME"
 
-#: src/multitrack.c:7399
+#: src/multitrack.c:7575
 msgid "_Show multitrack keys"
 msgstr "_Mostra tasti multi-traccia"
 
-#: src/multitrack.c:7468
+#: src/multitrack.c:7644
 msgid "Mouse mode: _Move"
 msgstr "Modalità mouse: _Sposta"
 
-#: src/multitrack.c:7476
+#: src/multitrack.c:7652
 msgid "Mouse mode: _Select"
 msgstr "Modalità mouse: Se_leziona"
 
-#: src/multitrack.c:7505
+#: src/multitrack.c:7681
 msgid "Insert mode: _Normal"
 msgstr "Modalità di inserimento: _Normale"
 
-#: src/multitrack.c:7733
+#: src/multitrack.c:7909
 msgid "Insert with _audio"
 msgstr "Inserisci con _audio"
 
-#: src/multitrack.c:7734
+#: src/multitrack.c:7910
 msgid ""
 "Select whether video clips are inserted and moved with their audio or not"
 msgstr ""
 
-#: src/multitrack.c:7829
+#: src/multitrack.c:8007
 msgid "Select _overlap"
 msgstr ""
 
-#: src/multitrack.c:7830
+#: src/multitrack.c:8008
 msgid ""
 "Select whether timeline selection snaps to overlap between selected tracks "
 "or not"
 msgstr ""
 
-#: src/multitrack.c:7894 src/multitrack.c:14198
+#: src/multitrack.c:8073 src/multitrack.c:14422
 msgid "Expanded View (d)"
 msgstr "Visualizzazione Estesa (d)"
 
-#: src/multitrack.c:7897 src/multitrack.c:14205
+#: src/multitrack.c:8076 src/multitrack.c:14428
 msgid "Compact View (d)"
 msgstr "Visualizzazione Compatta (d)"
 
-#: src/multitrack.c:7939
+#: src/multitrack.c:8118
 msgid "Gravity: _Normal"
 msgstr "Gravità: _Normale"
 
-#: src/multitrack.c:7952
+#: src/multitrack.c:8131
 msgid "Gravity: _Left"
 msgstr "Gravità: _Sinistra"
 
-#: src/multitrack.c:7967
+#: src/multitrack.c:8146
 msgid "Gravity: _Right"
 msgstr "Gravità: _Destra"
 
-#: src/multitrack.c:8297
+#: src/multitrack.c:8496
 msgid "_Apply"
 msgstr "_Applica"
 
-#: src/multitrack.c:8319
+#: src/multitrack.c:8518
 msgid "Time"
 msgstr "Tempo"
 
-#: src/multitrack.c:8333
+#: src/multitrack.c:8532
 msgid "_Del. node"
 msgstr "_Elimina nodo"
 
-#: src/multitrack.c:8341
+#: src/multitrack.c:8540
 msgid "_Next node"
 msgstr "Nodo _successivo"
 
-#: src/multitrack.c:8349
+#: src/multitrack.c:8548
 msgid "_Prev node"
 msgstr "Nodo _precedente"
 
-#: src/multitrack.c:8373
+#: src/multitrack.c:8574
 msgid "_Reverse playback  "
 msgstr "_Inverti riproduzione  "
 
-#: src/multitrack.c:8395
+#: src/multitrack.c:8596
 msgid "_Velocity  "
 msgstr "_Velocità  "
 
-#: src/multitrack.c:8464
+#: src/multitrack.c:8664
 msgid "Anchor _start"
 msgstr "_Inizio ancora"
 
-#: src/multitrack.c:8465
+#: src/multitrack.c:8665
 msgid "Anchor the start point to the timeline"
 msgstr "Ancora il punto di inizio alla linea del tempo"
 
-#: src/multitrack.c:8481
-msgid "Start frame"
-msgstr "Fotogramma iniziale"
-
-#: src/multitrack.c:8533
+#: src/multitrack.c:8728
 msgid "Anchor _end"
 msgstr "_Fine ancora"
 
-#: src/multitrack.c:8534
+#: src/multitrack.c:8729
 msgid "Anchor the end point to the timeline"
 msgstr "Ancora il punto di fine alla linea del tempo"
 
-#: src/multitrack.c:8546
-msgid "End frame"
-msgstr "Fotogramma finale"
-
-#: src/multitrack.c:8739
+#: src/multitrack.c:8929
 msgid "Scroll"
 msgstr "Scorri"
 
-#: src/multitrack.c:9316
+#: src/multitrack.c:9502
 msgid ""
 "\n"
 "==============================\n"
@@ -9864,91 +9870,91 @@
 "==============================\n"
 "Passato alla modalità Modifica Clip\n"
 
-#: src/multitrack.c:9502
+#: src/multitrack.c:9708
 msgid "Timeline (seconds)"
 msgstr "Linea del tempo (secondi)"
 
-#: src/multitrack.c:9984
+#: src/multitrack.c:10202
 msgid " Backing audio"
 msgstr " Audio di supporto"
 
-#: src/multitrack.c:9987
+#: src/multitrack.c:10204
 #, c-format
 msgid " Layer %d audio"
 msgstr " Audio livello %d"
 
-#: src/multitrack.c:9995
+#: src/multitrack.c:10212
 msgid "Show/hide audio details"
 msgstr "Mostra/nascondi i dettagli dell'audio"
 
-#: src/multitrack.c:10010 src/multitrack.c:10232
+#: src/multitrack.c:10227 src/multitrack.c:10452
 #, c-format
 msgid "Layer %d audio"
 msgstr "Audio livello %d"
 
-#: src/multitrack.c:10144 src/multitrack.c:10261
+#: src/multitrack.c:10353 src/multitrack.c:10481
 #, c-format
 msgid "%s (layer %d)"
 msgstr "%s (livello %d)"
 
-#: src/multitrack.c:10184
+#: src/multitrack.c:10403
 msgid "Select track"
 msgstr "Seleziona traccia"
 
-#: src/multitrack.c:10188
+#: src/multitrack.c:10407
 msgid "Show/hide audio"
 msgstr "Mostra/nascondi audio"
 
-#: src/multitrack.c:10194
+#: src/multitrack.c:10413
 #, c-format
 msgid "Video %d"
 msgstr "Video %d"
 
-#: src/multitrack.c:10233
+#: src/multitrack.c:10453
 #, c-format
 msgid " %s"
 msgstr " %s"
 
-#: src/multitrack.c:10346
+#: src/multitrack.c:10574
 msgid "LiVES: Selected effect"
 msgstr "LiVES: Effetto selezionato"
 
-#: src/multitrack.c:10358
+#: src/multitrack.c:10586
 msgid "_View/Edit this effect"
 msgstr "_Visualizza/Modifica questo effetto"
 
-#: src/multitrack.c:10361
+#: src/multitrack.c:10588
 msgid "_View this effect"
 msgstr "Vis_ualizza questo effetto"
 
-#: src/multitrack.c:10369
+#: src/multitrack.c:10596
 msgid "_Delete this effect"
 msgstr "_Elimina questo effetto"
 
-#: src/multitrack.c:10422
+#: src/multitrack.c:10648
 msgid "Cannot insert after this effect"
 msgstr "Non è possibile inserire dopo questo effetto"
 
-#: src/multitrack.c:10451
+#: src/multitrack.c:10677
 msgid "This effect cannot be moved"
 msgstr "Questo effetto non pù essere spostato"
 
-#: src/multitrack.c:10499
+#: src/multitrack.c:10724
 #, c-format
 msgid "  %d to %d selected  "
 msgstr "  selezionato da %d a %d  "
 
-#: src/multitrack.c:10502 src/multitrack.c:10746
+#: src/multitrack.c:10727 src/multitrack.c:10968
 #, c-format
 msgid "%.2f sec."
 msgstr "%.2f secondi."
 
-#: src/multitrack.c:10717
+#: src/multitrack.c:10940
 #, c-format
 msgid "%d frames"
 msgstr "%d fotogrammi"
 
-#: src/multitrack.c:11070
+#: src/multitrack.c:11299
 msgid ""
 "\n"
 "==============================\n"
@@ -9958,70 +9964,70 @@
 "==============================\n"
 "Passato alla modalità Multi-traccia\n"
 
-#: src/multitrack.c:12691
+#: src/multitrack.c:12939
 msgid "Drag the time slider to where you"
 msgstr "Trascina il cursore del tempo dove"
 
-#: src/multitrack.c:12692
+#: src/multitrack.c:12940
 msgid "want to set effect parameters"
 msgstr "vuoi impostare i parametri degli effetti"
 
-#: src/multitrack.c:12693
+#: src/multitrack.c:12941
 msgid "Set parameters, then click \"Apply\"\n"
 msgstr "Imposta i parametri, poi clicca \"Applica\"\n"
 
-#: src/multitrack.c:12694
+#: src/multitrack.c:12942
 msgid ""
 "NODES are points where parameters\n"
 "have been set.\n"
 "Nodes can be deleted."
 msgstr ""
 
-#: src/multitrack.c:12697
+#: src/multitrack.c:12944
 msgid "Effect has no parameters.\n"
 msgstr "L'effetto non ha parametri.\n"
 
-#: src/multitrack.c:12788
+#: src/multitrack.c:13033
 #, c-format
 msgid "%s output"
 msgstr "output %s"
 
-#: src/multitrack.c:12794 src/multitrack.c:12804
+#: src/multitrack.c:13038 src/multitrack.c:13046
 #, c-format
 msgid "layer %d"
 msgstr "livello %d"
 
-#: src/multitrack.c:12796 src/multitrack.c:12806
+#: src/multitrack.c:13039 src/multitrack.c:13047
 msgid "audio track"
 msgstr "traccia audio"
 
-#: src/multitrack.c:12797
+#: src/multitrack.c:13040
 #, c-format
 msgid "%s to %s"
 msgstr "da %s a %s"
 
-#: src/multitrack.c:12807
+#: src/multitrack.c:13048
 #, c-format
 msgid "%s from %s"
 msgstr ""
 
-#: src/multitrack.c:12860
+#: src/multitrack.c:13099
 msgid "_Prev filter map"
 msgstr "Mappa dei filtri _precedente"
 
-#: src/multitrack.c:12871
+#: src/multitrack.c:13110
 msgid "Insert _before"
 msgstr "Inserisci pr_ima"
 
-#: src/multitrack.c:12881
+#: src/multitrack.c:13120
 msgid "Insert _after"
 msgstr "Inserisci _dopo"
 
-#: src/multitrack.c:12896
+#: src/multitrack.c:13134
 msgid "_Next filter map"
 msgstr "Mappa dei filtri _successiva"
 
-#: src/multitrack.c:12911
+#: src/multitrack.c:13148
 msgid ""
 "\n"
 "\n"
@@ -10033,7 +10039,7 @@
 "Nessun effetto nella traccia corrente,\n"
 "tempo corrente.\n"
 
-#: src/multitrack.c:12929
+#: src/multitrack.c:13166
 msgid ""
 "Drag a compositor anywhere\n"
 "on the timeline\n"
@@ -10043,7 +10049,7 @@
 "sulla linea temporale\n"
 "per applicarlo alla regione selezionata."
 
-#: src/multitrack.c:12936
+#: src/multitrack.c:13173
 msgid ""
 "Drag a transition anywhere\n"
 "on the timeline\n"
@@ -10053,7 +10059,7 @@
 "sulla linea temporale\n"
 "per applicarla alla regione selezionata."
 
-#: src/multitrack.c:12944
+#: src/multitrack.c:13181
 msgid ""
 "Effects can be dragged\n"
 "onto blocks on the timeline."
@@ -10061,60 +10067,60 @@
 "Gli effetti possono essere trascinati\n"
 "in blocchi sulla linea temporale."
 
-#: src/multitrack.c:13166
+#: src/multitrack.c:13406
 msgid "LiVES: Selected block/frame"
 msgstr "LiVES: Blocco/fotogramma selezionato"
 
-#: src/multitrack.c:13173
+#: src/multitrack.c:13413
 msgid "_Select this block"
 msgstr "_Seleziona questo blocco"
 
-#: src/multitrack.c:13183
+#: src/multitrack.c:13423
 msgid "_Split block here"
 msgstr "_Dividi il blocco qui"
 
-#: src/multitrack.c:13191
+#: src/multitrack.c:13431
 msgid "List _effects here"
 msgstr "Elenca gli _effetti qui"
 
-#: src/multitrack.c:13200 src/multitrack.c:13277
+#: src/multitrack.c:13440 src/multitrack.c:13518
 #, c-format
 msgid "_Adjust %s"
 msgstr "_Regola %s"
 
-#: src/multitrack.c:13215
+#: src/multitrack.c:13455
 msgid "_Delete this block"
 msgstr "_Elimina questo blocco"
 
-#: src/multitrack.c:13258
+#: src/multitrack.c:13500
 msgid "_Insert here"
 msgstr "_Inserisci qui"
 
-#: src/multitrack.c:13264
+#: src/multitrack.c:13505
 msgid "_Insert audio here"
 msgstr "In_serisci audio qui"
 
-#: src/multitrack.c:14801
+#: src/multitrack.c:15017
 #, c-format
 msgid "Inserted gap in selected tracks from time %.4f to %.4f\n"
 msgstr "Intervallo inserito nelle tracce selezionate dal tempo %.4f a %.4f\n"
 
-#: src/multitrack.c:14835
+#: src/multitrack.c:15048
 #, c-format
 msgid "Inserted gap in track %s from time %.4f to %.4f\n"
 msgstr "Intervallo inserito nella traccia %s dal tempo %.4f a %.4f\n"
 
-#: src/multitrack.c:15036
+#: src/multitrack.c:15244
 #, c-format
 msgid "Undid %s\n"
 msgstr "Annullato %s\n"
 
-#: src/multitrack.c:15235
+#: src/multitrack.c:15445
 #, c-format
 msgid "Redid %s\n"
 msgstr "Rifatto %s\n"
 
-#: src/multitrack.c:15268
+#: src/multitrack.c:15475
 msgid ""
 "\n"
 " (variable)"
@@ -10122,62 +10128,62 @@
 "\n"
 " (variabile)"
 
-#: src/multitrack.c:15502 src/multitrack.c:15614 src/multitrack.c:18736
-#: src/multitrack.c:18748
+#: src/multitrack.c:15710 src/multitrack.c:15823 src/multitrack.c:19077
+#: src/multitrack.c:19089
 #, c-format
 msgid "track %s"
 msgstr "traccia %s"
 
-#: src/multitrack.c:15507 src/multitrack.c:15619 src/multitrack.c:18741
+#: src/multitrack.c:15715 src/multitrack.c:15828 src/multitrack.c:19082
 #, c-format
 msgid "tracks %s and %s"
 msgstr "tracce %s e %s"
 
-#: src/multitrack.c:15513 src/multitrack.c:15625 src/multitrack.c:18751
+#: src/multitrack.c:15721 src/multitrack.c:15834 src/multitrack.c:19091
 msgid "selected tracks"
 msgstr "tracce selezionate"
 
-#: src/multitrack.c:15516
+#: src/multitrack.c:15726
 #, c-format
 msgid "Added %s %s to %s from %.4f to %.4f\n"
 msgstr "Aggiunti %s %s a %s da %.4f a %.4f\n"
 
-#: src/multitrack.c:15550
+#: src/multitrack.c:15760
 #, c-format
 msgid "Added effect %s to track %s from %.4f to %.4f\n"
 msgstr "Aggiunto l'effetto %s alla traccia %s da %.4f a %.4f\n"
 
-#: src/multitrack.c:15631
+#: src/multitrack.c:15845
 #, c-format
 msgid "Deleted %s %s from %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15935
+#: src/multitrack.c:16143
 #, c-format
 msgid "rendered %d frames to new clip.\n"
 msgstr "renderizzati %d fotogrammi nel nuovo clip.\n"
 
-#: src/multitrack.c:16025
+#: src/multitrack.c:16230
 msgid "Cleaning up..."
 msgstr "Pulizia in corso..."
 
-#: src/multitrack.c:16712
+#: src/multitrack.c:17003
 msgid "_Pause"
 msgstr "_Pausa"
 
-#: src/multitrack.c:16713
+#: src/multitrack.c:17004
 msgid "Pause (p)"
 msgstr "Pausa (p)"
 
-#: src/multitrack.c:16856
+#: src/multitrack.c:17151
 msgid "Press 'm' during playback"
 msgstr "Premi 'm' durante la riproduzione"
 
-#: src/multitrack.c:16857
+#: src/multitrack.c:17152
 msgid "to make a mark on the timeline"
 msgstr "per creare un segno sulla linea del tempo"
 
-#: src/multitrack.c:17154
+#: src/multitrack.c:17498
 #, c-format
 msgid ""
 "Inserted audio %.4f to %.4f from clip %s into backing audio from time %.4f "
@@ -10186,7 +10192,7 @@
 "Audio inserito da %.4f a %.4f dal clip %s nell'audio di supporto dal tempo "
 "%.4f a %.4f\n"
 
-#: src/multitrack.c:17414
+#: src/multitrack.c:17759
 #, c-format
 msgid ""
 "Inserted frames %d to %d from clip %s into track %s from time %.4f to %.4f\n"
@@ -10194,7 +10200,7 @@
 "Fotogrammi inseriti da %d a %d dal clip %s nella traccia %s dal tempo da "
 "%.4f a %.4f\n"
 
-#: src/multitrack.c:17998
+#: src/multitrack.c:18332
 #, c-format
 msgid ""
 "Time region %.3f to %.3f\n"
@@ -10203,7 +10209,7 @@
 "Regione temporale da %.3f a %.3f\n"
 "selezionata\n"
 
-#: src/multitrack.c:18002
+#: src/multitrack.c:18336
 msgid ""
 "select one or more tracks\n"
 "to create a region.\n"
@@ -10211,12 +10217,12 @@
 "seleziona una o più tracce\n"
 "per creare una regione.\n"
 
-#: src/multitrack.c:18004
+#: src/multitrack.c:18337
 #, c-format
 msgid "%d video tracks selected.\n"
 msgstr "%d tracce video selezionate.\n"
 
-#: src/multitrack.c:18006
+#: src/multitrack.c:18339
 msgid ""
 "Double click on timeline\n"
 "to deselect time region."
@@ -10224,7 +10230,7 @@
 "Clicca due volte sulla linea temporale\n"
 "per deselezionare la regione temporale."
 
-#: src/multitrack.c:18013
+#: src/multitrack.c:18346
 msgid ""
 "Single click on an effect\n"
 "to select it."
@@ -10232,7 +10238,7 @@
 "Clicca una volta su un effetto\n"
 "per selezionarlo."
 
-#: src/multitrack.c:18014
+#: src/multitrack.c:18347
 msgid ""
 "Double click on an effect\n"
 "to edit it."
@@ -10240,7 +10246,7 @@
 "Clicca due volte su un effetto\n"
 "per modificarlo"
 
-#: src/multitrack.c:18015
+#: src/multitrack.c:18348
 msgid ""
 "Right click on an effect\n"
 "for context menu.\n"
@@ -10248,7 +10254,7 @@
 "Clicca col tasto destro del mouse su un effetto\n"
 "per il menù del contesto.\n"
 
-#: src/multitrack.c:18017
+#: src/multitrack.c:18350
 msgid ""
 "Effect order can be changed at\n"
 "FILTER MAPS"
@@ -10256,21 +10262,21 @@
 "L'ordine degli effetti può essere cambiato in\n"
 "MAPPE FILTRO"
 
-#: src/multitrack.c:18024
+#: src/multitrack.c:18357
 msgid ""
 "You can select an effect,\n"
 "then use the INSERT BEFORE"
 msgstr ""
 
-#: src/multitrack.c:18025
+#: src/multitrack.c:18358
 msgid "or INSERT AFTER buttons to move it."
 msgstr "o INSERISCI DOPO per spostarlo."
 
-#: src/multitrack.c:18307 src/multitrack.c:18320
+#: src/multitrack.c:18639 src/multitrack.c:18652
 msgid "Click on another effect,"
 msgstr "Clicca su un altro effetto,"
 
-#: src/multitrack.c:18308 src/multitrack.c:18321
+#: src/multitrack.c:18640 src/multitrack.c:18653
 msgid ""
 "and the selected one\n"
 "will be inserted"
@@ -10278,51 +10284,51 @@
 "e quello selezionato\n"
 "sarà inserito"
 
-#: src/multitrack.c:18309
+#: src/multitrack.c:18641
 msgid "after it.\n"
 msgstr "dopo di esso.\n"
 
-#: src/multitrack.c:18322
+#: src/multitrack.c:18654
 msgid "before it.\n"
 msgstr "prima di esso.\n"
 
-#: src/multitrack.c:18551
+#: src/multitrack.c:18889
 #, c-format
 msgid "Removed parameter values for effect %s at time %.4f\n"
 msgstr "Rimossi i valori del parametro per l'effetto %s al tempo %.4f\n"
 
-#: src/multitrack.c:18759
+#: src/multitrack.c:19100
 #, c-format
 msgid "Set parameter values for %s %s on %s at time %.4f\n"
 msgstr "Imposta i valori del parametro per %s %s su %s al tempo %.4f\n"
 
-#: src/multitrack.c:19251 src/multitrack.c:20873
+#: src/multitrack.c:19630 src/multitrack.c:21195
 msgid "_Autoreload each time"
 msgstr "Ricarica _automaticamente ogni volta"
 
-#: src/multitrack.c:19323
+#: src/multitrack.c:19702
 #, fuzzy
 msgid "Saving layout"
 msgstr "_Salva layout"
 
-#: src/multitrack.c:19345
+#: src/multitrack.c:19725
 #, c-format
 msgid "Saved layout to %s\n"
 msgstr "Salvato il layout in %s\n"
 
-#: src/multitrack.c:20783
+#: src/multitrack.c:21125
 msgid "clips and frames"
 msgstr "clip e fotogrammi"
 
-#: src/multitrack.c:20787
+#: src/multitrack.c:21128
 msgid "clips"
 msgstr "clip"
 
-#: src/multitrack.c:20790
+#: src/multitrack.c:21130
 msgid "frames"
 msgstr "fotogrammi"
 
-#: src/multitrack.c:20800
+#: src/multitrack.c:21140
 msgid ""
 "\n"
 "Auto reload layout.\n"
@@ -10330,7 +10336,7 @@
 "\n"
 "Ricarica automaticamente il layout.\n"
 
-#: src/multitrack.c:20803
+#: src/multitrack.c:21143
 #, c-format
 msgid ""
 "%s\n"
@@ -10341,11 +10347,11 @@
 "Alcuni %s mancano nel layout%s\n"
 "Quindi non può venire caricato correttamente.\n"
 
-#: src/multitrack.c:20920
+#: src/multitrack.c:21284
 msgid "auto backup"
 msgstr "backup automatico"
 
-#: src/multitrack.c:20923
+#: src/multitrack.c:21287
 #, c-format
 msgid ""
 "\n"
@@ -10354,31 +10360,31 @@
 "\n"
 "Impossibile caricare il file layout %s\n"
 
-#: src/multitrack.c:20944
+#: src/multitrack.c:21308
 #, c-format
 msgid "Loading layout from %s..."
 msgstr "Caricamento del layout da %s in corso..."
 
-#: src/multitrack.c:20978
+#: src/multitrack.c:21338
 #, c-format
 msgid "Got %d events...processing..."
 msgstr "Ottenuti %d eventi...processo in corso..."
 
-#: src/multitrack.c:20991
+#: src/multitrack.c:21349
 msgid "Checking and rebuilding event list"
 msgstr "Controllando e ricostruendo l'elenco degli eventi"
 
-#: src/multitrack.c:21017
+#: src/multitrack.c:21374
 #, c-format
 msgid "%d errors detected.\n"
 msgstr "%d errori trovati.\n"
 
-#: src/multitrack.c:21068
+#: src/multitrack.c:21422
 #, c-format
 msgid "Multitrack fps set to %.3f\n"
 msgstr "Fps multi-traccia impostato a %.3f\n"
 
-#: src/multitrack.c:21225
+#: src/multitrack.c:21576
 #, fuzzy
 msgid ""
 "The current layout has changes which have not been saved.\n"
@@ -10387,19 +10393,19 @@
 "Il layout attuale non è stato salvato.\n"
 "Cosa vorresti fare ?\n"
 
-#: src/multitrack.c:22047
+#: src/multitrack.c:22385
 msgid "LiVES: Multitrack audio mixer"
 msgstr "LiVES: Mixer audio multi-traccia"
 
-#: src/multitrack.c:22077
+#: src/multitrack.c:22414
 msgid "_Reset values"
 msgstr "_Azzera valori"
 
-#: src/multitrack.c:22081
+#: src/multitrack.c:22418
 msgid "_Close mixer"
 msgstr "_Chiudi mixer"
 
-#: src/multitrack.c:22130
+#: src/multitrack.c:22466
 msgid ""
 "_Invert backing audio\n"
 "and layer volumes"
@@ -10407,43 +10413,43 @@
 "_Inverti l'audio di supporto\n"
 "e i volumi dei layer"
 
-#: src/multitrack.c:22132
+#: src/multitrack.c:22468
 msgid "Adjust backing and layer audio values so that they sum to 1.0"
 msgstr ""
 "Regola i valori dell'audio di sostegno e di livello in modo che la loro "
 "somma sia pari a 1.0"
 
-#: src/multitrack.c:22175
+#: src/multitrack.c:22510
 msgid "_Gang layer audio"
 msgstr "_Riunisci audio livello"
 
-#: src/multitrack.c:22177
+#: src/multitrack.c:22512
 msgid "Adjust all layer audio values to the same value"
 msgstr "Regola tutti i valori audio del layer allo stesso valore"
 
-#: src/jack.c:104
+#: src/jack.c:102
 msgid "JACK server started\n"
 msgstr "Server JACK avviato\n"
 
-#: src/jack.c:1284 src/jack.c:1353
+#: src/jack.c:1265 src/jack.c:1334
 msgid "Unable to connect to JACK server\n"
 msgstr "Non è stato possibile connettersi al server JACK\n"
 
-#: src/jack.c:1512
+#: src/jack.c:1491
 msgid "Started jack audio subsystem.\n"
 msgstr "Sottosistema audio jack avviato.\n"
 
-#: src/jack.c:1623
+#: src/jack.c:1600
 msgid "Started jack audio reader.\n"
 msgstr "Lettore audio jack avviato.\n"
 
-#: src/jack.c:1838
+#: src/jack.c:1815
 msgid ""
 "\n"
 "Connection to jack audio was reset.\n"
 msgstr ""
 
-#: src/pulse.c:87
+#: src/pulse.c:88
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -10451,7 +10457,7 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:92
+#: src/pulse.c:94
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -10459,7 +10465,7 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:96
+#: src/pulse.c:99
 #, fuzzy
 msgid ""
 "\n"
@@ -10471,129 +10477,129 @@
 "lettore audio \"jack\" o \"pulse audio\".\n"
 "Puoi impostare ciò in Strumenti|Preferenze|Riproduzione."
 
-#: src/pulse.c:101
+#: src/pulse.c:104
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
 msgstr ""
 
-#: src/pulse.c:107
+#: src/pulse.c:109
 msgid "LiVES will exit and you can choose another audio player.\n"
 msgstr ""
 
-#: src/pulse.c:1352
+#: src/pulse.c:1335
 msgid ""
 "\n"
 "Connection to pulse audio was reset.\n"
 msgstr ""
 
-#: src/colourspace.c:1100
+#: src/colourspace.c:1092
 msgid "unclamped"
 msgstr "non accumulato"
 
-#: src/colourspace.c:1101
+#: src/colourspace.c:1093
 msgid "clamped"
 msgstr "accumulato"
 
-#: src/omc-learn.c:195
+#: src/omc-learn.c:191
 #, c-format
 msgid "Responding to joystick events from %s\n"
 msgstr "Rispondendo agli eventi del joystick da %s\n"
 
-#: src/omc-learn.c:289
+#: src/omc-learn.c:279
 msgid "Creating ALSA seq port..."
 msgstr "Creazione porta sequenza ALSA in corso..."
 
-#: src/omc-learn.c:325
+#: src/omc-learn.c:313
 #, c-format
 msgid "Responding to MIDI events from %s\n"
 msgstr "Rispondendo agli eventi MIDI da %s\n"
 
-#: src/omc-learn.c:568
+#: src/omc-learn.c:554
 msgid "data"
 msgstr "dati"
 
-#: src/omc-learn.c:571
+#: src/omc-learn.c:557
 msgid "velocity"
 msgstr "velocità"
 
-#: src/omc-learn.c:572
+#: src/omc-learn.c:558
 msgid "note"
 msgstr "nota"
 
-#: src/omc-learn.c:574 src/omc-learn.c:736 src/omc-learn.c:1105
-#: src/omc-learn.c:1591 src/omc-learn.c:1640
+#: src/omc-learn.c:560 src/omc-learn.c:724 src/omc-learn.c:1092
+#: src/omc-learn.c:1581 src/omc-learn.c:1630
 msgid "value"
 msgstr "valore"
 
-#: src/omc-learn.c:576
+#: src/omc-learn.c:562
 msgid "state"
 msgstr "stato"
 
-#: src/omc-learn.c:688
+#: src/omc-learn.c:674
 msgid "variable"
 msgstr "variabile"
 
-#: src/omc-learn.c:1001
+#: src/omc-learn.c:989
 msgid "Vars."
 msgstr "Vers."
 
-#: src/omc-learn.c:1054
+#: src/omc-learn.c:1041
 #, c-format
 msgid "MIDI ch %d note on"
 msgstr "Note on sul canale MIDI %d"
 
-#: src/omc-learn.c:1058
+#: src/omc-learn.c:1045
 #, c-format
 msgid "MIDI ch %d note off"
 msgstr "Note off sul canale MIDI %d"
 
-#: src/omc-learn.c:1062
+#: src/omc-learn.c:1049
 #, c-format
 msgid "MIDI ch %d controller %d"
 msgstr "Canale MIDI %d, controller %d"
 
-#: src/omc-learn.c:1066
+#: src/omc-learn.c:1053
 #, c-format
 msgid "MIDI ch %d pitch bend"
 msgstr "Pitch bend sul canale MIDI %d"
 
-#: src/omc-learn.c:1070
+#: src/omc-learn.c:1057
 #, c-format
 msgid "MIDI ch %d pgm change"
 msgstr "Cambiamento MIDI ch %d pgm"
 
-#: src/omc-learn.c:1073
+#: src/omc-learn.c:1060
 #, c-format
 msgid "Joystick button %d"
 msgstr "Pulsante joystick %d"
 
-#: src/omc-learn.c:1076
+#: src/omc-learn.c:1063
 #, c-format
 msgid "Joystick axis %d"
 msgstr "Asse joystick %d"
 
-#: src/omc-learn.c:1113
+#: src/omc-learn.c:1100
 msgid "x"
 msgstr "x"
 
-#: src/omc-learn.c:1122
+#: src/omc-learn.c:1109
 msgid "range"
 msgstr "intervallo"
 
-#: src/omc-learn.c:1143
+#: src/omc-learn.c:1130
 msgid "+ offset1"
 msgstr "+ offset1"
 
-#: src/omc-learn.c:1161
+#: src/omc-learn.c:1150
 msgid "* scale"
 msgstr "* scala"
 
-#: src/omc-learn.c:1179
+#: src/omc-learn.c:1170
 msgid "+ offset2"
 msgstr "+ offset2"
 
-#: src/omc-learn.c:1280
+#: src/omc-learn.c:1270
 msgid ""
 "\n"
 "Click OK to delete all entries\n"
@@ -10601,212 +10607,212 @@
 "\n"
 "Clicca OK per eliminare tutte le entrate\n"
 
-#: src/omc-learn.c:1318
+#: src/omc-learn.c:1308
 msgid "LiVES: OMC learner"
 msgstr "LiVES: Studente OMC"
 
-#: src/omc-learn.c:1334
+#: src/omc-learn.c:1324
 msgid "Clear _unmatched"
 msgstr "Pulisci non _corrispondenti"
 
-#: src/omc-learn.c:1345
+#: src/omc-learn.c:1335
 msgid "_Delete all"
 msgstr "_Elimina tutto"
 
-#: src/omc-learn.c:1411
+#: src/omc-learn.c:1401
 msgid "Start video playback"
 msgstr "Avvia riproduzione video"
 
-#: src/omc-learn.c:1414
+#: src/omc-learn.c:1404
 msgid "Stop video playback"
 msgstr "Interrompi riproduzione video"
 
-#: src/omc-learn.c:1418
+#: src/omc-learn.c:1408
 msgid "Clip select <clipnum>"
 msgstr "Selezione clip <clipnum>"
 
-#: src/omc-learn.c:1419
+#: src/omc-learn.c:1409
 msgid "Switch foreground clip to the nth valid clip"
 msgstr "Scambia il clip in primo piano con il n° clip valido"
 
-#: src/omc-learn.c:1423
+#: src/omc-learn.c:1413
 msgid "Play forwards"
 msgstr "Riproduci in avanti"
 
-#: src/omc-learn.c:1424
+#: src/omc-learn.c:1414
 msgid "Play video in a forwards direction"
 msgstr "Riproduci video in avanti"
 
-#: src/omc-learn.c:1427
+#: src/omc-learn.c:1417
 msgid "Play backwards"
 msgstr "Riproduci all'indietro"
 
-#: src/omc-learn.c:1428
+#: src/omc-learn.c:1418
 msgid "Play video in a backwards direction"
 msgstr "Riproduci video all'indietro"
 
-#: src/omc-learn.c:1431
+#: src/omc-learn.c:1421
 msgid "Reverse playback direction"
 msgstr "Inverti la direzione di riproduzione"
 
-#: src/omc-learn.c:1432
+#: src/omc-learn.c:1422
 msgid "Reverse direction of video playback"
 msgstr "Inverti la direzione della riproduzione del video"
 
-#: src/omc-learn.c:1435
+#: src/omc-learn.c:1425
 msgid "Play video faster"
 msgstr "Riproduci video più velocemente"
 
-#: src/omc-learn.c:1436
+#: src/omc-learn.c:1426
 msgid "Play video at a slightly faster rate"
 msgstr "Riproduci il video con un valore un po' più veloce"
 
-#: src/omc-learn.c:1439
+#: src/omc-learn.c:1429
 msgid "Play video slower"
 msgstr "Riproduci video più lentamente"
 
-#: src/omc-learn.c:1440
+#: src/omc-learn.c:1430
 msgid "Play video at a slightly slower rate"
 msgstr "Riproduci il video con un valore un po' più lento"
 
-#: src/omc-learn.c:1443
+#: src/omc-learn.c:1433
 msgid "Toggle video freeze"
 msgstr "Commuta congelamento video"
 
-#: src/omc-learn.c:1444
+#: src/omc-learn.c:1434
 msgid "Freeze video, or if already frozen, unfreeze it"
 msgstr "Congela video, o se è già congelato, scongelalo"
 
-#: src/omc-learn.c:1447
+#: src/omc-learn.c:1437
 msgid "Set video framerate to <fps>"
 msgstr "Imposta il rapporto dei fotogrammi del video a <fps>"
 
-#: src/omc-learn.c:1448
+#: src/omc-learn.c:1438
 msgid "Set framerate of foreground clip to <float fps>"
 msgstr "Imposta il valore dei fotogrammi del clip in primo piano a <float fps>"
 
-#: src/omc-learn.c:1452
+#: src/omc-learn.c:1442
 msgid "Start recording"
 msgstr "Avvia la registrazione"
 
-#: src/omc-learn.c:1455
+#: src/omc-learn.c:1445
 msgid "Stop recording"
 msgstr "Interrompi la registrazione"
 
-#: src/omc-learn.c:1458
+#: src/omc-learn.c:1448
 msgid "Toggle recording state"
 msgstr "Commuta lo stato di registrazione"
 
-#: src/omc-learn.c:1461
+#: src/omc-learn.c:1451
 msgid "Swap foreground and background clips"
 msgstr "Scambia i clip in primo piano e in secondo piano"
 
-#: src/omc-learn.c:1463
+#: src/omc-learn.c:1453
 msgid "Reset effect keys"
 msgstr "Azzera i tasti degli effetti"
 
-#: src/omc-learn.c:1464
+#: src/omc-learn.c:1454
 msgid "Switch all effects off."
 msgstr "Disattiva tutti gli effetti."
 
-#: src/omc-learn.c:1467
+#: src/omc-learn.c:1457
 msgid "Enable effect key <key>"
 msgstr "Abilita tasto effetto <key>"
 
-#: src/omc-learn.c:1471
+#: src/omc-learn.c:1461
 msgid "Disable effect key <key>"
 msgstr "Disabilita tasto effetto <key>"
 
-#: src/omc-learn.c:1475
+#: src/omc-learn.c:1465
 msgid "Toggle effect key <key>"
 msgstr "Commuta tasto effetto <key>"
 
-#: src/omc-learn.c:1479
+#: src/omc-learn.c:1469
 msgid "Set parameter value <key> <pnum> = <value>"
 msgstr "Imposta il valore del parametro <key> <pnum> = <value>"
 
-#: src/omc-learn.c:1480
+#: src/omc-learn.c:1470
 msgid "Set <value> of pth (numerical) parameter for effect key <key>."
 msgstr ""
 "Imposta <value> del parametro (numerico) p° per il tasto di effetto <key>."
 
-#: src/omc-learn.c:1484
+#: src/omc-learn.c:1474
 msgid "Switch foreground to next clip"
 msgstr "Scambia primo piano nel prossimo clip"
 
-#: src/omc-learn.c:1487
+#: src/omc-learn.c:1477
 msgid "Switch foreground to previous clip"
 msgstr "Scambia primo piano nel clip precedente"
 
-#: src/omc-learn.c:1490
+#: src/omc-learn.c:1480
 msgid "Set video framerate to ratio <fps_ratio>"
 msgstr "Imposta il valore dei fotogrammi del video al rapporto <fps_ratio>"
 
-#: src/omc-learn.c:1491
+#: src/omc-learn.c:1481
 msgid "Set framerate ratio of foreground clip to <float fps_ratio>"
 msgstr ""
 "Imposta il rapporto del valore dei fotogrammi del clip in primo piano a "
 "<float fps_ratio>"
 
-#: src/omc-learn.c:1495
+#: src/omc-learn.c:1485
 msgid "Retrigger clip <clipnum>"
 msgstr "Reinnesca il clip <clipnum>"
 
-#: src/omc-learn.c:1496
+#: src/omc-learn.c:1486
 msgid ""
 "Switch foreground clip to the nth valid clip, and reset the frame number"
 msgstr ""
 "Scambia il clip in primo piano con il n° clip valido, e azzera il numero di "
 "fotogrammi"
 
-#: src/omc-learn.c:1500
+#: src/omc-learn.c:1490
 msgid "Cycle to next mode for effect key <key>"
 msgstr "Salta il ciclo alla modalità successiva per il tasto di effetto <key>"
 
-#: src/omc-learn.c:1504
+#: src/omc-learn.c:1494
 msgid "Cycle to previous mode for effect key <key>"
 msgstr "Salta il ciclo alla modalità precedente per il tasto di effetto <key>"
 
-#: src/omc-learn.c:1508
+#: src/omc-learn.c:1498
 msgid "Set playback plugin parameter value <pnum> = <value>"
 msgstr ""
 
-#: src/omc-learn.c:1509
+#: src/omc-learn.c:1499
 msgid "Set <value> of pth parameter for the playback plugin."
 msgstr ""
 
 #. TRANSLATORS: short form of "clip number"
-#: src/omc-learn.c:1536 src/omc-learn.c:1607
+#: src/omc-learn.c:1526 src/omc-learn.c:1597
 msgid "clipnum"
 msgstr "numero clip"
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1545
+#: src/omc-learn.c:1535
 msgid "fps"
 msgstr "fps"
 
 #. TRANSLATORS: as in keyboard key
-#: src/omc-learn.c:1553 src/omc-learn.c:1560 src/omc-learn.c:1567
-#: src/omc-learn.c:1575 src/omc-learn.c:1615 src/omc-learn.c:1623
+#: src/omc-learn.c:1543 src/omc-learn.c:1550 src/omc-learn.c:1557
+#: src/omc-learn.c:1565 src/omc-learn.c:1605 src/omc-learn.c:1613
 msgid "key"
 msgstr "tasto"
 
 #. TRANSLATORS: short form of "parameter number"
-#: src/omc-learn.c:1583 src/omc-learn.c:1632
+#: src/omc-learn.c:1573 src/omc-learn.c:1622
 msgid "pnum"
 msgstr "pnum"
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1599
+#: src/omc-learn.c:1589
 msgid "fps_ratio"
 msgstr "fps_ratio"
 
-#: src/omc-learn.c:2443
+#: src/omc-learn.c:2417
 #, c-format
 msgid "Saving device mapping to file %s..."
 msgstr "Salvando la mappatura del dispositivo nel file %s..."
 
-#: src/omc-learn.c:2527
+#: src/omc-learn.c:2498
 #, c-format
 msgid ""
 "\n"
@@ -10819,7 +10825,7 @@
 "Errore durante l'analisi del file\n"
 "%s\n"
 
-#: src/omc-learn.c:2534
+#: src/omc-learn.c:2505
 #, c-format
 msgid ""
 "\n"
@@ -10832,12 +10838,12 @@
 "Versione non valida nel file\n"
 "%s\n"
 
-#: src/omc-learn.c:2571
+#: src/omc-learn.c:2541
 #, c-format
 msgid "Loading device mapping from file %s..."
 msgstr "Caricando la mappatura del dispositivo dal file %s..."
 
-#: src/omc-learn.c:2576
+#: src/omc-learn.c:2544
 #, c-format
 msgid ""
 "\n"
@@ -10852,12 +10858,12 @@
 "%s\n"
 "Codice errore %d\n"
 
-#: src/videodev.c:547
+#: src/videodev.c:539
 #, c-format
 msgid "Unable to open device %s\n"
 msgstr ""
 
-#: src/videodev.c:564
+#: src/videodev.c:554
 #, c-format
 msgid "Opened device %s\n"
 msgstr ""
@@ -11803,6 +11809,15 @@
 #~ msgid "$error"
 #~ msgstr "$errore"
 
+#~ msgid "Pause"
+#~ msgstr "Pausa"
+
+#~ msgid "Start frame"
+#~ msgstr "Fotogramma iniziale"
+
+#~ msgid "End frame"
+#~ msgstr "Fotogramma finale"
+
 #, fuzzy
 #~ msgid "_Open"
 #~ msgstr "_Apri..."

LiVES-2.2.8.tar.bz2/po/ja.po -> LiVES-2.4.1.tar.bz2/po/ja.po Changed

@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: ja\n"
 "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n"
-"POT-Creation-Date: 2015-02-08 17:18-0300\n"
+"POT-Creation-Date: 2015-08-09 14:52-0300\n"
 "PO-Revision-Date: 2013-03-14 12:31+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -18,8 +18,7 @@
 "X-Launchpad-Export-Date: 2013-03-28 10:43+0000\n"
 "X-Generator: Launchpad (build 16546)\n"
 
-#. TRANSLATORS: do not translate this message
-#: src/main.c:118
+#: src/main.c:128
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -28,22 +27,22 @@
 "http://lives.sourceforge.net/TRANS-README.txt"
 msgstr ""
 
-#: src/main.c:134
+#: src/main.c:153
 #, c-format
 msgid "%s Warning: %s\n"
 msgstr ""
 
-#: src/main.c:138
+#: src/main.c:157
 #, c-format
 msgid "%s Critical error: %s\n"
 msgstr ""
 
-#: src/main.c:139
+#: src/main.c:158
 #, c-format
 msgid "%s Fatal error: %s\n"
 msgstr ""
 
-#: src/main.c:176
+#: src/main.c:198
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -57,7 +56,7 @@
 "してください。\n"
 "ご協力ありがとうございます。LiVESを再起動すれば復元が行われるでしょう。\n"
 
-#: src/main.c:177
+#: src/main.c:199
 msgid ""
 "\n"
 "\n"
@@ -69,7 +68,7 @@
 "クラッシュ報告する際は、使用しているOS・ディストリビューションやLiVESのバー"
 "ジョンなどの詳細も含めてください ("
 
-#: src/main.c:180
+#: src/main.c:203
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -77,7 +76,7 @@
 "また、以下の情報もお願いします:\n"
 "\n"
 
-#: src/main.c:184
+#: src/main.c:206
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
@@ -87,84 +86,84 @@
 "と共に実行してください。\n"
 "\n"
 
-#: src/main.c:192
+#: src/main.c:216
 msgid "Preserving set.\n"
 msgstr "セットの保護\n"
 
-#: src/main.c:636
+#: src/main.c:691
 msgid "Resizing"
 msgstr "リサイズ"
 
-#: src/main.c:643
+#: src/main.c:698
 msgid "_Resize All Frames"
 msgstr "全フレームのリサイズ(_R)"
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:895
+#: src/main.c:948
 msgid "Any"
 msgstr "任意"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:897
+#: src/main.c:950
 msgid "None"
 msgstr "なし"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:899
+#: src/main.c:952
 msgid "recommended"
 msgstr "推奨"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:901
+#: src/main.c:954
 msgid "disabled !"
 msgstr "使用不能！"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:903
+#: src/main.c:956
 msgid "**The current layout**"
 msgstr "**現在のレイアウト**"
 
 #. TRANSLATORS: adjective for "Built in" type effects
-#: src/main.c:905
+#: src/main.c:958
 msgid "Builtin"
 msgstr "ビルトイン"
 
 #. TRANSLATORS: adjective for "Custom" type effects
-#: src/main.c:907
+#: src/main.c:960
 msgid "Custom"
 msgstr "カスタム"
 
 #. TRANSLATORS: adjective for "Test" type effects
-#: src/main.c:909
+#: src/main.c:962
 msgid "Test"
 msgstr "テスト"
 
-#: src/main.c:1054
+#: src/main.c:1107
 msgid "Foreground"
 msgstr ""
 
-#: src/main.c:1055
+#: src/main.c:1108
 #, fuzzy
 msgid "Background"
 msgstr "空白のバックグラウンド(_B)"
 
-#: src/main.c:1566
+#: src/main.c:1624
 msgid "Loading realtime effect plugins..."
 msgstr "リアルタイムエフェクトプラグインを読み込み中..."
 
-#: src/main.c:1631
+#: src/main.c:1690
 msgid "Starting jack audio server..."
 msgstr "JACKサーバーの音声機能を開始しています..."
 
-#: src/main.c:1633
+#: src/main.c:1692
 msgid "Starting jack transport server..."
 msgstr "JACKサーバーのトランスポート機能を開始しています..."
 
-#: src/main.c:1634
+#: src/main.c:1693
 msgid "Connecting to jack transport server..."
 msgstr "JACKサーバーのトランスポート機能に接続しています..."
 
-#: src/main.c:1663
+#: src/main.c:1723
 #, c-format
 msgid ""
 "\n"
@@ -176,114 +175,114 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1697
+#: src/main.c:1758
 msgid "Starting pulse audio server..."
 msgstr "PulseAudioサーバーを開始しています..."
 
-#: src/main.c:1765
+#: src/main.c:1825
 msgid "Checking optional dependencies:"
 msgstr "必ずしも必要ではない依存関係を確認しています:"
 
-#: src/main.c:1766
+#: src/main.c:1826
 msgid "mplayer...detected..."
 msgstr "mplayerが見つかりました..."
 
-#: src/main.c:1767
+#: src/main.c:1827
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayerは見つかりませんでした..."
 
-#: src/main.c:1768
+#: src/main.c:1828
 #, fuzzy
 msgid "mplayer2...detected..."
 msgstr "mplayerが見つかりました..."
 
-#: src/main.c:1769
+#: src/main.c:1829
 #, fuzzy
 msgid "mplayer2...NOT DETECTED..."
 msgstr "mplayerは見つかりませんでした..."
 
-#: src/main.c:1770
+#: src/main.c:1830
 msgid "convert...detected..."
 msgstr "convertが見つかりました..."
 
-#: src/main.c:1771
+#: src/main.c:1831
 msgid "convert...NOT DETECTED..."
 msgstr "convertは見つかりませんでした..."
 
-#: src/main.c:1772
+#: src/main.c:1832
 msgid "composite...detected..."
 msgstr "compositeが見つかりました..."
 
-#: src/main.c:1773
+#: src/main.c:1833
 msgid "composite...NOT DETECTED..."
 msgstr "compositeは見つかりませんでした..."
 
-#: src/main.c:1774
+#: src/main.c:1834
 msgid "sox...detected\n"
 msgstr "soxが見つかりました\n"
 
-#: src/main.c:1775
+#: src/main.c:1835
 msgid "sox...NOT DETECTED\n"
 msgstr "soxは見つかりませんでした\n"
 
-#: src/main.c:1776
+#: src/main.c:1836
 msgid "cdda2wav...detected..."
 msgstr "cdda2wavが見つかりました..."
 
-#: src/main.c:1777
+#: src/main.c:1837
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wavは見つかりませんでした..."
 
-#: src/main.c:1778
+#: src/main.c:1838
 msgid "jackd...detected..."
 msgstr "jackdが見つかりました..."
 
-#: src/main.c:1779
+#: src/main.c:1839
 msgid "jackd...NOT DETECTED..."
 msgstr "jackdは見つかりませんでした..."
 
-#: src/main.c:1780
+#: src/main.c:1840
 msgid "pulse audio...detected..."
 msgstr "pulseaudioが見つかりました..."
 
-#: src/main.c:1781
+#: src/main.c:1841
 msgid "pulse audio...NOT DETECTED..."
 msgstr "pulseaudioは見つかりませんでした..."
 
-#: src/main.c:1782
+#: src/main.c:1842
 msgid "python...detected..."
 msgstr "pythonが見つかりました..."
 
-#: src/main.c:1783
+#: src/main.c:1843
 msgid "python...NOT DETECTED..."
 msgstr "pythonは見つかりませんでした..."
 
-#: src/main.c:1784
+#: src/main.c:1844
 msgid "dvgrab...detected..."
 msgstr "dvgrabが見つかりました..."
 
-#: src/main.c:1785
+#: src/main.c:1845
 msgid "dvgrab...NOT DETECTED..."
 msgstr "dvgrabは見つかりませんでした..."
 
-#: src/main.c:1786
+#: src/main.c:1846
 msgid "xwininfo...detected..."
 msgstr "xwininfoが見つかりました..."
 
-#: src/main.c:1787
+#: src/main.c:1847
 msgid "xwininfo...NOT DETECTED..."
 msgstr "xwininfoは見つかりませんでした..."
 
-#: src/main.c:1793
+#: src/main.c:1853
 #, c-format
 msgid "Windows version %04X"
 msgstr ""
 
-#: src/main.c:1795
+#: src/main.c:1855
 msgid "UNKNOWN - please patch me !"
 msgstr "不明 - パッチを送ってください！"
 
-#: src/main.c:1799
+#: src/main.c:1859
 #, c-format
 msgid ""
 "\n"
@@ -294,48 +293,48 @@
 "\n"
 "ウィンドウマネジャーは \"%s\" です; "
 
-#: src/main.c:1802
+#: src/main.c:1862
 #, c-format
 msgid "number of monitors detected: %d\n"
 msgstr "検出されたモニタ数: %d\n"
 
-#: src/main.c:1805
+#: src/main.c:1865
 #, c-format
 msgid "Number of CPUs detected: %d "
 msgstr ""
 
-#: src/main.c:1808 src/multitrack.c:4902
+#: src/main.c:1868 src/multitrack.c:5068
 msgid "little endian"
 msgstr "リトルエンディアン"
 
-#: src/main.c:1809 src/multitrack.c:4901
+#: src/main.c:1869 src/multitrack.c:5067
 msgid "big endian"
 msgstr "ビッグエンディアン"
 
-#: src/main.c:1810
+#: src/main.c:1870
 #, c-format
 msgid "(%d bits, %s)\n"
 msgstr ""
 
-#: src/main.c:1814
+#: src/main.c:1874
 msgid "GUI type is: "
 msgstr ""
 
-#: src/main.c:1818
+#: src/main.c:1878
 #, c-format
 msgid "GTK+ version %d.%d.%d (compiled with %d.%d.%d)"
 msgstr ""
 
-#: src/main.c:1840
+#: src/main.c:1900
 msgid ", with cairo support"
 msgstr ""
 
-#: src/main.c:1847
+#: src/main.c:1907
 #, c-format
 msgid "Temp directory is %s\n"
 msgstr "一時ディレクトリは %s です。\n"
 
-#: src/main.c:1851
+#: src/main.c:1911
 msgid ""
 "WARNING - this version of LiVES was compiled without either\n"
 "jack or pulse audio support.\n"
@@ -345,15 +344,15 @@
 "サポートしない状態でコンパイルされています。\n"
 "そのため音声機能の多くが利用できません。\n"
 
-#: src/main.c:1854
+#: src/main.c:1914
 msgid "Compiled with jack support, good !\n"
 msgstr "JACKサーバーをサポートした状態でコンパイルされています\n"
 
-#: src/main.c:1857
+#: src/main.c:1917
 msgid "Compiled with pulse audio support, wonderful !\n"
 msgstr "PulseAudioをサポートする状態でコンパイルされています！\n"
 
-#: src/main.c:1861
+#: src/main.c:1921
 #, c-format
 msgid ""
 "Welcome to LiVES version %s.\n"
@@ -362,7 +361,7 @@
 "LiVES version %s へようこそ。\n"
 "\n"
 
-#: src/main.c:2306
+#: src/main.c:2380
 #, c-format
 msgid ""
 "\n"
@@ -371,72 +370,78 @@
 "\n"
 "起動方法: %s [オプション] [ファイル名 [開始時刻] [フレーム]]\n"
 
-#: src/main.c:2307
+#: src/main.c:2381
 msgid "Where: filename is the name of a media file or backup file.\n"
 msgstr ""
 "ファイル名は、メディアファイルもしくはバックアップファイルの名前です。\n"
 
-#: src/main.c:2308
+#: src/main.c:2382
 msgid "start_time : filename start time in seconds\n"
 msgstr "開始時刻 : ファイル名 開始時刻(秒)\n"
 
-#: src/main.c:2309
+#: src/main.c:2383
 msgid "frames : maximum number of frames to open\n"
 msgstr "フレーム : オープンする最大フレームの数\n"
 
-#: src/main.c:2311
+#: src/main.c:2385
 msgid "opts can be:\n"
 msgstr "オプション:\n"
 
-#: src/main.c:2312
+#: src/main.c:2386
 msgid "-help            : show this help text and exit\n"
 msgstr "-help : ヘルプを表示して終了\n"
 
-#: src/main.c:2313
+#: src/main.c:2387
 msgid "-tmpdir <tempdir>: use alternate working directory (e.g /var/ramdisk)\n"
 msgstr "-tmpdir <tempdir>: 別な作業用ディレクトリを使う(例 /var/ramdisk)\n"
 
-#: src/main.c:2314
+#: src/main.c:2388
 msgid "-set <setname>   : autoload clip set setname\n"
 msgstr "-set <setname> : 自動読み込みするクリップをsetnameとする\n"
 
-#: src/main.c:2315
+#: src/main.c:2389
 msgid "-noset           : do not load any set on startup\n"
 msgstr "-noset : 開始時にセットの読み込みをしない\n"
 
-#: src/main.c:2316
+#: src/main.c:2390
 msgid "-norecover       : force no-loading of crash recovery\n"
 msgstr "-norecover : 読み込み時にクラッシュからの復元を強制しない\n"
 
-#: src/main.c:2317
+#: src/main.c:2391
 msgid "-recover         : force loading of crash recovery\n"
 msgstr "-recover : 読み込み時にクラッシュからの復元を強制する\n"
 
-#: src/main.c:2318
-msgid "-nothreaddialog  : doe nothing - retained for backwards compatibility\n"
+#: src/main.c:2392
+#, fuzzy
+msgid ""
+"-nothreaddialog  : does nothing - retained for backwards compatibility\n"
 msgstr "-nothreaddialog  : 何も行いません - 後方互換性のために残しています\n"
 
-#: src/main.c:2319
+#: src/main.c:2393
 msgid "-nogui           : do not show the gui\n"
 msgstr "-nogui           : GUIを表示しない\n"
 
-#: src/main.c:2320
+#: src/main.c:2394
 msgid "-nosplash        : do not show the splash window\n"
 msgstr "-nosplash        : スプラッシュウィンドウを表示しない\n"
 
-#: src/main.c:2321
+#: src/main.c:2395
 msgid "-noplaywin       : do not show the play window\n"
 msgstr "-noplaywin       : プレイウィンドウを表示しない\n"
 
-#: src/main.c:2322
+#: src/main.c:2396
+msgid "-noninteractive  : disable menu interactivity\n"
+msgstr ""
+
+#: src/main.c:2397
 msgid "-startup-ce      : start in clip editor mode\n"
 msgstr "-startup-ce      : クリップ編集モードで起動する\n"
 
-#: src/main.c:2323
+#: src/main.c:2398
 msgid "-startup-mt      : start in multitrack mode\n"
 msgstr "-startup-mt      : マルチトラックモードで起動する\n"
 
-#: src/main.c:2324
+#: src/main.c:2399
 msgid ""
 "-fxmodesmax <n>  : allow <n> modes per effect key (minimum is 1, default is "
 "8)\n"
@@ -444,15 +449,15 @@
 "-fxmodesmax <n>  : エフェクトキーそれぞれに <n> つのモードを許可する(最小は"
 "1、デフォルトは8)\n"
 
-#: src/main.c:2326
+#: src/main.c:2401
 msgid "-oscstart <port> : start OSC listener on UDP port <port>\n"
 msgstr "-oscstart <port> : OSCリスナーをUDPポート<port>で開始する\n"
 
-#: src/main.c:2327
+#: src/main.c:2402
 msgid "-nooscstart      : do not start OSC listener\n"
 msgstr "-nooscstart : OSCリスナーを起動しない\n"
 
-#: src/main.c:2329
+#: src/main.c:2404
 #, fuzzy
 msgid ""
 "-aplayer <ap>    : start with selected audio player. <ap> can be mplayer, "
@@ -460,15 +465,15 @@
 msgstr "-aplayer <ap> : 選択したオーディオプレーヤーを起動する。<ap>はmplayer"
 
 #. TRANSLATORS: pulse (audio)
-#: src/main.c:2332
+#: src/main.c:2407
 msgid ", pulse"
 msgstr ", pulse"
 
-#: src/main.c:2335
+#: src/main.c:2410
 msgid ", sox or jack\n"
 msgstr "、soxまたはjack\n"
 
-#: src/main.c:2336
+#: src/main.c:2412
 msgid ""
 "-jackopts <opts>    : opts is a bitmap of jack startup options [1 = jack "
 "transport client, 2 = jack transport master, 4 = start jack transport "
@@ -478,15 +483,15 @@
 "transport client, 2 = jack transport master,4 = start jack transport server, "
 "8 = pause audio when video paused,16 = start jack audio server] \n"
 
-#: src/main.c:2338
+#: src/main.c:2414
 msgid " or sox\n"
 msgstr " または sox\n"
 
-#: src/main.c:2340
+#: src/main.c:2416
 msgid "-devicemap <mapname>          : autoload devicemap\n"
 msgstr "-devicemap <mapname>          : autoload devicemap\n"
 
-#: src/main.c:2341
+#: src/main.c:2418
 msgid ""
 "-vppdefaults <file>          : load video playback plugin defaults from "
 "<file> (Note: only sets the settings, not the plugin type)\n"
@@ -494,16 +499,16 @@
 "-vppdefaults <file>          : 映像再生プラグインのデフォルトを<file> から読"
 "み込む(注: プラグインの種類ではなく設定のセットのみ)\n"
 
-#: src/main.c:2342
+#: src/main.c:2419
 msgid "-debug            : try to debug crashes (requires 'gdb' installed)\n"
 msgstr ""
 "-debug            : クラッシュのデバックを試みる (gdbのインストールが必要)\n"
 
-#: src/main.c:2373 src/gui.c:1128
+#: src/main.c:2449 src/gui.c:1127
 msgid "Starting GUI..."
 msgstr "GUIを開始..."
 
-#: src/main.c:2396
+#: src/main.c:2475
 #, c-format
 msgid ""
 "\n"
@@ -514,7 +519,7 @@
 "(Maybe you need to change the value of <prefix_dir> in your %s file)\n"
 msgstr ""
 
-#: src/main.c:2410
+#: src/main.c:2492
 #, c-format
 msgid ""
 "\n"
@@ -522,7 +527,7 @@
 "Please make sure you have write access to %s and try again.\n"
 msgstr ""
 
-#: src/main.c:2415
+#: src/main.c:2498
 msgid ""
 "\n"
 "`smogrify` must be in your path, and be executable\n"
@@ -536,7 +541,7 @@
 "LiVESを実行する前に、パッケージに附属するREADMEファイルを\n"
 "確認してください。\n"
 
-#: src/main.c:2421
+#: src/main.c:2504
 #, c-format
 msgid ""
 "\n"
@@ -546,7 +551,7 @@
 "Please check the file permissions for this file and try again.\n"
 msgstr ""
 
-#: src/main.c:2428
+#: src/main.c:2512
 #, c-format
 msgid ""
 "\n"
@@ -557,7 +562,7 @@
 "and try again.\n"
 msgstr ""
 
-#: src/main.c:2438
+#: src/main.c:2522
 #, c-format
 msgid ""
 "Please check the <tempdir> setting in \n"
@@ -565,7 +570,7 @@
 "and try again.\n"
 msgstr ""
 
-#: src/main.c:2445
+#: src/main.c:2528
 #, c-format
 msgid ""
 "\n"
@@ -580,7 +585,7 @@
 "\n"
 "%s"
 
-#: src/main.c:2453
+#: src/main.c:2536
 msgid ""
 "\n"
 "An incorrect version of smogrify was found in your path.\n"
@@ -598,7 +603,7 @@
 "\n"
 "よろしくお願いします。\n"
 
-#: src/main.c:2458
+#: src/main.c:2541
 #, fuzzy
 msgid ""
 "\n"
@@ -609,7 +614,7 @@
 "LiVESは現在のところ正しく動作するために'mplayer'または'sox'を必要とします。い"
 "ずれかひとつもしくは両方をインストールして、再び試してください。\n"
 
-#: src/main.c:2462
+#: src/main.c:2546
 #, fuzzy
 msgid ""
 "\n"
@@ -620,7 +625,7 @@
 "LiVESは現在のところ正しく動作するために'mplayer'または'sox'を必要とします。い"
 "ずれかひとつもしくは両方をインストールして、再び試してください。\n"
 
-#: src/main.c:2472
+#: src/main.c:2556
 #, fuzzy
 msgid ""
 "\n"
@@ -631,7 +636,7 @@
 "LiVESは'mplayer'を検出できませんでした。LiVESをより完全に使うには、mplayerを"
 "インストールするとよいでしょう。\n"
 
-#: src/main.c:2475
+#: src/main.c:2561
 msgid ""
 "\n"
 "LiVES was unable to locate 'convert'. You should install convert and image-"
@@ -641,7 +646,7 @@
 "LiVESは'convert'を検出できませんでした。描画エフェクトを使いたい場合はconvert"
 "およびimageMagickをインストールしてください。\n"
 
-#: src/main.c:2478
+#: src/main.c:2566
 msgid ""
 "\n"
 "LiVES was unable to locate 'composite'. You should install composite and "
@@ -651,7 +656,7 @@
 "LiVESは'composite'を検出できませんでした。マージ機能を使いたい場合はcomposite"
 "およびimageMagickをインストールしてください。\n"
 
-#: src/main.c:2481
+#: src/main.c:2570
 msgid ""
 "\n"
 "LiVES was unable to locate 'sox'. Some audio features may not work. You "
@@ -661,7 +666,7 @@
 "LiVESはsoxを探すことができませんでした。いくつかの音声機能は使えません。soxを"
 "インストールしてください。\n"
 
-#: src/main.c:2484
+#: src/main.c:2575
 #, c-format
 msgid ""
 "\n"
@@ -672,59 +677,59 @@
 "You may need to change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/main.c:2611
+#: src/main.c:2707
 #, c-format
 msgid "Autoloading set %s..."
 msgstr "セット %s を自動読み込み中..."
 
 #. TRANSLATORS: localised name may be used here
-#: src/main.c:2781 src/interface.c:738
+#: src/main.c:2902
 msgid "LiVES"
 msgstr "LiVES"
 
-#: src/main.c:2948
+#: src/main.c:3066
 #, c-format
 msgid "Invalid audio player %s\n"
 msgstr "無効なオーディオプレーヤー %s\n"
 
-#: src/main.c:3077
+#: src/main.c:3214
 #, c-format
 msgid "LiVES-%s: <Untitled%d> %dx%d : %d frames %d bpp %.3f fps"
 msgstr "LiVES-%s: <無題%d> %dx%d : %d frames %d bpp %.3f fps"
 
-#: src/main.c:3082
+#: src/main.c:3219
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : ??? frames ??? bpp %.3f fps"
 msgstr "LiVES-%s: <%s> %dx%d : ??? frames ??? bpp %.3f fps"
 
-#: src/main.c:3086
+#: src/main.c:3222
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : %d frames %d bpp %.3f fps"
 msgstr "LiVES-%s: <%s> %dx%d : %d frames %d bpp %.3f fps"
 
-#: src/main.c:3094
+#: src/main.c:3229
 #, c-format
 msgid "LiVES-%s: <No File>"
 msgstr "LiVES-%s: <ファイル未設定>"
 
 #. TRANSLATORS: rec(ord)
-#: src/main.c:5085
+#: src/main.c:5201
 #, c-format
 msgid "rec %9d/%d"
 msgstr "記録 %9d/%d"
 
 #. TRANSLATORS: out of memory (rec(ord))
-#: src/main.c:5091
+#: src/main.c:5206
 #, c-format
 msgid "!rec %9d/%d"
 msgstr "!記録 %9d/%d"
 
-#: src/main.c:5398 src/main.c:5399 src/gui.c:2110 src/gui.c:3220
-#: src/saveplay.c:2336
+#: src/main.c:5500 src/main.c:5501 src/gui.c:2108 src/gui.c:3331
+#: src/saveplay.c:2315
 msgid "Play"
 msgstr "再生"
 
-#: src/main.c:6128
+#: src/main.c:6216
 msgid ""
 "LiVES was unable to capture this image\n"
 "\n"
@@ -732,35 +737,35 @@
 "LiVESはこの画像をキャプチャできませんでした\n"
 "\n"
 
-#: src/main.c:6250
+#: src/main.c:6345
 #, c-format
 msgid "Closed file %s\n"
 msgstr "ファイル %s を閉じました\n"
 
-#: src/main.c:6452 src/gui.c:648 src/utils.c:4312 src/utils.c:4344
-#: src/saveplay.c:3550 src/multitrack.c:4510 src/multitrack.c:6268
+#: src/main.c:6542 src/gui.c:647 src/utils.c:4256 src/utils.c:4286
+#: src/saveplay.c:3500 src/multitrack.c:4678 src/multitrack.c:6447
 msgid "_Undo"
 msgstr "元に戻す(_U)"
 
-#: src/main.c:6453 src/gui.c:666 src/utils.c:4313 src/utils.c:4345
-#: src/saveplay.c:3551 src/multitrack.c:4531 src/multitrack.c:6293
+#: src/main.c:6543 src/gui.c:665 src/utils.c:4257 src/utils.c:4287
+#: src/saveplay.c:3501 src/multitrack.c:4698 src/multitrack.c:6472
 msgid "_Redo"
 msgstr "やり直す(_R)"
 
-#: src/main.c:6493 src/interface.c:470 src/gui.c:2326 src/preferences.c:2357
-#: src/resample.c:1516
+#: src/main.c:6583 src/interface.c:457 src/gui.c:2324 src/preferences.c:2391
+#: src/resample.c:1488
 msgid "Video"
 msgstr "ビデオ"
 
-#: src/main.c:6494 src/interface.c:483 src/gui.c:2351
+#: src/main.c:6584 src/interface.c:470 src/gui.c:2348
 msgid "Left Audio"
 msgstr "左音声"
 
-#: src/main.c:6495 src/gui.c:2375
+#: src/main.c:6585 src/gui.c:2371
 msgid "Right Audio"
 msgstr "右音声"
 
-#: src/main.c:6540
+#: src/main.c:6630
 #, fuzzy
 msgid ""
 "\n"
@@ -775,11 +780,11 @@
 "きません。\n"
 "「設定」の再生オプションを調整して、再度試してください。\n"
 
-#: src/main.c:7051 src/plugins.c:1502
+#: src/main.c:7134 src/plugins.c:1468
 msgid "LiVES: - Play Window"
 msgstr "LiVES: - 再生ウィンドウ"
 
-#: src/startup.c:25
+#: src/startup.c:24
 #, c-format
 msgid ""
 "A directory named\n"
@@ -794,7 +799,7 @@
 "\n"
 "(空き容量 = %s)\n"
 
-#: src/startup.c:32
+#: src/startup.c:29
 #, c-format
 msgid ""
 "A directory named\n"
@@ -809,7 +814,7 @@
 "LiVES はこのディレクトリに書き込んだり、空き領域を読み込めませんでした。\n"
 "他の場所を選択してください。\n"
 
-#: src/startup.c:49
+#: src/startup.c:46
 #, c-format
 msgid ""
 "\n"
@@ -826,7 +831,7 @@
 "\n"
 "(空き容量 = %s)"
 
-#: src/startup.c:54
+#: src/startup.c:50
 #, c-format
 msgid ""
 "\n"
@@ -839,11 +844,11 @@
 "%s\n"
 "再度試して、他の場所を指定してください。\n"
 
-#: src/startup.c:96
+#: src/startup.c:92
 msgid "Directory name is too long !"
 msgstr "ディレクトリ名が長すぎます！"
 
-#: src/startup.c:223
+#: src/startup.c:216
 msgid ""
 "LiVES FAILED TO START YOUR SELECTED AUDIO PLAYER !\n"
 "\n"
@@ -851,7 +856,7 @@
 "選択した音声の入出力先を開始できませんでした！\n"
 "\n"
 
-#: src/startup.c:230
+#: src/startup.c:222
 msgid ""
 "Before starting LiVES, you need to choose an audio player.\n"
 "\n"
@@ -861,7 +866,7 @@
 "\n"
 "ほとんどのユーザーにはPulseAudioがお勧めです。"
 
-#: src/startup.c:233
+#: src/startup.c:225
 msgid ""
 ", but this version of LiVES was not compiled with pulse audio support.\n"
 "\n"
@@ -869,7 +874,7 @@
 "、ですがお使いのLiVESは、PulseAudioのサポートなしでコンパイルされています。\n"
 "\n"
 
-#: src/startup.c:236
+#: src/startup.c:229
 msgid ""
 ", but you do not have pulse audio installed on your system.\n"
 " You are advised to install pulse audio first before running LiVES.\n"
@@ -879,11 +884,11 @@
 " LiVESを起動する前にPulseAudioサウンドサーバーをインストールしてください。\n"
 "\n"
 
-#: src/startup.c:241
+#: src/startup.c:233
 msgid "JACK audio is recommended for pro users"
 msgstr "プロのユーザー向けにはJACKサウンドサーバーの使用を推奨します"
 
-#: src/startup.c:244
+#: src/startup.c:236
 msgid ""
 ", but this version of LiVES was not compiled with jack audio support.\n"
 "\n"
@@ -892,7 +897,7 @@
 "います。\n"
 "\n"
 
-#: src/startup.c:247
+#: src/startup.c:239
 msgid ""
 ", but you do not have jackd installed. You may wish to install jackd first "
 "before running LiVES.\n"
@@ -902,7 +907,7 @@
 "JACKサウンドサーバーをインストールしてください。\n"
 "\n"
 
-#: src/startup.c:250
+#: src/startup.c:242
 msgid ""
 ", but may prevent LiVES from starting on some systems.\n"
 "If LiVES will not start with jack, you can restart and try with another "
@@ -914,11 +919,11 @@
 "声機能を試してください。\n"
 "\n"
 
-#: src/startup.c:254
+#: src/startup.c:246
 msgid "SOX may be used if neither of the preceding players work, "
 msgstr "SOXは先進的なプレイヤーが動作しない場合に使えるでしょう、 "
 
-#: src/startup.c:257
+#: src/startup.c:249
 msgid ""
 "but some audio features will be disabled.\n"
 "\n"
@@ -926,7 +931,7 @@
 "しかし、いくつかの音声機能は使えないでしょう。\n"
 "\n"
 
-#: src/startup.c:260
+#: src/startup.c:251
 msgid ""
 "but you do not have sox installed.\n"
 "You are advised to install it before running LiVES.\n"
@@ -936,7 +941,7 @@
 "LiVESを起動する前に sox をインストールする事を推奨します。\n"
 "\n"
 
-#: src/startup.c:264
+#: src/startup.c:255
 #, fuzzy
 msgid ""
 "The MPLAYER/MPLAYER2 audio player is only recommended for testing purposes.\n"
@@ -945,144 +950,144 @@
 "mplayerはテスト目的での使用を推奨します。\n"
 "\n"
 
-#: src/startup.c:281
+#: src/startup.c:271
 msgid "LiVES: - Choose an audio player"
 msgstr "LiVES: - オーディオプレイヤーを選んでください"
 
-#: src/startup.c:298
+#: src/startup.c:288
 msgid "Use _pulse audio player"
 msgstr "PulseAudioサウンドサーバーを使用する(_P)"
 
-#: src/startup.c:320
+#: src/startup.c:310
 msgid "Use _jack audio player"
 msgstr "JACKサウンドサーバーを使用する(_J)"
 
-#: src/startup.c:340
+#: src/startup.c:330
 msgid "Use _sox audio player"
 msgstr "Sox音声プレイヤーを使用する(_S)"
 
-#: src/startup.c:361
+#: src/startup.c:351
 msgid "Use _mplayer audio player"
 msgstr "mplayerを使用する(_M)"
 
-#: src/startup.c:381
+#: src/startup.c:371
 #, fuzzy
 msgid "Use _mplayer2 audio player"
 msgstr "mplayerを使用する(_M)"
 
-#: src/startup.c:405 src/startup.c:580 src/interface.c:1506
+#: src/startup.c:395 src/startup.c:569 src/interface.c:1398
 msgid "_Next"
 msgstr "次へ(_N)"
 
-#: src/startup.c:445
+#: src/startup.c:435
 msgid "Skipped"
 msgstr "スキップ"
 
-#: src/startup.c:460
+#: src/startup.c:450
 msgid "Passed"
 msgstr "完了"
 
-#: src/startup.c:493
+#: src/startup.c:483
 msgid "Failed"
 msgstr "失敗しました"
 
-#: src/startup.c:552
+#: src/startup.c:542
 msgid "LiVES: - Testing Configuration"
 msgstr "LiVES: - 設定のテスト"
 
-#: src/startup.c:555
+#: src/startup.c:544
 msgid "LiVES: - Troubleshoot"
 msgstr "LiVES: - トラブルシューティング"
 
-#: src/startup.c:568
+#: src/startup.c:557
 msgid "LiVES will now run some basic configuration tests\n"
 msgstr "LiVESの基本設定のテストを開始します\n"
 
-#: src/startup.c:603
+#: src/startup.c:591
 msgid "Checking for \"sox\" presence"
 msgstr "\"sox\" のインストールチェック"
 
-#: src/startup.c:607
+#: src/startup.c:595
 msgid ""
 "You should install sox to be able to use all the audio features in LiVES"
 msgstr ""
 "LiVESですべての音声機能を利用できるようにするには sox をインストールしてくだ"
 "さい。"
 
-#: src/startup.c:615
+#: src/startup.c:602
 msgid "Checking if sox can convert audio"
 msgstr "soxの音声変換機能のチェック"
 
-#: src/startup.c:638
+#: src/startup.c:625
 msgid "Unable to allocate 176400 bytes memory."
 msgstr "176400 バイトのメモリを割り当てられません。"
 
-#: src/startup.c:653
+#: src/startup.c:639
 #, c-format
 msgid "Unable to write to: %s"
 msgstr "以下に書き込めません: %s"
 
-#: src/startup.c:667 src/startup.c:807
+#: src/startup.c:653 src/startup.c:789
 #, c-format
 msgid "Command failed: %s"
 msgstr "コマンドの実行に失敗しました: %s"
 
-#: src/startup.c:689
+#: src/startup.c:675
 msgid "You should install sox_fmt_all or similar"
 msgstr "sox_fmt_all または同様のものをインストールしてください"
 
-#: src/startup.c:717
+#: src/startup.c:703
 msgid "Checking for \"mplayer\" presence"
 msgstr "\"mplayer\" のインストールチェック"
 
-#: src/startup.c:721
+#: src/startup.c:707
 #, fuzzy
 msgid ""
 "You should install mplayer or mplayer2 to be able to use all the decoding "
 "features in LiVES"
 msgstr "LiVESのデコード機能をすべて使うにはmplayerをインストールしてください"
 
-#: src/startup.c:747
+#: src/startup.c:732
 msgid "Checking if mplayer can convert audio"
 msgstr "mplayerの音声変換機能のチェック"
 
-#: src/startup.c:768
+#: src/startup.c:751
 #, fuzzy
 msgid "You should install mplayer or mplayer2 with pcm/wav support"
 msgstr "PCM/WAVフォーマットに対応したmplayerのインストールをおすすめします。"
 
-#: src/startup.c:785
+#: src/startup.c:767
 msgid "Checking if mplayer can decode to png/alpha"
 msgstr "mplayerのpng/alphaデコード機能のチェック"
 
-#: src/startup.c:828
+#: src/startup.c:810
 msgid "You may wish to upgrade mplayer to a newer version"
 msgstr "mplayer を最新バージョンにアップグレードすることを推奨します"
 
-#: src/startup.c:854
+#: src/startup.c:836
 msgid "Checking if mplayer can decode to jpeg"
 msgstr "mplayerのJPEGデコード機能のチェック"
 
-#: src/startup.c:882
+#: src/startup.c:862
 msgid "You should install mplayer with either png/alpha or jpeg support"
 msgstr ""
 "アルファチャネル付きのPNGとJPEGに対応したmplayerをインストールしてください"
 
-#: src/startup.c:883
+#: src/startup.c:863
 msgid "You may wish to add jpeg output support to mplayer"
 msgstr "JPEG出力が可能な mplayer の利用を推奨します"
 
-#: src/startup.c:892
+#: src/startup.c:872
 msgid "Checking for \"convert\" presence"
 msgstr "\"convert\" コマンドのインストールチェック"
 
-#: src/startup.c:896
+#: src/startup.c:876
 msgid "Install imageMagick to be able to use all of the rendered effects"
 msgstr ""
 "すべてのレンダリングエフェクトを利用できるようにするにはImageMagick をインス"
 "トールしてください"
 
-#: src/startup.c:909
+#: src/startup.c:889
 msgid ""
 "\n"
 "\n"
@@ -1090,7 +1095,7 @@
 "Preferences/Decoding.    \n"
 msgstr ""
 
-#: src/startup.c:915
+#: src/startup.c:894
 msgid ""
 "\n"
 "\n"
@@ -1102,7 +1107,7 @@
 "    キャンセルを押して終了し、不明なコンポーネントをインストールしてくださ"
 "い。もしくは次へを押すと進みます    \n"
 
-#: src/startup.c:949
+#: src/startup.c:928
 msgid ""
 "\n"
 "\n"
@@ -1112,7 +1117,7 @@
 "\n"
 "最後に、LiVESの起動時のデフォルトの画面を選択してください。\n"
 
-#: src/startup.c:950
+#: src/startup.c:929
 msgid ""
 "\n"
 "\n"
@@ -1122,7 +1127,7 @@
 "\n"
 "LiVESには2種類のメイン画面があり、どちらの画面でも起動することができます。\n"
 
-#: src/startup.c:951
+#: src/startup.c:930
 msgid ""
 "\n"
 "\n"
@@ -1132,29 +1137,29 @@
 "\n"
 "デフォルトの画面は、後で「設定」から変更することもできます。\n"
 
-#: src/startup.c:961
+#: src/startup.c:940
 msgid "LiVES: - Choose the startup interface"
 msgstr "LiVES: - 起動時の画面の選択"
 
-#: src/startup.c:972
+#: src/startup.c:951
 msgid "Start in _Clip Edit mode"
 msgstr "クリップ編集モードで起動(_C)"
 
-#: src/startup.c:975
+#: src/startup.c:954
 msgid "This is the best choice for simple editing tasks and for VJs\n"
 msgstr "これは単純な編集作業や VJ 向けに最も良い選択です。\n"
 
-#: src/startup.c:981
+#: src/startup.c:960
 msgid "Start in _Multitrack mode"
 msgstr "マルチトラックモードで起動(_M)"
 
-#: src/startup.c:983
+#: src/startup.c:962
 msgid ""
 "This is a better choice for complex editing tasks involving multiple clips.\n"
 msgstr ""
 "複数のクリップを扱う複雑な映像編集を行う場合は、こちらを選択してください。\n"
 
-#: src/startup.c:992
+#: src/startup.c:971
 msgid "_Finish"
 msgstr "完了(_F)"
 
@@ -1171,37 +1176,37 @@
 msgid "Apply _Deinterlace"
 msgstr ""
 
-#: src/interface.c:66
+#: src/interface.c:65
 msgid "If this is set, frames will be deinterlaced as they are imported."
 msgstr ""
 "これを設定すると、フレームがインポートされたときにインターレースを解除しま"
 "す。"
 
-#: src/interface.c:113 src/callbacks.c:9623 src/callbacks.c:9646
-#: src/callbacks.c:9647 src/gui.c:3223 src/gui.c:3821 src/saveplay.c:2339
-#: src/saveplay.c:3138 src/dialogs.c:1514 src/dialogs.c:1515
-#: src/dialogs.c:1746 src/dialogs.c:1747 src/framedraw.c:238
-#: src/multitrack.c:8031
+#: src/interface.c:106 src/callbacks.c:9542 src/callbacks.c:9564
+#: src/callbacks.c:9565 src/gui.c:3333 src/gui.c:3946 src/saveplay.c:2317
+#: src/saveplay.c:3097 src/dialogs.c:1575 src/dialogs.c:1576
+#: src/dialogs.c:1804 src/dialogs.c:1805 src/framedraw.c:236
+#: src/multitrack.c:8210
 msgid "Preview"
 msgstr "プレビュー"
 
-#: src/interface.c:132
+#: src/interface.c:125
 msgid "Click here to _Preview any selected video, image or audio file"
 msgstr "クリックで、選択された映像、画像、音声をプレビュー(_P)"
 
-#: src/interface.c:135
+#: src/interface.c:127
 msgid "Click here to _Preview any selected audio file"
 msgstr "クリックで、選択された音声をプレビュー(_P)"
 
-#: src/interface.c:138
+#: src/interface.c:129
 msgid "Click here to _Preview the video"
 msgstr "クリックで、映像をプレビュー(_P)"
 
-#: src/interface.c:181 src/dialogs.c:2542
+#: src/interface.c:169 src/dialogs.c:2621
 msgid "LiVES: - Processing..."
 msgstr "LiVES: - 処理中..."
 
-#: src/interface.c:217
+#: src/interface.c:205
 msgid ""
 "\n"
 "\n"
@@ -1215,8 +1220,8 @@
 "\n"
 "忘れないよう後でエフェクトを停止(ctrl-0)させてください!"
 
-#: src/interface.c:222 src/callbacks.c:9373 src/callbacks.c:9420
-#: src/dialogs.c:2570
+#: src/interface.c:210 src/callbacks.c:9283 src/callbacks.c:9332
+#: src/dialogs.c:2649
 msgid ""
 "\n"
 "Please Wait"
@@ -1224,190 +1229,178 @@
 "\n"
 "お待ちください"
 
-#: src/interface.c:242
+#: src/interface.c:230
 msgid "Show Details"
 msgstr ""
 
-#: src/interface.c:254 src/dialogs.c:2584
+#: src/interface.c:242 src/dialogs.c:2663
 msgid "_Enough"
 msgstr "OK(_E)"
 
-#: src/interface.c:255 src/framedraw.c:278
+#: src/interface.c:243 src/framedraw.c:276
 msgid "_Preview"
 msgstr "プレビュー(_P)"
 
-#: src/interface.c:257
+#: src/interface.c:245 src/callbacks.c:9282 src/callbacks.c:9330
 msgid "Paus_e"
 msgstr "一時停止(_E)"
 
-#: src/interface.c:258 src/callbacks.c:9417
+#: src/interface.c:246 src/callbacks.c:9329
 msgid "Pause/_Enough"
 msgstr "一時停止（_E）"
 
-#: src/interface.c:285
+#: src/interface.c:273
 msgid "_Cancel"
 msgstr "キャンセル(_C)"
 
-#: src/interface.c:374
+#: src/interface.c:361
 #, c-format
 msgid "LiVES: - %s"
 msgstr ""
 
-#: src/interface.c:376
+#: src/interface.c:363
 msgid "LiVES: - Multitrack details"
 msgstr ""
 
-#: src/interface.c:407
+#: src/interface.c:394
 msgid "Format"
 msgstr "フォーマット"
 
-#: src/interface.c:412
+#: src/interface.c:399
 msgid "Frame size"
 msgstr "フレームサイズ"
 
-#: src/interface.c:417
+#: src/interface.c:404
 msgid "File size"
 msgstr "ファイルサイズ"
 
-#: src/interface.c:418
+#: src/interface.c:405
 msgid "Byte size"
 msgstr "バイトサイズ"
 
-#: src/interface.c:423 src/interface.c:1891
+#: src/interface.c:410 src/interface.c:1760
 msgid "FPS"
 msgstr "FPS"
 
-#: src/interface.c:428
+#: src/interface.c:415
 msgid "Frames"
 msgstr "フレーム"
 
-#: src/interface.c:429
+#: src/interface.c:416
 msgid "Events"
 msgstr "イベント"
 
-#: src/interface.c:434 src/interface.c:500 src/interface.c:542
+#: src/interface.c:421 src/interface.c:486 src/interface.c:528
 msgid "Total time"
 msgstr "全時間"
 
-#: src/interface.c:486 src/resample.c:1488
+#: src/interface.c:472 src/resample.c:1460
 msgid "Audio"
 msgstr "音声"
 
-#: src/interface.c:511 src/interface.c:553
+#: src/interface.c:497 src/interface.c:539
 msgid "Rate/size"
 msgstr "レート/サイズ"
 
-#: src/interface.c:530
+#: src/interface.c:516
 msgid "Right audio"
 msgstr "右音声"
 
-#: src/interface.c:622
+#: src/interface.c:607
 msgid "LiVES: - Encoding options"
 msgstr "LiVES: - エンコーディングオプション"
 
-#: src/interface.c:636
+#: src/interface.c:621
 msgid "<------------- (Check the box to re_size as suggested)"
 msgstr "<------------- (推奨サイズを適用する場合はチェックを入れて下さい(_S))"
 
-#: src/interface.c:637
+#: src/interface.c:622
 msgid "<------------- (Check the box to use the _size recommendation)"
 msgstr "<------------- (推奨サイズを計算する場合はチェックを入れて下さい(_S))"
 
-#: src/interface.c:662
+#: src/interface.c:646
 msgid "Use _letterboxing to maintain aspect ratio (optional)"
 msgstr "アスペクト比を維持するためレターボックスを使用する(オプション)(_L)"
 
-#: src/interface.c:663
+#: src/interface.c:647
 msgid ""
 "Draw black rectangles either above or to the sides of the image, to prevent "
 "it from stretching."
 msgstr "画面が伸縮されないよう、画像の上部あるいは左右に黒い四角を配置します。"
 
-#: src/interface.c:694
+#: src/interface.c:677
 msgid "Keep _my settings"
 msgstr "設定を保存(_M)"
 
-#: src/interface.c:695
+#: src/interface.c:678
 msgid "Use _recommended settings"
 msgstr "推奨される設定を使用(_R)"
 
-#: src/interface.c:775 src/dialogs.c:114
-msgid ""
-"Do _not show this warning any more\n"
-"(can be turned back on from Preferences/Warnings)"
-msgstr ""
-"これ以上の警告を表示しない(_N)\n"
-"(「設定 | 警告」から変更可能です)"
-
-#: src/interface.c:787
-msgid "Show _Details"
-msgstr "詳細を表示(_D)"
-
-#: src/interface.c:881
+#: src/interface.c:769
 msgid "_Close Window"
 msgstr "ウィンドウを閉じる(_C)"
 
-#: src/interface.c:883
+#: src/interface.c:771
 msgid "_Save to file"
 msgstr "ファイルに保存(_S)"
 
-#: src/interface.c:928
+#: src/interface.c:816
 msgid "LiVES: - Insert"
 msgstr "LiVES: - 挿入"
 
-#: src/interface.c:945
+#: src/interface.c:833
 msgid "_Number of times to insert"
 msgstr "挿入する回数(_N)"
 
-#: src/interface.c:954
+#: src/interface.c:842
 msgid "_Insert to fit audio"
 msgstr "音声に合わせて挿入(_I)"
 
-#: src/interface.c:968
+#: src/interface.c:856
 msgid "Insert _before selection"
 msgstr "選択範囲の前に挿入(_B)"
 
-#: src/interface.c:970
+#: src/interface.c:858
 msgid "Insert clipboard before selected frames"
 msgstr "選択したフレームの前にクリップボードを挿入"
 
-#: src/interface.c:986
+#: src/interface.c:875
 msgid "Insert _after selection"
 msgstr "選択範囲の後に挿入(_A)"
 
-#: src/interface.c:988
+#: src/interface.c:877
 msgid "Insert clipboard after selected frames"
 msgstr "選択したフレームの後にクリップボードを挿入"
 
-#: src/interface.c:999
+#: src/interface.c:888
 msgid "Insert _with sound"
 msgstr "音声と共に挿入(_W)"
 
-#: src/interface.c:1012
+#: src/interface.c:901
 msgid "Insert with_out sound"
 msgstr "音声なしで挿入(_O)"
 
-#: src/interface.c:1093
+#: src/interface.c:985
 msgid "LiVES: - Open Selection"
 msgstr "LiVES: - 選択を開く"
 
-#: src/interface.c:1111
+#: src/interface.c:1004
 msgid "Selection start time (sec)"
 msgstr ""
 
-#: src/interface.c:1117
+#: src/interface.c:1010
 msgid "Number of frames to open"
 msgstr ""
 
-#: src/interface.c:1193
+#: src/interface.c:1088
 msgid "LiVES: - Open Location"
 msgstr "LiVES: - 場所を開く"
 
-#: src/interface.c:1195
+#: src/interface.c:1090
 msgid "LiVES: - Open Youtube Clip"
 msgstr "LiVES: - Youtube クリップを開く"
 
-#: src/interface.c:1213
+#: src/interface.c:1109
 msgid ""
 "\n"
 "\n"
@@ -1423,7 +1416,7 @@
 "また、「設定 | ストリーミング」でバンド幅の設定も確認してください。\n"
 "\n"
 
-#: src/interface.c:1216
+#: src/interface.c:1112
 msgid ""
 "\n"
 "\n"
@@ -1438,7 +1431,7 @@
 "このツールの最新バージョンをインストールしているか確認してください。\n"
 "\n"
 
-#: src/interface.c:1220
+#: src/interface.c:1116
 msgid ""
 "Enter the URL of the clip below.\n"
 "E.g: http://www.youtube.com/watch?v=WCR6f6WzjP8\n"
@@ -1448,55 +1441,56 @@
 "例: http://www.youtube.com/watch?v=WCR6f6WzjP8\n"
 "\n"
 
-#: src/interface.c:1231
+#: src/interface.c:1127
 msgid "URL : "
 msgstr "URL : "
 
-#: src/interface.c:1231
+#: src/interface.c:1127
 msgid "Youtube URL : "
 msgstr "Youtube URL : "
 
-#: src/interface.c:1235
+#: src/interface.c:1131
 msgid "Do not send bandwidth information"
 msgstr "バンド幅情報を送らない"
 
-#: src/interface.c:1237
+#: src/interface.c:1133
 msgid "Try this setting if you are having problems getting a stream"
 msgstr "ストリームの取得に問題がある場合はこの設定を試してください"
 
-#: src/interface.c:1258
+#: src/interface.c:1155
 msgid "Download to _Directory : "
 msgstr "ダウンロード先ディレクトリ(_D): "
 
-#: src/interface.c:1276
+#: src/interface.c:1173
 msgid "Download _File Name : "
 msgstr "ダウンロードファイル名(_F): "
 
-#: src/interface.c:1281
+#: src/interface.c:1178
 msgid ".webm"
 msgstr ".webm"
 
-#: src/interface.c:1359
+#: src/interface.c:1256
 msgid "LiVES: - Rename Clip"
 msgstr "LiVES: - クリップの名称変更"
 
-#: src/interface.c:1362
-msgid "LiVES: - Enter Set Name"
-msgstr "LiVES: - セット名の入力"
+#: src/interface.c:1258
+#, fuzzy
+msgid "LiVES: - Enter Set Name to Save as"
+msgstr "LiVES: - 再読み込みするセット名を入力"
 
-#: src/interface.c:1365
+#: src/interface.c:1260
 msgid "LiVES: - Enter a Set Name to Reload"
 msgstr "LiVES: - 再読み込みするセット名を入力"
 
-#: src/interface.c:1368
+#: src/interface.c:1262
 msgid "LiVES: - Choose a Working Directory"
 msgstr "LiVES: - 作業ディレクトリの選択"
 
-#: src/interface.c:1371
+#: src/interface.c:1264
 msgid "LiVES: - Rename Current Track"
 msgstr ""
 
-#: src/interface.c:1391
+#: src/interface.c:1283
 msgid ""
 "You need to enter a name for the current clip set.\n"
 "This will allow you reload the layout with the same clips later.\n"
@@ -1508,7 +1502,7 @@
 "使いたい名前を入力してください。\n"
 "なお終了しようとするときに、LiVESは再度クリップセットの保存を促します。\n"
 
-#: src/interface.c:1397
+#: src/interface.c:1289
 msgid ""
 "In order to export this project, you must enter a name for this clip set.\n"
 "This will also be used for the project name.\n"
@@ -1517,7 +1511,7 @@
 "あります。\n"
 "また、これはプロジェクト名としても利用されます。\n"
 
-#: src/interface.c:1404
+#: src/interface.c:1296
 msgid ""
 "Welcome to LiVES !\n"
 "This startup wizard will guide you through the\n"
@@ -1527,200 +1521,200 @@
 "このスタートアップウィザードでは、このアプリケーションをより活用できるよう\n"
 "初期インストールの案内をいたします。\n"
 
-#: src/interface.c:1408
+#: src/interface.c:1300
 msgid ""
 "\n"
 "First of all you need to choose a working directory for LiVES.\n"
 "This should be a directory with plenty of disk space available.\n"
 msgstr ""
 
-#: src/interface.c:1427
+#: src/interface.c:1317
 msgid "New name "
 msgstr "新しい名前 "
 
-#: src/interface.c:1430
+#: src/interface.c:1319
 msgid "Set name "
 msgstr "セットの名前 "
 
-#: src/interface.c:1550
+#: src/interface.c:1435
 msgid "Use def_aults"
 msgstr "デフォルトを使用(_A)"
 
-#: src/interface.c:1553 src/interface.c:1840 src/preferences.c:2515
-#: src/preferences.c:2697
+#: src/interface.c:1437 src/interface.c:1709 src/preferences.c:2550
+#: src/preferences.c:2739
 msgid "_Advanced"
 msgstr "詳細(_A)"
 
-#: src/interface.c:1604
+#: src/interface.c:1487
 msgid "LiVES:- Select input device"
 msgstr "LiVES:- 入力デバイスの選択"
 
-#: src/interface.c:1622
+#: src/interface.c:1504
 msgid "Select input device:"
 msgstr "入力デバイスの選択:"
 
-#: src/interface.c:1686
+#: src/interface.c:1568
 msgid "LiVES:- Load CD Track"
 msgstr "LiVES:- CDトラックの読み込み"
 
-#: src/interface.c:1689
+#: src/interface.c:1570
 msgid "LiVES:- Select DVD Title/Chapter"
 msgstr "LiVES:- DVDタイトル/チャプターの選択"
 
-#: src/interface.c:1692
+#: src/interface.c:1572
 msgid "LiVES:- Select VCD Title"
 msgstr "LiVES:- VCDタイトルの選択"
 
-#: src/interface.c:1695
+#: src/interface.c:1574
 msgid "LiVES:- Change Maximum Visible Tracks"
 msgstr "LiVES:- 表示するトラックの最大値変更"
 
-#: src/interface.c:1698
+#: src/interface.c:1576
 msgid "LiVES:- Device details"
 msgstr "LiVES:- デバイスの詳細"
 
-#: src/interface.c:1721
+#: src/interface.c:1598
 #, c-format
 msgid "Track to load (from %s)"
 msgstr "(%sから)読み込みするトラック"
 
-#: src/interface.c:1724
+#: src/interface.c:1600
 msgid "DVD Title"
 msgstr "DVDタイトル"
 
-#: src/interface.c:1727
+#: src/interface.c:1602
 msgid "VCD Title"
 msgstr "VCDタイトル"
 
-#: src/interface.c:1730
+#: src/interface.c:1604
 msgid "Maximum number of tracks to display"
 msgstr "表示するトラック数の最大値"
 
-#: src/interface.c:1733
+#: src/interface.c:1606
 msgid "Device:        /dev/video"
 msgstr "デバイス:        /dev/video"
 
-#: src/interface.c:1736
+#: src/interface.c:1608
 msgid "Device:        fw:"
 msgstr "デバイス:        fw:"
 
-#: src/interface.c:1771
+#: src/interface.c:1641
 msgid "Chapter  "
 msgstr "チャプター  "
 
-#: src/interface.c:1776
+#: src/interface.c:1645
 msgid "Channel  "
 msgstr "キャンセル  "
 
-#: src/interface.c:1791
+#: src/interface.c:1660
 msgid "Audio ID  "
 msgstr "オーディオ ID  "
 
-#: src/interface.c:1857
+#: src/interface.c:1726
 msgid "Input number"
 msgstr "入力ポート数"
 
-#: src/interface.c:1865
+#: src/interface.c:1734
 msgid "Use default width, height and FPS"
 msgstr "デフォルトの幅、高さ、FPSを使用します"
 
-#: src/interface.c:1879
+#: src/interface.c:1748
 msgid "Width"
 msgstr "幅"
 
-#: src/interface.c:1885
+#: src/interface.c:1754
 msgid "Height"
 msgstr "高さ"
 
-#: src/interface.c:1899
+#: src/interface.c:1768
 msgid "_Driver"
 msgstr ""
 
-#: src/interface.c:1902
+#: src/interface.c:1771
 msgid "_Output format"
 msgstr ""
 
-#: src/interface.c:1998
+#: src/interface.c:1865
 msgid "LiVES:- Fade Audio In"
 msgstr "LiVES:- 音声のフェードイン"
 
-#: src/interface.c:2001
+#: src/interface.c:1867
 msgid "LiVES:- Fade Audio Out"
 msgstr "LiVES:- 音声のフェードアウト"
 
-#: src/interface.c:2017
+#: src/interface.c:1883
 msgid "Fade in over  "
 msgstr "フェードイン  "
 
-#: src/interface.c:2018
+#: src/interface.c:1884
 msgid "first"
 msgstr "最初"
 
-#: src/interface.c:2021
+#: src/interface.c:1886
 msgid "Fade out over  "
 msgstr "フェードアウト  "
 
-#: src/interface.c:2022
+#: src/interface.c:1887
 msgid "last"
 msgstr "最後"
 
-#: src/interface.c:2044
+#: src/interface.c:1909
 msgid "seconds."
 msgstr "秒"
 
-#: src/interface.c:2052 src/saveplay.c:1507
+#: src/interface.c:1917 src/saveplay.c:1484
 msgid "selection"
 msgstr "選択"
 
-#: src/interface.c:2092
+#: src/interface.c:1956
 msgid "LiVES: - File Comments (optional)"
 msgstr "LiVES: - ファイルコメント (オプション)"
 
-#: src/interface.c:2107
+#: src/interface.c:1971
 msgid "Title/Name : "
 msgstr "タイトル/名前 : "
 
-#: src/interface.c:2114
+#: src/interface.c:1978
 msgid "Author/Artist : "
 msgstr "作者/アーティスト : "
 
-#: src/interface.c:2121
+#: src/interface.c:1985
 msgid "Comments : "
 msgstr "コメント : "
 
-#: src/interface.c:2151
+#: src/interface.c:2015
 msgid "_Options"
 msgstr "オプション(_O)"
 
-#: src/interface.c:2158
+#: src/interface.c:2022
 msgid "Save _subtitles to file"
 msgstr "字幕をファイルに保存(_S)"
 
-#: src/interface.c:2170
+#: src/interface.c:2033
 msgid "Subtitle file"
 msgstr "字幕ファイル"
 
-#: src/interface.c:2172
+#: src/interface.c:2035
 msgid "Browse..."
 msgstr "参照..."
 
-#: src/interface.c:2255
+#: src/interface.c:2132
 msgid "LiVES: - choose a device"
 msgstr ""
 
-#: src/interface.c:2259
+#: src/interface.c:2135
 msgid "LiVES: - choose a directory"
 msgstr ""
 
-#: src/interface.c:2262
+#: src/interface.c:2137
 msgid "LiVES: - choose a file"
 msgstr ""
 
-#: src/interface.c:2445
+#: src/interface.c:2381
 msgid "LiVES: - Cancel/Discard/Save"
 msgstr "LiVES: - キャンセル/破棄/保存"
 
-#: src/interface.c:2460
+#: src/interface.c:2397
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has not been saved.\n"
@@ -1730,7 +1724,7 @@
 "現在のレイアウトは保存されていません。\n"
 "どうしますか?\n"
 
-#: src/interface.c:2463
+#: src/interface.c:2400
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has been changed since the last save.\n"
@@ -1740,7 +1734,7 @@
 "現在のレイアウトは最後の保存から変更されています。\n"
 "どうしますか?\n"
 
-#: src/interface.c:2467
+#: src/interface.c:2404
 msgid ""
 "You are about to exit LiVES.\n"
 "The current clip set can be saved.\n"
@@ -1750,7 +1744,7 @@
 "現在のクリップセットを保存することができます。\n"
 "どうしますか?\n"
 
-#: src/interface.c:2468
+#: src/interface.c:2405
 msgid ""
 "The current clip set has not been saved.\n"
 "What would you like to do ?\n"
@@ -1758,7 +1752,7 @@
 "現在のクリップセットは保存されていません。\n"
 "どうしますか?\n"
 
-#: src/interface.c:2472
+#: src/interface.c:2408
 msgid ""
 "The current layout has not been saved.\n"
 "What would you like to do ?\n"
@@ -1766,7 +1760,7 @@
 "現在のレイアウトは保存されていません。\n"
 "どうしますか?\n"
 
-#: src/interface.c:2475
+#: src/interface.c:2410
 #, fuzzy
 msgid ""
 "The current layout has *not* been changed since it was last saved.\n"
@@ -1775,7 +1769,7 @@
 "最後に保存され、現在のレイアウトが変更されていません。\n"
 "を行うにはどのような希望ですか？\n"
 
-#: src/interface.c:2480
+#: src/interface.c:2415
 msgid ""
 "The current layout contains generated frames and cannot be retained.\n"
 "You may wish to render it before exiting multitrack mode.\n"
@@ -1783,7 +1777,7 @@
 "作成したフレームを含んだ現在のレイアウトは保存できません。\n"
 "マルチトラックモードを終了する前にレンダリングしておくのが良いでしょう。\n"
 
-#: src/interface.c:2483
+#: src/interface.c:2418
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout contains generated frames and cannot be retained.\n"
@@ -1793,39 +1787,39 @@
 "作成したフレームを含む現在のレイアウトは保存されません。\n"
 "どうしますか？"
 
-#: src/interface.c:2496
+#: src/interface.c:2431
 msgid "Clip set _name"
 msgstr "クリップセット名(_N)"
 
-#: src/interface.c:2502
+#: src/interface.c:2437
 msgid "_Auto reload next time"
 msgstr "次回、自動で再読み込みする(_A)"
 
-#: src/interface.c:2538 src/interface.c:2547
+#: src/interface.c:2473 src/interface.c:2482
 msgid "_Wipe layout"
 msgstr "レイアウトの除去(_W)"
 
-#: src/interface.c:2539
+#: src/interface.c:2474
 msgid "_Ignore changes"
 msgstr "変更を無視(_I)"
 
-#: src/interface.c:2540
+#: src/interface.c:2475
 msgid "_Delete clip set"
 msgstr "クリップセットを削除(_D)"
 
-#: src/interface.c:2541
+#: src/interface.c:2476
 msgid "_Delete layout"
 msgstr "レイアウトを削除(_D)"
 
-#: src/interface.c:2545
+#: src/interface.c:2480
 msgid "_Save layout"
 msgstr "レイアウトを保存(_S)"
 
-#: src/interface.c:2546
+#: src/interface.c:2481
 msgid "_Save clip set"
 msgstr "クリップセットを保存(_S)"
 
-#: src/interface.c:2565
+#: src/interface.c:2502
 msgid ""
 "\n"
 "LiVES has detected a multitrack layout from a previous session.\n"
@@ -1835,57 +1829,57 @@
 "LiVESは、前回のセッションのマルチトラックモードのレイアウトを検出しました。\n"
 "再度このレイアウトを開き、復元しますか？\n"
 
-#: src/interface.c:2589
+#: src/interface.c:2528
 msgid "LiVES: - Disk Recovery Options"
 msgstr "LiVES: - ディスク回復オプション"
 
-#: src/interface.c:2608
+#: src/interface.c:2549
 msgid "Delete _Orphaned Clips"
 msgstr "孤立したクリップを削除(_O)"
 
-#: src/interface.c:2609
+#: src/interface.c:2550
 msgid "Delete any clips which are not currently loaded or part of a set"
 msgstr ""
 
-#: src/interface.c:2622
+#: src/interface.c:2564
 msgid "Clear _Backup Files from Closed Clips"
 msgstr "閉じたクリップのバックアップファイルを消去(_B)"
 
-#: src/interface.c:2633
+#: src/interface.c:2575
 msgid "Remove Sets which have _Layouts but no Clips"
 msgstr "レイアウトのみでクリップがないセットを削除(_L)"
 
-#: src/interface.c:2644
+#: src/interface.c:2586
 msgid "_Reset to Defaults"
 msgstr "デフォルトに戻す(_R)"
 
-#: src/interface.c:2651
+#: src/interface.c:2593
 msgid "_Accept"
 msgstr "承認(_A)"
 
-#: src/callbacks.c:198
+#: src/callbacks.c:208
 #, c-format
 msgid "Saving as set %s..."
 msgstr "セット %s として保存しています..."
 
-#: src/callbacks.c:833
+#: src/callbacks.c:852
 msgid "Please enter the name of the file to save the clip as.\n"
 msgstr "クリップを保存するファイル名を入力してください。\n"
 
-#: src/callbacks.c:841
+#: src/callbacks.c:860
 msgid "Please enter a valid URL for the download.\n"
 msgstr "ダウンロードするには有効な URL を入力してください。\n"
 
-#: src/callbacks.c:867
+#: src/callbacks.c:886
 #, c-format
 msgid "Downloading %s to %s..."
 msgstr "%s を %s にダウンロード中..."
 
-#: src/callbacks.c:895
+#: src/callbacks.c:912
 msgid "Downloading clip"
 msgstr "クリップをダウンロード中"
 
-#: src/callbacks.c:933
+#: src/callbacks.c:950
 msgid ""
 "\n"
 "LiVES was unable to download the clip.\n"
@@ -1897,11 +1891,11 @@
 "クリップの URL を確認した上で、最新の youtube-dl が\n"
 "インストールされているか確認してください。\n"
 
-#: src/callbacks.c:1114 src/callbacks.c:1149
+#: src/callbacks.c:1131 src/callbacks.c:1166
 msgid "This file"
 msgstr "このファイル"
 
-#: src/callbacks.c:1115
+#: src/callbacks.c:1132
 msgid ""
 ",\n"
 " - including the current layout - "
@@ -1909,7 +1903,7 @@
 ",\n"
 " - 現在のレイアウトを含む - "
 
-#: src/callbacks.c:1117
+#: src/callbacks.c:1134
 #, c-format
 msgid ""
 "\n"
@@ -1924,7 +1918,7 @@
 "\n"
 "本当に閉じますか？"
 
-#: src/callbacks.c:1119
+#: src/callbacks.c:1136
 #, c-format
 msgid ""
 "\n"
@@ -1939,7 +1933,7 @@
 "\n"
 "本当に閉じますか？"
 
-#: src/callbacks.c:1150
+#: src/callbacks.c:1167
 msgid ""
 "Changes made to this clip have not been saved or backed up.\n"
 "\n"
@@ -1949,7 +1943,7 @@
 "\n"
 "本当に閉じますか？"
 
-#: src/callbacks.c:1343
+#: src/callbacks.c:1356
 msgid ""
 "\n"
 "Invalid project file.\n"
@@ -1957,7 +1951,7 @@
 "\n"
 "無効なプロジェクトファイルです。\n"
 
-#: src/callbacks.c:1356
+#: src/callbacks.c:1370
 #, c-format
 msgid ""
 "\n"
@@ -1980,33 +1974,33 @@
 "いったんこの作業を行えば、新しいプロジェクトをインポートできるようになりま"
 "す。\n"
 
-#: src/callbacks.c:1366
+#: src/callbacks.c:1381
 #, c-format
 msgid "Importing the project %s as set %s..."
 msgstr "プロジェクト %s をセット %s としてインポート..."
 
-#: src/callbacks.c:1386
+#: src/callbacks.c:1399
 msgid "Importing project"
 msgstr "プロジェクトのインポート"
 
-#: src/callbacks.c:1472
+#: src/callbacks.c:1481
 #, c-format
 msgid "Exporting project %s..."
 msgstr "プロジェクト %s をエクスポート..."
 
-#: src/callbacks.c:1490
+#: src/callbacks.c:1497
 msgid "Exporting project"
 msgstr "プロジェクトのエクスポート"
 
-#: src/callbacks.c:1506
+#: src/callbacks.c:1513
 msgid "Backup as .lv1 file"
 msgstr ".lv1ファイルとしてバックアップ"
 
-#: src/callbacks.c:1522
+#: src/callbacks.c:1529
 msgid "Restore .lv1 file"
 msgstr ".lv1ファイルからリストア"
 
-#: src/callbacks.c:1664
+#: src/callbacks.c:1671
 msgid ""
 "\n"
 "\n"
@@ -2018,72 +2012,77 @@
 "セットはディスクから消去されます。\n"
 "よろしいでしょうか?\n"
 
-#: src/callbacks.c:1725
+#: src/callbacks.c:1732
 #, c-format
 msgid "Deleting set %s..."
 msgstr "セット %s を削除しています..."
 
-#: src/callbacks.c:1727
+#: src/callbacks.c:1734
 msgid "Deleting set..."
 msgstr "セットの削除..."
 
-#: src/callbacks.c:1731
+#: src/callbacks.c:1738
 msgid "Deleting set"
 msgstr "セットの削除"
 
-#: src/callbacks.c:1739
+#: src/callbacks.c:1746
 #, c-format
 msgid "Set %s was permanently deleted from the disk.\n"
 msgstr "セット %s はディスクから完全に削除されました。\n"
 
-#: src/callbacks.c:1787 src/callbacks.c:11764
+#: src/callbacks.c:1792 src/callbacks.c:11676
 msgid "Insert Silence"
 msgstr "無音部分の挿入"
 
-#: src/callbacks.c:1840 src/callbacks.c:1923 src/callbacks.c:2086
+#: src/callbacks.c:1844 src/callbacks.c:1927 src/callbacks.c:2089
 msgid "Undoing"
 msgstr "アンドゥします"
 
-#: src/callbacks.c:1936 src/callbacks.c:2147
+#: src/callbacks.c:1940 src/callbacks.c:2150
 msgid "Restoring audio..."
 msgstr "音声のリストア..."
 
-#: src/callbacks.c:1952
+#: src/callbacks.c:1956
 msgid "Clearing frame images"
 msgstr "フレームイメージの消去"
 
-#: src/callbacks.c:1985
+#: src/callbacks.c:1988
 msgid "Deleting excess frames"
 msgstr "オーバーしたフレームを削除"
 
-#: src/callbacks.c:2229
+#: src/callbacks.c:2232
 #, c-format
 msgid "Length of video is now %d frames at %.3f frames per second.\n"
 msgstr "ビデオの長さは現在%dフレームです(%.3fフレーム/秒)。\n"
 
-#: src/callbacks.c:2233 src/resample.c:683 src/resample.c:2166
+#: src/callbacks.c:2235 src/resample.c:678 src/resample.c:2133
 #, c-format
 msgid "Clipboard was resampled to %d frames.\n"
 msgstr "クリップボードは%dフレームにリサンプリングされました。\n"
 
-#: src/callbacks.c:2394 src/callbacks.c:2423
+#: src/callbacks.c:2396 src/callbacks.c:2425
 msgid "Redoing"
 msgstr "リドゥします"
 
-#: src/callbacks.c:2462
-#, c-format
-msgid "Copying frames %d to %d%s to the clipboard..."
+#: src/callbacks.c:2472
+#, fuzzy, c-format
+msgid "Copying frames %d to %d (with sound) to the clipboard..."
 msgstr "%dから%d%sフレームをクリップボードにコピーします..."
 
-#: src/callbacks.c:2525
+#: src/callbacks.c:2474
+#, fuzzy, c-format
+msgid "Copying frames %d to %d to the clipboard..."
+msgstr "%dから%d%sフレームをクリップボードにコピーします..."
+
+#: src/callbacks.c:2526
 msgid "Copying to the clipboard"
 msgstr "クリップボードにコピー"
 
-#: src/callbacks.c:2600
+#: src/callbacks.c:2601
 msgid "Cut"
 msgstr "カット"
 
-#: src/callbacks.c:2641 src/callbacks.c:3068 src/callbacks.c:8026
+#: src/callbacks.c:2641 src/callbacks.c:3063 src/callbacks.c:7631
 #, fuzzy
 msgid "Pulling frames from clipboard"
 msgstr "クリップからフレームを抽出"
@@ -2093,15 +2092,15 @@
 msgid "Pasting %d frames to new clip %s..."
 msgstr "%d フレームを 新しいクリップ %s に貼り付けます..."
 
-#: src/callbacks.c:2678
+#: src/callbacks.c:2676
 msgid "Pasting"
 msgstr "貼り付けます"
 
-#: src/callbacks.c:2694
+#: src/callbacks.c:2692
 msgid "...added audio..."
 msgstr "...音声を追加..."
 
-#: src/callbacks.c:2778
+#: src/callbacks.c:2775
 msgid ""
 "This operation requires resizing or converting of frames.\n"
 "Please install 'convert' from the Image-magick package, and then restart "
@@ -2111,7 +2110,7 @@
 "Image-magickパッケージの'convert'コマンドをインストールして、LiVESを再起動し"
 "てください。\n"
 
-#: src/callbacks.c:2795
+#: src/callbacks.c:2793
 msgid ""
 "\n"
 "\n"
@@ -2125,7 +2124,7 @@
 "すべてのフレームを選択して、音声メニューから\n"
 "「音声のトリミング」機能を選択しましょう。"
 
-#: src/callbacks.c:2819
+#: src/callbacks.c:2817
 msgid ""
 "LiVES cannot insert because the audio rates do not match.\n"
 "Please install 'sox', and try again."
@@ -2133,7 +2132,7 @@
 "音声レートが適合しなかったため、LiVESは挿入できませんでした。\n"
 "'sox'をインストールして再試行してください。"
 
-#: src/callbacks.c:2838
+#: src/callbacks.c:2835
 msgid ""
 "\n"
 "Insertion will cause frames to shift in some multitrack layouts.\n"
@@ -2144,7 +2143,7 @@
 "う。\n"
 "続けても構いませんか?\n"
 
-#: src/callbacks.c:2888 src/callbacks.c:11692
+#: src/callbacks.c:2883 src/callbacks.c:11606
 msgid ""
 "\n"
 "Insertion will cause audio to shift in some multitrack layouts.\n"
@@ -2155,11 +2154,11 @@
 "う。\n"
 "続けても構いませんか?\n"
 
-#: src/callbacks.c:2996 src/callbacks.c:3025
+#: src/callbacks.c:2987 src/callbacks.c:3016
 msgid "Resampling clipboard audio"
 msgstr "クリップボードの音声をリサンプリング"
 
-#: src/callbacks.c:3041
+#: src/callbacks.c:3032
 msgid ""
 "\n"
 "\n"
@@ -2171,7 +2170,7 @@
 "LiVESはクリップボードの音声をリサンプリングできませんでした。\n"
 "クリップボードの音声は消去されました。\n"
 
-#: src/callbacks.c:3055
+#: src/callbacks.c:3045
 msgid ""
 "\n"
 "\n"
@@ -2184,30 +2183,30 @@
 "LiVESはクリップボードの音声をリサンプリングできませんでした。 \n"
 "変更前の音声を用いて、挿入を続けますか?\n"
 
-#: src/callbacks.c:3137 src/callbacks.c:3311
+#: src/callbacks.c:3132 src/callbacks.c:3299
 #, c-format
 msgid "Inserting %d%s frames from the clipboard..."
 msgstr "クリップボードから%d%sフレームを挿入..."
 
-#: src/callbacks.c:3162 src/callbacks.c:3236 src/callbacks.c:3339
+#: src/callbacks.c:3155 src/callbacks.c:3224 src/callbacks.c:3325
 msgid "Inserting"
 msgstr "挿入します"
 
-#: src/callbacks.c:3193
+#: src/callbacks.c:3187
 #, c-format
 msgid "Inserting %d times from the clipboard%s..."
 msgstr "%d時間挿入します (クリップボード%sから)..."
 
-#: src/callbacks.c:3200
+#: src/callbacks.c:3191
 #, c-format
 msgid "Inserting %d frames from the clipboard%s..."
 msgstr "%dフレーム挿入します (クリップボード%sから)..."
 
-#: src/callbacks.c:3418
+#: src/callbacks.c:3404
 msgid "Insert"
 msgstr "挿入"
 
-#: src/callbacks.c:3486
+#: src/callbacks.c:3471
 msgid ""
 "\n"
 "Deleting all frames will close this file.\n"
@@ -2217,7 +2216,7 @@
 "全フレームを削除すると、このファイルを閉じます。\n"
 "構いませんか ?"
 
-#: src/callbacks.c:3495
+#: src/callbacks.c:3480
 msgid ""
 "\n"
 "Deletion will cause missing frames in some multitrack layouts.\n"
@@ -2227,8 +2226,8 @@
 "削除によってマルチトラックレイアウトからフレームが失われます。\n"
 "続けても構いませんか?\n"
 
-#: src/callbacks.c:3515 src/callbacks.c:10920 src/callbacks.c:11162
-#: src/callbacks.c:11228
+#: src/callbacks.c:3500 src/callbacks.c:10851 src/callbacks.c:11087
+#: src/callbacks.c:11152
 msgid ""
 "\n"
 "Deletion will cause missing audio in some multitrack layouts.\n"
@@ -2238,7 +2237,7 @@
 "削除することによって、マルチトラックレイアウトで音声が削除されるでしょう。\n"
 "続けても構いませんか?\n"
 
-#: src/callbacks.c:3534
+#: src/callbacks.c:3519
 msgid ""
 "\n"
 "Deletion will cause frames to shift in some multitrack layouts.\n"
@@ -2248,7 +2247,7 @@
 "消去することによってフレームはマルチトラックレイアウト中で移動します。\n"
 "続けますか?\n"
 
-#: src/callbacks.c:3553 src/callbacks.c:11210
+#: src/callbacks.c:3538 src/callbacks.c:11134
 msgid ""
 "\n"
 "Deletion will cause audio to shift in some multitrack layouts.\n"
@@ -2258,20 +2257,20 @@
 "消去することによって音声はマルチトラックレイアウト中で移動します。\n"
 "続けますか?\n"
 
-#: src/callbacks.c:3611
+#: src/callbacks.c:3597
 #, c-format
 msgid "Deleting frames %d to %d%s..."
 msgstr "%dから%d%sフレームを削除..."
 
-#: src/callbacks.c:3636
+#: src/callbacks.c:3619
 msgid "Deleting"
 msgstr "削除します"
 
-#: src/callbacks.c:3717
+#: src/callbacks.c:3699
 msgid "Delete"
 msgstr "消去"
 
-#: src/callbacks.c:3738
+#: src/callbacks.c:3717
 msgid ""
 "\n"
 "\n"
@@ -2281,7 +2280,7 @@
 "\n"
 "選択範囲をロックします。\n"
 
-#: src/callbacks.c:4092
+#: src/callbacks.c:4056
 msgid ""
 "Ready to record. Use 'control' and cursor keys during playback to record "
 "your performance.\n"
@@ -2293,11 +2292,11 @@
 "(キャンセルするには、'r'キーを押すか、再生を始める前に 再生|動作を記録 を再度"
 "クリックしてください。\n"
 
-#: src/callbacks.c:4098
+#: src/callbacks.c:4061
 msgid "Record cancelled.\n"
 msgstr "記録はキャンセルされました。\n"
 
-#: src/callbacks.c:4237
+#: src/callbacks.c:4197
 #, c-format
 msgid ""
 "\n"
@@ -2310,7 +2309,7 @@
 "プラグイン'%s'の報告:\n"
 "%s\n"
 
-#: src/callbacks.c:4241
+#: src/callbacks.c:4200
 #, c-format
 msgid ""
 "\n"
@@ -2323,7 +2322,7 @@
 "プラグイン%sの中に'init'メソッドが見つかりません。\n"
 "このプラグインは壊れているか、正しくインストールされていないようです。"
 
-#: src/callbacks.c:4571
+#: src/callbacks.c:4532
 #, c-format
 msgid ""
 "Saving the set will cause copies of all loaded clips to remain on the disk"
@@ -2336,23 +2335,23 @@
 "\n"
 "コピーしたくない場合は、'キャンセル'を押してください。\n"
 
-#: src/callbacks.c:4654
+#: src/callbacks.c:4617
 #, c-format
 msgid "Saving set %s"
 msgstr "セット %s の保存"
 
-#: src/callbacks.c:5005
+#: src/callbacks.c:4964
 #, c-format
 msgid "Loading clips from set %s"
 msgstr "セット %s からクリップを読み込み"
 
-#: src/callbacks.c:5093
+#: src/callbacks.c:5051
 #, c-format
 msgid "%d clips and %d layouts were recovered from set (%s).\n"
 msgstr ""
 "セット (%3$s) から %1$d 個のクリップと %2$d 個のレイアウトを回復しました。\n"
 
-#: src/callbacks.c:5312
+#: src/callbacks.c:5259
 msgid ""
 "LiVES will attempt to recover some disk space.\n"
 "You should ONLY run this if you have no other copies of LiVES running on "
@@ -2364,24 +2363,24 @@
 "動作させるようにしてください。\n"
 "OKをクリックすると先に進みます。\n"
 
-#: src/callbacks.c:5317
+#: src/callbacks.c:5264
 msgid "Cleaning up disk space..."
 msgstr "ディスクスペースの消去..."
 
-#: src/callbacks.c:5387
+#: src/callbacks.c:5334
 msgid "Recovering disk space"
 msgstr "ディスク容量を回復"
 
-#: src/callbacks.c:5439
+#: src/callbacks.c:5386
 #, c-format
 msgid "%s of disk space was recovered.\n"
 msgstr "%s のディスク容量を回復しました。\n"
 
-#: src/callbacks.c:5482
+#: src/callbacks.c:5428
 msgid "Resetting frame rates and frame values..."
 msgstr "フレームレートとフレーム値のリストア..."
 
-#: src/callbacks.c:5523
+#: src/callbacks.c:5469
 #, c-format
 msgid ""
 "\n"
@@ -2389,12 +2388,12 @@
 "Internal: %s (%d bpp) / %s\n"
 msgstr ""
 
-#: src/callbacks.c:5525
+#: src/callbacks.c:5471
 msgid "buffered"
 msgstr "バッファー内"
 
-#: src/callbacks.c:5538 src/callbacks.c:5557 src/callbacks.c:5575
-#: src/callbacks.c:5609
+#: src/callbacks.c:5484 src/callbacks.c:5502 src/callbacks.c:5518
+#: src/callbacks.c:5551
 msgid ""
 "\n"
 "  Opening..."
@@ -2402,7 +2401,7 @@
 "\n"
 "  開いています..."
 
-#: src/callbacks.c:5545
+#: src/callbacks.c:5490
 #, c-format
 msgid ""
 "\n"
@@ -2411,7 +2410,7 @@
 "\n"
 "(%d バーチャル)"
 
-#: src/callbacks.c:5548
+#: src/callbacks.c:5493
 #, c-format
 msgid ""
 "\n"
@@ -2420,7 +2419,7 @@
 "\n"
 "(%d デコード済み)"
 
-#: src/callbacks.c:5560 src/callbacks.c:5578 src/callbacks.c:5612
+#: src/callbacks.c:5504 src/callbacks.c:5520 src/callbacks.c:5553
 #, c-format
 msgid ""
 "\n"
@@ -2429,7 +2428,7 @@
 "\n"
 "  %.2f 秒."
 
-#: src/callbacks.c:5569
+#: src/callbacks.c:5512
 msgid ""
 "\n"
 "  Unknown"
@@ -2437,23 +2436,23 @@
 "\n"
 "  不明"
 
-#: src/callbacks.c:5582 src/callbacks.c:5596
+#: src/callbacks.c:5524 src/callbacks.c:5538
 msgid "unsigned"
 msgstr "符号なし"
 
-#: src/callbacks.c:5583 src/callbacks.c:5597
+#: src/callbacks.c:5525 src/callbacks.c:5539
 msgid "signed"
 msgstr "符号付き"
 
-#: src/callbacks.c:5585 src/callbacks.c:5599
+#: src/callbacks.c:5527 src/callbacks.c:5541
 msgid "big-endian"
 msgstr "ビッグエンディアン"
 
-#: src/callbacks.c:5586 src/callbacks.c:5600
+#: src/callbacks.c:5528 src/callbacks.c:5542
 msgid "little-endian"
 msgstr "リトルエンディアン"
 
-#: src/callbacks.c:5588 src/callbacks.c:5602
+#: src/callbacks.c:5530 src/callbacks.c:5544
 #, c-format
 msgid ""
 "  %d Hz %d bit\n"
@@ -2462,7 +2461,7 @@
 "  %d Hz %d ビット\n"
 "%s %s"
 
-#: src/callbacks.c:5707
+#: src/callbacks.c:5647
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -2492,15 +2491,15 @@
 "along with this program; if not, write to the Free Software\n"
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA.\n"
 
-#: src/callbacks.c:5721
+#: src/callbacks.c:5661
 msgid "A video editor and VJ program."
 msgstr "映像エディターとVJプログラム"
 
-#: src/callbacks.c:5722
+#: src/callbacks.c:5662
 msgid "About LiVES"
 msgstr ""
 
-#: src/callbacks.c:5724
+#: src/callbacks.c:5664
 msgid "translator_credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -2509,7 +2508,7 @@
 "  Shushi Kurose https://launchpad.net/~kuromabo\n"
 "  Takashi Sakamoto https://launchpad.net/~mocchi"
 
-#: src/callbacks.c:5758
+#: src/callbacks.c:5699
 #, c-format
 msgid ""
 "LiVES Version %s\n"
@@ -2532,7 +2531,7 @@
 "salsaman@gmail.com\n"
 "ホームページ: http://lives.sourceforge.net"
 
-#: src/callbacks.c:6037
+#: src/callbacks.c:5996
 #, fuzzy
 msgid ""
 "\n"
@@ -2543,7 +2542,7 @@
 "\n"
 "このファイルをプレビューするにはmplayerをインストールする必要があります。\n"
 
-#: src/callbacks.c:6040
+#: src/callbacks.c:5998
 #, fuzzy
 msgid ""
 "\n"
@@ -2555,192 +2554,187 @@
 "\n"
 "このファイルをプレビューするにはmplayerをインストールする必要があります。\n"
 
-#: src/callbacks.c:6423 src/callbacks.c:8289
-msgid ""
-"\n"
-"Loading new audio may cause missing audio in some multitrack layouts.\n"
-"Are you sure you wish to continue ?\n"
-"."
-msgstr ""
-"\n"
-"新しい音声を読み込むことによって、マルチトラックにおいて音声の消去が生じま"
-"す。\n"
-"続けても構いませんか?"
-
-#: src/callbacks.c:6523
-#, c-format
-msgid "Opening audio %s, type %s..."
-msgstr "音声%s, タイプ%sを開きます..."
-
-#: src/callbacks.c:6556 src/saveplay.c:480
-msgid "Opening audio"
-msgstr "音声を開きます"
-
-#: src/callbacks.c:6565 src/callbacks.c:6612 src/callbacks.c:8387
-#: src/callbacks.c:8429 src/callbacks.c:8472 src/callbacks.c:10846
-msgid "Cancelling"
-msgstr "キャンセルします"
-
-#: src/callbacks.c:6660 src/callbacks.c:8514 src/callbacks.c:10876
-#: src/callbacks.c:11563
-msgid "Committing audio"
-msgstr "音声を収容します"
-
-#: src/callbacks.c:6672 src/callbacks.c:8546
-msgid "New Audio"
-msgstr "新しい音声"
-
-#: src/callbacks.c:6779
+#: src/callbacks.c:6459
 #, c-format
 msgid ""
 "Text was saved as\n"
 "%s\n"
 msgstr ""
 
-#: src/callbacks.c:6951 src/saveplay.c:3618
-#, c-format
-msgid "%d frames are enough !\n"
-msgstr "%d フレームで十分です !\n"
-
-#: src/callbacks.c:7050
+#: src/callbacks.c:6706
 msgid "LiVES: - Encoder debug output"
 msgstr "LiVES: - エンコーダのデバッグ出力"
 
-#: src/callbacks.c:7087 src/gui.c:1922
+#: src/callbacks.c:6743 src/gui.c:1921
 msgid "Fullscreen playback (f)"
 msgstr "フルスクリーン再生 (f)"
 
-#: src/callbacks.c:7089
+#: src/callbacks.c:6744
 msgid "Fullscreen playback off (f)"
 msgstr "フルスクリーン再生オフ (f)"
 
-#: src/callbacks.c:7188 src/callbacks.c:7336 src/callbacks.c:7664
-#: src/callbacks.c:7681 src/gui.c:3712 src/saveplay.c:2467 src/saveplay.c:2501
-#: src/saveplay.c:3115 src/saveplay.c:3220 src/saveplay.c:3239
-#: src/multitrack.c:9340 src/multitrack.c:11060
+#: src/callbacks.c:6841 src/callbacks.c:6983 src/callbacks.c:7283
+#: src/callbacks.c:7298 src/gui.c:3838 src/saveplay.c:2442 src/saveplay.c:2475
+#: src/saveplay.c:3074 src/saveplay.c:3178 src/saveplay.c:3197
+#: src/multitrack.c:9526 src/multitrack.c:11288
 #, c-format
 msgid " (%d %% scale)"
 msgstr ""
 
-#: src/callbacks.c:7190 src/callbacks.c:7338 src/callbacks.c:7666
-#: src/gui.c:3716 src/saveplay.c:2469 src/saveplay.c:2503
+#: src/callbacks.c:6843 src/callbacks.c:6985 src/callbacks.c:7285
+#: src/gui.c:3842 src/saveplay.c:2444 src/saveplay.c:2477
 #, c-format
 msgid "LiVES: - Play Window%s"
 msgstr ""
 
-#: src/callbacks.c:7302 src/gui.c:1907
+#: src/callbacks.c:6950 src/gui.c:1906
 msgid "Double size (d)"
 msgstr "ダブルサイズ (d)"
 
-#: src/callbacks.c:7309
+#: src/callbacks.c:6956
 msgid "Single size (d)"
 msgstr "シングルサイズ (d)"
 
-#: src/callbacks.c:7442 src/callbacks.c:7443
+#: src/callbacks.c:7087 src/callbacks.c:7088
 msgid "Hide the play window (s)"
 msgstr "再生ウィンドウを隠す (s)"
 
-#: src/callbacks.c:7452 src/gui.c:1746
+#: src/callbacks.c:7096 src/gui.c:1744
 msgid "Show the play window (s)"
 msgstr "再生ウィンドウを表示する (s)"
 
-#: src/callbacks.c:7453 src/gui.c:1896
+#: src/callbacks.c:7097 src/gui.c:1895
 msgid "Play in separate window (s)"
 msgstr "独立したウィンドウで再生 (s)"
 
-#: src/callbacks.c:7535 src/gui.c:4060 src/saveplay.c:2498
+#: src/callbacks.c:7175 src/gui.c:4169 src/saveplay.c:2472
 msgid "LiVES: - Streaming"
 msgstr "LiVES: - ストリーミング"
 
-#: src/callbacks.c:7778
+#: src/callbacks.c:7388
 msgid "Switch continuous looping off (o)"
 msgstr "連続ループをオフ (o)"
 
-#: src/callbacks.c:7785 src/gui.c:1795
+#: src/callbacks.c:7394 src/gui.c:1793
 msgid "Switch continuous looping on (o)"
 msgstr "連続ループをオン (o)"
 
-#: src/callbacks.c:7837
+#: src/callbacks.c:7444
 #, c-format
 msgid "Audio volume (%.2f)"
 msgstr "音声ボリューム (%.2f)"
 
-#: src/callbacks.c:7876 src/callbacks.c:7877 src/gui.c:3640
+#: src/callbacks.c:7483 src/callbacks.c:7484 src/gui.c:3766
 msgid "Unmute the audio (z)"
 msgstr "音声ミュートをオフ (z)"
 
-#: src/callbacks.c:7888 src/callbacks.c:7889 src/gui.c:1808 src/gui.c:3639
+#: src/callbacks.c:7494 src/callbacks.c:7495 src/gui.c:1806 src/gui.c:3765
 msgid "Mute the audio (z)"
 msgstr "音声ミュートをオン (z)"
 
-#: src/callbacks.c:8038
+#: src/callbacks.c:7643
 msgid "Reversing clipboard..."
 msgstr "クリップボードを反転します..."
 
-#: src/callbacks.c:8052
+#: src/callbacks.c:7657
 msgid "Reversing clipboard"
 msgstr "クリップボードを反転"
 
-#: src/callbacks.c:8084
+#: src/callbacks.c:7689
 msgid "LiVES: Load subtitles from..."
 msgstr "LiVES: 字幕の読み込み先..."
 
-#: src/callbacks.c:8151 src/saveplay.c:970
+#: src/callbacks.c:7753 src/saveplay.c:956
 #, c-format
 msgid "Loaded subtitle file: %s\n"
 msgstr "字幕ファイルを読み込みます: %s\n"
 
-#: src/callbacks.c:8220
+#: src/callbacks.c:7821
 msgid "Subtitles were erased.\n"
 msgstr "字幕を削除しました。\n"
 
-#: src/callbacks.c:8239
+#: src/callbacks.c:7843
 msgid "LiVES: - Select Audio File"
 msgstr ""
 
-#: src/callbacks.c:8250
+#: src/callbacks.c:7878 src/callbacks.c:8232
+msgid ""
+"\n"
+"Loading new audio may cause missing audio in some multitrack layouts.\n"
+"Are you sure you wish to continue ?\n"
+"."
+msgstr ""
+"\n"
+"新しい音声を読み込むことによって、マルチトラックにおいて音声の消去が生じま"
+"す。\n"
+"続けても構いませんか?"
+
+#: src/callbacks.c:7989
+#, c-format
+msgid "Opening audio %s, type %s..."
+msgstr "音声%s, タイプ%sを開きます..."
+
+#: src/callbacks.c:8023 src/saveplay.c:477
+msgid "Opening audio"
+msgstr "音声を開きます"
+
+#: src/callbacks.c:8032 src/callbacks.c:8083 src/callbacks.c:8327
+#: src/callbacks.c:8369 src/callbacks.c:8412 src/callbacks.c:10766
+msgid "Cancelling"
+msgstr "キャンセルします"
+
+#: src/callbacks.c:8137 src/callbacks.c:8454 src/callbacks.c:10803
+#: src/callbacks.c:11477
+msgid "Committing audio"
+msgstr "音声を収容します"
+
+#: src/callbacks.c:8153 src/callbacks.c:8484
+msgid "New Audio"
+msgstr "新しい音声"
+
+#: src/callbacks.c:8194
 msgid "Please set your CD play device in Tools | Preferences | Misc\n"
 msgstr "「ツール|設定|その他」で、CD再生デバイスを設定してください。\n"
 
-#: src/callbacks.c:8321
+#: src/callbacks.c:8264
 #, c-format
 msgid "Opening CD track %d from %s..."
 msgstr "CDトラック%dから%sを開きます..."
 
-#: src/callbacks.c:8326
+#: src/callbacks.c:8267
 #, c-format
 msgid "CD track %d"
 msgstr "CDトラック%d"
 
-#: src/callbacks.c:8373
+#: src/callbacks.c:8313
 msgid "Opening CD track..."
 msgstr "CDトラックを開く..."
 
-#: src/callbacks.c:8415 src/callbacks.c:8461
+#: src/callbacks.c:8355 src/callbacks.c:8401
 msgid "Error loading CD track\n"
 msgstr "CDトラックの読み込みエラー\n"
 
-#: src/callbacks.c:8584
+#: src/callbacks.c:8518
 msgid "layout errors"
 msgstr "レイアウトエラー"
 
-#: src/callbacks.c:8595
+#: src/callbacks.c:8529
 msgid "Close _Window"
 msgstr "ウィンドウを閉じる(_W)"
 
-#: src/callbacks.c:8606
+#: src/callbacks.c:8540
 msgid "Clear _Errors"
 msgstr "エラーを消去(_E)"
 
-#: src/callbacks.c:8617
+#: src/callbacks.c:8551
 msgid "_Delete affected layouts"
 msgstr "レイアウトを消去(_D)"
 
-#: src/callbacks.c:9343 src/callbacks.c:9388
+#: src/callbacks.c:9253 src/callbacks.c:9298
 msgid "Resume"
 msgstr "再開"
 
-#: src/callbacks.c:9344
+#: src/callbacks.c:9254
 msgid ""
 "\n"
 "Paused\n"
@@ -2750,27 +2744,23 @@
 "一時停止\n"
 "(クリックすると処理を再開します)"
 
-#: src/callbacks.c:9345 src/callbacks.c:9406
+#: src/callbacks.c:9255 src/callbacks.c:9315
 msgid "paused..."
 msgstr "一時停止しています..."
 
-#: src/callbacks.c:9372 src/callbacks.c:9418
-msgid "Pause"
-msgstr "一時停止"
-
-#: src/callbacks.c:9374 src/callbacks.c:9421
+#: src/callbacks.c:9284 src/callbacks.c:9333
 msgid "resumed..."
 msgstr "再開..."
 
-#: src/callbacks.c:9393
+#: src/callbacks.c:9303
 msgid "Keep"
 msgstr "維持"
 
-#: src/callbacks.c:9396
+#: src/callbacks.c:9305
 msgid "Enough"
 msgstr "停止"
 
-#: src/callbacks.c:9401
+#: src/callbacks.c:9310
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2783,28 +2773,28 @@
 "(現状を保つには「維持」をクリック)\n"
 "(処理を続ける場合は「再開」をクリック)"
 
-#: src/callbacks.c:9419
+#: src/callbacks.c:9331
 msgid "Cancel"
 msgstr "キャンセル"
 
-#: src/callbacks.c:9558
+#: src/callbacks.c:9478
 msgid "Stop"
 msgstr "停止"
 
-#: src/callbacks.c:10053 src/multitrack.c:13247
+#: src/callbacks.c:9968 src/multitrack.c:13489
 msgid "LiVES: Selected frame"
 msgstr "LiVES: 選択したフレーム"
 
-#: src/callbacks.c:10061
+#: src/callbacks.c:9976
 msgid "_Save frame as..."
 msgstr "フレームに名前を付けて保存(_S)..."
 
-#: src/callbacks.c:10290
+#: src/callbacks.c:10202
 #, c-format
 msgid "Audio is ahead of video by %.4f secs. at frame %d, with fps %.4f\n"
 msgstr "音声が映像を%.4f秒上回っています。%dフレーム、%.4f fps\n"
 
-#: src/callbacks.c:10347
+#: src/callbacks.c:10255
 msgid ""
 "\n"
 "\n"
@@ -2818,7 +2808,7 @@
 "他のプラットフォームで動作させるにはパッチを送ってください。\n"
 "\n"
 
-#: src/callbacks.c:10353
+#: src/callbacks.c:10261
 msgid ""
 "\n"
 "\n"
@@ -2830,7 +2820,7 @@
 "この機能を利用するには xwininfo をインストールしなければなりません。\n"
 "\n"
 
-#: src/callbacks.c:10429 src/callbacks.c:11479
+#: src/callbacks.c:10334 src/callbacks.c:11395
 msgid ""
 "\n"
 "Record time must be greater than 0.\n"
@@ -2838,7 +2828,7 @@
 "\n"
 "記録時間は0より大きくなければなりません。\n"
 
-#: src/callbacks.c:10440
+#: src/callbacks.c:10346
 msgid ""
 "Capture an External Window:\n"
 "\n"
@@ -2852,11 +2842,11 @@
 "キャンセルするには'キャンセル'をクリックしてください。\n"
 "\n"
 
-#: src/callbacks.c:10445
+#: src/callbacks.c:10351
 msgid "External window was released.\n"
 msgstr "外部ウィンドウを解放しました。\n"
 
-#: src/callbacks.c:10479
+#: src/callbacks.c:10385
 msgid ""
 "Click on a Window to Capture it\n"
 "Press 'q' to stop recording"
@@ -2864,7 +2854,7 @@
 "キャプチャーしたいウィンドウをクリックしてください\n"
 "記録を終える場合は 'q' を押してください"
 
-#: src/callbacks.c:10513
+#: src/callbacks.c:10419
 #, c-format
 msgid ""
 "\n"
@@ -2880,19 +2870,19 @@
 "'q'キーで終了。\n"
 "(標準設定の%.3fフレーム/秒を使います)\n"
 
-#: src/callbacks.c:10539
+#: src/callbacks.c:10443
 msgid "LiVES was unable to capture this window. Sorry.\n"
 msgstr "LiVESはこのウィンドウをキャプチャできませんでした。ごめんなさい。\n"
 
-#: src/callbacks.c:10695
+#: src/callbacks.c:10601
 msgid "Export Selected Audio as..."
 msgstr "選択した音声をエクスポート..."
 
-#: src/callbacks.c:10699
+#: src/callbacks.c:10604
 msgid "Export Audio as..."
 msgstr "音声をエクスポート..."
 
-#: src/callbacks.c:10714
+#: src/callbacks.c:10619
 msgid ""
 "\n"
 "\n"
@@ -2906,86 +2896,86 @@
 "新しい速度でエクスポートするには'OK'をクリック。元の速度でエクスポートするに"
 "は'キャンセル'をクリックしてください。\n"
 
-#: src/callbacks.c:10720
+#: src/callbacks.c:10625
 #, c-format
 msgid "Exporting audio frames %d to %d as %s..."
 msgstr "%dから%dまでの音声フレームを%sとしてエクスポート..."
 
-#: src/callbacks.c:10725
+#: src/callbacks.c:10629
 #, c-format
 msgid "Exporting audio as %s..."
 msgstr "音声を%sとしてエクスポート..."
 
-#: src/callbacks.c:10751
+#: src/callbacks.c:10655
 msgid "Exporting audio"
 msgstr "音声をエクスポートします"
 
-#: src/callbacks.c:10782
+#: src/callbacks.c:10695
 msgid "LiVES: - Append Audio File"
 msgstr ""
 
-#: src/callbacks.c:10825
+#: src/callbacks.c:10739
 #, c-format
 msgid "Appending audio file %s..."
 msgstr "音声ファイル%sを追加します..."
 
-#: src/callbacks.c:10836
+#: src/callbacks.c:10756
 msgid "Appending audio"
 msgstr "音声を追加します"
 
-#: src/callbacks.c:10892
+#: src/callbacks.c:10818
 msgid "Append Audio"
 msgstr "音声の追加"
 
-#: src/callbacks.c:10952
+#: src/callbacks.c:10883
 #, c-format
 msgid "Padding audio to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10954
+#: src/callbacks.c:10885
 #, c-format
 msgid "Trimming audio from %.2f to %.2f seconds..."
 msgstr "音声を%.2fから%.2f秒までトリミングします..."
 
-#: src/callbacks.c:10973
+#: src/callbacks.c:10904
 msgid "Trimming/Padding audio"
 msgstr "音声をトリミング/パディングします"
 
-#: src/callbacks.c:10981
+#: src/callbacks.c:10912
 msgid "Trim/Pad Audio"
 msgstr "音声のトリミング"
 
-#: src/callbacks.c:11055
+#: src/callbacks.c:10982
 msgid "Fading audio in"
 msgstr "音声をフェードイン"
 
-#: src/callbacks.c:11056
+#: src/callbacks.c:10983
 msgid "Fade audio in"
 msgstr "音声をフェードイン"
 
-#: src/callbacks.c:11061
+#: src/callbacks.c:10987
 msgid "Fading audio out"
 msgstr "音声をフェードアウト"
 
-#: src/callbacks.c:11062
+#: src/callbacks.c:10988
 msgid "Fade audio out"
 msgstr "音声をフェードアウト"
 
-#: src/callbacks.c:11085
+#: src/callbacks.c:11011
 #, c-format
 msgid "%s over %.1f seconds..."
 msgstr "%s が %.1f 秒オーバー..."
 
-#: src/callbacks.c:11087
+#: src/callbacks.c:11013
 #, c-format
 msgid "%s from time %.2f seconds to %.2f seconds..."
 msgstr "%s は %.2f秒から%.2f秒まで..."
 
-#: src/callbacks.c:11094
+#: src/callbacks.c:11020
 msgid "Fading audio..."
 msgstr "音声のフェード..."
 
-#: src/callbacks.c:11194
+#: src/callbacks.c:11119
 msgid ""
 "\n"
 "Deleting all audio will close this file.\n"
@@ -2995,46 +2985,46 @@
 "全音声を削除すると、このファイルを閉じます。\n"
 "構いませんか ?"
 
-#: src/callbacks.c:11197
+#: src/callbacks.c:11122
 msgid "Deleting all audio..."
 msgstr "全音声の削除..."
 
-#: src/callbacks.c:11203
+#: src/callbacks.c:11127
 #, c-format
 msgid "Deleting audio from %.2f to %.2f seconds..."
 msgstr "音声を%.2fから%.2f秒まで削除します..."
 
-#: src/callbacks.c:11290
+#: src/callbacks.c:11214
 msgid "Deleting Audio"
 msgstr "音声を削除します"
 
-#: src/callbacks.c:11297
+#: src/callbacks.c:11221
 msgid "Delete Audio"
 msgstr "音声の削除"
 
-#: src/callbacks.c:11636
+#: src/callbacks.c:11550
 msgid "Record new audio"
 msgstr "新しい音声の記録"
 
-#: src/callbacks.c:11725
+#: src/callbacks.c:11640
 #, c-format
 msgid "Inserting silence from %.2f to %.2f seconds..."
 msgstr "%.2fから%.2f秒まで無音部分を挿入します..."
 
-#: src/callbacks.c:11754
+#: src/callbacks.c:11666
 msgid "Inserting Silence"
 msgstr "無音部分を挿入します"
 
-#: src/merge.c:85
+#: src/merge.c:96
 msgid "LiVES: - Merge"
 msgstr "LiVES: - 結合"
 
-#: src/merge.c:102
+#: src/merge.c:113
 #, c-format
 msgid "Merge Clipboard [ %d Frames ]       With Selection [ %d Frames ]"
 msgstr "クリップボード [ %d フレーム ]   選択範囲 [ %d フレーム ] を結合"
 
-#: src/merge.c:107
+#: src/merge.c:118
 #, c-format
 msgid ""
 "Merge Clipboard [ %d Frames (resampled) ]       With Selection [ %d Frames ]"
@@ -3042,585 +3032,585 @@
 "クリップボード [ %d フレーム (リサンプリング後)]   選択範囲 [ %d フレーム ]を"
 "結合"
 
-#: src/merge.c:118
+#: src/merge.c:130
 msgid "Align _Starts"
 msgstr "先頭に合わせる(_S)"
 
-#: src/merge.c:123
+#: src/merge.c:135
 msgid "Align _Ends"
 msgstr "最後に合わせる(_E)"
 
-#: src/merge.c:134
+#: src/merge.c:146
 msgid "What to do with extra clipboard frames -"
 msgstr "クリップボードの余分なフレームについての処理 -"
 
-#: src/merge.c:137
+#: src/merge.c:149
 msgid "_Insert Frames"
 msgstr "フレームの挿入(_I)"
 
-#: src/merge.c:143
+#: src/merge.c:155
 msgid "_Drop Frames"
 msgstr "フレームを落とす(_D)"
 
-#: src/merge.c:149
+#: src/merge.c:160
 msgid "Number of Times to Loop Clipboard"
 msgstr "ループクリップボードの回数"
 
-#: src/merge.c:160
+#: src/merge.c:171
 msgid "_Loop Clipboard to Fit Selection"
 msgstr "選択範囲に合わせてクリップボードをループさせる(_L)"
 
-#: src/merge.c:173
+#: src/merge.c:184
 msgid "_Transition Method:"
 msgstr "トランジション方法(_T):"
 
-#: src/merge.c:394
+#: src/merge.c:395
 msgid "Merging clipboard with selection..."
 msgstr "クリップボードと選択範囲を結合する..."
 
-#: src/merge.c:551
+#: src/merge.c:539
 msgid "Merge done.\n"
 msgstr "結合の完了。\n"
 
-#: src/gui.c:123
+#: src/gui.c:122
 msgid "_Custom Generators"
 msgstr "カスタムジェネレーター(_C)"
 
-#: src/gui.c:124
+#: src/gui.c:123
 msgid "_Custom Effects"
 msgstr "カスタムエフェクト(_C)"
 
-#: src/gui.c:125
+#: src/gui.c:124
 msgid "Custom _Utilities"
 msgstr "カスタムユーティリティ(_U)"
 
-#: src/gui.c:352 src/multitrack.c:5964
+#: src/gui.c:351 src/multitrack.c:6143
 msgid "_File"
 msgstr "ファイル(_F)"
 
-#: src/gui.c:367 src/multitrack.c:5989
+#: src/gui.c:366 src/multitrack.c:6168
 msgid "_Open File/Directory"
 msgstr "ファイル/ディレクトリを開く(_O)"
 
-#: src/gui.c:373
+#: src/gui.c:372
 msgid "O_pen Part of File..."
 msgstr "ファイルの一部を開く(_P)..."
 
-#: src/gui.c:379 src/gui.c:383 src/multitrack.c:6006 src/multitrack.c:6023
-#: src/multitrack.c:6028
+#: src/gui.c:378 src/gui.c:382 src/multitrack.c:6185 src/multitrack.c:6202
+#: src/multitrack.c:6207
 msgid "Open _Location/Stream..."
 msgstr "場所/ストリームを開く(_L)..."
 
-#: src/gui.c:393 src/multitrack.c:6016
+#: src/gui.c:392 src/multitrack.c:6195
 msgid "Open _Youtube Clip..."
 msgstr "Youtube クリップを開く(_Y)..."
 
-#: src/gui.c:404
+#: src/gui.c:403
 msgid "Import from _dvd/vcd..."
 msgstr "DVDやビデオCDからインポート(_D)..."
 
-#: src/gui.c:413
+#: src/gui.c:412
 msgid "Import from _dvd"
 msgstr "DVDからインポート(_D)"
 
-#: src/gui.c:416
+#: src/gui.c:415
 msgid "Import from _vcd"
 msgstr "ビデオCDからインポート(_V)"
 
-#: src/gui.c:419
+#: src/gui.c:418
 msgid "_Import from Firewire"
 msgstr "Firewireデバイスからインポート(_I)"
 
-#: src/gui.c:428 src/multitrack.c:6086
+#: src/gui.c:427 src/multitrack.c:6265
 msgid "Import from _Firewire Device (dv)"
 msgstr "Firewireデバイスからインポート (dv)(_F)"
 
-#: src/gui.c:429 src/multitrack.c:6094
+#: src/gui.c:428 src/multitrack.c:6273
 msgid "Import from _Firewire Device (hdv)"
 msgstr "Firewireデバイスからインポート (hdv)(_F)"
 
-#: src/gui.c:457
+#: src/gui.c:456
 msgid "_Add Webcam/TV card..."
 msgstr "ウェブカメラ/TVカードの追加(_A)..."
 
-#: src/gui.c:476
+#: src/gui.c:475
 msgid "Add _Unicap Device"
 msgstr "Unicapデバイスの追加(_U)"
 
-#: src/gui.c:486
+#: src/gui.c:485
 msgid "Add Live _Firewire Device"
 msgstr "Firewireのライブデバイスを追加する(_F)"
 
-#: src/gui.c:495
+#: src/gui.c:494
 msgid "Add _TV Device"
 msgstr "TVデバイスの追加(_T)"
 
-#: src/gui.c:510 src/multitrack.c:6117
+#: src/gui.c:509 src/multitrack.c:6296
 msgid "_Recent Files..."
 msgstr "最近開いたファイル(_R)..."
 
-#: src/gui.c:560 src/multitrack.c:6177
+#: src/gui.c:559 src/multitrack.c:6356
 msgid "_Reload Clip Set..."
 msgstr "クリップセットの再読み込み(_R)..."
 
-#: src/gui.c:564 src/multitrack.c:6185
+#: src/gui.c:563 src/multitrack.c:6364
 msgid "Close/Sa_ve All Clips"
 msgstr "全クリップを保存して閉じる(_V)"
 
-#: src/gui.c:575
+#: src/gui.c:574
 msgid "_Encode Clip As..."
 msgstr "クリップを別名でエンコード(_E)..."
 
-#: src/gui.c:577
+#: src/gui.c:576
 msgid "Encode _Selection As..."
 msgstr "選択範囲を別名でエンコード(_S)..."
 
-#: src/gui.c:584
+#: src/gui.c:583
 msgid "_Close This Clip"
 msgstr "このクリップを閉じる(_C)"
 
-#: src/gui.c:595
+#: src/gui.c:594
 msgid "_Backup Clip as .lv1..."
 msgstr "クリップを .lv1 としてバックアップ(_B)..."
 
-#: src/gui.c:604
+#: src/gui.c:603
 msgid "_Restore Clip from .lv1..."
 msgstr ".lv1からクリップをリストア(_R)..."
 
-#: src/gui.c:615
+#: src/gui.c:614
 msgid "Encode/Load/Backup _with Sound"
 msgstr "音声付きでエンコード/読み込み/バックアップする(_W)"
 
-#: src/gui.c:620
+#: src/gui.c:619
 msgid "Auto load subtitles"
 msgstr "字幕の自動読み込み"
 
-#: src/gui.c:628 src/multitrack.c:6224
+#: src/gui.c:627 src/multitrack.c:6403
 msgid "Clean _up Diskspace"
 msgstr "ディスク領域のクリーンアップ(_U)"
 
-#: src/gui.c:636 src/multitrack.c:6257
+#: src/gui.c:635 src/multitrack.c:6436
 msgid "_Edit"
 msgstr "編集(_E)"
 
-#: src/gui.c:685
+#: src/gui.c:684
 msgid "_MULTITRACK mode"
 msgstr "マルチトラックモード(_M)"
 
-#: src/gui.c:696
+#: src/gui.c:695
 msgid "_Copy Selection"
 msgstr "選択範囲をコピー(_C)"
 
-#: src/gui.c:705
+#: src/gui.c:704
 msgid "Cu_t Selection"
 msgstr "選択範囲をカット(_T)"
 
-#: src/gui.c:714
+#: src/gui.c:713
 msgid "_Insert from Clipboard..."
 msgstr "クリップボードから挿入(_I)..."
 
-#: src/gui.c:730
+#: src/gui.c:729
 msgid "Paste as _New"
 msgstr "新規として貼り付け(_N)"
 
-#: src/gui.c:739
+#: src/gui.c:738
 msgid "_Merge Clipboard with Selection..."
 msgstr "クリップボードと選択範囲をマージ(_M)..."
 
-#: src/gui.c:746
+#: src/gui.c:745
 msgid "_Delete Selection"
 msgstr "選択範囲を削除(_D)"
 
-#: src/gui.c:764
+#: src/gui.c:763
 msgid "Decouple _Video from Audio"
 msgstr "音声と映像を切り離す(_V)"
 
-#: src/gui.c:772
+#: src/gui.c:771
 msgid "_Select..."
 msgstr "選択(_S)..."
 
-#: src/gui.c:786
+#: src/gui.c:785
 msgid "Select _All Frames"
 msgstr "全フレームを選択(_A)..."
 
-#: src/gui.c:794
+#: src/gui.c:793
 msgid "_Start Frame Only"
 msgstr "開始フレームのみ(_S)"
 
-#: src/gui.c:802
+#: src/gui.c:801
 msgid "_End Frame Only"
 msgstr "終了フレームのみ(_E)"
 
-#: src/gui.c:813
+#: src/gui.c:812
 msgid "Select from _First Frame"
 msgstr "先頭フレームから選択(_F)"
 
-#: src/gui.c:817
+#: src/gui.c:816
 msgid "Select to _Last Frame"
 msgstr "最後尾フレームから選択(_L)"
 
-#: src/gui.c:821
+#: src/gui.c:820
 msgid "Select Last Insertion/_Merge"
 msgstr "最後の挿入/マージを選択(_M)"
 
-#: src/gui.c:825
+#: src/gui.c:824
 msgid "Select Last _Effect"
 msgstr "最後のエフェクトを選択(_E)"
 
-#: src/gui.c:829
+#: src/gui.c:828
 msgid "_Invert Selection"
 msgstr "選択範囲を反転(_I)"
 
-#: src/gui.c:837
+#: src/gui.c:836
 msgid "_Lock Selection Width"
 msgstr "選択範囲の幅を固定(_L)"
 
-#: src/gui.c:842 src/multitrack.c:6409
+#: src/gui.c:841 src/multitrack.c:6591
 msgid "_Play"
 msgstr "再生(_P)"
 
-#: src/gui.c:854
+#: src/gui.c:853
 msgid "_Play All"
 msgstr "すべて再生(_P)"
 
-#: src/gui.c:869
+#: src/gui.c:868
 msgid "Pla_y Selection"
 msgstr "選択範囲を再生(_Y)"
 
-#: src/gui.c:877
+#: src/gui.c:876
 msgid "Play _Clipboard"
 msgstr "クリップボードを再生(_C)"
 
-#: src/gui.c:899 src/multitrack.c:6441
+#: src/gui.c:898 src/multitrack.c:6623
 msgid "_Stop"
 msgstr "停止(_S)"
 
-#: src/gui.c:914 src/multitrack.c:6453
+#: src/gui.c:913 src/multitrack.c:6635
 msgid "Re_wind"
 msgstr "巻き戻し(_W)"
 
-#: src/gui.c:946 src/multitrack.c:6471
+#: src/gui.c:945 src/multitrack.c:6653
 msgid "_Full Screen"
 msgstr "全画面表示(_F)"
 
-#: src/gui.c:955
+#: src/gui.c:954
 msgid "_Double Size"
 msgstr "二倍サイズ(_D)"
 
-#: src/gui.c:963 src/multitrack.c:6479
+#: src/gui.c:962 src/multitrack.c:6661
 msgid "Play in _Separate Window"
 msgstr "独立ウィンドウで再生(_S)"
 
-#: src/gui.c:972
+#: src/gui.c:971
 msgid "_Blank Background"
 msgstr "空白のバックグラウンド(_B)"
 
-#: src/gui.c:979
+#: src/gui.c:978
 msgid "(Auto)_loop Video (to fit audio track)"
 msgstr "音声トラックに合わせてループ(_L)"
 
-#: src/gui.c:988 src/multitrack.c:6487
+#: src/gui.c:987 src/multitrack.c:6669
 msgid "L_oop Continuously"
 msgstr "連続ループ(_O)"
 
-#: src/gui.c:997
+#: src/gui.c:996
 msgid "Pin_g Pong Loops"
 msgstr "ピンポンループ(_G)"
 
-#: src/gui.c:1005 src/multitrack.c:6495
+#: src/gui.c:1004 src/multitrack.c:6677
 msgid "_Mute"
 msgstr "ミュート(_M)"
 
-#: src/gui.c:1017
+#: src/gui.c:1016
 msgid "Separate Window 'S_ticky' Mode"
 msgstr "独立ウィンドウの'スティッキー'モード(_T)"
 
-#: src/gui.c:1025
+#: src/gui.c:1024
 msgid "S_how Frame Counter"
 msgstr "フレームカウンタの表示(_H)"
 
-#: src/gui.c:1035
+#: src/gui.c:1034
 msgid "Show Subtitles"
 msgstr "字幕の表示"
 
-#: src/gui.c:1045
+#: src/gui.c:1044
 msgid "Letterbox mode"
 msgstr "レターボックスモード"
 
-#: src/gui.c:1051 src/multitrack.c:6507
+#: src/gui.c:1050 src/multitrack.c:6689
 msgid "Effect_s"
 msgstr "エフェクト(_S)"
 
-#: src/gui.c:1054
+#: src/gui.c:1053
 msgid "Effects are applied to the current selection."
 msgstr "エフェクトは現在の選択範囲に適用されます。"
 
-#: src/gui.c:1067
+#: src/gui.c:1066
 msgid "_Run Test Rendered Effect/Tool/Generator..."
 msgstr "レンダリングエフェクト/ツール/ジェネレーターをテスト(_R)..."
 
-#: src/gui.c:1072 src/multitrack.c:7123
+#: src/gui.c:1071 src/multitrack.c:7299
 msgid "_Tools"
 msgstr "ツール(_T)"
 
-#: src/gui.c:1075
+#: src/gui.c:1074
 msgid "Tools are applied to complete clips."
 msgstr "ツールはクリップ全体に適用されます。"
 
-#: src/gui.c:1085
+#: src/gui.c:1084
 msgid "_Reverse Clipboard"
 msgstr "クリップボードの反転(_R)"
 
-#: src/gui.c:1094
+#: src/gui.c:1093
 msgid "_Change Playback/Save Speed..."
 msgstr "再生/保存スピードの変更(_C)..."
 
-#: src/gui.c:1099
+#: src/gui.c:1098
 msgid "Resample _Video to New Frame Rate..."
 msgstr "映像を新しいフレームレートでリサンプリング(_V)..."
 
-#: src/gui.c:1105
+#: src/gui.c:1104
 msgid "_Utilities"
 msgstr "ユーティリティ(_U)"
 
-#: src/gui.c:1110
+#: src/gui.c:1109
 msgid "Custom _Tools"
 msgstr "カスタムツール(_T)"
 
-#: src/gui.c:1116 src/multitrack.c:7149
+#: src/gui.c:1115 src/multitrack.c:7325
 msgid "_Generate"
 msgstr "生成(_G)"
 
-#: src/gui.c:1126
+#: src/gui.c:1125
 msgid "Loading rendered effect plugins..."
 msgstr "レンダリングエフェクトプラグインの読み込み中..."
 
-#: src/gui.c:1139
+#: src/gui.c:1138
 msgid "Load _Subtitles from File..."
 msgstr "字幕をファイルから読み込む(_S)..."
 
-#: src/gui.c:1144
+#: src/gui.c:1143
 msgid "Erase subtitles"
 msgstr "字幕の削除"
 
-#: src/gui.c:1152 src/multitrack.c:7158
+#: src/gui.c:1151 src/multitrack.c:7334
 msgid "Capture _External Window... "
 msgstr "外部ウィンドウのキャプチャ(_E)... "
 
-#: src/gui.c:1159 src/multitrack.c:7173
+#: src/gui.c:1158 src/multitrack.c:7349
 msgid "_Preferences..."
 msgstr "設定(_P)..."
 
-#: src/gui.c:1172
+#: src/gui.c:1171
 msgid "_Audio"
 msgstr "音声(_A)"
 
-#: src/gui.c:1184
+#: src/gui.c:1183
 msgid "Load _New Audio for Clip..."
 msgstr "クリップへ新しい音声を読み込み(_N)..."
 
-#: src/gui.c:1190
+#: src/gui.c:1189
 msgid "Load _CD Track..."
 msgstr "CDトラックの読み込み(_C)..."
 
-#: src/gui.c:1191
+#: src/gui.c:1190
 msgid "E_ject CD"
 msgstr "CDのイジェクト(_J)"
 
-#: src/gui.c:1205
+#: src/gui.c:1204
 msgid "Record E_xternal Audio..."
 msgstr "外部音声を録音(_X)..."
 
-#: src/gui.c:1218
+#: src/gui.c:1217
 msgid "to New _Clip..."
 msgstr "新しいクリップへ(_C)..."
 
-#: src/gui.c:1222
+#: src/gui.c:1221
 msgid "to _Selection"
 msgstr "選択範囲へ(_S)"
 
-#: src/gui.c:1230
+#: src/gui.c:1229
 msgid "Fade Audio _In..."
 msgstr "音声をフェードイン(_I)..."
 
-#: src/gui.c:1234
+#: src/gui.c:1233
 msgid "Fade Audio _Out..."
 msgstr "音声をフェードアウト(_O)..."
 
-#: src/gui.c:1244
+#: src/gui.c:1243
 msgid "_Export Audio..."
 msgstr "音声のエクスポート(_E)..."
 
-#: src/gui.c:1257
+#: src/gui.c:1256
 msgid "Export _Selected Audio..."
 msgstr "選択した音声のエクスポート(_S)..."
 
-#: src/gui.c:1261
+#: src/gui.c:1260
 msgid "Export _All Audio..."
 msgstr "全音声のエクスポート(_A)..."
 
-#: src/gui.c:1265
+#: src/gui.c:1264
 msgid "_Append Audio..."
 msgstr "音声の追加(_A)..."
 
-#: src/gui.c:1270
+#: src/gui.c:1269
 msgid "_Trim/Pad Audio..."
 msgstr "音声のトリミング/パディング(_T)..."
 
-#: src/gui.c:1283
+#: src/gui.c:1282
 msgid "Trim/Pad Audio to _Selection"
 msgstr "選択範囲への音声のトリミング/パディング(_S)"
 
-#: src/gui.c:1288
+#: src/gui.c:1287
 msgid "Trim/Pad Audio from Beginning to _Play Start"
 msgstr "先頭から再生開始までへの音声のトリミング/パディング(_P)"
 
-#: src/gui.c:1293
+#: src/gui.c:1292
 msgid "_Delete Audio..."
 msgstr "音声の削除(_D)..."
 
-#: src/gui.c:1306
+#: src/gui.c:1305
 msgid "Delete _Selected Audio"
 msgstr "選択した音声の削除(_S)"
 
-#: src/gui.c:1310
+#: src/gui.c:1309
 msgid "Delete _All Audio"
 msgstr "全音声の削除(_A)"
 
-#: src/gui.c:1314
+#: src/gui.c:1313
 msgid "Insert _Silence in Selection"
 msgstr "選択範囲に無音声を挿入(_S)"
 
-#: src/gui.c:1319
+#: src/gui.c:1318
 msgid "_Resample Audio..."
 msgstr "音声のリサンプリング(_R)..."
 
-#: src/gui.c:1324
+#: src/gui.c:1323
 msgid "_Info"
 msgstr "情報(_I)"
 
-#: src/gui.c:1336
+#: src/gui.c:1335
 msgid "Show Clip _Info"
 msgstr "クリップ情報を表示(_I)"
 
-#: src/gui.c:1344
+#: src/gui.c:1343
 msgid "Show/_Edit File Comments"
 msgstr "ファイルコメントの表示/編集(_E)"
 
-#: src/gui.c:1349
+#: src/gui.c:1348
 msgid "Show _Clipboard Info"
 msgstr "クリップボード情報の表示(_C)"
 
-#: src/gui.c:1360 src/multitrack.c:7286
+#: src/gui.c:1359 src/multitrack.c:7462
 msgid "Show _Messages"
 msgstr "メッセージの表示(_M)"
 
-#: src/gui.c:1364 src/multitrack.c:7365
+#: src/gui.c:1363 src/multitrack.c:7541
 msgid "Show _Layout Errors"
 msgstr "レイアウトエラーを表示(_L)"
 
-#: src/gui.c:1369 src/multitrack.c:7263
+#: src/gui.c:1368 src/multitrack.c:7439
 msgid "_Clips"
 msgstr "クリップ(_C)"
 
-#: src/gui.c:1381
+#: src/gui.c:1380
 msgid "_Rename Current Clip in Menu..."
 msgstr "メニューにある現在のクリップの名称変更(_R)..."
 
-#: src/gui.c:1399
+#: src/gui.c:1398
 msgid "A_dvanced"
 msgstr "詳細(_D)"
 
-#: src/gui.c:1412
+#: src/gui.c:1411
 msgid "_RFX Effects/Tools/Utilities"
 msgstr "RFXエフェクト/ツール/ユーティリティ(_R)"
 
-#: src/gui.c:1424
+#: src/gui.c:1423
 msgid "_New Test RFX Script..."
 msgstr "新しいテストRFXスクリプト(_N)..."
 
-#: src/gui.c:1428
+#: src/gui.c:1427
 msgid "_Copy RFX Script to Test..."
 msgstr "RFXスクリプトをテストへコピー(_C)..."
 
-#: src/gui.c:1432
+#: src/gui.c:1431
 msgid "_Edit Test RFX Script..."
 msgstr "テストRFXスクリプトの編集(_E)..."
 
-#: src/gui.c:1436
+#: src/gui.c:1435
 msgid "Rena_me Test RFX Script..."
 msgstr "テストRFXスクリプトの名称変更(_M)..."
 
-#: src/gui.c:1440
+#: src/gui.c:1439
 msgid "_Delete Test RFX Script..."
 msgstr "テストRFXスクリプトの削除(_D)..."
 
-#: src/gui.c:1450
+#: src/gui.c:1449
 msgid "_Promote Test Rendered Effect/Tool/Generator..."
 msgstr "レンダリングエフェクト/ツール/ジェネレーターをテストから昇格(_P)..."
 
-#: src/gui.c:1457
+#: src/gui.c:1456
 msgid "_Import Custom RFX script..."
 msgstr "カスタムRFXスクリプトのインポート(_I)..."
 
-#: src/gui.c:1461
+#: src/gui.c:1460
 msgid "E_xport Custom RFX script..."
 msgstr "カスタムRFXスクリプトのエクスポート(_X)..."
 
-#: src/gui.c:1465
+#: src/gui.c:1464
 msgid "De_lete Custom RFX Script..."
 msgstr "カスタムRFXスクリプトの削除(_L)..."
 
-#: src/gui.c:1472
+#: src/gui.c:1471
 msgid "Re_build all RFX plugins"
 msgstr "全RFXプラグインの再構築(_B)"
 
-#: src/gui.c:1501
+#: src/gui.c:1498
 msgid "Receive _LiVES stream from..."
 msgstr "LiVESストリームを受信する(_L)..."
 
-#: src/gui.c:1506
+#: src/gui.c:1503
 msgid "_Send LiVES stream to..."
 msgstr "LiVESストリームを送信する(_S)..."
 
-#: src/gui.c:1515
+#: src/gui.c:1512
 #, c-format
 msgid "Open _yuv4mpeg stream on %sstream.yuv..."
 msgstr "%sstream.yuvのyuv4mpegストリームを開く(_Y)..."
 
-#: src/gui.c:1536
+#: src/gui.c:1534
 msgid "_Import Project (.lv2)..."
 msgstr "プロジェクトのインポート (.lv2) (_I)..."
 
-#: src/gui.c:1540
+#: src/gui.c:1538
 msgid "E_xport Project (.lv2)..."
 msgstr "プロジェクトのエクスポート(.lv2)(_X)..."
 
-#: src/gui.c:1545
+#: src/gui.c:1543
 msgid "_VJ"
 msgstr "VJ(_V)"
 
-#: src/gui.c:1557
+#: src/gui.c:1555
 msgid "Real Time _Effect Mapping"
 msgstr "リアルタイムエフェクトマップ(_E)"
 
-#: src/gui.c:1563
+#: src/gui.c:1561
 msgid "Bind real time effects to ctrl-number keys."
 msgstr "リアルタイムエフェクトをコントロール-数字キーに設定します"
 
-#: src/gui.c:1565
+#: src/gui.c:1563
 msgid "Set Real Time Effect _Defaults"
 msgstr "リアルタイムエフェクトのデフォルト値を設定(_D)"
 
-#: src/gui.c:1567
+#: src/gui.c:1565
 msgid "Set default parameter values for real time effects."
 msgstr "リアルタイムエフェクトのデフォルト値を設定します"
 
-#: src/gui.c:1580
+#: src/gui.c:1578
 msgid "Save Real Time Effect _Defaults"
 msgstr "リアルタイムエフェクトをデフォルトとして保存(_D)"
 
-#: src/gui.c:1583
+#: src/gui.c:1581
 msgid ""
 "Save real time effect defaults so they will be restored each time you use "
 "LiVES."
@@ -3628,146 +3618,146 @@
 "リアルタイムエフェクトをデフォルトとして保存します。毎回、LiVESの起動時に復元"
 "されます。"
 
-#: src/gui.c:1589
+#: src/gui.c:1587
 msgid "_Reset all playback speeds and positions"
 msgstr "すべての再生スピードと位置をリセット(_R)"
 
-#: src/gui.c:1592
+#: src/gui.c:1590
 msgid ""
 "Reset all playback positions to frame 1, and reset all playback frame rates."
 msgstr ""
 "すべての再生位置をフレーム1にリセットし、すべてのフレーム再生レートをリセット"
 "する"
 
-#: src/gui.c:1594
+#: src/gui.c:1592
 msgid "_MIDI/joystick interface"
 msgstr "MIDI/ジョイスティックインタフェース(_M)"
 
-#: src/gui.c:1609
+#: src/gui.c:1607
 msgid "_MIDI/joystick learner..."
 msgstr "MIDI/ジョイスティックの登録(_M)..."
 
-#: src/gui.c:1614
+#: src/gui.c:1612
 msgid "_Save device mapping..."
 msgstr "デバイスマップの保存(_S)..."
 
-#: src/gui.c:1620
+#: src/gui.c:1618
 msgid "_Load device mapping..."
 msgstr "デバイスマップの読み込み(_L)..."
 
-#: src/gui.c:1628
+#: src/gui.c:1626
 msgid "Show VJ _Keys"
 msgstr "VJキーの表示(_K)"
 
-#: src/gui.c:1632
+#: src/gui.c:1630
 msgid "To_ys"
 msgstr "トイ(_Y)"
 
-#: src/gui.c:1644
+#: src/gui.c:1642
 msgid "_None"
 msgstr "なし(_N)"
 
-#: src/gui.c:1652
+#: src/gui.c:1650
 msgid "_Autolives"
 msgstr "Autolives(_A)"
 
-#: src/gui.c:1657
+#: src/gui.c:1655
 msgid "_Mad Frames"
 msgstr "熱狂フレーム(_M)"
 
-#: src/gui.c:1662
+#: src/gui.c:1660
 msgid "_LiVES TV (broadband)"
 msgstr "LiVES TV (ブロードバンド)(_L)"
 
-#: src/gui.c:1672 src/multitrack.c:7387
+#: src/gui.c:1670 src/multitrack.c:7563
 msgid "_Help"
 msgstr "ヘルプ(_H)"
 
-#: src/gui.c:1684 src/multitrack.c:7407
+#: src/gui.c:1682 src/multitrack.c:7583
 msgid "_Manual (opens in browser)"
 msgstr "マニュアル (ブラウザで開く)(_M)"
 
-#: src/gui.c:1691 src/multitrack.c:7416
+#: src/gui.c:1689 src/multitrack.c:7592
 msgid "_Donate to the project !"
 msgstr "プロジェクトに寄付する!(_D)"
 
-#: src/gui.c:1695 src/multitrack.c:7420
+#: src/gui.c:1693 src/multitrack.c:7596
 msgid "_Email the author"
 msgstr "作者にメールを送る(_E)"
 
-#: src/gui.c:1699 src/multitrack.c:7424
+#: src/gui.c:1697 src/multitrack.c:7600
 msgid "Report a _bug"
 msgstr "バグを報告する(_B)"
 
-#: src/gui.c:1703 src/multitrack.c:7428
+#: src/gui.c:1701 src/multitrack.c:7604
 msgid "Suggest a _feature"
 msgstr "機能を提案する(_F)"
 
-#: src/gui.c:1707 src/multitrack.c:7432
+#: src/gui.c:1705 src/multitrack.c:7608
 msgid "Assist with _translating"
 msgstr "翻訳を手伝う(_T)"
 
-#: src/gui.c:1714 src/multitrack.c:7439
+#: src/gui.c:1712 src/multitrack.c:7615
 msgid "_Troubleshoot"
 msgstr "トラブルシューティング(_T)"
 
-#: src/gui.c:1718 src/multitrack.c:7443
+#: src/gui.c:1716 src/multitrack.c:7619
 msgid "_About"
 msgstr "LiVESについて(_A)"
 
-#: src/gui.c:1752
+#: src/gui.c:1750
 msgid "Rewind to start (w)"
 msgstr "開始まで巻き戻す (w)"
 
-#: src/gui.c:1760 src/multitrack.c:16720
+#: src/gui.c:1758 src/multitrack.c:17010
 msgid "Play all (p)"
 msgstr "すべて再生 (p)"
 
-#: src/gui.c:1768 src/gui.c:1877
+#: src/gui.c:1766 src/gui.c:1876
 msgid "Stop playback (q)"
 msgstr "再生を停止 (q)"
 
-#: src/gui.c:1779
+#: src/gui.c:1777
 msgid "Play selection (y)"
 msgstr "選択範囲を再生 (y)"
 
-#: src/gui.c:1832
+#: src/gui.c:1829
 msgid "Volume"
 msgstr "ボリューム"
 
-#: src/gui.c:1854
+#: src/gui.c:1853
 msgid "Audio volume (1.00)"
 msgstr "音声ボリューム (1.00)"
 
-#: src/gui.c:1883
+#: src/gui.c:1882
 msgid "Unblank background (b)"
 msgstr "空白でないバックグラウンド"
 
-#: src/gui.c:1929
+#: src/gui.c:1928
 msgid "Play slower (ctrl-down)"
 msgstr "遅く再生 (ctrl-down)"
 
-#: src/gui.c:1935
+#: src/gui.c:1934
 msgid "Play faster (ctrl-up)"
 msgstr "早く再生 (ctrl-up)"
 
-#: src/gui.c:1942
+#: src/gui.c:1941
 msgid "Skip back (ctrl-left)"
 msgstr "前へスキップ (ctrl+left)"
 
-#: src/gui.c:1948
+#: src/gui.c:1947
 msgid "Skip forward (ctrl-right)"
 msgstr "前にスキップ (ctrl-right)"
 
-#: src/gui.c:1954
+#: src/gui.c:1953
 msgid "Show clip info (i)"
 msgstr "クリップ情報を表示 (i)"
 
-#: src/gui.c:1960
+#: src/gui.c:1959
 msgid "Hide this toolbar"
 msgstr "ツールバーを隠す"
 
-#: src/gui.c:1962
+#: src/gui.c:1961
 msgid ""
 "Press \"s\" to toggle separate play window for improved performance, \"q\" "
 "to stop."
@@ -3776,176 +3766,176 @@
 "てください。停止するには\"q\"を押してください。"
 
 #. TRANSLATORS: please keep the translated string the same length
-#: src/gui.c:1995
+#: src/gui.c:1994
 msgid "     Video playback speed (frames per second)        "
 msgstr "     ビデオ再生スピード (フレーム/秒)        "
 
-#: src/gui.c:2009
+#: src/gui.c:2008
 msgid "Vary the video speed"
 msgstr "映像の再生スピードの変更"
 
-#: src/gui.c:2092 src/gui.c:3218
+#: src/gui.c:2090 src/gui.c:3329
 msgid "First Frame"
 msgstr "先頭フレーム"
 
-#: src/gui.c:2193 src/gui.c:3226
+#: src/gui.c:2191 src/gui.c:3336
 msgid "Last Frame"
 msgstr "最終フレーム"
 
-#: src/gui.c:2210
+#: src/gui.c:2208
 msgid "The first selected frame in this clip"
 msgstr "このクリップで選択した最初のフレーム"
 
-#: src/gui.c:2248
+#: src/gui.c:2246
 msgid "The last selected frame in this clip"
 msgstr "このクリップで選択した最後のフレーム"
 
-#: src/gui.c:2532
+#: src/gui.c:2546
 msgid "Starting...\n"
 msgstr "開始しています...\n"
 
-#: src/gui.c:3074
+#: src/gui.c:3181
 msgid "    Press 'q' to stop recording.  DO NOT COVER THE PLAY WINDOW !   "
 msgstr ""
 "    記録を停止するには'q'を押してください。「再生ウィンドウを覆ってはいけませ"
 "ん！」   "
 
-#: src/gui.c:3521
+#: src/gui.c:3643
 msgid "Frame number to preview"
 msgstr "プレビューするフレーム数"
 
-#: src/gui.c:3538
+#: src/gui.c:3660
 msgid "_Free"
 msgstr "解放(_F)"
 
-#: src/gui.c:3539
+#: src/gui.c:3661
 msgid "Free choice of frame number"
 msgstr "解放するフレーム数"
 
-#: src/gui.c:3543
+#: src/gui.c:3666
 msgid "_Start"
 msgstr "開始(_S)"
 
-#: src/gui.c:3544
+#: src/gui.c:3667
 msgid "Frame number is linked to start frame"
 msgstr "開始フレームのフレーム番号"
 
-#: src/gui.c:3551
+#: src/gui.c:3675
 msgid "_End"
 msgstr "終了(_E)"
 
-#: src/gui.c:3552
+#: src/gui.c:3676
 msgid "Frame number is linked to end frame"
 msgstr "終了フレームのフレーム番号"
 
-#: src/gui.c:3559
+#: src/gui.c:3684
 msgid "_Pointer"
 msgstr "ポインター(_P)"
 
-#: src/gui.c:3560
+#: src/gui.c:3685
 msgid "Frame number is linked to playback pointer"
 msgstr "再生ポインターのフレーム番号"
 
-#: src/gui.c:3581
+#: src/gui.c:3707
 msgid "Rewind"
 msgstr "巻き戻し"
 
-#: src/gui.c:3592 src/dialogs.c:894 src/dialogs.c:896 src/dialogs.c:1817
-#: src/dialogs.c:1819
+#: src/gui.c:3718 src/dialogs.c:960 src/dialogs.c:962 src/dialogs.c:1873
+#: src/dialogs.c:1875
 msgid "Play all"
 msgstr "すべて再生"
 
-#: src/gui.c:3605
+#: src/gui.c:3731
 msgid "Play Selection"
 msgstr "選択範囲を再生"
 
-#: src/gui.c:3619
+#: src/gui.c:3745
 msgid "Loop On/Off"
 msgstr "ループ On/Off"
 
-#: src/gui.c:3693
+#: src/gui.c:3819
 msgid "Start _recording"
 msgstr "記録の開始(_R)"
 
-#: src/gui.c:3698
+#: src/gui.c:3824
 msgid "Stop _recording"
 msgstr "記録の停止(_R)"
 
-#: src/gui.c:3703
+#: src/gui.c:3829
 msgid "_Record Performance"
 msgstr "動作を記録(_R)"
 
-#: src/gui.c:3851
+#: src/gui.c:3974
 msgid "Hide Play Window"
 msgstr "再生ウィンドウを隠す"
 
-#: src/gui.c:4232
+#: src/gui.c:4333
 msgid "Show Play Window"
 msgstr "再生ウィンドウの表示"
 
-#: src/ce_thumbs.c:222
+#: src/ce_thumbs.c:242
 #, c-format
 msgid "Mapped to ctrl-%d"
 msgstr ""
 
-#: src/ce_thumbs.c:276 src/effects.c:85 src/preferences.c:3195
+#: src/ce_thumbs.c:296 src/effects.c:86 src/preferences.c:3247
 msgid "Effects"
 msgstr "エフェクト"
 
-#: src/ce_thumbs.c:279 src/multitrack.c:5615
+#: src/ce_thumbs.c:299 src/multitrack.c:5791
 msgid "Clips"
 msgstr "クリップ"
 
-#: src/ce_thumbs.c:303
+#: src/ce_thumbs.c:323
 #, fuzzy, c-format
 msgid "Show / apply effects to %s\n"
 msgstr "すべてのエフェクトをオフ"
 
-#: src/ce_thumbs.c:315
+#: src/ce_thumbs.c:335
 #, fuzzy, c-format
 msgid "Select clip for %s\n"
 msgstr "クリップセットを削除(_D)"
 
-#: src/ce_thumbs.c:515
+#: src/ce_thumbs.c:536
 msgid "_Pin"
 msgstr ""
 
-#: src/ce_thumbs.c:515
+#: src/ce_thumbs.c:537
 msgid "Pin the parameter box to the window"
 msgstr ""
 
 #. TRANSLATORS: Exabytes
-#: src/utils.c:794
+#: src/utils.c:800
 #, c-format
 msgid "%.2f EB"
 msgstr "%.2f EB"
 
 #. TRANSLATORS: Petabytes
-#: src/utils.c:798
+#: src/utils.c:803
 #, c-format
 msgid "%.2f PB"
 msgstr "%.2f PB"
 
 #. TRANSLATORS: Terabytes
-#: src/utils.c:802
+#: src/utils.c:806
 #, c-format
 msgid "%.2f TB"
 msgstr "%.2f TB"
 
 #. TRANSLATORS: Gigabytes
-#: src/utils.c:806
+#: src/utils.c:809
 #, c-format
 msgid "%.2f GB"
 msgstr "%.2f GB"
 
 #. TRANSLATORS: Megabytes
-#: src/utils.c:810
+#: src/utils.c:812
 #, c-format
 msgid "%.2f MB"
 msgstr "%.2f MB"
 
 #. TRANSLATORS: Kilobytes (1024 bytes)
-#: src/utils.c:814
+#: src/utils.c:815
 #, c-format
 msgid "%.2f KiB"
 msgstr "%.2f KiB"
@@ -3955,7 +3945,7 @@
 msgid "%d bytes"
 msgstr "%d バイト"
 
-#: src/utils.c:1841
+#: src/utils.c:1835
 msgid "Clearing the clipboard"
 msgstr "クリップボードを消去します"
 
@@ -3970,7 +3960,7 @@
 "==============================\n"
 "クリップ「%s」へ変更しました\n"
 
-#: src/utils.c:1880
+#: src/utils.c:1877
 msgid ""
 "\n"
 "==============================\n"
@@ -3980,11 +3970,11 @@
 "==============================\n"
 "空のクリップへ変更しました\n"
 
-#: src/utils.c:1917
+#: src/utils.c:1916
 msgid "(blank)"
 msgstr "（空白）"
 
-#: src/utils.c:1920
+#: src/utils.c:1919
 #, c-format
 msgid ""
 "The set name has been changed from %s to %s. Affected layouts have been "
@@ -3993,7 +3983,7 @@
 "セット名は %s から %s に変更されました。それに伴いレイアウトがアップデートさ"
 "れています。\n"
 
-#: src/utils.c:1928
+#: src/utils.c:1927
 #, c-format
 msgid ""
 "The clip %s is missing from this set.\n"
@@ -4002,7 +3992,7 @@
 "クリップ %s はこのセットにありません。\n"
 "次のレイアウトに必要です:\n"
 
-#: src/utils.c:1932
+#: src/utils.c:1931
 #, c-format
 msgid ""
 "The clip %s has been closed.\n"
@@ -4011,7 +4001,7 @@
 "クリップ %s は既に閉じています。\n"
 "次のレイアウトに必要です:\n"
 
-#: src/utils.c:1937
+#: src/utils.c:1936
 #, c-format
 msgid ""
 "Frames have been shifted in the clip %s.\n"
@@ -4020,7 +4010,7 @@
 "クリップ %s からフレームが移動しました。\n"
 "次のレイアウトに影響します:\n"
 
-#: src/utils.c:1942
+#: src/utils.c:1941
 #, c-format
 msgid ""
 "Frames have been deleted from the clip %s.\n"
@@ -4029,7 +4019,7 @@
 "クリップ %s からフレームが消去されました。\n"
 "次のレイアウトに影響します:\n"
 
-#: src/utils.c:1947
+#: src/utils.c:1946
 #, c-format
 msgid ""
 "Audio has been deleted from the clip %s.\n"
@@ -4038,7 +4028,7 @@
 "クリップ %s から音声が消去されました。\n"
 "次のレイアウトに影響します:\n"
 
-#: src/utils.c:1952
+#: src/utils.c:1951
 #, c-format
 msgid ""
 "Audio has been shifted in clip %s.\n"
@@ -4047,7 +4037,7 @@
 "クリップ %s で音声が移動しました。\n"
 "次のレイアウトに影響します:\n"
 
-#: src/utils.c:1957
+#: src/utils.c:1956
 #, c-format
 msgid ""
 "Audio has been altered in the clip %s.\n"
@@ -4056,7 +4046,7 @@
 "クリップ %s で音声が変更されました。\n"
 "次のレイアウトに影響します:\n"
 
-#: src/utils.c:1962
+#: src/utils.c:1961
 #, c-format
 msgid ""
 "Frames have been altered in the clip %s.\n"
@@ -4065,7 +4055,7 @@
 "クリップ %s でフレームが変更されました。\n"
 "次のレイアウトに影響します:\n"
 
-#: src/utils.c:2135
+#: src/utils.c:2134
 #, c-format
 msgid ""
 "Set %s\n"
@@ -4076,7 +4066,7 @@
 "LiVESの他のプロジェクトで使用されており\n"
 "開くことができません。\n"
 
-#: src/utils.c:2142
+#: src/utils.c:2140
 #, c-format
 msgid ""
 "\n"
@@ -4136,68 +4126,68 @@
 msgid "Removing layout %s\n"
 msgstr "レイアウト %s を削除\n"
 
-#: src/utils.c:3014
+#: src/utils.c:2996
 msgid "Video [opening...]"
 msgstr "映像ファイル [開く...]"
 
-#: src/utils.c:3018
+#: src/utils.c:2999
 #, c-format
 msgid "Video [%.2f sec]"
 msgstr "映像 [%.2f 秒]"
 
-#: src/utils.c:3022
+#: src/utils.c:3002
 msgid "(Undefined)"
 msgstr "(未定義)"
 
-#: src/utils.c:3025
+#: src/utils.c:3004
 msgid "(No video)"
 msgstr "(映像なし)"
 
-#: src/utils.c:3032
+#: src/utils.c:3011
 msgid "(No audio)"
 msgstr "(音声なし)"
 
-#: src/utils.c:3037
+#: src/utils.c:3015
 msgid "Mono  [opening...]"
 msgstr "モノラル [開く...]"
 
-#: src/utils.c:3040
+#: src/utils.c:3017
 msgid "Left Audio [opening...]"
 msgstr "左音声 [開く...]"
 
-#: src/utils.c:3045
+#: src/utils.c:3021
 #, c-format
 msgid "Mono [%.2f sec]"
 msgstr "モノラル [%.2f 秒]"
 
-#: src/utils.c:3048
+#: src/utils.c:3023
 #, c-format
 msgid "Left Audio [%.2f sec]"
 msgstr "左音声 [%.2f 秒]"
 
-#: src/utils.c:3056
+#: src/utils.c:3031
 msgid "Right Audio [opening...]"
 msgstr "右音声 [開く...]"
 
-#: src/utils.c:3059
+#: src/utils.c:3033
 #, c-format
 msgid "Right Audio [%.2f sec]"
 msgstr "右音声 [%.2f 秒]"
 
-#: src/utils.c:3506
+#: src/utils.c:3472
 msgid "LiVES cannot switch to mplayer whilst clips are loading."
 msgstr "LiVESはクリップが読み込み時にmplayerを起動できませんでした。"
 
-#: src/utils.c:3559
+#: src/utils.c:3525
 #, fuzzy
 msgid "LiVES cannot switch to mplayer2 whilst clips are loading."
 msgstr "LiVESはクリップが読み込み時にmplayerを起動できませんでした。"
 
-#: src/utils.c:3809
+#: src/utils.c:3775
 msgid "Cleaning up clip"
 msgstr "クリップを消去します"
 
-#: src/utils.c:3913
+#: src/utils.c:3874
 #, c-format
 msgid ""
 "\n"
@@ -4212,30 +4202,29 @@
 "\n"
 "上書きしますか ?\n"
 
-#: src/utils.c:4305 src/utils.c:4337 src/multitrack.c:4503
+#: src/utils.c:4250 src/utils.c:4280 src/multitrack.c:4672
 #, c-format
 msgid "_Undo %s"
 msgstr "%sを元に戻す(_U)"
 
-#: src/utils.c:4306 src/utils.c:4338 src/multitrack.c:4525
+#: src/utils.c:4251 src/utils.c:4281 src/multitrack.c:4693
 #, c-format
 msgid "_Redo %s"
 msgstr "%sをやり直す(_R)"
 
-#: src/utils.c:4363
+#: src/utils.c:4305
 msgid "-------------Selection------------"
 msgstr "------------- 選択範囲 ------------"
 
-#. TRANSLATORS: - try to keep the text of the middle part the same length, by deleting "-" if necessary
-#: src/utils.c:4371
+#: src/utils.c:4313
 msgid " sec ] ----------Selection---------- [ "
 msgstr " 秒 ] ---------- 選択範囲 ---------- [ "
 
-#: src/utils.c:4371
+#: src/utils.c:4314
 msgid " frames ] ----------"
 msgstr " フレーム ] ----------"
 
-#: src/utils.c:5360
+#: src/utils.c:5302
 msgid ""
 "Your version of mplayer/ffmpeg may be broken !\n"
 "See http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2071\n"
@@ -4246,11 +4235,11 @@
 "Try running Help/Troubleshoot for more information."
 msgstr ""
 
-#: src/saveplay.c:178
+#: src/saveplay.c:179
 msgid "Examining file header"
 msgstr "ファイルヘッダを検査"
 
-#: src/saveplay.c:315 src/saveplay.c:789
+#: src/saveplay.c:316 src/saveplay.c:779
 #, c-format
 msgid "Opening %s"
 msgstr "%sを開きます"
@@ -4260,36 +4249,36 @@
 msgid "Opening %s start time %.2f sec. frames %d"
 msgstr "%sを開きます。開始時刻%.2f秒、%dフレーム"
 
-#: src/saveplay.c:326 src/saveplay.c:4001
+#: src/saveplay.c:326 src/saveplay.c:3927
 msgid " without sound"
 msgstr " 音声なし"
 
-#: src/saveplay.c:396
+#: src/saveplay.c:395
 #, c-format
 msgid "Opening audio for %s"
 msgstr "音声 %s を開く"
 
-#: src/saveplay.c:557
+#: src/saveplay.c:554
 #, c-format
 msgid "Auto trimming %.2f seconds of audio at start..."
 msgstr ""
 
-#: src/saveplay.c:567
+#: src/saveplay.c:562
 #, fuzzy, c-format
 msgid "Auto trimming %.2f seconds of audio at end..."
 msgstr "%s は %.2f秒から%.2f秒まで..."
 
-#: src/saveplay.c:584
+#: src/saveplay.c:577
 #, c-format
 msgid "Auto padding with %.2f seconds of silence at start..."
 msgstr ""
 
-#: src/saveplay.c:599
+#: src/saveplay.c:590
 #, c-format
 msgid "Auto padding with %.2f seconds of silence at end..."
 msgstr ""
 
-#: src/saveplay.c:671
+#: src/saveplay.c:661
 #, c-format
 msgid ""
 "\n"
@@ -4308,11 +4297,11 @@
 "\n"
 "本当に続けますか？"
 
-#: src/saveplay.c:685
+#: src/saveplay.c:676
 msgid " - please be patient."
 msgstr " - 我慢してください。"
 
-#: src/saveplay.c:938
+#: src/saveplay.c:926
 msgid ""
 "\n"
 "\n"
@@ -4324,7 +4313,7 @@
 "LiVESは、音声もしくは映像を取得できませんでした。\n"
 "詳細はターミナルウィンドウで確認してください。\n"
 
-#: src/saveplay.c:940
+#: src/saveplay.c:928
 msgid ""
 "\n"
 "\n"
@@ -4334,7 +4323,7 @@
 "\n"
 "このファイルを開くにはmplayerをインストールする必要があります。\n"
 
-#: src/saveplay.c:948
+#: src/saveplay.c:934
 msgid ""
 "\n"
 "\n"
@@ -4346,29 +4335,29 @@
 "「ツール | 設定 | デコーディング」で\n"
 "「映像ファイルを開くコマンド」の設定を確認してください。\n"
 
-#: src/saveplay.c:1014
+#: src/saveplay.c:995
 msgid "Adding image..."
 msgstr "画像を追加..."
 
-#: src/saveplay.c:1108
+#: src/saveplay.c:1089
 #, c-format
 msgid "Subtitles were saved as %s\n"
 msgstr "字幕を以下のファイルに保存しました: %s\n"
 
-#: src/saveplay.c:1192
+#: src/saveplay.c:1171
 #, c-format
 msgid "LiVES: Save Frame %d as..."
 msgstr "LiVES: %d フレームに名前を付けて保存..."
 
-#: src/saveplay.c:1195
+#: src/saveplay.c:1174
 msgid "LiVES: Save Frame as..."
 msgstr "LiVES: フレームに名前を付けて保存..."
 
-#: src/saveplay.c:1322
+#: src/saveplay.c:1303
 msgid "LiVES: Save Clip as..."
 msgstr "LiVES: クリップに名前を付けて保存..."
 
-#: src/saveplay.c:1390
+#: src/saveplay.c:1369
 msgid ""
 "Saving your video could lead to a loss of quality !\n"
 "You are strongly advised to 'Save As' to a new file.\n"
@@ -4380,36 +4369,36 @@
 "\n"
 "それでも続けますか ?"
 
-#: src/saveplay.c:1517 src/saveplay.c:1683 src/saveplay.c:1762
-#: src/saveplay.c:4014
+#: src/saveplay.c:1494 src/saveplay.c:1659 src/saveplay.c:1738
+#: src/saveplay.c:3940
 msgid "Pulling frames from clip"
 msgstr "クリップからフレームを抽出"
 
-#: src/saveplay.c:1588 src/saveplay.c:1727
+#: src/saveplay.c:1565 src/saveplay.c:1703
 msgid "Linking selection"
 msgstr "リンクの選択"
 
-#: src/saveplay.c:1779
+#: src/saveplay.c:1755
 msgid " (with no sound)\n"
 msgstr " (音声なし)\n"
 
-#: src/saveplay.c:1786
+#: src/saveplay.c:1761
 #, c-format
 msgid "Saving frames %d to %d%s as \"%s\" : encoder = %s : format = %s..."
 msgstr ""
 "フレーム%dから%d%sを\"%s\"として保存 : エンコーダ = %s : フォーマット = %s..."
 
-#: src/saveplay.c:1790
+#: src/saveplay.c:1765
 #, c-format
 msgid "Saving frames 1 to %d%s as \"%s\" : encoder %s : format = %s..."
 msgstr ""
 "フレーム1から%d%sを\"%s\"として保存 : エンコーダ = %s : フォーマット = %s..."
 
-#: src/saveplay.c:1909
+#: src/saveplay.c:1890
 msgid "Saving [can take a long time]"
 msgstr "保存 [しばらく時間がかかるかもしれません]"
 
-#: src/saveplay.c:2057
+#: src/saveplay.c:2044
 msgid ""
 "\n"
 "\n"
@@ -4419,33 +4408,33 @@
 "\n"
 "エンコーダエラー - 出力ファイルは作成されませんでした !\n"
 
-#: src/saveplay.c:2094
+#: src/saveplay.c:2081
 msgid "Clearing letterbox"
 msgstr "レターボックスの消去"
 
-#: src/saveplay.c:2183
+#: src/saveplay.c:2168
 #, c-format
 msgid "File size was %s\n"
 msgstr "ファイルサイズ %s\n"
 
-#: src/saveplay.c:2284
+#: src/saveplay.c:2265
 msgid "recording aborted by preview.\n"
 msgstr "プレビューにより記録は中止されました。\n"
 
-#: src/saveplay.c:2288
+#: src/saveplay.c:2268
 msgid "recording aborted by clipboard playback.\n"
 msgstr "クリップボードの再生により記録は中止されました。\n"
 
-#: src/saveplay.c:2291
+#: src/saveplay.c:2270
 msgid "Recording performance..."
 msgstr "パフォーマンスを記録します..."
 
-#: src/saveplay.c:3293
+#: src/saveplay.c:3251
 #, c-format
 msgid "Average FPS was %.4f\n"
 msgstr "平均のFPSは%.4fです\n"
 
-#: src/saveplay.c:3299
+#: src/saveplay.c:3256
 msgid ""
 "\n"
 "\n"
@@ -4459,16 +4448,21 @@
 "ツール--->すべてリサイズ をクリックして\n"
 "すべてのフレームを現在のサイズにリサイズしてください。\n"
 
-#: src/saveplay.c:3479
+#: src/saveplay.c:3429
 msgid "Unknown"
 msgstr "不明"
 
-#: src/saveplay.c:3588 src/saveplay.c:4585
+#: src/saveplay.c:3538 src/saveplay.c:4502
 #, c-format
 msgid "Untitled%d"
 msgstr "無題%d"
 
-#: src/saveplay.c:3633
+#: src/saveplay.c:3567
+#, c-format
+msgid "%d frames are enough !\n"
+msgstr "%d フレームで十分です !\n"
+
+#: src/saveplay.c:3579
 #, c-format
 msgid ""
 "\n"
@@ -4479,7 +4473,7 @@
 "クリップ %s のファイル情報の取得でエラーが発生しました。\n"
 "このクリップに問題が発生している可能性があります。\n"
 
-#: src/saveplay.c:3723
+#: src/saveplay.c:3667
 #, c-format
 msgid ""
 "\n"
@@ -4490,12 +4484,12 @@
 "無効な再生速度です。 %.3ffpsの標準設定を使います。 \n"
 "標準値は「ツール | 設定 | その他」で指定できます。\n"
 
-#: src/saveplay.c:3735
+#: src/saveplay.c:3677
 #, c-format
 msgid "Playback speed was adjusted to %.3f frames per second to fit audio.\n"
 msgstr "再生速度は音声に合わせて %.3f フレーム/秒に調整しました。\n"
 
-#: src/saveplay.c:3754
+#: src/saveplay.c:3694
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d *bpp=Greyscale* fps=%.3f\n"
@@ -4504,7 +4498,7 @@
 "フレーム=%d タイプ=%s サイズ=%dx%d *bpp=グレースケール* fps=%.3f\n"
 "音声:"
 
-#: src/saveplay.c:3758 src/saveplay.c:4762
+#: src/saveplay.c:3698 src/saveplay.c:4671
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d bpp=%d fps=%.3f\n"
@@ -4513,54 +4507,54 @@
 "フレーム=%d タイプ=%s サイズ=%dx%d bpp=%d fps=%.3f\n"
 "音声:"
 
-#: src/saveplay.c:3762 src/saveplay.c:4766
+#: src/saveplay.c:3703 src/saveplay.c:4676
 #, c-format
 msgid "%s none\n"
 msgstr "%s なし\n"
 
-#: src/saveplay.c:3774
+#: src/saveplay.c:3714
 #, fuzzy, c-format
 msgid " - Author: %s\n"
 msgstr "作者: %s"
 
-#: src/saveplay.c:3779
+#: src/saveplay.c:3717
 #, fuzzy, c-format
 msgid " - Title: %s\n"
 msgstr " - コメント: %s\n"
 
-#: src/saveplay.c:3784
+#: src/saveplay.c:3720
 #, c-format
 msgid " - Comment: %s\n"
 msgstr " - コメント: %s\n"
 
-#: src/saveplay.c:3897
+#: src/saveplay.c:3829
 #, c-format
 msgid "Saving frame %d as %s..."
 msgstr "フレーム%dを%sとして保存..."
 
-#: src/saveplay.c:3996
+#: src/saveplay.c:3924
 #, c-format
 msgid "Backing up %s to %s"
 msgstr "%sから%sへバックアップします"
 
-#: src/saveplay.c:4049
+#: src/saveplay.c:3975
 msgid "Backing up"
 msgstr "バックアップします"
 
-#: src/saveplay.c:4083
+#: src/saveplay.c:4009
 msgid "performance data was backed up..."
 msgstr "パフォーマンスのデータをバックアップしました..."
 
-#: src/saveplay.c:4661
+#: src/saveplay.c:4574
 #, c-format
 msgid "Restoring %s..."
 msgstr "%sをリストアします..."
 
-#: src/saveplay.c:4692
+#: src/saveplay.c:4603
 msgid "Restoring"
 msgstr "リストアします"
 
-#: src/saveplay.c:4714
+#: src/saveplay.c:4625
 #, c-format
 msgid ""
 "\n"
@@ -4574,22 +4568,22 @@
 "LiVESはリストアできませんでした。\n"
 
 #. TRANSLATORS: rec(ord) %.2f M(ega)B(ytes)
-#: src/saveplay.c:5207
+#: src/saveplay.c:5118
 #, c-format
 msgid "rec %.2f MB"
 msgstr "%.2fMBを記録しました"
 
-#: src/saveplay.c:5213
+#: src/saveplay.c:5123
 #, c-format
 msgid "!rec %.2f MB"
 msgstr "%.2fMBを記録しました"
 
 #. TRANSLATORS: rec(ord) ?? M(ega)B(ytes)
-#: src/saveplay.c:5216
+#: src/saveplay.c:5126
 msgid "rec ?? MB"
 msgstr "rec ?? MB"
 
-#: src/saveplay.c:5241
+#: src/saveplay.c:5151
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -4600,7 +4594,7 @@
 "%s のディスクの空き領域が %ld GB を切ったため記録を停止しています！\n"
 "記録の停止レベルは「設定」で設定することができます。\n"
 
-#: src/saveplay.c:5535
+#: src/saveplay.c:5447
 msgid ""
 "\n"
 "Files from a previous run of LiVES were found.\n"
@@ -4610,47 +4604,69 @@
 "LiVESを前回起動した際のファイルを発見しました。\n"
 "復元を試しますか?\n"
 
-#: src/saveplay.c:5557
+#: src/saveplay.c:5469
 msgid "Recovering files"
 msgstr "ファイルの復元"
 
-#: src/saveplay.c:5560
+#: src/saveplay.c:5472
 msgid "Recovering files..."
 msgstr "ファイルを復元しています..."
 
-#: src/dialogs.c:72
+#: src/dialogs.c:71
 msgid "Show affected _layouts"
 msgstr "影響を受けるレイアウト(_L)"
 
-#: src/dialogs.c:128
+#: src/dialogs.c:113
+msgid ""
+"Do _not show this warning any more\n"
+"(can be turned back on from Preferences/Warnings)"
+msgstr ""
+"これ以上の警告を表示しない(_N)\n"
+"(「設定 | 警告」から変更可能です)"
+
+#: src/dialogs.c:127
 msgid "_Recover disk space"
 msgstr "ディスク容量を回復(_R)"
 
-#: src/dialogs.c:143
+#: src/dialogs.c:142
 msgid " _Advanced Settings >>"
 msgstr " 詳細設定(_A) >>"
 
-#: src/dialogs.c:184
+#: src/dialogs.c:183 src/dialogs.c:221
 msgid "LiVES: - Warning !"
 msgstr "LiVES: - 警告 !"
 
 #: src/dialogs.c:194
+#, fuzzy
+msgid "LiVES: - Error !"
+msgstr "LiVES: - ファイルエラー"
+
+#: src/dialogs.c:204
+#, fuzzy
+msgid "LiVES: - Information"
+msgstr "LiVES: %s の情報"
+
+#: src/dialogs.c:230
 msgid "LiVES: - Question"
 msgstr "LiVES: - 質問"
 
-#: src/dialogs.c:204
+#: src/dialogs.c:239
 msgid "LiVES: - File Error"
 msgstr "LiVES: - ファイルエラー"
 
-#: src/dialogs.c:208
+#: src/dialogs.c:241
 msgid "_Abort"
 msgstr "中止(_A)"
 
-#: src/dialogs.c:213
+#: src/dialogs.c:246
 msgid "_Retry"
 msgstr "再試行(_R)"
 
-#: src/dialogs.c:597
+#: src/dialogs.c:306
+msgid "Show _Details"
+msgstr "詳細を表示(_D)"
+
+#: src/dialogs.c:657
 #, c-format
 msgid ""
 "FREE SPACE IN THE PARTITION CONTAINING\n"
@@ -4667,7 +4683,7 @@
 "\n"
 "(ディスク警告のレベルは「設定」で設定することができます。)"
 
-#: src/dialogs.c:615
+#: src/dialogs.c:676
 #, c-format
 msgid ""
 "Free space in the partition containing\n"
@@ -4686,11 +4702,11 @@
 "(次回の警告は %s になると表示されます。ディスク警告のレベルは「設定」で設定す"
 "ることができます。)"
 
-#: src/dialogs.c:627
+#: src/dialogs.c:688
 msgid "Audio players cannot be switched during playback."
 msgstr "再生中は音声プレーヤーを変更できません。"
 
-#: src/dialogs.c:632
+#: src/dialogs.c:694
 msgid ""
 "\n"
 "\n"
@@ -4702,18 +4718,18 @@
 "LiVESはメモリ不足により、この操作を実行できませんでした。\n"
 "他のアプリケーションを終了させてから試してください。\n"
 
-#: src/dialogs.c:752
+#: src/dialogs.c:820
 msgid "Processing has been paused."
 msgstr "処理を一時停止しています。"
 
-#: src/dialogs.c:937
+#: src/dialogs.c:1002
 #, c-format
 msgid ""
 "\n"
 "%s%d%% done. Time remaining: %u sec%s\n"
 msgstr ""
 
-#: src/dialogs.c:1335
+#: src/dialogs.c:1391
 #, c-format
 msgid ""
 "\n"
@@ -4722,7 +4738,7 @@
 "\n"
 "%d/%d フレームを開きました。残り時間は %u 秒です。\n"
 
-#: src/dialogs.c:1337
+#: src/dialogs.c:1393
 #, c-format
 msgid ""
 "\n"
@@ -4731,7 +4747,7 @@
 "\n"
 "%d/%d フレームを開いています。\n"
 
-#: src/dialogs.c:1341
+#: src/dialogs.c:1396
 #, c-format
 msgid ""
 "\n"
@@ -4740,7 +4756,7 @@
 "\n"
 "%d フレームを開きました。\n"
 
-#: src/dialogs.c:1940
+#: src/dialogs.c:1993
 #, c-format
 msgid ""
 "\n"
@@ -4749,7 +4765,7 @@
 "\n"
 "残り時間: %d 秒"
 
-#: src/dialogs.c:1988
+#: src/dialogs.c:2040
 #, c-format
 msgid ""
 "\n"
@@ -4760,7 +4776,7 @@
 "ごめん、LiVESはいちどに%d個のファイルしか開けません。\n"
 "ファイルを閉じてから、再び試してください。"
 
-#: src/dialogs.c:1994
+#: src/dialogs.c:2047
 #, c-format
 msgid ""
 "LiVES was unable to write to its temporary directory.\n"
@@ -4779,7 +4795,7 @@
 "\n"
 "このディレクトリが書き込み可能であることを確認してください。"
 
-#: src/dialogs.c:2005
+#: src/dialogs.c:2059
 #, fuzzy
 msgid ""
 "\n"
@@ -4790,13 +4806,13 @@
 "LiVESは現在のところ正しく動作するために'mplayer'または'sox'を必要とします。い"
 "ずれかひとつもしくは両方をインストールして、再び試してください。\n"
 
-#: src/dialogs.c:2010
+#: src/dialogs.c:2064
 msgid ""
 "Audio was not loaded; please install mplayer or mplayer2 if you expected "
 "audio for this clip.\n"
 msgstr ""
 
-#: src/dialogs.c:2014
+#: src/dialogs.c:2069
 msgid ""
 "Audio resampling is required for this format.\n"
 "Please install 'sox'\n"
@@ -4807,7 +4823,7 @@
 "「ツール | 設定 | エンコーディング」で他のエンコーダフォーマットに変更してく"
 "ださい。\n"
 
-#: src/dialogs.c:2019
+#: src/dialogs.c:2075
 msgid ""
 "\n"
 "\n"
@@ -4820,7 +4836,7 @@
 "ん。\n"
 "「ツール | 設定 | エンコーディング」で音声コーデックを指定してください。\n"
 
-#: src/dialogs.c:2024
+#: src/dialogs.c:2080
 msgid ""
 "This layout includes generated frames.\n"
 "It cannot be saved, you must render it to a clip first.\n"
@@ -4829,7 +4845,7 @@
 "フレームは保存することができません。先にクリップへレンダリング出力してくださ"
 "い。\n"
 
-#: src/dialogs.c:2029
+#: src/dialogs.c:2085
 msgid ""
 "This layout includes generated or recorded audio.\n"
 "It cannot be saved, you must render it to a clip first.\n"
@@ -4837,7 +4853,7 @@
 "このレイアウトには、生成または記録された音声が含まれています。\n"
 "保存することができません。まずクリップにレンダリングする必要があります。\n"
 
-#: src/dialogs.c:2039 src/dialogs.c:2137
+#: src/dialogs.c:2095 src/dialogs.c:2189
 #, c-format
 msgid ""
 "\n"
@@ -4848,7 +4864,7 @@
 "\n"
 "%sフォーマットの制限によります\n"
 
-#: src/dialogs.c:2059
+#: src/dialogs.c:2115
 msgid ""
 "LiVES recommends the following settings:\n"
 "\n"
@@ -4856,43 +4872,43 @@
 "LiVESは以下の設定を推奨します:\n"
 "\n"
 
-#: src/dialogs.c:2065 src/dialogs.c:2174 src/resample.c:850
+#: src/dialogs.c:2121 src/dialogs.c:2225 src/resample.c:839
 msgid ", signed"
 msgstr "符号付き"
 
-#: src/dialogs.c:2066 src/dialogs.c:2175 src/resample.c:853
+#: src/dialogs.c:2122 src/dialogs.c:2226 src/resample.c:841
 msgid ", unsigned"
 msgstr "符号なし"
 
-#: src/dialogs.c:2070 src/dialogs.c:2179 src/resample.c:858
+#: src/dialogs.c:2126 src/dialogs.c:2230 src/resample.c:846
 msgid ", little-endian"
 msgstr "リトルエンディアン"
 
-#: src/dialogs.c:2071 src/dialogs.c:2180 src/resample.c:861
+#: src/dialogs.c:2127 src/dialogs.c:2231 src/resample.c:848
 msgid ", big-endian"
 msgstr "ビッグエンディアン"
 
-#: src/dialogs.c:2077
+#: src/dialogs.c:2132
 #, c-format
 msgid "Use an audio rate of %d Hz%s%s\n"
 msgstr "音声レート %d Hz%s%s\n"
 
-#: src/dialogs.c:2085
+#: src/dialogs.c:2140
 #, c-format
 msgid "Set video rate to %.3f frames per second\n"
 msgstr "映像のレートを %.3f フレーム/秒に設定\n"
 
-#: src/dialogs.c:2089
+#: src/dialogs.c:2143
 #, c-format
 msgid "Set video rate to %d:%d frames per second\n"
 msgstr "映像のレートを %d:%d フレーム/秒に設定\n"
 
-#: src/dialogs.c:2094 src/dialogs.c:2209
+#: src/dialogs.c:2148 src/dialogs.c:2258
 #, c-format
 msgid "Set video size to %d x %d pixels\n"
 msgstr "映像のサイズを %d x %d ピクセルに設定\n"
 
-#: src/dialogs.c:2102 src/dialogs.c:2208
+#: src/dialogs.c:2156 src/dialogs.c:2257
 msgid ""
 "\n"
 "You may wish to:\n"
@@ -4900,36 +4916,36 @@
 "\n"
 "お好みの動作:\n"
 
-#: src/dialogs.c:2105 src/dialogs.c:2200
+#: src/dialogs.c:2159 src/dialogs.c:2249
 #, c-format
 msgid "resize video to %d x %d pixels\n"
 msgstr "映像を %d × %d ピクセルにリサイズします\n"
 
-#: src/dialogs.c:2110
+#: src/dialogs.c:2163
 msgid "disable audio, since the target encoder cannot encode audio\n"
 msgstr ""
 "音声を無効にします。ターゲットエンコーダは音声をエンコードできないためです\n"
 
-#: src/dialogs.c:2170
+#: src/dialogs.c:2221
 msgid "LiVES must:\n"
 msgstr "LiVES に必要:\n"
 
-#: src/dialogs.c:2185
+#: src/dialogs.c:2235
 #, c-format
 msgid "resample audio to %d Hz%s%s\n"
 msgstr "音声を %d Hz%s%s にリサンプリング\n"
 
-#: src/dialogs.c:2192
+#: src/dialogs.c:2242
 #, c-format
 msgid "resample video to %.3f frames per second\n"
 msgstr "映像を %.3f フレーム/秒にリサンプリングします...\n"
 
-#: src/dialogs.c:2196
+#: src/dialogs.c:2245
 #, c-format
 msgid "resample video to %d:%d frames per second\n"
 msgstr "映像を %d:%d フレーム/秒にリサンプリングします...\n"
 
-#: src/dialogs.c:2215
+#: src/dialogs.c:2263
 msgid ""
 "\n"
 "You will be able to undo these changes afterwards.\n"
@@ -4943,7 +4959,7 @@
 "'OK'で続行、'キャンセル'で中止します。\n"
 "\n"
 
-#: src/dialogs.c:2218
+#: src/dialogs.c:2265
 msgid ""
 "\n"
 "Changes applied to the selection will not be permanent.\n"
@@ -4953,7 +4969,7 @@
 "選択範囲に適用された変更は、永久なものではありません。\n"
 "\n"
 
-#: src/dialogs.c:2237
+#: src/dialogs.c:2285
 msgid ""
 "\n"
 "\n"
@@ -4967,7 +4983,7 @@
 "現在、利用可能なメモリが不足しています。\n"
 "ファイルの選択範囲だけで記録してみてください。"
 
-#: src/dialogs.c:2244
+#: src/dialogs.c:2293
 msgid ""
 "The playback speed (fps), or the audio rate\n"
 " of the clipboard does not match\n"
@@ -4985,7 +5001,7 @@
 "\n"
 "続けるにはOKを、挿入を中止するにはキャンセルを押してください。"
 
-#: src/dialogs.c:2253
+#: src/dialogs.c:2304
 #, fuzzy, c-format
 msgid ""
 "When opening a yuvmpeg stream, you should first create a fifo file in:\n"
@@ -5003,11 +5019,11 @@
 "何をしようとしているかを理解している場合のみOKをクリックし、そうでない場合は"
 "キャンセルをクリックしてください。"
 
-#: src/dialogs.c:2305
+#: src/dialogs.c:2356
 msgid "Show Keys"
 msgstr "キーの表示"
 
-#: src/dialogs.c:2306
+#: src/dialogs.c:2358
 msgid ""
 "You can use the following keys during playback to control LiVES:-\n"
 "\n"
@@ -5087,11 +5103,11 @@
 "d ダブルサイズ\n"
 "g ピンポンループ\n"
 
-#: src/dialogs.c:2313
+#: src/dialogs.c:2365
 msgid "Multitrack Keys"
 msgstr "マルチトラックキー"
 
-#: src/dialogs.c:2314
+#: src/dialogs.c:2367
 msgid ""
 "You can use the following keys to control the multitrack window:-\n"
 "\n"
@@ -5131,18 +5147,18 @@
 "\n"
 "ここに挙げた以外のキーに関しては、メニューを参照してください。\n"
 
-#: src/dialogs.c:2322
+#: src/dialogs.c:2375
 msgid "Message History"
 msgstr "メッセージの履歴"
 
-#: src/dialogs.c:2335
+#: src/dialogs.c:2388
 #, c-format
 msgid ""
 "After upgrading/installing, you may need to adjust the <prefix_dir> setting "
 "in your %s file"
 msgstr ""
 
-#: src/dialogs.c:2344
+#: src/dialogs.c:2399
 #, c-format
 msgid ""
 "\n"
@@ -5153,7 +5169,7 @@
 "or change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/dialogs.c:2352
+#: src/dialogs.c:2408
 msgid ""
 "Sorry, unknown audio type.\n"
 "\n"
@@ -5164,11 +5180,11 @@
 " (ファイル名は .mp3, .ogg, .wav, .mod, .xm または .it で終わるものでなければ"
 "なりません)"
 
-#: src/dialogs.c:2353
+#: src/dialogs.c:2409
 msgid "failed (unknown type)\n"
 msgstr "失敗 (不明なタイプ)\n"
 
-#: src/dialogs.c:2358
+#: src/dialogs.c:2415
 msgid ""
 "\n"
 "Do you wish to remove the layout files associated with this set ?\n"
@@ -5178,7 +5194,7 @@
 "このセットに関連付けられたレイアウトファイルを削除しますか？\n"
 "（レイアウトファイルはこのセットで利用できなくなります）\n"
 
-#: src/dialogs.c:2363
+#: src/dialogs.c:2421
 #, c-format
 msgid ""
 "\n"
@@ -5191,7 +5207,7 @@
 "現在のクリップとレイアウトを既存のセットに付け加えるときはOKを、\n"
 "新しい名前を付けるならキャンセルをクリックしてください。\n"
 
-#: src/dialogs.c:2370
+#: src/dialogs.c:2429
 msgid ""
 "\n"
 "Frames from this clip are used in some multitrack layouts.\n"
@@ -5203,7 +5219,7 @@
 "続けても構いませんか?\n"
 "."
 
-#: src/dialogs.c:2374
+#: src/dialogs.c:2433
 msgid ""
 "\n"
 "Audio from this clip is used in some multitrack layouts.\n"
@@ -5215,7 +5231,7 @@
 "続けても構いませんか?\n"
 "."
 
-#: src/dialogs.c:2378
+#: src/dialogs.c:2438
 #, c-format
 msgid ""
 "\n"
@@ -5234,7 +5250,7 @@
 "そうでなければ、キャンセルをクリックしてこのファイルの読み込みをスキップして"
 "ください。\n"
 
-#: src/dialogs.c:2385
+#: src/dialogs.c:2446
 #, c-format
 msgid ""
 "\n"
@@ -5249,7 +5265,7 @@
 "%s\n"
 "を見つけられません。このクリップは読み込みされません。\n"
 
-#: src/dialogs.c:2392
+#: src/dialogs.c:2455
 msgid ""
 "\n"
 "Dear user, the jack developers decided to remove the -Z option from jackd.\n"
@@ -5263,7 +5279,7 @@
 "てください。\n"
 "もしくは、設定で他の音声プレイヤーを選択してください。\n"
 
-#: src/dialogs.c:2396
+#: src/dialogs.c:2460
 msgid ""
 "\n"
 "Unable to start up jack. Please ensure that alsa is set up correctly on your "
@@ -5278,7 +5294,7 @@
 "い。\n"
 "JACKサーバーの自動起動は今回、無効となりました。\n"
 
-#: src/dialogs.c:2402
+#: src/dialogs.c:2466
 msgid ""
 "\n"
 "Unable to connect to jack server. Please start jack before starting LiVES\n"
@@ -5287,7 +5303,7 @@
 "JACKサーバーに接続できません。JACKサーバーを起動してからLiVESを起動してくださ"
 "い。\n"
 
-#: src/dialogs.c:2411
+#: src/dialogs.c:2475
 #, c-format
 msgid ""
 "\n"
@@ -5304,7 +5320,7 @@
 "\n"
 "%s\n"
 
-#: src/dialogs.c:2418
+#: src/dialogs.c:2482
 msgid ""
 "\n"
 "Alternately, you can restart LiVES and select another audio player.\n"
@@ -5312,7 +5328,7 @@
 "\n"
 "もしくは、LiVESを再起動して他の音声プレイヤーを選択してください。\n"
 
-#: src/dialogs.c:2423
+#: src/dialogs.c:2488
 #, c-format
 msgid ""
 "\n"
@@ -5328,7 +5344,7 @@
 "「設定 | マルチトラック」で値を増やしてください。\n"
 "少なくとも %d MB追加することをお勧めします。"
 
-#: src/dialogs.c:2429
+#: src/dialogs.c:2496
 #, c-format
 msgid ""
 "\n"
@@ -5341,7 +5357,7 @@
 "これらを削除することをお勧めします。\n"
 "これらを削除しますか？\n"
 
-#: src/dialogs.c:2436
+#: src/dialogs.c:2504
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for multitrack undo.\n"
@@ -5354,7 +5370,7 @@
 "ファー」で\n"
 "アンドゥメモリーの量を減らしてください。\n"
 
-#: src/dialogs.c:2440
+#: src/dialogs.c:2508
 msgid ""
 "\n"
 "Out of memory for undo.\n"
@@ -5366,7 +5382,7 @@
 "「設定 | マルチトラック | アンドゥバッファー」を用いて\n"
 "アンドゥのためのメモリーを増加してください。\n"
 
-#: src/dialogs.c:2444
+#: src/dialogs.c:2512
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for the multitrack undo buffer.\n"
@@ -5375,21 +5391,21 @@
 "LiVESは、マルチトラックアンドゥバッファーに十分なメモリを確保できませんでし"
 "た。\n"
 
-#: src/dialogs.c:2446
+#: src/dialogs.c:2514
 msgid "or enter a smaller value.\n"
 msgstr "もしくは、もう少し小さな値を入力してください。\n"
 
-#: src/dialogs.c:2448
+#: src/dialogs.c:2516
 msgid "Try again from the clip editor, try closing some other applications\n"
 msgstr ""
 "他のアプリケーションを終了させて、クリップエディターから再試行してくださ"
 "い。\n"
 
-#: src/dialogs.c:2449
+#: src/dialogs.c:2517
 msgid "Try closing some other applications\n"
 msgstr "他のアプリケーションを終了させてみてください。\n"
 
-#: src/dialogs.c:2460
+#: src/dialogs.c:2529
 msgid ""
 "Multitrack is set to 0 audio channels, but this layout has audio.\n"
 "You should adjust the audio settings from the Tools menu.\n"
@@ -5398,14 +5414,14 @@
 "は音声があります。\n"
 "ツールメニューから音声設定を調整してください。\n"
 
-#: src/dialogs.c:2464
+#: src/dialogs.c:2534
 msgid ""
 "The current layout has audio, so audio channels may not be set to zero.\n"
 msgstr ""
 "現在のレイアウトには音声があります。したがって、音声チャンネルはゼロにできま"
 "せん。\n"
 
-#: src/dialogs.c:2468
+#: src/dialogs.c:2539
 msgid ""
 "Multitrack audio preview is only available with the\n"
 "\"jack\" or \"pulse audio\" audio player.\n"
@@ -5415,7 +5431,7 @@
 "JACKサーバーかPulseAudioサーバーでのみ利用できます。\n"
 "「ツール | 設定 | 再生」で設定を変更してください。"
 
-#: src/dialogs.c:2472
+#: src/dialogs.c:2545
 msgid ""
 "Errors were detected in the layout (which may be due to transferring from "
 "another system, or from an older version of LiVES).\n"
@@ -5425,7 +5441,7 @@
 "行が原因かもしれません)。\n"
 "レイアウトのディスクコピーを修復してみますか?\n"
 
-#: src/dialogs.c:2476
+#: src/dialogs.c:2549
 msgid ""
 "LiVES was unable to load the layout.\n"
 "Sorry.\n"
@@ -5433,7 +5449,7 @@
 "LiVESはレイアウトを読み込む事ができませんでした。\n"
 "申し訳ありません。\n"
 
-#: src/dialogs.c:2482
+#: src/dialogs.c:2555
 msgid ""
 "\n"
 "\n"
@@ -5443,7 +5459,7 @@
 "\n"
 "音声レートは0より大きくなくてはいけません。\n"
 
-#: src/dialogs.c:2486
+#: src/dialogs.c:2559
 msgid ""
 "\n"
 "Event list will be very large\n"
@@ -5455,7 +5471,7 @@
 "表示するにはとても長い時間がかかるでしょう。\n"
 "それでも表示しますか?\n"
 
-#: src/dialogs.c:2491
+#: src/dialogs.c:2564
 msgid ""
 "\n"
 "\n"
@@ -5465,7 +5481,7 @@
 "\n"
 "この機能を使うには、'dvgrab'をインストールしなければなりません。\n"
 
-#: src/dialogs.c:2496
+#: src/dialogs.c:2570
 msgid ""
 "\n"
 "\n"
@@ -5479,19 +5495,19 @@
 "JACKサーバーかPulseAudioサーバーでのみ可能です。\n"
 "「ツール | 設定 | 再生」で設定を変更してください。\n"
 
-#: src/dialogs.c:2500
+#: src/dialogs.c:2574
 msgid "Video playback plugin failed to initialise palette !\n"
 msgstr "映像プラグインはパレットの初期化に失敗しました。\n"
 
-#: src/dialogs.c:2504
+#: src/dialogs.c:2579
 msgid "Decoder plugin failed to initialise palette !\n"
 msgstr "デコーダープラグインはパレットの初期化に失敗しました。\n"
 
-#: src/dialogs.c:2509
+#: src/dialogs.c:2584
 msgid "Unable to set framerate of video plugin\n"
 msgstr "映像プラグインのフレームレートを設定できません。\n"
 
-#: src/dialogs.c:2514
+#: src/dialogs.c:2590
 msgid ""
 "After a crash, it is advisable to clean up the disk with\n"
 "File|Clean up disk space\n"
@@ -5499,7 +5515,7 @@
 "クラッシュした場合、「ファイル | ディスクスペースのクリーンアップ」で\n"
 "ディスクをクリーンアップするとよいでしょう\n"
 
-#: src/dialogs.c:2526
+#: src/dialogs.c:2604
 #, c-format
 msgid ""
 "Stream frame size is too large for your network buffers.\n"
@@ -5512,33 +5528,33 @@
 "\n"
 "echo %d > /proc/sys/net/core/rmem_max\n"
 
-#: src/dialogs.c:2714
+#: src/dialogs.c:2800
 msgid "cancelled.\n"
 msgstr "キャンセルされました。\n"
 
-#: src/dialogs.c:2721
+#: src/dialogs.c:2805
 msgid "failed.\n"
 msgstr "失敗。\n"
 
-#: src/dialogs.c:2728
+#: src/dialogs.c:2810
 msgid "done.\n"
 msgstr "完了。\n"
 
-#: src/dialogs.c:2732
+#: src/dialogs.c:2814
 msgid "error in file. Failed.\n"
 msgstr "ファイルのエラー。失敗しました。\n"
 
-#: src/dialogs.c:2766 src/dialogs.c:2815 src/dialogs.c:2839
+#: src/dialogs.c:2848 src/dialogs.c:2897 src/dialogs.c:2921
 #, c-format
 msgid "Additional info: %s\n"
 msgstr "追加情報: %s\n"
 
-#: src/dialogs.c:2769
+#: src/dialogs.c:2851
 #, c-format
 msgid "The error value was %d%s\n"
 msgstr "エラーの値は %d%s です\n"
 
-#: src/dialogs.c:2772
+#: src/dialogs.c:2854
 #, c-format
 msgid ""
 "\n"
@@ -5553,7 +5569,7 @@
 "エラーに関してシステムをチェックしてください。\n"
 "%s%s%s"
 
-#: src/dialogs.c:2818
+#: src/dialogs.c:2900
 #, c-format
 msgid ""
 "\n"
@@ -5568,7 +5584,7 @@
 "考えられるエラー原因を確認してください。\n"
 "%s"
 
-#: src/dialogs.c:2842
+#: src/dialogs.c:2924
 #, c-format
 msgid ""
 "\n"
@@ -5583,7 +5599,7 @@
 "考えられるエラー原因を確認してください。\n"
 "%s"
 
-#: src/dialogs.c:2886
+#: src/dialogs.c:2968
 #, c-format
 msgid ""
 "\n"
@@ -5596,7 +5612,7 @@
 "%s\n"
 "考えられるエラー原因を確認してください。\n"
 
-#: src/dialogs.c:2890
+#: src/dialogs.c:2971
 #, c-format
 msgid ""
 "\n"
@@ -5611,7 +5627,7 @@
 "エラーは以下の通りです\n"
 "%s\n"
 
-#: src/dialogs.c:2921
+#: src/dialogs.c:3002
 #, c-format
 msgid ""
 "\n"
@@ -5624,7 +5640,7 @@
 "%s\n"
 "考えられるエラー原因を確認してください。\n"
 
-#: src/dialogs.c:2925
+#: src/dialogs.c:3005
 #, c-format
 msgid ""
 "\n"
@@ -5639,12 +5655,12 @@
 "エラーは以下の通りです\n"
 "%s\n"
 
-#: src/dialogs.c:2993
+#: src/dialogs.c:3073
 #, c-format
 msgid "Value for \"%s\" could not be read."
 msgstr "\"%s\" の値を読み取れませんでした。"
 
-#: src/dialogs.c:3011
+#: src/dialogs.c:3091
 #, c-format
 msgid ""
 "\n"
@@ -5657,7 +5673,7 @@
 "%s\n"
 "エラーに関してシステムを確認してください。\n"
 
-#: src/dialogs.c:3020
+#: src/dialogs.c:3100
 #, c-format
 msgid ""
 "\n"
@@ -5670,7 +5686,7 @@
 "%s\n"
 "ファイルパーミッションを確認して、もう一度試してください。"
 
-#: src/dialogs.c:3027
+#: src/dialogs.c:3109
 #, c-format
 msgid ""
 "\n"
@@ -5683,7 +5699,7 @@
 "%s\n"
 "ディレクトリの権限を確認した上で、再度試してください。"
 
-#: src/dialogs.c:3034
+#: src/dialogs.c:3116
 #, c-format
 msgid ""
 "\n"
@@ -5691,7 +5707,7 @@
 "%s\n"
 msgstr ""
 
-#: src/dialogs.c:3041
+#: src/dialogs.c:3123
 msgid ""
 "\n"
 "Abort and exit immediately from LiVES\n"
@@ -5701,7 +5717,7 @@
 "処理を中止しLiVESを終了します\n"
 "よろしいですか？\n"
 
-#: src/dialogs.c:3047
+#: src/dialogs.c:3129
 #, c-format
 msgid ""
 "\n"
@@ -5712,7 +5728,7 @@
 "%sは%s形式でフォーマットされたクリップをエンコードすることができません。\n"
 "リストから他のエンコーダーを選択してください。\n"
 
-#: src/dialogs.c:3056
+#: src/dialogs.c:3139
 msgid ""
 "\n"
 "This card is already in use and cannot be opened multiple times.\n"
@@ -5720,7 +5736,7 @@
 "\n"
 "このデバイスはすでに使用中で、何度も開くことはできません。\n"
 
-#: src/dialogs.c:3061
+#: src/dialogs.c:3145
 #, c-format
 msgid ""
 "\n"
@@ -5735,7 +5751,7 @@
 "- 他のプログラムによってこのデバイスが使用中かどうか確認してください。\n"
 "- このデバイスが本当に存在しているかどうか確認してください。\n"
 
-#: src/dialogs.c:3068
+#: src/dialogs.c:3153
 msgid ""
 "\n"
 "This file already has subtitles loaded.\n"
@@ -5745,7 +5761,7 @@
 "このファイルの字幕はすでに読み込まれています。\n"
 "以前の字幕を上書きしますか？\n"
 
-#: src/dialogs.c:3072
+#: src/dialogs.c:3157
 msgid ""
 "\n"
 "LiVES currently only supports subtitles of type .srt and .sub.\n"
@@ -5753,7 +5769,7 @@
 "\n"
 "LiVESでは、現在.srtと.sub形式の字幕ファイルのみサポートしています。\n"
 
-#: src/dialogs.c:3076
+#: src/dialogs.c:3161
 msgid ""
 "\n"
 "Erase all subtitles from this clip.\n"
@@ -5763,7 +5779,7 @@
 "このクリップからすべての字幕ファイルを削除します。\n"
 "よろしいですか？\n"
 
-#: src/dialogs.c:3082
+#: src/dialogs.c:3168
 #, c-format
 msgid ""
 "\n"
@@ -5776,7 +5792,7 @@
 "キャンセルをクリックして他のファイル名を指定するか\n"
 "OKをクリックした上で\"%s\"形式として保存してください。\n"
 
-#: src/dialogs.c:3089
+#: src/dialogs.c:3176
 msgid ""
 "\n"
 "Do you wish to move the current clip sets to the new directory ?\n"
@@ -5786,7 +5802,7 @@
 "現在のクリップセットを新しいディレクトリに移動しますか？\n"
 "（このメッセージの内容がよくわからない場合は、Yesをクリックしてください）\n"
 
-#: src/dialogs.c:3093
+#: src/dialogs.c:3181
 #, c-format
 msgid ""
 "\n"
@@ -5802,7 +5818,7 @@
 "他のLiVESプロジェクトを閉じてからOKをクリックして続行してください。\n"
 "."
 
-#: src/dialogs.c:3099
+#: src/dialogs.c:3188
 msgid ""
 "\n"
 "No video input devices could be found.\n"
@@ -5810,7 +5826,7 @@
 "\n"
 "映像入力のためのデバイスが見つかりません。\n"
 
-#: src/dialogs.c:3103
+#: src/dialogs.c:3192
 msgid ""
 "\n"
 "All video input devices are already in use.\n"
@@ -5818,7 +5834,7 @@
 "\n"
 "映像入力デバイスがすべて使用中です。\n"
 
-#: src/dialogs.c:3107
+#: src/dialogs.c:3196
 msgid ""
 "\n"
 "\n"
@@ -5830,7 +5846,7 @@
 "クリーニングとファイルのコピーを行っています。少し時間がかかります。\n"
 "LiVESを終了したり閉じたりしないでください！\n"
 
-#: src/dialogs.c:3127
+#: src/dialogs.c:3203
 #, c-format
 msgid ""
 "No clips were recovered for set (%s).\n"
@@ -5839,8 +5855,7 @@
 "セット(%s)のクリップは復元されませんでした。\n"
 "セット名の綴りを確認して再度実行してください。\n"
 
-#. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:3136
+#: src/dialogs.c:3214
 #, c-format
 msgid ""
 "\n"
@@ -5858,7 +5873,7 @@
 "ファイル -> ディスク領域をクリーン\n"
 
 #. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:3144
+#: src/dialogs.c:3222
 #, c-format
 msgid ""
 "\n"
@@ -5871,7 +5886,7 @@
 "LiVES バージョン %s にようこそ！\n"
 "\n"
 
-#: src/dialogs.c:3150
+#: src/dialogs.c:3228
 msgid ""
 "\n"
 "You must have autolives.pl installed and in your path to use this toy.\n"
@@ -5882,7 +5897,7 @@
 "ります。\n"
 "パッケージディストリビューターに相談してください。\n"
 
-#: src/dialogs.c:3154
+#: src/dialogs.c:3232
 msgid ""
 "\n"
 "You must have a minimum of one clip loaded to use this toy.\n"
@@ -5891,7 +5906,7 @@
 "このトイを利用するには、少なくとも1個のクリップが読み込まれている必要がありま"
 "す。\n"
 
-#: src/dialogs.c:3158
+#: src/dialogs.c:3236
 msgid ""
 "\n"
 "LiVES lost its connection to jack and was unable to reconnect.\n"
@@ -5901,7 +5916,7 @@
 "LiVES は JACK との接続が切れてしまい、再接続できませんでした。\n"
 "LiVES の再起動をお勧めします。\n"
 
-#: src/dialogs.c:3162
+#: src/dialogs.c:3240
 msgid ""
 "\n"
 "LiVES lost its connection to pulseaudio and was unable to reconnect.\n"
@@ -5911,7 +5926,7 @@
 "LiVES は PulseAudio との接続が切れてしまい、再接続できませんでした。\n"
 "LiVES の再起動をお勧めします。\n"
 
-#: src/dialogs.c:3175
+#: src/dialogs.c:3254
 #, c-format
 msgid ""
 "\n"
@@ -5924,240 +5939,240 @@
 "ローカルネットワーク接続を開こうとしています。 (UDP port %d)\n"
 "許可しますか? (このセッション限定です)\n"
 
-#: src/effects.c:60
+#: src/effects.c:61
 msgid "generator"
 msgstr "ジェネレーター"
 
-#: src/effects.c:61
+#: src/effects.c:62
 msgid "Generators"
 msgstr "ジェネレーター"
 
-#: src/effects.c:63
+#: src/effects.c:64
 msgid "audio generator"
 msgstr ""
 
-#: src/effects.c:64
+#: src/effects.c:65
 msgid "Audio Generators"
 msgstr ""
 
-#: src/effects.c:66
+#: src/effects.c:67
 msgid "audio/video generator"
 msgstr ""
 
-#: src/effects.c:67
+#: src/effects.c:68
 msgid "Audio/Video Generators"
 msgstr ""
 
-#: src/effects.c:69
+#: src/effects.c:70
 msgid "data generator"
 msgstr ""
 
-#: src/effects.c:70
+#: src/effects.c:71
 msgid "Data Generators"
 msgstr ""
 
-#: src/effects.c:72
+#: src/effects.c:73
 msgid "data visualiser"
 msgstr ""
 
-#: src/effects.c:73
+#: src/effects.c:74
 msgid "Data Visualisers"
 msgstr ""
 
-#: src/effects.c:75
+#: src/effects.c:76
 msgid "data processor"
 msgstr ""
 
-#: src/effects.c:76
+#: src/effects.c:77
 msgid "Data Processors"
 msgstr ""
 
-#: src/effects.c:78
+#: src/effects.c:79
 msgid "data source"
 msgstr ""
 
-#: src/effects.c:79
+#: src/effects.c:80
 msgid "Data Sources"
 msgstr ""
 
-#: src/effects.c:81
+#: src/effects.c:82
 msgid "transition"
 msgstr "トランジション"
 
-#: src/effects.c:82
+#: src/effects.c:83
 msgid "Transitions"
 msgstr "トランジション"
 
-#: src/effects.c:84
+#: src/effects.c:85
 msgid "effect"
 msgstr "エフェクト"
 
-#: src/effects.c:87 src/rfx-builder.c:187
+#: src/effects.c:88 src/rfx-builder.c:187
 msgid "utility"
 msgstr "ユーティリティ"
 
-#: src/effects.c:88
+#: src/effects.c:89
 msgid "Utilities"
 msgstr "ユーティリティ"
 
-#: src/effects.c:90
+#: src/effects.c:91
 msgid "compositor"
 msgstr "コンポジット"
 
-#: src/effects.c:91
+#: src/effects.c:92
 msgid "Compositors"
 msgstr "コンポジット"
 
-#: src/effects.c:93
+#: src/effects.c:94
 msgid "tap"
 msgstr "タップ"
 
-#: src/effects.c:94
+#: src/effects.c:95
 msgid "Taps"
 msgstr "タップ"
 
-#: src/effects.c:96
+#: src/effects.c:97
 msgid "splitter"
 msgstr "スプリッター"
 
-#: src/effects.c:97
+#: src/effects.c:98
 msgid "Splitters"
 msgstr "スプリッター"
 
-#: src/effects.c:99
+#: src/effects.c:100
 msgid "converter"
 msgstr "コンバーター"
 
-#: src/effects.c:100
+#: src/effects.c:101
 msgid "Converters"
 msgstr "コンバーター"
 
-#: src/effects.c:102
+#: src/effects.c:103
 msgid "analyser"
 msgstr "アナライザー"
 
-#: src/effects.c:103
+#: src/effects.c:104
 msgid "Analysers"
 msgstr "アナライザー"
 
-#: src/effects.c:108
+#: src/effects.c:109
 msgid "audio/video"
 msgstr "音声/映像"
 
-#: src/effects.c:109
+#: src/effects.c:110
 msgid "Audio/Video Transitions"
 msgstr "音声/映像トランジション"
 
-#: src/effects.c:111
+#: src/effects.c:112
 msgid "video only"
 msgstr "映像のみ"
 
-#: src/effects.c:112
+#: src/effects.c:113
 msgid "Video only Transitions"
 msgstr "映像のみのトランジション"
 
-#: src/effects.c:114 src/multitrack.c:10740
+#: src/effects.c:115 src/multitrack.c:10962
 msgid "audio only"
 msgstr "音声のみ"
 
-#: src/effects.c:115
+#: src/effects.c:116
 msgid "Audio only Transitions"
 msgstr "音声のみのトランジション"
 
-#: src/effects.c:117 src/effects.c:120 src/multitrack.c:18757
+#: src/effects.c:118 src/effects.c:121 src/multitrack.c:19097
 msgid "audio"
 msgstr "音声"
 
-#: src/effects.c:118
+#: src/effects.c:119
 msgid "Audio Mixers"
 msgstr "音声ミキサー"
 
-#: src/effects.c:121
+#: src/effects.c:122
 msgid "Audio Effects"
 msgstr "音声エフェクト"
 
-#: src/effects.c:123
+#: src/effects.c:124
 msgid "video"
 msgstr ""
 
-#: src/effects.c:124
+#: src/effects.c:125
 msgid "Video Effects"
 msgstr ""
 
-#: src/effects.c:126
+#: src/effects.c:127
 msgid "audio volume controller"
 msgstr "音声ボリュームコントローラー"
 
-#: src/effects.c:127
+#: src/effects.c:128
 msgid "Audio Volume Controllers"
 msgstr "音声ボリュームコントローラー"
 
-#: src/effects.c:129
+#: src/effects.c:130
 msgid "video analyser"
 msgstr "映像アナライザー"
 
-#: src/effects.c:130
+#: src/effects.c:131
 msgid "Video analysers"
 msgstr "映像アナライザー"
 
-#: src/effects.c:132
+#: src/effects.c:133
 msgid "audio analyser"
 msgstr "音声アナライザー"
 
-#: src/effects.c:133
+#: src/effects.c:134
 msgid "Audio Analysers"
 msgstr ""
 
-#: src/effects.c:137 src/plugins.c:2559 src/plugins.c:2573
+#: src/effects.c:138 src/plugins.c:2507 src/plugins.c:2521
 msgid "unknown"
 msgstr "不明"
 
-#: src/effects.c:238
+#: src/effects.c:235
 #, c-format
 msgid "%s all frames..."
 msgstr "%s すべてのフレーム..."
 
-#: src/effects.c:243
+#: src/effects.c:239
 #, c-format
 msgid "%s clipboard into frames %d to %d..."
 msgstr "%s クリップボードの %d フレームから %dフレーム..."
 
-#: src/effects.c:250
+#: src/effects.c:245
 #, c-format
 msgid "%s to clipboard..."
 msgstr "%s をクリップボードへ..."
 
-#: src/effects.c:254
+#: src/effects.c:248
 #, c-format
 msgid "%s to new clip..."
 msgstr "%s を新しいクリップへ..."
 
-#: src/effects.c:259
+#: src/effects.c:252
 #, c-format
 msgid "%s frames %d to %d..."
 msgstr "%sフレーム%dから%d..."
 
-#: src/effects.c:290
+#: src/effects.c:283
 #, c-format
 msgid "%s clipboard with selection"
 msgstr "%s クリップボードと選択範囲"
 
-#: src/effects.c:295
+#: src/effects.c:287
 #, c-format
 msgid "%s to clipboard"
 msgstr "%s をクリップボードへ"
 
-#: src/effects.c:299
+#: src/effects.c:290
 #, c-format
 msgid "%s to new clip"
 msgstr "%s を新しいクリップへ"
 
-#: src/effects.c:304
+#: src/effects.c:294
 #, c-format
 msgid "%s frames %d to %d"
 msgstr "%sフレーム%dから%d"
 
-#: src/effects.c:456 src/effects.c:523
+#: src/effects.c:443 src/effects.c:507
 msgid ""
 "\n"
 "No frames were generated.\n"
@@ -6165,46 +6180,46 @@
 "\n"
 "フレームは生成されませんでした。\n"
 
-#: src/effects-weed.c:431
+#: src/effects-weed.c:452
 msgid "integer"
 msgstr ""
 
-#: src/effects-weed.c:432
+#: src/effects-weed.c:454
 msgid "int64"
 msgstr ""
 
-#: src/effects-weed.c:433
+#: src/effects-weed.c:456
 msgid "boolean"
 msgstr ""
 
-#: src/effects-weed.c:434
+#: src/effects-weed.c:458
 msgid "double"
 msgstr ""
 
-#: src/effects-weed.c:435
+#: src/effects-weed.c:460
 msgid "string"
 msgstr ""
 
-#: src/effects-weed.c:436
+#: src/effects-weed.c:462
 msgid "pointer"
 msgstr ""
 
-#: src/effects-weed.c:4591
+#: src/effects-weed.c:4581
 #, c-format
 msgid "Error: plugin %s has no weed_setup() function.\n"
 msgstr "エラー: プラグイン %s に weed_setup() がありません。\n"
 
-#: src/effects-weed.c:4606
+#: src/effects-weed.c:4595
 #, c-format
 msgid "No usable filters found in plugin %s\n"
 msgstr "プラグイン %s に使うことのできないフィルターが見つかりました\n"
 
-#: src/effects-weed.c:4680
+#: src/effects-weed.c:4668
 #, c-format
 msgid "Found duplicate plugin %s"
 msgstr ""
 
-#: src/effects-weed.c:4734
+#: src/effects-weed.c:4723
 #, c-format
 msgid ""
 "Info: Unable to load plugin %s\n"
@@ -6213,259 +6228,259 @@
 "情報: プラグイン %s を読み込みできませんでした。\n"
 "エラー: %s\n"
 
-#: src/effects-weed.c:4737 src/effects-weed.c:5858
+#: src/effects-weed.c:4726 src/effects-weed.c:5847
 msgid "Some plugin directories"
 msgstr "プラグインディレクトリ"
 
 #. TRANSLATORS: example " - LADSPA plugins -"
-#: src/effects-weed.c:4812 src/rte_window.c:2105
+#: src/effects-weed.c:4801 src/rte_window.c:2107
 #, c-format
 msgid " - %s plugins -"
 msgstr ""
 
-#: src/effects-weed.c:5012
+#: src/effects-weed.c:4998
 #, c-format
 msgid "Successfully loaded %d Weed filters\n"
 msgstr "%d Weedフィルターの読み込みに成功しました\n"
 
-#: src/effects-weed.c:5177
+#: src/effects-weed.c:5162
 #, c-format
 msgid "Invalid compound effect %s - has conflicting target_fps\n"
 msgstr ""
 
-#: src/effects-weed.c:5197
+#: src/effects-weed.c:5182
 #, c-format
 msgid "Invalid compound effect %s - has multiple transition parameters\n"
 msgstr ""
 
-#: src/effects-weed.c:5211
+#: src/effects-weed.c:5196
 #, c-format
 msgid "Invalid compound effect %s - has multiple master volume parameters\n"
 msgstr ""
 
-#: src/effects-weed.c:5346
+#: src/effects-weed.c:5329
 #, c-format
 msgid "Invalid compound effect %s - must have >1 sub filters\n"
 msgstr ""
 
-#: src/effects-weed.c:5366
+#: src/effects-weed.c:5349
 #, c-format
 msgid "Invalid effect %s found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5381
+#: src/effects-weed.c:5364
 #, c-format
 msgid "Invalid default found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5392
+#: src/effects-weed.c:5375
 #, c-format
 msgid "Invalid filter %d for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5406
+#: src/effects-weed.c:5389
 #, c-format
 msgid "Invalid param %d for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5433
+#: src/effects-weed.c:5416
 #, c-format
 msgid ""
 "Invalid number of values for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5467
+#: src/effects-weed.c:5450
 #, c-format
 msgid ""
 "Invalid non-boolean value for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5500
+#: src/effects-weed.c:5483
 #, c-format
 msgid "Invalid param link found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5511
+#: src/effects-weed.c:5494
 #, c-format
 msgid ""
 "Invalid out filter %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5529
+#: src/effects-weed.c:5513
 #, c-format
 msgid ""
 "Invalid out param %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5541
+#: src/effects-weed.c:5526
 #, c-format
 msgid ""
 "Invalid non-boolean value for autoscale found in compound effect %s, line "
 "%d\n"
 msgstr ""
 
-#: src/effects-weed.c:5552
+#: src/effects-weed.c:5537
 #, c-format
 msgid ""
 "Invalid in filter %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5566
+#: src/effects-weed.c:5552
 #, c-format
 msgid ""
 "Invalid in param %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5594
+#: src/effects-weed.c:5581
 #, c-format
 msgid "Invalid channel link found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5605
+#: src/effects-weed.c:5592
 #, c-format
 msgid ""
 "Invalid out filter %d for link channels found in compound effect %s, line "
 "%d\n"
 msgstr ""
 
-#: src/effects-weed.c:5623
+#: src/effects-weed.c:5611
 #, c-format
 msgid ""
 "Invalid out channel %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5633
+#: src/effects-weed.c:5622
 #, c-format
 msgid ""
 "Invalid in filter %d for link channels found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5651
+#: src/effects-weed.c:5641
 #, c-format
 msgid ""
 "Invalid in channel %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5687
+#: src/effects-weed.c:5678
 #, c-format
 msgid "Compound:%s"
 msgstr ""
 
-#: src/effects-weed.c:5758
+#: src/effects-weed.c:5749
 #, c-format
 msgid "Successfully loaded %d compound filters\n"
 msgstr ""
 
-#: src/effects-weed.c:6591
+#: src/effects-weed.c:6570
 #, c-format
 msgid "Effect %s cannot be used with this audio player.\n"
 msgstr ""
 
-#: src/effects-weed.c:6737
+#: src/effects-weed.c:6718
 #, c-format
 msgid "Failed to start instance %s, error code %d\n"
 msgstr "インスタンス %s を開始できません。エラーコード %d\n"
 
-#: src/effects-weed.c:6814
+#: src/effects-weed.c:6797
 #, c-format
 msgid "Unable to start generator %s\n"
 msgstr "ジェネレーター%sを開始できません。\n"
 
-#: src/effects-weed.c:7621
+#: src/effects-weed.c:7607
 #, c-format
 msgid "Failed to start generator %s\n"
 msgstr "ジェネレーター %s を開始できません。\n"
 
-#: src/effects-weed.c:7718
+#: src/effects-weed.c:7701
 #, c-format
 msgid "Failed to start generator %s, error %d\n"
 msgstr "ジェネレーター %s を開始できません。エラーコード %d\n"
 
-#: src/effects-weed.c:9012
+#: src/effects-weed.c:8993
 #, c-format
 msgid "%s [unstable] (%s)"
 msgstr "%s [不安定] (%s)"
 
-#: src/effects-data.c:3278
+#: src/effects-data.c:3234
 #, c-format
 msgid "ACTIVATE (%s)"
 msgstr ""
 
-#: src/effects-data.c:3548
+#: src/effects-data.c:3501
 msgid "ACTIVATE"
 msgstr ""
 
-#: src/effects-data.c:3876
+#: src/effects-data.c:3829
 #, c-format
 msgid "Key slot %d"
 msgstr ""
 
-#: src/effects-data.c:3998
+#: src/effects-data.c:3951
 msgid "Autoscale"
 msgstr ""
 
-#: src/effects-data.c:4089
+#: src/effects-data.c:4042
 msgid "Add another connection for this output parameter"
 msgstr ""
 
-#: src/effects-data.c:4102 src/effects-data.c:4151
+#: src/effects-data.c:4055 src/effects-data.c:4104
 #, fuzzy
 msgid "Delete this connection"
 msgstr "このエフェクトを消去(_D)"
 
-#: src/effects-data.c:4138
+#: src/effects-data.c:4091
 msgid "Add another connection for this output channel"
 msgstr ""
 
-#: src/effects-data.c:4223
+#: src/effects-data.c:4176
 msgid "Connected to -->"
 msgstr ""
 
-#: src/effects-data.c:4243
+#: src/effects-data.c:4196
 #, c-format
 msgid "%s - Alpha Channel Connections"
 msgstr ""
 
-#: src/effects-data.c:4316
+#: src/effects-data.c:4269
 #, c-format
 msgid "%s - Parameter Data Connections"
 msgstr ""
 
-#: src/effects-data.c:4336
+#: src/effects-data.c:4289
 msgid "Autoscale All"
 msgstr ""
 
-#: src/effects-data.c:4361 src/effects-data.c:4890
+#: src/effects-data.c:4314 src/effects-data.c:4841
 msgid "ACTIVATED"
 msgstr ""
 
-#: src/effects-data.c:4774
+#: src/effects-data.c:4726
 msgid "LiVES: - Parameter and Alpha Channel Connections"
 msgstr ""
 
-#: src/effects-data.c:4785
+#: src/effects-data.c:4736
 msgid "Auto Connect Channels"
 msgstr ""
 
-#: src/effects-data.c:4797
+#: src/effects-data.c:4748
 msgid "Auto Connect Parameters"
 msgstr ""
 
-#: src/effects-data.c:4807
+#: src/effects-data.c:4758
 msgid "Disconnect All"
 msgstr ""
 
-#: src/effects-data.c:4875
+#: src/effects-data.c:4826
 #, c-format
 msgid "Input channel is already connected from (%d,%d) %s"
 msgstr ""
 
-#: src/effects-data.c:4891
+#: src/effects-data.c:4842
 #, c-format
 msgid "Input parameter is already connected from (%d,%d) %s"
 msgstr ""
 
-#: src/effects-data.c:4899
+#: src/effects-data.c:4851
 msgid "Input and output parameters are not compatible"
 msgstr ""
 
@@ -6477,43 +6492,43 @@
 msgid "_Reset Values"
 msgstr "値のリセット(_R)"
 
-#: src/framedraw.c:267
+#: src/framedraw.c:265
 msgid "_Frame"
 msgstr ""
 
-#: src/paramspecial.c:266
+#: src/paramspecial.c:259
 msgid "Maintain _Aspect Ratio"
 msgstr "アスペクト比を保つ(_A)"
 
-#: src/paramspecial.c:267
+#: src/paramspecial.c:260
 msgid "Maintain aspect ratio of original frame"
 msgstr "オリジナルフレームのアスペクト比を維持"
 
-#: src/paramspecial.c:341
+#: src/paramspecial.c:335
 msgid "Display Password"
 msgstr "パスワードの表示"
 
-#: src/paramwindow.c:450
+#: src/paramwindow.c:447
 msgid "Transition _In"
 msgstr "トランジションイン(_I)"
 
-#: src/paramwindow.c:452
+#: src/paramwindow.c:449
 msgid "Click to set the transition parameter to show only the front frame"
 msgstr ""
 
-#: src/paramwindow.c:474
+#: src/paramwindow.c:472
 msgid "Crossfade audio"
 msgstr "音声のクロスフェード"
 
-#: src/paramwindow.c:475
+#: src/paramwindow.c:473
 msgid "Check the box to make audio transition with the video"
 msgstr "音声と映像をトランジションさせる場合はボックスをチェック"
 
-#: src/paramwindow.c:493
+#: src/paramwindow.c:492
 msgid "Transition _Out"
 msgstr "トランジションアウト(_O)"
 
-#: src/paramwindow.c:495
+#: src/paramwindow.c:494
 msgid "Click to set the transition parameter to show only the rear frame"
 msgstr ""
 
@@ -6526,23 +6541,23 @@
 msgid "%s : size"
 msgstr "%s : サイズ"
 
-#: src/paramwindow.c:598
+#: src/paramwindow.c:597
 msgid "New size (pixels)"
 msgstr "新しいサイズ (ピクセル)"
 
-#: src/paramwindow.c:617 src/plugins.c:997
+#: src/paramwindow.c:616 src/plugins.c:973
 msgid "_Width"
 msgstr "幅(_W)"
 
-#: src/paramwindow.c:636 src/plugins.c:1003
+#: src/paramwindow.c:635 src/plugins.c:979
 msgid "_Height"
 msgstr "高さ(_H)"
 
-#: src/paramwindow.c:684
+#: src/paramwindow.c:683
 msgid "Generate to _Clipboard"
 msgstr "クリップボードに生成(_C)"
 
-#: src/paramwindow.c:686
+#: src/paramwindow.c:685
 msgid "Generate frames to the clipboard"
 msgstr "クリップボードへフレームを生成"
 
@@ -6554,7 +6569,7 @@
 msgid "Generate frames to a new clip"
 msgstr "新しいクリップへフレームを生成"
 
-#: src/paramwindow.c:822
+#: src/paramwindow.c:824
 #, c-format
 msgid ""
 "\n"
@@ -6565,59 +6580,59 @@
 "このエフェクトを利用するには、少なくとも%dフレームを選択してください。\n"
 "\n"
 
-#: src/paramwindow.c:920 src/paramwindow.c:930
+#: src/paramwindow.c:934 src/paramwindow.c:942
 msgid "Set as default"
 msgstr "デフォルトに設定"
 
-#: src/paramwindow.c:922 src/paramwindow.c:938
+#: src/paramwindow.c:936 src/paramwindow.c:950
 msgid "Reset"
 msgstr "リセット"
 
-#: src/paramwindow.c:932 src/rte_window.c:2401 src/omc-learn.c:1357
+#: src/paramwindow.c:944 src/rte_window.c:2394 src/omc-learn.c:1347
 msgid "Close _window"
 msgstr "ウィンドウを閉じる(_W)"
 
-#: src/paramwindow.c:1337
+#: src/paramwindow.c:1340
 msgid "No parameters"
 msgstr "パラメータなし"
 
-#: src/paramwindow.c:1419
+#: src/paramwindow.c:1424
 msgid "Invalid parameter"
 msgstr "無効なパラメータ"
 
-#: src/paramwindow.c:1611
+#: src/paramwindow.c:1610
 msgid "LiVES: - Select Colour"
 msgstr "LiVES:- 色の選択"
 
-#: src/paramwindow.c:1616
+#: src/paramwindow.c:1615
 msgid "Click to set the colour"
 msgstr "クリックでカラーを設定"
 
-#: src/paramwindow.c:1628
+#: src/paramwindow.c:1626
 msgid "_Red"
 msgstr "赤(_R)"
 
-#: src/paramwindow.c:1629
+#: src/paramwindow.c:1627
 msgid "The red value (0 - 255)"
 msgstr "赤の値 (0 - 255)"
 
-#: src/paramwindow.c:1632
+#: src/paramwindow.c:1630
 msgid "_Green"
 msgstr "緑(_G)"
 
-#: src/paramwindow.c:1633
+#: src/paramwindow.c:1631
 msgid "The green value (0 - 255)"
 msgstr "緑の値 (0 - 255)"
 
-#: src/paramwindow.c:1636
+#: src/paramwindow.c:1634
 msgid "_Blue"
 msgstr "青(_B)"
 
-#: src/paramwindow.c:1637
+#: src/paramwindow.c:1635
 msgid "The blue value (0 - 255)"
 msgstr "青の値 (0 - 255)"
 
-#: src/plugins.c:85
+#: src/plugins.c:86
 #, c-format
 msgid ""
 "\n"
@@ -6626,12 +6641,12 @@
 "\n"
 "プラグインエラー: %sに失敗。(コード%d)"
 
-#: src/plugins.c:87
+#: src/plugins.c:88
 #, c-format
 msgid " : message was %s\n"
 msgstr " : メッセージは%sでした。\n"
 
-#: src/plugins.c:387
+#: src/plugins.c:375
 #, c-format
 msgid ""
 "\n"
@@ -6646,17 +6661,17 @@
 "%s\n"
 "エラーコード %d\n"
 
-#: src/plugins.c:397
+#: src/plugins.c:385
 #, c-format
 msgid "Updating video playback plugin defaults in %s\n"
 msgstr "%s にあるデフォルト映像プラグインのアップデート\n"
 
-#: src/plugins.c:452
+#: src/plugins.c:444
 #, c-format
 msgid "Loading video playback plugin defaults from %s..."
 msgstr "%s からデフォルト映像プラグインを読み込み中..."
 
-#: src/plugins.c:515
+#: src/plugins.c:505
 #, c-format
 msgid ""
 "\n"
@@ -6671,32 +6686,32 @@
 "「ツール | 設定 | 再生 | 映像 | プラグイン」\n"
 "\n"
 
-#: src/plugins.c:855
+#: src/plugins.c:836
 #, c-format
 msgid "Saving playback plugin defaults to %s..."
 msgstr "再生プラグインのデフォルトを%sに保存..."
 
-#: src/plugins.c:962
+#: src/plugins.c:939
 msgid "_FPS"
 msgstr "FPS(_F)"
 
-#: src/plugins.c:963
+#: src/plugins.c:940
 msgid "Fixed framerate for plugin.\n"
 msgstr "プラグインのフレームレートを固定します。\n"
 
-#: src/plugins.c:1032
+#: src/plugins.c:1008
 msgid "_Colourspace"
 msgstr "カラースペース(_C)"
 
-#: src/plugins.c:1033
+#: src/plugins.c:1009
 msgid "Colourspace input to the plugin.\n"
 msgstr "プラグインに入力されるカラースペース\n"
 
-#: src/plugins.c:1089
+#: src/plugins.c:1065
 msgid "Save settings to an alternate file.\n"
 msgstr "設定を別なファイルに保存します。\n"
 
-#: src/plugins.c:1206
+#: src/plugins.c:1182
 #, c-format
 msgid ""
 "\n"
@@ -6709,7 +6724,7 @@
 "再生プラグイン %s を開けません。\n"
 "エラーは　%s\n"
 
-#: src/plugins.c:1252
+#: src/plugins.c:1228
 #, c-format
 msgid ""
 "\n"
@@ -6724,7 +6739,7 @@
 "必要とされる機能を持ちません。\n"
 "使用することができません。\n"
 
-#: src/plugins.c:1265
+#: src/plugins.c:1241
 #, c-format
 msgid ""
 "Video playback plugin failed to initialise.\n"
@@ -6733,7 +6748,7 @@
 "映像プラグインを初期化できません。\n"
 "エラー: %s\n"
 
-#: src/plugins.c:1461
+#: src/plugins.c:1428
 msgid ""
 "\n"
 "Warning ! Video playback plugin will not send key presses. Keyboard may be "
@@ -6743,7 +6758,7 @@
 "警告! 映像プラグインはキー操作を送信できません。プラグインの利用中はキーボー"
 "ドが無効になります!\n"
 
-#: src/plugins.c:1465
+#: src/plugins.c:1433
 #, c-format
 msgid ""
 "*** Using %s plugin for fs playback, agreed to use palette type %d ( %s ). "
@@ -6752,17 +6767,17 @@
 "*** 再生に %s プラグインを使います。パレットタイプは %d ( %s ) を使います。 "
 "***\n"
 
-#: src/plugins.c:1571
+#: src/plugins.c:1537
 #, c-format
 msgid "Audio stream unable to use preferred format '%s'\n"
 msgstr "音声ストリームは選択したフォーマット '%s' を利用できません\n"
 
-#: src/plugins.c:1579
+#: src/plugins.c:1543
 #, c-format
 msgid "Using format '%s' instead.\n"
 msgstr "代わりに %s をフォーマットに使ってください。\n"
 
-#: src/plugins.c:1616
+#: src/plugins.c:1579
 #, c-format
 msgid ""
 "LiVES was unable to find its encoder plugins. Please make sure you have the "
@@ -6771,7 +6786,7 @@
 "or change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/plugins.c:1624
+#: src/plugins.c:1589
 #, c-format
 msgid ""
 "LiVES did not receive a response from the encoder plugin called '%s'.\n"
@@ -6787,11 +6802,11 @@
 "もしくは、「ツール | 設定 | エンコーディング」で他のプラグインに変更してくだ"
 "さい。\n"
 
-#: src/plugins.c:2032
+#: src/plugins.c:1987
 msgid "Unable to resize, please install imageMagick\n"
 msgstr "リサイズできません。imageMagickをインストールしてください。\n"
 
-#: src/plugins.c:2231
+#: src/plugins.c:2183
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -6799,12 +6814,12 @@
 "No decoders found in %s !\n"
 msgstr "プラグイン %s に使うことのできないフィルターが見つかりました\n"
 
-#: src/plugins.c:2415
+#: src/plugins.c:2369
 #, fuzzy, c-format
 msgid " using %s"
 msgstr "%sを開きます"
 
-#: src/plugins.c:2499
+#: src/plugins.c:2451
 #, c-format
 msgid ""
 "\n"
@@ -6817,7 +6832,7 @@
 "デコーダプラグイン %s を開けません。\n"
 "エラーは %s\n"
 
-#: src/plugins.c:2522
+#: src/plugins.c:2472
 #, c-format
 msgid ""
 "\n"
@@ -6832,24 +6847,24 @@
 "必須の機能がありません。\n"
 "利用することができません。\n"
 
-#: src/plugins.c:2564
+#: src/plugins.c:2512
 msgid "/unknown"
 msgstr "/不明"
 
-#: src/plugins.c:2651
+#: src/plugins.c:2598
 msgid "LiVES: - Decoder Plugins"
 msgstr "LiVES: - デコーダープラグイン"
 
-#: src/plugins.c:2669
+#: src/plugins.c:2616
 msgid "Enabled Video Decoders (uncheck to disable)"
 msgstr "映像デコーダーを有効にする（チェックを外すと無効）"
 
-#: src/plugins.c:2726
+#: src/plugins.c:2672
 #, c-format
 msgid "Failed to load %s, transitions may not resize.\n"
 msgstr "%sの読み込みに失敗しました。トランジションはリサイズされません。\n"
 
-#: src/plugins.c:3854
+#: src/plugins.c:3797
 #, c-format
 msgid "%s advanced settings"
 msgstr "%s 高度な設定"
@@ -6858,15 +6873,15 @@
 msgid "LiVES: - New Test RFX"
 msgstr "LiVES: - RFXの新しいテストスクリプト"
 
-#: src/rfx-builder.c:136
+#: src/rfx-builder.c:135
 msgid "LiVES: - Edit Test RFX"
 msgstr "LiVES: - RFXのテストスクリプトの編集"
 
-#: src/rfx-builder.c:166
+#: src/rfx-builder.c:165
 msgid "Type:"
 msgstr "タイプ:"
 
-#: src/rfx-builder.c:184
+#: src/rfx-builder.c:183
 msgid "tool"
 msgstr ""
 
@@ -6878,128 +6893,128 @@
 msgid "The name of the plugin. No spaces allowed."
 msgstr "プラグインの名前。空白は入れられません"
 
-#: src/rfx-builder.c:201
+#: src/rfx-builder.c:202
 msgid "Version:       "
 msgstr "バージョン:       "
 
-#: src/rfx-builder.c:203
+#: src/rfx-builder.c:204
 msgid "The script version."
 msgstr "スクリプトバージョン"
 
-#: src/rfx-builder.c:210
+#: src/rfx-builder.c:212
 msgid "    Author:       "
 msgstr "    作者:       "
 
-#: src/rfx-builder.c:211
+#: src/rfx-builder.c:213
 msgid "The script author."
 msgstr "このスクリプトの作者"
 
-#: src/rfx-builder.c:217
+#: src/rfx-builder.c:220
 msgid "    URL (optional):       "
 msgstr "    URL (オプション):       "
 
-#: src/rfx-builder.c:218
+#: src/rfx-builder.c:221
 msgid "URL for the plugin maintainer."
 msgstr "プラグインメンテナンスのためのURL"
 
-#: src/rfx-builder.c:226
+#: src/rfx-builder.c:230
 msgid "Menu text:    "
 msgstr "メニューのテキスト:    "
 
-#: src/rfx-builder.c:227
+#: src/rfx-builder.c:231
 msgid "The text to show in the menu."
 msgstr "メニューに表示するテキスト"
 
-#: src/rfx-builder.c:239
+#: src/rfx-builder.c:244
 msgid "Action description:        "
 msgstr "動作の記述:        "
 
-#: src/rfx-builder.c:241
+#: src/rfx-builder.c:246
 msgid "Describe what the plugin is doing. E.g. \"Edge detecting\""
 msgstr ""
 "このプラグインが何をするものかを記述します。例えば「エッジ検出」などです。"
 
-#: src/rfx-builder.c:246
+#: src/rfx-builder.c:251
 msgid "Minimum frames:"
 msgstr "最小フレーム数:"
 
-#: src/rfx-builder.c:249
+#: src/rfx-builder.c:254
 msgid ""
 "Minimum number of frames this effect/tool can be applied to. Normally 1."
 msgstr "このエフェクト/ツールが適用する最小のフレーム数。通常は1"
 
-#: src/rfx-builder.c:260
+#: src/rfx-builder.c:265
 msgid "_Requirements..."
 msgstr "要求(_R)..."
 
-#: src/rfx-builder.c:263
+#: src/rfx-builder.c:268
 msgid "Enter any binaries required by the plugin."
 msgstr "このプラグインが要求するバイナリを入力します。"
 
-#: src/rfx-builder.c:267
+#: src/rfx-builder.c:272
 msgid "_Properties..."
 msgstr "プロパティー(_P)..."
 
-#: src/rfx-builder.c:270
+#: src/rfx-builder.c:275
 msgid "Set properties for the plugin. Optional."
 msgstr "このプラグインのプロパティーを指定します。オプションです。"
 
-#: src/rfx-builder.c:274
+#: src/rfx-builder.c:279
 msgid "_Parameters..."
 msgstr "パラメーター(_P)..."
 
-#: src/rfx-builder.c:277
+#: src/rfx-builder.c:282
 msgid "Set up parameters used in pre/loop/post/trigger code. Optional."
 msgstr ""
 "プリ/ループ/ポスト/トリガーの各コードで使用するパラメータを指定します。オプ"
 "ションです。"
 
-#: src/rfx-builder.c:281
+#: src/rfx-builder.c:286
 msgid "Parameter _Window Hints..."
 msgstr "パラメーター、ウィンドウヒント(_W)..."
 
-#: src/rfx-builder.c:284
+#: src/rfx-builder.c:289
 msgid "Set hints about how to lay out the parameter window. Optional."
 msgstr ""
 "パラメータウィンドウをどう配置するかのヒントを指定します。オプションです。"
 
-#: src/rfx-builder.c:290
+#: src/rfx-builder.c:295
 msgid "_Language code:"
 msgstr ""
 
-#: src/rfx-builder.c:291
+#: src/rfx-builder.c:296
 msgid "Language for pre/loop/post/triggers. Optional."
 msgstr "プリ/ループ/ポスト/トリガーの言語を指定。オプションです。"
 
-#: src/rfx-builder.c:300
+#: src/rfx-builder.c:305
 msgid "_Pre loop code..."
 msgstr "プリループコード(_P)..."
 
-#: src/rfx-builder.c:303
+#: src/rfx-builder.c:308
 msgid "Code to be executed before the loop. Optional."
 msgstr "ループの前に実行するコードです。オプションです。"
 
-#: src/rfx-builder.c:307
+#: src/rfx-builder.c:312
 msgid "_Loop code..."
 msgstr "ループコード(_L)..."
 
-#: src/rfx-builder.c:310
+#: src/rfx-builder.c:315
 msgid "Loop code to be applied to each frame."
 msgstr "各フレームに適用するループコードです。"
 
-#: src/rfx-builder.c:314
+#: src/rfx-builder.c:319
 msgid "_Post loop code..."
 msgstr "ポストループコード(_P)..."
 
-#: src/rfx-builder.c:317
+#: src/rfx-builder.c:322
 msgid "Code to be executed after the loop. Optional."
 msgstr "ループの後に実行するコードです。オプションです。"
 
-#: src/rfx-builder.c:321
+#: src/rfx-builder.c:326
 msgid "_Trigger code..."
 msgstr "トリガーコード(_T)..."
 
-#: src/rfx-builder.c:324
+#: src/rfx-builder.c:329
 msgid ""
 "Set trigger code for when the parameter window is shown, or when a parameter "
 "is changed. Optional (except for Utilities)."
@@ -7007,7 +7022,7 @@
 "パラメータウィンドウが表示されたとき、またはパラメータが変更されたときに実行"
 "するトリガーコードを指定する。(ユーティリティ以外はオプション)"
 
-#: src/rfx-builder.c:421
+#: src/rfx-builder.c:426
 #, c-format
 msgid ""
 "\n"
@@ -7022,55 +7037,55 @@
 "%s\n"
 "%s をパースできません\n"
 
-#: src/rfx-builder.c:544
+#: src/rfx-builder.c:541
 msgid "LiVES: - RFX Requirements"
 msgstr "LiVES: - RFXの要件"
 
-#: src/rfx-builder.c:548
+#: src/rfx-builder.c:544
 msgid "LiVES: - RFX Parameters"
 msgstr "LiVES: - RFXパラメータ"
 
-#: src/rfx-builder.c:552
+#: src/rfx-builder.c:547
 msgid "LiVES: - RFX Parameter Window Hints"
 msgstr "LiVES: - RFXパラメータのウィンドウヒント"
 
-#: src/rfx-builder.c:556
+#: src/rfx-builder.c:550
 msgid "LiVES: - RFX Triggers"
 msgstr "LiVES: - RFXトリガー"
 
-#: src/rfx-builder.c:622
+#: src/rfx-builder.c:613
 msgid "_New Entry"
 msgstr "新しいエントリ(_N)"
 
-#: src/rfx-builder.c:625
+#: src/rfx-builder.c:616
 msgid "_Edit Entry"
 msgstr "エントリの編集(_E)"
 
-#: src/rfx-builder.c:628
+#: src/rfx-builder.c:619
 msgid "_Remove Entry"
 msgstr "エントリの削除(_R)"
 
-#: src/rfx-builder.c:632
+#: src/rfx-builder.c:623
 msgid "Move _Up"
 msgstr "上へ移動(_U)"
 
-#: src/rfx-builder.c:635
+#: src/rfx-builder.c:626
 msgid "Move _Down"
 msgstr "下へ移動(_D)"
 
-#: src/rfx-builder.c:1004
+#: src/rfx-builder.c:984
 msgid "LiVES: - RFX Properties"
 msgstr "LiVES: - RFX属性"
 
-#: src/rfx-builder.c:1013
+#: src/rfx-builder.c:993
 msgid "_Slow (hint to GUI)"
 msgstr "遅く (GUIへのヒント)(_S)"
 
-#: src/rfx-builder.c:1024
+#: src/rfx-builder.c:1004
 msgid "_Batch mode generator"
 msgstr "バッチモードジェネレーター(_B)"
 
-#: src/rfx-builder.c:1831
+#: src/rfx-builder.c:1790
 msgid ""
 "\n"
 "\n"
@@ -7084,7 +7099,7 @@
 "トリガーを先に削除してください。\n"
 "\n"
 
-#: src/rfx-builder.c:1875
+#: src/rfx-builder.c:1834
 msgid ""
 "\n"
 "\n"
@@ -7096,27 +7111,27 @@
 "いくつかのトリガーが調整されました。\n"
 "トリガーのコードを確認してください。\n"
 
-#: src/rfx-builder.c:1994
+#: src/rfx-builder.c:1950
 msgid "LiVES: - New RFX Parameter"
 msgstr "LiVES: - 新しいRFXパラメータ"
 
-#: src/rfx-builder.c:1997
+#: src/rfx-builder.c:1952
 msgid "LiVES: - Edit RFX Parameter"
 msgstr "LiVES: - RFXパラメータの編集"
 
-#: src/rfx-builder.c:2013
+#: src/rfx-builder.c:1968
 msgid "_Name:    "
 msgstr "名前(_N):    "
 
-#: src/rfx-builder.c:2016
+#: src/rfx-builder.c:1971
 msgid "Name of the parameter, must be unique in the plugin."
 msgstr "パラメータ名はプラグインの中で一意でなければなりません。"
 
-#: src/rfx-builder.c:2025
+#: src/rfx-builder.c:1981
 msgid "_Label:    "
 msgstr "ラベル(_L):    "
 
-#: src/rfx-builder.c:2028
+#: src/rfx-builder.c:1984
 msgid ""
 "Label to be shown by the parameter. An underscore represents mnemonic "
 "accelerator."
@@ -7124,159 +7139,159 @@
 "パラメータとして表示されるラベル。アンダースコアはキーボードアクセラレータを"
 "表します。"
 
-#: src/rfx-builder.c:2039
+#: src/rfx-builder.c:1996
 msgid "_Type:         "
 msgstr "タイプ(_T):         "
 
-#: src/rfx-builder.c:2040
+#: src/rfx-builder.c:1997
 msgid "Parameter type (select from list)."
 msgstr "パラメータタイプ (リストから選択)"
 
-#: src/rfx-builder.c:2073
+#: src/rfx-builder.c:2029
 msgid "Decimal _places: "
 msgstr "小数点以下の位(_P): "
 
-#: src/rfx-builder.c:2082 src/rfx-builder.c:2477 src/rfx-builder.c:2495
+#: src/rfx-builder.c:2038 src/rfx-builder.c:2430 src/rfx-builder.c:2447
 msgid "_Default value:    "
 msgstr "デフォルト値(_D):    "
 
-#: src/rfx-builder.c:2098
+#: src/rfx-builder.c:2054
 msgid "_Default: "
 msgstr "デフォルト(_D): "
 
-#: src/rfx-builder.c:2132
+#: src/rfx-builder.c:2087
 msgid "Button _Group: "
 msgstr "ボタングループ(_G): "
 
-#: src/rfx-builder.c:2134
+#: src/rfx-builder.c:2089
 msgid "A non-zero value can be used to group radio buttons."
 msgstr "ラジオボタングループにはゼロではない値を使います。"
 
-#: src/rfx-builder.c:2142 src/rfx-builder.c:2478
+#: src/rfx-builder.c:2097 src/rfx-builder.c:2431
 msgid "_Minimum value: "
 msgstr "最小値(_M): "
 
-#: src/rfx-builder.c:2148 src/rfx-builder.c:2479
+#: src/rfx-builder.c:2103 src/rfx-builder.c:2432
 msgid "Ma_ximum value: "
 msgstr "最大値(_X): "
 
-#: src/rfx-builder.c:2157
+#: src/rfx-builder.c:2113
 msgid "     _Step size:   "
 msgstr "     ステップサイズ(_S):   "
 
-#: src/rfx-builder.c:2160
+#: src/rfx-builder.c:2117
 msgid ""
 "How much the parameter is adjusted when the spinbutton arrows are pressed."
 msgstr ""
 "スピンボタンの矢印が押されたときに、どのくらいパラメータが調節されるか。"
 
-#: src/rfx-builder.c:2171
+#: src/rfx-builder.c:2129
 msgid "_Wrap value"
 msgstr ""
 
-#: src/rfx-builder.c:2172
+#: src/rfx-builder.c:2131
 msgid "Whether the value wraps max->min and min->max."
 msgstr "端数が max->min かつ min->max に丸められるかどうか。"
 
-#: src/rfx-builder.c:2470
+#: src/rfx-builder.c:2424
 msgid "Set _values"
 msgstr "値の設定(_V)"
 
-#: src/rfx-builder.c:2512
+#: src/rfx-builder.c:2463
 msgid "Default _Red:  "
 msgstr "標準の赤(_R):  "
 
-#: src/rfx-builder.c:2513
+#: src/rfx-builder.c:2464
 msgid "Default _Green:"
 msgstr "標準の緑(_G):"
 
-#: src/rfx-builder.c:2514
+#: src/rfx-builder.c:2465
 msgid "Default _Blue: "
 msgstr "標準の青(_B): "
 
-#: src/rfx-builder.c:2538
+#: src/rfx-builder.c:2488
 msgid "Set _default"
 msgstr "デフォルトに設定(_D)"
 
-#: src/rfx-builder.c:2540
+#: src/rfx-builder.c:2490
 msgid "Default value:  "
 msgstr "デフォルトの値:  "
 
-#: src/rfx-builder.c:2541
+#: src/rfx-builder.c:2491
 msgid "Maximum length (chars): "
 msgstr "最大長(chars): "
 
-#: src/rfx-builder.c:2576
+#: src/rfx-builder.c:2526
 msgid "LiVES: - New RFX Parameter Window Hint"
 msgstr "LiVES: - 新しいRFXパラメータ、ウィンドウヒント"
 
-#: src/rfx-builder.c:2579
+#: src/rfx-builder.c:2528
 msgid "LiVES: - Edit RFX Parameter Window Hint"
 msgstr "LiVES: - RFXパラメータ、ウィンドウヒントの編集"
 
-#: src/rfx-builder.c:2622
+#: src/rfx-builder.c:2569
 msgid "_Keyword:         "
 msgstr ""
 
-#: src/rfx-builder.c:2639
+#: src/rfx-builder.c:2586
 msgid "Special _Type:         "
 msgstr ""
 
-#: src/rfx-builder.c:2656
+#: src/rfx-builder.c:2602
 msgid "Special _Subtype:         "
 msgstr ""
 
-#: src/rfx-builder.c:2667 src/rfx-builder.c:2706
+#: src/rfx-builder.c:2613 src/rfx-builder.c:2651
 msgid "Row:    "
 msgstr "列:    "
 
-#: src/rfx-builder.c:2732
+#: src/rfx-builder.c:2676
 #, c-format
 msgid "Linked parameters (%d):    "
 msgstr "リンクパラメータ (%d):    "
 
-#: src/rfx-builder.c:2749
+#: src/rfx-builder.c:2693
 msgid "Linked parameters (4):    "
 msgstr "リンクパラメータ (4):    "
 
-#: src/rfx-builder.c:2752
+#: src/rfx-builder.c:2695
 msgid "Linked parameters (2):    "
 msgstr "リンクパラメータ (2):    "
 
-#: src/rfx-builder.c:2777
+#: src/rfx-builder.c:2720
 msgid "LiVES: - New RFX Trigger"
 msgstr "LiVES: - 新しいRFXトリガー"
 
-#: src/rfx-builder.c:2780
+#: src/rfx-builder.c:2722
 msgid "LiVES: - Edit RFX Trigger"
 msgstr "LiVES: - RFXトリガーの編集"
 
-#: src/rfx-builder.c:2808
+#: src/rfx-builder.c:2750
 msgid "When:         "
 msgstr "いつ:         "
 
-#: src/rfx-builder.c:2904
+#: src/rfx-builder.c:2846
 msgid "LiVES: - Pre Loop Code"
 msgstr "LiVES: - プレループコード"
 
-#: src/rfx-builder.c:2911
+#: src/rfx-builder.c:2853
 msgid "LiVES: - Loop Code"
 msgstr "LiVES: - ループコード"
 
-#: src/rfx-builder.c:2918
+#: src/rfx-builder.c:2860
 msgid "LiVES: - Post Loop Code"
 msgstr "LiVES: - ポストループコード"
 
-#: src/rfx-builder.c:2931
+#: src/rfx-builder.c:2873
 #, c-format
 msgid "LiVES: - Default text (max length %d)"
 msgstr "LiVES: - 標準テキスト (最大長 %d)"
 
-#: src/rfx-builder.c:2944
+#: src/rfx-builder.c:2885
 msgid "LiVES: - Enter values, one per line"
 msgstr "LiVES: - 一行ごとに値を入力"
 
-#: src/rfx-builder.c:3055
+#: src/rfx-builder.c:2996
 msgid ""
 "\n"
 "\n"
@@ -7286,7 +7301,7 @@
 "\n"
 "名前が空欄ではいけません。\n"
 
-#: src/rfx-builder.c:3060
+#: src/rfx-builder.c:3001
 msgid ""
 "\n"
 "\n"
@@ -7296,7 +7311,7 @@
 "\n"
 "名前に空白が含まれてはいけません。\n"
 
-#: src/rfx-builder.c:3065
+#: src/rfx-builder.c:3006
 msgid ""
 "\n"
 "\n"
@@ -7306,7 +7321,7 @@
 "\n"
 "メニューテキストが空欄ではいけません。\n"
 
-#: src/rfx-builder.c:3071
+#: src/rfx-builder.c:3012
 msgid ""
 "\n"
 "\n"
@@ -7316,7 +7331,7 @@
 "\n"
 "動作の記述が空欄ではいけません。\n"
 
-#: src/rfx-builder.c:3076
+#: src/rfx-builder.c:3017
 msgid ""
 "\n"
 "\n"
@@ -7326,7 +7341,7 @@
 "\n"
 "作者は空白ではいけません。\n"
 
-#: src/rfx-builder.c:3085 src/rfx-builder.c:4339
+#: src/rfx-builder.c:3026 src/rfx-builder.c:4253
 msgid ""
 "\n"
 "\n"
@@ -7338,7 +7353,7 @@
 "この名前のプラグインが既に存在します。\n"
 "プラグイン名は一意でなければなりません。\n"
 
-#: src/rfx-builder.c:3092
+#: src/rfx-builder.c:3033
 msgid ""
 "\n"
 "\n"
@@ -7348,7 +7363,7 @@
 "\n"
 "ループコードは空欄ではいけません。\n"
 
-#: src/rfx-builder.c:3098
+#: src/rfx-builder.c:3039
 msgid ""
 "\n"
 "\n"
@@ -7358,7 +7373,7 @@
 "\n"
 "トリガーコードはユーティリティに利用するときは空欄ではいけません。\n"
 
-#: src/rfx-builder.c:3111
+#: src/rfx-builder.c:3052
 msgid ""
 "\n"
 "\n"
@@ -7368,7 +7383,7 @@
 "\n"
 "パラメータ名は空欄ではいけません。\n"
 
-#: src/rfx-builder.c:3117
+#: src/rfx-builder.c:3058
 msgid ""
 "\n"
 "\n"
@@ -7382,41 +7397,41 @@
 "ればなりません。\n"
 "\n"
 
-#: src/rfx-builder.c:3171
+#: src/rfx-builder.c:3111
 #, c-format
 msgid "Writing script file %s..."
 msgstr "スクリプトファイル%sを出力します..."
 
-#: src/rfx-builder.c:3477
+#: src/rfx-builder.c:3411
 msgid "No <define> section found in script.\n"
 msgstr "スクリプトに <define>　セクションがありません。\n"
 
-#: src/rfx-builder.c:3484 src/rfx-builder.c:3493
+#: src/rfx-builder.c:3418 src/rfx-builder.c:3427
 msgid "Bad script version.\n"
 msgstr "不適切なスクリプトのバージョン\n"
 
-#: src/rfx-builder.c:3505
+#: src/rfx-builder.c:3439
 msgid "No <name> section found in script.\n"
 msgstr "スクリプトに <name> セクションがありません。\n"
 
-#: src/rfx-builder.c:3513
+#: src/rfx-builder.c:3447
 msgid "No <version> section found in script.\n"
 msgstr "スクリプトに <version> セクションがありません。\n"
 
-#: src/rfx-builder.c:3522
+#: src/rfx-builder.c:3456
 msgid "No <author> section found in script.\n"
 msgstr "スクリプトに <author> セクションがありません。\n"
 
-#: src/rfx-builder.c:3536
+#: src/rfx-builder.c:3470
 msgid "No <description> section found in script.\n"
 msgstr "スクリプトに <description> セクションがありません。\n"
 
-#: src/rfx-builder.c:3540
+#: src/rfx-builder.c:3474
 #, c-format
 msgid "Bad description. (%s)\n"
 msgstr "不適切な記述 (%s)\n"
 
-#: src/rfx-builder.c:3702
+#: src/rfx-builder.c:3627
 #, c-format
 msgid ""
 "\n"
@@ -7431,27 +7446,27 @@
 "スクリプトに発見しました。\n"
 "\n"
 
-#: src/rfx-builder.c:3859
+#: src/rfx-builder.c:3780
 msgid "Rebuilding all RFX scripts...builtin..."
 msgstr "再構築します。全RFXスクリプト...ビルトイン..."
 
-#: src/rfx-builder.c:3860
+#: src/rfx-builder.c:3781
 msgid "Rebuilding scripts"
 msgstr "スクリプトの再構築"
 
-#: src/rfx-builder.c:3868
+#: src/rfx-builder.c:3789
 msgid "custom..."
 msgstr "カスタム..."
 
-#: src/rfx-builder.c:3872
+#: src/rfx-builder.c:3793
 msgid "test..."
 msgstr "テスト..."
 
-#: src/rfx-builder.c:3878
+#: src/rfx-builder.c:3799
 msgid "rebuilding dynamic menu entries..."
 msgstr "動的メニューエントリを再構築します..."
 
-#: src/rfx-builder.c:3905 src/rfx-builder.c:3912
+#: src/rfx-builder.c:3826 src/rfx-builder.c:3834
 #, c-format
 msgid ""
 "\n"
@@ -7464,7 +7479,7 @@
 "LiVESはプログラム %s を見つけられませんでした。\n"
 "このプログラムがパス中にあり、実行可能であることを確認してください。\n"
 
-#: src/rfx-builder.c:3951
+#: src/rfx-builder.c:3874
 #, c-format
 msgid ""
 "\n"
@@ -7478,12 +7493,12 @@
 "本当にRFXスクリプト %s を削除しますか?\n"
 "\n"
 
-#: src/rfx-builder.c:3960
+#: src/rfx-builder.c:3884
 #, c-format
 msgid "Deleting rfx script %s..."
 msgstr "RFXスクリプト %s を削除します...."
 
-#: src/rfx-builder.c:3980
+#: src/rfx-builder.c:3902
 #, c-format
 msgid ""
 "\n"
@@ -7498,7 +7513,7 @@
 "\n"
 "エラーコードは%dです。\n"
 
-#: src/rfx-builder.c:4016
+#: src/rfx-builder.c:3938
 #, c-format
 msgid ""
 "\n"
@@ -7513,12 +7528,12 @@
 "は既に存在します。\n"
 "消去するか、テストスクリプトの名前を変えてください。\n"
 
-#: src/rfx-builder.c:4027
+#: src/rfx-builder.c:3950
 #, c-format
 msgid "Promoting rfx test plugin %s to custom..."
 msgstr "RFXのテストスクリプト %s をカスタムスクリプトに昇格します..."
 
-#: src/rfx-builder.c:4044
+#: src/rfx-builder.c:3965
 #, c-format
 msgid ""
 "\n"
@@ -7529,20 +7544,20 @@
 "Return code was %d (%s)\n"
 msgstr ""
 
-#: src/rfx-builder.c:4070
+#: src/rfx-builder.c:3990
 msgid "LiVES: - Export Script to..."
 msgstr ""
 
-#: src/rfx-builder.c:4077 src/rfx-builder.c:4156
+#: src/rfx-builder.c:3997 src/rfx-builder.c:4074
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "%s を %s からコピーしています..."
 
-#: src/rfx-builder.c:4105
+#: src/rfx-builder.c:4024
 msgid "LiVES: Import Script from..."
 msgstr ""
 
-#: src/rfx-builder.c:4148
+#: src/rfx-builder.c:4067
 #, c-format
 msgid ""
 "\n"
@@ -7557,43 +7572,43 @@
 "は既に存在します。\n"
 "消去するか、インポートするスクリプトの名前を変えてください。\n"
 
-#: src/rfx-builder.c:4249
+#: src/rfx-builder.c:4166
 msgid "LiVES: - Copy RFX Script"
 msgstr "LiVES: - RFXスクリプトのコピー"
 
-#: src/rfx-builder.c:4251
+#: src/rfx-builder.c:4168
 msgid "_From type:    "
 msgstr ""
 
-#: src/rfx-builder.c:4258
+#: src/rfx-builder.c:4175
 msgid "   Script:    "
 msgstr "   スクリプト:    "
 
-#: src/rfx-builder.c:4267
+#: src/rfx-builder.c:4183
 msgid "LiVES: - Rename test RFX Script"
 msgstr "LiVES: -RFXのテストスクリプトの名前を変更..."
 
-#: src/rfx-builder.c:4268
+#: src/rfx-builder.c:4184
 msgid "From script: "
 msgstr "スクリプトから: "
 
-#: src/rfx-builder.c:4273
+#: src/rfx-builder.c:4188
 msgid "LiVES: - RFX Script name"
 msgstr "LiVES: - RFXのスクリプト名"
 
-#: src/rfx-builder.c:4274
+#: src/rfx-builder.c:4189
 msgid "Script name: "
 msgstr "スクリプト名: "
 
-#: src/rfx-builder.c:4294
+#: src/rfx-builder.c:4209
 msgid "New name: "
 msgstr "新しい名前: "
 
-#: src/rfx-builder.c:4297
+#: src/rfx-builder.c:4212
 msgid "New script name: "
 msgstr "新しいスクリプト名: "
 
-#: src/rfx-builder.c:4372
+#: src/rfx-builder.c:4286
 msgid ""
 "\n"
 "\n"
@@ -7605,12 +7620,12 @@
 "この名前のテストスクリプトが既に存在します。\n"
 "スクリプト名は一意でなければなりません。\n"
 
-#: src/rfx-builder.c:4384
+#: src/rfx-builder.c:4297
 #, c-format
 msgid "Renaming RFX test script %s to %s..."
 msgstr "RFXのテストスクリプトの名称を%sから%sに変更..."
 
-#: src/rfx-builder.c:4390
+#: src/rfx-builder.c:4302
 #, c-format
 msgid ""
 "\n"
@@ -7627,21 +7642,21 @@
 "%sへの移動に失敗しました。\n"
 "戻り値は%dです。\n"
 
-#: src/rfx-builder.c:4610
+#: src/rfx-builder.c:4518
 msgid "_Apply Real Time Effects to Selection"
 msgstr "リアルタイムエフェクトを選択範囲に適用(_A)"
 
-#: src/rfx-builder.c:4664
+#: src/rfx-builder.c:4572
 #, c-format
 msgid "Loading rendered effect %s..."
 msgstr "レンダリングエフェクト %s の読み込み中..."
 
-#: src/rfx-builder.c:4766
+#: src/rfx-builder.c:4674
 msgid ""
 "See: VJ - show VJ keys. Set the realtime effects, and then apply them here."
 msgstr "参照: VJ - VJキーを表示。リアルタイムエフェクトを設定し、適用します。"
 
-#: src/preferences.c:359
+#: src/preferences.c:351
 msgid ""
 "\n"
 "\n"
@@ -7653,7 +7668,7 @@
 "映像プラグインは、フルスクリーンと\n"
 "分離ウィンドウ (fs) モードでのみ利用可能です。\n"
 
-#: src/preferences.c:408
+#: src/preferences.c:400
 msgid ""
 "\n"
 "\n"
@@ -7665,7 +7680,7 @@
 "\n"
 "(空き領域 = 不明)"
 
-#: src/preferences.c:412
+#: src/preferences.c:403
 #, c-format
 msgid ""
 "\n"
@@ -7678,14 +7693,14 @@
 "\n"
 "(空き容量 = %s)"
 
-#: src/preferences.c:416
+#: src/preferences.c:408
 msgid ""
 "The temp directory is LiVES working directory where opened clips and sets "
 "are stored.\n"
 "It should be in a partition with plenty of free disk space.\n"
 msgstr ""
 
-#: src/preferences.c:784
+#: src/preferences.c:839
 #, c-format
 msgid ""
 "Unable to create or write to the new temporary directory.\n"
@@ -7696,7 +7711,7 @@
 "The directory will not be changed now.\n"
 msgstr ""
 
-#: src/preferences.c:786
+#: src/preferences.c:843
 #, c-format
 msgid ""
 "Unable to create or write to the new temporary directory.\n"
@@ -7706,7 +7721,7 @@
 "The directory will not be changed now.\n"
 msgstr ""
 
-#: src/preferences.c:798
+#: src/preferences.c:856
 msgid ""
 "You have chosen to change the temporary directory.\n"
 "Please make sure you have no other copies of LiVES open.\n"
@@ -7726,7 +7741,7 @@
 "あるいは、一時ディレクトリの指定をもとの設定に戻すために、キャンセルを押して"
 "ください。"
 
-#: src/preferences.c:1169
+#: src/preferences.c:1221
 msgid ""
 "\n"
 "Unable to switch audio players to jack - jackd must be installed first.\n"
@@ -7737,7 +7752,7 @@
 "いる必要があります。\n"
 "http://jackaudio.orgを参照してください。\n"
 
-#: src/preferences.c:1175
+#: src/preferences.c:1226
 msgid ""
 "\n"
 "Switching audio players requires restart (jackd must not be running)\n"
@@ -7745,7 +7760,7 @@
 "\n"
 "音声プレーヤーの変更は再起動が必要です(jackd が動作していてはいけません)\n"
 
-#: src/preferences.c:1202
+#: src/preferences.c:1253
 msgid ""
 "\n"
 "Unable to switch audio players to pulse audio\n"
@@ -7757,67 +7772,67 @@
 "PulseAudioサーバーが前もってインストールされている必要があります。\n"
 "http://www.pulseaudio.orgを参照してください。\n"
 
-#: src/preferences.c:1502
+#: src/preferences.c:1544
 msgid "PCM (highest quality; largest files)"
 msgstr "PCM (再高品質、ファイルサイズ最大)"
 
-#: src/preferences.c:2063
+#: src/preferences.c:2096
 msgid "LiVES: - Preferences"
 msgstr "LiVES: - 設定"
 
-#: src/preferences.c:2142
+#: src/preferences.c:2177
 msgid "Open file selection maximised"
 msgstr "ファイル選択を最大化して開く"
 
-#: src/preferences.c:2149
+#: src/preferences.c:2184
 msgid "Show recent files in the File menu"
 msgstr "最近使ったファイルをファイルメニューに表示"
 
-#: src/preferences.c:2158
+#: src/preferences.c:2193
 msgid "Stop screensaver on playback    "
 msgstr "再生時にスクリーンセーバーを停止    "
 
-#: src/preferences.c:2165
+#: src/preferences.c:2200
 msgid "Open main window maximised"
 msgstr "起動時にメインウィンドウを最大化"
 
-#: src/preferences.c:2173
+#: src/preferences.c:2208
 msgid "Show toolbar when background is blanked"
 msgstr "バックグラウンドなしの場合にツールバーを表示"
 
-#: src/preferences.c:2181
+#: src/preferences.c:2216
 msgid "Allow mouse wheel to switch clips"
 msgstr "マウスホイールでクリップを切り替える"
 
-#: src/preferences.c:2192
+#: src/preferences.c:2227
 msgid "Shrink previews to fit in interface"
 msgstr "プレビューを画面に合わせて調整"
 
-#: src/preferences.c:2202
+#: src/preferences.c:2237
 msgid "Startup mode:"
 msgstr "起動時のウィンドウ"
 
-#: src/preferences.c:2206
+#: src/preferences.c:2241
 msgid "_Clip editor"
 msgstr "クリップエディター(_C)"
 
-#: src/preferences.c:2210
+#: src/preferences.c:2245
 msgid "_Multitrack mode"
 msgstr "マルチトラック(_M)"
 
-#: src/preferences.c:2234
+#: src/preferences.c:2268
 msgid "Multi-head support"
 msgstr "マルチヘッドのサポート"
 
-#: src/preferences.c:2242
+#: src/preferences.c:2276
 msgid " monitor number for LiVES interface"
 msgstr " LiVES用のモニター番号"
 
-#: src/preferences.c:2248
+#: src/preferences.c:2282
 msgid " monitor number for playback"
 msgstr " 再生用のモニター番号"
 
-#: src/preferences.c:2260
+#: src/preferences.c:2294
 msgid ""
 "A setting of 0 means use all available monitors (only works with some "
 "playback plugins)."
@@ -7825,271 +7840,271 @@
 "0 に設定すると利用可能なすべてのモニタを使用します(一部のプレイバックプラグイ"
 "ンのみ動作)。"
 
-#: src/preferences.c:2270
+#: src/preferences.c:2304
 msgid "Force single monitor"
 msgstr "シングルモニターにする"
 
-#: src/preferences.c:2271
+#: src/preferences.c:2305
 msgid "Ignore all except the first monitor."
 msgstr ""
 
-#: src/preferences.c:2293
+#: src/preferences.c:2327
 msgid "Show clip thumbnails during playback"
 msgstr ""
 
-#: src/preferences.c:2306
+#: src/preferences.c:2340
 msgid "GUI"
 msgstr "GUI"
 
-#: src/preferences.c:2321
+#: src/preferences.c:2355
 msgid "When entering Multitrack mode:"
 msgstr "マルチトラックモードに入るとき:"
 
-#: src/preferences.c:2330
+#: src/preferences.c:2364
 msgid "_Prompt me for width, height, fps and audio settings"
 msgstr "幅、高さ、fps、音声の設定を求める(_P)"
 
-#: src/preferences.c:2336
+#: src/preferences.c:2370
 msgid "_Always use the following values:"
 msgstr "常に次の値を使う(_A):"
 
-#: src/preferences.c:2345
+#: src/preferences.c:2379
 msgid "Use these same _values for rendering a new clip"
 msgstr "新しいクリップのレンダリングにこれらの同じ値を使う(_V)"
 
-#: src/preferences.c:2370
+#: src/preferences.c:2404
 msgid "_Width           "
 msgstr "幅(_W)           "
 
-#: src/preferences.c:2375
+#: src/preferences.c:2409
 msgid "          _Height      "
 msgstr "          高さ(_H)      "
 
-#: src/preferences.c:2379
+#: src/preferences.c:2413
 msgid "          _FPS"
 msgstr "          FPS(_F)"
 
-#: src/preferences.c:2387
+#: src/preferences.c:2421
 msgid "Enable backing audio track"
 msgstr "音声トラックを逆再生時も有効にする"
 
-#: src/preferences.c:2394
+#: src/preferences.c:2428
 msgid "Audio track per video track"
 msgstr "音声/映像トラック"
 
-#: src/preferences.c:2423
+#: src/preferences.c:2457
 msgid "    _Undo buffer size (MB)    "
 msgstr "    アンドゥバッファのサイズ(_U) (MB)    "
 
-#: src/preferences.c:2432
+#: src/preferences.c:2466
 msgid "_Exit multitrack mode after rendering"
 msgstr "レンダリング後にマルチトラックモードを終了(_E)"
 
-#: src/preferences.c:2440
+#: src/preferences.c:2474
 msgid "Auto backup layouts"
 msgstr "レイアウトを自動でバックアップ"
 
-#: src/preferences.c:2445
+#: src/preferences.c:2479
 msgid "_Every"
 msgstr "すべての(_E)"
 
-#: src/preferences.c:2453
+#: src/preferences.c:2487
 msgid "seconds"
 msgstr "秒"
 
-#: src/preferences.c:2461
+#: src/preferences.c:2495
 msgid "After every _change"
 msgstr "すべての変更を行った後(_C)"
 
-#: src/preferences.c:2467
+#: src/preferences.c:2501
 msgid "_Never"
 msgstr "しない(_N)"
 
-#: src/preferences.c:2490
+#: src/preferences.c:2523
 msgid "Multitrack/Render"
 msgstr "マルチトラック/レンダリング"
 
-#: src/preferences.c:2508
+#: src/preferences.c:2541
 msgid "Use instant opening when possible"
 msgstr "可能な場合にインスタントオープンを使用"
 
-#: src/preferences.c:2509
+#: src/preferences.c:2543
 msgid "Enable instant opening of some file types using decoder plugins"
 msgstr ""
 "いくつかのファイルタイプ対し、デコーダープラグインを使ってインスタントオープ"
 "ンを有効とする"
 
-#: src/preferences.c:2531
+#: src/preferences.c:2567
 msgid "Video open command (fallback)"
 msgstr ""
 
-#: src/preferences.c:2543
+#: src/preferences.c:2579
 msgid "Open/render compression"
 msgstr ""
 
-#: src/preferences.c:2546
+#: src/preferences.c:2582
 msgid " %     ( lower = slower, larger files; for jpeg, higher quality )"
 msgstr ""
 " % （小さな値だと処理時間が長くファイルも大きくなりますがJPEGは画質が上がりま"
 "す）"
 
-#: src/preferences.c:2558
+#: src/preferences.c:2594
 msgid "Default image format"
 msgstr ""
 
-#: src/preferences.c:2562
+#: src/preferences.c:2598
 msgid "_jpeg"
 msgstr "jpeg(_J)"
 
-#: src/preferences.c:2565
+#: src/preferences.c:2601
 msgid "_png"
 msgstr "png(_P)"
 
-#: src/preferences.c:2572
+#: src/preferences.c:2608
 msgid "(Check Help/Troubleshoot to see which image formats are supported)"
 msgstr ""
 "（どの画像フォーマットが使用可能かどうか、「ヘルプ | トラブルシュート」で確認"
 "してください）"
 
-#: src/preferences.c:2580
+#: src/preferences.c:2616
 msgid "Enable automatic deinterlacing when possible"
 msgstr "可能な場合にインターレースの自動解除を有効にする"
 
-#: src/preferences.c:2582
+#: src/preferences.c:2619
 msgid "Automatically deinterlace frames when a plugin suggests it"
 msgstr "プラグインの提案をするときはフレームのインターレース自動解除を行う"
 
-#: src/preferences.c:2593
+#: src/preferences.c:2632
 #, fuzzy
 msgid "Automatic trimming / padding of audio when possible"
 msgstr "可能な場合にインターレースの自動解除を有効にする"
 
-#: src/preferences.c:2595
+#: src/preferences.c:2634
 #, fuzzy
 msgid "Automatically trim or pad audio when a plugin suggests it"
 msgstr "プラグインの提案をするときはフレームのインターレース自動解除を行う"
 
-#: src/preferences.c:2606
+#: src/preferences.c:2646
 msgid "Ignore blank borders when possible"
 msgstr "可能ならブランクボーダーを無視"
 
-#: src/preferences.c:2608
+#: src/preferences.c:2648
 msgid "Clip any blank borders from frames where possible"
 msgstr "可能ならフレームからブランクボーダーを取り除く"
 
-#: src/preferences.c:2619
+#: src/preferences.c:2660
 msgid "When opening multiple files, concatenate images into one clip"
 msgstr "複数ファイルを開くとき、画像を一つのクリップに結合する"
 
-#: src/preferences.c:2629
+#: src/preferences.c:2670
 msgid "Decoding"
 msgstr "デコード"
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:2652
+#: src/preferences.c:2693
 msgid "Low - can improve performance on slower machines"
 msgstr "低 - 遅いマシンで性能が向上します"
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:2654
+#: src/preferences.c:2695
 msgid "Normal - recommended for most users"
 msgstr "通常 - 多くのユーザーに推奨"
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:2656
+#: src/preferences.c:2697
 msgid "High - can improve quality on very fast machines"
 msgstr "高 - 速いマシンで品質が向上します"
 
-#: src/preferences.c:2659
+#: src/preferences.c:2700
 msgid "Preview _quality"
 msgstr "プレビュー品質(_Q)"
 
-#: src/preferences.c:2660
+#: src/preferences.c:2701
 msgid "The preview quality for video playback - affects resizing"
 msgstr "映像のプレビュー品質 - リサイズに影響"
 
-#: src/preferences.c:2675
+#: src/preferences.c:2717
 msgid "_Show FPS statistics"
 msgstr "FPS統計を表示する(_S)"
 
-#: src/preferences.c:2694
+#: src/preferences.c:2736
 msgid "_Plugin"
 msgstr "プラグイン(_P)"
 
-#: src/preferences.c:2718
+#: src/preferences.c:2760
 msgid "Stream audio"
 msgstr "音声ストリーム"
 
-#: src/preferences.c:2721
+#: src/preferences.c:2763
 msgid "Stream audio to playback plugin"
 msgstr "再生プラグインへの音声ストリーム"
 
-#: src/preferences.c:2734
+#: src/preferences.c:2778
 msgid "Record player output"
 msgstr ""
 
-#: src/preferences.c:2737
+#: src/preferences.c:2781
 msgid "Record output from player instead of input to player"
 msgstr ""
 
-#: src/preferences.c:2744
+#: src/preferences.c:2789
 msgid "VIDEO"
 msgstr "映像"
 
-#: src/preferences.c:2787
+#: src/preferences.c:2833
 msgid "_Player"
 msgstr "プレーヤー(_P)"
 
-#: src/preferences.c:2792
+#: src/preferences.c:2838
 msgid "(See also the Jack Integration tab for jack startup options)"
 msgstr "(JACKサーバー統合タブで、JACKサーバーの起動オプションを変更できます)"
 
-#: src/preferences.c:2819
+#: src/preferences.c:2865
 msgid "mplayer"
 msgstr "mplayer"
 
-#: src/preferences.c:2830
+#: src/preferences.c:2876
 #, fuzzy
 msgid "mplayer2"
 msgstr "mplayer"
 
-#: src/preferences.c:2833
+#: src/preferences.c:2879
 msgid "Audio play _command"
 msgstr "音声再生コマンド(_C)"
 
-#: src/preferences.c:2840
+#: src/preferences.c:2886
 msgid "- internal -"
 msgstr "- 内部 -"
 
-#: src/preferences.c:2849
+#: src/preferences.c:2895
 msgid "Audio follows video _rate/direction"
 msgstr "音声を映像のフレームレート/方向に合わせる(JACKのみ)(_R)"
 
-#: src/preferences.c:2857
+#: src/preferences.c:2903
 msgid "Audio follows _clip switches"
 msgstr "音声をクリップスイッチに合わせる(JACKのみ)(_C)"
 
-#: src/preferences.c:2864
+#: src/preferences.c:2910
 msgid "Source:"
 msgstr ""
 
-#: src/preferences.c:2868
+#: src/preferences.c:2914
 msgid "_Internal"
 msgstr ""
 
-#: src/preferences.c:2873
+#: src/preferences.c:2919
 msgid "_External (requires jack or pulse audio player)"
 msgstr ""
 
-#: src/preferences.c:2892
+#: src/preferences.c:2940
 msgid "AUDIO"
 msgstr "音声"
 
-#: src/preferences.c:2902
+#: src/preferences.c:2950
 msgid "Playback"
 msgstr "再生"
 
-#: src/preferences.c:2925
+#: src/preferences.c:2973
 msgid ""
 "Record audio when capturing an e_xternal window\n"
 " (requires jack or pulse audio)"
@@ -8097,68 +8112,68 @@
 "外部ウィンドウをキャプチャーするとき、音声も記録する(_X)\n"
 "(JACKサーバーかPulseAudioサーバーが必要)"
 
-#: src/preferences.c:2940
+#: src/preferences.c:2988
 msgid "      What to record when 'r' is pressed   "
 msgstr "      ’r’が押されたときに記録するもの   "
 
-#: src/preferences.c:2949
+#: src/preferences.c:2997
 msgid "_Frame changes"
 msgstr "フレーム変更(_F)"
 
-#: src/preferences.c:2964
+#: src/preferences.c:3012
 msgid "F_PS changes"
 msgstr "FPSの変更(_P)"
 
-#: src/preferences.c:2982
+#: src/preferences.c:3030
 msgid "_Real time effects"
 msgstr "リアルタイムエフェクト(_R)"
 
-#: src/preferences.c:2993
+#: src/preferences.c:3041
 msgid "_Clip switches"
 msgstr "クリップスイッチ(_C)"
 
-#: src/preferences.c:3004
+#: src/preferences.c:3052
 msgid "_Audio (requires jack or pulse audio player)"
 msgstr ""
 
-#: src/preferences.c:3024
+#: src/preferences.c:3072
 msgid "Pause recording if free disk space falls below"
 msgstr "ディスクの空き容量が以下を下回ったら記録を停止します"
 
 #. TRANSLATORS: gigabytes
-#: src/preferences.c:3030
+#: src/preferences.c:3078
 msgid "GB"
 msgstr "GB"
 
-#: src/preferences.c:3037
+#: src/preferences.c:3085
 msgid "Recording"
 msgstr "記録"
 
-#: src/preferences.c:3055
+#: src/preferences.c:3103
 msgid "Encoder"
 msgstr ""
 
-#: src/preferences.c:3090
+#: src/preferences.c:3137
 msgid "Output format"
 msgstr "出力フォーマット"
 
-#: src/preferences.c:3106
+#: src/preferences.c:3153
 msgid "Audio codec"
 msgstr "音声コーデック"
 
-#: src/preferences.c:3119
+#: src/preferences.c:3165
 msgid "Encoding"
 msgstr "エンコード"
 
-#: src/preferences.c:3134
+#: src/preferences.c:3180
 msgid "Use _antialiasing when resizing"
 msgstr "リサイズ時にアンチエイリアスを使用する(_A)"
 
-#: src/preferences.c:3143
+#: src/preferences.c:3189
 msgid "Number of _real time effect keys"
 msgstr "リアルタイムエフェクトキーの数(_R)"
 
-#: src/preferences.c:3145
+#: src/preferences.c:3192
 msgid ""
 "The number of \"virtual\" real time effect keys. They can be controlled "
 "through the real time effects window, or via network (OSC)."
@@ -8166,95 +8181,95 @@
 "\"バーチャル\"リアルタイムエフェクトキーの数。リアルタイムエフェクトウィンド"
 "ウやネットワーク(OSC)を介してコントロールされます。"
 
-#: src/preferences.c:3152
+#: src/preferences.c:3199
 msgid "Use _threads where possible when applying effects"
 msgstr "エフェクトを適用する際、可能であればマルチスレッドを利用する(_T)"
 
-#: src/preferences.c:3159
+#: src/preferences.c:3207
 msgid "Number of _threads"
 msgstr "スレッドの数(_T)"
 
-#: src/preferences.c:3172
+#: src/preferences.c:3221
 msgid "Restart is required if any of the following paths are changed:"
 msgstr ""
 
-#: src/preferences.c:3182
+#: src/preferences.c:3231
 msgid "Weed plugin path"
 msgstr ""
 
-#: src/preferences.c:3184
+#: src/preferences.c:3234
 msgid "Frei0r plugin path"
 msgstr ""
 
-#: src/preferences.c:3186
+#: src/preferences.c:3237
 msgid "LADSPA plugin path"
 msgstr ""
 
-#: src/preferences.c:3209
+#: src/preferences.c:3261
 msgid "      Video load directory (default)      "
 msgstr "      ビデオを読み込むディレクトリ (デフォルト)      "
 
-#: src/preferences.c:3215
+#: src/preferences.c:3267
 msgid "      Video save directory (default) "
 msgstr "      ビデオ保存ディレクトリ (デフォルト) "
 
-#: src/preferences.c:3221
+#: src/preferences.c:3273
 msgid "      Audio load directory (default) "
 msgstr "      音声を読み込むディレクトリ (デフォルト) "
 
-#: src/preferences.c:3227
+#: src/preferences.c:3279
 msgid "      Image directory (default) "
 msgstr "      画像ディレクトリ (デフォルト) "
 
-#: src/preferences.c:3233
+#: src/preferences.c:3285
 msgid "      Backup/Restore directory (default) "
 msgstr "      バックアップ/リストアディレクトリ (デフォルト) "
 
-#: src/preferences.c:3239
+#: src/preferences.c:3291
 msgid "      Temp directory (do not remove) "
 msgstr "      一時ディレクトリ (削除不可能) "
 
-#: src/preferences.c:3252
+#: src/preferences.c:3304
 msgid "The default directory for loading video clips from"
 msgstr "ビデオクリップを読み込むデフォルトのディレクトリ"
 
-#: src/preferences.c:3277
+#: src/preferences.c:3329
 msgid "The default directory for saving encoded clips to"
 msgstr "エンコードしたクリップを書き込むデフォルトのディレクトリ"
 
-#: src/preferences.c:3285
+#: src/preferences.c:3337
 msgid "The default directory for loading and saving audio"
 msgstr "音声を読み込み/保存するデフォルトのディレクトリ"
 
-#: src/preferences.c:3293
+#: src/preferences.c:3345
 msgid "The default directory for saving frameshots to"
 msgstr "フレームショットを保存するデフォルトのディレクトリ"
 
-#: src/preferences.c:3301
+#: src/preferences.c:3353
 msgid "The default directory for backing up/restoring single clips"
 msgstr "シングルクリップをバックアップ/リストアするデフォルトのディレクトリ"
 
-#: src/preferences.c:3309
+#: src/preferences.c:3361
 msgid "LiVES working directory."
 msgstr "LiVES作業用ディレクトリ"
 
-#: src/preferences.c:3359
+#: src/preferences.c:3412
 msgid "Directories"
 msgstr "ディレクトリ"
 
-#: src/preferences.c:3374
+#: src/preferences.c:3427
 msgid "Warn if diskspace falls below: "
 msgstr "ディスク容量がこれ以下になった場合に警告: "
 
-#: src/preferences.c:3380 src/preferences.c:3394
+#: src/preferences.c:3433 src/preferences.c:3447
 msgid " MB [set to 0 to disable]"
 msgstr " MB [ 0 にすると無効]"
 
-#: src/preferences.c:3389
+#: src/preferences.c:3442
 msgid "Diskspace critical level: "
 msgstr "ディスク容量が致命的なレベル: "
 
-#: src/preferences.c:3407
+#: src/preferences.c:3461
 msgid ""
 "Warn on Insert / Merge if _frame rate of clipboard does not match frame rate "
 "of selection"
@@ -8262,19 +8277,19 @@
 "クリップボードのフレームレートが選択範囲のフレームレートと合わない場合に警告"
 "(_F)"
 
-#: src/preferences.c:3417
+#: src/preferences.c:3471
 msgid "Warn on Open if file _size exceeds "
 msgstr "ファイルサイズが次を超えるときに警告する(_S) "
 
-#: src/preferences.c:3425
+#: src/preferences.c:3479
 msgid " MB"
 msgstr " MB"
 
-#: src/preferences.c:3432
+#: src/preferences.c:3486
 msgid "Show a warning before saving a se_t"
 msgstr "セットを保存する前に警告を表示する(_T)"
 
-#: src/preferences.c:3442
+#: src/preferences.c:3496
 #, fuzzy
 msgid ""
 "Show a warning if _mplayer/mplayer2, sox, composite or convert is not found "
@@ -8283,70 +8298,70 @@
 "起動時にmplayer, sox, composite, convertの各コマンドを検出できないときに警告"
 "を表示する(_M)"
 
-#: src/preferences.c:3452
+#: src/preferences.c:3506
 msgid "Show a warning if no _rendered effects are found at startup."
 msgstr "開始時にレンダリングエフェクトが見つからないときに警告を表示する(_R)"
 
-#: src/preferences.c:3464
+#: src/preferences.c:3518
 msgid "Show a warning if no _encoder plugins are found at startup."
 msgstr "開始時にエンコーダプラグインが見つからないときに警告を表示する(_E)"
 
-#: src/preferences.c:3474
+#: src/preferences.c:3528
 msgid "Show a warning if a _duplicate set name is entered."
 msgstr "同じセット名が入力されたときに警告を表示する(_D)"
 
-#: src/preferences.c:3485
+#: src/preferences.c:3539
 msgid "When a set is loaded, warn if clips are missing from _layouts."
 msgstr ""
 "セットが読み込みされたときに、クリップがレイアウトから失われるときに警告する"
 "(_L)"
 
-#: src/preferences.c:3495
+#: src/preferences.c:3550
 msgid "Warn if a clip used in a layout is about to be closed."
 msgstr "レイアウトで使われているクリップが閉じられるときには警告する。"
 
-#: src/preferences.c:3505
+#: src/preferences.c:3561
 msgid "Warn if frames used in a layout are about to be deleted."
 msgstr "レイアウトで使われているフレームが削除されるときには警告する。"
 
-#: src/preferences.c:3515
+#: src/preferences.c:3572
 msgid "Warn if frames used in a layout are about to be shifted."
 msgstr "レイアウトで使われているフレームが移動するときには警告する。"
 
-#: src/preferences.c:3525
+#: src/preferences.c:3583
 msgid "Warn if frames used in a layout are about to be altered."
 msgstr "レイアウトで使われているフレームが変化するときには警告する。"
 
-#: src/preferences.c:3535
+#: src/preferences.c:3594
 msgid "Warn if audio used in a layout is about to be deleted."
 msgstr "レイアウトで使われている音声が削除されるときには警告する。"
 
-#: src/preferences.c:3546
+#: src/preferences.c:3606
 msgid "Warn if audio used in a layout is about to be shifted."
 msgstr "レイアウトで使われている音声が移動するときには警告する。"
 
-#: src/preferences.c:3556
+#: src/preferences.c:3617
 msgid "Warn if audio used in a layout is about to be altered."
 msgstr "レイアウトで使われている音声が変化するときには警告する。"
 
-#: src/preferences.c:3566
+#: src/preferences.c:3628
 msgid "Popup layout errors after clip changes."
 msgstr "クリップが変更された後のレイアウトエラーをポップアップ表示する。"
 
-#: src/preferences.c:3577
+#: src/preferences.c:3639
 msgid "Warn if the layout has not been saved when leaving multitrack mode."
 msgstr ""
 "マルチトラックモードを抜けるときにレイアウトが保存されていないときは警告す"
 "る。"
 
-#: src/preferences.c:3588
+#: src/preferences.c:3650
 msgid ""
 "Warn if multitrack has no audio channels, and a layout with audio is loaded."
 msgstr ""
 "マルチトラックモードに音声チャネルが無いのに音声付きレイアウトが読み込まれる"
 "ときには警告する。"
 
-#: src/preferences.c:3598
+#: src/preferences.c:3660
 msgid ""
 "Warn if multitrack has audio channels, and your audio player is not \"jack\" "
 "or \"pulse audio\"."
@@ -8354,114 +8369,114 @@
 "複数のトラックが音声チャンネルを持っている場合はJACKサーバかPulseAudioサーバ"
 "を使うよう警告する"
 
-#: src/preferences.c:3610
+#: src/preferences.c:3672
 msgid "Show info message after importing from firewire device."
 msgstr "Firewireデバイスからのインポート後に情報メッセージを表示する"
 
-#: src/preferences.c:3626
+#: src/preferences.c:3688
 msgid "Show a warning before opening a yuv4mpeg stream (advanced)."
 msgstr "yuv4mpegストリームを開く前に警告を出す(高度)"
 
-#: src/preferences.c:3639
+#: src/preferences.c:3701
 msgid "Show a warning when multitrack is low on backup space."
 msgstr "マルチトラックが空き容量より足りない場合に警告を表示する"
 
-#: src/preferences.c:3650
+#: src/preferences.c:3713
 msgid "Show a warning advising cleaning of disk space after a crash."
 msgstr ""
 "表示する警告がクラッシュした後、ディスクスペースをクリーニングするよう促しま"
 "す。"
 
-#: src/preferences.c:3661
+#: src/preferences.c:3725
 msgid "Show a warning if unable to connect to pulseaudio player."
 msgstr "PulseAudioサーバーに接続できなかった場合に警告します。"
 
-#: src/preferences.c:3673
+#: src/preferences.c:3737
 #, fuzzy
 msgid "Show a warning before wiping a layout which has unsaved changes."
 msgstr "yuv4mpegストリームを開く前に警告を出す(高度)"
 
-#: src/preferences.c:3685
+#: src/preferences.c:3749
 msgid "Warnings"
 msgstr "警告"
 
-#: src/preferences.c:3703
+#: src/preferences.c:3767
 msgid "Midi synch (requires the files midistart and midistop)"
 msgstr ""
 "MMC（MIDI Machine Control）を送信する（midistartおよびmidistopファイルが必要"
 "です）"
 
-#: src/preferences.c:3715
+#: src/preferences.c:3779
 msgid "When inserting/merging frames:  "
 msgstr "フレームの挿入とマージをするときの処理:  "
 
-#: src/preferences.c:3719
+#: src/preferences.c:3783
 msgid "_Speed Up/Slow Down Insertion"
 msgstr "スピードアップ/スローダウンして挿入(_S)"
 
-#: src/preferences.c:3723
+#: src/preferences.c:3787
 msgid "_Resample Insertion"
 msgstr "リサンプリングして挿入(_R)"
 
-#: src/preferences.c:3730
+#: src/preferences.c:3794
 msgid "CD device           "
 msgstr "CDデバイス           "
 
-#: src/preferences.c:3733
+#: src/preferences.c:3797
 msgid "LiVES can load audio tracks from this CD"
 msgstr "LiVESはこのCDから音声トラックを読み込むことができます"
 
-#: src/preferences.c:3746
+#: src/preferences.c:3813
 msgid "Default FPS        "
 msgstr "デフォルトのFPS        "
 
-#: src/preferences.c:3749
+#: src/preferences.c:3816
 msgid "Frames per second to use when none is specified"
 msgstr "何も指定しないときのFPS"
 
-#: src/preferences.c:3757
+#: src/preferences.c:3825
 msgid "Misc"
 msgstr "その他"
 
-#: src/preferences.c:3782
+#: src/preferences.c:3850
 msgid "New theme:           "
 msgstr "新しいテーマ:           "
 
-#: src/preferences.c:3800
+#: src/preferences.c:3867
 msgid "Themes"
 msgstr "テーマ"
 
-#: src/preferences.c:3815
+#: src/preferences.c:3882
 msgid "Download bandwidth (Kb/s)       "
 msgstr "ダウンロードバンド幅 (Kb/s)       "
 
-#: src/preferences.c:3823
+#: src/preferences.c:3890
 msgid "LiVES must be compiled without \"configure --disable-OSC\" to use OMC"
 msgstr ""
 "OMCを利用するには、\"configure --disable-OSC\"無しでLiVESをコンパイルしなけれ"
 "ばなりません。"
 
-#: src/preferences.c:3833
+#: src/preferences.c:3900
 msgid "OMC remote control enabled"
 msgstr "OMCリモートコントロールを有効にする"
 
-#: src/preferences.c:3841
+#: src/preferences.c:3908
 msgid "UDP port       "
 msgstr "UDPポート       "
 
-#: src/preferences.c:3850
+#: src/preferences.c:3917
 msgid "Start OMC on startup"
 msgstr "起動時にOMCを開始する"
 
-#: src/preferences.c:3870
+#: src/preferences.c:3937
 msgid "Streaming/Networking"
 msgstr "ストリーミング/ネットワーキング"
 
-#: src/preferences.c:3882
+#: src/preferences.c:3949
 msgid "Jack transport"
 msgstr "JACKトランスポート機能"
 
-#: src/preferences.c:3886
+#: src/preferences.c:3953
 msgid ""
 "LiVES must be compiled with jack/transport.h and jack/jack.h present to use "
 "jack transport"
@@ -8469,47 +8484,47 @@
 "JACKサウンドサーバのトランスポート機能を使うには、jack/transport.h と jack/"
 "jack.h を使ってLiVESをコンパイルする必要があります"
 
-#: src/preferences.c:3892
+#: src/preferences.c:3959
 msgid "Jack _transport config file"
 msgstr "JACKサーバーの設定ファイル(_T)"
 
-#: src/preferences.c:3899 src/preferences.c:3989
+#: src/preferences.c:3967 src/preferences.c:4058
 msgid "Start _server on LiVES startup"
 msgstr "LiVES起動時にJACKサーバーを起動(_S)"
 
-#: src/preferences.c:3911
+#: src/preferences.c:3979
 msgid "Jack transport _master (start and stop)"
 msgstr "JACKサーバーのトランスポート機能のマスターとなる(_M)"
 
-#: src/preferences.c:3921
+#: src/preferences.c:3989
 msgid "Jack transport _client (start and stop)"
 msgstr "JACKサーバーのトランスポート機能のクライアントとなる(_C)"
 
-#: src/preferences.c:3935
+#: src/preferences.c:4003
 msgid "Jack transport sets start position"
 msgstr "JACKサーバーのトランスポート機能にスタート位置を合わせる"
 
-#: src/preferences.c:3952
+#: src/preferences.c:4020
 msgid "Jack transport timebase slave"
 msgstr "JACKサーバーのトランスポート機能に時間を合わせる"
 
-#: src/preferences.c:3963
+#: src/preferences.c:4031
 msgid "(See also Playback -> Audio follows video rate/direction)"
 msgstr ""
 "(「再生 | 音声を映像のフレームレート/方向に合わせる」オプションも確認してくだ"
 "さい)"
 
-#: src/preferences.c:3971
+#: src/preferences.c:4039
 msgid "Jack audio"
 msgstr "JACK音声機能"
 
-#: src/preferences.c:3975
+#: src/preferences.c:4043
 msgid "LiVES must be compiled with jack/jack.h present to use jack audio"
 msgstr ""
 "JACKサーバーの音声機能を使うためには、jack/jack.hを使ってLiVESをコンパイルす"
 "る必要があります"
 
-#: src/preferences.c:3978
+#: src/preferences.c:4046
 msgid ""
 "You MUST set the audio player to \"jack\" in the Playback tab to use jack "
 "audio"
@@ -8517,76 +8532,76 @@
 "JACk音声機能を使うには「設定 | 再生」の音声で、プレイヤーを\"jack\"に指定する"
 "必要があります"
 
-#: src/preferences.c:3984
+#: src/preferences.c:4052
 msgid "Jack _audio server config file"
 msgstr "JACKサーバーの設定ファイル(_A)"
 
-#: src/preferences.c:3996
+#: src/preferences.c:4065
 msgid "Play audio even when transport is _paused"
 msgstr "JACKトランスポート機能が停止しても音声の再生を続けます(_P)"
 
-#: src/preferences.c:4008
+#: src/preferences.c:4077
 msgid "Automatically connect to System Out ports when 'playing' External Audio"
 msgstr ""
 
-#: src/preferences.c:4021
+#: src/preferences.c:4090
 msgid "Jack Integration"
 msgstr "JACKサーバー統合"
 
-#: src/preferences.c:4035
+#: src/preferences.c:4104
 msgid "Events to respond to:"
 msgstr "反応するイベント:"
 
-#: src/preferences.c:4044
+#: src/preferences.c:4113
 msgid "_Joystick events"
 msgstr "ジョイスティックイベント(_J)"
 
-#: src/preferences.c:4051
+#: src/preferences.c:4120
 msgid "_Joystick device"
 msgstr "ジョイスティックデバイス(_J)"
 
-#: src/preferences.c:4053
+#: src/preferences.c:4122
 msgid "The joystick device, e.g. /dev/input/js0"
 msgstr "ジョイスティックデバイス。例）/dev/input/js0"
 
-#: src/preferences.c:4071
+#: src/preferences.c:4142
 msgid "_MIDI events"
 msgstr "MIDI イベント(_M)"
 
-#: src/preferences.c:4080
+#: src/preferences.c:4151
 msgid "Use _ALSA MIDI (recommended)"
 msgstr "ALSAシーケンサ機能を利用(_A) (推奨)"
 
-#: src/preferences.c:4082
+#: src/preferences.c:4153
 msgid "Create an ALSA MIDI port which other MIDI devices can be connected to"
 msgstr ""
 "MIDIデバイスを接続するために、ALSAシーケンサ機能にMIDIポートを作成します"
 
-#: src/preferences.c:4090
+#: src/preferences.c:4162
 msgid "Use _raw MIDI"
 msgstr "raw MIDIを利用(_R)"
 
-#: src/preferences.c:4092
+#: src/preferences.c:4164
 msgid "Read directly from the MIDI device"
 msgstr "MIDIデバイスに対応するノードから直接信号を取得します"
 
-#: src/preferences.c:4104
+#: src/preferences.c:4177
 msgid "_MIDI device"
 msgstr "MIDI デバイス(_M)"
 
-#: src/preferences.c:4106
+#: src/preferences.c:4179
 msgid "The MIDI device, e.g. /dev/input/midi0"
 msgstr "MIDIデバイス 例) /dev/input/midi0"
 
-#: src/preferences.c:4118
+#: src/preferences.c:4193
 msgid "Advanced"
 msgstr "詳細"
 
-#: src/preferences.c:4124
+#: src/preferences.c:4199
 msgid "MIDI check _rate"
 msgstr "MIDIチェックレート(_R)"
 
-#: src/preferences.c:4127
+#: src/preferences.c:4203
 msgid ""
 "Number of MIDI checks per keyboard tick. Increasing this may improve MIDI "
 "responsiveness, but may slow down playback."
@@ -8594,23 +8609,23 @@
 "キーボードによるMIDIチェックの数。この数を増やすとMIDIの反応が向上しますが、"
 "再生が遅くなるかもしれません。"
 
-#: src/preferences.c:4134
+#: src/preferences.c:4211
 msgid "MIDI repeat"
 msgstr "MIDIリピート"
 
-#: src/preferences.c:4137
+#: src/preferences.c:4214
 msgid "Number of non-reads allowed between succesive reads."
 msgstr "連続するリードにおける非リードの数"
 
-#: src/preferences.c:4140
+#: src/preferences.c:4218
 msgid "(Warning: setting this value too high can slow down playback.)"
 msgstr "(警告: 高い値を設定すると、再生が遅くなります)"
 
-#: src/preferences.c:4159
+#: src/preferences.c:4237
 msgid "MIDI/Joystick learner"
 msgstr "MIDI/ジョイスティック登録"
 
-#: src/preferences.c:4499
+#: src/preferences.c:4679
 msgid ""
 "\n"
 "LiVES will now shut down. You need to restart it for the directory change to "
@@ -8622,7 +8637,7 @@
 "す。\n"
 "OKのクリックで続けます。\n"
 
-#: src/preferences.c:4523
+#: src/preferences.c:4703
 msgid ""
 "For the directory change to take effect LiVES will restart when preferences "
 "dialog closes."
@@ -8630,64 +8645,64 @@
 "ディレクトリの変更を適用するため、LiVESは設定ダイアログを閉じると再起動しま"
 "す。"
 
-#: src/preferences.c:4527
+#: src/preferences.c:4707
 msgid "Theme changes will not take effect until the next time you start LiVES."
 msgstr "この変更は次にLiVESを起動するときまで影響を与えません。"
 
-#: src/preferences.c:4531
+#: src/preferences.c:4711
 msgid "Jack options will not take effect until the next time you start LiVES."
 msgstr ""
 "JACKサーバに関するオプションは、次にLiVESを開始するときまで変更が反映されませ"
 "ん"
 
-#: src/osc.c:2585
+#: src/osc.c:2616
 #, c-format
 msgid "Syncing to external framerate of %.8f frames per second.\n"
 msgstr "外部フレームレート(%.8fフレーム/秒)に合わせる\n"
 
-#: src/osc.c:6746
+#: src/osc.c:6938
 msgid "Cannot initialize OSC receiver\n"
 msgstr "OSCレシーバーを初期化できません。\n"
 
-#: src/osc.c:6770
+#: src/osc.c:6961
 #, c-format
 msgid "WARNING: Cannot start OSC server at UDP port %d\n"
 msgstr "警告: OSCサーバーをUDPポート %d で開始できません。\n"
 
-#: src/osc.c:6775
+#: src/osc.c:6963
 #, c-format
 msgid "Started OSC server at UDP port %d\n"
 msgstr "OSCサーバーをUDPポート %d で開始しました。\n"
 
-#: src/osc.c:6890
+#: src/osc.c:7076
 #, c-format
 msgid "Cannot start OSC/UDP server at port %d \n"
 msgstr "ポート%d番のOSC/UDPサーバーを起動できません。 \n"
 
-#: src/resample.c:125 src/resample.c:304
+#: src/resample.c:131 src/resample.c:305
 #, c-format
 msgid "Resizing frames 1 to %d"
 msgstr "フレーム1を %d にリサイズ"
 
-#: src/resample.c:140 src/resample.c:318
+#: src/resample.c:145 src/resample.c:318
 #, c-format
 msgid "Resizing/letterboxing frames 1 to %d"
 msgstr "フレーム1から%dを単純リサイズもしくはレターボックスを用いてリサイズ"
 
-#: src/resample.c:361 src/resample.c:385
+#: src/resample.c:360 src/resample.c:384
 msgid "Resize"
 msgstr "リサイズ"
 
-#: src/resample.c:395
+#: src/resample.c:394
 msgid "Resample/Resize"
 msgstr "リサンプル/リサイズ"
 
-#: src/resample.c:680
+#: src/resample.c:676
 #, c-format
 msgid "Length of video is now %d frames.\n"
 msgstr "現在、映像の長さは %d フレームです。\n"
 
-#: src/resample.c:745
+#: src/resample.c:737
 msgid ""
 "\n"
 "\n"
@@ -8697,146 +8712,146 @@
 "\n"
 "新しいレートは0より大きくなければなりません。\n"
 
-#: src/resample.c:797 src/resample.c:813
+#: src/resample.c:788 src/resample.c:803
 msgid "Resampling audio"
 msgstr "音声のリサンプリング"
 
-#: src/resample.c:831
+#: src/resample.c:821
 msgid "LiVES was unable to resample the audio as requested.\n"
 msgstr "LiVESは要求された音声のリサンプリングを実施できません。\n"
 
-#: src/resample.c:833 src/resample.c:837
+#: src/resample.c:823 src/resample.c:827
 msgid "Resample Audio"
 msgstr "音声のリサンプリング"
 
-#: src/resample.c:845
+#: src/resample.c:835
 #, c-format
 msgid "Audio was resampled to %d Hz, %d channels, %d bit"
 msgstr "音声は %d Hz、 %d チャンネル、%d ビットでリサンプリングされました。"
 
-#: src/resample.c:1034
+#: src/resample.c:1016
 #, c-format
 msgid "Resampling video at %.8f frames per second..."
 msgstr "%.8f フレーム/秒で映像をリサンプリング..."
 
-#: src/resample.c:1037
+#: src/resample.c:1018
 #, c-format
 msgid "Resampling video at %.3f frames per second..."
 msgstr "%.3f フレーム/秒で映像をリサンプリング..."
 
-#: src/resample.c:1068
+#: src/resample.c:1049
 msgid "Reordering error !\n"
 msgstr "リオーダリングエラー !\n"
 
-#: src/resample.c:1079
+#: src/resample.c:1060
 msgid "Resample"
 msgstr "リサンプリング"
 
-#: src/resample.c:1192
+#: src/resample.c:1173
 msgid "LiVES: - Resample Audio"
 msgstr "LiVES: - 音声のリサンプリング"
 
-#: src/resample.c:1195
+#: src/resample.c:1175
 msgid "LiVES: - Insert Silence"
 msgstr "LiVES: - 無音声の挿入"
 
-#: src/resample.c:1198
+#: src/resample.c:1177
 msgid "LiVES: - New Clip Audio"
 msgstr "LiVES: - 新しい音声クリップ"
 
-#: src/resample.c:1201
+#: src/resample.c:1179
 msgid "LiVES: - External Clip Settings"
 msgstr "LiVES: - 外部クリップ設定"
 
-#: src/resample.c:1238 src/resample.c:1358
+#: src/resample.c:1215 src/resample.c:1332
 msgid "Rate (Hz) "
 msgstr "レート (Hz) "
 
-#: src/resample.c:1245 src/resample.c:1372
+#: src/resample.c:1222 src/resample.c:1346
 msgid "Channels"
 msgstr ""
 
-#: src/resample.c:1252
+#: src/resample.c:1229
 msgid "Sample Size "
 msgstr ""
 
-#: src/resample.c:1268 src/resample.c:1425
+#: src/resample.c:1245 src/resample.c:1399
 msgid "Signed"
 msgstr "符号付き"
 
-#: src/resample.c:1274 src/resample.c:1435
+#: src/resample.c:1251 src/resample.c:1409
 msgid "Unsigned"
 msgstr "符号なし"
 
-#: src/resample.c:1297 src/resample.c:1460
+#: src/resample.c:1273 src/resample.c:1433
 msgid "Little Endian"
 msgstr "リトルエンディアン"
 
-#: src/resample.c:1303 src/resample.c:1468
+#: src/resample.c:1279 src/resample.c:1441
 msgid "Big Endian"
 msgstr "ビッグエンディアン"
 
-#: src/resample.c:1315
+#: src/resample.c:1290
 msgid "Current"
 msgstr "現在"
 
-#: src/resample.c:1340
+#: src/resample.c:1315
 msgid "_Enable audio"
 msgstr "音声を有効にする(_E)"
 
-#: src/resample.c:1372
+#: src/resample.c:1346
 msgid "_Channels"
 msgstr ""
 
-#: src/resample.c:1394
+#: src/resample.c:1368
 msgid "_Sample Size"
 msgstr ""
 
-#: src/resample.c:1394
+#: src/resample.c:1368
 msgid "Sample Size"
 msgstr ""
 
-#: src/resample.c:1489
+#: src/resample.c:1461
 msgid "New"
 msgstr "新規"
 
-#: src/resample.c:1512
+#: src/resample.c:1484
 msgid "_Frames Per Second "
 msgstr "フレーム/秒(_F) "
 
-#: src/resample.c:1530
+#: src/resample.c:1502
 msgid "Record for maximum:  "
 msgstr "最大レコード:  "
 
-#: src/resample.c:1533
+#: src/resample.c:1505
 msgid " hours  "
 msgstr " 時間  "
 
-#: src/resample.c:1536
+#: src/resample.c:1508
 msgid " minutes  "
 msgstr " 分  "
 
-#: src/resample.c:1538
+#: src/resample.c:1510
 msgid " seconds  "
 msgstr " 秒  "
 
-#: src/resample.c:1545
+#: src/resample.c:1517
 msgid "Unlimited"
 msgstr "無制限"
 
-#: src/resample.c:1561
+#: src/resample.c:1533
 msgid "Click OK to begin recording, or Cancel to quit."
 msgstr "記録の開始にはOKを、やめるにはキャンセルをクリック"
 
-#: src/resample.c:1670
+#: src/resample.c:1638
 msgid "LiVES: - Change playback speed"
 msgstr "LiVES: - 再生速度の変更"
 
-#: src/resample.c:1673
+#: src/resample.c:1640
 msgid "LiVES: - Resample Video"
 msgstr "LiVES: - 映像のリサンプリング"
 
-#: src/resample.c:1696
+#: src/resample.c:1663
 #, c-format
 msgid ""
 "\n"
@@ -8853,7 +8868,7 @@
 "要求する再生スピードをフレーム/秒の数値で\n"
 "入力してください(_f)"
 
-#: src/resample.c:1701
+#: src/resample.c:1667
 #, c-format
 msgid ""
 "\n"
@@ -8870,15 +8885,15 @@
 "要求するリサンプリングレートをフレーム/秒の数値で\n"
 "入力してください(_r)"
 
-#: src/resample.c:1723
+#: src/resample.c:1688
 msgid "OR enter the desired clip length in _seconds"
 msgstr "もしくは、クリップの長さを秒単位で入力してください(_S)"
 
-#: src/resample.c:1745
+#: src/resample.c:1710
 msgid "Change the _audio speed as well"
 msgstr "音声スピードも変更(_A)"
 
-#: src/resample.c:1846
+#: src/resample.c:1810
 msgid ""
 "\n"
 "Speeding up the clip will cause missing frames in some multitrack layouts.\n"
@@ -8888,7 +8903,7 @@
 "速度を上げるとマルチトラックレイアウトでフレームを失う原因になります。\n"
 "速度を変更しますか?\n"
 
-#: src/resample.c:1863
+#: src/resample.c:1829
 msgid ""
 "\n"
 "Speeding up the clip will cause missing audio in some multitrack layouts.\n"
@@ -8898,7 +8913,7 @@
 "速度を上げるとマルチトラックレイアウトで音声を失う原因になります。\n"
 "速度を変更しますか?\n"
 
-#: src/resample.c:1878
+#: src/resample.c:1847
 msgid ""
 "\n"
 "Changing the speed will cause frames to shift in some multitrack layouts.\n"
@@ -8908,7 +8923,7 @@
 "スピードを変更すると一部のマルチトラックモードでフレームが移動されます。\n"
 "本当に続行しますか？\n"
 
-#: src/resample.c:1892
+#: src/resample.c:1863
 msgid ""
 "\n"
 "Changing the speed will cause audio to shift in some multitrack layouts.\n"
@@ -8918,33 +8933,33 @@
 "スピードを変更すると一部のマルチトラックモードで音声が移動されます。\n"
 "本当に続行しますか？\n"
 
-#: src/resample.c:1938
+#: src/resample.c:1911
 msgid "Speed Change"
 msgstr "スピード変更"
 
-#: src/resample.c:1947
+#: src/resample.c:1920
 #, c-format
 msgid "Changed playback speed to %.3f frames per second and audio to %d Hz.\n"
 msgstr "再生スピードを %.3f フレーム/秒および音声 %d Hz に変更しました。\n"
 
-#: src/resample.c:1950
+#: src/resample.c:1922
 #, c-format
 msgid "Changed playback speed to %.3f frames per second.\n"
 msgstr "再生スピードを　%.3f フレーム/秒に変更しました。\n"
 
-#: src/resample.c:2035
+#: src/resample.c:2006
 msgid "Resampling video"
 msgstr "映像をリサンプリングします"
 
-#: src/resample.c:2042 src/resample.c:2160 src/resample.c:2182
+#: src/resample.c:2012 src/resample.c:2127 src/resample.c:2148
 msgid "Resampling clipboard video"
 msgstr "クリップボードの映像をリサンプリングします"
 
-#: src/resample.c:2047
+#: src/resample.c:2016
 msgid "Reordering frames"
 msgstr "フレームを並べ換えます"
 
-#: src/resample.c:2056
+#: src/resample.c:2025
 msgid ""
 "\n"
 "\n"
@@ -8954,20 +8969,20 @@
 "\n"
 "LiVESはフレームを並べ換えられませんでした。"
 
-#: src/resample.c:2104
+#: src/resample.c:2071
 msgid "Deordering frames"
 msgstr "フレームを再び並べ換えます"
 
-#: src/resample.c:2199
+#: src/resample.c:2165
 msgid "resampling error..."
 msgstr "リサンプリングエラー..."
 
-#: src/rte_window.c:85 src/rte_window.c:1708
+#: src/rte_window.c:124 src/rte_window.c:1709
 #, c-format
 msgid "Type: %s"
 msgstr "タイプ: %s"
 
-#: src/rte_window.c:112
+#: src/rte_window.c:150
 msgid ""
 "\n"
 "\n"
@@ -8983,7 +8998,7 @@
 "よろしいですか?\n"
 "\n"
 
-#: src/rte_window.c:426
+#: src/rte_window.c:460
 msgid ""
 "\n"
 "\n"
@@ -8995,12 +9010,12 @@
 "このキーマップをデフォルトとして保存するには'OK'をクリック\n"
 "\n"
 
-#: src/rte_window.c:432
+#: src/rte_window.c:466
 #, c-format
 msgid "Saving keymap to %s\n"
 msgstr "キーマップを %s に保存\n"
 
-#: src/rte_window.c:439
+#: src/rte_window.c:471
 #, c-format
 msgid ""
 "\n"
@@ -9009,7 +9024,7 @@
 "\n"
 "キーマップファイル %s をアップデート..."
 
-#: src/rte_window.c:446
+#: src/rte_window.c:477
 #, c-format
 msgid ""
 "\n"
@@ -9024,12 +9039,12 @@
 "%s\n"
 "エラーは %s です。\n"
 
-#: src/rte_window.c:526
+#: src/rte_window.c:556
 #, c-format
 msgid "Saving real time effect defaults to %s..."
 msgstr "リアルタイムエフェクトのデフォルトを %s に保存..."
 
-#: src/rte_window.c:535
+#: src/rte_window.c:563
 #, c-format
 msgid ""
 "\n"
@@ -9044,22 +9059,22 @@
 "\n"
 "エラーコード %d\n"
 
-#: src/rte_window.c:632
+#: src/rte_window.c:657
 #, c-format
 msgid "Loading real time effect defaults from %s..."
 msgstr "リアルタイムエフェクトのデフォルトを %s から読み込み中..."
 
-#: src/rte_window.c:681
+#: src/rte_window.c:701
 #, c-format
 msgid "Loading generator default sizes from %s..."
 msgstr "ジェネレーターのデフォルトサイズを %s から読み込み中..."
 
-#: src/rte_window.c:1306
+#: src/rte_window.c:1319
 #, c-format
 msgid "Loading default keymap from %s..."
 msgstr "デフォルトキーマップを %s から読み込み中..."
 
-#: src/rte_window.c:1329
+#: src/rte_window.c:1339
 #, c-format
 msgid ""
 "\n"
@@ -9074,27 +9089,27 @@
 "\n"
 "エラーコード %d\n"
 
-#: src/rte_window.c:1403
+#: src/rte_window.c:1412
 #, c-format
 msgid "Invalid line %d in %s\n"
 msgstr "無効な行 %d : %s\n"
 
-#: src/rte_window.c:1483
+#: src/rte_window.c:1490
 #, c-format
 msgid "Invalid key %d in %s\n"
 msgstr "無効なキー %d : %s\n"
 
-#: src/rte_window.c:1498
+#: src/rte_window.c:1505
 #, c-format
 msgid "Invalid effect %s in %s\n"
 msgstr "無効なエフェクト %s : %s\n"
 
-#: src/rte_window.c:1517
+#: src/rte_window.c:1524
 #, c-format
 msgid "Unknown effect %s in %s\n"
 msgstr "不明なエフェクト %s が %sにあります\n"
 
-#: src/rte_window.c:1535
+#: src/rte_window.c:1542
 #, c-format
 msgid ""
 "This version of LiVES cannot mix generators/non-generators on the same key "
@@ -9103,21 +9118,21 @@
 "このバージョンのLiVESは、同じキー(%d)でジェネレーターと非ジェネレーターを混ぜ"
 "ることができません！\n"
 
-#: src/rte_window.c:1547
+#: src/rte_window.c:1554
 #, c-format
 msgid "Too many effects bound to key %d.\n"
 msgstr "キー %d に結びつけられたエフェクトが多すぎます。\n"
 
-#: src/rte_window.c:1587
+#: src/rte_window.c:1593
 msgid "update required.\n"
 msgstr "アップデートが必要です。\n"
 
-#: src/rte_window.c:1603
+#: src/rte_window.c:1607
 #, c-format
 msgid "Loading data connection map from %s..."
 msgstr ""
 
-#: src/rte_window.c:1612
+#: src/rte_window.c:1614
 msgid ""
 "\n"
 "\n"
@@ -9129,41 +9144,41 @@
 "いくつかのエフェクトが指定できません。\n"
 "\n"
 
-#: src/rte_window.c:1691
+#: src/rte_window.c:1692
 #, c-format
 msgid "LiVES: Information for %s"
 msgstr "LiVES: %s の情報"
 
-#: src/rte_window.c:1704
+#: src/rte_window.c:1705
 #, c-format
 msgid "Effect name: %s"
 msgstr "エフェクト名: %s"
 
-#: src/rte_window.c:1712
+#: src/rte_window.c:1713
 #, c-format
 msgid "Plugin name: %s"
 msgstr "プラグイン名: %s"
 
-#: src/rte_window.c:1716
+#: src/rte_window.c:1717
 #, c-format
 msgid "Author: %s"
 msgstr "作者: %s"
 
-#: src/rte_window.c:1721
+#: src/rte_window.c:1722
 #, c-format
 msgid "and: %s"
 msgstr ""
 
-#: src/rte_window.c:1726
+#: src/rte_window.c:1727
 #, c-format
 msgid "Version: %d"
 msgstr "バージョン: %d"
 
-#: src/rte_window.c:1734
+#: src/rte_window.c:1735
 msgid "Description: "
 msgstr "説明: "
 
-#: src/rte_window.c:1960
+#: src/rte_window.c:1963
 msgid ""
 "\n"
 "\n"
@@ -9177,69 +9192,69 @@
 "とができません。\n"
 "\n"
 
-#: src/rte_window.c:2024
+#: src/rte_window.c:2027
 #, c-format
 msgid "LiVES could not locate the effect %s.\n"
 msgstr "LiVESはエフェクト %s を指定できません。\n"
 
-#: src/rte_window.c:2225
+#: src/rte_window.c:2216
 msgid "LiVES: Real time effect mapping"
 msgstr "LiVES: リアルタイムエフェクトマッピング"
 
-#: src/rte_window.c:2257
+#: src/rte_window.c:2248
 #, c-format
 msgid "Ctrl-%d"
 msgstr "Ctrl-%d"
 
-#: src/rte_window.c:2264
+#: src/rte_window.c:2255
 msgid "Key active"
 msgstr "キーアクティブ"
 
-#: src/rte_window.c:2279
+#: src/rte_window.c:2271
 msgid "Key grab"
 msgstr "キーの割り当て"
 
-#: src/rte_window.c:2280
+#: src/rte_window.c:2272
 msgid "Grab keyboard for this effect key"
 msgstr "キーボードをこのエフェクトキーに割り当て"
 
-#: src/rte_window.c:2290
+#: src/rte_window.c:2283
 msgid "_Clear all effects"
 msgstr "全エフェクトのクリア(_C)"
 
-#: src/rte_window.c:2304
+#: src/rte_window.c:2297
 msgid "Mode active"
 msgstr "モードアクティブ"
 
-#: src/rte_window.c:2314 src/multitrack.c:8568
+#: src/rte_window.c:2307 src/multitrack.c:8762
 msgid "Info"
 msgstr "情報"
 
-#: src/rte_window.c:2315
+#: src/rte_window.c:2308
 msgid "Set Parameters"
 msgstr "パラメータセット"
 
-#: src/rte_window.c:2316
+#: src/rte_window.c:2309
 msgid "Set Connections"
 msgstr ""
 
-#: src/rte_window.c:2317
+#: src/rte_window.c:2310
 msgid "Clear"
 msgstr "クリア"
 
-#: src/rte_window.c:2326
+#: src/rte_window.c:2319
 msgid "Effect name:"
 msgstr "エフェクト名:"
 
-#: src/rte_window.c:2391
+#: src/rte_window.c:2384
 msgid "_Save as default keymap"
 msgstr "デフォルトキーマップとして保存(_S)"
 
-#: src/rte_window.c:2396
+#: src/rte_window.c:2389
 msgid "_Load default keymap"
 msgstr "デフォルトキーマップの読み込み(_L)"
 
-#: src/rte_window.c:2840
+#: src/rte_window.c:2833
 #, c-format
 msgid ""
 "Unable to create default keymap file: %s\n"
@@ -9300,7 +9315,7 @@
 msgid "none\n"
 msgstr "なし\n"
 
-#: src/lives-yuv4mpeg.c:494
+#: src/lives-yuv4mpeg.c:493
 #, c-format
 msgid ""
 "Unable to set display framerate to %.3f fps.\n"
@@ -9309,73 +9324,73 @@
 "表示のフレームレートを %.3f fpsに設定できません。\n"
 "\n"
 
-#: src/lives-yuv4mpeg.c:503
+#: src/lives-yuv4mpeg.c:502
 #, c-format
 msgid "Unable to open yuv4mpeg out stream %s\n"
 msgstr "yuv4mpeg出力ストリーム %s を開くことができません。\n"
 
-#: src/lives-yuv4mpeg.c:628
+#: src/lives-yuv4mpeg.c:626
 #, c-format
 msgid "TV card %d"
 msgstr "TVカード %d"
 
-#: src/lives-yuv4mpeg.c:713
+#: src/lives-yuv4mpeg.c:710
 #, c-format
 msgid "Opened TV card %d (%s)"
 msgstr "開かれたTVカード %d (%s)"
 
-#: src/lives-yuv4mpeg.c:760
+#: src/lives-yuv4mpeg.c:757
 #, c-format
 msgid "Firewire card %d"
 msgstr "Firewireカード %d"
 
-#: src/lives-yuv4mpeg.c:796
+#: src/lives-yuv4mpeg.c:793
 #, c-format
 msgid "Opened firewire card %d"
 msgstr "開かれたFirewireカード %d"
 
-#: src/multitrack.c:666
+#: src/multitrack.c:736
 msgid "Auto backup"
 msgstr "自動バックアップ"
 
-#: src/multitrack.c:868
+#: src/multitrack.c:935
 msgid "Backing audio"
 msgstr "バックグラウンド音声"
 
-#: src/multitrack.c:1435
+#: src/multitrack.c:1515
 #, fuzzy, c-format
 msgid "%s : parameters for %s"
 msgstr "パラメータなし"
 
-#: src/multitrack.c:1809 src/multitrack.c:3483
+#: src/multitrack.c:1881 src/multitrack.c:3635
 #, c-format
 msgid "Current track: %s (layer %d)\n"
 msgstr "現在のトラック: %s (レイヤー %d)\n"
 
-#: src/multitrack.c:1813 src/multitrack.c:3484
+#: src/multitrack.c:1885 src/multitrack.c:3637
 msgid "Current track: Backing audio\n"
 msgstr "現在のトラック: バックグラウンド音声\n"
 
-#: src/multitrack.c:1814
+#: src/multitrack.c:1886
 #, c-format
 msgid "Current track: Layer %d audio\n"
 msgstr "現在のトラック: レイヤー %d 音声\n"
 
-#: src/multitrack.c:1817
+#: src/multitrack.c:1889
 #, c-format
 msgid "%.2f sec.\n"
 msgstr "%.2f 秒\n"
 
-#: src/multitrack.c:1822 src/multitrack.c:3490
+#: src/multitrack.c:1894 src/multitrack.c:3643
 #, c-format
 msgid "Source: %s"
 msgstr "ソース: %s"
 
-#: src/multitrack.c:1825 src/multitrack.c:3492
+#: src/multitrack.c:1897 src/multitrack.c:3645
 msgid "Right click for context menu.\n"
 msgstr "右クリックでコンテキストメニュー\n"
 
-#: src/multitrack.c:1827
+#: src/multitrack.c:1899
 msgid ""
 "Double click on a block\n"
 "to select it."
@@ -9383,7 +9398,7 @@
 "ブロックをダブルクリックして\n"
 "選択します。"
 
-#: src/multitrack.c:3312
+#: src/multitrack.c:3452
 msgid ""
 "\n"
 "\n"
@@ -9397,7 +9412,7 @@
 "ダブルクリックして\n"
 "ブロックを選択してください。\n"
 
-#: src/multitrack.c:3315
+#: src/multitrack.c:3455
 msgid ""
 "\n"
 "\n"
@@ -9409,7 +9424,7 @@
 "エフェクトが選択されていません。\n"
 "パラメーターを確認するには、まずFXスタックでエフェクトを選択してください。\n"
 
-#: src/multitrack.c:3318
+#: src/multitrack.c:3458
 msgid ""
 "\n"
 "\n"
@@ -9419,7 +9434,7 @@
 "\n"
 "読み込まれたクリップはありません。\n"
 
-#: src/multitrack.c:3321
+#: src/multitrack.c:3462
 msgid ""
 "You must select two video tracks\n"
 "and a time region\n"
@@ -9435,7 +9450,7 @@
 "代わりに、クリップをタイムラインに挿入する前にあらかじめ\n"
 "メニューのエフェクトから、自動トランジションを有効にしてください。"
 
-#: src/multitrack.c:3324
+#: src/multitrack.c:3465
 msgid ""
 "\n"
 "\n"
@@ -9448,12 +9463,12 @@
 "コンポジットを利用するには\n"
 "少なくともひとつのトラックと時間帯を選択してください。\n"
 
-#: src/multitrack.c:3487
+#: src/multitrack.c:3640
 #, c-format
 msgid "%.2f sec. to %.2f sec.\n"
 msgstr "%.2f 秒を %.2f 秒に\n"
 
-#: src/multitrack.c:3493
+#: src/multitrack.c:3646
 msgid ""
 "Single click on timeline\n"
 "to select a frame.\n"
@@ -9461,12 +9476,12 @@
 "タイムライン上をクリックすると\n"
 "フレームを選択します。\n"
 
-#: src/multitrack.c:3711 src/multitrack.c:6790
+#: src/multitrack.c:3858 src/multitrack.c:6972
 #, c-format
 msgid "%s [unstable]"
 msgstr "%s [不安定]"
 
-#: src/multitrack.c:3822
+#: src/multitrack.c:3973
 msgid ""
 "You can click and drag\n"
 "below the timeline"
@@ -9474,176 +9489,176 @@
 "タイムライン上で\n"
 "クリックとドラッグをして"
 
-#: src/multitrack.c:3823
+#: src/multitrack.c:3974
 msgid "to select a time region.\n"
 msgstr "時間帯を選択します。\n"
 
-#: src/multitrack.c:3985
+#: src/multitrack.c:4137
 msgid "LiVES: Selected clip"
 msgstr "LiVES: 選択したクリップ"
 
-#: src/multitrack.c:3993
+#: src/multitrack.c:4145
 msgid "_Adjust start and end points"
 msgstr "開始/終了地点の調整(_A)"
 
-#: src/multitrack.c:4002
+#: src/multitrack.c:4154
 msgid "_Edit/encode in clip editor"
 msgstr "クリップエディターで編集/エンコード(_E)"
 
-#: src/multitrack.c:4009
+#: src/multitrack.c:4161
 msgid "_Show clip information"
 msgstr "クリップ情報の表示(_S)"
 
-#: src/multitrack.c:4016
+#: src/multitrack.c:4168
 msgid "_Close this clip"
 msgstr "選択されたクリップを閉じます(_C)"
 
-#: src/multitrack.c:4236
+#: src/multitrack.c:4388
 msgid "Audio mixer (ctrl-m)"
 msgstr "音声ミキサー(ctrl + M)"
 
-#: src/multitrack.c:4336
+#: src/multitrack.c:4488
 msgid "Single click on timeline"
 msgstr "タイムライン上でクリックすると"
 
-#: src/multitrack.c:4337
+#: src/multitrack.c:4489
 msgid "to select a frame."
 msgstr "フレームを選択します。"
 
-#: src/multitrack.c:4338
+#: src/multitrack.c:4490
 msgid "Double click or right click on timeline"
 msgstr "タイムライン上でダブルクリックまたは右クリックしてください。"
 
-#: src/multitrack.c:4339
+#: src/multitrack.c:4491
 msgid "to select a block."
 msgstr "ブロックを選択します。"
 
-#: src/multitrack.c:4340
+#: src/multitrack.c:4492
 msgid "Clips can be dragged"
 msgstr "タイムライン上にクリップをドラッグして"
 
-#: src/multitrack.c:4341
+#: src/multitrack.c:4493
 msgid "onto the timeline."
 msgstr "配置します。"
 
-#: src/multitrack.c:4343
+#: src/multitrack.c:4495
 msgid "Mouse mode is: Move"
 msgstr "\"移動\" マウスモードでは"
 
-#: src/multitrack.c:4344
+#: src/multitrack.c:4496
 msgid "clips can be moved around."
 msgstr "クリックでクリップを移動します。"
 
-#: src/multitrack.c:4349
+#: src/multitrack.c:4500
 msgid "Mouse mode is: Select."
 msgstr "\"選択\" マウスモードでは"
 
-#: src/multitrack.c:4350
+#: src/multitrack.c:4501
 msgid "Drag with mouse on timeline"
 msgstr "タイムライン上でマウスをドラックすることで"
 
-#: src/multitrack.c:4351
+#: src/multitrack.c:4502
 msgid "to select tracks and time."
 msgstr "複数のトラックと時間帯を選択します。"
 
-#: src/multitrack.c:4362
+#: src/multitrack.c:4509
 msgid "_Insert mode: Normal"
 msgstr "挿入モード: 標準(_I)"
 
-#: src/multitrack.c:4378
+#: src/multitrack.c:4537
 msgid "_Mouse mode: Move"
 msgstr "マウスモード: 移動(_M)"
 
-#: src/multitrack.c:4382
+#: src/multitrack.c:4540
 msgid "_Mouse mode: Select"
 msgstr "マウスモード: 選択(_M)"
 
-#: src/multitrack.c:4405 src/multitrack.c:7925
+#: src/multitrack.c:4563 src/multitrack.c:8104
 #, fuzzy
 msgid "Gravity: Normal"
 msgstr "Gravity: 標準(_G)"
 
-#: src/multitrack.c:4409
+#: src/multitrack.c:4565
 #, fuzzy
 msgid "Gravity: Left"
 msgstr "Gravity: 左詰め(_G)"
 
-#: src/multitrack.c:4414
+#: src/multitrack.c:4569
 #, fuzzy
 msgid "Gravity: Right"
 msgstr "Gravity: 右詰め(_G)"
 
-#: src/multitrack.c:4416
+#: src/multitrack.c:4570
 msgid "Close _last gap(s) in selected tracks/time"
 msgstr "選択したトラックと時間の最後のギャップを詰める(_L)"
 
-#: src/multitrack.c:4419
+#: src/multitrack.c:4572
 msgid "Close _first gap(s) in selected tracks/time"
 msgstr "選択したトラックと時間の最初のギャップを詰める(_F)"
 
-#: src/multitrack.c:4458
+#: src/multitrack.c:4627
 msgid "Close gaps"
 msgstr "ギャップ詰める"
 
-#: src/multitrack.c:4460
+#: src/multitrack.c:4629
 msgid "Move block"
 msgstr "ブロックの移動"
 
-#: src/multitrack.c:4462
+#: src/multitrack.c:4631
 msgid "Move audio block"
 msgstr "音声ブロックの移動"
 
-#: src/multitrack.c:4464
+#: src/multitrack.c:4633
 msgid "Delete block"
 msgstr "ブロックの消去"
 
-#: src/multitrack.c:4466
+#: src/multitrack.c:4635
 msgid "Delete audio block"
 msgstr "音声ブロックの消去"
 
-#: src/multitrack.c:4468
+#: src/multitrack.c:4637
 msgid "Split tracks"
 msgstr "トラックの分割"
 
-#: src/multitrack.c:4470
+#: src/multitrack.c:4639
 msgid "Split block"
 msgstr "ブロックの分割"
 
-#: src/multitrack.c:4473
+#: src/multitrack.c:4642
 #, c-format
 msgid "Apply %s"
 msgstr "%s を適用"
 
-#: src/multitrack.c:4478
+#: src/multitrack.c:4647
 #, c-format
 msgid "Delete %s"
 msgstr "%s を消去"
 
-#: src/multitrack.c:4482
+#: src/multitrack.c:4651
 msgid "Insert block"
 msgstr "ブロックの挿入"
 
-#: src/multitrack.c:4484
+#: src/multitrack.c:4653
 msgid "Insert gap"
 msgstr "ギャップの挿入"
 
-#: src/multitrack.c:4486
+#: src/multitrack.c:4655
 msgid "Insert audio block"
 msgstr "音声ブロックの挿入"
 
-#: src/multitrack.c:4488
+#: src/multitrack.c:4657
 msgid "Effect order change"
 msgstr "エフェクト順序の変更"
 
-#: src/multitrack.c:4898
+#: src/multitrack.c:5064
 msgid "unsigned "
 msgstr "符号なし "
 
-#: src/multitrack.c:4899
+#: src/multitrack.c:5065
 msgid "signed "
 msgstr "符号付き "
 
-#: src/multitrack.c:4904
+#: src/multitrack.c:5071
 #, c-format
 msgid ""
 "Multitrack values set to %.3f fps, frame size %d x %d, audio channels %d, "
@@ -9652,15 +9667,15 @@
 "マルチトラックの値を %.3f fps、フレームサイズ %d x %d 、音声チャネル %d 、音"
 "声レート %d, 音声のサンプルサイズ %d, %s に設定\n"
 
-#: src/multitrack.c:4938
+#: src/multitrack.c:5104
 msgid "invalid event list. Failed.\n"
 msgstr "無効なイベントリスト。失敗しました。\n"
 
-#: src/multitrack.c:4944
+#: src/multitrack.c:5110
 msgid "event list has invalid fps. Failed.\n"
 msgstr "イベントリストには無効なfpsが含まれています。失敗しました。\n"
 
-#: src/multitrack.c:4953
+#: src/multitrack.c:5122
 #, c-format
 msgid ""
 "\n"
@@ -9675,7 +9690,7 @@
 "現在のセットを閉じた後で、\n"
 "ファイルメニューから新しいセットを読み込んでください。\n"
 
-#: src/multitrack.c:4993
+#: src/multitrack.c:5163
 #, c-format
 msgid ""
 "\n"
@@ -9686,440 +9701,432 @@
 "無効な数の音声チャネル(%d)を含んでいます。\n"
 "読み込みできません。\n"
 
-#: src/multitrack.c:5329 src/multitrack.c:5338 src/multitrack.c:21133
+#: src/multitrack.c:5452
 msgid "Layout was wiped.\n"
 msgstr "レイアウトは除去されました。\n"
 
-#: src/multitrack.c:5374
+#: src/multitrack.c:5547
 #, c-format
 msgid "LiVES-%s: Multitrack %dx%d : %d bpp %.3f fps"
 msgstr "LiVES-%s: マルチトラック %dx%d : %d bpp %.3f fps"
 
-#: src/multitrack.c:5617
+#: src/multitrack.c:5793
 msgid "In/out"
 msgstr "イン/アウト"
 
-#: src/multitrack.c:5619
+#: src/multitrack.c:5795
 msgid "FX stack"
 msgstr "適用済エフェクト"
 
-#: src/multitrack.c:5627 src/omc-learn.c:673
+#: src/multitrack.c:5803 src/omc-learn.c:659
 msgid "Params."
 msgstr "パラメータ"
 
-#: src/multitrack.c:5978
+#: src/multitrack.c:6157
 msgid "_Open..."
 msgstr "開く(_O)..."
 
-#: src/multitrack.c:5996
+#: src/multitrack.c:6175
 msgid "O_pen File Selection..."
 msgstr "ファイルを選択して開く(_P)..."
 
-#: src/multitrack.c:6040
+#: src/multitrack.c:6219
 msgid "Import Selection from _dvd/vcd..."
 msgstr "DVD/VCDから選択範囲をインポート(_D)..."
 
-#: src/multitrack.c:6050
+#: src/multitrack.c:6229
 msgid "Import Selection from _dvd"
 msgstr "DVDから選択範囲をインポート(_D)"
 
-#: src/multitrack.c:6060
+#: src/multitrack.c:6239
 msgid "Import Selection from _vcd"
 msgstr "VCDから選択範囲をインポート(_V)"
 
-#: src/multitrack.c:6076
+#: src/multitrack.c:6255
 msgid "_Import from Device"
 msgstr "デバイスからインポート(_I)"
 
-#: src/multitrack.c:6103
+#: src/multitrack.c:6282
 msgid "_Close the selected clip"
 msgstr "選択されたクリップを閉じる(_C)"
 
-#: src/multitrack.c:6198
+#: src/multitrack.c:6377
 msgid "_Save layout as..."
 msgstr "レイアウトを別名で保存(_S)..."
 
-#: src/multitrack.c:6206
+#: src/multitrack.c:6385
 msgid "_Load layout..."
 msgstr "レイアウトの読み込み(_L)..."
 
-#: src/multitrack.c:6210
+#: src/multitrack.c:6389
 msgid "_Wipe/Delete layout..."
 msgstr "レイアウトの除去(_W)..."
 
-#: src/multitrack.c:6236
+#: src/multitrack.c:6415
 msgid "_Ignore width, height and audio values from loaded layouts"
 msgstr "読み込んだレイアウトにおける幅、高さ、音声の値を無視(_I)"
 
-#: src/multitrack.c:6240
+#: src/multitrack.c:6419
 msgid "Auto load _subtitles with clips"
 msgstr ""
 
-#: src/multitrack.c:6322
+#: src/multitrack.c:6501
 msgid "_CLIP EDITOR"
 msgstr "クリップエディター(_C)"
 
-#: src/multitrack.c:6334
+#: src/multitrack.c:6513
 msgid "_Adjust selected clip start/end points"
 msgstr "選択されたクリップの開始/終了点を調整(_A)"
 
-#: src/multitrack.c:6343
+#: src/multitrack.c:6522
 msgid "_Insert selected clip"
 msgstr "選択したクリップの挿入(_I)"
 
-#: src/multitrack.c:6355
+#: src/multitrack.c:6534
 msgid "_Insert selected clip audio"
 msgstr "選択したクリップ音声の挿入(_I)"
 
-#: src/multitrack.c:6364
+#: src/multitrack.c:6543
 msgid "_Delete selected block"
 msgstr "選択したブロックの消去(_D)"
 
-#: src/multitrack.c:6373
+#: src/multitrack.c:6555
 msgid "_Jump to previous block boundary"
 msgstr "前のブロック境界にジャンプ(_J)"
 
-#: src/multitrack.c:6382
+#: src/multitrack.c:6564
 msgid "_Jump to next block boundary"
 msgstr "次のブロック境界にジャンプ(_J)"
 
-#: src/multitrack.c:6395
+#: src/multitrack.c:6577
 msgid "Clear _marks from timeline"
 msgstr "タイムラインからマークをクリア(_M)"
 
-#: src/multitrack.c:6403
+#: src/multitrack.c:6585
 msgid "Ignore selection limits when inserting"
 msgstr "挿入時に選択の制限を無視"
 
-#: src/multitrack.c:6420 src/multitrack.c:16719
+#: src/multitrack.c:6602 src/multitrack.c:17009
 msgid "_Play from Timeline Position"
 msgstr "タイムラインの位置から再生(_P)"
 
-#: src/multitrack.c:6434
+#: src/multitrack.c:6616
 msgid "Pla_y selected time only"
 msgstr "選択した時間帯のみ再生(_Y)"
 
-#: src/multitrack.c:6518
+#: src/multitrack.c:6700
 msgid "_Move effects with blocks"
 msgstr "ブロックと共にエフェクトを移動(_M)"
 
-#: src/multitrack.c:6531
+#: src/multitrack.c:6713
 msgid "Select _autotransition effect..."
 msgstr "自動トランジションエフェクトを選択(_A)..."
 
-#: src/multitrack.c:6542
+#: src/multitrack.c:6724
 #, fuzzy
 msgid "Crossfade audio with autotransition"
 msgstr "音声のクロスフェード"
 
-#: src/multitrack.c:6550
+#: src/multitrack.c:6732
 msgid "View/_Edit selected effect"
 msgstr "選択したエフェクトのビュー/編集(_E)"
 
-#: src/multitrack.c:6554
+#: src/multitrack.c:6736
 msgid "_Delete selected effect"
 msgstr "選択したエフェクトを削除(_D)"
 
-#: src/multitrack.c:6562
+#: src/multitrack.c:6744
 msgid "Apply effect to _block..."
 msgstr "ブロックにエフェクトを適用(_B)..."
 
-#: src/multitrack.c:6619
+#: src/multitrack.c:6801
 msgid "Apply effect to _region..."
 msgstr "領域にエフェクトを適用(_R)..."
 
-#: src/multitrack.c:6885
+#: src/multitrack.c:7061
 msgid "_Tracks"
 msgstr "トラック(_T)"
 
-#: src/multitrack.c:6896
+#: src/multitrack.c:7072
 msgid "Rename current track"
 msgstr ""
 
-#: src/multitrack.c:6904
+#: src/multitrack.c:7080
 msgid "Make _Backing Audio current track"
 msgstr "現在のトラックにバックグラウンド音声を作成(_B)"
 
-#: src/multitrack.c:6915
+#: src/multitrack.c:7091
 msgid "Add Video Track at _Rear"
 msgstr "下にビデオトラックを追加(_R)"
 
-#: src/multitrack.c:6923
+#: src/multitrack.c:7099
 msgid "Add Video Track at _Front"
 msgstr "上にビデオトラックを追加(_F)"
 
-#: src/multitrack.c:6936
+#: src/multitrack.c:7112
 msgid "_Split current track at cursor"
 msgstr "カーソルの場所で現在のトラックを分割(_S)"
 
-#: src/multitrack.c:6948
+#: src/multitrack.c:7124
 msgid "_Split selected video tracks"
 msgstr "選択したビデオトラックを分割(_S)"
 
-#: src/multitrack.c:6961
+#: src/multitrack.c:7137
 msgid "Insert gap in selected tracks/time"
 msgstr "選択したトラックと時間にギャップを挿入"
 
-#: src/multitrack.c:6969
+#: src/multitrack.c:7145
 msgid "Insert gap in current track/selected time"
 msgstr "現在のトラックと時間にギャップを挿入"
 
-#: src/multitrack.c:6981
+#: src/multitrack.c:7157
 msgid "Close all _gaps in selected tracks/time"
 msgstr "選択したトラックと時間のすべてのギャップを詰める(_G)"
 
-#: src/multitrack.c:7007
+#: src/multitrack.c:7183
 msgid "Se_lection"
 msgstr "選択(_L)"
 
-#: src/multitrack.c:7018
+#: src/multitrack.c:7194
 msgid "_Select Current Track"
 msgstr "現在のトラックを選択(_S)"
 
-#: src/multitrack.c:7025
+#: src/multitrack.c:7201
 msgid "Select _all video tracks"
 msgstr "すべてのビデオトラックを選択(_A)"
 
-#: src/multitrack.c:7032
+#: src/multitrack.c:7208
 msgid "Select _no video tracks"
 msgstr "ビデオトラックを非選択(_N)"
 
-#: src/multitrack.c:7039
+#: src/multitrack.c:7215
 msgid "Select all _time"
 msgstr "すべての時間を選択(_T)"
 
-#: src/multitrack.c:7050
+#: src/multitrack.c:7226
 msgid "Select from _zero time"
 msgstr "ゼロ時刻から選択(_Z)"
 
-#: src/multitrack.c:7057
+#: src/multitrack.c:7233
 msgid "Select to _end time"
 msgstr "最終時刻まで選択(_E)"
 
-#: src/multitrack.c:7064
+#: src/multitrack.c:7240
 msgid "_Copy..."
 msgstr "コピー(_C)..."
 
-#: src/multitrack.c:7075
+#: src/multitrack.c:7251
 msgid "_Timecode to region start"
 msgstr "タイムコードから領域の最初へ(_T)"
 
-#: src/multitrack.c:7082
+#: src/multitrack.c:7258
 msgid "_Timecode to region end"
 msgstr "タイムコードから領域の最後へ(_T)"
 
-#: src/multitrack.c:7089
+#: src/multitrack.c:7265
 msgid "_Region start to timecode"
 msgstr "領域の最初からタイムコードへ(_R)"
 
-#: src/multitrack.c:7096
+#: src/multitrack.c:7272
 msgid "_Region end to timecode"
 msgstr "領域の最後からタイムコードへ(_R)"
 
-#: src/multitrack.c:7110
+#: src/multitrack.c:7286
 msgid "Select/deselect block at current track/time"
 msgstr ""
 
-#: src/multitrack.c:7135
+#: src/multitrack.c:7311
 msgid "_Change width, height and audio values..."
 msgstr "幅、高さ、音声値の変更(_C)..."
 
-#: src/multitrack.c:7194
+#: src/multitrack.c:7370
 msgid "_Render"
 msgstr "レンダリング(_R)"
 
-#: src/multitrack.c:7205
+#: src/multitrack.c:7381
 msgid "_Render all to new clip"
 msgstr "新しいクリップへすべてレンダリング(_R)"
 
-#: src/multitrack.c:7220
+#: src/multitrack.c:7396
 msgid "Render _video"
 msgstr "ビデオのレンダリング(_V)"
 
-#: src/multitrack.c:7225
+#: src/multitrack.c:7401
 msgid "Render _audio"
 msgstr "音声のレンダリング(_A)"
 
-#: src/multitrack.c:7235
+#: src/multitrack.c:7411
 msgid "_Normalise rendered audio"
 msgstr "レンダリングした音声のノーマライズ(_N)"
 
-#: src/multitrack.c:7242
+#: src/multitrack.c:7418
 msgid "_Pre-render audio"
 msgstr "音声のプリレンダリング(_P)"
 
-#: src/multitrack.c:7251
+#: src/multitrack.c:7427
 msgid "_View"
 msgstr "ビュー(_V)"
 
-#: src/multitrack.c:7270
+#: src/multitrack.c:7446
 msgid "Block _In/out points"
 msgstr "ブロックの開始/終了点(_I)"
 
-#: src/multitrack.c:7279
+#: src/multitrack.c:7455
 msgid "_Effects at current"
 msgstr "現在のエフェクト(_E)"
 
-#: src/multitrack.c:7297
+#: src/multitrack.c:7473
 msgid "Audio parameters"
 msgstr "音声パラメータ"
 
-#: src/multitrack.c:7308
+#: src/multitrack.c:7484
 msgid "Show backing _audio track"
 msgstr "バックグラウンド音声トラックの表示(_A)"
 
-#: src/multitrack.c:7312
+#: src/multitrack.c:7488
 msgid "Compact view"
 msgstr "コンパクトビュー"
 
-#: src/multitrack.c:7320
+#: src/multitrack.c:7496
 msgid "Maximum tracks to display..."
 msgstr "表示する最大トラック..."
 
-#: src/multitrack.c:7327
+#: src/multitrack.c:7503
 msgid "Scroll to follow playback"
 msgstr "再生に合わせてスクロール表示"
 
-#: src/multitrack.c:7331
+#: src/multitrack.c:7507
 msgid "_Center on cursor"
 msgstr "カーソルを中心に再表示(_C)"
 
-#: src/multitrack.c:7338
+#: src/multitrack.c:7514
 msgid "_Zoom in"
 msgstr "拡大表示(_Z)"
 
-#: src/multitrack.c:7349
+#: src/multitrack.c:7525
 msgid "_Zoom out"
 msgstr "縮小表示(_Z)"
 
-#: src/multitrack.c:7361
+#: src/multitrack.c:7537
 msgid "Multitrack _details"
 msgstr "マルチトラックの詳細(_D)"
 
-#: src/multitrack.c:7374
+#: src/multitrack.c:7550
 msgid "_Event Window"
 msgstr "イベントウィンドウ(_E)"
 
-#: src/multitrack.c:7378
+#: src/multitrack.c:7554
 msgid "_Event Window (selected time only)"
 msgstr "選択した時間帯のイベントウィンドウ(_E)"
 
-#: src/multitrack.c:7382
+#: src/multitrack.c:7558
 msgid "_Show FRAME events"
 msgstr "フレームイベントを表示(_S)"
 
-#: src/multitrack.c:7399
+#: src/multitrack.c:7575
 msgid "_Show multitrack keys"
 msgstr "マルチトラックキーを表示(_S)"
 
-#: src/multitrack.c:7468
+#: src/multitrack.c:7644
 msgid "Mouse mode: _Move"
 msgstr "マウスモード: 移動(_M)"
 
-#: src/multitrack.c:7476
+#: src/multitrack.c:7652
 msgid "Mouse mode: _Select"
 msgstr "マウスモード: 選択(_S)"
 
-#: src/multitrack.c:7505
+#: src/multitrack.c:7681
 msgid "Insert mode: _Normal"
 msgstr "挿入モード: 標準(_N)"
 
-#: src/multitrack.c:7733
+#: src/multitrack.c:7909
 msgid "Insert with _audio"
 msgstr "音声ごと挿入(_A)"
 
-#: src/multitrack.c:7734
+#: src/multitrack.c:7910
 msgid ""
 "Select whether video clips are inserted and moved with their audio or not"
 msgstr "挿入する/挿入したビデオクリップを音声とセットで扱うかどうかを選択"
 
-#: src/multitrack.c:7829
+#: src/multitrack.c:8007
 msgid "Select _overlap"
 msgstr "重複を選択(_O)"
 
-#: src/multitrack.c:7830
+#: src/multitrack.c:8008
 msgid ""
 "Select whether timeline selection snaps to overlap between selected tracks "
 "or not"
 msgstr "タイムライン上の選択範囲をクリップの重複に合わせるかどうかを選択"
 
-#: src/multitrack.c:7894 src/multitrack.c:14198
+#: src/multitrack.c:8073 src/multitrack.c:14422
 msgid "Expanded View (d)"
 msgstr "拡大ビュー (d)"
 
-#: src/multitrack.c:7897 src/multitrack.c:14205
+#: src/multitrack.c:8076 src/multitrack.c:14428
 msgid "Compact View (d)"
 msgstr "コンパクトビュー (d)"
 
-#: src/multitrack.c:7939
+#: src/multitrack.c:8118
 msgid "Gravity: _Normal"
 msgstr "Gravity: 標準(_N)"
 
-#: src/multitrack.c:7952
+#: src/multitrack.c:8131
 msgid "Gravity: _Left"
 msgstr "Gravity: 左詰め(_L)"
 
-#: src/multitrack.c:7967
+#: src/multitrack.c:8146
 msgid "Gravity: _Right"
 msgstr "Gravity: 右詰め(_R)"
 
-#: src/multitrack.c:8297
+#: src/multitrack.c:8496
 msgid "_Apply"
 msgstr "適用(_A)"
 
-#: src/multitrack.c:8319
+#: src/multitrack.c:8518
 msgid "Time"
 msgstr "時間"
 
-#: src/multitrack.c:8333
+#: src/multitrack.c:8532
 msgid "_Del. node"
 msgstr "ノードの消去(_D)"
 
-#: src/multitrack.c:8341
+#: src/multitrack.c:8540
 msgid "_Next node"
 msgstr "次のモード(_N)"
 
-#: src/multitrack.c:8349
+#: src/multitrack.c:8548
 msgid "_Prev node"
 msgstr "前のモード(_P)"
 
-#: src/multitrack.c:8373
+#: src/multitrack.c:8574
 msgid "_Reverse playback  "
 msgstr "逆再生(_R)  "
 
-#: src/multitrack.c:8395
+#: src/multitrack.c:8596
 msgid "_Velocity  "
 msgstr "速度(_V)  "
 
-#: src/multitrack.c:8464
+#: src/multitrack.c:8664
 msgid "Anchor _start"
 msgstr "アンカー始点(_S)"
 
-#: src/multitrack.c:8465
+#: src/multitrack.c:8665
 msgid "Anchor the start point to the timeline"
 msgstr "タイムラインの始点をアンカー"
 
-#: src/multitrack.c:8481
-msgid "Start frame"
-msgstr "フレームの開始"
-
-#: src/multitrack.c:8533
+#: src/multitrack.c:8728
 msgid "Anchor _end"
 msgstr "アンカー終端(_E)"
 
-#: src/multitrack.c:8534
+#: src/multitrack.c:8729
 msgid "Anchor the end point to the timeline"
 msgstr "タイムラインの終点をアンカー"
 
-#: src/multitrack.c:8546
-msgid "End frame"
-msgstr "フレームの終了"
-
-#: src/multitrack.c:8739
+#: src/multitrack.c:8929
 msgid "Scroll"
 msgstr "スクロール"
 
-#: src/multitrack.c:9316
+#: src/multitrack.c:9502
 msgid ""
 "\n"
 "==============================\n"
@@ -10129,91 +10136,91 @@
 "==============================\n"
 "クリップ編集モードに変更\n"
 
-#: src/multitrack.c:9502
+#: src/multitrack.c:9708
 msgid "Timeline (seconds)"
 msgstr "タイムライン(秒)"
 
-#: src/multitrack.c:9984
+#: src/multitrack.c:10202
 msgid " Backing audio"
 msgstr " バックグラウンド音声"
 
-#: src/multitrack.c:9987
+#: src/multitrack.c:10204
 #, c-format
 msgid " Layer %d audio"
 msgstr " レイヤー %d 音声"
 
-#: src/multitrack.c:9995
+#: src/multitrack.c:10212
 msgid "Show/hide audio details"
 msgstr "音声の詳細表示の切り替え"
 
-#: src/multitrack.c:10010 src/multitrack.c:10232
+#: src/multitrack.c:10227 src/multitrack.c:10452
 #, c-format
 msgid "Layer %d audio"
 msgstr "レイヤー %d 音声"
 
-#: src/multitrack.c:10144 src/multitrack.c:10261
+#: src/multitrack.c:10353 src/multitrack.c:10481
 #, c-format
 msgid "%s (layer %d)"
 msgstr "%s (レイヤー %d)"
 
-#: src/multitrack.c:10184
+#: src/multitrack.c:10403
 msgid "Select track"
 msgstr "トラックの選択"
 
-#: src/multitrack.c:10188
+#: src/multitrack.c:10407
 msgid "Show/hide audio"
 msgstr "オーディオ表示の切り替え"
 
-#: src/multitrack.c:10194
+#: src/multitrack.c:10413
 #, c-format
 msgid "Video %d"
 msgstr "映像 %d"
 
-#: src/multitrack.c:10233
+#: src/multitrack.c:10453
 #, c-format
 msgid " %s"
 msgstr " %s"
 
-#: src/multitrack.c:10346
+#: src/multitrack.c:10574
 msgid "LiVES: Selected effect"
 msgstr "LiVES: 選択したエフェクト"
 
-#: src/multitrack.c:10358
+#: src/multitrack.c:10586
 msgid "_View/Edit this effect"
 msgstr "パラメータを表示(_V)"
 
-#: src/multitrack.c:10361
+#: src/multitrack.c:10588
 msgid "_View this effect"
 msgstr "このエフェクトを表示(_V)"
 
-#: src/multitrack.c:10369
+#: src/multitrack.c:10596
 msgid "_Delete this effect"
 msgstr "このエフェクトを消去(_D)"
 
-#: src/multitrack.c:10422
+#: src/multitrack.c:10648
 msgid "Cannot insert after this effect"
 msgstr "このエフェクトの下に挿入できませんでした。"
 
-#: src/multitrack.c:10451
+#: src/multitrack.c:10677
 msgid "This effect cannot be moved"
 msgstr "このエフェクトは移動することができません。"
 
-#: src/multitrack.c:10499
+#: src/multitrack.c:10724
 #, c-format
 msgid "  %d to %d selected  "
 msgstr "  %d から %d を選択  "
 
-#: src/multitrack.c:10502 src/multitrack.c:10746
+#: src/multitrack.c:10727 src/multitrack.c:10968
 #, c-format
 msgid "%.2f sec."
 msgstr "%.2f 秒"
 
-#: src/multitrack.c:10717
+#: src/multitrack.c:10940
 #, c-format
 msgid "%d frames"
 msgstr "%d フレーム"
 
-#: src/multitrack.c:11070
+#: src/multitrack.c:11299
 msgid ""
 "\n"
 "==============================\n"
@@ -10223,19 +10230,19 @@
 "==============================\n"
 "マルチトラックモードに変更\n"
 
-#: src/multitrack.c:12691
+#: src/multitrack.c:12939
 msgid "Drag the time slider to where you"
 msgstr "パラメータを設定したい箇所に"
 
-#: src/multitrack.c:12692
+#: src/multitrack.c:12940
 msgid "want to set effect parameters"
 msgstr "スライダーを移動してください。"
 
-#: src/multitrack.c:12693
+#: src/multitrack.c:12941
 msgid "Set parameters, then click \"Apply\"\n"
 msgstr "パラメータ設定を反映するには、\"適用\"をクリックしてください。\n"
 
-#: src/multitrack.c:12694
+#: src/multitrack.c:12942
 msgid ""
 "NODES are points where parameters\n"
 "have been set.\n"
@@ -10245,51 +10252,51 @@
 "ノードとなります。\n"
 "ノードは削除することができます。"
 
-#: src/multitrack.c:12697
+#: src/multitrack.c:12944
 msgid "Effect has no parameters.\n"
 msgstr "エフェクトパラメータがありません。\n"
 
-#: src/multitrack.c:12788
+#: src/multitrack.c:13033
 #, c-format
 msgid "%s output"
 msgstr "%s 出力"
 
-#: src/multitrack.c:12794 src/multitrack.c:12804
+#: src/multitrack.c:13038 src/multitrack.c:13046
 #, c-format
 msgid "layer %d"
 msgstr "レイヤー %d"
 
-#: src/multitrack.c:12796 src/multitrack.c:12806
+#: src/multitrack.c:13039 src/multitrack.c:13047
 msgid "audio track"
 msgstr "音声トラック"
 
-#: src/multitrack.c:12797
+#: src/multitrack.c:13040
 #, c-format
 msgid "%s to %s"
 msgstr "%s から %s"
 
-#: src/multitrack.c:12807
+#: src/multitrack.c:13048
 #, c-format
 msgid "%s from %s"
 msgstr ""
 
-#: src/multitrack.c:12860
+#: src/multitrack.c:13099
 msgid "_Prev filter map"
 msgstr "前のフィルターマップ(_P)"
 
-#: src/multitrack.c:12871
+#: src/multitrack.c:13110
 msgid "Insert _before"
 msgstr "上に挿入(_B)"
 
-#: src/multitrack.c:12881
+#: src/multitrack.c:13120
 msgid "Insert _after"
 msgstr "下に挿入(_A)"
 
-#: src/multitrack.c:12896
+#: src/multitrack.c:13134
 msgid "_Next filter map"
 msgstr "次のフィルターマップ(_N)"
 
-#: src/multitrack.c:12911
+#: src/multitrack.c:13148
 msgid ""
 "\n"
 "\n"
@@ -10301,7 +10308,7 @@
 "現在のトラックには\n"
 "このタイミングで有効なエフェクトはありません。\n"
 
-#: src/multitrack.c:12929
+#: src/multitrack.c:13166
 msgid ""
 "Drag a compositor anywhere\n"
 "on the timeline\n"
@@ -10311,7 +10318,7 @@
 "タイムライン上の選択した領域まで\n"
 "ドラッグしてください。"
 
-#: src/multitrack.c:12936
+#: src/multitrack.c:13173
 msgid ""
 "Drag a transition anywhere\n"
 "on the timeline\n"
@@ -10321,7 +10328,7 @@
 "タイムライン上の選択した領域まで\n"
 "ドラッグしてください。"
 
-#: src/multitrack.c:12944
+#: src/multitrack.c:13181
 msgid ""
 "Effects can be dragged\n"
 "onto blocks on the timeline."
@@ -10329,60 +10336,60 @@
 "エフェクトを適用するには\n"
 "タイムライン上のブロックまでドラッグしてください。"
 
-#: src/multitrack.c:13166
+#: src/multitrack.c:13406
 msgid "LiVES: Selected block/frame"
 msgstr "LiVES: 選択したブロック/フレーム"
 
-#: src/multitrack.c:13173
+#: src/multitrack.c:13413
 msgid "_Select this block"
 msgstr "このブロックを選択(_S)"
 
-#: src/multitrack.c:13183
+#: src/multitrack.c:13423
 msgid "_Split block here"
 msgstr "ここでブロックを分割(_S)"
 
-#: src/multitrack.c:13191
+#: src/multitrack.c:13431
 msgid "List _effects here"
 msgstr "適用可能なエフェクト(_E)"
 
-#: src/multitrack.c:13200 src/multitrack.c:13277
+#: src/multitrack.c:13440 src/multitrack.c:13518
 #, c-format
 msgid "_Adjust %s"
 msgstr "%s の調整(_A)"
 
-#: src/multitrack.c:13215
+#: src/multitrack.c:13455
 msgid "_Delete this block"
 msgstr "このブロックを削除(_D)"
 
-#: src/multitrack.c:13258
+#: src/multitrack.c:13500
 msgid "_Insert here"
 msgstr "ここに挿入(_I)"
 
-#: src/multitrack.c:13264
+#: src/multitrack.c:13505
 msgid "_Insert audio here"
 msgstr "ここに音声を挿入(_I)"
 
-#: src/multitrack.c:14801
+#: src/multitrack.c:15017
 #, c-format
 msgid "Inserted gap in selected tracks from time %.4f to %.4f\n"
 msgstr "選択したトラックにギャップを挿入(時間は %.4f から %.4f まで)\n"
 
-#: src/multitrack.c:14835
+#: src/multitrack.c:15048
 #, c-format
 msgid "Inserted gap in track %s from time %.4f to %.4f\n"
 msgstr "トラック %s にギャップを挿入(時間は %.4f から %.4f まで)\n"
 
-#: src/multitrack.c:15036
+#: src/multitrack.c:15244
 #, c-format
 msgid "Undid %s\n"
 msgstr "%s の取り消し\n"
 
-#: src/multitrack.c:15235
+#: src/multitrack.c:15445
 #, c-format
 msgid "Redid %s\n"
 msgstr "%s のやり直し\n"
 
-#: src/multitrack.c:15268
+#: src/multitrack.c:15475
 msgid ""
 "\n"
 " (variable)"
@@ -10390,62 +10397,62 @@
 "\n"
 " (変数)"
 
-#: src/multitrack.c:15502 src/multitrack.c:15614 src/multitrack.c:18736
-#: src/multitrack.c:18748
+#: src/multitrack.c:15710 src/multitrack.c:15823 src/multitrack.c:19077
+#: src/multitrack.c:19089
 #, c-format
 msgid "track %s"
 msgstr "トラック %s"
 
-#: src/multitrack.c:15507 src/multitrack.c:15619 src/multitrack.c:18741
+#: src/multitrack.c:15715 src/multitrack.c:15828 src/multitrack.c:19082
 #, c-format
 msgid "tracks %s and %s"
 msgstr "トラック %s および %s"
 
-#: src/multitrack.c:15513 src/multitrack.c:15625 src/multitrack.c:18751
+#: src/multitrack.c:15721 src/multitrack.c:15834 src/multitrack.c:19091
 msgid "selected tracks"
 msgstr "選択したトラック"
 
-#: src/multitrack.c:15516
+#: src/multitrack.c:15726
 #, c-format
 msgid "Added %s %s to %s from %.4f to %.4f\n"
 msgstr "%s %s を %s に追加( %.4f から %.4f まで)\n"
 
-#: src/multitrack.c:15550
+#: src/multitrack.c:15760
 #, c-format
 msgid "Added effect %s to track %s from %.4f to %.4f\n"
 msgstr "エフェクト %s をトラック %s に追加( %.4f から %.4f まで)\n"
 
-#: src/multitrack.c:15631
+#: src/multitrack.c:15845
 #, c-format
 msgid "Deleted %s %s from %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15935
+#: src/multitrack.c:16143
 #, c-format
 msgid "rendered %d frames to new clip.\n"
 msgstr "新しいクリップに %d フレームをレンダリング\n"
 
-#: src/multitrack.c:16025
+#: src/multitrack.c:16230
 msgid "Cleaning up..."
 msgstr "クリーンアップ..."
 
-#: src/multitrack.c:16712
+#: src/multitrack.c:17003
 msgid "_Pause"
 msgstr "一時停止(_P)"
 
-#: src/multitrack.c:16713
+#: src/multitrack.c:17004
 msgid "Pause (p)"
 msgstr "一時停止(p)"
 
-#: src/multitrack.c:16856
+#: src/multitrack.c:17151
 msgid "Press 'm' during playback"
 msgstr "再生中に'm'を押すと"
 
-#: src/multitrack.c:16857
+#: src/multitrack.c:17152
 msgid "to make a mark on the timeline"
 msgstr "タイムラインにマークできます"
 
-#: src/multitrack.c:17154
+#: src/multitrack.c:17498
 #, c-format
 msgid ""
 "Inserted audio %.4f to %.4f from clip %s into backing audio from time %.4f "
@@ -10454,7 +10461,7 @@
 "音声 %.4f から %.4f を挿入(クリップ %s の時間 %.4f から %.4f までを、バックグ"
 "ラウンド音声に挿入)\n"
 
-#: src/multitrack.c:17414
+#: src/multitrack.c:17759
 #, c-format
 msgid ""
 "Inserted frames %d to %d from clip %s into track %s from time %.4f to %.4f\n"
@@ -10462,14 +10469,14 @@
 "フレーム %d から %d を挿入(クリップ %s からトラック %s に挿入。時間は %.4f か"
 "ら %.4f まで)\n"
 
-#: src/multitrack.c:17998
+#: src/multitrack.c:18332
 #, c-format
 msgid ""
 "Time region %.3f to %.3f\n"
 "selected.\n"
 msgstr "%.3f から %.3f までの時間帯が選択されています。\n"
 
-#: src/multitrack.c:18002
+#: src/multitrack.c:18336
 msgid ""
 "select one or more tracks\n"
 "to create a region.\n"
@@ -10477,12 +10484,12 @@
 "時間帯を作成するために\n"
 "少なくともひとつのトラックを選択してください。\n"
 
-#: src/multitrack.c:18004
+#: src/multitrack.c:18337
 #, c-format
 msgid "%d video tracks selected.\n"
 msgstr "%d トラックが選択されています。\n"
 
-#: src/multitrack.c:18006
+#: src/multitrack.c:18339
 msgid ""
 "Double click on timeline\n"
 "to deselect time region."
@@ -10490,7 +10497,7 @@
 "タイムライン上でダブルクリックすると\n"
 "時間帯の選択を解除します。"
 
-#: src/multitrack.c:18013
+#: src/multitrack.c:18346
 msgid ""
 "Single click on an effect\n"
 "to select it."
@@ -10498,7 +10505,7 @@
 "エフェクトをクリックして\n"
 "選択します。"
 
-#: src/multitrack.c:18014
+#: src/multitrack.c:18347
 msgid ""
 "Double click on an effect\n"
 "to edit it."
@@ -10506,7 +10513,7 @@
 "エフェクト上でダブルクリックして\n"
 "編集を行います。"
 
-#: src/multitrack.c:18015
+#: src/multitrack.c:18348
 msgid ""
 "Right click on an effect\n"
 "for context menu.\n"
@@ -10514,7 +10521,7 @@
 "エフェクト上で右クリックをすると\n"
 "編集メニューが開きます。\n"
 
-#: src/multitrack.c:18017
+#: src/multitrack.c:18350
 msgid ""
 "Effect order can be changed at\n"
 "FILTER MAPS"
@@ -10522,7 +10529,7 @@
 "このフィルターマップのエフェクトの順番は\n"
 "変更することができます。"
 
-#: src/multitrack.c:18024
+#: src/multitrack.c:18357
 msgid ""
 "You can select an effect,\n"
 "then use the INSERT BEFORE"
@@ -10530,15 +10537,15 @@
 "エフェクトを移動するには、選択した後に\n"
 "上に挿入 ボタンをクリックするか"
 
-#: src/multitrack.c:18025
+#: src/multitrack.c:18358
 msgid "or INSERT AFTER buttons to move it."
 msgstr "下に挿入 ボタンをクリックします。"
 
-#: src/multitrack.c:18307 src/multitrack.c:18320
+#: src/multitrack.c:18639 src/multitrack.c:18652
 msgid "Click on another effect,"
 msgstr "選択したエフェクトは"
 
-#: src/multitrack.c:18308 src/multitrack.c:18321
+#: src/multitrack.c:18640 src/multitrack.c:18653
 msgid ""
 "and the selected one\n"
 "will be inserted"
@@ -10546,51 +10553,51 @@
 "移動先にあるエフェクトを\n"
 "クリックすると"
 
-#: src/multitrack.c:18309
+#: src/multitrack.c:18641
 msgid "after it.\n"
 msgstr "その下に移動します。\n"
 
-#: src/multitrack.c:18322
+#: src/multitrack.c:18654
 msgid "before it.\n"
 msgstr "その上に移動します。\n"
 
-#: src/multitrack.c:18551
+#: src/multitrack.c:18889
 #, c-format
 msgid "Removed parameter values for effect %s at time %.4f\n"
 msgstr "エフェクト %s からパラメータ値を消去 (時間 %.4f )\n"
 
-#: src/multitrack.c:18759
+#: src/multitrack.c:19100
 #, c-format
 msgid "Set parameter values for %s %s on %s at time %.4f\n"
 msgstr "パラメータ値を設定: %s %s, %s (時間 %.4f )\n"
 
-#: src/multitrack.c:19251 src/multitrack.c:20873
+#: src/multitrack.c:19630 src/multitrack.c:21195
 msgid "_Autoreload each time"
 msgstr "常に自動読み込み(_A)"
 
-#: src/multitrack.c:19323
+#: src/multitrack.c:19702
 #, fuzzy
 msgid "Saving layout"
 msgstr "レイアウトを保存(_S)"
 
-#: src/multitrack.c:19345
+#: src/multitrack.c:19725
 #, c-format
 msgid "Saved layout to %s\n"
 msgstr "%s へレイアウトを保存\n"
 
-#: src/multitrack.c:20783
+#: src/multitrack.c:21125
 msgid "clips and frames"
 msgstr "クリップとフレーム"
 
-#: src/multitrack.c:20787
+#: src/multitrack.c:21128
 msgid "clips"
 msgstr "クリップ"
 
-#: src/multitrack.c:20790
+#: src/multitrack.c:21130
 msgid "frames"
 msgstr "フレーム"
 
-#: src/multitrack.c:20800
+#: src/multitrack.c:21140
 msgid ""
 "\n"
 "Auto reload layout.\n"
@@ -10598,7 +10605,7 @@
 "\n"
 "レイアウトの自動読み込み\n"
 
-#: src/multitrack.c:20803
+#: src/multitrack.c:21143
 #, c-format
 msgid ""
 "%s\n"
@@ -10609,11 +10616,11 @@
 "いくつかの %s がレイアウト %s から失われています。\n"
 "そのため正しく読み込まれないかもしれません。\n"
 
-#: src/multitrack.c:20920
+#: src/multitrack.c:21284
 msgid "auto backup"
 msgstr "自動バックアップ"
 
-#: src/multitrack.c:20923
+#: src/multitrack.c:21287
 #, c-format
 msgid ""
 "\n"
@@ -10622,31 +10629,31 @@
 "\n"
 "ファイル %s からレイアウトを読み込みできません。\n"
 
-#: src/multitrack.c:20944
+#: src/multitrack.c:21308
 #, c-format
 msgid "Loading layout from %s..."
 msgstr "レイアウトを %s から読み込み中..."
 
-#: src/multitrack.c:20978
+#: src/multitrack.c:21338
 #, c-format
 msgid "Got %d events...processing..."
 msgstr "%d イベントを取得...処理中..."
 
-#: src/multitrack.c:20991
+#: src/multitrack.c:21349
 msgid "Checking and rebuilding event list"
 msgstr "イベントリストのチェックとリビルド"
 
-#: src/multitrack.c:21017
+#: src/multitrack.c:21374
 #, c-format
 msgid "%d errors detected.\n"
 msgstr "%d エラーを検出しました。\n"
 
-#: src/multitrack.c:21068
+#: src/multitrack.c:21422
 #, c-format
 msgid "Multitrack fps set to %.3f\n"
 msgstr "マルチトラックfpsを %.3f に設定\n"
 
-#: src/multitrack.c:21225
+#: src/multitrack.c:21576
 #, fuzzy
 msgid ""
 "The current layout has changes which have not been saved.\n"
@@ -10655,19 +10662,19 @@
 "現在のレイアウトは保存されていません。\n"
 "どうしますか?\n"
 
-#: src/multitrack.c:22047
+#: src/multitrack.c:22385
 msgid "LiVES: Multitrack audio mixer"
 msgstr "LiVES: マルチトラック音声ミキサー"
 
-#: src/multitrack.c:22077
+#: src/multitrack.c:22414
 msgid "_Reset values"
 msgstr "値のリセット(_R)"
 
-#: src/multitrack.c:22081
+#: src/multitrack.c:22418
 msgid "_Close mixer"
 msgstr "ミキサーを閉じる(_C)"
 
-#: src/multitrack.c:22130
+#: src/multitrack.c:22466
 msgid ""
 "_Invert backing audio\n"
 "and layer volumes"
@@ -10675,35 +10682,35 @@
 "バックグラウンド音声と\n"
 "レイヤー音量を反転(_I)"
 
-#: src/multitrack.c:22132
+#: src/multitrack.c:22468
 msgid "Adjust backing and layer audio values so that they sum to 1.0"
 msgstr "バックグラウンドとレイヤー音声の値を合計で1.0になるように調整"
 
-#: src/multitrack.c:22175
+#: src/multitrack.c:22510
 msgid "_Gang layer audio"
 msgstr "レイヤー音声をまとめる(_G)"
 
-#: src/multitrack.c:22177
+#: src/multitrack.c:22512
 msgid "Adjust all layer audio values to the same value"
 msgstr "すべてのレイヤーの音量を同じ値に揃える"
 
-#: src/jack.c:104
+#: src/jack.c:102
 msgid "JACK server started\n"
 msgstr "JACKサーバーの開始\n"
 
-#: src/jack.c:1284 src/jack.c:1353
+#: src/jack.c:1265 src/jack.c:1334
 msgid "Unable to connect to JACK server\n"
 msgstr "JACKサーバーに接続できません\n"
 
-#: src/jack.c:1512
+#: src/jack.c:1491
 msgid "Started jack audio subsystem.\n"
 msgstr "JACKサーバーの音声機能を開始\n"
 
-#: src/jack.c:1623
+#: src/jack.c:1600
 msgid "Started jack audio reader.\n"
 msgstr "JACKサーバーからの音声読み出しの開始\n"
 
-#: src/jack.c:1838
+#: src/jack.c:1815
 msgid ""
 "\n"
 "Connection to jack audio was reset.\n"
@@ -10711,7 +10718,7 @@
 "\n"
 "JACK の音声機能への接続をリセットしました。\n"
 
-#: src/pulse.c:87
+#: src/pulse.c:88
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -10723,7 +10730,7 @@
 "sox オーディオプレーヤーにフォールバックします。\n"
 "この設定は、設定/プレイバック で変更できます。\n"
 
-#: src/pulse.c:92
+#: src/pulse.c:94
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -10735,7 +10742,7 @@
 "mplayer オーディオプレーヤーにフォールバックします。\n"
 "この設定は、設定/プレイバック で変更できます。\n"
 
-#: src/pulse.c:96
+#: src/pulse.c:99
 #, fuzzy
 msgid ""
 "\n"
@@ -10748,7 +10755,7 @@
 "mplayer オーディオプレーヤーにフォールバックします。\n"
 "この設定は、設定/プレイバック で変更できます。\n"
 
-#: src/pulse.c:101
+#: src/pulse.c:104
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -10756,11 +10763,11 @@
 "\n"
 "PulseAudio サーバーに接続できませんでした。\n"
 
-#: src/pulse.c:107
+#: src/pulse.c:109
 msgid "LiVES will exit and you can choose another audio player.\n"
 msgstr "LiVES が終了すると、他のオーディオプレーヤーを選択できます。\n"
 
-#: src/pulse.c:1352
+#: src/pulse.c:1335
 msgid ""
 "\n"
 "Connection to pulse audio was reset.\n"
@@ -10768,113 +10775,113 @@
 "\n"
 "PulseAudio サーバーへの接続がリセットされました。\n"
 
-#: src/colourspace.c:1100
+#: src/colourspace.c:1092
 msgid "unclamped"
 msgstr "非固定"
 
-#: src/colourspace.c:1101
+#: src/colourspace.c:1093
 msgid "clamped"
 msgstr "固定"
 
-#: src/omc-learn.c:195
+#: src/omc-learn.c:191
 #, c-format
 msgid "Responding to joystick events from %s\n"
 msgstr "%s からのジョイスティックイベントへ反応\n"
 
-#: src/omc-learn.c:289
+#: src/omc-learn.c:279
 msgid "Creating ALSA seq port..."
 msgstr "ALSAシーケンサ機能にポートを開いています..."
 
-#: src/omc-learn.c:325
+#: src/omc-learn.c:313
 #, c-format
 msgid "Responding to MIDI events from %s\n"
 msgstr "%s からのMIDIイベントへ反応\n"
 
-#: src/omc-learn.c:568
+#: src/omc-learn.c:554
 msgid "data"
 msgstr "データ"
 
-#: src/omc-learn.c:571
+#: src/omc-learn.c:557
 msgid "velocity"
 msgstr "速度"
 
-#: src/omc-learn.c:572
+#: src/omc-learn.c:558
 msgid "note"
 msgstr "ノート"
 
-#: src/omc-learn.c:574 src/omc-learn.c:736 src/omc-learn.c:1105
-#: src/omc-learn.c:1591 src/omc-learn.c:1640
+#: src/omc-learn.c:560 src/omc-learn.c:724 src/omc-learn.c:1092
+#: src/omc-learn.c:1581 src/omc-learn.c:1630
 msgid "value"
 msgstr "値"
 
-#: src/omc-learn.c:576
+#: src/omc-learn.c:562
 msgid "state"
 msgstr "状態"
 
-#: src/omc-learn.c:688
+#: src/omc-learn.c:674
 msgid "variable"
 msgstr "変数"
 
-#: src/omc-learn.c:1001
+#: src/omc-learn.c:989
 msgid "Vars."
 msgstr "変数"
 
-#: src/omc-learn.c:1054
+#: src/omc-learn.c:1041
 #, c-format
 msgid "MIDI ch %d note on"
 msgstr "MIDI ch %d　ノートオン"
 
-#: src/omc-learn.c:1058
+#: src/omc-learn.c:1045
 #, c-format
 msgid "MIDI ch %d note off"
 msgstr "MIDI ch %d　ノートオフ"
 
-#: src/omc-learn.c:1062
+#: src/omc-learn.c:1049
 #, c-format
 msgid "MIDI ch %d controller %d"
 msgstr "MIDI ch %d コントローラ %d"
 
-#: src/omc-learn.c:1066
+#: src/omc-learn.c:1053
 #, c-format
 msgid "MIDI ch %d pitch bend"
 msgstr "MIDI ch %d ピッチベンド"
 
-#: src/omc-learn.c:1070
+#: src/omc-learn.c:1057
 #, c-format
 msgid "MIDI ch %d pgm change"
 msgstr "MIDI ch %d プログラムチェンジ"
 
-#: src/omc-learn.c:1073
+#: src/omc-learn.c:1060
 #, c-format
 msgid "Joystick button %d"
 msgstr "ジョイスティックボタン %d"
 
-#: src/omc-learn.c:1076
+#: src/omc-learn.c:1063
 #, c-format
 msgid "Joystick axis %d"
 msgstr "ジョイスティック軸 %d"
 
-#: src/omc-learn.c:1113
+#: src/omc-learn.c:1100
 msgid "x"
 msgstr "x"
 
-#: src/omc-learn.c:1122
+#: src/omc-learn.c:1109
 msgid "range"
 msgstr "範囲"
 
-#: src/omc-learn.c:1143
+#: src/omc-learn.c:1130
 msgid "+ offset1"
 msgstr "+ オフセット1"
 
-#: src/omc-learn.c:1161
+#: src/omc-learn.c:1150
 msgid "* scale"
 msgstr "* スケール"
 
-#: src/omc-learn.c:1179
+#: src/omc-learn.c:1170
 msgid "+ offset2"
 msgstr "+ オフセット2"
 
-#: src/omc-learn.c:1280
+#: src/omc-learn.c:1270
 msgid ""
 "\n"
 "Click OK to delete all entries\n"
@@ -10882,208 +10889,208 @@
 "\n"
 "すべてのエントリを削除するには[OK]をクリックします\n"
 
-#: src/omc-learn.c:1318
+#: src/omc-learn.c:1308
 msgid "LiVES: OMC learner"
 msgstr "LiVES: OMCラーナー"
 
-#: src/omc-learn.c:1334
+#: src/omc-learn.c:1324
 msgid "Clear _unmatched"
 msgstr "アンマッチのクリア(_U)"
 
-#: src/omc-learn.c:1345
+#: src/omc-learn.c:1335
 msgid "_Delete all"
 msgstr "すべて削除(_D)"
 
-#: src/omc-learn.c:1411
+#: src/omc-learn.c:1401
 msgid "Start video playback"
 msgstr "ビデオ再生の開始"
 
-#: src/omc-learn.c:1414
+#: src/omc-learn.c:1404
 msgid "Stop video playback"
 msgstr "ビデオ再生の停止"
 
-#: src/omc-learn.c:1418
+#: src/omc-learn.c:1408
 msgid "Clip select <clipnum>"
 msgstr "クリップ選択 <clipnum>"
 
-#: src/omc-learn.c:1419
+#: src/omc-learn.c:1409
 msgid "Switch foreground clip to the nth valid clip"
 msgstr "前景クリップを n番目の有効なクリップと変更"
 
-#: src/omc-learn.c:1423
+#: src/omc-learn.c:1413
 msgid "Play forwards"
 msgstr "前に再生"
 
-#: src/omc-learn.c:1424
+#: src/omc-learn.c:1414
 msgid "Play video in a forwards direction"
 msgstr "ビデオを前方向に再生"
 
-#: src/omc-learn.c:1427
+#: src/omc-learn.c:1417
 msgid "Play backwards"
 msgstr "後ろに再生"
 
-#: src/omc-learn.c:1428
+#: src/omc-learn.c:1418
 msgid "Play video in a backwards direction"
 msgstr "ビデオを後方向に再生"
 
-#: src/omc-learn.c:1431
+#: src/omc-learn.c:1421
 msgid "Reverse playback direction"
 msgstr "再生方向のリバース"
 
-#: src/omc-learn.c:1432
+#: src/omc-learn.c:1422
 msgid "Reverse direction of video playback"
 msgstr "ビデオ再生方向のリバース"
 
-#: src/omc-learn.c:1435
+#: src/omc-learn.c:1425
 msgid "Play video faster"
 msgstr "さらに速くビデオを再生"
 
-#: src/omc-learn.c:1436
+#: src/omc-learn.c:1426
 msgid "Play video at a slightly faster rate"
 msgstr "少し速いレートでビデオを再生"
 
-#: src/omc-learn.c:1439
+#: src/omc-learn.c:1429
 msgid "Play video slower"
 msgstr "さらに遅くビデオを再生"
 
-#: src/omc-learn.c:1440
+#: src/omc-learn.c:1430
 msgid "Play video at a slightly slower rate"
 msgstr "少し遅いレートでビデオを再生"
 
-#: src/omc-learn.c:1443
+#: src/omc-learn.c:1433
 msgid "Toggle video freeze"
 msgstr "ビデオ一時停止/再開"
 
-#: src/omc-learn.c:1444
+#: src/omc-learn.c:1434
 msgid "Freeze video, or if already frozen, unfreeze it"
 msgstr "ビデオを一時停止、もしくは停止しているならば再開します。"
 
-#: src/omc-learn.c:1447
+#: src/omc-learn.c:1437
 msgid "Set video framerate to <fps>"
 msgstr "映像のフレームレートを <fps> に設定"
 
-#: src/omc-learn.c:1448
+#: src/omc-learn.c:1438
 msgid "Set framerate of foreground clip to <float fps>"
 msgstr "前景クリップのフレームレートを <float fps> に設定"
 
-#: src/omc-learn.c:1452
+#: src/omc-learn.c:1442
 msgid "Start recording"
 msgstr "記録の開始"
 
-#: src/omc-learn.c:1455
+#: src/omc-learn.c:1445
 msgid "Stop recording"
 msgstr "記録の停止"
 
-#: src/omc-learn.c:1458
+#: src/omc-learn.c:1448
 msgid "Toggle recording state"
 msgstr "記録状態のトグル"
 
-#: src/omc-learn.c:1461
+#: src/omc-learn.c:1451
 msgid "Swap foreground and background clips"
 msgstr "前景と背景クリップの交換"
 
-#: src/omc-learn.c:1463
+#: src/omc-learn.c:1453
 msgid "Reset effect keys"
 msgstr "エフェクトキーのリセット"
 
-#: src/omc-learn.c:1464
+#: src/omc-learn.c:1454
 msgid "Switch all effects off."
 msgstr "すべてのエフェクトをオフ"
 
-#: src/omc-learn.c:1467
+#: src/omc-learn.c:1457
 msgid "Enable effect key <key>"
 msgstr "エフェクトキー <key> を有効にする"
 
-#: src/omc-learn.c:1471
+#: src/omc-learn.c:1461
 msgid "Disable effect key <key>"
 msgstr "エフェクトキー <key> を無効にする"
 
-#: src/omc-learn.c:1475
+#: src/omc-learn.c:1465
 msgid "Toggle effect key <key>"
 msgstr "エフェクトキー <key> のトグル"
 
-#: src/omc-learn.c:1479
+#: src/omc-learn.c:1469
 msgid "Set parameter value <key> <pnum> = <value>"
 msgstr "パラメータ値のセット　<key> <pnum> = <value>"
 
-#: src/omc-learn.c:1480
+#: src/omc-learn.c:1470
 msgid "Set <value> of pth (numerical) parameter for effect key <key>."
 msgstr ""
 "エフェクトキー <key>　に対するp番目の(数値)パラメータを <value> にセット"
 
-#: src/omc-learn.c:1484
+#: src/omc-learn.c:1474
 msgid "Switch foreground to next clip"
 msgstr "前景を次のクリップに変更"
 
-#: src/omc-learn.c:1487
+#: src/omc-learn.c:1477
 msgid "Switch foreground to previous clip"
 msgstr "前景を前のクリップに変更"
 
-#: src/omc-learn.c:1490
+#: src/omc-learn.c:1480
 msgid "Set video framerate to ratio <fps_ratio>"
 msgstr "映像のフレームレートを <fps_ratio> に設定"
 
-#: src/omc-learn.c:1491
+#: src/omc-learn.c:1481
 msgid "Set framerate ratio of foreground clip to <float fps_ratio>"
 msgstr "前景クリップのフレームレート比を <float fps_ratio> にセット"
 
-#: src/omc-learn.c:1495
+#: src/omc-learn.c:1485
 msgid "Retrigger clip <clipnum>"
 msgstr "クリップ<clipnum>のリトリガー"
 
-#: src/omc-learn.c:1496
+#: src/omc-learn.c:1486
 msgid ""
 "Switch foreground clip to the nth valid clip, and reset the frame number"
 msgstr "前景のクリップをn番目の有効なクリップと交換し、フレーム番号をリセット"
 
-#: src/omc-learn.c:1500
+#: src/omc-learn.c:1490
 msgid "Cycle to next mode for effect key <key>"
 msgstr "エフェクトキー <key> を次のモードに切り替え"
 
-#: src/omc-learn.c:1504
+#: src/omc-learn.c:1494
 msgid "Cycle to previous mode for effect key <key>"
 msgstr "エフェクトキー <key> を前のモードに切り替え"
 
-#: src/omc-learn.c:1508
+#: src/omc-learn.c:1498
 msgid "Set playback plugin parameter value <pnum> = <value>"
 msgstr ""
 
-#: src/omc-learn.c:1509
+#: src/omc-learn.c:1499
 msgid "Set <value> of pth parameter for the playback plugin."
 msgstr ""
 
 #. TRANSLATORS: short form of "clip number"
-#: src/omc-learn.c:1536 src/omc-learn.c:1607
+#: src/omc-learn.c:1526 src/omc-learn.c:1597
 msgid "clipnum"
 msgstr "クリップ番号"
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1545
+#: src/omc-learn.c:1535
 msgid "fps"
 msgstr "fps"
 
 #. TRANSLATORS: as in keyboard key
-#: src/omc-learn.c:1553 src/omc-learn.c:1560 src/omc-learn.c:1567
-#: src/omc-learn.c:1575 src/omc-learn.c:1615 src/omc-learn.c:1623
+#: src/omc-learn.c:1543 src/omc-learn.c:1550 src/omc-learn.c:1557
+#: src/omc-learn.c:1565 src/omc-learn.c:1605 src/omc-learn.c:1613
 msgid "key"
 msgstr "キー"
 
 #. TRANSLATORS: short form of "parameter number"
-#: src/omc-learn.c:1583 src/omc-learn.c:1632
+#: src/omc-learn.c:1573 src/omc-learn.c:1622
 msgid "pnum"
 msgstr "p番号"
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1599
+#: src/omc-learn.c:1589
 msgid "fps_ratio"
 msgstr "fps比率(_R)"
 
-#: src/omc-learn.c:2443
+#: src/omc-learn.c:2417
 #, c-format
 msgid "Saving device mapping to file %s..."
 msgstr "デバイスマップをファイル %s に保存..."
 
-#: src/omc-learn.c:2527
+#: src/omc-learn.c:2498
 #, c-format
 msgid ""
 "\n"
@@ -11096,7 +11103,7 @@
 "ファイルのパースエラー\n"
 "%s\n"
 
-#: src/omc-learn.c:2534
+#: src/omc-learn.c:2505
 #, c-format
 msgid ""
 "\n"
@@ -11109,12 +11116,12 @@
 "無効なバージョンのファイル\n"
 "%s\n"
 
-#: src/omc-learn.c:2571
+#: src/omc-learn.c:2541
 #, c-format
 msgid "Loading device mapping from file %s..."
 msgstr "デバイスマップをファイル %s から読み込み中..."
 
-#: src/omc-learn.c:2576
+#: src/omc-learn.c:2544
 #, c-format
 msgid ""
 "\n"
@@ -11129,12 +11136,12 @@
 "\n"
 "エラーコード %d\n"
 
-#: src/videodev.c:547
+#: src/videodev.c:539
 #, c-format
 msgid "Unable to open device %s\n"
 msgstr "デバイス %s を開くことができません\n"
 
-#: src/videodev.c:564
+#: src/videodev.c:554
 #, c-format
 msgid "Opened device %s\n"
 msgstr "デバイス %s を開きました\n"
@@ -12105,6 +12112,18 @@
 #~ msgid "$error"
 #~ msgstr "$error"
 
+#~ msgid "Pause"
+#~ msgstr "一時停止"
+
+#~ msgid "Start frame"
+#~ msgstr "フレームの開始"
+
+#~ msgid "End frame"
+#~ msgstr "フレームの終了"
+
+#~ msgid "LiVES: - Enter Set Name"
+#~ msgstr "LiVES: - セット名の入力"
+
 #, fuzzy
 #~ msgid "_Open"
 #~ msgstr "開く(_O)..."

LiVES-2.2.8.tar.bz2/po/lives.pot -> LiVES-2.4.1.tar.bz2/po/lives.pot Changed

@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: lives 2.2.8\n"
+"Project-Id-Version: lives 2.4.1\n"
 "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n"
-"POT-Creation-Date: 2015-02-08 17:18-0300\n"
+"POT-Creation-Date: 2015-08-09 14:52-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"
@@ -17,8 +17,7 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#. TRANSLATORS: do not translate this message
-#: src/main.c:118
+#: src/main.c:128
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -27,22 +26,22 @@
 "http://lives.sourceforge.net/TRANS-README.txt"
 msgstr ""
 
-#: src/main.c:134
+#: src/main.c:153
 #, c-format
 msgid "%s Warning: %s\n"
 msgstr ""
 
-#: src/main.c:138
+#: src/main.c:157
 #, c-format
 msgid "%s Critical error: %s\n"
 msgstr ""
 
-#: src/main.c:139
+#: src/main.c:158
 #, c-format
 msgid "%s Fatal error: %s\n"
 msgstr ""
 
-#: src/main.c:176
+#: src/main.c:198
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -51,7 +50,7 @@
 "Thanks. Recovery should be possible if you restart LiVES.\n"
 msgstr ""
 
-#: src/main.c:177
+#: src/main.c:199
 msgid ""
 "\n"
 "\n"
@@ -59,96 +58,96 @@
 "distribution, and the LiVES version ("
 msgstr ""
 
-#: src/main.c:180
+#: src/main.c:203
 msgid ""
 "and any information shown below:\n"
 "\n"
 msgstr ""
 
-#: src/main.c:184
+#: src/main.c:206
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
 "\n"
 msgstr ""
 
-#: src/main.c:192
+#: src/main.c:216
 msgid "Preserving set.\n"
 msgstr ""
 
-#: src/main.c:636
+#: src/main.c:691
 msgid "Resizing"
 msgstr ""
 
-#: src/main.c:643
+#: src/main.c:698
 msgid "_Resize All Frames"
 msgstr ""
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:895
+#: src/main.c:948
 msgid "Any"
 msgstr ""
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:897
+#: src/main.c:950
 msgid "None"
 msgstr ""
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:899
+#: src/main.c:952
 msgid "recommended"
 msgstr ""
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:901
+#: src/main.c:954
 msgid "disabled !"
 msgstr ""
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:903
+#: src/main.c:956
 msgid "**The current layout**"
 msgstr ""
 
 #. TRANSLATORS: adjective for "Built in" type effects
-#: src/main.c:905
+#: src/main.c:958
 msgid "Builtin"
 msgstr ""
 
 #. TRANSLATORS: adjective for "Custom" type effects
-#: src/main.c:907
+#: src/main.c:960
 msgid "Custom"
 msgstr ""
 
 #. TRANSLATORS: adjective for "Test" type effects
-#: src/main.c:909
+#: src/main.c:962
 msgid "Test"
 msgstr ""
 
-#: src/main.c:1054
+#: src/main.c:1107
 msgid "Foreground"
 msgstr ""
 
-#: src/main.c:1055
+#: src/main.c:1108
 msgid "Background"
 msgstr ""
 
-#: src/main.c:1566
+#: src/main.c:1624
 msgid "Loading realtime effect plugins..."
 msgstr ""
 
-#: src/main.c:1631
+#: src/main.c:1690
 msgid "Starting jack audio server..."
 msgstr ""
 
-#: src/main.c:1633
+#: src/main.c:1692
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1634
+#: src/main.c:1693
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1663
+#: src/main.c:1723
 #, c-format
 msgid ""
 "\n"
@@ -160,112 +159,112 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1697
+#: src/main.c:1758
 msgid "Starting pulse audio server..."
 msgstr ""
 
-#: src/main.c:1765
+#: src/main.c:1825
 msgid "Checking optional dependencies:"
 msgstr ""
 
-#: src/main.c:1766
+#: src/main.c:1826
 msgid "mplayer...detected..."
 msgstr ""
 
-#: src/main.c:1767
+#: src/main.c:1827
 msgid "mplayer...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1768
+#: src/main.c:1828
 msgid "mplayer2...detected..."
 msgstr ""
 
-#: src/main.c:1769
+#: src/main.c:1829
 msgid "mplayer2...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1770
+#: src/main.c:1830
 msgid "convert...detected..."
 msgstr ""
 
-#: src/main.c:1771
+#: src/main.c:1831
 msgid "convert...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1772
+#: src/main.c:1832
 msgid "composite...detected..."
 msgstr ""
 
-#: src/main.c:1773
+#: src/main.c:1833
 msgid "composite...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1774
+#: src/main.c:1834
 msgid "sox...detected\n"
 msgstr ""
 
-#: src/main.c:1775
+#: src/main.c:1835
 msgid "sox...NOT DETECTED\n"
 msgstr ""
 
-#: src/main.c:1776
+#: src/main.c:1836
 msgid "cdda2wav...detected..."
 msgstr ""
 
-#: src/main.c:1777
+#: src/main.c:1837
 msgid "cdda2wav...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1778
+#: src/main.c:1838
 msgid "jackd...detected..."
 msgstr ""
 
-#: src/main.c:1779
+#: src/main.c:1839
 msgid "jackd...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1780
+#: src/main.c:1840
 msgid "pulse audio...detected..."
 msgstr ""
 
-#: src/main.c:1781
+#: src/main.c:1841
 msgid "pulse audio...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1782
+#: src/main.c:1842
 msgid "python...detected..."
 msgstr ""
 
-#: src/main.c:1783
+#: src/main.c:1843
 msgid "python...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1784
+#: src/main.c:1844
 msgid "dvgrab...detected..."
 msgstr ""
 
-#: src/main.c:1785
+#: src/main.c:1845
 msgid "dvgrab...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1786
+#: src/main.c:1846
 msgid "xwininfo...detected..."
 msgstr ""
 
-#: src/main.c:1787
+#: src/main.c:1847
 msgid "xwininfo...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1793
+#: src/main.c:1853
 #, c-format
 msgid "Windows version %04X"
 msgstr ""
 
-#: src/main.c:1795
+#: src/main.c:1855
 msgid "UNKNOWN - please patch me !"
 msgstr ""
 
-#: src/main.c:1799
+#: src/main.c:1859
 #, c-format
 msgid ""
 "\n"
@@ -273,199 +272,204 @@
 "Window manager reports as \"%s\"; "
 msgstr ""
 
-#: src/main.c:1802
+#: src/main.c:1862
 #, c-format
 msgid "number of monitors detected: %d\n"
 msgstr ""
 
-#: src/main.c:1805
+#: src/main.c:1865
 #, c-format
 msgid "Number of CPUs detected: %d "
 msgstr ""
 
-#: src/main.c:1808 src/multitrack.c:4902
+#: src/main.c:1868 src/multitrack.c:5068
 msgid "little endian"
 msgstr ""
 
-#: src/main.c:1809 src/multitrack.c:4901
+#: src/main.c:1869 src/multitrack.c:5067
 msgid "big endian"
 msgstr ""
 
-#: src/main.c:1810
+#: src/main.c:1870
 #, c-format
 msgid "(%d bits, %s)\n"
 msgstr ""
 
-#: src/main.c:1814
+#: src/main.c:1874
 msgid "GUI type is: "
 msgstr ""
 
-#: src/main.c:1818
+#: src/main.c:1878
 #, c-format
 msgid "GTK+ version %d.%d.%d (compiled with %d.%d.%d)"
 msgstr ""
 
-#: src/main.c:1840
+#: src/main.c:1900
 msgid ", with cairo support"
 msgstr ""
 
-#: src/main.c:1847
+#: src/main.c:1907
 #, c-format
 msgid "Temp directory is %s\n"
 msgstr ""
 
-#: src/main.c:1851
+#: src/main.c:1911
 msgid ""
 "WARNING - this version of LiVES was compiled without either\n"
 "jack or pulse audio support.\n"
 "Many audio features will be unavailable.\n"
 msgstr ""
 
-#: src/main.c:1854
+#: src/main.c:1914
 msgid "Compiled with jack support, good !\n"
 msgstr ""
 
-#: src/main.c:1857
+#: src/main.c:1917
 msgid "Compiled with pulse audio support, wonderful !\n"
 msgstr ""
 
-#: src/main.c:1861
+#: src/main.c:1921
 #, c-format
 msgid ""
 "Welcome to LiVES version %s.\n"
 "\n"
 msgstr ""
 
-#: src/main.c:2306
+#: src/main.c:2380
 #, c-format
 msgid ""
 "\n"
 "Startup syntax is: %s [opts] [filename [start_time] [frames]]\n"
 msgstr ""
 
-#: src/main.c:2307
+#: src/main.c:2381
 msgid "Where: filename is the name of a media file or backup file.\n"
 msgstr ""
 
-#: src/main.c:2308
+#: src/main.c:2382
 msgid "start_time : filename start time in seconds\n"
 msgstr ""
 
-#: src/main.c:2309
+#: src/main.c:2383
 msgid "frames : maximum number of frames to open\n"
 msgstr ""
 
-#: src/main.c:2311
+#: src/main.c:2385
 msgid "opts can be:\n"
 msgstr ""
 
-#: src/main.c:2312
+#: src/main.c:2386
 msgid "-help            : show this help text and exit\n"
 msgstr ""
 
-#: src/main.c:2313
+#: src/main.c:2387
 msgid "-tmpdir <tempdir>: use alternate working directory (e.g /var/ramdisk)\n"
 msgstr ""
 
-#: src/main.c:2314
+#: src/main.c:2388
 msgid "-set <setname>   : autoload clip set setname\n"
 msgstr ""
 
-#: src/main.c:2315
+#: src/main.c:2389
 msgid "-noset           : do not load any set on startup\n"
 msgstr ""
 
-#: src/main.c:2316
+#: src/main.c:2390
 msgid "-norecover       : force no-loading of crash recovery\n"
 msgstr ""
 
-#: src/main.c:2317
+#: src/main.c:2391
 msgid "-recover         : force loading of crash recovery\n"
 msgstr ""
 
-#: src/main.c:2318
-msgid "-nothreaddialog  : doe nothing - retained for backwards compatibility\n"
+#: src/main.c:2392
+msgid ""
+"-nothreaddialog  : does nothing - retained for backwards compatibility\n"
 msgstr ""
 
-#: src/main.c:2319
+#: src/main.c:2393
 msgid "-nogui           : do not show the gui\n"
 msgstr ""
 
-#: src/main.c:2320
+#: src/main.c:2394
 msgid "-nosplash        : do not show the splash window\n"
 msgstr ""
 
-#: src/main.c:2321
+#: src/main.c:2395
 msgid "-noplaywin       : do not show the play window\n"
 msgstr ""
 
-#: src/main.c:2322
+#: src/main.c:2396
+msgid "-noninteractive  : disable menu interactivity\n"
+msgstr ""
+
+#: src/main.c:2397
 msgid "-startup-ce      : start in clip editor mode\n"
 msgstr ""
 
-#: src/main.c:2323
+#: src/main.c:2398
 msgid "-startup-mt      : start in multitrack mode\n"
 msgstr ""
 
-#: src/main.c:2324
+#: src/main.c:2399
 msgid ""
 "-fxmodesmax <n>  : allow <n> modes per effect key (minimum is 1, default is "
 "8)\n"
 msgstr ""
 
-#: src/main.c:2326
+#: src/main.c:2401
 msgid "-oscstart <port> : start OSC listener on UDP port <port>\n"
 msgstr ""
 
-#: src/main.c:2327
+#: src/main.c:2402
 msgid "-nooscstart      : do not start OSC listener\n"
 msgstr ""
 
-#: src/main.c:2329
+#: src/main.c:2404
 msgid ""
 "-aplayer <ap>    : start with selected audio player. <ap> can be mplayer, "
 "mplayer2"
 msgstr ""
 
 #. TRANSLATORS: pulse (audio)
-#: src/main.c:2332
+#: src/main.c:2407
 msgid ", pulse"
 msgstr ""
 
-#: src/main.c:2335
+#: src/main.c:2410
 msgid ", sox or jack\n"
 msgstr ""
 
-#: src/main.c:2336
+#: src/main.c:2412
 msgid ""
 "-jackopts <opts>    : opts is a bitmap of jack startup options [1 = jack "
 "transport client, 2 = jack transport master, 4 = start jack transport "
 "server, 8 = pause audio when video paused, 16 = start jack audio server] \n"
 msgstr ""
 
-#: src/main.c:2338
+#: src/main.c:2414
 msgid " or sox\n"
 msgstr ""
 
-#: src/main.c:2340
+#: src/main.c:2416
 msgid "-devicemap <mapname>          : autoload devicemap\n"
 msgstr ""
 
-#: src/main.c:2341
+#: src/main.c:2418
 msgid ""
 "-vppdefaults <file>          : load video playback plugin defaults from "
 "<file> (Note: only sets the settings, not the plugin type)\n"
 msgstr ""
 
-#: src/main.c:2342
+#: src/main.c:2419
 msgid "-debug            : try to debug crashes (requires 'gdb' installed)\n"
 msgstr ""
 
-#: src/main.c:2373 src/gui.c:1128
+#: src/main.c:2449 src/gui.c:1127
 msgid "Starting GUI..."
 msgstr ""
 
-#: src/main.c:2396
+#: src/main.c:2475
 #, c-format
 msgid ""
 "\n"
@@ -476,7 +480,7 @@
 "(Maybe you need to change the value of <prefix_dir> in your %s file)\n"
 msgstr ""
 
-#: src/main.c:2410
+#: src/main.c:2492
 #, c-format
 msgid ""
 "\n"
@@ -484,7 +488,7 @@
 "Please make sure you have write access to %s and try again.\n"
 msgstr ""
 
-#: src/main.c:2415
+#: src/main.c:2498
 msgid ""
 "\n"
 "`smogrify` must be in your path, and be executable\n"
@@ -493,7 +497,7 @@
 "before running LiVES.\n"
 msgstr ""
 
-#: src/main.c:2421
+#: src/main.c:2504
 #, c-format
 msgid ""
 "\n"
@@ -503,7 +507,7 @@
 "Please check the file permissions for this file and try again.\n"
 msgstr ""
 
-#: src/main.c:2428
+#: src/main.c:2512
 #, c-format
 msgid ""
 "\n"
@@ -514,7 +518,7 @@
 "and try again.\n"
 msgstr ""
 
-#: src/main.c:2438
+#: src/main.c:2522
 #, c-format
 msgid ""
 "Please check the <tempdir> setting in \n"
@@ -522,7 +526,7 @@
 "and try again.\n"
 msgstr ""
 
-#: src/main.c:2445
+#: src/main.c:2528
 #, c-format
 msgid ""
 "\n"
@@ -532,7 +536,7 @@
 "%s"
 msgstr ""
 
-#: src/main.c:2453
+#: src/main.c:2536
 msgid ""
 "\n"
 "An incorrect version of smogrify was found in your path.\n"
@@ -543,49 +547,49 @@
 "Thankyou.\n"
 msgstr ""
 
-#: src/main.c:2458
+#: src/main.c:2541
 msgid ""
 "\n"
 "LiVES currently requires 'mplayer', 'mplayer2' or 'sox' to function. Please "
 "install one or other of these, and try again.\n"
 msgstr ""
 
-#: src/main.c:2462
+#: src/main.c:2546
 msgid ""
 "\n"
 "LiVES currently requires both 'mplayer' or 'mplayer2' and 'sox' to function. "
 "Please install these, and try again.\n"
 msgstr ""
 
-#: src/main.c:2472
+#: src/main.c:2556
 msgid ""
 "\n"
 "LiVES was unable to locate 'mplayer' or 'mplayer2'. You may wish to install "
 "either one to use LiVES more fully.\n"
 msgstr ""
 
-#: src/main.c:2475
+#: src/main.c:2561
 msgid ""
 "\n"
 "LiVES was unable to locate 'convert'. You should install convert and image-"
 "magick if you want to use rendered effects.\n"
 msgstr ""
 
-#: src/main.c:2478
+#: src/main.c:2566
 msgid ""
 "\n"
 "LiVES was unable to locate 'composite'. You should install composite and "
 "image-magick if you want to use the merge function.\n"
 msgstr ""
 
-#: src/main.c:2481
+#: src/main.c:2570
 msgid ""
 "\n"
 "LiVES was unable to locate 'sox'. Some audio features may not work. You "
 "should install 'sox'.\n"
 msgstr ""
 
-#: src/main.c:2484
+#: src/main.c:2575
 #, c-format
 msgid ""
 "\n"
@@ -596,93 +600,93 @@
 "You may need to change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/main.c:2611
+#: src/main.c:2707
 #, c-format
 msgid "Autoloading set %s..."
 msgstr ""
 
 #. TRANSLATORS: localised name may be used here
-#: src/main.c:2781 src/interface.c:738
+#: src/main.c:2902
 msgid "LiVES"
 msgstr ""
 
-#: src/main.c:2948
+#: src/main.c:3066
 #, c-format
 msgid "Invalid audio player %s\n"
 msgstr ""
 
-#: src/main.c:3077
+#: src/main.c:3214
 #, c-format
 msgid "LiVES-%s: <Untitled%d> %dx%d : %d frames %d bpp %.3f fps"
 msgstr ""
 
-#: src/main.c:3082
+#: src/main.c:3219
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : ??? frames ??? bpp %.3f fps"
 msgstr ""
 
-#: src/main.c:3086
+#: src/main.c:3222
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : %d frames %d bpp %.3f fps"
 msgstr ""
 
-#: src/main.c:3094
+#: src/main.c:3229
 #, c-format
 msgid "LiVES-%s: <No File>"
 msgstr ""
 
 #. TRANSLATORS: rec(ord)
-#: src/main.c:5085
+#: src/main.c:5201
 #, c-format
 msgid "rec %9d/%d"
 msgstr ""
 
 #. TRANSLATORS: out of memory (rec(ord))
-#: src/main.c:5091
+#: src/main.c:5206
 #, c-format
 msgid "!rec %9d/%d"
 msgstr ""
 
-#: src/main.c:5398 src/main.c:5399 src/gui.c:2110 src/gui.c:3220
-#: src/saveplay.c:2336
+#: src/main.c:5500 src/main.c:5501 src/gui.c:2108 src/gui.c:3331
+#: src/saveplay.c:2315
 msgid "Play"
 msgstr ""
 
-#: src/main.c:6128
+#: src/main.c:6216
 msgid ""
 "LiVES was unable to capture this image\n"
 "\n"
 msgstr ""
 
-#: src/main.c:6250
+#: src/main.c:6345
 #, c-format
 msgid "Closed file %s\n"
 msgstr ""
 
-#: src/main.c:6452 src/gui.c:648 src/utils.c:4312 src/utils.c:4344
-#: src/saveplay.c:3550 src/multitrack.c:4510 src/multitrack.c:6268
+#: src/main.c:6542 src/gui.c:647 src/utils.c:4256 src/utils.c:4286
+#: src/saveplay.c:3500 src/multitrack.c:4678 src/multitrack.c:6447
 msgid "_Undo"
 msgstr ""
 
-#: src/main.c:6453 src/gui.c:666 src/utils.c:4313 src/utils.c:4345
-#: src/saveplay.c:3551 src/multitrack.c:4531 src/multitrack.c:6293
+#: src/main.c:6543 src/gui.c:665 src/utils.c:4257 src/utils.c:4287
+#: src/saveplay.c:3501 src/multitrack.c:4698 src/multitrack.c:6472
 msgid "_Redo"
 msgstr ""
 
-#: src/main.c:6493 src/interface.c:470 src/gui.c:2326 src/preferences.c:2357
-#: src/resample.c:1516
+#: src/main.c:6583 src/interface.c:457 src/gui.c:2324 src/preferences.c:2391
+#: src/resample.c:1488
 msgid "Video"
 msgstr ""
 
-#: src/main.c:6494 src/interface.c:483 src/gui.c:2351
+#: src/main.c:6584 src/interface.c:470 src/gui.c:2348
 msgid "Left Audio"
 msgstr ""
 
-#: src/main.c:6495 src/gui.c:2375
+#: src/main.c:6585 src/gui.c:2371
 msgid "Right Audio"
 msgstr ""
 
-#: src/main.c:6540
+#: src/main.c:6630
 msgid ""
 "\n"
 "\n"
@@ -691,11 +695,11 @@
 "Please adjust the playback options in Preferences and try again.\n"
 msgstr ""
 
-#: src/main.c:7051 src/plugins.c:1502
+#: src/main.c:7134 src/plugins.c:1468
 msgid "LiVES: - Play Window"
 msgstr ""
 
-#: src/startup.c:25
+#: src/startup.c:24
 #, c-format
 msgid ""
 "A directory named\n"
@@ -705,7 +709,7 @@
 "(Free space = %s)\n"
 msgstr ""
 
-#: src/startup.c:32
+#: src/startup.c:29
 #, c-format
 msgid ""
 "A directory named\n"
@@ -715,7 +719,7 @@
 "Please select another location.\n"
 msgstr ""
 
-#: src/startup.c:49
+#: src/startup.c:46
 #, c-format
 msgid ""
 "\n"
@@ -726,7 +730,7 @@
 "(Free space = %s)"
 msgstr ""
 
-#: src/startup.c:54
+#: src/startup.c:50
 #, c-format
 msgid ""
 "\n"
@@ -735,54 +739,54 @@
 "Please try again and choose a different location.\n"
 msgstr ""
 
-#: src/startup.c:96
+#: src/startup.c:92
 msgid "Directory name is too long !"
 msgstr ""
 
-#: src/startup.c:223
+#: src/startup.c:216
 msgid ""
 "LiVES FAILED TO START YOUR SELECTED AUDIO PLAYER !\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:230
+#: src/startup.c:222
 msgid ""
 "Before starting LiVES, you need to choose an audio player.\n"
 "\n"
 "PULSE AUDIO is recommended for most users"
 msgstr ""
 
-#: src/startup.c:233
+#: src/startup.c:225
 msgid ""
 ", but this version of LiVES was not compiled with pulse audio support.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:236
+#: src/startup.c:229
 msgid ""
 ", but you do not have pulse audio installed on your system.\n"
 " You are advised to install pulse audio first before running LiVES.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:241
+#: src/startup.c:233
 msgid "JACK audio is recommended for pro users"
 msgstr ""
 
-#: src/startup.c:244
+#: src/startup.c:236
 msgid ""
 ", but this version of LiVES was not compiled with jack audio support.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:247
+#: src/startup.c:239
 msgid ""
 ", but you do not have jackd installed. You may wish to install jackd first "
 "before running LiVES.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:250
+#: src/startup.c:242
 msgid ""
 ", but may prevent LiVES from starting on some systems.\n"
 "If LiVES will not start with jack, you can restart and try with another "
@@ -790,159 +794,159 @@
 "\n"
 msgstr ""
 
-#: src/startup.c:254
+#: src/startup.c:246
 msgid "SOX may be used if neither of the preceding players work, "
 msgstr ""
 
-#: src/startup.c:257
+#: src/startup.c:249
 msgid ""
 "but some audio features will be disabled.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:260
+#: src/startup.c:251
 msgid ""
 "but you do not have sox installed.\n"
 "You are advised to install it before running LiVES.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:264
+#: src/startup.c:255
 msgid ""
 "The MPLAYER/MPLAYER2 audio player is only recommended for testing purposes.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:281
+#: src/startup.c:271
 msgid "LiVES: - Choose an audio player"
 msgstr ""
 
-#: src/startup.c:298
+#: src/startup.c:288
 msgid "Use _pulse audio player"
 msgstr ""
 
-#: src/startup.c:320
+#: src/startup.c:310
 msgid "Use _jack audio player"
 msgstr ""
 
-#: src/startup.c:340
+#: src/startup.c:330
 msgid "Use _sox audio player"
 msgstr ""
 
-#: src/startup.c:361
+#: src/startup.c:351
 msgid "Use _mplayer audio player"
 msgstr ""
 
-#: src/startup.c:381
+#: src/startup.c:371
 msgid "Use _mplayer2 audio player"
 msgstr ""
 
-#: src/startup.c:405 src/startup.c:580 src/interface.c:1506
+#: src/startup.c:395 src/startup.c:569 src/interface.c:1398
 msgid "_Next"
 msgstr ""
 
-#: src/startup.c:445
+#: src/startup.c:435
 msgid "Skipped"
 msgstr ""
 
-#: src/startup.c:460
+#: src/startup.c:450
 msgid "Passed"
 msgstr ""
 
-#: src/startup.c:493
+#: src/startup.c:483
 msgid "Failed"
 msgstr ""
 
-#: src/startup.c:552
+#: src/startup.c:542
 msgid "LiVES: - Testing Configuration"
 msgstr ""
 
-#: src/startup.c:555
+#: src/startup.c:544
 msgid "LiVES: - Troubleshoot"
 msgstr ""
 
-#: src/startup.c:568
+#: src/startup.c:557
 msgid "LiVES will now run some basic configuration tests\n"
 msgstr ""
 
-#: src/startup.c:603
+#: src/startup.c:591
 msgid "Checking for \"sox\" presence"
 msgstr ""
 
-#: src/startup.c:607
+#: src/startup.c:595
 msgid ""
 "You should install sox to be able to use all the audio features in LiVES"
 msgstr ""
 
-#: src/startup.c:615
+#: src/startup.c:602
 msgid "Checking if sox can convert audio"
 msgstr ""
 
-#: src/startup.c:638
+#: src/startup.c:625
 msgid "Unable to allocate 176400 bytes memory."
 msgstr ""
 
-#: src/startup.c:653
+#: src/startup.c:639
 #, c-format
 msgid "Unable to write to: %s"
 msgstr ""
 
-#: src/startup.c:667 src/startup.c:807
+#: src/startup.c:653 src/startup.c:789
 #, c-format
 msgid "Command failed: %s"
 msgstr ""
 
-#: src/startup.c:689
+#: src/startup.c:675
 msgid "You should install sox_fmt_all or similar"
 msgstr ""
 
-#: src/startup.c:717
+#: src/startup.c:703
 msgid "Checking for \"mplayer\" presence"
 msgstr ""
 
-#: src/startup.c:721
+#: src/startup.c:707
 msgid ""
 "You should install mplayer or mplayer2 to be able to use all the decoding "
 "features in LiVES"
 msgstr ""
 
-#: src/startup.c:747
+#: src/startup.c:732
 msgid "Checking if mplayer can convert audio"
 msgstr ""
 
-#: src/startup.c:768
+#: src/startup.c:751
 msgid "You should install mplayer or mplayer2 with pcm/wav support"
 msgstr ""
 
-#: src/startup.c:785
+#: src/startup.c:767
 msgid "Checking if mplayer can decode to png/alpha"
 msgstr ""
 
-#: src/startup.c:828
+#: src/startup.c:810
 msgid "You may wish to upgrade mplayer to a newer version"
 msgstr ""
 
-#: src/startup.c:854
+#: src/startup.c:836
 msgid "Checking if mplayer can decode to jpeg"
 msgstr ""
 
-#: src/startup.c:882
+#: src/startup.c:862
 msgid "You should install mplayer with either png/alpha or jpeg support"
 msgstr ""
 
-#: src/startup.c:883
+#: src/startup.c:863
 msgid "You may wish to add jpeg output support to mplayer"
 msgstr ""
 
-#: src/startup.c:892
+#: src/startup.c:872
 msgid "Checking for \"convert\" presence"
 msgstr ""
 
-#: src/startup.c:896
+#: src/startup.c:876
 msgid "Install imageMagick to be able to use all of the rendered effects"
 msgstr ""
 
-#: src/startup.c:909
+#: src/startup.c:889
 msgid ""
 "\n"
 "\n"
@@ -950,7 +954,7 @@
 "Preferences/Decoding.    \n"
 msgstr ""
 
-#: src/startup.c:915
+#: src/startup.c:894
 msgid ""
 "\n"
 "\n"
@@ -958,49 +962,49 @@
 "continue    \n"
 msgstr ""
 
-#: src/startup.c:949
+#: src/startup.c:928
 msgid ""
 "\n"
 "\n"
 "Finally, you can choose the default startup interface for LiVES.\n"
 msgstr ""
 
-#: src/startup.c:950
+#: src/startup.c:929
 msgid ""
 "\n"
 "\n"
 "LiVES has two main interfaces and you can start up with either of them.\n"
 msgstr ""
 
-#: src/startup.c:951
+#: src/startup.c:930
 msgid ""
 "\n"
 "\n"
 "The default can always be changed later from Preferences.\n"
 msgstr ""
 
-#: src/startup.c:961
+#: src/startup.c:940
 msgid "LiVES: - Choose the startup interface"
 msgstr ""
 
-#: src/startup.c:972
+#: src/startup.c:951
 msgid "Start in _Clip Edit mode"
 msgstr ""
 
-#: src/startup.c:975
+#: src/startup.c:954
 msgid "This is the best choice for simple editing tasks and for VJs\n"
 msgstr ""
 
-#: src/startup.c:981
+#: src/startup.c:960
 msgid "Start in _Multitrack mode"
 msgstr ""
 
-#: src/startup.c:983
+#: src/startup.c:962
 msgid ""
 "This is a better choice for complex editing tasks involving multiple clips.\n"
 msgstr ""
 
-#: src/startup.c:992
+#: src/startup.c:971
 msgid "_Finish"
 msgstr ""
 
@@ -1017,35 +1021,35 @@
 msgid "Apply _Deinterlace"
 msgstr ""
 
-#: src/interface.c:66
+#: src/interface.c:65
 msgid "If this is set, frames will be deinterlaced as they are imported."
 msgstr ""
 
-#: src/interface.c:113 src/callbacks.c:9623 src/callbacks.c:9646
-#: src/callbacks.c:9647 src/gui.c:3223 src/gui.c:3821 src/saveplay.c:2339
-#: src/saveplay.c:3138 src/dialogs.c:1514 src/dialogs.c:1515
-#: src/dialogs.c:1746 src/dialogs.c:1747 src/framedraw.c:238
-#: src/multitrack.c:8031
+#: src/interface.c:106 src/callbacks.c:9542 src/callbacks.c:9564
+#: src/callbacks.c:9565 src/gui.c:3333 src/gui.c:3946 src/saveplay.c:2317
+#: src/saveplay.c:3097 src/dialogs.c:1575 src/dialogs.c:1576
+#: src/dialogs.c:1804 src/dialogs.c:1805 src/framedraw.c:236
+#: src/multitrack.c:8210
 msgid "Preview"
 msgstr ""
 
-#: src/interface.c:132
+#: src/interface.c:125
 msgid "Click here to _Preview any selected video, image or audio file"
 msgstr ""
 
-#: src/interface.c:135
+#: src/interface.c:127
 msgid "Click here to _Preview any selected audio file"
 msgstr ""
 
-#: src/interface.c:138
+#: src/interface.c:129
 msgid "Click here to _Preview the video"
 msgstr ""
 
-#: src/interface.c:181 src/dialogs.c:2542
+#: src/interface.c:169 src/dialogs.c:2621
 msgid "LiVES: - Processing..."
 msgstr ""
 
-#: src/interface.c:217
+#: src/interface.c:205
 msgid ""
 "\n"
 "\n"
@@ -1054,195 +1058,185 @@
 "Remember to switch off effects (ctrl-0) afterwards !"
 msgstr ""
 
-#: src/interface.c:222 src/callbacks.c:9373 src/callbacks.c:9420
-#: src/dialogs.c:2570
+#: src/interface.c:210 src/callbacks.c:9283 src/callbacks.c:9332
+#: src/dialogs.c:2649
 msgid ""
 "\n"
 "Please Wait"
 msgstr ""
 
-#: src/interface.c:242
+#: src/interface.c:230
 msgid "Show Details"
 msgstr ""
 
-#: src/interface.c:254 src/dialogs.c:2584
+#: src/interface.c:242 src/dialogs.c:2663
 msgid "_Enough"
 msgstr ""
 
-#: src/interface.c:255 src/framedraw.c:278
+#: src/interface.c:243 src/framedraw.c:276
 msgid "_Preview"
 msgstr ""
 
-#: src/interface.c:257
+#: src/interface.c:245 src/callbacks.c:9282 src/callbacks.c:9330
 msgid "Paus_e"
 msgstr ""
 
-#: src/interface.c:258 src/callbacks.c:9417
+#: src/interface.c:246 src/callbacks.c:9329
 msgid "Pause/_Enough"
 msgstr ""
 
-#: src/interface.c:285
+#: src/interface.c:273
 msgid "_Cancel"
 msgstr ""
 
-#: src/interface.c:374
+#: src/interface.c:361
 #, c-format
 msgid "LiVES: - %s"
 msgstr ""
 
-#: src/interface.c:376
+#: src/interface.c:363
 msgid "LiVES: - Multitrack details"
 msgstr ""
 
-#: src/interface.c:407
+#: src/interface.c:394
 msgid "Format"
 msgstr ""
 
-#: src/interface.c:412
+#: src/interface.c:399
 msgid "Frame size"
 msgstr ""
 
-#: src/interface.c:417
+#: src/interface.c:404
 msgid "File size"
 msgstr ""
 
-#: src/interface.c:418
+#: src/interface.c:405
 msgid "Byte size"
 msgstr ""
 
-#: src/interface.c:423 src/interface.c:1891
+#: src/interface.c:410 src/interface.c:1760
 msgid "FPS"
 msgstr ""
 
-#: src/interface.c:428
+#: src/interface.c:415
 msgid "Frames"
 msgstr ""
 
-#: src/interface.c:429
+#: src/interface.c:416
 msgid "Events"
 msgstr ""
 
-#: src/interface.c:434 src/interface.c:500 src/interface.c:542
+#: src/interface.c:421 src/interface.c:486 src/interface.c:528
 msgid "Total time"
 msgstr ""
 
-#: src/interface.c:486 src/resample.c:1488
+#: src/interface.c:472 src/resample.c:1460
 msgid "Audio"
 msgstr ""
 
-#: src/interface.c:511 src/interface.c:553
+#: src/interface.c:497 src/interface.c:539
 msgid "Rate/size"
 msgstr ""
 
-#: src/interface.c:530
+#: src/interface.c:516
 msgid "Right audio"
 msgstr ""
 
-#: src/interface.c:622
+#: src/interface.c:607
 msgid "LiVES: - Encoding options"
 msgstr ""
 
-#: src/interface.c:636
+#: src/interface.c:621
 msgid "<------------- (Check the box to re_size as suggested)"
 msgstr ""
 
-#: src/interface.c:637
+#: src/interface.c:622
 msgid "<------------- (Check the box to use the _size recommendation)"
 msgstr ""
 
-#: src/interface.c:662
+#: src/interface.c:646
 msgid "Use _letterboxing to maintain aspect ratio (optional)"
 msgstr ""
 
-#: src/interface.c:663
+#: src/interface.c:647
 msgid ""
 "Draw black rectangles either above or to the sides of the image, to prevent "
 "it from stretching."
 msgstr ""
 
-#: src/interface.c:694
+#: src/interface.c:677
 msgid "Keep _my settings"
 msgstr ""
 
-#: src/interface.c:695
+#: src/interface.c:678
 msgid "Use _recommended settings"
 msgstr ""
 
-#: src/interface.c:775 src/dialogs.c:114
-msgid ""
-"Do _not show this warning any more\n"
-"(can be turned back on from Preferences/Warnings)"
-msgstr ""
-
-#: src/interface.c:787
-msgid "Show _Details"
-msgstr ""
-
-#: src/interface.c:881
+#: src/interface.c:769
 msgid "_Close Window"
 msgstr ""
 
-#: src/interface.c:883
+#: src/interface.c:771
 msgid "_Save to file"
 msgstr ""
 
-#: src/interface.c:928
+#: src/interface.c:816
 msgid "LiVES: - Insert"
 msgstr ""
 
-#: src/interface.c:945
+#: src/interface.c:833
 msgid "_Number of times to insert"
 msgstr ""
 
-#: src/interface.c:954
+#: src/interface.c:842
 msgid "_Insert to fit audio"
 msgstr ""
 
-#: src/interface.c:968
+#: src/interface.c:856
 msgid "Insert _before selection"
 msgstr ""
 
-#: src/interface.c:970
+#: src/interface.c:858
 msgid "Insert clipboard before selected frames"
 msgstr ""
 
-#: src/interface.c:986
+#: src/interface.c:875
 msgid "Insert _after selection"
 msgstr ""
 
-#: src/interface.c:988
+#: src/interface.c:877
 msgid "Insert clipboard after selected frames"
 msgstr ""
 
-#: src/interface.c:999
+#: src/interface.c:888
 msgid "Insert _with sound"
 msgstr ""
 
-#: src/interface.c:1012
+#: src/interface.c:901
 msgid "Insert with_out sound"
 msgstr ""
 
-#: src/interface.c:1093
+#: src/interface.c:985
 msgid "LiVES: - Open Selection"
 msgstr ""
 
-#: src/interface.c:1111
+#: src/interface.c:1004
 msgid "Selection start time (sec)"
 msgstr ""
 
-#: src/interface.c:1117
+#: src/interface.c:1010
 msgid "Number of frames to open"
 msgstr ""
 
-#: src/interface.c:1193
+#: src/interface.c:1088
 msgid "LiVES: - Open Location"
 msgstr ""
 
-#: src/interface.c:1195
+#: src/interface.c:1090
 msgid "LiVES: - Open Youtube Clip"
 msgstr ""
 
-#: src/interface.c:1213
+#: src/interface.c:1109
 msgid ""
 "\n"
 "\n"
@@ -1252,7 +1246,7 @@
 "\n"
 msgstr ""
 
-#: src/interface.c:1216
+#: src/interface.c:1112
 msgid ""
 "\n"
 "\n"
@@ -1261,62 +1255,62 @@
 "\n"
 msgstr ""
 
-#: src/interface.c:1220
+#: src/interface.c:1116
 msgid ""
 "Enter the URL of the clip below.\n"
 "E.g: http://www.youtube.com/watch?v=WCR6f6WzjP8\n"
 "\n"
 msgstr ""
 
-#: src/interface.c:1231
+#: src/interface.c:1127
 msgid "URL : "
 msgstr ""
 
-#: src/interface.c:1231
+#: src/interface.c:1127
 msgid "Youtube URL : "
 msgstr ""
 
-#: src/interface.c:1235
+#: src/interface.c:1131
 msgid "Do not send bandwidth information"
 msgstr ""
 
-#: src/interface.c:1237
+#: src/interface.c:1133
 msgid "Try this setting if you are having problems getting a stream"
 msgstr ""
 
-#: src/interface.c:1258
+#: src/interface.c:1155
 msgid "Download to _Directory : "
 msgstr ""
 
-#: src/interface.c:1276
+#: src/interface.c:1173
 msgid "Download _File Name : "
 msgstr ""
 
-#: src/interface.c:1281
+#: src/interface.c:1178
 msgid ".webm"
 msgstr ""
 
-#: src/interface.c:1359
+#: src/interface.c:1256
 msgid "LiVES: - Rename Clip"
 msgstr ""
 
-#: src/interface.c:1362
-msgid "LiVES: - Enter Set Name"
+#: src/interface.c:1258
+msgid "LiVES: - Enter Set Name to Save as"
 msgstr ""
 
-#: src/interface.c:1365
+#: src/interface.c:1260
 msgid "LiVES: - Enter a Set Name to Reload"
 msgstr ""
 
-#: src/interface.c:1368
+#: src/interface.c:1262
 msgid "LiVES: - Choose a Working Directory"
 msgstr ""
 
-#: src/interface.c:1371
+#: src/interface.c:1264
 msgid "LiVES: - Rename Current Track"
 msgstr ""
 
-#: src/interface.c:1391
+#: src/interface.c:1283
 msgid ""
 "You need to enter a name for the current clip set.\n"
 "This will allow you reload the layout with the same clips later.\n"
@@ -1324,354 +1318,354 @@
 "LiVES will remind you to save the clip set later when you try to exit.\n"
 msgstr ""
 
-#: src/interface.c:1397
+#: src/interface.c:1289
 msgid ""
 "In order to export this project, you must enter a name for this clip set.\n"
 "This will also be used for the project name.\n"
 msgstr ""
 
-#: src/interface.c:1404
+#: src/interface.c:1296
 msgid ""
 "Welcome to LiVES !\n"
 "This startup wizard will guide you through the\n"
 "initial install so that you can get the most from this application.\n"
 msgstr ""
 
-#: src/interface.c:1408
+#: src/interface.c:1300
 msgid ""
 "\n"
 "First of all you need to choose a working directory for LiVES.\n"
 "This should be a directory with plenty of disk space available.\n"
 msgstr ""
 
-#: src/interface.c:1427
+#: src/interface.c:1317
 msgid "New name "
 msgstr ""
 
-#: src/interface.c:1430
+#: src/interface.c:1319
 msgid "Set name "
 msgstr ""
 
-#: src/interface.c:1550
+#: src/interface.c:1435
 msgid "Use def_aults"
 msgstr ""
 
-#: src/interface.c:1553 src/interface.c:1840 src/preferences.c:2515
-#: src/preferences.c:2697
+#: src/interface.c:1437 src/interface.c:1709 src/preferences.c:2550
+#: src/preferences.c:2739
 msgid "_Advanced"
 msgstr ""
 
-#: src/interface.c:1604
+#: src/interface.c:1487
 msgid "LiVES:- Select input device"
 msgstr ""
 
-#: src/interface.c:1622
+#: src/interface.c:1504
 msgid "Select input device:"
 msgstr ""
 
-#: src/interface.c:1686
+#: src/interface.c:1568
 msgid "LiVES:- Load CD Track"
 msgstr ""
 
-#: src/interface.c:1689
+#: src/interface.c:1570
 msgid "LiVES:- Select DVD Title/Chapter"
 msgstr ""
 
-#: src/interface.c:1692
+#: src/interface.c:1572
 msgid "LiVES:- Select VCD Title"
 msgstr ""
 
-#: src/interface.c:1695
+#: src/interface.c:1574
 msgid "LiVES:- Change Maximum Visible Tracks"
 msgstr ""
 
-#: src/interface.c:1698
+#: src/interface.c:1576
 msgid "LiVES:- Device details"
 msgstr ""
 
-#: src/interface.c:1721
+#: src/interface.c:1598
 #, c-format
 msgid "Track to load (from %s)"
 msgstr ""
 
-#: src/interface.c:1724
+#: src/interface.c:1600
 msgid "DVD Title"
 msgstr ""
 
-#: src/interface.c:1727
+#: src/interface.c:1602
 msgid "VCD Title"
 msgstr ""
 
-#: src/interface.c:1730
+#: src/interface.c:1604
 msgid "Maximum number of tracks to display"
 msgstr ""
 
-#: src/interface.c:1733
+#: src/interface.c:1606
 msgid "Device:        /dev/video"
 msgstr ""
 
-#: src/interface.c:1736
+#: src/interface.c:1608
 msgid "Device:        fw:"
 msgstr ""
 
-#: src/interface.c:1771
+#: src/interface.c:1641
 msgid "Chapter  "
 msgstr ""
 
-#: src/interface.c:1776
+#: src/interface.c:1645
 msgid "Channel  "
 msgstr ""
 
-#: src/interface.c:1791
+#: src/interface.c:1660
 msgid "Audio ID  "
 msgstr ""
 
-#: src/interface.c:1857
+#: src/interface.c:1726
 msgid "Input number"
 msgstr ""
 
-#: src/interface.c:1865
+#: src/interface.c:1734
 msgid "Use default width, height and FPS"
 msgstr ""
 
-#: src/interface.c:1879
+#: src/interface.c:1748
 msgid "Width"
 msgstr ""
 
-#: src/interface.c:1885
+#: src/interface.c:1754
 msgid "Height"
 msgstr ""
 
-#: src/interface.c:1899
+#: src/interface.c:1768
 msgid "_Driver"
 msgstr ""
 
-#: src/interface.c:1902
+#: src/interface.c:1771
 msgid "_Output format"
 msgstr ""
 
-#: src/interface.c:1998
+#: src/interface.c:1865
 msgid "LiVES:- Fade Audio In"
 msgstr ""
 
-#: src/interface.c:2001
+#: src/interface.c:1867
 msgid "LiVES:- Fade Audio Out"
 msgstr ""
 
-#: src/interface.c:2017
+#: src/interface.c:1883
 msgid "Fade in over  "
 msgstr ""
 
-#: src/interface.c:2018
+#: src/interface.c:1884
 msgid "first"
 msgstr ""
 
-#: src/interface.c:2021
+#: src/interface.c:1886
 msgid "Fade out over  "
 msgstr ""
 
-#: src/interface.c:2022
+#: src/interface.c:1887
 msgid "last"
 msgstr ""
 
-#: src/interface.c:2044
+#: src/interface.c:1909
 msgid "seconds."
 msgstr ""
 
-#: src/interface.c:2052 src/saveplay.c:1507
+#: src/interface.c:1917 src/saveplay.c:1484
 msgid "selection"
 msgstr ""
 
-#: src/interface.c:2092
+#: src/interface.c:1956
 msgid "LiVES: - File Comments (optional)"
 msgstr ""
 
-#: src/interface.c:2107
+#: src/interface.c:1971
 msgid "Title/Name : "
 msgstr ""
 
-#: src/interface.c:2114
+#: src/interface.c:1978
 msgid "Author/Artist : "
 msgstr ""
 
-#: src/interface.c:2121
+#: src/interface.c:1985
 msgid "Comments : "
 msgstr ""
 
-#: src/interface.c:2151
+#: src/interface.c:2015
 msgid "_Options"
 msgstr ""
 
-#: src/interface.c:2158
+#: src/interface.c:2022
 msgid "Save _subtitles to file"
 msgstr ""
 
-#: src/interface.c:2170
+#: src/interface.c:2033
 msgid "Subtitle file"
 msgstr ""
 
-#: src/interface.c:2172
+#: src/interface.c:2035
 msgid "Browse..."
 msgstr ""
 
-#: src/interface.c:2255
+#: src/interface.c:2132
 msgid "LiVES: - choose a device"
 msgstr ""
 
-#: src/interface.c:2259
+#: src/interface.c:2135
 msgid "LiVES: - choose a directory"
 msgstr ""
 
-#: src/interface.c:2262
+#: src/interface.c:2137
 msgid "LiVES: - choose a file"
 msgstr ""
 
-#: src/interface.c:2445
+#: src/interface.c:2381
 msgid "LiVES: - Cancel/Discard/Save"
 msgstr ""
 
-#: src/interface.c:2460
+#: src/interface.c:2397
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has not been saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:2463
+#: src/interface.c:2400
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has been changed since the last save.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:2467
+#: src/interface.c:2404
 msgid ""
 "You are about to exit LiVES.\n"
 "The current clip set can be saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:2468
+#: src/interface.c:2405
 msgid ""
 "The current clip set has not been saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:2472
+#: src/interface.c:2408
 msgid ""
 "The current layout has not been saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:2475
+#: src/interface.c:2410
 msgid ""
 "The current layout has *not* been changed since it was last saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:2480
+#: src/interface.c:2415
 msgid ""
 "The current layout contains generated frames and cannot be retained.\n"
 "You may wish to render it before exiting multitrack mode.\n"
 msgstr ""
 
-#: src/interface.c:2483
+#: src/interface.c:2418
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout contains generated frames and cannot be retained.\n"
 "What do you wish to do ?"
 msgstr ""
 
-#: src/interface.c:2496
+#: src/interface.c:2431
 msgid "Clip set _name"
 msgstr ""
 
-#: src/interface.c:2502
+#: src/interface.c:2437
 msgid "_Auto reload next time"
 msgstr ""
 
-#: src/interface.c:2538 src/interface.c:2547
+#: src/interface.c:2473 src/interface.c:2482
 msgid "_Wipe layout"
 msgstr ""
 
-#: src/interface.c:2539
+#: src/interface.c:2474
 msgid "_Ignore changes"
 msgstr ""
 
-#: src/interface.c:2540
+#: src/interface.c:2475
 msgid "_Delete clip set"
 msgstr ""
 
-#: src/interface.c:2541
+#: src/interface.c:2476
 msgid "_Delete layout"
 msgstr ""
 
-#: src/interface.c:2545
+#: src/interface.c:2480
 msgid "_Save layout"
 msgstr ""
 
-#: src/interface.c:2546
+#: src/interface.c:2481
 msgid "_Save clip set"
 msgstr ""
 
-#: src/interface.c:2565
+#: src/interface.c:2502
 msgid ""
 "\n"
 "LiVES has detected a multitrack layout from a previous session.\n"
 "Would you like to try and recover it ?\n"
 msgstr ""
 
-#: src/interface.c:2589
+#: src/interface.c:2528
 msgid "LiVES: - Disk Recovery Options"
 msgstr ""
 
-#: src/interface.c:2608
+#: src/interface.c:2549
 msgid "Delete _Orphaned Clips"
 msgstr ""
 
-#: src/interface.c:2609
+#: src/interface.c:2550
 msgid "Delete any clips which are not currently loaded or part of a set"
 msgstr ""
 
-#: src/interface.c:2622
+#: src/interface.c:2564
 msgid "Clear _Backup Files from Closed Clips"
 msgstr ""
 
-#: src/interface.c:2633
+#: src/interface.c:2575
 msgid "Remove Sets which have _Layouts but no Clips"
 msgstr ""
 
-#: src/interface.c:2644
+#: src/interface.c:2586
 msgid "_Reset to Defaults"
 msgstr ""
 
-#: src/interface.c:2651
+#: src/interface.c:2593
 msgid "_Accept"
 msgstr ""
 
-#: src/callbacks.c:198
+#: src/callbacks.c:208
 #, c-format
 msgid "Saving as set %s..."
 msgstr ""
 
-#: src/callbacks.c:833
+#: src/callbacks.c:852
 msgid "Please enter the name of the file to save the clip as.\n"
 msgstr ""
 
-#: src/callbacks.c:841
+#: src/callbacks.c:860
 msgid "Please enter a valid URL for the download.\n"
 msgstr ""
 
-#: src/callbacks.c:867
+#: src/callbacks.c:886
 #, c-format
 msgid "Downloading %s to %s..."
 msgstr ""
 
-#: src/callbacks.c:895
+#: src/callbacks.c:912
 msgid "Downloading clip"
 msgstr ""
 
-#: src/callbacks.c:933
+#: src/callbacks.c:950
 msgid ""
 "\n"
 "LiVES was unable to download the clip.\n"
@@ -1679,17 +1673,17 @@
 "the latest youtube-dl installed.\n"
 msgstr ""
 
-#: src/callbacks.c:1114 src/callbacks.c:1149
+#: src/callbacks.c:1131 src/callbacks.c:1166
 msgid "This file"
 msgstr ""
 
-#: src/callbacks.c:1115
+#: src/callbacks.c:1132
 msgid ""
 ",\n"
 " - including the current layout - "
 msgstr ""
 
-#: src/callbacks.c:1117
+#: src/callbacks.c:1134
 #, c-format
 msgid ""
 "\n"
@@ -1699,7 +1693,7 @@
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1119
+#: src/callbacks.c:1136
 #, c-format
 msgid ""
 "\n"
@@ -1709,20 +1703,20 @@
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1150
+#: src/callbacks.c:1167
 msgid ""
 "Changes made to this clip have not been saved or backed up.\n"
 "\n"
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1343
+#: src/callbacks.c:1356
 msgid ""
 "\n"
 "Invalid project file.\n"
 msgstr ""
 
-#: src/callbacks.c:1356
+#: src/callbacks.c:1370
 #, c-format
 msgid ""
 "\n"
@@ -1735,33 +1729,33 @@
 "Once you have done this, you will be able to import the new project.\n"
 msgstr ""
 
-#: src/callbacks.c:1366
+#: src/callbacks.c:1381
 #, c-format
 msgid "Importing the project %s as set %s..."
 msgstr ""
 
-#: src/callbacks.c:1386
+#: src/callbacks.c:1399
 msgid "Importing project"
 msgstr ""
 
-#: src/callbacks.c:1472
+#: src/callbacks.c:1481
 #, c-format
 msgid "Exporting project %s..."
 msgstr ""
 
-#: src/callbacks.c:1490
+#: src/callbacks.c:1497
 msgid "Exporting project"
 msgstr ""
 
-#: src/callbacks.c:1506
+#: src/callbacks.c:1513
 msgid "Backup as .lv1 file"
 msgstr ""
 
-#: src/callbacks.c:1522
+#: src/callbacks.c:1529
 msgid "Restore .lv1 file"
 msgstr ""
 
-#: src/callbacks.c:1664
+#: src/callbacks.c:1671
 msgid ""
 "\n"
 "\n"
@@ -1769,72 +1763,77 @@
 "Are you sure ?\n"
 msgstr ""
 
-#: src/callbacks.c:1725
+#: src/callbacks.c:1732
 #, c-format
 msgid "Deleting set %s..."
 msgstr ""
 
-#: src/callbacks.c:1727
+#: src/callbacks.c:1734
 msgid "Deleting set..."
 msgstr ""
 
-#: src/callbacks.c:1731
+#: src/callbacks.c:1738
 msgid "Deleting set"
 msgstr ""
 
-#: src/callbacks.c:1739
+#: src/callbacks.c:1746
 #, c-format
 msgid "Set %s was permanently deleted from the disk.\n"
 msgstr ""
 
-#: src/callbacks.c:1787 src/callbacks.c:11764
+#: src/callbacks.c:1792 src/callbacks.c:11676
 msgid "Insert Silence"
 msgstr ""
 
-#: src/callbacks.c:1840 src/callbacks.c:1923 src/callbacks.c:2086
+#: src/callbacks.c:1844 src/callbacks.c:1927 src/callbacks.c:2089
 msgid "Undoing"
 msgstr ""
 
-#: src/callbacks.c:1936 src/callbacks.c:2147
+#: src/callbacks.c:1940 src/callbacks.c:2150
 msgid "Restoring audio..."
 msgstr ""
 
-#: src/callbacks.c:1952
+#: src/callbacks.c:1956
 msgid "Clearing frame images"
 msgstr ""
 
-#: src/callbacks.c:1985
+#: src/callbacks.c:1988
 msgid "Deleting excess frames"
 msgstr ""
 
-#: src/callbacks.c:2229
+#: src/callbacks.c:2232
 #, c-format
 msgid "Length of video is now %d frames at %.3f frames per second.\n"
 msgstr ""
 
-#: src/callbacks.c:2233 src/resample.c:683 src/resample.c:2166
+#: src/callbacks.c:2235 src/resample.c:678 src/resample.c:2133
 #, c-format
 msgid "Clipboard was resampled to %d frames.\n"
 msgstr ""
 
-#: src/callbacks.c:2394 src/callbacks.c:2423
+#: src/callbacks.c:2396 src/callbacks.c:2425
 msgid "Redoing"
 msgstr ""
 
-#: src/callbacks.c:2462
+#: src/callbacks.c:2472
 #, c-format
-msgid "Copying frames %d to %d%s to the clipboard..."
+msgid "Copying frames %d to %d (with sound) to the clipboard..."
 msgstr ""
 
-#: src/callbacks.c:2525
+#: src/callbacks.c:2474
+#, c-format
+msgid "Copying frames %d to %d to the clipboard..."
+msgstr ""
+
+#: src/callbacks.c:2526
 msgid "Copying to the clipboard"
 msgstr ""
 
-#: src/callbacks.c:2600
+#: src/callbacks.c:2601
 msgid "Cut"
 msgstr ""
 
-#: src/callbacks.c:2641 src/callbacks.c:3068 src/callbacks.c:8026
+#: src/callbacks.c:2641 src/callbacks.c:3063 src/callbacks.c:7631
 msgid "Pulling frames from clipboard"
 msgstr ""
 
@@ -1843,22 +1842,22 @@
 msgid "Pasting %d frames to new clip %s..."
 msgstr ""
 
-#: src/callbacks.c:2678
+#: src/callbacks.c:2676
 msgid "Pasting"
 msgstr ""
 
-#: src/callbacks.c:2694
+#: src/callbacks.c:2692
 msgid "...added audio..."
 msgstr ""
 
-#: src/callbacks.c:2778
+#: src/callbacks.c:2775
 msgid ""
 "This operation requires resizing or converting of frames.\n"
 "Please install 'convert' from the Image-magick package, and then restart "
 "LiVES.\n"
 msgstr ""
 
-#: src/callbacks.c:2795
+#: src/callbacks.c:2793
 msgid ""
 "\n"
 "\n"
@@ -1867,31 +1866,31 @@
 "the 'Trim Audio' function from the Audio menu."
 msgstr ""
 
-#: src/callbacks.c:2819
+#: src/callbacks.c:2817
 msgid ""
 "LiVES cannot insert because the audio rates do not match.\n"
 "Please install 'sox', and try again."
 msgstr ""
 
-#: src/callbacks.c:2838
+#: src/callbacks.c:2835
 msgid ""
 "\n"
 "Insertion will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:2888 src/callbacks.c:11692
+#: src/callbacks.c:2883 src/callbacks.c:11606
 msgid ""
 "\n"
 "Insertion will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:2996 src/callbacks.c:3025
+#: src/callbacks.c:2987 src/callbacks.c:3016
 msgid "Resampling clipboard audio"
 msgstr ""
 
-#: src/callbacks.c:3041
+#: src/callbacks.c:3032
 msgid ""
 "\n"
 "\n"
@@ -1899,7 +1898,7 @@
 "Clipboard audio has been erased.\n"
 msgstr ""
 
-#: src/callbacks.c:3055
+#: src/callbacks.c:3045
 msgid ""
 "\n"
 "\n"
@@ -1908,86 +1907,86 @@
 "using unchanged audio ?\n"
 msgstr ""
 
-#: src/callbacks.c:3137 src/callbacks.c:3311
+#: src/callbacks.c:3132 src/callbacks.c:3299
 #, c-format
 msgid "Inserting %d%s frames from the clipboard..."
 msgstr ""
 
-#: src/callbacks.c:3162 src/callbacks.c:3236 src/callbacks.c:3339
+#: src/callbacks.c:3155 src/callbacks.c:3224 src/callbacks.c:3325
 msgid "Inserting"
 msgstr ""
 
-#: src/callbacks.c:3193
+#: src/callbacks.c:3187
 #, c-format
 msgid "Inserting %d times from the clipboard%s..."
 msgstr ""
 
-#: src/callbacks.c:3200
+#: src/callbacks.c:3191
 #, c-format
 msgid "Inserting %d frames from the clipboard%s..."
 msgstr ""
 
-#: src/callbacks.c:3418
+#: src/callbacks.c:3404
 msgid "Insert"
 msgstr ""
 
-#: src/callbacks.c:3486
+#: src/callbacks.c:3471
 msgid ""
 "\n"
 "Deleting all frames will close this file.\n"
 "Are you sure ?"
 msgstr ""
 
-#: src/callbacks.c:3495
+#: src/callbacks.c:3480
 msgid ""
 "\n"
 "Deletion will cause missing frames in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3515 src/callbacks.c:10920 src/callbacks.c:11162
-#: src/callbacks.c:11228
+#: src/callbacks.c:3500 src/callbacks.c:10851 src/callbacks.c:11087
+#: src/callbacks.c:11152
 msgid ""
 "\n"
 "Deletion will cause missing audio in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3534
+#: src/callbacks.c:3519
 msgid ""
 "\n"
 "Deletion will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3553 src/callbacks.c:11210
+#: src/callbacks.c:3538 src/callbacks.c:11134
 msgid ""
 "\n"
 "Deletion will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3611
+#: src/callbacks.c:3597
 #, c-format
 msgid "Deleting frames %d to %d%s..."
 msgstr ""
 
-#: src/callbacks.c:3636
+#: src/callbacks.c:3619
 msgid "Deleting"
 msgstr ""
 
-#: src/callbacks.c:3717
+#: src/callbacks.c:3699
 msgid "Delete"
 msgstr ""
 
-#: src/callbacks.c:3738
+#: src/callbacks.c:3717
 msgid ""
 "\n"
 "\n"
 "Selection is locked.\n"
 msgstr ""
 
-#: src/callbacks.c:4092
+#: src/callbacks.c:4056
 msgid ""
 "Ready to record. Use 'control' and cursor keys during playback to record "
 "your performance.\n"
@@ -1995,11 +1994,11 @@
 "play.)\n"
 msgstr ""
 
-#: src/callbacks.c:4098
+#: src/callbacks.c:4061
 msgid "Record cancelled.\n"
 msgstr ""
 
-#: src/callbacks.c:4237
+#: src/callbacks.c:4197
 #, c-format
 msgid ""
 "\n"
@@ -2008,7 +2007,7 @@
 "%s\n"
 msgstr ""
 
-#: src/callbacks.c:4241
+#: src/callbacks.c:4200
 #, c-format
 msgid ""
 "\n"
@@ -2017,7 +2016,7 @@
 "The plugin may be broken or not installed correctly."
 msgstr ""
 
-#: src/callbacks.c:4571
+#: src/callbacks.c:4532
 #, c-format
 msgid ""
 "Saving the set will cause copies of all loaded clips to remain on the disk"
@@ -2026,22 +2025,22 @@
 "Please press 'Cancel' if that is not what you want.\n"
 msgstr ""
 
-#: src/callbacks.c:4654
+#: src/callbacks.c:4617
 #, c-format
 msgid "Saving set %s"
 msgstr ""
 
-#: src/callbacks.c:5005
+#: src/callbacks.c:4964
 #, c-format
 msgid "Loading clips from set %s"
 msgstr ""
 
-#: src/callbacks.c:5093
+#: src/callbacks.c:5051
 #, c-format
 msgid "%d clips and %d layouts were recovered from set (%s).\n"
 msgstr ""
 
-#: src/callbacks.c:5312
+#: src/callbacks.c:5259
 msgid ""
 "LiVES will attempt to recover some disk space.\n"
 "You should ONLY run this if you have no other copies of LiVES running on "
@@ -2049,24 +2048,24 @@
 "Click OK to proceed.\n"
 msgstr ""
 
-#: src/callbacks.c:5317
+#: src/callbacks.c:5264
 msgid "Cleaning up disk space..."
 msgstr ""
 
-#: src/callbacks.c:5387
+#: src/callbacks.c:5334
 msgid "Recovering disk space"
 msgstr ""
 
-#: src/callbacks.c:5439
+#: src/callbacks.c:5386
 #, c-format
 msgid "%s of disk space was recovered.\n"
 msgstr ""
 
-#: src/callbacks.c:5482
+#: src/callbacks.c:5428
 msgid "Resetting frame rates and frame values..."
 msgstr ""
 
-#: src/callbacks.c:5523
+#: src/callbacks.c:5469
 #, c-format
 msgid ""
 "\n"
@@ -2074,68 +2073,68 @@
 "Internal: %s (%d bpp) / %s\n"
 msgstr ""
 
-#: src/callbacks.c:5525
+#: src/callbacks.c:5471
 msgid "buffered"
 msgstr ""
 
-#: src/callbacks.c:5538 src/callbacks.c:5557 src/callbacks.c:5575
-#: src/callbacks.c:5609
+#: src/callbacks.c:5484 src/callbacks.c:5502 src/callbacks.c:5518
+#: src/callbacks.c:5551
 msgid ""
 "\n"
 "  Opening..."
 msgstr ""
 
-#: src/callbacks.c:5545
+#: src/callbacks.c:5490
 #, c-format
 msgid ""
 "\n"
 "(%d virtual)"
 msgstr ""
 
-#: src/callbacks.c:5548
+#: src/callbacks.c:5493
 #, c-format
 msgid ""
 "\n"
 "(%d decoded)"
 msgstr ""
 
-#: src/callbacks.c:5560 src/callbacks.c:5578 src/callbacks.c:5612
+#: src/callbacks.c:5504 src/callbacks.c:5520 src/callbacks.c:5553
 #, c-format
 msgid ""
 "\n"
 "  %.2f sec."
 msgstr ""
 
-#: src/callbacks.c:5569
+#: src/callbacks.c:5512
 msgid ""
 "\n"
 "  Unknown"
 msgstr ""
 
-#: src/callbacks.c:5582 src/callbacks.c:5596
+#: src/callbacks.c:5524 src/callbacks.c:5538
 msgid "unsigned"
 msgstr ""
 
-#: src/callbacks.c:5583 src/callbacks.c:5597
+#: src/callbacks.c:5525 src/callbacks.c:5539
 msgid "signed"
 msgstr ""
 
-#: src/callbacks.c:5585 src/callbacks.c:5599
+#: src/callbacks.c:5527 src/callbacks.c:5541
 msgid "big-endian"
 msgstr ""
 
-#: src/callbacks.c:5586 src/callbacks.c:5600
+#: src/callbacks.c:5528 src/callbacks.c:5542
 msgid "little-endian"
 msgstr ""
 
-#: src/callbacks.c:5588 src/callbacks.c:5602
+#: src/callbacks.c:5530 src/callbacks.c:5544
 #, c-format
 msgid ""
 "  %d Hz %d bit\n"
 "%s %s"
 msgstr ""
 
-#: src/callbacks.c:5707
+#: src/callbacks.c:5647
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -2152,19 +2151,19 @@
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA.\n"
 msgstr ""
 
-#: src/callbacks.c:5721
+#: src/callbacks.c:5661
 msgid "A video editor and VJ program."
 msgstr ""
 
-#: src/callbacks.c:5722
+#: src/callbacks.c:5662
 msgid "About LiVES"
 msgstr ""
 
-#: src/callbacks.c:5724
+#: src/callbacks.c:5664
 msgid "translator_credits"
 msgstr ""
 
-#: src/callbacks.c:5758
+#: src/callbacks.c:5699
 #, c-format
 msgid ""
 "LiVES Version %s\n"
@@ -2178,14 +2177,14 @@
 "Homepage: http://lives.sourceforge.net"
 msgstr ""
 
-#: src/callbacks.c:6037
+#: src/callbacks.c:5996
 msgid ""
 "\n"
 "\n"
 "You need to install mplayer or mplayer2 to be able to preview this file.\n"
 msgstr ""
 
-#: src/callbacks.c:6040
+#: src/callbacks.c:5998
 msgid ""
 "\n"
 "\n"
@@ -2193,215 +2192,206 @@
 "this file.\n"
 msgstr ""
 
-#: src/callbacks.c:6423 src/callbacks.c:8289
-msgid ""
-"\n"
-"Loading new audio may cause missing audio in some multitrack layouts.\n"
-"Are you sure you wish to continue ?\n"
-"."
-msgstr ""
-
-#: src/callbacks.c:6523
-#, c-format
-msgid "Opening audio %s, type %s..."
-msgstr ""
-
-#: src/callbacks.c:6556 src/saveplay.c:480
-msgid "Opening audio"
-msgstr ""
-
-#: src/callbacks.c:6565 src/callbacks.c:6612 src/callbacks.c:8387
-#: src/callbacks.c:8429 src/callbacks.c:8472 src/callbacks.c:10846
-msgid "Cancelling"
-msgstr ""
-
-#: src/callbacks.c:6660 src/callbacks.c:8514 src/callbacks.c:10876
-#: src/callbacks.c:11563
-msgid "Committing audio"
-msgstr ""
-
-#: src/callbacks.c:6672 src/callbacks.c:8546
-msgid "New Audio"
-msgstr ""
-
-#: src/callbacks.c:6779
+#: src/callbacks.c:6459
 #, c-format
 msgid ""
 "Text was saved as\n"
 "%s\n"
 msgstr ""
 
-#: src/callbacks.c:6951 src/saveplay.c:3618
-#, c-format
-msgid "%d frames are enough !\n"
-msgstr ""
-
-#: src/callbacks.c:7050
+#: src/callbacks.c:6706
 msgid "LiVES: - Encoder debug output"
 msgstr ""
 
-#: src/callbacks.c:7087 src/gui.c:1922
+#: src/callbacks.c:6743 src/gui.c:1921
 msgid "Fullscreen playback (f)"
 msgstr ""
 
-#: src/callbacks.c:7089
+#: src/callbacks.c:6744
 msgid "Fullscreen playback off (f)"
 msgstr ""
 
-#: src/callbacks.c:7188 src/callbacks.c:7336 src/callbacks.c:7664
-#: src/callbacks.c:7681 src/gui.c:3712 src/saveplay.c:2467 src/saveplay.c:2501
-#: src/saveplay.c:3115 src/saveplay.c:3220 src/saveplay.c:3239
-#: src/multitrack.c:9340 src/multitrack.c:11060
+#: src/callbacks.c:6841 src/callbacks.c:6983 src/callbacks.c:7283
+#: src/callbacks.c:7298 src/gui.c:3838 src/saveplay.c:2442 src/saveplay.c:2475
+#: src/saveplay.c:3074 src/saveplay.c:3178 src/saveplay.c:3197
+#: src/multitrack.c:9526 src/multitrack.c:11288
 #, c-format
 msgid " (%d %% scale)"
 msgstr ""
 
-#: src/callbacks.c:7190 src/callbacks.c:7338 src/callbacks.c:7666
-#: src/gui.c:3716 src/saveplay.c:2469 src/saveplay.c:2503
+#: src/callbacks.c:6843 src/callbacks.c:6985 src/callbacks.c:7285
+#: src/gui.c:3842 src/saveplay.c:2444 src/saveplay.c:2477
 #, c-format
 msgid "LiVES: - Play Window%s"
 msgstr ""
 
-#: src/callbacks.c:7302 src/gui.c:1907
+#: src/callbacks.c:6950 src/gui.c:1906
 msgid "Double size (d)"
 msgstr ""
 
-#: src/callbacks.c:7309
+#: src/callbacks.c:6956
 msgid "Single size (d)"
 msgstr ""
 
-#: src/callbacks.c:7442 src/callbacks.c:7443
+#: src/callbacks.c:7087 src/callbacks.c:7088
 msgid "Hide the play window (s)"
 msgstr ""
 
-#: src/callbacks.c:7452 src/gui.c:1746
+#: src/callbacks.c:7096 src/gui.c:1744
 msgid "Show the play window (s)"
 msgstr ""
 
-#: src/callbacks.c:7453 src/gui.c:1896
+#: src/callbacks.c:7097 src/gui.c:1895
 msgid "Play in separate window (s)"
 msgstr ""
 
-#: src/callbacks.c:7535 src/gui.c:4060 src/saveplay.c:2498
+#: src/callbacks.c:7175 src/gui.c:4169 src/saveplay.c:2472
 msgid "LiVES: - Streaming"
 msgstr ""
 
-#: src/callbacks.c:7778
+#: src/callbacks.c:7388
 msgid "Switch continuous looping off (o)"
 msgstr ""
 
-#: src/callbacks.c:7785 src/gui.c:1795
+#: src/callbacks.c:7394 src/gui.c:1793
 msgid "Switch continuous looping on (o)"
 msgstr ""
 
-#: src/callbacks.c:7837
+#: src/callbacks.c:7444
 #, c-format
 msgid "Audio volume (%.2f)"
 msgstr ""
 
-#: src/callbacks.c:7876 src/callbacks.c:7877 src/gui.c:3640
+#: src/callbacks.c:7483 src/callbacks.c:7484 src/gui.c:3766
 msgid "Unmute the audio (z)"
 msgstr ""
 
-#: src/callbacks.c:7888 src/callbacks.c:7889 src/gui.c:1808 src/gui.c:3639
+#: src/callbacks.c:7494 src/callbacks.c:7495 src/gui.c:1806 src/gui.c:3765
 msgid "Mute the audio (z)"
 msgstr ""
 
-#: src/callbacks.c:8038
+#: src/callbacks.c:7643
 msgid "Reversing clipboard..."
 msgstr ""
 
-#: src/callbacks.c:8052
+#: src/callbacks.c:7657
 msgid "Reversing clipboard"
 msgstr ""
 
-#: src/callbacks.c:8084
+#: src/callbacks.c:7689
 msgid "LiVES: Load subtitles from..."
 msgstr ""
 
-#: src/callbacks.c:8151 src/saveplay.c:970
+#: src/callbacks.c:7753 src/saveplay.c:956
 #, c-format
 msgid "Loaded subtitle file: %s\n"
 msgstr ""
 
-#: src/callbacks.c:8220
+#: src/callbacks.c:7821
 msgid "Subtitles were erased.\n"
 msgstr ""
 
-#: src/callbacks.c:8239
+#: src/callbacks.c:7843
 msgid "LiVES: - Select Audio File"
 msgstr ""
 
-#: src/callbacks.c:8250
+#: src/callbacks.c:7878 src/callbacks.c:8232
+msgid ""
+"\n"
+"Loading new audio may cause missing audio in some multitrack layouts.\n"
+"Are you sure you wish to continue ?\n"
+"."
+msgstr ""
+
+#: src/callbacks.c:7989
+#, c-format
+msgid "Opening audio %s, type %s..."
+msgstr ""
+
+#: src/callbacks.c:8023 src/saveplay.c:477
+msgid "Opening audio"
+msgstr ""
+
+#: src/callbacks.c:8032 src/callbacks.c:8083 src/callbacks.c:8327
+#: src/callbacks.c:8369 src/callbacks.c:8412 src/callbacks.c:10766
+msgid "Cancelling"
+msgstr ""
+
+#: src/callbacks.c:8137 src/callbacks.c:8454 src/callbacks.c:10803
+#: src/callbacks.c:11477
+msgid "Committing audio"
+msgstr ""
+
+#: src/callbacks.c:8153 src/callbacks.c:8484
+msgid "New Audio"
+msgstr ""
+
+#: src/callbacks.c:8194
 msgid "Please set your CD play device in Tools | Preferences | Misc\n"
 msgstr ""
 
-#: src/callbacks.c:8321
+#: src/callbacks.c:8264
 #, c-format
 msgid "Opening CD track %d from %s..."
 msgstr ""
 
-#: src/callbacks.c:8326
+#: src/callbacks.c:8267
 #, c-format
 msgid "CD track %d"
 msgstr ""
 
-#: src/callbacks.c:8373
+#: src/callbacks.c:8313
 msgid "Opening CD track..."
 msgstr ""
 
-#: src/callbacks.c:8415 src/callbacks.c:8461
+#: src/callbacks.c:8355 src/callbacks.c:8401
 msgid "Error loading CD track\n"
 msgstr ""
 
-#: src/callbacks.c:8584
+#: src/callbacks.c:8518
 msgid "layout errors"
 msgstr ""
 
-#: src/callbacks.c:8595
+#: src/callbacks.c:8529
 msgid "Close _Window"
 msgstr ""
 
-#: src/callbacks.c:8606
+#: src/callbacks.c:8540
 msgid "Clear _Errors"
 msgstr ""
 
-#: src/callbacks.c:8617
+#: src/callbacks.c:8551
 msgid "_Delete affected layouts"
 msgstr ""
 
-#: src/callbacks.c:9343 src/callbacks.c:9388
+#: src/callbacks.c:9253 src/callbacks.c:9298
 msgid "Resume"
 msgstr ""
 
-#: src/callbacks.c:9344
+#: src/callbacks.c:9254
 msgid ""
 "\n"
 "Paused\n"
 "(click Resume to continue processing)"
 msgstr ""
 
-#: src/callbacks.c:9345 src/callbacks.c:9406
+#: src/callbacks.c:9255 src/callbacks.c:9315
 msgid "paused..."
 msgstr ""
 
-#: src/callbacks.c:9372 src/callbacks.c:9418
-msgid "Pause"
-msgstr ""
-
-#: src/callbacks.c:9374 src/callbacks.c:9421
+#: src/callbacks.c:9284 src/callbacks.c:9333
 msgid "resumed..."
 msgstr ""
 
-#: src/callbacks.c:9393
+#: src/callbacks.c:9303
 msgid "Keep"
 msgstr ""
 
-#: src/callbacks.c:9396
+#: src/callbacks.c:9305
 msgid "Enough"
 msgstr ""
 
-#: src/callbacks.c:9401
+#: src/callbacks.c:9310
 #, c-format
 msgid ""
 "\n"
@@ -2410,28 +2400,28 @@
 "(click Resume to continue processing)"
 msgstr ""
 
-#: src/callbacks.c:9419
+#: src/callbacks.c:9331
 msgid "Cancel"
 msgstr ""
 
-#: src/callbacks.c:9558
+#: src/callbacks.c:9478
 msgid "Stop"
 msgstr ""
 
-#: src/callbacks.c:10053 src/multitrack.c:13247
+#: src/callbacks.c:9968 src/multitrack.c:13489
 msgid "LiVES: Selected frame"
 msgstr ""
 
-#: src/callbacks.c:10061
+#: src/callbacks.c:9976
 msgid "_Save frame as..."
 msgstr ""
 
-#: src/callbacks.c:10290
+#: src/callbacks.c:10202
 #, c-format
 msgid "Audio is ahead of video by %.4f secs. at frame %d, with fps %.4f\n"
 msgstr ""
 
-#: src/callbacks.c:10347
+#: src/callbacks.c:10255
 msgid ""
 "\n"
 "\n"
@@ -2440,7 +2430,7 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10353
+#: src/callbacks.c:10261
 msgid ""
 "\n"
 "\n"
@@ -2448,13 +2438,13 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10429 src/callbacks.c:11479
+#: src/callbacks.c:10334 src/callbacks.c:11395
 msgid ""
 "\n"
 "Record time must be greater than 0.\n"
 msgstr ""
 
-#: src/callbacks.c:10440
+#: src/callbacks.c:10346
 msgid ""
 "Capture an External Window:\n"
 "\n"
@@ -2463,17 +2453,17 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10445
+#: src/callbacks.c:10351
 msgid "External window was released.\n"
 msgstr ""
 
-#: src/callbacks.c:10479
+#: src/callbacks.c:10385
 msgid ""
 "Click on a Window to Capture it\n"
 "Press 'q' to stop recording"
 msgstr ""
 
-#: src/callbacks.c:10513
+#: src/callbacks.c:10419
 #, c-format
 msgid ""
 "\n"
@@ -2483,19 +2473,19 @@
 "(Default of %.3f frames per second will be used.)\n"
 msgstr ""
 
-#: src/callbacks.c:10539
+#: src/callbacks.c:10443
 msgid "LiVES was unable to capture this window. Sorry.\n"
 msgstr ""
 
-#: src/callbacks.c:10695
+#: src/callbacks.c:10601
 msgid "Export Selected Audio as..."
 msgstr ""
 
-#: src/callbacks.c:10699
+#: src/callbacks.c:10604
 msgid "Export Audio as..."
 msgstr ""
 
-#: src/callbacks.c:10714
+#: src/callbacks.c:10619
 msgid ""
 "\n"
 "\n"
@@ -2504,1033 +2494,1033 @@
 "rate.\n"
 msgstr ""
 
-#: src/callbacks.c:10720
+#: src/callbacks.c:10625
 #, c-format
 msgid "Exporting audio frames %d to %d as %s..."
 msgstr ""
 
-#: src/callbacks.c:10725
+#: src/callbacks.c:10629
 #, c-format
 msgid "Exporting audio as %s..."
 msgstr ""
 
-#: src/callbacks.c:10751
+#: src/callbacks.c:10655
 msgid "Exporting audio"
 msgstr ""
 
-#: src/callbacks.c:10782
+#: src/callbacks.c:10695
 msgid "LiVES: - Append Audio File"
 msgstr ""
 
-#: src/callbacks.c:10825
+#: src/callbacks.c:10739
 #, c-format
 msgid "Appending audio file %s..."
 msgstr ""
 
-#: src/callbacks.c:10836
+#: src/callbacks.c:10756
 msgid "Appending audio"
 msgstr ""
 
-#: src/callbacks.c:10892
+#: src/callbacks.c:10818
 msgid "Append Audio"
 msgstr ""
 
-#: src/callbacks.c:10952
+#: src/callbacks.c:10883
 #, c-format
 msgid "Padding audio to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10954
+#: src/callbacks.c:10885
 #, c-format
 msgid "Trimming audio from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10973
+#: src/callbacks.c:10904
 msgid "Trimming/Padding audio"
 msgstr ""
 
-#: src/callbacks.c:10981
+#: src/callbacks.c:10912
 msgid "Trim/Pad Audio"
 msgstr ""
 
-#: src/callbacks.c:11055
+#: src/callbacks.c:10982
 msgid "Fading audio in"
 msgstr ""
 
-#: src/callbacks.c:11056
+#: src/callbacks.c:10983
 msgid "Fade audio in"
 msgstr ""
 
-#: src/callbacks.c:11061
+#: src/callbacks.c:10987
 msgid "Fading audio out"
 msgstr ""
 
-#: src/callbacks.c:11062
+#: src/callbacks.c:10988
 msgid "Fade audio out"
 msgstr ""
 
-#: src/callbacks.c:11085
+#: src/callbacks.c:11011
 #, c-format
 msgid "%s over %.1f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11087
+#: src/callbacks.c:11013
 #, c-format
 msgid "%s from time %.2f seconds to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11094
+#: src/callbacks.c:11020
 msgid "Fading audio..."
 msgstr ""
 
-#: src/callbacks.c:11194
+#: src/callbacks.c:11119
 msgid ""
 "\n"
 "Deleting all audio will close this file.\n"
 "Are you sure ?"
 msgstr ""
 
-#: src/callbacks.c:11197
+#: src/callbacks.c:11122
 msgid "Deleting all audio..."
 msgstr ""
 
-#: src/callbacks.c:11203
+#: src/callbacks.c:11127
 #, c-format
 msgid "Deleting audio from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11290
+#: src/callbacks.c:11214
 msgid "Deleting Audio"
 msgstr ""
 
-#: src/callbacks.c:11297
+#: src/callbacks.c:11221
 msgid "Delete Audio"
 msgstr ""
 
-#: src/callbacks.c:11636
+#: src/callbacks.c:11550
 msgid "Record new audio"
 msgstr ""
 
-#: src/callbacks.c:11725
+#: src/callbacks.c:11640
 #, c-format
 msgid "Inserting silence from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11754
+#: src/callbacks.c:11666
 msgid "Inserting Silence"
 msgstr ""
 
-#: src/merge.c:85
+#: src/merge.c:96
 msgid "LiVES: - Merge"
 msgstr ""
 
-#: src/merge.c:102
+#: src/merge.c:113
 #, c-format
 msgid "Merge Clipboard [ %d Frames ]       With Selection [ %d Frames ]"
 msgstr ""
 
-#: src/merge.c:107
+#: src/merge.c:118
 #, c-format
 msgid ""
 "Merge Clipboard [ %d Frames (resampled) ]       With Selection [ %d Frames ]"
 msgstr ""
 
-#: src/merge.c:118
+#: src/merge.c:130
 msgid "Align _Starts"
 msgstr ""
 
-#: src/merge.c:123
+#: src/merge.c:135
 msgid "Align _Ends"
 msgstr ""
 
-#: src/merge.c:134
+#: src/merge.c:146
 msgid "What to do with extra clipboard frames -"
 msgstr ""
 
-#: src/merge.c:137
+#: src/merge.c:149
 msgid "_Insert Frames"
 msgstr ""
 
-#: src/merge.c:143
+#: src/merge.c:155
 msgid "_Drop Frames"
 msgstr ""
 
-#: src/merge.c:149
+#: src/merge.c:160
 msgid "Number of Times to Loop Clipboard"
 msgstr ""
 
-#: src/merge.c:160
+#: src/merge.c:171
 msgid "_Loop Clipboard to Fit Selection"
 msgstr ""
 
-#: src/merge.c:173
+#: src/merge.c:184
 msgid "_Transition Method:"
 msgstr ""
 
-#: src/merge.c:394
+#: src/merge.c:395
 msgid "Merging clipboard with selection..."
 msgstr ""
 
-#: src/merge.c:551
+#: src/merge.c:539
 msgid "Merge done.\n"
 msgstr ""
 
-#: src/gui.c:123
+#: src/gui.c:122
 msgid "_Custom Generators"
 msgstr ""
 
-#: src/gui.c:124
+#: src/gui.c:123
 msgid "_Custom Effects"
 msgstr ""
 
-#: src/gui.c:125
+#: src/gui.c:124
 msgid "Custom _Utilities"
 msgstr ""
 
-#: src/gui.c:352 src/multitrack.c:5964
+#: src/gui.c:351 src/multitrack.c:6143
 msgid "_File"
 msgstr ""
 
-#: src/gui.c:367 src/multitrack.c:5989
+#: src/gui.c:366 src/multitrack.c:6168
 msgid "_Open File/Directory"
 msgstr ""
 
-#: src/gui.c:373
+#: src/gui.c:372
 msgid "O_pen Part of File..."
 msgstr ""
 
-#: src/gui.c:379 src/gui.c:383 src/multitrack.c:6006 src/multitrack.c:6023
-#: src/multitrack.c:6028
+#: src/gui.c:378 src/gui.c:382 src/multitrack.c:6185 src/multitrack.c:6202
+#: src/multitrack.c:6207
 msgid "Open _Location/Stream..."
 msgstr ""
 
-#: src/gui.c:393 src/multitrack.c:6016
+#: src/gui.c:392 src/multitrack.c:6195
 msgid "Open _Youtube Clip..."
 msgstr ""
 
-#: src/gui.c:404
+#: src/gui.c:403
 msgid "Import from _dvd/vcd..."
 msgstr ""
 
-#: src/gui.c:413
+#: src/gui.c:412
 msgid "Import from _dvd"
 msgstr ""
 
-#: src/gui.c:416
+#: src/gui.c:415
 msgid "Import from _vcd"
 msgstr ""
 
-#: src/gui.c:419
+#: src/gui.c:418
 msgid "_Import from Firewire"
 msgstr ""
 
-#: src/gui.c:428 src/multitrack.c:6086
+#: src/gui.c:427 src/multitrack.c:6265
 msgid "Import from _Firewire Device (dv)"
 msgstr ""
 
-#: src/gui.c:429 src/multitrack.c:6094
+#: src/gui.c:428 src/multitrack.c:6273
 msgid "Import from _Firewire Device (hdv)"
 msgstr ""
 
-#: src/gui.c:457
+#: src/gui.c:456
 msgid "_Add Webcam/TV card..."
 msgstr ""
 
-#: src/gui.c:476
+#: src/gui.c:475
 msgid "Add _Unicap Device"
 msgstr ""
 
-#: src/gui.c:486
+#: src/gui.c:485
 msgid "Add Live _Firewire Device"
 msgstr ""
 
-#: src/gui.c:495
+#: src/gui.c:494
 msgid "Add _TV Device"
 msgstr ""
 
-#: src/gui.c:510 src/multitrack.c:6117
+#: src/gui.c:509 src/multitrack.c:6296
 msgid "_Recent Files..."
 msgstr ""
 
-#: src/gui.c:560 src/multitrack.c:6177
+#: src/gui.c:559 src/multitrack.c:6356
 msgid "_Reload Clip Set..."
 msgstr ""
 
-#: src/gui.c:564 src/multitrack.c:6185
+#: src/gui.c:563 src/multitrack.c:6364
 msgid "Close/Sa_ve All Clips"
 msgstr ""
 
-#: src/gui.c:575
+#: src/gui.c:574
 msgid "_Encode Clip As..."
 msgstr ""
 
-#: src/gui.c:577
+#: src/gui.c:576
 msgid "Encode _Selection As..."
 msgstr ""
 
-#: src/gui.c:584
+#: src/gui.c:583
 msgid "_Close This Clip"
 msgstr ""
 
-#: src/gui.c:595
+#: src/gui.c:594
 msgid "_Backup Clip as .lv1..."
 msgstr ""
 
-#: src/gui.c:604
+#: src/gui.c:603
 msgid "_Restore Clip from .lv1..."
 msgstr ""
 
-#: src/gui.c:615
+#: src/gui.c:614
 msgid "Encode/Load/Backup _with Sound"
 msgstr ""
 
-#: src/gui.c:620
+#: src/gui.c:619
 msgid "Auto load subtitles"
 msgstr ""
 
-#: src/gui.c:628 src/multitrack.c:6224
+#: src/gui.c:627 src/multitrack.c:6403
 msgid "Clean _up Diskspace"
 msgstr ""
 
-#: src/gui.c:636 src/multitrack.c:6257
+#: src/gui.c:635 src/multitrack.c:6436
 msgid "_Edit"
 msgstr ""
 
-#: src/gui.c:685
+#: src/gui.c:684
 msgid "_MULTITRACK mode"
 msgstr ""
 
-#: src/gui.c:696
+#: src/gui.c:695
 msgid "_Copy Selection"
 msgstr ""
 
-#: src/gui.c:705
+#: src/gui.c:704
 msgid "Cu_t Selection"
 msgstr ""
 
-#: src/gui.c:714
+#: src/gui.c:713
 msgid "_Insert from Clipboard..."
 msgstr ""
 
-#: src/gui.c:730
+#: src/gui.c:729
 msgid "Paste as _New"
 msgstr ""
 
-#: src/gui.c:739
+#: src/gui.c:738
 msgid "_Merge Clipboard with Selection..."
 msgstr ""
 
-#: src/gui.c:746
+#: src/gui.c:745
 msgid "_Delete Selection"
 msgstr ""
 
-#: src/gui.c:764
+#: src/gui.c:763
 msgid "Decouple _Video from Audio"
 msgstr ""
 
-#: src/gui.c:772
+#: src/gui.c:771
 msgid "_Select..."
 msgstr ""
 
-#: src/gui.c:786
+#: src/gui.c:785
 msgid "Select _All Frames"
 msgstr ""
 
-#: src/gui.c:794
+#: src/gui.c:793
 msgid "_Start Frame Only"
 msgstr ""
 
-#: src/gui.c:802
+#: src/gui.c:801
 msgid "_End Frame Only"
 msgstr ""
 
-#: src/gui.c:813
+#: src/gui.c:812
 msgid "Select from _First Frame"
 msgstr ""
 
-#: src/gui.c:817
+#: src/gui.c:816
 msgid "Select to _Last Frame"
 msgstr ""
 
-#: src/gui.c:821
+#: src/gui.c:820
 msgid "Select Last Insertion/_Merge"
 msgstr ""
 
-#: src/gui.c:825
+#: src/gui.c:824
 msgid "Select Last _Effect"
 msgstr ""
 
-#: src/gui.c:829
+#: src/gui.c:828
 msgid "_Invert Selection"
 msgstr ""
 
-#: src/gui.c:837
+#: src/gui.c:836
 msgid "_Lock Selection Width"
 msgstr ""
 
-#: src/gui.c:842 src/multitrack.c:6409
+#: src/gui.c:841 src/multitrack.c:6591
 msgid "_Play"
 msgstr ""
 
-#: src/gui.c:854
+#: src/gui.c:853
 msgid "_Play All"
 msgstr ""
 
-#: src/gui.c:869
+#: src/gui.c:868
 msgid "Pla_y Selection"
 msgstr ""
 
-#: src/gui.c:877
+#: src/gui.c:876
 msgid "Play _Clipboard"
 msgstr ""
 
-#: src/gui.c:899 src/multitrack.c:6441
+#: src/gui.c:898 src/multitrack.c:6623
 msgid "_Stop"
 msgstr ""
 
-#: src/gui.c:914 src/multitrack.c:6453
+#: src/gui.c:913 src/multitrack.c:6635
 msgid "Re_wind"
 msgstr ""
 
-#: src/gui.c:946 src/multitrack.c:6471
+#: src/gui.c:945 src/multitrack.c:6653
 msgid "_Full Screen"
 msgstr ""
 
-#: src/gui.c:955
+#: src/gui.c:954
 msgid "_Double Size"
 msgstr ""
 
-#: src/gui.c:963 src/multitrack.c:6479
+#: src/gui.c:962 src/multitrack.c:6661
 msgid "Play in _Separate Window"
 msgstr ""
 
-#: src/gui.c:972
+#: src/gui.c:971
 msgid "_Blank Background"
 msgstr ""
 
-#: src/gui.c:979
+#: src/gui.c:978
 msgid "(Auto)_loop Video (to fit audio track)"
 msgstr ""
 
-#: src/gui.c:988 src/multitrack.c:6487
+#: src/gui.c:987 src/multitrack.c:6669
 msgid "L_oop Continuously"
 msgstr ""
 
-#: src/gui.c:997
+#: src/gui.c:996
 msgid "Pin_g Pong Loops"
 msgstr ""
 
-#: src/gui.c:1005 src/multitrack.c:6495
+#: src/gui.c:1004 src/multitrack.c:6677
 msgid "_Mute"
 msgstr ""
 
-#: src/gui.c:1017
+#: src/gui.c:1016
 msgid "Separate Window 'S_ticky' Mode"
 msgstr ""
 
-#: src/gui.c:1025
+#: src/gui.c:1024
 msgid "S_how Frame Counter"
 msgstr ""
 
-#: src/gui.c:1035
+#: src/gui.c:1034
 msgid "Show Subtitles"
 msgstr ""
 
-#: src/gui.c:1045
+#: src/gui.c:1044
 msgid "Letterbox mode"
 msgstr ""
 
-#: src/gui.c:1051 src/multitrack.c:6507
+#: src/gui.c:1050 src/multitrack.c:6689
 msgid "Effect_s"
 msgstr ""
 
-#: src/gui.c:1054
+#: src/gui.c:1053
 msgid "Effects are applied to the current selection."
 msgstr ""
 
-#: src/gui.c:1067
+#: src/gui.c:1066
 msgid "_Run Test Rendered Effect/Tool/Generator..."
 msgstr ""
 
-#: src/gui.c:1072 src/multitrack.c:7123
+#: src/gui.c:1071 src/multitrack.c:7299
 msgid "_Tools"
 msgstr ""
 
-#: src/gui.c:1075
+#: src/gui.c:1074
 msgid "Tools are applied to complete clips."
 msgstr ""
 
-#: src/gui.c:1085
+#: src/gui.c:1084
 msgid "_Reverse Clipboard"
 msgstr ""
 
-#: src/gui.c:1094
+#: src/gui.c:1093
 msgid "_Change Playback/Save Speed..."
 msgstr ""
 
-#: src/gui.c:1099
+#: src/gui.c:1098
 msgid "Resample _Video to New Frame Rate..."
 msgstr ""
 
-#: src/gui.c:1105
+#: src/gui.c:1104
 msgid "_Utilities"
 msgstr ""
 
-#: src/gui.c:1110
+#: src/gui.c:1109
 msgid "Custom _Tools"
 msgstr ""
 
-#: src/gui.c:1116 src/multitrack.c:7149
+#: src/gui.c:1115 src/multitrack.c:7325
 msgid "_Generate"
 msgstr ""
 
-#: src/gui.c:1126
+#: src/gui.c:1125
 msgid "Loading rendered effect plugins..."
 msgstr ""
 
-#: src/gui.c:1139
+#: src/gui.c:1138
 msgid "Load _Subtitles from File..."
 msgstr ""
 
-#: src/gui.c:1144
+#: src/gui.c:1143
 msgid "Erase subtitles"
 msgstr ""
 
-#: src/gui.c:1152 src/multitrack.c:7158
+#: src/gui.c:1151 src/multitrack.c:7334
 msgid "Capture _External Window... "
 msgstr ""
 
-#: src/gui.c:1159 src/multitrack.c:7173
+#: src/gui.c:1158 src/multitrack.c:7349
 msgid "_Preferences..."
 msgstr ""
 
-#: src/gui.c:1172
+#: src/gui.c:1171
 msgid "_Audio"
 msgstr ""
 
-#: src/gui.c:1184
+#: src/gui.c:1183
 msgid "Load _New Audio for Clip..."
 msgstr ""
 
-#: src/gui.c:1190
+#: src/gui.c:1189
 msgid "Load _CD Track..."
 msgstr ""
 
-#: src/gui.c:1191
+#: src/gui.c:1190
 msgid "E_ject CD"
 msgstr ""
 
-#: src/gui.c:1205
+#: src/gui.c:1204
 msgid "Record E_xternal Audio..."
 msgstr ""
 
-#: src/gui.c:1218
+#: src/gui.c:1217
 msgid "to New _Clip..."
 msgstr ""
 
-#: src/gui.c:1222
+#: src/gui.c:1221
 msgid "to _Selection"
 msgstr ""
 
-#: src/gui.c:1230
+#: src/gui.c:1229
 msgid "Fade Audio _In..."
 msgstr ""
 
-#: src/gui.c:1234
+#: src/gui.c:1233
 msgid "Fade Audio _Out..."
 msgstr ""
 
-#: src/gui.c:1244
+#: src/gui.c:1243
 msgid "_Export Audio..."
 msgstr ""
 
-#: src/gui.c:1257
+#: src/gui.c:1256
 msgid "Export _Selected Audio..."
 msgstr ""
 
-#: src/gui.c:1261
+#: src/gui.c:1260
 msgid "Export _All Audio..."
 msgstr ""
 
-#: src/gui.c:1265
+#: src/gui.c:1264
 msgid "_Append Audio..."
 msgstr ""
 
-#: src/gui.c:1270
+#: src/gui.c:1269
 msgid "_Trim/Pad Audio..."
 msgstr ""
 
-#: src/gui.c:1283
+#: src/gui.c:1282
 msgid "Trim/Pad Audio to _Selection"
 msgstr ""
 
-#: src/gui.c:1288
+#: src/gui.c:1287
 msgid "Trim/Pad Audio from Beginning to _Play Start"
 msgstr ""
 
-#: src/gui.c:1293
+#: src/gui.c:1292
 msgid "_Delete Audio..."
 msgstr ""
 
-#: src/gui.c:1306
+#: src/gui.c:1305
 msgid "Delete _Selected Audio"
 msgstr ""
 
-#: src/gui.c:1310
+#: src/gui.c:1309
 msgid "Delete _All Audio"
 msgstr ""
 
-#: src/gui.c:1314
+#: src/gui.c:1313
 msgid "Insert _Silence in Selection"
 msgstr ""
 
-#: src/gui.c:1319
+#: src/gui.c:1318
 msgid "_Resample Audio..."
 msgstr ""
 
-#: src/gui.c:1324
+#: src/gui.c:1323
 msgid "_Info"
 msgstr ""
 
-#: src/gui.c:1336
+#: src/gui.c:1335
 msgid "Show Clip _Info"
 msgstr ""
 
-#: src/gui.c:1344
+#: src/gui.c:1343
 msgid "Show/_Edit File Comments"
 msgstr ""
 
-#: src/gui.c:1349
+#: src/gui.c:1348
 msgid "Show _Clipboard Info"
 msgstr ""
 
-#: src/gui.c:1360 src/multitrack.c:7286
+#: src/gui.c:1359 src/multitrack.c:7462
 msgid "Show _Messages"
 msgstr ""
 
-#: src/gui.c:1364 src/multitrack.c:7365
+#: src/gui.c:1363 src/multitrack.c:7541
 msgid "Show _Layout Errors"
 msgstr ""
 
-#: src/gui.c:1369 src/multitrack.c:7263
+#: src/gui.c:1368 src/multitrack.c:7439
 msgid "_Clips"
 msgstr ""
 
-#: src/gui.c:1381
+#: src/gui.c:1380
 msgid "_Rename Current Clip in Menu..."
 msgstr ""
 
-#: src/gui.c:1399
+#: src/gui.c:1398
 msgid "A_dvanced"
 msgstr ""
 
-#: src/gui.c:1412
+#: src/gui.c:1411
 msgid "_RFX Effects/Tools/Utilities"
 msgstr ""
 
-#: src/gui.c:1424
+#: src/gui.c:1423
 msgid "_New Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1428
+#: src/gui.c:1427
 msgid "_Copy RFX Script to Test..."
 msgstr ""
 
-#: src/gui.c:1432
+#: src/gui.c:1431
 msgid "_Edit Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1436
+#: src/gui.c:1435
 msgid "Rena_me Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1440
+#: src/gui.c:1439
 msgid "_Delete Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1450
+#: src/gui.c:1449
 msgid "_Promote Test Rendered Effect/Tool/Generator..."
 msgstr ""
 
-#: src/gui.c:1457
+#: src/gui.c:1456
 msgid "_Import Custom RFX script..."
 msgstr ""
 
-#: src/gui.c:1461
+#: src/gui.c:1460
 msgid "E_xport Custom RFX script..."
 msgstr ""
 
-#: src/gui.c:1465
+#: src/gui.c:1464
 msgid "De_lete Custom RFX Script..."
 msgstr ""
 
-#: src/gui.c:1472
+#: src/gui.c:1471
 msgid "Re_build all RFX plugins"
 msgstr ""
 
-#: src/gui.c:1501
+#: src/gui.c:1498
 msgid "Receive _LiVES stream from..."
 msgstr ""
 
-#: src/gui.c:1506
+#: src/gui.c:1503
 msgid "_Send LiVES stream to..."
 msgstr ""
 
-#: src/gui.c:1515
+#: src/gui.c:1512
 #, c-format
 msgid "Open _yuv4mpeg stream on %sstream.yuv..."
 msgstr ""
 
-#: src/gui.c:1536
+#: src/gui.c:1534
 msgid "_Import Project (.lv2)..."
 msgstr ""
 
-#: src/gui.c:1540
+#: src/gui.c:1538
 msgid "E_xport Project (.lv2)..."
 msgstr ""
 
-#: src/gui.c:1545
+#: src/gui.c:1543
 msgid "_VJ"
 msgstr ""
 
-#: src/gui.c:1557
+#: src/gui.c:1555
 msgid "Real Time _Effect Mapping"
 msgstr ""
 
-#: src/gui.c:1563
+#: src/gui.c:1561
 msgid "Bind real time effects to ctrl-number keys."
 msgstr ""
 
-#: src/gui.c:1565
+#: src/gui.c:1563
 msgid "Set Real Time Effect _Defaults"
 msgstr ""
 
-#: src/gui.c:1567
+#: src/gui.c:1565
 msgid "Set default parameter values for real time effects."
 msgstr ""
 
-#: src/gui.c:1580
+#: src/gui.c:1578
 msgid "Save Real Time Effect _Defaults"
 msgstr ""
 
-#: src/gui.c:1583
+#: src/gui.c:1581
 msgid ""
 "Save real time effect defaults so they will be restored each time you use "
 "LiVES."
 msgstr ""
 
-#: src/gui.c:1589
+#: src/gui.c:1587
 msgid "_Reset all playback speeds and positions"
 msgstr ""
 
-#: src/gui.c:1592
+#: src/gui.c:1590
 msgid ""
 "Reset all playback positions to frame 1, and reset all playback frame rates."
 msgstr ""
 
-#: src/gui.c:1594
+#: src/gui.c:1592
 msgid "_MIDI/joystick interface"
 msgstr ""
 
-#: src/gui.c:1609
+#: src/gui.c:1607
 msgid "_MIDI/joystick learner..."
 msgstr ""
 
-#: src/gui.c:1614
+#: src/gui.c:1612
 msgid "_Save device mapping..."
 msgstr ""
 
-#: src/gui.c:1620
+#: src/gui.c:1618
 msgid "_Load device mapping..."
 msgstr ""
 
-#: src/gui.c:1628
+#: src/gui.c:1626
 msgid "Show VJ _Keys"
 msgstr ""
 
-#: src/gui.c:1632
+#: src/gui.c:1630
 msgid "To_ys"
 msgstr ""
 
-#: src/gui.c:1644
+#: src/gui.c:1642
 msgid "_None"
 msgstr ""
 
-#: src/gui.c:1652
+#: src/gui.c:1650
 msgid "_Autolives"
 msgstr ""
 
-#: src/gui.c:1657
+#: src/gui.c:1655
 msgid "_Mad Frames"
 msgstr ""
 
-#: src/gui.c:1662
+#: src/gui.c:1660
 msgid "_LiVES TV (broadband)"
 msgstr ""
 
-#: src/gui.c:1672 src/multitrack.c:7387
+#: src/gui.c:1670 src/multitrack.c:7563
 msgid "_Help"
 msgstr ""
 
-#: src/gui.c:1684 src/multitrack.c:7407
+#: src/gui.c:1682 src/multitrack.c:7583
 msgid "_Manual (opens in browser)"
 msgstr ""
 
-#: src/gui.c:1691 src/multitrack.c:7416
+#: src/gui.c:1689 src/multitrack.c:7592
 msgid "_Donate to the project !"
 msgstr ""
 
-#: src/gui.c:1695 src/multitrack.c:7420
+#: src/gui.c:1693 src/multitrack.c:7596
 msgid "_Email the author"
 msgstr ""
 
-#: src/gui.c:1699 src/multitrack.c:7424
+#: src/gui.c:1697 src/multitrack.c:7600
 msgid "Report a _bug"
 msgstr ""
 
-#: src/gui.c:1703 src/multitrack.c:7428
+#: src/gui.c:1701 src/multitrack.c:7604
 msgid "Suggest a _feature"
 msgstr ""
 
-#: src/gui.c:1707 src/multitrack.c:7432
+#: src/gui.c:1705 src/multitrack.c:7608
 msgid "Assist with _translating"
 msgstr ""
 
-#: src/gui.c:1714 src/multitrack.c:7439
+#: src/gui.c:1712 src/multitrack.c:7615
 msgid "_Troubleshoot"
 msgstr ""
 
-#: src/gui.c:1718 src/multitrack.c:7443
+#: src/gui.c:1716 src/multitrack.c:7619
 msgid "_About"
 msgstr ""
 
-#: src/gui.c:1752
+#: src/gui.c:1750
 msgid "Rewind to start (w)"
 msgstr ""
 
-#: src/gui.c:1760 src/multitrack.c:16720
+#: src/gui.c:1758 src/multitrack.c:17010
 msgid "Play all (p)"
 msgstr ""
 
-#: src/gui.c:1768 src/gui.c:1877
+#: src/gui.c:1766 src/gui.c:1876
 msgid "Stop playback (q)"
 msgstr ""
 
-#: src/gui.c:1779
+#: src/gui.c:1777
 msgid "Play selection (y)"
 msgstr ""
 
-#: src/gui.c:1832
+#: src/gui.c:1829
 msgid "Volume"
 msgstr ""
 
-#: src/gui.c:1854
+#: src/gui.c:1853
 msgid "Audio volume (1.00)"
 msgstr ""
 
-#: src/gui.c:1883
+#: src/gui.c:1882
 msgid "Unblank background (b)"
 msgstr ""
 
-#: src/gui.c:1929
+#: src/gui.c:1928
 msgid "Play slower (ctrl-down)"
 msgstr ""
 
-#: src/gui.c:1935
+#: src/gui.c:1934
 msgid "Play faster (ctrl-up)"
 msgstr ""
 
-#: src/gui.c:1942
+#: src/gui.c:1941
 msgid "Skip back (ctrl-left)"
 msgstr ""
 
-#: src/gui.c:1948
+#: src/gui.c:1947
 msgid "Skip forward (ctrl-right)"
 msgstr ""
 
-#: src/gui.c:1954
+#: src/gui.c:1953
 msgid "Show clip info (i)"
 msgstr ""
 
-#: src/gui.c:1960
+#: src/gui.c:1959
 msgid "Hide this toolbar"
 msgstr ""
 
-#: src/gui.c:1962
+#: src/gui.c:1961
 msgid ""
 "Press \"s\" to toggle separate play window for improved performance, \"q\" "
 "to stop."
 msgstr ""
 
 #. TRANSLATORS: please keep the translated string the same length
-#: src/gui.c:1995
+#: src/gui.c:1994
 msgid "     Video playback speed (frames per second)        "
 msgstr ""
 
-#: src/gui.c:2009
+#: src/gui.c:2008
 msgid "Vary the video speed"
 msgstr ""
 
-#: src/gui.c:2092 src/gui.c:3218
+#: src/gui.c:2090 src/gui.c:3329
 msgid "First Frame"
 msgstr ""
 
-#: src/gui.c:2193 src/gui.c:3226
+#: src/gui.c:2191 src/gui.c:3336
 msgid "Last Frame"
 msgstr ""
 
-#: src/gui.c:2210
+#: src/gui.c:2208
 msgid "The first selected frame in this clip"
 msgstr ""
 
-#: src/gui.c:2248
+#: src/gui.c:2246
 msgid "The last selected frame in this clip"
 msgstr ""
 
-#: src/gui.c:2532
+#: src/gui.c:2546
 msgid "Starting...\n"
 msgstr ""
 
-#: src/gui.c:3074
+#: src/gui.c:3181
 msgid "    Press 'q' to stop recording.  DO NOT COVER THE PLAY WINDOW !   "
 msgstr ""
 
-#: src/gui.c:3521
+#: src/gui.c:3643
 msgid "Frame number to preview"
 msgstr ""
 
-#: src/gui.c:3538
+#: src/gui.c:3660
 msgid "_Free"
 msgstr ""
 
-#: src/gui.c:3539
+#: src/gui.c:3661
 msgid "Free choice of frame number"
 msgstr ""
 
-#: src/gui.c:3543
+#: src/gui.c:3666
 msgid "_Start"
 msgstr ""
 
-#: src/gui.c:3544
+#: src/gui.c:3667
 msgid "Frame number is linked to start frame"
 msgstr ""
 
-#: src/gui.c:3551
+#: src/gui.c:3675
 msgid "_End"
 msgstr ""
 
-#: src/gui.c:3552
+#: src/gui.c:3676
 msgid "Frame number is linked to end frame"
 msgstr ""
 
-#: src/gui.c:3559
+#: src/gui.c:3684
 msgid "_Pointer"
 msgstr ""
 
-#: src/gui.c:3560
+#: src/gui.c:3685
 msgid "Frame number is linked to playback pointer"
 msgstr ""
 
-#: src/gui.c:3581
+#: src/gui.c:3707
 msgid "Rewind"
 msgstr ""
 
-#: src/gui.c:3592 src/dialogs.c:894 src/dialogs.c:896 src/dialogs.c:1817
-#: src/dialogs.c:1819
+#: src/gui.c:3718 src/dialogs.c:960 src/dialogs.c:962 src/dialogs.c:1873
+#: src/dialogs.c:1875
 msgid "Play all"
 msgstr ""
 
-#: src/gui.c:3605
+#: src/gui.c:3731
 msgid "Play Selection"
 msgstr ""
 
-#: src/gui.c:3619
+#: src/gui.c:3745
 msgid "Loop On/Off"
 msgstr ""
 
-#: src/gui.c:3693
+#: src/gui.c:3819
 msgid "Start _recording"
 msgstr ""
 
-#: src/gui.c:3698
+#: src/gui.c:3824
 msgid "Stop _recording"
 msgstr ""
 
-#: src/gui.c:3703
+#: src/gui.c:3829
 msgid "_Record Performance"
 msgstr ""
 
-#: src/gui.c:3851
+#: src/gui.c:3974
 msgid "Hide Play Window"
 msgstr ""
 
-#: src/gui.c:4232
+#: src/gui.c:4333
 msgid "Show Play Window"
 msgstr ""
 
-#: src/ce_thumbs.c:222
+#: src/ce_thumbs.c:242
 #, c-format
 msgid "Mapped to ctrl-%d"
 msgstr ""
 
-#: src/ce_thumbs.c:276 src/effects.c:85 src/preferences.c:3195
+#: src/ce_thumbs.c:296 src/effects.c:86 src/preferences.c:3247
 msgid "Effects"
 msgstr ""
 
-#: src/ce_thumbs.c:279 src/multitrack.c:5615
+#: src/ce_thumbs.c:299 src/multitrack.c:5791
 msgid "Clips"
 msgstr ""
 
-#: src/ce_thumbs.c:303
+#: src/ce_thumbs.c:323
 #, c-format
 msgid "Show / apply effects to %s\n"
 msgstr ""
 
-#: src/ce_thumbs.c:315
+#: src/ce_thumbs.c:335
 #, c-format
 msgid "Select clip for %s\n"
 msgstr ""
 
-#: src/ce_thumbs.c:515
+#: src/ce_thumbs.c:536
 msgid "_Pin"
 msgstr ""
 
-#: src/ce_thumbs.c:515
+#: src/ce_thumbs.c:537
 msgid "Pin the parameter box to the window"
 msgstr ""
 
 #. TRANSLATORS: Exabytes
-#: src/utils.c:794
+#: src/utils.c:800
 #, c-format
 msgid "%.2f EB"
 msgstr ""
 
 #. TRANSLATORS: Petabytes
-#: src/utils.c:798
+#: src/utils.c:803
 #, c-format
 msgid "%.2f PB"
 msgstr ""
 
 #. TRANSLATORS: Terabytes
-#: src/utils.c:802
+#: src/utils.c:806
 #, c-format
 msgid "%.2f TB"
 msgstr ""
 
 #. TRANSLATORS: Gigabytes
-#: src/utils.c:806
+#: src/utils.c:809
 #, c-format
 msgid "%.2f GB"
 msgstr ""
 
 #. TRANSLATORS: Megabytes
-#: src/utils.c:810
+#: src/utils.c:812
 #, c-format
 msgid "%.2f MB"
 msgstr ""
 
 #. TRANSLATORS: Kilobytes (1024 bytes)
-#: src/utils.c:814
+#: src/utils.c:815
 #, c-format
 msgid "%.2f KiB"
 msgstr ""
@@ -3540,7 +3530,7 @@
 msgid "%d bytes"
 msgstr ""
 
-#: src/utils.c:1841
+#: src/utils.c:1835
 msgid "Clearing the clipboard"
 msgstr ""
 
@@ -3552,81 +3542,81 @@
 "Switched to clip %s\n"
 msgstr ""
 
-#: src/utils.c:1880
+#: src/utils.c:1877
 msgid ""
 "\n"
 "==============================\n"
 "Switched to empty clip\n"
 msgstr ""
 
-#: src/utils.c:1917
+#: src/utils.c:1916
 msgid "(blank)"
 msgstr ""
 
-#: src/utils.c:1920
+#: src/utils.c:1919
 #, c-format
 msgid ""
 "The set name has been changed from %s to %s. Affected layouts have been "
 "updated accordingly\n"
 msgstr ""
 
-#: src/utils.c:1928
+#: src/utils.c:1927
 #, c-format
 msgid ""
 "The clip %s is missing from this set.\n"
 "It is required by the following layouts:\n"
 msgstr ""
 
-#: src/utils.c:1932
+#: src/utils.c:1931
 #, c-format
 msgid ""
 "The clip %s has been closed.\n"
 "It is required by the following layouts:\n"
 msgstr ""
 
-#: src/utils.c:1937
+#: src/utils.c:1936
 #, c-format
 msgid ""
 "Frames have been shifted in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1942
+#: src/utils.c:1941
 #, c-format
 msgid ""
 "Frames have been deleted from the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1947
+#: src/utils.c:1946
 #, c-format
 msgid ""
 "Audio has been deleted from the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1952
+#: src/utils.c:1951
 #, c-format
 msgid ""
 "Audio has been shifted in clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1957
+#: src/utils.c:1956
 #, c-format
 msgid ""
 "Audio has been altered in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1962
+#: src/utils.c:1961
 #, c-format
 msgid ""
 "Frames have been altered in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:2135
+#: src/utils.c:2134
 #, c-format
 msgid ""
 "Set %s\n"
@@ -3634,7 +3624,7 @@
 "by another copy of LiVES.\n"
 msgstr ""
 
-#: src/utils.c:2142
+#: src/utils.c:2140
 #, c-format
 msgid ""
 "\n"
@@ -3680,67 +3670,67 @@
 msgid "Removing layout %s\n"
 msgstr ""
 
-#: src/utils.c:3014
+#: src/utils.c:2996
 msgid "Video [opening...]"
 msgstr ""
 
-#: src/utils.c:3018
+#: src/utils.c:2999
 #, c-format
 msgid "Video [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:3022
+#: src/utils.c:3002
 msgid "(Undefined)"
 msgstr ""
 
-#: src/utils.c:3025
+#: src/utils.c:3004
 msgid "(No video)"
 msgstr ""
 
-#: src/utils.c:3032
+#: src/utils.c:3011
 msgid "(No audio)"
 msgstr ""
 
-#: src/utils.c:3037
+#: src/utils.c:3015
 msgid "Mono  [opening...]"
 msgstr ""
 
-#: src/utils.c:3040
+#: src/utils.c:3017
 msgid "Left Audio [opening...]"
 msgstr ""
 
-#: src/utils.c:3045
+#: src/utils.c:3021
 #, c-format
 msgid "Mono [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:3048
+#: src/utils.c:3023
 #, c-format
 msgid "Left Audio [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:3056
+#: src/utils.c:3031
 msgid "Right Audio [opening...]"
 msgstr ""
 
-#: src/utils.c:3059
+#: src/utils.c:3033
 #, c-format
 msgid "Right Audio [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:3506
+#: src/utils.c:3472
 msgid "LiVES cannot switch to mplayer whilst clips are loading."
 msgstr ""
 
-#: src/utils.c:3559
+#: src/utils.c:3525
 msgid "LiVES cannot switch to mplayer2 whilst clips are loading."
 msgstr ""
 
-#: src/utils.c:3809
+#: src/utils.c:3775
 msgid "Cleaning up clip"
 msgstr ""
 
-#: src/utils.c:3913
+#: src/utils.c:3874
 #, c-format
 msgid ""
 "\n"
@@ -3750,30 +3740,29 @@
 "Overwrite ?\n"
 msgstr ""
 
-#: src/utils.c:4305 src/utils.c:4337 src/multitrack.c:4503
+#: src/utils.c:4250 src/utils.c:4280 src/multitrack.c:4672
 #, c-format
 msgid "_Undo %s"
 msgstr ""
 
-#: src/utils.c:4306 src/utils.c:4338 src/multitrack.c:4525
+#: src/utils.c:4251 src/utils.c:4281 src/multitrack.c:4693
 #, c-format
 msgid "_Redo %s"
 msgstr ""
 
-#: src/utils.c:4363
+#: src/utils.c:4305
 msgid "-------------Selection------------"
 msgstr ""
 
-#. TRANSLATORS: - try to keep the text of the middle part the same length, by deleting "-" if necessary
-#: src/utils.c:4371
+#: src/utils.c:4313
 msgid " sec ] ----------Selection---------- [ "
 msgstr ""
 
-#: src/utils.c:4371
+#: src/utils.c:4314
 msgid " frames ] ----------"
 msgstr ""
 
-#: src/utils.c:5360
+#: src/utils.c:5302
 msgid ""
 "Your version of mplayer/ffmpeg may be broken !\n"
 "See http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2071\n"
@@ -3784,11 +3773,11 @@
 "Try running Help/Troubleshoot for more information."
 msgstr ""
 
-#: src/saveplay.c:178
+#: src/saveplay.c:179
 msgid "Examining file header"
 msgstr ""
 
-#: src/saveplay.c:315 src/saveplay.c:789
+#: src/saveplay.c:316 src/saveplay.c:779
 #, c-format
 msgid "Opening %s"
 msgstr ""
@@ -3798,36 +3787,36 @@
 msgid "Opening %s start time %.2f sec. frames %d"
 msgstr ""
 
-#: src/saveplay.c:326 src/saveplay.c:4001
+#: src/saveplay.c:326 src/saveplay.c:3927
 msgid " without sound"
 msgstr ""
 
-#: src/saveplay.c:396
+#: src/saveplay.c:395
 #, c-format
 msgid "Opening audio for %s"
 msgstr ""
 
-#: src/saveplay.c:557
+#: src/saveplay.c:554
 #, c-format
 msgid "Auto trimming %.2f seconds of audio at start..."
 msgstr ""
 
-#: src/saveplay.c:567
+#: src/saveplay.c:562
 #, c-format
 msgid "Auto trimming %.2f seconds of audio at end..."
 msgstr ""
 
-#: src/saveplay.c:584
+#: src/saveplay.c:577
 #, c-format
 msgid "Auto padding with %.2f seconds of silence at start..."
 msgstr ""
 
-#: src/saveplay.c:599
+#: src/saveplay.c:590
 #, c-format
 msgid "Auto padding with %.2f seconds of silence at end..."
 msgstr ""
 
-#: src/saveplay.c:671
+#: src/saveplay.c:661
 #, c-format
 msgid ""
 "\n"
@@ -3839,11 +3828,11 @@
 "Are you sure you wish to continue ?"
 msgstr ""
 
-#: src/saveplay.c:685
+#: src/saveplay.c:676
 msgid " - please be patient."
 msgstr ""
 
-#: src/saveplay.c:938
+#: src/saveplay.c:926
 msgid ""
 "\n"
 "\n"
@@ -3851,14 +3840,14 @@
 "Please check the terminal window for more details.\n"
 msgstr ""
 
-#: src/saveplay.c:940
+#: src/saveplay.c:928
 msgid ""
 "\n"
 "\n"
 "You may need to install mplayer to open this file.\n"
 msgstr ""
 
-#: src/saveplay.c:948
+#: src/saveplay.c:934
 msgid ""
 "\n"
 "\n"
@@ -3866,29 +3855,29 @@
 "Tools|Preferences|Decoding\n"
 msgstr ""
 
-#: src/saveplay.c:1014
+#: src/saveplay.c:995
 msgid "Adding image..."
 msgstr ""
 
-#: src/saveplay.c:1108
+#: src/saveplay.c:1089
 #, c-format
 msgid "Subtitles were saved as %s\n"
 msgstr ""
 
-#: src/saveplay.c:1192
+#: src/saveplay.c:1171
 #, c-format
 msgid "LiVES: Save Frame %d as..."
 msgstr ""
 
-#: src/saveplay.c:1195
+#: src/saveplay.c:1174
 msgid "LiVES: Save Frame as..."
 msgstr ""
 
-#: src/saveplay.c:1322
+#: src/saveplay.c:1303
 msgid "LiVES: Save Clip as..."
 msgstr ""
 
-#: src/saveplay.c:1390
+#: src/saveplay.c:1369
 msgid ""
 "Saving your video could lead to a loss of quality !\n"
 "You are strongly advised to 'Save As' to a new file.\n"
@@ -3896,67 +3885,67 @@
 "Do you still wish to continue ?"
 msgstr ""
 
-#: src/saveplay.c:1517 src/saveplay.c:1683 src/saveplay.c:1762
-#: src/saveplay.c:4014
+#: src/saveplay.c:1494 src/saveplay.c:1659 src/saveplay.c:1738
+#: src/saveplay.c:3940
 msgid "Pulling frames from clip"
 msgstr ""
 
-#: src/saveplay.c:1588 src/saveplay.c:1727
+#: src/saveplay.c:1565 src/saveplay.c:1703
 msgid "Linking selection"
 msgstr ""
 
-#: src/saveplay.c:1779
+#: src/saveplay.c:1755
 msgid " (with no sound)\n"
 msgstr ""
 
-#: src/saveplay.c:1786
+#: src/saveplay.c:1761
 #, c-format
 msgid "Saving frames %d to %d%s as \"%s\" : encoder = %s : format = %s..."
 msgstr ""
 
-#: src/saveplay.c:1790
+#: src/saveplay.c:1765
 #, c-format
 msgid "Saving frames 1 to %d%s as \"%s\" : encoder %s : format = %s..."
 msgstr ""
 
-#: src/saveplay.c:1909
+#: src/saveplay.c:1890
 msgid "Saving [can take a long time]"
 msgstr ""
 
-#: src/saveplay.c:2057
+#: src/saveplay.c:2044
 msgid ""
 "\n"
 "\n"
 "Encoder error - output file was not created !\n"
 msgstr ""
 
-#: src/saveplay.c:2094
+#: src/saveplay.c:2081
 msgid "Clearing letterbox"
 msgstr ""
 
-#: src/saveplay.c:2183
+#: src/saveplay.c:2168
 #, c-format
 msgid "File size was %s\n"
 msgstr ""
 
-#: src/saveplay.c:2284
+#: src/saveplay.c:2265
 msgid "recording aborted by preview.\n"
 msgstr ""
 
-#: src/saveplay.c:2288
+#: src/saveplay.c:2268
 msgid "recording aborted by clipboard playback.\n"
 msgstr ""
 
-#: src/saveplay.c:2291
+#: src/saveplay.c:2270
 msgid "Recording performance..."
 msgstr ""
 
-#: src/saveplay.c:3293
+#: src/saveplay.c:3251
 #, c-format
 msgid "Average FPS was %.4f\n"
 msgstr ""
 
-#: src/saveplay.c:3299
+#: src/saveplay.c:3256
 msgid ""
 "\n"
 "\n"
@@ -3965,16 +3954,21 @@
 "and resize all frames to the current size.\n"
 msgstr ""
 
-#: src/saveplay.c:3479
+#: src/saveplay.c:3429
 msgid "Unknown"
 msgstr ""
 
-#: src/saveplay.c:3588 src/saveplay.c:4585
+#: src/saveplay.c:3538 src/saveplay.c:4502
 #, c-format
 msgid "Untitled%d"
 msgstr ""
 
-#: src/saveplay.c:3633
+#: src/saveplay.c:3567
+#, c-format
+msgid "%d frames are enough !\n"
+msgstr ""
+
+#: src/saveplay.c:3579
 #, c-format
 msgid ""
 "\n"
@@ -3982,7 +3976,7 @@
 "Bad things may happen with this clip.\n"
 msgstr ""
 
-#: src/saveplay.c:3723
+#: src/saveplay.c:3667
 #, c-format
 msgid ""
 "\n"
@@ -3990,73 +3984,73 @@
 "Default can be set in Tools | Preferences | Misc.\n"
 msgstr ""
 
-#: src/saveplay.c:3735
+#: src/saveplay.c:3677
 #, c-format
 msgid "Playback speed was adjusted to %.3f frames per second to fit audio.\n"
 msgstr ""
 
-#: src/saveplay.c:3754
+#: src/saveplay.c:3694
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d *bpp=Greyscale* fps=%.3f\n"
 "Audio:"
 msgstr ""
 
-#: src/saveplay.c:3758 src/saveplay.c:4762
+#: src/saveplay.c:3698 src/saveplay.c:4671
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d bpp=%d fps=%.3f\n"
 "Audio:"
 msgstr ""
 
-#: src/saveplay.c:3762 src/saveplay.c:4766
+#: src/saveplay.c:3703 src/saveplay.c:4676
 #, c-format
 msgid "%s none\n"
 msgstr ""
 
-#: src/saveplay.c:3774
+#: src/saveplay.c:3714
 #, c-format
 msgid " - Author: %s\n"
 msgstr ""
 
-#: src/saveplay.c:3779
+#: src/saveplay.c:3717
 #, c-format
 msgid " - Title: %s\n"
 msgstr ""
 
-#: src/saveplay.c:3784
+#: src/saveplay.c:3720
 #, c-format
 msgid " - Comment: %s\n"
 msgstr ""
 
-#: src/saveplay.c:3897
+#: src/saveplay.c:3829
 #, c-format
 msgid "Saving frame %d as %s..."
 msgstr ""
 
-#: src/saveplay.c:3996
+#: src/saveplay.c:3924
 #, c-format
 msgid "Backing up %s to %s"
 msgstr ""
 
-#: src/saveplay.c:4049
+#: src/saveplay.c:3975
 msgid "Backing up"
 msgstr ""
 
-#: src/saveplay.c:4083
+#: src/saveplay.c:4009
 msgid "performance data was backed up..."
 msgstr ""
 
-#: src/saveplay.c:4661
+#: src/saveplay.c:4574
 #, c-format
 msgid "Restoring %s..."
 msgstr ""
 
-#: src/saveplay.c:4692
+#: src/saveplay.c:4603
 msgid "Restoring"
 msgstr ""
 
-#: src/saveplay.c:4714
+#: src/saveplay.c:4625
 #, c-format
 msgid ""
 "\n"
@@ -4066,22 +4060,22 @@
 msgstr ""
 
 #. TRANSLATORS: rec(ord) %.2f M(ega)B(ytes)
-#: src/saveplay.c:5207
+#: src/saveplay.c:5118
 #, c-format
 msgid "rec %.2f MB"
 msgstr ""
 
-#: src/saveplay.c:5213
+#: src/saveplay.c:5123
 #, c-format
 msgid "!rec %.2f MB"
 msgstr ""
 
 #. TRANSLATORS: rec(ord) ?? M(ega)B(ytes)
-#: src/saveplay.c:5216
+#: src/saveplay.c:5126
 msgid "rec ?? MB"
 msgstr ""
 
-#: src/saveplay.c:5241
+#: src/saveplay.c:5151
 #, c-format
 msgid ""
 "\n"
@@ -4089,54 +4083,72 @@
 "Record stop level can be set in Preferences.\n"
 msgstr ""
 
-#: src/saveplay.c:5535
+#: src/saveplay.c:5447
 msgid ""
 "\n"
 "Files from a previous run of LiVES were found.\n"
 "Do you want to attempt to recover them ?\n"
 msgstr ""
 
-#: src/saveplay.c:5557
+#: src/saveplay.c:5469
 msgid "Recovering files"
 msgstr ""
 
-#: src/saveplay.c:5560
+#: src/saveplay.c:5472
 msgid "Recovering files..."
 msgstr ""
 
-#: src/dialogs.c:72
+#: src/dialogs.c:71
 msgid "Show affected _layouts"
 msgstr ""
 
-#: src/dialogs.c:128
+#: src/dialogs.c:113
+msgid ""
+"Do _not show this warning any more\n"
+"(can be turned back on from Preferences/Warnings)"
+msgstr ""
+
+#: src/dialogs.c:127
 msgid "_Recover disk space"
 msgstr ""
 
-#: src/dialogs.c:143
+#: src/dialogs.c:142
 msgid " _Advanced Settings >>"
 msgstr ""
 
-#: src/dialogs.c:184
+#: src/dialogs.c:183 src/dialogs.c:221
 msgid "LiVES: - Warning !"
 msgstr ""
 
 #: src/dialogs.c:194
-msgid "LiVES: - Question"
+msgid "LiVES: - Error !"
 msgstr ""
 
 #: src/dialogs.c:204
+msgid "LiVES: - Information"
+msgstr ""
+
+#: src/dialogs.c:230
+msgid "LiVES: - Question"
+msgstr ""
+
+#: src/dialogs.c:239
 msgid "LiVES: - File Error"
 msgstr ""
 
-#: src/dialogs.c:208
+#: src/dialogs.c:241
 msgid "_Abort"
 msgstr ""
 
-#: src/dialogs.c:213
+#: src/dialogs.c:246
 msgid "_Retry"
 msgstr ""
 
-#: src/dialogs.c:597
+#: src/dialogs.c:306
+msgid "Show _Details"
+msgstr ""
+
+#: src/dialogs.c:657
 #, c-format
 msgid ""
 "FREE SPACE IN THE PARTITION CONTAINING\n"
@@ -4147,7 +4159,7 @@
 "(Disk warning levels can be configured in Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:615
+#: src/dialogs.c:676
 #, c-format
 msgid ""
 "Free space in the partition containing\n"
@@ -4159,11 +4171,11 @@
 "Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:627
+#: src/dialogs.c:688
 msgid "Audio players cannot be switched during playback."
 msgstr ""
 
-#: src/dialogs.c:632
+#: src/dialogs.c:694
 msgid ""
 "\n"
 "\n"
@@ -4171,46 +4183,46 @@
 "Please try closing some other applications first.\n"
 msgstr ""
 
-#: src/dialogs.c:752
+#: src/dialogs.c:820
 msgid "Processing has been paused."
 msgstr ""
 
-#: src/dialogs.c:937
+#: src/dialogs.c:1002
 #, c-format
 msgid ""
 "\n"
 "%s%d%% done. Time remaining: %u sec%s\n"
 msgstr ""
 
-#: src/dialogs.c:1335
+#: src/dialogs.c:1391
 #, c-format
 msgid ""
 "\n"
 "%d/%d frames opened. Time remaining %u sec.\n"
 msgstr ""
 
-#: src/dialogs.c:1337
+#: src/dialogs.c:1393
 #, c-format
 msgid ""
 "\n"
 "%d/%d frames opened.\n"
 msgstr ""
 
-#: src/dialogs.c:1341
+#: src/dialogs.c:1396
 #, c-format
 msgid ""
 "\n"
 "%d frames opened.\n"
 msgstr ""
 
-#: src/dialogs.c:1940
+#: src/dialogs.c:1993
 #, c-format
 msgid ""
 "\n"
 "Time remaining: %d sec"
 msgstr ""
 
-#: src/dialogs.c:1988
+#: src/dialogs.c:2040
 #, c-format
 msgid ""
 "\n"
@@ -4218,7 +4230,7 @@
 "Please close a file and then try again."
 msgstr ""
 
-#: src/dialogs.c:1994
+#: src/dialogs.c:2047
 #, c-format
 msgid ""
 "LiVES was unable to write to its temporary directory.\n"
@@ -4230,27 +4242,27 @@
 "Please make sure you can write to this directory."
 msgstr ""
 
-#: src/dialogs.c:2005
+#: src/dialogs.c:2059
 msgid ""
 "\n"
 "LiVES currently requires either 'mplayer', 'mplayer2', or 'sox' to function. "
 "Please install one or other of these, and try again.\n"
 msgstr ""
 
-#: src/dialogs.c:2010
+#: src/dialogs.c:2064
 msgid ""
 "Audio was not loaded; please install mplayer or mplayer2 if you expected "
 "audio for this clip.\n"
 msgstr ""
 
-#: src/dialogs.c:2014
+#: src/dialogs.c:2069
 msgid ""
 "Audio resampling is required for this format.\n"
 "Please install 'sox'\n"
 "Or switch to another encoder format in Tools | Preferences | Encoding\n"
 msgstr ""
 
-#: src/dialogs.c:2019
+#: src/dialogs.c:2075
 msgid ""
 "\n"
 "\n"
@@ -4258,19 +4270,19 @@
 "Please set the audio codec in Tools|Preferences|Encoding\n"
 msgstr ""
 
-#: src/dialogs.c:2024
+#: src/dialogs.c:2080
 msgid ""
 "This layout includes generated frames.\n"
 "It cannot be saved, you must render it to a clip first.\n"
 msgstr ""
 
-#: src/dialogs.c:2029
+#: src/dialogs.c:2085
 msgid ""
 "This layout includes generated or recorded audio.\n"
 "It cannot be saved, you must render it to a clip first.\n"
 msgstr ""
 
-#: src/dialogs.c:2039 src/dialogs.c:2137
+#: src/dialogs.c:2095 src/dialogs.c:2189
 #, c-format
 msgid ""
 "\n"
@@ -4278,83 +4290,83 @@
 "Due to restrictions in the %s format\n"
 msgstr ""
 
-#: src/dialogs.c:2059
+#: src/dialogs.c:2115
 msgid ""
 "LiVES recommends the following settings:\n"
 "\n"
 msgstr ""
 
-#: src/dialogs.c:2065 src/dialogs.c:2174 src/resample.c:850
+#: src/dialogs.c:2121 src/dialogs.c:2225 src/resample.c:839
 msgid ", signed"
 msgstr ""
 
-#: src/dialogs.c:2066 src/dialogs.c:2175 src/resample.c:853
+#: src/dialogs.c:2122 src/dialogs.c:2226 src/resample.c:841
 msgid ", unsigned"
 msgstr ""
 
-#: src/dialogs.c:2070 src/dialogs.c:2179 src/resample.c:858
+#: src/dialogs.c:2126 src/dialogs.c:2230 src/resample.c:846
 msgid ", little-endian"
 msgstr ""
 
-#: src/dialogs.c:2071 src/dialogs.c:2180 src/resample.c:861
+#: src/dialogs.c:2127 src/dialogs.c:2231 src/resample.c:848
 msgid ", big-endian"
 msgstr ""
 
-#: src/dialogs.c:2077
+#: src/dialogs.c:2132
 #, c-format
 msgid "Use an audio rate of %d Hz%s%s\n"
 msgstr ""
 
-#: src/dialogs.c:2085
+#: src/dialogs.c:2140
 #, c-format
 msgid "Set video rate to %.3f frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:2089
+#: src/dialogs.c:2143
 #, c-format
 msgid "Set video rate to %d:%d frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:2094 src/dialogs.c:2209
+#: src/dialogs.c:2148 src/dialogs.c:2258
 #, c-format
 msgid "Set video size to %d x %d pixels\n"
 msgstr ""
 
-#: src/dialogs.c:2102 src/dialogs.c:2208
+#: src/dialogs.c:2156 src/dialogs.c:2257
 msgid ""
 "\n"
 "You may wish to:\n"
 msgstr ""
 
-#: src/dialogs.c:2105 src/dialogs.c:2200
+#: src/dialogs.c:2159 src/dialogs.c:2249
 #, c-format
 msgid "resize video to %d x %d pixels\n"
 msgstr ""
 
-#: src/dialogs.c:2110
+#: src/dialogs.c:2163
 msgid "disable audio, since the target encoder cannot encode audio\n"
 msgstr ""
 
-#: src/dialogs.c:2170
+#: src/dialogs.c:2221
 msgid "LiVES must:\n"
 msgstr ""
 
-#: src/dialogs.c:2185
+#: src/dialogs.c:2235
 #, c-format
 msgid "resample audio to %d Hz%s%s\n"
 msgstr ""
 
-#: src/dialogs.c:2192
+#: src/dialogs.c:2242
 #, c-format
 msgid "resample video to %.3f frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:2196
+#: src/dialogs.c:2245
 #, c-format
 msgid "resample video to %d:%d frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:2215
+#: src/dialogs.c:2263
 msgid ""
 "\n"
 "You will be able to undo these changes afterwards.\n"
@@ -4363,14 +4375,14 @@
 "\n"
 msgstr ""
 
-#: src/dialogs.c:2218
+#: src/dialogs.c:2265
 msgid ""
 "\n"
 "Changes applied to the selection will not be permanent.\n"
 "\n"
 msgstr ""
 
-#: src/dialogs.c:2237
+#: src/dialogs.c:2285
 msgid ""
 "\n"
 "\n"
@@ -4379,7 +4391,7 @@
 "Try recording for just a selection of the file."
 msgstr ""
 
-#: src/dialogs.c:2244
+#: src/dialogs.c:2293
 msgid ""
 "The playback speed (fps), or the audio rate\n"
 " of the clipboard does not match\n"
@@ -4390,7 +4402,7 @@
 "Please press Cancel to abort the insert, or OK to continue."
 msgstr ""
 
-#: src/dialogs.c:2253
+#: src/dialogs.c:2304
 #, c-format
 msgid ""
 "When opening a yuvmpeg stream, you should first create a fifo file in:\n"
@@ -4403,11 +4415,11 @@
 "click Cancel."
 msgstr ""
 
-#: src/dialogs.c:2305
+#: src/dialogs.c:2356
 msgid "Show Keys"
 msgstr ""
 
-#: src/dialogs.c:2306
+#: src/dialogs.c:2358
 msgid ""
 "You can use the following keys during playback to control LiVES:-\n"
 "\n"
@@ -4449,11 +4461,11 @@
 "g                             ping pong loops\n"
 msgstr ""
 
-#: src/dialogs.c:2313
+#: src/dialogs.c:2365
 msgid "Multitrack Keys"
 msgstr ""
 
-#: src/dialogs.c:2314
+#: src/dialogs.c:2367
 msgid ""
 "You can use the following keys to control the multitrack window:-\n"
 "\n"
@@ -4475,18 +4487,18 @@
 "For other keys, see the menus.\n"
 msgstr ""
 
-#: src/dialogs.c:2322
+#: src/dialogs.c:2375
 msgid "Message History"
 msgstr ""
 
-#: src/dialogs.c:2335
+#: src/dialogs.c:2388
 #, c-format
 msgid ""
 "After upgrading/installing, you may need to adjust the <prefix_dir> setting "
 "in your %s file"
 msgstr ""
 
-#: src/dialogs.c:2344
+#: src/dialogs.c:2399
 #, c-format
 msgid ""
 "\n"
@@ -4497,25 +4509,25 @@
 "or change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/dialogs.c:2352
+#: src/dialogs.c:2408
 msgid ""
 "Sorry, unknown audio type.\n"
 "\n"
 " (Filenames must end in .mp3, .ogg, .wav, .mod, .xm or .it)"
 msgstr ""
 
-#: src/dialogs.c:2353
+#: src/dialogs.c:2409
 msgid "failed (unknown type)\n"
 msgstr ""
 
-#: src/dialogs.c:2358
+#: src/dialogs.c:2415
 msgid ""
 "\n"
 "Do you wish to remove the layout files associated with this set ?\n"
 "(They will not be usable without the set).\n"
 msgstr ""
 
-#: src/dialogs.c:2363
+#: src/dialogs.c:2421
 #, c-format
 msgid ""
 "\n"
@@ -4524,7 +4536,7 @@
 "Click Cancel to pick a new name.\n"
 msgstr ""
 
-#: src/dialogs.c:2370
+#: src/dialogs.c:2429
 msgid ""
 "\n"
 "Frames from this clip are used in some multitrack layouts.\n"
@@ -4532,7 +4544,7 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2374
+#: src/dialogs.c:2433
 msgid ""
 "\n"
 "Audio from this clip is used in some multitrack layouts.\n"
@@ -4540,7 +4552,7 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2378
+#: src/dialogs.c:2438
 #, c-format
 msgid ""
 "\n"
@@ -4551,7 +4563,7 @@
 "Otherwise click Cancel to skip loading this file.\n"
 msgstr ""
 
-#: src/dialogs.c:2385
+#: src/dialogs.c:2446
 #, c-format
 msgid ""
 "\n"
@@ -4561,7 +4573,7 @@
 "The clip could not be loaded.\n"
 msgstr ""
 
-#: src/dialogs.c:2392
+#: src/dialogs.c:2455
 msgid ""
 "\n"
 "Dear user, the jack developers decided to remove the -Z option from jackd.\n"
@@ -4569,7 +4581,7 @@
 "Alternately, select a different audio player in Preferences.\n"
 msgstr ""
 
-#: src/dialogs.c:2396
+#: src/dialogs.c:2460
 msgid ""
 "\n"
 "Unable to start up jack. Please ensure that alsa is set up correctly on your "
@@ -4578,13 +4590,13 @@
 "Automatic jack startup will be disabled now.\n"
 msgstr ""
 
-#: src/dialogs.c:2402
+#: src/dialogs.c:2466
 msgid ""
 "\n"
 "Unable to connect to jack server. Please start jack before starting LiVES\n"
 msgstr ""
 
-#: src/dialogs.c:2411
+#: src/dialogs.c:2475
 #, c-format
 msgid ""
 "\n"
@@ -4595,13 +4607,13 @@
 "%s\n"
 msgstr ""
 
-#: src/dialogs.c:2418
+#: src/dialogs.c:2482
 msgid ""
 "\n"
 "Alternately, you can restart LiVES and select another audio player.\n"
 msgstr ""
 
-#: src/dialogs.c:2423
+#: src/dialogs.c:2488
 #, c-format
 msgid ""
 "\n"
@@ -4611,7 +4623,7 @@
 "It is recommended to increase it to at least %d MB"
 msgstr ""
 
-#: src/dialogs.c:2429
+#: src/dialogs.c:2496
 #, c-format
 msgid ""
 "\n"
@@ -4620,7 +4632,7 @@
 "Do you wish to delete them ?\n"
 msgstr ""
 
-#: src/dialogs.c:2436
+#: src/dialogs.c:2504
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for multitrack undo.\n"
@@ -4628,7 +4640,7 @@
 "using Preferences/Multitrack/Undo Memory\n"
 msgstr ""
 
-#: src/dialogs.c:2440
+#: src/dialogs.c:2508
 msgid ""
 "\n"
 "Out of memory for undo.\n"
@@ -4636,63 +4648,63 @@
 "using Preferences/Multitrack/Undo Memory\n"
 msgstr ""
 
-#: src/dialogs.c:2444
+#: src/dialogs.c:2512
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for the multitrack undo buffer.\n"
 msgstr ""
 
-#: src/dialogs.c:2446
+#: src/dialogs.c:2514
 msgid "or enter a smaller value.\n"
 msgstr ""
 
-#: src/dialogs.c:2448
+#: src/dialogs.c:2516
 msgid "Try again from the clip editor, try closing some other applications\n"
 msgstr ""
 
-#: src/dialogs.c:2449
+#: src/dialogs.c:2517
 msgid "Try closing some other applications\n"
 msgstr ""
 
-#: src/dialogs.c:2460
+#: src/dialogs.c:2529
 msgid ""
 "Multitrack is set to 0 audio channels, but this layout has audio.\n"
 "You should adjust the audio settings from the Tools menu.\n"
 msgstr ""
 
-#: src/dialogs.c:2464
+#: src/dialogs.c:2534
 msgid ""
 "The current layout has audio, so audio channels may not be set to zero.\n"
 msgstr ""
 
-#: src/dialogs.c:2468
+#: src/dialogs.c:2539
 msgid ""
 "Multitrack audio preview is only available with the\n"
 "\"jack\" or \"pulse audio\" audio player.\n"
 "You can set this in Tools|Preferences|Playback."
 msgstr ""
 
-#: src/dialogs.c:2472
+#: src/dialogs.c:2545
 msgid ""
 "Errors were detected in the layout (which may be due to transferring from "
 "another system, or from an older version of LiVES).\n"
 "Should I try to repair the disk copy of the layout ?\n"
 msgstr ""
 
-#: src/dialogs.c:2476
+#: src/dialogs.c:2549
 msgid ""
 "LiVES was unable to load the layout.\n"
 "Sorry.\n"
 msgstr ""
 
-#: src/dialogs.c:2482
+#: src/dialogs.c:2555
 msgid ""
 "\n"
 "\n"
 "Audio rate must be greater than 0.\n"
 msgstr ""
 
-#: src/dialogs.c:2486
+#: src/dialogs.c:2559
 msgid ""
 "\n"
 "Event list will be very large\n"
@@ -4700,14 +4712,14 @@
 "Are you sure you wish to view it ?\n"
 msgstr ""
 
-#: src/dialogs.c:2491
+#: src/dialogs.c:2564
 msgid ""
 "\n"
 "\n"
 "You must install 'dvgrab' to use this function.\n"
 msgstr ""
 
-#: src/dialogs.c:2496
+#: src/dialogs.c:2570
 msgid ""
 "\n"
 "\n"
@@ -4716,25 +4728,25 @@
 "You may need to select one of these in Tools/Preferences/Playback.\n"
 msgstr ""
 
-#: src/dialogs.c:2500
+#: src/dialogs.c:2574
 msgid "Video playback plugin failed to initialise palette !\n"
 msgstr ""
 
-#: src/dialogs.c:2504
+#: src/dialogs.c:2579
 msgid "Decoder plugin failed to initialise palette !\n"
 msgstr ""
 
-#: src/dialogs.c:2509
+#: src/dialogs.c:2584
 msgid "Unable to set framerate of video plugin\n"
 msgstr ""
 
-#: src/dialogs.c:2514
+#: src/dialogs.c:2590
 msgid ""
 "After a crash, it is advisable to clean up the disk with\n"
 "File|Clean up disk space\n"
 msgstr ""
 
-#: src/dialogs.c:2526
+#: src/dialogs.c:2604
 #, c-format
 msgid ""
 "Stream frame size is too large for your network buffers.\n"
@@ -4743,33 +4755,33 @@
 "echo %d > /proc/sys/net/core/rmem_max\n"
 msgstr ""
 
-#: src/dialogs.c:2714
+#: src/dialogs.c:2800
 msgid "cancelled.\n"
 msgstr ""
 
-#: src/dialogs.c:2721
+#: src/dialogs.c:2805
 msgid "failed.\n"
 msgstr ""
 
-#: src/dialogs.c:2728
+#: src/dialogs.c:2810
 msgid "done.\n"
 msgstr ""
 
-#: src/dialogs.c:2732
+#: src/dialogs.c:2814
 msgid "error in file. Failed.\n"
 msgstr ""
 
-#: src/dialogs.c:2766 src/dialogs.c:2815 src/dialogs.c:2839
+#: src/dialogs.c:2848 src/dialogs.c:2897 src/dialogs.c:2921
 #, c-format
 msgid "Additional info: %s\n"
 msgstr ""
 
-#: src/dialogs.c:2769
+#: src/dialogs.c:2851
 #, c-format
 msgid "The error value was %d%s\n"
 msgstr ""
 
-#: src/dialogs.c:2772
+#: src/dialogs.c:2854
 #, c-format
 msgid ""
 "\n"
@@ -4779,7 +4791,7 @@
 "%s%s%s"
 msgstr ""
 
-#: src/dialogs.c:2818
+#: src/dialogs.c:2900
 #, c-format
 msgid ""
 "\n"
@@ -4789,7 +4801,7 @@
 "%s"
 msgstr ""
 
-#: src/dialogs.c:2842
+#: src/dialogs.c:2924
 #, c-format
 msgid ""
 "\n"
@@ -4799,7 +4811,7 @@
 "%s"
 msgstr ""
 
-#: src/dialogs.c:2886
+#: src/dialogs.c:2968
 #, c-format
 msgid ""
 "\n"
@@ -4808,7 +4820,7 @@
 "Please check for possible error causes.\n"
 msgstr ""
 
-#: src/dialogs.c:2890
+#: src/dialogs.c:2971
 #, c-format
 msgid ""
 "\n"
@@ -4818,7 +4830,7 @@
 "%s.\n"
 msgstr ""
 
-#: src/dialogs.c:2921
+#: src/dialogs.c:3002
 #, c-format
 msgid ""
 "\n"
@@ -4827,7 +4839,7 @@
 "Please check for possible error causes.\n"
 msgstr ""
 
-#: src/dialogs.c:2925
+#: src/dialogs.c:3005
 #, c-format
 msgid ""
 "\n"
@@ -4837,12 +4849,12 @@
 "%s.\n"
 msgstr ""
 
-#: src/dialogs.c:2993
+#: src/dialogs.c:3073
 #, c-format
 msgid "Value for \"%s\" could not be read."
 msgstr ""
 
-#: src/dialogs.c:3011
+#: src/dialogs.c:3091
 #, c-format
 msgid ""
 "\n"
@@ -4851,7 +4863,7 @@
 "Please check your system for errors.\n"
 msgstr ""
 
-#: src/dialogs.c:3020
+#: src/dialogs.c:3100
 #, c-format
 msgid ""
 "\n"
@@ -4860,7 +4872,7 @@
 "Please check the file permissions and try again."
 msgstr ""
 
-#: src/dialogs.c:3027
+#: src/dialogs.c:3109
 #, c-format
 msgid ""
 "\n"
@@ -4869,7 +4881,7 @@
 "Please check the directory permissions and try again."
 msgstr ""
 
-#: src/dialogs.c:3034
+#: src/dialogs.c:3116
 #, c-format
 msgid ""
 "\n"
@@ -4877,14 +4889,14 @@
 "%s\n"
 msgstr ""
 
-#: src/dialogs.c:3041
+#: src/dialogs.c:3123
 msgid ""
 "\n"
 "Abort and exit immediately from LiVES\n"
 "Are you sure ?\n"
 msgstr ""
 
-#: src/dialogs.c:3047
+#: src/dialogs.c:3129
 #, c-format
 msgid ""
 "\n"
@@ -4892,13 +4904,13 @@
 "Please select another encoder from the list.\n"
 msgstr ""
 
-#: src/dialogs.c:3056
+#: src/dialogs.c:3139
 msgid ""
 "\n"
 "This card is already in use and cannot be opened multiple times.\n"
 msgstr ""
 
-#: src/dialogs.c:3061
+#: src/dialogs.c:3145
 #, c-format
 msgid ""
 "\n"
@@ -4908,27 +4920,27 @@
 "- Check if the device actually exists.\n"
 msgstr ""
 
-#: src/dialogs.c:3068
+#: src/dialogs.c:3153
 msgid ""
 "\n"
 "This file already has subtitles loaded.\n"
 "Do you wish to overwrite the existing subtitles ?\n"
 msgstr ""
 
-#: src/dialogs.c:3072
+#: src/dialogs.c:3157
 msgid ""
 "\n"
 "LiVES currently only supports subtitles of type .srt and .sub.\n"
 msgstr ""
 
-#: src/dialogs.c:3076
+#: src/dialogs.c:3161
 msgid ""
 "\n"
 "Erase all subtitles from this clip.\n"
 "Are you sure ?\n"
 msgstr ""
 
-#: src/dialogs.c:3082
+#: src/dialogs.c:3168
 #, c-format
 msgid ""
 "\n"
@@ -4937,14 +4949,14 @@
 "or OK to continue and save as type \"%s\"\n"
 msgstr ""
 
-#: src/dialogs.c:3089
+#: src/dialogs.c:3176
 msgid ""
 "\n"
 "Do you wish to move the current clip sets to the new directory ?\n"
 "(If unsure, click Yes)\n"
 msgstr ""
 
-#: src/dialogs.c:3093
+#: src/dialogs.c:3181
 #, c-format
 msgid ""
 "\n"
@@ -4955,19 +4967,19 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:3099
+#: src/dialogs.c:3188
 msgid ""
 "\n"
 "No video input devices could be found.\n"
 msgstr ""
 
-#: src/dialogs.c:3103
+#: src/dialogs.c:3192
 msgid ""
 "\n"
 "All video input devices are already in use.\n"
 msgstr ""
 
-#: src/dialogs.c:3107
+#: src/dialogs.c:3196
 msgid ""
 "\n"
 "\n"
@@ -4975,15 +4987,14 @@
 "DO NOT SHUT DOWN OR CLOSE LIVES !\n"
 msgstr ""
 
-#: src/dialogs.c:3127
+#: src/dialogs.c:3203
 #, c-format
 msgid ""
 "No clips were recovered for set (%s).\n"
 "Please check the spelling of the set name and try again.\n"
 msgstr ""
 
-#. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:3136
+#: src/dialogs.c:3214
 #, c-format
 msgid ""
 "\n"
@@ -4995,7 +5006,7 @@
 msgstr ""
 
 #. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:3144
+#: src/dialogs.c:3222
 #, c-format
 msgid ""
 "\n"
@@ -5004,34 +5015,34 @@
 "\n"
 msgstr ""
 
-#: src/dialogs.c:3150
+#: src/dialogs.c:3228
 msgid ""
 "\n"
 "You must have autolives.pl installed and in your path to use this toy.\n"
 "Consult your package distributor.\n"
 msgstr ""
 
-#: src/dialogs.c:3154
+#: src/dialogs.c:3232
 msgid ""
 "\n"
 "You must have a minimum of one clip loaded to use this toy.\n"
 msgstr ""
 
-#: src/dialogs.c:3158
+#: src/dialogs.c:3236
 msgid ""
 "\n"
 "LiVES lost its connection to jack and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:3162
+#: src/dialogs.c:3240
 msgid ""
 "\n"
 "LiVES lost its connection to pulseaudio and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:3175
+#: src/dialogs.c:3254
 #, c-format
 msgid ""
 "\n"
@@ -5040,543 +5051,543 @@
 "Do you wish to allow this (for this session only) ?\n"
 msgstr ""
 
-#: src/effects.c:60
+#: src/effects.c:61
 msgid "generator"
 msgstr ""
 
-#: src/effects.c:61
+#: src/effects.c:62
 msgid "Generators"
 msgstr ""
 
-#: src/effects.c:63
+#: src/effects.c:64
 msgid "audio generator"
 msgstr ""
 
-#: src/effects.c:64
+#: src/effects.c:65
 msgid "Audio Generators"
 msgstr ""
 
-#: src/effects.c:66
+#: src/effects.c:67
 msgid "audio/video generator"
 msgstr ""
 
-#: src/effects.c:67
+#: src/effects.c:68
 msgid "Audio/Video Generators"
 msgstr ""
 
-#: src/effects.c:69
+#: src/effects.c:70
 msgid "data generator"
 msgstr ""
 
-#: src/effects.c:70
+#: src/effects.c:71
 msgid "Data Generators"
 msgstr ""
 
-#: src/effects.c:72
+#: src/effects.c:73
 msgid "data visualiser"
 msgstr ""
 
-#: src/effects.c:73
+#: src/effects.c:74
 msgid "Data Visualisers"
 msgstr ""
 
-#: src/effects.c:75
+#: src/effects.c:76
 msgid "data processor"
 msgstr ""
 
-#: src/effects.c:76
+#: src/effects.c:77
 msgid "Data Processors"
 msgstr ""
 
-#: src/effects.c:78
+#: src/effects.c:79
 msgid "data source"
 msgstr ""
 
-#: src/effects.c:79
+#: src/effects.c:80
 msgid "Data Sources"
 msgstr ""
 
-#: src/effects.c:81
+#: src/effects.c:82
 msgid "transition"
 msgstr ""
 
-#: src/effects.c:82
+#: src/effects.c:83
 msgid "Transitions"
 msgstr ""
 
-#: src/effects.c:84
+#: src/effects.c:85
 msgid "effect"
 msgstr ""
 
-#: src/effects.c:87 src/rfx-builder.c:187
+#: src/effects.c:88 src/rfx-builder.c:187
 msgid "utility"
 msgstr ""
 
-#: src/effects.c:88
+#: src/effects.c:89
 msgid "Utilities"
 msgstr ""
 
-#: src/effects.c:90
+#: src/effects.c:91
 msgid "compositor"
 msgstr ""
 
-#: src/effects.c:91
+#: src/effects.c:92
 msgid "Compositors"
 msgstr ""
 
-#: src/effects.c:93
+#: src/effects.c:94
 msgid "tap"
 msgstr ""
 
-#: src/effects.c:94
+#: src/effects.c:95
 msgid "Taps"
 msgstr ""
 
-#: src/effects.c:96
+#: src/effects.c:97
 msgid "splitter"
 msgstr ""
 
-#: src/effects.c:97
+#: src/effects.c:98
 msgid "Splitters"
 msgstr ""
 
-#: src/effects.c:99
+#: src/effects.c:100
 msgid "converter"
 msgstr ""
 
-#: src/effects.c:100
+#: src/effects.c:101
 msgid "Converters"
 msgstr ""
 
-#: src/effects.c:102
+#: src/effects.c:103
 msgid "analyser"
 msgstr ""
 
-#: src/effects.c:103
+#: src/effects.c:104
 msgid "Analysers"
 msgstr ""
 
-#: src/effects.c:108
+#: src/effects.c:109
 msgid "audio/video"
 msgstr ""
 
-#: src/effects.c:109
+#: src/effects.c:110
 msgid "Audio/Video Transitions"
 msgstr ""
 
-#: src/effects.c:111
+#: src/effects.c:112
 msgid "video only"
 msgstr ""
 
-#: src/effects.c:112
+#: src/effects.c:113
 msgid "Video only Transitions"
 msgstr ""
 
-#: src/effects.c:114 src/multitrack.c:10740
+#: src/effects.c:115 src/multitrack.c:10962
 msgid "audio only"
 msgstr ""
 
-#: src/effects.c:115
+#: src/effects.c:116
 msgid "Audio only Transitions"
 msgstr ""
 
-#: src/effects.c:117 src/effects.c:120 src/multitrack.c:18757
+#: src/effects.c:118 src/effects.c:121 src/multitrack.c:19097
 msgid "audio"
 msgstr ""
 
-#: src/effects.c:118
+#: src/effects.c:119
 msgid "Audio Mixers"
 msgstr ""
 
-#: src/effects.c:121
+#: src/effects.c:122
 msgid "Audio Effects"
 msgstr ""
 
-#: src/effects.c:123
+#: src/effects.c:124
 msgid "video"
 msgstr ""
 
-#: src/effects.c:124
+#: src/effects.c:125
 msgid "Video Effects"
 msgstr ""
 
-#: src/effects.c:126
+#: src/effects.c:127
 msgid "audio volume controller"
 msgstr ""
 
-#: src/effects.c:127
+#: src/effects.c:128
 msgid "Audio Volume Controllers"
 msgstr ""
 
-#: src/effects.c:129
+#: src/effects.c:130
 msgid "video analyser"
 msgstr ""
 
-#: src/effects.c:130
+#: src/effects.c:131
 msgid "Video analysers"
 msgstr ""
 
-#: src/effects.c:132
+#: src/effects.c:133
 msgid "audio analyser"
 msgstr ""
 
-#: src/effects.c:133
+#: src/effects.c:134
 msgid "Audio Analysers"
 msgstr ""
 
-#: src/effects.c:137 src/plugins.c:2559 src/plugins.c:2573
+#: src/effects.c:138 src/plugins.c:2507 src/plugins.c:2521
 msgid "unknown"
 msgstr ""
 
-#: src/effects.c:238
+#: src/effects.c:235
 #, c-format
 msgid "%s all frames..."
 msgstr ""
 
-#: src/effects.c:243
+#: src/effects.c:239
 #, c-format
 msgid "%s clipboard into frames %d to %d..."
 msgstr ""
 
-#: src/effects.c:250
+#: src/effects.c:245
 #, c-format
 msgid "%s to clipboard..."
 msgstr ""
 
-#: src/effects.c:254
+#: src/effects.c:248
 #, c-format
 msgid "%s to new clip..."
 msgstr ""
 
-#: src/effects.c:259
+#: src/effects.c:252
 #, c-format
 msgid "%s frames %d to %d..."
 msgstr ""
 
-#: src/effects.c:290
+#: src/effects.c:283
 #, c-format
 msgid "%s clipboard with selection"
 msgstr ""
 
-#: src/effects.c:295
+#: src/effects.c:287
 #, c-format
 msgid "%s to clipboard"
 msgstr ""
 
-#: src/effects.c:299
+#: src/effects.c:290
 #, c-format
 msgid "%s to new clip"
 msgstr ""
 
-#: src/effects.c:304
+#: src/effects.c:294
 #, c-format
 msgid "%s frames %d to %d"
 msgstr ""
 
-#: src/effects.c:456 src/effects.c:523
+#: src/effects.c:443 src/effects.c:507
 msgid ""
 "\n"
 "No frames were generated.\n"
 msgstr ""
 
-#: src/effects-weed.c:431
+#: src/effects-weed.c:452
 msgid "integer"
 msgstr ""
 
-#: src/effects-weed.c:432
+#: src/effects-weed.c:454
 msgid "int64"
 msgstr ""
 
-#: src/effects-weed.c:433
+#: src/effects-weed.c:456
 msgid "boolean"
 msgstr ""
 
-#: src/effects-weed.c:434
+#: src/effects-weed.c:458
 msgid "double"
 msgstr ""
 
-#: src/effects-weed.c:435
+#: src/effects-weed.c:460
 msgid "string"
 msgstr ""
 
-#: src/effects-weed.c:436
+#: src/effects-weed.c:462
 msgid "pointer"
 msgstr ""
 
-#: src/effects-weed.c:4591
+#: src/effects-weed.c:4581
 #, c-format
 msgid "Error: plugin %s has no weed_setup() function.\n"
 msgstr ""
 
-#: src/effects-weed.c:4606
+#: src/effects-weed.c:4595
 #, c-format
 msgid "No usable filters found in plugin %s\n"
 msgstr ""
 
-#: src/effects-weed.c:4680
+#: src/effects-weed.c:4668
 #, c-format
 msgid "Found duplicate plugin %s"
 msgstr ""
 
-#: src/effects-weed.c:4734
+#: src/effects-weed.c:4723
 #, c-format
 msgid ""
 "Info: Unable to load plugin %s\n"
 "Error was: %s\n"
 msgstr ""
 
-#: src/effects-weed.c:4737 src/effects-weed.c:5858
+#: src/effects-weed.c:4726 src/effects-weed.c:5847
 msgid "Some plugin directories"
 msgstr ""
 
 #. TRANSLATORS: example " - LADSPA plugins -"
-#: src/effects-weed.c:4812 src/rte_window.c:2105
+#: src/effects-weed.c:4801 src/rte_window.c:2107
 #, c-format
 msgid " - %s plugins -"
 msgstr ""
 
-#: src/effects-weed.c:5012
+#: src/effects-weed.c:4998
 #, c-format
 msgid "Successfully loaded %d Weed filters\n"
 msgstr ""
 
-#: src/effects-weed.c:5177
+#: src/effects-weed.c:5162
 #, c-format
 msgid "Invalid compound effect %s - has conflicting target_fps\n"
 msgstr ""
 
-#: src/effects-weed.c:5197
+#: src/effects-weed.c:5182
 #, c-format
 msgid "Invalid compound effect %s - has multiple transition parameters\n"
 msgstr ""
 
-#: src/effects-weed.c:5211
+#: src/effects-weed.c:5196
 #, c-format
 msgid "Invalid compound effect %s - has multiple master volume parameters\n"
 msgstr ""
 
-#: src/effects-weed.c:5346
+#: src/effects-weed.c:5329
 #, c-format
 msgid "Invalid compound effect %s - must have >1 sub filters\n"
 msgstr ""
 
-#: src/effects-weed.c:5366
+#: src/effects-weed.c:5349
 #, c-format
 msgid "Invalid effect %s found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5381
+#: src/effects-weed.c:5364
 #, c-format
 msgid "Invalid default found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5392
+#: src/effects-weed.c:5375
 #, c-format
 msgid "Invalid filter %d for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5406
+#: src/effects-weed.c:5389
 #, c-format
 msgid "Invalid param %d for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5433
+#: src/effects-weed.c:5416
 #, c-format
 msgid ""
 "Invalid number of values for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5467
+#: src/effects-weed.c:5450
 #, c-format
 msgid ""
 "Invalid non-boolean value for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5500
+#: src/effects-weed.c:5483
 #, c-format
 msgid "Invalid param link found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5511
+#: src/effects-weed.c:5494
 #, c-format
 msgid ""
 "Invalid out filter %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5529
+#: src/effects-weed.c:5513
 #, c-format
 msgid ""
 "Invalid out param %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5541
+#: src/effects-weed.c:5526
 #, c-format
 msgid ""
 "Invalid non-boolean value for autoscale found in compound effect %s, line "
 "%d\n"
 msgstr ""
 
-#: src/effects-weed.c:5552
+#: src/effects-weed.c:5537
 #, c-format
 msgid ""
 "Invalid in filter %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5566
+#: src/effects-weed.c:5552
 #, c-format
 msgid ""
 "Invalid in param %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5594
+#: src/effects-weed.c:5581
 #, c-format
 msgid "Invalid channel link found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5605
+#: src/effects-weed.c:5592
 #, c-format
 msgid ""
 "Invalid out filter %d for link channels found in compound effect %s, line "
 "%d\n"
 msgstr ""
 
-#: src/effects-weed.c:5623
+#: src/effects-weed.c:5611
 #, c-format
 msgid ""
 "Invalid out channel %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5633
+#: src/effects-weed.c:5622
 #, c-format
 msgid ""
 "Invalid in filter %d for link channels found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5651
+#: src/effects-weed.c:5641
 #, c-format
 msgid ""
 "Invalid in channel %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5687
+#: src/effects-weed.c:5678
 #, c-format
 msgid "Compound:%s"
 msgstr ""
 
-#: src/effects-weed.c:5758
+#: src/effects-weed.c:5749
 #, c-format
 msgid "Successfully loaded %d compound filters\n"
 msgstr ""
 
-#: src/effects-weed.c:6591
+#: src/effects-weed.c:6570
 #, c-format
 msgid "Effect %s cannot be used with this audio player.\n"
 msgstr ""
 
-#: src/effects-weed.c:6737
+#: src/effects-weed.c:6718
 #, c-format
 msgid "Failed to start instance %s, error code %d\n"
 msgstr ""
 
-#: src/effects-weed.c:6814
+#: src/effects-weed.c:6797
 #, c-format
 msgid "Unable to start generator %s\n"
 msgstr ""
 
-#: src/effects-weed.c:7621
+#: src/effects-weed.c:7607
 #, c-format
 msgid "Failed to start generator %s\n"
 msgstr ""
 
-#: src/effects-weed.c:7718
+#: src/effects-weed.c:7701
 #, c-format
 msgid "Failed to start generator %s, error %d\n"
 msgstr ""
 
-#: src/effects-weed.c:9012
+#: src/effects-weed.c:8993
 #, c-format
 msgid "%s [unstable] (%s)"
 msgstr ""
 
-#: src/effects-data.c:3278
+#: src/effects-data.c:3234
 #, c-format
 msgid "ACTIVATE (%s)"
 msgstr ""
 
-#: src/effects-data.c:3548
+#: src/effects-data.c:3501
 msgid "ACTIVATE"
 msgstr ""
 
-#: src/effects-data.c:3876
+#: src/effects-data.c:3829
 #, c-format
 msgid "Key slot %d"
 msgstr ""
 
-#: src/effects-data.c:3998
+#: src/effects-data.c:3951
 msgid "Autoscale"
 msgstr ""
 
-#: src/effects-data.c:4089
+#: src/effects-data.c:4042
 msgid "Add another connection for this output parameter"
 msgstr ""
 
-#: src/effects-data.c:4102 src/effects-data.c:4151
+#: src/effects-data.c:4055 src/effects-data.c:4104
 msgid "Delete this connection"
 msgstr ""
 
-#: src/effects-data.c:4138
+#: src/effects-data.c:4091
 msgid "Add another connection for this output channel"
 msgstr ""
 
-#: src/effects-data.c:4223
+#: src/effects-data.c:4176
 msgid "Connected to -->"
 msgstr ""
 
-#: src/effects-data.c:4243
+#: src/effects-data.c:4196
 #, c-format
 msgid "%s - Alpha Channel Connections"
 msgstr ""
 
-#: src/effects-data.c:4316
+#: src/effects-data.c:4269
 #, c-format
 msgid "%s - Parameter Data Connections"
 msgstr ""
 
-#: src/effects-data.c:4336
+#: src/effects-data.c:4289
 msgid "Autoscale All"
 msgstr ""
 
-#: src/effects-data.c:4361 src/effects-data.c:4890
+#: src/effects-data.c:4314 src/effects-data.c:4841
 msgid "ACTIVATED"
 msgstr ""
 
-#: src/effects-data.c:4774
+#: src/effects-data.c:4726
 msgid "LiVES: - Parameter and Alpha Channel Connections"
 msgstr ""
 
-#: src/effects-data.c:4785
+#: src/effects-data.c:4736
 msgid "Auto Connect Channels"
 msgstr ""
 
-#: src/effects-data.c:4797
+#: src/effects-data.c:4748
 msgid "Auto Connect Parameters"
 msgstr ""
 
-#: src/effects-data.c:4807
+#: src/effects-data.c:4758
 msgid "Disconnect All"
 msgstr ""
 
-#: src/effects-data.c:4875
+#: src/effects-data.c:4826
 #, c-format
 msgid "Input channel is already connected from (%d,%d) %s"
 msgstr ""
 
-#: src/effects-data.c:4891
+#: src/effects-data.c:4842
 #, c-format
 msgid "Input parameter is already connected from (%d,%d) %s"
 msgstr ""
 
-#: src/effects-data.c:4899
+#: src/effects-data.c:4851
 msgid "Input and output parameters are not compatible"
 msgstr ""
 
@@ -5588,43 +5599,43 @@
 msgid "_Reset Values"
 msgstr ""
 
-#: src/framedraw.c:267
+#: src/framedraw.c:265
 msgid "_Frame"
 msgstr ""
 
-#: src/paramspecial.c:266
+#: src/paramspecial.c:259
 msgid "Maintain _Aspect Ratio"
 msgstr ""
 
-#: src/paramspecial.c:267
+#: src/paramspecial.c:260
 msgid "Maintain aspect ratio of original frame"
 msgstr ""
 
-#: src/paramspecial.c:341
+#: src/paramspecial.c:335
 msgid "Display Password"
 msgstr ""
 
-#: src/paramwindow.c:450
+#: src/paramwindow.c:447
 msgid "Transition _In"
 msgstr ""
 
-#: src/paramwindow.c:452
+#: src/paramwindow.c:449
 msgid "Click to set the transition parameter to show only the front frame"
 msgstr ""
 
-#: src/paramwindow.c:474
+#: src/paramwindow.c:472
 msgid "Crossfade audio"
 msgstr ""
 
-#: src/paramwindow.c:475
+#: src/paramwindow.c:473
 msgid "Check the box to make audio transition with the video"
 msgstr ""
 
-#: src/paramwindow.c:493
+#: src/paramwindow.c:492
 msgid "Transition _Out"
 msgstr ""
 
-#: src/paramwindow.c:495
+#: src/paramwindow.c:494
 msgid "Click to set the transition parameter to show only the rear frame"
 msgstr ""
 
@@ -5637,23 +5648,23 @@
 msgid "%s : size"
 msgstr ""
 
-#: src/paramwindow.c:598
+#: src/paramwindow.c:597
 msgid "New size (pixels)"
 msgstr ""
 
-#: src/paramwindow.c:617 src/plugins.c:997
+#: src/paramwindow.c:616 src/plugins.c:973
 msgid "_Width"
 msgstr ""
 
-#: src/paramwindow.c:636 src/plugins.c:1003
+#: src/paramwindow.c:635 src/plugins.c:979
 msgid "_Height"
 msgstr ""
 
-#: src/paramwindow.c:684
+#: src/paramwindow.c:683
 msgid "Generate to _Clipboard"
 msgstr ""
 
-#: src/paramwindow.c:686
+#: src/paramwindow.c:685
 msgid "Generate frames to the clipboard"
 msgstr ""
 
@@ -5665,7 +5676,7 @@
 msgid "Generate frames to a new clip"
 msgstr ""
 
-#: src/paramwindow.c:822
+#: src/paramwindow.c:824
 #, c-format
 msgid ""
 "\n"
@@ -5673,71 +5684,71 @@
 "\n"
 msgstr ""
 
-#: src/paramwindow.c:920 src/paramwindow.c:930
+#: src/paramwindow.c:934 src/paramwindow.c:942
 msgid "Set as default"
 msgstr ""
 
-#: src/paramwindow.c:922 src/paramwindow.c:938
+#: src/paramwindow.c:936 src/paramwindow.c:950
 msgid "Reset"
 msgstr ""
 
-#: src/paramwindow.c:932 src/rte_window.c:2401 src/omc-learn.c:1357
+#: src/paramwindow.c:944 src/rte_window.c:2394 src/omc-learn.c:1347
 msgid "Close _window"
 msgstr ""
 
-#: src/paramwindow.c:1337
+#: src/paramwindow.c:1340
 msgid "No parameters"
 msgstr ""
 
-#: src/paramwindow.c:1419
+#: src/paramwindow.c:1424
 msgid "Invalid parameter"
 msgstr ""
 
-#: src/paramwindow.c:1611
+#: src/paramwindow.c:1610
 msgid "LiVES: - Select Colour"
 msgstr ""
 
-#: src/paramwindow.c:1616
+#: src/paramwindow.c:1615
 msgid "Click to set the colour"
 msgstr ""
 
-#: src/paramwindow.c:1628
+#: src/paramwindow.c:1626
 msgid "_Red"
 msgstr ""
 
-#: src/paramwindow.c:1629
+#: src/paramwindow.c:1627
 msgid "The red value (0 - 255)"
 msgstr ""
 
-#: src/paramwindow.c:1632
+#: src/paramwindow.c:1630
 msgid "_Green"
 msgstr ""
 
-#: src/paramwindow.c:1633
+#: src/paramwindow.c:1631
 msgid "The green value (0 - 255)"
 msgstr ""
 
-#: src/paramwindow.c:1636
+#: src/paramwindow.c:1634
 msgid "_Blue"
 msgstr ""
 
-#: src/paramwindow.c:1637
+#: src/paramwindow.c:1635
 msgid "The blue value (0 - 255)"
 msgstr ""
 
-#: src/plugins.c:85
+#: src/plugins.c:86
 #, c-format
 msgid ""
 "\n"
 "Plugin error: %s failed with code %d"
 msgstr ""
 
-#: src/plugins.c:87
+#: src/plugins.c:88
 #, c-format
 msgid " : message was %s\n"
 msgstr ""
 
-#: src/plugins.c:387
+#: src/plugins.c:375
 #, c-format
 msgid ""
 "\n"
@@ -5747,17 +5758,17 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/plugins.c:397
+#: src/plugins.c:385
 #, c-format
 msgid "Updating video playback plugin defaults in %s\n"
 msgstr ""
 
-#: src/plugins.c:452
+#: src/plugins.c:444
 #, c-format
 msgid "Loading video playback plugin defaults from %s..."
 msgstr ""
 
-#: src/plugins.c:515
+#: src/plugins.c:505
 #, c-format
 msgid ""
 "\n"
@@ -5767,32 +5778,32 @@
 "\n"
 msgstr ""
 
-#: src/plugins.c:855
+#: src/plugins.c:836
 #, c-format
 msgid "Saving playback plugin defaults to %s..."
 msgstr ""
 
-#: src/plugins.c:962
+#: src/plugins.c:939
 msgid "_FPS"
 msgstr ""
 
-#: src/plugins.c:963
+#: src/plugins.c:940
 msgid "Fixed framerate for plugin.\n"
 msgstr ""
 
-#: src/plugins.c:1032
+#: src/plugins.c:1008
 msgid "_Colourspace"
 msgstr ""
 
-#: src/plugins.c:1033
+#: src/plugins.c:1009
 msgid "Colourspace input to the plugin.\n"
 msgstr ""
 
-#: src/plugins.c:1089
+#: src/plugins.c:1065
 msgid "Save settings to an alternate file.\n"
 msgstr ""
 
-#: src/plugins.c:1206
+#: src/plugins.c:1182
 #, c-format
 msgid ""
 "\n"
@@ -5801,7 +5812,7 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/plugins.c:1252
+#: src/plugins.c:1228
 #, c-format
 msgid ""
 "\n"
@@ -5811,38 +5822,38 @@
 "Unable to use it.\n"
 msgstr ""
 
-#: src/plugins.c:1265
+#: src/plugins.c:1241
 #, c-format
 msgid ""
 "Video playback plugin failed to initialise.\n"
 "Error was: %s\n"
 msgstr ""
 
-#: src/plugins.c:1461
+#: src/plugins.c:1428
 msgid ""
 "\n"
 "Warning ! Video playback plugin will not send key presses. Keyboard may be "
 "disabled during plugin use !\n"
 msgstr ""
 
-#: src/plugins.c:1465
+#: src/plugins.c:1433
 #, c-format
 msgid ""
 "*** Using %s plugin for fs playback, agreed to use palette type %d ( %s ). "
 "***\n"
 msgstr ""
 
-#: src/plugins.c:1571
+#: src/plugins.c:1537
 #, c-format
 msgid "Audio stream unable to use preferred format '%s'\n"
 msgstr ""
 
-#: src/plugins.c:1579
+#: src/plugins.c:1543
 #, c-format
 msgid "Using format '%s' instead.\n"
 msgstr ""
 
-#: src/plugins.c:1616
+#: src/plugins.c:1579
 #, c-format
 msgid ""
 "LiVES was unable to find its encoder plugins. Please make sure you have the "
@@ -5851,7 +5862,7 @@
 "or change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/plugins.c:1624
+#: src/plugins.c:1589
 #, c-format
 msgid ""
 "LiVES did not receive a response from the encoder plugin called '%s'.\n"
@@ -5860,11 +5871,11 @@
 "or switch to another plugin using Tools|Preferences|Encoding\n"
 msgstr ""
 
-#: src/plugins.c:2032
+#: src/plugins.c:1987
 msgid "Unable to resize, please install imageMagick\n"
 msgstr ""
 
-#: src/plugins.c:2231
+#: src/plugins.c:2183
 #, c-format
 msgid ""
 "\n"
@@ -5872,12 +5883,12 @@
 "No decoders found in %s !\n"
 msgstr ""
 
-#: src/plugins.c:2415
+#: src/plugins.c:2369
 #, c-format
 msgid " using %s"
 msgstr ""
 
-#: src/plugins.c:2499
+#: src/plugins.c:2451
 #, c-format
 msgid ""
 "\n"
@@ -5886,7 +5897,7 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/plugins.c:2522
+#: src/plugins.c:2472
 #, c-format
 msgid ""
 "\n"
@@ -5896,24 +5907,24 @@
 "Unable to use it.\n"
 msgstr ""
 
-#: src/plugins.c:2564
+#: src/plugins.c:2512
 msgid "/unknown"
 msgstr ""
 
-#: src/plugins.c:2651
+#: src/plugins.c:2598
 msgid "LiVES: - Decoder Plugins"
 msgstr ""
 
-#: src/plugins.c:2669
+#: src/plugins.c:2616
 msgid "Enabled Video Decoders (uncheck to disable)"
 msgstr ""
 
-#: src/plugins.c:2726
+#: src/plugins.c:2672
 #, c-format
 msgid "Failed to load %s, transitions may not resize.\n"
 msgstr ""
 
-#: src/plugins.c:3854
+#: src/plugins.c:3797
 #, c-format
 msgid "%s advanced settings"
 msgstr ""
@@ -5922,15 +5933,15 @@
 msgid "LiVES: - New Test RFX"
 msgstr ""
 
-#: src/rfx-builder.c:136
+#: src/rfx-builder.c:135
 msgid "LiVES: - Edit Test RFX"
 msgstr ""
 
-#: src/rfx-builder.c:166
+#: src/rfx-builder.c:165
 msgid "Type:"
 msgstr ""
 
-#: src/rfx-builder.c:184
+#: src/rfx-builder.c:183
 msgid "tool"
 msgstr ""
 
@@ -5942,130 +5953,130 @@
 msgid "The name of the plugin. No spaces allowed."
 msgstr ""
 
-#: src/rfx-builder.c:201
+#: src/rfx-builder.c:202
 msgid "Version:       "
 msgstr ""
 
-#: src/rfx-builder.c:203
+#: src/rfx-builder.c:204
 msgid "The script version."
 msgstr ""
 
-#: src/rfx-builder.c:210
+#: src/rfx-builder.c:212
 msgid "    Author:       "
 msgstr ""
 
-#: src/rfx-builder.c:211
+#: src/rfx-builder.c:213
 msgid "The script author."
 msgstr ""
 
-#: src/rfx-builder.c:217
+#: src/rfx-builder.c:220
 msgid "    URL (optional):       "
 msgstr ""
 
-#: src/rfx-builder.c:218
+#: src/rfx-builder.c:221
 msgid "URL for the plugin maintainer."
 msgstr ""
 
-#: src/rfx-builder.c:226
+#: src/rfx-builder.c:230
 msgid "Menu text:    "
 msgstr ""
 
-#: src/rfx-builder.c:227
+#: src/rfx-builder.c:231
 msgid "The text to show in the menu."
 msgstr ""
 
-#: src/rfx-builder.c:239
+#: src/rfx-builder.c:244
 msgid "Action description:        "
 msgstr ""
 
-#: src/rfx-builder.c:241
+#: src/rfx-builder.c:246
 msgid "Describe what the plugin is doing. E.g. \"Edge detecting\""
 msgstr ""
 
-#: src/rfx-builder.c:246
+#: src/rfx-builder.c:251
 msgid "Minimum frames:"
 msgstr ""
 
-#: src/rfx-builder.c:249
+#: src/rfx-builder.c:254
 msgid ""
 "Minimum number of frames this effect/tool can be applied to. Normally 1."
 msgstr ""
 
-#: src/rfx-builder.c:260
+#: src/rfx-builder.c:265
 msgid "_Requirements..."
 msgstr ""
 
-#: src/rfx-builder.c:263
+#: src/rfx-builder.c:268
 msgid "Enter any binaries required by the plugin."
 msgstr ""
 
-#: src/rfx-builder.c:267
+#: src/rfx-builder.c:272
 msgid "_Properties..."
 msgstr ""
 
-#: src/rfx-builder.c:270
+#: src/rfx-builder.c:275
 msgid "Set properties for the plugin. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:274
+#: src/rfx-builder.c:279
 msgid "_Parameters..."
 msgstr ""
 
-#: src/rfx-builder.c:277
+#: src/rfx-builder.c:282
 msgid "Set up parameters used in pre/loop/post/trigger code. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:281
+#: src/rfx-builder.c:286
 msgid "Parameter _Window Hints..."
 msgstr ""
 
-#: src/rfx-builder.c:284
+#: src/rfx-builder.c:289
 msgid "Set hints about how to lay out the parameter window. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:290
+#: src/rfx-builder.c:295
 msgid "_Language code:"
 msgstr ""
 
-#: src/rfx-builder.c:291
+#: src/rfx-builder.c:296
 msgid "Language for pre/loop/post/triggers. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:300
+#: src/rfx-builder.c:305
 msgid "_Pre loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:303
+#: src/rfx-builder.c:308
 msgid "Code to be executed before the loop. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:307
+#: src/rfx-builder.c:312
 msgid "_Loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:310
+#: src/rfx-builder.c:315
 msgid "Loop code to be applied to each frame."
 msgstr ""
 
-#: src/rfx-builder.c:314
+#: src/rfx-builder.c:319
 msgid "_Post loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:317
+#: src/rfx-builder.c:322
 msgid "Code to be executed after the loop. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:321
+#: src/rfx-builder.c:326
 msgid "_Trigger code..."
 msgstr ""
 
-#: src/rfx-builder.c:324
+#: src/rfx-builder.c:329
 msgid ""
 "Set trigger code for when the parameter window is shown, or when a parameter "
 "is changed. Optional (except for Utilities)."
 msgstr ""
 
-#: src/rfx-builder.c:421
+#: src/rfx-builder.c:426
 #, c-format
 msgid ""
 "\n"
@@ -6075,55 +6086,55 @@
 "%s\n"
 msgstr ""
 
-#: src/rfx-builder.c:544
+#: src/rfx-builder.c:541
 msgid "LiVES: - RFX Requirements"
 msgstr ""
 
-#: src/rfx-builder.c:548
+#: src/rfx-builder.c:544
 msgid "LiVES: - RFX Parameters"
 msgstr ""
 
-#: src/rfx-builder.c:552
+#: src/rfx-builder.c:547
 msgid "LiVES: - RFX Parameter Window Hints"
 msgstr ""
 
-#: src/rfx-builder.c:556
+#: src/rfx-builder.c:550
 msgid "LiVES: - RFX Triggers"
 msgstr ""
 
-#: src/rfx-builder.c:622
+#: src/rfx-builder.c:613
 msgid "_New Entry"
 msgstr ""
 
-#: src/rfx-builder.c:625
+#: src/rfx-builder.c:616
 msgid "_Edit Entry"
 msgstr ""
 
-#: src/rfx-builder.c:628
+#: src/rfx-builder.c:619
 msgid "_Remove Entry"
 msgstr ""
 
-#: src/rfx-builder.c:632
+#: src/rfx-builder.c:623
 msgid "Move _Up"
 msgstr ""
 
-#: src/rfx-builder.c:635
+#: src/rfx-builder.c:626
 msgid "Move _Down"
 msgstr ""
 
-#: src/rfx-builder.c:1004
+#: src/rfx-builder.c:984
 msgid "LiVES: - RFX Properties"
 msgstr ""
 
-#: src/rfx-builder.c:1013
+#: src/rfx-builder.c:993
 msgid "_Slow (hint to GUI)"
 msgstr ""
 
-#: src/rfx-builder.c:1024
+#: src/rfx-builder.c:1004
 msgid "_Batch mode generator"
 msgstr ""
 
-#: src/rfx-builder.c:1831
+#: src/rfx-builder.c:1790
 msgid ""
 "\n"
 "\n"
@@ -6132,7 +6143,7 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:1875
+#: src/rfx-builder.c:1834
 msgid ""
 "\n"
 "\n"
@@ -6140,219 +6151,219 @@
 "Please check the trigger code.\n"
 msgstr ""
 
-#: src/rfx-builder.c:1994
+#: src/rfx-builder.c:1950
 msgid "LiVES: - New RFX Parameter"
 msgstr ""
 
-#: src/rfx-builder.c:1997
+#: src/rfx-builder.c:1952
 msgid "LiVES: - Edit RFX Parameter"
 msgstr ""
 
-#: src/rfx-builder.c:2013
+#: src/rfx-builder.c:1968
 msgid "_Name:    "
 msgstr ""
 
-#: src/rfx-builder.c:2016
+#: src/rfx-builder.c:1971
 msgid "Name of the parameter, must be unique in the plugin."
 msgstr ""
 
-#: src/rfx-builder.c:2025
+#: src/rfx-builder.c:1981
 msgid "_Label:    "
 msgstr ""
 
-#: src/rfx-builder.c:2028
+#: src/rfx-builder.c:1984
 msgid ""
 "Label to be shown by the parameter. An underscore represents mnemonic "
 "accelerator."
 msgstr ""
 
-#: src/rfx-builder.c:2039
+#: src/rfx-builder.c:1996
 msgid "_Type:         "
 msgstr ""
 
-#: src/rfx-builder.c:2040
+#: src/rfx-builder.c:1997
 msgid "Parameter type (select from list)."
 msgstr ""
 
-#: src/rfx-builder.c:2073
+#: src/rfx-builder.c:2029
 msgid "Decimal _places: "
 msgstr ""
 
-#: src/rfx-builder.c:2082 src/rfx-builder.c:2477 src/rfx-builder.c:2495
+#: src/rfx-builder.c:2038 src/rfx-builder.c:2430 src/rfx-builder.c:2447
 msgid "_Default value:    "
 msgstr ""
 
-#: src/rfx-builder.c:2098
+#: src/rfx-builder.c:2054
 msgid "_Default: "
 msgstr ""
 
-#: src/rfx-builder.c:2132
+#: src/rfx-builder.c:2087
 msgid "Button _Group: "
 msgstr ""
 
-#: src/rfx-builder.c:2134
+#: src/rfx-builder.c:2089
 msgid "A non-zero value can be used to group radio buttons."
 msgstr ""
 
-#: src/rfx-builder.c:2142 src/rfx-builder.c:2478
+#: src/rfx-builder.c:2097 src/rfx-builder.c:2431
 msgid "_Minimum value: "
 msgstr ""
 
-#: src/rfx-builder.c:2148 src/rfx-builder.c:2479
+#: src/rfx-builder.c:2103 src/rfx-builder.c:2432
 msgid "Ma_ximum value: "
 msgstr ""
 
-#: src/rfx-builder.c:2157
+#: src/rfx-builder.c:2113
 msgid "     _Step size:   "
 msgstr ""
 
-#: src/rfx-builder.c:2160
+#: src/rfx-builder.c:2117
 msgid ""
 "How much the parameter is adjusted when the spinbutton arrows are pressed."
 msgstr ""
 
-#: src/rfx-builder.c:2171
+#: src/rfx-builder.c:2129
 msgid "_Wrap value"
 msgstr ""
 
-#: src/rfx-builder.c:2172
+#: src/rfx-builder.c:2131
 msgid "Whether the value wraps max->min and min->max."
 msgstr ""
 
-#: src/rfx-builder.c:2470
+#: src/rfx-builder.c:2424
 msgid "Set _values"
 msgstr ""
 
-#: src/rfx-builder.c:2512
+#: src/rfx-builder.c:2463
 msgid "Default _Red:  "
 msgstr ""
 
-#: src/rfx-builder.c:2513
+#: src/rfx-builder.c:2464
 msgid "Default _Green:"
 msgstr ""
 
-#: src/rfx-builder.c:2514
+#: src/rfx-builder.c:2465
 msgid "Default _Blue: "
 msgstr ""
 
-#: src/rfx-builder.c:2538
+#: src/rfx-builder.c:2488
 msgid "Set _default"
 msgstr ""
 
-#: src/rfx-builder.c:2540
+#: src/rfx-builder.c:2490
 msgid "Default value:  "
 msgstr ""
 
-#: src/rfx-builder.c:2541
+#: src/rfx-builder.c:2491
 msgid "Maximum length (chars): "
 msgstr ""
 
-#: src/rfx-builder.c:2576
+#: src/rfx-builder.c:2526
 msgid "LiVES: - New RFX Parameter Window Hint"
 msgstr ""
 
-#: src/rfx-builder.c:2579
+#: src/rfx-builder.c:2528
 msgid "LiVES: - Edit RFX Parameter Window Hint"
 msgstr ""
 
-#: src/rfx-builder.c:2622
+#: src/rfx-builder.c:2569
 msgid "_Keyword:         "
 msgstr ""
 
-#: src/rfx-builder.c:2639
+#: src/rfx-builder.c:2586
 msgid "Special _Type:         "
 msgstr ""
 
-#: src/rfx-builder.c:2656
+#: src/rfx-builder.c:2602
 msgid "Special _Subtype:         "
 msgstr ""
 
-#: src/rfx-builder.c:2667 src/rfx-builder.c:2706
+#: src/rfx-builder.c:2613 src/rfx-builder.c:2651
 msgid "Row:    "
 msgstr ""
 
-#: src/rfx-builder.c:2732
+#: src/rfx-builder.c:2676
 #, c-format
 msgid "Linked parameters (%d):    "
 msgstr ""
 
-#: src/rfx-builder.c:2749
+#: src/rfx-builder.c:2693
 msgid "Linked parameters (4):    "
 msgstr ""
 
-#: src/rfx-builder.c:2752
+#: src/rfx-builder.c:2695
 msgid "Linked parameters (2):    "
 msgstr ""
 
-#: src/rfx-builder.c:2777
+#: src/rfx-builder.c:2720
 msgid "LiVES: - New RFX Trigger"
 msgstr ""
 
-#: src/rfx-builder.c:2780
+#: src/rfx-builder.c:2722
 msgid "LiVES: - Edit RFX Trigger"
 msgstr ""
 
-#: src/rfx-builder.c:2808
+#: src/rfx-builder.c:2750
 msgid "When:         "
 msgstr ""
 
-#: src/rfx-builder.c:2904
+#: src/rfx-builder.c:2846
 msgid "LiVES: - Pre Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:2911
+#: src/rfx-builder.c:2853
 msgid "LiVES: - Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:2918
+#: src/rfx-builder.c:2860
 msgid "LiVES: - Post Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:2931
+#: src/rfx-builder.c:2873
 #, c-format
 msgid "LiVES: - Default text (max length %d)"
 msgstr ""
 
-#: src/rfx-builder.c:2944
+#: src/rfx-builder.c:2885
 msgid "LiVES: - Enter values, one per line"
 msgstr ""
 
-#: src/rfx-builder.c:3055
+#: src/rfx-builder.c:2996
 msgid ""
 "\n"
 "\n"
 "Name must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3060
+#: src/rfx-builder.c:3001
 msgid ""
 "\n"
 "\n"
 "Name must not contain spaces.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3065
+#: src/rfx-builder.c:3006
 msgid ""
 "\n"
 "\n"
 "Menu text must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3071
+#: src/rfx-builder.c:3012
 msgid ""
 "\n"
 "\n"
 "Action description must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3076
+#: src/rfx-builder.c:3017
 msgid ""
 "\n"
 "\n"
 "Author must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3085 src/rfx-builder.c:4339
+#: src/rfx-builder.c:3026 src/rfx-builder.c:4253
 msgid ""
 "\n"
 "\n"
@@ -6360,28 +6371,28 @@
 "Name must be unique.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3092
+#: src/rfx-builder.c:3033
 msgid ""
 "\n"
 "\n"
 "Loop code should not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3098
+#: src/rfx-builder.c:3039
 msgid ""
 "\n"
 "\n"
 "Trigger code should not be blank for a utility.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3111
+#: src/rfx-builder.c:3052
 msgid ""
 "\n"
 "\n"
 "Parameter name must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3117
+#: src/rfx-builder.c:3058
 msgid ""
 "\n"
 "\n"
@@ -6390,41 +6401,41 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:3171
+#: src/rfx-builder.c:3111
 #, c-format
 msgid "Writing script file %s..."
 msgstr ""
 
-#: src/rfx-builder.c:3477
+#: src/rfx-builder.c:3411
 msgid "No <define> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3484 src/rfx-builder.c:3493
+#: src/rfx-builder.c:3418 src/rfx-builder.c:3427
 msgid "Bad script version.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3505
+#: src/rfx-builder.c:3439
 msgid "No <name> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3513
+#: src/rfx-builder.c:3447
 msgid "No <version> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3522
+#: src/rfx-builder.c:3456
 msgid "No <author> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3536
+#: src/rfx-builder.c:3470
 msgid "No <description> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3540
+#: src/rfx-builder.c:3474
 #, c-format
 msgid "Bad description. (%s)\n"
 msgstr ""
 
-#: src/rfx-builder.c:3702
+#: src/rfx-builder.c:3627
 #, c-format
 msgid ""
 "\n"
@@ -6434,27 +6445,27 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:3859
+#: src/rfx-builder.c:3780
 msgid "Rebuilding all RFX scripts...builtin..."
 msgstr ""
 
-#: src/rfx-builder.c:3860
+#: src/rfx-builder.c:3781
 msgid "Rebuilding scripts"
 msgstr ""
 
-#: src/rfx-builder.c:3868
+#: src/rfx-builder.c:3789
 msgid "custom..."
 msgstr ""
 
-#: src/rfx-builder.c:3872
+#: src/rfx-builder.c:3793
 msgid "test..."
 msgstr ""
 
-#: src/rfx-builder.c:3878
+#: src/rfx-builder.c:3799
 msgid "rebuilding dynamic menu entries..."
 msgstr ""
 
-#: src/rfx-builder.c:3905 src/rfx-builder.c:3912
+#: src/rfx-builder.c:3826 src/rfx-builder.c:3834
 #, c-format
 msgid ""
 "\n"
@@ -6463,7 +6474,7 @@
 "Please check this program is in your path and executable.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3951
+#: src/rfx-builder.c:3874
 #, c-format
 msgid ""
 "\n"
@@ -6473,12 +6484,12 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:3960
+#: src/rfx-builder.c:3884
 #, c-format
 msgid "Deleting rfx script %s..."
 msgstr ""
 
-#: src/rfx-builder.c:3980
+#: src/rfx-builder.c:3902
 #, c-format
 msgid ""
 "\n"
@@ -6488,7 +6499,7 @@
 "Error code was %d\n"
 msgstr ""
 
-#: src/rfx-builder.c:4016
+#: src/rfx-builder.c:3938
 #, c-format
 msgid ""
 "\n"
@@ -6498,12 +6509,12 @@
 "Please delete it first, or rename the test script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4027
+#: src/rfx-builder.c:3950
 #, c-format
 msgid "Promoting rfx test plugin %s to custom..."
 msgstr ""
 
-#: src/rfx-builder.c:4044
+#: src/rfx-builder.c:3965
 #, c-format
 msgid ""
 "\n"
@@ -6514,20 +6525,20 @@
 "Return code was %d (%s)\n"
 msgstr ""
 
-#: src/rfx-builder.c:4070
+#: src/rfx-builder.c:3990
 msgid "LiVES: - Export Script to..."
 msgstr ""
 
-#: src/rfx-builder.c:4077 src/rfx-builder.c:4156
+#: src/rfx-builder.c:3997 src/rfx-builder.c:4074
 #, c-format
 msgid "Copying %s to %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4105
+#: src/rfx-builder.c:4024
 msgid "LiVES: Import Script from..."
 msgstr ""
 
-#: src/rfx-builder.c:4148
+#: src/rfx-builder.c:4067
 #, c-format
 msgid ""
 "\n"
@@ -6537,43 +6548,43 @@
 "Please delete it first, or rename the import script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4249
+#: src/rfx-builder.c:4166
 msgid "LiVES: - Copy RFX Script"
 msgstr ""
 
-#: src/rfx-builder.c:4251
+#: src/rfx-builder.c:4168
 msgid "_From type:    "
 msgstr ""
 
-#: src/rfx-builder.c:4258
+#: src/rfx-builder.c:4175
 msgid "   Script:    "
 msgstr ""
 
-#: src/rfx-builder.c:4267
+#: src/rfx-builder.c:4183
 msgid "LiVES: - Rename test RFX Script"
 msgstr ""
 
-#: src/rfx-builder.c:4268
+#: src/rfx-builder.c:4184
 msgid "From script: "
 msgstr ""
 
-#: src/rfx-builder.c:4273
+#: src/rfx-builder.c:4188
 msgid "LiVES: - RFX Script name"
 msgstr ""
 
-#: src/rfx-builder.c:4274
+#: src/rfx-builder.c:4189
 msgid "Script name: "
 msgstr ""
 
-#: src/rfx-builder.c:4294
+#: src/rfx-builder.c:4209
 msgid "New name: "
 msgstr ""
 
-#: src/rfx-builder.c:4297
+#: src/rfx-builder.c:4212
 msgid "New script name: "
 msgstr ""
 
-#: src/rfx-builder.c:4372
+#: src/rfx-builder.c:4286
 msgid ""
 "\n"
 "\n"
@@ -6581,12 +6592,12 @@
 "Script name must be unique.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4384
+#: src/rfx-builder.c:4297
 #, c-format
 msgid "Renaming RFX test script %s to %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4390
+#: src/rfx-builder.c:4302
 #, c-format
 msgid ""
 "\n"
@@ -6597,21 +6608,21 @@
 "Return code was %d\n"
 msgstr ""
 
-#: src/rfx-builder.c:4610
+#: src/rfx-builder.c:4518
 msgid "_Apply Real Time Effects to Selection"
 msgstr ""
 
-#: src/rfx-builder.c:4664
+#: src/rfx-builder.c:4572
 #, c-format
 msgid "Loading rendered effect %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4766
+#: src/rfx-builder.c:4674
 msgid ""
 "See: VJ - show VJ keys. Set the realtime effects, and then apply them here."
 msgstr ""
 
-#: src/preferences.c:359
+#: src/preferences.c:351
 msgid ""
 "\n"
 "\n"
@@ -6619,7 +6630,7 @@
 "full screen, separate window (fs) mode\n"
 msgstr ""
 
-#: src/preferences.c:408
+#: src/preferences.c:400
 msgid ""
 "\n"
 "\n"
@@ -6627,7 +6638,7 @@
 "(Free space = UNKNOWN)"
 msgstr ""
 
-#: src/preferences.c:412
+#: src/preferences.c:403
 #, c-format
 msgid ""
 "\n"
@@ -6636,14 +6647,14 @@
 "(Free space = %s)"
 msgstr ""
 
-#: src/preferences.c:416
+#: src/preferences.c:408
 msgid ""
 "The temp directory is LiVES working directory where opened clips and sets "
 "are stored.\n"
 "It should be in a partition with plenty of free disk space.\n"
 msgstr ""
 
-#: src/preferences.c:784
+#: src/preferences.c:839
 #, c-format
 msgid ""
 "Unable to create or write to the new temporary directory.\n"
@@ -6654,7 +6665,7 @@
 "The directory will not be changed now.\n"
 msgstr ""
 
-#: src/preferences.c:786
+#: src/preferences.c:843
 #, c-format
 msgid ""
 "Unable to create or write to the new temporary directory.\n"
@@ -6664,7 +6675,7 @@
 "The directory will not be changed now.\n"
 msgstr ""
 
-#: src/preferences.c:798
+#: src/preferences.c:856
 msgid ""
 "You have chosen to change the temporary directory.\n"
 "Please make sure you have no other copies of LiVES open.\n"
@@ -6676,20 +6687,20 @@
 "original setting."
 msgstr ""
 
-#: src/preferences.c:1169
+#: src/preferences.c:1221
 msgid ""
 "\n"
 "Unable to switch audio players to jack - jackd must be installed first.\n"
 "See http://jackaudio.org\n"
 msgstr ""
 
-#: src/preferences.c:1175
+#: src/preferences.c:1226
 msgid ""
 "\n"
 "Switching audio players requires restart (jackd must not be running)\n"
 msgstr ""
 
-#: src/preferences.c:1202
+#: src/preferences.c:1253
 msgid ""
 "\n"
 "Unable to switch audio players to pulse audio\n"
@@ -6697,814 +6708,814 @@
 "See http://www.pulseaudio.org\n"
 msgstr ""
 
-#: src/preferences.c:1502
+#: src/preferences.c:1544
 msgid "PCM (highest quality; largest files)"
 msgstr ""
 
-#: src/preferences.c:2063
+#: src/preferences.c:2096
 msgid "LiVES: - Preferences"
 msgstr ""
 
-#: src/preferences.c:2142
+#: src/preferences.c:2177
 msgid "Open file selection maximised"
 msgstr ""
 
-#: src/preferences.c:2149
+#: src/preferences.c:2184
 msgid "Show recent files in the File menu"
 msgstr ""
 
-#: src/preferences.c:2158
+#: src/preferences.c:2193
 msgid "Stop screensaver on playback    "
 msgstr ""
 
-#: src/preferences.c:2165
+#: src/preferences.c:2200
 msgid "Open main window maximised"
 msgstr ""
 
-#: src/preferences.c:2173
+#: src/preferences.c:2208
 msgid "Show toolbar when background is blanked"
 msgstr ""
 
-#: src/preferences.c:2181
+#: src/preferences.c:2216
 msgid "Allow mouse wheel to switch clips"
 msgstr ""
 
-#: src/preferences.c:2192
+#: src/preferences.c:2227
 msgid "Shrink previews to fit in interface"
 msgstr ""
 
-#: src/preferences.c:2202
+#: src/preferences.c:2237
 msgid "Startup mode:"
 msgstr ""
 
-#: src/preferences.c:2206
+#: src/preferences.c:2241
 msgid "_Clip editor"
 msgstr ""
 
-#: src/preferences.c:2210
+#: src/preferences.c:2245
 msgid "_Multitrack mode"
 msgstr ""
 
-#: src/preferences.c:2234
+#: src/preferences.c:2268
 msgid "Multi-head support"
 msgstr ""
 
-#: src/preferences.c:2242
+#: src/preferences.c:2276
 msgid " monitor number for LiVES interface"
 msgstr ""
 
-#: src/preferences.c:2248
+#: src/preferences.c:2282
 msgid " monitor number for playback"
 msgstr ""
 
-#: src/preferences.c:2260
+#: src/preferences.c:2294
 msgid ""
 "A setting of 0 means use all available monitors (only works with some "
 "playback plugins)."
 msgstr ""
 
-#: src/preferences.c:2270
+#: src/preferences.c:2304
 msgid "Force single monitor"
 msgstr ""
 
-#: src/preferences.c:2271
+#: src/preferences.c:2305
 msgid "Ignore all except the first monitor."
 msgstr ""
 
-#: src/preferences.c:2293
+#: src/preferences.c:2327
 msgid "Show clip thumbnails during playback"
 msgstr ""
 
-#: src/preferences.c:2306
+#: src/preferences.c:2340
 msgid "GUI"
 msgstr ""
 
-#: src/preferences.c:2321
+#: src/preferences.c:2355
 msgid "When entering Multitrack mode:"
 msgstr ""
 
-#: src/preferences.c:2330
+#: src/preferences.c:2364
 msgid "_Prompt me for width, height, fps and audio settings"
 msgstr ""
 
-#: src/preferences.c:2336
+#: src/preferences.c:2370
 msgid "_Always use the following values:"
 msgstr ""
 
-#: src/preferences.c:2345
+#: src/preferences.c:2379
 msgid "Use these same _values for rendering a new clip"
 msgstr ""
 
-#: src/preferences.c:2370
+#: src/preferences.c:2404
 msgid "_Width           "
 msgstr ""
 
-#: src/preferences.c:2375
+#: src/preferences.c:2409
 msgid "          _Height      "
 msgstr ""
 
-#: src/preferences.c:2379
+#: src/preferences.c:2413
 msgid "          _FPS"
 msgstr ""
 
-#: src/preferences.c:2387
+#: src/preferences.c:2421
 msgid "Enable backing audio track"
 msgstr ""
 
-#: src/preferences.c:2394
+#: src/preferences.c:2428
 msgid "Audio track per video track"
 msgstr ""
 
-#: src/preferences.c:2423
+#: src/preferences.c:2457
 msgid "    _Undo buffer size (MB)    "
 msgstr ""
 
-#: src/preferences.c:2432
+#: src/preferences.c:2466
 msgid "_Exit multitrack mode after rendering"
 msgstr ""
 
-#: src/preferences.c:2440
+#: src/preferences.c:2474
 msgid "Auto backup layouts"
 msgstr ""
 
-#: src/preferences.c:2445
+#: src/preferences.c:2479
 msgid "_Every"
 msgstr ""
 
-#: src/preferences.c:2453
+#: src/preferences.c:2487
 msgid "seconds"
 msgstr ""
 
-#: src/preferences.c:2461
+#: src/preferences.c:2495
 msgid "After every _change"
 msgstr ""
 
-#: src/preferences.c:2467
+#: src/preferences.c:2501
 msgid "_Never"
 msgstr ""
 
-#: src/preferences.c:2490
+#: src/preferences.c:2523
 msgid "Multitrack/Render"
 msgstr ""
 
-#: src/preferences.c:2508
+#: src/preferences.c:2541
 msgid "Use instant opening when possible"
 msgstr ""
 
-#: src/preferences.c:2509
+#: src/preferences.c:2543
 msgid "Enable instant opening of some file types using decoder plugins"
 msgstr ""
 
-#: src/preferences.c:2531
+#: src/preferences.c:2567
 msgid "Video open command (fallback)"
 msgstr ""
 
-#: src/preferences.c:2543
+#: src/preferences.c:2579
 msgid "Open/render compression"
 msgstr ""
 
-#: src/preferences.c:2546
+#: src/preferences.c:2582
 msgid " %     ( lower = slower, larger files; for jpeg, higher quality )"
 msgstr ""
 
-#: src/preferences.c:2558
+#: src/preferences.c:2594
 msgid "Default image format"
 msgstr ""
 
-#: src/preferences.c:2562
+#: src/preferences.c:2598
 msgid "_jpeg"
 msgstr ""
 
-#: src/preferences.c:2565
+#: src/preferences.c:2601
 msgid "_png"
 msgstr ""
 
-#: src/preferences.c:2572
+#: src/preferences.c:2608
 msgid "(Check Help/Troubleshoot to see which image formats are supported)"
 msgstr ""
 
-#: src/preferences.c:2580
+#: src/preferences.c:2616
 msgid "Enable automatic deinterlacing when possible"
 msgstr ""
 
-#: src/preferences.c:2582
+#: src/preferences.c:2619
 msgid "Automatically deinterlace frames when a plugin suggests it"
 msgstr ""
 
-#: src/preferences.c:2593
+#: src/preferences.c:2632
 msgid "Automatic trimming / padding of audio when possible"
 msgstr ""
 
-#: src/preferences.c:2595
+#: src/preferences.c:2634
 msgid "Automatically trim or pad audio when a plugin suggests it"
 msgstr ""
 
-#: src/preferences.c:2606
+#: src/preferences.c:2646
 msgid "Ignore blank borders when possible"
 msgstr ""
 
-#: src/preferences.c:2608
+#: src/preferences.c:2648
 msgid "Clip any blank borders from frames where possible"
 msgstr ""
 
-#: src/preferences.c:2619
+#: src/preferences.c:2660
 msgid "When opening multiple files, concatenate images into one clip"
 msgstr ""
 
-#: src/preferences.c:2629
+#: src/preferences.c:2670
 msgid "Decoding"
 msgstr ""
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:2652
+#: src/preferences.c:2693
 msgid "Low - can improve performance on slower machines"
 msgstr ""
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:2654
+#: src/preferences.c:2695
 msgid "Normal - recommended for most users"
 msgstr ""
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:2656
+#: src/preferences.c:2697
 msgid "High - can improve quality on very fast machines"
 msgstr ""
 
-#: src/preferences.c:2659
+#: src/preferences.c:2700
 msgid "Preview _quality"
 msgstr ""
 
-#: src/preferences.c:2660
+#: src/preferences.c:2701
 msgid "The preview quality for video playback - affects resizing"
 msgstr ""
 
-#: src/preferences.c:2675
+#: src/preferences.c:2717
 msgid "_Show FPS statistics"
 msgstr ""
 
-#: src/preferences.c:2694
+#: src/preferences.c:2736
 msgid "_Plugin"
 msgstr ""
 
-#: src/preferences.c:2718
+#: src/preferences.c:2760
 msgid "Stream audio"
 msgstr ""
 
-#: src/preferences.c:2721
+#: src/preferences.c:2763
 msgid "Stream audio to playback plugin"
 msgstr ""
 
-#: src/preferences.c:2734
+#: src/preferences.c:2778
 msgid "Record player output"
 msgstr ""
 
-#: src/preferences.c:2737
+#: src/preferences.c:2781
 msgid "Record output from player instead of input to player"
 msgstr ""
 
-#: src/preferences.c:2744
+#: src/preferences.c:2789
 msgid "VIDEO"
 msgstr ""
 
-#: src/preferences.c:2787
+#: src/preferences.c:2833
 msgid "_Player"
 msgstr ""
 
-#: src/preferences.c:2792
+#: src/preferences.c:2838
 msgid "(See also the Jack Integration tab for jack startup options)"
 msgstr ""
 
-#: src/preferences.c:2819
+#: src/preferences.c:2865
 msgid "mplayer"
 msgstr ""
 
-#: src/preferences.c:2830
+#: src/preferences.c:2876
 msgid "mplayer2"
 msgstr ""
 
-#: src/preferences.c:2833
+#: src/preferences.c:2879
 msgid "Audio play _command"
 msgstr ""
 
-#: src/preferences.c:2840
+#: src/preferences.c:2886
 msgid "- internal -"
 msgstr ""
 
-#: src/preferences.c:2849
+#: src/preferences.c:2895
 msgid "Audio follows video _rate/direction"
 msgstr ""
 
-#: src/preferences.c:2857
+#: src/preferences.c:2903
 msgid "Audio follows _clip switches"
 msgstr ""
 
-#: src/preferences.c:2864
+#: src/preferences.c:2910
 msgid "Source:"
 msgstr ""
 
-#: src/preferences.c:2868
+#: src/preferences.c:2914
 msgid "_Internal"
 msgstr ""
 
-#: src/preferences.c:2873
+#: src/preferences.c:2919
 msgid "_External (requires jack or pulse audio player)"
 msgstr ""
 
-#: src/preferences.c:2892
+#: src/preferences.c:2940
 msgid "AUDIO"
 msgstr ""
 
-#: src/preferences.c:2902
+#: src/preferences.c:2950
 msgid "Playback"
 msgstr ""
 
-#: src/preferences.c:2925
+#: src/preferences.c:2973
 msgid ""
 "Record audio when capturing an e_xternal window\n"
 " (requires jack or pulse audio)"
 msgstr ""
 
-#: src/preferences.c:2940
+#: src/preferences.c:2988
 msgid "      What to record when 'r' is pressed   "
 msgstr ""
 
-#: src/preferences.c:2949
+#: src/preferences.c:2997
 msgid "_Frame changes"
 msgstr ""
 
-#: src/preferences.c:2964
+#: src/preferences.c:3012
 msgid "F_PS changes"
 msgstr ""
 
-#: src/preferences.c:2982
+#: src/preferences.c:3030
 msgid "_Real time effects"
 msgstr ""
 
-#: src/preferences.c:2993
+#: src/preferences.c:3041
 msgid "_Clip switches"
 msgstr ""
 
-#: src/preferences.c:3004
+#: src/preferences.c:3052
 msgid "_Audio (requires jack or pulse audio player)"
 msgstr ""
 
-#: src/preferences.c:3024
+#: src/preferences.c:3072
 msgid "Pause recording if free disk space falls below"
 msgstr ""
 
 #. TRANSLATORS: gigabytes
-#: src/preferences.c:3030
+#: src/preferences.c:3078
 msgid "GB"
 msgstr ""
 
-#: src/preferences.c:3037
+#: src/preferences.c:3085
 msgid "Recording"
 msgstr ""
 
-#: src/preferences.c:3055
+#: src/preferences.c:3103
 msgid "Encoder"
 msgstr ""
 
-#: src/preferences.c:3090
+#: src/preferences.c:3137
 msgid "Output format"
 msgstr ""
 
-#: src/preferences.c:3106
+#: src/preferences.c:3153
 msgid "Audio codec"
 msgstr ""
 
-#: src/preferences.c:3119
+#: src/preferences.c:3165
 msgid "Encoding"
 msgstr ""
 
-#: src/preferences.c:3134
+#: src/preferences.c:3180
 msgid "Use _antialiasing when resizing"
 msgstr ""
 
-#: src/preferences.c:3143
+#: src/preferences.c:3189
 msgid "Number of _real time effect keys"
 msgstr ""
 
-#: src/preferences.c:3145
+#: src/preferences.c:3192
 msgid ""
 "The number of \"virtual\" real time effect keys. They can be controlled "
 "through the real time effects window, or via network (OSC)."
 msgstr ""
 
-#: src/preferences.c:3152
+#: src/preferences.c:3199
 msgid "Use _threads where possible when applying effects"
 msgstr ""
 
-#: src/preferences.c:3159
+#: src/preferences.c:3207
 msgid "Number of _threads"
 msgstr ""
 
-#: src/preferences.c:3172
+#: src/preferences.c:3221
 msgid "Restart is required if any of the following paths are changed:"
 msgstr ""
 
-#: src/preferences.c:3182
+#: src/preferences.c:3231
 msgid "Weed plugin path"
 msgstr ""
 
-#: src/preferences.c:3184
+#: src/preferences.c:3234
 msgid "Frei0r plugin path"
 msgstr ""
 
-#: src/preferences.c:3186
+#: src/preferences.c:3237
 msgid "LADSPA plugin path"
 msgstr ""
 
-#: src/preferences.c:3209
+#: src/preferences.c:3261
 msgid "      Video load directory (default)      "
 msgstr ""
 
-#: src/preferences.c:3215
+#: src/preferences.c:3267
 msgid "      Video save directory (default) "
 msgstr ""
 
-#: src/preferences.c:3221
+#: src/preferences.c:3273
 msgid "      Audio load directory (default) "
 msgstr ""
 
-#: src/preferences.c:3227
+#: src/preferences.c:3279
 msgid "      Image directory (default) "
 msgstr ""
 
-#: src/preferences.c:3233
+#: src/preferences.c:3285
 msgid "      Backup/Restore directory (default) "
 msgstr ""
 
-#: src/preferences.c:3239
+#: src/preferences.c:3291
 msgid "      Temp directory (do not remove) "
 msgstr ""
 
-#: src/preferences.c:3252
+#: src/preferences.c:3304
 msgid "The default directory for loading video clips from"
 msgstr ""
 
-#: src/preferences.c:3277
+#: src/preferences.c:3329
 msgid "The default directory for saving encoded clips to"
 msgstr ""
 
-#: src/preferences.c:3285
+#: src/preferences.c:3337
 msgid "The default directory for loading and saving audio"
 msgstr ""
 
-#: src/preferences.c:3293
+#: src/preferences.c:3345
 msgid "The default directory for saving frameshots to"
 msgstr ""
 
-#: src/preferences.c:3301
+#: src/preferences.c:3353
 msgid "The default directory for backing up/restoring single clips"
 msgstr ""
 
-#: src/preferences.c:3309
+#: src/preferences.c:3361
 msgid "LiVES working directory."
 msgstr ""
 
-#: src/preferences.c:3359
+#: src/preferences.c:3412
 msgid "Directories"
 msgstr ""
 
-#: src/preferences.c:3374
+#: src/preferences.c:3427
 msgid "Warn if diskspace falls below: "
 msgstr ""
 
-#: src/preferences.c:3380 src/preferences.c:3394
+#: src/preferences.c:3433 src/preferences.c:3447
 msgid " MB [set to 0 to disable]"
 msgstr ""
 
-#: src/preferences.c:3389
+#: src/preferences.c:3442
 msgid "Diskspace critical level: "
 msgstr ""
 
-#: src/preferences.c:3407
+#: src/preferences.c:3461
 msgid ""
 "Warn on Insert / Merge if _frame rate of clipboard does not match frame rate "
 "of selection"
 msgstr ""
 
-#: src/preferences.c:3417
+#: src/preferences.c:3471
 msgid "Warn on Open if file _size exceeds "
 msgstr ""
 
-#: src/preferences.c:3425
+#: src/preferences.c:3479
 msgid " MB"
 msgstr ""
 
-#: src/preferences.c:3432
+#: src/preferences.c:3486
 msgid "Show a warning before saving a se_t"
 msgstr ""
 
-#: src/preferences.c:3442
+#: src/preferences.c:3496
 msgid ""
 "Show a warning if _mplayer/mplayer2, sox, composite or convert is not found "
 "when LiVES is started."
 msgstr ""
 
-#: src/preferences.c:3452
+#: src/preferences.c:3506
 msgid "Show a warning if no _rendered effects are found at startup."
 msgstr ""
 
-#: src/preferences.c:3464
+#: src/preferences.c:3518
 msgid "Show a warning if no _encoder plugins are found at startup."
 msgstr ""
 
-#: src/preferences.c:3474
+#: src/preferences.c:3528
 msgid "Show a warning if a _duplicate set name is entered."
 msgstr ""
 
-#: src/preferences.c:3485
+#: src/preferences.c:3539
 msgid "When a set is loaded, warn if clips are missing from _layouts."
 msgstr ""
 
-#: src/preferences.c:3495
+#: src/preferences.c:3550
 msgid "Warn if a clip used in a layout is about to be closed."
 msgstr ""
 
-#: src/preferences.c:3505
+#: src/preferences.c:3561
 msgid "Warn if frames used in a layout are about to be deleted."
 msgstr ""
 
-#: src/preferences.c:3515
+#: src/preferences.c:3572
 msgid "Warn if frames used in a layout are about to be shifted."
 msgstr ""
 
-#: src/preferences.c:3525
+#: src/preferences.c:3583
 msgid "Warn if frames used in a layout are about to be altered."
 msgstr ""
 
-#: src/preferences.c:3535
+#: src/preferences.c:3594
 msgid "Warn if audio used in a layout is about to be deleted."
 msgstr ""
 
-#: src/preferences.c:3546
+#: src/preferences.c:3606
 msgid "Warn if audio used in a layout is about to be shifted."
 msgstr ""
 
-#: src/preferences.c:3556
+#: src/preferences.c:3617
 msgid "Warn if audio used in a layout is about to be altered."
 msgstr ""
 
-#: src/preferences.c:3566
+#: src/preferences.c:3628
 msgid "Popup layout errors after clip changes."
 msgstr ""
 
-#: src/preferences.c:3577
+#: src/preferences.c:3639
 msgid "Warn if the layout has not been saved when leaving multitrack mode."
 msgstr ""
 
-#: src/preferences.c:3588
+#: src/preferences.c:3650
 msgid ""
 "Warn if multitrack has no audio channels, and a layout with audio is loaded."
 msgstr ""
 
-#: src/preferences.c:3598
+#: src/preferences.c:3660
 msgid ""
 "Warn if multitrack has audio channels, and your audio player is not \"jack\" "
 "or \"pulse audio\"."
 msgstr ""
 
-#: src/preferences.c:3610
+#: src/preferences.c:3672
 msgid "Show info message after importing from firewire device."
 msgstr ""
 
-#: src/preferences.c:3626
+#: src/preferences.c:3688
 msgid "Show a warning before opening a yuv4mpeg stream (advanced)."
 msgstr ""
 
-#: src/preferences.c:3639
+#: src/preferences.c:3701
 msgid "Show a warning when multitrack is low on backup space."
 msgstr ""
 
-#: src/preferences.c:3650
+#: src/preferences.c:3713
 msgid "Show a warning advising cleaning of disk space after a crash."
 msgstr ""
 
-#: src/preferences.c:3661
+#: src/preferences.c:3725
 msgid "Show a warning if unable to connect to pulseaudio player."
 msgstr ""
 
-#: src/preferences.c:3673
+#: src/preferences.c:3737
 msgid "Show a warning before wiping a layout which has unsaved changes."
 msgstr ""
 
-#: src/preferences.c:3685
+#: src/preferences.c:3749
 msgid "Warnings"
 msgstr ""
 
-#: src/preferences.c:3703
+#: src/preferences.c:3767
 msgid "Midi synch (requires the files midistart and midistop)"
 msgstr ""
 
-#: src/preferences.c:3715
+#: src/preferences.c:3779
 msgid "When inserting/merging frames:  "
 msgstr ""
 
-#: src/preferences.c:3719
+#: src/preferences.c:3783
 msgid "_Speed Up/Slow Down Insertion"
 msgstr ""
 
-#: src/preferences.c:3723
+#: src/preferences.c:3787
 msgid "_Resample Insertion"
 msgstr ""
 
-#: src/preferences.c:3730
+#: src/preferences.c:3794
 msgid "CD device           "
 msgstr ""
 
-#: src/preferences.c:3733
+#: src/preferences.c:3797
 msgid "LiVES can load audio tracks from this CD"
 msgstr ""
 
-#: src/preferences.c:3746
+#: src/preferences.c:3813
 msgid "Default FPS        "
 msgstr ""
 
-#: src/preferences.c:3749
+#: src/preferences.c:3816
 msgid "Frames per second to use when none is specified"
 msgstr ""
 
-#: src/preferences.c:3757
+#: src/preferences.c:3825
 msgid "Misc"
 msgstr ""
 
-#: src/preferences.c:3782
+#: src/preferences.c:3850
 msgid "New theme:           "
 msgstr ""
 
-#: src/preferences.c:3800
+#: src/preferences.c:3867
 msgid "Themes"
 msgstr ""
 
-#: src/preferences.c:3815
+#: src/preferences.c:3882
 msgid "Download bandwidth (Kb/s)       "
 msgstr ""
 
-#: src/preferences.c:3823
+#: src/preferences.c:3890
 msgid "LiVES must be compiled without \"configure --disable-OSC\" to use OMC"
 msgstr ""
 
-#: src/preferences.c:3833
+#: src/preferences.c:3900
 msgid "OMC remote control enabled"
 msgstr ""
 
-#: src/preferences.c:3841
+#: src/preferences.c:3908
 msgid "UDP port       "
 msgstr ""
 
-#: src/preferences.c:3850
+#: src/preferences.c:3917
 msgid "Start OMC on startup"
 msgstr ""
 
-#: src/preferences.c:3870
+#: src/preferences.c:3937
 msgid "Streaming/Networking"
 msgstr ""
 
-#: src/preferences.c:3882
+#: src/preferences.c:3949
 msgid "Jack transport"
 msgstr ""
 
-#: src/preferences.c:3886
+#: src/preferences.c:3953
 msgid ""
 "LiVES must be compiled with jack/transport.h and jack/jack.h present to use "
 "jack transport"
 msgstr ""
 
-#: src/preferences.c:3892
+#: src/preferences.c:3959
 msgid "Jack _transport config file"
 msgstr ""
 
-#: src/preferences.c:3899 src/preferences.c:3989
+#: src/preferences.c:3967 src/preferences.c:4058
 msgid "Start _server on LiVES startup"
 msgstr ""
 
-#: src/preferences.c:3911
+#: src/preferences.c:3979
 msgid "Jack transport _master (start and stop)"
 msgstr ""
 
-#: src/preferences.c:3921
+#: src/preferences.c:3989
 msgid "Jack transport _client (start and stop)"
 msgstr ""
 
-#: src/preferences.c:3935
+#: src/preferences.c:4003
 msgid "Jack transport sets start position"
 msgstr ""
 
-#: src/preferences.c:3952
+#: src/preferences.c:4020
 msgid "Jack transport timebase slave"
 msgstr ""
 
-#: src/preferences.c:3963
+#: src/preferences.c:4031
 msgid "(See also Playback -> Audio follows video rate/direction)"
 msgstr ""
 
-#: src/preferences.c:3971
+#: src/preferences.c:4039
 msgid "Jack audio"
 msgstr ""
 
-#: src/preferences.c:3975
+#: src/preferences.c:4043
 msgid "LiVES must be compiled with jack/jack.h present to use jack audio"
 msgstr ""
 
-#: src/preferences.c:3978
+#: src/preferences.c:4046
 msgid ""
 "You MUST set the audio player to \"jack\" in the Playback tab to use jack "
 "audio"
 msgstr ""
 
-#: src/preferences.c:3984
+#: src/preferences.c:4052
 msgid "Jack _audio server config file"
 msgstr ""
 
-#: src/preferences.c:3996
+#: src/preferences.c:4065
 msgid "Play audio even when transport is _paused"
 msgstr ""
 
-#: src/preferences.c:4008
+#: src/preferences.c:4077
 msgid "Automatically connect to System Out ports when 'playing' External Audio"
 msgstr ""
 
-#: src/preferences.c:4021
+#: src/preferences.c:4090
 msgid "Jack Integration"
 msgstr ""
 
-#: src/preferences.c:4035
+#: src/preferences.c:4104
 msgid "Events to respond to:"
 msgstr ""
 
-#: src/preferences.c:4044
+#: src/preferences.c:4113
 msgid "_Joystick events"
 msgstr ""
 
-#: src/preferences.c:4051
+#: src/preferences.c:4120
 msgid "_Joystick device"
 msgstr ""
 
-#: src/preferences.c:4053
+#: src/preferences.c:4122
 msgid "The joystick device, e.g. /dev/input/js0"
 msgstr ""
 
-#: src/preferences.c:4071
+#: src/preferences.c:4142
 msgid "_MIDI events"
 msgstr ""
 
-#: src/preferences.c:4080
+#: src/preferences.c:4151
 msgid "Use _ALSA MIDI (recommended)"
 msgstr ""
 
-#: src/preferences.c:4082
+#: src/preferences.c:4153
 msgid "Create an ALSA MIDI port which other MIDI devices can be connected to"
 msgstr ""
 
-#: src/preferences.c:4090
+#: src/preferences.c:4162
 msgid "Use _raw MIDI"
 msgstr ""
 
-#: src/preferences.c:4092
+#: src/preferences.c:4164
 msgid "Read directly from the MIDI device"
 msgstr ""
 
-#: src/preferences.c:4104
+#: src/preferences.c:4177
 msgid "_MIDI device"
 msgstr ""
 
-#: src/preferences.c:4106
+#: src/preferences.c:4179
 msgid "The MIDI device, e.g. /dev/input/midi0"
 msgstr ""
 
-#: src/preferences.c:4118
+#: src/preferences.c:4193
 msgid "Advanced"
 msgstr ""
 
-#: src/preferences.c:4124
+#: src/preferences.c:4199
 msgid "MIDI check _rate"
 msgstr ""
 
-#: src/preferences.c:4127
+#: src/preferences.c:4203
 msgid ""
 "Number of MIDI checks per keyboard tick. Increasing this may improve MIDI "
 "responsiveness, but may slow down playback."
 msgstr ""
 
-#: src/preferences.c:4134
+#: src/preferences.c:4211
 msgid "MIDI repeat"
 msgstr ""
 
-#: src/preferences.c:4137
+#: src/preferences.c:4214
 msgid "Number of non-reads allowed between succesive reads."
 msgstr ""
 
-#: src/preferences.c:4140
+#: src/preferences.c:4218
 msgid "(Warning: setting this value too high can slow down playback.)"
 msgstr ""
 
-#: src/preferences.c:4159
+#: src/preferences.c:4237
 msgid "MIDI/Joystick learner"
 msgstr ""
 
-#: src/preferences.c:4499
+#: src/preferences.c:4679
 msgid ""
 "\n"
 "LiVES will now shut down. You need to restart it for the directory change to "
@@ -7512,214 +7523,214 @@
 "Click OK to continue.\n"
 msgstr ""
 
-#: src/preferences.c:4523
+#: src/preferences.c:4703
 msgid ""
 "For the directory change to take effect LiVES will restart when preferences "
 "dialog closes."
 msgstr ""
 
-#: src/preferences.c:4527
+#: src/preferences.c:4707
 msgid "Theme changes will not take effect until the next time you start LiVES."
 msgstr ""
 
-#: src/preferences.c:4531
+#: src/preferences.c:4711
 msgid "Jack options will not take effect until the next time you start LiVES."
 msgstr ""
 
-#: src/osc.c:2585
+#: src/osc.c:2616
 #, c-format
 msgid "Syncing to external framerate of %.8f frames per second.\n"
 msgstr ""
 
-#: src/osc.c:6746
+#: src/osc.c:6938
 msgid "Cannot initialize OSC receiver\n"
 msgstr ""
 
-#: src/osc.c:6770
+#: src/osc.c:6961
 #, c-format
 msgid "WARNING: Cannot start OSC server at UDP port %d\n"
 msgstr ""
 
-#: src/osc.c:6775
+#: src/osc.c:6963
 #, c-format
 msgid "Started OSC server at UDP port %d\n"
 msgstr ""
 
-#: src/osc.c:6890
+#: src/osc.c:7076
 #, c-format
 msgid "Cannot start OSC/UDP server at port %d \n"
 msgstr ""
 
-#: src/resample.c:125 src/resample.c:304
+#: src/resample.c:131 src/resample.c:305
 #, c-format
 msgid "Resizing frames 1 to %d"
 msgstr ""
 
-#: src/resample.c:140 src/resample.c:318
+#: src/resample.c:145 src/resample.c:318
 #, c-format
 msgid "Resizing/letterboxing frames 1 to %d"
 msgstr ""
 
-#: src/resample.c:361 src/resample.c:385
+#: src/resample.c:360 src/resample.c:384
 msgid "Resize"
 msgstr ""
 
-#: src/resample.c:395
+#: src/resample.c:394
 msgid "Resample/Resize"
 msgstr ""
 
-#: src/resample.c:680
+#: src/resample.c:676
 #, c-format
 msgid "Length of video is now %d frames.\n"
 msgstr ""
 
-#: src/resample.c:745
+#: src/resample.c:737
 msgid ""
 "\n"
 "\n"
 "New rate must be greater than 0\n"
 msgstr ""
 
-#: src/resample.c:797 src/resample.c:813
+#: src/resample.c:788 src/resample.c:803
 msgid "Resampling audio"
 msgstr ""
 
-#: src/resample.c:831
+#: src/resample.c:821
 msgid "LiVES was unable to resample the audio as requested.\n"
 msgstr ""
 
-#: src/resample.c:833 src/resample.c:837
+#: src/resample.c:823 src/resample.c:827
 msgid "Resample Audio"
 msgstr ""
 
-#: src/resample.c:845
+#: src/resample.c:835
 #, c-format
 msgid "Audio was resampled to %d Hz, %d channels, %d bit"
 msgstr ""
 
-#: src/resample.c:1034
+#: src/resample.c:1016
 #, c-format
 msgid "Resampling video at %.8f frames per second..."
 msgstr ""
 
-#: src/resample.c:1037
+#: src/resample.c:1018
 #, c-format
 msgid "Resampling video at %.3f frames per second..."
 msgstr ""
 
-#: src/resample.c:1068
+#: src/resample.c:1049
 msgid "Reordering error !\n"
 msgstr ""
 
-#: src/resample.c:1079
+#: src/resample.c:1060
 msgid "Resample"
 msgstr ""
 
-#: src/resample.c:1192
+#: src/resample.c:1173
 msgid "LiVES: - Resample Audio"
 msgstr ""
 
-#: src/resample.c:1195
+#: src/resample.c:1175
 msgid "LiVES: - Insert Silence"
 msgstr ""
 
-#: src/resample.c:1198
+#: src/resample.c:1177
 msgid "LiVES: - New Clip Audio"
 msgstr ""
 
-#: src/resample.c:1201
+#: src/resample.c:1179
 msgid "LiVES: - External Clip Settings"
 msgstr ""
 
-#: src/resample.c:1238 src/resample.c:1358
+#: src/resample.c:1215 src/resample.c:1332
 msgid "Rate (Hz) "
 msgstr ""
 
-#: src/resample.c:1245 src/resample.c:1372
+#: src/resample.c:1222 src/resample.c:1346
 msgid "Channels"
 msgstr ""
 
-#: src/resample.c:1252
+#: src/resample.c:1229
 msgid "Sample Size "
 msgstr ""
 
-#: src/resample.c:1268 src/resample.c:1425
+#: src/resample.c:1245 src/resample.c:1399
 msgid "Signed"
 msgstr ""
 
-#: src/resample.c:1274 src/resample.c:1435
+#: src/resample.c:1251 src/resample.c:1409
 msgid "Unsigned"
 msgstr ""
 
-#: src/resample.c:1297 src/resample.c:1460
+#: src/resample.c:1273 src/resample.c:1433
 msgid "Little Endian"
 msgstr ""
 
-#: src/resample.c:1303 src/resample.c:1468
+#: src/resample.c:1279 src/resample.c:1441
 msgid "Big Endian"
 msgstr ""
 
-#: src/resample.c:1315
+#: src/resample.c:1290
 msgid "Current"
 msgstr ""
 
-#: src/resample.c:1340
+#: src/resample.c:1315
 msgid "_Enable audio"
 msgstr ""
 
-#: src/resample.c:1372
+#: src/resample.c:1346
 msgid "_Channels"
 msgstr ""
 
-#: src/resample.c:1394
+#: src/resample.c:1368
 msgid "_Sample Size"
 msgstr ""
 
-#: src/resample.c:1394
+#: src/resample.c:1368
 msgid "Sample Size"
 msgstr ""
 
-#: src/resample.c:1489
+#: src/resample.c:1461
 msgid "New"
 msgstr ""
 
-#: src/resample.c:1512
+#: src/resample.c:1484
 msgid "_Frames Per Second "
 msgstr ""
 
-#: src/resample.c:1530
+#: src/resample.c:1502
 msgid "Record for maximum:  "
 msgstr ""
 
-#: src/resample.c:1533
+#: src/resample.c:1505
 msgid " hours  "
 msgstr ""
 
-#: src/resample.c:1536
+#: src/resample.c:1508
 msgid " minutes  "
 msgstr ""
 
-#: src/resample.c:1538
+#: src/resample.c:1510
 msgid " seconds  "
 msgstr ""
 
-#: src/resample.c:1545
+#: src/resample.c:1517
 msgid "Unlimited"
 msgstr ""
 
-#: src/resample.c:1561
+#: src/resample.c:1533
 msgid "Click OK to begin recording, or Cancel to quit."
 msgstr ""
 
-#: src/resample.c:1670
+#: src/resample.c:1638
 msgid "LiVES: - Change playback speed"
 msgstr ""
 
-#: src/resample.c:1673
+#: src/resample.c:1640
 msgid "LiVES: - Resample Video"
 msgstr ""
 
-#: src/resample.c:1696
+#: src/resample.c:1663
 #, c-format
 msgid ""
 "\n"
@@ -7730,7 +7741,7 @@
 "in _frames per second"
 msgstr ""
 
-#: src/resample.c:1701
+#: src/resample.c:1667
 #, c-format
 msgid ""
 "\n"
@@ -7741,89 +7752,89 @@
 "in frames per second"
 msgstr ""
 
-#: src/resample.c:1723
+#: src/resample.c:1688
 msgid "OR enter the desired clip length in _seconds"
 msgstr ""
 
-#: src/resample.c:1745
+#: src/resample.c:1710
 msgid "Change the _audio speed as well"
 msgstr ""
 
-#: src/resample.c:1846
+#: src/resample.c:1810
 msgid ""
 "\n"
 "Speeding up the clip will cause missing frames in some multitrack layouts.\n"
 "Are you sure you wish to change the speed ?\n"
 msgstr ""
 
-#: src/resample.c:1863
+#: src/resample.c:1829
 msgid ""
 "\n"
 "Speeding up the clip will cause missing audio in some multitrack layouts.\n"
 "Are you sure you wish to change the speed ?\n"
 msgstr ""
 
-#: src/resample.c:1878
+#: src/resample.c:1847
 msgid ""
 "\n"
 "Changing the speed will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/resample.c:1892
+#: src/resample.c:1863
 msgid ""
 "\n"
 "Changing the speed will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/resample.c:1938
+#: src/resample.c:1911
 msgid "Speed Change"
 msgstr ""
 
-#: src/resample.c:1947
+#: src/resample.c:1920
 #, c-format
 msgid "Changed playback speed to %.3f frames per second and audio to %d Hz.\n"
 msgstr ""
 
-#: src/resample.c:1950
+#: src/resample.c:1922
 #, c-format
 msgid "Changed playback speed to %.3f frames per second.\n"
 msgstr ""
 
-#: src/resample.c:2035
+#: src/resample.c:2006
 msgid "Resampling video"
 msgstr ""
 
-#: src/resample.c:2042 src/resample.c:2160 src/resample.c:2182
+#: src/resample.c:2012 src/resample.c:2127 src/resample.c:2148
 msgid "Resampling clipboard video"
 msgstr ""
 
-#: src/resample.c:2047
+#: src/resample.c:2016
 msgid "Reordering frames"
 msgstr ""
 
-#: src/resample.c:2056
+#: src/resample.c:2025
 msgid ""
 "\n"
 "\n"
 "LiVES was unable to reorder the frames."
 msgstr ""
 
-#: src/resample.c:2104
+#: src/resample.c:2071
 msgid "Deordering frames"
 msgstr ""
 
-#: src/resample.c:2199
+#: src/resample.c:2165
 msgid "resampling error..."
 msgstr ""
 
-#: src/rte_window.c:85 src/rte_window.c:1708
+#: src/rte_window.c:124 src/rte_window.c:1709
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
-#: src/rte_window.c:112
+#: src/rte_window.c:150
 msgid ""
 "\n"
 "\n"
@@ -7833,7 +7844,7 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:426
+#: src/rte_window.c:460
 msgid ""
 "\n"
 "\n"
@@ -7841,19 +7852,19 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:432
+#: src/rte_window.c:466
 #, c-format
 msgid "Saving keymap to %s\n"
 msgstr ""
 
-#: src/rte_window.c:439
+#: src/rte_window.c:471
 #, c-format
 msgid ""
 "\n"
 "Updating keymap file %s..."
 msgstr ""
 
-#: src/rte_window.c:446
+#: src/rte_window.c:477
 #, c-format
 msgid ""
 "\n"
@@ -7863,12 +7874,12 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/rte_window.c:526
+#: src/rte_window.c:556
 #, c-format
 msgid "Saving real time effect defaults to %s..."
 msgstr ""
 
-#: src/rte_window.c:535
+#: src/rte_window.c:563
 #, c-format
 msgid ""
 "\n"
@@ -7878,22 +7889,22 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/rte_window.c:632
+#: src/rte_window.c:657
 #, c-format
 msgid "Loading real time effect defaults from %s..."
 msgstr ""
 
-#: src/rte_window.c:681
+#: src/rte_window.c:701
 #, c-format
 msgid "Loading generator default sizes from %s..."
 msgstr ""
 
-#: src/rte_window.c:1306
+#: src/rte_window.c:1319
 #, c-format
 msgid "Loading default keymap from %s..."
 msgstr ""
 
-#: src/rte_window.c:1329
+#: src/rte_window.c:1339
 #, c-format
 msgid ""
 "\n"
@@ -7903,48 +7914,48 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/rte_window.c:1403
+#: src/rte_window.c:1412
 #, c-format
 msgid "Invalid line %d in %s\n"
 msgstr ""
 
-#: src/rte_window.c:1483
+#: src/rte_window.c:1490
 #, c-format
 msgid "Invalid key %d in %s\n"
 msgstr ""
 
-#: src/rte_window.c:1498
+#: src/rte_window.c:1505
 #, c-format
 msgid "Invalid effect %s in %s\n"
 msgstr ""
 
-#: src/rte_window.c:1517
+#: src/rte_window.c:1524
 #, c-format
 msgid "Unknown effect %s in %s\n"
 msgstr ""
 
-#: src/rte_window.c:1535
+#: src/rte_window.c:1542
 #, c-format
 msgid ""
 "This version of LiVES cannot mix generators/non-generators on the same key "
 "(%d) !\n"
 msgstr ""
 
-#: src/rte_window.c:1547
+#: src/rte_window.c:1554
 #, c-format
 msgid "Too many effects bound to key %d.\n"
 msgstr ""
 
-#: src/rte_window.c:1587
+#: src/rte_window.c:1593
 msgid "update required.\n"
 msgstr ""
 
-#: src/rte_window.c:1603
+#: src/rte_window.c:1607
 #, c-format
 msgid "Loading data connection map from %s..."
 msgstr ""
 
-#: src/rte_window.c:1612
+#: src/rte_window.c:1614
 msgid ""
 "\n"
 "\n"
@@ -7952,41 +7963,41 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:1691
+#: src/rte_window.c:1692
 #, c-format
 msgid "LiVES: Information for %s"
 msgstr ""
 
-#: src/rte_window.c:1704
+#: src/rte_window.c:1705
 #, c-format
 msgid "Effect name: %s"
 msgstr ""
 
-#: src/rte_window.c:1712
+#: src/rte_window.c:1713
 #, c-format
 msgid "Plugin name: %s"
 msgstr ""
 
-#: src/rte_window.c:1716
+#: src/rte_window.c:1717
 #, c-format
 msgid "Author: %s"
 msgstr ""
 
-#: src/rte_window.c:1721
+#: src/rte_window.c:1722
 #, c-format
 msgid "and: %s"
 msgstr ""
 
-#: src/rte_window.c:1726
+#: src/rte_window.c:1727
 #, c-format
 msgid "Version: %d"
 msgstr ""
 
-#: src/rte_window.c:1734
+#: src/rte_window.c:1735
 msgid "Description: "
 msgstr ""
 
-#: src/rte_window.c:1960
+#: src/rte_window.c:1963
 msgid ""
 "\n"
 "\n"
@@ -7995,69 +8006,69 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:2024
+#: src/rte_window.c:2027
 #, c-format
 msgid "LiVES could not locate the effect %s.\n"
 msgstr ""
 
-#: src/rte_window.c:2225
+#: src/rte_window.c:2216
 msgid "LiVES: Real time effect mapping"
 msgstr ""
 
-#: src/rte_window.c:2257
+#: src/rte_window.c:2248
 #, c-format
 msgid "Ctrl-%d"
 msgstr ""
 
-#: src/rte_window.c:2264
+#: src/rte_window.c:2255
 msgid "Key active"
 msgstr ""
 
-#: src/rte_window.c:2279
+#: src/rte_window.c:2271
 msgid "Key grab"
 msgstr ""
 
-#: src/rte_window.c:2280
+#: src/rte_window.c:2272
 msgid "Grab keyboard for this effect key"
 msgstr ""
 
-#: src/rte_window.c:2290
+#: src/rte_window.c:2283
 msgid "_Clear all effects"
 msgstr ""
 
-#: src/rte_window.c:2304
+#: src/rte_window.c:2297
 msgid "Mode active"
 msgstr ""
 
-#: src/rte_window.c:2314 src/multitrack.c:8568
+#: src/rte_window.c:2307 src/multitrack.c:8762
 msgid "Info"
 msgstr ""
 
-#: src/rte_window.c:2315
+#: src/rte_window.c:2308
 msgid "Set Parameters"
 msgstr ""
 
-#: src/rte_window.c:2316
+#: src/rte_window.c:2309
 msgid "Set Connections"
 msgstr ""
 
-#: src/rte_window.c:2317
+#: src/rte_window.c:2310
 msgid "Clear"
 msgstr ""
 
-#: src/rte_window.c:2326
+#: src/rte_window.c:2319
 msgid "Effect name:"
 msgstr ""
 
-#: src/rte_window.c:2391
+#: src/rte_window.c:2384
 msgid "_Save as default keymap"
 msgstr ""
 
-#: src/rte_window.c:2396
+#: src/rte_window.c:2389
 msgid "_Load default keymap"
 msgstr ""
 
-#: src/rte_window.c:2840
+#: src/rte_window.c:2833
 #, c-format
 msgid ""
 "Unable to create default keymap file: %s\n"
@@ -8115,86 +8126,86 @@
 msgid "none\n"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:494
+#: src/lives-yuv4mpeg.c:493
 #, c-format
 msgid ""
 "Unable to set display framerate to %.3f fps.\n"
 "\n"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:503
+#: src/lives-yuv4mpeg.c:502
 #, c-format
 msgid "Unable to open yuv4mpeg out stream %s\n"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:628
+#: src/lives-yuv4mpeg.c:626
 #, c-format
 msgid "TV card %d"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:713
+#: src/lives-yuv4mpeg.c:710
 #, c-format
 msgid "Opened TV card %d (%s)"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:760
+#: src/lives-yuv4mpeg.c:757
 #, c-format
 msgid "Firewire card %d"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:796
+#: src/lives-yuv4mpeg.c:793
 #, c-format
 msgid "Opened firewire card %d"
 msgstr ""
 
-#: src/multitrack.c:666
+#: src/multitrack.c:736
 msgid "Auto backup"
 msgstr ""
 
-#: src/multitrack.c:868
+#: src/multitrack.c:935
 msgid "Backing audio"
 msgstr ""
 
-#: src/multitrack.c:1435
+#: src/multitrack.c:1515
 #, c-format
 msgid "%s : parameters for %s"
 msgstr ""
 
-#: src/multitrack.c:1809 src/multitrack.c:3483
+#: src/multitrack.c:1881 src/multitrack.c:3635
 #, c-format
 msgid "Current track: %s (layer %d)\n"
 msgstr ""
 
-#: src/multitrack.c:1813 src/multitrack.c:3484
+#: src/multitrack.c:1885 src/multitrack.c:3637
 msgid "Current track: Backing audio\n"
 msgstr ""
 
-#: src/multitrack.c:1814
+#: src/multitrack.c:1886
 #, c-format
 msgid "Current track: Layer %d audio\n"
 msgstr ""
 
-#: src/multitrack.c:1817
+#: src/multitrack.c:1889
 #, c-format
 msgid "%.2f sec.\n"
 msgstr ""
 
-#: src/multitrack.c:1822 src/multitrack.c:3490
+#: src/multitrack.c:1894 src/multitrack.c:3643
 #, c-format
 msgid "Source: %s"
 msgstr ""
 
-#: src/multitrack.c:1825 src/multitrack.c:3492
+#: src/multitrack.c:1897 src/multitrack.c:3645
 msgid "Right click for context menu.\n"
 msgstr ""
 
-#: src/multitrack.c:1827
+#: src/multitrack.c:1899
 msgid ""
 "Double click on a block\n"
 "to select it."
 msgstr ""
 
-#: src/multitrack.c:3312
+#: src/multitrack.c:3452
 msgid ""
 "\n"
 "\n"
@@ -8203,7 +8214,7 @@
 "right or double clicking on it.\n"
 msgstr ""
 
-#: src/multitrack.c:3315
+#: src/multitrack.c:3455
 msgid ""
 "\n"
 "\n"
@@ -8211,14 +8222,14 @@
 "Select an effect in FX stack first to view its parameters.\n"
 msgstr ""
 
-#: src/multitrack.c:3318
+#: src/multitrack.c:3458
 msgid ""
 "\n"
 "\n"
 "No clips loaded.\n"
 msgstr ""
 
-#: src/multitrack.c:3321
+#: src/multitrack.c:3462
 msgid ""
 "You must select two video tracks\n"
 "and a time region\n"
@@ -8228,7 +8239,7 @@
 "before inserting clips into the timeline."
 msgstr ""
 
-#: src/multitrack.c:3324
+#: src/multitrack.c:3465
 msgid ""
 "\n"
 "\n"
@@ -8237,210 +8248,210 @@
 "to apply compositors.\n"
 msgstr ""
 
-#: src/multitrack.c:3487
+#: src/multitrack.c:3640
 #, c-format
 msgid "%.2f sec. to %.2f sec.\n"
 msgstr ""
 
-#: src/multitrack.c:3493
+#: src/multitrack.c:3646
 msgid ""
 "Single click on timeline\n"
 "to select a frame.\n"
 msgstr ""
 
-#: src/multitrack.c:3711 src/multitrack.c:6790
+#: src/multitrack.c:3858 src/multitrack.c:6972
 #, c-format
 msgid "%s [unstable]"
 msgstr ""
 
-#: src/multitrack.c:3822
+#: src/multitrack.c:3973
 msgid ""
 "You can click and drag\n"
 "below the timeline"
 msgstr ""
 
-#: src/multitrack.c:3823
+#: src/multitrack.c:3974
 msgid "to select a time region.\n"
 msgstr ""
 
-#: src/multitrack.c:3985
+#: src/multitrack.c:4137
 msgid "LiVES: Selected clip"
 msgstr ""
 
-#: src/multitrack.c:3993
+#: src/multitrack.c:4145
 msgid "_Adjust start and end points"
 msgstr ""
 
-#: src/multitrack.c:4002
+#: src/multitrack.c:4154
 msgid "_Edit/encode in clip editor"
 msgstr ""
 
-#: src/multitrack.c:4009
+#: src/multitrack.c:4161
 msgid "_Show clip information"
 msgstr ""
 
-#: src/multitrack.c:4016
+#: src/multitrack.c:4168
 msgid "_Close this clip"
 msgstr ""
 
-#: src/multitrack.c:4236
+#: src/multitrack.c:4388
 msgid "Audio mixer (ctrl-m)"
 msgstr ""
 
-#: src/multitrack.c:4336
+#: src/multitrack.c:4488
 msgid "Single click on timeline"
 msgstr ""
 
-#: src/multitrack.c:4337
+#: src/multitrack.c:4489
 msgid "to select a frame."
 msgstr ""
 
-#: src/multitrack.c:4338
+#: src/multitrack.c:4490
 msgid "Double click or right click on timeline"
 msgstr ""
 
-#: src/multitrack.c:4339
+#: src/multitrack.c:4491
 msgid "to select a block."
 msgstr ""
 
-#: src/multitrack.c:4340
+#: src/multitrack.c:4492
 msgid "Clips can be dragged"
 msgstr ""
 
-#: src/multitrack.c:4341
+#: src/multitrack.c:4493
 msgid "onto the timeline."
 msgstr ""
 
-#: src/multitrack.c:4343
+#: src/multitrack.c:4495
 msgid "Mouse mode is: Move"
 msgstr ""
 
-#: src/multitrack.c:4344
+#: src/multitrack.c:4496
 msgid "clips can be moved around."
 msgstr ""
 
-#: src/multitrack.c:4349
+#: src/multitrack.c:4500
 msgid "Mouse mode is: Select."
 msgstr ""
 
-#: src/multitrack.c:4350
+#: src/multitrack.c:4501
 msgid "Drag with mouse on timeline"
 msgstr ""
 
-#: src/multitrack.c:4351
+#: src/multitrack.c:4502
 msgid "to select tracks and time."
 msgstr ""
 
-#: src/multitrack.c:4362
+#: src/multitrack.c:4509
 msgid "_Insert mode: Normal"
 msgstr ""
 
-#: src/multitrack.c:4378
+#: src/multitrack.c:4537
 msgid "_Mouse mode: Move"
 msgstr ""
 
-#: src/multitrack.c:4382
+#: src/multitrack.c:4540
 msgid "_Mouse mode: Select"
 msgstr ""
 
-#: src/multitrack.c:4405 src/multitrack.c:7925
+#: src/multitrack.c:4563 src/multitrack.c:8104
 msgid "Gravity: Normal"
 msgstr ""
 
-#: src/multitrack.c:4409
+#: src/multitrack.c:4565
 msgid "Gravity: Left"
 msgstr ""
 
-#: src/multitrack.c:4414
+#: src/multitrack.c:4569
 msgid "Gravity: Right"
 msgstr ""
 
-#: src/multitrack.c:4416
+#: src/multitrack.c:4570
 msgid "Close _last gap(s) in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:4419
+#: src/multitrack.c:4572
 msgid "Close _first gap(s) in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:4458
+#: src/multitrack.c:4627
 msgid "Close gaps"
 msgstr ""
 
-#: src/multitrack.c:4460
+#: src/multitrack.c:4629
 msgid "Move block"
 msgstr ""
 
-#: src/multitrack.c:4462
+#: src/multitrack.c:4631
 msgid "Move audio block"
 msgstr ""
 
-#: src/multitrack.c:4464
+#: src/multitrack.c:4633
 msgid "Delete block"
 msgstr ""
 
-#: src/multitrack.c:4466
+#: src/multitrack.c:4635
 msgid "Delete audio block"
 msgstr ""
 
-#: src/multitrack.c:4468
+#: src/multitrack.c:4637
 msgid "Split tracks"
 msgstr ""
 
-#: src/multitrack.c:4470
+#: src/multitrack.c:4639
 msgid "Split block"
 msgstr ""
 
-#: src/multitrack.c:4473
+#: src/multitrack.c:4642
 #, c-format
 msgid "Apply %s"
 msgstr ""
 
-#: src/multitrack.c:4478
+#: src/multitrack.c:4647
 #, c-format
 msgid "Delete %s"
 msgstr ""
 
-#: src/multitrack.c:4482
+#: src/multitrack.c:4651
 msgid "Insert block"
 msgstr ""
 
-#: src/multitrack.c:4484
+#: src/multitrack.c:4653
 msgid "Insert gap"
 msgstr ""
 
-#: src/multitrack.c:4486
+#: src/multitrack.c:4655
 msgid "Insert audio block"
 msgstr ""
 
-#: src/multitrack.c:4488
+#: src/multitrack.c:4657
 msgid "Effect order change"
 msgstr ""
 
-#: src/multitrack.c:4898
+#: src/multitrack.c:5064
 msgid "unsigned "
 msgstr ""
 
-#: src/multitrack.c:4899
+#: src/multitrack.c:5065
 msgid "signed "
 msgstr ""
 
-#: src/multitrack.c:4904
+#: src/multitrack.c:5071
 #, c-format
 msgid ""
 "Multitrack values set to %.3f fps, frame size %d x %d, audio channels %d, "
 "audio rate %d, audio sample size %d, %s.\n"
 msgstr ""
 
-#: src/multitrack.c:4938
+#: src/multitrack.c:5104
 msgid "invalid event list. Failed.\n"
 msgstr ""
 
-#: src/multitrack.c:4944
+#: src/multitrack.c:5110
 msgid "event list has invalid fps. Failed.\n"
 msgstr ""
 
-#: src/multitrack.c:4953
+#: src/multitrack.c:5122
 #, c-format
 msgid ""
 "\n"
@@ -8450,7 +8461,7 @@
 "then load in the new set from the File menu.\n"
 msgstr ""
 
-#: src/multitrack.c:4993
+#: src/multitrack.c:5163
 #, c-format
 msgid ""
 "\n"
@@ -8458,600 +8469,592 @@
 "It cannot be loaded.\n"
 msgstr ""
 
-#: src/multitrack.c:5329 src/multitrack.c:5338 src/multitrack.c:21133
+#: src/multitrack.c:5452
 msgid "Layout was wiped.\n"
 msgstr ""
 
-#: src/multitrack.c:5374
+#: src/multitrack.c:5547
 #, c-format
 msgid "LiVES-%s: Multitrack %dx%d : %d bpp %.3f fps"
 msgstr ""
 
-#: src/multitrack.c:5617
+#: src/multitrack.c:5793
 msgid "In/out"
 msgstr ""
 
-#: src/multitrack.c:5619
+#: src/multitrack.c:5795
 msgid "FX stack"
 msgstr ""
 
-#: src/multitrack.c:5627 src/omc-learn.c:673
+#: src/multitrack.c:5803 src/omc-learn.c:659
 msgid "Params."
 msgstr ""
 
-#: src/multitrack.c:5978
+#: src/multitrack.c:6157
 msgid "_Open..."
 msgstr ""
 
-#: src/multitrack.c:5996
+#: src/multitrack.c:6175
 msgid "O_pen File Selection..."
 msgstr ""
 
-#: src/multitrack.c:6040
+#: src/multitrack.c:6219
 msgid "Import Selection from _dvd/vcd..."
 msgstr ""
 
-#: src/multitrack.c:6050
+#: src/multitrack.c:6229
 msgid "Import Selection from _dvd"
 msgstr ""
 
-#: src/multitrack.c:6060
+#: src/multitrack.c:6239
 msgid "Import Selection from _vcd"
 msgstr ""
 
-#: src/multitrack.c:6076
+#: src/multitrack.c:6255
 msgid "_Import from Device"
 msgstr ""
 
-#: src/multitrack.c:6103
+#: src/multitrack.c:6282
 msgid "_Close the selected clip"
 msgstr ""
 
-#: src/multitrack.c:6198
+#: src/multitrack.c:6377
 msgid "_Save layout as..."
 msgstr ""
 
-#: src/multitrack.c:6206
+#: src/multitrack.c:6385
 msgid "_Load layout..."
 msgstr ""
 
-#: src/multitrack.c:6210
+#: src/multitrack.c:6389
 msgid "_Wipe/Delete layout..."
 msgstr ""
 
-#: src/multitrack.c:6236
+#: src/multitrack.c:6415
 msgid "_Ignore width, height and audio values from loaded layouts"
 msgstr ""
 
-#: src/multitrack.c:6240
+#: src/multitrack.c:6419
 msgid "Auto load _subtitles with clips"
 msgstr ""
 
-#: src/multitrack.c:6322
+#: src/multitrack.c:6501
 msgid "_CLIP EDITOR"
 msgstr ""
 
-#: src/multitrack.c:6334
+#: src/multitrack.c:6513
 msgid "_Adjust selected clip start/end points"
 msgstr ""
 
-#: src/multitrack.c:6343
+#: src/multitrack.c:6522
 msgid "_Insert selected clip"
 msgstr ""
 
-#: src/multitrack.c:6355
+#: src/multitrack.c:6534
 msgid "_Insert selected clip audio"
 msgstr ""
 
-#: src/multitrack.c:6364
+#: src/multitrack.c:6543
 msgid "_Delete selected block"
 msgstr ""
 
-#: src/multitrack.c:6373
+#: src/multitrack.c:6555
 msgid "_Jump to previous block boundary"
 msgstr ""
 
-#: src/multitrack.c:6382
+#: src/multitrack.c:6564
 msgid "_Jump to next block boundary"
 msgstr ""
 
-#: src/multitrack.c:6395
+#: src/multitrack.c:6577
 msgid "Clear _marks from timeline"
 msgstr ""
 
-#: src/multitrack.c:6403
+#: src/multitrack.c:6585
 msgid "Ignore selection limits when inserting"
 msgstr ""
 
-#: src/multitrack.c:6420 src/multitrack.c:16719
+#: src/multitrack.c:6602 src/multitrack.c:17009
 msgid "_Play from Timeline Position"
 msgstr ""
 
-#: src/multitrack.c:6434
+#: src/multitrack.c:6616
 msgid "Pla_y selected time only"
 msgstr ""
 
-#: src/multitrack.c:6518
+#: src/multitrack.c:6700
 msgid "_Move effects with blocks"
 msgstr ""
 
-#: src/multitrack.c:6531
+#: src/multitrack.c:6713
 msgid "Select _autotransition effect..."
 msgstr ""
 
-#: src/multitrack.c:6542
+#: src/multitrack.c:6724
 msgid "Crossfade audio with autotransition"
 msgstr ""
 
-#: src/multitrack.c:6550
+#: src/multitrack.c:6732
 msgid "View/_Edit selected effect"
 msgstr ""
 
-#: src/multitrack.c:6554
+#: src/multitrack.c:6736
 msgid "_Delete selected effect"
 msgstr ""
 
-#: src/multitrack.c:6562
+#: src/multitrack.c:6744
 msgid "Apply effect to _block..."
 msgstr ""
 
-#: src/multitrack.c:6619
+#: src/multitrack.c:6801
 msgid "Apply effect to _region..."
 msgstr ""
 
-#: src/multitrack.c:6885
+#: src/multitrack.c:7061
 msgid "_Tracks"
 msgstr ""
 
-#: src/multitrack.c:6896
+#: src/multitrack.c:7072
 msgid "Rename current track"
 msgstr ""
 
-#: src/multitrack.c:6904
+#: src/multitrack.c:7080
 msgid "Make _Backing Audio current track"
 msgstr ""
 
-#: src/multitrack.c:6915
+#: src/multitrack.c:7091
 msgid "Add Video Track at _Rear"
 msgstr ""
 
-#: src/multitrack.c:6923
+#: src/multitrack.c:7099
 msgid "Add Video Track at _Front"
 msgstr ""
 
-#: src/multitrack.c:6936
+#: src/multitrack.c:7112
 msgid "_Split current track at cursor"
 msgstr ""
 
-#: src/multitrack.c:6948
+#: src/multitrack.c:7124
 msgid "_Split selected video tracks"
 msgstr ""
 
-#: src/multitrack.c:6961
+#: src/multitrack.c:7137
 msgid "Insert gap in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:6969
+#: src/multitrack.c:7145
 msgid "Insert gap in current track/selected time"
 msgstr ""
 
-#: src/multitrack.c:6981
+#: src/multitrack.c:7157
 msgid "Close all _gaps in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:7007
+#: src/multitrack.c:7183
 msgid "Se_lection"
 msgstr ""
 
-#: src/multitrack.c:7018
+#: src/multitrack.c:7194
 msgid "_Select Current Track"
 msgstr ""
 
-#: src/multitrack.c:7025
+#: src/multitrack.c:7201
 msgid "Select _all video tracks"
 msgstr ""
 
-#: src/multitrack.c:7032
+#: src/multitrack.c:7208
 msgid "Select _no video tracks"
 msgstr ""
 
-#: src/multitrack.c:7039
+#: src/multitrack.c:7215
 msgid "Select all _time"
 msgstr ""
 
-#: src/multitrack.c:7050
+#: src/multitrack.c:7226
 msgid "Select from _zero time"
 msgstr ""
 
-#: src/multitrack.c:7057
+#: src/multitrack.c:7233
 msgid "Select to _end time"
 msgstr ""
 
-#: src/multitrack.c:7064
+#: src/multitrack.c:7240
 msgid "_Copy..."
 msgstr ""
 
-#: src/multitrack.c:7075
+#: src/multitrack.c:7251
 msgid "_Timecode to region start"
 msgstr ""
 
-#: src/multitrack.c:7082
+#: src/multitrack.c:7258
 msgid "_Timecode to region end"
 msgstr ""
 
-#: src/multitrack.c:7089
+#: src/multitrack.c:7265
 msgid "_Region start to timecode"
 msgstr ""
 
-#: src/multitrack.c:7096
+#: src/multitrack.c:7272
 msgid "_Region end to timecode"
 msgstr ""
 
-#: src/multitrack.c:7110
+#: src/multitrack.c:7286
 msgid "Select/deselect block at current track/time"
 msgstr ""
 
-#: src/multitrack.c:7135
+#: src/multitrack.c:7311
 msgid "_Change width, height and audio values..."
 msgstr ""
 
-#: src/multitrack.c:7194
+#: src/multitrack.c:7370
 msgid "_Render"
 msgstr ""
 
-#: src/multitrack.c:7205
+#: src/multitrack.c:7381
 msgid "_Render all to new clip"
 msgstr ""
 
-#: src/multitrack.c:7220
+#: src/multitrack.c:7396
 msgid "Render _video"
 msgstr ""
 
-#: src/multitrack.c:7225
+#: src/multitrack.c:7401
 msgid "Render _audio"
 msgstr ""
 
-#: src/multitrack.c:7235
+#: src/multitrack.c:7411
 msgid "_Normalise rendered audio"
 msgstr ""
 
-#: src/multitrack.c:7242
+#: src/multitrack.c:7418
 msgid "_Pre-render audio"
 msgstr ""
 
-#: src/multitrack.c:7251
+#: src/multitrack.c:7427
 msgid "_View"
 msgstr ""
 
-#: src/multitrack.c:7270
+#: src/multitrack.c:7446
 msgid "Block _In/out points"
 msgstr ""
 
-#: src/multitrack.c:7279
+#: src/multitrack.c:7455
 msgid "_Effects at current"
 msgstr ""
 
-#: src/multitrack.c:7297
+#: src/multitrack.c:7473
 msgid "Audio parameters"
 msgstr ""
 
-#: src/multitrack.c:7308
+#: src/multitrack.c:7484
 msgid "Show backing _audio track"
 msgstr ""
 
-#: src/multitrack.c:7312
+#: src/multitrack.c:7488
 msgid "Compact view"
 msgstr ""
 
-#: src/multitrack.c:7320
+#: src/multitrack.c:7496
 msgid "Maximum tracks to display..."
 msgstr ""
 
-#: src/multitrack.c:7327
+#: src/multitrack.c:7503
 msgid "Scroll to follow playback"
 msgstr ""
 
-#: src/multitrack.c:7331
+#: src/multitrack.c:7507
 msgid "_Center on cursor"
 msgstr ""
 
-#: src/multitrack.c:7338
+#: src/multitrack.c:7514
 msgid "_Zoom in"
 msgstr ""
 
-#: src/multitrack.c:7349
+#: src/multitrack.c:7525
 msgid "_Zoom out"
 msgstr ""
 
-#: src/multitrack.c:7361
+#: src/multitrack.c:7537
 msgid "Multitrack _details"
 msgstr ""
 
-#: src/multitrack.c:7374
+#: src/multitrack.c:7550
 msgid "_Event Window"
 msgstr ""
 
-#: src/multitrack.c:7378
+#: src/multitrack.c:7554
 msgid "_Event Window (selected time only)"
 msgstr ""
 
-#: src/multitrack.c:7382
+#: src/multitrack.c:7558
 msgid "_Show FRAME events"
 msgstr ""
 
-#: src/multitrack.c:7399
+#: src/multitrack.c:7575
 msgid "_Show multitrack keys"
 msgstr ""
 
-#: src/multitrack.c:7468
+#: src/multitrack.c:7644
 msgid "Mouse mode: _Move"
 msgstr ""
 
-#: src/multitrack.c:7476
+#: src/multitrack.c:7652
 msgid "Mouse mode: _Select"
 msgstr ""
 
-#: src/multitrack.c:7505
+#: src/multitrack.c:7681
 msgid "Insert mode: _Normal"
 msgstr ""
 
-#: src/multitrack.c:7733
+#: src/multitrack.c:7909
 msgid "Insert with _audio"
 msgstr ""
 
-#: src/multitrack.c:7734
+#: src/multitrack.c:7910
 msgid ""
 "Select whether video clips are inserted and moved with their audio or not"
 msgstr ""
 
-#: src/multitrack.c:7829
+#: src/multitrack.c:8007
 msgid "Select _overlap"
 msgstr ""
 
-#: src/multitrack.c:7830
+#: src/multitrack.c:8008
 msgid ""
 "Select whether timeline selection snaps to overlap between selected tracks "
 "or not"
 msgstr ""
 
-#: src/multitrack.c:7894 src/multitrack.c:14198
+#: src/multitrack.c:8073 src/multitrack.c:14422
 msgid "Expanded View (d)"
 msgstr ""
 
-#: src/multitrack.c:7897 src/multitrack.c:14205
+#: src/multitrack.c:8076 src/multitrack.c:14428
 msgid "Compact View (d)"
 msgstr ""
 
-#: src/multitrack.c:7939
+#: src/multitrack.c:8118
 msgid "Gravity: _Normal"
 msgstr ""
 
-#: src/multitrack.c:7952
+#: src/multitrack.c:8131
 msgid "Gravity: _Left"
 msgstr ""
 
-#: src/multitrack.c:7967
+#: src/multitrack.c:8146
 msgid "Gravity: _Right"
 msgstr ""
 
-#: src/multitrack.c:8297
+#: src/multitrack.c:8496
 msgid "_Apply"
 msgstr ""
 
-#: src/multitrack.c:8319
+#: src/multitrack.c:8518
 msgid "Time"
 msgstr ""
 
-#: src/multitrack.c:8333
+#: src/multitrack.c:8532
 msgid "_Del. node"
 msgstr ""
 
-#: src/multitrack.c:8341
+#: src/multitrack.c:8540
 msgid "_Next node"
 msgstr ""
 
-#: src/multitrack.c:8349
+#: src/multitrack.c:8548
 msgid "_Prev node"
 msgstr ""
 
-#: src/multitrack.c:8373
+#: src/multitrack.c:8574
 msgid "_Reverse playback  "
 msgstr ""
 
-#: src/multitrack.c:8395
+#: src/multitrack.c:8596
 msgid "_Velocity  "
 msgstr ""
 
-#: src/multitrack.c:8464
+#: src/multitrack.c:8664
 msgid "Anchor _start"
 msgstr ""
 
-#: src/multitrack.c:8465
+#: src/multitrack.c:8665
 msgid "Anchor the start point to the timeline"
 msgstr ""
 
-#: src/multitrack.c:8481
-msgid "Start frame"
-msgstr ""
-
-#: src/multitrack.c:8533
+#: src/multitrack.c:8728
 msgid "Anchor _end"
 msgstr ""
 
-#: src/multitrack.c:8534
+#: src/multitrack.c:8729
 msgid "Anchor the end point to the timeline"
 msgstr ""
 
-#: src/multitrack.c:8546
-msgid "End frame"
-msgstr ""
-
-#: src/multitrack.c:8739
+#: src/multitrack.c:8929
 msgid "Scroll"
 msgstr ""
 
-#: src/multitrack.c:9316
+#: src/multitrack.c:9502
 msgid ""
 "\n"
 "==============================\n"
 "Switched to Clip Edit mode\n"
 msgstr ""
 
-#: src/multitrack.c:9502
+#: src/multitrack.c:9708
 msgid "Timeline (seconds)"
 msgstr ""
 
-#: src/multitrack.c:9984
+#: src/multitrack.c:10202
 msgid " Backing audio"
 msgstr ""
 
-#: src/multitrack.c:9987
+#: src/multitrack.c:10204
 #, c-format
 msgid " Layer %d audio"
 msgstr ""
 
-#: src/multitrack.c:9995
+#: src/multitrack.c:10212
 msgid "Show/hide audio details"
 msgstr ""
 
-#: src/multitrack.c:10010 src/multitrack.c:10232
+#: src/multitrack.c:10227 src/multitrack.c:10452
 #, c-format
 msgid "Layer %d audio"
 msgstr ""
 
-#: src/multitrack.c:10144 src/multitrack.c:10261
+#: src/multitrack.c:10353 src/multitrack.c:10481
 #, c-format
 msgid "%s (layer %d)"
 msgstr ""
 
-#: src/multitrack.c:10184
+#: src/multitrack.c:10403
 msgid "Select track"
 msgstr ""
 
-#: src/multitrack.c:10188
+#: src/multitrack.c:10407
 msgid "Show/hide audio"
 msgstr ""
 
-#: src/multitrack.c:10194
+#: src/multitrack.c:10413
 #, c-format
 msgid "Video %d"
 msgstr ""
 
-#: src/multitrack.c:10233
+#: src/multitrack.c:10453
 #, c-format
 msgid " %s"
 msgstr ""
 
-#: src/multitrack.c:10346
+#: src/multitrack.c:10574
 msgid "LiVES: Selected effect"
 msgstr ""
 
-#: src/multitrack.c:10358
+#: src/multitrack.c:10586
 msgid "_View/Edit this effect"
 msgstr ""
 
-#: src/multitrack.c:10361
+#: src/multitrack.c:10588
 msgid "_View this effect"
 msgstr ""
 
-#: src/multitrack.c:10369
+#: src/multitrack.c:10596
 msgid "_Delete this effect"
 msgstr ""
 
-#: src/multitrack.c:10422
+#: src/multitrack.c:10648
 msgid "Cannot insert after this effect"
 msgstr ""
 
-#: src/multitrack.c:10451
+#: src/multitrack.c:10677
 msgid "This effect cannot be moved"
 msgstr ""
 
-#: src/multitrack.c:10499
+#: src/multitrack.c:10724
 #, c-format
 msgid "  %d to %d selected  "
 msgstr ""
 
-#: src/multitrack.c:10502 src/multitrack.c:10746
+#: src/multitrack.c:10727 src/multitrack.c:10968
 #, c-format
 msgid "%.2f sec."
 msgstr ""
 
-#: src/multitrack.c:10717
+#: src/multitrack.c:10940
 #, c-format
 msgid "%d frames"
 msgstr ""
 
-#: src/multitrack.c:11070
+#: src/multitrack.c:11299
 msgid ""
 "\n"
 "==============================\n"
 "Switched to Multitrack mode\n"
 msgstr ""
 
-#: src/multitrack.c:12691
+#: src/multitrack.c:12939
 msgid "Drag the time slider to where you"
 msgstr ""
 
-#: src/multitrack.c:12692
+#: src/multitrack.c:12940
 msgid "want to set effect parameters"
 msgstr ""
 
-#: src/multitrack.c:12693
+#: src/multitrack.c:12941
 msgid "Set parameters, then click \"Apply\"\n"
 msgstr ""
 
-#: src/multitrack.c:12694
+#: src/multitrack.c:12942
 msgid ""
 "NODES are points where parameters\n"
 "have been set.\n"
 "Nodes can be deleted."
 msgstr ""
 
-#: src/multitrack.c:12697
+#: src/multitrack.c:12944
 msgid "Effect has no parameters.\n"
 msgstr ""
 
-#: src/multitrack.c:12788
+#: src/multitrack.c:13033
 #, c-format
 msgid "%s output"
 msgstr ""
 
-#: src/multitrack.c:12794 src/multitrack.c:12804
+#: src/multitrack.c:13038 src/multitrack.c:13046
 #, c-format
 msgid "layer %d"
 msgstr ""
 
-#: src/multitrack.c:12796 src/multitrack.c:12806
+#: src/multitrack.c:13039 src/multitrack.c:13047
 msgid "audio track"
 msgstr ""
 
-#: src/multitrack.c:12797
+#: src/multitrack.c:13040
 #, c-format
 msgid "%s to %s"
 msgstr ""
 
-#: src/multitrack.c:12807
+#: src/multitrack.c:13048
 #, c-format
 msgid "%s from %s"
 msgstr ""
 
-#: src/multitrack.c:12860
+#: src/multitrack.c:13099
 msgid "_Prev filter map"
 msgstr ""
 
-#: src/multitrack.c:12871
+#: src/multitrack.c:13110
 msgid "Insert _before"
 msgstr ""
 
-#: src/multitrack.c:12881
+#: src/multitrack.c:13120
 msgid "Insert _after"
 msgstr ""
 
-#: src/multitrack.c:12896
+#: src/multitrack.c:13134
 msgid "_Next filter map"
 msgstr ""
 
-#: src/multitrack.c:12911
+#: src/multitrack.c:13148
 msgid ""
 "\n"
 "\n"
@@ -9059,271 +9062,271 @@
 "current time.\n"
 msgstr ""
 
-#: src/multitrack.c:12929
+#: src/multitrack.c:13166
 msgid ""
 "Drag a compositor anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:12936
+#: src/multitrack.c:13173
 msgid ""
 "Drag a transition anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:12944
+#: src/multitrack.c:13181
 msgid ""
 "Effects can be dragged\n"
 "onto blocks on the timeline."
 msgstr ""
 
-#: src/multitrack.c:13166
+#: src/multitrack.c:13406
 msgid "LiVES: Selected block/frame"
 msgstr ""
 
-#: src/multitrack.c:13173
+#: src/multitrack.c:13413
 msgid "_Select this block"
 msgstr ""
 
-#: src/multitrack.c:13183
+#: src/multitrack.c:13423
 msgid "_Split block here"
 msgstr ""
 
-#: src/multitrack.c:13191
+#: src/multitrack.c:13431
 msgid "List _effects here"
 msgstr ""
 
-#: src/multitrack.c:13200 src/multitrack.c:13277
+#: src/multitrack.c:13440 src/multitrack.c:13518
 #, c-format
 msgid "_Adjust %s"
 msgstr ""
 
-#: src/multitrack.c:13215
+#: src/multitrack.c:13455
 msgid "_Delete this block"
 msgstr ""
 
-#: src/multitrack.c:13258
+#: src/multitrack.c:13500
 msgid "_Insert here"
 msgstr ""
 
-#: src/multitrack.c:13264
+#: src/multitrack.c:13505
 msgid "_Insert audio here"
 msgstr ""
 
-#: src/multitrack.c:14801
+#: src/multitrack.c:15017
 #, c-format
 msgid "Inserted gap in selected tracks from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:14835
+#: src/multitrack.c:15048
 #, c-format
 msgid "Inserted gap in track %s from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15036
+#: src/multitrack.c:15244
 #, c-format
 msgid "Undid %s\n"
 msgstr ""
 
-#: src/multitrack.c:15235
+#: src/multitrack.c:15445
 #, c-format
 msgid "Redid %s\n"
 msgstr ""
 
-#: src/multitrack.c:15268
+#: src/multitrack.c:15475
 msgid ""
 "\n"
 " (variable)"
 msgstr ""
 
-#: src/multitrack.c:15502 src/multitrack.c:15614 src/multitrack.c:18736
-#: src/multitrack.c:18748
+#: src/multitrack.c:15710 src/multitrack.c:15823 src/multitrack.c:19077
+#: src/multitrack.c:19089
 #, c-format
 msgid "track %s"
 msgstr ""
 
-#: src/multitrack.c:15507 src/multitrack.c:15619 src/multitrack.c:18741
+#: src/multitrack.c:15715 src/multitrack.c:15828 src/multitrack.c:19082
 #, c-format
 msgid "tracks %s and %s"
 msgstr ""
 
-#: src/multitrack.c:15513 src/multitrack.c:15625 src/multitrack.c:18751
+#: src/multitrack.c:15721 src/multitrack.c:15834 src/multitrack.c:19091
 msgid "selected tracks"
 msgstr ""
 
-#: src/multitrack.c:15516
+#: src/multitrack.c:15726
 #, c-format
 msgid "Added %s %s to %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15550
+#: src/multitrack.c:15760
 #, c-format
 msgid "Added effect %s to track %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15631
+#: src/multitrack.c:15845
 #, c-format
 msgid "Deleted %s %s from %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15935
+#: src/multitrack.c:16143
 #, c-format
 msgid "rendered %d frames to new clip.\n"
 msgstr ""
 
-#: src/multitrack.c:16025
+#: src/multitrack.c:16230
 msgid "Cleaning up..."
 msgstr ""
 
-#: src/multitrack.c:16712
+#: src/multitrack.c:17003
 msgid "_Pause"
 msgstr ""
 
-#: src/multitrack.c:16713
+#: src/multitrack.c:17004
 msgid "Pause (p)"
 msgstr ""
 
-#: src/multitrack.c:16856
+#: src/multitrack.c:17151
 msgid "Press 'm' during playback"
 msgstr ""
 
-#: src/multitrack.c:16857
+#: src/multitrack.c:17152
 msgid "to make a mark on the timeline"
 msgstr ""
 
-#: src/multitrack.c:17154
+#: src/multitrack.c:17498
 #, c-format
 msgid ""
 "Inserted audio %.4f to %.4f from clip %s into backing audio from time %.4f "
 "to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:17414
+#: src/multitrack.c:17759
 #, c-format
 msgid ""
 "Inserted frames %d to %d from clip %s into track %s from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:17998
+#: src/multitrack.c:18332
 #, c-format
 msgid ""
 "Time region %.3f to %.3f\n"
 "selected.\n"
 msgstr ""
 
-#: src/multitrack.c:18002
+#: src/multitrack.c:18336
 msgid ""
 "select one or more tracks\n"
 "to create a region.\n"
 msgstr ""
 
-#: src/multitrack.c:18004
+#: src/multitrack.c:18337
 #, c-format
 msgid "%d video tracks selected.\n"
 msgstr ""
 
-#: src/multitrack.c:18006
+#: src/multitrack.c:18339
 msgid ""
 "Double click on timeline\n"
 "to deselect time region."
 msgstr ""
 
-#: src/multitrack.c:18013
+#: src/multitrack.c:18346
 msgid ""
 "Single click on an effect\n"
 "to select it."
 msgstr ""
 
-#: src/multitrack.c:18014
+#: src/multitrack.c:18347
 msgid ""
 "Double click on an effect\n"
 "to edit it."
 msgstr ""
 
-#: src/multitrack.c:18015
+#: src/multitrack.c:18348
 msgid ""
 "Right click on an effect\n"
 "for context menu.\n"
 msgstr ""
 
-#: src/multitrack.c:18017
+#: src/multitrack.c:18350
 msgid ""
 "Effect order can be changed at\n"
 "FILTER MAPS"
 msgstr ""
 
-#: src/multitrack.c:18024
+#: src/multitrack.c:18357
 msgid ""
 "You can select an effect,\n"
 "then use the INSERT BEFORE"
 msgstr ""
 
-#: src/multitrack.c:18025
+#: src/multitrack.c:18358
 msgid "or INSERT AFTER buttons to move it."
 msgstr ""
 
-#: src/multitrack.c:18307 src/multitrack.c:18320
+#: src/multitrack.c:18639 src/multitrack.c:18652
 msgid "Click on another effect,"
 msgstr ""
 
-#: src/multitrack.c:18308 src/multitrack.c:18321
+#: src/multitrack.c:18640 src/multitrack.c:18653
 msgid ""
 "and the selected one\n"
 "will be inserted"
 msgstr ""
 
-#: src/multitrack.c:18309
+#: src/multitrack.c:18641
 msgid "after it.\n"
 msgstr ""
 
-#: src/multitrack.c:18322
+#: src/multitrack.c:18654
 msgid "before it.\n"
 msgstr ""
 
-#: src/multitrack.c:18551
+#: src/multitrack.c:18889
 #, c-format
 msgid "Removed parameter values for effect %s at time %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:18759
+#: src/multitrack.c:19100
 #, c-format
 msgid "Set parameter values for %s %s on %s at time %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:19251 src/multitrack.c:20873
+#: src/multitrack.c:19630 src/multitrack.c:21195
 msgid "_Autoreload each time"
 msgstr ""
 
-#: src/multitrack.c:19323
+#: src/multitrack.c:19702
 msgid "Saving layout"
 msgstr ""
 
-#: src/multitrack.c:19345
+#: src/multitrack.c:19725
 #, c-format
 msgid "Saved layout to %s\n"
 msgstr ""
 
-#: src/multitrack.c:20783
+#: src/multitrack.c:21125
 msgid "clips and frames"
 msgstr ""
 
-#: src/multitrack.c:20787
+#: src/multitrack.c:21128
 msgid "clips"
 msgstr ""
 
-#: src/multitrack.c:20790
+#: src/multitrack.c:21130
 msgid "frames"
 msgstr ""
 
-#: src/multitrack.c:20800
+#: src/multitrack.c:21140
 msgid ""
 "\n"
 "Auto reload layout.\n"
 msgstr ""
 
-#: src/multitrack.c:20803
+#: src/multitrack.c:21143
 #, c-format
 msgid ""
 "%s\n"
@@ -9331,100 +9334,100 @@
 "Therefore it could not be loaded properly.\n"
 msgstr ""
 
-#: src/multitrack.c:20920
+#: src/multitrack.c:21284
 msgid "auto backup"
 msgstr ""
 
-#: src/multitrack.c:20923
+#: src/multitrack.c:21287
 #, c-format
 msgid ""
 "\n"
 "Unable to load layout file %s\n"
 msgstr ""
 
-#: src/multitrack.c:20944
+#: src/multitrack.c:21308
 #, c-format
 msgid "Loading layout from %s..."
 msgstr ""
 
-#: src/multitrack.c:20978
+#: src/multitrack.c:21338
 #, c-format
 msgid "Got %d events...processing..."
 msgstr ""
 
-#: src/multitrack.c:20991
+#: src/multitrack.c:21349
 msgid "Checking and rebuilding event list"
 msgstr ""
 
-#: src/multitrack.c:21017
+#: src/multitrack.c:21374
 #, c-format
 msgid "%d errors detected.\n"
 msgstr ""
 
-#: src/multitrack.c:21068
+#: src/multitrack.c:21422
 #, c-format
 msgid "Multitrack fps set to %.3f\n"
 msgstr ""
 
-#: src/multitrack.c:21225
+#: src/multitrack.c:21576
 msgid ""
 "The current layout has changes which have not been saved.\n"
 "Are you sure you wish to wipe it ?\n"
 msgstr ""
 
-#: src/multitrack.c:22047
+#: src/multitrack.c:22385
 msgid "LiVES: Multitrack audio mixer"
 msgstr ""
 
-#: src/multitrack.c:22077
+#: src/multitrack.c:22414
 msgid "_Reset values"
 msgstr ""
 
-#: src/multitrack.c:22081
+#: src/multitrack.c:22418
 msgid "_Close mixer"
 msgstr ""
 
-#: src/multitrack.c:22130
+#: src/multitrack.c:22466
 msgid ""
 "_Invert backing audio\n"
 "and layer volumes"
 msgstr ""
 
-#: src/multitrack.c:22132
+#: src/multitrack.c:22468
 msgid "Adjust backing and layer audio values so that they sum to 1.0"
 msgstr ""
 
-#: src/multitrack.c:22175
+#: src/multitrack.c:22510
 msgid "_Gang layer audio"
 msgstr ""
 
-#: src/multitrack.c:22177
+#: src/multitrack.c:22512
 msgid "Adjust all layer audio values to the same value"
 msgstr ""
 
-#: src/jack.c:104
+#: src/jack.c:102
 msgid "JACK server started\n"
 msgstr ""
 
-#: src/jack.c:1284 src/jack.c:1353
+#: src/jack.c:1265 src/jack.c:1334
 msgid "Unable to connect to JACK server\n"
 msgstr ""
 
-#: src/jack.c:1512
+#: src/jack.c:1491
 msgid "Started jack audio subsystem.\n"
 msgstr ""
 
-#: src/jack.c:1623
+#: src/jack.c:1600
 msgid "Started jack audio reader.\n"
 msgstr ""
 
-#: src/jack.c:1838
+#: src/jack.c:1815
 msgid ""
 "\n"
 "Connection to jack audio was reset.\n"
 msgstr ""
 
-#: src/pulse.c:87
+#: src/pulse.c:88
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -9432,7 +9435,7 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:92
+#: src/pulse.c:94
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -9440,7 +9443,7 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:96
+#: src/pulse.c:99
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -9448,335 +9451,335 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:101
+#: src/pulse.c:104
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
 msgstr ""
 
-#: src/pulse.c:107
+#: src/pulse.c:109
 msgid "LiVES will exit and you can choose another audio player.\n"
 msgstr ""
 
-#: src/pulse.c:1352
+#: src/pulse.c:1335
 msgid ""
 "\n"
 "Connection to pulse audio was reset.\n"
 msgstr ""
 
-#: src/colourspace.c:1100
+#: src/colourspace.c:1092
 msgid "unclamped"
 msgstr ""
 
-#: src/colourspace.c:1101
+#: src/colourspace.c:1093
 msgid "clamped"
 msgstr ""
 
-#: src/omc-learn.c:195
+#: src/omc-learn.c:191
 #, c-format
 msgid "Responding to joystick events from %s\n"
 msgstr ""
 
-#: src/omc-learn.c:289
+#: src/omc-learn.c:279
 msgid "Creating ALSA seq port..."
 msgstr ""
 
-#: src/omc-learn.c:325
+#: src/omc-learn.c:313
 #, c-format
 msgid "Responding to MIDI events from %s\n"
 msgstr ""
 
-#: src/omc-learn.c:568
+#: src/omc-learn.c:554
 msgid "data"
 msgstr ""
 
-#: src/omc-learn.c:571
+#: src/omc-learn.c:557
 msgid "velocity"
 msgstr ""
 
-#: src/omc-learn.c:572
+#: src/omc-learn.c:558
 msgid "note"
 msgstr ""
 
-#: src/omc-learn.c:574 src/omc-learn.c:736 src/omc-learn.c:1105
-#: src/omc-learn.c:1591 src/omc-learn.c:1640
+#: src/omc-learn.c:560 src/omc-learn.c:724 src/omc-learn.c:1092
+#: src/omc-learn.c:1581 src/omc-learn.c:1630
 msgid "value"
 msgstr ""
 
-#: src/omc-learn.c:576
+#: src/omc-learn.c:562
 msgid "state"
 msgstr ""
 
-#: src/omc-learn.c:688
+#: src/omc-learn.c:674
 msgid "variable"
 msgstr ""
 
-#: src/omc-learn.c:1001
+#: src/omc-learn.c:989
 msgid "Vars."
 msgstr ""
 
-#: src/omc-learn.c:1054
+#: src/omc-learn.c:1041
 #, c-format
 msgid "MIDI ch %d note on"
 msgstr ""
 
-#: src/omc-learn.c:1058
+#: src/omc-learn.c:1045
 #, c-format
 msgid "MIDI ch %d note off"
 msgstr ""
 
-#: src/omc-learn.c:1062
+#: src/omc-learn.c:1049
 #, c-format
 msgid "MIDI ch %d controller %d"
 msgstr ""
 
-#: src/omc-learn.c:1066
+#: src/omc-learn.c:1053
 #, c-format
 msgid "MIDI ch %d pitch bend"
 msgstr ""
 
-#: src/omc-learn.c:1070
+#: src/omc-learn.c:1057
 #, c-format
 msgid "MIDI ch %d pgm change"
 msgstr ""
 
-#: src/omc-learn.c:1073
+#: src/omc-learn.c:1060
 #, c-format
 msgid "Joystick button %d"
 msgstr ""
 
-#: src/omc-learn.c:1076
+#: src/omc-learn.c:1063
 #, c-format
 msgid "Joystick axis %d"
 msgstr ""
 
-#: src/omc-learn.c:1113
+#: src/omc-learn.c:1100
 msgid "x"
 msgstr ""
 
-#: src/omc-learn.c:1122
+#: src/omc-learn.c:1109
 msgid "range"
 msgstr ""
 
-#: src/omc-learn.c:1143
+#: src/omc-learn.c:1130
 msgid "+ offset1"
 msgstr ""
 
-#: src/omc-learn.c:1161
+#: src/omc-learn.c:1150
 msgid "* scale"
 msgstr ""
 
-#: src/omc-learn.c:1179
+#: src/omc-learn.c:1170
 msgid "+ offset2"
 msgstr ""
 
-#: src/omc-learn.c:1280
+#: src/omc-learn.c:1270
 msgid ""
 "\n"
 "Click OK to delete all entries\n"
 msgstr ""
 
-#: src/omc-learn.c:1318
+#: src/omc-learn.c:1308
 msgid "LiVES: OMC learner"
 msgstr ""
 
-#: src/omc-learn.c:1334
+#: src/omc-learn.c:1324
 msgid "Clear _unmatched"
 msgstr ""
 
-#: src/omc-learn.c:1345
+#: src/omc-learn.c:1335
 msgid "_Delete all"
 msgstr ""
 
-#: src/omc-learn.c:1411
+#: src/omc-learn.c:1401
 msgid "Start video playback"
 msgstr ""
 
-#: src/omc-learn.c:1414
+#: src/omc-learn.c:1404
 msgid "Stop video playback"
 msgstr ""
 
-#: src/omc-learn.c:1418
+#: src/omc-learn.c:1408
 msgid "Clip select <clipnum>"
 msgstr ""
 
-#: src/omc-learn.c:1419
+#: src/omc-learn.c:1409
 msgid "Switch foreground clip to the nth valid clip"
 msgstr ""
 
-#: src/omc-learn.c:1423
+#: src/omc-learn.c:1413
 msgid "Play forwards"
 msgstr ""
 
-#: src/omc-learn.c:1424
+#: src/omc-learn.c:1414
 msgid "Play video in a forwards direction"
 msgstr ""
 
-#: src/omc-learn.c:1427
+#: src/omc-learn.c:1417
 msgid "Play backwards"
 msgstr ""
 
-#: src/omc-learn.c:1428
+#: src/omc-learn.c:1418
 msgid "Play video in a backwards direction"
 msgstr ""
 
-#: src/omc-learn.c:1431
+#: src/omc-learn.c:1421
 msgid "Reverse playback direction"
 msgstr ""
 
-#: src/omc-learn.c:1432
+#: src/omc-learn.c:1422
 msgid "Reverse direction of video playback"
 msgstr ""
 
-#: src/omc-learn.c:1435
+#: src/omc-learn.c:1425
 msgid "Play video faster"
 msgstr ""
 
-#: src/omc-learn.c:1436
+#: src/omc-learn.c:1426
 msgid "Play video at a slightly faster rate"
 msgstr ""
 
-#: src/omc-learn.c:1439
+#: src/omc-learn.c:1429
 msgid "Play video slower"
 msgstr ""
 
-#: src/omc-learn.c:1440
+#: src/omc-learn.c:1430
 msgid "Play video at a slightly slower rate"
 msgstr ""
 
-#: src/omc-learn.c:1443
+#: src/omc-learn.c:1433
 msgid "Toggle video freeze"
 msgstr ""
 
-#: src/omc-learn.c:1444
+#: src/omc-learn.c:1434
 msgid "Freeze video, or if already frozen, unfreeze it"
 msgstr ""
 
-#: src/omc-learn.c:1447
+#: src/omc-learn.c:1437
 msgid "Set video framerate to <fps>"
 msgstr ""
 
-#: src/omc-learn.c:1448
+#: src/omc-learn.c:1438
 msgid "Set framerate of foreground clip to <float fps>"
 msgstr ""
 
-#: src/omc-learn.c:1452
+#: src/omc-learn.c:1442
 msgid "Start recording"
 msgstr ""
 
-#: src/omc-learn.c:1455
+#: src/omc-learn.c:1445
 msgid "Stop recording"
 msgstr ""
 
-#: src/omc-learn.c:1458
+#: src/omc-learn.c:1448
 msgid "Toggle recording state"
 msgstr ""
 
-#: src/omc-learn.c:1461
+#: src/omc-learn.c:1451
 msgid "Swap foreground and background clips"
 msgstr ""
 
-#: src/omc-learn.c:1463
+#: src/omc-learn.c:1453
 msgid "Reset effect keys"
 msgstr ""
 
-#: src/omc-learn.c:1464
+#: src/omc-learn.c:1454
 msgid "Switch all effects off."
 msgstr ""
 
-#: src/omc-learn.c:1467
+#: src/omc-learn.c:1457
 msgid "Enable effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1471
+#: src/omc-learn.c:1461
 msgid "Disable effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1475
+#: src/omc-learn.c:1465
 msgid "Toggle effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1479
+#: src/omc-learn.c:1469
 msgid "Set parameter value <key> <pnum> = <value>"
 msgstr ""
 
-#: src/omc-learn.c:1480
+#: src/omc-learn.c:1470
 msgid "Set <value> of pth (numerical) parameter for effect key <key>."
 msgstr ""
 
-#: src/omc-learn.c:1484
+#: src/omc-learn.c:1474
 msgid "Switch foreground to next clip"
 msgstr ""
 
-#: src/omc-learn.c:1487
+#: src/omc-learn.c:1477
 msgid "Switch foreground to previous clip"
 msgstr ""
 
-#: src/omc-learn.c:1490
+#: src/omc-learn.c:1480
 msgid "Set video framerate to ratio <fps_ratio>"
 msgstr ""
 
-#: src/omc-learn.c:1491
+#: src/omc-learn.c:1481
 msgid "Set framerate ratio of foreground clip to <float fps_ratio>"
 msgstr ""
 
-#: src/omc-learn.c:1495
+#: src/omc-learn.c:1485
 msgid "Retrigger clip <clipnum>"
 msgstr ""
 
-#: src/omc-learn.c:1496
+#: src/omc-learn.c:1486
 msgid ""
 "Switch foreground clip to the nth valid clip, and reset the frame number"
 msgstr ""
 
-#: src/omc-learn.c:1500
+#: src/omc-learn.c:1490
 msgid "Cycle to next mode for effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1504
+#: src/omc-learn.c:1494
 msgid "Cycle to previous mode for effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1508
+#: src/omc-learn.c:1498
 msgid "Set playback plugin parameter value <pnum> = <value>"
 msgstr ""
 
-#: src/omc-learn.c:1509
+#: src/omc-learn.c:1499
 msgid "Set <value> of pth parameter for the playback plugin."
 msgstr ""
 
 #. TRANSLATORS: short form of "clip number"
-#: src/omc-learn.c:1536 src/omc-learn.c:1607
+#: src/omc-learn.c:1526 src/omc-learn.c:1597
 msgid "clipnum"
 msgstr ""
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1545
+#: src/omc-learn.c:1535
 msgid "fps"
 msgstr ""
 
 #. TRANSLATORS: as in keyboard key
-#: src/omc-learn.c:1553 src/omc-learn.c:1560 src/omc-learn.c:1567
-#: src/omc-learn.c:1575 src/omc-learn.c:1615 src/omc-learn.c:1623
+#: src/omc-learn.c:1543 src/omc-learn.c:1550 src/omc-learn.c:1557
+#: src/omc-learn.c:1565 src/omc-learn.c:1605 src/omc-learn.c:1613
 msgid "key"
 msgstr ""
 
 #. TRANSLATORS: short form of "parameter number"
-#: src/omc-learn.c:1583 src/omc-learn.c:1632
+#: src/omc-learn.c:1573 src/omc-learn.c:1622
 msgid "pnum"
 msgstr ""
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1599
+#: src/omc-learn.c:1589
 msgid "fps_ratio"
 msgstr ""
 
-#: src/omc-learn.c:2443
+#: src/omc-learn.c:2417
 #, c-format
 msgid "Saving device mapping to file %s..."
 msgstr ""
 
-#: src/omc-learn.c:2527
+#: src/omc-learn.c:2498
 #, c-format
 msgid ""
 "\n"
@@ -9785,7 +9788,7 @@
 "%s\n"
 msgstr ""
 
-#: src/omc-learn.c:2534
+#: src/omc-learn.c:2505
 #, c-format
 msgid ""
 "\n"
@@ -9794,12 +9797,12 @@
 "%s\n"
 msgstr ""
 
-#: src/omc-learn.c:2571
+#: src/omc-learn.c:2541
 #, c-format
 msgid "Loading device mapping from file %s..."
 msgstr ""
 
-#: src/omc-learn.c:2576
+#: src/omc-learn.c:2544
 #, c-format
 msgid ""
 "\n"
@@ -9809,12 +9812,12 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/videodev.c:547
+#: src/videodev.c:539
 #, c-format
 msgid "Unable to open device %s\n"
 msgstr ""
 
-#: src/videodev.c:564
+#: src/videodev.c:554
 #, c-format
 msgid "Opened device %s\n"
 msgstr ""

LiVES-2.2.8.tar.bz2/po/nl_NL.po -> LiVES-2.4.1.tar.bz2/po/nl_NL.po Changed

@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: LiVES 0.9.5cvs\n"
 "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n"
-"POT-Creation-Date: 2015-02-08 17:18-0300\n"
+"POT-Creation-Date: 2015-08-09 14:52-0300\n"
 "PO-Revision-Date: 2013-03-14 12:31+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: \n"
@@ -15,8 +15,7 @@
 "X-Poedit-Country: NETHERLANDS\n"
 "X-Poedit-Language: Dutch\n"
 
-#. TRANSLATORS: do not translate this message
-#: src/main.c:118
+#: src/main.c:128
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -25,22 +24,22 @@
 "http://lives.sourceforge.net/TRANS-README.txt"
 msgstr ""
 
-#: src/main.c:134
+#: src/main.c:153
 #, c-format
 msgid "%s Warning: %s\n"
 msgstr ""
 
-#: src/main.c:138
+#: src/main.c:157
 #, c-format
 msgid "%s Critical error: %s\n"
 msgstr ""
 
-#: src/main.c:139
+#: src/main.c:158
 #, c-format
 msgid "%s Fatal error: %s\n"
 msgstr ""
 
-#: src/main.c:176
+#: src/main.c:198
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -49,7 +48,7 @@
 "Thanks. Recovery should be possible if you restart LiVES.\n"
 msgstr ""
 
-#: src/main.c:177
+#: src/main.c:199
 msgid ""
 "\n"
 "\n"
@@ -57,97 +56,97 @@
 "distribution, and the LiVES version ("
 msgstr ""
 
-#: src/main.c:180
+#: src/main.c:203
 msgid ""
 "and any information shown below:\n"
 "\n"
 msgstr ""
 
-#: src/main.c:184
+#: src/main.c:206
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
 "\n"
 msgstr ""
 
-#: src/main.c:192
+#: src/main.c:216
 msgid "Preserving set.\n"
 msgstr ""
 
-#: src/main.c:636
+#: src/main.c:691
 msgid "Resizing"
 msgstr "Grootte aanpassen"
 
-#: src/main.c:643
+#: src/main.c:698
 msgid "_Resize All Frames"
 msgstr ""
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:895
+#: src/main.c:948
 msgid "Any"
 msgstr ""
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:897
+#: src/main.c:950
 msgid "None"
 msgstr ""
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:899
+#: src/main.c:952
 msgid "recommended"
 msgstr ""
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:901
+#: src/main.c:954
 msgid "disabled !"
 msgstr ""
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:903
+#: src/main.c:956
 msgid "**The current layout**"
 msgstr ""
 
 #. TRANSLATORS: adjective for "Built in" type effects
-#: src/main.c:905
+#: src/main.c:958
 msgid "Builtin"
 msgstr ""
 
 #. TRANSLATORS: adjective for "Custom" type effects
-#: src/main.c:907
+#: src/main.c:960
 msgid "Custom"
 msgstr ""
 
 #. TRANSLATORS: adjective for "Test" type effects
-#: src/main.c:909
+#: src/main.c:962
 msgid "Test"
 msgstr ""
 
-#: src/main.c:1054
+#: src/main.c:1107
 msgid "Foreground"
 msgstr ""
 
-#: src/main.c:1055
+#: src/main.c:1108
 #, fuzzy
 msgid "Background"
 msgstr "Vervagen"
 
-#: src/main.c:1566
+#: src/main.c:1624
 msgid "Loading realtime effect plugins..."
 msgstr ""
 
-#: src/main.c:1631
+#: src/main.c:1690
 msgid "Starting jack audio server..."
 msgstr ""
 
-#: src/main.c:1633
+#: src/main.c:1692
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1634
+#: src/main.c:1693
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1663
+#: src/main.c:1723
 #, c-format
 msgid ""
 "\n"
@@ -159,112 +158,112 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1697
+#: src/main.c:1758
 msgid "Starting pulse audio server..."
 msgstr ""
 
-#: src/main.c:1765
+#: src/main.c:1825
 msgid "Checking optional dependencies:"
 msgstr ""
 
-#: src/main.c:1766
+#: src/main.c:1826
 msgid "mplayer...detected..."
 msgstr ""
 
-#: src/main.c:1767
+#: src/main.c:1827
 msgid "mplayer...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1768
+#: src/main.c:1828
 msgid "mplayer2...detected..."
 msgstr ""
 
-#: src/main.c:1769
+#: src/main.c:1829
 msgid "mplayer2...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1770
+#: src/main.c:1830
 msgid "convert...detected..."
 msgstr ""
 
-#: src/main.c:1771
+#: src/main.c:1831
 msgid "convert...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1772
+#: src/main.c:1832
 msgid "composite...detected..."
 msgstr ""
 
-#: src/main.c:1773
+#: src/main.c:1833
 msgid "composite...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1774
+#: src/main.c:1834
 msgid "sox...detected\n"
 msgstr ""
 
-#: src/main.c:1775
+#: src/main.c:1835
 msgid "sox...NOT DETECTED\n"
 msgstr ""
 
-#: src/main.c:1776
+#: src/main.c:1836
 msgid "cdda2wav...detected..."
 msgstr ""
 
-#: src/main.c:1777
+#: src/main.c:1837
 msgid "cdda2wav...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1778
+#: src/main.c:1838
 msgid "jackd...detected..."
 msgstr ""
 
-#: src/main.c:1779
+#: src/main.c:1839
 msgid "jackd...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1780
+#: src/main.c:1840
 msgid "pulse audio...detected..."
 msgstr ""
 
-#: src/main.c:1781
+#: src/main.c:1841
 msgid "pulse audio...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1782
+#: src/main.c:1842
 msgid "python...detected..."
 msgstr ""
 
-#: src/main.c:1783
+#: src/main.c:1843
 msgid "python...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1784
+#: src/main.c:1844
 msgid "dvgrab...detected..."
 msgstr ""
 
-#: src/main.c:1785
+#: src/main.c:1845
 msgid "dvgrab...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1786
+#: src/main.c:1846
 msgid "xwininfo...detected..."
 msgstr ""
 
-#: src/main.c:1787
+#: src/main.c:1847
 msgid "xwininfo...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1793
+#: src/main.c:1853
 #, c-format
 msgid "Windows version %04X"
 msgstr ""
 
-#: src/main.c:1795
+#: src/main.c:1855
 msgid "UNKNOWN - please patch me !"
 msgstr ""
 
-#: src/main.c:1799
+#: src/main.c:1859
 #, c-format
 msgid ""
 "\n"
@@ -272,199 +271,204 @@
 "Window manager reports as \"%s\"; "
 msgstr ""
 
-#: src/main.c:1802
+#: src/main.c:1862
 #, c-format
 msgid "number of monitors detected: %d\n"
 msgstr ""
 
-#: src/main.c:1805
+#: src/main.c:1865
 #, c-format
 msgid "Number of CPUs detected: %d "
 msgstr ""
 
-#: src/main.c:1808 src/multitrack.c:4902
+#: src/main.c:1868 src/multitrack.c:5068
 msgid "little endian"
 msgstr ""
 
-#: src/main.c:1809 src/multitrack.c:4901
+#: src/main.c:1869 src/multitrack.c:5067
 msgid "big endian"
 msgstr ""
 
-#: src/main.c:1810
+#: src/main.c:1870
 #, c-format
 msgid "(%d bits, %s)\n"
 msgstr ""
 
-#: src/main.c:1814
+#: src/main.c:1874
 msgid "GUI type is: "
 msgstr ""
 
-#: src/main.c:1818
+#: src/main.c:1878
 #, c-format
 msgid "GTK+ version %d.%d.%d (compiled with %d.%d.%d)"
 msgstr ""
 
-#: src/main.c:1840
+#: src/main.c:1900
 msgid ", with cairo support"
 msgstr ""
 
-#: src/main.c:1847
+#: src/main.c:1907
 #, c-format
 msgid "Temp directory is %s\n"
 msgstr ""
 
-#: src/main.c:1851
+#: src/main.c:1911
 msgid ""
 "WARNING - this version of LiVES was compiled without either\n"
 "jack or pulse audio support.\n"
 "Many audio features will be unavailable.\n"
 msgstr ""
 
-#: src/main.c:1854
+#: src/main.c:1914
 msgid "Compiled with jack support, good !\n"
 msgstr ""
 
-#: src/main.c:1857
+#: src/main.c:1917
 msgid "Compiled with pulse audio support, wonderful !\n"
 msgstr ""
 
-#: src/main.c:1861
+#: src/main.c:1921
 #, c-format
 msgid ""
 "Welcome to LiVES version %s.\n"
 "\n"
 msgstr ""
 
-#: src/main.c:2306
+#: src/main.c:2380
 #, c-format
 msgid ""
 "\n"
 "Startup syntax is: %s [opts] [filename [start_time] [frames]]\n"
 msgstr ""
 
-#: src/main.c:2307
+#: src/main.c:2381
 msgid "Where: filename is the name of a media file or backup file.\n"
 msgstr ""
 
-#: src/main.c:2308
+#: src/main.c:2382
 msgid "start_time : filename start time in seconds\n"
 msgstr ""
 
-#: src/main.c:2309
+#: src/main.c:2383
 msgid "frames : maximum number of frames to open\n"
 msgstr ""
 
-#: src/main.c:2311
+#: src/main.c:2385
 msgid "opts can be:\n"
 msgstr ""
 
-#: src/main.c:2312
+#: src/main.c:2386
 msgid "-help            : show this help text and exit\n"
 msgstr ""
 
-#: src/main.c:2313
+#: src/main.c:2387
 msgid "-tmpdir <tempdir>: use alternate working directory (e.g /var/ramdisk)\n"
 msgstr ""
 
-#: src/main.c:2314
+#: src/main.c:2388
 msgid "-set <setname>   : autoload clip set setname\n"
 msgstr ""
 
-#: src/main.c:2315
+#: src/main.c:2389
 msgid "-noset           : do not load any set on startup\n"
 msgstr ""
 
-#: src/main.c:2316
+#: src/main.c:2390
 msgid "-norecover       : force no-loading of crash recovery\n"
 msgstr ""
 
-#: src/main.c:2317
+#: src/main.c:2391
 msgid "-recover         : force loading of crash recovery\n"
 msgstr ""
 
-#: src/main.c:2318
-msgid "-nothreaddialog  : doe nothing - retained for backwards compatibility\n"
+#: src/main.c:2392
+msgid ""
+"-nothreaddialog  : does nothing - retained for backwards compatibility\n"
 msgstr ""
 
-#: src/main.c:2319
+#: src/main.c:2393
 msgid "-nogui           : do not show the gui\n"
 msgstr ""
 
-#: src/main.c:2320
+#: src/main.c:2394
 msgid "-nosplash        : do not show the splash window\n"
 msgstr ""
 
-#: src/main.c:2321
+#: src/main.c:2395
 msgid "-noplaywin       : do not show the play window\n"
 msgstr ""
 
-#: src/main.c:2322
+#: src/main.c:2396
+msgid "-noninteractive  : disable menu interactivity\n"
+msgstr ""
+
+#: src/main.c:2397
 msgid "-startup-ce      : start in clip editor mode\n"
 msgstr ""
 
-#: src/main.c:2323
+#: src/main.c:2398
 msgid "-startup-mt      : start in multitrack mode\n"
 msgstr ""
 
-#: src/main.c:2324
+#: src/main.c:2399
 msgid ""
 "-fxmodesmax <n>  : allow <n> modes per effect key (minimum is 1, default is "
 "8)\n"
 msgstr ""
 
-#: src/main.c:2326
+#: src/main.c:2401
 msgid "-oscstart <port> : start OSC listener on UDP port <port>\n"
 msgstr ""
 
-#: src/main.c:2327
+#: src/main.c:2402
 msgid "-nooscstart      : do not start OSC listener\n"
 msgstr ""
 
-#: src/main.c:2329
+#: src/main.c:2404
 msgid ""
 "-aplayer <ap>    : start with selected audio player. <ap> can be mplayer, "
 "mplayer2"
 msgstr ""
 
 #. TRANSLATORS: pulse (audio)
-#: src/main.c:2332
+#: src/main.c:2407
 msgid ", pulse"
 msgstr ""
 
-#: src/main.c:2335
+#: src/main.c:2410
 msgid ", sox or jack\n"
 msgstr ""
 
-#: src/main.c:2336
+#: src/main.c:2412
 msgid ""
 "-jackopts <opts>    : opts is a bitmap of jack startup options [1 = jack "
 "transport client, 2 = jack transport master, 4 = start jack transport "
 "server, 8 = pause audio when video paused, 16 = start jack audio server] \n"
 msgstr ""
 
-#: src/main.c:2338
+#: src/main.c:2414
 msgid " or sox\n"
 msgstr ""
 
-#: src/main.c:2340
+#: src/main.c:2416
 msgid "-devicemap <mapname>          : autoload devicemap\n"
 msgstr ""
 
-#: src/main.c:2341
+#: src/main.c:2418
 msgid ""
 "-vppdefaults <file>          : load video playback plugin defaults from "
 "<file> (Note: only sets the settings, not the plugin type)\n"
 msgstr ""
 
-#: src/main.c:2342
+#: src/main.c:2419
 msgid "-debug            : try to debug crashes (requires 'gdb' installed)\n"
 msgstr ""
 
-#: src/main.c:2373 src/gui.c:1128
+#: src/main.c:2449 src/gui.c:1127
 msgid "Starting GUI..."
 msgstr ""
 
-#: src/main.c:2396
+#: src/main.c:2475
 #, c-format
 msgid ""
 "\n"
@@ -475,7 +479,7 @@
 "(Maybe you need to change the value of <prefix_dir> in your %s file)\n"
 msgstr ""
 
-#: src/main.c:2410
+#: src/main.c:2492
 #, c-format
 msgid ""
 "\n"
@@ -483,7 +487,7 @@
 "Please make sure you have write access to %s and try again.\n"
 msgstr ""
 
-#: src/main.c:2415
+#: src/main.c:2498
 msgid ""
 "\n"
 "`smogrify` must be in your path, and be executable\n"
@@ -492,7 +496,7 @@
 "before running LiVES.\n"
 msgstr ""
 
-#: src/main.c:2421
+#: src/main.c:2504
 #, c-format
 msgid ""
 "\n"
@@ -502,7 +506,7 @@
 "Please check the file permissions for this file and try again.\n"
 msgstr ""
 
-#: src/main.c:2428
+#: src/main.c:2512
 #, c-format
 msgid ""
 "\n"
@@ -513,7 +517,7 @@
 "and try again.\n"
 msgstr ""
 
-#: src/main.c:2438
+#: src/main.c:2522
 #, c-format
 msgid ""
 "Please check the <tempdir> setting in \n"
@@ -521,7 +525,7 @@
 "and try again.\n"
 msgstr ""
 
-#: src/main.c:2445
+#: src/main.c:2528
 #, c-format
 msgid ""
 "\n"
@@ -531,7 +535,7 @@
 "%s"
 msgstr ""
 
-#: src/main.c:2453
+#: src/main.c:2536
 msgid ""
 "\n"
 "An incorrect version of smogrify was found in your path.\n"
@@ -542,49 +546,49 @@
 "Thankyou.\n"
 msgstr ""
 
-#: src/main.c:2458
+#: src/main.c:2541
 msgid ""
 "\n"
 "LiVES currently requires 'mplayer', 'mplayer2' or 'sox' to function. Please "
 "install one or other of these, and try again.\n"
 msgstr ""
 
-#: src/main.c:2462
+#: src/main.c:2546
 msgid ""
 "\n"
 "LiVES currently requires both 'mplayer' or 'mplayer2' and 'sox' to function. "
 "Please install these, and try again.\n"
 msgstr ""
 
-#: src/main.c:2472
+#: src/main.c:2556
 msgid ""
 "\n"
 "LiVES was unable to locate 'mplayer' or 'mplayer2'. You may wish to install "
 "either one to use LiVES more fully.\n"
 msgstr ""
 
-#: src/main.c:2475
+#: src/main.c:2561
 msgid ""
 "\n"
 "LiVES was unable to locate 'convert'. You should install convert and image-"
 "magick if you want to use rendered effects.\n"
 msgstr ""
 
-#: src/main.c:2478
+#: src/main.c:2566
 msgid ""
 "\n"
 "LiVES was unable to locate 'composite'. You should install composite and "
 "image-magick if you want to use the merge function.\n"
 msgstr ""
 
-#: src/main.c:2481
+#: src/main.c:2570
 msgid ""
 "\n"
 "LiVES was unable to locate 'sox'. Some audio features may not work. You "
 "should install 'sox'.\n"
 msgstr ""
 
-#: src/main.c:2484
+#: src/main.c:2575
 #, c-format
 msgid ""
 "\n"
@@ -595,93 +599,93 @@
 "You may need to change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/main.c:2611
+#: src/main.c:2707
 #, c-format
 msgid "Autoloading set %s..."
 msgstr ""
 
 #. TRANSLATORS: localised name may be used here
-#: src/main.c:2781 src/interface.c:738
+#: src/main.c:2902
 msgid "LiVES"
 msgstr ""
 
-#: src/main.c:2948
+#: src/main.c:3066
 #, c-format
 msgid "Invalid audio player %s\n"
 msgstr ""
 
-#: src/main.c:3077
+#: src/main.c:3214
 #, c-format
 msgid "LiVES-%s: <Untitled%d> %dx%d : %d frames %d bpp %.3f fps"
 msgstr ""
 
-#: src/main.c:3082
+#: src/main.c:3219
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : ??? frames ??? bpp %.3f fps"
 msgstr ""
 
-#: src/main.c:3086
+#: src/main.c:3222
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : %d frames %d bpp %.3f fps"
 msgstr ""
 
-#: src/main.c:3094
+#: src/main.c:3229
 #, c-format
 msgid "LiVES-%s: <No File>"
 msgstr ""
 
 #. TRANSLATORS: rec(ord)
-#: src/main.c:5085
+#: src/main.c:5201
 #, c-format
 msgid "rec %9d/%d"
 msgstr ""
 
 #. TRANSLATORS: out of memory (rec(ord))
-#: src/main.c:5091
+#: src/main.c:5206
 #, c-format
 msgid "!rec %9d/%d"
 msgstr ""
 
-#: src/main.c:5398 src/main.c:5399 src/gui.c:2110 src/gui.c:3220
-#: src/saveplay.c:2336
+#: src/main.c:5500 src/main.c:5501 src/gui.c:2108 src/gui.c:3331
+#: src/saveplay.c:2315
 msgid "Play"
 msgstr ""
 
-#: src/main.c:6128
+#: src/main.c:6216
 msgid ""
 "LiVES was unable to capture this image\n"
 "\n"
 msgstr ""
 
-#: src/main.c:6250
+#: src/main.c:6345
 #, c-format
 msgid "Closed file %s\n"
 msgstr ""
 
-#: src/main.c:6452 src/gui.c:648 src/utils.c:4312 src/utils.c:4344
-#: src/saveplay.c:3550 src/multitrack.c:4510 src/multitrack.c:6268
+#: src/main.c:6542 src/gui.c:647 src/utils.c:4256 src/utils.c:4286
+#: src/saveplay.c:3500 src/multitrack.c:4678 src/multitrack.c:6447
 msgid "_Undo"
 msgstr ""
 
-#: src/main.c:6453 src/gui.c:666 src/utils.c:4313 src/utils.c:4345
-#: src/saveplay.c:3551 src/multitrack.c:4531 src/multitrack.c:6293
+#: src/main.c:6543 src/gui.c:665 src/utils.c:4257 src/utils.c:4287
+#: src/saveplay.c:3501 src/multitrack.c:4698 src/multitrack.c:6472
 msgid "_Redo"
 msgstr ""
 
-#: src/main.c:6493 src/interface.c:470 src/gui.c:2326 src/preferences.c:2357
-#: src/resample.c:1516
+#: src/main.c:6583 src/interface.c:457 src/gui.c:2324 src/preferences.c:2391
+#: src/resample.c:1488
 msgid "Video"
 msgstr ""
 
-#: src/main.c:6494 src/interface.c:483 src/gui.c:2351
+#: src/main.c:6584 src/interface.c:470 src/gui.c:2348
 msgid "Left Audio"
 msgstr ""
 
-#: src/main.c:6495 src/gui.c:2375
+#: src/main.c:6585 src/gui.c:2371
 msgid "Right Audio"
 msgstr ""
 
-#: src/main.c:6540
+#: src/main.c:6630
 msgid ""
 "\n"
 "\n"
@@ -690,11 +694,11 @@
 "Please adjust the playback options in Preferences and try again.\n"
 msgstr ""
 
-#: src/main.c:7051 src/plugins.c:1502
+#: src/main.c:7134 src/plugins.c:1468
 msgid "LiVES: - Play Window"
 msgstr ""
 
-#: src/startup.c:25
+#: src/startup.c:24
 #, c-format
 msgid ""
 "A directory named\n"
@@ -704,7 +708,7 @@
 "(Free space = %s)\n"
 msgstr ""
 
-#: src/startup.c:32
+#: src/startup.c:29
 #, c-format
 msgid ""
 "A directory named\n"
@@ -714,7 +718,7 @@
 "Please select another location.\n"
 msgstr ""
 
-#: src/startup.c:49
+#: src/startup.c:46
 #, c-format
 msgid ""
 "\n"
@@ -725,7 +729,7 @@
 "(Free space = %s)"
 msgstr ""
 
-#: src/startup.c:54
+#: src/startup.c:50
 #, c-format
 msgid ""
 "\n"
@@ -734,54 +738,54 @@
 "Please try again and choose a different location.\n"
 msgstr ""
 
-#: src/startup.c:96
+#: src/startup.c:92
 msgid "Directory name is too long !"
 msgstr ""
 
-#: src/startup.c:223
+#: src/startup.c:216
 msgid ""
 "LiVES FAILED TO START YOUR SELECTED AUDIO PLAYER !\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:230
+#: src/startup.c:222
 msgid ""
 "Before starting LiVES, you need to choose an audio player.\n"
 "\n"
 "PULSE AUDIO is recommended for most users"
 msgstr ""
 
-#: src/startup.c:233
+#: src/startup.c:225
 msgid ""
 ", but this version of LiVES was not compiled with pulse audio support.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:236
+#: src/startup.c:229
 msgid ""
 ", but you do not have pulse audio installed on your system.\n"
 " You are advised to install pulse audio first before running LiVES.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:241
+#: src/startup.c:233
 msgid "JACK audio is recommended for pro users"
 msgstr ""
 
-#: src/startup.c:244
+#: src/startup.c:236
 msgid ""
 ", but this version of LiVES was not compiled with jack audio support.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:247
+#: src/startup.c:239
 msgid ""
 ", but you do not have jackd installed. You may wish to install jackd first "
 "before running LiVES.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:250
+#: src/startup.c:242
 msgid ""
 ", but may prevent LiVES from starting on some systems.\n"
 "If LiVES will not start with jack, you can restart and try with another "
@@ -789,159 +793,159 @@
 "\n"
 msgstr ""
 
-#: src/startup.c:254
+#: src/startup.c:246
 msgid "SOX may be used if neither of the preceding players work, "
 msgstr ""
 
-#: src/startup.c:257
+#: src/startup.c:249
 msgid ""
 "but some audio features will be disabled.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:260
+#: src/startup.c:251
 msgid ""
 "but you do not have sox installed.\n"
 "You are advised to install it before running LiVES.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:264
+#: src/startup.c:255
 msgid ""
 "The MPLAYER/MPLAYER2 audio player is only recommended for testing purposes.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:281
+#: src/startup.c:271
 msgid "LiVES: - Choose an audio player"
 msgstr ""
 
-#: src/startup.c:298
+#: src/startup.c:288
 msgid "Use _pulse audio player"
 msgstr ""
 
-#: src/startup.c:320
+#: src/startup.c:310
 msgid "Use _jack audio player"
 msgstr ""
 
-#: src/startup.c:340
+#: src/startup.c:330
 msgid "Use _sox audio player"
 msgstr ""
 
-#: src/startup.c:361
+#: src/startup.c:351
 msgid "Use _mplayer audio player"
 msgstr ""
 
-#: src/startup.c:381
+#: src/startup.c:371
 msgid "Use _mplayer2 audio player"
 msgstr ""
 
-#: src/startup.c:405 src/startup.c:580 src/interface.c:1506
+#: src/startup.c:395 src/startup.c:569 src/interface.c:1398
 msgid "_Next"
 msgstr ""
 
-#: src/startup.c:445
+#: src/startup.c:435
 msgid "Skipped"
 msgstr ""
 
-#: src/startup.c:460
+#: src/startup.c:450
 msgid "Passed"
 msgstr ""
 
-#: src/startup.c:493
+#: src/startup.c:483
 msgid "Failed"
 msgstr ""
 
-#: src/startup.c:552
+#: src/startup.c:542
 msgid "LiVES: - Testing Configuration"
 msgstr ""
 
-#: src/startup.c:555
+#: src/startup.c:544
 msgid "LiVES: - Troubleshoot"
 msgstr ""
 
-#: src/startup.c:568
+#: src/startup.c:557
 msgid "LiVES will now run some basic configuration tests\n"
 msgstr ""
 
-#: src/startup.c:603
+#: src/startup.c:591
 msgid "Checking for \"sox\" presence"
 msgstr ""
 
-#: src/startup.c:607
+#: src/startup.c:595
 msgid ""
 "You should install sox to be able to use all the audio features in LiVES"
 msgstr ""
 
-#: src/startup.c:615
+#: src/startup.c:602
 msgid "Checking if sox can convert audio"
 msgstr ""
 
-#: src/startup.c:638
+#: src/startup.c:625
 msgid "Unable to allocate 176400 bytes memory."
 msgstr ""
 
-#: src/startup.c:653
+#: src/startup.c:639
 #, c-format
 msgid "Unable to write to: %s"
 msgstr ""
 
-#: src/startup.c:667 src/startup.c:807
+#: src/startup.c:653 src/startup.c:789
 #, c-format
 msgid "Command failed: %s"
 msgstr ""
 
-#: src/startup.c:689
+#: src/startup.c:675
 msgid "You should install sox_fmt_all or similar"
 msgstr ""
 
-#: src/startup.c:717
+#: src/startup.c:703
 msgid "Checking for \"mplayer\" presence"
 msgstr ""
 
-#: src/startup.c:721
+#: src/startup.c:707
 msgid ""
 "You should install mplayer or mplayer2 to be able to use all the decoding "
 "features in LiVES"
 msgstr ""
 
-#: src/startup.c:747
+#: src/startup.c:732
 msgid "Checking if mplayer can convert audio"
 msgstr ""
 
-#: src/startup.c:768
+#: src/startup.c:751
 msgid "You should install mplayer or mplayer2 with pcm/wav support"
 msgstr ""
 
-#: src/startup.c:785
+#: src/startup.c:767
 msgid "Checking if mplayer can decode to png/alpha"
 msgstr ""
 
-#: src/startup.c:828
+#: src/startup.c:810
 msgid "You may wish to upgrade mplayer to a newer version"
 msgstr ""
 
-#: src/startup.c:854
+#: src/startup.c:836
 msgid "Checking if mplayer can decode to jpeg"
 msgstr ""
 
-#: src/startup.c:882
+#: src/startup.c:862
 msgid "You should install mplayer with either png/alpha or jpeg support"
 msgstr ""
 
-#: src/startup.c:883
+#: src/startup.c:863
 msgid "You may wish to add jpeg output support to mplayer"
 msgstr ""
 
-#: src/startup.c:892
+#: src/startup.c:872
 msgid "Checking for \"convert\" presence"
 msgstr ""
 
-#: src/startup.c:896
+#: src/startup.c:876
 msgid "Install imageMagick to be able to use all of the rendered effects"
 msgstr ""
 
-#: src/startup.c:909
+#: src/startup.c:889
 msgid ""
 "\n"
 "\n"
@@ -949,7 +953,7 @@
 "Preferences/Decoding.    \n"
 msgstr ""
 
-#: src/startup.c:915
+#: src/startup.c:894
 msgid ""
 "\n"
 "\n"
@@ -957,49 +961,49 @@
 "continue    \n"
 msgstr ""
 
-#: src/startup.c:949
+#: src/startup.c:928
 msgid ""
 "\n"
 "\n"
 "Finally, you can choose the default startup interface for LiVES.\n"
 msgstr ""
 
-#: src/startup.c:950
+#: src/startup.c:929
 msgid ""
 "\n"
 "\n"
 "LiVES has two main interfaces and you can start up with either of them.\n"
 msgstr ""
 
-#: src/startup.c:951
+#: src/startup.c:930
 msgid ""
 "\n"
 "\n"
 "The default can always be changed later from Preferences.\n"
 msgstr ""
 
-#: src/startup.c:961
+#: src/startup.c:940
 msgid "LiVES: - Choose the startup interface"
 msgstr ""
 
-#: src/startup.c:972
+#: src/startup.c:951
 msgid "Start in _Clip Edit mode"
 msgstr ""
 
-#: src/startup.c:975
+#: src/startup.c:954
 msgid "This is the best choice for simple editing tasks and for VJs\n"
 msgstr ""
 
-#: src/startup.c:981
+#: src/startup.c:960
 msgid "Start in _Multitrack mode"
 msgstr ""
 
-#: src/startup.c:983
+#: src/startup.c:962
 msgid ""
 "This is a better choice for complex editing tasks involving multiple clips.\n"
 msgstr ""
 
-#: src/startup.c:992
+#: src/startup.c:971
 msgid "_Finish"
 msgstr ""
 
@@ -1016,35 +1020,35 @@
 msgid "Apply _Deinterlace"
 msgstr ""
 
-#: src/interface.c:66
+#: src/interface.c:65
 msgid "If this is set, frames will be deinterlaced as they are imported."
 msgstr ""
 
-#: src/interface.c:113 src/callbacks.c:9623 src/callbacks.c:9646
-#: src/callbacks.c:9647 src/gui.c:3223 src/gui.c:3821 src/saveplay.c:2339
-#: src/saveplay.c:3138 src/dialogs.c:1514 src/dialogs.c:1515
-#: src/dialogs.c:1746 src/dialogs.c:1747 src/framedraw.c:238
-#: src/multitrack.c:8031
+#: src/interface.c:106 src/callbacks.c:9542 src/callbacks.c:9564
+#: src/callbacks.c:9565 src/gui.c:3333 src/gui.c:3946 src/saveplay.c:2317
+#: src/saveplay.c:3097 src/dialogs.c:1575 src/dialogs.c:1576
+#: src/dialogs.c:1804 src/dialogs.c:1805 src/framedraw.c:236
+#: src/multitrack.c:8210
 msgid "Preview"
 msgstr ""
 
-#: src/interface.c:132
+#: src/interface.c:125
 msgid "Click here to _Preview any selected video, image or audio file"
 msgstr ""
 
-#: src/interface.c:135
+#: src/interface.c:127
 msgid "Click here to _Preview any selected audio file"
 msgstr ""
 
-#: src/interface.c:138
+#: src/interface.c:129
 msgid "Click here to _Preview the video"
 msgstr ""
 
-#: src/interface.c:181 src/dialogs.c:2542
+#: src/interface.c:169 src/dialogs.c:2621
 msgid "LiVES: - Processing..."
 msgstr ""
 
-#: src/interface.c:217
+#: src/interface.c:205
 msgid ""
 "\n"
 "\n"
@@ -1053,195 +1057,185 @@
 "Remember to switch off effects (ctrl-0) afterwards !"
 msgstr ""
 
-#: src/interface.c:222 src/callbacks.c:9373 src/callbacks.c:9420
-#: src/dialogs.c:2570
+#: src/interface.c:210 src/callbacks.c:9283 src/callbacks.c:9332
+#: src/dialogs.c:2649
 msgid ""
 "\n"
 "Please Wait"
 msgstr ""
 
-#: src/interface.c:242
+#: src/interface.c:230
 msgid "Show Details"
 msgstr ""
 
-#: src/interface.c:254 src/dialogs.c:2584
+#: src/interface.c:242 src/dialogs.c:2663
 msgid "_Enough"
 msgstr ""
 
-#: src/interface.c:255 src/framedraw.c:278
+#: src/interface.c:243 src/framedraw.c:276
 msgid "_Preview"
 msgstr ""
 
-#: src/interface.c:257
+#: src/interface.c:245 src/callbacks.c:9282 src/callbacks.c:9330
 msgid "Paus_e"
 msgstr ""
 
-#: src/interface.c:258 src/callbacks.c:9417
+#: src/interface.c:246 src/callbacks.c:9329
 msgid "Pause/_Enough"
 msgstr ""
 
-#: src/interface.c:285
+#: src/interface.c:273
 msgid "_Cancel"
 msgstr ""
 
-#: src/interface.c:374
+#: src/interface.c:361
 #, c-format
 msgid "LiVES: - %s"
 msgstr ""
 
-#: src/interface.c:376
+#: src/interface.c:363
 msgid "LiVES: - Multitrack details"
 msgstr ""
 
-#: src/interface.c:407
+#: src/interface.c:394
 msgid "Format"
 msgstr ""
 
-#: src/interface.c:412
+#: src/interface.c:399
 msgid "Frame size"
 msgstr ""
 
-#: src/interface.c:417
+#: src/interface.c:404
 msgid "File size"
 msgstr ""
 
-#: src/interface.c:418
+#: src/interface.c:405
 msgid "Byte size"
 msgstr ""
 
-#: src/interface.c:423 src/interface.c:1891
+#: src/interface.c:410 src/interface.c:1760
 msgid "FPS"
 msgstr ""
 
-#: src/interface.c:428
+#: src/interface.c:415
 msgid "Frames"
 msgstr ""
 
-#: src/interface.c:429
+#: src/interface.c:416
 msgid "Events"
 msgstr ""
 
-#: src/interface.c:434 src/interface.c:500 src/interface.c:542
+#: src/interface.c:421 src/interface.c:486 src/interface.c:528
 msgid "Total time"
 msgstr ""
 
-#: src/interface.c:486 src/resample.c:1488
+#: src/interface.c:472 src/resample.c:1460
 msgid "Audio"
 msgstr ""
 
-#: src/interface.c:511 src/interface.c:553
+#: src/interface.c:497 src/interface.c:539
 msgid "Rate/size"
 msgstr ""
 
-#: src/interface.c:530
+#: src/interface.c:516
 msgid "Right audio"
 msgstr ""
 
-#: src/interface.c:622
+#: src/interface.c:607
 msgid "LiVES: - Encoding options"
 msgstr ""
 
-#: src/interface.c:636
+#: src/interface.c:621
 msgid "<------------- (Check the box to re_size as suggested)"
 msgstr ""
 
-#: src/interface.c:637
+#: src/interface.c:622
 msgid "<------------- (Check the box to use the _size recommendation)"
 msgstr ""
 
-#: src/interface.c:662
+#: src/interface.c:646
 msgid "Use _letterboxing to maintain aspect ratio (optional)"
 msgstr ""
 
-#: src/interface.c:663
+#: src/interface.c:647
 msgid ""
 "Draw black rectangles either above or to the sides of the image, to prevent "
 "it from stretching."
 msgstr ""
 
-#: src/interface.c:694
+#: src/interface.c:677
 msgid "Keep _my settings"
 msgstr ""
 
-#: src/interface.c:695
+#: src/interface.c:678
 msgid "Use _recommended settings"
 msgstr ""
 
-#: src/interface.c:775 src/dialogs.c:114
-msgid ""
-"Do _not show this warning any more\n"
-"(can be turned back on from Preferences/Warnings)"
-msgstr ""
-
-#: src/interface.c:787
-msgid "Show _Details"
-msgstr ""
-
-#: src/interface.c:881
+#: src/interface.c:769
 msgid "_Close Window"
 msgstr ""
 
-#: src/interface.c:883
+#: src/interface.c:771
 msgid "_Save to file"
 msgstr ""
 
-#: src/interface.c:928
+#: src/interface.c:816
 msgid "LiVES: - Insert"
 msgstr ""
 
-#: src/interface.c:945
+#: src/interface.c:833
 msgid "_Number of times to insert"
 msgstr ""
 
-#: src/interface.c:954
+#: src/interface.c:842
 msgid "_Insert to fit audio"
 msgstr ""
 
-#: src/interface.c:968
+#: src/interface.c:856
 msgid "Insert _before selection"
 msgstr ""
 
-#: src/interface.c:970
+#: src/interface.c:858
 msgid "Insert clipboard before selected frames"
 msgstr ""
 
-#: src/interface.c:986
+#: src/interface.c:875
 msgid "Insert _after selection"
 msgstr ""
 
-#: src/interface.c:988
+#: src/interface.c:877
 msgid "Insert clipboard after selected frames"
 msgstr ""
 
-#: src/interface.c:999
+#: src/interface.c:888
 msgid "Insert _with sound"
 msgstr ""
 
-#: src/interface.c:1012
+#: src/interface.c:901
 msgid "Insert with_out sound"
 msgstr ""
 
-#: src/interface.c:1093
+#: src/interface.c:985
 msgid "LiVES: - Open Selection"
 msgstr ""
 
-#: src/interface.c:1111
+#: src/interface.c:1004
 msgid "Selection start time (sec)"
 msgstr ""
 
-#: src/interface.c:1117
+#: src/interface.c:1010
 msgid "Number of frames to open"
 msgstr ""
 
-#: src/interface.c:1193
+#: src/interface.c:1088
 msgid "LiVES: - Open Location"
 msgstr ""
 
-#: src/interface.c:1195
+#: src/interface.c:1090
 msgid "LiVES: - Open Youtube Clip"
 msgstr ""
 
-#: src/interface.c:1213
+#: src/interface.c:1109
 msgid ""
 "\n"
 "\n"
@@ -1251,7 +1245,7 @@
 "\n"
 msgstr ""
 
-#: src/interface.c:1216
+#: src/interface.c:1112
 msgid ""
 "\n"
 "\n"
@@ -1260,62 +1254,62 @@
 "\n"
 msgstr ""
 
-#: src/interface.c:1220
+#: src/interface.c:1116
 msgid ""
 "Enter the URL of the clip below.\n"
 "E.g: http://www.youtube.com/watch?v=WCR6f6WzjP8\n"
 "\n"
 msgstr ""
 
-#: src/interface.c:1231
+#: src/interface.c:1127
 msgid "URL : "
 msgstr ""
 
-#: src/interface.c:1231
+#: src/interface.c:1127
 msgid "Youtube URL : "
 msgstr ""
 
-#: src/interface.c:1235
+#: src/interface.c:1131
 msgid "Do not send bandwidth information"
 msgstr ""
 
-#: src/interface.c:1237
+#: src/interface.c:1133
 msgid "Try this setting if you are having problems getting a stream"
 msgstr ""
 
-#: src/interface.c:1258
+#: src/interface.c:1155
 msgid "Download to _Directory : "
 msgstr ""
 
-#: src/interface.c:1276
+#: src/interface.c:1173
 msgid "Download _File Name : "
 msgstr ""
 
-#: src/interface.c:1281
+#: src/interface.c:1178
 msgid ".webm"
 msgstr ""
 
-#: src/interface.c:1359
+#: src/interface.c:1256
 msgid "LiVES: - Rename Clip"
 msgstr ""
 
-#: src/interface.c:1362
-msgid "LiVES: - Enter Set Name"
+#: src/interface.c:1258
+msgid "LiVES: - Enter Set Name to Save as"
 msgstr ""
 
-#: src/interface.c:1365
+#: src/interface.c:1260
 msgid "LiVES: - Enter a Set Name to Reload"
 msgstr ""
 
-#: src/interface.c:1368
+#: src/interface.c:1262
 msgid "LiVES: - Choose a Working Directory"
 msgstr ""
 
-#: src/interface.c:1371
+#: src/interface.c:1264
 msgid "LiVES: - Rename Current Track"
 msgstr ""
 
-#: src/interface.c:1391
+#: src/interface.c:1283
 msgid ""
 "You need to enter a name for the current clip set.\n"
 "This will allow you reload the layout with the same clips later.\n"
@@ -1323,354 +1317,354 @@
 "LiVES will remind you to save the clip set later when you try to exit.\n"
 msgstr ""
 
-#: src/interface.c:1397
+#: src/interface.c:1289
 msgid ""
 "In order to export this project, you must enter a name for this clip set.\n"
 "This will also be used for the project name.\n"
 msgstr ""
 
-#: src/interface.c:1404
+#: src/interface.c:1296
 msgid ""
 "Welcome to LiVES !\n"
 "This startup wizard will guide you through the\n"
 "initial install so that you can get the most from this application.\n"
 msgstr ""
 
-#: src/interface.c:1408
+#: src/interface.c:1300
 msgid ""
 "\n"
 "First of all you need to choose a working directory for LiVES.\n"
 "This should be a directory with plenty of disk space available.\n"
 msgstr ""
 
-#: src/interface.c:1427
+#: src/interface.c:1317
 msgid "New name "
 msgstr ""
 
-#: src/interface.c:1430
+#: src/interface.c:1319
 msgid "Set name "
 msgstr ""
 
-#: src/interface.c:1550
+#: src/interface.c:1435
 msgid "Use def_aults"
 msgstr ""
 
-#: src/interface.c:1553 src/interface.c:1840 src/preferences.c:2515
-#: src/preferences.c:2697
+#: src/interface.c:1437 src/interface.c:1709 src/preferences.c:2550
+#: src/preferences.c:2739
 msgid "_Advanced"
 msgstr ""
 
-#: src/interface.c:1604
+#: src/interface.c:1487
 msgid "LiVES:- Select input device"
 msgstr ""
 
-#: src/interface.c:1622
+#: src/interface.c:1504
 msgid "Select input device:"
 msgstr ""
 
-#: src/interface.c:1686
+#: src/interface.c:1568
 msgid "LiVES:- Load CD Track"
 msgstr ""
 
-#: src/interface.c:1689
+#: src/interface.c:1570
 msgid "LiVES:- Select DVD Title/Chapter"
 msgstr ""
 
-#: src/interface.c:1692
+#: src/interface.c:1572
 msgid "LiVES:- Select VCD Title"
 msgstr ""
 
-#: src/interface.c:1695
+#: src/interface.c:1574
 msgid "LiVES:- Change Maximum Visible Tracks"
 msgstr ""
 
-#: src/interface.c:1698
+#: src/interface.c:1576
 msgid "LiVES:- Device details"
 msgstr ""
 
-#: src/interface.c:1721
+#: src/interface.c:1598
 #, c-format
 msgid "Track to load (from %s)"
 msgstr ""
 
-#: src/interface.c:1724
+#: src/interface.c:1600
 msgid "DVD Title"
 msgstr ""
 
-#: src/interface.c:1727
+#: src/interface.c:1602
 msgid "VCD Title"
 msgstr ""
 
-#: src/interface.c:1730
+#: src/interface.c:1604
 msgid "Maximum number of tracks to display"
 msgstr ""
 
-#: src/interface.c:1733
+#: src/interface.c:1606
 msgid "Device:        /dev/video"
 msgstr ""
 
-#: src/interface.c:1736
+#: src/interface.c:1608
 msgid "Device:        fw:"
 msgstr ""
 
-#: src/interface.c:1771
+#: src/interface.c:1641
 msgid "Chapter  "
 msgstr ""
 
-#: src/interface.c:1776
+#: src/interface.c:1645
 msgid "Channel  "
 msgstr ""
 
-#: src/interface.c:1791
+#: src/interface.c:1660
 msgid "Audio ID  "
 msgstr ""
 
-#: src/interface.c:1857
+#: src/interface.c:1726
 msgid "Input number"
 msgstr ""
 
-#: src/interface.c:1865
+#: src/interface.c:1734
 msgid "Use default width, height and FPS"
 msgstr ""
 
-#: src/interface.c:1879
+#: src/interface.c:1748
 msgid "Width"
 msgstr ""
 
-#: src/interface.c:1885
+#: src/interface.c:1754
 msgid "Height"
 msgstr ""
 
-#: src/interface.c:1899
+#: src/interface.c:1768
 msgid "_Driver"
 msgstr ""
 
-#: src/interface.c:1902
+#: src/interface.c:1771
 msgid "_Output format"
 msgstr ""
 
-#: src/interface.c:1998
+#: src/interface.c:1865
 msgid "LiVES:- Fade Audio In"
 msgstr ""
 
-#: src/interface.c:2001
+#: src/interface.c:1867
 msgid "LiVES:- Fade Audio Out"
 msgstr ""
 
-#: src/interface.c:2017
+#: src/interface.c:1883
 msgid "Fade in over  "
 msgstr ""
 
-#: src/interface.c:2018
+#: src/interface.c:1884
 msgid "first"
 msgstr ""
 
-#: src/interface.c:2021
+#: src/interface.c:1886
 msgid "Fade out over  "
 msgstr ""
 
-#: src/interface.c:2022
+#: src/interface.c:1887
 msgid "last"
 msgstr ""
 
-#: src/interface.c:2044
+#: src/interface.c:1909
 msgid "seconds."
 msgstr ""
 
-#: src/interface.c:2052 src/saveplay.c:1507
+#: src/interface.c:1917 src/saveplay.c:1484
 msgid "selection"
 msgstr ""
 
-#: src/interface.c:2092
+#: src/interface.c:1956
 msgid "LiVES: - File Comments (optional)"
 msgstr ""
 
-#: src/interface.c:2107
+#: src/interface.c:1971
 msgid "Title/Name : "
 msgstr ""
 
-#: src/interface.c:2114
+#: src/interface.c:1978
 msgid "Author/Artist : "
 msgstr ""
 
-#: src/interface.c:2121
+#: src/interface.c:1985
 msgid "Comments : "
 msgstr ""
 
-#: src/interface.c:2151
+#: src/interface.c:2015
 msgid "_Options"
 msgstr ""
 
-#: src/interface.c:2158
+#: src/interface.c:2022
 msgid "Save _subtitles to file"
 msgstr ""
 
-#: src/interface.c:2170
+#: src/interface.c:2033
 msgid "Subtitle file"
 msgstr ""
 
-#: src/interface.c:2172
+#: src/interface.c:2035
 msgid "Browse..."
 msgstr ""
 
-#: src/interface.c:2255
+#: src/interface.c:2132
 msgid "LiVES: - choose a device"
 msgstr ""
 
-#: src/interface.c:2259
+#: src/interface.c:2135
 msgid "LiVES: - choose a directory"
 msgstr ""
 
-#: src/interface.c:2262
+#: src/interface.c:2137
 msgid "LiVES: - choose a file"
 msgstr ""
 
-#: src/interface.c:2445
+#: src/interface.c:2381
 msgid "LiVES: - Cancel/Discard/Save"
 msgstr ""
 
-#: src/interface.c:2460
+#: src/interface.c:2397
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has not been saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:2463
+#: src/interface.c:2400
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has been changed since the last save.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:2467
+#: src/interface.c:2404
 msgid ""
 "You are about to exit LiVES.\n"
 "The current clip set can be saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:2468
+#: src/interface.c:2405
 msgid ""
 "The current clip set has not been saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:2472
+#: src/interface.c:2408
 msgid ""
 "The current layout has not been saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:2475
+#: src/interface.c:2410
 msgid ""
 "The current layout has *not* been changed since it was last saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:2480
+#: src/interface.c:2415
 msgid ""
 "The current layout contains generated frames and cannot be retained.\n"
 "You may wish to render it before exiting multitrack mode.\n"
 msgstr ""
 
-#: src/interface.c:2483
+#: src/interface.c:2418
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout contains generated frames and cannot be retained.\n"
 "What do you wish to do ?"
 msgstr ""
 
-#: src/interface.c:2496
+#: src/interface.c:2431
 msgid "Clip set _name"
 msgstr ""
 
-#: src/interface.c:2502
+#: src/interface.c:2437
 msgid "_Auto reload next time"
 msgstr ""
 
-#: src/interface.c:2538 src/interface.c:2547
+#: src/interface.c:2473 src/interface.c:2482
 msgid "_Wipe layout"
 msgstr ""
 
-#: src/interface.c:2539
+#: src/interface.c:2474
 msgid "_Ignore changes"
 msgstr ""
 
-#: src/interface.c:2540
+#: src/interface.c:2475
 msgid "_Delete clip set"
 msgstr ""
 
-#: src/interface.c:2541
+#: src/interface.c:2476
 msgid "_Delete layout"
 msgstr ""
 
-#: src/interface.c:2545
+#: src/interface.c:2480
 msgid "_Save layout"
 msgstr ""
 
-#: src/interface.c:2546
+#: src/interface.c:2481
 msgid "_Save clip set"
 msgstr ""
 
-#: src/interface.c:2565
+#: src/interface.c:2502
 msgid ""
 "\n"
 "LiVES has detected a multitrack layout from a previous session.\n"
 "Would you like to try and recover it ?\n"
 msgstr ""
 
-#: src/interface.c:2589
+#: src/interface.c:2528
 msgid "LiVES: - Disk Recovery Options"
 msgstr ""
 
-#: src/interface.c:2608
+#: src/interface.c:2549
 msgid "Delete _Orphaned Clips"
 msgstr ""
 
-#: src/interface.c:2609
+#: src/interface.c:2550
 msgid "Delete any clips which are not currently loaded or part of a set"
 msgstr ""
 
-#: src/interface.c:2622
+#: src/interface.c:2564
 msgid "Clear _Backup Files from Closed Clips"
 msgstr ""
 
-#: src/interface.c:2633
+#: src/interface.c:2575
 msgid "Remove Sets which have _Layouts but no Clips"
 msgstr ""
 
-#: src/interface.c:2644
+#: src/interface.c:2586
 msgid "_Reset to Defaults"
 msgstr ""
 
-#: src/interface.c:2651
+#: src/interface.c:2593
 msgid "_Accept"
 msgstr ""
 
-#: src/callbacks.c:198
+#: src/callbacks.c:208
 #, c-format
 msgid "Saving as set %s..."
 msgstr ""
 
-#: src/callbacks.c:833
+#: src/callbacks.c:852
 msgid "Please enter the name of the file to save the clip as.\n"
 msgstr ""
 
-#: src/callbacks.c:841
+#: src/callbacks.c:860
 msgid "Please enter a valid URL for the download.\n"
 msgstr ""
 
-#: src/callbacks.c:867
+#: src/callbacks.c:886
 #, c-format
 msgid "Downloading %s to %s..."
 msgstr ""
 
-#: src/callbacks.c:895
+#: src/callbacks.c:912
 msgid "Downloading clip"
 msgstr ""
 
-#: src/callbacks.c:933
+#: src/callbacks.c:950
 msgid ""
 "\n"
 "LiVES was unable to download the clip.\n"
@@ -1678,17 +1672,17 @@
 "the latest youtube-dl installed.\n"
 msgstr ""
 
-#: src/callbacks.c:1114 src/callbacks.c:1149
+#: src/callbacks.c:1131 src/callbacks.c:1166
 msgid "This file"
 msgstr ""
 
-#: src/callbacks.c:1115
+#: src/callbacks.c:1132
 msgid ""
 ",\n"
 " - including the current layout - "
 msgstr ""
 
-#: src/callbacks.c:1117
+#: src/callbacks.c:1134
 #, c-format
 msgid ""
 "\n"
@@ -1698,7 +1692,7 @@
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1119
+#: src/callbacks.c:1136
 #, c-format
 msgid ""
 "\n"
@@ -1708,20 +1702,20 @@
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1150
+#: src/callbacks.c:1167
 msgid ""
 "Changes made to this clip have not been saved or backed up.\n"
 "\n"
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1343
+#: src/callbacks.c:1356
 msgid ""
 "\n"
 "Invalid project file.\n"
 msgstr ""
 
-#: src/callbacks.c:1356
+#: src/callbacks.c:1370
 #, c-format
 msgid ""
 "\n"
@@ -1734,33 +1728,33 @@
 "Once you have done this, you will be able to import the new project.\n"
 msgstr ""
 
-#: src/callbacks.c:1366
+#: src/callbacks.c:1381
 #, c-format
 msgid "Importing the project %s as set %s..."
 msgstr ""
 
-#: src/callbacks.c:1386
+#: src/callbacks.c:1399
 msgid "Importing project"
 msgstr ""
 
-#: src/callbacks.c:1472
+#: src/callbacks.c:1481
 #, c-format
 msgid "Exporting project %s..."
 msgstr ""
 
-#: src/callbacks.c:1490
+#: src/callbacks.c:1497
 msgid "Exporting project"
 msgstr ""
 
-#: src/callbacks.c:1506
+#: src/callbacks.c:1513
 msgid "Backup as .lv1 file"
 msgstr ""
 
-#: src/callbacks.c:1522
+#: src/callbacks.c:1529
 msgid "Restore .lv1 file"
 msgstr ""
 
-#: src/callbacks.c:1664
+#: src/callbacks.c:1671
 msgid ""
 "\n"
 "\n"
@@ -1768,72 +1762,77 @@
 "Are you sure ?\n"
 msgstr ""
 
-#: src/callbacks.c:1725
+#: src/callbacks.c:1732
 #, c-format
 msgid "Deleting set %s..."
 msgstr ""
 
-#: src/callbacks.c:1727
+#: src/callbacks.c:1734
 msgid "Deleting set..."
 msgstr ""
 
-#: src/callbacks.c:1731
+#: src/callbacks.c:1738
 msgid "Deleting set"
 msgstr ""
 
-#: src/callbacks.c:1739
+#: src/callbacks.c:1746
 #, c-format
 msgid "Set %s was permanently deleted from the disk.\n"
 msgstr ""
 
-#: src/callbacks.c:1787 src/callbacks.c:11764
+#: src/callbacks.c:1792 src/callbacks.c:11676
 msgid "Insert Silence"
 msgstr ""
 
-#: src/callbacks.c:1840 src/callbacks.c:1923 src/callbacks.c:2086
+#: src/callbacks.c:1844 src/callbacks.c:1927 src/callbacks.c:2089
 msgid "Undoing"
 msgstr ""
 
-#: src/callbacks.c:1936 src/callbacks.c:2147
+#: src/callbacks.c:1940 src/callbacks.c:2150
 msgid "Restoring audio..."
 msgstr ""
 
-#: src/callbacks.c:1952
+#: src/callbacks.c:1956
 msgid "Clearing frame images"
 msgstr ""
 
-#: src/callbacks.c:1985
+#: src/callbacks.c:1988
 msgid "Deleting excess frames"
 msgstr ""
 
-#: src/callbacks.c:2229
+#: src/callbacks.c:2232
 #, c-format
 msgid "Length of video is now %d frames at %.3f frames per second.\n"
 msgstr ""
 
-#: src/callbacks.c:2233 src/resample.c:683 src/resample.c:2166
+#: src/callbacks.c:2235 src/resample.c:678 src/resample.c:2133
 #, c-format
 msgid "Clipboard was resampled to %d frames.\n"
 msgstr ""
 
-#: src/callbacks.c:2394 src/callbacks.c:2423
+#: src/callbacks.c:2396 src/callbacks.c:2425
 msgid "Redoing"
 msgstr ""
 
-#: src/callbacks.c:2462
+#: src/callbacks.c:2472
 #, c-format
-msgid "Copying frames %d to %d%s to the clipboard..."
+msgid "Copying frames %d to %d (with sound) to the clipboard..."
 msgstr ""
 
-#: src/callbacks.c:2525
+#: src/callbacks.c:2474
+#, c-format
+msgid "Copying frames %d to %d to the clipboard..."
+msgstr ""
+
+#: src/callbacks.c:2526
 msgid "Copying to the clipboard"
 msgstr ""
 
-#: src/callbacks.c:2600
+#: src/callbacks.c:2601
 msgid "Cut"
 msgstr ""
 
-#: src/callbacks.c:2641 src/callbacks.c:3068 src/callbacks.c:8026
+#: src/callbacks.c:2641 src/callbacks.c:3063 src/callbacks.c:7631
 msgid "Pulling frames from clipboard"
 msgstr ""
 
@@ -1842,22 +1841,22 @@
 msgid "Pasting %d frames to new clip %s..."
 msgstr ""
 
-#: src/callbacks.c:2678
+#: src/callbacks.c:2676
 msgid "Pasting"
 msgstr ""
 
-#: src/callbacks.c:2694
+#: src/callbacks.c:2692
 msgid "...added audio..."
 msgstr ""
 
-#: src/callbacks.c:2778
+#: src/callbacks.c:2775
 msgid ""
 "This operation requires resizing or converting of frames.\n"
 "Please install 'convert' from the Image-magick package, and then restart "
 "LiVES.\n"
 msgstr ""
 
-#: src/callbacks.c:2795
+#: src/callbacks.c:2793
 msgid ""
 "\n"
 "\n"
@@ -1866,31 +1865,31 @@
 "the 'Trim Audio' function from the Audio menu."
 msgstr ""
 
-#: src/callbacks.c:2819
+#: src/callbacks.c:2817
 msgid ""
 "LiVES cannot insert because the audio rates do not match.\n"
 "Please install 'sox', and try again."
 msgstr ""
 
-#: src/callbacks.c:2838
+#: src/callbacks.c:2835
 msgid ""
 "\n"
 "Insertion will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:2888 src/callbacks.c:11692
+#: src/callbacks.c:2883 src/callbacks.c:11606
 msgid ""
 "\n"
 "Insertion will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:2996 src/callbacks.c:3025
+#: src/callbacks.c:2987 src/callbacks.c:3016
 msgid "Resampling clipboard audio"
 msgstr ""
 
-#: src/callbacks.c:3041
+#: src/callbacks.c:3032
 msgid ""
 "\n"
 "\n"
@@ -1898,7 +1897,7 @@
 "Clipboard audio has been erased.\n"
 msgstr ""
 
-#: src/callbacks.c:3055
+#: src/callbacks.c:3045
 msgid ""
 "\n"
 "\n"
@@ -1907,86 +1906,86 @@
 "using unchanged audio ?\n"
 msgstr ""
 
-#: src/callbacks.c:3137 src/callbacks.c:3311
+#: src/callbacks.c:3132 src/callbacks.c:3299
 #, c-format
 msgid "Inserting %d%s frames from the clipboard..."
 msgstr ""
 
-#: src/callbacks.c:3162 src/callbacks.c:3236 src/callbacks.c:3339
+#: src/callbacks.c:3155 src/callbacks.c:3224 src/callbacks.c:3325
 msgid "Inserting"
 msgstr ""
 
-#: src/callbacks.c:3193
+#: src/callbacks.c:3187
 #, c-format
 msgid "Inserting %d times from the clipboard%s..."
 msgstr ""
 
-#: src/callbacks.c:3200
+#: src/callbacks.c:3191
 #, c-format
 msgid "Inserting %d frames from the clipboard%s..."
 msgstr ""
 
-#: src/callbacks.c:3418
+#: src/callbacks.c:3404
 msgid "Insert"
 msgstr ""
 
-#: src/callbacks.c:3486
+#: src/callbacks.c:3471
 msgid ""
 "\n"
 "Deleting all frames will close this file.\n"
 "Are you sure ?"
 msgstr ""
 
-#: src/callbacks.c:3495
+#: src/callbacks.c:3480
 msgid ""
 "\n"
 "Deletion will cause missing frames in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3515 src/callbacks.c:10920 src/callbacks.c:11162
-#: src/callbacks.c:11228
+#: src/callbacks.c:3500 src/callbacks.c:10851 src/callbacks.c:11087
+#: src/callbacks.c:11152
 msgid ""
 "\n"
 "Deletion will cause missing audio in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3534
+#: src/callbacks.c:3519
 msgid ""
 "\n"
 "Deletion will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3553 src/callbacks.c:11210
+#: src/callbacks.c:3538 src/callbacks.c:11134
 msgid ""
 "\n"
 "Deletion will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3611
+#: src/callbacks.c:3597
 #, c-format
 msgid "Deleting frames %d to %d%s..."
 msgstr ""
 
-#: src/callbacks.c:3636
+#: src/callbacks.c:3619
 msgid "Deleting"
 msgstr ""
 
-#: src/callbacks.c:3717
+#: src/callbacks.c:3699
 msgid "Delete"
 msgstr ""
 
-#: src/callbacks.c:3738
+#: src/callbacks.c:3717
 msgid ""
 "\n"
 "\n"
 "Selection is locked.\n"
 msgstr ""
 
-#: src/callbacks.c:4092
+#: src/callbacks.c:4056
 msgid ""
 "Ready to record. Use 'control' and cursor keys during playback to record "
 "your performance.\n"
@@ -1994,11 +1993,11 @@
 "play.)\n"
 msgstr ""
 
-#: src/callbacks.c:4098
+#: src/callbacks.c:4061
 msgid "Record cancelled.\n"
 msgstr ""
 
-#: src/callbacks.c:4237
+#: src/callbacks.c:4197
 #, c-format
 msgid ""
 "\n"
@@ -2007,7 +2006,7 @@
 "%s\n"
 msgstr ""
 
-#: src/callbacks.c:4241
+#: src/callbacks.c:4200
 #, c-format
 msgid ""
 "\n"
@@ -2016,7 +2015,7 @@
 "The plugin may be broken or not installed correctly."
 msgstr ""
 
-#: src/callbacks.c:4571
+#: src/callbacks.c:4532
 #, c-format
 msgid ""
 "Saving the set will cause copies of all loaded clips to remain on the disk"
@@ -2025,22 +2024,22 @@
 "Please press 'Cancel' if that is not what you want.\n"
 msgstr ""
 
-#: src/callbacks.c:4654
+#: src/callbacks.c:4617
 #, c-format
 msgid "Saving set %s"
 msgstr ""
 
-#: src/callbacks.c:5005
+#: src/callbacks.c:4964
 #, c-format
 msgid "Loading clips from set %s"
 msgstr ""
 
-#: src/callbacks.c:5093
+#: src/callbacks.c:5051
 #, c-format
 msgid "%d clips and %d layouts were recovered from set (%s).\n"
 msgstr ""
 
-#: src/callbacks.c:5312
+#: src/callbacks.c:5259
 msgid ""
 "LiVES will attempt to recover some disk space.\n"
 "You should ONLY run this if you have no other copies of LiVES running on "
@@ -2048,24 +2047,24 @@
 "Click OK to proceed.\n"
 msgstr ""
 
-#: src/callbacks.c:5317
+#: src/callbacks.c:5264
 msgid "Cleaning up disk space..."
 msgstr ""
 
-#: src/callbacks.c:5387
+#: src/callbacks.c:5334
 msgid "Recovering disk space"
 msgstr ""
 
-#: src/callbacks.c:5439
+#: src/callbacks.c:5386
 #, c-format
 msgid "%s of disk space was recovered.\n"
 msgstr ""
 
-#: src/callbacks.c:5482
+#: src/callbacks.c:5428
 msgid "Resetting frame rates and frame values..."
 msgstr ""
 
-#: src/callbacks.c:5523
+#: src/callbacks.c:5469
 #, c-format
 msgid ""
 "\n"
@@ -2073,68 +2072,68 @@
 "Internal: %s (%d bpp) / %s\n"
 msgstr ""
 
-#: src/callbacks.c:5525
+#: src/callbacks.c:5471
 msgid "buffered"
 msgstr ""
 
-#: src/callbacks.c:5538 src/callbacks.c:5557 src/callbacks.c:5575
-#: src/callbacks.c:5609
+#: src/callbacks.c:5484 src/callbacks.c:5502 src/callbacks.c:5518
+#: src/callbacks.c:5551
 msgid ""
 "\n"
 "  Opening..."
 msgstr ""
 
-#: src/callbacks.c:5545
+#: src/callbacks.c:5490
 #, c-format
 msgid ""
 "\n"
 "(%d virtual)"
 msgstr ""
 
-#: src/callbacks.c:5548
+#: src/callbacks.c:5493
 #, c-format
 msgid ""
 "\n"
 "(%d decoded)"
 msgstr ""
 
-#: src/callbacks.c:5560 src/callbacks.c:5578 src/callbacks.c:5612
+#: src/callbacks.c:5504 src/callbacks.c:5520 src/callbacks.c:5553
 #, c-format
 msgid ""
 "\n"
 "  %.2f sec."
 msgstr ""
 
-#: src/callbacks.c:5569
+#: src/callbacks.c:5512
 msgid ""
 "\n"
 "  Unknown"
 msgstr ""
 
-#: src/callbacks.c:5582 src/callbacks.c:5596
+#: src/callbacks.c:5524 src/callbacks.c:5538
 msgid "unsigned"
 msgstr ""
 
-#: src/callbacks.c:5583 src/callbacks.c:5597
+#: src/callbacks.c:5525 src/callbacks.c:5539
 msgid "signed"
 msgstr ""
 
-#: src/callbacks.c:5585 src/callbacks.c:5599
+#: src/callbacks.c:5527 src/callbacks.c:5541
 msgid "big-endian"
 msgstr ""
 
-#: src/callbacks.c:5586 src/callbacks.c:5600
+#: src/callbacks.c:5528 src/callbacks.c:5542
 msgid "little-endian"
 msgstr ""
 
-#: src/callbacks.c:5588 src/callbacks.c:5602
+#: src/callbacks.c:5530 src/callbacks.c:5544
 #, c-format
 msgid ""
 "  %d Hz %d bit\n"
 "%s %s"
 msgstr ""
 
-#: src/callbacks.c:5707
+#: src/callbacks.c:5647
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -2151,22 +2150,22 @@
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA.\n"
 msgstr ""
 
-#: src/callbacks.c:5721
+#: src/callbacks.c:5661
 msgid "A video editor and VJ program."
 msgstr ""
 
-#: src/callbacks.c:5722
+#: src/callbacks.c:5662
 msgid "About LiVES"
 msgstr ""
 
-#: src/callbacks.c:5724
+#: src/callbacks.c:5664
 msgid "translator_credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Guybrush88 https://launchpad.net/~guybrush\n"
 "  Rene Hasekamp https://launchpad.net/~hasekamp"
 
-#: src/callbacks.c:5758
+#: src/callbacks.c:5699
 #, c-format
 msgid ""
 "LiVES Version %s\n"
@@ -2180,14 +2179,14 @@
 "Homepage: http://lives.sourceforge.net"
 msgstr ""
 
-#: src/callbacks.c:6037
+#: src/callbacks.c:5996
 msgid ""
 "\n"
 "\n"
 "You need to install mplayer or mplayer2 to be able to preview this file.\n"
 msgstr ""
 
-#: src/callbacks.c:6040
+#: src/callbacks.c:5998
 msgid ""
 "\n"
 "\n"
@@ -2195,215 +2194,206 @@
 "this file.\n"
 msgstr ""
 
-#: src/callbacks.c:6423 src/callbacks.c:8289
-msgid ""
-"\n"
-"Loading new audio may cause missing audio in some multitrack layouts.\n"
-"Are you sure you wish to continue ?\n"
-"."
-msgstr ""
-
-#: src/callbacks.c:6523
-#, c-format
-msgid "Opening audio %s, type %s..."
-msgstr ""
-
-#: src/callbacks.c:6556 src/saveplay.c:480
-msgid "Opening audio"
-msgstr ""
-
-#: src/callbacks.c:6565 src/callbacks.c:6612 src/callbacks.c:8387
-#: src/callbacks.c:8429 src/callbacks.c:8472 src/callbacks.c:10846
-msgid "Cancelling"
-msgstr ""
-
-#: src/callbacks.c:6660 src/callbacks.c:8514 src/callbacks.c:10876
-#: src/callbacks.c:11563
-msgid "Committing audio"
-msgstr ""
-
-#: src/callbacks.c:6672 src/callbacks.c:8546
-msgid "New Audio"
-msgstr ""
-
-#: src/callbacks.c:6779
+#: src/callbacks.c:6459
 #, c-format
 msgid ""
 "Text was saved as\n"
 "%s\n"
 msgstr ""
 
-#: src/callbacks.c:6951 src/saveplay.c:3618
-#, c-format
-msgid "%d frames are enough !\n"
-msgstr ""
-
-#: src/callbacks.c:7050
+#: src/callbacks.c:6706
 msgid "LiVES: - Encoder debug output"
 msgstr ""
 
-#: src/callbacks.c:7087 src/gui.c:1922
+#: src/callbacks.c:6743 src/gui.c:1921
 msgid "Fullscreen playback (f)"
 msgstr ""
 
-#: src/callbacks.c:7089
+#: src/callbacks.c:6744
 msgid "Fullscreen playback off (f)"
 msgstr ""
 
-#: src/callbacks.c:7188 src/callbacks.c:7336 src/callbacks.c:7664
-#: src/callbacks.c:7681 src/gui.c:3712 src/saveplay.c:2467 src/saveplay.c:2501
-#: src/saveplay.c:3115 src/saveplay.c:3220 src/saveplay.c:3239
-#: src/multitrack.c:9340 src/multitrack.c:11060
+#: src/callbacks.c:6841 src/callbacks.c:6983 src/callbacks.c:7283
+#: src/callbacks.c:7298 src/gui.c:3838 src/saveplay.c:2442 src/saveplay.c:2475
+#: src/saveplay.c:3074 src/saveplay.c:3178 src/saveplay.c:3197
+#: src/multitrack.c:9526 src/multitrack.c:11288
 #, c-format
 msgid " (%d %% scale)"
 msgstr ""
 
-#: src/callbacks.c:7190 src/callbacks.c:7338 src/callbacks.c:7666
-#: src/gui.c:3716 src/saveplay.c:2469 src/saveplay.c:2503
+#: src/callbacks.c:6843 src/callbacks.c:6985 src/callbacks.c:7285
+#: src/gui.c:3842 src/saveplay.c:2444 src/saveplay.c:2477
 #, c-format
 msgid "LiVES: - Play Window%s"
 msgstr ""
 
-#: src/callbacks.c:7302 src/gui.c:1907
+#: src/callbacks.c:6950 src/gui.c:1906
 msgid "Double size (d)"
 msgstr ""
 
-#: src/callbacks.c:7309
+#: src/callbacks.c:6956
 msgid "Single size (d)"
 msgstr ""
 
-#: src/callbacks.c:7442 src/callbacks.c:7443
+#: src/callbacks.c:7087 src/callbacks.c:7088
 msgid "Hide the play window (s)"
 msgstr ""
 
-#: src/callbacks.c:7452 src/gui.c:1746
+#: src/callbacks.c:7096 src/gui.c:1744
 msgid "Show the play window (s)"
 msgstr ""
 
-#: src/callbacks.c:7453 src/gui.c:1896
+#: src/callbacks.c:7097 src/gui.c:1895
 msgid "Play in separate window (s)"
 msgstr ""
 
-#: src/callbacks.c:7535 src/gui.c:4060 src/saveplay.c:2498
+#: src/callbacks.c:7175 src/gui.c:4169 src/saveplay.c:2472
 msgid "LiVES: - Streaming"
 msgstr ""
 
-#: src/callbacks.c:7778
+#: src/callbacks.c:7388
 msgid "Switch continuous looping off (o)"
 msgstr ""
 
-#: src/callbacks.c:7785 src/gui.c:1795
+#: src/callbacks.c:7394 src/gui.c:1793
 msgid "Switch continuous looping on (o)"
 msgstr ""
 
-#: src/callbacks.c:7837
+#: src/callbacks.c:7444
 #, c-format
 msgid "Audio volume (%.2f)"
 msgstr ""
 
-#: src/callbacks.c:7876 src/callbacks.c:7877 src/gui.c:3640
+#: src/callbacks.c:7483 src/callbacks.c:7484 src/gui.c:3766
 msgid "Unmute the audio (z)"
 msgstr ""
 
-#: src/callbacks.c:7888 src/callbacks.c:7889 src/gui.c:1808 src/gui.c:3639
+#: src/callbacks.c:7494 src/callbacks.c:7495 src/gui.c:1806 src/gui.c:3765
 msgid "Mute the audio (z)"
 msgstr ""
 
-#: src/callbacks.c:8038
+#: src/callbacks.c:7643
 msgid "Reversing clipboard..."
 msgstr ""
 
-#: src/callbacks.c:8052
+#: src/callbacks.c:7657
 msgid "Reversing clipboard"
 msgstr ""
 
-#: src/callbacks.c:8084
+#: src/callbacks.c:7689
 msgid "LiVES: Load subtitles from..."
 msgstr ""
 
-#: src/callbacks.c:8151 src/saveplay.c:970
+#: src/callbacks.c:7753 src/saveplay.c:956
 #, c-format
 msgid "Loaded subtitle file: %s\n"
 msgstr ""
 
-#: src/callbacks.c:8220
+#: src/callbacks.c:7821
 msgid "Subtitles were erased.\n"
 msgstr ""
 
-#: src/callbacks.c:8239
+#: src/callbacks.c:7843
 msgid "LiVES: - Select Audio File"
 msgstr ""
 
-#: src/callbacks.c:8250
+#: src/callbacks.c:7878 src/callbacks.c:8232
+msgid ""
+"\n"
+"Loading new audio may cause missing audio in some multitrack layouts.\n"
+"Are you sure you wish to continue ?\n"
+"."
+msgstr ""
+
+#: src/callbacks.c:7989
+#, c-format
+msgid "Opening audio %s, type %s..."
+msgstr ""
+
+#: src/callbacks.c:8023 src/saveplay.c:477
+msgid "Opening audio"
+msgstr ""
+
+#: src/callbacks.c:8032 src/callbacks.c:8083 src/callbacks.c:8327
+#: src/callbacks.c:8369 src/callbacks.c:8412 src/callbacks.c:10766
+msgid "Cancelling"
+msgstr ""
+
+#: src/callbacks.c:8137 src/callbacks.c:8454 src/callbacks.c:10803
+#: src/callbacks.c:11477
+msgid "Committing audio"
+msgstr ""
+
+#: src/callbacks.c:8153 src/callbacks.c:8484
+msgid "New Audio"
+msgstr ""
+
+#: src/callbacks.c:8194
 msgid "Please set your CD play device in Tools | Preferences | Misc\n"
 msgstr ""
 
-#: src/callbacks.c:8321
+#: src/callbacks.c:8264
 #, c-format
 msgid "Opening CD track %d from %s..."
 msgstr ""
 
-#: src/callbacks.c:8326
+#: src/callbacks.c:8267
 #, c-format
 msgid "CD track %d"
 msgstr ""
 
-#: src/callbacks.c:8373
+#: src/callbacks.c:8313
 msgid "Opening CD track..."
 msgstr ""
 
-#: src/callbacks.c:8415 src/callbacks.c:8461
+#: src/callbacks.c:8355 src/callbacks.c:8401
 msgid "Error loading CD track\n"
 msgstr ""
 
-#: src/callbacks.c:8584
+#: src/callbacks.c:8518
 msgid "layout errors"
 msgstr ""
 
-#: src/callbacks.c:8595
+#: src/callbacks.c:8529
 msgid "Close _Window"
 msgstr ""
 
-#: src/callbacks.c:8606
+#: src/callbacks.c:8540
 msgid "Clear _Errors"
 msgstr ""
 
-#: src/callbacks.c:8617
+#: src/callbacks.c:8551
 msgid "_Delete affected layouts"
 msgstr ""
 
-#: src/callbacks.c:9343 src/callbacks.c:9388
+#: src/callbacks.c:9253 src/callbacks.c:9298
 msgid "Resume"
 msgstr ""
 
-#: src/callbacks.c:9344
+#: src/callbacks.c:9254
 msgid ""
 "\n"
 "Paused\n"
 "(click Resume to continue processing)"
 msgstr ""
 
-#: src/callbacks.c:9345 src/callbacks.c:9406
+#: src/callbacks.c:9255 src/callbacks.c:9315
 msgid "paused..."
 msgstr ""
 
-#: src/callbacks.c:9372 src/callbacks.c:9418
-msgid "Pause"
-msgstr ""
-
-#: src/callbacks.c:9374 src/callbacks.c:9421
+#: src/callbacks.c:9284 src/callbacks.c:9333
 msgid "resumed..."
 msgstr ""
 
-#: src/callbacks.c:9393
+#: src/callbacks.c:9303
 msgid "Keep"
 msgstr ""
 
-#: src/callbacks.c:9396
+#: src/callbacks.c:9305
 msgid "Enough"
 msgstr ""
 
-#: src/callbacks.c:9401
+#: src/callbacks.c:9310
 #, c-format
 msgid ""
 "\n"
@@ -2412,28 +2402,28 @@
 "(click Resume to continue processing)"
 msgstr ""
 
-#: src/callbacks.c:9419
+#: src/callbacks.c:9331
 msgid "Cancel"
 msgstr ""
 
-#: src/callbacks.c:9558
+#: src/callbacks.c:9478
 msgid "Stop"
 msgstr ""
 
-#: src/callbacks.c:10053 src/multitrack.c:13247
+#: src/callbacks.c:9968 src/multitrack.c:13489
 msgid "LiVES: Selected frame"
 msgstr ""
 
-#: src/callbacks.c:10061
+#: src/callbacks.c:9976
 msgid "_Save frame as..."
 msgstr ""
 
-#: src/callbacks.c:10290
+#: src/callbacks.c:10202
 #, c-format
 msgid "Audio is ahead of video by %.4f secs. at frame %d, with fps %.4f\n"
 msgstr ""
 
-#: src/callbacks.c:10347
+#: src/callbacks.c:10255
 msgid ""
 "\n"
 "\n"
@@ -2442,7 +2432,7 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10353
+#: src/callbacks.c:10261
 msgid ""
 "\n"
 "\n"
@@ -2450,13 +2440,13 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10429 src/callbacks.c:11479
+#: src/callbacks.c:10334 src/callbacks.c:11395
 msgid ""
 "\n"
 "Record time must be greater than 0.\n"
 msgstr ""
 
-#: src/callbacks.c:10440
+#: src/callbacks.c:10346
 msgid ""
 "Capture an External Window:\n"
 "\n"
@@ -2465,17 +2455,17 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10445
+#: src/callbacks.c:10351
 msgid "External window was released.\n"
 msgstr ""
 
-#: src/callbacks.c:10479
+#: src/callbacks.c:10385
 msgid ""
 "Click on a Window to Capture it\n"
 "Press 'q' to stop recording"
 msgstr ""
 
-#: src/callbacks.c:10513
+#: src/callbacks.c:10419
 #, c-format
 msgid ""
 "\n"
@@ -2485,19 +2475,19 @@
 "(Default of %.3f frames per second will be used.)\n"
 msgstr ""
 
-#: src/callbacks.c:10539
+#: src/callbacks.c:10443
 msgid "LiVES was unable to capture this window. Sorry.\n"
 msgstr ""
 
-#: src/callbacks.c:10695
+#: src/callbacks.c:10601
 msgid "Export Selected Audio as..."
 msgstr ""
 
-#: src/callbacks.c:10699
+#: src/callbacks.c:10604
 msgid "Export Audio as..."
 msgstr ""
 
-#: src/callbacks.c:10714
+#: src/callbacks.c:10619
 msgid ""
 "\n"
 "\n"
@@ -2506,1033 +2496,1033 @@
 "rate.\n"
 msgstr ""
 
-#: src/callbacks.c:10720
+#: src/callbacks.c:10625
 #, c-format
 msgid "Exporting audio frames %d to %d as %s..."
 msgstr ""
 
-#: src/callbacks.c:10725
+#: src/callbacks.c:10629
 #, c-format
 msgid "Exporting audio as %s..."
 msgstr ""
 
-#: src/callbacks.c:10751
+#: src/callbacks.c:10655
 msgid "Exporting audio"
 msgstr ""
 
-#: src/callbacks.c:10782
+#: src/callbacks.c:10695
 msgid "LiVES: - Append Audio File"
 msgstr ""
 
-#: src/callbacks.c:10825
+#: src/callbacks.c:10739
 #, c-format
 msgid "Appending audio file %s..."
 msgstr ""
 
-#: src/callbacks.c:10836
+#: src/callbacks.c:10756
 msgid "Appending audio"
 msgstr ""
 
-#: src/callbacks.c:10892
+#: src/callbacks.c:10818
 msgid "Append Audio"
 msgstr ""
 
-#: src/callbacks.c:10952
+#: src/callbacks.c:10883
 #, c-format
 msgid "Padding audio to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10954
+#: src/callbacks.c:10885
 #, c-format
 msgid "Trimming audio from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10973
+#: src/callbacks.c:10904
 msgid "Trimming/Padding audio"
 msgstr ""
 
-#: src/callbacks.c:10981
+#: src/callbacks.c:10912
 msgid "Trim/Pad Audio"
 msgstr ""
 
-#: src/callbacks.c:11055
+#: src/callbacks.c:10982
 msgid "Fading audio in"
 msgstr ""
 
-#: src/callbacks.c:11056
+#: src/callbacks.c:10983
 msgid "Fade audio in"
 msgstr ""
 
-#: src/callbacks.c:11061
+#: src/callbacks.c:10987
 msgid "Fading audio out"
 msgstr ""
 
-#: src/callbacks.c:11062
+#: src/callbacks.c:10988
 msgid "Fade audio out"
 msgstr ""
 
-#: src/callbacks.c:11085
+#: src/callbacks.c:11011
 #, c-format
 msgid "%s over %.1f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11087
+#: src/callbacks.c:11013
 #, c-format
 msgid "%s from time %.2f seconds to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11094
+#: src/callbacks.c:11020
 msgid "Fading audio..."
 msgstr ""
 
-#: src/callbacks.c:11194
+#: src/callbacks.c:11119
 msgid ""
 "\n"
 "Deleting all audio will close this file.\n"
 "Are you sure ?"
 msgstr ""
 
-#: src/callbacks.c:11197
+#: src/callbacks.c:11122
 msgid "Deleting all audio..."
 msgstr ""
 
-#: src/callbacks.c:11203
+#: src/callbacks.c:11127
 #, c-format
 msgid "Deleting audio from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11290
+#: src/callbacks.c:11214
 msgid "Deleting Audio"
 msgstr ""
 
-#: src/callbacks.c:11297
+#: src/callbacks.c:11221
 msgid "Delete Audio"
 msgstr ""
 
-#: src/callbacks.c:11636
+#: src/callbacks.c:11550
 msgid "Record new audio"
 msgstr ""
 
-#: src/callbacks.c:11725
+#: src/callbacks.c:11640
 #, c-format
 msgid "Inserting silence from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11754
+#: src/callbacks.c:11666
 msgid "Inserting Silence"
 msgstr ""
 
-#: src/merge.c:85
+#: src/merge.c:96
 msgid "LiVES: - Merge"
 msgstr ""
 
-#: src/merge.c:102
+#: src/merge.c:113
 #, c-format
 msgid "Merge Clipboard [ %d Frames ]       With Selection [ %d Frames ]"
 msgstr ""
 
-#: src/merge.c:107
+#: src/merge.c:118
 #, c-format
 msgid ""
 "Merge Clipboard [ %d Frames (resampled) ]       With Selection [ %d Frames ]"
 msgstr ""
 
-#: src/merge.c:118
+#: src/merge.c:130
 msgid "Align _Starts"
 msgstr ""
 
-#: src/merge.c:123
+#: src/merge.c:135
 msgid "Align _Ends"
 msgstr ""
 
-#: src/merge.c:134
+#: src/merge.c:146
 msgid "What to do with extra clipboard frames -"
 msgstr ""
 
-#: src/merge.c:137
+#: src/merge.c:149
 msgid "_Insert Frames"
 msgstr ""
 
-#: src/merge.c:143
+#: src/merge.c:155
 msgid "_Drop Frames"
 msgstr ""
 
-#: src/merge.c:149
+#: src/merge.c:160
 msgid "Number of Times to Loop Clipboard"
 msgstr ""
 
-#: src/merge.c:160
+#: src/merge.c:171
 msgid "_Loop Clipboard to Fit Selection"
 msgstr ""
 
-#: src/merge.c:173
+#: src/merge.c:184
 msgid "_Transition Method:"
 msgstr ""
 
-#: src/merge.c:394
+#: src/merge.c:395
 msgid "Merging clipboard with selection..."
 msgstr ""
 
-#: src/merge.c:551
+#: src/merge.c:539
 msgid "Merge done.\n"
 msgstr ""
 
-#: src/gui.c:123
+#: src/gui.c:122
 msgid "_Custom Generators"
 msgstr ""
 
-#: src/gui.c:124
+#: src/gui.c:123
 msgid "_Custom Effects"
 msgstr ""
 
-#: src/gui.c:125
+#: src/gui.c:124
 msgid "Custom _Utilities"
 msgstr ""
 
-#: src/gui.c:352 src/multitrack.c:5964
+#: src/gui.c:351 src/multitrack.c:6143
 msgid "_File"
 msgstr ""
 
-#: src/gui.c:367 src/multitrack.c:5989
+#: src/gui.c:366 src/multitrack.c:6168
 msgid "_Open File/Directory"
 msgstr ""
 
-#: src/gui.c:373
+#: src/gui.c:372
 msgid "O_pen Part of File..."
 msgstr ""
 
-#: src/gui.c:379 src/gui.c:383 src/multitrack.c:6006 src/multitrack.c:6023
-#: src/multitrack.c:6028
+#: src/gui.c:378 src/gui.c:382 src/multitrack.c:6185 src/multitrack.c:6202
+#: src/multitrack.c:6207
 msgid "Open _Location/Stream..."
 msgstr ""
 
-#: src/gui.c:393 src/multitrack.c:6016
+#: src/gui.c:392 src/multitrack.c:6195
 msgid "Open _Youtube Clip..."
 msgstr ""
 
-#: src/gui.c:404
+#: src/gui.c:403
 msgid "Import from _dvd/vcd..."
 msgstr ""
 
-#: src/gui.c:413
+#: src/gui.c:412
 msgid "Import from _dvd"
 msgstr ""
 
-#: src/gui.c:416
+#: src/gui.c:415
 msgid "Import from _vcd"
 msgstr ""
 
-#: src/gui.c:419
+#: src/gui.c:418
 msgid "_Import from Firewire"
 msgstr ""
 
-#: src/gui.c:428 src/multitrack.c:6086
+#: src/gui.c:427 src/multitrack.c:6265
 msgid "Import from _Firewire Device (dv)"
 msgstr ""
 
-#: src/gui.c:429 src/multitrack.c:6094
+#: src/gui.c:428 src/multitrack.c:6273
 msgid "Import from _Firewire Device (hdv)"
 msgstr ""
 
-#: src/gui.c:457
+#: src/gui.c:456
 msgid "_Add Webcam/TV card..."
 msgstr ""
 
-#: src/gui.c:476
+#: src/gui.c:475
 msgid "Add _Unicap Device"
 msgstr ""
 
-#: src/gui.c:486
+#: src/gui.c:485
 msgid "Add Live _Firewire Device"
 msgstr ""
 
-#: src/gui.c:495
+#: src/gui.c:494
 msgid "Add _TV Device"
 msgstr ""
 
-#: src/gui.c:510 src/multitrack.c:6117
+#: src/gui.c:509 src/multitrack.c:6296
 msgid "_Recent Files..."
 msgstr ""
 
-#: src/gui.c:560 src/multitrack.c:6177
+#: src/gui.c:559 src/multitrack.c:6356
 msgid "_Reload Clip Set..."
 msgstr ""
 
-#: src/gui.c:564 src/multitrack.c:6185
+#: src/gui.c:563 src/multitrack.c:6364
 msgid "Close/Sa_ve All Clips"
 msgstr ""
 
-#: src/gui.c:575
+#: src/gui.c:574
 msgid "_Encode Clip As..."
 msgstr ""
 
-#: src/gui.c:577
+#: src/gui.c:576
 msgid "Encode _Selection As..."
 msgstr ""
 
-#: src/gui.c:584
+#: src/gui.c:583
 msgid "_Close This Clip"
 msgstr ""
 
-#: src/gui.c:595
+#: src/gui.c:594
 msgid "_Backup Clip as .lv1..."
 msgstr ""
 
-#: src/gui.c:604
+#: src/gui.c:603
 msgid "_Restore Clip from .lv1..."
 msgstr ""
 
-#: src/gui.c:615
+#: src/gui.c:614
 msgid "Encode/Load/Backup _with Sound"
 msgstr ""
 
-#: src/gui.c:620
+#: src/gui.c:619
 msgid "Auto load subtitles"
 msgstr ""
 
-#: src/gui.c:628 src/multitrack.c:6224
+#: src/gui.c:627 src/multitrack.c:6403
 msgid "Clean _up Diskspace"
 msgstr ""
 
-#: src/gui.c:636 src/multitrack.c:6257
+#: src/gui.c:635 src/multitrack.c:6436
 msgid "_Edit"
 msgstr ""
 
-#: src/gui.c:685
+#: src/gui.c:684
 msgid "_MULTITRACK mode"
 msgstr ""
 
-#: src/gui.c:696
+#: src/gui.c:695
 msgid "_Copy Selection"
 msgstr ""
 
-#: src/gui.c:705
+#: src/gui.c:704
 msgid "Cu_t Selection"
 msgstr ""
 
-#: src/gui.c:714
+#: src/gui.c:713
 msgid "_Insert from Clipboard..."
 msgstr ""
 
-#: src/gui.c:730
+#: src/gui.c:729
 msgid "Paste as _New"
 msgstr ""
 
-#: src/gui.c:739
+#: src/gui.c:738
 msgid "_Merge Clipboard with Selection..."
 msgstr ""
 
-#: src/gui.c:746
+#: src/gui.c:745
 msgid "_Delete Selection"
 msgstr ""
 
-#: src/gui.c:764
+#: src/gui.c:763
 msgid "Decouple _Video from Audio"
 msgstr ""
 
-#: src/gui.c:772
+#: src/gui.c:771
 msgid "_Select..."
 msgstr ""
 
-#: src/gui.c:786
+#: src/gui.c:785
 msgid "Select _All Frames"
 msgstr ""
 
-#: src/gui.c:794
+#: src/gui.c:793
 msgid "_Start Frame Only"
 msgstr ""
 
-#: src/gui.c:802
+#: src/gui.c:801
 msgid "_End Frame Only"
 msgstr ""
 
-#: src/gui.c:813
+#: src/gui.c:812
 msgid "Select from _First Frame"
 msgstr ""
 
-#: src/gui.c:817
+#: src/gui.c:816
 msgid "Select to _Last Frame"
 msgstr ""
 
-#: src/gui.c:821
+#: src/gui.c:820
 msgid "Select Last Insertion/_Merge"
 msgstr ""
 
-#: src/gui.c:825
+#: src/gui.c:824
 msgid "Select Last _Effect"
 msgstr ""
 
-#: src/gui.c:829
+#: src/gui.c:828
 msgid "_Invert Selection"
 msgstr ""
 
-#: src/gui.c:837
+#: src/gui.c:836
 msgid "_Lock Selection Width"
 msgstr ""
 
-#: src/gui.c:842 src/multitrack.c:6409
+#: src/gui.c:841 src/multitrack.c:6591
 msgid "_Play"
 msgstr ""
 
-#: src/gui.c:854
+#: src/gui.c:853
 msgid "_Play All"
 msgstr ""
 
-#: src/gui.c:869
+#: src/gui.c:868
 msgid "Pla_y Selection"
 msgstr ""
 
-#: src/gui.c:877
+#: src/gui.c:876
 msgid "Play _Clipboard"
 msgstr ""
 
-#: src/gui.c:899 src/multitrack.c:6441
+#: src/gui.c:898 src/multitrack.c:6623
 msgid "_Stop"
 msgstr ""
 
-#: src/gui.c:914 src/multitrack.c:6453
+#: src/gui.c:913 src/multitrack.c:6635
 msgid "Re_wind"
 msgstr ""
 
-#: src/gui.c:946 src/multitrack.c:6471
+#: src/gui.c:945 src/multitrack.c:6653
 msgid "_Full Screen"
 msgstr ""
 
-#: src/gui.c:955
+#: src/gui.c:954
 msgid "_Double Size"
 msgstr ""
 
-#: src/gui.c:963 src/multitrack.c:6479
+#: src/gui.c:962 src/multitrack.c:6661
 msgid "Play in _Separate Window"
 msgstr ""
 
-#: src/gui.c:972
+#: src/gui.c:971
 msgid "_Blank Background"
 msgstr ""
 
-#: src/gui.c:979
+#: src/gui.c:978
 msgid "(Auto)_loop Video (to fit audio track)"
 msgstr ""
 
-#: src/gui.c:988 src/multitrack.c:6487
+#: src/gui.c:987 src/multitrack.c:6669
 msgid "L_oop Continuously"
 msgstr ""
 
-#: src/gui.c:997
+#: src/gui.c:996
 msgid "Pin_g Pong Loops"
 msgstr ""
 
-#: src/gui.c:1005 src/multitrack.c:6495
+#: src/gui.c:1004 src/multitrack.c:6677
 msgid "_Mute"
 msgstr ""
 
-#: src/gui.c:1017
+#: src/gui.c:1016
 msgid "Separate Window 'S_ticky' Mode"
 msgstr ""
 
-#: src/gui.c:1025
+#: src/gui.c:1024
 msgid "S_how Frame Counter"
 msgstr ""
 
-#: src/gui.c:1035
+#: src/gui.c:1034
 msgid "Show Subtitles"
 msgstr ""
 
-#: src/gui.c:1045
+#: src/gui.c:1044
 msgid "Letterbox mode"
 msgstr ""
 
-#: src/gui.c:1051 src/multitrack.c:6507
+#: src/gui.c:1050 src/multitrack.c:6689
 msgid "Effect_s"
 msgstr ""
 
-#: src/gui.c:1054
+#: src/gui.c:1053
 msgid "Effects are applied to the current selection."
 msgstr ""
 
-#: src/gui.c:1067
+#: src/gui.c:1066
 msgid "_Run Test Rendered Effect/Tool/Generator..."
 msgstr ""
 
-#: src/gui.c:1072 src/multitrack.c:7123
+#: src/gui.c:1071 src/multitrack.c:7299
 msgid "_Tools"
 msgstr ""
 
-#: src/gui.c:1075
+#: src/gui.c:1074
 msgid "Tools are applied to complete clips."
 msgstr ""
 
-#: src/gui.c:1085
+#: src/gui.c:1084
 msgid "_Reverse Clipboard"
 msgstr ""
 
-#: src/gui.c:1094
+#: src/gui.c:1093
 msgid "_Change Playback/Save Speed..."
 msgstr ""
 
-#: src/gui.c:1099
+#: src/gui.c:1098
 msgid "Resample _Video to New Frame Rate..."
 msgstr ""
 
-#: src/gui.c:1105
+#: src/gui.c:1104
 msgid "_Utilities"
 msgstr ""
 
-#: src/gui.c:1110
+#: src/gui.c:1109
 msgid "Custom _Tools"
 msgstr ""
 
-#: src/gui.c:1116 src/multitrack.c:7149
+#: src/gui.c:1115 src/multitrack.c:7325
 msgid "_Generate"
 msgstr ""
 
-#: src/gui.c:1126
+#: src/gui.c:1125
 msgid "Loading rendered effect plugins..."
 msgstr ""
 
-#: src/gui.c:1139
+#: src/gui.c:1138
 msgid "Load _Subtitles from File..."
 msgstr ""
 
-#: src/gui.c:1144
+#: src/gui.c:1143
 msgid "Erase subtitles"
 msgstr ""
 
-#: src/gui.c:1152 src/multitrack.c:7158
+#: src/gui.c:1151 src/multitrack.c:7334
 msgid "Capture _External Window... "
 msgstr ""
 
-#: src/gui.c:1159 src/multitrack.c:7173
+#: src/gui.c:1158 src/multitrack.c:7349
 msgid "_Preferences..."
 msgstr ""
 
-#: src/gui.c:1172
+#: src/gui.c:1171
 msgid "_Audio"
 msgstr ""
 
-#: src/gui.c:1184
+#: src/gui.c:1183
 msgid "Load _New Audio for Clip..."
 msgstr ""
 
-#: src/gui.c:1190
+#: src/gui.c:1189
 msgid "Load _CD Track..."
 msgstr ""
 
-#: src/gui.c:1191
+#: src/gui.c:1190
 msgid "E_ject CD"
 msgstr ""
 
-#: src/gui.c:1205
+#: src/gui.c:1204
 msgid "Record E_xternal Audio..."
 msgstr ""
 
-#: src/gui.c:1218
+#: src/gui.c:1217
 msgid "to New _Clip..."
 msgstr ""
 
-#: src/gui.c:1222
+#: src/gui.c:1221
 msgid "to _Selection"
 msgstr ""
 
-#: src/gui.c:1230
+#: src/gui.c:1229
 msgid "Fade Audio _In..."
 msgstr ""
 
-#: src/gui.c:1234
+#: src/gui.c:1233
 msgid "Fade Audio _Out..."
 msgstr ""
 
-#: src/gui.c:1244
+#: src/gui.c:1243
 msgid "_Export Audio..."
 msgstr ""
 
-#: src/gui.c:1257
+#: src/gui.c:1256
 msgid "Export _Selected Audio..."
 msgstr ""
 
-#: src/gui.c:1261
+#: src/gui.c:1260
 msgid "Export _All Audio..."
 msgstr ""
 
-#: src/gui.c:1265
+#: src/gui.c:1264
 msgid "_Append Audio..."
 msgstr ""
 
-#: src/gui.c:1270
+#: src/gui.c:1269
 msgid "_Trim/Pad Audio..."
 msgstr ""
 
-#: src/gui.c:1283
+#: src/gui.c:1282
 msgid "Trim/Pad Audio to _Selection"
 msgstr ""
 
-#: src/gui.c:1288
+#: src/gui.c:1287
 msgid "Trim/Pad Audio from Beginning to _Play Start"
 msgstr ""
 
-#: src/gui.c:1293
+#: src/gui.c:1292
 msgid "_Delete Audio..."
 msgstr ""
 
-#: src/gui.c:1306
+#: src/gui.c:1305
 msgid "Delete _Selected Audio"
 msgstr ""
 
-#: src/gui.c:1310
+#: src/gui.c:1309
 msgid "Delete _All Audio"
 msgstr ""
 
-#: src/gui.c:1314
+#: src/gui.c:1313
 msgid "Insert _Silence in Selection"
 msgstr ""
 
-#: src/gui.c:1319
+#: src/gui.c:1318
 msgid "_Resample Audio..."
 msgstr ""
 
-#: src/gui.c:1324
+#: src/gui.c:1323
 msgid "_Info"
 msgstr ""
 
-#: src/gui.c:1336
+#: src/gui.c:1335
 msgid "Show Clip _Info"
 msgstr ""
 
-#: src/gui.c:1344
+#: src/gui.c:1343
 msgid "Show/_Edit File Comments"
 msgstr ""
 
-#: src/gui.c:1349
+#: src/gui.c:1348
 msgid "Show _Clipboard Info"
 msgstr ""
 
-#: src/gui.c:1360 src/multitrack.c:7286
+#: src/gui.c:1359 src/multitrack.c:7462
 msgid "Show _Messages"
 msgstr ""
 
-#: src/gui.c:1364 src/multitrack.c:7365
+#: src/gui.c:1363 src/multitrack.c:7541
 msgid "Show _Layout Errors"
 msgstr ""
 
-#: src/gui.c:1369 src/multitrack.c:7263
+#: src/gui.c:1368 src/multitrack.c:7439
 msgid "_Clips"
 msgstr ""
 
-#: src/gui.c:1381
+#: src/gui.c:1380
 msgid "_Rename Current Clip in Menu..."
 msgstr ""
 
-#: src/gui.c:1399
+#: src/gui.c:1398
 msgid "A_dvanced"
 msgstr ""
 
-#: src/gui.c:1412
+#: src/gui.c:1411
 msgid "_RFX Effects/Tools/Utilities"
 msgstr ""
 
-#: src/gui.c:1424
+#: src/gui.c:1423
 msgid "_New Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1428
+#: src/gui.c:1427
 msgid "_Copy RFX Script to Test..."
 msgstr ""
 
-#: src/gui.c:1432
+#: src/gui.c:1431
 msgid "_Edit Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1436
+#: src/gui.c:1435
 msgid "Rena_me Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1440
+#: src/gui.c:1439
 msgid "_Delete Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1450
+#: src/gui.c:1449
 msgid "_Promote Test Rendered Effect/Tool/Generator..."
 msgstr ""
 
-#: src/gui.c:1457
+#: src/gui.c:1456
 msgid "_Import Custom RFX script..."
 msgstr ""
 
-#: src/gui.c:1461
+#: src/gui.c:1460
 msgid "E_xport Custom RFX script..."
 msgstr ""
 
-#: src/gui.c:1465
+#: src/gui.c:1464
 msgid "De_lete Custom RFX Script..."
 msgstr ""
 
-#: src/gui.c:1472
+#: src/gui.c:1471
 msgid "Re_build all RFX plugins"
 msgstr ""
 
-#: src/gui.c:1501
+#: src/gui.c:1498
 msgid "Receive _LiVES stream from..."
 msgstr ""
 
-#: src/gui.c:1506
+#: src/gui.c:1503
 msgid "_Send LiVES stream to..."
 msgstr ""
 
-#: src/gui.c:1515
+#: src/gui.c:1512
 #, c-format
 msgid "Open _yuv4mpeg stream on %sstream.yuv..."
 msgstr ""
 
-#: src/gui.c:1536
+#: src/gui.c:1534
 msgid "_Import Project (.lv2)..."
 msgstr ""
 
-#: src/gui.c:1540
+#: src/gui.c:1538
 msgid "E_xport Project (.lv2)..."
 msgstr ""
 
-#: src/gui.c:1545
+#: src/gui.c:1543
 msgid "_VJ"
 msgstr ""
 
-#: src/gui.c:1557
+#: src/gui.c:1555
 msgid "Real Time _Effect Mapping"
 msgstr ""
 
-#: src/gui.c:1563
+#: src/gui.c:1561
 msgid "Bind real time effects to ctrl-number keys."
 msgstr ""
 
-#: src/gui.c:1565
+#: src/gui.c:1563
 msgid "Set Real Time Effect _Defaults"
 msgstr ""
 
-#: src/gui.c:1567
+#: src/gui.c:1565
 msgid "Set default parameter values for real time effects."
 msgstr ""
 
-#: src/gui.c:1580
+#: src/gui.c:1578
 msgid "Save Real Time Effect _Defaults"
 msgstr ""
 
-#: src/gui.c:1583
+#: src/gui.c:1581
 msgid ""
 "Save real time effect defaults so they will be restored each time you use "
 "LiVES."
 msgstr ""
 
-#: src/gui.c:1589
+#: src/gui.c:1587
 msgid "_Reset all playback speeds and positions"
 msgstr ""
 
-#: src/gui.c:1592
+#: src/gui.c:1590
 msgid ""
 "Reset all playback positions to frame 1, and reset all playback frame rates."
 msgstr ""
 
-#: src/gui.c:1594
+#: src/gui.c:1592
 msgid "_MIDI/joystick interface"
 msgstr ""
 
-#: src/gui.c:1609
+#: src/gui.c:1607
 msgid "_MIDI/joystick learner..."
 msgstr ""
 
-#: src/gui.c:1614
+#: src/gui.c:1612
 msgid "_Save device mapping..."
 msgstr ""
 
-#: src/gui.c:1620
+#: src/gui.c:1618
 msgid "_Load device mapping..."
 msgstr ""
 
-#: src/gui.c:1628
+#: src/gui.c:1626
 msgid "Show VJ _Keys"
 msgstr ""
 
-#: src/gui.c:1632
+#: src/gui.c:1630
 msgid "To_ys"
 msgstr ""
 
-#: src/gui.c:1644
+#: src/gui.c:1642
 msgid "_None"
 msgstr ""
 
-#: src/gui.c:1652
+#: src/gui.c:1650
 msgid "_Autolives"
 msgstr ""
 
-#: src/gui.c:1657
+#: src/gui.c:1655
 msgid "_Mad Frames"
 msgstr ""
 
-#: src/gui.c:1662
+#: src/gui.c:1660
 msgid "_LiVES TV (broadband)"
 msgstr ""
 
-#: src/gui.c:1672 src/multitrack.c:7387
+#: src/gui.c:1670 src/multitrack.c:7563
 msgid "_Help"
 msgstr ""
 
-#: src/gui.c:1684 src/multitrack.c:7407
+#: src/gui.c:1682 src/multitrack.c:7583
 msgid "_Manual (opens in browser)"
 msgstr ""
 
-#: src/gui.c:1691 src/multitrack.c:7416
+#: src/gui.c:1689 src/multitrack.c:7592
 msgid "_Donate to the project !"
 msgstr ""
 
-#: src/gui.c:1695 src/multitrack.c:7420
+#: src/gui.c:1693 src/multitrack.c:7596
 msgid "_Email the author"
 msgstr ""
 
-#: src/gui.c:1699 src/multitrack.c:7424
+#: src/gui.c:1697 src/multitrack.c:7600
 msgid "Report a _bug"
 msgstr ""
 
-#: src/gui.c:1703 src/multitrack.c:7428
+#: src/gui.c:1701 src/multitrack.c:7604
 msgid "Suggest a _feature"
 msgstr ""
 
-#: src/gui.c:1707 src/multitrack.c:7432
+#: src/gui.c:1705 src/multitrack.c:7608
 msgid "Assist with _translating"
 msgstr ""
 
-#: src/gui.c:1714 src/multitrack.c:7439
+#: src/gui.c:1712 src/multitrack.c:7615
 msgid "_Troubleshoot"
 msgstr ""
 
-#: src/gui.c:1718 src/multitrack.c:7443
+#: src/gui.c:1716 src/multitrack.c:7619
 msgid "_About"
 msgstr ""
 
-#: src/gui.c:1752
+#: src/gui.c:1750
 msgid "Rewind to start (w)"
 msgstr ""
 
-#: src/gui.c:1760 src/multitrack.c:16720
+#: src/gui.c:1758 src/multitrack.c:17010
 msgid "Play all (p)"
 msgstr ""
 
-#: src/gui.c:1768 src/gui.c:1877
+#: src/gui.c:1766 src/gui.c:1876
 msgid "Stop playback (q)"
 msgstr ""
 
-#: src/gui.c:1779
+#: src/gui.c:1777
 msgid "Play selection (y)"
 msgstr ""
 
-#: src/gui.c:1832
+#: src/gui.c:1829
 msgid "Volume"
 msgstr ""
 
-#: src/gui.c:1854
+#: src/gui.c:1853
 msgid "Audio volume (1.00)"
 msgstr ""
 
-#: src/gui.c:1883
+#: src/gui.c:1882
 msgid "Unblank background (b)"
 msgstr ""
 
-#: src/gui.c:1929
+#: src/gui.c:1928
 msgid "Play slower (ctrl-down)"
 msgstr ""
 
-#: src/gui.c:1935
+#: src/gui.c:1934
 msgid "Play faster (ctrl-up)"
 msgstr ""
 
-#: src/gui.c:1942
+#: src/gui.c:1941
 msgid "Skip back (ctrl-left)"
 msgstr ""
 
-#: src/gui.c:1948
+#: src/gui.c:1947
 msgid "Skip forward (ctrl-right)"
 msgstr ""
 
-#: src/gui.c:1954
+#: src/gui.c:1953
 msgid "Show clip info (i)"
 msgstr ""
 
-#: src/gui.c:1960
+#: src/gui.c:1959
 msgid "Hide this toolbar"
 msgstr ""
 
-#: src/gui.c:1962
+#: src/gui.c:1961
 msgid ""
 "Press \"s\" to toggle separate play window for improved performance, \"q\" "
 "to stop."
 msgstr ""
 
 #. TRANSLATORS: please keep the translated string the same length
-#: src/gui.c:1995
+#: src/gui.c:1994
 msgid "     Video playback speed (frames per second)        "
 msgstr ""
 
-#: src/gui.c:2009
+#: src/gui.c:2008
 msgid "Vary the video speed"
 msgstr ""
 
-#: src/gui.c:2092 src/gui.c:3218
+#: src/gui.c:2090 src/gui.c:3329
 msgid "First Frame"
 msgstr ""
 
-#: src/gui.c:2193 src/gui.c:3226
+#: src/gui.c:2191 src/gui.c:3336
 msgid "Last Frame"
 msgstr ""
 
-#: src/gui.c:2210
+#: src/gui.c:2208
 msgid "The first selected frame in this clip"
 msgstr ""
 
-#: src/gui.c:2248
+#: src/gui.c:2246
 msgid "The last selected frame in this clip"
 msgstr ""
 
-#: src/gui.c:2532
+#: src/gui.c:2546
 msgid "Starting...\n"
 msgstr ""
 
-#: src/gui.c:3074
+#: src/gui.c:3181
 msgid "    Press 'q' to stop recording.  DO NOT COVER THE PLAY WINDOW !   "
 msgstr ""
 
-#: src/gui.c:3521
+#: src/gui.c:3643
 msgid "Frame number to preview"
 msgstr ""
 
-#: src/gui.c:3538
+#: src/gui.c:3660
 msgid "_Free"
 msgstr ""
 
-#: src/gui.c:3539
+#: src/gui.c:3661
 msgid "Free choice of frame number"
 msgstr ""
 
-#: src/gui.c:3543
+#: src/gui.c:3666
 msgid "_Start"
 msgstr ""
 
-#: src/gui.c:3544
+#: src/gui.c:3667
 msgid "Frame number is linked to start frame"
 msgstr ""
 
-#: src/gui.c:3551
+#: src/gui.c:3675
 msgid "_End"
 msgstr ""
 
-#: src/gui.c:3552
+#: src/gui.c:3676
 msgid "Frame number is linked to end frame"
 msgstr ""
 
-#: src/gui.c:3559
+#: src/gui.c:3684
 msgid "_Pointer"
 msgstr ""
 
-#: src/gui.c:3560
+#: src/gui.c:3685
 msgid "Frame number is linked to playback pointer"
 msgstr ""
 
-#: src/gui.c:3581
+#: src/gui.c:3707
 msgid "Rewind"
 msgstr ""
 
-#: src/gui.c:3592 src/dialogs.c:894 src/dialogs.c:896 src/dialogs.c:1817
-#: src/dialogs.c:1819
+#: src/gui.c:3718 src/dialogs.c:960 src/dialogs.c:962 src/dialogs.c:1873
+#: src/dialogs.c:1875
 msgid "Play all"
 msgstr ""
 
-#: src/gui.c:3605
+#: src/gui.c:3731
 msgid "Play Selection"
 msgstr ""
 
-#: src/gui.c:3619
+#: src/gui.c:3745
 msgid "Loop On/Off"
 msgstr ""
 
-#: src/gui.c:3693
+#: src/gui.c:3819
 msgid "Start _recording"
 msgstr ""
 
-#: src/gui.c:3698
+#: src/gui.c:3824
 msgid "Stop _recording"
 msgstr ""
 
-#: src/gui.c:3703
+#: src/gui.c:3829
 msgid "_Record Performance"
 msgstr ""
 
-#: src/gui.c:3851
+#: src/gui.c:3974
 msgid "Hide Play Window"
 msgstr ""
 
-#: src/gui.c:4232
+#: src/gui.c:4333
 msgid "Show Play Window"
 msgstr ""
 
-#: src/ce_thumbs.c:222
+#: src/ce_thumbs.c:242
 #, c-format
 msgid "Mapped to ctrl-%d"
 msgstr ""
 
-#: src/ce_thumbs.c:276 src/effects.c:85 src/preferences.c:3195
+#: src/ce_thumbs.c:296 src/effects.c:86 src/preferences.c:3247
 msgid "Effects"
 msgstr ""
 
-#: src/ce_thumbs.c:279 src/multitrack.c:5615
+#: src/ce_thumbs.c:299 src/multitrack.c:5791
 msgid "Clips"
 msgstr ""
 
-#: src/ce_thumbs.c:303
+#: src/ce_thumbs.c:323
 #, c-format
 msgid "Show / apply effects to %s\n"
 msgstr ""
 
-#: src/ce_thumbs.c:315
+#: src/ce_thumbs.c:335
 #, c-format
 msgid "Select clip for %s\n"
 msgstr ""
 
-#: src/ce_thumbs.c:515
+#: src/ce_thumbs.c:536
 msgid "_Pin"
 msgstr ""
 
-#: src/ce_thumbs.c:515
+#: src/ce_thumbs.c:537
 msgid "Pin the parameter box to the window"
 msgstr ""
 
 #. TRANSLATORS: Exabytes
-#: src/utils.c:794
+#: src/utils.c:800
 #, c-format
 msgid "%.2f EB"
 msgstr ""
 
 #. TRANSLATORS: Petabytes
-#: src/utils.c:798
+#: src/utils.c:803
 #, c-format
 msgid "%.2f PB"
 msgstr ""
 
 #. TRANSLATORS: Terabytes
-#: src/utils.c:802
+#: src/utils.c:806
 #, c-format
 msgid "%.2f TB"
 msgstr ""
 
 #. TRANSLATORS: Gigabytes
-#: src/utils.c:806
+#: src/utils.c:809
 #, c-format
 msgid "%.2f GB"
 msgstr ""
 
 #. TRANSLATORS: Megabytes
-#: src/utils.c:810
+#: src/utils.c:812
 #, c-format
 msgid "%.2f MB"
 msgstr ""
 
 #. TRANSLATORS: Kilobytes (1024 bytes)
-#: src/utils.c:814
+#: src/utils.c:815
 #, c-format
 msgid "%.2f KiB"
 msgstr ""
@@ -3542,7 +3532,7 @@
 msgid "%d bytes"
 msgstr ""
 
-#: src/utils.c:1841
+#: src/utils.c:1835
 msgid "Clearing the clipboard"
 msgstr ""
 
@@ -3554,81 +3544,81 @@
 "Switched to clip %s\n"
 msgstr ""
 
-#: src/utils.c:1880
+#: src/utils.c:1877
 msgid ""
 "\n"
 "==============================\n"
 "Switched to empty clip\n"
 msgstr ""
 
-#: src/utils.c:1917
+#: src/utils.c:1916
 msgid "(blank)"
 msgstr ""
 
-#: src/utils.c:1920
+#: src/utils.c:1919
 #, c-format
 msgid ""
 "The set name has been changed from %s to %s. Affected layouts have been "
 "updated accordingly\n"
 msgstr ""
 
-#: src/utils.c:1928
+#: src/utils.c:1927
 #, c-format
 msgid ""
 "The clip %s is missing from this set.\n"
 "It is required by the following layouts:\n"
 msgstr ""
 
-#: src/utils.c:1932
+#: src/utils.c:1931
 #, c-format
 msgid ""
 "The clip %s has been closed.\n"
 "It is required by the following layouts:\n"
 msgstr ""
 
-#: src/utils.c:1937
+#: src/utils.c:1936
 #, c-format
 msgid ""
 "Frames have been shifted in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1942
+#: src/utils.c:1941
 #, c-format
 msgid ""
 "Frames have been deleted from the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1947
+#: src/utils.c:1946
 #, c-format
 msgid ""
 "Audio has been deleted from the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1952
+#: src/utils.c:1951
 #, c-format
 msgid ""
 "Audio has been shifted in clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1957
+#: src/utils.c:1956
 #, c-format
 msgid ""
 "Audio has been altered in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1962
+#: src/utils.c:1961
 #, c-format
 msgid ""
 "Frames have been altered in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:2135
+#: src/utils.c:2134
 #, c-format
 msgid ""
 "Set %s\n"
@@ -3636,7 +3626,7 @@
 "by another copy of LiVES.\n"
 msgstr ""
 
-#: src/utils.c:2142
+#: src/utils.c:2140
 #, c-format
 msgid ""
 "\n"
@@ -3682,67 +3672,67 @@
 msgid "Removing layout %s\n"
 msgstr ""
 
-#: src/utils.c:3014
+#: src/utils.c:2996
 msgid "Video [opening...]"
 msgstr ""
 
-#: src/utils.c:3018
+#: src/utils.c:2999
 #, c-format
 msgid "Video [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:3022
+#: src/utils.c:3002
 msgid "(Undefined)"
 msgstr ""
 
-#: src/utils.c:3025
+#: src/utils.c:3004
 msgid "(No video)"
 msgstr ""
 
-#: src/utils.c:3032
+#: src/utils.c:3011
 msgid "(No audio)"
 msgstr ""
 
-#: src/utils.c:3037
+#: src/utils.c:3015
 msgid "Mono  [opening...]"
 msgstr ""
 
-#: src/utils.c:3040
+#: src/utils.c:3017
 msgid "Left Audio [opening...]"
 msgstr ""
 
-#: src/utils.c:3045
+#: src/utils.c:3021
 #, c-format
 msgid "Mono [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:3048
+#: src/utils.c:3023
 #, c-format
 msgid "Left Audio [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:3056
+#: src/utils.c:3031
 msgid "Right Audio [opening...]"
 msgstr ""
 
-#: src/utils.c:3059
+#: src/utils.c:3033
 #, c-format
 msgid "Right Audio [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:3506
+#: src/utils.c:3472
 msgid "LiVES cannot switch to mplayer whilst clips are loading."
 msgstr ""
 
-#: src/utils.c:3559
+#: src/utils.c:3525
 msgid "LiVES cannot switch to mplayer2 whilst clips are loading."
 msgstr ""
 
-#: src/utils.c:3809
+#: src/utils.c:3775
 msgid "Cleaning up clip"
 msgstr ""
 
-#: src/utils.c:3913
+#: src/utils.c:3874
 #, c-format
 msgid ""
 "\n"
@@ -3752,30 +3742,29 @@
 "Overwrite ?\n"
 msgstr ""
 
-#: src/utils.c:4305 src/utils.c:4337 src/multitrack.c:4503
+#: src/utils.c:4250 src/utils.c:4280 src/multitrack.c:4672
 #, c-format
 msgid "_Undo %s"
 msgstr ""
 
-#: src/utils.c:4306 src/utils.c:4338 src/multitrack.c:4525
+#: src/utils.c:4251 src/utils.c:4281 src/multitrack.c:4693
 #, c-format
 msgid "_Redo %s"
 msgstr ""
 
-#: src/utils.c:4363
+#: src/utils.c:4305
 msgid "-------------Selection------------"
 msgstr ""
 
-#. TRANSLATORS: - try to keep the text of the middle part the same length, by deleting "-" if necessary
-#: src/utils.c:4371
+#: src/utils.c:4313
 msgid " sec ] ----------Selection---------- [ "
 msgstr ""
 
-#: src/utils.c:4371
+#: src/utils.c:4314
 msgid " frames ] ----------"
 msgstr ""
 
-#: src/utils.c:5360
+#: src/utils.c:5302
 msgid ""
 "Your version of mplayer/ffmpeg may be broken !\n"
 "See http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2071\n"
@@ -3786,11 +3775,11 @@
 "Try running Help/Troubleshoot for more information."
 msgstr ""
 
-#: src/saveplay.c:178
+#: src/saveplay.c:179
 msgid "Examining file header"
 msgstr ""
 
-#: src/saveplay.c:315 src/saveplay.c:789
+#: src/saveplay.c:316 src/saveplay.c:779
 #, c-format
 msgid "Opening %s"
 msgstr ""
@@ -3800,36 +3789,36 @@
 msgid "Opening %s start time %.2f sec. frames %d"
 msgstr ""
 
-#: src/saveplay.c:326 src/saveplay.c:4001
+#: src/saveplay.c:326 src/saveplay.c:3927
 msgid " without sound"
 msgstr ""
 
-#: src/saveplay.c:396
+#: src/saveplay.c:395
 #, c-format
 msgid "Opening audio for %s"
 msgstr ""
 
-#: src/saveplay.c:557
+#: src/saveplay.c:554
 #, c-format
 msgid "Auto trimming %.2f seconds of audio at start..."
 msgstr ""
 
-#: src/saveplay.c:567
+#: src/saveplay.c:562
 #, c-format
 msgid "Auto trimming %.2f seconds of audio at end..."
 msgstr ""
 
-#: src/saveplay.c:584
+#: src/saveplay.c:577
 #, c-format
 msgid "Auto padding with %.2f seconds of silence at start..."
 msgstr ""
 
-#: src/saveplay.c:599
+#: src/saveplay.c:590
 #, c-format
 msgid "Auto padding with %.2f seconds of silence at end..."
 msgstr ""
 
-#: src/saveplay.c:671
+#: src/saveplay.c:661
 #, c-format
 msgid ""
 "\n"
@@ -3841,11 +3830,11 @@
 "Are you sure you wish to continue ?"
 msgstr ""
 
-#: src/saveplay.c:685
+#: src/saveplay.c:676
 msgid " - please be patient."
 msgstr ""
 
-#: src/saveplay.c:938
+#: src/saveplay.c:926
 msgid ""
 "\n"
 "\n"
@@ -3853,14 +3842,14 @@
 "Please check the terminal window for more details.\n"
 msgstr ""
 
-#: src/saveplay.c:940
+#: src/saveplay.c:928
 msgid ""
 "\n"
 "\n"
 "You may need to install mplayer to open this file.\n"
 msgstr ""
 
-#: src/saveplay.c:948
+#: src/saveplay.c:934
 msgid ""
 "\n"
 "\n"
@@ -3868,29 +3857,29 @@
 "Tools|Preferences|Decoding\n"
 msgstr ""
 
-#: src/saveplay.c:1014
+#: src/saveplay.c:995
 msgid "Adding image..."
 msgstr ""
 
-#: src/saveplay.c:1108
+#: src/saveplay.c:1089
 #, c-format
 msgid "Subtitles were saved as %s\n"
 msgstr ""
 
-#: src/saveplay.c:1192
+#: src/saveplay.c:1171
 #, c-format
 msgid "LiVES: Save Frame %d as..."
 msgstr ""
 
-#: src/saveplay.c:1195
+#: src/saveplay.c:1174
 msgid "LiVES: Save Frame as..."
 msgstr ""
 
-#: src/saveplay.c:1322
+#: src/saveplay.c:1303
 msgid "LiVES: Save Clip as..."
 msgstr ""
 
-#: src/saveplay.c:1390
+#: src/saveplay.c:1369
 msgid ""
 "Saving your video could lead to a loss of quality !\n"
 "You are strongly advised to 'Save As' to a new file.\n"
@@ -3898,67 +3887,67 @@
 "Do you still wish to continue ?"
 msgstr ""
 
-#: src/saveplay.c:1517 src/saveplay.c:1683 src/saveplay.c:1762
-#: src/saveplay.c:4014
+#: src/saveplay.c:1494 src/saveplay.c:1659 src/saveplay.c:1738
+#: src/saveplay.c:3940
 msgid "Pulling frames from clip"
 msgstr ""
 
-#: src/saveplay.c:1588 src/saveplay.c:1727
+#: src/saveplay.c:1565 src/saveplay.c:1703
 msgid "Linking selection"
 msgstr ""
 
-#: src/saveplay.c:1779
+#: src/saveplay.c:1755
 msgid " (with no sound)\n"
 msgstr ""
 
-#: src/saveplay.c:1786
+#: src/saveplay.c:1761
 #, c-format
 msgid "Saving frames %d to %d%s as \"%s\" : encoder = %s : format = %s..."
 msgstr ""
 
-#: src/saveplay.c:1790
+#: src/saveplay.c:1765
 #, c-format
 msgid "Saving frames 1 to %d%s as \"%s\" : encoder %s : format = %s..."
 msgstr ""
 
-#: src/saveplay.c:1909
+#: src/saveplay.c:1890
 msgid "Saving [can take a long time]"
 msgstr ""
 
-#: src/saveplay.c:2057
+#: src/saveplay.c:2044
 msgid ""
 "\n"
 "\n"
 "Encoder error - output file was not created !\n"
 msgstr ""
 
-#: src/saveplay.c:2094
+#: src/saveplay.c:2081
 msgid "Clearing letterbox"
 msgstr ""
 
-#: src/saveplay.c:2183
+#: src/saveplay.c:2168
 #, c-format
 msgid "File size was %s\n"
 msgstr ""
 
-#: src/saveplay.c:2284
+#: src/saveplay.c:2265
 msgid "recording aborted by preview.\n"
 msgstr ""
 
-#: src/saveplay.c:2288
+#: src/saveplay.c:2268
 msgid "recording aborted by clipboard playback.\n"
 msgstr ""
 
-#: src/saveplay.c:2291
+#: src/saveplay.c:2270
 msgid "Recording performance..."
 msgstr ""
 
-#: src/saveplay.c:3293
+#: src/saveplay.c:3251
 #, c-format
 msgid "Average FPS was %.4f\n"
 msgstr ""
 
-#: src/saveplay.c:3299
+#: src/saveplay.c:3256
 msgid ""
 "\n"
 "\n"
@@ -3967,16 +3956,21 @@
 "and resize all frames to the current size.\n"
 msgstr ""
 
-#: src/saveplay.c:3479
+#: src/saveplay.c:3429
 msgid "Unknown"
 msgstr ""
 
-#: src/saveplay.c:3588 src/saveplay.c:4585
+#: src/saveplay.c:3538 src/saveplay.c:4502
 #, c-format
 msgid "Untitled%d"
 msgstr ""
 
-#: src/saveplay.c:3633
+#: src/saveplay.c:3567
+#, c-format
+msgid "%d frames are enough !\n"
+msgstr ""
+
+#: src/saveplay.c:3579
 #, c-format
 msgid ""
 "\n"
@@ -3984,7 +3978,7 @@
 "Bad things may happen with this clip.\n"
 msgstr ""
 
-#: src/saveplay.c:3723
+#: src/saveplay.c:3667
 #, c-format
 msgid ""
 "\n"
@@ -3992,73 +3986,73 @@
 "Default can be set in Tools | Preferences | Misc.\n"
 msgstr ""
 
-#: src/saveplay.c:3735
+#: src/saveplay.c:3677
 #, c-format
 msgid "Playback speed was adjusted to %.3f frames per second to fit audio.\n"
 msgstr ""
 
-#: src/saveplay.c:3754
+#: src/saveplay.c:3694
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d *bpp=Greyscale* fps=%.3f\n"
 "Audio:"
 msgstr ""
 
-#: src/saveplay.c:3758 src/saveplay.c:4762
+#: src/saveplay.c:3698 src/saveplay.c:4671
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d bpp=%d fps=%.3f\n"
 "Audio:"
 msgstr ""
 
-#: src/saveplay.c:3762 src/saveplay.c:4766
+#: src/saveplay.c:3703 src/saveplay.c:4676
 #, c-format
 msgid "%s none\n"
 msgstr ""
 
-#: src/saveplay.c:3774
+#: src/saveplay.c:3714
 #, c-format
 msgid " - Author: %s\n"
 msgstr ""
 
-#: src/saveplay.c:3779
+#: src/saveplay.c:3717
 #, c-format
 msgid " - Title: %s\n"
 msgstr ""
 
-#: src/saveplay.c:3784
+#: src/saveplay.c:3720
 #, c-format
 msgid " - Comment: %s\n"
 msgstr ""
 
-#: src/saveplay.c:3897
+#: src/saveplay.c:3829
 #, c-format
 msgid "Saving frame %d as %s..."
 msgstr ""
 
-#: src/saveplay.c:3996
+#: src/saveplay.c:3924
 #, c-format
 msgid "Backing up %s to %s"
 msgstr ""
 
-#: src/saveplay.c:4049
+#: src/saveplay.c:3975
 msgid "Backing up"
 msgstr ""
 
-#: src/saveplay.c:4083
+#: src/saveplay.c:4009
 msgid "performance data was backed up..."
 msgstr ""
 
-#: src/saveplay.c:4661
+#: src/saveplay.c:4574
 #, c-format
 msgid "Restoring %s..."
 msgstr ""
 
-#: src/saveplay.c:4692
+#: src/saveplay.c:4603
 msgid "Restoring"
 msgstr ""
 
-#: src/saveplay.c:4714
+#: src/saveplay.c:4625
 #, c-format
 msgid ""
 "\n"
@@ -4068,22 +4062,22 @@
 msgstr ""
 
 #. TRANSLATORS: rec(ord) %.2f M(ega)B(ytes)
-#: src/saveplay.c:5207
+#: src/saveplay.c:5118
 #, c-format
 msgid "rec %.2f MB"
 msgstr ""
 
-#: src/saveplay.c:5213
+#: src/saveplay.c:5123
 #, c-format
 msgid "!rec %.2f MB"
 msgstr ""
 
 #. TRANSLATORS: rec(ord) ?? M(ega)B(ytes)
-#: src/saveplay.c:5216
+#: src/saveplay.c:5126
 msgid "rec ?? MB"
 msgstr ""
 
-#: src/saveplay.c:5241
+#: src/saveplay.c:5151
 #, c-format
 msgid ""
 "\n"
@@ -4091,54 +4085,72 @@
 "Record stop level can be set in Preferences.\n"
 msgstr ""
 
-#: src/saveplay.c:5535
+#: src/saveplay.c:5447
 msgid ""
 "\n"
 "Files from a previous run of LiVES were found.\n"
 "Do you want to attempt to recover them ?\n"
 msgstr ""
 
-#: src/saveplay.c:5557
+#: src/saveplay.c:5469
 msgid "Recovering files"
 msgstr ""
 
-#: src/saveplay.c:5560
+#: src/saveplay.c:5472
 msgid "Recovering files..."
 msgstr ""
 
-#: src/dialogs.c:72
+#: src/dialogs.c:71
 msgid "Show affected _layouts"
 msgstr ""
 
-#: src/dialogs.c:128
+#: src/dialogs.c:113
+msgid ""
+"Do _not show this warning any more\n"
+"(can be turned back on from Preferences/Warnings)"
+msgstr ""
+
+#: src/dialogs.c:127
 msgid "_Recover disk space"
 msgstr ""
 
-#: src/dialogs.c:143
+#: src/dialogs.c:142
 msgid " _Advanced Settings >>"
 msgstr ""
 
-#: src/dialogs.c:184
+#: src/dialogs.c:183 src/dialogs.c:221
 msgid "LiVES: - Warning !"
 msgstr ""
 
 #: src/dialogs.c:194
-msgid "LiVES: - Question"
+msgid "LiVES: - Error !"
 msgstr ""
 
 #: src/dialogs.c:204
+msgid "LiVES: - Information"
+msgstr ""
+
+#: src/dialogs.c:230
+msgid "LiVES: - Question"
+msgstr ""
+
+#: src/dialogs.c:239
 msgid "LiVES: - File Error"
 msgstr ""
 
-#: src/dialogs.c:208
+#: src/dialogs.c:241
 msgid "_Abort"
 msgstr ""
 
-#: src/dialogs.c:213
+#: src/dialogs.c:246
 msgid "_Retry"
 msgstr ""
 
-#: src/dialogs.c:597
+#: src/dialogs.c:306
+msgid "Show _Details"
+msgstr ""
+
+#: src/dialogs.c:657
 #, c-format
 msgid ""
 "FREE SPACE IN THE PARTITION CONTAINING\n"
@@ -4149,7 +4161,7 @@
 "(Disk warning levels can be configured in Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:615
+#: src/dialogs.c:676
 #, c-format
 msgid ""
 "Free space in the partition containing\n"
@@ -4161,11 +4173,11 @@
 "Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:627
+#: src/dialogs.c:688
 msgid "Audio players cannot be switched during playback."
 msgstr ""
 
-#: src/dialogs.c:632
+#: src/dialogs.c:694
 msgid ""
 "\n"
 "\n"
@@ -4173,46 +4185,46 @@
 "Please try closing some other applications first.\n"
 msgstr ""
 
-#: src/dialogs.c:752
+#: src/dialogs.c:820
 msgid "Processing has been paused."
 msgstr ""
 
-#: src/dialogs.c:937
+#: src/dialogs.c:1002
 #, c-format
 msgid ""
 "\n"
 "%s%d%% done. Time remaining: %u sec%s\n"
 msgstr ""
 
-#: src/dialogs.c:1335
+#: src/dialogs.c:1391
 #, c-format
 msgid ""
 "\n"
 "%d/%d frames opened. Time remaining %u sec.\n"
 msgstr ""
 
-#: src/dialogs.c:1337
+#: src/dialogs.c:1393
 #, c-format
 msgid ""
 "\n"
 "%d/%d frames opened.\n"
 msgstr ""
 
-#: src/dialogs.c:1341
+#: src/dialogs.c:1396
 #, c-format
 msgid ""
 "\n"
 "%d frames opened.\n"
 msgstr ""
 
-#: src/dialogs.c:1940
+#: src/dialogs.c:1993
 #, c-format
 msgid ""
 "\n"
 "Time remaining: %d sec"
 msgstr ""
 
-#: src/dialogs.c:1988
+#: src/dialogs.c:2040
 #, c-format
 msgid ""
 "\n"
@@ -4220,7 +4232,7 @@
 "Please close a file and then try again."
 msgstr ""
 
-#: src/dialogs.c:1994
+#: src/dialogs.c:2047
 #, c-format
 msgid ""
 "LiVES was unable to write to its temporary directory.\n"
@@ -4232,27 +4244,27 @@
 "Please make sure you can write to this directory."
 msgstr ""
 
-#: src/dialogs.c:2005
+#: src/dialogs.c:2059
 msgid ""
 "\n"
 "LiVES currently requires either 'mplayer', 'mplayer2', or 'sox' to function. "
 "Please install one or other of these, and try again.\n"
 msgstr ""
 
-#: src/dialogs.c:2010
+#: src/dialogs.c:2064
 msgid ""
 "Audio was not loaded; please install mplayer or mplayer2 if you expected "
 "audio for this clip.\n"
 msgstr ""
 
-#: src/dialogs.c:2014
+#: src/dialogs.c:2069
 msgid ""
 "Audio resampling is required for this format.\n"
 "Please install 'sox'\n"
 "Or switch to another encoder format in Tools | Preferences | Encoding\n"
 msgstr ""
 
-#: src/dialogs.c:2019
+#: src/dialogs.c:2075
 msgid ""
 "\n"
 "\n"
@@ -4260,19 +4272,19 @@
 "Please set the audio codec in Tools|Preferences|Encoding\n"
 msgstr ""
 
-#: src/dialogs.c:2024
+#: src/dialogs.c:2080
 msgid ""
 "This layout includes generated frames.\n"
 "It cannot be saved, you must render it to a clip first.\n"
 msgstr ""
 
-#: src/dialogs.c:2029
+#: src/dialogs.c:2085
 msgid ""
 "This layout includes generated or recorded audio.\n"
 "It cannot be saved, you must render it to a clip first.\n"
 msgstr ""
 
-#: src/dialogs.c:2039 src/dialogs.c:2137
+#: src/dialogs.c:2095 src/dialogs.c:2189
 #, c-format
 msgid ""
 "\n"
@@ -4280,83 +4292,83 @@
 "Due to restrictions in the %s format\n"
 msgstr ""
 
-#: src/dialogs.c:2059
+#: src/dialogs.c:2115
 msgid ""
 "LiVES recommends the following settings:\n"
 "\n"
 msgstr ""
 
-#: src/dialogs.c:2065 src/dialogs.c:2174 src/resample.c:850
+#: src/dialogs.c:2121 src/dialogs.c:2225 src/resample.c:839
 msgid ", signed"
 msgstr ""
 
-#: src/dialogs.c:2066 src/dialogs.c:2175 src/resample.c:853
+#: src/dialogs.c:2122 src/dialogs.c:2226 src/resample.c:841
 msgid ", unsigned"
 msgstr ""
 
-#: src/dialogs.c:2070 src/dialogs.c:2179 src/resample.c:858
+#: src/dialogs.c:2126 src/dialogs.c:2230 src/resample.c:846
 msgid ", little-endian"
 msgstr ""
 
-#: src/dialogs.c:2071 src/dialogs.c:2180 src/resample.c:861
+#: src/dialogs.c:2127 src/dialogs.c:2231 src/resample.c:848
 msgid ", big-endian"
 msgstr ""
 
-#: src/dialogs.c:2077
+#: src/dialogs.c:2132
 #, c-format
 msgid "Use an audio rate of %d Hz%s%s\n"
 msgstr ""
 
-#: src/dialogs.c:2085
+#: src/dialogs.c:2140
 #, c-format
 msgid "Set video rate to %.3f frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:2089
+#: src/dialogs.c:2143
 #, c-format
 msgid "Set video rate to %d:%d frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:2094 src/dialogs.c:2209
+#: src/dialogs.c:2148 src/dialogs.c:2258
 #, c-format
 msgid "Set video size to %d x %d pixels\n"
 msgstr ""
 
-#: src/dialogs.c:2102 src/dialogs.c:2208
+#: src/dialogs.c:2156 src/dialogs.c:2257
 msgid ""
 "\n"
 "You may wish to:\n"
 msgstr ""
 
-#: src/dialogs.c:2105 src/dialogs.c:2200
+#: src/dialogs.c:2159 src/dialogs.c:2249
 #, c-format
 msgid "resize video to %d x %d pixels\n"
 msgstr ""
 
-#: src/dialogs.c:2110
+#: src/dialogs.c:2163
 msgid "disable audio, since the target encoder cannot encode audio\n"
 msgstr ""
 
-#: src/dialogs.c:2170
+#: src/dialogs.c:2221
 msgid "LiVES must:\n"
 msgstr ""
 
-#: src/dialogs.c:2185
+#: src/dialogs.c:2235
 #, c-format
 msgid "resample audio to %d Hz%s%s\n"
 msgstr ""
 
-#: src/dialogs.c:2192
+#: src/dialogs.c:2242
 #, c-format
 msgid "resample video to %.3f frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:2196
+#: src/dialogs.c:2245
 #, c-format
 msgid "resample video to %d:%d frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:2215
+#: src/dialogs.c:2263
 msgid ""
 "\n"
 "You will be able to undo these changes afterwards.\n"
@@ -4365,14 +4377,14 @@
 "\n"
 msgstr ""
 
-#: src/dialogs.c:2218
+#: src/dialogs.c:2265
 msgid ""
 "\n"
 "Changes applied to the selection will not be permanent.\n"
 "\n"
 msgstr ""
 
-#: src/dialogs.c:2237
+#: src/dialogs.c:2285
 msgid ""
 "\n"
 "\n"
@@ -4381,7 +4393,7 @@
 "Try recording for just a selection of the file."
 msgstr ""
 
-#: src/dialogs.c:2244
+#: src/dialogs.c:2293
 msgid ""
 "The playback speed (fps), or the audio rate\n"
 " of the clipboard does not match\n"
@@ -4392,7 +4404,7 @@
 "Please press Cancel to abort the insert, or OK to continue."
 msgstr ""
 
-#: src/dialogs.c:2253
+#: src/dialogs.c:2304
 #, c-format
 msgid ""
 "When opening a yuvmpeg stream, you should first create a fifo file in:\n"
@@ -4405,11 +4417,11 @@
 "click Cancel."
 msgstr ""
 
-#: src/dialogs.c:2305
+#: src/dialogs.c:2356
 msgid "Show Keys"
 msgstr ""
 
-#: src/dialogs.c:2306
+#: src/dialogs.c:2358
 msgid ""
 "You can use the following keys during playback to control LiVES:-\n"
 "\n"
@@ -4451,11 +4463,11 @@
 "g                             ping pong loops\n"
 msgstr ""
 
-#: src/dialogs.c:2313
+#: src/dialogs.c:2365
 msgid "Multitrack Keys"
 msgstr ""
 
-#: src/dialogs.c:2314
+#: src/dialogs.c:2367
 msgid ""
 "You can use the following keys to control the multitrack window:-\n"
 "\n"
@@ -4477,18 +4489,18 @@
 "For other keys, see the menus.\n"
 msgstr ""
 
-#: src/dialogs.c:2322
+#: src/dialogs.c:2375
 msgid "Message History"
 msgstr ""
 
-#: src/dialogs.c:2335
+#: src/dialogs.c:2388
 #, c-format
 msgid ""
 "After upgrading/installing, you may need to adjust the <prefix_dir> setting "
 "in your %s file"
 msgstr ""
 
-#: src/dialogs.c:2344
+#: src/dialogs.c:2399
 #, c-format
 msgid ""
 "\n"
@@ -4499,25 +4511,25 @@
 "or change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/dialogs.c:2352
+#: src/dialogs.c:2408
 msgid ""
 "Sorry, unknown audio type.\n"
 "\n"
 " (Filenames must end in .mp3, .ogg, .wav, .mod, .xm or .it)"
 msgstr ""
 
-#: src/dialogs.c:2353
+#: src/dialogs.c:2409
 msgid "failed (unknown type)\n"
 msgstr ""
 
-#: src/dialogs.c:2358
+#: src/dialogs.c:2415
 msgid ""
 "\n"
 "Do you wish to remove the layout files associated with this set ?\n"
 "(They will not be usable without the set).\n"
 msgstr ""
 
-#: src/dialogs.c:2363
+#: src/dialogs.c:2421
 #, c-format
 msgid ""
 "\n"
@@ -4526,7 +4538,7 @@
 "Click Cancel to pick a new name.\n"
 msgstr ""
 
-#: src/dialogs.c:2370
+#: src/dialogs.c:2429
 msgid ""
 "\n"
 "Frames from this clip are used in some multitrack layouts.\n"
@@ -4534,7 +4546,7 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2374
+#: src/dialogs.c:2433
 msgid ""
 "\n"
 "Audio from this clip is used in some multitrack layouts.\n"
@@ -4542,7 +4554,7 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2378
+#: src/dialogs.c:2438
 #, c-format
 msgid ""
 "\n"
@@ -4553,7 +4565,7 @@
 "Otherwise click Cancel to skip loading this file.\n"
 msgstr ""
 
-#: src/dialogs.c:2385
+#: src/dialogs.c:2446
 #, c-format
 msgid ""
 "\n"
@@ -4563,7 +4575,7 @@
 "The clip could not be loaded.\n"
 msgstr ""
 
-#: src/dialogs.c:2392
+#: src/dialogs.c:2455
 msgid ""
 "\n"
 "Dear user, the jack developers decided to remove the -Z option from jackd.\n"
@@ -4571,7 +4583,7 @@
 "Alternately, select a different audio player in Preferences.\n"
 msgstr ""
 
-#: src/dialogs.c:2396
+#: src/dialogs.c:2460
 msgid ""
 "\n"
 "Unable to start up jack. Please ensure that alsa is set up correctly on your "
@@ -4580,13 +4592,13 @@
 "Automatic jack startup will be disabled now.\n"
 msgstr ""
 
-#: src/dialogs.c:2402
+#: src/dialogs.c:2466
 msgid ""
 "\n"
 "Unable to connect to jack server. Please start jack before starting LiVES\n"
 msgstr ""
 
-#: src/dialogs.c:2411
+#: src/dialogs.c:2475
 #, c-format
 msgid ""
 "\n"
@@ -4597,13 +4609,13 @@
 "%s\n"
 msgstr ""
 
-#: src/dialogs.c:2418
+#: src/dialogs.c:2482
 msgid ""
 "\n"
 "Alternately, you can restart LiVES and select another audio player.\n"
 msgstr ""
 
-#: src/dialogs.c:2423
+#: src/dialogs.c:2488
 #, c-format
 msgid ""
 "\n"
@@ -4613,7 +4625,7 @@
 "It is recommended to increase it to at least %d MB"
 msgstr ""
 
-#: src/dialogs.c:2429
+#: src/dialogs.c:2496
 #, c-format
 msgid ""
 "\n"
@@ -4622,7 +4634,7 @@
 "Do you wish to delete them ?\n"
 msgstr ""
 
-#: src/dialogs.c:2436
+#: src/dialogs.c:2504
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for multitrack undo.\n"
@@ -4630,7 +4642,7 @@
 "using Preferences/Multitrack/Undo Memory\n"
 msgstr ""
 
-#: src/dialogs.c:2440
+#: src/dialogs.c:2508
 msgid ""
 "\n"
 "Out of memory for undo.\n"
@@ -4638,63 +4650,63 @@
 "using Preferences/Multitrack/Undo Memory\n"
 msgstr ""
 
-#: src/dialogs.c:2444
+#: src/dialogs.c:2512
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for the multitrack undo buffer.\n"
 msgstr ""
 
-#: src/dialogs.c:2446
+#: src/dialogs.c:2514
 msgid "or enter a smaller value.\n"
 msgstr ""
 
-#: src/dialogs.c:2448
+#: src/dialogs.c:2516
 msgid "Try again from the clip editor, try closing some other applications\n"
 msgstr ""
 
-#: src/dialogs.c:2449
+#: src/dialogs.c:2517
 msgid "Try closing some other applications\n"
 msgstr ""
 
-#: src/dialogs.c:2460
+#: src/dialogs.c:2529
 msgid ""
 "Multitrack is set to 0 audio channels, but this layout has audio.\n"
 "You should adjust the audio settings from the Tools menu.\n"
 msgstr ""
 
-#: src/dialogs.c:2464
+#: src/dialogs.c:2534
 msgid ""
 "The current layout has audio, so audio channels may not be set to zero.\n"
 msgstr ""
 
-#: src/dialogs.c:2468
+#: src/dialogs.c:2539
 msgid ""
 "Multitrack audio preview is only available with the\n"
 "\"jack\" or \"pulse audio\" audio player.\n"
 "You can set this in Tools|Preferences|Playback."
 msgstr ""
 
-#: src/dialogs.c:2472
+#: src/dialogs.c:2545
 msgid ""
 "Errors were detected in the layout (which may be due to transferring from "
 "another system, or from an older version of LiVES).\n"
 "Should I try to repair the disk copy of the layout ?\n"
 msgstr ""
 
-#: src/dialogs.c:2476
+#: src/dialogs.c:2549
 msgid ""
 "LiVES was unable to load the layout.\n"
 "Sorry.\n"
 msgstr ""
 
-#: src/dialogs.c:2482
+#: src/dialogs.c:2555
 msgid ""
 "\n"
 "\n"
 "Audio rate must be greater than 0.\n"
 msgstr ""
 
-#: src/dialogs.c:2486
+#: src/dialogs.c:2559
 msgid ""
 "\n"
 "Event list will be very large\n"
@@ -4702,14 +4714,14 @@
 "Are you sure you wish to view it ?\n"
 msgstr ""
 
-#: src/dialogs.c:2491
+#: src/dialogs.c:2564
 msgid ""
 "\n"
 "\n"
 "You must install 'dvgrab' to use this function.\n"
 msgstr ""
 
-#: src/dialogs.c:2496
+#: src/dialogs.c:2570
 msgid ""
 "\n"
 "\n"
@@ -4718,25 +4730,25 @@
 "You may need to select one of these in Tools/Preferences/Playback.\n"
 msgstr ""
 
-#: src/dialogs.c:2500
+#: src/dialogs.c:2574
 msgid "Video playback plugin failed to initialise palette !\n"
 msgstr ""
 
-#: src/dialogs.c:2504
+#: src/dialogs.c:2579
 msgid "Decoder plugin failed to initialise palette !\n"
 msgstr ""
 
-#: src/dialogs.c:2509
+#: src/dialogs.c:2584
 msgid "Unable to set framerate of video plugin\n"
 msgstr ""
 
-#: src/dialogs.c:2514
+#: src/dialogs.c:2590
 msgid ""
 "After a crash, it is advisable to clean up the disk with\n"
 "File|Clean up disk space\n"
 msgstr ""
 
-#: src/dialogs.c:2526
+#: src/dialogs.c:2604
 #, c-format
 msgid ""
 "Stream frame size is too large for your network buffers.\n"
@@ -4745,33 +4757,33 @@
 "echo %d > /proc/sys/net/core/rmem_max\n"
 msgstr ""
 
-#: src/dialogs.c:2714
+#: src/dialogs.c:2800
 msgid "cancelled.\n"
 msgstr ""
 
-#: src/dialogs.c:2721
+#: src/dialogs.c:2805
 msgid "failed.\n"
 msgstr ""
 
-#: src/dialogs.c:2728
+#: src/dialogs.c:2810
 msgid "done.\n"
 msgstr ""
 
-#: src/dialogs.c:2732
+#: src/dialogs.c:2814
 msgid "error in file. Failed.\n"
 msgstr ""
 
-#: src/dialogs.c:2766 src/dialogs.c:2815 src/dialogs.c:2839
+#: src/dialogs.c:2848 src/dialogs.c:2897 src/dialogs.c:2921
 #, c-format
 msgid "Additional info: %s\n"
 msgstr ""
 
-#: src/dialogs.c:2769
+#: src/dialogs.c:2851
 #, c-format
 msgid "The error value was %d%s\n"
 msgstr ""
 
-#: src/dialogs.c:2772
+#: src/dialogs.c:2854
 #, c-format
 msgid ""
 "\n"
@@ -4781,7 +4793,7 @@
 "%s%s%s"
 msgstr ""
 
-#: src/dialogs.c:2818
+#: src/dialogs.c:2900
 #, c-format
 msgid ""
 "\n"
@@ -4791,7 +4803,7 @@
 "%s"
 msgstr ""
 
-#: src/dialogs.c:2842
+#: src/dialogs.c:2924
 #, c-format
 msgid ""
 "\n"
@@ -4801,7 +4813,7 @@
 "%s"
 msgstr ""
 
-#: src/dialogs.c:2886
+#: src/dialogs.c:2968
 #, c-format
 msgid ""
 "\n"
@@ -4810,7 +4822,7 @@
 "Please check for possible error causes.\n"
 msgstr ""
 
-#: src/dialogs.c:2890
+#: src/dialogs.c:2971
 #, c-format
 msgid ""
 "\n"
@@ -4820,7 +4832,7 @@
 "%s.\n"
 msgstr ""
 
-#: src/dialogs.c:2921
+#: src/dialogs.c:3002
 #, c-format
 msgid ""
 "\n"
@@ -4829,7 +4841,7 @@
 "Please check for possible error causes.\n"
 msgstr ""
 
-#: src/dialogs.c:2925
+#: src/dialogs.c:3005
 #, c-format
 msgid ""
 "\n"
@@ -4839,12 +4851,12 @@
 "%s.\n"
 msgstr ""
 
-#: src/dialogs.c:2993
+#: src/dialogs.c:3073
 #, c-format
 msgid "Value for \"%s\" could not be read."
 msgstr ""
 
-#: src/dialogs.c:3011
+#: src/dialogs.c:3091
 #, c-format
 msgid ""
 "\n"
@@ -4853,7 +4865,7 @@
 "Please check your system for errors.\n"
 msgstr ""
 
-#: src/dialogs.c:3020
+#: src/dialogs.c:3100
 #, c-format
 msgid ""
 "\n"
@@ -4862,7 +4874,7 @@
 "Please check the file permissions and try again."
 msgstr ""
 
-#: src/dialogs.c:3027
+#: src/dialogs.c:3109
 #, c-format
 msgid ""
 "\n"
@@ -4871,7 +4883,7 @@
 "Please check the directory permissions and try again."
 msgstr ""
 
-#: src/dialogs.c:3034
+#: src/dialogs.c:3116
 #, c-format
 msgid ""
 "\n"
@@ -4879,14 +4891,14 @@
 "%s\n"
 msgstr ""
 
-#: src/dialogs.c:3041
+#: src/dialogs.c:3123
 msgid ""
 "\n"
 "Abort and exit immediately from LiVES\n"
 "Are you sure ?\n"
 msgstr ""
 
-#: src/dialogs.c:3047
+#: src/dialogs.c:3129
 #, c-format
 msgid ""
 "\n"
@@ -4894,13 +4906,13 @@
 "Please select another encoder from the list.\n"
 msgstr ""
 
-#: src/dialogs.c:3056
+#: src/dialogs.c:3139
 msgid ""
 "\n"
 "This card is already in use and cannot be opened multiple times.\n"
 msgstr ""
 
-#: src/dialogs.c:3061
+#: src/dialogs.c:3145
 #, c-format
 msgid ""
 "\n"
@@ -4910,27 +4922,27 @@
 "- Check if the device actually exists.\n"
 msgstr ""
 
-#: src/dialogs.c:3068
+#: src/dialogs.c:3153
 msgid ""
 "\n"
 "This file already has subtitles loaded.\n"
 "Do you wish to overwrite the existing subtitles ?\n"
 msgstr ""
 
-#: src/dialogs.c:3072
+#: src/dialogs.c:3157
 msgid ""
 "\n"
 "LiVES currently only supports subtitles of type .srt and .sub.\n"
 msgstr ""
 
-#: src/dialogs.c:3076
+#: src/dialogs.c:3161
 msgid ""
 "\n"
 "Erase all subtitles from this clip.\n"
 "Are you sure ?\n"
 msgstr ""
 
-#: src/dialogs.c:3082
+#: src/dialogs.c:3168
 #, c-format
 msgid ""
 "\n"
@@ -4939,14 +4951,14 @@
 "or OK to continue and save as type \"%s\"\n"
 msgstr ""
 
-#: src/dialogs.c:3089
+#: src/dialogs.c:3176
 msgid ""
 "\n"
 "Do you wish to move the current clip sets to the new directory ?\n"
 "(If unsure, click Yes)\n"
 msgstr ""
 
-#: src/dialogs.c:3093
+#: src/dialogs.c:3181
 #, c-format
 msgid ""
 "\n"
@@ -4957,19 +4969,19 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:3099
+#: src/dialogs.c:3188
 msgid ""
 "\n"
 "No video input devices could be found.\n"
 msgstr ""
 
-#: src/dialogs.c:3103
+#: src/dialogs.c:3192
 msgid ""
 "\n"
 "All video input devices are already in use.\n"
 msgstr ""
 
-#: src/dialogs.c:3107
+#: src/dialogs.c:3196
 msgid ""
 "\n"
 "\n"
@@ -4977,15 +4989,14 @@
 "DO NOT SHUT DOWN OR CLOSE LIVES !\n"
 msgstr ""
 
-#: src/dialogs.c:3127
+#: src/dialogs.c:3203
 #, c-format
 msgid ""
 "No clips were recovered for set (%s).\n"
 "Please check the spelling of the set name and try again.\n"
 msgstr ""
 
-#. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:3136
+#: src/dialogs.c:3214
 #, c-format
 msgid ""
 "\n"
@@ -4997,7 +5008,7 @@
 msgstr ""
 
 #. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:3144
+#: src/dialogs.c:3222
 #, c-format
 msgid ""
 "\n"
@@ -5006,34 +5017,34 @@
 "\n"
 msgstr ""
 
-#: src/dialogs.c:3150
+#: src/dialogs.c:3228
 msgid ""
 "\n"
 "You must have autolives.pl installed and in your path to use this toy.\n"
 "Consult your package distributor.\n"
 msgstr ""
 
-#: src/dialogs.c:3154
+#: src/dialogs.c:3232
 msgid ""
 "\n"
 "You must have a minimum of one clip loaded to use this toy.\n"
 msgstr ""
 
-#: src/dialogs.c:3158
+#: src/dialogs.c:3236
 msgid ""
 "\n"
 "LiVES lost its connection to jack and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:3162
+#: src/dialogs.c:3240
 msgid ""
 "\n"
 "LiVES lost its connection to pulseaudio and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:3175
+#: src/dialogs.c:3254
 #, c-format
 msgid ""
 "\n"
@@ -5042,543 +5053,543 @@
 "Do you wish to allow this (for this session only) ?\n"
 msgstr ""
 
-#: src/effects.c:60
+#: src/effects.c:61
 msgid "generator"
 msgstr ""
 
-#: src/effects.c:61
+#: src/effects.c:62
 msgid "Generators"
 msgstr ""
 
-#: src/effects.c:63
+#: src/effects.c:64
 msgid "audio generator"
 msgstr ""
 
-#: src/effects.c:64
+#: src/effects.c:65
 msgid "Audio Generators"
 msgstr ""
 
-#: src/effects.c:66
+#: src/effects.c:67
 msgid "audio/video generator"
 msgstr ""
 
-#: src/effects.c:67
+#: src/effects.c:68
 msgid "Audio/Video Generators"
 msgstr ""
 
-#: src/effects.c:69
+#: src/effects.c:70
 msgid "data generator"
 msgstr ""
 
-#: src/effects.c:70
+#: src/effects.c:71
 msgid "Data Generators"
 msgstr ""
 
-#: src/effects.c:72
+#: src/effects.c:73
 msgid "data visualiser"
 msgstr ""
 
-#: src/effects.c:73
+#: src/effects.c:74
 msgid "Data Visualisers"
 msgstr ""
 
-#: src/effects.c:75
+#: src/effects.c:76
 msgid "data processor"
 msgstr ""
 
-#: src/effects.c:76
+#: src/effects.c:77
 msgid "Data Processors"
 msgstr ""
 
-#: src/effects.c:78
+#: src/effects.c:79
 msgid "data source"
 msgstr ""
 
-#: src/effects.c:79
+#: src/effects.c:80
 msgid "Data Sources"
 msgstr ""
 
-#: src/effects.c:81
+#: src/effects.c:82
 msgid "transition"
 msgstr ""
 
-#: src/effects.c:82
+#: src/effects.c:83
 msgid "Transitions"
 msgstr ""
 
-#: src/effects.c:84
+#: src/effects.c:85
 msgid "effect"
 msgstr ""
 
-#: src/effects.c:87 src/rfx-builder.c:187
+#: src/effects.c:88 src/rfx-builder.c:187
 msgid "utility"
 msgstr ""
 
-#: src/effects.c:88
+#: src/effects.c:89
 msgid "Utilities"
 msgstr ""
 
-#: src/effects.c:90
+#: src/effects.c:91
 msgid "compositor"
 msgstr ""
 
-#: src/effects.c:91
+#: src/effects.c:92
 msgid "Compositors"
 msgstr ""
 
-#: src/effects.c:93
+#: src/effects.c:94
 msgid "tap"
 msgstr ""
 
-#: src/effects.c:94
+#: src/effects.c:95
 msgid "Taps"
 msgstr ""
 
-#: src/effects.c:96
+#: src/effects.c:97
 msgid "splitter"
 msgstr ""
 
-#: src/effects.c:97
+#: src/effects.c:98
 msgid "Splitters"
 msgstr ""
 
-#: src/effects.c:99
+#: src/effects.c:100
 msgid "converter"
 msgstr ""
 
-#: src/effects.c:100
+#: src/effects.c:101
 msgid "Converters"
 msgstr ""
 
-#: src/effects.c:102
+#: src/effects.c:103
 msgid "analyser"
 msgstr ""
 
-#: src/effects.c:103
+#: src/effects.c:104
 msgid "Analysers"
 msgstr ""
 
-#: src/effects.c:108
+#: src/effects.c:109
 msgid "audio/video"
 msgstr ""
 
-#: src/effects.c:109
+#: src/effects.c:110
 msgid "Audio/Video Transitions"
 msgstr ""
 
-#: src/effects.c:111
+#: src/effects.c:112
 msgid "video only"
 msgstr ""
 
-#: src/effects.c:112
+#: src/effects.c:113
 msgid "Video only Transitions"
 msgstr ""
 
-#: src/effects.c:114 src/multitrack.c:10740
+#: src/effects.c:115 src/multitrack.c:10962
 msgid "audio only"
 msgstr ""
 
-#: src/effects.c:115
+#: src/effects.c:116
 msgid "Audio only Transitions"
 msgstr ""
 
-#: src/effects.c:117 src/effects.c:120 src/multitrack.c:18757
+#: src/effects.c:118 src/effects.c:121 src/multitrack.c:19097
 msgid "audio"
 msgstr ""
 
-#: src/effects.c:118
+#: src/effects.c:119
 msgid "Audio Mixers"
 msgstr ""
 
-#: src/effects.c:121
+#: src/effects.c:122
 msgid "Audio Effects"
 msgstr ""
 
-#: src/effects.c:123
+#: src/effects.c:124
 msgid "video"
 msgstr ""
 
-#: src/effects.c:124
+#: src/effects.c:125
 msgid "Video Effects"
 msgstr ""
 
-#: src/effects.c:126
+#: src/effects.c:127
 msgid "audio volume controller"
 msgstr ""
 
-#: src/effects.c:127
+#: src/effects.c:128
 msgid "Audio Volume Controllers"
 msgstr ""
 
-#: src/effects.c:129
+#: src/effects.c:130
 msgid "video analyser"
 msgstr ""
 
-#: src/effects.c:130
+#: src/effects.c:131
 msgid "Video analysers"
 msgstr ""
 
-#: src/effects.c:132
+#: src/effects.c:133
 msgid "audio analyser"
 msgstr ""
 
-#: src/effects.c:133
+#: src/effects.c:134
 msgid "Audio Analysers"
 msgstr ""
 
-#: src/effects.c:137 src/plugins.c:2559 src/plugins.c:2573
+#: src/effects.c:138 src/plugins.c:2507 src/plugins.c:2521
 msgid "unknown"
 msgstr ""
 
-#: src/effects.c:238
+#: src/effects.c:235
 #, c-format
 msgid "%s all frames..."
 msgstr ""
 
-#: src/effects.c:243
+#: src/effects.c:239
 #, c-format
 msgid "%s clipboard into frames %d to %d..."
 msgstr ""
 
-#: src/effects.c:250
+#: src/effects.c:245
 #, c-format
 msgid "%s to clipboard..."
 msgstr ""
 
-#: src/effects.c:254
+#: src/effects.c:248
 #, c-format
 msgid "%s to new clip..."
 msgstr ""
 
-#: src/effects.c:259
+#: src/effects.c:252
 #, c-format
 msgid "%s frames %d to %d..."
 msgstr ""
 
-#: src/effects.c:290
+#: src/effects.c:283
 #, c-format
 msgid "%s clipboard with selection"
 msgstr ""
 
-#: src/effects.c:295
+#: src/effects.c:287
 #, c-format
 msgid "%s to clipboard"
 msgstr ""
 
-#: src/effects.c:299
+#: src/effects.c:290
 #, c-format
 msgid "%s to new clip"
 msgstr ""
 
-#: src/effects.c:304
+#: src/effects.c:294
 #, c-format
 msgid "%s frames %d to %d"
 msgstr ""
 
-#: src/effects.c:456 src/effects.c:523
+#: src/effects.c:443 src/effects.c:507
 msgid ""
 "\n"
 "No frames were generated.\n"
 msgstr ""
 
-#: src/effects-weed.c:431
+#: src/effects-weed.c:452
 msgid "integer"
 msgstr ""
 
-#: src/effects-weed.c:432
+#: src/effects-weed.c:454
 msgid "int64"
 msgstr ""
 
-#: src/effects-weed.c:433
+#: src/effects-weed.c:456
 msgid "boolean"
 msgstr ""
 
-#: src/effects-weed.c:434
+#: src/effects-weed.c:458
 msgid "double"
 msgstr ""
 
-#: src/effects-weed.c:435
+#: src/effects-weed.c:460
 msgid "string"
 msgstr ""
 
-#: src/effects-weed.c:436
+#: src/effects-weed.c:462
 msgid "pointer"
 msgstr ""
 
-#: src/effects-weed.c:4591
+#: src/effects-weed.c:4581
 #, c-format
 msgid "Error: plugin %s has no weed_setup() function.\n"
 msgstr ""
 
-#: src/effects-weed.c:4606
+#: src/effects-weed.c:4595
 #, c-format
 msgid "No usable filters found in plugin %s\n"
 msgstr ""
 
-#: src/effects-weed.c:4680
+#: src/effects-weed.c:4668
 #, c-format
 msgid "Found duplicate plugin %s"
 msgstr ""
 
-#: src/effects-weed.c:4734
+#: src/effects-weed.c:4723
 #, c-format
 msgid ""
 "Info: Unable to load plugin %s\n"
 "Error was: %s\n"
 msgstr ""
 
-#: src/effects-weed.c:4737 src/effects-weed.c:5858
+#: src/effects-weed.c:4726 src/effects-weed.c:5847
 msgid "Some plugin directories"
 msgstr ""
 
 #. TRANSLATORS: example " - LADSPA plugins -"
-#: src/effects-weed.c:4812 src/rte_window.c:2105
+#: src/effects-weed.c:4801 src/rte_window.c:2107
 #, c-format
 msgid " - %s plugins -"
 msgstr ""
 
-#: src/effects-weed.c:5012
+#: src/effects-weed.c:4998
 #, c-format
 msgid "Successfully loaded %d Weed filters\n"
 msgstr ""
 
-#: src/effects-weed.c:5177
+#: src/effects-weed.c:5162
 #, c-format
 msgid "Invalid compound effect %s - has conflicting target_fps\n"
 msgstr ""
 
-#: src/effects-weed.c:5197
+#: src/effects-weed.c:5182
 #, c-format
 msgid "Invalid compound effect %s - has multiple transition parameters\n"
 msgstr ""
 
-#: src/effects-weed.c:5211
+#: src/effects-weed.c:5196
 #, c-format
 msgid "Invalid compound effect %s - has multiple master volume parameters\n"
 msgstr ""
 
-#: src/effects-weed.c:5346
+#: src/effects-weed.c:5329
 #, c-format
 msgid "Invalid compound effect %s - must have >1 sub filters\n"
 msgstr ""
 
-#: src/effects-weed.c:5366
+#: src/effects-weed.c:5349
 #, c-format
 msgid "Invalid effect %s found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5381
+#: src/effects-weed.c:5364
 #, c-format
 msgid "Invalid default found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5392
+#: src/effects-weed.c:5375
 #, c-format
 msgid "Invalid filter %d for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5406
+#: src/effects-weed.c:5389
 #, c-format
 msgid "Invalid param %d for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5433
+#: src/effects-weed.c:5416
 #, c-format
 msgid ""
 "Invalid number of values for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5467
+#: src/effects-weed.c:5450
 #, c-format
 msgid ""
 "Invalid non-boolean value for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5500
+#: src/effects-weed.c:5483
 #, c-format
 msgid "Invalid param link found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5511
+#: src/effects-weed.c:5494
 #, c-format
 msgid ""
 "Invalid out filter %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5529
+#: src/effects-weed.c:5513
 #, c-format
 msgid ""
 "Invalid out param %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5541
+#: src/effects-weed.c:5526
 #, c-format
 msgid ""
 "Invalid non-boolean value for autoscale found in compound effect %s, line "
 "%d\n"
 msgstr ""
 
-#: src/effects-weed.c:5552
+#: src/effects-weed.c:5537
 #, c-format
 msgid ""
 "Invalid in filter %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5566
+#: src/effects-weed.c:5552
 #, c-format
 msgid ""
 "Invalid in param %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5594
+#: src/effects-weed.c:5581
 #, c-format
 msgid "Invalid channel link found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5605
+#: src/effects-weed.c:5592
 #, c-format
 msgid ""
 "Invalid out filter %d for link channels found in compound effect %s, line "
 "%d\n"
 msgstr ""
 
-#: src/effects-weed.c:5623
+#: src/effects-weed.c:5611
 #, c-format
 msgid ""
 "Invalid out channel %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5633
+#: src/effects-weed.c:5622
 #, c-format
 msgid ""
 "Invalid in filter %d for link channels found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5651
+#: src/effects-weed.c:5641
 #, c-format
 msgid ""
 "Invalid in channel %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5687
+#: src/effects-weed.c:5678
 #, c-format
 msgid "Compound:%s"
 msgstr ""
 
-#: src/effects-weed.c:5758
+#: src/effects-weed.c:5749
 #, c-format
 msgid "Successfully loaded %d compound filters\n"
 msgstr ""
 
-#: src/effects-weed.c:6591
+#: src/effects-weed.c:6570
 #, c-format
 msgid "Effect %s cannot be used with this audio player.\n"
 msgstr ""
 
-#: src/effects-weed.c:6737
+#: src/effects-weed.c:6718
 #, c-format
 msgid "Failed to start instance %s, error code %d\n"
 msgstr ""
 
-#: src/effects-weed.c:6814
+#: src/effects-weed.c:6797
 #, c-format
 msgid "Unable to start generator %s\n"
 msgstr ""
 
-#: src/effects-weed.c:7621
+#: src/effects-weed.c:7607
 #, c-format
 msgid "Failed to start generator %s\n"
 msgstr ""
 
-#: src/effects-weed.c:7718
+#: src/effects-weed.c:7701
 #, c-format
 msgid "Failed to start generator %s, error %d\n"
 msgstr ""
 
-#: src/effects-weed.c:9012
+#: src/effects-weed.c:8993
 #, c-format
 msgid "%s [unstable] (%s)"
 msgstr ""
 
-#: src/effects-data.c:3278
+#: src/effects-data.c:3234
 #, c-format
 msgid "ACTIVATE (%s)"
 msgstr ""
 
-#: src/effects-data.c:3548
+#: src/effects-data.c:3501
 msgid "ACTIVATE"
 msgstr ""
 
-#: src/effects-data.c:3876
+#: src/effects-data.c:3829
 #, c-format
 msgid "Key slot %d"
 msgstr ""
 
-#: src/effects-data.c:3998
+#: src/effects-data.c:3951
 msgid "Autoscale"
 msgstr ""
 
-#: src/effects-data.c:4089
+#: src/effects-data.c:4042
 msgid "Add another connection for this output parameter"
 msgstr ""
 
-#: src/effects-data.c:4102 src/effects-data.c:4151
+#: src/effects-data.c:4055 src/effects-data.c:4104
 msgid "Delete this connection"
 msgstr ""
 
-#: src/effects-data.c:4138
+#: src/effects-data.c:4091
 msgid "Add another connection for this output channel"
 msgstr ""
 
-#: src/effects-data.c:4223
+#: src/effects-data.c:4176
 msgid "Connected to -->"
 msgstr ""
 
-#: src/effects-data.c:4243
+#: src/effects-data.c:4196
 #, c-format
 msgid "%s - Alpha Channel Connections"
 msgstr ""
 
-#: src/effects-data.c:4316
+#: src/effects-data.c:4269
 #, c-format
 msgid "%s - Parameter Data Connections"
 msgstr ""
 
-#: src/effects-data.c:4336
+#: src/effects-data.c:4289
 msgid "Autoscale All"
 msgstr ""
 
-#: src/effects-data.c:4361 src/effects-data.c:4890
+#: src/effects-data.c:4314 src/effects-data.c:4841
 msgid "ACTIVATED"
 msgstr ""
 
-#: src/effects-data.c:4774
+#: src/effects-data.c:4726
 msgid "LiVES: - Parameter and Alpha Channel Connections"
 msgstr ""
 
-#: src/effects-data.c:4785
+#: src/effects-data.c:4736
 msgid "Auto Connect Channels"
 msgstr ""
 
-#: src/effects-data.c:4797
+#: src/effects-data.c:4748
 msgid "Auto Connect Parameters"
 msgstr ""
 
-#: src/effects-data.c:4807
+#: src/effects-data.c:4758
 msgid "Disconnect All"
 msgstr ""
 
-#: src/effects-data.c:4875
+#: src/effects-data.c:4826
 #, c-format
 msgid "Input channel is already connected from (%d,%d) %s"
 msgstr ""
 
-#: src/effects-data.c:4891
+#: src/effects-data.c:4842
 #, c-format
 msgid "Input parameter is already connected from (%d,%d) %s"
 msgstr ""
 
-#: src/effects-data.c:4899
+#: src/effects-data.c:4851
 msgid "Input and output parameters are not compatible"
 msgstr ""
 
@@ -5590,43 +5601,43 @@
 msgid "_Reset Values"
 msgstr ""
 
-#: src/framedraw.c:267
+#: src/framedraw.c:265
 msgid "_Frame"
 msgstr ""
 
-#: src/paramspecial.c:266
+#: src/paramspecial.c:259
 msgid "Maintain _Aspect Ratio"
 msgstr ""
 
-#: src/paramspecial.c:267
+#: src/paramspecial.c:260
 msgid "Maintain aspect ratio of original frame"
 msgstr ""
 
-#: src/paramspecial.c:341
+#: src/paramspecial.c:335
 msgid "Display Password"
 msgstr ""
 
-#: src/paramwindow.c:450
+#: src/paramwindow.c:447
 msgid "Transition _In"
 msgstr ""
 
-#: src/paramwindow.c:452
+#: src/paramwindow.c:449
 msgid "Click to set the transition parameter to show only the front frame"
 msgstr ""
 
-#: src/paramwindow.c:474
+#: src/paramwindow.c:472
 msgid "Crossfade audio"
 msgstr ""
 
-#: src/paramwindow.c:475
+#: src/paramwindow.c:473
 msgid "Check the box to make audio transition with the video"
 msgstr ""
 
-#: src/paramwindow.c:493
+#: src/paramwindow.c:492
 msgid "Transition _Out"
 msgstr ""
 
-#: src/paramwindow.c:495
+#: src/paramwindow.c:494
 msgid "Click to set the transition parameter to show only the rear frame"
 msgstr ""
 
@@ -5639,23 +5650,23 @@
 msgid "%s : size"
 msgstr ""
 
-#: src/paramwindow.c:598
+#: src/paramwindow.c:597
 msgid "New size (pixels)"
 msgstr ""
 
-#: src/paramwindow.c:617 src/plugins.c:997
+#: src/paramwindow.c:616 src/plugins.c:973
 msgid "_Width"
 msgstr "_Breedte"
 
-#: src/paramwindow.c:636 src/plugins.c:1003
+#: src/paramwindow.c:635 src/plugins.c:979
 msgid "_Height"
 msgstr "_Hoogte"
 
-#: src/paramwindow.c:684
+#: src/paramwindow.c:683
 msgid "Generate to _Clipboard"
 msgstr ""
 
-#: src/paramwindow.c:686
+#: src/paramwindow.c:685
 msgid "Generate frames to the clipboard"
 msgstr ""
 
@@ -5667,7 +5678,7 @@
 msgid "Generate frames to a new clip"
 msgstr ""
 
-#: src/paramwindow.c:822
+#: src/paramwindow.c:824
 #, c-format
 msgid ""
 "\n"
@@ -5675,71 +5686,71 @@
 "\n"
 msgstr ""
 
-#: src/paramwindow.c:920 src/paramwindow.c:930
+#: src/paramwindow.c:934 src/paramwindow.c:942
 msgid "Set as default"
 msgstr ""
 
-#: src/paramwindow.c:922 src/paramwindow.c:938
+#: src/paramwindow.c:936 src/paramwindow.c:950
 msgid "Reset"
 msgstr ""
 
-#: src/paramwindow.c:932 src/rte_window.c:2401 src/omc-learn.c:1357
+#: src/paramwindow.c:944 src/rte_window.c:2394 src/omc-learn.c:1347
 msgid "Close _window"
 msgstr ""
 
-#: src/paramwindow.c:1337
+#: src/paramwindow.c:1340
 msgid "No parameters"
 msgstr ""
 
-#: src/paramwindow.c:1419
+#: src/paramwindow.c:1424
 msgid "Invalid parameter"
 msgstr ""
 
-#: src/paramwindow.c:1611
+#: src/paramwindow.c:1610
 msgid "LiVES: - Select Colour"
 msgstr ""
 
-#: src/paramwindow.c:1616
+#: src/paramwindow.c:1615
 msgid "Click to set the colour"
 msgstr ""
 
-#: src/paramwindow.c:1628
+#: src/paramwindow.c:1626
 msgid "_Red"
 msgstr ""
 
-#: src/paramwindow.c:1629
+#: src/paramwindow.c:1627
 msgid "The red value (0 - 255)"
 msgstr ""
 
-#: src/paramwindow.c:1632
+#: src/paramwindow.c:1630
 msgid "_Green"
 msgstr ""
 
-#: src/paramwindow.c:1633
+#: src/paramwindow.c:1631
 msgid "The green value (0 - 255)"
 msgstr ""
 
-#: src/paramwindow.c:1636
+#: src/paramwindow.c:1634
 msgid "_Blue"
 msgstr ""
 
-#: src/paramwindow.c:1637
+#: src/paramwindow.c:1635
 msgid "The blue value (0 - 255)"
 msgstr ""
 
-#: src/plugins.c:85
+#: src/plugins.c:86
 #, c-format
 msgid ""
 "\n"
 "Plugin error: %s failed with code %d"
 msgstr ""
 
-#: src/plugins.c:87
+#: src/plugins.c:88
 #, c-format
 msgid " : message was %s\n"
 msgstr ""
 
-#: src/plugins.c:387
+#: src/plugins.c:375
 #, c-format
 msgid ""
 "\n"
@@ -5749,17 +5760,17 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/plugins.c:397
+#: src/plugins.c:385
 #, c-format
 msgid "Updating video playback plugin defaults in %s\n"
 msgstr ""
 
-#: src/plugins.c:452
+#: src/plugins.c:444
 #, c-format
 msgid "Loading video playback plugin defaults from %s..."
 msgstr ""
 
-#: src/plugins.c:515
+#: src/plugins.c:505
 #, c-format
 msgid ""
 "\n"
@@ -5769,32 +5780,32 @@
 "\n"
 msgstr ""
 
-#: src/plugins.c:855
+#: src/plugins.c:836
 #, c-format
 msgid "Saving playback plugin defaults to %s..."
 msgstr ""
 
-#: src/plugins.c:962
+#: src/plugins.c:939
 msgid "_FPS"
 msgstr ""
 
-#: src/plugins.c:963
+#: src/plugins.c:940
 msgid "Fixed framerate for plugin.\n"
 msgstr ""
 
-#: src/plugins.c:1032
+#: src/plugins.c:1008
 msgid "_Colourspace"
 msgstr ""
 
-#: src/plugins.c:1033
+#: src/plugins.c:1009
 msgid "Colourspace input to the plugin.\n"
 msgstr ""
 
-#: src/plugins.c:1089
+#: src/plugins.c:1065
 msgid "Save settings to an alternate file.\n"
 msgstr ""
 
-#: src/plugins.c:1206
+#: src/plugins.c:1182
 #, c-format
 msgid ""
 "\n"
@@ -5803,7 +5814,7 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/plugins.c:1252
+#: src/plugins.c:1228
 #, c-format
 msgid ""
 "\n"
@@ -5813,38 +5824,38 @@
 "Unable to use it.\n"
 msgstr ""
 
-#: src/plugins.c:1265
+#: src/plugins.c:1241
 #, c-format
 msgid ""
 "Video playback plugin failed to initialise.\n"
 "Error was: %s\n"
 msgstr ""
 
-#: src/plugins.c:1461
+#: src/plugins.c:1428
 msgid ""
 "\n"
 "Warning ! Video playback plugin will not send key presses. Keyboard may be "
 "disabled during plugin use !\n"
 msgstr ""
 
-#: src/plugins.c:1465
+#: src/plugins.c:1433
 #, c-format
 msgid ""
 "*** Using %s plugin for fs playback, agreed to use palette type %d ( %s ). "
 "***\n"
 msgstr ""
 
-#: src/plugins.c:1571
+#: src/plugins.c:1537
 #, c-format
 msgid "Audio stream unable to use preferred format '%s'\n"
 msgstr ""
 
-#: src/plugins.c:1579
+#: src/plugins.c:1543
 #, c-format
 msgid "Using format '%s' instead.\n"
 msgstr ""
 
-#: src/plugins.c:1616
+#: src/plugins.c:1579
 #, c-format
 msgid ""
 "LiVES was unable to find its encoder plugins. Please make sure you have the "
@@ -5853,7 +5864,7 @@
 "or change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/plugins.c:1624
+#: src/plugins.c:1589
 #, c-format
 msgid ""
 "LiVES did not receive a response from the encoder plugin called '%s'.\n"
@@ -5862,11 +5873,11 @@
 "or switch to another plugin using Tools|Preferences|Encoding\n"
 msgstr ""
 
-#: src/plugins.c:2032
+#: src/plugins.c:1987
 msgid "Unable to resize, please install imageMagick\n"
 msgstr ""
 
-#: src/plugins.c:2231
+#: src/plugins.c:2183
 #, c-format
 msgid ""
 "\n"
@@ -5874,12 +5885,12 @@
 "No decoders found in %s !\n"
 msgstr ""
 
-#: src/plugins.c:2415
+#: src/plugins.c:2369
 #, c-format
 msgid " using %s"
 msgstr ""
 
-#: src/plugins.c:2499
+#: src/plugins.c:2451
 #, c-format
 msgid ""
 "\n"
@@ -5888,7 +5899,7 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/plugins.c:2522
+#: src/plugins.c:2472
 #, c-format
 msgid ""
 "\n"
@@ -5898,24 +5909,24 @@
 "Unable to use it.\n"
 msgstr ""
 
-#: src/plugins.c:2564
+#: src/plugins.c:2512
 msgid "/unknown"
 msgstr ""
 
-#: src/plugins.c:2651
+#: src/plugins.c:2598
 msgid "LiVES: - Decoder Plugins"
 msgstr ""
 
-#: src/plugins.c:2669
+#: src/plugins.c:2616
 msgid "Enabled Video Decoders (uncheck to disable)"
 msgstr ""
 
-#: src/plugins.c:2726
+#: src/plugins.c:2672
 #, c-format
 msgid "Failed to load %s, transitions may not resize.\n"
 msgstr ""
 
-#: src/plugins.c:3854
+#: src/plugins.c:3797
 #, c-format
 msgid "%s advanced settings"
 msgstr ""
@@ -5924,15 +5935,15 @@
 msgid "LiVES: - New Test RFX"
 msgstr ""
 
-#: src/rfx-builder.c:136
+#: src/rfx-builder.c:135
 msgid "LiVES: - Edit Test RFX"
 msgstr ""
 
-#: src/rfx-builder.c:166
+#: src/rfx-builder.c:165
 msgid "Type:"
 msgstr ""
 
-#: src/rfx-builder.c:184
+#: src/rfx-builder.c:183
 msgid "tool"
 msgstr ""
 
@@ -5944,130 +5955,130 @@
 msgid "The name of the plugin. No spaces allowed."
 msgstr ""
 
-#: src/rfx-builder.c:201
+#: src/rfx-builder.c:202
 msgid "Version:       "
 msgstr ""
 
-#: src/rfx-builder.c:203
+#: src/rfx-builder.c:204
 msgid "The script version."
 msgstr ""
 
-#: src/rfx-builder.c:210
+#: src/rfx-builder.c:212
 msgid "    Author:       "
 msgstr ""
 
-#: src/rfx-builder.c:211
+#: src/rfx-builder.c:213
 msgid "The script author."
 msgstr ""
 
-#: src/rfx-builder.c:217
+#: src/rfx-builder.c:220
 msgid "    URL (optional):       "
 msgstr ""
 
-#: src/rfx-builder.c:218
+#: src/rfx-builder.c:221
 msgid "URL for the plugin maintainer."
 msgstr ""
 
-#: src/rfx-builder.c:226
+#: src/rfx-builder.c:230
 msgid "Menu text:    "
 msgstr ""
 
-#: src/rfx-builder.c:227
+#: src/rfx-builder.c:231
 msgid "The text to show in the menu."
 msgstr ""
 
-#: src/rfx-builder.c:239
+#: src/rfx-builder.c:244
 msgid "Action description:        "
 msgstr ""
 
-#: src/rfx-builder.c:241
+#: src/rfx-builder.c:246
 msgid "Describe what the plugin is doing. E.g. \"Edge detecting\""
 msgstr ""
 
-#: src/rfx-builder.c:246
+#: src/rfx-builder.c:251
 msgid "Minimum frames:"
 msgstr ""
 
-#: src/rfx-builder.c:249
+#: src/rfx-builder.c:254
 msgid ""
 "Minimum number of frames this effect/tool can be applied to. Normally 1."
 msgstr ""
 
-#: src/rfx-builder.c:260
+#: src/rfx-builder.c:265
 msgid "_Requirements..."
 msgstr ""
 
-#: src/rfx-builder.c:263
+#: src/rfx-builder.c:268
 msgid "Enter any binaries required by the plugin."
 msgstr ""
 
-#: src/rfx-builder.c:267
+#: src/rfx-builder.c:272
 msgid "_Properties..."
 msgstr ""
 
-#: src/rfx-builder.c:270
+#: src/rfx-builder.c:275
 msgid "Set properties for the plugin. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:274
+#: src/rfx-builder.c:279
 msgid "_Parameters..."
 msgstr ""
 
-#: src/rfx-builder.c:277
+#: src/rfx-builder.c:282
 msgid "Set up parameters used in pre/loop/post/trigger code. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:281
+#: src/rfx-builder.c:286
 msgid "Parameter _Window Hints..."
 msgstr ""
 
-#: src/rfx-builder.c:284
+#: src/rfx-builder.c:289
 msgid "Set hints about how to lay out the parameter window. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:290
+#: src/rfx-builder.c:295
 msgid "_Language code:"
 msgstr ""
 
-#: src/rfx-builder.c:291
+#: src/rfx-builder.c:296
 msgid "Language for pre/loop/post/triggers. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:300
+#: src/rfx-builder.c:305
 msgid "_Pre loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:303
+#: src/rfx-builder.c:308
 msgid "Code to be executed before the loop. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:307
+#: src/rfx-builder.c:312
 msgid "_Loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:310
+#: src/rfx-builder.c:315
 msgid "Loop code to be applied to each frame."
 msgstr ""
 
-#: src/rfx-builder.c:314
+#: src/rfx-builder.c:319
 msgid "_Post loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:317
+#: src/rfx-builder.c:322
 msgid "Code to be executed after the loop. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:321
+#: src/rfx-builder.c:326
 msgid "_Trigger code..."
 msgstr ""
 
-#: src/rfx-builder.c:324
+#: src/rfx-builder.c:329
 msgid ""
 "Set trigger code for when the parameter window is shown, or when a parameter "
 "is changed. Optional (except for Utilities)."
 msgstr ""
 
-#: src/rfx-builder.c:421
+#: src/rfx-builder.c:426
 #, c-format
 msgid ""
 "\n"
@@ -6077,55 +6088,55 @@
 "%s\n"
 msgstr ""
 
-#: src/rfx-builder.c:544
+#: src/rfx-builder.c:541
 msgid "LiVES: - RFX Requirements"
 msgstr ""
 
-#: src/rfx-builder.c:548
+#: src/rfx-builder.c:544
 msgid "LiVES: - RFX Parameters"
 msgstr ""
 
-#: src/rfx-builder.c:552
+#: src/rfx-builder.c:547
 msgid "LiVES: - RFX Parameter Window Hints"
 msgstr ""
 
-#: src/rfx-builder.c:556
+#: src/rfx-builder.c:550
 msgid "LiVES: - RFX Triggers"
 msgstr ""
 
-#: src/rfx-builder.c:622
+#: src/rfx-builder.c:613
 msgid "_New Entry"
 msgstr ""
 
-#: src/rfx-builder.c:625
+#: src/rfx-builder.c:616
 msgid "_Edit Entry"
 msgstr ""
 
-#: src/rfx-builder.c:628
+#: src/rfx-builder.c:619
 msgid "_Remove Entry"
 msgstr ""
 
-#: src/rfx-builder.c:632
+#: src/rfx-builder.c:623
 msgid "Move _Up"
 msgstr ""
 
-#: src/rfx-builder.c:635
+#: src/rfx-builder.c:626
 msgid "Move _Down"
 msgstr ""
 
-#: src/rfx-builder.c:1004
+#: src/rfx-builder.c:984
 msgid "LiVES: - RFX Properties"
 msgstr ""
 
-#: src/rfx-builder.c:1013
+#: src/rfx-builder.c:993
 msgid "_Slow (hint to GUI)"
 msgstr ""
 
-#: src/rfx-builder.c:1024
+#: src/rfx-builder.c:1004
 msgid "_Batch mode generator"
 msgstr ""
 
-#: src/rfx-builder.c:1831
+#: src/rfx-builder.c:1790
 msgid ""
 "\n"
 "\n"
@@ -6134,7 +6145,7 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:1875
+#: src/rfx-builder.c:1834
 msgid ""
 "\n"
 "\n"
@@ -6142,219 +6153,219 @@
 "Please check the trigger code.\n"
 msgstr ""
 
-#: src/rfx-builder.c:1994
+#: src/rfx-builder.c:1950
 msgid "LiVES: - New RFX Parameter"
 msgstr ""
 
-#: src/rfx-builder.c:1997
+#: src/rfx-builder.c:1952
 msgid "LiVES: - Edit RFX Parameter"
 msgstr ""
 
-#: src/rfx-builder.c:2013
+#: src/rfx-builder.c:1968
 msgid "_Name:    "
 msgstr ""
 
-#: src/rfx-builder.c:2016
+#: src/rfx-builder.c:1971
 msgid "Name of the parameter, must be unique in the plugin."
 msgstr ""
 
-#: src/rfx-builder.c:2025
+#: src/rfx-builder.c:1981
 msgid "_Label:    "
 msgstr ""
 
-#: src/rfx-builder.c:2028
+#: src/rfx-builder.c:1984
 msgid ""
 "Label to be shown by the parameter. An underscore represents mnemonic "
 "accelerator."
 msgstr ""
 
-#: src/rfx-builder.c:2039
+#: src/rfx-builder.c:1996
 msgid "_Type:         "
 msgstr ""
 
-#: src/rfx-builder.c:2040
+#: src/rfx-builder.c:1997
 msgid "Parameter type (select from list)."
 msgstr ""
 
-#: src/rfx-builder.c:2073
+#: src/rfx-builder.c:2029
 msgid "Decimal _places: "
 msgstr ""
 
-#: src/rfx-builder.c:2082 src/rfx-builder.c:2477 src/rfx-builder.c:2495
+#: src/rfx-builder.c:2038 src/rfx-builder.c:2430 src/rfx-builder.c:2447
 msgid "_Default value:    "
 msgstr ""
 
-#: src/rfx-builder.c:2098
+#: src/rfx-builder.c:2054
 msgid "_Default: "
 msgstr ""
 
-#: src/rfx-builder.c:2132
+#: src/rfx-builder.c:2087
 msgid "Button _Group: "
 msgstr ""
 
-#: src/rfx-builder.c:2134
+#: src/rfx-builder.c:2089
 msgid "A non-zero value can be used to group radio buttons."
 msgstr ""
 
-#: src/rfx-builder.c:2142 src/rfx-builder.c:2478
+#: src/rfx-builder.c:2097 src/rfx-builder.c:2431
 msgid "_Minimum value: "
 msgstr ""
 
-#: src/rfx-builder.c:2148 src/rfx-builder.c:2479
+#: src/rfx-builder.c:2103 src/rfx-builder.c:2432
 msgid "Ma_ximum value: "
 msgstr ""
 
-#: src/rfx-builder.c:2157
+#: src/rfx-builder.c:2113
 msgid "     _Step size:   "
 msgstr ""
 
-#: src/rfx-builder.c:2160
+#: src/rfx-builder.c:2117
 msgid ""
 "How much the parameter is adjusted when the spinbutton arrows are pressed."
 msgstr ""
 
-#: src/rfx-builder.c:2171
+#: src/rfx-builder.c:2129
 msgid "_Wrap value"
 msgstr ""
 
-#: src/rfx-builder.c:2172
+#: src/rfx-builder.c:2131
 msgid "Whether the value wraps max->min and min->max."
 msgstr ""
 
-#: src/rfx-builder.c:2470
+#: src/rfx-builder.c:2424
 msgid "Set _values"
 msgstr ""
 
-#: src/rfx-builder.c:2512
+#: src/rfx-builder.c:2463
 msgid "Default _Red:  "
 msgstr ""
 
-#: src/rfx-builder.c:2513
+#: src/rfx-builder.c:2464
 msgid "Default _Green:"
 msgstr ""
 
-#: src/rfx-builder.c:2514
+#: src/rfx-builder.c:2465
 msgid "Default _Blue: "
 msgstr ""
 
-#: src/rfx-builder.c:2538
+#: src/rfx-builder.c:2488
 msgid "Set _default"
 msgstr ""
 
-#: src/rfx-builder.c:2540
+#: src/rfx-builder.c:2490
 msgid "Default value:  "
 msgstr ""
 
-#: src/rfx-builder.c:2541
+#: src/rfx-builder.c:2491
 msgid "Maximum length (chars): "
 msgstr ""
 
-#: src/rfx-builder.c:2576
+#: src/rfx-builder.c:2526
 msgid "LiVES: - New RFX Parameter Window Hint"
 msgstr ""
 
-#: src/rfx-builder.c:2579
+#: src/rfx-builder.c:2528
 msgid "LiVES: - Edit RFX Parameter Window Hint"
 msgstr ""
 
-#: src/rfx-builder.c:2622
+#: src/rfx-builder.c:2569
 msgid "_Keyword:         "
 msgstr ""
 
-#: src/rfx-builder.c:2639
+#: src/rfx-builder.c:2586
 msgid "Special _Type:         "
 msgstr ""
 
-#: src/rfx-builder.c:2656
+#: src/rfx-builder.c:2602
 msgid "Special _Subtype:         "
 msgstr ""
 
-#: src/rfx-builder.c:2667 src/rfx-builder.c:2706
+#: src/rfx-builder.c:2613 src/rfx-builder.c:2651
 msgid "Row:    "
 msgstr ""
 
-#: src/rfx-builder.c:2732
+#: src/rfx-builder.c:2676
 #, c-format
 msgid "Linked parameters (%d):    "
 msgstr ""
 
-#: src/rfx-builder.c:2749
+#: src/rfx-builder.c:2693
 msgid "Linked parameters (4):    "
 msgstr ""
 
-#: src/rfx-builder.c:2752
+#: src/rfx-builder.c:2695
 msgid "Linked parameters (2):    "
 msgstr ""
 
-#: src/rfx-builder.c:2777
+#: src/rfx-builder.c:2720
 msgid "LiVES: - New RFX Trigger"
 msgstr ""
 
-#: src/rfx-builder.c:2780
+#: src/rfx-builder.c:2722
 msgid "LiVES: - Edit RFX Trigger"
 msgstr ""
 
-#: src/rfx-builder.c:2808
+#: src/rfx-builder.c:2750
 msgid "When:         "
 msgstr ""
 
-#: src/rfx-builder.c:2904
+#: src/rfx-builder.c:2846
 msgid "LiVES: - Pre Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:2911
+#: src/rfx-builder.c:2853
 msgid "LiVES: - Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:2918
+#: src/rfx-builder.c:2860
 msgid "LiVES: - Post Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:2931
+#: src/rfx-builder.c:2873
 #, c-format
 msgid "LiVES: - Default text (max length %d)"
 msgstr ""
 
-#: src/rfx-builder.c:2944
+#: src/rfx-builder.c:2885
 msgid "LiVES: - Enter values, one per line"
 msgstr ""
 
-#: src/rfx-builder.c:3055
+#: src/rfx-builder.c:2996
 msgid ""
 "\n"
 "\n"
 "Name must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3060
+#: src/rfx-builder.c:3001
 msgid ""
 "\n"
 "\n"
 "Name must not contain spaces.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3065
+#: src/rfx-builder.c:3006
 msgid ""
 "\n"
 "\n"
 "Menu text must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3071
+#: src/rfx-builder.c:3012
 msgid ""
 "\n"
 "\n"
 "Action description must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3076
+#: src/rfx-builder.c:3017
 msgid ""
 "\n"
 "\n"
 "Author must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3085 src/rfx-builder.c:4339
+#: src/rfx-builder.c:3026 src/rfx-builder.c:4253
 msgid ""
 "\n"
 "\n"
@@ -6362,28 +6373,28 @@
 "Name must be unique.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3092
+#: src/rfx-builder.c:3033
 msgid ""
 "\n"
 "\n"
 "Loop code should not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3098
+#: src/rfx-builder.c:3039
 msgid ""
 "\n"
 "\n"
 "Trigger code should not be blank for a utility.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3111
+#: src/rfx-builder.c:3052
 msgid ""
 "\n"
 "\n"
 "Parameter name must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3117
+#: src/rfx-builder.c:3058
 msgid ""
 "\n"
 "\n"
@@ -6392,41 +6403,41 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:3171
+#: src/rfx-builder.c:3111
 #, c-format
 msgid "Writing script file %s..."
 msgstr ""
 
-#: src/rfx-builder.c:3477
+#: src/rfx-builder.c:3411
 msgid "No <define> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3484 src/rfx-builder.c:3493
+#: src/rfx-builder.c:3418 src/rfx-builder.c:3427
 msgid "Bad script version.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3505
+#: src/rfx-builder.c:3439
 msgid "No <name> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3513
+#: src/rfx-builder.c:3447
 msgid "No <version> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3522
+#: src/rfx-builder.c:3456
 msgid "No <author> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3536
+#: src/rfx-builder.c:3470
 msgid "No <description> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3540
+#: src/rfx-builder.c:3474
 #, c-format
 msgid "Bad description. (%s)\n"
 msgstr ""
 
-#: src/rfx-builder.c:3702
+#: src/rfx-builder.c:3627
 #, c-format
 msgid ""
 "\n"
@@ -6436,27 +6447,27 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:3859
+#: src/rfx-builder.c:3780
 msgid "Rebuilding all RFX scripts...builtin..."
 msgstr ""
 
-#: src/rfx-builder.c:3860
+#: src/rfx-builder.c:3781
 msgid "Rebuilding scripts"
 msgstr ""
 
-#: src/rfx-builder.c:3868
+#: src/rfx-builder.c:3789
 msgid "custom..."
 msgstr ""
 
-#: src/rfx-builder.c:3872
+#: src/rfx-builder.c:3793
 msgid "test..."
 msgstr ""
 
-#: src/rfx-builder.c:3878
+#: src/rfx-builder.c:3799
 msgid "rebuilding dynamic menu entries..."
 msgstr ""
 
-#: src/rfx-builder.c:3905 src/rfx-builder.c:3912
+#: src/rfx-builder.c:3826 src/rfx-builder.c:3834
 #, c-format
 msgid ""
 "\n"
@@ -6465,7 +6476,7 @@
 "Please check this program is in your path and executable.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3951
+#: src/rfx-builder.c:3874
 #, c-format
 msgid ""
 "\n"
@@ -6475,12 +6486,12 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:3960
+#: src/rfx-builder.c:3884
 #, c-format
 msgid "Deleting rfx script %s..."
 msgstr ""
 
-#: src/rfx-builder.c:3980
+#: src/rfx-builder.c:3902
 #, c-format
 msgid ""
 "\n"
@@ -6490,7 +6501,7 @@
 "Error code was %d\n"
 msgstr ""
 
-#: src/rfx-builder.c:4016
+#: src/rfx-builder.c:3938
 #, c-format
 msgid ""
 "\n"
@@ -6500,12 +6511,12 @@
 "Please delete it first, or rename the test script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4027
+#: src/rfx-builder.c:3950
 #, c-format
 msgid "Promoting rfx test plugin %s to custom..."
 msgstr ""
 
-#: src/rfx-builder.c:4044
+#: src/rfx-builder.c:3965
 #, c-format
 msgid ""
 "\n"
@@ -6516,20 +6527,20 @@
 "Return code was %d (%s)\n"
 msgstr ""
 
-#: src/rfx-builder.c:4070
+#: src/rfx-builder.c:3990
 msgid "LiVES: - Export Script to..."
 msgstr ""
 
-#: src/rfx-builder.c:4077 src/rfx-builder.c:4156
+#: src/rfx-builder.c:3997 src/rfx-builder.c:4074
 #, c-format
 msgid "Copying %s to %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4105
+#: src/rfx-builder.c:4024
 msgid "LiVES: Import Script from..."
 msgstr ""
 
-#: src/rfx-builder.c:4148
+#: src/rfx-builder.c:4067
 #, c-format
 msgid ""
 "\n"
@@ -6539,43 +6550,43 @@
 "Please delete it first, or rename the import script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4249
+#: src/rfx-builder.c:4166
 msgid "LiVES: - Copy RFX Script"
 msgstr ""
 
-#: src/rfx-builder.c:4251
+#: src/rfx-builder.c:4168
 msgid "_From type:    "
 msgstr ""
 
-#: src/rfx-builder.c:4258
+#: src/rfx-builder.c:4175
 msgid "   Script:    "
 msgstr ""
 
-#: src/rfx-builder.c:4267
+#: src/rfx-builder.c:4183
 msgid "LiVES: - Rename test RFX Script"
 msgstr ""
 
-#: src/rfx-builder.c:4268
+#: src/rfx-builder.c:4184
 msgid "From script: "
 msgstr ""
 
-#: src/rfx-builder.c:4273
+#: src/rfx-builder.c:4188
 msgid "LiVES: - RFX Script name"
 msgstr ""
 
-#: src/rfx-builder.c:4274
+#: src/rfx-builder.c:4189
 msgid "Script name: "
 msgstr ""
 
-#: src/rfx-builder.c:4294
+#: src/rfx-builder.c:4209
 msgid "New name: "
 msgstr ""
 
-#: src/rfx-builder.c:4297
+#: src/rfx-builder.c:4212
 msgid "New script name: "
 msgstr ""
 
-#: src/rfx-builder.c:4372
+#: src/rfx-builder.c:4286
 msgid ""
 "\n"
 "\n"
@@ -6583,12 +6594,12 @@
 "Script name must be unique.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4384
+#: src/rfx-builder.c:4297
 #, c-format
 msgid "Renaming RFX test script %s to %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4390
+#: src/rfx-builder.c:4302
 #, c-format
 msgid ""
 "\n"
@@ -6599,21 +6610,21 @@
 "Return code was %d\n"
 msgstr ""
 
-#: src/rfx-builder.c:4610
+#: src/rfx-builder.c:4518
 msgid "_Apply Real Time Effects to Selection"
 msgstr ""
 
-#: src/rfx-builder.c:4664
+#: src/rfx-builder.c:4572
 #, c-format
 msgid "Loading rendered effect %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4766
+#: src/rfx-builder.c:4674
 msgid ""
 "See: VJ - show VJ keys. Set the realtime effects, and then apply them here."
 msgstr ""
 
-#: src/preferences.c:359
+#: src/preferences.c:351
 msgid ""
 "\n"
 "\n"
@@ -6621,7 +6632,7 @@
 "full screen, separate window (fs) mode\n"
 msgstr ""
 
-#: src/preferences.c:408
+#: src/preferences.c:400
 msgid ""
 "\n"
 "\n"
@@ -6629,7 +6640,7 @@
 "(Free space = UNKNOWN)"
 msgstr ""
 
-#: src/preferences.c:412
+#: src/preferences.c:403
 #, c-format
 msgid ""
 "\n"
@@ -6638,14 +6649,14 @@
 "(Free space = %s)"
 msgstr ""
 
-#: src/preferences.c:416
+#: src/preferences.c:408
 msgid ""
 "The temp directory is LiVES working directory where opened clips and sets "
 "are stored.\n"
 "It should be in a partition with plenty of free disk space.\n"
 msgstr ""
 
-#: src/preferences.c:784
+#: src/preferences.c:839
 #, c-format
 msgid ""
 "Unable to create or write to the new temporary directory.\n"
@@ -6656,7 +6667,7 @@
 "The directory will not be changed now.\n"
 msgstr ""
 
-#: src/preferences.c:786
+#: src/preferences.c:843
 #, c-format
 msgid ""
 "Unable to create or write to the new temporary directory.\n"
@@ -6666,7 +6677,7 @@
 "The directory will not be changed now.\n"
 msgstr ""
 
-#: src/preferences.c:798
+#: src/preferences.c:856
 msgid ""
 "You have chosen to change the temporary directory.\n"
 "Please make sure you have no other copies of LiVES open.\n"
@@ -6678,20 +6689,20 @@
 "original setting."
 msgstr ""
 
-#: src/preferences.c:1169
+#: src/preferences.c:1221
 msgid ""
 "\n"
 "Unable to switch audio players to jack - jackd must be installed first.\n"
 "See http://jackaudio.org\n"
 msgstr ""
 
-#: src/preferences.c:1175
+#: src/preferences.c:1226
 msgid ""
 "\n"
 "Switching audio players requires restart (jackd must not be running)\n"
 msgstr ""
 
-#: src/preferences.c:1202
+#: src/preferences.c:1253
 msgid ""
 "\n"
 "Unable to switch audio players to pulse audio\n"
@@ -6699,814 +6710,814 @@
 "See http://www.pulseaudio.org\n"
 msgstr ""
 
-#: src/preferences.c:1502
+#: src/preferences.c:1544
 msgid "PCM (highest quality; largest files)"
 msgstr ""
 
-#: src/preferences.c:2063
+#: src/preferences.c:2096
 msgid "LiVES: - Preferences"
 msgstr ""
 
-#: src/preferences.c:2142
+#: src/preferences.c:2177
 msgid "Open file selection maximised"
 msgstr ""
 
-#: src/preferences.c:2149
+#: src/preferences.c:2184
 msgid "Show recent files in the File menu"
 msgstr ""
 
-#: src/preferences.c:2158
+#: src/preferences.c:2193
 msgid "Stop screensaver on playback    "
 msgstr ""
 
-#: src/preferences.c:2165
+#: src/preferences.c:2200
 msgid "Open main window maximised"
 msgstr ""
 
-#: src/preferences.c:2173
+#: src/preferences.c:2208
 msgid "Show toolbar when background is blanked"
 msgstr ""
 
-#: src/preferences.c:2181
+#: src/preferences.c:2216
 msgid "Allow mouse wheel to switch clips"
 msgstr ""
 
-#: src/preferences.c:2192
+#: src/preferences.c:2227
 msgid "Shrink previews to fit in interface"
 msgstr ""
 
-#: src/preferences.c:2202
+#: src/preferences.c:2237
 msgid "Startup mode:"
 msgstr ""
 
-#: src/preferences.c:2206
+#: src/preferences.c:2241
 msgid "_Clip editor"
 msgstr ""
 
-#: src/preferences.c:2210
+#: src/preferences.c:2245
 msgid "_Multitrack mode"
 msgstr ""
 
-#: src/preferences.c:2234
+#: src/preferences.c:2268
 msgid "Multi-head support"
 msgstr ""
 
-#: src/preferences.c:2242
+#: src/preferences.c:2276
 msgid " monitor number for LiVES interface"
 msgstr ""
 
-#: src/preferences.c:2248
+#: src/preferences.c:2282
 msgid " monitor number for playback"
 msgstr ""
 
-#: src/preferences.c:2260
+#: src/preferences.c:2294
 msgid ""
 "A setting of 0 means use all available monitors (only works with some "
 "playback plugins)."
 msgstr ""
 
-#: src/preferences.c:2270
+#: src/preferences.c:2304
 msgid "Force single monitor"
 msgstr ""
 
-#: src/preferences.c:2271
+#: src/preferences.c:2305
 msgid "Ignore all except the first monitor."
 msgstr ""
 
-#: src/preferences.c:2293
+#: src/preferences.c:2327
 msgid "Show clip thumbnails during playback"
 msgstr ""
 
-#: src/preferences.c:2306
+#: src/preferences.c:2340
 msgid "GUI"
 msgstr ""
 
-#: src/preferences.c:2321
+#: src/preferences.c:2355
 msgid "When entering Multitrack mode:"
 msgstr ""
 
-#: src/preferences.c:2330
+#: src/preferences.c:2364
 msgid "_Prompt me for width, height, fps and audio settings"
 msgstr ""
 
-#: src/preferences.c:2336
+#: src/preferences.c:2370
 msgid "_Always use the following values:"
 msgstr ""
 
-#: src/preferences.c:2345
+#: src/preferences.c:2379
 msgid "Use these same _values for rendering a new clip"
 msgstr ""
 
-#: src/preferences.c:2370
+#: src/preferences.c:2404
 msgid "_Width           "
 msgstr ""
 
-#: src/preferences.c:2375
+#: src/preferences.c:2409
 msgid "          _Height      "
 msgstr ""
 
-#: src/preferences.c:2379
+#: src/preferences.c:2413
 msgid "          _FPS"
 msgstr ""
 
-#: src/preferences.c:2387
+#: src/preferences.c:2421
 msgid "Enable backing audio track"
 msgstr ""
 
-#: src/preferences.c:2394
+#: src/preferences.c:2428
 msgid "Audio track per video track"
 msgstr ""
 
-#: src/preferences.c:2423
+#: src/preferences.c:2457
 msgid "    _Undo buffer size (MB)    "
 msgstr ""
 
-#: src/preferences.c:2432
+#: src/preferences.c:2466
 msgid "_Exit multitrack mode after rendering"
 msgstr ""
 
-#: src/preferences.c:2440
+#: src/preferences.c:2474
 msgid "Auto backup layouts"
 msgstr ""
 
-#: src/preferences.c:2445
+#: src/preferences.c:2479
 msgid "_Every"
 msgstr ""
 
-#: src/preferences.c:2453
+#: src/preferences.c:2487
 msgid "seconds"
 msgstr ""
 
-#: src/preferences.c:2461
+#: src/preferences.c:2495
 msgid "After every _change"
 msgstr ""
 
-#: src/preferences.c:2467
+#: src/preferences.c:2501
 msgid "_Never"
 msgstr ""
 
-#: src/preferences.c:2490
+#: src/preferences.c:2523
 msgid "Multitrack/Render"
 msgstr ""
 
-#: src/preferences.c:2508
+#: src/preferences.c:2541
 msgid "Use instant opening when possible"
 msgstr ""
 
-#: src/preferences.c:2509
+#: src/preferences.c:2543
 msgid "Enable instant opening of some file types using decoder plugins"
 msgstr ""
 
-#: src/preferences.c:2531
+#: src/preferences.c:2567
 msgid "Video open command (fallback)"
 msgstr ""
 
-#: src/preferences.c:2543
+#: src/preferences.c:2579
 msgid "Open/render compression"
 msgstr ""
 
-#: src/preferences.c:2546
+#: src/preferences.c:2582
 msgid " %     ( lower = slower, larger files; for jpeg, higher quality )"
 msgstr ""
 
-#: src/preferences.c:2558
+#: src/preferences.c:2594
 msgid "Default image format"
 msgstr ""
 
-#: src/preferences.c:2562
+#: src/preferences.c:2598
 msgid "_jpeg"
 msgstr ""
 
-#: src/preferences.c:2565
+#: src/preferences.c:2601
 msgid "_png"
 msgstr ""
 
-#: src/preferences.c:2572
+#: src/preferences.c:2608
 msgid "(Check Help/Troubleshoot to see which image formats are supported)"
 msgstr ""
 
-#: src/preferences.c:2580
+#: src/preferences.c:2616
 msgid "Enable automatic deinterlacing when possible"
 msgstr ""
 
-#: src/preferences.c:2582
+#: src/preferences.c:2619
 msgid "Automatically deinterlace frames when a plugin suggests it"
 msgstr ""
 
-#: src/preferences.c:2593
+#: src/preferences.c:2632
 msgid "Automatic trimming / padding of audio when possible"
 msgstr ""
 
-#: src/preferences.c:2595
+#: src/preferences.c:2634
 msgid "Automatically trim or pad audio when a plugin suggests it"
 msgstr ""
 
-#: src/preferences.c:2606
+#: src/preferences.c:2646
 msgid "Ignore blank borders when possible"
 msgstr ""
 
-#: src/preferences.c:2608
+#: src/preferences.c:2648
 msgid "Clip any blank borders from frames where possible"
 msgstr ""
 
-#: src/preferences.c:2619
+#: src/preferences.c:2660
 msgid "When opening multiple files, concatenate images into one clip"
 msgstr ""
 
-#: src/preferences.c:2629
+#: src/preferences.c:2670
 msgid "Decoding"
 msgstr ""
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:2652
+#: src/preferences.c:2693
 msgid "Low - can improve performance on slower machines"
 msgstr ""
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:2654
+#: src/preferences.c:2695
 msgid "Normal - recommended for most users"
 msgstr ""
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:2656
+#: src/preferences.c:2697
 msgid "High - can improve quality on very fast machines"
 msgstr ""
 
-#: src/preferences.c:2659
+#: src/preferences.c:2700
 msgid "Preview _quality"
 msgstr ""
 
-#: src/preferences.c:2660
+#: src/preferences.c:2701
 msgid "The preview quality for video playback - affects resizing"
 msgstr ""
 
-#: src/preferences.c:2675
+#: src/preferences.c:2717
 msgid "_Show FPS statistics"
 msgstr ""
 
-#: src/preferences.c:2694
+#: src/preferences.c:2736
 msgid "_Plugin"
 msgstr ""
 
-#: src/preferences.c:2718
+#: src/preferences.c:2760
 msgid "Stream audio"
 msgstr ""
 
-#: src/preferences.c:2721
+#: src/preferences.c:2763
 msgid "Stream audio to playback plugin"
 msgstr ""
 
-#: src/preferences.c:2734
+#: src/preferences.c:2778
 msgid "Record player output"
 msgstr ""
 
-#: src/preferences.c:2737
+#: src/preferences.c:2781
 msgid "Record output from player instead of input to player"
 msgstr ""
 
-#: src/preferences.c:2744
+#: src/preferences.c:2789
 msgid "VIDEO"
 msgstr ""
 
-#: src/preferences.c:2787
+#: src/preferences.c:2833
 msgid "_Player"
 msgstr ""
 
-#: src/preferences.c:2792
+#: src/preferences.c:2838
 msgid "(See also the Jack Integration tab for jack startup options)"
 msgstr ""
 
-#: src/preferences.c:2819
+#: src/preferences.c:2865
 msgid "mplayer"
 msgstr ""
 
-#: src/preferences.c:2830
+#: src/preferences.c:2876
 msgid "mplayer2"
 msgstr ""
 
-#: src/preferences.c:2833
+#: src/preferences.c:2879
 msgid "Audio play _command"
 msgstr ""
 
-#: src/preferences.c:2840
+#: src/preferences.c:2886
 msgid "- internal -"
 msgstr ""
 
-#: src/preferences.c:2849
+#: src/preferences.c:2895
 msgid "Audio follows video _rate/direction"
 msgstr ""
 
-#: src/preferences.c:2857
+#: src/preferences.c:2903
 msgid "Audio follows _clip switches"
 msgstr ""
 
-#: src/preferences.c:2864
+#: src/preferences.c:2910
 msgid "Source:"
 msgstr ""
 
-#: src/preferences.c:2868
+#: src/preferences.c:2914
 msgid "_Internal"
 msgstr ""
 
-#: src/preferences.c:2873
+#: src/preferences.c:2919
 msgid "_External (requires jack or pulse audio player)"
 msgstr ""
 
-#: src/preferences.c:2892
+#: src/preferences.c:2940
 msgid "AUDIO"
 msgstr ""
 
-#: src/preferences.c:2902
+#: src/preferences.c:2950
 msgid "Playback"
 msgstr ""
 
-#: src/preferences.c:2925
+#: src/preferences.c:2973
 msgid ""
 "Record audio when capturing an e_xternal window\n"
 " (requires jack or pulse audio)"
 msgstr ""
 
-#: src/preferences.c:2940
+#: src/preferences.c:2988
 msgid "      What to record when 'r' is pressed   "
 msgstr ""
 
-#: src/preferences.c:2949
+#: src/preferences.c:2997
 msgid "_Frame changes"
 msgstr ""
 
-#: src/preferences.c:2964
+#: src/preferences.c:3012
 msgid "F_PS changes"
 msgstr ""
 
-#: src/preferences.c:2982
+#: src/preferences.c:3030
 msgid "_Real time effects"
 msgstr ""
 
-#: src/preferences.c:2993
+#: src/preferences.c:3041
 msgid "_Clip switches"
 msgstr ""
 
-#: src/preferences.c:3004
+#: src/preferences.c:3052
 msgid "_Audio (requires jack or pulse audio player)"
 msgstr ""
 
-#: src/preferences.c:3024
+#: src/preferences.c:3072
 msgid "Pause recording if free disk space falls below"
 msgstr ""
 
 #. TRANSLATORS: gigabytes
-#: src/preferences.c:3030
+#: src/preferences.c:3078
 msgid "GB"
 msgstr ""
 
-#: src/preferences.c:3037
+#: src/preferences.c:3085
 msgid "Recording"
 msgstr ""
 
-#: src/preferences.c:3055
+#: src/preferences.c:3103
 msgid "Encoder"
 msgstr ""
 
-#: src/preferences.c:3090
+#: src/preferences.c:3137
 msgid "Output format"
 msgstr ""
 
-#: src/preferences.c:3106
+#: src/preferences.c:3153
 msgid "Audio codec"
 msgstr ""
 
-#: src/preferences.c:3119
+#: src/preferences.c:3165
 msgid "Encoding"
 msgstr ""
 
-#: src/preferences.c:3134
+#: src/preferences.c:3180
 msgid "Use _antialiasing when resizing"
 msgstr ""
 
-#: src/preferences.c:3143
+#: src/preferences.c:3189
 msgid "Number of _real time effect keys"
 msgstr ""
 
-#: src/preferences.c:3145
+#: src/preferences.c:3192
 msgid ""
 "The number of \"virtual\" real time effect keys. They can be controlled "
 "through the real time effects window, or via network (OSC)."
 msgstr ""
 
-#: src/preferences.c:3152
+#: src/preferences.c:3199
 msgid "Use _threads where possible when applying effects"
 msgstr ""
 
-#: src/preferences.c:3159
+#: src/preferences.c:3207
 msgid "Number of _threads"
 msgstr ""
 
-#: src/preferences.c:3172
+#: src/preferences.c:3221
 msgid "Restart is required if any of the following paths are changed:"
 msgstr ""
 
-#: src/preferences.c:3182
+#: src/preferences.c:3231
 msgid "Weed plugin path"
 msgstr ""
 
-#: src/preferences.c:3184
+#: src/preferences.c:3234
 msgid "Frei0r plugin path"
 msgstr ""
 
-#: src/preferences.c:3186
+#: src/preferences.c:3237
 msgid "LADSPA plugin path"
 msgstr ""
 
-#: src/preferences.c:3209
+#: src/preferences.c:3261
 msgid "      Video load directory (default)      "
 msgstr ""
 
-#: src/preferences.c:3215
+#: src/preferences.c:3267
 msgid "      Video save directory (default) "
 msgstr ""
 
-#: src/preferences.c:3221
+#: src/preferences.c:3273
 msgid "      Audio load directory (default) "
 msgstr ""
 
-#: src/preferences.c:3227
+#: src/preferences.c:3279
 msgid "      Image directory (default) "
 msgstr ""
 
-#: src/preferences.c:3233
+#: src/preferences.c:3285
 msgid "      Backup/Restore directory (default) "
 msgstr ""
 
-#: src/preferences.c:3239
+#: src/preferences.c:3291
 msgid "      Temp directory (do not remove) "
 msgstr ""
 
-#: src/preferences.c:3252
+#: src/preferences.c:3304
 msgid "The default directory for loading video clips from"
 msgstr ""
 
-#: src/preferences.c:3277
+#: src/preferences.c:3329
 msgid "The default directory for saving encoded clips to"
 msgstr ""
 
-#: src/preferences.c:3285
+#: src/preferences.c:3337
 msgid "The default directory for loading and saving audio"
 msgstr ""
 
-#: src/preferences.c:3293
+#: src/preferences.c:3345
 msgid "The default directory for saving frameshots to"
 msgstr ""
 
-#: src/preferences.c:3301
+#: src/preferences.c:3353
 msgid "The default directory for backing up/restoring single clips"
 msgstr ""
 
-#: src/preferences.c:3309
+#: src/preferences.c:3361
 msgid "LiVES working directory."
 msgstr ""
 
-#: src/preferences.c:3359
+#: src/preferences.c:3412
 msgid "Directories"
 msgstr ""
 
-#: src/preferences.c:3374
+#: src/preferences.c:3427
 msgid "Warn if diskspace falls below: "
 msgstr ""
 
-#: src/preferences.c:3380 src/preferences.c:3394
+#: src/preferences.c:3433 src/preferences.c:3447
 msgid " MB [set to 0 to disable]"
 msgstr ""
 
-#: src/preferences.c:3389
+#: src/preferences.c:3442
 msgid "Diskspace critical level: "
 msgstr ""
 
-#: src/preferences.c:3407
+#: src/preferences.c:3461
 msgid ""
 "Warn on Insert / Merge if _frame rate of clipboard does not match frame rate "
 "of selection"
 msgstr ""
 
-#: src/preferences.c:3417
+#: src/preferences.c:3471
 msgid "Warn on Open if file _size exceeds "
 msgstr ""
 
-#: src/preferences.c:3425
+#: src/preferences.c:3479
 msgid " MB"
 msgstr ""
 
-#: src/preferences.c:3432
+#: src/preferences.c:3486
 msgid "Show a warning before saving a se_t"
 msgstr ""
 
-#: src/preferences.c:3442
+#: src/preferences.c:3496
 msgid ""
 "Show a warning if _mplayer/mplayer2, sox, composite or convert is not found "
 "when LiVES is started."
 msgstr ""
 
-#: src/preferences.c:3452
+#: src/preferences.c:3506
 msgid "Show a warning if no _rendered effects are found at startup."
 msgstr ""
 
-#: src/preferences.c:3464
+#: src/preferences.c:3518
 msgid "Show a warning if no _encoder plugins are found at startup."
 msgstr ""
 
-#: src/preferences.c:3474
+#: src/preferences.c:3528
 msgid "Show a warning if a _duplicate set name is entered."
 msgstr ""
 
-#: src/preferences.c:3485
+#: src/preferences.c:3539
 msgid "When a set is loaded, warn if clips are missing from _layouts."
 msgstr ""
 
-#: src/preferences.c:3495
+#: src/preferences.c:3550
 msgid "Warn if a clip used in a layout is about to be closed."
 msgstr ""
 
-#: src/preferences.c:3505
+#: src/preferences.c:3561
 msgid "Warn if frames used in a layout are about to be deleted."
 msgstr ""
 
-#: src/preferences.c:3515
+#: src/preferences.c:3572
 msgid "Warn if frames used in a layout are about to be shifted."
 msgstr ""
 
-#: src/preferences.c:3525
+#: src/preferences.c:3583
 msgid "Warn if frames used in a layout are about to be altered."
 msgstr ""
 
-#: src/preferences.c:3535
+#: src/preferences.c:3594
 msgid "Warn if audio used in a layout is about to be deleted."
 msgstr ""
 
-#: src/preferences.c:3546
+#: src/preferences.c:3606
 msgid "Warn if audio used in a layout is about to be shifted."
 msgstr ""
 
-#: src/preferences.c:3556
+#: src/preferences.c:3617
 msgid "Warn if audio used in a layout is about to be altered."
 msgstr ""
 
-#: src/preferences.c:3566
+#: src/preferences.c:3628
 msgid "Popup layout errors after clip changes."
 msgstr ""
 
-#: src/preferences.c:3577
+#: src/preferences.c:3639
 msgid "Warn if the layout has not been saved when leaving multitrack mode."
 msgstr ""
 
-#: src/preferences.c:3588
+#: src/preferences.c:3650
 msgid ""
 "Warn if multitrack has no audio channels, and a layout with audio is loaded."
 msgstr ""
 
-#: src/preferences.c:3598
+#: src/preferences.c:3660
 msgid ""
 "Warn if multitrack has audio channels, and your audio player is not \"jack\" "
 "or \"pulse audio\"."
 msgstr ""
 
-#: src/preferences.c:3610
+#: src/preferences.c:3672
 msgid "Show info message after importing from firewire device."
 msgstr ""
 
-#: src/preferences.c:3626
+#: src/preferences.c:3688
 msgid "Show a warning before opening a yuv4mpeg stream (advanced)."
 msgstr ""
 
-#: src/preferences.c:3639
+#: src/preferences.c:3701
 msgid "Show a warning when multitrack is low on backup space."
 msgstr ""
 
-#: src/preferences.c:3650
+#: src/preferences.c:3713
 msgid "Show a warning advising cleaning of disk space after a crash."
 msgstr ""
 
-#: src/preferences.c:3661
+#: src/preferences.c:3725
 msgid "Show a warning if unable to connect to pulseaudio player."
 msgstr ""
 
-#: src/preferences.c:3673
+#: src/preferences.c:3737
 msgid "Show a warning before wiping a layout which has unsaved changes."
 msgstr ""
 
-#: src/preferences.c:3685
+#: src/preferences.c:3749
 msgid "Warnings"
 msgstr ""
 
-#: src/preferences.c:3703
+#: src/preferences.c:3767
 msgid "Midi synch (requires the files midistart and midistop)"
 msgstr ""
 
-#: src/preferences.c:3715
+#: src/preferences.c:3779
 msgid "When inserting/merging frames:  "
 msgstr ""
 
-#: src/preferences.c:3719
+#: src/preferences.c:3783
 msgid "_Speed Up/Slow Down Insertion"
 msgstr ""
 
-#: src/preferences.c:3723
+#: src/preferences.c:3787
 msgid "_Resample Insertion"
 msgstr ""
 
-#: src/preferences.c:3730
+#: src/preferences.c:3794
 msgid "CD device           "
 msgstr ""
 
-#: src/preferences.c:3733
+#: src/preferences.c:3797
 msgid "LiVES can load audio tracks from this CD"
 msgstr ""
 
-#: src/preferences.c:3746
+#: src/preferences.c:3813
 msgid "Default FPS        "
 msgstr ""
 
-#: src/preferences.c:3749
+#: src/preferences.c:3816
 msgid "Frames per second to use when none is specified"
 msgstr ""
 
-#: src/preferences.c:3757
+#: src/preferences.c:3825
 msgid "Misc"
 msgstr ""
 
-#: src/preferences.c:3782
+#: src/preferences.c:3850
 msgid "New theme:           "
 msgstr ""
 
-#: src/preferences.c:3800
+#: src/preferences.c:3867
 msgid "Themes"
 msgstr ""
 
-#: src/preferences.c:3815
+#: src/preferences.c:3882
 msgid "Download bandwidth (Kb/s)       "
 msgstr ""
 
-#: src/preferences.c:3823
+#: src/preferences.c:3890
 msgid "LiVES must be compiled without \"configure --disable-OSC\" to use OMC"
 msgstr ""
 
-#: src/preferences.c:3833
+#: src/preferences.c:3900
 msgid "OMC remote control enabled"
 msgstr ""
 
-#: src/preferences.c:3841
+#: src/preferences.c:3908
 msgid "UDP port       "
 msgstr ""
 
-#: src/preferences.c:3850
+#: src/preferences.c:3917
 msgid "Start OMC on startup"
 msgstr ""
 
-#: src/preferences.c:3870
+#: src/preferences.c:3937
 msgid "Streaming/Networking"
 msgstr ""
 
-#: src/preferences.c:3882
+#: src/preferences.c:3949
 msgid "Jack transport"
 msgstr ""
 
-#: src/preferences.c:3886
+#: src/preferences.c:3953
 msgid ""
 "LiVES must be compiled with jack/transport.h and jack/jack.h present to use "
 "jack transport"
 msgstr ""
 
-#: src/preferences.c:3892
+#: src/preferences.c:3959
 msgid "Jack _transport config file"
 msgstr ""
 
-#: src/preferences.c:3899 src/preferences.c:3989
+#: src/preferences.c:3967 src/preferences.c:4058
 msgid "Start _server on LiVES startup"
 msgstr ""
 
-#: src/preferences.c:3911
+#: src/preferences.c:3979
 msgid "Jack transport _master (start and stop)"
 msgstr ""
 
-#: src/preferences.c:3921
+#: src/preferences.c:3989
 msgid "Jack transport _client (start and stop)"
 msgstr ""
 
-#: src/preferences.c:3935
+#: src/preferences.c:4003
 msgid "Jack transport sets start position"
 msgstr ""
 
-#: src/preferences.c:3952
+#: src/preferences.c:4020
 msgid "Jack transport timebase slave"
 msgstr ""
 
-#: src/preferences.c:3963
+#: src/preferences.c:4031
 msgid "(See also Playback -> Audio follows video rate/direction)"
 msgstr ""
 
-#: src/preferences.c:3971
+#: src/preferences.c:4039
 msgid "Jack audio"
 msgstr ""
 
-#: src/preferences.c:3975
+#: src/preferences.c:4043
 msgid "LiVES must be compiled with jack/jack.h present to use jack audio"
 msgstr ""
 
-#: src/preferences.c:3978
+#: src/preferences.c:4046
 msgid ""
 "You MUST set the audio player to \"jack\" in the Playback tab to use jack "
 "audio"
 msgstr ""
 
-#: src/preferences.c:3984
+#: src/preferences.c:4052
 msgid "Jack _audio server config file"
 msgstr ""
 
-#: src/preferences.c:3996
+#: src/preferences.c:4065
 msgid "Play audio even when transport is _paused"
 msgstr ""
 
-#: src/preferences.c:4008
+#: src/preferences.c:4077
 msgid "Automatically connect to System Out ports when 'playing' External Audio"
 msgstr ""
 
-#: src/preferences.c:4021
+#: src/preferences.c:4090
 msgid "Jack Integration"
 msgstr ""
 
-#: src/preferences.c:4035
+#: src/preferences.c:4104
 msgid "Events to respond to:"
 msgstr ""
 
-#: src/preferences.c:4044
+#: src/preferences.c:4113
 msgid "_Joystick events"
 msgstr ""
 
-#: src/preferences.c:4051
+#: src/preferences.c:4120
 msgid "_Joystick device"
 msgstr ""
 
-#: src/preferences.c:4053
+#: src/preferences.c:4122
 msgid "The joystick device, e.g. /dev/input/js0"
 msgstr ""
 
-#: src/preferences.c:4071
+#: src/preferences.c:4142
 msgid "_MIDI events"
 msgstr ""
 
-#: src/preferences.c:4080
+#: src/preferences.c:4151
 msgid "Use _ALSA MIDI (recommended)"
 msgstr ""
 
-#: src/preferences.c:4082
+#: src/preferences.c:4153
 msgid "Create an ALSA MIDI port which other MIDI devices can be connected to"
 msgstr ""
 
-#: src/preferences.c:4090
+#: src/preferences.c:4162
 msgid "Use _raw MIDI"
 msgstr ""
 
-#: src/preferences.c:4092
+#: src/preferences.c:4164
 msgid "Read directly from the MIDI device"
 msgstr ""
 
-#: src/preferences.c:4104
+#: src/preferences.c:4177
 msgid "_MIDI device"
 msgstr ""
 
-#: src/preferences.c:4106
+#: src/preferences.c:4179
 msgid "The MIDI device, e.g. /dev/input/midi0"
 msgstr ""
 
-#: src/preferences.c:4118
+#: src/preferences.c:4193
 msgid "Advanced"
 msgstr ""
 
-#: src/preferences.c:4124
+#: src/preferences.c:4199
 msgid "MIDI check _rate"
 msgstr ""
 
-#: src/preferences.c:4127
+#: src/preferences.c:4203
 msgid ""
 "Number of MIDI checks per keyboard tick. Increasing this may improve MIDI "
 "responsiveness, but may slow down playback."
 msgstr ""
 
-#: src/preferences.c:4134
+#: src/preferences.c:4211
 msgid "MIDI repeat"
 msgstr ""
 
-#: src/preferences.c:4137
+#: src/preferences.c:4214
 msgid "Number of non-reads allowed between succesive reads."
 msgstr ""
 
-#: src/preferences.c:4140
+#: src/preferences.c:4218
 msgid "(Warning: setting this value too high can slow down playback.)"
 msgstr ""
 
-#: src/preferences.c:4159
+#: src/preferences.c:4237
 msgid "MIDI/Joystick learner"
 msgstr ""
 
-#: src/preferences.c:4499
+#: src/preferences.c:4679
 msgid ""
 "\n"
 "LiVES will now shut down. You need to restart it for the directory change to "
@@ -7514,214 +7525,214 @@
 "Click OK to continue.\n"
 msgstr ""
 
-#: src/preferences.c:4523
+#: src/preferences.c:4703
 msgid ""
 "For the directory change to take effect LiVES will restart when preferences "
 "dialog closes."
 msgstr ""
 
-#: src/preferences.c:4527
+#: src/preferences.c:4707
 msgid "Theme changes will not take effect until the next time you start LiVES."
 msgstr ""
 
-#: src/preferences.c:4531
+#: src/preferences.c:4711
 msgid "Jack options will not take effect until the next time you start LiVES."
 msgstr ""
 
-#: src/osc.c:2585
+#: src/osc.c:2616
 #, c-format
 msgid "Syncing to external framerate of %.8f frames per second.\n"
 msgstr ""
 
-#: src/osc.c:6746
+#: src/osc.c:6938
 msgid "Cannot initialize OSC receiver\n"
 msgstr ""
 
-#: src/osc.c:6770
+#: src/osc.c:6961
 #, c-format
 msgid "WARNING: Cannot start OSC server at UDP port %d\n"
 msgstr ""
 
-#: src/osc.c:6775
+#: src/osc.c:6963
 #, c-format
 msgid "Started OSC server at UDP port %d\n"
 msgstr ""
 
-#: src/osc.c:6890
+#: src/osc.c:7076
 #, c-format
 msgid "Cannot start OSC/UDP server at port %d \n"
 msgstr ""
 
-#: src/resample.c:125 src/resample.c:304
+#: src/resample.c:131 src/resample.c:305
 #, c-format
 msgid "Resizing frames 1 to %d"
 msgstr ""
 
-#: src/resample.c:140 src/resample.c:318
+#: src/resample.c:145 src/resample.c:318
 #, c-format
 msgid "Resizing/letterboxing frames 1 to %d"
 msgstr ""
 
-#: src/resample.c:361 src/resample.c:385
+#: src/resample.c:360 src/resample.c:384
 msgid "Resize"
 msgstr ""
 
-#: src/resample.c:395
+#: src/resample.c:394
 msgid "Resample/Resize"
 msgstr ""
 
-#: src/resample.c:680
+#: src/resample.c:676
 #, c-format
 msgid "Length of video is now %d frames.\n"
 msgstr ""
 
-#: src/resample.c:745
+#: src/resample.c:737
 msgid ""
 "\n"
 "\n"
 "New rate must be greater than 0\n"
 msgstr ""
 
-#: src/resample.c:797 src/resample.c:813
+#: src/resample.c:788 src/resample.c:803
 msgid "Resampling audio"
 msgstr ""
 
-#: src/resample.c:831
+#: src/resample.c:821
 msgid "LiVES was unable to resample the audio as requested.\n"
 msgstr ""
 
-#: src/resample.c:833 src/resample.c:837
+#: src/resample.c:823 src/resample.c:827
 msgid "Resample Audio"
 msgstr ""
 
-#: src/resample.c:845
+#: src/resample.c:835
 #, c-format
 msgid "Audio was resampled to %d Hz, %d channels, %d bit"
 msgstr ""
 
-#: src/resample.c:1034
+#: src/resample.c:1016
 #, c-format
 msgid "Resampling video at %.8f frames per second..."
 msgstr ""
 
-#: src/resample.c:1037
+#: src/resample.c:1018
 #, c-format
 msgid "Resampling video at %.3f frames per second..."
 msgstr ""
 
-#: src/resample.c:1068
+#: src/resample.c:1049
 msgid "Reordering error !\n"
 msgstr ""
 
-#: src/resample.c:1079
+#: src/resample.c:1060
 msgid "Resample"
 msgstr ""
 
-#: src/resample.c:1192
+#: src/resample.c:1173
 msgid "LiVES: - Resample Audio"
 msgstr ""
 
-#: src/resample.c:1195
+#: src/resample.c:1175
 msgid "LiVES: - Insert Silence"
 msgstr ""
 
-#: src/resample.c:1198
+#: src/resample.c:1177
 msgid "LiVES: - New Clip Audio"
 msgstr ""
 
-#: src/resample.c:1201
+#: src/resample.c:1179
 msgid "LiVES: - External Clip Settings"
 msgstr ""
 
-#: src/resample.c:1238 src/resample.c:1358
+#: src/resample.c:1215 src/resample.c:1332
 msgid "Rate (Hz) "
 msgstr ""
 
-#: src/resample.c:1245 src/resample.c:1372
+#: src/resample.c:1222 src/resample.c:1346
 msgid "Channels"
 msgstr ""
 
-#: src/resample.c:1252
+#: src/resample.c:1229
 msgid "Sample Size "
 msgstr ""
 
-#: src/resample.c:1268 src/resample.c:1425
+#: src/resample.c:1245 src/resample.c:1399
 msgid "Signed"
 msgstr ""
 
-#: src/resample.c:1274 src/resample.c:1435
+#: src/resample.c:1251 src/resample.c:1409
 msgid "Unsigned"
 msgstr ""
 
-#: src/resample.c:1297 src/resample.c:1460
+#: src/resample.c:1273 src/resample.c:1433
 msgid "Little Endian"
 msgstr ""
 
-#: src/resample.c:1303 src/resample.c:1468
+#: src/resample.c:1279 src/resample.c:1441
 msgid "Big Endian"
 msgstr ""
 
-#: src/resample.c:1315
+#: src/resample.c:1290
 msgid "Current"
 msgstr ""
 
-#: src/resample.c:1340
+#: src/resample.c:1315
 msgid "_Enable audio"
 msgstr ""
 
-#: src/resample.c:1372
+#: src/resample.c:1346
 msgid "_Channels"
 msgstr ""
 
-#: src/resample.c:1394
+#: src/resample.c:1368
 msgid "_Sample Size"
 msgstr ""
 
-#: src/resample.c:1394
+#: src/resample.c:1368
 msgid "Sample Size"
 msgstr ""
 
-#: src/resample.c:1489
+#: src/resample.c:1461
 msgid "New"
 msgstr ""
 
-#: src/resample.c:1512
+#: src/resample.c:1484
 msgid "_Frames Per Second "
 msgstr ""
 
-#: src/resample.c:1530
+#: src/resample.c:1502
 msgid "Record for maximum:  "
 msgstr ""
 
-#: src/resample.c:1533
+#: src/resample.c:1505
 msgid " hours  "
 msgstr ""
 
-#: src/resample.c:1536
+#: src/resample.c:1508
 msgid " minutes  "
 msgstr ""
 
-#: src/resample.c:1538
+#: src/resample.c:1510
 msgid " seconds  "
 msgstr ""
 
-#: src/resample.c:1545
+#: src/resample.c:1517
 msgid "Unlimited"
 msgstr ""
 
-#: src/resample.c:1561
+#: src/resample.c:1533
 msgid "Click OK to begin recording, or Cancel to quit."
 msgstr ""
 
-#: src/resample.c:1670
+#: src/resample.c:1638
 msgid "LiVES: - Change playback speed"
 msgstr ""
 
-#: src/resample.c:1673
+#: src/resample.c:1640
 msgid "LiVES: - Resample Video"
 msgstr ""
 
-#: src/resample.c:1696
+#: src/resample.c:1663
 #, c-format
 msgid ""
 "\n"
@@ -7732,7 +7743,7 @@
 "in _frames per second"
 msgstr ""
 
-#: src/resample.c:1701
+#: src/resample.c:1667
 #, c-format
 msgid ""
 "\n"
@@ -7743,89 +7754,89 @@
 "in frames per second"
 msgstr ""
 
-#: src/resample.c:1723
+#: src/resample.c:1688
 msgid "OR enter the desired clip length in _seconds"
 msgstr ""
 
-#: src/resample.c:1745
+#: src/resample.c:1710
 msgid "Change the _audio speed as well"
 msgstr ""
 
-#: src/resample.c:1846
+#: src/resample.c:1810
 msgid ""
 "\n"
 "Speeding up the clip will cause missing frames in some multitrack layouts.\n"
 "Are you sure you wish to change the speed ?\n"
 msgstr ""
 
-#: src/resample.c:1863
+#: src/resample.c:1829
 msgid ""
 "\n"
 "Speeding up the clip will cause missing audio in some multitrack layouts.\n"
 "Are you sure you wish to change the speed ?\n"
 msgstr ""
 
-#: src/resample.c:1878
+#: src/resample.c:1847
 msgid ""
 "\n"
 "Changing the speed will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/resample.c:1892
+#: src/resample.c:1863
 msgid ""
 "\n"
 "Changing the speed will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/resample.c:1938
+#: src/resample.c:1911
 msgid "Speed Change"
 msgstr ""
 
-#: src/resample.c:1947
+#: src/resample.c:1920
 #, c-format
 msgid "Changed playback speed to %.3f frames per second and audio to %d Hz.\n"
 msgstr ""
 
-#: src/resample.c:1950
+#: src/resample.c:1922
 #, c-format
 msgid "Changed playback speed to %.3f frames per second.\n"
 msgstr ""
 
-#: src/resample.c:2035
+#: src/resample.c:2006
 msgid "Resampling video"
 msgstr ""
 
-#: src/resample.c:2042 src/resample.c:2160 src/resample.c:2182
+#: src/resample.c:2012 src/resample.c:2127 src/resample.c:2148
 msgid "Resampling clipboard video"
 msgstr ""
 
-#: src/resample.c:2047
+#: src/resample.c:2016
 msgid "Reordering frames"
 msgstr ""
 
-#: src/resample.c:2056
+#: src/resample.c:2025
 msgid ""
 "\n"
 "\n"
 "LiVES was unable to reorder the frames."
 msgstr ""
 
-#: src/resample.c:2104
+#: src/resample.c:2071
 msgid "Deordering frames"
 msgstr ""
 
-#: src/resample.c:2199
+#: src/resample.c:2165
 msgid "resampling error..."
 msgstr ""
 
-#: src/rte_window.c:85 src/rte_window.c:1708
+#: src/rte_window.c:124 src/rte_window.c:1709
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
-#: src/rte_window.c:112
+#: src/rte_window.c:150
 msgid ""
 "\n"
 "\n"
@@ -7835,7 +7846,7 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:426
+#: src/rte_window.c:460
 msgid ""
 "\n"
 "\n"
@@ -7843,19 +7854,19 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:432
+#: src/rte_window.c:466
 #, c-format
 msgid "Saving keymap to %s\n"
 msgstr ""
 
-#: src/rte_window.c:439
+#: src/rte_window.c:471
 #, c-format
 msgid ""
 "\n"
 "Updating keymap file %s..."
 msgstr ""
 
-#: src/rte_window.c:446
+#: src/rte_window.c:477
 #, c-format
 msgid ""
 "\n"
@@ -7865,12 +7876,12 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/rte_window.c:526
+#: src/rte_window.c:556
 #, c-format
 msgid "Saving real time effect defaults to %s..."
 msgstr ""
 
-#: src/rte_window.c:535
+#: src/rte_window.c:563
 #, c-format
 msgid ""
 "\n"
@@ -7880,22 +7891,22 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/rte_window.c:632
+#: src/rte_window.c:657
 #, c-format
 msgid "Loading real time effect defaults from %s..."
 msgstr ""
 
-#: src/rte_window.c:681
+#: src/rte_window.c:701
 #, c-format
 msgid "Loading generator default sizes from %s..."
 msgstr ""
 
-#: src/rte_window.c:1306
+#: src/rte_window.c:1319
 #, c-format
 msgid "Loading default keymap from %s..."
 msgstr ""
 
-#: src/rte_window.c:1329
+#: src/rte_window.c:1339
 #, c-format
 msgid ""
 "\n"
@@ -7905,48 +7916,48 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/rte_window.c:1403
+#: src/rte_window.c:1412
 #, c-format
 msgid "Invalid line %d in %s\n"
 msgstr ""
 
-#: src/rte_window.c:1483
+#: src/rte_window.c:1490
 #, c-format
 msgid "Invalid key %d in %s\n"
 msgstr ""
 
-#: src/rte_window.c:1498
+#: src/rte_window.c:1505
 #, c-format
 msgid "Invalid effect %s in %s\n"
 msgstr ""
 
-#: src/rte_window.c:1517
+#: src/rte_window.c:1524
 #, c-format
 msgid "Unknown effect %s in %s\n"
 msgstr ""
 
-#: src/rte_window.c:1535
+#: src/rte_window.c:1542
 #, c-format
 msgid ""
 "This version of LiVES cannot mix generators/non-generators on the same key "
 "(%d) !\n"
 msgstr ""
 
-#: src/rte_window.c:1547
+#: src/rte_window.c:1554
 #, c-format
 msgid "Too many effects bound to key %d.\n"
 msgstr ""
 
-#: src/rte_window.c:1587
+#: src/rte_window.c:1593
 msgid "update required.\n"
 msgstr ""
 
-#: src/rte_window.c:1603
+#: src/rte_window.c:1607
 #, c-format
 msgid "Loading data connection map from %s..."
 msgstr ""
 
-#: src/rte_window.c:1612
+#: src/rte_window.c:1614
 msgid ""
 "\n"
 "\n"
@@ -7954,41 +7965,41 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:1691
+#: src/rte_window.c:1692
 #, c-format
 msgid "LiVES: Information for %s"
 msgstr ""
 
-#: src/rte_window.c:1704
+#: src/rte_window.c:1705
 #, c-format
 msgid "Effect name: %s"
 msgstr ""
 
-#: src/rte_window.c:1712
+#: src/rte_window.c:1713
 #, c-format
 msgid "Plugin name: %s"
 msgstr ""
 
-#: src/rte_window.c:1716
+#: src/rte_window.c:1717
 #, c-format
 msgid "Author: %s"
 msgstr ""
 
-#: src/rte_window.c:1721
+#: src/rte_window.c:1722
 #, c-format
 msgid "and: %s"
 msgstr ""
 
-#: src/rte_window.c:1726
+#: src/rte_window.c:1727
 #, c-format
 msgid "Version: %d"
 msgstr ""
 
-#: src/rte_window.c:1734
+#: src/rte_window.c:1735
 msgid "Description: "
 msgstr ""
 
-#: src/rte_window.c:1960
+#: src/rte_window.c:1963
 msgid ""
 "\n"
 "\n"
@@ -7997,69 +8008,69 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:2024
+#: src/rte_window.c:2027
 #, c-format
 msgid "LiVES could not locate the effect %s.\n"
 msgstr ""
 
-#: src/rte_window.c:2225
+#: src/rte_window.c:2216
 msgid "LiVES: Real time effect mapping"
 msgstr ""
 
-#: src/rte_window.c:2257
+#: src/rte_window.c:2248
 #, c-format
 msgid "Ctrl-%d"
 msgstr ""
 
-#: src/rte_window.c:2264
+#: src/rte_window.c:2255
 msgid "Key active"
 msgstr ""
 
-#: src/rte_window.c:2279
+#: src/rte_window.c:2271
 msgid "Key grab"
 msgstr ""
 
-#: src/rte_window.c:2280
+#: src/rte_window.c:2272
 msgid "Grab keyboard for this effect key"
 msgstr ""
 
-#: src/rte_window.c:2290
+#: src/rte_window.c:2283
 msgid "_Clear all effects"
 msgstr ""
 
-#: src/rte_window.c:2304
+#: src/rte_window.c:2297
 msgid "Mode active"
 msgstr ""
 
-#: src/rte_window.c:2314 src/multitrack.c:8568
+#: src/rte_window.c:2307 src/multitrack.c:8762
 msgid "Info"
 msgstr ""
 
-#: src/rte_window.c:2315
+#: src/rte_window.c:2308
 msgid "Set Parameters"
 msgstr ""
 
-#: src/rte_window.c:2316
+#: src/rte_window.c:2309
 msgid "Set Connections"
 msgstr ""
 
-#: src/rte_window.c:2317
+#: src/rte_window.c:2310
 msgid "Clear"
 msgstr ""
 
-#: src/rte_window.c:2326
+#: src/rte_window.c:2319
 msgid "Effect name:"
 msgstr ""
 
-#: src/rte_window.c:2391
+#: src/rte_window.c:2384
 msgid "_Save as default keymap"
 msgstr ""
 
-#: src/rte_window.c:2396
+#: src/rte_window.c:2389
 msgid "_Load default keymap"
 msgstr ""
 
-#: src/rte_window.c:2840
+#: src/rte_window.c:2833
 #, c-format
 msgid ""
 "Unable to create default keymap file: %s\n"
@@ -8117,86 +8128,86 @@
 msgid "none\n"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:494
+#: src/lives-yuv4mpeg.c:493
 #, c-format
 msgid ""
 "Unable to set display framerate to %.3f fps.\n"
 "\n"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:503
+#: src/lives-yuv4mpeg.c:502
 #, c-format
 msgid "Unable to open yuv4mpeg out stream %s\n"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:628
+#: src/lives-yuv4mpeg.c:626
 #, c-format
 msgid "TV card %d"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:713
+#: src/lives-yuv4mpeg.c:710
 #, c-format
 msgid "Opened TV card %d (%s)"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:760
+#: src/lives-yuv4mpeg.c:757
 #, c-format
 msgid "Firewire card %d"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:796
+#: src/lives-yuv4mpeg.c:793
 #, c-format
 msgid "Opened firewire card %d"
 msgstr ""
 
-#: src/multitrack.c:666
+#: src/multitrack.c:736
 msgid "Auto backup"
 msgstr ""
 
-#: src/multitrack.c:868
+#: src/multitrack.c:935
 msgid "Backing audio"
 msgstr ""
 
-#: src/multitrack.c:1435
+#: src/multitrack.c:1515
 #, c-format
 msgid "%s : parameters for %s"
 msgstr ""
 
-#: src/multitrack.c:1809 src/multitrack.c:3483
+#: src/multitrack.c:1881 src/multitrack.c:3635
 #, c-format
 msgid "Current track: %s (layer %d)\n"
 msgstr ""
 
-#: src/multitrack.c:1813 src/multitrack.c:3484
+#: src/multitrack.c:1885 src/multitrack.c:3637
 msgid "Current track: Backing audio\n"
 msgstr ""
 
-#: src/multitrack.c:1814
+#: src/multitrack.c:1886
 #, c-format
 msgid "Current track: Layer %d audio\n"
 msgstr ""
 
-#: src/multitrack.c:1817
+#: src/multitrack.c:1889
 #, c-format
 msgid "%.2f sec.\n"
 msgstr ""
 
-#: src/multitrack.c:1822 src/multitrack.c:3490
+#: src/multitrack.c:1894 src/multitrack.c:3643
 #, c-format
 msgid "Source: %s"
 msgstr ""
 
-#: src/multitrack.c:1825 src/multitrack.c:3492
+#: src/multitrack.c:1897 src/multitrack.c:3645
 msgid "Right click for context menu.\n"
 msgstr ""
 
-#: src/multitrack.c:1827
+#: src/multitrack.c:1899
 msgid ""
 "Double click on a block\n"
 "to select it."
 msgstr ""
 
-#: src/multitrack.c:3312
+#: src/multitrack.c:3452
 msgid ""
 "\n"
 "\n"
@@ -8205,7 +8216,7 @@
 "right or double clicking on it.\n"
 msgstr ""
 
-#: src/multitrack.c:3315
+#: src/multitrack.c:3455
 msgid ""
 "\n"
 "\n"
@@ -8213,14 +8224,14 @@
 "Select an effect in FX stack first to view its parameters.\n"
 msgstr ""
 
-#: src/multitrack.c:3318
+#: src/multitrack.c:3458
 msgid ""
 "\n"
 "\n"
 "No clips loaded.\n"
 msgstr ""
 
-#: src/multitrack.c:3321
+#: src/multitrack.c:3462
 msgid ""
 "You must select two video tracks\n"
 "and a time region\n"
@@ -8230,7 +8241,7 @@
 "before inserting clips into the timeline."
 msgstr ""
 
-#: src/multitrack.c:3324
+#: src/multitrack.c:3465
 msgid ""
 "\n"
 "\n"
@@ -8239,210 +8250,210 @@
 "to apply compositors.\n"
 msgstr ""
 
-#: src/multitrack.c:3487
+#: src/multitrack.c:3640
 #, c-format
 msgid "%.2f sec. to %.2f sec.\n"
 msgstr ""
 
-#: src/multitrack.c:3493
+#: src/multitrack.c:3646
 msgid ""
 "Single click on timeline\n"
 "to select a frame.\n"
 msgstr ""
 
-#: src/multitrack.c:3711 src/multitrack.c:6790
+#: src/multitrack.c:3858 src/multitrack.c:6972
 #, c-format
 msgid "%s [unstable]"
 msgstr ""
 
-#: src/multitrack.c:3822
+#: src/multitrack.c:3973
 msgid ""
 "You can click and drag\n"
 "below the timeline"
 msgstr ""
 
-#: src/multitrack.c:3823
+#: src/multitrack.c:3974
 msgid "to select a time region.\n"
 msgstr ""
 
-#: src/multitrack.c:3985
+#: src/multitrack.c:4137
 msgid "LiVES: Selected clip"
 msgstr ""
 
-#: src/multitrack.c:3993
+#: src/multitrack.c:4145
 msgid "_Adjust start and end points"
 msgstr ""
 
-#: src/multitrack.c:4002
+#: src/multitrack.c:4154
 msgid "_Edit/encode in clip editor"
 msgstr ""
 
-#: src/multitrack.c:4009
+#: src/multitrack.c:4161
 msgid "_Show clip information"
 msgstr ""
 
-#: src/multitrack.c:4016
+#: src/multitrack.c:4168
 msgid "_Close this clip"
 msgstr ""
 
-#: src/multitrack.c:4236
+#: src/multitrack.c:4388
 msgid "Audio mixer (ctrl-m)"
 msgstr ""
 
-#: src/multitrack.c:4336
+#: src/multitrack.c:4488
 msgid "Single click on timeline"
 msgstr ""
 
-#: src/multitrack.c:4337
+#: src/multitrack.c:4489
 msgid "to select a frame."
 msgstr ""
 
-#: src/multitrack.c:4338
+#: src/multitrack.c:4490
 msgid "Double click or right click on timeline"
 msgstr ""
 
-#: src/multitrack.c:4339
+#: src/multitrack.c:4491
 msgid "to select a block."
 msgstr ""
 
-#: src/multitrack.c:4340
+#: src/multitrack.c:4492
 msgid "Clips can be dragged"
 msgstr ""
 
-#: src/multitrack.c:4341
+#: src/multitrack.c:4493
 msgid "onto the timeline."
 msgstr ""
 
-#: src/multitrack.c:4343
+#: src/multitrack.c:4495
 msgid "Mouse mode is: Move"
 msgstr ""
 
-#: src/multitrack.c:4344
+#: src/multitrack.c:4496
 msgid "clips can be moved around."
 msgstr ""
 
-#: src/multitrack.c:4349
+#: src/multitrack.c:4500
 msgid "Mouse mode is: Select."
 msgstr ""
 
-#: src/multitrack.c:4350
+#: src/multitrack.c:4501
 msgid "Drag with mouse on timeline"
 msgstr ""
 
-#: src/multitrack.c:4351
+#: src/multitrack.c:4502
 msgid "to select tracks and time."
 msgstr ""
 
-#: src/multitrack.c:4362
+#: src/multitrack.c:4509
 msgid "_Insert mode: Normal"
 msgstr ""
 
-#: src/multitrack.c:4378
+#: src/multitrack.c:4537
 msgid "_Mouse mode: Move"
 msgstr ""
 
-#: src/multitrack.c:4382
+#: src/multitrack.c:4540
 msgid "_Mouse mode: Select"
 msgstr ""
 
-#: src/multitrack.c:4405 src/multitrack.c:7925
+#: src/multitrack.c:4563 src/multitrack.c:8104
 msgid "Gravity: Normal"
 msgstr ""
 
-#: src/multitrack.c:4409
+#: src/multitrack.c:4565
 msgid "Gravity: Left"
 msgstr ""
 
-#: src/multitrack.c:4414
+#: src/multitrack.c:4569
 msgid "Gravity: Right"
 msgstr ""
 
-#: src/multitrack.c:4416
+#: src/multitrack.c:4570
 msgid "Close _last gap(s) in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:4419
+#: src/multitrack.c:4572
 msgid "Close _first gap(s) in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:4458
+#: src/multitrack.c:4627
 msgid "Close gaps"
 msgstr ""
 
-#: src/multitrack.c:4460
+#: src/multitrack.c:4629
 msgid "Move block"
 msgstr ""
 
-#: src/multitrack.c:4462
+#: src/multitrack.c:4631
 msgid "Move audio block"
 msgstr ""
 
-#: src/multitrack.c:4464
+#: src/multitrack.c:4633
 msgid "Delete block"
 msgstr ""
 
-#: src/multitrack.c:4466
+#: src/multitrack.c:4635
 msgid "Delete audio block"
 msgstr ""
 
-#: src/multitrack.c:4468
+#: src/multitrack.c:4637
 msgid "Split tracks"
 msgstr ""
 
-#: src/multitrack.c:4470
+#: src/multitrack.c:4639
 msgid "Split block"
 msgstr ""
 
-#: src/multitrack.c:4473
+#: src/multitrack.c:4642
 #, c-format
 msgid "Apply %s"
 msgstr ""
 
-#: src/multitrack.c:4478
+#: src/multitrack.c:4647
 #, c-format
 msgid "Delete %s"
 msgstr ""
 
-#: src/multitrack.c:4482
+#: src/multitrack.c:4651
 msgid "Insert block"
 msgstr ""
 
-#: src/multitrack.c:4484
+#: src/multitrack.c:4653
 msgid "Insert gap"
 msgstr ""
 
-#: src/multitrack.c:4486
+#: src/multitrack.c:4655
 msgid "Insert audio block"
 msgstr ""
 
-#: src/multitrack.c:4488
+#: src/multitrack.c:4657
 msgid "Effect order change"
 msgstr ""
 
-#: src/multitrack.c:4898
+#: src/multitrack.c:5064
 msgid "unsigned "
 msgstr ""
 
-#: src/multitrack.c:4899
+#: src/multitrack.c:5065
 msgid "signed "
 msgstr ""
 
-#: src/multitrack.c:4904
+#: src/multitrack.c:5071
 #, c-format
 msgid ""
 "Multitrack values set to %.3f fps, frame size %d x %d, audio channels %d, "
 "audio rate %d, audio sample size %d, %s.\n"
 msgstr ""
 
-#: src/multitrack.c:4938
+#: src/multitrack.c:5104
 msgid "invalid event list. Failed.\n"
 msgstr ""
 
-#: src/multitrack.c:4944
+#: src/multitrack.c:5110
 msgid "event list has invalid fps. Failed.\n"
 msgstr ""
 
-#: src/multitrack.c:4953
+#: src/multitrack.c:5122
 #, c-format
 msgid ""
 "\n"
@@ -8452,7 +8463,7 @@
 "then load in the new set from the File menu.\n"
 msgstr ""
 
-#: src/multitrack.c:4993
+#: src/multitrack.c:5163
 #, c-format
 msgid ""
 "\n"
@@ -8460,600 +8471,592 @@
 "It cannot be loaded.\n"
 msgstr ""
 
-#: src/multitrack.c:5329 src/multitrack.c:5338 src/multitrack.c:21133
+#: src/multitrack.c:5452
 msgid "Layout was wiped.\n"
 msgstr ""
 
-#: src/multitrack.c:5374
+#: src/multitrack.c:5547
 #, c-format
 msgid "LiVES-%s: Multitrack %dx%d : %d bpp %.3f fps"
 msgstr ""
 
-#: src/multitrack.c:5617
+#: src/multitrack.c:5793
 msgid "In/out"
 msgstr ""
 
-#: src/multitrack.c:5619
+#: src/multitrack.c:5795
 msgid "FX stack"
 msgstr ""
 
-#: src/multitrack.c:5627 src/omc-learn.c:673
+#: src/multitrack.c:5803 src/omc-learn.c:659
 msgid "Params."
 msgstr ""
 
-#: src/multitrack.c:5978
+#: src/multitrack.c:6157
 msgid "_Open..."
 msgstr ""
 
-#: src/multitrack.c:5996
+#: src/multitrack.c:6175
 msgid "O_pen File Selection..."
 msgstr ""
 
-#: src/multitrack.c:6040
+#: src/multitrack.c:6219
 msgid "Import Selection from _dvd/vcd..."
 msgstr ""
 
-#: src/multitrack.c:6050
+#: src/multitrack.c:6229
 msgid "Import Selection from _dvd"
 msgstr ""
 
-#: src/multitrack.c:6060
+#: src/multitrack.c:6239
 msgid "Import Selection from _vcd"
 msgstr ""
 
-#: src/multitrack.c:6076
+#: src/multitrack.c:6255
 msgid "_Import from Device"
 msgstr ""
 
-#: src/multitrack.c:6103
+#: src/multitrack.c:6282
 msgid "_Close the selected clip"
 msgstr ""
 
-#: src/multitrack.c:6198
+#: src/multitrack.c:6377
 msgid "_Save layout as..."
 msgstr ""
 
-#: src/multitrack.c:6206
+#: src/multitrack.c:6385
 msgid "_Load layout..."
 msgstr ""
 
-#: src/multitrack.c:6210
+#: src/multitrack.c:6389
 msgid "_Wipe/Delete layout..."
 msgstr ""
 
-#: src/multitrack.c:6236
+#: src/multitrack.c:6415
 msgid "_Ignore width, height and audio values from loaded layouts"
 msgstr ""
 
-#: src/multitrack.c:6240
+#: src/multitrack.c:6419
 msgid "Auto load _subtitles with clips"
 msgstr ""
 
-#: src/multitrack.c:6322
+#: src/multitrack.c:6501
 msgid "_CLIP EDITOR"
 msgstr ""
 
-#: src/multitrack.c:6334
+#: src/multitrack.c:6513
 msgid "_Adjust selected clip start/end points"
 msgstr ""
 
-#: src/multitrack.c:6343
+#: src/multitrack.c:6522
 msgid "_Insert selected clip"
 msgstr ""
 
-#: src/multitrack.c:6355
+#: src/multitrack.c:6534
 msgid "_Insert selected clip audio"
 msgstr ""
 
-#: src/multitrack.c:6364
+#: src/multitrack.c:6543
 msgid "_Delete selected block"
 msgstr ""
 
-#: src/multitrack.c:6373
+#: src/multitrack.c:6555
 msgid "_Jump to previous block boundary"
 msgstr ""
 
-#: src/multitrack.c:6382
+#: src/multitrack.c:6564
 msgid "_Jump to next block boundary"
 msgstr ""
 
-#: src/multitrack.c:6395
+#: src/multitrack.c:6577
 msgid "Clear _marks from timeline"
 msgstr ""
 
-#: src/multitrack.c:6403
+#: src/multitrack.c:6585
 msgid "Ignore selection limits when inserting"
 msgstr ""
 
-#: src/multitrack.c:6420 src/multitrack.c:16719
+#: src/multitrack.c:6602 src/multitrack.c:17009
 msgid "_Play from Timeline Position"
 msgstr ""
 
-#: src/multitrack.c:6434
+#: src/multitrack.c:6616
 msgid "Pla_y selected time only"
 msgstr ""
 
-#: src/multitrack.c:6518
+#: src/multitrack.c:6700
 msgid "_Move effects with blocks"
 msgstr ""
 
-#: src/multitrack.c:6531
+#: src/multitrack.c:6713
 msgid "Select _autotransition effect..."
 msgstr ""
 
-#: src/multitrack.c:6542
+#: src/multitrack.c:6724
 msgid "Crossfade audio with autotransition"
 msgstr ""
 
-#: src/multitrack.c:6550
+#: src/multitrack.c:6732
 msgid "View/_Edit selected effect"
 msgstr ""
 
-#: src/multitrack.c:6554
+#: src/multitrack.c:6736
 msgid "_Delete selected effect"
 msgstr ""
 
-#: src/multitrack.c:6562
+#: src/multitrack.c:6744
 msgid "Apply effect to _block..."
 msgstr ""
 
-#: src/multitrack.c:6619
+#: src/multitrack.c:6801
 msgid "Apply effect to _region..."
 msgstr ""
 
-#: src/multitrack.c:6885
+#: src/multitrack.c:7061
 msgid "_Tracks"
 msgstr ""
 
-#: src/multitrack.c:6896
+#: src/multitrack.c:7072
 msgid "Rename current track"
 msgstr ""
 
-#: src/multitrack.c:6904
+#: src/multitrack.c:7080
 msgid "Make _Backing Audio current track"
 msgstr ""
 
-#: src/multitrack.c:6915
+#: src/multitrack.c:7091
 msgid "Add Video Track at _Rear"
 msgstr ""
 
-#: src/multitrack.c:6923
+#: src/multitrack.c:7099
 msgid "Add Video Track at _Front"
 msgstr ""
 
-#: src/multitrack.c:6936
+#: src/multitrack.c:7112
 msgid "_Split current track at cursor"
 msgstr ""
 
-#: src/multitrack.c:6948
+#: src/multitrack.c:7124
 msgid "_Split selected video tracks"
 msgstr ""
 
-#: src/multitrack.c:6961
+#: src/multitrack.c:7137
 msgid "Insert gap in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:6969
+#: src/multitrack.c:7145
 msgid "Insert gap in current track/selected time"
 msgstr ""
 
-#: src/multitrack.c:6981
+#: src/multitrack.c:7157
 msgid "Close all _gaps in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:7007
+#: src/multitrack.c:7183
 msgid "Se_lection"
 msgstr ""
 
-#: src/multitrack.c:7018
+#: src/multitrack.c:7194
 msgid "_Select Current Track"
 msgstr ""
 
-#: src/multitrack.c:7025
+#: src/multitrack.c:7201
 msgid "Select _all video tracks"
 msgstr ""
 
-#: src/multitrack.c:7032
+#: src/multitrack.c:7208
 msgid "Select _no video tracks"
 msgstr ""
 
-#: src/multitrack.c:7039
+#: src/multitrack.c:7215
 msgid "Select all _time"
 msgstr ""
 
-#: src/multitrack.c:7050
+#: src/multitrack.c:7226
 msgid "Select from _zero time"
 msgstr ""
 
-#: src/multitrack.c:7057
+#: src/multitrack.c:7233
 msgid "Select to _end time"
 msgstr ""
 
-#: src/multitrack.c:7064
+#: src/multitrack.c:7240
 msgid "_Copy..."
 msgstr ""
 
-#: src/multitrack.c:7075
+#: src/multitrack.c:7251
 msgid "_Timecode to region start"
 msgstr ""
 
-#: src/multitrack.c:7082
+#: src/multitrack.c:7258
 msgid "_Timecode to region end"
 msgstr ""
 
-#: src/multitrack.c:7089
+#: src/multitrack.c:7265
 msgid "_Region start to timecode"
 msgstr ""
 
-#: src/multitrack.c:7096
+#: src/multitrack.c:7272
 msgid "_Region end to timecode"
 msgstr ""
 
-#: src/multitrack.c:7110
+#: src/multitrack.c:7286
 msgid "Select/deselect block at current track/time"
 msgstr ""
 
-#: src/multitrack.c:7135
+#: src/multitrack.c:7311
 msgid "_Change width, height and audio values..."
 msgstr ""
 
-#: src/multitrack.c:7194
+#: src/multitrack.c:7370
 msgid "_Render"
 msgstr ""
 
-#: src/multitrack.c:7205
+#: src/multitrack.c:7381
 msgid "_Render all to new clip"
 msgstr ""
 
-#: src/multitrack.c:7220
+#: src/multitrack.c:7396
 msgid "Render _video"
 msgstr ""
 
-#: src/multitrack.c:7225
+#: src/multitrack.c:7401
 msgid "Render _audio"
 msgstr ""
 
-#: src/multitrack.c:7235
+#: src/multitrack.c:7411
 msgid "_Normalise rendered audio"
 msgstr ""
 
-#: src/multitrack.c:7242
+#: src/multitrack.c:7418
 msgid "_Pre-render audio"
 msgstr ""
 
-#: src/multitrack.c:7251
+#: src/multitrack.c:7427
 msgid "_View"
 msgstr ""
 
-#: src/multitrack.c:7270
+#: src/multitrack.c:7446
 msgid "Block _In/out points"
 msgstr ""
 
-#: src/multitrack.c:7279
+#: src/multitrack.c:7455
 msgid "_Effects at current"
 msgstr ""
 
-#: src/multitrack.c:7297
+#: src/multitrack.c:7473
 msgid "Audio parameters"
 msgstr ""
 
-#: src/multitrack.c:7308
+#: src/multitrack.c:7484
 msgid "Show backing _audio track"
 msgstr ""
 
-#: src/multitrack.c:7312
+#: src/multitrack.c:7488
 msgid "Compact view"
 msgstr ""
 
-#: src/multitrack.c:7320
+#: src/multitrack.c:7496
 msgid "Maximum tracks to display..."
 msgstr ""
 
-#: src/multitrack.c:7327
+#: src/multitrack.c:7503
 msgid "Scroll to follow playback"
 msgstr ""
 
-#: src/multitrack.c:7331
+#: src/multitrack.c:7507
 msgid "_Center on cursor"
 msgstr ""
 
-#: src/multitrack.c:7338
+#: src/multitrack.c:7514
 msgid "_Zoom in"
 msgstr ""
 
-#: src/multitrack.c:7349
+#: src/multitrack.c:7525
 msgid "_Zoom out"
 msgstr ""
 
-#: src/multitrack.c:7361
+#: src/multitrack.c:7537
 msgid "Multitrack _details"
 msgstr ""
 
-#: src/multitrack.c:7374
+#: src/multitrack.c:7550
 msgid "_Event Window"
 msgstr ""
 
-#: src/multitrack.c:7378
+#: src/multitrack.c:7554
 msgid "_Event Window (selected time only)"
 msgstr ""
 
-#: src/multitrack.c:7382
+#: src/multitrack.c:7558
 msgid "_Show FRAME events"
 msgstr ""
 
-#: src/multitrack.c:7399
+#: src/multitrack.c:7575
 msgid "_Show multitrack keys"
 msgstr ""
 
-#: src/multitrack.c:7468
+#: src/multitrack.c:7644
 msgid "Mouse mode: _Move"
 msgstr ""
 
-#: src/multitrack.c:7476
+#: src/multitrack.c:7652
 msgid "Mouse mode: _Select"
 msgstr ""
 
-#: src/multitrack.c:7505
+#: src/multitrack.c:7681
 msgid "Insert mode: _Normal"
 msgstr ""
 
-#: src/multitrack.c:7733
+#: src/multitrack.c:7909
 msgid "Insert with _audio"
 msgstr ""
 
-#: src/multitrack.c:7734
+#: src/multitrack.c:7910
 msgid ""
 "Select whether video clips are inserted and moved with their audio or not"
 msgstr ""
 
-#: src/multitrack.c:7829
+#: src/multitrack.c:8007
 msgid "Select _overlap"
 msgstr ""
 
-#: src/multitrack.c:7830
+#: src/multitrack.c:8008
 msgid ""
 "Select whether timeline selection snaps to overlap between selected tracks "
 "or not"
 msgstr ""
 
-#: src/multitrack.c:7894 src/multitrack.c:14198
+#: src/multitrack.c:8073 src/multitrack.c:14422
 msgid "Expanded View (d)"
 msgstr ""
 
-#: src/multitrack.c:7897 src/multitrack.c:14205
+#: src/multitrack.c:8076 src/multitrack.c:14428
 msgid "Compact View (d)"
 msgstr ""
 
-#: src/multitrack.c:7939
+#: src/multitrack.c:8118
 msgid "Gravity: _Normal"
 msgstr ""
 
-#: src/multitrack.c:7952
+#: src/multitrack.c:8131
 msgid "Gravity: _Left"
 msgstr ""
 
-#: src/multitrack.c:7967
+#: src/multitrack.c:8146
 msgid "Gravity: _Right"
 msgstr ""
 
-#: src/multitrack.c:8297
+#: src/multitrack.c:8496
 msgid "_Apply"
 msgstr ""
 
-#: src/multitrack.c:8319
+#: src/multitrack.c:8518
 msgid "Time"
 msgstr ""
 
-#: src/multitrack.c:8333
+#: src/multitrack.c:8532
 msgid "_Del. node"
 msgstr ""
 
-#: src/multitrack.c:8341
+#: src/multitrack.c:8540
 msgid "_Next node"
 msgstr ""
 
-#: src/multitrack.c:8349
+#: src/multitrack.c:8548
 msgid "_Prev node"
 msgstr ""
 
-#: src/multitrack.c:8373
+#: src/multitrack.c:8574
 msgid "_Reverse playback  "
 msgstr ""
 
-#: src/multitrack.c:8395
+#: src/multitrack.c:8596
 msgid "_Velocity  "
 msgstr ""
 
-#: src/multitrack.c:8464
+#: src/multitrack.c:8664
 msgid "Anchor _start"
 msgstr ""
 
-#: src/multitrack.c:8465
+#: src/multitrack.c:8665
 msgid "Anchor the start point to the timeline"
 msgstr ""
 
-#: src/multitrack.c:8481
-msgid "Start frame"
-msgstr ""
-
-#: src/multitrack.c:8533
+#: src/multitrack.c:8728
 msgid "Anchor _end"
 msgstr ""
 
-#: src/multitrack.c:8534
+#: src/multitrack.c:8729
 msgid "Anchor the end point to the timeline"
 msgstr ""
 
-#: src/multitrack.c:8546
-msgid "End frame"
-msgstr ""
-
-#: src/multitrack.c:8739
+#: src/multitrack.c:8929
 msgid "Scroll"
 msgstr ""
 
-#: src/multitrack.c:9316
+#: src/multitrack.c:9502
 msgid ""
 "\n"
 "==============================\n"
 "Switched to Clip Edit mode\n"
 msgstr ""
 
-#: src/multitrack.c:9502
+#: src/multitrack.c:9708
 msgid "Timeline (seconds)"
 msgstr ""
 
-#: src/multitrack.c:9984
+#: src/multitrack.c:10202
 msgid " Backing audio"
 msgstr ""
 
-#: src/multitrack.c:9987
+#: src/multitrack.c:10204
 #, c-format
 msgid " Layer %d audio"
 msgstr ""
 
-#: src/multitrack.c:9995
+#: src/multitrack.c:10212
 msgid "Show/hide audio details"
 msgstr ""
 
-#: src/multitrack.c:10010 src/multitrack.c:10232
+#: src/multitrack.c:10227 src/multitrack.c:10452
 #, c-format
 msgid "Layer %d audio"
 msgstr ""
 
-#: src/multitrack.c:10144 src/multitrack.c:10261
+#: src/multitrack.c:10353 src/multitrack.c:10481
 #, c-format
 msgid "%s (layer %d)"
 msgstr ""
 
-#: src/multitrack.c:10184
+#: src/multitrack.c:10403
 msgid "Select track"
 msgstr ""
 
-#: src/multitrack.c:10188
+#: src/multitrack.c:10407
 msgid "Show/hide audio"
 msgstr ""
 
-#: src/multitrack.c:10194
+#: src/multitrack.c:10413
 #, c-format
 msgid "Video %d"
 msgstr ""
 
-#: src/multitrack.c:10233
+#: src/multitrack.c:10453
 #, c-format
 msgid " %s"
 msgstr ""
 
-#: src/multitrack.c:10346
+#: src/multitrack.c:10574
 msgid "LiVES: Selected effect"
 msgstr ""
 
-#: src/multitrack.c:10358
+#: src/multitrack.c:10586
 msgid "_View/Edit this effect"
 msgstr ""
 
-#: src/multitrack.c:10361
+#: src/multitrack.c:10588
 msgid "_View this effect"
 msgstr ""
 
-#: src/multitrack.c:10369
+#: src/multitrack.c:10596
 msgid "_Delete this effect"
 msgstr ""
 
-#: src/multitrack.c:10422
+#: src/multitrack.c:10648
 msgid "Cannot insert after this effect"
 msgstr ""
 
-#: src/multitrack.c:10451
+#: src/multitrack.c:10677
 msgid "This effect cannot be moved"
 msgstr ""
 
-#: src/multitrack.c:10499
+#: src/multitrack.c:10724
 #, c-format
 msgid "  %d to %d selected  "
 msgstr ""
 
-#: src/multitrack.c:10502 src/multitrack.c:10746
+#: src/multitrack.c:10727 src/multitrack.c:10968
 #, c-format
 msgid "%.2f sec."
 msgstr ""
 
-#: src/multitrack.c:10717
+#: src/multitrack.c:10940
 #, c-format
 msgid "%d frames"
 msgstr ""
 
-#: src/multitrack.c:11070
+#: src/multitrack.c:11299
 msgid ""
 "\n"
 "==============================\n"
 "Switched to Multitrack mode\n"
 msgstr ""
 
-#: src/multitrack.c:12691
+#: src/multitrack.c:12939
 msgid "Drag the time slider to where you"
 msgstr ""
 
-#: src/multitrack.c:12692
+#: src/multitrack.c:12940
 msgid "want to set effect parameters"
 msgstr ""
 
-#: src/multitrack.c:12693
+#: src/multitrack.c:12941
 msgid "Set parameters, then click \"Apply\"\n"
 msgstr ""
 
-#: src/multitrack.c:12694
+#: src/multitrack.c:12942
 msgid ""
 "NODES are points where parameters\n"
 "have been set.\n"
 "Nodes can be deleted."
 msgstr ""
 
-#: src/multitrack.c:12697
+#: src/multitrack.c:12944
 msgid "Effect has no parameters.\n"
 msgstr ""
 
-#: src/multitrack.c:12788
+#: src/multitrack.c:13033
 #, c-format
 msgid "%s output"
 msgstr ""
 
-#: src/multitrack.c:12794 src/multitrack.c:12804
+#: src/multitrack.c:13038 src/multitrack.c:13046
 #, c-format
 msgid "layer %d"
 msgstr ""
 
-#: src/multitrack.c:12796 src/multitrack.c:12806
+#: src/multitrack.c:13039 src/multitrack.c:13047
 msgid "audio track"
 msgstr ""
 
-#: src/multitrack.c:12797
+#: src/multitrack.c:13040
 #, c-format
 msgid "%s to %s"
 msgstr ""
 
-#: src/multitrack.c:12807
+#: src/multitrack.c:13048
 #, c-format
 msgid "%s from %s"
 msgstr ""
 
-#: src/multitrack.c:12860
+#: src/multitrack.c:13099
 msgid "_Prev filter map"
 msgstr ""
 
-#: src/multitrack.c:12871
+#: src/multitrack.c:13110
 msgid "Insert _before"
 msgstr ""
 
-#: src/multitrack.c:12881
+#: src/multitrack.c:13120
 msgid "Insert _after"
 msgstr ""
 
-#: src/multitrack.c:12896
+#: src/multitrack.c:13134
 msgid "_Next filter map"
 msgstr ""
 
-#: src/multitrack.c:12911
+#: src/multitrack.c:13148
 msgid ""
 "\n"
 "\n"
@@ -9061,271 +9064,271 @@
 "current time.\n"
 msgstr ""
 
-#: src/multitrack.c:12929
+#: src/multitrack.c:13166
 msgid ""
 "Drag a compositor anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:12936
+#: src/multitrack.c:13173
 msgid ""
 "Drag a transition anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:12944
+#: src/multitrack.c:13181
 msgid ""
 "Effects can be dragged\n"
 "onto blocks on the timeline."
 msgstr ""
 
-#: src/multitrack.c:13166
+#: src/multitrack.c:13406
 msgid "LiVES: Selected block/frame"
 msgstr ""
 
-#: src/multitrack.c:13173
+#: src/multitrack.c:13413
 msgid "_Select this block"
 msgstr ""
 
-#: src/multitrack.c:13183
+#: src/multitrack.c:13423
 msgid "_Split block here"
 msgstr ""
 
-#: src/multitrack.c:13191
+#: src/multitrack.c:13431
 msgid "List _effects here"
 msgstr ""
 
-#: src/multitrack.c:13200 src/multitrack.c:13277
+#: src/multitrack.c:13440 src/multitrack.c:13518
 #, c-format
 msgid "_Adjust %s"
 msgstr ""
 
-#: src/multitrack.c:13215
+#: src/multitrack.c:13455
 msgid "_Delete this block"
 msgstr ""
 
-#: src/multitrack.c:13258
+#: src/multitrack.c:13500
 msgid "_Insert here"
 msgstr ""
 
-#: src/multitrack.c:13264
+#: src/multitrack.c:13505
 msgid "_Insert audio here"
 msgstr ""
 
-#: src/multitrack.c:14801
+#: src/multitrack.c:15017
 #, c-format
 msgid "Inserted gap in selected tracks from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:14835
+#: src/multitrack.c:15048
 #, c-format
 msgid "Inserted gap in track %s from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15036
+#: src/multitrack.c:15244
 #, c-format
 msgid "Undid %s\n"
 msgstr ""
 
-#: src/multitrack.c:15235
+#: src/multitrack.c:15445
 #, c-format
 msgid "Redid %s\n"
 msgstr ""
 
-#: src/multitrack.c:15268
+#: src/multitrack.c:15475
 msgid ""
 "\n"
 " (variable)"
 msgstr ""
 
-#: src/multitrack.c:15502 src/multitrack.c:15614 src/multitrack.c:18736
-#: src/multitrack.c:18748
+#: src/multitrack.c:15710 src/multitrack.c:15823 src/multitrack.c:19077
+#: src/multitrack.c:19089
 #, c-format
 msgid "track %s"
 msgstr ""
 
-#: src/multitrack.c:15507 src/multitrack.c:15619 src/multitrack.c:18741
+#: src/multitrack.c:15715 src/multitrack.c:15828 src/multitrack.c:19082
 #, c-format
 msgid "tracks %s and %s"
 msgstr ""
 
-#: src/multitrack.c:15513 src/multitrack.c:15625 src/multitrack.c:18751
+#: src/multitrack.c:15721 src/multitrack.c:15834 src/multitrack.c:19091
 msgid "selected tracks"
 msgstr ""
 
-#: src/multitrack.c:15516
+#: src/multitrack.c:15726
 #, c-format
 msgid "Added %s %s to %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15550
+#: src/multitrack.c:15760
 #, c-format
 msgid "Added effect %s to track %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15631
+#: src/multitrack.c:15845
 #, c-format
 msgid "Deleted %s %s from %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15935
+#: src/multitrack.c:16143
 #, c-format
 msgid "rendered %d frames to new clip.\n"
 msgstr ""
 
-#: src/multitrack.c:16025
+#: src/multitrack.c:16230
 msgid "Cleaning up..."
 msgstr ""
 
-#: src/multitrack.c:16712
+#: src/multitrack.c:17003
 msgid "_Pause"
 msgstr ""
 
-#: src/multitrack.c:16713
+#: src/multitrack.c:17004
 msgid "Pause (p)"
 msgstr ""
 
-#: src/multitrack.c:16856
+#: src/multitrack.c:17151
 msgid "Press 'm' during playback"
 msgstr ""
 
-#: src/multitrack.c:16857
+#: src/multitrack.c:17152
 msgid "to make a mark on the timeline"
 msgstr ""
 
-#: src/multitrack.c:17154
+#: src/multitrack.c:17498
 #, c-format
 msgid ""
 "Inserted audio %.4f to %.4f from clip %s into backing audio from time %.4f "
 "to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:17414
+#: src/multitrack.c:17759
 #, c-format
 msgid ""
 "Inserted frames %d to %d from clip %s into track %s from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:17998
+#: src/multitrack.c:18332
 #, c-format
 msgid ""
 "Time region %.3f to %.3f\n"
 "selected.\n"
 msgstr ""
 
-#: src/multitrack.c:18002
+#: src/multitrack.c:18336
 msgid ""
 "select one or more tracks\n"
 "to create a region.\n"
 msgstr ""
 
-#: src/multitrack.c:18004
+#: src/multitrack.c:18337
 #, c-format
 msgid "%d video tracks selected.\n"
 msgstr ""
 
-#: src/multitrack.c:18006
+#: src/multitrack.c:18339
 msgid ""
 "Double click on timeline\n"
 "to deselect time region."
 msgstr ""
 
-#: src/multitrack.c:18013
+#: src/multitrack.c:18346
 msgid ""
 "Single click on an effect\n"
 "to select it."
 msgstr ""
 
-#: src/multitrack.c:18014
+#: src/multitrack.c:18347
 msgid ""
 "Double click on an effect\n"
 "to edit it."
 msgstr ""
 
-#: src/multitrack.c:18015
+#: src/multitrack.c:18348
 msgid ""
 "Right click on an effect\n"
 "for context menu.\n"
 msgstr ""
 
-#: src/multitrack.c:18017
+#: src/multitrack.c:18350
 msgid ""
 "Effect order can be changed at\n"
 "FILTER MAPS"
 msgstr ""
 
-#: src/multitrack.c:18024
+#: src/multitrack.c:18357
 msgid ""
 "You can select an effect,\n"
 "then use the INSERT BEFORE"
 msgstr ""
 
-#: src/multitrack.c:18025
+#: src/multitrack.c:18358
 msgid "or INSERT AFTER buttons to move it."
 msgstr ""
 
-#: src/multitrack.c:18307 src/multitrack.c:18320
+#: src/multitrack.c:18639 src/multitrack.c:18652
 msgid "Click on another effect,"
 msgstr ""
 
-#: src/multitrack.c:18308 src/multitrack.c:18321
+#: src/multitrack.c:18640 src/multitrack.c:18653
 msgid ""
 "and the selected one\n"
 "will be inserted"
 msgstr ""
 
-#: src/multitrack.c:18309
+#: src/multitrack.c:18641
 msgid "after it.\n"
 msgstr ""
 
-#: src/multitrack.c:18322
+#: src/multitrack.c:18654
 msgid "before it.\n"
 msgstr ""
 
-#: src/multitrack.c:18551
+#: src/multitrack.c:18889
 #, c-format
 msgid "Removed parameter values for effect %s at time %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:18759
+#: src/multitrack.c:19100
 #, c-format
 msgid "Set parameter values for %s %s on %s at time %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:19251 src/multitrack.c:20873
+#: src/multitrack.c:19630 src/multitrack.c:21195
 msgid "_Autoreload each time"
 msgstr ""
 
-#: src/multitrack.c:19323
+#: src/multitrack.c:19702
 msgid "Saving layout"
 msgstr ""
 
-#: src/multitrack.c:19345
+#: src/multitrack.c:19725
 #, c-format
 msgid "Saved layout to %s\n"
 msgstr ""
 
-#: src/multitrack.c:20783
+#: src/multitrack.c:21125
 msgid "clips and frames"
 msgstr ""
 
-#: src/multitrack.c:20787
+#: src/multitrack.c:21128
 msgid "clips"
 msgstr ""
 
-#: src/multitrack.c:20790
+#: src/multitrack.c:21130
 msgid "frames"
 msgstr ""
 
-#: src/multitrack.c:20800
+#: src/multitrack.c:21140
 msgid ""
 "\n"
 "Auto reload layout.\n"
 msgstr ""
 
-#: src/multitrack.c:20803
+#: src/multitrack.c:21143
 #, c-format
 msgid ""
 "%s\n"
@@ -9333,100 +9336,100 @@
 "Therefore it could not be loaded properly.\n"
 msgstr ""
 
-#: src/multitrack.c:20920
+#: src/multitrack.c:21284
 msgid "auto backup"
 msgstr ""
 
-#: src/multitrack.c:20923
+#: src/multitrack.c:21287
 #, c-format
 msgid ""
 "\n"
 "Unable to load layout file %s\n"
 msgstr ""
 
-#: src/multitrack.c:20944
+#: src/multitrack.c:21308
 #, c-format
 msgid "Loading layout from %s..."
 msgstr ""
 
-#: src/multitrack.c:20978
+#: src/multitrack.c:21338
 #, c-format
 msgid "Got %d events...processing..."
 msgstr ""
 
-#: src/multitrack.c:20991
+#: src/multitrack.c:21349
 msgid "Checking and rebuilding event list"
 msgstr ""
 
-#: src/multitrack.c:21017
+#: src/multitrack.c:21374
 #, c-format
 msgid "%d errors detected.\n"
 msgstr ""
 
-#: src/multitrack.c:21068
+#: src/multitrack.c:21422
 #, c-format
 msgid "Multitrack fps set to %.3f\n"
 msgstr ""
 
-#: src/multitrack.c:21225
+#: src/multitrack.c:21576
 msgid ""
 "The current layout has changes which have not been saved.\n"
 "Are you sure you wish to wipe it ?\n"
 msgstr ""
 
-#: src/multitrack.c:22047
+#: src/multitrack.c:22385
 msgid "LiVES: Multitrack audio mixer"
 msgstr ""
 
-#: src/multitrack.c:22077
+#: src/multitrack.c:22414
 msgid "_Reset values"
 msgstr ""
 
-#: src/multitrack.c:22081
+#: src/multitrack.c:22418
 msgid "_Close mixer"
 msgstr ""
 
-#: src/multitrack.c:22130
+#: src/multitrack.c:22466
 msgid ""
 "_Invert backing audio\n"
 "and layer volumes"
 msgstr ""
 
-#: src/multitrack.c:22132
+#: src/multitrack.c:22468
 msgid "Adjust backing and layer audio values so that they sum to 1.0"
 msgstr ""
 
-#: src/multitrack.c:22175
+#: src/multitrack.c:22510
 msgid "_Gang layer audio"
 msgstr ""
 
-#: src/multitrack.c:22177
+#: src/multitrack.c:22512
 msgid "Adjust all layer audio values to the same value"
 msgstr ""
 
-#: src/jack.c:104
+#: src/jack.c:102
 msgid "JACK server started\n"
 msgstr ""
 
-#: src/jack.c:1284 src/jack.c:1353
+#: src/jack.c:1265 src/jack.c:1334
 msgid "Unable to connect to JACK server\n"
 msgstr ""
 
-#: src/jack.c:1512
+#: src/jack.c:1491
 msgid "Started jack audio subsystem.\n"
 msgstr ""
 
-#: src/jack.c:1623
+#: src/jack.c:1600
 msgid "Started jack audio reader.\n"
 msgstr ""
 
-#: src/jack.c:1838
+#: src/jack.c:1815
 msgid ""
 "\n"
 "Connection to jack audio was reset.\n"
 msgstr ""
 
-#: src/pulse.c:87
+#: src/pulse.c:88
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -9434,7 +9437,7 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:92
+#: src/pulse.c:94
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -9442,7 +9445,7 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:96
+#: src/pulse.c:99
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -9450,335 +9453,335 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:101
+#: src/pulse.c:104
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
 msgstr ""
 
-#: src/pulse.c:107
+#: src/pulse.c:109
 msgid "LiVES will exit and you can choose another audio player.\n"
 msgstr ""
 
-#: src/pulse.c:1352
+#: src/pulse.c:1335
 msgid ""
 "\n"
 "Connection to pulse audio was reset.\n"
 msgstr ""
 
-#: src/colourspace.c:1100
+#: src/colourspace.c:1092
 msgid "unclamped"
 msgstr ""
 
-#: src/colourspace.c:1101
+#: src/colourspace.c:1093
 msgid "clamped"
 msgstr ""
 
-#: src/omc-learn.c:195
+#: src/omc-learn.c:191
 #, c-format
 msgid "Responding to joystick events from %s\n"
 msgstr ""
 
-#: src/omc-learn.c:289
+#: src/omc-learn.c:279
 msgid "Creating ALSA seq port..."
 msgstr ""
 
-#: src/omc-learn.c:325
+#: src/omc-learn.c:313
 #, c-format
 msgid "Responding to MIDI events from %s\n"
 msgstr ""
 
-#: src/omc-learn.c:568
+#: src/omc-learn.c:554
 msgid "data"
 msgstr ""
 
-#: src/omc-learn.c:571
+#: src/omc-learn.c:557
 msgid "velocity"
 msgstr ""
 
-#: src/omc-learn.c:572
+#: src/omc-learn.c:558
 msgid "note"
 msgstr ""
 
-#: src/omc-learn.c:574 src/omc-learn.c:736 src/omc-learn.c:1105
-#: src/omc-learn.c:1591 src/omc-learn.c:1640
+#: src/omc-learn.c:560 src/omc-learn.c:724 src/omc-learn.c:1092
+#: src/omc-learn.c:1581 src/omc-learn.c:1630
 msgid "value"
 msgstr ""
 
-#: src/omc-learn.c:576
+#: src/omc-learn.c:562
 msgid "state"
 msgstr ""
 
-#: src/omc-learn.c:688
+#: src/omc-learn.c:674
 msgid "variable"
 msgstr ""
 
-#: src/omc-learn.c:1001
+#: src/omc-learn.c:989
 msgid "Vars."
 msgstr ""
 
-#: src/omc-learn.c:1054
+#: src/omc-learn.c:1041
 #, c-format
 msgid "MIDI ch %d note on"
 msgstr ""
 
-#: src/omc-learn.c:1058
+#: src/omc-learn.c:1045
 #, c-format
 msgid "MIDI ch %d note off"
 msgstr ""
 
-#: src/omc-learn.c:1062
+#: src/omc-learn.c:1049
 #, c-format
 msgid "MIDI ch %d controller %d"
 msgstr ""
 
-#: src/omc-learn.c:1066
+#: src/omc-learn.c:1053
 #, c-format
 msgid "MIDI ch %d pitch bend"
 msgstr ""
 
-#: src/omc-learn.c:1070
+#: src/omc-learn.c:1057
 #, c-format
 msgid "MIDI ch %d pgm change"
 msgstr ""
 
-#: src/omc-learn.c:1073
+#: src/omc-learn.c:1060
 #, c-format
 msgid "Joystick button %d"
 msgstr ""
 
-#: src/omc-learn.c:1076
+#: src/omc-learn.c:1063
 #, c-format
 msgid "Joystick axis %d"
 msgstr ""
 
-#: src/omc-learn.c:1113
+#: src/omc-learn.c:1100
 msgid "x"
 msgstr ""
 
-#: src/omc-learn.c:1122
+#: src/omc-learn.c:1109
 msgid "range"
 msgstr ""
 
-#: src/omc-learn.c:1143
+#: src/omc-learn.c:1130
 msgid "+ offset1"
 msgstr ""
 
-#: src/omc-learn.c:1161
+#: src/omc-learn.c:1150
 msgid "* scale"
 msgstr ""
 
-#: src/omc-learn.c:1179
+#: src/omc-learn.c:1170
 msgid "+ offset2"
 msgstr ""
 
-#: src/omc-learn.c:1280
+#: src/omc-learn.c:1270
 msgid ""
 "\n"
 "Click OK to delete all entries\n"
 msgstr ""
 
-#: src/omc-learn.c:1318
+#: src/omc-learn.c:1308
 msgid "LiVES: OMC learner"
 msgstr ""
 
-#: src/omc-learn.c:1334
+#: src/omc-learn.c:1324
 msgid "Clear _unmatched"
 msgstr ""
 
-#: src/omc-learn.c:1345
+#: src/omc-learn.c:1335
 msgid "_Delete all"
 msgstr ""
 
-#: src/omc-learn.c:1411
+#: src/omc-learn.c:1401
 msgid "Start video playback"
 msgstr ""
 
-#: src/omc-learn.c:1414
+#: src/omc-learn.c:1404
 msgid "Stop video playback"
 msgstr ""
 
-#: src/omc-learn.c:1418
+#: src/omc-learn.c:1408
 msgid "Clip select <clipnum>"
 msgstr ""
 
-#: src/omc-learn.c:1419
+#: src/omc-learn.c:1409
 msgid "Switch foreground clip to the nth valid clip"
 msgstr ""
 
-#: src/omc-learn.c:1423
+#: src/omc-learn.c:1413
 msgid "Play forwards"
 msgstr ""
 
-#: src/omc-learn.c:1424
+#: src/omc-learn.c:1414
 msgid "Play video in a forwards direction"
 msgstr ""
 
-#: src/omc-learn.c:1427
+#: src/omc-learn.c:1417
 msgid "Play backwards"
 msgstr ""
 
-#: src/omc-learn.c:1428
+#: src/omc-learn.c:1418
 msgid "Play video in a backwards direction"
 msgstr ""
 
-#: src/omc-learn.c:1431
+#: src/omc-learn.c:1421
 msgid "Reverse playback direction"
 msgstr ""
 
-#: src/omc-learn.c:1432
+#: src/omc-learn.c:1422
 msgid "Reverse direction of video playback"
 msgstr ""
 
-#: src/omc-learn.c:1435
+#: src/omc-learn.c:1425
 msgid "Play video faster"
 msgstr ""
 
-#: src/omc-learn.c:1436
+#: src/omc-learn.c:1426
 msgid "Play video at a slightly faster rate"
 msgstr ""
 
-#: src/omc-learn.c:1439
+#: src/omc-learn.c:1429
 msgid "Play video slower"
 msgstr ""
 
-#: src/omc-learn.c:1440
+#: src/omc-learn.c:1430
 msgid "Play video at a slightly slower rate"
 msgstr ""
 
-#: src/omc-learn.c:1443
+#: src/omc-learn.c:1433
 msgid "Toggle video freeze"
 msgstr ""
 
-#: src/omc-learn.c:1444
+#: src/omc-learn.c:1434
 msgid "Freeze video, or if already frozen, unfreeze it"
 msgstr ""
 
-#: src/omc-learn.c:1447
+#: src/omc-learn.c:1437
 msgid "Set video framerate to <fps>"
 msgstr ""
 
-#: src/omc-learn.c:1448
+#: src/omc-learn.c:1438
 msgid "Set framerate of foreground clip to <float fps>"
 msgstr ""
 
-#: src/omc-learn.c:1452
+#: src/omc-learn.c:1442
 msgid "Start recording"
 msgstr ""
 
-#: src/omc-learn.c:1455
+#: src/omc-learn.c:1445
 msgid "Stop recording"
 msgstr ""
 
-#: src/omc-learn.c:1458
+#: src/omc-learn.c:1448
 msgid "Toggle recording state"
 msgstr ""
 
-#: src/omc-learn.c:1461
+#: src/omc-learn.c:1451
 msgid "Swap foreground and background clips"
 msgstr ""
 
-#: src/omc-learn.c:1463
+#: src/omc-learn.c:1453
 msgid "Reset effect keys"
 msgstr ""
 
-#: src/omc-learn.c:1464
+#: src/omc-learn.c:1454
 msgid "Switch all effects off."
 msgstr ""
 
-#: src/omc-learn.c:1467
+#: src/omc-learn.c:1457
 msgid "Enable effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1471
+#: src/omc-learn.c:1461
 msgid "Disable effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1475
+#: src/omc-learn.c:1465
 msgid "Toggle effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1479
+#: src/omc-learn.c:1469
 msgid "Set parameter value <key> <pnum> = <value>"
 msgstr ""
 
-#: src/omc-learn.c:1480
+#: src/omc-learn.c:1470
 msgid "Set <value> of pth (numerical) parameter for effect key <key>."
 msgstr ""
 
-#: src/omc-learn.c:1484
+#: src/omc-learn.c:1474
 msgid "Switch foreground to next clip"
 msgstr ""
 
-#: src/omc-learn.c:1487
+#: src/omc-learn.c:1477
 msgid "Switch foreground to previous clip"
 msgstr ""
 
-#: src/omc-learn.c:1490
+#: src/omc-learn.c:1480
 msgid "Set video framerate to ratio <fps_ratio>"
 msgstr ""
 
-#: src/omc-learn.c:1491
+#: src/omc-learn.c:1481
 msgid "Set framerate ratio of foreground clip to <float fps_ratio>"
 msgstr ""
 
-#: src/omc-learn.c:1495
+#: src/omc-learn.c:1485
 msgid "Retrigger clip <clipnum>"
 msgstr ""
 
-#: src/omc-learn.c:1496
+#: src/omc-learn.c:1486
 msgid ""
 "Switch foreground clip to the nth valid clip, and reset the frame number"
 msgstr ""
 
-#: src/omc-learn.c:1500
+#: src/omc-learn.c:1490
 msgid "Cycle to next mode for effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1504
+#: src/omc-learn.c:1494
 msgid "Cycle to previous mode for effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1508
+#: src/omc-learn.c:1498
 msgid "Set playback plugin parameter value <pnum> = <value>"
 msgstr ""
 
-#: src/omc-learn.c:1509
+#: src/omc-learn.c:1499
 msgid "Set <value> of pth parameter for the playback plugin."
 msgstr ""
 
 #. TRANSLATORS: short form of "clip number"
-#: src/omc-learn.c:1536 src/omc-learn.c:1607
+#: src/omc-learn.c:1526 src/omc-learn.c:1597
 msgid "clipnum"
 msgstr ""
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1545
+#: src/omc-learn.c:1535
 msgid "fps"
 msgstr ""
 
 #. TRANSLATORS: as in keyboard key
-#: src/omc-learn.c:1553 src/omc-learn.c:1560 src/omc-learn.c:1567
-#: src/omc-learn.c:1575 src/omc-learn.c:1615 src/omc-learn.c:1623
+#: src/omc-learn.c:1543 src/omc-learn.c:1550 src/omc-learn.c:1557
+#: src/omc-learn.c:1565 src/omc-learn.c:1605 src/omc-learn.c:1613
 msgid "key"
 msgstr ""
 
 #. TRANSLATORS: short form of "parameter number"
-#: src/omc-learn.c:1583 src/omc-learn.c:1632
+#: src/omc-learn.c:1573 src/omc-learn.c:1622
 msgid "pnum"
 msgstr ""
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1599
+#: src/omc-learn.c:1589
 msgid "fps_ratio"
 msgstr ""
 
-#: src/omc-learn.c:2443
+#: src/omc-learn.c:2417
 #, c-format
 msgid "Saving device mapping to file %s..."
 msgstr ""
 
-#: src/omc-learn.c:2527
+#: src/omc-learn.c:2498
 #, c-format
 msgid ""
 "\n"
@@ -9787,7 +9790,7 @@
 "%s\n"
 msgstr ""
 
-#: src/omc-learn.c:2534
+#: src/omc-learn.c:2505
 #, c-format
 msgid ""
 "\n"
@@ -9796,12 +9799,12 @@
 "%s\n"
 msgstr ""
 
-#: src/omc-learn.c:2571
+#: src/omc-learn.c:2541
 #, c-format
 msgid "Loading device mapping from file %s..."
 msgstr ""
 
-#: src/omc-learn.c:2576
+#: src/omc-learn.c:2544
 #, c-format
 msgid ""
 "\n"
@@ -9811,12 +9814,12 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/videodev.c:547
+#: src/videodev.c:539
 #, c-format
 msgid "Unable to open device %s\n"
 msgstr ""
 
-#: src/videodev.c:564
+#: src/videodev.c:554
 #, c-format
 msgid "Opened device %s\n"
 msgstr ""

LiVES-2.2.8.tar.bz2/po/oc.po -> LiVES-2.4.1.tar.bz2/po/oc.po Changed

@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n"
-"POT-Creation-Date: 2015-02-08 17:18-0300\n"
+"POT-Creation-Date: 2015-08-09 14:52-0300\n"
 "PO-Revision-Date: 2013-03-14 12:31+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Occitan (post 1500) <oc@li.org>\n"
@@ -18,8 +18,7 @@
 "X-Launchpad-Export-Date: 2013-03-29 15:04+0000\n"
 "X-Generator: Launchpad (build 16546)\n"
 
-#. TRANSLATORS: do not translate this message
-#: src/main.c:118
+#: src/main.c:128
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -28,22 +27,22 @@
 "http://lives.sourceforge.net/TRANS-README.txt"
 msgstr ""
 
-#: src/main.c:134
+#: src/main.c:153
 #, c-format
 msgid "%s Warning: %s\n"
 msgstr ""
 
-#: src/main.c:138
+#: src/main.c:157
 #, c-format
 msgid "%s Critical error: %s\n"
 msgstr ""
 
-#: src/main.c:139
+#: src/main.c:158
 #, c-format
 msgid "%s Fatal error: %s\n"
 msgstr ""
 
-#: src/main.c:176
+#: src/main.c:198
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -52,7 +51,7 @@
 "Thanks. Recovery should be possible if you restart LiVES.\n"
 msgstr ""
 
-#: src/main.c:177
+#: src/main.c:199
 msgid ""
 "\n"
 "\n"
@@ -60,7 +59,7 @@
 "distribution, and the LiVES version ("
 msgstr ""
 
-#: src/main.c:180
+#: src/main.c:203
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -68,91 +67,91 @@
 "e tota autra informacion indicada çaijós :\n"
 "\n"
 
-#: src/main.c:184
+#: src/main.c:206
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
 "\n"
 msgstr ""
 
-#: src/main.c:192
+#: src/main.c:216
 msgid "Preserving set.\n"
 msgstr "Marca posicionada.\n"
 
-#: src/main.c:636
+#: src/main.c:691
 msgid "Resizing"
 msgstr "Requadratge"
 
-#: src/main.c:643
+#: src/main.c:698
 msgid "_Resize All Frames"
 msgstr "_Requadra Totes Los Imatges"
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:895
+#: src/main.c:948
 msgid "Any"
 msgstr "Quin que siá"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:897
+#: src/main.c:950
 msgid "None"
 msgstr "Pas cap"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:899
+#: src/main.c:952
 msgid "recommended"
 msgstr "recomandat"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:901
+#: src/main.c:954
 msgid "disabled !"
 msgstr "desactivat !"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:903
+#: src/main.c:956
 msgid "**The current layout**"
 msgstr "**La configuracion actuala**"
 
 #. TRANSLATORS: adjective for "Built in" type effects
-#: src/main.c:905
+#: src/main.c:958
 msgid "Builtin"
 msgstr "Integrat"
 
 #. TRANSLATORS: adjective for "Custom" type effects
-#: src/main.c:907
+#: src/main.c:960
 msgid "Custom"
 msgstr "Personalizat"
 
 #. TRANSLATORS: adjective for "Test" type effects
-#: src/main.c:909
+#: src/main.c:962
 msgid "Test"
 msgstr "Testar"
 
-#: src/main.c:1054
+#: src/main.c:1107
 msgid "Foreground"
 msgstr ""
 
-#: src/main.c:1055
+#: src/main.c:1108
 #, fuzzy
 msgid "Background"
 msgstr "_Aviar"
 
-#: src/main.c:1566
+#: src/main.c:1624
 msgid "Loading realtime effect plugins..."
 msgstr "Cargament dels plugins d'efièches en temps real"
 
-#: src/main.c:1631
+#: src/main.c:1690
 msgid "Starting jack audio server..."
 msgstr "Aviada del servidor àudio jack..."
 
-#: src/main.c:1633
+#: src/main.c:1692
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1634
+#: src/main.c:1693
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1663
+#: src/main.c:1723
 #, c-format
 msgid ""
 "\n"
@@ -164,114 +163,114 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1697
+#: src/main.c:1758
 msgid "Starting pulse audio server..."
 msgstr "Inicializacion del servidor àudio pulse..."
 
-#: src/main.c:1765
+#: src/main.c:1825
 msgid "Checking optional dependencies:"
 msgstr "Verificacion de las dependéncias opcionalas :"
 
-#: src/main.c:1766
+#: src/main.c:1826
 msgid "mplayer...detected..."
 msgstr "mplayer....detectat..."
 
-#: src/main.c:1767
+#: src/main.c:1827
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...PAS DETECTAT..."
 
-#: src/main.c:1768
+#: src/main.c:1828
 #, fuzzy
 msgid "mplayer2...detected..."
 msgstr "mplayer....detectat..."
 
-#: src/main.c:1769
+#: src/main.c:1829
 #, fuzzy
 msgid "mplayer2...NOT DETECTED..."
 msgstr "mplayer...PAS DETECTAT..."
 
-#: src/main.c:1770
+#: src/main.c:1830
 msgid "convert...detected..."
 msgstr "convert...detectat..."
 
-#: src/main.c:1771
+#: src/main.c:1831
 msgid "convert...NOT DETECTED..."
 msgstr "convert...PAS DETECTAT..."
 
-#: src/main.c:1772
+#: src/main.c:1832
 msgid "composite...detected..."
 msgstr "composite...detectat..."
 
-#: src/main.c:1773
+#: src/main.c:1833
 msgid "composite...NOT DETECTED..."
 msgstr "composite...PAS DETECTAT..."
 
-#: src/main.c:1774
+#: src/main.c:1834
 msgid "sox...detected\n"
 msgstr "sox...detectat\n"
 
-#: src/main.c:1775
+#: src/main.c:1835
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...PAS DETECTAT\n"
 
-#: src/main.c:1776
+#: src/main.c:1836
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...detectat..."
 
-#: src/main.c:1777
+#: src/main.c:1837
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...PAS DETECTAT..."
 
-#: src/main.c:1778
+#: src/main.c:1838
 msgid "jackd...detected..."
 msgstr "jackd...detectat..."
 
-#: src/main.c:1779
+#: src/main.c:1839
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...PAS DETECTAT..."
 
-#: src/main.c:1780
+#: src/main.c:1840
 msgid "pulse audio...detected..."
 msgstr "pulse audio...detectat..."
 
-#: src/main.c:1781
+#: src/main.c:1841
 msgid "pulse audio...NOT DETECTED..."
 msgstr "pulse audio...PAS DETECTAT..."
 
-#: src/main.c:1782
+#: src/main.c:1842
 msgid "python...detected..."
 msgstr "python...detectat..."
 
-#: src/main.c:1783
+#: src/main.c:1843
 msgid "python...NOT DETECTED..."
 msgstr "python...PAS DETECTAT..."
 
-#: src/main.c:1784
+#: src/main.c:1844
 msgid "dvgrab...detected..."
 msgstr "dvgrab...detectat..."
 
-#: src/main.c:1785
+#: src/main.c:1845
 msgid "dvgrab...NOT DETECTED..."
 msgstr "dvgrab...PAS DETECTAT..."
 
-#: src/main.c:1786
+#: src/main.c:1846
 msgid "xwininfo...detected..."
 msgstr "xwininfo...detectat..."
 
-#: src/main.c:1787
+#: src/main.c:1847
 msgid "xwininfo...NOT DETECTED..."
 msgstr "xwininfo...PAS DETECTAT..."
 
-#: src/main.c:1793
+#: src/main.c:1853
 #, c-format
 msgid "Windows version %04X"
 msgstr ""
 
-#: src/main.c:1795
+#: src/main.c:1855
 msgid "UNKNOWN - please patch me !"
 msgstr ""
 
-#: src/main.c:1799
+#: src/main.c:1859
 #, c-format
 msgid ""
 "\n"
@@ -282,63 +281,63 @@
 "\n"
 "Lo gestionari de fenèstras apareis coma essent  \"%s\"; "
 
-#: src/main.c:1802
+#: src/main.c:1862
 #, c-format
 msgid "number of monitors detected: %d\n"
 msgstr "nombre d'ecrans trobats : %d\n"
 
-#: src/main.c:1805
+#: src/main.c:1865
 #, c-format
 msgid "Number of CPUs detected: %d "
 msgstr ""
 
-#: src/main.c:1808 src/multitrack.c:4902
+#: src/main.c:1868 src/multitrack.c:5068
 msgid "little endian"
 msgstr ""
 
-#: src/main.c:1809 src/multitrack.c:4901
+#: src/main.c:1869 src/multitrack.c:5067
 msgid "big endian"
 msgstr ""
 
-#: src/main.c:1810
+#: src/main.c:1870
 #, c-format
 msgid "(%d bits, %s)\n"
 msgstr ""
 
-#: src/main.c:1814
+#: src/main.c:1874
 msgid "GUI type is: "
 msgstr ""
 
-#: src/main.c:1818
+#: src/main.c:1878
 #, c-format
 msgid "GTK+ version %d.%d.%d (compiled with %d.%d.%d)"
 msgstr ""
 
-#: src/main.c:1840
+#: src/main.c:1900
 msgid ", with cairo support"
 msgstr ""
 
-#: src/main.c:1847
+#: src/main.c:1907
 #, c-format
 msgid "Temp directory is %s\n"
 msgstr "Lo dorsièr temporari es %s\n"
 
-#: src/main.c:1851
+#: src/main.c:1911
 msgid ""
 "WARNING - this version of LiVES was compiled without either\n"
 "jack or pulse audio support.\n"
 "Many audio features will be unavailable.\n"
 msgstr ""
 
-#: src/main.c:1854
+#: src/main.c:1914
 msgid "Compiled with jack support, good !\n"
 msgstr "Compilat amb lo supòrt de jack, plan !\n"
 
-#: src/main.c:1857
+#: src/main.c:1917
 msgid "Compiled with pulse audio support, wonderful !\n"
 msgstr ""
 
-#: src/main.c:1861
+#: src/main.c:1921
 #, c-format
 msgid ""
 "Welcome to LiVES version %s.\n"
@@ -347,7 +346,7 @@
 "Benvenguda sus LiVES version %s.\n"
 "\n"
 
-#: src/main.c:2306
+#: src/main.c:2380
 #, c-format
 msgid ""
 "\n"
@@ -356,129 +355,134 @@
 "\n"
 "La sintaxi d'aviada es : %s [opcions] [nomfichièr [start_time] [frames]]\n"
 
-#: src/main.c:2307
+#: src/main.c:2381
 msgid "Where: filename is the name of a media file or backup file.\n"
 msgstr ""
 
-#: src/main.c:2308
+#: src/main.c:2382
 msgid "start_time : filename start time in seconds\n"
 msgstr ""
 
-#: src/main.c:2309
+#: src/main.c:2383
 msgid "frames : maximum number of frames to open\n"
 msgstr "imatges : nombre maximal d'imatges de dobrir\n"
 
-#: src/main.c:2311
+#: src/main.c:2385
 msgid "opts can be:\n"
 msgstr "opts pòt èsser :\n"
 
-#: src/main.c:2312
+#: src/main.c:2386
 msgid "-help            : show this help text and exit\n"
 msgstr ""
 
-#: src/main.c:2313
+#: src/main.c:2387
 msgid "-tmpdir <tempdir>: use alternate working directory (e.g /var/ramdisk)\n"
 msgstr ""
 
-#: src/main.c:2314
+#: src/main.c:2388
 msgid "-set <setname>   : autoload clip set setname\n"
 msgstr ""
 
-#: src/main.c:2315
+#: src/main.c:2389
 msgid "-noset           : do not load any set on startup\n"
 msgstr ""
 
-#: src/main.c:2316
+#: src/main.c:2390
 msgid "-norecover       : force no-loading of crash recovery\n"
 msgstr ""
 
-#: src/main.c:2317
+#: src/main.c:2391
 msgid "-recover         : force loading of crash recovery\n"
 msgstr ""
 
-#: src/main.c:2318
-msgid "-nothreaddialog  : doe nothing - retained for backwards compatibility\n"
+#: src/main.c:2392
+msgid ""
+"-nothreaddialog  : does nothing - retained for backwards compatibility\n"
 msgstr ""
 
-#: src/main.c:2319
+#: src/main.c:2393
 msgid "-nogui           : do not show the gui\n"
 msgstr "-nogui : avia lo programa sens l'interfàcia grafica.\n"
 
-#: src/main.c:2320
+#: src/main.c:2394
 msgid "-nosplash        : do not show the splash window\n"
 msgstr ""
 
-#: src/main.c:2321
+#: src/main.c:2395
 msgid "-noplaywin       : do not show the play window\n"
 msgstr ""
 
-#: src/main.c:2322
+#: src/main.c:2396
+msgid "-noninteractive  : disable menu interactivity\n"
+msgstr ""
+
+#: src/main.c:2397
 msgid "-startup-ce      : start in clip editor mode\n"
 msgstr ""
 
-#: src/main.c:2323
+#: src/main.c:2398
 msgid "-startup-mt      : start in multitrack mode\n"
 msgstr "-startup-mt : aviar en mòde multipista\n"
 
-#: src/main.c:2324
+#: src/main.c:2399
 msgid ""
 "-fxmodesmax <n>  : allow <n> modes per effect key (minimum is 1, default is "
 "8)\n"
 msgstr ""
 
-#: src/main.c:2326
+#: src/main.c:2401
 msgid "-oscstart <port> : start OSC listener on UDP port <port>\n"
 msgstr ""
 
-#: src/main.c:2327
+#: src/main.c:2402
 msgid "-nooscstart      : do not start OSC listener\n"
 msgstr "-nooscstart  : aviar pas l'escotador OSC\n"
 
-#: src/main.c:2329
+#: src/main.c:2404
 msgid ""
 "-aplayer <ap>    : start with selected audio player. <ap> can be mplayer, "
 "mplayer2"
 msgstr ""
 
 #. TRANSLATORS: pulse (audio)
-#: src/main.c:2332
+#: src/main.c:2407
 msgid ", pulse"
 msgstr ", pulse"
 
-#: src/main.c:2335
+#: src/main.c:2410
 msgid ", sox or jack\n"
 msgstr ", sox o jack\n"
 
-#: src/main.c:2336
+#: src/main.c:2412
 msgid ""
 "-jackopts <opts>    : opts is a bitmap of jack startup options [1 = jack "
 "transport client, 2 = jack transport master, 4 = start jack transport "
 "server, 8 = pause audio when video paused, 16 = start jack audio server] \n"
 msgstr ""
 
-#: src/main.c:2338
+#: src/main.c:2414
 msgid " or sox\n"
 msgstr " o sox\n"
 
-#: src/main.c:2340
+#: src/main.c:2416
 msgid "-devicemap <mapname>          : autoload devicemap\n"
 msgstr ""
 
-#: src/main.c:2341
+#: src/main.c:2418
 msgid ""
 "-vppdefaults <file>          : load video playback plugin defaults from "
 "<file> (Note: only sets the settings, not the plugin type)\n"
 msgstr ""
 
-#: src/main.c:2342
+#: src/main.c:2419
 msgid "-debug            : try to debug crashes (requires 'gdb' installed)\n"
 msgstr ""
 
-#: src/main.c:2373 src/gui.c:1128
+#: src/main.c:2449 src/gui.c:1127
 msgid "Starting GUI..."
 msgstr "Aviada de l'interfàcia grafica..."
 
-#: src/main.c:2396
+#: src/main.c:2475
 #, c-format
 msgid ""
 "\n"
@@ -489,7 +493,7 @@
 "(Maybe you need to change the value of <prefix_dir> in your %s file)\n"
 msgstr ""
 
-#: src/main.c:2410
+#: src/main.c:2492
 #, c-format
 msgid ""
 "\n"
@@ -497,7 +501,7 @@
 "Please make sure you have write access to %s and try again.\n"
 msgstr ""
 
-#: src/main.c:2415
+#: src/main.c:2498
 msgid ""
 "\n"
 "`smogrify` must be in your path, and be executable\n"
@@ -506,7 +510,7 @@
 "before running LiVES.\n"
 msgstr ""
 
-#: src/main.c:2421
+#: src/main.c:2504
 #, c-format
 msgid ""
 "\n"
@@ -516,7 +520,7 @@
 "Please check the file permissions for this file and try again.\n"
 msgstr ""
 
-#: src/main.c:2428
+#: src/main.c:2512
 #, c-format
 msgid ""
 "\n"
@@ -527,7 +531,7 @@
 "and try again.\n"
 msgstr ""
 
-#: src/main.c:2438
+#: src/main.c:2522
 #, c-format
 msgid ""
 "Please check the <tempdir> setting in \n"
@@ -535,7 +539,7 @@
 "and try again.\n"
 msgstr ""
 
-#: src/main.c:2445
+#: src/main.c:2528
 #, c-format
 msgid ""
 "\n"
@@ -545,7 +549,7 @@
 "%s"
 msgstr ""
 
-#: src/main.c:2453
+#: src/main.c:2536
 msgid ""
 "\n"
 "An incorrect version of smogrify was found in your path.\n"
@@ -556,49 +560,49 @@
 "Thankyou.\n"
 msgstr ""
 
-#: src/main.c:2458
+#: src/main.c:2541
 msgid ""
 "\n"
 "LiVES currently requires 'mplayer', 'mplayer2' or 'sox' to function. Please "
 "install one or other of these, and try again.\n"
 msgstr ""
 
-#: src/main.c:2462
+#: src/main.c:2546
 msgid ""
 "\n"
 "LiVES currently requires both 'mplayer' or 'mplayer2' and 'sox' to function. "
 "Please install these, and try again.\n"
 msgstr ""
 
-#: src/main.c:2472
+#: src/main.c:2556
 msgid ""
 "\n"
 "LiVES was unable to locate 'mplayer' or 'mplayer2'. You may wish to install "
 "either one to use LiVES more fully.\n"
 msgstr ""
 
-#: src/main.c:2475
+#: src/main.c:2561
 msgid ""
 "\n"
 "LiVES was unable to locate 'convert'. You should install convert and image-"
 "magick if you want to use rendered effects.\n"
 msgstr ""
 
-#: src/main.c:2478
+#: src/main.c:2566
 msgid ""
 "\n"
 "LiVES was unable to locate 'composite'. You should install composite and "
 "image-magick if you want to use the merge function.\n"
 msgstr ""
 
-#: src/main.c:2481
+#: src/main.c:2570
 msgid ""
 "\n"
 "LiVES was unable to locate 'sox'. Some audio features may not work. You "
 "should install 'sox'.\n"
 msgstr ""
 
-#: src/main.c:2484
+#: src/main.c:2575
 #, c-format
 msgid ""
 "\n"
@@ -609,93 +613,93 @@
 "You may need to change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/main.c:2611
+#: src/main.c:2707
 #, c-format
 msgid "Autoloading set %s..."
 msgstr "En cargant automaticament lo set %s..."
 
 #. TRANSLATORS: localised name may be used here
-#: src/main.c:2781 src/interface.c:738
+#: src/main.c:2902
 msgid "LiVES"
 msgstr ""
 
-#: src/main.c:2948
+#: src/main.c:3066
 #, c-format
 msgid "Invalid audio player %s\n"
 msgstr "Lector àudio invalid %s\n"
 
-#: src/main.c:3077
+#: src/main.c:3214
 #, c-format
 msgid "LiVES-%s: <Untitled%d> %dx%d : %d frames %d bpp %.3f fps"
 msgstr "LiVES-%s: <Sens títol%d> %dx%d : %d quadres %d bpp %.3f fps"
 
-#: src/main.c:3082
+#: src/main.c:3219
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : ??? frames ??? bpp %.3f fps"
 msgstr "LiVES-%s: <%s> %dx%d : ??? quadres ??? bpp %.3f fps"
 
-#: src/main.c:3086
+#: src/main.c:3222
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : %d frames %d bpp %.3f fps"
 msgstr "LiVES-%s: <%s> %dx%d : %d quadres %d bpp %.3f fps"
 
-#: src/main.c:3094
+#: src/main.c:3229
 #, c-format
 msgid "LiVES-%s: <No File>"
 msgstr "LiVES-%s: <Pas de Fichièr>"
 
 #. TRANSLATORS: rec(ord)
-#: src/main.c:5085
+#: src/main.c:5201
 #, c-format
 msgid "rec %9d/%d"
 msgstr ""
 
 #. TRANSLATORS: out of memory (rec(ord))
-#: src/main.c:5091
+#: src/main.c:5206
 #, c-format
 msgid "!rec %9d/%d"
 msgstr ""
 
-#: src/main.c:5398 src/main.c:5399 src/gui.c:2110 src/gui.c:3220
-#: src/saveplay.c:2336
+#: src/main.c:5500 src/main.c:5501 src/gui.c:2108 src/gui.c:3331
+#: src/saveplay.c:2315
 msgid "Play"
 msgstr "Legir"
 
-#: src/main.c:6128
+#: src/main.c:6216
 msgid ""
 "LiVES was unable to capture this image\n"
 "\n"
 msgstr ""
 
-#: src/main.c:6250
+#: src/main.c:6345
 #, c-format
 msgid "Closed file %s\n"
 msgstr "Fichièr Tampat %s\n"
 
-#: src/main.c:6452 src/gui.c:648 src/utils.c:4312 src/utils.c:4344
-#: src/saveplay.c:3550 src/multitrack.c:4510 src/multitrack.c:6268
+#: src/main.c:6542 src/gui.c:647 src/utils.c:4256 src/utils.c:4286
+#: src/saveplay.c:3500 src/multitrack.c:4678 src/multitrack.c:6447
 msgid "_Undo"
 msgstr "_Anullar"
 
-#: src/main.c:6453 src/gui.c:666 src/utils.c:4313 src/utils.c:4345
-#: src/saveplay.c:3551 src/multitrack.c:4531 src/multitrack.c:6293
+#: src/main.c:6543 src/gui.c:665 src/utils.c:4257 src/utils.c:4287
+#: src/saveplay.c:3501 src/multitrack.c:4698 src/multitrack.c:6472
 msgid "_Redo"
 msgstr "_Restablir"
 
-#: src/main.c:6493 src/interface.c:470 src/gui.c:2326 src/preferences.c:2357
-#: src/resample.c:1516
+#: src/main.c:6583 src/interface.c:457 src/gui.c:2324 src/preferences.c:2391
+#: src/resample.c:1488
 msgid "Video"
 msgstr "Vidèo"
 
-#: src/main.c:6494 src/interface.c:483 src/gui.c:2351
+#: src/main.c:6584 src/interface.c:470 src/gui.c:2348
 msgid "Left Audio"
 msgstr "Àudio Esquèrra"
 
-#: src/main.c:6495 src/gui.c:2375
+#: src/main.c:6585 src/gui.c:2371
 msgid "Right Audio"
 msgstr "Àudio Drecha"
 
-#: src/main.c:6540
+#: src/main.c:6630
 msgid ""
 "\n"
 "\n"
@@ -704,11 +708,11 @@
 "Please adjust the playback options in Preferences and try again.\n"
 msgstr ""
 
-#: src/main.c:7051 src/plugins.c:1502
+#: src/main.c:7134 src/plugins.c:1468
 msgid "LiVES: - Play Window"
 msgstr "LiVES: - Fenèstra de Lectura"
 
-#: src/startup.c:25
+#: src/startup.c:24
 #, c-format
 msgid ""
 "A directory named\n"
@@ -718,7 +722,7 @@
 "(Free space = %s)\n"
 msgstr ""
 
-#: src/startup.c:32
+#: src/startup.c:29
 #, c-format
 msgid ""
 "A directory named\n"
@@ -728,7 +732,7 @@
 "Please select another location.\n"
 msgstr ""
 
-#: src/startup.c:49
+#: src/startup.c:46
 #, c-format
 msgid ""
 "\n"
@@ -739,7 +743,7 @@
 "(Free space = %s)"
 msgstr ""
 
-#: src/startup.c:54
+#: src/startup.c:50
 #, c-format
 msgid ""
 "\n"
@@ -748,54 +752,54 @@
 "Please try again and choose a different location.\n"
 msgstr ""
 
-#: src/startup.c:96
+#: src/startup.c:92
 msgid "Directory name is too long !"
 msgstr "Lo nom del dorsièr es tròp long !"
 
-#: src/startup.c:223
+#: src/startup.c:216
 msgid ""
 "LiVES FAILED TO START YOUR SELECTED AUDIO PLAYER !\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:230
+#: src/startup.c:222
 msgid ""
 "Before starting LiVES, you need to choose an audio player.\n"
 "\n"
 "PULSE AUDIO is recommended for most users"
 msgstr ""
 
-#: src/startup.c:233
+#: src/startup.c:225
 msgid ""
 ", but this version of LiVES was not compiled with pulse audio support.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:236
+#: src/startup.c:229
 msgid ""
 ", but you do not have pulse audio installed on your system.\n"
 " You are advised to install pulse audio first before running LiVES.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:241
+#: src/startup.c:233
 msgid "JACK audio is recommended for pro users"
 msgstr ""
 
-#: src/startup.c:244
+#: src/startup.c:236
 msgid ""
 ", but this version of LiVES was not compiled with jack audio support.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:247
+#: src/startup.c:239
 msgid ""
 ", but you do not have jackd installed. You may wish to install jackd first "
 "before running LiVES.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:250
+#: src/startup.c:242
 msgid ""
 ", but may prevent LiVES from starting on some systems.\n"
 "If LiVES will not start with jack, you can restart and try with another "
@@ -803,160 +807,160 @@
 "\n"
 msgstr ""
 
-#: src/startup.c:254
+#: src/startup.c:246
 msgid "SOX may be used if neither of the preceding players work, "
 msgstr ""
 
-#: src/startup.c:257
+#: src/startup.c:249
 msgid ""
 "but some audio features will be disabled.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:260
+#: src/startup.c:251
 msgid ""
 "but you do not have sox installed.\n"
 "You are advised to install it before running LiVES.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:264
+#: src/startup.c:255
 msgid ""
 "The MPLAYER/MPLAYER2 audio player is only recommended for testing purposes.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:281
+#: src/startup.c:271
 msgid "LiVES: - Choose an audio player"
 msgstr "LiVES: - causir un lector àudio"
 
-#: src/startup.c:298
+#: src/startup.c:288
 msgid "Use _pulse audio player"
 msgstr "Utiliza lo lector àudio _pulse"
 
-#: src/startup.c:320
+#: src/startup.c:310
 msgid "Use _jack audio player"
 msgstr "Utilizar lo lector àudio jack"
 
-#: src/startup.c:340
+#: src/startup.c:330
 msgid "Use _sox audio player"
 msgstr "Utiliza lo lector àudio _sox"
 
-#: src/startup.c:361
+#: src/startup.c:351
 msgid "Use _mplayer audio player"
 msgstr "Utiliza lo lector audui _mplayer"
 
-#: src/startup.c:381
+#: src/startup.c:371
 #, fuzzy
 msgid "Use _mplayer2 audio player"
 msgstr "Utiliza lo lector audui _mplayer"
 
-#: src/startup.c:405 src/startup.c:580 src/interface.c:1506
+#: src/startup.c:395 src/startup.c:569 src/interface.c:1398
 msgid "_Next"
 msgstr "_Seguent"
 
-#: src/startup.c:445
+#: src/startup.c:435
 msgid "Skipped"
 msgstr "Evitat"
 
-#: src/startup.c:460
+#: src/startup.c:450
 msgid "Passed"
 msgstr "Capitat"
 
-#: src/startup.c:493
+#: src/startup.c:483
 msgid "Failed"
 msgstr "Fracàs"
 
-#: src/startup.c:552
+#: src/startup.c:542
 msgid "LiVES: - Testing Configuration"
 msgstr ""
 
-#: src/startup.c:555
+#: src/startup.c:544
 msgid "LiVES: - Troubleshoot"
 msgstr ""
 
-#: src/startup.c:568
+#: src/startup.c:557
 msgid "LiVES will now run some basic configuration tests\n"
 msgstr ""
 
-#: src/startup.c:603
+#: src/startup.c:591
 msgid "Checking for \"sox\" presence"
 msgstr "Verificacion de la preséncia de \"sox\""
 
-#: src/startup.c:607
+#: src/startup.c:595
 msgid ""
 "You should install sox to be able to use all the audio features in LiVES"
 msgstr ""
 
-#: src/startup.c:615
+#: src/startup.c:602
 msgid "Checking if sox can convert audio"
 msgstr "Verifica se sox pòt convertir de son"
 
-#: src/startup.c:638
+#: src/startup.c:625
 msgid "Unable to allocate 176400 bytes memory."
 msgstr ""
 
-#: src/startup.c:653
+#: src/startup.c:639
 #, c-format
 msgid "Unable to write to: %s"
 msgstr ""
 
-#: src/startup.c:667 src/startup.c:807
+#: src/startup.c:653 src/startup.c:789
 #, c-format
 msgid "Command failed: %s"
 msgstr "La comanda a fracassat : %s"
 
-#: src/startup.c:689
+#: src/startup.c:675
 msgid "You should install sox_fmt_all or similar"
 msgstr ""
 
-#: src/startup.c:717
+#: src/startup.c:703
 msgid "Checking for \"mplayer\" presence"
 msgstr "Verifica se \"mplayer\" es present"
 
-#: src/startup.c:721
+#: src/startup.c:707
 msgid ""
 "You should install mplayer or mplayer2 to be able to use all the decoding "
 "features in LiVES"
 msgstr ""
 
-#: src/startup.c:747
+#: src/startup.c:732
 msgid "Checking if mplayer can convert audio"
 msgstr "Verifica se mplayer pòt convertir de son"
 
-#: src/startup.c:768
+#: src/startup.c:751
 msgid "You should install mplayer or mplayer2 with pcm/wav support"
 msgstr ""
 
-#: src/startup.c:785
+#: src/startup.c:767
 msgid "Checking if mplayer can decode to png/alpha"
 msgstr ""
 
-#: src/startup.c:828
+#: src/startup.c:810
 msgid "You may wish to upgrade mplayer to a newer version"
 msgstr ""
 
-#: src/startup.c:854
+#: src/startup.c:836
 msgid "Checking if mplayer can decode to jpeg"
 msgstr ""
 
-#: src/startup.c:882
+#: src/startup.c:862
 msgid "You should install mplayer with either png/alpha or jpeg support"
 msgstr ""
 
-#: src/startup.c:883
+#: src/startup.c:863
 msgid "You may wish to add jpeg output support to mplayer"
 msgstr ""
 
-#: src/startup.c:892
+#: src/startup.c:872
 msgid "Checking for \"convert\" presence"
 msgstr ""
 
-#: src/startup.c:896
+#: src/startup.c:876
 msgid "Install imageMagick to be able to use all of the rendered effects"
 msgstr ""
 
-#: src/startup.c:909
+#: src/startup.c:889
 msgid ""
 "\n"
 "\n"
@@ -964,7 +968,7 @@
 "Preferences/Decoding.    \n"
 msgstr ""
 
-#: src/startup.c:915
+#: src/startup.c:894
 msgid ""
 "\n"
 "\n"
@@ -972,49 +976,49 @@
 "continue    \n"
 msgstr ""
 
-#: src/startup.c:949
+#: src/startup.c:928
 msgid ""
 "\n"
 "\n"
 "Finally, you can choose the default startup interface for LiVES.\n"
 msgstr ""
 
-#: src/startup.c:950
+#: src/startup.c:929
 msgid ""
 "\n"
 "\n"
 "LiVES has two main interfaces and you can start up with either of them.\n"
 msgstr ""
 
-#: src/startup.c:951
+#: src/startup.c:930
 msgid ""
 "\n"
 "\n"
 "The default can always be changed later from Preferences.\n"
 msgstr ""
 
-#: src/startup.c:961
+#: src/startup.c:940
 msgid "LiVES: - Choose the startup interface"
 msgstr ""
 
-#: src/startup.c:972
+#: src/startup.c:951
 msgid "Start in _Clip Edit mode"
 msgstr ""
 
-#: src/startup.c:975
+#: src/startup.c:954
 msgid "This is the best choice for simple editing tasks and for VJs\n"
 msgstr ""
 
-#: src/startup.c:981
+#: src/startup.c:960
 msgid "Start in _Multitrack mode"
 msgstr ""
 
-#: src/startup.c:983
+#: src/startup.c:962
 msgid ""
 "This is a better choice for complex editing tasks involving multiple clips.\n"
 msgstr ""
 
-#: src/startup.c:992
+#: src/startup.c:971
 msgid "_Finish"
 msgstr "Aca_bar"
 
@@ -1031,35 +1035,35 @@
 msgid "Apply _Deinterlace"
 msgstr ""
 
-#: src/interface.c:66
+#: src/interface.c:65
 msgid "If this is set, frames will be deinterlaced as they are imported."
 msgstr ""
 
-#: src/interface.c:113 src/callbacks.c:9623 src/callbacks.c:9646
-#: src/callbacks.c:9647 src/gui.c:3223 src/gui.c:3821 src/saveplay.c:2339
-#: src/saveplay.c:3138 src/dialogs.c:1514 src/dialogs.c:1515
-#: src/dialogs.c:1746 src/dialogs.c:1747 src/framedraw.c:238
-#: src/multitrack.c:8031
+#: src/interface.c:106 src/callbacks.c:9542 src/callbacks.c:9564
+#: src/callbacks.c:9565 src/gui.c:3333 src/gui.c:3946 src/saveplay.c:2317
+#: src/saveplay.c:3097 src/dialogs.c:1575 src/dialogs.c:1576
+#: src/dialogs.c:1804 src/dialogs.c:1805 src/framedraw.c:236
+#: src/multitrack.c:8210
 msgid "Preview"
 msgstr "Previsualizacion"
 
-#: src/interface.c:132
+#: src/interface.c:125
 msgid "Click here to _Preview any selected video, image or audio file"
 msgstr ""
 
-#: src/interface.c:135
+#: src/interface.c:127
 msgid "Click here to _Preview any selected audio file"
 msgstr ""
 
-#: src/interface.c:138
+#: src/interface.c:129
 msgid "Click here to _Preview the video"
 msgstr ""
 
-#: src/interface.c:181 src/dialogs.c:2542
+#: src/interface.c:169 src/dialogs.c:2621
 msgid "LiVES: - Processing..."
 msgstr "LiVES: - Tractament..."
 
-#: src/interface.c:217
+#: src/interface.c:205
 msgid ""
 "\n"
 "\n"
@@ -1068,8 +1072,8 @@
 "Remember to switch off effects (ctrl-0) afterwards !"
 msgstr ""
 
-#: src/interface.c:222 src/callbacks.c:9373 src/callbacks.c:9420
-#: src/dialogs.c:2570
+#: src/interface.c:210 src/callbacks.c:9283 src/callbacks.c:9332
+#: src/dialogs.c:2649
 msgid ""
 "\n"
 "Please Wait"
@@ -1077,188 +1081,178 @@
 "\n"
 "Pacientatz SVP"
 
-#: src/interface.c:242
+#: src/interface.c:230
 msgid "Show Details"
 msgstr ""
 
-#: src/interface.c:254 src/dialogs.c:2584
+#: src/interface.c:242 src/dialogs.c:2663
 msgid "_Enough"
 msgstr "_Pro"
 
-#: src/interface.c:255 src/framedraw.c:278
+#: src/interface.c:243 src/framedraw.c:276
 msgid "_Preview"
 msgstr "_Previsualizacion"
 
-#: src/interface.c:257
+#: src/interface.c:245 src/callbacks.c:9282 src/callbacks.c:9330
 msgid "Paus_e"
 msgstr "Paus_a"
 
-#: src/interface.c:258 src/callbacks.c:9417
+#: src/interface.c:246 src/callbacks.c:9329
 msgid "Pause/_Enough"
 msgstr "Pausa/_Pro"
 
-#: src/interface.c:285
+#: src/interface.c:273
 msgid "_Cancel"
 msgstr "_Anullar"
 
-#: src/interface.c:374
+#: src/interface.c:361
 #, c-format
 msgid "LiVES: - %s"
 msgstr ""
 
-#: src/interface.c:376
+#: src/interface.c:363
 msgid "LiVES: - Multitrack details"
 msgstr ""
 
-#: src/interface.c:407
+#: src/interface.c:394
 msgid "Format"
 msgstr "Formatar"
 
-#: src/interface.c:412
+#: src/interface.c:399
 msgid "Frame size"
 msgstr "Talha de l'enquadrament"
 
-#: src/interface.c:417
+#: src/interface.c:404
 msgid "File size"
 msgstr "Talha del fichièr"
 
-#: src/interface.c:418
+#: src/interface.c:405
 msgid "Byte size"
 msgstr ""
 
-#: src/interface.c:423 src/interface.c:1891
+#: src/interface.c:410 src/interface.c:1760
 msgid "FPS"
 msgstr "FPS"
 
-#: src/interface.c:428
+#: src/interface.c:415
 msgid "Frames"
 msgstr "Tramas"
 
-#: src/interface.c:429
+#: src/interface.c:416
 msgid "Events"
 msgstr "Eveniments"
 
-#: src/interface.c:434 src/interface.c:500 src/interface.c:542
+#: src/interface.c:421 src/interface.c:486 src/interface.c:528
 msgid "Total time"
 msgstr "Durada totala"
 
-#: src/interface.c:486 src/resample.c:1488
+#: src/interface.c:472 src/resample.c:1460
 msgid "Audio"
 msgstr "Àudio"
 
-#: src/interface.c:511 src/interface.c:553
+#: src/interface.c:497 src/interface.c:539
 msgid "Rate/size"
 msgstr "Velocitat/talha"
 
-#: src/interface.c:530
+#: src/interface.c:516
 msgid "Right audio"
 msgstr "Àudio drecha"
 
-#: src/interface.c:622
+#: src/interface.c:607
 msgid "LiVES: - Encoding options"
 msgstr "LiVES: - Opcions d'encodatge"
 
-#: src/interface.c:636
+#: src/interface.c:621
 msgid "<------------- (Check the box to re_size as suggested)"
 msgstr ""
 
-#: src/interface.c:637
+#: src/interface.c:622
 msgid "<------------- (Check the box to use the _size recommendation)"
 msgstr ""
 
-#: src/interface.c:662
+#: src/interface.c:646
 msgid "Use _letterboxing to maintain aspect ratio (optional)"
 msgstr ""
 
-#: src/interface.c:663
+#: src/interface.c:647
 msgid ""
 "Draw black rectangles either above or to the sides of the image, to prevent "
 "it from stretching."
 msgstr ""
 
-#: src/interface.c:694
+#: src/interface.c:677
 msgid "Keep _my settings"
 msgstr "Conservar mos reglatges"
 
-#: src/interface.c:695
+#: src/interface.c:678
 msgid "Use _recommended settings"
 msgstr "Utilizar los paramètres recomandats"
 
-#: src/interface.c:775 src/dialogs.c:114
-msgid ""
-"Do _not show this warning any more\n"
-"(can be turned back on from Preferences/Warnings)"
-msgstr ""
-
-#: src/interface.c:787
-msgid "Show _Details"
-msgstr "Veire Los _Detalhs"
-
-#: src/interface.c:881
+#: src/interface.c:769
 msgid "_Close Window"
 msgstr "_Tampar la fenèstra"
 
-#: src/interface.c:883
+#: src/interface.c:771
 msgid "_Save to file"
 msgstr "Enregi_strar dins un fichièr"
 
-#: src/interface.c:928
+#: src/interface.c:816
 msgid "LiVES: - Insert"
 msgstr "LiVES: - Inserís"
 
-#: src/interface.c:945
+#: src/interface.c:833
 msgid "_Number of times to insert"
 msgstr ""
 
-#: src/interface.c:954
+#: src/interface.c:842
 msgid "_Insert to fit audio"
 msgstr "_Inserís per correspondre al son"
 
-#: src/interface.c:968
+#: src/interface.c:856
 msgid "Insert _before selection"
 msgstr "Inserís _abans la seleccion"
 
-#: src/interface.c:970
+#: src/interface.c:858
 msgid "Insert clipboard before selected frames"
 msgstr ""
 
-#: src/interface.c:986
+#: src/interface.c:875
 msgid "Insert _after selection"
 msgstr "Inserís aprèp la seleccion"
 
-#: src/interface.c:988
+#: src/interface.c:877
 msgid "Insert clipboard after selected frames"
 msgstr ""
 
-#: src/interface.c:999
+#: src/interface.c:888
 msgid "Insert _with sound"
 msgstr "Inserís amb lo _son"
 
-#: src/interface.c:1012
+#: src/interface.c:901
 msgid "Insert with_out sound"
 msgstr "Inserís sens lo son"
 
-#: src/interface.c:1093
+#: src/interface.c:985
 msgid "LiVES: - Open Selection"
 msgstr "LiVES: - Dobrir la Seleccion"
 
-#: src/interface.c:1111
+#: src/interface.c:1004
 msgid "Selection start time (sec)"
 msgstr ""
 
-#: src/interface.c:1117
+#: src/interface.c:1010
 msgid "Number of frames to open"
 msgstr ""
 
-#: src/interface.c:1193
+#: src/interface.c:1088
 msgid "LiVES: - Open Location"
 msgstr "LiVES: - Dobrir l'emplaçament"
 
-#: src/interface.c:1195
+#: src/interface.c:1090
 msgid "LiVES: - Open Youtube Clip"
 msgstr ""
 
-#: src/interface.c:1213
+#: src/interface.c:1109
 msgid ""
 "\n"
 "\n"
@@ -1268,7 +1262,7 @@
 "\n"
 msgstr ""
 
-#: src/interface.c:1216
+#: src/interface.c:1112
 msgid ""
 "\n"
 "\n"
@@ -1277,62 +1271,63 @@
 "\n"
 msgstr ""
 
-#: src/interface.c:1220
+#: src/interface.c:1116
 msgid ""
 "Enter the URL of the clip below.\n"
 "E.g: http://www.youtube.com/watch?v=WCR6f6WzjP8\n"
 "\n"
 msgstr ""
 
-#: src/interface.c:1231
+#: src/interface.c:1127
 msgid "URL : "
 msgstr "URL : "
 
-#: src/interface.c:1231
+#: src/interface.c:1127
 msgid "Youtube URL : "
 msgstr ""
 
-#: src/interface.c:1235
+#: src/interface.c:1131
 msgid "Do not send bandwidth information"
 msgstr ""
 
-#: src/interface.c:1237
+#: src/interface.c:1133
 msgid "Try this setting if you are having problems getting a stream"
 msgstr ""
 
-#: src/interface.c:1258
+#: src/interface.c:1155
 msgid "Download to _Directory : "
 msgstr ""
 
-#: src/interface.c:1276
+#: src/interface.c:1173
 msgid "Download _File Name : "
 msgstr ""
 
-#: src/interface.c:1281
+#: src/interface.c:1178
 msgid ".webm"
 msgstr ""
 
-#: src/interface.c:1359
+#: src/interface.c:1256
 msgid "LiVES: - Rename Clip"
 msgstr "LiVES: - Tornar nomenar un Clip"
 
-#: src/interface.c:1362
-msgid "LiVES: - Enter Set Name"
+#: src/interface.c:1258
+#, fuzzy
+msgid "LiVES: - Enter Set Name to Save as"
 msgstr "LiVES: - Entrar lo nom dels paramètres"
 
-#: src/interface.c:1365
+#: src/interface.c:1260
 msgid "LiVES: - Enter a Set Name to Reload"
 msgstr ""
 
-#: src/interface.c:1368
+#: src/interface.c:1262
 msgid "LiVES: - Choose a Working Directory"
 msgstr ""
 
-#: src/interface.c:1371
+#: src/interface.c:1264
 msgid "LiVES: - Rename Current Track"
 msgstr ""
 
-#: src/interface.c:1391
+#: src/interface.c:1283
 msgid ""
 "You need to enter a name for the current clip set.\n"
 "This will allow you reload the layout with the same clips later.\n"
@@ -1340,354 +1335,354 @@
 "LiVES will remind you to save the clip set later when you try to exit.\n"
 msgstr ""
 
-#: src/interface.c:1397
+#: src/interface.c:1289
 msgid ""
 "In order to export this project, you must enter a name for this clip set.\n"
 "This will also be used for the project name.\n"
 msgstr ""
 
-#: src/interface.c:1404
+#: src/interface.c:1296
 msgid ""
 "Welcome to LiVES !\n"
 "This startup wizard will guide you through the\n"
 "initial install so that you can get the most from this application.\n"
 msgstr ""
 
-#: src/interface.c:1408
+#: src/interface.c:1300
 msgid ""
 "\n"
 "First of all you need to choose a working directory for LiVES.\n"
 "This should be a directory with plenty of disk space available.\n"
 msgstr ""
 
-#: src/interface.c:1427
+#: src/interface.c:1317
 msgid "New name "
 msgstr "Nom novèl "
 
-#: src/interface.c:1430
+#: src/interface.c:1319
 msgid "Set name "
 msgstr "Indicar nom "
 
-#: src/interface.c:1550
+#: src/interface.c:1435
 msgid "Use def_aults"
 msgstr ""
 
-#: src/interface.c:1553 src/interface.c:1840 src/preferences.c:2515
-#: src/preferences.c:2697
+#: src/interface.c:1437 src/interface.c:1709 src/preferences.c:2550
+#: src/preferences.c:2739
 msgid "_Advanced"
 msgstr "_Avançat"
 
-#: src/interface.c:1604
+#: src/interface.c:1487
 msgid "LiVES:- Select input device"
 msgstr ""
 
-#: src/interface.c:1622
+#: src/interface.c:1504
 msgid "Select input device:"
 msgstr ""
 
-#: src/interface.c:1686
+#: src/interface.c:1568
 msgid "LiVES:- Load CD Track"
 msgstr "LiVES:- Cargar una pista CD"
 
-#: src/interface.c:1689
+#: src/interface.c:1570
 msgid "LiVES:- Select DVD Title/Chapter"
 msgstr ""
 
-#: src/interface.c:1692
+#: src/interface.c:1572
 msgid "LiVES:- Select VCD Title"
 msgstr "LiVES:- Selecciona lo títol VCD"
 
-#: src/interface.c:1695
+#: src/interface.c:1574
 msgid "LiVES:- Change Maximum Visible Tracks"
 msgstr ""
 
-#: src/interface.c:1698
+#: src/interface.c:1576
 msgid "LiVES:- Device details"
 msgstr ""
 
-#: src/interface.c:1721
+#: src/interface.c:1598
 #, c-format
 msgid "Track to load (from %s)"
 msgstr "Pista de cargar (de %s)"
 
-#: src/interface.c:1724
+#: src/interface.c:1600
 msgid "DVD Title"
 msgstr "Títol DVD"
 
-#: src/interface.c:1727
+#: src/interface.c:1602
 msgid "VCD Title"
 msgstr "Títol VCD"
 
-#: src/interface.c:1730
+#: src/interface.c:1604
 msgid "Maximum number of tracks to display"
 msgstr "Nombre maximal de pistas d'afichar"
 
-#: src/interface.c:1733
+#: src/interface.c:1606
 msgid "Device:        /dev/video"
 msgstr ""
 
-#: src/interface.c:1736
+#: src/interface.c:1608
 msgid "Device:        fw:"
 msgstr ""
 
-#: src/interface.c:1771
+#: src/interface.c:1641
 msgid "Chapter  "
 msgstr "Capítol  "
 
-#: src/interface.c:1776
+#: src/interface.c:1645
 msgid "Channel  "
 msgstr "Canal  "
 
-#: src/interface.c:1791
+#: src/interface.c:1660
 msgid "Audio ID  "
 msgstr "Àudio ID  "
 
-#: src/interface.c:1857
+#: src/interface.c:1726
 msgid "Input number"
 msgstr ""
 
-#: src/interface.c:1865
+#: src/interface.c:1734
 msgid "Use default width, height and FPS"
 msgstr ""
 
-#: src/interface.c:1879
+#: src/interface.c:1748
 msgid "Width"
 msgstr "Largor"
 
-#: src/interface.c:1885
+#: src/interface.c:1754
 msgid "Height"
 msgstr "Nautor"
 
-#: src/interface.c:1899
+#: src/interface.c:1768
 msgid "_Driver"
 msgstr ""
 
-#: src/interface.c:1902
+#: src/interface.c:1771
 msgid "_Output format"
 msgstr ""
 
-#: src/interface.c:1998
+#: src/interface.c:1865
 msgid "LiVES:- Fade Audio In"
 msgstr ""
 
-#: src/interface.c:2001
+#: src/interface.c:1867
 msgid "LiVES:- Fade Audio Out"
 msgstr ""
 
-#: src/interface.c:2017
+#: src/interface.c:1883
 msgid "Fade in over  "
 msgstr ""
 
-#: src/interface.c:2018
+#: src/interface.c:1884
 msgid "first"
 msgstr "primièra"
 
-#: src/interface.c:2021
+#: src/interface.c:1886
 msgid "Fade out over  "
 msgstr ""
 
-#: src/interface.c:2022
+#: src/interface.c:1887
 msgid "last"
 msgstr "darrièra"
 
-#: src/interface.c:2044
+#: src/interface.c:1909
 msgid "seconds."
 msgstr "segondas."
 
-#: src/interface.c:2052 src/saveplay.c:1507
+#: src/interface.c:1917 src/saveplay.c:1484
 msgid "selection"
 msgstr "seleccion"
 
-#: src/interface.c:2092
+#: src/interface.c:1956
 msgid "LiVES: - File Comments (optional)"
 msgstr "LiVES: - Commentaires Fichier (optionnel)"
 
-#: src/interface.c:2107
+#: src/interface.c:1971
 msgid "Title/Name : "
 msgstr "Títol/Nom  : "
 
-#: src/interface.c:2114
+#: src/interface.c:1978
 msgid "Author/Artist : "
 msgstr "Autor/Artista : "
 
-#: src/interface.c:2121
+#: src/interface.c:1985
 msgid "Comments : "
 msgstr "Comentaris : "
 
-#: src/interface.c:2151
+#: src/interface.c:2015
 msgid "_Options"
 msgstr "_Opcions"
 
-#: src/interface.c:2158
+#: src/interface.c:2022
 msgid "Save _subtitles to file"
 msgstr ""
 
-#: src/interface.c:2170
+#: src/interface.c:2033
 msgid "Subtitle file"
 msgstr ""
 
-#: src/interface.c:2172
+#: src/interface.c:2035
 msgid "Browse..."
 msgstr "Percórrer..."
 
-#: src/interface.c:2255
+#: src/interface.c:2132
 msgid "LiVES: - choose a device"
 msgstr ""
 
-#: src/interface.c:2259
+#: src/interface.c:2135
 msgid "LiVES: - choose a directory"
 msgstr ""
 
-#: src/interface.c:2262
+#: src/interface.c:2137
 msgid "LiVES: - choose a file"
 msgstr ""
 
-#: src/interface.c:2445
+#: src/interface.c:2381
 msgid "LiVES: - Cancel/Discard/Save"
 msgstr "LiVES: - Anullar/Contunhar/Salvar"
 
-#: src/interface.c:2460
+#: src/interface.c:2397
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has not been saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:2463
+#: src/interface.c:2400
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has been changed since the last save.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:2467
+#: src/interface.c:2404
 msgid ""
 "You are about to exit LiVES.\n"
 "The current clip set can be saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:2468
+#: src/interface.c:2405
 msgid ""
 "The current clip set has not been saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:2472
+#: src/interface.c:2408
 msgid ""
 "The current layout has not been saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:2475
+#: src/interface.c:2410
 msgid ""
 "The current layout has *not* been changed since it was last saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:2480
+#: src/interface.c:2415
 msgid ""
 "The current layout contains generated frames and cannot be retained.\n"
 "You may wish to render it before exiting multitrack mode.\n"
 msgstr ""
 
-#: src/interface.c:2483
+#: src/interface.c:2418
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout contains generated frames and cannot be retained.\n"
 "What do you wish to do ?"
 msgstr ""
 
-#: src/interface.c:2496
+#: src/interface.c:2431
 msgid "Clip set _name"
 msgstr "_Nom de l'ensemble de clips"
 
-#: src/interface.c:2502
+#: src/interface.c:2437
 msgid "_Auto reload next time"
 msgstr ""
 
-#: src/interface.c:2538 src/interface.c:2547
+#: src/interface.c:2473 src/interface.c:2482
 msgid "_Wipe layout"
 msgstr ""
 
-#: src/interface.c:2539
+#: src/interface.c:2474
 msgid "_Ignore changes"
 msgstr "_Ignòra los cambiaments"
 
-#: src/interface.c:2540
+#: src/interface.c:2475
 msgid "_Delete clip set"
 msgstr ""
 
-#: src/interface.c:2541
+#: src/interface.c:2476
 msgid "_Delete layout"
 msgstr "_Suprimís la disposicion"
 
-#: src/interface.c:2545
+#: src/interface.c:2480
 msgid "_Save layout"
 msgstr "_Salva la disposicion"
 
-#: src/interface.c:2546
+#: src/interface.c:2481
 msgid "_Save clip set"
 msgstr "_Salva l'ensemble de clips"
 
-#: src/interface.c:2565
+#: src/interface.c:2502
 msgid ""
 "\n"
 "LiVES has detected a multitrack layout from a previous session.\n"
 "Would you like to try and recover it ?\n"
 msgstr ""
 
-#: src/interface.c:2589
+#: src/interface.c:2528
 msgid "LiVES: - Disk Recovery Options"
 msgstr ""
 
-#: src/interface.c:2608
+#: src/interface.c:2549
 msgid "Delete _Orphaned Clips"
 msgstr ""
 
-#: src/interface.c:2609
+#: src/interface.c:2550
 msgid "Delete any clips which are not currently loaded or part of a set"
 msgstr ""
 
-#: src/interface.c:2622
+#: src/interface.c:2564
 msgid "Clear _Backup Files from Closed Clips"
 msgstr ""
 
-#: src/interface.c:2633
+#: src/interface.c:2575
 msgid "Remove Sets which have _Layouts but no Clips"
 msgstr ""
 
-#: src/interface.c:2644
+#: src/interface.c:2586
 msgid "_Reset to Defaults"
 msgstr "_Reïnicializar a las valors per defaut"
 
-#: src/interface.c:2651
+#: src/interface.c:2593
 msgid "_Accept"
 msgstr "_Acceptar"
 
-#: src/callbacks.c:198
+#: src/callbacks.c:208
 #, c-format
 msgid "Saving as set %s..."
 msgstr ""
 
-#: src/callbacks.c:833
+#: src/callbacks.c:852
 msgid "Please enter the name of the file to save the clip as.\n"
 msgstr ""
 
-#: src/callbacks.c:841
+#: src/callbacks.c:860
 msgid "Please enter a valid URL for the download.\n"
 msgstr ""
 
-#: src/callbacks.c:867
+#: src/callbacks.c:886
 #, c-format
 msgid "Downloading %s to %s..."
 msgstr ""
 
-#: src/callbacks.c:895
+#: src/callbacks.c:912
 msgid "Downloading clip"
 msgstr ""
 
-#: src/callbacks.c:933
+#: src/callbacks.c:950
 msgid ""
 "\n"
 "LiVES was unable to download the clip.\n"
@@ -1695,17 +1690,17 @@
 "the latest youtube-dl installed.\n"
 msgstr ""
 
-#: src/callbacks.c:1114 src/callbacks.c:1149
+#: src/callbacks.c:1131 src/callbacks.c:1166
 msgid "This file"
 msgstr "Aqueste fichièr"
 
-#: src/callbacks.c:1115
+#: src/callbacks.c:1132
 msgid ""
 ",\n"
 " - including the current layout - "
 msgstr ""
 
-#: src/callbacks.c:1117
+#: src/callbacks.c:1134
 #, c-format
 msgid ""
 "\n"
@@ -1715,7 +1710,7 @@
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1119
+#: src/callbacks.c:1136
 #, c-format
 msgid ""
 "\n"
@@ -1725,14 +1720,14 @@
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1150
+#: src/callbacks.c:1167
 msgid ""
 "Changes made to this clip have not been saved or backed up.\n"
 "\n"
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1343
+#: src/callbacks.c:1356
 msgid ""
 "\n"
 "Invalid project file.\n"
@@ -1740,7 +1735,7 @@
 "\n"
 "Fichièr de projècte invalid.\n"
 
-#: src/callbacks.c:1356
+#: src/callbacks.c:1370
 #, c-format
 msgid ""
 "\n"
@@ -1753,33 +1748,33 @@
 "Once you have done this, you will be able to import the new project.\n"
 msgstr ""
 
-#: src/callbacks.c:1366
+#: src/callbacks.c:1381
 #, c-format
 msgid "Importing the project %s as set %s..."
 msgstr "Importar lo projècte %s en tant que %s..."
 
-#: src/callbacks.c:1386
+#: src/callbacks.c:1399
 msgid "Importing project"
 msgstr "importacion del projècte"
 
-#: src/callbacks.c:1472
+#: src/callbacks.c:1481
 #, c-format
 msgid "Exporting project %s..."
 msgstr "Exportacion del projècte %s..."
 
-#: src/callbacks.c:1490
+#: src/callbacks.c:1497
 msgid "Exporting project"
 msgstr "Exportacion del projècte"
 
-#: src/callbacks.c:1506
+#: src/callbacks.c:1513
 msgid "Backup as .lv1 file"
 msgstr "Salvar coma fichièr .lv1"
 
-#: src/callbacks.c:1522
+#: src/callbacks.c:1529
 msgid "Restore .lv1 file"
 msgstr "Restablir lo fichièr .lv1"
 
-#: src/callbacks.c:1664
+#: src/callbacks.c:1671
 msgid ""
 "\n"
 "\n"
@@ -1787,72 +1782,77 @@
 "Are you sure ?\n"
 msgstr ""
 
-#: src/callbacks.c:1725
+#: src/callbacks.c:1732
 #, c-format
 msgid "Deleting set %s..."
 msgstr ""
 
-#: src/callbacks.c:1727
+#: src/callbacks.c:1734
 msgid "Deleting set..."
 msgstr "Supression del set..."
 
-#: src/callbacks.c:1731
+#: src/callbacks.c:1738
 msgid "Deleting set"
 msgstr "Supression del set"
 
-#: src/callbacks.c:1739
+#: src/callbacks.c:1746
 #, c-format
 msgid "Set %s was permanently deleted from the disk.\n"
 msgstr ""
 
-#: src/callbacks.c:1787 src/callbacks.c:11764
+#: src/callbacks.c:1792 src/callbacks.c:11676
 msgid "Insert Silence"
 msgstr ""
 
-#: src/callbacks.c:1840 src/callbacks.c:1923 src/callbacks.c:2086
+#: src/callbacks.c:1844 src/callbacks.c:1927 src/callbacks.c:2089
 msgid "Undoing"
 msgstr "Anullacion"
 
-#: src/callbacks.c:1936 src/callbacks.c:2147
+#: src/callbacks.c:1940 src/callbacks.c:2150
 msgid "Restoring audio..."
 msgstr ""
 
-#: src/callbacks.c:1952
+#: src/callbacks.c:1956
 msgid "Clearing frame images"
 msgstr ""
 
-#: src/callbacks.c:1985
+#: src/callbacks.c:1988
 msgid "Deleting excess frames"
 msgstr ""
 
-#: src/callbacks.c:2229
+#: src/callbacks.c:2232
 #, c-format
 msgid "Length of video is now %d frames at %.3f frames per second.\n"
 msgstr ""
 
-#: src/callbacks.c:2233 src/resample.c:683 src/resample.c:2166
+#: src/callbacks.c:2235 src/resample.c:678 src/resample.c:2133
 #, c-format
 msgid "Clipboard was resampled to %d frames.\n"
 msgstr ""
 
-#: src/callbacks.c:2394 src/callbacks.c:2423
+#: src/callbacks.c:2396 src/callbacks.c:2425
 msgid "Redoing"
 msgstr "Refar"
 
-#: src/callbacks.c:2462
+#: src/callbacks.c:2472
 #, c-format
-msgid "Copying frames %d to %d%s to the clipboard..."
+msgid "Copying frames %d to %d (with sound) to the clipboard..."
 msgstr ""
 
-#: src/callbacks.c:2525
+#: src/callbacks.c:2474
+#, fuzzy, c-format
+msgid "Copying frames %d to %d to the clipboard..."
+msgstr "Escafament dels imatges %d a %d%s...."
+
+#: src/callbacks.c:2526
 msgid "Copying to the clipboard"
 msgstr ""
 
-#: src/callbacks.c:2600
+#: src/callbacks.c:2601
 msgid "Cut"
 msgstr "Copar"
 
-#: src/callbacks.c:2641 src/callbacks.c:3068 src/callbacks.c:8026
+#: src/callbacks.c:2641 src/callbacks.c:3063 src/callbacks.c:7631
 msgid "Pulling frames from clipboard"
 msgstr ""
 
@@ -1861,22 +1861,22 @@
 msgid "Pasting %d frames to new clip %s..."
 msgstr ""
 
-#: src/callbacks.c:2678
+#: src/callbacks.c:2676
 msgid "Pasting"
 msgstr "Empegament"
 
-#: src/callbacks.c:2694
+#: src/callbacks.c:2692
 msgid "...added audio..."
 msgstr ""
 
-#: src/callbacks.c:2778
+#: src/callbacks.c:2775
 msgid ""
 "This operation requires resizing or converting of frames.\n"
 "Please install 'convert' from the Image-magick package, and then restart "
 "LiVES.\n"
 msgstr ""
 
-#: src/callbacks.c:2795
+#: src/callbacks.c:2793
 msgid ""
 "\n"
 "\n"
@@ -1885,31 +1885,31 @@
 "the 'Trim Audio' function from the Audio menu."
 msgstr ""
 
-#: src/callbacks.c:2819
+#: src/callbacks.c:2817
 msgid ""
 "LiVES cannot insert because the audio rates do not match.\n"
 "Please install 'sox', and try again."
 msgstr ""
 
-#: src/callbacks.c:2838
+#: src/callbacks.c:2835
 msgid ""
 "\n"
 "Insertion will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:2888 src/callbacks.c:11692
+#: src/callbacks.c:2883 src/callbacks.c:11606
 msgid ""
 "\n"
 "Insertion will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:2996 src/callbacks.c:3025
+#: src/callbacks.c:2987 src/callbacks.c:3016
 msgid "Resampling clipboard audio"
 msgstr ""
 
-#: src/callbacks.c:3041
+#: src/callbacks.c:3032
 msgid ""
 "\n"
 "\n"
@@ -1917,7 +1917,7 @@
 "Clipboard audio has been erased.\n"
 msgstr ""
 
-#: src/callbacks.c:3055
+#: src/callbacks.c:3045
 msgid ""
 "\n"
 "\n"
@@ -1926,79 +1926,79 @@
 "using unchanged audio ?\n"
 msgstr ""
 
-#: src/callbacks.c:3137 src/callbacks.c:3311
+#: src/callbacks.c:3132 src/callbacks.c:3299
 #, c-format
 msgid "Inserting %d%s frames from the clipboard..."
 msgstr ""
 
-#: src/callbacks.c:3162 src/callbacks.c:3236 src/callbacks.c:3339
+#: src/callbacks.c:3155 src/callbacks.c:3224 src/callbacks.c:3325
 msgid "Inserting"
 msgstr "Insercion de"
 
-#: src/callbacks.c:3193
+#: src/callbacks.c:3187
 #, c-format
 msgid "Inserting %d times from the clipboard%s..."
 msgstr ""
 
-#: src/callbacks.c:3200
+#: src/callbacks.c:3191
 #, c-format
 msgid "Inserting %d frames from the clipboard%s..."
 msgstr ""
 
-#: src/callbacks.c:3418
+#: src/callbacks.c:3404
 msgid "Insert"
 msgstr "Insercion"
 
-#: src/callbacks.c:3486
+#: src/callbacks.c:3471
 msgid ""
 "\n"
 "Deleting all frames will close this file.\n"
 "Are you sure ?"
 msgstr ""
 
-#: src/callbacks.c:3495
+#: src/callbacks.c:3480
 msgid ""
 "\n"
 "Deletion will cause missing frames in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3515 src/callbacks.c:10920 src/callbacks.c:11162
-#: src/callbacks.c:11228
+#: src/callbacks.c:3500 src/callbacks.c:10851 src/callbacks.c:11087
+#: src/callbacks.c:11152
 msgid ""
 "\n"
 "Deletion will cause missing audio in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3534
+#: src/callbacks.c:3519
 msgid ""
 "\n"
 "Deletion will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3553 src/callbacks.c:11210
+#: src/callbacks.c:3538 src/callbacks.c:11134
 msgid ""
 "\n"
 "Deletion will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3611
+#: src/callbacks.c:3597
 #, c-format
 msgid "Deleting frames %d to %d%s..."
 msgstr "Escafament dels imatges %d a %d%s...."
 
-#: src/callbacks.c:3636
+#: src/callbacks.c:3619
 msgid "Deleting"
 msgstr "Supression"
 
-#: src/callbacks.c:3717
+#: src/callbacks.c:3699
 msgid "Delete"
 msgstr "Levar"
 
-#: src/callbacks.c:3738
+#: src/callbacks.c:3717
 msgid ""
 "\n"
 "\n"
@@ -2008,7 +2008,7 @@
 "\n"
 "La seleccion es varrolhada.\n"
 
-#: src/callbacks.c:4092
+#: src/callbacks.c:4056
 msgid ""
 "Ready to record. Use 'control' and cursor keys during playback to record "
 "your performance.\n"
@@ -2016,11 +2016,11 @@
 "play.)\n"
 msgstr ""
 
-#: src/callbacks.c:4098
+#: src/callbacks.c:4061
 msgid "Record cancelled.\n"
 msgstr ""
 
-#: src/callbacks.c:4237
+#: src/callbacks.c:4197
 #, c-format
 msgid ""
 "\n"
@@ -2029,7 +2029,7 @@
 "%s\n"
 msgstr ""
 
-#: src/callbacks.c:4241
+#: src/callbacks.c:4200
 #, c-format
 msgid ""
 "\n"
@@ -2038,7 +2038,7 @@
 "The plugin may be broken or not installed correctly."
 msgstr ""
 
-#: src/callbacks.c:4571
+#: src/callbacks.c:4532
 #, c-format
 msgid ""
 "Saving the set will cause copies of all loaded clips to remain on the disk"
@@ -2047,22 +2047,22 @@
 "Please press 'Cancel' if that is not what you want.\n"
 msgstr ""
 
-#: src/callbacks.c:4654
+#: src/callbacks.c:4617
 #, c-format
 msgid "Saving set %s"
 msgstr "Salva %s"
 
-#: src/callbacks.c:5005
+#: src/callbacks.c:4964
 #, c-format
 msgid "Loading clips from set %s"
 msgstr "Cargament dels clips dempuèi %s"
 
-#: src/callbacks.c:5093
+#: src/callbacks.c:5051
 #, c-format
 msgid "%d clips and %d layouts were recovered from set (%s).\n"
 msgstr ""
 
-#: src/callbacks.c:5312
+#: src/callbacks.c:5259
 msgid ""
 "LiVES will attempt to recover some disk space.\n"
 "You should ONLY run this if you have no other copies of LiVES running on "
@@ -2070,24 +2070,24 @@
 "Click OK to proceed.\n"
 msgstr ""
 
-#: src/callbacks.c:5317
+#: src/callbacks.c:5264
 msgid "Cleaning up disk space..."
 msgstr "Netejatge de l'espaci de disc..."
 
-#: src/callbacks.c:5387
+#: src/callbacks.c:5334
 msgid "Recovering disk space"
 msgstr ""
 
-#: src/callbacks.c:5439
+#: src/callbacks.c:5386
 #, c-format
 msgid "%s of disk space was recovered.\n"
 msgstr ""
 
-#: src/callbacks.c:5482
+#: src/callbacks.c:5428
 msgid "Resetting frame rates and frame values..."
 msgstr ""
 
-#: src/callbacks.c:5523
+#: src/callbacks.c:5469
 #, c-format
 msgid ""
 "\n"
@@ -2095,12 +2095,12 @@
 "Internal: %s (%d bpp) / %s\n"
 msgstr ""
 
-#: src/callbacks.c:5525
+#: src/callbacks.c:5471
 msgid "buffered"
 msgstr ""
 
-#: src/callbacks.c:5538 src/callbacks.c:5557 src/callbacks.c:5575
-#: src/callbacks.c:5609
+#: src/callbacks.c:5484 src/callbacks.c:5502 src/callbacks.c:5518
+#: src/callbacks.c:5551
 msgid ""
 "\n"
 "  Opening..."
@@ -2108,7 +2108,7 @@
 "\n"
 "  Dobertura..."
 
-#: src/callbacks.c:5545
+#: src/callbacks.c:5490
 #, c-format
 msgid ""
 "\n"
@@ -2117,7 +2117,7 @@
 "\n"
 "(%d virtuals)"
 
-#: src/callbacks.c:5548
+#: src/callbacks.c:5493
 #, c-format
 msgid ""
 "\n"
@@ -2126,7 +2126,7 @@
 "\n"
 "(%d desencodats)"
 
-#: src/callbacks.c:5560 src/callbacks.c:5578 src/callbacks.c:5612
+#: src/callbacks.c:5504 src/callbacks.c:5520 src/callbacks.c:5553
 #, c-format
 msgid ""
 "\n"
@@ -2135,7 +2135,7 @@
 "\n"
 "  %.2f seg."
 
-#: src/callbacks.c:5569
+#: src/callbacks.c:5512
 msgid ""
 "\n"
 "  Unknown"
@@ -2143,23 +2143,23 @@
 "\n"
 "  Desconegut"
 
-#: src/callbacks.c:5582 src/callbacks.c:5596
+#: src/callbacks.c:5524 src/callbacks.c:5538
 msgid "unsigned"
 msgstr ""
 
-#: src/callbacks.c:5583 src/callbacks.c:5597
+#: src/callbacks.c:5525 src/callbacks.c:5539
 msgid "signed"
 msgstr "signat"
 
-#: src/callbacks.c:5585 src/callbacks.c:5599
+#: src/callbacks.c:5527 src/callbacks.c:5541
 msgid "big-endian"
 msgstr ""
 
-#: src/callbacks.c:5586 src/callbacks.c:5600
+#: src/callbacks.c:5528 src/callbacks.c:5542
 msgid "little-endian"
 msgstr ""
 
-#: src/callbacks.c:5588 src/callbacks.c:5602
+#: src/callbacks.c:5530 src/callbacks.c:5544
 #, c-format
 msgid ""
 "  %d Hz %d bit\n"
@@ -2168,7 +2168,7 @@
 "  %d Hz %d bit\n"
 "%s %s"
 
-#: src/callbacks.c:5707
+#: src/callbacks.c:5647
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -2185,21 +2185,21 @@
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA.\n"
 msgstr ""
 
-#: src/callbacks.c:5721
+#: src/callbacks.c:5661
 msgid "A video editor and VJ program."
 msgstr ""
 
-#: src/callbacks.c:5722
+#: src/callbacks.c:5662
 msgid "About LiVES"
 msgstr ""
 
-#: src/callbacks.c:5724
+#: src/callbacks.c:5664
 msgid "translator_credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Cédric VALMARY (Tot en òc) https://launchpad.net/~cvalmary"
 
-#: src/callbacks.c:5758
+#: src/callbacks.c:5699
 #, c-format
 msgid ""
 "LiVES Version %s\n"
@@ -2213,14 +2213,14 @@
 "Homepage: http://lives.sourceforge.net"
 msgstr ""
 
-#: src/callbacks.c:6037
+#: src/callbacks.c:5996
 msgid ""
 "\n"
 "\n"
 "You need to install mplayer or mplayer2 to be able to preview this file.\n"
 msgstr ""
 
-#: src/callbacks.c:6040
+#: src/callbacks.c:5998
 msgid ""
 "\n"
 "\n"
@@ -2228,215 +2228,206 @@
 "this file.\n"
 msgstr ""
 
-#: src/callbacks.c:6423 src/callbacks.c:8289
-msgid ""
-"\n"
-"Loading new audio may cause missing audio in some multitrack layouts.\n"
-"Are you sure you wish to continue ?\n"
-"."
-msgstr ""
-
-#: src/callbacks.c:6523
-#, c-format
-msgid "Opening audio %s, type %s..."
-msgstr ""
-
-#: src/callbacks.c:6556 src/saveplay.c:480
-msgid "Opening audio"
-msgstr ""
-
-#: src/callbacks.c:6565 src/callbacks.c:6612 src/callbacks.c:8387
-#: src/callbacks.c:8429 src/callbacks.c:8472 src/callbacks.c:10846
-msgid "Cancelling"
-msgstr "Anullacion"
-
-#: src/callbacks.c:6660 src/callbacks.c:8514 src/callbacks.c:10876
-#: src/callbacks.c:11563
-msgid "Committing audio"
-msgstr "Validacion del son"
-
-#: src/callbacks.c:6672 src/callbacks.c:8546
-msgid "New Audio"
-msgstr "Àudio novèl"
-
-#: src/callbacks.c:6779
+#: src/callbacks.c:6459
 #, c-format
 msgid ""
 "Text was saved as\n"
 "%s\n"
 msgstr ""
 
-#: src/callbacks.c:6951 src/saveplay.c:3618
-#, c-format
-msgid "%d frames are enough !\n"
-msgstr ""
-
-#: src/callbacks.c:7050
+#: src/callbacks.c:6706
 msgid "LiVES: - Encoder debug output"
 msgstr ""
 
-#: src/callbacks.c:7087 src/gui.c:1922
+#: src/callbacks.c:6743 src/gui.c:1921
 msgid "Fullscreen playback (f)"
 msgstr ""
 
-#: src/callbacks.c:7089
+#: src/callbacks.c:6744
 msgid "Fullscreen playback off (f)"
 msgstr ""
 
-#: src/callbacks.c:7188 src/callbacks.c:7336 src/callbacks.c:7664
-#: src/callbacks.c:7681 src/gui.c:3712 src/saveplay.c:2467 src/saveplay.c:2501
-#: src/saveplay.c:3115 src/saveplay.c:3220 src/saveplay.c:3239
-#: src/multitrack.c:9340 src/multitrack.c:11060
+#: src/callbacks.c:6841 src/callbacks.c:6983 src/callbacks.c:7283
+#: src/callbacks.c:7298 src/gui.c:3838 src/saveplay.c:2442 src/saveplay.c:2475
+#: src/saveplay.c:3074 src/saveplay.c:3178 src/saveplay.c:3197
+#: src/multitrack.c:9526 src/multitrack.c:11288
 #, c-format
 msgid " (%d %% scale)"
 msgstr ""
 
-#: src/callbacks.c:7190 src/callbacks.c:7338 src/callbacks.c:7666
-#: src/gui.c:3716 src/saveplay.c:2469 src/saveplay.c:2503
+#: src/callbacks.c:6843 src/callbacks.c:6985 src/callbacks.c:7285
+#: src/gui.c:3842 src/saveplay.c:2444 src/saveplay.c:2477
 #, c-format
 msgid "LiVES: - Play Window%s"
 msgstr ""
 
-#: src/callbacks.c:7302 src/gui.c:1907
+#: src/callbacks.c:6950 src/gui.c:1906
 msgid "Double size (d)"
 msgstr ""
 
-#: src/callbacks.c:7309
+#: src/callbacks.c:6956
 msgid "Single size (d)"
 msgstr "Talha simpla (d)"
 
-#: src/callbacks.c:7442 src/callbacks.c:7443
+#: src/callbacks.c:7087 src/callbacks.c:7088
 msgid "Hide the play window (s)"
 msgstr ""
 
-#: src/callbacks.c:7452 src/gui.c:1746
+#: src/callbacks.c:7096 src/gui.c:1744
 msgid "Show the play window (s)"
 msgstr ""
 
-#: src/callbacks.c:7453 src/gui.c:1896
+#: src/callbacks.c:7097 src/gui.c:1895
 msgid "Play in separate window (s)"
 msgstr ""
 
-#: src/callbacks.c:7535 src/gui.c:4060 src/saveplay.c:2498
+#: src/callbacks.c:7175 src/gui.c:4169 src/saveplay.c:2472
 msgid "LiVES: - Streaming"
 msgstr ""
 
-#: src/callbacks.c:7778
+#: src/callbacks.c:7388
 msgid "Switch continuous looping off (o)"
 msgstr ""
 
-#: src/callbacks.c:7785 src/gui.c:1795
+#: src/callbacks.c:7394 src/gui.c:1793
 msgid "Switch continuous looping on (o)"
 msgstr ""
 
-#: src/callbacks.c:7837
+#: src/callbacks.c:7444
 #, c-format
 msgid "Audio volume (%.2f)"
 msgstr "Volum àudio (%.2f)"
 
-#: src/callbacks.c:7876 src/callbacks.c:7877 src/gui.c:3640
+#: src/callbacks.c:7483 src/callbacks.c:7484 src/gui.c:3766
 msgid "Unmute the audio (z)"
 msgstr "Activar l'àudio (z)"
 
-#: src/callbacks.c:7888 src/callbacks.c:7889 src/gui.c:1808 src/gui.c:3639
+#: src/callbacks.c:7494 src/callbacks.c:7495 src/gui.c:1806 src/gui.c:3765
 msgid "Mute the audio (z)"
 msgstr "Desactivar l'àudio (z)"
 
-#: src/callbacks.c:8038
+#: src/callbacks.c:7643
 msgid "Reversing clipboard..."
 msgstr ""
 
-#: src/callbacks.c:8052
+#: src/callbacks.c:7657
 msgid "Reversing clipboard"
 msgstr ""
 
-#: src/callbacks.c:8084
+#: src/callbacks.c:7689
 msgid "LiVES: Load subtitles from..."
 msgstr ""
 
-#: src/callbacks.c:8151 src/saveplay.c:970
+#: src/callbacks.c:7753 src/saveplay.c:956
 #, c-format
 msgid "Loaded subtitle file: %s\n"
 msgstr ""
 
-#: src/callbacks.c:8220
+#: src/callbacks.c:7821
 msgid "Subtitles were erased.\n"
 msgstr ""
 
-#: src/callbacks.c:8239
+#: src/callbacks.c:7843
 msgid "LiVES: - Select Audio File"
 msgstr ""
 
-#: src/callbacks.c:8250
+#: src/callbacks.c:7878 src/callbacks.c:8232
+msgid ""
+"\n"
+"Loading new audio may cause missing audio in some multitrack layouts.\n"
+"Are you sure you wish to continue ?\n"
+"."
+msgstr ""
+
+#: src/callbacks.c:7989
+#, c-format
+msgid "Opening audio %s, type %s..."
+msgstr ""
+
+#: src/callbacks.c:8023 src/saveplay.c:477
+msgid "Opening audio"
+msgstr ""
+
+#: src/callbacks.c:8032 src/callbacks.c:8083 src/callbacks.c:8327
+#: src/callbacks.c:8369 src/callbacks.c:8412 src/callbacks.c:10766
+msgid "Cancelling"
+msgstr "Anullacion"
+
+#: src/callbacks.c:8137 src/callbacks.c:8454 src/callbacks.c:10803
+#: src/callbacks.c:11477
+msgid "Committing audio"
+msgstr "Validacion del son"
+
+#: src/callbacks.c:8153 src/callbacks.c:8484
+msgid "New Audio"
+msgstr "Àudio novèl"
+
+#: src/callbacks.c:8194
 msgid "Please set your CD play device in Tools | Preferences | Misc\n"
 msgstr ""
 
-#: src/callbacks.c:8321
+#: src/callbacks.c:8264
 #, c-format
 msgid "Opening CD track %d from %s..."
 msgstr ""
 
-#: src/callbacks.c:8326
+#: src/callbacks.c:8267
 #, c-format
 msgid "CD track %d"
 msgstr "Pista CD %d"
 
-#: src/callbacks.c:8373
+#: src/callbacks.c:8313
 msgid "Opening CD track..."
 msgstr "Dobertura de la pista CD...."
 
-#: src/callbacks.c:8415 src/callbacks.c:8461
+#: src/callbacks.c:8355 src/callbacks.c:8401
 msgid "Error loading CD track\n"
 msgstr ""
 
-#: src/callbacks.c:8584
+#: src/callbacks.c:8518
 msgid "layout errors"
 msgstr "Errors de sortida"
 
-#: src/callbacks.c:8595
+#: src/callbacks.c:8529
 msgid "Close _Window"
 msgstr ""
 
-#: src/callbacks.c:8606
+#: src/callbacks.c:8540
 msgid "Clear _Errors"
 msgstr ""
 
-#: src/callbacks.c:8617
+#: src/callbacks.c:8551
 msgid "_Delete affected layouts"
 msgstr ""
 
-#: src/callbacks.c:9343 src/callbacks.c:9388
+#: src/callbacks.c:9253 src/callbacks.c:9298
 msgid "Resume"
 msgstr "Contunhar"
 
-#: src/callbacks.c:9344
+#: src/callbacks.c:9254
 msgid ""
 "\n"
 "Paused\n"
 "(click Resume to continue processing)"
 msgstr ""
 
-#: src/callbacks.c:9345 src/callbacks.c:9406
+#: src/callbacks.c:9255 src/callbacks.c:9315
 msgid "paused..."
 msgstr "en espèra..."
 
-#: src/callbacks.c:9372 src/callbacks.c:9418
-msgid "Pause"
-msgstr "Metre en pausa"
-
-#: src/callbacks.c:9374 src/callbacks.c:9421
+#: src/callbacks.c:9284 src/callbacks.c:9333
 msgid "resumed..."
 msgstr "represa..."
 
-#: src/callbacks.c:9393
+#: src/callbacks.c:9303
 msgid "Keep"
 msgstr "Conservar"
 
-#: src/callbacks.c:9396
+#: src/callbacks.c:9305
 msgid "Enough"
 msgstr ""
 
-#: src/callbacks.c:9401
+#: src/callbacks.c:9310
 #, c-format
 msgid ""
 "\n"
@@ -2445,28 +2436,28 @@
 "(click Resume to continue processing)"
 msgstr ""
 
-#: src/callbacks.c:9419
+#: src/callbacks.c:9331
 msgid "Cancel"
 msgstr "Anullar"
 
-#: src/callbacks.c:9558
+#: src/callbacks.c:9478
 msgid "Stop"
 msgstr "Arrestar"
 
-#: src/callbacks.c:10053 src/multitrack.c:13247
+#: src/callbacks.c:9968 src/multitrack.c:13489
 msgid "LiVES: Selected frame"
 msgstr ""
 
-#: src/callbacks.c:10061
+#: src/callbacks.c:9976
 msgid "_Save frame as..."
 msgstr ""
 
-#: src/callbacks.c:10290
+#: src/callbacks.c:10202
 #, c-format
 msgid "Audio is ahead of video by %.4f secs. at frame %d, with fps %.4f\n"
 msgstr ""
 
-#: src/callbacks.c:10347
+#: src/callbacks.c:10255
 msgid ""
 "\n"
 "\n"
@@ -2475,7 +2466,7 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10353
+#: src/callbacks.c:10261
 msgid ""
 "\n"
 "\n"
@@ -2483,13 +2474,13 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10429 src/callbacks.c:11479
+#: src/callbacks.c:10334 src/callbacks.c:11395
 msgid ""
 "\n"
 "Record time must be greater than 0.\n"
 msgstr ""
 
-#: src/callbacks.c:10440
+#: src/callbacks.c:10346
 msgid ""
 "Capture an External Window:\n"
 "\n"
@@ -2498,17 +2489,17 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10445
+#: src/callbacks.c:10351
 msgid "External window was released.\n"
 msgstr ""
 
-#: src/callbacks.c:10479
+#: src/callbacks.c:10385
 msgid ""
 "Click on a Window to Capture it\n"
 "Press 'q' to stop recording"
 msgstr ""
 
-#: src/callbacks.c:10513
+#: src/callbacks.c:10419
 #, c-format
 msgid ""
 "\n"
@@ -2518,19 +2509,19 @@
 "(Default of %.3f frames per second will be used.)\n"
 msgstr ""
 
-#: src/callbacks.c:10539
+#: src/callbacks.c:10443
 msgid "LiVES was unable to capture this window. Sorry.\n"
 msgstr ""
 
-#: src/callbacks.c:10695
+#: src/callbacks.c:10601
 msgid "Export Selected Audio as..."
 msgstr ""
 
-#: src/callbacks.c:10699
+#: src/callbacks.c:10604
 msgid "Export Audio as..."
 msgstr ""
 
-#: src/callbacks.c:10714
+#: src/callbacks.c:10619
 msgid ""
 "\n"
 "\n"
@@ -2539,1033 +2530,1033 @@
 "rate.\n"
 msgstr ""
 
-#: src/callbacks.c:10720
+#: src/callbacks.c:10625
 #, c-format
 msgid "Exporting audio frames %d to %d as %s..."
 msgstr ""
 
-#: src/callbacks.c:10725
+#: src/callbacks.c:10629
 #, c-format
 msgid "Exporting audio as %s..."
 msgstr ""
 
-#: src/callbacks.c:10751
+#: src/callbacks.c:10655
 msgid "Exporting audio"
 msgstr "Exportacion del son"
 
-#: src/callbacks.c:10782
+#: src/callbacks.c:10695
 msgid "LiVES: - Append Audio File"
 msgstr ""
 
-#: src/callbacks.c:10825
+#: src/callbacks.c:10739
 #, c-format
 msgid "Appending audio file %s..."
 msgstr ""
 
-#: src/callbacks.c:10836
+#: src/callbacks.c:10756
 msgid "Appending audio"
 msgstr ""
 
-#: src/callbacks.c:10892
+#: src/callbacks.c:10818
 msgid "Append Audio"
 msgstr ""
 
-#: src/callbacks.c:10952
+#: src/callbacks.c:10883
 #, c-format
 msgid "Padding audio to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10954
+#: src/callbacks.c:10885
 #, c-format
 msgid "Trimming audio from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10973
+#: src/callbacks.c:10904
 msgid "Trimming/Padding audio"
 msgstr ""
 
-#: src/callbacks.c:10981
+#: src/callbacks.c:10912
 msgid "Trim/Pad Audio"
 msgstr ""
 
-#: src/callbacks.c:11055
+#: src/callbacks.c:10982
 msgid "Fading audio in"
 msgstr ""
 
-#: src/callbacks.c:11056
+#: src/callbacks.c:10983
 msgid "Fade audio in"
 msgstr ""
 
-#: src/callbacks.c:11061
+#: src/callbacks.c:10987
 msgid "Fading audio out"
 msgstr ""
 
-#: src/callbacks.c:11062
+#: src/callbacks.c:10988
 msgid "Fade audio out"
 msgstr ""
 
-#: src/callbacks.c:11085
+#: src/callbacks.c:11011
 #, c-format
 msgid "%s over %.1f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11087
+#: src/callbacks.c:11013
 #, c-format
 msgid "%s from time %.2f seconds to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11094
+#: src/callbacks.c:11020
 msgid "Fading audio..."
 msgstr "Fondut àudio..."
 
-#: src/callbacks.c:11194
+#: src/callbacks.c:11119
 msgid ""
 "\n"
 "Deleting all audio will close this file.\n"
 "Are you sure ?"
 msgstr ""
 
-#: src/callbacks.c:11197
+#: src/callbacks.c:11122
 msgid "Deleting all audio..."
 msgstr ""
 
-#: src/callbacks.c:11203
+#: src/callbacks.c:11127
 #, c-format
 msgid "Deleting audio from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11290
+#: src/callbacks.c:11214
 msgid "Deleting Audio"
 msgstr "Escafament del son"
 
-#: src/callbacks.c:11297
+#: src/callbacks.c:11221
 msgid "Delete Audio"
 msgstr ""
 
-#: src/callbacks.c:11636
+#: src/callbacks.c:11550
 msgid "Record new audio"
 msgstr ""
 
-#: src/callbacks.c:11725
+#: src/callbacks.c:11640
 #, c-format
 msgid "Inserting silence from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11754
+#: src/callbacks.c:11666
 msgid "Inserting Silence"
 msgstr ""
 
-#: src/merge.c:85
+#: src/merge.c:96
 msgid "LiVES: - Merge"
 msgstr "LiVES: - Union"
 
-#: src/merge.c:102
+#: src/merge.c:113
 #, c-format
 msgid "Merge Clipboard [ %d Frames ]       With Selection [ %d Frames ]"
 msgstr ""
 
-#: src/merge.c:107
+#: src/merge.c:118
 #, c-format
 msgid ""
 "Merge Clipboard [ %d Frames (resampled) ]       With Selection [ %d Frames ]"
 msgstr ""
 
-#: src/merge.c:118
+#: src/merge.c:130
 msgid "Align _Starts"
 msgstr ""
 
-#: src/merge.c:123
+#: src/merge.c:135
 msgid "Align _Ends"
 msgstr "Alinhar Fin"
 
-#: src/merge.c:134
+#: src/merge.c:146
 msgid "What to do with extra clipboard frames -"
 msgstr ""
 
-#: src/merge.c:137
+#: src/merge.c:149
 msgid "_Insert Frames"
 msgstr "_Inserir d'Imatges"
 
-#: src/merge.c:143
+#: src/merge.c:155
 msgid "_Drop Frames"
 msgstr "_Ignorar los imatges"
 
-#: src/merge.c:149
+#: src/merge.c:160
 msgid "Number of Times to Loop Clipboard"
 msgstr ""
 
-#: src/merge.c:160
+#: src/merge.c:171
 msgid "_Loop Clipboard to Fit Selection"
 msgstr ""
 
-#: src/merge.c:173
+#: src/merge.c:184
 msgid "_Transition Method:"
 msgstr ""
 
-#: src/merge.c:394
+#: src/merge.c:395
 msgid "Merging clipboard with selection..."
 msgstr ""
 
-#: src/merge.c:551
+#: src/merge.c:539
 msgid "Merge done.\n"
 msgstr "Fusion acabada.\n"
 
-#: src/gui.c:123
+#: src/gui.c:122
 msgid "_Custom Generators"
 msgstr ""
 
-#: src/gui.c:124
+#: src/gui.c:123
 msgid "_Custom Effects"
 msgstr "Efièches Personalizats"
 
-#: src/gui.c:125
+#: src/gui.c:124
 msgid "Custom _Utilities"
 msgstr "_Utilitaris Personalizats"
 
-#: src/gui.c:352 src/multitrack.c:5964
+#: src/gui.c:351 src/multitrack.c:6143
 msgid "_File"
 msgstr "_Fichièr"
 
-#: src/gui.c:367 src/multitrack.c:5989
+#: src/gui.c:366 src/multitrack.c:6168
 msgid "_Open File/Directory"
 msgstr ""
 
-#: src/gui.c:373
+#: src/gui.c:372
 msgid "O_pen Part of File..."
 msgstr ""
 
-#: src/gui.c:379 src/gui.c:383 src/multitrack.c:6006 src/multitrack.c:6023
-#: src/multitrack.c:6028
+#: src/gui.c:378 src/gui.c:382 src/multitrack.c:6185 src/multitrack.c:6202
+#: src/multitrack.c:6207
 msgid "Open _Location/Stream..."
 msgstr "Dobrir URL/Stream..."
 
-#: src/gui.c:393 src/multitrack.c:6016
+#: src/gui.c:392 src/multitrack.c:6195
 msgid "Open _Youtube Clip..."
 msgstr ""
 
-#: src/gui.c:404
+#: src/gui.c:403
 msgid "Import from _dvd/vcd..."
 msgstr ""
 
-#: src/gui.c:413
+#: src/gui.c:412
 msgid "Import from _dvd"
 msgstr ""
 
-#: src/gui.c:416
+#: src/gui.c:415
 msgid "Import from _vcd"
 msgstr ""
 
-#: src/gui.c:419
+#: src/gui.c:418
 msgid "_Import from Firewire"
 msgstr ""
 
-#: src/gui.c:428 src/multitrack.c:6086
+#: src/gui.c:427 src/multitrack.c:6265
 msgid "Import from _Firewire Device (dv)"
 msgstr ""
 
-#: src/gui.c:429 src/multitrack.c:6094
+#: src/gui.c:428 src/multitrack.c:6273
 msgid "Import from _Firewire Device (hdv)"
 msgstr ""
 
-#: src/gui.c:457
+#: src/gui.c:456
 msgid "_Add Webcam/TV card..."
 msgstr ""
 
-#: src/gui.c:476
+#: src/gui.c:475
 msgid "Add _Unicap Device"
 msgstr ""
 
-#: src/gui.c:486
+#: src/gui.c:485
 msgid "Add Live _Firewire Device"
 msgstr ""
 
-#: src/gui.c:495
+#: src/gui.c:494
 msgid "Add _TV Device"
 msgstr ""
 
-#: src/gui.c:510 src/multitrack.c:6117
+#: src/gui.c:509 src/multitrack.c:6296
 msgid "_Recent Files..."
 msgstr "Fichièrs _Recents...."
 
-#: src/gui.c:560 src/multitrack.c:6177
+#: src/gui.c:559 src/multitrack.c:6356
 msgid "_Reload Clip Set..."
 msgstr ""
 
-#: src/gui.c:564 src/multitrack.c:6185
+#: src/gui.c:563 src/multitrack.c:6364
 msgid "Close/Sa_ve All Clips"
 msgstr ""
 
-#: src/gui.c:575
+#: src/gui.c:574
 msgid "_Encode Clip As..."
 msgstr ""
 
-#: src/gui.c:577
+#: src/gui.c:576
 msgid "Encode _Selection As..."
 msgstr ""
 
-#: src/gui.c:584
+#: src/gui.c:583
 msgid "_Close This Clip"
 msgstr ""
 
-#: src/gui.c:595
+#: src/gui.c:594
 msgid "_Backup Clip as .lv1..."
 msgstr ""
 
-#: src/gui.c:604
+#: src/gui.c:603
 msgid "_Restore Clip from .lv1..."
 msgstr ""
 
-#: src/gui.c:615
+#: src/gui.c:614
 msgid "Encode/Load/Backup _with Sound"
 msgstr ""
 
-#: src/gui.c:620
+#: src/gui.c:619
 msgid "Auto load subtitles"
 msgstr ""
 
-#: src/gui.c:628 src/multitrack.c:6224
+#: src/gui.c:627 src/multitrack.c:6403
 msgid "Clean _up Diskspace"
 msgstr ""
 
-#: src/gui.c:636 src/multitrack.c:6257
+#: src/gui.c:635 src/multitrack.c:6436
 msgid "_Edit"
 msgstr "_Edicion"
 
-#: src/gui.c:685
+#: src/gui.c:684
 msgid "_MULTITRACK mode"
 msgstr "Mòde multipistas"
 
-#: src/gui.c:696
+#: src/gui.c:695
 msgid "_Copy Selection"
 msgstr "_Copiar Seleccion"
 
-#: src/gui.c:705
+#: src/gui.c:704
 msgid "Cu_t Selection"
 msgstr "_Copar Seleccion"
 
-#: src/gui.c:714
+#: src/gui.c:713
 msgid "_Insert from Clipboard..."
 msgstr ""
 
-#: src/gui.c:730
+#: src/gui.c:729
 msgid "Paste as _New"
 msgstr ""
 
-#: src/gui.c:739
+#: src/gui.c:738
 msgid "_Merge Clipboard with Selection..."
 msgstr ""
 
-#: src/gui.c:746
+#: src/gui.c:745
 msgid "_Delete Selection"
 msgstr ""
 
-#: src/gui.c:764
+#: src/gui.c:763
 msgid "Decouple _Video from Audio"
 msgstr ""
 
-#: src/gui.c:772
+#: src/gui.c:771
 msgid "_Select..."
 msgstr "_Seleccionar..."
 
-#: src/gui.c:786
+#: src/gui.c:785
 msgid "Select _All Frames"
 msgstr ""
 
-#: src/gui.c:794
+#: src/gui.c:793
 msgid "_Start Frame Only"
 msgstr "Primièr Imatge solament"
 
-#: src/gui.c:802
+#: src/gui.c:801
 msgid "_End Frame Only"
 msgstr "_Darrièr Imatge solament"
 
-#: src/gui.c:813
+#: src/gui.c:812
 msgid "Select from _First Frame"
 msgstr ""
 
-#: src/gui.c:817
+#: src/gui.c:816
 msgid "Select to _Last Frame"
 msgstr ""
 
-#: src/gui.c:821
+#: src/gui.c:820
 msgid "Select Last Insertion/_Merge"
 msgstr ""
 
-#: src/gui.c:825
+#: src/gui.c:824
 msgid "Select Last _Effect"
 msgstr ""
 
-#: src/gui.c:829
+#: src/gui.c:828
 msgid "_Invert Selection"
 msgstr "_Inversar la seleccion"
 
-#: src/gui.c:837
+#: src/gui.c:836
 msgid "_Lock Selection Width"
 msgstr ""
 
-#: src/gui.c:842 src/multitrack.c:6409
+#: src/gui.c:841 src/multitrack.c:6591
 msgid "_Play"
 msgstr "_Lectura"
 
-#: src/gui.c:854
+#: src/gui.c:853
 msgid "_Play All"
 msgstr ""
 
-#: src/gui.c:869
+#: src/gui.c:868
 msgid "Pla_y Selection"
 msgstr ""
 
-#: src/gui.c:877
+#: src/gui.c:876
 msgid "Play _Clipboard"
 msgstr ""
 
-#: src/gui.c:899 src/multitrack.c:6441
+#: src/gui.c:898 src/multitrack.c:6623
 msgid "_Stop"
 msgstr "_Arrestar"
 
-#: src/gui.c:914 src/multitrack.c:6453
+#: src/gui.c:913 src/multitrack.c:6635
 msgid "Re_wind"
 msgstr ""
 
-#: src/gui.c:946 src/multitrack.c:6471
+#: src/gui.c:945 src/multitrack.c:6653
 msgid "_Full Screen"
 msgstr "Ecran _complet"
 
-#: src/gui.c:955
+#: src/gui.c:954
 msgid "_Double Size"
 msgstr "Talha _Dobla"
 
-#: src/gui.c:963 src/multitrack.c:6479
+#: src/gui.c:962 src/multitrack.c:6661
 msgid "Play in _Separate Window"
 msgstr ""
 
-#: src/gui.c:972
+#: src/gui.c:971
 msgid "_Blank Background"
 msgstr ""
 
-#: src/gui.c:979
+#: src/gui.c:978
 msgid "(Auto)_loop Video (to fit audio track)"
 msgstr ""
 
-#: src/gui.c:988 src/multitrack.c:6487
+#: src/gui.c:987 src/multitrack.c:6669
 msgid "L_oop Continuously"
 msgstr "Lectura Continua"
 
-#: src/gui.c:997
+#: src/gui.c:996
 msgid "Pin_g Pong Loops"
 msgstr "Pin_g Pong (Lectura Continua)"
 
-#: src/gui.c:1005 src/multitrack.c:6495
+#: src/gui.c:1004 src/multitrack.c:6677
 msgid "_Mute"
 msgstr "_Mut"
 
-#: src/gui.c:1017
+#: src/gui.c:1016
 msgid "Separate Window 'S_ticky' Mode"
 msgstr ""
 
-#: src/gui.c:1025
+#: src/gui.c:1024
 msgid "S_how Frame Counter"
 msgstr ""
 
-#: src/gui.c:1035
+#: src/gui.c:1034
 msgid "Show Subtitles"
 msgstr ""
 
-#: src/gui.c:1045
+#: src/gui.c:1044
 msgid "Letterbox mode"
 msgstr ""
 
-#: src/gui.c:1051 src/multitrack.c:6507
+#: src/gui.c:1050 src/multitrack.c:6689
 msgid "Effect_s"
 msgstr "Efièche_s"
 
-#: src/gui.c:1054
+#: src/gui.c:1053
 msgid "Effects are applied to the current selection."
 msgstr ""
 
-#: src/gui.c:1067
+#: src/gui.c:1066
 msgid "_Run Test Rendered Effect/Tool/Generator..."
 msgstr ""
 
-#: src/gui.c:1072 src/multitrack.c:7123
+#: src/gui.c:1071 src/multitrack.c:7299
 msgid "_Tools"
 msgstr "_Espleches"
 
-#: src/gui.c:1075
+#: src/gui.c:1074
 msgid "Tools are applied to complete clips."
 msgstr ""
 
-#: src/gui.c:1085
+#: src/gui.c:1084
 msgid "_Reverse Clipboard"
 msgstr ""
 
-#: src/gui.c:1094
+#: src/gui.c:1093
 msgid "_Change Playback/Save Speed..."
 msgstr ""
 
-#: src/gui.c:1099
+#: src/gui.c:1098
 msgid "Resample _Video to New Frame Rate..."
 msgstr ""
 
-#: src/gui.c:1105
+#: src/gui.c:1104
 msgid "_Utilities"
 msgstr "_Utilitaris"
 
-#: src/gui.c:1110
+#: src/gui.c:1109
 msgid "Custom _Tools"
 msgstr ""
 
-#: src/gui.c:1116 src/multitrack.c:7149
+#: src/gui.c:1115 src/multitrack.c:7325
 msgid "_Generate"
 msgstr "_Genèra"
 
-#: src/gui.c:1126
+#: src/gui.c:1125
 msgid "Loading rendered effect plugins..."
 msgstr ""
 
-#: src/gui.c:1139
+#: src/gui.c:1138
 msgid "Load _Subtitles from File..."
 msgstr ""
 
-#: src/gui.c:1144
+#: src/gui.c:1143
 msgid "Erase subtitles"
 msgstr ""
 
-#: src/gui.c:1152 src/multitrack.c:7158
+#: src/gui.c:1151 src/multitrack.c:7334
 msgid "Capture _External Window... "
 msgstr ""
 
-#: src/gui.c:1159 src/multitrack.c:7173
+#: src/gui.c:1158 src/multitrack.c:7349
 msgid "_Preferences..."
 msgstr "_Preferéncias..."
 
-#: src/gui.c:1172
+#: src/gui.c:1171
 msgid "_Audio"
 msgstr "_Àudio"
 
-#: src/gui.c:1184
+#: src/gui.c:1183
 msgid "Load _New Audio for Clip..."
 msgstr ""
 
-#: src/gui.c:1190
+#: src/gui.c:1189
 msgid "Load _CD Track..."
 msgstr "_Cargar una pista CD...."
 
-#: src/gui.c:1191
+#: src/gui.c:1190
 msgid "E_ject CD"
 msgstr "Ejectar CD"
 
-#: src/gui.c:1205
+#: src/gui.c:1204
 msgid "Record E_xternal Audio..."
 msgstr "Enregistrament àudio"
 
-#: src/gui.c:1218
+#: src/gui.c:1217
 msgid "to New _Clip..."
 msgstr ""
 
-#: src/gui.c:1222
+#: src/gui.c:1221
 msgid "to _Selection"
 msgstr ""
 
-#: src/gui.c:1230
+#: src/gui.c:1229
 msgid "Fade Audio _In..."
 msgstr ""
 
-#: src/gui.c:1234
+#: src/gui.c:1233
 msgid "Fade Audio _Out..."
 msgstr ""
 
-#: src/gui.c:1244
+#: src/gui.c:1243
 msgid "_Export Audio..."
 msgstr ""
 
-#: src/gui.c:1257
+#: src/gui.c:1256
 msgid "Export _Selected Audio..."
 msgstr ""
 
-#: src/gui.c:1261
+#: src/gui.c:1260
 msgid "Export _All Audio..."
 msgstr ""
 
-#: src/gui.c:1265
+#: src/gui.c:1264
 msgid "_Append Audio..."
 msgstr ""
 
-#: src/gui.c:1270
+#: src/gui.c:1269
 msgid "_Trim/Pad Audio..."
 msgstr ""
 
-#: src/gui.c:1283
+#: src/gui.c:1282
 msgid "Trim/Pad Audio to _Selection"
 msgstr ""
 
-#: src/gui.c:1288
+#: src/gui.c:1287
 msgid "Trim/Pad Audio from Beginning to _Play Start"
 msgstr ""
 
-#: src/gui.c:1293
+#: src/gui.c:1292
 msgid "_Delete Audio..."
 msgstr ""
 
-#: src/gui.c:1306
+#: src/gui.c:1305
 msgid "Delete _Selected Audio"
 msgstr ""
 
-#: src/gui.c:1310
+#: src/gui.c:1309
 msgid "Delete _All Audio"
 msgstr ""
 
-#: src/gui.c:1314
+#: src/gui.c:1313
 msgid "Insert _Silence in Selection"
 msgstr ""
 
-#: src/gui.c:1319
+#: src/gui.c:1318
 msgid "_Resample Audio..."
 msgstr ""
 
-#: src/gui.c:1324
+#: src/gui.c:1323
 msgid "_Info"
 msgstr ""
 
-#: src/gui.c:1336
+#: src/gui.c:1335
 msgid "Show Clip _Info"
 msgstr ""
 
-#: src/gui.c:1344
+#: src/gui.c:1343
 msgid "Show/_Edit File Comments"
 msgstr ""
 
-#: src/gui.c:1349
+#: src/gui.c:1348
 msgid "Show _Clipboard Info"
 msgstr ""
 
-#: src/gui.c:1360 src/multitrack.c:7286
+#: src/gui.c:1359 src/multitrack.c:7462
 msgid "Show _Messages"
 msgstr ""
 
-#: src/gui.c:1364 src/multitrack.c:7365
+#: src/gui.c:1363 src/multitrack.c:7541
 msgid "Show _Layout Errors"
 msgstr ""
 
-#: src/gui.c:1369 src/multitrack.c:7263
+#: src/gui.c:1368 src/multitrack.c:7439
 msgid "_Clips"
 msgstr ""
 
-#: src/gui.c:1381
+#: src/gui.c:1380
 msgid "_Rename Current Clip in Menu..."
 msgstr ""
 
-#: src/gui.c:1399
+#: src/gui.c:1398
 msgid "A_dvanced"
 msgstr "A_vançat"
 
-#: src/gui.c:1412
+#: src/gui.c:1411
 msgid "_RFX Effects/Tools/Utilities"
 msgstr ""
 
-#: src/gui.c:1424
+#: src/gui.c:1423
 msgid "_New Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1428
+#: src/gui.c:1427
 msgid "_Copy RFX Script to Test..."
 msgstr ""
 
-#: src/gui.c:1432
+#: src/gui.c:1431
 msgid "_Edit Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1436
+#: src/gui.c:1435
 msgid "Rena_me Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1440
+#: src/gui.c:1439
 msgid "_Delete Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1450
+#: src/gui.c:1449
 msgid "_Promote Test Rendered Effect/Tool/Generator..."
 msgstr ""
 
-#: src/gui.c:1457
+#: src/gui.c:1456
 msgid "_Import Custom RFX script..."
 msgstr ""
 
-#: src/gui.c:1461
+#: src/gui.c:1460
 msgid "E_xport Custom RFX script..."
 msgstr ""
 
-#: src/gui.c:1465
+#: src/gui.c:1464
 msgid "De_lete Custom RFX Script..."
 msgstr ""
 
-#: src/gui.c:1472
+#: src/gui.c:1471
 msgid "Re_build all RFX plugins"
 msgstr ""
 
-#: src/gui.c:1501
+#: src/gui.c:1498
 msgid "Receive _LiVES stream from..."
 msgstr ""
 
-#: src/gui.c:1506
+#: src/gui.c:1503
 msgid "_Send LiVES stream to..."
 msgstr ""
 
-#: src/gui.c:1515
+#: src/gui.c:1512
 #, c-format
 msgid "Open _yuv4mpeg stream on %sstream.yuv..."
 msgstr ""
 
-#: src/gui.c:1536
+#: src/gui.c:1534
 msgid "_Import Project (.lv2)..."
 msgstr ""
 
-#: src/gui.c:1540
+#: src/gui.c:1538
 msgid "E_xport Project (.lv2)..."
 msgstr ""
 
-#: src/gui.c:1545
+#: src/gui.c:1543
 msgid "_VJ"
 msgstr ""
 
-#: src/gui.c:1557
+#: src/gui.c:1555
 msgid "Real Time _Effect Mapping"
 msgstr ""
 
-#: src/gui.c:1563
+#: src/gui.c:1561
 msgid "Bind real time effects to ctrl-number keys."
 msgstr ""
 
-#: src/gui.c:1565
+#: src/gui.c:1563
 msgid "Set Real Time Effect _Defaults"
 msgstr ""
 
-#: src/gui.c:1567
+#: src/gui.c:1565
 msgid "Set default parameter values for real time effects."
 msgstr ""
 
-#: src/gui.c:1580
+#: src/gui.c:1578
 msgid "Save Real Time Effect _Defaults"
 msgstr ""
 
-#: src/gui.c:1583
+#: src/gui.c:1581
 msgid ""
 "Save real time effect defaults so they will be restored each time you use "
 "LiVES."
 msgstr ""
 
-#: src/gui.c:1589
+#: src/gui.c:1587
 msgid "_Reset all playback speeds and positions"
 msgstr ""
 
-#: src/gui.c:1592
+#: src/gui.c:1590
 msgid ""
 "Reset all playback positions to frame 1, and reset all playback frame rates."
 msgstr ""
 
-#: src/gui.c:1594
+#: src/gui.c:1592
 msgid "_MIDI/joystick interface"
 msgstr ""
 
-#: src/gui.c:1609
+#: src/gui.c:1607
 msgid "_MIDI/joystick learner..."
 msgstr ""
 
-#: src/gui.c:1614
+#: src/gui.c:1612
 msgid "_Save device mapping..."
 msgstr ""
 
-#: src/gui.c:1620
+#: src/gui.c:1618
 msgid "_Load device mapping..."
 msgstr ""
 
-#: src/gui.c:1628
+#: src/gui.c:1626
 msgid "Show VJ _Keys"
 msgstr ""
 
-#: src/gui.c:1632
+#: src/gui.c:1630
 msgid "To_ys"
 msgstr ""
 
-#: src/gui.c:1644
+#: src/gui.c:1642
 msgid "_None"
 msgstr "_Pas cap"
 
-#: src/gui.c:1652
+#: src/gui.c:1650
 msgid "_Autolives"
 msgstr ""
 
-#: src/gui.c:1657
+#: src/gui.c:1655
 msgid "_Mad Frames"
 msgstr ""
 
-#: src/gui.c:1662
+#: src/gui.c:1660
 msgid "_LiVES TV (broadband)"
 msgstr ""
 
-#: src/gui.c:1672 src/multitrack.c:7387
+#: src/gui.c:1670 src/multitrack.c:7563
 msgid "_Help"
 msgstr "_Ajuda"
 
-#: src/gui.c:1684 src/multitrack.c:7407
+#: src/gui.c:1682 src/multitrack.c:7583
 msgid "_Manual (opens in browser)"
 msgstr ""
 
-#: src/gui.c:1691 src/multitrack.c:7416
+#: src/gui.c:1689 src/multitrack.c:7592
 msgid "_Donate to the project !"
 msgstr ""
 
-#: src/gui.c:1695 src/multitrack.c:7420
+#: src/gui.c:1693 src/multitrack.c:7596
 msgid "_Email the author"
 msgstr ""
 
-#: src/gui.c:1699 src/multitrack.c:7424
+#: src/gui.c:1697 src/multitrack.c:7600
 msgid "Report a _bug"
 msgstr ""
 
-#: src/gui.c:1703 src/multitrack.c:7428
+#: src/gui.c:1701 src/multitrack.c:7604
 msgid "Suggest a _feature"
 msgstr ""
 
-#: src/gui.c:1707 src/multitrack.c:7432
+#: src/gui.c:1705 src/multitrack.c:7608
 msgid "Assist with _translating"
 msgstr ""
 
-#: src/gui.c:1714 src/multitrack.c:7439
+#: src/gui.c:1712 src/multitrack.c:7615
 msgid "_Troubleshoot"
 msgstr "_Depanatge"
 
-#: src/gui.c:1718 src/multitrack.c:7443
+#: src/gui.c:1716 src/multitrack.c:7619
 msgid "_About"
 msgstr "_A prepaus"
 
-#: src/gui.c:1752
+#: src/gui.c:1750
 msgid "Rewind to start (w)"
 msgstr ""
 
-#: src/gui.c:1760 src/multitrack.c:16720
+#: src/gui.c:1758 src/multitrack.c:17010
 msgid "Play all (p)"
 msgstr ""
 
-#: src/gui.c:1768 src/gui.c:1877
+#: src/gui.c:1766 src/gui.c:1876
 msgid "Stop playback (q)"
 msgstr ""
 
-#: src/gui.c:1779
+#: src/gui.c:1777
 msgid "Play selection (y)"
 msgstr ""
 
-#: src/gui.c:1832
+#: src/gui.c:1829
 msgid "Volume"
 msgstr "Volum"
 
-#: src/gui.c:1854
+#: src/gui.c:1853
 msgid "Audio volume (1.00)"
 msgstr ""
 
-#: src/gui.c:1883
+#: src/gui.c:1882
 msgid "Unblank background (b)"
 msgstr ""
 
-#: src/gui.c:1929
+#: src/gui.c:1928
 msgid "Play slower (ctrl-down)"
 msgstr ""
 
-#: src/gui.c:1935
+#: src/gui.c:1934
 msgid "Play faster (ctrl-up)"
 msgstr ""
 
-#: src/gui.c:1942
+#: src/gui.c:1941
 msgid "Skip back (ctrl-left)"
 msgstr ""
 
-#: src/gui.c:1948
+#: src/gui.c:1947
 msgid "Skip forward (ctrl-right)"
 msgstr ""
 
-#: src/gui.c:1954
+#: src/gui.c:1953
 msgid "Show clip info (i)"
 msgstr ""
 
-#: src/gui.c:1960
+#: src/gui.c:1959
 msgid "Hide this toolbar"
 msgstr ""
 
-#: src/gui.c:1962
+#: src/gui.c:1961
 msgid ""
 "Press \"s\" to toggle separate play window for improved performance, \"q\" "
 "to stop."
 msgstr ""
 
 #. TRANSLATORS: please keep the translated string the same length
-#: src/gui.c:1995
+#: src/gui.c:1994
 msgid "     Video playback speed (frames per second)        "
 msgstr ""
 
-#: src/gui.c:2009
+#: src/gui.c:2008
 msgid "Vary the video speed"
 msgstr ""
 
-#: src/gui.c:2092 src/gui.c:3218
+#: src/gui.c:2090 src/gui.c:3329
 msgid "First Frame"
 msgstr ""
 
-#: src/gui.c:2193 src/gui.c:3226
+#: src/gui.c:2191 src/gui.c:3336
 msgid "Last Frame"
 msgstr ""
 
-#: src/gui.c:2210
+#: src/gui.c:2208
 msgid "The first selected frame in this clip"
 msgstr ""
 
-#: src/gui.c:2248
+#: src/gui.c:2246
 msgid "The last selected frame in this clip"
 msgstr ""
 
-#: src/gui.c:2532
+#: src/gui.c:2546
 msgid "Starting...\n"
 msgstr ""
 
-#: src/gui.c:3074
+#: src/gui.c:3181
 msgid "    Press 'q' to stop recording.  DO NOT COVER THE PLAY WINDOW !   "
 msgstr ""
 
-#: src/gui.c:3521
+#: src/gui.c:3643
 msgid "Frame number to preview"
 msgstr ""
 
-#: src/gui.c:3538
+#: src/gui.c:3660
 msgid "_Free"
 msgstr "_Liure"
 
-#: src/gui.c:3539
+#: src/gui.c:3661
 msgid "Free choice of frame number"
 msgstr ""
 
-#: src/gui.c:3543
+#: src/gui.c:3666
 msgid "_Start"
 msgstr "_Aviar"
 
-#: src/gui.c:3544
+#: src/gui.c:3667
 msgid "Frame number is linked to start frame"
 msgstr ""
 
-#: src/gui.c:3551
+#: src/gui.c:3675
 msgid "_End"
 msgstr ""
 
-#: src/gui.c:3552
+#: src/gui.c:3676
 msgid "Frame number is linked to end frame"
 msgstr ""
 
-#: src/gui.c:3559
+#: src/gui.c:3684
 msgid "_Pointer"
 msgstr ""
 
-#: src/gui.c:3560
+#: src/gui.c:3685
 msgid "Frame number is linked to playback pointer"
 msgstr ""
 
-#: src/gui.c:3581
+#: src/gui.c:3707
 msgid "Rewind"
 msgstr "Retorn rapid"
 
-#: src/gui.c:3592 src/dialogs.c:894 src/dialogs.c:896 src/dialogs.c:1817
-#: src/dialogs.c:1819
+#: src/gui.c:3718 src/dialogs.c:960 src/dialogs.c:962 src/dialogs.c:1873
+#: src/dialogs.c:1875
 msgid "Play all"
 msgstr ""
 
-#: src/gui.c:3605
+#: src/gui.c:3731
 msgid "Play Selection"
 msgstr ""
 
-#: src/gui.c:3619
+#: src/gui.c:3745
 msgid "Loop On/Off"
 msgstr ""
 
-#: src/gui.c:3693
+#: src/gui.c:3819
 msgid "Start _recording"
 msgstr ""
 
-#: src/gui.c:3698
+#: src/gui.c:3824
 msgid "Stop _recording"
 msgstr ""
 
-#: src/gui.c:3703
+#: src/gui.c:3829
 msgid "_Record Performance"
 msgstr ""
 
-#: src/gui.c:3851
+#: src/gui.c:3974
 msgid "Hide Play Window"
 msgstr ""
 
-#: src/gui.c:4232
+#: src/gui.c:4333
 msgid "Show Play Window"
 msgstr ""
 
-#: src/ce_thumbs.c:222
+#: src/ce_thumbs.c:242
 #, c-format
 msgid "Mapped to ctrl-%d"
 msgstr ""
 
-#: src/ce_thumbs.c:276 src/effects.c:85 src/preferences.c:3195
+#: src/ce_thumbs.c:296 src/effects.c:86 src/preferences.c:3247
 msgid "Effects"
 msgstr "Efièches"
 
-#: src/ce_thumbs.c:279 src/multitrack.c:5615
+#: src/ce_thumbs.c:299 src/multitrack.c:5791
 msgid "Clips"
 msgstr ""
 
-#: src/ce_thumbs.c:303
+#: src/ce_thumbs.c:323
 #, c-format
 msgid "Show / apply effects to %s\n"
 msgstr ""
 
-#: src/ce_thumbs.c:315
+#: src/ce_thumbs.c:335
 #, c-format
 msgid "Select clip for %s\n"
 msgstr ""
 
-#: src/ce_thumbs.c:515
+#: src/ce_thumbs.c:536
 msgid "_Pin"
 msgstr ""
 
-#: src/ce_thumbs.c:515
+#: src/ce_thumbs.c:537
 msgid "Pin the parameter box to the window"
 msgstr ""
 
 #. TRANSLATORS: Exabytes
-#: src/utils.c:794
+#: src/utils.c:800
 #, c-format
 msgid "%.2f EB"
 msgstr ""
 
 #. TRANSLATORS: Petabytes
-#: src/utils.c:798
+#: src/utils.c:803
 #, c-format
 msgid "%.2f PB"
 msgstr ""
 
 #. TRANSLATORS: Terabytes
-#: src/utils.c:802
+#: src/utils.c:806
 #, c-format
 msgid "%.2f TB"
 msgstr ""
 
 #. TRANSLATORS: Gigabytes
-#: src/utils.c:806
+#: src/utils.c:809
 #, c-format
 msgid "%.2f GB"
 msgstr ""
 
 #. TRANSLATORS: Megabytes
-#: src/utils.c:810
+#: src/utils.c:812
 #, c-format
 msgid "%.2f MB"
 msgstr ""
 
 #. TRANSLATORS: Kilobytes (1024 bytes)
-#: src/utils.c:814
+#: src/utils.c:815
 #, c-format
 msgid "%.2f KiB"
 msgstr ""
@@ -3575,7 +3566,7 @@
 msgid "%d bytes"
 msgstr ""
 
-#: src/utils.c:1841
+#: src/utils.c:1835
 msgid "Clearing the clipboard"
 msgstr ""
 
@@ -3587,81 +3578,81 @@
 "Switched to clip %s\n"
 msgstr ""
 
-#: src/utils.c:1880
+#: src/utils.c:1877
 msgid ""
 "\n"
 "==============================\n"
 "Switched to empty clip\n"
 msgstr ""
 
-#: src/utils.c:1917
+#: src/utils.c:1916
 msgid "(blank)"
 msgstr ""
 
-#: src/utils.c:1920
+#: src/utils.c:1919
 #, c-format
 msgid ""
 "The set name has been changed from %s to %s. Affected layouts have been "
 "updated accordingly\n"
 msgstr ""
 
-#: src/utils.c:1928
+#: src/utils.c:1927
 #, c-format
 msgid ""
 "The clip %s is missing from this set.\n"
 "It is required by the following layouts:\n"
 msgstr ""
 
-#: src/utils.c:1932
+#: src/utils.c:1931
 #, c-format
 msgid ""
 "The clip %s has been closed.\n"
 "It is required by the following layouts:\n"
 msgstr ""
 
-#: src/utils.c:1937
+#: src/utils.c:1936
 #, c-format
 msgid ""
 "Frames have been shifted in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1942
+#: src/utils.c:1941
 #, c-format
 msgid ""
 "Frames have been deleted from the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1947
+#: src/utils.c:1946
 #, c-format
 msgid ""
 "Audio has been deleted from the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1952
+#: src/utils.c:1951
 #, c-format
 msgid ""
 "Audio has been shifted in clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1957
+#: src/utils.c:1956
 #, c-format
 msgid ""
 "Audio has been altered in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1962
+#: src/utils.c:1961
 #, c-format
 msgid ""
 "Frames have been altered in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:2135
+#: src/utils.c:2134
 #, c-format
 msgid ""
 "Set %s\n"
@@ -3669,7 +3660,7 @@
 "by another copy of LiVES.\n"
 msgstr ""
 
-#: src/utils.c:2142
+#: src/utils.c:2140
 #, c-format
 msgid ""
 "\n"
@@ -3715,67 +3706,67 @@
 msgid "Removing layout %s\n"
 msgstr ""
 
-#: src/utils.c:3014
+#: src/utils.c:2996
 msgid "Video [opening...]"
 msgstr ""
 
-#: src/utils.c:3018
+#: src/utils.c:2999
 #, c-format
 msgid "Video [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:3022
+#: src/utils.c:3002
 msgid "(Undefined)"
 msgstr ""
 
-#: src/utils.c:3025
+#: src/utils.c:3004
 msgid "(No video)"
 msgstr ""
 
-#: src/utils.c:3032
+#: src/utils.c:3011
 msgid "(No audio)"
 msgstr ""
 
-#: src/utils.c:3037
+#: src/utils.c:3015
 msgid "Mono  [opening...]"
 msgstr ""
 
-#: src/utils.c:3040
+#: src/utils.c:3017
 msgid "Left Audio [opening...]"
 msgstr ""
 
-#: src/utils.c:3045
+#: src/utils.c:3021
 #, c-format
 msgid "Mono [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:3048
+#: src/utils.c:3023
 #, c-format
 msgid "Left Audio [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:3056
+#: src/utils.c:3031
 msgid "Right Audio [opening...]"
 msgstr ""
 
-#: src/utils.c:3059
+#: src/utils.c:3033
 #, c-format
 msgid "Right Audio [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:3506
+#: src/utils.c:3472
 msgid "LiVES cannot switch to mplayer whilst clips are loading."
 msgstr ""
 
-#: src/utils.c:3559
+#: src/utils.c:3525
 msgid "LiVES cannot switch to mplayer2 whilst clips are loading."
 msgstr ""
 
-#: src/utils.c:3809
+#: src/utils.c:3775
 msgid "Cleaning up clip"
 msgstr ""
 
-#: src/utils.c:3913
+#: src/utils.c:3874
 #, c-format
 msgid ""
 "\n"
@@ -3785,30 +3776,29 @@
 "Overwrite ?\n"
 msgstr ""
 
-#: src/utils.c:4305 src/utils.c:4337 src/multitrack.c:4503
+#: src/utils.c:4250 src/utils.c:4280 src/multitrack.c:4672
 #, c-format
 msgid "_Undo %s"
 msgstr "_Anullar %s"
 
-#: src/utils.c:4306 src/utils.c:4338 src/multitrack.c:4525
+#: src/utils.c:4251 src/utils.c:4281 src/multitrack.c:4693
 #, c-format
 msgid "_Redo %s"
 msgstr "_Restablir %s"
 
-#: src/utils.c:4363
+#: src/utils.c:4305
 msgid "-------------Selection------------"
 msgstr ""
 
-#. TRANSLATORS: - try to keep the text of the middle part the same length, by deleting "-" if necessary
-#: src/utils.c:4371
+#: src/utils.c:4313
 msgid " sec ] ----------Selection---------- [ "
 msgstr ""
 
-#: src/utils.c:4371
+#: src/utils.c:4314
 msgid " frames ] ----------"
 msgstr ""
 
-#: src/utils.c:5360
+#: src/utils.c:5302
 msgid ""
 "Your version of mplayer/ffmpeg may be broken !\n"
 "See http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2071\n"
@@ -3819,11 +3809,11 @@
 "Try running Help/Troubleshoot for more information."
 msgstr ""
 
-#: src/saveplay.c:178
+#: src/saveplay.c:179
 msgid "Examining file header"
 msgstr ""
 
-#: src/saveplay.c:315 src/saveplay.c:789
+#: src/saveplay.c:316 src/saveplay.c:779
 #, c-format
 msgid "Opening %s"
 msgstr "Dobertura de %s"
@@ -3833,36 +3823,36 @@
 msgid "Opening %s start time %.2f sec. frames %d"
 msgstr ""
 
-#: src/saveplay.c:326 src/saveplay.c:4001
+#: src/saveplay.c:326 src/saveplay.c:3927
 msgid " without sound"
 msgstr ""
 
-#: src/saveplay.c:396
+#: src/saveplay.c:395
 #, c-format
 msgid "Opening audio for %s"
 msgstr ""
 
-#: src/saveplay.c:557
+#: src/saveplay.c:554
 #, c-format
 msgid "Auto trimming %.2f seconds of audio at start..."
 msgstr ""
 
-#: src/saveplay.c:567
+#: src/saveplay.c:562
 #, c-format
 msgid "Auto trimming %.2f seconds of audio at end..."
 msgstr ""
 
-#: src/saveplay.c:584
+#: src/saveplay.c:577
 #, c-format
 msgid "Auto padding with %.2f seconds of silence at start..."
 msgstr ""
 
-#: src/saveplay.c:599
+#: src/saveplay.c:590
 #, c-format
 msgid "Auto padding with %.2f seconds of silence at end..."
 msgstr ""
 
-#: src/saveplay.c:671
+#: src/saveplay.c:661
 #, c-format
 msgid ""
 "\n"
@@ -3874,11 +3864,11 @@
 "Are you sure you wish to continue ?"
 msgstr ""
 
-#: src/saveplay.c:685
+#: src/saveplay.c:676
 msgid " - please be patient."
 msgstr ""
 
-#: src/saveplay.c:938
+#: src/saveplay.c:926
 msgid ""
 "\n"
 "\n"
@@ -3886,14 +3876,14 @@
 "Please check the terminal window for more details.\n"
 msgstr ""
 
-#: src/saveplay.c:940
+#: src/saveplay.c:928
 msgid ""
 "\n"
 "\n"
 "You may need to install mplayer to open this file.\n"
 msgstr ""
 
-#: src/saveplay.c:948
+#: src/saveplay.c:934
 msgid ""
 "\n"
 "\n"
@@ -3901,29 +3891,29 @@
 "Tools|Preferences|Decoding\n"
 msgstr ""
 
-#: src/saveplay.c:1014
+#: src/saveplay.c:995
 msgid "Adding image..."
 msgstr ""
 
-#: src/saveplay.c:1108
+#: src/saveplay.c:1089
 #, c-format
 msgid "Subtitles were saved as %s\n"
 msgstr ""
 
-#: src/saveplay.c:1192
+#: src/saveplay.c:1171
 #, c-format
 msgid "LiVES: Save Frame %d as..."
 msgstr ""
 
-#: src/saveplay.c:1195
+#: src/saveplay.c:1174
 msgid "LiVES: Save Frame as..."
 msgstr ""
 
-#: src/saveplay.c:1322
+#: src/saveplay.c:1303
 msgid "LiVES: Save Clip as..."
 msgstr ""
 
-#: src/saveplay.c:1390
+#: src/saveplay.c:1369
 msgid ""
 "Saving your video could lead to a loss of quality !\n"
 "You are strongly advised to 'Save As' to a new file.\n"
@@ -3931,67 +3921,67 @@
 "Do you still wish to continue ?"
 msgstr ""
 
-#: src/saveplay.c:1517 src/saveplay.c:1683 src/saveplay.c:1762
-#: src/saveplay.c:4014
+#: src/saveplay.c:1494 src/saveplay.c:1659 src/saveplay.c:1738
+#: src/saveplay.c:3940
 msgid "Pulling frames from clip"
 msgstr ""
 
-#: src/saveplay.c:1588 src/saveplay.c:1727
+#: src/saveplay.c:1565 src/saveplay.c:1703
 msgid "Linking selection"
 msgstr ""
 
-#: src/saveplay.c:1779
+#: src/saveplay.c:1755
 msgid " (with no sound)\n"
 msgstr ""
 
-#: src/saveplay.c:1786
+#: src/saveplay.c:1761
 #, c-format
 msgid "Saving frames %d to %d%s as \"%s\" : encoder = %s : format = %s..."
 msgstr ""
 
-#: src/saveplay.c:1790
+#: src/saveplay.c:1765
 #, c-format
 msgid "Saving frames 1 to %d%s as \"%s\" : encoder %s : format = %s..."
 msgstr ""
 
-#: src/saveplay.c:1909
+#: src/saveplay.c:1890
 msgid "Saving [can take a long time]"
 msgstr ""
 
-#: src/saveplay.c:2057
+#: src/saveplay.c:2044
 msgid ""
 "\n"
 "\n"
 "Encoder error - output file was not created !\n"
 msgstr ""
 
-#: src/saveplay.c:2094
+#: src/saveplay.c:2081
 msgid "Clearing letterbox"
 msgstr ""
 
-#: src/saveplay.c:2183
+#: src/saveplay.c:2168
 #, c-format
 msgid "File size was %s\n"
 msgstr ""
 
-#: src/saveplay.c:2284
+#: src/saveplay.c:2265
 msgid "recording aborted by preview.\n"
 msgstr ""
 
-#: src/saveplay.c:2288
+#: src/saveplay.c:2268
 msgid "recording aborted by clipboard playback.\n"
 msgstr ""
 
-#: src/saveplay.c:2291
+#: src/saveplay.c:2270
 msgid "Recording performance..."
 msgstr ""
 
-#: src/saveplay.c:3293
+#: src/saveplay.c:3251
 #, c-format
 msgid "Average FPS was %.4f\n"
 msgstr ""
 
-#: src/saveplay.c:3299
+#: src/saveplay.c:3256
 msgid ""
 "\n"
 "\n"
@@ -4000,16 +3990,21 @@
 "and resize all frames to the current size.\n"
 msgstr ""
 
-#: src/saveplay.c:3479
+#: src/saveplay.c:3429
 msgid "Unknown"
 msgstr "Desconegut"
 
-#: src/saveplay.c:3588 src/saveplay.c:4585
+#: src/saveplay.c:3538 src/saveplay.c:4502
 #, c-format
 msgid "Untitled%d"
 msgstr ""
 
-#: src/saveplay.c:3633
+#: src/saveplay.c:3567
+#, c-format
+msgid "%d frames are enough !\n"
+msgstr ""
+
+#: src/saveplay.c:3579
 #, c-format
 msgid ""
 "\n"
@@ -4017,7 +4012,7 @@
 "Bad things may happen with this clip.\n"
 msgstr ""
 
-#: src/saveplay.c:3723
+#: src/saveplay.c:3667
 #, c-format
 msgid ""
 "\n"
@@ -4025,73 +4020,73 @@
 "Default can be set in Tools | Preferences | Misc.\n"
 msgstr ""
 
-#: src/saveplay.c:3735
+#: src/saveplay.c:3677
 #, c-format
 msgid "Playback speed was adjusted to %.3f frames per second to fit audio.\n"
 msgstr ""
 
-#: src/saveplay.c:3754
+#: src/saveplay.c:3694
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d *bpp=Greyscale* fps=%.3f\n"
 "Audio:"
 msgstr ""
 
-#: src/saveplay.c:3758 src/saveplay.c:4762
+#: src/saveplay.c:3698 src/saveplay.c:4671
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d bpp=%d fps=%.3f\n"
 "Audio:"
 msgstr ""
 
-#: src/saveplay.c:3762 src/saveplay.c:4766
+#: src/saveplay.c:3703 src/saveplay.c:4676
 #, c-format
 msgid "%s none\n"
 msgstr ""
 
-#: src/saveplay.c:3774
+#: src/saveplay.c:3714
 #, fuzzy, c-format
 msgid " - Author: %s\n"
 msgstr "Autor : %s"
 
-#: src/saveplay.c:3779
+#: src/saveplay.c:3717
 #, c-format
 msgid " - Title: %s\n"
 msgstr ""
 
-#: src/saveplay.c:3784
+#: src/saveplay.c:3720
 #, c-format
 msgid " - Comment: %s\n"
 msgstr ""
 
-#: src/saveplay.c:3897
+#: src/saveplay.c:3829
 #, c-format
 msgid "Saving frame %d as %s..."
 msgstr ""
 
-#: src/saveplay.c:3996
+#: src/saveplay.c:3924
 #, c-format
 msgid "Backing up %s to %s"
 msgstr ""
 
-#: src/saveplay.c:4049
+#: src/saveplay.c:3975
 msgid "Backing up"
 msgstr ""
 
-#: src/saveplay.c:4083
+#: src/saveplay.c:4009
 msgid "performance data was backed up..."
 msgstr ""
 
-#: src/saveplay.c:4661
+#: src/saveplay.c:4574
 #, c-format
 msgid "Restoring %s..."
 msgstr ""
 
-#: src/saveplay.c:4692
+#: src/saveplay.c:4603
 msgid "Restoring"
 msgstr ""
 
-#: src/saveplay.c:4714
+#: src/saveplay.c:4625
 #, c-format
 msgid ""
 "\n"
@@ -4101,22 +4096,22 @@
 msgstr ""
 
 #. TRANSLATORS: rec(ord) %.2f M(ega)B(ytes)
-#: src/saveplay.c:5207
+#: src/saveplay.c:5118
 #, c-format
 msgid "rec %.2f MB"
 msgstr ""
 
-#: src/saveplay.c:5213
+#: src/saveplay.c:5123
 #, c-format
 msgid "!rec %.2f MB"
 msgstr ""
 
 #. TRANSLATORS: rec(ord) ?? M(ega)B(ytes)
-#: src/saveplay.c:5216
+#: src/saveplay.c:5126
 msgid "rec ?? MB"
 msgstr ""
 
-#: src/saveplay.c:5241
+#: src/saveplay.c:5151
 #, c-format
 msgid ""
 "\n"
@@ -4124,54 +4119,74 @@
 "Record stop level can be set in Preferences.\n"
 msgstr ""
 
-#: src/saveplay.c:5535
+#: src/saveplay.c:5447
 msgid ""
 "\n"
 "Files from a previous run of LiVES were found.\n"
 "Do you want to attempt to recover them ?\n"
 msgstr ""
 
-#: src/saveplay.c:5557
+#: src/saveplay.c:5469
 msgid "Recovering files"
 msgstr ""
 
-#: src/saveplay.c:5560
+#: src/saveplay.c:5472
 msgid "Recovering files..."
 msgstr ""
 
-#: src/dialogs.c:72
+#: src/dialogs.c:71
 msgid "Show affected _layouts"
 msgstr ""
 
-#: src/dialogs.c:128
+#: src/dialogs.c:113
+msgid ""
+"Do _not show this warning any more\n"
+"(can be turned back on from Preferences/Warnings)"
+msgstr ""
+
+#: src/dialogs.c:127
 msgid "_Recover disk space"
 msgstr ""
 
-#: src/dialogs.c:143
+#: src/dialogs.c:142
 msgid " _Advanced Settings >>"
 msgstr ""
 
-#: src/dialogs.c:184
+#: src/dialogs.c:183 src/dialogs.c:221
 msgid "LiVES: - Warning !"
 msgstr ""
 
 #: src/dialogs.c:194
+#, fuzzy
+msgid "LiVES: - Error !"
+msgstr "LiVES: - Union"
+
+#: src/dialogs.c:204
+#, fuzzy
+msgid "LiVES: - Information"
+msgstr "LiVES: - Dobrir l'emplaçament"
+
+#: src/dialogs.c:230
 msgid "LiVES: - Question"
 msgstr ""
 
-#: src/dialogs.c:204
+#: src/dialogs.c:239
 msgid "LiVES: - File Error"
 msgstr ""
 
-#: src/dialogs.c:208
+#: src/dialogs.c:241
 msgid "_Abort"
 msgstr ""
 
-#: src/dialogs.c:213
+#: src/dialogs.c:246
 msgid "_Retry"
 msgstr ""
 
-#: src/dialogs.c:597
+#: src/dialogs.c:306
+msgid "Show _Details"
+msgstr "Veire Los _Detalhs"
+
+#: src/dialogs.c:657
 #, c-format
 msgid ""
 "FREE SPACE IN THE PARTITION CONTAINING\n"
@@ -4182,7 +4197,7 @@
 "(Disk warning levels can be configured in Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:615
+#: src/dialogs.c:676
 #, c-format
 msgid ""
 "Free space in the partition containing\n"
@@ -4194,11 +4209,11 @@
 "Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:627
+#: src/dialogs.c:688
 msgid "Audio players cannot be switched during playback."
 msgstr ""
 
-#: src/dialogs.c:632
+#: src/dialogs.c:694
 msgid ""
 "\n"
 "\n"
@@ -4206,46 +4221,46 @@
 "Please try closing some other applications first.\n"
 msgstr ""
 
-#: src/dialogs.c:752
+#: src/dialogs.c:820
 msgid "Processing has been paused."
 msgstr ""
 
-#: src/dialogs.c:937
+#: src/dialogs.c:1002
 #, c-format
 msgid ""
 "\n"
 "%s%d%% done. Time remaining: %u sec%s\n"
 msgstr ""
 
-#: src/dialogs.c:1335
+#: src/dialogs.c:1391
 #, c-format
 msgid ""
 "\n"
 "%d/%d frames opened. Time remaining %u sec.\n"
 msgstr ""
 
-#: src/dialogs.c:1337
+#: src/dialogs.c:1393
 #, c-format
 msgid ""
 "\n"
 "%d/%d frames opened.\n"
 msgstr ""
 
-#: src/dialogs.c:1341
+#: src/dialogs.c:1396
 #, c-format
 msgid ""
 "\n"
 "%d frames opened.\n"
 msgstr ""
 
-#: src/dialogs.c:1940
+#: src/dialogs.c:1993
 #, c-format
 msgid ""
 "\n"
 "Time remaining: %d sec"
 msgstr ""
 
-#: src/dialogs.c:1988
+#: src/dialogs.c:2040
 #, c-format
 msgid ""
 "\n"
@@ -4253,7 +4268,7 @@
 "Please close a file and then try again."
 msgstr ""
 
-#: src/dialogs.c:1994
+#: src/dialogs.c:2047
 #, c-format
 msgid ""
 "LiVES was unable to write to its temporary directory.\n"
@@ -4265,27 +4280,27 @@
 "Please make sure you can write to this directory."
 msgstr ""
 
-#: src/dialogs.c:2005
+#: src/dialogs.c:2059
 msgid ""
 "\n"
 "LiVES currently requires either 'mplayer', 'mplayer2', or 'sox' to function. "
 "Please install one or other of these, and try again.\n"
 msgstr ""
 
-#: src/dialogs.c:2010
+#: src/dialogs.c:2064
 msgid ""
 "Audio was not loaded; please install mplayer or mplayer2 if you expected "
 "audio for this clip.\n"
 msgstr ""
 
-#: src/dialogs.c:2014
+#: src/dialogs.c:2069
 msgid ""
 "Audio resampling is required for this format.\n"
 "Please install 'sox'\n"
 "Or switch to another encoder format in Tools | Preferences | Encoding\n"
 msgstr ""
 
-#: src/dialogs.c:2019
+#: src/dialogs.c:2075
 msgid ""
 "\n"
 "\n"
@@ -4293,19 +4308,19 @@
 "Please set the audio codec in Tools|Preferences|Encoding\n"
 msgstr ""
 
-#: src/dialogs.c:2024
+#: src/dialogs.c:2080
 msgid ""
 "This layout includes generated frames.\n"
 "It cannot be saved, you must render it to a clip first.\n"
 msgstr ""
 
-#: src/dialogs.c:2029
+#: src/dialogs.c:2085
 msgid ""
 "This layout includes generated or recorded audio.\n"
 "It cannot be saved, you must render it to a clip first.\n"
 msgstr ""
 
-#: src/dialogs.c:2039 src/dialogs.c:2137
+#: src/dialogs.c:2095 src/dialogs.c:2189
 #, c-format
 msgid ""
 "\n"
@@ -4313,83 +4328,83 @@
 "Due to restrictions in the %s format\n"
 msgstr ""
 
-#: src/dialogs.c:2059
+#: src/dialogs.c:2115
 msgid ""
 "LiVES recommends the following settings:\n"
 "\n"
 msgstr ""
 
-#: src/dialogs.c:2065 src/dialogs.c:2174 src/resample.c:850
+#: src/dialogs.c:2121 src/dialogs.c:2225 src/resample.c:839
 msgid ", signed"
 msgstr ""
 
-#: src/dialogs.c:2066 src/dialogs.c:2175 src/resample.c:853
+#: src/dialogs.c:2122 src/dialogs.c:2226 src/resample.c:841
 msgid ", unsigned"
 msgstr ""
 
-#: src/dialogs.c:2070 src/dialogs.c:2179 src/resample.c:858
+#: src/dialogs.c:2126 src/dialogs.c:2230 src/resample.c:846
 msgid ", little-endian"
 msgstr ""
 
-#: src/dialogs.c:2071 src/dialogs.c:2180 src/resample.c:861
+#: src/dialogs.c:2127 src/dialogs.c:2231 src/resample.c:848
 msgid ", big-endian"
 msgstr ""
 
-#: src/dialogs.c:2077
+#: src/dialogs.c:2132
 #, c-format
 msgid "Use an audio rate of %d Hz%s%s\n"
 msgstr ""
 
-#: src/dialogs.c:2085
+#: src/dialogs.c:2140
 #, c-format
 msgid "Set video rate to %.3f frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:2089
+#: src/dialogs.c:2143
 #, c-format
 msgid "Set video rate to %d:%d frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:2094 src/dialogs.c:2209
+#: src/dialogs.c:2148 src/dialogs.c:2258
 #, c-format
 msgid "Set video size to %d x %d pixels\n"
 msgstr ""
 
-#: src/dialogs.c:2102 src/dialogs.c:2208
+#: src/dialogs.c:2156 src/dialogs.c:2257
 msgid ""
 "\n"
 "You may wish to:\n"
 msgstr ""
 
-#: src/dialogs.c:2105 src/dialogs.c:2200
+#: src/dialogs.c:2159 src/dialogs.c:2249
 #, c-format
 msgid "resize video to %d x %d pixels\n"
 msgstr ""
 
-#: src/dialogs.c:2110
+#: src/dialogs.c:2163
 msgid "disable audio, since the target encoder cannot encode audio\n"
 msgstr ""
 
-#: src/dialogs.c:2170
+#: src/dialogs.c:2221
 msgid "LiVES must:\n"
 msgstr ""
 
-#: src/dialogs.c:2185
+#: src/dialogs.c:2235
 #, c-format
 msgid "resample audio to %d Hz%s%s\n"
 msgstr ""
 
-#: src/dialogs.c:2192
+#: src/dialogs.c:2242
 #, c-format
 msgid "resample video to %.3f frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:2196
+#: src/dialogs.c:2245
 #, c-format
 msgid "resample video to %d:%d frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:2215
+#: src/dialogs.c:2263
 msgid ""
 "\n"
 "You will be able to undo these changes afterwards.\n"
@@ -4398,14 +4413,14 @@
 "\n"
 msgstr ""
 
-#: src/dialogs.c:2218
+#: src/dialogs.c:2265
 msgid ""
 "\n"
 "Changes applied to the selection will not be permanent.\n"
 "\n"
 msgstr ""
 
-#: src/dialogs.c:2237
+#: src/dialogs.c:2285
 msgid ""
 "\n"
 "\n"
@@ -4414,7 +4429,7 @@
 "Try recording for just a selection of the file."
 msgstr ""
 
-#: src/dialogs.c:2244
+#: src/dialogs.c:2293
 msgid ""
 "The playback speed (fps), or the audio rate\n"
 " of the clipboard does not match\n"
@@ -4425,7 +4440,7 @@
 "Please press Cancel to abort the insert, or OK to continue."
 msgstr ""
 
-#: src/dialogs.c:2253
+#: src/dialogs.c:2304
 #, c-format
 msgid ""
 "When opening a yuvmpeg stream, you should first create a fifo file in:\n"
@@ -4438,11 +4453,11 @@
 "click Cancel."
 msgstr ""
 
-#: src/dialogs.c:2305
+#: src/dialogs.c:2356
 msgid "Show Keys"
 msgstr ""
 
-#: src/dialogs.c:2306
+#: src/dialogs.c:2358
 msgid ""
 "You can use the following keys during playback to control LiVES:-\n"
 "\n"
@@ -4484,11 +4499,11 @@
 "g                             ping pong loops\n"
 msgstr ""
 
-#: src/dialogs.c:2313
+#: src/dialogs.c:2365
 msgid "Multitrack Keys"
 msgstr ""
 
-#: src/dialogs.c:2314
+#: src/dialogs.c:2367
 msgid ""
 "You can use the following keys to control the multitrack window:-\n"
 "\n"
@@ -4510,18 +4525,18 @@
 "For other keys, see the menus.\n"
 msgstr ""
 
-#: src/dialogs.c:2322
+#: src/dialogs.c:2375
 msgid "Message History"
 msgstr ""
 
-#: src/dialogs.c:2335
+#: src/dialogs.c:2388
 #, c-format
 msgid ""
 "After upgrading/installing, you may need to adjust the <prefix_dir> setting "
 "in your %s file"
 msgstr ""
 
-#: src/dialogs.c:2344
+#: src/dialogs.c:2399
 #, c-format
 msgid ""
 "\n"
@@ -4532,25 +4547,25 @@
 "or change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/dialogs.c:2352
+#: src/dialogs.c:2408
 msgid ""
 "Sorry, unknown audio type.\n"
 "\n"
 " (Filenames must end in .mp3, .ogg, .wav, .mod, .xm or .it)"
 msgstr ""
 
-#: src/dialogs.c:2353
+#: src/dialogs.c:2409
 msgid "failed (unknown type)\n"
 msgstr ""
 
-#: src/dialogs.c:2358
+#: src/dialogs.c:2415
 msgid ""
 "\n"
 "Do you wish to remove the layout files associated with this set ?\n"
 "(They will not be usable without the set).\n"
 msgstr ""
 
-#: src/dialogs.c:2363
+#: src/dialogs.c:2421
 #, c-format
 msgid ""
 "\n"
@@ -4559,7 +4574,7 @@
 "Click Cancel to pick a new name.\n"
 msgstr ""
 
-#: src/dialogs.c:2370
+#: src/dialogs.c:2429
 msgid ""
 "\n"
 "Frames from this clip are used in some multitrack layouts.\n"
@@ -4567,7 +4582,7 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2374
+#: src/dialogs.c:2433
 msgid ""
 "\n"
 "Audio from this clip is used in some multitrack layouts.\n"
@@ -4575,7 +4590,7 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2378
+#: src/dialogs.c:2438
 #, c-format
 msgid ""
 "\n"
@@ -4586,7 +4601,7 @@
 "Otherwise click Cancel to skip loading this file.\n"
 msgstr ""
 
-#: src/dialogs.c:2385
+#: src/dialogs.c:2446
 #, c-format
 msgid ""
 "\n"
@@ -4596,7 +4611,7 @@
 "The clip could not be loaded.\n"
 msgstr ""
 
-#: src/dialogs.c:2392
+#: src/dialogs.c:2455
 msgid ""
 "\n"
 "Dear user, the jack developers decided to remove the -Z option from jackd.\n"
@@ -4604,7 +4619,7 @@
 "Alternately, select a different audio player in Preferences.\n"
 msgstr ""
 
-#: src/dialogs.c:2396
+#: src/dialogs.c:2460
 msgid ""
 "\n"
 "Unable to start up jack. Please ensure that alsa is set up correctly on your "
@@ -4613,13 +4628,13 @@
 "Automatic jack startup will be disabled now.\n"
 msgstr ""
 
-#: src/dialogs.c:2402
+#: src/dialogs.c:2466
 msgid ""
 "\n"
 "Unable to connect to jack server. Please start jack before starting LiVES\n"
 msgstr ""
 
-#: src/dialogs.c:2411
+#: src/dialogs.c:2475
 #, c-format
 msgid ""
 "\n"
@@ -4630,13 +4645,13 @@
 "%s\n"
 msgstr ""
 
-#: src/dialogs.c:2418
+#: src/dialogs.c:2482
 msgid ""
 "\n"
 "Alternately, you can restart LiVES and select another audio player.\n"
 msgstr ""
 
-#: src/dialogs.c:2423
+#: src/dialogs.c:2488
 #, c-format
 msgid ""
 "\n"
@@ -4646,7 +4661,7 @@
 "It is recommended to increase it to at least %d MB"
 msgstr ""
 
-#: src/dialogs.c:2429
+#: src/dialogs.c:2496
 #, c-format
 msgid ""
 "\n"
@@ -4655,7 +4670,7 @@
 "Do you wish to delete them ?\n"
 msgstr ""
 
-#: src/dialogs.c:2436
+#: src/dialogs.c:2504
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for multitrack undo.\n"
@@ -4663,7 +4678,7 @@
 "using Preferences/Multitrack/Undo Memory\n"
 msgstr ""
 
-#: src/dialogs.c:2440
+#: src/dialogs.c:2508
 msgid ""
 "\n"
 "Out of memory for undo.\n"
@@ -4671,63 +4686,63 @@
 "using Preferences/Multitrack/Undo Memory\n"
 msgstr ""
 
-#: src/dialogs.c:2444
+#: src/dialogs.c:2512
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for the multitrack undo buffer.\n"
 msgstr ""
 
-#: src/dialogs.c:2446
+#: src/dialogs.c:2514
 msgid "or enter a smaller value.\n"
 msgstr ""
 
-#: src/dialogs.c:2448
+#: src/dialogs.c:2516
 msgid "Try again from the clip editor, try closing some other applications\n"
 msgstr ""
 
-#: src/dialogs.c:2449
+#: src/dialogs.c:2517
 msgid "Try closing some other applications\n"
 msgstr ""
 
-#: src/dialogs.c:2460
+#: src/dialogs.c:2529
 msgid ""
 "Multitrack is set to 0 audio channels, but this layout has audio.\n"
 "You should adjust the audio settings from the Tools menu.\n"
 msgstr ""
 
-#: src/dialogs.c:2464
+#: src/dialogs.c:2534
 msgid ""
 "The current layout has audio, so audio channels may not be set to zero.\n"
 msgstr ""
 
-#: src/dialogs.c:2468
+#: src/dialogs.c:2539
 msgid ""
 "Multitrack audio preview is only available with the\n"
 "\"jack\" or \"pulse audio\" audio player.\n"
 "You can set this in Tools|Preferences|Playback."
 msgstr ""
 
-#: src/dialogs.c:2472
+#: src/dialogs.c:2545
 msgid ""
 "Errors were detected in the layout (which may be due to transferring from "
 "another system, or from an older version of LiVES).\n"
 "Should I try to repair the disk copy of the layout ?\n"
 msgstr ""
 
-#: src/dialogs.c:2476
+#: src/dialogs.c:2549
 msgid ""
 "LiVES was unable to load the layout.\n"
 "Sorry.\n"
 msgstr ""
 
-#: src/dialogs.c:2482
+#: src/dialogs.c:2555
 msgid ""
 "\n"
 "\n"
 "Audio rate must be greater than 0.\n"
 msgstr ""
 
-#: src/dialogs.c:2486
+#: src/dialogs.c:2559
 msgid ""
 "\n"
 "Event list will be very large\n"
@@ -4735,14 +4750,14 @@
 "Are you sure you wish to view it ?\n"
 msgstr ""
 
-#: src/dialogs.c:2491
+#: src/dialogs.c:2564
 msgid ""
 "\n"
 "\n"
 "You must install 'dvgrab' to use this function.\n"
 msgstr ""
 
-#: src/dialogs.c:2496
+#: src/dialogs.c:2570
 msgid ""
 "\n"
 "\n"
@@ -4751,25 +4766,25 @@
 "You may need to select one of these in Tools/Preferences/Playback.\n"
 msgstr ""
 
-#: src/dialogs.c:2500
+#: src/dialogs.c:2574
 msgid "Video playback plugin failed to initialise palette !\n"
 msgstr ""
 
-#: src/dialogs.c:2504
+#: src/dialogs.c:2579
 msgid "Decoder plugin failed to initialise palette !\n"
 msgstr ""
 
-#: src/dialogs.c:2509
+#: src/dialogs.c:2584
 msgid "Unable to set framerate of video plugin\n"
 msgstr ""
 
-#: src/dialogs.c:2514
+#: src/dialogs.c:2590
 msgid ""
 "After a crash, it is advisable to clean up the disk with\n"
 "File|Clean up disk space\n"
 msgstr ""
 
-#: src/dialogs.c:2526
+#: src/dialogs.c:2604
 #, c-format
 msgid ""
 "Stream frame size is too large for your network buffers.\n"
@@ -4778,33 +4793,33 @@
 "echo %d > /proc/sys/net/core/rmem_max\n"
 msgstr ""
 
-#: src/dialogs.c:2714
+#: src/dialogs.c:2800
 msgid "cancelled.\n"
 msgstr ""
 
-#: src/dialogs.c:2721
+#: src/dialogs.c:2805
 msgid "failed.\n"
 msgstr ""
 
-#: src/dialogs.c:2728
+#: src/dialogs.c:2810
 msgid "done.\n"
 msgstr "acabat.\n"
 
-#: src/dialogs.c:2732
+#: src/dialogs.c:2814
 msgid "error in file. Failed.\n"
 msgstr ""
 
-#: src/dialogs.c:2766 src/dialogs.c:2815 src/dialogs.c:2839
+#: src/dialogs.c:2848 src/dialogs.c:2897 src/dialogs.c:2921
 #, c-format
 msgid "Additional info: %s\n"
 msgstr ""
 
-#: src/dialogs.c:2769
+#: src/dialogs.c:2851
 #, c-format
 msgid "The error value was %d%s\n"
 msgstr ""
 
-#: src/dialogs.c:2772
+#: src/dialogs.c:2854
 #, c-format
 msgid ""
 "\n"
@@ -4814,7 +4829,7 @@
 "%s%s%s"
 msgstr ""
 
-#: src/dialogs.c:2818
+#: src/dialogs.c:2900
 #, c-format
 msgid ""
 "\n"
@@ -4824,7 +4839,7 @@
 "%s"
 msgstr ""
 
-#: src/dialogs.c:2842
+#: src/dialogs.c:2924
 #, c-format
 msgid ""
 "\n"
@@ -4834,7 +4849,7 @@
 "%s"
 msgstr ""
 
-#: src/dialogs.c:2886
+#: src/dialogs.c:2968
 #, c-format
 msgid ""
 "\n"
@@ -4843,7 +4858,7 @@
 "Please check for possible error causes.\n"
 msgstr ""
 
-#: src/dialogs.c:2890
+#: src/dialogs.c:2971
 #, c-format
 msgid ""
 "\n"
@@ -4853,7 +4868,7 @@
 "%s.\n"
 msgstr ""
 
-#: src/dialogs.c:2921
+#: src/dialogs.c:3002
 #, c-format
 msgid ""
 "\n"
@@ -4862,7 +4877,7 @@
 "Please check for possible error causes.\n"
 msgstr ""
 
-#: src/dialogs.c:2925
+#: src/dialogs.c:3005
 #, c-format
 msgid ""
 "\n"
@@ -4872,12 +4887,12 @@
 "%s.\n"
 msgstr ""
 
-#: src/dialogs.c:2993
+#: src/dialogs.c:3073
 #, c-format
 msgid "Value for \"%s\" could not be read."
 msgstr ""
 
-#: src/dialogs.c:3011
+#: src/dialogs.c:3091
 #, c-format
 msgid ""
 "\n"
@@ -4886,7 +4901,7 @@
 "Please check your system for errors.\n"
 msgstr ""
 
-#: src/dialogs.c:3020
+#: src/dialogs.c:3100
 #, c-format
 msgid ""
 "\n"
@@ -4895,7 +4910,7 @@
 "Please check the file permissions and try again."
 msgstr ""
 
-#: src/dialogs.c:3027
+#: src/dialogs.c:3109
 #, c-format
 msgid ""
 "\n"
@@ -4904,7 +4919,7 @@
 "Please check the directory permissions and try again."
 msgstr ""
 
-#: src/dialogs.c:3034
+#: src/dialogs.c:3116
 #, c-format
 msgid ""
 "\n"
@@ -4912,14 +4927,14 @@
 "%s\n"
 msgstr ""
 
-#: src/dialogs.c:3041
+#: src/dialogs.c:3123
 msgid ""
 "\n"
 "Abort and exit immediately from LiVES\n"
 "Are you sure ?\n"
 msgstr ""
 
-#: src/dialogs.c:3047
+#: src/dialogs.c:3129
 #, c-format
 msgid ""
 "\n"
@@ -4927,13 +4942,13 @@
 "Please select another encoder from the list.\n"
 msgstr ""
 
-#: src/dialogs.c:3056
+#: src/dialogs.c:3139
 msgid ""
 "\n"
 "This card is already in use and cannot be opened multiple times.\n"
 msgstr ""
 
-#: src/dialogs.c:3061
+#: src/dialogs.c:3145
 #, c-format
 msgid ""
 "\n"
@@ -4943,27 +4958,27 @@
 "- Check if the device actually exists.\n"
 msgstr ""
 
-#: src/dialogs.c:3068
+#: src/dialogs.c:3153
 msgid ""
 "\n"
 "This file already has subtitles loaded.\n"
 "Do you wish to overwrite the existing subtitles ?\n"
 msgstr ""
 
-#: src/dialogs.c:3072
+#: src/dialogs.c:3157
 msgid ""
 "\n"
 "LiVES currently only supports subtitles of type .srt and .sub.\n"
 msgstr ""
 
-#: src/dialogs.c:3076
+#: src/dialogs.c:3161
 msgid ""
 "\n"
 "Erase all subtitles from this clip.\n"
 "Are you sure ?\n"
 msgstr ""
 
-#: src/dialogs.c:3082
+#: src/dialogs.c:3168
 #, c-format
 msgid ""
 "\n"
@@ -4972,14 +4987,14 @@
 "or OK to continue and save as type \"%s\"\n"
 msgstr ""
 
-#: src/dialogs.c:3089
+#: src/dialogs.c:3176
 msgid ""
 "\n"
 "Do you wish to move the current clip sets to the new directory ?\n"
 "(If unsure, click Yes)\n"
 msgstr ""
 
-#: src/dialogs.c:3093
+#: src/dialogs.c:3181
 #, c-format
 msgid ""
 "\n"
@@ -4990,19 +5005,19 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:3099
+#: src/dialogs.c:3188
 msgid ""
 "\n"
 "No video input devices could be found.\n"
 msgstr ""
 
-#: src/dialogs.c:3103
+#: src/dialogs.c:3192
 msgid ""
 "\n"
 "All video input devices are already in use.\n"
 msgstr ""
 
-#: src/dialogs.c:3107
+#: src/dialogs.c:3196
 msgid ""
 "\n"
 "\n"
@@ -5010,15 +5025,14 @@
 "DO NOT SHUT DOWN OR CLOSE LIVES !\n"
 msgstr ""
 
-#: src/dialogs.c:3127
+#: src/dialogs.c:3203
 #, c-format
 msgid ""
 "No clips were recovered for set (%s).\n"
 "Please check the spelling of the set name and try again.\n"
 msgstr ""
 
-#. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:3136
+#: src/dialogs.c:3214
 #, c-format
 msgid ""
 "\n"
@@ -5030,7 +5044,7 @@
 msgstr ""
 
 #. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:3144
+#: src/dialogs.c:3222
 #, c-format
 msgid ""
 "\n"
@@ -5039,34 +5053,34 @@
 "\n"
 msgstr ""
 
-#: src/dialogs.c:3150
+#: src/dialogs.c:3228
 msgid ""
 "\n"
 "You must have autolives.pl installed and in your path to use this toy.\n"
 "Consult your package distributor.\n"
 msgstr ""
 
-#: src/dialogs.c:3154
+#: src/dialogs.c:3232
 msgid ""
 "\n"
 "You must have a minimum of one clip loaded to use this toy.\n"
 msgstr ""
 
-#: src/dialogs.c:3158
+#: src/dialogs.c:3236
 msgid ""
 "\n"
 "LiVES lost its connection to jack and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:3162
+#: src/dialogs.c:3240
 msgid ""
 "\n"
 "LiVES lost its connection to pulseaudio and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:3175
+#: src/dialogs.c:3254
 #, c-format
 msgid ""
 "\n"
@@ -5075,543 +5089,543 @@
 "Do you wish to allow this (for this session only) ?\n"
 msgstr ""
 
-#: src/effects.c:60
+#: src/effects.c:61
 msgid "generator"
 msgstr ""
 
-#: src/effects.c:61
+#: src/effects.c:62
 msgid "Generators"
 msgstr ""
 
-#: src/effects.c:63
+#: src/effects.c:64
 msgid "audio generator"
 msgstr ""
 
-#: src/effects.c:64
+#: src/effects.c:65
 msgid "Audio Generators"
 msgstr ""
 
-#: src/effects.c:66
+#: src/effects.c:67
 msgid "audio/video generator"
 msgstr ""
 
-#: src/effects.c:67
+#: src/effects.c:68
 msgid "Audio/Video Generators"
 msgstr ""
 
-#: src/effects.c:69
+#: src/effects.c:70
 msgid "data generator"
 msgstr ""
 
-#: src/effects.c:70
+#: src/effects.c:71
 msgid "Data Generators"
 msgstr ""
 
-#: src/effects.c:72
+#: src/effects.c:73
 msgid "data visualiser"
 msgstr ""
 
-#: src/effects.c:73
+#: src/effects.c:74
 msgid "Data Visualisers"
 msgstr ""
 
-#: src/effects.c:75
+#: src/effects.c:76
 msgid "data processor"
 msgstr ""
 
-#: src/effects.c:76
+#: src/effects.c:77
 msgid "Data Processors"
 msgstr ""
 
-#: src/effects.c:78
+#: src/effects.c:79
 msgid "data source"
 msgstr ""
 
-#: src/effects.c:79
+#: src/effects.c:80
 msgid "Data Sources"
 msgstr ""
 
-#: src/effects.c:81
+#: src/effects.c:82
 msgid "transition"
 msgstr ""
 
-#: src/effects.c:82
+#: src/effects.c:83
 msgid "Transitions"
 msgstr "Transicions"
 
-#: src/effects.c:84
+#: src/effects.c:85
 msgid "effect"
 msgstr "efièch"
 
-#: src/effects.c:87 src/rfx-builder.c:187
+#: src/effects.c:88 src/rfx-builder.c:187
 msgid "utility"
 msgstr "utilitari"
 
-#: src/effects.c:88
+#: src/effects.c:89
 msgid "Utilities"
 msgstr "Utilitaris"
 
-#: src/effects.c:90
+#: src/effects.c:91
 msgid "compositor"
 msgstr ""
 
-#: src/effects.c:91
+#: src/effects.c:92
 msgid "Compositors"
 msgstr ""
 
-#: src/effects.c:93
+#: src/effects.c:94
 msgid "tap"
 msgstr ""
 
-#: src/effects.c:94
+#: src/effects.c:95
 msgid "Taps"
 msgstr ""
 
-#: src/effects.c:96
+#: src/effects.c:97
 msgid "splitter"
 msgstr ""
 
-#: src/effects.c:97
+#: src/effects.c:98
 msgid "Splitters"
 msgstr "Separadors"
 
-#: src/effects.c:99
+#: src/effects.c:100
 msgid "converter"
 msgstr ""
 
-#: src/effects.c:100
+#: src/effects.c:101
 msgid "Converters"
 msgstr ""
 
-#: src/effects.c:102
+#: src/effects.c:103
 msgid "analyser"
 msgstr ""
 
-#: src/effects.c:103
+#: src/effects.c:104
 msgid "Analysers"
 msgstr ""
 
-#: src/effects.c:108
+#: src/effects.c:109
 msgid "audio/video"
 msgstr ""
 
-#: src/effects.c:109
+#: src/effects.c:110
 msgid "Audio/Video Transitions"
 msgstr ""
 
-#: src/effects.c:111
+#: src/effects.c:112
 msgid "video only"
 msgstr ""
 
-#: src/effects.c:112
+#: src/effects.c:113
 msgid "Video only Transitions"
 msgstr ""
 
-#: src/effects.c:114 src/multitrack.c:10740
+#: src/effects.c:115 src/multitrack.c:10962
 msgid "audio only"
 msgstr ""
 
-#: src/effects.c:115
+#: src/effects.c:116
 msgid "Audio only Transitions"
 msgstr ""
 
-#: src/effects.c:117 src/effects.c:120 src/multitrack.c:18757
+#: src/effects.c:118 src/effects.c:121 src/multitrack.c:19097
 msgid "audio"
 msgstr "àudio"
 
-#: src/effects.c:118
+#: src/effects.c:119
 msgid "Audio Mixers"
 msgstr ""
 
-#: src/effects.c:121
+#: src/effects.c:122
 msgid "Audio Effects"
 msgstr ""
 
-#: src/effects.c:123
+#: src/effects.c:124
 msgid "video"
 msgstr ""
 
-#: src/effects.c:124
+#: src/effects.c:125
 msgid "Video Effects"
 msgstr ""
 
-#: src/effects.c:126
+#: src/effects.c:127
 msgid "audio volume controller"
 msgstr ""
 
-#: src/effects.c:127
+#: src/effects.c:128
 msgid "Audio Volume Controllers"
 msgstr ""
 
-#: src/effects.c:129
+#: src/effects.c:130
 msgid "video analyser"
 msgstr ""
 
-#: src/effects.c:130
+#: src/effects.c:131
 msgid "Video analysers"
 msgstr ""
 
-#: src/effects.c:132
+#: src/effects.c:133
 msgid "audio analyser"
 msgstr ""
 
-#: src/effects.c:133
+#: src/effects.c:134
 msgid "Audio Analysers"
 msgstr ""
 
-#: src/effects.c:137 src/plugins.c:2559 src/plugins.c:2573
+#: src/effects.c:138 src/plugins.c:2507 src/plugins.c:2521
 msgid "unknown"
 msgstr "desconegut"
 
-#: src/effects.c:238
+#: src/effects.c:235
 #, c-format
 msgid "%s all frames..."
 msgstr ""
 
-#: src/effects.c:243
+#: src/effects.c:239
 #, c-format
 msgid "%s clipboard into frames %d to %d..."
 msgstr ""
 
-#: src/effects.c:250
+#: src/effects.c:245
 #, c-format
 msgid "%s to clipboard..."
 msgstr ""
 
-#: src/effects.c:254
+#: src/effects.c:248
 #, c-format
 msgid "%s to new clip..."
 msgstr ""
 
-#: src/effects.c:259
+#: src/effects.c:252
 #, c-format
 msgid "%s frames %d to %d..."
 msgstr ""
 
-#: src/effects.c:290
+#: src/effects.c:283
 #, c-format
 msgid "%s clipboard with selection"
 msgstr ""
 
-#: src/effects.c:295
+#: src/effects.c:287
 #, c-format
 msgid "%s to clipboard"
 msgstr ""
 
-#: src/effects.c:299
+#: src/effects.c:290
 #, c-format
 msgid "%s to new clip"
 msgstr ""
 
-#: src/effects.c:304
+#: src/effects.c:294
 #, c-format
 msgid "%s frames %d to %d"
 msgstr ""
 
-#: src/effects.c:456 src/effects.c:523
+#: src/effects.c:443 src/effects.c:507
 msgid ""
 "\n"
 "No frames were generated.\n"
 msgstr ""
 
-#: src/effects-weed.c:431
+#: src/effects-weed.c:452
 msgid "integer"
 msgstr ""
 
-#: src/effects-weed.c:432
+#: src/effects-weed.c:454
 msgid "int64"
 msgstr ""
 
-#: src/effects-weed.c:433
+#: src/effects-weed.c:456
 msgid "boolean"
 msgstr ""
 
-#: src/effects-weed.c:434
+#: src/effects-weed.c:458
 msgid "double"
 msgstr ""
 
-#: src/effects-weed.c:435
+#: src/effects-weed.c:460
 msgid "string"
 msgstr ""
 
-#: src/effects-weed.c:436
+#: src/effects-weed.c:462
 msgid "pointer"
 msgstr ""
 
-#: src/effects-weed.c:4591
+#: src/effects-weed.c:4581
 #, c-format
 msgid "Error: plugin %s has no weed_setup() function.\n"
 msgstr ""
 
-#: src/effects-weed.c:4606
+#: src/effects-weed.c:4595
 #, c-format
 msgid "No usable filters found in plugin %s\n"
 msgstr ""
 
-#: src/effects-weed.c:4680
+#: src/effects-weed.c:4668
 #, c-format
 msgid "Found duplicate plugin %s"
 msgstr ""
 
-#: src/effects-weed.c:4734
+#: src/effects-weed.c:4723
 #, c-format
 msgid ""
 "Info: Unable to load plugin %s\n"
 "Error was: %s\n"
 msgstr ""
 
-#: src/effects-weed.c:4737 src/effects-weed.c:5858
+#: src/effects-weed.c:4726 src/effects-weed.c:5847
 msgid "Some plugin directories"
 msgstr ""
 
 #. TRANSLATORS: example " - LADSPA plugins -"
-#: src/effects-weed.c:4812 src/rte_window.c:2105
+#: src/effects-weed.c:4801 src/rte_window.c:2107
 #, c-format
 msgid " - %s plugins -"
 msgstr ""
 
-#: src/effects-weed.c:5012
+#: src/effects-weed.c:4998
 #, c-format
 msgid "Successfully loaded %d Weed filters\n"
 msgstr ""
 
-#: src/effects-weed.c:5177
+#: src/effects-weed.c:5162
 #, c-format
 msgid "Invalid compound effect %s - has conflicting target_fps\n"
 msgstr ""
 
-#: src/effects-weed.c:5197
+#: src/effects-weed.c:5182
 #, c-format
 msgid "Invalid compound effect %s - has multiple transition parameters\n"
 msgstr ""
 
-#: src/effects-weed.c:5211
+#: src/effects-weed.c:5196
 #, c-format
 msgid "Invalid compound effect %s - has multiple master volume parameters\n"
 msgstr ""
 
-#: src/effects-weed.c:5346
+#: src/effects-weed.c:5329
 #, c-format
 msgid "Invalid compound effect %s - must have >1 sub filters\n"
 msgstr ""
 
-#: src/effects-weed.c:5366
+#: src/effects-weed.c:5349
 #, c-format
 msgid "Invalid effect %s found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5381
+#: src/effects-weed.c:5364
 #, c-format
 msgid "Invalid default found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5392
+#: src/effects-weed.c:5375
 #, c-format
 msgid "Invalid filter %d for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5406
+#: src/effects-weed.c:5389
 #, c-format
 msgid "Invalid param %d for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5433
+#: src/effects-weed.c:5416
 #, c-format
 msgid ""
 "Invalid number of values for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5467
+#: src/effects-weed.c:5450
 #, c-format
 msgid ""
 "Invalid non-boolean value for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5500
+#: src/effects-weed.c:5483
 #, c-format
 msgid "Invalid param link found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5511
+#: src/effects-weed.c:5494
 #, c-format
 msgid ""
 "Invalid out filter %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5529
+#: src/effects-weed.c:5513
 #, c-format
 msgid ""
 "Invalid out param %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5541
+#: src/effects-weed.c:5526
 #, c-format
 msgid ""
 "Invalid non-boolean value for autoscale found in compound effect %s, line "
 "%d\n"
 msgstr ""
 
-#: src/effects-weed.c:5552
+#: src/effects-weed.c:5537
 #, c-format
 msgid ""
 "Invalid in filter %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5566
+#: src/effects-weed.c:5552
 #, c-format
 msgid ""
 "Invalid in param %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5594
+#: src/effects-weed.c:5581
 #, c-format
 msgid "Invalid channel link found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5605
+#: src/effects-weed.c:5592
 #, c-format
 msgid ""
 "Invalid out filter %d for link channels found in compound effect %s, line "
 "%d\n"
 msgstr ""
 
-#: src/effects-weed.c:5623
+#: src/effects-weed.c:5611
 #, c-format
 msgid ""
 "Invalid out channel %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5633
+#: src/effects-weed.c:5622
 #, c-format
 msgid ""
 "Invalid in filter %d for link channels found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5651
+#: src/effects-weed.c:5641
 #, c-format
 msgid ""
 "Invalid in channel %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5687
+#: src/effects-weed.c:5678
 #, c-format
 msgid "Compound:%s"
 msgstr ""
 
-#: src/effects-weed.c:5758
+#: src/effects-weed.c:5749
 #, c-format
 msgid "Successfully loaded %d compound filters\n"
 msgstr ""
 
-#: src/effects-weed.c:6591
+#: src/effects-weed.c:6570
 #, c-format
 msgid "Effect %s cannot be used with this audio player.\n"
 msgstr ""
 
-#: src/effects-weed.c:6737
+#: src/effects-weed.c:6718
 #, c-format
 msgid "Failed to start instance %s, error code %d\n"
 msgstr ""
 
-#: src/effects-weed.c:6814
+#: src/effects-weed.c:6797
 #, c-format
 msgid "Unable to start generator %s\n"
 msgstr ""
 
-#: src/effects-weed.c:7621
+#: src/effects-weed.c:7607
 #, c-format
 msgid "Failed to start generator %s\n"
 msgstr ""
 
-#: src/effects-weed.c:7718
+#: src/effects-weed.c:7701
 #, c-format
 msgid "Failed to start generator %s, error %d\n"
 msgstr ""
 
-#: src/effects-weed.c:9012
+#: src/effects-weed.c:8993
 #, c-format
 msgid "%s [unstable] (%s)"
 msgstr ""
 
-#: src/effects-data.c:3278
+#: src/effects-data.c:3234
 #, c-format
 msgid "ACTIVATE (%s)"
 msgstr ""
 
-#: src/effects-data.c:3548
+#: src/effects-data.c:3501
 msgid "ACTIVATE"
 msgstr ""
 
-#: src/effects-data.c:3876
+#: src/effects-data.c:3829
 #, c-format
 msgid "Key slot %d"
 msgstr ""
 
-#: src/effects-data.c:3998
+#: src/effects-data.c:3951
 msgid "Autoscale"
 msgstr ""
 
-#: src/effects-data.c:4089
+#: src/effects-data.c:4042
 msgid "Add another connection for this output parameter"
 msgstr ""
 
-#: src/effects-data.c:4102 src/effects-data.c:4151
+#: src/effects-data.c:4055 src/effects-data.c:4104
 msgid "Delete this connection"
 msgstr ""
 
-#: src/effects-data.c:4138
+#: src/effects-data.c:4091
 msgid "Add another connection for this output channel"
 msgstr ""
 
-#: src/effects-data.c:4223
+#: src/effects-data.c:4176
 msgid "Connected to -->"
 msgstr ""
 
-#: src/effects-data.c:4243
+#: src/effects-data.c:4196
 #, c-format
 msgid "%s - Alpha Channel Connections"
 msgstr ""
 
-#: src/effects-data.c:4316
+#: src/effects-data.c:4269
 #, c-format
 msgid "%s - Parameter Data Connections"
 msgstr ""
 
-#: src/effects-data.c:4336
+#: src/effects-data.c:4289
 msgid "Autoscale All"
 msgstr ""
 
-#: src/effects-data.c:4361 src/effects-data.c:4890
+#: src/effects-data.c:4314 src/effects-data.c:4841
 msgid "ACTIVATED"
 msgstr ""
 
-#: src/effects-data.c:4774
+#: src/effects-data.c:4726
 msgid "LiVES: - Parameter and Alpha Channel Connections"
 msgstr ""
 
-#: src/effects-data.c:4785
+#: src/effects-data.c:4736
 msgid "Auto Connect Channels"
 msgstr ""
 
-#: src/effects-data.c:4797
+#: src/effects-data.c:4748
 msgid "Auto Connect Parameters"
 msgstr ""
 
-#: src/effects-data.c:4807
+#: src/effects-data.c:4758
 msgid "Disconnect All"
 msgstr ""
 
-#: src/effects-data.c:4875
+#: src/effects-data.c:4826
 #, c-format
 msgid "Input channel is already connected from (%d,%d) %s"
 msgstr ""
 
-#: src/effects-data.c:4891
+#: src/effects-data.c:4842
 #, c-format
 msgid "Input parameter is already connected from (%d,%d) %s"
 msgstr ""
 
-#: src/effects-data.c:4899
+#: src/effects-data.c:4851
 msgid "Input and output parameters are not compatible"
 msgstr ""
 
@@ -5623,43 +5637,43 @@
 msgid "_Reset Values"
 msgstr ""
 
-#: src/framedraw.c:267
+#: src/framedraw.c:265
 msgid "_Frame"
 msgstr ""
 
-#: src/paramspecial.c:266
+#: src/paramspecial.c:259
 msgid "Maintain _Aspect Ratio"
 msgstr ""
 
-#: src/paramspecial.c:267
+#: src/paramspecial.c:260
 msgid "Maintain aspect ratio of original frame"
 msgstr ""
 
-#: src/paramspecial.c:341
+#: src/paramspecial.c:335
 msgid "Display Password"
 msgstr ""
 
-#: src/paramwindow.c:450
+#: src/paramwindow.c:447
 msgid "Transition _In"
 msgstr ""
 
-#: src/paramwindow.c:452
+#: src/paramwindow.c:449
 msgid "Click to set the transition parameter to show only the front frame"
 msgstr ""
 
-#: src/paramwindow.c:474
+#: src/paramwindow.c:472
 msgid "Crossfade audio"
 msgstr ""
 
-#: src/paramwindow.c:475
+#: src/paramwindow.c:473
 msgid "Check the box to make audio transition with the video"
 msgstr ""
 
-#: src/paramwindow.c:493
+#: src/paramwindow.c:492
 msgid "Transition _Out"
 msgstr ""
 
-#: src/paramwindow.c:495
+#: src/paramwindow.c:494
 msgid "Click to set the transition parameter to show only the rear frame"
 msgstr ""
 
@@ -5672,23 +5686,23 @@
 msgid "%s : size"
 msgstr ""
 
-#: src/paramwindow.c:598
+#: src/paramwindow.c:597
 msgid "New size (pixels)"
 msgstr ""
 
-#: src/paramwindow.c:617 src/plugins.c:997
+#: src/paramwindow.c:616 src/plugins.c:973
 msgid "_Width"
 msgstr ""
 
-#: src/paramwindow.c:636 src/plugins.c:1003
+#: src/paramwindow.c:635 src/plugins.c:979
 msgid "_Height"
 msgstr "_Nautor"
 
-#: src/paramwindow.c:684
+#: src/paramwindow.c:683
 msgid "Generate to _Clipboard"
 msgstr ""
 
-#: src/paramwindow.c:686
+#: src/paramwindow.c:685
 msgid "Generate frames to the clipboard"
 msgstr ""
 
@@ -5700,7 +5714,7 @@
 msgid "Generate frames to a new clip"
 msgstr ""
 
-#: src/paramwindow.c:822
+#: src/paramwindow.c:824
 #, c-format
 msgid ""
 "\n"
@@ -5708,71 +5722,71 @@
 "\n"
 msgstr ""
 
-#: src/paramwindow.c:920 src/paramwindow.c:930
+#: src/paramwindow.c:934 src/paramwindow.c:942
 msgid "Set as default"
 msgstr ""
 
-#: src/paramwindow.c:922 src/paramwindow.c:938
+#: src/paramwindow.c:936 src/paramwindow.c:950
 msgid "Reset"
 msgstr ""
 
-#: src/paramwindow.c:932 src/rte_window.c:2401 src/omc-learn.c:1357
+#: src/paramwindow.c:944 src/rte_window.c:2394 src/omc-learn.c:1347
 msgid "Close _window"
 msgstr ""
 
-#: src/paramwindow.c:1337
+#: src/paramwindow.c:1340
 msgid "No parameters"
 msgstr ""
 
-#: src/paramwindow.c:1419
+#: src/paramwindow.c:1424
 msgid "Invalid parameter"
 msgstr ""
 
-#: src/paramwindow.c:1611
+#: src/paramwindow.c:1610
 msgid "LiVES: - Select Colour"
 msgstr ""
 
-#: src/paramwindow.c:1616
+#: src/paramwindow.c:1615
 msgid "Click to set the colour"
 msgstr ""
 
-#: src/paramwindow.c:1628
+#: src/paramwindow.c:1626
 msgid "_Red"
 msgstr ""
 
-#: src/paramwindow.c:1629
+#: src/paramwindow.c:1627
 msgid "The red value (0 - 255)"
 msgstr ""
 
-#: src/paramwindow.c:1632
+#: src/paramwindow.c:1630
 msgid "_Green"
 msgstr ""
 
-#: src/paramwindow.c:1633
+#: src/paramwindow.c:1631
 msgid "The green value (0 - 255)"
 msgstr ""
 
-#: src/paramwindow.c:1636
+#: src/paramwindow.c:1634
 msgid "_Blue"
 msgstr ""
 
-#: src/paramwindow.c:1637
+#: src/paramwindow.c:1635
 msgid "The blue value (0 - 255)"
 msgstr ""
 
-#: src/plugins.c:85
+#: src/plugins.c:86
 #, c-format
 msgid ""
 "\n"
 "Plugin error: %s failed with code %d"
 msgstr ""
 
-#: src/plugins.c:87
+#: src/plugins.c:88
 #, c-format
 msgid " : message was %s\n"
 msgstr ""
 
-#: src/plugins.c:387
+#: src/plugins.c:375
 #, c-format
 msgid ""
 "\n"
@@ -5782,17 +5796,17 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/plugins.c:397
+#: src/plugins.c:385
 #, c-format
 msgid "Updating video playback plugin defaults in %s\n"
 msgstr ""
 
-#: src/plugins.c:452
+#: src/plugins.c:444
 #, c-format
 msgid "Loading video playback plugin defaults from %s..."
 msgstr ""
 
-#: src/plugins.c:515
+#: src/plugins.c:505
 #, c-format
 msgid ""
 "\n"
@@ -5802,32 +5816,32 @@
 "\n"
 msgstr ""
 
-#: src/plugins.c:855
+#: src/plugins.c:836
 #, c-format
 msgid "Saving playback plugin defaults to %s..."
 msgstr ""
 
-#: src/plugins.c:962
+#: src/plugins.c:939
 msgid "_FPS"
 msgstr ""
 
-#: src/plugins.c:963
+#: src/plugins.c:940
 msgid "Fixed framerate for plugin.\n"
 msgstr ""
 
-#: src/plugins.c:1032
+#: src/plugins.c:1008
 msgid "_Colourspace"
 msgstr ""
 
-#: src/plugins.c:1033
+#: src/plugins.c:1009
 msgid "Colourspace input to the plugin.\n"
 msgstr ""
 
-#: src/plugins.c:1089
+#: src/plugins.c:1065
 msgid "Save settings to an alternate file.\n"
 msgstr ""
 
-#: src/plugins.c:1206
+#: src/plugins.c:1182
 #, c-format
 msgid ""
 "\n"
@@ -5836,7 +5850,7 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/plugins.c:1252
+#: src/plugins.c:1228
 #, c-format
 msgid ""
 "\n"
@@ -5846,38 +5860,38 @@
 "Unable to use it.\n"
 msgstr ""
 
-#: src/plugins.c:1265
+#: src/plugins.c:1241
 #, c-format
 msgid ""
 "Video playback plugin failed to initialise.\n"
 "Error was: %s\n"
 msgstr ""
 
-#: src/plugins.c:1461
+#: src/plugins.c:1428
 msgid ""
 "\n"
 "Warning ! Video playback plugin will not send key presses. Keyboard may be "
 "disabled during plugin use !\n"
 msgstr ""
 
-#: src/plugins.c:1465
+#: src/plugins.c:1433
 #, c-format
 msgid ""
 "*** Using %s plugin for fs playback, agreed to use palette type %d ( %s ). "
 "***\n"
 msgstr ""
 
-#: src/plugins.c:1571
+#: src/plugins.c:1537
 #, c-format
 msgid "Audio stream unable to use preferred format '%s'\n"
 msgstr ""
 
-#: src/plugins.c:1579
+#: src/plugins.c:1543
 #, c-format
 msgid "Using format '%s' instead.\n"
 msgstr ""
 
-#: src/plugins.c:1616
+#: src/plugins.c:1579
 #, c-format
 msgid ""
 "LiVES was unable to find its encoder plugins. Please make sure you have the "
@@ -5886,7 +5900,7 @@
 "or change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/plugins.c:1624
+#: src/plugins.c:1589
 #, c-format
 msgid ""
 "LiVES did not receive a response from the encoder plugin called '%s'.\n"
@@ -5895,11 +5909,11 @@
 "or switch to another plugin using Tools|Preferences|Encoding\n"
 msgstr ""
 
-#: src/plugins.c:2032
+#: src/plugins.c:1987
 msgid "Unable to resize, please install imageMagick\n"
 msgstr ""
 
-#: src/plugins.c:2231
+#: src/plugins.c:2183
 #, c-format
 msgid ""
 "\n"
@@ -5907,12 +5921,12 @@
 "No decoders found in %s !\n"
 msgstr ""
 
-#: src/plugins.c:2415
+#: src/plugins.c:2369
 #, fuzzy, c-format
 msgid " using %s"
 msgstr "Dobertura de %s"
 
-#: src/plugins.c:2499
+#: src/plugins.c:2451
 #, c-format
 msgid ""
 "\n"
@@ -5921,7 +5935,7 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/plugins.c:2522
+#: src/plugins.c:2472
 #, c-format
 msgid ""
 "\n"
@@ -5931,24 +5945,24 @@
 "Unable to use it.\n"
 msgstr ""
 
-#: src/plugins.c:2564
+#: src/plugins.c:2512
 msgid "/unknown"
 msgstr ""
 
-#: src/plugins.c:2651
+#: src/plugins.c:2598
 msgid "LiVES: - Decoder Plugins"
 msgstr ""
 
-#: src/plugins.c:2669
+#: src/plugins.c:2616
 msgid "Enabled Video Decoders (uncheck to disable)"
 msgstr ""
 
-#: src/plugins.c:2726
+#: src/plugins.c:2672
 #, c-format
 msgid "Failed to load %s, transitions may not resize.\n"
 msgstr ""
 
-#: src/plugins.c:3854
+#: src/plugins.c:3797
 #, c-format
 msgid "%s advanced settings"
 msgstr ""
@@ -5957,15 +5971,15 @@
 msgid "LiVES: - New Test RFX"
 msgstr ""
 
-#: src/rfx-builder.c:136
+#: src/rfx-builder.c:135
 msgid "LiVES: - Edit Test RFX"
 msgstr ""
 
-#: src/rfx-builder.c:166
+#: src/rfx-builder.c:165
 msgid "Type:"
 msgstr "Tipe :"
 
-#: src/rfx-builder.c:184
+#: src/rfx-builder.c:183
 msgid "tool"
 msgstr ""
 
@@ -5977,130 +5991,130 @@
 msgid "The name of the plugin. No spaces allowed."
 msgstr ""
 
-#: src/rfx-builder.c:201
+#: src/rfx-builder.c:202
 msgid "Version:       "
 msgstr ""
 
-#: src/rfx-builder.c:203
+#: src/rfx-builder.c:204
 msgid "The script version."
 msgstr ""
 
-#: src/rfx-builder.c:210
+#: src/rfx-builder.c:212
 msgid "    Author:       "
 msgstr ""
 
-#: src/rfx-builder.c:211
+#: src/rfx-builder.c:213
 msgid "The script author."
 msgstr ""
 
-#: src/rfx-builder.c:217
+#: src/rfx-builder.c:220
 msgid "    URL (optional):       "
 msgstr ""
 
-#: src/rfx-builder.c:218
+#: src/rfx-builder.c:221
 msgid "URL for the plugin maintainer."
 msgstr ""
 
-#: src/rfx-builder.c:226
+#: src/rfx-builder.c:230
 msgid "Menu text:    "
 msgstr ""
 
-#: src/rfx-builder.c:227
+#: src/rfx-builder.c:231
 msgid "The text to show in the menu."
 msgstr ""
 
-#: src/rfx-builder.c:239
+#: src/rfx-builder.c:244
 msgid "Action description:        "
 msgstr ""
 
-#: src/rfx-builder.c:241
+#: src/rfx-builder.c:246
 msgid "Describe what the plugin is doing. E.g. \"Edge detecting\""
 msgstr ""
 
-#: src/rfx-builder.c:246
+#: src/rfx-builder.c:251
 msgid "Minimum frames:"
 msgstr ""
 
-#: src/rfx-builder.c:249
+#: src/rfx-builder.c:254
 msgid ""
 "Minimum number of frames this effect/tool can be applied to. Normally 1."
 msgstr ""
 
-#: src/rfx-builder.c:260
+#: src/rfx-builder.c:265
 msgid "_Requirements..."
 msgstr ""
 
-#: src/rfx-builder.c:263
+#: src/rfx-builder.c:268
 msgid "Enter any binaries required by the plugin."
 msgstr ""
 
-#: src/rfx-builder.c:267
+#: src/rfx-builder.c:272
 msgid "_Properties..."
 msgstr "_Proprietats..."
 
-#: src/rfx-builder.c:270
+#: src/rfx-builder.c:275
 msgid "Set properties for the plugin. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:274
+#: src/rfx-builder.c:279
 msgid "_Parameters..."
 msgstr ""
 
-#: src/rfx-builder.c:277
+#: src/rfx-builder.c:282
 msgid "Set up parameters used in pre/loop/post/trigger code. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:281
+#: src/rfx-builder.c:286
 msgid "Parameter _Window Hints..."
 msgstr ""
 
-#: src/rfx-builder.c:284
+#: src/rfx-builder.c:289
 msgid "Set hints about how to lay out the parameter window. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:290
+#: src/rfx-builder.c:295
 msgid "_Language code:"
 msgstr ""
 
-#: src/rfx-builder.c:291
+#: src/rfx-builder.c:296
 msgid "Language for pre/loop/post/triggers. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:300
+#: src/rfx-builder.c:305
 msgid "_Pre loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:303
+#: src/rfx-builder.c:308
 msgid "Code to be executed before the loop. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:307
+#: src/rfx-builder.c:312
 msgid "_Loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:310
+#: src/rfx-builder.c:315
 msgid "Loop code to be applied to each frame."
 msgstr ""
 
-#: src/rfx-builder.c:314
+#: src/rfx-builder.c:319
 msgid "_Post loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:317
+#: src/rfx-builder.c:322
 msgid "Code to be executed after the loop. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:321
+#: src/rfx-builder.c:326
 msgid "_Trigger code..."
 msgstr ""
 
-#: src/rfx-builder.c:324
+#: src/rfx-builder.c:329
 msgid ""
 "Set trigger code for when the parameter window is shown, or when a parameter "
 "is changed. Optional (except for Utilities)."
 msgstr ""
 
-#: src/rfx-builder.c:421
+#: src/rfx-builder.c:426
 #, c-format
 msgid ""
 "\n"
@@ -6110,55 +6124,55 @@
 "%s\n"
 msgstr ""
 
-#: src/rfx-builder.c:544
+#: src/rfx-builder.c:541
 msgid "LiVES: - RFX Requirements"
 msgstr ""
 
-#: src/rfx-builder.c:548
+#: src/rfx-builder.c:544
 msgid "LiVES: - RFX Parameters"
 msgstr ""
 
-#: src/rfx-builder.c:552
+#: src/rfx-builder.c:547
 msgid "LiVES: - RFX Parameter Window Hints"
 msgstr ""
 
-#: src/rfx-builder.c:556
+#: src/rfx-builder.c:550
 msgid "LiVES: - RFX Triggers"
 msgstr ""
 
-#: src/rfx-builder.c:622
+#: src/rfx-builder.c:613
 msgid "_New Entry"
 msgstr ""
 
-#: src/rfx-builder.c:625
+#: src/rfx-builder.c:616
 msgid "_Edit Entry"
 msgstr ""
 
-#: src/rfx-builder.c:628
+#: src/rfx-builder.c:619
 msgid "_Remove Entry"
 msgstr ""
 
-#: src/rfx-builder.c:632
+#: src/rfx-builder.c:623
 msgid "Move _Up"
 msgstr "Desplaçar cap a_mont"
 
-#: src/rfx-builder.c:635
+#: src/rfx-builder.c:626
 msgid "Move _Down"
 msgstr "Desplaçar cap a_val"
 
-#: src/rfx-builder.c:1004
+#: src/rfx-builder.c:984
 msgid "LiVES: - RFX Properties"
 msgstr ""
 
-#: src/rfx-builder.c:1013
+#: src/rfx-builder.c:993
 msgid "_Slow (hint to GUI)"
 msgstr ""
 
-#: src/rfx-builder.c:1024
+#: src/rfx-builder.c:1004
 msgid "_Batch mode generator"
 msgstr ""
 
-#: src/rfx-builder.c:1831
+#: src/rfx-builder.c:1790
 msgid ""
 "\n"
 "\n"
@@ -6167,7 +6181,7 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:1875
+#: src/rfx-builder.c:1834
 msgid ""
 "\n"
 "\n"
@@ -6175,219 +6189,219 @@
 "Please check the trigger code.\n"
 msgstr ""
 
-#: src/rfx-builder.c:1994
+#: src/rfx-builder.c:1950
 msgid "LiVES: - New RFX Parameter"
 msgstr ""
 
-#: src/rfx-builder.c:1997
+#: src/rfx-builder.c:1952
 msgid "LiVES: - Edit RFX Parameter"
 msgstr ""
 
-#: src/rfx-builder.c:2013
+#: src/rfx-builder.c:1968
 msgid "_Name:    "
 msgstr ""
 
-#: src/rfx-builder.c:2016
+#: src/rfx-builder.c:1971
 msgid "Name of the parameter, must be unique in the plugin."
 msgstr ""
 
-#: src/rfx-builder.c:2025
+#: src/rfx-builder.c:1981
 msgid "_Label:    "
 msgstr ""
 
-#: src/rfx-builder.c:2028
+#: src/rfx-builder.c:1984
 msgid ""
 "Label to be shown by the parameter. An underscore represents mnemonic "
 "accelerator."
 msgstr ""
 
-#: src/rfx-builder.c:2039
+#: src/rfx-builder.c:1996
 msgid "_Type:         "
 msgstr ""
 
-#: src/rfx-builder.c:2040
+#: src/rfx-builder.c:1997
 msgid "Parameter type (select from list)."
 msgstr ""
 
-#: src/rfx-builder.c:2073
+#: src/rfx-builder.c:2029
 msgid "Decimal _places: "
 msgstr ""
 
-#: src/rfx-builder.c:2082 src/rfx-builder.c:2477 src/rfx-builder.c:2495
+#: src/rfx-builder.c:2038 src/rfx-builder.c:2430 src/rfx-builder.c:2447
 msgid "_Default value:    "
 msgstr ""
 
-#: src/rfx-builder.c:2098
+#: src/rfx-builder.c:2054
 msgid "_Default: "
 msgstr ""
 
-#: src/rfx-builder.c:2132
+#: src/rfx-builder.c:2087
 msgid "Button _Group: "
 msgstr ""
 
-#: src/rfx-builder.c:2134
+#: src/rfx-builder.c:2089
 msgid "A non-zero value can be used to group radio buttons."
 msgstr ""
 
-#: src/rfx-builder.c:2142 src/rfx-builder.c:2478
+#: src/rfx-builder.c:2097 src/rfx-builder.c:2431
 msgid "_Minimum value: "
 msgstr ""
 
-#: src/rfx-builder.c:2148 src/rfx-builder.c:2479
+#: src/rfx-builder.c:2103 src/rfx-builder.c:2432
 msgid "Ma_ximum value: "
 msgstr ""
 
-#: src/rfx-builder.c:2157
+#: src/rfx-builder.c:2113
 msgid "     _Step size:   "
 msgstr ""
 
-#: src/rfx-builder.c:2160
+#: src/rfx-builder.c:2117
 msgid ""
 "How much the parameter is adjusted when the spinbutton arrows are pressed."
 msgstr ""
 
-#: src/rfx-builder.c:2171
+#: src/rfx-builder.c:2129
 msgid "_Wrap value"
 msgstr ""
 
-#: src/rfx-builder.c:2172
+#: src/rfx-builder.c:2131
 msgid "Whether the value wraps max->min and min->max."
 msgstr ""
 
-#: src/rfx-builder.c:2470
+#: src/rfx-builder.c:2424
 msgid "Set _values"
 msgstr ""
 
-#: src/rfx-builder.c:2512
+#: src/rfx-builder.c:2463
 msgid "Default _Red:  "
 msgstr ""
 
-#: src/rfx-builder.c:2513
+#: src/rfx-builder.c:2464
 msgid "Default _Green:"
 msgstr ""
 
-#: src/rfx-builder.c:2514
+#: src/rfx-builder.c:2465
 msgid "Default _Blue: "
 msgstr ""
 
-#: src/rfx-builder.c:2538
+#: src/rfx-builder.c:2488
 msgid "Set _default"
 msgstr ""
 
-#: src/rfx-builder.c:2540
+#: src/rfx-builder.c:2490
 msgid "Default value:  "
 msgstr ""
 
-#: src/rfx-builder.c:2541
+#: src/rfx-builder.c:2491
 msgid "Maximum length (chars): "
 msgstr ""
 
-#: src/rfx-builder.c:2576
+#: src/rfx-builder.c:2526
 msgid "LiVES: - New RFX Parameter Window Hint"
 msgstr ""
 
-#: src/rfx-builder.c:2579
+#: src/rfx-builder.c:2528
 msgid "LiVES: - Edit RFX Parameter Window Hint"
 msgstr ""
 
-#: src/rfx-builder.c:2622
+#: src/rfx-builder.c:2569
 msgid "_Keyword:         "
 msgstr ""
 
-#: src/rfx-builder.c:2639
+#: src/rfx-builder.c:2586
 msgid "Special _Type:         "
 msgstr ""
 
-#: src/rfx-builder.c:2656
+#: src/rfx-builder.c:2602
 msgid "Special _Subtype:         "
 msgstr ""
 
-#: src/rfx-builder.c:2667 src/rfx-builder.c:2706
+#: src/rfx-builder.c:2613 src/rfx-builder.c:2651
 msgid "Row:    "
 msgstr ""
 
-#: src/rfx-builder.c:2732
+#: src/rfx-builder.c:2676
 #, c-format
 msgid "Linked parameters (%d):    "
 msgstr ""
 
-#: src/rfx-builder.c:2749
+#: src/rfx-builder.c:2693
 msgid "Linked parameters (4):    "
 msgstr ""
 
-#: src/rfx-builder.c:2752
+#: src/rfx-builder.c:2695
 msgid "Linked parameters (2):    "
 msgstr ""
 
-#: src/rfx-builder.c:2777
+#: src/rfx-builder.c:2720
 msgid "LiVES: - New RFX Trigger"
 msgstr ""
 
-#: src/rfx-builder.c:2780
+#: src/rfx-builder.c:2722
 msgid "LiVES: - Edit RFX Trigger"
 msgstr ""
 
-#: src/rfx-builder.c:2808
+#: src/rfx-builder.c:2750
 msgid "When:         "
 msgstr ""
 
-#: src/rfx-builder.c:2904
+#: src/rfx-builder.c:2846
 msgid "LiVES: - Pre Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:2911
+#: src/rfx-builder.c:2853
 msgid "LiVES: - Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:2918
+#: src/rfx-builder.c:2860
 msgid "LiVES: - Post Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:2931
+#: src/rfx-builder.c:2873
 #, c-format
 msgid "LiVES: - Default text (max length %d)"
 msgstr ""
 
-#: src/rfx-builder.c:2944
+#: src/rfx-builder.c:2885
 msgid "LiVES: - Enter values, one per line"
 msgstr ""
 
-#: src/rfx-builder.c:3055
+#: src/rfx-builder.c:2996
 msgid ""
 "\n"
 "\n"
 "Name must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3060
+#: src/rfx-builder.c:3001
 msgid ""
 "\n"
 "\n"
 "Name must not contain spaces.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3065
+#: src/rfx-builder.c:3006
 msgid ""
 "\n"
 "\n"
 "Menu text must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3071
+#: src/rfx-builder.c:3012
 msgid ""
 "\n"
 "\n"
 "Action description must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3076
+#: src/rfx-builder.c:3017
 msgid ""
 "\n"
 "\n"
 "Author must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3085 src/rfx-builder.c:4339
+#: src/rfx-builder.c:3026 src/rfx-builder.c:4253
 msgid ""
 "\n"
 "\n"
@@ -6395,28 +6409,28 @@
 "Name must be unique.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3092
+#: src/rfx-builder.c:3033
 msgid ""
 "\n"
 "\n"
 "Loop code should not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3098
+#: src/rfx-builder.c:3039
 msgid ""
 "\n"
 "\n"
 "Trigger code should not be blank for a utility.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3111
+#: src/rfx-builder.c:3052
 msgid ""
 "\n"
 "\n"
 "Parameter name must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3117
+#: src/rfx-builder.c:3058
 msgid ""
 "\n"
 "\n"
@@ -6425,41 +6439,41 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:3171
+#: src/rfx-builder.c:3111
 #, c-format
 msgid "Writing script file %s..."
 msgstr ""
 
-#: src/rfx-builder.c:3477
+#: src/rfx-builder.c:3411
 msgid "No <define> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3484 src/rfx-builder.c:3493
+#: src/rfx-builder.c:3418 src/rfx-builder.c:3427
 msgid "Bad script version.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3505
+#: src/rfx-builder.c:3439
 msgid "No <name> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3513
+#: src/rfx-builder.c:3447
 msgid "No <version> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3522
+#: src/rfx-builder.c:3456
 msgid "No <author> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3536
+#: src/rfx-builder.c:3470
 msgid "No <description> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3540
+#: src/rfx-builder.c:3474
 #, c-format
 msgid "Bad description. (%s)\n"
 msgstr ""
 
-#: src/rfx-builder.c:3702
+#: src/rfx-builder.c:3627
 #, c-format
 msgid ""
 "\n"
@@ -6469,27 +6483,27 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:3859
+#: src/rfx-builder.c:3780
 msgid "Rebuilding all RFX scripts...builtin..."
 msgstr ""
 
-#: src/rfx-builder.c:3860
+#: src/rfx-builder.c:3781
 msgid "Rebuilding scripts"
 msgstr ""
 
-#: src/rfx-builder.c:3868
+#: src/rfx-builder.c:3789
 msgid "custom..."
 msgstr ""
 
-#: src/rfx-builder.c:3872
+#: src/rfx-builder.c:3793
 msgid "test..."
 msgstr ""
 
-#: src/rfx-builder.c:3878
+#: src/rfx-builder.c:3799
 msgid "rebuilding dynamic menu entries..."
 msgstr ""
 
-#: src/rfx-builder.c:3905 src/rfx-builder.c:3912
+#: src/rfx-builder.c:3826 src/rfx-builder.c:3834
 #, c-format
 msgid ""
 "\n"
@@ -6498,7 +6512,7 @@
 "Please check this program is in your path and executable.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3951
+#: src/rfx-builder.c:3874
 #, c-format
 msgid ""
 "\n"
@@ -6508,12 +6522,12 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:3960
+#: src/rfx-builder.c:3884
 #, c-format
 msgid "Deleting rfx script %s..."
 msgstr ""
 
-#: src/rfx-builder.c:3980
+#: src/rfx-builder.c:3902
 #, c-format
 msgid ""
 "\n"
@@ -6523,7 +6537,7 @@
 "Error code was %d\n"
 msgstr ""
 
-#: src/rfx-builder.c:4016
+#: src/rfx-builder.c:3938
 #, c-format
 msgid ""
 "\n"
@@ -6533,12 +6547,12 @@
 "Please delete it first, or rename the test script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4027
+#: src/rfx-builder.c:3950
 #, c-format
 msgid "Promoting rfx test plugin %s to custom..."
 msgstr ""
 
-#: src/rfx-builder.c:4044
+#: src/rfx-builder.c:3965
 #, c-format
 msgid ""
 "\n"
@@ -6549,20 +6563,20 @@
 "Return code was %d (%s)\n"
 msgstr ""
 
-#: src/rfx-builder.c:4070
+#: src/rfx-builder.c:3990
 msgid "LiVES: - Export Script to..."
 msgstr ""
 
-#: src/rfx-builder.c:4077 src/rfx-builder.c:4156
+#: src/rfx-builder.c:3997 src/rfx-builder.c:4074
 #, c-format
 msgid "Copying %s to %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4105
+#: src/rfx-builder.c:4024
 msgid "LiVES: Import Script from..."
 msgstr ""
 
-#: src/rfx-builder.c:4148
+#: src/rfx-builder.c:4067
 #, c-format
 msgid ""
 "\n"
@@ -6572,43 +6586,43 @@
 "Please delete it first, or rename the import script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4249
+#: src/rfx-builder.c:4166
 msgid "LiVES: - Copy RFX Script"
 msgstr ""
 
-#: src/rfx-builder.c:4251
+#: src/rfx-builder.c:4168
 msgid "_From type:    "
 msgstr ""
 
-#: src/rfx-builder.c:4258
+#: src/rfx-builder.c:4175
 msgid "   Script:    "
 msgstr ""
 
-#: src/rfx-builder.c:4267
+#: src/rfx-builder.c:4183
 msgid "LiVES: - Rename test RFX Script"
 msgstr ""
 
-#: src/rfx-builder.c:4268
+#: src/rfx-builder.c:4184
 msgid "From script: "
 msgstr ""
 
-#: src/rfx-builder.c:4273
+#: src/rfx-builder.c:4188
 msgid "LiVES: - RFX Script name"
 msgstr ""
 
-#: src/rfx-builder.c:4274
+#: src/rfx-builder.c:4189
 msgid "Script name: "
 msgstr ""
 
-#: src/rfx-builder.c:4294
+#: src/rfx-builder.c:4209
 msgid "New name: "
 msgstr ""
 
-#: src/rfx-builder.c:4297
+#: src/rfx-builder.c:4212
 msgid "New script name: "
 msgstr ""
 
-#: src/rfx-builder.c:4372
+#: src/rfx-builder.c:4286
 msgid ""
 "\n"
 "\n"
@@ -6616,12 +6630,12 @@
 "Script name must be unique.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4384
+#: src/rfx-builder.c:4297
 #, c-format
 msgid "Renaming RFX test script %s to %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4390
+#: src/rfx-builder.c:4302
 #, c-format
 msgid ""
 "\n"
@@ -6632,21 +6646,21 @@
 "Return code was %d\n"
 msgstr ""
 
-#: src/rfx-builder.c:4610
+#: src/rfx-builder.c:4518
 msgid "_Apply Real Time Effects to Selection"
 msgstr ""
 
-#: src/rfx-builder.c:4664
+#: src/rfx-builder.c:4572
 #, c-format
 msgid "Loading rendered effect %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4766
+#: src/rfx-builder.c:4674
 msgid ""
 "See: VJ - show VJ keys. Set the realtime effects, and then apply them here."
 msgstr ""
 
-#: src/preferences.c:359
+#: src/preferences.c:351
 msgid ""
 "\n"
 "\n"
@@ -6654,7 +6668,7 @@
 "full screen, separate window (fs) mode\n"
 msgstr ""
 
-#: src/preferences.c:408
+#: src/preferences.c:400
 msgid ""
 "\n"
 "\n"
@@ -6662,7 +6676,7 @@
 "(Free space = UNKNOWN)"
 msgstr ""
 
-#: src/preferences.c:412
+#: src/preferences.c:403
 #, c-format
 msgid ""
 "\n"
@@ -6671,14 +6685,14 @@
 "(Free space = %s)"
 msgstr ""
 
-#: src/preferences.c:416
+#: src/preferences.c:408
 msgid ""
 "The temp directory is LiVES working directory where opened clips and sets "
 "are stored.\n"
 "It should be in a partition with plenty of free disk space.\n"
 msgstr ""
 
-#: src/preferences.c:784
+#: src/preferences.c:839
 #, c-format
 msgid ""
 "Unable to create or write to the new temporary directory.\n"
@@ -6689,7 +6703,7 @@
 "The directory will not be changed now.\n"
 msgstr ""
 
-#: src/preferences.c:786
+#: src/preferences.c:843
 #, c-format
 msgid ""
 "Unable to create or write to the new temporary directory.\n"
@@ -6699,7 +6713,7 @@
 "The directory will not be changed now.\n"
 msgstr ""
 
-#: src/preferences.c:798
+#: src/preferences.c:856
 msgid ""
 "You have chosen to change the temporary directory.\n"
 "Please make sure you have no other copies of LiVES open.\n"
@@ -6711,20 +6725,20 @@
 "original setting."
 msgstr ""
 
-#: src/preferences.c:1169
+#: src/preferences.c:1221
 msgid ""
 "\n"
 "Unable to switch audio players to jack - jackd must be installed first.\n"
 "See http://jackaudio.org\n"
 msgstr ""
 
-#: src/preferences.c:1175
+#: src/preferences.c:1226
 msgid ""
 "\n"
 "Switching audio players requires restart (jackd must not be running)\n"
 msgstr ""
 
-#: src/preferences.c:1202
+#: src/preferences.c:1253
 msgid ""
 "\n"
 "Unable to switch audio players to pulse audio\n"
@@ -6732,814 +6746,814 @@
 "See http://www.pulseaudio.org\n"
 msgstr ""
 
-#: src/preferences.c:1502
+#: src/preferences.c:1544
 msgid "PCM (highest quality; largest files)"
 msgstr ""
 
-#: src/preferences.c:2063
+#: src/preferences.c:2096
 msgid "LiVES: - Preferences"
 msgstr ""
 
-#: src/preferences.c:2142
+#: src/preferences.c:2177
 msgid "Open file selection maximised"
 msgstr ""
 
-#: src/preferences.c:2149
+#: src/preferences.c:2184
 msgid "Show recent files in the File menu"
 msgstr ""
 
-#: src/preferences.c:2158
+#: src/preferences.c:2193
 msgid "Stop screensaver on playback    "
 msgstr ""
 
-#: src/preferences.c:2165
+#: src/preferences.c:2200
 msgid "Open main window maximised"
 msgstr ""
 
-#: src/preferences.c:2173
+#: src/preferences.c:2208
 msgid "Show toolbar when background is blanked"
 msgstr ""
 
-#: src/preferences.c:2181
+#: src/preferences.c:2216
 msgid "Allow mouse wheel to switch clips"
 msgstr ""
 
-#: src/preferences.c:2192
+#: src/preferences.c:2227
 msgid "Shrink previews to fit in interface"
 msgstr ""
 
-#: src/preferences.c:2202
+#: src/preferences.c:2237
 msgid "Startup mode:"
 msgstr ""
 
-#: src/preferences.c:2206
+#: src/preferences.c:2241
 msgid "_Clip editor"
 msgstr ""
 
-#: src/preferences.c:2210
+#: src/preferences.c:2245
 msgid "_Multitrack mode"
 msgstr ""
 
-#: src/preferences.c:2234
+#: src/preferences.c:2268
 msgid "Multi-head support"
 msgstr ""
 
-#: src/preferences.c:2242
+#: src/preferences.c:2276
 msgid " monitor number for LiVES interface"
 msgstr ""
 
-#: src/preferences.c:2248
+#: src/preferences.c:2282
 msgid " monitor number for playback"
 msgstr ""
 
-#: src/preferences.c:2260
+#: src/preferences.c:2294
 msgid ""
 "A setting of 0 means use all available monitors (only works with some "
 "playback plugins)."
 msgstr ""
 
-#: src/preferences.c:2270
+#: src/preferences.c:2304
 msgid "Force single monitor"
 msgstr ""
 
-#: src/preferences.c:2271
+#: src/preferences.c:2305
 msgid "Ignore all except the first monitor."
 msgstr ""
 
-#: src/preferences.c:2293
+#: src/preferences.c:2327
 msgid "Show clip thumbnails during playback"
 msgstr ""
 
-#: src/preferences.c:2306
+#: src/preferences.c:2340
 msgid "GUI"
 msgstr "Interfàcia grafica"
 
-#: src/preferences.c:2321
+#: src/preferences.c:2355
 msgid "When entering Multitrack mode:"
 msgstr ""
 
-#: src/preferences.c:2330
+#: src/preferences.c:2364
 msgid "_Prompt me for width, height, fps and audio settings"
 msgstr ""
 
-#: src/preferences.c:2336
+#: src/preferences.c:2370
 msgid "_Always use the following values:"
 msgstr ""
 
-#: src/preferences.c:2345
+#: src/preferences.c:2379
 msgid "Use these same _values for rendering a new clip"
 msgstr ""
 
-#: src/preferences.c:2370
+#: src/preferences.c:2404
 msgid "_Width           "
 msgstr ""
 
-#: src/preferences.c:2375
+#: src/preferences.c:2409
 msgid "          _Height      "
 msgstr ""
 
-#: src/preferences.c:2379
+#: src/preferences.c:2413
 msgid "          _FPS"
 msgstr ""
 
-#: src/preferences.c:2387
+#: src/preferences.c:2421
 msgid "Enable backing audio track"
 msgstr ""
 
-#: src/preferences.c:2394
+#: src/preferences.c:2428
 msgid "Audio track per video track"
 msgstr ""
 
-#: src/preferences.c:2423
+#: src/preferences.c:2457
 msgid "    _Undo buffer size (MB)    "
 msgstr ""
 
-#: src/preferences.c:2432
+#: src/preferences.c:2466
 msgid "_Exit multitrack mode after rendering"
 msgstr ""
 
-#: src/preferences.c:2440
+#: src/preferences.c:2474
 msgid "Auto backup layouts"
 msgstr ""
 
-#: src/preferences.c:2445
+#: src/preferences.c:2479
 msgid "_Every"
 msgstr ""
 
-#: src/preferences.c:2453
+#: src/preferences.c:2487
 msgid "seconds"
 msgstr "segondas"
 
-#: src/preferences.c:2461
+#: src/preferences.c:2495
 msgid "After every _change"
 msgstr ""
 
-#: src/preferences.c:2467
+#: src/preferences.c:2501
 msgid "_Never"
 msgstr "Pas _jamai"
 
-#: src/preferences.c:2490
+#: src/preferences.c:2523
 msgid "Multitrack/Render"
 msgstr ""
 
-#: src/preferences.c:2508
+#: src/preferences.c:2541
 msgid "Use instant opening when possible"
 msgstr ""
 
-#: src/preferences.c:2509
+#: src/preferences.c:2543
 msgid "Enable instant opening of some file types using decoder plugins"
 msgstr ""
 
-#: src/preferences.c:2531
+#: src/preferences.c:2567
 msgid "Video open command (fallback)"
 msgstr ""
 
-#: src/preferences.c:2543
+#: src/preferences.c:2579
 msgid "Open/render compression"
 msgstr ""
 
-#: src/preferences.c:2546
+#: src/preferences.c:2582
 msgid " %     ( lower = slower, larger files; for jpeg, higher quality )"
 msgstr ""
 
-#: src/preferences.c:2558
+#: src/preferences.c:2594
 msgid "Default image format"
 msgstr ""
 
-#: src/preferences.c:2562
+#: src/preferences.c:2598
 msgid "_jpeg"
 msgstr "_jpeg"
 
-#: src/preferences.c:2565
+#: src/preferences.c:2601
 msgid "_png"
 msgstr "_png"
 
-#: src/preferences.c:2572
+#: src/preferences.c:2608
 msgid "(Check Help/Troubleshoot to see which image formats are supported)"
 msgstr ""
 
-#: src/preferences.c:2580
+#: src/preferences.c:2616
 msgid "Enable automatic deinterlacing when possible"
 msgstr ""
 
-#: src/preferences.c:2582
+#: src/preferences.c:2619
 msgid "Automatically deinterlace frames when a plugin suggests it"
 msgstr ""
 
-#: src/preferences.c:2593
+#: src/preferences.c:2632
 msgid "Automatic trimming / padding of audio when possible"
 msgstr ""
 
-#: src/preferences.c:2595
+#: src/preferences.c:2634
 msgid "Automatically trim or pad audio when a plugin suggests it"
 msgstr ""
 
-#: src/preferences.c:2606
+#: src/preferences.c:2646
 msgid "Ignore blank borders when possible"
 msgstr ""
 
-#: src/preferences.c:2608
+#: src/preferences.c:2648
 msgid "Clip any blank borders from frames where possible"
 msgstr ""
 
-#: src/preferences.c:2619
+#: src/preferences.c:2660
 msgid "When opening multiple files, concatenate images into one clip"
 msgstr ""
 
-#: src/preferences.c:2629
+#: src/preferences.c:2670
 msgid "Decoding"
 msgstr ""
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:2652
+#: src/preferences.c:2693
 msgid "Low - can improve performance on slower machines"
 msgstr ""
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:2654
+#: src/preferences.c:2695
 msgid "Normal - recommended for most users"
 msgstr ""
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:2656
+#: src/preferences.c:2697
 msgid "High - can improve quality on very fast machines"
 msgstr ""
 
-#: src/preferences.c:2659
+#: src/preferences.c:2700
 msgid "Preview _quality"
 msgstr ""
 
-#: src/preferences.c:2660
+#: src/preferences.c:2701
 msgid "The preview quality for video playback - affects resizing"
 msgstr ""
 
-#: src/preferences.c:2675
+#: src/preferences.c:2717
 msgid "_Show FPS statistics"
 msgstr ""
 
-#: src/preferences.c:2694
+#: src/preferences.c:2736
 msgid "_Plugin"
 msgstr ""
 
-#: src/preferences.c:2718
+#: src/preferences.c:2760
 msgid "Stream audio"
 msgstr ""
 
-#: src/preferences.c:2721
+#: src/preferences.c:2763
 msgid "Stream audio to playback plugin"
 msgstr ""
 
-#: src/preferences.c:2734
+#: src/preferences.c:2778
 msgid "Record player output"
 msgstr ""
 
-#: src/preferences.c:2737
+#: src/preferences.c:2781
 msgid "Record output from player instead of input to player"
 msgstr ""
 
-#: src/preferences.c:2744
+#: src/preferences.c:2789
 msgid "VIDEO"
 msgstr "VIDÈO"
 
-#: src/preferences.c:2787
+#: src/preferences.c:2833
 msgid "_Player"
 msgstr ""
 
-#: src/preferences.c:2792
+#: src/preferences.c:2838
 msgid "(See also the Jack Integration tab for jack startup options)"
 msgstr ""
 
-#: src/preferences.c:2819
+#: src/preferences.c:2865
 msgid "mplayer"
 msgstr ""
 
-#: src/preferences.c:2830
+#: src/preferences.c:2876
 msgid "mplayer2"
 msgstr ""
 
-#: src/preferences.c:2833
+#: src/preferences.c:2879
 msgid "Audio play _command"
 msgstr ""
 
-#: src/preferences.c:2840
+#: src/preferences.c:2886
 msgid "- internal -"
 msgstr ""
 
-#: src/preferences.c:2849
+#: src/preferences.c:2895
 msgid "Audio follows video _rate/direction"
 msgstr ""
 
-#: src/preferences.c:2857
+#: src/preferences.c:2903
 msgid "Audio follows _clip switches"
 msgstr ""
 
-#: src/preferences.c:2864
+#: src/preferences.c:2910
 msgid "Source:"
 msgstr ""
 
-#: src/preferences.c:2868
+#: src/preferences.c:2914
 msgid "_Internal"
 msgstr ""
 
-#: src/preferences.c:2873
+#: src/preferences.c:2919
 msgid "_External (requires jack or pulse audio player)"
 msgstr ""
 
-#: src/preferences.c:2892
+#: src/preferences.c:2940
 msgid "AUDIO"
 msgstr "ÀUDIO"
 
-#: src/preferences.c:2902
+#: src/preferences.c:2950
 msgid "Playback"
 msgstr "Lectura"
 
-#: src/preferences.c:2925
+#: src/preferences.c:2973
 msgid ""
 "Record audio when capturing an e_xternal window\n"
 " (requires jack or pulse audio)"
 msgstr ""
 
-#: src/preferences.c:2940
+#: src/preferences.c:2988
 msgid "      What to record when 'r' is pressed   "
 msgstr ""
 
-#: src/preferences.c:2949
+#: src/preferences.c:2997
 msgid "_Frame changes"
 msgstr ""
 
-#: src/preferences.c:2964
+#: src/preferences.c:3012
 msgid "F_PS changes"
 msgstr ""
 
-#: src/preferences.c:2982
+#: src/preferences.c:3030
 msgid "_Real time effects"
 msgstr ""
 
-#: src/preferences.c:2993
+#: src/preferences.c:3041
 msgid "_Clip switches"
 msgstr ""
 
-#: src/preferences.c:3004
+#: src/preferences.c:3052
 msgid "_Audio (requires jack or pulse audio player)"
 msgstr ""
 
-#: src/preferences.c:3024
+#: src/preferences.c:3072
 msgid "Pause recording if free disk space falls below"
 msgstr ""
 
 #. TRANSLATORS: gigabytes
-#: src/preferences.c:3030
+#: src/preferences.c:3078
 msgid "GB"
 msgstr "Gio"
 
-#: src/preferences.c:3037
+#: src/preferences.c:3085
 msgid "Recording"
 msgstr "Enregistrament"
 
-#: src/preferences.c:3055
+#: src/preferences.c:3103
 msgid "Encoder"
 msgstr ""
 
-#: src/preferences.c:3090
+#: src/preferences.c:3137
 msgid "Output format"
 msgstr "Format de sortida"
 
-#: src/preferences.c:3106
+#: src/preferences.c:3153
 msgid "Audio codec"
 msgstr ""
 
-#: src/preferences.c:3119
+#: src/preferences.c:3165
 msgid "Encoding"
 msgstr "Encodatge"
 
-#: src/preferences.c:3134
+#: src/preferences.c:3180
 msgid "Use _antialiasing when resizing"
 msgstr ""
 
-#: src/preferences.c:3143
+#: src/preferences.c:3189
 msgid "Number of _real time effect keys"
 msgstr ""
 
-#: src/preferences.c:3145
+#: src/preferences.c:3192
 msgid ""
 "The number of \"virtual\" real time effect keys. They can be controlled "
 "through the real time effects window, or via network (OSC)."
 msgstr ""
 
-#: src/preferences.c:3152
+#: src/preferences.c:3199
 msgid "Use _threads where possible when applying effects"
 msgstr ""
 
-#: src/preferences.c:3159
+#: src/preferences.c:3207
 msgid "Number of _threads"
 msgstr ""
 
-#: src/preferences.c:3172
+#: src/preferences.c:3221
 msgid "Restart is required if any of the following paths are changed:"
 msgstr ""
 
-#: src/preferences.c:3182
+#: src/preferences.c:3231
 msgid "Weed plugin path"
 msgstr ""
 
-#: src/preferences.c:3184
+#: src/preferences.c:3234
 msgid "Frei0r plugin path"
 msgstr ""
 
-#: src/preferences.c:3186
+#: src/preferences.c:3237
 msgid "LADSPA plugin path"
 msgstr ""
 
-#: src/preferences.c:3209
+#: src/preferences.c:3261
 msgid "      Video load directory (default)      "
 msgstr ""
 
-#: src/preferences.c:3215
+#: src/preferences.c:3267
 msgid "      Video save directory (default) "
 msgstr ""
 
-#: src/preferences.c:3221
+#: src/preferences.c:3273
 msgid "      Audio load directory (default) "
 msgstr ""
 
-#: src/preferences.c:3227
+#: src/preferences.c:3279
 msgid "      Image directory (default) "
 msgstr ""
 
-#: src/preferences.c:3233
+#: src/preferences.c:3285
 msgid "      Backup/Restore directory (default) "
 msgstr ""
 
-#: src/preferences.c:3239
+#: src/preferences.c:3291
 msgid "      Temp directory (do not remove) "
 msgstr ""
 
-#: src/preferences.c:3252
+#: src/preferences.c:3304
 msgid "The default directory for loading video clips from"
 msgstr ""
 
-#: src/preferences.c:3277
+#: src/preferences.c:3329
 msgid "The default directory for saving encoded clips to"
 msgstr ""
 
-#: src/preferences.c:3285
+#: src/preferences.c:3337
 msgid "The default directory for loading and saving audio"
 msgstr ""
 
-#: src/preferences.c:3293
+#: src/preferences.c:3345
 msgid "The default directory for saving frameshots to"
 msgstr ""
 
-#: src/preferences.c:3301
+#: src/preferences.c:3353
 msgid "The default directory for backing up/restoring single clips"
 msgstr ""
 
-#: src/preferences.c:3309
+#: src/preferences.c:3361
 msgid "LiVES working directory."
 msgstr ""
 
-#: src/preferences.c:3359
+#: src/preferences.c:3412
 msgid "Directories"
 msgstr "Repertòris"
 
-#: src/preferences.c:3374
+#: src/preferences.c:3427
 msgid "Warn if diskspace falls below: "
 msgstr ""
 
-#: src/preferences.c:3380 src/preferences.c:3394
+#: src/preferences.c:3433 src/preferences.c:3447
 msgid " MB [set to 0 to disable]"
 msgstr ""
 
-#: src/preferences.c:3389
+#: src/preferences.c:3442
 msgid "Diskspace critical level: "
 msgstr ""
 
-#: src/preferences.c:3407
+#: src/preferences.c:3461
 msgid ""
 "Warn on Insert / Merge if _frame rate of clipboard does not match frame rate "
 "of selection"
 msgstr ""
 
-#: src/preferences.c:3417
+#: src/preferences.c:3471
 msgid "Warn on Open if file _size exceeds "
 msgstr ""
 
-#: src/preferences.c:3425
+#: src/preferences.c:3479
 msgid " MB"
 msgstr " Mo"
 
-#: src/preferences.c:3432
+#: src/preferences.c:3486
 msgid "Show a warning before saving a se_t"
 msgstr ""
 
-#: src/preferences.c:3442
+#: src/preferences.c:3496
 msgid ""
 "Show a warning if _mplayer/mplayer2, sox, composite or convert is not found "
 "when LiVES is started."
 msgstr ""
 
-#: src/preferences.c:3452
+#: src/preferences.c:3506
 msgid "Show a warning if no _rendered effects are found at startup."
 msgstr ""
 
-#: src/preferences.c:3464
+#: src/preferences.c:3518
 msgid "Show a warning if no _encoder plugins are found at startup."
 msgstr ""
 
-#: src/preferences.c:3474
+#: src/preferences.c:3528
 msgid "Show a warning if a _duplicate set name is entered."
 msgstr ""
 
-#: src/preferences.c:3485
+#: src/preferences.c:3539
 msgid "When a set is loaded, warn if clips are missing from _layouts."
 msgstr ""
 
-#: src/preferences.c:3495
+#: src/preferences.c:3550
 msgid "Warn if a clip used in a layout is about to be closed."
 msgstr ""
 
-#: src/preferences.c:3505
+#: src/preferences.c:3561
 msgid "Warn if frames used in a layout are about to be deleted."
 msgstr ""
 
-#: src/preferences.c:3515
+#: src/preferences.c:3572
 msgid "Warn if frames used in a layout are about to be shifted."
 msgstr ""
 
-#: src/preferences.c:3525
+#: src/preferences.c:3583
 msgid "Warn if frames used in a layout are about to be altered."
 msgstr ""
 
-#: src/preferences.c:3535
+#: src/preferences.c:3594
 msgid "Warn if audio used in a layout is about to be deleted."
 msgstr ""
 
-#: src/preferences.c:3546
+#: src/preferences.c:3606
 msgid "Warn if audio used in a layout is about to be shifted."
 msgstr ""
 
-#: src/preferences.c:3556
+#: src/preferences.c:3617
 msgid "Warn if audio used in a layout is about to be altered."
 msgstr ""
 
-#: src/preferences.c:3566
+#: src/preferences.c:3628
 msgid "Popup layout errors after clip changes."
 msgstr ""
 
-#: src/preferences.c:3577
+#: src/preferences.c:3639
 msgid "Warn if the layout has not been saved when leaving multitrack mode."
 msgstr ""
 
-#: src/preferences.c:3588
+#: src/preferences.c:3650
 msgid ""
 "Warn if multitrack has no audio channels, and a layout with audio is loaded."
 msgstr ""
 
-#: src/preferences.c:3598
+#: src/preferences.c:3660
 msgid ""
 "Warn if multitrack has audio channels, and your audio player is not \"jack\" "
 "or \"pulse audio\"."
 msgstr ""
 
-#: src/preferences.c:3610
+#: src/preferences.c:3672
 msgid "Show info message after importing from firewire device."
 msgstr ""
 
-#: src/preferences.c:3626
+#: src/preferences.c:3688
 msgid "Show a warning before opening a yuv4mpeg stream (advanced)."
 msgstr ""
 
-#: src/preferences.c:3639
+#: src/preferences.c:3701
 msgid "Show a warning when multitrack is low on backup space."
 msgstr ""
 
-#: src/preferences.c:3650
+#: src/preferences.c:3713
 msgid "Show a warning advising cleaning of disk space after a crash."
 msgstr ""
 
-#: src/preferences.c:3661
+#: src/preferences.c:3725
 msgid "Show a warning if unable to connect to pulseaudio player."
 msgstr ""
 
-#: src/preferences.c:3673
+#: src/preferences.c:3737
 msgid "Show a warning before wiping a layout which has unsaved changes."
 msgstr ""
 
-#: src/preferences.c:3685
+#: src/preferences.c:3749
 msgid "Warnings"
 msgstr "Avertiments"
 
-#: src/preferences.c:3703
+#: src/preferences.c:3767
 msgid "Midi synch (requires the files midistart and midistop)"
 msgstr ""
 
-#: src/preferences.c:3715
+#: src/preferences.c:3779
 msgid "When inserting/merging frames:  "
 msgstr ""
 
-#: src/preferences.c:3719
+#: src/preferences.c:3783
 msgid "_Speed Up/Slow Down Insertion"
 msgstr ""
 
-#: src/preferences.c:3723
+#: src/preferences.c:3787
 msgid "_Resample Insertion"
 msgstr ""
 
-#: src/preferences.c:3730
+#: src/preferences.c:3794
 msgid "CD device           "
 msgstr ""
 
-#: src/preferences.c:3733
+#: src/preferences.c:3797
 msgid "LiVES can load audio tracks from this CD"
 msgstr ""
 
-#: src/preferences.c:3746
+#: src/preferences.c:3813
 msgid "Default FPS        "
 msgstr ""
 
-#: src/preferences.c:3749
+#: src/preferences.c:3816
 msgid "Frames per second to use when none is specified"
 msgstr ""
 
-#: src/preferences.c:3757
+#: src/preferences.c:3825
 msgid "Misc"
 msgstr "Divèrs"
 
-#: src/preferences.c:3782
+#: src/preferences.c:3850
 msgid "New theme:           "
 msgstr ""
 
-#: src/preferences.c:3800
+#: src/preferences.c:3867
 msgid "Themes"
 msgstr "Tèmas"
 
-#: src/preferences.c:3815
+#: src/preferences.c:3882
 msgid "Download bandwidth (Kb/s)       "
 msgstr ""
 
-#: src/preferences.c:3823
+#: src/preferences.c:3890
 msgid "LiVES must be compiled without \"configure --disable-OSC\" to use OMC"
 msgstr ""
 
-#: src/preferences.c:3833
+#: src/preferences.c:3900
 msgid "OMC remote control enabled"
 msgstr ""
 
-#: src/preferences.c:3841
+#: src/preferences.c:3908
 msgid "UDP port       "
 msgstr ""
 
-#: src/preferences.c:3850
+#: src/preferences.c:3917
 msgid "Start OMC on startup"
 msgstr ""
 
-#: src/preferences.c:3870
+#: src/preferences.c:3937
 msgid "Streaming/Networking"
 msgstr ""
 
-#: src/preferences.c:3882
+#: src/preferences.c:3949
 msgid "Jack transport"
 msgstr ""
 
-#: src/preferences.c:3886
+#: src/preferences.c:3953
 msgid ""
 "LiVES must be compiled with jack/transport.h and jack/jack.h present to use "
 "jack transport"
 msgstr ""
 
-#: src/preferences.c:3892
+#: src/preferences.c:3959
 msgid "Jack _transport config file"
 msgstr ""
 
-#: src/preferences.c:3899 src/preferences.c:3989
+#: src/preferences.c:3967 src/preferences.c:4058
 msgid "Start _server on LiVES startup"
 msgstr ""
 
-#: src/preferences.c:3911
+#: src/preferences.c:3979
 msgid "Jack transport _master (start and stop)"
 msgstr ""
 
-#: src/preferences.c:3921
+#: src/preferences.c:3989
 msgid "Jack transport _client (start and stop)"
 msgstr ""
 
-#: src/preferences.c:3935
+#: src/preferences.c:4003
 msgid "Jack transport sets start position"
 msgstr ""
 
-#: src/preferences.c:3952
+#: src/preferences.c:4020
 msgid "Jack transport timebase slave"
 msgstr ""
 
-#: src/preferences.c:3963
+#: src/preferences.c:4031
 msgid "(See also Playback -> Audio follows video rate/direction)"
 msgstr ""
 
-#: src/preferences.c:3971
+#: src/preferences.c:4039
 msgid "Jack audio"
 msgstr ""
 
-#: src/preferences.c:3975
+#: src/preferences.c:4043
 msgid "LiVES must be compiled with jack/jack.h present to use jack audio"
 msgstr ""
 
-#: src/preferences.c:3978
+#: src/preferences.c:4046
 msgid ""
 "You MUST set the audio player to \"jack\" in the Playback tab to use jack "
 "audio"
 msgstr ""
 
-#: src/preferences.c:3984
+#: src/preferences.c:4052
 msgid "Jack _audio server config file"
 msgstr ""
 
-#: src/preferences.c:3996
+#: src/preferences.c:4065
 msgid "Play audio even when transport is _paused"
 msgstr ""
 
-#: src/preferences.c:4008
+#: src/preferences.c:4077
 msgid "Automatically connect to System Out ports when 'playing' External Audio"
 msgstr ""
 
-#: src/preferences.c:4021
+#: src/preferences.c:4090
 msgid "Jack Integration"
 msgstr ""
 
-#: src/preferences.c:4035
+#: src/preferences.c:4104
 msgid "Events to respond to:"
 msgstr ""
 
-#: src/preferences.c:4044
+#: src/preferences.c:4113
 msgid "_Joystick events"
 msgstr ""
 
-#: src/preferences.c:4051
+#: src/preferences.c:4120
 msgid "_Joystick device"
 msgstr ""
 
-#: src/preferences.c:4053
+#: src/preferences.c:4122
 msgid "The joystick device, e.g. /dev/input/js0"
 msgstr ""
 
-#: src/preferences.c:4071
+#: src/preferences.c:4142
 msgid "_MIDI events"
 msgstr ""
 
-#: src/preferences.c:4080
+#: src/preferences.c:4151
 msgid "Use _ALSA MIDI (recommended)"
 msgstr ""
 
-#: src/preferences.c:4082
+#: src/preferences.c:4153
 msgid "Create an ALSA MIDI port which other MIDI devices can be connected to"
 msgstr ""
 
-#: src/preferences.c:4090
+#: src/preferences.c:4162
 msgid "Use _raw MIDI"
 msgstr ""
 
-#: src/preferences.c:4092
+#: src/preferences.c:4164
 msgid "Read directly from the MIDI device"
 msgstr ""
 
-#: src/preferences.c:4104
+#: src/preferences.c:4177
 msgid "_MIDI device"
 msgstr ""
 
-#: src/preferences.c:4106
+#: src/preferences.c:4179
 msgid "The MIDI device, e.g. /dev/input/midi0"
 msgstr ""
 
-#: src/preferences.c:4118
+#: src/preferences.c:4193
 msgid "Advanced"
 msgstr "Avançat"
 
-#: src/preferences.c:4124
+#: src/preferences.c:4199
 msgid "MIDI check _rate"
 msgstr ""
 
-#: src/preferences.c:4127
+#: src/preferences.c:4203
 msgid ""
 "Number of MIDI checks per keyboard tick. Increasing this may improve MIDI "
 "responsiveness, but may slow down playback."
 msgstr ""
 
-#: src/preferences.c:4134
+#: src/preferences.c:4211
 msgid "MIDI repeat"
 msgstr ""
 
-#: src/preferences.c:4137
+#: src/preferences.c:4214
 msgid "Number of non-reads allowed between succesive reads."
 msgstr ""
 
-#: src/preferences.c:4140
+#: src/preferences.c:4218
 msgid "(Warning: setting this value too high can slow down playback.)"
 msgstr ""
 
-#: src/preferences.c:4159
+#: src/preferences.c:4237
 msgid "MIDI/Joystick learner"
 msgstr ""
 
-#: src/preferences.c:4499
+#: src/preferences.c:4679
 msgid ""
 "\n"
 "LiVES will now shut down. You need to restart it for the directory change to "
@@ -7547,214 +7561,214 @@
 "Click OK to continue.\n"
 msgstr ""
 
-#: src/preferences.c:4523
+#: src/preferences.c:4703
 msgid ""
 "For the directory change to take effect LiVES will restart when preferences "
 "dialog closes."
 msgstr ""
 
-#: src/preferences.c:4527
+#: src/preferences.c:4707
 msgid "Theme changes will not take effect until the next time you start LiVES."
 msgstr ""
 
-#: src/preferences.c:4531
+#: src/preferences.c:4711
 msgid "Jack options will not take effect until the next time you start LiVES."
 msgstr ""
 
-#: src/osc.c:2585
+#: src/osc.c:2616
 #, c-format
 msgid "Syncing to external framerate of %.8f frames per second.\n"
 msgstr ""
 
-#: src/osc.c:6746
+#: src/osc.c:6938
 msgid "Cannot initialize OSC receiver\n"
 msgstr ""
 
-#: src/osc.c:6770
+#: src/osc.c:6961
 #, c-format
 msgid "WARNING: Cannot start OSC server at UDP port %d\n"
 msgstr ""
 
-#: src/osc.c:6775
+#: src/osc.c:6963
 #, c-format
 msgid "Started OSC server at UDP port %d\n"
 msgstr ""
 
-#: src/osc.c:6890
+#: src/osc.c:7076
 #, c-format
 msgid "Cannot start OSC/UDP server at port %d \n"
 msgstr ""
 
-#: src/resample.c:125 src/resample.c:304
+#: src/resample.c:131 src/resample.c:305
 #, c-format
 msgid "Resizing frames 1 to %d"
 msgstr ""
 
-#: src/resample.c:140 src/resample.c:318
+#: src/resample.c:145 src/resample.c:318
 #, c-format
 msgid "Resizing/letterboxing frames 1 to %d"
 msgstr ""
 
-#: src/resample.c:361 src/resample.c:385
+#: src/resample.c:360 src/resample.c:384
 msgid "Resize"
 msgstr "Redimensionar"
 
-#: src/resample.c:395
+#: src/resample.c:394
 msgid "Resample/Resize"
 msgstr ""
 
-#: src/resample.c:680
+#: src/resample.c:676
 #, c-format
 msgid "Length of video is now %d frames.\n"
 msgstr ""
 
-#: src/resample.c:745
+#: src/resample.c:737
 msgid ""
 "\n"
 "\n"
 "New rate must be greater than 0\n"
 msgstr ""
 
-#: src/resample.c:797 src/resample.c:813
+#: src/resample.c:788 src/resample.c:803
 msgid "Resampling audio"
 msgstr ""
 
-#: src/resample.c:831
+#: src/resample.c:821
 msgid "LiVES was unable to resample the audio as requested.\n"
 msgstr ""
 
-#: src/resample.c:833 src/resample.c:837
+#: src/resample.c:823 src/resample.c:827
 msgid "Resample Audio"
 msgstr ""
 
-#: src/resample.c:845
+#: src/resample.c:835
 #, c-format
 msgid "Audio was resampled to %d Hz, %d channels, %d bit"
 msgstr ""
 
-#: src/resample.c:1034
+#: src/resample.c:1016
 #, c-format
 msgid "Resampling video at %.8f frames per second..."
 msgstr ""
 
-#: src/resample.c:1037
+#: src/resample.c:1018
 #, c-format
 msgid "Resampling video at %.3f frames per second..."
 msgstr ""
 
-#: src/resample.c:1068
+#: src/resample.c:1049
 msgid "Reordering error !\n"
 msgstr ""
 
-#: src/resample.c:1079
+#: src/resample.c:1060
 msgid "Resample"
 msgstr ""
 
-#: src/resample.c:1192
+#: src/resample.c:1173
 msgid "LiVES: - Resample Audio"
 msgstr ""
 
-#: src/resample.c:1195
+#: src/resample.c:1175
 msgid "LiVES: - Insert Silence"
 msgstr ""
 
-#: src/resample.c:1198
+#: src/resample.c:1177
 msgid "LiVES: - New Clip Audio"
 msgstr ""
 
-#: src/resample.c:1201
+#: src/resample.c:1179
 msgid "LiVES: - External Clip Settings"
 msgstr ""
 
-#: src/resample.c:1238 src/resample.c:1358
+#: src/resample.c:1215 src/resample.c:1332
 msgid "Rate (Hz) "
 msgstr ""
 
-#: src/resample.c:1245 src/resample.c:1372
+#: src/resample.c:1222 src/resample.c:1346
 msgid "Channels"
 msgstr ""
 
-#: src/resample.c:1252
+#: src/resample.c:1229
 msgid "Sample Size "
 msgstr ""
 
-#: src/resample.c:1268 src/resample.c:1425
+#: src/resample.c:1245 src/resample.c:1399
 msgid "Signed"
 msgstr ""
 
-#: src/resample.c:1274 src/resample.c:1435
+#: src/resample.c:1251 src/resample.c:1409
 msgid "Unsigned"
 msgstr "Pas signat"
 
-#: src/resample.c:1297 src/resample.c:1460
+#: src/resample.c:1273 src/resample.c:1433
 msgid "Little Endian"
 msgstr ""
 
-#: src/resample.c:1303 src/resample.c:1468
+#: src/resample.c:1279 src/resample.c:1441
 msgid "Big Endian"
 msgstr ""
 
-#: src/resample.c:1315
+#: src/resample.c:1290
 msgid "Current"
 msgstr "Actual"
 
-#: src/resample.c:1340
+#: src/resample.c:1315
 msgid "_Enable audio"
 msgstr ""
 
-#: src/resample.c:1372
+#: src/resample.c:1346
 msgid "_Channels"
 msgstr ""
 
-#: src/resample.c:1394
+#: src/resample.c:1368
 msgid "_Sample Size"
 msgstr ""
 
-#: src/resample.c:1394
+#: src/resample.c:1368
 msgid "Sample Size"
 msgstr ""
 
-#: src/resample.c:1489
+#: src/resample.c:1461
 msgid "New"
 msgstr "Novèl"
 
-#: src/resample.c:1512
+#: src/resample.c:1484
 msgid "_Frames Per Second "
 msgstr ""
 
-#: src/resample.c:1530
+#: src/resample.c:1502
 msgid "Record for maximum:  "
 msgstr ""
 
-#: src/resample.c:1533
+#: src/resample.c:1505
 msgid " hours  "
 msgstr ""
 
-#: src/resample.c:1536
+#: src/resample.c:1508
 msgid " minutes  "
 msgstr ""
 
-#: src/resample.c:1538
+#: src/resample.c:1510
 msgid " seconds  "
 msgstr ""
 
-#: src/resample.c:1545
+#: src/resample.c:1517
 msgid "Unlimited"
 msgstr "Illimitat"
 
-#: src/resample.c:1561
+#: src/resample.c:1533
 msgid "Click OK to begin recording, or Cancel to quit."
 msgstr ""
 
-#: src/resample.c:1670
+#: src/resample.c:1638
 msgid "LiVES: - Change playback speed"
 msgstr ""
 
-#: src/resample.c:1673
+#: src/resample.c:1640
 msgid "LiVES: - Resample Video"
 msgstr ""
 
-#: src/resample.c:1696
+#: src/resample.c:1663
 #, c-format
 msgid ""
 "\n"
@@ -7765,7 +7779,7 @@
 "in _frames per second"
 msgstr ""
 
-#: src/resample.c:1701
+#: src/resample.c:1667
 #, c-format
 msgid ""
 "\n"
@@ -7776,89 +7790,89 @@
 "in frames per second"
 msgstr ""
 
-#: src/resample.c:1723
+#: src/resample.c:1688
 msgid "OR enter the desired clip length in _seconds"
 msgstr ""
 
-#: src/resample.c:1745
+#: src/resample.c:1710
 msgid "Change the _audio speed as well"
 msgstr ""
 
-#: src/resample.c:1846
+#: src/resample.c:1810
 msgid ""
 "\n"
 "Speeding up the clip will cause missing frames in some multitrack layouts.\n"
 "Are you sure you wish to change the speed ?\n"
 msgstr ""
 
-#: src/resample.c:1863
+#: src/resample.c:1829
 msgid ""
 "\n"
 "Speeding up the clip will cause missing audio in some multitrack layouts.\n"
 "Are you sure you wish to change the speed ?\n"
 msgstr ""
 
-#: src/resample.c:1878
+#: src/resample.c:1847
 msgid ""
 "\n"
 "Changing the speed will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/resample.c:1892
+#: src/resample.c:1863
 msgid ""
 "\n"
 "Changing the speed will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/resample.c:1938
+#: src/resample.c:1911
 msgid "Speed Change"
 msgstr ""
 
-#: src/resample.c:1947
+#: src/resample.c:1920
 #, c-format
 msgid "Changed playback speed to %.3f frames per second and audio to %d Hz.\n"
 msgstr ""
 
-#: src/resample.c:1950
+#: src/resample.c:1922
 #, c-format
 msgid "Changed playback speed to %.3f frames per second.\n"
 msgstr ""
 
-#: src/resample.c:2035
+#: src/resample.c:2006
 msgid "Resampling video"
 msgstr ""
 
-#: src/resample.c:2042 src/resample.c:2160 src/resample.c:2182
+#: src/resample.c:2012 src/resample.c:2127 src/resample.c:2148
 msgid "Resampling clipboard video"
 msgstr ""
 
-#: src/resample.c:2047
+#: src/resample.c:2016
 msgid "Reordering frames"
 msgstr ""
 
-#: src/resample.c:2056
+#: src/resample.c:2025
 msgid ""
 "\n"
 "\n"
 "LiVES was unable to reorder the frames."
 msgstr ""
 
-#: src/resample.c:2104
+#: src/resample.c:2071
 msgid "Deordering frames"
 msgstr ""
 
-#: src/resample.c:2199
+#: src/resample.c:2165
 msgid "resampling error..."
 msgstr ""
 
-#: src/rte_window.c:85 src/rte_window.c:1708
+#: src/rte_window.c:124 src/rte_window.c:1709
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
-#: src/rte_window.c:112
+#: src/rte_window.c:150
 msgid ""
 "\n"
 "\n"
@@ -7868,7 +7882,7 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:426
+#: src/rte_window.c:460
 msgid ""
 "\n"
 "\n"
@@ -7876,19 +7890,19 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:432
+#: src/rte_window.c:466
 #, c-format
 msgid "Saving keymap to %s\n"
 msgstr ""
 
-#: src/rte_window.c:439
+#: src/rte_window.c:471
 #, c-format
 msgid ""
 "\n"
 "Updating keymap file %s..."
 msgstr ""
 
-#: src/rte_window.c:446
+#: src/rte_window.c:477
 #, c-format
 msgid ""
 "\n"
@@ -7898,12 +7912,12 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/rte_window.c:526
+#: src/rte_window.c:556
 #, c-format
 msgid "Saving real time effect defaults to %s..."
 msgstr ""
 
-#: src/rte_window.c:535
+#: src/rte_window.c:563
 #, c-format
 msgid ""
 "\n"
@@ -7913,22 +7927,22 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/rte_window.c:632
+#: src/rte_window.c:657
 #, c-format
 msgid "Loading real time effect defaults from %s..."
 msgstr ""
 
-#: src/rte_window.c:681
+#: src/rte_window.c:701
 #, c-format
 msgid "Loading generator default sizes from %s..."
 msgstr ""
 
-#: src/rte_window.c:1306
+#: src/rte_window.c:1319
 #, c-format
 msgid "Loading default keymap from %s..."
 msgstr ""
 
-#: src/rte_window.c:1329
+#: src/rte_window.c:1339
 #, c-format
 msgid ""
 "\n"
@@ -7938,48 +7952,48 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/rte_window.c:1403
+#: src/rte_window.c:1412
 #, c-format
 msgid "Invalid line %d in %s\n"
 msgstr ""
 
-#: src/rte_window.c:1483
+#: src/rte_window.c:1490
 #, c-format
 msgid "Invalid key %d in %s\n"
 msgstr ""
 
-#: src/rte_window.c:1498
+#: src/rte_window.c:1505
 #, c-format
 msgid "Invalid effect %s in %s\n"
 msgstr ""
 
-#: src/rte_window.c:1517
+#: src/rte_window.c:1524
 #, c-format
 msgid "Unknown effect %s in %s\n"
 msgstr ""
 
-#: src/rte_window.c:1535
+#: src/rte_window.c:1542
 #, c-format
 msgid ""
 "This version of LiVES cannot mix generators/non-generators on the same key "
 "(%d) !\n"
 msgstr ""
 
-#: src/rte_window.c:1547
+#: src/rte_window.c:1554
 #, c-format
 msgid "Too many effects bound to key %d.\n"
 msgstr ""
 
-#: src/rte_window.c:1587
+#: src/rte_window.c:1593
 msgid "update required.\n"
 msgstr ""
 
-#: src/rte_window.c:1603
+#: src/rte_window.c:1607
 #, c-format
 msgid "Loading data connection map from %s..."
 msgstr ""
 
-#: src/rte_window.c:1612
+#: src/rte_window.c:1614
 msgid ""
 "\n"
 "\n"
@@ -7987,41 +8001,41 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:1691
+#: src/rte_window.c:1692
 #, c-format
 msgid "LiVES: Information for %s"
 msgstr ""
 
-#: src/rte_window.c:1704
+#: src/rte_window.c:1705
 #, c-format
 msgid "Effect name: %s"
 msgstr ""
 
-#: src/rte_window.c:1712
+#: src/rte_window.c:1713
 #, c-format
 msgid "Plugin name: %s"
 msgstr ""
 
-#: src/rte_window.c:1716
+#: src/rte_window.c:1717
 #, c-format
 msgid "Author: %s"
 msgstr "Autor : %s"
 
-#: src/rte_window.c:1721
+#: src/rte_window.c:1722
 #, c-format
 msgid "and: %s"
 msgstr ""
 
-#: src/rte_window.c:1726
+#: src/rte_window.c:1727
 #, c-format
 msgid "Version: %d"
 msgstr "Version : %d"
 
-#: src/rte_window.c:1734
+#: src/rte_window.c:1735
 msgid "Description: "
 msgstr ""
 
-#: src/rte_window.c:1960
+#: src/rte_window.c:1963
 msgid ""
 "\n"
 "\n"
@@ -8030,69 +8044,69 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:2024
+#: src/rte_window.c:2027
 #, c-format
 msgid "LiVES could not locate the effect %s.\n"
 msgstr ""
 
-#: src/rte_window.c:2225
+#: src/rte_window.c:2216
 msgid "LiVES: Real time effect mapping"
 msgstr ""
 
-#: src/rte_window.c:2257
+#: src/rte_window.c:2248
 #, c-format
 msgid "Ctrl-%d"
 msgstr "Ctrl-%d"
 
-#: src/rte_window.c:2264
+#: src/rte_window.c:2255
 msgid "Key active"
 msgstr ""
 
-#: src/rte_window.c:2279
+#: src/rte_window.c:2271
 msgid "Key grab"
 msgstr ""
 
-#: src/rte_window.c:2280
+#: src/rte_window.c:2272
 msgid "Grab keyboard for this effect key"
 msgstr ""
 
-#: src/rte_window.c:2290
+#: src/rte_window.c:2283
 msgid "_Clear all effects"
 msgstr ""
 
-#: src/rte_window.c:2304
+#: src/rte_window.c:2297
 msgid "Mode active"
 msgstr ""
 
-#: src/rte_window.c:2314 src/multitrack.c:8568
+#: src/rte_window.c:2307 src/multitrack.c:8762
 msgid "Info"
 msgstr "Info"
 
-#: src/rte_window.c:2315
+#: src/rte_window.c:2308
 msgid "Set Parameters"
 msgstr ""
 
-#: src/rte_window.c:2316
+#: src/rte_window.c:2309
 msgid "Set Connections"
 msgstr ""
 
-#: src/rte_window.c:2317
+#: src/rte_window.c:2310
 msgid "Clear"
 msgstr "Escafar"
 
-#: src/rte_window.c:2326
+#: src/rte_window.c:2319
 msgid "Effect name:"
 msgstr ""
 
-#: src/rte_window.c:2391
+#: src/rte_window.c:2384
 msgid "_Save as default keymap"
 msgstr ""
 
-#: src/rte_window.c:2396
+#: src/rte_window.c:2389
 msgid "_Load default keymap"
 msgstr ""
 
-#: src/rte_window.c:2840
+#: src/rte_window.c:2833
 #, c-format
 msgid ""
 "Unable to create default keymap file: %s\n"
@@ -8150,86 +8164,86 @@
 msgid "none\n"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:494
+#: src/lives-yuv4mpeg.c:493
 #, c-format
 msgid ""
 "Unable to set display framerate to %.3f fps.\n"
 "\n"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:503
+#: src/lives-yuv4mpeg.c:502
 #, c-format
 msgid "Unable to open yuv4mpeg out stream %s\n"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:628
+#: src/lives-yuv4mpeg.c:626
 #, c-format
 msgid "TV card %d"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:713
+#: src/lives-yuv4mpeg.c:710
 #, c-format
 msgid "Opened TV card %d (%s)"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:760
+#: src/lives-yuv4mpeg.c:757
 #, c-format
 msgid "Firewire card %d"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:796
+#: src/lives-yuv4mpeg.c:793
 #, c-format
 msgid "Opened firewire card %d"
 msgstr ""
 
-#: src/multitrack.c:666
+#: src/multitrack.c:736
 msgid "Auto backup"
 msgstr ""
 
-#: src/multitrack.c:868
+#: src/multitrack.c:935
 msgid "Backing audio"
 msgstr ""
 
-#: src/multitrack.c:1435
+#: src/multitrack.c:1515
 #, c-format
 msgid "%s : parameters for %s"
 msgstr ""
 
-#: src/multitrack.c:1809 src/multitrack.c:3483
+#: src/multitrack.c:1881 src/multitrack.c:3635
 #, c-format
 msgid "Current track: %s (layer %d)\n"
 msgstr ""
 
-#: src/multitrack.c:1813 src/multitrack.c:3484
+#: src/multitrack.c:1885 src/multitrack.c:3637
 msgid "Current track: Backing audio\n"
 msgstr ""
 
-#: src/multitrack.c:1814
+#: src/multitrack.c:1886
 #, c-format
 msgid "Current track: Layer %d audio\n"
 msgstr ""
 
-#: src/multitrack.c:1817
+#: src/multitrack.c:1889
 #, c-format
 msgid "%.2f sec.\n"
 msgstr "%.2f seg.\n"
 
-#: src/multitrack.c:1822 src/multitrack.c:3490
+#: src/multitrack.c:1894 src/multitrack.c:3643
 #, c-format
 msgid "Source: %s"
 msgstr "Font : %s"
 
-#: src/multitrack.c:1825 src/multitrack.c:3492
+#: src/multitrack.c:1897 src/multitrack.c:3645
 msgid "Right click for context menu.\n"
 msgstr ""
 
-#: src/multitrack.c:1827
+#: src/multitrack.c:1899
 msgid ""
 "Double click on a block\n"
 "to select it."
 msgstr ""
 
-#: src/multitrack.c:3312
+#: src/multitrack.c:3452
 msgid ""
 "\n"
 "\n"
@@ -8238,7 +8252,7 @@
 "right or double clicking on it.\n"
 msgstr ""
 
-#: src/multitrack.c:3315
+#: src/multitrack.c:3455
 msgid ""
 "\n"
 "\n"
@@ -8246,14 +8260,14 @@
 "Select an effect in FX stack first to view its parameters.\n"
 msgstr ""
 
-#: src/multitrack.c:3318
+#: src/multitrack.c:3458
 msgid ""
 "\n"
 "\n"
 "No clips loaded.\n"
 msgstr ""
 
-#: src/multitrack.c:3321
+#: src/multitrack.c:3462
 msgid ""
 "You must select two video tracks\n"
 "and a time region\n"
@@ -8263,7 +8277,7 @@
 "before inserting clips into the timeline."
 msgstr ""
 
-#: src/multitrack.c:3324
+#: src/multitrack.c:3465
 msgid ""
 "\n"
 "\n"
@@ -8272,210 +8286,210 @@
 "to apply compositors.\n"
 msgstr ""
 
-#: src/multitrack.c:3487
+#: src/multitrack.c:3640
 #, c-format
 msgid "%.2f sec. to %.2f sec.\n"
 msgstr ""
 
-#: src/multitrack.c:3493
+#: src/multitrack.c:3646
 msgid ""
 "Single click on timeline\n"
 "to select a frame.\n"
 msgstr ""
 
-#: src/multitrack.c:3711 src/multitrack.c:6790
+#: src/multitrack.c:3858 src/multitrack.c:6972
 #, c-format
 msgid "%s [unstable]"
 msgstr ""
 
-#: src/multitrack.c:3822
+#: src/multitrack.c:3973
 msgid ""
 "You can click and drag\n"
 "below the timeline"
 msgstr ""
 
-#: src/multitrack.c:3823
+#: src/multitrack.c:3974
 msgid "to select a time region.\n"
 msgstr ""
 
-#: src/multitrack.c:3985
+#: src/multitrack.c:4137
 msgid "LiVES: Selected clip"
 msgstr ""
 
-#: src/multitrack.c:3993
+#: src/multitrack.c:4145
 msgid "_Adjust start and end points"
 msgstr ""
 
-#: src/multitrack.c:4002
+#: src/multitrack.c:4154
 msgid "_Edit/encode in clip editor"
 msgstr ""
 
-#: src/multitrack.c:4009
+#: src/multitrack.c:4161
 msgid "_Show clip information"
 msgstr ""
 
-#: src/multitrack.c:4016
+#: src/multitrack.c:4168
 msgid "_Close this clip"
 msgstr ""
 
-#: src/multitrack.c:4236
+#: src/multitrack.c:4388
 msgid "Audio mixer (ctrl-m)"
 msgstr ""
 
-#: src/multitrack.c:4336
+#: src/multitrack.c:4488
 msgid "Single click on timeline"
 msgstr ""
 
-#: src/multitrack.c:4337
+#: src/multitrack.c:4489
 msgid "to select a frame."
 msgstr ""
 
-#: src/multitrack.c:4338
+#: src/multitrack.c:4490
 msgid "Double click or right click on timeline"
 msgstr ""
 
-#: src/multitrack.c:4339
+#: src/multitrack.c:4491
 msgid "to select a block."
 msgstr ""
 
-#: src/multitrack.c:4340
+#: src/multitrack.c:4492
 msgid "Clips can be dragged"
 msgstr ""
 
-#: src/multitrack.c:4341
+#: src/multitrack.c:4493
 msgid "onto the timeline."
 msgstr ""
 
-#: src/multitrack.c:4343
+#: src/multitrack.c:4495
 msgid "Mouse mode is: Move"
 msgstr ""
 
-#: src/multitrack.c:4344
+#: src/multitrack.c:4496
 msgid "clips can be moved around."
 msgstr ""
 
-#: src/multitrack.c:4349
+#: src/multitrack.c:4500
 msgid "Mouse mode is: Select."
 msgstr ""
 
-#: src/multitrack.c:4350
+#: src/multitrack.c:4501
 msgid "Drag with mouse on timeline"
 msgstr ""
 
-#: src/multitrack.c:4351
+#: src/multitrack.c:4502
 msgid "to select tracks and time."
 msgstr ""
 
-#: src/multitrack.c:4362
+#: src/multitrack.c:4509
 msgid "_Insert mode: Normal"
 msgstr ""
 
-#: src/multitrack.c:4378
+#: src/multitrack.c:4537
 msgid "_Mouse mode: Move"
 msgstr ""
 
-#: src/multitrack.c:4382
+#: src/multitrack.c:4540
 msgid "_Mouse mode: Select"
 msgstr ""
 
-#: src/multitrack.c:4405 src/multitrack.c:7925
+#: src/multitrack.c:4563 src/multitrack.c:8104
 msgid "Gravity: Normal"
 msgstr ""
 
-#: src/multitrack.c:4409
+#: src/multitrack.c:4565
 msgid "Gravity: Left"
 msgstr ""
 
-#: src/multitrack.c:4414
+#: src/multitrack.c:4569
 msgid "Gravity: Right"
 msgstr ""
 
-#: src/multitrack.c:4416
+#: src/multitrack.c:4570
 msgid "Close _last gap(s) in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:4419
+#: src/multitrack.c:4572
 msgid "Close _first gap(s) in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:4458
+#: src/multitrack.c:4627
 msgid "Close gaps"
 msgstr ""
 
-#: src/multitrack.c:4460
+#: src/multitrack.c:4629
 msgid "Move block"
 msgstr ""
 
-#: src/multitrack.c:4462
+#: src/multitrack.c:4631
 msgid "Move audio block"
 msgstr ""
 
-#: src/multitrack.c:4464
+#: src/multitrack.c:4633
 msgid "Delete block"
 msgstr ""
 
-#: src/multitrack.c:4466
+#: src/multitrack.c:4635
 msgid "Delete audio block"
 msgstr ""
 
-#: src/multitrack.c:4468
+#: src/multitrack.c:4637
 msgid "Split tracks"
 msgstr ""
 
-#: src/multitrack.c:4470
+#: src/multitrack.c:4639
 msgid "Split block"
 msgstr ""
 
-#: src/multitrack.c:4473
+#: src/multitrack.c:4642
 #, c-format
 msgid "Apply %s"
 msgstr ""
 
-#: src/multitrack.c:4478
+#: src/multitrack.c:4647
 #, c-format
 msgid "Delete %s"
 msgstr "Suprimir %s"
 
-#: src/multitrack.c:4482
+#: src/multitrack.c:4651
 msgid "Insert block"
 msgstr ""
 
-#: src/multitrack.c:4484
+#: src/multitrack.c:4653
 msgid "Insert gap"
 msgstr ""
 
-#: src/multitrack.c:4486
+#: src/multitrack.c:4655
 msgid "Insert audio block"
 msgstr ""
 
-#: src/multitrack.c:4488
+#: src/multitrack.c:4657
 msgid "Effect order change"
 msgstr ""
 
-#: src/multitrack.c:4898
+#: src/multitrack.c:5064
 msgid "unsigned "
 msgstr ""
 
-#: src/multitrack.c:4899
+#: src/multitrack.c:5065
 msgid "signed "
 msgstr ""
 
-#: src/multitrack.c:4904
+#: src/multitrack.c:5071
 #, c-format
 msgid ""
 "Multitrack values set to %.3f fps, frame size %d x %d, audio channels %d, "
 "audio rate %d, audio sample size %d, %s.\n"
 msgstr ""
 
-#: src/multitrack.c:4938
+#: src/multitrack.c:5104
 msgid "invalid event list. Failed.\n"
 msgstr ""
 
-#: src/multitrack.c:4944
+#: src/multitrack.c:5110
 msgid "event list has invalid fps. Failed.\n"
 msgstr ""
 
-#: src/multitrack.c:4953
+#: src/multitrack.c:5122
 #, c-format
 msgid ""
 "\n"
@@ -8485,7 +8499,7 @@
 "then load in the new set from the File menu.\n"
 msgstr ""
 
-#: src/multitrack.c:4993
+#: src/multitrack.c:5163
 #, c-format
 msgid ""
 "\n"
@@ -8493,600 +8507,592 @@
 "It cannot be loaded.\n"
 msgstr ""
 
-#: src/multitrack.c:5329 src/multitrack.c:5338 src/multitrack.c:21133
+#: src/multitrack.c:5452
 msgid "Layout was wiped.\n"
 msgstr ""
 
-#: src/multitrack.c:5374
+#: src/multitrack.c:5547
 #, c-format
 msgid "LiVES-%s: Multitrack %dx%d : %d bpp %.3f fps"
 msgstr ""
 
-#: src/multitrack.c:5617
+#: src/multitrack.c:5793
 msgid "In/out"
 msgstr ""
 
-#: src/multitrack.c:5619
+#: src/multitrack.c:5795
 msgid "FX stack"
 msgstr ""
 
-#: src/multitrack.c:5627 src/omc-learn.c:673
+#: src/multitrack.c:5803 src/omc-learn.c:659
 msgid "Params."
 msgstr ""
 
-#: src/multitrack.c:5978
+#: src/multitrack.c:6157
 msgid "_Open..."
 msgstr "_Dobrir..."
 
-#: src/multitrack.c:5996
+#: src/multitrack.c:6175
 msgid "O_pen File Selection..."
 msgstr ""
 
-#: src/multitrack.c:6040
+#: src/multitrack.c:6219
 msgid "Import Selection from _dvd/vcd..."
 msgstr ""
 
-#: src/multitrack.c:6050
+#: src/multitrack.c:6229
 msgid "Import Selection from _dvd"
 msgstr ""
 
-#: src/multitrack.c:6060
+#: src/multitrack.c:6239
 msgid "Import Selection from _vcd"
 msgstr ""
 
-#: src/multitrack.c:6076
+#: src/multitrack.c:6255
 msgid "_Import from Device"
 msgstr ""
 
-#: src/multitrack.c:6103
+#: src/multitrack.c:6282
 msgid "_Close the selected clip"
 msgstr ""
 
-#: src/multitrack.c:6198
+#: src/multitrack.c:6377
 msgid "_Save layout as..."
 msgstr ""
 
-#: src/multitrack.c:6206
+#: src/multitrack.c:6385
 msgid "_Load layout..."
 msgstr ""
 
-#: src/multitrack.c:6210
+#: src/multitrack.c:6389
 msgid "_Wipe/Delete layout..."
 msgstr ""
 
-#: src/multitrack.c:6236
+#: src/multitrack.c:6415
 msgid "_Ignore width, height and audio values from loaded layouts"
 msgstr ""
 
-#: src/multitrack.c:6240
+#: src/multitrack.c:6419
 msgid "Auto load _subtitles with clips"
 msgstr ""
 
-#: src/multitrack.c:6322
+#: src/multitrack.c:6501
 msgid "_CLIP EDITOR"
 msgstr ""
 
-#: src/multitrack.c:6334
+#: src/multitrack.c:6513
 msgid "_Adjust selected clip start/end points"
 msgstr ""
 
-#: src/multitrack.c:6343
+#: src/multitrack.c:6522
 msgid "_Insert selected clip"
 msgstr ""
 
-#: src/multitrack.c:6355
+#: src/multitrack.c:6534
 msgid "_Insert selected clip audio"
 msgstr ""
 
-#: src/multitrack.c:6364
+#: src/multitrack.c:6543
 msgid "_Delete selected block"
 msgstr ""
 
-#: src/multitrack.c:6373
+#: src/multitrack.c:6555
 msgid "_Jump to previous block boundary"
 msgstr ""
 
-#: src/multitrack.c:6382
+#: src/multitrack.c:6564
 msgid "_Jump to next block boundary"
 msgstr ""
 
-#: src/multitrack.c:6395
+#: src/multitrack.c:6577
 msgid "Clear _marks from timeline"
 msgstr ""
 
-#: src/multitrack.c:6403
+#: src/multitrack.c:6585
 msgid "Ignore selection limits when inserting"
 msgstr ""
 
-#: src/multitrack.c:6420 src/multitrack.c:16719
+#: src/multitrack.c:6602 src/multitrack.c:17009
 msgid "_Play from Timeline Position"
 msgstr ""
 
-#: src/multitrack.c:6434
+#: src/multitrack.c:6616
 msgid "Pla_y selected time only"
 msgstr ""
 
-#: src/multitrack.c:6518
+#: src/multitrack.c:6700
 msgid "_Move effects with blocks"
 msgstr ""
 
-#: src/multitrack.c:6531
+#: src/multitrack.c:6713
 msgid "Select _autotransition effect..."
 msgstr ""
 
-#: src/multitrack.c:6542
+#: src/multitrack.c:6724
 msgid "Crossfade audio with autotransition"
 msgstr ""
 
-#: src/multitrack.c:6550
+#: src/multitrack.c:6732
 msgid "View/_Edit selected effect"
 msgstr ""
 
-#: src/multitrack.c:6554
+#: src/multitrack.c:6736
 msgid "_Delete selected effect"
 msgstr ""
 
-#: src/multitrack.c:6562
+#: src/multitrack.c:6744
 msgid "Apply effect to _block..."
 msgstr ""
 
-#: src/multitrack.c:6619
+#: src/multitrack.c:6801
 msgid "Apply effect to _region..."
 msgstr ""
 
-#: src/multitrack.c:6885
+#: src/multitrack.c:7061
 msgid "_Tracks"
 msgstr ""
 
-#: src/multitrack.c:6896
+#: src/multitrack.c:7072
 msgid "Rename current track"
 msgstr ""
 
-#: src/multitrack.c:6904
+#: src/multitrack.c:7080
 msgid "Make _Backing Audio current track"
 msgstr ""
 
-#: src/multitrack.c:6915
+#: src/multitrack.c:7091
 msgid "Add Video Track at _Rear"
 msgstr ""
 
-#: src/multitrack.c:6923
+#: src/multitrack.c:7099
 msgid "Add Video Track at _Front"
 msgstr ""
 
-#: src/multitrack.c:6936
+#: src/multitrack.c:7112
 msgid "_Split current track at cursor"
 msgstr ""
 
-#: src/multitrack.c:6948
+#: src/multitrack.c:7124
 msgid "_Split selected video tracks"
 msgstr ""
 
-#: src/multitrack.c:6961
+#: src/multitrack.c:7137
 msgid "Insert gap in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:6969
+#: src/multitrack.c:7145
 msgid "Insert gap in current track/selected time"
 msgstr ""
 
-#: src/multitrack.c:6981
+#: src/multitrack.c:7157
 msgid "Close all _gaps in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:7007
+#: src/multitrack.c:7183
 msgid "Se_lection"
 msgstr "Se_leccion"
 
-#: src/multitrack.c:7018
+#: src/multitrack.c:7194
 msgid "_Select Current Track"
 msgstr ""
 
-#: src/multitrack.c:7025
+#: src/multitrack.c:7201
 msgid "Select _all video tracks"
 msgstr ""
 
-#: src/multitrack.c:7032
+#: src/multitrack.c:7208
 msgid "Select _no video tracks"
 msgstr ""
 
-#: src/multitrack.c:7039
+#: src/multitrack.c:7215
 msgid "Select all _time"
 msgstr ""
 
-#: src/multitrack.c:7050
+#: src/multitrack.c:7226
 msgid "Select from _zero time"
 msgstr ""
 
-#: src/multitrack.c:7057
+#: src/multitrack.c:7233
 msgid "Select to _end time"
 msgstr ""
 
-#: src/multitrack.c:7064
+#: src/multitrack.c:7240
 msgid "_Copy..."
 msgstr "_Copiar..."
 
-#: src/multitrack.c:7075
+#: src/multitrack.c:7251
 msgid "_Timecode to region start"
 msgstr ""
 
-#: src/multitrack.c:7082
+#: src/multitrack.c:7258
 msgid "_Timecode to region end"
 msgstr ""
 
-#: src/multitrack.c:7089
+#: src/multitrack.c:7265
 msgid "_Region start to timecode"
 msgstr ""
 
-#: src/multitrack.c:7096
+#: src/multitrack.c:7272
 msgid "_Region end to timecode"
 msgstr ""
 
-#: src/multitrack.c:7110
+#: src/multitrack.c:7286
 msgid "Select/deselect block at current track/time"
 msgstr ""
 
-#: src/multitrack.c:7135
+#: src/multitrack.c:7311
 msgid "_Change width, height and audio values..."
 msgstr ""
 
-#: src/multitrack.c:7194
+#: src/multitrack.c:7370
 msgid "_Render"
 msgstr ""
 
-#: src/multitrack.c:7205
+#: src/multitrack.c:7381
 msgid "_Render all to new clip"
 msgstr ""
 
-#: src/multitrack.c:7220
+#: src/multitrack.c:7396
 msgid "Render _video"
 msgstr ""
 
-#: src/multitrack.c:7225
+#: src/multitrack.c:7401
 msgid "Render _audio"
 msgstr ""
 
-#: src/multitrack.c:7235
+#: src/multitrack.c:7411
 msgid "_Normalise rendered audio"
 msgstr ""
 
-#: src/multitrack.c:7242
+#: src/multitrack.c:7418
 msgid "_Pre-render audio"
 msgstr ""
 
-#: src/multitrack.c:7251
+#: src/multitrack.c:7427
 msgid "_View"
 msgstr "_Afichatge"
 
-#: src/multitrack.c:7270
+#: src/multitrack.c:7446
 msgid "Block _In/out points"
 msgstr ""
 
-#: src/multitrack.c:7279
+#: src/multitrack.c:7455
 msgid "_Effects at current"
 msgstr ""
 
-#: src/multitrack.c:7297
+#: src/multitrack.c:7473
 msgid "Audio parameters"
 msgstr ""
 
-#: src/multitrack.c:7308
+#: src/multitrack.c:7484
 msgid "Show backing _audio track"
 msgstr ""
 
-#: src/multitrack.c:7312
+#: src/multitrack.c:7488
 msgid "Compact view"
 msgstr ""
 
-#: src/multitrack.c:7320
+#: src/multitrack.c:7496
 msgid "Maximum tracks to display..."
 msgstr ""
 
-#: src/multitrack.c:7327
+#: src/multitrack.c:7503
 msgid "Scroll to follow playback"
 msgstr ""
 
-#: src/multitrack.c:7331
+#: src/multitrack.c:7507
 msgid "_Center on cursor"
 msgstr ""
 
-#: src/multitrack.c:7338
+#: src/multitrack.c:7514
 msgid "_Zoom in"
 msgstr ""
 
-#: src/multitrack.c:7349
+#: src/multitrack.c:7525
 msgid "_Zoom out"
 msgstr ""
 
-#: src/multitrack.c:7361
+#: src/multitrack.c:7537
 msgid "Multitrack _details"
 msgstr ""
 
-#: src/multitrack.c:7374
+#: src/multitrack.c:7550
 msgid "_Event Window"
 msgstr ""
 
-#: src/multitrack.c:7378
+#: src/multitrack.c:7554
 msgid "_Event Window (selected time only)"
 msgstr ""
 
-#: src/multitrack.c:7382
+#: src/multitrack.c:7558
 msgid "_Show FRAME events"
 msgstr ""
 
-#: src/multitrack.c:7399
+#: src/multitrack.c:7575
 msgid "_Show multitrack keys"
 msgstr ""
 
-#: src/multitrack.c:7468
+#: src/multitrack.c:7644
 msgid "Mouse mode: _Move"
 msgstr ""
 
-#: src/multitrack.c:7476
+#: src/multitrack.c:7652
 msgid "Mouse mode: _Select"
 msgstr ""
 
-#: src/multitrack.c:7505
+#: src/multitrack.c:7681
 msgid "Insert mode: _Normal"
 msgstr ""
 
-#: src/multitrack.c:7733
+#: src/multitrack.c:7909
 msgid "Insert with _audio"
 msgstr ""
 
-#: src/multitrack.c:7734
+#: src/multitrack.c:7910
 msgid ""
 "Select whether video clips are inserted and moved with their audio or not"
 msgstr ""
 
-#: src/multitrack.c:7829
+#: src/multitrack.c:8007
 msgid "Select _overlap"
 msgstr ""
 
-#: src/multitrack.c:7830
+#: src/multitrack.c:8008
 msgid ""
 "Select whether timeline selection snaps to overlap between selected tracks "
 "or not"
 msgstr ""
 
-#: src/multitrack.c:7894 src/multitrack.c:14198
+#: src/multitrack.c:8073 src/multitrack.c:14422
 msgid "Expanded View (d)"
 msgstr ""
 
-#: src/multitrack.c:7897 src/multitrack.c:14205
+#: src/multitrack.c:8076 src/multitrack.c:14428
 msgid "Compact View (d)"
 msgstr ""
 
-#: src/multitrack.c:7939
+#: src/multitrack.c:8118
 msgid "Gravity: _Normal"
 msgstr ""
 
-#: src/multitrack.c:7952
+#: src/multitrack.c:8131
 msgid "Gravity: _Left"
 msgstr ""
 
-#: src/multitrack.c:7967
+#: src/multitrack.c:8146
 msgid "Gravity: _Right"
 msgstr ""
 
-#: src/multitrack.c:8297
+#: src/multitrack.c:8496
 msgid "_Apply"
 msgstr "_Aplicar"
 
-#: src/multitrack.c:8319
+#: src/multitrack.c:8518
 msgid "Time"
 msgstr "Ora"
 
-#: src/multitrack.c:8333
+#: src/multitrack.c:8532
 msgid "_Del. node"
 msgstr ""
 
-#: src/multitrack.c:8341
+#: src/multitrack.c:8540
 msgid "_Next node"
 msgstr ""
 
-#: src/multitrack.c:8349
+#: src/multitrack.c:8548
 msgid "_Prev node"
 msgstr ""
 
-#: src/multitrack.c:8373
+#: src/multitrack.c:8574
 msgid "_Reverse playback  "
 msgstr ""
 
-#: src/multitrack.c:8395
+#: src/multitrack.c:8596
 msgid "_Velocity  "
 msgstr ""
 
-#: src/multitrack.c:8464
+#: src/multitrack.c:8664
 msgid "Anchor _start"
 msgstr ""
 
-#: src/multitrack.c:8465
+#: src/multitrack.c:8665
 msgid "Anchor the start point to the timeline"
 msgstr ""
 
-#: src/multitrack.c:8481
-msgid "Start frame"
-msgstr ""
-
-#: src/multitrack.c:8533
+#: src/multitrack.c:8728
 msgid "Anchor _end"
 msgstr ""
 
-#: src/multitrack.c:8534
+#: src/multitrack.c:8729
 msgid "Anchor the end point to the timeline"
 msgstr ""
 
-#: src/multitrack.c:8546
-msgid "End frame"
-msgstr ""
-
-#: src/multitrack.c:8739
+#: src/multitrack.c:8929
 msgid "Scroll"
 msgstr "Desfilament"
 
-#: src/multitrack.c:9316
+#: src/multitrack.c:9502
 msgid ""
 "\n"
 "==============================\n"
 "Switched to Clip Edit mode\n"
 msgstr ""
 
-#: src/multitrack.c:9502
+#: src/multitrack.c:9708
 msgid "Timeline (seconds)"
 msgstr ""
 
-#: src/multitrack.c:9984
+#: src/multitrack.c:10202
 msgid " Backing audio"
 msgstr ""
 
-#: src/multitrack.c:9987
+#: src/multitrack.c:10204
 #, c-format
 msgid " Layer %d audio"
 msgstr ""
 
-#: src/multitrack.c:9995
+#: src/multitrack.c:10212
 msgid "Show/hide audio details"
 msgstr ""
 
-#: src/multitrack.c:10010 src/multitrack.c:10232
+#: src/multitrack.c:10227 src/multitrack.c:10452
 #, c-format
 msgid "Layer %d audio"
 msgstr ""
 
-#: src/multitrack.c:10144 src/multitrack.c:10261
+#: src/multitrack.c:10353 src/multitrack.c:10481
 #, c-format
 msgid "%s (layer %d)"
 msgstr ""
 
-#: src/multitrack.c:10184
+#: src/multitrack.c:10403
 msgid "Select track"
 msgstr ""
 
-#: src/multitrack.c:10188
+#: src/multitrack.c:10407
 msgid "Show/hide audio"
 msgstr ""
 
-#: src/multitrack.c:10194
+#: src/multitrack.c:10413
 #, c-format
 msgid "Video %d"
 msgstr "Vidèo %d"
 
-#: src/multitrack.c:10233
+#: src/multitrack.c:10453
 #, c-format
 msgid " %s"
 msgstr " %s"
 
-#: src/multitrack.c:10346
+#: src/multitrack.c:10574
 msgid "LiVES: Selected effect"
 msgstr ""
 
-#: src/multitrack.c:10358
+#: src/multitrack.c:10586
 msgid "_View/Edit this effect"
 msgstr ""
 
-#: src/multitrack.c:10361
+#: src/multitrack.c:10588
 msgid "_View this effect"
 msgstr ""
 
-#: src/multitrack.c:10369
+#: src/multitrack.c:10596
 msgid "_Delete this effect"
 msgstr ""
 
-#: src/multitrack.c:10422
+#: src/multitrack.c:10648
 msgid "Cannot insert after this effect"
 msgstr ""
 
-#: src/multitrack.c:10451
+#: src/multitrack.c:10677
 msgid "This effect cannot be moved"
 msgstr ""
 
-#: src/multitrack.c:10499
+#: src/multitrack.c:10724
 #, c-format
 msgid "  %d to %d selected  "
 msgstr ""
 
-#: src/multitrack.c:10502 src/multitrack.c:10746
+#: src/multitrack.c:10727 src/multitrack.c:10968
 #, c-format
 msgid "%.2f sec."
 msgstr "%.2f seg."
 
-#: src/multitrack.c:10717
+#: src/multitrack.c:10940
 #, c-format
 msgid "%d frames"
 msgstr ""
 
-#: src/multitrack.c:11070
+#: src/multitrack.c:11299
 msgid ""
 "\n"
 "==============================\n"
 "Switched to Multitrack mode\n"
 msgstr ""
 
-#: src/multitrack.c:12691
+#: src/multitrack.c:12939
 msgid "Drag the time slider to where you"
 msgstr ""
 
-#: src/multitrack.c:12692
+#: src/multitrack.c:12940
 msgid "want to set effect parameters"
 msgstr ""
 
-#: src/multitrack.c:12693
+#: src/multitrack.c:12941
 msgid "Set parameters, then click \"Apply\"\n"
 msgstr ""
 
-#: src/multitrack.c:12694
+#: src/multitrack.c:12942
 msgid ""
 "NODES are points where parameters\n"
 "have been set.\n"
 "Nodes can be deleted."
 msgstr ""
 
-#: src/multitrack.c:12697
+#: src/multitrack.c:12944
 msgid "Effect has no parameters.\n"
 msgstr ""
 
-#: src/multitrack.c:12788
+#: src/multitrack.c:13033
 #, c-format
 msgid "%s output"
 msgstr ""
 
-#: src/multitrack.c:12794 src/multitrack.c:12804
+#: src/multitrack.c:13038 src/multitrack.c:13046
 #, c-format
 msgid "layer %d"
 msgstr ""
 
-#: src/multitrack.c:12796 src/multitrack.c:12806
+#: src/multitrack.c:13039 src/multitrack.c:13047
 msgid "audio track"
 msgstr ""
 
-#: src/multitrack.c:12797
+#: src/multitrack.c:13040
 #, c-format
 msgid "%s to %s"
 msgstr ""
 
-#: src/multitrack.c:12807
+#: src/multitrack.c:13048
 #, c-format
 msgid "%s from %s"
 msgstr ""
 
-#: src/multitrack.c:12860
+#: src/multitrack.c:13099
 msgid "_Prev filter map"
 msgstr ""
 
-#: src/multitrack.c:12871
+#: src/multitrack.c:13110
 msgid "Insert _before"
 msgstr ""
 
-#: src/multitrack.c:12881
+#: src/multitrack.c:13120
 msgid "Insert _after"
 msgstr ""
 
-#: src/multitrack.c:12896
+#: src/multitrack.c:13134
 msgid "_Next filter map"
 msgstr ""
 
-#: src/multitrack.c:12911
+#: src/multitrack.c:13148
 msgid ""
 "\n"
 "\n"
@@ -9094,272 +9100,272 @@
 "current time.\n"
 msgstr ""
 
-#: src/multitrack.c:12929
+#: src/multitrack.c:13166
 msgid ""
 "Drag a compositor anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:12936
+#: src/multitrack.c:13173
 msgid ""
 "Drag a transition anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:12944
+#: src/multitrack.c:13181
 msgid ""
 "Effects can be dragged\n"
 "onto blocks on the timeline."
 msgstr ""
 
-#: src/multitrack.c:13166
+#: src/multitrack.c:13406
 msgid "LiVES: Selected block/frame"
 msgstr ""
 
-#: src/multitrack.c:13173
+#: src/multitrack.c:13413
 msgid "_Select this block"
 msgstr ""
 
-#: src/multitrack.c:13183
+#: src/multitrack.c:13423
 msgid "_Split block here"
 msgstr ""
 
-#: src/multitrack.c:13191
+#: src/multitrack.c:13431
 msgid "List _effects here"
 msgstr ""
 
-#: src/multitrack.c:13200 src/multitrack.c:13277
+#: src/multitrack.c:13440 src/multitrack.c:13518
 #, c-format
 msgid "_Adjust %s"
 msgstr ""
 
-#: src/multitrack.c:13215
+#: src/multitrack.c:13455
 msgid "_Delete this block"
 msgstr ""
 
-#: src/multitrack.c:13258
+#: src/multitrack.c:13500
 msgid "_Insert here"
 msgstr ""
 
-#: src/multitrack.c:13264
+#: src/multitrack.c:13505
 msgid "_Insert audio here"
 msgstr ""
 
-#: src/multitrack.c:14801
+#: src/multitrack.c:15017
 #, c-format
 msgid "Inserted gap in selected tracks from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:14835
+#: src/multitrack.c:15048
 #, c-format
 msgid "Inserted gap in track %s from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15036
+#: src/multitrack.c:15244
 #, c-format
 msgid "Undid %s\n"
 msgstr ""
 
-#: src/multitrack.c:15235
+#: src/multitrack.c:15445
 #, c-format
 msgid "Redid %s\n"
 msgstr ""
 
-#: src/multitrack.c:15268
+#: src/multitrack.c:15475
 msgid ""
 "\n"
 " (variable)"
 msgstr ""
 
-#: src/multitrack.c:15502 src/multitrack.c:15614 src/multitrack.c:18736
-#: src/multitrack.c:18748
+#: src/multitrack.c:15710 src/multitrack.c:15823 src/multitrack.c:19077
+#: src/multitrack.c:19089
 #, c-format
 msgid "track %s"
 msgstr ""
 
-#: src/multitrack.c:15507 src/multitrack.c:15619 src/multitrack.c:18741
+#: src/multitrack.c:15715 src/multitrack.c:15828 src/multitrack.c:19082
 #, c-format
 msgid "tracks %s and %s"
 msgstr ""
 
-#: src/multitrack.c:15513 src/multitrack.c:15625 src/multitrack.c:18751
+#: src/multitrack.c:15721 src/multitrack.c:15834 src/multitrack.c:19091
 msgid "selected tracks"
 msgstr ""
 
-#: src/multitrack.c:15516
+#: src/multitrack.c:15726
 #, c-format
 msgid "Added %s %s to %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15550
+#: src/multitrack.c:15760
 #, c-format
 msgid "Added effect %s to track %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15631
+#: src/multitrack.c:15845
 #, c-format
 msgid "Deleted %s %s from %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15935
+#: src/multitrack.c:16143
 #, c-format
 msgid "rendered %d frames to new clip.\n"
 msgstr ""
 
-#: src/multitrack.c:16025
+#: src/multitrack.c:16230
 msgid "Cleaning up..."
 msgstr "Netejatge..."
 
-#: src/multitrack.c:16712
+#: src/multitrack.c:17003
 msgid "_Pause"
 msgstr "_Pausa"
 
-#: src/multitrack.c:16713
+#: src/multitrack.c:17004
 msgid "Pause (p)"
 msgstr "Pausa (p)"
 
-#: src/multitrack.c:16856
+#: src/multitrack.c:17151
 msgid "Press 'm' during playback"
 msgstr ""
 
-#: src/multitrack.c:16857
+#: src/multitrack.c:17152
 msgid "to make a mark on the timeline"
 msgstr ""
 
-#: src/multitrack.c:17154
+#: src/multitrack.c:17498
 #, c-format
 msgid ""
 "Inserted audio %.4f to %.4f from clip %s into backing audio from time %.4f "
 "to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:17414
+#: src/multitrack.c:17759
 #, c-format
 msgid ""
 "Inserted frames %d to %d from clip %s into track %s from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:17998
+#: src/multitrack.c:18332
 #, c-format
 msgid ""
 "Time region %.3f to %.3f\n"
 "selected.\n"
 msgstr ""
 
-#: src/multitrack.c:18002
+#: src/multitrack.c:18336
 msgid ""
 "select one or more tracks\n"
 "to create a region.\n"
 msgstr ""
 
-#: src/multitrack.c:18004
+#: src/multitrack.c:18337
 #, c-format
 msgid "%d video tracks selected.\n"
 msgstr ""
 
-#: src/multitrack.c:18006
+#: src/multitrack.c:18339
 msgid ""
 "Double click on timeline\n"
 "to deselect time region."
 msgstr ""
 
-#: src/multitrack.c:18013
+#: src/multitrack.c:18346
 msgid ""
 "Single click on an effect\n"
 "to select it."
 msgstr ""
 
-#: src/multitrack.c:18014
+#: src/multitrack.c:18347
 msgid ""
 "Double click on an effect\n"
 "to edit it."
 msgstr ""
 
-#: src/multitrack.c:18015
+#: src/multitrack.c:18348
 msgid ""
 "Right click on an effect\n"
 "for context menu.\n"
 msgstr ""
 
-#: src/multitrack.c:18017
+#: src/multitrack.c:18350
 msgid ""
 "Effect order can be changed at\n"
 "FILTER MAPS"
 msgstr ""
 
-#: src/multitrack.c:18024
+#: src/multitrack.c:18357
 msgid ""
 "You can select an effect,\n"
 "then use the INSERT BEFORE"
 msgstr ""
 
-#: src/multitrack.c:18025
+#: src/multitrack.c:18358
 msgid "or INSERT AFTER buttons to move it."
 msgstr ""
 
-#: src/multitrack.c:18307 src/multitrack.c:18320
+#: src/multitrack.c:18639 src/multitrack.c:18652
 msgid "Click on another effect,"
 msgstr ""
 
-#: src/multitrack.c:18308 src/multitrack.c:18321
+#: src/multitrack.c:18640 src/multitrack.c:18653
 msgid ""
 "and the selected one\n"
 "will be inserted"
 msgstr ""
 
-#: src/multitrack.c:18309
+#: src/multitrack.c:18641
 msgid "after it.\n"
 msgstr ""
 
-#: src/multitrack.c:18322
+#: src/multitrack.c:18654
 msgid "before it.\n"
 msgstr ""
 
-#: src/multitrack.c:18551
+#: src/multitrack.c:18889
 #, c-format
 msgid "Removed parameter values for effect %s at time %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:18759
+#: src/multitrack.c:19100
 #, c-format
 msgid "Set parameter values for %s %s on %s at time %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:19251 src/multitrack.c:20873
+#: src/multitrack.c:19630 src/multitrack.c:21195
 msgid "_Autoreload each time"
 msgstr ""
 
-#: src/multitrack.c:19323
+#: src/multitrack.c:19702
 #, fuzzy
 msgid "Saving layout"
 msgstr "_Salva la disposicion"
 
-#: src/multitrack.c:19345
+#: src/multitrack.c:19725
 #, c-format
 msgid "Saved layout to %s\n"
 msgstr ""
 
-#: src/multitrack.c:20783
+#: src/multitrack.c:21125
 msgid "clips and frames"
 msgstr ""
 
-#: src/multitrack.c:20787
+#: src/multitrack.c:21128
 msgid "clips"
 msgstr ""
 
-#: src/multitrack.c:20790
+#: src/multitrack.c:21130
 msgid "frames"
 msgstr "imatges"
 
-#: src/multitrack.c:20800
+#: src/multitrack.c:21140
 msgid ""
 "\n"
 "Auto reload layout.\n"
 msgstr ""
 
-#: src/multitrack.c:20803
+#: src/multitrack.c:21143
 #, c-format
 msgid ""
 "%s\n"
@@ -9367,100 +9373,100 @@
 "Therefore it could not be loaded properly.\n"
 msgstr ""
 
-#: src/multitrack.c:20920
+#: src/multitrack.c:21284
 msgid "auto backup"
 msgstr ""
 
-#: src/multitrack.c:20923
+#: src/multitrack.c:21287
 #, c-format
 msgid ""
 "\n"
 "Unable to load layout file %s\n"
 msgstr ""
 
-#: src/multitrack.c:20944
+#: src/multitrack.c:21308
 #, c-format
 msgid "Loading layout from %s..."
 msgstr ""
 
-#: src/multitrack.c:20978
+#: src/multitrack.c:21338
 #, c-format
 msgid "Got %d events...processing..."
 msgstr ""
 
-#: src/multitrack.c:20991
+#: src/multitrack.c:21349
 msgid "Checking and rebuilding event list"
 msgstr ""
 
-#: src/multitrack.c:21017
+#: src/multitrack.c:21374
 #, c-format
 msgid "%d errors detected.\n"
 msgstr ""
 
-#: src/multitrack.c:21068
+#: src/multitrack.c:21422
 #, c-format
 msgid "Multitrack fps set to %.3f\n"
 msgstr ""
 
-#: src/multitrack.c:21225
+#: src/multitrack.c:21576
 msgid ""
 "The current layout has changes which have not been saved.\n"
 "Are you sure you wish to wipe it ?\n"
 msgstr ""
 
-#: src/multitrack.c:22047
+#: src/multitrack.c:22385
 msgid "LiVES: Multitrack audio mixer"
 msgstr ""
 
-#: src/multitrack.c:22077
+#: src/multitrack.c:22414
 msgid "_Reset values"
 msgstr ""
 
-#: src/multitrack.c:22081
+#: src/multitrack.c:22418
 msgid "_Close mixer"
 msgstr ""
 
-#: src/multitrack.c:22130
+#: src/multitrack.c:22466
 msgid ""
 "_Invert backing audio\n"
 "and layer volumes"
 msgstr ""
 
-#: src/multitrack.c:22132
+#: src/multitrack.c:22468
 msgid "Adjust backing and layer audio values so that they sum to 1.0"
 msgstr ""
 
-#: src/multitrack.c:22175
+#: src/multitrack.c:22510
 msgid "_Gang layer audio"
 msgstr ""
 
-#: src/multitrack.c:22177
+#: src/multitrack.c:22512
 msgid "Adjust all layer audio values to the same value"
 msgstr ""
 
-#: src/jack.c:104
+#: src/jack.c:102
 msgid "JACK server started\n"
 msgstr ""
 
-#: src/jack.c:1284 src/jack.c:1353
+#: src/jack.c:1265 src/jack.c:1334
 msgid "Unable to connect to JACK server\n"
 msgstr ""
 
-#: src/jack.c:1512
+#: src/jack.c:1491
 msgid "Started jack audio subsystem.\n"
 msgstr ""
 
-#: src/jack.c:1623
+#: src/jack.c:1600
 msgid "Started jack audio reader.\n"
 msgstr ""
 
-#: src/jack.c:1838
+#: src/jack.c:1815
 msgid ""
 "\n"
 "Connection to jack audio was reset.\n"
 msgstr ""
 
-#: src/pulse.c:87
+#: src/pulse.c:88
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -9468,7 +9474,7 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:92
+#: src/pulse.c:94
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -9476,7 +9482,7 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:96
+#: src/pulse.c:99
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -9484,335 +9490,335 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:101
+#: src/pulse.c:104
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
 msgstr ""
 
-#: src/pulse.c:107
+#: src/pulse.c:109
 msgid "LiVES will exit and you can choose another audio player.\n"
 msgstr ""
 
-#: src/pulse.c:1352
+#: src/pulse.c:1335
 msgid ""
 "\n"
 "Connection to pulse audio was reset.\n"
 msgstr ""
 
-#: src/colourspace.c:1100
+#: src/colourspace.c:1092
 msgid "unclamped"
 msgstr ""
 
-#: src/colourspace.c:1101
+#: src/colourspace.c:1093
 msgid "clamped"
 msgstr ""
 
-#: src/omc-learn.c:195
+#: src/omc-learn.c:191
 #, c-format
 msgid "Responding to joystick events from %s\n"
 msgstr ""
 
-#: src/omc-learn.c:289
+#: src/omc-learn.c:279
 msgid "Creating ALSA seq port..."
 msgstr ""
 
-#: src/omc-learn.c:325
+#: src/omc-learn.c:313
 #, c-format
 msgid "Responding to MIDI events from %s\n"
 msgstr ""
 
-#: src/omc-learn.c:568
+#: src/omc-learn.c:554
 msgid "data"
 msgstr "donadas"
 
-#: src/omc-learn.c:571
+#: src/omc-learn.c:557
 msgid "velocity"
 msgstr ""
 
-#: src/omc-learn.c:572
+#: src/omc-learn.c:558
 msgid "note"
 msgstr "nòta"
 
-#: src/omc-learn.c:574 src/omc-learn.c:736 src/omc-learn.c:1105
-#: src/omc-learn.c:1591 src/omc-learn.c:1640
+#: src/omc-learn.c:560 src/omc-learn.c:724 src/omc-learn.c:1092
+#: src/omc-learn.c:1581 src/omc-learn.c:1630
 msgid "value"
 msgstr "valor"
 
-#: src/omc-learn.c:576
+#: src/omc-learn.c:562
 msgid "state"
 msgstr "estat"
 
-#: src/omc-learn.c:688
+#: src/omc-learn.c:674
 msgid "variable"
 msgstr "variabla"
 
-#: src/omc-learn.c:1001
+#: src/omc-learn.c:989
 msgid "Vars."
 msgstr ""
 
-#: src/omc-learn.c:1054
+#: src/omc-learn.c:1041
 #, c-format
 msgid "MIDI ch %d note on"
 msgstr ""
 
-#: src/omc-learn.c:1058
+#: src/omc-learn.c:1045
 #, c-format
 msgid "MIDI ch %d note off"
 msgstr ""
 
-#: src/omc-learn.c:1062
+#: src/omc-learn.c:1049
 #, c-format
 msgid "MIDI ch %d controller %d"
 msgstr ""
 
-#: src/omc-learn.c:1066
+#: src/omc-learn.c:1053
 #, c-format
 msgid "MIDI ch %d pitch bend"
 msgstr ""
 
-#: src/omc-learn.c:1070
+#: src/omc-learn.c:1057
 #, c-format
 msgid "MIDI ch %d pgm change"
 msgstr ""
 
-#: src/omc-learn.c:1073
+#: src/omc-learn.c:1060
 #, c-format
 msgid "Joystick button %d"
 msgstr ""
 
-#: src/omc-learn.c:1076
+#: src/omc-learn.c:1063
 #, c-format
 msgid "Joystick axis %d"
 msgstr ""
 
-#: src/omc-learn.c:1113
+#: src/omc-learn.c:1100
 msgid "x"
 msgstr ""
 
-#: src/omc-learn.c:1122
+#: src/omc-learn.c:1109
 msgid "range"
 msgstr "Airal"
 
-#: src/omc-learn.c:1143
+#: src/omc-learn.c:1130
 msgid "+ offset1"
 msgstr ""
 
-#: src/omc-learn.c:1161
+#: src/omc-learn.c:1150
 msgid "* scale"
 msgstr ""
 
-#: src/omc-learn.c:1179
+#: src/omc-learn.c:1170
 msgid "+ offset2"
 msgstr ""
 
-#: src/omc-learn.c:1280
+#: src/omc-learn.c:1270
 msgid ""
 "\n"
 "Click OK to delete all entries\n"
 msgstr ""
 
-#: src/omc-learn.c:1318
+#: src/omc-learn.c:1308
 msgid "LiVES: OMC learner"
 msgstr ""
 
-#: src/omc-learn.c:1334
+#: src/omc-learn.c:1324
 msgid "Clear _unmatched"
 msgstr ""
 
-#: src/omc-learn.c:1345
+#: src/omc-learn.c:1335
 msgid "_Delete all"
 msgstr "Tot _suprimir"
 
-#: src/omc-learn.c:1411
+#: src/omc-learn.c:1401
 msgid "Start video playback"
 msgstr ""
 
-#: src/omc-learn.c:1414
+#: src/omc-learn.c:1404
 msgid "Stop video playback"
 msgstr ""
 
-#: src/omc-learn.c:1418
+#: src/omc-learn.c:1408
 msgid "Clip select <clipnum>"
 msgstr ""
 
-#: src/omc-learn.c:1419
+#: src/omc-learn.c:1409
 msgid "Switch foreground clip to the nth valid clip"
 msgstr ""
 
-#: src/omc-learn.c:1423
+#: src/omc-learn.c:1413
 msgid "Play forwards"
 msgstr ""
 
-#: src/omc-learn.c:1424
+#: src/omc-learn.c:1414
 msgid "Play video in a forwards direction"
 msgstr ""
 
-#: src/omc-learn.c:1427
+#: src/omc-learn.c:1417
 msgid "Play backwards"
 msgstr ""
 
-#: src/omc-learn.c:1428
+#: src/omc-learn.c:1418
 msgid "Play video in a backwards direction"
 msgstr ""
 
-#: src/omc-learn.c:1431
+#: src/omc-learn.c:1421
 msgid "Reverse playback direction"
 msgstr ""
 
-#: src/omc-learn.c:1432
+#: src/omc-learn.c:1422
 msgid "Reverse direction of video playback"
 msgstr ""
 
-#: src/omc-learn.c:1435
+#: src/omc-learn.c:1425
 msgid "Play video faster"
 msgstr ""
 
-#: src/omc-learn.c:1436
+#: src/omc-learn.c:1426
 msgid "Play video at a slightly faster rate"
 msgstr ""
 
-#: src/omc-learn.c:1439
+#: src/omc-learn.c:1429
 msgid "Play video slower"
 msgstr ""
 
-#: src/omc-learn.c:1440
+#: src/omc-learn.c:1430
 msgid "Play video at a slightly slower rate"
 msgstr ""
 
-#: src/omc-learn.c:1443
+#: src/omc-learn.c:1433
 msgid "Toggle video freeze"
 msgstr ""
 
-#: src/omc-learn.c:1444
+#: src/omc-learn.c:1434
 msgid "Freeze video, or if already frozen, unfreeze it"
 msgstr ""
 
-#: src/omc-learn.c:1447
+#: src/omc-learn.c:1437
 msgid "Set video framerate to <fps>"
 msgstr ""
 
-#: src/omc-learn.c:1448
+#: src/omc-learn.c:1438
 msgid "Set framerate of foreground clip to <float fps>"
 msgstr ""
 
-#: src/omc-learn.c:1452
+#: src/omc-learn.c:1442
 msgid "Start recording"
 msgstr ""
 
-#: src/omc-learn.c:1455
+#: src/omc-learn.c:1445
 msgid "Stop recording"
 msgstr ""
 
-#: src/omc-learn.c:1458
+#: src/omc-learn.c:1448
 msgid "Toggle recording state"
 msgstr ""
 
-#: src/omc-learn.c:1461
+#: src/omc-learn.c:1451
 msgid "Swap foreground and background clips"
 msgstr ""
 
-#: src/omc-learn.c:1463
+#: src/omc-learn.c:1453
 msgid "Reset effect keys"
 msgstr ""
 
-#: src/omc-learn.c:1464
+#: src/omc-learn.c:1454
 msgid "Switch all effects off."
 msgstr ""
 
-#: src/omc-learn.c:1467
+#: src/omc-learn.c:1457
 msgid "Enable effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1471
+#: src/omc-learn.c:1461
 msgid "Disable effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1475
+#: src/omc-learn.c:1465
 msgid "Toggle effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1479
+#: src/omc-learn.c:1469
 msgid "Set parameter value <key> <pnum> = <value>"
 msgstr ""
 
-#: src/omc-learn.c:1480
+#: src/omc-learn.c:1470
 msgid "Set <value> of pth (numerical) parameter for effect key <key>."
 msgstr ""
 
-#: src/omc-learn.c:1484
+#: src/omc-learn.c:1474
 msgid "Switch foreground to next clip"
 msgstr ""
 
-#: src/omc-learn.c:1487
+#: src/omc-learn.c:1477
 msgid "Switch foreground to previous clip"
 msgstr ""
 
-#: src/omc-learn.c:1490
+#: src/omc-learn.c:1480
 msgid "Set video framerate to ratio <fps_ratio>"
 msgstr ""
 
-#: src/omc-learn.c:1491
+#: src/omc-learn.c:1481
 msgid "Set framerate ratio of foreground clip to <float fps_ratio>"
 msgstr ""
 
-#: src/omc-learn.c:1495
+#: src/omc-learn.c:1485
 msgid "Retrigger clip <clipnum>"
 msgstr ""
 
-#: src/omc-learn.c:1496
+#: src/omc-learn.c:1486
 msgid ""
 "Switch foreground clip to the nth valid clip, and reset the frame number"
 msgstr ""
 
-#: src/omc-learn.c:1500
+#: src/omc-learn.c:1490
 msgid "Cycle to next mode for effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1504
+#: src/omc-learn.c:1494
 msgid "Cycle to previous mode for effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1508
+#: src/omc-learn.c:1498
 msgid "Set playback plugin parameter value <pnum> = <value>"
 msgstr ""
 
-#: src/omc-learn.c:1509
+#: src/omc-learn.c:1499
 msgid "Set <value> of pth parameter for the playback plugin."
 msgstr ""
 
 #. TRANSLATORS: short form of "clip number"
-#: src/omc-learn.c:1536 src/omc-learn.c:1607
+#: src/omc-learn.c:1526 src/omc-learn.c:1597
 msgid "clipnum"
 msgstr ""
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1545
+#: src/omc-learn.c:1535
 msgid "fps"
 msgstr "imtg/seg"
 
 #. TRANSLATORS: as in keyboard key
-#: src/omc-learn.c:1553 src/omc-learn.c:1560 src/omc-learn.c:1567
-#: src/omc-learn.c:1575 src/omc-learn.c:1615 src/omc-learn.c:1623
+#: src/omc-learn.c:1543 src/omc-learn.c:1550 src/omc-learn.c:1557
+#: src/omc-learn.c:1565 src/omc-learn.c:1605 src/omc-learn.c:1613
 msgid "key"
 msgstr "clau"
 
 #. TRANSLATORS: short form of "parameter number"
-#: src/omc-learn.c:1583 src/omc-learn.c:1632
+#: src/omc-learn.c:1573 src/omc-learn.c:1622
 msgid "pnum"
 msgstr ""
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1599
+#: src/omc-learn.c:1589
 msgid "fps_ratio"
 msgstr ""
 
-#: src/omc-learn.c:2443
+#: src/omc-learn.c:2417
 #, c-format
 msgid "Saving device mapping to file %s..."
 msgstr ""
 
-#: src/omc-learn.c:2527
+#: src/omc-learn.c:2498
 #, c-format
 msgid ""
 "\n"
@@ -9821,7 +9827,7 @@
 "%s\n"
 msgstr ""
 
-#: src/omc-learn.c:2534
+#: src/omc-learn.c:2505
 #, c-format
 msgid ""
 "\n"
@@ -9830,12 +9836,12 @@
 "%s\n"
 msgstr ""
 
-#: src/omc-learn.c:2571
+#: src/omc-learn.c:2541
 #, c-format
 msgid "Loading device mapping from file %s..."
 msgstr ""
 
-#: src/omc-learn.c:2576
+#: src/omc-learn.c:2544
 #, c-format
 msgid ""
 "\n"
@@ -9845,12 +9851,12 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/videodev.c:547
+#: src/videodev.c:539
 #, c-format
 msgid "Unable to open device %s\n"
 msgstr ""
 
-#: src/videodev.c:564
+#: src/videodev.c:554
 #, c-format
 msgid "Opened device %s\n"
 msgstr ""
@@ -10056,6 +10062,14 @@
 #~ msgstr "Talha de l'enquadrament"
 
 #, fuzzy
+#~ msgid "Frame _in frame position of clipboard..."
+#~ msgstr "Escafament dels imatges %d a %d%s...."
+
+#, fuzzy
+#~ msgid "Frame _in frame position of top frame..."
+#~ msgstr "Escafament dels imatges %d a %d%s...."
+
+#, fuzzy
 #~ msgid "Frame _width"
 #~ msgstr "Talha de l'enquadrament"
 
@@ -10641,9 +10655,16 @@
 #~ msgid "tunnel"
 #~ msgstr "Tunèl"
 
+#, fuzzy
+#~ msgid "LiVES audio error."
+#~ msgstr "LiVES: - Union"
+
 #~ msgid "$error"
 #~ msgstr "$error"
 
+#~ msgid "Pause"
+#~ msgstr "Metre en pausa"
+
 #, fuzzy
 #~ msgid "_Open"
 #~ msgstr "_Dobrir..."

LiVES-2.2.8.tar.bz2/po/pl.po -> LiVES-2.4.1.tar.bz2/po/pl.po Changed

@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n"
-"POT-Creation-Date: 2015-02-08 17:18-0300\n"
+"POT-Creation-Date: 2015-08-09 14:52-0300\n"
 "PO-Revision-Date: 2013-03-14 12:31+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Polish <pl@li.org>\n"
@@ -18,8 +18,7 @@
 "X-Launchpad-Export-Date: 2013-03-28 10:56+0000\n"
 "X-Generator: Launchpad (build 16546)\n"
 
-#. TRANSLATORS: do not translate this message
-#: src/main.c:118
+#: src/main.c:128
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -28,22 +27,22 @@
 "http://lives.sourceforge.net/TRANS-README.txt"
 msgstr ""
 
-#: src/main.c:134
+#: src/main.c:153
 #, c-format
 msgid "%s Warning: %s\n"
 msgstr "%s Ostrzeżenie: %s\n"
 
-#: src/main.c:138
+#: src/main.c:157
 #, c-format
 msgid "%s Critical error: %s\n"
 msgstr "%s Błąd krytyczny: %s\n"
 
-#: src/main.c:139
+#: src/main.c:158
 #, c-format
 msgid "%s Fatal error: %s\n"
 msgstr ""
 
-#: src/main.c:176
+#: src/main.c:198
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -57,7 +56,7 @@
 "group_id=64341&atid=507139\n"
 "Dzięki. Odzyskiwanie powinno być możliwe po uruchomieniu życia.\n"
 
-#: src/main.c:177
+#: src/main.c:199
 msgid ""
 "\n"
 "\n"
@@ -69,7 +68,7 @@
 "Przy zgłaszaniu awarii, należy podać szczegółowe informacje na temat systemu "
 "operacyjnego, dystrybucję i wersję LiVES ("
 
-#: src/main.c:180
+#: src/main.c:203
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -77,7 +76,7 @@
 "oraz wszelkie informacje poniżej:\n"
 "\n"
 
-#: src/main.c:184
+#: src/main.c:206
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
@@ -87,84 +86,84 @@
 "więcej informacji.\n"
 "\n"
 
-#: src/main.c:192
+#: src/main.c:216
 msgid "Preserving set.\n"
 msgstr ""
 
-#: src/main.c:636
+#: src/main.c:691
 msgid "Resizing"
 msgstr "Skalowanie"
 
-#: src/main.c:643
+#: src/main.c:698
 msgid "_Resize All Frames"
 msgstr "_Skaluj Wszystkie Klatki"
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:895
+#: src/main.c:948
 msgid "Any"
 msgstr "Dowolny"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:897
+#: src/main.c:950
 msgid "None"
 msgstr "Brak"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:899
+#: src/main.c:952
 msgid "recommended"
 msgstr "zalecane"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:901
+#: src/main.c:954
 msgid "disabled !"
 msgstr "niepełnosprawnych !"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:903
+#: src/main.c:956
 msgid "**The current layout**"
 msgstr "**Obecny układ**"
 
 #. TRANSLATORS: adjective for "Built in" type effects
-#: src/main.c:905
+#: src/main.c:958
 msgid "Builtin"
 msgstr "Wbudowane"
 
 #. TRANSLATORS: adjective for "Custom" type effects
-#: src/main.c:907
+#: src/main.c:960
 msgid "Custom"
 msgstr "Własne"
 
 #. TRANSLATORS: adjective for "Test" type effects
-#: src/main.c:909
+#: src/main.c:962
 msgid "Test"
 msgstr "Przetestuj"
 
-#: src/main.c:1054
+#: src/main.c:1107
 msgid "Foreground"
 msgstr ""
 
-#: src/main.c:1055
+#: src/main.c:1108
 #, fuzzy
 msgid "Background"
 msgstr "_Uruchom"
 
-#: src/main.c:1566
+#: src/main.c:1624
 msgid "Loading realtime effect plugins..."
 msgstr ""
 
-#: src/main.c:1631
+#: src/main.c:1690
 msgid "Starting jack audio server..."
 msgstr ""
 
-#: src/main.c:1633
+#: src/main.c:1692
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1634
+#: src/main.c:1693
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1663
+#: src/main.c:1723
 #, c-format
 msgid ""
 "\n"
@@ -176,114 +175,114 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1697
+#: src/main.c:1758
 msgid "Starting pulse audio server..."
 msgstr "Uruchamianie serwera pulse audio"
 
-#: src/main.c:1765
+#: src/main.c:1825
 msgid "Checking optional dependencies:"
 msgstr "Sprawdzanie zależności opcjonalne:"
 
-#: src/main.c:1766
+#: src/main.c:1826
 msgid "mplayer...detected..."
 msgstr "mplayer...  wykryto..."
 
-#: src/main.c:1767
+#: src/main.c:1827
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...NIE WYKRYTO..."
 
-#: src/main.c:1768
+#: src/main.c:1828
 #, fuzzy
 msgid "mplayer2...detected..."
 msgstr "mplayer...  wykryto..."
 
-#: src/main.c:1769
+#: src/main.c:1829
 #, fuzzy
 msgid "mplayer2...NOT DETECTED..."
 msgstr "mplayer...NIE WYKRYTO..."
 
-#: src/main.c:1770
+#: src/main.c:1830
 msgid "convert...detected..."
 msgstr "convert...wykrytych..."
 
-#: src/main.c:1771
+#: src/main.c:1831
 msgid "convert...NOT DETECTED..."
 msgstr "convert...NIE WYKRYTO..."
 
-#: src/main.c:1772
+#: src/main.c:1832
 msgid "composite...detected..."
 msgstr "composite...wykrytych..."
 
-#: src/main.c:1773
+#: src/main.c:1833
 msgid "composite...NOT DETECTED..."
 msgstr "composite...NIE WYKRYTO..."
 
-#: src/main.c:1774
+#: src/main.c:1834
 msgid "sox...detected\n"
 msgstr "sox...wykrytych\n"
 
-#: src/main.c:1775
+#: src/main.c:1835
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...NIE WYKRYTO\n"
 
-#: src/main.c:1776
+#: src/main.c:1836
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...wykrytych..."
 
-#: src/main.c:1777
+#: src/main.c:1837
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...NIE WYKRYTO..."
 
-#: src/main.c:1778
+#: src/main.c:1838
 msgid "jackd...detected..."
 msgstr "jackd...wykrytych..."
 
-#: src/main.c:1779
+#: src/main.c:1839
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...NIE WYKRYTO..."
 
-#: src/main.c:1780
+#: src/main.c:1840
 msgid "pulse audio...detected..."
 msgstr "pulse audio...wykrytych..."
 
-#: src/main.c:1781
+#: src/main.c:1841
 msgid "pulse audio...NOT DETECTED..."
 msgstr "pulse audio...NIE WYKRYTO..."
 
-#: src/main.c:1782
+#: src/main.c:1842
 msgid "python...detected..."
 msgstr "python...wykrytych..."
 
-#: src/main.c:1783
+#: src/main.c:1843
 msgid "python...NOT DETECTED..."
 msgstr "python...NIE WYKRYTO..."
 
-#: src/main.c:1784
+#: src/main.c:1844
 msgid "dvgrab...detected..."
 msgstr "dvgrab...wykrytych..."
 
-#: src/main.c:1785
+#: src/main.c:1845
 msgid "dvgrab...NOT DETECTED..."
 msgstr "dvgrab...NIE WYKRYTO..."
 
-#: src/main.c:1786
+#: src/main.c:1846
 msgid "xwininfo...detected..."
 msgstr "xwininfo...wykrytych..."
 
-#: src/main.c:1787
+#: src/main.c:1847
 msgid "xwininfo...NOT DETECTED..."
 msgstr "xwininfo...NIE WYKRYTO..."
 
-#: src/main.c:1793
+#: src/main.c:1853
 #, c-format
 msgid "Windows version %04X"
 msgstr ""
 
-#: src/main.c:1795
+#: src/main.c:1855
 msgid "UNKNOWN - please patch me !"
 msgstr ""
 
-#: src/main.c:1799
+#: src/main.c:1859
 #, c-format
 msgid ""
 "\n"
@@ -294,63 +293,63 @@
 "\n"
 "Sprawozdania Menedżer okien jako \"%s\"; "
 
-#: src/main.c:1802
+#: src/main.c:1862
 #, c-format
 msgid "number of monitors detected: %d\n"
 msgstr "liczba wykrytych monitorów: %d\n"
 
-#: src/main.c:1805
+#: src/main.c:1865
 #, c-format
 msgid "Number of CPUs detected: %d "
 msgstr ""
 
-#: src/main.c:1808 src/multitrack.c:4902
+#: src/main.c:1868 src/multitrack.c:5068
 msgid "little endian"
 msgstr ""
 
-#: src/main.c:1809 src/multitrack.c:4901
+#: src/main.c:1869 src/multitrack.c:5067
 msgid "big endian"
 msgstr ""
 
-#: src/main.c:1810
+#: src/main.c:1870
 #, c-format
 msgid "(%d bits, %s)\n"
 msgstr ""
 
-#: src/main.c:1814
+#: src/main.c:1874
 msgid "GUI type is: "
 msgstr ""
 
-#: src/main.c:1818
+#: src/main.c:1878
 #, c-format
 msgid "GTK+ version %d.%d.%d (compiled with %d.%d.%d)"
 msgstr ""
 
-#: src/main.c:1840
+#: src/main.c:1900
 msgid ", with cairo support"
 msgstr ""
 
-#: src/main.c:1847
+#: src/main.c:1907
 #, c-format
 msgid "Temp directory is %s\n"
 msgstr "Katalog tymczasowy jest %s\n"
 
-#: src/main.c:1851
+#: src/main.c:1911
 msgid ""
 "WARNING - this version of LiVES was compiled without either\n"
 "jack or pulse audio support.\n"
 "Many audio features will be unavailable.\n"
 msgstr ""
 
-#: src/main.c:1854
+#: src/main.c:1914
 msgid "Compiled with jack support, good !\n"
 msgstr "Skompilowane z obsługą jack, dobre !\n"
 
-#: src/main.c:1857
+#: src/main.c:1917
 msgid "Compiled with pulse audio support, wonderful !\n"
 msgstr ""
 
-#: src/main.c:1861
+#: src/main.c:1921
 #, c-format
 msgid ""
 "Welcome to LiVES version %s.\n"
@@ -359,136 +358,141 @@
 "Zapraszamy do LiVES wersja %s.\n"
 "\n"
 
-#: src/main.c:2306
+#: src/main.c:2380
 #, c-format
 msgid ""
 "\n"
 "Startup syntax is: %s [opts] [filename [start_time] [frames]]\n"
 msgstr ""
 
-#: src/main.c:2307
+#: src/main.c:2381
 msgid "Where: filename is the name of a media file or backup file.\n"
 msgstr ""
 
-#: src/main.c:2308
+#: src/main.c:2382
 msgid "start_time : filename start time in seconds\n"
 msgstr ""
 
-#: src/main.c:2309
+#: src/main.c:2383
 msgid "frames : maximum number of frames to open\n"
 msgstr "frames : maksymalna liczba klatek, aby otworzyć\n"
 
-#: src/main.c:2311
+#: src/main.c:2385
 msgid "opts can be:\n"
 msgstr "opts może to być:\n"
 
-#: src/main.c:2312
+#: src/main.c:2386
 msgid "-help            : show this help text and exit\n"
 msgstr "-help : pokaż ten tekst pomocy i wyjścia\n"
 
-#: src/main.c:2313
+#: src/main.c:2387
 msgid "-tmpdir <tempdir>: use alternate working directory (e.g /var/ramdisk)\n"
 msgstr ""
 
-#: src/main.c:2314
+#: src/main.c:2388
 msgid "-set <setname>   : autoload clip set setname\n"
 msgstr ""
 
-#: src/main.c:2315
+#: src/main.c:2389
 msgid "-noset           : do not load any set on startup\n"
 msgstr "-noset : nie ładuje żadnych ustawić na starcie\n"
 
-#: src/main.c:2316
+#: src/main.c:2390
 msgid "-norecover       : force no-loading of crash recovery\n"
 msgstr ""
 
-#: src/main.c:2317
+#: src/main.c:2391
 msgid "-recover         : force loading of crash recovery\n"
 msgstr ""
 
-#: src/main.c:2318
-msgid "-nothreaddialog  : doe nothing - retained for backwards compatibility\n"
+#: src/main.c:2392
+msgid ""
+"-nothreaddialog  : does nothing - retained for backwards compatibility\n"
 msgstr ""
 
-#: src/main.c:2319
+#: src/main.c:2393
 msgid "-nogui           : do not show the gui\n"
 msgstr "-nogui : nie wykazują gui\n"
 
-#: src/main.c:2320
+#: src/main.c:2394
 msgid "-nosplash        : do not show the splash window\n"
 msgstr ""
 
-#: src/main.c:2321
+#: src/main.c:2395
 msgid "-noplaywin       : do not show the play window\n"
 msgstr ""
 
-#: src/main.c:2322
+#: src/main.c:2396
+msgid "-noninteractive  : disable menu interactivity\n"
+msgstr ""
+
+#: src/main.c:2397
 msgid "-startup-ce      : start in clip editor mode\n"
 msgstr "-startup-ce : uruchamia się w trybie edytor wideo\n"
 
-#: src/main.c:2323
+#: src/main.c:2398
 msgid "-startup-mt      : start in multitrack mode\n"
 msgstr ""
 
-#: src/main.c:2324
+#: src/main.c:2399
 msgid ""
 "-fxmodesmax <n>  : allow <n> modes per effect key (minimum is 1, default is "
 "8)\n"
 msgstr ""
 
-#: src/main.c:2326
+#: src/main.c:2401
 msgid "-oscstart <port> : start OSC listener on UDP port <port>\n"
 msgstr ""
 
-#: src/main.c:2327
+#: src/main.c:2402
 msgid "-nooscstart      : do not start OSC listener\n"
 msgstr ""
 
-#: src/main.c:2329
+#: src/main.c:2404
 msgid ""
 "-aplayer <ap>    : start with selected audio player. <ap> can be mplayer, "
 "mplayer2"
 msgstr ""
 
 #. TRANSLATORS: pulse (audio)
-#: src/main.c:2332
+#: src/main.c:2407
 msgid ", pulse"
 msgstr ", pulse"
 
-#: src/main.c:2335
+#: src/main.c:2410
 msgid ", sox or jack\n"
 msgstr ""
 
-#: src/main.c:2336
+#: src/main.c:2412
 msgid ""
 "-jackopts <opts>    : opts is a bitmap of jack startup options [1 = jack "
 "transport client, 2 = jack transport master, 4 = start jack transport "
 "server, 8 = pause audio when video paused, 16 = start jack audio server] \n"
 msgstr ""
 
-#: src/main.c:2338
+#: src/main.c:2414
 msgid " or sox\n"
 msgstr ""
 
-#: src/main.c:2340
+#: src/main.c:2416
 msgid "-devicemap <mapname>          : autoload devicemap\n"
 msgstr ""
 
-#: src/main.c:2341
+#: src/main.c:2418
 msgid ""
 "-vppdefaults <file>          : load video playback plugin defaults from "
 "<file> (Note: only sets the settings, not the plugin type)\n"
 msgstr ""
 
-#: src/main.c:2342
+#: src/main.c:2419
 msgid "-debug            : try to debug crashes (requires 'gdb' installed)\n"
 msgstr ""
 
-#: src/main.c:2373 src/gui.c:1128
+#: src/main.c:2449 src/gui.c:1127
 msgid "Starting GUI..."
 msgstr ""
 
-#: src/main.c:2396
+#: src/main.c:2475
 #, c-format
 msgid ""
 "\n"
@@ -499,7 +503,7 @@
 "(Maybe you need to change the value of <prefix_dir> in your %s file)\n"
 msgstr ""
 
-#: src/main.c:2410
+#: src/main.c:2492
 #, c-format
 msgid ""
 "\n"
@@ -507,7 +511,7 @@
 "Please make sure you have write access to %s and try again.\n"
 msgstr ""
 
-#: src/main.c:2415
+#: src/main.c:2498
 msgid ""
 "\n"
 "`smogrify` must be in your path, and be executable\n"
@@ -516,7 +520,7 @@
 "before running LiVES.\n"
 msgstr ""
 
-#: src/main.c:2421
+#: src/main.c:2504
 #, c-format
 msgid ""
 "\n"
@@ -526,7 +530,7 @@
 "Please check the file permissions for this file and try again.\n"
 msgstr ""
 
-#: src/main.c:2428
+#: src/main.c:2512
 #, c-format
 msgid ""
 "\n"
@@ -537,7 +541,7 @@
 "and try again.\n"
 msgstr ""
 
-#: src/main.c:2438
+#: src/main.c:2522
 #, c-format
 msgid ""
 "Please check the <tempdir> setting in \n"
@@ -545,7 +549,7 @@
 "and try again.\n"
 msgstr ""
 
-#: src/main.c:2445
+#: src/main.c:2528
 #, c-format
 msgid ""
 "\n"
@@ -555,7 +559,7 @@
 "%s"
 msgstr ""
 
-#: src/main.c:2453
+#: src/main.c:2536
 msgid ""
 "\n"
 "An incorrect version of smogrify was found in your path.\n"
@@ -566,49 +570,49 @@
 "Thankyou.\n"
 msgstr ""
 
-#: src/main.c:2458
+#: src/main.c:2541
 msgid ""
 "\n"
 "LiVES currently requires 'mplayer', 'mplayer2' or 'sox' to function. Please "
 "install one or other of these, and try again.\n"
 msgstr ""
 
-#: src/main.c:2462
+#: src/main.c:2546
 msgid ""
 "\n"
 "LiVES currently requires both 'mplayer' or 'mplayer2' and 'sox' to function. "
 "Please install these, and try again.\n"
 msgstr ""
 
-#: src/main.c:2472
+#: src/main.c:2556
 msgid ""
 "\n"
 "LiVES was unable to locate 'mplayer' or 'mplayer2'. You may wish to install "
 "either one to use LiVES more fully.\n"
 msgstr ""
 
-#: src/main.c:2475
+#: src/main.c:2561
 msgid ""
 "\n"
 "LiVES was unable to locate 'convert'. You should install convert and image-"
 "magick if you want to use rendered effects.\n"
 msgstr ""
 
-#: src/main.c:2478
+#: src/main.c:2566
 msgid ""
 "\n"
 "LiVES was unable to locate 'composite'. You should install composite and "
 "image-magick if you want to use the merge function.\n"
 msgstr ""
 
-#: src/main.c:2481
+#: src/main.c:2570
 msgid ""
 "\n"
 "LiVES was unable to locate 'sox'. Some audio features may not work. You "
 "should install 'sox'.\n"
 msgstr ""
 
-#: src/main.c:2484
+#: src/main.c:2575
 #, c-format
 msgid ""
 "\n"
@@ -619,93 +623,93 @@
 "You may need to change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/main.c:2611
+#: src/main.c:2707
 #, c-format
 msgid "Autoloading set %s..."
 msgstr ""
 
 #. TRANSLATORS: localised name may be used here
-#: src/main.c:2781 src/interface.c:738
+#: src/main.c:2902
 msgid "LiVES"
 msgstr ""
 
-#: src/main.c:2948
+#: src/main.c:3066
 #, c-format
 msgid "Invalid audio player %s\n"
 msgstr ""
 
-#: src/main.c:3077
+#: src/main.c:3214
 #, c-format
 msgid "LiVES-%s: <Untitled%d> %dx%d : %d frames %d bpp %.3f fps"
 msgstr ""
 
-#: src/main.c:3082
+#: src/main.c:3219
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : ??? frames ??? bpp %.3f fps"
 msgstr ""
 
-#: src/main.c:3086
+#: src/main.c:3222
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : %d frames %d bpp %.3f fps"
 msgstr ""
 
-#: src/main.c:3094
+#: src/main.c:3229
 #, c-format
 msgid "LiVES-%s: <No File>"
 msgstr ""
 
 #. TRANSLATORS: rec(ord)
-#: src/main.c:5085
+#: src/main.c:5201
 #, c-format
 msgid "rec %9d/%d"
 msgstr ""
 
 #. TRANSLATORS: out of memory (rec(ord))
-#: src/main.c:5091
+#: src/main.c:5206
 #, c-format
 msgid "!rec %9d/%d"
 msgstr ""
 
-#: src/main.c:5398 src/main.c:5399 src/gui.c:2110 src/gui.c:3220
-#: src/saveplay.c:2336
+#: src/main.c:5500 src/main.c:5501 src/gui.c:2108 src/gui.c:3331
+#: src/saveplay.c:2315
 msgid "Play"
 msgstr "Odtwarzaj"
 
-#: src/main.c:6128
+#: src/main.c:6216
 msgid ""
 "LiVES was unable to capture this image\n"
 "\n"
 msgstr ""
 
-#: src/main.c:6250
+#: src/main.c:6345
 #, c-format
 msgid "Closed file %s\n"
 msgstr ""
 
-#: src/main.c:6452 src/gui.c:648 src/utils.c:4312 src/utils.c:4344
-#: src/saveplay.c:3550 src/multitrack.c:4510 src/multitrack.c:6268
+#: src/main.c:6542 src/gui.c:647 src/utils.c:4256 src/utils.c:4286
+#: src/saveplay.c:3500 src/multitrack.c:4678 src/multitrack.c:6447
 msgid "_Undo"
 msgstr "_Cofnij"
 
-#: src/main.c:6453 src/gui.c:666 src/utils.c:4313 src/utils.c:4345
-#: src/saveplay.c:3551 src/multitrack.c:4531 src/multitrack.c:6293
+#: src/main.c:6543 src/gui.c:665 src/utils.c:4257 src/utils.c:4287
+#: src/saveplay.c:3501 src/multitrack.c:4698 src/multitrack.c:6472
 msgid "_Redo"
 msgstr "_Powtórz"
 
-#: src/main.c:6493 src/interface.c:470 src/gui.c:2326 src/preferences.c:2357
-#: src/resample.c:1516
+#: src/main.c:6583 src/interface.c:457 src/gui.c:2324 src/preferences.c:2391
+#: src/resample.c:1488
 msgid "Video"
 msgstr "Wideo"
 
-#: src/main.c:6494 src/interface.c:483 src/gui.c:2351
+#: src/main.c:6584 src/interface.c:470 src/gui.c:2348
 msgid "Left Audio"
 msgstr ""
 
-#: src/main.c:6495 src/gui.c:2375
+#: src/main.c:6585 src/gui.c:2371
 msgid "Right Audio"
 msgstr ""
 
-#: src/main.c:6540
+#: src/main.c:6630
 msgid ""
 "\n"
 "\n"
@@ -714,11 +718,11 @@
 "Please adjust the playback options in Preferences and try again.\n"
 msgstr ""
 
-#: src/main.c:7051 src/plugins.c:1502
+#: src/main.c:7134 src/plugins.c:1468
 msgid "LiVES: - Play Window"
 msgstr ""
 
-#: src/startup.c:25
+#: src/startup.c:24
 #, c-format
 msgid ""
 "A directory named\n"
@@ -728,7 +732,7 @@
 "(Free space = %s)\n"
 msgstr ""
 
-#: src/startup.c:32
+#: src/startup.c:29
 #, c-format
 msgid ""
 "A directory named\n"
@@ -738,7 +742,7 @@
 "Please select another location.\n"
 msgstr ""
 
-#: src/startup.c:49
+#: src/startup.c:46
 #, c-format
 msgid ""
 "\n"
@@ -749,7 +753,7 @@
 "(Free space = %s)"
 msgstr ""
 
-#: src/startup.c:54
+#: src/startup.c:50
 #, c-format
 msgid ""
 "\n"
@@ -758,54 +762,54 @@
 "Please try again and choose a different location.\n"
 msgstr ""
 
-#: src/startup.c:96
+#: src/startup.c:92
 msgid "Directory name is too long !"
 msgstr ""
 
-#: src/startup.c:223
+#: src/startup.c:216
 msgid ""
 "LiVES FAILED TO START YOUR SELECTED AUDIO PLAYER !\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:230
+#: src/startup.c:222
 msgid ""
 "Before starting LiVES, you need to choose an audio player.\n"
 "\n"
 "PULSE AUDIO is recommended for most users"
 msgstr ""
 
-#: src/startup.c:233
+#: src/startup.c:225
 msgid ""
 ", but this version of LiVES was not compiled with pulse audio support.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:236
+#: src/startup.c:229
 msgid ""
 ", but you do not have pulse audio installed on your system.\n"
 " You are advised to install pulse audio first before running LiVES.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:241
+#: src/startup.c:233
 msgid "JACK audio is recommended for pro users"
 msgstr ""
 
-#: src/startup.c:244
+#: src/startup.c:236
 msgid ""
 ", but this version of LiVES was not compiled with jack audio support.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:247
+#: src/startup.c:239
 msgid ""
 ", but you do not have jackd installed. You may wish to install jackd first "
 "before running LiVES.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:250
+#: src/startup.c:242
 msgid ""
 ", but may prevent LiVES from starting on some systems.\n"
 "If LiVES will not start with jack, you can restart and try with another "
@@ -813,11 +817,11 @@
 "\n"
 msgstr ""
 
-#: src/startup.c:254
+#: src/startup.c:246
 msgid "SOX may be used if neither of the preceding players work, "
 msgstr ""
 
-#: src/startup.c:257
+#: src/startup.c:249
 msgid ""
 "but some audio features will be disabled.\n"
 "\n"
@@ -825,150 +829,150 @@
 "ale niektóre funkcje audio zostaną wyłączone.\n"
 "\n"
 
-#: src/startup.c:260
+#: src/startup.c:251
 msgid ""
 "but you do not have sox installed.\n"
 "You are advised to install it before running LiVES.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:264
+#: src/startup.c:255
 msgid ""
 "The MPLAYER/MPLAYER2 audio player is only recommended for testing purposes.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:281
+#: src/startup.c:271
 msgid "LiVES: - Choose an audio player"
 msgstr "LiVES: - Wybierz odtwarzacz audio"
 
-#: src/startup.c:298
+#: src/startup.c:288
 msgid "Use _pulse audio player"
 msgstr ""
 
-#: src/startup.c:320
+#: src/startup.c:310
 msgid "Use _jack audio player"
 msgstr "Użyj _jack odtwarzacz audio"
 
-#: src/startup.c:340
+#: src/startup.c:330
 msgid "Use _sox audio player"
 msgstr "Użyj _sox odtwarzacz audio"
 
-#: src/startup.c:361
+#: src/startup.c:351
 msgid "Use _mplayer audio player"
 msgstr "Użyj _mplayer odtwarzacz audio"
 
-#: src/startup.c:381
+#: src/startup.c:371
 #, fuzzy
 msgid "Use _mplayer2 audio player"
 msgstr "Użyj _mplayer odtwarzacz audio"
 
-#: src/startup.c:405 src/startup.c:580 src/interface.c:1506
+#: src/startup.c:395 src/startup.c:569 src/interface.c:1398
 msgid "_Next"
 msgstr ""
 
-#: src/startup.c:445
+#: src/startup.c:435
 msgid "Skipped"
 msgstr "Pominięty"
 
-#: src/startup.c:460
+#: src/startup.c:450
 msgid "Passed"
 msgstr "Zaliczony"
 
-#: src/startup.c:493
+#: src/startup.c:483
 msgid "Failed"
 msgstr "Nieudany"
 
-#: src/startup.c:552
+#: src/startup.c:542
 msgid "LiVES: - Testing Configuration"
 msgstr "LiVES: - Testowanie konfiguracji"
 
-#: src/startup.c:555
+#: src/startup.c:544
 msgid "LiVES: - Troubleshoot"
 msgstr "LiVES: - Rozwiązywanie problemów"
 
-#: src/startup.c:568
+#: src/startup.c:557
 msgid "LiVES will now run some basic configuration tests\n"
 msgstr "LiVES wykona teraz podstawowe testy konfiguracji\n"
 
-#: src/startup.c:603
+#: src/startup.c:591
 msgid "Checking for \"sox\" presence"
 msgstr ""
 
-#: src/startup.c:607
+#: src/startup.c:595
 msgid ""
 "You should install sox to be able to use all the audio features in LiVES"
 msgstr ""
 
-#: src/startup.c:615
+#: src/startup.c:602
 msgid "Checking if sox can convert audio"
 msgstr ""
 
-#: src/startup.c:638
+#: src/startup.c:625
 msgid "Unable to allocate 176400 bytes memory."
 msgstr ""
 
-#: src/startup.c:653
+#: src/startup.c:639
 #, c-format
 msgid "Unable to write to: %s"
 msgstr ""
 
-#: src/startup.c:667 src/startup.c:807
+#: src/startup.c:653 src/startup.c:789
 #, c-format
 msgid "Command failed: %s"
 msgstr ""
 
-#: src/startup.c:689
+#: src/startup.c:675
 msgid "You should install sox_fmt_all or similar"
 msgstr ""
 
-#: src/startup.c:717
+#: src/startup.c:703
 msgid "Checking for \"mplayer\" presence"
 msgstr ""
 
-#: src/startup.c:721
+#: src/startup.c:707
 msgid ""
 "You should install mplayer or mplayer2 to be able to use all the decoding "
 "features in LiVES"
 msgstr ""
 
-#: src/startup.c:747
+#: src/startup.c:732
 msgid "Checking if mplayer can convert audio"
 msgstr ""
 
-#: src/startup.c:768
+#: src/startup.c:751
 msgid "You should install mplayer or mplayer2 with pcm/wav support"
 msgstr ""
 
-#: src/startup.c:785
+#: src/startup.c:767
 msgid "Checking if mplayer can decode to png/alpha"
 msgstr ""
 
-#: src/startup.c:828
+#: src/startup.c:810
 msgid "You may wish to upgrade mplayer to a newer version"
 msgstr ""
 
-#: src/startup.c:854
+#: src/startup.c:836
 msgid "Checking if mplayer can decode to jpeg"
 msgstr ""
 
-#: src/startup.c:882
+#: src/startup.c:862
 msgid "You should install mplayer with either png/alpha or jpeg support"
 msgstr ""
 
-#: src/startup.c:883
+#: src/startup.c:863
 msgid "You may wish to add jpeg output support to mplayer"
 msgstr ""
 
-#: src/startup.c:892
+#: src/startup.c:872
 msgid "Checking for \"convert\" presence"
 msgstr ""
 
-#: src/startup.c:896
+#: src/startup.c:876
 msgid "Install imageMagick to be able to use all of the rendered effects"
 msgstr ""
 
-#: src/startup.c:909
+#: src/startup.c:889
 msgid ""
 "\n"
 "\n"
@@ -976,7 +980,7 @@
 "Preferences/Decoding.    \n"
 msgstr ""
 
-#: src/startup.c:915
+#: src/startup.c:894
 msgid ""
 "\n"
 "\n"
@@ -984,7 +988,7 @@
 "continue    \n"
 msgstr ""
 
-#: src/startup.c:949
+#: src/startup.c:928
 msgid ""
 "\n"
 "\n"
@@ -995,7 +999,7 @@
 "Na koniec możesz wybrać, który interfejs będzie domyślnie ustawiany po "
 "uruchomieniu programu LiVES.\n"
 
-#: src/startup.c:950
+#: src/startup.c:929
 msgid ""
 "\n"
 "\n"
@@ -1006,7 +1010,7 @@
 "LiVES ma dwa główne interfejsy, więc możesz wybrać, który z nich będzie "
 "ustawiany po uruchomieniu.\n"
 
-#: src/startup.c:951
+#: src/startup.c:930
 msgid ""
 "\n"
 "\n"
@@ -1016,28 +1020,28 @@
 "\n"
 "Domyślne ustawienie można później zmieniać w oknie Preferencje.\n"
 
-#: src/startup.c:961
+#: src/startup.c:940
 msgid "LiVES: - Choose the startup interface"
 msgstr ""
 
-#: src/startup.c:972
+#: src/startup.c:951
 msgid "Start in _Clip Edit mode"
 msgstr ""
 
-#: src/startup.c:975
+#: src/startup.c:954
 msgid "This is the best choice for simple editing tasks and for VJs\n"
 msgstr ""
 
-#: src/startup.c:981
+#: src/startup.c:960
 msgid "Start in _Multitrack mode"
 msgstr ""
 
-#: src/startup.c:983
+#: src/startup.c:962
 msgid ""
 "This is a better choice for complex editing tasks involving multiple clips.\n"
 msgstr ""
 
-#: src/startup.c:992
+#: src/startup.c:971
 msgid "_Finish"
 msgstr ""
 
@@ -1054,35 +1058,35 @@
 msgid "Apply _Deinterlace"
 msgstr ""
 
-#: src/interface.c:66
+#: src/interface.c:65
 msgid "If this is set, frames will be deinterlaced as they are imported."
 msgstr ""
 
-#: src/interface.c:113 src/callbacks.c:9623 src/callbacks.c:9646
-#: src/callbacks.c:9647 src/gui.c:3223 src/gui.c:3821 src/saveplay.c:2339
-#: src/saveplay.c:3138 src/dialogs.c:1514 src/dialogs.c:1515
-#: src/dialogs.c:1746 src/dialogs.c:1747 src/framedraw.c:238
-#: src/multitrack.c:8031
+#: src/interface.c:106 src/callbacks.c:9542 src/callbacks.c:9564
+#: src/callbacks.c:9565 src/gui.c:3333 src/gui.c:3946 src/saveplay.c:2317
+#: src/saveplay.c:3097 src/dialogs.c:1575 src/dialogs.c:1576
+#: src/dialogs.c:1804 src/dialogs.c:1805 src/framedraw.c:236
+#: src/multitrack.c:8210
 msgid "Preview"
 msgstr "Podgląd"
 
-#: src/interface.c:132
+#: src/interface.c:125
 msgid "Click here to _Preview any selected video, image or audio file"
 msgstr ""
 
-#: src/interface.c:135
+#: src/interface.c:127
 msgid "Click here to _Preview any selected audio file"
 msgstr ""
 
-#: src/interface.c:138
+#: src/interface.c:129
 msgid "Click here to _Preview the video"
 msgstr ""
 
-#: src/interface.c:181 src/dialogs.c:2542
+#: src/interface.c:169 src/dialogs.c:2621
 msgid "LiVES: - Processing..."
 msgstr ""
 
-#: src/interface.c:217
+#: src/interface.c:205
 msgid ""
 "\n"
 "\n"
@@ -1091,8 +1095,8 @@
 "Remember to switch off effects (ctrl-0) afterwards !"
 msgstr ""
 
-#: src/interface.c:222 src/callbacks.c:9373 src/callbacks.c:9420
-#: src/dialogs.c:2570
+#: src/interface.c:210 src/callbacks.c:9283 src/callbacks.c:9332
+#: src/dialogs.c:2649
 msgid ""
 "\n"
 "Please Wait"
@@ -1100,188 +1104,178 @@
 "\n"
 "Proszę czekać"
 
-#: src/interface.c:242
+#: src/interface.c:230
 msgid "Show Details"
 msgstr ""
 
-#: src/interface.c:254 src/dialogs.c:2584
+#: src/interface.c:242 src/dialogs.c:2663
 msgid "_Enough"
 msgstr "_Dość"
 
-#: src/interface.c:255 src/framedraw.c:278
+#: src/interface.c:243 src/framedraw.c:276
 msgid "_Preview"
 msgstr "_Podgląd"
 
-#: src/interface.c:257
+#: src/interface.c:245 src/callbacks.c:9282 src/callbacks.c:9330
 msgid "Paus_e"
 msgstr ""
 
-#: src/interface.c:258 src/callbacks.c:9417
+#: src/interface.c:246 src/callbacks.c:9329
 msgid "Pause/_Enough"
 msgstr ""
 
-#: src/interface.c:285
+#: src/interface.c:273
 msgid "_Cancel"
 msgstr "_Anuluj"
 
-#: src/interface.c:374
+#: src/interface.c:361
 #, c-format
 msgid "LiVES: - %s"
 msgstr ""
 
-#: src/interface.c:376
+#: src/interface.c:363
 msgid "LiVES: - Multitrack details"
 msgstr ""
 
-#: src/interface.c:407
+#: src/interface.c:394
 msgid "Format"
 msgstr "Format"
 
-#: src/interface.c:412
+#: src/interface.c:399
 msgid "Frame size"
 msgstr "Wielkość filmu"
 
-#: src/interface.c:417
+#: src/interface.c:404
 msgid "File size"
 msgstr "Wielkość pliku"
 
-#: src/interface.c:418
+#: src/interface.c:405
 msgid "Byte size"
 msgstr "Wielkość pliku w bajtach"
 
-#: src/interface.c:423 src/interface.c:1891
+#: src/interface.c:410 src/interface.c:1760
 msgid "FPS"
 msgstr "Klatki na sekundę"
 
-#: src/interface.c:428
+#: src/interface.c:415
 msgid "Frames"
 msgstr "Klatki"
 
-#: src/interface.c:429
+#: src/interface.c:416
 msgid "Events"
 msgstr "Zdarzenia"
 
-#: src/interface.c:434 src/interface.c:500 src/interface.c:542
+#: src/interface.c:421 src/interface.c:486 src/interface.c:528
 msgid "Total time"
 msgstr "Całkowity czas"
 
-#: src/interface.c:486 src/resample.c:1488
+#: src/interface.c:472 src/resample.c:1460
 msgid "Audio"
 msgstr "Dźwięk"
 
-#: src/interface.c:511 src/interface.c:553
+#: src/interface.c:497 src/interface.c:539
 msgid "Rate/size"
 msgstr ""
 
-#: src/interface.c:530
+#: src/interface.c:516
 msgid "Right audio"
 msgstr ""
 
-#: src/interface.c:622
+#: src/interface.c:607
 msgid "LiVES: - Encoding options"
 msgstr ""
 
-#: src/interface.c:636
+#: src/interface.c:621
 msgid "<------------- (Check the box to re_size as suggested)"
 msgstr ""
 
-#: src/interface.c:637
+#: src/interface.c:622
 msgid "<------------- (Check the box to use the _size recommendation)"
 msgstr ""
 
-#: src/interface.c:662
+#: src/interface.c:646
 msgid "Use _letterboxing to maintain aspect ratio (optional)"
 msgstr ""
 
-#: src/interface.c:663
+#: src/interface.c:647
 msgid ""
 "Draw black rectangles either above or to the sides of the image, to prevent "
 "it from stretching."
 msgstr ""
 
-#: src/interface.c:694
+#: src/interface.c:677
 msgid "Keep _my settings"
 msgstr "Zachowaj _ustawienia"
 
-#: src/interface.c:695
+#: src/interface.c:678
 msgid "Use _recommended settings"
 msgstr "Użyj ustawień _zalecanych"
 
-#: src/interface.c:775 src/dialogs.c:114
-msgid ""
-"Do _not show this warning any more\n"
-"(can be turned back on from Preferences/Warnings)"
-msgstr ""
-
-#: src/interface.c:787
-msgid "Show _Details"
-msgstr "Pokaż _szczegóły"
-
-#: src/interface.c:881
+#: src/interface.c:769
 msgid "_Close Window"
 msgstr "_Zamknij okno"
 
-#: src/interface.c:883
+#: src/interface.c:771
 msgid "_Save to file"
 msgstr "_Zapisz do pliku"
 
-#: src/interface.c:928
+#: src/interface.c:816
 msgid "LiVES: - Insert"
 msgstr "LiVES: - Wstaw"
 
-#: src/interface.c:945
+#: src/interface.c:833
 msgid "_Number of times to insert"
 msgstr ""
 
-#: src/interface.c:954
+#: src/interface.c:842
 msgid "_Insert to fit audio"
 msgstr ""
 
-#: src/interface.c:968
+#: src/interface.c:856
 msgid "Insert _before selection"
 msgstr ""
 
-#: src/interface.c:970
+#: src/interface.c:858
 msgid "Insert clipboard before selected frames"
 msgstr ""
 
-#: src/interface.c:986
+#: src/interface.c:875
 msgid "Insert _after selection"
 msgstr ""
 
-#: src/interface.c:988
+#: src/interface.c:877
 msgid "Insert clipboard after selected frames"
 msgstr ""
 
-#: src/interface.c:999
+#: src/interface.c:888
 msgid "Insert _with sound"
 msgstr ""
 
-#: src/interface.c:1012
+#: src/interface.c:901
 msgid "Insert with_out sound"
 msgstr ""
 
-#: src/interface.c:1093
+#: src/interface.c:985
 msgid "LiVES: - Open Selection"
 msgstr ""
 
-#: src/interface.c:1111
+#: src/interface.c:1004
 msgid "Selection start time (sec)"
 msgstr ""
 
-#: src/interface.c:1117
+#: src/interface.c:1010
 msgid "Number of frames to open"
 msgstr ""
 
-#: src/interface.c:1193
+#: src/interface.c:1088
 msgid "LiVES: - Open Location"
 msgstr ""
 
-#: src/interface.c:1195
+#: src/interface.c:1090
 msgid "LiVES: - Open Youtube Clip"
 msgstr ""
 
-#: src/interface.c:1213
+#: src/interface.c:1109
 msgid ""
 "\n"
 "\n"
@@ -1291,7 +1285,7 @@
 "\n"
 msgstr ""
 
-#: src/interface.c:1216
+#: src/interface.c:1112
 msgid ""
 "\n"
 "\n"
@@ -1300,62 +1294,62 @@
 "\n"
 msgstr ""
 
-#: src/interface.c:1220
+#: src/interface.c:1116
 msgid ""
 "Enter the URL of the clip below.\n"
 "E.g: http://www.youtube.com/watch?v=WCR6f6WzjP8\n"
 "\n"
 msgstr ""
 
-#: src/interface.c:1231
+#: src/interface.c:1127
 msgid "URL : "
 msgstr "Adres : "
 
-#: src/interface.c:1231
+#: src/interface.c:1127
 msgid "Youtube URL : "
 msgstr ""
 
-#: src/interface.c:1235
+#: src/interface.c:1131
 msgid "Do not send bandwidth information"
 msgstr "Nie wysyłaj przepustowości informacji"
 
-#: src/interface.c:1237
+#: src/interface.c:1133
 msgid "Try this setting if you are having problems getting a stream"
 msgstr "Wypróbuj tę funkcję, jeśli mają problemy ze znalezieniem strumień"
 
-#: src/interface.c:1258
+#: src/interface.c:1155
 msgid "Download to _Directory : "
 msgstr ""
 
-#: src/interface.c:1276
+#: src/interface.c:1173
 msgid "Download _File Name : "
 msgstr ""
 
-#: src/interface.c:1281
+#: src/interface.c:1178
 msgid ".webm"
 msgstr ""
 
-#: src/interface.c:1359
+#: src/interface.c:1256
 msgid "LiVES: - Rename Clip"
 msgstr ""
 
-#: src/interface.c:1362
-msgid "LiVES: - Enter Set Name"
+#: src/interface.c:1258
+msgid "LiVES: - Enter Set Name to Save as"
 msgstr ""
 
-#: src/interface.c:1365
+#: src/interface.c:1260
 msgid "LiVES: - Enter a Set Name to Reload"
 msgstr ""
 
-#: src/interface.c:1368
+#: src/interface.c:1262
 msgid "LiVES: - Choose a Working Directory"
 msgstr ""
 
-#: src/interface.c:1371
+#: src/interface.c:1264
 msgid "LiVES: - Rename Current Track"
 msgstr ""
 
-#: src/interface.c:1391
+#: src/interface.c:1283
 msgid ""
 "You need to enter a name for the current clip set.\n"
 "This will allow you reload the layout with the same clips later.\n"
@@ -1363,354 +1357,354 @@
 "LiVES will remind you to save the clip set later when you try to exit.\n"
 msgstr ""
 
-#: src/interface.c:1397
+#: src/interface.c:1289
 msgid ""
 "In order to export this project, you must enter a name for this clip set.\n"
 "This will also be used for the project name.\n"
 msgstr ""
 
-#: src/interface.c:1404
+#: src/interface.c:1296
 msgid ""
 "Welcome to LiVES !\n"
 "This startup wizard will guide you through the\n"
 "initial install so that you can get the most from this application.\n"
 msgstr ""
 
-#: src/interface.c:1408
+#: src/interface.c:1300
 msgid ""
 "\n"
 "First of all you need to choose a working directory for LiVES.\n"
 "This should be a directory with plenty of disk space available.\n"
 msgstr ""
 
-#: src/interface.c:1427
+#: src/interface.c:1317
 msgid "New name "
 msgstr "Nowa nazwa "
 
-#: src/interface.c:1430
+#: src/interface.c:1319
 msgid "Set name "
 msgstr "Ustaw nazwę "
 
-#: src/interface.c:1550
+#: src/interface.c:1435
 msgid "Use def_aults"
 msgstr ""
 
-#: src/interface.c:1553 src/interface.c:1840 src/preferences.c:2515
-#: src/preferences.c:2697
+#: src/interface.c:1437 src/interface.c:1709 src/preferences.c:2550
+#: src/preferences.c:2739
 msgid "_Advanced"
 msgstr "_Zaawansowane"
 
-#: src/interface.c:1604
+#: src/interface.c:1487
 msgid "LiVES:- Select input device"
 msgstr ""
 
-#: src/interface.c:1622
+#: src/interface.c:1504
 msgid "Select input device:"
 msgstr ""
 
-#: src/interface.c:1686
+#: src/interface.c:1568
 msgid "LiVES:- Load CD Track"
 msgstr ""
 
-#: src/interface.c:1689
+#: src/interface.c:1570
 msgid "LiVES:- Select DVD Title/Chapter"
 msgstr ""
 
-#: src/interface.c:1692
+#: src/interface.c:1572
 msgid "LiVES:- Select VCD Title"
 msgstr ""
 
-#: src/interface.c:1695
+#: src/interface.c:1574
 msgid "LiVES:- Change Maximum Visible Tracks"
 msgstr ""
 
-#: src/interface.c:1698
+#: src/interface.c:1576
 msgid "LiVES:- Device details"
 msgstr ""
 
-#: src/interface.c:1721
+#: src/interface.c:1598
 #, c-format
 msgid "Track to load (from %s)"
 msgstr ""
 
-#: src/interface.c:1724
+#: src/interface.c:1600
 msgid "DVD Title"
 msgstr "Tytuł DVD"
 
-#: src/interface.c:1727
+#: src/interface.c:1602
 msgid "VCD Title"
 msgstr "Tytuł VCD"
 
-#: src/interface.c:1730
+#: src/interface.c:1604
 msgid "Maximum number of tracks to display"
 msgstr "Maksymalna liczba utworów do wyświetlenia"
 
-#: src/interface.c:1733
+#: src/interface.c:1606
 msgid "Device:        /dev/video"
 msgstr ""
 
-#: src/interface.c:1736
+#: src/interface.c:1608
 msgid "Device:        fw:"
 msgstr ""
 
-#: src/interface.c:1771
+#: src/interface.c:1641
 msgid "Chapter  "
 msgstr "Rozdział  "
 
-#: src/interface.c:1776
+#: src/interface.c:1645
 msgid "Channel  "
 msgstr ""
 
-#: src/interface.c:1791
+#: src/interface.c:1660
 msgid "Audio ID  "
 msgstr "ID Dźwięku  "
 
-#: src/interface.c:1857
+#: src/interface.c:1726
 msgid "Input number"
 msgstr ""
 
-#: src/interface.c:1865
+#: src/interface.c:1734
 msgid "Use default width, height and FPS"
 msgstr ""
 
-#: src/interface.c:1879
+#: src/interface.c:1748
 msgid "Width"
 msgstr ""
 
-#: src/interface.c:1885
+#: src/interface.c:1754
 msgid "Height"
 msgstr ""
 
-#: src/interface.c:1899
+#: src/interface.c:1768
 msgid "_Driver"
 msgstr ""
 
-#: src/interface.c:1902
+#: src/interface.c:1771
 msgid "_Output format"
 msgstr ""
 
-#: src/interface.c:1998
+#: src/interface.c:1865
 msgid "LiVES:- Fade Audio In"
 msgstr ""
 
-#: src/interface.c:2001
+#: src/interface.c:1867
 msgid "LiVES:- Fade Audio Out"
 msgstr ""
 
-#: src/interface.c:2017
+#: src/interface.c:1883
 msgid "Fade in over  "
 msgstr ""
 
-#: src/interface.c:2018
+#: src/interface.c:1884
 msgid "first"
 msgstr "pierwszy"
 
-#: src/interface.c:2021
+#: src/interface.c:1886
 msgid "Fade out over  "
 msgstr ""
 
-#: src/interface.c:2022
+#: src/interface.c:1887
 msgid "last"
 msgstr "ostatnią"
 
-#: src/interface.c:2044
+#: src/interface.c:1909
 msgid "seconds."
 msgstr "sekund."
 
-#: src/interface.c:2052 src/saveplay.c:1507
+#: src/interface.c:1917 src/saveplay.c:1484
 msgid "selection"
 msgstr "zaznaczenie"
 
-#: src/interface.c:2092
+#: src/interface.c:1956
 msgid "LiVES: - File Comments (optional)"
 msgstr ""
 
-#: src/interface.c:2107
+#: src/interface.c:1971
 msgid "Title/Name : "
 msgstr "Nazwa / Imię i nazwisko : "
 
-#: src/interface.c:2114
+#: src/interface.c:1978
 msgid "Author/Artist : "
 msgstr "Autor / wykonawcy : "
 
-#: src/interface.c:2121
+#: src/interface.c:1985
 msgid "Comments : "
 msgstr "Komentarze : "
 
-#: src/interface.c:2151
+#: src/interface.c:2015
 msgid "_Options"
 msgstr ""
 
-#: src/interface.c:2158
+#: src/interface.c:2022
 msgid "Save _subtitles to file"
 msgstr ""
 
-#: src/interface.c:2170
+#: src/interface.c:2033
 msgid "Subtitle file"
 msgstr ""
 
-#: src/interface.c:2172
+#: src/interface.c:2035
 msgid "Browse..."
 msgstr ""
 
-#: src/interface.c:2255
+#: src/interface.c:2132
 msgid "LiVES: - choose a device"
 msgstr ""
 
-#: src/interface.c:2259
+#: src/interface.c:2135
 msgid "LiVES: - choose a directory"
 msgstr ""
 
-#: src/interface.c:2262
+#: src/interface.c:2137
 msgid "LiVES: - choose a file"
 msgstr ""
 
-#: src/interface.c:2445
+#: src/interface.c:2381
 msgid "LiVES: - Cancel/Discard/Save"
 msgstr ""
 
-#: src/interface.c:2460
+#: src/interface.c:2397
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has not been saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:2463
+#: src/interface.c:2400
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has been changed since the last save.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:2467
+#: src/interface.c:2404
 msgid ""
 "You are about to exit LiVES.\n"
 "The current clip set can be saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:2468
+#: src/interface.c:2405
 msgid ""
 "The current clip set has not been saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:2472
+#: src/interface.c:2408
 msgid ""
 "The current layout has not been saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:2475
+#: src/interface.c:2410
 msgid ""
 "The current layout has *not* been changed since it was last saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:2480
+#: src/interface.c:2415
 msgid ""
 "The current layout contains generated frames and cannot be retained.\n"
 "You may wish to render it before exiting multitrack mode.\n"
 msgstr ""
 
-#: src/interface.c:2483
+#: src/interface.c:2418
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout contains generated frames and cannot be retained.\n"
 "What do you wish to do ?"
 msgstr ""
 
-#: src/interface.c:2496
+#: src/interface.c:2431
 msgid "Clip set _name"
 msgstr ""
 
-#: src/interface.c:2502
+#: src/interface.c:2437
 msgid "_Auto reload next time"
 msgstr ""
 
-#: src/interface.c:2538 src/interface.c:2547
+#: src/interface.c:2473 src/interface.c:2482
 msgid "_Wipe layout"
 msgstr ""
 
-#: src/interface.c:2539
+#: src/interface.c:2474
 msgid "_Ignore changes"
 msgstr "_Ignorowanie zmian"
 
-#: src/interface.c:2540
+#: src/interface.c:2475
 msgid "_Delete clip set"
 msgstr ""
 
-#: src/interface.c:2541
+#: src/interface.c:2476
 msgid "_Delete layout"
 msgstr ""
 
-#: src/interface.c:2545
+#: src/interface.c:2480
 msgid "_Save layout"
 msgstr "_Zapisz układ"
 
-#: src/interface.c:2546
+#: src/interface.c:2481
 msgid "_Save clip set"
 msgstr ""
 
-#: src/interface.c:2565
+#: src/interface.c:2502
 msgid ""
 "\n"
 "LiVES has detected a multitrack layout from a previous session.\n"
 "Would you like to try and recover it ?\n"
 msgstr ""
 
-#: src/interface.c:2589
+#: src/interface.c:2528
 msgid "LiVES: - Disk Recovery Options"
 msgstr ""
 
-#: src/interface.c:2608
+#: src/interface.c:2549
 msgid "Delete _Orphaned Clips"
 msgstr ""
 
-#: src/interface.c:2609
+#: src/interface.c:2550
 msgid "Delete any clips which are not currently loaded or part of a set"
 msgstr ""
 
-#: src/interface.c:2622
+#: src/interface.c:2564
 msgid "Clear _Backup Files from Closed Clips"
 msgstr ""
 
-#: src/interface.c:2633
+#: src/interface.c:2575
 msgid "Remove Sets which have _Layouts but no Clips"
 msgstr ""
 
-#: src/interface.c:2644
+#: src/interface.c:2586
 msgid "_Reset to Defaults"
 msgstr ""
 
-#: src/interface.c:2651
+#: src/interface.c:2593
 msgid "_Accept"
 msgstr ""
 
-#: src/callbacks.c:198
+#: src/callbacks.c:208
 #, c-format
 msgid "Saving as set %s..."
 msgstr ""
 
-#: src/callbacks.c:833
+#: src/callbacks.c:852
 msgid "Please enter the name of the file to save the clip as.\n"
 msgstr ""
 
-#: src/callbacks.c:841
+#: src/callbacks.c:860
 msgid "Please enter a valid URL for the download.\n"
 msgstr ""
 
-#: src/callbacks.c:867
+#: src/callbacks.c:886
 #, c-format
 msgid "Downloading %s to %s..."
 msgstr ""
 
-#: src/callbacks.c:895
+#: src/callbacks.c:912
 msgid "Downloading clip"
 msgstr ""
 
-#: src/callbacks.c:933
+#: src/callbacks.c:950
 msgid ""
 "\n"
 "LiVES was unable to download the clip.\n"
@@ -1718,17 +1712,17 @@
 "the latest youtube-dl installed.\n"
 msgstr ""
 
-#: src/callbacks.c:1114 src/callbacks.c:1149
+#: src/callbacks.c:1131 src/callbacks.c:1166
 msgid "This file"
 msgstr "Plik ten"
 
-#: src/callbacks.c:1115
+#: src/callbacks.c:1132
 msgid ""
 ",\n"
 " - including the current layout - "
 msgstr ""
 
-#: src/callbacks.c:1117
+#: src/callbacks.c:1134
 #, c-format
 msgid ""
 "\n"
@@ -1738,7 +1732,7 @@
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1119
+#: src/callbacks.c:1136
 #, c-format
 msgid ""
 "\n"
@@ -1748,14 +1742,14 @@
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1150
+#: src/callbacks.c:1167
 msgid ""
 "Changes made to this clip have not been saved or backed up.\n"
 "\n"
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1343
+#: src/callbacks.c:1356
 msgid ""
 "\n"
 "Invalid project file.\n"
@@ -1763,7 +1757,7 @@
 "\n"
 "Nieprawidłowy plik projektu.\n"
 
-#: src/callbacks.c:1356
+#: src/callbacks.c:1370
 #, c-format
 msgid ""
 "\n"
@@ -1776,33 +1770,33 @@
 "Once you have done this, you will be able to import the new project.\n"
 msgstr ""
 
-#: src/callbacks.c:1366
+#: src/callbacks.c:1381
 #, c-format
 msgid "Importing the project %s as set %s..."
 msgstr ""
 
-#: src/callbacks.c:1386
+#: src/callbacks.c:1399
 msgid "Importing project"
 msgstr "Importowanie projektu"
 
-#: src/callbacks.c:1472
+#: src/callbacks.c:1481
 #, c-format
 msgid "Exporting project %s..."
 msgstr ""
 
-#: src/callbacks.c:1490
+#: src/callbacks.c:1497
 msgid "Exporting project"
 msgstr "Projekt eksportowanie"
 
-#: src/callbacks.c:1506
+#: src/callbacks.c:1513
 msgid "Backup as .lv1 file"
 msgstr ""
 
-#: src/callbacks.c:1522
+#: src/callbacks.c:1529
 msgid "Restore .lv1 file"
 msgstr "Przywróć .lv1 plik"
 
-#: src/callbacks.c:1664
+#: src/callbacks.c:1671
 msgid ""
 "\n"
 "\n"
@@ -1814,72 +1808,77 @@
 "Ustaw zostaną usunięte z dysku.\n"
 "Czy na pewno ?\n"
 
-#: src/callbacks.c:1725
+#: src/callbacks.c:1732
 #, c-format
 msgid "Deleting set %s..."
 msgstr ""
 
-#: src/callbacks.c:1727
+#: src/callbacks.c:1734
 msgid "Deleting set..."
 msgstr "Usuwanie zestawu..."
 
-#: src/callbacks.c:1731
+#: src/callbacks.c:1738
 msgid "Deleting set"
 msgstr "Usuwanie zestawu"
 
-#: src/callbacks.c:1739
+#: src/callbacks.c:1746
 #, c-format
 msgid "Set %s was permanently deleted from the disk.\n"
 msgstr ""
 
-#: src/callbacks.c:1787 src/callbacks.c:11764
+#: src/callbacks.c:1792 src/callbacks.c:11676
 msgid "Insert Silence"
 msgstr ""
 
-#: src/callbacks.c:1840 src/callbacks.c:1923 src/callbacks.c:2086
+#: src/callbacks.c:1844 src/callbacks.c:1927 src/callbacks.c:2089
 msgid "Undoing"
 msgstr "Cofanie"
 
-#: src/callbacks.c:1936 src/callbacks.c:2147
+#: src/callbacks.c:1940 src/callbacks.c:2150
 msgid "Restoring audio..."
 msgstr ""
 
-#: src/callbacks.c:1952
+#: src/callbacks.c:1956
 msgid "Clearing frame images"
 msgstr "Czyszczenie ramy obrazów"
 
-#: src/callbacks.c:1985
+#: src/callbacks.c:1988
 msgid "Deleting excess frames"
 msgstr "Usuwanie nadmiaru ramek"
 
-#: src/callbacks.c:2229
+#: src/callbacks.c:2232
 #, c-format
 msgid "Length of video is now %d frames at %.3f frames per second.\n"
 msgstr ""
 
-#: src/callbacks.c:2233 src/resample.c:683 src/resample.c:2166
+#: src/callbacks.c:2235 src/resample.c:678 src/resample.c:2133
 #, c-format
 msgid "Clipboard was resampled to %d frames.\n"
 msgstr ""
 
-#: src/callbacks.c:2394 src/callbacks.c:2423
+#: src/callbacks.c:2396 src/callbacks.c:2425
 msgid "Redoing"
 msgstr ""
 
-#: src/callbacks.c:2462
+#: src/callbacks.c:2472
 #, c-format
-msgid "Copying frames %d to %d%s to the clipboard..."
+msgid "Copying frames %d to %d (with sound) to the clipboard..."
 msgstr ""
 
-#: src/callbacks.c:2525
+#: src/callbacks.c:2474
+#, c-format
+msgid "Copying frames %d to %d to the clipboard..."
+msgstr ""
+
+#: src/callbacks.c:2526
 msgid "Copying to the clipboard"
 msgstr ""
 
-#: src/callbacks.c:2600
+#: src/callbacks.c:2601
 msgid "Cut"
 msgstr "Wytnij"
 
-#: src/callbacks.c:2641 src/callbacks.c:3068 src/callbacks.c:8026
+#: src/callbacks.c:2641 src/callbacks.c:3063 src/callbacks.c:7631
 msgid "Pulling frames from clipboard"
 msgstr ""
 
@@ -1888,22 +1887,22 @@
 msgid "Pasting %d frames to new clip %s..."
 msgstr ""
 
-#: src/callbacks.c:2678
+#: src/callbacks.c:2676
 msgid "Pasting"
 msgstr ""
 
-#: src/callbacks.c:2694
+#: src/callbacks.c:2692
 msgid "...added audio..."
 msgstr ""
 
-#: src/callbacks.c:2778
+#: src/callbacks.c:2775
 msgid ""
 "This operation requires resizing or converting of frames.\n"
 "Please install 'convert' from the Image-magick package, and then restart "
 "LiVES.\n"
 msgstr ""
 
-#: src/callbacks.c:2795
+#: src/callbacks.c:2793
 msgid ""
 "\n"
 "\n"
@@ -1912,31 +1911,31 @@
 "the 'Trim Audio' function from the Audio menu."
 msgstr ""
 
-#: src/callbacks.c:2819
+#: src/callbacks.c:2817
 msgid ""
 "LiVES cannot insert because the audio rates do not match.\n"
 "Please install 'sox', and try again."
 msgstr ""
 
-#: src/callbacks.c:2838
+#: src/callbacks.c:2835
 msgid ""
 "\n"
 "Insertion will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:2888 src/callbacks.c:11692
+#: src/callbacks.c:2883 src/callbacks.c:11606
 msgid ""
 "\n"
 "Insertion will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:2996 src/callbacks.c:3025
+#: src/callbacks.c:2987 src/callbacks.c:3016
 msgid "Resampling clipboard audio"
 msgstr ""
 
-#: src/callbacks.c:3041
+#: src/callbacks.c:3032
 msgid ""
 "\n"
 "\n"
@@ -1944,7 +1943,7 @@
 "Clipboard audio has been erased.\n"
 msgstr ""
 
-#: src/callbacks.c:3055
+#: src/callbacks.c:3045
 msgid ""
 "\n"
 "\n"
@@ -1953,30 +1952,30 @@
 "using unchanged audio ?\n"
 msgstr ""
 
-#: src/callbacks.c:3137 src/callbacks.c:3311
+#: src/callbacks.c:3132 src/callbacks.c:3299
 #, c-format
 msgid "Inserting %d%s frames from the clipboard..."
 msgstr ""
 
-#: src/callbacks.c:3162 src/callbacks.c:3236 src/callbacks.c:3339
+#: src/callbacks.c:3155 src/callbacks.c:3224 src/callbacks.c:3325
 msgid "Inserting"
 msgstr "Wstawianie"
 
-#: src/callbacks.c:3193
+#: src/callbacks.c:3187
 #, c-format
 msgid "Inserting %d times from the clipboard%s..."
 msgstr ""
 
-#: src/callbacks.c:3200
+#: src/callbacks.c:3191
 #, c-format
 msgid "Inserting %d frames from the clipboard%s..."
 msgstr ""
 
-#: src/callbacks.c:3418
+#: src/callbacks.c:3404
 msgid "Insert"
 msgstr "Wstaw"
 
-#: src/callbacks.c:3486
+#: src/callbacks.c:3471
 msgid ""
 "\n"
 "Deleting all frames will close this file.\n"
@@ -1986,7 +1985,7 @@
 "Usuwanie wszystkich klatek zamknie ten plik.\n"
 "Czy na pewno ?"
 
-#: src/callbacks.c:3495
+#: src/callbacks.c:3480
 msgid ""
 "\n"
 "Deletion will cause missing frames in some multitrack layouts.\n"
@@ -1996,8 +1995,8 @@
 "Skreślenie spowoduje brak ramek w niektóre układy wielościeżkowym.\n"
 "Czy na pewno chcesz kontynuować ?\n"
 
-#: src/callbacks.c:3515 src/callbacks.c:10920 src/callbacks.c:11162
-#: src/callbacks.c:11228
+#: src/callbacks.c:3500 src/callbacks.c:10851 src/callbacks.c:11087
+#: src/callbacks.c:11152
 msgid ""
 "\n"
 "Deletion will cause missing audio in some multitrack layouts.\n"
@@ -2007,7 +2006,7 @@
 "Usunięcie może spowodować brak audio w niektórych układów wielościeżkowym.\n"
 "Czy na pewno chcesz kontynuować ?\n"
 
-#: src/callbacks.c:3534
+#: src/callbacks.c:3519
 msgid ""
 "\n"
 "Deletion will cause frames to shift in some multitrack layouts.\n"
@@ -2017,7 +2016,7 @@
 "Usunięcie powoduje przesunięcie ramki w niektórych układów wielościeżkowym.\n"
 "Czy na pewno chcesz kontynuować ?\n"
 
-#: src/callbacks.c:3553 src/callbacks.c:11210
+#: src/callbacks.c:3538 src/callbacks.c:11134
 msgid ""
 "\n"
 "Deletion will cause audio to shift in some multitrack layouts.\n"
@@ -2028,20 +2027,20 @@
 "wielościeżkowym.\n"
 "Czy na pewno chcesz kontynuować ?\n"
 
-#: src/callbacks.c:3611
+#: src/callbacks.c:3597
 #, c-format
 msgid "Deleting frames %d to %d%s..."
 msgstr ""
 
-#: src/callbacks.c:3636
+#: src/callbacks.c:3619
 msgid "Deleting"
 msgstr "Kasowanie"
 
-#: src/callbacks.c:3717
+#: src/callbacks.c:3699
 msgid "Delete"
 msgstr "Usuń"
 
-#: src/callbacks.c:3738
+#: src/callbacks.c:3717
 msgid ""
 "\n"
 "\n"
@@ -2051,7 +2050,7 @@
 "\n"
 "Wybór jest zablokowana.\n"
 
-#: src/callbacks.c:4092
+#: src/callbacks.c:4056
 msgid ""
 "Ready to record. Use 'control' and cursor keys during playback to record "
 "your performance.\n"
@@ -2059,11 +2058,11 @@
 "play.)\n"
 msgstr ""
 
-#: src/callbacks.c:4098
+#: src/callbacks.c:4061
 msgid "Record cancelled.\n"
 msgstr "Nagrywanie anulowane.\n"
 
-#: src/callbacks.c:4237
+#: src/callbacks.c:4197
 #, c-format
 msgid ""
 "\n"
@@ -2072,7 +2071,7 @@
 "%s\n"
 msgstr ""
 
-#: src/callbacks.c:4241
+#: src/callbacks.c:4200
 #, c-format
 msgid ""
 "\n"
@@ -2081,7 +2080,7 @@
 "The plugin may be broken or not installed correctly."
 msgstr ""
 
-#: src/callbacks.c:4571
+#: src/callbacks.c:4532
 #, c-format
 msgid ""
 "Saving the set will cause copies of all loaded clips to remain on the disk"
@@ -2090,22 +2089,22 @@
 "Please press 'Cancel' if that is not what you want.\n"
 msgstr ""
 
-#: src/callbacks.c:4654
+#: src/callbacks.c:4617
 #, c-format
 msgid "Saving set %s"
 msgstr ""
 
-#: src/callbacks.c:5005
+#: src/callbacks.c:4964
 #, c-format
 msgid "Loading clips from set %s"
 msgstr ""
 
-#: src/callbacks.c:5093
+#: src/callbacks.c:5051
 #, c-format
 msgid "%d clips and %d layouts were recovered from set (%s).\n"
 msgstr ""
 
-#: src/callbacks.c:5312
+#: src/callbacks.c:5259
 msgid ""
 "LiVES will attempt to recover some disk space.\n"
 "You should ONLY run this if you have no other copies of LiVES running on "
@@ -2113,24 +2112,24 @@
 "Click OK to proceed.\n"
 msgstr ""
 
-#: src/callbacks.c:5317
+#: src/callbacks.c:5264
 msgid "Cleaning up disk space..."
 msgstr ""
 
-#: src/callbacks.c:5387
+#: src/callbacks.c:5334
 msgid "Recovering disk space"
 msgstr ""
 
-#: src/callbacks.c:5439
+#: src/callbacks.c:5386
 #, c-format
 msgid "%s of disk space was recovered.\n"
 msgstr ""
 
-#: src/callbacks.c:5482
+#: src/callbacks.c:5428
 msgid "Resetting frame rates and frame values..."
 msgstr ""
 
-#: src/callbacks.c:5523
+#: src/callbacks.c:5469
 #, c-format
 msgid ""
 "\n"
@@ -2138,68 +2137,68 @@
 "Internal: %s (%d bpp) / %s\n"
 msgstr ""
 
-#: src/callbacks.c:5525
+#: src/callbacks.c:5471
 msgid "buffered"
 msgstr ""
 
-#: src/callbacks.c:5538 src/callbacks.c:5557 src/callbacks.c:5575
-#: src/callbacks.c:5609
+#: src/callbacks.c:5484 src/callbacks.c:5502 src/callbacks.c:5518
+#: src/callbacks.c:5551
 msgid ""
 "\n"
 "  Opening..."
 msgstr ""
 
-#: src/callbacks.c:5545
+#: src/callbacks.c:5490
 #, c-format
 msgid ""
 "\n"
 "(%d virtual)"
 msgstr ""
 
-#: src/callbacks.c:5548
+#: src/callbacks.c:5493
 #, c-format
 msgid ""
 "\n"
 "(%d decoded)"
 msgstr ""
 
-#: src/callbacks.c:5560 src/callbacks.c:5578 src/callbacks.c:5612
+#: src/callbacks.c:5504 src/callbacks.c:5520 src/callbacks.c:5553
 #, c-format
 msgid ""
 "\n"
 "  %.2f sec."
 msgstr ""
 
-#: src/callbacks.c:5569
+#: src/callbacks.c:5512
 msgid ""
 "\n"
 "  Unknown"
 msgstr ""
 
-#: src/callbacks.c:5582 src/callbacks.c:5596
+#: src/callbacks.c:5524 src/callbacks.c:5538
 msgid "unsigned"
 msgstr ""
 
-#: src/callbacks.c:5583 src/callbacks.c:5597
+#: src/callbacks.c:5525 src/callbacks.c:5539
 msgid "signed"
 msgstr ""
 
-#: src/callbacks.c:5585 src/callbacks.c:5599
+#: src/callbacks.c:5527 src/callbacks.c:5541
 msgid "big-endian"
 msgstr ""
 
-#: src/callbacks.c:5586 src/callbacks.c:5600
+#: src/callbacks.c:5528 src/callbacks.c:5542
 msgid "little-endian"
 msgstr ""
 
-#: src/callbacks.c:5588 src/callbacks.c:5602
+#: src/callbacks.c:5530 src/callbacks.c:5544
 #, c-format
 msgid ""
 "  %d Hz %d bit\n"
 "%s %s"
 msgstr ""
 
-#: src/callbacks.c:5707
+#: src/callbacks.c:5647
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -2216,15 +2215,15 @@
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA.\n"
 msgstr ""
 
-#: src/callbacks.c:5721
+#: src/callbacks.c:5661
 msgid "A video editor and VJ program."
 msgstr ""
 
-#: src/callbacks.c:5722
+#: src/callbacks.c:5662
 msgid "About LiVES"
 msgstr ""
 
-#: src/callbacks.c:5724
+#: src/callbacks.c:5664
 msgid "translator_credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -2233,7 +2232,7 @@
 "  risto https://launchpad.net/~kml\n"
 "  salsaman https://launchpad.net/~salsaman"
 
-#: src/callbacks.c:5758
+#: src/callbacks.c:5699
 #, c-format
 msgid ""
 "LiVES Version %s\n"
@@ -2247,14 +2246,14 @@
 "Homepage: http://lives.sourceforge.net"
 msgstr ""
 
-#: src/callbacks.c:6037
+#: src/callbacks.c:5996
 msgid ""
 "\n"
 "\n"
 "You need to install mplayer or mplayer2 to be able to preview this file.\n"
 msgstr ""
 
-#: src/callbacks.c:6040
+#: src/callbacks.c:5998
 msgid ""
 "\n"
 "\n"
@@ -2262,215 +2261,206 @@
 "this file.\n"
 msgstr ""
 
-#: src/callbacks.c:6423 src/callbacks.c:8289
-msgid ""
-"\n"
-"Loading new audio may cause missing audio in some multitrack layouts.\n"
-"Are you sure you wish to continue ?\n"
-"."
-msgstr ""
-
-#: src/callbacks.c:6523
-#, c-format
-msgid "Opening audio %s, type %s..."
-msgstr ""
-
-#: src/callbacks.c:6556 src/saveplay.c:480
-msgid "Opening audio"
-msgstr ""
-
-#: src/callbacks.c:6565 src/callbacks.c:6612 src/callbacks.c:8387
-#: src/callbacks.c:8429 src/callbacks.c:8472 src/callbacks.c:10846
-msgid "Cancelling"
-msgstr "Anulowanie"
-
-#: src/callbacks.c:6660 src/callbacks.c:8514 src/callbacks.c:10876
-#: src/callbacks.c:11563
-msgid "Committing audio"
-msgstr ""
-
-#: src/callbacks.c:6672 src/callbacks.c:8546
-msgid "New Audio"
-msgstr ""
-
-#: src/callbacks.c:6779
+#: src/callbacks.c:6459
 #, c-format
 msgid ""
 "Text was saved as\n"
 "%s\n"
 msgstr ""
 
-#: src/callbacks.c:6951 src/saveplay.c:3618
-#, c-format
-msgid "%d frames are enough !\n"
-msgstr ""
-
-#: src/callbacks.c:7050
+#: src/callbacks.c:6706
 msgid "LiVES: - Encoder debug output"
 msgstr ""
 
-#: src/callbacks.c:7087 src/gui.c:1922
+#: src/callbacks.c:6743 src/gui.c:1921
 msgid "Fullscreen playback (f)"
 msgstr ""
 
-#: src/callbacks.c:7089
+#: src/callbacks.c:6744
 msgid "Fullscreen playback off (f)"
 msgstr ""
 
-#: src/callbacks.c:7188 src/callbacks.c:7336 src/callbacks.c:7664
-#: src/callbacks.c:7681 src/gui.c:3712 src/saveplay.c:2467 src/saveplay.c:2501
-#: src/saveplay.c:3115 src/saveplay.c:3220 src/saveplay.c:3239
-#: src/multitrack.c:9340 src/multitrack.c:11060
+#: src/callbacks.c:6841 src/callbacks.c:6983 src/callbacks.c:7283
+#: src/callbacks.c:7298 src/gui.c:3838 src/saveplay.c:2442 src/saveplay.c:2475
+#: src/saveplay.c:3074 src/saveplay.c:3178 src/saveplay.c:3197
+#: src/multitrack.c:9526 src/multitrack.c:11288
 #, c-format
 msgid " (%d %% scale)"
 msgstr ""
 
-#: src/callbacks.c:7190 src/callbacks.c:7338 src/callbacks.c:7666
-#: src/gui.c:3716 src/saveplay.c:2469 src/saveplay.c:2503
+#: src/callbacks.c:6843 src/callbacks.c:6985 src/callbacks.c:7285
+#: src/gui.c:3842 src/saveplay.c:2444 src/saveplay.c:2477
 #, c-format
 msgid "LiVES: - Play Window%s"
 msgstr ""
 
-#: src/callbacks.c:7302 src/gui.c:1907
+#: src/callbacks.c:6950 src/gui.c:1906
 msgid "Double size (d)"
 msgstr ""
 
-#: src/callbacks.c:7309
+#: src/callbacks.c:6956
 msgid "Single size (d)"
 msgstr ""
 
-#: src/callbacks.c:7442 src/callbacks.c:7443
+#: src/callbacks.c:7087 src/callbacks.c:7088
 msgid "Hide the play window (s)"
 msgstr ""
 
-#: src/callbacks.c:7452 src/gui.c:1746
+#: src/callbacks.c:7096 src/gui.c:1744
 msgid "Show the play window (s)"
 msgstr ""
 
-#: src/callbacks.c:7453 src/gui.c:1896
+#: src/callbacks.c:7097 src/gui.c:1895
 msgid "Play in separate window (s)"
 msgstr ""
 
-#: src/callbacks.c:7535 src/gui.c:4060 src/saveplay.c:2498
+#: src/callbacks.c:7175 src/gui.c:4169 src/saveplay.c:2472
 msgid "LiVES: - Streaming"
 msgstr ""
 
-#: src/callbacks.c:7778
+#: src/callbacks.c:7388
 msgid "Switch continuous looping off (o)"
 msgstr ""
 
-#: src/callbacks.c:7785 src/gui.c:1795
+#: src/callbacks.c:7394 src/gui.c:1793
 msgid "Switch continuous looping on (o)"
 msgstr ""
 
-#: src/callbacks.c:7837
+#: src/callbacks.c:7444
 #, c-format
 msgid "Audio volume (%.2f)"
 msgstr ""
 
-#: src/callbacks.c:7876 src/callbacks.c:7877 src/gui.c:3640
+#: src/callbacks.c:7483 src/callbacks.c:7484 src/gui.c:3766
 msgid "Unmute the audio (z)"
 msgstr ""
 
-#: src/callbacks.c:7888 src/callbacks.c:7889 src/gui.c:1808 src/gui.c:3639
+#: src/callbacks.c:7494 src/callbacks.c:7495 src/gui.c:1806 src/gui.c:3765
 msgid "Mute the audio (z)"
 msgstr ""
 
-#: src/callbacks.c:8038
+#: src/callbacks.c:7643
 msgid "Reversing clipboard..."
 msgstr ""
 
-#: src/callbacks.c:8052
+#: src/callbacks.c:7657
 msgid "Reversing clipboard"
 msgstr ""
 
-#: src/callbacks.c:8084
+#: src/callbacks.c:7689
 msgid "LiVES: Load subtitles from..."
 msgstr ""
 
-#: src/callbacks.c:8151 src/saveplay.c:970
+#: src/callbacks.c:7753 src/saveplay.c:956
 #, c-format
 msgid "Loaded subtitle file: %s\n"
 msgstr ""
 
-#: src/callbacks.c:8220
+#: src/callbacks.c:7821
 msgid "Subtitles were erased.\n"
 msgstr ""
 
-#: src/callbacks.c:8239
+#: src/callbacks.c:7843
 msgid "LiVES: - Select Audio File"
 msgstr ""
 
-#: src/callbacks.c:8250
+#: src/callbacks.c:7878 src/callbacks.c:8232
+msgid ""
+"\n"
+"Loading new audio may cause missing audio in some multitrack layouts.\n"
+"Are you sure you wish to continue ?\n"
+"."
+msgstr ""
+
+#: src/callbacks.c:7989
+#, c-format
+msgid "Opening audio %s, type %s..."
+msgstr ""
+
+#: src/callbacks.c:8023 src/saveplay.c:477
+msgid "Opening audio"
+msgstr ""
+
+#: src/callbacks.c:8032 src/callbacks.c:8083 src/callbacks.c:8327
+#: src/callbacks.c:8369 src/callbacks.c:8412 src/callbacks.c:10766
+msgid "Cancelling"
+msgstr "Anulowanie"
+
+#: src/callbacks.c:8137 src/callbacks.c:8454 src/callbacks.c:10803
+#: src/callbacks.c:11477
+msgid "Committing audio"
+msgstr ""
+
+#: src/callbacks.c:8153 src/callbacks.c:8484
+msgid "New Audio"
+msgstr ""
+
+#: src/callbacks.c:8194
 msgid "Please set your CD play device in Tools | Preferences | Misc\n"
 msgstr ""
 
-#: src/callbacks.c:8321
+#: src/callbacks.c:8264
 #, c-format
 msgid "Opening CD track %d from %s..."
 msgstr ""
 
-#: src/callbacks.c:8326
+#: src/callbacks.c:8267
 #, c-format
 msgid "CD track %d"
 msgstr ""
 
-#: src/callbacks.c:8373
+#: src/callbacks.c:8313
 msgid "Opening CD track..."
 msgstr ""
 
-#: src/callbacks.c:8415 src/callbacks.c:8461
+#: src/callbacks.c:8355 src/callbacks.c:8401
 msgid "Error loading CD track\n"
 msgstr ""
 
-#: src/callbacks.c:8584
+#: src/callbacks.c:8518
 msgid "layout errors"
 msgstr ""
 
-#: src/callbacks.c:8595
+#: src/callbacks.c:8529
 msgid "Close _Window"
 msgstr ""
 
-#: src/callbacks.c:8606
+#: src/callbacks.c:8540
 msgid "Clear _Errors"
 msgstr ""
 
-#: src/callbacks.c:8617
+#: src/callbacks.c:8551
 msgid "_Delete affected layouts"
 msgstr ""
 
-#: src/callbacks.c:9343 src/callbacks.c:9388
+#: src/callbacks.c:9253 src/callbacks.c:9298
 msgid "Resume"
 msgstr "Przywróć"
 
-#: src/callbacks.c:9344
+#: src/callbacks.c:9254
 msgid ""
 "\n"
 "Paused\n"
 "(click Resume to continue processing)"
 msgstr ""
 
-#: src/callbacks.c:9345 src/callbacks.c:9406
+#: src/callbacks.c:9255 src/callbacks.c:9315
 msgid "paused..."
 msgstr ""
 
-#: src/callbacks.c:9372 src/callbacks.c:9418
-msgid "Pause"
-msgstr "Wstrzymaj"
-
-#: src/callbacks.c:9374 src/callbacks.c:9421
+#: src/callbacks.c:9284 src/callbacks.c:9333
 msgid "resumed..."
 msgstr ""
 
-#: src/callbacks.c:9393
+#: src/callbacks.c:9303
 msgid "Keep"
 msgstr "Zatrzymaj"
 
-#: src/callbacks.c:9396
+#: src/callbacks.c:9305
 msgid "Enough"
 msgstr ""
 
-#: src/callbacks.c:9401
+#: src/callbacks.c:9310
 #, c-format
 msgid ""
 "\n"
@@ -2479,28 +2469,28 @@
 "(click Resume to continue processing)"
 msgstr ""
 
-#: src/callbacks.c:9419
+#: src/callbacks.c:9331
 msgid "Cancel"
 msgstr "Przerwij"
 
-#: src/callbacks.c:9558
+#: src/callbacks.c:9478
 msgid "Stop"
 msgstr ""
 
-#: src/callbacks.c:10053 src/multitrack.c:13247
+#: src/callbacks.c:9968 src/multitrack.c:13489
 msgid "LiVES: Selected frame"
 msgstr ""
 
-#: src/callbacks.c:10061
+#: src/callbacks.c:9976
 msgid "_Save frame as..."
 msgstr ""
 
-#: src/callbacks.c:10290
+#: src/callbacks.c:10202
 #, c-format
 msgid "Audio is ahead of video by %.4f secs. at frame %d, with fps %.4f\n"
 msgstr ""
 
-#: src/callbacks.c:10347
+#: src/callbacks.c:10255
 msgid ""
 "\n"
 "\n"
@@ -2509,7 +2499,7 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10353
+#: src/callbacks.c:10261
 msgid ""
 "\n"
 "\n"
@@ -2517,13 +2507,13 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10429 src/callbacks.c:11479
+#: src/callbacks.c:10334 src/callbacks.c:11395
 msgid ""
 "\n"
 "Record time must be greater than 0.\n"
 msgstr ""
 
-#: src/callbacks.c:10440
+#: src/callbacks.c:10346
 msgid ""
 "Capture an External Window:\n"
 "\n"
@@ -2532,17 +2522,17 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10445
+#: src/callbacks.c:10351
 msgid "External window was released.\n"
 msgstr ""
 
-#: src/callbacks.c:10479
+#: src/callbacks.c:10385
 msgid ""
 "Click on a Window to Capture it\n"
 "Press 'q' to stop recording"
 msgstr ""
 
-#: src/callbacks.c:10513
+#: src/callbacks.c:10419
 #, c-format
 msgid ""
 "\n"
@@ -2552,19 +2542,19 @@
 "(Default of %.3f frames per second will be used.)\n"
 msgstr ""
 
-#: src/callbacks.c:10539
+#: src/callbacks.c:10443
 msgid "LiVES was unable to capture this window. Sorry.\n"
 msgstr ""
 
-#: src/callbacks.c:10695
+#: src/callbacks.c:10601
 msgid "Export Selected Audio as..."
 msgstr ""
 
-#: src/callbacks.c:10699
+#: src/callbacks.c:10604
 msgid "Export Audio as..."
 msgstr ""
 
-#: src/callbacks.c:10714
+#: src/callbacks.c:10619
 msgid ""
 "\n"
 "\n"
@@ -2573,1033 +2563,1033 @@
 "rate.\n"
 msgstr ""
 
-#: src/callbacks.c:10720
+#: src/callbacks.c:10625
 #, c-format
 msgid "Exporting audio frames %d to %d as %s..."
 msgstr ""
 
-#: src/callbacks.c:10725
+#: src/callbacks.c:10629
 #, c-format
 msgid "Exporting audio as %s..."
 msgstr ""
 
-#: src/callbacks.c:10751
+#: src/callbacks.c:10655
 msgid "Exporting audio"
 msgstr ""
 
-#: src/callbacks.c:10782
+#: src/callbacks.c:10695
 msgid "LiVES: - Append Audio File"
 msgstr ""
 
-#: src/callbacks.c:10825
+#: src/callbacks.c:10739
 #, c-format
 msgid "Appending audio file %s..."
 msgstr ""
 
-#: src/callbacks.c:10836
+#: src/callbacks.c:10756
 msgid "Appending audio"
 msgstr ""
 
-#: src/callbacks.c:10892
+#: src/callbacks.c:10818
 msgid "Append Audio"
 msgstr ""
 
-#: src/callbacks.c:10952
+#: src/callbacks.c:10883
 #, c-format
 msgid "Padding audio to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10954
+#: src/callbacks.c:10885
 #, c-format
 msgid "Trimming audio from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10973
+#: src/callbacks.c:10904
 msgid "Trimming/Padding audio"
 msgstr ""
 
-#: src/callbacks.c:10981
+#: src/callbacks.c:10912
 msgid "Trim/Pad Audio"
 msgstr ""
 
-#: src/callbacks.c:11055
+#: src/callbacks.c:10982
 msgid "Fading audio in"
 msgstr ""
 
-#: src/callbacks.c:11056
+#: src/callbacks.c:10983
 msgid "Fade audio in"
 msgstr ""
 
-#: src/callbacks.c:11061
+#: src/callbacks.c:10987
 msgid "Fading audio out"
 msgstr ""
 
-#: src/callbacks.c:11062
+#: src/callbacks.c:10988
 msgid "Fade audio out"
 msgstr ""
 
-#: src/callbacks.c:11085
+#: src/callbacks.c:11011
 #, c-format
 msgid "%s over %.1f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11087
+#: src/callbacks.c:11013
 #, c-format
 msgid "%s from time %.2f seconds to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11094
+#: src/callbacks.c:11020
 msgid "Fading audio..."
 msgstr ""
 
-#: src/callbacks.c:11194
+#: src/callbacks.c:11119
 msgid ""
 "\n"
 "Deleting all audio will close this file.\n"
 "Are you sure ?"
 msgstr ""
 
-#: src/callbacks.c:11197
+#: src/callbacks.c:11122
 msgid "Deleting all audio..."
 msgstr ""
 
-#: src/callbacks.c:11203
+#: src/callbacks.c:11127
 #, c-format
 msgid "Deleting audio from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11290
+#: src/callbacks.c:11214
 msgid "Deleting Audio"
 msgstr ""
 
-#: src/callbacks.c:11297
+#: src/callbacks.c:11221
 msgid "Delete Audio"
 msgstr ""
 
-#: src/callbacks.c:11636
+#: src/callbacks.c:11550
 msgid "Record new audio"
 msgstr ""
 
-#: src/callbacks.c:11725
+#: src/callbacks.c:11640
 #, c-format
 msgid "Inserting silence from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11754
+#: src/callbacks.c:11666
 msgid "Inserting Silence"
 msgstr ""
 
-#: src/merge.c:85
+#: src/merge.c:96
 msgid "LiVES: - Merge"
 msgstr ""
 
-#: src/merge.c:102
+#: src/merge.c:113
 #, c-format
 msgid "Merge Clipboard [ %d Frames ]       With Selection [ %d Frames ]"
 msgstr ""
 
-#: src/merge.c:107
+#: src/merge.c:118
 #, c-format
 msgid ""
 "Merge Clipboard [ %d Frames (resampled) ]       With Selection [ %d Frames ]"
 msgstr ""
 
-#: src/merge.c:118
+#: src/merge.c:130
 msgid "Align _Starts"
 msgstr ""
 
-#: src/merge.c:123
+#: src/merge.c:135
 msgid "Align _Ends"
 msgstr ""
 
-#: src/merge.c:134
+#: src/merge.c:146
 msgid "What to do with extra clipboard frames -"
 msgstr ""
 
-#: src/merge.c:137
+#: src/merge.c:149
 msgid "_Insert Frames"
 msgstr ""
 
-#: src/merge.c:143
+#: src/merge.c:155
 msgid "_Drop Frames"
 msgstr ""
 
-#: src/merge.c:149
+#: src/merge.c:160
 msgid "Number of Times to Loop Clipboard"
 msgstr ""
 
-#: src/merge.c:160
+#: src/merge.c:171
 msgid "_Loop Clipboard to Fit Selection"
 msgstr ""
 
-#: src/merge.c:173
+#: src/merge.c:184
 msgid "_Transition Method:"
 msgstr ""
 
-#: src/merge.c:394
+#: src/merge.c:395
 msgid "Merging clipboard with selection..."
 msgstr ""
 
-#: src/merge.c:551
+#: src/merge.c:539
 msgid "Merge done.\n"
 msgstr ""
 
-#: src/gui.c:123
+#: src/gui.c:122
 msgid "_Custom Generators"
 msgstr ""
 
-#: src/gui.c:124
+#: src/gui.c:123
 msgid "_Custom Effects"
 msgstr ""
 
-#: src/gui.c:125
+#: src/gui.c:124
 msgid "Custom _Utilities"
 msgstr ""
 
-#: src/gui.c:352 src/multitrack.c:5964
+#: src/gui.c:351 src/multitrack.c:6143
 msgid "_File"
 msgstr "_Plik"
 
-#: src/gui.c:367 src/multitrack.c:5989
+#: src/gui.c:366 src/multitrack.c:6168
 msgid "_Open File/Directory"
 msgstr ""
 
-#: src/gui.c:373
+#: src/gui.c:372
 msgid "O_pen Part of File..."
 msgstr ""
 
-#: src/gui.c:379 src/gui.c:383 src/multitrack.c:6006 src/multitrack.c:6023
-#: src/multitrack.c:6028
+#: src/gui.c:378 src/gui.c:382 src/multitrack.c:6185 src/multitrack.c:6202
+#: src/multitrack.c:6207
 msgid "Open _Location/Stream..."
 msgstr ""
 
-#: src/gui.c:393 src/multitrack.c:6016
+#: src/gui.c:392 src/multitrack.c:6195
 msgid "Open _Youtube Clip..."
 msgstr ""
 
-#: src/gui.c:404
+#: src/gui.c:403
 msgid "Import from _dvd/vcd..."
 msgstr ""
 
-#: src/gui.c:413
+#: src/gui.c:412
 msgid "Import from _dvd"
 msgstr ""
 
-#: src/gui.c:416
+#: src/gui.c:415
 msgid "Import from _vcd"
 msgstr ""
 
-#: src/gui.c:419
+#: src/gui.c:418
 msgid "_Import from Firewire"
 msgstr ""
 
-#: src/gui.c:428 src/multitrack.c:6086
+#: src/gui.c:427 src/multitrack.c:6265
 msgid "Import from _Firewire Device (dv)"
 msgstr ""
 
-#: src/gui.c:429 src/multitrack.c:6094
+#: src/gui.c:428 src/multitrack.c:6273
 msgid "Import from _Firewire Device (hdv)"
 msgstr ""
 
-#: src/gui.c:457
+#: src/gui.c:456
 msgid "_Add Webcam/TV card..."
 msgstr ""
 
-#: src/gui.c:476
+#: src/gui.c:475
 msgid "Add _Unicap Device"
 msgstr ""
 
-#: src/gui.c:486
+#: src/gui.c:485
 msgid "Add Live _Firewire Device"
 msgstr ""
 
-#: src/gui.c:495
+#: src/gui.c:494
 msgid "Add _TV Device"
 msgstr ""
 
-#: src/gui.c:510 src/multitrack.c:6117
+#: src/gui.c:509 src/multitrack.c:6296
 msgid "_Recent Files..."
 msgstr ""
 
-#: src/gui.c:560 src/multitrack.c:6177
+#: src/gui.c:559 src/multitrack.c:6356
 msgid "_Reload Clip Set..."
 msgstr ""
 
-#: src/gui.c:564 src/multitrack.c:6185
+#: src/gui.c:563 src/multitrack.c:6364
 msgid "Close/Sa_ve All Clips"
 msgstr ""
 
-#: src/gui.c:575
+#: src/gui.c:574
 msgid "_Encode Clip As..."
 msgstr ""
 
-#: src/gui.c:577
+#: src/gui.c:576
 msgid "Encode _Selection As..."
 msgstr ""
 
-#: src/gui.c:584
+#: src/gui.c:583
 msgid "_Close This Clip"
 msgstr ""
 
-#: src/gui.c:595
+#: src/gui.c:594
 msgid "_Backup Clip as .lv1..."
 msgstr ""
 
-#: src/gui.c:604
+#: src/gui.c:603
 msgid "_Restore Clip from .lv1..."
 msgstr ""
 
-#: src/gui.c:615
+#: src/gui.c:614
 msgid "Encode/Load/Backup _with Sound"
 msgstr ""
 
-#: src/gui.c:620
+#: src/gui.c:619
 msgid "Auto load subtitles"
 msgstr ""
 
-#: src/gui.c:628 src/multitrack.c:6224
+#: src/gui.c:627 src/multitrack.c:6403
 msgid "Clean _up Diskspace"
 msgstr ""
 
-#: src/gui.c:636 src/multitrack.c:6257
+#: src/gui.c:635 src/multitrack.c:6436
 msgid "_Edit"
 msgstr "_Edycja"
 
-#: src/gui.c:685
+#: src/gui.c:684
 msgid "_MULTITRACK mode"
 msgstr ""
 
-#: src/gui.c:696
+#: src/gui.c:695
 msgid "_Copy Selection"
 msgstr ""
 
-#: src/gui.c:705
+#: src/gui.c:704
 msgid "Cu_t Selection"
 msgstr ""
 
-#: src/gui.c:714
+#: src/gui.c:713
 msgid "_Insert from Clipboard..."
 msgstr ""
 
-#: src/gui.c:730
+#: src/gui.c:729
 msgid "Paste as _New"
 msgstr "Wklej jako _nowy"
 
-#: src/gui.c:739
+#: src/gui.c:738
 msgid "_Merge Clipboard with Selection..."
 msgstr ""
 
-#: src/gui.c:746
+#: src/gui.c:745
 msgid "_Delete Selection"
 msgstr "_Usuń zaznaczenie"
 
-#: src/gui.c:764
+#: src/gui.c:763
 msgid "Decouple _Video from Audio"
 msgstr ""
 
-#: src/gui.c:772
+#: src/gui.c:771
 msgid "_Select..."
 msgstr "_Wybierz..."
 
-#: src/gui.c:786
+#: src/gui.c:785
 msgid "Select _All Frames"
 msgstr ""
 
-#: src/gui.c:794
+#: src/gui.c:793
 msgid "_Start Frame Only"
 msgstr ""
 
-#: src/gui.c:802
+#: src/gui.c:801
 msgid "_End Frame Only"
 msgstr ""
 
-#: src/gui.c:813
+#: src/gui.c:812
 msgid "Select from _First Frame"
 msgstr ""
 
-#: src/gui.c:817
+#: src/gui.c:816
 msgid "Select to _Last Frame"
 msgstr ""
 
-#: src/gui.c:821
+#: src/gui.c:820
 msgid "Select Last Insertion/_Merge"
 msgstr ""
 
-#: src/gui.c:825
+#: src/gui.c:824
 msgid "Select Last _Effect"
 msgstr ""
 
-#: src/gui.c:829
+#: src/gui.c:828
 msgid "_Invert Selection"
 msgstr "_Odwróć zaznaczenie"
 
-#: src/gui.c:837
+#: src/gui.c:836
 msgid "_Lock Selection Width"
 msgstr ""
 
-#: src/gui.c:842 src/multitrack.c:6409
+#: src/gui.c:841 src/multitrack.c:6591
 msgid "_Play"
 msgstr "_Odtwarzanie"
 
-#: src/gui.c:854
+#: src/gui.c:853
 msgid "_Play All"
 msgstr ""
 
-#: src/gui.c:869
+#: src/gui.c:868
 msgid "Pla_y Selection"
 msgstr ""
 
-#: src/gui.c:877
+#: src/gui.c:876
 msgid "Play _Clipboard"
 msgstr ""
 
-#: src/gui.c:899 src/multitrack.c:6441
+#: src/gui.c:898 src/multitrack.c:6623
 msgid "_Stop"
 msgstr "_Zatrzymaj"
 
-#: src/gui.c:914 src/multitrack.c:6453
+#: src/gui.c:913 src/multitrack.c:6635
 msgid "Re_wind"
 msgstr ""
 
-#: src/gui.c:946 src/multitrack.c:6471
+#: src/gui.c:945 src/multitrack.c:6653
 msgid "_Full Screen"
 msgstr "_Pełny ekran"
 
-#: src/gui.c:955
+#: src/gui.c:954
 msgid "_Double Size"
 msgstr ""
 
-#: src/gui.c:963 src/multitrack.c:6479
+#: src/gui.c:962 src/multitrack.c:6661
 msgid "Play in _Separate Window"
 msgstr ""
 
-#: src/gui.c:972
+#: src/gui.c:971
 msgid "_Blank Background"
 msgstr ""
 
-#: src/gui.c:979
+#: src/gui.c:978
 msgid "(Auto)_loop Video (to fit audio track)"
 msgstr ""
 
-#: src/gui.c:988 src/multitrack.c:6487
+#: src/gui.c:987 src/multitrack.c:6669
 msgid "L_oop Continuously"
 msgstr ""
 
-#: src/gui.c:997
+#: src/gui.c:996
 msgid "Pin_g Pong Loops"
 msgstr ""
 
-#: src/gui.c:1005 src/multitrack.c:6495
+#: src/gui.c:1004 src/multitrack.c:6677
 msgid "_Mute"
 msgstr "_Wyciszenie"
 
-#: src/gui.c:1017
+#: src/gui.c:1016
 msgid "Separate Window 'S_ticky' Mode"
 msgstr ""
 
-#: src/gui.c:1025
+#: src/gui.c:1024
 msgid "S_how Frame Counter"
 msgstr ""
 
-#: src/gui.c:1035
+#: src/gui.c:1034
 msgid "Show Subtitles"
 msgstr ""
 
-#: src/gui.c:1045
+#: src/gui.c:1044
 msgid "Letterbox mode"
 msgstr ""
 
-#: src/gui.c:1051 src/multitrack.c:6507
+#: src/gui.c:1050 src/multitrack.c:6689
 msgid "Effect_s"
 msgstr ""
 
-#: src/gui.c:1054
+#: src/gui.c:1053
 msgid "Effects are applied to the current selection."
 msgstr ""
 
-#: src/gui.c:1067
+#: src/gui.c:1066
 msgid "_Run Test Rendered Effect/Tool/Generator..."
 msgstr ""
 
-#: src/gui.c:1072 src/multitrack.c:7123
+#: src/gui.c:1071 src/multitrack.c:7299
 msgid "_Tools"
 msgstr "_Narzędzia"
 
-#: src/gui.c:1075
+#: src/gui.c:1074
 msgid "Tools are applied to complete clips."
 msgstr ""
 
-#: src/gui.c:1085
+#: src/gui.c:1084
 msgid "_Reverse Clipboard"
 msgstr ""
 
-#: src/gui.c:1094
+#: src/gui.c:1093
 msgid "_Change Playback/Save Speed..."
 msgstr ""
 
-#: src/gui.c:1099
+#: src/gui.c:1098
 msgid "Resample _Video to New Frame Rate..."
 msgstr ""
 
-#: src/gui.c:1105
+#: src/gui.c:1104
 msgid "_Utilities"
 msgstr "_Narzędzia"
 
-#: src/gui.c:1110
+#: src/gui.c:1109
 msgid "Custom _Tools"
 msgstr ""
 
-#: src/gui.c:1116 src/multitrack.c:7149
+#: src/gui.c:1115 src/multitrack.c:7325
 msgid "_Generate"
 msgstr "_Generuj"
 
-#: src/gui.c:1126
+#: src/gui.c:1125
 msgid "Loading rendered effect plugins..."
 msgstr ""
 
-#: src/gui.c:1139
+#: src/gui.c:1138
 msgid "Load _Subtitles from File..."
 msgstr ""
 
-#: src/gui.c:1144
+#: src/gui.c:1143
 msgid "Erase subtitles"
 msgstr ""
 
-#: src/gui.c:1152 src/multitrack.c:7158
+#: src/gui.c:1151 src/multitrack.c:7334
 msgid "Capture _External Window... "
 msgstr ""
 
-#: src/gui.c:1159 src/multitrack.c:7173
+#: src/gui.c:1158 src/multitrack.c:7349
 msgid "_Preferences..."
 msgstr "_Preferencje..."
 
-#: src/gui.c:1172
+#: src/gui.c:1171
 msgid "_Audio"
 msgstr "_Dźwięk"
 
-#: src/gui.c:1184
+#: src/gui.c:1183
 msgid "Load _New Audio for Clip..."
 msgstr ""
 
-#: src/gui.c:1190
+#: src/gui.c:1189
 msgid "Load _CD Track..."
 msgstr ""
 
-#: src/gui.c:1191
+#: src/gui.c:1190
 msgid "E_ject CD"
 msgstr ""
 
-#: src/gui.c:1205
+#: src/gui.c:1204
 msgid "Record E_xternal Audio..."
 msgstr ""
 
-#: src/gui.c:1218
+#: src/gui.c:1217
 msgid "to New _Clip..."
 msgstr ""
 
-#: src/gui.c:1222
+#: src/gui.c:1221
 msgid "to _Selection"
 msgstr ""
 
-#: src/gui.c:1230
+#: src/gui.c:1229
 msgid "Fade Audio _In..."
 msgstr ""
 
-#: src/gui.c:1234
+#: src/gui.c:1233
 msgid "Fade Audio _Out..."
 msgstr ""
 
-#: src/gui.c:1244
+#: src/gui.c:1243
 msgid "_Export Audio..."
 msgstr ""
 
-#: src/gui.c:1257
+#: src/gui.c:1256
 msgid "Export _Selected Audio..."
 msgstr ""
 
-#: src/gui.c:1261
+#: src/gui.c:1260
 msgid "Export _All Audio..."
 msgstr ""
 
-#: src/gui.c:1265
+#: src/gui.c:1264
 msgid "_Append Audio..."
 msgstr ""
 
-#: src/gui.c:1270
+#: src/gui.c:1269
 msgid "_Trim/Pad Audio..."
 msgstr ""
 
-#: src/gui.c:1283
+#: src/gui.c:1282
 msgid "Trim/Pad Audio to _Selection"
 msgstr ""
 
-#: src/gui.c:1288
+#: src/gui.c:1287
 msgid "Trim/Pad Audio from Beginning to _Play Start"
 msgstr ""
 
-#: src/gui.c:1293
+#: src/gui.c:1292
 msgid "_Delete Audio..."
 msgstr ""
 
-#: src/gui.c:1306
+#: src/gui.c:1305
 msgid "Delete _Selected Audio"
 msgstr ""
 
-#: src/gui.c:1310
+#: src/gui.c:1309
 msgid "Delete _All Audio"
 msgstr ""
 
-#: src/gui.c:1314
+#: src/gui.c:1313
 msgid "Insert _Silence in Selection"
 msgstr ""
 
-#: src/gui.c:1319
+#: src/gui.c:1318
 msgid "_Resample Audio..."
 msgstr ""
 
-#: src/gui.c:1324
+#: src/gui.c:1323
 msgid "_Info"
 msgstr "_Informacje"
 
-#: src/gui.c:1336
+#: src/gui.c:1335
 msgid "Show Clip _Info"
 msgstr ""
 
-#: src/gui.c:1344
+#: src/gui.c:1343
 msgid "Show/_Edit File Comments"
 msgstr ""
 
-#: src/gui.c:1349
+#: src/gui.c:1348
 msgid "Show _Clipboard Info"
 msgstr ""
 
-#: src/gui.c:1360 src/multitrack.c:7286
+#: src/gui.c:1359 src/multitrack.c:7462
 msgid "Show _Messages"
 msgstr ""
 
-#: src/gui.c:1364 src/multitrack.c:7365
+#: src/gui.c:1363 src/multitrack.c:7541
 msgid "Show _Layout Errors"
 msgstr ""
 
-#: src/gui.c:1369 src/multitrack.c:7263
+#: src/gui.c:1368 src/multitrack.c:7439
 msgid "_Clips"
 msgstr ""
 
-#: src/gui.c:1381
+#: src/gui.c:1380
 msgid "_Rename Current Clip in Menu..."
 msgstr ""
 
-#: src/gui.c:1399
+#: src/gui.c:1398
 msgid "A_dvanced"
 msgstr "_Zaawansowane"
 
-#: src/gui.c:1412
+#: src/gui.c:1411
 msgid "_RFX Effects/Tools/Utilities"
 msgstr ""
 
-#: src/gui.c:1424
+#: src/gui.c:1423
 msgid "_New Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1428
+#: src/gui.c:1427
 msgid "_Copy RFX Script to Test..."
 msgstr ""
 
-#: src/gui.c:1432
+#: src/gui.c:1431
 msgid "_Edit Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1436
+#: src/gui.c:1435
 msgid "Rena_me Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1440
+#: src/gui.c:1439
 msgid "_Delete Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1450
+#: src/gui.c:1449
 msgid "_Promote Test Rendered Effect/Tool/Generator..."
 msgstr ""
 
-#: src/gui.c:1457
+#: src/gui.c:1456
 msgid "_Import Custom RFX script..."
 msgstr ""
 
-#: src/gui.c:1461
+#: src/gui.c:1460
 msgid "E_xport Custom RFX script..."
 msgstr ""
 
-#: src/gui.c:1465
+#: src/gui.c:1464
 msgid "De_lete Custom RFX Script..."
 msgstr ""
 
-#: src/gui.c:1472
+#: src/gui.c:1471
 msgid "Re_build all RFX plugins"
 msgstr ""
 
-#: src/gui.c:1501
+#: src/gui.c:1498
 msgid "Receive _LiVES stream from..."
 msgstr ""
 
-#: src/gui.c:1506
+#: src/gui.c:1503
 msgid "_Send LiVES stream to..."
 msgstr ""
 
-#: src/gui.c:1515
+#: src/gui.c:1512
 #, c-format
 msgid "Open _yuv4mpeg stream on %sstream.yuv..."
 msgstr ""
 
-#: src/gui.c:1536
+#: src/gui.c:1534
 msgid "_Import Project (.lv2)..."
 msgstr ""
 
-#: src/gui.c:1540
+#: src/gui.c:1538
 msgid "E_xport Project (.lv2)..."
 msgstr ""
 
-#: src/gui.c:1545
+#: src/gui.c:1543
 msgid "_VJ"
 msgstr "_VJ"
 
-#: src/gui.c:1557
+#: src/gui.c:1555
 msgid "Real Time _Effect Mapping"
 msgstr ""
 
-#: src/gui.c:1563
+#: src/gui.c:1561
 msgid "Bind real time effects to ctrl-number keys."
 msgstr ""
 
-#: src/gui.c:1565
+#: src/gui.c:1563
 msgid "Set Real Time Effect _Defaults"
 msgstr ""
 
-#: src/gui.c:1567
+#: src/gui.c:1565
 msgid "Set default parameter values for real time effects."
 msgstr ""
 
-#: src/gui.c:1580
+#: src/gui.c:1578
 msgid "Save Real Time Effect _Defaults"
 msgstr ""
 
-#: src/gui.c:1583
+#: src/gui.c:1581
 msgid ""
 "Save real time effect defaults so they will be restored each time you use "
 "LiVES."
 msgstr ""
 
-#: src/gui.c:1589
+#: src/gui.c:1587
 msgid "_Reset all playback speeds and positions"
 msgstr ""
 
-#: src/gui.c:1592
+#: src/gui.c:1590
 msgid ""
 "Reset all playback positions to frame 1, and reset all playback frame rates."
 msgstr ""
 
-#: src/gui.c:1594
+#: src/gui.c:1592
 msgid "_MIDI/joystick interface"
 msgstr ""
 
-#: src/gui.c:1609
+#: src/gui.c:1607
 msgid "_MIDI/joystick learner..."
 msgstr ""
 
-#: src/gui.c:1614
+#: src/gui.c:1612
 msgid "_Save device mapping..."
 msgstr ""
 
-#: src/gui.c:1620
+#: src/gui.c:1618
 msgid "_Load device mapping..."
 msgstr ""
 
-#: src/gui.c:1628
+#: src/gui.c:1626
 msgid "Show VJ _Keys"
 msgstr ""
 
-#: src/gui.c:1632
+#: src/gui.c:1630
 msgid "To_ys"
 msgstr "Za_bawki"
 
-#: src/gui.c:1644
+#: src/gui.c:1642
 msgid "_None"
 msgstr "_Brak"
 
-#: src/gui.c:1652
+#: src/gui.c:1650
 msgid "_Autolives"
 msgstr ""
 
-#: src/gui.c:1657
+#: src/gui.c:1655
 msgid "_Mad Frames"
 msgstr ""
 
-#: src/gui.c:1662
+#: src/gui.c:1660
 msgid "_LiVES TV (broadband)"
 msgstr ""
 
-#: src/gui.c:1672 src/multitrack.c:7387
+#: src/gui.c:1670 src/multitrack.c:7563
 msgid "_Help"
 msgstr "_Pomoc"
 
-#: src/gui.c:1684 src/multitrack.c:7407
+#: src/gui.c:1682 src/multitrack.c:7583
 msgid "_Manual (opens in browser)"
 msgstr ""
 
-#: src/gui.c:1691 src/multitrack.c:7416
+#: src/gui.c:1689 src/multitrack.c:7592
 msgid "_Donate to the project !"
 msgstr ""
 
-#: src/gui.c:1695 src/multitrack.c:7420
+#: src/gui.c:1693 src/multitrack.c:7596
 msgid "_Email the author"
 msgstr ""
 
-#: src/gui.c:1699 src/multitrack.c:7424
+#: src/gui.c:1697 src/multitrack.c:7600
 msgid "Report a _bug"
 msgstr ""
 
-#: src/gui.c:1703 src/multitrack.c:7428
+#: src/gui.c:1701 src/multitrack.c:7604
 msgid "Suggest a _feature"
 msgstr ""
 
-#: src/gui.c:1707 src/multitrack.c:7432
+#: src/gui.c:1705 src/multitrack.c:7608
 msgid "Assist with _translating"
 msgstr ""
 
-#: src/gui.c:1714 src/multitrack.c:7439
+#: src/gui.c:1712 src/multitrack.c:7615
 msgid "_Troubleshoot"
 msgstr ""
 
-#: src/gui.c:1718 src/multitrack.c:7443
+#: src/gui.c:1716 src/multitrack.c:7619
 msgid "_About"
 msgstr "_Adnotacje o programie"
 
-#: src/gui.c:1752
+#: src/gui.c:1750
 msgid "Rewind to start (w)"
 msgstr ""
 
-#: src/gui.c:1760 src/multitrack.c:16720
+#: src/gui.c:1758 src/multitrack.c:17010
 msgid "Play all (p)"
 msgstr ""
 
-#: src/gui.c:1768 src/gui.c:1877
+#: src/gui.c:1766 src/gui.c:1876
 msgid "Stop playback (q)"
 msgstr ""
 
-#: src/gui.c:1779
+#: src/gui.c:1777
 msgid "Play selection (y)"
 msgstr ""
 
-#: src/gui.c:1832
+#: src/gui.c:1829
 msgid "Volume"
 msgstr "Głośność"
 
-#: src/gui.c:1854
+#: src/gui.c:1853
 msgid "Audio volume (1.00)"
 msgstr ""
 
-#: src/gui.c:1883
+#: src/gui.c:1882
 msgid "Unblank background (b)"
 msgstr ""
 
-#: src/gui.c:1929
+#: src/gui.c:1928
 msgid "Play slower (ctrl-down)"
 msgstr ""
 
-#: src/gui.c:1935
+#: src/gui.c:1934
 msgid "Play faster (ctrl-up)"
 msgstr ""
 
-#: src/gui.c:1942
+#: src/gui.c:1941
 msgid "Skip back (ctrl-left)"
 msgstr ""
 
-#: src/gui.c:1948
+#: src/gui.c:1947
 msgid "Skip forward (ctrl-right)"
 msgstr ""
 
-#: src/gui.c:1954
+#: src/gui.c:1953
 msgid "Show clip info (i)"
 msgstr ""
 
-#: src/gui.c:1960
+#: src/gui.c:1959
 msgid "Hide this toolbar"
 msgstr ""
 
-#: src/gui.c:1962
+#: src/gui.c:1961
 msgid ""
 "Press \"s\" to toggle separate play window for improved performance, \"q\" "
 "to stop."
 msgstr ""
 
 #. TRANSLATORS: please keep the translated string the same length
-#: src/gui.c:1995
+#: src/gui.c:1994
 msgid "     Video playback speed (frames per second)        "
 msgstr ""
 
-#: src/gui.c:2009
+#: src/gui.c:2008
 msgid "Vary the video speed"
 msgstr ""
 
-#: src/gui.c:2092 src/gui.c:3218
+#: src/gui.c:2090 src/gui.c:3329
 msgid "First Frame"
 msgstr "Pierwsza klatka"
 
-#: src/gui.c:2193 src/gui.c:3226
+#: src/gui.c:2191 src/gui.c:3336
 msgid "Last Frame"
 msgstr "Ostatnia klatka"
 
-#: src/gui.c:2210
+#: src/gui.c:2208
 msgid "The first selected frame in this clip"
 msgstr ""
 
-#: src/gui.c:2248
+#: src/gui.c:2246
 msgid "The last selected frame in this clip"
 msgstr ""
 
-#: src/gui.c:2532
+#: src/gui.c:2546
 msgid "Starting...\n"
 msgstr ""
 
-#: src/gui.c:3074
+#: src/gui.c:3181
 msgid "    Press 'q' to stop recording.  DO NOT COVER THE PLAY WINDOW !   "
 msgstr ""
 
-#: src/gui.c:3521
+#: src/gui.c:3643
 msgid "Frame number to preview"
 msgstr ""
 
-#: src/gui.c:3538
+#: src/gui.c:3660
 msgid "_Free"
 msgstr "_Darmowe"
 
-#: src/gui.c:3539
+#: src/gui.c:3661
 msgid "Free choice of frame number"
 msgstr ""
 
-#: src/gui.c:3543
+#: src/gui.c:3666
 msgid "_Start"
 msgstr "_Uruchom"
 
-#: src/gui.c:3544
+#: src/gui.c:3667
 msgid "Frame number is linked to start frame"
 msgstr ""
 
-#: src/gui.c:3551
+#: src/gui.c:3675
 msgid "_End"
 msgstr ""
 
-#: src/gui.c:3552
+#: src/gui.c:3676
 msgid "Frame number is linked to end frame"
 msgstr ""
 
-#: src/gui.c:3559
+#: src/gui.c:3684
 msgid "_Pointer"
 msgstr ""
 
-#: src/gui.c:3560
+#: src/gui.c:3685
 msgid "Frame number is linked to playback pointer"
 msgstr ""
 
-#: src/gui.c:3581
+#: src/gui.c:3707
 msgid "Rewind"
 msgstr "Przewiń"
 
-#: src/gui.c:3592 src/dialogs.c:894 src/dialogs.c:896 src/dialogs.c:1817
-#: src/dialogs.c:1819
+#: src/gui.c:3718 src/dialogs.c:960 src/dialogs.c:962 src/dialogs.c:1873
+#: src/dialogs.c:1875
 msgid "Play all"
 msgstr "Odtwórz wszystko"
 
-#: src/gui.c:3605
+#: src/gui.c:3731
 msgid "Play Selection"
 msgstr ""
 
-#: src/gui.c:3619
+#: src/gui.c:3745
 msgid "Loop On/Off"
 msgstr ""
 
-#: src/gui.c:3693
+#: src/gui.c:3819
 msgid "Start _recording"
 msgstr ""
 
-#: src/gui.c:3698
+#: src/gui.c:3824
 msgid "Stop _recording"
 msgstr ""
 
-#: src/gui.c:3703
+#: src/gui.c:3829
 msgid "_Record Performance"
 msgstr ""
 
-#: src/gui.c:3851
+#: src/gui.c:3974
 msgid "Hide Play Window"
 msgstr ""
 
-#: src/gui.c:4232
+#: src/gui.c:4333
 msgid "Show Play Window"
 msgstr ""
 
-#: src/ce_thumbs.c:222
+#: src/ce_thumbs.c:242
 #, c-format
 msgid "Mapped to ctrl-%d"
 msgstr ""
 
-#: src/ce_thumbs.c:276 src/effects.c:85 src/preferences.c:3195
+#: src/ce_thumbs.c:296 src/effects.c:86 src/preferences.c:3247
 msgid "Effects"
 msgstr "Efekty"
 
-#: src/ce_thumbs.c:279 src/multitrack.c:5615
+#: src/ce_thumbs.c:299 src/multitrack.c:5791
 msgid "Clips"
 msgstr ""
 
-#: src/ce_thumbs.c:303
+#: src/ce_thumbs.c:323
 #, c-format
 msgid "Show / apply effects to %s\n"
 msgstr ""
 
-#: src/ce_thumbs.c:315
+#: src/ce_thumbs.c:335
 #, c-format
 msgid "Select clip for %s\n"
 msgstr ""
 
-#: src/ce_thumbs.c:515
+#: src/ce_thumbs.c:536
 msgid "_Pin"
 msgstr ""
 
-#: src/ce_thumbs.c:515
+#: src/ce_thumbs.c:537
 msgid "Pin the parameter box to the window"
 msgstr ""
 
 #. TRANSLATORS: Exabytes
-#: src/utils.c:794
+#: src/utils.c:800
 #, c-format
 msgid "%.2f EB"
 msgstr ""
 
 #. TRANSLATORS: Petabytes
-#: src/utils.c:798
+#: src/utils.c:803
 #, c-format
 msgid "%.2f PB"
 msgstr ""
 
 #. TRANSLATORS: Terabytes
-#: src/utils.c:802
+#: src/utils.c:806
 #, c-format
 msgid "%.2f TB"
 msgstr ""
 
 #. TRANSLATORS: Gigabytes
-#: src/utils.c:806
+#: src/utils.c:809
 #, c-format
 msgid "%.2f GB"
 msgstr ""
 
 #. TRANSLATORS: Megabytes
-#: src/utils.c:810
+#: src/utils.c:812
 #, c-format
 msgid "%.2f MB"
 msgstr ""
 
 #. TRANSLATORS: Kilobytes (1024 bytes)
-#: src/utils.c:814
+#: src/utils.c:815
 #, c-format
 msgid "%.2f KiB"
 msgstr ""
@@ -3609,7 +3599,7 @@
 msgid "%d bytes"
 msgstr ""
 
-#: src/utils.c:1841
+#: src/utils.c:1835
 msgid "Clearing the clipboard"
 msgstr ""
 
@@ -3621,81 +3611,81 @@
 "Switched to clip %s\n"
 msgstr ""
 
-#: src/utils.c:1880
+#: src/utils.c:1877
 msgid ""
 "\n"
 "==============================\n"
 "Switched to empty clip\n"
 msgstr ""
 
-#: src/utils.c:1917
+#: src/utils.c:1916
 msgid "(blank)"
 msgstr ""
 
-#: src/utils.c:1920
+#: src/utils.c:1919
 #, c-format
 msgid ""
 "The set name has been changed from %s to %s. Affected layouts have been "
 "updated accordingly\n"
 msgstr ""
 
-#: src/utils.c:1928
+#: src/utils.c:1927
 #, c-format
 msgid ""
 "The clip %s is missing from this set.\n"
 "It is required by the following layouts:\n"
 msgstr ""
 
-#: src/utils.c:1932
+#: src/utils.c:1931
 #, c-format
 msgid ""
 "The clip %s has been closed.\n"
 "It is required by the following layouts:\n"
 msgstr ""
 
-#: src/utils.c:1937
+#: src/utils.c:1936
 #, c-format
 msgid ""
 "Frames have been shifted in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1942
+#: src/utils.c:1941
 #, c-format
 msgid ""
 "Frames have been deleted from the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1947
+#: src/utils.c:1946
 #, c-format
 msgid ""
 "Audio has been deleted from the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1952
+#: src/utils.c:1951
 #, c-format
 msgid ""
 "Audio has been shifted in clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1957
+#: src/utils.c:1956
 #, c-format
 msgid ""
 "Audio has been altered in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1962
+#: src/utils.c:1961
 #, c-format
 msgid ""
 "Frames have been altered in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:2135
+#: src/utils.c:2134
 #, c-format
 msgid ""
 "Set %s\n"
@@ -3703,7 +3693,7 @@
 "by another copy of LiVES.\n"
 msgstr ""
 
-#: src/utils.c:2142
+#: src/utils.c:2140
 #, c-format
 msgid ""
 "\n"
@@ -3749,67 +3739,67 @@
 msgid "Removing layout %s\n"
 msgstr ""
 
-#: src/utils.c:3014
+#: src/utils.c:2996
 msgid "Video [opening...]"
 msgstr ""
 
-#: src/utils.c:3018
+#: src/utils.c:2999
 #, c-format
 msgid "Video [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:3022
+#: src/utils.c:3002
 msgid "(Undefined)"
 msgstr ""
 
-#: src/utils.c:3025
+#: src/utils.c:3004
 msgid "(No video)"
 msgstr ""
 
-#: src/utils.c:3032
+#: src/utils.c:3011
 msgid "(No audio)"
 msgstr ""
 
-#: src/utils.c:3037
+#: src/utils.c:3015
 msgid "Mono  [opening...]"
 msgstr ""
 
-#: src/utils.c:3040
+#: src/utils.c:3017
 msgid "Left Audio [opening...]"
 msgstr ""
 
-#: src/utils.c:3045
+#: src/utils.c:3021
 #, c-format
 msgid "Mono [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:3048
+#: src/utils.c:3023
 #, c-format
 msgid "Left Audio [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:3056
+#: src/utils.c:3031
 msgid "Right Audio [opening...]"
 msgstr ""
 
-#: src/utils.c:3059
+#: src/utils.c:3033
 #, c-format
 msgid "Right Audio [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:3506
+#: src/utils.c:3472
 msgid "LiVES cannot switch to mplayer whilst clips are loading."
 msgstr ""
 
-#: src/utils.c:3559
+#: src/utils.c:3525
 msgid "LiVES cannot switch to mplayer2 whilst clips are loading."
 msgstr ""
 
-#: src/utils.c:3809
+#: src/utils.c:3775
 msgid "Cleaning up clip"
 msgstr ""
 
-#: src/utils.c:3913
+#: src/utils.c:3874
 #, c-format
 msgid ""
 "\n"
@@ -3819,30 +3809,29 @@
 "Overwrite ?\n"
 msgstr ""
 
-#: src/utils.c:4305 src/utils.c:4337 src/multitrack.c:4503
+#: src/utils.c:4250 src/utils.c:4280 src/multitrack.c:4672
 #, c-format
 msgid "_Undo %s"
 msgstr "_Cofnij %s"
 
-#: src/utils.c:4306 src/utils.c:4338 src/multitrack.c:4525
+#: src/utils.c:4251 src/utils.c:4281 src/multitrack.c:4693
 #, c-format
 msgid "_Redo %s"
 msgstr "_Ponów %s"
 
-#: src/utils.c:4363
+#: src/utils.c:4305
 msgid "-------------Selection------------"
 msgstr ""
 
-#. TRANSLATORS: - try to keep the text of the middle part the same length, by deleting "-" if necessary
-#: src/utils.c:4371
+#: src/utils.c:4313
 msgid " sec ] ----------Selection---------- [ "
 msgstr ""
 
-#: src/utils.c:4371
+#: src/utils.c:4314
 msgid " frames ] ----------"
 msgstr ""
 
-#: src/utils.c:5360
+#: src/utils.c:5302
 msgid ""
 "Your version of mplayer/ffmpeg may be broken !\n"
 "See http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2071\n"
@@ -3853,11 +3842,11 @@
 "Try running Help/Troubleshoot for more information."
 msgstr ""
 
-#: src/saveplay.c:178
+#: src/saveplay.c:179
 msgid "Examining file header"
 msgstr ""
 
-#: src/saveplay.c:315 src/saveplay.c:789
+#: src/saveplay.c:316 src/saveplay.c:779
 #, c-format
 msgid "Opening %s"
 msgstr "Otwieranie %s"
@@ -3867,36 +3856,36 @@
 msgid "Opening %s start time %.2f sec. frames %d"
 msgstr ""
 
-#: src/saveplay.c:326 src/saveplay.c:4001
+#: src/saveplay.c:326 src/saveplay.c:3927
 msgid " without sound"
 msgstr ""
 
-#: src/saveplay.c:396
+#: src/saveplay.c:395
 #, c-format
 msgid "Opening audio for %s"
 msgstr ""
 
-#: src/saveplay.c:557
+#: src/saveplay.c:554
 #, c-format
 msgid "Auto trimming %.2f seconds of audio at start..."
 msgstr ""
 
-#: src/saveplay.c:567
+#: src/saveplay.c:562
 #, c-format
 msgid "Auto trimming %.2f seconds of audio at end..."
 msgstr ""
 
-#: src/saveplay.c:584
+#: src/saveplay.c:577
 #, c-format
 msgid "Auto padding with %.2f seconds of silence at start..."
 msgstr ""
 
-#: src/saveplay.c:599
+#: src/saveplay.c:590
 #, c-format
 msgid "Auto padding with %.2f seconds of silence at end..."
 msgstr ""
 
-#: src/saveplay.c:671
+#: src/saveplay.c:661
 #, c-format
 msgid ""
 "\n"
@@ -3908,11 +3897,11 @@
 "Are you sure you wish to continue ?"
 msgstr ""
 
-#: src/saveplay.c:685
+#: src/saveplay.c:676
 msgid " - please be patient."
 msgstr ""
 
-#: src/saveplay.c:938
+#: src/saveplay.c:926
 msgid ""
 "\n"
 "\n"
@@ -3920,14 +3909,14 @@
 "Please check the terminal window for more details.\n"
 msgstr ""
 
-#: src/saveplay.c:940
+#: src/saveplay.c:928
 msgid ""
 "\n"
 "\n"
 "You may need to install mplayer to open this file.\n"
 msgstr ""
 
-#: src/saveplay.c:948
+#: src/saveplay.c:934
 msgid ""
 "\n"
 "\n"
@@ -3935,29 +3924,29 @@
 "Tools|Preferences|Decoding\n"
 msgstr ""
 
-#: src/saveplay.c:1014
+#: src/saveplay.c:995
 msgid "Adding image..."
 msgstr ""
 
-#: src/saveplay.c:1108
+#: src/saveplay.c:1089
 #, c-format
 msgid "Subtitles were saved as %s\n"
 msgstr ""
 
-#: src/saveplay.c:1192
+#: src/saveplay.c:1171
 #, c-format
 msgid "LiVES: Save Frame %d as..."
 msgstr ""
 
-#: src/saveplay.c:1195
+#: src/saveplay.c:1174
 msgid "LiVES: Save Frame as..."
 msgstr ""
 
-#: src/saveplay.c:1322
+#: src/saveplay.c:1303
 msgid "LiVES: Save Clip as..."
 msgstr ""
 
-#: src/saveplay.c:1390
+#: src/saveplay.c:1369
 msgid ""
 "Saving your video could lead to a loss of quality !\n"
 "You are strongly advised to 'Save As' to a new file.\n"
@@ -3965,67 +3954,67 @@
 "Do you still wish to continue ?"
 msgstr ""
 
-#: src/saveplay.c:1517 src/saveplay.c:1683 src/saveplay.c:1762
-#: src/saveplay.c:4014
+#: src/saveplay.c:1494 src/saveplay.c:1659 src/saveplay.c:1738
+#: src/saveplay.c:3940
 msgid "Pulling frames from clip"
 msgstr ""
 
-#: src/saveplay.c:1588 src/saveplay.c:1727
+#: src/saveplay.c:1565 src/saveplay.c:1703
 msgid "Linking selection"
 msgstr ""
 
-#: src/saveplay.c:1779
+#: src/saveplay.c:1755
 msgid " (with no sound)\n"
 msgstr ""
 
-#: src/saveplay.c:1786
+#: src/saveplay.c:1761
 #, c-format
 msgid "Saving frames %d to %d%s as \"%s\" : encoder = %s : format = %s..."
 msgstr ""
 
-#: src/saveplay.c:1790
+#: src/saveplay.c:1765
 #, c-format
 msgid "Saving frames 1 to %d%s as \"%s\" : encoder %s : format = %s..."
 msgstr ""
 
-#: src/saveplay.c:1909
+#: src/saveplay.c:1890
 msgid "Saving [can take a long time]"
 msgstr ""
 
-#: src/saveplay.c:2057
+#: src/saveplay.c:2044
 msgid ""
 "\n"
 "\n"
 "Encoder error - output file was not created !\n"
 msgstr ""
 
-#: src/saveplay.c:2094
+#: src/saveplay.c:2081
 msgid "Clearing letterbox"
 msgstr ""
 
-#: src/saveplay.c:2183
+#: src/saveplay.c:2168
 #, c-format
 msgid "File size was %s\n"
 msgstr ""
 
-#: src/saveplay.c:2284
+#: src/saveplay.c:2265
 msgid "recording aborted by preview.\n"
 msgstr ""
 
-#: src/saveplay.c:2288
+#: src/saveplay.c:2268
 msgid "recording aborted by clipboard playback.\n"
 msgstr ""
 
-#: src/saveplay.c:2291
+#: src/saveplay.c:2270
 msgid "Recording performance..."
 msgstr ""
 
-#: src/saveplay.c:3293
+#: src/saveplay.c:3251
 #, c-format
 msgid "Average FPS was %.4f\n"
 msgstr ""
 
-#: src/saveplay.c:3299
+#: src/saveplay.c:3256
 msgid ""
 "\n"
 "\n"
@@ -4034,16 +4023,21 @@
 "and resize all frames to the current size.\n"
 msgstr ""
 
-#: src/saveplay.c:3479
+#: src/saveplay.c:3429
 msgid "Unknown"
 msgstr "Nieznane"
 
-#: src/saveplay.c:3588 src/saveplay.c:4585
+#: src/saveplay.c:3538 src/saveplay.c:4502
 #, c-format
 msgid "Untitled%d"
 msgstr "Dokument_%d"
 
-#: src/saveplay.c:3633
+#: src/saveplay.c:3567
+#, c-format
+msgid "%d frames are enough !\n"
+msgstr ""
+
+#: src/saveplay.c:3579
 #, c-format
 msgid ""
 "\n"
@@ -4051,7 +4045,7 @@
 "Bad things may happen with this clip.\n"
 msgstr ""
 
-#: src/saveplay.c:3723
+#: src/saveplay.c:3667
 #, c-format
 msgid ""
 "\n"
@@ -4059,73 +4053,73 @@
 "Default can be set in Tools | Preferences | Misc.\n"
 msgstr ""
 
-#: src/saveplay.c:3735
+#: src/saveplay.c:3677
 #, c-format
 msgid "Playback speed was adjusted to %.3f frames per second to fit audio.\n"
 msgstr ""
 
-#: src/saveplay.c:3754
+#: src/saveplay.c:3694
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d *bpp=Greyscale* fps=%.3f\n"
 "Audio:"
 msgstr ""
 
-#: src/saveplay.c:3758 src/saveplay.c:4762
+#: src/saveplay.c:3698 src/saveplay.c:4671
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d bpp=%d fps=%.3f\n"
 "Audio:"
 msgstr ""
 
-#: src/saveplay.c:3762 src/saveplay.c:4766
+#: src/saveplay.c:3703 src/saveplay.c:4676
 #, c-format
 msgid "%s none\n"
 msgstr ""
 
-#: src/saveplay.c:3774
+#: src/saveplay.c:3714
 #, fuzzy, c-format
 msgid " - Author: %s\n"
 msgstr "Autor: %s"
 
-#: src/saveplay.c:3779
+#: src/saveplay.c:3717
 #, c-format
 msgid " - Title: %s\n"
 msgstr ""
 
-#: src/saveplay.c:3784
+#: src/saveplay.c:3720
 #, c-format
 msgid " - Comment: %s\n"
 msgstr ""
 
-#: src/saveplay.c:3897
+#: src/saveplay.c:3829
 #, c-format
 msgid "Saving frame %d as %s..."
 msgstr ""
 
-#: src/saveplay.c:3996
+#: src/saveplay.c:3924
 #, c-format
 msgid "Backing up %s to %s"
 msgstr ""
 
-#: src/saveplay.c:4049
+#: src/saveplay.c:3975
 msgid "Backing up"
 msgstr ""
 
-#: src/saveplay.c:4083
+#: src/saveplay.c:4009
 msgid "performance data was backed up..."
 msgstr ""
 
-#: src/saveplay.c:4661
+#: src/saveplay.c:4574
 #, c-format
 msgid "Restoring %s..."
 msgstr ""
 
-#: src/saveplay.c:4692
+#: src/saveplay.c:4603
 msgid "Restoring"
 msgstr "Przywracanie"
 
-#: src/saveplay.c:4714
+#: src/saveplay.c:4625
 #, c-format
 msgid ""
 "\n"
@@ -4135,22 +4129,22 @@
 msgstr ""
 
 #. TRANSLATORS: rec(ord) %.2f M(ega)B(ytes)
-#: src/saveplay.c:5207
+#: src/saveplay.c:5118
 #, c-format
 msgid "rec %.2f MB"
 msgstr ""
 
-#: src/saveplay.c:5213
+#: src/saveplay.c:5123
 #, c-format
 msgid "!rec %.2f MB"
 msgstr ""
 
 #. TRANSLATORS: rec(ord) ?? M(ega)B(ytes)
-#: src/saveplay.c:5216
+#: src/saveplay.c:5126
 msgid "rec ?? MB"
 msgstr ""
 
-#: src/saveplay.c:5241
+#: src/saveplay.c:5151
 #, c-format
 msgid ""
 "\n"
@@ -4158,54 +4152,74 @@
 "Record stop level can be set in Preferences.\n"
 msgstr ""
 
-#: src/saveplay.c:5535
+#: src/saveplay.c:5447
 msgid ""
 "\n"
 "Files from a previous run of LiVES were found.\n"
 "Do you want to attempt to recover them ?\n"
 msgstr ""
 
-#: src/saveplay.c:5557
+#: src/saveplay.c:5469
 msgid "Recovering files"
 msgstr ""
 
-#: src/saveplay.c:5560
+#: src/saveplay.c:5472
 msgid "Recovering files..."
 msgstr ""
 
-#: src/dialogs.c:72
+#: src/dialogs.c:71
 msgid "Show affected _layouts"
 msgstr ""
 
-#: src/dialogs.c:128
+#: src/dialogs.c:113
+msgid ""
+"Do _not show this warning any more\n"
+"(can be turned back on from Preferences/Warnings)"
+msgstr ""
+
+#: src/dialogs.c:127
 msgid "_Recover disk space"
 msgstr ""
 
-#: src/dialogs.c:143
+#: src/dialogs.c:142
 msgid " _Advanced Settings >>"
 msgstr ""
 
-#: src/dialogs.c:184
+#: src/dialogs.c:183 src/dialogs.c:221
 msgid "LiVES: - Warning !"
 msgstr ""
 
 #: src/dialogs.c:194
+#, fuzzy
+msgid "LiVES: - Error !"
+msgstr "LiVES: - Wstaw"
+
+#: src/dialogs.c:204
+#, fuzzy
+msgid "LiVES: - Information"
+msgstr "LiVES: - Wstaw"
+
+#: src/dialogs.c:230
 msgid "LiVES: - Question"
 msgstr ""
 
-#: src/dialogs.c:204
+#: src/dialogs.c:239
 msgid "LiVES: - File Error"
 msgstr ""
 
-#: src/dialogs.c:208
+#: src/dialogs.c:241
 msgid "_Abort"
 msgstr ""
 
-#: src/dialogs.c:213
+#: src/dialogs.c:246
 msgid "_Retry"
 msgstr ""
 
-#: src/dialogs.c:597
+#: src/dialogs.c:306
+msgid "Show _Details"
+msgstr "Pokaż _szczegóły"
+
+#: src/dialogs.c:657
 #, c-format
 msgid ""
 "FREE SPACE IN THE PARTITION CONTAINING\n"
@@ -4216,7 +4230,7 @@
 "(Disk warning levels can be configured in Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:615
+#: src/dialogs.c:676
 #, c-format
 msgid ""
 "Free space in the partition containing\n"
@@ -4228,11 +4242,11 @@
 "Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:627
+#: src/dialogs.c:688
 msgid "Audio players cannot be switched during playback."
 msgstr ""
 
-#: src/dialogs.c:632
+#: src/dialogs.c:694
 msgid ""
 "\n"
 "\n"
@@ -4240,46 +4254,46 @@
 "Please try closing some other applications first.\n"
 msgstr ""
 
-#: src/dialogs.c:752
+#: src/dialogs.c:820
 msgid "Processing has been paused."
 msgstr ""
 
-#: src/dialogs.c:937
+#: src/dialogs.c:1002
 #, c-format
 msgid ""
 "\n"
 "%s%d%% done. Time remaining: %u sec%s\n"
 msgstr ""
 
-#: src/dialogs.c:1335
+#: src/dialogs.c:1391
 #, c-format
 msgid ""
 "\n"
 "%d/%d frames opened. Time remaining %u sec.\n"
 msgstr ""
 
-#: src/dialogs.c:1337
+#: src/dialogs.c:1393
 #, c-format
 msgid ""
 "\n"
 "%d/%d frames opened.\n"
 msgstr ""
 
-#: src/dialogs.c:1341
+#: src/dialogs.c:1396
 #, c-format
 msgid ""
 "\n"
 "%d frames opened.\n"
 msgstr ""
 
-#: src/dialogs.c:1940
+#: src/dialogs.c:1993
 #, c-format
 msgid ""
 "\n"
 "Time remaining: %d sec"
 msgstr ""
 
-#: src/dialogs.c:1988
+#: src/dialogs.c:2040
 #, c-format
 msgid ""
 "\n"
@@ -4287,7 +4301,7 @@
 "Please close a file and then try again."
 msgstr ""
 
-#: src/dialogs.c:1994
+#: src/dialogs.c:2047
 #, c-format
 msgid ""
 "LiVES was unable to write to its temporary directory.\n"
@@ -4299,27 +4313,27 @@
 "Please make sure you can write to this directory."
 msgstr ""
 
-#: src/dialogs.c:2005
+#: src/dialogs.c:2059
 msgid ""
 "\n"
 "LiVES currently requires either 'mplayer', 'mplayer2', or 'sox' to function. "
 "Please install one or other of these, and try again.\n"
 msgstr ""
 
-#: src/dialogs.c:2010
+#: src/dialogs.c:2064
 msgid ""
 "Audio was not loaded; please install mplayer or mplayer2 if you expected "
 "audio for this clip.\n"
 msgstr ""
 
-#: src/dialogs.c:2014
+#: src/dialogs.c:2069
 msgid ""
 "Audio resampling is required for this format.\n"
 "Please install 'sox'\n"
 "Or switch to another encoder format in Tools | Preferences | Encoding\n"
 msgstr ""
 
-#: src/dialogs.c:2019
+#: src/dialogs.c:2075
 msgid ""
 "\n"
 "\n"
@@ -4327,19 +4341,19 @@
 "Please set the audio codec in Tools|Preferences|Encoding\n"
 msgstr ""
 
-#: src/dialogs.c:2024
+#: src/dialogs.c:2080
 msgid ""
 "This layout includes generated frames.\n"
 "It cannot be saved, you must render it to a clip first.\n"
 msgstr ""
 
-#: src/dialogs.c:2029
+#: src/dialogs.c:2085
 msgid ""
 "This layout includes generated or recorded audio.\n"
 "It cannot be saved, you must render it to a clip first.\n"
 msgstr ""
 
-#: src/dialogs.c:2039 src/dialogs.c:2137
+#: src/dialogs.c:2095 src/dialogs.c:2189
 #, c-format
 msgid ""
 "\n"
@@ -4347,83 +4361,83 @@
 "Due to restrictions in the %s format\n"
 msgstr ""
 
-#: src/dialogs.c:2059
+#: src/dialogs.c:2115
 msgid ""
 "LiVES recommends the following settings:\n"
 "\n"
 msgstr ""
 
-#: src/dialogs.c:2065 src/dialogs.c:2174 src/resample.c:850
+#: src/dialogs.c:2121 src/dialogs.c:2225 src/resample.c:839
 msgid ", signed"
 msgstr ""
 
-#: src/dialogs.c:2066 src/dialogs.c:2175 src/resample.c:853
+#: src/dialogs.c:2122 src/dialogs.c:2226 src/resample.c:841
 msgid ", unsigned"
 msgstr ""
 
-#: src/dialogs.c:2070 src/dialogs.c:2179 src/resample.c:858
+#: src/dialogs.c:2126 src/dialogs.c:2230 src/resample.c:846
 msgid ", little-endian"
 msgstr ""
 
-#: src/dialogs.c:2071 src/dialogs.c:2180 src/resample.c:861
+#: src/dialogs.c:2127 src/dialogs.c:2231 src/resample.c:848
 msgid ", big-endian"
 msgstr ""
 
-#: src/dialogs.c:2077
+#: src/dialogs.c:2132
 #, c-format
 msgid "Use an audio rate of %d Hz%s%s\n"
 msgstr ""
 
-#: src/dialogs.c:2085
+#: src/dialogs.c:2140
 #, c-format
 msgid "Set video rate to %.3f frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:2089
+#: src/dialogs.c:2143
 #, c-format
 msgid "Set video rate to %d:%d frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:2094 src/dialogs.c:2209
+#: src/dialogs.c:2148 src/dialogs.c:2258
 #, c-format
 msgid "Set video size to %d x %d pixels\n"
 msgstr ""
 
-#: src/dialogs.c:2102 src/dialogs.c:2208
+#: src/dialogs.c:2156 src/dialogs.c:2257
 msgid ""
 "\n"
 "You may wish to:\n"
 msgstr ""
 
-#: src/dialogs.c:2105 src/dialogs.c:2200
+#: src/dialogs.c:2159 src/dialogs.c:2249
 #, c-format
 msgid "resize video to %d x %d pixels\n"
 msgstr ""
 
-#: src/dialogs.c:2110
+#: src/dialogs.c:2163
 msgid "disable audio, since the target encoder cannot encode audio\n"
 msgstr ""
 
-#: src/dialogs.c:2170
+#: src/dialogs.c:2221
 msgid "LiVES must:\n"
 msgstr ""
 
-#: src/dialogs.c:2185
+#: src/dialogs.c:2235
 #, c-format
 msgid "resample audio to %d Hz%s%s\n"
 msgstr ""
 
-#: src/dialogs.c:2192
+#: src/dialogs.c:2242
 #, c-format
 msgid "resample video to %.3f frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:2196
+#: src/dialogs.c:2245
 #, c-format
 msgid "resample video to %d:%d frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:2215
+#: src/dialogs.c:2263
 msgid ""
 "\n"
 "You will be able to undo these changes afterwards.\n"
@@ -4432,14 +4446,14 @@
 "\n"
 msgstr ""
 
-#: src/dialogs.c:2218
+#: src/dialogs.c:2265
 msgid ""
 "\n"
 "Changes applied to the selection will not be permanent.\n"
 "\n"
 msgstr ""
 
-#: src/dialogs.c:2237
+#: src/dialogs.c:2285
 msgid ""
 "\n"
 "\n"
@@ -4448,7 +4462,7 @@
 "Try recording for just a selection of the file."
 msgstr ""
 
-#: src/dialogs.c:2244
+#: src/dialogs.c:2293
 msgid ""
 "The playback speed (fps), or the audio rate\n"
 " of the clipboard does not match\n"
@@ -4459,7 +4473,7 @@
 "Please press Cancel to abort the insert, or OK to continue."
 msgstr ""
 
-#: src/dialogs.c:2253
+#: src/dialogs.c:2304
 #, c-format
 msgid ""
 "When opening a yuvmpeg stream, you should first create a fifo file in:\n"
@@ -4472,11 +4486,11 @@
 "click Cancel."
 msgstr ""
 
-#: src/dialogs.c:2305
+#: src/dialogs.c:2356
 msgid "Show Keys"
 msgstr ""
 
-#: src/dialogs.c:2306
+#: src/dialogs.c:2358
 msgid ""
 "You can use the following keys during playback to control LiVES:-\n"
 "\n"
@@ -4518,11 +4532,11 @@
 "g                             ping pong loops\n"
 msgstr ""
 
-#: src/dialogs.c:2313
+#: src/dialogs.c:2365
 msgid "Multitrack Keys"
 msgstr ""
 
-#: src/dialogs.c:2314
+#: src/dialogs.c:2367
 msgid ""
 "You can use the following keys to control the multitrack window:-\n"
 "\n"
@@ -4544,18 +4558,18 @@
 "For other keys, see the menus.\n"
 msgstr ""
 
-#: src/dialogs.c:2322
+#: src/dialogs.c:2375
 msgid "Message History"
 msgstr ""
 
-#: src/dialogs.c:2335
+#: src/dialogs.c:2388
 #, c-format
 msgid ""
 "After upgrading/installing, you may need to adjust the <prefix_dir> setting "
 "in your %s file"
 msgstr ""
 
-#: src/dialogs.c:2344
+#: src/dialogs.c:2399
 #, c-format
 msgid ""
 "\n"
@@ -4566,25 +4580,25 @@
 "or change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/dialogs.c:2352
+#: src/dialogs.c:2408
 msgid ""
 "Sorry, unknown audio type.\n"
 "\n"
 " (Filenames must end in .mp3, .ogg, .wav, .mod, .xm or .it)"
 msgstr ""
 
-#: src/dialogs.c:2353
+#: src/dialogs.c:2409
 msgid "failed (unknown type)\n"
 msgstr ""
 
-#: src/dialogs.c:2358
+#: src/dialogs.c:2415
 msgid ""
 "\n"
 "Do you wish to remove the layout files associated with this set ?\n"
 "(They will not be usable without the set).\n"
 msgstr ""
 
-#: src/dialogs.c:2363
+#: src/dialogs.c:2421
 #, c-format
 msgid ""
 "\n"
@@ -4593,7 +4607,7 @@
 "Click Cancel to pick a new name.\n"
 msgstr ""
 
-#: src/dialogs.c:2370
+#: src/dialogs.c:2429
 msgid ""
 "\n"
 "Frames from this clip are used in some multitrack layouts.\n"
@@ -4601,7 +4615,7 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2374
+#: src/dialogs.c:2433
 msgid ""
 "\n"
 "Audio from this clip is used in some multitrack layouts.\n"
@@ -4609,7 +4623,7 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2378
+#: src/dialogs.c:2438
 #, c-format
 msgid ""
 "\n"
@@ -4620,7 +4634,7 @@
 "Otherwise click Cancel to skip loading this file.\n"
 msgstr ""
 
-#: src/dialogs.c:2385
+#: src/dialogs.c:2446
 #, c-format
 msgid ""
 "\n"
@@ -4630,7 +4644,7 @@
 "The clip could not be loaded.\n"
 msgstr ""
 
-#: src/dialogs.c:2392
+#: src/dialogs.c:2455
 msgid ""
 "\n"
 "Dear user, the jack developers decided to remove the -Z option from jackd.\n"
@@ -4638,7 +4652,7 @@
 "Alternately, select a different audio player in Preferences.\n"
 msgstr ""
 
-#: src/dialogs.c:2396
+#: src/dialogs.c:2460
 msgid ""
 "\n"
 "Unable to start up jack. Please ensure that alsa is set up correctly on your "
@@ -4647,13 +4661,13 @@
 "Automatic jack startup will be disabled now.\n"
 msgstr ""
 
-#: src/dialogs.c:2402
+#: src/dialogs.c:2466
 msgid ""
 "\n"
 "Unable to connect to jack server. Please start jack before starting LiVES\n"
 msgstr ""
 
-#: src/dialogs.c:2411
+#: src/dialogs.c:2475
 #, c-format
 msgid ""
 "\n"
@@ -4664,13 +4678,13 @@
 "%s\n"
 msgstr ""
 
-#: src/dialogs.c:2418
+#: src/dialogs.c:2482
 msgid ""
 "\n"
 "Alternately, you can restart LiVES and select another audio player.\n"
 msgstr ""
 
-#: src/dialogs.c:2423
+#: src/dialogs.c:2488
 #, c-format
 msgid ""
 "\n"
@@ -4680,7 +4694,7 @@
 "It is recommended to increase it to at least %d MB"
 msgstr ""
 
-#: src/dialogs.c:2429
+#: src/dialogs.c:2496
 #, c-format
 msgid ""
 "\n"
@@ -4689,7 +4703,7 @@
 "Do you wish to delete them ?\n"
 msgstr ""
 
-#: src/dialogs.c:2436
+#: src/dialogs.c:2504
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for multitrack undo.\n"
@@ -4697,7 +4711,7 @@
 "using Preferences/Multitrack/Undo Memory\n"
 msgstr ""
 
-#: src/dialogs.c:2440
+#: src/dialogs.c:2508
 msgid ""
 "\n"
 "Out of memory for undo.\n"
@@ -4705,63 +4719,63 @@
 "using Preferences/Multitrack/Undo Memory\n"
 msgstr ""
 
-#: src/dialogs.c:2444
+#: src/dialogs.c:2512
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for the multitrack undo buffer.\n"
 msgstr ""
 
-#: src/dialogs.c:2446
+#: src/dialogs.c:2514
 msgid "or enter a smaller value.\n"
 msgstr ""
 
-#: src/dialogs.c:2448
+#: src/dialogs.c:2516
 msgid "Try again from the clip editor, try closing some other applications\n"
 msgstr ""
 
-#: src/dialogs.c:2449
+#: src/dialogs.c:2517
 msgid "Try closing some other applications\n"
 msgstr ""
 
-#: src/dialogs.c:2460
+#: src/dialogs.c:2529
 msgid ""
 "Multitrack is set to 0 audio channels, but this layout has audio.\n"
 "You should adjust the audio settings from the Tools menu.\n"
 msgstr ""
 
-#: src/dialogs.c:2464
+#: src/dialogs.c:2534
 msgid ""
 "The current layout has audio, so audio channels may not be set to zero.\n"
 msgstr ""
 
-#: src/dialogs.c:2468
+#: src/dialogs.c:2539
 msgid ""
 "Multitrack audio preview is only available with the\n"
 "\"jack\" or \"pulse audio\" audio player.\n"
 "You can set this in Tools|Preferences|Playback."
 msgstr ""
 
-#: src/dialogs.c:2472
+#: src/dialogs.c:2545
 msgid ""
 "Errors were detected in the layout (which may be due to transferring from "
 "another system, or from an older version of LiVES).\n"
 "Should I try to repair the disk copy of the layout ?\n"
 msgstr ""
 
-#: src/dialogs.c:2476
+#: src/dialogs.c:2549
 msgid ""
 "LiVES was unable to load the layout.\n"
 "Sorry.\n"
 msgstr ""
 
-#: src/dialogs.c:2482
+#: src/dialogs.c:2555
 msgid ""
 "\n"
 "\n"
 "Audio rate must be greater than 0.\n"
 msgstr ""
 
-#: src/dialogs.c:2486
+#: src/dialogs.c:2559
 msgid ""
 "\n"
 "Event list will be very large\n"
@@ -4769,14 +4783,14 @@
 "Are you sure you wish to view it ?\n"
 msgstr ""
 
-#: src/dialogs.c:2491
+#: src/dialogs.c:2564
 msgid ""
 "\n"
 "\n"
 "You must install 'dvgrab' to use this function.\n"
 msgstr ""
 
-#: src/dialogs.c:2496
+#: src/dialogs.c:2570
 msgid ""
 "\n"
 "\n"
@@ -4785,25 +4799,25 @@
 "You may need to select one of these in Tools/Preferences/Playback.\n"
 msgstr ""
 
-#: src/dialogs.c:2500
+#: src/dialogs.c:2574
 msgid "Video playback plugin failed to initialise palette !\n"
 msgstr ""
 
-#: src/dialogs.c:2504
+#: src/dialogs.c:2579
 msgid "Decoder plugin failed to initialise palette !\n"
 msgstr ""
 
-#: src/dialogs.c:2509
+#: src/dialogs.c:2584
 msgid "Unable to set framerate of video plugin\n"
 msgstr ""
 
-#: src/dialogs.c:2514
+#: src/dialogs.c:2590
 msgid ""
 "After a crash, it is advisable to clean up the disk with\n"
 "File|Clean up disk space\n"
 msgstr ""
 
-#: src/dialogs.c:2526
+#: src/dialogs.c:2604
 #, c-format
 msgid ""
 "Stream frame size is too large for your network buffers.\n"
@@ -4812,33 +4826,33 @@
 "echo %d > /proc/sys/net/core/rmem_max\n"
 msgstr ""
 
-#: src/dialogs.c:2714
+#: src/dialogs.c:2800
 msgid "cancelled.\n"
 msgstr ""
 
-#: src/dialogs.c:2721
+#: src/dialogs.c:2805
 msgid "failed.\n"
 msgstr "nieudane.\n"
 
-#: src/dialogs.c:2728
+#: src/dialogs.c:2810
 msgid "done.\n"
 msgstr "zrobione.\n"
 
-#: src/dialogs.c:2732
+#: src/dialogs.c:2814
 msgid "error in file. Failed.\n"
 msgstr ""
 
-#: src/dialogs.c:2766 src/dialogs.c:2815 src/dialogs.c:2839
+#: src/dialogs.c:2848 src/dialogs.c:2897 src/dialogs.c:2921
 #, c-format
 msgid "Additional info: %s\n"
 msgstr ""
 
-#: src/dialogs.c:2769
+#: src/dialogs.c:2851
 #, c-format
 msgid "The error value was %d%s\n"
 msgstr ""
 
-#: src/dialogs.c:2772
+#: src/dialogs.c:2854
 #, c-format
 msgid ""
 "\n"
@@ -4848,7 +4862,7 @@
 "%s%s%s"
 msgstr ""
 
-#: src/dialogs.c:2818
+#: src/dialogs.c:2900
 #, c-format
 msgid ""
 "\n"
@@ -4858,7 +4872,7 @@
 "%s"
 msgstr ""
 
-#: src/dialogs.c:2842
+#: src/dialogs.c:2924
 #, c-format
 msgid ""
 "\n"
@@ -4868,7 +4882,7 @@
 "%s"
 msgstr ""
 
-#: src/dialogs.c:2886
+#: src/dialogs.c:2968
 #, c-format
 msgid ""
 "\n"
@@ -4877,7 +4891,7 @@
 "Please check for possible error causes.\n"
 msgstr ""
 
-#: src/dialogs.c:2890
+#: src/dialogs.c:2971
 #, c-format
 msgid ""
 "\n"
@@ -4887,7 +4901,7 @@
 "%s.\n"
 msgstr ""
 
-#: src/dialogs.c:2921
+#: src/dialogs.c:3002
 #, c-format
 msgid ""
 "\n"
@@ -4896,7 +4910,7 @@
 "Please check for possible error causes.\n"
 msgstr ""
 
-#: src/dialogs.c:2925
+#: src/dialogs.c:3005
 #, c-format
 msgid ""
 "\n"
@@ -4906,12 +4920,12 @@
 "%s.\n"
 msgstr ""
 
-#: src/dialogs.c:2993
+#: src/dialogs.c:3073
 #, c-format
 msgid "Value for \"%s\" could not be read."
 msgstr ""
 
-#: src/dialogs.c:3011
+#: src/dialogs.c:3091
 #, c-format
 msgid ""
 "\n"
@@ -4920,7 +4934,7 @@
 "Please check your system for errors.\n"
 msgstr ""
 
-#: src/dialogs.c:3020
+#: src/dialogs.c:3100
 #, c-format
 msgid ""
 "\n"
@@ -4929,7 +4943,7 @@
 "Please check the file permissions and try again."
 msgstr ""
 
-#: src/dialogs.c:3027
+#: src/dialogs.c:3109
 #, c-format
 msgid ""
 "\n"
@@ -4938,7 +4952,7 @@
 "Please check the directory permissions and try again."
 msgstr ""
 
-#: src/dialogs.c:3034
+#: src/dialogs.c:3116
 #, c-format
 msgid ""
 "\n"
@@ -4946,14 +4960,14 @@
 "%s\n"
 msgstr ""
 
-#: src/dialogs.c:3041
+#: src/dialogs.c:3123
 msgid ""
 "\n"
 "Abort and exit immediately from LiVES\n"
 "Are you sure ?\n"
 msgstr ""
 
-#: src/dialogs.c:3047
+#: src/dialogs.c:3129
 #, c-format
 msgid ""
 "\n"
@@ -4961,13 +4975,13 @@
 "Please select another encoder from the list.\n"
 msgstr ""
 
-#: src/dialogs.c:3056
+#: src/dialogs.c:3139
 msgid ""
 "\n"
 "This card is already in use and cannot be opened multiple times.\n"
 msgstr ""
 
-#: src/dialogs.c:3061
+#: src/dialogs.c:3145
 #, c-format
 msgid ""
 "\n"
@@ -4977,27 +4991,27 @@
 "- Check if the device actually exists.\n"
 msgstr ""
 
-#: src/dialogs.c:3068
+#: src/dialogs.c:3153
 msgid ""
 "\n"
 "This file already has subtitles loaded.\n"
 "Do you wish to overwrite the existing subtitles ?\n"
 msgstr ""
 
-#: src/dialogs.c:3072
+#: src/dialogs.c:3157
 msgid ""
 "\n"
 "LiVES currently only supports subtitles of type .srt and .sub.\n"
 msgstr ""
 
-#: src/dialogs.c:3076
+#: src/dialogs.c:3161
 msgid ""
 "\n"
 "Erase all subtitles from this clip.\n"
 "Are you sure ?\n"
 msgstr ""
 
-#: src/dialogs.c:3082
+#: src/dialogs.c:3168
 #, c-format
 msgid ""
 "\n"
@@ -5006,14 +5020,14 @@
 "or OK to continue and save as type \"%s\"\n"
 msgstr ""
 
-#: src/dialogs.c:3089
+#: src/dialogs.c:3176
 msgid ""
 "\n"
 "Do you wish to move the current clip sets to the new directory ?\n"
 "(If unsure, click Yes)\n"
 msgstr ""
 
-#: src/dialogs.c:3093
+#: src/dialogs.c:3181
 #, c-format
 msgid ""
 "\n"
@@ -5024,19 +5038,19 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:3099
+#: src/dialogs.c:3188
 msgid ""
 "\n"
 "No video input devices could be found.\n"
 msgstr ""
 
-#: src/dialogs.c:3103
+#: src/dialogs.c:3192
 msgid ""
 "\n"
 "All video input devices are already in use.\n"
 msgstr ""
 
-#: src/dialogs.c:3107
+#: src/dialogs.c:3196
 msgid ""
 "\n"
 "\n"
@@ -5044,15 +5058,14 @@
 "DO NOT SHUT DOWN OR CLOSE LIVES !\n"
 msgstr ""
 
-#: src/dialogs.c:3127
+#: src/dialogs.c:3203
 #, c-format
 msgid ""
 "No clips were recovered for set (%s).\n"
 "Please check the spelling of the set name and try again.\n"
 msgstr ""
 
-#. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:3136
+#: src/dialogs.c:3214
 #, c-format
 msgid ""
 "\n"
@@ -5064,7 +5077,7 @@
 msgstr ""
 
 #. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:3144
+#: src/dialogs.c:3222
 #, c-format
 msgid ""
 "\n"
@@ -5073,34 +5086,34 @@
 "\n"
 msgstr ""
 
-#: src/dialogs.c:3150
+#: src/dialogs.c:3228
 msgid ""
 "\n"
 "You must have autolives.pl installed and in your path to use this toy.\n"
 "Consult your package distributor.\n"
 msgstr ""
 
-#: src/dialogs.c:3154
+#: src/dialogs.c:3232
 msgid ""
 "\n"
 "You must have a minimum of one clip loaded to use this toy.\n"
 msgstr ""
 
-#: src/dialogs.c:3158
+#: src/dialogs.c:3236
 msgid ""
 "\n"
 "LiVES lost its connection to jack and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:3162
+#: src/dialogs.c:3240
 msgid ""
 "\n"
 "LiVES lost its connection to pulseaudio and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:3175
+#: src/dialogs.c:3254
 #, c-format
 msgid ""
 "\n"
@@ -5109,544 +5122,544 @@
 "Do you wish to allow this (for this session only) ?\n"
 msgstr ""
 
-#: src/effects.c:60
+#: src/effects.c:61
 msgid "generator"
 msgstr ""
 
-#: src/effects.c:61
+#: src/effects.c:62
 msgid "Generators"
 msgstr ""
 
-#: src/effects.c:63
+#: src/effects.c:64
 msgid "audio generator"
 msgstr ""
 
-#: src/effects.c:64
+#: src/effects.c:65
 msgid "Audio Generators"
 msgstr ""
 
-#: src/effects.c:66
+#: src/effects.c:67
 msgid "audio/video generator"
 msgstr ""
 
-#: src/effects.c:67
+#: src/effects.c:68
 msgid "Audio/Video Generators"
 msgstr ""
 
-#: src/effects.c:69
+#: src/effects.c:70
 msgid "data generator"
 msgstr ""
 
-#: src/effects.c:70
+#: src/effects.c:71
 msgid "Data Generators"
 msgstr ""
 
-#: src/effects.c:72
+#: src/effects.c:73
 msgid "data visualiser"
 msgstr ""
 
-#: src/effects.c:73
+#: src/effects.c:74
 msgid "Data Visualisers"
 msgstr ""
 
-#: src/effects.c:75
+#: src/effects.c:76
 msgid "data processor"
 msgstr ""
 
-#: src/effects.c:76
+#: src/effects.c:77
 msgid "Data Processors"
 msgstr ""
 
-#: src/effects.c:78
+#: src/effects.c:79
 msgid "data source"
 msgstr ""
 
-#: src/effects.c:79
+#: src/effects.c:80
 msgid "Data Sources"
 msgstr ""
 
-#: src/effects.c:81
+#: src/effects.c:82
 msgid "transition"
 msgstr ""
 
-#: src/effects.c:82
+#: src/effects.c:83
 msgid "Transitions"
 msgstr "Przejścia"
 
-#: src/effects.c:84
+#: src/effects.c:85
 msgid "effect"
 msgstr "efekt"
 
-#: src/effects.c:87 src/rfx-builder.c:187
+#: src/effects.c:88 src/rfx-builder.c:187
 msgid "utility"
 msgstr ""
 
-#: src/effects.c:88
+#: src/effects.c:89
 msgid "Utilities"
 msgstr "Narzędzia"
 
-#: src/effects.c:90
+#: src/effects.c:91
 msgid "compositor"
 msgstr ""
 
-#: src/effects.c:91
+#: src/effects.c:92
 msgid "Compositors"
 msgstr ""
 
-#: src/effects.c:93
+#: src/effects.c:94
 msgid "tap"
 msgstr ""
 
-#: src/effects.c:94
+#: src/effects.c:95
 msgid "Taps"
 msgstr ""
 
-#: src/effects.c:96
+#: src/effects.c:97
 msgid "splitter"
 msgstr "liniaPodzialu"
 
-#: src/effects.c:97
+#: src/effects.c:98
 msgid "Splitters"
 msgstr ""
 
-#: src/effects.c:99
+#: src/effects.c:100
 msgid "converter"
 msgstr ""
 
-#: src/effects.c:100
+#: src/effects.c:101
 msgid "Converters"
 msgstr ""
 
-#: src/effects.c:102
+#: src/effects.c:103
 msgid "analyser"
 msgstr ""
 
-#: src/effects.c:103
+#: src/effects.c:104
 msgid "Analysers"
 msgstr ""
 
-#: src/effects.c:108
+#: src/effects.c:109
 msgid "audio/video"
 msgstr ""
 
-#: src/effects.c:109
+#: src/effects.c:110
 msgid "Audio/Video Transitions"
 msgstr ""
 
-#: src/effects.c:111
+#: src/effects.c:112
 msgid "video only"
 msgstr ""
 
-#: src/effects.c:112
+#: src/effects.c:113
 msgid "Video only Transitions"
 msgstr ""
 
-#: src/effects.c:114 src/multitrack.c:10740
+#: src/effects.c:115 src/multitrack.c:10962
 msgid "audio only"
 msgstr ""
 
-#: src/effects.c:115
+#: src/effects.c:116
 msgid "Audio only Transitions"
 msgstr ""
 
-#: src/effects.c:117 src/effects.c:120 src/multitrack.c:18757
+#: src/effects.c:118 src/effects.c:121 src/multitrack.c:19097
 msgid "audio"
 msgstr ""
 
-#: src/effects.c:118
+#: src/effects.c:119
 msgid "Audio Mixers"
 msgstr ""
 
-#: src/effects.c:121
+#: src/effects.c:122
 msgid "Audio Effects"
 msgstr ""
 
-#: src/effects.c:123
+#: src/effects.c:124
 msgid "video"
 msgstr ""
 
-#: src/effects.c:124
+#: src/effects.c:125
 msgid "Video Effects"
 msgstr ""
 
-#: src/effects.c:126
+#: src/effects.c:127
 msgid "audio volume controller"
 msgstr ""
 
-#: src/effects.c:127
+#: src/effects.c:128
 msgid "Audio Volume Controllers"
 msgstr ""
 
-#: src/effects.c:129
+#: src/effects.c:130
 msgid "video analyser"
 msgstr ""
 
-#: src/effects.c:130
+#: src/effects.c:131
 msgid "Video analysers"
 msgstr ""
 
-#: src/effects.c:132
+#: src/effects.c:133
 msgid "audio analyser"
 msgstr ""
 
-#: src/effects.c:133
+#: src/effects.c:134
 msgid "Audio Analysers"
 msgstr ""
 
-#: src/effects.c:137 src/plugins.c:2559 src/plugins.c:2573
+#: src/effects.c:138 src/plugins.c:2507 src/plugins.c:2521
 msgid "unknown"
 msgstr "nieznane"
 
-#: src/effects.c:238
+#: src/effects.c:235
 #, c-format
 msgid "%s all frames..."
 msgstr ""
 
-#: src/effects.c:243
+#: src/effects.c:239
 #, c-format
 msgid "%s clipboard into frames %d to %d..."
 msgstr ""
 
-#: src/effects.c:250
+#: src/effects.c:245
 #, c-format
 msgid "%s to clipboard..."
 msgstr ""
 
-#: src/effects.c:254
+#: src/effects.c:248
 #, c-format
 msgid "%s to new clip..."
 msgstr ""
 
-#: src/effects.c:259
+#: src/effects.c:252
 #, c-format
 msgid "%s frames %d to %d..."
 msgstr ""
 
-#: src/effects.c:290
+#: src/effects.c:283
 #, c-format
 msgid "%s clipboard with selection"
 msgstr ""
 
-#: src/effects.c:295
+#: src/effects.c:287
 #, c-format
 msgid "%s to clipboard"
 msgstr ""
 
-#: src/effects.c:299
+#: src/effects.c:290
 #, c-format
 msgid "%s to new clip"
 msgstr ""
 
-#: src/effects.c:304
+#: src/effects.c:294
 #, c-format
 msgid "%s frames %d to %d"
 msgstr ""
 
-#: src/effects.c:456 src/effects.c:523
+#: src/effects.c:443 src/effects.c:507
 msgid ""
 "\n"
 "No frames were generated.\n"
 msgstr ""
 
-#: src/effects-weed.c:431
+#: src/effects-weed.c:452
 msgid "integer"
 msgstr ""
 
-#: src/effects-weed.c:432
+#: src/effects-weed.c:454
 msgid "int64"
 msgstr ""
 
-#: src/effects-weed.c:433
+#: src/effects-weed.c:456
 msgid "boolean"
 msgstr ""
 
-#: src/effects-weed.c:434
+#: src/effects-weed.c:458
 msgid "double"
 msgstr ""
 
-#: src/effects-weed.c:435
+#: src/effects-weed.c:460
 msgid "string"
 msgstr ""
 
-#: src/effects-weed.c:436
+#: src/effects-weed.c:462
 msgid "pointer"
 msgstr ""
 
-#: src/effects-weed.c:4591
+#: src/effects-weed.c:4581
 #, c-format
 msgid "Error: plugin %s has no weed_setup() function.\n"
 msgstr ""
 
-#: src/effects-weed.c:4606
+#: src/effects-weed.c:4595
 #, c-format
 msgid "No usable filters found in plugin %s\n"
 msgstr ""
 
-#: src/effects-weed.c:4680
+#: src/effects-weed.c:4668
 #, c-format
 msgid "Found duplicate plugin %s"
 msgstr ""
 
-#: src/effects-weed.c:4734
+#: src/effects-weed.c:4723
 #, c-format
 msgid ""
 "Info: Unable to load plugin %s\n"
 "Error was: %s\n"
 msgstr ""
 
-#: src/effects-weed.c:4737 src/effects-weed.c:5858
+#: src/effects-weed.c:4726 src/effects-weed.c:5847
 msgid "Some plugin directories"
 msgstr ""
 
 #. TRANSLATORS: example " - LADSPA plugins -"
-#: src/effects-weed.c:4812 src/rte_window.c:2105
+#: src/effects-weed.c:4801 src/rte_window.c:2107
 #, c-format
 msgid " - %s plugins -"
 msgstr ""
 
-#: src/effects-weed.c:5012
+#: src/effects-weed.c:4998
 #, c-format
 msgid "Successfully loaded %d Weed filters\n"
 msgstr ""
 
-#: src/effects-weed.c:5177
+#: src/effects-weed.c:5162
 #, c-format
 msgid "Invalid compound effect %s - has conflicting target_fps\n"
 msgstr ""
 
-#: src/effects-weed.c:5197
+#: src/effects-weed.c:5182
 #, c-format
 msgid "Invalid compound effect %s - has multiple transition parameters\n"
 msgstr ""
 
-#: src/effects-weed.c:5211
+#: src/effects-weed.c:5196
 #, c-format
 msgid "Invalid compound effect %s - has multiple master volume parameters\n"
 msgstr ""
 
-#: src/effects-weed.c:5346
+#: src/effects-weed.c:5329
 #, c-format
 msgid "Invalid compound effect %s - must have >1 sub filters\n"
 msgstr ""
 
-#: src/effects-weed.c:5366
+#: src/effects-weed.c:5349
 #, c-format
 msgid "Invalid effect %s found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5381
+#: src/effects-weed.c:5364
 #, c-format
 msgid "Invalid default found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5392
+#: src/effects-weed.c:5375
 #, c-format
 msgid "Invalid filter %d for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5406
+#: src/effects-weed.c:5389
 #, c-format
 msgid "Invalid param %d for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5433
+#: src/effects-weed.c:5416
 #, c-format
 msgid ""
 "Invalid number of values for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5467
+#: src/effects-weed.c:5450
 #, c-format
 msgid ""
 "Invalid non-boolean value for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5500
+#: src/effects-weed.c:5483
 #, c-format
 msgid "Invalid param link found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5511
+#: src/effects-weed.c:5494
 #, c-format
 msgid ""
 "Invalid out filter %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5529
+#: src/effects-weed.c:5513
 #, c-format
 msgid ""
 "Invalid out param %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5541
+#: src/effects-weed.c:5526
 #, c-format
 msgid ""
 "Invalid non-boolean value for autoscale found in compound effect %s, line "
 "%d\n"
 msgstr ""
 
-#: src/effects-weed.c:5552
+#: src/effects-weed.c:5537
 #, c-format
 msgid ""
 "Invalid in filter %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5566
+#: src/effects-weed.c:5552
 #, c-format
 msgid ""
 "Invalid in param %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5594
+#: src/effects-weed.c:5581
 #, c-format
 msgid "Invalid channel link found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5605
+#: src/effects-weed.c:5592
 #, c-format
 msgid ""
 "Invalid out filter %d for link channels found in compound effect %s, line "
 "%d\n"
 msgstr ""
 
-#: src/effects-weed.c:5623
+#: src/effects-weed.c:5611
 #, c-format
 msgid ""
 "Invalid out channel %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5633
+#: src/effects-weed.c:5622
 #, c-format
 msgid ""
 "Invalid in filter %d for link channels found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5651
+#: src/effects-weed.c:5641
 #, c-format
 msgid ""
 "Invalid in channel %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5687
+#: src/effects-weed.c:5678
 #, c-format
 msgid "Compound:%s"
 msgstr ""
 
-#: src/effects-weed.c:5758
+#: src/effects-weed.c:5749
 #, c-format
 msgid "Successfully loaded %d compound filters\n"
 msgstr ""
 
-#: src/effects-weed.c:6591
+#: src/effects-weed.c:6570
 #, c-format
 msgid "Effect %s cannot be used with this audio player.\n"
 msgstr ""
 
-#: src/effects-weed.c:6737
+#: src/effects-weed.c:6718
 #, c-format
 msgid "Failed to start instance %s, error code %d\n"
 msgstr ""
 
-#: src/effects-weed.c:6814
+#: src/effects-weed.c:6797
 #, c-format
 msgid "Unable to start generator %s\n"
 msgstr ""
 
-#: src/effects-weed.c:7621
+#: src/effects-weed.c:7607
 #, c-format
 msgid "Failed to start generator %s\n"
 msgstr ""
 
-#: src/effects-weed.c:7718
+#: src/effects-weed.c:7701
 #, c-format
 msgid "Failed to start generator %s, error %d\n"
 msgstr ""
 
-#: src/effects-weed.c:9012
+#: src/effects-weed.c:8993
 #, c-format
 msgid "%s [unstable] (%s)"
 msgstr ""
 
-#: src/effects-data.c:3278
+#: src/effects-data.c:3234
 #, c-format
 msgid "ACTIVATE (%s)"
 msgstr ""
 
-#: src/effects-data.c:3548
+#: src/effects-data.c:3501
 msgid "ACTIVATE"
 msgstr ""
 
-#: src/effects-data.c:3876
+#: src/effects-data.c:3829
 #, c-format
 msgid "Key slot %d"
 msgstr ""
 
-#: src/effects-data.c:3998
+#: src/effects-data.c:3951
 msgid "Autoscale"
 msgstr ""
 
-#: src/effects-data.c:4089
+#: src/effects-data.c:4042
 msgid "Add another connection for this output parameter"
 msgstr ""
 
-#: src/effects-data.c:4102 src/effects-data.c:4151
+#: src/effects-data.c:4055 src/effects-data.c:4104
 #, fuzzy
 msgid "Delete this connection"
 msgstr "_Usuń zaznaczenie"
 
-#: src/effects-data.c:4138
+#: src/effects-data.c:4091
 msgid "Add another connection for this output channel"
 msgstr ""
 
-#: src/effects-data.c:4223
+#: src/effects-data.c:4176
 msgid "Connected to -->"
 msgstr ""
 
-#: src/effects-data.c:4243
+#: src/effects-data.c:4196
 #, c-format
 msgid "%s - Alpha Channel Connections"
 msgstr ""
 
-#: src/effects-data.c:4316
+#: src/effects-data.c:4269
 #, c-format
 msgid "%s - Parameter Data Connections"
 msgstr ""
 
-#: src/effects-data.c:4336
+#: src/effects-data.c:4289
 msgid "Autoscale All"
 msgstr ""
 
-#: src/effects-data.c:4361 src/effects-data.c:4890
+#: src/effects-data.c:4314 src/effects-data.c:4841
 msgid "ACTIVATED"
 msgstr ""
 
-#: src/effects-data.c:4774
+#: src/effects-data.c:4726
 msgid "LiVES: - Parameter and Alpha Channel Connections"
 msgstr ""
 
-#: src/effects-data.c:4785
+#: src/effects-data.c:4736
 msgid "Auto Connect Channels"
 msgstr ""
 
-#: src/effects-data.c:4797
+#: src/effects-data.c:4748
 msgid "Auto Connect Parameters"
 msgstr ""
 
-#: src/effects-data.c:4807
+#: src/effects-data.c:4758
 msgid "Disconnect All"
 msgstr ""
 
-#: src/effects-data.c:4875
+#: src/effects-data.c:4826
 #, c-format
 msgid "Input channel is already connected from (%d,%d) %s"
 msgstr ""
 
-#: src/effects-data.c:4891
+#: src/effects-data.c:4842
 #, c-format
 msgid "Input parameter is already connected from (%d,%d) %s"
 msgstr ""
 
-#: src/effects-data.c:4899
+#: src/effects-data.c:4851
 msgid "Input and output parameters are not compatible"
 msgstr ""
 
@@ -5658,43 +5671,43 @@
 msgid "_Reset Values"
 msgstr ""
 
-#: src/framedraw.c:267
+#: src/framedraw.c:265
 msgid "_Frame"
 msgstr ""
 
-#: src/paramspecial.c:266
+#: src/paramspecial.c:259
 msgid "Maintain _Aspect Ratio"
 msgstr ""
 
-#: src/paramspecial.c:267
+#: src/paramspecial.c:260
 msgid "Maintain aspect ratio of original frame"
 msgstr ""
 
-#: src/paramspecial.c:341
+#: src/paramspecial.c:335
 msgid "Display Password"
 msgstr ""
 
-#: src/paramwindow.c:450
+#: src/paramwindow.c:447
 msgid "Transition _In"
 msgstr ""
 
-#: src/paramwindow.c:452
+#: src/paramwindow.c:449
 msgid "Click to set the transition parameter to show only the front frame"
 msgstr ""
 
-#: src/paramwindow.c:474
+#: src/paramwindow.c:472
 msgid "Crossfade audio"
 msgstr ""
 
-#: src/paramwindow.c:475
+#: src/paramwindow.c:473
 msgid "Check the box to make audio transition with the video"
 msgstr ""
 
-#: src/paramwindow.c:493
+#: src/paramwindow.c:492
 msgid "Transition _Out"
 msgstr ""
 
-#: src/paramwindow.c:495
+#: src/paramwindow.c:494
 msgid "Click to set the transition parameter to show only the rear frame"
 msgstr ""
 
@@ -5707,23 +5720,23 @@
 msgid "%s : size"
 msgstr ""
 
-#: src/paramwindow.c:598
+#: src/paramwindow.c:597
 msgid "New size (pixels)"
 msgstr ""
 
-#: src/paramwindow.c:617 src/plugins.c:997
+#: src/paramwindow.c:616 src/plugins.c:973
 msgid "_Width"
 msgstr "_Szerokość"
 
-#: src/paramwindow.c:636 src/plugins.c:1003
+#: src/paramwindow.c:635 src/plugins.c:979
 msgid "_Height"
 msgstr "_Wysokość"
 
-#: src/paramwindow.c:684
+#: src/paramwindow.c:683
 msgid "Generate to _Clipboard"
 msgstr ""
 
-#: src/paramwindow.c:686
+#: src/paramwindow.c:685
 msgid "Generate frames to the clipboard"
 msgstr ""
 
@@ -5735,7 +5748,7 @@
 msgid "Generate frames to a new clip"
 msgstr ""
 
-#: src/paramwindow.c:822
+#: src/paramwindow.c:824
 #, c-format
 msgid ""
 "\n"
@@ -5743,71 +5756,71 @@
 "\n"
 msgstr ""
 
-#: src/paramwindow.c:920 src/paramwindow.c:930
+#: src/paramwindow.c:934 src/paramwindow.c:942
 msgid "Set as default"
 msgstr "Ustaw wartość z pola jako domyślną"
 
-#: src/paramwindow.c:922 src/paramwindow.c:938
+#: src/paramwindow.c:936 src/paramwindow.c:950
 msgid "Reset"
 msgstr ""
 
-#: src/paramwindow.c:932 src/rte_window.c:2401 src/omc-learn.c:1357
+#: src/paramwindow.c:944 src/rte_window.c:2394 src/omc-learn.c:1347
 msgid "Close _window"
 msgstr "Zamknij okno"
 
-#: src/paramwindow.c:1337
+#: src/paramwindow.c:1340
 msgid "No parameters"
 msgstr ""
 
-#: src/paramwindow.c:1419
+#: src/paramwindow.c:1424
 msgid "Invalid parameter"
 msgstr "Niepoprawny parametr"
 
-#: src/paramwindow.c:1611
+#: src/paramwindow.c:1610
 msgid "LiVES: - Select Colour"
 msgstr ""
 
-#: src/paramwindow.c:1616
+#: src/paramwindow.c:1615
 msgid "Click to set the colour"
 msgstr ""
 
-#: src/paramwindow.c:1628
+#: src/paramwindow.c:1626
 msgid "_Red"
 msgstr ""
 
-#: src/paramwindow.c:1629
+#: src/paramwindow.c:1627
 msgid "The red value (0 - 255)"
 msgstr ""
 
-#: src/paramwindow.c:1632
+#: src/paramwindow.c:1630
 msgid "_Green"
 msgstr ""
 
-#: src/paramwindow.c:1633
+#: src/paramwindow.c:1631
 msgid "The green value (0 - 255)"
 msgstr ""
 
-#: src/paramwindow.c:1636
+#: src/paramwindow.c:1634
 msgid "_Blue"
 msgstr ""
 
-#: src/paramwindow.c:1637
+#: src/paramwindow.c:1635
 msgid "The blue value (0 - 255)"
 msgstr ""
 
-#: src/plugins.c:85
+#: src/plugins.c:86
 #, c-format
 msgid ""
 "\n"
 "Plugin error: %s failed with code %d"
 msgstr ""
 
-#: src/plugins.c:87
+#: src/plugins.c:88
 #, c-format
 msgid " : message was %s\n"
 msgstr ""
 
-#: src/plugins.c:387
+#: src/plugins.c:375
 #, c-format
 msgid ""
 "\n"
@@ -5817,17 +5830,17 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/plugins.c:397
+#: src/plugins.c:385
 #, c-format
 msgid "Updating video playback plugin defaults in %s\n"
 msgstr ""
 
-#: src/plugins.c:452
+#: src/plugins.c:444
 #, c-format
 msgid "Loading video playback plugin defaults from %s..."
 msgstr ""
 
-#: src/plugins.c:515
+#: src/plugins.c:505
 #, c-format
 msgid ""
 "\n"
@@ -5837,32 +5850,32 @@
 "\n"
 msgstr ""
 
-#: src/plugins.c:855
+#: src/plugins.c:836
 #, c-format
 msgid "Saving playback plugin defaults to %s..."
 msgstr ""
 
-#: src/plugins.c:962
+#: src/plugins.c:939
 msgid "_FPS"
 msgstr "_FPS"
 
-#: src/plugins.c:963
+#: src/plugins.c:940
 msgid "Fixed framerate for plugin.\n"
 msgstr ""
 
-#: src/plugins.c:1032
+#: src/plugins.c:1008
 msgid "_Colourspace"
 msgstr ""
 
-#: src/plugins.c:1033
+#: src/plugins.c:1009
 msgid "Colourspace input to the plugin.\n"
 msgstr ""
 
-#: src/plugins.c:1089
+#: src/plugins.c:1065
 msgid "Save settings to an alternate file.\n"
 msgstr ""
 
-#: src/plugins.c:1206
+#: src/plugins.c:1182
 #, c-format
 msgid ""
 "\n"
@@ -5871,7 +5884,7 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/plugins.c:1252
+#: src/plugins.c:1228
 #, c-format
 msgid ""
 "\n"
@@ -5881,38 +5894,38 @@
 "Unable to use it.\n"
 msgstr ""
 
-#: src/plugins.c:1265
+#: src/plugins.c:1241
 #, c-format
 msgid ""
 "Video playback plugin failed to initialise.\n"
 "Error was: %s\n"
 msgstr ""
 
-#: src/plugins.c:1461
+#: src/plugins.c:1428
 msgid ""
 "\n"
 "Warning ! Video playback plugin will not send key presses. Keyboard may be "
 "disabled during plugin use !\n"
 msgstr ""
 
-#: src/plugins.c:1465
+#: src/plugins.c:1433
 #, c-format
 msgid ""
 "*** Using %s plugin for fs playback, agreed to use palette type %d ( %s ). "
 "***\n"
 msgstr ""
 
-#: src/plugins.c:1571
+#: src/plugins.c:1537
 #, c-format
 msgid "Audio stream unable to use preferred format '%s'\n"
 msgstr ""
 
-#: src/plugins.c:1579
+#: src/plugins.c:1543
 #, c-format
 msgid "Using format '%s' instead.\n"
 msgstr ""
 
-#: src/plugins.c:1616
+#: src/plugins.c:1579
 #, c-format
 msgid ""
 "LiVES was unable to find its encoder plugins. Please make sure you have the "
@@ -5921,7 +5934,7 @@
 "or change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/plugins.c:1624
+#: src/plugins.c:1589
 #, c-format
 msgid ""
 "LiVES did not receive a response from the encoder plugin called '%s'.\n"
@@ -5930,11 +5943,11 @@
 "or switch to another plugin using Tools|Preferences|Encoding\n"
 msgstr ""
 
-#: src/plugins.c:2032
+#: src/plugins.c:1987
 msgid "Unable to resize, please install imageMagick\n"
 msgstr ""
 
-#: src/plugins.c:2231
+#: src/plugins.c:2183
 #, c-format
 msgid ""
 "\n"
@@ -5942,12 +5955,12 @@
 "No decoders found in %s !\n"
 msgstr ""
 
-#: src/plugins.c:2415
+#: src/plugins.c:2369
 #, fuzzy, c-format
 msgid " using %s"
 msgstr "Otwieranie %s"
 
-#: src/plugins.c:2499
+#: src/plugins.c:2451
 #, c-format
 msgid ""
 "\n"
@@ -5956,7 +5969,7 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/plugins.c:2522
+#: src/plugins.c:2472
 #, c-format
 msgid ""
 "\n"
@@ -5966,24 +5979,24 @@
 "Unable to use it.\n"
 msgstr ""
 
-#: src/plugins.c:2564
+#: src/plugins.c:2512
 msgid "/unknown"
 msgstr ""
 
-#: src/plugins.c:2651
+#: src/plugins.c:2598
 msgid "LiVES: - Decoder Plugins"
 msgstr ""
 
-#: src/plugins.c:2669
+#: src/plugins.c:2616
 msgid "Enabled Video Decoders (uncheck to disable)"
 msgstr ""
 
-#: src/plugins.c:2726
+#: src/plugins.c:2672
 #, c-format
 msgid "Failed to load %s, transitions may not resize.\n"
 msgstr ""
 
-#: src/plugins.c:3854
+#: src/plugins.c:3797
 #, c-format
 msgid "%s advanced settings"
 msgstr ""
@@ -5992,15 +6005,15 @@
 msgid "LiVES: - New Test RFX"
 msgstr ""
 
-#: src/rfx-builder.c:136
+#: src/rfx-builder.c:135
 msgid "LiVES: - Edit Test RFX"
 msgstr ""
 
-#: src/rfx-builder.c:166
+#: src/rfx-builder.c:165
 msgid "Type:"
 msgstr "Rodzaj:"
 
-#: src/rfx-builder.c:184
+#: src/rfx-builder.c:183
 msgid "tool"
 msgstr ""
 
@@ -6012,130 +6025,130 @@
 msgid "The name of the plugin. No spaces allowed."
 msgstr ""
 
-#: src/rfx-builder.c:201
+#: src/rfx-builder.c:202
 msgid "Version:       "
 msgstr ""
 
-#: src/rfx-builder.c:203
+#: src/rfx-builder.c:204
 msgid "The script version."
 msgstr ""
 
-#: src/rfx-builder.c:210
+#: src/rfx-builder.c:212
 msgid "    Author:       "
 msgstr ""
 
-#: src/rfx-builder.c:211
+#: src/rfx-builder.c:213
 msgid "The script author."
 msgstr ""
 
-#: src/rfx-builder.c:217
+#: src/rfx-builder.c:220
 msgid "    URL (optional):       "
 msgstr ""
 
-#: src/rfx-builder.c:218
+#: src/rfx-builder.c:221
 msgid "URL for the plugin maintainer."
 msgstr ""
 
-#: src/rfx-builder.c:226
+#: src/rfx-builder.c:230
 msgid "Menu text:    "
 msgstr ""
 
-#: src/rfx-builder.c:227
+#: src/rfx-builder.c:231
 msgid "The text to show in the menu."
 msgstr ""
 
-#: src/rfx-builder.c:239
+#: src/rfx-builder.c:244
 msgid "Action description:        "
 msgstr ""
 
-#: src/rfx-builder.c:241
+#: src/rfx-builder.c:246
 msgid "Describe what the plugin is doing. E.g. \"Edge detecting\""
 msgstr ""
 
-#: src/rfx-builder.c:246
+#: src/rfx-builder.c:251
 msgid "Minimum frames:"
 msgstr ""
 
-#: src/rfx-builder.c:249
+#: src/rfx-builder.c:254
 msgid ""
 "Minimum number of frames this effect/tool can be applied to. Normally 1."
 msgstr ""
 
-#: src/rfx-builder.c:260
+#: src/rfx-builder.c:265
 msgid "_Requirements..."
 msgstr ""
 
-#: src/rfx-builder.c:263
+#: src/rfx-builder.c:268
 msgid "Enter any binaries required by the plugin."
 msgstr ""
 
-#: src/rfx-builder.c:267
+#: src/rfx-builder.c:272
 msgid "_Properties..."
 msgstr "_Właściwości..."
 
-#: src/rfx-builder.c:270
+#: src/rfx-builder.c:275
 msgid "Set properties for the plugin. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:274
+#: src/rfx-builder.c:279
 msgid "_Parameters..."
 msgstr ""
 
-#: src/rfx-builder.c:277
+#: src/rfx-builder.c:282
 msgid "Set up parameters used in pre/loop/post/trigger code. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:281
+#: src/rfx-builder.c:286
 msgid "Parameter _Window Hints..."
 msgstr ""
 
-#: src/rfx-builder.c:284
+#: src/rfx-builder.c:289
 msgid "Set hints about how to lay out the parameter window. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:290
+#: src/rfx-builder.c:295
 msgid "_Language code:"
 msgstr ""
 
-#: src/rfx-builder.c:291
+#: src/rfx-builder.c:296
 msgid "Language for pre/loop/post/triggers. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:300
+#: src/rfx-builder.c:305
 msgid "_Pre loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:303
+#: src/rfx-builder.c:308
 msgid "Code to be executed before the loop. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:307
+#: src/rfx-builder.c:312
 msgid "_Loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:310
+#: src/rfx-builder.c:315
 msgid "Loop code to be applied to each frame."
 msgstr ""
 
-#: src/rfx-builder.c:314
+#: src/rfx-builder.c:319
 msgid "_Post loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:317
+#: src/rfx-builder.c:322
 msgid "Code to be executed after the loop. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:321
+#: src/rfx-builder.c:326
 msgid "_Trigger code..."
 msgstr ""
 
-#: src/rfx-builder.c:324
+#: src/rfx-builder.c:329
 msgid ""
 "Set trigger code for when the parameter window is shown, or when a parameter "
 "is changed. Optional (except for Utilities)."
 msgstr ""
 
-#: src/rfx-builder.c:421
+#: src/rfx-builder.c:426
 #, c-format
 msgid ""
 "\n"
@@ -6145,55 +6158,55 @@
 "%s\n"
 msgstr ""
 
-#: src/rfx-builder.c:544
+#: src/rfx-builder.c:541
 msgid "LiVES: - RFX Requirements"
 msgstr ""
 
-#: src/rfx-builder.c:548
+#: src/rfx-builder.c:544
 msgid "LiVES: - RFX Parameters"
 msgstr ""
 
-#: src/rfx-builder.c:552
+#: src/rfx-builder.c:547
 msgid "LiVES: - RFX Parameter Window Hints"
 msgstr ""
 
-#: src/rfx-builder.c:556
+#: src/rfx-builder.c:550
 msgid "LiVES: - RFX Triggers"
 msgstr ""
 
-#: src/rfx-builder.c:622
+#: src/rfx-builder.c:613
 msgid "_New Entry"
 msgstr "_Nowy wpis"
 
-#: src/rfx-builder.c:625
+#: src/rfx-builder.c:616
 msgid "_Edit Entry"
 msgstr ""
 
-#: src/rfx-builder.c:628
+#: src/rfx-builder.c:619
 msgid "_Remove Entry"
 msgstr "_Usuń"
 
-#: src/rfx-builder.c:632
+#: src/rfx-builder.c:623
 msgid "Move _Up"
 msgstr "Przesuń w _górę"
 
-#: src/rfx-builder.c:635
+#: src/rfx-builder.c:626
 msgid "Move _Down"
 msgstr "Przesuń w _dół"
 
-#: src/rfx-builder.c:1004
+#: src/rfx-builder.c:984
 msgid "LiVES: - RFX Properties"
 msgstr ""
 
-#: src/rfx-builder.c:1013
+#: src/rfx-builder.c:993
 msgid "_Slow (hint to GUI)"
 msgstr ""
 
-#: src/rfx-builder.c:1024
+#: src/rfx-builder.c:1004
 msgid "_Batch mode generator"
 msgstr ""
 
-#: src/rfx-builder.c:1831
+#: src/rfx-builder.c:1790
 msgid ""
 "\n"
 "\n"
@@ -6202,7 +6215,7 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:1875
+#: src/rfx-builder.c:1834
 msgid ""
 "\n"
 "\n"
@@ -6210,219 +6223,219 @@
 "Please check the trigger code.\n"
 msgstr ""
 
-#: src/rfx-builder.c:1994
+#: src/rfx-builder.c:1950
 msgid "LiVES: - New RFX Parameter"
 msgstr ""
 
-#: src/rfx-builder.c:1997
+#: src/rfx-builder.c:1952
 msgid "LiVES: - Edit RFX Parameter"
 msgstr ""
 
-#: src/rfx-builder.c:2013
+#: src/rfx-builder.c:1968
 msgid "_Name:    "
 msgstr ""
 
-#: src/rfx-builder.c:2016
+#: src/rfx-builder.c:1971
 msgid "Name of the parameter, must be unique in the plugin."
 msgstr ""
 
-#: src/rfx-builder.c:2025
+#: src/rfx-builder.c:1981
 msgid "_Label:    "
 msgstr ""
 
-#: src/rfx-builder.c:2028
+#: src/rfx-builder.c:1984
 msgid ""
 "Label to be shown by the parameter. An underscore represents mnemonic "
 "accelerator."
 msgstr ""
 
-#: src/rfx-builder.c:2039
+#: src/rfx-builder.c:1996
 msgid "_Type:         "
 msgstr ""
 
-#: src/rfx-builder.c:2040
+#: src/rfx-builder.c:1997
 msgid "Parameter type (select from list)."
 msgstr ""
 
-#: src/rfx-builder.c:2073
+#: src/rfx-builder.c:2029
 msgid "Decimal _places: "
 msgstr ""
 
-#: src/rfx-builder.c:2082 src/rfx-builder.c:2477 src/rfx-builder.c:2495
+#: src/rfx-builder.c:2038 src/rfx-builder.c:2430 src/rfx-builder.c:2447
 msgid "_Default value:    "
 msgstr ""
 
-#: src/rfx-builder.c:2098
+#: src/rfx-builder.c:2054
 msgid "_Default: "
 msgstr ""
 
-#: src/rfx-builder.c:2132
+#: src/rfx-builder.c:2087
 msgid "Button _Group: "
 msgstr ""
 
-#: src/rfx-builder.c:2134
+#: src/rfx-builder.c:2089
 msgid "A non-zero value can be used to group radio buttons."
 msgstr ""
 
-#: src/rfx-builder.c:2142 src/rfx-builder.c:2478
+#: src/rfx-builder.c:2097 src/rfx-builder.c:2431
 msgid "_Minimum value: "
 msgstr ""
 
-#: src/rfx-builder.c:2148 src/rfx-builder.c:2479
+#: src/rfx-builder.c:2103 src/rfx-builder.c:2432
 msgid "Ma_ximum value: "
 msgstr ""
 
-#: src/rfx-builder.c:2157
+#: src/rfx-builder.c:2113
 msgid "     _Step size:   "
 msgstr ""
 
-#: src/rfx-builder.c:2160
+#: src/rfx-builder.c:2117
 msgid ""
 "How much the parameter is adjusted when the spinbutton arrows are pressed."
 msgstr ""
 
-#: src/rfx-builder.c:2171
+#: src/rfx-builder.c:2129
 msgid "_Wrap value"
 msgstr ""
 
-#: src/rfx-builder.c:2172
+#: src/rfx-builder.c:2131
 msgid "Whether the value wraps max->min and min->max."
 msgstr ""
 
-#: src/rfx-builder.c:2470
+#: src/rfx-builder.c:2424
 msgid "Set _values"
 msgstr ""
 
-#: src/rfx-builder.c:2512
+#: src/rfx-builder.c:2463
 msgid "Default _Red:  "
 msgstr ""
 
-#: src/rfx-builder.c:2513
+#: src/rfx-builder.c:2464
 msgid "Default _Green:"
 msgstr ""
 
-#: src/rfx-builder.c:2514
+#: src/rfx-builder.c:2465
 msgid "Default _Blue: "
 msgstr ""
 
-#: src/rfx-builder.c:2538
+#: src/rfx-builder.c:2488
 msgid "Set _default"
 msgstr ""
 
-#: src/rfx-builder.c:2540
+#: src/rfx-builder.c:2490
 msgid "Default value:  "
 msgstr ""
 
-#: src/rfx-builder.c:2541
+#: src/rfx-builder.c:2491
 msgid "Maximum length (chars): "
 msgstr ""
 
-#: src/rfx-builder.c:2576
+#: src/rfx-builder.c:2526
 msgid "LiVES: - New RFX Parameter Window Hint"
 msgstr ""
 
-#: src/rfx-builder.c:2579
+#: src/rfx-builder.c:2528
 msgid "LiVES: - Edit RFX Parameter Window Hint"
 msgstr ""
 
-#: src/rfx-builder.c:2622
+#: src/rfx-builder.c:2569
 msgid "_Keyword:         "
 msgstr ""
 
-#: src/rfx-builder.c:2639
+#: src/rfx-builder.c:2586
 msgid "Special _Type:         "
 msgstr ""
 
-#: src/rfx-builder.c:2656
+#: src/rfx-builder.c:2602
 msgid "Special _Subtype:         "
 msgstr ""
 
-#: src/rfx-builder.c:2667 src/rfx-builder.c:2706
+#: src/rfx-builder.c:2613 src/rfx-builder.c:2651
 msgid "Row:    "
 msgstr ""
 
-#: src/rfx-builder.c:2732
+#: src/rfx-builder.c:2676
 #, c-format
 msgid "Linked parameters (%d):    "
 msgstr ""
 
-#: src/rfx-builder.c:2749
+#: src/rfx-builder.c:2693
 msgid "Linked parameters (4):    "
 msgstr ""
 
-#: src/rfx-builder.c:2752
+#: src/rfx-builder.c:2695
 msgid "Linked parameters (2):    "
 msgstr ""
 
-#: src/rfx-builder.c:2777
+#: src/rfx-builder.c:2720
 msgid "LiVES: - New RFX Trigger"
 msgstr ""
 
-#: src/rfx-builder.c:2780
+#: src/rfx-builder.c:2722
 msgid "LiVES: - Edit RFX Trigger"
 msgstr ""
 
-#: src/rfx-builder.c:2808
+#: src/rfx-builder.c:2750
 msgid "When:         "
 msgstr ""
 
-#: src/rfx-builder.c:2904
+#: src/rfx-builder.c:2846
 msgid "LiVES: - Pre Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:2911
+#: src/rfx-builder.c:2853
 msgid "LiVES: - Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:2918
+#: src/rfx-builder.c:2860
 msgid "LiVES: - Post Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:2931
+#: src/rfx-builder.c:2873
 #, c-format
 msgid "LiVES: - Default text (max length %d)"
 msgstr ""
 
-#: src/rfx-builder.c:2944
+#: src/rfx-builder.c:2885
 msgid "LiVES: - Enter values, one per line"
 msgstr ""
 
-#: src/rfx-builder.c:3055
+#: src/rfx-builder.c:2996
 msgid ""
 "\n"
 "\n"
 "Name must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3060
+#: src/rfx-builder.c:3001
 msgid ""
 "\n"
 "\n"
 "Name must not contain spaces.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3065
+#: src/rfx-builder.c:3006
 msgid ""
 "\n"
 "\n"
 "Menu text must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3071
+#: src/rfx-builder.c:3012
 msgid ""
 "\n"
 "\n"
 "Action description must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3076
+#: src/rfx-builder.c:3017
 msgid ""
 "\n"
 "\n"
 "Author must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3085 src/rfx-builder.c:4339
+#: src/rfx-builder.c:3026 src/rfx-builder.c:4253
 msgid ""
 "\n"
 "\n"
@@ -6430,28 +6443,28 @@
 "Name must be unique.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3092
+#: src/rfx-builder.c:3033
 msgid ""
 "\n"
 "\n"
 "Loop code should not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3098
+#: src/rfx-builder.c:3039
 msgid ""
 "\n"
 "\n"
 "Trigger code should not be blank for a utility.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3111
+#: src/rfx-builder.c:3052
 msgid ""
 "\n"
 "\n"
 "Parameter name must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3117
+#: src/rfx-builder.c:3058
 msgid ""
 "\n"
 "\n"
@@ -6460,41 +6473,41 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:3171
+#: src/rfx-builder.c:3111
 #, c-format
 msgid "Writing script file %s..."
 msgstr ""
 
-#: src/rfx-builder.c:3477
+#: src/rfx-builder.c:3411
 msgid "No <define> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3484 src/rfx-builder.c:3493
+#: src/rfx-builder.c:3418 src/rfx-builder.c:3427
 msgid "Bad script version.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3505
+#: src/rfx-builder.c:3439
 msgid "No <name> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3513
+#: src/rfx-builder.c:3447
 msgid "No <version> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3522
+#: src/rfx-builder.c:3456
 msgid "No <author> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3536
+#: src/rfx-builder.c:3470
 msgid "No <description> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3540
+#: src/rfx-builder.c:3474
 #, c-format
 msgid "Bad description. (%s)\n"
 msgstr ""
 
-#: src/rfx-builder.c:3702
+#: src/rfx-builder.c:3627
 #, c-format
 msgid ""
 "\n"
@@ -6504,27 +6517,27 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:3859
+#: src/rfx-builder.c:3780
 msgid "Rebuilding all RFX scripts...builtin..."
 msgstr ""
 
-#: src/rfx-builder.c:3860
+#: src/rfx-builder.c:3781
 msgid "Rebuilding scripts"
 msgstr ""
 
-#: src/rfx-builder.c:3868
+#: src/rfx-builder.c:3789
 msgid "custom..."
 msgstr ""
 
-#: src/rfx-builder.c:3872
+#: src/rfx-builder.c:3793
 msgid "test..."
 msgstr ""
 
-#: src/rfx-builder.c:3878
+#: src/rfx-builder.c:3799
 msgid "rebuilding dynamic menu entries..."
 msgstr ""
 
-#: src/rfx-builder.c:3905 src/rfx-builder.c:3912
+#: src/rfx-builder.c:3826 src/rfx-builder.c:3834
 #, c-format
 msgid ""
 "\n"
@@ -6533,7 +6546,7 @@
 "Please check this program is in your path and executable.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3951
+#: src/rfx-builder.c:3874
 #, c-format
 msgid ""
 "\n"
@@ -6543,12 +6556,12 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:3960
+#: src/rfx-builder.c:3884
 #, c-format
 msgid "Deleting rfx script %s..."
 msgstr ""
 
-#: src/rfx-builder.c:3980
+#: src/rfx-builder.c:3902
 #, c-format
 msgid ""
 "\n"
@@ -6558,7 +6571,7 @@
 "Error code was %d\n"
 msgstr ""
 
-#: src/rfx-builder.c:4016
+#: src/rfx-builder.c:3938
 #, c-format
 msgid ""
 "\n"
@@ -6568,12 +6581,12 @@
 "Please delete it first, or rename the test script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4027
+#: src/rfx-builder.c:3950
 #, c-format
 msgid "Promoting rfx test plugin %s to custom..."
 msgstr ""
 
-#: src/rfx-builder.c:4044
+#: src/rfx-builder.c:3965
 #, c-format
 msgid ""
 "\n"
@@ -6584,20 +6597,20 @@
 "Return code was %d (%s)\n"
 msgstr ""
 
-#: src/rfx-builder.c:4070
+#: src/rfx-builder.c:3990
 msgid "LiVES: - Export Script to..."
 msgstr ""
 
-#: src/rfx-builder.c:4077 src/rfx-builder.c:4156
+#: src/rfx-builder.c:3997 src/rfx-builder.c:4074
 #, c-format
 msgid "Copying %s to %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4105
+#: src/rfx-builder.c:4024
 msgid "LiVES: Import Script from..."
 msgstr ""
 
-#: src/rfx-builder.c:4148
+#: src/rfx-builder.c:4067
 #, c-format
 msgid ""
 "\n"
@@ -6607,43 +6620,43 @@
 "Please delete it first, or rename the import script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4249
+#: src/rfx-builder.c:4166
 msgid "LiVES: - Copy RFX Script"
 msgstr ""
 
-#: src/rfx-builder.c:4251
+#: src/rfx-builder.c:4168
 msgid "_From type:    "
 msgstr ""
 
-#: src/rfx-builder.c:4258
+#: src/rfx-builder.c:4175
 msgid "   Script:    "
 msgstr ""
 
-#: src/rfx-builder.c:4267
+#: src/rfx-builder.c:4183
 msgid "LiVES: - Rename test RFX Script"
 msgstr ""
 
-#: src/rfx-builder.c:4268
+#: src/rfx-builder.c:4184
 msgid "From script: "
 msgstr ""
 
-#: src/rfx-builder.c:4273
+#: src/rfx-builder.c:4188
 msgid "LiVES: - RFX Script name"
 msgstr ""
 
-#: src/rfx-builder.c:4274
+#: src/rfx-builder.c:4189
 msgid "Script name: "
 msgstr ""
 
-#: src/rfx-builder.c:4294
+#: src/rfx-builder.c:4209
 msgid "New name: "
 msgstr ""
 
-#: src/rfx-builder.c:4297
+#: src/rfx-builder.c:4212
 msgid "New script name: "
 msgstr ""
 
-#: src/rfx-builder.c:4372
+#: src/rfx-builder.c:4286
 msgid ""
 "\n"
 "\n"
@@ -6651,12 +6664,12 @@
 "Script name must be unique.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4384
+#: src/rfx-builder.c:4297
 #, c-format
 msgid "Renaming RFX test script %s to %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4390
+#: src/rfx-builder.c:4302
 #, c-format
 msgid ""
 "\n"
@@ -6667,21 +6680,21 @@
 "Return code was %d\n"
 msgstr ""
 
-#: src/rfx-builder.c:4610
+#: src/rfx-builder.c:4518
 msgid "_Apply Real Time Effects to Selection"
 msgstr ""
 
-#: src/rfx-builder.c:4664
+#: src/rfx-builder.c:4572
 #, c-format
 msgid "Loading rendered effect %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4766
+#: src/rfx-builder.c:4674
 msgid ""
 "See: VJ - show VJ keys. Set the realtime effects, and then apply them here."
 msgstr ""
 
-#: src/preferences.c:359
+#: src/preferences.c:351
 msgid ""
 "\n"
 "\n"
@@ -6689,7 +6702,7 @@
 "full screen, separate window (fs) mode\n"
 msgstr ""
 
-#: src/preferences.c:408
+#: src/preferences.c:400
 msgid ""
 "\n"
 "\n"
@@ -6697,7 +6710,7 @@
 "(Free space = UNKNOWN)"
 msgstr ""
 
-#: src/preferences.c:412
+#: src/preferences.c:403
 #, c-format
 msgid ""
 "\n"
@@ -6706,14 +6719,14 @@
 "(Free space = %s)"
 msgstr ""
 
-#: src/preferences.c:416
+#: src/preferences.c:408
 msgid ""
 "The temp directory is LiVES working directory where opened clips and sets "
 "are stored.\n"
 "It should be in a partition with plenty of free disk space.\n"
 msgstr ""
 
-#: src/preferences.c:784
+#: src/preferences.c:839
 #, c-format
 msgid ""
 "Unable to create or write to the new temporary directory.\n"
@@ -6724,7 +6737,7 @@
 "The directory will not be changed now.\n"
 msgstr ""
 
-#: src/preferences.c:786
+#: src/preferences.c:843
 #, c-format
 msgid ""
 "Unable to create or write to the new temporary directory.\n"
@@ -6734,7 +6747,7 @@
 "The directory will not be changed now.\n"
 msgstr ""
 
-#: src/preferences.c:798
+#: src/preferences.c:856
 msgid ""
 "You have chosen to change the temporary directory.\n"
 "Please make sure you have no other copies of LiVES open.\n"
@@ -6746,20 +6759,20 @@
 "original setting."
 msgstr ""
 
-#: src/preferences.c:1169
+#: src/preferences.c:1221
 msgid ""
 "\n"
 "Unable to switch audio players to jack - jackd must be installed first.\n"
 "See http://jackaudio.org\n"
 msgstr ""
 
-#: src/preferences.c:1175
+#: src/preferences.c:1226
 msgid ""
 "\n"
 "Switching audio players requires restart (jackd must not be running)\n"
 msgstr ""
 
-#: src/preferences.c:1202
+#: src/preferences.c:1253
 msgid ""
 "\n"
 "Unable to switch audio players to pulse audio\n"
@@ -6767,815 +6780,815 @@
 "See http://www.pulseaudio.org\n"
 msgstr ""
 
-#: src/preferences.c:1502
+#: src/preferences.c:1544
 msgid "PCM (highest quality; largest files)"
 msgstr ""
 
-#: src/preferences.c:2063
+#: src/preferences.c:2096
 msgid "LiVES: - Preferences"
 msgstr ""
 
-#: src/preferences.c:2142
+#: src/preferences.c:2177
 msgid "Open file selection maximised"
 msgstr ""
 
-#: src/preferences.c:2149
+#: src/preferences.c:2184
 msgid "Show recent files in the File menu"
 msgstr ""
 
-#: src/preferences.c:2158
+#: src/preferences.c:2193
 msgid "Stop screensaver on playback    "
 msgstr ""
 
-#: src/preferences.c:2165
+#: src/preferences.c:2200
 msgid "Open main window maximised"
 msgstr ""
 
-#: src/preferences.c:2173
+#: src/preferences.c:2208
 msgid "Show toolbar when background is blanked"
 msgstr ""
 
-#: src/preferences.c:2181
+#: src/preferences.c:2216
 msgid "Allow mouse wheel to switch clips"
 msgstr ""
 
-#: src/preferences.c:2192
+#: src/preferences.c:2227
 msgid "Shrink previews to fit in interface"
 msgstr ""
 
-#: src/preferences.c:2202
+#: src/preferences.c:2237
 msgid "Startup mode:"
 msgstr ""
 
-#: src/preferences.c:2206
+#: src/preferences.c:2241
 msgid "_Clip editor"
 msgstr ""
 
-#: src/preferences.c:2210
+#: src/preferences.c:2245
 msgid "_Multitrack mode"
 msgstr ""
 
-#: src/preferences.c:2234
+#: src/preferences.c:2268
 msgid "Multi-head support"
 msgstr ""
 
-#: src/preferences.c:2242
+#: src/preferences.c:2276
 msgid " monitor number for LiVES interface"
 msgstr ""
 
-#: src/preferences.c:2248
+#: src/preferences.c:2282
 msgid " monitor number for playback"
 msgstr ""
 
-#: src/preferences.c:2260
+#: src/preferences.c:2294
 msgid ""
 "A setting of 0 means use all available monitors (only works with some "
 "playback plugins)."
 msgstr ""
 
-#: src/preferences.c:2270
+#: src/preferences.c:2304
 msgid "Force single monitor"
 msgstr ""
 
-#: src/preferences.c:2271
+#: src/preferences.c:2305
 msgid "Ignore all except the first monitor."
 msgstr ""
 
-#: src/preferences.c:2293
+#: src/preferences.c:2327
 msgid "Show clip thumbnails during playback"
 msgstr ""
 
-#: src/preferences.c:2306
+#: src/preferences.c:2340
 msgid "GUI"
 msgstr "GUI"
 
-#: src/preferences.c:2321
+#: src/preferences.c:2355
 msgid "When entering Multitrack mode:"
 msgstr ""
 
-#: src/preferences.c:2330
+#: src/preferences.c:2364
 msgid "_Prompt me for width, height, fps and audio settings"
 msgstr ""
 
-#: src/preferences.c:2336
+#: src/preferences.c:2370
 msgid "_Always use the following values:"
 msgstr ""
 
-#: src/preferences.c:2345
+#: src/preferences.c:2379
 msgid "Use these same _values for rendering a new clip"
 msgstr ""
 
-#: src/preferences.c:2370
+#: src/preferences.c:2404
 msgid "_Width           "
 msgstr ""
 
-#: src/preferences.c:2375
+#: src/preferences.c:2409
 msgid "          _Height      "
 msgstr ""
 
-#: src/preferences.c:2379
+#: src/preferences.c:2413
 msgid "          _FPS"
 msgstr ""
 
-#: src/preferences.c:2387
+#: src/preferences.c:2421
 msgid "Enable backing audio track"
 msgstr ""
 
-#: src/preferences.c:2394
+#: src/preferences.c:2428
 msgid "Audio track per video track"
 msgstr ""
 
-#: src/preferences.c:2423
+#: src/preferences.c:2457
 msgid "    _Undo buffer size (MB)    "
 msgstr ""
 
-#: src/preferences.c:2432
+#: src/preferences.c:2466
 msgid "_Exit multitrack mode after rendering"
 msgstr ""
 
-#: src/preferences.c:2440
+#: src/preferences.c:2474
 msgid "Auto backup layouts"
 msgstr ""
 
-#: src/preferences.c:2445
+#: src/preferences.c:2479
 msgid "_Every"
 msgstr ""
 
-#: src/preferences.c:2453
+#: src/preferences.c:2487
 msgid "seconds"
 msgstr "sekundy"
 
-#: src/preferences.c:2461
+#: src/preferences.c:2495
 msgid "After every _change"
 msgstr ""
 
-#: src/preferences.c:2467
+#: src/preferences.c:2501
 msgid "_Never"
 msgstr "_Nigdy"
 
-#: src/preferences.c:2490
+#: src/preferences.c:2523
 msgid "Multitrack/Render"
 msgstr ""
 
-#: src/preferences.c:2508
+#: src/preferences.c:2541
 msgid "Use instant opening when possible"
 msgstr ""
 
-#: src/preferences.c:2509
+#: src/preferences.c:2543
 msgid "Enable instant opening of some file types using decoder plugins"
 msgstr ""
 
-#: src/preferences.c:2531
+#: src/preferences.c:2567
 msgid "Video open command (fallback)"
 msgstr ""
 
-#: src/preferences.c:2543
+#: src/preferences.c:2579
 msgid "Open/render compression"
 msgstr ""
 
-#: src/preferences.c:2546
+#: src/preferences.c:2582
 msgid " %     ( lower = slower, larger files; for jpeg, higher quality )"
 msgstr ""
 
-#: src/preferences.c:2558
+#: src/preferences.c:2594
 msgid "Default image format"
 msgstr ""
 
-#: src/preferences.c:2562
+#: src/preferences.c:2598
 msgid "_jpeg"
 msgstr "_jpeg"
 
-#: src/preferences.c:2565
+#: src/preferences.c:2601
 msgid "_png"
 msgstr "_png"
 
-#: src/preferences.c:2572
+#: src/preferences.c:2608
 msgid "(Check Help/Troubleshoot to see which image formats are supported)"
 msgstr ""
 
-#: src/preferences.c:2580
+#: src/preferences.c:2616
 msgid "Enable automatic deinterlacing when possible"
 msgstr ""
 
-#: src/preferences.c:2582
+#: src/preferences.c:2619
 msgid "Automatically deinterlace frames when a plugin suggests it"
 msgstr ""
 
-#: src/preferences.c:2593
+#: src/preferences.c:2632
 msgid "Automatic trimming / padding of audio when possible"
 msgstr ""
 
-#: src/preferences.c:2595
+#: src/preferences.c:2634
 msgid "Automatically trim or pad audio when a plugin suggests it"
 msgstr ""
 
-#: src/preferences.c:2606
+#: src/preferences.c:2646
 msgid "Ignore blank borders when possible"
 msgstr ""
 
-#: src/preferences.c:2608
+#: src/preferences.c:2648
 msgid "Clip any blank borders from frames where possible"
 msgstr ""
 
-#: src/preferences.c:2619
+#: src/preferences.c:2660
 msgid "When opening multiple files, concatenate images into one clip"
 msgstr ""
 
-#: src/preferences.c:2629
+#: src/preferences.c:2670
 msgid "Decoding"
 msgstr "Dekodowanie"
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:2652
+#: src/preferences.c:2693
 msgid "Low - can improve performance on slower machines"
 msgstr ""
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:2654
+#: src/preferences.c:2695
 msgid "Normal - recommended for most users"
 msgstr ""
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:2656
+#: src/preferences.c:2697
 msgid "High - can improve quality on very fast machines"
 msgstr ""
 
-#: src/preferences.c:2659
+#: src/preferences.c:2700
 msgid "Preview _quality"
 msgstr ""
 
-#: src/preferences.c:2660
+#: src/preferences.c:2701
 msgid "The preview quality for video playback - affects resizing"
 msgstr ""
 
-#: src/preferences.c:2675
+#: src/preferences.c:2717
 msgid "_Show FPS statistics"
 msgstr ""
 
-#: src/preferences.c:2694
+#: src/preferences.c:2736
 msgid "_Plugin"
 msgstr "_Wtyczka"
 
-#: src/preferences.c:2718
+#: src/preferences.c:2760
 msgid "Stream audio"
 msgstr ""
 
-#: src/preferences.c:2721
+#: src/preferences.c:2763
 msgid "Stream audio to playback plugin"
 msgstr ""
 
-#: src/preferences.c:2734
+#: src/preferences.c:2778
 msgid "Record player output"
 msgstr ""
 
-#: src/preferences.c:2737
+#: src/preferences.c:2781
 msgid "Record output from player instead of input to player"
 msgstr ""
 
-#: src/preferences.c:2744
+#: src/preferences.c:2789
 msgid "VIDEO"
 msgstr "VIDEO"
 
-#: src/preferences.c:2787
+#: src/preferences.c:2833
 msgid "_Player"
 msgstr ""
 
-#: src/preferences.c:2792
+#: src/preferences.c:2838
 msgid "(See also the Jack Integration tab for jack startup options)"
 msgstr ""
 
-#: src/preferences.c:2819
+#: src/preferences.c:2865
 msgid "mplayer"
 msgstr "mplayer"
 
-#: src/preferences.c:2830
+#: src/preferences.c:2876
 #, fuzzy
 msgid "mplayer2"
 msgstr "mplayer"
 
-#: src/preferences.c:2833
+#: src/preferences.c:2879
 msgid "Audio play _command"
 msgstr ""
 
-#: src/preferences.c:2840
+#: src/preferences.c:2886
 msgid "- internal -"
 msgstr ""
 
-#: src/preferences.c:2849
+#: src/preferences.c:2895
 msgid "Audio follows video _rate/direction"
 msgstr ""
 
-#: src/preferences.c:2857
+#: src/preferences.c:2903
 msgid "Audio follows _clip switches"
 msgstr ""
 
-#: src/preferences.c:2864
+#: src/preferences.c:2910
 msgid "Source:"
 msgstr ""
 
-#: src/preferences.c:2868
+#: src/preferences.c:2914
 msgid "_Internal"
 msgstr ""
 
-#: src/preferences.c:2873
+#: src/preferences.c:2919
 msgid "_External (requires jack or pulse audio player)"
 msgstr ""
 
-#: src/preferences.c:2892
+#: src/preferences.c:2940
 msgid "AUDIO"
 msgstr ""
 
-#: src/preferences.c:2902
+#: src/preferences.c:2950
 msgid "Playback"
 msgstr "Odtwarzanie"
 
-#: src/preferences.c:2925
+#: src/preferences.c:2973
 msgid ""
 "Record audio when capturing an e_xternal window\n"
 " (requires jack or pulse audio)"
 msgstr ""
 
-#: src/preferences.c:2940
+#: src/preferences.c:2988
 msgid "      What to record when 'r' is pressed   "
 msgstr ""
 
-#: src/preferences.c:2949
+#: src/preferences.c:2997
 msgid "_Frame changes"
 msgstr ""
 
-#: src/preferences.c:2964
+#: src/preferences.c:3012
 msgid "F_PS changes"
 msgstr ""
 
-#: src/preferences.c:2982
+#: src/preferences.c:3030
 msgid "_Real time effects"
 msgstr ""
 
-#: src/preferences.c:2993
+#: src/preferences.c:3041
 msgid "_Clip switches"
 msgstr ""
 
-#: src/preferences.c:3004
+#: src/preferences.c:3052
 msgid "_Audio (requires jack or pulse audio player)"
 msgstr ""
 
-#: src/preferences.c:3024
+#: src/preferences.c:3072
 msgid "Pause recording if free disk space falls below"
 msgstr ""
 
 #. TRANSLATORS: gigabytes
-#: src/preferences.c:3030
+#: src/preferences.c:3078
 msgid "GB"
 msgstr ""
 
-#: src/preferences.c:3037
+#: src/preferences.c:3085
 msgid "Recording"
 msgstr "Nagrywanie"
 
-#: src/preferences.c:3055
+#: src/preferences.c:3103
 msgid "Encoder"
 msgstr ""
 
-#: src/preferences.c:3090
+#: src/preferences.c:3137
 msgid "Output format"
 msgstr "Format wyjściowy"
 
-#: src/preferences.c:3106
+#: src/preferences.c:3153
 msgid "Audio codec"
 msgstr "Kedek dźwięku"
 
-#: src/preferences.c:3119
+#: src/preferences.c:3165
 msgid "Encoding"
 msgstr "Kodowanie"
 
-#: src/preferences.c:3134
+#: src/preferences.c:3180
 msgid "Use _antialiasing when resizing"
 msgstr ""
 
-#: src/preferences.c:3143
+#: src/preferences.c:3189
 msgid "Number of _real time effect keys"
 msgstr ""
 
-#: src/preferences.c:3145
+#: src/preferences.c:3192
 msgid ""
 "The number of \"virtual\" real time effect keys. They can be controlled "
 "through the real time effects window, or via network (OSC)."
 msgstr ""
 
-#: src/preferences.c:3152
+#: src/preferences.c:3199
 msgid "Use _threads where possible when applying effects"
 msgstr ""
 
-#: src/preferences.c:3159
+#: src/preferences.c:3207
 msgid "Number of _threads"
 msgstr ""
 
-#: src/preferences.c:3172
+#: src/preferences.c:3221
 msgid "Restart is required if any of the following paths are changed:"
 msgstr ""
 
-#: src/preferences.c:3182
+#: src/preferences.c:3231
 msgid "Weed plugin path"
 msgstr ""
 
-#: src/preferences.c:3184
+#: src/preferences.c:3234
 msgid "Frei0r plugin path"
 msgstr ""
 
-#: src/preferences.c:3186
+#: src/preferences.c:3237
 msgid "LADSPA plugin path"
 msgstr ""
 
-#: src/preferences.c:3209
+#: src/preferences.c:3261
 msgid "      Video load directory (default)      "
 msgstr ""
 
-#: src/preferences.c:3215
+#: src/preferences.c:3267
 msgid "      Video save directory (default) "
 msgstr ""
 
-#: src/preferences.c:3221
+#: src/preferences.c:3273
 msgid "      Audio load directory (default) "
 msgstr ""
 
-#: src/preferences.c:3227
+#: src/preferences.c:3279
 msgid "      Image directory (default) "
 msgstr ""
 
-#: src/preferences.c:3233
+#: src/preferences.c:3285
 msgid "      Backup/Restore directory (default) "
 msgstr ""
 
-#: src/preferences.c:3239
+#: src/preferences.c:3291
 msgid "      Temp directory (do not remove) "
 msgstr ""
 
-#: src/preferences.c:3252
+#: src/preferences.c:3304
 msgid "The default directory for loading video clips from"
 msgstr ""
 
-#: src/preferences.c:3277
+#: src/preferences.c:3329
 msgid "The default directory for saving encoded clips to"
 msgstr ""
 
-#: src/preferences.c:3285
+#: src/preferences.c:3337
 msgid "The default directory for loading and saving audio"
 msgstr ""
 
-#: src/preferences.c:3293
+#: src/preferences.c:3345
 msgid "The default directory for saving frameshots to"
 msgstr ""
 
-#: src/preferences.c:3301
+#: src/preferences.c:3353
 msgid "The default directory for backing up/restoring single clips"
 msgstr ""
 
-#: src/preferences.c:3309
+#: src/preferences.c:3361
 msgid "LiVES working directory."
 msgstr ""
 
-#: src/preferences.c:3359
+#: src/preferences.c:3412
 msgid "Directories"
 msgstr "Katalogi"
 
-#: src/preferences.c:3374
+#: src/preferences.c:3427
 msgid "Warn if diskspace falls below: "
 msgstr ""
 
-#: src/preferences.c:3380 src/preferences.c:3394
+#: src/preferences.c:3433 src/preferences.c:3447
 msgid " MB [set to 0 to disable]"
 msgstr ""
 
-#: src/preferences.c:3389
+#: src/preferences.c:3442
 msgid "Diskspace critical level: "
 msgstr ""
 
-#: src/preferences.c:3407
+#: src/preferences.c:3461
 msgid ""
 "Warn on Insert / Merge if _frame rate of clipboard does not match frame rate "
 "of selection"
 msgstr ""
 
-#: src/preferences.c:3417
+#: src/preferences.c:3471
 msgid "Warn on Open if file _size exceeds "
 msgstr ""
 
-#: src/preferences.c:3425
+#: src/preferences.c:3479
 msgid " MB"
 msgstr " MB"
 
-#: src/preferences.c:3432
+#: src/preferences.c:3486
 msgid "Show a warning before saving a se_t"
 msgstr ""
 
-#: src/preferences.c:3442
+#: src/preferences.c:3496
 msgid ""
 "Show a warning if _mplayer/mplayer2, sox, composite or convert is not found "
 "when LiVES is started."
 msgstr ""
 
-#: src/preferences.c:3452
+#: src/preferences.c:3506
 msgid "Show a warning if no _rendered effects are found at startup."
 msgstr ""
 
-#: src/preferences.c:3464
+#: src/preferences.c:3518
 msgid "Show a warning if no _encoder plugins are found at startup."
 msgstr ""
 
-#: src/preferences.c:3474
+#: src/preferences.c:3528
 msgid "Show a warning if a _duplicate set name is entered."
 msgstr ""
 
-#: src/preferences.c:3485
+#: src/preferences.c:3539
 msgid "When a set is loaded, warn if clips are missing from _layouts."
 msgstr ""
 
-#: src/preferences.c:3495
+#: src/preferences.c:3550
 msgid "Warn if a clip used in a layout is about to be closed."
 msgstr ""
 
-#: src/preferences.c:3505
+#: src/preferences.c:3561
 msgid "Warn if frames used in a layout are about to be deleted."
 msgstr ""
 
-#: src/preferences.c:3515
+#: src/preferences.c:3572
 msgid "Warn if frames used in a layout are about to be shifted."
 msgstr ""
 
-#: src/preferences.c:3525
+#: src/preferences.c:3583
 msgid "Warn if frames used in a layout are about to be altered."
 msgstr ""
 
-#: src/preferences.c:3535
+#: src/preferences.c:3594
 msgid "Warn if audio used in a layout is about to be deleted."
 msgstr ""
 
-#: src/preferences.c:3546
+#: src/preferences.c:3606
 msgid "Warn if audio used in a layout is about to be shifted."
 msgstr ""
 
-#: src/preferences.c:3556
+#: src/preferences.c:3617
 msgid "Warn if audio used in a layout is about to be altered."
 msgstr ""
 
-#: src/preferences.c:3566
+#: src/preferences.c:3628
 msgid "Popup layout errors after clip changes."
 msgstr ""
 
-#: src/preferences.c:3577
+#: src/preferences.c:3639
 msgid "Warn if the layout has not been saved when leaving multitrack mode."
 msgstr ""
 
-#: src/preferences.c:3588
+#: src/preferences.c:3650
 msgid ""
 "Warn if multitrack has no audio channels, and a layout with audio is loaded."
 msgstr ""
 
-#: src/preferences.c:3598
+#: src/preferences.c:3660
 msgid ""
 "Warn if multitrack has audio channels, and your audio player is not \"jack\" "
 "or \"pulse audio\"."
 msgstr ""
 
-#: src/preferences.c:3610
+#: src/preferences.c:3672
 msgid "Show info message after importing from firewire device."
 msgstr ""
 
-#: src/preferences.c:3626
+#: src/preferences.c:3688
 msgid "Show a warning before opening a yuv4mpeg stream (advanced)."
 msgstr ""
 
-#: src/preferences.c:3639
+#: src/preferences.c:3701
 msgid "Show a warning when multitrack is low on backup space."
 msgstr ""
 
-#: src/preferences.c:3650
+#: src/preferences.c:3713
 msgid "Show a warning advising cleaning of disk space after a crash."
 msgstr ""
 
-#: src/preferences.c:3661
+#: src/preferences.c:3725
 msgid "Show a warning if unable to connect to pulseaudio player."
 msgstr ""
 
-#: src/preferences.c:3673
+#: src/preferences.c:3737
 msgid "Show a warning before wiping a layout which has unsaved changes."
 msgstr ""
 
-#: src/preferences.c:3685
+#: src/preferences.c:3749
 msgid "Warnings"
 msgstr "Ostrzeżenia"
 
-#: src/preferences.c:3703
+#: src/preferences.c:3767
 msgid "Midi synch (requires the files midistart and midistop)"
 msgstr ""
 
-#: src/preferences.c:3715
+#: src/preferences.c:3779
 msgid "When inserting/merging frames:  "
 msgstr ""
 
-#: src/preferences.c:3719
+#: src/preferences.c:3783
 msgid "_Speed Up/Slow Down Insertion"
 msgstr ""
 
-#: src/preferences.c:3723
+#: src/preferences.c:3787
 msgid "_Resample Insertion"
 msgstr ""
 
-#: src/preferences.c:3730
+#: src/preferences.c:3794
 msgid "CD device           "
 msgstr ""
 
-#: src/preferences.c:3733
+#: src/preferences.c:3797
 msgid "LiVES can load audio tracks from this CD"
 msgstr ""
 
-#: src/preferences.c:3746
+#: src/preferences.c:3813
 msgid "Default FPS        "
 msgstr ""
 
-#: src/preferences.c:3749
+#: src/preferences.c:3816
 msgid "Frames per second to use when none is specified"
 msgstr ""
 
-#: src/preferences.c:3757
+#: src/preferences.c:3825
 msgid "Misc"
 msgstr "Różne"
 
-#: src/preferences.c:3782
+#: src/preferences.c:3850
 msgid "New theme:           "
 msgstr ""
 
-#: src/preferences.c:3800
+#: src/preferences.c:3867
 msgid "Themes"
 msgstr "Motywy"
 
-#: src/preferences.c:3815
+#: src/preferences.c:3882
 msgid "Download bandwidth (Kb/s)       "
 msgstr ""
 
-#: src/preferences.c:3823
+#: src/preferences.c:3890
 msgid "LiVES must be compiled without \"configure --disable-OSC\" to use OMC"
 msgstr ""
 
-#: src/preferences.c:3833
+#: src/preferences.c:3900
 msgid "OMC remote control enabled"
 msgstr ""
 
-#: src/preferences.c:3841
+#: src/preferences.c:3908
 msgid "UDP port       "
 msgstr ""
 
-#: src/preferences.c:3850
+#: src/preferences.c:3917
 msgid "Start OMC on startup"
 msgstr ""
 
-#: src/preferences.c:3870
+#: src/preferences.c:3937
 msgid "Streaming/Networking"
 msgstr ""
 
-#: src/preferences.c:3882
+#: src/preferences.c:3949
 msgid "Jack transport"
 msgstr ""
 
-#: src/preferences.c:3886
+#: src/preferences.c:3953
 msgid ""
 "LiVES must be compiled with jack/transport.h and jack/jack.h present to use "
 "jack transport"
 msgstr ""
 
-#: src/preferences.c:3892
+#: src/preferences.c:3959
 msgid "Jack _transport config file"
 msgstr ""
 
-#: src/preferences.c:3899 src/preferences.c:3989
+#: src/preferences.c:3967 src/preferences.c:4058
 msgid "Start _server on LiVES startup"
 msgstr ""
 
-#: src/preferences.c:3911
+#: src/preferences.c:3979
 msgid "Jack transport _master (start and stop)"
 msgstr ""
 
-#: src/preferences.c:3921
+#: src/preferences.c:3989
 msgid "Jack transport _client (start and stop)"
 msgstr ""
 
-#: src/preferences.c:3935
+#: src/preferences.c:4003
 msgid "Jack transport sets start position"
 msgstr ""
 
-#: src/preferences.c:3952
+#: src/preferences.c:4020
 msgid "Jack transport timebase slave"
 msgstr ""
 
-#: src/preferences.c:3963
+#: src/preferences.c:4031
 msgid "(See also Playback -> Audio follows video rate/direction)"
 msgstr ""
 
-#: src/preferences.c:3971
+#: src/preferences.c:4039
 msgid "Jack audio"
 msgstr ""
 
-#: src/preferences.c:3975
+#: src/preferences.c:4043
 msgid "LiVES must be compiled with jack/jack.h present to use jack audio"
 msgstr ""
 
-#: src/preferences.c:3978
+#: src/preferences.c:4046
 msgid ""
 "You MUST set the audio player to \"jack\" in the Playback tab to use jack "
 "audio"
 msgstr ""
 
-#: src/preferences.c:3984
+#: src/preferences.c:4052
 msgid "Jack _audio server config file"
 msgstr ""
 
-#: src/preferences.c:3996
+#: src/preferences.c:4065
 msgid "Play audio even when transport is _paused"
 msgstr ""
 
-#: src/preferences.c:4008
+#: src/preferences.c:4077
 msgid "Automatically connect to System Out ports when 'playing' External Audio"
 msgstr ""
 
-#: src/preferences.c:4021
+#: src/preferences.c:4090
 msgid "Jack Integration"
 msgstr ""
 
-#: src/preferences.c:4035
+#: src/preferences.c:4104
 msgid "Events to respond to:"
 msgstr ""
 
-#: src/preferences.c:4044
+#: src/preferences.c:4113
 msgid "_Joystick events"
 msgstr ""
 
-#: src/preferences.c:4051
+#: src/preferences.c:4120
 msgid "_Joystick device"
 msgstr ""
 
-#: src/preferences.c:4053
+#: src/preferences.c:4122
 msgid "The joystick device, e.g. /dev/input/js0"
 msgstr ""
 
-#: src/preferences.c:4071
+#: src/preferences.c:4142
 msgid "_MIDI events"
 msgstr ""
 
-#: src/preferences.c:4080
+#: src/preferences.c:4151
 msgid "Use _ALSA MIDI (recommended)"
 msgstr ""
 
-#: src/preferences.c:4082
+#: src/preferences.c:4153
 msgid "Create an ALSA MIDI port which other MIDI devices can be connected to"
 msgstr ""
 
-#: src/preferences.c:4090
+#: src/preferences.c:4162
 msgid "Use _raw MIDI"
 msgstr ""
 
-#: src/preferences.c:4092
+#: src/preferences.c:4164
 msgid "Read directly from the MIDI device"
 msgstr ""
 
-#: src/preferences.c:4104
+#: src/preferences.c:4177
 msgid "_MIDI device"
 msgstr ""
 
-#: src/preferences.c:4106
+#: src/preferences.c:4179
 msgid "The MIDI device, e.g. /dev/input/midi0"
 msgstr ""
 
-#: src/preferences.c:4118
+#: src/preferences.c:4193
 msgid "Advanced"
 msgstr "Zaawansowane"
 
-#: src/preferences.c:4124
+#: src/preferences.c:4199
 msgid "MIDI check _rate"
 msgstr ""
 
-#: src/preferences.c:4127
+#: src/preferences.c:4203
 msgid ""
 "Number of MIDI checks per keyboard tick. Increasing this may improve MIDI "
 "responsiveness, but may slow down playback."
 msgstr ""
 
-#: src/preferences.c:4134
+#: src/preferences.c:4211
 msgid "MIDI repeat"
 msgstr ""
 
-#: src/preferences.c:4137
+#: src/preferences.c:4214
 msgid "Number of non-reads allowed between succesive reads."
 msgstr ""
 
-#: src/preferences.c:4140
+#: src/preferences.c:4218
 msgid "(Warning: setting this value too high can slow down playback.)"
 msgstr ""
 
-#: src/preferences.c:4159
+#: src/preferences.c:4237
 msgid "MIDI/Joystick learner"
 msgstr ""
 
-#: src/preferences.c:4499
+#: src/preferences.c:4679
 msgid ""
 "\n"
 "LiVES will now shut down. You need to restart it for the directory change to "
@@ -7583,214 +7596,214 @@
 "Click OK to continue.\n"
 msgstr ""
 
-#: src/preferences.c:4523
+#: src/preferences.c:4703
 msgid ""
 "For the directory change to take effect LiVES will restart when preferences "
 "dialog closes."
 msgstr ""
 
-#: src/preferences.c:4527
+#: src/preferences.c:4707
 msgid "Theme changes will not take effect until the next time you start LiVES."
 msgstr ""
 
-#: src/preferences.c:4531
+#: src/preferences.c:4711
 msgid "Jack options will not take effect until the next time you start LiVES."
 msgstr ""
 
-#: src/osc.c:2585
+#: src/osc.c:2616
 #, c-format
 msgid "Syncing to external framerate of %.8f frames per second.\n"
 msgstr ""
 
-#: src/osc.c:6746
+#: src/osc.c:6938
 msgid "Cannot initialize OSC receiver\n"
 msgstr ""
 
-#: src/osc.c:6770
+#: src/osc.c:6961
 #, c-format
 msgid "WARNING: Cannot start OSC server at UDP port %d\n"
 msgstr ""
 
-#: src/osc.c:6775
+#: src/osc.c:6963
 #, c-format
 msgid "Started OSC server at UDP port %d\n"
 msgstr ""
 
-#: src/osc.c:6890
+#: src/osc.c:7076
 #, c-format
 msgid "Cannot start OSC/UDP server at port %d \n"
 msgstr ""
 
-#: src/resample.c:125 src/resample.c:304
+#: src/resample.c:131 src/resample.c:305
 #, c-format
 msgid "Resizing frames 1 to %d"
 msgstr ""
 
-#: src/resample.c:140 src/resample.c:318
+#: src/resample.c:145 src/resample.c:318
 #, c-format
 msgid "Resizing/letterboxing frames 1 to %d"
 msgstr ""
 
-#: src/resample.c:361 src/resample.c:385
+#: src/resample.c:360 src/resample.c:384
 msgid "Resize"
 msgstr "Zmień rozmiar"
 
-#: src/resample.c:395
+#: src/resample.c:394
 msgid "Resample/Resize"
 msgstr ""
 
-#: src/resample.c:680
+#: src/resample.c:676
 #, c-format
 msgid "Length of video is now %d frames.\n"
 msgstr ""
 
-#: src/resample.c:745
+#: src/resample.c:737
 msgid ""
 "\n"
 "\n"
 "New rate must be greater than 0\n"
 msgstr ""
 
-#: src/resample.c:797 src/resample.c:813
+#: src/resample.c:788 src/resample.c:803
 msgid "Resampling audio"
 msgstr ""
 
-#: src/resample.c:831
+#: src/resample.c:821
 msgid "LiVES was unable to resample the audio as requested.\n"
 msgstr ""
 
-#: src/resample.c:833 src/resample.c:837
+#: src/resample.c:823 src/resample.c:827
 msgid "Resample Audio"
 msgstr ""
 
-#: src/resample.c:845
+#: src/resample.c:835
 #, c-format
 msgid "Audio was resampled to %d Hz, %d channels, %d bit"
 msgstr ""
 
-#: src/resample.c:1034
+#: src/resample.c:1016
 #, c-format
 msgid "Resampling video at %.8f frames per second..."
 msgstr ""
 
-#: src/resample.c:1037
+#: src/resample.c:1018
 #, c-format
 msgid "Resampling video at %.3f frames per second..."
 msgstr ""
 
-#: src/resample.c:1068
+#: src/resample.c:1049
 msgid "Reordering error !\n"
 msgstr ""
 
-#: src/resample.c:1079
+#: src/resample.c:1060
 msgid "Resample"
 msgstr "Zmiana rozdzielczości"
 
-#: src/resample.c:1192
+#: src/resample.c:1173
 msgid "LiVES: - Resample Audio"
 msgstr ""
 
-#: src/resample.c:1195
+#: src/resample.c:1175
 msgid "LiVES: - Insert Silence"
 msgstr ""
 
-#: src/resample.c:1198
+#: src/resample.c:1177
 msgid "LiVES: - New Clip Audio"
 msgstr ""
 
-#: src/resample.c:1201
+#: src/resample.c:1179
 msgid "LiVES: - External Clip Settings"
 msgstr ""
 
-#: src/resample.c:1238 src/resample.c:1358
+#: src/resample.c:1215 src/resample.c:1332
 msgid "Rate (Hz) "
 msgstr ""
 
-#: src/resample.c:1245 src/resample.c:1372
+#: src/resample.c:1222 src/resample.c:1346
 msgid "Channels"
 msgstr ""
 
-#: src/resample.c:1252
+#: src/resample.c:1229
 msgid "Sample Size "
 msgstr ""
 
-#: src/resample.c:1268 src/resample.c:1425
+#: src/resample.c:1245 src/resample.c:1399
 msgid "Signed"
 msgstr ""
 
-#: src/resample.c:1274 src/resample.c:1435
+#: src/resample.c:1251 src/resample.c:1409
 msgid "Unsigned"
 msgstr "Niepodpisany"
 
-#: src/resample.c:1297 src/resample.c:1460
+#: src/resample.c:1273 src/resample.c:1433
 msgid "Little Endian"
 msgstr ""
 
-#: src/resample.c:1303 src/resample.c:1468
+#: src/resample.c:1279 src/resample.c:1441
 msgid "Big Endian"
 msgstr ""
 
-#: src/resample.c:1315
+#: src/resample.c:1290
 msgid "Current"
 msgstr "Bieżące"
 
-#: src/resample.c:1340
+#: src/resample.c:1315
 msgid "_Enable audio"
 msgstr ""
 
-#: src/resample.c:1372
+#: src/resample.c:1346
 msgid "_Channels"
 msgstr ""
 
-#: src/resample.c:1394
+#: src/resample.c:1368
 msgid "_Sample Size"
 msgstr ""
 
-#: src/resample.c:1394
+#: src/resample.c:1368
 msgid "Sample Size"
 msgstr ""
 
-#: src/resample.c:1489
+#: src/resample.c:1461
 msgid "New"
 msgstr "Nowa"
 
-#: src/resample.c:1512
+#: src/resample.c:1484
 msgid "_Frames Per Second "
 msgstr ""
 
-#: src/resample.c:1530
+#: src/resample.c:1502
 msgid "Record for maximum:  "
 msgstr ""
 
-#: src/resample.c:1533
+#: src/resample.c:1505
 msgid " hours  "
 msgstr ""
 
-#: src/resample.c:1536
+#: src/resample.c:1508
 msgid " minutes  "
 msgstr ""
 
-#: src/resample.c:1538
+#: src/resample.c:1510
 msgid " seconds  "
 msgstr ""
 
-#: src/resample.c:1545
+#: src/resample.c:1517
 msgid "Unlimited"
 msgstr "Nieograniczony"
 
-#: src/resample.c:1561
+#: src/resample.c:1533
 msgid "Click OK to begin recording, or Cancel to quit."
 msgstr ""
 
-#: src/resample.c:1670
+#: src/resample.c:1638
 msgid "LiVES: - Change playback speed"
 msgstr ""
 
-#: src/resample.c:1673
+#: src/resample.c:1640
 msgid "LiVES: - Resample Video"
 msgstr ""
 
-#: src/resample.c:1696
+#: src/resample.c:1663
 #, c-format
 msgid ""
 "\n"
@@ -7801,7 +7814,7 @@
 "in _frames per second"
 msgstr ""
 
-#: src/resample.c:1701
+#: src/resample.c:1667
 #, c-format
 msgid ""
 "\n"
@@ -7812,89 +7825,89 @@
 "in frames per second"
 msgstr ""
 
-#: src/resample.c:1723
+#: src/resample.c:1688
 msgid "OR enter the desired clip length in _seconds"
 msgstr ""
 
-#: src/resample.c:1745
+#: src/resample.c:1710
 msgid "Change the _audio speed as well"
 msgstr ""
 
-#: src/resample.c:1846
+#: src/resample.c:1810
 msgid ""
 "\n"
 "Speeding up the clip will cause missing frames in some multitrack layouts.\n"
 "Are you sure you wish to change the speed ?\n"
 msgstr ""
 
-#: src/resample.c:1863
+#: src/resample.c:1829
 msgid ""
 "\n"
 "Speeding up the clip will cause missing audio in some multitrack layouts.\n"
 "Are you sure you wish to change the speed ?\n"
 msgstr ""
 
-#: src/resample.c:1878
+#: src/resample.c:1847
 msgid ""
 "\n"
 "Changing the speed will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/resample.c:1892
+#: src/resample.c:1863
 msgid ""
 "\n"
 "Changing the speed will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/resample.c:1938
+#: src/resample.c:1911
 msgid "Speed Change"
 msgstr ""
 
-#: src/resample.c:1947
+#: src/resample.c:1920
 #, c-format
 msgid "Changed playback speed to %.3f frames per second and audio to %d Hz.\n"
 msgstr ""
 
-#: src/resample.c:1950
+#: src/resample.c:1922
 #, c-format
 msgid "Changed playback speed to %.3f frames per second.\n"
 msgstr ""
 
-#: src/resample.c:2035
+#: src/resample.c:2006
 msgid "Resampling video"
 msgstr ""
 
-#: src/resample.c:2042 src/resample.c:2160 src/resample.c:2182
+#: src/resample.c:2012 src/resample.c:2127 src/resample.c:2148
 msgid "Resampling clipboard video"
 msgstr ""
 
-#: src/resample.c:2047
+#: src/resample.c:2016
 msgid "Reordering frames"
 msgstr ""
 
-#: src/resample.c:2056
+#: src/resample.c:2025
 msgid ""
 "\n"
 "\n"
 "LiVES was unable to reorder the frames."
 msgstr ""
 
-#: src/resample.c:2104
+#: src/resample.c:2071
 msgid "Deordering frames"
 msgstr ""
 
-#: src/resample.c:2199
+#: src/resample.c:2165
 msgid "resampling error..."
 msgstr ""
 
-#: src/rte_window.c:85 src/rte_window.c:1708
+#: src/rte_window.c:124 src/rte_window.c:1709
 #, c-format
 msgid "Type: %s"
 msgstr "Typ: %s"
 
-#: src/rte_window.c:112
+#: src/rte_window.c:150
 msgid ""
 "\n"
 "\n"
@@ -7904,7 +7917,7 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:426
+#: src/rte_window.c:460
 msgid ""
 "\n"
 "\n"
@@ -7912,19 +7925,19 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:432
+#: src/rte_window.c:466
 #, c-format
 msgid "Saving keymap to %s\n"
 msgstr ""
 
-#: src/rte_window.c:439
+#: src/rte_window.c:471
 #, c-format
 msgid ""
 "\n"
 "Updating keymap file %s..."
 msgstr ""
 
-#: src/rte_window.c:446
+#: src/rte_window.c:477
 #, c-format
 msgid ""
 "\n"
@@ -7934,12 +7947,12 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/rte_window.c:526
+#: src/rte_window.c:556
 #, c-format
 msgid "Saving real time effect defaults to %s..."
 msgstr ""
 
-#: src/rte_window.c:535
+#: src/rte_window.c:563
 #, c-format
 msgid ""
 "\n"
@@ -7949,22 +7962,22 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/rte_window.c:632
+#: src/rte_window.c:657
 #, c-format
 msgid "Loading real time effect defaults from %s..."
 msgstr ""
 
-#: src/rte_window.c:681
+#: src/rte_window.c:701
 #, c-format
 msgid "Loading generator default sizes from %s..."
 msgstr ""
 
-#: src/rte_window.c:1306
+#: src/rte_window.c:1319
 #, c-format
 msgid "Loading default keymap from %s..."
 msgstr ""
 
-#: src/rte_window.c:1329
+#: src/rte_window.c:1339
 #, c-format
 msgid ""
 "\n"
@@ -7974,48 +7987,48 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/rte_window.c:1403
+#: src/rte_window.c:1412
 #, c-format
 msgid "Invalid line %d in %s\n"
 msgstr ""
 
-#: src/rte_window.c:1483
+#: src/rte_window.c:1490
 #, c-format
 msgid "Invalid key %d in %s\n"
 msgstr ""
 
-#: src/rte_window.c:1498
+#: src/rte_window.c:1505
 #, c-format
 msgid "Invalid effect %s in %s\n"
 msgstr ""
 
-#: src/rte_window.c:1517
+#: src/rte_window.c:1524
 #, c-format
 msgid "Unknown effect %s in %s\n"
 msgstr ""
 
-#: src/rte_window.c:1535
+#: src/rte_window.c:1542
 #, c-format
 msgid ""
 "This version of LiVES cannot mix generators/non-generators on the same key "
 "(%d) !\n"
 msgstr ""
 
-#: src/rte_window.c:1547
+#: src/rte_window.c:1554
 #, c-format
 msgid "Too many effects bound to key %d.\n"
 msgstr ""
 
-#: src/rte_window.c:1587
+#: src/rte_window.c:1593
 msgid "update required.\n"
 msgstr ""
 
-#: src/rte_window.c:1603
+#: src/rte_window.c:1607
 #, c-format
 msgid "Loading data connection map from %s..."
 msgstr ""
 
-#: src/rte_window.c:1612
+#: src/rte_window.c:1614
 msgid ""
 "\n"
 "\n"
@@ -8023,41 +8036,41 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:1691
+#: src/rte_window.c:1692
 #, c-format
 msgid "LiVES: Information for %s"
 msgstr ""
 
-#: src/rte_window.c:1704
+#: src/rte_window.c:1705
 #, c-format
 msgid "Effect name: %s"
 msgstr ""
 
-#: src/rte_window.c:1712
+#: src/rte_window.c:1713
 #, c-format
 msgid "Plugin name: %s"
 msgstr ""
 
-#: src/rte_window.c:1716
+#: src/rte_window.c:1717
 #, c-format
 msgid "Author: %s"
 msgstr "Autor: %s"
 
-#: src/rte_window.c:1721
+#: src/rte_window.c:1722
 #, c-format
 msgid "and: %s"
 msgstr ""
 
-#: src/rte_window.c:1726
+#: src/rte_window.c:1727
 #, c-format
 msgid "Version: %d"
 msgstr ""
 
-#: src/rte_window.c:1734
+#: src/rte_window.c:1735
 msgid "Description: "
 msgstr "Opis: "
 
-#: src/rte_window.c:1960
+#: src/rte_window.c:1963
 msgid ""
 "\n"
 "\n"
@@ -8066,69 +8079,69 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:2024
+#: src/rte_window.c:2027
 #, c-format
 msgid "LiVES could not locate the effect %s.\n"
 msgstr ""
 
-#: src/rte_window.c:2225
+#: src/rte_window.c:2216
 msgid "LiVES: Real time effect mapping"
 msgstr ""
 
-#: src/rte_window.c:2257
+#: src/rte_window.c:2248
 #, c-format
 msgid "Ctrl-%d"
 msgstr "Ctrl-%d"
 
-#: src/rte_window.c:2264
+#: src/rte_window.c:2255
 msgid "Key active"
 msgstr ""
 
-#: src/rte_window.c:2279
+#: src/rte_window.c:2271
 msgid "Key grab"
 msgstr ""
 
-#: src/rte_window.c:2280
+#: src/rte_window.c:2272
 msgid "Grab keyboard for this effect key"
 msgstr ""
 
-#: src/rte_window.c:2290
+#: src/rte_window.c:2283
 msgid "_Clear all effects"
 msgstr ""
 
-#: src/rte_window.c:2304
+#: src/rte_window.c:2297
 msgid "Mode active"
 msgstr ""
 
-#: src/rte_window.c:2314 src/multitrack.c:8568
+#: src/rte_window.c:2307 src/multitrack.c:8762
 msgid "Info"
 msgstr "Informacje"
 
-#: src/rte_window.c:2315
+#: src/rte_window.c:2308
 msgid "Set Parameters"
 msgstr ""
 
-#: src/rte_window.c:2316
+#: src/rte_window.c:2309
 msgid "Set Connections"
 msgstr ""
 
-#: src/rte_window.c:2317
+#: src/rte_window.c:2310
 msgid "Clear"
 msgstr "Wyczyść"
 
-#: src/rte_window.c:2326
+#: src/rte_window.c:2319
 msgid "Effect name:"
 msgstr ""
 
-#: src/rte_window.c:2391
+#: src/rte_window.c:2384
 msgid "_Save as default keymap"
 msgstr ""
 
-#: src/rte_window.c:2396
+#: src/rte_window.c:2389
 msgid "_Load default keymap"
 msgstr ""
 
-#: src/rte_window.c:2840
+#: src/rte_window.c:2833
 #, c-format
 msgid ""
 "Unable to create default keymap file: %s\n"
@@ -8186,86 +8199,86 @@
 msgid "none\n"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:494
+#: src/lives-yuv4mpeg.c:493
 #, c-format
 msgid ""
 "Unable to set display framerate to %.3f fps.\n"
 "\n"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:503
+#: src/lives-yuv4mpeg.c:502
 #, c-format
 msgid "Unable to open yuv4mpeg out stream %s\n"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:628
+#: src/lives-yuv4mpeg.c:626
 #, c-format
 msgid "TV card %d"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:713
+#: src/lives-yuv4mpeg.c:710
 #, c-format
 msgid "Opened TV card %d (%s)"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:760
+#: src/lives-yuv4mpeg.c:757
 #, c-format
 msgid "Firewire card %d"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:796
+#: src/lives-yuv4mpeg.c:793
 #, c-format
 msgid "Opened firewire card %d"
 msgstr ""
 
-#: src/multitrack.c:666
+#: src/multitrack.c:736
 msgid "Auto backup"
 msgstr ""
 
-#: src/multitrack.c:868
+#: src/multitrack.c:935
 msgid "Backing audio"
 msgstr ""
 
-#: src/multitrack.c:1435
+#: src/multitrack.c:1515
 #, c-format
 msgid "%s : parameters for %s"
 msgstr ""
 
-#: src/multitrack.c:1809 src/multitrack.c:3483
+#: src/multitrack.c:1881 src/multitrack.c:3635
 #, c-format
 msgid "Current track: %s (layer %d)\n"
 msgstr ""
 
-#: src/multitrack.c:1813 src/multitrack.c:3484
+#: src/multitrack.c:1885 src/multitrack.c:3637
 msgid "Current track: Backing audio\n"
 msgstr ""
 
-#: src/multitrack.c:1814
+#: src/multitrack.c:1886
 #, c-format
 msgid "Current track: Layer %d audio\n"
 msgstr ""
 
-#: src/multitrack.c:1817
+#: src/multitrack.c:1889
 #, c-format
 msgid "%.2f sec.\n"
 msgstr ""
 
-#: src/multitrack.c:1822 src/multitrack.c:3490
+#: src/multitrack.c:1894 src/multitrack.c:3643
 #, c-format
 msgid "Source: %s"
 msgstr "Źródło: %s"
 
-#: src/multitrack.c:1825 src/multitrack.c:3492
+#: src/multitrack.c:1897 src/multitrack.c:3645
 msgid "Right click for context menu.\n"
 msgstr ""
 
-#: src/multitrack.c:1827
+#: src/multitrack.c:1899
 msgid ""
 "Double click on a block\n"
 "to select it."
 msgstr ""
 
-#: src/multitrack.c:3312
+#: src/multitrack.c:3452
 msgid ""
 "\n"
 "\n"
@@ -8274,7 +8287,7 @@
 "right or double clicking on it.\n"
 msgstr ""
 
-#: src/multitrack.c:3315
+#: src/multitrack.c:3455
 msgid ""
 "\n"
 "\n"
@@ -8282,14 +8295,14 @@
 "Select an effect in FX stack first to view its parameters.\n"
 msgstr ""
 
-#: src/multitrack.c:3318
+#: src/multitrack.c:3458
 msgid ""
 "\n"
 "\n"
 "No clips loaded.\n"
 msgstr ""
 
-#: src/multitrack.c:3321
+#: src/multitrack.c:3462
 msgid ""
 "You must select two video tracks\n"
 "and a time region\n"
@@ -8299,7 +8312,7 @@
 "before inserting clips into the timeline."
 msgstr ""
 
-#: src/multitrack.c:3324
+#: src/multitrack.c:3465
 msgid ""
 "\n"
 "\n"
@@ -8308,210 +8321,210 @@
 "to apply compositors.\n"
 msgstr ""
 
-#: src/multitrack.c:3487
+#: src/multitrack.c:3640
 #, c-format
 msgid "%.2f sec. to %.2f sec.\n"
 msgstr ""
 
-#: src/multitrack.c:3493
+#: src/multitrack.c:3646
 msgid ""
 "Single click on timeline\n"
 "to select a frame.\n"
 msgstr ""
 
-#: src/multitrack.c:3711 src/multitrack.c:6790
+#: src/multitrack.c:3858 src/multitrack.c:6972
 #, c-format
 msgid "%s [unstable]"
 msgstr ""
 
-#: src/multitrack.c:3822
+#: src/multitrack.c:3973
 msgid ""
 "You can click and drag\n"
 "below the timeline"
 msgstr ""
 
-#: src/multitrack.c:3823
+#: src/multitrack.c:3974
 msgid "to select a time region.\n"
 msgstr ""
 
-#: src/multitrack.c:3985
+#: src/multitrack.c:4137
 msgid "LiVES: Selected clip"
 msgstr ""
 
-#: src/multitrack.c:3993
+#: src/multitrack.c:4145
 msgid "_Adjust start and end points"
 msgstr ""
 
-#: src/multitrack.c:4002
+#: src/multitrack.c:4154
 msgid "_Edit/encode in clip editor"
 msgstr ""
 
-#: src/multitrack.c:4009
+#: src/multitrack.c:4161
 msgid "_Show clip information"
 msgstr ""
 
-#: src/multitrack.c:4016
+#: src/multitrack.c:4168
 msgid "_Close this clip"
 msgstr ""
 
-#: src/multitrack.c:4236
+#: src/multitrack.c:4388
 msgid "Audio mixer (ctrl-m)"
 msgstr ""
 
-#: src/multitrack.c:4336
+#: src/multitrack.c:4488
 msgid "Single click on timeline"
 msgstr ""
 
-#: src/multitrack.c:4337
+#: src/multitrack.c:4489
 msgid "to select a frame."
 msgstr ""
 
-#: src/multitrack.c:4338
+#: src/multitrack.c:4490
 msgid "Double click or right click on timeline"
 msgstr ""
 
-#: src/multitrack.c:4339
+#: src/multitrack.c:4491
 msgid "to select a block."
 msgstr ""
 
-#: src/multitrack.c:4340
+#: src/multitrack.c:4492
 msgid "Clips can be dragged"
 msgstr ""
 
-#: src/multitrack.c:4341
+#: src/multitrack.c:4493
 msgid "onto the timeline."
 msgstr ""
 
-#: src/multitrack.c:4343
+#: src/multitrack.c:4495
 msgid "Mouse mode is: Move"
 msgstr ""
 
-#: src/multitrack.c:4344
+#: src/multitrack.c:4496
 msgid "clips can be moved around."
 msgstr ""
 
-#: src/multitrack.c:4349
+#: src/multitrack.c:4500
 msgid "Mouse mode is: Select."
 msgstr ""
 
-#: src/multitrack.c:4350
+#: src/multitrack.c:4501
 msgid "Drag with mouse on timeline"
 msgstr ""
 
-#: src/multitrack.c:4351
+#: src/multitrack.c:4502
 msgid "to select tracks and time."
 msgstr ""
 
-#: src/multitrack.c:4362
+#: src/multitrack.c:4509
 msgid "_Insert mode: Normal"
 msgstr ""
 
-#: src/multitrack.c:4378
+#: src/multitrack.c:4537
 msgid "_Mouse mode: Move"
 msgstr ""
 
-#: src/multitrack.c:4382
+#: src/multitrack.c:4540
 msgid "_Mouse mode: Select"
 msgstr ""
 
-#: src/multitrack.c:4405 src/multitrack.c:7925
+#: src/multitrack.c:4563 src/multitrack.c:8104
 msgid "Gravity: Normal"
 msgstr ""
 
-#: src/multitrack.c:4409
+#: src/multitrack.c:4565
 msgid "Gravity: Left"
 msgstr ""
 
-#: src/multitrack.c:4414
+#: src/multitrack.c:4569
 msgid "Gravity: Right"
 msgstr ""
 
-#: src/multitrack.c:4416
+#: src/multitrack.c:4570
 msgid "Close _last gap(s) in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:4419
+#: src/multitrack.c:4572
 msgid "Close _first gap(s) in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:4458
+#: src/multitrack.c:4627
 msgid "Close gaps"
 msgstr "Zamykanie przerw"
 
-#: src/multitrack.c:4460
+#: src/multitrack.c:4629
 msgid "Move block"
 msgstr ""
 
-#: src/multitrack.c:4462
+#: src/multitrack.c:4631
 msgid "Move audio block"
 msgstr ""
 
-#: src/multitrack.c:4464
+#: src/multitrack.c:4633
 msgid "Delete block"
 msgstr "Usuń blok"
 
-#: src/multitrack.c:4466
+#: src/multitrack.c:4635
 msgid "Delete audio block"
 msgstr ""
 
-#: src/multitrack.c:4468
+#: src/multitrack.c:4637
 msgid "Split tracks"
 msgstr ""
 
-#: src/multitrack.c:4470
+#: src/multitrack.c:4639
 msgid "Split block"
 msgstr ""
 
-#: src/multitrack.c:4473
+#: src/multitrack.c:4642
 #, c-format
 msgid "Apply %s"
 msgstr ""
 
-#: src/multitrack.c:4478
+#: src/multitrack.c:4647
 #, c-format
 msgid "Delete %s"
 msgstr "Usuń %s"
 
-#: src/multitrack.c:4482
+#: src/multitrack.c:4651
 msgid "Insert block"
 msgstr ""
 
-#: src/multitrack.c:4484
+#: src/multitrack.c:4653
 msgid "Insert gap"
 msgstr ""
 
-#: src/multitrack.c:4486
+#: src/multitrack.c:4655
 msgid "Insert audio block"
 msgstr ""
 
-#: src/multitrack.c:4488
+#: src/multitrack.c:4657
 msgid "Effect order change"
 msgstr ""
 
-#: src/multitrack.c:4898
+#: src/multitrack.c:5064
 msgid "unsigned "
 msgstr ""
 
-#: src/multitrack.c:4899
+#: src/multitrack.c:5065
 msgid "signed "
 msgstr ""
 
-#: src/multitrack.c:4904
+#: src/multitrack.c:5071
 #, c-format
 msgid ""
 "Multitrack values set to %.3f fps, frame size %d x %d, audio channels %d, "
 "audio rate %d, audio sample size %d, %s.\n"
 msgstr ""
 
-#: src/multitrack.c:4938
+#: src/multitrack.c:5104
 msgid "invalid event list. Failed.\n"
 msgstr ""
 
-#: src/multitrack.c:4944
+#: src/multitrack.c:5110
 msgid "event list has invalid fps. Failed.\n"
 msgstr ""
 
-#: src/multitrack.c:4953
+#: src/multitrack.c:5122
 #, c-format
 msgid ""
 "\n"
@@ -8521,7 +8534,7 @@
 "then load in the new set from the File menu.\n"
 msgstr ""
 
-#: src/multitrack.c:4993
+#: src/multitrack.c:5163
 #, c-format
 msgid ""
 "\n"
@@ -8529,600 +8542,592 @@
 "It cannot be loaded.\n"
 msgstr ""
 
-#: src/multitrack.c:5329 src/multitrack.c:5338 src/multitrack.c:21133
+#: src/multitrack.c:5452
 msgid "Layout was wiped.\n"
 msgstr ""
 
-#: src/multitrack.c:5374
+#: src/multitrack.c:5547
 #, c-format
 msgid "LiVES-%s: Multitrack %dx%d : %d bpp %.3f fps"
 msgstr ""
 
-#: src/multitrack.c:5617
+#: src/multitrack.c:5793
 msgid "In/out"
 msgstr ""
 
-#: src/multitrack.c:5619
+#: src/multitrack.c:5795
 msgid "FX stack"
 msgstr ""
 
-#: src/multitrack.c:5627 src/omc-learn.c:673
+#: src/multitrack.c:5803 src/omc-learn.c:659
 msgid "Params."
 msgstr ""
 
-#: src/multitrack.c:5978
+#: src/multitrack.c:6157
 msgid "_Open..."
 msgstr ""
 
-#: src/multitrack.c:5996
+#: src/multitrack.c:6175
 msgid "O_pen File Selection..."
 msgstr ""
 
-#: src/multitrack.c:6040
+#: src/multitrack.c:6219
 msgid "Import Selection from _dvd/vcd..."
 msgstr ""
 
-#: src/multitrack.c:6050
+#: src/multitrack.c:6229
 msgid "Import Selection from _dvd"
 msgstr ""
 
-#: src/multitrack.c:6060
+#: src/multitrack.c:6239
 msgid "Import Selection from _vcd"
 msgstr ""
 
-#: src/multitrack.c:6076
+#: src/multitrack.c:6255
 msgid "_Import from Device"
 msgstr ""
 
-#: src/multitrack.c:6103
+#: src/multitrack.c:6282
 msgid "_Close the selected clip"
 msgstr ""
 
-#: src/multitrack.c:6198
+#: src/multitrack.c:6377
 msgid "_Save layout as..."
 msgstr ""
 
-#: src/multitrack.c:6206
+#: src/multitrack.c:6385
 msgid "_Load layout..."
 msgstr ""
 
-#: src/multitrack.c:6210
+#: src/multitrack.c:6389
 msgid "_Wipe/Delete layout..."
 msgstr ""
 
-#: src/multitrack.c:6236
+#: src/multitrack.c:6415
 msgid "_Ignore width, height and audio values from loaded layouts"
 msgstr ""
 
-#: src/multitrack.c:6240
+#: src/multitrack.c:6419
 msgid "Auto load _subtitles with clips"
 msgstr ""
 
-#: src/multitrack.c:6322
+#: src/multitrack.c:6501
 msgid "_CLIP EDITOR"
 msgstr ""
 
-#: src/multitrack.c:6334
+#: src/multitrack.c:6513
 msgid "_Adjust selected clip start/end points"
 msgstr ""
 
-#: src/multitrack.c:6343
+#: src/multitrack.c:6522
 msgid "_Insert selected clip"
 msgstr ""
 
-#: src/multitrack.c:6355
+#: src/multitrack.c:6534
 msgid "_Insert selected clip audio"
 msgstr ""
 
-#: src/multitrack.c:6364
+#: src/multitrack.c:6543
 msgid "_Delete selected block"
 msgstr ""
 
-#: src/multitrack.c:6373
+#: src/multitrack.c:6555
 msgid "_Jump to previous block boundary"
 msgstr ""
 
-#: src/multitrack.c:6382
+#: src/multitrack.c:6564
 msgid "_Jump to next block boundary"
 msgstr ""
 
-#: src/multitrack.c:6395
+#: src/multitrack.c:6577
 msgid "Clear _marks from timeline"
 msgstr ""
 
-#: src/multitrack.c:6403
+#: src/multitrack.c:6585
 msgid "Ignore selection limits when inserting"
 msgstr ""
 
-#: src/multitrack.c:6420 src/multitrack.c:16719
+#: src/multitrack.c:6602 src/multitrack.c:17009
 msgid "_Play from Timeline Position"
 msgstr ""
 
-#: src/multitrack.c:6434
+#: src/multitrack.c:6616
 msgid "Pla_y selected time only"
 msgstr ""
 
-#: src/multitrack.c:6518
+#: src/multitrack.c:6700
 msgid "_Move effects with blocks"
 msgstr ""
 
-#: src/multitrack.c:6531
+#: src/multitrack.c:6713
 msgid "Select _autotransition effect..."
 msgstr ""
 
-#: src/multitrack.c:6542
+#: src/multitrack.c:6724
 msgid "Crossfade audio with autotransition"
 msgstr ""
 
-#: src/multitrack.c:6550
+#: src/multitrack.c:6732
 msgid "View/_Edit selected effect"
 msgstr ""
 
-#: src/multitrack.c:6554
+#: src/multitrack.c:6736
 msgid "_Delete selected effect"
 msgstr ""
 
-#: src/multitrack.c:6562
+#: src/multitrack.c:6744
 msgid "Apply effect to _block..."
 msgstr ""
 
-#: src/multitrack.c:6619
+#: src/multitrack.c:6801
 msgid "Apply effect to _region..."
 msgstr ""
 
-#: src/multitrack.c:6885
+#: src/multitrack.c:7061
 msgid "_Tracks"
 msgstr ""
 
-#: src/multitrack.c:6896
+#: src/multitrack.c:7072
 msgid "Rename current track"
 msgstr ""
 
-#: src/multitrack.c:6904
+#: src/multitrack.c:7080
 msgid "Make _Backing Audio current track"
 msgstr ""
 
-#: src/multitrack.c:6915
+#: src/multitrack.c:7091
 msgid "Add Video Track at _Rear"
 msgstr ""
 
-#: src/multitrack.c:6923
+#: src/multitrack.c:7099
 msgid "Add Video Track at _Front"
 msgstr ""
 
-#: src/multitrack.c:6936
+#: src/multitrack.c:7112
 msgid "_Split current track at cursor"
 msgstr ""
 
-#: src/multitrack.c:6948
+#: src/multitrack.c:7124
 msgid "_Split selected video tracks"
 msgstr ""
 
-#: src/multitrack.c:6961
+#: src/multitrack.c:7137
 msgid "Insert gap in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:6969
+#: src/multitrack.c:7145
 msgid "Insert gap in current track/selected time"
 msgstr ""
 
-#: src/multitrack.c:6981
+#: src/multitrack.c:7157
 msgid "Close all _gaps in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:7007
+#: src/multitrack.c:7183
 msgid "Se_lection"
 msgstr "_Wybór"
 
-#: src/multitrack.c:7018
+#: src/multitrack.c:7194
 msgid "_Select Current Track"
 msgstr ""
 
-#: src/multitrack.c:7025
+#: src/multitrack.c:7201
 msgid "Select _all video tracks"
 msgstr ""
 
-#: src/multitrack.c:7032
+#: src/multitrack.c:7208
 msgid "Select _no video tracks"
 msgstr ""
 
-#: src/multitrack.c:7039
+#: src/multitrack.c:7215
 msgid "Select all _time"
 msgstr ""
 
-#: src/multitrack.c:7050
+#: src/multitrack.c:7226
 msgid "Select from _zero time"
 msgstr ""
 
-#: src/multitrack.c:7057
+#: src/multitrack.c:7233
 msgid "Select to _end time"
 msgstr ""
 
-#: src/multitrack.c:7064
+#: src/multitrack.c:7240
 msgid "_Copy..."
 msgstr "_Kopiuj..."
 
-#: src/multitrack.c:7075
+#: src/multitrack.c:7251
 msgid "_Timecode to region start"
 msgstr ""
 
-#: src/multitrack.c:7082
+#: src/multitrack.c:7258
 msgid "_Timecode to region end"
 msgstr ""
 
-#: src/multitrack.c:7089
+#: src/multitrack.c:7265
 msgid "_Region start to timecode"
 msgstr ""
 
-#: src/multitrack.c:7096
+#: src/multitrack.c:7272
 msgid "_Region end to timecode"
 msgstr ""
 
-#: src/multitrack.c:7110
+#: src/multitrack.c:7286
 msgid "Select/deselect block at current track/time"
 msgstr ""
 
-#: src/multitrack.c:7135
+#: src/multitrack.c:7311
 msgid "_Change width, height and audio values..."
 msgstr ""
 
-#: src/multitrack.c:7194
+#: src/multitrack.c:7370
 msgid "_Render"
 msgstr "_Renderuj"
 
-#: src/multitrack.c:7205
+#: src/multitrack.c:7381
 msgid "_Render all to new clip"
 msgstr ""
 
-#: src/multitrack.c:7220
+#: src/multitrack.c:7396
 msgid "Render _video"
 msgstr ""
 
-#: src/multitrack.c:7225
+#: src/multitrack.c:7401
 msgid "Render _audio"
 msgstr ""
 
-#: src/multitrack.c:7235
+#: src/multitrack.c:7411
 msgid "_Normalise rendered audio"
 msgstr ""
 
-#: src/multitrack.c:7242
+#: src/multitrack.c:7418
 msgid "_Pre-render audio"
 msgstr ""
 
-#: src/multitrack.c:7251
+#: src/multitrack.c:7427
 msgid "_View"
 msgstr "_Widok"
 
-#: src/multitrack.c:7270
+#: src/multitrack.c:7446
 msgid "Block _In/out points"
 msgstr ""
 
-#: src/multitrack.c:7279
+#: src/multitrack.c:7455
 msgid "_Effects at current"
 msgstr ""
 
-#: src/multitrack.c:7297
+#: src/multitrack.c:7473
 msgid "Audio parameters"
 msgstr ""
 
-#: src/multitrack.c:7308
+#: src/multitrack.c:7484
 msgid "Show backing _audio track"
 msgstr ""
 
-#: src/multitrack.c:7312
+#: src/multitrack.c:7488
 msgid "Compact view"
 msgstr "Widok oszczędny"
 
-#: src/multitrack.c:7320
+#: src/multitrack.c:7496
 msgid "Maximum tracks to display..."
 msgstr ""
 
-#: src/multitrack.c:7327
+#: src/multitrack.c:7503
 msgid "Scroll to follow playback"
 msgstr ""
 
-#: src/multitrack.c:7331
+#: src/multitrack.c:7507
 msgid "_Center on cursor"
 msgstr ""
 
-#: src/multitrack.c:7338
+#: src/multitrack.c:7514
 msgid "_Zoom in"
 msgstr ""
 
-#: src/multitrack.c:7349
+#: src/multitrack.c:7525
 msgid "_Zoom out"
 msgstr ""
 
-#: src/multitrack.c:7361
+#: src/multitrack.c:7537
 msgid "Multitrack _details"
 msgstr ""
 
-#: src/multitrack.c:7374
+#: src/multitrack.c:7550
 msgid "_Event Window"
 msgstr ""
 
-#: src/multitrack.c:7378
+#: src/multitrack.c:7554
 msgid "_Event Window (selected time only)"
 msgstr ""
 
-#: src/multitrack.c:7382
+#: src/multitrack.c:7558
 msgid "_Show FRAME events"
 msgstr ""
 
-#: src/multitrack.c:7399
+#: src/multitrack.c:7575
 msgid "_Show multitrack keys"
 msgstr ""
 
-#: src/multitrack.c:7468
+#: src/multitrack.c:7644
 msgid "Mouse mode: _Move"
 msgstr ""
 
-#: src/multitrack.c:7476
+#: src/multitrack.c:7652
 msgid "Mouse mode: _Select"
 msgstr ""
 
-#: src/multitrack.c:7505
+#: src/multitrack.c:7681
 msgid "Insert mode: _Normal"
 msgstr ""
 
-#: src/multitrack.c:7733
+#: src/multitrack.c:7909
 msgid "Insert with _audio"
 msgstr ""
 
-#: src/multitrack.c:7734
+#: src/multitrack.c:7910
 msgid ""
 "Select whether video clips are inserted and moved with their audio or not"
 msgstr ""
 
-#: src/multitrack.c:7829
+#: src/multitrack.c:8007
 msgid "Select _overlap"
 msgstr ""
 
-#: src/multitrack.c:7830
+#: src/multitrack.c:8008
 msgid ""
 "Select whether timeline selection snaps to overlap between selected tracks "
 "or not"
 msgstr ""
 
-#: src/multitrack.c:7894 src/multitrack.c:14198
+#: src/multitrack.c:8073 src/multitrack.c:14422
 msgid "Expanded View (d)"
 msgstr ""
 
-#: src/multitrack.c:7897 src/multitrack.c:14205
+#: src/multitrack.c:8076 src/multitrack.c:14428
 msgid "Compact View (d)"
 msgstr ""
 
-#: src/multitrack.c:7939
+#: src/multitrack.c:8118
 msgid "Gravity: _Normal"
 msgstr ""
 
-#: src/multitrack.c:7952
+#: src/multitrack.c:8131
 msgid "Gravity: _Left"
 msgstr ""
 
-#: src/multitrack.c:7967
+#: src/multitrack.c:8146
 msgid "Gravity: _Right"
 msgstr ""
 
-#: src/multitrack.c:8297
+#: src/multitrack.c:8496
 msgid "_Apply"
 msgstr "_Zastosuj"
 
-#: src/multitrack.c:8319
+#: src/multitrack.c:8518
 msgid "Time"
 msgstr ""
 
-#: src/multitrack.c:8333
+#: src/multitrack.c:8532
 msgid "_Del. node"
 msgstr ""
 
-#: src/multitrack.c:8341
+#: src/multitrack.c:8540
 msgid "_Next node"
 msgstr ""
 
-#: src/multitrack.c:8349
+#: src/multitrack.c:8548
 msgid "_Prev node"
 msgstr ""
 
-#: src/multitrack.c:8373
+#: src/multitrack.c:8574
 msgid "_Reverse playback  "
 msgstr ""
 
-#: src/multitrack.c:8395
+#: src/multitrack.c:8596
 msgid "_Velocity  "
 msgstr ""
 
-#: src/multitrack.c:8464
+#: src/multitrack.c:8664
 msgid "Anchor _start"
 msgstr ""
 
-#: src/multitrack.c:8465
+#: src/multitrack.c:8665
 msgid "Anchor the start point to the timeline"
 msgstr ""
 
-#: src/multitrack.c:8481
-msgid "Start frame"
-msgstr "Początek ramki"
-
-#: src/multitrack.c:8533
+#: src/multitrack.c:8728
 msgid "Anchor _end"
 msgstr ""
 
-#: src/multitrack.c:8534
+#: src/multitrack.c:8729
 msgid "Anchor the end point to the timeline"
 msgstr ""
 
-#: src/multitrack.c:8546
-msgid "End frame"
-msgstr "Koniec ramki"
-
-#: src/multitrack.c:8739
+#: src/multitrack.c:8929
 msgid "Scroll"
 msgstr "Przewijanie"
 
-#: src/multitrack.c:9316
+#: src/multitrack.c:9502
 msgid ""
 "\n"
 "==============================\n"
 "Switched to Clip Edit mode\n"
 msgstr ""
 
-#: src/multitrack.c:9502
+#: src/multitrack.c:9708
 msgid "Timeline (seconds)"
 msgstr ""
 
-#: src/multitrack.c:9984
+#: src/multitrack.c:10202
 msgid " Backing audio"
 msgstr ""
 
-#: src/multitrack.c:9987
+#: src/multitrack.c:10204
 #, c-format
 msgid " Layer %d audio"
 msgstr ""
 
-#: src/multitrack.c:9995
+#: src/multitrack.c:10212
 msgid "Show/hide audio details"
 msgstr ""
 
-#: src/multitrack.c:10010 src/multitrack.c:10232
+#: src/multitrack.c:10227 src/multitrack.c:10452
 #, c-format
 msgid "Layer %d audio"
 msgstr ""
 
-#: src/multitrack.c:10144 src/multitrack.c:10261
+#: src/multitrack.c:10353 src/multitrack.c:10481
 #, c-format
 msgid "%s (layer %d)"
 msgstr ""
 
-#: src/multitrack.c:10184
+#: src/multitrack.c:10403
 msgid "Select track"
 msgstr ""
 
-#: src/multitrack.c:10188
+#: src/multitrack.c:10407
 msgid "Show/hide audio"
 msgstr ""
 
-#: src/multitrack.c:10194
+#: src/multitrack.c:10413
 #, c-format
 msgid "Video %d"
 msgstr ""
 
-#: src/multitrack.c:10233
+#: src/multitrack.c:10453
 #, c-format
 msgid " %s"
 msgstr " %s"
 
-#: src/multitrack.c:10346
+#: src/multitrack.c:10574
 msgid "LiVES: Selected effect"
 msgstr ""
 
-#: src/multitrack.c:10358
+#: src/multitrack.c:10586
 msgid "_View/Edit this effect"
 msgstr ""
 
-#: src/multitrack.c:10361
+#: src/multitrack.c:10588
 msgid "_View this effect"
 msgstr ""
 
-#: src/multitrack.c:10369
+#: src/multitrack.c:10596
 msgid "_Delete this effect"
 msgstr ""
 
-#: src/multitrack.c:10422
+#: src/multitrack.c:10648
 msgid "Cannot insert after this effect"
 msgstr ""
 
-#: src/multitrack.c:10451
+#: src/multitrack.c:10677
 msgid "This effect cannot be moved"
 msgstr ""
 
-#: src/multitrack.c:10499
+#: src/multitrack.c:10724
 #, c-format
 msgid "  %d to %d selected  "
 msgstr ""
 
-#: src/multitrack.c:10502 src/multitrack.c:10746
+#: src/multitrack.c:10727 src/multitrack.c:10968
 #, c-format
 msgid "%.2f sec."
 msgstr ""
 
-#: src/multitrack.c:10717
+#: src/multitrack.c:10940
 #, c-format
 msgid "%d frames"
 msgstr ""
 
-#: src/multitrack.c:11070
+#: src/multitrack.c:11299
 msgid ""
 "\n"
 "==============================\n"
 "Switched to Multitrack mode\n"
 msgstr ""
 
-#: src/multitrack.c:12691
+#: src/multitrack.c:12939
 msgid "Drag the time slider to where you"
 msgstr ""
 
-#: src/multitrack.c:12692
+#: src/multitrack.c:12940
 msgid "want to set effect parameters"
 msgstr ""
 
-#: src/multitrack.c:12693
+#: src/multitrack.c:12941
 msgid "Set parameters, then click \"Apply\"\n"
 msgstr ""
 
-#: src/multitrack.c:12694
+#: src/multitrack.c:12942
 msgid ""
 "NODES are points where parameters\n"
 "have been set.\n"
 "Nodes can be deleted."
 msgstr ""
 
-#: src/multitrack.c:12697
+#: src/multitrack.c:12944
 msgid "Effect has no parameters.\n"
 msgstr ""
 
-#: src/multitrack.c:12788
+#: src/multitrack.c:13033
 #, c-format
 msgid "%s output"
 msgstr ""
 
-#: src/multitrack.c:12794 src/multitrack.c:12804
+#: src/multitrack.c:13038 src/multitrack.c:13046
 #, c-format
 msgid "layer %d"
 msgstr ""
 
-#: src/multitrack.c:12796 src/multitrack.c:12806
+#: src/multitrack.c:13039 src/multitrack.c:13047
 msgid "audio track"
 msgstr ""
 
-#: src/multitrack.c:12797
+#: src/multitrack.c:13040
 #, c-format
 msgid "%s to %s"
 msgstr ""
 
-#: src/multitrack.c:12807
+#: src/multitrack.c:13048
 #, c-format
 msgid "%s from %s"
 msgstr ""
 
-#: src/multitrack.c:12860
+#: src/multitrack.c:13099
 msgid "_Prev filter map"
 msgstr ""
 
-#: src/multitrack.c:12871
+#: src/multitrack.c:13110
 msgid "Insert _before"
 msgstr ""
 
-#: src/multitrack.c:12881
+#: src/multitrack.c:13120
 msgid "Insert _after"
 msgstr ""
 
-#: src/multitrack.c:12896
+#: src/multitrack.c:13134
 msgid "_Next filter map"
 msgstr ""
 
-#: src/multitrack.c:12911
+#: src/multitrack.c:13148
 msgid ""
 "\n"
 "\n"
@@ -9130,272 +9135,272 @@
 "current time.\n"
 msgstr ""
 
-#: src/multitrack.c:12929
+#: src/multitrack.c:13166
 msgid ""
 "Drag a compositor anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:12936
+#: src/multitrack.c:13173
 msgid ""
 "Drag a transition anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:12944
+#: src/multitrack.c:13181
 msgid ""
 "Effects can be dragged\n"
 "onto blocks on the timeline."
 msgstr ""
 
-#: src/multitrack.c:13166
+#: src/multitrack.c:13406
 msgid "LiVES: Selected block/frame"
 msgstr ""
 
-#: src/multitrack.c:13173
+#: src/multitrack.c:13413
 msgid "_Select this block"
 msgstr ""
 
-#: src/multitrack.c:13183
+#: src/multitrack.c:13423
 msgid "_Split block here"
 msgstr ""
 
-#: src/multitrack.c:13191
+#: src/multitrack.c:13431
 msgid "List _effects here"
 msgstr ""
 
-#: src/multitrack.c:13200 src/multitrack.c:13277
+#: src/multitrack.c:13440 src/multitrack.c:13518
 #, c-format
 msgid "_Adjust %s"
 msgstr ""
 
-#: src/multitrack.c:13215
+#: src/multitrack.c:13455
 msgid "_Delete this block"
 msgstr ""
 
-#: src/multitrack.c:13258
+#: src/multitrack.c:13500
 msgid "_Insert here"
 msgstr ""
 
-#: src/multitrack.c:13264
+#: src/multitrack.c:13505
 msgid "_Insert audio here"
 msgstr ""
 
-#: src/multitrack.c:14801
+#: src/multitrack.c:15017
 #, c-format
 msgid "Inserted gap in selected tracks from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:14835
+#: src/multitrack.c:15048
 #, c-format
 msgid "Inserted gap in track %s from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15036
+#: src/multitrack.c:15244
 #, c-format
 msgid "Undid %s\n"
 msgstr ""
 
-#: src/multitrack.c:15235
+#: src/multitrack.c:15445
 #, c-format
 msgid "Redid %s\n"
 msgstr ""
 
-#: src/multitrack.c:15268
+#: src/multitrack.c:15475
 msgid ""
 "\n"
 " (variable)"
 msgstr ""
 
-#: src/multitrack.c:15502 src/multitrack.c:15614 src/multitrack.c:18736
-#: src/multitrack.c:18748
+#: src/multitrack.c:15710 src/multitrack.c:15823 src/multitrack.c:19077
+#: src/multitrack.c:19089
 #, c-format
 msgid "track %s"
 msgstr ""
 
-#: src/multitrack.c:15507 src/multitrack.c:15619 src/multitrack.c:18741
+#: src/multitrack.c:15715 src/multitrack.c:15828 src/multitrack.c:19082
 #, c-format
 msgid "tracks %s and %s"
 msgstr ""
 
-#: src/multitrack.c:15513 src/multitrack.c:15625 src/multitrack.c:18751
+#: src/multitrack.c:15721 src/multitrack.c:15834 src/multitrack.c:19091
 msgid "selected tracks"
 msgstr ""
 
-#: src/multitrack.c:15516
+#: src/multitrack.c:15726
 #, c-format
 msgid "Added %s %s to %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15550
+#: src/multitrack.c:15760
 #, c-format
 msgid "Added effect %s to track %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15631
+#: src/multitrack.c:15845
 #, c-format
 msgid "Deleted %s %s from %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15935
+#: src/multitrack.c:16143
 #, c-format
 msgid "rendered %d frames to new clip.\n"
 msgstr ""
 
-#: src/multitrack.c:16025
+#: src/multitrack.c:16230
 msgid "Cleaning up..."
 msgstr "Sprzątanie..."
 
-#: src/multitrack.c:16712
+#: src/multitrack.c:17003
 msgid "_Pause"
 msgstr "_Wstrzymaj"
 
-#: src/multitrack.c:16713
+#: src/multitrack.c:17004
 msgid "Pause (p)"
 msgstr ""
 
-#: src/multitrack.c:16856
+#: src/multitrack.c:17151
 msgid "Press 'm' during playback"
 msgstr ""
 
-#: src/multitrack.c:16857
+#: src/multitrack.c:17152
 msgid "to make a mark on the timeline"
 msgstr ""
 
-#: src/multitrack.c:17154
+#: src/multitrack.c:17498
 #, c-format
 msgid ""
 "Inserted audio %.4f to %.4f from clip %s into backing audio from time %.4f "
 "to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:17414
+#: src/multitrack.c:17759
 #, c-format
 msgid ""
 "Inserted frames %d to %d from clip %s into track %s from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:17998
+#: src/multitrack.c:18332
 #, c-format
 msgid ""
 "Time region %.3f to %.3f\n"
 "selected.\n"
 msgstr ""
 
-#: src/multitrack.c:18002
+#: src/multitrack.c:18336
 msgid ""
 "select one or more tracks\n"
 "to create a region.\n"
 msgstr ""
 
-#: src/multitrack.c:18004
+#: src/multitrack.c:18337
 #, c-format
 msgid "%d video tracks selected.\n"
 msgstr ""
 
-#: src/multitrack.c:18006
+#: src/multitrack.c:18339
 msgid ""
 "Double click on timeline\n"
 "to deselect time region."
 msgstr ""
 
-#: src/multitrack.c:18013
+#: src/multitrack.c:18346
 msgid ""
 "Single click on an effect\n"
 "to select it."
 msgstr ""
 
-#: src/multitrack.c:18014
+#: src/multitrack.c:18347
 msgid ""
 "Double click on an effect\n"
 "to edit it."
 msgstr ""
 
-#: src/multitrack.c:18015
+#: src/multitrack.c:18348
 msgid ""
 "Right click on an effect\n"
 "for context menu.\n"
 msgstr ""
 
-#: src/multitrack.c:18017
+#: src/multitrack.c:18350
 msgid ""
 "Effect order can be changed at\n"
 "FILTER MAPS"
 msgstr ""
 
-#: src/multitrack.c:18024
+#: src/multitrack.c:18357
 msgid ""
 "You can select an effect,\n"
 "then use the INSERT BEFORE"
 msgstr ""
 
-#: src/multitrack.c:18025
+#: src/multitrack.c:18358
 msgid "or INSERT AFTER buttons to move it."
 msgstr ""
 
-#: src/multitrack.c:18307 src/multitrack.c:18320
+#: src/multitrack.c:18639 src/multitrack.c:18652
 msgid "Click on another effect,"
 msgstr ""
 
-#: src/multitrack.c:18308 src/multitrack.c:18321
+#: src/multitrack.c:18640 src/multitrack.c:18653
 msgid ""
 "and the selected one\n"
 "will be inserted"
 msgstr ""
 
-#: src/multitrack.c:18309
+#: src/multitrack.c:18641
 msgid "after it.\n"
 msgstr ""
 
-#: src/multitrack.c:18322
+#: src/multitrack.c:18654
 msgid "before it.\n"
 msgstr ""
 
-#: src/multitrack.c:18551
+#: src/multitrack.c:18889
 #, c-format
 msgid "Removed parameter values for effect %s at time %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:18759
+#: src/multitrack.c:19100
 #, c-format
 msgid "Set parameter values for %s %s on %s at time %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:19251 src/multitrack.c:20873
+#: src/multitrack.c:19630 src/multitrack.c:21195
 msgid "_Autoreload each time"
 msgstr ""
 
-#: src/multitrack.c:19323
+#: src/multitrack.c:19702
 #, fuzzy
 msgid "Saving layout"
 msgstr "_Zapisz układ"
 
-#: src/multitrack.c:19345
+#: src/multitrack.c:19725
 #, c-format
 msgid "Saved layout to %s\n"
 msgstr ""
 
-#: src/multitrack.c:20783
+#: src/multitrack.c:21125
 msgid "clips and frames"
 msgstr ""
 
-#: src/multitrack.c:20787
+#: src/multitrack.c:21128
 msgid "clips"
 msgstr ""
 
-#: src/multitrack.c:20790
+#: src/multitrack.c:21130
 msgid "frames"
 msgstr "klatek"
 
-#: src/multitrack.c:20800
+#: src/multitrack.c:21140
 msgid ""
 "\n"
 "Auto reload layout.\n"
 msgstr ""
 
-#: src/multitrack.c:20803
+#: src/multitrack.c:21143
 #, c-format
 msgid ""
 "%s\n"
@@ -9403,100 +9408,100 @@
 "Therefore it could not be loaded properly.\n"
 msgstr ""
 
-#: src/multitrack.c:20920
+#: src/multitrack.c:21284
 msgid "auto backup"
 msgstr ""
 
-#: src/multitrack.c:20923
+#: src/multitrack.c:21287
 #, c-format
 msgid ""
 "\n"
 "Unable to load layout file %s\n"
 msgstr ""
 
-#: src/multitrack.c:20944
+#: src/multitrack.c:21308
 #, c-format
 msgid "Loading layout from %s..."
 msgstr ""
 
-#: src/multitrack.c:20978
+#: src/multitrack.c:21338
 #, c-format
 msgid "Got %d events...processing..."
 msgstr ""
 
-#: src/multitrack.c:20991
+#: src/multitrack.c:21349
 msgid "Checking and rebuilding event list"
 msgstr ""
 
-#: src/multitrack.c:21017
+#: src/multitrack.c:21374
 #, c-format
 msgid "%d errors detected.\n"
 msgstr ""
 
-#: src/multitrack.c:21068
+#: src/multitrack.c:21422
 #, c-format
 msgid "Multitrack fps set to %.3f\n"
 msgstr ""
 
-#: src/multitrack.c:21225
+#: src/multitrack.c:21576
 msgid ""
 "The current layout has changes which have not been saved.\n"
 "Are you sure you wish to wipe it ?\n"
 msgstr ""
 
-#: src/multitrack.c:22047
+#: src/multitrack.c:22385
 msgid "LiVES: Multitrack audio mixer"
 msgstr ""
 
-#: src/multitrack.c:22077
+#: src/multitrack.c:22414
 msgid "_Reset values"
 msgstr ""
 
-#: src/multitrack.c:22081
+#: src/multitrack.c:22418
 msgid "_Close mixer"
 msgstr ""
 
-#: src/multitrack.c:22130
+#: src/multitrack.c:22466
 msgid ""
 "_Invert backing audio\n"
 "and layer volumes"
 msgstr ""
 
-#: src/multitrack.c:22132
+#: src/multitrack.c:22468
 msgid "Adjust backing and layer audio values so that they sum to 1.0"
 msgstr ""
 
-#: src/multitrack.c:22175
+#: src/multitrack.c:22510
 msgid "_Gang layer audio"
 msgstr ""
 
-#: src/multitrack.c:22177
+#: src/multitrack.c:22512
 msgid "Adjust all layer audio values to the same value"
 msgstr ""
 
-#: src/jack.c:104
+#: src/jack.c:102
 msgid "JACK server started\n"
 msgstr ""
 
-#: src/jack.c:1284 src/jack.c:1353
+#: src/jack.c:1265 src/jack.c:1334
 msgid "Unable to connect to JACK server\n"
 msgstr ""
 
-#: src/jack.c:1512
+#: src/jack.c:1491
 msgid "Started jack audio subsystem.\n"
 msgstr ""
 
-#: src/jack.c:1623
+#: src/jack.c:1600
 msgid "Started jack audio reader.\n"
 msgstr ""
 
-#: src/jack.c:1838
+#: src/jack.c:1815
 msgid ""
 "\n"
 "Connection to jack audio was reset.\n"
 msgstr ""
 
-#: src/pulse.c:87
+#: src/pulse.c:88
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -9504,7 +9509,7 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:92
+#: src/pulse.c:94
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -9512,7 +9517,7 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:96
+#: src/pulse.c:99
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -9520,335 +9525,335 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:101
+#: src/pulse.c:104
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
 msgstr ""
 
-#: src/pulse.c:107
+#: src/pulse.c:109
 msgid "LiVES will exit and you can choose another audio player.\n"
 msgstr ""
 
-#: src/pulse.c:1352
+#: src/pulse.c:1335
 msgid ""
 "\n"
 "Connection to pulse audio was reset.\n"
 msgstr ""
 
-#: src/colourspace.c:1100
+#: src/colourspace.c:1092
 msgid "unclamped"
 msgstr ""
 
-#: src/colourspace.c:1101
+#: src/colourspace.c:1093
 msgid "clamped"
 msgstr ""
 
-#: src/omc-learn.c:195
+#: src/omc-learn.c:191
 #, c-format
 msgid "Responding to joystick events from %s\n"
 msgstr ""
 
-#: src/omc-learn.c:289
+#: src/omc-learn.c:279
 msgid "Creating ALSA seq port..."
 msgstr ""
 
-#: src/omc-learn.c:325
+#: src/omc-learn.c:313
 #, c-format
 msgid "Responding to MIDI events from %s\n"
 msgstr ""
 
-#: src/omc-learn.c:568
+#: src/omc-learn.c:554
 msgid "data"
 msgstr "dane"
 
-#: src/omc-learn.c:571
+#: src/omc-learn.c:557
 msgid "velocity"
 msgstr "prędkość"
 
-#: src/omc-learn.c:572
+#: src/omc-learn.c:558
 msgid "note"
 msgstr "notatka"
 
-#: src/omc-learn.c:574 src/omc-learn.c:736 src/omc-learn.c:1105
-#: src/omc-learn.c:1591 src/omc-learn.c:1640
+#: src/omc-learn.c:560 src/omc-learn.c:724 src/omc-learn.c:1092
+#: src/omc-learn.c:1581 src/omc-learn.c:1630
 msgid "value"
 msgstr "wartość"
 
-#: src/omc-learn.c:576
+#: src/omc-learn.c:562
 msgid "state"
 msgstr "stan"
 
-#: src/omc-learn.c:688
+#: src/omc-learn.c:674
 msgid "variable"
 msgstr "zmienna"
 
-#: src/omc-learn.c:1001
+#: src/omc-learn.c:989
 msgid "Vars."
 msgstr ""
 
-#: src/omc-learn.c:1054
+#: src/omc-learn.c:1041
 #, c-format
 msgid "MIDI ch %d note on"
 msgstr ""
 
-#: src/omc-learn.c:1058
+#: src/omc-learn.c:1045
 #, c-format
 msgid "MIDI ch %d note off"
 msgstr ""
 
-#: src/omc-learn.c:1062
+#: src/omc-learn.c:1049
 #, c-format
 msgid "MIDI ch %d controller %d"
 msgstr ""
 
-#: src/omc-learn.c:1066
+#: src/omc-learn.c:1053
 #, c-format
 msgid "MIDI ch %d pitch bend"
 msgstr ""
 
-#: src/omc-learn.c:1070
+#: src/omc-learn.c:1057
 #, c-format
 msgid "MIDI ch %d pgm change"
 msgstr ""
 
-#: src/omc-learn.c:1073
+#: src/omc-learn.c:1060
 #, c-format
 msgid "Joystick button %d"
 msgstr ""
 
-#: src/omc-learn.c:1076
+#: src/omc-learn.c:1063
 #, c-format
 msgid "Joystick axis %d"
 msgstr ""
 
-#: src/omc-learn.c:1113
+#: src/omc-learn.c:1100
 msgid "x"
 msgstr "x"
 
-#: src/omc-learn.c:1122
+#: src/omc-learn.c:1109
 msgid "range"
 msgstr "zakres"
 
-#: src/omc-learn.c:1143
+#: src/omc-learn.c:1130
 msgid "+ offset1"
 msgstr ""
 
-#: src/omc-learn.c:1161
+#: src/omc-learn.c:1150
 msgid "* scale"
 msgstr ""
 
-#: src/omc-learn.c:1179
+#: src/omc-learn.c:1170
 msgid "+ offset2"
 msgstr ""
 
-#: src/omc-learn.c:1280
+#: src/omc-learn.c:1270
 msgid ""
 "\n"
 "Click OK to delete all entries\n"
 msgstr ""
 
-#: src/omc-learn.c:1318
+#: src/omc-learn.c:1308
 msgid "LiVES: OMC learner"
 msgstr ""
 
-#: src/omc-learn.c:1334
+#: src/omc-learn.c:1324
 msgid "Clear _unmatched"
 msgstr ""
 
-#: src/omc-learn.c:1345
+#: src/omc-learn.c:1335
 msgid "_Delete all"
 msgstr "_Usuń wszystko"
 
-#: src/omc-learn.c:1411
+#: src/omc-learn.c:1401
 msgid "Start video playback"
 msgstr ""
 
-#: src/omc-learn.c:1414
+#: src/omc-learn.c:1404
 msgid "Stop video playback"
 msgstr ""
 
-#: src/omc-learn.c:1418
+#: src/omc-learn.c:1408
 msgid "Clip select <clipnum>"
 msgstr ""
 
-#: src/omc-learn.c:1419
+#: src/omc-learn.c:1409
 msgid "Switch foreground clip to the nth valid clip"
 msgstr ""
 
-#: src/omc-learn.c:1423
+#: src/omc-learn.c:1413
 msgid "Play forwards"
 msgstr ""
 
-#: src/omc-learn.c:1424
+#: src/omc-learn.c:1414
 msgid "Play video in a forwards direction"
 msgstr ""
 
-#: src/omc-learn.c:1427
+#: src/omc-learn.c:1417
 msgid "Play backwards"
 msgstr ""
 
-#: src/omc-learn.c:1428
+#: src/omc-learn.c:1418
 msgid "Play video in a backwards direction"
 msgstr ""
 
-#: src/omc-learn.c:1431
+#: src/omc-learn.c:1421
 msgid "Reverse playback direction"
 msgstr ""
 
-#: src/omc-learn.c:1432
+#: src/omc-learn.c:1422
 msgid "Reverse direction of video playback"
 msgstr ""
 
-#: src/omc-learn.c:1435
+#: src/omc-learn.c:1425
 msgid "Play video faster"
 msgstr ""
 
-#: src/omc-learn.c:1436
+#: src/omc-learn.c:1426
 msgid "Play video at a slightly faster rate"
 msgstr ""
 
-#: src/omc-learn.c:1439
+#: src/omc-learn.c:1429
 msgid "Play video slower"
 msgstr ""
 
-#: src/omc-learn.c:1440
+#: src/omc-learn.c:1430
 msgid "Play video at a slightly slower rate"
 msgstr ""
 
-#: src/omc-learn.c:1443
+#: src/omc-learn.c:1433
 msgid "Toggle video freeze"
 msgstr ""
 
-#: src/omc-learn.c:1444
+#: src/omc-learn.c:1434
 msgid "Freeze video, or if already frozen, unfreeze it"
 msgstr ""
 
-#: src/omc-learn.c:1447
+#: src/omc-learn.c:1437
 msgid "Set video framerate to <fps>"
 msgstr ""
 
-#: src/omc-learn.c:1448
+#: src/omc-learn.c:1438
 msgid "Set framerate of foreground clip to <float fps>"
 msgstr ""
 
-#: src/omc-learn.c:1452
+#: src/omc-learn.c:1442
 msgid "Start recording"
 msgstr ""
 
-#: src/omc-learn.c:1455
+#: src/omc-learn.c:1445
 msgid "Stop recording"
 msgstr "Zatrzymaj zapisywanie"
 
-#: src/omc-learn.c:1458
+#: src/omc-learn.c:1448
 msgid "Toggle recording state"
 msgstr ""
 
-#: src/omc-learn.c:1461
+#: src/omc-learn.c:1451
 msgid "Swap foreground and background clips"
 msgstr ""
 
-#: src/omc-learn.c:1463
+#: src/omc-learn.c:1453
 msgid "Reset effect keys"
 msgstr ""
 
-#: src/omc-learn.c:1464
+#: src/omc-learn.c:1454
 msgid "Switch all effects off."
 msgstr ""
 
-#: src/omc-learn.c:1467
+#: src/omc-learn.c:1457
 msgid "Enable effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1471
+#: src/omc-learn.c:1461
 msgid "Disable effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1475
+#: src/omc-learn.c:1465
 msgid "Toggle effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1479
+#: src/omc-learn.c:1469
 msgid "Set parameter value <key> <pnum> = <value>"
 msgstr ""
 
-#: src/omc-learn.c:1480
+#: src/omc-learn.c:1470
 msgid "Set <value> of pth (numerical) parameter for effect key <key>."
 msgstr ""
 
-#: src/omc-learn.c:1484
+#: src/omc-learn.c:1474
 msgid "Switch foreground to next clip"
 msgstr ""
 
-#: src/omc-learn.c:1487
+#: src/omc-learn.c:1477
 msgid "Switch foreground to previous clip"
 msgstr ""
 
-#: src/omc-learn.c:1490
+#: src/omc-learn.c:1480
 msgid "Set video framerate to ratio <fps_ratio>"
 msgstr ""
 
-#: src/omc-learn.c:1491
+#: src/omc-learn.c:1481
 msgid "Set framerate ratio of foreground clip to <float fps_ratio>"
 msgstr ""
 
-#: src/omc-learn.c:1495
+#: src/omc-learn.c:1485
 msgid "Retrigger clip <clipnum>"
 msgstr ""
 
-#: src/omc-learn.c:1496
+#: src/omc-learn.c:1486
 msgid ""
 "Switch foreground clip to the nth valid clip, and reset the frame number"
 msgstr ""
 
-#: src/omc-learn.c:1500
+#: src/omc-learn.c:1490
 msgid "Cycle to next mode for effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1504
+#: src/omc-learn.c:1494
 msgid "Cycle to previous mode for effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1508
+#: src/omc-learn.c:1498
 msgid "Set playback plugin parameter value <pnum> = <value>"
 msgstr ""
 
-#: src/omc-learn.c:1509
+#: src/omc-learn.c:1499
 msgid "Set <value> of pth parameter for the playback plugin."
 msgstr ""
 
 #. TRANSLATORS: short form of "clip number"
-#: src/omc-learn.c:1536 src/omc-learn.c:1607
+#: src/omc-learn.c:1526 src/omc-learn.c:1597
 msgid "clipnum"
 msgstr "clipnum"
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1545
+#: src/omc-learn.c:1535
 msgid "fps"
 msgstr "fps"
 
 #. TRANSLATORS: as in keyboard key
-#: src/omc-learn.c:1553 src/omc-learn.c:1560 src/omc-learn.c:1567
-#: src/omc-learn.c:1575 src/omc-learn.c:1615 src/omc-learn.c:1623
+#: src/omc-learn.c:1543 src/omc-learn.c:1550 src/omc-learn.c:1557
+#: src/omc-learn.c:1565 src/omc-learn.c:1605 src/omc-learn.c:1613
 msgid "key"
 msgstr "klucz"
 
 #. TRANSLATORS: short form of "parameter number"
-#: src/omc-learn.c:1583 src/omc-learn.c:1632
+#: src/omc-learn.c:1573 src/omc-learn.c:1622
 msgid "pnum"
 msgstr "pnum"
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1599
+#: src/omc-learn.c:1589
 msgid "fps_ratio"
 msgstr "fps_ratio"
 
-#: src/omc-learn.c:2443
+#: src/omc-learn.c:2417
 #, c-format
 msgid "Saving device mapping to file %s..."
 msgstr ""
 
-#: src/omc-learn.c:2527
+#: src/omc-learn.c:2498
 #, c-format
 msgid ""
 "\n"
@@ -9857,7 +9862,7 @@
 "%s\n"
 msgstr ""
 
-#: src/omc-learn.c:2534
+#: src/omc-learn.c:2505
 #, c-format
 msgid ""
 "\n"
@@ -9866,12 +9871,12 @@
 "%s\n"
 msgstr ""
 
-#: src/omc-learn.c:2571
+#: src/omc-learn.c:2541
 #, c-format
 msgid "Loading device mapping from file %s..."
 msgstr ""
 
-#: src/omc-learn.c:2576
+#: src/omc-learn.c:2544
 #, c-format
 msgid ""
 "\n"
@@ -9881,12 +9886,12 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/videodev.c:547
+#: src/videodev.c:539
 #, c-format
 msgid "Unable to open device %s\n"
 msgstr ""
 
-#: src/videodev.c:564
+#: src/videodev.c:554
 #, c-format
 msgid "Opened device %s\n"
 msgstr ""
@@ -10725,6 +10730,10 @@
 #~ msgid "$file"
 #~ msgstr "$file"
 
+#, fuzzy
+#~ msgid "LiVES audio error."
+#~ msgstr "LiVES: - Wstaw"
+
 #~ msgid "cdda2wav is required for this function."
 #~ msgstr "cdda2wav jest wymagane dla tej funkcji."
 
@@ -10737,6 +10746,15 @@
 #~ msgid "$error"
 #~ msgstr "$error"
 
+#~ msgid "Pause"
+#~ msgstr "Wstrzymaj"
+
+#~ msgid "Start frame"
+#~ msgstr "Początek ramki"
+
+#~ msgid "End frame"
+#~ msgstr "Koniec ramki"
+
 #~ msgid "                                                            "
 #~ msgstr "                                                            "

LiVES-2.2.8.tar.bz2/po/pms.po -> LiVES-2.4.1.tar.bz2/po/pms.po Changed

@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n"
-"POT-Creation-Date: 2015-02-08 17:18-0300\n"
+"POT-Creation-Date: 2015-08-09 14:52-0300\n"
 "PO-Revision-Date: 2013-11-09 23:22+0000\n"
 "Last-Translator: Simon Uslengh <simoneislanda@libero.it>\n"
 "Language-Team: Piemontese <pms@li.org>\n"
@@ -18,8 +18,7 @@
 "X-Launchpad-Export-Date: 2014-04-13 13:01+0000\n"
 "X-Generator: Launchpad (build 16976)\n"
 
-#. TRANSLATORS: do not translate this message
-#: src/main.c:118
+#: src/main.c:128
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -28,22 +27,22 @@
 "http://lives.sourceforge.net/TRANS-README.txt"
 msgstr ""
 
-#: src/main.c:134
+#: src/main.c:153
 #, c-format
 msgid "%s Warning: %s\n"
 msgstr "%s Avis: %s\n"
 
-#: src/main.c:138
+#: src/main.c:157
 #, c-format
 msgid "%s Critical error: %s\n"
 msgstr "%s Eror grav: %s\n"
 
-#: src/main.c:139
+#: src/main.c:158
 #, c-format
 msgid "%s Fatal error: %s\n"
 msgstr "%s Eror vastant: %s\n"
 
-#: src/main.c:176
+#: src/main.c:198
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -57,7 +56,7 @@
 "group_id=64341&atid=507139\n"
 "Mersì. A dovrìa podej arpijè sò travaj andiand torna LiVES.\n"
 
-#: src/main.c:177
+#: src/main.c:199
 msgid ""
 "\n"
 "\n"
@@ -69,7 +68,7 @@
 "Cand a arpòrta d'vast, ch'a includa fabilman ij detaj ëd sò sistem operativ, "
 "la distribussion e la version ëd LiVES."
 
-#: src/main.c:180
+#: src/main.c:203
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -77,7 +76,7 @@
 "e tute j'informassion smonùe sì dapress\n"
 "\n"
 
-#: src/main.c:184
+#: src/main.c:206
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
@@ -87,83 +86,83 @@
 "fale (debug) për cheuje pì d'informassion.\n"
 "\n"
 
-#: src/main.c:192
+#: src/main.c:216
 msgid "Preserving set.\n"
 msgstr "Preservassion j'anpostassion\n"
 
-#: src/main.c:636
+#: src/main.c:691
 msgid "Resizing"
 msgstr "Ardimensionament"
 
-#: src/main.c:643
+#: src/main.c:698
 msgid "_Resize All Frames"
 msgstr "_Ardimension-a tute le curnis"
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:895
+#: src/main.c:948
 msgid "Any"
 msgstr "qualsëssìa"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:897
+#: src/main.c:950
 msgid "None"
 msgstr "Gnun"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:899
+#: src/main.c:952
 msgid "recommended"
 msgstr "consejà"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:901
+#: src/main.c:954
 msgid "disabled !"
 msgstr "dësativà"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:903
+#: src/main.c:956
 msgid "**The current layout**"
 msgstr "**L'atual formà**"
 
 #. TRANSLATORS: adjective for "Built in" type effects
-#: src/main.c:905
+#: src/main.c:958
 msgid "Builtin"
 msgstr "Antregà"
 
 #. TRANSLATORS: adjective for "Custom" type effects
-#: src/main.c:907
+#: src/main.c:960
 msgid "Custom"
 msgstr "Personaj"
 
 #. TRANSLATORS: adjective for "Test" type effects
-#: src/main.c:909
+#: src/main.c:962
 msgid "Test"
 msgstr "Test"
 
-#: src/main.c:1054
+#: src/main.c:1107
 msgid "Foreground"
 msgstr "Prim pian"
 
-#: src/main.c:1055
+#: src/main.c:1108
 msgid "Background"
 msgstr "Drefond"
 
-#: src/main.c:1566
+#: src/main.c:1624
 msgid "Loading realtime effect plugins..."
 msgstr "Caria dle gionte për j'efet an temp-real..."
 
-#: src/main.c:1631
+#: src/main.c:1690
 msgid "Starting jack audio server..."
 msgstr "Andi dël jack audio server..."
 
-#: src/main.c:1633
+#: src/main.c:1692
 msgid "Starting jack transport server..."
 msgstr "Andi dël jack transport server..."
 
-#: src/main.c:1634
+#: src/main.c:1693
 msgid "Connecting to jack transport server..."
 msgstr "Conession al jack transport server..."
 
-#: src/main.c:1663
+#: src/main.c:1723
 #, c-format
 msgid ""
 "\n"
@@ -182,114 +181,114 @@
 "\n"
 "Dësnò, ch'a preuva a nandiè lives con tute le doe \"lives - jackopts 16\", o "
 
-#: src/main.c:1697
+#: src/main.c:1758
 msgid "Starting pulse audio server..."
 msgstr "Andi dël pulse audio server..."
 
-#: src/main.c:1765
+#: src/main.c:1825
 msgid "Checking optional dependencies:"
 msgstr "Contròl dependense opsionaj:"
 
-#: src/main.c:1766
+#: src/main.c:1826
 msgid "mplayer...detected..."
 msgstr "mplayer...trovà..."
 
-#: src/main.c:1767
+#: src/main.c:1827
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...NEN TROVÀ"
 
-#: src/main.c:1768
+#: src/main.c:1828
 #, fuzzy
 msgid "mplayer2...detected..."
 msgstr "mplayer...trovà..."
 
-#: src/main.c:1769
+#: src/main.c:1829
 #, fuzzy
 msgid "mplayer2...NOT DETECTED..."
 msgstr "mplayer...NEN TROVÀ"
 
-#: src/main.c:1770
+#: src/main.c:1830
 msgid "convert...detected..."
 msgstr "convert...trovà..."
 
-#: src/main.c:1771
+#: src/main.c:1831
 msgid "convert...NOT DETECTED..."
 msgstr "convert...NEN TROVÀ..."
 
-#: src/main.c:1772
+#: src/main.c:1832
 msgid "composite...detected..."
 msgstr "composite...TROVÀ..."
 
-#: src/main.c:1773
+#: src/main.c:1833
 msgid "composite...NOT DETECTED..."
 msgstr "composite...NEN TROVÀ..."
 
-#: src/main.c:1774
+#: src/main.c:1834
 msgid "sox...detected\n"
 msgstr "sox...TROVÀ\n"
 
-#: src/main.c:1775
+#: src/main.c:1835
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...NEN TROVÀ\n"
 
-#: src/main.c:1776
+#: src/main.c:1836
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...TROVÀ..."
 
-#: src/main.c:1777
+#: src/main.c:1837
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...NEN TROVÀ..."
 
-#: src/main.c:1778
+#: src/main.c:1838
 msgid "jackd...detected..."
 msgstr "jackd...TROVÀ..."
 
-#: src/main.c:1779
+#: src/main.c:1839
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...NEN TROVÀ..."
 
-#: src/main.c:1780
+#: src/main.c:1840
 msgid "pulse audio...detected..."
 msgstr "pulse audio...TROVÀ..."
 
-#: src/main.c:1781
+#: src/main.c:1841
 msgid "pulse audio...NOT DETECTED..."
 msgstr "pulse audio...NEN TROVÀ..."
 
-#: src/main.c:1782
+#: src/main.c:1842
 msgid "python...detected..."
 msgstr "python...TROVÀ..."
 
-#: src/main.c:1783
+#: src/main.c:1843
 msgid "python...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1784
+#: src/main.c:1844
 msgid "dvgrab...detected..."
 msgstr "dvgrab...TROVÀ..."
 
-#: src/main.c:1785
+#: src/main.c:1845
 msgid "dvgrab...NOT DETECTED..."
 msgstr "dvgrab...NEN TROVÀ..."
 
-#: src/main.c:1786
+#: src/main.c:1846
 msgid "xwininfo...detected..."
 msgstr "xwininfo...TROVÀ..."
 
-#: src/main.c:1787
+#: src/main.c:1847
 msgid "xwininfo...NOT DETECTED..."
 msgstr "xwininfo...NEN TROVÀ..."
 
-#: src/main.c:1793
+#: src/main.c:1853
 #, c-format
 msgid "Windows version %04X"
 msgstr "version ëd Windows %04X"
 
-#: src/main.c:1795
+#: src/main.c:1855
 msgid "UNKNOWN - please patch me !"
 msgstr "ANCONOSSÙ - ch'am tacon-a, për piasì!"
 
-#: src/main.c:1799
+#: src/main.c:1859
 #, c-format
 msgid ""
 "\n"
@@ -300,48 +299,48 @@
 "\n"
 "La fnëstra 'd contòl a arpòrta \"%s\"; "
 
-#: src/main.c:1802
+#: src/main.c:1862
 #, c-format
 msgid "number of monitors detected: %d\n"
 msgstr "numer d'ecran trovà: %d\n"
 
-#: src/main.c:1805
+#: src/main.c:1865
 #, c-format
 msgid "Number of CPUs detected: %d "
 msgstr "Numer ëd CPU trovà: %d "
 
-#: src/main.c:1808 src/multitrack.c:4902
+#: src/main.c:1868 src/multitrack.c:5068
 msgid "little endian"
 msgstr "partisan cit"
 
-#: src/main.c:1809 src/multitrack.c:4901
+#: src/main.c:1869 src/multitrack.c:5067
 msgid "big endian"
 msgstr "partisan gròss"
 
-#: src/main.c:1810
+#: src/main.c:1870
 #, c-format
 msgid "(%d bits, %s)\n"
 msgstr "(%d bit, %s)\n"
 
-#: src/main.c:1814
+#: src/main.c:1874
 msgid "GUI type is: "
 msgstr "ël fònt GUI a l'è: "
 
-#: src/main.c:1818
+#: src/main.c:1878
 #, c-format
 msgid "GTK+ version %d.%d.%d (compiled with %d.%d.%d)"
 msgstr "GTK+ version %d.%d.%d (compilà con %d.%d.%d)"
 
-#: src/main.c:1840
+#: src/main.c:1900
 msgid ", with cairo support"
 msgstr ", con supòrt cairo"
 
-#: src/main.c:1847
+#: src/main.c:1907
 #, c-format
 msgid "Temp directory is %s\n"
 msgstr "Ël plior temporari a l'è %s\n"
 
-#: src/main.c:1851
+#: src/main.c:1911
 msgid ""
 "WARNING - this version of LiVES was compiled without either\n"
 "jack or pulse audio support.\n"
@@ -351,15 +350,15 @@
 "ai jack e al pulse audio.\n"
 "Many audio features will be unavailable.\n"
 
-#: src/main.c:1854
+#: src/main.c:1914
 msgid "Compiled with jack support, good !\n"
 msgstr "Compilà con supòrt ai jack, a va bin!\n"
 
-#: src/main.c:1857
+#: src/main.c:1917
 msgid "Compiled with pulse audio support, wonderful !\n"
 msgstr "Compilà con supòrt al pulse audio, marvijos!\n"
 
-#: src/main.c:1861
+#: src/main.c:1921
 #, c-format
 msgid ""
 "Welcome to LiVES version %s.\n"
@@ -368,7 +367,7 @@
 "Bin vnù a LiVES - version %s.\n"
 "\n"
 
-#: src/main.c:2306
+#: src/main.c:2380
 #, c-format
 msgid ""
 "\n"
@@ -377,73 +376,79 @@
 "\n"
 "La sintassis dlë startup a l'è: %s [opts] [filename [start_time] [frames]]\n"
 
-#: src/main.c:2307
+#: src/main.c:2381
 msgid "Where: filename is the name of a media file or backup file.\n"
 msgstr "Antè: \"pito\" l'è 'l nòm dël dait multimedial o dël dait ëd backup.\n"
 
-#: src/main.c:2308
+#: src/main.c:2382
 msgid "start_time : filename start time in seconds\n"
 msgstr "temp_andi : l'istant d'andi ëd pito mzurà an scond\n"
 
-#: src/main.c:2309
+#: src/main.c:2383
 msgid "frames : maximum number of frames to open\n"
 msgstr "curnis: numer massim ëd curnis da duertè\n"
 
-#: src/main.c:2311
+#: src/main.c:2385
 msgid "opts can be:\n"
 msgstr "j'opsion a peulo esse:\n"
 
-#: src/main.c:2312
+#: src/main.c:2386
 msgid "-help            : show this help text and exit\n"
 msgstr "-agiut : a mostra es test d'agiut e la surtìa\n"
 
-#: src/main.c:2313
+#: src/main.c:2387
 msgid "-tmpdir <tempdir>: use alternate working directory (e.g /var/ramdisk)\n"
 msgstr ""
 "-tmpdir <tempdir>: a dòvra 'n plior auternativ fonsionant (e.g /var/"
 "ramdisk)\n"
 
-#: src/main.c:2314
+#: src/main.c:2388
 msgid "-set <setname>   : autoload clip set setname\n"
 msgstr "-set <setname>   : autocaria nòm predefinì\n"
 
-#: src/main.c:2315
+#: src/main.c:2389
 msgid "-noset           : do not load any set on startup\n"
 msgstr "-noset  : caria gnun-a impostassion slë startup\n"
 
-#: src/main.c:2316
+#: src/main.c:2390
 msgid "-norecover       : force no-loading of crash recovery\n"
 msgstr "-norecover  : dëscaria forsà dl'arcuper ëd vast\n"
 
-#: src/main.c:2317
+#: src/main.c:2391
 msgid "-recover         : force loading of crash recovery\n"
 msgstr "-recover         : caria forsà dl'arcuper ëd vast\n"
 
-#: src/main.c:2318
-msgid "-nothreaddialog  : doe nothing - retained for backwards compatibility\n"
+#: src/main.c:2392
+#, fuzzy
+msgid ""
+"-nothreaddialog  : does nothing - retained for backwards compatibility\n"
 msgstr "-nothreaddialog  : fa nient - mantenlo për la drècompatibijtà\n"
 
-#: src/main.c:2319
+#: src/main.c:2393
 msgid "-nogui           : do not show the gui\n"
 msgstr "-nogui           : smon nen l'interfassa grafica pr'ël dovrant (GUI)\n"
 
-#: src/main.c:2320
+#: src/main.c:2394
 msgid "-nosplash        : do not show the splash window\n"
 msgstr "-nosplash        : smon nen la fnëstra 'd caria\n"
 
-#: src/main.c:2321
+#: src/main.c:2395
 msgid "-noplaywin       : do not show the play window\n"
 msgstr "-noplaywin       : smon nen la fnëstra 'd  dësròl\n"
 
-#: src/main.c:2322
+#: src/main.c:2396
+msgid "-noninteractive  : disable menu interactivity\n"
+msgstr ""
+
+#: src/main.c:2397
 msgid "-startup-ce      : start in clip editor mode\n"
 msgstr "-startup-ce      : nandia an meud edita-ciape\n"
 
-#: src/main.c:2323
+#: src/main.c:2398
 msgid "-startup-mt      : start in multitrack mode\n"
 msgstr "-startup-mt      : nandia an meud multisbòss\n"
 
-#: src/main.c:2324
+#: src/main.c:2399
 msgid ""
 "-fxmodesmax <n>  : allow <n> modes per effect key (minimum is 1, default is "
 "8)\n"
@@ -451,15 +456,15 @@
 "-fxmodesmax <n>  : përmet <n> meud për minch na ciav d'efet (minim l'è 1, "
 "default l'è 8)\n"
 
-#: src/main.c:2326
+#: src/main.c:2401
 msgid "-oscstart <port> : start OSC listener on UDP port <port>\n"
 msgstr "-oscstart <port> : nandia lë scotator OSC sla pòrta UDP <port>\n"
 
-#: src/main.c:2327
+#: src/main.c:2402
 msgid "-nooscstart      : do not start OSC listener\n"
 msgstr "-nooscstart      : nandia nen lë scotator OSC\n"
 
-#: src/main.c:2329
+#: src/main.c:2404
 #, fuzzy
 msgid ""
 "-aplayer <ap>    : start with selected audio player. <ap> can be mplayer, "
@@ -468,15 +473,15 @@
 "-aplayer <ap>    : nandia con ën slessionà audiòfon. <ap> a peul esse mplayer"
 
 #. TRANSLATORS: pulse (audio)
-#: src/main.c:2332
+#: src/main.c:2407
 msgid ", pulse"
 msgstr ", pulse"
 
-#: src/main.c:2335
+#: src/main.c:2410
 msgid ", sox or jack\n"
 msgstr ", sox o jack\n"
 
-#: src/main.c:2336
+#: src/main.c:2412
 msgid ""
 "-jackopts <opts>    : opts is a bitmap of jack startup options [1 = jack "
 "transport client, 2 = jack transport master, 4 = start jack transport "
@@ -486,29 +491,29 @@
 "transport client, 2 = jack transport master, 4 = start jack transport "
 "server, 8 = pause audio when video paused, 16 = start jack audio server] \n"
 
-#: src/main.c:2338
+#: src/main.c:2414
 msgid " or sox\n"
 msgstr " o sox\n"
 
-#: src/main.c:2340
+#: src/main.c:2416
 msgid "-devicemap <mapname>          : autoload devicemap\n"
 msgstr "-devicemap <mapname>          : autocaria devicemap\n"
 
-#: src/main.c:2341
+#: src/main.c:2418
 msgid ""
 "-vppdefaults <file>          : load video playback plugin defaults from "
 "<file> (Note: only sets the settings, not the plugin type)\n"
 msgstr ""
 
-#: src/main.c:2342
+#: src/main.c:2419
 msgid "-debug            : try to debug crashes (requires 'gdb' installed)\n"
 msgstr ""
 
-#: src/main.c:2373 src/gui.c:1128
+#: src/main.c:2449 src/gui.c:1127
 msgid "Starting GUI..."
 msgstr ""
 
-#: src/main.c:2396
+#: src/main.c:2475
 #, c-format
 msgid ""
 "\n"
@@ -519,7 +524,7 @@
 "(Maybe you need to change the value of <prefix_dir> in your %s file)\n"
 msgstr ""
 
-#: src/main.c:2410
+#: src/main.c:2492
 #, c-format
 msgid ""
 "\n"
@@ -527,7 +532,7 @@
 "Please make sure you have write access to %s and try again.\n"
 msgstr ""
 
-#: src/main.c:2415
+#: src/main.c:2498
 msgid ""
 "\n"
 "`smogrify` must be in your path, and be executable\n"
@@ -536,7 +541,7 @@
 "before running LiVES.\n"
 msgstr ""
 
-#: src/main.c:2421
+#: src/main.c:2504
 #, c-format
 msgid ""
 "\n"
@@ -546,7 +551,7 @@
 "Please check the file permissions for this file and try again.\n"
 msgstr ""
 
-#: src/main.c:2428
+#: src/main.c:2512
 #, c-format
 msgid ""
 "\n"
@@ -557,7 +562,7 @@
 "and try again.\n"
 msgstr ""
 
-#: src/main.c:2438
+#: src/main.c:2522
 #, c-format
 msgid ""
 "Please check the <tempdir> setting in \n"
@@ -565,7 +570,7 @@
 "and try again.\n"
 msgstr ""
 
-#: src/main.c:2445
+#: src/main.c:2528
 #, c-format
 msgid ""
 "\n"
@@ -575,7 +580,7 @@
 "%s"
 msgstr ""
 
-#: src/main.c:2453
+#: src/main.c:2536
 msgid ""
 "\n"
 "An incorrect version of smogrify was found in your path.\n"
@@ -586,49 +591,49 @@
 "Thankyou.\n"
 msgstr ""
 
-#: src/main.c:2458
+#: src/main.c:2541
 msgid ""
 "\n"
 "LiVES currently requires 'mplayer', 'mplayer2' or 'sox' to function. Please "
 "install one or other of these, and try again.\n"
 msgstr ""
 
-#: src/main.c:2462
+#: src/main.c:2546
 msgid ""
 "\n"
 "LiVES currently requires both 'mplayer' or 'mplayer2' and 'sox' to function. "
 "Please install these, and try again.\n"
 msgstr ""
 
-#: src/main.c:2472
+#: src/main.c:2556
 msgid ""
 "\n"
 "LiVES was unable to locate 'mplayer' or 'mplayer2'. You may wish to install "
 "either one to use LiVES more fully.\n"
 msgstr ""
 
-#: src/main.c:2475
+#: src/main.c:2561
 msgid ""
 "\n"
 "LiVES was unable to locate 'convert'. You should install convert and image-"
 "magick if you want to use rendered effects.\n"
 msgstr ""
 
-#: src/main.c:2478
+#: src/main.c:2566
 msgid ""
 "\n"
 "LiVES was unable to locate 'composite'. You should install composite and "
 "image-magick if you want to use the merge function.\n"
 msgstr ""
 
-#: src/main.c:2481
+#: src/main.c:2570
 msgid ""
 "\n"
 "LiVES was unable to locate 'sox'. Some audio features may not work. You "
 "should install 'sox'.\n"
 msgstr ""
 
-#: src/main.c:2484
+#: src/main.c:2575
 #, c-format
 msgid ""
 "\n"
@@ -639,93 +644,93 @@
 "You may need to change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/main.c:2611
+#: src/main.c:2707
 #, c-format
 msgid "Autoloading set %s..."
 msgstr ""
 
 #. TRANSLATORS: localised name may be used here
-#: src/main.c:2781 src/interface.c:738
+#: src/main.c:2902
 msgid "LiVES"
 msgstr ""
 
-#: src/main.c:2948
+#: src/main.c:3066
 #, c-format
 msgid "Invalid audio player %s\n"
 msgstr ""
 
-#: src/main.c:3077
+#: src/main.c:3214
 #, c-format
 msgid "LiVES-%s: <Untitled%d> %dx%d : %d frames %d bpp %.3f fps"
 msgstr ""
 
-#: src/main.c:3082
+#: src/main.c:3219
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : ??? frames ??? bpp %.3f fps"
 msgstr ""
 
-#: src/main.c:3086
+#: src/main.c:3222
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : %d frames %d bpp %.3f fps"
 msgstr ""
 
-#: src/main.c:3094
+#: src/main.c:3229
 #, c-format
 msgid "LiVES-%s: <No File>"
 msgstr ""
 
 #. TRANSLATORS: rec(ord)
-#: src/main.c:5085
+#: src/main.c:5201
 #, c-format
 msgid "rec %9d/%d"
 msgstr ""
 
 #. TRANSLATORS: out of memory (rec(ord))
-#: src/main.c:5091
+#: src/main.c:5206
 #, c-format
 msgid "!rec %9d/%d"
 msgstr ""
 
-#: src/main.c:5398 src/main.c:5399 src/gui.c:2110 src/gui.c:3220
-#: src/saveplay.c:2336
+#: src/main.c:5500 src/main.c:5501 src/gui.c:2108 src/gui.c:3331
+#: src/saveplay.c:2315
 msgid "Play"
 msgstr ""
 
-#: src/main.c:6128
+#: src/main.c:6216
 msgid ""
 "LiVES was unable to capture this image\n"
 "\n"
 msgstr ""
 
-#: src/main.c:6250
+#: src/main.c:6345
 #, c-format
 msgid "Closed file %s\n"
 msgstr ""
 
-#: src/main.c:6452 src/gui.c:648 src/utils.c:4312 src/utils.c:4344
-#: src/saveplay.c:3550 src/multitrack.c:4510 src/multitrack.c:6268
+#: src/main.c:6542 src/gui.c:647 src/utils.c:4256 src/utils.c:4286
+#: src/saveplay.c:3500 src/multitrack.c:4678 src/multitrack.c:6447
 msgid "_Undo"
 msgstr ""
 
-#: src/main.c:6453 src/gui.c:666 src/utils.c:4313 src/utils.c:4345
-#: src/saveplay.c:3551 src/multitrack.c:4531 src/multitrack.c:6293
+#: src/main.c:6543 src/gui.c:665 src/utils.c:4257 src/utils.c:4287
+#: src/saveplay.c:3501 src/multitrack.c:4698 src/multitrack.c:6472
 msgid "_Redo"
 msgstr ""
 
-#: src/main.c:6493 src/interface.c:470 src/gui.c:2326 src/preferences.c:2357
-#: src/resample.c:1516
+#: src/main.c:6583 src/interface.c:457 src/gui.c:2324 src/preferences.c:2391
+#: src/resample.c:1488
 msgid "Video"
 msgstr ""
 
-#: src/main.c:6494 src/interface.c:483 src/gui.c:2351
+#: src/main.c:6584 src/interface.c:470 src/gui.c:2348
 msgid "Left Audio"
 msgstr ""
 
-#: src/main.c:6495 src/gui.c:2375
+#: src/main.c:6585 src/gui.c:2371
 msgid "Right Audio"
 msgstr ""
 
-#: src/main.c:6540
+#: src/main.c:6630
 msgid ""
 "\n"
 "\n"
@@ -734,11 +739,11 @@
 "Please adjust the playback options in Preferences and try again.\n"
 msgstr ""
 
-#: src/main.c:7051 src/plugins.c:1502
+#: src/main.c:7134 src/plugins.c:1468
 msgid "LiVES: - Play Window"
 msgstr ""
 
-#: src/startup.c:25
+#: src/startup.c:24
 #, c-format
 msgid ""
 "A directory named\n"
@@ -748,7 +753,7 @@
 "(Free space = %s)\n"
 msgstr ""
 
-#: src/startup.c:32
+#: src/startup.c:29
 #, c-format
 msgid ""
 "A directory named\n"
@@ -758,7 +763,7 @@
 "Please select another location.\n"
 msgstr ""
 
-#: src/startup.c:49
+#: src/startup.c:46
 #, c-format
 msgid ""
 "\n"
@@ -769,7 +774,7 @@
 "(Free space = %s)"
 msgstr ""
 
-#: src/startup.c:54
+#: src/startup.c:50
 #, c-format
 msgid ""
 "\n"
@@ -778,54 +783,54 @@
 "Please try again and choose a different location.\n"
 msgstr ""
 
-#: src/startup.c:96
+#: src/startup.c:92
 msgid "Directory name is too long !"
 msgstr ""
 
-#: src/startup.c:223
+#: src/startup.c:216
 msgid ""
 "LiVES FAILED TO START YOUR SELECTED AUDIO PLAYER !\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:230
+#: src/startup.c:222
 msgid ""
 "Before starting LiVES, you need to choose an audio player.\n"
 "\n"
 "PULSE AUDIO is recommended for most users"
 msgstr ""
 
-#: src/startup.c:233
+#: src/startup.c:225
 msgid ""
 ", but this version of LiVES was not compiled with pulse audio support.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:236
+#: src/startup.c:229
 msgid ""
 ", but you do not have pulse audio installed on your system.\n"
 " You are advised to install pulse audio first before running LiVES.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:241
+#: src/startup.c:233
 msgid "JACK audio is recommended for pro users"
 msgstr ""
 
-#: src/startup.c:244
+#: src/startup.c:236
 msgid ""
 ", but this version of LiVES was not compiled with jack audio support.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:247
+#: src/startup.c:239
 msgid ""
 ", but you do not have jackd installed. You may wish to install jackd first "
 "before running LiVES.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:250
+#: src/startup.c:242
 msgid ""
 ", but may prevent LiVES from starting on some systems.\n"
 "If LiVES will not start with jack, you can restart and try with another "
@@ -833,159 +838,159 @@
 "\n"
 msgstr ""
 
-#: src/startup.c:254
+#: src/startup.c:246
 msgid "SOX may be used if neither of the preceding players work, "
 msgstr ""
 
-#: src/startup.c:257
+#: src/startup.c:249
 msgid ""
 "but some audio features will be disabled.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:260
+#: src/startup.c:251
 msgid ""
 "but you do not have sox installed.\n"
 "You are advised to install it before running LiVES.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:264
+#: src/startup.c:255
 msgid ""
 "The MPLAYER/MPLAYER2 audio player is only recommended for testing purposes.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:281
+#: src/startup.c:271
 msgid "LiVES: - Choose an audio player"
 msgstr ""
 
-#: src/startup.c:298
+#: src/startup.c:288
 msgid "Use _pulse audio player"
 msgstr ""
 
-#: src/startup.c:320
+#: src/startup.c:310
 msgid "Use _jack audio player"
 msgstr ""
 
-#: src/startup.c:340
+#: src/startup.c:330
 msgid "Use _sox audio player"
 msgstr ""
 
-#: src/startup.c:361
+#: src/startup.c:351
 msgid "Use _mplayer audio player"
 msgstr ""
 
-#: src/startup.c:381
+#: src/startup.c:371
 msgid "Use _mplayer2 audio player"
 msgstr ""
 
-#: src/startup.c:405 src/startup.c:580 src/interface.c:1506
+#: src/startup.c:395 src/startup.c:569 src/interface.c:1398
 msgid "_Next"
 msgstr ""
 
-#: src/startup.c:445
+#: src/startup.c:435
 msgid "Skipped"
 msgstr ""
 
-#: src/startup.c:460
+#: src/startup.c:450
 msgid "Passed"
 msgstr ""
 
-#: src/startup.c:493
+#: src/startup.c:483
 msgid "Failed"
 msgstr ""
 
-#: src/startup.c:552
+#: src/startup.c:542
 msgid "LiVES: - Testing Configuration"
 msgstr ""
 
-#: src/startup.c:555
+#: src/startup.c:544
 msgid "LiVES: - Troubleshoot"
 msgstr ""
 
-#: src/startup.c:568
+#: src/startup.c:557
 msgid "LiVES will now run some basic configuration tests\n"
 msgstr ""
 
-#: src/startup.c:603
+#: src/startup.c:591
 msgid "Checking for \"sox\" presence"
 msgstr ""
 
-#: src/startup.c:607
+#: src/startup.c:595
 msgid ""
 "You should install sox to be able to use all the audio features in LiVES"
 msgstr ""
 
-#: src/startup.c:615
+#: src/startup.c:602
 msgid "Checking if sox can convert audio"
 msgstr ""
 
-#: src/startup.c:638
+#: src/startup.c:625
 msgid "Unable to allocate 176400 bytes memory."
 msgstr ""
 
-#: src/startup.c:653
+#: src/startup.c:639
 #, c-format
 msgid "Unable to write to: %s"
 msgstr ""
 
-#: src/startup.c:667 src/startup.c:807
+#: src/startup.c:653 src/startup.c:789
 #, c-format
 msgid "Command failed: %s"
 msgstr ""
 
-#: src/startup.c:689
+#: src/startup.c:675
 msgid "You should install sox_fmt_all or similar"
 msgstr ""
 
-#: src/startup.c:717
+#: src/startup.c:703
 msgid "Checking for \"mplayer\" presence"
 msgstr ""
 
-#: src/startup.c:721
+#: src/startup.c:707
 msgid ""
 "You should install mplayer or mplayer2 to be able to use all the decoding "
 "features in LiVES"
 msgstr ""
 
-#: src/startup.c:747
+#: src/startup.c:732
 msgid "Checking if mplayer can convert audio"
 msgstr ""
 
-#: src/startup.c:768
+#: src/startup.c:751
 msgid "You should install mplayer or mplayer2 with pcm/wav support"
 msgstr ""
 
-#: src/startup.c:785
+#: src/startup.c:767
 msgid "Checking if mplayer can decode to png/alpha"
 msgstr ""
 
-#: src/startup.c:828
+#: src/startup.c:810
 msgid "You may wish to upgrade mplayer to a newer version"
 msgstr ""
 
-#: src/startup.c:854
+#: src/startup.c:836
 msgid "Checking if mplayer can decode to jpeg"
 msgstr ""
 
-#: src/startup.c:882
+#: src/startup.c:862
 msgid "You should install mplayer with either png/alpha or jpeg support"
 msgstr ""
 
-#: src/startup.c:883
+#: src/startup.c:863
 msgid "You may wish to add jpeg output support to mplayer"
 msgstr ""
 
-#: src/startup.c:892
+#: src/startup.c:872
 msgid "Checking for \"convert\" presence"
 msgstr ""
 
-#: src/startup.c:896
+#: src/startup.c:876
 msgid "Install imageMagick to be able to use all of the rendered effects"
 msgstr ""
 
-#: src/startup.c:909
+#: src/startup.c:889
 msgid ""
 "\n"
 "\n"
@@ -993,7 +998,7 @@
 "Preferences/Decoding.    \n"
 msgstr ""
 
-#: src/startup.c:915
+#: src/startup.c:894
 msgid ""
 "\n"
 "\n"
@@ -1001,49 +1006,49 @@
 "continue    \n"
 msgstr ""
 
-#: src/startup.c:949
+#: src/startup.c:928
 msgid ""
 "\n"
 "\n"
 "Finally, you can choose the default startup interface for LiVES.\n"
 msgstr ""
 
-#: src/startup.c:950
+#: src/startup.c:929
 msgid ""
 "\n"
 "\n"
 "LiVES has two main interfaces and you can start up with either of them.\n"
 msgstr ""
 
-#: src/startup.c:951
+#: src/startup.c:930
 msgid ""
 "\n"
 "\n"
 "The default can always be changed later from Preferences.\n"
 msgstr ""
 
-#: src/startup.c:961
+#: src/startup.c:940
 msgid "LiVES: - Choose the startup interface"
 msgstr ""
 
-#: src/startup.c:972
+#: src/startup.c:951
 msgid "Start in _Clip Edit mode"
 msgstr ""
 
-#: src/startup.c:975
+#: src/startup.c:954
 msgid "This is the best choice for simple editing tasks and for VJs\n"
 msgstr ""
 
-#: src/startup.c:981
+#: src/startup.c:960
 msgid "Start in _Multitrack mode"
 msgstr ""
 
-#: src/startup.c:983
+#: src/startup.c:962
 msgid ""
 "This is a better choice for complex editing tasks involving multiple clips.\n"
 msgstr ""
 
-#: src/startup.c:992
+#: src/startup.c:971
 msgid "_Finish"
 msgstr ""
 
@@ -1060,35 +1065,35 @@
 msgid "Apply _Deinterlace"
 msgstr ""
 
-#: src/interface.c:66
+#: src/interface.c:65
 msgid "If this is set, frames will be deinterlaced as they are imported."
 msgstr ""
 
-#: src/interface.c:113 src/callbacks.c:9623 src/callbacks.c:9646
-#: src/callbacks.c:9647 src/gui.c:3223 src/gui.c:3821 src/saveplay.c:2339
-#: src/saveplay.c:3138 src/dialogs.c:1514 src/dialogs.c:1515
-#: src/dialogs.c:1746 src/dialogs.c:1747 src/framedraw.c:238
-#: src/multitrack.c:8031
+#: src/interface.c:106 src/callbacks.c:9542 src/callbacks.c:9564
+#: src/callbacks.c:9565 src/gui.c:3333 src/gui.c:3946 src/saveplay.c:2317
+#: src/saveplay.c:3097 src/dialogs.c:1575 src/dialogs.c:1576
+#: src/dialogs.c:1804 src/dialogs.c:1805 src/framedraw.c:236
+#: src/multitrack.c:8210
 msgid "Preview"
 msgstr ""
 
-#: src/interface.c:132
+#: src/interface.c:125
 msgid "Click here to _Preview any selected video, image or audio file"
 msgstr ""
 
-#: src/interface.c:135
+#: src/interface.c:127
 msgid "Click here to _Preview any selected audio file"
 msgstr ""
 
-#: src/interface.c:138
+#: src/interface.c:129
 msgid "Click here to _Preview the video"
 msgstr ""
 
-#: src/interface.c:181 src/dialogs.c:2542
+#: src/interface.c:169 src/dialogs.c:2621
 msgid "LiVES: - Processing..."
 msgstr ""
 
-#: src/interface.c:217
+#: src/interface.c:205
 msgid ""
 "\n"
 "\n"
@@ -1097,195 +1102,185 @@
 "Remember to switch off effects (ctrl-0) afterwards !"
 msgstr ""
 
-#: src/interface.c:222 src/callbacks.c:9373 src/callbacks.c:9420
-#: src/dialogs.c:2570
+#: src/interface.c:210 src/callbacks.c:9283 src/callbacks.c:9332
+#: src/dialogs.c:2649
 msgid ""
 "\n"
 "Please Wait"
 msgstr ""
 
-#: src/interface.c:242
+#: src/interface.c:230
 msgid "Show Details"
 msgstr ""
 
-#: src/interface.c:254 src/dialogs.c:2584
+#: src/interface.c:242 src/dialogs.c:2663
 msgid "_Enough"
 msgstr ""
 
-#: src/interface.c:255 src/framedraw.c:278
+#: src/interface.c:243 src/framedraw.c:276
 msgid "_Preview"
 msgstr ""
 
-#: src/interface.c:257
+#: src/interface.c:245 src/callbacks.c:9282 src/callbacks.c:9330
 msgid "Paus_e"
 msgstr ""
 
-#: src/interface.c:258 src/callbacks.c:9417
+#: src/interface.c:246 src/callbacks.c:9329
 msgid "Pause/_Enough"
 msgstr ""
 
-#: src/interface.c:285
+#: src/interface.c:273
 msgid "_Cancel"
 msgstr ""
 
-#: src/interface.c:374
+#: src/interface.c:361
 #, c-format
 msgid "LiVES: - %s"
 msgstr ""
 
-#: src/interface.c:376
+#: src/interface.c:363
 msgid "LiVES: - Multitrack details"
 msgstr ""
 
-#: src/interface.c:407
+#: src/interface.c:394
 msgid "Format"
 msgstr ""
 
-#: src/interface.c:412
+#: src/interface.c:399
 msgid "Frame size"
 msgstr ""
 
-#: src/interface.c:417
+#: src/interface.c:404
 msgid "File size"
 msgstr ""
 
-#: src/interface.c:418
+#: src/interface.c:405
 msgid "Byte size"
 msgstr ""
 
-#: src/interface.c:423 src/interface.c:1891
+#: src/interface.c:410 src/interface.c:1760
 msgid "FPS"
 msgstr ""
 
-#: src/interface.c:428
+#: src/interface.c:415
 msgid "Frames"
 msgstr ""
 
-#: src/interface.c:429
+#: src/interface.c:416
 msgid "Events"
 msgstr ""
 
-#: src/interface.c:434 src/interface.c:500 src/interface.c:542
+#: src/interface.c:421 src/interface.c:486 src/interface.c:528
 msgid "Total time"
 msgstr ""
 
-#: src/interface.c:486 src/resample.c:1488
+#: src/interface.c:472 src/resample.c:1460
 msgid "Audio"
 msgstr ""
 
-#: src/interface.c:511 src/interface.c:553
+#: src/interface.c:497 src/interface.c:539
 msgid "Rate/size"
 msgstr ""
 
-#: src/interface.c:530
+#: src/interface.c:516
 msgid "Right audio"
 msgstr ""
 
-#: src/interface.c:622
+#: src/interface.c:607
 msgid "LiVES: - Encoding options"
 msgstr ""
 
-#: src/interface.c:636
+#: src/interface.c:621
 msgid "<------------- (Check the box to re_size as suggested)"
 msgstr ""
 
-#: src/interface.c:637
+#: src/interface.c:622
 msgid "<------------- (Check the box to use the _size recommendation)"
 msgstr ""
 
-#: src/interface.c:662
+#: src/interface.c:646
 msgid "Use _letterboxing to maintain aspect ratio (optional)"
 msgstr ""
 
-#: src/interface.c:663
+#: src/interface.c:647
 msgid ""
 "Draw black rectangles either above or to the sides of the image, to prevent "
 "it from stretching."
 msgstr ""
 
-#: src/interface.c:694
+#: src/interface.c:677
 msgid "Keep _my settings"
 msgstr ""
 
-#: src/interface.c:695
+#: src/interface.c:678
 msgid "Use _recommended settings"
 msgstr ""
 
-#: src/interface.c:775 src/dialogs.c:114
-msgid ""
-"Do _not show this warning any more\n"
-"(can be turned back on from Preferences/Warnings)"
-msgstr ""
-
-#: src/interface.c:787
-msgid "Show _Details"
-msgstr ""
-
-#: src/interface.c:881
+#: src/interface.c:769
 msgid "_Close Window"
 msgstr ""
 
-#: src/interface.c:883
+#: src/interface.c:771
 msgid "_Save to file"
 msgstr ""
 
-#: src/interface.c:928
+#: src/interface.c:816
 msgid "LiVES: - Insert"
 msgstr ""
 
-#: src/interface.c:945
+#: src/interface.c:833
 msgid "_Number of times to insert"
 msgstr ""
 
-#: src/interface.c:954
+#: src/interface.c:842
 msgid "_Insert to fit audio"
 msgstr ""
 
-#: src/interface.c:968
+#: src/interface.c:856
 msgid "Insert _before selection"
 msgstr ""
 
-#: src/interface.c:970
+#: src/interface.c:858
 msgid "Insert clipboard before selected frames"
 msgstr ""
 
-#: src/interface.c:986
+#: src/interface.c:875
 msgid "Insert _after selection"
 msgstr ""
 
-#: src/interface.c:988
+#: src/interface.c:877
 msgid "Insert clipboard after selected frames"
 msgstr ""
 
-#: src/interface.c:999
+#: src/interface.c:888
 msgid "Insert _with sound"
 msgstr ""
 
-#: src/interface.c:1012
+#: src/interface.c:901
 msgid "Insert with_out sound"
 msgstr ""
 
-#: src/interface.c:1093
+#: src/interface.c:985
 msgid "LiVES: - Open Selection"
 msgstr ""
 
-#: src/interface.c:1111
+#: src/interface.c:1004
 msgid "Selection start time (sec)"
 msgstr ""
 
-#: src/interface.c:1117
+#: src/interface.c:1010
 msgid "Number of frames to open"
 msgstr ""
 
-#: src/interface.c:1193
+#: src/interface.c:1088
 msgid "LiVES: - Open Location"
 msgstr ""
 
-#: src/interface.c:1195
+#: src/interface.c:1090
 msgid "LiVES: - Open Youtube Clip"
 msgstr ""
 
-#: src/interface.c:1213
+#: src/interface.c:1109
 msgid ""
 "\n"
 "\n"
@@ -1295,7 +1290,7 @@
 "\n"
 msgstr ""
 
-#: src/interface.c:1216
+#: src/interface.c:1112
 msgid ""
 "\n"
 "\n"
@@ -1304,62 +1299,62 @@
 "\n"
 msgstr ""
 
-#: src/interface.c:1220
+#: src/interface.c:1116
 msgid ""
 "Enter the URL of the clip below.\n"
 "E.g: http://www.youtube.com/watch?v=WCR6f6WzjP8\n"
 "\n"
 msgstr ""
 
-#: src/interface.c:1231
+#: src/interface.c:1127
 msgid "URL : "
 msgstr ""
 
-#: src/interface.c:1231
+#: src/interface.c:1127
 msgid "Youtube URL : "
 msgstr ""
 
-#: src/interface.c:1235
+#: src/interface.c:1131
 msgid "Do not send bandwidth information"
 msgstr ""
 
-#: src/interface.c:1237
+#: src/interface.c:1133
 msgid "Try this setting if you are having problems getting a stream"
 msgstr ""
 
-#: src/interface.c:1258
+#: src/interface.c:1155
 msgid "Download to _Directory : "
 msgstr ""
 
-#: src/interface.c:1276
+#: src/interface.c:1173
 msgid "Download _File Name : "
 msgstr ""
 
-#: src/interface.c:1281
+#: src/interface.c:1178
 msgid ".webm"
 msgstr ""
 
-#: src/interface.c:1359
+#: src/interface.c:1256
 msgid "LiVES: - Rename Clip"
 msgstr ""
 
-#: src/interface.c:1362
-msgid "LiVES: - Enter Set Name"
+#: src/interface.c:1258
+msgid "LiVES: - Enter Set Name to Save as"
 msgstr ""
 
-#: src/interface.c:1365
+#: src/interface.c:1260
 msgid "LiVES: - Enter a Set Name to Reload"
 msgstr ""
 
-#: src/interface.c:1368
+#: src/interface.c:1262
 msgid "LiVES: - Choose a Working Directory"
 msgstr ""
 
-#: src/interface.c:1371
+#: src/interface.c:1264
 msgid "LiVES: - Rename Current Track"
 msgstr ""
 
-#: src/interface.c:1391
+#: src/interface.c:1283
 msgid ""
 "You need to enter a name for the current clip set.\n"
 "This will allow you reload the layout with the same clips later.\n"
@@ -1367,354 +1362,354 @@
 "LiVES will remind you to save the clip set later when you try to exit.\n"
 msgstr ""
 
-#: src/interface.c:1397
+#: src/interface.c:1289
 msgid ""
 "In order to export this project, you must enter a name for this clip set.\n"
 "This will also be used for the project name.\n"
 msgstr ""
 
-#: src/interface.c:1404
+#: src/interface.c:1296
 msgid ""
 "Welcome to LiVES !\n"
 "This startup wizard will guide you through the\n"
 "initial install so that you can get the most from this application.\n"
 msgstr ""
 
-#: src/interface.c:1408
+#: src/interface.c:1300
 msgid ""
 "\n"
 "First of all you need to choose a working directory for LiVES.\n"
 "This should be a directory with plenty of disk space available.\n"
 msgstr ""
 
-#: src/interface.c:1427
+#: src/interface.c:1317
 msgid "New name "
 msgstr ""
 
-#: src/interface.c:1430
+#: src/interface.c:1319
 msgid "Set name "
 msgstr ""
 
-#: src/interface.c:1550
+#: src/interface.c:1435
 msgid "Use def_aults"
 msgstr ""
 
-#: src/interface.c:1553 src/interface.c:1840 src/preferences.c:2515
-#: src/preferences.c:2697
+#: src/interface.c:1437 src/interface.c:1709 src/preferences.c:2550
+#: src/preferences.c:2739
 msgid "_Advanced"
 msgstr ""
 
-#: src/interface.c:1604
+#: src/interface.c:1487
 msgid "LiVES:- Select input device"
 msgstr ""
 
-#: src/interface.c:1622
+#: src/interface.c:1504
 msgid "Select input device:"
 msgstr ""
 
-#: src/interface.c:1686
+#: src/interface.c:1568
 msgid "LiVES:- Load CD Track"
 msgstr ""
 
-#: src/interface.c:1689
+#: src/interface.c:1570
 msgid "LiVES:- Select DVD Title/Chapter"
 msgstr ""
 
-#: src/interface.c:1692
+#: src/interface.c:1572
 msgid "LiVES:- Select VCD Title"
 msgstr ""
 
-#: src/interface.c:1695
+#: src/interface.c:1574
 msgid "LiVES:- Change Maximum Visible Tracks"
 msgstr ""
 
-#: src/interface.c:1698
+#: src/interface.c:1576
 msgid "LiVES:- Device details"
 msgstr ""
 
-#: src/interface.c:1721
+#: src/interface.c:1598
 #, c-format
 msgid "Track to load (from %s)"
 msgstr ""
 
-#: src/interface.c:1724
+#: src/interface.c:1600
 msgid "DVD Title"
 msgstr ""
 
-#: src/interface.c:1727
+#: src/interface.c:1602
 msgid "VCD Title"
 msgstr ""
 
-#: src/interface.c:1730
+#: src/interface.c:1604
 msgid "Maximum number of tracks to display"
 msgstr ""
 
-#: src/interface.c:1733
+#: src/interface.c:1606
 msgid "Device:        /dev/video"
 msgstr ""
 
-#: src/interface.c:1736
+#: src/interface.c:1608
 msgid "Device:        fw:"
 msgstr ""
 
-#: src/interface.c:1771
+#: src/interface.c:1641
 msgid "Chapter  "
 msgstr ""
 
-#: src/interface.c:1776
+#: src/interface.c:1645
 msgid "Channel  "
 msgstr ""
 
-#: src/interface.c:1791
+#: src/interface.c:1660
 msgid "Audio ID  "
 msgstr ""
 
-#: src/interface.c:1857
+#: src/interface.c:1726
 msgid "Input number"
 msgstr ""
 
-#: src/interface.c:1865
+#: src/interface.c:1734
 msgid "Use default width, height and FPS"
 msgstr ""
 
-#: src/interface.c:1879
+#: src/interface.c:1748
 msgid "Width"
 msgstr ""
 
-#: src/interface.c:1885
+#: src/interface.c:1754
 msgid "Height"
 msgstr ""
 
-#: src/interface.c:1899
+#: src/interface.c:1768
 msgid "_Driver"
 msgstr ""
 
-#: src/interface.c:1902
+#: src/interface.c:1771
 msgid "_Output format"
 msgstr ""
 
-#: src/interface.c:1998
+#: src/interface.c:1865
 msgid "LiVES:- Fade Audio In"
 msgstr ""
 
-#: src/interface.c:2001
+#: src/interface.c:1867
 msgid "LiVES:- Fade Audio Out"
 msgstr ""
 
-#: src/interface.c:2017
+#: src/interface.c:1883
 msgid "Fade in over  "
 msgstr ""
 
-#: src/interface.c:2018
+#: src/interface.c:1884
 msgid "first"
 msgstr ""
 
-#: src/interface.c:2021
+#: src/interface.c:1886
 msgid "Fade out over  "
 msgstr ""
 
-#: src/interface.c:2022
+#: src/interface.c:1887
 msgid "last"
 msgstr ""
 
-#: src/interface.c:2044
+#: src/interface.c:1909
 msgid "seconds."
 msgstr ""
 
-#: src/interface.c:2052 src/saveplay.c:1507
+#: src/interface.c:1917 src/saveplay.c:1484
 msgid "selection"
 msgstr ""
 
-#: src/interface.c:2092
+#: src/interface.c:1956
 msgid "LiVES: - File Comments (optional)"
 msgstr ""
 
-#: src/interface.c:2107
+#: src/interface.c:1971
 msgid "Title/Name : "
 msgstr ""
 
-#: src/interface.c:2114
+#: src/interface.c:1978
 msgid "Author/Artist : "
 msgstr ""
 
-#: src/interface.c:2121
+#: src/interface.c:1985
 msgid "Comments : "
 msgstr ""
 
-#: src/interface.c:2151
+#: src/interface.c:2015
 msgid "_Options"
 msgstr ""
 
-#: src/interface.c:2158
+#: src/interface.c:2022
 msgid "Save _subtitles to file"
 msgstr ""
 
-#: src/interface.c:2170
+#: src/interface.c:2033
 msgid "Subtitle file"
 msgstr ""
 
-#: src/interface.c:2172
+#: src/interface.c:2035
 msgid "Browse..."
 msgstr ""
 
-#: src/interface.c:2255
+#: src/interface.c:2132
 msgid "LiVES: - choose a device"
 msgstr ""
 
-#: src/interface.c:2259
+#: src/interface.c:2135
 msgid "LiVES: - choose a directory"
 msgstr ""
 
-#: src/interface.c:2262
+#: src/interface.c:2137
 msgid "LiVES: - choose a file"
 msgstr ""
 
-#: src/interface.c:2445
+#: src/interface.c:2381
 msgid "LiVES: - Cancel/Discard/Save"
 msgstr ""
 
-#: src/interface.c:2460
+#: src/interface.c:2397
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has not been saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:2463
+#: src/interface.c:2400
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has been changed since the last save.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:2467
+#: src/interface.c:2404
 msgid ""
 "You are about to exit LiVES.\n"
 "The current clip set can be saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:2468
+#: src/interface.c:2405
 msgid ""
 "The current clip set has not been saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:2472
+#: src/interface.c:2408
 msgid ""
 "The current layout has not been saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:2475
+#: src/interface.c:2410
 msgid ""
 "The current layout has *not* been changed since it was last saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:2480
+#: src/interface.c:2415
 msgid ""
 "The current layout contains generated frames and cannot be retained.\n"
 "You may wish to render it before exiting multitrack mode.\n"
 msgstr ""
 
-#: src/interface.c:2483
+#: src/interface.c:2418
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout contains generated frames and cannot be retained.\n"
 "What do you wish to do ?"
 msgstr ""
 
-#: src/interface.c:2496
+#: src/interface.c:2431
 msgid "Clip set _name"
 msgstr ""
 
-#: src/interface.c:2502
+#: src/interface.c:2437
 msgid "_Auto reload next time"
 msgstr ""
 
-#: src/interface.c:2538 src/interface.c:2547
+#: src/interface.c:2473 src/interface.c:2482
 msgid "_Wipe layout"
 msgstr ""
 
-#: src/interface.c:2539
+#: src/interface.c:2474
 msgid "_Ignore changes"
 msgstr ""
 
-#: src/interface.c:2540
+#: src/interface.c:2475
 msgid "_Delete clip set"
 msgstr ""
 
-#: src/interface.c:2541
+#: src/interface.c:2476
 msgid "_Delete layout"
 msgstr ""
 
-#: src/interface.c:2545
+#: src/interface.c:2480
 msgid "_Save layout"
 msgstr ""
 
-#: src/interface.c:2546
+#: src/interface.c:2481
 msgid "_Save clip set"
 msgstr ""
 
-#: src/interface.c:2565
+#: src/interface.c:2502
 msgid ""
 "\n"
 "LiVES has detected a multitrack layout from a previous session.\n"
 "Would you like to try and recover it ?\n"
 msgstr ""
 
-#: src/interface.c:2589
+#: src/interface.c:2528
 msgid "LiVES: - Disk Recovery Options"
 msgstr ""
 
-#: src/interface.c:2608
+#: src/interface.c:2549
 msgid "Delete _Orphaned Clips"
 msgstr ""
 
-#: src/interface.c:2609
+#: src/interface.c:2550
 msgid "Delete any clips which are not currently loaded or part of a set"
 msgstr ""
 
-#: src/interface.c:2622
+#: src/interface.c:2564
 msgid "Clear _Backup Files from Closed Clips"
 msgstr ""
 
-#: src/interface.c:2633
+#: src/interface.c:2575
 msgid "Remove Sets which have _Layouts but no Clips"
 msgstr ""
 
-#: src/interface.c:2644
+#: src/interface.c:2586
 msgid "_Reset to Defaults"
 msgstr ""
 
-#: src/interface.c:2651
+#: src/interface.c:2593
 msgid "_Accept"
 msgstr ""
 
-#: src/callbacks.c:198
+#: src/callbacks.c:208
 #, c-format
 msgid "Saving as set %s..."
 msgstr ""
 
-#: src/callbacks.c:833
+#: src/callbacks.c:852
 msgid "Please enter the name of the file to save the clip as.\n"
 msgstr ""
 
-#: src/callbacks.c:841
+#: src/callbacks.c:860
 msgid "Please enter a valid URL for the download.\n"
 msgstr ""
 
-#: src/callbacks.c:867
+#: src/callbacks.c:886
 #, c-format
 msgid "Downloading %s to %s..."
 msgstr ""
 
-#: src/callbacks.c:895
+#: src/callbacks.c:912
 msgid "Downloading clip"
 msgstr ""
 
-#: src/callbacks.c:933
+#: src/callbacks.c:950
 msgid ""
 "\n"
 "LiVES was unable to download the clip.\n"
@@ -1722,17 +1717,17 @@
 "the latest youtube-dl installed.\n"
 msgstr ""
 
-#: src/callbacks.c:1114 src/callbacks.c:1149
+#: src/callbacks.c:1131 src/callbacks.c:1166
 msgid "This file"
 msgstr ""
 
-#: src/callbacks.c:1115
+#: src/callbacks.c:1132
 msgid ""
 ",\n"
 " - including the current layout - "
 msgstr ""
 
-#: src/callbacks.c:1117
+#: src/callbacks.c:1134
 #, c-format
 msgid ""
 "\n"
@@ -1742,7 +1737,7 @@
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1119
+#: src/callbacks.c:1136
 #, c-format
 msgid ""
 "\n"
@@ -1752,20 +1747,20 @@
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1150
+#: src/callbacks.c:1167
 msgid ""
 "Changes made to this clip have not been saved or backed up.\n"
 "\n"
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1343
+#: src/callbacks.c:1356
 msgid ""
 "\n"
 "Invalid project file.\n"
 msgstr ""
 
-#: src/callbacks.c:1356
+#: src/callbacks.c:1370
 #, c-format
 msgid ""
 "\n"
@@ -1778,33 +1773,33 @@
 "Once you have done this, you will be able to import the new project.\n"
 msgstr ""
 
-#: src/callbacks.c:1366
+#: src/callbacks.c:1381
 #, c-format
 msgid "Importing the project %s as set %s..."
 msgstr ""
 
-#: src/callbacks.c:1386
+#: src/callbacks.c:1399
 msgid "Importing project"
 msgstr ""
 
-#: src/callbacks.c:1472
+#: src/callbacks.c:1481
 #, c-format
 msgid "Exporting project %s..."
 msgstr ""
 
-#: src/callbacks.c:1490
+#: src/callbacks.c:1497
 msgid "Exporting project"
 msgstr ""
 
-#: src/callbacks.c:1506
+#: src/callbacks.c:1513
 msgid "Backup as .lv1 file"
 msgstr ""
 
-#: src/callbacks.c:1522
+#: src/callbacks.c:1529
 msgid "Restore .lv1 file"
 msgstr ""
 
-#: src/callbacks.c:1664
+#: src/callbacks.c:1671
 msgid ""
 "\n"
 "\n"
@@ -1812,72 +1807,77 @@
 "Are you sure ?\n"
 msgstr ""
 
-#: src/callbacks.c:1725
+#: src/callbacks.c:1732
 #, c-format
 msgid "Deleting set %s..."
 msgstr ""
 
-#: src/callbacks.c:1727
+#: src/callbacks.c:1734
 msgid "Deleting set..."
 msgstr ""
 
-#: src/callbacks.c:1731
+#: src/callbacks.c:1738
 msgid "Deleting set"
 msgstr ""
 
-#: src/callbacks.c:1739
+#: src/callbacks.c:1746
 #, c-format
 msgid "Set %s was permanently deleted from the disk.\n"
 msgstr ""
 
-#: src/callbacks.c:1787 src/callbacks.c:11764
+#: src/callbacks.c:1792 src/callbacks.c:11676
 msgid "Insert Silence"
 msgstr ""
 
-#: src/callbacks.c:1840 src/callbacks.c:1923 src/callbacks.c:2086
+#: src/callbacks.c:1844 src/callbacks.c:1927 src/callbacks.c:2089
 msgid "Undoing"
 msgstr ""
 
-#: src/callbacks.c:1936 src/callbacks.c:2147
+#: src/callbacks.c:1940 src/callbacks.c:2150
 msgid "Restoring audio..."
 msgstr ""
 
-#: src/callbacks.c:1952
+#: src/callbacks.c:1956
 msgid "Clearing frame images"
 msgstr ""
 
-#: src/callbacks.c:1985
+#: src/callbacks.c:1988
 msgid "Deleting excess frames"
 msgstr ""
 
-#: src/callbacks.c:2229
+#: src/callbacks.c:2232
 #, c-format
 msgid "Length of video is now %d frames at %.3f frames per second.\n"
 msgstr ""
 
-#: src/callbacks.c:2233 src/resample.c:683 src/resample.c:2166
+#: src/callbacks.c:2235 src/resample.c:678 src/resample.c:2133
 #, c-format
 msgid "Clipboard was resampled to %d frames.\n"
 msgstr ""
 
-#: src/callbacks.c:2394 src/callbacks.c:2423
+#: src/callbacks.c:2396 src/callbacks.c:2425
 msgid "Redoing"
 msgstr ""
 
-#: src/callbacks.c:2462
+#: src/callbacks.c:2472
+#, c-format
+msgid "Copying frames %d to %d (with sound) to the clipboard..."
+msgstr ""
+
+#: src/callbacks.c:2474
 #, c-format
-msgid "Copying frames %d to %d%s to the clipboard..."
+msgid "Copying frames %d to %d to the clipboard..."
 msgstr ""
 
-#: src/callbacks.c:2525
+#: src/callbacks.c:2526
 msgid "Copying to the clipboard"
 msgstr ""
 
-#: src/callbacks.c:2600
+#: src/callbacks.c:2601
 msgid "Cut"
 msgstr ""
 
-#: src/callbacks.c:2641 src/callbacks.c:3068 src/callbacks.c:8026
+#: src/callbacks.c:2641 src/callbacks.c:3063 src/callbacks.c:7631
 msgid "Pulling frames from clipboard"
 msgstr ""
 
@@ -1886,22 +1886,22 @@
 msgid "Pasting %d frames to new clip %s..."
 msgstr ""
 
-#: src/callbacks.c:2678
+#: src/callbacks.c:2676
 msgid "Pasting"
 msgstr ""
 
-#: src/callbacks.c:2694
+#: src/callbacks.c:2692
 msgid "...added audio..."
 msgstr ""
 
-#: src/callbacks.c:2778
+#: src/callbacks.c:2775
 msgid ""
 "This operation requires resizing or converting of frames.\n"
 "Please install 'convert' from the Image-magick package, and then restart "
 "LiVES.\n"
 msgstr ""
 
-#: src/callbacks.c:2795
+#: src/callbacks.c:2793
 msgid ""
 "\n"
 "\n"
@@ -1910,31 +1910,31 @@
 "the 'Trim Audio' function from the Audio menu."
 msgstr ""
 
-#: src/callbacks.c:2819
+#: src/callbacks.c:2817
 msgid ""
 "LiVES cannot insert because the audio rates do not match.\n"
 "Please install 'sox', and try again."
 msgstr ""
 
-#: src/callbacks.c:2838
+#: src/callbacks.c:2835
 msgid ""
 "\n"
 "Insertion will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:2888 src/callbacks.c:11692
+#: src/callbacks.c:2883 src/callbacks.c:11606
 msgid ""
 "\n"
 "Insertion will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:2996 src/callbacks.c:3025
+#: src/callbacks.c:2987 src/callbacks.c:3016
 msgid "Resampling clipboard audio"
 msgstr ""
 
-#: src/callbacks.c:3041
+#: src/callbacks.c:3032
 msgid ""
 "\n"
 "\n"
@@ -1942,7 +1942,7 @@
 "Clipboard audio has been erased.\n"
 msgstr ""
 
-#: src/callbacks.c:3055
+#: src/callbacks.c:3045
 msgid ""
 "\n"
 "\n"
@@ -1951,86 +1951,86 @@
 "using unchanged audio ?\n"
 msgstr ""
 
-#: src/callbacks.c:3137 src/callbacks.c:3311
+#: src/callbacks.c:3132 src/callbacks.c:3299
 #, c-format
 msgid "Inserting %d%s frames from the clipboard..."
 msgstr ""
 
-#: src/callbacks.c:3162 src/callbacks.c:3236 src/callbacks.c:3339
+#: src/callbacks.c:3155 src/callbacks.c:3224 src/callbacks.c:3325
 msgid "Inserting"
 msgstr ""
 
-#: src/callbacks.c:3193
+#: src/callbacks.c:3187
 #, c-format
 msgid "Inserting %d times from the clipboard%s..."
 msgstr ""
 
-#: src/callbacks.c:3200
+#: src/callbacks.c:3191
 #, c-format
 msgid "Inserting %d frames from the clipboard%s..."
 msgstr ""
 
-#: src/callbacks.c:3418
+#: src/callbacks.c:3404
 msgid "Insert"
 msgstr ""
 
-#: src/callbacks.c:3486
+#: src/callbacks.c:3471
 msgid ""
 "\n"
 "Deleting all frames will close this file.\n"
 "Are you sure ?"
 msgstr ""
 
-#: src/callbacks.c:3495
+#: src/callbacks.c:3480
 msgid ""
 "\n"
 "Deletion will cause missing frames in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3515 src/callbacks.c:10920 src/callbacks.c:11162
-#: src/callbacks.c:11228
+#: src/callbacks.c:3500 src/callbacks.c:10851 src/callbacks.c:11087
+#: src/callbacks.c:11152
 msgid ""
 "\n"
 "Deletion will cause missing audio in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3534
+#: src/callbacks.c:3519
 msgid ""
 "\n"
 "Deletion will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3553 src/callbacks.c:11210
+#: src/callbacks.c:3538 src/callbacks.c:11134
 msgid ""
 "\n"
 "Deletion will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3611
+#: src/callbacks.c:3597
 #, c-format
 msgid "Deleting frames %d to %d%s..."
 msgstr ""
 
-#: src/callbacks.c:3636
+#: src/callbacks.c:3619
 msgid "Deleting"
 msgstr ""
 
-#: src/callbacks.c:3717
+#: src/callbacks.c:3699
 msgid "Delete"
 msgstr ""
 
-#: src/callbacks.c:3738
+#: src/callbacks.c:3717
 msgid ""
 "\n"
 "\n"
 "Selection is locked.\n"
 msgstr ""
 
-#: src/callbacks.c:4092
+#: src/callbacks.c:4056
 msgid ""
 "Ready to record. Use 'control' and cursor keys during playback to record "
 "your performance.\n"
@@ -2038,11 +2038,11 @@
 "play.)\n"
 msgstr ""
 
-#: src/callbacks.c:4098
+#: src/callbacks.c:4061
 msgid "Record cancelled.\n"
 msgstr ""
 
-#: src/callbacks.c:4237
+#: src/callbacks.c:4197
 #, c-format
 msgid ""
 "\n"
@@ -2051,7 +2051,7 @@
 "%s\n"
 msgstr ""
 
-#: src/callbacks.c:4241
+#: src/callbacks.c:4200
 #, c-format
 msgid ""
 "\n"
@@ -2060,7 +2060,7 @@
 "The plugin may be broken or not installed correctly."
 msgstr ""
 
-#: src/callbacks.c:4571
+#: src/callbacks.c:4532
 #, c-format
 msgid ""
 "Saving the set will cause copies of all loaded clips to remain on the disk"
@@ -2069,22 +2069,22 @@
 "Please press 'Cancel' if that is not what you want.\n"
 msgstr ""
 
-#: src/callbacks.c:4654
+#: src/callbacks.c:4617
 #, c-format
 msgid "Saving set %s"
 msgstr ""
 
-#: src/callbacks.c:5005
+#: src/callbacks.c:4964
 #, c-format
 msgid "Loading clips from set %s"
 msgstr ""
 
-#: src/callbacks.c:5093
+#: src/callbacks.c:5051
 #, c-format
 msgid "%d clips and %d layouts were recovered from set (%s).\n"
 msgstr ""
 
-#: src/callbacks.c:5312
+#: src/callbacks.c:5259
 msgid ""
 "LiVES will attempt to recover some disk space.\n"
 "You should ONLY run this if you have no other copies of LiVES running on "
@@ -2092,24 +2092,24 @@
 "Click OK to proceed.\n"
 msgstr ""
 
-#: src/callbacks.c:5317
+#: src/callbacks.c:5264
 msgid "Cleaning up disk space..."
 msgstr ""
 
-#: src/callbacks.c:5387
+#: src/callbacks.c:5334
 msgid "Recovering disk space"
 msgstr ""
 
-#: src/callbacks.c:5439
+#: src/callbacks.c:5386
 #, c-format
 msgid "%s of disk space was recovered.\n"
 msgstr ""
 
-#: src/callbacks.c:5482
+#: src/callbacks.c:5428
 msgid "Resetting frame rates and frame values..."
 msgstr ""
 
-#: src/callbacks.c:5523
+#: src/callbacks.c:5469
 #, c-format
 msgid ""
 "\n"
@@ -2117,68 +2117,68 @@
 "Internal: %s (%d bpp) / %s\n"
 msgstr ""
 
-#: src/callbacks.c:5525
+#: src/callbacks.c:5471
 msgid "buffered"
 msgstr ""
 
-#: src/callbacks.c:5538 src/callbacks.c:5557 src/callbacks.c:5575
-#: src/callbacks.c:5609
+#: src/callbacks.c:5484 src/callbacks.c:5502 src/callbacks.c:5518
+#: src/callbacks.c:5551
 msgid ""
 "\n"
 "  Opening..."
 msgstr ""
 
-#: src/callbacks.c:5545
+#: src/callbacks.c:5490
 #, c-format
 msgid ""
 "\n"
 "(%d virtual)"
 msgstr ""
 
-#: src/callbacks.c:5548
+#: src/callbacks.c:5493
 #, c-format
 msgid ""
 "\n"
 "(%d decoded)"
 msgstr ""
 
-#: src/callbacks.c:5560 src/callbacks.c:5578 src/callbacks.c:5612
+#: src/callbacks.c:5504 src/callbacks.c:5520 src/callbacks.c:5553
 #, c-format
 msgid ""
 "\n"
 "  %.2f sec."
 msgstr ""
 
-#: src/callbacks.c:5569
+#: src/callbacks.c:5512
 msgid ""
 "\n"
 "  Unknown"
 msgstr ""
 
-#: src/callbacks.c:5582 src/callbacks.c:5596
+#: src/callbacks.c:5524 src/callbacks.c:5538
 msgid "unsigned"
 msgstr ""
 
-#: src/callbacks.c:5583 src/callbacks.c:5597
+#: src/callbacks.c:5525 src/callbacks.c:5539
 msgid "signed"
 msgstr ""
 
-#: src/callbacks.c:5585 src/callbacks.c:5599
+#: src/callbacks.c:5527 src/callbacks.c:5541
 msgid "big-endian"
 msgstr ""
 
-#: src/callbacks.c:5586 src/callbacks.c:5600
+#: src/callbacks.c:5528 src/callbacks.c:5542
 msgid "little-endian"
 msgstr ""
 
-#: src/callbacks.c:5588 src/callbacks.c:5602
+#: src/callbacks.c:5530 src/callbacks.c:5544
 #, c-format
 msgid ""
 "  %d Hz %d bit\n"
 "%s %s"
 msgstr ""
 
-#: src/callbacks.c:5707
+#: src/callbacks.c:5647
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -2195,21 +2195,21 @@
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA.\n"
 msgstr ""
 
-#: src/callbacks.c:5721
+#: src/callbacks.c:5661
 msgid "A video editor and VJ program."
 msgstr ""
 
-#: src/callbacks.c:5722
+#: src/callbacks.c:5662
 msgid "About LiVES"
 msgstr ""
 
-#: src/callbacks.c:5724
+#: src/callbacks.c:5664
 msgid "translator_credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Simon Uslengh https://launchpad.net/~simon.uslengh"
 
-#: src/callbacks.c:5758
+#: src/callbacks.c:5699
 #, c-format
 msgid ""
 "LiVES Version %s\n"
@@ -2223,14 +2223,14 @@
 "Homepage: http://lives.sourceforge.net"
 msgstr ""
 
-#: src/callbacks.c:6037
+#: src/callbacks.c:5996
 msgid ""
 "\n"
 "\n"
 "You need to install mplayer or mplayer2 to be able to preview this file.\n"
 msgstr ""
 
-#: src/callbacks.c:6040
+#: src/callbacks.c:5998
 msgid ""
 "\n"
 "\n"
@@ -2238,215 +2238,206 @@
 "this file.\n"
 msgstr ""
 
-#: src/callbacks.c:6423 src/callbacks.c:8289
-msgid ""
-"\n"
-"Loading new audio may cause missing audio in some multitrack layouts.\n"
-"Are you sure you wish to continue ?\n"
-"."
-msgstr ""
-
-#: src/callbacks.c:6523
-#, c-format
-msgid "Opening audio %s, type %s..."
-msgstr ""
-
-#: src/callbacks.c:6556 src/saveplay.c:480
-msgid "Opening audio"
-msgstr ""
-
-#: src/callbacks.c:6565 src/callbacks.c:6612 src/callbacks.c:8387
-#: src/callbacks.c:8429 src/callbacks.c:8472 src/callbacks.c:10846
-msgid "Cancelling"
-msgstr ""
-
-#: src/callbacks.c:6660 src/callbacks.c:8514 src/callbacks.c:10876
-#: src/callbacks.c:11563
-msgid "Committing audio"
-msgstr ""
-
-#: src/callbacks.c:6672 src/callbacks.c:8546
-msgid "New Audio"
-msgstr ""
-
-#: src/callbacks.c:6779
+#: src/callbacks.c:6459
 #, c-format
 msgid ""
 "Text was saved as\n"
 "%s\n"
 msgstr ""
 
-#: src/callbacks.c:6951 src/saveplay.c:3618
-#, c-format
-msgid "%d frames are enough !\n"
-msgstr ""
-
-#: src/callbacks.c:7050
+#: src/callbacks.c:6706
 msgid "LiVES: - Encoder debug output"
 msgstr ""
 
-#: src/callbacks.c:7087 src/gui.c:1922
+#: src/callbacks.c:6743 src/gui.c:1921
 msgid "Fullscreen playback (f)"
 msgstr ""
 
-#: src/callbacks.c:7089
+#: src/callbacks.c:6744
 msgid "Fullscreen playback off (f)"
 msgstr ""
 
-#: src/callbacks.c:7188 src/callbacks.c:7336 src/callbacks.c:7664
-#: src/callbacks.c:7681 src/gui.c:3712 src/saveplay.c:2467 src/saveplay.c:2501
-#: src/saveplay.c:3115 src/saveplay.c:3220 src/saveplay.c:3239
-#: src/multitrack.c:9340 src/multitrack.c:11060
+#: src/callbacks.c:6841 src/callbacks.c:6983 src/callbacks.c:7283
+#: src/callbacks.c:7298 src/gui.c:3838 src/saveplay.c:2442 src/saveplay.c:2475
+#: src/saveplay.c:3074 src/saveplay.c:3178 src/saveplay.c:3197
+#: src/multitrack.c:9526 src/multitrack.c:11288
 #, c-format
 msgid " (%d %% scale)"
 msgstr ""
 
-#: src/callbacks.c:7190 src/callbacks.c:7338 src/callbacks.c:7666
-#: src/gui.c:3716 src/saveplay.c:2469 src/saveplay.c:2503
+#: src/callbacks.c:6843 src/callbacks.c:6985 src/callbacks.c:7285
+#: src/gui.c:3842 src/saveplay.c:2444 src/saveplay.c:2477
 #, c-format
 msgid "LiVES: - Play Window%s"
 msgstr ""
 
-#: src/callbacks.c:7302 src/gui.c:1907
+#: src/callbacks.c:6950 src/gui.c:1906
 msgid "Double size (d)"
 msgstr ""
 
-#: src/callbacks.c:7309
+#: src/callbacks.c:6956
 msgid "Single size (d)"
 msgstr ""
 
-#: src/callbacks.c:7442 src/callbacks.c:7443
+#: src/callbacks.c:7087 src/callbacks.c:7088
 msgid "Hide the play window (s)"
 msgstr ""
 
-#: src/callbacks.c:7452 src/gui.c:1746
+#: src/callbacks.c:7096 src/gui.c:1744
 msgid "Show the play window (s)"
 msgstr ""
 
-#: src/callbacks.c:7453 src/gui.c:1896
+#: src/callbacks.c:7097 src/gui.c:1895
 msgid "Play in separate window (s)"
 msgstr ""
 
-#: src/callbacks.c:7535 src/gui.c:4060 src/saveplay.c:2498
+#: src/callbacks.c:7175 src/gui.c:4169 src/saveplay.c:2472
 msgid "LiVES: - Streaming"
 msgstr ""
 
-#: src/callbacks.c:7778
+#: src/callbacks.c:7388
 msgid "Switch continuous looping off (o)"
 msgstr ""
 
-#: src/callbacks.c:7785 src/gui.c:1795
+#: src/callbacks.c:7394 src/gui.c:1793
 msgid "Switch continuous looping on (o)"
 msgstr ""
 
-#: src/callbacks.c:7837
+#: src/callbacks.c:7444
 #, c-format
 msgid "Audio volume (%.2f)"
 msgstr ""
 
-#: src/callbacks.c:7876 src/callbacks.c:7877 src/gui.c:3640
+#: src/callbacks.c:7483 src/callbacks.c:7484 src/gui.c:3766
 msgid "Unmute the audio (z)"
 msgstr ""
 
-#: src/callbacks.c:7888 src/callbacks.c:7889 src/gui.c:1808 src/gui.c:3639
+#: src/callbacks.c:7494 src/callbacks.c:7495 src/gui.c:1806 src/gui.c:3765
 msgid "Mute the audio (z)"
 msgstr ""
 
-#: src/callbacks.c:8038
+#: src/callbacks.c:7643
 msgid "Reversing clipboard..."
 msgstr ""
 
-#: src/callbacks.c:8052
+#: src/callbacks.c:7657
 msgid "Reversing clipboard"
 msgstr ""
 
-#: src/callbacks.c:8084
+#: src/callbacks.c:7689
 msgid "LiVES: Load subtitles from..."
 msgstr ""
 
-#: src/callbacks.c:8151 src/saveplay.c:970
+#: src/callbacks.c:7753 src/saveplay.c:956
 #, c-format
 msgid "Loaded subtitle file: %s\n"
 msgstr ""
 
-#: src/callbacks.c:8220
+#: src/callbacks.c:7821
 msgid "Subtitles were erased.\n"
 msgstr ""
 
-#: src/callbacks.c:8239
+#: src/callbacks.c:7843
 msgid "LiVES: - Select Audio File"
 msgstr ""
 
-#: src/callbacks.c:8250
+#: src/callbacks.c:7878 src/callbacks.c:8232
+msgid ""
+"\n"
+"Loading new audio may cause missing audio in some multitrack layouts.\n"
+"Are you sure you wish to continue ?\n"
+"."
+msgstr ""
+
+#: src/callbacks.c:7989
+#, c-format
+msgid "Opening audio %s, type %s..."
+msgstr ""
+
+#: src/callbacks.c:8023 src/saveplay.c:477
+msgid "Opening audio"
+msgstr ""
+
+#: src/callbacks.c:8032 src/callbacks.c:8083 src/callbacks.c:8327
+#: src/callbacks.c:8369 src/callbacks.c:8412 src/callbacks.c:10766
+msgid "Cancelling"
+msgstr ""
+
+#: src/callbacks.c:8137 src/callbacks.c:8454 src/callbacks.c:10803
+#: src/callbacks.c:11477
+msgid "Committing audio"
+msgstr ""
+
+#: src/callbacks.c:8153 src/callbacks.c:8484
+msgid "New Audio"
+msgstr ""
+
+#: src/callbacks.c:8194
 msgid "Please set your CD play device in Tools | Preferences | Misc\n"
 msgstr ""
 
-#: src/callbacks.c:8321
+#: src/callbacks.c:8264
 #, c-format
 msgid "Opening CD track %d from %s..."
 msgstr ""
 
-#: src/callbacks.c:8326
+#: src/callbacks.c:8267
 #, c-format
 msgid "CD track %d"
 msgstr ""
 
-#: src/callbacks.c:8373
+#: src/callbacks.c:8313
 msgid "Opening CD track..."
 msgstr ""
 
-#: src/callbacks.c:8415 src/callbacks.c:8461
+#: src/callbacks.c:8355 src/callbacks.c:8401
 msgid "Error loading CD track\n"
 msgstr ""
 
-#: src/callbacks.c:8584
+#: src/callbacks.c:8518
 msgid "layout errors"
 msgstr ""
 
-#: src/callbacks.c:8595
+#: src/callbacks.c:8529
 msgid "Close _Window"
 msgstr ""
 
-#: src/callbacks.c:8606
+#: src/callbacks.c:8540
 msgid "Clear _Errors"
 msgstr ""
 
-#: src/callbacks.c:8617
+#: src/callbacks.c:8551
 msgid "_Delete affected layouts"
 msgstr ""
 
-#: src/callbacks.c:9343 src/callbacks.c:9388
+#: src/callbacks.c:9253 src/callbacks.c:9298
 msgid "Resume"
 msgstr ""
 
-#: src/callbacks.c:9344
+#: src/callbacks.c:9254
 msgid ""
 "\n"
 "Paused\n"
 "(click Resume to continue processing)"
 msgstr ""
 
-#: src/callbacks.c:9345 src/callbacks.c:9406
+#: src/callbacks.c:9255 src/callbacks.c:9315
 msgid "paused..."
 msgstr ""
 
-#: src/callbacks.c:9372 src/callbacks.c:9418
-msgid "Pause"
-msgstr ""
-
-#: src/callbacks.c:9374 src/callbacks.c:9421
+#: src/callbacks.c:9284 src/callbacks.c:9333
 msgid "resumed..."
 msgstr ""
 
-#: src/callbacks.c:9393
+#: src/callbacks.c:9303
 msgid "Keep"
 msgstr ""
 
-#: src/callbacks.c:9396
+#: src/callbacks.c:9305
 msgid "Enough"
 msgstr ""
 
-#: src/callbacks.c:9401
+#: src/callbacks.c:9310
 #, c-format
 msgid ""
 "\n"
@@ -2455,28 +2446,28 @@
 "(click Resume to continue processing)"
 msgstr ""
 
-#: src/callbacks.c:9419
+#: src/callbacks.c:9331
 msgid "Cancel"
 msgstr ""
 
-#: src/callbacks.c:9558
+#: src/callbacks.c:9478
 msgid "Stop"
 msgstr ""
 
-#: src/callbacks.c:10053 src/multitrack.c:13247
+#: src/callbacks.c:9968 src/multitrack.c:13489
 msgid "LiVES: Selected frame"
 msgstr ""
 
-#: src/callbacks.c:10061
+#: src/callbacks.c:9976
 msgid "_Save frame as..."
 msgstr ""
 
-#: src/callbacks.c:10290
+#: src/callbacks.c:10202
 #, c-format
 msgid "Audio is ahead of video by %.4f secs. at frame %d, with fps %.4f\n"
 msgstr ""
 
-#: src/callbacks.c:10347
+#: src/callbacks.c:10255
 msgid ""
 "\n"
 "\n"
@@ -2485,7 +2476,7 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10353
+#: src/callbacks.c:10261
 msgid ""
 "\n"
 "\n"
@@ -2493,13 +2484,13 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10429 src/callbacks.c:11479
+#: src/callbacks.c:10334 src/callbacks.c:11395
 msgid ""
 "\n"
 "Record time must be greater than 0.\n"
 msgstr ""
 
-#: src/callbacks.c:10440
+#: src/callbacks.c:10346
 msgid ""
 "Capture an External Window:\n"
 "\n"
@@ -2508,17 +2499,17 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10445
+#: src/callbacks.c:10351
 msgid "External window was released.\n"
 msgstr ""
 
-#: src/callbacks.c:10479
+#: src/callbacks.c:10385
 msgid ""
 "Click on a Window to Capture it\n"
 "Press 'q' to stop recording"
 msgstr ""
 
-#: src/callbacks.c:10513
+#: src/callbacks.c:10419
 #, c-format
 msgid ""
 "\n"
@@ -2528,19 +2519,19 @@
 "(Default of %.3f frames per second will be used.)\n"
 msgstr ""
 
-#: src/callbacks.c:10539
+#: src/callbacks.c:10443
 msgid "LiVES was unable to capture this window. Sorry.\n"
 msgstr ""
 
-#: src/callbacks.c:10695
+#: src/callbacks.c:10601
 msgid "Export Selected Audio as..."
 msgstr ""
 
-#: src/callbacks.c:10699
+#: src/callbacks.c:10604
 msgid "Export Audio as..."
 msgstr ""
 
-#: src/callbacks.c:10714
+#: src/callbacks.c:10619
 msgid ""
 "\n"
 "\n"
@@ -2549,1033 +2540,1033 @@
 "rate.\n"
 msgstr ""
 
-#: src/callbacks.c:10720
+#: src/callbacks.c:10625
 #, c-format
 msgid "Exporting audio frames %d to %d as %s..."
 msgstr ""
 
-#: src/callbacks.c:10725
+#: src/callbacks.c:10629
 #, c-format
 msgid "Exporting audio as %s..."
 msgstr ""
 
-#: src/callbacks.c:10751
+#: src/callbacks.c:10655
 msgid "Exporting audio"
 msgstr ""
 
-#: src/callbacks.c:10782
+#: src/callbacks.c:10695
 msgid "LiVES: - Append Audio File"
 msgstr ""
 
-#: src/callbacks.c:10825
+#: src/callbacks.c:10739
 #, c-format
 msgid "Appending audio file %s..."
 msgstr ""
 
-#: src/callbacks.c:10836
+#: src/callbacks.c:10756
 msgid "Appending audio"
 msgstr ""
 
-#: src/callbacks.c:10892
+#: src/callbacks.c:10818
 msgid "Append Audio"
 msgstr ""
 
-#: src/callbacks.c:10952
+#: src/callbacks.c:10883
 #, c-format
 msgid "Padding audio to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10954
+#: src/callbacks.c:10885
 #, c-format
 msgid "Trimming audio from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10973
+#: src/callbacks.c:10904
 msgid "Trimming/Padding audio"
 msgstr ""
 
-#: src/callbacks.c:10981
+#: src/callbacks.c:10912
 msgid "Trim/Pad Audio"
 msgstr ""
 
-#: src/callbacks.c:11055
+#: src/callbacks.c:10982
 msgid "Fading audio in"
 msgstr ""
 
-#: src/callbacks.c:11056
+#: src/callbacks.c:10983
 msgid "Fade audio in"
 msgstr ""
 
-#: src/callbacks.c:11061
+#: src/callbacks.c:10987
 msgid "Fading audio out"
 msgstr ""
 
-#: src/callbacks.c:11062
+#: src/callbacks.c:10988
 msgid "Fade audio out"
 msgstr ""
 
-#: src/callbacks.c:11085
+#: src/callbacks.c:11011
 #, c-format
 msgid "%s over %.1f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11087
+#: src/callbacks.c:11013
 #, c-format
 msgid "%s from time %.2f seconds to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11094
+#: src/callbacks.c:11020
 msgid "Fading audio..."
 msgstr ""
 
-#: src/callbacks.c:11194
+#: src/callbacks.c:11119
 msgid ""
 "\n"
 "Deleting all audio will close this file.\n"
 "Are you sure ?"
 msgstr ""
 
-#: src/callbacks.c:11197
+#: src/callbacks.c:11122
 msgid "Deleting all audio..."
 msgstr ""
 
-#: src/callbacks.c:11203
+#: src/callbacks.c:11127
 #, c-format
 msgid "Deleting audio from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11290
+#: src/callbacks.c:11214
 msgid "Deleting Audio"
 msgstr ""
 
-#: src/callbacks.c:11297
+#: src/callbacks.c:11221
 msgid "Delete Audio"
 msgstr ""
 
-#: src/callbacks.c:11636
+#: src/callbacks.c:11550
 msgid "Record new audio"
 msgstr ""
 
-#: src/callbacks.c:11725
+#: src/callbacks.c:11640
 #, c-format
 msgid "Inserting silence from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11754
+#: src/callbacks.c:11666
 msgid "Inserting Silence"
 msgstr ""
 
-#: src/merge.c:85
+#: src/merge.c:96
 msgid "LiVES: - Merge"
 msgstr ""
 
-#: src/merge.c:102
+#: src/merge.c:113
 #, c-format
 msgid "Merge Clipboard [ %d Frames ]       With Selection [ %d Frames ]"
 msgstr ""
 
-#: src/merge.c:107
+#: src/merge.c:118
 #, c-format
 msgid ""
 "Merge Clipboard [ %d Frames (resampled) ]       With Selection [ %d Frames ]"
 msgstr ""
 
-#: src/merge.c:118
+#: src/merge.c:130
 msgid "Align _Starts"
 msgstr ""
 
-#: src/merge.c:123
+#: src/merge.c:135
 msgid "Align _Ends"
 msgstr ""
 
-#: src/merge.c:134
+#: src/merge.c:146
 msgid "What to do with extra clipboard frames -"
 msgstr ""
 
-#: src/merge.c:137
+#: src/merge.c:149
 msgid "_Insert Frames"
 msgstr ""
 
-#: src/merge.c:143
+#: src/merge.c:155
 msgid "_Drop Frames"
 msgstr ""
 
-#: src/merge.c:149
+#: src/merge.c:160
 msgid "Number of Times to Loop Clipboard"
 msgstr ""
 
-#: src/merge.c:160
+#: src/merge.c:171
 msgid "_Loop Clipboard to Fit Selection"
 msgstr ""
 
-#: src/merge.c:173
+#: src/merge.c:184
 msgid "_Transition Method:"
 msgstr ""
 
-#: src/merge.c:394
+#: src/merge.c:395
 msgid "Merging clipboard with selection..."
 msgstr ""
 
-#: src/merge.c:551
+#: src/merge.c:539
 msgid "Merge done.\n"
 msgstr ""
 
-#: src/gui.c:123
+#: src/gui.c:122
 msgid "_Custom Generators"
 msgstr ""
 
-#: src/gui.c:124
+#: src/gui.c:123
 msgid "_Custom Effects"
 msgstr ""
 
-#: src/gui.c:125
+#: src/gui.c:124
 msgid "Custom _Utilities"
 msgstr ""
 
-#: src/gui.c:352 src/multitrack.c:5964
+#: src/gui.c:351 src/multitrack.c:6143
 msgid "_File"
 msgstr ""
 
-#: src/gui.c:367 src/multitrack.c:5989
+#: src/gui.c:366 src/multitrack.c:6168
 msgid "_Open File/Directory"
 msgstr ""
 
-#: src/gui.c:373
+#: src/gui.c:372
 msgid "O_pen Part of File..."
 msgstr ""
 
-#: src/gui.c:379 src/gui.c:383 src/multitrack.c:6006 src/multitrack.c:6023
-#: src/multitrack.c:6028
+#: src/gui.c:378 src/gui.c:382 src/multitrack.c:6185 src/multitrack.c:6202
+#: src/multitrack.c:6207
 msgid "Open _Location/Stream..."
 msgstr ""
 
-#: src/gui.c:393 src/multitrack.c:6016
+#: src/gui.c:392 src/multitrack.c:6195
 msgid "Open _Youtube Clip..."
 msgstr ""
 
-#: src/gui.c:404
+#: src/gui.c:403
 msgid "Import from _dvd/vcd..."
 msgstr ""
 
-#: src/gui.c:413
+#: src/gui.c:412
 msgid "Import from _dvd"
 msgstr ""
 
-#: src/gui.c:416
+#: src/gui.c:415
 msgid "Import from _vcd"
 msgstr ""
 
-#: src/gui.c:419
+#: src/gui.c:418
 msgid "_Import from Firewire"
 msgstr ""
 
-#: src/gui.c:428 src/multitrack.c:6086
+#: src/gui.c:427 src/multitrack.c:6265
 msgid "Import from _Firewire Device (dv)"
 msgstr ""
 
-#: src/gui.c:429 src/multitrack.c:6094
+#: src/gui.c:428 src/multitrack.c:6273
 msgid "Import from _Firewire Device (hdv)"
 msgstr ""
 
-#: src/gui.c:457
+#: src/gui.c:456
 msgid "_Add Webcam/TV card..."
 msgstr ""
 
-#: src/gui.c:476
+#: src/gui.c:475
 msgid "Add _Unicap Device"
 msgstr ""
 
-#: src/gui.c:486
+#: src/gui.c:485
 msgid "Add Live _Firewire Device"
 msgstr ""
 
-#: src/gui.c:495
+#: src/gui.c:494
 msgid "Add _TV Device"
 msgstr ""
 
-#: src/gui.c:510 src/multitrack.c:6117
+#: src/gui.c:509 src/multitrack.c:6296
 msgid "_Recent Files..."
 msgstr ""
 
-#: src/gui.c:560 src/multitrack.c:6177
+#: src/gui.c:559 src/multitrack.c:6356
 msgid "_Reload Clip Set..."
 msgstr ""
 
-#: src/gui.c:564 src/multitrack.c:6185
+#: src/gui.c:563 src/multitrack.c:6364
 msgid "Close/Sa_ve All Clips"
 msgstr ""
 
-#: src/gui.c:575
+#: src/gui.c:574
 msgid "_Encode Clip As..."
 msgstr ""
 
-#: src/gui.c:577
+#: src/gui.c:576
 msgid "Encode _Selection As..."
 msgstr ""
 
-#: src/gui.c:584
+#: src/gui.c:583
 msgid "_Close This Clip"
 msgstr ""
 
-#: src/gui.c:595
+#: src/gui.c:594
 msgid "_Backup Clip as .lv1..."
 msgstr ""
 
-#: src/gui.c:604
+#: src/gui.c:603
 msgid "_Restore Clip from .lv1..."
 msgstr ""
 
-#: src/gui.c:615
+#: src/gui.c:614
 msgid "Encode/Load/Backup _with Sound"
 msgstr ""
 
-#: src/gui.c:620
+#: src/gui.c:619
 msgid "Auto load subtitles"
 msgstr ""
 
-#: src/gui.c:628 src/multitrack.c:6224
+#: src/gui.c:627 src/multitrack.c:6403
 msgid "Clean _up Diskspace"
 msgstr ""
 
-#: src/gui.c:636 src/multitrack.c:6257
+#: src/gui.c:635 src/multitrack.c:6436
 msgid "_Edit"
 msgstr ""
 
-#: src/gui.c:685
+#: src/gui.c:684
 msgid "_MULTITRACK mode"
 msgstr ""
 
-#: src/gui.c:696
+#: src/gui.c:695
 msgid "_Copy Selection"
 msgstr ""
 
-#: src/gui.c:705
+#: src/gui.c:704
 msgid "Cu_t Selection"
 msgstr ""
 
-#: src/gui.c:714
+#: src/gui.c:713
 msgid "_Insert from Clipboard..."
 msgstr ""
 
-#: src/gui.c:730
+#: src/gui.c:729
 msgid "Paste as _New"
 msgstr ""
 
-#: src/gui.c:739
+#: src/gui.c:738
 msgid "_Merge Clipboard with Selection..."
 msgstr ""
 
-#: src/gui.c:746
+#: src/gui.c:745
 msgid "_Delete Selection"
 msgstr ""
 
-#: src/gui.c:764
+#: src/gui.c:763
 msgid "Decouple _Video from Audio"
 msgstr ""
 
-#: src/gui.c:772
+#: src/gui.c:771
 msgid "_Select..."
 msgstr ""
 
-#: src/gui.c:786
+#: src/gui.c:785
 msgid "Select _All Frames"
 msgstr ""
 
-#: src/gui.c:794
+#: src/gui.c:793
 msgid "_Start Frame Only"
 msgstr ""
 
-#: src/gui.c:802
+#: src/gui.c:801
 msgid "_End Frame Only"
 msgstr ""
 
-#: src/gui.c:813
+#: src/gui.c:812
 msgid "Select from _First Frame"
 msgstr ""
 
-#: src/gui.c:817
+#: src/gui.c:816
 msgid "Select to _Last Frame"
 msgstr ""
 
-#: src/gui.c:821
+#: src/gui.c:820
 msgid "Select Last Insertion/_Merge"
 msgstr ""
 
-#: src/gui.c:825
+#: src/gui.c:824
 msgid "Select Last _Effect"
 msgstr ""
 
-#: src/gui.c:829
+#: src/gui.c:828
 msgid "_Invert Selection"
 msgstr ""
 
-#: src/gui.c:837
+#: src/gui.c:836
 msgid "_Lock Selection Width"
 msgstr ""
 
-#: src/gui.c:842 src/multitrack.c:6409
+#: src/gui.c:841 src/multitrack.c:6591
 msgid "_Play"
 msgstr ""
 
-#: src/gui.c:854
+#: src/gui.c:853
 msgid "_Play All"
 msgstr ""
 
-#: src/gui.c:869
+#: src/gui.c:868
 msgid "Pla_y Selection"
 msgstr ""
 
-#: src/gui.c:877
+#: src/gui.c:876
 msgid "Play _Clipboard"
 msgstr ""
 
-#: src/gui.c:899 src/multitrack.c:6441
+#: src/gui.c:898 src/multitrack.c:6623
 msgid "_Stop"
 msgstr ""
 
-#: src/gui.c:914 src/multitrack.c:6453
+#: src/gui.c:913 src/multitrack.c:6635
 msgid "Re_wind"
 msgstr ""
 
-#: src/gui.c:946 src/multitrack.c:6471
+#: src/gui.c:945 src/multitrack.c:6653
 msgid "_Full Screen"
 msgstr ""
 
-#: src/gui.c:955
+#: src/gui.c:954
 msgid "_Double Size"
 msgstr ""
 
-#: src/gui.c:963 src/multitrack.c:6479
+#: src/gui.c:962 src/multitrack.c:6661
 msgid "Play in _Separate Window"
 msgstr ""
 
-#: src/gui.c:972
+#: src/gui.c:971
 msgid "_Blank Background"
 msgstr ""
 
-#: src/gui.c:979
+#: src/gui.c:978
 msgid "(Auto)_loop Video (to fit audio track)"
 msgstr ""
 
-#: src/gui.c:988 src/multitrack.c:6487
+#: src/gui.c:987 src/multitrack.c:6669
 msgid "L_oop Continuously"
 msgstr ""
 
-#: src/gui.c:997
+#: src/gui.c:996
 msgid "Pin_g Pong Loops"
 msgstr ""
 
-#: src/gui.c:1005 src/multitrack.c:6495
+#: src/gui.c:1004 src/multitrack.c:6677
 msgid "_Mute"
 msgstr ""
 
-#: src/gui.c:1017
+#: src/gui.c:1016
 msgid "Separate Window 'S_ticky' Mode"
 msgstr ""
 
-#: src/gui.c:1025
+#: src/gui.c:1024
 msgid "S_how Frame Counter"
 msgstr ""
 
-#: src/gui.c:1035
+#: src/gui.c:1034
 msgid "Show Subtitles"
 msgstr ""
 
-#: src/gui.c:1045
+#: src/gui.c:1044
 msgid "Letterbox mode"
 msgstr ""
 
-#: src/gui.c:1051 src/multitrack.c:6507
+#: src/gui.c:1050 src/multitrack.c:6689
 msgid "Effect_s"
 msgstr ""
 
-#: src/gui.c:1054
+#: src/gui.c:1053
 msgid "Effects are applied to the current selection."
 msgstr ""
 
-#: src/gui.c:1067
+#: src/gui.c:1066
 msgid "_Run Test Rendered Effect/Tool/Generator..."
 msgstr ""
 
-#: src/gui.c:1072 src/multitrack.c:7123
+#: src/gui.c:1071 src/multitrack.c:7299
 msgid "_Tools"
 msgstr ""
 
-#: src/gui.c:1075
+#: src/gui.c:1074
 msgid "Tools are applied to complete clips."
 msgstr ""
 
-#: src/gui.c:1085
+#: src/gui.c:1084
 msgid "_Reverse Clipboard"
 msgstr ""
 
-#: src/gui.c:1094
+#: src/gui.c:1093
 msgid "_Change Playback/Save Speed..."
 msgstr ""
 
-#: src/gui.c:1099
+#: src/gui.c:1098
 msgid "Resample _Video to New Frame Rate..."
 msgstr ""
 
-#: src/gui.c:1105
+#: src/gui.c:1104
 msgid "_Utilities"
 msgstr ""
 
-#: src/gui.c:1110
+#: src/gui.c:1109
 msgid "Custom _Tools"
 msgstr ""
 
-#: src/gui.c:1116 src/multitrack.c:7149
+#: src/gui.c:1115 src/multitrack.c:7325
 msgid "_Generate"
 msgstr ""
 
-#: src/gui.c:1126
+#: src/gui.c:1125
 msgid "Loading rendered effect plugins..."
 msgstr ""
 
-#: src/gui.c:1139
+#: src/gui.c:1138
 msgid "Load _Subtitles from File..."
 msgstr ""
 
-#: src/gui.c:1144
+#: src/gui.c:1143
 msgid "Erase subtitles"
 msgstr ""
 
-#: src/gui.c:1152 src/multitrack.c:7158
+#: src/gui.c:1151 src/multitrack.c:7334
 msgid "Capture _External Window... "
 msgstr ""
 
-#: src/gui.c:1159 src/multitrack.c:7173
+#: src/gui.c:1158 src/multitrack.c:7349
 msgid "_Preferences..."
 msgstr ""
 
-#: src/gui.c:1172
+#: src/gui.c:1171
 msgid "_Audio"
 msgstr ""
 
-#: src/gui.c:1184
+#: src/gui.c:1183
 msgid "Load _New Audio for Clip..."
 msgstr ""
 
-#: src/gui.c:1190
+#: src/gui.c:1189
 msgid "Load _CD Track..."
 msgstr ""
 
-#: src/gui.c:1191
+#: src/gui.c:1190
 msgid "E_ject CD"
 msgstr ""
 
-#: src/gui.c:1205
+#: src/gui.c:1204
 msgid "Record E_xternal Audio..."
 msgstr ""
 
-#: src/gui.c:1218
+#: src/gui.c:1217
 msgid "to New _Clip..."
 msgstr ""
 
-#: src/gui.c:1222
+#: src/gui.c:1221
 msgid "to _Selection"
 msgstr ""
 
-#: src/gui.c:1230
+#: src/gui.c:1229
 msgid "Fade Audio _In..."
 msgstr ""
 
-#: src/gui.c:1234
+#: src/gui.c:1233
 msgid "Fade Audio _Out..."
 msgstr ""
 
-#: src/gui.c:1244
+#: src/gui.c:1243
 msgid "_Export Audio..."
 msgstr ""
 
-#: src/gui.c:1257
+#: src/gui.c:1256
 msgid "Export _Selected Audio..."
 msgstr ""
 
-#: src/gui.c:1261
+#: src/gui.c:1260
 msgid "Export _All Audio..."
 msgstr ""
 
-#: src/gui.c:1265
+#: src/gui.c:1264
 msgid "_Append Audio..."
 msgstr ""
 
-#: src/gui.c:1270
+#: src/gui.c:1269
 msgid "_Trim/Pad Audio..."
 msgstr ""
 
-#: src/gui.c:1283
+#: src/gui.c:1282
 msgid "Trim/Pad Audio to _Selection"
 msgstr ""
 
-#: src/gui.c:1288
+#: src/gui.c:1287
 msgid "Trim/Pad Audio from Beginning to _Play Start"
 msgstr ""
 
-#: src/gui.c:1293
+#: src/gui.c:1292
 msgid "_Delete Audio..."
 msgstr ""
 
-#: src/gui.c:1306
+#: src/gui.c:1305
 msgid "Delete _Selected Audio"
 msgstr ""
 
-#: src/gui.c:1310
+#: src/gui.c:1309
 msgid "Delete _All Audio"
 msgstr ""
 
-#: src/gui.c:1314
+#: src/gui.c:1313
 msgid "Insert _Silence in Selection"
 msgstr ""
 
-#: src/gui.c:1319
+#: src/gui.c:1318
 msgid "_Resample Audio..."
 msgstr ""
 
-#: src/gui.c:1324
+#: src/gui.c:1323
 msgid "_Info"
 msgstr ""
 
-#: src/gui.c:1336
+#: src/gui.c:1335
 msgid "Show Clip _Info"
 msgstr ""
 
-#: src/gui.c:1344
+#: src/gui.c:1343
 msgid "Show/_Edit File Comments"
 msgstr ""
 
-#: src/gui.c:1349
+#: src/gui.c:1348
 msgid "Show _Clipboard Info"
 msgstr ""
 
-#: src/gui.c:1360 src/multitrack.c:7286
+#: src/gui.c:1359 src/multitrack.c:7462
 msgid "Show _Messages"
 msgstr ""
 
-#: src/gui.c:1364 src/multitrack.c:7365
+#: src/gui.c:1363 src/multitrack.c:7541
 msgid "Show _Layout Errors"
 msgstr ""
 
-#: src/gui.c:1369 src/multitrack.c:7263
+#: src/gui.c:1368 src/multitrack.c:7439
 msgid "_Clips"
 msgstr ""
 
-#: src/gui.c:1381
+#: src/gui.c:1380
 msgid "_Rename Current Clip in Menu..."
 msgstr ""
 
-#: src/gui.c:1399
+#: src/gui.c:1398
 msgid "A_dvanced"
 msgstr ""
 
-#: src/gui.c:1412
+#: src/gui.c:1411
 msgid "_RFX Effects/Tools/Utilities"
 msgstr ""
 
-#: src/gui.c:1424
+#: src/gui.c:1423
 msgid "_New Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1428
+#: src/gui.c:1427
 msgid "_Copy RFX Script to Test..."
 msgstr ""
 
-#: src/gui.c:1432
+#: src/gui.c:1431
 msgid "_Edit Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1436
+#: src/gui.c:1435
 msgid "Rena_me Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1440
+#: src/gui.c:1439
 msgid "_Delete Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1450
+#: src/gui.c:1449
 msgid "_Promote Test Rendered Effect/Tool/Generator..."
 msgstr ""
 
-#: src/gui.c:1457
+#: src/gui.c:1456
 msgid "_Import Custom RFX script..."
 msgstr ""
 
-#: src/gui.c:1461
+#: src/gui.c:1460
 msgid "E_xport Custom RFX script..."
 msgstr ""
 
-#: src/gui.c:1465
+#: src/gui.c:1464
 msgid "De_lete Custom RFX Script..."
 msgstr ""
 
-#: src/gui.c:1472
+#: src/gui.c:1471
 msgid "Re_build all RFX plugins"
 msgstr ""
 
-#: src/gui.c:1501
+#: src/gui.c:1498
 msgid "Receive _LiVES stream from..."
 msgstr ""
 
-#: src/gui.c:1506
+#: src/gui.c:1503
 msgid "_Send LiVES stream to..."
 msgstr ""
 
-#: src/gui.c:1515
+#: src/gui.c:1512
 #, c-format
 msgid "Open _yuv4mpeg stream on %sstream.yuv..."
 msgstr ""
 
-#: src/gui.c:1536
+#: src/gui.c:1534
 msgid "_Import Project (.lv2)..."
 msgstr ""
 
-#: src/gui.c:1540
+#: src/gui.c:1538
 msgid "E_xport Project (.lv2)..."
 msgstr ""
 
-#: src/gui.c:1545
+#: src/gui.c:1543
 msgid "_VJ"
 msgstr ""
 
-#: src/gui.c:1557
+#: src/gui.c:1555
 msgid "Real Time _Effect Mapping"
 msgstr ""
 
-#: src/gui.c:1563
+#: src/gui.c:1561
 msgid "Bind real time effects to ctrl-number keys."
 msgstr ""
 
-#: src/gui.c:1565
+#: src/gui.c:1563
 msgid "Set Real Time Effect _Defaults"
 msgstr ""
 
-#: src/gui.c:1567
+#: src/gui.c:1565
 msgid "Set default parameter values for real time effects."
 msgstr ""
 
-#: src/gui.c:1580
+#: src/gui.c:1578
 msgid "Save Real Time Effect _Defaults"
 msgstr ""
 
-#: src/gui.c:1583
+#: src/gui.c:1581
 msgid ""
 "Save real time effect defaults so they will be restored each time you use "
 "LiVES."
 msgstr ""
 
-#: src/gui.c:1589
+#: src/gui.c:1587
 msgid "_Reset all playback speeds and positions"
 msgstr ""
 
-#: src/gui.c:1592
+#: src/gui.c:1590
 msgid ""
 "Reset all playback positions to frame 1, and reset all playback frame rates."
 msgstr ""
 
-#: src/gui.c:1594
+#: src/gui.c:1592
 msgid "_MIDI/joystick interface"
 msgstr ""
 
-#: src/gui.c:1609
+#: src/gui.c:1607
 msgid "_MIDI/joystick learner..."
 msgstr ""
 
-#: src/gui.c:1614
+#: src/gui.c:1612
 msgid "_Save device mapping..."
 msgstr ""
 
-#: src/gui.c:1620
+#: src/gui.c:1618
 msgid "_Load device mapping..."
 msgstr ""
 
-#: src/gui.c:1628
+#: src/gui.c:1626
 msgid "Show VJ _Keys"
 msgstr ""
 
-#: src/gui.c:1632
+#: src/gui.c:1630
 msgid "To_ys"
 msgstr ""
 
-#: src/gui.c:1644
+#: src/gui.c:1642
 msgid "_None"
 msgstr ""
 
-#: src/gui.c:1652
+#: src/gui.c:1650
 msgid "_Autolives"
 msgstr ""
 
-#: src/gui.c:1657
+#: src/gui.c:1655
 msgid "_Mad Frames"
 msgstr ""
 
-#: src/gui.c:1662
+#: src/gui.c:1660
 msgid "_LiVES TV (broadband)"
 msgstr ""
 
-#: src/gui.c:1672 src/multitrack.c:7387
+#: src/gui.c:1670 src/multitrack.c:7563
 msgid "_Help"
 msgstr ""
 
-#: src/gui.c:1684 src/multitrack.c:7407
+#: src/gui.c:1682 src/multitrack.c:7583
 msgid "_Manual (opens in browser)"
 msgstr ""
 
-#: src/gui.c:1691 src/multitrack.c:7416
+#: src/gui.c:1689 src/multitrack.c:7592
 msgid "_Donate to the project !"
 msgstr ""
 
-#: src/gui.c:1695 src/multitrack.c:7420
+#: src/gui.c:1693 src/multitrack.c:7596
 msgid "_Email the author"
 msgstr ""
 
-#: src/gui.c:1699 src/multitrack.c:7424
+#: src/gui.c:1697 src/multitrack.c:7600
 msgid "Report a _bug"
 msgstr ""
 
-#: src/gui.c:1703 src/multitrack.c:7428
+#: src/gui.c:1701 src/multitrack.c:7604
 msgid "Suggest a _feature"
 msgstr ""
 
-#: src/gui.c:1707 src/multitrack.c:7432
+#: src/gui.c:1705 src/multitrack.c:7608
 msgid "Assist with _translating"
 msgstr ""
 
-#: src/gui.c:1714 src/multitrack.c:7439
+#: src/gui.c:1712 src/multitrack.c:7615
 msgid "_Troubleshoot"
 msgstr ""
 
-#: src/gui.c:1718 src/multitrack.c:7443
+#: src/gui.c:1716 src/multitrack.c:7619
 msgid "_About"
 msgstr ""
 
-#: src/gui.c:1752
+#: src/gui.c:1750
 msgid "Rewind to start (w)"
 msgstr ""
 
-#: src/gui.c:1760 src/multitrack.c:16720
+#: src/gui.c:1758 src/multitrack.c:17010
 msgid "Play all (p)"
 msgstr ""
 
-#: src/gui.c:1768 src/gui.c:1877
+#: src/gui.c:1766 src/gui.c:1876
 msgid "Stop playback (q)"
 msgstr ""
 
-#: src/gui.c:1779
+#: src/gui.c:1777
 msgid "Play selection (y)"
 msgstr ""
 
-#: src/gui.c:1832
+#: src/gui.c:1829
 msgid "Volume"
 msgstr ""
 
-#: src/gui.c:1854
+#: src/gui.c:1853
 msgid "Audio volume (1.00)"
 msgstr ""
 
-#: src/gui.c:1883
+#: src/gui.c:1882
 msgid "Unblank background (b)"
 msgstr ""
 
-#: src/gui.c:1929
+#: src/gui.c:1928
 msgid "Play slower (ctrl-down)"
 msgstr ""
 
-#: src/gui.c:1935
+#: src/gui.c:1934
 msgid "Play faster (ctrl-up)"
 msgstr ""
 
-#: src/gui.c:1942
+#: src/gui.c:1941
 msgid "Skip back (ctrl-left)"
 msgstr ""
 
-#: src/gui.c:1948
+#: src/gui.c:1947
 msgid "Skip forward (ctrl-right)"
 msgstr ""
 
-#: src/gui.c:1954
+#: src/gui.c:1953
 msgid "Show clip info (i)"
 msgstr ""
 
-#: src/gui.c:1960
+#: src/gui.c:1959
 msgid "Hide this toolbar"
 msgstr ""
 
-#: src/gui.c:1962
+#: src/gui.c:1961
 msgid ""
 "Press \"s\" to toggle separate play window for improved performance, \"q\" "
 "to stop."
 msgstr ""
 
 #. TRANSLATORS: please keep the translated string the same length
-#: src/gui.c:1995
+#: src/gui.c:1994
 msgid "     Video playback speed (frames per second)        "
 msgstr ""
 
-#: src/gui.c:2009
+#: src/gui.c:2008
 msgid "Vary the video speed"
 msgstr ""
 
-#: src/gui.c:2092 src/gui.c:3218
+#: src/gui.c:2090 src/gui.c:3329
 msgid "First Frame"
 msgstr ""
 
-#: src/gui.c:2193 src/gui.c:3226
+#: src/gui.c:2191 src/gui.c:3336
 msgid "Last Frame"
 msgstr ""
 
-#: src/gui.c:2210
+#: src/gui.c:2208
 msgid "The first selected frame in this clip"
 msgstr ""
 
-#: src/gui.c:2248
+#: src/gui.c:2246
 msgid "The last selected frame in this clip"
 msgstr ""
 
-#: src/gui.c:2532
+#: src/gui.c:2546
 msgid "Starting...\n"
 msgstr ""
 
-#: src/gui.c:3074
+#: src/gui.c:3181
 msgid "    Press 'q' to stop recording.  DO NOT COVER THE PLAY WINDOW !   "
 msgstr ""
 
-#: src/gui.c:3521
+#: src/gui.c:3643
 msgid "Frame number to preview"
 msgstr ""
 
-#: src/gui.c:3538
+#: src/gui.c:3660
 msgid "_Free"
 msgstr ""
 
-#: src/gui.c:3539
+#: src/gui.c:3661
 msgid "Free choice of frame number"
 msgstr ""
 
-#: src/gui.c:3543
+#: src/gui.c:3666
 msgid "_Start"
 msgstr ""
 
-#: src/gui.c:3544
+#: src/gui.c:3667
 msgid "Frame number is linked to start frame"
 msgstr ""
 
-#: src/gui.c:3551
+#: src/gui.c:3675
 msgid "_End"
 msgstr ""
 
-#: src/gui.c:3552
+#: src/gui.c:3676
 msgid "Frame number is linked to end frame"
 msgstr ""
 
-#: src/gui.c:3559
+#: src/gui.c:3684
 msgid "_Pointer"
 msgstr ""
 
-#: src/gui.c:3560
+#: src/gui.c:3685
 msgid "Frame number is linked to playback pointer"
 msgstr ""
 
-#: src/gui.c:3581
+#: src/gui.c:3707
 msgid "Rewind"
 msgstr ""
 
-#: src/gui.c:3592 src/dialogs.c:894 src/dialogs.c:896 src/dialogs.c:1817
-#: src/dialogs.c:1819
+#: src/gui.c:3718 src/dialogs.c:960 src/dialogs.c:962 src/dialogs.c:1873
+#: src/dialogs.c:1875
 msgid "Play all"
 msgstr ""
 
-#: src/gui.c:3605
+#: src/gui.c:3731
 msgid "Play Selection"
 msgstr ""
 
-#: src/gui.c:3619
+#: src/gui.c:3745
 msgid "Loop On/Off"
 msgstr ""
 
-#: src/gui.c:3693
+#: src/gui.c:3819
 msgid "Start _recording"
 msgstr ""
 
-#: src/gui.c:3698
+#: src/gui.c:3824
 msgid "Stop _recording"
 msgstr ""
 
-#: src/gui.c:3703
+#: src/gui.c:3829
 msgid "_Record Performance"
 msgstr ""
 
-#: src/gui.c:3851
+#: src/gui.c:3974
 msgid "Hide Play Window"
 msgstr ""
 
-#: src/gui.c:4232
+#: src/gui.c:4333
 msgid "Show Play Window"
 msgstr ""
 
-#: src/ce_thumbs.c:222
+#: src/ce_thumbs.c:242
 #, c-format
 msgid "Mapped to ctrl-%d"
 msgstr ""
 
-#: src/ce_thumbs.c:276 src/effects.c:85 src/preferences.c:3195
+#: src/ce_thumbs.c:296 src/effects.c:86 src/preferences.c:3247
 msgid "Effects"
 msgstr ""
 
-#: src/ce_thumbs.c:279 src/multitrack.c:5615
+#: src/ce_thumbs.c:299 src/multitrack.c:5791
 msgid "Clips"
 msgstr ""
 
-#: src/ce_thumbs.c:303
+#: src/ce_thumbs.c:323
 #, c-format
 msgid "Show / apply effects to %s\n"
 msgstr ""
 
-#: src/ce_thumbs.c:315
+#: src/ce_thumbs.c:335
 #, c-format
 msgid "Select clip for %s\n"
 msgstr ""
 
-#: src/ce_thumbs.c:515
+#: src/ce_thumbs.c:536
 msgid "_Pin"
 msgstr ""
 
-#: src/ce_thumbs.c:515
+#: src/ce_thumbs.c:537
 msgid "Pin the parameter box to the window"
 msgstr ""
 
 #. TRANSLATORS: Exabytes
-#: src/utils.c:794
+#: src/utils.c:800
 #, c-format
 msgid "%.2f EB"
 msgstr ""
 
 #. TRANSLATORS: Petabytes
-#: src/utils.c:798
+#: src/utils.c:803
 #, c-format
 msgid "%.2f PB"
 msgstr ""
 
 #. TRANSLATORS: Terabytes
-#: src/utils.c:802
+#: src/utils.c:806
 #, c-format
 msgid "%.2f TB"
 msgstr ""
 
 #. TRANSLATORS: Gigabytes
-#: src/utils.c:806
+#: src/utils.c:809
 #, c-format
 msgid "%.2f GB"
 msgstr ""
 
 #. TRANSLATORS: Megabytes
-#: src/utils.c:810
+#: src/utils.c:812
 #, c-format
 msgid "%.2f MB"
 msgstr ""
 
 #. TRANSLATORS: Kilobytes (1024 bytes)
-#: src/utils.c:814
+#: src/utils.c:815
 #, c-format
 msgid "%.2f KiB"
 msgstr ""
@@ -3585,7 +3576,7 @@
 msgid "%d bytes"
 msgstr ""
 
-#: src/utils.c:1841
+#: src/utils.c:1835
 msgid "Clearing the clipboard"
 msgstr ""
 
@@ -3597,81 +3588,81 @@
 "Switched to clip %s\n"
 msgstr ""
 
-#: src/utils.c:1880
+#: src/utils.c:1877
 msgid ""
 "\n"
 "==============================\n"
 "Switched to empty clip\n"
 msgstr ""
 
-#: src/utils.c:1917
+#: src/utils.c:1916
 msgid "(blank)"
 msgstr ""
 
-#: src/utils.c:1920
+#: src/utils.c:1919
 #, c-format
 msgid ""
 "The set name has been changed from %s to %s. Affected layouts have been "
 "updated accordingly\n"
 msgstr ""
 
-#: src/utils.c:1928
+#: src/utils.c:1927
 #, c-format
 msgid ""
 "The clip %s is missing from this set.\n"
 "It is required by the following layouts:\n"
 msgstr ""
 
-#: src/utils.c:1932
+#: src/utils.c:1931
 #, c-format
 msgid ""
 "The clip %s has been closed.\n"
 "It is required by the following layouts:\n"
 msgstr ""
 
-#: src/utils.c:1937
+#: src/utils.c:1936
 #, c-format
 msgid ""
 "Frames have been shifted in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1942
+#: src/utils.c:1941
 #, c-format
 msgid ""
 "Frames have been deleted from the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1947
+#: src/utils.c:1946
 #, c-format
 msgid ""
 "Audio has been deleted from the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1952
+#: src/utils.c:1951
 #, c-format
 msgid ""
 "Audio has been shifted in clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1957
+#: src/utils.c:1956
 #, c-format
 msgid ""
 "Audio has been altered in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1962
+#: src/utils.c:1961
 #, c-format
 msgid ""
 "Frames have been altered in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:2135
+#: src/utils.c:2134
 #, c-format
 msgid ""
 "Set %s\n"
@@ -3679,7 +3670,7 @@
 "by another copy of LiVES.\n"
 msgstr ""
 
-#: src/utils.c:2142
+#: src/utils.c:2140
 #, c-format
 msgid ""
 "\n"
@@ -3725,67 +3716,67 @@
 msgid "Removing layout %s\n"
 msgstr ""
 
-#: src/utils.c:3014
+#: src/utils.c:2996
 msgid "Video [opening...]"
 msgstr ""
 
-#: src/utils.c:3018
+#: src/utils.c:2999
 #, c-format
 msgid "Video [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:3022
+#: src/utils.c:3002
 msgid "(Undefined)"
 msgstr ""
 
-#: src/utils.c:3025
+#: src/utils.c:3004
 msgid "(No video)"
 msgstr ""
 
-#: src/utils.c:3032
+#: src/utils.c:3011
 msgid "(No audio)"
 msgstr ""
 
-#: src/utils.c:3037
+#: src/utils.c:3015
 msgid "Mono  [opening...]"
 msgstr ""
 
-#: src/utils.c:3040
+#: src/utils.c:3017
 msgid "Left Audio [opening...]"
 msgstr ""
 
-#: src/utils.c:3045
+#: src/utils.c:3021
 #, c-format
 msgid "Mono [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:3048
+#: src/utils.c:3023
 #, c-format
 msgid "Left Audio [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:3056
+#: src/utils.c:3031
 msgid "Right Audio [opening...]"
 msgstr ""
 
-#: src/utils.c:3059
+#: src/utils.c:3033
 #, c-format
 msgid "Right Audio [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:3506
+#: src/utils.c:3472
 msgid "LiVES cannot switch to mplayer whilst clips are loading."
 msgstr ""
 
-#: src/utils.c:3559
+#: src/utils.c:3525
 msgid "LiVES cannot switch to mplayer2 whilst clips are loading."
 msgstr ""
 
-#: src/utils.c:3809
+#: src/utils.c:3775
 msgid "Cleaning up clip"
 msgstr ""
 
-#: src/utils.c:3913
+#: src/utils.c:3874
 #, c-format
 msgid ""
 "\n"
@@ -3795,30 +3786,29 @@
 "Overwrite ?\n"
 msgstr ""
 
-#: src/utils.c:4305 src/utils.c:4337 src/multitrack.c:4503
+#: src/utils.c:4250 src/utils.c:4280 src/multitrack.c:4672
 #, c-format
 msgid "_Undo %s"
 msgstr ""
 
-#: src/utils.c:4306 src/utils.c:4338 src/multitrack.c:4525
+#: src/utils.c:4251 src/utils.c:4281 src/multitrack.c:4693
 #, c-format
 msgid "_Redo %s"
 msgstr ""
 
-#: src/utils.c:4363
+#: src/utils.c:4305
 msgid "-------------Selection------------"
 msgstr ""
 
-#. TRANSLATORS: - try to keep the text of the middle part the same length, by deleting "-" if necessary
-#: src/utils.c:4371
+#: src/utils.c:4313
 msgid " sec ] ----------Selection---------- [ "
 msgstr ""
 
-#: src/utils.c:4371
+#: src/utils.c:4314
 msgid " frames ] ----------"
 msgstr ""
 
-#: src/utils.c:5360
+#: src/utils.c:5302
 msgid ""
 "Your version of mplayer/ffmpeg may be broken !\n"
 "See http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2071\n"
@@ -3829,11 +3819,11 @@
 "Try running Help/Troubleshoot for more information."
 msgstr ""
 
-#: src/saveplay.c:178
+#: src/saveplay.c:179
 msgid "Examining file header"
 msgstr ""
 
-#: src/saveplay.c:315 src/saveplay.c:789
+#: src/saveplay.c:316 src/saveplay.c:779
 #, c-format
 msgid "Opening %s"
 msgstr ""
@@ -3843,36 +3833,36 @@
 msgid "Opening %s start time %.2f sec. frames %d"
 msgstr ""
 
-#: src/saveplay.c:326 src/saveplay.c:4001
+#: src/saveplay.c:326 src/saveplay.c:3927
 msgid " without sound"
 msgstr ""
 
-#: src/saveplay.c:396
+#: src/saveplay.c:395
 #, c-format
 msgid "Opening audio for %s"
 msgstr ""
 
-#: src/saveplay.c:557
+#: src/saveplay.c:554
 #, c-format
 msgid "Auto trimming %.2f seconds of audio at start..."
 msgstr ""
 
-#: src/saveplay.c:567
+#: src/saveplay.c:562
 #, c-format
 msgid "Auto trimming %.2f seconds of audio at end..."
 msgstr ""
 
-#: src/saveplay.c:584
+#: src/saveplay.c:577
 #, c-format
 msgid "Auto padding with %.2f seconds of silence at start..."
 msgstr ""
 
-#: src/saveplay.c:599
+#: src/saveplay.c:590
 #, c-format
 msgid "Auto padding with %.2f seconds of silence at end..."
 msgstr ""
 
-#: src/saveplay.c:671
+#: src/saveplay.c:661
 #, c-format
 msgid ""
 "\n"
@@ -3884,11 +3874,11 @@
 "Are you sure you wish to continue ?"
 msgstr ""
 
-#: src/saveplay.c:685
+#: src/saveplay.c:676
 msgid " - please be patient."
 msgstr ""
 
-#: src/saveplay.c:938
+#: src/saveplay.c:926
 msgid ""
 "\n"
 "\n"
@@ -3896,14 +3886,14 @@
 "Please check the terminal window for more details.\n"
 msgstr ""
 
-#: src/saveplay.c:940
+#: src/saveplay.c:928
 msgid ""
 "\n"
 "\n"
 "You may need to install mplayer to open this file.\n"
 msgstr ""
 
-#: src/saveplay.c:948
+#: src/saveplay.c:934
 msgid ""
 "\n"
 "\n"
@@ -3911,29 +3901,29 @@
 "Tools|Preferences|Decoding\n"
 msgstr ""
 
-#: src/saveplay.c:1014
+#: src/saveplay.c:995
 msgid "Adding image..."
 msgstr ""
 
-#: src/saveplay.c:1108
+#: src/saveplay.c:1089
 #, c-format
 msgid "Subtitles were saved as %s\n"
 msgstr ""
 
-#: src/saveplay.c:1192
+#: src/saveplay.c:1171
 #, c-format
 msgid "LiVES: Save Frame %d as..."
 msgstr ""
 
-#: src/saveplay.c:1195
+#: src/saveplay.c:1174
 msgid "LiVES: Save Frame as..."
 msgstr ""
 
-#: src/saveplay.c:1322
+#: src/saveplay.c:1303
 msgid "LiVES: Save Clip as..."
 msgstr ""
 
-#: src/saveplay.c:1390
+#: src/saveplay.c:1369
 msgid ""
 "Saving your video could lead to a loss of quality !\n"
 "You are strongly advised to 'Save As' to a new file.\n"
@@ -3941,67 +3931,67 @@
 "Do you still wish to continue ?"
 msgstr ""
 
-#: src/saveplay.c:1517 src/saveplay.c:1683 src/saveplay.c:1762
-#: src/saveplay.c:4014
+#: src/saveplay.c:1494 src/saveplay.c:1659 src/saveplay.c:1738
+#: src/saveplay.c:3940
 msgid "Pulling frames from clip"
 msgstr ""
 
-#: src/saveplay.c:1588 src/saveplay.c:1727
+#: src/saveplay.c:1565 src/saveplay.c:1703
 msgid "Linking selection"
 msgstr ""
 
-#: src/saveplay.c:1779
+#: src/saveplay.c:1755
 msgid " (with no sound)\n"
 msgstr ""
 
-#: src/saveplay.c:1786
+#: src/saveplay.c:1761
 #, c-format
 msgid "Saving frames %d to %d%s as \"%s\" : encoder = %s : format = %s..."
 msgstr ""
 
-#: src/saveplay.c:1790
+#: src/saveplay.c:1765
 #, c-format
 msgid "Saving frames 1 to %d%s as \"%s\" : encoder %s : format = %s..."
 msgstr ""
 
-#: src/saveplay.c:1909
+#: src/saveplay.c:1890
 msgid "Saving [can take a long time]"
 msgstr ""
 
-#: src/saveplay.c:2057
+#: src/saveplay.c:2044
 msgid ""
 "\n"
 "\n"
 "Encoder error - output file was not created !\n"
 msgstr ""
 
-#: src/saveplay.c:2094
+#: src/saveplay.c:2081
 msgid "Clearing letterbox"
 msgstr ""
 
-#: src/saveplay.c:2183
+#: src/saveplay.c:2168
 #, c-format
 msgid "File size was %s\n"
 msgstr ""
 
-#: src/saveplay.c:2284
+#: src/saveplay.c:2265
 msgid "recording aborted by preview.\n"
 msgstr ""
 
-#: src/saveplay.c:2288
+#: src/saveplay.c:2268
 msgid "recording aborted by clipboard playback.\n"
 msgstr ""
 
-#: src/saveplay.c:2291
+#: src/saveplay.c:2270
 msgid "Recording performance..."
 msgstr ""
 
-#: src/saveplay.c:3293
+#: src/saveplay.c:3251
 #, c-format
 msgid "Average FPS was %.4f\n"
 msgstr ""
 
-#: src/saveplay.c:3299
+#: src/saveplay.c:3256
 msgid ""
 "\n"
 "\n"
@@ -4010,16 +4000,21 @@
 "and resize all frames to the current size.\n"
 msgstr ""
 
-#: src/saveplay.c:3479
+#: src/saveplay.c:3429
 msgid "Unknown"
 msgstr ""
 
-#: src/saveplay.c:3588 src/saveplay.c:4585
+#: src/saveplay.c:3538 src/saveplay.c:4502
 #, c-format
 msgid "Untitled%d"
 msgstr ""
 
-#: src/saveplay.c:3633
+#: src/saveplay.c:3567
+#, c-format
+msgid "%d frames are enough !\n"
+msgstr ""
+
+#: src/saveplay.c:3579
 #, c-format
 msgid ""
 "\n"
@@ -4027,7 +4022,7 @@
 "Bad things may happen with this clip.\n"
 msgstr ""
 
-#: src/saveplay.c:3723
+#: src/saveplay.c:3667
 #, c-format
 msgid ""
 "\n"
@@ -4035,73 +4030,73 @@
 "Default can be set in Tools | Preferences | Misc.\n"
 msgstr ""
 
-#: src/saveplay.c:3735
+#: src/saveplay.c:3677
 #, c-format
 msgid "Playback speed was adjusted to %.3f frames per second to fit audio.\n"
 msgstr ""
 
-#: src/saveplay.c:3754
+#: src/saveplay.c:3694
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d *bpp=Greyscale* fps=%.3f\n"
 "Audio:"
 msgstr ""
 
-#: src/saveplay.c:3758 src/saveplay.c:4762
+#: src/saveplay.c:3698 src/saveplay.c:4671
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d bpp=%d fps=%.3f\n"
 "Audio:"
 msgstr ""
 
-#: src/saveplay.c:3762 src/saveplay.c:4766
+#: src/saveplay.c:3703 src/saveplay.c:4676
 #, c-format
 msgid "%s none\n"
 msgstr ""
 
-#: src/saveplay.c:3774
+#: src/saveplay.c:3714
 #, c-format
 msgid " - Author: %s\n"
 msgstr ""
 
-#: src/saveplay.c:3779
+#: src/saveplay.c:3717
 #, c-format
 msgid " - Title: %s\n"
 msgstr ""
 
-#: src/saveplay.c:3784
+#: src/saveplay.c:3720
 #, c-format
 msgid " - Comment: %s\n"
 msgstr ""
 
-#: src/saveplay.c:3897
+#: src/saveplay.c:3829
 #, c-format
 msgid "Saving frame %d as %s..."
 msgstr ""
 
-#: src/saveplay.c:3996
+#: src/saveplay.c:3924
 #, c-format
 msgid "Backing up %s to %s"
 msgstr ""
 
-#: src/saveplay.c:4049
+#: src/saveplay.c:3975
 msgid "Backing up"
 msgstr ""
 
-#: src/saveplay.c:4083
+#: src/saveplay.c:4009
 msgid "performance data was backed up..."
 msgstr ""
 
-#: src/saveplay.c:4661
+#: src/saveplay.c:4574
 #, c-format
 msgid "Restoring %s..."
 msgstr ""
 
-#: src/saveplay.c:4692
+#: src/saveplay.c:4603
 msgid "Restoring"
 msgstr ""
 
-#: src/saveplay.c:4714
+#: src/saveplay.c:4625
 #, c-format
 msgid ""
 "\n"
@@ -4111,22 +4106,22 @@
 msgstr ""
 
 #. TRANSLATORS: rec(ord) %.2f M(ega)B(ytes)
-#: src/saveplay.c:5207
+#: src/saveplay.c:5118
 #, c-format
 msgid "rec %.2f MB"
 msgstr ""
 
-#: src/saveplay.c:5213
+#: src/saveplay.c:5123
 #, c-format
 msgid "!rec %.2f MB"
 msgstr ""
 
 #. TRANSLATORS: rec(ord) ?? M(ega)B(ytes)
-#: src/saveplay.c:5216
+#: src/saveplay.c:5126
 msgid "rec ?? MB"
 msgstr ""
 
-#: src/saveplay.c:5241
+#: src/saveplay.c:5151
 #, c-format
 msgid ""
 "\n"
@@ -4134,54 +4129,72 @@
 "Record stop level can be set in Preferences.\n"
 msgstr ""
 
-#: src/saveplay.c:5535
+#: src/saveplay.c:5447
 msgid ""
 "\n"
 "Files from a previous run of LiVES were found.\n"
 "Do you want to attempt to recover them ?\n"
 msgstr ""
 
-#: src/saveplay.c:5557
+#: src/saveplay.c:5469
 msgid "Recovering files"
 msgstr ""
 
-#: src/saveplay.c:5560
+#: src/saveplay.c:5472
 msgid "Recovering files..."
 msgstr ""
 
-#: src/dialogs.c:72
+#: src/dialogs.c:71
 msgid "Show affected _layouts"
 msgstr ""
 
-#: src/dialogs.c:128
+#: src/dialogs.c:113
+msgid ""
+"Do _not show this warning any more\n"
+"(can be turned back on from Preferences/Warnings)"
+msgstr ""
+
+#: src/dialogs.c:127
 msgid "_Recover disk space"
 msgstr ""
 
-#: src/dialogs.c:143
+#: src/dialogs.c:142
 msgid " _Advanced Settings >>"
 msgstr ""
 
-#: src/dialogs.c:184
+#: src/dialogs.c:183 src/dialogs.c:221
 msgid "LiVES: - Warning !"
 msgstr ""
 
 #: src/dialogs.c:194
-msgid "LiVES: - Question"
+msgid "LiVES: - Error !"
 msgstr ""
 
 #: src/dialogs.c:204
+msgid "LiVES: - Information"
+msgstr ""
+
+#: src/dialogs.c:230
+msgid "LiVES: - Question"
+msgstr ""
+
+#: src/dialogs.c:239
 msgid "LiVES: - File Error"
 msgstr ""
 
-#: src/dialogs.c:208
+#: src/dialogs.c:241
 msgid "_Abort"
 msgstr ""
 
-#: src/dialogs.c:213
+#: src/dialogs.c:246
 msgid "_Retry"
 msgstr ""
 
-#: src/dialogs.c:597
+#: src/dialogs.c:306
+msgid "Show _Details"
+msgstr ""
+
+#: src/dialogs.c:657
 #, c-format
 msgid ""
 "FREE SPACE IN THE PARTITION CONTAINING\n"
@@ -4192,7 +4205,7 @@
 "(Disk warning levels can be configured in Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:615
+#: src/dialogs.c:676
 #, c-format
 msgid ""
 "Free space in the partition containing\n"
@@ -4204,11 +4217,11 @@
 "Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:627
+#: src/dialogs.c:688
 msgid "Audio players cannot be switched during playback."
 msgstr ""
 
-#: src/dialogs.c:632
+#: src/dialogs.c:694
 msgid ""
 "\n"
 "\n"
@@ -4216,46 +4229,46 @@
 "Please try closing some other applications first.\n"
 msgstr ""
 
-#: src/dialogs.c:752
+#: src/dialogs.c:820
 msgid "Processing has been paused."
 msgstr ""
 
-#: src/dialogs.c:937
+#: src/dialogs.c:1002
 #, c-format
 msgid ""
 "\n"
 "%s%d%% done. Time remaining: %u sec%s\n"
 msgstr ""
 
-#: src/dialogs.c:1335
+#: src/dialogs.c:1391
 #, c-format
 msgid ""
 "\n"
 "%d/%d frames opened. Time remaining %u sec.\n"
 msgstr ""
 
-#: src/dialogs.c:1337
+#: src/dialogs.c:1393
 #, c-format
 msgid ""
 "\n"
 "%d/%d frames opened.\n"
 msgstr ""
 
-#: src/dialogs.c:1341
+#: src/dialogs.c:1396
 #, c-format
 msgid ""
 "\n"
 "%d frames opened.\n"
 msgstr ""
 
-#: src/dialogs.c:1940
+#: src/dialogs.c:1993
 #, c-format
 msgid ""
 "\n"
 "Time remaining: %d sec"
 msgstr ""
 
-#: src/dialogs.c:1988
+#: src/dialogs.c:2040
 #, c-format
 msgid ""
 "\n"
@@ -4263,7 +4276,7 @@
 "Please close a file and then try again."
 msgstr ""
 
-#: src/dialogs.c:1994
+#: src/dialogs.c:2047
 #, c-format
 msgid ""
 "LiVES was unable to write to its temporary directory.\n"
@@ -4275,27 +4288,27 @@
 "Please make sure you can write to this directory."
 msgstr ""
 
-#: src/dialogs.c:2005
+#: src/dialogs.c:2059
 msgid ""
 "\n"
 "LiVES currently requires either 'mplayer', 'mplayer2', or 'sox' to function. "
 "Please install one or other of these, and try again.\n"
 msgstr ""
 
-#: src/dialogs.c:2010
+#: src/dialogs.c:2064
 msgid ""
 "Audio was not loaded; please install mplayer or mplayer2 if you expected "
 "audio for this clip.\n"
 msgstr ""
 
-#: src/dialogs.c:2014
+#: src/dialogs.c:2069
 msgid ""
 "Audio resampling is required for this format.\n"
 "Please install 'sox'\n"
 "Or switch to another encoder format in Tools | Preferences | Encoding\n"
 msgstr ""
 
-#: src/dialogs.c:2019
+#: src/dialogs.c:2075
 msgid ""
 "\n"
 "\n"
@@ -4303,19 +4316,19 @@
 "Please set the audio codec in Tools|Preferences|Encoding\n"
 msgstr ""
 
-#: src/dialogs.c:2024
+#: src/dialogs.c:2080
 msgid ""
 "This layout includes generated frames.\n"
 "It cannot be saved, you must render it to a clip first.\n"
 msgstr ""
 
-#: src/dialogs.c:2029
+#: src/dialogs.c:2085
 msgid ""
 "This layout includes generated or recorded audio.\n"
 "It cannot be saved, you must render it to a clip first.\n"
 msgstr ""
 
-#: src/dialogs.c:2039 src/dialogs.c:2137
+#: src/dialogs.c:2095 src/dialogs.c:2189
 #, c-format
 msgid ""
 "\n"
@@ -4323,83 +4336,83 @@
 "Due to restrictions in the %s format\n"
 msgstr ""
 
-#: src/dialogs.c:2059
+#: src/dialogs.c:2115
 msgid ""
 "LiVES recommends the following settings:\n"
 "\n"
 msgstr ""
 
-#: src/dialogs.c:2065 src/dialogs.c:2174 src/resample.c:850
+#: src/dialogs.c:2121 src/dialogs.c:2225 src/resample.c:839
 msgid ", signed"
 msgstr ""
 
-#: src/dialogs.c:2066 src/dialogs.c:2175 src/resample.c:853
+#: src/dialogs.c:2122 src/dialogs.c:2226 src/resample.c:841
 msgid ", unsigned"
 msgstr ""
 
-#: src/dialogs.c:2070 src/dialogs.c:2179 src/resample.c:858
+#: src/dialogs.c:2126 src/dialogs.c:2230 src/resample.c:846
 msgid ", little-endian"
 msgstr ""
 
-#: src/dialogs.c:2071 src/dialogs.c:2180 src/resample.c:861
+#: src/dialogs.c:2127 src/dialogs.c:2231 src/resample.c:848
 msgid ", big-endian"
 msgstr ""
 
-#: src/dialogs.c:2077
+#: src/dialogs.c:2132
 #, c-format
 msgid "Use an audio rate of %d Hz%s%s\n"
 msgstr ""
 
-#: src/dialogs.c:2085
+#: src/dialogs.c:2140
 #, c-format
 msgid "Set video rate to %.3f frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:2089
+#: src/dialogs.c:2143
 #, c-format
 msgid "Set video rate to %d:%d frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:2094 src/dialogs.c:2209
+#: src/dialogs.c:2148 src/dialogs.c:2258
 #, c-format
 msgid "Set video size to %d x %d pixels\n"
 msgstr ""
 
-#: src/dialogs.c:2102 src/dialogs.c:2208
+#: src/dialogs.c:2156 src/dialogs.c:2257
 msgid ""
 "\n"
 "You may wish to:\n"
 msgstr ""
 
-#: src/dialogs.c:2105 src/dialogs.c:2200
+#: src/dialogs.c:2159 src/dialogs.c:2249
 #, c-format
 msgid "resize video to %d x %d pixels\n"
 msgstr ""
 
-#: src/dialogs.c:2110
+#: src/dialogs.c:2163
 msgid "disable audio, since the target encoder cannot encode audio\n"
 msgstr ""
 
-#: src/dialogs.c:2170
+#: src/dialogs.c:2221
 msgid "LiVES must:\n"
 msgstr ""
 
-#: src/dialogs.c:2185
+#: src/dialogs.c:2235
 #, c-format
 msgid "resample audio to %d Hz%s%s\n"
 msgstr ""
 
-#: src/dialogs.c:2192
+#: src/dialogs.c:2242
 #, c-format
 msgid "resample video to %.3f frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:2196
+#: src/dialogs.c:2245
 #, c-format
 msgid "resample video to %d:%d frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:2215
+#: src/dialogs.c:2263
 msgid ""
 "\n"
 "You will be able to undo these changes afterwards.\n"
@@ -4408,14 +4421,14 @@
 "\n"
 msgstr ""
 
-#: src/dialogs.c:2218
+#: src/dialogs.c:2265
 msgid ""
 "\n"
 "Changes applied to the selection will not be permanent.\n"
 "\n"
 msgstr ""
 
-#: src/dialogs.c:2237
+#: src/dialogs.c:2285
 msgid ""
 "\n"
 "\n"
@@ -4424,7 +4437,7 @@
 "Try recording for just a selection of the file."
 msgstr ""
 
-#: src/dialogs.c:2244
+#: src/dialogs.c:2293
 msgid ""
 "The playback speed (fps), or the audio rate\n"
 " of the clipboard does not match\n"
@@ -4435,7 +4448,7 @@
 "Please press Cancel to abort the insert, or OK to continue."
 msgstr ""
 
-#: src/dialogs.c:2253
+#: src/dialogs.c:2304
 #, c-format
 msgid ""
 "When opening a yuvmpeg stream, you should first create a fifo file in:\n"
@@ -4448,11 +4461,11 @@
 "click Cancel."
 msgstr ""
 
-#: src/dialogs.c:2305
+#: src/dialogs.c:2356
 msgid "Show Keys"
 msgstr ""
 
-#: src/dialogs.c:2306
+#: src/dialogs.c:2358
 msgid ""
 "You can use the following keys during playback to control LiVES:-\n"
 "\n"
@@ -4494,11 +4507,11 @@
 "g                             ping pong loops\n"
 msgstr ""
 
-#: src/dialogs.c:2313
+#: src/dialogs.c:2365
 msgid "Multitrack Keys"
 msgstr ""
 
-#: src/dialogs.c:2314
+#: src/dialogs.c:2367
 msgid ""
 "You can use the following keys to control the multitrack window:-\n"
 "\n"
@@ -4520,18 +4533,18 @@
 "For other keys, see the menus.\n"
 msgstr ""
 
-#: src/dialogs.c:2322
+#: src/dialogs.c:2375
 msgid "Message History"
 msgstr ""
 
-#: src/dialogs.c:2335
+#: src/dialogs.c:2388
 #, c-format
 msgid ""
 "After upgrading/installing, you may need to adjust the <prefix_dir> setting "
 "in your %s file"
 msgstr ""
 
-#: src/dialogs.c:2344
+#: src/dialogs.c:2399
 #, c-format
 msgid ""
 "\n"
@@ -4542,25 +4555,25 @@
 "or change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/dialogs.c:2352
+#: src/dialogs.c:2408
 msgid ""
 "Sorry, unknown audio type.\n"
 "\n"
 " (Filenames must end in .mp3, .ogg, .wav, .mod, .xm or .it)"
 msgstr ""
 
-#: src/dialogs.c:2353
+#: src/dialogs.c:2409
 msgid "failed (unknown type)\n"
 msgstr ""
 
-#: src/dialogs.c:2358
+#: src/dialogs.c:2415
 msgid ""
 "\n"
 "Do you wish to remove the layout files associated with this set ?\n"
 "(They will not be usable without the set).\n"
 msgstr ""
 
-#: src/dialogs.c:2363
+#: src/dialogs.c:2421
 #, c-format
 msgid ""
 "\n"
@@ -4569,7 +4582,7 @@
 "Click Cancel to pick a new name.\n"
 msgstr ""
 
-#: src/dialogs.c:2370
+#: src/dialogs.c:2429
 msgid ""
 "\n"
 "Frames from this clip are used in some multitrack layouts.\n"
@@ -4577,7 +4590,7 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2374
+#: src/dialogs.c:2433
 msgid ""
 "\n"
 "Audio from this clip is used in some multitrack layouts.\n"
@@ -4585,7 +4598,7 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2378
+#: src/dialogs.c:2438
 #, c-format
 msgid ""
 "\n"
@@ -4596,7 +4609,7 @@
 "Otherwise click Cancel to skip loading this file.\n"
 msgstr ""
 
-#: src/dialogs.c:2385
+#: src/dialogs.c:2446
 #, c-format
 msgid ""
 "\n"
@@ -4606,7 +4619,7 @@
 "The clip could not be loaded.\n"
 msgstr ""
 
-#: src/dialogs.c:2392
+#: src/dialogs.c:2455
 msgid ""
 "\n"
 "Dear user, the jack developers decided to remove the -Z option from jackd.\n"
@@ -4614,7 +4627,7 @@
 "Alternately, select a different audio player in Preferences.\n"
 msgstr ""
 
-#: src/dialogs.c:2396
+#: src/dialogs.c:2460
 msgid ""
 "\n"
 "Unable to start up jack. Please ensure that alsa is set up correctly on your "
@@ -4623,13 +4636,13 @@
 "Automatic jack startup will be disabled now.\n"
 msgstr ""
 
-#: src/dialogs.c:2402
+#: src/dialogs.c:2466
 msgid ""
 "\n"
 "Unable to connect to jack server. Please start jack before starting LiVES\n"
 msgstr ""
 
-#: src/dialogs.c:2411
+#: src/dialogs.c:2475
 #, c-format
 msgid ""
 "\n"
@@ -4640,13 +4653,13 @@
 "%s\n"
 msgstr ""
 
-#: src/dialogs.c:2418
+#: src/dialogs.c:2482
 msgid ""
 "\n"
 "Alternately, you can restart LiVES and select another audio player.\n"
 msgstr ""
 
-#: src/dialogs.c:2423
+#: src/dialogs.c:2488
 #, c-format
 msgid ""
 "\n"
@@ -4656,7 +4669,7 @@
 "It is recommended to increase it to at least %d MB"
 msgstr ""
 
-#: src/dialogs.c:2429
+#: src/dialogs.c:2496
 #, c-format
 msgid ""
 "\n"
@@ -4665,7 +4678,7 @@
 "Do you wish to delete them ?\n"
 msgstr ""
 
-#: src/dialogs.c:2436
+#: src/dialogs.c:2504
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for multitrack undo.\n"
@@ -4673,7 +4686,7 @@
 "using Preferences/Multitrack/Undo Memory\n"
 msgstr ""
 
-#: src/dialogs.c:2440
+#: src/dialogs.c:2508
 msgid ""
 "\n"
 "Out of memory for undo.\n"
@@ -4681,63 +4694,63 @@
 "using Preferences/Multitrack/Undo Memory\n"
 msgstr ""
 
-#: src/dialogs.c:2444
+#: src/dialogs.c:2512
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for the multitrack undo buffer.\n"
 msgstr ""
 
-#: src/dialogs.c:2446
+#: src/dialogs.c:2514
 msgid "or enter a smaller value.\n"
 msgstr ""
 
-#: src/dialogs.c:2448
+#: src/dialogs.c:2516
 msgid "Try again from the clip editor, try closing some other applications\n"
 msgstr ""
 
-#: src/dialogs.c:2449
+#: src/dialogs.c:2517
 msgid "Try closing some other applications\n"
 msgstr ""
 
-#: src/dialogs.c:2460
+#: src/dialogs.c:2529
 msgid ""
 "Multitrack is set to 0 audio channels, but this layout has audio.\n"
 "You should adjust the audio settings from the Tools menu.\n"
 msgstr ""
 
-#: src/dialogs.c:2464
+#: src/dialogs.c:2534
 msgid ""
 "The current layout has audio, so audio channels may not be set to zero.\n"
 msgstr ""
 
-#: src/dialogs.c:2468
+#: src/dialogs.c:2539
 msgid ""
 "Multitrack audio preview is only available with the\n"
 "\"jack\" or \"pulse audio\" audio player.\n"
 "You can set this in Tools|Preferences|Playback."
 msgstr ""
 
-#: src/dialogs.c:2472
+#: src/dialogs.c:2545
 msgid ""
 "Errors were detected in the layout (which may be due to transferring from "
 "another system, or from an older version of LiVES).\n"
 "Should I try to repair the disk copy of the layout ?\n"
 msgstr ""
 
-#: src/dialogs.c:2476
+#: src/dialogs.c:2549
 msgid ""
 "LiVES was unable to load the layout.\n"
 "Sorry.\n"
 msgstr ""
 
-#: src/dialogs.c:2482
+#: src/dialogs.c:2555
 msgid ""
 "\n"
 "\n"
 "Audio rate must be greater than 0.\n"
 msgstr ""
 
-#: src/dialogs.c:2486
+#: src/dialogs.c:2559
 msgid ""
 "\n"
 "Event list will be very large\n"
@@ -4745,14 +4758,14 @@
 "Are you sure you wish to view it ?\n"
 msgstr ""
 
-#: src/dialogs.c:2491
+#: src/dialogs.c:2564
 msgid ""
 "\n"
 "\n"
 "You must install 'dvgrab' to use this function.\n"
 msgstr ""
 
-#: src/dialogs.c:2496
+#: src/dialogs.c:2570
 msgid ""
 "\n"
 "\n"
@@ -4761,25 +4774,25 @@
 "You may need to select one of these in Tools/Preferences/Playback.\n"
 msgstr ""
 
-#: src/dialogs.c:2500
+#: src/dialogs.c:2574
 msgid "Video playback plugin failed to initialise palette !\n"
 msgstr ""
 
-#: src/dialogs.c:2504
+#: src/dialogs.c:2579
 msgid "Decoder plugin failed to initialise palette !\n"
 msgstr ""
 
-#: src/dialogs.c:2509
+#: src/dialogs.c:2584
 msgid "Unable to set framerate of video plugin\n"
 msgstr ""
 
-#: src/dialogs.c:2514
+#: src/dialogs.c:2590
 msgid ""
 "After a crash, it is advisable to clean up the disk with\n"
 "File|Clean up disk space\n"
 msgstr ""
 
-#: src/dialogs.c:2526
+#: src/dialogs.c:2604
 #, c-format
 msgid ""
 "Stream frame size is too large for your network buffers.\n"
@@ -4788,33 +4801,33 @@
 "echo %d > /proc/sys/net/core/rmem_max\n"
 msgstr ""
 
-#: src/dialogs.c:2714
+#: src/dialogs.c:2800
 msgid "cancelled.\n"
 msgstr ""
 
-#: src/dialogs.c:2721
+#: src/dialogs.c:2805
 msgid "failed.\n"
 msgstr ""
 
-#: src/dialogs.c:2728
+#: src/dialogs.c:2810
 msgid "done.\n"
 msgstr ""
 
-#: src/dialogs.c:2732
+#: src/dialogs.c:2814
 msgid "error in file. Failed.\n"
 msgstr ""
 
-#: src/dialogs.c:2766 src/dialogs.c:2815 src/dialogs.c:2839
+#: src/dialogs.c:2848 src/dialogs.c:2897 src/dialogs.c:2921
 #, c-format
 msgid "Additional info: %s\n"
 msgstr ""
 
-#: src/dialogs.c:2769
+#: src/dialogs.c:2851
 #, c-format
 msgid "The error value was %d%s\n"
 msgstr ""
 
-#: src/dialogs.c:2772
+#: src/dialogs.c:2854
 #, c-format
 msgid ""
 "\n"
@@ -4824,7 +4837,7 @@
 "%s%s%s"
 msgstr ""
 
-#: src/dialogs.c:2818
+#: src/dialogs.c:2900
 #, c-format
 msgid ""
 "\n"
@@ -4834,7 +4847,7 @@
 "%s"
 msgstr ""
 
-#: src/dialogs.c:2842
+#: src/dialogs.c:2924
 #, c-format
 msgid ""
 "\n"
@@ -4844,7 +4857,7 @@
 "%s"
 msgstr ""
 
-#: src/dialogs.c:2886
+#: src/dialogs.c:2968
 #, c-format
 msgid ""
 "\n"
@@ -4853,7 +4866,7 @@
 "Please check for possible error causes.\n"
 msgstr ""
 
-#: src/dialogs.c:2890
+#: src/dialogs.c:2971
 #, c-format
 msgid ""
 "\n"
@@ -4863,7 +4876,7 @@
 "%s.\n"
 msgstr ""
 
-#: src/dialogs.c:2921
+#: src/dialogs.c:3002
 #, c-format
 msgid ""
 "\n"
@@ -4872,7 +4885,7 @@
 "Please check for possible error causes.\n"
 msgstr ""
 
-#: src/dialogs.c:2925
+#: src/dialogs.c:3005
 #, c-format
 msgid ""
 "\n"
@@ -4882,12 +4895,12 @@
 "%s.\n"
 msgstr ""
 
-#: src/dialogs.c:2993
+#: src/dialogs.c:3073
 #, c-format
 msgid "Value for \"%s\" could not be read."
 msgstr ""
 
-#: src/dialogs.c:3011
+#: src/dialogs.c:3091
 #, c-format
 msgid ""
 "\n"
@@ -4896,7 +4909,7 @@
 "Please check your system for errors.\n"
 msgstr ""
 
-#: src/dialogs.c:3020
+#: src/dialogs.c:3100
 #, c-format
 msgid ""
 "\n"
@@ -4905,7 +4918,7 @@
 "Please check the file permissions and try again."
 msgstr ""
 
-#: src/dialogs.c:3027
+#: src/dialogs.c:3109
 #, c-format
 msgid ""
 "\n"
@@ -4914,7 +4927,7 @@
 "Please check the directory permissions and try again."
 msgstr ""
 
-#: src/dialogs.c:3034
+#: src/dialogs.c:3116
 #, c-format
 msgid ""
 "\n"
@@ -4922,14 +4935,14 @@
 "%s\n"
 msgstr ""
 
-#: src/dialogs.c:3041
+#: src/dialogs.c:3123
 msgid ""
 "\n"
 "Abort and exit immediately from LiVES\n"
 "Are you sure ?\n"
 msgstr ""
 
-#: src/dialogs.c:3047
+#: src/dialogs.c:3129
 #, c-format
 msgid ""
 "\n"
@@ -4937,13 +4950,13 @@
 "Please select another encoder from the list.\n"
 msgstr ""
 
-#: src/dialogs.c:3056
+#: src/dialogs.c:3139
 msgid ""
 "\n"
 "This card is already in use and cannot be opened multiple times.\n"
 msgstr ""
 
-#: src/dialogs.c:3061
+#: src/dialogs.c:3145
 #, c-format
 msgid ""
 "\n"
@@ -4953,27 +4966,27 @@
 "- Check if the device actually exists.\n"
 msgstr ""
 
-#: src/dialogs.c:3068
+#: src/dialogs.c:3153
 msgid ""
 "\n"
 "This file already has subtitles loaded.\n"
 "Do you wish to overwrite the existing subtitles ?\n"
 msgstr ""
 
-#: src/dialogs.c:3072
+#: src/dialogs.c:3157
 msgid ""
 "\n"
 "LiVES currently only supports subtitles of type .srt and .sub.\n"
 msgstr ""
 
-#: src/dialogs.c:3076
+#: src/dialogs.c:3161
 msgid ""
 "\n"
 "Erase all subtitles from this clip.\n"
 "Are you sure ?\n"
 msgstr ""
 
-#: src/dialogs.c:3082
+#: src/dialogs.c:3168
 #, c-format
 msgid ""
 "\n"
@@ -4982,14 +4995,14 @@
 "or OK to continue and save as type \"%s\"\n"
 msgstr ""
 
-#: src/dialogs.c:3089
+#: src/dialogs.c:3176
 msgid ""
 "\n"
 "Do you wish to move the current clip sets to the new directory ?\n"
 "(If unsure, click Yes)\n"
 msgstr ""
 
-#: src/dialogs.c:3093
+#: src/dialogs.c:3181
 #, c-format
 msgid ""
 "\n"
@@ -5000,19 +5013,19 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:3099
+#: src/dialogs.c:3188
 msgid ""
 "\n"
 "No video input devices could be found.\n"
 msgstr ""
 
-#: src/dialogs.c:3103
+#: src/dialogs.c:3192
 msgid ""
 "\n"
 "All video input devices are already in use.\n"
 msgstr ""
 
-#: src/dialogs.c:3107
+#: src/dialogs.c:3196
 msgid ""
 "\n"
 "\n"
@@ -5020,15 +5033,14 @@
 "DO NOT SHUT DOWN OR CLOSE LIVES !\n"
 msgstr ""
 
-#: src/dialogs.c:3127
+#: src/dialogs.c:3203
 #, c-format
 msgid ""
 "No clips were recovered for set (%s).\n"
 "Please check the spelling of the set name and try again.\n"
 msgstr ""
 
-#. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:3136
+#: src/dialogs.c:3214
 #, c-format
 msgid ""
 "\n"
@@ -5040,7 +5052,7 @@
 msgstr ""
 
 #. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:3144
+#: src/dialogs.c:3222
 #, c-format
 msgid ""
 "\n"
@@ -5049,34 +5061,34 @@
 "\n"
 msgstr ""
 
-#: src/dialogs.c:3150
+#: src/dialogs.c:3228
 msgid ""
 "\n"
 "You must have autolives.pl installed and in your path to use this toy.\n"
 "Consult your package distributor.\n"
 msgstr ""
 
-#: src/dialogs.c:3154
+#: src/dialogs.c:3232
 msgid ""
 "\n"
 "You must have a minimum of one clip loaded to use this toy.\n"
 msgstr ""
 
-#: src/dialogs.c:3158
+#: src/dialogs.c:3236
 msgid ""
 "\n"
 "LiVES lost its connection to jack and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:3162
+#: src/dialogs.c:3240
 msgid ""
 "\n"
 "LiVES lost its connection to pulseaudio and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:3175
+#: src/dialogs.c:3254
 #, c-format
 msgid ""
 "\n"
@@ -5085,543 +5097,543 @@
 "Do you wish to allow this (for this session only) ?\n"
 msgstr ""
 
-#: src/effects.c:60
+#: src/effects.c:61
 msgid "generator"
 msgstr ""
 
-#: src/effects.c:61
+#: src/effects.c:62
 msgid "Generators"
 msgstr ""
 
-#: src/effects.c:63
+#: src/effects.c:64
 msgid "audio generator"
 msgstr ""
 
-#: src/effects.c:64
+#: src/effects.c:65
 msgid "Audio Generators"
 msgstr ""
 
-#: src/effects.c:66
+#: src/effects.c:67
 msgid "audio/video generator"
 msgstr ""
 
-#: src/effects.c:67
+#: src/effects.c:68
 msgid "Audio/Video Generators"
 msgstr ""
 
-#: src/effects.c:69
+#: src/effects.c:70
 msgid "data generator"
 msgstr ""
 
-#: src/effects.c:70
+#: src/effects.c:71
 msgid "Data Generators"
 msgstr ""
 
-#: src/effects.c:72
+#: src/effects.c:73
 msgid "data visualiser"
 msgstr ""
 
-#: src/effects.c:73
+#: src/effects.c:74
 msgid "Data Visualisers"
 msgstr ""
 
-#: src/effects.c:75
+#: src/effects.c:76
 msgid "data processor"
 msgstr ""
 
-#: src/effects.c:76
+#: src/effects.c:77
 msgid "Data Processors"
 msgstr ""
 
-#: src/effects.c:78
+#: src/effects.c:79
 msgid "data source"
 msgstr ""
 
-#: src/effects.c:79
+#: src/effects.c:80
 msgid "Data Sources"
 msgstr ""
 
-#: src/effects.c:81
+#: src/effects.c:82
 msgid "transition"
 msgstr ""
 
-#: src/effects.c:82
+#: src/effects.c:83
 msgid "Transitions"
 msgstr ""
 
-#: src/effects.c:84
+#: src/effects.c:85
 msgid "effect"
 msgstr ""
 
-#: src/effects.c:87 src/rfx-builder.c:187
+#: src/effects.c:88 src/rfx-builder.c:187
 msgid "utility"
 msgstr ""
 
-#: src/effects.c:88
+#: src/effects.c:89
 msgid "Utilities"
 msgstr ""
 
-#: src/effects.c:90
+#: src/effects.c:91
 msgid "compositor"
 msgstr ""
 
-#: src/effects.c:91
+#: src/effects.c:92
 msgid "Compositors"
 msgstr ""
 
-#: src/effects.c:93
+#: src/effects.c:94
 msgid "tap"
 msgstr ""
 
-#: src/effects.c:94
+#: src/effects.c:95
 msgid "Taps"
 msgstr ""
 
-#: src/effects.c:96
+#: src/effects.c:97
 msgid "splitter"
 msgstr ""
 
-#: src/effects.c:97
+#: src/effects.c:98
 msgid "Splitters"
 msgstr ""
 
-#: src/effects.c:99
+#: src/effects.c:100
 msgid "converter"
 msgstr ""
 
-#: src/effects.c:100
+#: src/effects.c:101
 msgid "Converters"
 msgstr ""
 
-#: src/effects.c:102
+#: src/effects.c:103
 msgid "analyser"
 msgstr ""
 
-#: src/effects.c:103
+#: src/effects.c:104
 msgid "Analysers"
 msgstr ""
 
-#: src/effects.c:108
+#: src/effects.c:109
 msgid "audio/video"
 msgstr ""
 
-#: src/effects.c:109
+#: src/effects.c:110
 msgid "Audio/Video Transitions"
 msgstr ""
 
-#: src/effects.c:111
+#: src/effects.c:112
 msgid "video only"
 msgstr ""
 
-#: src/effects.c:112
+#: src/effects.c:113
 msgid "Video only Transitions"
 msgstr ""
 
-#: src/effects.c:114 src/multitrack.c:10740
+#: src/effects.c:115 src/multitrack.c:10962
 msgid "audio only"
 msgstr ""
 
-#: src/effects.c:115
+#: src/effects.c:116
 msgid "Audio only Transitions"
 msgstr ""
 
-#: src/effects.c:117 src/effects.c:120 src/multitrack.c:18757
+#: src/effects.c:118 src/effects.c:121 src/multitrack.c:19097
 msgid "audio"
 msgstr ""
 
-#: src/effects.c:118
+#: src/effects.c:119
 msgid "Audio Mixers"
 msgstr ""
 
-#: src/effects.c:121
+#: src/effects.c:122
 msgid "Audio Effects"
 msgstr ""
 
-#: src/effects.c:123
+#: src/effects.c:124
 msgid "video"
 msgstr ""
 
-#: src/effects.c:124
+#: src/effects.c:125
 msgid "Video Effects"
 msgstr ""
 
-#: src/effects.c:126
+#: src/effects.c:127
 msgid "audio volume controller"
 msgstr ""
 
-#: src/effects.c:127
+#: src/effects.c:128
 msgid "Audio Volume Controllers"
 msgstr ""
 
-#: src/effects.c:129
+#: src/effects.c:130
 msgid "video analyser"
 msgstr ""
 
-#: src/effects.c:130
+#: src/effects.c:131
 msgid "Video analysers"
 msgstr ""
 
-#: src/effects.c:132
+#: src/effects.c:133
 msgid "audio analyser"
 msgstr ""
 
-#: src/effects.c:133
+#: src/effects.c:134
 msgid "Audio Analysers"
 msgstr ""
 
-#: src/effects.c:137 src/plugins.c:2559 src/plugins.c:2573
+#: src/effects.c:138 src/plugins.c:2507 src/plugins.c:2521
 msgid "unknown"
 msgstr ""
 
-#: src/effects.c:238
+#: src/effects.c:235
 #, c-format
 msgid "%s all frames..."
 msgstr ""
 
-#: src/effects.c:243
+#: src/effects.c:239
 #, c-format
 msgid "%s clipboard into frames %d to %d..."
 msgstr ""
 
-#: src/effects.c:250
+#: src/effects.c:245
 #, c-format
 msgid "%s to clipboard..."
 msgstr ""
 
-#: src/effects.c:254
+#: src/effects.c:248
 #, c-format
 msgid "%s to new clip..."
 msgstr ""
 
-#: src/effects.c:259
+#: src/effects.c:252
 #, c-format
 msgid "%s frames %d to %d..."
 msgstr ""
 
-#: src/effects.c:290
+#: src/effects.c:283
 #, c-format
 msgid "%s clipboard with selection"
 msgstr ""
 
-#: src/effects.c:295
+#: src/effects.c:287
 #, c-format
 msgid "%s to clipboard"
 msgstr ""
 
-#: src/effects.c:299
+#: src/effects.c:290
 #, c-format
 msgid "%s to new clip"
 msgstr ""
 
-#: src/effects.c:304
+#: src/effects.c:294
 #, c-format
 msgid "%s frames %d to %d"
 msgstr ""
 
-#: src/effects.c:456 src/effects.c:523
+#: src/effects.c:443 src/effects.c:507
 msgid ""
 "\n"
 "No frames were generated.\n"
 msgstr ""
 
-#: src/effects-weed.c:431
+#: src/effects-weed.c:452
 msgid "integer"
 msgstr ""
 
-#: src/effects-weed.c:432
+#: src/effects-weed.c:454
 msgid "int64"
 msgstr ""
 
-#: src/effects-weed.c:433
+#: src/effects-weed.c:456
 msgid "boolean"
 msgstr ""
 
-#: src/effects-weed.c:434
+#: src/effects-weed.c:458
 msgid "double"
 msgstr ""
 
-#: src/effects-weed.c:435
+#: src/effects-weed.c:460
 msgid "string"
 msgstr ""
 
-#: src/effects-weed.c:436
+#: src/effects-weed.c:462
 msgid "pointer"
 msgstr ""
 
-#: src/effects-weed.c:4591
+#: src/effects-weed.c:4581
 #, c-format
 msgid "Error: plugin %s has no weed_setup() function.\n"
 msgstr ""
 
-#: src/effects-weed.c:4606
+#: src/effects-weed.c:4595
 #, c-format
 msgid "No usable filters found in plugin %s\n"
 msgstr ""
 
-#: src/effects-weed.c:4680
+#: src/effects-weed.c:4668
 #, c-format
 msgid "Found duplicate plugin %s"
 msgstr ""
 
-#: src/effects-weed.c:4734
+#: src/effects-weed.c:4723
 #, c-format
 msgid ""
 "Info: Unable to load plugin %s\n"
 "Error was: %s\n"
 msgstr ""
 
-#: src/effects-weed.c:4737 src/effects-weed.c:5858
+#: src/effects-weed.c:4726 src/effects-weed.c:5847
 msgid "Some plugin directories"
 msgstr ""
 
 #. TRANSLATORS: example " - LADSPA plugins -"
-#: src/effects-weed.c:4812 src/rte_window.c:2105
+#: src/effects-weed.c:4801 src/rte_window.c:2107
 #, c-format
 msgid " - %s plugins -"
 msgstr ""
 
-#: src/effects-weed.c:5012
+#: src/effects-weed.c:4998
 #, c-format
 msgid "Successfully loaded %d Weed filters\n"
 msgstr ""
 
-#: src/effects-weed.c:5177
+#: src/effects-weed.c:5162
 #, c-format
 msgid "Invalid compound effect %s - has conflicting target_fps\n"
 msgstr ""
 
-#: src/effects-weed.c:5197
+#: src/effects-weed.c:5182
 #, c-format
 msgid "Invalid compound effect %s - has multiple transition parameters\n"
 msgstr ""
 
-#: src/effects-weed.c:5211
+#: src/effects-weed.c:5196
 #, c-format
 msgid "Invalid compound effect %s - has multiple master volume parameters\n"
 msgstr ""
 
-#: src/effects-weed.c:5346
+#: src/effects-weed.c:5329
 #, c-format
 msgid "Invalid compound effect %s - must have >1 sub filters\n"
 msgstr ""
 
-#: src/effects-weed.c:5366
+#: src/effects-weed.c:5349
 #, c-format
 msgid "Invalid effect %s found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5381
+#: src/effects-weed.c:5364
 #, c-format
 msgid "Invalid default found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5392
+#: src/effects-weed.c:5375
 #, c-format
 msgid "Invalid filter %d for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5406
+#: src/effects-weed.c:5389
 #, c-format
 msgid "Invalid param %d for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5433
+#: src/effects-weed.c:5416
 #, c-format
 msgid ""
 "Invalid number of values for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5467
+#: src/effects-weed.c:5450
 #, c-format
 msgid ""
 "Invalid non-boolean value for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5500
+#: src/effects-weed.c:5483
 #, c-format
 msgid "Invalid param link found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5511
+#: src/effects-weed.c:5494
 #, c-format
 msgid ""
 "Invalid out filter %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5529
+#: src/effects-weed.c:5513
 #, c-format
 msgid ""
 "Invalid out param %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5541
+#: src/effects-weed.c:5526
 #, c-format
 msgid ""
 "Invalid non-boolean value for autoscale found in compound effect %s, line "
 "%d\n"
 msgstr ""
 
-#: src/effects-weed.c:5552
+#: src/effects-weed.c:5537
 #, c-format
 msgid ""
 "Invalid in filter %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5566
+#: src/effects-weed.c:5552
 #, c-format
 msgid ""
 "Invalid in param %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5594
+#: src/effects-weed.c:5581
 #, c-format
 msgid "Invalid channel link found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5605
+#: src/effects-weed.c:5592
 #, c-format
 msgid ""
 "Invalid out filter %d for link channels found in compound effect %s, line "
 "%d\n"
 msgstr ""
 
-#: src/effects-weed.c:5623
+#: src/effects-weed.c:5611
 #, c-format
 msgid ""
 "Invalid out channel %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5633
+#: src/effects-weed.c:5622
 #, c-format
 msgid ""
 "Invalid in filter %d for link channels found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5651
+#: src/effects-weed.c:5641
 #, c-format
 msgid ""
 "Invalid in channel %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5687
+#: src/effects-weed.c:5678
 #, c-format
 msgid "Compound:%s"
 msgstr ""
 
-#: src/effects-weed.c:5758
+#: src/effects-weed.c:5749
 #, c-format
 msgid "Successfully loaded %d compound filters\n"
 msgstr ""
 
-#: src/effects-weed.c:6591
+#: src/effects-weed.c:6570
 #, c-format
 msgid "Effect %s cannot be used with this audio player.\n"
 msgstr ""
 
-#: src/effects-weed.c:6737
+#: src/effects-weed.c:6718
 #, c-format
 msgid "Failed to start instance %s, error code %d\n"
 msgstr ""
 
-#: src/effects-weed.c:6814
+#: src/effects-weed.c:6797
 #, c-format
 msgid "Unable to start generator %s\n"
 msgstr ""
 
-#: src/effects-weed.c:7621
+#: src/effects-weed.c:7607
 #, c-format
 msgid "Failed to start generator %s\n"
 msgstr ""
 
-#: src/effects-weed.c:7718
+#: src/effects-weed.c:7701
 #, c-format
 msgid "Failed to start generator %s, error %d\n"
 msgstr ""
 
-#: src/effects-weed.c:9012
+#: src/effects-weed.c:8993
 #, c-format
 msgid "%s [unstable] (%s)"
 msgstr ""
 
-#: src/effects-data.c:3278
+#: src/effects-data.c:3234
 #, c-format
 msgid "ACTIVATE (%s)"
 msgstr ""
 
-#: src/effects-data.c:3548
+#: src/effects-data.c:3501
 msgid "ACTIVATE"
 msgstr ""
 
-#: src/effects-data.c:3876
+#: src/effects-data.c:3829
 #, c-format
 msgid "Key slot %d"
 msgstr ""
 
-#: src/effects-data.c:3998
+#: src/effects-data.c:3951
 msgid "Autoscale"
 msgstr ""
 
-#: src/effects-data.c:4089
+#: src/effects-data.c:4042
 msgid "Add another connection for this output parameter"
 msgstr ""
 
-#: src/effects-data.c:4102 src/effects-data.c:4151
+#: src/effects-data.c:4055 src/effects-data.c:4104
 msgid "Delete this connection"
 msgstr ""
 
-#: src/effects-data.c:4138
+#: src/effects-data.c:4091
 msgid "Add another connection for this output channel"
 msgstr ""
 
-#: src/effects-data.c:4223
+#: src/effects-data.c:4176
 msgid "Connected to -->"
 msgstr ""
 
-#: src/effects-data.c:4243
+#: src/effects-data.c:4196
 #, c-format
 msgid "%s - Alpha Channel Connections"
 msgstr ""
 
-#: src/effects-data.c:4316
+#: src/effects-data.c:4269
 #, c-format
 msgid "%s - Parameter Data Connections"
 msgstr ""
 
-#: src/effects-data.c:4336
+#: src/effects-data.c:4289
 msgid "Autoscale All"
 msgstr ""
 
-#: src/effects-data.c:4361 src/effects-data.c:4890
+#: src/effects-data.c:4314 src/effects-data.c:4841
 msgid "ACTIVATED"
 msgstr ""
 
-#: src/effects-data.c:4774
+#: src/effects-data.c:4726
 msgid "LiVES: - Parameter and Alpha Channel Connections"
 msgstr ""
 
-#: src/effects-data.c:4785
+#: src/effects-data.c:4736
 msgid "Auto Connect Channels"
 msgstr ""
 
-#: src/effects-data.c:4797
+#: src/effects-data.c:4748
 msgid "Auto Connect Parameters"
 msgstr ""
 
-#: src/effects-data.c:4807
+#: src/effects-data.c:4758
 msgid "Disconnect All"
 msgstr ""
 
-#: src/effects-data.c:4875
+#: src/effects-data.c:4826
 #, c-format
 msgid "Input channel is already connected from (%d,%d) %s"
 msgstr ""
 
-#: src/effects-data.c:4891
+#: src/effects-data.c:4842
 #, c-format
 msgid "Input parameter is already connected from (%d,%d) %s"
 msgstr ""
 
-#: src/effects-data.c:4899
+#: src/effects-data.c:4851
 msgid "Input and output parameters are not compatible"
 msgstr ""
 
@@ -5633,43 +5645,43 @@
 msgid "_Reset Values"
 msgstr ""
 
-#: src/framedraw.c:267
+#: src/framedraw.c:265
 msgid "_Frame"
 msgstr ""
 
-#: src/paramspecial.c:266
+#: src/paramspecial.c:259
 msgid "Maintain _Aspect Ratio"
 msgstr ""
 
-#: src/paramspecial.c:267
+#: src/paramspecial.c:260
 msgid "Maintain aspect ratio of original frame"
 msgstr ""
 
-#: src/paramspecial.c:341
+#: src/paramspecial.c:335
 msgid "Display Password"
 msgstr ""
 
-#: src/paramwindow.c:450
+#: src/paramwindow.c:447
 msgid "Transition _In"
 msgstr ""
 
-#: src/paramwindow.c:452
+#: src/paramwindow.c:449
 msgid "Click to set the transition parameter to show only the front frame"
 msgstr ""
 
-#: src/paramwindow.c:474
+#: src/paramwindow.c:472
 msgid "Crossfade audio"
 msgstr ""
 
-#: src/paramwindow.c:475
+#: src/paramwindow.c:473
 msgid "Check the box to make audio transition with the video"
 msgstr ""
 
-#: src/paramwindow.c:493
+#: src/paramwindow.c:492
 msgid "Transition _Out"
 msgstr ""
 
-#: src/paramwindow.c:495
+#: src/paramwindow.c:494
 msgid "Click to set the transition parameter to show only the rear frame"
 msgstr ""
 
@@ -5682,23 +5694,23 @@
 msgid "%s : size"
 msgstr ""
 
-#: src/paramwindow.c:598
+#: src/paramwindow.c:597
 msgid "New size (pixels)"
 msgstr ""
 
-#: src/paramwindow.c:617 src/plugins.c:997
+#: src/paramwindow.c:616 src/plugins.c:973
 msgid "_Width"
 msgstr ""
 
-#: src/paramwindow.c:636 src/plugins.c:1003
+#: src/paramwindow.c:635 src/plugins.c:979
 msgid "_Height"
 msgstr ""
 
-#: src/paramwindow.c:684
+#: src/paramwindow.c:683
 msgid "Generate to _Clipboard"
 msgstr ""
 
-#: src/paramwindow.c:686
+#: src/paramwindow.c:685
 msgid "Generate frames to the clipboard"
 msgstr ""
 
@@ -5710,7 +5722,7 @@
 msgid "Generate frames to a new clip"
 msgstr ""
 
-#: src/paramwindow.c:822
+#: src/paramwindow.c:824
 #, c-format
 msgid ""
 "\n"
@@ -5718,71 +5730,71 @@
 "\n"
 msgstr ""
 
-#: src/paramwindow.c:920 src/paramwindow.c:930
+#: src/paramwindow.c:934 src/paramwindow.c:942
 msgid "Set as default"
 msgstr ""
 
-#: src/paramwindow.c:922 src/paramwindow.c:938
+#: src/paramwindow.c:936 src/paramwindow.c:950
 msgid "Reset"
 msgstr ""
 
-#: src/paramwindow.c:932 src/rte_window.c:2401 src/omc-learn.c:1357
+#: src/paramwindow.c:944 src/rte_window.c:2394 src/omc-learn.c:1347
 msgid "Close _window"
 msgstr ""
 
-#: src/paramwindow.c:1337
+#: src/paramwindow.c:1340
 msgid "No parameters"
 msgstr ""
 
-#: src/paramwindow.c:1419
+#: src/paramwindow.c:1424
 msgid "Invalid parameter"
 msgstr ""
 
-#: src/paramwindow.c:1611
+#: src/paramwindow.c:1610
 msgid "LiVES: - Select Colour"
 msgstr ""
 
-#: src/paramwindow.c:1616
+#: src/paramwindow.c:1615
 msgid "Click to set the colour"
 msgstr ""
 
-#: src/paramwindow.c:1628
+#: src/paramwindow.c:1626
 msgid "_Red"
 msgstr ""
 
-#: src/paramwindow.c:1629
+#: src/paramwindow.c:1627
 msgid "The red value (0 - 255)"
 msgstr ""
 
-#: src/paramwindow.c:1632
+#: src/paramwindow.c:1630
 msgid "_Green"
 msgstr ""
 
-#: src/paramwindow.c:1633
+#: src/paramwindow.c:1631
 msgid "The green value (0 - 255)"
 msgstr ""
 
-#: src/paramwindow.c:1636
+#: src/paramwindow.c:1634
 msgid "_Blue"
 msgstr ""
 
-#: src/paramwindow.c:1637
+#: src/paramwindow.c:1635
 msgid "The blue value (0 - 255)"
 msgstr ""
 
-#: src/plugins.c:85
+#: src/plugins.c:86
 #, c-format
 msgid ""
 "\n"
 "Plugin error: %s failed with code %d"
 msgstr ""
 
-#: src/plugins.c:87
+#: src/plugins.c:88
 #, c-format
 msgid " : message was %s\n"
 msgstr ""
 
-#: src/plugins.c:387
+#: src/plugins.c:375
 #, c-format
 msgid ""
 "\n"
@@ -5792,17 +5804,17 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/plugins.c:397
+#: src/plugins.c:385
 #, c-format
 msgid "Updating video playback plugin defaults in %s\n"
 msgstr ""
 
-#: src/plugins.c:452
+#: src/plugins.c:444
 #, c-format
 msgid "Loading video playback plugin defaults from %s..."
 msgstr ""
 
-#: src/plugins.c:515
+#: src/plugins.c:505
 #, c-format
 msgid ""
 "\n"
@@ -5812,32 +5824,32 @@
 "\n"
 msgstr ""
 
-#: src/plugins.c:855
+#: src/plugins.c:836
 #, c-format
 msgid "Saving playback plugin defaults to %s..."
 msgstr ""
 
-#: src/plugins.c:962
+#: src/plugins.c:939
 msgid "_FPS"
 msgstr ""
 
-#: src/plugins.c:963
+#: src/plugins.c:940
 msgid "Fixed framerate for plugin.\n"
 msgstr ""
 
-#: src/plugins.c:1032
+#: src/plugins.c:1008
 msgid "_Colourspace"
 msgstr ""
 
-#: src/plugins.c:1033
+#: src/plugins.c:1009
 msgid "Colourspace input to the plugin.\n"
 msgstr ""
 
-#: src/plugins.c:1089
+#: src/plugins.c:1065
 msgid "Save settings to an alternate file.\n"
 msgstr ""
 
-#: src/plugins.c:1206
+#: src/plugins.c:1182
 #, c-format
 msgid ""
 "\n"
@@ -5846,7 +5858,7 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/plugins.c:1252
+#: src/plugins.c:1228
 #, c-format
 msgid ""
 "\n"
@@ -5856,38 +5868,38 @@
 "Unable to use it.\n"
 msgstr ""
 
-#: src/plugins.c:1265
+#: src/plugins.c:1241
 #, c-format
 msgid ""
 "Video playback plugin failed to initialise.\n"
 "Error was: %s\n"
 msgstr ""
 
-#: src/plugins.c:1461
+#: src/plugins.c:1428
 msgid ""
 "\n"
 "Warning ! Video playback plugin will not send key presses. Keyboard may be "
 "disabled during plugin use !\n"
 msgstr ""
 
-#: src/plugins.c:1465
+#: src/plugins.c:1433
 #, c-format
 msgid ""
 "*** Using %s plugin for fs playback, agreed to use palette type %d ( %s ). "
 "***\n"
 msgstr ""
 
-#: src/plugins.c:1571
+#: src/plugins.c:1537
 #, c-format
 msgid "Audio stream unable to use preferred format '%s'\n"
 msgstr ""
 
-#: src/plugins.c:1579
+#: src/plugins.c:1543
 #, c-format
 msgid "Using format '%s' instead.\n"
 msgstr ""
 
-#: src/plugins.c:1616
+#: src/plugins.c:1579
 #, c-format
 msgid ""
 "LiVES was unable to find its encoder plugins. Please make sure you have the "
@@ -5896,7 +5908,7 @@
 "or change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/plugins.c:1624
+#: src/plugins.c:1589
 #, c-format
 msgid ""
 "LiVES did not receive a response from the encoder plugin called '%s'.\n"
@@ -5905,11 +5917,11 @@
 "or switch to another plugin using Tools|Preferences|Encoding\n"
 msgstr ""
 
-#: src/plugins.c:2032
+#: src/plugins.c:1987
 msgid "Unable to resize, please install imageMagick\n"
 msgstr ""
 
-#: src/plugins.c:2231
+#: src/plugins.c:2183
 #, c-format
 msgid ""
 "\n"
@@ -5917,12 +5929,12 @@
 "No decoders found in %s !\n"
 msgstr ""
 
-#: src/plugins.c:2415
+#: src/plugins.c:2369
 #, c-format
 msgid " using %s"
 msgstr ""
 
-#: src/plugins.c:2499
+#: src/plugins.c:2451
 #, c-format
 msgid ""
 "\n"
@@ -5931,7 +5943,7 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/plugins.c:2522
+#: src/plugins.c:2472
 #, c-format
 msgid ""
 "\n"
@@ -5941,24 +5953,24 @@
 "Unable to use it.\n"
 msgstr ""
 
-#: src/plugins.c:2564
+#: src/plugins.c:2512
 msgid "/unknown"
 msgstr ""
 
-#: src/plugins.c:2651
+#: src/plugins.c:2598
 msgid "LiVES: - Decoder Plugins"
 msgstr ""
 
-#: src/plugins.c:2669
+#: src/plugins.c:2616
 msgid "Enabled Video Decoders (uncheck to disable)"
 msgstr ""
 
-#: src/plugins.c:2726
+#: src/plugins.c:2672
 #, c-format
 msgid "Failed to load %s, transitions may not resize.\n"
 msgstr ""
 
-#: src/plugins.c:3854
+#: src/plugins.c:3797
 #, c-format
 msgid "%s advanced settings"
 msgstr ""
@@ -5967,15 +5979,15 @@
 msgid "LiVES: - New Test RFX"
 msgstr ""
 
-#: src/rfx-builder.c:136
+#: src/rfx-builder.c:135
 msgid "LiVES: - Edit Test RFX"
 msgstr ""
 
-#: src/rfx-builder.c:166
+#: src/rfx-builder.c:165
 msgid "Type:"
 msgstr ""
 
-#: src/rfx-builder.c:184
+#: src/rfx-builder.c:183
 msgid "tool"
 msgstr ""
 
@@ -5987,130 +5999,130 @@
 msgid "The name of the plugin. No spaces allowed."
 msgstr ""
 
-#: src/rfx-builder.c:201
+#: src/rfx-builder.c:202
 msgid "Version:       "
 msgstr ""
 
-#: src/rfx-builder.c:203
+#: src/rfx-builder.c:204
 msgid "The script version."
 msgstr ""
 
-#: src/rfx-builder.c:210
+#: src/rfx-builder.c:212
 msgid "    Author:       "
 msgstr ""
 
-#: src/rfx-builder.c:211
+#: src/rfx-builder.c:213
 msgid "The script author."
 msgstr ""
 
-#: src/rfx-builder.c:217
+#: src/rfx-builder.c:220
 msgid "    URL (optional):       "
 msgstr ""
 
-#: src/rfx-builder.c:218
+#: src/rfx-builder.c:221
 msgid "URL for the plugin maintainer."
 msgstr ""
 
-#: src/rfx-builder.c:226
+#: src/rfx-builder.c:230
 msgid "Menu text:    "
 msgstr ""
 
-#: src/rfx-builder.c:227
+#: src/rfx-builder.c:231
 msgid "The text to show in the menu."
 msgstr ""
 
-#: src/rfx-builder.c:239
+#: src/rfx-builder.c:244
 msgid "Action description:        "
 msgstr ""
 
-#: src/rfx-builder.c:241
+#: src/rfx-builder.c:246
 msgid "Describe what the plugin is doing. E.g. \"Edge detecting\""
 msgstr ""
 
-#: src/rfx-builder.c:246
+#: src/rfx-builder.c:251
 msgid "Minimum frames:"
 msgstr ""
 
-#: src/rfx-builder.c:249
+#: src/rfx-builder.c:254
 msgid ""
 "Minimum number of frames this effect/tool can be applied to. Normally 1."
 msgstr ""
 
-#: src/rfx-builder.c:260
+#: src/rfx-builder.c:265
 msgid "_Requirements..."
 msgstr ""
 
-#: src/rfx-builder.c:263
+#: src/rfx-builder.c:268
 msgid "Enter any binaries required by the plugin."
 msgstr ""
 
-#: src/rfx-builder.c:267
+#: src/rfx-builder.c:272
 msgid "_Properties..."
 msgstr ""
 
-#: src/rfx-builder.c:270
+#: src/rfx-builder.c:275
 msgid "Set properties for the plugin. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:274
+#: src/rfx-builder.c:279
 msgid "_Parameters..."
 msgstr ""
 
-#: src/rfx-builder.c:277
+#: src/rfx-builder.c:282
 msgid "Set up parameters used in pre/loop/post/trigger code. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:281
+#: src/rfx-builder.c:286
 msgid "Parameter _Window Hints..."
 msgstr ""
 
-#: src/rfx-builder.c:284
+#: src/rfx-builder.c:289
 msgid "Set hints about how to lay out the parameter window. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:290
+#: src/rfx-builder.c:295
 msgid "_Language code:"
 msgstr ""
 
-#: src/rfx-builder.c:291
+#: src/rfx-builder.c:296
 msgid "Language for pre/loop/post/triggers. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:300
+#: src/rfx-builder.c:305
 msgid "_Pre loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:303
+#: src/rfx-builder.c:308
 msgid "Code to be executed before the loop. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:307
+#: src/rfx-builder.c:312
 msgid "_Loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:310
+#: src/rfx-builder.c:315
 msgid "Loop code to be applied to each frame."
 msgstr ""
 
-#: src/rfx-builder.c:314
+#: src/rfx-builder.c:319
 msgid "_Post loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:317
+#: src/rfx-builder.c:322
 msgid "Code to be executed after the loop. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:321
+#: src/rfx-builder.c:326
 msgid "_Trigger code..."
 msgstr ""
 
-#: src/rfx-builder.c:324
+#: src/rfx-builder.c:329
 msgid ""
 "Set trigger code for when the parameter window is shown, or when a parameter "
 "is changed. Optional (except for Utilities)."
 msgstr ""
 
-#: src/rfx-builder.c:421
+#: src/rfx-builder.c:426
 #, c-format
 msgid ""
 "\n"
@@ -6120,55 +6132,55 @@
 "%s\n"
 msgstr ""
 
-#: src/rfx-builder.c:544
+#: src/rfx-builder.c:541
 msgid "LiVES: - RFX Requirements"
 msgstr ""
 
-#: src/rfx-builder.c:548
+#: src/rfx-builder.c:544
 msgid "LiVES: - RFX Parameters"
 msgstr ""
 
-#: src/rfx-builder.c:552
+#: src/rfx-builder.c:547
 msgid "LiVES: - RFX Parameter Window Hints"
 msgstr ""
 
-#: src/rfx-builder.c:556
+#: src/rfx-builder.c:550
 msgid "LiVES: - RFX Triggers"
 msgstr ""
 
-#: src/rfx-builder.c:622
+#: src/rfx-builder.c:613
 msgid "_New Entry"
 msgstr ""
 
-#: src/rfx-builder.c:625
+#: src/rfx-builder.c:616
 msgid "_Edit Entry"
 msgstr ""
 
-#: src/rfx-builder.c:628
+#: src/rfx-builder.c:619
 msgid "_Remove Entry"
 msgstr ""
 
-#: src/rfx-builder.c:632
+#: src/rfx-builder.c:623
 msgid "Move _Up"
 msgstr ""
 
-#: src/rfx-builder.c:635
+#: src/rfx-builder.c:626
 msgid "Move _Down"
 msgstr ""
 
-#: src/rfx-builder.c:1004
+#: src/rfx-builder.c:984
 msgid "LiVES: - RFX Properties"
 msgstr ""
 
-#: src/rfx-builder.c:1013
+#: src/rfx-builder.c:993
 msgid "_Slow (hint to GUI)"
 msgstr ""
 
-#: src/rfx-builder.c:1024
+#: src/rfx-builder.c:1004
 msgid "_Batch mode generator"
 msgstr ""
 
-#: src/rfx-builder.c:1831
+#: src/rfx-builder.c:1790
 msgid ""
 "\n"
 "\n"
@@ -6177,7 +6189,7 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:1875
+#: src/rfx-builder.c:1834
 msgid ""
 "\n"
 "\n"
@@ -6185,219 +6197,219 @@
 "Please check the trigger code.\n"
 msgstr ""
 
-#: src/rfx-builder.c:1994
+#: src/rfx-builder.c:1950
 msgid "LiVES: - New RFX Parameter"
 msgstr ""
 
-#: src/rfx-builder.c:1997
+#: src/rfx-builder.c:1952
 msgid "LiVES: - Edit RFX Parameter"
 msgstr ""
 
-#: src/rfx-builder.c:2013
+#: src/rfx-builder.c:1968
 msgid "_Name:    "
 msgstr ""
 
-#: src/rfx-builder.c:2016
+#: src/rfx-builder.c:1971
 msgid "Name of the parameter, must be unique in the plugin."
 msgstr ""
 
-#: src/rfx-builder.c:2025
+#: src/rfx-builder.c:1981
 msgid "_Label:    "
 msgstr ""
 
-#: src/rfx-builder.c:2028
+#: src/rfx-builder.c:1984
 msgid ""
 "Label to be shown by the parameter. An underscore represents mnemonic "
 "accelerator."
 msgstr ""
 
-#: src/rfx-builder.c:2039
+#: src/rfx-builder.c:1996
 msgid "_Type:         "
 msgstr ""
 
-#: src/rfx-builder.c:2040
+#: src/rfx-builder.c:1997
 msgid "Parameter type (select from list)."
 msgstr ""
 
-#: src/rfx-builder.c:2073
+#: src/rfx-builder.c:2029
 msgid "Decimal _places: "
 msgstr ""
 
-#: src/rfx-builder.c:2082 src/rfx-builder.c:2477 src/rfx-builder.c:2495
+#: src/rfx-builder.c:2038 src/rfx-builder.c:2430 src/rfx-builder.c:2447
 msgid "_Default value:    "
 msgstr ""
 
-#: src/rfx-builder.c:2098
+#: src/rfx-builder.c:2054
 msgid "_Default: "
 msgstr ""
 
-#: src/rfx-builder.c:2132
+#: src/rfx-builder.c:2087
 msgid "Button _Group: "
 msgstr ""
 
-#: src/rfx-builder.c:2134
+#: src/rfx-builder.c:2089
 msgid "A non-zero value can be used to group radio buttons."
 msgstr ""
 
-#: src/rfx-builder.c:2142 src/rfx-builder.c:2478
+#: src/rfx-builder.c:2097 src/rfx-builder.c:2431
 msgid "_Minimum value: "
 msgstr ""
 
-#: src/rfx-builder.c:2148 src/rfx-builder.c:2479
+#: src/rfx-builder.c:2103 src/rfx-builder.c:2432
 msgid "Ma_ximum value: "
 msgstr ""
 
-#: src/rfx-builder.c:2157
+#: src/rfx-builder.c:2113
 msgid "     _Step size:   "
 msgstr ""
 
-#: src/rfx-builder.c:2160
+#: src/rfx-builder.c:2117
 msgid ""
 "How much the parameter is adjusted when the spinbutton arrows are pressed."
 msgstr ""
 
-#: src/rfx-builder.c:2171
+#: src/rfx-builder.c:2129
 msgid "_Wrap value"
 msgstr ""
 
-#: src/rfx-builder.c:2172
+#: src/rfx-builder.c:2131
 msgid "Whether the value wraps max->min and min->max."
 msgstr ""
 
-#: src/rfx-builder.c:2470
+#: src/rfx-builder.c:2424
 msgid "Set _values"
 msgstr ""
 
-#: src/rfx-builder.c:2512
+#: src/rfx-builder.c:2463
 msgid "Default _Red:  "
 msgstr ""
 
-#: src/rfx-builder.c:2513
+#: src/rfx-builder.c:2464
 msgid "Default _Green:"
 msgstr ""
 
-#: src/rfx-builder.c:2514
+#: src/rfx-builder.c:2465
 msgid "Default _Blue: "
 msgstr ""
 
-#: src/rfx-builder.c:2538
+#: src/rfx-builder.c:2488
 msgid "Set _default"
 msgstr ""
 
-#: src/rfx-builder.c:2540
+#: src/rfx-builder.c:2490
 msgid "Default value:  "
 msgstr ""
 
-#: src/rfx-builder.c:2541
+#: src/rfx-builder.c:2491
 msgid "Maximum length (chars): "
 msgstr ""
 
-#: src/rfx-builder.c:2576
+#: src/rfx-builder.c:2526
 msgid "LiVES: - New RFX Parameter Window Hint"
 msgstr ""
 
-#: src/rfx-builder.c:2579
+#: src/rfx-builder.c:2528
 msgid "LiVES: - Edit RFX Parameter Window Hint"
 msgstr ""
 
-#: src/rfx-builder.c:2622
+#: src/rfx-builder.c:2569
 msgid "_Keyword:         "
 msgstr ""
 
-#: src/rfx-builder.c:2639
+#: src/rfx-builder.c:2586
 msgid "Special _Type:         "
 msgstr ""
 
-#: src/rfx-builder.c:2656
+#: src/rfx-builder.c:2602
 msgid "Special _Subtype:         "
 msgstr ""
 
-#: src/rfx-builder.c:2667 src/rfx-builder.c:2706
+#: src/rfx-builder.c:2613 src/rfx-builder.c:2651
 msgid "Row:    "
 msgstr ""
 
-#: src/rfx-builder.c:2732
+#: src/rfx-builder.c:2676
 #, c-format
 msgid "Linked parameters (%d):    "
 msgstr ""
 
-#: src/rfx-builder.c:2749
+#: src/rfx-builder.c:2693
 msgid "Linked parameters (4):    "
 msgstr ""
 
-#: src/rfx-builder.c:2752
+#: src/rfx-builder.c:2695
 msgid "Linked parameters (2):    "
 msgstr ""
 
-#: src/rfx-builder.c:2777
+#: src/rfx-builder.c:2720
 msgid "LiVES: - New RFX Trigger"
 msgstr ""
 
-#: src/rfx-builder.c:2780
+#: src/rfx-builder.c:2722
 msgid "LiVES: - Edit RFX Trigger"
 msgstr ""
 
-#: src/rfx-builder.c:2808
+#: src/rfx-builder.c:2750
 msgid "When:         "
 msgstr ""
 
-#: src/rfx-builder.c:2904
+#: src/rfx-builder.c:2846
 msgid "LiVES: - Pre Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:2911
+#: src/rfx-builder.c:2853
 msgid "LiVES: - Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:2918
+#: src/rfx-builder.c:2860
 msgid "LiVES: - Post Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:2931
+#: src/rfx-builder.c:2873
 #, c-format
 msgid "LiVES: - Default text (max length %d)"
 msgstr ""
 
-#: src/rfx-builder.c:2944
+#: src/rfx-builder.c:2885
 msgid "LiVES: - Enter values, one per line"
 msgstr ""
 
-#: src/rfx-builder.c:3055
+#: src/rfx-builder.c:2996
 msgid ""
 "\n"
 "\n"
 "Name must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3060
+#: src/rfx-builder.c:3001
 msgid ""
 "\n"
 "\n"
 "Name must not contain spaces.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3065
+#: src/rfx-builder.c:3006
 msgid ""
 "\n"
 "\n"
 "Menu text must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3071
+#: src/rfx-builder.c:3012
 msgid ""
 "\n"
 "\n"
 "Action description must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3076
+#: src/rfx-builder.c:3017
 msgid ""
 "\n"
 "\n"
 "Author must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3085 src/rfx-builder.c:4339
+#: src/rfx-builder.c:3026 src/rfx-builder.c:4253
 msgid ""
 "\n"
 "\n"
@@ -6405,28 +6417,28 @@
 "Name must be unique.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3092
+#: src/rfx-builder.c:3033
 msgid ""
 "\n"
 "\n"
 "Loop code should not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3098
+#: src/rfx-builder.c:3039
 msgid ""
 "\n"
 "\n"
 "Trigger code should not be blank for a utility.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3111
+#: src/rfx-builder.c:3052
 msgid ""
 "\n"
 "\n"
 "Parameter name must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3117
+#: src/rfx-builder.c:3058
 msgid ""
 "\n"
 "\n"
@@ -6435,41 +6447,41 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:3171
+#: src/rfx-builder.c:3111
 #, c-format
 msgid "Writing script file %s..."
 msgstr ""
 
-#: src/rfx-builder.c:3477
+#: src/rfx-builder.c:3411
 msgid "No <define> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3484 src/rfx-builder.c:3493
+#: src/rfx-builder.c:3418 src/rfx-builder.c:3427
 msgid "Bad script version.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3505
+#: src/rfx-builder.c:3439
 msgid "No <name> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3513
+#: src/rfx-builder.c:3447
 msgid "No <version> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3522
+#: src/rfx-builder.c:3456
 msgid "No <author> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3536
+#: src/rfx-builder.c:3470
 msgid "No <description> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3540
+#: src/rfx-builder.c:3474
 #, c-format
 msgid "Bad description. (%s)\n"
 msgstr ""
 
-#: src/rfx-builder.c:3702
+#: src/rfx-builder.c:3627
 #, c-format
 msgid ""
 "\n"
@@ -6479,27 +6491,27 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:3859
+#: src/rfx-builder.c:3780
 msgid "Rebuilding all RFX scripts...builtin..."
 msgstr ""
 
-#: src/rfx-builder.c:3860
+#: src/rfx-builder.c:3781
 msgid "Rebuilding scripts"
 msgstr ""
 
-#: src/rfx-builder.c:3868
+#: src/rfx-builder.c:3789
 msgid "custom..."
 msgstr ""
 
-#: src/rfx-builder.c:3872
+#: src/rfx-builder.c:3793
 msgid "test..."
 msgstr ""
 
-#: src/rfx-builder.c:3878
+#: src/rfx-builder.c:3799
 msgid "rebuilding dynamic menu entries..."
 msgstr ""
 
-#: src/rfx-builder.c:3905 src/rfx-builder.c:3912
+#: src/rfx-builder.c:3826 src/rfx-builder.c:3834
 #, c-format
 msgid ""
 "\n"
@@ -6508,7 +6520,7 @@
 "Please check this program is in your path and executable.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3951
+#: src/rfx-builder.c:3874
 #, c-format
 msgid ""
 "\n"
@@ -6518,12 +6530,12 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:3960
+#: src/rfx-builder.c:3884
 #, c-format
 msgid "Deleting rfx script %s..."
 msgstr ""
 
-#: src/rfx-builder.c:3980
+#: src/rfx-builder.c:3902
 #, c-format
 msgid ""
 "\n"
@@ -6533,7 +6545,7 @@
 "Error code was %d\n"
 msgstr ""
 
-#: src/rfx-builder.c:4016
+#: src/rfx-builder.c:3938
 #, c-format
 msgid ""
 "\n"
@@ -6543,12 +6555,12 @@
 "Please delete it first, or rename the test script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4027
+#: src/rfx-builder.c:3950
 #, c-format
 msgid "Promoting rfx test plugin %s to custom..."
 msgstr ""
 
-#: src/rfx-builder.c:4044
+#: src/rfx-builder.c:3965
 #, c-format
 msgid ""
 "\n"
@@ -6559,20 +6571,20 @@
 "Return code was %d (%s)\n"
 msgstr ""
 
-#: src/rfx-builder.c:4070
+#: src/rfx-builder.c:3990
 msgid "LiVES: - Export Script to..."
 msgstr ""
 
-#: src/rfx-builder.c:4077 src/rfx-builder.c:4156
+#: src/rfx-builder.c:3997 src/rfx-builder.c:4074
 #, c-format
 msgid "Copying %s to %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4105
+#: src/rfx-builder.c:4024
 msgid "LiVES: Import Script from..."
 msgstr ""
 
-#: src/rfx-builder.c:4148
+#: src/rfx-builder.c:4067
 #, c-format
 msgid ""
 "\n"
@@ -6582,43 +6594,43 @@
 "Please delete it first, or rename the import script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4249
+#: src/rfx-builder.c:4166
 msgid "LiVES: - Copy RFX Script"
 msgstr ""
 
-#: src/rfx-builder.c:4251
+#: src/rfx-builder.c:4168
 msgid "_From type:    "
 msgstr ""
 
-#: src/rfx-builder.c:4258
+#: src/rfx-builder.c:4175
 msgid "   Script:    "
 msgstr ""
 
-#: src/rfx-builder.c:4267
+#: src/rfx-builder.c:4183
 msgid "LiVES: - Rename test RFX Script"
 msgstr ""
 
-#: src/rfx-builder.c:4268
+#: src/rfx-builder.c:4184
 msgid "From script: "
 msgstr ""
 
-#: src/rfx-builder.c:4273
+#: src/rfx-builder.c:4188
 msgid "LiVES: - RFX Script name"
 msgstr ""
 
-#: src/rfx-builder.c:4274
+#: src/rfx-builder.c:4189
 msgid "Script name: "
 msgstr ""
 
-#: src/rfx-builder.c:4294
+#: src/rfx-builder.c:4209
 msgid "New name: "
 msgstr ""
 
-#: src/rfx-builder.c:4297
+#: src/rfx-builder.c:4212
 msgid "New script name: "
 msgstr ""
 
-#: src/rfx-builder.c:4372
+#: src/rfx-builder.c:4286
 msgid ""
 "\n"
 "\n"
@@ -6626,12 +6638,12 @@
 "Script name must be unique.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4384
+#: src/rfx-builder.c:4297
 #, c-format
 msgid "Renaming RFX test script %s to %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4390
+#: src/rfx-builder.c:4302
 #, c-format
 msgid ""
 "\n"
@@ -6642,21 +6654,21 @@
 "Return code was %d\n"
 msgstr ""
 
-#: src/rfx-builder.c:4610
+#: src/rfx-builder.c:4518
 msgid "_Apply Real Time Effects to Selection"
 msgstr ""
 
-#: src/rfx-builder.c:4664
+#: src/rfx-builder.c:4572
 #, c-format
 msgid "Loading rendered effect %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4766
+#: src/rfx-builder.c:4674
 msgid ""
 "See: VJ - show VJ keys. Set the realtime effects, and then apply them here."
 msgstr ""
 
-#: src/preferences.c:359
+#: src/preferences.c:351
 msgid ""
 "\n"
 "\n"
@@ -6664,7 +6676,7 @@
 "full screen, separate window (fs) mode\n"
 msgstr ""
 
-#: src/preferences.c:408
+#: src/preferences.c:400
 msgid ""
 "\n"
 "\n"
@@ -6672,7 +6684,7 @@
 "(Free space = UNKNOWN)"
 msgstr ""
 
-#: src/preferences.c:412
+#: src/preferences.c:403
 #, c-format
 msgid ""
 "\n"
@@ -6681,14 +6693,14 @@
 "(Free space = %s)"
 msgstr ""
 
-#: src/preferences.c:416
+#: src/preferences.c:408
 msgid ""
 "The temp directory is LiVES working directory where opened clips and sets "
 "are stored.\n"
 "It should be in a partition with plenty of free disk space.\n"
 msgstr ""
 
-#: src/preferences.c:784
+#: src/preferences.c:839
 #, c-format
 msgid ""
 "Unable to create or write to the new temporary directory.\n"
@@ -6699,7 +6711,7 @@
 "The directory will not be changed now.\n"
 msgstr ""
 
-#: src/preferences.c:786
+#: src/preferences.c:843
 #, c-format
 msgid ""
 "Unable to create or write to the new temporary directory.\n"
@@ -6709,7 +6721,7 @@
 "The directory will not be changed now.\n"
 msgstr ""
 
-#: src/preferences.c:798
+#: src/preferences.c:856
 msgid ""
 "You have chosen to change the temporary directory.\n"
 "Please make sure you have no other copies of LiVES open.\n"
@@ -6721,20 +6733,20 @@
 "original setting."
 msgstr ""
 
-#: src/preferences.c:1169
+#: src/preferences.c:1221
 msgid ""
 "\n"
 "Unable to switch audio players to jack - jackd must be installed first.\n"
 "See http://jackaudio.org\n"
 msgstr ""
 
-#: src/preferences.c:1175
+#: src/preferences.c:1226
 msgid ""
 "\n"
 "Switching audio players requires restart (jackd must not be running)\n"
 msgstr ""
 
-#: src/preferences.c:1202
+#: src/preferences.c:1253
 msgid ""
 "\n"
 "Unable to switch audio players to pulse audio\n"
@@ -6742,814 +6754,814 @@
 "See http://www.pulseaudio.org\n"
 msgstr ""
 
-#: src/preferences.c:1502
+#: src/preferences.c:1544
 msgid "PCM (highest quality; largest files)"
 msgstr ""
 
-#: src/preferences.c:2063
+#: src/preferences.c:2096
 msgid "LiVES: - Preferences"
 msgstr ""
 
-#: src/preferences.c:2142
+#: src/preferences.c:2177
 msgid "Open file selection maximised"
 msgstr ""
 
-#: src/preferences.c:2149
+#: src/preferences.c:2184
 msgid "Show recent files in the File menu"
 msgstr ""
 
-#: src/preferences.c:2158
+#: src/preferences.c:2193
 msgid "Stop screensaver on playback    "
 msgstr ""
 
-#: src/preferences.c:2165
+#: src/preferences.c:2200
 msgid "Open main window maximised"
 msgstr ""
 
-#: src/preferences.c:2173
+#: src/preferences.c:2208
 msgid "Show toolbar when background is blanked"
 msgstr ""
 
-#: src/preferences.c:2181
+#: src/preferences.c:2216
 msgid "Allow mouse wheel to switch clips"
 msgstr ""
 
-#: src/preferences.c:2192
+#: src/preferences.c:2227
 msgid "Shrink previews to fit in interface"
 msgstr ""
 
-#: src/preferences.c:2202
+#: src/preferences.c:2237
 msgid "Startup mode:"
 msgstr ""
 
-#: src/preferences.c:2206
+#: src/preferences.c:2241
 msgid "_Clip editor"
 msgstr ""
 
-#: src/preferences.c:2210
+#: src/preferences.c:2245
 msgid "_Multitrack mode"
 msgstr ""
 
-#: src/preferences.c:2234
+#: src/preferences.c:2268
 msgid "Multi-head support"
 msgstr ""
 
-#: src/preferences.c:2242
+#: src/preferences.c:2276
 msgid " monitor number for LiVES interface"
 msgstr ""
 
-#: src/preferences.c:2248
+#: src/preferences.c:2282
 msgid " monitor number for playback"
 msgstr ""
 
-#: src/preferences.c:2260
+#: src/preferences.c:2294
 msgid ""
 "A setting of 0 means use all available monitors (only works with some "
 "playback plugins)."
 msgstr ""
 
-#: src/preferences.c:2270
+#: src/preferences.c:2304
 msgid "Force single monitor"
 msgstr ""
 
-#: src/preferences.c:2271
+#: src/preferences.c:2305
 msgid "Ignore all except the first monitor."
 msgstr ""
 
-#: src/preferences.c:2293
+#: src/preferences.c:2327
 msgid "Show clip thumbnails during playback"
 msgstr ""
 
-#: src/preferences.c:2306
+#: src/preferences.c:2340
 msgid "GUI"
 msgstr ""
 
-#: src/preferences.c:2321
+#: src/preferences.c:2355
 msgid "When entering Multitrack mode:"
 msgstr ""
 
-#: src/preferences.c:2330
+#: src/preferences.c:2364
 msgid "_Prompt me for width, height, fps and audio settings"
 msgstr ""
 
-#: src/preferences.c:2336
+#: src/preferences.c:2370
 msgid "_Always use the following values:"
 msgstr ""
 
-#: src/preferences.c:2345
+#: src/preferences.c:2379
 msgid "Use these same _values for rendering a new clip"
 msgstr ""
 
-#: src/preferences.c:2370
+#: src/preferences.c:2404
 msgid "_Width           "
 msgstr ""
 
-#: src/preferences.c:2375
+#: src/preferences.c:2409
 msgid "          _Height      "
 msgstr ""
 
-#: src/preferences.c:2379
+#: src/preferences.c:2413
 msgid "          _FPS"
 msgstr ""
 
-#: src/preferences.c:2387
+#: src/preferences.c:2421
 msgid "Enable backing audio track"
 msgstr ""
 
-#: src/preferences.c:2394
+#: src/preferences.c:2428
 msgid "Audio track per video track"
 msgstr ""
 
-#: src/preferences.c:2423
+#: src/preferences.c:2457
 msgid "    _Undo buffer size (MB)    "
 msgstr ""
 
-#: src/preferences.c:2432
+#: src/preferences.c:2466
 msgid "_Exit multitrack mode after rendering"
 msgstr ""
 
-#: src/preferences.c:2440
+#: src/preferences.c:2474
 msgid "Auto backup layouts"
 msgstr ""
 
-#: src/preferences.c:2445
+#: src/preferences.c:2479
 msgid "_Every"
 msgstr ""
 
-#: src/preferences.c:2453
+#: src/preferences.c:2487
 msgid "seconds"
 msgstr ""
 
-#: src/preferences.c:2461
+#: src/preferences.c:2495
 msgid "After every _change"
 msgstr ""
 
-#: src/preferences.c:2467
+#: src/preferences.c:2501
 msgid "_Never"
 msgstr ""
 
-#: src/preferences.c:2490
+#: src/preferences.c:2523
 msgid "Multitrack/Render"
 msgstr ""
 
-#: src/preferences.c:2508
+#: src/preferences.c:2541
 msgid "Use instant opening when possible"
 msgstr ""
 
-#: src/preferences.c:2509
+#: src/preferences.c:2543
 msgid "Enable instant opening of some file types using decoder plugins"
 msgstr ""
 
-#: src/preferences.c:2531
+#: src/preferences.c:2567
 msgid "Video open command (fallback)"
 msgstr ""
 
-#: src/preferences.c:2543
+#: src/preferences.c:2579
 msgid "Open/render compression"
 msgstr ""
 
-#: src/preferences.c:2546
+#: src/preferences.c:2582
 msgid " %     ( lower = slower, larger files; for jpeg, higher quality )"
 msgstr ""
 
-#: src/preferences.c:2558
+#: src/preferences.c:2594
 msgid "Default image format"
 msgstr ""
 
-#: src/preferences.c:2562
+#: src/preferences.c:2598
 msgid "_jpeg"
 msgstr ""
 
-#: src/preferences.c:2565
+#: src/preferences.c:2601
 msgid "_png"
 msgstr ""
 
-#: src/preferences.c:2572
+#: src/preferences.c:2608
 msgid "(Check Help/Troubleshoot to see which image formats are supported)"
 msgstr ""
 
-#: src/preferences.c:2580
+#: src/preferences.c:2616
 msgid "Enable automatic deinterlacing when possible"
 msgstr ""
 
-#: src/preferences.c:2582
+#: src/preferences.c:2619
 msgid "Automatically deinterlace frames when a plugin suggests it"
 msgstr ""
 
-#: src/preferences.c:2593
+#: src/preferences.c:2632
 msgid "Automatic trimming / padding of audio when possible"
 msgstr ""
 
-#: src/preferences.c:2595
+#: src/preferences.c:2634
 msgid "Automatically trim or pad audio when a plugin suggests it"
 msgstr ""
 
-#: src/preferences.c:2606
+#: src/preferences.c:2646
 msgid "Ignore blank borders when possible"
 msgstr ""
 
-#: src/preferences.c:2608
+#: src/preferences.c:2648
 msgid "Clip any blank borders from frames where possible"
 msgstr ""
 
-#: src/preferences.c:2619
+#: src/preferences.c:2660
 msgid "When opening multiple files, concatenate images into one clip"
 msgstr ""
 
-#: src/preferences.c:2629
+#: src/preferences.c:2670
 msgid "Decoding"
 msgstr ""
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:2652
+#: src/preferences.c:2693
 msgid "Low - can improve performance on slower machines"
 msgstr ""
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:2654
+#: src/preferences.c:2695
 msgid "Normal - recommended for most users"
 msgstr ""
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:2656
+#: src/preferences.c:2697
 msgid "High - can improve quality on very fast machines"
 msgstr ""
 
-#: src/preferences.c:2659
+#: src/preferences.c:2700
 msgid "Preview _quality"
 msgstr ""
 
-#: src/preferences.c:2660
+#: src/preferences.c:2701
 msgid "The preview quality for video playback - affects resizing"
 msgstr ""
 
-#: src/preferences.c:2675
+#: src/preferences.c:2717
 msgid "_Show FPS statistics"
 msgstr ""
 
-#: src/preferences.c:2694
+#: src/preferences.c:2736
 msgid "_Plugin"
 msgstr ""
 
-#: src/preferences.c:2718
+#: src/preferences.c:2760
 msgid "Stream audio"
 msgstr ""
 
-#: src/preferences.c:2721
+#: src/preferences.c:2763
 msgid "Stream audio to playback plugin"
 msgstr ""
 
-#: src/preferences.c:2734
+#: src/preferences.c:2778
 msgid "Record player output"
 msgstr ""
 
-#: src/preferences.c:2737
+#: src/preferences.c:2781
 msgid "Record output from player instead of input to player"
 msgstr ""
 
-#: src/preferences.c:2744
+#: src/preferences.c:2789
 msgid "VIDEO"
 msgstr ""
 
-#: src/preferences.c:2787
+#: src/preferences.c:2833
 msgid "_Player"
 msgstr ""
 
-#: src/preferences.c:2792
+#: src/preferences.c:2838
 msgid "(See also the Jack Integration tab for jack startup options)"
 msgstr ""
 
-#: src/preferences.c:2819
+#: src/preferences.c:2865
 msgid "mplayer"
 msgstr ""
 
-#: src/preferences.c:2830
+#: src/preferences.c:2876
 msgid "mplayer2"
 msgstr ""
 
-#: src/preferences.c:2833
+#: src/preferences.c:2879
 msgid "Audio play _command"
 msgstr ""
 
-#: src/preferences.c:2840
+#: src/preferences.c:2886
 msgid "- internal -"
 msgstr ""
 
-#: src/preferences.c:2849
+#: src/preferences.c:2895
 msgid "Audio follows video _rate/direction"
 msgstr ""
 
-#: src/preferences.c:2857
+#: src/preferences.c:2903
 msgid "Audio follows _clip switches"
 msgstr ""
 
-#: src/preferences.c:2864
+#: src/preferences.c:2910
 msgid "Source:"
 msgstr ""
 
-#: src/preferences.c:2868
+#: src/preferences.c:2914
 msgid "_Internal"
 msgstr ""
 
-#: src/preferences.c:2873
+#: src/preferences.c:2919
 msgid "_External (requires jack or pulse audio player)"
 msgstr ""
 
-#: src/preferences.c:2892
+#: src/preferences.c:2940
 msgid "AUDIO"
 msgstr ""
 
-#: src/preferences.c:2902
+#: src/preferences.c:2950
 msgid "Playback"
 msgstr ""
 
-#: src/preferences.c:2925
+#: src/preferences.c:2973
 msgid ""
 "Record audio when capturing an e_xternal window\n"
 " (requires jack or pulse audio)"
 msgstr ""
 
-#: src/preferences.c:2940
+#: src/preferences.c:2988
 msgid "      What to record when 'r' is pressed   "
 msgstr ""
 
-#: src/preferences.c:2949
+#: src/preferences.c:2997
 msgid "_Frame changes"
 msgstr ""
 
-#: src/preferences.c:2964
+#: src/preferences.c:3012
 msgid "F_PS changes"
 msgstr ""
 
-#: src/preferences.c:2982
+#: src/preferences.c:3030
 msgid "_Real time effects"
 msgstr ""
 
-#: src/preferences.c:2993
+#: src/preferences.c:3041
 msgid "_Clip switches"
 msgstr ""
 
-#: src/preferences.c:3004
+#: src/preferences.c:3052
 msgid "_Audio (requires jack or pulse audio player)"
 msgstr ""
 
-#: src/preferences.c:3024
+#: src/preferences.c:3072
 msgid "Pause recording if free disk space falls below"
 msgstr ""
 
 #. TRANSLATORS: gigabytes
-#: src/preferences.c:3030
+#: src/preferences.c:3078
 msgid "GB"
 msgstr ""
 
-#: src/preferences.c:3037
+#: src/preferences.c:3085
 msgid "Recording"
 msgstr ""
 
-#: src/preferences.c:3055
+#: src/preferences.c:3103
 msgid "Encoder"
 msgstr ""
 
-#: src/preferences.c:3090
+#: src/preferences.c:3137
 msgid "Output format"
 msgstr ""
 
-#: src/preferences.c:3106
+#: src/preferences.c:3153
 msgid "Audio codec"
 msgstr ""
 
-#: src/preferences.c:3119
+#: src/preferences.c:3165
 msgid "Encoding"
 msgstr ""
 
-#: src/preferences.c:3134
+#: src/preferences.c:3180
 msgid "Use _antialiasing when resizing"
 msgstr ""
 
-#: src/preferences.c:3143
+#: src/preferences.c:3189
 msgid "Number of _real time effect keys"
 msgstr ""
 
-#: src/preferences.c:3145
+#: src/preferences.c:3192
 msgid ""
 "The number of \"virtual\" real time effect keys. They can be controlled "
 "through the real time effects window, or via network (OSC)."
 msgstr ""
 
-#: src/preferences.c:3152
+#: src/preferences.c:3199
 msgid "Use _threads where possible when applying effects"
 msgstr ""
 
-#: src/preferences.c:3159
+#: src/preferences.c:3207
 msgid "Number of _threads"
 msgstr ""
 
-#: src/preferences.c:3172
+#: src/preferences.c:3221
 msgid "Restart is required if any of the following paths are changed:"
 msgstr ""
 
-#: src/preferences.c:3182
+#: src/preferences.c:3231
 msgid "Weed plugin path"
 msgstr ""
 
-#: src/preferences.c:3184
+#: src/preferences.c:3234
 msgid "Frei0r plugin path"
 msgstr ""
 
-#: src/preferences.c:3186
+#: src/preferences.c:3237
 msgid "LADSPA plugin path"
 msgstr ""
 
-#: src/preferences.c:3209
+#: src/preferences.c:3261
 msgid "      Video load directory (default)      "
 msgstr ""
 
-#: src/preferences.c:3215
+#: src/preferences.c:3267
 msgid "      Video save directory (default) "
 msgstr ""
 
-#: src/preferences.c:3221
+#: src/preferences.c:3273
 msgid "      Audio load directory (default) "
 msgstr ""
 
-#: src/preferences.c:3227
+#: src/preferences.c:3279
 msgid "      Image directory (default) "
 msgstr ""
 
-#: src/preferences.c:3233
+#: src/preferences.c:3285
 msgid "      Backup/Restore directory (default) "
 msgstr ""
 
-#: src/preferences.c:3239
+#: src/preferences.c:3291
 msgid "      Temp directory (do not remove) "
 msgstr ""
 
-#: src/preferences.c:3252
+#: src/preferences.c:3304
 msgid "The default directory for loading video clips from"
 msgstr ""
 
-#: src/preferences.c:3277
+#: src/preferences.c:3329
 msgid "The default directory for saving encoded clips to"
 msgstr ""
 
-#: src/preferences.c:3285
+#: src/preferences.c:3337
 msgid "The default directory for loading and saving audio"
 msgstr ""
 
-#: src/preferences.c:3293
+#: src/preferences.c:3345
 msgid "The default directory for saving frameshots to"
 msgstr ""
 
-#: src/preferences.c:3301
+#: src/preferences.c:3353
 msgid "The default directory for backing up/restoring single clips"
 msgstr ""
 
-#: src/preferences.c:3309
+#: src/preferences.c:3361
 msgid "LiVES working directory."
 msgstr ""
 
-#: src/preferences.c:3359
+#: src/preferences.c:3412
 msgid "Directories"
 msgstr ""
 
-#: src/preferences.c:3374
+#: src/preferences.c:3427
 msgid "Warn if diskspace falls below: "
 msgstr ""
 
-#: src/preferences.c:3380 src/preferences.c:3394
+#: src/preferences.c:3433 src/preferences.c:3447
 msgid " MB [set to 0 to disable]"
 msgstr ""
 
-#: src/preferences.c:3389
+#: src/preferences.c:3442
 msgid "Diskspace critical level: "
 msgstr ""
 
-#: src/preferences.c:3407
+#: src/preferences.c:3461
 msgid ""
 "Warn on Insert / Merge if _frame rate of clipboard does not match frame rate "
 "of selection"
 msgstr ""
 
-#: src/preferences.c:3417
+#: src/preferences.c:3471
 msgid "Warn on Open if file _size exceeds "
 msgstr ""
 
-#: src/preferences.c:3425
+#: src/preferences.c:3479
 msgid " MB"
 msgstr ""
 
-#: src/preferences.c:3432
+#: src/preferences.c:3486
 msgid "Show a warning before saving a se_t"
 msgstr ""
 
-#: src/preferences.c:3442
+#: src/preferences.c:3496
 msgid ""
 "Show a warning if _mplayer/mplayer2, sox, composite or convert is not found "
 "when LiVES is started."
 msgstr ""
 
-#: src/preferences.c:3452
+#: src/preferences.c:3506
 msgid "Show a warning if no _rendered effects are found at startup."
 msgstr ""
 
-#: src/preferences.c:3464
+#: src/preferences.c:3518
 msgid "Show a warning if no _encoder plugins are found at startup."
 msgstr ""
 
-#: src/preferences.c:3474
+#: src/preferences.c:3528
 msgid "Show a warning if a _duplicate set name is entered."
 msgstr ""
 
-#: src/preferences.c:3485
+#: src/preferences.c:3539
 msgid "When a set is loaded, warn if clips are missing from _layouts."
 msgstr ""
 
-#: src/preferences.c:3495
+#: src/preferences.c:3550
 msgid "Warn if a clip used in a layout is about to be closed."
 msgstr ""
 
-#: src/preferences.c:3505
+#: src/preferences.c:3561
 msgid "Warn if frames used in a layout are about to be deleted."
 msgstr ""
 
-#: src/preferences.c:3515
+#: src/preferences.c:3572
 msgid "Warn if frames used in a layout are about to be shifted."
 msgstr ""
 
-#: src/preferences.c:3525
+#: src/preferences.c:3583
 msgid "Warn if frames used in a layout are about to be altered."
 msgstr ""
 
-#: src/preferences.c:3535
+#: src/preferences.c:3594
 msgid "Warn if audio used in a layout is about to be deleted."
 msgstr ""
 
-#: src/preferences.c:3546
+#: src/preferences.c:3606
 msgid "Warn if audio used in a layout is about to be shifted."
 msgstr ""
 
-#: src/preferences.c:3556
+#: src/preferences.c:3617
 msgid "Warn if audio used in a layout is about to be altered."
 msgstr ""
 
-#: src/preferences.c:3566
+#: src/preferences.c:3628
 msgid "Popup layout errors after clip changes."
 msgstr ""
 
-#: src/preferences.c:3577
+#: src/preferences.c:3639
 msgid "Warn if the layout has not been saved when leaving multitrack mode."
 msgstr ""
 
-#: src/preferences.c:3588
+#: src/preferences.c:3650
 msgid ""
 "Warn if multitrack has no audio channels, and a layout with audio is loaded."
 msgstr ""
 
-#: src/preferences.c:3598
+#: src/preferences.c:3660
 msgid ""
 "Warn if multitrack has audio channels, and your audio player is not \"jack\" "
 "or \"pulse audio\"."
 msgstr ""
 
-#: src/preferences.c:3610
+#: src/preferences.c:3672
 msgid "Show info message after importing from firewire device."
 msgstr ""
 
-#: src/preferences.c:3626
+#: src/preferences.c:3688
 msgid "Show a warning before opening a yuv4mpeg stream (advanced)."
 msgstr ""
 
-#: src/preferences.c:3639
+#: src/preferences.c:3701
 msgid "Show a warning when multitrack is low on backup space."
 msgstr ""
 
-#: src/preferences.c:3650
+#: src/preferences.c:3713
 msgid "Show a warning advising cleaning of disk space after a crash."
 msgstr ""
 
-#: src/preferences.c:3661
+#: src/preferences.c:3725
 msgid "Show a warning if unable to connect to pulseaudio player."
 msgstr ""
 
-#: src/preferences.c:3673
+#: src/preferences.c:3737
 msgid "Show a warning before wiping a layout which has unsaved changes."
 msgstr ""
 
-#: src/preferences.c:3685
+#: src/preferences.c:3749
 msgid "Warnings"
 msgstr ""
 
-#: src/preferences.c:3703
+#: src/preferences.c:3767
 msgid "Midi synch (requires the files midistart and midistop)"
 msgstr ""
 
-#: src/preferences.c:3715
+#: src/preferences.c:3779
 msgid "When inserting/merging frames:  "
 msgstr ""
 
-#: src/preferences.c:3719
+#: src/preferences.c:3783
 msgid "_Speed Up/Slow Down Insertion"
 msgstr ""
 
-#: src/preferences.c:3723
+#: src/preferences.c:3787
 msgid "_Resample Insertion"
 msgstr ""
 
-#: src/preferences.c:3730
+#: src/preferences.c:3794
 msgid "CD device           "
 msgstr ""
 
-#: src/preferences.c:3733
+#: src/preferences.c:3797
 msgid "LiVES can load audio tracks from this CD"
 msgstr ""
 
-#: src/preferences.c:3746
+#: src/preferences.c:3813
 msgid "Default FPS        "
 msgstr ""
 
-#: src/preferences.c:3749
+#: src/preferences.c:3816
 msgid "Frames per second to use when none is specified"
 msgstr ""
 
-#: src/preferences.c:3757
+#: src/preferences.c:3825
 msgid "Misc"
 msgstr ""
 
-#: src/preferences.c:3782
+#: src/preferences.c:3850
 msgid "New theme:           "
 msgstr ""
 
-#: src/preferences.c:3800
+#: src/preferences.c:3867
 msgid "Themes"
 msgstr ""
 
-#: src/preferences.c:3815
+#: src/preferences.c:3882
 msgid "Download bandwidth (Kb/s)       "
 msgstr ""
 
-#: src/preferences.c:3823
+#: src/preferences.c:3890
 msgid "LiVES must be compiled without \"configure --disable-OSC\" to use OMC"
 msgstr ""
 
-#: src/preferences.c:3833
+#: src/preferences.c:3900
 msgid "OMC remote control enabled"
 msgstr ""
 
-#: src/preferences.c:3841
+#: src/preferences.c:3908
 msgid "UDP port       "
 msgstr ""
 
-#: src/preferences.c:3850
+#: src/preferences.c:3917
 msgid "Start OMC on startup"
 msgstr ""
 
-#: src/preferences.c:3870
+#: src/preferences.c:3937
 msgid "Streaming/Networking"
 msgstr ""
 
-#: src/preferences.c:3882
+#: src/preferences.c:3949
 msgid "Jack transport"
 msgstr ""
 
-#: src/preferences.c:3886
+#: src/preferences.c:3953
 msgid ""
 "LiVES must be compiled with jack/transport.h and jack/jack.h present to use "
 "jack transport"
 msgstr ""
 
-#: src/preferences.c:3892
+#: src/preferences.c:3959
 msgid "Jack _transport config file"
 msgstr ""
 
-#: src/preferences.c:3899 src/preferences.c:3989
+#: src/preferences.c:3967 src/preferences.c:4058
 msgid "Start _server on LiVES startup"
 msgstr ""
 
-#: src/preferences.c:3911
+#: src/preferences.c:3979
 msgid "Jack transport _master (start and stop)"
 msgstr ""
 
-#: src/preferences.c:3921
+#: src/preferences.c:3989
 msgid "Jack transport _client (start and stop)"
 msgstr ""
 
-#: src/preferences.c:3935
+#: src/preferences.c:4003
 msgid "Jack transport sets start position"
 msgstr ""
 
-#: src/preferences.c:3952
+#: src/preferences.c:4020
 msgid "Jack transport timebase slave"
 msgstr ""
 
-#: src/preferences.c:3963
+#: src/preferences.c:4031
 msgid "(See also Playback -> Audio follows video rate/direction)"
 msgstr ""
 
-#: src/preferences.c:3971
+#: src/preferences.c:4039
 msgid "Jack audio"
 msgstr ""
 
-#: src/preferences.c:3975
+#: src/preferences.c:4043
 msgid "LiVES must be compiled with jack/jack.h present to use jack audio"
 msgstr ""
 
-#: src/preferences.c:3978
+#: src/preferences.c:4046
 msgid ""
 "You MUST set the audio player to \"jack\" in the Playback tab to use jack "
 "audio"
 msgstr ""
 
-#: src/preferences.c:3984
+#: src/preferences.c:4052
 msgid "Jack _audio server config file"
 msgstr ""
 
-#: src/preferences.c:3996
+#: src/preferences.c:4065
 msgid "Play audio even when transport is _paused"
 msgstr ""
 
-#: src/preferences.c:4008
+#: src/preferences.c:4077
 msgid "Automatically connect to System Out ports when 'playing' External Audio"
 msgstr ""
 
-#: src/preferences.c:4021
+#: src/preferences.c:4090
 msgid "Jack Integration"
 msgstr ""
 
-#: src/preferences.c:4035
+#: src/preferences.c:4104
 msgid "Events to respond to:"
 msgstr ""
 
-#: src/preferences.c:4044
+#: src/preferences.c:4113
 msgid "_Joystick events"
 msgstr ""
 
-#: src/preferences.c:4051
+#: src/preferences.c:4120
 msgid "_Joystick device"
 msgstr ""
 
-#: src/preferences.c:4053
+#: src/preferences.c:4122
 msgid "The joystick device, e.g. /dev/input/js0"
 msgstr ""
 
-#: src/preferences.c:4071
+#: src/preferences.c:4142
 msgid "_MIDI events"
 msgstr ""
 
-#: src/preferences.c:4080
+#: src/preferences.c:4151
 msgid "Use _ALSA MIDI (recommended)"
 msgstr ""
 
-#: src/preferences.c:4082
+#: src/preferences.c:4153
 msgid "Create an ALSA MIDI port which other MIDI devices can be connected to"
 msgstr ""
 
-#: src/preferences.c:4090
+#: src/preferences.c:4162
 msgid "Use _raw MIDI"
 msgstr ""
 
-#: src/preferences.c:4092
+#: src/preferences.c:4164
 msgid "Read directly from the MIDI device"
 msgstr ""
 
-#: src/preferences.c:4104
+#: src/preferences.c:4177
 msgid "_MIDI device"
 msgstr ""
 
-#: src/preferences.c:4106
+#: src/preferences.c:4179
 msgid "The MIDI device, e.g. /dev/input/midi0"
 msgstr ""
 
-#: src/preferences.c:4118
+#: src/preferences.c:4193
 msgid "Advanced"
 msgstr ""
 
-#: src/preferences.c:4124
+#: src/preferences.c:4199
 msgid "MIDI check _rate"
 msgstr ""
 
-#: src/preferences.c:4127
+#: src/preferences.c:4203
 msgid ""
 "Number of MIDI checks per keyboard tick. Increasing this may improve MIDI "
 "responsiveness, but may slow down playback."
 msgstr ""
 
-#: src/preferences.c:4134
+#: src/preferences.c:4211
 msgid "MIDI repeat"
 msgstr ""
 
-#: src/preferences.c:4137
+#: src/preferences.c:4214
 msgid "Number of non-reads allowed between succesive reads."
 msgstr ""
 
-#: src/preferences.c:4140
+#: src/preferences.c:4218
 msgid "(Warning: setting this value too high can slow down playback.)"
 msgstr ""
 
-#: src/preferences.c:4159
+#: src/preferences.c:4237
 msgid "MIDI/Joystick learner"
 msgstr ""
 
-#: src/preferences.c:4499
+#: src/preferences.c:4679
 msgid ""
 "\n"
 "LiVES will now shut down. You need to restart it for the directory change to "
@@ -7557,214 +7569,214 @@
 "Click OK to continue.\n"
 msgstr ""
 
-#: src/preferences.c:4523
+#: src/preferences.c:4703
 msgid ""
 "For the directory change to take effect LiVES will restart when preferences "
 "dialog closes."
 msgstr ""
 
-#: src/preferences.c:4527
+#: src/preferences.c:4707
 msgid "Theme changes will not take effect until the next time you start LiVES."
 msgstr ""
 
-#: src/preferences.c:4531
+#: src/preferences.c:4711
 msgid "Jack options will not take effect until the next time you start LiVES."
 msgstr ""
 
-#: src/osc.c:2585
+#: src/osc.c:2616
 #, c-format
 msgid "Syncing to external framerate of %.8f frames per second.\n"
 msgstr ""
 
-#: src/osc.c:6746
+#: src/osc.c:6938
 msgid "Cannot initialize OSC receiver\n"
 msgstr ""
 
-#: src/osc.c:6770
+#: src/osc.c:6961
 #, c-format
 msgid "WARNING: Cannot start OSC server at UDP port %d\n"
 msgstr ""
 
-#: src/osc.c:6775
+#: src/osc.c:6963
 #, c-format
 msgid "Started OSC server at UDP port %d\n"
 msgstr ""
 
-#: src/osc.c:6890
+#: src/osc.c:7076
 #, c-format
 msgid "Cannot start OSC/UDP server at port %d \n"
 msgstr ""
 
-#: src/resample.c:125 src/resample.c:304
+#: src/resample.c:131 src/resample.c:305
 #, c-format
 msgid "Resizing frames 1 to %d"
 msgstr ""
 
-#: src/resample.c:140 src/resample.c:318
+#: src/resample.c:145 src/resample.c:318
 #, c-format
 msgid "Resizing/letterboxing frames 1 to %d"
 msgstr ""
 
-#: src/resample.c:361 src/resample.c:385
+#: src/resample.c:360 src/resample.c:384
 msgid "Resize"
 msgstr ""
 
-#: src/resample.c:395
+#: src/resample.c:394
 msgid "Resample/Resize"
 msgstr ""
 
-#: src/resample.c:680
+#: src/resample.c:676
 #, c-format
 msgid "Length of video is now %d frames.\n"
 msgstr ""
 
-#: src/resample.c:745
+#: src/resample.c:737
 msgid ""
 "\n"
 "\n"
 "New rate must be greater than 0\n"
 msgstr ""
 
-#: src/resample.c:797 src/resample.c:813
+#: src/resample.c:788 src/resample.c:803
 msgid "Resampling audio"
 msgstr ""
 
-#: src/resample.c:831
+#: src/resample.c:821
 msgid "LiVES was unable to resample the audio as requested.\n"
 msgstr ""
 
-#: src/resample.c:833 src/resample.c:837
+#: src/resample.c:823 src/resample.c:827
 msgid "Resample Audio"
 msgstr ""
 
-#: src/resample.c:845
+#: src/resample.c:835
 #, c-format
 msgid "Audio was resampled to %d Hz, %d channels, %d bit"
 msgstr ""
 
-#: src/resample.c:1034
+#: src/resample.c:1016
 #, c-format
 msgid "Resampling video at %.8f frames per second..."
 msgstr ""
 
-#: src/resample.c:1037
+#: src/resample.c:1018
 #, c-format
 msgid "Resampling video at %.3f frames per second..."
 msgstr ""
 
-#: src/resample.c:1068
+#: src/resample.c:1049
 msgid "Reordering error !\n"
 msgstr ""
 
-#: src/resample.c:1079
+#: src/resample.c:1060
 msgid "Resample"
 msgstr ""
 
-#: src/resample.c:1192
+#: src/resample.c:1173
 msgid "LiVES: - Resample Audio"
 msgstr ""
 
-#: src/resample.c:1195
+#: src/resample.c:1175
 msgid "LiVES: - Insert Silence"
 msgstr ""
 
-#: src/resample.c:1198
+#: src/resample.c:1177
 msgid "LiVES: - New Clip Audio"
 msgstr ""
 
-#: src/resample.c:1201
+#: src/resample.c:1179
 msgid "LiVES: - External Clip Settings"
 msgstr ""
 
-#: src/resample.c:1238 src/resample.c:1358
+#: src/resample.c:1215 src/resample.c:1332
 msgid "Rate (Hz) "
 msgstr ""
 
-#: src/resample.c:1245 src/resample.c:1372
+#: src/resample.c:1222 src/resample.c:1346
 msgid "Channels"
 msgstr ""
 
-#: src/resample.c:1252
+#: src/resample.c:1229
 msgid "Sample Size "
 msgstr ""
 
-#: src/resample.c:1268 src/resample.c:1425
+#: src/resample.c:1245 src/resample.c:1399
 msgid "Signed"
 msgstr ""
 
-#: src/resample.c:1274 src/resample.c:1435
+#: src/resample.c:1251 src/resample.c:1409
 msgid "Unsigned"
 msgstr ""
 
-#: src/resample.c:1297 src/resample.c:1460
+#: src/resample.c:1273 src/resample.c:1433
 msgid "Little Endian"
 msgstr ""
 
-#: src/resample.c:1303 src/resample.c:1468
+#: src/resample.c:1279 src/resample.c:1441
 msgid "Big Endian"
 msgstr ""
 
-#: src/resample.c:1315
+#: src/resample.c:1290
 msgid "Current"
 msgstr ""
 
-#: src/resample.c:1340
+#: src/resample.c:1315
 msgid "_Enable audio"
 msgstr ""
 
-#: src/resample.c:1372
+#: src/resample.c:1346
 msgid "_Channels"
 msgstr ""
 
-#: src/resample.c:1394
+#: src/resample.c:1368
 msgid "_Sample Size"
 msgstr ""
 
-#: src/resample.c:1394
+#: src/resample.c:1368
 msgid "Sample Size"
 msgstr ""
 
-#: src/resample.c:1489
+#: src/resample.c:1461
 msgid "New"
 msgstr ""
 
-#: src/resample.c:1512
+#: src/resample.c:1484
 msgid "_Frames Per Second "
 msgstr ""
 
-#: src/resample.c:1530
+#: src/resample.c:1502
 msgid "Record for maximum:  "
 msgstr ""
 
-#: src/resample.c:1533
+#: src/resample.c:1505
 msgid " hours  "
 msgstr ""
 
-#: src/resample.c:1536
+#: src/resample.c:1508
 msgid " minutes  "
 msgstr ""
 
-#: src/resample.c:1538
+#: src/resample.c:1510
 msgid " seconds  "
 msgstr ""
 
-#: src/resample.c:1545
+#: src/resample.c:1517
 msgid "Unlimited"
 msgstr ""
 
-#: src/resample.c:1561
+#: src/resample.c:1533
 msgid "Click OK to begin recording, or Cancel to quit."
 msgstr ""
 
-#: src/resample.c:1670
+#: src/resample.c:1638
 msgid "LiVES: - Change playback speed"
 msgstr ""
 
-#: src/resample.c:1673
+#: src/resample.c:1640
 msgid "LiVES: - Resample Video"
 msgstr ""
 
-#: src/resample.c:1696
+#: src/resample.c:1663
 #, c-format
 msgid ""
 "\n"
@@ -7775,7 +7787,7 @@
 "in _frames per second"
 msgstr ""
 
-#: src/resample.c:1701
+#: src/resample.c:1667
 #, c-format
 msgid ""
 "\n"
@@ -7786,89 +7798,89 @@
 "in frames per second"
 msgstr ""
 
-#: src/resample.c:1723
+#: src/resample.c:1688
 msgid "OR enter the desired clip length in _seconds"
 msgstr ""
 
-#: src/resample.c:1745
+#: src/resample.c:1710
 msgid "Change the _audio speed as well"
 msgstr ""
 
-#: src/resample.c:1846
+#: src/resample.c:1810
 msgid ""
 "\n"
 "Speeding up the clip will cause missing frames in some multitrack layouts.\n"
 "Are you sure you wish to change the speed ?\n"
 msgstr ""
 
-#: src/resample.c:1863
+#: src/resample.c:1829
 msgid ""
 "\n"
 "Speeding up the clip will cause missing audio in some multitrack layouts.\n"
 "Are you sure you wish to change the speed ?\n"
 msgstr ""
 
-#: src/resample.c:1878
+#: src/resample.c:1847
 msgid ""
 "\n"
 "Changing the speed will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/resample.c:1892
+#: src/resample.c:1863
 msgid ""
 "\n"
 "Changing the speed will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/resample.c:1938
+#: src/resample.c:1911
 msgid "Speed Change"
 msgstr ""
 
-#: src/resample.c:1947
+#: src/resample.c:1920
 #, c-format
 msgid "Changed playback speed to %.3f frames per second and audio to %d Hz.\n"
 msgstr ""
 
-#: src/resample.c:1950
+#: src/resample.c:1922
 #, c-format
 msgid "Changed playback speed to %.3f frames per second.\n"
 msgstr ""
 
-#: src/resample.c:2035
+#: src/resample.c:2006
 msgid "Resampling video"
 msgstr ""
 
-#: src/resample.c:2042 src/resample.c:2160 src/resample.c:2182
+#: src/resample.c:2012 src/resample.c:2127 src/resample.c:2148
 msgid "Resampling clipboard video"
 msgstr ""
 
-#: src/resample.c:2047
+#: src/resample.c:2016
 msgid "Reordering frames"
 msgstr ""
 
-#: src/resample.c:2056
+#: src/resample.c:2025
 msgid ""
 "\n"
 "\n"
 "LiVES was unable to reorder the frames."
 msgstr ""
 
-#: src/resample.c:2104
+#: src/resample.c:2071
 msgid "Deordering frames"
 msgstr ""
 
-#: src/resample.c:2199
+#: src/resample.c:2165
 msgid "resampling error..."
 msgstr ""
 
-#: src/rte_window.c:85 src/rte_window.c:1708
+#: src/rte_window.c:124 src/rte_window.c:1709
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
-#: src/rte_window.c:112
+#: src/rte_window.c:150
 msgid ""
 "\n"
 "\n"
@@ -7878,7 +7890,7 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:426
+#: src/rte_window.c:460
 msgid ""
 "\n"
 "\n"
@@ -7886,19 +7898,19 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:432
+#: src/rte_window.c:466
 #, c-format
 msgid "Saving keymap to %s\n"
 msgstr ""
 
-#: src/rte_window.c:439
+#: src/rte_window.c:471
 #, c-format
 msgid ""
 "\n"
 "Updating keymap file %s..."
 msgstr ""
 
-#: src/rte_window.c:446
+#: src/rte_window.c:477
 #, c-format
 msgid ""
 "\n"
@@ -7908,12 +7920,12 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/rte_window.c:526
+#: src/rte_window.c:556
 #, c-format
 msgid "Saving real time effect defaults to %s..."
 msgstr ""
 
-#: src/rte_window.c:535
+#: src/rte_window.c:563
 #, c-format
 msgid ""
 "\n"
@@ -7923,22 +7935,22 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/rte_window.c:632
+#: src/rte_window.c:657
 #, c-format
 msgid "Loading real time effect defaults from %s..."
 msgstr ""
 
-#: src/rte_window.c:681
+#: src/rte_window.c:701
 #, c-format
 msgid "Loading generator default sizes from %s..."
 msgstr ""
 
-#: src/rte_window.c:1306
+#: src/rte_window.c:1319
 #, c-format
 msgid "Loading default keymap from %s..."
 msgstr ""
 
-#: src/rte_window.c:1329
+#: src/rte_window.c:1339
 #, c-format
 msgid ""
 "\n"
@@ -7948,48 +7960,48 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/rte_window.c:1403
+#: src/rte_window.c:1412
 #, c-format
 msgid "Invalid line %d in %s\n"
 msgstr ""
 
-#: src/rte_window.c:1483
+#: src/rte_window.c:1490
 #, c-format
 msgid "Invalid key %d in %s\n"
 msgstr ""
 
-#: src/rte_window.c:1498
+#: src/rte_window.c:1505
 #, c-format
 msgid "Invalid effect %s in %s\n"
 msgstr ""
 
-#: src/rte_window.c:1517
+#: src/rte_window.c:1524
 #, c-format
 msgid "Unknown effect %s in %s\n"
 msgstr ""
 
-#: src/rte_window.c:1535
+#: src/rte_window.c:1542
 #, c-format
 msgid ""
 "This version of LiVES cannot mix generators/non-generators on the same key "
 "(%d) !\n"
 msgstr ""
 
-#: src/rte_window.c:1547
+#: src/rte_window.c:1554
 #, c-format
 msgid "Too many effects bound to key %d.\n"
 msgstr ""
 
-#: src/rte_window.c:1587
+#: src/rte_window.c:1593
 msgid "update required.\n"
 msgstr ""
 
-#: src/rte_window.c:1603
+#: src/rte_window.c:1607
 #, c-format
 msgid "Loading data connection map from %s..."
 msgstr ""
 
-#: src/rte_window.c:1612
+#: src/rte_window.c:1614
 msgid ""
 "\n"
 "\n"
@@ -7997,41 +8009,41 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:1691
+#: src/rte_window.c:1692
 #, c-format
 msgid "LiVES: Information for %s"
 msgstr ""
 
-#: src/rte_window.c:1704
+#: src/rte_window.c:1705
 #, c-format
 msgid "Effect name: %s"
 msgstr ""
 
-#: src/rte_window.c:1712
+#: src/rte_window.c:1713
 #, c-format
 msgid "Plugin name: %s"
 msgstr ""
 
-#: src/rte_window.c:1716
+#: src/rte_window.c:1717
 #, c-format
 msgid "Author: %s"
 msgstr ""
 
-#: src/rte_window.c:1721
+#: src/rte_window.c:1722
 #, c-format
 msgid "and: %s"
 msgstr ""
 
-#: src/rte_window.c:1726
+#: src/rte_window.c:1727
 #, c-format
 msgid "Version: %d"
 msgstr ""
 
-#: src/rte_window.c:1734
+#: src/rte_window.c:1735
 msgid "Description: "
 msgstr ""
 
-#: src/rte_window.c:1960
+#: src/rte_window.c:1963
 msgid ""
 "\n"
 "\n"
@@ -8040,69 +8052,69 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:2024
+#: src/rte_window.c:2027
 #, c-format
 msgid "LiVES could not locate the effect %s.\n"
 msgstr ""
 
-#: src/rte_window.c:2225
+#: src/rte_window.c:2216
 msgid "LiVES: Real time effect mapping"
 msgstr ""
 
-#: src/rte_window.c:2257
+#: src/rte_window.c:2248
 #, c-format
 msgid "Ctrl-%d"
 msgstr ""
 
-#: src/rte_window.c:2264
+#: src/rte_window.c:2255
 msgid "Key active"
 msgstr ""
 
-#: src/rte_window.c:2279
+#: src/rte_window.c:2271
 msgid "Key grab"
 msgstr ""
 
-#: src/rte_window.c:2280
+#: src/rte_window.c:2272
 msgid "Grab keyboard for this effect key"
 msgstr ""
 
-#: src/rte_window.c:2290
+#: src/rte_window.c:2283
 msgid "_Clear all effects"
 msgstr ""
 
-#: src/rte_window.c:2304
+#: src/rte_window.c:2297
 msgid "Mode active"
 msgstr ""
 
-#: src/rte_window.c:2314 src/multitrack.c:8568
+#: src/rte_window.c:2307 src/multitrack.c:8762
 msgid "Info"
 msgstr ""
 
-#: src/rte_window.c:2315
+#: src/rte_window.c:2308
 msgid "Set Parameters"
 msgstr ""
 
-#: src/rte_window.c:2316
+#: src/rte_window.c:2309
 msgid "Set Connections"
 msgstr ""
 
-#: src/rte_window.c:2317
+#: src/rte_window.c:2310
 msgid "Clear"
 msgstr ""
 
-#: src/rte_window.c:2326
+#: src/rte_window.c:2319
 msgid "Effect name:"
 msgstr ""
 
-#: src/rte_window.c:2391
+#: src/rte_window.c:2384
 msgid "_Save as default keymap"
 msgstr ""
 
-#: src/rte_window.c:2396
+#: src/rte_window.c:2389
 msgid "_Load default keymap"
 msgstr ""
 
-#: src/rte_window.c:2840
+#: src/rte_window.c:2833
 #, c-format
 msgid ""
 "Unable to create default keymap file: %s\n"
@@ -8160,86 +8172,86 @@
 msgid "none\n"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:494
+#: src/lives-yuv4mpeg.c:493
 #, c-format
 msgid ""
 "Unable to set display framerate to %.3f fps.\n"
 "\n"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:503
+#: src/lives-yuv4mpeg.c:502
 #, c-format
 msgid "Unable to open yuv4mpeg out stream %s\n"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:628
+#: src/lives-yuv4mpeg.c:626
 #, c-format
 msgid "TV card %d"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:713
+#: src/lives-yuv4mpeg.c:710
 #, c-format
 msgid "Opened TV card %d (%s)"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:760
+#: src/lives-yuv4mpeg.c:757
 #, c-format
 msgid "Firewire card %d"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:796
+#: src/lives-yuv4mpeg.c:793
 #, c-format
 msgid "Opened firewire card %d"
 msgstr ""
 
-#: src/multitrack.c:666
+#: src/multitrack.c:736
 msgid "Auto backup"
 msgstr ""
 
-#: src/multitrack.c:868
+#: src/multitrack.c:935
 msgid "Backing audio"
 msgstr ""
 
-#: src/multitrack.c:1435
+#: src/multitrack.c:1515
 #, c-format
 msgid "%s : parameters for %s"
 msgstr ""
 
-#: src/multitrack.c:1809 src/multitrack.c:3483
+#: src/multitrack.c:1881 src/multitrack.c:3635
 #, c-format
 msgid "Current track: %s (layer %d)\n"
 msgstr ""
 
-#: src/multitrack.c:1813 src/multitrack.c:3484
+#: src/multitrack.c:1885 src/multitrack.c:3637
 msgid "Current track: Backing audio\n"
 msgstr ""
 
-#: src/multitrack.c:1814
+#: src/multitrack.c:1886
 #, c-format
 msgid "Current track: Layer %d audio\n"
 msgstr ""
 
-#: src/multitrack.c:1817
+#: src/multitrack.c:1889
 #, c-format
 msgid "%.2f sec.\n"
 msgstr ""
 
-#: src/multitrack.c:1822 src/multitrack.c:3490
+#: src/multitrack.c:1894 src/multitrack.c:3643
 #, c-format
 msgid "Source: %s"
 msgstr ""
 
-#: src/multitrack.c:1825 src/multitrack.c:3492
+#: src/multitrack.c:1897 src/multitrack.c:3645
 msgid "Right click for context menu.\n"
 msgstr ""
 
-#: src/multitrack.c:1827
+#: src/multitrack.c:1899
 msgid ""
 "Double click on a block\n"
 "to select it."
 msgstr ""
 
-#: src/multitrack.c:3312
+#: src/multitrack.c:3452
 msgid ""
 "\n"
 "\n"
@@ -8248,7 +8260,7 @@
 "right or double clicking on it.\n"
 msgstr ""
 
-#: src/multitrack.c:3315
+#: src/multitrack.c:3455
 msgid ""
 "\n"
 "\n"
@@ -8256,14 +8268,14 @@
 "Select an effect in FX stack first to view its parameters.\n"
 msgstr ""
 
-#: src/multitrack.c:3318
+#: src/multitrack.c:3458
 msgid ""
 "\n"
 "\n"
 "No clips loaded.\n"
 msgstr ""
 
-#: src/multitrack.c:3321
+#: src/multitrack.c:3462
 msgid ""
 "You must select two video tracks\n"
 "and a time region\n"
@@ -8273,7 +8285,7 @@
 "before inserting clips into the timeline."
 msgstr ""
 
-#: src/multitrack.c:3324
+#: src/multitrack.c:3465
 msgid ""
 "\n"
 "\n"
@@ -8282,210 +8294,210 @@
 "to apply compositors.\n"
 msgstr ""
 
-#: src/multitrack.c:3487
+#: src/multitrack.c:3640
 #, c-format
 msgid "%.2f sec. to %.2f sec.\n"
 msgstr ""
 
-#: src/multitrack.c:3493
+#: src/multitrack.c:3646
 msgid ""
 "Single click on timeline\n"
 "to select a frame.\n"
 msgstr ""
 
-#: src/multitrack.c:3711 src/multitrack.c:6790
+#: src/multitrack.c:3858 src/multitrack.c:6972
 #, c-format
 msgid "%s [unstable]"
 msgstr ""
 
-#: src/multitrack.c:3822
+#: src/multitrack.c:3973
 msgid ""
 "You can click and drag\n"
 "below the timeline"
 msgstr ""
 
-#: src/multitrack.c:3823
+#: src/multitrack.c:3974
 msgid "to select a time region.\n"
 msgstr ""
 
-#: src/multitrack.c:3985
+#: src/multitrack.c:4137
 msgid "LiVES: Selected clip"
 msgstr ""
 
-#: src/multitrack.c:3993
+#: src/multitrack.c:4145
 msgid "_Adjust start and end points"
 msgstr ""
 
-#: src/multitrack.c:4002
+#: src/multitrack.c:4154
 msgid "_Edit/encode in clip editor"
 msgstr ""
 
-#: src/multitrack.c:4009
+#: src/multitrack.c:4161
 msgid "_Show clip information"
 msgstr ""
 
-#: src/multitrack.c:4016
+#: src/multitrack.c:4168
 msgid "_Close this clip"
 msgstr ""
 
-#: src/multitrack.c:4236
+#: src/multitrack.c:4388
 msgid "Audio mixer (ctrl-m)"
 msgstr ""
 
-#: src/multitrack.c:4336
+#: src/multitrack.c:4488
 msgid "Single click on timeline"
 msgstr ""
 
-#: src/multitrack.c:4337
+#: src/multitrack.c:4489
 msgid "to select a frame."
 msgstr ""
 
-#: src/multitrack.c:4338
+#: src/multitrack.c:4490
 msgid "Double click or right click on timeline"
 msgstr ""
 
-#: src/multitrack.c:4339
+#: src/multitrack.c:4491
 msgid "to select a block."
 msgstr ""
 
-#: src/multitrack.c:4340
+#: src/multitrack.c:4492
 msgid "Clips can be dragged"
 msgstr ""
 
-#: src/multitrack.c:4341
+#: src/multitrack.c:4493
 msgid "onto the timeline."
 msgstr ""
 
-#: src/multitrack.c:4343
+#: src/multitrack.c:4495
 msgid "Mouse mode is: Move"
 msgstr ""
 
-#: src/multitrack.c:4344
+#: src/multitrack.c:4496
 msgid "clips can be moved around."
 msgstr ""
 
-#: src/multitrack.c:4349
+#: src/multitrack.c:4500
 msgid "Mouse mode is: Select."
 msgstr ""
 
-#: src/multitrack.c:4350
+#: src/multitrack.c:4501
 msgid "Drag with mouse on timeline"
 msgstr ""
 
-#: src/multitrack.c:4351
+#: src/multitrack.c:4502
 msgid "to select tracks and time."
 msgstr ""
 
-#: src/multitrack.c:4362
+#: src/multitrack.c:4509
 msgid "_Insert mode: Normal"
 msgstr ""
 
-#: src/multitrack.c:4378
+#: src/multitrack.c:4537
 msgid "_Mouse mode: Move"
 msgstr ""
 
-#: src/multitrack.c:4382
+#: src/multitrack.c:4540
 msgid "_Mouse mode: Select"
 msgstr ""
 
-#: src/multitrack.c:4405 src/multitrack.c:7925
+#: src/multitrack.c:4563 src/multitrack.c:8104
 msgid "Gravity: Normal"
 msgstr ""
 
-#: src/multitrack.c:4409
+#: src/multitrack.c:4565
 msgid "Gravity: Left"
 msgstr ""
 
-#: src/multitrack.c:4414
+#: src/multitrack.c:4569
 msgid "Gravity: Right"
 msgstr ""
 
-#: src/multitrack.c:4416
+#: src/multitrack.c:4570
 msgid "Close _last gap(s) in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:4419
+#: src/multitrack.c:4572
 msgid "Close _first gap(s) in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:4458
+#: src/multitrack.c:4627
 msgid "Close gaps"
 msgstr ""
 
-#: src/multitrack.c:4460
+#: src/multitrack.c:4629
 msgid "Move block"
 msgstr ""
 
-#: src/multitrack.c:4462
+#: src/multitrack.c:4631
 msgid "Move audio block"
 msgstr ""
 
-#: src/multitrack.c:4464
+#: src/multitrack.c:4633
 msgid "Delete block"
 msgstr ""
 
-#: src/multitrack.c:4466
+#: src/multitrack.c:4635
 msgid "Delete audio block"
 msgstr ""
 
-#: src/multitrack.c:4468
+#: src/multitrack.c:4637
 msgid "Split tracks"
 msgstr ""
 
-#: src/multitrack.c:4470
+#: src/multitrack.c:4639
 msgid "Split block"
 msgstr ""
 
-#: src/multitrack.c:4473
+#: src/multitrack.c:4642
 #, c-format
 msgid "Apply %s"
 msgstr ""
 
-#: src/multitrack.c:4478
+#: src/multitrack.c:4647
 #, c-format
 msgid "Delete %s"
 msgstr ""
 
-#: src/multitrack.c:4482
+#: src/multitrack.c:4651
 msgid "Insert block"
 msgstr ""
 
-#: src/multitrack.c:4484
+#: src/multitrack.c:4653
 msgid "Insert gap"
 msgstr ""
 
-#: src/multitrack.c:4486
+#: src/multitrack.c:4655
 msgid "Insert audio block"
 msgstr ""
 
-#: src/multitrack.c:4488
+#: src/multitrack.c:4657
 msgid "Effect order change"
 msgstr ""
 
-#: src/multitrack.c:4898
+#: src/multitrack.c:5064
 msgid "unsigned "
 msgstr ""
 
-#: src/multitrack.c:4899
+#: src/multitrack.c:5065
 msgid "signed "
 msgstr ""
 
-#: src/multitrack.c:4904
+#: src/multitrack.c:5071
 #, c-format
 msgid ""
 "Multitrack values set to %.3f fps, frame size %d x %d, audio channels %d, "
 "audio rate %d, audio sample size %d, %s.\n"
 msgstr ""
 
-#: src/multitrack.c:4938
+#: src/multitrack.c:5104
 msgid "invalid event list. Failed.\n"
 msgstr ""
 
-#: src/multitrack.c:4944
+#: src/multitrack.c:5110
 msgid "event list has invalid fps. Failed.\n"
 msgstr ""
 
-#: src/multitrack.c:4953
+#: src/multitrack.c:5122
 #, c-format
 msgid ""
 "\n"
@@ -8495,7 +8507,7 @@
 "then load in the new set from the File menu.\n"
 msgstr ""
 
-#: src/multitrack.c:4993
+#: src/multitrack.c:5163
 #, c-format
 msgid ""
 "\n"
@@ -8503,600 +8515,592 @@
 "It cannot be loaded.\n"
 msgstr ""
 
-#: src/multitrack.c:5329 src/multitrack.c:5338 src/multitrack.c:21133
+#: src/multitrack.c:5452
 msgid "Layout was wiped.\n"
 msgstr ""
 
-#: src/multitrack.c:5374
+#: src/multitrack.c:5547
 #, c-format
 msgid "LiVES-%s: Multitrack %dx%d : %d bpp %.3f fps"
 msgstr ""
 
-#: src/multitrack.c:5617
+#: src/multitrack.c:5793
 msgid "In/out"
 msgstr ""
 
-#: src/multitrack.c:5619
+#: src/multitrack.c:5795
 msgid "FX stack"
 msgstr ""
 
-#: src/multitrack.c:5627 src/omc-learn.c:673
+#: src/multitrack.c:5803 src/omc-learn.c:659
 msgid "Params."
 msgstr ""
 
-#: src/multitrack.c:5978
+#: src/multitrack.c:6157
 msgid "_Open..."
 msgstr ""
 
-#: src/multitrack.c:5996
+#: src/multitrack.c:6175
 msgid "O_pen File Selection..."
 msgstr ""
 
-#: src/multitrack.c:6040
+#: src/multitrack.c:6219
 msgid "Import Selection from _dvd/vcd..."
 msgstr ""
 
-#: src/multitrack.c:6050
+#: src/multitrack.c:6229
 msgid "Import Selection from _dvd"
 msgstr ""
 
-#: src/multitrack.c:6060
+#: src/multitrack.c:6239
 msgid "Import Selection from _vcd"
 msgstr ""
 
-#: src/multitrack.c:6076
+#: src/multitrack.c:6255
 msgid "_Import from Device"
 msgstr ""
 
-#: src/multitrack.c:6103
+#: src/multitrack.c:6282
 msgid "_Close the selected clip"
 msgstr ""
 
-#: src/multitrack.c:6198
+#: src/multitrack.c:6377
 msgid "_Save layout as..."
 msgstr ""
 
-#: src/multitrack.c:6206
+#: src/multitrack.c:6385
 msgid "_Load layout..."
 msgstr ""
 
-#: src/multitrack.c:6210
+#: src/multitrack.c:6389
 msgid "_Wipe/Delete layout..."
 msgstr ""
 
-#: src/multitrack.c:6236
+#: src/multitrack.c:6415
 msgid "_Ignore width, height and audio values from loaded layouts"
 msgstr ""
 
-#: src/multitrack.c:6240
+#: src/multitrack.c:6419
 msgid "Auto load _subtitles with clips"
 msgstr ""
 
-#: src/multitrack.c:6322
+#: src/multitrack.c:6501
 msgid "_CLIP EDITOR"
 msgstr ""
 
-#: src/multitrack.c:6334
+#: src/multitrack.c:6513
 msgid "_Adjust selected clip start/end points"
 msgstr ""
 
-#: src/multitrack.c:6343
+#: src/multitrack.c:6522
 msgid "_Insert selected clip"
 msgstr ""
 
-#: src/multitrack.c:6355
+#: src/multitrack.c:6534
 msgid "_Insert selected clip audio"
 msgstr ""
 
-#: src/multitrack.c:6364
+#: src/multitrack.c:6543
 msgid "_Delete selected block"
 msgstr ""
 
-#: src/multitrack.c:6373
+#: src/multitrack.c:6555
 msgid "_Jump to previous block boundary"
 msgstr ""
 
-#: src/multitrack.c:6382
+#: src/multitrack.c:6564
 msgid "_Jump to next block boundary"
 msgstr ""
 
-#: src/multitrack.c:6395
+#: src/multitrack.c:6577
 msgid "Clear _marks from timeline"
 msgstr ""
 
-#: src/multitrack.c:6403
+#: src/multitrack.c:6585
 msgid "Ignore selection limits when inserting"
 msgstr ""
 
-#: src/multitrack.c:6420 src/multitrack.c:16719
+#: src/multitrack.c:6602 src/multitrack.c:17009
 msgid "_Play from Timeline Position"
 msgstr ""
 
-#: src/multitrack.c:6434
+#: src/multitrack.c:6616
 msgid "Pla_y selected time only"
 msgstr ""
 
-#: src/multitrack.c:6518
+#: src/multitrack.c:6700
 msgid "_Move effects with blocks"
 msgstr ""
 
-#: src/multitrack.c:6531
+#: src/multitrack.c:6713
 msgid "Select _autotransition effect..."
 msgstr ""
 
-#: src/multitrack.c:6542
+#: src/multitrack.c:6724
 msgid "Crossfade audio with autotransition"
 msgstr ""
 
-#: src/multitrack.c:6550
+#: src/multitrack.c:6732
 msgid "View/_Edit selected effect"
 msgstr ""
 
-#: src/multitrack.c:6554
+#: src/multitrack.c:6736
 msgid "_Delete selected effect"
 msgstr ""
 
-#: src/multitrack.c:6562
+#: src/multitrack.c:6744
 msgid "Apply effect to _block..."
 msgstr ""
 
-#: src/multitrack.c:6619
+#: src/multitrack.c:6801
 msgid "Apply effect to _region..."
 msgstr ""
 
-#: src/multitrack.c:6885
+#: src/multitrack.c:7061
 msgid "_Tracks"
 msgstr ""
 
-#: src/multitrack.c:6896
+#: src/multitrack.c:7072
 msgid "Rename current track"
 msgstr ""
 
-#: src/multitrack.c:6904
+#: src/multitrack.c:7080
 msgid "Make _Backing Audio current track"
 msgstr ""
 
-#: src/multitrack.c:6915
+#: src/multitrack.c:7091
 msgid "Add Video Track at _Rear"
 msgstr ""
 
-#: src/multitrack.c:6923
+#: src/multitrack.c:7099
 msgid "Add Video Track at _Front"
 msgstr ""
 
-#: src/multitrack.c:6936
+#: src/multitrack.c:7112
 msgid "_Split current track at cursor"
 msgstr ""
 
-#: src/multitrack.c:6948
+#: src/multitrack.c:7124
 msgid "_Split selected video tracks"
 msgstr ""
 
-#: src/multitrack.c:6961
+#: src/multitrack.c:7137
 msgid "Insert gap in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:6969
+#: src/multitrack.c:7145
 msgid "Insert gap in current track/selected time"
 msgstr ""
 
-#: src/multitrack.c:6981
+#: src/multitrack.c:7157
 msgid "Close all _gaps in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:7007
+#: src/multitrack.c:7183
 msgid "Se_lection"
 msgstr ""
 
-#: src/multitrack.c:7018
+#: src/multitrack.c:7194
 msgid "_Select Current Track"
 msgstr ""
 
-#: src/multitrack.c:7025
+#: src/multitrack.c:7201
 msgid "Select _all video tracks"
 msgstr ""
 
-#: src/multitrack.c:7032
+#: src/multitrack.c:7208
 msgid "Select _no video tracks"
 msgstr ""
 
-#: src/multitrack.c:7039
+#: src/multitrack.c:7215
 msgid "Select all _time"
 msgstr ""
 
-#: src/multitrack.c:7050
+#: src/multitrack.c:7226
 msgid "Select from _zero time"
 msgstr ""
 
-#: src/multitrack.c:7057
+#: src/multitrack.c:7233
 msgid "Select to _end time"
 msgstr ""
 
-#: src/multitrack.c:7064
+#: src/multitrack.c:7240
 msgid "_Copy..."
 msgstr ""
 
-#: src/multitrack.c:7075
+#: src/multitrack.c:7251
 msgid "_Timecode to region start"
 msgstr ""
 
-#: src/multitrack.c:7082
+#: src/multitrack.c:7258
 msgid "_Timecode to region end"
 msgstr ""
 
-#: src/multitrack.c:7089
+#: src/multitrack.c:7265
 msgid "_Region start to timecode"
 msgstr ""
 
-#: src/multitrack.c:7096
+#: src/multitrack.c:7272
 msgid "_Region end to timecode"
 msgstr ""
 
-#: src/multitrack.c:7110
+#: src/multitrack.c:7286
 msgid "Select/deselect block at current track/time"
 msgstr ""
 
-#: src/multitrack.c:7135
+#: src/multitrack.c:7311
 msgid "_Change width, height and audio values..."
 msgstr ""
 
-#: src/multitrack.c:7194
+#: src/multitrack.c:7370
 msgid "_Render"
 msgstr ""
 
-#: src/multitrack.c:7205
+#: src/multitrack.c:7381
 msgid "_Render all to new clip"
 msgstr ""
 
-#: src/multitrack.c:7220
+#: src/multitrack.c:7396
 msgid "Render _video"
 msgstr ""
 
-#: src/multitrack.c:7225
+#: src/multitrack.c:7401
 msgid "Render _audio"
 msgstr ""
 
-#: src/multitrack.c:7235
+#: src/multitrack.c:7411
 msgid "_Normalise rendered audio"
 msgstr ""
 
-#: src/multitrack.c:7242
+#: src/multitrack.c:7418
 msgid "_Pre-render audio"
 msgstr ""
 
-#: src/multitrack.c:7251
+#: src/multitrack.c:7427
 msgid "_View"
 msgstr ""
 
-#: src/multitrack.c:7270
+#: src/multitrack.c:7446
 msgid "Block _In/out points"
 msgstr ""
 
-#: src/multitrack.c:7279
+#: src/multitrack.c:7455
 msgid "_Effects at current"
 msgstr ""
 
-#: src/multitrack.c:7297
+#: src/multitrack.c:7473
 msgid "Audio parameters"
 msgstr ""
 
-#: src/multitrack.c:7308
+#: src/multitrack.c:7484
 msgid "Show backing _audio track"
 msgstr ""
 
-#: src/multitrack.c:7312
+#: src/multitrack.c:7488
 msgid "Compact view"
 msgstr ""
 
-#: src/multitrack.c:7320
+#: src/multitrack.c:7496
 msgid "Maximum tracks to display..."
 msgstr ""
 
-#: src/multitrack.c:7327
+#: src/multitrack.c:7503
 msgid "Scroll to follow playback"
 msgstr ""
 
-#: src/multitrack.c:7331
+#: src/multitrack.c:7507
 msgid "_Center on cursor"
 msgstr ""
 
-#: src/multitrack.c:7338
+#: src/multitrack.c:7514
 msgid "_Zoom in"
 msgstr ""
 
-#: src/multitrack.c:7349
+#: src/multitrack.c:7525
 msgid "_Zoom out"
 msgstr ""
 
-#: src/multitrack.c:7361
+#: src/multitrack.c:7537
 msgid "Multitrack _details"
 msgstr ""
 
-#: src/multitrack.c:7374
+#: src/multitrack.c:7550
 msgid "_Event Window"
 msgstr ""
 
-#: src/multitrack.c:7378
+#: src/multitrack.c:7554
 msgid "_Event Window (selected time only)"
 msgstr ""
 
-#: src/multitrack.c:7382
+#: src/multitrack.c:7558
 msgid "_Show FRAME events"
 msgstr ""
 
-#: src/multitrack.c:7399
+#: src/multitrack.c:7575
 msgid "_Show multitrack keys"
 msgstr ""
 
-#: src/multitrack.c:7468
+#: src/multitrack.c:7644
 msgid "Mouse mode: _Move"
 msgstr ""
 
-#: src/multitrack.c:7476
+#: src/multitrack.c:7652
 msgid "Mouse mode: _Select"
 msgstr ""
 
-#: src/multitrack.c:7505
+#: src/multitrack.c:7681
 msgid "Insert mode: _Normal"
 msgstr ""
 
-#: src/multitrack.c:7733
+#: src/multitrack.c:7909
 msgid "Insert with _audio"
 msgstr ""
 
-#: src/multitrack.c:7734
+#: src/multitrack.c:7910
 msgid ""
 "Select whether video clips are inserted and moved with their audio or not"
 msgstr ""
 
-#: src/multitrack.c:7829
+#: src/multitrack.c:8007
 msgid "Select _overlap"
 msgstr ""
 
-#: src/multitrack.c:7830
+#: src/multitrack.c:8008
 msgid ""
 "Select whether timeline selection snaps to overlap between selected tracks "
 "or not"
 msgstr ""
 
-#: src/multitrack.c:7894 src/multitrack.c:14198
+#: src/multitrack.c:8073 src/multitrack.c:14422
 msgid "Expanded View (d)"
 msgstr ""
 
-#: src/multitrack.c:7897 src/multitrack.c:14205
+#: src/multitrack.c:8076 src/multitrack.c:14428
 msgid "Compact View (d)"
 msgstr ""
 
-#: src/multitrack.c:7939
+#: src/multitrack.c:8118
 msgid "Gravity: _Normal"
 msgstr ""
 
-#: src/multitrack.c:7952
+#: src/multitrack.c:8131
 msgid "Gravity: _Left"
 msgstr ""
 
-#: src/multitrack.c:7967
+#: src/multitrack.c:8146
 msgid "Gravity: _Right"
 msgstr ""
 
-#: src/multitrack.c:8297
+#: src/multitrack.c:8496
 msgid "_Apply"
 msgstr ""
 
-#: src/multitrack.c:8319
+#: src/multitrack.c:8518
 msgid "Time"
 msgstr ""
 
-#: src/multitrack.c:8333
+#: src/multitrack.c:8532
 msgid "_Del. node"
 msgstr ""
 
-#: src/multitrack.c:8341
+#: src/multitrack.c:8540
 msgid "_Next node"
 msgstr ""
 
-#: src/multitrack.c:8349
+#: src/multitrack.c:8548
 msgid "_Prev node"
 msgstr ""
 
-#: src/multitrack.c:8373
+#: src/multitrack.c:8574
 msgid "_Reverse playback  "
 msgstr ""
 
-#: src/multitrack.c:8395
+#: src/multitrack.c:8596
 msgid "_Velocity  "
 msgstr ""
 
-#: src/multitrack.c:8464
+#: src/multitrack.c:8664
 msgid "Anchor _start"
 msgstr ""
 
-#: src/multitrack.c:8465
+#: src/multitrack.c:8665
 msgid "Anchor the start point to the timeline"
 msgstr ""
 
-#: src/multitrack.c:8481
-msgid "Start frame"
-msgstr ""
-
-#: src/multitrack.c:8533
+#: src/multitrack.c:8728
 msgid "Anchor _end"
 msgstr ""
 
-#: src/multitrack.c:8534
+#: src/multitrack.c:8729
 msgid "Anchor the end point to the timeline"
 msgstr ""
 
-#: src/multitrack.c:8546
-msgid "End frame"
-msgstr ""
-
-#: src/multitrack.c:8739
+#: src/multitrack.c:8929
 msgid "Scroll"
 msgstr ""
 
-#: src/multitrack.c:9316
+#: src/multitrack.c:9502
 msgid ""
 "\n"
 "==============================\n"
 "Switched to Clip Edit mode\n"
 msgstr ""
 
-#: src/multitrack.c:9502
+#: src/multitrack.c:9708
 msgid "Timeline (seconds)"
 msgstr ""
 
-#: src/multitrack.c:9984
+#: src/multitrack.c:10202
 msgid " Backing audio"
 msgstr ""
 
-#: src/multitrack.c:9987
+#: src/multitrack.c:10204
 #, c-format
 msgid " Layer %d audio"
 msgstr ""
 
-#: src/multitrack.c:9995
+#: src/multitrack.c:10212
 msgid "Show/hide audio details"
 msgstr ""
 
-#: src/multitrack.c:10010 src/multitrack.c:10232
+#: src/multitrack.c:10227 src/multitrack.c:10452
 #, c-format
 msgid "Layer %d audio"
 msgstr ""
 
-#: src/multitrack.c:10144 src/multitrack.c:10261
+#: src/multitrack.c:10353 src/multitrack.c:10481
 #, c-format
 msgid "%s (layer %d)"
 msgstr ""
 
-#: src/multitrack.c:10184
+#: src/multitrack.c:10403
 msgid "Select track"
 msgstr ""
 
-#: src/multitrack.c:10188
+#: src/multitrack.c:10407
 msgid "Show/hide audio"
 msgstr ""
 
-#: src/multitrack.c:10194
+#: src/multitrack.c:10413
 #, c-format
 msgid "Video %d"
 msgstr ""
 
-#: src/multitrack.c:10233
+#: src/multitrack.c:10453
 #, c-format
 msgid " %s"
 msgstr ""
 
-#: src/multitrack.c:10346
+#: src/multitrack.c:10574
 msgid "LiVES: Selected effect"
 msgstr ""
 
-#: src/multitrack.c:10358
+#: src/multitrack.c:10586
 msgid "_View/Edit this effect"
 msgstr ""
 
-#: src/multitrack.c:10361
+#: src/multitrack.c:10588
 msgid "_View this effect"
 msgstr ""
 
-#: src/multitrack.c:10369
+#: src/multitrack.c:10596
 msgid "_Delete this effect"
 msgstr ""
 
-#: src/multitrack.c:10422
+#: src/multitrack.c:10648
 msgid "Cannot insert after this effect"
 msgstr ""
 
-#: src/multitrack.c:10451
+#: src/multitrack.c:10677
 msgid "This effect cannot be moved"
 msgstr ""
 
-#: src/multitrack.c:10499
+#: src/multitrack.c:10724
 #, c-format
 msgid "  %d to %d selected  "
 msgstr ""
 
-#: src/multitrack.c:10502 src/multitrack.c:10746
+#: src/multitrack.c:10727 src/multitrack.c:10968
 #, c-format
 msgid "%.2f sec."
 msgstr ""
 
-#: src/multitrack.c:10717
+#: src/multitrack.c:10940
 #, c-format
 msgid "%d frames"
 msgstr ""
 
-#: src/multitrack.c:11070
+#: src/multitrack.c:11299
 msgid ""
 "\n"
 "==============================\n"
 "Switched to Multitrack mode\n"
 msgstr ""
 
-#: src/multitrack.c:12691
+#: src/multitrack.c:12939
 msgid "Drag the time slider to where you"
 msgstr ""
 
-#: src/multitrack.c:12692
+#: src/multitrack.c:12940
 msgid "want to set effect parameters"
 msgstr ""
 
-#: src/multitrack.c:12693
+#: src/multitrack.c:12941
 msgid "Set parameters, then click \"Apply\"\n"
 msgstr ""
 
-#: src/multitrack.c:12694
+#: src/multitrack.c:12942
 msgid ""
 "NODES are points where parameters\n"
 "have been set.\n"
 "Nodes can be deleted."
 msgstr ""
 
-#: src/multitrack.c:12697
+#: src/multitrack.c:12944
 msgid "Effect has no parameters.\n"
 msgstr ""
 
-#: src/multitrack.c:12788
+#: src/multitrack.c:13033
 #, c-format
 msgid "%s output"
 msgstr ""
 
-#: src/multitrack.c:12794 src/multitrack.c:12804
+#: src/multitrack.c:13038 src/multitrack.c:13046
 #, c-format
 msgid "layer %d"
 msgstr ""
 
-#: src/multitrack.c:12796 src/multitrack.c:12806
+#: src/multitrack.c:13039 src/multitrack.c:13047
 msgid "audio track"
 msgstr ""
 
-#: src/multitrack.c:12797
+#: src/multitrack.c:13040
 #, c-format
 msgid "%s to %s"
 msgstr ""
 
-#: src/multitrack.c:12807
+#: src/multitrack.c:13048
 #, c-format
 msgid "%s from %s"
 msgstr ""
 
-#: src/multitrack.c:12860
+#: src/multitrack.c:13099
 msgid "_Prev filter map"
 msgstr ""
 
-#: src/multitrack.c:12871
+#: src/multitrack.c:13110
 msgid "Insert _before"
 msgstr ""
 
-#: src/multitrack.c:12881
+#: src/multitrack.c:13120
 msgid "Insert _after"
 msgstr ""
 
-#: src/multitrack.c:12896
+#: src/multitrack.c:13134
 msgid "_Next filter map"
 msgstr ""
 
-#: src/multitrack.c:12911
+#: src/multitrack.c:13148
 msgid ""
 "\n"
 "\n"
@@ -9104,271 +9108,271 @@
 "current time.\n"
 msgstr ""
 
-#: src/multitrack.c:12929
+#: src/multitrack.c:13166
 msgid ""
 "Drag a compositor anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:12936
+#: src/multitrack.c:13173
 msgid ""
 "Drag a transition anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:12944
+#: src/multitrack.c:13181
 msgid ""
 "Effects can be dragged\n"
 "onto blocks on the timeline."
 msgstr ""
 
-#: src/multitrack.c:13166
+#: src/multitrack.c:13406
 msgid "LiVES: Selected block/frame"
 msgstr ""
 
-#: src/multitrack.c:13173
+#: src/multitrack.c:13413
 msgid "_Select this block"
 msgstr ""
 
-#: src/multitrack.c:13183
+#: src/multitrack.c:13423
 msgid "_Split block here"
 msgstr ""
 
-#: src/multitrack.c:13191
+#: src/multitrack.c:13431
 msgid "List _effects here"
 msgstr ""
 
-#: src/multitrack.c:13200 src/multitrack.c:13277
+#: src/multitrack.c:13440 src/multitrack.c:13518
 #, c-format
 msgid "_Adjust %s"
 msgstr ""
 
-#: src/multitrack.c:13215
+#: src/multitrack.c:13455
 msgid "_Delete this block"
 msgstr ""
 
-#: src/multitrack.c:13258
+#: src/multitrack.c:13500
 msgid "_Insert here"
 msgstr ""
 
-#: src/multitrack.c:13264
+#: src/multitrack.c:13505
 msgid "_Insert audio here"
 msgstr ""
 
-#: src/multitrack.c:14801
+#: src/multitrack.c:15017
 #, c-format
 msgid "Inserted gap in selected tracks from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:14835
+#: src/multitrack.c:15048
 #, c-format
 msgid "Inserted gap in track %s from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15036
+#: src/multitrack.c:15244
 #, c-format
 msgid "Undid %s\n"
 msgstr ""
 
-#: src/multitrack.c:15235
+#: src/multitrack.c:15445
 #, c-format
 msgid "Redid %s\n"
 msgstr ""
 
-#: src/multitrack.c:15268
+#: src/multitrack.c:15475
 msgid ""
 "\n"
 " (variable)"
 msgstr ""
 
-#: src/multitrack.c:15502 src/multitrack.c:15614 src/multitrack.c:18736
-#: src/multitrack.c:18748
+#: src/multitrack.c:15710 src/multitrack.c:15823 src/multitrack.c:19077
+#: src/multitrack.c:19089
 #, c-format
 msgid "track %s"
 msgstr ""
 
-#: src/multitrack.c:15507 src/multitrack.c:15619 src/multitrack.c:18741
+#: src/multitrack.c:15715 src/multitrack.c:15828 src/multitrack.c:19082
 #, c-format
 msgid "tracks %s and %s"
 msgstr ""
 
-#: src/multitrack.c:15513 src/multitrack.c:15625 src/multitrack.c:18751
+#: src/multitrack.c:15721 src/multitrack.c:15834 src/multitrack.c:19091
 msgid "selected tracks"
 msgstr ""
 
-#: src/multitrack.c:15516
+#: src/multitrack.c:15726
 #, c-format
 msgid "Added %s %s to %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15550
+#: src/multitrack.c:15760
 #, c-format
 msgid "Added effect %s to track %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15631
+#: src/multitrack.c:15845
 #, c-format
 msgid "Deleted %s %s from %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15935
+#: src/multitrack.c:16143
 #, c-format
 msgid "rendered %d frames to new clip.\n"
 msgstr ""
 
-#: src/multitrack.c:16025
+#: src/multitrack.c:16230
 msgid "Cleaning up..."
 msgstr ""
 
-#: src/multitrack.c:16712
+#: src/multitrack.c:17003
 msgid "_Pause"
 msgstr ""
 
-#: src/multitrack.c:16713
+#: src/multitrack.c:17004
 msgid "Pause (p)"
 msgstr ""
 
-#: src/multitrack.c:16856
+#: src/multitrack.c:17151
 msgid "Press 'm' during playback"
 msgstr ""
 
-#: src/multitrack.c:16857
+#: src/multitrack.c:17152
 msgid "to make a mark on the timeline"
 msgstr ""
 
-#: src/multitrack.c:17154
+#: src/multitrack.c:17498
 #, c-format
 msgid ""
 "Inserted audio %.4f to %.4f from clip %s into backing audio from time %.4f "
 "to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:17414
+#: src/multitrack.c:17759
 #, c-format
 msgid ""
 "Inserted frames %d to %d from clip %s into track %s from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:17998
+#: src/multitrack.c:18332
 #, c-format
 msgid ""
 "Time region %.3f to %.3f\n"
 "selected.\n"
 msgstr ""
 
-#: src/multitrack.c:18002
+#: src/multitrack.c:18336
 msgid ""
 "select one or more tracks\n"
 "to create a region.\n"
 msgstr ""
 
-#: src/multitrack.c:18004
+#: src/multitrack.c:18337
 #, c-format
 msgid "%d video tracks selected.\n"
 msgstr ""
 
-#: src/multitrack.c:18006
+#: src/multitrack.c:18339
 msgid ""
 "Double click on timeline\n"
 "to deselect time region."
 msgstr ""
 
-#: src/multitrack.c:18013
+#: src/multitrack.c:18346
 msgid ""
 "Single click on an effect\n"
 "to select it."
 msgstr ""
 
-#: src/multitrack.c:18014
+#: src/multitrack.c:18347
 msgid ""
 "Double click on an effect\n"
 "to edit it."
 msgstr ""
 
-#: src/multitrack.c:18015
+#: src/multitrack.c:18348
 msgid ""
 "Right click on an effect\n"
 "for context menu.\n"
 msgstr ""
 
-#: src/multitrack.c:18017
+#: src/multitrack.c:18350
 msgid ""
 "Effect order can be changed at\n"
 "FILTER MAPS"
 msgstr ""
 
-#: src/multitrack.c:18024
+#: src/multitrack.c:18357
 msgid ""
 "You can select an effect,\n"
 "then use the INSERT BEFORE"
 msgstr ""
 
-#: src/multitrack.c:18025
+#: src/multitrack.c:18358
 msgid "or INSERT AFTER buttons to move it."
 msgstr ""
 
-#: src/multitrack.c:18307 src/multitrack.c:18320
+#: src/multitrack.c:18639 src/multitrack.c:18652
 msgid "Click on another effect,"
 msgstr ""
 
-#: src/multitrack.c:18308 src/multitrack.c:18321
+#: src/multitrack.c:18640 src/multitrack.c:18653
 msgid ""
 "and the selected one\n"
 "will be inserted"
 msgstr ""
 
-#: src/multitrack.c:18309
+#: src/multitrack.c:18641
 msgid "after it.\n"
 msgstr ""
 
-#: src/multitrack.c:18322
+#: src/multitrack.c:18654
 msgid "before it.\n"
 msgstr ""
 
-#: src/multitrack.c:18551
+#: src/multitrack.c:18889
 #, c-format
 msgid "Removed parameter values for effect %s at time %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:18759
+#: src/multitrack.c:19100
 #, c-format
 msgid "Set parameter values for %s %s on %s at time %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:19251 src/multitrack.c:20873
+#: src/multitrack.c:19630 src/multitrack.c:21195
 msgid "_Autoreload each time"
 msgstr ""
 
-#: src/multitrack.c:19323
+#: src/multitrack.c:19702
 msgid "Saving layout"
 msgstr ""
 
-#: src/multitrack.c:19345
+#: src/multitrack.c:19725
 #, c-format
 msgid "Saved layout to %s\n"
 msgstr ""
 
-#: src/multitrack.c:20783
+#: src/multitrack.c:21125
 msgid "clips and frames"
 msgstr ""
 
-#: src/multitrack.c:20787
+#: src/multitrack.c:21128
 msgid "clips"
 msgstr ""
 
-#: src/multitrack.c:20790
+#: src/multitrack.c:21130
 msgid "frames"
 msgstr ""
 
-#: src/multitrack.c:20800
+#: src/multitrack.c:21140
 msgid ""
 "\n"
 "Auto reload layout.\n"
 msgstr ""
 
-#: src/multitrack.c:20803
+#: src/multitrack.c:21143
 #, c-format
 msgid ""
 "%s\n"
@@ -9376,100 +9380,100 @@
 "Therefore it could not be loaded properly.\n"
 msgstr ""
 
-#: src/multitrack.c:20920
+#: src/multitrack.c:21284
 msgid "auto backup"
 msgstr ""
 
-#: src/multitrack.c:20923
+#: src/multitrack.c:21287
 #, c-format
 msgid ""
 "\n"
 "Unable to load layout file %s\n"
 msgstr ""
 
-#: src/multitrack.c:20944
+#: src/multitrack.c:21308
 #, c-format
 msgid "Loading layout from %s..."
 msgstr ""
 
-#: src/multitrack.c:20978
+#: src/multitrack.c:21338
 #, c-format
 msgid "Got %d events...processing..."
 msgstr ""
 
-#: src/multitrack.c:20991
+#: src/multitrack.c:21349
 msgid "Checking and rebuilding event list"
 msgstr ""
 
-#: src/multitrack.c:21017
+#: src/multitrack.c:21374
 #, c-format
 msgid "%d errors detected.\n"
 msgstr ""
 
-#: src/multitrack.c:21068
+#: src/multitrack.c:21422
 #, c-format
 msgid "Multitrack fps set to %.3f\n"
 msgstr ""
 
-#: src/multitrack.c:21225
+#: src/multitrack.c:21576
 msgid ""
 "The current layout has changes which have not been saved.\n"
 "Are you sure you wish to wipe it ?\n"
 msgstr ""
 
-#: src/multitrack.c:22047
+#: src/multitrack.c:22385
 msgid "LiVES: Multitrack audio mixer"
 msgstr ""
 
-#: src/multitrack.c:22077
+#: src/multitrack.c:22414
 msgid "_Reset values"
 msgstr ""
 
-#: src/multitrack.c:22081
+#: src/multitrack.c:22418
 msgid "_Close mixer"
 msgstr ""
 
-#: src/multitrack.c:22130
+#: src/multitrack.c:22466
 msgid ""
 "_Invert backing audio\n"
 "and layer volumes"
 msgstr ""
 
-#: src/multitrack.c:22132
+#: src/multitrack.c:22468
 msgid "Adjust backing and layer audio values so that they sum to 1.0"
 msgstr ""
 
-#: src/multitrack.c:22175
+#: src/multitrack.c:22510
 msgid "_Gang layer audio"
 msgstr ""
 
-#: src/multitrack.c:22177
+#: src/multitrack.c:22512
 msgid "Adjust all layer audio values to the same value"
 msgstr ""
 
-#: src/jack.c:104
+#: src/jack.c:102
 msgid "JACK server started\n"
 msgstr ""
 
-#: src/jack.c:1284 src/jack.c:1353
+#: src/jack.c:1265 src/jack.c:1334
 msgid "Unable to connect to JACK server\n"
 msgstr ""
 
-#: src/jack.c:1512
+#: src/jack.c:1491
 msgid "Started jack audio subsystem.\n"
 msgstr ""
 
-#: src/jack.c:1623
+#: src/jack.c:1600
 msgid "Started jack audio reader.\n"
 msgstr ""
 
-#: src/jack.c:1838
+#: src/jack.c:1815
 msgid ""
 "\n"
 "Connection to jack audio was reset.\n"
 msgstr ""
 
-#: src/pulse.c:87
+#: src/pulse.c:88
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -9477,7 +9481,7 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:92
+#: src/pulse.c:94
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -9485,7 +9489,7 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:96
+#: src/pulse.c:99
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -9493,335 +9497,335 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:101
+#: src/pulse.c:104
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
 msgstr ""
 
-#: src/pulse.c:107
+#: src/pulse.c:109
 msgid "LiVES will exit and you can choose another audio player.\n"
 msgstr ""
 
-#: src/pulse.c:1352
+#: src/pulse.c:1335
 msgid ""
 "\n"
 "Connection to pulse audio was reset.\n"
 msgstr ""
 
-#: src/colourspace.c:1100
+#: src/colourspace.c:1092
 msgid "unclamped"
 msgstr ""
 
-#: src/colourspace.c:1101
+#: src/colourspace.c:1093
 msgid "clamped"
 msgstr ""
 
-#: src/omc-learn.c:195
+#: src/omc-learn.c:191
 #, c-format
 msgid "Responding to joystick events from %s\n"
 msgstr ""
 
-#: src/omc-learn.c:289
+#: src/omc-learn.c:279
 msgid "Creating ALSA seq port..."
 msgstr ""
 
-#: src/omc-learn.c:325
+#: src/omc-learn.c:313
 #, c-format
 msgid "Responding to MIDI events from %s\n"
 msgstr ""
 
-#: src/omc-learn.c:568
+#: src/omc-learn.c:554
 msgid "data"
 msgstr ""
 
-#: src/omc-learn.c:571
+#: src/omc-learn.c:557
 msgid "velocity"
 msgstr ""
 
-#: src/omc-learn.c:572
+#: src/omc-learn.c:558
 msgid "note"
 msgstr ""
 
-#: src/omc-learn.c:574 src/omc-learn.c:736 src/omc-learn.c:1105
-#: src/omc-learn.c:1591 src/omc-learn.c:1640
+#: src/omc-learn.c:560 src/omc-learn.c:724 src/omc-learn.c:1092
+#: src/omc-learn.c:1581 src/omc-learn.c:1630
 msgid "value"
 msgstr ""
 
-#: src/omc-learn.c:576
+#: src/omc-learn.c:562
 msgid "state"
 msgstr ""
 
-#: src/omc-learn.c:688
+#: src/omc-learn.c:674
 msgid "variable"
 msgstr ""
 
-#: src/omc-learn.c:1001
+#: src/omc-learn.c:989
 msgid "Vars."
 msgstr ""
 
-#: src/omc-learn.c:1054
+#: src/omc-learn.c:1041
 #, c-format
 msgid "MIDI ch %d note on"
 msgstr ""
 
-#: src/omc-learn.c:1058
+#: src/omc-learn.c:1045
 #, c-format
 msgid "MIDI ch %d note off"
 msgstr ""
 
-#: src/omc-learn.c:1062
+#: src/omc-learn.c:1049
 #, c-format
 msgid "MIDI ch %d controller %d"
 msgstr ""
 
-#: src/omc-learn.c:1066
+#: src/omc-learn.c:1053
 #, c-format
 msgid "MIDI ch %d pitch bend"
 msgstr ""
 
-#: src/omc-learn.c:1070
+#: src/omc-learn.c:1057
 #, c-format
 msgid "MIDI ch %d pgm change"
 msgstr ""
 
-#: src/omc-learn.c:1073
+#: src/omc-learn.c:1060
 #, c-format
 msgid "Joystick button %d"
 msgstr ""
 
-#: src/omc-learn.c:1076
+#: src/omc-learn.c:1063
 #, c-format
 msgid "Joystick axis %d"
 msgstr ""
 
-#: src/omc-learn.c:1113
+#: src/omc-learn.c:1100
 msgid "x"
 msgstr ""
 
-#: src/omc-learn.c:1122
+#: src/omc-learn.c:1109
 msgid "range"
 msgstr ""
 
-#: src/omc-learn.c:1143
+#: src/omc-learn.c:1130
 msgid "+ offset1"
 msgstr ""
 
-#: src/omc-learn.c:1161
+#: src/omc-learn.c:1150
 msgid "* scale"
 msgstr ""
 
-#: src/omc-learn.c:1179
+#: src/omc-learn.c:1170
 msgid "+ offset2"
 msgstr ""
 
-#: src/omc-learn.c:1280
+#: src/omc-learn.c:1270
 msgid ""
 "\n"
 "Click OK to delete all entries\n"
 msgstr ""
 
-#: src/omc-learn.c:1318
+#: src/omc-learn.c:1308
 msgid "LiVES: OMC learner"
 msgstr ""
 
-#: src/omc-learn.c:1334
+#: src/omc-learn.c:1324
 msgid "Clear _unmatched"
 msgstr ""
 
-#: src/omc-learn.c:1345
+#: src/omc-learn.c:1335
 msgid "_Delete all"
 msgstr ""
 
-#: src/omc-learn.c:1411
+#: src/omc-learn.c:1401
 msgid "Start video playback"
 msgstr ""
 
-#: src/omc-learn.c:1414
+#: src/omc-learn.c:1404
 msgid "Stop video playback"
 msgstr ""
 
-#: src/omc-learn.c:1418
+#: src/omc-learn.c:1408
 msgid "Clip select <clipnum>"
 msgstr ""
 
-#: src/omc-learn.c:1419
+#: src/omc-learn.c:1409
 msgid "Switch foreground clip to the nth valid clip"
 msgstr ""
 
-#: src/omc-learn.c:1423
+#: src/omc-learn.c:1413
 msgid "Play forwards"
 msgstr ""
 
-#: src/omc-learn.c:1424
+#: src/omc-learn.c:1414
 msgid "Play video in a forwards direction"
 msgstr ""
 
-#: src/omc-learn.c:1427
+#: src/omc-learn.c:1417
 msgid "Play backwards"
 msgstr ""
 
-#: src/omc-learn.c:1428
+#: src/omc-learn.c:1418
 msgid "Play video in a backwards direction"
 msgstr ""
 
-#: src/omc-learn.c:1431
+#: src/omc-learn.c:1421
 msgid "Reverse playback direction"
 msgstr ""
 
-#: src/omc-learn.c:1432
+#: src/omc-learn.c:1422
 msgid "Reverse direction of video playback"
 msgstr ""
 
-#: src/omc-learn.c:1435
+#: src/omc-learn.c:1425
 msgid "Play video faster"
 msgstr ""
 
-#: src/omc-learn.c:1436
+#: src/omc-learn.c:1426
 msgid "Play video at a slightly faster rate"
 msgstr ""
 
-#: src/omc-learn.c:1439
+#: src/omc-learn.c:1429
 msgid "Play video slower"
 msgstr ""
 
-#: src/omc-learn.c:1440
+#: src/omc-learn.c:1430
 msgid "Play video at a slightly slower rate"
 msgstr ""
 
-#: src/omc-learn.c:1443
+#: src/omc-learn.c:1433
 msgid "Toggle video freeze"
 msgstr ""
 
-#: src/omc-learn.c:1444
+#: src/omc-learn.c:1434
 msgid "Freeze video, or if already frozen, unfreeze it"
 msgstr ""
 
-#: src/omc-learn.c:1447
+#: src/omc-learn.c:1437
 msgid "Set video framerate to <fps>"
 msgstr ""
 
-#: src/omc-learn.c:1448
+#: src/omc-learn.c:1438
 msgid "Set framerate of foreground clip to <float fps>"
 msgstr ""
 
-#: src/omc-learn.c:1452
+#: src/omc-learn.c:1442
 msgid "Start recording"
 msgstr ""
 
-#: src/omc-learn.c:1455
+#: src/omc-learn.c:1445
 msgid "Stop recording"
 msgstr ""
 
-#: src/omc-learn.c:1458
+#: src/omc-learn.c:1448
 msgid "Toggle recording state"
 msgstr ""
 
-#: src/omc-learn.c:1461
+#: src/omc-learn.c:1451
 msgid "Swap foreground and background clips"
 msgstr ""
 
-#: src/omc-learn.c:1463
+#: src/omc-learn.c:1453
 msgid "Reset effect keys"
 msgstr ""
 
-#: src/omc-learn.c:1464
+#: src/omc-learn.c:1454
 msgid "Switch all effects off."
 msgstr ""
 
-#: src/omc-learn.c:1467
+#: src/omc-learn.c:1457
 msgid "Enable effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1471
+#: src/omc-learn.c:1461
 msgid "Disable effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1475
+#: src/omc-learn.c:1465
 msgid "Toggle effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1479
+#: src/omc-learn.c:1469
 msgid "Set parameter value <key> <pnum> = <value>"
 msgstr ""
 
-#: src/omc-learn.c:1480
+#: src/omc-learn.c:1470
 msgid "Set <value> of pth (numerical) parameter for effect key <key>."
 msgstr ""
 
-#: src/omc-learn.c:1484
+#: src/omc-learn.c:1474
 msgid "Switch foreground to next clip"
 msgstr ""
 
-#: src/omc-learn.c:1487
+#: src/omc-learn.c:1477
 msgid "Switch foreground to previous clip"
 msgstr ""
 
-#: src/omc-learn.c:1490
+#: src/omc-learn.c:1480
 msgid "Set video framerate to ratio <fps_ratio>"
 msgstr ""
 
-#: src/omc-learn.c:1491
+#: src/omc-learn.c:1481
 msgid "Set framerate ratio of foreground clip to <float fps_ratio>"
 msgstr ""
 
-#: src/omc-learn.c:1495
+#: src/omc-learn.c:1485
 msgid "Retrigger clip <clipnum>"
 msgstr ""
 
-#: src/omc-learn.c:1496
+#: src/omc-learn.c:1486
 msgid ""
 "Switch foreground clip to the nth valid clip, and reset the frame number"
 msgstr ""
 
-#: src/omc-learn.c:1500
+#: src/omc-learn.c:1490
 msgid "Cycle to next mode for effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1504
+#: src/omc-learn.c:1494
 msgid "Cycle to previous mode for effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1508
+#: src/omc-learn.c:1498
 msgid "Set playback plugin parameter value <pnum> = <value>"
 msgstr ""
 
-#: src/omc-learn.c:1509
+#: src/omc-learn.c:1499
 msgid "Set <value> of pth parameter for the playback plugin."
 msgstr ""
 
 #. TRANSLATORS: short form of "clip number"
-#: src/omc-learn.c:1536 src/omc-learn.c:1607
+#: src/omc-learn.c:1526 src/omc-learn.c:1597
 msgid "clipnum"
 msgstr ""
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1545
+#: src/omc-learn.c:1535
 msgid "fps"
 msgstr ""
 
 #. TRANSLATORS: as in keyboard key
-#: src/omc-learn.c:1553 src/omc-learn.c:1560 src/omc-learn.c:1567
-#: src/omc-learn.c:1575 src/omc-learn.c:1615 src/omc-learn.c:1623
+#: src/omc-learn.c:1543 src/omc-learn.c:1550 src/omc-learn.c:1557
+#: src/omc-learn.c:1565 src/omc-learn.c:1605 src/omc-learn.c:1613
 msgid "key"
 msgstr ""
 
 #. TRANSLATORS: short form of "parameter number"
-#: src/omc-learn.c:1583 src/omc-learn.c:1632
+#: src/omc-learn.c:1573 src/omc-learn.c:1622
 msgid "pnum"
 msgstr ""
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1599
+#: src/omc-learn.c:1589
 msgid "fps_ratio"
 msgstr ""
 
-#: src/omc-learn.c:2443
+#: src/omc-learn.c:2417
 #, c-format
 msgid "Saving device mapping to file %s..."
 msgstr ""
 
-#: src/omc-learn.c:2527
+#: src/omc-learn.c:2498
 #, c-format
 msgid ""
 "\n"
@@ -9830,7 +9834,7 @@
 "%s\n"
 msgstr ""
 
-#: src/omc-learn.c:2534
+#: src/omc-learn.c:2505
 #, c-format
 msgid ""
 "\n"
@@ -9839,12 +9843,12 @@
 "%s\n"
 msgstr ""
 
-#: src/omc-learn.c:2571
+#: src/omc-learn.c:2541
 #, c-format
 msgid "Loading device mapping from file %s..."
 msgstr ""
 
-#: src/omc-learn.c:2576
+#: src/omc-learn.c:2544
 #, c-format
 msgid ""
 "\n"
@@ -9854,12 +9858,12 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/videodev.c:547
+#: src/videodev.c:539
 #, c-format
 msgid "Unable to open device %s\n"
 msgstr ""
 
-#: src/videodev.c:564
+#: src/videodev.c:554
 #, c-format
 msgid "Opened device %s\n"
 msgstr ""

LiVES-2.2.8.tar.bz2/po/pt.po -> LiVES-2.4.1.tar.bz2/po/pt.po Changed

@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: LiVES\n"
 "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n"
-"POT-Creation-Date: 2015-02-08 17:18-0300\n"
+"POT-Creation-Date: 2015-08-09 14:52-0300\n"
 "PO-Revision-Date: 2013-03-14 12:31+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: pixel <vjpixel@gmail.com>\n"
@@ -15,8 +15,7 @@
 "X-Poedit-Language: Portuguese\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#. TRANSLATORS: do not translate this message
-#: src/main.c:118
+#: src/main.c:128
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -25,22 +24,22 @@
 "http://lives.sourceforge.net/TRANS-README.txt"
 msgstr ""
 
-#: src/main.c:134
+#: src/main.c:153
 #, c-format
 msgid "%s Warning: %s\n"
 msgstr ""
 
-#: src/main.c:138
+#: src/main.c:157
 #, c-format
 msgid "%s Critical error: %s\n"
 msgstr ""
 
-#: src/main.c:139
+#: src/main.c:158
 #, c-format
 msgid "%s Fatal error: %s\n"
 msgstr ""
 
-#: src/main.c:176
+#: src/main.c:198
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -54,7 +53,7 @@
 "group_id=64341&atid=5071 39\n"
 "Obrigado. A recuperação deve ser possível se você reiniciar LiVES.\n"
 
-#: src/main.c:177
+#: src/main.c:199
 msgid ""
 "\n"
 "\n"
@@ -66,7 +65,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:180
+#: src/main.c:203
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -74,91 +73,91 @@
 "e todas as informações mostradas abaixo:\n"
 "\n"
 
-#: src/main.c:184
+#: src/main.c:206
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
 "\n"
 msgstr ""
 
-#: src/main.c:192
+#: src/main.c:216
 msgid "Preserving set.\n"
 msgstr "Preservando set.\n"
 
-#: src/main.c:636
+#: src/main.c:691
 msgid "Resizing"
 msgstr "A redimensionar"
 
-#: src/main.c:643
+#: src/main.c:698
 msgid "_Resize All Frames"
 msgstr "_Redimensionar Todos Frames"
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:895
+#: src/main.c:948
 msgid "Any"
 msgstr "Qualquer"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:897
+#: src/main.c:950
 msgid "None"
 msgstr "Nenhum"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:899
+#: src/main.c:952
 msgid "recommended"
 msgstr "recomendado"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:901
+#: src/main.c:954
 msgid "disabled !"
 msgstr "desactivado!"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:903
+#: src/main.c:956
 msgid "**The current layout**"
 msgstr "**O layout atual**"
 
 #. TRANSLATORS: adjective for "Built in" type effects
-#: src/main.c:905
+#: src/main.c:958
 msgid "Builtin"
 msgstr "Builtin"
 
 #. TRANSLATORS: adjective for "Custom" type effects
-#: src/main.c:907
+#: src/main.c:960
 msgid "Custom"
 msgstr "Customizado"
 
 #. TRANSLATORS: adjective for "Test" type effects
-#: src/main.c:909
+#: src/main.c:962
 msgid "Test"
 msgstr "Teste"
 
-#: src/main.c:1054
+#: src/main.c:1107
 msgid "Foreground"
 msgstr ""
 
-#: src/main.c:1055
+#: src/main.c:1108
 #, fuzzy
 msgid "Background"
 msgstr "Fundo _Branco"
 
-#: src/main.c:1566
+#: src/main.c:1624
 msgid "Loading realtime effect plugins..."
 msgstr "A carregar plugins de efeito em tempo real..."
 
-#: src/main.c:1631
+#: src/main.c:1690
 msgid "Starting jack audio server..."
 msgstr "A iniciar servidor de jack audio..."
 
-#: src/main.c:1633
+#: src/main.c:1692
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1634
+#: src/main.c:1693
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1663
+#: src/main.c:1723
 #, c-format
 msgid ""
 "\n"
@@ -170,114 +169,114 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1697
+#: src/main.c:1758
 msgid "Starting pulse audio server..."
 msgstr ""
 
-#: src/main.c:1765
+#: src/main.c:1825
 msgid "Checking optional dependencies:"
 msgstr "A verificar as dependências opcionais:"
 
-#: src/main.c:1766
+#: src/main.c:1826
 msgid "mplayer...detected..."
 msgstr "mplayer...detectado..."
 
-#: src/main.c:1767
+#: src/main.c:1827
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...NÃO DETECTADO..."
 
-#: src/main.c:1768
+#: src/main.c:1828
 #, fuzzy
 msgid "mplayer2...detected..."
 msgstr "mplayer...detectado..."
 
-#: src/main.c:1769
+#: src/main.c:1829
 #, fuzzy
 msgid "mplayer2...NOT DETECTED..."
 msgstr "mplayer...NÃO DETECTADO..."
 
-#: src/main.c:1770
+#: src/main.c:1830
 msgid "convert...detected..."
 msgstr "convert...detectado..."
 
-#: src/main.c:1771
+#: src/main.c:1831
 msgid "convert...NOT DETECTED..."
 msgstr "convert...NÃO DETECTADO..."
 
-#: src/main.c:1772
+#: src/main.c:1832
 msgid "composite...detected..."
 msgstr "composite...detectado..."
 
-#: src/main.c:1773
+#: src/main.c:1833
 msgid "composite...NOT DETECTED..."
 msgstr "composite...NÃO DETECTADO..."
 
-#: src/main.c:1774
+#: src/main.c:1834
 msgid "sox...detected\n"
 msgstr "sox...detectado\n"
 
-#: src/main.c:1775
+#: src/main.c:1835
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...NÃO DETECTADO...\n"
 
-#: src/main.c:1776
+#: src/main.c:1836
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...detectado..."
 
-#: src/main.c:1777
+#: src/main.c:1837
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...NÃO DETECTADO..."
 
-#: src/main.c:1778
+#: src/main.c:1838
 msgid "jackd...detected..."
 msgstr "jackd...detectado..."
 
-#: src/main.c:1779
+#: src/main.c:1839
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...NÃO DETECTADO..."
 
-#: src/main.c:1780
+#: src/main.c:1840
 msgid "pulse audio...detected..."
 msgstr "pulse audio...detectados..."
 
-#: src/main.c:1781
+#: src/main.c:1841
 msgid "pulse audio...NOT DETECTED..."
 msgstr "pulse audio...NÃO DETECTADO..."
 
-#: src/main.c:1782
+#: src/main.c:1842
 msgid "python...detected..."
 msgstr "python...detectado..."
 
-#: src/main.c:1783
+#: src/main.c:1843
 msgid "python...NOT DETECTED..."
 msgstr "python...NÃO DETECTADO..."
 
-#: src/main.c:1784
+#: src/main.c:1844
 msgid "dvgrab...detected..."
 msgstr "dvgrab...detectado..."
 
-#: src/main.c:1785
+#: src/main.c:1845
 msgid "dvgrab...NOT DETECTED..."
 msgstr "dvgrab...NÃO DETECTADO..."
 
-#: src/main.c:1786
+#: src/main.c:1846
 msgid "xwininfo...detected..."
 msgstr "xwininfo...detectado..."
 
-#: src/main.c:1787
+#: src/main.c:1847
 msgid "xwininfo...NOT DETECTED..."
 msgstr "xwininfo...NÃO DETECTADO..."
 
-#: src/main.c:1793
+#: src/main.c:1853
 #, c-format
 msgid "Windows version %04X"
 msgstr ""
 
-#: src/main.c:1795
+#: src/main.c:1855
 msgid "UNKNOWN - please patch me !"
 msgstr ""
 
-#: src/main.c:1799
+#: src/main.c:1859
 #, c-format
 msgid ""
 "\n"
@@ -288,63 +287,63 @@
 "\n"
 "Gerenciador de janelas: \"%s\"; "
 
-#: src/main.c:1802
+#: src/main.c:1862
 #, c-format
 msgid "number of monitors detected: %d\n"
 msgstr "número de monitores detectados: %d\n"
 
-#: src/main.c:1805
+#: src/main.c:1865
 #, c-format
 msgid "Number of CPUs detected: %d "
 msgstr ""
 
-#: src/main.c:1808 src/multitrack.c:4902
+#: src/main.c:1868 src/multitrack.c:5068
 msgid "little endian"
 msgstr ""
 
-#: src/main.c:1809 src/multitrack.c:4901
+#: src/main.c:1869 src/multitrack.c:5067
 msgid "big endian"
 msgstr ""
 
-#: src/main.c:1810
+#: src/main.c:1870
 #, c-format
 msgid "(%d bits, %s)\n"
 msgstr ""
 
-#: src/main.c:1814
+#: src/main.c:1874
 msgid "GUI type is: "
 msgstr ""
 
-#: src/main.c:1818
+#: src/main.c:1878
 #, c-format
 msgid "GTK+ version %d.%d.%d (compiled with %d.%d.%d)"
 msgstr ""
 
-#: src/main.c:1840
+#: src/main.c:1900
 msgid ", with cairo support"
 msgstr ""
 
-#: src/main.c:1847
+#: src/main.c:1907
 #, c-format
 msgid "Temp directory is %s\n"
 msgstr "o diretório temp utilizado é %s\n"
 
-#: src/main.c:1851
+#: src/main.c:1911
 msgid ""
 "WARNING - this version of LiVES was compiled without either\n"
 "jack or pulse audio support.\n"
 "Many audio features will be unavailable.\n"
 msgstr ""
 
-#: src/main.c:1854
+#: src/main.c:1914
 msgid "Compiled with jack support, good !\n"
 msgstr "Compilado com suporte a JACK, bom!\n"
 
-#: src/main.c:1857
+#: src/main.c:1917
 msgid "Compiled with pulse audio support, wonderful !\n"
 msgstr ""
 
-#: src/main.c:1861
+#: src/main.c:1921
 #, c-format
 msgid ""
 "Welcome to LiVES version %s.\n"
@@ -353,7 +352,7 @@
 "Bem vindo ao LiVES versão %s.\n"
 "\n"
 
-#: src/main.c:2306
+#: src/main.c:2380
 #, c-format
 msgid ""
 "\n"
@@ -363,85 +362,90 @@
 "A sintaxe de inicialização é: %s [opçoes] [nome_do_arquivo [tempo_inicial] "
 "[frames]]\n"
 
-#: src/main.c:2307
+#: src/main.c:2381
 msgid "Where: filename is the name of a media file or backup file.\n"
 msgstr "Onde: nome_do_arquivo é o nome do arquivo de mídia ou backup.\n"
 
-#: src/main.c:2308
+#: src/main.c:2382
 msgid "start_time : filename start time in seconds\n"
 msgstr "tempo_inicial : tempo inicial do arquivo em segundos\n"
 
-#: src/main.c:2309
+#: src/main.c:2383
 msgid "frames : maximum number of frames to open\n"
 msgstr "frames : número máximo de frames a abrir\n"
 
-#: src/main.c:2311
+#: src/main.c:2385
 msgid "opts can be:\n"
 msgstr "as opções podem ser:\n"
 
-#: src/main.c:2312
+#: src/main.c:2386
 msgid "-help            : show this help text and exit\n"
 msgstr "-help            : mostra este texto de ajuda e sai\n"
 
-#: src/main.c:2313
+#: src/main.c:2387
 msgid "-tmpdir <tempdir>: use alternate working directory (e.g /var/ramdisk)\n"
 msgstr ""
 
-#: src/main.c:2314
+#: src/main.c:2388
 msgid "-set <setname>   : autoload clip set setname\n"
 msgstr "-set <nome_do_set>   : autocarregar set de clips nome_do_set\n"
 
-#: src/main.c:2315
+#: src/main.c:2389
 msgid "-noset           : do not load any set on startup\n"
 msgstr "-noset           : não carregar set no início\n"
 
-#: src/main.c:2316
+#: src/main.c:2390
 msgid "-norecover       : force no-loading of crash recovery\n"
 msgstr "-norecover       : forçar não carregamento da recuperação de crash\n"
 
-#: src/main.c:2317
+#: src/main.c:2391
 msgid "-recover         : force loading of crash recovery\n"
 msgstr "-recover         : forçar carregamento da recuperação de crash\n"
 
-#: src/main.c:2318
-msgid "-nothreaddialog  : doe nothing - retained for backwards compatibility\n"
+#: src/main.c:2392
+msgid ""
+"-nothreaddialog  : does nothing - retained for backwards compatibility\n"
 msgstr ""
 
-#: src/main.c:2319
+#: src/main.c:2393
 msgid "-nogui           : do not show the gui\n"
 msgstr "-nogui           : não mostrar a interface gráfica\n"
 
-#: src/main.c:2320
+#: src/main.c:2394
 msgid "-nosplash        : do not show the splash window\n"
 msgstr ""
 
-#: src/main.c:2321
+#: src/main.c:2395
 msgid "-noplaywin       : do not show the play window\n"
 msgstr ""
 
-#: src/main.c:2322
+#: src/main.c:2396
+msgid "-noninteractive  : disable menu interactivity\n"
+msgstr ""
+
+#: src/main.c:2397
 msgid "-startup-ce      : start in clip editor mode\n"
 msgstr "-startup-ce : iniciar no modo de editor clip\n"
 
-#: src/main.c:2323
+#: src/main.c:2398
 msgid "-startup-mt      : start in multitrack mode\n"
 msgstr ""
 
-#: src/main.c:2324
+#: src/main.c:2399
 msgid ""
 "-fxmodesmax <n>  : allow <n> modes per effect key (minimum is 1, default is "
 "8)\n"
 msgstr ""
 
-#: src/main.c:2326
+#: src/main.c:2401
 msgid "-oscstart <port> : start OSC listener on UDP port <port>\n"
 msgstr "-oscstart <port> : iniciar monitoramento de OSC na porta UDP <port>\n"
 
-#: src/main.c:2327
+#: src/main.c:2402
 msgid "-nooscstart      : do not start OSC listener\n"
 msgstr "-nooscstart      : não iniciar monitoramento de OSC\n"
 
-#: src/main.c:2329
+#: src/main.c:2404
 #, fuzzy
 msgid ""
 "-aplayer <ap>    : start with selected audio player. <ap> can be mplayer, "
@@ -451,44 +455,44 @@
 "ser mplayer"
 
 #. TRANSLATORS: pulse (audio)
-#: src/main.c:2332
+#: src/main.c:2407
 msgid ", pulse"
 msgstr ", pulse"
 
-#: src/main.c:2335
+#: src/main.c:2410
 msgid ", sox or jack\n"
 msgstr ", sox ou jack\n"
 
-#: src/main.c:2336
+#: src/main.c:2412
 msgid ""
 "-jackopts <opts>    : opts is a bitmap of jack startup options [1 = jack "
 "transport client, 2 = jack transport master, 4 = start jack transport "
 "server, 8 = pause audio when video paused, 16 = start jack audio server] \n"
 msgstr ""
 
-#: src/main.c:2338
+#: src/main.c:2414
 msgid " or sox\n"
 msgstr " ou sox\n"
 
-#: src/main.c:2340
+#: src/main.c:2416
 msgid "-devicemap <mapname>          : autoload devicemap\n"
 msgstr ""
 
-#: src/main.c:2341
+#: src/main.c:2418
 msgid ""
 "-vppdefaults <file>          : load video playback plugin defaults from "
 "<file> (Note: only sets the settings, not the plugin type)\n"
 msgstr ""
 
-#: src/main.c:2342
+#: src/main.c:2419
 msgid "-debug            : try to debug crashes (requires 'gdb' installed)\n"
 msgstr ""
 
-#: src/main.c:2373 src/gui.c:1128
+#: src/main.c:2449 src/gui.c:1127
 msgid "Starting GUI..."
 msgstr "A iniciar GUI..."
 
-#: src/main.c:2396
+#: src/main.c:2475
 #, c-format
 msgid ""
 "\n"
@@ -499,7 +503,7 @@
 "(Maybe you need to change the value of <prefix_dir> in your %s file)\n"
 msgstr ""
 
-#: src/main.c:2410
+#: src/main.c:2492
 #, c-format
 msgid ""
 "\n"
@@ -507,7 +511,7 @@
 "Please make sure you have write access to %s and try again.\n"
 msgstr ""
 
-#: src/main.c:2415
+#: src/main.c:2498
 msgid ""
 "\n"
 "`smogrify` must be in your path, and be executable\n"
@@ -521,7 +525,7 @@
 "Por favor, leia o arquivo README que vem com este pacote\n"
 "antes de rodar o LiVES.\n"
 
-#: src/main.c:2421
+#: src/main.c:2504
 #, c-format
 msgid ""
 "\n"
@@ -531,7 +535,7 @@
 "Please check the file permissions for this file and try again.\n"
 msgstr ""
 
-#: src/main.c:2428
+#: src/main.c:2512
 #, c-format
 msgid ""
 "\n"
@@ -542,7 +546,7 @@
 "and try again.\n"
 msgstr ""
 
-#: src/main.c:2438
+#: src/main.c:2522
 #, c-format
 msgid ""
 "Please check the <tempdir> setting in \n"
@@ -550,7 +554,7 @@
 "and try again.\n"
 msgstr ""
 
-#: src/main.c:2445
+#: src/main.c:2528
 #, c-format
 msgid ""
 "\n"
@@ -560,7 +564,7 @@
 "%s"
 msgstr ""
 
-#: src/main.c:2453
+#: src/main.c:2536
 msgid ""
 "\n"
 "An incorrect version of smogrify was found in your path.\n"
@@ -578,7 +582,7 @@
 "\n"
 "Obrigado.\n"
 
-#: src/main.c:2458
+#: src/main.c:2541
 #, fuzzy
 msgid ""
 "\n"
@@ -589,7 +593,7 @@
 "LiVES atualmente precisa do 'mplayer' ou 'sox' para funcionar. Por favor "
 "instale um deles e tente novamente.\n"
 
-#: src/main.c:2462
+#: src/main.c:2546
 #, fuzzy
 msgid ""
 "\n"
@@ -600,7 +604,7 @@
 "LiVES atualmente precisa do 'mplayer' ou 'sox' para funcionar. Por favor "
 "instale um deles e tente novamente.\n"
 
-#: src/main.c:2472
+#: src/main.c:2556
 #, fuzzy
 msgid ""
 "\n"
@@ -611,7 +615,7 @@
 "LiVES não conseguiu encontrar 'mplayer'. Você deverá instalar o mplayer para "
 "utilizar o LiVES com todos os seus recursos.\n"
 
-#: src/main.c:2475
+#: src/main.c:2561
 msgid ""
 "\n"
 "LiVES was unable to locate 'convert'. You should install convert and image-"
@@ -621,7 +625,7 @@
 "LiVES não conseguiu localizar 'convert'. Você deverá instalar o Convert e o "
 "Image Magick, caso deseje utilizar os efeitos rederizados.\n"
 
-#: src/main.c:2478
+#: src/main.c:2566
 msgid ""
 "\n"
 "LiVES was unable to locate 'composite'. You should install composite and "
@@ -631,7 +635,7 @@
 "LiVES não conseguiu localizar 'composite'. Você deverá instalar o Composite "
 "e o Image Magick, caso deseje utilizar a função mesclar..\n"
 
-#: src/main.c:2481
+#: src/main.c:2570
 msgid ""
 "\n"
 "LiVES was unable to locate 'sox'. Some audio features may not work. You "
@@ -641,7 +645,7 @@
 "LiVES não foi capaz de localizar 'sox'. Alguns recursos de áudio podem não "
 "funcionar. Instale o 'sox'.\n"
 
-#: src/main.c:2484
+#: src/main.c:2575
 #, c-format
 msgid ""
 "\n"
@@ -652,59 +656,59 @@
 "You may need to change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/main.c:2611
+#: src/main.c:2707
 #, c-format
 msgid "Autoloading set %s..."
 msgstr "Inicio automático definido %s..."
 
 #. TRANSLATORS: localised name may be used here
-#: src/main.c:2781 src/interface.c:738
+#: src/main.c:2902
 msgid "LiVES"
 msgstr ""
 
-#: src/main.c:2948
+#: src/main.c:3066
 #, c-format
 msgid "Invalid audio player %s\n"
 msgstr "O reprodutor de áudio %s é inválido\n"
 
-#: src/main.c:3077
+#: src/main.c:3214
 #, c-format
 msgid "LiVES-%s: <Untitled%d> %dx%d : %d frames %d bpp %.3f fps"
 msgstr "LiVES-%s: <Sem título %d> %dx%d : %d frames %d bpp %.3f fps"
 
-#: src/main.c:3082
+#: src/main.c:3219
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : ??? frames ??? bpp %.3f fps"
 msgstr "LiVES-%s: <%s> %dx%d : ??? frames ??? bpp %.3f fps"
 
-#: src/main.c:3086
+#: src/main.c:3222
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : %d frames %d bpp %.3f fps"
 msgstr "LiVES-%s: <%s> %dx%d : %d frames %d bpp %.3f fps"
 
-#: src/main.c:3094
+#: src/main.c:3229
 #, c-format
 msgid "LiVES-%s: <No File>"
 msgstr "LiVES-%s: <Nenhum Arquivo>"
 
 #. TRANSLATORS: rec(ord)
-#: src/main.c:5085
+#: src/main.c:5201
 #, c-format
 msgid "rec %9d/%d"
 msgstr "grv %9d/%d"
 
 #. TRANSLATORS: out of memory (rec(ord))
-#: src/main.c:5091
+#: src/main.c:5206
 #, c-format
 msgid "!rec %9d/%d"
 msgstr "!grv %9d/%d"
 
-#: src/main.c:5398 src/main.c:5399 src/gui.c:2110 src/gui.c:3220
-#: src/saveplay.c:2336
+#: src/main.c:5500 src/main.c:5501 src/gui.c:2108 src/gui.c:3331
+#: src/saveplay.c:2315
 msgid "Play"
 msgstr "Tocar"
 
-#: src/main.c:6128
+#: src/main.c:6216
 msgid ""
 "LiVES was unable to capture this image\n"
 "\n"
@@ -712,35 +716,35 @@
 "LiVES não conseguiu capturar esta imagem\n"
 "\n"
 
-#: src/main.c:6250
+#: src/main.c:6345
 #, c-format
 msgid "Closed file %s\n"
 msgstr "Arquivo %s fechado\n"
 
-#: src/main.c:6452 src/gui.c:648 src/utils.c:4312 src/utils.c:4344
-#: src/saveplay.c:3550 src/multitrack.c:4510 src/multitrack.c:6268
+#: src/main.c:6542 src/gui.c:647 src/utils.c:4256 src/utils.c:4286
+#: src/saveplay.c:3500 src/multitrack.c:4678 src/multitrack.c:6447
 msgid "_Undo"
 msgstr "Desfazer [_U]"
 
-#: src/main.c:6453 src/gui.c:666 src/utils.c:4313 src/utils.c:4345
-#: src/saveplay.c:3551 src/multitrack.c:4531 src/multitrack.c:6293
+#: src/main.c:6543 src/gui.c:665 src/utils.c:4257 src/utils.c:4287
+#: src/saveplay.c:3501 src/multitrack.c:4698 src/multitrack.c:6472
 msgid "_Redo"
 msgstr "_Refazer"
 
-#: src/main.c:6493 src/interface.c:470 src/gui.c:2326 src/preferences.c:2357
-#: src/resample.c:1516
+#: src/main.c:6583 src/interface.c:457 src/gui.c:2324 src/preferences.c:2391
+#: src/resample.c:1488
 msgid "Video"
 msgstr "Vídeo"
 
-#: src/main.c:6494 src/interface.c:483 src/gui.c:2351
+#: src/main.c:6584 src/interface.c:470 src/gui.c:2348
 msgid "Left Audio"
 msgstr "Áudio Esquerdo"
 
-#: src/main.c:6495 src/gui.c:2375
+#: src/main.c:6585 src/gui.c:2371
 msgid "Right Audio"
 msgstr "Áudio Direito"
 
-#: src/main.c:6540
+#: src/main.c:6630
 #, fuzzy
 msgid ""
 "\n"
@@ -756,11 +760,11 @@
 "Por favor ajuste as opções de execução em 'Preferências | Execução' e tente "
 "novamente.\n"
 
-#: src/main.c:7051 src/plugins.c:1502
+#: src/main.c:7134 src/plugins.c:1468
 msgid "LiVES: - Play Window"
 msgstr "LiVES: - Tocador"
 
-#: src/startup.c:25
+#: src/startup.c:24
 #, c-format
 msgid ""
 "A directory named\n"
@@ -770,7 +774,7 @@
 "(Free space = %s)\n"
 msgstr ""
 
-#: src/startup.c:32
+#: src/startup.c:29
 #, c-format
 msgid ""
 "A directory named\n"
@@ -780,7 +784,7 @@
 "Please select another location.\n"
 msgstr ""
 
-#: src/startup.c:49
+#: src/startup.c:46
 #, c-format
 msgid ""
 "\n"
@@ -791,7 +795,7 @@
 "(Free space = %s)"
 msgstr ""
 
-#: src/startup.c:54
+#: src/startup.c:50
 #, c-format
 msgid ""
 "\n"
@@ -800,54 +804,54 @@
 "Please try again and choose a different location.\n"
 msgstr ""
 
-#: src/startup.c:96
+#: src/startup.c:92
 msgid "Directory name is too long !"
 msgstr ""
 
-#: src/startup.c:223
+#: src/startup.c:216
 msgid ""
 "LiVES FAILED TO START YOUR SELECTED AUDIO PLAYER !\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:230
+#: src/startup.c:222
 msgid ""
 "Before starting LiVES, you need to choose an audio player.\n"
 "\n"
 "PULSE AUDIO is recommended for most users"
 msgstr ""
 
-#: src/startup.c:233
+#: src/startup.c:225
 msgid ""
 ", but this version of LiVES was not compiled with pulse audio support.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:236
+#: src/startup.c:229
 msgid ""
 ", but you do not have pulse audio installed on your system.\n"
 " You are advised to install pulse audio first before running LiVES.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:241
+#: src/startup.c:233
 msgid "JACK audio is recommended for pro users"
 msgstr ""
 
-#: src/startup.c:244
+#: src/startup.c:236
 msgid ""
 ", but this version of LiVES was not compiled with jack audio support.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:247
+#: src/startup.c:239
 msgid ""
 ", but you do not have jackd installed. You may wish to install jackd first "
 "before running LiVES.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:250
+#: src/startup.c:242
 msgid ""
 ", but may prevent LiVES from starting on some systems.\n"
 "If LiVES will not start with jack, you can restart and try with another "
@@ -855,160 +859,160 @@
 "\n"
 msgstr ""
 
-#: src/startup.c:254
+#: src/startup.c:246
 msgid "SOX may be used if neither of the preceding players work, "
 msgstr ""
 
-#: src/startup.c:257
+#: src/startup.c:249
 msgid ""
 "but some audio features will be disabled.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:260
+#: src/startup.c:251
 msgid ""
 "but you do not have sox installed.\n"
 "You are advised to install it before running LiVES.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:264
+#: src/startup.c:255
 msgid ""
 "The MPLAYER/MPLAYER2 audio player is only recommended for testing purposes.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:281
+#: src/startup.c:271
 msgid "LiVES: - Choose an audio player"
 msgstr "LiVES: escolha um reprodutor de áudio"
 
-#: src/startup.c:298
+#: src/startup.c:288
 msgid "Use _pulse audio player"
 msgstr ""
 
-#: src/startup.c:320
+#: src/startup.c:310
 msgid "Use _jack audio player"
 msgstr "Usar o reprodutor de áudio _jack"
 
-#: src/startup.c:340
+#: src/startup.c:330
 msgid "Use _sox audio player"
 msgstr ""
 
-#: src/startup.c:361
+#: src/startup.c:351
 msgid "Use _mplayer audio player"
 msgstr ""
 
-#: src/startup.c:381
+#: src/startup.c:371
 #, fuzzy
 msgid "Use _mplayer2 audio player"
 msgstr "Usar o reprodutor de áudio _jack"
 
-#: src/startup.c:405 src/startup.c:580 src/interface.c:1506
+#: src/startup.c:395 src/startup.c:569 src/interface.c:1398
 msgid "_Next"
 msgstr "_Próximo"
 
-#: src/startup.c:445
+#: src/startup.c:435
 msgid "Skipped"
 msgstr ""
 
-#: src/startup.c:460
+#: src/startup.c:450
 msgid "Passed"
 msgstr ""
 
-#: src/startup.c:493
+#: src/startup.c:483
 msgid "Failed"
 msgstr ""
 
-#: src/startup.c:552
+#: src/startup.c:542
 msgid "LiVES: - Testing Configuration"
 msgstr ""
 
-#: src/startup.c:555
+#: src/startup.c:544
 msgid "LiVES: - Troubleshoot"
 msgstr ""
 
-#: src/startup.c:568
+#: src/startup.c:557
 msgid "LiVES will now run some basic configuration tests\n"
 msgstr ""
 
-#: src/startup.c:603
+#: src/startup.c:591
 msgid "Checking for \"sox\" presence"
 msgstr ""
 
-#: src/startup.c:607
+#: src/startup.c:595
 msgid ""
 "You should install sox to be able to use all the audio features in LiVES"
 msgstr ""
 
-#: src/startup.c:615
+#: src/startup.c:602
 msgid "Checking if sox can convert audio"
 msgstr ""
 
-#: src/startup.c:638
+#: src/startup.c:625
 msgid "Unable to allocate 176400 bytes memory."
 msgstr ""
 
-#: src/startup.c:653
+#: src/startup.c:639
 #, c-format
 msgid "Unable to write to: %s"
 msgstr ""
 
-#: src/startup.c:667 src/startup.c:807
+#: src/startup.c:653 src/startup.c:789
 #, c-format
 msgid "Command failed: %s"
 msgstr ""
 
-#: src/startup.c:689
+#: src/startup.c:675
 msgid "You should install sox_fmt_all or similar"
 msgstr ""
 
-#: src/startup.c:717
+#: src/startup.c:703
 msgid "Checking for \"mplayer\" presence"
 msgstr ""
 
-#: src/startup.c:721
+#: src/startup.c:707
 msgid ""
 "You should install mplayer or mplayer2 to be able to use all the decoding "
 "features in LiVES"
 msgstr ""
 
-#: src/startup.c:747
+#: src/startup.c:732
 msgid "Checking if mplayer can convert audio"
 msgstr ""
 
-#: src/startup.c:768
+#: src/startup.c:751
 msgid "You should install mplayer or mplayer2 with pcm/wav support"
 msgstr ""
 
-#: src/startup.c:785
+#: src/startup.c:767
 msgid "Checking if mplayer can decode to png/alpha"
 msgstr ""
 
-#: src/startup.c:828
+#: src/startup.c:810
 msgid "You may wish to upgrade mplayer to a newer version"
 msgstr ""
 
-#: src/startup.c:854
+#: src/startup.c:836
 msgid "Checking if mplayer can decode to jpeg"
 msgstr ""
 
-#: src/startup.c:882
+#: src/startup.c:862
 msgid "You should install mplayer with either png/alpha or jpeg support"
 msgstr ""
 
-#: src/startup.c:883
+#: src/startup.c:863
 msgid "You may wish to add jpeg output support to mplayer"
 msgstr ""
 
-#: src/startup.c:892
+#: src/startup.c:872
 msgid "Checking for \"convert\" presence"
 msgstr ""
 
-#: src/startup.c:896
+#: src/startup.c:876
 msgid "Install imageMagick to be able to use all of the rendered effects"
 msgstr ""
 
-#: src/startup.c:909
+#: src/startup.c:889
 msgid ""
 "\n"
 "\n"
@@ -1016,7 +1020,7 @@
 "Preferences/Decoding.    \n"
 msgstr ""
 
-#: src/startup.c:915
+#: src/startup.c:894
 msgid ""
 "\n"
 "\n"
@@ -1024,49 +1028,49 @@
 "continue    \n"
 msgstr ""
 
-#: src/startup.c:949
+#: src/startup.c:928
 msgid ""
 "\n"
 "\n"
 "Finally, you can choose the default startup interface for LiVES.\n"
 msgstr ""
 
-#: src/startup.c:950
+#: src/startup.c:929
 msgid ""
 "\n"
 "\n"
 "LiVES has two main interfaces and you can start up with either of them.\n"
 msgstr ""
 
-#: src/startup.c:951
+#: src/startup.c:930
 msgid ""
 "\n"
 "\n"
 "The default can always be changed later from Preferences.\n"
 msgstr ""
 
-#: src/startup.c:961
+#: src/startup.c:940
 msgid "LiVES: - Choose the startup interface"
 msgstr ""
 
-#: src/startup.c:972
+#: src/startup.c:951
 msgid "Start in _Clip Edit mode"
 msgstr ""
 
-#: src/startup.c:975
+#: src/startup.c:954
 msgid "This is the best choice for simple editing tasks and for VJs\n"
 msgstr ""
 
-#: src/startup.c:981
+#: src/startup.c:960
 msgid "Start in _Multitrack mode"
 msgstr ""
 
-#: src/startup.c:983
+#: src/startup.c:962
 msgid ""
 "This is a better choice for complex editing tasks involving multiple clips.\n"
 msgstr ""
 
-#: src/startup.c:992
+#: src/startup.c:971
 msgid "_Finish"
 msgstr ""
 
@@ -1083,38 +1087,38 @@
 msgid "Apply _Deinterlace"
 msgstr ""
 
-#: src/interface.c:66
+#: src/interface.c:65
 msgid "If this is set, frames will be deinterlaced as they are imported."
 msgstr ""
 "Se isso for selecionado, frames vão ser desinterlaçados enquanto forem "
 "importados."
 
-#: src/interface.c:113 src/callbacks.c:9623 src/callbacks.c:9646
-#: src/callbacks.c:9647 src/gui.c:3223 src/gui.c:3821 src/saveplay.c:2339
-#: src/saveplay.c:3138 src/dialogs.c:1514 src/dialogs.c:1515
-#: src/dialogs.c:1746 src/dialogs.c:1747 src/framedraw.c:238
-#: src/multitrack.c:8031
+#: src/interface.c:106 src/callbacks.c:9542 src/callbacks.c:9564
+#: src/callbacks.c:9565 src/gui.c:3333 src/gui.c:3946 src/saveplay.c:2317
+#: src/saveplay.c:3097 src/dialogs.c:1575 src/dialogs.c:1576
+#: src/dialogs.c:1804 src/dialogs.c:1805 src/framedraw.c:236
+#: src/multitrack.c:8210
 msgid "Preview"
 msgstr "Visualizar"
 
-#: src/interface.c:132
+#: src/interface.c:125
 msgid "Click here to _Preview any selected video, image or audio file"
 msgstr ""
 "Clique aqui para _Previsualizar qualquer vídeo, áudio ou imagem selecionada"
 
-#: src/interface.c:135
+#: src/interface.c:127
 msgid "Click here to _Preview any selected audio file"
 msgstr "Clique aqui para _Previsualizar qualquer arquivo de áudio"
 
-#: src/interface.c:138
+#: src/interface.c:129
 msgid "Click here to _Preview the video"
 msgstr "Clique aqui para _Previsualizar o vídeo"
 
-#: src/interface.c:181 src/dialogs.c:2542
+#: src/interface.c:169 src/dialogs.c:2621
 msgid "LiVES: - Processing..."
 msgstr "LiVES: - Processando..."
 
-#: src/interface.c:217
+#: src/interface.c:205
 msgid ""
 "\n"
 "\n"
@@ -1128,8 +1132,8 @@
 "\n"
 "Lembre de desligar os efeitos (ctrl-0) depois!"
 
-#: src/interface.c:222 src/callbacks.c:9373 src/callbacks.c:9420
-#: src/dialogs.c:2570
+#: src/interface.c:210 src/callbacks.c:9283 src/callbacks.c:9332
+#: src/dialogs.c:2649
 msgid ""
 "\n"
 "Please Wait"
@@ -1137,190 +1141,178 @@
 "\n"
 "Por favor aguarde"
 
-#: src/interface.c:242
+#: src/interface.c:230
 msgid "Show Details"
 msgstr ""
 
-#: src/interface.c:254 src/dialogs.c:2584
+#: src/interface.c:242 src/dialogs.c:2663
 msgid "_Enough"
 msgstr "Sufici_ente"
 
-#: src/interface.c:255 src/framedraw.c:278
+#: src/interface.c:243 src/framedraw.c:276
 msgid "_Preview"
 msgstr "_Pré-visualizar"
 
-#: src/interface.c:257
+#: src/interface.c:245 src/callbacks.c:9282 src/callbacks.c:9330
 msgid "Paus_e"
 msgstr ""
 
-#: src/interface.c:258 src/callbacks.c:9417
+#: src/interface.c:246 src/callbacks.c:9329
 msgid "Pause/_Enough"
 msgstr ""
 
-#: src/interface.c:285
+#: src/interface.c:273
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: src/interface.c:374
+#: src/interface.c:361
 #, c-format
 msgid "LiVES: - %s"
 msgstr ""
 
-#: src/interface.c:376
+#: src/interface.c:363
 msgid "LiVES: - Multitrack details"
 msgstr ""
 
-#: src/interface.c:407
+#: src/interface.c:394
 msgid "Format"
 msgstr "Formato"
 
-#: src/interface.c:412
+#: src/interface.c:399
 msgid "Frame size"
 msgstr "Tamanho do frame"
 
-#: src/interface.c:417
+#: src/interface.c:404
 msgid "File size"
 msgstr "Tamanho do arquivo"
 
-#: src/interface.c:418
+#: src/interface.c:405
 msgid "Byte size"
 msgstr "Tamanho do byte"
 
-#: src/interface.c:423 src/interface.c:1891
+#: src/interface.c:410 src/interface.c:1760
 msgid "FPS"
 msgstr "FPS"
 
-#: src/interface.c:428
+#: src/interface.c:415
 msgid "Frames"
 msgstr "Frames"
 
-#: src/interface.c:429
+#: src/interface.c:416
 msgid "Events"
 msgstr "Eventos"
 
-#: src/interface.c:434 src/interface.c:500 src/interface.c:542
+#: src/interface.c:421 src/interface.c:486 src/interface.c:528
 msgid "Total time"
 msgstr "Tempo total"
 
-#: src/interface.c:486 src/resample.c:1488
+#: src/interface.c:472 src/resample.c:1460
 msgid "Audio"
 msgstr "Áudio"
 
-#: src/interface.c:511 src/interface.c:553
+#: src/interface.c:497 src/interface.c:539
 msgid "Rate/size"
 msgstr "Taxa/tamanho"
 
-#: src/interface.c:530
+#: src/interface.c:516
 msgid "Right audio"
 msgstr "Áudio direito"
 
-#: src/interface.c:622
+#: src/interface.c:607
 msgid "LiVES: - Encoding options"
 msgstr "LiVES: - Opções de codificação"
 
-#: src/interface.c:636
+#: src/interface.c:621
 msgid "<------------- (Check the box to re_size as suggested)"
 msgstr ""
 
-#: src/interface.c:637
+#: src/interface.c:622
 msgid "<------------- (Check the box to use the _size recommendation)"
 msgstr ""
 
-#: src/interface.c:662
+#: src/interface.c:646
 msgid "Use _letterboxing to maintain aspect ratio (optional)"
 msgstr ""
 
-#: src/interface.c:663
+#: src/interface.c:647
 msgid ""
 "Draw black rectangles either above or to the sides of the image, to prevent "
 "it from stretching."
 msgstr ""
 
-#: src/interface.c:694
+#: src/interface.c:677
 msgid "Keep _my settings"
 msgstr "Mantenha _minhas configurações"
 
-#: src/interface.c:695
+#: src/interface.c:678
 msgid "Use _recommended settings"
 msgstr "Usar configurações _recomendadas"
 
-#: src/interface.c:775 src/dialogs.c:114
-msgid ""
-"Do _not show this warning any more\n"
-"(can be turned back on from Preferences/Warnings)"
-msgstr ""
-"Não mostrar mais este aviso\n"
-"(pode ser ligado novamente em Preferências/Avisos)"
-
-#: src/interface.c:787
-msgid "Show _Details"
-msgstr ""
-
-#: src/interface.c:881
+#: src/interface.c:769
 msgid "_Close Window"
 msgstr "Fechar janela [_C]"
 
-#: src/interface.c:883
+#: src/interface.c:771
 msgid "_Save to file"
 msgstr ""
 
-#: src/interface.c:928
+#: src/interface.c:816
 msgid "LiVES: - Insert"
 msgstr "LiVES: - Inserir"
 
-#: src/interface.c:945
+#: src/interface.c:833
 msgid "_Number of times to insert"
 msgstr "_Número de vezes a inserir"
 
-#: src/interface.c:954
+#: src/interface.c:842
 msgid "_Insert to fit audio"
 msgstr "_Inserir até o fim do áudio"
 
-#: src/interface.c:968
+#: src/interface.c:856
 msgid "Insert _before selection"
 msgstr "Inserir antes da seleção [_B]"
 
-#: src/interface.c:970
+#: src/interface.c:858
 msgid "Insert clipboard before selected frames"
 msgstr "Inserir área de transferência antes da seleção"
 
-#: src/interface.c:986
+#: src/interface.c:875
 msgid "Insert _after selection"
 msgstr "Inserir _após a seleção"
 
-#: src/interface.c:988
+#: src/interface.c:877
 msgid "Insert clipboard after selected frames"
 msgstr "Inserir área de transferência depois da seleção"
 
-#: src/interface.c:999
+#: src/interface.c:888
 msgid "Insert _with sound"
 msgstr "Inserir com som [_W]"
 
-#: src/interface.c:1012
+#: src/interface.c:901
 msgid "Insert with_out sound"
 msgstr "Inserir sem s_om"
 
-#: src/interface.c:1093
+#: src/interface.c:985
 msgid "LiVES: - Open Selection"
 msgstr "LiVES: - Abrir Seleção"
 
-#: src/interface.c:1111
+#: src/interface.c:1004
 msgid "Selection start time (sec)"
 msgstr ""
 
-#: src/interface.c:1117
+#: src/interface.c:1010
 msgid "Number of frames to open"
 msgstr ""
 
-#: src/interface.c:1193
+#: src/interface.c:1088
 msgid "LiVES: - Open Location"
 msgstr "LiVES: - Abrir Stream"
 
-#: src/interface.c:1195
+#: src/interface.c:1090
 msgid "LiVES: - Open Youtube Clip"
 msgstr ""
 
-#: src/interface.c:1213
+#: src/interface.c:1109
 msgid ""
 "\n"
 "\n"
@@ -1336,7 +1328,7 @@
 "Também certifique-se de ter marcado sua banda em Preferências|Streaming\n"
 "\n"
 
-#: src/interface.c:1216
+#: src/interface.c:1112
 msgid ""
 "\n"
 "\n"
@@ -1345,62 +1337,63 @@
 "\n"
 msgstr ""
 
-#: src/interface.c:1220
+#: src/interface.c:1116
 msgid ""
 "Enter the URL of the clip below.\n"
 "E.g: http://www.youtube.com/watch?v=WCR6f6WzjP8\n"
 "\n"
 msgstr ""
 
-#: src/interface.c:1231
+#: src/interface.c:1127
 msgid "URL : "
 msgstr "URL : "
 
-#: src/interface.c:1231
+#: src/interface.c:1127
 msgid "Youtube URL : "
 msgstr ""
 
-#: src/interface.c:1235
+#: src/interface.c:1131
 msgid "Do not send bandwidth information"
 msgstr "Não enviar informação de banda"
 
-#: src/interface.c:1237
+#: src/interface.c:1133
 msgid "Try this setting if you are having problems getting a stream"
 msgstr "Tente esta configuração se está tendo problemas ao pegar um stream"
 
-#: src/interface.c:1258
+#: src/interface.c:1155
 msgid "Download to _Directory : "
 msgstr ""
 
-#: src/interface.c:1276
+#: src/interface.c:1173
 msgid "Download _File Name : "
 msgstr ""
 
-#: src/interface.c:1281
+#: src/interface.c:1178
 msgid ".webm"
 msgstr ""
 
-#: src/interface.c:1359
+#: src/interface.c:1256
 msgid "LiVES: - Rename Clip"
 msgstr "LiVES: - Renomear Clipe"
 
-#: src/interface.c:1362
-msgid "LiVES: - Enter Set Name"
+#: src/interface.c:1258
+#, fuzzy
+msgid "LiVES: - Enter Set Name to Save as"
 msgstr "LiVES: - Entre com o Nome do Set"
 
-#: src/interface.c:1365
+#: src/interface.c:1260
 msgid "LiVES: - Enter a Set Name to Reload"
 msgstr ""
 
-#: src/interface.c:1368
+#: src/interface.c:1262
 msgid "LiVES: - Choose a Working Directory"
 msgstr ""
 
-#: src/interface.c:1371
+#: src/interface.c:1264
 msgid "LiVES: - Rename Current Track"
 msgstr ""
 
-#: src/interface.c:1391
+#: src/interface.c:1283
 msgid ""
 "You need to enter a name for the current clip set.\n"
 "This will allow you reload the layout with the same clips later.\n"
@@ -1411,7 +1404,7 @@
 "Isso vai permitir recarregar o layout com os mesmos clipes depois.\n"
 "O LiVES lembrará você de salvar o set quando você for sair.\n"
 
-#: src/interface.c:1397
+#: src/interface.c:1289
 msgid ""
 "In order to export this project, you must enter a name for this clip set.\n"
 "This will also be used for the project name.\n"
@@ -1419,207 +1412,207 @@
 "Para exportar este projeto, você deverá definir o nome deste set.\n"
 "Ele tambem será utilizado como nome do projeto.\n"
 
-#: src/interface.c:1404
+#: src/interface.c:1296
 msgid ""
 "Welcome to LiVES !\n"
 "This startup wizard will guide you through the\n"
 "initial install so that you can get the most from this application.\n"
 msgstr ""
 
-#: src/interface.c:1408
+#: src/interface.c:1300
 msgid ""
 "\n"
 "First of all you need to choose a working directory for LiVES.\n"
 "This should be a directory with plenty of disk space available.\n"
 msgstr ""
 
-#: src/interface.c:1427
+#: src/interface.c:1317
 msgid "New name "
 msgstr "Novo nome "
 
-#: src/interface.c:1430
+#: src/interface.c:1319
 msgid "Set name "
 msgstr "Nome do set "
 
-#: src/interface.c:1550
+#: src/interface.c:1435
 msgid "Use def_aults"
 msgstr ""
 
-#: src/interface.c:1553 src/interface.c:1840 src/preferences.c:2515
-#: src/preferences.c:2697
+#: src/interface.c:1437 src/interface.c:1709 src/preferences.c:2550
+#: src/preferences.c:2739
 msgid "_Advanced"
 msgstr "_Avançado"
 
-#: src/interface.c:1604
+#: src/interface.c:1487
 msgid "LiVES:- Select input device"
 msgstr ""
 
-#: src/interface.c:1622
+#: src/interface.c:1504
 msgid "Select input device:"
 msgstr ""
 
-#: src/interface.c:1686
+#: src/interface.c:1568
 msgid "LiVES:- Load CD Track"
 msgstr "LiVES:- Carregar trilha de CD"
 
-#: src/interface.c:1689
+#: src/interface.c:1570
 msgid "LiVES:- Select DVD Title/Chapter"
 msgstr "LiVES:- Selecionar Título/Capítulo do DVD"
 
-#: src/interface.c:1692
+#: src/interface.c:1572
 msgid "LiVES:- Select VCD Title"
 msgstr "LiVES:- Selecionar o Título do VCD"
 
-#: src/interface.c:1695
+#: src/interface.c:1574
 msgid "LiVES:- Change Maximum Visible Tracks"
 msgstr "LiVES:- Modificar o máximo de trilhas visíveis"
 
-#: src/interface.c:1698
+#: src/interface.c:1576
 msgid "LiVES:- Device details"
 msgstr ""
 
-#: src/interface.c:1721
+#: src/interface.c:1598
 #, c-format
 msgid "Track to load (from %s)"
 msgstr "Trilha a carregar (de %s)"
 
-#: src/interface.c:1724
+#: src/interface.c:1600
 msgid "DVD Title"
 msgstr "Título do DVD"
 
-#: src/interface.c:1727
+#: src/interface.c:1602
 msgid "VCD Title"
 msgstr "Título do VCD"
 
-#: src/interface.c:1730
+#: src/interface.c:1604
 msgid "Maximum number of tracks to display"
 msgstr "Número máximo de trilhas a visualizar"
 
-#: src/interface.c:1733
+#: src/interface.c:1606
 msgid "Device:        /dev/video"
 msgstr ""
 
-#: src/interface.c:1736
+#: src/interface.c:1608
 msgid "Device:        fw:"
 msgstr ""
 
-#: src/interface.c:1771
+#: src/interface.c:1641
 msgid "Chapter  "
 msgstr "Capítulo  "
 
-#: src/interface.c:1776
+#: src/interface.c:1645
 msgid "Channel  "
 msgstr "Canal  "
 
-#: src/interface.c:1791
+#: src/interface.c:1660
 msgid "Audio ID  "
 msgstr "Áudio ID  "
 
-#: src/interface.c:1857
+#: src/interface.c:1726
 msgid "Input number"
 msgstr ""
 
-#: src/interface.c:1865
+#: src/interface.c:1734
 msgid "Use default width, height and FPS"
 msgstr ""
 
-#: src/interface.c:1879
+#: src/interface.c:1748
 msgid "Width"
 msgstr ""
 
-#: src/interface.c:1885
+#: src/interface.c:1754
 msgid "Height"
 msgstr ""
 
-#: src/interface.c:1899
+#: src/interface.c:1768
 msgid "_Driver"
 msgstr ""
 
-#: src/interface.c:1902
+#: src/interface.c:1771
 msgid "_Output format"
 msgstr ""
 
-#: src/interface.c:1998
+#: src/interface.c:1865
 msgid "LiVES:- Fade Audio In"
 msgstr "LiVES:- Fade Audio In"
 
-#: src/interface.c:2001
+#: src/interface.c:1867
 msgid "LiVES:- Fade Audio Out"
 msgstr "LiVES:- Fade Audio Out"
 
-#: src/interface.c:2017
+#: src/interface.c:1883
 msgid "Fade in over  "
 msgstr "Fade in sobre  "
 
-#: src/interface.c:2018
+#: src/interface.c:1884
 msgid "first"
 msgstr "primeiro"
 
-#: src/interface.c:2021
+#: src/interface.c:1886
 msgid "Fade out over  "
 msgstr "Fade out sobre  "
 
-#: src/interface.c:2022
+#: src/interface.c:1887
 msgid "last"
 msgstr "último"
 
-#: src/interface.c:2044
+#: src/interface.c:1909
 msgid "seconds."
 msgstr "segundos."
 
-#: src/interface.c:2052 src/saveplay.c:1507
+#: src/interface.c:1917 src/saveplay.c:1484
 msgid "selection"
 msgstr "seleção"
 
-#: src/interface.c:2092
+#: src/interface.c:1956
 msgid "LiVES: - File Comments (optional)"
 msgstr "LiVES: - Comentários do arquivo (opcional)"
 
-#: src/interface.c:2107
+#: src/interface.c:1971
 msgid "Title/Name : "
 msgstr "Título/Nome: "
 
-#: src/interface.c:2114
+#: src/interface.c:1978
 msgid "Author/Artist : "
 msgstr "Autor/Artista: "
 
-#: src/interface.c:2121
+#: src/interface.c:1985
 msgid "Comments : "
 msgstr "Comentários: "
 
-#: src/interface.c:2151
+#: src/interface.c:2015
 msgid "_Options"
 msgstr ""
 
-#: src/interface.c:2158
+#: src/interface.c:2022
 msgid "Save _subtitles to file"
 msgstr ""
 
-#: src/interface.c:2170
+#: src/interface.c:2033
 msgid "Subtitle file"
 msgstr ""
 
-#: src/interface.c:2172
+#: src/interface.c:2035
 msgid "Browse..."
 msgstr ""
 
-#: src/interface.c:2255
+#: src/interface.c:2132
 msgid "LiVES: - choose a device"
 msgstr ""
 
-#: src/interface.c:2259
+#: src/interface.c:2135
 msgid "LiVES: - choose a directory"
 msgstr ""
 
-#: src/interface.c:2262
+#: src/interface.c:2137
 msgid "LiVES: - choose a file"
 msgstr ""
 
-#: src/interface.c:2445
+#: src/interface.c:2381
 msgid "LiVES: - Cancel/Discard/Save"
 msgstr "LiVES: - Cancelar/Discartar/Salvar"
 
-#: src/interface.c:2460
+#: src/interface.c:2397
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has not been saved.\n"
@@ -1629,7 +1622,7 @@
 "O layout atual não foi salvo.\n"
 "O que você quer fazer?\n"
 
-#: src/interface.c:2463
+#: src/interface.c:2400
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has been changed since the last save.\n"
@@ -1639,7 +1632,7 @@
 "O layout atual foi modificado desde que foi salvo.\n"
 "O que você quer fazer?\n"
 
-#: src/interface.c:2467
+#: src/interface.c:2404
 msgid ""
 "You are about to exit LiVES.\n"
 "The current clip set can be saved.\n"
@@ -1649,7 +1642,7 @@
 "O set de clipes atual pode ser salvo.\n"
 "O que você quer fazer?\n"
 
-#: src/interface.c:2468
+#: src/interface.c:2405
 msgid ""
 "The current clip set has not been saved.\n"
 "What would you like to do ?\n"
@@ -1657,7 +1650,7 @@
 "O set de clipes atual não foi salvo.\n"
 "O que quer fazer?\n"
 
-#: src/interface.c:2472
+#: src/interface.c:2408
 msgid ""
 "The current layout has not been saved.\n"
 "What would you like to do ?\n"
@@ -1665,7 +1658,7 @@
 "O layout atual não foi salvo.\n"
 "O que quer fazer?\n"
 
-#: src/interface.c:2475
+#: src/interface.c:2410
 #, fuzzy
 msgid ""
 "The current layout has *not* been changed since it was last saved.\n"
@@ -1674,109 +1667,109 @@
 "O layout atual não foi salvo.\n"
 "O que quer fazer?\n"
 
-#: src/interface.c:2480
+#: src/interface.c:2415
 msgid ""
 "The current layout contains generated frames and cannot be retained.\n"
 "You may wish to render it before exiting multitrack mode.\n"
 msgstr ""
 
-#: src/interface.c:2483
+#: src/interface.c:2418
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout contains generated frames and cannot be retained.\n"
 "What do you wish to do ?"
 msgstr ""
 
-#: src/interface.c:2496
+#: src/interface.c:2431
 msgid "Clip set _name"
 msgstr "_Nome do set"
 
-#: src/interface.c:2502
+#: src/interface.c:2437
 msgid "_Auto reload next time"
 msgstr "Auto recarregar da próxima vez"
 
-#: src/interface.c:2538 src/interface.c:2547
+#: src/interface.c:2473 src/interface.c:2482
 msgid "_Wipe layout"
 msgstr "Apagar layout [_W]"
 
-#: src/interface.c:2539
+#: src/interface.c:2474
 msgid "_Ignore changes"
 msgstr "_Ignorar mudanças"
 
-#: src/interface.c:2540
+#: src/interface.c:2475
 msgid "_Delete clip set"
 msgstr "_Deletar set"
 
-#: src/interface.c:2541
+#: src/interface.c:2476
 msgid "_Delete layout"
 msgstr "_Deletar layout"
 
-#: src/interface.c:2545
+#: src/interface.c:2480
 msgid "_Save layout"
 msgstr "_Salvar layout"
 
-#: src/interface.c:2546
+#: src/interface.c:2481
 msgid "_Save clip set"
 msgstr "_Salvar set"
 
-#: src/interface.c:2565
+#: src/interface.c:2502
 msgid ""
 "\n"
 "LiVES has detected a multitrack layout from a previous session.\n"
 "Would you like to try and recover it ?\n"
 msgstr ""
 
-#: src/interface.c:2589
+#: src/interface.c:2528
 msgid "LiVES: - Disk Recovery Options"
 msgstr ""
 
-#: src/interface.c:2608
+#: src/interface.c:2549
 msgid "Delete _Orphaned Clips"
 msgstr ""
 
-#: src/interface.c:2609
+#: src/interface.c:2550
 msgid "Delete any clips which are not currently loaded or part of a set"
 msgstr ""
 
-#: src/interface.c:2622
+#: src/interface.c:2564
 msgid "Clear _Backup Files from Closed Clips"
 msgstr ""
 
-#: src/interface.c:2633
+#: src/interface.c:2575
 msgid "Remove Sets which have _Layouts but no Clips"
 msgstr ""
 
-#: src/interface.c:2644
+#: src/interface.c:2586
 msgid "_Reset to Defaults"
 msgstr ""
 
-#: src/interface.c:2651
+#: src/interface.c:2593
 msgid "_Accept"
 msgstr ""
 
-#: src/callbacks.c:198
+#: src/callbacks.c:208
 #, c-format
 msgid "Saving as set %s..."
 msgstr "A Salvar set como %s..."
 
-#: src/callbacks.c:833
+#: src/callbacks.c:852
 msgid "Please enter the name of the file to save the clip as.\n"
 msgstr ""
 
-#: src/callbacks.c:841
+#: src/callbacks.c:860
 msgid "Please enter a valid URL for the download.\n"
 msgstr ""
 
-#: src/callbacks.c:867
+#: src/callbacks.c:886
 #, c-format
 msgid "Downloading %s to %s..."
 msgstr ""
 
-#: src/callbacks.c:895
+#: src/callbacks.c:912
 msgid "Downloading clip"
 msgstr ""
 
-#: src/callbacks.c:933
+#: src/callbacks.c:950
 msgid ""
 "\n"
 "LiVES was unable to download the clip.\n"
@@ -1784,17 +1777,17 @@
 "the latest youtube-dl installed.\n"
 msgstr ""
 
-#: src/callbacks.c:1114 src/callbacks.c:1149
+#: src/callbacks.c:1131 src/callbacks.c:1166
 msgid "This file"
 msgstr "Este ficheiro"
 
-#: src/callbacks.c:1115
+#: src/callbacks.c:1132
 msgid ""
 ",\n"
 " - including the current layout - "
 msgstr ""
 
-#: src/callbacks.c:1117
+#: src/callbacks.c:1134
 #, c-format
 msgid ""
 "\n"
@@ -1804,7 +1797,7 @@
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1119
+#: src/callbacks.c:1136
 #, c-format
 msgid ""
 "\n"
@@ -1814,14 +1807,14 @@
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1150
+#: src/callbacks.c:1167
 msgid ""
 "Changes made to this clip have not been saved or backed up.\n"
 "\n"
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1343
+#: src/callbacks.c:1356
 msgid ""
 "\n"
 "Invalid project file.\n"
@@ -1829,7 +1822,7 @@
 "\n"
 "Arquivo de projeto inválido.\n"
 
-#: src/callbacks.c:1356
+#: src/callbacks.c:1370
 #, c-format
 msgid ""
 "\n"
@@ -1850,33 +1843,33 @@
 "delete-o.\n"
 "Uma vez que tenha feito isso, vai poder importar o novo projeto.\n"
 
-#: src/callbacks.c:1366
+#: src/callbacks.c:1381
 #, c-format
 msgid "Importing the project %s as set %s..."
 msgstr "Importando o projeto %s como set %s..."
 
-#: src/callbacks.c:1386
+#: src/callbacks.c:1399
 msgid "Importing project"
 msgstr "Importando projeto"
 
-#: src/callbacks.c:1472
+#: src/callbacks.c:1481
 #, c-format
 msgid "Exporting project %s..."
 msgstr "Exportando projeto %s..."
 
-#: src/callbacks.c:1490
+#: src/callbacks.c:1497
 msgid "Exporting project"
 msgstr "Exportando projeto"
 
-#: src/callbacks.c:1506
+#: src/callbacks.c:1513
 msgid "Backup as .lv1 file"
 msgstr "Backup como arquivo .lv1"
 
-#: src/callbacks.c:1522
+#: src/callbacks.c:1529
 msgid "Restore .lv1 file"
 msgstr "Restaurar arquivo .lv1"
 
-#: src/callbacks.c:1664
+#: src/callbacks.c:1671
 msgid ""
 "\n"
 "\n"
@@ -1888,72 +1881,77 @@
 "O set será deletado do disco.\n"
 "Tem certeza?\n"
 
-#: src/callbacks.c:1725
+#: src/callbacks.c:1732
 #, c-format
 msgid "Deleting set %s..."
 msgstr ""
 
-#: src/callbacks.c:1727
+#: src/callbacks.c:1734
 msgid "Deleting set..."
 msgstr "A apagar set..."
 
-#: src/callbacks.c:1731
+#: src/callbacks.c:1738
 msgid "Deleting set"
 msgstr "A apagar set..."
 
-#: src/callbacks.c:1739
+#: src/callbacks.c:1746
 #, c-format
 msgid "Set %s was permanently deleted from the disk.\n"
 msgstr "O set %s foi permanentemente apagado do disco.\n"
 
-#: src/callbacks.c:1787 src/callbacks.c:11764
+#: src/callbacks.c:1792 src/callbacks.c:11676
 msgid "Insert Silence"
 msgstr "Inserir Silêncio"
 
-#: src/callbacks.c:1840 src/callbacks.c:1923 src/callbacks.c:2086
+#: src/callbacks.c:1844 src/callbacks.c:1927 src/callbacks.c:2089
 msgid "Undoing"
 msgstr "Desfazendo"
 
-#: src/callbacks.c:1936 src/callbacks.c:2147
+#: src/callbacks.c:1940 src/callbacks.c:2150
 msgid "Restoring audio..."
 msgstr "A restaurar audio..."
 
-#: src/callbacks.c:1952
+#: src/callbacks.c:1956
 msgid "Clearing frame images"
 msgstr "Limpando imagens de frames"
 
-#: src/callbacks.c:1985
+#: src/callbacks.c:1988
 msgid "Deleting excess frames"
 msgstr ""
 
-#: src/callbacks.c:2229
+#: src/callbacks.c:2232
 #, c-format
 msgid "Length of video is now %d frames at %.3f frames per second.\n"
 msgstr "O comprimento do vídeo é agora %d frames a %.3f FPS.\n"
 
-#: src/callbacks.c:2233 src/resample.c:683 src/resample.c:2166
+#: src/callbacks.c:2235 src/resample.c:678 src/resample.c:2133
 #, c-format
 msgid "Clipboard was resampled to %d frames.\n"
 msgstr "Área de transferência resampleada para %d frames.\n"
 
-#: src/callbacks.c:2394 src/callbacks.c:2423
+#: src/callbacks.c:2396 src/callbacks.c:2425
 msgid "Redoing"
 msgstr "Refazendo"
 
-#: src/callbacks.c:2462
-#, c-format
-msgid "Copying frames %d to %d%s to the clipboard..."
+#: src/callbacks.c:2472
+#, fuzzy, c-format
+msgid "Copying frames %d to %d (with sound) to the clipboard..."
+msgstr "Copiando frames %d até %d%s para a área de transferência..."
+
+#: src/callbacks.c:2474
+#, fuzzy, c-format
+msgid "Copying frames %d to %d to the clipboard..."
 msgstr "Copiando frames %d até %d%s para a área de transferência..."
 
-#: src/callbacks.c:2525
+#: src/callbacks.c:2526
 msgid "Copying to the clipboard"
 msgstr "Copiando para a área de trasferência"
 
-#: src/callbacks.c:2600
+#: src/callbacks.c:2601
 msgid "Cut"
 msgstr "Cortar"
 
-#: src/callbacks.c:2641 src/callbacks.c:3068 src/callbacks.c:8026
+#: src/callbacks.c:2641 src/callbacks.c:3063 src/callbacks.c:7631
 #, fuzzy
 msgid "Pulling frames from clipboard"
 msgstr "Pegando frames do clipe"
@@ -1963,22 +1961,22 @@
 msgid "Pasting %d frames to new clip %s..."
 msgstr ""
 
-#: src/callbacks.c:2678
+#: src/callbacks.c:2676
 msgid "Pasting"
 msgstr "Colando"
 
-#: src/callbacks.c:2694
+#: src/callbacks.c:2692
 msgid "...added audio..."
 msgstr ""
 
-#: src/callbacks.c:2778
+#: src/callbacks.c:2775
 msgid ""
 "This operation requires resizing or converting of frames.\n"
 "Please install 'convert' from the Image-magick package, and then restart "
 "LiVES.\n"
 msgstr ""
 
-#: src/callbacks.c:2795
+#: src/callbacks.c:2793
 msgid ""
 "\n"
 "\n"
@@ -1992,7 +1990,7 @@
 "Tente selecionar todos frames e usar\n"
 "a função 'Ajustar Áudio' do menu 'Áudio'."
 
-#: src/callbacks.c:2819
+#: src/callbacks.c:2817
 msgid ""
 "LiVES cannot insert because the audio rates do not match.\n"
 "Please install 'sox', and try again."
@@ -2000,7 +1998,7 @@
 "LiVES não pôde inserir porque as taxas de áudio não conferem.\n"
 "Por favor instale 'sox' e tente novamente."
 
-#: src/callbacks.c:2838
+#: src/callbacks.c:2835
 msgid ""
 "\n"
 "Insertion will cause frames to shift in some multitrack layouts.\n"
@@ -2011,7 +2009,7 @@
 "multipista.\n"
 "Tem certeza que quer continuar?\n"
 
-#: src/callbacks.c:2888 src/callbacks.c:11692
+#: src/callbacks.c:2883 src/callbacks.c:11606
 msgid ""
 "\n"
 "Insertion will cause audio to shift in some multitrack layouts.\n"
@@ -2022,11 +2020,11 @@
 "multipista.\n"
 "Tem certeza que quer continuar?\n"
 
-#: src/callbacks.c:2996 src/callbacks.c:3025
+#: src/callbacks.c:2987 src/callbacks.c:3016
 msgid "Resampling clipboard audio"
 msgstr "Resampleando áudio da área de transferência"
 
-#: src/callbacks.c:3041
+#: src/callbacks.c:3032
 msgid ""
 "\n"
 "\n"
@@ -2038,7 +2036,7 @@
 "LiVES não pode resamplear o áudio da área de transferência.\n"
 "O áudio da área de transferência foi deletado.\n"
 
-#: src/callbacks.c:3055
+#: src/callbacks.c:3045
 msgid ""
 "\n"
 "\n"
@@ -2051,30 +2049,30 @@
 "LiVES não pôde processar o áudio da área de transferência.\n"
 "Deseja continuar a inserção usando áudio não modificado?\n"
 
-#: src/callbacks.c:3137 src/callbacks.c:3311
+#: src/callbacks.c:3132 src/callbacks.c:3299
 #, c-format
 msgid "Inserting %d%s frames from the clipboard..."
 msgstr "Inserindo %d%s frames da área de transferência..."
 
-#: src/callbacks.c:3162 src/callbacks.c:3236 src/callbacks.c:3339
+#: src/callbacks.c:3155 src/callbacks.c:3224 src/callbacks.c:3325
 msgid "Inserting"
 msgstr "Inserindo"
 
-#: src/callbacks.c:3193
+#: src/callbacks.c:3187
 #, c-format
 msgid "Inserting %d times from the clipboard%s..."
 msgstr "Inserindo %d vezes da área de transferência%s..."
 
-#: src/callbacks.c:3200
+#: src/callbacks.c:3191
 #, c-format
 msgid "Inserting %d frames from the clipboard%s..."
 msgstr "Inserindo %d frames da área de transferência%s..."
 
-#: src/callbacks.c:3418
+#: src/callbacks.c:3404
 msgid "Insert"
 msgstr "Inserir"
 
-#: src/callbacks.c:3486
+#: src/callbacks.c:3471
 msgid ""
 "\n"
 "Deleting all frames will close this file.\n"
@@ -2084,7 +2082,7 @@
 "Deletar todos frames vai fechar este arquivo.\n"
 "Tem certeza?"
 
-#: src/callbacks.c:3495
+#: src/callbacks.c:3480
 msgid ""
 "\n"
 "Deletion will cause missing frames in some multitrack layouts.\n"
@@ -2094,8 +2092,8 @@
 "Deleção vai causar frames perdidos em alguns layouts multipista.\n"
 "Tem certeza que quer continuar?\n"
 
-#: src/callbacks.c:3515 src/callbacks.c:10920 src/callbacks.c:11162
-#: src/callbacks.c:11228
+#: src/callbacks.c:3500 src/callbacks.c:10851 src/callbacks.c:11087
+#: src/callbacks.c:11152
 msgid ""
 "\n"
 "Deletion will cause missing audio in some multitrack layouts.\n"
@@ -2105,7 +2103,7 @@
 "Deleção vai causar que o áudio se perca em alguns layouts multipista.\n"
 "Tem certeza que quer continuar?\n"
 
-#: src/callbacks.c:3534
+#: src/callbacks.c:3519
 msgid ""
 "\n"
 "Deletion will cause frames to shift in some multitrack layouts.\n"
@@ -2115,7 +2113,7 @@
 "Deleção vai causar que frames sejam movidos em alguns layouts multipista.\n"
 "Tem certeza que quer continuar?\n"
 
-#: src/callbacks.c:3553 src/callbacks.c:11210
+#: src/callbacks.c:3538 src/callbacks.c:11134
 msgid ""
 "\n"
 "Deletion will cause audio to shift in some multitrack layouts.\n"
@@ -2125,20 +2123,20 @@
 "Deleção vai causar que áudio seja movido em alguns layouts multipista.\n"
 "Tem certeza que quer continuar?\n"
 
-#: src/callbacks.c:3611
+#: src/callbacks.c:3597
 #, c-format
 msgid "Deleting frames %d to %d%s..."
 msgstr "Deletando frames %d até %d%s..."
 
-#: src/callbacks.c:3636
+#: src/callbacks.c:3619
 msgid "Deleting"
 msgstr "Deletando"
 
-#: src/callbacks.c:3717
+#: src/callbacks.c:3699
 msgid "Delete"
 msgstr "Deletar"
 
-#: src/callbacks.c:3738
+#: src/callbacks.c:3717
 msgid ""
 "\n"
 "\n"
@@ -2148,7 +2146,7 @@
 "\n"
 "Seleção está travada.\n"
 
-#: src/callbacks.c:4092
+#: src/callbacks.c:4056
 msgid ""
 "Ready to record. Use 'control' and cursor keys during playback to record "
 "your performance.\n"
@@ -2156,11 +2154,11 @@
 "play.)\n"
 msgstr ""
 
-#: src/callbacks.c:4098
+#: src/callbacks.c:4061
 msgid "Record cancelled.\n"
 msgstr "Gravação cancelada.\n"
 
-#: src/callbacks.c:4237
+#: src/callbacks.c:4197
 #, c-format
 msgid ""
 "\n"
@@ -2173,7 +2171,7 @@
 "O plugin '%s' diz:\n"
 "%s\n"
 
-#: src/callbacks.c:4241
+#: src/callbacks.c:4200
 #, c-format
 msgid ""
 "\n"
@@ -2186,7 +2184,7 @@
 "Impossível achar o método 'init' no plugin %s.\n"
 "O plugin pode não funcionar ou estar instalado incorretamente."
 
-#: src/callbacks.c:4571
+#: src/callbacks.c:4532
 #, c-format
 msgid ""
 "Saving the set will cause copies of all loaded clips to remain on the disk"
@@ -2198,22 +2196,22 @@
 "\n"
 "Por favor aperte 'Cancelar' se não é o que quer.\n"
 
-#: src/callbacks.c:4654
+#: src/callbacks.c:4617
 #, c-format
 msgid "Saving set %s"
 msgstr "Salvando set %s"
 
-#: src/callbacks.c:5005
+#: src/callbacks.c:4964
 #, c-format
 msgid "Loading clips from set %s"
 msgstr "Carregando clipes do set %s"
 
-#: src/callbacks.c:5093
+#: src/callbacks.c:5051
 #, c-format
 msgid "%d clips and %d layouts were recovered from set (%s).\n"
 msgstr ""
 
-#: src/callbacks.c:5312
+#: src/callbacks.c:5259
 msgid ""
 "LiVES will attempt to recover some disk space.\n"
 "You should ONLY run this if you have no other copies of LiVES running on "
@@ -2225,24 +2223,24 @@
 "nesta máquina.\n"
 "Aperte 'OK' para continuar.\n"
 
-#: src/callbacks.c:5317
+#: src/callbacks.c:5264
 msgid "Cleaning up disk space..."
 msgstr "Limpando espaço em disco..."
 
-#: src/callbacks.c:5387
+#: src/callbacks.c:5334
 msgid "Recovering disk space"
 msgstr ""
 
-#: src/callbacks.c:5439
+#: src/callbacks.c:5386
 #, c-format
 msgid "%s of disk space was recovered.\n"
 msgstr ""
 
-#: src/callbacks.c:5482
+#: src/callbacks.c:5428
 msgid "Resetting frame rates and frame values..."
 msgstr ""
 
-#: src/callbacks.c:5523
+#: src/callbacks.c:5469
 #, c-format
 msgid ""
 "\n"
@@ -2250,12 +2248,12 @@
 "Internal: %s (%d bpp) / %s\n"
 msgstr ""
 
-#: src/callbacks.c:5525
+#: src/callbacks.c:5471
 msgid "buffered"
 msgstr ""
 
-#: src/callbacks.c:5538 src/callbacks.c:5557 src/callbacks.c:5575
-#: src/callbacks.c:5609
+#: src/callbacks.c:5484 src/callbacks.c:5502 src/callbacks.c:5518
+#: src/callbacks.c:5551
 msgid ""
 "\n"
 "  Opening..."
@@ -2263,7 +2261,7 @@
 "\n"
 "  Abrindo..."
 
-#: src/callbacks.c:5545
+#: src/callbacks.c:5490
 #, c-format
 msgid ""
 "\n"
@@ -2272,7 +2270,7 @@
 "\n"
 "(%d virtual)"
 
-#: src/callbacks.c:5548
+#: src/callbacks.c:5493
 #, c-format
 msgid ""
 "\n"
@@ -2281,7 +2279,7 @@
 "\n"
 "(%d decodificado)"
 
-#: src/callbacks.c:5560 src/callbacks.c:5578 src/callbacks.c:5612
+#: src/callbacks.c:5504 src/callbacks.c:5520 src/callbacks.c:5553
 #, c-format
 msgid ""
 "\n"
@@ -2290,7 +2288,7 @@
 "\n"
 "  %.2f seg."
 
-#: src/callbacks.c:5569
+#: src/callbacks.c:5512
 msgid ""
 "\n"
 "  Unknown"
@@ -2298,23 +2296,23 @@
 "\n"
 "  Desconhecido"
 
-#: src/callbacks.c:5582 src/callbacks.c:5596
+#: src/callbacks.c:5524 src/callbacks.c:5538
 msgid "unsigned"
 msgstr ""
 
-#: src/callbacks.c:5583 src/callbacks.c:5597
+#: src/callbacks.c:5525 src/callbacks.c:5539
 msgid "signed"
 msgstr ""
 
-#: src/callbacks.c:5585 src/callbacks.c:5599
+#: src/callbacks.c:5527 src/callbacks.c:5541
 msgid "big-endian"
 msgstr ""
 
-#: src/callbacks.c:5586 src/callbacks.c:5600
+#: src/callbacks.c:5528 src/callbacks.c:5542
 msgid "little-endian"
 msgstr ""
 
-#: src/callbacks.c:5588 src/callbacks.c:5602
+#: src/callbacks.c:5530 src/callbacks.c:5544
 #, c-format
 msgid ""
 "  %d Hz %d bit\n"
@@ -2323,7 +2321,7 @@
 "  %d Hz %d bit\n"
 "%s %s"
 
-#: src/callbacks.c:5707
+#: src/callbacks.c:5647
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -2340,15 +2338,15 @@
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA.\n"
 msgstr ""
 
-#: src/callbacks.c:5721
+#: src/callbacks.c:5661
 msgid "A video editor and VJ program."
 msgstr ""
 
-#: src/callbacks.c:5722
+#: src/callbacks.c:5662
 msgid "About LiVES"
 msgstr ""
 
-#: src/callbacks.c:5724
+#: src/callbacks.c:5664
 msgid "translator_credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -2356,7 +2354,7 @@
 "  nitrofurano https://launchpad.net/~nitrofurano-3t\n"
 "  salsaman https://launchpad.net/~salsaman"
 
-#: src/callbacks.c:5758
+#: src/callbacks.c:5699
 #, c-format
 msgid ""
 "LiVES Version %s\n"
@@ -2370,7 +2368,7 @@
 "Homepage: http://lives.sourceforge.net"
 msgstr ""
 
-#: src/callbacks.c:6037
+#: src/callbacks.c:5996
 #, fuzzy
 msgid ""
 "\n"
@@ -2381,7 +2379,7 @@
 "\n"
 "Instale o mplayer para poder vêr este arquivo.\n"
 
-#: src/callbacks.c:6040
+#: src/callbacks.c:5998
 #, fuzzy
 msgid ""
 "\n"
@@ -2393,222 +2391,213 @@
 "\n"
 "Instale o mplayer para poder vêr este arquivo.\n"
 
-#: src/callbacks.c:6423 src/callbacks.c:8289
-msgid ""
-"\n"
-"Loading new audio may cause missing audio in some multitrack layouts.\n"
-"Are you sure you wish to continue ?\n"
-"."
-msgstr ""
-"\n"
-"Carregar novo áudio vai causar que áudio se perca em alguns layouts "
-"multipista.\n"
-"Tem certeza que quer continuar?\n"
-"."
-
-#: src/callbacks.c:6523
-#, c-format
-msgid "Opening audio %s, type %s..."
-msgstr "Abrindo áudio %s, tipo %s..."
-
-#: src/callbacks.c:6556 src/saveplay.c:480
-msgid "Opening audio"
-msgstr "Abrindo áudio"
-
-#: src/callbacks.c:6565 src/callbacks.c:6612 src/callbacks.c:8387
-#: src/callbacks.c:8429 src/callbacks.c:8472 src/callbacks.c:10846
-msgid "Cancelling"
-msgstr "Cancelando"
-
-#: src/callbacks.c:6660 src/callbacks.c:8514 src/callbacks.c:10876
-#: src/callbacks.c:11563
-msgid "Committing audio"
-msgstr "Transformando áudio"
-
-#: src/callbacks.c:6672 src/callbacks.c:8546
-msgid "New Audio"
-msgstr "Novo Áudio"
-
-#: src/callbacks.c:6779
+#: src/callbacks.c:6459
 #, c-format
 msgid ""
 "Text was saved as\n"
 "%s\n"
 msgstr ""
 
-#: src/callbacks.c:6951 src/saveplay.c:3618
-#, c-format
-msgid "%d frames are enough !\n"
-msgstr "%d frames são suficientes!\n"
-
-#: src/callbacks.c:7050
+#: src/callbacks.c:6706
 msgid "LiVES: - Encoder debug output"
 msgstr ""
 
-#: src/callbacks.c:7087 src/gui.c:1922
+#: src/callbacks.c:6743 src/gui.c:1921
 msgid "Fullscreen playback (f)"
 msgstr "Tela Cheia (f)"
 
-#: src/callbacks.c:7089
+#: src/callbacks.c:6744
 msgid "Fullscreen playback off (f)"
 msgstr "Desativar tela Cheia (f)"
 
-#: src/callbacks.c:7188 src/callbacks.c:7336 src/callbacks.c:7664
-#: src/callbacks.c:7681 src/gui.c:3712 src/saveplay.c:2467 src/saveplay.c:2501
-#: src/saveplay.c:3115 src/saveplay.c:3220 src/saveplay.c:3239
-#: src/multitrack.c:9340 src/multitrack.c:11060
+#: src/callbacks.c:6841 src/callbacks.c:6983 src/callbacks.c:7283
+#: src/callbacks.c:7298 src/gui.c:3838 src/saveplay.c:2442 src/saveplay.c:2475
+#: src/saveplay.c:3074 src/saveplay.c:3178 src/saveplay.c:3197
+#: src/multitrack.c:9526 src/multitrack.c:11288
 #, c-format
 msgid " (%d %% scale)"
 msgstr ""
 
-#: src/callbacks.c:7190 src/callbacks.c:7338 src/callbacks.c:7666
-#: src/gui.c:3716 src/saveplay.c:2469 src/saveplay.c:2503
+#: src/callbacks.c:6843 src/callbacks.c:6985 src/callbacks.c:7285
+#: src/gui.c:3842 src/saveplay.c:2444 src/saveplay.c:2477
 #, c-format
 msgid "LiVES: - Play Window%s"
 msgstr ""
 
-#: src/callbacks.c:7302 src/gui.c:1907
+#: src/callbacks.c:6950 src/gui.c:1906
 msgid "Double size (d)"
 msgstr "Tamanho dobrado(d)"
 
-#: src/callbacks.c:7309
+#: src/callbacks.c:6956
 msgid "Single size (d)"
 msgstr "Tamanho normal (d)"
 
-#: src/callbacks.c:7442 src/callbacks.c:7443
+#: src/callbacks.c:7087 src/callbacks.c:7088
 msgid "Hide the play window (s)"
 msgstr "Esconder janela do tocador (s)"
 
-#: src/callbacks.c:7452 src/gui.c:1746
+#: src/callbacks.c:7096 src/gui.c:1744
 msgid "Show the play window (s)"
 msgstr "Mostrar janela do tocador (s)"
 
-#: src/callbacks.c:7453 src/gui.c:1896
+#: src/callbacks.c:7097 src/gui.c:1895
 msgid "Play in separate window (s)"
 msgstr "Tocar em janela separada (s)"
 
-#: src/callbacks.c:7535 src/gui.c:4060 src/saveplay.c:2498
+#: src/callbacks.c:7175 src/gui.c:4169 src/saveplay.c:2472
 msgid "LiVES: - Streaming"
 msgstr ""
 
-#: src/callbacks.c:7778
+#: src/callbacks.c:7388
 msgid "Switch continuous looping off (o)"
 msgstr "Desligar loop contínuo (o)"
 
-#: src/callbacks.c:7785 src/gui.c:1795
+#: src/callbacks.c:7394 src/gui.c:1793
 msgid "Switch continuous looping on (o)"
 msgstr "Ligar loop contínuo (o)"
 
-#: src/callbacks.c:7837
+#: src/callbacks.c:7444
 #, c-format
 msgid "Audio volume (%.2f)"
 msgstr "Volume do áudio (%.2f)"
 
-#: src/callbacks.c:7876 src/callbacks.c:7877 src/gui.c:3640
+#: src/callbacks.c:7483 src/callbacks.c:7484 src/gui.c:3766
 msgid "Unmute the audio (z)"
 msgstr "Ligar o áudio (z)"
 
-#: src/callbacks.c:7888 src/callbacks.c:7889 src/gui.c:1808 src/gui.c:3639
+#: src/callbacks.c:7494 src/callbacks.c:7495 src/gui.c:1806 src/gui.c:3765
 msgid "Mute the audio (z)"
 msgstr "Desligar o áudio (z)"
 
-#: src/callbacks.c:8038
+#: src/callbacks.c:7643
 msgid "Reversing clipboard..."
 msgstr "Invertendo área de trabalho..."
 
-#: src/callbacks.c:8052
+#: src/callbacks.c:7657
 msgid "Reversing clipboard"
 msgstr "Invertendo área de trabalho"
 
-#: src/callbacks.c:8084
+#: src/callbacks.c:7689
 msgid "LiVES: Load subtitles from..."
 msgstr ""
 
-#: src/callbacks.c:8151 src/saveplay.c:970
+#: src/callbacks.c:7753 src/saveplay.c:956
 #, c-format
 msgid "Loaded subtitle file: %s\n"
 msgstr ""
 
-#: src/callbacks.c:8220
+#: src/callbacks.c:7821
 msgid "Subtitles were erased.\n"
 msgstr ""
 
-#: src/callbacks.c:8239
+#: src/callbacks.c:7843
 msgid "LiVES: - Select Audio File"
 msgstr ""
 
-#: src/callbacks.c:8250
+#: src/callbacks.c:7878 src/callbacks.c:8232
+msgid ""
+"\n"
+"Loading new audio may cause missing audio in some multitrack layouts.\n"
+"Are you sure you wish to continue ?\n"
+"."
+msgstr ""
+"\n"
+"Carregar novo áudio vai causar que áudio se perca em alguns layouts "
+"multipista.\n"
+"Tem certeza que quer continuar?\n"
+"."
+
+#: src/callbacks.c:7989
+#, c-format
+msgid "Opening audio %s, type %s..."
+msgstr "Abrindo áudio %s, tipo %s..."
+
+#: src/callbacks.c:8023 src/saveplay.c:477
+msgid "Opening audio"
+msgstr "Abrindo áudio"
+
+#: src/callbacks.c:8032 src/callbacks.c:8083 src/callbacks.c:8327
+#: src/callbacks.c:8369 src/callbacks.c:8412 src/callbacks.c:10766
+msgid "Cancelling"
+msgstr "Cancelando"
+
+#: src/callbacks.c:8137 src/callbacks.c:8454 src/callbacks.c:10803
+#: src/callbacks.c:11477
+msgid "Committing audio"
+msgstr "Transformando áudio"
+
+#: src/callbacks.c:8153 src/callbacks.c:8484
+msgid "New Audio"
+msgstr "Novo Áudio"
+
+#: src/callbacks.c:8194
 msgid "Please set your CD play device in Tools | Preferences | Misc\n"
 msgstr ""
 "Por favor configure seu tocador de CD em 'Ferramentas | Preferências | "
 "Misc'\n"
 
-#: src/callbacks.c:8321
+#: src/callbacks.c:8264
 #, c-format
 msgid "Opening CD track %d from %s..."
 msgstr "Abrindo faixa do CD %d de %s..."
 
-#: src/callbacks.c:8326
+#: src/callbacks.c:8267
 #, c-format
 msgid "CD track %d"
 msgstr "Faixa do CD %d"
 
-#: src/callbacks.c:8373
+#: src/callbacks.c:8313
 msgid "Opening CD track..."
 msgstr "Abrindo faixa de CD..."
 
-#: src/callbacks.c:8415 src/callbacks.c:8461
+#: src/callbacks.c:8355 src/callbacks.c:8401
 msgid "Error loading CD track\n"
 msgstr "Erro carregado faixa do CD\n"
 
-#: src/callbacks.c:8584
+#: src/callbacks.c:8518
 msgid "layout errors"
 msgstr "erros de layout"
 
-#: src/callbacks.c:8595
+#: src/callbacks.c:8529
 msgid "Close _Window"
 msgstr "Fechar Janela [_W]"
 
-#: src/callbacks.c:8606
+#: src/callbacks.c:8540
 msgid "Clear _Errors"
 msgstr "Limpar _Erros"
 
-#: src/callbacks.c:8617
+#: src/callbacks.c:8551
 msgid "_Delete affected layouts"
 msgstr "_Deletar layouts afetados"
 
-#: src/callbacks.c:9343 src/callbacks.c:9388
+#: src/callbacks.c:9253 src/callbacks.c:9298
 msgid "Resume"
 msgstr "Continuar"
 
-#: src/callbacks.c:9344
+#: src/callbacks.c:9254
 msgid ""
 "\n"
 "Paused\n"
 "(click Resume to continue processing)"
 msgstr ""
 
-#: src/callbacks.c:9345 src/callbacks.c:9406
+#: src/callbacks.c:9255 src/callbacks.c:9315
 msgid "paused..."
 msgstr "pausado..."
 
-#: src/callbacks.c:9372 src/callbacks.c:9418
-msgid "Pause"
-msgstr "Pausa"
-
-#: src/callbacks.c:9374 src/callbacks.c:9421
+#: src/callbacks.c:9284 src/callbacks.c:9333
 msgid "resumed..."
 msgstr "continuando..."
 
-#: src/callbacks.c:9393
+#: src/callbacks.c:9303
 msgid "Keep"
 msgstr "Manter"
 
-#: src/callbacks.c:9396
+#: src/callbacks.c:9305
 msgid "Enough"
 msgstr ""
 
-#: src/callbacks.c:9401
+#: src/callbacks.c:9310
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2621,28 +2610,28 @@
 "(clique 'Manter' para manter o que você tem e parar)\n"
 "(clique em 'Continuar' para continuar o processamento)"
 
-#: src/callbacks.c:9419
+#: src/callbacks.c:9331
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/callbacks.c:9558
+#: src/callbacks.c:9478
 msgid "Stop"
 msgstr ""
 
-#: src/callbacks.c:10053 src/multitrack.c:13247
+#: src/callbacks.c:9968 src/multitrack.c:13489
 msgid "LiVES: Selected frame"
 msgstr "LiVES: Frame selecionado"
 
-#: src/callbacks.c:10061
+#: src/callbacks.c:9976
 msgid "_Save frame as..."
 msgstr ""
 
-#: src/callbacks.c:10290
+#: src/callbacks.c:10202
 #, c-format
 msgid "Audio is ahead of video by %.4f secs. at frame %d, with fps %.4f\n"
 msgstr ""
 
-#: src/callbacks.c:10347
+#: src/callbacks.c:10255
 msgid ""
 "\n"
 "\n"
@@ -2651,7 +2640,7 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10353
+#: src/callbacks.c:10261
 msgid ""
 "\n"
 "\n"
@@ -2663,7 +2652,7 @@
 "Você deve instalar o \"xwininfo\" para usar este recurso\n"
 "\n"
 
-#: src/callbacks.c:10429 src/callbacks.c:11479
+#: src/callbacks.c:10334 src/callbacks.c:11395
 msgid ""
 "\n"
 "Record time must be greater than 0.\n"
@@ -2671,7 +2660,7 @@
 "\n"
 "Tempo de gravação deve ser maior que 0.\n"
 
-#: src/callbacks.c:10440
+#: src/callbacks.c:10346
 msgid ""
 "Capture an External Window:\n"
 "\n"
@@ -2685,17 +2674,17 @@
 "Clique em 'Cancelar' para cancelar\n"
 "\n"
 
-#: src/callbacks.c:10445
+#: src/callbacks.c:10351
 msgid "External window was released.\n"
 msgstr "A janela externa foi solta.\n"
 
-#: src/callbacks.c:10479
+#: src/callbacks.c:10385
 msgid ""
 "Click on a Window to Capture it\n"
 "Press 'q' to stop recording"
 msgstr ""
 
-#: src/callbacks.c:10513
+#: src/callbacks.c:10419
 #, c-format
 msgid ""
 "\n"
@@ -2711,19 +2700,19 @@
 "'Parar' ou 'q' para terminar.\n"
 "(O padrão de %.3f frames por segundo vai ser usado.)\n"
 
-#: src/callbacks.c:10539
+#: src/callbacks.c:10443
 msgid "LiVES was unable to capture this window. Sorry.\n"
 msgstr "LiVES não conseguiu capturar esta janela. Desculpe.\n"
 
-#: src/callbacks.c:10695
+#: src/callbacks.c:10601
 msgid "Export Selected Audio as..."
 msgstr "Exportar Áudio Selecionado como..."
 
-#: src/callbacks.c:10699
+#: src/callbacks.c:10604
 msgid "Export Audio as..."
 msgstr "Exportar Áudio como..."
 
-#: src/callbacks.c:10714
+#: src/callbacks.c:10619
 msgid ""
 "\n"
 "\n"
@@ -2737,86 +2726,86 @@
 "Clique em 'OK' para exportar na nova velocidade, ou 'Cancelar' para exportar "
 "na velocidade original.\n"
 
-#: src/callbacks.c:10720
+#: src/callbacks.c:10625
 #, c-format
 msgid "Exporting audio frames %d to %d as %s..."
 msgstr "Exportando frames de áudio %d até %d como %s..."
 
-#: src/callbacks.c:10725
+#: src/callbacks.c:10629
 #, c-format
 msgid "Exporting audio as %s..."
 msgstr "Exportando áudio como %s..."
 
-#: src/callbacks.c:10751
+#: src/callbacks.c:10655
 msgid "Exporting audio"
 msgstr "Exportando áudio"
 
-#: src/callbacks.c:10782
+#: src/callbacks.c:10695
 msgid "LiVES: - Append Audio File"
 msgstr ""
 
-#: src/callbacks.c:10825
+#: src/callbacks.c:10739
 #, c-format
 msgid "Appending audio file %s..."
 msgstr "Inserindo arquivo de áudio %s..."
 
-#: src/callbacks.c:10836
+#: src/callbacks.c:10756
 msgid "Appending audio"
 msgstr "Inserindo áudio"
 
-#: src/callbacks.c:10892
+#: src/callbacks.c:10818
 msgid "Append Audio"
 msgstr "Anexar Áudio"
 
-#: src/callbacks.c:10952
+#: src/callbacks.c:10883
 #, c-format
 msgid "Padding audio to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10954
+#: src/callbacks.c:10885
 #, c-format
 msgid "Trimming audio from %.2f to %.2f seconds..."
 msgstr "Diminuindo áudio de %.2f para %.2f segundos..."
 
-#: src/callbacks.c:10973
+#: src/callbacks.c:10904
 msgid "Trimming/Padding audio"
 msgstr "Diminuindo/Aumentando áudio"
 
-#: src/callbacks.c:10981
+#: src/callbacks.c:10912
 msgid "Trim/Pad Audio"
 msgstr "Ajustar Áudio"
 
-#: src/callbacks.c:11055
+#: src/callbacks.c:10982
 msgid "Fading audio in"
 msgstr "Fading in áudio"
 
-#: src/callbacks.c:11056
+#: src/callbacks.c:10983
 msgid "Fade audio in"
 msgstr "Fade in áudio"
 
-#: src/callbacks.c:11061
+#: src/callbacks.c:10987
 msgid "Fading audio out"
 msgstr "Fading out áudio"
 
-#: src/callbacks.c:11062
+#: src/callbacks.c:10988
 msgid "Fade audio out"
 msgstr "Fade out do áudio"
 
-#: src/callbacks.c:11085
+#: src/callbacks.c:11011
 #, c-format
 msgid "%s over %.1f seconds..."
 msgstr "%s sobre %.1f segundos..."
 
-#: src/callbacks.c:11087
+#: src/callbacks.c:11013
 #, c-format
 msgid "%s from time %.2f seconds to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11094
+#: src/callbacks.c:11020
 msgid "Fading audio..."
 msgstr "Fading áudio..."
 
-#: src/callbacks.c:11194
+#: src/callbacks.c:11119
 msgid ""
 "\n"
 "Deleting all audio will close this file.\n"
@@ -2826,47 +2815,47 @@
 "Deletar todo áudio vai fechar este arquivo.\n"
 "Tem certeza?"
 
-#: src/callbacks.c:11197
+#: src/callbacks.c:11122
 msgid "Deleting all audio..."
 msgstr "Deletando todo áudio..."
 
-#: src/callbacks.c:11203
+#: src/callbacks.c:11127
 #, c-format
 msgid "Deleting audio from %.2f to %.2f seconds..."
 msgstr "Deletando áudio de %.2f até %.2f segundos..."
 
-#: src/callbacks.c:11290
+#: src/callbacks.c:11214
 msgid "Deleting Audio"
 msgstr "Deletando Áudio"
 
-#: src/callbacks.c:11297
+#: src/callbacks.c:11221
 msgid "Delete Audio"
 msgstr "Deletar Áudio"
 
-#: src/callbacks.c:11636
+#: src/callbacks.c:11550
 msgid "Record new audio"
 msgstr "Gravar áudio novo"
 
-#: src/callbacks.c:11725
+#: src/callbacks.c:11640
 #, c-format
 msgid "Inserting silence from %.2f to %.2f seconds..."
 msgstr "Inserindo silêncio de %.2f até %.2f segundos..."
 
-#: src/callbacks.c:11754
+#: src/callbacks.c:11666
 msgid "Inserting Silence"
 msgstr "Inserindo Silêncio"
 
-#: src/merge.c:85
+#: src/merge.c:96
 msgid "LiVES: - Merge"
 msgstr "LiVES: - Mesclar"
 
-#: src/merge.c:102
+#: src/merge.c:113
 #, c-format
 msgid "Merge Clipboard [ %d Frames ]       With Selection [ %d Frames ]"
 msgstr ""
 "Mesclar área de trabalho [ %d Frames ]       Com a seleção [ %d Frames ]"
 
-#: src/merge.c:107
+#: src/merge.c:118
 #, c-format
 msgid ""
 "Merge Clipboard [ %d Frames (resampled) ]       With Selection [ %d Frames ]"
@@ -2874,585 +2863,585 @@
 "Mesclar área de trabalho [ %d Frames (resampleada)]       Com a seleção [ %d "
 "Frames ]"
 
-#: src/merge.c:118
+#: src/merge.c:130
 msgid "Align _Starts"
 msgstr "Alinhar Início_s"
 
-#: src/merge.c:123
+#: src/merge.c:135
 msgid "Align _Ends"
 msgstr "Alinhar Finais [_E]"
 
-#: src/merge.c:134
+#: src/merge.c:146
 msgid "What to do with extra clipboard frames -"
 msgstr "O que fazer com os frames que sobraram na área de trabalho -"
 
-#: src/merge.c:137
+#: src/merge.c:149
 msgid "_Insert Frames"
 msgstr "_Inserir Frames"
 
-#: src/merge.c:143
+#: src/merge.c:155
 msgid "_Drop Frames"
 msgstr "_Deletar Frames"
 
-#: src/merge.c:149
+#: src/merge.c:160
 msgid "Number of Times to Loop Clipboard"
 msgstr "Número de vezes a repetir área de transferência"
 
-#: src/merge.c:160
+#: src/merge.c:171
 msgid "_Loop Clipboard to Fit Selection"
 msgstr "Repetir área de transferência para se encaixar à se_leção"
 
-#: src/merge.c:173
+#: src/merge.c:184
 msgid "_Transition Method:"
 msgstr "Método de _Transição:"
 
-#: src/merge.c:394
+#: src/merge.c:395
 msgid "Merging clipboard with selection..."
 msgstr "Mesclando área de transferência com seleção..."
 
-#: src/merge.c:551
+#: src/merge.c:539
 msgid "Merge done.\n"
 msgstr "Mesclagem feita.\n"
 
-#: src/gui.c:123
+#: src/gui.c:122
 msgid "_Custom Generators"
 msgstr ""
 
-#: src/gui.c:124
+#: src/gui.c:123
 msgid "_Custom Effects"
 msgstr "Efeitos _Customizados"
 
-#: src/gui.c:125
+#: src/gui.c:124
 msgid "Custom _Utilities"
 msgstr "_Utilitários Customizados"
 
-#: src/gui.c:352 src/multitrack.c:5964
+#: src/gui.c:351 src/multitrack.c:6143
 msgid "_File"
 msgstr "_Ficheiro"
 
-#: src/gui.c:367 src/multitrack.c:5989
+#: src/gui.c:366 src/multitrack.c:6168
 msgid "_Open File/Directory"
 msgstr "Abrir Arquivo/Diretóri_o"
 
-#: src/gui.c:373
+#: src/gui.c:372
 msgid "O_pen Part of File..."
 msgstr ""
 
-#: src/gui.c:379 src/gui.c:383 src/multitrack.c:6006 src/multitrack.c:6023
-#: src/multitrack.c:6028
+#: src/gui.c:378 src/gui.c:382 src/multitrack.c:6185 src/multitrack.c:6202
+#: src/multitrack.c:6207
 msgid "Open _Location/Stream..."
 msgstr "Abrir Stream... [_L]"
 
-#: src/gui.c:393 src/multitrack.c:6016
+#: src/gui.c:392 src/multitrack.c:6195
 msgid "Open _Youtube Clip..."
 msgstr ""
 
-#: src/gui.c:404
+#: src/gui.c:403
 msgid "Import from _dvd/vcd..."
 msgstr ""
 
-#: src/gui.c:413
+#: src/gui.c:412
 msgid "Import from _dvd"
 msgstr ""
 
-#: src/gui.c:416
+#: src/gui.c:415
 msgid "Import from _vcd"
 msgstr ""
 
-#: src/gui.c:419
+#: src/gui.c:418
 msgid "_Import from Firewire"
 msgstr ""
 
-#: src/gui.c:428 src/multitrack.c:6086
+#: src/gui.c:427 src/multitrack.c:6265
 msgid "Import from _Firewire Device (dv)"
 msgstr "Importar de Dispositivo _Firewire (DV)"
 
-#: src/gui.c:429 src/multitrack.c:6094
+#: src/gui.c:428 src/multitrack.c:6273
 msgid "Import from _Firewire Device (hdv)"
 msgstr "Importar de Dispositivo _Firewire (HDV)"
 
-#: src/gui.c:457
+#: src/gui.c:456
 msgid "_Add Webcam/TV card..."
 msgstr ""
 
-#: src/gui.c:476
+#: src/gui.c:475
 msgid "Add _Unicap Device"
 msgstr ""
 
-#: src/gui.c:486
+#: src/gui.c:485
 msgid "Add Live _Firewire Device"
 msgstr ""
 
-#: src/gui.c:495
+#: src/gui.c:494
 msgid "Add _TV Device"
 msgstr ""
 
-#: src/gui.c:510 src/multitrack.c:6117
+#: src/gui.c:509 src/multitrack.c:6296
 msgid "_Recent Files..."
 msgstr "Arquivos _Recentes"
 
-#: src/gui.c:560 src/multitrack.c:6177
+#: src/gui.c:559 src/multitrack.c:6356
 msgid "_Reload Clip Set..."
 msgstr "_Recarregar Set"
 
-#: src/gui.c:564 src/multitrack.c:6185
+#: src/gui.c:563 src/multitrack.c:6364
 msgid "Close/Sa_ve All Clips"
 msgstr "Fechar/Sal_var Todos Clipes"
 
-#: src/gui.c:575
+#: src/gui.c:574
 msgid "_Encode Clip As..."
 msgstr "Salvar Clip_e Como..."
 
-#: src/gui.c:577
+#: src/gui.c:576
 msgid "Encode _Selection As..."
 msgstr "Salvar _Seleção Como..."
 
-#: src/gui.c:584
+#: src/gui.c:583
 msgid "_Close This Clip"
 msgstr "Fechar Este _Clipe"
 
-#: src/gui.c:595
+#: src/gui.c:594
 msgid "_Backup Clip as .lv1..."
 msgstr "_Backup do Clip como .lv1"
 
-#: src/gui.c:604
+#: src/gui.c:603
 msgid "_Restore Clip from .lv1..."
 msgstr "_Restaurar Clip de .lv1"
 
-#: src/gui.c:615
+#: src/gui.c:614
 msgid "Encode/Load/Backup _with Sound"
 msgstr "Salvar/Carregar/Backup com Som [_W]"
 
-#: src/gui.c:620
+#: src/gui.c:619
 msgid "Auto load subtitles"
 msgstr ""
 
-#: src/gui.c:628 src/multitrack.c:6224
+#: src/gui.c:627 src/multitrack.c:6403
 msgid "Clean _up Diskspace"
 msgstr "Limpar espaço em disco [_U]"
 
-#: src/gui.c:636 src/multitrack.c:6257
+#: src/gui.c:635 src/multitrack.c:6436
 msgid "_Edit"
 msgstr "_Editar"
 
-#: src/gui.c:685
+#: src/gui.c:684
 msgid "_MULTITRACK mode"
 msgstr "Modo _MULTIPISTA"
 
-#: src/gui.c:696
+#: src/gui.c:695
 msgid "_Copy Selection"
 msgstr "_Copiar Seleção"
 
-#: src/gui.c:705
+#: src/gui.c:704
 msgid "Cu_t Selection"
 msgstr "Cor_tar Seleção"
 
-#: src/gui.c:714
+#: src/gui.c:713
 msgid "_Insert from Clipboard..."
 msgstr "_Inserir da Área de Transferência"
 
-#: src/gui.c:730
+#: src/gui.c:729
 msgid "Paste as _New"
 msgstr "Colar como _Novo"
 
-#: src/gui.c:739
+#: src/gui.c:738
 msgid "_Merge Clipboard with Selection..."
 msgstr "_Mesclar Área de Transferência com Seleção"
 
-#: src/gui.c:746
+#: src/gui.c:745
 msgid "_Delete Selection"
 msgstr "_Deletar Seleção"
 
-#: src/gui.c:764
+#: src/gui.c:763
 msgid "Decouple _Video from Audio"
 msgstr "Separar Áudio e _Vídeo"
 
-#: src/gui.c:772
+#: src/gui.c:771
 msgid "_Select..."
 msgstr "_Selecionar"
 
-#: src/gui.c:786
+#: src/gui.c:785
 msgid "Select _All Frames"
 msgstr "Selecionar Todos Fr_ames"
 
-#: src/gui.c:794
+#: src/gui.c:793
 msgid "_Start Frame Only"
 msgstr "Apena_s Frame Inicial"
 
-#: src/gui.c:802
+#: src/gui.c:801
 msgid "_End Frame Only"
 msgstr "Apenas Fram_e Final"
 
-#: src/gui.c:813
+#: src/gui.c:812
 msgid "Select from _First Frame"
 msgstr "Selecionar a partir do primeiro _frame"
 
-#: src/gui.c:817
+#: src/gui.c:816
 msgid "Select to _Last Frame"
 msgstr "Selecionar a partir do ú_ltimo frame"
 
-#: src/gui.c:821
+#: src/gui.c:820
 msgid "Select Last Insertion/_Merge"
 msgstr "Selecionar Última Inserção/_Mesclagem"
 
-#: src/gui.c:825
+#: src/gui.c:824
 msgid "Select Last _Effect"
 msgstr "Selecionar Último _Efeito"
 
-#: src/gui.c:829
+#: src/gui.c:828
 msgid "_Invert Selection"
 msgstr "_Inverter Seleção"
 
-#: src/gui.c:837
+#: src/gui.c:836
 msgid "_Lock Selection Width"
 msgstr "Travar _Largura da Seleção"
 
-#: src/gui.c:842 src/multitrack.c:6409
+#: src/gui.c:841 src/multitrack.c:6591
 msgid "_Play"
 msgstr "_Tocar"
 
-#: src/gui.c:854
+#: src/gui.c:853
 msgid "_Play All"
 msgstr "Tocar Tudo [_P]"
 
-#: src/gui.c:869
+#: src/gui.c:868
 msgid "Pla_y Selection"
 msgstr "Tocar Seleção [_Y]"
 
-#: src/gui.c:877
+#: src/gui.c:876
 msgid "Play _Clipboard"
 msgstr "To_car Área de Transferência"
 
-#: src/gui.c:899 src/multitrack.c:6441
+#: src/gui.c:898 src/multitrack.c:6623
 msgid "_Stop"
 msgstr "Parar [_S]"
 
-#: src/gui.c:914 src/multitrack.c:6453
+#: src/gui.c:913 src/multitrack.c:6635
 msgid "Re_wind"
 msgstr "Voltar [_W]"
 
-#: src/gui.c:946 src/multitrack.c:6471
+#: src/gui.c:945 src/multitrack.c:6653
 msgid "_Full Screen"
 msgstr "Tela Cheia [_F]"
 
-#: src/gui.c:955
+#: src/gui.c:954
 msgid "_Double Size"
 msgstr "Tamanho _Dobrado"
 
-#: src/gui.c:963 src/multitrack.c:6479
+#: src/gui.c:962 src/multitrack.c:6661
 msgid "Play in _Separate Window"
 msgstr "Tocar em Janela _Separada"
 
-#: src/gui.c:972
+#: src/gui.c:971
 msgid "_Blank Background"
 msgstr "Fundo _Branco"
 
-#: src/gui.c:979
+#: src/gui.c:978
 msgid "(Auto)_loop Video (to fit audio track)"
 msgstr "Repetir vídeo (para caber na faixa de áudio)"
 
-#: src/gui.c:988 src/multitrack.c:6487
+#: src/gui.c:987 src/multitrack.c:6669
 msgid "L_oop Continuously"
 msgstr "Repetir C_ontinuamente"
 
-#: src/gui.c:997
+#: src/gui.c:996
 msgid "Pin_g Pong Loops"
 msgstr "Loops Pin_g Pong"
 
-#: src/gui.c:1005 src/multitrack.c:6495
+#: src/gui.c:1004 src/multitrack.c:6677
 msgid "_Mute"
 msgstr "_Mudo"
 
-#: src/gui.c:1017
+#: src/gui.c:1016
 msgid "Separate Window 'S_ticky' Mode"
 msgstr "Modo 'S_ticky' de Janela"
 
-#: src/gui.c:1025
+#: src/gui.c:1024
 msgid "S_how Frame Counter"
 msgstr "Mostrar Contador de Frames [_H]"
 
-#: src/gui.c:1035
+#: src/gui.c:1034
 msgid "Show Subtitles"
 msgstr ""
 
-#: src/gui.c:1045
+#: src/gui.c:1044
 msgid "Letterbox mode"
 msgstr ""
 
-#: src/gui.c:1051 src/multitrack.c:6507
+#: src/gui.c:1050 src/multitrack.c:6689
 msgid "Effect_s"
 msgstr "Efeito_s"
 
-#: src/gui.c:1054
+#: src/gui.c:1053
 msgid "Effects are applied to the current selection."
 msgstr "Efeitos são aplicados na seleção atual."
 
-#: src/gui.c:1067
+#: src/gui.c:1066
 msgid "_Run Test Rendered Effect/Tool/Generator..."
 msgstr "_Rodar Efeito/Ferramenta/erador de Teste..."
 
-#: src/gui.c:1072 src/multitrack.c:7123
+#: src/gui.c:1071 src/multitrack.c:7299
 msgid "_Tools"
 msgstr "Ferramen_tas"
 
-#: src/gui.c:1075
+#: src/gui.c:1074
 msgid "Tools are applied to complete clips."
 msgstr "Ferramentas são aplicadas nos clipes inteiros."
 
-#: src/gui.c:1085
+#: src/gui.c:1084
 msgid "_Reverse Clipboard"
 msgstr "Inverte_r área de transferência"
 
-#: src/gui.c:1094
+#: src/gui.c:1093
 msgid "_Change Playback/Save Speed..."
 msgstr "Mudar velo_cidade de Execução/Salvar"
 
-#: src/gui.c:1099
+#: src/gui.c:1098
 msgid "Resample _Video to New Frame Rate..."
 msgstr "Resamplear _Vídeo para Nova Frame Rate"
 
-#: src/gui.c:1105
+#: src/gui.c:1104
 msgid "_Utilities"
 msgstr "_Utilitários"
 
-#: src/gui.c:1110
+#: src/gui.c:1109
 msgid "Custom _Tools"
 msgstr "Ferramentas _Customizadas"
 
-#: src/gui.c:1116 src/multitrack.c:7149
+#: src/gui.c:1115 src/multitrack.c:7325
 msgid "_Generate"
 msgstr "_Gerar"
 
-#: src/gui.c:1126
+#: src/gui.c:1125
 msgid "Loading rendered effect plugins..."
 msgstr "Carregando efeitos renderizados..."
 
-#: src/gui.c:1139
+#: src/gui.c:1138
 msgid "Load _Subtitles from File..."
 msgstr ""
 
-#: src/gui.c:1144
+#: src/gui.c:1143
 msgid "Erase subtitles"
 msgstr ""
 
-#: src/gui.c:1152 src/multitrack.c:7158
+#: src/gui.c:1151 src/multitrack.c:7334
 msgid "Capture _External Window... "
 msgstr "Capturar Janela _Externa "
 
-#: src/gui.c:1159 src/multitrack.c:7173
+#: src/gui.c:1158 src/multitrack.c:7349
 msgid "_Preferences..."
 msgstr "_Preferências"
 
-#: src/gui.c:1172
+#: src/gui.c:1171
 msgid "_Audio"
 msgstr "_Áudio"
 
-#: src/gui.c:1184
+#: src/gui.c:1183
 msgid "Load _New Audio for Clip..."
 msgstr "Carregar _Novo Áudio para o Clipe"
 
-#: src/gui.c:1190
+#: src/gui.c:1189
 msgid "Load _CD Track..."
 msgstr "Carregar Faixa do _CD"
 
-#: src/gui.c:1191
+#: src/gui.c:1190
 msgid "E_ject CD"
 msgstr "E_jetar CD"
 
-#: src/gui.c:1205
+#: src/gui.c:1204
 msgid "Record E_xternal Audio..."
 msgstr "Gravar Áudio E_xterno..."
 
-#: src/gui.c:1218
+#: src/gui.c:1217
 msgid "to New _Clip..."
 msgstr "para _Clip Novo..."
 
-#: src/gui.c:1222
+#: src/gui.c:1221
 msgid "to _Selection"
 msgstr "para _Seleção"
 
-#: src/gui.c:1230
+#: src/gui.c:1229
 msgid "Fade Audio _In..."
 msgstr "Fade _In Áudio..."
 
-#: src/gui.c:1234
+#: src/gui.c:1233
 msgid "Fade Audio _Out..."
 msgstr "Fade _Out Áudio..."
 
-#: src/gui.c:1244
+#: src/gui.c:1243
 msgid "_Export Audio..."
 msgstr "_Exportar Áudio"
 
-#: src/gui.c:1257
+#: src/gui.c:1256
 msgid "Export _Selected Audio..."
 msgstr "Exportar Áudio _Selecionado"
 
-#: src/gui.c:1261
+#: src/gui.c:1260
 msgid "Export _All Audio..."
 msgstr "Export_ar Todo Áudio"
 
-#: src/gui.c:1265
+#: src/gui.c:1264
 msgid "_Append Audio..."
 msgstr "_Anexar Áudio"
 
-#: src/gui.c:1270
+#: src/gui.c:1269
 msgid "_Trim/Pad Audio..."
 msgstr "_Ajustar Áudio"
 
-#: src/gui.c:1283
+#: src/gui.c:1282
 msgid "Trim/Pad Audio to _Selection"
 msgstr "Diminuir/Aumentar Áudio para _Selecão"
 
-#: src/gui.c:1288
+#: src/gui.c:1287
 msgid "Trim/Pad Audio from Beginning to _Play Start"
 msgstr "Ajustar Áudio do Início ao Começo da Execução [_P]"
 
-#: src/gui.c:1293
+#: src/gui.c:1292
 msgid "_Delete Audio..."
 msgstr "_Deletar Áudio"
 
-#: src/gui.c:1306
+#: src/gui.c:1305
 msgid "Delete _Selected Audio"
 msgstr "Deletar Áudio _Selecionado"
 
-#: src/gui.c:1310
+#: src/gui.c:1309
 msgid "Delete _All Audio"
 msgstr "Deletar _Todo Áudio"
 
-#: src/gui.c:1314
+#: src/gui.c:1313
 msgid "Insert _Silence in Selection"
 msgstr "Inserir _Silêncio na Seleção"
 
-#: src/gui.c:1319
+#: src/gui.c:1318
 msgid "_Resample Audio..."
 msgstr "_Resamplear Áudio..."
 
-#: src/gui.c:1324
+#: src/gui.c:1323
 msgid "_Info"
 msgstr "_Info"
 
-#: src/gui.c:1336
+#: src/gui.c:1335
 msgid "Show Clip _Info"
 msgstr "Mostrar _Informação de Clipe"
 
-#: src/gui.c:1344
+#: src/gui.c:1343
 msgid "Show/_Edit File Comments"
 msgstr "Mostrar/_Editar Comentários do Arquivo"
 
-#: src/gui.c:1349
+#: src/gui.c:1348
 msgid "Show _Clipboard Info"
 msgstr "Mostrar Info da Área de Transferên_cia"
 
-#: src/gui.c:1360 src/multitrack.c:7286
+#: src/gui.c:1359 src/multitrack.c:7462
 msgid "Show _Messages"
 msgstr "Mostrar _Mensagens"
 
-#: src/gui.c:1364 src/multitrack.c:7365
+#: src/gui.c:1363 src/multitrack.c:7541
 msgid "Show _Layout Errors"
 msgstr "Mostrar Erros de _Layout"
 
-#: src/gui.c:1369 src/multitrack.c:7263
+#: src/gui.c:1368 src/multitrack.c:7439
 msgid "_Clips"
 msgstr "_Clipes"
 
-#: src/gui.c:1381
+#: src/gui.c:1380
 msgid "_Rename Current Clip in Menu..."
 msgstr "_Renomear Clipe Atual no Menu"
 
-#: src/gui.c:1399
+#: src/gui.c:1398
 msgid "A_dvanced"
 msgstr "A_vançado"
 
-#: src/gui.c:1412
+#: src/gui.c:1411
 msgid "_RFX Effects/Tools/Utilities"
 msgstr "Efeitos/Ferramentas/Utilitários _RFX"
 
-#: src/gui.c:1424
+#: src/gui.c:1423
 msgid "_New Test RFX Script..."
 msgstr "_Novo Script RFX de Teste..."
 
-#: src/gui.c:1428
+#: src/gui.c:1427
 msgid "_Copy RFX Script to Test..."
 msgstr "_Copiar Script RFX para Teste"
 
-#: src/gui.c:1432
+#: src/gui.c:1431
 msgid "_Edit Test RFX Script..."
 msgstr "_Editar Script RFX de teste..."
 
-#: src/gui.c:1436
+#: src/gui.c:1435
 msgid "Rena_me Test RFX Script..."
 msgstr "Reno_mear Script RFX de Teste"
 
-#: src/gui.c:1440
+#: src/gui.c:1439
 msgid "_Delete Test RFX Script..."
 msgstr "_Deletar Script RFX de Teste"
 
-#: src/gui.c:1450
+#: src/gui.c:1449
 msgid "_Promote Test Rendered Effect/Tool/Generator..."
 msgstr "_Promover Teste de Efeito/Ferramenta/Gerador Renderizado..."
 
-#: src/gui.c:1457
+#: src/gui.c:1456
 msgid "_Import Custom RFX script..."
 msgstr "_Importar Script RFX Customizado"
 
-#: src/gui.c:1461
+#: src/gui.c:1460
 msgid "E_xport Custom RFX script..."
 msgstr "E_xportar Script RFX Customizado"
 
-#: src/gui.c:1465
+#: src/gui.c:1464
 msgid "De_lete Custom RFX Script..."
 msgstr "De_letar Script RFX Customizado"
 
-#: src/gui.c:1472
+#: src/gui.c:1471
 msgid "Re_build all RFX plugins"
 msgstr "Reconstruir todos plugins RFX [_B]"
 
-#: src/gui.c:1501
+#: src/gui.c:1498
 msgid "Receive _LiVES stream from..."
 msgstr "Receber _LiVES stream de..."
 
-#: src/gui.c:1506
+#: src/gui.c:1503
 msgid "_Send LiVES stream to..."
 msgstr "Enviar LiVES _stream para..."
 
-#: src/gui.c:1515
+#: src/gui.c:1512
 #, c-format
 msgid "Open _yuv4mpeg stream on %sstream.yuv..."
 msgstr "Abrir _yuv4mpeg stream em %sstream.yuv"
 
-#: src/gui.c:1536
+#: src/gui.c:1534
 msgid "_Import Project (.lv2)..."
 msgstr "_Importar Projeto (.lv2)"
 
-#: src/gui.c:1540
+#: src/gui.c:1538
 msgid "E_xport Project (.lv2)..."
 msgstr "E_xportar Projeto (.lv2)"
 
-#: src/gui.c:1545
+#: src/gui.c:1543
 msgid "_VJ"
 msgstr "_VJ"
 
-#: src/gui.c:1557
+#: src/gui.c:1555
 msgid "Real Time _Effect Mapping"
 msgstr "Mapeamento de _Efeitos de Tempo-Real"
 
-#: src/gui.c:1563
+#: src/gui.c:1561
 msgid "Bind real time effects to ctrl-number keys."
 msgstr "Vincular efeitos em tempo real para ctrl mais teclas de número."
 
-#: src/gui.c:1565
+#: src/gui.c:1563
 msgid "Set Real Time Effect _Defaults"
 msgstr "_Definir Padrão de Efeitos em Tempo Real"
 
-#: src/gui.c:1567
+#: src/gui.c:1565
 msgid "Set default parameter values for real time effects."
 msgstr "Definir padrão de valores de parâmetros para efeitos em tempo real."
 
-#: src/gui.c:1580
+#: src/gui.c:1578
 msgid "Save Real Time Effect _Defaults"
 msgstr "Salvar Padrão _de Efeitos em Tempo Real"
 
-#: src/gui.c:1583
+#: src/gui.c:1581
 msgid ""
 "Save real time effect defaults so they will be restored each time you use "
 "LiVES."
@@ -3460,320 +3449,320 @@
 "Salvar padrão de efeitos de tempo real de modo que seja restaurado toda vez "
 "que o LiVES abrir."
 
-#: src/gui.c:1589
+#: src/gui.c:1587
 msgid "_Reset all playback speeds and positions"
 msgstr "_Reiniciar todas as velocidades e posições de reprodução"
 
-#: src/gui.c:1592
+#: src/gui.c:1590
 msgid ""
 "Reset all playback positions to frame 1, and reset all playback frame rates."
 msgstr ""
 "Reiniciar todas posições de reprodução para o frame 1 e todas as framerates."
 
-#: src/gui.c:1594
+#: src/gui.c:1592
 msgid "_MIDI/joystick interface"
 msgstr ""
 
-#: src/gui.c:1609
+#: src/gui.c:1607
 msgid "_MIDI/joystick learner..."
 msgstr ""
 
-#: src/gui.c:1614
+#: src/gui.c:1612
 msgid "_Save device mapping..."
 msgstr ""
 
-#: src/gui.c:1620
+#: src/gui.c:1618
 msgid "_Load device mapping..."
 msgstr ""
 
-#: src/gui.c:1628
+#: src/gui.c:1626
 msgid "Show VJ _Keys"
 msgstr "Mostrar Teclas de VJ [_K]"
 
-#: src/gui.c:1632
+#: src/gui.c:1630
 msgid "To_ys"
 msgstr "_Brinquedos"
 
-#: src/gui.c:1644
+#: src/gui.c:1642
 msgid "_None"
 msgstr "_Nenhum"
 
-#: src/gui.c:1652
+#: src/gui.c:1650
 msgid "_Autolives"
 msgstr ""
 
-#: src/gui.c:1657
+#: src/gui.c:1655
 msgid "_Mad Frames"
 msgstr "Fra_mes doidos"
 
-#: src/gui.c:1662
+#: src/gui.c:1660
 msgid "_LiVES TV (broadband)"
 msgstr "TV _LiVES (banda larga)"
 
-#: src/gui.c:1672 src/multitrack.c:7387
+#: src/gui.c:1670 src/multitrack.c:7563
 msgid "_Help"
 msgstr "_Ajuda"
 
-#: src/gui.c:1684 src/multitrack.c:7407
+#: src/gui.c:1682 src/multitrack.c:7583
 msgid "_Manual (opens in browser)"
 msgstr ""
 
-#: src/gui.c:1691 src/multitrack.c:7416
+#: src/gui.c:1689 src/multitrack.c:7592
 msgid "_Donate to the project !"
 msgstr "_Doar ao projecto !"
 
-#: src/gui.c:1695 src/multitrack.c:7420
+#: src/gui.c:1693 src/multitrack.c:7596
 msgid "_Email the author"
 msgstr ""
 
-#: src/gui.c:1699 src/multitrack.c:7424
+#: src/gui.c:1697 src/multitrack.c:7600
 msgid "Report a _bug"
 msgstr ""
 
-#: src/gui.c:1703 src/multitrack.c:7428
+#: src/gui.c:1701 src/multitrack.c:7604
 msgid "Suggest a _feature"
 msgstr ""
 
-#: src/gui.c:1707 src/multitrack.c:7432
+#: src/gui.c:1705 src/multitrack.c:7608
 msgid "Assist with _translating"
 msgstr "Ajudar com a _tradução"
 
-#: src/gui.c:1714 src/multitrack.c:7439
+#: src/gui.c:1712 src/multitrack.c:7615
 msgid "_Troubleshoot"
 msgstr ""
 
-#: src/gui.c:1718 src/multitrack.c:7443
+#: src/gui.c:1716 src/multitrack.c:7619
 msgid "_About"
 msgstr "_Acerca"
 
-#: src/gui.c:1752
+#: src/gui.c:1750
 msgid "Rewind to start (w)"
 msgstr "Rebobinar para iniciar (w)"
 
-#: src/gui.c:1760 src/multitrack.c:16720
+#: src/gui.c:1758 src/multitrack.c:17010
 msgid "Play all (p)"
 msgstr "Tocar tudo (p)"
 
-#: src/gui.c:1768 src/gui.c:1877
+#: src/gui.c:1766 src/gui.c:1876
 msgid "Stop playback (q)"
 msgstr "Parar execução (q)"
 
-#: src/gui.c:1779
+#: src/gui.c:1777
 msgid "Play selection (y)"
 msgstr "Tocar seleção (y)"
 
-#: src/gui.c:1832
+#: src/gui.c:1829
 msgid "Volume"
 msgstr "Volume"
 
-#: src/gui.c:1854
+#: src/gui.c:1853
 msgid "Audio volume (1.00)"
 msgstr "Volume do áudio (1.00)"
 
-#: src/gui.c:1883
+#: src/gui.c:1882
 msgid "Unblank background (b)"
 msgstr "Remover fundo branco (b)"
 
-#: src/gui.c:1929
+#: src/gui.c:1928
 msgid "Play slower (ctrl-down)"
 msgstr "Tocar mais devagar (ctrl-down)"
 
-#: src/gui.c:1935
+#: src/gui.c:1934
 msgid "Play faster (ctrl-up)"
 msgstr "Tocar mais rápido (ctrl-up)"
 
-#: src/gui.c:1942
+#: src/gui.c:1941
 msgid "Skip back (ctrl-left)"
 msgstr "Voltar (ctrl-left)"
 
-#: src/gui.c:1948
+#: src/gui.c:1947
 msgid "Skip forward (ctrl-right)"
 msgstr "Avançar (ctrl-right)"
 
-#: src/gui.c:1954
+#: src/gui.c:1953
 msgid "Show clip info (i)"
 msgstr "Mostrar informação de clipe (i)"
 
-#: src/gui.c:1960
+#: src/gui.c:1959
 msgid "Hide this toolbar"
 msgstr "Esconder esta barra de ferramentas"
 
-#: src/gui.c:1962
+#: src/gui.c:1961
 msgid ""
 "Press \"s\" to toggle separate play window for improved performance, \"q\" "
 "to stop."
 msgstr ""
 
 #. TRANSLATORS: please keep the translated string the same length
-#: src/gui.c:1995
+#: src/gui.c:1994
 msgid "     Video playback speed (frames per second)        "
 msgstr "     Velocidade de execução do vídeo (frames por segundo)        "
 
-#: src/gui.c:2009
+#: src/gui.c:2008
 msgid "Vary the video speed"
 msgstr "Variar a velocidade do vídeo"
 
-#: src/gui.c:2092 src/gui.c:3218
+#: src/gui.c:2090 src/gui.c:3329
 msgid "First Frame"
 msgstr "Primeiro Frame"
 
-#: src/gui.c:2193 src/gui.c:3226
+#: src/gui.c:2191 src/gui.c:3336
 msgid "Last Frame"
 msgstr "Último Frame"
 
-#: src/gui.c:2210
+#: src/gui.c:2208
 msgid "The first selected frame in this clip"
 msgstr "O primeiro frame selecionado nesse clipe"
 
-#: src/gui.c:2248
+#: src/gui.c:2246
 msgid "The last selected frame in this clip"
 msgstr "O último frame selecionado nesse clipe"
 
-#: src/gui.c:2532
+#: src/gui.c:2546
 msgid "Starting...\n"
 msgstr "Iniciando...\n"
 
-#: src/gui.c:3074
+#: src/gui.c:3181
 msgid "    Press 'q' to stop recording.  DO NOT COVER THE PLAY WINDOW !   "
 msgstr ""
 "    Aperte 'Q' para parar a gravação. NÃO CUBRA A JANELA DO TOCADOR!   "
 
-#: src/gui.c:3521
+#: src/gui.c:3643
 msgid "Frame number to preview"
 msgstr "Número do frame a visualizar"
 
-#: src/gui.c:3538
+#: src/gui.c:3660
 msgid "_Free"
 msgstr "Livre [_f]"
 
-#: src/gui.c:3539
+#: src/gui.c:3661
 msgid "Free choice of frame number"
 msgstr "Escolha livre do número do frame"
 
-#: src/gui.c:3543
+#: src/gui.c:3666
 msgid "_Start"
 msgstr "Início [_s]"
 
-#: src/gui.c:3544
+#: src/gui.c:3667
 msgid "Frame number is linked to start frame"
 msgstr "O número do frame está ligado ao quadro inicial"
 
-#: src/gui.c:3551
+#: src/gui.c:3675
 msgid "_End"
 msgstr "Fim [_e]"
 
-#: src/gui.c:3552
+#: src/gui.c:3676
 msgid "Frame number is linked to end frame"
 msgstr "O número do frame está ligado ao quadro final"
 
-#: src/gui.c:3559
+#: src/gui.c:3684
 msgid "_Pointer"
 msgstr "_Ponteiro"
 
-#: src/gui.c:3560
+#: src/gui.c:3685
 msgid "Frame number is linked to playback pointer"
 msgstr "O número do frame está ligado ao ponteiro de execução"
 
-#: src/gui.c:3581
+#: src/gui.c:3707
 msgid "Rewind"
 msgstr "Voltar"
 
-#: src/gui.c:3592 src/dialogs.c:894 src/dialogs.c:896 src/dialogs.c:1817
-#: src/dialogs.c:1819
+#: src/gui.c:3718 src/dialogs.c:960 src/dialogs.c:962 src/dialogs.c:1873
+#: src/dialogs.c:1875
 msgid "Play all"
 msgstr "Tocar Tudo"
 
-#: src/gui.c:3605
+#: src/gui.c:3731
 msgid "Play Selection"
 msgstr "Tocar Seleção"
 
-#: src/gui.c:3619
+#: src/gui.c:3745
 msgid "Loop On/Off"
 msgstr "Loop On/Off"
 
-#: src/gui.c:3693
+#: src/gui.c:3819
 msgid "Start _recording"
 msgstr "Iniciar g_ravação"
 
-#: src/gui.c:3698
+#: src/gui.c:3824
 msgid "Stop _recording"
 msgstr "Parar de grava_r"
 
-#: src/gui.c:3703
+#: src/gui.c:3829
 msgid "_Record Performance"
 msgstr ""
 
-#: src/gui.c:3851
+#: src/gui.c:3974
 msgid "Hide Play Window"
 msgstr "Esconder Janela do Tocador"
 
-#: src/gui.c:4232
+#: src/gui.c:4333
 msgid "Show Play Window"
 msgstr "Mostrar Janela do Tocador"
 
-#: src/ce_thumbs.c:222
+#: src/ce_thumbs.c:242
 #, c-format
 msgid "Mapped to ctrl-%d"
 msgstr ""
 
-#: src/ce_thumbs.c:276 src/effects.c:85 src/preferences.c:3195
+#: src/ce_thumbs.c:296 src/effects.c:86 src/preferences.c:3247
 msgid "Effects"
 msgstr "Efeitos"
 
-#: src/ce_thumbs.c:279 src/multitrack.c:5615
+#: src/ce_thumbs.c:299 src/multitrack.c:5791
 msgid "Clips"
 msgstr "Clipes"
 
-#: src/ce_thumbs.c:303
+#: src/ce_thumbs.c:323
 #, c-format
 msgid "Show / apply effects to %s\n"
 msgstr ""
 
-#: src/ce_thumbs.c:315
+#: src/ce_thumbs.c:335
 #, fuzzy, c-format
 msgid "Select clip for %s\n"
 msgstr "_Deletar set"
 
-#: src/ce_thumbs.c:515
+#: src/ce_thumbs.c:536
 msgid "_Pin"
 msgstr ""
 
-#: src/ce_thumbs.c:515
+#: src/ce_thumbs.c:537
 msgid "Pin the parameter box to the window"
 msgstr ""
 
 #. TRANSLATORS: Exabytes
-#: src/utils.c:794
+#: src/utils.c:800
 #, c-format
 msgid "%.2f EB"
 msgstr ""
 
 #. TRANSLATORS: Petabytes
-#: src/utils.c:798
+#: src/utils.c:803
 #, c-format
 msgid "%.2f PB"
 msgstr ""
 
 #. TRANSLATORS: Terabytes
-#: src/utils.c:802
+#: src/utils.c:806
 #, c-format
 msgid "%.2f TB"
 msgstr ""
 
 #. TRANSLATORS: Gigabytes
-#: src/utils.c:806
+#: src/utils.c:809
 #, c-format
 msgid "%.2f GB"
 msgstr ""
 
 #. TRANSLATORS: Megabytes
-#: src/utils.c:810
+#: src/utils.c:812
 #, c-format
 msgid "%.2f MB"
 msgstr ""
 
 #. TRANSLATORS: Kilobytes (1024 bytes)
-#: src/utils.c:814
+#: src/utils.c:815
 #, c-format
 msgid "%.2f KiB"
 msgstr ""
@@ -3783,7 +3772,7 @@
 msgid "%d bytes"
 msgstr ""
 
-#: src/utils.c:1841
+#: src/utils.c:1835
 msgid "Clearing the clipboard"
 msgstr "Limpando a área de trasferência"
 
@@ -3798,7 +3787,7 @@
 "==============================\n"
 "Alternado para clipe %s\n"
 
-#: src/utils.c:1880
+#: src/utils.c:1877
 msgid ""
 "\n"
 "==============================\n"
@@ -3808,11 +3797,11 @@
 "==============================\n"
 "Alternado para clipe vazio\n"
 
-#: src/utils.c:1917
+#: src/utils.c:1916
 msgid "(blank)"
 msgstr "(em branco)"
 
-#: src/utils.c:1920
+#: src/utils.c:1919
 #, c-format
 msgid ""
 "The set name has been changed from %s to %s. Affected layouts have been "
@@ -3821,7 +3810,7 @@
 "O nome do set foi modificado de %s para %s. Layouts afetados foram "
 "atualizados\n"
 
-#: src/utils.c:1928
+#: src/utils.c:1927
 #, c-format
 msgid ""
 "The clip %s is missing from this set.\n"
@@ -3830,7 +3819,7 @@
 "O clipe %s está faltando no set.\n"
 "Ele é necessário para os seguintes layouts:\n"
 
-#: src/utils.c:1932
+#: src/utils.c:1931
 #, c-format
 msgid ""
 "The clip %s has been closed.\n"
@@ -3839,7 +3828,7 @@
 "O clipe %s foi fechado.\n"
 "Ele é utilizado nos seguintes layouts:\n"
 
-#: src/utils.c:1937
+#: src/utils.c:1936
 #, c-format
 msgid ""
 "Frames have been shifted in the clip %s.\n"
@@ -3848,7 +3837,7 @@
 "Frames foram movidos no clipe %s.\n"
 "Os seguintes layouts foram afetados:\n"
 
-#: src/utils.c:1942
+#: src/utils.c:1941
 #, c-format
 msgid ""
 "Frames have been deleted from the clip %s.\n"
@@ -3857,7 +3846,7 @@
 "Frames foram deletados no clipe %s.\n"
 "Os seguintes layouts foram afetados:\n"
 
-#: src/utils.c:1947
+#: src/utils.c:1946
 #, c-format
 msgid ""
 "Audio has been deleted from the clip %s.\n"
@@ -3866,7 +3855,7 @@
 "Frames foram deletados do clipe %s.\n"
 "Os seguintes layouts foram afetados:\n"
 
-#: src/utils.c:1952
+#: src/utils.c:1951
 #, c-format
 msgid ""
 "Audio has been shifted in clip %s.\n"
@@ -3875,7 +3864,7 @@
 "Áudio foi movido no clipe %s.\n"
 "Os seguintes layouts foram afetados:\n"
 
-#: src/utils.c:1957
+#: src/utils.c:1956
 #, c-format
 msgid ""
 "Audio has been altered in the clip %s.\n"
@@ -3884,7 +3873,7 @@
 "Áduio foi alterado no clipe %s.\n"
 "Os seguintes layouts foram afetados:\n"
 
-#: src/utils.c:1962
+#: src/utils.c:1961
 #, c-format
 msgid ""
 "Frames have been altered in the clip %s.\n"
@@ -3893,7 +3882,7 @@
 "Frames foram alterados no clipe %s.\n"
 "Os seguintes layouts foram afetados:\n"
 
-#: src/utils.c:2135
+#: src/utils.c:2134
 #, c-format
 msgid ""
 "Set %s\n"
@@ -3904,7 +3893,7 @@
 "não pode ser aberto porque está em uso\n"
 "por outra instância de LiVES.\n"
 
-#: src/utils.c:2142
+#: src/utils.c:2140
 #, c-format
 msgid ""
 "\n"
@@ -3960,70 +3949,70 @@
 msgid "Removing layout %s\n"
 msgstr "Removendo layout %s\n"
 
-#: src/utils.c:3014
+#: src/utils.c:2996
 msgid "Video [opening...]"
 msgstr "Vídeo [abrindo...]"
 
-#: src/utils.c:3018
+#: src/utils.c:2999
 #, c-format
 msgid "Video [%.2f sec]"
 msgstr "Vídeo [%.2f seg]"
 
-#: src/utils.c:3022
+#: src/utils.c:3002
 msgid "(Undefined)"
 msgstr "(Indefinida)"
 
-#: src/utils.c:3025
+#: src/utils.c:3004
 msgid "(No video)"
 msgstr "(Sem vídeo)"
 
-#: src/utils.c:3032
+#: src/utils.c:3011
 msgid "(No audio)"
 msgstr "(Sem áudio)"
 
-#: src/utils.c:3037
+#: src/utils.c:3015
 msgid "Mono  [opening...]"
 msgstr "Mono  [abrindo...]"
 
-#: src/utils.c:3040
+#: src/utils.c:3017
 msgid "Left Audio [opening...]"
 msgstr "Áudio Esquerdo [abrindo...]"
 
-#: src/utils.c:3045
+#: src/utils.c:3021
 #, c-format
 msgid "Mono [%.2f sec]"
 msgstr "Mono [%.2f seg]"
 
-#: src/utils.c:3048
+#: src/utils.c:3023
 #, c-format
 msgid "Left Audio [%.2f sec]"
 msgstr "Áudio Esquerdo [%.2f seg]"
 
-#: src/utils.c:3056
+#: src/utils.c:3031
 msgid "Right Audio [opening...]"
 msgstr "Áudio Direito [abrindo...]"
 
-#: src/utils.c:3059
+#: src/utils.c:3033
 #, c-format
 msgid "Right Audio [%.2f sec]"
 msgstr "Áudio Direito [%.2f seg]"
 
-#: src/utils.c:3506
+#: src/utils.c:3472
 msgid "LiVES cannot switch to mplayer whilst clips are loading."
 msgstr ""
 "LiVES não pode mudar para o mplayer enquanto clipes estão sendo carregados."
 
-#: src/utils.c:3559
+#: src/utils.c:3525
 #, fuzzy
 msgid "LiVES cannot switch to mplayer2 whilst clips are loading."
 msgstr ""
 "LiVES não pode mudar para o mplayer enquanto clipes estão sendo carregados."
 
-#: src/utils.c:3809
+#: src/utils.c:3775
 msgid "Cleaning up clip"
 msgstr "Limpando clipe"
 
-#: src/utils.c:3913
+#: src/utils.c:3874
 #, c-format
 msgid ""
 "\n"
@@ -4038,30 +4027,29 @@
 "\n"
 "Sobrescrever?\n"
 
-#: src/utils.c:4305 src/utils.c:4337 src/multitrack.c:4503
+#: src/utils.c:4250 src/utils.c:4280 src/multitrack.c:4672
 #, c-format
 msgid "_Undo %s"
 msgstr "Desfazer %s [_U]"
 
-#: src/utils.c:4306 src/utils.c:4338 src/multitrack.c:4525
+#: src/utils.c:4251 src/utils.c:4281 src/multitrack.c:4693
 #, c-format
 msgid "_Redo %s"
 msgstr "_Refazer %s"
 
-#: src/utils.c:4363
+#: src/utils.c:4305
 msgid "-------------Selection------------"
 msgstr "-------------Seleção------------"
 
-#. TRANSLATORS: - try to keep the text of the middle part the same length, by deleting "-" if necessary
-#: src/utils.c:4371
+#: src/utils.c:4313
 msgid " sec ] ----------Selection---------- [ "
 msgstr " seg ] ---------- Seleção ---------- [ "
 
-#: src/utils.c:4371
+#: src/utils.c:4314
 msgid " frames ] ----------"
 msgstr " frames ] ----------"
 
-#: src/utils.c:5360
+#: src/utils.c:5302
 msgid ""
 "Your version of mplayer/ffmpeg may be broken !\n"
 "See http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2071\n"
@@ -4072,11 +4060,11 @@
 "Try running Help/Troubleshoot for more information."
 msgstr ""
 
-#: src/saveplay.c:178
+#: src/saveplay.c:179
 msgid "Examining file header"
 msgstr "Examinando cabeçalho do arquivo"
 
-#: src/saveplay.c:315 src/saveplay.c:789
+#: src/saveplay.c:316 src/saveplay.c:779
 #, c-format
 msgid "Opening %s"
 msgstr "Abrindo %s"
@@ -4086,36 +4074,36 @@
 msgid "Opening %s start time %.2f sec. frames %d"
 msgstr "Abrindo %s tempo inicial %.2f seg. frames %d"
 
-#: src/saveplay.c:326 src/saveplay.c:4001
+#: src/saveplay.c:326 src/saveplay.c:3927
 msgid " without sound"
 msgstr " sem som"
 
-#: src/saveplay.c:396
+#: src/saveplay.c:395
 #, c-format
 msgid "Opening audio for %s"
 msgstr "Abrindo áudio para %s"
 
-#: src/saveplay.c:557
+#: src/saveplay.c:554
 #, c-format
 msgid "Auto trimming %.2f seconds of audio at start..."
 msgstr ""
 
-#: src/saveplay.c:567
+#: src/saveplay.c:562
 #, c-format
 msgid "Auto trimming %.2f seconds of audio at end..."
 msgstr ""
 
-#: src/saveplay.c:584
+#: src/saveplay.c:577
 #, c-format
 msgid "Auto padding with %.2f seconds of silence at start..."
 msgstr ""
 
-#: src/saveplay.c:599
+#: src/saveplay.c:590
 #, c-format
 msgid "Auto padding with %.2f seconds of silence at end..."
 msgstr ""
 
-#: src/saveplay.c:671
+#: src/saveplay.c:661
 #, c-format
 msgid ""
 "\n"
@@ -4127,11 +4115,11 @@
 "Are you sure you wish to continue ?"
 msgstr ""
 
-#: src/saveplay.c:685
+#: src/saveplay.c:676
 msgid " - please be patient."
 msgstr " - por favor tenha paciência."
 
-#: src/saveplay.c:938
+#: src/saveplay.c:926
 msgid ""
 "\n"
 "\n"
@@ -4143,7 +4131,7 @@
 "LiVES não conseguiu extrair nem vídeo nem áudio deste arquivo.\n"
 "Por favor verifique a janela de terminal para mais detalhes.\n"
 
-#: src/saveplay.c:940
+#: src/saveplay.c:928
 msgid ""
 "\n"
 "\n"
@@ -4153,7 +4141,7 @@
 "\n"
 "Talvez seja necessário ter o mplayer para abrir este arquivo.\n"
 
-#: src/saveplay.c:948
+#: src/saveplay.c:934
 msgid ""
 "\n"
 "\n"
@@ -4165,29 +4153,29 @@
 "Por favor confira as configurações de 'Comando de abertura de vídeo' em\n"
 "'Ferramentas | Preferências | Decodificação'\n"
 
-#: src/saveplay.c:1014
+#: src/saveplay.c:995
 msgid "Adding image..."
 msgstr ""
 
-#: src/saveplay.c:1108
+#: src/saveplay.c:1089
 #, c-format
 msgid "Subtitles were saved as %s\n"
 msgstr ""
 
-#: src/saveplay.c:1192
+#: src/saveplay.c:1171
 #, c-format
 msgid "LiVES: Save Frame %d as..."
 msgstr ""
 
-#: src/saveplay.c:1195
+#: src/saveplay.c:1174
 msgid "LiVES: Save Frame as..."
 msgstr ""
 
-#: src/saveplay.c:1322
+#: src/saveplay.c:1303
 msgid "LiVES: Save Clip as..."
 msgstr ""
 
-#: src/saveplay.c:1390
+#: src/saveplay.c:1369
 msgid ""
 "Saving your video could lead to a loss of quality !\n"
 "You are strongly advised to 'Save As' to a new file.\n"
@@ -4199,36 +4187,36 @@
 "\n"
 "Tem certeza que quer continuar?"
 
-#: src/saveplay.c:1517 src/saveplay.c:1683 src/saveplay.c:1762
-#: src/saveplay.c:4014
+#: src/saveplay.c:1494 src/saveplay.c:1659 src/saveplay.c:1738
+#: src/saveplay.c:3940
 msgid "Pulling frames from clip"
 msgstr "Pegando frames do clipe"
 
-#: src/saveplay.c:1588 src/saveplay.c:1727
+#: src/saveplay.c:1565 src/saveplay.c:1703
 msgid "Linking selection"
 msgstr "Ligando seleção"
 
-#: src/saveplay.c:1779
+#: src/saveplay.c:1755
 msgid " (with no sound)\n"
 msgstr " (sem som)\n"
 
-#: src/saveplay.c:1786
+#: src/saveplay.c:1761
 #, c-format
 msgid "Saving frames %d to %d%s as \"%s\" : encoder = %s : format = %s..."
 msgstr ""
 "Salvando frames %d até %d%s como \"%s\" : codificador = %s : formato = %s..."
 
-#: src/saveplay.c:1790
+#: src/saveplay.c:1765
 #, c-format
 msgid "Saving frames 1 to %d%s as \"%s\" : encoder %s : format = %s..."
 msgstr ""
 "Salvando frames 1 até %d%s como \"%s\" : codificador %s : formato = %s..."
 
-#: src/saveplay.c:1909
+#: src/saveplay.c:1890
 msgid "Saving [can take a long time]"
 msgstr "A guardar [pode levar algum tempo]"
 
-#: src/saveplay.c:2057
+#: src/saveplay.c:2044
 msgid ""
 "\n"
 "\n"
@@ -4238,33 +4226,33 @@
 "\n"
 "Erro de codificador -  arquivo de saída não foi criado!\n"
 
-#: src/saveplay.c:2094
+#: src/saveplay.c:2081
 msgid "Clearing letterbox"
 msgstr ""
 
-#: src/saveplay.c:2183
+#: src/saveplay.c:2168
 #, c-format
 msgid "File size was %s\n"
 msgstr ""
 
-#: src/saveplay.c:2284
+#: src/saveplay.c:2265
 msgid "recording aborted by preview.\n"
 msgstr "gravação cancelada pela visualização.\n"
 
-#: src/saveplay.c:2288
+#: src/saveplay.c:2268
 msgid "recording aborted by clipboard playback.\n"
 msgstr "gravação cancelada pela visualização.\n"
 
-#: src/saveplay.c:2291
+#: src/saveplay.c:2270
 msgid "Recording performance..."
 msgstr "Gravando performance..."
 
-#: src/saveplay.c:3293
+#: src/saveplay.c:3251
 #, c-format
 msgid "Average FPS was %.4f\n"
 msgstr "FPS médio era %.4f\n"
 
-#: src/saveplay.c:3299
+#: src/saveplay.c:3256
 msgid ""
 "\n"
 "\n"
@@ -4278,16 +4266,21 @@
 "Vá em 'Ferramentas | Redimensionar Todos'\n"
 "e redimensione todos frames para o tamanho atual.\n"
 
-#: src/saveplay.c:3479
+#: src/saveplay.c:3429
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: src/saveplay.c:3588 src/saveplay.c:4585
+#: src/saveplay.c:3538 src/saveplay.c:4502
 #, c-format
 msgid "Untitled%d"
 msgstr "Untitled%d"
 
-#: src/saveplay.c:3633
+#: src/saveplay.c:3567
+#, c-format
+msgid "%d frames are enough !\n"
+msgstr "%d frames são suficientes!\n"
+
+#: src/saveplay.c:3579
 #, c-format
 msgid ""
 "\n"
@@ -4295,7 +4288,7 @@
 "Bad things may happen with this clip.\n"
 msgstr ""
 
-#: src/saveplay.c:3723
+#: src/saveplay.c:3667
 #, c-format
 msgid ""
 "\n"
@@ -4307,13 +4300,13 @@
 "FPS.\n"
 "O padrão pode ser ajustado em 'Ferramentas | Preferências | Misc'.\n"
 
-#: src/saveplay.c:3735
+#: src/saveplay.c:3677
 #, c-format
 msgid "Playback speed was adjusted to %.3f frames per second to fit audio.\n"
 msgstr ""
 "Velocidade de execução ajustada para %.3f fps para se encaixar no áudio.\n"
 
-#: src/saveplay.c:3754
+#: src/saveplay.c:3694
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d *bpp=Greyscale* fps=%.3f\n"
@@ -4322,7 +4315,7 @@
 "Frames=%d tipo=%s tamanho=%dx%d *bpp=Greyscale* fps=%.3f\n"
 "Áudio:"
 
-#: src/saveplay.c:3758 src/saveplay.c:4762
+#: src/saveplay.c:3698 src/saveplay.c:4671
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d bpp=%d fps=%.3f\n"
@@ -4331,54 +4324,54 @@
 "Frames=%d tipo=%s tamanho=%dx%d bpp=%d fps=%.3f\n"
 "Áudio:"
 
-#: src/saveplay.c:3762 src/saveplay.c:4766
+#: src/saveplay.c:3703 src/saveplay.c:4676
 #, c-format
 msgid "%s none\n"
 msgstr "%s nenhum\n"
 
-#: src/saveplay.c:3774
+#: src/saveplay.c:3714
 #, fuzzy, c-format
 msgid " - Author: %s\n"
 msgstr "Autor: %s"
 
-#: src/saveplay.c:3779
+#: src/saveplay.c:3717
 #, fuzzy, c-format
 msgid " - Title: %s\n"
 msgstr " - Comentário: %s\n"
 
-#: src/saveplay.c:3784
+#: src/saveplay.c:3720
 #, c-format
 msgid " - Comment: %s\n"
 msgstr " - Comentário: %s\n"
 
-#: src/saveplay.c:3897
+#: src/saveplay.c:3829
 #, c-format
 msgid "Saving frame %d as %s..."
 msgstr "Salvando frame %d de %s..."
 
-#: src/saveplay.c:3996
+#: src/saveplay.c:3924
 #, c-format
 msgid "Backing up %s to %s"
 msgstr "Fazendo backup de %s até %s"
 
-#: src/saveplay.c:4049
+#: src/saveplay.c:3975
 msgid "Backing up"
 msgstr "Fazendo backup"
 
-#: src/saveplay.c:4083
+#: src/saveplay.c:4009
 msgid "performance data was backed up..."
 msgstr "backup concluído dos dados da performance..."
 
-#: src/saveplay.c:4661
+#: src/saveplay.c:4574
 #, c-format
 msgid "Restoring %s..."
 msgstr "Restaurando %s..."
 
-#: src/saveplay.c:4692
+#: src/saveplay.c:4603
 msgid "Restoring"
 msgstr "Restaurando"
 
-#: src/saveplay.c:4714
+#: src/saveplay.c:4625
 #, c-format
 msgid ""
 "\n"
@@ -4392,22 +4385,22 @@
 "LiVES não pode restaurá-lo.\n"
 
 #. TRANSLATORS: rec(ord) %.2f M(ega)B(ytes)
-#: src/saveplay.c:5207
+#: src/saveplay.c:5118
 #, c-format
 msgid "rec %.2f MB"
 msgstr "grv %.2f MB"
 
-#: src/saveplay.c:5213
+#: src/saveplay.c:5123
 #, c-format
 msgid "!rec %.2f MB"
 msgstr "!grv %.2f MB"
 
 #. TRANSLATORS: rec(ord) ?? M(ega)B(ytes)
-#: src/saveplay.c:5216
+#: src/saveplay.c:5126
 msgid "rec ?? MB"
 msgstr ""
 
-#: src/saveplay.c:5241
+#: src/saveplay.c:5151
 #, c-format
 msgid ""
 "\n"
@@ -4415,7 +4408,7 @@
 "Record stop level can be set in Preferences.\n"
 msgstr ""
 
-#: src/saveplay.c:5535
+#: src/saveplay.c:5447
 msgid ""
 "\n"
 "Files from a previous run of LiVES were found.\n"
@@ -4425,47 +4418,69 @@
 "Arquivos de uma execução anterior do LiVES foram encontrados.\n"
 "Quer tentar recuperá-los?\n"
 
-#: src/saveplay.c:5557
+#: src/saveplay.c:5469
 msgid "Recovering files"
 msgstr "Recuperando arquivos"
 
-#: src/saveplay.c:5560
+#: src/saveplay.c:5472
 msgid "Recovering files..."
 msgstr "Recuperando arquivos..."
 
-#: src/dialogs.c:72
+#: src/dialogs.c:71
 msgid "Show affected _layouts"
 msgstr ""
 
-#: src/dialogs.c:128
+#: src/dialogs.c:113
+msgid ""
+"Do _not show this warning any more\n"
+"(can be turned back on from Preferences/Warnings)"
+msgstr ""
+"Não mostrar mais este aviso\n"
+"(pode ser ligado novamente em Preferências/Avisos)"
+
+#: src/dialogs.c:127
 msgid "_Recover disk space"
 msgstr ""
 
-#: src/dialogs.c:143
+#: src/dialogs.c:142
 msgid " _Advanced Settings >>"
 msgstr ""
 
-#: src/dialogs.c:184
+#: src/dialogs.c:183 src/dialogs.c:221
 msgid "LiVES: - Warning !"
 msgstr "LiVES: - Aviso !"
 
 #: src/dialogs.c:194
+#, fuzzy
+msgid "LiVES: - Error !"
+msgstr "LiVES: - Aviso !"
+
+#: src/dialogs.c:204
+#, fuzzy
+msgid "LiVES: - Information"
+msgstr "LiVES: Informação para %s"
+
+#: src/dialogs.c:230
 msgid "LiVES: - Question"
 msgstr ""
 
-#: src/dialogs.c:204
+#: src/dialogs.c:239
 msgid "LiVES: - File Error"
 msgstr ""
 
-#: src/dialogs.c:208
+#: src/dialogs.c:241
 msgid "_Abort"
 msgstr ""
 
-#: src/dialogs.c:213
+#: src/dialogs.c:246
 msgid "_Retry"
 msgstr ""
 
-#: src/dialogs.c:597
+#: src/dialogs.c:306
+msgid "Show _Details"
+msgstr ""
+
+#: src/dialogs.c:657
 #, c-format
 msgid ""
 "FREE SPACE IN THE PARTITION CONTAINING\n"
@@ -4476,7 +4491,7 @@
 "(Disk warning levels can be configured in Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:615
+#: src/dialogs.c:676
 #, c-format
 msgid ""
 "Free space in the partition containing\n"
@@ -4488,11 +4503,11 @@
 "Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:627
+#: src/dialogs.c:688
 msgid "Audio players cannot be switched during playback."
 msgstr "Tocadores de áudio não podem ser trocados durante a execução."
 
-#: src/dialogs.c:632
+#: src/dialogs.c:694
 msgid ""
 "\n"
 "\n"
@@ -4505,18 +4520,18 @@
 "insuficiente.\n"
 "Por favor tente fechar outros aplicativos primeiro.\n"
 
-#: src/dialogs.c:752
+#: src/dialogs.c:820
 msgid "Processing has been paused."
 msgstr ""
 
-#: src/dialogs.c:937
+#: src/dialogs.c:1002
 #, c-format
 msgid ""
 "\n"
 "%s%d%% done. Time remaining: %u sec%s\n"
 msgstr ""
 
-#: src/dialogs.c:1335
+#: src/dialogs.c:1391
 #, c-format
 msgid ""
 "\n"
@@ -4525,14 +4540,14 @@
 "\n"
 "%d/%d frames abertos. Tempo restante %u seg.\n"
 
-#: src/dialogs.c:1337
+#: src/dialogs.c:1393
 #, c-format
 msgid ""
 "\n"
 "%d/%d frames opened.\n"
 msgstr ""
 
-#: src/dialogs.c:1341
+#: src/dialogs.c:1396
 #, c-format
 msgid ""
 "\n"
@@ -4541,7 +4556,7 @@
 "\n"
 "%d frames abertos.\n"
 
-#: src/dialogs.c:1940
+#: src/dialogs.c:1993
 #, c-format
 msgid ""
 "\n"
@@ -4550,7 +4565,7 @@
 "\n"
 "Tempo restante: %d seg"
 
-#: src/dialogs.c:1988
+#: src/dialogs.c:2040
 #, c-format
 msgid ""
 "\n"
@@ -4561,7 +4576,7 @@
 "Desculpe, LiVES só pode abrir %d arquivos por vez.\n"
 "Por favor feche um arquivo e tente novamente."
 
-#: src/dialogs.c:1994
+#: src/dialogs.c:2047
 #, c-format
 msgid ""
 "LiVES was unable to write to its temporary directory.\n"
@@ -4578,7 +4593,7 @@
 "\n"
 "Por favor tenha certeza de ter permissão de escrita neste diretório."
 
-#: src/dialogs.c:2005
+#: src/dialogs.c:2059
 #, fuzzy
 msgid ""
 "\n"
@@ -4589,13 +4604,13 @@
 "LiVES atualmente precisa do 'mplayer' ou 'sox' para funcionar. Por favor "
 "instale um deles e tente novamente.\n"
 
-#: src/dialogs.c:2010
+#: src/dialogs.c:2064
 msgid ""
 "Audio was not loaded; please install mplayer or mplayer2 if you expected "
 "audio for this clip.\n"
 msgstr ""
 
-#: src/dialogs.c:2014
+#: src/dialogs.c:2069
 msgid ""
 "Audio resampling is required for this format.\n"
 "Please install 'sox'\n"
@@ -4606,7 +4621,7 @@
 "ou troque por outro formato de codificador em 'Ferramentas | Preferências | "
 "Codificação'\n"
 
-#: src/dialogs.c:2019
+#: src/dialogs.c:2075
 msgid ""
 "\n"
 "\n"
@@ -4620,7 +4635,7 @@
 "Por favor mude o codec de áudio em 'Ferramentas | Preferências | "
 "Codificação'\n"
 
-#: src/dialogs.c:2024
+#: src/dialogs.c:2080
 msgid ""
 "This layout includes generated frames.\n"
 "It cannot be saved, you must render it to a clip first.\n"
@@ -4628,13 +4643,13 @@
 "Este layout inclui frames gerados.\n"
 "Ele nãopode ser salvo, renderize como clipe primeiro.\n"
 
-#: src/dialogs.c:2029
+#: src/dialogs.c:2085
 msgid ""
 "This layout includes generated or recorded audio.\n"
 "It cannot be saved, you must render it to a clip first.\n"
 msgstr ""
 
-#: src/dialogs.c:2039 src/dialogs.c:2137
+#: src/dialogs.c:2095 src/dialogs.c:2189
 #, c-format
 msgid ""
 "\n"
@@ -4645,7 +4660,7 @@
 "\n"
 "Devido a restrições no formato %s\n"
 
-#: src/dialogs.c:2059
+#: src/dialogs.c:2115
 msgid ""
 "LiVES recommends the following settings:\n"
 "\n"
@@ -4653,43 +4668,43 @@
 "LiVES recomenda as configurações a seguir:\n"
 "\n"
 
-#: src/dialogs.c:2065 src/dialogs.c:2174 src/resample.c:850
+#: src/dialogs.c:2121 src/dialogs.c:2225 src/resample.c:839
 msgid ", signed"
 msgstr ""
 
-#: src/dialogs.c:2066 src/dialogs.c:2175 src/resample.c:853
+#: src/dialogs.c:2122 src/dialogs.c:2226 src/resample.c:841
 msgid ", unsigned"
 msgstr ""
 
-#: src/dialogs.c:2070 src/dialogs.c:2179 src/resample.c:858
+#: src/dialogs.c:2126 src/dialogs.c:2230 src/resample.c:846
 msgid ", little-endian"
 msgstr ""
 
-#: src/dialogs.c:2071 src/dialogs.c:2180 src/resample.c:861
+#: src/dialogs.c:2127 src/dialogs.c:2231 src/resample.c:848
 msgid ", big-endian"
 msgstr ""
 
-#: src/dialogs.c:2077
+#: src/dialogs.c:2132
 #, c-format
 msgid "Use an audio rate of %d Hz%s%s\n"
 msgstr ""
 
-#: src/dialogs.c:2085
+#: src/dialogs.c:2140
 #, c-format
 msgid "Set video rate to %.3f frames per second\n"
 msgstr "Definir vídeo para %.3f FPS\n"
 
-#: src/dialogs.c:2089
+#: src/dialogs.c:2143
 #, c-format
 msgid "Set video rate to %d:%d frames per second\n"
 msgstr "Definir vídeo para %d:%d FPS\n"
 
-#: src/dialogs.c:2094 src/dialogs.c:2209
+#: src/dialogs.c:2148 src/dialogs.c:2258
 #, c-format
 msgid "Set video size to %d x %d pixels\n"
 msgstr "Redimensionar vídeo para %d x %d pixels\n"
 
-#: src/dialogs.c:2102 src/dialogs.c:2208
+#: src/dialogs.c:2156 src/dialogs.c:2257
 msgid ""
 "\n"
 "You may wish to:\n"
@@ -4697,36 +4712,36 @@
 "\n"
 "Você pode querer:\n"
 
-#: src/dialogs.c:2105 src/dialogs.c:2200
+#: src/dialogs.c:2159 src/dialogs.c:2249
 #, c-format
 msgid "resize video to %d x %d pixels\n"
 msgstr "redimensionar vídeo para %d x %d pixels\n"
 
-#: src/dialogs.c:2110
+#: src/dialogs.c:2163
 msgid "disable audio, since the target encoder cannot encode audio\n"
 msgstr ""
 "desabilite o áudio, uma vez que o codificador não pode codificar áudio\n"
 
-#: src/dialogs.c:2170
+#: src/dialogs.c:2221
 msgid "LiVES must:\n"
 msgstr "LiVES deve:\n"
 
-#: src/dialogs.c:2185
+#: src/dialogs.c:2235
 #, c-format
 msgid "resample audio to %d Hz%s%s\n"
 msgstr ""
 
-#: src/dialogs.c:2192
+#: src/dialogs.c:2242
 #, c-format
 msgid "resample video to %.3f frames per second\n"
 msgstr "resamplear vídeo para %.3f FPS\n"
 
-#: src/dialogs.c:2196
+#: src/dialogs.c:2245
 #, c-format
 msgid "resample video to %d:%d frames per second\n"
 msgstr "resamplear vídeo para %d:%d FPS\n"
 
-#: src/dialogs.c:2215
+#: src/dialogs.c:2263
 msgid ""
 "\n"
 "You will be able to undo these changes afterwards.\n"
@@ -4740,7 +4755,7 @@
 "Aperte 'OK' para continuar e 'Cancelar' para abortar.\n"
 "\n"
 
-#: src/dialogs.c:2218
+#: src/dialogs.c:2265
 msgid ""
 "\n"
 "Changes applied to the selection will not be permanent.\n"
@@ -4750,7 +4765,7 @@
 "Mudanças aplicadas a seleção não serão permanentes.\n"
 "\n"
 
-#: src/dialogs.c:2237
+#: src/dialogs.c:2285
 msgid ""
 "\n"
 "\n"
@@ -4763,7 +4778,7 @@
 "LiVES não pôde gravar a performance. Não há memória suficiente disponível.\n"
 "Tente gravar apenas uma parte do arquivo."
 
-#: src/dialogs.c:2244
+#: src/dialogs.c:2293
 msgid ""
 "The playback speed (fps), or the audio rate\n"
 " of the clipboard does not match\n"
@@ -4782,7 +4797,7 @@
 "\n"
 "Aperte 'Cancelar' para abortar a inserção, ou 'OK' para continuar."
 
-#: src/dialogs.c:2253
+#: src/dialogs.c:2304
 #, fuzzy, c-format
 msgid ""
 "When opening a yuvmpeg stream, you should first create a fifo file in:\n"
@@ -4800,11 +4815,11 @@
 "Você deve apenas clicar em OK se você sabe o que está fazendo, em outro caso "
 "clique Cancelar."
 
-#: src/dialogs.c:2305
+#: src/dialogs.c:2356
 msgid "Show Keys"
 msgstr "Mostrar atalhos"
 
-#: src/dialogs.c:2306
+#: src/dialogs.c:2358
 msgid ""
 "You can use the following keys during playback to control LiVES:-\n"
 "\n"
@@ -4886,11 +4901,11 @@
 "g                             faz o loop tocar ao contrário quando chegar no "
 "final\n"
 
-#: src/dialogs.c:2313
+#: src/dialogs.c:2365
 msgid "Multitrack Keys"
 msgstr "Atalhos do Multipista"
 
-#: src/dialogs.c:2314
+#: src/dialogs.c:2367
 msgid ""
 "You can use the following keys to control the multitrack window:-\n"
 "\n"
@@ -4912,18 +4927,18 @@
 "For other keys, see the menus.\n"
 msgstr ""
 
-#: src/dialogs.c:2322
+#: src/dialogs.c:2375
 msgid "Message History"
 msgstr "Histórico de Mensagens"
 
-#: src/dialogs.c:2335
+#: src/dialogs.c:2388
 #, c-format
 msgid ""
 "After upgrading/installing, you may need to adjust the <prefix_dir> setting "
 "in your %s file"
 msgstr ""
 
-#: src/dialogs.c:2344
+#: src/dialogs.c:2399
 #, c-format
 msgid ""
 "\n"
@@ -4934,7 +4949,7 @@
 "or change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/dialogs.c:2352
+#: src/dialogs.c:2408
 msgid ""
 "Sorry, unknown audio type.\n"
 "\n"
@@ -4944,18 +4959,18 @@
 "\n"
 " (Nomes de arquivo devem terminar em .mp3, .ogg, .wav, .mod, .xm ou .it)"
 
-#: src/dialogs.c:2353
+#: src/dialogs.c:2409
 msgid "failed (unknown type)\n"
 msgstr "falhou (tipo desconhecido)\n"
 
-#: src/dialogs.c:2358
+#: src/dialogs.c:2415
 msgid ""
 "\n"
 "Do you wish to remove the layout files associated with this set ?\n"
 "(They will not be usable without the set).\n"
 msgstr ""
 
-#: src/dialogs.c:2363
+#: src/dialogs.c:2421
 #, c-format
 msgid ""
 "\n"
@@ -4969,7 +4984,7 @@
 "existente.\n"
 "Clique em Cancelar para escolher um novo nome.\n"
 
-#: src/dialogs.c:2370
+#: src/dialogs.c:2429
 msgid ""
 "\n"
 "Frames from this clip are used in some multitrack layouts.\n"
@@ -4981,7 +4996,7 @@
 "Tem certeza que quer continuar?\n"
 "."
 
-#: src/dialogs.c:2374
+#: src/dialogs.c:2433
 msgid ""
 "\n"
 "Audio from this clip is used in some multitrack layouts.\n"
@@ -4993,7 +5008,7 @@
 "Tem certeza que quer continuar?\n"
 "."
 
-#: src/dialogs.c:2378
+#: src/dialogs.c:2438
 #, c-format
 msgid ""
 "\n"
@@ -5004,7 +5019,7 @@
 "Otherwise click Cancel to skip loading this file.\n"
 msgstr ""
 
-#: src/dialogs.c:2385
+#: src/dialogs.c:2446
 #, c-format
 msgid ""
 "\n"
@@ -5019,7 +5034,7 @@
 "%s\n"
 "O clipe não pode ser carregado.\n"
 
-#: src/dialogs.c:2392
+#: src/dialogs.c:2455
 msgid ""
 "\n"
 "Dear user, the jack developers decided to remove the -Z option from jackd.\n"
@@ -5027,7 +5042,7 @@
 "Alternately, select a different audio player in Preferences.\n"
 msgstr ""
 
-#: src/dialogs.c:2396
+#: src/dialogs.c:2460
 msgid ""
 "\n"
 "Unable to start up jack. Please ensure that alsa is set up correctly on your "
@@ -5036,13 +5051,13 @@
 "Automatic jack startup will be disabled now.\n"
 msgstr ""
 
-#: src/dialogs.c:2402
+#: src/dialogs.c:2466
 msgid ""
 "\n"
 "Unable to connect to jack server. Please start jack before starting LiVES\n"
 msgstr ""
 
-#: src/dialogs.c:2411
+#: src/dialogs.c:2475
 #, c-format
 msgid ""
 "\n"
@@ -5053,13 +5068,13 @@
 "%s\n"
 msgstr ""
 
-#: src/dialogs.c:2418
+#: src/dialogs.c:2482
 msgid ""
 "\n"
 "Alternately, you can restart LiVES and select another audio player.\n"
 msgstr ""
 
-#: src/dialogs.c:2423
+#: src/dialogs.c:2488
 #, c-format
 msgid ""
 "\n"
@@ -5074,7 +5089,7 @@
 "Você pode aumentar este valor em  Preferências/Multipista.\n"
 "É recomendado aumentá-lo em ao menos %d MB"
 
-#: src/dialogs.c:2429
+#: src/dialogs.c:2496
 #, c-format
 msgid ""
 "\n"
@@ -5083,7 +5098,7 @@
 "Do you wish to delete them ?\n"
 msgstr ""
 
-#: src/dialogs.c:2436
+#: src/dialogs.c:2504
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for multitrack undo.\n"
@@ -5095,7 +5110,7 @@
 "Feche alguns aplicativos ou reduza o tamanho da memória de desfazer\n"
 "Em 'Preferências > Multipista 'Memória de Desfazer'\n"
 
-#: src/dialogs.c:2440
+#: src/dialogs.c:2508
 msgid ""
 "\n"
 "Out of memory for undo.\n"
@@ -5107,7 +5122,7 @@
 "Você precisa aumentar o buffer de desfazer\n"
 "em 'Preferências > Multipista > Tamanho do buffer de desfazer'\n"
 
-#: src/dialogs.c:2444
+#: src/dialogs.c:2512
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for the multitrack undo buffer.\n"
@@ -5115,19 +5130,19 @@
 "\n"
 "LiVES não conseguiu reservar memória sufiiciente para o buffer de desfazer.\n"
 
-#: src/dialogs.c:2446
+#: src/dialogs.c:2514
 msgid "or enter a smaller value.\n"
 msgstr "ou insira um valor menos.\n"
 
-#: src/dialogs.c:2448
+#: src/dialogs.c:2516
 msgid "Try again from the clip editor, try closing some other applications\n"
 msgstr "Tente novamente do editor de clipes, tente fechar outros aplicativos\n"
 
-#: src/dialogs.c:2449
+#: src/dialogs.c:2517
 msgid "Try closing some other applications\n"
 msgstr "Tente fechar outros aplicativos\n"
 
-#: src/dialogs.c:2460
+#: src/dialogs.c:2529
 msgid ""
 "Multitrack is set to 0 audio channels, but this layout has audio.\n"
 "You should adjust the audio settings from the Tools menu.\n"
@@ -5136,21 +5151,21 @@
 "áudio.\n"
 "Ajuste as configurações de áudio no menu Ferramentas.\n"
 
-#: src/dialogs.c:2464
+#: src/dialogs.c:2534
 msgid ""
 "The current layout has audio, so audio channels may not be set to zero.\n"
 msgstr ""
 "O layout atual tem áudio, de modo que canais de áudio não podem ser "
 "definidos como zero.\n"
 
-#: src/dialogs.c:2468
+#: src/dialogs.c:2539
 msgid ""
 "Multitrack audio preview is only available with the\n"
 "\"jack\" or \"pulse audio\" audio player.\n"
 "You can set this in Tools|Preferences|Playback."
 msgstr ""
 
-#: src/dialogs.c:2472
+#: src/dialogs.c:2545
 msgid ""
 "Errors were detected in the layout (which may be due to transferring from "
 "another system, or from an older version of LiVES).\n"
@@ -5160,13 +5175,13 @@
 "outro sistema, ou de uma versão mais antiga do LiVES).\n"
 "Tentar reparar a cópia em disco do layout?\n"
 
-#: src/dialogs.c:2476
+#: src/dialogs.c:2549
 msgid ""
 "LiVES was unable to load the layout.\n"
 "Sorry.\n"
 msgstr ""
 
-#: src/dialogs.c:2482
+#: src/dialogs.c:2555
 msgid ""
 "\n"
 "\n"
@@ -5176,7 +5191,7 @@
 "\n"
 "A taxa de áudio deve ser maior que 0.\n"
 
-#: src/dialogs.c:2486
+#: src/dialogs.c:2559
 msgid ""
 "\n"
 "Event list will be very large\n"
@@ -5188,7 +5203,7 @@
 "e pode demorar muito tempo para ser apresentada.\n"
 "Tem certeza que deseja visualizar?\n"
 
-#: src/dialogs.c:2491
+#: src/dialogs.c:2564
 msgid ""
 "\n"
 "\n"
@@ -5198,7 +5213,7 @@
 "\n"
 "Você deve instalar o 'dvgrab' para usar esta função.\n"
 
-#: src/dialogs.c:2496
+#: src/dialogs.c:2570
 msgid ""
 "\n"
 "\n"
@@ -5207,25 +5222,25 @@
 "You may need to select one of these in Tools/Preferences/Playback.\n"
 msgstr ""
 
-#: src/dialogs.c:2500
+#: src/dialogs.c:2574
 msgid "Video playback plugin failed to initialise palette !\n"
 msgstr "O plugin de execução de vídeo falhou em iniciar a palheta!\n"
 
-#: src/dialogs.c:2504
+#: src/dialogs.c:2579
 msgid "Decoder plugin failed to initialise palette !\n"
 msgstr "O plugin de decodificação de áudio falhou em inicializar a palheta!\n"
 
-#: src/dialogs.c:2509
+#: src/dialogs.c:2584
 msgid "Unable to set framerate of video plugin\n"
 msgstr "Impossível definir framerate do plugin de vídeo\n"
 
-#: src/dialogs.c:2514
+#: src/dialogs.c:2590
 msgid ""
 "After a crash, it is advisable to clean up the disk with\n"
 "File|Clean up disk space\n"
 msgstr ""
 
-#: src/dialogs.c:2526
+#: src/dialogs.c:2604
 #, c-format
 msgid ""
 "Stream frame size is too large for your network buffers.\n"
@@ -5238,33 +5253,33 @@
 "\n"
 "echo %d > /proc/sys/net/core/rmem_max\n"
 
-#: src/dialogs.c:2714
+#: src/dialogs.c:2800
 msgid "cancelled.\n"
 msgstr "cancelado.\n"
 
-#: src/dialogs.c:2721
+#: src/dialogs.c:2805
 msgid "failed.\n"
 msgstr "falhou.\n"
 
-#: src/dialogs.c:2728
+#: src/dialogs.c:2810
 msgid "done.\n"
 msgstr "feito.\n"
 
-#: src/dialogs.c:2732
+#: src/dialogs.c:2814
 msgid "error in file. Failed.\n"
 msgstr "erro no arquivo. Falhou.\n"
 
-#: src/dialogs.c:2766 src/dialogs.c:2815 src/dialogs.c:2839
+#: src/dialogs.c:2848 src/dialogs.c:2897 src/dialogs.c:2921
 #, c-format
 msgid "Additional info: %s\n"
 msgstr ""
 
-#: src/dialogs.c:2769
+#: src/dialogs.c:2851
 #, c-format
 msgid "The error value was %d%s\n"
 msgstr ""
 
-#: src/dialogs.c:2772
+#: src/dialogs.c:2854
 #, c-format
 msgid ""
 "\n"
@@ -5274,7 +5289,7 @@
 "%s%s%s"
 msgstr ""
 
-#: src/dialogs.c:2818
+#: src/dialogs.c:2900
 #, c-format
 msgid ""
 "\n"
@@ -5284,7 +5299,7 @@
 "%s"
 msgstr ""
 
-#: src/dialogs.c:2842
+#: src/dialogs.c:2924
 #, c-format
 msgid ""
 "\n"
@@ -5294,7 +5309,7 @@
 "%s"
 msgstr ""
 
-#: src/dialogs.c:2886
+#: src/dialogs.c:2968
 #, c-format
 msgid ""
 "\n"
@@ -5303,7 +5318,7 @@
 "Please check for possible error causes.\n"
 msgstr ""
 
-#: src/dialogs.c:2890
+#: src/dialogs.c:2971
 #, c-format
 msgid ""
 "\n"
@@ -5313,7 +5328,7 @@
 "%s.\n"
 msgstr ""
 
-#: src/dialogs.c:2921
+#: src/dialogs.c:3002
 #, c-format
 msgid ""
 "\n"
@@ -5322,7 +5337,7 @@
 "Please check for possible error causes.\n"
 msgstr ""
 
-#: src/dialogs.c:2925
+#: src/dialogs.c:3005
 #, c-format
 msgid ""
 "\n"
@@ -5332,12 +5347,12 @@
 "%s.\n"
 msgstr ""
 
-#: src/dialogs.c:2993
+#: src/dialogs.c:3073
 #, c-format
 msgid "Value for \"%s\" could not be read."
 msgstr ""
 
-#: src/dialogs.c:3011
+#: src/dialogs.c:3091
 #, c-format
 msgid ""
 "\n"
@@ -5346,7 +5361,7 @@
 "Please check your system for errors.\n"
 msgstr ""
 
-#: src/dialogs.c:3020
+#: src/dialogs.c:3100
 #, c-format
 msgid ""
 "\n"
@@ -5359,7 +5374,7 @@
 "%s\n"
 "Por favor veja as permissões e tente novamente."
 
-#: src/dialogs.c:3027
+#: src/dialogs.c:3109
 #, c-format
 msgid ""
 "\n"
@@ -5368,7 +5383,7 @@
 "Please check the directory permissions and try again."
 msgstr ""
 
-#: src/dialogs.c:3034
+#: src/dialogs.c:3116
 #, c-format
 msgid ""
 "\n"
@@ -5376,14 +5391,14 @@
 "%s\n"
 msgstr ""
 
-#: src/dialogs.c:3041
+#: src/dialogs.c:3123
 msgid ""
 "\n"
 "Abort and exit immediately from LiVES\n"
 "Are you sure ?\n"
 msgstr ""
 
-#: src/dialogs.c:3047
+#: src/dialogs.c:3129
 #, c-format
 msgid ""
 "\n"
@@ -5391,13 +5406,13 @@
 "Please select another encoder from the list.\n"
 msgstr ""
 
-#: src/dialogs.c:3056
+#: src/dialogs.c:3139
 msgid ""
 "\n"
 "This card is already in use and cannot be opened multiple times.\n"
 msgstr ""
 
-#: src/dialogs.c:3061
+#: src/dialogs.c:3145
 #, c-format
 msgid ""
 "\n"
@@ -5407,27 +5422,27 @@
 "- Check if the device actually exists.\n"
 msgstr ""
 
-#: src/dialogs.c:3068
+#: src/dialogs.c:3153
 msgid ""
 "\n"
 "This file already has subtitles loaded.\n"
 "Do you wish to overwrite the existing subtitles ?\n"
 msgstr ""
 
-#: src/dialogs.c:3072
+#: src/dialogs.c:3157
 msgid ""
 "\n"
 "LiVES currently only supports subtitles of type .srt and .sub.\n"
 msgstr ""
 
-#: src/dialogs.c:3076
+#: src/dialogs.c:3161
 msgid ""
 "\n"
 "Erase all subtitles from this clip.\n"
 "Are you sure ?\n"
 msgstr ""
 
-#: src/dialogs.c:3082
+#: src/dialogs.c:3168
 #, c-format
 msgid ""
 "\n"
@@ -5436,14 +5451,14 @@
 "or OK to continue and save as type \"%s\"\n"
 msgstr ""
 
-#: src/dialogs.c:3089
+#: src/dialogs.c:3176
 msgid ""
 "\n"
 "Do you wish to move the current clip sets to the new directory ?\n"
 "(If unsure, click Yes)\n"
 msgstr ""
 
-#: src/dialogs.c:3093
+#: src/dialogs.c:3181
 #, c-format
 msgid ""
 "\n"
@@ -5454,19 +5469,19 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:3099
+#: src/dialogs.c:3188
 msgid ""
 "\n"
 "No video input devices could be found.\n"
 msgstr ""
 
-#: src/dialogs.c:3103
+#: src/dialogs.c:3192
 msgid ""
 "\n"
 "All video input devices are already in use.\n"
 msgstr ""
 
-#: src/dialogs.c:3107
+#: src/dialogs.c:3196
 msgid ""
 "\n"
 "\n"
@@ -5474,15 +5489,14 @@
 "DO NOT SHUT DOWN OR CLOSE LIVES !\n"
 msgstr ""
 
-#: src/dialogs.c:3127
+#: src/dialogs.c:3203
 #, c-format
 msgid ""
 "No clips were recovered for set (%s).\n"
 "Please check the spelling of the set name and try again.\n"
 msgstr ""
 
-#. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:3136
+#: src/dialogs.c:3214
 #, c-format
 msgid ""
 "\n"
@@ -5494,7 +5508,7 @@
 msgstr ""
 
 #. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:3144
+#: src/dialogs.c:3222
 #, c-format
 msgid ""
 "\n"
@@ -5503,34 +5517,34 @@
 "\n"
 msgstr ""
 
-#: src/dialogs.c:3150
+#: src/dialogs.c:3228
 msgid ""
 "\n"
 "You must have autolives.pl installed and in your path to use this toy.\n"
 "Consult your package distributor.\n"
 msgstr ""
 
-#: src/dialogs.c:3154
+#: src/dialogs.c:3232
 msgid ""
 "\n"
 "You must have a minimum of one clip loaded to use this toy.\n"
 msgstr ""
 
-#: src/dialogs.c:3158
+#: src/dialogs.c:3236
 msgid ""
 "\n"
 "LiVES lost its connection to jack and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:3162
+#: src/dialogs.c:3240
 msgid ""
 "\n"
 "LiVES lost its connection to pulseaudio and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:3175
+#: src/dialogs.c:3254
 #, c-format
 msgid ""
 "\n"
@@ -5539,240 +5553,240 @@
 "Do you wish to allow this (for this session only) ?\n"
 msgstr ""
 
-#: src/effects.c:60
+#: src/effects.c:61
 msgid "generator"
 msgstr "gerador"
 
-#: src/effects.c:61
+#: src/effects.c:62
 msgid "Generators"
 msgstr "Geradores"
 
-#: src/effects.c:63
+#: src/effects.c:64
 msgid "audio generator"
 msgstr ""
 
-#: src/effects.c:64
+#: src/effects.c:65
 msgid "Audio Generators"
 msgstr ""
 
-#: src/effects.c:66
+#: src/effects.c:67
 msgid "audio/video generator"
 msgstr ""
 
-#: src/effects.c:67
+#: src/effects.c:68
 msgid "Audio/Video Generators"
 msgstr ""
 
-#: src/effects.c:69
+#: src/effects.c:70
 msgid "data generator"
 msgstr ""
 
-#: src/effects.c:70
+#: src/effects.c:71
 msgid "Data Generators"
 msgstr ""
 
-#: src/effects.c:72
+#: src/effects.c:73
 msgid "data visualiser"
 msgstr ""
 
-#: src/effects.c:73
+#: src/effects.c:74
 msgid "Data Visualisers"
 msgstr ""
 
-#: src/effects.c:75
+#: src/effects.c:76
 msgid "data processor"
 msgstr ""
 
-#: src/effects.c:76
+#: src/effects.c:77
 msgid "Data Processors"
 msgstr ""
 
-#: src/effects.c:78
+#: src/effects.c:79
 msgid "data source"
 msgstr ""
 
-#: src/effects.c:79
+#: src/effects.c:80
 msgid "Data Sources"
 msgstr ""
 
-#: src/effects.c:81
+#: src/effects.c:82
 msgid "transition"
 msgstr "transição"
 
-#: src/effects.c:82
+#: src/effects.c:83
 msgid "Transitions"
 msgstr "Transições"
 
-#: src/effects.c:84
+#: src/effects.c:85
 msgid "effect"
 msgstr "efeito"
 
-#: src/effects.c:87 src/rfx-builder.c:187
+#: src/effects.c:88 src/rfx-builder.c:187
 msgid "utility"
 msgstr "utilitário"
 
-#: src/effects.c:88
+#: src/effects.c:89
 msgid "Utilities"
 msgstr "Utilitários"
 
-#: src/effects.c:90
+#: src/effects.c:91
 msgid "compositor"
 msgstr "compositor"
 
-#: src/effects.c:91
+#: src/effects.c:92
 msgid "Compositors"
 msgstr "Compositores"
 
-#: src/effects.c:93
+#: src/effects.c:94
 msgid "tap"
 msgstr "tap"
 
-#: src/effects.c:94
+#: src/effects.c:95
 msgid "Taps"
 msgstr "Torneiras"
 
-#: src/effects.c:96
+#: src/effects.c:97
 msgid "splitter"
 msgstr "divisor"
 
-#: src/effects.c:97
+#: src/effects.c:98
 msgid "Splitters"
 msgstr "Divisores"
 
-#: src/effects.c:99
+#: src/effects.c:100
 msgid "converter"
 msgstr "conversor"
 
-#: src/effects.c:100
+#: src/effects.c:101
 msgid "Converters"
 msgstr "Conversores"
 
-#: src/effects.c:102
+#: src/effects.c:103
 msgid "analyser"
 msgstr ""
 
-#: src/effects.c:103
+#: src/effects.c:104
 msgid "Analysers"
 msgstr ""
 
-#: src/effects.c:108
+#: src/effects.c:109
 msgid "audio/video"
 msgstr "áudio/vídeo"
 
-#: src/effects.c:109
+#: src/effects.c:110
 msgid "Audio/Video Transitions"
 msgstr "Transições de Áudio e Vídeo"
 
-#: src/effects.c:111
+#: src/effects.c:112
 msgid "video only"
 msgstr "só vídeo"
 
-#: src/effects.c:112
+#: src/effects.c:113
 msgid "Video only Transitions"
 msgstr "Ver apenas Transições"
 
-#: src/effects.c:114 src/multitrack.c:10740
+#: src/effects.c:115 src/multitrack.c:10962
 msgid "audio only"
 msgstr "áudio apenas"
 
-#: src/effects.c:115
+#: src/effects.c:116
 msgid "Audio only Transitions"
 msgstr "Transições apenas de Áudio"
 
-#: src/effects.c:117 src/effects.c:120 src/multitrack.c:18757
+#: src/effects.c:118 src/effects.c:121 src/multitrack.c:19097
 msgid "audio"
 msgstr "áudio"
 
-#: src/effects.c:118
+#: src/effects.c:119
 msgid "Audio Mixers"
 msgstr "Mixers de Áudio"
 
-#: src/effects.c:121
+#: src/effects.c:122
 msgid "Audio Effects"
 msgstr "Efeitos de Áudio"
 
-#: src/effects.c:123
+#: src/effects.c:124
 msgid "video"
 msgstr ""
 
-#: src/effects.c:124
+#: src/effects.c:125
 msgid "Video Effects"
 msgstr ""
 
-#: src/effects.c:126
+#: src/effects.c:127
 msgid "audio volume controller"
 msgstr "controle do volume de áudio"
 
-#: src/effects.c:127
+#: src/effects.c:128
 msgid "Audio Volume Controllers"
 msgstr "Controles do Volume de Áudio"
 
-#: src/effects.c:129
+#: src/effects.c:130
 msgid "video analyser"
 msgstr ""
 
-#: src/effects.c:130
+#: src/effects.c:131
 msgid "Video analysers"
 msgstr ""
 
-#: src/effects.c:132
+#: src/effects.c:133
 msgid "audio analyser"
 msgstr ""
 
-#: src/effects.c:133
+#: src/effects.c:134
 msgid "Audio Analysers"
 msgstr ""
 
-#: src/effects.c:137 src/plugins.c:2559 src/plugins.c:2573
+#: src/effects.c:138 src/plugins.c:2507 src/plugins.c:2521
 msgid "unknown"
 msgstr "desconhecido"
 
-#: src/effects.c:238
+#: src/effects.c:235
 #, c-format
 msgid "%s all frames..."
 msgstr "%s todos frames..."
 
-#: src/effects.c:243
+#: src/effects.c:239
 #, c-format
 msgid "%s clipboard into frames %d to %d..."
 msgstr "%s área de transferência em frames %d até %d..."
 
-#: src/effects.c:250
+#: src/effects.c:245
 #, c-format
 msgid "%s to clipboard..."
 msgstr "%s na área de transferência..."
 
-#: src/effects.c:254
+#: src/effects.c:248
 #, c-format
 msgid "%s to new clip..."
 msgstr "%s em novo clipe..."
 
-#: src/effects.c:259
+#: src/effects.c:252
 #, c-format
 msgid "%s frames %d to %d..."
 msgstr "%s frames %d até %d..."
 
-#: src/effects.c:290
+#: src/effects.c:283
 #, c-format
 msgid "%s clipboard with selection"
 msgstr "%s área de transferência com seleção"
 
-#: src/effects.c:295
+#: src/effects.c:287
 #, c-format
 msgid "%s to clipboard"
 msgstr "%s na área de transferência"
 
-#: src/effects.c:299
+#: src/effects.c:290
 #, c-format
 msgid "%s to new clip"
 msgstr "%s em um novo clipe"
 
-#: src/effects.c:304
+#: src/effects.c:294
 #, c-format
 msgid "%s frames %d to %d"
 msgstr "%s frames %d até %d"
 
-#: src/effects.c:456 src/effects.c:523
+#: src/effects.c:443 src/effects.c:507
 msgid ""
 "\n"
 "No frames were generated.\n"
@@ -5780,46 +5794,46 @@
 "\n"
 "Nenhum frame foi gerado.\n"
 
-#: src/effects-weed.c:431
+#: src/effects-weed.c:452
 msgid "integer"
 msgstr ""
 
-#: src/effects-weed.c:432
+#: src/effects-weed.c:454
 msgid "int64"
 msgstr ""
 
-#: src/effects-weed.c:433
+#: src/effects-weed.c:456
 msgid "boolean"
 msgstr ""
 
-#: src/effects-weed.c:434
+#: src/effects-weed.c:458
 msgid "double"
 msgstr ""
 
-#: src/effects-weed.c:435
+#: src/effects-weed.c:460
 msgid "string"
 msgstr ""
 
-#: src/effects-weed.c:436
+#: src/effects-weed.c:462
 msgid "pointer"
 msgstr ""
 
-#: src/effects-weed.c:4591
+#: src/effects-weed.c:4581
 #, c-format
 msgid "Error: plugin %s has no weed_setup() function.\n"
 msgstr "Erro: plugin %s não tem a função weed_setup().\n"
 
-#: src/effects-weed.c:4606
+#: src/effects-weed.c:4595
 #, c-format
 msgid "No usable filters found in plugin %s\n"
 msgstr ""
 
-#: src/effects-weed.c:4680
+#: src/effects-weed.c:4668
 #, c-format
 msgid "Found duplicate plugin %s"
 msgstr ""
 
-#: src/effects-weed.c:4734
+#: src/effects-weed.c:4723
 #, c-format
 msgid ""
 "Info: Unable to load plugin %s\n"
@@ -5828,259 +5842,259 @@
 "Info: Impossível carregar plugin %s\n"
 "Erro: %s\n"
 
-#: src/effects-weed.c:4737 src/effects-weed.c:5858
+#: src/effects-weed.c:4726 src/effects-weed.c:5847
 msgid "Some plugin directories"
 msgstr ""
 
 #. TRANSLATORS: example " - LADSPA plugins -"
-#: src/effects-weed.c:4812 src/rte_window.c:2105
+#: src/effects-weed.c:4801 src/rte_window.c:2107
 #, c-format
 msgid " - %s plugins -"
 msgstr ""
 
-#: src/effects-weed.c:5012
+#: src/effects-weed.c:4998
 #, c-format
 msgid "Successfully loaded %d Weed filters\n"
 msgstr "Carregado %d filtros de Weed com sucesso\n"
 
-#: src/effects-weed.c:5177
+#: src/effects-weed.c:5162
 #, c-format
 msgid "Invalid compound effect %s - has conflicting target_fps\n"
 msgstr ""
 
-#: src/effects-weed.c:5197
+#: src/effects-weed.c:5182
 #, c-format
 msgid "Invalid compound effect %s - has multiple transition parameters\n"
 msgstr ""
 
-#: src/effects-weed.c:5211
+#: src/effects-weed.c:5196
 #, c-format
 msgid "Invalid compound effect %s - has multiple master volume parameters\n"
 msgstr ""
 
-#: src/effects-weed.c:5346
+#: src/effects-weed.c:5329
 #, c-format
 msgid "Invalid compound effect %s - must have >1 sub filters\n"
 msgstr ""
 
-#: src/effects-weed.c:5366
+#: src/effects-weed.c:5349
 #, c-format
 msgid "Invalid effect %s found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5381
+#: src/effects-weed.c:5364
 #, c-format
 msgid "Invalid default found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5392
+#: src/effects-weed.c:5375
 #, c-format
 msgid "Invalid filter %d for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5406
+#: src/effects-weed.c:5389
 #, c-format
 msgid "Invalid param %d for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5433
+#: src/effects-weed.c:5416
 #, c-format
 msgid ""
 "Invalid number of values for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5467
+#: src/effects-weed.c:5450
 #, c-format
 msgid ""
 "Invalid non-boolean value for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5500
+#: src/effects-weed.c:5483
 #, c-format
 msgid "Invalid param link found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5511
+#: src/effects-weed.c:5494
 #, c-format
 msgid ""
 "Invalid out filter %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5529
+#: src/effects-weed.c:5513
 #, c-format
 msgid ""
 "Invalid out param %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5541
+#: src/effects-weed.c:5526
 #, c-format
 msgid ""
 "Invalid non-boolean value for autoscale found in compound effect %s, line "
 "%d\n"
 msgstr ""
 
-#: src/effects-weed.c:5552
+#: src/effects-weed.c:5537
 #, c-format
 msgid ""
 "Invalid in filter %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5566
+#: src/effects-weed.c:5552
 #, c-format
 msgid ""
 "Invalid in param %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5594
+#: src/effects-weed.c:5581
 #, c-format
 msgid "Invalid channel link found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5605
+#: src/effects-weed.c:5592
 #, c-format
 msgid ""
 "Invalid out filter %d for link channels found in compound effect %s, line "
 "%d\n"
 msgstr ""
 
-#: src/effects-weed.c:5623
+#: src/effects-weed.c:5611
 #, c-format
 msgid ""
 "Invalid out channel %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5633
+#: src/effects-weed.c:5622
 #, c-format
 msgid ""
 "Invalid in filter %d for link channels found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5651
+#: src/effects-weed.c:5641
 #, c-format
 msgid ""
 "Invalid in channel %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5687
+#: src/effects-weed.c:5678
 #, c-format
 msgid "Compound:%s"
 msgstr ""
 
-#: src/effects-weed.c:5758
+#: src/effects-weed.c:5749
 #, c-format
 msgid "Successfully loaded %d compound filters\n"
 msgstr ""
 
-#: src/effects-weed.c:6591
+#: src/effects-weed.c:6570
 #, c-format
 msgid "Effect %s cannot be used with this audio player.\n"
 msgstr ""
 
-#: src/effects-weed.c:6737
+#: src/effects-weed.c:6718
 #, c-format
 msgid "Failed to start instance %s, error code %d\n"
 msgstr "Falha ao iniciar instância %s, erro %d\n"
 
-#: src/effects-weed.c:6814
+#: src/effects-weed.c:6797
 #, c-format
 msgid "Unable to start generator %s\n"
 msgstr "Impossível iniciar gerador %s\n"
 
-#: src/effects-weed.c:7621
+#: src/effects-weed.c:7607
 #, c-format
 msgid "Failed to start generator %s\n"
 msgstr "Falha ao iniciar gerador %s\n"
 
-#: src/effects-weed.c:7718
+#: src/effects-weed.c:7701
 #, c-format
 msgid "Failed to start generator %s, error %d\n"
 msgstr "Falha ao iniciar gerador %s, erro %d\n"
 
-#: src/effects-weed.c:9012
+#: src/effects-weed.c:8993
 #, c-format
 msgid "%s [unstable] (%s)"
 msgstr ""
 
-#: src/effects-data.c:3278
+#: src/effects-data.c:3234
 #, c-format
 msgid "ACTIVATE (%s)"
 msgstr ""
 
-#: src/effects-data.c:3548
+#: src/effects-data.c:3501
 msgid "ACTIVATE"
 msgstr ""
 
-#: src/effects-data.c:3876
+#: src/effects-data.c:3829
 #, c-format
 msgid "Key slot %d"
 msgstr ""
 
-#: src/effects-data.c:3998
+#: src/effects-data.c:3951
 msgid "Autoscale"
 msgstr ""
 
-#: src/effects-data.c:4089
+#: src/effects-data.c:4042
 msgid "Add another connection for this output parameter"
 msgstr ""
 
-#: src/effects-data.c:4102 src/effects-data.c:4151
+#: src/effects-data.c:4055 src/effects-data.c:4104
 #, fuzzy
 msgid "Delete this connection"
 msgstr "_Deletar este efeito"
 
-#: src/effects-data.c:4138
+#: src/effects-data.c:4091
 msgid "Add another connection for this output channel"
 msgstr ""
 
-#: src/effects-data.c:4223
+#: src/effects-data.c:4176
 msgid "Connected to -->"
 msgstr ""
 
-#: src/effects-data.c:4243
+#: src/effects-data.c:4196
 #, c-format
 msgid "%s - Alpha Channel Connections"
 msgstr ""
 
-#: src/effects-data.c:4316
+#: src/effects-data.c:4269
 #, c-format
 msgid "%s - Parameter Data Connections"
 msgstr ""
 
-#: src/effects-data.c:4336
+#: src/effects-data.c:4289
 msgid "Autoscale All"
 msgstr ""
 
-#: src/effects-data.c:4361 src/effects-data.c:4890
+#: src/effects-data.c:4314 src/effects-data.c:4841
 msgid "ACTIVATED"
 msgstr ""
 
-#: src/effects-data.c:4774
+#: src/effects-data.c:4726
 msgid "LiVES: - Parameter and Alpha Channel Connections"
 msgstr ""
 
-#: src/effects-data.c:4785
+#: src/effects-data.c:4736
 msgid "Auto Connect Channels"
 msgstr ""
 
-#: src/effects-data.c:4797
+#: src/effects-data.c:4748
 msgid "Auto Connect Parameters"
 msgstr ""
 
-#: src/effects-data.c:4807
+#: src/effects-data.c:4758
 msgid "Disconnect All"
 msgstr ""
 
-#: src/effects-data.c:4875
+#: src/effects-data.c:4826
 #, c-format
 msgid "Input channel is already connected from (%d,%d) %s"
 msgstr ""
 
-#: src/effects-data.c:4891
+#: src/effects-data.c:4842
 #, c-format
 msgid "Input parameter is already connected from (%d,%d) %s"
 msgstr ""
 
-#: src/effects-data.c:4899
+#: src/effects-data.c:4851
 msgid "Input and output parameters are not compatible"
 msgstr ""
 
@@ -6092,43 +6106,43 @@
 msgid "_Reset Values"
 msgstr "_Reiniciar Valores"
 
-#: src/framedraw.c:267
+#: src/framedraw.c:265
 msgid "_Frame"
 msgstr ""
 
-#: src/paramspecial.c:266
+#: src/paramspecial.c:259
 msgid "Maintain _Aspect Ratio"
 msgstr "Manter _Aspecto"
 
-#: src/paramspecial.c:267
+#: src/paramspecial.c:260
 msgid "Maintain aspect ratio of original frame"
 msgstr "Manter aspecto do frame original"
 
-#: src/paramspecial.c:341
+#: src/paramspecial.c:335
 msgid "Display Password"
 msgstr ""
 
-#: src/paramwindow.c:450
+#: src/paramwindow.c:447
 msgid "Transition _In"
 msgstr "_Inicio da transição"
 
-#: src/paramwindow.c:452
+#: src/paramwindow.c:449
 msgid "Click to set the transition parameter to show only the front frame"
 msgstr ""
 
-#: src/paramwindow.c:474
+#: src/paramwindow.c:472
 msgid "Crossfade audio"
 msgstr "Crossfade áudio"
 
-#: src/paramwindow.c:475
+#: src/paramwindow.c:473
 msgid "Check the box to make audio transition with the video"
 msgstr "Clique na caixa para permitir fazer transmissão de áudio com vídeo"
 
-#: src/paramwindow.c:493
+#: src/paramwindow.c:492
 msgid "Transition _Out"
 msgstr "Fim da transiçã_o"
 
-#: src/paramwindow.c:495
+#: src/paramwindow.c:494
 msgid "Click to set the transition parameter to show only the rear frame"
 msgstr ""
 
@@ -6141,23 +6155,23 @@
 msgid "%s : size"
 msgstr "%s : tamanho"
 
-#: src/paramwindow.c:598
+#: src/paramwindow.c:597
 msgid "New size (pixels)"
 msgstr "Novo tamanho (pixels)"
 
-#: src/paramwindow.c:617 src/plugins.c:997
+#: src/paramwindow.c:616 src/plugins.c:973
 msgid "_Width"
 msgstr "Largura [_W]"
 
-#: src/paramwindow.c:636 src/plugins.c:1003
+#: src/paramwindow.c:635 src/plugins.c:979
 msgid "_Height"
 msgstr "Altura [_H]"
 
-#: src/paramwindow.c:684
+#: src/paramwindow.c:683
 msgid "Generate to _Clipboard"
 msgstr "Gerar na Área de Transferên_cia"
 
-#: src/paramwindow.c:686
+#: src/paramwindow.c:685
 msgid "Generate frames to the clipboard"
 msgstr "Gerar frames na área de transferência"
 
@@ -6169,7 +6183,7 @@
 msgid "Generate frames to a new clip"
 msgstr "Gerar frames em um novo clipe"
 
-#: src/paramwindow.c:822
+#: src/paramwindow.c:824
 #, c-format
 msgid ""
 "\n"
@@ -6180,59 +6194,59 @@
 "Devem ser selecionados ao menos %d frames para usar este efeito.\n"
 "\n"
 
-#: src/paramwindow.c:920 src/paramwindow.c:930
+#: src/paramwindow.c:934 src/paramwindow.c:942
 msgid "Set as default"
 msgstr "Definir como padrão"
 
-#: src/paramwindow.c:922 src/paramwindow.c:938
+#: src/paramwindow.c:936 src/paramwindow.c:950
 msgid "Reset"
 msgstr ""
 
-#: src/paramwindow.c:932 src/rte_window.c:2401 src/omc-learn.c:1357
+#: src/paramwindow.c:944 src/rte_window.c:2394 src/omc-learn.c:1347
 msgid "Close _window"
 msgstr "Fechar janela [_W]"
 
-#: src/paramwindow.c:1337
+#: src/paramwindow.c:1340
 msgid "No parameters"
 msgstr "Sem parâmetros"
 
-#: src/paramwindow.c:1419
+#: src/paramwindow.c:1424
 msgid "Invalid parameter"
 msgstr "Parametro inválido"
 
-#: src/paramwindow.c:1611
+#: src/paramwindow.c:1610
 msgid "LiVES: - Select Colour"
 msgstr "Mostrar Compositor"
 
-#: src/paramwindow.c:1616
+#: src/paramwindow.c:1615
 msgid "Click to set the colour"
 msgstr "Clique para selecionar a cor"
 
-#: src/paramwindow.c:1628
+#: src/paramwindow.c:1626
 msgid "_Red"
 msgstr ""
 
-#: src/paramwindow.c:1629
+#: src/paramwindow.c:1627
 msgid "The red value (0 - 255)"
 msgstr "Valor do vermelho (0 - 255)"
 
-#: src/paramwindow.c:1632
+#: src/paramwindow.c:1630
 msgid "_Green"
 msgstr ""
 
-#: src/paramwindow.c:1633
+#: src/paramwindow.c:1631
 msgid "The green value (0 - 255)"
 msgstr "Valor do verde (0 - 255)"
 
-#: src/paramwindow.c:1636
+#: src/paramwindow.c:1634
 msgid "_Blue"
 msgstr ""
 
-#: src/paramwindow.c:1637
+#: src/paramwindow.c:1635
 msgid "The blue value (0 - 255)"
 msgstr "Valor do azul (0 - 255)"
 
-#: src/plugins.c:85
+#: src/plugins.c:86
 #, c-format
 msgid ""
 "\n"
@@ -6241,12 +6255,12 @@
 "\n"
 "Erro de plugin: %s falhou com o código %d"
 
-#: src/plugins.c:87
+#: src/plugins.c:88
 #, c-format
 msgid " : message was %s\n"
 msgstr " : mensagem era %s\n"
 
-#: src/plugins.c:387
+#: src/plugins.c:375
 #, c-format
 msgid ""
 "\n"
@@ -6261,17 +6275,17 @@
 "%s\n"
 "Código de erro %d\n"
 
-#: src/plugins.c:397
+#: src/plugins.c:385
 #, c-format
 msgid "Updating video playback plugin defaults in %s\n"
 msgstr "Atualizando padrões de plugins de execução de vídeo em %s\n"
 
-#: src/plugins.c:452
+#: src/plugins.c:444
 #, c-format
 msgid "Loading video playback plugin defaults from %s..."
 msgstr "Carregando padrões de plugin de execução de vídeo de %s..."
 
-#: src/plugins.c:515
+#: src/plugins.c:505
 #, c-format
 msgid ""
 "\n"
@@ -6286,32 +6300,32 @@
 " Ferramentas|Preferências|Execução|Plugins de Execução Avançados\n"
 "\n"
 
-#: src/plugins.c:855
+#: src/plugins.c:836
 #, c-format
 msgid "Saving playback plugin defaults to %s..."
 msgstr ""
 
-#: src/plugins.c:962
+#: src/plugins.c:939
 msgid "_FPS"
 msgstr "_FPS"
 
-#: src/plugins.c:963
+#: src/plugins.c:940
 msgid "Fixed framerate for plugin.\n"
 msgstr "Framerate fixa para plugin.\n"
 
-#: src/plugins.c:1032
+#: src/plugins.c:1008
 msgid "_Colourspace"
 msgstr ""
 
-#: src/plugins.c:1033
+#: src/plugins.c:1009
 msgid "Colourspace input to the plugin.\n"
 msgstr "Entrada de colorspace para o plugin.\n"
 
-#: src/plugins.c:1089
+#: src/plugins.c:1065
 msgid "Save settings to an alternate file.\n"
 msgstr ""
 
-#: src/plugins.c:1206
+#: src/plugins.c:1182
 #, c-format
 msgid ""
 "\n"
@@ -6324,7 +6338,7 @@
 "Falhou em abrir o plugin de execução %s\n"
 "Erro: %s\n"
 
-#: src/plugins.c:1252
+#: src/plugins.c:1228
 #, c-format
 msgid ""
 "\n"
@@ -6339,7 +6353,7 @@
 "está sem uma função essencial.\n"
 "Impossível usá-lo.\n"
 
-#: src/plugins.c:1265
+#: src/plugins.c:1241
 #, c-format
 msgid ""
 "Video playback plugin failed to initialise.\n"
@@ -6348,7 +6362,7 @@
 "O plugin de execução de vídeo falhou ao iniciar.\n"
 "O error: %s\n"
 
-#: src/plugins.c:1461
+#: src/plugins.c:1428
 msgid ""
 "\n"
 "Warning ! Video playback plugin will not send key presses. Keyboard may be "
@@ -6358,7 +6372,7 @@
 "Aviso! O plugin de execução de vídeo não envia teclas pressionadas. O "
 "teclado deve estar desativado durante o uso!\n"
 
-#: src/plugins.c:1465
+#: src/plugins.c:1433
 #, c-format
 msgid ""
 "*** Using %s plugin for fs playback, agreed to use palette type %d ( %s ). "
@@ -6367,17 +6381,17 @@
 "*** Usando o plugin %s pra execução em tela cheia, com a palheta tipo %d "
 "(%s). ***\n"
 
-#: src/plugins.c:1571
+#: src/plugins.c:1537
 #, c-format
 msgid "Audio stream unable to use preferred format '%s'\n"
 msgstr ""
 
-#: src/plugins.c:1579
+#: src/plugins.c:1543
 #, c-format
 msgid "Using format '%s' instead.\n"
 msgstr ""
 
-#: src/plugins.c:1616
+#: src/plugins.c:1579
 #, c-format
 msgid ""
 "LiVES was unable to find its encoder plugins. Please make sure you have the "
@@ -6386,7 +6400,7 @@
 "or change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/plugins.c:1624
+#: src/plugins.c:1589
 #, c-format
 msgid ""
 "LiVES did not receive a response from the encoder plugin called '%s'.\n"
@@ -6399,11 +6413,11 @@
 "%s%s%s\n"
 "ou troque de plugin em 'Ferramentas | Preferências | Codificação'\n"
 
-#: src/plugins.c:2032
+#: src/plugins.c:1987
 msgid "Unable to resize, please install imageMagick\n"
 msgstr "Não foi possível redimensionar, por favor instale imageMagick\n"
 
-#: src/plugins.c:2231
+#: src/plugins.c:2183
 #, c-format
 msgid ""
 "\n"
@@ -6411,12 +6425,12 @@
 "No decoders found in %s !\n"
 msgstr ""
 
-#: src/plugins.c:2415
+#: src/plugins.c:2369
 #, fuzzy, c-format
 msgid " using %s"
 msgstr "Abrindo %s"
 
-#: src/plugins.c:2499
+#: src/plugins.c:2451
 #, c-format
 msgid ""
 "\n"
@@ -6429,7 +6443,7 @@
 "Falhou em abrir o plugin de decodificação %s\n"
 "Erro: %s\n"
 
-#: src/plugins.c:2522
+#: src/plugins.c:2472
 #, c-format
 msgid ""
 "\n"
@@ -6444,24 +6458,24 @@
 "está sem uma função essencial.\n"
 "Impossível usá-lo.\n"
 
-#: src/plugins.c:2564
+#: src/plugins.c:2512
 msgid "/unknown"
 msgstr "/desconhecido"
 
-#: src/plugins.c:2651
+#: src/plugins.c:2598
 msgid "LiVES: - Decoder Plugins"
 msgstr ""
 
-#: src/plugins.c:2669
+#: src/plugins.c:2616
 msgid "Enabled Video Decoders (uncheck to disable)"
 msgstr ""
 
-#: src/plugins.c:2726
+#: src/plugins.c:2672
 #, c-format
 msgid "Failed to load %s, transitions may not resize.\n"
 msgstr "Falhou em carregar %s, as transições podem não redimensionar.\n"
 
-#: src/plugins.c:3854
+#: src/plugins.c:3797
 #, c-format
 msgid "%s advanced settings"
 msgstr "%s configurações avançadas"
@@ -6470,15 +6484,15 @@
 msgid "LiVES: - New Test RFX"
 msgstr "LiVES: - Novo RFX de Teste"
 
-#: src/rfx-builder.c:136
+#: src/rfx-builder.c:135
 msgid "LiVES: - Edit Test RFX"
 msgstr "LiVES: - Editar RFX de Teste"
 
-#: src/rfx-builder.c:166
+#: src/rfx-builder.c:165
 msgid "Type:"
 msgstr "Tipo:"
 
-#: src/rfx-builder.c:184
+#: src/rfx-builder.c:183
 msgid "tool"
 msgstr ""
 
@@ -6490,127 +6504,127 @@
 msgid "The name of the plugin. No spaces allowed."
 msgstr "O nome do plugin. Não são permitidos espaços."
 
-#: src/rfx-builder.c:201
+#: src/rfx-builder.c:202
 msgid "Version:       "
 msgstr "Versão:       "
 
-#: src/rfx-builder.c:203
+#: src/rfx-builder.c:204
 msgid "The script version."
 msgstr "Versão do script."
 
-#: src/rfx-builder.c:210
+#: src/rfx-builder.c:212
 msgid "    Author:       "
 msgstr "    Autor:       "
 
-#: src/rfx-builder.c:211
+#: src/rfx-builder.c:213
 msgid "The script author."
 msgstr "Autor do script."
 
-#: src/rfx-builder.c:217
+#: src/rfx-builder.c:220
 msgid "    URL (optional):       "
 msgstr "    URL (opcional):       "
 
-#: src/rfx-builder.c:218
+#: src/rfx-builder.c:221
 msgid "URL for the plugin maintainer."
 msgstr "URL do mantenedor do plugin."
 
-#: src/rfx-builder.c:226
+#: src/rfx-builder.c:230
 msgid "Menu text:    "
 msgstr "Texto do menu:    "
 
-#: src/rfx-builder.c:227
+#: src/rfx-builder.c:231
 msgid "The text to show in the menu."
 msgstr "O texto a ser mostrado no menu."
 
-#: src/rfx-builder.c:239
+#: src/rfx-builder.c:244
 msgid "Action description:        "
 msgstr "Descrição da ação:        "
 
-#: src/rfx-builder.c:241
+#: src/rfx-builder.c:246
 msgid "Describe what the plugin is doing. E.g. \"Edge detecting\""
 msgstr "Descreva o que o plugin faz. Ex.: \"detecção de bordas\""
 
-#: src/rfx-builder.c:246
+#: src/rfx-builder.c:251
 msgid "Minimum frames:"
 msgstr "Mínimo de frames:"
 
-#: src/rfx-builder.c:249
+#: src/rfx-builder.c:254
 msgid ""
 "Minimum number of frames this effect/tool can be applied to. Normally 1."
 msgstr ""
 "Número mínimo de frames ao qual este efeito/ferramenta pode ser aplicado. "
 "Normalmente 1."
 
-#: src/rfx-builder.c:260
+#: src/rfx-builder.c:265
 msgid "_Requirements..."
 msgstr "_Requisitos..."
 
-#: src/rfx-builder.c:263
+#: src/rfx-builder.c:268
 msgid "Enter any binaries required by the plugin."
 msgstr "Entre com os binários requeridos pelo plugin."
 
-#: src/rfx-builder.c:267
+#: src/rfx-builder.c:272
 msgid "_Properties..."
 msgstr "_Propriedades..."
 
-#: src/rfx-builder.c:270
+#: src/rfx-builder.c:275
 msgid "Set properties for the plugin. Optional."
 msgstr "Definir propriedades para o plugin. Opcional."
 
-#: src/rfx-builder.c:274
+#: src/rfx-builder.c:279
 msgid "_Parameters..."
 msgstr "_Parâmetros..."
 
-#: src/rfx-builder.c:277
+#: src/rfx-builder.c:282
 msgid "Set up parameters used in pre/loop/post/trigger code. Optional."
 msgstr ""
 "Configurando parâmetros usados em código pró/loop/pós/gatilho. Opcional."
 
-#: src/rfx-builder.c:281
+#: src/rfx-builder.c:286
 msgid "Parameter _Window Hints..."
 msgstr "Notas da Janela de Parâmetros [_W]"
 
-#: src/rfx-builder.c:284
+#: src/rfx-builder.c:289
 msgid "Set hints about how to lay out the parameter window. Optional."
 msgstr "Criar notas sobre layout da janela de parâmetros. Opcional"
 
-#: src/rfx-builder.c:290
+#: src/rfx-builder.c:295
 msgid "_Language code:"
 msgstr ""
 
-#: src/rfx-builder.c:291
+#: src/rfx-builder.c:296
 msgid "Language for pre/loop/post/triggers. Optional."
 msgstr "Língua para pré/loop/pós/gatilho. Opcional."
 
-#: src/rfx-builder.c:300
+#: src/rfx-builder.c:305
 msgid "_Pre loop code..."
 msgstr "Código _pré-loop..."
 
-#: src/rfx-builder.c:303
+#: src/rfx-builder.c:308
 msgid "Code to be executed before the loop. Optional."
 msgstr "Código a ser executado antes do loop. Opcional."
 
-#: src/rfx-builder.c:307
+#: src/rfx-builder.c:312
 msgid "_Loop code..."
 msgstr "Código de _loop..."
 
-#: src/rfx-builder.c:310
+#: src/rfx-builder.c:315
 msgid "Loop code to be applied to each frame."
 msgstr "Código de loop a ser aplicado em cada frame."
 
-#: src/rfx-builder.c:314
+#: src/rfx-builder.c:319
 msgid "_Post loop code..."
 msgstr "Código _pós-loop..."
 
-#: src/rfx-builder.c:317
+#: src/rfx-builder.c:322
 msgid "Code to be executed after the loop. Optional."
 msgstr "Código para ser executado após o loop. Opcional"
 
-#: src/rfx-builder.c:321
+#: src/rfx-builder.c:326
 msgid "_Trigger code..."
 msgstr "Código de acionamen_to..."
 
-#: src/rfx-builder.c:324
+#: src/rfx-builder.c:329
 msgid ""
 "Set trigger code for when the parameter window is shown, or when a parameter "
 "is changed. Optional (except for Utilities)."
@@ -6618,7 +6632,7 @@
 "Configure o código gatilho para quando a janela de parâmetros for mostrada, "
 "ou quando um parâmetro for modificado. Opcional (exceto para Utilitários)."
 
-#: src/rfx-builder.c:421
+#: src/rfx-builder.c:426
 #, c-format
 msgid ""
 "\n"
@@ -6633,55 +6647,55 @@
 "%s\n"
 "%s\n"
 
-#: src/rfx-builder.c:544
+#: src/rfx-builder.c:541
 msgid "LiVES: - RFX Requirements"
 msgstr "LiVES: - Requisitos RFX"
 
-#: src/rfx-builder.c:548
+#: src/rfx-builder.c:544
 msgid "LiVES: - RFX Parameters"
 msgstr "LiVES: - Parâmetros RFX"
 
-#: src/rfx-builder.c:552
+#: src/rfx-builder.c:547
 msgid "LiVES: - RFX Parameter Window Hints"
 msgstr "LiVES: - Notas da Janela de Parâmetros RFX"
 
-#: src/rfx-builder.c:556
+#: src/rfx-builder.c:550
 msgid "LiVES: - RFX Triggers"
 msgstr "LiVES: - Gatilhos RFX"
 
-#: src/rfx-builder.c:622
+#: src/rfx-builder.c:613
 msgid "_New Entry"
 msgstr "_Nova Entrada"
 
-#: src/rfx-builder.c:625
+#: src/rfx-builder.c:616
 msgid "_Edit Entry"
 msgstr "_Editar Entrada"
 
-#: src/rfx-builder.c:628
+#: src/rfx-builder.c:619
 msgid "_Remove Entry"
 msgstr "_Remover Entrada"
 
-#: src/rfx-builder.c:632
+#: src/rfx-builder.c:623
 msgid "Move _Up"
 msgstr "Mover Acima [_U]"
 
-#: src/rfx-builder.c:635
+#: src/rfx-builder.c:626
 msgid "Move _Down"
 msgstr "Move Abaixo [_U]"
 
-#: src/rfx-builder.c:1004
+#: src/rfx-builder.c:984
 msgid "LiVES: - RFX Properties"
 msgstr "LiVES: - Propriedades RFX"
 
-#: src/rfx-builder.c:1013
+#: src/rfx-builder.c:993
 msgid "_Slow (hint to GUI)"
 msgstr "Lento (nota para GUI) [_S]"
 
-#: src/rfx-builder.c:1024
+#: src/rfx-builder.c:1004
 msgid "_Batch mode generator"
 msgstr "Gerador de modo _batch"
 
-#: src/rfx-builder.c:1831
+#: src/rfx-builder.c:1790
 msgid ""
 "\n"
 "\n"
@@ -6695,7 +6709,7 @@
 "Favor remover o gatilho primeiro.\n"
 "\n"
 
-#: src/rfx-builder.c:1875
+#: src/rfx-builder.c:1834
 msgid ""
 "\n"
 "\n"
@@ -6707,185 +6721,185 @@
 "Alguns gatilhos foram ajustados.\n"
 "Por favor confirme o código gatilho.\n"
 
-#: src/rfx-builder.c:1994
+#: src/rfx-builder.c:1950
 msgid "LiVES: - New RFX Parameter"
 msgstr "LiVES: - Novo Parâmetro RFX"
 
-#: src/rfx-builder.c:1997
+#: src/rfx-builder.c:1952
 msgid "LiVES: - Edit RFX Parameter"
 msgstr "LiVES: - Editar Parâmetro RFX"
 
-#: src/rfx-builder.c:2013
+#: src/rfx-builder.c:1968
 msgid "_Name:    "
 msgstr "_Nome:    "
 
-#: src/rfx-builder.c:2016
+#: src/rfx-builder.c:1971
 msgid "Name of the parameter, must be unique in the plugin."
 msgstr "Nome do parâmetro, deve ser único no plugin."
 
-#: src/rfx-builder.c:2025
+#: src/rfx-builder.c:1981
 msgid "_Label:    "
 msgstr "_Rótulo:    "
 
-#: src/rfx-builder.c:2028
+#: src/rfx-builder.c:1984
 msgid ""
 "Label to be shown by the parameter. An underscore represents mnemonic "
 "accelerator."
 msgstr ""
 "Rótulo a ser mostrado pelo parâmetro. Um sublinhado representa um atalho."
 
-#: src/rfx-builder.c:2039
+#: src/rfx-builder.c:1996
 msgid "_Type:         "
 msgstr "_Tipo:         "
 
-#: src/rfx-builder.c:2040
+#: src/rfx-builder.c:1997
 msgid "Parameter type (select from list)."
 msgstr "Tipo de parâmetro (selecione de uma lista)."
 
-#: src/rfx-builder.c:2073
+#: src/rfx-builder.c:2029
 msgid "Decimal _places: "
 msgstr "Casas decimais [_P]: "
 
-#: src/rfx-builder.c:2082 src/rfx-builder.c:2477 src/rfx-builder.c:2495
+#: src/rfx-builder.c:2038 src/rfx-builder.c:2430 src/rfx-builder.c:2447
 msgid "_Default value:    "
 msgstr "Valor pa_drão:    "
 
-#: src/rfx-builder.c:2098
+#: src/rfx-builder.c:2054
 msgid "_Default: "
 msgstr "Padrão [_D]: "
 
-#: src/rfx-builder.c:2132
+#: src/rfx-builder.c:2087
 msgid "Button _Group: "
 msgstr "_Grupo de botões: "
 
-#: src/rfx-builder.c:2134
+#: src/rfx-builder.c:2089
 msgid "A non-zero value can be used to group radio buttons."
 msgstr "Um valor diferente de zero pode ser usado para agrupar botões rádio."
 
-#: src/rfx-builder.c:2142 src/rfx-builder.c:2478
+#: src/rfx-builder.c:2097 src/rfx-builder.c:2431
 msgid "_Minimum value: "
 msgstr "Valor _mínimo: "
 
-#: src/rfx-builder.c:2148 src/rfx-builder.c:2479
+#: src/rfx-builder.c:2103 src/rfx-builder.c:2432
 msgid "Ma_ximum value: "
 msgstr "Valor má_ximo: "
 
-#: src/rfx-builder.c:2157
+#: src/rfx-builder.c:2113
 msgid "     _Step size:   "
 msgstr "     Tamanho do pa_sso:   "
 
-#: src/rfx-builder.c:2160
+#: src/rfx-builder.c:2117
 msgid ""
 "How much the parameter is adjusted when the spinbutton arrows are pressed."
 msgstr "Quanto do parâmetro é ajustado quando as setas são pressionadas."
 
-#: src/rfx-builder.c:2171
+#: src/rfx-builder.c:2129
 msgid "_Wrap value"
 msgstr ""
 
-#: src/rfx-builder.c:2172
+#: src/rfx-builder.c:2131
 msgid "Whether the value wraps max->min and min->max."
 msgstr "Se o valor empacota max->min e min->max."
 
-#: src/rfx-builder.c:2470
+#: src/rfx-builder.c:2424
 msgid "Set _values"
 msgstr "Definir _valores"
 
-#: src/rfx-builder.c:2512
+#: src/rfx-builder.c:2463
 msgid "Default _Red:  "
 msgstr "Padrão ve_rmelho:  "
 
-#: src/rfx-builder.c:2513
+#: src/rfx-builder.c:2464
 msgid "Default _Green:"
 msgstr "Padrão verde [_G]:"
 
-#: src/rfx-builder.c:2514
+#: src/rfx-builder.c:2465
 msgid "Default _Blue: "
 msgstr "Padrão azul [_B]: "
 
-#: src/rfx-builder.c:2538
+#: src/rfx-builder.c:2488
 msgid "Set _default"
 msgstr "_Definir padrão"
 
-#: src/rfx-builder.c:2540
+#: src/rfx-builder.c:2490
 msgid "Default value:  "
 msgstr "Valor padrão:  "
 
-#: src/rfx-builder.c:2541
+#: src/rfx-builder.c:2491
 msgid "Maximum length (chars): "
 msgstr "Comprimento máximo (caracteres): "
 
-#: src/rfx-builder.c:2576
+#: src/rfx-builder.c:2526
 msgid "LiVES: - New RFX Parameter Window Hint"
 msgstr "LiVES: - Notas da Janela de Parâmetros RFX"
 
-#: src/rfx-builder.c:2579
+#: src/rfx-builder.c:2528
 msgid "LiVES: - Edit RFX Parameter Window Hint"
 msgstr "LiVES: - Notas da Janela de Edição de Parâmetros RFX"
 
-#: src/rfx-builder.c:2622
+#: src/rfx-builder.c:2569
 msgid "_Keyword:         "
 msgstr ""
 
-#: src/rfx-builder.c:2639
+#: src/rfx-builder.c:2586
 msgid "Special _Type:         "
 msgstr ""
 
-#: src/rfx-builder.c:2656
+#: src/rfx-builder.c:2602
 msgid "Special _Subtype:         "
 msgstr ""
 
-#: src/rfx-builder.c:2667 src/rfx-builder.c:2706
+#: src/rfx-builder.c:2613 src/rfx-builder.c:2651
 msgid "Row:    "
 msgstr "Linha:    "
 
-#: src/rfx-builder.c:2732
+#: src/rfx-builder.c:2676
 #, c-format
 msgid "Linked parameters (%d):    "
 msgstr "Parâmetros atrelados (%d):    "
 
-#: src/rfx-builder.c:2749
+#: src/rfx-builder.c:2693
 msgid "Linked parameters (4):    "
 msgstr "Parametros atrelados (4):    "
 
-#: src/rfx-builder.c:2752
+#: src/rfx-builder.c:2695
 msgid "Linked parameters (2):    "
 msgstr "Parâmetros atrelados (2):    "
 
-#: src/rfx-builder.c:2777
+#: src/rfx-builder.c:2720
 msgid "LiVES: - New RFX Trigger"
 msgstr "LiVES: - Novo Gatilho RFX"
 
-#: src/rfx-builder.c:2780
+#: src/rfx-builder.c:2722
 msgid "LiVES: - Edit RFX Trigger"
 msgstr "LiVES: - Editar Gatilho RFX"
 
-#: src/rfx-builder.c:2808
+#: src/rfx-builder.c:2750
 msgid "When:         "
 msgstr "Quando:         "
 
-#: src/rfx-builder.c:2904
+#: src/rfx-builder.c:2846
 msgid "LiVES: - Pre Loop Code"
 msgstr "LiVES: - Código Pré-loop"
 
-#: src/rfx-builder.c:2911
+#: src/rfx-builder.c:2853
 msgid "LiVES: - Loop Code"
 msgstr "LiVES: - Codigo de Loop"
 
-#: src/rfx-builder.c:2918
+#: src/rfx-builder.c:2860
 msgid "LiVES: - Post Loop Code"
 msgstr "LiVES: - Codigo Pós-Loop"
 
-#: src/rfx-builder.c:2931
+#: src/rfx-builder.c:2873
 #, c-format
 msgid "LiVES: - Default text (max length %d)"
 msgstr "LiVES: - Texto padrão (tam. máx. %d)"
 
-#: src/rfx-builder.c:2944
+#: src/rfx-builder.c:2885
 msgid "LiVES: - Enter values, one per line"
 msgstr "LiVES: - Entre com valores, um por linha"
 
-#: src/rfx-builder.c:3055
+#: src/rfx-builder.c:2996
 msgid ""
 "\n"
 "\n"
@@ -6895,7 +6909,7 @@
 "\n"
 "O nome não deve ficar em branco.\n"
 
-#: src/rfx-builder.c:3060
+#: src/rfx-builder.c:3001
 msgid ""
 "\n"
 "\n"
@@ -6905,7 +6919,7 @@
 "\n"
 "Nome não pode conter espaços.\n"
 
-#: src/rfx-builder.c:3065
+#: src/rfx-builder.c:3006
 msgid ""
 "\n"
 "\n"
@@ -6915,7 +6929,7 @@
 "\n"
 "Texto do menu não pode estar em branco.\n"
 
-#: src/rfx-builder.c:3071
+#: src/rfx-builder.c:3012
 msgid ""
 "\n"
 "\n"
@@ -6925,7 +6939,7 @@
 "\n"
 "Descrição da ação não pode estar em branco.\n"
 
-#: src/rfx-builder.c:3076
+#: src/rfx-builder.c:3017
 msgid ""
 "\n"
 "\n"
@@ -6935,7 +6949,7 @@
 "\n"
 "O nome do autor não deve ficar em branco.\n"
 
-#: src/rfx-builder.c:3085 src/rfx-builder.c:4339
+#: src/rfx-builder.c:3026 src/rfx-builder.c:4253
 msgid ""
 "\n"
 "\n"
@@ -6947,7 +6961,7 @@
 "Já existe um plugin com este nome.\n"
 "O nome deve ser único.\n"
 
-#: src/rfx-builder.c:3092
+#: src/rfx-builder.c:3033
 msgid ""
 "\n"
 "\n"
@@ -6957,7 +6971,7 @@
 "\n"
 "Codigo do loop não deve estar em branco.\n"
 
-#: src/rfx-builder.c:3098
+#: src/rfx-builder.c:3039
 msgid ""
 "\n"
 "\n"
@@ -6967,7 +6981,7 @@
 "\n"
 "O código do gatilho não deve ser deixado em branco para um utilitário.\n"
 
-#: src/rfx-builder.c:3111
+#: src/rfx-builder.c:3052
 msgid ""
 "\n"
 "\n"
@@ -6977,7 +6991,7 @@
 "\n"
 "O nome do parâmetro não deve ser deixado em branco.\n"
 
-#: src/rfx-builder.c:3117
+#: src/rfx-builder.c:3058
 msgid ""
 "\n"
 "\n"
@@ -6991,41 +7005,41 @@
 "plugin.\n"
 "\n"
 
-#: src/rfx-builder.c:3171
+#: src/rfx-builder.c:3111
 #, c-format
 msgid "Writing script file %s..."
 msgstr "Escrevendo arquivo de script %s..."
 
-#: src/rfx-builder.c:3477
+#: src/rfx-builder.c:3411
 msgid "No <define> section found in script.\n"
 msgstr "A seção <define> não foi encontrada no script.\n"
 
-#: src/rfx-builder.c:3484 src/rfx-builder.c:3493
+#: src/rfx-builder.c:3418 src/rfx-builder.c:3427
 msgid "Bad script version.\n"
 msgstr "Versão do script ruim.\n"
 
-#: src/rfx-builder.c:3505
+#: src/rfx-builder.c:3439
 msgid "No <name> section found in script.\n"
 msgstr "A seção <name> não foi encontrada no script.\n"
 
-#: src/rfx-builder.c:3513
+#: src/rfx-builder.c:3447
 msgid "No <version> section found in script.\n"
 msgstr "A seção <version> não foi enonctrada no script.\n"
 
-#: src/rfx-builder.c:3522
+#: src/rfx-builder.c:3456
 msgid "No <author> section found in script.\n"
 msgstr "A seção <author> não foi encontrada no script.\n"
 
-#: src/rfx-builder.c:3536
+#: src/rfx-builder.c:3470
 msgid "No <description> section found in script.\n"
 msgstr "A seção <description> não foi encontrada no script.\n"
 
-#: src/rfx-builder.c:3540
+#: src/rfx-builder.c:3474
 #, c-format
 msgid "Bad description. (%s)\n"
 msgstr "Descrição ruim. (%s)\n"
 
-#: src/rfx-builder.c:3702
+#: src/rfx-builder.c:3627
 #, c-format
 msgid ""
 "\n"
@@ -7040,27 +7054,27 @@
 "encontrado no script.\n"
 "\n"
 
-#: src/rfx-builder.c:3859
+#: src/rfx-builder.c:3780
 msgid "Rebuilding all RFX scripts...builtin..."
 msgstr "Reconstruindo todos scripts RFX..."
 
-#: src/rfx-builder.c:3860
+#: src/rfx-builder.c:3781
 msgid "Rebuilding scripts"
 msgstr "Reconstruindo scripts"
 
-#: src/rfx-builder.c:3868
+#: src/rfx-builder.c:3789
 msgid "custom..."
 msgstr "customizado..."
 
-#: src/rfx-builder.c:3872
+#: src/rfx-builder.c:3793
 msgid "test..."
 msgstr "teste..."
 
-#: src/rfx-builder.c:3878
+#: src/rfx-builder.c:3799
 msgid "rebuilding dynamic menu entries..."
 msgstr "reconstruindo entradas dinâmicas de menu..."
 
-#: src/rfx-builder.c:3905 src/rfx-builder.c:3912
+#: src/rfx-builder.c:3826 src/rfx-builder.c:3834
 #, c-format
 msgid ""
 "\n"
@@ -7073,7 +7087,7 @@
 "LiVES não conseguiu encontrar o programa %s.\n"
 "Por favor confirme se este programa está no PATH e é executável.\n"
 
-#: src/rfx-builder.c:3951
+#: src/rfx-builder.c:3874
 #, c-format
 msgid ""
 "\n"
@@ -7088,12 +7102,12 @@
 "%s ?\n"
 "\n"
 
-#: src/rfx-builder.c:3960
+#: src/rfx-builder.c:3884
 #, c-format
 msgid "Deleting rfx script %s..."
 msgstr "Deletando script RFX %s..."
 
-#: src/rfx-builder.c:3980
+#: src/rfx-builder.c:3902
 #, c-format
 msgid ""
 "\n"
@@ -7108,7 +7122,7 @@
 "%s\n"
 "Código do erro %d\n"
 
-#: src/rfx-builder.c:4016
+#: src/rfx-builder.c:3938
 #, c-format
 msgid ""
 "\n"
@@ -7123,12 +7137,12 @@
 "já existe.\n"
 "Por favor delete-o primeiro, ou renomeie o script de teste.\n"
 
-#: src/rfx-builder.c:4027
+#: src/rfx-builder.c:3950
 #, c-format
 msgid "Promoting rfx test plugin %s to custom..."
 msgstr "Promovendo plugin rfx %s de teste para customizado..."
 
-#: src/rfx-builder.c:4044
+#: src/rfx-builder.c:3965
 #, c-format
 msgid ""
 "\n"
@@ -7139,20 +7153,20 @@
 "Return code was %d (%s)\n"
 msgstr ""
 
-#: src/rfx-builder.c:4070
+#: src/rfx-builder.c:3990
 msgid "LiVES: - Export Script to..."
 msgstr ""
 
-#: src/rfx-builder.c:4077 src/rfx-builder.c:4156
+#: src/rfx-builder.c:3997 src/rfx-builder.c:4074
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "Copiando %s para %s..."
 
-#: src/rfx-builder.c:4105
+#: src/rfx-builder.c:4024
 msgid "LiVES: Import Script from..."
 msgstr ""
 
-#: src/rfx-builder.c:4148
+#: src/rfx-builder.c:4067
 #, c-format
 msgid ""
 "\n"
@@ -7167,43 +7181,43 @@
 "já existe.\n"
 "Por favor delete-o primeiro, ou renomeie o script a ser importado.\n"
 
-#: src/rfx-builder.c:4249
+#: src/rfx-builder.c:4166
 msgid "LiVES: - Copy RFX Script"
 msgstr "LiVES: - Copy RFX Script"
 
-#: src/rfx-builder.c:4251
+#: src/rfx-builder.c:4168
 msgid "_From type:    "
 msgstr ""
 
-#: src/rfx-builder.c:4258
+#: src/rfx-builder.c:4175
 msgid "   Script:    "
 msgstr "   Script:    "
 
-#: src/rfx-builder.c:4267
+#: src/rfx-builder.c:4183
 msgid "LiVES: - Rename test RFX Script"
 msgstr "LiVES: - Renomear Script RFX de Teste"
 
-#: src/rfx-builder.c:4268
+#: src/rfx-builder.c:4184
 msgid "From script: "
 msgstr "Do script: "
 
-#: src/rfx-builder.c:4273
+#: src/rfx-builder.c:4188
 msgid "LiVES: - RFX Script name"
 msgstr "LiVES: - Nome do Script RFX"
 
-#: src/rfx-builder.c:4274
+#: src/rfx-builder.c:4189
 msgid "Script name: "
 msgstr "Nome do script: "
 
-#: src/rfx-builder.c:4294
+#: src/rfx-builder.c:4209
 msgid "New name: "
 msgstr "Novo nome: "
 
-#: src/rfx-builder.c:4297
+#: src/rfx-builder.c:4212
 msgid "New script name: "
 msgstr "Novo nome de script: "
 
-#: src/rfx-builder.c:4372
+#: src/rfx-builder.c:4286
 msgid ""
 "\n"
 "\n"
@@ -7215,12 +7229,12 @@
 "Já existe um script de teste com este nome.\n"
 "O nome do script deve ser único.\n"
 
-#: src/rfx-builder.c:4384
+#: src/rfx-builder.c:4297
 #, c-format
 msgid "Renaming RFX test script %s to %s..."
 msgstr "Renomeando script RFX de teste %s para %s..."
 
-#: src/rfx-builder.c:4390
+#: src/rfx-builder.c:4302
 #, c-format
 msgid ""
 "\n"
@@ -7237,23 +7251,23 @@
 "%s\n"
 "Código %d\n"
 
-#: src/rfx-builder.c:4610
+#: src/rfx-builder.c:4518
 msgid "_Apply Real Time Effects to Selection"
 msgstr "_Aplicar Efeitos em Tempo-Real para Seleção"
 
-#: src/rfx-builder.c:4664
+#: src/rfx-builder.c:4572
 #, c-format
 msgid "Loading rendered effect %s..."
 msgstr "Carregando efeito renderizado %s..."
 
-#: src/rfx-builder.c:4766
+#: src/rfx-builder.c:4674
 msgid ""
 "See: VJ - show VJ keys. Set the realtime effects, and then apply them here."
 msgstr ""
 "Veja: VJ - mostrar atalhos'. Configure os efeitos em tempo-real, e depois "
 "aplique-os aqui."
 
-#: src/preferences.c:359
+#: src/preferences.c:351
 msgid ""
 "\n"
 "\n"
@@ -7265,7 +7279,7 @@
 "Plugins de execução de vídeo só são ativados em\n"
 "tela cheia, modo de janela separada\n"
 
-#: src/preferences.c:408
+#: src/preferences.c:400
 msgid ""
 "\n"
 "\n"
@@ -7273,7 +7287,7 @@
 "(Free space = UNKNOWN)"
 msgstr ""
 
-#: src/preferences.c:412
+#: src/preferences.c:403
 #, c-format
 msgid ""
 "\n"
@@ -7282,14 +7296,14 @@
 "(Free space = %s)"
 msgstr ""
 
-#: src/preferences.c:416
+#: src/preferences.c:408
 msgid ""
 "The temp directory is LiVES working directory where opened clips and sets "
 "are stored.\n"
 "It should be in a partition with plenty of free disk space.\n"
 msgstr ""
 
-#: src/preferences.c:784
+#: src/preferences.c:839
 #, c-format
 msgid ""
 "Unable to create or write to the new temporary directory.\n"
@@ -7300,7 +7314,7 @@
 "The directory will not be changed now.\n"
 msgstr ""
 
-#: src/preferences.c:786
+#: src/preferences.c:843
 #, c-format
 msgid ""
 "Unable to create or write to the new temporary directory.\n"
@@ -7310,7 +7324,7 @@
 "The directory will not be changed now.\n"
 msgstr ""
 
-#: src/preferences.c:798
+#: src/preferences.c:856
 msgid ""
 "You have chosen to change the temporary directory.\n"
 "Please make sure you have no other copies of LiVES open.\n"
@@ -7330,7 +7344,7 @@
 "Ou aperte 'Cancelar' para restaurar o diretório temp para sua configuração "
 "original."
 
-#: src/preferences.c:1169
+#: src/preferences.c:1221
 msgid ""
 "\n"
 "Unable to switch audio players to jack - jackd must be installed first.\n"
@@ -7341,7 +7355,7 @@
 "primeiro.\n"
 "Veja http://jackaudio.org\n"
 
-#: src/preferences.c:1175
+#: src/preferences.c:1226
 msgid ""
 "\n"
 "Switching audio players requires restart (jackd must not be running)\n"
@@ -7349,7 +7363,7 @@
 "\n"
 "Trocar tocador de áudio requer reiniciar (jackd não deve estar rodando)\n"
 
-#: src/preferences.c:1202
+#: src/preferences.c:1253
 msgid ""
 "\n"
 "Unable to switch audio players to pulse audio\n"
@@ -7357,404 +7371,404 @@
 "See http://www.pulseaudio.org\n"
 msgstr ""
 
-#: src/preferences.c:1502
+#: src/preferences.c:1544
 msgid "PCM (highest quality; largest files)"
 msgstr "PCM (qualidade melhor; arquivos maiores)"
 
-#: src/preferences.c:2063
+#: src/preferences.c:2096
 msgid "LiVES: - Preferences"
 msgstr "LiVES: - Preferências"
 
-#: src/preferences.c:2142
+#: src/preferences.c:2177
 msgid "Open file selection maximised"
 msgstr "Abrir janela de seleção de arquivos maximizada"
 
-#: src/preferences.c:2149
+#: src/preferences.c:2184
 msgid "Show recent files in the File menu"
 msgstr "Mostrar arquivos recentes no menu 'Arquivo'"
 
-#: src/preferences.c:2158
+#: src/preferences.c:2193
 msgid "Stop screensaver on playback    "
 msgstr "Parar screensaver quando tocando    "
 
-#: src/preferences.c:2165
+#: src/preferences.c:2200
 msgid "Open main window maximised"
 msgstr "Abrir janela principal maximizada"
 
-#: src/preferences.c:2173
+#: src/preferences.c:2208
 msgid "Show toolbar when background is blanked"
 msgstr "Mostrar barra de ferramentas quando o fundo estiver limpo"
 
-#: src/preferences.c:2181
+#: src/preferences.c:2216
 msgid "Allow mouse wheel to switch clips"
 msgstr ""
 
-#: src/preferences.c:2192
+#: src/preferences.c:2227
 msgid "Shrink previews to fit in interface"
 msgstr ""
 
-#: src/preferences.c:2202
+#: src/preferences.c:2237
 msgid "Startup mode:"
 msgstr ""
 
-#: src/preferences.c:2206
+#: src/preferences.c:2241
 msgid "_Clip editor"
 msgstr ""
 
-#: src/preferences.c:2210
+#: src/preferences.c:2245
 msgid "_Multitrack mode"
 msgstr ""
 
-#: src/preferences.c:2234
+#: src/preferences.c:2268
 msgid "Multi-head support"
 msgstr "Suporte multi-head"
 
-#: src/preferences.c:2242
+#: src/preferences.c:2276
 msgid " monitor number for LiVES interface"
 msgstr " número do monitor para a interface do LiVES"
 
-#: src/preferences.c:2248
+#: src/preferences.c:2282
 msgid " monitor number for playback"
 msgstr " número do monitor para execução"
 
-#: src/preferences.c:2260
+#: src/preferences.c:2294
 msgid ""
 "A setting of 0 means use all available monitors (only works with some "
 "playback plugins)."
 msgstr ""
 
-#: src/preferences.c:2270
+#: src/preferences.c:2304
 msgid "Force single monitor"
 msgstr "Forçar monitor único"
 
-#: src/preferences.c:2271
+#: src/preferences.c:2305
 msgid "Ignore all except the first monitor."
 msgstr ""
 
-#: src/preferences.c:2293
+#: src/preferences.c:2327
 msgid "Show clip thumbnails during playback"
 msgstr ""
 
-#: src/preferences.c:2306
+#: src/preferences.c:2340
 msgid "GUI"
 msgstr "GUI"
 
-#: src/preferences.c:2321
+#: src/preferences.c:2355
 msgid "When entering Multitrack mode:"
 msgstr "Quando entrando no modo multipista"
 
-#: src/preferences.c:2330
+#: src/preferences.c:2364
 msgid "_Prompt me for width, height, fps and audio settings"
 msgstr "_Pergunte-me por configurações de largura, altura, FPS e de áudio"
 
-#: src/preferences.c:2336
+#: src/preferences.c:2370
 msgid "_Always use the following values:"
 msgstr "Sempre use os seguintes v_alores:"
 
-#: src/preferences.c:2345
+#: src/preferences.c:2379
 msgid "Use these same _values for rendering a new clip"
 msgstr "Use os mesmos _valores para renderizar um novo clip"
 
-#: src/preferences.c:2370
+#: src/preferences.c:2404
 msgid "_Width           "
 msgstr "Largura [_W]           "
 
-#: src/preferences.c:2375
+#: src/preferences.c:2409
 msgid "          _Height      "
 msgstr "          Altura [_H]      "
 
-#: src/preferences.c:2379
+#: src/preferences.c:2413
 msgid "          _FPS"
 msgstr ""
 
-#: src/preferences.c:2387
+#: src/preferences.c:2421
 msgid "Enable backing audio track"
 msgstr "Habilitar faixa do áudio de fundo"
 
-#: src/preferences.c:2394
+#: src/preferences.c:2428
 msgid "Audio track per video track"
 msgstr "Trilha de áudio por trilha de vídeo"
 
-#: src/preferences.c:2423
+#: src/preferences.c:2457
 msgid "    _Undo buffer size (MB)    "
 msgstr "    Tamanho do b_uffer de desfazer (MB)    "
 
-#: src/preferences.c:2432
+#: src/preferences.c:2466
 msgid "_Exit multitrack mode after rendering"
 msgstr "Sair do modo multipista depois d_e renderizar"
 
-#: src/preferences.c:2440
+#: src/preferences.c:2474
 msgid "Auto backup layouts"
 msgstr ""
 
-#: src/preferences.c:2445
+#: src/preferences.c:2479
 msgid "_Every"
 msgstr "_Cada"
 
-#: src/preferences.c:2453
+#: src/preferences.c:2487
 msgid "seconds"
 msgstr "segundos"
 
-#: src/preferences.c:2461
+#: src/preferences.c:2495
 msgid "After every _change"
 msgstr "Depois de _cada mudança"
 
-#: src/preferences.c:2467
+#: src/preferences.c:2501
 msgid "_Never"
 msgstr "_Nunca"
 
-#: src/preferences.c:2490
+#: src/preferences.c:2523
 msgid "Multitrack/Render"
 msgstr "Multipista/Renderizar"
 
-#: src/preferences.c:2508
+#: src/preferences.c:2541
 msgid "Use instant opening when possible"
 msgstr "Use abertura imediata quando possível"
 
-#: src/preferences.c:2509
+#: src/preferences.c:2543
 msgid "Enable instant opening of some file types using decoder plugins"
 msgstr ""
 "Ativar abertura imediata de alguns tipos de arquivo usando plugins de "
 "decodificação"
 
-#: src/preferences.c:2531
+#: src/preferences.c:2567
 msgid "Video open command (fallback)"
 msgstr ""
 
-#: src/preferences.c:2543
+#: src/preferences.c:2579
 msgid "Open/render compression"
 msgstr ""
 
-#: src/preferences.c:2546
+#: src/preferences.c:2582
 msgid " %     ( lower = slower, larger files; for jpeg, higher quality )"
 msgstr ""
 " %     ( mais baixo = arquivos maiores e mais lentos; para jpeg, melhor "
 "qualidade )"
 
-#: src/preferences.c:2558
+#: src/preferences.c:2594
 msgid "Default image format"
 msgstr ""
 
-#: src/preferences.c:2562
+#: src/preferences.c:2598
 msgid "_jpeg"
 msgstr "_jpeg"
 
-#: src/preferences.c:2565
+#: src/preferences.c:2601
 msgid "_png"
 msgstr "_png"
 
-#: src/preferences.c:2572
+#: src/preferences.c:2608
 msgid "(Check Help/Troubleshoot to see which image formats are supported)"
 msgstr ""
 
-#: src/preferences.c:2580
+#: src/preferences.c:2616
 msgid "Enable automatic deinterlacing when possible"
 msgstr "Ativar desinterlaçamento automático quando possível"
 
-#: src/preferences.c:2582
+#: src/preferences.c:2619
 msgid "Automatically deinterlace frames when a plugin suggests it"
 msgstr "Desinterlaça automaticamente frames quando um plugin o sugerir"
 
-#: src/preferences.c:2593
+#: src/preferences.c:2632
 #, fuzzy
 msgid "Automatic trimming / padding of audio when possible"
 msgstr "Ativar desinterlaçamento automático quando possível"
 
-#: src/preferences.c:2595
+#: src/preferences.c:2634
 #, fuzzy
 msgid "Automatically trim or pad audio when a plugin suggests it"
 msgstr "Desinterlaça automaticamente frames quando um plugin o sugerir"
 
-#: src/preferences.c:2606
+#: src/preferences.c:2646
 msgid "Ignore blank borders when possible"
 msgstr ""
 
-#: src/preferences.c:2608
+#: src/preferences.c:2648
 msgid "Clip any blank borders from frames where possible"
 msgstr ""
 
-#: src/preferences.c:2619
+#: src/preferences.c:2660
 msgid "When opening multiple files, concatenate images into one clip"
 msgstr "Quando abrir múltiplos arquivos, concatene as imagens em um clip"
 
-#: src/preferences.c:2629
+#: src/preferences.c:2670
 msgid "Decoding"
 msgstr "Decodificação"
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:2652
+#: src/preferences.c:2693
 msgid "Low - can improve performance on slower machines"
 msgstr "Baixo - pode melhorar a performance em computadores mais lentos"
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:2654
+#: src/preferences.c:2695
 msgid "Normal - recommended for most users"
 msgstr "Normal - recomendado para a maioria dos usuários"
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:2656
+#: src/preferences.c:2697
 msgid "High - can improve quality on very fast machines"
 msgstr "Alto - pode melhorar a qualidade em computadores muito rápidos"
 
-#: src/preferences.c:2659
+#: src/preferences.c:2700
 msgid "Preview _quality"
 msgstr "_Qualidade de Visualização"
 
-#: src/preferences.c:2660
+#: src/preferences.c:2701
 msgid "The preview quality for video playback - affects resizing"
 msgstr ""
 "A qualidade da pré-visualização da execução de vídeo - afeta o "
 "redimensionamento"
 
-#: src/preferences.c:2675
+#: src/preferences.c:2717
 msgid "_Show FPS statistics"
 msgstr "_Mostrar estatísticas de FPS"
 
-#: src/preferences.c:2694
+#: src/preferences.c:2736
 msgid "_Plugin"
 msgstr "_Plugin"
 
-#: src/preferences.c:2718
+#: src/preferences.c:2760
 msgid "Stream audio"
 msgstr ""
 
-#: src/preferences.c:2721
+#: src/preferences.c:2763
 msgid "Stream audio to playback plugin"
 msgstr ""
 
-#: src/preferences.c:2734
+#: src/preferences.c:2778
 msgid "Record player output"
 msgstr ""
 
-#: src/preferences.c:2737
+#: src/preferences.c:2781
 msgid "Record output from player instead of input to player"
 msgstr ""
 
-#: src/preferences.c:2744
+#: src/preferences.c:2789
 msgid "VIDEO"
 msgstr "VÍDEO"
 
-#: src/preferences.c:2787
+#: src/preferences.c:2833
 msgid "_Player"
 msgstr "Tocador [_P]"
 
-#: src/preferences.c:2792
+#: src/preferences.c:2838
 msgid "(See also the Jack Integration tab for jack startup options)"
 msgstr ""
 
-#: src/preferences.c:2819
+#: src/preferences.c:2865
 msgid "mplayer"
 msgstr "mplayer"
 
-#: src/preferences.c:2830
+#: src/preferences.c:2876
 #, fuzzy
 msgid "mplayer2"
 msgstr "mplayer"
 
-#: src/preferences.c:2833
+#: src/preferences.c:2879
 msgid "Audio play _command"
 msgstr "_Comando para tocar áudio"
 
-#: src/preferences.c:2840
+#: src/preferences.c:2886
 msgid "- internal -"
 msgstr "- interno -"
 
-#: src/preferences.c:2849
+#: src/preferences.c:2895
 msgid "Audio follows video _rate/direction"
 msgstr "Áudio segue a velocidade/di_reção de vídeo"
 
-#: src/preferences.c:2857
+#: src/preferences.c:2903
 msgid "Audio follows _clip switches"
 msgstr "Áudio segue as mudanças de _clipe"
 
-#: src/preferences.c:2864
+#: src/preferences.c:2910
 msgid "Source:"
 msgstr ""
 
-#: src/preferences.c:2868
+#: src/preferences.c:2914
 msgid "_Internal"
 msgstr ""
 
-#: src/preferences.c:2873
+#: src/preferences.c:2919
 msgid "_External (requires jack or pulse audio player)"
 msgstr ""
 
-#: src/preferences.c:2892
+#: src/preferences.c:2940
 msgid "AUDIO"
 msgstr "ÁUDIO"
 
-#: src/preferences.c:2902
+#: src/preferences.c:2950
 msgid "Playback"
 msgstr "Execução"
 
-#: src/preferences.c:2925
+#: src/preferences.c:2973
 msgid ""
 "Record audio when capturing an e_xternal window\n"
 " (requires jack or pulse audio)"
 msgstr ""
 
-#: src/preferences.c:2940
+#: src/preferences.c:2988
 msgid "      What to record when 'r' is pressed   "
 msgstr "      O que gravar quando 'r' for pressionado   "
 
-#: src/preferences.c:2949
+#: src/preferences.c:2997
 msgid "_Frame changes"
 msgstr "Mudanças de _frame"
 
-#: src/preferences.c:2964
+#: src/preferences.c:3012
 msgid "F_PS changes"
 msgstr "Mudanças de F_PS"
 
-#: src/preferences.c:2982
+#: src/preferences.c:3030
 msgid "_Real time effects"
 msgstr "_Efeitos em tempo real"
 
-#: src/preferences.c:2993
+#: src/preferences.c:3041
 msgid "_Clip switches"
 msgstr ""
 
-#: src/preferences.c:3004
+#: src/preferences.c:3052
 msgid "_Audio (requires jack or pulse audio player)"
 msgstr ""
 
-#: src/preferences.c:3024
+#: src/preferences.c:3072
 msgid "Pause recording if free disk space falls below"
 msgstr ""
 
 #. TRANSLATORS: gigabytes
-#: src/preferences.c:3030
+#: src/preferences.c:3078
 msgid "GB"
 msgstr "GB"
 
-#: src/preferences.c:3037
+#: src/preferences.c:3085
 msgid "Recording"
 msgstr "Gravando"
 
-#: src/preferences.c:3055
+#: src/preferences.c:3103
 msgid "Encoder"
 msgstr ""
 
-#: src/preferences.c:3090
+#: src/preferences.c:3137
 msgid "Output format"
 msgstr "Formato de saída"
 
-#: src/preferences.c:3106
+#: src/preferences.c:3153
 msgid "Audio codec"
 msgstr "Codec de áudio"
 
-#: src/preferences.c:3119
+#: src/preferences.c:3165
 msgid "Encoding"
 msgstr "Codificação"
 
-#: src/preferences.c:3134
+#: src/preferences.c:3180
 msgid "Use _antialiasing when resizing"
 msgstr "Usar _antialiasing quando redimensionando"
 
-#: src/preferences.c:3143
+#: src/preferences.c:3189
 msgid "Number of _real time effect keys"
 msgstr "Numero de teclas para efeitos tempo real"
 
-#: src/preferences.c:3145
+#: src/preferences.c:3192
 msgid ""
 "The number of \"virtual\" real time effect keys. They can be controlled "
 "through the real time effects window, or via network (OSC)."
@@ -7762,96 +7776,96 @@
 "O número de teclas de efeito em tempo real \"virtuais\". Podem ser "
 "controladas através da janela de efeitos em tempo real, ou via rede (OSC)."
 
-#: src/preferences.c:3152
+#: src/preferences.c:3199
 msgid "Use _threads where possible when applying effects"
 msgstr ""
 
-#: src/preferences.c:3159
+#: src/preferences.c:3207
 msgid "Number of _threads"
 msgstr ""
 
-#: src/preferences.c:3172
+#: src/preferences.c:3221
 msgid "Restart is required if any of the following paths are changed:"
 msgstr ""
 
-#: src/preferences.c:3182
+#: src/preferences.c:3231
 msgid "Weed plugin path"
 msgstr ""
 
-#: src/preferences.c:3184
+#: src/preferences.c:3234
 msgid "Frei0r plugin path"
 msgstr ""
 
-#: src/preferences.c:3186
+#: src/preferences.c:3237
 msgid "LADSPA plugin path"
 msgstr ""
 
-#: src/preferences.c:3209
+#: src/preferences.c:3261
 msgid "      Video load directory (default)      "
 msgstr "      Diretório de vídeo a ser carregado (padrão)      "
 
-#: src/preferences.c:3215
+#: src/preferences.c:3267
 msgid "      Video save directory (default) "
 msgstr "      Diretório de salvar vídeo (padrão) "
 
-#: src/preferences.c:3221
+#: src/preferences.c:3273
 msgid "      Audio load directory (default) "
 msgstr "      Diretório de áudio a ser carregado (padrão) "
 
-#: src/preferences.c:3227
+#: src/preferences.c:3279
 msgid "      Image directory (default) "
 msgstr "      Diretório de imagens (padrão) "
 
-#: src/preferences.c:3233
+#: src/preferences.c:3285
 msgid "      Backup/Restore directory (default) "
 msgstr "      Diretório de Backup/Restauração (padrão) "
 
-#: src/preferences.c:3239
+#: src/preferences.c:3291
 msgid "      Temp directory (do not remove) "
 msgstr "      Diretório temp (não remova) "
 
-#: src/preferences.c:3252
+#: src/preferences.c:3304
 msgid "The default directory for loading video clips from"
 msgstr "O diretório padrão de onde carregar vídeos"
 
-#: src/preferences.c:3277
+#: src/preferences.c:3329
 msgid "The default directory for saving encoded clips to"
 msgstr "O diretório padrão onde salvar vídeos codificados"
 
-#: src/preferences.c:3285
+#: src/preferences.c:3337
 msgid "The default directory for loading and saving audio"
 msgstr "O diretório padrão para carregar e salvar áudio"
 
-#: src/preferences.c:3293
+#: src/preferences.c:3345
 msgid "The default directory for saving frameshots to"
 msgstr "O diretório padrão para salvar amostras de frames"
 
-#: src/preferences.c:3301
+#: src/preferences.c:3353
 msgid "The default directory for backing up/restoring single clips"
 msgstr ""
 "O diretório padrão para fazer backup e restauração de clipes individuais"
 
-#: src/preferences.c:3309
+#: src/preferences.c:3361
 msgid "LiVES working directory."
 msgstr "diretório de trabalho do LiVES."
 
-#: src/preferences.c:3359
+#: src/preferences.c:3412
 msgid "Directories"
 msgstr "Diretórios"
 
-#: src/preferences.c:3374
+#: src/preferences.c:3427
 msgid "Warn if diskspace falls below: "
 msgstr ""
 
-#: src/preferences.c:3380 src/preferences.c:3394
+#: src/preferences.c:3433 src/preferences.c:3447
 msgid " MB [set to 0 to disable]"
 msgstr ""
 
-#: src/preferences.c:3389
+#: src/preferences.c:3442
 msgid "Diskspace critical level: "
 msgstr ""
 
-#: src/preferences.c:3407
+#: src/preferences.c:3461
 msgid ""
 "Warn on Insert / Merge if _frame rate of clipboard does not match frame rate "
 "of selection"
@@ -7859,196 +7873,196 @@
 "Avisar ao Inserir/Mesclar se o _framerate da área de transferência não for "
 "igual ao da seleção"
 
-#: src/preferences.c:3417
+#: src/preferences.c:3471
 msgid "Warn on Open if file _size exceeds "
 msgstr "Avisar ao abrir arquivos de tamanho _superior a "
 
-#: src/preferences.c:3425
+#: src/preferences.c:3479
 msgid " MB"
 msgstr " MB"
 
-#: src/preferences.c:3432
+#: src/preferences.c:3486
 msgid "Show a warning before saving a se_t"
 msgstr "Mostrar um aviso antes de salvar um se_t"
 
-#: src/preferences.c:3442
+#: src/preferences.c:3496
 msgid ""
 "Show a warning if _mplayer/mplayer2, sox, composite or convert is not found "
 "when LiVES is started."
 msgstr ""
 
-#: src/preferences.c:3452
+#: src/preferences.c:3506
 msgid "Show a warning if no _rendered effects are found at startup."
 msgstr ""
 "Mostrar um aviso se nenhum efeito _renderizado for encontrado na "
 "inicialização."
 
-#: src/preferences.c:3464
+#: src/preferences.c:3518
 msgid "Show a warning if no _encoder plugins are found at startup."
 msgstr "Avisar se o  _mplayer não for encontrado quando o LiVES abrir."
 
-#: src/preferences.c:3474
+#: src/preferences.c:3528
 msgid "Show a warning if a _duplicate set name is entered."
 msgstr "Avisar se um nome de set _duplicado for digitado."
 
-#: src/preferences.c:3485
+#: src/preferences.c:3539
 msgid "When a set is loaded, warn if clips are missing from _layouts."
 msgstr ""
 "Quando um set é carregado, avise se clipes estiverem faltando dos _layouts."
 
-#: src/preferences.c:3495
+#: src/preferences.c:3550
 msgid "Warn if a clip used in a layout is about to be closed."
 msgstr "Avise se um clipe usado em um layout está para ser fechado."
 
-#: src/preferences.c:3505
+#: src/preferences.c:3561
 msgid "Warn if frames used in a layout are about to be deleted."
 msgstr "Avise se frames usados em um layout estão perto de serem deletados."
 
-#: src/preferences.c:3515
+#: src/preferences.c:3572
 msgid "Warn if frames used in a layout are about to be shifted."
 msgstr "Avise se frames usados em um layout estão perto de serem movidos."
 
-#: src/preferences.c:3525
+#: src/preferences.c:3583
 msgid "Warn if frames used in a layout are about to be altered."
 msgstr "Avise se fames usados em um layout estão perto de serem alterados."
 
-#: src/preferences.c:3535
+#: src/preferences.c:3594
 msgid "Warn if audio used in a layout is about to be deleted."
 msgstr "Avise se áudio usado em um layout está perto de ser deletado."
 
-#: src/preferences.c:3546
+#: src/preferences.c:3606
 msgid "Warn if audio used in a layout is about to be shifted."
 msgstr "Avise se áudio usado em um layout está perto de ser movido."
 
-#: src/preferences.c:3556
+#: src/preferences.c:3617
 msgid "Warn if audio used in a layout is about to be altered."
 msgstr "Avise se áudio usado em um layout está perto de ser alterado."
 
-#: src/preferences.c:3566
+#: src/preferences.c:3628
 msgid "Popup layout errors after clip changes."
 msgstr ""
 
-#: src/preferences.c:3577
+#: src/preferences.c:3639
 msgid "Warn if the layout has not been saved when leaving multitrack mode."
 msgstr "Avise se um layout não estiver salvo ao sair do modo multipista."
 
-#: src/preferences.c:3588
+#: src/preferences.c:3650
 msgid ""
 "Warn if multitrack has no audio channels, and a layout with audio is loaded."
 msgstr ""
 "Avisar se multipista não tem canais de áudio e o layout com áudio está "
 "carregado."
 
-#: src/preferences.c:3598
+#: src/preferences.c:3660
 msgid ""
 "Warn if multitrack has audio channels, and your audio player is not \"jack\" "
 "or \"pulse audio\"."
 msgstr ""
 
-#: src/preferences.c:3610
+#: src/preferences.c:3672
 msgid "Show info message after importing from firewire device."
 msgstr ""
 "Mostrar mensagem de informação depois de importar de dispositivo firewire."
 
-#: src/preferences.c:3626
+#: src/preferences.c:3688
 msgid "Show a warning before opening a yuv4mpeg stream (advanced)."
 msgstr "Mostrar um aviso antes de abrir um stream yuv4mpeg (avançado)."
 
-#: src/preferences.c:3639
+#: src/preferences.c:3701
 msgid "Show a warning when multitrack is low on backup space."
 msgstr ""
 "Mostrar um aviso quando houver pouco espaço em disco no modo multipista."
 
-#: src/preferences.c:3650
+#: src/preferences.c:3713
 msgid "Show a warning advising cleaning of disk space after a crash."
 msgstr ""
 
-#: src/preferences.c:3661
+#: src/preferences.c:3725
 msgid "Show a warning if unable to connect to pulseaudio player."
 msgstr ""
 
-#: src/preferences.c:3673
+#: src/preferences.c:3737
 #, fuzzy
 msgid "Show a warning before wiping a layout which has unsaved changes."
 msgstr "Mostrar um aviso antes de abrir um stream yuv4mpeg (avançado)."
 
-#: src/preferences.c:3685
+#: src/preferences.c:3749
 msgid "Warnings"
 msgstr "Avisos"
 
-#: src/preferences.c:3703
+#: src/preferences.c:3767
 msgid "Midi synch (requires the files midistart and midistop)"
 msgstr "Sincronia MIDI (requer os arquivos midistart e midistop)"
 
-#: src/preferences.c:3715
+#: src/preferences.c:3779
 msgid "When inserting/merging frames:  "
 msgstr "Quando inserindo/mesclando frames:  "
 
-#: src/preferences.c:3719
+#: src/preferences.c:3783
 msgid "_Speed Up/Slow Down Insertion"
 msgstr "Aumentar/Diminuir Velocidade da In_serção"
 
-#: src/preferences.c:3723
+#: src/preferences.c:3787
 msgid "_Resample Insertion"
 msgstr "_Resamplear Inserção"
 
-#: src/preferences.c:3730
+#: src/preferences.c:3794
 msgid "CD device           "
 msgstr "Dispositivo de CD           "
 
-#: src/preferences.c:3733
+#: src/preferences.c:3797
 msgid "LiVES can load audio tracks from this CD"
 msgstr "LiVES pode carregar faixas de áudio deste CD"
 
-#: src/preferences.c:3746
+#: src/preferences.c:3813
 msgid "Default FPS        "
 msgstr "FPS padrão        "
 
-#: src/preferences.c:3749
+#: src/preferences.c:3816
 msgid "Frames per second to use when none is specified"
 msgstr "Frames por segundo para usar se nenhum for especificado"
 
-#: src/preferences.c:3757
+#: src/preferences.c:3825
 msgid "Misc"
 msgstr "Misc"
 
-#: src/preferences.c:3782
+#: src/preferences.c:3850
 msgid "New theme:           "
 msgstr "Novo tema:           "
 
-#: src/preferences.c:3800
+#: src/preferences.c:3867
 msgid "Themes"
 msgstr "Temas"
 
-#: src/preferences.c:3815
+#: src/preferences.c:3882
 msgid "Download bandwidth (Kb/s)       "
 msgstr "Velocidade de download (Kb/s)       "
 
-#: src/preferences.c:3823
+#: src/preferences.c:3890
 msgid "LiVES must be compiled without \"configure --disable-OSC\" to use OMC"
 msgstr "LiVES deve ser compilado sem \"configure --disable-OSC\" para usar OMC"
 
-#: src/preferences.c:3833
+#: src/preferences.c:3900
 msgid "OMC remote control enabled"
 msgstr "Controle remoto OMC ativado"
 
-#: src/preferences.c:3841
+#: src/preferences.c:3908
 msgid "UDP port       "
 msgstr "Porta UDP       "
 
-#: src/preferences.c:3850
+#: src/preferences.c:3917
 msgid "Start OMC on startup"
 msgstr "Iniciar OMC ao abrir"
 
-#: src/preferences.c:3870
+#: src/preferences.c:3937
 msgid "Streaming/Networking"
 msgstr "Streaming/Networking"
 
-#: src/preferences.c:3882
+#: src/preferences.c:3949
 msgid "Jack transport"
 msgstr "Transporte"
 
-#: src/preferences.c:3886
+#: src/preferences.c:3953
 msgid ""
 "LiVES must be compiled with jack/transport.h and jack/jack.h present to use "
 "jack transport"
@@ -8056,44 +8070,44 @@
 "LiVES deve ser compilado com jack/transport.h e jack/jack.h presentes para "
 "usar transporte jack"
 
-#: src/preferences.c:3892
+#: src/preferences.c:3959
 msgid "Jack _transport config file"
 msgstr "Arquivo de configuração do _transporte jack"
 
-#: src/preferences.c:3899 src/preferences.c:3989
+#: src/preferences.c:3967 src/preferences.c:4058
 msgid "Start _server on LiVES startup"
 msgstr "Iniciar _servidor junto com o LiVES"
 
-#: src/preferences.c:3911
+#: src/preferences.c:3979
 msgid "Jack transport _master (start and stop)"
 msgstr ""
 
-#: src/preferences.c:3921
+#: src/preferences.c:3989
 msgid "Jack transport _client (start and stop)"
 msgstr ""
 
-#: src/preferences.c:3935
+#: src/preferences.c:4003
 msgid "Jack transport sets start position"
 msgstr ""
 
-#: src/preferences.c:3952
+#: src/preferences.c:4020
 msgid "Jack transport timebase slave"
 msgstr ""
 
-#: src/preferences.c:3963
+#: src/preferences.c:4031
 msgid "(See also Playback -> Audio follows video rate/direction)"
 msgstr ""
 
-#: src/preferences.c:3971
+#: src/preferences.c:4039
 msgid "Jack audio"
 msgstr "Áudio"
 
-#: src/preferences.c:3975
+#: src/preferences.c:4043
 msgid "LiVES must be compiled with jack/jack.h present to use jack audio"
 msgstr ""
 "LiVES deve ser compilado com jack/jack.h presente para usar áudio do jack"
 
-#: src/preferences.c:3978
+#: src/preferences.c:4046
 msgid ""
 "You MUST set the audio player to \"jack\" in the Playback tab to use jack "
 "audio"
@@ -8101,99 +8115,99 @@
 "Você DEVE escolher o tocador de áudio \"jack\" na aba Execução para usar "
 "áudio do jack"
 
-#: src/preferences.c:3984
+#: src/preferences.c:4052
 msgid "Jack _audio server config file"
 msgstr "_Arquivo de configuração do servidor de áudio jack"
 
-#: src/preferences.c:3996
+#: src/preferences.c:4065
 msgid "Play audio even when transport is _paused"
 msgstr ""
 
-#: src/preferences.c:4008
+#: src/preferences.c:4077
 msgid "Automatically connect to System Out ports when 'playing' External Audio"
 msgstr ""
 
-#: src/preferences.c:4021
+#: src/preferences.c:4090
 msgid "Jack Integration"
 msgstr "Integração com jack"
 
-#: src/preferences.c:4035
+#: src/preferences.c:4104
 msgid "Events to respond to:"
 msgstr "Responder aos eventos:"
 
-#: src/preferences.c:4044
+#: src/preferences.c:4113
 msgid "_Joystick events"
 msgstr "_Eventos de Joystick"
 
-#: src/preferences.c:4051
+#: src/preferences.c:4120
 msgid "_Joystick device"
 msgstr "_Dispositivo de Joystick"
 
-#: src/preferences.c:4053
+#: src/preferences.c:4122
 msgid "The joystick device, e.g. /dev/input/js0"
 msgstr "O dispositivo de joystick, ex: /dev/input/js0"
 
-#: src/preferences.c:4071
+#: src/preferences.c:4142
 msgid "_MIDI events"
 msgstr "_Eventos MIDI"
 
-#: src/preferences.c:4080
+#: src/preferences.c:4151
 msgid "Use _ALSA MIDI (recommended)"
 msgstr "Usar _ALSA MIDI (recomendado)"
 
-#: src/preferences.c:4082
+#: src/preferences.c:4153
 msgid "Create an ALSA MIDI port which other MIDI devices can be connected to"
 msgstr ""
 "Criar uma porta ALSA MIDI na qual outros dispositivos MIDI possam ser "
 "conectados"
 
-#: src/preferences.c:4090
+#: src/preferences.c:4162
 msgid "Use _raw MIDI"
 msgstr ""
 
-#: src/preferences.c:4092
+#: src/preferences.c:4164
 msgid "Read directly from the MIDI device"
 msgstr "Ler directamente do dispositivo de MIDI"
 
-#: src/preferences.c:4104
+#: src/preferences.c:4177
 msgid "_MIDI device"
 msgstr "_Dispositivo de MIDI"
 
-#: src/preferences.c:4106
+#: src/preferences.c:4179
 msgid "The MIDI device, e.g. /dev/input/midi0"
 msgstr "O dispositivo de MIDI, ex: /dev/input/midi0"
 
-#: src/preferences.c:4118
+#: src/preferences.c:4193
 msgid "Advanced"
 msgstr "Avançado"
 
-#: src/preferences.c:4124
+#: src/preferences.c:4199
 msgid "MIDI check _rate"
 msgstr ""
 
-#: src/preferences.c:4127
+#: src/preferences.c:4203
 msgid ""
 "Number of MIDI checks per keyboard tick. Increasing this may improve MIDI "
 "responsiveness, but may slow down playback."
 msgstr ""
 
-#: src/preferences.c:4134
+#: src/preferences.c:4211
 msgid "MIDI repeat"
 msgstr "Repetição MIDI"
 
-#: src/preferences.c:4137
+#: src/preferences.c:4214
 msgid "Number of non-reads allowed between succesive reads."
 msgstr ""
 
-#: src/preferences.c:4140
+#: src/preferences.c:4218
 msgid "(Warning: setting this value too high can slow down playback.)"
 msgstr ""
 
-#: src/preferences.c:4159
+#: src/preferences.c:4237
 msgid "MIDI/Joystick learner"
 msgstr ""
 
-#: src/preferences.c:4499
+#: src/preferences.c:4679
 msgid ""
 "\n"
 "LiVES will now shut down. You need to restart it for the directory change to "
@@ -8205,70 +8219,70 @@
 "diretório tenha efeito.\n"
 "Clique OK para continuar.\n"
 
-#: src/preferences.c:4523
+#: src/preferences.c:4703
 msgid ""
 "For the directory change to take effect LiVES will restart when preferences "
 "dialog closes."
 msgstr ""
 
-#: src/preferences.c:4527
+#: src/preferences.c:4707
 msgid "Theme changes will not take effect until the next time you start LiVES."
 msgstr ""
 "Mudanças de tema só surtirão efeito na próxima vez que o LiVES foi iniciado."
 
-#: src/preferences.c:4531
+#: src/preferences.c:4711
 msgid "Jack options will not take effect until the next time you start LiVES."
 msgstr ""
 "As opções do jack só surtirão efeito da próxima vez que o LiVES for iniciado."
 
-#: src/osc.c:2585
+#: src/osc.c:2616
 #, c-format
 msgid "Syncing to external framerate of %.8f frames per second.\n"
 msgstr "Sincronizando ao framerate externo de %.8f FPS.\n"
 
-#: src/osc.c:6746
+#: src/osc.c:6938
 msgid "Cannot initialize OSC receiver\n"
 msgstr "Impossível inicializar receptor OSC\n"
 
-#: src/osc.c:6770
+#: src/osc.c:6961
 #, c-format
 msgid "WARNING: Cannot start OSC server at UDP port %d\n"
 msgstr "AVISO: Não foi possível iniciar o servidor OSC na porta UDP %d\n"
 
-#: src/osc.c:6775
+#: src/osc.c:6963
 #, c-format
 msgid "Started OSC server at UDP port %d\n"
 msgstr "Servidor OSC iniciado na porta UDP %d\n"
 
-#: src/osc.c:6890
+#: src/osc.c:7076
 #, c-format
 msgid "Cannot start OSC/UDP server at port %d \n"
 msgstr "Não foi possivel iniciar servidor OSC/UDP na porta %d \n"
 
-#: src/resample.c:125 src/resample.c:304
+#: src/resample.c:131 src/resample.c:305
 #, c-format
 msgid "Resizing frames 1 to %d"
 msgstr "Redimensionando frames 1 até %d"
 
-#: src/resample.c:140 src/resample.c:318
+#: src/resample.c:145 src/resample.c:318
 #, c-format
 msgid "Resizing/letterboxing frames 1 to %d"
 msgstr ""
 
-#: src/resample.c:361 src/resample.c:385
+#: src/resample.c:360 src/resample.c:384
 msgid "Resize"
 msgstr "Redimensionar"
 
-#: src/resample.c:395
+#: src/resample.c:394
 msgid "Resample/Resize"
 msgstr "Resamplear/Redimensionar"
 
-#: src/resample.c:680
+#: src/resample.c:676
 #, c-format
 msgid "Length of video is now %d frames.\n"
 msgstr "Comprimento do vídeo é agora de %d frames.\n"
 
-#: src/resample.c:745
+#: src/resample.c:737
 msgid ""
 "\n"
 "\n"
@@ -8278,146 +8292,146 @@
 "\n"
 "A nova taxa deve ser maior que 0\n"
 
-#: src/resample.c:797 src/resample.c:813
+#: src/resample.c:788 src/resample.c:803
 msgid "Resampling audio"
 msgstr "Resampleando áudio"
 
-#: src/resample.c:831
+#: src/resample.c:821
 msgid "LiVES was unable to resample the audio as requested.\n"
 msgstr "LiVES não conseguiu resamplear o áudio como requisitado.\n"
 
-#: src/resample.c:833 src/resample.c:837
+#: src/resample.c:823 src/resample.c:827
 msgid "Resample Audio"
 msgstr "Resamplear Áudio"
 
-#: src/resample.c:845
+#: src/resample.c:835
 #, c-format
 msgid "Audio was resampled to %d Hz, %d channels, %d bit"
 msgstr "Áudio resampleado a %d Hz, %d canais, %d bit"
 
-#: src/resample.c:1034
+#: src/resample.c:1016
 #, c-format
 msgid "Resampling video at %.8f frames per second..."
 msgstr "Resampleando vídeo a %.8f frames por segundo..."
 
-#: src/resample.c:1037
+#: src/resample.c:1018
 #, c-format
 msgid "Resampling video at %.3f frames per second..."
 msgstr "Resampleando vídeo a %.3f frames por segundo..."
 
-#: src/resample.c:1068
+#: src/resample.c:1049
 msgid "Reordering error !\n"
 msgstr "Erro de reordenação!\n"
 
-#: src/resample.c:1079
+#: src/resample.c:1060
 msgid "Resample"
 msgstr "Resamplear"
 
-#: src/resample.c:1192
+#: src/resample.c:1173
 msgid "LiVES: - Resample Audio"
 msgstr "LiVES: - Resamplear Áudio"
 
-#: src/resample.c:1195
+#: src/resample.c:1175
 msgid "LiVES: - Insert Silence"
 msgstr "LiVES: - Inserir Silêncio"
 
-#: src/resample.c:1198
+#: src/resample.c:1177
 msgid "LiVES: - New Clip Audio"
 msgstr "LiVES: - Novo Clip de Áudio"
 
-#: src/resample.c:1201
+#: src/resample.c:1179
 msgid "LiVES: - External Clip Settings"
 msgstr "LiVES: - Configurações Externas de Clipe"
 
-#: src/resample.c:1238 src/resample.c:1358
+#: src/resample.c:1215 src/resample.c:1332
 msgid "Rate (Hz) "
 msgstr "Taxa (Hz) "
 
-#: src/resample.c:1245 src/resample.c:1372
+#: src/resample.c:1222 src/resample.c:1346
 msgid "Channels"
 msgstr ""
 
-#: src/resample.c:1252
+#: src/resample.c:1229
 msgid "Sample Size "
 msgstr ""
 
-#: src/resample.c:1268 src/resample.c:1425
+#: src/resample.c:1245 src/resample.c:1399
 msgid "Signed"
 msgstr ""
 
-#: src/resample.c:1274 src/resample.c:1435
+#: src/resample.c:1251 src/resample.c:1409
 msgid "Unsigned"
 msgstr "Não assinado"
 
-#: src/resample.c:1297 src/resample.c:1460
+#: src/resample.c:1273 src/resample.c:1433
 msgid "Little Endian"
 msgstr ""
 
-#: src/resample.c:1303 src/resample.c:1468
+#: src/resample.c:1279 src/resample.c:1441
 msgid "Big Endian"
 msgstr ""
 
-#: src/resample.c:1315
+#: src/resample.c:1290
 msgid "Current"
 msgstr "Atual"
 
-#: src/resample.c:1340
+#: src/resample.c:1315
 msgid "_Enable audio"
 msgstr "Habilitar áudio [_e]"
 
-#: src/resample.c:1372
+#: src/resample.c:1346
 msgid "_Channels"
 msgstr ""
 
-#: src/resample.c:1394
+#: src/resample.c:1368
 msgid "_Sample Size"
 msgstr ""
 
-#: src/resample.c:1394
+#: src/resample.c:1368
 msgid "Sample Size"
 msgstr ""
 
-#: src/resample.c:1489
+#: src/resample.c:1461
 msgid "New"
 msgstr "Novo"
 
-#: src/resample.c:1512
+#: src/resample.c:1484
 msgid "_Frames Per Second "
 msgstr "_Frames por segundo (FPS) "
 
-#: src/resample.c:1530
+#: src/resample.c:1502
 msgid "Record for maximum:  "
 msgstr "Gravar para máximo:  "
 
-#: src/resample.c:1533
+#: src/resample.c:1505
 msgid " hours  "
 msgstr " horass  "
 
-#: src/resample.c:1536
+#: src/resample.c:1508
 msgid " minutes  "
 msgstr " minutos  "
 
-#: src/resample.c:1538
+#: src/resample.c:1510
 msgid " seconds  "
 msgstr " segundos  "
 
-#: src/resample.c:1545
+#: src/resample.c:1517
 msgid "Unlimited"
 msgstr "Ilimitado"
 
-#: src/resample.c:1561
+#: src/resample.c:1533
 msgid "Click OK to begin recording, or Cancel to quit."
 msgstr "Clique OK para começar a gravar ou Cancelar para sair."
 
-#: src/resample.c:1670
+#: src/resample.c:1638
 msgid "LiVES: - Change playback speed"
 msgstr "Tocar"
 
-#: src/resample.c:1673
+#: src/resample.c:1640
 msgid "LiVES: - Resample Video"
 msgstr "LiVES: - Resamplear Vídeo"
 
-#: src/resample.c:1696
+#: src/resample.c:1663
 #, c-format
 msgid ""
 "\n"
@@ -8434,7 +8448,7 @@
 "Por favor digite o framerate desejado\n"
 "em _frames por segundo"
 
-#: src/resample.c:1701
+#: src/resample.c:1667
 #, c-format
 msgid ""
 "\n"
@@ -8451,15 +8465,15 @@
 "Por favor digite o framerate desejado para _resamplear\n"
 "em frames por segundo"
 
-#: src/resample.c:1723
+#: src/resample.c:1688
 msgid "OR enter the desired clip length in _seconds"
 msgstr "OU entre a duração do arquivo em _segundos"
 
-#: src/resample.c:1745
+#: src/resample.c:1710
 msgid "Change the _audio speed as well"
 msgstr "Mudar _a velocidade do áudio também"
 
-#: src/resample.c:1846
+#: src/resample.c:1810
 msgid ""
 "\n"
 "Speeding up the clip will cause missing frames in some multitrack layouts.\n"
@@ -8470,7 +8484,7 @@
 "layouts multipista.\n"
 "Tem certeza que quer mudar a velocidade?\n"
 
-#: src/resample.c:1863
+#: src/resample.c:1829
 msgid ""
 "\n"
 "Speeding up the clip will cause missing audio in some multitrack layouts.\n"
@@ -8481,47 +8495,47 @@
 "layouts multipista.\n"
 "Tem certeza que quer mudar a velocidade?\n"
 
-#: src/resample.c:1878
+#: src/resample.c:1847
 msgid ""
 "\n"
 "Changing the speed will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/resample.c:1892
+#: src/resample.c:1863
 msgid ""
 "\n"
 "Changing the speed will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/resample.c:1938
+#: src/resample.c:1911
 msgid "Speed Change"
 msgstr "Mudança de Velocidade"
 
-#: src/resample.c:1947
+#: src/resample.c:1920
 #, c-format
 msgid "Changed playback speed to %.3f frames per second and audio to %d Hz.\n"
 msgstr "Velocidade de execução modificada para %.3f fps e áudio para %d Hz.\n"
 
-#: src/resample.c:1950
+#: src/resample.c:1922
 #, c-format
 msgid "Changed playback speed to %.3f frames per second.\n"
 msgstr "Velocidade de execução modificada para %.3f fps.\n"
 
-#: src/resample.c:2035
+#: src/resample.c:2006
 msgid "Resampling video"
 msgstr "Resampleando vídeo"
 
-#: src/resample.c:2042 src/resample.c:2160 src/resample.c:2182
+#: src/resample.c:2012 src/resample.c:2127 src/resample.c:2148
 msgid "Resampling clipboard video"
 msgstr "Resampleando vídeo da area de transferência"
 
-#: src/resample.c:2047
+#: src/resample.c:2016
 msgid "Reordering frames"
 msgstr "Reordenando frames"
 
-#: src/resample.c:2056
+#: src/resample.c:2025
 msgid ""
 "\n"
 "\n"
@@ -8531,20 +8545,20 @@
 "\n"
 "LiVES foi incapaz de reordenar os frames."
 
-#: src/resample.c:2104
+#: src/resample.c:2071
 msgid "Deordering frames"
 msgstr "Desordenando frames"
 
-#: src/resample.c:2199
+#: src/resample.c:2165
 msgid "resampling error..."
 msgstr "erro de sampling..."
 
-#: src/rte_window.c:85 src/rte_window.c:1708
+#: src/rte_window.c:124 src/rte_window.c:1709
 #, c-format
 msgid "Type: %s"
 msgstr "Tipo: %s"
 
-#: src/rte_window.c:112
+#: src/rte_window.c:150
 msgid ""
 "\n"
 "\n"
@@ -8560,7 +8574,7 @@
 "Tem certeza?\n"
 "\n"
 
-#: src/rte_window.c:426
+#: src/rte_window.c:460
 msgid ""
 "\n"
 "\n"
@@ -8572,12 +8586,12 @@
 "Aperte 'OK' para salvar este mapa de teclado como padrão\n"
 "\n"
 
-#: src/rte_window.c:432
+#: src/rte_window.c:466
 #, c-format
 msgid "Saving keymap to %s\n"
 msgstr "Salvando mapa de teclado em %s\n"
 
-#: src/rte_window.c:439
+#: src/rte_window.c:471
 #, c-format
 msgid ""
 "\n"
@@ -8586,7 +8600,7 @@
 "\n"
 "Atualizando arquivo de mapa de teclado %s..."
 
-#: src/rte_window.c:446
+#: src/rte_window.c:477
 #, c-format
 msgid ""
 "\n"
@@ -8596,12 +8610,12 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/rte_window.c:526
+#: src/rte_window.c:556
 #, c-format
 msgid "Saving real time effect defaults to %s..."
 msgstr "Salvando padrão de efeitos em tempo-real para %s..."
 
-#: src/rte_window.c:535
+#: src/rte_window.c:563
 #, c-format
 msgid ""
 "\n"
@@ -8616,22 +8630,22 @@
 "%s\n"
 "Erro %d\n"
 
-#: src/rte_window.c:632
+#: src/rte_window.c:657
 #, c-format
 msgid "Loading real time effect defaults from %s..."
 msgstr "Carregando padrão de efeitos tempo-real de %s..."
 
-#: src/rte_window.c:681
+#: src/rte_window.c:701
 #, c-format
 msgid "Loading generator default sizes from %s..."
 msgstr "Carregando tamanhos padrão no gerador de %s..."
 
-#: src/rte_window.c:1306
+#: src/rte_window.c:1319
 #, c-format
 msgid "Loading default keymap from %s..."
 msgstr "Carregando mapa de teclado padrão de %s..."
 
-#: src/rte_window.c:1329
+#: src/rte_window.c:1339
 #, c-format
 msgid ""
 "\n"
@@ -8646,27 +8660,27 @@
 "%s\n"
 "Erro %d\n"
 
-#: src/rte_window.c:1403
+#: src/rte_window.c:1412
 #, c-format
 msgid "Invalid line %d in %s\n"
 msgstr "Linha inválida %d em %s\n"
 
-#: src/rte_window.c:1483
+#: src/rte_window.c:1490
 #, c-format
 msgid "Invalid key %d in %s\n"
 msgstr "Chave inválida %d em %s\n"
 
-#: src/rte_window.c:1498
+#: src/rte_window.c:1505
 #, c-format
 msgid "Invalid effect %s in %s\n"
 msgstr "Efeito inválido %s em %s\n"
 
-#: src/rte_window.c:1517
+#: src/rte_window.c:1524
 #, c-format
 msgid "Unknown effect %s in %s\n"
 msgstr ""
 
-#: src/rte_window.c:1535
+#: src/rte_window.c:1542
 #, c-format
 msgid ""
 "This version of LiVES cannot mix generators/non-generators on the same key "
@@ -8675,21 +8689,21 @@
 "Esta versão de LiVES não pode misturar geradores/não-geradores na mesma "
 "tecla (%d) !\n"
 
-#: src/rte_window.c:1547
+#: src/rte_window.c:1554
 #, c-format
 msgid "Too many effects bound to key %d.\n"
 msgstr "Muitos efeitos ligados à tecla %d.\n"
 
-#: src/rte_window.c:1587
+#: src/rte_window.c:1593
 msgid "update required.\n"
 msgstr "atualização requerida.\n"
 
-#: src/rte_window.c:1603
+#: src/rte_window.c:1607
 #, c-format
 msgid "Loading data connection map from %s..."
 msgstr ""
 
-#: src/rte_window.c:1612
+#: src/rte_window.c:1614
 msgid ""
 "\n"
 "\n"
@@ -8701,41 +8715,41 @@
 "Alguns efeitos não puderam ser localizados.\n"
 "\n"
 
-#: src/rte_window.c:1691
+#: src/rte_window.c:1692
 #, c-format
 msgid "LiVES: Information for %s"
 msgstr "LiVES: Informação para %s"
 
-#: src/rte_window.c:1704
+#: src/rte_window.c:1705
 #, c-format
 msgid "Effect name: %s"
 msgstr "Nome do efeito: %s"
 
-#: src/rte_window.c:1712
+#: src/rte_window.c:1713
 #, c-format
 msgid "Plugin name: %s"
 msgstr "Nome do plugin: %s"
 
-#: src/rte_window.c:1716
+#: src/rte_window.c:1717
 #, c-format
 msgid "Author: %s"
 msgstr "Autor: %s"
 
-#: src/rte_window.c:1721
+#: src/rte_window.c:1722
 #, c-format
 msgid "and: %s"
 msgstr ""
 
-#: src/rte_window.c:1726
+#: src/rte_window.c:1727
 #, c-format
 msgid "Version: %d"
 msgstr "Versão: %d"
 
-#: src/rte_window.c:1734
+#: src/rte_window.c:1735
 msgid "Description: "
 msgstr "Descrição: "
 
-#: src/rte_window.c:1960
+#: src/rte_window.c:1963
 msgid ""
 "\n"
 "\n"
@@ -8749,69 +8763,69 @@
 "tecla.\n"
 "\n"
 
-#: src/rte_window.c:2024
+#: src/rte_window.c:2027
 #, c-format
 msgid "LiVES could not locate the effect %s.\n"
 msgstr "LiVES não pode localizar o efeito %s.\n"
 
-#: src/rte_window.c:2225
+#: src/rte_window.c:2216
 msgid "LiVES: Real time effect mapping"
 msgstr "LiVES: Mapeamento de Efeitos em Tempo-Real"
 
-#: src/rte_window.c:2257
+#: src/rte_window.c:2248
 #, c-format
 msgid "Ctrl-%d"
 msgstr "Ctrl-%d"
 
-#: src/rte_window.c:2264
+#: src/rte_window.c:2255
 msgid "Key active"
 msgstr "Tecla ativa"
 
-#: src/rte_window.c:2279
+#: src/rte_window.c:2271
 msgid "Key grab"
 msgstr "Pegar tecla"
 
-#: src/rte_window.c:2280
+#: src/rte_window.c:2272
 msgid "Grab keyboard for this effect key"
 msgstr "Trave o teclado para essa tecla de efeito"
 
-#: src/rte_window.c:2290
+#: src/rte_window.c:2283
 msgid "_Clear all effects"
 msgstr "Limpar todos efeitos [_C]"
 
-#: src/rte_window.c:2304
+#: src/rte_window.c:2297
 msgid "Mode active"
 msgstr "Modo ativo"
 
-#: src/rte_window.c:2314 src/multitrack.c:8568
+#: src/rte_window.c:2307 src/multitrack.c:8762
 msgid "Info"
 msgstr "Info"
 
-#: src/rte_window.c:2315
+#: src/rte_window.c:2308
 msgid "Set Parameters"
 msgstr "Atribuir parâmetros"
 
-#: src/rte_window.c:2316
+#: src/rte_window.c:2309
 msgid "Set Connections"
 msgstr ""
 
-#: src/rte_window.c:2317
+#: src/rte_window.c:2310
 msgid "Clear"
 msgstr "Limpar"
 
-#: src/rte_window.c:2326
+#: src/rte_window.c:2319
 msgid "Effect name:"
 msgstr "Nome do efeito:"
 
-#: src/rte_window.c:2391
+#: src/rte_window.c:2384
 msgid "_Save as default keymap"
 msgstr "_Salvar como mapa de teclado padrão"
 
-#: src/rte_window.c:2396
+#: src/rte_window.c:2389
 msgid "_Load default keymap"
 msgstr "Carregar mapa de teclado padrão [_L]"
 
-#: src/rte_window.c:2840
+#: src/rte_window.c:2833
 #, c-format
 msgid ""
 "Unable to create default keymap file: %s\n"
@@ -8872,7 +8886,7 @@
 msgid "none\n"
 msgstr "nenhum\n"
 
-#: src/lives-yuv4mpeg.c:494
+#: src/lives-yuv4mpeg.c:493
 #, c-format
 msgid ""
 "Unable to set display framerate to %.3f fps.\n"
@@ -8881,79 +8895,79 @@
 "Impossível definir velocidade de visualização em %.3f fps.\n"
 "\n"
 
-#: src/lives-yuv4mpeg.c:503
+#: src/lives-yuv4mpeg.c:502
 #, c-format
 msgid "Unable to open yuv4mpeg out stream %s\n"
 msgstr "Impossível abrir stream yuv4mpeg %s\n"
 
-#: src/lives-yuv4mpeg.c:628
+#: src/lives-yuv4mpeg.c:626
 #, c-format
 msgid "TV card %d"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:713
+#: src/lives-yuv4mpeg.c:710
 #, c-format
 msgid "Opened TV card %d (%s)"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:760
+#: src/lives-yuv4mpeg.c:757
 #, c-format
 msgid "Firewire card %d"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:796
+#: src/lives-yuv4mpeg.c:793
 #, c-format
 msgid "Opened firewire card %d"
 msgstr ""
 
-#: src/multitrack.c:666
+#: src/multitrack.c:736
 msgid "Auto backup"
 msgstr ""
 
-#: src/multitrack.c:868
+#: src/multitrack.c:935
 msgid "Backing audio"
 msgstr "Áudio de fundo"
 
-#: src/multitrack.c:1435
+#: src/multitrack.c:1515
 #, fuzzy, c-format
 msgid "%s : parameters for %s"
 msgstr "Sem parâmetros"
 
-#: src/multitrack.c:1809 src/multitrack.c:3483
+#: src/multitrack.c:1881 src/multitrack.c:3635
 #, c-format
 msgid "Current track: %s (layer %d)\n"
 msgstr "Faixa selecionada: %s (camada %d)\n"
 
-#: src/multitrack.c:1813 src/multitrack.c:3484
+#: src/multitrack.c:1885 src/multitrack.c:3637
 msgid "Current track: Backing audio\n"
 msgstr "Faixa atual: Áudio de fundo\n"
 
-#: src/multitrack.c:1814
+#: src/multitrack.c:1886
 #, c-format
 msgid "Current track: Layer %d audio\n"
 msgstr "Faixa selecionada: camada %d\n"
 
-#: src/multitrack.c:1817
+#: src/multitrack.c:1889
 #, c-format
 msgid "%.2f sec.\n"
 msgstr "%.2f seg.\n"
 
-#: src/multitrack.c:1822 src/multitrack.c:3490
+#: src/multitrack.c:1894 src/multitrack.c:3643
 #, c-format
 msgid "Source: %s"
 msgstr "Fonte: %s"
 
-#: src/multitrack.c:1825 src/multitrack.c:3492
+#: src/multitrack.c:1897 src/multitrack.c:3645
 msgid "Right click for context menu.\n"
 msgstr "Clique com o botão direito para menu.\n"
 
-#: src/multitrack.c:1827
+#: src/multitrack.c:1899
 msgid ""
 "Double click on a block\n"
 "to select it."
 msgstr ""
 
-#: src/multitrack.c:3312
+#: src/multitrack.c:3452
 msgid ""
 "\n"
 "\n"
@@ -8962,7 +8976,7 @@
 "right or double clicking on it.\n"
 msgstr ""
 
-#: src/multitrack.c:3315
+#: src/multitrack.c:3455
 msgid ""
 "\n"
 "\n"
@@ -8970,7 +8984,7 @@
 "Select an effect in FX stack first to view its parameters.\n"
 msgstr ""
 
-#: src/multitrack.c:3318
+#: src/multitrack.c:3458
 msgid ""
 "\n"
 "\n"
@@ -8980,7 +8994,7 @@
 "\n"
 "Sem clipes.\n"
 
-#: src/multitrack.c:3321
+#: src/multitrack.c:3462
 msgid ""
 "You must select two video tracks\n"
 "and a time region\n"
@@ -8990,7 +9004,7 @@
 "before inserting clips into the timeline."
 msgstr ""
 
-#: src/multitrack.c:3324
+#: src/multitrack.c:3465
 msgid ""
 "\n"
 "\n"
@@ -8999,12 +9013,12 @@
 "to apply compositors.\n"
 msgstr ""
 
-#: src/multitrack.c:3487
+#: src/multitrack.c:3640
 #, c-format
 msgid "%.2f sec. to %.2f sec.\n"
 msgstr "%.2f seg. até %.2f seg.\n"
 
-#: src/multitrack.c:3493
+#: src/multitrack.c:3646
 msgid ""
 "Single click on timeline\n"
 "to select a frame.\n"
@@ -9012,187 +9026,187 @@
 "Clique simples na linha de tempo\n"
 "para selecionar um frame.\n"
 
-#: src/multitrack.c:3711 src/multitrack.c:6790
+#: src/multitrack.c:3858 src/multitrack.c:6972
 #, c-format
 msgid "%s [unstable]"
 msgstr ""
 
-#: src/multitrack.c:3822
+#: src/multitrack.c:3973
 msgid ""
 "You can click and drag\n"
 "below the timeline"
 msgstr ""
 
-#: src/multitrack.c:3823
+#: src/multitrack.c:3974
 msgid "to select a time region.\n"
 msgstr "para selecionar uma região.\n"
 
-#: src/multitrack.c:3985
+#: src/multitrack.c:4137
 msgid "LiVES: Selected clip"
 msgstr "LiVES: Clipe seleccionado"
 
-#: src/multitrack.c:3993
+#: src/multitrack.c:4145
 msgid "_Adjust start and end points"
 msgstr ""
 
-#: src/multitrack.c:4002
+#: src/multitrack.c:4154
 msgid "_Edit/encode in clip editor"
 msgstr ""
 
-#: src/multitrack.c:4009
+#: src/multitrack.c:4161
 msgid "_Show clip information"
 msgstr "Mo_strar informacão de clipe"
 
-#: src/multitrack.c:4016
+#: src/multitrack.c:4168
 msgid "_Close this clip"
 msgstr "Fechar este _clipe"
 
-#: src/multitrack.c:4236
+#: src/multitrack.c:4388
 msgid "Audio mixer (ctrl-m)"
 msgstr "Mixer de Áudio (ctrl-m)"
 
-#: src/multitrack.c:4336
+#: src/multitrack.c:4488
 msgid "Single click on timeline"
 msgstr ""
 
-#: src/multitrack.c:4337
+#: src/multitrack.c:4489
 msgid "to select a frame."
 msgstr ""
 
-#: src/multitrack.c:4338
+#: src/multitrack.c:4490
 msgid "Double click or right click on timeline"
 msgstr ""
 
-#: src/multitrack.c:4339
+#: src/multitrack.c:4491
 msgid "to select a block."
 msgstr ""
 
-#: src/multitrack.c:4340
+#: src/multitrack.c:4492
 msgid "Clips can be dragged"
 msgstr ""
 
-#: src/multitrack.c:4341
+#: src/multitrack.c:4493
 msgid "onto the timeline."
 msgstr ""
 
-#: src/multitrack.c:4343
+#: src/multitrack.c:4495
 msgid "Mouse mode is: Move"
 msgstr ""
 
-#: src/multitrack.c:4344
+#: src/multitrack.c:4496
 msgid "clips can be moved around."
 msgstr ""
 
-#: src/multitrack.c:4349
+#: src/multitrack.c:4500
 msgid "Mouse mode is: Select."
 msgstr ""
 
-#: src/multitrack.c:4350
+#: src/multitrack.c:4501
 msgid "Drag with mouse on timeline"
 msgstr ""
 
-#: src/multitrack.c:4351
+#: src/multitrack.c:4502
 msgid "to select tracks and time."
 msgstr ""
 
-#: src/multitrack.c:4362
+#: src/multitrack.c:4509
 msgid "_Insert mode: Normal"
 msgstr "Modo _Ins:Normal"
 
-#: src/multitrack.c:4378
+#: src/multitrack.c:4537
 msgid "_Mouse mode: Move"
 msgstr "_Mouse: Mover"
 
-#: src/multitrack.c:4382
+#: src/multitrack.c:4540
 msgid "_Mouse mode: Select"
 msgstr "_Mouse: Selecionar"
 
-#: src/multitrack.c:4405 src/multitrack.c:7925
+#: src/multitrack.c:4563 src/multitrack.c:8104
 #, fuzzy
 msgid "Gravity: Normal"
 msgstr "_Gravidade:Normal"
 
-#: src/multitrack.c:4409
+#: src/multitrack.c:4565
 #, fuzzy
 msgid "Gravity: Left"
 msgstr "_Gravidade:Esquerda"
 
-#: src/multitrack.c:4414
+#: src/multitrack.c:4569
 #, fuzzy
 msgid "Gravity: Right"
 msgstr "_Gravidade:Direito"
 
-#: src/multitrack.c:4416
+#: src/multitrack.c:4570
 msgid "Close _last gap(s) in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:4419
+#: src/multitrack.c:4572
 msgid "Close _first gap(s) in selected tracks/time"
 msgstr "Fechar primeiro vão(s) nas trilhas/tempo selecionados"
 
-#: src/multitrack.c:4458
+#: src/multitrack.c:4627
 msgid "Close gaps"
 msgstr "Fechar vãos"
 
-#: src/multitrack.c:4460
+#: src/multitrack.c:4629
 msgid "Move block"
 msgstr "Mover bloco"
 
-#: src/multitrack.c:4462
+#: src/multitrack.c:4631
 msgid "Move audio block"
 msgstr "Mover bloco de áudio"
 
-#: src/multitrack.c:4464
+#: src/multitrack.c:4633
 msgid "Delete block"
 msgstr "Deletar bloco"
 
-#: src/multitrack.c:4466
+#: src/multitrack.c:4635
 msgid "Delete audio block"
 msgstr "Deletar bloco de áudio"
 
-#: src/multitrack.c:4468
+#: src/multitrack.c:4637
 msgid "Split tracks"
 msgstr "Dividir faixas"
 
-#: src/multitrack.c:4470
+#: src/multitrack.c:4639
 msgid "Split block"
 msgstr "Dividir bloco"
 
-#: src/multitrack.c:4473
+#: src/multitrack.c:4642
 #, c-format
 msgid "Apply %s"
 msgstr "Aplicar %s"
 
-#: src/multitrack.c:4478
+#: src/multitrack.c:4647
 #, c-format
 msgid "Delete %s"
 msgstr "Deletar %s"
 
-#: src/multitrack.c:4482
+#: src/multitrack.c:4651
 msgid "Insert block"
 msgstr "Inserir bloco"
 
-#: src/multitrack.c:4484
+#: src/multitrack.c:4653
 msgid "Insert gap"
 msgstr "Inserir vão"
 
-#: src/multitrack.c:4486
+#: src/multitrack.c:4655
 msgid "Insert audio block"
 msgstr "Inserir bloco de áudio"
 
-#: src/multitrack.c:4488
+#: src/multitrack.c:4657
 msgid "Effect order change"
 msgstr "Mudança da ordem de efeitos"
 
-#: src/multitrack.c:4898
+#: src/multitrack.c:5064
 msgid "unsigned "
 msgstr ""
 
-#: src/multitrack.c:4899
+#: src/multitrack.c:5065
 msgid "signed "
 msgstr ""
 
-#: src/multitrack.c:4904
+#: src/multitrack.c:5071
 #, c-format
 msgid ""
 "Multitrack values set to %.3f fps, frame size %d x %d, audio channels %d, "
@@ -9201,15 +9215,15 @@
 "Valores multipista definidos em %.3f fps, tamanho de frame %d x %d, canais "
 "de áudio %d, taxa de áudio %d, tamanho da amostra de áudio %d, %s.\n"
 
-#: src/multitrack.c:4938
+#: src/multitrack.c:5104
 msgid "invalid event list. Failed.\n"
 msgstr "lista de eventos inválida. Falha.\n"
 
-#: src/multitrack.c:4944
+#: src/multitrack.c:5110
 msgid "event list has invalid fps. Failed.\n"
 msgstr "a lista de eventos tem um FPS inválida. Falha.\n"
 
-#: src/multitrack.c:4953
+#: src/multitrack.c:5122
 #, c-format
 msgid ""
 "\n"
@@ -9224,7 +9238,7 @@
 "fechar o set atual,\n"
 "e então carregue no novo set a partir do menu 'Arquivo'.\n"
 
-#: src/multitrack.c:4993
+#: src/multitrack.c:5163
 #, c-format
 msgid ""
 "\n"
@@ -9235,440 +9249,432 @@
 "Há um número inválido de canais de áudio (%d) no LiVES.\n"
 "Não pode ser carregado.\n"
 
-#: src/multitrack.c:5329 src/multitrack.c:5338 src/multitrack.c:21133
+#: src/multitrack.c:5452
 msgid "Layout was wiped.\n"
 msgstr ""
 
-#: src/multitrack.c:5374
+#: src/multitrack.c:5547
 #, c-format
 msgid "LiVES-%s: Multitrack %dx%d : %d bpp %.3f fps"
 msgstr "LiVES-%s: Multitrack %dx%d : %d bpp %.3f fps"
 
-#: src/multitrack.c:5617
+#: src/multitrack.c:5793
 msgid "In/out"
 msgstr ""
 
-#: src/multitrack.c:5619
+#: src/multitrack.c:5795
 msgid "FX stack"
 msgstr ""
 
-#: src/multitrack.c:5627 src/omc-learn.c:673
+#: src/multitrack.c:5803 src/omc-learn.c:659
 msgid "Params."
 msgstr "Params."
 
-#: src/multitrack.c:5978
+#: src/multitrack.c:6157
 msgid "_Open..."
 msgstr "_Abrir..."
 
-#: src/multitrack.c:5996
+#: src/multitrack.c:6175
 msgid "O_pen File Selection..."
 msgstr "Abrir Trecho de Arquivo [_P]"
 
-#: src/multitrack.c:6040
+#: src/multitrack.c:6219
 msgid "Import Selection from _dvd/vcd..."
 msgstr "Importar trecho de _DVD/VCD"
 
-#: src/multitrack.c:6050
+#: src/multitrack.c:6229
 msgid "Import Selection from _dvd"
 msgstr "Importar Trecho de _DVD"
 
-#: src/multitrack.c:6060
+#: src/multitrack.c:6239
 msgid "Import Selection from _vcd"
 msgstr "Importar Trecho de _VCD"
 
-#: src/multitrack.c:6076
+#: src/multitrack.c:6255
 msgid "_Import from Device"
 msgstr "_Importar de Dispositivo"
 
-#: src/multitrack.c:6103
+#: src/multitrack.c:6282
 msgid "_Close the selected clip"
 msgstr ""
 
-#: src/multitrack.c:6198
+#: src/multitrack.c:6377
 msgid "_Save layout as..."
 msgstr "_Salvar layout como..."
 
-#: src/multitrack.c:6206
+#: src/multitrack.c:6385
 msgid "_Load layout..."
 msgstr "_Carregar layout..."
 
-#: src/multitrack.c:6210
+#: src/multitrack.c:6389
 msgid "_Wipe/Delete layout..."
 msgstr "_Descartar/Deletar layout..."
 
-#: src/multitrack.c:6236
+#: src/multitrack.c:6415
 msgid "_Ignore width, height and audio values from loaded layouts"
 msgstr "_Ignorar largura, altura e valores de áudio dos layouts carregados"
 
-#: src/multitrack.c:6240
+#: src/multitrack.c:6419
 msgid "Auto load _subtitles with clips"
 msgstr ""
 
-#: src/multitrack.c:6322
+#: src/multitrack.c:6501
 msgid "_CLIP EDITOR"
 msgstr "EDITOR DE _CLIPES"
 
-#: src/multitrack.c:6334
+#: src/multitrack.c:6513
 msgid "_Adjust selected clip start/end points"
 msgstr ""
 
-#: src/multitrack.c:6343
+#: src/multitrack.c:6522
 msgid "_Insert selected clip"
 msgstr "_Inserir clipe selecionado"
 
-#: src/multitrack.c:6355
+#: src/multitrack.c:6534
 msgid "_Insert selected clip audio"
 msgstr "_Inserir áudio do clipe selecionado"
 
-#: src/multitrack.c:6364
+#: src/multitrack.c:6543
 msgid "_Delete selected block"
 msgstr "_Deletar bloco Selecionado"
 
-#: src/multitrack.c:6373
+#: src/multitrack.c:6555
 msgid "_Jump to previous block boundary"
 msgstr "Pular para limite de bloco anterior [_J]"
 
-#: src/multitrack.c:6382
+#: src/multitrack.c:6564
 msgid "_Jump to next block boundary"
 msgstr "Pular para o próximo limite de bloco [_J]"
 
-#: src/multitrack.c:6395
+#: src/multitrack.c:6577
 msgid "Clear _marks from timeline"
 msgstr "Limpar _marcas da linha de tempo"
 
-#: src/multitrack.c:6403
+#: src/multitrack.c:6585
 msgid "Ignore selection limits when inserting"
 msgstr ""
 
-#: src/multitrack.c:6420 src/multitrack.c:16719
+#: src/multitrack.c:6602 src/multitrack.c:17009
 msgid "_Play from Timeline Position"
 msgstr "Tocar a partir da _posição na linha de tempo"
 
-#: src/multitrack.c:6434
+#: src/multitrack.c:6616
 msgid "Pla_y selected time only"
 msgstr ""
 
-#: src/multitrack.c:6518
+#: src/multitrack.c:6700
 msgid "_Move effects with blocks"
 msgstr "_Mover efeitos com blocos"
 
-#: src/multitrack.c:6531
+#: src/multitrack.c:6713
 msgid "Select _autotransition effect..."
 msgstr ""
 
-#: src/multitrack.c:6542
+#: src/multitrack.c:6724
 #, fuzzy
 msgid "Crossfade audio with autotransition"
 msgstr "Crossfade áudio"
 
-#: src/multitrack.c:6550
+#: src/multitrack.c:6732
 msgid "View/_Edit selected effect"
 msgstr "Ver/_Editar o efeito seleccionado"
 
-#: src/multitrack.c:6554
+#: src/multitrack.c:6736
 msgid "_Delete selected effect"
 msgstr "_Deletar efeito selecionado"
 
-#: src/multitrack.c:6562
+#: src/multitrack.c:6744
 msgid "Apply effect to _block..."
 msgstr "Aplicar efeito ao _bloco..."
 
-#: src/multitrack.c:6619
+#: src/multitrack.c:6801
 msgid "Apply effect to _region..."
 msgstr "Aplicar efeito à _região..."
 
-#: src/multitrack.c:6885
+#: src/multitrack.c:7061
 msgid "_Tracks"
 msgstr "_Faixas"
 
-#: src/multitrack.c:6896
+#: src/multitrack.c:7072
 msgid "Rename current track"
 msgstr ""
 
-#: src/multitrack.c:6904
+#: src/multitrack.c:7080
 msgid "Make _Backing Audio current track"
 msgstr "Fazer áudio de fundo a faixa atual (_b)"
 
-#: src/multitrack.c:6915
+#: src/multitrack.c:7091
 msgid "Add Video Track at _Rear"
 msgstr "Adicionar faixa de vídeo at_rás"
 
-#: src/multitrack.c:6923
+#: src/multitrack.c:7099
 msgid "Add Video Track at _Front"
 msgstr "Adicionar Faixa de Vídeo à _Frente"
 
-#: src/multitrack.c:6936
+#: src/multitrack.c:7112
 msgid "_Split current track at cursor"
 msgstr "Dividir a trilha atual no cursor [_s]"
 
-#: src/multitrack.c:6948
+#: src/multitrack.c:7124
 msgid "_Split selected video tracks"
 msgstr "Dividir faixas _selecionadas de vídeo"
 
-#: src/multitrack.c:6961
+#: src/multitrack.c:7137
 msgid "Insert gap in selected tracks/time"
 msgstr "Inserir vão nas trilhas/tempo selecionados"
 
-#: src/multitrack.c:6969
+#: src/multitrack.c:7145
 msgid "Insert gap in current track/selected time"
 msgstr "Inserir vão na trilha atual e tempo selecionado"
 
-#: src/multitrack.c:6981
+#: src/multitrack.c:7157
 msgid "Close all _gaps in selected tracks/time"
 msgstr "Fechar todos vãos nas trilhas/tempo selecionados (_g)"
 
-#: src/multitrack.c:7007
+#: src/multitrack.c:7183
 msgid "Se_lection"
 msgstr "Se_leção"
 
-#: src/multitrack.c:7018
+#: src/multitrack.c:7194
 msgid "_Select Current Track"
 msgstr "_Selecionar faixa atual"
 
-#: src/multitrack.c:7025
+#: src/multitrack.c:7201
 msgid "Select _all video tracks"
 msgstr "Selecionar tod_as faixas de vídeo"
 
-#: src/multitrack.c:7032
+#: src/multitrack.c:7208
 msgid "Select _no video tracks"
 msgstr "_Não selecionar faixas de vídeo"
 
-#: src/multitrack.c:7039
+#: src/multitrack.c:7215
 msgid "Select all _time"
 msgstr "Selecionar todo _tempo"
 
-#: src/multitrack.c:7050
+#: src/multitrack.c:7226
 msgid "Select from _zero time"
 msgstr "Selecionar do tempo _zero"
 
-#: src/multitrack.c:7057
+#: src/multitrack.c:7233
 msgid "Select to _end time"
 msgstr "Selecionar fim do t_empo"
 
-#: src/multitrack.c:7064
+#: src/multitrack.c:7240
 msgid "_Copy..."
 msgstr "_Copiar..."
 
-#: src/multitrack.c:7075
+#: src/multitrack.c:7251
 msgid "_Timecode to region start"
 msgstr "_Timecode para o início da região"
 
-#: src/multitrack.c:7082
+#: src/multitrack.c:7258
 msgid "_Timecode to region end"
 msgstr "_Timecode para o fim da região"
 
-#: src/multitrack.c:7089
+#: src/multitrack.c:7265
 msgid "_Region start to timecode"
 msgstr "Início da _região para timecode"
 
-#: src/multitrack.c:7096
+#: src/multitrack.c:7272
 msgid "_Region end to timecode"
 msgstr "Fim da _região para timecode"
 
-#: src/multitrack.c:7110
+#: src/multitrack.c:7286
 msgid "Select/deselect block at current track/time"
 msgstr ""
 
-#: src/multitrack.c:7135
+#: src/multitrack.c:7311
 msgid "_Change width, height and audio values..."
 msgstr "Mudar valores de largura, alltura e áudio..."
 
-#: src/multitrack.c:7194
+#: src/multitrack.c:7370
 msgid "_Render"
 msgstr "_Renderizar"
 
-#: src/multitrack.c:7205
+#: src/multitrack.c:7381
 msgid "_Render all to new clip"
 msgstr "_Renderizar tudo para um novo clipe"
 
-#: src/multitrack.c:7220
+#: src/multitrack.c:7396
 msgid "Render _video"
 msgstr "Renderizar _vídeo"
 
-#: src/multitrack.c:7225
+#: src/multitrack.c:7401
 msgid "Render _audio"
 msgstr "Renderizar _áudio"
 
-#: src/multitrack.c:7235
+#: src/multitrack.c:7411
 msgid "_Normalise rendered audio"
 msgstr ""
 
-#: src/multitrack.c:7242
+#: src/multitrack.c:7418
 msgid "_Pre-render audio"
 msgstr "_Pre-renderizar áudio"
 
-#: src/multitrack.c:7251
+#: src/multitrack.c:7427
 msgid "_View"
 msgstr "_Ver"
 
-#: src/multitrack.c:7270
+#: src/multitrack.c:7446
 msgid "Block _In/out points"
 msgstr "Bloquear pontos de entrada/sa_ida"
 
-#: src/multitrack.c:7279
+#: src/multitrack.c:7455
 msgid "_Effects at current"
 msgstr "_Efeitos no atual"
 
-#: src/multitrack.c:7297
+#: src/multitrack.c:7473
 msgid "Audio parameters"
 msgstr "Parâmetros de áudio"
 
-#: src/multitrack.c:7308
+#: src/multitrack.c:7484
 msgid "Show backing _audio track"
 msgstr "Mostrar faix_a do áudio de fundo"
 
-#: src/multitrack.c:7312
+#: src/multitrack.c:7488
 msgid "Compact view"
 msgstr "Visão compacta"
 
-#: src/multitrack.c:7320
+#: src/multitrack.c:7496
 msgid "Maximum tracks to display..."
 msgstr "Máximo de trilhas a inserir..."
 
-#: src/multitrack.c:7327
+#: src/multitrack.c:7503
 msgid "Scroll to follow playback"
 msgstr "Rolar para seguir a execução"
 
-#: src/multitrack.c:7331
+#: src/multitrack.c:7507
 msgid "_Center on cursor"
 msgstr "_Centralizar no cursor"
 
-#: src/multitrack.c:7338
+#: src/multitrack.c:7514
 msgid "_Zoom in"
 msgstr "_Zoom in"
 
-#: src/multitrack.c:7349
+#: src/multitrack.c:7525
 msgid "_Zoom out"
 msgstr "_Zoom out"
 
-#: src/multitrack.c:7361
+#: src/multitrack.c:7537
 msgid "Multitrack _details"
 msgstr "_Detalhes multipista"
 
-#: src/multitrack.c:7374
+#: src/multitrack.c:7550
 msgid "_Event Window"
 msgstr "Janela de _Eventos"
 
-#: src/multitrack.c:7378
+#: src/multitrack.c:7554
 msgid "_Event Window (selected time only)"
 msgstr ""
 
-#: src/multitrack.c:7382
+#: src/multitrack.c:7558
 msgid "_Show FRAME events"
 msgstr "Mostrar evento_s de frame"
 
-#: src/multitrack.c:7399
+#: src/multitrack.c:7575
 msgid "_Show multitrack keys"
 msgstr "Mostrar tecla_s multipista"
 
-#: src/multitrack.c:7468
+#: src/multitrack.c:7644
 msgid "Mouse mode: _Move"
 msgstr "Modo do mouse: _Mover"
 
-#: src/multitrack.c:7476
+#: src/multitrack.c:7652
 msgid "Mouse mode: _Select"
 msgstr "Modo do mouse: _Selecionar"
 
-#: src/multitrack.c:7505
+#: src/multitrack.c:7681
 msgid "Insert mode: _Normal"
 msgstr "Modo Ins:_Normal"
 
-#: src/multitrack.c:7733
+#: src/multitrack.c:7909
 msgid "Insert with _audio"
 msgstr "Inserir com _áudio"
 
-#: src/multitrack.c:7734
+#: src/multitrack.c:7910
 msgid ""
 "Select whether video clips are inserted and moved with their audio or not"
 msgstr ""
 
-#: src/multitrack.c:7829
+#: src/multitrack.c:8007
 msgid "Select _overlap"
 msgstr ""
 
-#: src/multitrack.c:7830
+#: src/multitrack.c:8008
 msgid ""
 "Select whether timeline selection snaps to overlap between selected tracks "
 "or not"
 msgstr ""
 
-#: src/multitrack.c:7894 src/multitrack.c:14198
+#: src/multitrack.c:8073 src/multitrack.c:14422
 msgid "Expanded View (d)"
 msgstr "Visão Expandida (d)"
 
-#: src/multitrack.c:7897 src/multitrack.c:14205
+#: src/multitrack.c:8076 src/multitrack.c:14428
 msgid "Compact View (d)"
 msgstr "Visão Compacta (d)"
 
-#: src/multitrack.c:7939
+#: src/multitrack.c:8118
 msgid "Gravity: _Normal"
 msgstr "Gravidade:_Normal"
 
-#: src/multitrack.c:7952
+#: src/multitrack.c:8131
 msgid "Gravity: _Left"
 msgstr "Gravidade:_Esquerda"
 
-#: src/multitrack.c:7967
+#: src/multitrack.c:8146
 msgid "Gravity: _Right"
 msgstr "Gravidade:_Direito"
 
-#: src/multitrack.c:8297
+#: src/multitrack.c:8496
 msgid "_Apply"
 msgstr "_Applicar"
 
-#: src/multitrack.c:8319
+#: src/multitrack.c:8518
 msgid "Time"
 msgstr "Tempo"
 
-#: src/multitrack.c:8333
+#: src/multitrack.c:8532
 msgid "_Del. node"
 msgstr "_Deletar nodo"
 
-#: src/multitrack.c:8341
+#: src/multitrack.c:8540
 msgid "_Next node"
 msgstr "Próximo _nodo"
 
-#: src/multitrack.c:8349
+#: src/multitrack.c:8548
 msgid "_Prev node"
 msgstr "Nodo anterior [_P]"
 
-#: src/multitrack.c:8373
+#: src/multitrack.c:8574
 msgid "_Reverse playback  "
 msgstr "Execução _reversa  "
 
-#: src/multitrack.c:8395
+#: src/multitrack.c:8596
 msgid "_Velocity  "
 msgstr "_Velocidade  "
 
-#: src/multitrack.c:8464
+#: src/multitrack.c:8664
 msgid "Anchor _start"
 msgstr "Ancorar início [_S]"
 
-#: src/multitrack.c:8465
+#: src/multitrack.c:8665
 msgid "Anchor the start point to the timeline"
 msgstr "Ancorar o ponto de início à linha de tempo"
 
-#: src/multitrack.c:8481
-msgid "Start frame"
-msgstr "Primerio frame"
-
-#: src/multitrack.c:8533
+#: src/multitrack.c:8728
 msgid "Anchor _end"
 msgstr "Ancorar final [_E]"
 
-#: src/multitrack.c:8534
+#: src/multitrack.c:8729
 msgid "Anchor the end point to the timeline"
 msgstr "Ancorar o ponto final à linha de tempo"
 
-#: src/multitrack.c:8546
-msgid "End frame"
-msgstr "Último frame"
-
-#: src/multitrack.c:8739
+#: src/multitrack.c:8929
 msgid "Scroll"
 msgstr "Rolar"
 
-#: src/multitrack.c:9316
+#: src/multitrack.c:9502
 msgid ""
 "\n"
 "==============================\n"
@@ -9678,91 +9684,91 @@
 "==============================\n"
 "Alternado para modo de edição de clipes\n"
 
-#: src/multitrack.c:9502
+#: src/multitrack.c:9708
 msgid "Timeline (seconds)"
 msgstr "Linha de tempo (segs.)"
 
-#: src/multitrack.c:9984
+#: src/multitrack.c:10202
 msgid " Backing audio"
 msgstr " Áudio de fundo"
 
-#: src/multitrack.c:9987
+#: src/multitrack.c:10204
 #, c-format
 msgid " Layer %d audio"
 msgstr " Áudio camada %d"
 
-#: src/multitrack.c:9995
+#: src/multitrack.c:10212
 msgid "Show/hide audio details"
 msgstr ""
 
-#: src/multitrack.c:10010 src/multitrack.c:10232
+#: src/multitrack.c:10227 src/multitrack.c:10452
 #, c-format
 msgid "Layer %d audio"
 msgstr "Áudio camada %d"
 
-#: src/multitrack.c:10144 src/multitrack.c:10261
+#: src/multitrack.c:10353 src/multitrack.c:10481
 #, c-format
 msgid "%s (layer %d)"
 msgstr "%s (cam. %d)"
 
-#: src/multitrack.c:10184
+#: src/multitrack.c:10403
 msgid "Select track"
 msgstr "Seleccionar faixa"
 
-#: src/multitrack.c:10188
+#: src/multitrack.c:10407
 msgid "Show/hide audio"
 msgstr ""
 
-#: src/multitrack.c:10194
+#: src/multitrack.c:10413
 #, c-format
 msgid "Video %d"
 msgstr "Vídeo %d"
 
-#: src/multitrack.c:10233
+#: src/multitrack.c:10453
 #, c-format
 msgid " %s"
 msgstr " %s"
 
-#: src/multitrack.c:10346
+#: src/multitrack.c:10574
 msgid "LiVES: Selected effect"
 msgstr "LiVES: Efeito selecionado"
 
-#: src/multitrack.c:10358
+#: src/multitrack.c:10586
 msgid "_View/Edit this effect"
 msgstr "_Ver/Editar este efeito"
 
-#: src/multitrack.c:10361
+#: src/multitrack.c:10588
 msgid "_View this effect"
 msgstr "_Ver este efeito"
 
-#: src/multitrack.c:10369
+#: src/multitrack.c:10596
 msgid "_Delete this effect"
 msgstr "_Deletar este efeito"
 
-#: src/multitrack.c:10422
+#: src/multitrack.c:10648
 msgid "Cannot insert after this effect"
 msgstr ""
 
-#: src/multitrack.c:10451
+#: src/multitrack.c:10677
 msgid "This effect cannot be moved"
 msgstr ""
 
-#: src/multitrack.c:10499
+#: src/multitrack.c:10724
 #, c-format
 msgid "  %d to %d selected  "
 msgstr "  %d até %d selecionados  "
 
-#: src/multitrack.c:10502 src/multitrack.c:10746
+#: src/multitrack.c:10727 src/multitrack.c:10968
 #, c-format
 msgid "%.2f sec."
 msgstr "%.2f seg."
 
-#: src/multitrack.c:10717
+#: src/multitrack.c:10940
 #, c-format
 msgid "%d frames"
 msgstr "%d frames"
 
-#: src/multitrack.c:11070
+#: src/multitrack.c:11299
 msgid ""
 "\n"
 "==============================\n"
@@ -9772,70 +9778,70 @@
 "==============================\n"
 "Alternado para modo multipista\n"
 
-#: src/multitrack.c:12691
+#: src/multitrack.c:12939
 msgid "Drag the time slider to where you"
 msgstr ""
 
-#: src/multitrack.c:12692
+#: src/multitrack.c:12940
 msgid "want to set effect parameters"
 msgstr ""
 
-#: src/multitrack.c:12693
+#: src/multitrack.c:12941
 msgid "Set parameters, then click \"Apply\"\n"
 msgstr ""
 
-#: src/multitrack.c:12694
+#: src/multitrack.c:12942
 msgid ""
 "NODES are points where parameters\n"
 "have been set.\n"
 "Nodes can be deleted."
 msgstr ""
 
-#: src/multitrack.c:12697
+#: src/multitrack.c:12944
 msgid "Effect has no parameters.\n"
 msgstr "Efeito não tem parâmetros.\n"
 
-#: src/multitrack.c:12788
+#: src/multitrack.c:13033
 #, c-format
 msgid "%s output"
 msgstr "%s saída"
 
-#: src/multitrack.c:12794 src/multitrack.c:12804
+#: src/multitrack.c:13038 src/multitrack.c:13046
 #, c-format
 msgid "layer %d"
 msgstr "camada %d"
 
-#: src/multitrack.c:12796 src/multitrack.c:12806
+#: src/multitrack.c:13039 src/multitrack.c:13047
 msgid "audio track"
 msgstr "faixa de áudio"
 
-#: src/multitrack.c:12797
+#: src/multitrack.c:13040
 #, c-format
 msgid "%s to %s"
 msgstr "%s até %s"
 
-#: src/multitrack.c:12807
+#: src/multitrack.c:13048
 #, c-format
 msgid "%s from %s"
 msgstr ""
 
-#: src/multitrack.c:12860
+#: src/multitrack.c:13099
 msgid "_Prev filter map"
 msgstr "Mapa de filtro _ant"
 
-#: src/multitrack.c:12871
+#: src/multitrack.c:13110
 msgid "Insert _before"
 msgstr "Ins an_tes"
 
-#: src/multitrack.c:12881
+#: src/multitrack.c:13120
 msgid "Insert _after"
 msgstr "Ins apó_s"
 
-#: src/multitrack.c:12896
+#: src/multitrack.c:13134
 msgid "_Next filter map"
 msgstr "_Prox mapa de filtro"
 
-#: src/multitrack.c:12911
+#: src/multitrack.c:13148
 msgid ""
 "\n"
 "\n"
@@ -9843,81 +9849,81 @@
 "current time.\n"
 msgstr ""
 
-#: src/multitrack.c:12929
+#: src/multitrack.c:13166
 msgid ""
 "Drag a compositor anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:12936
+#: src/multitrack.c:13173
 msgid ""
 "Drag a transition anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:12944
+#: src/multitrack.c:13181
 msgid ""
 "Effects can be dragged\n"
 "onto blocks on the timeline."
 msgstr ""
 
-#: src/multitrack.c:13166
+#: src/multitrack.c:13406
 msgid "LiVES: Selected block/frame"
 msgstr "LiVES: Bloco/frame selecionado"
 
-#: src/multitrack.c:13173
+#: src/multitrack.c:13413
 msgid "_Select this block"
 msgstr "_Selecionar este blog"
 
-#: src/multitrack.c:13183
+#: src/multitrack.c:13423
 msgid "_Split block here"
 msgstr "Dividir bloco aqui [_S]"
 
-#: src/multitrack.c:13191
+#: src/multitrack.c:13431
 msgid "List _effects here"
 msgstr "Listar _efeitos aqui"
 
-#: src/multitrack.c:13200 src/multitrack.c:13277
+#: src/multitrack.c:13440 src/multitrack.c:13518
 #, c-format
 msgid "_Adjust %s"
 msgstr "_Ajustar %s"
 
-#: src/multitrack.c:13215
+#: src/multitrack.c:13455
 msgid "_Delete this block"
 msgstr "_Deletar bloco selecionado"
 
-#: src/multitrack.c:13258
+#: src/multitrack.c:13500
 msgid "_Insert here"
 msgstr "_Inserir aqui"
 
-#: src/multitrack.c:13264
+#: src/multitrack.c:13505
 msgid "_Insert audio here"
 msgstr "_Inserir áudio aqui"
 
-#: src/multitrack.c:14801
+#: src/multitrack.c:15017
 #, c-format
 msgid "Inserted gap in selected tracks from time %.4f to %.4f\n"
 msgstr ""
 "Gap inserido nas trilhas selecionadas a partir do tempo %.4f até %.4f\n"
 
-#: src/multitrack.c:14835
+#: src/multitrack.c:15048
 #, c-format
 msgid "Inserted gap in track %s from time %.4f to %.4f\n"
 msgstr "Inserido vão na trilha %s do tempo %.4f até %.4f\n"
 
-#: src/multitrack.c:15036
+#: src/multitrack.c:15244
 #, c-format
 msgid "Undid %s\n"
 msgstr "Desfeito %s\n"
 
-#: src/multitrack.c:15235
+#: src/multitrack.c:15445
 #, c-format
 msgid "Redid %s\n"
 msgstr "Refeito %s\n"
 
-#: src/multitrack.c:15268
+#: src/multitrack.c:15475
 msgid ""
 "\n"
 " (variable)"
@@ -9925,62 +9931,62 @@
 "\n"
 " (variable)"
 
-#: src/multitrack.c:15502 src/multitrack.c:15614 src/multitrack.c:18736
-#: src/multitrack.c:18748
+#: src/multitrack.c:15710 src/multitrack.c:15823 src/multitrack.c:19077
+#: src/multitrack.c:19089
 #, c-format
 msgid "track %s"
 msgstr "pista %s"
 
-#: src/multitrack.c:15507 src/multitrack.c:15619 src/multitrack.c:18741
+#: src/multitrack.c:15715 src/multitrack.c:15828 src/multitrack.c:19082
 #, c-format
 msgid "tracks %s and %s"
 msgstr "faixas %s e %s"
 
-#: src/multitrack.c:15513 src/multitrack.c:15625 src/multitrack.c:18751
+#: src/multitrack.c:15721 src/multitrack.c:15834 src/multitrack.c:19091
 msgid "selected tracks"
 msgstr "faixas selecionadas"
 
-#: src/multitrack.c:15516
+#: src/multitrack.c:15726
 #, c-format
 msgid "Added %s %s to %s from %.4f to %.4f\n"
 msgstr "Adiconados %s %s até %s de %.4f até %.4f\n"
 
-#: src/multitrack.c:15550
+#: src/multitrack.c:15760
 #, c-format
 msgid "Added effect %s to track %s from %.4f to %.4f\n"
 msgstr "Adicionado efeito %s na faixa %s de %.4f até %.4f\n"
 
-#: src/multitrack.c:15631
+#: src/multitrack.c:15845
 #, c-format
 msgid "Deleted %s %s from %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15935
+#: src/multitrack.c:16143
 #, c-format
 msgid "rendered %d frames to new clip.\n"
 msgstr "renderizados %d frames para um novo clipe.\n"
 
-#: src/multitrack.c:16025
+#: src/multitrack.c:16230
 msgid "Cleaning up..."
 msgstr "A limpar..."
 
-#: src/multitrack.c:16712
+#: src/multitrack.c:17003
 msgid "_Pause"
 msgstr "_Pausa"
 
-#: src/multitrack.c:16713
+#: src/multitrack.c:17004
 msgid "Pause (p)"
 msgstr "Pausa (p)"
 
-#: src/multitrack.c:16856
+#: src/multitrack.c:17151
 msgid "Press 'm' during playback"
 msgstr "Aperte 'm' durante a execução"
 
-#: src/multitrack.c:16857
+#: src/multitrack.c:17152
 msgid "to make a mark on the timeline"
 msgstr "fazer uma marca na linha de tempo"
 
-#: src/multitrack.c:17154
+#: src/multitrack.c:17498
 #, c-format
 msgid ""
 "Inserted audio %.4f to %.4f from clip %s into backing audio from time %.4f "
@@ -9989,21 +9995,21 @@
 "Inserido áudio %.4f até %.4f do clip %s no áudio de fundo, do tempo %.4f até "
 "%.4f\n"
 
-#: src/multitrack.c:17414
+#: src/multitrack.c:17759
 #, c-format
 msgid ""
 "Inserted frames %d to %d from clip %s into track %s from time %.4f to %.4f\n"
 msgstr ""
 "Inseridos frames %d até %d no clipe %s na faixa %s do tempo %.4f até %.4f\n"
 
-#: src/multitrack.c:17998
+#: src/multitrack.c:18332
 #, c-format
 msgid ""
 "Time region %.3f to %.3f\n"
 "selected.\n"
 msgstr ""
 
-#: src/multitrack.c:18002
+#: src/multitrack.c:18336
 msgid ""
 "select one or more tracks\n"
 "to create a region.\n"
@@ -10011,106 +10017,106 @@
 "selecione uma ou mais faixas\n"
 "para criar a região.\n"
 
-#: src/multitrack.c:18004
+#: src/multitrack.c:18337
 #, c-format
 msgid "%d video tracks selected.\n"
 msgstr "%d trilhas de vídeo selecionadas.\n"
 
-#: src/multitrack.c:18006
+#: src/multitrack.c:18339
 msgid ""
 "Double click on timeline\n"
 "to deselect time region."
 msgstr ""
 
-#: src/multitrack.c:18013
+#: src/multitrack.c:18346
 msgid ""
 "Single click on an effect\n"
 "to select it."
 msgstr ""
 
-#: src/multitrack.c:18014
+#: src/multitrack.c:18347
 msgid ""
 "Double click on an effect\n"
 "to edit it."
 msgstr ""
 
-#: src/multitrack.c:18015
+#: src/multitrack.c:18348
 msgid ""
 "Right click on an effect\n"
 "for context menu.\n"
 msgstr ""
 
-#: src/multitrack.c:18017
+#: src/multitrack.c:18350
 msgid ""
 "Effect order can be changed at\n"
 "FILTER MAPS"
 msgstr ""
 
-#: src/multitrack.c:18024
+#: src/multitrack.c:18357
 msgid ""
 "You can select an effect,\n"
 "then use the INSERT BEFORE"
 msgstr ""
 
-#: src/multitrack.c:18025
+#: src/multitrack.c:18358
 msgid "or INSERT AFTER buttons to move it."
 msgstr "ou o botão INSERIR DEPOIS para movê-lo."
 
-#: src/multitrack.c:18307 src/multitrack.c:18320
+#: src/multitrack.c:18639 src/multitrack.c:18652
 msgid "Click on another effect,"
 msgstr ""
 
-#: src/multitrack.c:18308 src/multitrack.c:18321
+#: src/multitrack.c:18640 src/multitrack.c:18653
 msgid ""
 "and the selected one\n"
 "will be inserted"
 msgstr ""
 
-#: src/multitrack.c:18309
+#: src/multitrack.c:18641
 msgid "after it.\n"
 msgstr "depois deste.\n"
 
-#: src/multitrack.c:18322
+#: src/multitrack.c:18654
 msgid "before it.\n"
 msgstr "antes deste.\n"
 
-#: src/multitrack.c:18551
+#: src/multitrack.c:18889
 #, c-format
 msgid "Removed parameter values for effect %s at time %.4f\n"
 msgstr "Removidos parâmetros de efeitos para o efeito %s no tempo %.4f\n"
 
-#: src/multitrack.c:18759
+#: src/multitrack.c:19100
 #, c-format
 msgid "Set parameter values for %s %s on %s at time %.4f\n"
 msgstr "Definir os valores de parâmetro para %s %s em %s no tempo %.4f\n"
 
-#: src/multitrack.c:19251 src/multitrack.c:20873
+#: src/multitrack.c:19630 src/multitrack.c:21195
 msgid "_Autoreload each time"
 msgstr "_Autorecarregar cada vez"
 
-#: src/multitrack.c:19323
+#: src/multitrack.c:19702
 #, fuzzy
 msgid "Saving layout"
 msgstr "_Salvar layout"
 
-#: src/multitrack.c:19345
+#: src/multitrack.c:19725
 #, c-format
 msgid "Saved layout to %s\n"
 msgstr "Mapa de teclado salvo em %s\n"
 
-#: src/multitrack.c:20783
+#: src/multitrack.c:21125
 msgid "clips and frames"
 msgstr "clipes e frames"
 
-#: src/multitrack.c:20787
+#: src/multitrack.c:21128
 msgid "clips"
 msgstr "clipes"
 
-#: src/multitrack.c:20790
+#: src/multitrack.c:21130
 msgid "frames"
 msgstr "frames"
 
-#: src/multitrack.c:20800
+#: src/multitrack.c:21140
 msgid ""
 "\n"
 "Auto reload layout.\n"
@@ -10118,7 +10124,7 @@
 "\n"
 "Auto recarregar layout.\n"
 
-#: src/multitrack.c:20803
+#: src/multitrack.c:21143
 #, c-format
 msgid ""
 "%s\n"
@@ -10129,11 +10135,11 @@
 "Alguns %s estão faltando no layout%s\n"
 "Por isso não pode ser carregado corretamente.\n"
 
-#: src/multitrack.c:20920
+#: src/multitrack.c:21284
 msgid "auto backup"
 msgstr ""
 
-#: src/multitrack.c:20923
+#: src/multitrack.c:21287
 #, c-format
 msgid ""
 "\n"
@@ -10142,31 +10148,31 @@
 "\n"
 "Impossível carregar arquivo de layout %s\n"
 
-#: src/multitrack.c:20944
+#: src/multitrack.c:21308
 #, c-format
 msgid "Loading layout from %s..."
 msgstr "Carregando mapa de teclado padrão de %s..."
 
-#: src/multitrack.c:20978
+#: src/multitrack.c:21338
 #, c-format
 msgid "Got %d events...processing..."
 msgstr "Pegou %d eventos...processando..."
 
-#: src/multitrack.c:20991
+#: src/multitrack.c:21349
 msgid "Checking and rebuilding event list"
 msgstr "Checando e reconstruindo lista de eventos"
 
-#: src/multitrack.c:21017
+#: src/multitrack.c:21374
 #, c-format
 msgid "%d errors detected.\n"
 msgstr "%d erros detectados.\n"
 
-#: src/multitrack.c:21068
+#: src/multitrack.c:21422
 #, c-format
 msgid "Multitrack fps set to %.3f\n"
 msgstr "FPS multipista definido em %.3f\n"
 
-#: src/multitrack.c:21225
+#: src/multitrack.c:21576
 #, fuzzy
 msgid ""
 "The current layout has changes which have not been saved.\n"
@@ -10175,19 +10181,19 @@
 "O layout atual não foi salvo.\n"
 "O que quer fazer?\n"
 
-#: src/multitrack.c:22047
+#: src/multitrack.c:22385
 msgid "LiVES: Multitrack audio mixer"
 msgstr "LiVES: Mixer de áudio multipista"
 
-#: src/multitrack.c:22077
+#: src/multitrack.c:22414
 msgid "_Reset values"
 msgstr "_Reiniciar valores"
 
-#: src/multitrack.c:22081
+#: src/multitrack.c:22418
 msgid "_Close mixer"
 msgstr "_Fechar mixer"
 
-#: src/multitrack.c:22130
+#: src/multitrack.c:22466
 msgid ""
 "_Invert backing audio\n"
 "and layer volumes"
@@ -10195,42 +10201,42 @@
 "_Invertendo volumes do\n"
 "áudio de fundo e da camada"
 
-#: src/multitrack.c:22132
+#: src/multitrack.c:22468
 msgid "Adjust backing and layer audio values so that they sum to 1.0"
 msgstr ""
 "Ajustando valores de áudio de fundo e da camada para que possam somar 1.0"
 
-#: src/multitrack.c:22175
+#: src/multitrack.c:22510
 msgid "_Gang layer audio"
 msgstr ""
 
-#: src/multitrack.c:22177
+#: src/multitrack.c:22512
 msgid "Adjust all layer audio values to the same value"
 msgstr "Ajustar todos valores de áudio das camadas para o mesmo valor"
 
-#: src/jack.c:104
+#: src/jack.c:102
 msgid "JACK server started\n"
 msgstr "servidor JACK iniciado\n"
 
-#: src/jack.c:1284 src/jack.c:1353
+#: src/jack.c:1265 src/jack.c:1334
 msgid "Unable to connect to JACK server\n"
 msgstr "Impossível conectar ao servidor JACK\n"
 
-#: src/jack.c:1512
+#: src/jack.c:1491
 msgid "Started jack audio subsystem.\n"
 msgstr "Iniciado subsistema de áudio jack.\n"
 
-#: src/jack.c:1623
+#: src/jack.c:1600
 msgid "Started jack audio reader.\n"
 msgstr "Iniciado leitor de áudio jack.\n"
 
-#: src/jack.c:1838
+#: src/jack.c:1815
 msgid ""
 "\n"
 "Connection to jack audio was reset.\n"
 msgstr ""
 
-#: src/pulse.c:87
+#: src/pulse.c:88
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -10238,7 +10244,7 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:92
+#: src/pulse.c:94
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -10246,7 +10252,7 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:96
+#: src/pulse.c:99
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -10254,335 +10260,335 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:101
+#: src/pulse.c:104
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
 msgstr ""
 
-#: src/pulse.c:107
+#: src/pulse.c:109
 msgid "LiVES will exit and you can choose another audio player.\n"
 msgstr ""
 
-#: src/pulse.c:1352
+#: src/pulse.c:1335
 msgid ""
 "\n"
 "Connection to pulse audio was reset.\n"
 msgstr ""
 
-#: src/colourspace.c:1100
+#: src/colourspace.c:1092
 msgid "unclamped"
 msgstr ""
 
-#: src/colourspace.c:1101
+#: src/colourspace.c:1093
 msgid "clamped"
 msgstr ""
 
-#: src/omc-learn.c:195
+#: src/omc-learn.c:191
 #, c-format
 msgid "Responding to joystick events from %s\n"
 msgstr ""
 
-#: src/omc-learn.c:289
+#: src/omc-learn.c:279
 msgid "Creating ALSA seq port..."
 msgstr ""
 
-#: src/omc-learn.c:325
+#: src/omc-learn.c:313
 #, c-format
 msgid "Responding to MIDI events from %s\n"
 msgstr ""
 
-#: src/omc-learn.c:568
+#: src/omc-learn.c:554
 msgid "data"
 msgstr "dados"
 
-#: src/omc-learn.c:571
+#: src/omc-learn.c:557
 msgid "velocity"
 msgstr "velocidade"
 
-#: src/omc-learn.c:572
+#: src/omc-learn.c:558
 msgid "note"
 msgstr "nota"
 
-#: src/omc-learn.c:574 src/omc-learn.c:736 src/omc-learn.c:1105
-#: src/omc-learn.c:1591 src/omc-learn.c:1640
+#: src/omc-learn.c:560 src/omc-learn.c:724 src/omc-learn.c:1092
+#: src/omc-learn.c:1581 src/omc-learn.c:1630
 msgid "value"
 msgstr "valor"
 
-#: src/omc-learn.c:576
+#: src/omc-learn.c:562
 msgid "state"
 msgstr "estado"
 
-#: src/omc-learn.c:688
+#: src/omc-learn.c:674
 msgid "variable"
 msgstr "variável"
 
-#: src/omc-learn.c:1001
+#: src/omc-learn.c:989
 msgid "Vars."
 msgstr "Vars."
 
-#: src/omc-learn.c:1054
+#: src/omc-learn.c:1041
 #, c-format
 msgid "MIDI ch %d note on"
 msgstr ""
 
-#: src/omc-learn.c:1058
+#: src/omc-learn.c:1045
 #, c-format
 msgid "MIDI ch %d note off"
 msgstr ""
 
-#: src/omc-learn.c:1062
+#: src/omc-learn.c:1049
 #, c-format
 msgid "MIDI ch %d controller %d"
 msgstr ""
 
-#: src/omc-learn.c:1066
+#: src/omc-learn.c:1053
 #, c-format
 msgid "MIDI ch %d pitch bend"
 msgstr ""
 
-#: src/omc-learn.c:1070
+#: src/omc-learn.c:1057
 #, c-format
 msgid "MIDI ch %d pgm change"
 msgstr ""
 
-#: src/omc-learn.c:1073
+#: src/omc-learn.c:1060
 #, c-format
 msgid "Joystick button %d"
 msgstr ""
 
-#: src/omc-learn.c:1076
+#: src/omc-learn.c:1063
 #, c-format
 msgid "Joystick axis %d"
 msgstr ""
 
-#: src/omc-learn.c:1113
+#: src/omc-learn.c:1100
 msgid "x"
 msgstr "×"
 
-#: src/omc-learn.c:1122
+#: src/omc-learn.c:1109
 msgid "range"
 msgstr "intervalo"
 
-#: src/omc-learn.c:1143
+#: src/omc-learn.c:1130
 msgid "+ offset1"
 msgstr ""
 
-#: src/omc-learn.c:1161
+#: src/omc-learn.c:1150
 msgid "* scale"
 msgstr ""
 
-#: src/omc-learn.c:1179
+#: src/omc-learn.c:1170
 msgid "+ offset2"
 msgstr ""
 
-#: src/omc-learn.c:1280
+#: src/omc-learn.c:1270
 msgid ""
 "\n"
 "Click OK to delete all entries\n"
 msgstr ""
 
-#: src/omc-learn.c:1318
+#: src/omc-learn.c:1308
 msgid "LiVES: OMC learner"
 msgstr ""
 
-#: src/omc-learn.c:1334
+#: src/omc-learn.c:1324
 msgid "Clear _unmatched"
 msgstr ""
 
-#: src/omc-learn.c:1345
+#: src/omc-learn.c:1335
 msgid "_Delete all"
 msgstr "_Apagar tudo"
 
-#: src/omc-learn.c:1411
+#: src/omc-learn.c:1401
 msgid "Start video playback"
 msgstr ""
 
-#: src/omc-learn.c:1414
+#: src/omc-learn.c:1404
 msgid "Stop video playback"
 msgstr ""
 
-#: src/omc-learn.c:1418
+#: src/omc-learn.c:1408
 msgid "Clip select <clipnum>"
 msgstr ""
 
-#: src/omc-learn.c:1419
+#: src/omc-learn.c:1409
 msgid "Switch foreground clip to the nth valid clip"
 msgstr ""
 
-#: src/omc-learn.c:1423
+#: src/omc-learn.c:1413
 msgid "Play forwards"
 msgstr ""
 
-#: src/omc-learn.c:1424
+#: src/omc-learn.c:1414
 msgid "Play video in a forwards direction"
 msgstr ""
 
-#: src/omc-learn.c:1427
+#: src/omc-learn.c:1417
 msgid "Play backwards"
 msgstr ""
 
-#: src/omc-learn.c:1428
+#: src/omc-learn.c:1418
 msgid "Play video in a backwards direction"
 msgstr ""
 
-#: src/omc-learn.c:1431
+#: src/omc-learn.c:1421
 msgid "Reverse playback direction"
 msgstr ""
 
-#: src/omc-learn.c:1432
+#: src/omc-learn.c:1422
 msgid "Reverse direction of video playback"
 msgstr ""
 
-#: src/omc-learn.c:1435
+#: src/omc-learn.c:1425
 msgid "Play video faster"
 msgstr ""
 
-#: src/omc-learn.c:1436
+#: src/omc-learn.c:1426
 msgid "Play video at a slightly faster rate"
 msgstr ""
 
-#: src/omc-learn.c:1439
+#: src/omc-learn.c:1429
 msgid "Play video slower"
 msgstr ""
 
-#: src/omc-learn.c:1440
+#: src/omc-learn.c:1430
 msgid "Play video at a slightly slower rate"
 msgstr ""
 
-#: src/omc-learn.c:1443
+#: src/omc-learn.c:1433
 msgid "Toggle video freeze"
 msgstr ""
 
-#: src/omc-learn.c:1444
+#: src/omc-learn.c:1434
 msgid "Freeze video, or if already frozen, unfreeze it"
 msgstr ""
 
-#: src/omc-learn.c:1447
+#: src/omc-learn.c:1437
 msgid "Set video framerate to <fps>"
 msgstr ""
 
-#: src/omc-learn.c:1448
+#: src/omc-learn.c:1438
 msgid "Set framerate of foreground clip to <float fps>"
 msgstr ""
 
-#: src/omc-learn.c:1452
+#: src/omc-learn.c:1442
 msgid "Start recording"
 msgstr ""
 
-#: src/omc-learn.c:1455
+#: src/omc-learn.c:1445
 msgid "Stop recording"
 msgstr "Parar gravação"
 
-#: src/omc-learn.c:1458
+#: src/omc-learn.c:1448
 msgid "Toggle recording state"
 msgstr ""
 
-#: src/omc-learn.c:1461
+#: src/omc-learn.c:1451
 msgid "Swap foreground and background clips"
 msgstr ""
 
-#: src/omc-learn.c:1463
+#: src/omc-learn.c:1453
 msgid "Reset effect keys"
 msgstr ""
 
-#: src/omc-learn.c:1464
+#: src/omc-learn.c:1454
 msgid "Switch all effects off."
 msgstr ""
 
-#: src/omc-learn.c:1467
+#: src/omc-learn.c:1457
 msgid "Enable effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1471
+#: src/omc-learn.c:1461
 msgid "Disable effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1475
+#: src/omc-learn.c:1465
 msgid "Toggle effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1479
+#: src/omc-learn.c:1469
 msgid "Set parameter value <key> <pnum> = <value>"
 msgstr ""
 
-#: src/omc-learn.c:1480
+#: src/omc-learn.c:1470
 msgid "Set <value> of pth (numerical) parameter for effect key <key>."
 msgstr ""
 
-#: src/omc-learn.c:1484
+#: src/omc-learn.c:1474
 msgid "Switch foreground to next clip"
 msgstr ""
 
-#: src/omc-learn.c:1487
+#: src/omc-learn.c:1477
 msgid "Switch foreground to previous clip"
 msgstr ""
 
-#: src/omc-learn.c:1490
+#: src/omc-learn.c:1480
 msgid "Set video framerate to ratio <fps_ratio>"
 msgstr ""
 
-#: src/omc-learn.c:1491
+#: src/omc-learn.c:1481
 msgid "Set framerate ratio of foreground clip to <float fps_ratio>"
 msgstr ""
 
-#: src/omc-learn.c:1495
+#: src/omc-learn.c:1485
 msgid "Retrigger clip <clipnum>"
 msgstr "Reiniciar clipe <clipenum>"
 
-#: src/omc-learn.c:1496
+#: src/omc-learn.c:1486
 msgid ""
 "Switch foreground clip to the nth valid clip, and reset the frame number"
 msgstr ""
 
-#: src/omc-learn.c:1500
+#: src/omc-learn.c:1490
 msgid "Cycle to next mode for effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1504
+#: src/omc-learn.c:1494
 msgid "Cycle to previous mode for effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1508
+#: src/omc-learn.c:1498
 msgid "Set playback plugin parameter value <pnum> = <value>"
 msgstr ""
 
-#: src/omc-learn.c:1509
+#: src/omc-learn.c:1499
 msgid "Set <value> of pth parameter for the playback plugin."
 msgstr ""
 
 #. TRANSLATORS: short form of "clip number"
-#: src/omc-learn.c:1536 src/omc-learn.c:1607
+#: src/omc-learn.c:1526 src/omc-learn.c:1597
 msgid "clipnum"
 msgstr "clipenum"
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1545
+#: src/omc-learn.c:1535
 msgid "fps"
 msgstr ""
 
 #. TRANSLATORS: as in keyboard key
-#: src/omc-learn.c:1553 src/omc-learn.c:1560 src/omc-learn.c:1567
-#: src/omc-learn.c:1575 src/omc-learn.c:1615 src/omc-learn.c:1623
+#: src/omc-learn.c:1543 src/omc-learn.c:1550 src/omc-learn.c:1557
+#: src/omc-learn.c:1565 src/omc-learn.c:1605 src/omc-learn.c:1613
 msgid "key"
 msgstr "tecla"
 
 #. TRANSLATORS: short form of "parameter number"
-#: src/omc-learn.c:1583 src/omc-learn.c:1632
+#: src/omc-learn.c:1573 src/omc-learn.c:1622
 msgid "pnum"
 msgstr "pnum"
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1599
+#: src/omc-learn.c:1589
 msgid "fps_ratio"
 msgstr ""
 
-#: src/omc-learn.c:2443
+#: src/omc-learn.c:2417
 #, c-format
 msgid "Saving device mapping to file %s..."
 msgstr ""
 
-#: src/omc-learn.c:2527
+#: src/omc-learn.c:2498
 #, c-format
 msgid ""
 "\n"
@@ -10591,7 +10597,7 @@
 "%s\n"
 msgstr ""
 
-#: src/omc-learn.c:2534
+#: src/omc-learn.c:2505
 #, c-format
 msgid ""
 "\n"
@@ -10600,12 +10606,12 @@
 "%s\n"
 msgstr ""
 
-#: src/omc-learn.c:2571
+#: src/omc-learn.c:2541
 #, c-format
 msgid "Loading device mapping from file %s..."
 msgstr ""
 
-#: src/omc-learn.c:2576
+#: src/omc-learn.c:2544
 #, c-format
 msgid ""
 "\n"
@@ -10615,12 +10621,12 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/videodev.c:547
+#: src/videodev.c:539
 #, c-format
 msgid "Unable to open device %s\n"
 msgstr ""
 
-#: src/videodev.c:564
+#: src/videodev.c:554
 #, c-format
 msgid "Opened device %s\n"
 msgstr ""
@@ -11558,6 +11564,15 @@
 #~ msgid "$error"
 #~ msgstr "$error"
 
+#~ msgid "Pause"
+#~ msgstr "Pausa"
+
+#~ msgid "Start frame"
+#~ msgstr "Primerio frame"
+
+#~ msgid "End frame"
+#~ msgstr "Último frame"
+
 #, fuzzy
 #~ msgid "_Open"
 #~ msgstr "_Abrir..."

LiVES-2.2.8.tar.bz2/po/pt_BR.po -> LiVES-2.4.1.tar.bz2/po/pt_BR.po Changed

@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: LiVES\n"
 "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n"
-"POT-Creation-Date: 2015-02-08 17:18-0300\n"
+"POT-Creation-Date: 2015-08-09 14:52-0300\n"
 "PO-Revision-Date: 2013-03-14 12:31+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: pixel <vjpixel@gmail.com>\n"
@@ -15,8 +15,7 @@
 "X-Poedit-Language: Portuguese\n"
 "X-Poedit-SourceCharset: utf-8\n"
 
-#. TRANSLATORS: do not translate this message
-#: src/main.c:118
+#: src/main.c:128
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -25,22 +24,22 @@
 "http://lives.sourceforge.net/TRANS-README.txt"
 msgstr ""
 
-#: src/main.c:134
+#: src/main.c:153
 #, c-format
 msgid "%s Warning: %s\n"
 msgstr ""
 
-#: src/main.c:138
+#: src/main.c:157
 #, c-format
 msgid "%s Critical error: %s\n"
 msgstr ""
 
-#: src/main.c:139
+#: src/main.c:158
 #, c-format
 msgid "%s Fatal error: %s\n"
 msgstr ""
 
-#: src/main.c:176
+#: src/main.c:198
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -54,7 +53,7 @@
 "group_id=64341&atid=507139\n"
 "Obrigado. Os dados podem ser recuperados se você reiniciar o LiVes.\n"
 
-#: src/main.c:177
+#: src/main.c:199
 msgid ""
 "\n"
 "\n"
@@ -66,7 +65,7 @@
 "Ao reportar travamentos, por favor informe qual o seu sistema operacional, "
 "distribuição e a versão do LiVES ("
 
-#: src/main.c:180
+#: src/main.c:203
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -74,7 +73,7 @@
 "e toda informação mostrada abaixo:\n"
 "\n"
 
-#: src/main.c:184
+#: src/main.c:206
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
@@ -84,84 +83,84 @@
 "seja coletada mais informações.\n"
 "\n"
 
-#: src/main.c:192
+#: src/main.c:216
 msgid "Preserving set.\n"
 msgstr "Preservando set.\n"
 
-#: src/main.c:636
+#: src/main.c:691
 msgid "Resizing"
 msgstr "Redimensionando"
 
-#: src/main.c:643
+#: src/main.c:698
 msgid "_Resize All Frames"
 msgstr "_Redimensionar Todos Frames"
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:895
+#: src/main.c:948
 msgid "Any"
 msgstr "Qualquer"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:897
+#: src/main.c:950
 msgid "None"
 msgstr "Nenhum"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:899
+#: src/main.c:952
 msgid "recommended"
 msgstr "recomendado"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:901
+#: src/main.c:954
 msgid "disabled !"
 msgstr "desativado!"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:903
+#: src/main.c:956
 msgid "**The current layout**"
 msgstr "**Layout atual**"
 
 #. TRANSLATORS: adjective for "Built in" type effects
-#: src/main.c:905
+#: src/main.c:958
 msgid "Builtin"
 msgstr "Builtin"
 
 #. TRANSLATORS: adjective for "Custom" type effects
-#: src/main.c:907
+#: src/main.c:960
 msgid "Custom"
 msgstr "Customizado"
 
 #. TRANSLATORS: adjective for "Test" type effects
-#: src/main.c:909
+#: src/main.c:962
 msgid "Test"
 msgstr "Teste"
 
-#: src/main.c:1054
+#: src/main.c:1107
 msgid "Foreground"
 msgstr ""
 
-#: src/main.c:1055
+#: src/main.c:1108
 #, fuzzy
 msgid "Background"
 msgstr "Fundo _Branco"
 
-#: src/main.c:1566
+#: src/main.c:1624
 msgid "Loading realtime effect plugins..."
 msgstr "Carregando plugins de efeitos em tempo real..."
 
-#: src/main.c:1631
+#: src/main.c:1690
 msgid "Starting jack audio server..."
 msgstr "Iniciando servidor de áudio jack..."
 
-#: src/main.c:1633
+#: src/main.c:1692
 msgid "Starting jack transport server..."
 msgstr "Iniciando o servidor jack de transporte..."
 
-#: src/main.c:1634
+#: src/main.c:1693
 msgid "Connecting to jack transport server..."
 msgstr "Conectando ao servidor jack de transporte..."
 
-#: src/main.c:1663
+#: src/main.c:1723
 #, c-format
 msgid ""
 "\n"
@@ -173,114 +172,114 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1697
+#: src/main.c:1758
 msgid "Starting pulse audio server..."
 msgstr "Iniciando o servidor pulse audio..."
 
-#: src/main.c:1765
+#: src/main.c:1825
 msgid "Checking optional dependencies:"
 msgstr "Checando dependências opcionais:"
 
-#: src/main.c:1766
+#: src/main.c:1826
 msgid "mplayer...detected..."
 msgstr "mplayer...detectado..."
 
-#: src/main.c:1767
+#: src/main.c:1827
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...NÃO DETECTADO..."
 
-#: src/main.c:1768
+#: src/main.c:1828
 #, fuzzy
 msgid "mplayer2...detected..."
 msgstr "mplayer...detectado..."
 
-#: src/main.c:1769
+#: src/main.c:1829
 #, fuzzy
 msgid "mplayer2...NOT DETECTED..."
 msgstr "mplayer...NÃO DETECTADO..."
 
-#: src/main.c:1770
+#: src/main.c:1830
 msgid "convert...detected..."
 msgstr "convert...detectado..."
 
-#: src/main.c:1771
+#: src/main.c:1831
 msgid "convert...NOT DETECTED..."
 msgstr "convert...NÃO DETECTADO..."
 
-#: src/main.c:1772
+#: src/main.c:1832
 msgid "composite...detected..."
 msgstr "composite...detectado..."
 
-#: src/main.c:1773
+#: src/main.c:1833
 msgid "composite...NOT DETECTED..."
 msgstr "composite...NÃO DETECTADO..."
 
-#: src/main.c:1774
+#: src/main.c:1834
 msgid "sox...detected\n"
 msgstr "sox...detectado\n"
 
-#: src/main.c:1775
+#: src/main.c:1835
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...NÃO DETECTADO...\n"
 
-#: src/main.c:1776
+#: src/main.c:1836
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...detectado..."
 
-#: src/main.c:1777
+#: src/main.c:1837
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...NÃO DETECTADO..."
 
-#: src/main.c:1778
+#: src/main.c:1838
 msgid "jackd...detected..."
 msgstr "jackd...detectado..."
 
-#: src/main.c:1779
+#: src/main.c:1839
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...NÃO DETECTADO..."
 
-#: src/main.c:1780
+#: src/main.c:1840
 msgid "pulse audio...detected..."
 msgstr "pulse audio...detectado..."
 
-#: src/main.c:1781
+#: src/main.c:1841
 msgid "pulse audio...NOT DETECTED..."
 msgstr "pulse audio...NÃO DETECTADO..."
 
-#: src/main.c:1782
+#: src/main.c:1842
 msgid "python...detected..."
 msgstr "python...detectado..."
 
-#: src/main.c:1783
+#: src/main.c:1843
 msgid "python...NOT DETECTED..."
 msgstr "python...NÃO DETECTADO..."
 
-#: src/main.c:1784
+#: src/main.c:1844
 msgid "dvgrab...detected..."
 msgstr "dvgrab...detectado..."
 
-#: src/main.c:1785
+#: src/main.c:1845
 msgid "dvgrab...NOT DETECTED..."
 msgstr "dvgrab...NÃO DETECTADO..."
 
-#: src/main.c:1786
+#: src/main.c:1846
 msgid "xwininfo...detected..."
 msgstr "xwininfo...detectado..."
 
-#: src/main.c:1787
+#: src/main.c:1847
 msgid "xwininfo...NOT DETECTED..."
 msgstr "xwininfo...NÃO DETECTADO..."
 
-#: src/main.c:1793
+#: src/main.c:1853
 #, c-format
 msgid "Windows version %04X"
 msgstr ""
 
-#: src/main.c:1795
+#: src/main.c:1855
 msgid "UNKNOWN - please patch me !"
 msgstr ""
 
-#: src/main.c:1799
+#: src/main.c:1859
 #, c-format
 msgid ""
 "\n"
@@ -291,48 +290,48 @@
 "\n"
 "Gerenciador de janelas: \"%s\"; "
 
-#: src/main.c:1802
+#: src/main.c:1862
 #, c-format
 msgid "number of monitors detected: %d\n"
 msgstr "número de monitores detectados: %d\n"
 
-#: src/main.c:1805
+#: src/main.c:1865
 #, c-format
 msgid "Number of CPUs detected: %d "
 msgstr ""
 
-#: src/main.c:1808 src/multitrack.c:4902
+#: src/main.c:1868 src/multitrack.c:5068
 msgid "little endian"
 msgstr "little endian"
 
-#: src/main.c:1809 src/multitrack.c:4901
+#: src/main.c:1869 src/multitrack.c:5067
 msgid "big endian"
 msgstr "big endian"
 
-#: src/main.c:1810
+#: src/main.c:1870
 #, c-format
 msgid "(%d bits, %s)\n"
 msgstr ""
 
-#: src/main.c:1814
+#: src/main.c:1874
 msgid "GUI type is: "
 msgstr ""
 
-#: src/main.c:1818
+#: src/main.c:1878
 #, c-format
 msgid "GTK+ version %d.%d.%d (compiled with %d.%d.%d)"
 msgstr ""
 
-#: src/main.c:1840
+#: src/main.c:1900
 msgid ", with cairo support"
 msgstr ""
 
-#: src/main.c:1847
+#: src/main.c:1907
 #, c-format
 msgid "Temp directory is %s\n"
 msgstr "o diretório temp utilizado é %s\n"
 
-#: src/main.c:1851
+#: src/main.c:1911
 msgid ""
 "WARNING - this version of LiVES was compiled without either\n"
 "jack or pulse audio support.\n"
@@ -342,15 +341,15 @@
 "jack ou suporte ao pulse audio.\n"
 "Muitos recursos de áudio não estarão disponíveis.\n"
 
-#: src/main.c:1854
+#: src/main.c:1914
 msgid "Compiled with jack support, good !\n"
 msgstr "Compilado com suporte a JACK, bom!\n"
 
-#: src/main.c:1857
+#: src/main.c:1917
 msgid "Compiled with pulse audio support, wonderful !\n"
 msgstr "Compilado com o suporte ao pulse audio, maravilha !\n"
 
-#: src/main.c:1861
+#: src/main.c:1921
 #, c-format
 msgid ""
 "Welcome to LiVES version %s.\n"
@@ -364,7 +363,7 @@
 "estudiolivre.org\n"
 "\n"
 
-#: src/main.c:2306
+#: src/main.c:2380
 #, c-format
 msgid ""
 "\n"
@@ -374,85 +373,90 @@
 "A sintaxe de inicialização é: %s [opçoes] [nome_do_arquivo [tempo_inicial] "
 "[frames]]\n"
 
-#: src/main.c:2307
+#: src/main.c:2381
 msgid "Where: filename is the name of a media file or backup file.\n"
 msgstr "Onde: nome_do_arquivo é o nome do arquivo de mídia ou backup.\n"
 
-#: src/main.c:2308
+#: src/main.c:2382
 msgid "start_time : filename start time in seconds\n"
 msgstr "tempo_inicial : tempo inicial do arquivo em segundos\n"
 
-#: src/main.c:2309
+#: src/main.c:2383
 msgid "frames : maximum number of frames to open\n"
 msgstr "frames : número máximo de frames a abrir\n"
 
-#: src/main.c:2311
+#: src/main.c:2385
 msgid "opts can be:\n"
 msgstr "as opções podem ser:\n"
 
-#: src/main.c:2312
+#: src/main.c:2386
 msgid "-help            : show this help text and exit\n"
 msgstr "-help            : mostra este texto de ajuda e sai\n"
 
-#: src/main.c:2313
+#: src/main.c:2387
 msgid "-tmpdir <tempdir>: use alternate working directory (e.g /var/ramdisk)\n"
 msgstr ""
 
-#: src/main.c:2314
+#: src/main.c:2388
 msgid "-set <setname>   : autoload clip set setname\n"
 msgstr "-set <nome_do_set>   : autocarregar set de clips nome_do_set\n"
 
-#: src/main.c:2315
+#: src/main.c:2389
 msgid "-noset           : do not load any set on startup\n"
 msgstr "-noset           : não carregar set no início\n"
 
-#: src/main.c:2316
+#: src/main.c:2390
 msgid "-norecover       : force no-loading of crash recovery\n"
 msgstr "-norecover       : forçar não carregamento da recuperação de crash\n"
 
-#: src/main.c:2317
+#: src/main.c:2391
 msgid "-recover         : force loading of crash recovery\n"
 msgstr "-recover         : forçar carregamento da recuperação de crash\n"
 
-#: src/main.c:2318
-msgid "-nothreaddialog  : doe nothing - retained for backwards compatibility\n"
+#: src/main.c:2392
+msgid ""
+"-nothreaddialog  : does nothing - retained for backwards compatibility\n"
 msgstr ""
 
-#: src/main.c:2319
+#: src/main.c:2393
 msgid "-nogui           : do not show the gui\n"
 msgstr "-nogui           : não mostrar a interface gráfica\n"
 
-#: src/main.c:2320
+#: src/main.c:2394
 msgid "-nosplash        : do not show the splash window\n"
 msgstr ""
 
-#: src/main.c:2321
+#: src/main.c:2395
 msgid "-noplaywin       : do not show the play window\n"
 msgstr ""
 
-#: src/main.c:2322
+#: src/main.c:2396
+msgid "-noninteractive  : disable menu interactivity\n"
+msgstr ""
+
+#: src/main.c:2397
 msgid "-startup-ce      : start in clip editor mode\n"
 msgstr "-startup-ce      : iniciar no modo de edição de clipe\n"
 
-#: src/main.c:2323
+#: src/main.c:2398
 msgid "-startup-mt      : start in multitrack mode\n"
 msgstr "-startup-mt      : iniciar no modo de multi-trilhas\n"
 
-#: src/main.c:2324
+#: src/main.c:2399
 msgid ""
 "-fxmodesmax <n>  : allow <n> modes per effect key (minimum is 1, default is "
 "8)\n"
 msgstr ""
 
-#: src/main.c:2326
+#: src/main.c:2401
 msgid "-oscstart <port> : start OSC listener on UDP port <port>\n"
 msgstr "-oscstart <port> : iniciar monitoramento de OSC na porta UDP <port>\n"
 
-#: src/main.c:2327
+#: src/main.c:2402
 msgid "-nooscstart      : do not start OSC listener\n"
 msgstr "-nooscstart      : não iniciar monitoramento de OSC\n"
 
-#: src/main.c:2329
+#: src/main.c:2404
 #, fuzzy
 msgid ""
 "-aplayer <ap>    : start with selected audio player. <ap> can be mplayer, "
@@ -462,46 +466,46 @@
 "ser mplayer"
 
 #. TRANSLATORS: pulse (audio)
-#: src/main.c:2332
+#: src/main.c:2407
 msgid ", pulse"
 msgstr ", pulse"
 
-#: src/main.c:2335
+#: src/main.c:2410
 msgid ", sox or jack\n"
 msgstr ", sox ou jack\n"
 
-#: src/main.c:2336
+#: src/main.c:2412
 msgid ""
 "-jackopts <opts>    : opts is a bitmap of jack startup options [1 = jack "
 "transport client, 2 = jack transport master, 4 = start jack transport "
 "server, 8 = pause audio when video paused, 16 = start jack audio server] \n"
 msgstr ""
 
-#: src/main.c:2338
+#: src/main.c:2414
 msgid " or sox\n"
 msgstr " ou sox\n"
 
-#: src/main.c:2340
+#: src/main.c:2416
 msgid "-devicemap <mapname>          : autoload devicemap\n"
 msgstr "-devicemap <mapname>          : autocarregar devicemap\n"
 
-#: src/main.c:2341
+#: src/main.c:2418
 msgid ""
 "-vppdefaults <file>          : load video playback plugin defaults from "
 "<file> (Note: only sets the settings, not the plugin type)\n"
 msgstr ""
 
-#: src/main.c:2342
+#: src/main.c:2419
 msgid "-debug            : try to debug crashes (requires 'gdb' installed)\n"
 msgstr ""
 "-debug            : tentativa de debug falhou (necessita do 'gdb' "
 "instalado)\n"
 
-#: src/main.c:2373 src/gui.c:1128
+#: src/main.c:2449 src/gui.c:1127
 msgid "Starting GUI..."
 msgstr "Iniciando interface gráfica..."
 
-#: src/main.c:2396
+#: src/main.c:2475
 #, c-format
 msgid ""
 "\n"
@@ -512,7 +516,7 @@
 "(Maybe you need to change the value of <prefix_dir> in your %s file)\n"
 msgstr ""
 
-#: src/main.c:2410
+#: src/main.c:2492
 #, c-format
 msgid ""
 "\n"
@@ -520,7 +524,7 @@
 "Please make sure you have write access to %s and try again.\n"
 msgstr ""
 
-#: src/main.c:2415
+#: src/main.c:2498
 msgid ""
 "\n"
 "`smogrify` must be in your path, and be executable\n"
@@ -534,7 +538,7 @@
 "Por favor, leia o arquivo README que vem com este pacote\n"
 "antes de rodar o LiVES.\n"
 
-#: src/main.c:2421
+#: src/main.c:2504
 #, c-format
 msgid ""
 "\n"
@@ -544,7 +548,7 @@
 "Please check the file permissions for this file and try again.\n"
 msgstr ""
 
-#: src/main.c:2428
+#: src/main.c:2512
 #, c-format
 msgid ""
 "\n"
@@ -555,7 +559,7 @@
 "and try again.\n"
 msgstr ""
 
-#: src/main.c:2438
+#: src/main.c:2522
 #, c-format
 msgid ""
 "Please check the <tempdir> setting in \n"
@@ -563,7 +567,7 @@
 "and try again.\n"
 msgstr ""
 
-#: src/main.c:2445
+#: src/main.c:2528
 #, c-format
 msgid ""
 "\n"
@@ -573,7 +577,7 @@
 "%s"
 msgstr ""
 
-#: src/main.c:2453
+#: src/main.c:2536
 msgid ""
 "\n"
 "An incorrect version of smogrify was found in your path.\n"
@@ -591,7 +595,7 @@
 "\n"
 "Obrigado.\n"
 
-#: src/main.c:2458
+#: src/main.c:2541
 #, fuzzy
 msgid ""
 "\n"
@@ -602,7 +606,7 @@
 "LiVES atualmente precisa do 'mplayer' ou 'sox' para funcionar. Por favor "
 "instale um deles e tente novamente.\n"
 
-#: src/main.c:2462
+#: src/main.c:2546
 #, fuzzy
 msgid ""
 "\n"
@@ -613,7 +617,7 @@
 "LiVES atualmente precisa do 'mplayer' ou 'sox' para funcionar. Por favor "
 "instale um deles e tente novamente.\n"
 
-#: src/main.c:2472
+#: src/main.c:2556
 #, fuzzy
 msgid ""
 "\n"
@@ -624,7 +628,7 @@
 "LiVES não conseguiu encontrar 'mplayer'. Você deverá instalar o mplayer para "
 "utilizar o LiVES com todos os seus recursos.\n"
 
-#: src/main.c:2475
+#: src/main.c:2561
 msgid ""
 "\n"
 "LiVES was unable to locate 'convert'. You should install convert and image-"
@@ -634,7 +638,7 @@
 "LiVES não conseguiu localizar 'convert'. Você deverá instalar o Convert e o "
 "Image Magick, caso deseje utilizar os efeitos rederizados.\n"
 
-#: src/main.c:2478
+#: src/main.c:2566
 msgid ""
 "\n"
 "LiVES was unable to locate 'composite'. You should install composite and "
@@ -644,7 +648,7 @@
 "LiVES não conseguiu localizar 'composite'. Você deverá instalar o Composite "
 "e o Image Magick, caso deseje utilizar a função mesclar..\n"
 
-#: src/main.c:2481
+#: src/main.c:2570
 msgid ""
 "\n"
 "LiVES was unable to locate 'sox'. Some audio features may not work. You "
@@ -654,7 +658,7 @@
 "LiVES não foi capaz de localizar 'sox'. Alguns recursos de áudio podem não "
 "funcionar. Instale o 'sox'.\n"
 
-#: src/main.c:2484
+#: src/main.c:2575
 #, c-format
 msgid ""
 "\n"
@@ -665,59 +669,59 @@
 "You may need to change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/main.c:2611
+#: src/main.c:2707
 #, c-format
 msgid "Autoloading set %s..."
 msgstr "Carregando automaticamente set %s..."
 
 #. TRANSLATORS: localised name may be used here
-#: src/main.c:2781 src/interface.c:738
+#: src/main.c:2902
 msgid "LiVES"
 msgstr ""
 
-#: src/main.c:2948
+#: src/main.c:3066
 #, c-format
 msgid "Invalid audio player %s\n"
 msgstr "O reprodutor de áudio %s é inválido\n"
 
-#: src/main.c:3077
+#: src/main.c:3214
 #, c-format
 msgid "LiVES-%s: <Untitled%d> %dx%d : %d frames %d bpp %.3f fps"
 msgstr "LiVES-%s: <Sem título %d> %dx%d : %d frames %d bpp %.3f fps"
 
-#: src/main.c:3082
+#: src/main.c:3219
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : ??? frames ??? bpp %.3f fps"
 msgstr "LiVES-%s: <%s> %dx%d : ??? frames ??? bpp %.3f fps"
 
-#: src/main.c:3086
+#: src/main.c:3222
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : %d frames %d bpp %.3f fps"
 msgstr "LiVES-%s: <%s> %dx%d : %d frames %d bpp %.3f fps"
 
-#: src/main.c:3094
+#: src/main.c:3229
 #, c-format
 msgid "LiVES-%s: <No File>"
 msgstr "LiVES-%s: <Nenhum Arquivo>"
 
 #. TRANSLATORS: rec(ord)
-#: src/main.c:5085
+#: src/main.c:5201
 #, c-format
 msgid "rec %9d/%d"
 msgstr "grv %9d/%d"
 
 #. TRANSLATORS: out of memory (rec(ord))
-#: src/main.c:5091
+#: src/main.c:5206
 #, c-format
 msgid "!rec %9d/%d"
 msgstr "!grv %9d/%d"
 
-#: src/main.c:5398 src/main.c:5399 src/gui.c:2110 src/gui.c:3220
-#: src/saveplay.c:2336
+#: src/main.c:5500 src/main.c:5501 src/gui.c:2108 src/gui.c:3331
+#: src/saveplay.c:2315
 msgid "Play"
 msgstr "Tocar"
 
-#: src/main.c:6128
+#: src/main.c:6216
 msgid ""
 "LiVES was unable to capture this image\n"
 "\n"
@@ -725,35 +729,35 @@
 "LiVES não conseguiu capturar esta imagem\n"
 "\n"
 
-#: src/main.c:6250
+#: src/main.c:6345
 #, c-format
 msgid "Closed file %s\n"
 msgstr "Arquivo %s fechado\n"
 
-#: src/main.c:6452 src/gui.c:648 src/utils.c:4312 src/utils.c:4344
-#: src/saveplay.c:3550 src/multitrack.c:4510 src/multitrack.c:6268
+#: src/main.c:6542 src/gui.c:647 src/utils.c:4256 src/utils.c:4286
+#: src/saveplay.c:3500 src/multitrack.c:4678 src/multitrack.c:6447
 msgid "_Undo"
 msgstr "Desfazer [_U]"
 
-#: src/main.c:6453 src/gui.c:666 src/utils.c:4313 src/utils.c:4345
-#: src/saveplay.c:3551 src/multitrack.c:4531 src/multitrack.c:6293
+#: src/main.c:6543 src/gui.c:665 src/utils.c:4257 src/utils.c:4287
+#: src/saveplay.c:3501 src/multitrack.c:4698 src/multitrack.c:6472
 msgid "_Redo"
 msgstr "_Refazer"
 
-#: src/main.c:6493 src/interface.c:470 src/gui.c:2326 src/preferences.c:2357
-#: src/resample.c:1516
+#: src/main.c:6583 src/interface.c:457 src/gui.c:2324 src/preferences.c:2391
+#: src/resample.c:1488
 msgid "Video"
 msgstr "Vídeo"
 
-#: src/main.c:6494 src/interface.c:483 src/gui.c:2351
+#: src/main.c:6584 src/interface.c:470 src/gui.c:2348
 msgid "Left Audio"
 msgstr "Áudio Esquerdo"
 
-#: src/main.c:6495 src/gui.c:2375
+#: src/main.c:6585 src/gui.c:2371
 msgid "Right Audio"
 msgstr "Áudio Direito"
 
-#: src/main.c:6540
+#: src/main.c:6630
 #, fuzzy
 msgid ""
 "\n"
@@ -769,11 +773,11 @@
 "Por favor ajuste as opções de execução em 'Preferências | Execução' e tente "
 "novamente.\n"
 
-#: src/main.c:7051 src/plugins.c:1502
+#: src/main.c:7134 src/plugins.c:1468
 msgid "LiVES: - Play Window"
 msgstr "LiVES: - Tocador"
 
-#: src/startup.c:25
+#: src/startup.c:24
 #, c-format
 msgid ""
 "A directory named\n"
@@ -783,7 +787,7 @@
 "(Free space = %s)\n"
 msgstr ""
 
-#: src/startup.c:32
+#: src/startup.c:29
 #, c-format
 msgid ""
 "A directory named\n"
@@ -793,7 +797,7 @@
 "Please select another location.\n"
 msgstr ""
 
-#: src/startup.c:49
+#: src/startup.c:46
 #, c-format
 msgid ""
 "\n"
@@ -804,7 +808,7 @@
 "(Free space = %s)"
 msgstr ""
 
-#: src/startup.c:54
+#: src/startup.c:50
 #, c-format
 msgid ""
 "\n"
@@ -813,11 +817,11 @@
 "Please try again and choose a different location.\n"
 msgstr ""
 
-#: src/startup.c:96
+#: src/startup.c:92
 msgid "Directory name is too long !"
 msgstr "Nome do diretorio é muito longo !"
 
-#: src/startup.c:223
+#: src/startup.c:216
 msgid ""
 "LiVES FAILED TO START YOUR SELECTED AUDIO PLAYER !\n"
 "\n"
@@ -825,7 +829,7 @@
 "LiVES FALHOU AO INICIAR SEU TOCADOR DE ÁUDIO !\n"
 "\n"
 
-#: src/startup.c:230
+#: src/startup.c:222
 msgid ""
 "Before starting LiVES, you need to choose an audio player.\n"
 "\n"
@@ -835,7 +839,7 @@
 "\n"
 "O PULSE AUDIO é o mais recomendável para a maior parte dos usuários."
 
-#: src/startup.c:233
+#: src/startup.c:225
 msgid ""
 ", but this version of LiVES was not compiled with pulse audio support.\n"
 "\n"
@@ -843,7 +847,7 @@
 ", porém esta versão do LiVES não foi compilada com suporte ao pulse audio.\n"
 "\n"
 
-#: src/startup.c:236
+#: src/startup.c:229
 msgid ""
 ", but you do not have pulse audio installed on your system.\n"
 " You are advised to install pulse audio first before running LiVES.\n"
@@ -853,11 +857,11 @@
 " É aconselhável instalar o pulse audio primeiro antes de iniciar o LiVES.\n"
 "\n"
 
-#: src/startup.c:241
+#: src/startup.c:233
 msgid "JACK audio is recommended for pro users"
 msgstr "JACK audio é recomendável para usuários avançados"
 
-#: src/startup.c:244
+#: src/startup.c:236
 msgid ""
 ", but this version of LiVES was not compiled with jack audio support.\n"
 "\n"
@@ -865,7 +869,7 @@
 ", porém esta versão do LiVES não foi compilada com suporte ao Jack.\n"
 "\n"
 
-#: src/startup.c:247
+#: src/startup.c:239
 msgid ""
 ", but you do not have jackd installed. You may wish to install jackd first "
 "before running LiVES.\n"
@@ -875,7 +879,7 @@
 "antes de iniciar o LiVES.\n"
 "\n"
 
-#: src/startup.c:250
+#: src/startup.c:242
 msgid ""
 ", but may prevent LiVES from starting on some systems.\n"
 "If LiVES will not start with jack, you can restart and try with another "
@@ -883,11 +887,11 @@
 "\n"
 msgstr ""
 
-#: src/startup.c:254
+#: src/startup.c:246
 msgid "SOX may be used if neither of the preceding players work, "
 msgstr "O SOX pode ser utilizado se nenhum dos outros players funcionarem, "
 
-#: src/startup.c:257
+#: src/startup.c:249
 msgid ""
 "but some audio features will be disabled.\n"
 "\n"
@@ -895,7 +899,7 @@
 "porém alguns recursos de áudio serão desabilitados\n"
 "\n"
 
-#: src/startup.c:260
+#: src/startup.c:251
 msgid ""
 "but you do not have sox installed.\n"
 "You are advised to install it before running LiVES.\n"
@@ -905,7 +909,7 @@
 "É aconselhável instalá-lo antes de iniciar o LiVES.\n"
 "\n"
 
-#: src/startup.c:264
+#: src/startup.c:255
 #, fuzzy
 msgid ""
 "The MPLAYER/MPLAYER2 audio player is only recommended for testing purposes.\n"
@@ -914,97 +918,97 @@
 "O MPLAYER é recomendável apenas para testes.\n"
 "\n"
 
-#: src/startup.c:281
+#: src/startup.c:271
 msgid "LiVES: - Choose an audio player"
 msgstr "LiVES: escolha um reprodutor de áudio"
 
-#: src/startup.c:298
+#: src/startup.c:288
 msgid "Use _pulse audio player"
 msgstr "Usar _pulse player de áudio"
 
-#: src/startup.c:320
+#: src/startup.c:310
 msgid "Use _jack audio player"
 msgstr "Usar o reprodutor de áudio _jack"
 
-#: src/startup.c:340
+#: src/startup.c:330
 msgid "Use _sox audio player"
 msgstr "Usar _sox audio player"
 
-#: src/startup.c:361
+#: src/startup.c:351
 msgid "Use _mplayer audio player"
 msgstr "Usar _mplayer audio player"
 
-#: src/startup.c:381
+#: src/startup.c:371
 #, fuzzy
 msgid "Use _mplayer2 audio player"
 msgstr "Usar _mplayer audio player"
 
-#: src/startup.c:405 src/startup.c:580 src/interface.c:1506
+#: src/startup.c:395 src/startup.c:569 src/interface.c:1398
 msgid "_Next"
 msgstr "_Próximo"
 
-#: src/startup.c:445
+#: src/startup.c:435
 msgid "Skipped"
 msgstr "Pulado"
 
-#: src/startup.c:460
+#: src/startup.c:450
 msgid "Passed"
 msgstr "Passou"
 
-#: src/startup.c:493
+#: src/startup.c:483
 msgid "Failed"
 msgstr "Falhou"
 
-#: src/startup.c:552
+#: src/startup.c:542
 msgid "LiVES: - Testing Configuration"
 msgstr "LiVES: - Configuração de teste"
 
-#: src/startup.c:555
+#: src/startup.c:544
 msgid "LiVES: - Troubleshoot"
 msgstr "LiVES: - Resolução de problemas"
 
-#: src/startup.c:568
+#: src/startup.c:557
 msgid "LiVES will now run some basic configuration tests\n"
 msgstr "LiVES irá fazer alguns testes de configuração básica\n"
 
-#: src/startup.c:603
+#: src/startup.c:591
 msgid "Checking for \"sox\" presence"
 msgstr "Verificando a presença do \"sox\""
 
-#: src/startup.c:607
+#: src/startup.c:595
 msgid ""
 "You should install sox to be able to use all the audio features in LiVES"
 msgstr ""
 "Você deve instalar o sox para ser capaz de usar todos os recursos de áudio "
 "no LiVES"
 
-#: src/startup.c:615
+#: src/startup.c:602
 msgid "Checking if sox can convert audio"
 msgstr "Verificando se o sox pode converter o audio"
 
-#: src/startup.c:638
+#: src/startup.c:625
 msgid "Unable to allocate 176400 bytes memory."
 msgstr ""
 
-#: src/startup.c:653
+#: src/startup.c:639
 #, c-format
 msgid "Unable to write to: %s"
 msgstr ""
 
-#: src/startup.c:667 src/startup.c:807
+#: src/startup.c:653 src/startup.c:789
 #, c-format
 msgid "Command failed: %s"
 msgstr ""
 
-#: src/startup.c:689
+#: src/startup.c:675
 msgid "You should install sox_fmt_all or similar"
 msgstr "Você deve instalar sox_fmt_all ou similar"
 
-#: src/startup.c:717
+#: src/startup.c:703
 msgid "Checking for \"mplayer\" presence"
 msgstr "Procurando por \"mplayer\""
 
-#: src/startup.c:721
+#: src/startup.c:707
 #, fuzzy
 msgid ""
 "You should install mplayer or mplayer2 to be able to use all the decoding "
@@ -1013,45 +1017,45 @@
 "Você deve instalar mplayer para poder utilizar todas as funções de "
 "decodificação no LiVES"
 
-#: src/startup.c:747
+#: src/startup.c:732
 msgid "Checking if mplayer can convert audio"
 msgstr "Verificando se mplayer pode converter o audio"
 
-#: src/startup.c:768
+#: src/startup.c:751
 #, fuzzy
 msgid "You should install mplayer or mplayer2 with pcm/wav support"
 msgstr "Você deve instalar mplayer com suporte a pcm/wav"
 
-#: src/startup.c:785
+#: src/startup.c:767
 msgid "Checking if mplayer can decode to png/alpha"
 msgstr "Verificando se o mplayer pode decodificar para png/alpha"
 
-#: src/startup.c:828
+#: src/startup.c:810
 msgid "You may wish to upgrade mplayer to a newer version"
 msgstr "Talvez você queira atualizar o mplayer para a nova versão"
 
-#: src/startup.c:854
+#: src/startup.c:836
 msgid "Checking if mplayer can decode to jpeg"
 msgstr "Verificando se o mplayer pode decodificar para jpeg"
 
-#: src/startup.c:882
+#: src/startup.c:862
 msgid "You should install mplayer with either png/alpha or jpeg support"
 msgstr "Você deve instalar mplayer com suporte a png/alpha"
 
-#: src/startup.c:883
+#: src/startup.c:863
 msgid "You may wish to add jpeg output support to mplayer"
 msgstr "Você pode adicionar suporte a saída jpeg com mplayer"
 
-#: src/startup.c:892
+#: src/startup.c:872
 msgid "Checking for \"convert\" presence"
 msgstr "Checando a presença do  \"converter\""
 
-#: src/startup.c:896
+#: src/startup.c:876
 msgid "Install imageMagick to be able to use all of the rendered effects"
 msgstr ""
 "Instalar o ImageMagick para conseguir usar todos os efeitos pretendidos"
 
-#: src/startup.c:909
+#: src/startup.c:889
 msgid ""
 "\n"
 "\n"
@@ -1059,7 +1063,7 @@
 "Preferences/Decoding.    \n"
 msgstr ""
 
-#: src/startup.c:915
+#: src/startup.c:894
 msgid ""
 "\n"
 "\n"
@@ -1071,7 +1075,7 @@
 "    Clique Cancelar para sair e instalar o componentes que estão faltando, "
 "ou Próximo para continuar    \n"
 
-#: src/startup.c:949
+#: src/startup.c:928
 msgid ""
 "\n"
 "\n"
@@ -1081,7 +1085,7 @@
 "\n"
 "Finalmente, você pode escolher a interface padrão para LiVES.\n"
 
-#: src/startup.c:950
+#: src/startup.c:929
 msgid ""
 "\n"
 "\n"
@@ -1092,7 +1096,7 @@
 "LiVES tem duas interfaces principais e você pode começar com qualquer uma "
 "delas.\n"
 
-#: src/startup.c:951
+#: src/startup.c:930
 msgid ""
 "\n"
 "\n"
@@ -1102,30 +1106,30 @@
 "\n"
 "O padrão pode ser alterado nas preferências.\n"
 
-#: src/startup.c:961
+#: src/startup.c:940
 msgid "LiVES: - Choose the startup interface"
 msgstr "LiVES: - Escolha a interface inicial"
 
-#: src/startup.c:972
+#: src/startup.c:951
 msgid "Start in _Clip Edit mode"
 msgstr "Inciando o _Clip no modo de edição"
 
-#: src/startup.c:975
+#: src/startup.c:954
 msgid "This is the best choice for simple editing tasks and for VJs\n"
 msgstr ""
 
-#: src/startup.c:981
+#: src/startup.c:960
 msgid "Start in _Multitrack mode"
 msgstr "Iniciando no modo _Multitrack"
 
-#: src/startup.c:983
+#: src/startup.c:962
 msgid ""
 "This is a better choice for complex editing tasks involving multiple clips.\n"
 msgstr ""
 "Esta é a melhor escolha para tarefas de edição complexa que envolve vários "
 "clipes.\n"
 
-#: src/startup.c:992
+#: src/startup.c:971
 msgid "_Finish"
 msgstr "_Finalizar"
 
@@ -1142,38 +1146,38 @@
 msgid "Apply _Deinterlace"
 msgstr ""
 
-#: src/interface.c:66
+#: src/interface.c:65
 msgid "If this is set, frames will be deinterlaced as they are imported."
 msgstr ""
 "Se isso for selecionado, frames vão ser desinterlaçados enquanto forem "
 "importados."
 
-#: src/interface.c:113 src/callbacks.c:9623 src/callbacks.c:9646
-#: src/callbacks.c:9647 src/gui.c:3223 src/gui.c:3821 src/saveplay.c:2339
-#: src/saveplay.c:3138 src/dialogs.c:1514 src/dialogs.c:1515
-#: src/dialogs.c:1746 src/dialogs.c:1747 src/framedraw.c:238
-#: src/multitrack.c:8031
+#: src/interface.c:106 src/callbacks.c:9542 src/callbacks.c:9564
+#: src/callbacks.c:9565 src/gui.c:3333 src/gui.c:3946 src/saveplay.c:2317
+#: src/saveplay.c:3097 src/dialogs.c:1575 src/dialogs.c:1576
+#: src/dialogs.c:1804 src/dialogs.c:1805 src/framedraw.c:236
+#: src/multitrack.c:8210
 msgid "Preview"
 msgstr "Visualizar"
 
-#: src/interface.c:132
+#: src/interface.c:125
 msgid "Click here to _Preview any selected video, image or audio file"
 msgstr ""
 "Clique aqui para _Previsualizar qualquer vídeo, áudio ou imagem selecionada"
 
-#: src/interface.c:135
+#: src/interface.c:127
 msgid "Click here to _Preview any selected audio file"
 msgstr "Clique aqui para _Previsualizar qualquer arquivo de áudio"
 
-#: src/interface.c:138
+#: src/interface.c:129
 msgid "Click here to _Preview the video"
 msgstr "Clique aqui para _Previsualizar o vídeo"
 
-#: src/interface.c:181 src/dialogs.c:2542
+#: src/interface.c:169 src/dialogs.c:2621
 msgid "LiVES: - Processing..."
 msgstr "LiVES: - Processando..."
 
-#: src/interface.c:217
+#: src/interface.c:205
 msgid ""
 "\n"
 "\n"
@@ -1187,8 +1191,8 @@
 "\n"
 "Lembre de desligar os efeitos (ctrl-0) depois!"
 
-#: src/interface.c:222 src/callbacks.c:9373 src/callbacks.c:9420
-#: src/dialogs.c:2570
+#: src/interface.c:210 src/callbacks.c:9283 src/callbacks.c:9332
+#: src/dialogs.c:2649
 msgid ""
 "\n"
 "Please Wait"
@@ -1196,190 +1200,178 @@
 "\n"
 "Por favor aguarde"
 
-#: src/interface.c:242
+#: src/interface.c:230
 msgid "Show Details"
 msgstr ""
 
-#: src/interface.c:254 src/dialogs.c:2584
+#: src/interface.c:242 src/dialogs.c:2663
 msgid "_Enough"
 msgstr "Sufici_ente"
 
-#: src/interface.c:255 src/framedraw.c:278
+#: src/interface.c:243 src/framedraw.c:276
 msgid "_Preview"
 msgstr "_Visualizar"
 
-#: src/interface.c:257
+#: src/interface.c:245 src/callbacks.c:9282 src/callbacks.c:9330
 msgid "Paus_e"
 msgstr "Pausar"
 
-#: src/interface.c:258 src/callbacks.c:9417
+#: src/interface.c:246 src/callbacks.c:9329
 msgid "Pause/_Enough"
 msgstr "Pausa/Sufici_ente"
 
-#: src/interface.c:285
+#: src/interface.c:273
 msgid "_Cancel"
 msgstr "_Cancelar"
 
-#: src/interface.c:374
+#: src/interface.c:361
 #, c-format
 msgid "LiVES: - %s"
 msgstr ""
 
-#: src/interface.c:376
+#: src/interface.c:363
 msgid "LiVES: - Multitrack details"
 msgstr ""
 
-#: src/interface.c:407
+#: src/interface.c:394
 msgid "Format"
 msgstr "Formato"
 
-#: src/interface.c:412
+#: src/interface.c:399
 msgid "Frame size"
 msgstr "Tamanho do frame"
 
-#: src/interface.c:417
+#: src/interface.c:404
 msgid "File size"
 msgstr "Tamanho do arquivo"
 
-#: src/interface.c:418
+#: src/interface.c:405
 msgid "Byte size"
 msgstr "Tamanho do byte"
 
-#: src/interface.c:423 src/interface.c:1891
+#: src/interface.c:410 src/interface.c:1760
 msgid "FPS"
 msgstr "FPS"
 
-#: src/interface.c:428
+#: src/interface.c:415
 msgid "Frames"
 msgstr "Frames"
 
-#: src/interface.c:429
+#: src/interface.c:416
 msgid "Events"
 msgstr "Eventos"
 
-#: src/interface.c:434 src/interface.c:500 src/interface.c:542
+#: src/interface.c:421 src/interface.c:486 src/interface.c:528
 msgid "Total time"
 msgstr "Tempo total"
 
-#: src/interface.c:486 src/resample.c:1488
+#: src/interface.c:472 src/resample.c:1460
 msgid "Audio"
 msgstr "Áudio"
 
-#: src/interface.c:511 src/interface.c:553
+#: src/interface.c:497 src/interface.c:539
 msgid "Rate/size"
 msgstr "Taxa/tamanho"
 
-#: src/interface.c:530
+#: src/interface.c:516
 msgid "Right audio"
 msgstr "Áudio direito"
 
-#: src/interface.c:622
+#: src/interface.c:607
 msgid "LiVES: - Encoding options"
 msgstr "LiVES: - Opções de codificação"
 
-#: src/interface.c:636
+#: src/interface.c:621
 msgid "<------------- (Check the box to re_size as suggested)"
 msgstr ""
 
-#: src/interface.c:637
+#: src/interface.c:622
 msgid "<------------- (Check the box to use the _size recommendation)"
 msgstr ""
 
-#: src/interface.c:662
+#: src/interface.c:646
 msgid "Use _letterboxing to maintain aspect ratio (optional)"
 msgstr ""
 
-#: src/interface.c:663
+#: src/interface.c:647
 msgid ""
 "Draw black rectangles either above or to the sides of the image, to prevent "
 "it from stretching."
 msgstr ""
 
-#: src/interface.c:694
+#: src/interface.c:677
 msgid "Keep _my settings"
 msgstr "Mantenha _minhas configurações"
 
-#: src/interface.c:695
+#: src/interface.c:678
 msgid "Use _recommended settings"
 msgstr "Usar configurações _recomendadas"
 
-#: src/interface.c:775 src/dialogs.c:114
-msgid ""
-"Do _not show this warning any more\n"
-"(can be turned back on from Preferences/Warnings)"
-msgstr ""
-"Não mostrar mais este aviso\n"
-"(pode ser ligado novamente em Preferências/Avisos)"
-
-#: src/interface.c:787
-msgid "Show _Details"
-msgstr "Exibir _Detalhes"
-
-#: src/interface.c:881
+#: src/interface.c:769
 msgid "_Close Window"
 msgstr "Fechar janela [_C]"
 
-#: src/interface.c:883
+#: src/interface.c:771
 msgid "_Save to file"
 msgstr "_Salvar para arquivo"
 
-#: src/interface.c:928
+#: src/interface.c:816
 msgid "LiVES: - Insert"
 msgstr "LiVES: - Inserir"
 
-#: src/interface.c:945
+#: src/interface.c:833
 msgid "_Number of times to insert"
 msgstr "_Número de vezes a inserir"
 
-#: src/interface.c:954
+#: src/interface.c:842
 msgid "_Insert to fit audio"
 msgstr "_Inserir até o fim do áudio"
 
-#: src/interface.c:968
+#: src/interface.c:856
 msgid "Insert _before selection"
 msgstr "Inserir antes da seleção [_B]"
 
-#: src/interface.c:970
+#: src/interface.c:858
 msgid "Insert clipboard before selected frames"
 msgstr "Inserir área de transferência antes da seleção"
 
-#: src/interface.c:986
+#: src/interface.c:875
 msgid "Insert _after selection"
 msgstr "Inserir _após a seleção"
 
-#: src/interface.c:988
+#: src/interface.c:877
 msgid "Insert clipboard after selected frames"
 msgstr "Inserir área de transferência depois da seleção"
 
-#: src/interface.c:999
+#: src/interface.c:888
 msgid "Insert _with sound"
 msgstr "Inserir com som [_W]"
 
-#: src/interface.c:1012
+#: src/interface.c:901
 msgid "Insert with_out sound"
 msgstr "Inserir sem s_om"
 
-#: src/interface.c:1093
+#: src/interface.c:985
 msgid "LiVES: - Open Selection"
 msgstr "LiVES: - Abrir Seleção"
 
-#: src/interface.c:1111
+#: src/interface.c:1004
 msgid "Selection start time (sec)"
 msgstr ""
 
-#: src/interface.c:1117
+#: src/interface.c:1010
 msgid "Number of frames to open"
 msgstr ""
 
-#: src/interface.c:1193
+#: src/interface.c:1088
 msgid "LiVES: - Open Location"
 msgstr "LiVES: - Abrir Stream"
 
-#: src/interface.c:1195
+#: src/interface.c:1090
 msgid "LiVES: - Open Youtube Clip"
 msgstr ""
 
-#: src/interface.c:1213
+#: src/interface.c:1109
 msgid ""
 "\n"
 "\n"
@@ -1395,7 +1387,7 @@
 "Também certifique-se de ter marcado sua banda em Preferências|Streaming\n"
 "\n"
 
-#: src/interface.c:1216
+#: src/interface.c:1112
 msgid ""
 "\n"
 "\n"
@@ -1404,62 +1396,63 @@
 "\n"
 msgstr ""
 
-#: src/interface.c:1220
+#: src/interface.c:1116
 msgid ""
 "Enter the URL of the clip below.\n"
 "E.g: http://www.youtube.com/watch?v=WCR6f6WzjP8\n"
 "\n"
 msgstr ""
 
-#: src/interface.c:1231
+#: src/interface.c:1127
 msgid "URL : "
 msgstr "URL : "
 
-#: src/interface.c:1231
+#: src/interface.c:1127
 msgid "Youtube URL : "
 msgstr ""
 
-#: src/interface.c:1235
+#: src/interface.c:1131
 msgid "Do not send bandwidth information"
 msgstr "Não enviar informação de banda"
 
-#: src/interface.c:1237
+#: src/interface.c:1133
 msgid "Try this setting if you are having problems getting a stream"
 msgstr "Tente esta configuração se está tendo problemas ao pegar um stream"
 
-#: src/interface.c:1258
+#: src/interface.c:1155
 msgid "Download to _Directory : "
 msgstr ""
 
-#: src/interface.c:1276
+#: src/interface.c:1173
 msgid "Download _File Name : "
 msgstr ""
 
-#: src/interface.c:1281
+#: src/interface.c:1178
 msgid ".webm"
 msgstr ""
 
-#: src/interface.c:1359
+#: src/interface.c:1256
 msgid "LiVES: - Rename Clip"
 msgstr "LiVES: - Renomear Clipe"
 
-#: src/interface.c:1362
-msgid "LiVES: - Enter Set Name"
+#: src/interface.c:1258
+#, fuzzy
+msgid "LiVES: - Enter Set Name to Save as"
 msgstr "LiVES: - Entre com o Nome do Set"
 
-#: src/interface.c:1365
+#: src/interface.c:1260
 msgid "LiVES: - Enter a Set Name to Reload"
 msgstr ""
 
-#: src/interface.c:1368
+#: src/interface.c:1262
 msgid "LiVES: - Choose a Working Directory"
 msgstr "LiVES: - Escolha o diretório de trabalho"
 
-#: src/interface.c:1371
+#: src/interface.c:1264
 msgid "LiVES: - Rename Current Track"
 msgstr ""
 
-#: src/interface.c:1391
+#: src/interface.c:1283
 msgid ""
 "You need to enter a name for the current clip set.\n"
 "This will allow you reload the layout with the same clips later.\n"
@@ -1470,7 +1463,7 @@
 "Isso vai permitir recarregar o layout com os mesmos clipes depois.\n"
 "O LiVES lembrará você de salvar o set quando você for sair.\n"
 
-#: src/interface.c:1397
+#: src/interface.c:1289
 msgid ""
 "In order to export this project, you must enter a name for this clip set.\n"
 "This will also be used for the project name.\n"
@@ -1478,7 +1471,7 @@
 "Para exportar este projeto, você deverá definir o nome deste set.\n"
 "Ele tambem será utilizado como nome do projeto.\n"
 
-#: src/interface.c:1404
+#: src/interface.c:1296
 msgid ""
 "Welcome to LiVES !\n"
 "This startup wizard will guide you through the\n"
@@ -1488,200 +1481,200 @@
 "Este Guia irá lhe ajudar\n"
 "durante a instalação inicial para que você tenha o máximo desta aplicação.\n"
 
-#: src/interface.c:1408
+#: src/interface.c:1300
 msgid ""
 "\n"
 "First of all you need to choose a working directory for LiVES.\n"
 "This should be a directory with plenty of disk space available.\n"
 msgstr ""
 
-#: src/interface.c:1427
+#: src/interface.c:1317
 msgid "New name "
 msgstr "Novo nome "
 
-#: src/interface.c:1430
+#: src/interface.c:1319
 msgid "Set name "
 msgstr "Nome do set "
 
-#: src/interface.c:1550
+#: src/interface.c:1435
 msgid "Use def_aults"
 msgstr ""
 
-#: src/interface.c:1553 src/interface.c:1840 src/preferences.c:2515
-#: src/preferences.c:2697
+#: src/interface.c:1437 src/interface.c:1709 src/preferences.c:2550
+#: src/preferences.c:2739
 msgid "_Advanced"
 msgstr "_Avançado"
 
-#: src/interface.c:1604
+#: src/interface.c:1487
 msgid "LiVES:- Select input device"
 msgstr ""
 
-#: src/interface.c:1622
+#: src/interface.c:1504
 msgid "Select input device:"
 msgstr ""
 
-#: src/interface.c:1686
+#: src/interface.c:1568
 msgid "LiVES:- Load CD Track"
 msgstr "LiVES:- Carregar trilha de CD"
 
-#: src/interface.c:1689
+#: src/interface.c:1570
 msgid "LiVES:- Select DVD Title/Chapter"
 msgstr "LiVES:- Selecionar Título/Capítulo do DVD"
 
-#: src/interface.c:1692
+#: src/interface.c:1572
 msgid "LiVES:- Select VCD Title"
 msgstr "LiVES:- Selecionar o Título do VCD"
 
-#: src/interface.c:1695
+#: src/interface.c:1574
 msgid "LiVES:- Change Maximum Visible Tracks"
 msgstr "LiVES:- Modificar o máximo de trilhas visíveis"
 
-#: src/interface.c:1698
+#: src/interface.c:1576
 msgid "LiVES:- Device details"
 msgstr "LiVES:- Detalhes do dispositivo"
 
-#: src/interface.c:1721
+#: src/interface.c:1598
 #, c-format
 msgid "Track to load (from %s)"
 msgstr "Trilha a carregar (de %s)"
 
-#: src/interface.c:1724
+#: src/interface.c:1600
 msgid "DVD Title"
 msgstr "Título do DVD"
 
-#: src/interface.c:1727
+#: src/interface.c:1602
 msgid "VCD Title"
 msgstr "Título do VCD"
 
-#: src/interface.c:1730
+#: src/interface.c:1604
 msgid "Maximum number of tracks to display"
 msgstr "Número máximo de trilhas a visualizar"
 
-#: src/interface.c:1733
+#: src/interface.c:1606
 msgid "Device:        /dev/video"
 msgstr "Dispositivo:        /dev/video"
 
-#: src/interface.c:1736
+#: src/interface.c:1608
 msgid "Device:        fw:"
 msgstr "Dispositivo:        fw:"
 
-#: src/interface.c:1771
+#: src/interface.c:1641
 msgid "Chapter  "
 msgstr "Capítulo  "
 
-#: src/interface.c:1776
+#: src/interface.c:1645
 msgid "Channel  "
 msgstr "Canal  "
 
-#: src/interface.c:1791
+#: src/interface.c:1660
 msgid "Audio ID  "
 msgstr "Áudio ID  "
 
-#: src/interface.c:1857
+#: src/interface.c:1726
 msgid "Input number"
 msgstr "Número de Entrada"
 
-#: src/interface.c:1865
+#: src/interface.c:1734
 msgid "Use default width, height and FPS"
 msgstr "Usar largura padrão, altura e FPS"
 
-#: src/interface.c:1879
+#: src/interface.c:1748
 msgid "Width"
 msgstr "Largura"
 
-#: src/interface.c:1885
+#: src/interface.c:1754
 msgid "Height"
 msgstr "Altura"
 
-#: src/interface.c:1899
+#: src/interface.c:1768
 msgid "_Driver"
 msgstr ""
 
-#: src/interface.c:1902
+#: src/interface.c:1771
 msgid "_Output format"
 msgstr ""
 
-#: src/interface.c:1998
+#: src/interface.c:1865
 msgid "LiVES:- Fade Audio In"
 msgstr "LiVES:- Fade Audio In"
 
-#: src/interface.c:2001
+#: src/interface.c:1867
 msgid "LiVES:- Fade Audio Out"
 msgstr "LiVES:- Fade Audio Out"
 
-#: src/interface.c:2017
+#: src/interface.c:1883
 msgid "Fade in over  "
 msgstr "Fade in sobre  "
 
-#: src/interface.c:2018
+#: src/interface.c:1884
 msgid "first"
 msgstr "primeiro"
 
-#: src/interface.c:2021
+#: src/interface.c:1886
 msgid "Fade out over  "
 msgstr "Fade out sobre  "
 
-#: src/interface.c:2022
+#: src/interface.c:1887
 msgid "last"
 msgstr "último"
 
-#: src/interface.c:2044
+#: src/interface.c:1909
 msgid "seconds."
 msgstr "segundos."
 
-#: src/interface.c:2052 src/saveplay.c:1507
+#: src/interface.c:1917 src/saveplay.c:1484
 msgid "selection"
 msgstr "seleção"
 
-#: src/interface.c:2092
+#: src/interface.c:1956
 msgid "LiVES: - File Comments (optional)"
 msgstr "LiVES: - Comentários do arquivo (opcional)"
 
-#: src/interface.c:2107
+#: src/interface.c:1971
 msgid "Title/Name : "
 msgstr "Título/Nome: "
 
-#: src/interface.c:2114
+#: src/interface.c:1978
 msgid "Author/Artist : "
 msgstr "Autor/Artista: "
 
-#: src/interface.c:2121
+#: src/interface.c:1985
 msgid "Comments : "
 msgstr "Comentários: "
 
-#: src/interface.c:2151
+#: src/interface.c:2015
 msgid "_Options"
 msgstr "_Opções"
 
-#: src/interface.c:2158
+#: src/interface.c:2022
 msgid "Save _subtitles to file"
 msgstr ""
 
-#: src/interface.c:2170
+#: src/interface.c:2033
 msgid "Subtitle file"
 msgstr "Arquivo de legenda"
 
-#: src/interface.c:2172
+#: src/interface.c:2035
 msgid "Browse..."
 msgstr "Navegar..."
 
-#: src/interface.c:2255
+#: src/interface.c:2132
 msgid "LiVES: - choose a device"
 msgstr ""
 
-#: src/interface.c:2259
+#: src/interface.c:2135
 msgid "LiVES: - choose a directory"
 msgstr ""
 
-#: src/interface.c:2262
+#: src/interface.c:2137
 msgid "LiVES: - choose a file"
 msgstr ""
 
-#: src/interface.c:2445
+#: src/interface.c:2381
 msgid "LiVES: - Cancel/Discard/Save"
 msgstr "LiVES: - Cancelar/Discartar/Salvar"
 
-#: src/interface.c:2460
+#: src/interface.c:2397
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has not been saved.\n"
@@ -1691,7 +1684,7 @@
 "O layout atual não foi salvo.\n"
 "O que você quer fazer?\n"
 
-#: src/interface.c:2463
+#: src/interface.c:2400
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has been changed since the last save.\n"
@@ -1701,7 +1694,7 @@
 "O layout atual foi modificado desde que foi salvo.\n"
 "O que você quer fazer?\n"
 
-#: src/interface.c:2467
+#: src/interface.c:2404
 msgid ""
 "You are about to exit LiVES.\n"
 "The current clip set can be saved.\n"
@@ -1711,7 +1704,7 @@
 "O set de clipes atual pode ser salvo.\n"
 "O que você quer fazer?\n"
 
-#: src/interface.c:2468
+#: src/interface.c:2405
 msgid ""
 "The current clip set has not been saved.\n"
 "What would you like to do ?\n"
@@ -1719,7 +1712,7 @@
 "O set de clipes atual não foi salvo.\n"
 "O que quer fazer?\n"
 
-#: src/interface.c:2472
+#: src/interface.c:2408
 msgid ""
 "The current layout has not been saved.\n"
 "What would you like to do ?\n"
@@ -1727,7 +1720,7 @@
 "O layout atual não foi salvo.\n"
 "O que quer fazer?\n"
 
-#: src/interface.c:2475
+#: src/interface.c:2410
 #, fuzzy
 msgid ""
 "The current layout has *not* been changed since it was last saved.\n"
@@ -1736,13 +1729,13 @@
 "O Layout atual não foi salvo desde de a ultima alteração\n"
 "O que gostaria de fazer  ?\n"
 
-#: src/interface.c:2480
+#: src/interface.c:2415
 msgid ""
 "The current layout contains generated frames and cannot be retained.\n"
 "You may wish to render it before exiting multitrack mode.\n"
 msgstr ""
 
-#: src/interface.c:2483
+#: src/interface.c:2418
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout contains generated frames and cannot be retained.\n"
@@ -1752,96 +1745,96 @@
 "O layout atual contém frames gerados e não foram salvos.\n"
 "O que você gostaria de fazer?"
 
-#: src/interface.c:2496
+#: src/interface.c:2431
 msgid "Clip set _name"
 msgstr "_Nome do set"
 
-#: src/interface.c:2502
+#: src/interface.c:2437
 msgid "_Auto reload next time"
 msgstr "Auto recarregar da próxima vez"
 
-#: src/interface.c:2538 src/interface.c:2547
+#: src/interface.c:2473 src/interface.c:2482
 msgid "_Wipe layout"
 msgstr "Apagar layout [_W]"
 
-#: src/interface.c:2539
+#: src/interface.c:2474
 msgid "_Ignore changes"
 msgstr "_Ignorar mudanças"
 
-#: src/interface.c:2540
+#: src/interface.c:2475
 msgid "_Delete clip set"
 msgstr "_Deletar set"
 
-#: src/interface.c:2541
+#: src/interface.c:2476
 msgid "_Delete layout"
 msgstr "_Deletar layout"
 
-#: src/interface.c:2545
+#: src/interface.c:2480
 msgid "_Save layout"
 msgstr "_Salvar layout"
 
-#: src/interface.c:2546
+#: src/interface.c:2481
 msgid "_Save clip set"
 msgstr "_Salvar set"
 
-#: src/interface.c:2565
+#: src/interface.c:2502
 msgid ""
 "\n"
 "LiVES has detected a multitrack layout from a previous session.\n"
 "Would you like to try and recover it ?\n"
 msgstr ""
 
-#: src/interface.c:2589
+#: src/interface.c:2528
 msgid "LiVES: - Disk Recovery Options"
 msgstr ""
 
-#: src/interface.c:2608
+#: src/interface.c:2549
 msgid "Delete _Orphaned Clips"
 msgstr ""
 
-#: src/interface.c:2609
+#: src/interface.c:2550
 msgid "Delete any clips which are not currently loaded or part of a set"
 msgstr ""
 
-#: src/interface.c:2622
+#: src/interface.c:2564
 msgid "Clear _Backup Files from Closed Clips"
 msgstr ""
 
-#: src/interface.c:2633
+#: src/interface.c:2575
 msgid "Remove Sets which have _Layouts but no Clips"
 msgstr ""
 
-#: src/interface.c:2644
+#: src/interface.c:2586
 msgid "_Reset to Defaults"
 msgstr ""
 
-#: src/interface.c:2651
+#: src/interface.c:2593
 msgid "_Accept"
 msgstr ""
 
-#: src/callbacks.c:198
+#: src/callbacks.c:208
 #, c-format
 msgid "Saving as set %s..."
 msgstr "Salvando como set %s..."
 
-#: src/callbacks.c:833
+#: src/callbacks.c:852
 msgid "Please enter the name of the file to save the clip as.\n"
 msgstr ""
 
-#: src/callbacks.c:841
+#: src/callbacks.c:860
 msgid "Please enter a valid URL for the download.\n"
 msgstr ""
 
-#: src/callbacks.c:867
+#: src/callbacks.c:886
 #, c-format
 msgid "Downloading %s to %s..."
 msgstr ""
 
-#: src/callbacks.c:895
+#: src/callbacks.c:912
 msgid "Downloading clip"
 msgstr ""
 
-#: src/callbacks.c:933
+#: src/callbacks.c:950
 msgid ""
 "\n"
 "LiVES was unable to download the clip.\n"
@@ -1849,11 +1842,11 @@
 "the latest youtube-dl installed.\n"
 msgstr ""
 
-#: src/callbacks.c:1114 src/callbacks.c:1149
+#: src/callbacks.c:1131 src/callbacks.c:1166
 msgid "This file"
 msgstr "Este arquivo"
 
-#: src/callbacks.c:1115
+#: src/callbacks.c:1132
 msgid ""
 ",\n"
 " - including the current layout - "
@@ -1861,7 +1854,7 @@
 ",\n"
 " - Incluindo o layout atual - "
 
-#: src/callbacks.c:1117
+#: src/callbacks.c:1134
 #, c-format
 msgid ""
 "\n"
@@ -1871,7 +1864,7 @@
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1119
+#: src/callbacks.c:1136
 #, c-format
 msgid ""
 "\n"
@@ -1881,14 +1874,14 @@
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1150
+#: src/callbacks.c:1167
 msgid ""
 "Changes made to this clip have not been saved or backed up.\n"
 "\n"
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1343
+#: src/callbacks.c:1356
 msgid ""
 "\n"
 "Invalid project file.\n"
@@ -1896,7 +1889,7 @@
 "\n"
 "Arquivo de projeto inválido.\n"
 
-#: src/callbacks.c:1356
+#: src/callbacks.c:1370
 #, c-format
 msgid ""
 "\n"
@@ -1917,33 +1910,33 @@
 "delete-o.\n"
 "Uma vez que tenha feito isso, vai poder importar o novo projeto.\n"
 
-#: src/callbacks.c:1366
+#: src/callbacks.c:1381
 #, c-format
 msgid "Importing the project %s as set %s..."
 msgstr "Importando o projeto %s como set %s..."
 
-#: src/callbacks.c:1386
+#: src/callbacks.c:1399
 msgid "Importing project"
 msgstr "Importando projeto"
 
-#: src/callbacks.c:1472
+#: src/callbacks.c:1481
 #, c-format
 msgid "Exporting project %s..."
 msgstr "Exportando projeto %s..."
 
-#: src/callbacks.c:1490
+#: src/callbacks.c:1497
 msgid "Exporting project"
 msgstr "Exportando projeto"
 
-#: src/callbacks.c:1506
+#: src/callbacks.c:1513
 msgid "Backup as .lv1 file"
 msgstr "Backup como arquivo .lv1"
 
-#: src/callbacks.c:1522
+#: src/callbacks.c:1529
 msgid "Restore .lv1 file"
 msgstr "Restaurar arquivo .lv1"
 
-#: src/callbacks.c:1664
+#: src/callbacks.c:1671
 msgid ""
 "\n"
 "\n"
@@ -1955,72 +1948,77 @@
 "O set será deletado do disco.\n"
 "Tem certeza?\n"
 
-#: src/callbacks.c:1725
+#: src/callbacks.c:1732
 #, c-format
 msgid "Deleting set %s..."
 msgstr ""
 
-#: src/callbacks.c:1727
+#: src/callbacks.c:1734
 msgid "Deleting set..."
 msgstr "Deletando set..."
 
-#: src/callbacks.c:1731
+#: src/callbacks.c:1738
 msgid "Deleting set"
 msgstr "Deletando set"
 
-#: src/callbacks.c:1739
+#: src/callbacks.c:1746
 #, c-format
 msgid "Set %s was permanently deleted from the disk.\n"
 msgstr "O set %s foi permanentemente apagado do disco.\n"
 
-#: src/callbacks.c:1787 src/callbacks.c:11764
+#: src/callbacks.c:1792 src/callbacks.c:11676
 msgid "Insert Silence"
 msgstr "Inserir Silêncio"
 
-#: src/callbacks.c:1840 src/callbacks.c:1923 src/callbacks.c:2086
+#: src/callbacks.c:1844 src/callbacks.c:1927 src/callbacks.c:2089
 msgid "Undoing"
 msgstr "Desfazendo"
 
-#: src/callbacks.c:1936 src/callbacks.c:2147
+#: src/callbacks.c:1940 src/callbacks.c:2150
 msgid "Restoring audio..."
 msgstr "Restaurando áudio..."
 
-#: src/callbacks.c:1952
+#: src/callbacks.c:1956
 msgid "Clearing frame images"
 msgstr "Limpando imagens de frames"
 
-#: src/callbacks.c:1985
+#: src/callbacks.c:1988
 msgid "Deleting excess frames"
 msgstr "Apagar quadros em excesso"
 
-#: src/callbacks.c:2229
+#: src/callbacks.c:2232
 #, c-format
 msgid "Length of video is now %d frames at %.3f frames per second.\n"
 msgstr "O comprimento do vídeo é agora %d frames a %.3f FPS.\n"
 
-#: src/callbacks.c:2233 src/resample.c:683 src/resample.c:2166
+#: src/callbacks.c:2235 src/resample.c:678 src/resample.c:2133
 #, c-format
 msgid "Clipboard was resampled to %d frames.\n"
 msgstr "Área de transferência resampleada para %d frames.\n"
 
-#: src/callbacks.c:2394 src/callbacks.c:2423
+#: src/callbacks.c:2396 src/callbacks.c:2425
 msgid "Redoing"
 msgstr "Refazendo"
 
-#: src/callbacks.c:2462
-#, c-format
-msgid "Copying frames %d to %d%s to the clipboard..."
+#: src/callbacks.c:2472
+#, fuzzy, c-format
+msgid "Copying frames %d to %d (with sound) to the clipboard..."
+msgstr "Copiando frames %d até %d%s para a área de transferência..."
+
+#: src/callbacks.c:2474
+#, fuzzy, c-format
+msgid "Copying frames %d to %d to the clipboard..."
 msgstr "Copiando frames %d até %d%s para a área de transferência..."
 
-#: src/callbacks.c:2525
+#: src/callbacks.c:2526
 msgid "Copying to the clipboard"
 msgstr "Copiando para a área de trasferência"
 
-#: src/callbacks.c:2600
+#: src/callbacks.c:2601
 msgid "Cut"
 msgstr "Cortar"
 
-#: src/callbacks.c:2641 src/callbacks.c:3068 src/callbacks.c:8026
+#: src/callbacks.c:2641 src/callbacks.c:3063 src/callbacks.c:7631
 #, fuzzy
 msgid "Pulling frames from clipboard"
 msgstr "Pegando frames do clipe"
@@ -2030,15 +2028,15 @@
 msgid "Pasting %d frames to new clip %s..."
 msgstr ""
 
-#: src/callbacks.c:2678
+#: src/callbacks.c:2676
 msgid "Pasting"
 msgstr "Colando"
 
-#: src/callbacks.c:2694
+#: src/callbacks.c:2692
 msgid "...added audio..."
 msgstr "...audio addicionado..."
 
-#: src/callbacks.c:2778
+#: src/callbacks.c:2775
 msgid ""
 "This operation requires resizing or converting of frames.\n"
 "Please install 'convert' from the Image-magick package, and then restart "
@@ -2048,7 +2046,7 @@
 "Por favor instale o software 'convert', o qual está presente no pacote Image-"
 "magick, e então reinicie o LiVES.\n"
 
-#: src/callbacks.c:2795
+#: src/callbacks.c:2793
 msgid ""
 "\n"
 "\n"
@@ -2062,7 +2060,7 @@
 "Tente selecionar todos frames e usar\n"
 "a função 'Ajustar Áudio' do menu 'Áudio'."
 
-#: src/callbacks.c:2819
+#: src/callbacks.c:2817
 msgid ""
 "LiVES cannot insert because the audio rates do not match.\n"
 "Please install 'sox', and try again."
@@ -2070,7 +2068,7 @@
 "LiVES não pôde inserir porque as taxas de áudio não conferem.\n"
 "Por favor instale 'sox' e tente novamente."
 
-#: src/callbacks.c:2838
+#: src/callbacks.c:2835
 msgid ""
 "\n"
 "Insertion will cause frames to shift in some multitrack layouts.\n"
@@ -2081,7 +2079,7 @@
 "multipista.\n"
 "Tem certeza que quer continuar?\n"
 
-#: src/callbacks.c:2888 src/callbacks.c:11692
+#: src/callbacks.c:2883 src/callbacks.c:11606
 msgid ""
 "\n"
 "Insertion will cause audio to shift in some multitrack layouts.\n"
@@ -2092,11 +2090,11 @@
 "multipista.\n"
 "Tem certeza que quer continuar?\n"
 
-#: src/callbacks.c:2996 src/callbacks.c:3025
+#: src/callbacks.c:2987 src/callbacks.c:3016
 msgid "Resampling clipboard audio"
 msgstr "Resampleando áudio da área de transferência"
 
-#: src/callbacks.c:3041
+#: src/callbacks.c:3032
 msgid ""
 "\n"
 "\n"
@@ -2108,7 +2106,7 @@
 "LiVES não pode resamplear o áudio da área de transferência.\n"
 "O áudio da área de transferência foi deletado.\n"
 
-#: src/callbacks.c:3055
+#: src/callbacks.c:3045
 msgid ""
 "\n"
 "\n"
@@ -2121,30 +2119,30 @@
 "LiVES não pôde processar o áudio da área de transferência.\n"
 "Deseja continuar a inserção usando áudio não modificado?\n"
 
-#: src/callbacks.c:3137 src/callbacks.c:3311
+#: src/callbacks.c:3132 src/callbacks.c:3299
 #, c-format
 msgid "Inserting %d%s frames from the clipboard..."
 msgstr "Inserindo %d%s frames da área de transferência..."
 
-#: src/callbacks.c:3162 src/callbacks.c:3236 src/callbacks.c:3339
+#: src/callbacks.c:3155 src/callbacks.c:3224 src/callbacks.c:3325
 msgid "Inserting"
 msgstr "Inserindo"
 
-#: src/callbacks.c:3193
+#: src/callbacks.c:3187
 #, c-format
 msgid "Inserting %d times from the clipboard%s..."
 msgstr "Inserindo %d vezes da área de transferência%s..."
 
-#: src/callbacks.c:3200
+#: src/callbacks.c:3191
 #, c-format
 msgid "Inserting %d frames from the clipboard%s..."
 msgstr "Inserindo %d frames da área de transferência%s..."
 
-#: src/callbacks.c:3418
+#: src/callbacks.c:3404
 msgid "Insert"
 msgstr "Inserir"
 
-#: src/callbacks.c:3486
+#: src/callbacks.c:3471
 msgid ""
 "\n"
 "Deleting all frames will close this file.\n"
@@ -2154,7 +2152,7 @@
 "Deletar todos frames vai fechar este arquivo.\n"
 "Tem certeza?"
 
-#: src/callbacks.c:3495
+#: src/callbacks.c:3480
 msgid ""
 "\n"
 "Deletion will cause missing frames in some multitrack layouts.\n"
@@ -2164,8 +2162,8 @@
 "Deleção vai causar frames perdidos em alguns layouts multipista.\n"
 "Tem certeza que quer continuar?\n"
 
-#: src/callbacks.c:3515 src/callbacks.c:10920 src/callbacks.c:11162
-#: src/callbacks.c:11228
+#: src/callbacks.c:3500 src/callbacks.c:10851 src/callbacks.c:11087
+#: src/callbacks.c:11152
 msgid ""
 "\n"
 "Deletion will cause missing audio in some multitrack layouts.\n"
@@ -2175,7 +2173,7 @@
 "Deleção vai causar que o áudio se perca em alguns layouts multipista.\n"
 "Tem certeza que quer continuar?\n"
 
-#: src/callbacks.c:3534
+#: src/callbacks.c:3519
 msgid ""
 "\n"
 "Deletion will cause frames to shift in some multitrack layouts.\n"
@@ -2185,7 +2183,7 @@
 "Deleção vai causar que frames sejam movidos em alguns layouts multipista.\n"
 "Tem certeza que quer continuar?\n"
 
-#: src/callbacks.c:3553 src/callbacks.c:11210
+#: src/callbacks.c:3538 src/callbacks.c:11134
 msgid ""
 "\n"
 "Deletion will cause audio to shift in some multitrack layouts.\n"
@@ -2195,20 +2193,20 @@
 "Deleção vai causar que áudio seja movido em alguns layouts multipista.\n"
 "Tem certeza que quer continuar?\n"
 
-#: src/callbacks.c:3611
+#: src/callbacks.c:3597
 #, c-format
 msgid "Deleting frames %d to %d%s..."
 msgstr "Deletando frames %d até %d%s..."
 
-#: src/callbacks.c:3636
+#: src/callbacks.c:3619
 msgid "Deleting"
 msgstr "Deletando"
 
-#: src/callbacks.c:3717
+#: src/callbacks.c:3699
 msgid "Delete"
 msgstr "Deletar"
 
-#: src/callbacks.c:3738
+#: src/callbacks.c:3717
 msgid ""
 "\n"
 "\n"
@@ -2218,7 +2216,7 @@
 "\n"
 "Seleção está travada.\n"
 
-#: src/callbacks.c:4092
+#: src/callbacks.c:4056
 msgid ""
 "Ready to record. Use 'control' and cursor keys during playback to record "
 "your performance.\n"
@@ -2230,11 +2228,11 @@
 "(Para cancelar, aperte 'r' ou clique em Tocar|Gravar Performance novamente "
 "quando você tocar.)\n"
 
-#: src/callbacks.c:4098
+#: src/callbacks.c:4061
 msgid "Record cancelled.\n"
 msgstr "Gravação cancelada.\n"
 
-#: src/callbacks.c:4237
+#: src/callbacks.c:4197
 #, c-format
 msgid ""
 "\n"
@@ -2247,7 +2245,7 @@
 "O plugin '%s' diz:\n"
 "%s\n"
 
-#: src/callbacks.c:4241
+#: src/callbacks.c:4200
 #, c-format
 msgid ""
 "\n"
@@ -2260,7 +2258,7 @@
 "Impossível achar o método 'init' no plugin %s.\n"
 "O plugin pode não funcionar ou estar instalado incorretamente."
 
-#: src/callbacks.c:4571
+#: src/callbacks.c:4532
 #, c-format
 msgid ""
 "Saving the set will cause copies of all loaded clips to remain on the disk"
@@ -2272,22 +2270,22 @@
 "\n"
 "Por favor aperte 'Cancelar' se não é o que quer.\n"
 
-#: src/callbacks.c:4654
+#: src/callbacks.c:4617
 #, c-format
 msgid "Saving set %s"
 msgstr "Salvando set %s"
 
-#: src/callbacks.c:5005
+#: src/callbacks.c:4964
 #, c-format
 msgid "Loading clips from set %s"
 msgstr "Carregando clipes do set %s"
 
-#: src/callbacks.c:5093
+#: src/callbacks.c:5051
 #, c-format
 msgid "%d clips and %d layouts were recovered from set (%s).\n"
 msgstr ""
 
-#: src/callbacks.c:5312
+#: src/callbacks.c:5259
 msgid ""
 "LiVES will attempt to recover some disk space.\n"
 "You should ONLY run this if you have no other copies of LiVES running on "
@@ -2299,24 +2297,24 @@
 "nesta máquina.\n"
 "Aperte 'OK' para continuar.\n"
 
-#: src/callbacks.c:5317
+#: src/callbacks.c:5264
 msgid "Cleaning up disk space..."
 msgstr "Limpando espaço em disco..."
 
-#: src/callbacks.c:5387
+#: src/callbacks.c:5334
 msgid "Recovering disk space"
 msgstr ""
 
-#: src/callbacks.c:5439
+#: src/callbacks.c:5386
 #, c-format
 msgid "%s of disk space was recovered.\n"
 msgstr ""
 
-#: src/callbacks.c:5482
+#: src/callbacks.c:5428
 msgid "Resetting frame rates and frame values..."
 msgstr "Reiniciando framerates..."
 
-#: src/callbacks.c:5523
+#: src/callbacks.c:5469
 #, c-format
 msgid ""
 "\n"
@@ -2324,12 +2322,12 @@
 "Internal: %s (%d bpp) / %s\n"
 msgstr ""
 
-#: src/callbacks.c:5525
+#: src/callbacks.c:5471
 msgid "buffered"
 msgstr ""
 
-#: src/callbacks.c:5538 src/callbacks.c:5557 src/callbacks.c:5575
-#: src/callbacks.c:5609
+#: src/callbacks.c:5484 src/callbacks.c:5502 src/callbacks.c:5518
+#: src/callbacks.c:5551
 msgid ""
 "\n"
 "  Opening..."
@@ -2337,7 +2335,7 @@
 "\n"
 "  Abrindo..."
 
-#: src/callbacks.c:5545
+#: src/callbacks.c:5490
 #, c-format
 msgid ""
 "\n"
@@ -2346,7 +2344,7 @@
 "\n"
 "(%d virtual)"
 
-#: src/callbacks.c:5548
+#: src/callbacks.c:5493
 #, c-format
 msgid ""
 "\n"
@@ -2355,7 +2353,7 @@
 "\n"
 "(%d decodificado)"
 
-#: src/callbacks.c:5560 src/callbacks.c:5578 src/callbacks.c:5612
+#: src/callbacks.c:5504 src/callbacks.c:5520 src/callbacks.c:5553
 #, c-format
 msgid ""
 "\n"
@@ -2364,7 +2362,7 @@
 "\n"
 "  %.2f seg."
 
-#: src/callbacks.c:5569
+#: src/callbacks.c:5512
 msgid ""
 "\n"
 "  Unknown"
@@ -2372,23 +2370,23 @@
 "\n"
 "  Desconhecido"
 
-#: src/callbacks.c:5582 src/callbacks.c:5596
+#: src/callbacks.c:5524 src/callbacks.c:5538
 msgid "unsigned"
 msgstr "não assinado"
 
-#: src/callbacks.c:5583 src/callbacks.c:5597
+#: src/callbacks.c:5525 src/callbacks.c:5539
 msgid "signed"
 msgstr "assinado"
 
-#: src/callbacks.c:5585 src/callbacks.c:5599
+#: src/callbacks.c:5527 src/callbacks.c:5541
 msgid "big-endian"
 msgstr ""
 
-#: src/callbacks.c:5586 src/callbacks.c:5600
+#: src/callbacks.c:5528 src/callbacks.c:5542
 msgid "little-endian"
 msgstr ""
 
-#: src/callbacks.c:5588 src/callbacks.c:5602
+#: src/callbacks.c:5530 src/callbacks.c:5544
 #, c-format
 msgid ""
 "  %d Hz %d bit\n"
@@ -2397,7 +2395,7 @@
 "  %d Hz %d bit\n"
 "%s %s"
 
-#: src/callbacks.c:5707
+#: src/callbacks.c:5647
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -2414,15 +2412,15 @@
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA.\n"
 msgstr ""
 
-#: src/callbacks.c:5721
+#: src/callbacks.c:5661
 msgid "A video editor and VJ program."
 msgstr "Um editor de video e programa de VJ."
 
-#: src/callbacks.c:5722
+#: src/callbacks.c:5662
 msgid "About LiVES"
 msgstr ""
 
-#: src/callbacks.c:5724
+#: src/callbacks.c:5664
 msgid "translator_credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -2431,7 +2429,7 @@
 "  VJ Pixel https://launchpad.net/~vjpixel\n"
 "  salsaman https://launchpad.net/~salsaman"
 
-#: src/callbacks.c:5758
+#: src/callbacks.c:5699
 #, c-format
 msgid ""
 "LiVES Version %s\n"
@@ -2445,7 +2443,7 @@
 "Homepage: http://lives.sourceforge.net"
 msgstr ""
 
-#: src/callbacks.c:6037
+#: src/callbacks.c:5996
 #, fuzzy
 msgid ""
 "\n"
@@ -2456,7 +2454,7 @@
 "\n"
 "Instale o mplayer para poder vêr este arquivo.\n"
 
-#: src/callbacks.c:6040
+#: src/callbacks.c:5998
 #, fuzzy
 msgid ""
 "\n"
@@ -2468,222 +2466,213 @@
 "\n"
 "Instale o mplayer para poder vêr este arquivo.\n"
 
-#: src/callbacks.c:6423 src/callbacks.c:8289
-msgid ""
-"\n"
-"Loading new audio may cause missing audio in some multitrack layouts.\n"
-"Are you sure you wish to continue ?\n"
-"."
-msgstr ""
-"\n"
-"Carregar novo áudio vai causar que áudio se perca em alguns layouts "
-"multipista.\n"
-"Tem certeza que quer continuar?\n"
-"."
-
-#: src/callbacks.c:6523
-#, c-format
-msgid "Opening audio %s, type %s..."
-msgstr "Abrindo áudio %s, tipo %s..."
-
-#: src/callbacks.c:6556 src/saveplay.c:480
-msgid "Opening audio"
-msgstr "Abrindo áudio"
-
-#: src/callbacks.c:6565 src/callbacks.c:6612 src/callbacks.c:8387
-#: src/callbacks.c:8429 src/callbacks.c:8472 src/callbacks.c:10846
-msgid "Cancelling"
-msgstr "Cancelando"
-
-#: src/callbacks.c:6660 src/callbacks.c:8514 src/callbacks.c:10876
-#: src/callbacks.c:11563
-msgid "Committing audio"
-msgstr "Transformando áudio"
-
-#: src/callbacks.c:6672 src/callbacks.c:8546
-msgid "New Audio"
-msgstr "Novo Áudio"
-
-#: src/callbacks.c:6779
+#: src/callbacks.c:6459
 #, c-format
 msgid ""
 "Text was saved as\n"
 "%s\n"
 msgstr ""
 
-#: src/callbacks.c:6951 src/saveplay.c:3618
-#, c-format
-msgid "%d frames are enough !\n"
-msgstr "%d frames são suficientes!\n"
-
-#: src/callbacks.c:7050
+#: src/callbacks.c:6706
 msgid "LiVES: - Encoder debug output"
 msgstr "LiVES: - Saíde do debug do codificador"
 
-#: src/callbacks.c:7087 src/gui.c:1922
+#: src/callbacks.c:6743 src/gui.c:1921
 msgid "Fullscreen playback (f)"
 msgstr "Tela Cheia (f)"
 
-#: src/callbacks.c:7089
+#: src/callbacks.c:6744
 msgid "Fullscreen playback off (f)"
 msgstr "Desativar tela Cheia (f)"
 
-#: src/callbacks.c:7188 src/callbacks.c:7336 src/callbacks.c:7664
-#: src/callbacks.c:7681 src/gui.c:3712 src/saveplay.c:2467 src/saveplay.c:2501
-#: src/saveplay.c:3115 src/saveplay.c:3220 src/saveplay.c:3239
-#: src/multitrack.c:9340 src/multitrack.c:11060
+#: src/callbacks.c:6841 src/callbacks.c:6983 src/callbacks.c:7283
+#: src/callbacks.c:7298 src/gui.c:3838 src/saveplay.c:2442 src/saveplay.c:2475
+#: src/saveplay.c:3074 src/saveplay.c:3178 src/saveplay.c:3197
+#: src/multitrack.c:9526 src/multitrack.c:11288
 #, c-format
 msgid " (%d %% scale)"
 msgstr ""
 
-#: src/callbacks.c:7190 src/callbacks.c:7338 src/callbacks.c:7666
-#: src/gui.c:3716 src/saveplay.c:2469 src/saveplay.c:2503
+#: src/callbacks.c:6843 src/callbacks.c:6985 src/callbacks.c:7285
+#: src/gui.c:3842 src/saveplay.c:2444 src/saveplay.c:2477
 #, c-format
 msgid "LiVES: - Play Window%s"
 msgstr ""
 
-#: src/callbacks.c:7302 src/gui.c:1907
+#: src/callbacks.c:6950 src/gui.c:1906
 msgid "Double size (d)"
 msgstr "Tamanho dobrado(d)"
 
-#: src/callbacks.c:7309
+#: src/callbacks.c:6956
 msgid "Single size (d)"
 msgstr "Tamanho normal (d)"
 
-#: src/callbacks.c:7442 src/callbacks.c:7443
+#: src/callbacks.c:7087 src/callbacks.c:7088
 msgid "Hide the play window (s)"
 msgstr "Esconder janela do tocador (s)"
 
-#: src/callbacks.c:7452 src/gui.c:1746
+#: src/callbacks.c:7096 src/gui.c:1744
 msgid "Show the play window (s)"
 msgstr "Mostrar janela do tocador (s)"
 
-#: src/callbacks.c:7453 src/gui.c:1896
+#: src/callbacks.c:7097 src/gui.c:1895
 msgid "Play in separate window (s)"
 msgstr "Tocar em janela separada (s)"
 
-#: src/callbacks.c:7535 src/gui.c:4060 src/saveplay.c:2498
+#: src/callbacks.c:7175 src/gui.c:4169 src/saveplay.c:2472
 msgid "LiVES: - Streaming"
 msgstr ""
 
-#: src/callbacks.c:7778
+#: src/callbacks.c:7388
 msgid "Switch continuous looping off (o)"
 msgstr "Desligar loop contínuo (o)"
 
-#: src/callbacks.c:7785 src/gui.c:1795
+#: src/callbacks.c:7394 src/gui.c:1793
 msgid "Switch continuous looping on (o)"
 msgstr "Ligar loop contínuo (o)"
 
-#: src/callbacks.c:7837
+#: src/callbacks.c:7444
 #, c-format
 msgid "Audio volume (%.2f)"
 msgstr "Volume do áudio (%.2f)"
 
-#: src/callbacks.c:7876 src/callbacks.c:7877 src/gui.c:3640
+#: src/callbacks.c:7483 src/callbacks.c:7484 src/gui.c:3766
 msgid "Unmute the audio (z)"
 msgstr "Ligar o áudio (z)"
 
-#: src/callbacks.c:7888 src/callbacks.c:7889 src/gui.c:1808 src/gui.c:3639
+#: src/callbacks.c:7494 src/callbacks.c:7495 src/gui.c:1806 src/gui.c:3765
 msgid "Mute the audio (z)"
 msgstr "Desligar o áudio (z)"
 
-#: src/callbacks.c:8038
+#: src/callbacks.c:7643
 msgid "Reversing clipboard..."
 msgstr "Invertendo área de trabalho..."
 
-#: src/callbacks.c:8052
+#: src/callbacks.c:7657
 msgid "Reversing clipboard"
 msgstr "Invertendo área de trabalho"
 
-#: src/callbacks.c:8084
+#: src/callbacks.c:7689
 msgid "LiVES: Load subtitles from..."
 msgstr ""
 
-#: src/callbacks.c:8151 src/saveplay.c:970
+#: src/callbacks.c:7753 src/saveplay.c:956
 #, c-format
 msgid "Loaded subtitle file: %s\n"
 msgstr "Carregado arquivo de legenda: %s\n"
 
-#: src/callbacks.c:8220
+#: src/callbacks.c:7821
 msgid "Subtitles were erased.\n"
 msgstr ""
 
-#: src/callbacks.c:8239
+#: src/callbacks.c:7843
 msgid "LiVES: - Select Audio File"
 msgstr ""
 
-#: src/callbacks.c:8250
+#: src/callbacks.c:7878 src/callbacks.c:8232
+msgid ""
+"\n"
+"Loading new audio may cause missing audio in some multitrack layouts.\n"
+"Are you sure you wish to continue ?\n"
+"."
+msgstr ""
+"\n"
+"Carregar novo áudio vai causar que áudio se perca em alguns layouts "
+"multipista.\n"
+"Tem certeza que quer continuar?\n"
+"."
+
+#: src/callbacks.c:7989
+#, c-format
+msgid "Opening audio %s, type %s..."
+msgstr "Abrindo áudio %s, tipo %s..."
+
+#: src/callbacks.c:8023 src/saveplay.c:477
+msgid "Opening audio"
+msgstr "Abrindo áudio"
+
+#: src/callbacks.c:8032 src/callbacks.c:8083 src/callbacks.c:8327
+#: src/callbacks.c:8369 src/callbacks.c:8412 src/callbacks.c:10766
+msgid "Cancelling"
+msgstr "Cancelando"
+
+#: src/callbacks.c:8137 src/callbacks.c:8454 src/callbacks.c:10803
+#: src/callbacks.c:11477
+msgid "Committing audio"
+msgstr "Transformando áudio"
+
+#: src/callbacks.c:8153 src/callbacks.c:8484
+msgid "New Audio"
+msgstr "Novo Áudio"
+
+#: src/callbacks.c:8194
 msgid "Please set your CD play device in Tools | Preferences | Misc\n"
 msgstr ""
 "Por favor configure seu tocador de CD em 'Ferramentas | Preferências | "
 "Misc'\n"
 
-#: src/callbacks.c:8321
+#: src/callbacks.c:8264
 #, c-format
 msgid "Opening CD track %d from %s..."
 msgstr "Abrindo faixa do CD %d de %s..."
 
-#: src/callbacks.c:8326
+#: src/callbacks.c:8267
 #, c-format
 msgid "CD track %d"
 msgstr "Faixa do CD %d"
 
-#: src/callbacks.c:8373
+#: src/callbacks.c:8313
 msgid "Opening CD track..."
 msgstr "Abrindo faixa de CD..."
 
-#: src/callbacks.c:8415 src/callbacks.c:8461
+#: src/callbacks.c:8355 src/callbacks.c:8401
 msgid "Error loading CD track\n"
 msgstr "Erro carregado faixa do CD\n"
 
-#: src/callbacks.c:8584
+#: src/callbacks.c:8518
 msgid "layout errors"
 msgstr "erros de layout"
 
-#: src/callbacks.c:8595
+#: src/callbacks.c:8529
 msgid "Close _Window"
 msgstr "Fechar Janela [_W]"
 
-#: src/callbacks.c:8606
+#: src/callbacks.c:8540
 msgid "Clear _Errors"
 msgstr "Limpar _Erros"
 
-#: src/callbacks.c:8617
+#: src/callbacks.c:8551
 msgid "_Delete affected layouts"
 msgstr "_Deletar layouts afetados"
 
-#: src/callbacks.c:9343 src/callbacks.c:9388
+#: src/callbacks.c:9253 src/callbacks.c:9298
 msgid "Resume"
 msgstr "Continuar"
 
-#: src/callbacks.c:9344
+#: src/callbacks.c:9254
 msgid ""
 "\n"
 "Paused\n"
 "(click Resume to continue processing)"
 msgstr ""
 
-#: src/callbacks.c:9345 src/callbacks.c:9406
+#: src/callbacks.c:9255 src/callbacks.c:9315
 msgid "paused..."
 msgstr "pausado..."
 
-#: src/callbacks.c:9372 src/callbacks.c:9418
-msgid "Pause"
-msgstr "Pausa"
-
-#: src/callbacks.c:9374 src/callbacks.c:9421
+#: src/callbacks.c:9284 src/callbacks.c:9333
 msgid "resumed..."
 msgstr "continuando..."
 
-#: src/callbacks.c:9393
+#: src/callbacks.c:9303
 msgid "Keep"
 msgstr "Manter"
 
-#: src/callbacks.c:9396
+#: src/callbacks.c:9305
 msgid "Enough"
 msgstr "Suficiente"
 
-#: src/callbacks.c:9401
+#: src/callbacks.c:9310
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2696,28 +2685,28 @@
 "(clique 'Manter' para manter o que você tem e parar)\n"
 "(clique em 'Continuar' para continuar o processamento)"
 
-#: src/callbacks.c:9419
+#: src/callbacks.c:9331
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: src/callbacks.c:9558
+#: src/callbacks.c:9478
 msgid "Stop"
 msgstr ""
 
-#: src/callbacks.c:10053 src/multitrack.c:13247
+#: src/callbacks.c:9968 src/multitrack.c:13489
 msgid "LiVES: Selected frame"
 msgstr "LiVES: Frame selecionado"
 
-#: src/callbacks.c:10061
+#: src/callbacks.c:9976
 msgid "_Save frame as..."
 msgstr ""
 
-#: src/callbacks.c:10290
+#: src/callbacks.c:10202
 #, c-format
 msgid "Audio is ahead of video by %.4f secs. at frame %d, with fps %.4f\n"
 msgstr ""
 
-#: src/callbacks.c:10347
+#: src/callbacks.c:10255
 msgid ""
 "\n"
 "\n"
@@ -2726,7 +2715,7 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10353
+#: src/callbacks.c:10261
 msgid ""
 "\n"
 "\n"
@@ -2738,7 +2727,7 @@
 "Você deve instalar o \"xwininfo\" para usar este recurso\n"
 "\n"
 
-#: src/callbacks.c:10429 src/callbacks.c:11479
+#: src/callbacks.c:10334 src/callbacks.c:11395
 msgid ""
 "\n"
 "Record time must be greater than 0.\n"
@@ -2746,7 +2735,7 @@
 "\n"
 "Tempo de gravação deve ser maior que 0.\n"
 
-#: src/callbacks.c:10440
+#: src/callbacks.c:10346
 msgid ""
 "Capture an External Window:\n"
 "\n"
@@ -2760,11 +2749,11 @@
 "Clique em 'Cancelar' para cancelar\n"
 "\n"
 
-#: src/callbacks.c:10445
+#: src/callbacks.c:10351
 msgid "External window was released.\n"
 msgstr "A janela externa foi solta.\n"
 
-#: src/callbacks.c:10479
+#: src/callbacks.c:10385
 msgid ""
 "Click on a Window to Capture it\n"
 "Press 'q' to stop recording"
@@ -2772,7 +2761,7 @@
 "Clique em uma janela para capturar\n"
 "Pressione 'q' para parar a gravação"
 
-#: src/callbacks.c:10513
+#: src/callbacks.c:10419
 #, c-format
 msgid ""
 "\n"
@@ -2788,19 +2777,19 @@
 "'Parar' ou 'q' para terminar.\n"
 "(O padrão de %.3f frames por segundo vai ser usado.)\n"
 
-#: src/callbacks.c:10539
+#: src/callbacks.c:10443
 msgid "LiVES was unable to capture this window. Sorry.\n"
 msgstr "LiVES não conseguiu capturar esta janela. Desculpe.\n"
 
-#: src/callbacks.c:10695
+#: src/callbacks.c:10601
 msgid "Export Selected Audio as..."
 msgstr "Exportar Áudio Selecionado como..."
 
-#: src/callbacks.c:10699
+#: src/callbacks.c:10604
 msgid "Export Audio as..."
 msgstr "Exportar Áudio como..."
 
-#: src/callbacks.c:10714
+#: src/callbacks.c:10619
 msgid ""
 "\n"
 "\n"
@@ -2814,86 +2803,86 @@
 "Clique em 'OK' para exportar na nova velocidade, ou 'Cancelar' para exportar "
 "na velocidade original.\n"
 
-#: src/callbacks.c:10720
+#: src/callbacks.c:10625
 #, c-format
 msgid "Exporting audio frames %d to %d as %s..."
 msgstr "Exportando frames de áudio %d até %d como %s..."
 
-#: src/callbacks.c:10725
+#: src/callbacks.c:10629
 #, c-format
 msgid "Exporting audio as %s..."
 msgstr "Exportando áudio como %s..."
 
-#: src/callbacks.c:10751
+#: src/callbacks.c:10655
 msgid "Exporting audio"
 msgstr "Exportando áudio"
 
-#: src/callbacks.c:10782
+#: src/callbacks.c:10695
 msgid "LiVES: - Append Audio File"
 msgstr ""
 
-#: src/callbacks.c:10825
+#: src/callbacks.c:10739
 #, c-format
 msgid "Appending audio file %s..."
 msgstr "Inserindo arquivo de áudio %s..."
 
-#: src/callbacks.c:10836
+#: src/callbacks.c:10756
 msgid "Appending audio"
 msgstr "Inserindo áudio"
 
-#: src/callbacks.c:10892
+#: src/callbacks.c:10818
 msgid "Append Audio"
 msgstr "Anexar Áudio"
 
-#: src/callbacks.c:10952
+#: src/callbacks.c:10883
 #, c-format
 msgid "Padding audio to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10954
+#: src/callbacks.c:10885
 #, c-format
 msgid "Trimming audio from %.2f to %.2f seconds..."
 msgstr "Diminuindo áudio de %.2f para %.2f segundos..."
 
-#: src/callbacks.c:10973
+#: src/callbacks.c:10904
 msgid "Trimming/Padding audio"
 msgstr "Diminuindo/Aumentando áudio"
 
-#: src/callbacks.c:10981
+#: src/callbacks.c:10912
 msgid "Trim/Pad Audio"
 msgstr "Ajustar Áudio"
 
-#: src/callbacks.c:11055
+#: src/callbacks.c:10982
 msgid "Fading audio in"
 msgstr "Fading in áudio"
 
-#: src/callbacks.c:11056
+#: src/callbacks.c:10983
 msgid "Fade audio in"
 msgstr "Fade in áudio"
 
-#: src/callbacks.c:11061
+#: src/callbacks.c:10987
 msgid "Fading audio out"
 msgstr "Fading out áudio"
 
-#: src/callbacks.c:11062
+#: src/callbacks.c:10988
 msgid "Fade audio out"
 msgstr "Fade out do áudio"
 
-#: src/callbacks.c:11085
+#: src/callbacks.c:11011
 #, c-format
 msgid "%s over %.1f seconds..."
 msgstr "%s sobre %.1f segundos..."
 
-#: src/callbacks.c:11087
+#: src/callbacks.c:11013
 #, c-format
 msgid "%s from time %.2f seconds to %.2f seconds..."
 msgstr "%s do tempo %.2f segundos até %.2f segundos..."
 
-#: src/callbacks.c:11094
+#: src/callbacks.c:11020
 msgid "Fading audio..."
 msgstr "Fading áudio..."
 
-#: src/callbacks.c:11194
+#: src/callbacks.c:11119
 msgid ""
 "\n"
 "Deleting all audio will close this file.\n"
@@ -2903,47 +2892,47 @@
 "Deletar todo áudio vai fechar este arquivo.\n"
 "Tem certeza?"
 
-#: src/callbacks.c:11197
+#: src/callbacks.c:11122
 msgid "Deleting all audio..."
 msgstr "Deletando todo áudio..."
 
-#: src/callbacks.c:11203
+#: src/callbacks.c:11127
 #, c-format
 msgid "Deleting audio from %.2f to %.2f seconds..."
 msgstr "Deletando áudio de %.2f até %.2f segundos..."
 
-#: src/callbacks.c:11290
+#: src/callbacks.c:11214
 msgid "Deleting Audio"
 msgstr "Deletando Áudio"
 
-#: src/callbacks.c:11297
+#: src/callbacks.c:11221
 msgid "Delete Audio"
 msgstr "Deletar Áudio"
 
-#: src/callbacks.c:11636
+#: src/callbacks.c:11550
 msgid "Record new audio"
 msgstr "Gravar áudio novo"
 
-#: src/callbacks.c:11725
+#: src/callbacks.c:11640
 #, c-format
 msgid "Inserting silence from %.2f to %.2f seconds..."
 msgstr "Inserindo silêncio de %.2f até %.2f segundos..."
 
-#: src/callbacks.c:11754
+#: src/callbacks.c:11666
 msgid "Inserting Silence"
 msgstr "Inserindo Silêncio"
 
-#: src/merge.c:85
+#: src/merge.c:96
 msgid "LiVES: - Merge"
 msgstr "LiVES: - Mesclar"
 
-#: src/merge.c:102
+#: src/merge.c:113
 #, c-format
 msgid "Merge Clipboard [ %d Frames ]       With Selection [ %d Frames ]"
 msgstr ""
 "Mesclar área de trabalho [ %d Frames ]       Com a seleção [ %d Frames ]"
 
-#: src/merge.c:107
+#: src/merge.c:118
 #, c-format
 msgid ""
 "Merge Clipboard [ %d Frames (resampled) ]       With Selection [ %d Frames ]"
@@ -2951,585 +2940,585 @@
 "Mesclar área de trabalho [ %d Frames (resampleada)]       Com a seleção [ %d "
 "Frames ]"
 
-#: src/merge.c:118
+#: src/merge.c:130
 msgid "Align _Starts"
 msgstr "Alinhar Início_s"
 
-#: src/merge.c:123
+#: src/merge.c:135
 msgid "Align _Ends"
 msgstr "Alinhar Finais [_E]"
 
-#: src/merge.c:134
+#: src/merge.c:146
 msgid "What to do with extra clipboard frames -"
 msgstr "O que fazer com os frames que sobraram na área de trabalho -"
 
-#: src/merge.c:137
+#: src/merge.c:149
 msgid "_Insert Frames"
 msgstr "_Inserir Frames"
 
-#: src/merge.c:143
+#: src/merge.c:155
 msgid "_Drop Frames"
 msgstr "_Deletar Frames"
 
-#: src/merge.c:149
+#: src/merge.c:160
 msgid "Number of Times to Loop Clipboard"
 msgstr "Número de vezes a repetir área de transferência"
 
-#: src/merge.c:160
+#: src/merge.c:171
 msgid "_Loop Clipboard to Fit Selection"
 msgstr "Repetir área de transferência para se encaixar à se_leção"
 
-#: src/merge.c:173
+#: src/merge.c:184
 msgid "_Transition Method:"
 msgstr "Método de _Transição:"
 
-#: src/merge.c:394
+#: src/merge.c:395
 msgid "Merging clipboard with selection..."
 msgstr "Mesclando área de transferência com seleção..."
 
-#: src/merge.c:551
+#: src/merge.c:539
 msgid "Merge done.\n"
 msgstr "Mesclagem feita.\n"
 
-#: src/gui.c:123
+#: src/gui.c:122
 msgid "_Custom Generators"
 msgstr ""
 
-#: src/gui.c:124
+#: src/gui.c:123
 msgid "_Custom Effects"
 msgstr "Efeitos _Customizados"
 
-#: src/gui.c:125
+#: src/gui.c:124
 msgid "Custom _Utilities"
 msgstr "_Utilitários Customizados"
 
-#: src/gui.c:352 src/multitrack.c:5964
+#: src/gui.c:351 src/multitrack.c:6143
 msgid "_File"
 msgstr "_Arquivo"
 
-#: src/gui.c:367 src/multitrack.c:5989
+#: src/gui.c:366 src/multitrack.c:6168
 msgid "_Open File/Directory"
 msgstr "Abrir Arquivo/Diretóri_o"
 
-#: src/gui.c:373
+#: src/gui.c:372
 msgid "O_pen Part of File..."
 msgstr ""
 
-#: src/gui.c:379 src/gui.c:383 src/multitrack.c:6006 src/multitrack.c:6023
-#: src/multitrack.c:6028
+#: src/gui.c:378 src/gui.c:382 src/multitrack.c:6185 src/multitrack.c:6202
+#: src/multitrack.c:6207
 msgid "Open _Location/Stream..."
 msgstr "Abrir Stream... [_L]"
 
-#: src/gui.c:393 src/multitrack.c:6016
+#: src/gui.c:392 src/multitrack.c:6195
 msgid "Open _Youtube Clip..."
 msgstr ""
 
-#: src/gui.c:404
+#: src/gui.c:403
 msgid "Import from _dvd/vcd..."
 msgstr ""
 
-#: src/gui.c:413
+#: src/gui.c:412
 msgid "Import from _dvd"
 msgstr ""
 
-#: src/gui.c:416
+#: src/gui.c:415
 msgid "Import from _vcd"
 msgstr ""
 
-#: src/gui.c:419
+#: src/gui.c:418
 msgid "_Import from Firewire"
 msgstr ""
 
-#: src/gui.c:428 src/multitrack.c:6086
+#: src/gui.c:427 src/multitrack.c:6265
 msgid "Import from _Firewire Device (dv)"
 msgstr "Importar de Dispositivo _Firewire (DV)"
 
-#: src/gui.c:429 src/multitrack.c:6094
+#: src/gui.c:428 src/multitrack.c:6273
 msgid "Import from _Firewire Device (hdv)"
 msgstr "Importar de Dispositivo _Firewire (HDV)"
 
-#: src/gui.c:457
+#: src/gui.c:456
 msgid "_Add Webcam/TV card..."
 msgstr ""
 
-#: src/gui.c:476
+#: src/gui.c:475
 msgid "Add _Unicap Device"
 msgstr ""
 
-#: src/gui.c:486
+#: src/gui.c:485
 msgid "Add Live _Firewire Device"
 msgstr ""
 
-#: src/gui.c:495
+#: src/gui.c:494
 msgid "Add _TV Device"
 msgstr ""
 
-#: src/gui.c:510 src/multitrack.c:6117
+#: src/gui.c:509 src/multitrack.c:6296
 msgid "_Recent Files..."
 msgstr "Arquivos _Recentes"
 
-#: src/gui.c:560 src/multitrack.c:6177
+#: src/gui.c:559 src/multitrack.c:6356
 msgid "_Reload Clip Set..."
 msgstr "_Recarregar Set"
 
-#: src/gui.c:564 src/multitrack.c:6185
+#: src/gui.c:563 src/multitrack.c:6364
 msgid "Close/Sa_ve All Clips"
 msgstr "Fechar/Sal_var Todos Clipes"
 
-#: src/gui.c:575
+#: src/gui.c:574
 msgid "_Encode Clip As..."
 msgstr "Salvar Clip_e Como..."
 
-#: src/gui.c:577
+#: src/gui.c:576
 msgid "Encode _Selection As..."
 msgstr "Salvar _Seleção Como..."
 
-#: src/gui.c:584
+#: src/gui.c:583
 msgid "_Close This Clip"
 msgstr "Fechar Este _Clipe"
 
-#: src/gui.c:595
+#: src/gui.c:594
 msgid "_Backup Clip as .lv1..."
 msgstr "_Backup do Clip como .lv1"
 
-#: src/gui.c:604
+#: src/gui.c:603
 msgid "_Restore Clip from .lv1..."
 msgstr "_Restaurar Clip de .lv1"
 
-#: src/gui.c:615
+#: src/gui.c:614
 msgid "Encode/Load/Backup _with Sound"
 msgstr "Salvar/Carregar/Backup com Som [_W]"
 
-#: src/gui.c:620
+#: src/gui.c:619
 msgid "Auto load subtitles"
 msgstr "Carregar legendas automaticamente"
 
-#: src/gui.c:628 src/multitrack.c:6224
+#: src/gui.c:627 src/multitrack.c:6403
 msgid "Clean _up Diskspace"
 msgstr "Limpar espaço em disco [_U]"
 
-#: src/gui.c:636 src/multitrack.c:6257
+#: src/gui.c:635 src/multitrack.c:6436
 msgid "_Edit"
 msgstr "_Editar"
 
-#: src/gui.c:685
+#: src/gui.c:684
 msgid "_MULTITRACK mode"
 msgstr "Modo _MULTIPISTA"
 
-#: src/gui.c:696
+#: src/gui.c:695
 msgid "_Copy Selection"
 msgstr "_Copiar Seleção"
 
-#: src/gui.c:705
+#: src/gui.c:704
 msgid "Cu_t Selection"
 msgstr "Cor_tar Seleção"
 
-#: src/gui.c:714
+#: src/gui.c:713
 msgid "_Insert from Clipboard..."
 msgstr "_Inserir da Área de Transferência"
 
-#: src/gui.c:730
+#: src/gui.c:729
 msgid "Paste as _New"
 msgstr "Colar como _Novo"
 
-#: src/gui.c:739
+#: src/gui.c:738
 msgid "_Merge Clipboard with Selection..."
 msgstr "_Mesclar Área de Transferência com Seleção"
 
-#: src/gui.c:746
+#: src/gui.c:745
 msgid "_Delete Selection"
 msgstr "_Deletar Seleção"
 
-#: src/gui.c:764
+#: src/gui.c:763
 msgid "Decouple _Video from Audio"
 msgstr "Separar Áudio e _Vídeo"
 
-#: src/gui.c:772
+#: src/gui.c:771
 msgid "_Select..."
 msgstr "_Selecionar"
 
-#: src/gui.c:786
+#: src/gui.c:785
 msgid "Select _All Frames"
 msgstr "Selecionar Todos Fr_ames"
 
-#: src/gui.c:794
+#: src/gui.c:793
 msgid "_Start Frame Only"
 msgstr "Apena_s Frame Inicial"
 
-#: src/gui.c:802
+#: src/gui.c:801
 msgid "_End Frame Only"
 msgstr "Apenas Fram_e Final"
 
-#: src/gui.c:813
+#: src/gui.c:812
 msgid "Select from _First Frame"
 msgstr "Selecionar a partir do primeiro _frame"
 
-#: src/gui.c:817
+#: src/gui.c:816
 msgid "Select to _Last Frame"
 msgstr "Selecionar a partir do ú_ltimo frame"
 
-#: src/gui.c:821
+#: src/gui.c:820
 msgid "Select Last Insertion/_Merge"
 msgstr "Selecionar Última Inserção/_Mesclagem"
 
-#: src/gui.c:825
+#: src/gui.c:824
 msgid "Select Last _Effect"
 msgstr "Selecionar Último _Efeito"
 
-#: src/gui.c:829
+#: src/gui.c:828
 msgid "_Invert Selection"
 msgstr "_Inverter Seleção"
 
-#: src/gui.c:837
+#: src/gui.c:836
 msgid "_Lock Selection Width"
 msgstr "Travar _Largura da Seleção"
 
-#: src/gui.c:842 src/multitrack.c:6409
+#: src/gui.c:841 src/multitrack.c:6591
 msgid "_Play"
 msgstr "_Tocar"
 
-#: src/gui.c:854
+#: src/gui.c:853
 msgid "_Play All"
 msgstr "Tocar Tudo [_P]"
 
-#: src/gui.c:869
+#: src/gui.c:868
 msgid "Pla_y Selection"
 msgstr "Tocar Seleção [_Y]"
 
-#: src/gui.c:877
+#: src/gui.c:876
 msgid "Play _Clipboard"
 msgstr "To_car Área de Transferência"
 
-#: src/gui.c:899 src/multitrack.c:6441
+#: src/gui.c:898 src/multitrack.c:6623
 msgid "_Stop"
 msgstr "Parar [_S]"
 
-#: src/gui.c:914 src/multitrack.c:6453
+#: src/gui.c:913 src/multitrack.c:6635
 msgid "Re_wind"
 msgstr "Voltar [_W]"
 
-#: src/gui.c:946 src/multitrack.c:6471
+#: src/gui.c:945 src/multitrack.c:6653
 msgid "_Full Screen"
 msgstr "Tela Cheia [_F]"
 
-#: src/gui.c:955
+#: src/gui.c:954
 msgid "_Double Size"
 msgstr "Tamanho _Dobrado"
 
-#: src/gui.c:963 src/multitrack.c:6479
+#: src/gui.c:962 src/multitrack.c:6661
 msgid "Play in _Separate Window"
 msgstr "Tocar em Janela _Separada"
 
-#: src/gui.c:972
+#: src/gui.c:971
 msgid "_Blank Background"
 msgstr "Fundo _Branco"
 
-#: src/gui.c:979
+#: src/gui.c:978
 msgid "(Auto)_loop Video (to fit audio track)"
 msgstr "Repetir vídeo (para caber na faixa de áudio)"
 
-#: src/gui.c:988 src/multitrack.c:6487
+#: src/gui.c:987 src/multitrack.c:6669
 msgid "L_oop Continuously"
 msgstr "Repetir C_ontinuamente"
 
-#: src/gui.c:997
+#: src/gui.c:996
 msgid "Pin_g Pong Loops"
 msgstr "Loops Pin_g Pong"
 
-#: src/gui.c:1005 src/multitrack.c:6495
+#: src/gui.c:1004 src/multitrack.c:6677
 msgid "_Mute"
 msgstr "_Mudo"
 
-#: src/gui.c:1017
+#: src/gui.c:1016
 msgid "Separate Window 'S_ticky' Mode"
 msgstr "Modo 'S_ticky' de Janela"
 
-#: src/gui.c:1025
+#: src/gui.c:1024
 msgid "S_how Frame Counter"
 msgstr "Mostrar Contador de Frames [_H]"
 
-#: src/gui.c:1035
+#: src/gui.c:1034
 msgid "Show Subtitles"
 msgstr "Mostrar legendas"
 
-#: src/gui.c:1045
+#: src/gui.c:1044
 msgid "Letterbox mode"
 msgstr ""
 
-#: src/gui.c:1051 src/multitrack.c:6507
+#: src/gui.c:1050 src/multitrack.c:6689
 msgid "Effect_s"
 msgstr "Efeito_s"
 
-#: src/gui.c:1054
+#: src/gui.c:1053
 msgid "Effects are applied to the current selection."
 msgstr "Efeitos são aplicados na seleção atual."
 
-#: src/gui.c:1067
+#: src/gui.c:1066
 msgid "_Run Test Rendered Effect/Tool/Generator..."
 msgstr "_Rodar Efeito/Ferramenta/erador de Teste..."
 
-#: src/gui.c:1072 src/multitrack.c:7123
+#: src/gui.c:1071 src/multitrack.c:7299
 msgid "_Tools"
 msgstr "Ferramen_tas"
 
-#: src/gui.c:1075
+#: src/gui.c:1074
 msgid "Tools are applied to complete clips."
 msgstr "Ferramentas são aplicadas nos clipes inteiros."
 
-#: src/gui.c:1085
+#: src/gui.c:1084
 msgid "_Reverse Clipboard"
 msgstr "Inverte_r área de transferência"
 
-#: src/gui.c:1094
+#: src/gui.c:1093
 msgid "_Change Playback/Save Speed..."
 msgstr "Mudar velo_cidade de Execução/Salvar"
 
-#: src/gui.c:1099
+#: src/gui.c:1098
 msgid "Resample _Video to New Frame Rate..."
 msgstr "Resamplear _Vídeo para Nova Frame Rate"
 
-#: src/gui.c:1105
+#: src/gui.c:1104
 msgid "_Utilities"
 msgstr "_Utilitários"
 
-#: src/gui.c:1110
+#: src/gui.c:1109
 msgid "Custom _Tools"
 msgstr "Ferramentas _Customizadas"
 
-#: src/gui.c:1116 src/multitrack.c:7149
+#: src/gui.c:1115 src/multitrack.c:7325
 msgid "_Generate"
 msgstr "_Gerar"
 
-#: src/gui.c:1126
+#: src/gui.c:1125
 msgid "Loading rendered effect plugins..."
 msgstr "Carregando plugins de efeitos renderizados..."
 
-#: src/gui.c:1139
+#: src/gui.c:1138
 msgid "Load _Subtitles from File..."
 msgstr "Carregar _Legenda do Arquivo..."
 
-#: src/gui.c:1144
+#: src/gui.c:1143
 msgid "Erase subtitles"
 msgstr "Apagar legendas"
 
-#: src/gui.c:1152 src/multitrack.c:7158
+#: src/gui.c:1151 src/multitrack.c:7334
 msgid "Capture _External Window... "
 msgstr "Capturar Janela _Externa "
 
-#: src/gui.c:1159 src/multitrack.c:7173
+#: src/gui.c:1158 src/multitrack.c:7349
 msgid "_Preferences..."
 msgstr "_Preferências"
 
-#: src/gui.c:1172
+#: src/gui.c:1171
 msgid "_Audio"
 msgstr "_Áudio"
 
-#: src/gui.c:1184
+#: src/gui.c:1183
 msgid "Load _New Audio for Clip..."
 msgstr "Carregar _Novo Áudio para o Clipe"
 
-#: src/gui.c:1190
+#: src/gui.c:1189
 msgid "Load _CD Track..."
 msgstr "Carregar Faixa do _CD"
 
-#: src/gui.c:1191
+#: src/gui.c:1190
 msgid "E_ject CD"
 msgstr "E_jetar CD"
 
-#: src/gui.c:1205
+#: src/gui.c:1204
 msgid "Record E_xternal Audio..."
 msgstr "Gravar Áudio E_xterno..."
 
-#: src/gui.c:1218
+#: src/gui.c:1217
 msgid "to New _Clip..."
 msgstr "para _Clip Novo..."
 
-#: src/gui.c:1222
+#: src/gui.c:1221
 msgid "to _Selection"
 msgstr "para _Seleção"
 
-#: src/gui.c:1230
+#: src/gui.c:1229
 msgid "Fade Audio _In..."
 msgstr "Fade _In Áudio..."
 
-#: src/gui.c:1234
+#: src/gui.c:1233
 msgid "Fade Audio _Out..."
 msgstr "Fade _Out Áudio..."
 
-#: src/gui.c:1244
+#: src/gui.c:1243
 msgid "_Export Audio..."
 msgstr "_Exportar Áudio"
 
-#: src/gui.c:1257
+#: src/gui.c:1256
 msgid "Export _Selected Audio..."
 msgstr "Exportar Áudio _Selecionado"
 
-#: src/gui.c:1261
+#: src/gui.c:1260
 msgid "Export _All Audio..."
 msgstr "Export_ar Todo Áudio"
 
-#: src/gui.c:1265
+#: src/gui.c:1264
 msgid "_Append Audio..."
 msgstr "_Anexar Áudio"
 
-#: src/gui.c:1270
+#: src/gui.c:1269
 msgid "_Trim/Pad Audio..."
 msgstr "_Ajustar Áudio"
 
-#: src/gui.c:1283
+#: src/gui.c:1282
 msgid "Trim/Pad Audio to _Selection"
 msgstr "Diminuir/Aumentar Áudio para _Selecão"
 
-#: src/gui.c:1288
+#: src/gui.c:1287
 msgid "Trim/Pad Audio from Beginning to _Play Start"
 msgstr "Ajustar Áudio do Início ao Começo da Execução [_P]"
 
-#: src/gui.c:1293
+#: src/gui.c:1292
 msgid "_Delete Audio..."
 msgstr "_Deletar Áudio"
 
-#: src/gui.c:1306
+#: src/gui.c:1305
 msgid "Delete _Selected Audio"
 msgstr "Deletar Áudio _Selecionado"
 
-#: src/gui.c:1310
+#: src/gui.c:1309
 msgid "Delete _All Audio"
 msgstr "Deletar _Todo Áudio"
 
-#: src/gui.c:1314
+#: src/gui.c:1313
 msgid "Insert _Silence in Selection"
 msgstr "Inserir _Silêncio na Seleção"
 
-#: src/gui.c:1319
+#: src/gui.c:1318
 msgid "_Resample Audio..."
 msgstr "_Resamplear Áudio..."
 
-#: src/gui.c:1324
+#: src/gui.c:1323
 msgid "_Info"
 msgstr "_Info"
 
-#: src/gui.c:1336
+#: src/gui.c:1335
 msgid "Show Clip _Info"
 msgstr "Mostrar _Informação de Clipe"
 
-#: src/gui.c:1344
+#: src/gui.c:1343
 msgid "Show/_Edit File Comments"
 msgstr "Mostrar/_Editar Comentários do Arquivo"
 
-#: src/gui.c:1349
+#: src/gui.c:1348
 msgid "Show _Clipboard Info"
 msgstr "Mostrar Info da Área de Transferên_cia"
 
-#: src/gui.c:1360 src/multitrack.c:7286
+#: src/gui.c:1359 src/multitrack.c:7462
 msgid "Show _Messages"
 msgstr "Mostrar _Mensagens"
 
-#: src/gui.c:1364 src/multitrack.c:7365
+#: src/gui.c:1363 src/multitrack.c:7541
 msgid "Show _Layout Errors"
 msgstr "Mostrar Erros de _Layout"
 
-#: src/gui.c:1369 src/multitrack.c:7263
+#: src/gui.c:1368 src/multitrack.c:7439
 msgid "_Clips"
 msgstr "_Clipes"
 
-#: src/gui.c:1381
+#: src/gui.c:1380
 msgid "_Rename Current Clip in Menu..."
 msgstr "_Renomear Clipe Atual no Menu"
 
-#: src/gui.c:1399
+#: src/gui.c:1398
 msgid "A_dvanced"
 msgstr "A_vançado"
 
-#: src/gui.c:1412
+#: src/gui.c:1411
 msgid "_RFX Effects/Tools/Utilities"
 msgstr "Efeitos/Ferramentas/Utilitários _RFX"
 
-#: src/gui.c:1424
+#: src/gui.c:1423
 msgid "_New Test RFX Script..."
 msgstr "_Novo Script RFX de Teste..."
 
-#: src/gui.c:1428
+#: src/gui.c:1427
 msgid "_Copy RFX Script to Test..."
 msgstr "_Copiar Script RFX para Teste"
 
-#: src/gui.c:1432
+#: src/gui.c:1431
 msgid "_Edit Test RFX Script..."
 msgstr "_Editar Script RFX de teste..."
 
-#: src/gui.c:1436
+#: src/gui.c:1435
 msgid "Rena_me Test RFX Script..."
 msgstr "Reno_mear Script RFX de Teste"
 
-#: src/gui.c:1440
+#: src/gui.c:1439
 msgid "_Delete Test RFX Script..."
 msgstr "_Deletar Script RFX de Teste"
 
-#: src/gui.c:1450
+#: src/gui.c:1449
 msgid "_Promote Test Rendered Effect/Tool/Generator..."
 msgstr "_Promover Teste de Efeito/Ferramenta/Gerador Renderizado..."
 
-#: src/gui.c:1457
+#: src/gui.c:1456
 msgid "_Import Custom RFX script..."
 msgstr "_Importar Script RFX Customizado"
 
-#: src/gui.c:1461
+#: src/gui.c:1460
 msgid "E_xport Custom RFX script..."
 msgstr "E_xportar Script RFX Customizado"
 
-#: src/gui.c:1465
+#: src/gui.c:1464
 msgid "De_lete Custom RFX Script..."
 msgstr "De_letar Script RFX Customizado"
 
-#: src/gui.c:1472
+#: src/gui.c:1471
 msgid "Re_build all RFX plugins"
 msgstr "Reconstruir todos plugins RFX [_B]"
 
-#: src/gui.c:1501
+#: src/gui.c:1498
 msgid "Receive _LiVES stream from..."
 msgstr "Receber _LiVES stream de..."
 
-#: src/gui.c:1506
+#: src/gui.c:1503
 msgid "_Send LiVES stream to..."
 msgstr "Enviar LiVES _stream para..."
 
-#: src/gui.c:1515
+#: src/gui.c:1512
 #, c-format
 msgid "Open _yuv4mpeg stream on %sstream.yuv..."
 msgstr "Abrir _yuv4mpeg stream em %sstream.yuv"
 
-#: src/gui.c:1536
+#: src/gui.c:1534
 msgid "_Import Project (.lv2)..."
 msgstr "_Importar Projeto (.lv2)"
 
-#: src/gui.c:1540
+#: src/gui.c:1538
 msgid "E_xport Project (.lv2)..."
 msgstr "E_xportar Projeto (.lv2)"
 
-#: src/gui.c:1545
+#: src/gui.c:1543
 msgid "_VJ"
 msgstr "_VJ"
 
-#: src/gui.c:1557
+#: src/gui.c:1555
 msgid "Real Time _Effect Mapping"
 msgstr "Mapeamento de _Efeitos de Tempo-Real"
 
-#: src/gui.c:1563
+#: src/gui.c:1561
 msgid "Bind real time effects to ctrl-number keys."
 msgstr "Vincular efeitos em tempo real para ctrl mais teclas de número."
 
-#: src/gui.c:1565
+#: src/gui.c:1563
 msgid "Set Real Time Effect _Defaults"
 msgstr "_Definir Padrão de Efeitos em Tempo Real"
 
-#: src/gui.c:1567
+#: src/gui.c:1565
 msgid "Set default parameter values for real time effects."
 msgstr "Definir padrão de valores de parâmetros para efeitos em tempo real."
 
-#: src/gui.c:1580
+#: src/gui.c:1578
 msgid "Save Real Time Effect _Defaults"
 msgstr "Salvar Padrão _de Efeitos em Tempo Real"
 
-#: src/gui.c:1583
+#: src/gui.c:1581
 msgid ""
 "Save real time effect defaults so they will be restored each time you use "
 "LiVES."
@@ -3537,320 +3526,320 @@
 "Salvar padrão de efeitos de tempo real de modo que seja restaurado toda vez "
 "que o LiVES abrir."
 
-#: src/gui.c:1589
+#: src/gui.c:1587
 msgid "_Reset all playback speeds and positions"
 msgstr "_Reiniciar todas as velocidades e posições de reprodução"
 
-#: src/gui.c:1592
+#: src/gui.c:1590
 msgid ""
 "Reset all playback positions to frame 1, and reset all playback frame rates."
 msgstr ""
 "Reiniciar todas posições de reprodução para o frame 1 e todas as framerates."
 
-#: src/gui.c:1594
+#: src/gui.c:1592
 msgid "_MIDI/joystick interface"
 msgstr "Interface _MIDI/joystick"
 
-#: src/gui.c:1609
+#: src/gui.c:1607
 msgid "_MIDI/joystick learner..."
 msgstr "Configuração _MIDI/joystick"
 
-#: src/gui.c:1614
+#: src/gui.c:1612
 msgid "_Save device mapping..."
 msgstr "_Salvar mapeamento de dispositivo"
 
-#: src/gui.c:1620
+#: src/gui.c:1618
 msgid "_Load device mapping..."
 msgstr "Carregar mapeamento de dispositivo [_L]"
 
-#: src/gui.c:1628
+#: src/gui.c:1626
 msgid "Show VJ _Keys"
 msgstr "Mostrar Teclas de VJ [_K]"
 
-#: src/gui.c:1632
+#: src/gui.c:1630
 msgid "To_ys"
 msgstr "_Brinquedos"
 
-#: src/gui.c:1644
+#: src/gui.c:1642
 msgid "_None"
 msgstr "_Nenhum"
 
-#: src/gui.c:1652
+#: src/gui.c:1650
 msgid "_Autolives"
 msgstr ""
 
-#: src/gui.c:1657
+#: src/gui.c:1655
 msgid "_Mad Frames"
 msgstr "Fra_mes doidos"
 
-#: src/gui.c:1662
+#: src/gui.c:1660
 msgid "_LiVES TV (broadband)"
 msgstr "TV _LiVES (banda larga)"
 
-#: src/gui.c:1672 src/multitrack.c:7387
+#: src/gui.c:1670 src/multitrack.c:7563
 msgid "_Help"
 msgstr "A_juda"
 
-#: src/gui.c:1684 src/multitrack.c:7407
+#: src/gui.c:1682 src/multitrack.c:7583
 msgid "_Manual (opens in browser)"
 msgstr "_Manual (abre no browser)"
 
-#: src/gui.c:1691 src/multitrack.c:7416
+#: src/gui.c:1689 src/multitrack.c:7592
 msgid "_Donate to the project !"
 msgstr "_Doação para o projeto !"
 
-#: src/gui.c:1695 src/multitrack.c:7420
+#: src/gui.c:1693 src/multitrack.c:7596
 msgid "_Email the author"
 msgstr "_Email do autor"
 
-#: src/gui.c:1699 src/multitrack.c:7424
+#: src/gui.c:1697 src/multitrack.c:7600
 msgid "Report a _bug"
 msgstr "Reportar um _bug"
 
-#: src/gui.c:1703 src/multitrack.c:7428
+#: src/gui.c:1701 src/multitrack.c:7604
 msgid "Suggest a _feature"
 msgstr "Sugira um _recurso"
 
-#: src/gui.c:1707 src/multitrack.c:7432
+#: src/gui.c:1705 src/multitrack.c:7608
 msgid "Assist with _translating"
 msgstr "Ajudar com a _traduçao"
 
-#: src/gui.c:1714 src/multitrack.c:7439
+#: src/gui.c:1712 src/multitrack.c:7615
 msgid "_Troubleshoot"
 msgstr "Resolução de Problemas"
 
-#: src/gui.c:1718 src/multitrack.c:7443
+#: src/gui.c:1716 src/multitrack.c:7619
 msgid "_About"
 msgstr "Sobre [_A]"
 
-#: src/gui.c:1752
+#: src/gui.c:1750
 msgid "Rewind to start (w)"
 msgstr "Rebobinar para iniciar (w)"
 
-#: src/gui.c:1760 src/multitrack.c:16720
+#: src/gui.c:1758 src/multitrack.c:17010
 msgid "Play all (p)"
 msgstr "Tocar tudo (p)"
 
-#: src/gui.c:1768 src/gui.c:1877
+#: src/gui.c:1766 src/gui.c:1876
 msgid "Stop playback (q)"
 msgstr "Parar execução (q)"
 
-#: src/gui.c:1779
+#: src/gui.c:1777
 msgid "Play selection (y)"
 msgstr "Tocar seleção (y)"
 
-#: src/gui.c:1832
+#: src/gui.c:1829
 msgid "Volume"
 msgstr "Volume"
 
-#: src/gui.c:1854
+#: src/gui.c:1853
 msgid "Audio volume (1.00)"
 msgstr "Volume do áudio (1.00)"
 
-#: src/gui.c:1883
+#: src/gui.c:1882
 msgid "Unblank background (b)"
 msgstr "Remover fundo branco (b)"
 
-#: src/gui.c:1929
+#: src/gui.c:1928
 msgid "Play slower (ctrl-down)"
 msgstr "Tocar mais devagar (ctrl-down)"
 
-#: src/gui.c:1935
+#: src/gui.c:1934
 msgid "Play faster (ctrl-up)"
 msgstr "Tocar mais rápido (ctrl-up)"
 
-#: src/gui.c:1942
+#: src/gui.c:1941
 msgid "Skip back (ctrl-left)"
 msgstr "Voltar (ctrl-left)"
 
-#: src/gui.c:1948
+#: src/gui.c:1947
 msgid "Skip forward (ctrl-right)"
 msgstr "Avançar (ctrl-right)"
 
-#: src/gui.c:1954
+#: src/gui.c:1953
 msgid "Show clip info (i)"
 msgstr "Mostrar informação de clipe (i)"
 
-#: src/gui.c:1960
+#: src/gui.c:1959
 msgid "Hide this toolbar"
 msgstr "Esconder esta barra de ferramentas"
 
-#: src/gui.c:1962
+#: src/gui.c:1961
 msgid ""
 "Press \"s\" to toggle separate play window for improved performance, \"q\" "
 "to stop."
 msgstr ""
 
 #. TRANSLATORS: please keep the translated string the same length
-#: src/gui.c:1995
+#: src/gui.c:1994
 msgid "     Video playback speed (frames per second)        "
 msgstr "     Velocidade de execução do vídeo (frames por segundo)        "
 
-#: src/gui.c:2009
+#: src/gui.c:2008
 msgid "Vary the video speed"
 msgstr "Variar a velocidade do vídeo"
 
-#: src/gui.c:2092 src/gui.c:3218
+#: src/gui.c:2090 src/gui.c:3329
 msgid "First Frame"
 msgstr "Primeiro Frame"
 
-#: src/gui.c:2193 src/gui.c:3226
+#: src/gui.c:2191 src/gui.c:3336
 msgid "Last Frame"
 msgstr "Último Frame"
 
-#: src/gui.c:2210
+#: src/gui.c:2208
 msgid "The first selected frame in this clip"
 msgstr "O primeiro frame selecionado nesse clipe"
 
-#: src/gui.c:2248
+#: src/gui.c:2246
 msgid "The last selected frame in this clip"
 msgstr "O último frame selecionado nesse clipe"
 
-#: src/gui.c:2532
+#: src/gui.c:2546
 msgid "Starting...\n"
 msgstr "Iniciando...\n"
 
-#: src/gui.c:3074
+#: src/gui.c:3181
 msgid "    Press 'q' to stop recording.  DO NOT COVER THE PLAY WINDOW !   "
 msgstr ""
 "    Aperte 'Q' para parar a gravação. NÃO CUBRA A JANELA DO TOCADOR!   "
 
-#: src/gui.c:3521
+#: src/gui.c:3643
 msgid "Frame number to preview"
 msgstr "Número do frame a visualizar"
 
-#: src/gui.c:3538
+#: src/gui.c:3660
 msgid "_Free"
 msgstr "Livre [_f]"
 
-#: src/gui.c:3539
+#: src/gui.c:3661
 msgid "Free choice of frame number"
 msgstr "Escolha livre do número do frame"
 
-#: src/gui.c:3543
+#: src/gui.c:3666
 msgid "_Start"
 msgstr "Início [_s]"
 
-#: src/gui.c:3544
+#: src/gui.c:3667
 msgid "Frame number is linked to start frame"
 msgstr "O número do frame está ligado ao quadro inicial"
 
-#: src/gui.c:3551
+#: src/gui.c:3675
 msgid "_End"
 msgstr "Fim [_e]"
 
-#: src/gui.c:3552
+#: src/gui.c:3676
 msgid "Frame number is linked to end frame"
 msgstr "O número do frame está ligado ao quadro final"
 
-#: src/gui.c:3559
+#: src/gui.c:3684
 msgid "_Pointer"
 msgstr "_Ponteiro"
 
-#: src/gui.c:3560
+#: src/gui.c:3685
 msgid "Frame number is linked to playback pointer"
 msgstr "O número do frame está ligado ao ponteiro de execução"
 
-#: src/gui.c:3581
+#: src/gui.c:3707
 msgid "Rewind"
 msgstr "Voltar"
 
-#: src/gui.c:3592 src/dialogs.c:894 src/dialogs.c:896 src/dialogs.c:1817
-#: src/dialogs.c:1819
+#: src/gui.c:3718 src/dialogs.c:960 src/dialogs.c:962 src/dialogs.c:1873
+#: src/dialogs.c:1875
 msgid "Play all"
 msgstr "Tocar Tudo"
 
-#: src/gui.c:3605
+#: src/gui.c:3731
 msgid "Play Selection"
 msgstr "Tocar Seleção"
 
-#: src/gui.c:3619
+#: src/gui.c:3745
 msgid "Loop On/Off"
 msgstr "Loop On/Off"
 
-#: src/gui.c:3693
+#: src/gui.c:3819
 msgid "Start _recording"
 msgstr "Iniciar g_ravação"
 
-#: src/gui.c:3698
+#: src/gui.c:3824
 msgid "Stop _recording"
 msgstr "Parar de grava_r"
 
-#: src/gui.c:3703
+#: src/gui.c:3829
 msgid "_Record Performance"
 msgstr "G_ravar Performance"
 
-#: src/gui.c:3851
+#: src/gui.c:3974
 msgid "Hide Play Window"
 msgstr "Esconder Janela do Tocador"
 
-#: src/gui.c:4232
+#: src/gui.c:4333
 msgid "Show Play Window"
 msgstr "Mostrar Janela do Tocador"
 
-#: src/ce_thumbs.c:222
+#: src/ce_thumbs.c:242
 #, c-format
 msgid "Mapped to ctrl-%d"
 msgstr ""
 
-#: src/ce_thumbs.c:276 src/effects.c:85 src/preferences.c:3195
+#: src/ce_thumbs.c:296 src/effects.c:86 src/preferences.c:3247
 msgid "Effects"
 msgstr "Efeitos"
 
-#: src/ce_thumbs.c:279 src/multitrack.c:5615
+#: src/ce_thumbs.c:299 src/multitrack.c:5791
 msgid "Clips"
 msgstr "Clipes"
 
-#: src/ce_thumbs.c:303
+#: src/ce_thumbs.c:323
 #, fuzzy, c-format
 msgid "Show / apply effects to %s\n"
 msgstr "Desligar todos os effeitos."
 
-#: src/ce_thumbs.c:315
+#: src/ce_thumbs.c:335
 #, fuzzy, c-format
 msgid "Select clip for %s\n"
 msgstr "_Deletar set"
 
-#: src/ce_thumbs.c:515
+#: src/ce_thumbs.c:536
 msgid "_Pin"
 msgstr ""
 
-#: src/ce_thumbs.c:515
+#: src/ce_thumbs.c:537
 msgid "Pin the parameter box to the window"
 msgstr ""
 
 #. TRANSLATORS: Exabytes
-#: src/utils.c:794
+#: src/utils.c:800
 #, c-format
 msgid "%.2f EB"
 msgstr ""
 
 #. TRANSLATORS: Petabytes
-#: src/utils.c:798
+#: src/utils.c:803
 #, c-format
 msgid "%.2f PB"
 msgstr ""
 
 #. TRANSLATORS: Terabytes
-#: src/utils.c:802
+#: src/utils.c:806
 #, c-format
 msgid "%.2f TB"
 msgstr ""
 
 #. TRANSLATORS: Gigabytes
-#: src/utils.c:806
+#: src/utils.c:809
 #, c-format
 msgid "%.2f GB"
 msgstr ""
 
 #. TRANSLATORS: Megabytes
-#: src/utils.c:810
+#: src/utils.c:812
 #, c-format
 msgid "%.2f MB"
 msgstr ""
 
 #. TRANSLATORS: Kilobytes (1024 bytes)
-#: src/utils.c:814
+#: src/utils.c:815
 #, c-format
 msgid "%.2f KiB"
 msgstr ""
@@ -3860,7 +3849,7 @@
 msgid "%d bytes"
 msgstr ""
 
-#: src/utils.c:1841
+#: src/utils.c:1835
 msgid "Clearing the clipboard"
 msgstr "Limpando a área de trasferência"
 
@@ -3875,7 +3864,7 @@
 "==============================\n"
 "Alternado para clipe %s\n"
 
-#: src/utils.c:1880
+#: src/utils.c:1877
 msgid ""
 "\n"
 "==============================\n"
@@ -3885,11 +3874,11 @@
 "==============================\n"
 "Alternado para clipe vazio\n"
 
-#: src/utils.c:1917
+#: src/utils.c:1916
 msgid "(blank)"
 msgstr "(vazio)"
 
-#: src/utils.c:1920
+#: src/utils.c:1919
 #, c-format
 msgid ""
 "The set name has been changed from %s to %s. Affected layouts have been "
@@ -3898,7 +3887,7 @@
 "O nome do set foi modificado de %s para %s. Layouts afetados foram "
 "atualizados\n"
 
-#: src/utils.c:1928
+#: src/utils.c:1927
 #, c-format
 msgid ""
 "The clip %s is missing from this set.\n"
@@ -3907,7 +3896,7 @@
 "O clipe %s está faltando no set.\n"
 "Ele é necessário para os seguintes layouts:\n"
 
-#: src/utils.c:1932
+#: src/utils.c:1931
 #, c-format
 msgid ""
 "The clip %s has been closed.\n"
@@ -3916,7 +3905,7 @@
 "O clipe %s foi fechado.\n"
 "Ele é utilizado nos seguintes layouts:\n"
 
-#: src/utils.c:1937
+#: src/utils.c:1936
 #, c-format
 msgid ""
 "Frames have been shifted in the clip %s.\n"
@@ -3925,7 +3914,7 @@
 "Frames foram movidos no clipe %s.\n"
 "Os seguintes layouts foram afetados:\n"
 
-#: src/utils.c:1942
+#: src/utils.c:1941
 #, c-format
 msgid ""
 "Frames have been deleted from the clip %s.\n"
@@ -3934,7 +3923,7 @@
 "Frames foram deletados no clipe %s.\n"
 "Os seguintes layouts foram afetados:\n"
 
-#: src/utils.c:1947
+#: src/utils.c:1946
 #, c-format
 msgid ""
 "Audio has been deleted from the clip %s.\n"
@@ -3943,7 +3932,7 @@
 "Frames foram deletados do clipe %s.\n"
 "Os seguintes layouts foram afetados:\n"
 
-#: src/utils.c:1952
+#: src/utils.c:1951
 #, c-format
 msgid ""
 "Audio has been shifted in clip %s.\n"
@@ -3952,7 +3941,7 @@
 "Áudio foi movido no clipe %s.\n"
 "Os seguintes layouts foram afetados:\n"
 
-#: src/utils.c:1957
+#: src/utils.c:1956
 #, c-format
 msgid ""
 "Audio has been altered in the clip %s.\n"
@@ -3961,7 +3950,7 @@
 "Áduio foi alterado no clipe %s.\n"
 "Os seguintes layouts foram afetados:\n"
 
-#: src/utils.c:1962
+#: src/utils.c:1961
 #, c-format
 msgid ""
 "Frames have been altered in the clip %s.\n"
@@ -3970,7 +3959,7 @@
 "Frames foram alterados no clipe %s.\n"
 "Os seguintes layouts foram afetados:\n"
 
-#: src/utils.c:2135
+#: src/utils.c:2134
 #, c-format
 msgid ""
 "Set %s\n"
@@ -3981,7 +3970,7 @@
 "não pode ser aberto porque está em uso\n"
 "por outra instância de LiVES.\n"
 
-#: src/utils.c:2142
+#: src/utils.c:2140
 #, c-format
 msgid ""
 "\n"
@@ -4037,70 +4026,70 @@
 msgid "Removing layout %s\n"
 msgstr "Removendo layout %s\n"
 
-#: src/utils.c:3014
+#: src/utils.c:2996
 msgid "Video [opening...]"
 msgstr "Vídeo [abrindo...]"
 
-#: src/utils.c:3018
+#: src/utils.c:2999
 #, c-format
 msgid "Video [%.2f sec]"
 msgstr "Vídeo [%.2f seg]"
 
-#: src/utils.c:3022
+#: src/utils.c:3002
 msgid "(Undefined)"
 msgstr "(Indefinida)"
 
-#: src/utils.c:3025
+#: src/utils.c:3004
 msgid "(No video)"
 msgstr "(Sem vídeo)"
 
-#: src/utils.c:3032
+#: src/utils.c:3011
 msgid "(No audio)"
 msgstr "(Sem áudio)"
 
-#: src/utils.c:3037
+#: src/utils.c:3015
 msgid "Mono  [opening...]"
 msgstr "Mono  [abrindo...]"
 
-#: src/utils.c:3040
+#: src/utils.c:3017
 msgid "Left Audio [opening...]"
 msgstr "Áudio Esquerdo [abrindo...]"
 
-#: src/utils.c:3045
+#: src/utils.c:3021
 #, c-format
 msgid "Mono [%.2f sec]"
 msgstr "Mono [%.2f seg]"
 
-#: src/utils.c:3048
+#: src/utils.c:3023
 #, c-format
 msgid "Left Audio [%.2f sec]"
 msgstr "Áudio Esquerdo [%.2f seg]"
 
-#: src/utils.c:3056
+#: src/utils.c:3031
 msgid "Right Audio [opening...]"
 msgstr "Áudio Direito [abrindo...]"
 
-#: src/utils.c:3059
+#: src/utils.c:3033
 #, c-format
 msgid "Right Audio [%.2f sec]"
 msgstr "Áudio Direito [%.2f seg]"
 
-#: src/utils.c:3506
+#: src/utils.c:3472
 msgid "LiVES cannot switch to mplayer whilst clips are loading."
 msgstr ""
 "LiVES não pode mudar para o mplayer enquanto clipes estão sendo carregados."
 
-#: src/utils.c:3559
+#: src/utils.c:3525
 #, fuzzy
 msgid "LiVES cannot switch to mplayer2 whilst clips are loading."
 msgstr ""
 "LiVES não pode mudar para o mplayer enquanto clipes estão sendo carregados."
 
-#: src/utils.c:3809
+#: src/utils.c:3775
 msgid "Cleaning up clip"
 msgstr "Limpando clipe"
 
-#: src/utils.c:3913
+#: src/utils.c:3874
 #, c-format
 msgid ""
 "\n"
@@ -4115,30 +4104,29 @@
 "\n"
 "Sobrescrever?\n"
 
-#: src/utils.c:4305 src/utils.c:4337 src/multitrack.c:4503
+#: src/utils.c:4250 src/utils.c:4280 src/multitrack.c:4672
 #, c-format
 msgid "_Undo %s"
 msgstr "Desfazer %s [_U]"
 
-#: src/utils.c:4306 src/utils.c:4338 src/multitrack.c:4525
+#: src/utils.c:4251 src/utils.c:4281 src/multitrack.c:4693
 #, c-format
 msgid "_Redo %s"
 msgstr "_Refazer %s"
 
-#: src/utils.c:4363
+#: src/utils.c:4305
 msgid "-------------Selection------------"
 msgstr "-------------Seleção------------"
 
-#. TRANSLATORS: - try to keep the text of the middle part the same length, by deleting "-" if necessary
-#: src/utils.c:4371
+#: src/utils.c:4313
 msgid " sec ] ----------Selection---------- [ "
 msgstr " seg ] ---------- Seleção ---------- [ "
 
-#: src/utils.c:4371
+#: src/utils.c:4314
 msgid " frames ] ----------"
 msgstr " frames ] ----------"
 
-#: src/utils.c:5360
+#: src/utils.c:5302
 msgid ""
 "Your version of mplayer/ffmpeg may be broken !\n"
 "See http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2071\n"
@@ -4149,11 +4137,11 @@
 "Try running Help/Troubleshoot for more information."
 msgstr ""
 
-#: src/saveplay.c:178
+#: src/saveplay.c:179
 msgid "Examining file header"
 msgstr "Examinando cabeçalho do arquivo"
 
-#: src/saveplay.c:315 src/saveplay.c:789
+#: src/saveplay.c:316 src/saveplay.c:779
 #, c-format
 msgid "Opening %s"
 msgstr "Abrindo %s"
@@ -4163,36 +4151,36 @@
 msgid "Opening %s start time %.2f sec. frames %d"
 msgstr "Abrindo %s tempo inicial %.2f seg. frames %d"
 
-#: src/saveplay.c:326 src/saveplay.c:4001
+#: src/saveplay.c:326 src/saveplay.c:3927
 msgid " without sound"
 msgstr " sem som"
 
-#: src/saveplay.c:396
+#: src/saveplay.c:395
 #, c-format
 msgid "Opening audio for %s"
 msgstr "Abrindo áudio para %s"
 
-#: src/saveplay.c:557
+#: src/saveplay.c:554
 #, c-format
 msgid "Auto trimming %.2f seconds of audio at start..."
 msgstr ""
 
-#: src/saveplay.c:567
+#: src/saveplay.c:562
 #, fuzzy, c-format
 msgid "Auto trimming %.2f seconds of audio at end..."
 msgstr "%s do tempo %.2f segundos até %.2f segundos..."
 
-#: src/saveplay.c:584
+#: src/saveplay.c:577
 #, c-format
 msgid "Auto padding with %.2f seconds of silence at start..."
 msgstr ""
 
-#: src/saveplay.c:599
+#: src/saveplay.c:590
 #, c-format
 msgid "Auto padding with %.2f seconds of silence at end..."
 msgstr ""
 
-#: src/saveplay.c:671
+#: src/saveplay.c:661
 #, c-format
 msgid ""
 "\n"
@@ -4204,11 +4192,11 @@
 "Are you sure you wish to continue ?"
 msgstr ""
 
-#: src/saveplay.c:685
+#: src/saveplay.c:676
 msgid " - please be patient."
 msgstr " - por favor tenha paciência."
 
-#: src/saveplay.c:938
+#: src/saveplay.c:926
 msgid ""
 "\n"
 "\n"
@@ -4220,7 +4208,7 @@
 "LiVES não conseguiu extrair nem vídeo nem áudio deste arquivo.\n"
 "Por favor verifique a janela de terminal para mais detalhes.\n"
 
-#: src/saveplay.c:940
+#: src/saveplay.c:928
 msgid ""
 "\n"
 "\n"
@@ -4230,7 +4218,7 @@
 "\n"
 "Talvez seja necessário ter o mplayer para abrir este arquivo.\n"
 
-#: src/saveplay.c:948
+#: src/saveplay.c:934
 msgid ""
 "\n"
 "\n"
@@ -4242,29 +4230,29 @@
 "Por favor confira as configurações de 'Comando de abertura de vídeo' em\n"
 "'Ferramentas | Preferências | Decodificação'\n"
 
-#: src/saveplay.c:1014
+#: src/saveplay.c:995
 msgid "Adding image..."
 msgstr ""
 
-#: src/saveplay.c:1108
+#: src/saveplay.c:1089
 #, c-format
 msgid "Subtitles were saved as %s\n"
 msgstr "Legendas foram salvas em %s\n"
 
-#: src/saveplay.c:1192
+#: src/saveplay.c:1171
 #, c-format
 msgid "LiVES: Save Frame %d as..."
 msgstr ""
 
-#: src/saveplay.c:1195
+#: src/saveplay.c:1174
 msgid "LiVES: Save Frame as..."
 msgstr ""
 
-#: src/saveplay.c:1322
+#: src/saveplay.c:1303
 msgid "LiVES: Save Clip as..."
 msgstr ""
 
-#: src/saveplay.c:1390
+#: src/saveplay.c:1369
 msgid ""
 "Saving your video could lead to a loss of quality !\n"
 "You are strongly advised to 'Save As' to a new file.\n"
@@ -4276,36 +4264,36 @@
 "\n"
 "Tem certeza que quer continuar?"
 
-#: src/saveplay.c:1517 src/saveplay.c:1683 src/saveplay.c:1762
-#: src/saveplay.c:4014
+#: src/saveplay.c:1494 src/saveplay.c:1659 src/saveplay.c:1738
+#: src/saveplay.c:3940
 msgid "Pulling frames from clip"
 msgstr "Pegando frames do clipe"
 
-#: src/saveplay.c:1588 src/saveplay.c:1727
+#: src/saveplay.c:1565 src/saveplay.c:1703
 msgid "Linking selection"
 msgstr "Ligando seleção"
 
-#: src/saveplay.c:1779
+#: src/saveplay.c:1755
 msgid " (with no sound)\n"
 msgstr " (sem som)\n"
 
-#: src/saveplay.c:1786
+#: src/saveplay.c:1761
 #, c-format
 msgid "Saving frames %d to %d%s as \"%s\" : encoder = %s : format = %s..."
 msgstr ""
 "Salvando frames %d até %d%s como \"%s\" : codificador = %s : formato = %s..."
 
-#: src/saveplay.c:1790
+#: src/saveplay.c:1765
 #, c-format
 msgid "Saving frames 1 to %d%s as \"%s\" : encoder %s : format = %s..."
 msgstr ""
 "Salvando frames 1 até %d%s como \"%s\" : codificador %s : formato = %s..."
 
-#: src/saveplay.c:1909
+#: src/saveplay.c:1890
 msgid "Saving [can take a long time]"
 msgstr "Salvando [pode levar muito tempo]"
 
-#: src/saveplay.c:2057
+#: src/saveplay.c:2044
 msgid ""
 "\n"
 "\n"
@@ -4315,33 +4303,33 @@
 "\n"
 "Erro de codificador -  arquivo de saída não foi criado!\n"
 
-#: src/saveplay.c:2094
+#: src/saveplay.c:2081
 msgid "Clearing letterbox"
 msgstr ""
 
-#: src/saveplay.c:2183
+#: src/saveplay.c:2168
 #, c-format
 msgid "File size was %s\n"
 msgstr ""
 
-#: src/saveplay.c:2284
+#: src/saveplay.c:2265
 msgid "recording aborted by preview.\n"
 msgstr "gravação cancelada pela visualização.\n"
 
-#: src/saveplay.c:2288
+#: src/saveplay.c:2268
 msgid "recording aborted by clipboard playback.\n"
 msgstr "gravação cancelada pela visualização.\n"
 
-#: src/saveplay.c:2291
+#: src/saveplay.c:2270
 msgid "Recording performance..."
 msgstr "Gravando performance..."
 
-#: src/saveplay.c:3293
+#: src/saveplay.c:3251
 #, c-format
 msgid "Average FPS was %.4f\n"
 msgstr "FPS médio era %.4f\n"
 
-#: src/saveplay.c:3299
+#: src/saveplay.c:3256
 msgid ""
 "\n"
 "\n"
@@ -4355,16 +4343,21 @@
 "Vá em 'Ferramentas | Redimensionar Todos'\n"
 "e redimensione todos frames para o tamanho atual.\n"
 
-#: src/saveplay.c:3479
+#: src/saveplay.c:3429
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: src/saveplay.c:3588 src/saveplay.c:4585
+#: src/saveplay.c:3538 src/saveplay.c:4502
 #, c-format
 msgid "Untitled%d"
 msgstr "Untitled%d"
 
-#: src/saveplay.c:3633
+#: src/saveplay.c:3567
+#, c-format
+msgid "%d frames are enough !\n"
+msgstr "%d frames são suficientes!\n"
+
+#: src/saveplay.c:3579
 #, c-format
 msgid ""
 "\n"
@@ -4372,7 +4365,7 @@
 "Bad things may happen with this clip.\n"
 msgstr ""
 
-#: src/saveplay.c:3723
+#: src/saveplay.c:3667
 #, c-format
 msgid ""
 "\n"
@@ -4384,13 +4377,13 @@
 "FPS.\n"
 "O padrão pode ser ajustado em 'Ferramentas | Preferências | Misc'.\n"
 
-#: src/saveplay.c:3735
+#: src/saveplay.c:3677
 #, c-format
 msgid "Playback speed was adjusted to %.3f frames per second to fit audio.\n"
 msgstr ""
 "Velocidade de execução ajustada para %.3f fps para se encaixar no áudio.\n"
 
-#: src/saveplay.c:3754
+#: src/saveplay.c:3694
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d *bpp=Greyscale* fps=%.3f\n"
@@ -4399,7 +4392,7 @@
 "Frames=%d tipo=%s tamanho=%dx%d *bpp=Greyscale* fps=%.3f\n"
 "Áudio:"
 
-#: src/saveplay.c:3758 src/saveplay.c:4762
+#: src/saveplay.c:3698 src/saveplay.c:4671
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d bpp=%d fps=%.3f\n"
@@ -4408,54 +4401,54 @@
 "Frames=%d tipo=%s tamanho=%dx%d bpp=%d fps=%.3f\n"
 "Áudio:"
 
-#: src/saveplay.c:3762 src/saveplay.c:4766
+#: src/saveplay.c:3703 src/saveplay.c:4676
 #, c-format
 msgid "%s none\n"
 msgstr "%s nenhum\n"
 
-#: src/saveplay.c:3774
+#: src/saveplay.c:3714
 #, fuzzy, c-format
 msgid " - Author: %s\n"
 msgstr "Autor: %s"
 
-#: src/saveplay.c:3779
+#: src/saveplay.c:3717
 #, fuzzy, c-format
 msgid " - Title: %s\n"
 msgstr " - Comentário: %s\n"
 
-#: src/saveplay.c:3784
+#: src/saveplay.c:3720
 #, c-format
 msgid " - Comment: %s\n"
 msgstr " - Comentário: %s\n"
 
-#: src/saveplay.c:3897
+#: src/saveplay.c:3829
 #, c-format
 msgid "Saving frame %d as %s..."
 msgstr "Salvando frame %d de %s..."
 
-#: src/saveplay.c:3996
+#: src/saveplay.c:3924
 #, c-format
 msgid "Backing up %s to %s"
 msgstr "Fazendo backup de %s até %s"
 
-#: src/saveplay.c:4049
+#: src/saveplay.c:3975
 msgid "Backing up"
 msgstr "Fazendo backup"
 
-#: src/saveplay.c:4083
+#: src/saveplay.c:4009
 msgid "performance data was backed up..."
 msgstr "backup concluído dos dados da performance..."
 
-#: src/saveplay.c:4661
+#: src/saveplay.c:4574
 #, c-format
 msgid "Restoring %s..."
 msgstr "Restaurando %s..."
 
-#: src/saveplay.c:4692
+#: src/saveplay.c:4603
 msgid "Restoring"
 msgstr "Restaurando"
 
-#: src/saveplay.c:4714
+#: src/saveplay.c:4625
 #, c-format
 msgid ""
 "\n"
@@ -4469,22 +4462,22 @@
 "LiVES não pode restaurá-lo.\n"
 
 #. TRANSLATORS: rec(ord) %.2f M(ega)B(ytes)
-#: src/saveplay.c:5207
+#: src/saveplay.c:5118
 #, c-format
 msgid "rec %.2f MB"
 msgstr "grv %.2f MB"
 
-#: src/saveplay.c:5213
+#: src/saveplay.c:5123
 #, c-format
 msgid "!rec %.2f MB"
 msgstr "!grv %.2f MB"
 
 #. TRANSLATORS: rec(ord) ?? M(ega)B(ytes)
-#: src/saveplay.c:5216
+#: src/saveplay.c:5126
 msgid "rec ?? MB"
 msgstr ""
 
-#: src/saveplay.c:5241
+#: src/saveplay.c:5151
 #, c-format
 msgid ""
 "\n"
@@ -4492,7 +4485,7 @@
 "Record stop level can be set in Preferences.\n"
 msgstr ""
 
-#: src/saveplay.c:5535
+#: src/saveplay.c:5447
 msgid ""
 "\n"
 "Files from a previous run of LiVES were found.\n"
@@ -4502,47 +4495,69 @@
 "Arquivos de uma execução anterior do LiVES foram encontrados.\n"
 "Quer tentar recuperá-los?\n"
 
-#: src/saveplay.c:5557
+#: src/saveplay.c:5469
 msgid "Recovering files"
 msgstr "Recuperando arquivos"
 
-#: src/saveplay.c:5560
+#: src/saveplay.c:5472
 msgid "Recovering files..."
 msgstr "Recuperando arquivos..."
 
-#: src/dialogs.c:72
+#: src/dialogs.c:71
 msgid "Show affected _layouts"
 msgstr "Mostra _layouts afetados"
 
-#: src/dialogs.c:128
+#: src/dialogs.c:113
+msgid ""
+"Do _not show this warning any more\n"
+"(can be turned back on from Preferences/Warnings)"
+msgstr ""
+"Não mostrar mais este aviso\n"
+"(pode ser ligado novamente em Preferências/Avisos)"
+
+#: src/dialogs.c:127
 msgid "_Recover disk space"
 msgstr ""
 
-#: src/dialogs.c:143
+#: src/dialogs.c:142
 msgid " _Advanced Settings >>"
 msgstr ""
 
-#: src/dialogs.c:184
+#: src/dialogs.c:183 src/dialogs.c:221
 msgid "LiVES: - Warning !"
 msgstr "LiVES: - Aviso !"
 
 #: src/dialogs.c:194
+#, fuzzy
+msgid "LiVES: - Error !"
+msgstr "LiVES: - Aviso !"
+
+#: src/dialogs.c:204
+#, fuzzy
+msgid "LiVES: - Information"
+msgstr "LiVES: Informação para %s"
+
+#: src/dialogs.c:230
 msgid "LiVES: - Question"
 msgstr "LiVES: - Pergunta"
 
-#: src/dialogs.c:204
+#: src/dialogs.c:239
 msgid "LiVES: - File Error"
 msgstr ""
 
-#: src/dialogs.c:208
+#: src/dialogs.c:241
 msgid "_Abort"
 msgstr ""
 
-#: src/dialogs.c:213
+#: src/dialogs.c:246
 msgid "_Retry"
 msgstr ""
 
-#: src/dialogs.c:597
+#: src/dialogs.c:306
+msgid "Show _Details"
+msgstr "Exibir _Detalhes"
+
+#: src/dialogs.c:657
 #, c-format
 msgid ""
 "FREE SPACE IN THE PARTITION CONTAINING\n"
@@ -4553,7 +4568,7 @@
 "(Disk warning levels can be configured in Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:615
+#: src/dialogs.c:676
 #, c-format
 msgid ""
 "Free space in the partition containing\n"
@@ -4565,11 +4580,11 @@
 "Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:627
+#: src/dialogs.c:688
 msgid "Audio players cannot be switched during playback."
 msgstr "Tocadores de áudio não podem ser trocados durante a execução."
 
-#: src/dialogs.c:632
+#: src/dialogs.c:694
 msgid ""
 "\n"
 "\n"
@@ -4582,18 +4597,18 @@
 "insuficiente.\n"
 "Por favor tente fechar outros aplicativos primeiro.\n"
 
-#: src/dialogs.c:752
+#: src/dialogs.c:820
 msgid "Processing has been paused."
 msgstr ""
 
-#: src/dialogs.c:937
+#: src/dialogs.c:1002
 #, c-format
 msgid ""
 "\n"
 "%s%d%% done. Time remaining: %u sec%s\n"
 msgstr ""
 
-#: src/dialogs.c:1335
+#: src/dialogs.c:1391
 #, c-format
 msgid ""
 "\n"
@@ -4602,7 +4617,7 @@
 "\n"
 "%d/%d frames abertos. Tempo restante %u seg.\n"
 
-#: src/dialogs.c:1337
+#: src/dialogs.c:1393
 #, c-format
 msgid ""
 "\n"
@@ -4611,7 +4626,7 @@
 "\n"
 "%d/%d frames abridos.\n"
 
-#: src/dialogs.c:1341
+#: src/dialogs.c:1396
 #, c-format
 msgid ""
 "\n"
@@ -4620,7 +4635,7 @@
 "\n"
 "%d frames abertos.\n"
 
-#: src/dialogs.c:1940
+#: src/dialogs.c:1993
 #, c-format
 msgid ""
 "\n"
@@ -4629,7 +4644,7 @@
 "\n"
 "Tempo restante: %d seg"
 
-#: src/dialogs.c:1988
+#: src/dialogs.c:2040
 #, c-format
 msgid ""
 "\n"
@@ -4640,7 +4655,7 @@
 "Desculpe, LiVES só pode abrir %d arquivos por vez.\n"
 "Por favor feche um arquivo e tente novamente."
 
-#: src/dialogs.c:1994
+#: src/dialogs.c:2047
 #, c-format
 msgid ""
 "LiVES was unable to write to its temporary directory.\n"
@@ -4657,7 +4672,7 @@
 "\n"
 "Por favor tenha certeza de ter permissão de escrita neste diretório."
 
-#: src/dialogs.c:2005
+#: src/dialogs.c:2059
 #, fuzzy
 msgid ""
 "\n"
@@ -4668,13 +4683,13 @@
 "LiVES atualmente precisa do 'mplayer' ou 'sox' para funcionar. Por favor "
 "instale um deles e tente novamente.\n"
 
-#: src/dialogs.c:2010
+#: src/dialogs.c:2064
 msgid ""
 "Audio was not loaded; please install mplayer or mplayer2 if you expected "
 "audio for this clip.\n"
 msgstr ""
 
-#: src/dialogs.c:2014
+#: src/dialogs.c:2069
 msgid ""
 "Audio resampling is required for this format.\n"
 "Please install 'sox'\n"
@@ -4685,7 +4700,7 @@
 "ou troque por outro formato de codificador em 'Ferramentas | Preferências | "
 "Codificação'\n"
 
-#: src/dialogs.c:2019
+#: src/dialogs.c:2075
 msgid ""
 "\n"
 "\n"
@@ -4699,7 +4714,7 @@
 "Por favor mude o codec de áudio em 'Ferramentas | Preferências | "
 "Codificação'\n"
 
-#: src/dialogs.c:2024
+#: src/dialogs.c:2080
 msgid ""
 "This layout includes generated frames.\n"
 "It cannot be saved, you must render it to a clip first.\n"
@@ -4707,13 +4722,13 @@
 "Este layout inclui frames gerados.\n"
 "Ele nãopode ser salvo, renderize como clipe primeiro.\n"
 
-#: src/dialogs.c:2029
+#: src/dialogs.c:2085
 msgid ""
 "This layout includes generated or recorded audio.\n"
 "It cannot be saved, you must render it to a clip first.\n"
 msgstr ""
 
-#: src/dialogs.c:2039 src/dialogs.c:2137
+#: src/dialogs.c:2095 src/dialogs.c:2189
 #, c-format
 msgid ""
 "\n"
@@ -4724,7 +4739,7 @@
 "\n"
 "Devido a restrições no formato %s\n"
 
-#: src/dialogs.c:2059
+#: src/dialogs.c:2115
 msgid ""
 "LiVES recommends the following settings:\n"
 "\n"
@@ -4732,43 +4747,43 @@
 "LiVES recomenda as configurações a seguir:\n"
 "\n"
 
-#: src/dialogs.c:2065 src/dialogs.c:2174 src/resample.c:850
+#: src/dialogs.c:2121 src/dialogs.c:2225 src/resample.c:839
 msgid ", signed"
 msgstr ", assinado"
 
-#: src/dialogs.c:2066 src/dialogs.c:2175 src/resample.c:853
+#: src/dialogs.c:2122 src/dialogs.c:2226 src/resample.c:841
 msgid ", unsigned"
 msgstr ", não-assinalado"
 
-#: src/dialogs.c:2070 src/dialogs.c:2179 src/resample.c:858
+#: src/dialogs.c:2126 src/dialogs.c:2230 src/resample.c:846
 msgid ", little-endian"
 msgstr ", little-endian"
 
-#: src/dialogs.c:2071 src/dialogs.c:2180 src/resample.c:861
+#: src/dialogs.c:2127 src/dialogs.c:2231 src/resample.c:848
 msgid ", big-endian"
 msgstr ", big-endian"
 
-#: src/dialogs.c:2077
+#: src/dialogs.c:2132
 #, c-format
 msgid "Use an audio rate of %d Hz%s%s\n"
 msgstr ""
 
-#: src/dialogs.c:2085
+#: src/dialogs.c:2140
 #, c-format
 msgid "Set video rate to %.3f frames per second\n"
 msgstr "Definir vídeo para %.3f FPS\n"
 
-#: src/dialogs.c:2089
+#: src/dialogs.c:2143
 #, c-format
 msgid "Set video rate to %d:%d frames per second\n"
 msgstr "Definir vídeo para %d:%d FPS\n"
 
-#: src/dialogs.c:2094 src/dialogs.c:2209
+#: src/dialogs.c:2148 src/dialogs.c:2258
 #, c-format
 msgid "Set video size to %d x %d pixels\n"
 msgstr "Redimensionar vídeo para %d x %d pixels\n"
 
-#: src/dialogs.c:2102 src/dialogs.c:2208
+#: src/dialogs.c:2156 src/dialogs.c:2257
 msgid ""
 "\n"
 "You may wish to:\n"
@@ -4776,36 +4791,36 @@
 "\n"
 "Você pode querer:\n"
 
-#: src/dialogs.c:2105 src/dialogs.c:2200
+#: src/dialogs.c:2159 src/dialogs.c:2249
 #, c-format
 msgid "resize video to %d x %d pixels\n"
 msgstr "redimensionar vídeo para %d x %d pixels\n"
 
-#: src/dialogs.c:2110
+#: src/dialogs.c:2163
 msgid "disable audio, since the target encoder cannot encode audio\n"
 msgstr ""
 "desabilite o áudio, uma vez que o codificador não pode codificar áudio\n"
 
-#: src/dialogs.c:2170
+#: src/dialogs.c:2221
 msgid "LiVES must:\n"
 msgstr "LiVES deve:\n"
 
-#: src/dialogs.c:2185
+#: src/dialogs.c:2235
 #, c-format
 msgid "resample audio to %d Hz%s%s\n"
 msgstr ""
 
-#: src/dialogs.c:2192
+#: src/dialogs.c:2242
 #, c-format
 msgid "resample video to %.3f frames per second\n"
 msgstr "resamplear vídeo para %.3f FPS\n"
 
-#: src/dialogs.c:2196
+#: src/dialogs.c:2245
 #, c-format
 msgid "resample video to %d:%d frames per second\n"
 msgstr "resamplear vídeo para %d:%d FPS\n"
 
-#: src/dialogs.c:2215
+#: src/dialogs.c:2263
 msgid ""
 "\n"
 "You will be able to undo these changes afterwards.\n"
@@ -4819,7 +4834,7 @@
 "Aperte 'OK' para continuar e 'Cancelar' para abortar.\n"
 "\n"
 
-#: src/dialogs.c:2218
+#: src/dialogs.c:2265
 msgid ""
 "\n"
 "Changes applied to the selection will not be permanent.\n"
@@ -4829,7 +4844,7 @@
 "Mudanças aplicadas a seleção não serão permanentes.\n"
 "\n"
 
-#: src/dialogs.c:2237
+#: src/dialogs.c:2285
 msgid ""
 "\n"
 "\n"
@@ -4842,7 +4857,7 @@
 "LiVES não pôde gravar a performance. Não há memória suficiente disponível.\n"
 "Tente gravar apenas uma parte do arquivo."
 
-#: src/dialogs.c:2244
+#: src/dialogs.c:2293
 msgid ""
 "The playback speed (fps), or the audio rate\n"
 " of the clipboard does not match\n"
@@ -4861,7 +4876,7 @@
 "\n"
 "Aperte 'Cancelar' para abortar a inserção, ou 'OK' para continuar."
 
-#: src/dialogs.c:2253
+#: src/dialogs.c:2304
 #, fuzzy, c-format
 msgid ""
 "When opening a yuvmpeg stream, you should first create a fifo file in:\n"
@@ -4879,11 +4894,11 @@
 "Você deve apenas clicar em OK se você sabe o que está fazendo, em outro caso "
 "clique Cancelar."
 
-#: src/dialogs.c:2305
+#: src/dialogs.c:2356
 msgid "Show Keys"
 msgstr "Mostrar atalhos"
 
-#: src/dialogs.c:2306
+#: src/dialogs.c:2358
 msgid ""
 "You can use the following keys during playback to control LiVES:-\n"
 "\n"
@@ -4965,11 +4980,11 @@
 "g                             faz o loop tocar ao contrário quando chegar no "
 "final\n"
 
-#: src/dialogs.c:2313
+#: src/dialogs.c:2365
 msgid "Multitrack Keys"
 msgstr "Atalhos do Multipista"
 
-#: src/dialogs.c:2314
+#: src/dialogs.c:2367
 msgid ""
 "You can use the following keys to control the multitrack window:-\n"
 "\n"
@@ -5012,18 +5027,18 @@
 "\n"
 "Para outras chaves, ver os menus.\n"
 
-#: src/dialogs.c:2322
+#: src/dialogs.c:2375
 msgid "Message History"
 msgstr "Histórico de Mensagens"
 
-#: src/dialogs.c:2335
+#: src/dialogs.c:2388
 #, c-format
 msgid ""
 "After upgrading/installing, you may need to adjust the <prefix_dir> setting "
 "in your %s file"
 msgstr ""
 
-#: src/dialogs.c:2344
+#: src/dialogs.c:2399
 #, c-format
 msgid ""
 "\n"
@@ -5034,7 +5049,7 @@
 "or change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/dialogs.c:2352
+#: src/dialogs.c:2408
 msgid ""
 "Sorry, unknown audio type.\n"
 "\n"
@@ -5044,18 +5059,18 @@
 "\n"
 " (Nomes de arquivo devem terminar em .mp3, .ogg, .wav, .mod, .xm ou .it)"
 
-#: src/dialogs.c:2353
+#: src/dialogs.c:2409
 msgid "failed (unknown type)\n"
 msgstr "falhou (tipo desconhecido)\n"
 
-#: src/dialogs.c:2358
+#: src/dialogs.c:2415
 msgid ""
 "\n"
 "Do you wish to remove the layout files associated with this set ?\n"
 "(They will not be usable without the set).\n"
 msgstr ""
 
-#: src/dialogs.c:2363
+#: src/dialogs.c:2421
 #, c-format
 msgid ""
 "\n"
@@ -5069,7 +5084,7 @@
 "existente.\n"
 "Clique em Cancelar para escolher um novo nome.\n"
 
-#: src/dialogs.c:2370
+#: src/dialogs.c:2429
 msgid ""
 "\n"
 "Frames from this clip are used in some multitrack layouts.\n"
@@ -5081,7 +5096,7 @@
 "Tem certeza que quer continuar?\n"
 "."
 
-#: src/dialogs.c:2374
+#: src/dialogs.c:2433
 msgid ""
 "\n"
 "Audio from this clip is used in some multitrack layouts.\n"
@@ -5093,7 +5108,7 @@
 "Tem certeza que quer continuar?\n"
 "."
 
-#: src/dialogs.c:2378
+#: src/dialogs.c:2438
 #, c-format
 msgid ""
 "\n"
@@ -5104,7 +5119,7 @@
 "Otherwise click Cancel to skip loading this file.\n"
 msgstr ""
 
-#: src/dialogs.c:2385
+#: src/dialogs.c:2446
 #, c-format
 msgid ""
 "\n"
@@ -5119,7 +5134,7 @@
 "%s\n"
 "O clipe não pode ser carregado.\n"
 
-#: src/dialogs.c:2392
+#: src/dialogs.c:2455
 msgid ""
 "\n"
 "Dear user, the jack developers decided to remove the -Z option from jackd.\n"
@@ -5127,7 +5142,7 @@
 "Alternately, select a different audio player in Preferences.\n"
 msgstr ""
 
-#: src/dialogs.c:2396
+#: src/dialogs.c:2460
 msgid ""
 "\n"
 "Unable to start up jack. Please ensure that alsa is set up correctly on your "
@@ -5136,13 +5151,13 @@
 "Automatic jack startup will be disabled now.\n"
 msgstr ""
 
-#: src/dialogs.c:2402
+#: src/dialogs.c:2466
 msgid ""
 "\n"
 "Unable to connect to jack server. Please start jack before starting LiVES\n"
 msgstr ""
 
-#: src/dialogs.c:2411
+#: src/dialogs.c:2475
 #, c-format
 msgid ""
 "\n"
@@ -5153,13 +5168,13 @@
 "%s\n"
 msgstr ""
 
-#: src/dialogs.c:2418
+#: src/dialogs.c:2482
 msgid ""
 "\n"
 "Alternately, you can restart LiVES and select another audio player.\n"
 msgstr ""
 
-#: src/dialogs.c:2423
+#: src/dialogs.c:2488
 #, c-format
 msgid ""
 "\n"
@@ -5174,7 +5189,7 @@
 "Você pode aumentar este valor em  Preferências/Multipista.\n"
 "É recomendado aumentá-lo em ao menos %d MB"
 
-#: src/dialogs.c:2429
+#: src/dialogs.c:2496
 #, c-format
 msgid ""
 "\n"
@@ -5183,7 +5198,7 @@
 "Do you wish to delete them ?\n"
 msgstr ""
 
-#: src/dialogs.c:2436
+#: src/dialogs.c:2504
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for multitrack undo.\n"
@@ -5195,7 +5210,7 @@
 "Feche alguns aplicativos ou reduza o tamanho da memória de desfazer\n"
 "Em 'Preferências > Multipista 'Memória de Desfazer'\n"
 
-#: src/dialogs.c:2440
+#: src/dialogs.c:2508
 msgid ""
 "\n"
 "Out of memory for undo.\n"
@@ -5207,7 +5222,7 @@
 "Você precisa aumentar o buffer de desfazer\n"
 "em 'Preferências > Multipista > Tamanho do buffer de desfazer'\n"
 
-#: src/dialogs.c:2444
+#: src/dialogs.c:2512
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for the multitrack undo buffer.\n"
@@ -5215,19 +5230,19 @@
 "\n"
 "LiVES não conseguiu reservar memória sufiiciente para o buffer de desfazer.\n"
 
-#: src/dialogs.c:2446
+#: src/dialogs.c:2514
 msgid "or enter a smaller value.\n"
 msgstr "ou insira um valor menos.\n"
 
-#: src/dialogs.c:2448
+#: src/dialogs.c:2516
 msgid "Try again from the clip editor, try closing some other applications\n"
 msgstr "Tente novamente do editor de clipes, tente fechar outros aplicativos\n"
 
-#: src/dialogs.c:2449
+#: src/dialogs.c:2517
 msgid "Try closing some other applications\n"
 msgstr "Tente fechar outros aplicativos\n"
 
-#: src/dialogs.c:2460
+#: src/dialogs.c:2529
 msgid ""
 "Multitrack is set to 0 audio channels, but this layout has audio.\n"
 "You should adjust the audio settings from the Tools menu.\n"
@@ -5236,21 +5251,21 @@
 "áudio.\n"
 "Ajuste as configurações de áudio no menu Ferramentas.\n"
 
-#: src/dialogs.c:2464
+#: src/dialogs.c:2534
 msgid ""
 "The current layout has audio, so audio channels may not be set to zero.\n"
 msgstr ""
 "O layout atual tem áudio, de modo que canais de áudio não podem ser "
 "definidos como zero.\n"
 
-#: src/dialogs.c:2468
+#: src/dialogs.c:2539
 msgid ""
 "Multitrack audio preview is only available with the\n"
 "\"jack\" or \"pulse audio\" audio player.\n"
 "You can set this in Tools|Preferences|Playback."
 msgstr ""
 
-#: src/dialogs.c:2472
+#: src/dialogs.c:2545
 msgid ""
 "Errors were detected in the layout (which may be due to transferring from "
 "another system, or from an older version of LiVES).\n"
@@ -5260,13 +5275,13 @@
 "outro sistema, ou de uma versão mais antiga do LiVES).\n"
 "Tentar reparar a cópia em disco do layout?\n"
 
-#: src/dialogs.c:2476
+#: src/dialogs.c:2549
 msgid ""
 "LiVES was unable to load the layout.\n"
 "Sorry.\n"
 msgstr ""
 
-#: src/dialogs.c:2482
+#: src/dialogs.c:2555
 msgid ""
 "\n"
 "\n"
@@ -5276,7 +5291,7 @@
 "\n"
 "A taxa de áudio deve ser maior que 0.\n"
 
-#: src/dialogs.c:2486
+#: src/dialogs.c:2559
 msgid ""
 "\n"
 "Event list will be very large\n"
@@ -5288,7 +5303,7 @@
 "e pode demorar muito tempo para ser apresentada.\n"
 "Tem certeza que deseja visualizar?\n"
 
-#: src/dialogs.c:2491
+#: src/dialogs.c:2564
 msgid ""
 "\n"
 "\n"
@@ -5298,7 +5313,7 @@
 "\n"
 "Você deve instalar o 'dvgrab' para usar esta função.\n"
 
-#: src/dialogs.c:2496
+#: src/dialogs.c:2570
 msgid ""
 "\n"
 "\n"
@@ -5313,25 +5328,25 @@
 "Você pode precisar selecionar um desses em Ferramentas/Preferências/"
 "Reprodução.\n"
 
-#: src/dialogs.c:2500
+#: src/dialogs.c:2574
 msgid "Video playback plugin failed to initialise palette !\n"
 msgstr "O plugin de execução de vídeo falhou em iniciar a palheta!\n"
 
-#: src/dialogs.c:2504
+#: src/dialogs.c:2579
 msgid "Decoder plugin failed to initialise palette !\n"
 msgstr "O plugin de decodificação de áudio falhou em inicializar a palheta!\n"
 
-#: src/dialogs.c:2509
+#: src/dialogs.c:2584
 msgid "Unable to set framerate of video plugin\n"
 msgstr "Impossível definir framerate do plugin de vídeo\n"
 
-#: src/dialogs.c:2514
+#: src/dialogs.c:2590
 msgid ""
 "After a crash, it is advisable to clean up the disk with\n"
 "File|Clean up disk space\n"
 msgstr ""
 
-#: src/dialogs.c:2526
+#: src/dialogs.c:2604
 #, c-format
 msgid ""
 "Stream frame size is too large for your network buffers.\n"
@@ -5344,33 +5359,33 @@
 "\n"
 "echo %d > /proc/sys/net/core/rmem_max\n"
 
-#: src/dialogs.c:2714
+#: src/dialogs.c:2800
 msgid "cancelled.\n"
 msgstr "cancelado.\n"
 
-#: src/dialogs.c:2721
+#: src/dialogs.c:2805
 msgid "failed.\n"
 msgstr "falhou.\n"
 
-#: src/dialogs.c:2728
+#: src/dialogs.c:2810
 msgid "done.\n"
 msgstr "feito.\n"
 
-#: src/dialogs.c:2732
+#: src/dialogs.c:2814
 msgid "error in file. Failed.\n"
 msgstr "erro no arquivo. Falhou.\n"
 
-#: src/dialogs.c:2766 src/dialogs.c:2815 src/dialogs.c:2839
+#: src/dialogs.c:2848 src/dialogs.c:2897 src/dialogs.c:2921
 #, c-format
 msgid "Additional info: %s\n"
 msgstr ""
 
-#: src/dialogs.c:2769
+#: src/dialogs.c:2851
 #, c-format
 msgid "The error value was %d%s\n"
 msgstr ""
 
-#: src/dialogs.c:2772
+#: src/dialogs.c:2854
 #, c-format
 msgid ""
 "\n"
@@ -5380,7 +5395,7 @@
 "%s%s%s"
 msgstr ""
 
-#: src/dialogs.c:2818
+#: src/dialogs.c:2900
 #, c-format
 msgid ""
 "\n"
@@ -5390,7 +5405,7 @@
 "%s"
 msgstr ""
 
-#: src/dialogs.c:2842
+#: src/dialogs.c:2924
 #, c-format
 msgid ""
 "\n"
@@ -5400,7 +5415,7 @@
 "%s"
 msgstr ""
 
-#: src/dialogs.c:2886
+#: src/dialogs.c:2968
 #, c-format
 msgid ""
 "\n"
@@ -5409,7 +5424,7 @@
 "Please check for possible error causes.\n"
 msgstr ""
 
-#: src/dialogs.c:2890
+#: src/dialogs.c:2971
 #, c-format
 msgid ""
 "\n"
@@ -5419,7 +5434,7 @@
 "%s.\n"
 msgstr ""
 
-#: src/dialogs.c:2921
+#: src/dialogs.c:3002
 #, c-format
 msgid ""
 "\n"
@@ -5428,7 +5443,7 @@
 "Please check for possible error causes.\n"
 msgstr ""
 
-#: src/dialogs.c:2925
+#: src/dialogs.c:3005
 #, c-format
 msgid ""
 "\n"
@@ -5438,12 +5453,12 @@
 "%s.\n"
 msgstr ""
 
-#: src/dialogs.c:2993
+#: src/dialogs.c:3073
 #, c-format
 msgid "Value for \"%s\" could not be read."
 msgstr ""
 
-#: src/dialogs.c:3011
+#: src/dialogs.c:3091
 #, c-format
 msgid ""
 "\n"
@@ -5452,7 +5467,7 @@
 "Please check your system for errors.\n"
 msgstr ""
 
-#: src/dialogs.c:3020
+#: src/dialogs.c:3100
 #, c-format
 msgid ""
 "\n"
@@ -5465,7 +5480,7 @@
 "%s\n"
 "Por favor veja as permissões e tente novamente."
 
-#: src/dialogs.c:3027
+#: src/dialogs.c:3109
 #, c-format
 msgid ""
 "\n"
@@ -5474,7 +5489,7 @@
 "Please check the directory permissions and try again."
 msgstr ""
 
-#: src/dialogs.c:3034
+#: src/dialogs.c:3116
 #, c-format
 msgid ""
 "\n"
@@ -5482,14 +5497,14 @@
 "%s\n"
 msgstr ""
 
-#: src/dialogs.c:3041
+#: src/dialogs.c:3123
 msgid ""
 "\n"
 "Abort and exit immediately from LiVES\n"
 "Are you sure ?\n"
 msgstr ""
 
-#: src/dialogs.c:3047
+#: src/dialogs.c:3129
 #, c-format
 msgid ""
 "\n"
@@ -5497,13 +5512,13 @@
 "Please select another encoder from the list.\n"
 msgstr ""
 
-#: src/dialogs.c:3056
+#: src/dialogs.c:3139
 msgid ""
 "\n"
 "This card is already in use and cannot be opened multiple times.\n"
 msgstr ""
 
-#: src/dialogs.c:3061
+#: src/dialogs.c:3145
 #, c-format
 msgid ""
 "\n"
@@ -5513,27 +5528,27 @@
 "- Check if the device actually exists.\n"
 msgstr ""
 
-#: src/dialogs.c:3068
+#: src/dialogs.c:3153
 msgid ""
 "\n"
 "This file already has subtitles loaded.\n"
 "Do you wish to overwrite the existing subtitles ?\n"
 msgstr ""
 
-#: src/dialogs.c:3072
+#: src/dialogs.c:3157
 msgid ""
 "\n"
 "LiVES currently only supports subtitles of type .srt and .sub.\n"
 msgstr ""
 
-#: src/dialogs.c:3076
+#: src/dialogs.c:3161
 msgid ""
 "\n"
 "Erase all subtitles from this clip.\n"
 "Are you sure ?\n"
 msgstr ""
 
-#: src/dialogs.c:3082
+#: src/dialogs.c:3168
 #, c-format
 msgid ""
 "\n"
@@ -5542,14 +5557,14 @@
 "or OK to continue and save as type \"%s\"\n"
 msgstr ""
 
-#: src/dialogs.c:3089
+#: src/dialogs.c:3176
 msgid ""
 "\n"
 "Do you wish to move the current clip sets to the new directory ?\n"
 "(If unsure, click Yes)\n"
 msgstr ""
 
-#: src/dialogs.c:3093
+#: src/dialogs.c:3181
 #, c-format
 msgid ""
 "\n"
@@ -5560,19 +5575,19 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:3099
+#: src/dialogs.c:3188
 msgid ""
 "\n"
 "No video input devices could be found.\n"
 msgstr ""
 
-#: src/dialogs.c:3103
+#: src/dialogs.c:3192
 msgid ""
 "\n"
 "All video input devices are already in use.\n"
 msgstr ""
 
-#: src/dialogs.c:3107
+#: src/dialogs.c:3196
 msgid ""
 "\n"
 "\n"
@@ -5580,15 +5595,14 @@
 "DO NOT SHUT DOWN OR CLOSE LIVES !\n"
 msgstr ""
 
-#: src/dialogs.c:3127
+#: src/dialogs.c:3203
 #, c-format
 msgid ""
 "No clips were recovered for set (%s).\n"
 "Please check the spelling of the set name and try again.\n"
 msgstr ""
 
-#. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:3136
+#: src/dialogs.c:3214
 #, c-format
 msgid ""
 "\n"
@@ -5600,7 +5614,7 @@
 msgstr ""
 
 #. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:3144
+#: src/dialogs.c:3222
 #, c-format
 msgid ""
 "\n"
@@ -5609,34 +5623,34 @@
 "\n"
 msgstr ""
 
-#: src/dialogs.c:3150
+#: src/dialogs.c:3228
 msgid ""
 "\n"
 "You must have autolives.pl installed and in your path to use this toy.\n"
 "Consult your package distributor.\n"
 msgstr ""
 
-#: src/dialogs.c:3154
+#: src/dialogs.c:3232
 msgid ""
 "\n"
 "You must have a minimum of one clip loaded to use this toy.\n"
 msgstr ""
 
-#: src/dialogs.c:3158
+#: src/dialogs.c:3236
 msgid ""
 "\n"
 "LiVES lost its connection to jack and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:3162
+#: src/dialogs.c:3240
 msgid ""
 "\n"
 "LiVES lost its connection to pulseaudio and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:3175
+#: src/dialogs.c:3254
 #, c-format
 msgid ""
 "\n"
@@ -5645,240 +5659,240 @@
 "Do you wish to allow this (for this session only) ?\n"
 msgstr ""
 
-#: src/effects.c:60
+#: src/effects.c:61
 msgid "generator"
 msgstr "gerador"
 
-#: src/effects.c:61
+#: src/effects.c:62
 msgid "Generators"
 msgstr "Geradores"
 
-#: src/effects.c:63
+#: src/effects.c:64
 msgid "audio generator"
 msgstr ""
 
-#: src/effects.c:64
+#: src/effects.c:65
 msgid "Audio Generators"
 msgstr ""
 
-#: src/effects.c:66
+#: src/effects.c:67
 msgid "audio/video generator"
 msgstr ""
 
-#: src/effects.c:67
+#: src/effects.c:68
 msgid "Audio/Video Generators"
 msgstr ""
 
-#: src/effects.c:69
+#: src/effects.c:70
 msgid "data generator"
 msgstr ""
 
-#: src/effects.c:70
+#: src/effects.c:71
 msgid "Data Generators"
 msgstr ""
 
-#: src/effects.c:72
+#: src/effects.c:73
 msgid "data visualiser"
 msgstr ""
 
-#: src/effects.c:73
+#: src/effects.c:74
 msgid "Data Visualisers"
 msgstr ""
 
-#: src/effects.c:75
+#: src/effects.c:76
 msgid "data processor"
 msgstr ""
 
-#: src/effects.c:76
+#: src/effects.c:77
 msgid "Data Processors"
 msgstr ""
 
-#: src/effects.c:78
+#: src/effects.c:79
 msgid "data source"
 msgstr ""
 
-#: src/effects.c:79
+#: src/effects.c:80
 msgid "Data Sources"
 msgstr ""
 
-#: src/effects.c:81
+#: src/effects.c:82
 msgid "transition"
 msgstr "transição"
 
-#: src/effects.c:82
+#: src/effects.c:83
 msgid "Transitions"
 msgstr "Transições"
 
-#: src/effects.c:84
+#: src/effects.c:85
 msgid "effect"
 msgstr "efeito"
 
-#: src/effects.c:87 src/rfx-builder.c:187
+#: src/effects.c:88 src/rfx-builder.c:187
 msgid "utility"
 msgstr "utilitário"
 
-#: src/effects.c:88
+#: src/effects.c:89
 msgid "Utilities"
 msgstr "Utilitários"
 
-#: src/effects.c:90
+#: src/effects.c:91
 msgid "compositor"
 msgstr "compositor"
 
-#: src/effects.c:91
+#: src/effects.c:92
 msgid "Compositors"
 msgstr "Compositores"
 
-#: src/effects.c:93
+#: src/effects.c:94
 msgid "tap"
 msgstr "tap"
 
-#: src/effects.c:94
+#: src/effects.c:95
 msgid "Taps"
 msgstr "Torneiras"
 
-#: src/effects.c:96
+#: src/effects.c:97
 msgid "splitter"
 msgstr "divisor"
 
-#: src/effects.c:97
+#: src/effects.c:98
 msgid "Splitters"
 msgstr "Divisores"
 
-#: src/effects.c:99
+#: src/effects.c:100
 msgid "converter"
 msgstr "conversor"
 
-#: src/effects.c:100
+#: src/effects.c:101
 msgid "Converters"
 msgstr "Conversores"
 
-#: src/effects.c:102
+#: src/effects.c:103
 msgid "analyser"
 msgstr ""
 
-#: src/effects.c:103
+#: src/effects.c:104
 msgid "Analysers"
 msgstr ""
 
-#: src/effects.c:108
+#: src/effects.c:109
 msgid "audio/video"
 msgstr "áudio/vídeo"
 
-#: src/effects.c:109
+#: src/effects.c:110
 msgid "Audio/Video Transitions"
 msgstr "Transições de Áudio e Vídeo"
 
-#: src/effects.c:111
+#: src/effects.c:112
 msgid "video only"
 msgstr "só vídeo"
 
-#: src/effects.c:112
+#: src/effects.c:113
 msgid "Video only Transitions"
 msgstr "Ver apenas Transições"
 
-#: src/effects.c:114 src/multitrack.c:10740
+#: src/effects.c:115 src/multitrack.c:10962
 msgid "audio only"
 msgstr "áudio apenas"
 
-#: src/effects.c:115
+#: src/effects.c:116
 msgid "Audio only Transitions"
 msgstr "Transições apenas de Áudio"
 
-#: src/effects.c:117 src/effects.c:120 src/multitrack.c:18757
+#: src/effects.c:118 src/effects.c:121 src/multitrack.c:19097
 msgid "audio"
 msgstr "áudio"
 
-#: src/effects.c:118
+#: src/effects.c:119
 msgid "Audio Mixers"
 msgstr "Mixers de Áudio"
 
-#: src/effects.c:121
+#: src/effects.c:122
 msgid "Audio Effects"
 msgstr "Efeitos de Áudio"
 
-#: src/effects.c:123
+#: src/effects.c:124
 msgid "video"
 msgstr ""
 
-#: src/effects.c:124
+#: src/effects.c:125
 msgid "Video Effects"
 msgstr ""
 
-#: src/effects.c:126
+#: src/effects.c:127
 msgid "audio volume controller"
 msgstr "controle do volume de áudio"
 
-#: src/effects.c:127
+#: src/effects.c:128
 msgid "Audio Volume Controllers"
 msgstr "Controles do Volume de Áudio"
 
-#: src/effects.c:129
+#: src/effects.c:130
 msgid "video analyser"
 msgstr ""
 
-#: src/effects.c:130
+#: src/effects.c:131
 msgid "Video analysers"
 msgstr ""
 
-#: src/effects.c:132
+#: src/effects.c:133
 msgid "audio analyser"
 msgstr ""
 
-#: src/effects.c:133
+#: src/effects.c:134
 msgid "Audio Analysers"
 msgstr ""
 
-#: src/effects.c:137 src/plugins.c:2559 src/plugins.c:2573
+#: src/effects.c:138 src/plugins.c:2507 src/plugins.c:2521
 msgid "unknown"
 msgstr "desconhecido"
 
-#: src/effects.c:238
+#: src/effects.c:235
 #, c-format
 msgid "%s all frames..."
 msgstr "%s todos frames..."
 
-#: src/effects.c:243
+#: src/effects.c:239
 #, c-format
 msgid "%s clipboard into frames %d to %d..."
 msgstr "%s área de transferência em frames %d até %d..."
 
-#: src/effects.c:250
+#: src/effects.c:245
 #, c-format
 msgid "%s to clipboard..."
 msgstr "%s na área de transferência..."
 
-#: src/effects.c:254
+#: src/effects.c:248
 #, c-format
 msgid "%s to new clip..."
 msgstr "%s em novo clipe..."
 
-#: src/effects.c:259
+#: src/effects.c:252
 #, c-format
 msgid "%s frames %d to %d..."
 msgstr "%s frames %d até %d..."
 
-#: src/effects.c:290
+#: src/effects.c:283
 #, c-format
 msgid "%s clipboard with selection"
 msgstr "%s área de transferência com seleção"
 
-#: src/effects.c:295
+#: src/effects.c:287
 #, c-format
 msgid "%s to clipboard"
 msgstr "%s na área de transferência"
 
-#: src/effects.c:299
+#: src/effects.c:290
 #, c-format
 msgid "%s to new clip"
 msgstr "%s em um novo clipe"
 
-#: src/effects.c:304
+#: src/effects.c:294
 #, c-format
 msgid "%s frames %d to %d"
 msgstr "%s frames %d até %d"
 
-#: src/effects.c:456 src/effects.c:523
+#: src/effects.c:443 src/effects.c:507
 msgid ""
 "\n"
 "No frames were generated.\n"
@@ -5886,46 +5900,46 @@
 "\n"
 "Nenhum frame foi gerado.\n"
 
-#: src/effects-weed.c:431
+#: src/effects-weed.c:452
 msgid "integer"
 msgstr ""
 
-#: src/effects-weed.c:432
+#: src/effects-weed.c:454
 msgid "int64"
 msgstr ""
 
-#: src/effects-weed.c:433
+#: src/effects-weed.c:456
 msgid "boolean"
 msgstr ""
 
-#: src/effects-weed.c:434
+#: src/effects-weed.c:458
 msgid "double"
 msgstr ""
 
-#: src/effects-weed.c:435
+#: src/effects-weed.c:460
 msgid "string"
 msgstr ""
 
-#: src/effects-weed.c:436
+#: src/effects-weed.c:462
 msgid "pointer"
 msgstr ""
 
-#: src/effects-weed.c:4591
+#: src/effects-weed.c:4581
 #, c-format
 msgid "Error: plugin %s has no weed_setup() function.\n"
 msgstr "Erro: plugin %s não tem a função weed_setup().\n"
 
-#: src/effects-weed.c:4606
+#: src/effects-weed.c:4595
 #, c-format
 msgid "No usable filters found in plugin %s\n"
 msgstr ""
 
-#: src/effects-weed.c:4680
+#: src/effects-weed.c:4668
 #, c-format
 msgid "Found duplicate plugin %s"
 msgstr ""
 
-#: src/effects-weed.c:4734
+#: src/effects-weed.c:4723
 #, c-format
 msgid ""
 "Info: Unable to load plugin %s\n"
@@ -5934,259 +5948,259 @@
 "Info: Impossível carregar plugin %s\n"
 "Erro: %s\n"
 
-#: src/effects-weed.c:4737 src/effects-weed.c:5858
+#: src/effects-weed.c:4726 src/effects-weed.c:5847
 msgid "Some plugin directories"
 msgstr ""
 
 #. TRANSLATORS: example " - LADSPA plugins -"
-#: src/effects-weed.c:4812 src/rte_window.c:2105
+#: src/effects-weed.c:4801 src/rte_window.c:2107
 #, c-format
 msgid " - %s plugins -"
 msgstr ""
 
-#: src/effects-weed.c:5012
+#: src/effects-weed.c:4998
 #, c-format
 msgid "Successfully loaded %d Weed filters\n"
 msgstr ""
 
-#: src/effects-weed.c:5177
+#: src/effects-weed.c:5162
 #, c-format
 msgid "Invalid compound effect %s - has conflicting target_fps\n"
 msgstr ""
 
-#: src/effects-weed.c:5197
+#: src/effects-weed.c:5182
 #, c-format
 msgid "Invalid compound effect %s - has multiple transition parameters\n"
 msgstr ""
 
-#: src/effects-weed.c:5211
+#: src/effects-weed.c:5196
 #, c-format
 msgid "Invalid compound effect %s - has multiple master volume parameters\n"
 msgstr ""
 
-#: src/effects-weed.c:5346
+#: src/effects-weed.c:5329
 #, c-format
 msgid "Invalid compound effect %s - must have >1 sub filters\n"
 msgstr ""
 
-#: src/effects-weed.c:5366
+#: src/effects-weed.c:5349
 #, c-format
 msgid "Invalid effect %s found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5381
+#: src/effects-weed.c:5364
 #, c-format
 msgid "Invalid default found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5392
+#: src/effects-weed.c:5375
 #, c-format
 msgid "Invalid filter %d for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5406
+#: src/effects-weed.c:5389
 #, c-format
 msgid "Invalid param %d for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5433
+#: src/effects-weed.c:5416
 #, c-format
 msgid ""
 "Invalid number of values for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5467
+#: src/effects-weed.c:5450
 #, c-format
 msgid ""
 "Invalid non-boolean value for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5500
+#: src/effects-weed.c:5483
 #, c-format
 msgid "Invalid param link found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5511
+#: src/effects-weed.c:5494
 #, c-format
 msgid ""
 "Invalid out filter %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5529
+#: src/effects-weed.c:5513
 #, c-format
 msgid ""
 "Invalid out param %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5541
+#: src/effects-weed.c:5526
 #, c-format
 msgid ""
 "Invalid non-boolean value for autoscale found in compound effect %s, line "
 "%d\n"
 msgstr ""
 
-#: src/effects-weed.c:5552
+#: src/effects-weed.c:5537
 #, c-format
 msgid ""
 "Invalid in filter %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5566
+#: src/effects-weed.c:5552
 #, c-format
 msgid ""
 "Invalid in param %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5594
+#: src/effects-weed.c:5581
 #, c-format
 msgid "Invalid channel link found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5605
+#: src/effects-weed.c:5592
 #, c-format
 msgid ""
 "Invalid out filter %d for link channels found in compound effect %s, line "
 "%d\n"
 msgstr ""
 
-#: src/effects-weed.c:5623
+#: src/effects-weed.c:5611
 #, c-format
 msgid ""
 "Invalid out channel %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5633
+#: src/effects-weed.c:5622
 #, c-format
 msgid ""
 "Invalid in filter %d for link channels found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5651
+#: src/effects-weed.c:5641
 #, c-format
 msgid ""
 "Invalid in channel %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5687
+#: src/effects-weed.c:5678
 #, c-format
 msgid "Compound:%s"
 msgstr ""
 
-#: src/effects-weed.c:5758
+#: src/effects-weed.c:5749
 #, c-format
 msgid "Successfully loaded %d compound filters\n"
 msgstr ""
 
-#: src/effects-weed.c:6591
+#: src/effects-weed.c:6570
 #, c-format
 msgid "Effect %s cannot be used with this audio player.\n"
 msgstr ""
 
-#: src/effects-weed.c:6737
+#: src/effects-weed.c:6718
 #, c-format
 msgid "Failed to start instance %s, error code %d\n"
 msgstr "Falha ao iniciar instância %s, erro %d\n"
 
-#: src/effects-weed.c:6814
+#: src/effects-weed.c:6797
 #, c-format
 msgid "Unable to start generator %s\n"
 msgstr "Impossível iniciar gerador %s\n"
 
-#: src/effects-weed.c:7621
+#: src/effects-weed.c:7607
 #, c-format
 msgid "Failed to start generator %s\n"
 msgstr "Falha ao iniciar gerador %s\n"
 
-#: src/effects-weed.c:7718
+#: src/effects-weed.c:7701
 #, c-format
 msgid "Failed to start generator %s, error %d\n"
 msgstr "Falha ao iniciar gerador %s, erro %d\n"
 
-#: src/effects-weed.c:9012
+#: src/effects-weed.c:8993
 #, c-format
 msgid "%s [unstable] (%s)"
 msgstr ""
 
-#: src/effects-data.c:3278
+#: src/effects-data.c:3234
 #, c-format
 msgid "ACTIVATE (%s)"
 msgstr ""
 
-#: src/effects-data.c:3548
+#: src/effects-data.c:3501
 msgid "ACTIVATE"
 msgstr ""
 
-#: src/effects-data.c:3876
+#: src/effects-data.c:3829
 #, c-format
 msgid "Key slot %d"
 msgstr ""
 
-#: src/effects-data.c:3998
+#: src/effects-data.c:3951
 msgid "Autoscale"
 msgstr ""
 
-#: src/effects-data.c:4089
+#: src/effects-data.c:4042
 msgid "Add another connection for this output parameter"
 msgstr ""
 
-#: src/effects-data.c:4102 src/effects-data.c:4151
+#: src/effects-data.c:4055 src/effects-data.c:4104
 #, fuzzy
 msgid "Delete this connection"
 msgstr "_Deletar este efeito"
 
-#: src/effects-data.c:4138
+#: src/effects-data.c:4091
 msgid "Add another connection for this output channel"
 msgstr ""
 
-#: src/effects-data.c:4223
+#: src/effects-data.c:4176
 msgid "Connected to -->"
 msgstr ""
 
-#: src/effects-data.c:4243
+#: src/effects-data.c:4196
 #, c-format
 msgid "%s - Alpha Channel Connections"
 msgstr ""
 
-#: src/effects-data.c:4316
+#: src/effects-data.c:4269
 #, c-format
 msgid "%s - Parameter Data Connections"
 msgstr ""
 
-#: src/effects-data.c:4336
+#: src/effects-data.c:4289
 msgid "Autoscale All"
 msgstr ""
 
-#: src/effects-data.c:4361 src/effects-data.c:4890
+#: src/effects-data.c:4314 src/effects-data.c:4841
 msgid "ACTIVATED"
 msgstr ""
 
-#: src/effects-data.c:4774
+#: src/effects-data.c:4726
 msgid "LiVES: - Parameter and Alpha Channel Connections"
 msgstr ""
 
-#: src/effects-data.c:4785
+#: src/effects-data.c:4736
 msgid "Auto Connect Channels"
 msgstr ""
 
-#: src/effects-data.c:4797
+#: src/effects-data.c:4748
 msgid "Auto Connect Parameters"
 msgstr ""
 
-#: src/effects-data.c:4807
+#: src/effects-data.c:4758
 msgid "Disconnect All"
 msgstr ""
 
-#: src/effects-data.c:4875
+#: src/effects-data.c:4826
 #, c-format
 msgid "Input channel is already connected from (%d,%d) %s"
 msgstr ""
 
-#: src/effects-data.c:4891
+#: src/effects-data.c:4842
 #, c-format
 msgid "Input parameter is already connected from (%d,%d) %s"
 msgstr ""
 
-#: src/effects-data.c:4899
+#: src/effects-data.c:4851
 msgid "Input and output parameters are not compatible"
 msgstr ""
 
@@ -6198,43 +6212,43 @@
 msgid "_Reset Values"
 msgstr "_Reiniciar Valores"
 
-#: src/framedraw.c:267
+#: src/framedraw.c:265
 msgid "_Frame"
 msgstr ""
 
-#: src/paramspecial.c:266
+#: src/paramspecial.c:259
 msgid "Maintain _Aspect Ratio"
 msgstr "Manter _Aspecto"
 
-#: src/paramspecial.c:267
+#: src/paramspecial.c:260
 msgid "Maintain aspect ratio of original frame"
 msgstr "Manter aspecto do frame original"
 
-#: src/paramspecial.c:341
+#: src/paramspecial.c:335
 msgid "Display Password"
 msgstr ""
 
-#: src/paramwindow.c:450
+#: src/paramwindow.c:447
 msgid "Transition _In"
 msgstr "_Inicio da transição"
 
-#: src/paramwindow.c:452
+#: src/paramwindow.c:449
 msgid "Click to set the transition parameter to show only the front frame"
 msgstr ""
 
-#: src/paramwindow.c:474
+#: src/paramwindow.c:472
 msgid "Crossfade audio"
 msgstr "Crossfade áudio"
 
-#: src/paramwindow.c:475
+#: src/paramwindow.c:473
 msgid "Check the box to make audio transition with the video"
 msgstr "Clique na caixa para permitir fazer transmissão de áudio com vídeo"
 
-#: src/paramwindow.c:493
+#: src/paramwindow.c:492
 msgid "Transition _Out"
 msgstr "Fim da transiçã_o"
 
-#: src/paramwindow.c:495
+#: src/paramwindow.c:494
 msgid "Click to set the transition parameter to show only the rear frame"
 msgstr ""
 
@@ -6247,23 +6261,23 @@
 msgid "%s : size"
 msgstr "%s : tamanho"
 
-#: src/paramwindow.c:598
+#: src/paramwindow.c:597
 msgid "New size (pixels)"
 msgstr "Novo tamanho (pixels)"
 
-#: src/paramwindow.c:617 src/plugins.c:997
+#: src/paramwindow.c:616 src/plugins.c:973
 msgid "_Width"
 msgstr "Largura [_W]"
 
-#: src/paramwindow.c:636 src/plugins.c:1003
+#: src/paramwindow.c:635 src/plugins.c:979
 msgid "_Height"
 msgstr "Altura [_H]"
 
-#: src/paramwindow.c:684
+#: src/paramwindow.c:683
 msgid "Generate to _Clipboard"
 msgstr "Gerar na Área de Transferên_cia"
 
-#: src/paramwindow.c:686
+#: src/paramwindow.c:685
 msgid "Generate frames to the clipboard"
 msgstr "Gerar frames na área de transferência"
 
@@ -6275,7 +6289,7 @@
 msgid "Generate frames to a new clip"
 msgstr "Gerar frames em um novo clipe"
 
-#: src/paramwindow.c:822
+#: src/paramwindow.c:824
 #, c-format
 msgid ""
 "\n"
@@ -6286,59 +6300,59 @@
 "Devem ser selecionados ao menos %d frames para usar este efeito.\n"
 "\n"
 
-#: src/paramwindow.c:920 src/paramwindow.c:930
+#: src/paramwindow.c:934 src/paramwindow.c:942
 msgid "Set as default"
 msgstr "Definir como padrão"
 
-#: src/paramwindow.c:922 src/paramwindow.c:938
+#: src/paramwindow.c:936 src/paramwindow.c:950
 msgid "Reset"
 msgstr ""
 
-#: src/paramwindow.c:932 src/rte_window.c:2401 src/omc-learn.c:1357
+#: src/paramwindow.c:944 src/rte_window.c:2394 src/omc-learn.c:1347
 msgid "Close _window"
 msgstr "Fechar janela [_W]"
 
-#: src/paramwindow.c:1337
+#: src/paramwindow.c:1340
 msgid "No parameters"
 msgstr "Sem parâmetros"
 
-#: src/paramwindow.c:1419
+#: src/paramwindow.c:1424
 msgid "Invalid parameter"
 msgstr "Parametro inválido"
 
-#: src/paramwindow.c:1611
+#: src/paramwindow.c:1610
 msgid "LiVES: - Select Colour"
 msgstr "Mostrar Compositor"
 
-#: src/paramwindow.c:1616
+#: src/paramwindow.c:1615
 msgid "Click to set the colour"
 msgstr "Clique para selecionar a cor"
 
-#: src/paramwindow.c:1628
+#: src/paramwindow.c:1626
 msgid "_Red"
 msgstr ""
 
-#: src/paramwindow.c:1629
+#: src/paramwindow.c:1627
 msgid "The red value (0 - 255)"
 msgstr "Valor do vermelho (0 - 255)"
 
-#: src/paramwindow.c:1632
+#: src/paramwindow.c:1630
 msgid "_Green"
 msgstr ""
 
-#: src/paramwindow.c:1633
+#: src/paramwindow.c:1631
 msgid "The green value (0 - 255)"
 msgstr "Valor do verde (0 - 255)"
 
-#: src/paramwindow.c:1636
+#: src/paramwindow.c:1634
 msgid "_Blue"
 msgstr ""
 
-#: src/paramwindow.c:1637
+#: src/paramwindow.c:1635
 msgid "The blue value (0 - 255)"
 msgstr "Valor do azul (0 - 255)"
 
-#: src/plugins.c:85
+#: src/plugins.c:86
 #, c-format
 msgid ""
 "\n"
@@ -6347,12 +6361,12 @@
 "\n"
 "Erro de plugin: %s falhou com o código %d"
 
-#: src/plugins.c:87
+#: src/plugins.c:88
 #, c-format
 msgid " : message was %s\n"
 msgstr " : mensagem era %s\n"
 
-#: src/plugins.c:387
+#: src/plugins.c:375
 #, c-format
 msgid ""
 "\n"
@@ -6367,17 +6381,17 @@
 "%s\n"
 "Código de erro %d\n"
 
-#: src/plugins.c:397
+#: src/plugins.c:385
 #, c-format
 msgid "Updating video playback plugin defaults in %s\n"
 msgstr "Atualizando padrões de plugins de execução de vídeo em %s\n"
 
-#: src/plugins.c:452
+#: src/plugins.c:444
 #, c-format
 msgid "Loading video playback plugin defaults from %s..."
 msgstr "Carregando padrões de plugin de execução de vídeo de %s..."
 
-#: src/plugins.c:515
+#: src/plugins.c:505
 #, c-format
 msgid ""
 "\n"
@@ -6392,32 +6406,32 @@
 " Ferramentas|Preferências|Execução|Plugins de Execução Avançados\n"
 "\n"
 
-#: src/plugins.c:855
+#: src/plugins.c:836
 #, c-format
 msgid "Saving playback plugin defaults to %s..."
 msgstr ""
 
-#: src/plugins.c:962
+#: src/plugins.c:939
 msgid "_FPS"
 msgstr "_FPS"
 
-#: src/plugins.c:963
+#: src/plugins.c:940
 msgid "Fixed framerate for plugin.\n"
 msgstr "Framerate fixa para plugin.\n"
 
-#: src/plugins.c:1032
+#: src/plugins.c:1008
 msgid "_Colourspace"
 msgstr ""
 
-#: src/plugins.c:1033
+#: src/plugins.c:1009
 msgid "Colourspace input to the plugin.\n"
 msgstr "Entrada de colorspace para o plugin.\n"
 
-#: src/plugins.c:1089
+#: src/plugins.c:1065
 msgid "Save settings to an alternate file.\n"
 msgstr ""
 
-#: src/plugins.c:1206
+#: src/plugins.c:1182
 #, c-format
 msgid ""
 "\n"
@@ -6430,7 +6444,7 @@
 "Falhou em abrir o plugin de execução %s\n"
 "Erro: %s\n"
 
-#: src/plugins.c:1252
+#: src/plugins.c:1228
 #, c-format
 msgid ""
 "\n"
@@ -6445,7 +6459,7 @@
 "está sem uma função essencial.\n"
 "Impossível usá-lo.\n"
 
-#: src/plugins.c:1265
+#: src/plugins.c:1241
 #, c-format
 msgid ""
 "Video playback plugin failed to initialise.\n"
@@ -6454,7 +6468,7 @@
 "O plugin de execução de vídeo falhou ao iniciar.\n"
 "O error: %s\n"
 
-#: src/plugins.c:1461
+#: src/plugins.c:1428
 msgid ""
 "\n"
 "Warning ! Video playback plugin will not send key presses. Keyboard may be "
@@ -6464,7 +6478,7 @@
 "Aviso! O plugin de execução de vídeo não envia teclas pressionadas. O "
 "teclado deve estar desativado durante o uso!\n"
 
-#: src/plugins.c:1465
+#: src/plugins.c:1433
 #, c-format
 msgid ""
 "*** Using %s plugin for fs playback, agreed to use palette type %d ( %s ). "
@@ -6473,17 +6487,17 @@
 "*** Usando o plugin %s pra execução em tela cheia, com a palheta tipo %d "
 "(%s). ***\n"
 
-#: src/plugins.c:1571
+#: src/plugins.c:1537
 #, c-format
 msgid "Audio stream unable to use preferred format '%s'\n"
 msgstr ""
 
-#: src/plugins.c:1579
+#: src/plugins.c:1543
 #, c-format
 msgid "Using format '%s' instead.\n"
 msgstr ""
 
-#: src/plugins.c:1616
+#: src/plugins.c:1579
 #, c-format
 msgid ""
 "LiVES was unable to find its encoder plugins. Please make sure you have the "
@@ -6492,7 +6506,7 @@
 "or change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/plugins.c:1624
+#: src/plugins.c:1589
 #, c-format
 msgid ""
 "LiVES did not receive a response from the encoder plugin called '%s'.\n"
@@ -6505,11 +6519,11 @@
 "%s%s%s\n"
 "ou troque de plugin em 'Ferramentas | Preferências | Codificação'\n"
 
-#: src/plugins.c:2032
+#: src/plugins.c:1987
 msgid "Unable to resize, please install imageMagick\n"
 msgstr "Não foi possível redimensionar, por favor instale imageMagick\n"
 
-#: src/plugins.c:2231
+#: src/plugins.c:2183
 #, c-format
 msgid ""
 "\n"
@@ -6517,12 +6531,12 @@
 "No decoders found in %s !\n"
 msgstr ""
 
-#: src/plugins.c:2415
+#: src/plugins.c:2369
 #, fuzzy, c-format
 msgid " using %s"
 msgstr "Abrindo %s"
 
-#: src/plugins.c:2499
+#: src/plugins.c:2451
 #, c-format
 msgid ""
 "\n"
@@ -6535,7 +6549,7 @@
 "Falhou em abrir o plugin de decodificação %s\n"
 "Erro: %s\n"
 
-#: src/plugins.c:2522
+#: src/plugins.c:2472
 #, c-format
 msgid ""
 "\n"
@@ -6550,24 +6564,24 @@
 "está sem uma função essencial.\n"
 "Impossível usá-lo.\n"
 
-#: src/plugins.c:2564
+#: src/plugins.c:2512
 msgid "/unknown"
 msgstr "/desconhecido"
 
-#: src/plugins.c:2651
+#: src/plugins.c:2598
 msgid "LiVES: - Decoder Plugins"
 msgstr ""
 
-#: src/plugins.c:2669
+#: src/plugins.c:2616
 msgid "Enabled Video Decoders (uncheck to disable)"
 msgstr ""
 
-#: src/plugins.c:2726
+#: src/plugins.c:2672
 #, c-format
 msgid "Failed to load %s, transitions may not resize.\n"
 msgstr "Falhou em carregar %s, as transições podem não redimensionar.\n"
 
-#: src/plugins.c:3854
+#: src/plugins.c:3797
 #, c-format
 msgid "%s advanced settings"
 msgstr "%s configurações avançadas"
@@ -6576,15 +6590,15 @@
 msgid "LiVES: - New Test RFX"
 msgstr "LiVES: - Novo RFX de Teste"
 
-#: src/rfx-builder.c:136
+#: src/rfx-builder.c:135
 msgid "LiVES: - Edit Test RFX"
 msgstr "LiVES: - Editar RFX de Teste"
 
-#: src/rfx-builder.c:166
+#: src/rfx-builder.c:165
 msgid "Type:"
 msgstr "Tipo:"
 
-#: src/rfx-builder.c:184
+#: src/rfx-builder.c:183
 msgid "tool"
 msgstr ""
 
@@ -6596,127 +6610,127 @@
 msgid "The name of the plugin. No spaces allowed."
 msgstr "O nome do plugin. Não são permitidos espaços."
 
-#: src/rfx-builder.c:201
+#: src/rfx-builder.c:202
 msgid "Version:       "
 msgstr "Versão:       "
 
-#: src/rfx-builder.c:203
+#: src/rfx-builder.c:204
 msgid "The script version."
 msgstr "Versão do script."
 
-#: src/rfx-builder.c:210
+#: src/rfx-builder.c:212
 msgid "    Author:       "
 msgstr "    Autor:       "
 
-#: src/rfx-builder.c:211
+#: src/rfx-builder.c:213
 msgid "The script author."
 msgstr "Autor do script."
 
-#: src/rfx-builder.c:217
+#: src/rfx-builder.c:220
 msgid "    URL (optional):       "
 msgstr "    URL (opcional):       "
 
-#: src/rfx-builder.c:218
+#: src/rfx-builder.c:221
 msgid "URL for the plugin maintainer."
 msgstr "URL do mantenedor do plugin."
 
-#: src/rfx-builder.c:226
+#: src/rfx-builder.c:230
 msgid "Menu text:    "
 msgstr "Texto do menu:    "
 
-#: src/rfx-builder.c:227
+#: src/rfx-builder.c:231
 msgid "The text to show in the menu."
 msgstr "O texto a ser mostrado no menu."
 
-#: src/rfx-builder.c:239
+#: src/rfx-builder.c:244
 msgid "Action description:        "
 msgstr "Descrição da ação:        "
 
-#: src/rfx-builder.c:241
+#: src/rfx-builder.c:246
 msgid "Describe what the plugin is doing. E.g. \"Edge detecting\""
 msgstr "Descreva o que o plugin faz. Ex.: \"detecção de bordas\""
 
-#: src/rfx-builder.c:246
+#: src/rfx-builder.c:251
 msgid "Minimum frames:"
 msgstr "Mínimo de frames:"
 
-#: src/rfx-builder.c:249
+#: src/rfx-builder.c:254
 msgid ""
 "Minimum number of frames this effect/tool can be applied to. Normally 1."
 msgstr ""
 "Número mínimo de frames ao qual este efeito/ferramenta pode ser aplicado. "
 "Normalmente 1."
 
-#: src/rfx-builder.c:260
+#: src/rfx-builder.c:265
 msgid "_Requirements..."
 msgstr "_Requisitos..."
 
-#: src/rfx-builder.c:263
+#: src/rfx-builder.c:268
 msgid "Enter any binaries required by the plugin."
 msgstr "Entre com os binários requeridos pelo plugin."
 
-#: src/rfx-builder.c:267
+#: src/rfx-builder.c:272
 msgid "_Properties..."
 msgstr "_Propriedades..."
 
-#: src/rfx-builder.c:270
+#: src/rfx-builder.c:275
 msgid "Set properties for the plugin. Optional."
 msgstr "Definir propriedades para o plugin. Opcional."
 
-#: src/rfx-builder.c:274
+#: src/rfx-builder.c:279
 msgid "_Parameters..."
 msgstr "_Parâmetros..."
 
-#: src/rfx-builder.c:277
+#: src/rfx-builder.c:282
 msgid "Set up parameters used in pre/loop/post/trigger code. Optional."
 msgstr ""
 "Configurando parâmetros usados em código pró/loop/pós/gatilho. Opcional."
 
-#: src/rfx-builder.c:281
+#: src/rfx-builder.c:286
 msgid "Parameter _Window Hints..."
 msgstr "Notas da Janela de Parâmetros [_W]"
 
-#: src/rfx-builder.c:284
+#: src/rfx-builder.c:289
 msgid "Set hints about how to lay out the parameter window. Optional."
 msgstr "Criar notas sobre layout da janela de parâmetros. Opcional"
 
-#: src/rfx-builder.c:290
+#: src/rfx-builder.c:295
 msgid "_Language code:"
 msgstr ""
 
-#: src/rfx-builder.c:291
+#: src/rfx-builder.c:296
 msgid "Language for pre/loop/post/triggers. Optional."
 msgstr "Língua para pré/loop/pós/gatilho. Opcional."
 
-#: src/rfx-builder.c:300
+#: src/rfx-builder.c:305
 msgid "_Pre loop code..."
 msgstr "Código _pré-loop..."
 
-#: src/rfx-builder.c:303
+#: src/rfx-builder.c:308
 msgid "Code to be executed before the loop. Optional."
 msgstr "Código a ser executado antes do loop. Opcional."
 
-#: src/rfx-builder.c:307
+#: src/rfx-builder.c:312
 msgid "_Loop code..."
 msgstr "Código de _loop..."
 
-#: src/rfx-builder.c:310
+#: src/rfx-builder.c:315
 msgid "Loop code to be applied to each frame."
 msgstr "Código de loop a ser aplicado em cada frame."
 
-#: src/rfx-builder.c:314
+#: src/rfx-builder.c:319
 msgid "_Post loop code..."
 msgstr "Código _pós-loop..."
 
-#: src/rfx-builder.c:317
+#: src/rfx-builder.c:322
 msgid "Code to be executed after the loop. Optional."
 msgstr "Código para ser executado após o loop. Opcional"
 
-#: src/rfx-builder.c:321
+#: src/rfx-builder.c:326
 msgid "_Trigger code..."
 msgstr "Código de acionamen_to..."
 
-#: src/rfx-builder.c:324
+#: src/rfx-builder.c:329
 msgid ""
 "Set trigger code for when the parameter window is shown, or when a parameter "
 "is changed. Optional (except for Utilities)."
@@ -6724,7 +6738,7 @@
 "Configure o código gatilho para quando a janela de parâmetros for mostrada, "
 "ou quando um parâmetro for modificado. Opcional (exceto para Utilitários)."
 
-#: src/rfx-builder.c:421
+#: src/rfx-builder.c:426
 #, c-format
 msgid ""
 "\n"
@@ -6739,55 +6753,55 @@
 "%s\n"
 "%s\n"
 
-#: src/rfx-builder.c:544
+#: src/rfx-builder.c:541
 msgid "LiVES: - RFX Requirements"
 msgstr "LiVES: - Requisitos RFX"
 
-#: src/rfx-builder.c:548
+#: src/rfx-builder.c:544
 msgid "LiVES: - RFX Parameters"
 msgstr "LiVES: - Parâmetros RFX"
 
-#: src/rfx-builder.c:552
+#: src/rfx-builder.c:547
 msgid "LiVES: - RFX Parameter Window Hints"
 msgstr "LiVES: - Notas da Janela de Parâmetros RFX"
 
-#: src/rfx-builder.c:556
+#: src/rfx-builder.c:550
 msgid "LiVES: - RFX Triggers"
 msgstr "LiVES: - Gatilhos RFX"
 
-#: src/rfx-builder.c:622
+#: src/rfx-builder.c:613
 msgid "_New Entry"
 msgstr "_Nova Entrada"
 
-#: src/rfx-builder.c:625
+#: src/rfx-builder.c:616
 msgid "_Edit Entry"
 msgstr "_Editar Entrada"
 
-#: src/rfx-builder.c:628
+#: src/rfx-builder.c:619
 msgid "_Remove Entry"
 msgstr "_Remover Entrada"
 
-#: src/rfx-builder.c:632
+#: src/rfx-builder.c:623
 msgid "Move _Up"
 msgstr "Mover Acima [_U]"
 
-#: src/rfx-builder.c:635
+#: src/rfx-builder.c:626
 msgid "Move _Down"
 msgstr "Move Abaixo [_U]"
 
-#: src/rfx-builder.c:1004
+#: src/rfx-builder.c:984
 msgid "LiVES: - RFX Properties"
 msgstr "LiVES: - Propriedades RFX"
 
-#: src/rfx-builder.c:1013
+#: src/rfx-builder.c:993
 msgid "_Slow (hint to GUI)"
 msgstr "Lento (nota para GUI) [_S]"
 
-#: src/rfx-builder.c:1024
+#: src/rfx-builder.c:1004
 msgid "_Batch mode generator"
 msgstr "Gerador de modo _batch"
 
-#: src/rfx-builder.c:1831
+#: src/rfx-builder.c:1790
 msgid ""
 "\n"
 "\n"
@@ -6801,7 +6815,7 @@
 "Favor remover o gatilho primeiro.\n"
 "\n"
 
-#: src/rfx-builder.c:1875
+#: src/rfx-builder.c:1834
 msgid ""
 "\n"
 "\n"
@@ -6813,185 +6827,185 @@
 "Alguns gatilhos foram ajustados.\n"
 "Por favor confirme o código gatilho.\n"
 
-#: src/rfx-builder.c:1994
+#: src/rfx-builder.c:1950
 msgid "LiVES: - New RFX Parameter"
 msgstr "LiVES: - Novo Parâmetro RFX"
 
-#: src/rfx-builder.c:1997
+#: src/rfx-builder.c:1952
 msgid "LiVES: - Edit RFX Parameter"
 msgstr "LiVES: - Editar Parâmetro RFX"
 
-#: src/rfx-builder.c:2013
+#: src/rfx-builder.c:1968
 msgid "_Name:    "
 msgstr "_Nome:    "
 
-#: src/rfx-builder.c:2016
+#: src/rfx-builder.c:1971
 msgid "Name of the parameter, must be unique in the plugin."
 msgstr "Nome do parâmetro, deve ser único no plugin."
 
-#: src/rfx-builder.c:2025
+#: src/rfx-builder.c:1981
 msgid "_Label:    "
 msgstr "_Rótulo:    "
 
-#: src/rfx-builder.c:2028
+#: src/rfx-builder.c:1984
 msgid ""
 "Label to be shown by the parameter. An underscore represents mnemonic "
 "accelerator."
 msgstr ""
 "Rótulo a ser mostrado pelo parâmetro. Um sublinhado representa um atalho."
 
-#: src/rfx-builder.c:2039
+#: src/rfx-builder.c:1996
 msgid "_Type:         "
 msgstr "_Tipo:         "
 
-#: src/rfx-builder.c:2040
+#: src/rfx-builder.c:1997
 msgid "Parameter type (select from list)."
 msgstr "Tipo de parâmetro (selecione de uma lista)."
 
-#: src/rfx-builder.c:2073
+#: src/rfx-builder.c:2029
 msgid "Decimal _places: "
 msgstr "Casas decimais [_P]: "
 
-#: src/rfx-builder.c:2082 src/rfx-builder.c:2477 src/rfx-builder.c:2495
+#: src/rfx-builder.c:2038 src/rfx-builder.c:2430 src/rfx-builder.c:2447
 msgid "_Default value:    "
 msgstr "Valor pa_drão:    "
 
-#: src/rfx-builder.c:2098
+#: src/rfx-builder.c:2054
 msgid "_Default: "
 msgstr "Padrão [_D]: "
 
-#: src/rfx-builder.c:2132
+#: src/rfx-builder.c:2087
 msgid "Button _Group: "
 msgstr "_Grupo de botões: "
 
-#: src/rfx-builder.c:2134
+#: src/rfx-builder.c:2089
 msgid "A non-zero value can be used to group radio buttons."
 msgstr "Um valor diferente de zero pode ser usado para agrupar botões rádio."
 
-#: src/rfx-builder.c:2142 src/rfx-builder.c:2478
+#: src/rfx-builder.c:2097 src/rfx-builder.c:2431
 msgid "_Minimum value: "
 msgstr "Valor _mínimo: "
 
-#: src/rfx-builder.c:2148 src/rfx-builder.c:2479
+#: src/rfx-builder.c:2103 src/rfx-builder.c:2432
 msgid "Ma_ximum value: "
 msgstr "Valor má_ximo: "
 
-#: src/rfx-builder.c:2157
+#: src/rfx-builder.c:2113
 msgid "     _Step size:   "
 msgstr "     Tamanho do pa_sso:   "
 
-#: src/rfx-builder.c:2160
+#: src/rfx-builder.c:2117
 msgid ""
 "How much the parameter is adjusted when the spinbutton arrows are pressed."
 msgstr "Quanto do parâmetro é ajustado quando as setas são pressionadas."
 
-#: src/rfx-builder.c:2171
+#: src/rfx-builder.c:2129
 msgid "_Wrap value"
 msgstr ""
 
-#: src/rfx-builder.c:2172
+#: src/rfx-builder.c:2131
 msgid "Whether the value wraps max->min and min->max."
 msgstr "Se o valor empacota max->min e min->max."
 
-#: src/rfx-builder.c:2470
+#: src/rfx-builder.c:2424
 msgid "Set _values"
 msgstr "Definir _valores"
 
-#: src/rfx-builder.c:2512
+#: src/rfx-builder.c:2463
 msgid "Default _Red:  "
 msgstr "Padrão ve_rmelho:  "
 
-#: src/rfx-builder.c:2513
+#: src/rfx-builder.c:2464
 msgid "Default _Green:"
 msgstr "Padrão verde [_G]:"
 
-#: src/rfx-builder.c:2514
+#: src/rfx-builder.c:2465
 msgid "Default _Blue: "
 msgstr "Padrão azul [_B]: "
 
-#: src/rfx-builder.c:2538
+#: src/rfx-builder.c:2488
 msgid "Set _default"
 msgstr "_Definir padrão"
 
-#: src/rfx-builder.c:2540
+#: src/rfx-builder.c:2490
 msgid "Default value:  "
 msgstr "Valor padrão:  "
 
-#: src/rfx-builder.c:2541
+#: src/rfx-builder.c:2491
 msgid "Maximum length (chars): "
 msgstr "Comprimento máximo (caracteres): "
 
-#: src/rfx-builder.c:2576
+#: src/rfx-builder.c:2526
 msgid "LiVES: - New RFX Parameter Window Hint"
 msgstr "LiVES: - Notas da Janela de Parâmetros RFX"
 
-#: src/rfx-builder.c:2579
+#: src/rfx-builder.c:2528
 msgid "LiVES: - Edit RFX Parameter Window Hint"
 msgstr "LiVES: - Notas da Janela de Edição de Parâmetros RFX"
 
-#: src/rfx-builder.c:2622
+#: src/rfx-builder.c:2569
 msgid "_Keyword:         "
 msgstr ""
 
-#: src/rfx-builder.c:2639
+#: src/rfx-builder.c:2586
 msgid "Special _Type:         "
 msgstr ""
 
-#: src/rfx-builder.c:2656
+#: src/rfx-builder.c:2602
 msgid "Special _Subtype:         "
 msgstr ""
 
-#: src/rfx-builder.c:2667 src/rfx-builder.c:2706
+#: src/rfx-builder.c:2613 src/rfx-builder.c:2651
 msgid "Row:    "
 msgstr "Linha:    "
 
-#: src/rfx-builder.c:2732
+#: src/rfx-builder.c:2676
 #, c-format
 msgid "Linked parameters (%d):    "
 msgstr "Parâmetros atrelados (%d):    "
 
-#: src/rfx-builder.c:2749
+#: src/rfx-builder.c:2693
 msgid "Linked parameters (4):    "
 msgstr "Parametros atrelados (4):    "
 
-#: src/rfx-builder.c:2752
+#: src/rfx-builder.c:2695
 msgid "Linked parameters (2):    "
 msgstr "Parâmetros atrelados (2):    "
 
-#: src/rfx-builder.c:2777
+#: src/rfx-builder.c:2720
 msgid "LiVES: - New RFX Trigger"
 msgstr "LiVES: - Novo Gatilho RFX"
 
-#: src/rfx-builder.c:2780
+#: src/rfx-builder.c:2722
 msgid "LiVES: - Edit RFX Trigger"
 msgstr "LiVES: - Editar Gatilho RFX"
 
-#: src/rfx-builder.c:2808
+#: src/rfx-builder.c:2750
 msgid "When:         "
 msgstr "Quando:         "
 
-#: src/rfx-builder.c:2904
+#: src/rfx-builder.c:2846
 msgid "LiVES: - Pre Loop Code"
 msgstr "LiVES: - Código Pré-loop"
 
-#: src/rfx-builder.c:2911
+#: src/rfx-builder.c:2853
 msgid "LiVES: - Loop Code"
 msgstr "LiVES: - Codigo de Loop"
 
-#: src/rfx-builder.c:2918
+#: src/rfx-builder.c:2860
 msgid "LiVES: - Post Loop Code"
 msgstr "LiVES: - Codigo Pós-Loop"
 
-#: src/rfx-builder.c:2931
+#: src/rfx-builder.c:2873
 #, c-format
 msgid "LiVES: - Default text (max length %d)"
 msgstr "LiVES: - Texto padrão (tam. máx. %d)"
 
-#: src/rfx-builder.c:2944
+#: src/rfx-builder.c:2885
 msgid "LiVES: - Enter values, one per line"
 msgstr "LiVES: - Entre com valores, um por linha"
 
-#: src/rfx-builder.c:3055
+#: src/rfx-builder.c:2996
 msgid ""
 "\n"
 "\n"
@@ -7001,7 +7015,7 @@
 "\n"
 "O nome não deve ficar em branco.\n"
 
-#: src/rfx-builder.c:3060
+#: src/rfx-builder.c:3001
 msgid ""
 "\n"
 "\n"
@@ -7011,7 +7025,7 @@
 "\n"
 "Nome não pode conter espaços.\n"
 
-#: src/rfx-builder.c:3065
+#: src/rfx-builder.c:3006
 msgid ""
 "\n"
 "\n"
@@ -7021,7 +7035,7 @@
 "\n"
 "Texto do menu não pode estar em branco.\n"
 
-#: src/rfx-builder.c:3071
+#: src/rfx-builder.c:3012
 msgid ""
 "\n"
 "\n"
@@ -7031,7 +7045,7 @@
 "\n"
 "Descrição da ação não pode estar em branco.\n"
 
-#: src/rfx-builder.c:3076
+#: src/rfx-builder.c:3017
 msgid ""
 "\n"
 "\n"
@@ -7041,7 +7055,7 @@
 "\n"
 "O nome do autor não deve ficar em branco.\n"
 
-#: src/rfx-builder.c:3085 src/rfx-builder.c:4339
+#: src/rfx-builder.c:3026 src/rfx-builder.c:4253
 msgid ""
 "\n"
 "\n"
@@ -7053,7 +7067,7 @@
 "Já existe um plugin com este nome.\n"
 "O nome deve ser único.\n"
 
-#: src/rfx-builder.c:3092
+#: src/rfx-builder.c:3033
 msgid ""
 "\n"
 "\n"
@@ -7063,7 +7077,7 @@
 "\n"
 "Codigo do loop não deve estar em branco.\n"
 
-#: src/rfx-builder.c:3098
+#: src/rfx-builder.c:3039
 msgid ""
 "\n"
 "\n"
@@ -7073,7 +7087,7 @@
 "\n"
 "O código do gatilho não deve ser deixado em branco para um utilitário.\n"
 
-#: src/rfx-builder.c:3111
+#: src/rfx-builder.c:3052
 msgid ""
 "\n"
 "\n"
@@ -7083,7 +7097,7 @@
 "\n"
 "O nome do parâmetro não deve ser deixado em branco.\n"
 
-#: src/rfx-builder.c:3117
+#: src/rfx-builder.c:3058
 msgid ""
 "\n"
 "\n"
@@ -7097,41 +7111,41 @@
 "plugin.\n"
 "\n"
 
-#: src/rfx-builder.c:3171
+#: src/rfx-builder.c:3111
 #, c-format
 msgid "Writing script file %s..."
 msgstr "Escrevendo arquivo de script %s..."
 
-#: src/rfx-builder.c:3477
+#: src/rfx-builder.c:3411
 msgid "No <define> section found in script.\n"
 msgstr "A seção <define> não foi encontrada no script.\n"
 
-#: src/rfx-builder.c:3484 src/rfx-builder.c:3493
+#: src/rfx-builder.c:3418 src/rfx-builder.c:3427
 msgid "Bad script version.\n"
 msgstr "Versão do script ruim.\n"
 
-#: src/rfx-builder.c:3505
+#: src/rfx-builder.c:3439
 msgid "No <name> section found in script.\n"
 msgstr "A seção <name> não foi encontrada no script.\n"
 
-#: src/rfx-builder.c:3513
+#: src/rfx-builder.c:3447
 msgid "No <version> section found in script.\n"
 msgstr "A seção <version> não foi enonctrada no script.\n"
 
-#: src/rfx-builder.c:3522
+#: src/rfx-builder.c:3456
 msgid "No <author> section found in script.\n"
 msgstr "A seção <author> não foi encontrada no script.\n"
 
-#: src/rfx-builder.c:3536
+#: src/rfx-builder.c:3470
 msgid "No <description> section found in script.\n"
 msgstr "A seção <description> não foi encontrada no script.\n"
 
-#: src/rfx-builder.c:3540
+#: src/rfx-builder.c:3474
 #, c-format
 msgid "Bad description. (%s)\n"
 msgstr "Descrição ruim. (%s)\n"
 
-#: src/rfx-builder.c:3702
+#: src/rfx-builder.c:3627
 #, c-format
 msgid ""
 "\n"
@@ -7146,27 +7160,27 @@
 "encontrado no script.\n"
 "\n"
 
-#: src/rfx-builder.c:3859
+#: src/rfx-builder.c:3780
 msgid "Rebuilding all RFX scripts...builtin..."
 msgstr "Reconstruindo todos scripts RFX..."
 
-#: src/rfx-builder.c:3860
+#: src/rfx-builder.c:3781
 msgid "Rebuilding scripts"
 msgstr "Reconstruindo scripts"
 
-#: src/rfx-builder.c:3868
+#: src/rfx-builder.c:3789
 msgid "custom..."
 msgstr "customizado..."
 
-#: src/rfx-builder.c:3872
+#: src/rfx-builder.c:3793
 msgid "test..."
 msgstr "teste..."
 
-#: src/rfx-builder.c:3878
+#: src/rfx-builder.c:3799
 msgid "rebuilding dynamic menu entries..."
 msgstr "reconstruindo entradas dinâmicas de menu..."
 
-#: src/rfx-builder.c:3905 src/rfx-builder.c:3912
+#: src/rfx-builder.c:3826 src/rfx-builder.c:3834
 #, c-format
 msgid ""
 "\n"
@@ -7179,7 +7193,7 @@
 "LiVES não conseguiu encontrar o programa %s.\n"
 "Por favor confirme se este programa está no PATH e é executável.\n"
 
-#: src/rfx-builder.c:3951
+#: src/rfx-builder.c:3874
 #, c-format
 msgid ""
 "\n"
@@ -7194,12 +7208,12 @@
 "%s ?\n"
 "\n"
 
-#: src/rfx-builder.c:3960
+#: src/rfx-builder.c:3884
 #, c-format
 msgid "Deleting rfx script %s..."
 msgstr "Deletando script RFX %s..."
 
-#: src/rfx-builder.c:3980
+#: src/rfx-builder.c:3902
 #, c-format
 msgid ""
 "\n"
@@ -7214,7 +7228,7 @@
 "%s\n"
 "Código do erro %d\n"
 
-#: src/rfx-builder.c:4016
+#: src/rfx-builder.c:3938
 #, c-format
 msgid ""
 "\n"
@@ -7229,12 +7243,12 @@
 "já existe.\n"
 "Por favor delete-o primeiro, ou renomeie o script de teste.\n"
 
-#: src/rfx-builder.c:4027
+#: src/rfx-builder.c:3950
 #, c-format
 msgid "Promoting rfx test plugin %s to custom..."
 msgstr "Promovendo plugin rfx %s de teste para customizado..."
 
-#: src/rfx-builder.c:4044
+#: src/rfx-builder.c:3965
 #, c-format
 msgid ""
 "\n"
@@ -7245,20 +7259,20 @@
 "Return code was %d (%s)\n"
 msgstr ""
 
-#: src/rfx-builder.c:4070
+#: src/rfx-builder.c:3990
 msgid "LiVES: - Export Script to..."
 msgstr ""
 
-#: src/rfx-builder.c:4077 src/rfx-builder.c:4156
+#: src/rfx-builder.c:3997 src/rfx-builder.c:4074
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "Copiando %s para %s..."
 
-#: src/rfx-builder.c:4105
+#: src/rfx-builder.c:4024
 msgid "LiVES: Import Script from..."
 msgstr ""
 
-#: src/rfx-builder.c:4148
+#: src/rfx-builder.c:4067
 #, c-format
 msgid ""
 "\n"
@@ -7273,43 +7287,43 @@
 "já existe.\n"
 "Por favor delete-o primeiro, ou renomeie o script a ser importado.\n"
 
-#: src/rfx-builder.c:4249
+#: src/rfx-builder.c:4166
 msgid "LiVES: - Copy RFX Script"
 msgstr "LiVES: - Copy RFX Script"
 
-#: src/rfx-builder.c:4251
+#: src/rfx-builder.c:4168
 msgid "_From type:    "
 msgstr ""
 
-#: src/rfx-builder.c:4258
+#: src/rfx-builder.c:4175
 msgid "   Script:    "
 msgstr "   Script:    "
 
-#: src/rfx-builder.c:4267
+#: src/rfx-builder.c:4183
 msgid "LiVES: - Rename test RFX Script"
 msgstr "LiVES: - Renomear Script RFX de Teste"
 
-#: src/rfx-builder.c:4268
+#: src/rfx-builder.c:4184
 msgid "From script: "
 msgstr "Do script: "
 
-#: src/rfx-builder.c:4273
+#: src/rfx-builder.c:4188
 msgid "LiVES: - RFX Script name"
 msgstr "LiVES: - Nome do Script RFX"
 
-#: src/rfx-builder.c:4274
+#: src/rfx-builder.c:4189
 msgid "Script name: "
 msgstr "Nome do script: "
 
-#: src/rfx-builder.c:4294
+#: src/rfx-builder.c:4209
 msgid "New name: "
 msgstr "Novo nome: "
 
-#: src/rfx-builder.c:4297
+#: src/rfx-builder.c:4212
 msgid "New script name: "
 msgstr "Novo nome de script: "
 
-#: src/rfx-builder.c:4372
+#: src/rfx-builder.c:4286
 msgid ""
 "\n"
 "\n"
@@ -7321,12 +7335,12 @@
 "Já existe um script de teste com este nome.\n"
 "O nome do script deve ser único.\n"
 
-#: src/rfx-builder.c:4384
+#: src/rfx-builder.c:4297
 #, c-format
 msgid "Renaming RFX test script %s to %s..."
 msgstr "Renomeando script RFX de teste %s para %s..."
 
-#: src/rfx-builder.c:4390
+#: src/rfx-builder.c:4302
 #, c-format
 msgid ""
 "\n"
@@ -7343,23 +7357,23 @@
 "%s\n"
 "Código %d\n"
 
-#: src/rfx-builder.c:4610
+#: src/rfx-builder.c:4518
 msgid "_Apply Real Time Effects to Selection"
 msgstr "_Aplicar Efeitos em Tempo-Real para Seleção"
 
-#: src/rfx-builder.c:4664
+#: src/rfx-builder.c:4572
 #, c-format
 msgid "Loading rendered effect %s..."
 msgstr "Carregando efeito renderizado %s..."
 
-#: src/rfx-builder.c:4766
+#: src/rfx-builder.c:4674
 msgid ""
 "See: VJ - show VJ keys. Set the realtime effects, and then apply them here."
 msgstr ""
 "Veja: VJ - mostrar atalhos'. Configure os efeitos em tempo-real, e depois "
 "aplique-os aqui."
 
-#: src/preferences.c:359
+#: src/preferences.c:351
 msgid ""
 "\n"
 "\n"
@@ -7371,7 +7385,7 @@
 "Plugins de execução de vídeo só são ativados em\n"
 "tela cheia, modo de janela separada\n"
 
-#: src/preferences.c:408
+#: src/preferences.c:400
 msgid ""
 "\n"
 "\n"
@@ -7379,7 +7393,7 @@
 "(Free space = UNKNOWN)"
 msgstr ""
 
-#: src/preferences.c:412
+#: src/preferences.c:403
 #, c-format
 msgid ""
 "\n"
@@ -7388,14 +7402,14 @@
 "(Free space = %s)"
 msgstr ""
 
-#: src/preferences.c:416
+#: src/preferences.c:408
 msgid ""
 "The temp directory is LiVES working directory where opened clips and sets "
 "are stored.\n"
 "It should be in a partition with plenty of free disk space.\n"
 msgstr ""
 
-#: src/preferences.c:784
+#: src/preferences.c:839
 #, c-format
 msgid ""
 "Unable to create or write to the new temporary directory.\n"
@@ -7406,7 +7420,7 @@
 "The directory will not be changed now.\n"
 msgstr ""
 
-#: src/preferences.c:786
+#: src/preferences.c:843
 #, c-format
 msgid ""
 "Unable to create or write to the new temporary directory.\n"
@@ -7416,7 +7430,7 @@
 "The directory will not be changed now.\n"
 msgstr ""
 
-#: src/preferences.c:798
+#: src/preferences.c:856
 msgid ""
 "You have chosen to change the temporary directory.\n"
 "Please make sure you have no other copies of LiVES open.\n"
@@ -7436,7 +7450,7 @@
 "Ou aperte 'Cancelar' para restaurar o diretório temp para sua configuração "
 "original."
 
-#: src/preferences.c:1169
+#: src/preferences.c:1221
 msgid ""
 "\n"
 "Unable to switch audio players to jack - jackd must be installed first.\n"
@@ -7447,7 +7461,7 @@
 "primeiro.\n"
 "Veja http://jackaudio.org\n"
 
-#: src/preferences.c:1175
+#: src/preferences.c:1226
 msgid ""
 "\n"
 "Switching audio players requires restart (jackd must not be running)\n"
@@ -7455,7 +7469,7 @@
 "\n"
 "Trocar tocador de áudio requer reiniciar (jackd não deve estar rodando)\n"
 
-#: src/preferences.c:1202
+#: src/preferences.c:1253
 msgid ""
 "\n"
 "Unable to switch audio players to pulse audio\n"
@@ -7463,404 +7477,404 @@
 "See http://www.pulseaudio.org\n"
 msgstr ""
 
-#: src/preferences.c:1502
+#: src/preferences.c:1544
 msgid "PCM (highest quality; largest files)"
 msgstr "PCM (qualidade melhor; arquivos maiores)"
 
-#: src/preferences.c:2063
+#: src/preferences.c:2096
 msgid "LiVES: - Preferences"
 msgstr "LiVES: - Preferências"
 
-#: src/preferences.c:2142
+#: src/preferences.c:2177
 msgid "Open file selection maximised"
 msgstr "Abrir janela de seleção de arquivos maximizada"
 
-#: src/preferences.c:2149
+#: src/preferences.c:2184
 msgid "Show recent files in the File menu"
 msgstr "Mostrar arquivos recentes no menu 'Arquivo'"
 
-#: src/preferences.c:2158
+#: src/preferences.c:2193
 msgid "Stop screensaver on playback    "
 msgstr "Parar screensaver quando tocando    "
 
-#: src/preferences.c:2165
+#: src/preferences.c:2200
 msgid "Open main window maximised"
 msgstr "Abrir janela principal maximizada"
 
-#: src/preferences.c:2173
+#: src/preferences.c:2208
 msgid "Show toolbar when background is blanked"
 msgstr "Mostrar barra de ferramentas quando o fundo estiver limpo"
 
-#: src/preferences.c:2181
+#: src/preferences.c:2216
 msgid "Allow mouse wheel to switch clips"
 msgstr ""
 
-#: src/preferences.c:2192
+#: src/preferences.c:2227
 msgid "Shrink previews to fit in interface"
 msgstr ""
 
-#: src/preferences.c:2202
+#: src/preferences.c:2237
 msgid "Startup mode:"
 msgstr "Modo inicial"
 
-#: src/preferences.c:2206
+#: src/preferences.c:2241
 msgid "_Clip editor"
 msgstr "Editor de _clipes"
 
-#: src/preferences.c:2210
+#: src/preferences.c:2245
 msgid "_Multitrack mode"
 msgstr "Modo _multipista"
 
-#: src/preferences.c:2234
+#: src/preferences.c:2268
 msgid "Multi-head support"
 msgstr "Suporte multi-head"
 
-#: src/preferences.c:2242
+#: src/preferences.c:2276
 msgid " monitor number for LiVES interface"
 msgstr " número do monitor para a interface do LiVES"
 
-#: src/preferences.c:2248
+#: src/preferences.c:2282
 msgid " monitor number for playback"
 msgstr " número do monitor para execução"
 
-#: src/preferences.c:2260
+#: src/preferences.c:2294
 msgid ""
 "A setting of 0 means use all available monitors (only works with some "
 "playback plugins)."
 msgstr ""
 
-#: src/preferences.c:2270
+#: src/preferences.c:2304
 msgid "Force single monitor"
 msgstr "Forçar único monitor"
 
-#: src/preferences.c:2271
+#: src/preferences.c:2305
 msgid "Ignore all except the first monitor."
 msgstr ""
 
-#: src/preferences.c:2293
+#: src/preferences.c:2327
 msgid "Show clip thumbnails during playback"
 msgstr ""
 
-#: src/preferences.c:2306
+#: src/preferences.c:2340
 msgid "GUI"
 msgstr "GUI"
 
-#: src/preferences.c:2321
+#: src/preferences.c:2355
 msgid "When entering Multitrack mode:"
 msgstr "Quando entrando no modo multipista"
 
-#: src/preferences.c:2330
+#: src/preferences.c:2364
 msgid "_Prompt me for width, height, fps and audio settings"
 msgstr "_Pergunte-me por configurações de largura, altura, FPS e de áudio"
 
-#: src/preferences.c:2336
+#: src/preferences.c:2370
 msgid "_Always use the following values:"
 msgstr "Sempre use os seguintes v_alores:"
 
-#: src/preferences.c:2345
+#: src/preferences.c:2379
 msgid "Use these same _values for rendering a new clip"
 msgstr "Use os mesmos _valores para renderizar um novo clip"
 
-#: src/preferences.c:2370
+#: src/preferences.c:2404
 msgid "_Width           "
 msgstr "Largura [_W]           "
 
-#: src/preferences.c:2375
+#: src/preferences.c:2409
 msgid "          _Height      "
 msgstr "          Altura [_H]      "
 
-#: src/preferences.c:2379
+#: src/preferences.c:2413
 msgid "          _FPS"
 msgstr ""
 
-#: src/preferences.c:2387
+#: src/preferences.c:2421
 msgid "Enable backing audio track"
 msgstr "Habilitar faixa do áudio de fundo"
 
-#: src/preferences.c:2394
+#: src/preferences.c:2428
 msgid "Audio track per video track"
 msgstr "Trilha de áudio por trilha de vídeo"
 
-#: src/preferences.c:2423
+#: src/preferences.c:2457
 msgid "    _Undo buffer size (MB)    "
 msgstr "    Tamanho do b_uffer de desfazer (MB)    "
 
-#: src/preferences.c:2432
+#: src/preferences.c:2466
 msgid "_Exit multitrack mode after rendering"
 msgstr "Sair do modo multipista depois d_e renderizar"
 
-#: src/preferences.c:2440
+#: src/preferences.c:2474
 msgid "Auto backup layouts"
 msgstr ""
 
-#: src/preferences.c:2445
+#: src/preferences.c:2479
 msgid "_Every"
 msgstr "_Cada"
 
-#: src/preferences.c:2453
+#: src/preferences.c:2487
 msgid "seconds"
 msgstr "segundos"
 
-#: src/preferences.c:2461
+#: src/preferences.c:2495
 msgid "After every _change"
 msgstr "Depois de cada mudança"
 
-#: src/preferences.c:2467
+#: src/preferences.c:2501
 msgid "_Never"
 msgstr "_Nunca"
 
-#: src/preferences.c:2490
+#: src/preferences.c:2523
 msgid "Multitrack/Render"
 msgstr "Multipista/Renderizar"
 
-#: src/preferences.c:2508
+#: src/preferences.c:2541
 msgid "Use instant opening when possible"
 msgstr "Use abertura imediata quando possível"
 
-#: src/preferences.c:2509
+#: src/preferences.c:2543
 msgid "Enable instant opening of some file types using decoder plugins"
 msgstr ""
 "Ativar abertura imediata de alguns tipos de arquivo usando plugins de "
 "decodificação"
 
-#: src/preferences.c:2531
+#: src/preferences.c:2567
 msgid "Video open command (fallback)"
 msgstr ""
 
-#: src/preferences.c:2543
+#: src/preferences.c:2579
 msgid "Open/render compression"
 msgstr ""
 
-#: src/preferences.c:2546
+#: src/preferences.c:2582
 msgid " %     ( lower = slower, larger files; for jpeg, higher quality )"
 msgstr ""
 " %     ( mais baixo = arquivos maiores e mais lentos; para jpeg, melhor "
 "qualidade )"
 
-#: src/preferences.c:2558
+#: src/preferences.c:2594
 msgid "Default image format"
 msgstr ""
 
-#: src/preferences.c:2562
+#: src/preferences.c:2598
 msgid "_jpeg"
 msgstr "_jpeg"
 
-#: src/preferences.c:2565
+#: src/preferences.c:2601
 msgid "_png"
 msgstr "_png"
 
-#: src/preferences.c:2572
+#: src/preferences.c:2608
 msgid "(Check Help/Troubleshoot to see which image formats are supported)"
 msgstr ""
 
-#: src/preferences.c:2580
+#: src/preferences.c:2616
 msgid "Enable automatic deinterlacing when possible"
 msgstr "Ativar desinterlaçamento automático quando possível"
 
-#: src/preferences.c:2582
+#: src/preferences.c:2619
 msgid "Automatically deinterlace frames when a plugin suggests it"
 msgstr "Desinterlaça automaticamente frames quando um plugin o sugerir"
 
-#: src/preferences.c:2593
+#: src/preferences.c:2632
 #, fuzzy
 msgid "Automatic trimming / padding of audio when possible"
 msgstr "Ativar desinterlaçamento automático quando possível"
 
-#: src/preferences.c:2595
+#: src/preferences.c:2634
 #, fuzzy
 msgid "Automatically trim or pad audio when a plugin suggests it"
 msgstr "Desinterlaça automaticamente frames quando um plugin o sugerir"
 
-#: src/preferences.c:2606
+#: src/preferences.c:2646
 msgid "Ignore blank borders when possible"
 msgstr ""
 
-#: src/preferences.c:2608
+#: src/preferences.c:2648
 msgid "Clip any blank borders from frames where possible"
 msgstr ""
 
-#: src/preferences.c:2619
+#: src/preferences.c:2660
 msgid "When opening multiple files, concatenate images into one clip"
 msgstr "Quando abrir múltiplos arquivos, concatene as imagens em um clip"
 
-#: src/preferences.c:2629
+#: src/preferences.c:2670
 msgid "Decoding"
 msgstr "Decodificação"
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:2652
+#: src/preferences.c:2693
 msgid "Low - can improve performance on slower machines"
 msgstr "Baixo - pode melhorar a performance em computadores mais lentos"
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:2654
+#: src/preferences.c:2695
 msgid "Normal - recommended for most users"
 msgstr "Normal - recomendado para a maioria dos usuários"
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:2656
+#: src/preferences.c:2697
 msgid "High - can improve quality on very fast machines"
 msgstr "Alto - pode melhorar a qualidade em computadores muito rápidos"
 
-#: src/preferences.c:2659
+#: src/preferences.c:2700
 msgid "Preview _quality"
 msgstr "_Qualidade de Visualização"
 
-#: src/preferences.c:2660
+#: src/preferences.c:2701
 msgid "The preview quality for video playback - affects resizing"
 msgstr ""
 "A qualidade da pré-visualização da execução de vídeo - afeta o "
 "redimensionamento"
 
-#: src/preferences.c:2675
+#: src/preferences.c:2717
 msgid "_Show FPS statistics"
 msgstr "_Mostrar estatísticas de FPS"
 
-#: src/preferences.c:2694
+#: src/preferences.c:2736
 msgid "_Plugin"
 msgstr "_Plugin"
 
-#: src/preferences.c:2718
+#: src/preferences.c:2760
 msgid "Stream audio"
 msgstr ""
 
-#: src/preferences.c:2721
+#: src/preferences.c:2763
 msgid "Stream audio to playback plugin"
 msgstr ""
 
-#: src/preferences.c:2734
+#: src/preferences.c:2778
 msgid "Record player output"
 msgstr ""
 
-#: src/preferences.c:2737
+#: src/preferences.c:2781
 msgid "Record output from player instead of input to player"
 msgstr ""
 
-#: src/preferences.c:2744
+#: src/preferences.c:2789
 msgid "VIDEO"
 msgstr "VÍDEO"
 
-#: src/preferences.c:2787
+#: src/preferences.c:2833
 msgid "_Player"
 msgstr "Tocador [_P]"
 
-#: src/preferences.c:2792
+#: src/preferences.c:2838
 msgid "(See also the Jack Integration tab for jack startup options)"
 msgstr ""
 
-#: src/preferences.c:2819
+#: src/preferences.c:2865
 msgid "mplayer"
 msgstr "mplayer"
 
-#: src/preferences.c:2830
+#: src/preferences.c:2876
 #, fuzzy
 msgid "mplayer2"
 msgstr "mplayer"
 
-#: src/preferences.c:2833
+#: src/preferences.c:2879
 msgid "Audio play _command"
 msgstr "_Comando para tocar áudio"
 
-#: src/preferences.c:2840
+#: src/preferences.c:2886
 msgid "- internal -"
 msgstr "- interno -"
 
-#: src/preferences.c:2849
+#: src/preferences.c:2895
 msgid "Audio follows video _rate/direction"
 msgstr "Áudio segue a velocidade/di_reção de vídeo"
 
-#: src/preferences.c:2857
+#: src/preferences.c:2903
 msgid "Audio follows _clip switches"
 msgstr "Áudio segue as mudanças de _clipe"
 
-#: src/preferences.c:2864
+#: src/preferences.c:2910
 msgid "Source:"
 msgstr ""
 
-#: src/preferences.c:2868
+#: src/preferences.c:2914
 msgid "_Internal"
 msgstr ""
 
-#: src/preferences.c:2873
+#: src/preferences.c:2919
 msgid "_External (requires jack or pulse audio player)"
 msgstr ""
 
-#: src/preferences.c:2892
+#: src/preferences.c:2940
 msgid "AUDIO"
 msgstr "ÁUDIO"
 
-#: src/preferences.c:2902
+#: src/preferences.c:2950
 msgid "Playback"
 msgstr "Execução"
 
-#: src/preferences.c:2925
+#: src/preferences.c:2973
 msgid ""
 "Record audio when capturing an e_xternal window\n"
 " (requires jack or pulse audio)"
 msgstr ""
 
-#: src/preferences.c:2940
+#: src/preferences.c:2988
 msgid "      What to record when 'r' is pressed   "
 msgstr "      O que gravar quando 'r' for pressionado   "
 
-#: src/preferences.c:2949
+#: src/preferences.c:2997
 msgid "_Frame changes"
 msgstr "Mudanças de _frame"
 
-#: src/preferences.c:2964
+#: src/preferences.c:3012
 msgid "F_PS changes"
 msgstr "Mudanças de F_PS"
 
-#: src/preferences.c:2982
+#: src/preferences.c:3030
 msgid "_Real time effects"
 msgstr "Efeitos em tempo _real"
 
-#: src/preferences.c:2993
+#: src/preferences.c:3041
 msgid "_Clip switches"
 msgstr "Trocas de _clip"
 
-#: src/preferences.c:3004
+#: src/preferences.c:3052
 msgid "_Audio (requires jack or pulse audio player)"
 msgstr ""
 
-#: src/preferences.c:3024
+#: src/preferences.c:3072
 msgid "Pause recording if free disk space falls below"
 msgstr ""
 
 #. TRANSLATORS: gigabytes
-#: src/preferences.c:3030
+#: src/preferences.c:3078
 msgid "GB"
 msgstr "GB"
 
-#: src/preferences.c:3037
+#: src/preferences.c:3085
 msgid "Recording"
 msgstr "Gravando"
 
-#: src/preferences.c:3055
+#: src/preferences.c:3103
 msgid "Encoder"
 msgstr ""
 
-#: src/preferences.c:3090
+#: src/preferences.c:3137
 msgid "Output format"
 msgstr "Formato de saída"
 
-#: src/preferences.c:3106
+#: src/preferences.c:3153
 msgid "Audio codec"
 msgstr "Codec de áudio"
 
-#: src/preferences.c:3119
+#: src/preferences.c:3165
 msgid "Encoding"
 msgstr "Codificação"
 
-#: src/preferences.c:3134
+#: src/preferences.c:3180
 msgid "Use _antialiasing when resizing"
 msgstr "Usar _antialiasing quando redimensionando"
 
-#: src/preferences.c:3143
+#: src/preferences.c:3189
 msgid "Number of _real time effect keys"
 msgstr "Número de efeitos em tempo _real"
 
-#: src/preferences.c:3145
+#: src/preferences.c:3192
 msgid ""
 "The number of \"virtual\" real time effect keys. They can be controlled "
 "through the real time effects window, or via network (OSC)."
@@ -7868,96 +7882,96 @@
 "O número de teclas de efeito em tempo real \"virtuais\". Podem ser "
 "controladas através da janela de efeitos em tempo real, ou via rede (OSC)."
 
-#: src/preferences.c:3152
+#: src/preferences.c:3199
 msgid "Use _threads where possible when applying effects"
 msgstr ""
 
-#: src/preferences.c:3159
+#: src/preferences.c:3207
 msgid "Number of _threads"
 msgstr ""
 
-#: src/preferences.c:3172
+#: src/preferences.c:3221
 msgid "Restart is required if any of the following paths are changed:"
 msgstr ""
 
-#: src/preferences.c:3182
+#: src/preferences.c:3231
 msgid "Weed plugin path"
 msgstr ""
 
-#: src/preferences.c:3184
+#: src/preferences.c:3234
 msgid "Frei0r plugin path"
 msgstr ""
 
-#: src/preferences.c:3186
+#: src/preferences.c:3237
 msgid "LADSPA plugin path"
 msgstr ""
 
-#: src/preferences.c:3209
+#: src/preferences.c:3261
 msgid "      Video load directory (default)      "
 msgstr "      Diretório de vídeo a ser carregado (padrão)      "
 
-#: src/preferences.c:3215
+#: src/preferences.c:3267
 msgid "      Video save directory (default) "
 msgstr "      Diretório de salvar vídeo (padrão) "
 
-#: src/preferences.c:3221
+#: src/preferences.c:3273
 msgid "      Audio load directory (default) "
 msgstr "      Diretório de áudio a ser carregado (padrão) "
 
-#: src/preferences.c:3227
+#: src/preferences.c:3279
 msgid "      Image directory (default) "
 msgstr "      Diretório de imagens (padrão) "
 
-#: src/preferences.c:3233
+#: src/preferences.c:3285
 msgid "      Backup/Restore directory (default) "
 msgstr "      Diretório de Backup/Restauração (padrão) "
 
-#: src/preferences.c:3239
+#: src/preferences.c:3291
 msgid "      Temp directory (do not remove) "
 msgstr "      Diretório temp (não remova) "
 
-#: src/preferences.c:3252
+#: src/preferences.c:3304
 msgid "The default directory for loading video clips from"
 msgstr "O diretório padrão de onde carregar vídeos"
 
-#: src/preferences.c:3277
+#: src/preferences.c:3329
 msgid "The default directory for saving encoded clips to"
 msgstr "O diretório padrão onde salvar vídeos codificados"
 
-#: src/preferences.c:3285
+#: src/preferences.c:3337
 msgid "The default directory for loading and saving audio"
 msgstr "O diretório padrão para carregar e salvar áudio"
 
-#: src/preferences.c:3293
+#: src/preferences.c:3345
 msgid "The default directory for saving frameshots to"
 msgstr "O diretório padrão para salvar amostras de frames"
 
-#: src/preferences.c:3301
+#: src/preferences.c:3353
 msgid "The default directory for backing up/restoring single clips"
 msgstr ""
 "O diretório padrão para fazer backup e restauração de clipes individuais"
 
-#: src/preferences.c:3309
+#: src/preferences.c:3361
 msgid "LiVES working directory."
 msgstr "diretório de trabalho do LiVES."
 
-#: src/preferences.c:3359
+#: src/preferences.c:3412
 msgid "Directories"
 msgstr "Diretórios"
 
-#: src/preferences.c:3374
+#: src/preferences.c:3427
 msgid "Warn if diskspace falls below: "
 msgstr ""
 
-#: src/preferences.c:3380 src/preferences.c:3394
+#: src/preferences.c:3433 src/preferences.c:3447
 msgid " MB [set to 0 to disable]"
 msgstr ""
 
-#: src/preferences.c:3389
+#: src/preferences.c:3442
 msgid "Diskspace critical level: "
 msgstr ""
 
-#: src/preferences.c:3407
+#: src/preferences.c:3461
 msgid ""
 "Warn on Insert / Merge if _frame rate of clipboard does not match frame rate "
 "of selection"
@@ -7965,196 +7979,196 @@
 "Avisar ao Inserir/Mesclar se o _framerate da área de transferência não for "
 "igual ao da seleção"
 
-#: src/preferences.c:3417
+#: src/preferences.c:3471
 msgid "Warn on Open if file _size exceeds "
 msgstr "Avisar ao abrir arquivos de tamanho _superior a "
 
-#: src/preferences.c:3425
+#: src/preferences.c:3479
 msgid " MB"
 msgstr " MB"
 
-#: src/preferences.c:3432
+#: src/preferences.c:3486
 msgid "Show a warning before saving a se_t"
 msgstr "Mostrar um aviso antes de salvar um se_t"
 
-#: src/preferences.c:3442
+#: src/preferences.c:3496
 msgid ""
 "Show a warning if _mplayer/mplayer2, sox, composite or convert is not found "
 "when LiVES is started."
 msgstr ""
 
-#: src/preferences.c:3452
+#: src/preferences.c:3506
 msgid "Show a warning if no _rendered effects are found at startup."
 msgstr ""
 "Mostrar um aviso se nenhum efeito _renderizado for encontrado na "
 "inicialização."
 
-#: src/preferences.c:3464
+#: src/preferences.c:3518
 msgid "Show a warning if no _encoder plugins are found at startup."
 msgstr "Avisar se o  _mplayer não for encontrado quando o LiVES abrir."
 
-#: src/preferences.c:3474
+#: src/preferences.c:3528
 msgid "Show a warning if a _duplicate set name is entered."
 msgstr "Avisar se um nome de set _duplicado for digitado."
 
-#: src/preferences.c:3485
+#: src/preferences.c:3539
 msgid "When a set is loaded, warn if clips are missing from _layouts."
 msgstr ""
 "Quando um set é carregado, avise se clipes estiverem faltando dos _layouts."
 
-#: src/preferences.c:3495
+#: src/preferences.c:3550
 msgid "Warn if a clip used in a layout is about to be closed."
 msgstr "Avise se um clipe usado em um layout está para ser fechado."
 
-#: src/preferences.c:3505
+#: src/preferences.c:3561
 msgid "Warn if frames used in a layout are about to be deleted."
 msgstr "Avise se frames usados em um layout estão perto de serem deletados."
 
-#: src/preferences.c:3515
+#: src/preferences.c:3572
 msgid "Warn if frames used in a layout are about to be shifted."
 msgstr "Avise se frames usados em um layout estão perto de serem movidos."
 
-#: src/preferences.c:3525
+#: src/preferences.c:3583
 msgid "Warn if frames used in a layout are about to be altered."
 msgstr "Avise se fames usados em um layout estão perto de serem alterados."
 
-#: src/preferences.c:3535
+#: src/preferences.c:3594
 msgid "Warn if audio used in a layout is about to be deleted."
 msgstr "Avise se áudio usado em um layout está perto de ser deletado."
 
-#: src/preferences.c:3546
+#: src/preferences.c:3606
 msgid "Warn if audio used in a layout is about to be shifted."
 msgstr "Avise se áudio usado em um layout está perto de ser movido."
 
-#: src/preferences.c:3556
+#: src/preferences.c:3617
 msgid "Warn if audio used in a layout is about to be altered."
 msgstr "Avise se áudio usado em um layout está perto de ser alterado."
 
-#: src/preferences.c:3566
+#: src/preferences.c:3628
 msgid "Popup layout errors after clip changes."
 msgstr ""
 
-#: src/preferences.c:3577
+#: src/preferences.c:3639
 msgid "Warn if the layout has not been saved when leaving multitrack mode."
 msgstr "Avise se um layout não estiver salvo ao sair do modo multipista."
 
-#: src/preferences.c:3588
+#: src/preferences.c:3650
 msgid ""
 "Warn if multitrack has no audio channels, and a layout with audio is loaded."
 msgstr ""
 "Avisar se multipista não tem canais de áudio e o layout com áudio está "
 "carregado."
 
-#: src/preferences.c:3598
+#: src/preferences.c:3660
 msgid ""
 "Warn if multitrack has audio channels, and your audio player is not \"jack\" "
 "or \"pulse audio\"."
 msgstr ""
 
-#: src/preferences.c:3610
+#: src/preferences.c:3672
 msgid "Show info message after importing from firewire device."
 msgstr ""
 "Mostrar mensagem de informação depois de importar de dispositivo firewire."
 
-#: src/preferences.c:3626
+#: src/preferences.c:3688
 msgid "Show a warning before opening a yuv4mpeg stream (advanced)."
 msgstr "Mostrar um aviso antes de abrir um stream yuv4mpeg (avançado)."
 
-#: src/preferences.c:3639
+#: src/preferences.c:3701
 msgid "Show a warning when multitrack is low on backup space."
 msgstr ""
 "Mostrar um aviso quando houver pouco espaço em disco no modo multipista."
 
-#: src/preferences.c:3650
+#: src/preferences.c:3713
 msgid "Show a warning advising cleaning of disk space after a crash."
 msgstr ""
 
-#: src/preferences.c:3661
+#: src/preferences.c:3725
 msgid "Show a warning if unable to connect to pulseaudio player."
 msgstr ""
 
-#: src/preferences.c:3673
+#: src/preferences.c:3737
 #, fuzzy
 msgid "Show a warning before wiping a layout which has unsaved changes."
 msgstr "Mostrar um aviso antes de abrir um stream yuv4mpeg (avançado)."
 
-#: src/preferences.c:3685
+#: src/preferences.c:3749
 msgid "Warnings"
 msgstr "Avisos"
 
-#: src/preferences.c:3703
+#: src/preferences.c:3767
 msgid "Midi synch (requires the files midistart and midistop)"
 msgstr "Sincronia MIDI (requer os arquivos midistart e midistop)"
 
-#: src/preferences.c:3715
+#: src/preferences.c:3779
 msgid "When inserting/merging frames:  "
 msgstr "Quando inserindo/mesclando frames:  "
 
-#: src/preferences.c:3719
+#: src/preferences.c:3783
 msgid "_Speed Up/Slow Down Insertion"
 msgstr "Aumentar/Diminuir Velocidade da In_serção"
 
-#: src/preferences.c:3723
+#: src/preferences.c:3787
 msgid "_Resample Insertion"
 msgstr "_Resamplear Inserção"
 
-#: src/preferences.c:3730
+#: src/preferences.c:3794
 msgid "CD device           "
 msgstr "Dispositivo de CD           "
 
-#: src/preferences.c:3733
+#: src/preferences.c:3797
 msgid "LiVES can load audio tracks from this CD"
 msgstr "LiVES pode carregar faixas de áudio deste CD"
 
-#: src/preferences.c:3746
+#: src/preferences.c:3813
 msgid "Default FPS        "
 msgstr "FPS padrão        "
 
-#: src/preferences.c:3749
+#: src/preferences.c:3816
 msgid "Frames per second to use when none is specified"
 msgstr "Frames por segundo para usar se nenhum for especificado"
 
-#: src/preferences.c:3757
+#: src/preferences.c:3825
 msgid "Misc"
 msgstr "Misc"
 
-#: src/preferences.c:3782
+#: src/preferences.c:3850
 msgid "New theme:           "
 msgstr "Novo tema:           "
 
-#: src/preferences.c:3800
+#: src/preferences.c:3867
 msgid "Themes"
 msgstr "Temas"
 
-#: src/preferences.c:3815
+#: src/preferences.c:3882
 msgid "Download bandwidth (Kb/s)       "
 msgstr "Velocidade de download (Kb/s)       "
 
-#: src/preferences.c:3823
+#: src/preferences.c:3890
 msgid "LiVES must be compiled without \"configure --disable-OSC\" to use OMC"
 msgstr "LiVES deve ser compilado sem \"configure --disable-OSC\" para usar OMC"
 
-#: src/preferences.c:3833
+#: src/preferences.c:3900
 msgid "OMC remote control enabled"
 msgstr "Controle remoto OMC ativado"
 
-#: src/preferences.c:3841
+#: src/preferences.c:3908
 msgid "UDP port       "
 msgstr "Porta UDP       "
 
-#: src/preferences.c:3850
+#: src/preferences.c:3917
 msgid "Start OMC on startup"
 msgstr "Iniciar OMC ao abrir"
 
-#: src/preferences.c:3870
+#: src/preferences.c:3937
 msgid "Streaming/Networking"
 msgstr "Streaming/Networking"
 
-#: src/preferences.c:3882
+#: src/preferences.c:3949
 msgid "Jack transport"
 msgstr "Transporte"
 
-#: src/preferences.c:3886
+#: src/preferences.c:3953
 msgid ""
 "LiVES must be compiled with jack/transport.h and jack/jack.h present to use "
 "jack transport"
@@ -8162,44 +8176,44 @@
 "LiVES deve ser compilado com jack/transport.h e jack/jack.h presentes para "
 "usar transporte jack"
 
-#: src/preferences.c:3892
+#: src/preferences.c:3959
 msgid "Jack _transport config file"
 msgstr "Arquivo de configuração do _transporte jack"
 
-#: src/preferences.c:3899 src/preferences.c:3989
+#: src/preferences.c:3967 src/preferences.c:4058
 msgid "Start _server on LiVES startup"
 msgstr "Iniciar _servidor junto com o LiVES"
 
-#: src/preferences.c:3911
+#: src/preferences.c:3979
 msgid "Jack transport _master (start and stop)"
 msgstr ""
 
-#: src/preferences.c:3921
+#: src/preferences.c:3989
 msgid "Jack transport _client (start and stop)"
 msgstr ""
 
-#: src/preferences.c:3935
+#: src/preferences.c:4003
 msgid "Jack transport sets start position"
 msgstr ""
 
-#: src/preferences.c:3952
+#: src/preferences.c:4020
 msgid "Jack transport timebase slave"
 msgstr ""
 
-#: src/preferences.c:3963
+#: src/preferences.c:4031
 msgid "(See also Playback -> Audio follows video rate/direction)"
 msgstr ""
 
-#: src/preferences.c:3971
+#: src/preferences.c:4039
 msgid "Jack audio"
 msgstr "Áudio"
 
-#: src/preferences.c:3975
+#: src/preferences.c:4043
 msgid "LiVES must be compiled with jack/jack.h present to use jack audio"
 msgstr ""
 "LiVES deve ser compilado com jack/jack.h presente para usar áudio do jack"
 
-#: src/preferences.c:3978
+#: src/preferences.c:4046
 msgid ""
 "You MUST set the audio player to \"jack\" in the Playback tab to use jack "
 "audio"
@@ -8207,75 +8221,75 @@
 "Você DEVE escolher o tocador de áudio \"jack\" na aba Execução para usar "
 "áudio do jack"
 
-#: src/preferences.c:3984
+#: src/preferences.c:4052
 msgid "Jack _audio server config file"
 msgstr "_Arquivo de configuração do servidor de áudio jack"
 
-#: src/preferences.c:3996
+#: src/preferences.c:4065
 msgid "Play audio even when transport is _paused"
 msgstr ""
 
-#: src/preferences.c:4008
+#: src/preferences.c:4077
 msgid "Automatically connect to System Out ports when 'playing' External Audio"
 msgstr ""
 
-#: src/preferences.c:4021
+#: src/preferences.c:4090
 msgid "Jack Integration"
 msgstr "Integração com jack"
 
-#: src/preferences.c:4035
+#: src/preferences.c:4104
 msgid "Events to respond to:"
 msgstr "Eventos a responder para:"
 
-#: src/preferences.c:4044
+#: src/preferences.c:4113
 msgid "_Joystick events"
 msgstr "Eventos do _Joystick"
 
-#: src/preferences.c:4051
+#: src/preferences.c:4120
 msgid "_Joystick device"
 msgstr "Dispositivos _Joystick"
 
-#: src/preferences.c:4053
+#: src/preferences.c:4122
 msgid "The joystick device, e.g. /dev/input/js0"
 msgstr "O dispositivo de Joystick, ex. /dev/input/js0"
 
-#: src/preferences.c:4071
+#: src/preferences.c:4142
 msgid "_MIDI events"
 msgstr "Eventos _MIDI"
 
-#: src/preferences.c:4080
+#: src/preferences.c:4151
 msgid "Use _ALSA MIDI (recommended)"
 msgstr "Use _ALSA MIDI (recomendado)"
 
-#: src/preferences.c:4082
+#: src/preferences.c:4153
 msgid "Create an ALSA MIDI port which other MIDI devices can be connected to"
 msgstr ""
 
-#: src/preferences.c:4090
+#: src/preferences.c:4162
 msgid "Use _raw MIDI"
 msgstr "Usar _raw MIDI"
 
-#: src/preferences.c:4092
+#: src/preferences.c:4164
 msgid "Read directly from the MIDI device"
 msgstr "Ler diretamente de um dispositivo MIDI"
 
-#: src/preferences.c:4104
+#: src/preferences.c:4177
 msgid "_MIDI device"
 msgstr "Dispositivo _MIDI"
 
-#: src/preferences.c:4106
+#: src/preferences.c:4179
 msgid "The MIDI device, e.g. /dev/input/midi0"
 msgstr "/dev/input/midi0O dispositivo MIDI, ex."
 
-#: src/preferences.c:4118
+#: src/preferences.c:4193
 msgid "Advanced"
 msgstr "Avançado"
 
-#: src/preferences.c:4124
+#: src/preferences.c:4199
 msgid "MIDI check _rate"
 msgstr "Checar _Taxa do MIDI"
 
-#: src/preferences.c:4127
+#: src/preferences.c:4203
 msgid ""
 "Number of MIDI checks per keyboard tick. Increasing this may improve MIDI "
 "responsiveness, but may slow down playback."
@@ -8283,25 +8297,25 @@
 "Número de checagens por mensagem do teclado. Aumentar vai melhorar a "
 "resposta da MIDI, mas pode diminuir o tempo de resposta."
 
-#: src/preferences.c:4134
+#: src/preferences.c:4211
 msgid "MIDI repeat"
 msgstr "Repetição do MIDI"
 
-#: src/preferences.c:4137
+#: src/preferences.c:4214
 msgid "Number of non-reads allowed between succesive reads."
 msgstr "Número de não-leituras permitidas entre sucessivas leituras."
 
-#: src/preferences.c:4140
+#: src/preferences.c:4218
 msgid "(Warning: setting this value too high can slow down playback.)"
 msgstr ""
 "(Aviso: definir este valor alto demais poder diminuir a velocidade de "
 "reprodução.)"
 
-#: src/preferences.c:4159
+#: src/preferences.c:4237
 msgid "MIDI/Joystick learner"
 msgstr "Aprendizado do MIDI/Joystick"
 
-#: src/preferences.c:4499
+#: src/preferences.c:4679
 msgid ""
 "\n"
 "LiVES will now shut down. You need to restart it for the directory change to "
@@ -8313,70 +8327,70 @@
 "diretório tenha efeito.\n"
 "Clique OK para continuar.\n"
 
-#: src/preferences.c:4523
+#: src/preferences.c:4703
 msgid ""
 "For the directory change to take effect LiVES will restart when preferences "
 "dialog closes."
 msgstr ""
 
-#: src/preferences.c:4527
+#: src/preferences.c:4707
 msgid "Theme changes will not take effect until the next time you start LiVES."
 msgstr ""
 "Mudanças de tema só surtirão efeito na próxima vez que o LiVES foi iniciado."
 
-#: src/preferences.c:4531
+#: src/preferences.c:4711
 msgid "Jack options will not take effect until the next time you start LiVES."
 msgstr ""
 "As opções do jack só surtirão efeito da próxima vez que o LiVES for iniciado."
 
-#: src/osc.c:2585
+#: src/osc.c:2616
 #, c-format
 msgid "Syncing to external framerate of %.8f frames per second.\n"
 msgstr "Sincronizando ao framerate externo de %.8f FPS.\n"
 
-#: src/osc.c:6746
+#: src/osc.c:6938
 msgid "Cannot initialize OSC receiver\n"
 msgstr "Impossível inicializar receptor OSC\n"
 
-#: src/osc.c:6770
+#: src/osc.c:6961
 #, c-format
 msgid "WARNING: Cannot start OSC server at UDP port %d\n"
 msgstr "AVISO: Não foi possível iniciar o servidor OSC na porta UDP %d\n"
 
-#: src/osc.c:6775
+#: src/osc.c:6963
 #, c-format
 msgid "Started OSC server at UDP port %d\n"
 msgstr "Servidor OSC iniciado na porta UDP %d\n"
 
-#: src/osc.c:6890
+#: src/osc.c:7076
 #, c-format
 msgid "Cannot start OSC/UDP server at port %d \n"
 msgstr "Não foi possivel iniciar servidor OSC/UDP na porta %d \n"
 
-#: src/resample.c:125 src/resample.c:304
+#: src/resample.c:131 src/resample.c:305
 #, c-format
 msgid "Resizing frames 1 to %d"
 msgstr "Redimensionando frames 1 até %d"
 
-#: src/resample.c:140 src/resample.c:318
+#: src/resample.c:145 src/resample.c:318
 #, c-format
 msgid "Resizing/letterboxing frames 1 to %d"
 msgstr ""
 
-#: src/resample.c:361 src/resample.c:385
+#: src/resample.c:360 src/resample.c:384
 msgid "Resize"
 msgstr "Redimensionar"
 
-#: src/resample.c:395
+#: src/resample.c:394
 msgid "Resample/Resize"
 msgstr "Resamplear/Redimensionar"
 
-#: src/resample.c:680
+#: src/resample.c:676
 #, c-format
 msgid "Length of video is now %d frames.\n"
 msgstr "Comprimento do vídeo é agora de %d frames.\n"
 
-#: src/resample.c:745
+#: src/resample.c:737
 msgid ""
 "\n"
 "\n"
@@ -8386,146 +8400,146 @@
 "\n"
 "A nova taxa deve ser maior que 0\n"
 
-#: src/resample.c:797 src/resample.c:813
+#: src/resample.c:788 src/resample.c:803
 msgid "Resampling audio"
 msgstr "Resampleando áudio"
 
-#: src/resample.c:831
+#: src/resample.c:821
 msgid "LiVES was unable to resample the audio as requested.\n"
 msgstr "LiVES não conseguiu resamplear o áudio como requisitado.\n"
 
-#: src/resample.c:833 src/resample.c:837
+#: src/resample.c:823 src/resample.c:827
 msgid "Resample Audio"
 msgstr "Resamplear Áudio"
 
-#: src/resample.c:845
+#: src/resample.c:835
 #, c-format
 msgid "Audio was resampled to %d Hz, %d channels, %d bit"
 msgstr "Áudio resampleado a %d Hz, %d canais, %d bit"
 
-#: src/resample.c:1034
+#: src/resample.c:1016
 #, c-format
 msgid "Resampling video at %.8f frames per second..."
 msgstr "Resampleando vídeo a %.8f frames por segundo..."
 
-#: src/resample.c:1037
+#: src/resample.c:1018
 #, c-format
 msgid "Resampling video at %.3f frames per second..."
 msgstr "Resampleando vídeo a %.3f frames por segundo..."
 
-#: src/resample.c:1068
+#: src/resample.c:1049
 msgid "Reordering error !\n"
 msgstr "Erro de reordenação!\n"
 
-#: src/resample.c:1079
+#: src/resample.c:1060
 msgid "Resample"
 msgstr "Resamplear"
 
-#: src/resample.c:1192
+#: src/resample.c:1173
 msgid "LiVES: - Resample Audio"
 msgstr "LiVES: - Resamplear Áudio"
 
-#: src/resample.c:1195
+#: src/resample.c:1175
 msgid "LiVES: - Insert Silence"
 msgstr "LiVES: - Inserir Silêncio"
 
-#: src/resample.c:1198
+#: src/resample.c:1177
 msgid "LiVES: - New Clip Audio"
 msgstr "LiVES: - Novo Clip de Áudio"
 
-#: src/resample.c:1201
+#: src/resample.c:1179
 msgid "LiVES: - External Clip Settings"
 msgstr "LiVES: - Configurações Externas de Clipe"
 
-#: src/resample.c:1238 src/resample.c:1358
+#: src/resample.c:1215 src/resample.c:1332
 msgid "Rate (Hz) "
 msgstr "Taxa (Hz) "
 
-#: src/resample.c:1245 src/resample.c:1372
+#: src/resample.c:1222 src/resample.c:1346
 msgid "Channels"
 msgstr ""
 
-#: src/resample.c:1252
+#: src/resample.c:1229
 msgid "Sample Size "
 msgstr ""
 
-#: src/resample.c:1268 src/resample.c:1425
+#: src/resample.c:1245 src/resample.c:1399
 msgid "Signed"
 msgstr "Assinalado"
 
-#: src/resample.c:1274 src/resample.c:1435
+#: src/resample.c:1251 src/resample.c:1409
 msgid "Unsigned"
 msgstr "Não-assinalado"
 
-#: src/resample.c:1297 src/resample.c:1460
+#: src/resample.c:1273 src/resample.c:1433
 msgid "Little Endian"
 msgstr "Little Endian"
 
-#: src/resample.c:1303 src/resample.c:1468
+#: src/resample.c:1279 src/resample.c:1441
 msgid "Big Endian"
 msgstr "Big Endian"
 
-#: src/resample.c:1315
+#: src/resample.c:1290
 msgid "Current"
 msgstr "Atual"
 
-#: src/resample.c:1340
+#: src/resample.c:1315
 msgid "_Enable audio"
 msgstr "Habilitar áudio [_e]"
 
-#: src/resample.c:1372
+#: src/resample.c:1346
 msgid "_Channels"
 msgstr ""
 
-#: src/resample.c:1394
+#: src/resample.c:1368
 msgid "_Sample Size"
 msgstr ""
 
-#: src/resample.c:1394
+#: src/resample.c:1368
 msgid "Sample Size"
 msgstr ""
 
-#: src/resample.c:1489
+#: src/resample.c:1461
 msgid "New"
 msgstr "Novo"
 
-#: src/resample.c:1512
+#: src/resample.c:1484
 msgid "_Frames Per Second "
 msgstr "_Frames por segundo (FPS) "
 
-#: src/resample.c:1530
+#: src/resample.c:1502
 msgid "Record for maximum:  "
 msgstr "Gravar para máximo:  "
 
-#: src/resample.c:1533
+#: src/resample.c:1505
 msgid " hours  "
 msgstr " horass  "
 
-#: src/resample.c:1536
+#: src/resample.c:1508
 msgid " minutes  "
 msgstr " minutos  "
 
-#: src/resample.c:1538
+#: src/resample.c:1510
 msgid " seconds  "
 msgstr " segundos  "
 
-#: src/resample.c:1545
+#: src/resample.c:1517
 msgid "Unlimited"
 msgstr "Ilimitado"
 
-#: src/resample.c:1561
+#: src/resample.c:1533
 msgid "Click OK to begin recording, or Cancel to quit."
 msgstr "Clique OK para começar a gravar ou Cancelar para sair."
 
-#: src/resample.c:1670
+#: src/resample.c:1638
 msgid "LiVES: - Change playback speed"
 msgstr "Tocar"
 
-#: src/resample.c:1673
+#: src/resample.c:1640
 msgid "LiVES: - Resample Video"
 msgstr "LiVES: - Resamplear Vídeo"
 
-#: src/resample.c:1696
+#: src/resample.c:1663
 #, c-format
 msgid ""
 "\n"
@@ -8542,7 +8556,7 @@
 "Por favor digite o framerate desejado\n"
 "em _frames por segundo"
 
-#: src/resample.c:1701
+#: src/resample.c:1667
 #, c-format
 msgid ""
 "\n"
@@ -8559,15 +8573,15 @@
 "Por favor digite o framerate desejado para _resamplear\n"
 "em frames por segundo"
 
-#: src/resample.c:1723
+#: src/resample.c:1688
 msgid "OR enter the desired clip length in _seconds"
 msgstr "OU entre a duração do arquivo em _segundos"
 
-#: src/resample.c:1745
+#: src/resample.c:1710
 msgid "Change the _audio speed as well"
 msgstr "Mudar _a velocidade do áudio também"
 
-#: src/resample.c:1846
+#: src/resample.c:1810
 msgid ""
 "\n"
 "Speeding up the clip will cause missing frames in some multitrack layouts.\n"
@@ -8578,7 +8592,7 @@
 "layouts multipista.\n"
 "Tem certeza que quer mudar a velocidade?\n"
 
-#: src/resample.c:1863
+#: src/resample.c:1829
 msgid ""
 "\n"
 "Speeding up the clip will cause missing audio in some multitrack layouts.\n"
@@ -8589,47 +8603,47 @@
 "layouts multipista.\n"
 "Tem certeza que quer mudar a velocidade?\n"
 
-#: src/resample.c:1878
+#: src/resample.c:1847
 msgid ""
 "\n"
 "Changing the speed will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/resample.c:1892
+#: src/resample.c:1863
 msgid ""
 "\n"
 "Changing the speed will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/resample.c:1938
+#: src/resample.c:1911
 msgid "Speed Change"
 msgstr "Mudança de Velocidade"
 
-#: src/resample.c:1947
+#: src/resample.c:1920
 #, c-format
 msgid "Changed playback speed to %.3f frames per second and audio to %d Hz.\n"
 msgstr "Velocidade de execução modificada para %.3f fps e áudio para %d Hz.\n"
 
-#: src/resample.c:1950
+#: src/resample.c:1922
 #, c-format
 msgid "Changed playback speed to %.3f frames per second.\n"
 msgstr "Velocidade de execução modificada para %.3f fps.\n"
 
-#: src/resample.c:2035
+#: src/resample.c:2006
 msgid "Resampling video"
 msgstr "Resampleando vídeo"
 
-#: src/resample.c:2042 src/resample.c:2160 src/resample.c:2182
+#: src/resample.c:2012 src/resample.c:2127 src/resample.c:2148
 msgid "Resampling clipboard video"
 msgstr "Resampleando vídeo da area de transferência"
 
-#: src/resample.c:2047
+#: src/resample.c:2016
 msgid "Reordering frames"
 msgstr "Reordenando frames"
 
-#: src/resample.c:2056
+#: src/resample.c:2025
 msgid ""
 "\n"
 "\n"
@@ -8639,20 +8653,20 @@
 "\n"
 "LiVES foi incapaz de reordenar os frames."
 
-#: src/resample.c:2104
+#: src/resample.c:2071
 msgid "Deordering frames"
 msgstr "Desordenando frames"
 
-#: src/resample.c:2199
+#: src/resample.c:2165
 msgid "resampling error..."
 msgstr "erro de sampling..."
 
-#: src/rte_window.c:85 src/rte_window.c:1708
+#: src/rte_window.c:124 src/rte_window.c:1709
 #, c-format
 msgid "Type: %s"
 msgstr "Tipo: %s"
 
-#: src/rte_window.c:112
+#: src/rte_window.c:150
 msgid ""
 "\n"
 "\n"
@@ -8668,7 +8682,7 @@
 "Tem certeza?\n"
 "\n"
 
-#: src/rte_window.c:426
+#: src/rte_window.c:460
 msgid ""
 "\n"
 "\n"
@@ -8680,12 +8694,12 @@
 "Aperte 'OK' para salvar este mapa de teclado como padrão\n"
 "\n"
 
-#: src/rte_window.c:432
+#: src/rte_window.c:466
 #, c-format
 msgid "Saving keymap to %s\n"
 msgstr "Salvando mapa de teclado em %s\n"
 
-#: src/rte_window.c:439
+#: src/rte_window.c:471
 #, c-format
 msgid ""
 "\n"
@@ -8694,7 +8708,7 @@
 "\n"
 "Atualizando arquivo de mapa de teclado %s..."
 
-#: src/rte_window.c:446
+#: src/rte_window.c:477
 #, c-format
 msgid ""
 "\n"
@@ -8704,12 +8718,12 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/rte_window.c:526
+#: src/rte_window.c:556
 #, c-format
 msgid "Saving real time effect defaults to %s..."
 msgstr "Salvando padrão de efeitos em tempo-real para %s..."
 
-#: src/rte_window.c:535
+#: src/rte_window.c:563
 #, c-format
 msgid ""
 "\n"
@@ -8724,22 +8738,22 @@
 "%s\n"
 "Erro %d\n"
 
-#: src/rte_window.c:632
+#: src/rte_window.c:657
 #, c-format
 msgid "Loading real time effect defaults from %s..."
 msgstr "Carregando padrão de efeitos tempo-real de %s..."
 
-#: src/rte_window.c:681
+#: src/rte_window.c:701
 #, c-format
 msgid "Loading generator default sizes from %s..."
 msgstr "Carregando tamanhos padrão no gerador de %s..."
 
-#: src/rte_window.c:1306
+#: src/rte_window.c:1319
 #, c-format
 msgid "Loading default keymap from %s..."
 msgstr "Carregando mapa de teclado padrão de %s..."
 
-#: src/rte_window.c:1329
+#: src/rte_window.c:1339
 #, c-format
 msgid ""
 "\n"
@@ -8754,27 +8768,27 @@
 "%s\n"
 "Erro %d\n"
 
-#: src/rte_window.c:1403
+#: src/rte_window.c:1412
 #, c-format
 msgid "Invalid line %d in %s\n"
 msgstr "Linha inválida %d em %s\n"
 
-#: src/rte_window.c:1483
+#: src/rte_window.c:1490
 #, c-format
 msgid "Invalid key %d in %s\n"
 msgstr "Chave inválida %d em %s\n"
 
-#: src/rte_window.c:1498
+#: src/rte_window.c:1505
 #, c-format
 msgid "Invalid effect %s in %s\n"
 msgstr "Efeito inválido %s em %s\n"
 
-#: src/rte_window.c:1517
+#: src/rte_window.c:1524
 #, c-format
 msgid "Unknown effect %s in %s\n"
 msgstr ""
 
-#: src/rte_window.c:1535
+#: src/rte_window.c:1542
 #, c-format
 msgid ""
 "This version of LiVES cannot mix generators/non-generators on the same key "
@@ -8783,21 +8797,21 @@
 "Esta versão de LiVES não pode misturar geradores/não-geradores na mesma "
 "tecla (%d) !\n"
 
-#: src/rte_window.c:1547
+#: src/rte_window.c:1554
 #, c-format
 msgid "Too many effects bound to key %d.\n"
 msgstr "Muitos efeitos ligados à tecla %d.\n"
 
-#: src/rte_window.c:1587
+#: src/rte_window.c:1593
 msgid "update required.\n"
 msgstr "atualização requerida.\n"
 
-#: src/rte_window.c:1603
+#: src/rte_window.c:1607
 #, c-format
 msgid "Loading data connection map from %s..."
 msgstr ""
 
-#: src/rte_window.c:1612
+#: src/rte_window.c:1614
 msgid ""
 "\n"
 "\n"
@@ -8809,41 +8823,41 @@
 "Alguns efeitos não puderam ser localizados.\n"
 "\n"
 
-#: src/rte_window.c:1691
+#: src/rte_window.c:1692
 #, c-format
 msgid "LiVES: Information for %s"
 msgstr "LiVES: Informação para %s"
 
-#: src/rte_window.c:1704
+#: src/rte_window.c:1705
 #, c-format
 msgid "Effect name: %s"
 msgstr "Nome do efeito: %s"
 
-#: src/rte_window.c:1712
+#: src/rte_window.c:1713
 #, c-format
 msgid "Plugin name: %s"
 msgstr "Nome do plugin: %s"
 
-#: src/rte_window.c:1716
+#: src/rte_window.c:1717
 #, c-format
 msgid "Author: %s"
 msgstr "Autor: %s"
 
-#: src/rte_window.c:1721
+#: src/rte_window.c:1722
 #, c-format
 msgid "and: %s"
 msgstr ""
 
-#: src/rte_window.c:1726
+#: src/rte_window.c:1727
 #, c-format
 msgid "Version: %d"
 msgstr "Versão: %d"
 
-#: src/rte_window.c:1734
+#: src/rte_window.c:1735
 msgid "Description: "
 msgstr "Descrição: "
 
-#: src/rte_window.c:1960
+#: src/rte_window.c:1963
 msgid ""
 "\n"
 "\n"
@@ -8857,69 +8871,69 @@
 "tecla.\n"
 "\n"
 
-#: src/rte_window.c:2024
+#: src/rte_window.c:2027
 #, c-format
 msgid "LiVES could not locate the effect %s.\n"
 msgstr "LiVES não pode localizar o efeito %s.\n"
 
-#: src/rte_window.c:2225
+#: src/rte_window.c:2216
 msgid "LiVES: Real time effect mapping"
 msgstr "LiVES: Mapeamento de Efeitos em Tempo-Real"
 
-#: src/rte_window.c:2257
+#: src/rte_window.c:2248
 #, c-format
 msgid "Ctrl-%d"
 msgstr "Ctrl-%d"
 
-#: src/rte_window.c:2264
+#: src/rte_window.c:2255
 msgid "Key active"
 msgstr "Tecla ativa"
 
-#: src/rte_window.c:2279
+#: src/rte_window.c:2271
 msgid "Key grab"
 msgstr "Pegar tecla"
 
-#: src/rte_window.c:2280
+#: src/rte_window.c:2272
 msgid "Grab keyboard for this effect key"
 msgstr "Trave o teclado para essa tecla de efeito"
 
-#: src/rte_window.c:2290
+#: src/rte_window.c:2283
 msgid "_Clear all effects"
 msgstr "Limpar todos efeitos [_C]"
 
-#: src/rte_window.c:2304
+#: src/rte_window.c:2297
 msgid "Mode active"
 msgstr "Modo ativo"
 
-#: src/rte_window.c:2314 src/multitrack.c:8568
+#: src/rte_window.c:2307 src/multitrack.c:8762
 msgid "Info"
 msgstr "Info"
 
-#: src/rte_window.c:2315
+#: src/rte_window.c:2308
 msgid "Set Parameters"
 msgstr "Atribuir parâmetros"
 
-#: src/rte_window.c:2316
+#: src/rte_window.c:2309
 msgid "Set Connections"
 msgstr ""
 
-#: src/rte_window.c:2317
+#: src/rte_window.c:2310
 msgid "Clear"
 msgstr "Limpar"
 
-#: src/rte_window.c:2326
+#: src/rte_window.c:2319
 msgid "Effect name:"
 msgstr "Nome do efeito:"
 
-#: src/rte_window.c:2391
+#: src/rte_window.c:2384
 msgid "_Save as default keymap"
 msgstr "_Salvar como mapa de teclado padrão"
 
-#: src/rte_window.c:2396
+#: src/rte_window.c:2389
 msgid "_Load default keymap"
 msgstr "Carregar mapa de teclado padrão [_L]"
 
-#: src/rte_window.c:2840
+#: src/rte_window.c:2833
 #, c-format
 msgid ""
 "Unable to create default keymap file: %s\n"
@@ -8980,7 +8994,7 @@
 msgid "none\n"
 msgstr "nenhum\n"
 
-#: src/lives-yuv4mpeg.c:494
+#: src/lives-yuv4mpeg.c:493
 #, c-format
 msgid ""
 "Unable to set display framerate to %.3f fps.\n"
@@ -8989,79 +9003,79 @@
 "Impossível definir velocidade de visualização em %.3f fps.\n"
 "\n"
 
-#: src/lives-yuv4mpeg.c:503
+#: src/lives-yuv4mpeg.c:502
 #, c-format
 msgid "Unable to open yuv4mpeg out stream %s\n"
 msgstr "Impossível abrir stream yuv4mpeg %s\n"
 
-#: src/lives-yuv4mpeg.c:628
+#: src/lives-yuv4mpeg.c:626
 #, c-format
 msgid "TV card %d"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:713
+#: src/lives-yuv4mpeg.c:710
 #, c-format
 msgid "Opened TV card %d (%s)"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:760
+#: src/lives-yuv4mpeg.c:757
 #, c-format
 msgid "Firewire card %d"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:796
+#: src/lives-yuv4mpeg.c:793
 #, c-format
 msgid "Opened firewire card %d"
 msgstr ""
 
-#: src/multitrack.c:666
+#: src/multitrack.c:736
 msgid "Auto backup"
 msgstr ""
 
-#: src/multitrack.c:868
+#: src/multitrack.c:935
 msgid "Backing audio"
 msgstr "Áudio de fundo"
 
-#: src/multitrack.c:1435
+#: src/multitrack.c:1515
 #, fuzzy, c-format
 msgid "%s : parameters for %s"
 msgstr "Sem parâmetros"
 
-#: src/multitrack.c:1809 src/multitrack.c:3483
+#: src/multitrack.c:1881 src/multitrack.c:3635
 #, c-format
 msgid "Current track: %s (layer %d)\n"
 msgstr "Faixa selecionada: %s (camada %d)\n"
 
-#: src/multitrack.c:1813 src/multitrack.c:3484
+#: src/multitrack.c:1885 src/multitrack.c:3637
 msgid "Current track: Backing audio\n"
 msgstr "Faixa atual: Áudio de fundo\n"
 
-#: src/multitrack.c:1814
+#: src/multitrack.c:1886
 #, c-format
 msgid "Current track: Layer %d audio\n"
 msgstr "Faixa selecionada: camada %d\n"
 
-#: src/multitrack.c:1817
+#: src/multitrack.c:1889
 #, c-format
 msgid "%.2f sec.\n"
 msgstr "%.2f seg.\n"
 
-#: src/multitrack.c:1822 src/multitrack.c:3490
+#: src/multitrack.c:1894 src/multitrack.c:3643
 #, c-format
 msgid "Source: %s"
 msgstr "Fonte: %s"
 
-#: src/multitrack.c:1825 src/multitrack.c:3492
+#: src/multitrack.c:1897 src/multitrack.c:3645
 msgid "Right click for context menu.\n"
 msgstr "Clique com o botão direito para menu.\n"
 
-#: src/multitrack.c:1827
+#: src/multitrack.c:1899
 msgid ""
 "Double click on a block\n"
 "to select it."
 msgstr ""
 
-#: src/multitrack.c:3312
+#: src/multitrack.c:3452
 msgid ""
 "\n"
 "\n"
@@ -9070,7 +9084,7 @@
 "right or double clicking on it.\n"
 msgstr ""
 
-#: src/multitrack.c:3315
+#: src/multitrack.c:3455
 msgid ""
 "\n"
 "\n"
@@ -9078,7 +9092,7 @@
 "Select an effect in FX stack first to view its parameters.\n"
 msgstr ""
 
-#: src/multitrack.c:3318
+#: src/multitrack.c:3458
 msgid ""
 "\n"
 "\n"
@@ -9088,7 +9102,7 @@
 "\n"
 "Sem clipes.\n"
 
-#: src/multitrack.c:3321
+#: src/multitrack.c:3462
 msgid ""
 "You must select two video tracks\n"
 "and a time region\n"
@@ -9098,7 +9112,7 @@
 "before inserting clips into the timeline."
 msgstr ""
 
-#: src/multitrack.c:3324
+#: src/multitrack.c:3465
 msgid ""
 "\n"
 "\n"
@@ -9107,12 +9121,12 @@
 "to apply compositors.\n"
 msgstr ""
 
-#: src/multitrack.c:3487
+#: src/multitrack.c:3640
 #, c-format
 msgid "%.2f sec. to %.2f sec.\n"
 msgstr "%.2f seg. até %.2f seg.\n"
 
-#: src/multitrack.c:3493
+#: src/multitrack.c:3646
 msgid ""
 "Single click on timeline\n"
 "to select a frame.\n"
@@ -9120,187 +9134,187 @@
 "Clique simples na linha de tempo\n"
 "para selecionar um frame.\n"
 
-#: src/multitrack.c:3711 src/multitrack.c:6790
+#: src/multitrack.c:3858 src/multitrack.c:6972
 #, c-format
 msgid "%s [unstable]"
 msgstr ""
 
-#: src/multitrack.c:3822
+#: src/multitrack.c:3973
 msgid ""
 "You can click and drag\n"
 "below the timeline"
 msgstr ""
 
-#: src/multitrack.c:3823
+#: src/multitrack.c:3974
 msgid "to select a time region.\n"
 msgstr "para selecionar uma região.\n"
 
-#: src/multitrack.c:3985
+#: src/multitrack.c:4137
 msgid "LiVES: Selected clip"
 msgstr ""
 
-#: src/multitrack.c:3993
+#: src/multitrack.c:4145
 msgid "_Adjust start and end points"
 msgstr ""
 
-#: src/multitrack.c:4002
+#: src/multitrack.c:4154
 msgid "_Edit/encode in clip editor"
 msgstr ""
 
-#: src/multitrack.c:4009
+#: src/multitrack.c:4161
 msgid "_Show clip information"
 msgstr ""
 
-#: src/multitrack.c:4016
+#: src/multitrack.c:4168
 msgid "_Close this clip"
 msgstr ""
 
-#: src/multitrack.c:4236
+#: src/multitrack.c:4388
 msgid "Audio mixer (ctrl-m)"
 msgstr "Mixer de Áudio (ctrl-m)"
 
-#: src/multitrack.c:4336
+#: src/multitrack.c:4488
 msgid "Single click on timeline"
 msgstr ""
 
-#: src/multitrack.c:4337
+#: src/multitrack.c:4489
 msgid "to select a frame."
 msgstr ""
 
-#: src/multitrack.c:4338
+#: src/multitrack.c:4490
 msgid "Double click or right click on timeline"
 msgstr ""
 
-#: src/multitrack.c:4339
+#: src/multitrack.c:4491
 msgid "to select a block."
 msgstr ""
 
-#: src/multitrack.c:4340
+#: src/multitrack.c:4492
 msgid "Clips can be dragged"
 msgstr ""
 
-#: src/multitrack.c:4341
+#: src/multitrack.c:4493
 msgid "onto the timeline."
 msgstr ""
 
-#: src/multitrack.c:4343
+#: src/multitrack.c:4495
 msgid "Mouse mode is: Move"
 msgstr ""
 
-#: src/multitrack.c:4344
+#: src/multitrack.c:4496
 msgid "clips can be moved around."
 msgstr ""
 
-#: src/multitrack.c:4349
+#: src/multitrack.c:4500
 msgid "Mouse mode is: Select."
 msgstr ""
 
-#: src/multitrack.c:4350
+#: src/multitrack.c:4501
 msgid "Drag with mouse on timeline"
 msgstr ""
 
-#: src/multitrack.c:4351
+#: src/multitrack.c:4502
 msgid "to select tracks and time."
 msgstr ""
 
-#: src/multitrack.c:4362
+#: src/multitrack.c:4509
 msgid "_Insert mode: Normal"
 msgstr "Modo _Ins:Normal"
 
-#: src/multitrack.c:4378
+#: src/multitrack.c:4537
 msgid "_Mouse mode: Move"
 msgstr "_Mouse: Mover"
 
-#: src/multitrack.c:4382
+#: src/multitrack.c:4540
 msgid "_Mouse mode: Select"
 msgstr "_Mouse: Selecionar"
 
-#: src/multitrack.c:4405 src/multitrack.c:7925
+#: src/multitrack.c:4563 src/multitrack.c:8104
 #, fuzzy
 msgid "Gravity: Normal"
 msgstr "_Gravidade:Normal"
 
-#: src/multitrack.c:4409
+#: src/multitrack.c:4565
 #, fuzzy
 msgid "Gravity: Left"
 msgstr "_Gravidade:Esquerda"
 
-#: src/multitrack.c:4414
+#: src/multitrack.c:4569
 #, fuzzy
 msgid "Gravity: Right"
 msgstr "_Gravidade:Direito"
 
-#: src/multitrack.c:4416
+#: src/multitrack.c:4570
 msgid "Close _last gap(s) in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:4419
+#: src/multitrack.c:4572
 msgid "Close _first gap(s) in selected tracks/time"
 msgstr "Fechar primeiro vão(s) nas trilhas/tempo selecionados"
 
-#: src/multitrack.c:4458
+#: src/multitrack.c:4627
 msgid "Close gaps"
 msgstr "Fechar vãos"
 
-#: src/multitrack.c:4460
+#: src/multitrack.c:4629
 msgid "Move block"
 msgstr "Mover bloco"
 
-#: src/multitrack.c:4462
+#: src/multitrack.c:4631
 msgid "Move audio block"
 msgstr "Mover bloco de áudio"
 
-#: src/multitrack.c:4464
+#: src/multitrack.c:4633
 msgid "Delete block"
 msgstr "Deletar bloco"
 
-#: src/multitrack.c:4466
+#: src/multitrack.c:4635
 msgid "Delete audio block"
 msgstr "Deletar bloco de áudio"
 
-#: src/multitrack.c:4468
+#: src/multitrack.c:4637
 msgid "Split tracks"
 msgstr "Dividir faixas"
 
-#: src/multitrack.c:4470
+#: src/multitrack.c:4639
 msgid "Split block"
 msgstr "Dividir bloco"
 
-#: src/multitrack.c:4473
+#: src/multitrack.c:4642
 #, c-format
 msgid "Apply %s"
 msgstr "Aplicar %s"
 
-#: src/multitrack.c:4478
+#: src/multitrack.c:4647
 #, c-format
 msgid "Delete %s"
 msgstr "Deletar %s"
 
-#: src/multitrack.c:4482
+#: src/multitrack.c:4651
 msgid "Insert block"
 msgstr "Inserir bloco"
 
-#: src/multitrack.c:4484
+#: src/multitrack.c:4653
 msgid "Insert gap"
 msgstr "Inserir vão"
 
-#: src/multitrack.c:4486
+#: src/multitrack.c:4655
 msgid "Insert audio block"
 msgstr "Inserir bloco de áudio"
 
-#: src/multitrack.c:4488
+#: src/multitrack.c:4657
 msgid "Effect order change"
 msgstr "Mudança da ordem de efeitos"
 
-#: src/multitrack.c:4898
+#: src/multitrack.c:5064
 msgid "unsigned "
 msgstr "não-assinalado "
 
-#: src/multitrack.c:4899
+#: src/multitrack.c:5065
 msgid "signed "
 msgstr "assinalado "
 
-#: src/multitrack.c:4904
+#: src/multitrack.c:5071
 #, c-format
 msgid ""
 "Multitrack values set to %.3f fps, frame size %d x %d, audio channels %d, "
@@ -9309,15 +9323,15 @@
 "Valores multipista definidos em %.3f fps, tamanho de frame %d x %d, canais "
 "de áudio %d, taxa de áudio %d, tamanho da amostra de áudio %d, %s.\n"
 
-#: src/multitrack.c:4938
+#: src/multitrack.c:5104
 msgid "invalid event list. Failed.\n"
 msgstr "lista de eventos inválida. Falha.\n"
 
-#: src/multitrack.c:4944
+#: src/multitrack.c:5110
 msgid "event list has invalid fps. Failed.\n"
 msgstr "a lista de eventos tem um FPS inválida. Falha.\n"
 
-#: src/multitrack.c:4953
+#: src/multitrack.c:5122
 #, c-format
 msgid ""
 "\n"
@@ -9332,7 +9346,7 @@
 "fechar o set atual,\n"
 "e então carregue no novo set a partir do menu 'Arquivo'.\n"
 
-#: src/multitrack.c:4993
+#: src/multitrack.c:5163
 #, c-format
 msgid ""
 "\n"
@@ -9343,440 +9357,432 @@
 "Há um número inválido de canais de áudio (%d) no LiVES.\n"
 "Não pode ser carregado.\n"
 
-#: src/multitrack.c:5329 src/multitrack.c:5338 src/multitrack.c:21133
+#: src/multitrack.c:5452
 msgid "Layout was wiped.\n"
 msgstr ""
 
-#: src/multitrack.c:5374
+#: src/multitrack.c:5547
 #, c-format
 msgid "LiVES-%s: Multitrack %dx%d : %d bpp %.3f fps"
 msgstr "LiVES-%s: Multitrack %dx%d : %d bpp %.3f fps"
 
-#: src/multitrack.c:5617
+#: src/multitrack.c:5793
 msgid "In/out"
 msgstr ""
 
-#: src/multitrack.c:5619
+#: src/multitrack.c:5795
 msgid "FX stack"
 msgstr ""
 
-#: src/multitrack.c:5627 src/omc-learn.c:673
+#: src/multitrack.c:5803 src/omc-learn.c:659
 msgid "Params."
 msgstr "Parâmetros"
 
-#: src/multitrack.c:5978
+#: src/multitrack.c:6157
 msgid "_Open..."
 msgstr "_Abrir..."
 
-#: src/multitrack.c:5996
+#: src/multitrack.c:6175
 msgid "O_pen File Selection..."
 msgstr "Abrir Trecho de Arquivo [_P]"
 
-#: src/multitrack.c:6040
+#: src/multitrack.c:6219
 msgid "Import Selection from _dvd/vcd..."
 msgstr "Importar trecho de _DVD/VCD"
 
-#: src/multitrack.c:6050
+#: src/multitrack.c:6229
 msgid "Import Selection from _dvd"
 msgstr "Importar Trecho de _DVD"
 
-#: src/multitrack.c:6060
+#: src/multitrack.c:6239
 msgid "Import Selection from _vcd"
 msgstr "Importar Trecho de _VCD"
 
-#: src/multitrack.c:6076
+#: src/multitrack.c:6255
 msgid "_Import from Device"
 msgstr "_Importar de Dispositivo"
 
-#: src/multitrack.c:6103
+#: src/multitrack.c:6282
 msgid "_Close the selected clip"
 msgstr ""
 
-#: src/multitrack.c:6198
+#: src/multitrack.c:6377
 msgid "_Save layout as..."
 msgstr "_Salvar layout como..."
 
-#: src/multitrack.c:6206
+#: src/multitrack.c:6385
 msgid "_Load layout..."
 msgstr "Carregar _layout..."
 
-#: src/multitrack.c:6210
+#: src/multitrack.c:6389
 msgid "_Wipe/Delete layout..."
 msgstr "_Descartar/Deletar layout..."
 
-#: src/multitrack.c:6236
+#: src/multitrack.c:6415
 msgid "_Ignore width, height and audio values from loaded layouts"
 msgstr "_Ignorar largura, altura e valores de áudio dos layouts carregados"
 
-#: src/multitrack.c:6240
+#: src/multitrack.c:6419
 msgid "Auto load _subtitles with clips"
 msgstr ""
 
-#: src/multitrack.c:6322
+#: src/multitrack.c:6501
 msgid "_CLIP EDITOR"
 msgstr "EDITOR DE _CLIPES"
 
-#: src/multitrack.c:6334
+#: src/multitrack.c:6513
 msgid "_Adjust selected clip start/end points"
 msgstr ""
 
-#: src/multitrack.c:6343
+#: src/multitrack.c:6522
 msgid "_Insert selected clip"
 msgstr "_Inserir clipe selecionado"
 
-#: src/multitrack.c:6355
+#: src/multitrack.c:6534
 msgid "_Insert selected clip audio"
 msgstr "_Inserir áudio do clipe selecionado"
 
-#: src/multitrack.c:6364
+#: src/multitrack.c:6543
 msgid "_Delete selected block"
 msgstr "_Deletar bloco Selecionado"
 
-#: src/multitrack.c:6373
+#: src/multitrack.c:6555
 msgid "_Jump to previous block boundary"
 msgstr "Pular para limite de bloco anterior [_J]"
 
-#: src/multitrack.c:6382
+#: src/multitrack.c:6564
 msgid "_Jump to next block boundary"
 msgstr "Pular para o próximo limite de bloco [_J]"
 
-#: src/multitrack.c:6395
+#: src/multitrack.c:6577
 msgid "Clear _marks from timeline"
 msgstr "Limpar _marcas da linha de tempo"
 
-#: src/multitrack.c:6403
+#: src/multitrack.c:6585
 msgid "Ignore selection limits when inserting"
 msgstr "Ignorar limites de seleção quando inserindo"
 
-#: src/multitrack.c:6420 src/multitrack.c:16719
+#: src/multitrack.c:6602 src/multitrack.c:17009
 msgid "_Play from Timeline Position"
 msgstr "Tocar a partir da _posição na linha de tempo"
 
-#: src/multitrack.c:6434
+#: src/multitrack.c:6616
 msgid "Pla_y selected time only"
 msgstr ""
 
-#: src/multitrack.c:6518
+#: src/multitrack.c:6700
 msgid "_Move effects with blocks"
 msgstr "_Mover efeitos com blocos"
 
-#: src/multitrack.c:6531
+#: src/multitrack.c:6713
 msgid "Select _autotransition effect..."
 msgstr ""
 
-#: src/multitrack.c:6542
+#: src/multitrack.c:6724
 #, fuzzy
 msgid "Crossfade audio with autotransition"
 msgstr "Crossfade áudio"
 
-#: src/multitrack.c:6550
+#: src/multitrack.c:6732
 msgid "View/_Edit selected effect"
 msgstr "Ver/_Editar efeito selecionado"
 
-#: src/multitrack.c:6554
+#: src/multitrack.c:6736
 msgid "_Delete selected effect"
 msgstr "_Deletar efeito selecionado"
 
-#: src/multitrack.c:6562
+#: src/multitrack.c:6744
 msgid "Apply effect to _block..."
 msgstr "Aplicar efeito ao _bloco..."
 
-#: src/multitrack.c:6619
+#: src/multitrack.c:6801
 msgid "Apply effect to _region..."
 msgstr "Aplicar efeito à _região..."
 
-#: src/multitrack.c:6885
+#: src/multitrack.c:7061
 msgid "_Tracks"
 msgstr "_Faixas"
 
-#: src/multitrack.c:6896
+#: src/multitrack.c:7072
 msgid "Rename current track"
 msgstr ""
 
-#: src/multitrack.c:6904
+#: src/multitrack.c:7080
 msgid "Make _Backing Audio current track"
 msgstr "Fazer áudio de fundo a faixa atual (_b)"
 
-#: src/multitrack.c:6915
+#: src/multitrack.c:7091
 msgid "Add Video Track at _Rear"
 msgstr "Adicionar faixa de vídeo at_rás"
 
-#: src/multitrack.c:6923
+#: src/multitrack.c:7099
 msgid "Add Video Track at _Front"
 msgstr "Adicionar Faixa de Vídeo à _Frente"
 
-#: src/multitrack.c:6936
+#: src/multitrack.c:7112
 msgid "_Split current track at cursor"
 msgstr "Dividir a trilha atual no cursor [_s]"
 
-#: src/multitrack.c:6948
+#: src/multitrack.c:7124
 msgid "_Split selected video tracks"
 msgstr "Dividir faixas _selecionadas de vídeo"
 
-#: src/multitrack.c:6961
+#: src/multitrack.c:7137
 msgid "Insert gap in selected tracks/time"
 msgstr "Inserir vão nas trilhas/tempo selecionados"
 
-#: src/multitrack.c:6969
+#: src/multitrack.c:7145
 msgid "Insert gap in current track/selected time"
 msgstr "Inserir vão na trilha atual e tempo selecionado"
 
-#: src/multitrack.c:6981
+#: src/multitrack.c:7157
 msgid "Close all _gaps in selected tracks/time"
 msgstr "Fechar todos vãos nas trilhas/tempo selecionados (_g)"
 
-#: src/multitrack.c:7007
+#: src/multitrack.c:7183
 msgid "Se_lection"
 msgstr "Se_leção"
 
-#: src/multitrack.c:7018
+#: src/multitrack.c:7194
 msgid "_Select Current Track"
 msgstr "_Selecionar faixa atual"
 
-#: src/multitrack.c:7025
+#: src/multitrack.c:7201
 msgid "Select _all video tracks"
 msgstr "Selecionar tod_as faixas de vídeo"
 
-#: src/multitrack.c:7032
+#: src/multitrack.c:7208
 msgid "Select _no video tracks"
 msgstr "_Não selecionar faixas de vídeo"
 
-#: src/multitrack.c:7039
+#: src/multitrack.c:7215
 msgid "Select all _time"
 msgstr "Selecionar todo _tempo"
 
-#: src/multitrack.c:7050
+#: src/multitrack.c:7226
 msgid "Select from _zero time"
 msgstr "Selecionar do tempo _zero"
 
-#: src/multitrack.c:7057
+#: src/multitrack.c:7233
 msgid "Select to _end time"
 msgstr "Selecionar fim do t_empo"
 
-#: src/multitrack.c:7064
+#: src/multitrack.c:7240
 msgid "_Copy..."
 msgstr "_Copiar..."
 
-#: src/multitrack.c:7075
+#: src/multitrack.c:7251
 msgid "_Timecode to region start"
 msgstr "_Timecode para o início da região"
 
-#: src/multitrack.c:7082
+#: src/multitrack.c:7258
 msgid "_Timecode to region end"
 msgstr "_Timecode para o fim da região"
 
-#: src/multitrack.c:7089
+#: src/multitrack.c:7265
 msgid "_Region start to timecode"
 msgstr "Início da _região para timecode"
 
-#: src/multitrack.c:7096
+#: src/multitrack.c:7272
 msgid "_Region end to timecode"
 msgstr "Fim da _região para timecode"
 
-#: src/multitrack.c:7110
+#: src/multitrack.c:7286
 msgid "Select/deselect block at current track/time"
 msgstr ""
 
-#: src/multitrack.c:7135
+#: src/multitrack.c:7311
 msgid "_Change width, height and audio values..."
 msgstr "Mudar valores de largura, alltura e áudio..."
 
-#: src/multitrack.c:7194
+#: src/multitrack.c:7370
 msgid "_Render"
 msgstr "_Renderizar"
 
-#: src/multitrack.c:7205
+#: src/multitrack.c:7381
 msgid "_Render all to new clip"
 msgstr "_Renderizar tudo para um novo clipe"
 
-#: src/multitrack.c:7220
+#: src/multitrack.c:7396
 msgid "Render _video"
 msgstr "Renderizar _vídeo"
 
-#: src/multitrack.c:7225
+#: src/multitrack.c:7401
 msgid "Render _audio"
 msgstr "Renderizar _áudio"
 
-#: src/multitrack.c:7235
+#: src/multitrack.c:7411
 msgid "_Normalise rendered audio"
 msgstr ""
 
-#: src/multitrack.c:7242
+#: src/multitrack.c:7418
 msgid "_Pre-render audio"
 msgstr "_Pre-renderizar áudio"
 
-#: src/multitrack.c:7251
+#: src/multitrack.c:7427
 msgid "_View"
 msgstr "_Ver"
 
-#: src/multitrack.c:7270
+#: src/multitrack.c:7446
 msgid "Block _In/out points"
 msgstr "Bloquear pontos de entrada/sa_ida"
 
-#: src/multitrack.c:7279
+#: src/multitrack.c:7455
 msgid "_Effects at current"
 msgstr "_Efeitos no atual"
 
-#: src/multitrack.c:7297
+#: src/multitrack.c:7473
 msgid "Audio parameters"
 msgstr "Parâmetros de áudio"
 
-#: src/multitrack.c:7308
+#: src/multitrack.c:7484
 msgid "Show backing _audio track"
 msgstr "Mostrar faix_a do áudio de fundo"
 
-#: src/multitrack.c:7312
+#: src/multitrack.c:7488
 msgid "Compact view"
 msgstr "Visão compacta"
 
-#: src/multitrack.c:7320
+#: src/multitrack.c:7496
 msgid "Maximum tracks to display..."
 msgstr "Máximo de trilhas a inserir..."
 
-#: src/multitrack.c:7327
+#: src/multitrack.c:7503
 msgid "Scroll to follow playback"
 msgstr "Rolar para seguir a execução"
 
-#: src/multitrack.c:7331
+#: src/multitrack.c:7507
 msgid "_Center on cursor"
 msgstr "_Centralizar no cursor"
 
-#: src/multitrack.c:7338
+#: src/multitrack.c:7514
 msgid "_Zoom in"
 msgstr "_Zoom in"
 
-#: src/multitrack.c:7349
+#: src/multitrack.c:7525
 msgid "_Zoom out"
 msgstr "_Zoom out"
 
-#: src/multitrack.c:7361
+#: src/multitrack.c:7537
 msgid "Multitrack _details"
 msgstr "_Detalhes multipista"
 
-#: src/multitrack.c:7374
+#: src/multitrack.c:7550
 msgid "_Event Window"
 msgstr "Janela de _Eventos"
 
-#: src/multitrack.c:7378
+#: src/multitrack.c:7554
 msgid "_Event Window (selected time only)"
 msgstr ""
 
-#: src/multitrack.c:7382
+#: src/multitrack.c:7558
 msgid "_Show FRAME events"
 msgstr "Mostrar evento_s de frame"
 
-#: src/multitrack.c:7399
+#: src/multitrack.c:7575
 msgid "_Show multitrack keys"
 msgstr "Mostrar tecla_s multipista"
 
-#: src/multitrack.c:7468
+#: src/multitrack.c:7644
 msgid "Mouse mode: _Move"
 msgstr "Modo do mouse: _Mover"
 
-#: src/multitrack.c:7476
+#: src/multitrack.c:7652
 msgid "Mouse mode: _Select"
 msgstr "Modo do mouse: _Selecionar"
 
-#: src/multitrack.c:7505
+#: src/multitrack.c:7681
 msgid "Insert mode: _Normal"
 msgstr "Modo Ins:_Normal"
 
-#: src/multitrack.c:7733
+#: src/multitrack.c:7909
 msgid "Insert with _audio"
 msgstr "Inserir com _áudio"
 
-#: src/multitrack.c:7734
+#: src/multitrack.c:7910
 msgid ""
 "Select whether video clips are inserted and moved with their audio or not"
 msgstr ""
 
-#: src/multitrack.c:7829
+#: src/multitrack.c:8007
 msgid "Select _overlap"
 msgstr "Selec. _sobreposn."
 
-#: src/multitrack.c:7830
+#: src/multitrack.c:8008
 msgid ""
 "Select whether timeline selection snaps to overlap between selected tracks "
 "or not"
 msgstr ""
 
-#: src/multitrack.c:7894 src/multitrack.c:14198
+#: src/multitrack.c:8073 src/multitrack.c:14422
 msgid "Expanded View (d)"
 msgstr "Visão Expandida (d)"
 
-#: src/multitrack.c:7897 src/multitrack.c:14205
+#: src/multitrack.c:8076 src/multitrack.c:14428
 msgid "Compact View (d)"
 msgstr "Visão Compacta (d)"
 
-#: src/multitrack.c:7939
+#: src/multitrack.c:8118
 msgid "Gravity: _Normal"
 msgstr "Gravidade:_Normal"
 
-#: src/multitrack.c:7952
+#: src/multitrack.c:8131
 msgid "Gravity: _Left"
 msgstr "Gravidade:_Esquerda"
 
-#: src/multitrack.c:7967
+#: src/multitrack.c:8146
 msgid "Gravity: _Right"
 msgstr "Gravidade:_Direito"
 
-#: src/multitrack.c:8297
+#: src/multitrack.c:8496
 msgid "_Apply"
 msgstr "_Applicar"
 
-#: src/multitrack.c:8319
+#: src/multitrack.c:8518
 msgid "Time"
 msgstr "Tempo"
 
-#: src/multitrack.c:8333
+#: src/multitrack.c:8532
 msgid "_Del. node"
 msgstr "_Deletar nodo"
 
-#: src/multitrack.c:8341
+#: src/multitrack.c:8540
 msgid "_Next node"
 msgstr "Próximo _nodo"
 
-#: src/multitrack.c:8349
+#: src/multitrack.c:8548
 msgid "_Prev node"
 msgstr "Nodo anterior [_P]"
 
-#: src/multitrack.c:8373
+#: src/multitrack.c:8574
 msgid "_Reverse playback  "
 msgstr "Execução _reversa  "
 
-#: src/multitrack.c:8395
+#: src/multitrack.c:8596
 msgid "_Velocity  "
 msgstr "_Velocidade  "
 
-#: src/multitrack.c:8464
+#: src/multitrack.c:8664
 msgid "Anchor _start"
 msgstr "Ancorar início [_S]"
 
-#: src/multitrack.c:8465
+#: src/multitrack.c:8665
 msgid "Anchor the start point to the timeline"
 msgstr "Ancorar o ponto de início à linha de tempo"
 
-#: src/multitrack.c:8481
-msgid "Start frame"
-msgstr "Quadro inicial"
-
-#: src/multitrack.c:8533
+#: src/multitrack.c:8728
 msgid "Anchor _end"
 msgstr "Ancorar final [_E]"
 
-#: src/multitrack.c:8534
+#: src/multitrack.c:8729
 msgid "Anchor the end point to the timeline"
 msgstr "Ancorar o ponto final à linha de tempo"
 
-#: src/multitrack.c:8546
-msgid "End frame"
-msgstr "Quadro final"
-
-#: src/multitrack.c:8739
+#: src/multitrack.c:8929
 msgid "Scroll"
 msgstr "Rolar"
 
-#: src/multitrack.c:9316
+#: src/multitrack.c:9502
 msgid ""
 "\n"
 "==============================\n"
@@ -9786,91 +9792,91 @@
 "==============================\n"
 "Alternado para modo de edição de clipes\n"
 
-#: src/multitrack.c:9502
+#: src/multitrack.c:9708
 msgid "Timeline (seconds)"
 msgstr "Linha de tempo (segs.)"
 
-#: src/multitrack.c:9984
+#: src/multitrack.c:10202
 msgid " Backing audio"
 msgstr " Áudio de fundo"
 
-#: src/multitrack.c:9987
+#: src/multitrack.c:10204
 #, c-format
 msgid " Layer %d audio"
 msgstr " Áudio camada %d"
 
-#: src/multitrack.c:9995
+#: src/multitrack.c:10212
 msgid "Show/hide audio details"
 msgstr ""
 
-#: src/multitrack.c:10010 src/multitrack.c:10232
+#: src/multitrack.c:10227 src/multitrack.c:10452
 #, c-format
 msgid "Layer %d audio"
 msgstr "Áudio camada %d"
 
-#: src/multitrack.c:10144 src/multitrack.c:10261
+#: src/multitrack.c:10353 src/multitrack.c:10481
 #, c-format
 msgid "%s (layer %d)"
 msgstr "%s (cam. %d)"
 
-#: src/multitrack.c:10184
+#: src/multitrack.c:10403
 msgid "Select track"
 msgstr "Selecionar faixa"
 
-#: src/multitrack.c:10188
+#: src/multitrack.c:10407
 msgid "Show/hide audio"
 msgstr ""
 
-#: src/multitrack.c:10194
+#: src/multitrack.c:10413
 #, c-format
 msgid "Video %d"
 msgstr "Vídeo %d"
 
-#: src/multitrack.c:10233
+#: src/multitrack.c:10453
 #, c-format
 msgid " %s"
 msgstr " %s"
 
-#: src/multitrack.c:10346
+#: src/multitrack.c:10574
 msgid "LiVES: Selected effect"
 msgstr "LiVES: Efeito selecionado"
 
-#: src/multitrack.c:10358
+#: src/multitrack.c:10586
 msgid "_View/Edit this effect"
 msgstr "_Ver/Editar este efeito"
 
-#: src/multitrack.c:10361
+#: src/multitrack.c:10588
 msgid "_View this effect"
 msgstr "_Ver este efeito"
 
-#: src/multitrack.c:10369
+#: src/multitrack.c:10596
 msgid "_Delete this effect"
 msgstr "_Deletar este efeito"
 
-#: src/multitrack.c:10422
+#: src/multitrack.c:10648
 msgid "Cannot insert after this effect"
 msgstr ""
 
-#: src/multitrack.c:10451
+#: src/multitrack.c:10677
 msgid "This effect cannot be moved"
 msgstr ""
 
-#: src/multitrack.c:10499
+#: src/multitrack.c:10724
 #, c-format
 msgid "  %d to %d selected  "
 msgstr "  %d até %d selecionados  "
 
-#: src/multitrack.c:10502 src/multitrack.c:10746
+#: src/multitrack.c:10727 src/multitrack.c:10968
 #, c-format
 msgid "%.2f sec."
 msgstr "%.2f seg."
 
-#: src/multitrack.c:10717
+#: src/multitrack.c:10940
 #, c-format
 msgid "%d frames"
 msgstr "%d frames"
 
-#: src/multitrack.c:11070
+#: src/multitrack.c:11299
 msgid ""
 "\n"
 "==============================\n"
@@ -9880,70 +9886,70 @@
 "==============================\n"
 "Alternado para modo multipista\n"
 
-#: src/multitrack.c:12691
+#: src/multitrack.c:12939
 msgid "Drag the time slider to where you"
 msgstr ""
 
-#: src/multitrack.c:12692
+#: src/multitrack.c:12940
 msgid "want to set effect parameters"
 msgstr ""
 
-#: src/multitrack.c:12693
+#: src/multitrack.c:12941
 msgid "Set parameters, then click \"Apply\"\n"
 msgstr ""
 
-#: src/multitrack.c:12694
+#: src/multitrack.c:12942
 msgid ""
 "NODES are points where parameters\n"
 "have been set.\n"
 "Nodes can be deleted."
 msgstr ""
 
-#: src/multitrack.c:12697
+#: src/multitrack.c:12944
 msgid "Effect has no parameters.\n"
 msgstr ""
 
-#: src/multitrack.c:12788
+#: src/multitrack.c:13033
 #, c-format
 msgid "%s output"
 msgstr "%s saída"
 
-#: src/multitrack.c:12794 src/multitrack.c:12804
+#: src/multitrack.c:13038 src/multitrack.c:13046
 #, c-format
 msgid "layer %d"
 msgstr "camada %d"
 
-#: src/multitrack.c:12796 src/multitrack.c:12806
+#: src/multitrack.c:13039 src/multitrack.c:13047
 msgid "audio track"
 msgstr "faixa de áudio"
 
-#: src/multitrack.c:12797
+#: src/multitrack.c:13040
 #, c-format
 msgid "%s to %s"
 msgstr "%s até %s"
 
-#: src/multitrack.c:12807
+#: src/multitrack.c:13048
 #, c-format
 msgid "%s from %s"
 msgstr ""
 
-#: src/multitrack.c:12860
+#: src/multitrack.c:13099
 msgid "_Prev filter map"
 msgstr "Mapa de filtro _ant"
 
-#: src/multitrack.c:12871
+#: src/multitrack.c:13110
 msgid "Insert _before"
 msgstr "Ins an_tes"
 
-#: src/multitrack.c:12881
+#: src/multitrack.c:13120
 msgid "Insert _after"
 msgstr "Ins apó_s"
 
-#: src/multitrack.c:12896
+#: src/multitrack.c:13134
 msgid "_Next filter map"
 msgstr "_Próx mapa de filtro"
 
-#: src/multitrack.c:12911
+#: src/multitrack.c:13148
 msgid ""
 "\n"
 "\n"
@@ -9951,81 +9957,81 @@
 "current time.\n"
 msgstr ""
 
-#: src/multitrack.c:12929
+#: src/multitrack.c:13166
 msgid ""
 "Drag a compositor anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:12936
+#: src/multitrack.c:13173
 msgid ""
 "Drag a transition anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:12944
+#: src/multitrack.c:13181
 msgid ""
 "Effects can be dragged\n"
 "onto blocks on the timeline."
 msgstr ""
 
-#: src/multitrack.c:13166
+#: src/multitrack.c:13406
 msgid "LiVES: Selected block/frame"
 msgstr "LiVES: Bloco/frame selecionado"
 
-#: src/multitrack.c:13173
+#: src/multitrack.c:13413
 msgid "_Select this block"
 msgstr "_Selecionar este blog"
 
-#: src/multitrack.c:13183
+#: src/multitrack.c:13423
 msgid "_Split block here"
 msgstr "Dividir bloco aqui [_S]"
 
-#: src/multitrack.c:13191
+#: src/multitrack.c:13431
 msgid "List _effects here"
 msgstr "Listar _efeitos aqui"
 
-#: src/multitrack.c:13200 src/multitrack.c:13277
+#: src/multitrack.c:13440 src/multitrack.c:13518
 #, c-format
 msgid "_Adjust %s"
 msgstr "_Ajustar %s"
 
-#: src/multitrack.c:13215
+#: src/multitrack.c:13455
 msgid "_Delete this block"
 msgstr "_Deletar bloco selecionado"
 
-#: src/multitrack.c:13258
+#: src/multitrack.c:13500
 msgid "_Insert here"
 msgstr "_Inserir aqui"
 
-#: src/multitrack.c:13264
+#: src/multitrack.c:13505
 msgid "_Insert audio here"
 msgstr "_Inserir áudio aqui"
 
-#: src/multitrack.c:14801
+#: src/multitrack.c:15017
 #, c-format
 msgid "Inserted gap in selected tracks from time %.4f to %.4f\n"
 msgstr ""
 "Gap inserido nas trilhas selecionadas a partir do tempo %.4f até %.4f\n"
 
-#: src/multitrack.c:14835
+#: src/multitrack.c:15048
 #, c-format
 msgid "Inserted gap in track %s from time %.4f to %.4f\n"
 msgstr "Inserido vão na trilha %s do tempo %.4f até %.4f\n"
 
-#: src/multitrack.c:15036
+#: src/multitrack.c:15244
 #, c-format
 msgid "Undid %s\n"
 msgstr "Desfeito %s\n"
 
-#: src/multitrack.c:15235
+#: src/multitrack.c:15445
 #, c-format
 msgid "Redid %s\n"
 msgstr "Refeito %s\n"
 
-#: src/multitrack.c:15268
+#: src/multitrack.c:15475
 msgid ""
 "\n"
 " (variable)"
@@ -10033,62 +10039,62 @@
 "\n"
 " (variable)"
 
-#: src/multitrack.c:15502 src/multitrack.c:15614 src/multitrack.c:18736
-#: src/multitrack.c:18748
+#: src/multitrack.c:15710 src/multitrack.c:15823 src/multitrack.c:19077
+#: src/multitrack.c:19089
 #, c-format
 msgid "track %s"
 msgstr "pista %s"
 
-#: src/multitrack.c:15507 src/multitrack.c:15619 src/multitrack.c:18741
+#: src/multitrack.c:15715 src/multitrack.c:15828 src/multitrack.c:19082
 #, c-format
 msgid "tracks %s and %s"
 msgstr "faixas %s e %s"
 
-#: src/multitrack.c:15513 src/multitrack.c:15625 src/multitrack.c:18751
+#: src/multitrack.c:15721 src/multitrack.c:15834 src/multitrack.c:19091
 msgid "selected tracks"
 msgstr "faixas selecionadas"
 
-#: src/multitrack.c:15516
+#: src/multitrack.c:15726
 #, c-format
 msgid "Added %s %s to %s from %.4f to %.4f\n"
 msgstr "Adiconados %s %s até %s de %.4f até %.4f\n"
 
-#: src/multitrack.c:15550
+#: src/multitrack.c:15760
 #, c-format
 msgid "Added effect %s to track %s from %.4f to %.4f\n"
 msgstr "Adicionado efeito %s na faixa %s de %.4f até %.4f\n"
 
-#: src/multitrack.c:15631
+#: src/multitrack.c:15845
 #, c-format
 msgid "Deleted %s %s from %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15935
+#: src/multitrack.c:16143
 #, c-format
 msgid "rendered %d frames to new clip.\n"
 msgstr "renderizados %d frames para um novo clipe.\n"
 
-#: src/multitrack.c:16025
+#: src/multitrack.c:16230
 msgid "Cleaning up..."
 msgstr "Limpando..."
 
-#: src/multitrack.c:16712
+#: src/multitrack.c:17003
 msgid "_Pause"
 msgstr "_Pausa"
 
-#: src/multitrack.c:16713
+#: src/multitrack.c:17004
 msgid "Pause (p)"
 msgstr "Pausa (p)"
 
-#: src/multitrack.c:16856
+#: src/multitrack.c:17151
 msgid "Press 'm' during playback"
 msgstr "Aperte 'm' durante a execução"
 
-#: src/multitrack.c:16857
+#: src/multitrack.c:17152
 msgid "to make a mark on the timeline"
 msgstr "fazer uma marca na linha de tempo"
 
-#: src/multitrack.c:17154
+#: src/multitrack.c:17498
 #, c-format
 msgid ""
 "Inserted audio %.4f to %.4f from clip %s into backing audio from time %.4f "
@@ -10097,21 +10103,21 @@
 "Inserido áudio %.4f até %.4f do clip %s no áudio de fundo, do tempo %.4f até "
 "%.4f\n"
 
-#: src/multitrack.c:17414
+#: src/multitrack.c:17759
 #, c-format
 msgid ""
 "Inserted frames %d to %d from clip %s into track %s from time %.4f to %.4f\n"
 msgstr ""
 "Inseridos frames %d até %d no clipe %s na faixa %s do tempo %.4f até %.4f\n"
 
-#: src/multitrack.c:17998
+#: src/multitrack.c:18332
 #, c-format
 msgid ""
 "Time region %.3f to %.3f\n"
 "selected.\n"
 msgstr ""
 
-#: src/multitrack.c:18002
+#: src/multitrack.c:18336
 msgid ""
 "select one or more tracks\n"
 "to create a region.\n"
@@ -10119,106 +10125,106 @@
 "selecione uma ou mais faixas\n"
 "para criar a região.\n"
 
-#: src/multitrack.c:18004
+#: src/multitrack.c:18337
 #, c-format
 msgid "%d video tracks selected.\n"
 msgstr "%d trilhas de vídeo selecionadas.\n"
 
-#: src/multitrack.c:18006
+#: src/multitrack.c:18339
 msgid ""
 "Double click on timeline\n"
 "to deselect time region."
 msgstr ""
 
-#: src/multitrack.c:18013
+#: src/multitrack.c:18346
 msgid ""
 "Single click on an effect\n"
 "to select it."
 msgstr ""
 
-#: src/multitrack.c:18014
+#: src/multitrack.c:18347
 msgid ""
 "Double click on an effect\n"
 "to edit it."
 msgstr ""
 
-#: src/multitrack.c:18015
+#: src/multitrack.c:18348
 msgid ""
 "Right click on an effect\n"
 "for context menu.\n"
 msgstr ""
 
-#: src/multitrack.c:18017
+#: src/multitrack.c:18350
 msgid ""
 "Effect order can be changed at\n"
 "FILTER MAPS"
 msgstr ""
 
-#: src/multitrack.c:18024
+#: src/multitrack.c:18357
 msgid ""
 "You can select an effect,\n"
 "then use the INSERT BEFORE"
 msgstr ""
 
-#: src/multitrack.c:18025
+#: src/multitrack.c:18358
 msgid "or INSERT AFTER buttons to move it."
 msgstr "ou o botão INSERIR DEPOIS para movê-lo."
 
-#: src/multitrack.c:18307 src/multitrack.c:18320
+#: src/multitrack.c:18639 src/multitrack.c:18652
 msgid "Click on another effect,"
 msgstr ""
 
-#: src/multitrack.c:18308 src/multitrack.c:18321
+#: src/multitrack.c:18640 src/multitrack.c:18653
 msgid ""
 "and the selected one\n"
 "will be inserted"
 msgstr ""
 
-#: src/multitrack.c:18309
+#: src/multitrack.c:18641
 msgid "after it.\n"
 msgstr "depois deste.\n"
 
-#: src/multitrack.c:18322
+#: src/multitrack.c:18654
 msgid "before it.\n"
 msgstr "antes deste.\n"
 
-#: src/multitrack.c:18551
+#: src/multitrack.c:18889
 #, c-format
 msgid "Removed parameter values for effect %s at time %.4f\n"
 msgstr "Removidos parâmetros de efeitos para o efeito %s no tempo %.4f\n"
 
-#: src/multitrack.c:18759
+#: src/multitrack.c:19100
 #, c-format
 msgid "Set parameter values for %s %s on %s at time %.4f\n"
 msgstr "Definir os valores de parâmetro para %s %s em %s no tempo %.4f\n"
 
-#: src/multitrack.c:19251 src/multitrack.c:20873
+#: src/multitrack.c:19630 src/multitrack.c:21195
 msgid "_Autoreload each time"
 msgstr "_Autorecarregar cada vez"
 
-#: src/multitrack.c:19323
+#: src/multitrack.c:19702
 #, fuzzy
 msgid "Saving layout"
 msgstr "_Salvar layout"
 
-#: src/multitrack.c:19345
+#: src/multitrack.c:19725
 #, c-format
 msgid "Saved layout to %s\n"
 msgstr "Mapa de teclado salvo em %s\n"
 
-#: src/multitrack.c:20783
+#: src/multitrack.c:21125
 msgid "clips and frames"
 msgstr "clipes e frames"
 
-#: src/multitrack.c:20787
+#: src/multitrack.c:21128
 msgid "clips"
 msgstr "clipes"
 
-#: src/multitrack.c:20790
+#: src/multitrack.c:21130
 msgid "frames"
 msgstr "frames"
 
-#: src/multitrack.c:20800
+#: src/multitrack.c:21140
 msgid ""
 "\n"
 "Auto reload layout.\n"
@@ -10226,7 +10232,7 @@
 "\n"
 "Auto recarregar layout.\n"
 
-#: src/multitrack.c:20803
+#: src/multitrack.c:21143
 #, c-format
 msgid ""
 "%s\n"
@@ -10237,11 +10243,11 @@
 "Alguns %s estão faltando no layout%s\n"
 "Por isso não pode ser carregado corretamente.\n"
 
-#: src/multitrack.c:20920
+#: src/multitrack.c:21284
 msgid "auto backup"
 msgstr ""
 
-#: src/multitrack.c:20923
+#: src/multitrack.c:21287
 #, c-format
 msgid ""
 "\n"
@@ -10250,31 +10256,31 @@
 "\n"
 "Impossível carregar arquivo de layout %s\n"
 
-#: src/multitrack.c:20944
+#: src/multitrack.c:21308
 #, c-format
 msgid "Loading layout from %s..."
 msgstr "Carregando mapa de teclado padrão de %s..."
 
-#: src/multitrack.c:20978
+#: src/multitrack.c:21338
 #, c-format
 msgid "Got %d events...processing..."
 msgstr "Pegou %d eventos...processando..."
 
-#: src/multitrack.c:20991
+#: src/multitrack.c:21349
 msgid "Checking and rebuilding event list"
 msgstr "Checando e reconstruindo lista de eventos"
 
-#: src/multitrack.c:21017
+#: src/multitrack.c:21374
 #, c-format
 msgid "%d errors detected.\n"
 msgstr "%d erros detectados.\n"
 
-#: src/multitrack.c:21068
+#: src/multitrack.c:21422
 #, c-format
 msgid "Multitrack fps set to %.3f\n"
 msgstr "FPS multipista definido em %.3f\n"
 
-#: src/multitrack.c:21225
+#: src/multitrack.c:21576
 #, fuzzy
 msgid ""
 "The current layout has changes which have not been saved.\n"
@@ -10283,19 +10289,19 @@
 "O layout atual não foi salvo.\n"
 "O que quer fazer?\n"
 
-#: src/multitrack.c:22047
+#: src/multitrack.c:22385
 msgid "LiVES: Multitrack audio mixer"
 msgstr "LiVES: Mixer de áudio multipista"
 
-#: src/multitrack.c:22077
+#: src/multitrack.c:22414
 msgid "_Reset values"
 msgstr "_Reiniciar valores"
 
-#: src/multitrack.c:22081
+#: src/multitrack.c:22418
 msgid "_Close mixer"
 msgstr "Fechar mixer [_C]"
 
-#: src/multitrack.c:22130
+#: src/multitrack.c:22466
 msgid ""
 "_Invert backing audio\n"
 "and layer volumes"
@@ -10303,42 +10309,42 @@
 "_Invertendo volumes do\n"
 "áudio de fundo e da camada"
 
-#: src/multitrack.c:22132
+#: src/multitrack.c:22468
 msgid "Adjust backing and layer audio values so that they sum to 1.0"
 msgstr ""
 "Ajustando valores de áudio de fundo e da camada para que possam somar 1.0"
 
-#: src/multitrack.c:22175
+#: src/multitrack.c:22510
 msgid "_Gang layer audio"
 msgstr "camada de audio _Gang"
 
-#: src/multitrack.c:22177
+#: src/multitrack.c:22512
 msgid "Adjust all layer audio values to the same value"
 msgstr "Ajustar todos valores de áudio das camadas para o mesmo valor"
 
-#: src/jack.c:104
+#: src/jack.c:102
 msgid "JACK server started\n"
 msgstr "servidor JACK iniciado\n"
 
-#: src/jack.c:1284 src/jack.c:1353
+#: src/jack.c:1265 src/jack.c:1334
 msgid "Unable to connect to JACK server\n"
 msgstr "Impossível conectar ao servidor JACK\n"
 
-#: src/jack.c:1512
+#: src/jack.c:1491
 msgid "Started jack audio subsystem.\n"
 msgstr "Iniciado subsistema de áudio jack.\n"
 
-#: src/jack.c:1623
+#: src/jack.c:1600
 msgid "Started jack audio reader.\n"
 msgstr "Iniciado leitor de áudio jack.\n"
 
-#: src/jack.c:1838
+#: src/jack.c:1815
 msgid ""
 "\n"
 "Connection to jack audio was reset.\n"
 msgstr ""
 
-#: src/pulse.c:87
+#: src/pulse.c:88
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -10346,7 +10352,7 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:92
+#: src/pulse.c:94
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -10354,7 +10360,7 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:96
+#: src/pulse.c:99
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -10362,129 +10368,129 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:101
+#: src/pulse.c:104
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
 msgstr ""
 
-#: src/pulse.c:107
+#: src/pulse.c:109
 msgid "LiVES will exit and you can choose another audio player.\n"
 msgstr ""
 
-#: src/pulse.c:1352
+#: src/pulse.c:1335
 msgid ""
 "\n"
 "Connection to pulse audio was reset.\n"
 msgstr ""
 
-#: src/colourspace.c:1100
+#: src/colourspace.c:1092
 msgid "unclamped"
 msgstr "não-fixado"
 
-#: src/colourspace.c:1101
+#: src/colourspace.c:1093
 msgid "clamped"
 msgstr "fixado"
 
-#: src/omc-learn.c:195
+#: src/omc-learn.c:191
 #, c-format
 msgid "Responding to joystick events from %s\n"
 msgstr "Respondendo a eventos de joystick de %s\n"
 
-#: src/omc-learn.c:289
+#: src/omc-learn.c:279
 msgid "Creating ALSA seq port..."
 msgstr ""
 
-#: src/omc-learn.c:325
+#: src/omc-learn.c:313
 #, c-format
 msgid "Responding to MIDI events from %s\n"
 msgstr "Respondendo a eventos MIDI de %s\n"
 
-#: src/omc-learn.c:568
+#: src/omc-learn.c:554
 msgid "data"
 msgstr "dados"
 
-#: src/omc-learn.c:571
+#: src/omc-learn.c:557
 msgid "velocity"
 msgstr "velocidade"
 
-#: src/omc-learn.c:572
+#: src/omc-learn.c:558
 msgid "note"
 msgstr "nota"
 
-#: src/omc-learn.c:574 src/omc-learn.c:736 src/omc-learn.c:1105
-#: src/omc-learn.c:1591 src/omc-learn.c:1640
+#: src/omc-learn.c:560 src/omc-learn.c:724 src/omc-learn.c:1092
+#: src/omc-learn.c:1581 src/omc-learn.c:1630
 msgid "value"
 msgstr "valor"
 
-#: src/omc-learn.c:576
+#: src/omc-learn.c:562
 msgid "state"
 msgstr "estado"
 
-#: src/omc-learn.c:688
+#: src/omc-learn.c:674
 msgid "variable"
 msgstr "variável"
 
-#: src/omc-learn.c:1001
+#: src/omc-learn.c:989
 msgid "Vars."
 msgstr "Vars."
 
-#: src/omc-learn.c:1054
+#: src/omc-learn.c:1041
 #, c-format
 msgid "MIDI ch %d note on"
 msgstr "Canal MIDI %d nota ligada"
 
-#: src/omc-learn.c:1058
+#: src/omc-learn.c:1045
 #, c-format
 msgid "MIDI ch %d note off"
 msgstr "Canal MIDI %d nota desligada"
 
-#: src/omc-learn.c:1062
+#: src/omc-learn.c:1049
 #, c-format
 msgid "MIDI ch %d controller %d"
 msgstr "Canal MIDI %d controlador %d"
 
-#: src/omc-learn.c:1066
+#: src/omc-learn.c:1053
 #, c-format
 msgid "MIDI ch %d pitch bend"
 msgstr "Canal MIDI %d pitch bend"
 
-#: src/omc-learn.c:1070
+#: src/omc-learn.c:1057
 #, c-format
 msgid "MIDI ch %d pgm change"
 msgstr ""
 
-#: src/omc-learn.c:1073
+#: src/omc-learn.c:1060
 #, c-format
 msgid "Joystick button %d"
 msgstr "botão %d do joystick"
 
-#: src/omc-learn.c:1076
+#: src/omc-learn.c:1063
 #, c-format
 msgid "Joystick axis %d"
 msgstr "eixo %d do joystick"
 
-#: src/omc-learn.c:1113
+#: src/omc-learn.c:1100
 msgid "x"
 msgstr "x"
 
-#: src/omc-learn.c:1122
+#: src/omc-learn.c:1109
 msgid "range"
 msgstr "extensão"
 
-#: src/omc-learn.c:1143
+#: src/omc-learn.c:1130
 msgid "+ offset1"
 msgstr "+ offset1"
 
-#: src/omc-learn.c:1161
+#: src/omc-learn.c:1150
 msgid "* scale"
 msgstr "* escala"
 
-#: src/omc-learn.c:1179
+#: src/omc-learn.c:1170
 msgid "+ offset2"
 msgstr "+ offset2"
 
-#: src/omc-learn.c:1280
+#: src/omc-learn.c:1270
 msgid ""
 "\n"
 "Click OK to delete all entries\n"
@@ -10492,211 +10498,211 @@
 "\n"
 "Clique em OK para deletar todas as entradas\n"
 
-#: src/omc-learn.c:1318
+#: src/omc-learn.c:1308
 msgid "LiVES: OMC learner"
 msgstr ""
 
-#: src/omc-learn.c:1334
+#: src/omc-learn.c:1324
 msgid "Clear _unmatched"
 msgstr "Limpar _não-coincidentes"
 
-#: src/omc-learn.c:1345
+#: src/omc-learn.c:1335
 msgid "_Delete all"
 msgstr "_Excluir tudo"
 
-#: src/omc-learn.c:1411
+#: src/omc-learn.c:1401
 msgid "Start video playback"
 msgstr "Iniciar exibição de video"
 
-#: src/omc-learn.c:1414
+#: src/omc-learn.c:1404
 msgid "Stop video playback"
 msgstr "Parar exibição de video"
 
-#: src/omc-learn.c:1418
+#: src/omc-learn.c:1408
 msgid "Clip select <clipnum>"
 msgstr "Selecionar trecho <clipnum>"
 
-#: src/omc-learn.c:1419
+#: src/omc-learn.c:1409
 msgid "Switch foreground clip to the nth valid clip"
 msgstr "Mudar clipe em primeiro plano para o n-ésimo clipe válido"
 
-#: src/omc-learn.c:1423
+#: src/omc-learn.c:1413
 msgid "Play forwards"
 msgstr "Exibir para frente"
 
-#: src/omc-learn.c:1424
+#: src/omc-learn.c:1414
 msgid "Play video in a forwards direction"
 msgstr "Tocar vídeo no sentido normal"
 
-#: src/omc-learn.c:1427
+#: src/omc-learn.c:1417
 msgid "Play backwards"
 msgstr "Tocar para trás"
 
-#: src/omc-learn.c:1428
+#: src/omc-learn.c:1418
 msgid "Play video in a backwards direction"
 msgstr "Tocar vídeo na direção reversa"
 
-#: src/omc-learn.c:1431
+#: src/omc-learn.c:1421
 msgid "Reverse playback direction"
 msgstr "Reverter direção de execução"
 
-#: src/omc-learn.c:1432
+#: src/omc-learn.c:1422
 msgid "Reverse direction of video playback"
 msgstr "Reverter direção da execução do vídeo"
 
-#: src/omc-learn.c:1435
+#: src/omc-learn.c:1425
 msgid "Play video faster"
 msgstr "Exibir o video rapidamente"
 
-#: src/omc-learn.c:1436
+#: src/omc-learn.c:1426
 msgid "Play video at a slightly faster rate"
 msgstr "Exibir o video a uma taxa um pouco mais rápida"
 
-#: src/omc-learn.c:1439
+#: src/omc-learn.c:1429
 msgid "Play video slower"
 msgstr "Exibir video vagarosamente"
 
-#: src/omc-learn.c:1440
+#: src/omc-learn.c:1430
 msgid "Play video at a slightly slower rate"
 msgstr "Exibir o video a uma taxa um pouco mais lenta"
 
-#: src/omc-learn.c:1443
+#: src/omc-learn.c:1433
 msgid "Toggle video freeze"
 msgstr "Mudar congelamento de execução"
 
-#: src/omc-learn.c:1444
+#: src/omc-learn.c:1434
 msgid "Freeze video, or if already frozen, unfreeze it"
 msgstr "Congelar video, ou se já congelado, descongelá-lo."
 
-#: src/omc-learn.c:1447
+#: src/omc-learn.c:1437
 msgid "Set video framerate to <fps>"
 msgstr "Definir taxa de exibição para <fps>"
 
-#: src/omc-learn.c:1448
+#: src/omc-learn.c:1438
 msgid "Set framerate of foreground clip to <float fps>"
 msgstr ""
 "Definir taxa de exibição para o clip em primeiro plano para <float fps>"
 
-#: src/omc-learn.c:1452
+#: src/omc-learn.c:1442
 msgid "Start recording"
 msgstr "Iniciar gravação"
 
-#: src/omc-learn.c:1455
+#: src/omc-learn.c:1445
 msgid "Stop recording"
 msgstr "Parar gravação"
 
-#: src/omc-learn.c:1458
+#: src/omc-learn.c:1448
 msgid "Toggle recording state"
 msgstr "Mudar estado de gravação"
 
-#: src/omc-learn.c:1461
+#: src/omc-learn.c:1451
 msgid "Swap foreground and background clips"
 msgstr "Alterar videos em primeiro e segundo planos"
 
-#: src/omc-learn.c:1463
+#: src/omc-learn.c:1453
 msgid "Reset effect keys"
 msgstr "Restaurar botões de efeitos"
 
-#: src/omc-learn.c:1464
+#: src/omc-learn.c:1454
 msgid "Switch all effects off."
 msgstr "Desligar todos os effeitos."
 
-#: src/omc-learn.c:1467
+#: src/omc-learn.c:1457
 msgid "Enable effect key <key>"
 msgstr "Ativar botão de efeito <key>"
 
-#: src/omc-learn.c:1471
+#: src/omc-learn.c:1461
 msgid "Disable effect key <key>"
 msgstr "Desativar botão de efeito <key>"
 
-#: src/omc-learn.c:1475
+#: src/omc-learn.c:1465
 msgid "Toggle effect key <key>"
 msgstr "Mudar tecla de efeito <key>"
 
-#: src/omc-learn.c:1479
+#: src/omc-learn.c:1469
 msgid "Set parameter value <key> <pnum> = <value>"
 msgstr "Definir valor do parâmetro <key> <pnum> = <value>"
 
-#: src/omc-learn.c:1480
+#: src/omc-learn.c:1470
 msgid "Set <value> of pth (numerical) parameter for effect key <key>."
 msgstr "Mudar <value> do n-ésimo parâmetro para a tecla de efeito <key>."
 
-#: src/omc-learn.c:1484
+#: src/omc-learn.c:1474
 msgid "Switch foreground to next clip"
 msgstr "Mudar vídeo em primeiro plano para o próximo clipe"
 
-#: src/omc-learn.c:1487
+#: src/omc-learn.c:1477
 msgid "Switch foreground to previous clip"
 msgstr "Mudar vídeo em primeiro plano para o clipe anterior"
 
-#: src/omc-learn.c:1490
+#: src/omc-learn.c:1480
 msgid "Set video framerate to ratio <fps_ratio>"
 msgstr "Definir a taxa de frames <fps_ratio>"
 
-#: src/omc-learn.c:1491
+#: src/omc-learn.c:1481
 msgid "Set framerate ratio of foreground clip to <float fps_ratio>"
 msgstr ""
 "Definir a taxa de frames do clipe em primeiro plano para <float fps_ratio>"
 
-#: src/omc-learn.c:1495
+#: src/omc-learn.c:1485
 msgid "Retrigger clip <clipnum>"
 msgstr "Reiniciar clipe <clipenum>"
 
-#: src/omc-learn.c:1496
+#: src/omc-learn.c:1486
 msgid ""
 "Switch foreground clip to the nth valid clip, and reset the frame number"
 msgstr ""
 "Mudar clipe em primeiro plano para o n-ésimo clipe válido, e reiniciar o "
 "número do frame"
 
-#: src/omc-learn.c:1500
+#: src/omc-learn.c:1490
 msgid "Cycle to next mode for effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1504
+#: src/omc-learn.c:1494
 msgid "Cycle to previous mode for effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1508
+#: src/omc-learn.c:1498
 msgid "Set playback plugin parameter value <pnum> = <value>"
 msgstr ""
 
-#: src/omc-learn.c:1509
+#: src/omc-learn.c:1499
 msgid "Set <value> of pth parameter for the playback plugin."
 msgstr ""
 
 #. TRANSLATORS: short form of "clip number"
-#: src/omc-learn.c:1536 src/omc-learn.c:1607
+#: src/omc-learn.c:1526 src/omc-learn.c:1597
 msgid "clipnum"
 msgstr "n. do clip"
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1545
+#: src/omc-learn.c:1535
 msgid "fps"
 msgstr "fps"
 
 #. TRANSLATORS: as in keyboard key
-#: src/omc-learn.c:1553 src/omc-learn.c:1560 src/omc-learn.c:1567
-#: src/omc-learn.c:1575 src/omc-learn.c:1615 src/omc-learn.c:1623
+#: src/omc-learn.c:1543 src/omc-learn.c:1550 src/omc-learn.c:1557
+#: src/omc-learn.c:1565 src/omc-learn.c:1605 src/omc-learn.c:1613
 msgid "key"
 msgstr "chave"
 
 #. TRANSLATORS: short form of "parameter number"
-#: src/omc-learn.c:1583 src/omc-learn.c:1632
+#: src/omc-learn.c:1573 src/omc-learn.c:1622
 msgid "pnum"
 msgstr "pnum"
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1599
+#: src/omc-learn.c:1589
 msgid "fps_ratio"
 msgstr "fps_ratio"
 
-#: src/omc-learn.c:2443
+#: src/omc-learn.c:2417
 #, c-format
 msgid "Saving device mapping to file %s..."
 msgstr "Salvando mapa de dispositivos para o arquivo %s..."
 
-#: src/omc-learn.c:2527
+#: src/omc-learn.c:2498
 #, c-format
 msgid ""
 "\n"
@@ -10709,7 +10715,7 @@
 "Erro ao ler arquivo\n"
 "%s\n"
 
-#: src/omc-learn.c:2534
+#: src/omc-learn.c:2505
 #, c-format
 msgid ""
 "\n"
@@ -10722,12 +10728,12 @@
 "Versão inválida do arquivo\n"
 "%s\n"
 
-#: src/omc-learn.c:2571
+#: src/omc-learn.c:2541
 #, c-format
 msgid "Loading device mapping from file %s..."
 msgstr "Carregando mapa de dispositivos do arquivo %s..."
 
-#: src/omc-learn.c:2576
+#: src/omc-learn.c:2544
 #, c-format
 msgid ""
 "\n"
@@ -10742,12 +10748,12 @@
 "%s\n"
 "Erro código %d\n"
 
-#: src/videodev.c:547
+#: src/videodev.c:539
 #, c-format
 msgid "Unable to open device %s\n"
 msgstr ""
 
-#: src/videodev.c:564
+#: src/videodev.c:554
 #, c-format
 msgid "Opened device %s\n"
 msgstr ""
@@ -11699,6 +11705,15 @@
 #~ msgid "$error"
 #~ msgstr "$error"
 
+#~ msgid "Pause"
+#~ msgstr "Pausa"
+
+#~ msgid "Start frame"
+#~ msgstr "Quadro inicial"
+
+#~ msgid "End frame"
+#~ msgstr "Quadro final"
+
 #, fuzzy
 #~ msgid "_Open"
 #~ msgstr "_Abrir..."

LiVES-2.2.8.tar.bz2/po/ro.po -> LiVES-2.4.1.tar.bz2/po/ro.po Changed

@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n"
-"POT-Creation-Date: 2015-02-08 17:18-0300\n"
+"POT-Creation-Date: 2015-08-09 14:52-0300\n"
 "PO-Revision-Date: 2013-03-14 12:31+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Romanian <ro@li.org>\n"
@@ -18,8 +18,7 @@
 "X-Launchpad-Export-Date: 2013-03-28 10:56+0000\n"
 "X-Generator: Launchpad (build 16546)\n"
 
-#. TRANSLATORS: do not translate this message
-#: src/main.c:118
+#: src/main.c:128
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -28,22 +27,22 @@
 "http://lives.sourceforge.net/TRANS-README.txt"
 msgstr ""
 
-#: src/main.c:134
+#: src/main.c:153
 #, c-format
 msgid "%s Warning: %s\n"
 msgstr ""
 
-#: src/main.c:138
+#: src/main.c:157
 #, c-format
 msgid "%s Critical error: %s\n"
 msgstr ""
 
-#: src/main.c:139
+#: src/main.c:158
 #, c-format
 msgid "%s Fatal error: %s\n"
 msgstr ""
 
-#: src/main.c:176
+#: src/main.c:198
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -58,7 +57,7 @@
 "Mulţumesc. De recuperare ar trebui să fie posibilă în cazul în care "
 "reporniţi LiVES.\n"
 
-#: src/main.c:177
+#: src/main.c:199
 msgid ""
 "\n"
 "\n"
@@ -70,7 +69,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:180
+#: src/main.c:203
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -78,7 +77,7 @@
 "şi orice alte informaţii prezentate mai jos:\n"
 "\n"
 
-#: src/main.c:184
+#: src/main.c:206
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
@@ -88,84 +87,84 @@
 "multe informații.\n"
 "\n"
 
-#: src/main.c:192
+#: src/main.c:216
 msgid "Preserving set.\n"
 msgstr "Păstrarea set.\n"
 
-#: src/main.c:636
+#: src/main.c:691
 msgid "Resizing"
 msgstr "Redimensionare"
 
-#: src/main.c:643
+#: src/main.c:698
 msgid "_Resize All Frames"
 msgstr "_Redimensionarea tuturor cadrelor"
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:895
+#: src/main.c:948
 msgid "Any"
 msgstr "Orice"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:897
+#: src/main.c:950
 msgid "None"
 msgstr "Nimic"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:899
+#: src/main.c:952
 msgid "recommended"
 msgstr "recomandat"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:901
+#: src/main.c:954
 msgid "disabled !"
 msgstr "dezactivat !"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:903
+#: src/main.c:956
 msgid "**The current layout**"
 msgstr "** Structura actuală **"
 
 #. TRANSLATORS: adjective for "Built in" type effects
-#: src/main.c:905
+#: src/main.c:958
 msgid "Builtin"
 msgstr ""
 
 #. TRANSLATORS: adjective for "Custom" type effects
-#: src/main.c:907
+#: src/main.c:960
 msgid "Custom"
 msgstr ""
 
 #. TRANSLATORS: adjective for "Test" type effects
-#: src/main.c:909
+#: src/main.c:962
 msgid "Test"
 msgstr ""
 
-#: src/main.c:1054
+#: src/main.c:1107
 msgid "Foreground"
 msgstr ""
 
-#: src/main.c:1055
+#: src/main.c:1108
 #, fuzzy
 msgid "Background"
 msgstr "_Ignoră schimbările"
 
-#: src/main.c:1566
+#: src/main.c:1624
 msgid "Loading realtime effect plugins..."
 msgstr "Se incarcă modulele de efecte in timp real..."
 
-#: src/main.c:1631
+#: src/main.c:1690
 msgid "Starting jack audio server..."
 msgstr "Pornirea serverului audio jack..."
 
-#: src/main.c:1633
+#: src/main.c:1692
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1634
+#: src/main.c:1693
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1663
+#: src/main.c:1723
 #, c-format
 msgid ""
 "\n"
@@ -177,114 +176,114 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1697
+#: src/main.c:1758
 msgid "Starting pulse audio server..."
 msgstr "Pornirea serverului audio pulse..."
 
-#: src/main.c:1765
+#: src/main.c:1825
 msgid "Checking optional dependencies:"
 msgstr "Verificarea dependenţelor opţionale:"
 
-#: src/main.c:1766
+#: src/main.c:1826
 msgid "mplayer...detected..."
 msgstr "mplayer...a fost detectat..."
 
-#: src/main.c:1767
+#: src/main.c:1827
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer... nu a fost detectat..."
 
-#: src/main.c:1768
+#: src/main.c:1828
 #, fuzzy
 msgid "mplayer2...detected..."
 msgstr "mplayer...a fost detectat..."
 
-#: src/main.c:1769
+#: src/main.c:1829
 #, fuzzy
 msgid "mplayer2...NOT DETECTED..."
 msgstr "mplayer... nu a fost detectat..."
 
-#: src/main.c:1770
+#: src/main.c:1830
 msgid "convert...detected..."
 msgstr "convert...detectat..."
 
-#: src/main.c:1771
+#: src/main.c:1831
 msgid "convert...NOT DETECTED..."
 msgstr "convert...NU A FOST DETECTAT..."
 
-#: src/main.c:1772
+#: src/main.c:1832
 msgid "composite...detected..."
 msgstr "composite...detectat..."
 
-#: src/main.c:1773
+#: src/main.c:1833
 msgid "composite...NOT DETECTED..."
 msgstr "composite...NU A FOST DETECTAT..."
 
-#: src/main.c:1774
+#: src/main.c:1834
 msgid "sox...detected\n"
 msgstr "sox...detectat\n"
 
-#: src/main.c:1775
+#: src/main.c:1835
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...NU A FOST DETECTAT\n"
 
-#: src/main.c:1776
+#: src/main.c:1836
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...detectat..."
 
-#: src/main.c:1777
+#: src/main.c:1837
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...NU A FOST DETECTAT..."
 
-#: src/main.c:1778
+#: src/main.c:1838
 msgid "jackd...detected..."
 msgstr "jackd...detectat..."
 
-#: src/main.c:1779
+#: src/main.c:1839
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...NU A FOST DETECTAT..."
 
-#: src/main.c:1780
+#: src/main.c:1840
 msgid "pulse audio...detected..."
 msgstr "pulse audio...detectat..."
 
-#: src/main.c:1781
+#: src/main.c:1841
 msgid "pulse audio...NOT DETECTED..."
 msgstr "pulse audio...NU A FOST DETECTAT..."
 
-#: src/main.c:1782
+#: src/main.c:1842
 msgid "python...detected..."
 msgstr "python...detectat..."
 
-#: src/main.c:1783
+#: src/main.c:1843
 msgid "python...NOT DETECTED..."
 msgstr "python...NU A FOST DETECTAT..."
 
-#: src/main.c:1784
+#: src/main.c:1844
 msgid "dvgrab...detected..."
 msgstr "dvgrab...detectat..."
 
-#: src/main.c:1785
+#: src/main.c:1845
 msgid "dvgrab...NOT DETECTED..."
 msgstr "dvgrab...NU A FOST DETECTAT..."
 
-#: src/main.c:1786
+#: src/main.c:1846
 msgid "xwininfo...detected..."
 msgstr "xwininfo...detectat..."
 
-#: src/main.c:1787
+#: src/main.c:1847
 msgid "xwininfo...NOT DETECTED..."
 msgstr "xwininfo...NU A FOST DETECTAT..."
 
-#: src/main.c:1793
+#: src/main.c:1853
 #, c-format
 msgid "Windows version %04X"
 msgstr ""
 
-#: src/main.c:1795
+#: src/main.c:1855
 msgid "UNKNOWN - please patch me !"
 msgstr ""
 
-#: src/main.c:1799
+#: src/main.c:1859
 #, c-format
 msgid ""
 "\n"
@@ -295,48 +294,48 @@
 "\n"
 "Rapoarte de manager de ferestre ca \"%s\"; "
 
-#: src/main.c:1802
+#: src/main.c:1862
 #, c-format
 msgid "number of monitors detected: %d\n"
 msgstr "numărul de monitoare detectate: %d\n"
 
-#: src/main.c:1805
+#: src/main.c:1865
 #, c-format
 msgid "Number of CPUs detected: %d "
 msgstr ""
 
-#: src/main.c:1808 src/multitrack.c:4902
+#: src/main.c:1868 src/multitrack.c:5068
 msgid "little endian"
 msgstr ""
 
-#: src/main.c:1809 src/multitrack.c:4901
+#: src/main.c:1869 src/multitrack.c:5067
 msgid "big endian"
 msgstr ""
 
-#: src/main.c:1810
+#: src/main.c:1870
 #, c-format
 msgid "(%d bits, %s)\n"
 msgstr ""
 
-#: src/main.c:1814
+#: src/main.c:1874
 msgid "GUI type is: "
 msgstr ""
 
-#: src/main.c:1818
+#: src/main.c:1878
 #, c-format
 msgid "GTK+ version %d.%d.%d (compiled with %d.%d.%d)"
 msgstr ""
 
-#: src/main.c:1840
+#: src/main.c:1900
 msgid ", with cairo support"
 msgstr ""
 
-#: src/main.c:1847
+#: src/main.c:1907
 #, c-format
 msgid "Temp directory is %s\n"
 msgstr "Directorul temporar este de %s\n"
 
-#: src/main.c:1851
+#: src/main.c:1911
 msgid ""
 "WARNING - this version of LiVES was compiled without either\n"
 "jack or pulse audio support.\n"
@@ -346,15 +345,15 @@
 "suport pentru jack sau pulse audio.\n"
 "Multe din funcțiile audio vor fi indisponibile.\n"
 
-#: src/main.c:1854
+#: src/main.c:1914
 msgid "Compiled with jack support, good !\n"
 msgstr "Compilate cu suport jack, de bine !\n"
 
-#: src/main.c:1857
+#: src/main.c:1917
 msgid "Compiled with pulse audio support, wonderful !\n"
 msgstr "Compilate cu suport de pulse audio, minunat\n"
 
-#: src/main.c:1861
+#: src/main.c:1921
 #, c-format
 msgid ""
 "Welcome to LiVES version %s.\n"
@@ -363,7 +362,7 @@
 "Bine ati venit la LiVES versiunea %s.\n"
 "\n"
 
-#: src/main.c:2306
+#: src/main.c:2380
 #, c-format
 msgid ""
 "\n"
@@ -372,87 +371,92 @@
 "\n"
 "Sintaxa de start este: %s [opts] [filename [start_time] [frames]]\n"
 
-#: src/main.c:2307
+#: src/main.c:2381
 msgid "Where: filename is the name of a media file or backup file.\n"
 msgstr ""
 "În cazul în care: de nume de fişier este numele de mass-media un fişier sau "
 "un fişier copie de rezervă.\n"
 
-#: src/main.c:2308
+#: src/main.c:2382
 msgid "start_time : filename start time in seconds\n"
 msgstr "start_time : timpul de start al fișierului in secunde\n"
 
-#: src/main.c:2309
+#: src/main.c:2383
 msgid "frames : maximum number of frames to open\n"
 msgstr "frames : numărul maxim de cadre pentru a deschide\n"
 
-#: src/main.c:2311
+#: src/main.c:2385
 msgid "opts can be:\n"
 msgstr "opts pot fi:\n"
 
-#: src/main.c:2312
+#: src/main.c:2386
 msgid "-help            : show this help text and exit\n"
 msgstr "-help : arată acest text de ajutor şi de ieşire\n"
 
-#: src/main.c:2313
+#: src/main.c:2387
 msgid "-tmpdir <tempdir>: use alternate working directory (e.g /var/ramdisk)\n"
 msgstr ""
 
-#: src/main.c:2314
+#: src/main.c:2388
 msgid "-set <setname>   : autoload clip set setname\n"
 msgstr ""
 
-#: src/main.c:2315
+#: src/main.c:2389
 msgid "-noset           : do not load any set on startup\n"
 msgstr "-noset : Nu încărcaţi orice set la pornire\n"
 
-#: src/main.c:2316
+#: src/main.c:2390
 msgid "-norecover       : force no-loading of crash recovery\n"
 msgstr "-norecover : vigoare nu-de încărcare de crash de recuperare\n"
 
-#: src/main.c:2317
+#: src/main.c:2391
 msgid "-recover         : force loading of crash recovery\n"
 msgstr "-recover : forţa de încărcare de accident de recuperare\n"
 
-#: src/main.c:2318
-msgid "-nothreaddialog  : doe nothing - retained for backwards compatibility\n"
+#: src/main.c:2392
+msgid ""
+"-nothreaddialog  : does nothing - retained for backwards compatibility\n"
 msgstr ""
 
-#: src/main.c:2319
+#: src/main.c:2393
 msgid "-nogui           : do not show the gui\n"
 msgstr "-nogui : Nu afişa GUI\n"
 
-#: src/main.c:2320
+#: src/main.c:2394
 msgid "-nosplash        : do not show the splash window\n"
 msgstr ""
 
-#: src/main.c:2321
+#: src/main.c:2395
 msgid "-noplaywin       : do not show the play window\n"
 msgstr ""
 
-#: src/main.c:2322
+#: src/main.c:2396
+msgid "-noninteractive  : disable menu interactivity\n"
+msgstr ""
+
+#: src/main.c:2397
 msgid "-startup-ce      : start in clip editor mode\n"
 msgstr "-startup-ce      : pornește in modul editare clip\n"
 
-#: src/main.c:2323
+#: src/main.c:2398
 msgid "-startup-mt      : start in multitrack mode\n"
 msgstr "-startup-mt : porni în modul multicale\n"
 
-#: src/main.c:2324
+#: src/main.c:2399
 msgid ""
 "-fxmodesmax <n>  : allow <n> modes per effect key (minimum is 1, default is "
 "8)\n"
 msgstr ""
 
-#: src/main.c:2326
+#: src/main.c:2401
 msgid "-oscstart <port> : start OSC listener on UDP port <port>\n"
 msgstr "-oscstart <port> : pornește ascultătorul OSCpe portul UDP <port>\n"
 
-#: src/main.c:2327
+#: src/main.c:2402
 msgid "-nooscstart      : do not start OSC listener\n"
 msgstr "-nooscstart : nu începeţi ascultător OSC\n"
 
-#: src/main.c:2329
+#: src/main.c:2404
 #, fuzzy
 msgid ""
 "-aplayer <ap>    : start with selected audio player. <ap> can be mplayer, "
@@ -461,45 +465,45 @@
 "-aplayer <ap>    : pornește cu playerul audio selectat. <ap> poate fi mplayer"
 
 #. TRANSLATORS: pulse (audio)
-#: src/main.c:2332
+#: src/main.c:2407
 msgid ", pulse"
 msgstr ", pulse"
 
-#: src/main.c:2335
+#: src/main.c:2410
 msgid ", sox or jack\n"
 msgstr ", sox sau jack\n"
 
-#: src/main.c:2336
+#: src/main.c:2412
 msgid ""
 "-jackopts <opts>    : opts is a bitmap of jack startup options [1 = jack "
 "transport client, 2 = jack transport master, 4 = start jack transport "
 "server, 8 = pause audio when video paused, 16 = start jack audio server] \n"
 msgstr ""
 
-#: src/main.c:2338
+#: src/main.c:2414
 msgid " or sox\n"
 msgstr " sau sox\n"
 
-#: src/main.c:2340
+#: src/main.c:2416
 msgid "-devicemap <mapname>          : autoload devicemap\n"
 msgstr ""
 
-#: src/main.c:2341
+#: src/main.c:2418
 msgid ""
 "-vppdefaults <file>          : load video playback plugin defaults from "
 "<file> (Note: only sets the settings, not the plugin type)\n"
 msgstr ""
 
-#: src/main.c:2342
+#: src/main.c:2419
 msgid "-debug            : try to debug crashes (requires 'gdb' installed)\n"
 msgstr ""
 "-debug : încerca să se blochează de depanare (necesită 'gdb' instalat)\n"
 
-#: src/main.c:2373 src/gui.c:1128
+#: src/main.c:2449 src/gui.c:1127
 msgid "Starting GUI..."
 msgstr "Incepand GUI ..."
 
-#: src/main.c:2396
+#: src/main.c:2475
 #, c-format
 msgid ""
 "\n"
@@ -510,7 +514,7 @@
 "(Maybe you need to change the value of <prefix_dir> in your %s file)\n"
 msgstr ""
 
-#: src/main.c:2410
+#: src/main.c:2492
 #, c-format
 msgid ""
 "\n"
@@ -518,7 +522,7 @@
 "Please make sure you have write access to %s and try again.\n"
 msgstr ""
 
-#: src/main.c:2415
+#: src/main.c:2498
 msgid ""
 "\n"
 "`smogrify` must be in your path, and be executable\n"
@@ -527,7 +531,7 @@
 "before running LiVES.\n"
 msgstr ""
 
-#: src/main.c:2421
+#: src/main.c:2504
 #, c-format
 msgid ""
 "\n"
@@ -537,7 +541,7 @@
 "Please check the file permissions for this file and try again.\n"
 msgstr ""
 
-#: src/main.c:2428
+#: src/main.c:2512
 #, c-format
 msgid ""
 "\n"
@@ -548,7 +552,7 @@
 "and try again.\n"
 msgstr ""
 
-#: src/main.c:2438
+#: src/main.c:2522
 #, c-format
 msgid ""
 "Please check the <tempdir> setting in \n"
@@ -556,7 +560,7 @@
 "and try again.\n"
 msgstr ""
 
-#: src/main.c:2445
+#: src/main.c:2528
 #, c-format
 msgid ""
 "\n"
@@ -566,7 +570,7 @@
 "%s"
 msgstr ""
 
-#: src/main.c:2453
+#: src/main.c:2536
 msgid ""
 "\n"
 "An incorrect version of smogrify was found in your path.\n"
@@ -577,49 +581,49 @@
 "Thankyou.\n"
 msgstr ""
 
-#: src/main.c:2458
+#: src/main.c:2541
 msgid ""
 "\n"
 "LiVES currently requires 'mplayer', 'mplayer2' or 'sox' to function. Please "
 "install one or other of these, and try again.\n"
 msgstr ""
 
-#: src/main.c:2462
+#: src/main.c:2546
 msgid ""
 "\n"
 "LiVES currently requires both 'mplayer' or 'mplayer2' and 'sox' to function. "
 "Please install these, and try again.\n"
 msgstr ""
 
-#: src/main.c:2472
+#: src/main.c:2556
 msgid ""
 "\n"
 "LiVES was unable to locate 'mplayer' or 'mplayer2'. You may wish to install "
 "either one to use LiVES more fully.\n"
 msgstr ""
 
-#: src/main.c:2475
+#: src/main.c:2561
 msgid ""
 "\n"
 "LiVES was unable to locate 'convert'. You should install convert and image-"
 "magick if you want to use rendered effects.\n"
 msgstr ""
 
-#: src/main.c:2478
+#: src/main.c:2566
 msgid ""
 "\n"
 "LiVES was unable to locate 'composite'. You should install composite and "
 "image-magick if you want to use the merge function.\n"
 msgstr ""
 
-#: src/main.c:2481
+#: src/main.c:2570
 msgid ""
 "\n"
 "LiVES was unable to locate 'sox'. Some audio features may not work. You "
 "should install 'sox'.\n"
 msgstr ""
 
-#: src/main.c:2484
+#: src/main.c:2575
 #, c-format
 msgid ""
 "\n"
@@ -630,59 +634,59 @@
 "You may need to change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/main.c:2611
+#: src/main.c:2707
 #, c-format
 msgid "Autoloading set %s..."
 msgstr ""
 
 #. TRANSLATORS: localised name may be used here
-#: src/main.c:2781 src/interface.c:738
+#: src/main.c:2902
 msgid "LiVES"
 msgstr ""
 
-#: src/main.c:2948
+#: src/main.c:3066
 #, c-format
 msgid "Invalid audio player %s\n"
 msgstr ""
 
-#: src/main.c:3077
+#: src/main.c:3214
 #, c-format
 msgid "LiVES-%s: <Untitled%d> %dx%d : %d frames %d bpp %.3f fps"
 msgstr "LiVES-%s: <Fără titlu%d> %dx%d : %d cadre %d bpp %.3f fps"
 
-#: src/main.c:3082
+#: src/main.c:3219
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : ??? frames ??? bpp %.3f fps"
 msgstr "LiVES-%s: <%s> %dx%d : ??? cadre ??? bpp %.3f fps"
 
-#: src/main.c:3086
+#: src/main.c:3222
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : %d frames %d bpp %.3f fps"
 msgstr "LiVES-%s: <%s> %dx%d : %d cadre %d bpp %.3f fps"
 
-#: src/main.c:3094
+#: src/main.c:3229
 #, c-format
 msgid "LiVES-%s: <No File>"
 msgstr "LiVES-%s: <Nici un fişier>"
 
 #. TRANSLATORS: rec(ord)
-#: src/main.c:5085
+#: src/main.c:5201
 #, c-format
 msgid "rec %9d/%d"
 msgstr ""
 
 #. TRANSLATORS: out of memory (rec(ord))
-#: src/main.c:5091
+#: src/main.c:5206
 #, c-format
 msgid "!rec %9d/%d"
 msgstr ""
 
-#: src/main.c:5398 src/main.c:5399 src/gui.c:2110 src/gui.c:3220
-#: src/saveplay.c:2336
+#: src/main.c:5500 src/main.c:5501 src/gui.c:2108 src/gui.c:3331
+#: src/saveplay.c:2315
 msgid "Play"
 msgstr "Rulează"
 
-#: src/main.c:6128
+#: src/main.c:6216
 msgid ""
 "LiVES was unable to capture this image\n"
 "\n"
@@ -690,35 +694,35 @@
 "LiVES nu a putut pentru a capta această imagine\n"
 "\n"
 
-#: src/main.c:6250
+#: src/main.c:6345
 #, c-format
 msgid "Closed file %s\n"
 msgstr "Închis de fişiere% s\n"
 
-#: src/main.c:6452 src/gui.c:648 src/utils.c:4312 src/utils.c:4344
-#: src/saveplay.c:3550 src/multitrack.c:4510 src/multitrack.c:6268
+#: src/main.c:6542 src/gui.c:647 src/utils.c:4256 src/utils.c:4286
+#: src/saveplay.c:3500 src/multitrack.c:4678 src/multitrack.c:6447
 msgid "_Undo"
 msgstr "An_ulează ultima acțiune"
 
-#: src/main.c:6453 src/gui.c:666 src/utils.c:4313 src/utils.c:4345
-#: src/saveplay.c:3551 src/multitrack.c:4531 src/multitrack.c:6293
+#: src/main.c:6543 src/gui.c:665 src/utils.c:4257 src/utils.c:4287
+#: src/saveplay.c:3501 src/multitrack.c:4698 src/multitrack.c:6472
 msgid "_Redo"
 msgstr "_Refă ultima acțiune"
 
-#: src/main.c:6493 src/interface.c:470 src/gui.c:2326 src/preferences.c:2357
-#: src/resample.c:1516
+#: src/main.c:6583 src/interface.c:457 src/gui.c:2324 src/preferences.c:2391
+#: src/resample.c:1488
 msgid "Video"
 msgstr "Video"
 
-#: src/main.c:6494 src/interface.c:483 src/gui.c:2351
+#: src/main.c:6584 src/interface.c:470 src/gui.c:2348
 msgid "Left Audio"
 msgstr ""
 
-#: src/main.c:6495 src/gui.c:2375
+#: src/main.c:6585 src/gui.c:2371
 msgid "Right Audio"
 msgstr ""
 
-#: src/main.c:6540
+#: src/main.c:6630
 msgid ""
 "\n"
 "\n"
@@ -727,11 +731,11 @@
 "Please adjust the playback options in Preferences and try again.\n"
 msgstr ""
 
-#: src/main.c:7051 src/plugins.c:1502
+#: src/main.c:7134 src/plugins.c:1468
 msgid "LiVES: - Play Window"
 msgstr ""
 
-#: src/startup.c:25
+#: src/startup.c:24
 #, c-format
 msgid ""
 "A directory named\n"
@@ -741,7 +745,7 @@
 "(Free space = %s)\n"
 msgstr ""
 
-#: src/startup.c:32
+#: src/startup.c:29
 #, c-format
 msgid ""
 "A directory named\n"
@@ -751,7 +755,7 @@
 "Please select another location.\n"
 msgstr ""
 
-#: src/startup.c:49
+#: src/startup.c:46
 #, c-format
 msgid ""
 "\n"
@@ -762,7 +766,7 @@
 "(Free space = %s)"
 msgstr ""
 
-#: src/startup.c:54
+#: src/startup.c:50
 #, c-format
 msgid ""
 "\n"
@@ -771,54 +775,54 @@
 "Please try again and choose a different location.\n"
 msgstr ""
 
-#: src/startup.c:96
+#: src/startup.c:92
 msgid "Directory name is too long !"
 msgstr ""
 
-#: src/startup.c:223
+#: src/startup.c:216
 msgid ""
 "LiVES FAILED TO START YOUR SELECTED AUDIO PLAYER !\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:230
+#: src/startup.c:222
 msgid ""
 "Before starting LiVES, you need to choose an audio player.\n"
 "\n"
 "PULSE AUDIO is recommended for most users"
 msgstr ""
 
-#: src/startup.c:233
+#: src/startup.c:225
 msgid ""
 ", but this version of LiVES was not compiled with pulse audio support.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:236
+#: src/startup.c:229
 msgid ""
 ", but you do not have pulse audio installed on your system.\n"
 " You are advised to install pulse audio first before running LiVES.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:241
+#: src/startup.c:233
 msgid "JACK audio is recommended for pro users"
 msgstr ""
 
-#: src/startup.c:244
+#: src/startup.c:236
 msgid ""
 ", but this version of LiVES was not compiled with jack audio support.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:247
+#: src/startup.c:239
 msgid ""
 ", but you do not have jackd installed. You may wish to install jackd first "
 "before running LiVES.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:250
+#: src/startup.c:242
 msgid ""
 ", but may prevent LiVES from starting on some systems.\n"
 "If LiVES will not start with jack, you can restart and try with another "
@@ -826,159 +830,159 @@
 "\n"
 msgstr ""
 
-#: src/startup.c:254
+#: src/startup.c:246
 msgid "SOX may be used if neither of the preceding players work, "
 msgstr ""
 
-#: src/startup.c:257
+#: src/startup.c:249
 msgid ""
 "but some audio features will be disabled.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:260
+#: src/startup.c:251
 msgid ""
 "but you do not have sox installed.\n"
 "You are advised to install it before running LiVES.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:264
+#: src/startup.c:255
 msgid ""
 "The MPLAYER/MPLAYER2 audio player is only recommended for testing purposes.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:281
+#: src/startup.c:271
 msgid "LiVES: - Choose an audio player"
 msgstr ""
 
-#: src/startup.c:298
+#: src/startup.c:288
 msgid "Use _pulse audio player"
 msgstr ""
 
-#: src/startup.c:320
+#: src/startup.c:310
 msgid "Use _jack audio player"
 msgstr ""
 
-#: src/startup.c:340
+#: src/startup.c:330
 msgid "Use _sox audio player"
 msgstr ""
 
-#: src/startup.c:361
+#: src/startup.c:351
 msgid "Use _mplayer audio player"
 msgstr ""
 
-#: src/startup.c:381
+#: src/startup.c:371
 msgid "Use _mplayer2 audio player"
 msgstr ""
 
-#: src/startup.c:405 src/startup.c:580 src/interface.c:1506
+#: src/startup.c:395 src/startup.c:569 src/interface.c:1398
 msgid "_Next"
 msgstr "Î_nainte"
 
-#: src/startup.c:445
+#: src/startup.c:435
 msgid "Skipped"
 msgstr ""
 
-#: src/startup.c:460
+#: src/startup.c:450
 msgid "Passed"
 msgstr ""
 
-#: src/startup.c:493
+#: src/startup.c:483
 msgid "Failed"
 msgstr ""
 
-#: src/startup.c:552
+#: src/startup.c:542
 msgid "LiVES: - Testing Configuration"
 msgstr ""
 
-#: src/startup.c:555
+#: src/startup.c:544
 msgid "LiVES: - Troubleshoot"
 msgstr ""
 
-#: src/startup.c:568
+#: src/startup.c:557
 msgid "LiVES will now run some basic configuration tests\n"
 msgstr ""
 
-#: src/startup.c:603
+#: src/startup.c:591
 msgid "Checking for \"sox\" presence"
 msgstr ""
 
-#: src/startup.c:607
+#: src/startup.c:595
 msgid ""
 "You should install sox to be able to use all the audio features in LiVES"
 msgstr ""
 
-#: src/startup.c:615
+#: src/startup.c:602
 msgid "Checking if sox can convert audio"
 msgstr ""
 
-#: src/startup.c:638
+#: src/startup.c:625
 msgid "Unable to allocate 176400 bytes memory."
 msgstr ""
 
-#: src/startup.c:653
+#: src/startup.c:639
 #, c-format
 msgid "Unable to write to: %s"
 msgstr ""
 
-#: src/startup.c:667 src/startup.c:807
+#: src/startup.c:653 src/startup.c:789
 #, c-format
 msgid "Command failed: %s"
 msgstr ""
 
-#: src/startup.c:689
+#: src/startup.c:675
 msgid "You should install sox_fmt_all or similar"
 msgstr ""
 
-#: src/startup.c:717
+#: src/startup.c:703
 msgid "Checking for \"mplayer\" presence"
 msgstr ""
 
-#: src/startup.c:721
+#: src/startup.c:707
 msgid ""
 "You should install mplayer or mplayer2 to be able to use all the decoding "
 "features in LiVES"
 msgstr ""
 
-#: src/startup.c:747
+#: src/startup.c:732
 msgid "Checking if mplayer can convert audio"
 msgstr ""
 
-#: src/startup.c:768
+#: src/startup.c:751
 msgid "You should install mplayer or mplayer2 with pcm/wav support"
 msgstr ""
 
-#: src/startup.c:785
+#: src/startup.c:767
 msgid "Checking if mplayer can decode to png/alpha"
 msgstr ""
 
-#: src/startup.c:828
+#: src/startup.c:810
 msgid "You may wish to upgrade mplayer to a newer version"
 msgstr ""
 
-#: src/startup.c:854
+#: src/startup.c:836
 msgid "Checking if mplayer can decode to jpeg"
 msgstr ""
 
-#: src/startup.c:882
+#: src/startup.c:862
 msgid "You should install mplayer with either png/alpha or jpeg support"
 msgstr ""
 
-#: src/startup.c:883
+#: src/startup.c:863
 msgid "You may wish to add jpeg output support to mplayer"
 msgstr ""
 
-#: src/startup.c:892
+#: src/startup.c:872
 msgid "Checking for \"convert\" presence"
 msgstr ""
 
-#: src/startup.c:896
+#: src/startup.c:876
 msgid "Install imageMagick to be able to use all of the rendered effects"
 msgstr ""
 
-#: src/startup.c:909
+#: src/startup.c:889
 msgid ""
 "\n"
 "\n"
@@ -986,7 +990,7 @@
 "Preferences/Decoding.    \n"
 msgstr ""
 
-#: src/startup.c:915
+#: src/startup.c:894
 msgid ""
 "\n"
 "\n"
@@ -994,49 +998,49 @@
 "continue    \n"
 msgstr ""
 
-#: src/startup.c:949
+#: src/startup.c:928
 msgid ""
 "\n"
 "\n"
 "Finally, you can choose the default startup interface for LiVES.\n"
 msgstr ""
 
-#: src/startup.c:950
+#: src/startup.c:929
 msgid ""
 "\n"
 "\n"
 "LiVES has two main interfaces and you can start up with either of them.\n"
 msgstr ""
 
-#: src/startup.c:951
+#: src/startup.c:930
 msgid ""
 "\n"
 "\n"
 "The default can always be changed later from Preferences.\n"
 msgstr ""
 
-#: src/startup.c:961
+#: src/startup.c:940
 msgid "LiVES: - Choose the startup interface"
 msgstr ""
 
-#: src/startup.c:972
+#: src/startup.c:951
 msgid "Start in _Clip Edit mode"
 msgstr ""
 
-#: src/startup.c:975
+#: src/startup.c:954
 msgid "This is the best choice for simple editing tasks and for VJs\n"
 msgstr ""
 
-#: src/startup.c:981
+#: src/startup.c:960
 msgid "Start in _Multitrack mode"
 msgstr ""
 
-#: src/startup.c:983
+#: src/startup.c:962
 msgid ""
 "This is a better choice for complex editing tasks involving multiple clips.\n"
 msgstr ""
 
-#: src/startup.c:992
+#: src/startup.c:971
 msgid "_Finish"
 msgstr ""
 
@@ -1053,35 +1057,35 @@
 msgid "Apply _Deinterlace"
 msgstr ""
 
-#: src/interface.c:66
+#: src/interface.c:65
 msgid "If this is set, frames will be deinterlaced as they are imported."
 msgstr ""
 
-#: src/interface.c:113 src/callbacks.c:9623 src/callbacks.c:9646
-#: src/callbacks.c:9647 src/gui.c:3223 src/gui.c:3821 src/saveplay.c:2339
-#: src/saveplay.c:3138 src/dialogs.c:1514 src/dialogs.c:1515
-#: src/dialogs.c:1746 src/dialogs.c:1747 src/framedraw.c:238
-#: src/multitrack.c:8031
+#: src/interface.c:106 src/callbacks.c:9542 src/callbacks.c:9564
+#: src/callbacks.c:9565 src/gui.c:3333 src/gui.c:3946 src/saveplay.c:2317
+#: src/saveplay.c:3097 src/dialogs.c:1575 src/dialogs.c:1576
+#: src/dialogs.c:1804 src/dialogs.c:1805 src/framedraw.c:236
+#: src/multitrack.c:8210
 msgid "Preview"
 msgstr "Previzionează"
 
-#: src/interface.c:132
+#: src/interface.c:125
 msgid "Click here to _Preview any selected video, image or audio file"
 msgstr ""
 
-#: src/interface.c:135
+#: src/interface.c:127
 msgid "Click here to _Preview any selected audio file"
 msgstr ""
 
-#: src/interface.c:138
+#: src/interface.c:129
 msgid "Click here to _Preview the video"
 msgstr ""
 
-#: src/interface.c:181 src/dialogs.c:2542
+#: src/interface.c:169 src/dialogs.c:2621
 msgid "LiVES: - Processing..."
 msgstr ""
 
-#: src/interface.c:217
+#: src/interface.c:205
 msgid ""
 "\n"
 "\n"
@@ -1095,8 +1099,8 @@
 "\n"
 "Amintiţi-vă pentru a opri efectele (Ctrl-0) dupa aceea !"
 
-#: src/interface.c:222 src/callbacks.c:9373 src/callbacks.c:9420
-#: src/dialogs.c:2570
+#: src/interface.c:210 src/callbacks.c:9283 src/callbacks.c:9332
+#: src/dialogs.c:2649
 msgid ""
 "\n"
 "Please Wait"
@@ -1104,188 +1108,178 @@
 "\n"
 "Vă rugăm să aşteptaţi"
 
-#: src/interface.c:242
+#: src/interface.c:230
 msgid "Show Details"
 msgstr ""
 
-#: src/interface.c:254 src/dialogs.c:2584
+#: src/interface.c:242 src/dialogs.c:2663
 msgid "_Enough"
 msgstr "_Destul"
 
-#: src/interface.c:255 src/framedraw.c:278
+#: src/interface.c:243 src/framedraw.c:276
 msgid "_Preview"
 msgstr "_Previzualizează"
 
-#: src/interface.c:257
+#: src/interface.c:245 src/callbacks.c:9282 src/callbacks.c:9330
 msgid "Paus_e"
 msgstr ""
 
-#: src/interface.c:258 src/callbacks.c:9417
+#: src/interface.c:246 src/callbacks.c:9329
 msgid "Pause/_Enough"
 msgstr ""
 
-#: src/interface.c:285
+#: src/interface.c:273
 msgid "_Cancel"
 msgstr "_Renunță"
 
-#: src/interface.c:374
+#: src/interface.c:361
 #, c-format
 msgid "LiVES: - %s"
 msgstr ""
 
-#: src/interface.c:376
+#: src/interface.c:363
 msgid "LiVES: - Multitrack details"
 msgstr ""
 
-#: src/interface.c:407
+#: src/interface.c:394
 msgid "Format"
 msgstr "Format"
 
-#: src/interface.c:412
+#: src/interface.c:399
 msgid "Frame size"
 msgstr "Dimensiune cadru"
 
-#: src/interface.c:417
+#: src/interface.c:404
 msgid "File size"
 msgstr "Dimensiune fișier"
 
-#: src/interface.c:418
+#: src/interface.c:405
 msgid "Byte size"
 msgstr "Octet dimensiuni"
 
-#: src/interface.c:423 src/interface.c:1891
+#: src/interface.c:410 src/interface.c:1760
 msgid "FPS"
 msgstr "FPS"
 
-#: src/interface.c:428
+#: src/interface.c:415
 msgid "Frames"
 msgstr "Cadre"
 
-#: src/interface.c:429
+#: src/interface.c:416
 msgid "Events"
 msgstr "Evenimente"
 
-#: src/interface.c:434 src/interface.c:500 src/interface.c:542
+#: src/interface.c:421 src/interface.c:486 src/interface.c:528
 msgid "Total time"
 msgstr "Timp total"
 
-#: src/interface.c:486 src/resample.c:1488
+#: src/interface.c:472 src/resample.c:1460
 msgid "Audio"
 msgstr "Sunet"
 
-#: src/interface.c:511 src/interface.c:553
+#: src/interface.c:497 src/interface.c:539
 msgid "Rate/size"
 msgstr "Tarif/dimensiune"
 
-#: src/interface.c:530
+#: src/interface.c:516
 msgid "Right audio"
 msgstr ""
 
-#: src/interface.c:622
+#: src/interface.c:607
 msgid "LiVES: - Encoding options"
 msgstr ""
 
-#: src/interface.c:636
+#: src/interface.c:621
 msgid "<------------- (Check the box to re_size as suggested)"
 msgstr ""
 
-#: src/interface.c:637
+#: src/interface.c:622
 msgid "<------------- (Check the box to use the _size recommendation)"
 msgstr ""
 
-#: src/interface.c:662
+#: src/interface.c:646
 msgid "Use _letterboxing to maintain aspect ratio (optional)"
 msgstr ""
 
-#: src/interface.c:663
+#: src/interface.c:647
 msgid ""
 "Draw black rectangles either above or to the sides of the image, to prevent "
 "it from stretching."
 msgstr ""
 
-#: src/interface.c:694
+#: src/interface.c:677
 msgid "Keep _my settings"
 msgstr "Păstraţi setările _mele"
 
-#: src/interface.c:695
+#: src/interface.c:678
 msgid "Use _recommended settings"
 msgstr ""
 
-#: src/interface.c:775 src/dialogs.c:114
-msgid ""
-"Do _not show this warning any more\n"
-"(can be turned back on from Preferences/Warnings)"
-msgstr ""
-
-#: src/interface.c:787
-msgid "Show _Details"
-msgstr ""
-
-#: src/interface.c:881
+#: src/interface.c:769
 msgid "_Close Window"
 msgstr "În_chide fereastră"
 
-#: src/interface.c:883
+#: src/interface.c:771
 msgid "_Save to file"
 msgstr "_Salvaţi în fişier"
 
-#: src/interface.c:928
+#: src/interface.c:816
 msgid "LiVES: - Insert"
 msgstr "LiVES: - Insera"
 
-#: src/interface.c:945
+#: src/interface.c:833
 msgid "_Number of times to insert"
 msgstr "_Numărul de ori pentru a insera"
 
-#: src/interface.c:954
+#: src/interface.c:842
 msgid "_Insert to fit audio"
 msgstr ""
 
-#: src/interface.c:968
+#: src/interface.c:856
 msgid "Insert _before selection"
 msgstr ""
 
-#: src/interface.c:970
+#: src/interface.c:858
 msgid "Insert clipboard before selected frames"
 msgstr ""
 
-#: src/interface.c:986
+#: src/interface.c:875
 msgid "Insert _after selection"
 msgstr ""
 
-#: src/interface.c:988
+#: src/interface.c:877
 msgid "Insert clipboard after selected frames"
 msgstr ""
 
-#: src/interface.c:999
+#: src/interface.c:888
 msgid "Insert _with sound"
 msgstr "Introduceţi _cu sunet"
 
-#: src/interface.c:1012
+#: src/interface.c:901
 msgid "Insert with_out sound"
 msgstr "Introduceţi _fără sunet"
 
-#: src/interface.c:1093
+#: src/interface.c:985
 msgid "LiVES: - Open Selection"
 msgstr "LiVES: - Deschidere de selecţie"
 
-#: src/interface.c:1111
+#: src/interface.c:1004
 msgid "Selection start time (sec)"
 msgstr ""
 
-#: src/interface.c:1117
+#: src/interface.c:1010
 msgid "Number of frames to open"
 msgstr ""
 
-#: src/interface.c:1193
+#: src/interface.c:1088
 msgid "LiVES: - Open Location"
 msgstr ""
 
-#: src/interface.c:1195
+#: src/interface.c:1090
 msgid "LiVES: - Open Youtube Clip"
 msgstr ""
 
-#: src/interface.c:1213
+#: src/interface.c:1109
 msgid ""
 "\n"
 "\n"
@@ -1295,7 +1289,7 @@
 "\n"
 msgstr ""
 
-#: src/interface.c:1216
+#: src/interface.c:1112
 msgid ""
 "\n"
 "\n"
@@ -1304,62 +1298,62 @@
 "\n"
 msgstr ""
 
-#: src/interface.c:1220
+#: src/interface.c:1116
 msgid ""
 "Enter the URL of the clip below.\n"
 "E.g: http://www.youtube.com/watch?v=WCR6f6WzjP8\n"
 "\n"
 msgstr ""
 
-#: src/interface.c:1231
+#: src/interface.c:1127
 msgid "URL : "
 msgstr "URL : "
 
-#: src/interface.c:1231
+#: src/interface.c:1127
 msgid "Youtube URL : "
 msgstr ""
 
-#: src/interface.c:1235
+#: src/interface.c:1131
 msgid "Do not send bandwidth information"
 msgstr "Nu trimiteţi informaţiile latime de banda"
 
-#: src/interface.c:1237
+#: src/interface.c:1133
 msgid "Try this setting if you are having problems getting a stream"
 msgstr "Încercaţi această setare dacă aveţi probleme cu obţinerea unui flux de"
 
-#: src/interface.c:1258
+#: src/interface.c:1155
 msgid "Download to _Directory : "
 msgstr ""
 
-#: src/interface.c:1276
+#: src/interface.c:1173
 msgid "Download _File Name : "
 msgstr ""
 
-#: src/interface.c:1281
+#: src/interface.c:1178
 msgid ".webm"
 msgstr ""
 
-#: src/interface.c:1359
+#: src/interface.c:1256
 msgid "LiVES: - Rename Clip"
 msgstr "LiVES: - Redenumiţi Clip"
 
-#: src/interface.c:1362
-msgid "LiVES: - Enter Set Name"
+#: src/interface.c:1258
+msgid "LiVES: - Enter Set Name to Save as"
 msgstr ""
 
-#: src/interface.c:1365
+#: src/interface.c:1260
 msgid "LiVES: - Enter a Set Name to Reload"
 msgstr ""
 
-#: src/interface.c:1368
+#: src/interface.c:1262
 msgid "LiVES: - Choose a Working Directory"
 msgstr "LiVES: - Alegeţi un director de lucru"
 
-#: src/interface.c:1371
+#: src/interface.c:1264
 msgid "LiVES: - Rename Current Track"
 msgstr ""
 
-#: src/interface.c:1391
+#: src/interface.c:1283
 msgid ""
 "You need to enter a name for the current clip set.\n"
 "This will allow you reload the layout with the same clips later.\n"
@@ -1367,13 +1361,13 @@
 "LiVES will remind you to save the clip set later when you try to exit.\n"
 msgstr ""
 
-#: src/interface.c:1397
+#: src/interface.c:1289
 msgid ""
 "In order to export this project, you must enter a name for this clip set.\n"
 "This will also be used for the project name.\n"
 msgstr ""
 
-#: src/interface.c:1404
+#: src/interface.c:1296
 msgid ""
 "Welcome to LiVES !\n"
 "This startup wizard will guide you through the\n"
@@ -1384,341 +1378,341 @@
 "iniţială a instala astfel încât să puteţi obţine cele mai multe de la "
 "această cerere.\n"
 
-#: src/interface.c:1408
+#: src/interface.c:1300
 msgid ""
 "\n"
 "First of all you need to choose a working directory for LiVES.\n"
 "This should be a directory with plenty of disk space available.\n"
 msgstr ""
 
-#: src/interface.c:1427
+#: src/interface.c:1317
 msgid "New name "
 msgstr "Nume nou "
 
-#: src/interface.c:1430
+#: src/interface.c:1319
 msgid "Set name "
 msgstr ""
 
-#: src/interface.c:1550
+#: src/interface.c:1435
 msgid "Use def_aults"
 msgstr ""
 
-#: src/interface.c:1553 src/interface.c:1840 src/preferences.c:2515
-#: src/preferences.c:2697
+#: src/interface.c:1437 src/interface.c:1709 src/preferences.c:2550
+#: src/preferences.c:2739
 msgid "_Advanced"
 msgstr ""
 
-#: src/interface.c:1604
+#: src/interface.c:1487
 msgid "LiVES:- Select input device"
 msgstr ""
 
-#: src/interface.c:1622
+#: src/interface.c:1504
 msgid "Select input device:"
 msgstr ""
 
-#: src/interface.c:1686
+#: src/interface.c:1568
 msgid "LiVES:- Load CD Track"
 msgstr ""
 
-#: src/interface.c:1689
+#: src/interface.c:1570
 msgid "LiVES:- Select DVD Title/Chapter"
 msgstr ""
 
-#: src/interface.c:1692
+#: src/interface.c:1572
 msgid "LiVES:- Select VCD Title"
 msgstr ""
 
-#: src/interface.c:1695
+#: src/interface.c:1574
 msgid "LiVES:- Change Maximum Visible Tracks"
 msgstr ""
 
-#: src/interface.c:1698
+#: src/interface.c:1576
 msgid "LiVES:- Device details"
 msgstr ""
 
-#: src/interface.c:1721
+#: src/interface.c:1598
 #, c-format
 msgid "Track to load (from %s)"
 msgstr ""
 
-#: src/interface.c:1724
+#: src/interface.c:1600
 msgid "DVD Title"
 msgstr ""
 
-#: src/interface.c:1727
+#: src/interface.c:1602
 msgid "VCD Title"
 msgstr ""
 
-#: src/interface.c:1730
+#: src/interface.c:1604
 msgid "Maximum number of tracks to display"
 msgstr ""
 
-#: src/interface.c:1733
+#: src/interface.c:1606
 msgid "Device:        /dev/video"
 msgstr ""
 
-#: src/interface.c:1736
+#: src/interface.c:1608
 msgid "Device:        fw:"
 msgstr ""
 
-#: src/interface.c:1771
+#: src/interface.c:1641
 msgid "Chapter  "
 msgstr "Capitol  "
 
-#: src/interface.c:1776
+#: src/interface.c:1645
 msgid "Channel  "
 msgstr ""
 
-#: src/interface.c:1791
+#: src/interface.c:1660
 msgid "Audio ID  "
 msgstr ""
 
-#: src/interface.c:1857
+#: src/interface.c:1726
 msgid "Input number"
 msgstr ""
 
-#: src/interface.c:1865
+#: src/interface.c:1734
 msgid "Use default width, height and FPS"
 msgstr ""
 
-#: src/interface.c:1879
+#: src/interface.c:1748
 msgid "Width"
 msgstr ""
 
-#: src/interface.c:1885
+#: src/interface.c:1754
 msgid "Height"
 msgstr ""
 
-#: src/interface.c:1899
+#: src/interface.c:1768
 msgid "_Driver"
 msgstr ""
 
-#: src/interface.c:1902
+#: src/interface.c:1771
 msgid "_Output format"
 msgstr ""
 
-#: src/interface.c:1998
+#: src/interface.c:1865
 msgid "LiVES:- Fade Audio In"
 msgstr ""
 
-#: src/interface.c:2001
+#: src/interface.c:1867
 msgid "LiVES:- Fade Audio Out"
 msgstr ""
 
-#: src/interface.c:2017
+#: src/interface.c:1883
 msgid "Fade in over  "
 msgstr ""
 
-#: src/interface.c:2018
+#: src/interface.c:1884
 msgid "first"
 msgstr "intai"
 
-#: src/interface.c:2021
+#: src/interface.c:1886
 msgid "Fade out over  "
 msgstr ""
 
-#: src/interface.c:2022
+#: src/interface.c:1887
 msgid "last"
 msgstr "ultimul"
 
-#: src/interface.c:2044
+#: src/interface.c:1909
 msgid "seconds."
 msgstr "secunde."
 
-#: src/interface.c:2052 src/saveplay.c:1507
+#: src/interface.c:1917 src/saveplay.c:1484
 msgid "selection"
 msgstr ""
 
-#: src/interface.c:2092
+#: src/interface.c:1956
 msgid "LiVES: - File Comments (optional)"
 msgstr "LiVES: - File Comentarii (opţional)"
 
-#: src/interface.c:2107
+#: src/interface.c:1971
 msgid "Title/Name : "
 msgstr "Titlu/Nume : "
 
-#: src/interface.c:2114
+#: src/interface.c:1978
 msgid "Author/Artist : "
 msgstr "Autor/Artist : "
 
-#: src/interface.c:2121
+#: src/interface.c:1985
 msgid "Comments : "
 msgstr "Comentarii : "
 
-#: src/interface.c:2151
+#: src/interface.c:2015
 msgid "_Options"
 msgstr ""
 
-#: src/interface.c:2158
+#: src/interface.c:2022
 msgid "Save _subtitles to file"
 msgstr ""
 
-#: src/interface.c:2170
+#: src/interface.c:2033
 msgid "Subtitle file"
 msgstr ""
 
-#: src/interface.c:2172
+#: src/interface.c:2035
 msgid "Browse..."
 msgstr ""
 
-#: src/interface.c:2255
+#: src/interface.c:2132
 msgid "LiVES: - choose a device"
 msgstr ""
 
-#: src/interface.c:2259
+#: src/interface.c:2135
 msgid "LiVES: - choose a directory"
 msgstr ""
 
-#: src/interface.c:2262
+#: src/interface.c:2137
 msgid "LiVES: - choose a file"
 msgstr ""
 
-#: src/interface.c:2445
+#: src/interface.c:2381
 msgid "LiVES: - Cancel/Discard/Save"
 msgstr "LiVES: - Revocare/Aruncaţi/Salvare"
 
-#: src/interface.c:2460
+#: src/interface.c:2397
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has not been saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:2463
+#: src/interface.c:2400
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has been changed since the last save.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:2467
+#: src/interface.c:2404
 msgid ""
 "You are about to exit LiVES.\n"
 "The current clip set can be saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:2468
+#: src/interface.c:2405
 msgid ""
 "The current clip set has not been saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:2472
+#: src/interface.c:2408
 msgid ""
 "The current layout has not been saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:2475
+#: src/interface.c:2410
 msgid ""
 "The current layout has *not* been changed since it was last saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:2480
+#: src/interface.c:2415
 msgid ""
 "The current layout contains generated frames and cannot be retained.\n"
 "You may wish to render it before exiting multitrack mode.\n"
 msgstr ""
 
-#: src/interface.c:2483
+#: src/interface.c:2418
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout contains generated frames and cannot be retained.\n"
 "What do you wish to do ?"
 msgstr ""
 
-#: src/interface.c:2496
+#: src/interface.c:2431
 msgid "Clip set _name"
 msgstr ""
 
-#: src/interface.c:2502
+#: src/interface.c:2437
 msgid "_Auto reload next time"
 msgstr ""
 
-#: src/interface.c:2538 src/interface.c:2547
+#: src/interface.c:2473 src/interface.c:2482
 msgid "_Wipe layout"
 msgstr "_Aspect Stergeti"
 
-#: src/interface.c:2539
+#: src/interface.c:2474
 msgid "_Ignore changes"
 msgstr "_Ignoră schimbările"
 
-#: src/interface.c:2540
+#: src/interface.c:2475
 msgid "_Delete clip set"
 msgstr ""
 
-#: src/interface.c:2541
+#: src/interface.c:2476
 msgid "_Delete layout"
 msgstr "Aspect _Sterge"
 
-#: src/interface.c:2545
+#: src/interface.c:2480
 msgid "_Save layout"
 msgstr "_Salvaţi aspectul"
 
-#: src/interface.c:2546
+#: src/interface.c:2481
 msgid "_Save clip set"
 msgstr ""
 
-#: src/interface.c:2565
+#: src/interface.c:2502
 msgid ""
 "\n"
 "LiVES has detected a multitrack layout from a previous session.\n"
 "Would you like to try and recover it ?\n"
 msgstr ""
 
-#: src/interface.c:2589
+#: src/interface.c:2528
 msgid "LiVES: - Disk Recovery Options"
 msgstr ""
 
-#: src/interface.c:2608
+#: src/interface.c:2549
 msgid "Delete _Orphaned Clips"
 msgstr ""
 
-#: src/interface.c:2609
+#: src/interface.c:2550
 msgid "Delete any clips which are not currently loaded or part of a set"
 msgstr ""
 
-#: src/interface.c:2622
+#: src/interface.c:2564
 msgid "Clear _Backup Files from Closed Clips"
 msgstr ""
 
-#: src/interface.c:2633
+#: src/interface.c:2575
 msgid "Remove Sets which have _Layouts but no Clips"
 msgstr ""
 
-#: src/interface.c:2644
+#: src/interface.c:2586
 msgid "_Reset to Defaults"
 msgstr ""
 
-#: src/interface.c:2651
+#: src/interface.c:2593
 msgid "_Accept"
 msgstr ""
 
-#: src/callbacks.c:198
+#: src/callbacks.c:208
 #, c-format
 msgid "Saving as set %s..."
 msgstr ""
 
-#: src/callbacks.c:833
+#: src/callbacks.c:852
 msgid "Please enter the name of the file to save the clip as.\n"
 msgstr ""
 
-#: src/callbacks.c:841
+#: src/callbacks.c:860
 msgid "Please enter a valid URL for the download.\n"
 msgstr ""
 
-#: src/callbacks.c:867
+#: src/callbacks.c:886
 #, c-format
 msgid "Downloading %s to %s..."
 msgstr ""
 
-#: src/callbacks.c:895
+#: src/callbacks.c:912
 msgid "Downloading clip"
 msgstr ""
 
-#: src/callbacks.c:933
+#: src/callbacks.c:950
 msgid ""
 "\n"
 "LiVES was unable to download the clip.\n"
@@ -1726,11 +1720,11 @@
 "the latest youtube-dl installed.\n"
 msgstr ""
 
-#: src/callbacks.c:1114 src/callbacks.c:1149
+#: src/callbacks.c:1131 src/callbacks.c:1166
 msgid "This file"
 msgstr "Acest fişier"
 
-#: src/callbacks.c:1115
+#: src/callbacks.c:1132
 msgid ""
 ",\n"
 " - including the current layout - "
@@ -1738,7 +1732,7 @@
 ",\n"
 " - inclusiv aspectul actual - "
 
-#: src/callbacks.c:1117
+#: src/callbacks.c:1134
 #, c-format
 msgid ""
 "\n"
@@ -1748,7 +1742,7 @@
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1119
+#: src/callbacks.c:1136
 #, c-format
 msgid ""
 "\n"
@@ -1758,20 +1752,20 @@
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1150
+#: src/callbacks.c:1167
 msgid ""
 "Changes made to this clip have not been saved or backed up.\n"
 "\n"
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1343
+#: src/callbacks.c:1356
 msgid ""
 "\n"
 "Invalid project file.\n"
 msgstr ""
 
-#: src/callbacks.c:1356
+#: src/callbacks.c:1370
 #, c-format
 msgid ""
 "\n"
@@ -1784,33 +1778,33 @@
 "Once you have done this, you will be able to import the new project.\n"
 msgstr ""
 
-#: src/callbacks.c:1366
+#: src/callbacks.c:1381
 #, c-format
 msgid "Importing the project %s as set %s..."
 msgstr ""
 
-#: src/callbacks.c:1386
+#: src/callbacks.c:1399
 msgid "Importing project"
 msgstr ""
 
-#: src/callbacks.c:1472
+#: src/callbacks.c:1481
 #, c-format
 msgid "Exporting project %s..."
 msgstr ""
 
-#: src/callbacks.c:1490
+#: src/callbacks.c:1497
 msgid "Exporting project"
 msgstr ""
 
-#: src/callbacks.c:1506
+#: src/callbacks.c:1513
 msgid "Backup as .lv1 file"
 msgstr ""
 
-#: src/callbacks.c:1522
+#: src/callbacks.c:1529
 msgid "Restore .lv1 file"
 msgstr ""
 
-#: src/callbacks.c:1664
+#: src/callbacks.c:1671
 msgid ""
 "\n"
 "\n"
@@ -1818,72 +1812,77 @@
 "Are you sure ?\n"
 msgstr ""
 
-#: src/callbacks.c:1725
+#: src/callbacks.c:1732
 #, c-format
 msgid "Deleting set %s..."
 msgstr ""
 
-#: src/callbacks.c:1727
+#: src/callbacks.c:1734
 msgid "Deleting set..."
 msgstr ""
 
-#: src/callbacks.c:1731
+#: src/callbacks.c:1738
 msgid "Deleting set"
 msgstr ""
 
-#: src/callbacks.c:1739
+#: src/callbacks.c:1746
 #, c-format
 msgid "Set %s was permanently deleted from the disk.\n"
 msgstr ""
 
-#: src/callbacks.c:1787 src/callbacks.c:11764
+#: src/callbacks.c:1792 src/callbacks.c:11676
 msgid "Insert Silence"
 msgstr ""
 
-#: src/callbacks.c:1840 src/callbacks.c:1923 src/callbacks.c:2086
+#: src/callbacks.c:1844 src/callbacks.c:1927 src/callbacks.c:2089
 msgid "Undoing"
 msgstr "Desfac"
 
-#: src/callbacks.c:1936 src/callbacks.c:2147
+#: src/callbacks.c:1940 src/callbacks.c:2150
 msgid "Restoring audio..."
 msgstr "Audio restaurarea..."
 
-#: src/callbacks.c:1952
+#: src/callbacks.c:1956
 msgid "Clearing frame images"
 msgstr ""
 
-#: src/callbacks.c:1985
+#: src/callbacks.c:1988
 msgid "Deleting excess frames"
 msgstr ""
 
-#: src/callbacks.c:2229
+#: src/callbacks.c:2232
 #, c-format
 msgid "Length of video is now %d frames at %.3f frames per second.\n"
 msgstr ""
 
-#: src/callbacks.c:2233 src/resample.c:683 src/resample.c:2166
+#: src/callbacks.c:2235 src/resample.c:678 src/resample.c:2133
 #, c-format
 msgid "Clipboard was resampled to %d frames.\n"
 msgstr ""
 
-#: src/callbacks.c:2394 src/callbacks.c:2423
+#: src/callbacks.c:2396 src/callbacks.c:2425
 msgid "Redoing"
 msgstr "Reface"
 
-#: src/callbacks.c:2462
+#: src/callbacks.c:2472
 #, c-format
-msgid "Copying frames %d to %d%s to the clipboard..."
+msgid "Copying frames %d to %d (with sound) to the clipboard..."
 msgstr ""
 
-#: src/callbacks.c:2525
+#: src/callbacks.c:2474
+#, c-format
+msgid "Copying frames %d to %d to the clipboard..."
+msgstr ""
+
+#: src/callbacks.c:2526
 msgid "Copying to the clipboard"
 msgstr ""
 
-#: src/callbacks.c:2600
+#: src/callbacks.c:2601
 msgid "Cut"
 msgstr "Taie"
 
-#: src/callbacks.c:2641 src/callbacks.c:3068 src/callbacks.c:8026
+#: src/callbacks.c:2641 src/callbacks.c:3063 src/callbacks.c:7631
 msgid "Pulling frames from clipboard"
 msgstr ""
 
@@ -1892,22 +1891,22 @@
 msgid "Pasting %d frames to new clip %s..."
 msgstr ""
 
-#: src/callbacks.c:2678
+#: src/callbacks.c:2676
 msgid "Pasting"
 msgstr ""
 
-#: src/callbacks.c:2694
+#: src/callbacks.c:2692
 msgid "...added audio..."
 msgstr ""
 
-#: src/callbacks.c:2778
+#: src/callbacks.c:2775
 msgid ""
 "This operation requires resizing or converting of frames.\n"
 "Please install 'convert' from the Image-magick package, and then restart "
 "LiVES.\n"
 msgstr ""
 
-#: src/callbacks.c:2795
+#: src/callbacks.c:2793
 msgid ""
 "\n"
 "\n"
@@ -1916,31 +1915,31 @@
 "the 'Trim Audio' function from the Audio menu."
 msgstr ""
 
-#: src/callbacks.c:2819
+#: src/callbacks.c:2817
 msgid ""
 "LiVES cannot insert because the audio rates do not match.\n"
 "Please install 'sox', and try again."
 msgstr ""
 
-#: src/callbacks.c:2838
+#: src/callbacks.c:2835
 msgid ""
 "\n"
 "Insertion will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:2888 src/callbacks.c:11692
+#: src/callbacks.c:2883 src/callbacks.c:11606
 msgid ""
 "\n"
 "Insertion will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:2996 src/callbacks.c:3025
+#: src/callbacks.c:2987 src/callbacks.c:3016
 msgid "Resampling clipboard audio"
 msgstr ""
 
-#: src/callbacks.c:3041
+#: src/callbacks.c:3032
 msgid ""
 "\n"
 "\n"
@@ -1948,7 +1947,7 @@
 "Clipboard audio has been erased.\n"
 msgstr ""
 
-#: src/callbacks.c:3055
+#: src/callbacks.c:3045
 msgid ""
 "\n"
 "\n"
@@ -1957,86 +1956,86 @@
 "using unchanged audio ?\n"
 msgstr ""
 
-#: src/callbacks.c:3137 src/callbacks.c:3311
+#: src/callbacks.c:3132 src/callbacks.c:3299
 #, c-format
 msgid "Inserting %d%s frames from the clipboard..."
 msgstr ""
 
-#: src/callbacks.c:3162 src/callbacks.c:3236 src/callbacks.c:3339
+#: src/callbacks.c:3155 src/callbacks.c:3224 src/callbacks.c:3325
 msgid "Inserting"
 msgstr "Inserez"
 
-#: src/callbacks.c:3193
+#: src/callbacks.c:3187
 #, c-format
 msgid "Inserting %d times from the clipboard%s..."
 msgstr ""
 
-#: src/callbacks.c:3200
+#: src/callbacks.c:3191
 #, c-format
 msgid "Inserting %d frames from the clipboard%s..."
 msgstr ""
 
-#: src/callbacks.c:3418
+#: src/callbacks.c:3404
 msgid "Insert"
 msgstr "Inserează"
 
-#: src/callbacks.c:3486
+#: src/callbacks.c:3471
 msgid ""
 "\n"
 "Deleting all frames will close this file.\n"
 "Are you sure ?"
 msgstr ""
 
-#: src/callbacks.c:3495
+#: src/callbacks.c:3480
 msgid ""
 "\n"
 "Deletion will cause missing frames in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3515 src/callbacks.c:10920 src/callbacks.c:11162
-#: src/callbacks.c:11228
+#: src/callbacks.c:3500 src/callbacks.c:10851 src/callbacks.c:11087
+#: src/callbacks.c:11152
 msgid ""
 "\n"
 "Deletion will cause missing audio in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3534
+#: src/callbacks.c:3519
 msgid ""
 "\n"
 "Deletion will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3553 src/callbacks.c:11210
+#: src/callbacks.c:3538 src/callbacks.c:11134
 msgid ""
 "\n"
 "Deletion will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3611
+#: src/callbacks.c:3597
 #, c-format
 msgid "Deleting frames %d to %d%s..."
 msgstr ""
 
-#: src/callbacks.c:3636
+#: src/callbacks.c:3619
 msgid "Deleting"
 msgstr ""
 
-#: src/callbacks.c:3717
+#: src/callbacks.c:3699
 msgid "Delete"
 msgstr ""
 
-#: src/callbacks.c:3738
+#: src/callbacks.c:3717
 msgid ""
 "\n"
 "\n"
 "Selection is locked.\n"
 msgstr ""
 
-#: src/callbacks.c:4092
+#: src/callbacks.c:4056
 msgid ""
 "Ready to record. Use 'control' and cursor keys during playback to record "
 "your performance.\n"
@@ -2044,11 +2043,11 @@
 "play.)\n"
 msgstr ""
 
-#: src/callbacks.c:4098
+#: src/callbacks.c:4061
 msgid "Record cancelled.\n"
 msgstr ""
 
-#: src/callbacks.c:4237
+#: src/callbacks.c:4197
 #, c-format
 msgid ""
 "\n"
@@ -2057,7 +2056,7 @@
 "%s\n"
 msgstr ""
 
-#: src/callbacks.c:4241
+#: src/callbacks.c:4200
 #, c-format
 msgid ""
 "\n"
@@ -2066,7 +2065,7 @@
 "The plugin may be broken or not installed correctly."
 msgstr ""
 
-#: src/callbacks.c:4571
+#: src/callbacks.c:4532
 #, c-format
 msgid ""
 "Saving the set will cause copies of all loaded clips to remain on the disk"
@@ -2075,22 +2074,22 @@
 "Please press 'Cancel' if that is not what you want.\n"
 msgstr ""
 
-#: src/callbacks.c:4654
+#: src/callbacks.c:4617
 #, c-format
 msgid "Saving set %s"
 msgstr ""
 
-#: src/callbacks.c:5005
+#: src/callbacks.c:4964
 #, c-format
 msgid "Loading clips from set %s"
 msgstr ""
 
-#: src/callbacks.c:5093
+#: src/callbacks.c:5051
 #, c-format
 msgid "%d clips and %d layouts were recovered from set (%s).\n"
 msgstr ""
 
-#: src/callbacks.c:5312
+#: src/callbacks.c:5259
 msgid ""
 "LiVES will attempt to recover some disk space.\n"
 "You should ONLY run this if you have no other copies of LiVES running on "
@@ -2098,24 +2097,24 @@
 "Click OK to proceed.\n"
 msgstr ""
 
-#: src/callbacks.c:5317
+#: src/callbacks.c:5264
 msgid "Cleaning up disk space..."
 msgstr ""
 
-#: src/callbacks.c:5387
+#: src/callbacks.c:5334
 msgid "Recovering disk space"
 msgstr ""
 
-#: src/callbacks.c:5439
+#: src/callbacks.c:5386
 #, c-format
 msgid "%s of disk space was recovered.\n"
 msgstr ""
 
-#: src/callbacks.c:5482
+#: src/callbacks.c:5428
 msgid "Resetting frame rates and frame values..."
 msgstr ""
 
-#: src/callbacks.c:5523
+#: src/callbacks.c:5469
 #, c-format
 msgid ""
 "\n"
@@ -2123,68 +2122,68 @@
 "Internal: %s (%d bpp) / %s\n"
 msgstr ""
 
-#: src/callbacks.c:5525
+#: src/callbacks.c:5471
 msgid "buffered"
 msgstr ""
 
-#: src/callbacks.c:5538 src/callbacks.c:5557 src/callbacks.c:5575
-#: src/callbacks.c:5609
+#: src/callbacks.c:5484 src/callbacks.c:5502 src/callbacks.c:5518
+#: src/callbacks.c:5551
 msgid ""
 "\n"
 "  Opening..."
 msgstr ""
 
-#: src/callbacks.c:5545
+#: src/callbacks.c:5490
 #, c-format
 msgid ""
 "\n"
 "(%d virtual)"
 msgstr ""
 
-#: src/callbacks.c:5548
+#: src/callbacks.c:5493
 #, c-format
 msgid ""
 "\n"
 "(%d decoded)"
 msgstr ""
 
-#: src/callbacks.c:5560 src/callbacks.c:5578 src/callbacks.c:5612
+#: src/callbacks.c:5504 src/callbacks.c:5520 src/callbacks.c:5553
 #, c-format
 msgid ""
 "\n"
 "  %.2f sec."
 msgstr ""
 
-#: src/callbacks.c:5569
+#: src/callbacks.c:5512
 msgid ""
 "\n"
 "  Unknown"
 msgstr ""
 
-#: src/callbacks.c:5582 src/callbacks.c:5596
+#: src/callbacks.c:5524 src/callbacks.c:5538
 msgid "unsigned"
 msgstr ""
 
-#: src/callbacks.c:5583 src/callbacks.c:5597
+#: src/callbacks.c:5525 src/callbacks.c:5539
 msgid "signed"
 msgstr ""
 
-#: src/callbacks.c:5585 src/callbacks.c:5599
+#: src/callbacks.c:5527 src/callbacks.c:5541
 msgid "big-endian"
 msgstr ""
 
-#: src/callbacks.c:5586 src/callbacks.c:5600
+#: src/callbacks.c:5528 src/callbacks.c:5542
 msgid "little-endian"
 msgstr ""
 
-#: src/callbacks.c:5588 src/callbacks.c:5602
+#: src/callbacks.c:5530 src/callbacks.c:5544
 #, c-format
 msgid ""
 "  %d Hz %d bit\n"
 "%s %s"
 msgstr ""
 
-#: src/callbacks.c:5707
+#: src/callbacks.c:5647
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -2201,22 +2200,22 @@
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA.\n"
 msgstr ""
 
-#: src/callbacks.c:5721
+#: src/callbacks.c:5661
 msgid "A video editor and VJ program."
 msgstr ""
 
-#: src/callbacks.c:5722
+#: src/callbacks.c:5662
 msgid "About LiVES"
 msgstr ""
 
-#: src/callbacks.c:5724
+#: src/callbacks.c:5664
 msgid "translator_credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Dan Telecan https://launchpad.net/~telecan-dan\n"
 "  salsaman https://launchpad.net/~salsaman"
 
-#: src/callbacks.c:5758
+#: src/callbacks.c:5699
 #, c-format
 msgid ""
 "LiVES Version %s\n"
@@ -2230,14 +2229,14 @@
 "Homepage: http://lives.sourceforge.net"
 msgstr ""
 
-#: src/callbacks.c:6037
+#: src/callbacks.c:5996
 msgid ""
 "\n"
 "\n"
 "You need to install mplayer or mplayer2 to be able to preview this file.\n"
 msgstr ""
 
-#: src/callbacks.c:6040
+#: src/callbacks.c:5998
 msgid ""
 "\n"
 "\n"
@@ -2245,215 +2244,206 @@
 "this file.\n"
 msgstr ""
 
-#: src/callbacks.c:6423 src/callbacks.c:8289
-msgid ""
-"\n"
-"Loading new audio may cause missing audio in some multitrack layouts.\n"
-"Are you sure you wish to continue ?\n"
-"."
-msgstr ""
-
-#: src/callbacks.c:6523
-#, c-format
-msgid "Opening audio %s, type %s..."
-msgstr ""
-
-#: src/callbacks.c:6556 src/saveplay.c:480
-msgid "Opening audio"
-msgstr ""
-
-#: src/callbacks.c:6565 src/callbacks.c:6612 src/callbacks.c:8387
-#: src/callbacks.c:8429 src/callbacks.c:8472 src/callbacks.c:10846
-msgid "Cancelling"
-msgstr ""
-
-#: src/callbacks.c:6660 src/callbacks.c:8514 src/callbacks.c:10876
-#: src/callbacks.c:11563
-msgid "Committing audio"
-msgstr ""
-
-#: src/callbacks.c:6672 src/callbacks.c:8546
-msgid "New Audio"
-msgstr ""
-
-#: src/callbacks.c:6779
+#: src/callbacks.c:6459
 #, c-format
 msgid ""
 "Text was saved as\n"
 "%s\n"
 msgstr ""
 
-#: src/callbacks.c:6951 src/saveplay.c:3618
-#, c-format
-msgid "%d frames are enough !\n"
-msgstr ""
-
-#: src/callbacks.c:7050
+#: src/callbacks.c:6706
 msgid "LiVES: - Encoder debug output"
 msgstr ""
 
-#: src/callbacks.c:7087 src/gui.c:1922
+#: src/callbacks.c:6743 src/gui.c:1921
 msgid "Fullscreen playback (f)"
 msgstr ""
 
-#: src/callbacks.c:7089
+#: src/callbacks.c:6744
 msgid "Fullscreen playback off (f)"
 msgstr ""
 
-#: src/callbacks.c:7188 src/callbacks.c:7336 src/callbacks.c:7664
-#: src/callbacks.c:7681 src/gui.c:3712 src/saveplay.c:2467 src/saveplay.c:2501
-#: src/saveplay.c:3115 src/saveplay.c:3220 src/saveplay.c:3239
-#: src/multitrack.c:9340 src/multitrack.c:11060
+#: src/callbacks.c:6841 src/callbacks.c:6983 src/callbacks.c:7283
+#: src/callbacks.c:7298 src/gui.c:3838 src/saveplay.c:2442 src/saveplay.c:2475
+#: src/saveplay.c:3074 src/saveplay.c:3178 src/saveplay.c:3197
+#: src/multitrack.c:9526 src/multitrack.c:11288
 #, c-format
 msgid " (%d %% scale)"
 msgstr ""
 
-#: src/callbacks.c:7190 src/callbacks.c:7338 src/callbacks.c:7666
-#: src/gui.c:3716 src/saveplay.c:2469 src/saveplay.c:2503
+#: src/callbacks.c:6843 src/callbacks.c:6985 src/callbacks.c:7285
+#: src/gui.c:3842 src/saveplay.c:2444 src/saveplay.c:2477
 #, c-format
 msgid "LiVES: - Play Window%s"
 msgstr ""
 
-#: src/callbacks.c:7302 src/gui.c:1907
+#: src/callbacks.c:6950 src/gui.c:1906
 msgid "Double size (d)"
 msgstr ""
 
-#: src/callbacks.c:7309
+#: src/callbacks.c:6956
 msgid "Single size (d)"
 msgstr ""
 
-#: src/callbacks.c:7442 src/callbacks.c:7443
+#: src/callbacks.c:7087 src/callbacks.c:7088
 msgid "Hide the play window (s)"
 msgstr ""
 
-#: src/callbacks.c:7452 src/gui.c:1746
+#: src/callbacks.c:7096 src/gui.c:1744
 msgid "Show the play window (s)"
 msgstr ""
 
-#: src/callbacks.c:7453 src/gui.c:1896
+#: src/callbacks.c:7097 src/gui.c:1895
 msgid "Play in separate window (s)"
 msgstr ""
 
-#: src/callbacks.c:7535 src/gui.c:4060 src/saveplay.c:2498
+#: src/callbacks.c:7175 src/gui.c:4169 src/saveplay.c:2472
 msgid "LiVES: - Streaming"
 msgstr ""
 
-#: src/callbacks.c:7778
+#: src/callbacks.c:7388
 msgid "Switch continuous looping off (o)"
 msgstr ""
 
-#: src/callbacks.c:7785 src/gui.c:1795
+#: src/callbacks.c:7394 src/gui.c:1793
 msgid "Switch continuous looping on (o)"
 msgstr ""
 
-#: src/callbacks.c:7837
+#: src/callbacks.c:7444
 #, c-format
 msgid "Audio volume (%.2f)"
 msgstr ""
 
-#: src/callbacks.c:7876 src/callbacks.c:7877 src/gui.c:3640
+#: src/callbacks.c:7483 src/callbacks.c:7484 src/gui.c:3766
 msgid "Unmute the audio (z)"
 msgstr ""
 
-#: src/callbacks.c:7888 src/callbacks.c:7889 src/gui.c:1808 src/gui.c:3639
+#: src/callbacks.c:7494 src/callbacks.c:7495 src/gui.c:1806 src/gui.c:3765
 msgid "Mute the audio (z)"
 msgstr ""
 
-#: src/callbacks.c:8038
+#: src/callbacks.c:7643
 msgid "Reversing clipboard..."
 msgstr ""
 
-#: src/callbacks.c:8052
+#: src/callbacks.c:7657
 msgid "Reversing clipboard"
 msgstr ""
 
-#: src/callbacks.c:8084
+#: src/callbacks.c:7689
 msgid "LiVES: Load subtitles from..."
 msgstr ""
 
-#: src/callbacks.c:8151 src/saveplay.c:970
+#: src/callbacks.c:7753 src/saveplay.c:956
 #, c-format
 msgid "Loaded subtitle file: %s\n"
 msgstr ""
 
-#: src/callbacks.c:8220
+#: src/callbacks.c:7821
 msgid "Subtitles were erased.\n"
 msgstr ""
 
-#: src/callbacks.c:8239
+#: src/callbacks.c:7843
 msgid "LiVES: - Select Audio File"
 msgstr ""
 
-#: src/callbacks.c:8250
+#: src/callbacks.c:7878 src/callbacks.c:8232
+msgid ""
+"\n"
+"Loading new audio may cause missing audio in some multitrack layouts.\n"
+"Are you sure you wish to continue ?\n"
+"."
+msgstr ""
+
+#: src/callbacks.c:7989
+#, c-format
+msgid "Opening audio %s, type %s..."
+msgstr ""
+
+#: src/callbacks.c:8023 src/saveplay.c:477
+msgid "Opening audio"
+msgstr ""
+
+#: src/callbacks.c:8032 src/callbacks.c:8083 src/callbacks.c:8327
+#: src/callbacks.c:8369 src/callbacks.c:8412 src/callbacks.c:10766
+msgid "Cancelling"
+msgstr ""
+
+#: src/callbacks.c:8137 src/callbacks.c:8454 src/callbacks.c:10803
+#: src/callbacks.c:11477
+msgid "Committing audio"
+msgstr ""
+
+#: src/callbacks.c:8153 src/callbacks.c:8484
+msgid "New Audio"
+msgstr ""
+
+#: src/callbacks.c:8194
 msgid "Please set your CD play device in Tools | Preferences | Misc\n"
 msgstr ""
 
-#: src/callbacks.c:8321
+#: src/callbacks.c:8264
 #, c-format
 msgid "Opening CD track %d from %s..."
 msgstr ""
 
-#: src/callbacks.c:8326
+#: src/callbacks.c:8267
 #, c-format
 msgid "CD track %d"
 msgstr ""
 
-#: src/callbacks.c:8373
+#: src/callbacks.c:8313
 msgid "Opening CD track..."
 msgstr ""
 
-#: src/callbacks.c:8415 src/callbacks.c:8461
+#: src/callbacks.c:8355 src/callbacks.c:8401
 msgid "Error loading CD track\n"
 msgstr ""
 
-#: src/callbacks.c:8584
+#: src/callbacks.c:8518
 msgid "layout errors"
 msgstr ""
 
-#: src/callbacks.c:8595
+#: src/callbacks.c:8529
 msgid "Close _Window"
 msgstr "Închide _fereastra"
 
-#: src/callbacks.c:8606
+#: src/callbacks.c:8540
 msgid "Clear _Errors"
 msgstr "Curăţă _erori"
 
-#: src/callbacks.c:8617
+#: src/callbacks.c:8551
 msgid "_Delete affected layouts"
 msgstr "Şterge _afişajele afectate"
 
-#: src/callbacks.c:9343 src/callbacks.c:9388
+#: src/callbacks.c:9253 src/callbacks.c:9298
 msgid "Resume"
 msgstr "Reia"
 
-#: src/callbacks.c:9344
+#: src/callbacks.c:9254
 msgid ""
 "\n"
 "Paused\n"
 "(click Resume to continue processing)"
 msgstr ""
 
-#: src/callbacks.c:9345 src/callbacks.c:9406
+#: src/callbacks.c:9255 src/callbacks.c:9315
 msgid "paused..."
 msgstr "întrerut..."
 
-#: src/callbacks.c:9372 src/callbacks.c:9418
-msgid "Pause"
-msgstr "Pauză"
-
-#: src/callbacks.c:9374 src/callbacks.c:9421
+#: src/callbacks.c:9284 src/callbacks.c:9333
 msgid "resumed..."
 msgstr "reluat..."
 
-#: src/callbacks.c:9393
+#: src/callbacks.c:9303
 msgid "Keep"
 msgstr "Păstrează"
 
-#: src/callbacks.c:9396
+#: src/callbacks.c:9305
 msgid "Enough"
 msgstr ""
 
-#: src/callbacks.c:9401
+#: src/callbacks.c:9310
 #, c-format
 msgid ""
 "\n"
@@ -2462,28 +2452,28 @@
 "(click Resume to continue processing)"
 msgstr ""
 
-#: src/callbacks.c:9419
+#: src/callbacks.c:9331
 msgid "Cancel"
 msgstr "Renunță"
 
-#: src/callbacks.c:9558
+#: src/callbacks.c:9478
 msgid "Stop"
 msgstr ""
 
-#: src/callbacks.c:10053 src/multitrack.c:13247
+#: src/callbacks.c:9968 src/multitrack.c:13489
 msgid "LiVES: Selected frame"
 msgstr ""
 
-#: src/callbacks.c:10061
+#: src/callbacks.c:9976
 msgid "_Save frame as..."
 msgstr ""
 
-#: src/callbacks.c:10290
+#: src/callbacks.c:10202
 #, c-format
 msgid "Audio is ahead of video by %.4f secs. at frame %d, with fps %.4f\n"
 msgstr ""
 
-#: src/callbacks.c:10347
+#: src/callbacks.c:10255
 msgid ""
 "\n"
 "\n"
@@ -2492,7 +2482,7 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10353
+#: src/callbacks.c:10261
 msgid ""
 "\n"
 "\n"
@@ -2500,7 +2490,7 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10429 src/callbacks.c:11479
+#: src/callbacks.c:10334 src/callbacks.c:11395
 msgid ""
 "\n"
 "Record time must be greater than 0.\n"
@@ -2508,7 +2498,7 @@
 "\n"
 "Timpul de înregistrare trebuie să fie mai mare decât 0.\n"
 
-#: src/callbacks.c:10440
+#: src/callbacks.c:10346
 msgid ""
 "Capture an External Window:\n"
 "\n"
@@ -2523,17 +2513,17 @@
 "Apăsaţi 'Anulare' pentru a anula acţiunea\n"
 "\n"
 
-#: src/callbacks.c:10445
+#: src/callbacks.c:10351
 msgid "External window was released.\n"
 msgstr ""
 
-#: src/callbacks.c:10479
+#: src/callbacks.c:10385
 msgid ""
 "Click on a Window to Capture it\n"
 "Press 'q' to stop recording"
 msgstr ""
 
-#: src/callbacks.c:10513
+#: src/callbacks.c:10419
 #, c-format
 msgid ""
 "\n"
@@ -2543,19 +2533,19 @@
 "(Default of %.3f frames per second will be used.)\n"
 msgstr ""
 
-#: src/callbacks.c:10539
+#: src/callbacks.c:10443
 msgid "LiVES was unable to capture this window. Sorry.\n"
 msgstr ""
 
-#: src/callbacks.c:10695
+#: src/callbacks.c:10601
 msgid "Export Selected Audio as..."
 msgstr ""
 
-#: src/callbacks.c:10699
+#: src/callbacks.c:10604
 msgid "Export Audio as..."
 msgstr ""
 
-#: src/callbacks.c:10714
+#: src/callbacks.c:10619
 msgid ""
 "\n"
 "\n"
@@ -2564,1033 +2554,1033 @@
 "rate.\n"
 msgstr ""
 
-#: src/callbacks.c:10720
+#: src/callbacks.c:10625
 #, c-format
 msgid "Exporting audio frames %d to %d as %s..."
 msgstr ""
 
-#: src/callbacks.c:10725
+#: src/callbacks.c:10629
 #, c-format
 msgid "Exporting audio as %s..."
 msgstr ""
 
-#: src/callbacks.c:10751
+#: src/callbacks.c:10655
 msgid "Exporting audio"
 msgstr ""
 
-#: src/callbacks.c:10782
+#: src/callbacks.c:10695
 msgid "LiVES: - Append Audio File"
 msgstr ""
 
-#: src/callbacks.c:10825
+#: src/callbacks.c:10739
 #, c-format
 msgid "Appending audio file %s..."
 msgstr ""
 
-#: src/callbacks.c:10836
+#: src/callbacks.c:10756
 msgid "Appending audio"
 msgstr ""
 
-#: src/callbacks.c:10892
+#: src/callbacks.c:10818
 msgid "Append Audio"
 msgstr ""
 
-#: src/callbacks.c:10952
+#: src/callbacks.c:10883
 #, c-format
 msgid "Padding audio to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10954
+#: src/callbacks.c:10885
 #, c-format
 msgid "Trimming audio from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10973
+#: src/callbacks.c:10904
 msgid "Trimming/Padding audio"
 msgstr ""
 
-#: src/callbacks.c:10981
+#: src/callbacks.c:10912
 msgid "Trim/Pad Audio"
 msgstr ""
 
-#: src/callbacks.c:11055
+#: src/callbacks.c:10982
 msgid "Fading audio in"
 msgstr ""
 
-#: src/callbacks.c:11056
+#: src/callbacks.c:10983
 msgid "Fade audio in"
 msgstr ""
 
-#: src/callbacks.c:11061
+#: src/callbacks.c:10987
 msgid "Fading audio out"
 msgstr ""
 
-#: src/callbacks.c:11062
+#: src/callbacks.c:10988
 msgid "Fade audio out"
 msgstr ""
 
-#: src/callbacks.c:11085
+#: src/callbacks.c:11011
 #, c-format
 msgid "%s over %.1f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11087
+#: src/callbacks.c:11013
 #, c-format
 msgid "%s from time %.2f seconds to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11094
+#: src/callbacks.c:11020
 msgid "Fading audio..."
 msgstr ""
 
-#: src/callbacks.c:11194
+#: src/callbacks.c:11119
 msgid ""
 "\n"
 "Deleting all audio will close this file.\n"
 "Are you sure ?"
 msgstr ""
 
-#: src/callbacks.c:11197
+#: src/callbacks.c:11122
 msgid "Deleting all audio..."
 msgstr ""
 
-#: src/callbacks.c:11203
+#: src/callbacks.c:11127
 #, c-format
 msgid "Deleting audio from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11290
+#: src/callbacks.c:11214
 msgid "Deleting Audio"
 msgstr ""
 
-#: src/callbacks.c:11297
+#: src/callbacks.c:11221
 msgid "Delete Audio"
 msgstr ""
 
-#: src/callbacks.c:11636
+#: src/callbacks.c:11550
 msgid "Record new audio"
 msgstr ""
 
-#: src/callbacks.c:11725
+#: src/callbacks.c:11640
 #, c-format
 msgid "Inserting silence from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11754
+#: src/callbacks.c:11666
 msgid "Inserting Silence"
 msgstr ""
 
-#: src/merge.c:85
+#: src/merge.c:96
 msgid "LiVES: - Merge"
 msgstr ""
 
-#: src/merge.c:102
+#: src/merge.c:113
 #, c-format
 msgid "Merge Clipboard [ %d Frames ]       With Selection [ %d Frames ]"
 msgstr ""
 
-#: src/merge.c:107
+#: src/merge.c:118
 #, c-format
 msgid ""
 "Merge Clipboard [ %d Frames (resampled) ]       With Selection [ %d Frames ]"
 msgstr ""
 
-#: src/merge.c:118
+#: src/merge.c:130
 msgid "Align _Starts"
 msgstr ""
 
-#: src/merge.c:123
+#: src/merge.c:135
 msgid "Align _Ends"
 msgstr ""
 
-#: src/merge.c:134
+#: src/merge.c:146
 msgid "What to do with extra clipboard frames -"
 msgstr ""
 
-#: src/merge.c:137
+#: src/merge.c:149
 msgid "_Insert Frames"
 msgstr ""
 
-#: src/merge.c:143
+#: src/merge.c:155
 msgid "_Drop Frames"
 msgstr ""
 
-#: src/merge.c:149
+#: src/merge.c:160
 msgid "Number of Times to Loop Clipboard"
 msgstr ""
 
-#: src/merge.c:160
+#: src/merge.c:171
 msgid "_Loop Clipboard to Fit Selection"
 msgstr ""
 
-#: src/merge.c:173
+#: src/merge.c:184
 msgid "_Transition Method:"
 msgstr ""
 
-#: src/merge.c:394
+#: src/merge.c:395
 msgid "Merging clipboard with selection..."
 msgstr ""
 
-#: src/merge.c:551
+#: src/merge.c:539
 msgid "Merge done.\n"
 msgstr ""
 
-#: src/gui.c:123
+#: src/gui.c:122
 msgid "_Custom Generators"
 msgstr ""
 
-#: src/gui.c:124
+#: src/gui.c:123
 msgid "_Custom Effects"
 msgstr ""
 
-#: src/gui.c:125
+#: src/gui.c:124
 msgid "Custom _Utilities"
 msgstr ""
 
-#: src/gui.c:352 src/multitrack.c:5964
+#: src/gui.c:351 src/multitrack.c:6143
 msgid "_File"
 msgstr ""
 
-#: src/gui.c:367 src/multitrack.c:5989
+#: src/gui.c:366 src/multitrack.c:6168
 msgid "_Open File/Directory"
 msgstr ""
 
-#: src/gui.c:373
+#: src/gui.c:372
 msgid "O_pen Part of File..."
 msgstr ""
 
-#: src/gui.c:379 src/gui.c:383 src/multitrack.c:6006 src/multitrack.c:6023
-#: src/multitrack.c:6028
+#: src/gui.c:378 src/gui.c:382 src/multitrack.c:6185 src/multitrack.c:6202
+#: src/multitrack.c:6207
 msgid "Open _Location/Stream..."
 msgstr ""
 
-#: src/gui.c:393 src/multitrack.c:6016
+#: src/gui.c:392 src/multitrack.c:6195
 msgid "Open _Youtube Clip..."
 msgstr ""
 
-#: src/gui.c:404
+#: src/gui.c:403
 msgid "Import from _dvd/vcd..."
 msgstr ""
 
-#: src/gui.c:413
+#: src/gui.c:412
 msgid "Import from _dvd"
 msgstr ""
 
-#: src/gui.c:416
+#: src/gui.c:415
 msgid "Import from _vcd"
 msgstr ""
 
-#: src/gui.c:419
+#: src/gui.c:418
 msgid "_Import from Firewire"
 msgstr ""
 
-#: src/gui.c:428 src/multitrack.c:6086
+#: src/gui.c:427 src/multitrack.c:6265
 msgid "Import from _Firewire Device (dv)"
 msgstr ""
 
-#: src/gui.c:429 src/multitrack.c:6094
+#: src/gui.c:428 src/multitrack.c:6273
 msgid "Import from _Firewire Device (hdv)"
 msgstr ""
 
-#: src/gui.c:457
+#: src/gui.c:456
 msgid "_Add Webcam/TV card..."
 msgstr ""
 
-#: src/gui.c:476
+#: src/gui.c:475
 msgid "Add _Unicap Device"
 msgstr ""
 
-#: src/gui.c:486
+#: src/gui.c:485
 msgid "Add Live _Firewire Device"
 msgstr ""
 
-#: src/gui.c:495
+#: src/gui.c:494
 msgid "Add _TV Device"
 msgstr ""
 
-#: src/gui.c:510 src/multitrack.c:6117
+#: src/gui.c:509 src/multitrack.c:6296
 msgid "_Recent Files..."
 msgstr ""
 
-#: src/gui.c:560 src/multitrack.c:6177
+#: src/gui.c:559 src/multitrack.c:6356
 msgid "_Reload Clip Set..."
 msgstr ""
 
-#: src/gui.c:564 src/multitrack.c:6185
+#: src/gui.c:563 src/multitrack.c:6364
 msgid "Close/Sa_ve All Clips"
 msgstr ""
 
-#: src/gui.c:575
+#: src/gui.c:574
 msgid "_Encode Clip As..."
 msgstr ""
 
-#: src/gui.c:577
+#: src/gui.c:576
 msgid "Encode _Selection As..."
 msgstr ""
 
-#: src/gui.c:584
+#: src/gui.c:583
 msgid "_Close This Clip"
 msgstr ""
 
-#: src/gui.c:595
+#: src/gui.c:594
 msgid "_Backup Clip as .lv1..."
 msgstr ""
 
-#: src/gui.c:604
+#: src/gui.c:603
 msgid "_Restore Clip from .lv1..."
 msgstr ""
 
-#: src/gui.c:615
+#: src/gui.c:614
 msgid "Encode/Load/Backup _with Sound"
 msgstr ""
 
-#: src/gui.c:620
+#: src/gui.c:619
 msgid "Auto load subtitles"
 msgstr ""
 
-#: src/gui.c:628 src/multitrack.c:6224
+#: src/gui.c:627 src/multitrack.c:6403
 msgid "Clean _up Diskspace"
 msgstr ""
 
-#: src/gui.c:636 src/multitrack.c:6257
+#: src/gui.c:635 src/multitrack.c:6436
 msgid "_Edit"
 msgstr ""
 
-#: src/gui.c:685
+#: src/gui.c:684
 msgid "_MULTITRACK mode"
 msgstr ""
 
-#: src/gui.c:696
+#: src/gui.c:695
 msgid "_Copy Selection"
 msgstr ""
 
-#: src/gui.c:705
+#: src/gui.c:704
 msgid "Cu_t Selection"
 msgstr ""
 
-#: src/gui.c:714
+#: src/gui.c:713
 msgid "_Insert from Clipboard..."
 msgstr ""
 
-#: src/gui.c:730
+#: src/gui.c:729
 msgid "Paste as _New"
 msgstr ""
 
-#: src/gui.c:739
+#: src/gui.c:738
 msgid "_Merge Clipboard with Selection..."
 msgstr ""
 
-#: src/gui.c:746
+#: src/gui.c:745
 msgid "_Delete Selection"
 msgstr ""
 
-#: src/gui.c:764
+#: src/gui.c:763
 msgid "Decouple _Video from Audio"
 msgstr ""
 
-#: src/gui.c:772
+#: src/gui.c:771
 msgid "_Select..."
 msgstr ""
 
-#: src/gui.c:786
+#: src/gui.c:785
 msgid "Select _All Frames"
 msgstr ""
 
-#: src/gui.c:794
+#: src/gui.c:793
 msgid "_Start Frame Only"
 msgstr ""
 
-#: src/gui.c:802
+#: src/gui.c:801
 msgid "_End Frame Only"
 msgstr ""
 
-#: src/gui.c:813
+#: src/gui.c:812
 msgid "Select from _First Frame"
 msgstr ""
 
-#: src/gui.c:817
+#: src/gui.c:816
 msgid "Select to _Last Frame"
 msgstr ""
 
-#: src/gui.c:821
+#: src/gui.c:820
 msgid "Select Last Insertion/_Merge"
 msgstr ""
 
-#: src/gui.c:825
+#: src/gui.c:824
 msgid "Select Last _Effect"
 msgstr ""
 
-#: src/gui.c:829
+#: src/gui.c:828
 msgid "_Invert Selection"
 msgstr ""
 
-#: src/gui.c:837
+#: src/gui.c:836
 msgid "_Lock Selection Width"
 msgstr ""
 
-#: src/gui.c:842 src/multitrack.c:6409
+#: src/gui.c:841 src/multitrack.c:6591
 msgid "_Play"
 msgstr ""
 
-#: src/gui.c:854
+#: src/gui.c:853
 msgid "_Play All"
 msgstr ""
 
-#: src/gui.c:869
+#: src/gui.c:868
 msgid "Pla_y Selection"
 msgstr ""
 
-#: src/gui.c:877
+#: src/gui.c:876
 msgid "Play _Clipboard"
 msgstr ""
 
-#: src/gui.c:899 src/multitrack.c:6441
+#: src/gui.c:898 src/multitrack.c:6623
 msgid "_Stop"
 msgstr ""
 
-#: src/gui.c:914 src/multitrack.c:6453
+#: src/gui.c:913 src/multitrack.c:6635
 msgid "Re_wind"
 msgstr ""
 
-#: src/gui.c:946 src/multitrack.c:6471
+#: src/gui.c:945 src/multitrack.c:6653
 msgid "_Full Screen"
 msgstr ""
 
-#: src/gui.c:955
+#: src/gui.c:954
 msgid "_Double Size"
 msgstr ""
 
-#: src/gui.c:963 src/multitrack.c:6479
+#: src/gui.c:962 src/multitrack.c:6661
 msgid "Play in _Separate Window"
 msgstr ""
 
-#: src/gui.c:972
+#: src/gui.c:971
 msgid "_Blank Background"
 msgstr ""
 
-#: src/gui.c:979
+#: src/gui.c:978
 msgid "(Auto)_loop Video (to fit audio track)"
 msgstr ""
 
-#: src/gui.c:988 src/multitrack.c:6487
+#: src/gui.c:987 src/multitrack.c:6669
 msgid "L_oop Continuously"
 msgstr ""
 
-#: src/gui.c:997
+#: src/gui.c:996
 msgid "Pin_g Pong Loops"
 msgstr ""
 
-#: src/gui.c:1005 src/multitrack.c:6495
+#: src/gui.c:1004 src/multitrack.c:6677
 msgid "_Mute"
 msgstr ""
 
-#: src/gui.c:1017
+#: src/gui.c:1016
 msgid "Separate Window 'S_ticky' Mode"
 msgstr ""
 
-#: src/gui.c:1025
+#: src/gui.c:1024
 msgid "S_how Frame Counter"
 msgstr ""
 
-#: src/gui.c:1035
+#: src/gui.c:1034
 msgid "Show Subtitles"
 msgstr ""
 
-#: src/gui.c:1045
+#: src/gui.c:1044
 msgid "Letterbox mode"
 msgstr ""
 
-#: src/gui.c:1051 src/multitrack.c:6507
+#: src/gui.c:1050 src/multitrack.c:6689
 msgid "Effect_s"
 msgstr ""
 
-#: src/gui.c:1054
+#: src/gui.c:1053
 msgid "Effects are applied to the current selection."
 msgstr ""
 
-#: src/gui.c:1067
+#: src/gui.c:1066
 msgid "_Run Test Rendered Effect/Tool/Generator..."
 msgstr ""
 
-#: src/gui.c:1072 src/multitrack.c:7123
+#: src/gui.c:1071 src/multitrack.c:7299
 msgid "_Tools"
 msgstr ""
 
-#: src/gui.c:1075
+#: src/gui.c:1074
 msgid "Tools are applied to complete clips."
 msgstr ""
 
-#: src/gui.c:1085
+#: src/gui.c:1084
 msgid "_Reverse Clipboard"
 msgstr ""
 
-#: src/gui.c:1094
+#: src/gui.c:1093
 msgid "_Change Playback/Save Speed..."
 msgstr ""
 
-#: src/gui.c:1099
+#: src/gui.c:1098
 msgid "Resample _Video to New Frame Rate..."
 msgstr ""
 
-#: src/gui.c:1105
+#: src/gui.c:1104
 msgid "_Utilities"
 msgstr ""
 
-#: src/gui.c:1110
+#: src/gui.c:1109
 msgid "Custom _Tools"
 msgstr ""
 
-#: src/gui.c:1116 src/multitrack.c:7149
+#: src/gui.c:1115 src/multitrack.c:7325
 msgid "_Generate"
 msgstr ""
 
-#: src/gui.c:1126
+#: src/gui.c:1125
 msgid "Loading rendered effect plugins..."
 msgstr ""
 
-#: src/gui.c:1139
+#: src/gui.c:1138
 msgid "Load _Subtitles from File..."
 msgstr ""
 
-#: src/gui.c:1144
+#: src/gui.c:1143
 msgid "Erase subtitles"
 msgstr ""
 
-#: src/gui.c:1152 src/multitrack.c:7158
+#: src/gui.c:1151 src/multitrack.c:7334
 msgid "Capture _External Window... "
 msgstr ""
 
-#: src/gui.c:1159 src/multitrack.c:7173
+#: src/gui.c:1158 src/multitrack.c:7349
 msgid "_Preferences..."
 msgstr ""
 
-#: src/gui.c:1172
+#: src/gui.c:1171
 msgid "_Audio"
 msgstr ""
 
-#: src/gui.c:1184
+#: src/gui.c:1183
 msgid "Load _New Audio for Clip..."
 msgstr ""
 
-#: src/gui.c:1190
+#: src/gui.c:1189
 msgid "Load _CD Track..."
 msgstr ""
 
-#: src/gui.c:1191
+#: src/gui.c:1190
 msgid "E_ject CD"
 msgstr ""
 
-#: src/gui.c:1205
+#: src/gui.c:1204
 msgid "Record E_xternal Audio..."
 msgstr ""
 
-#: src/gui.c:1218
+#: src/gui.c:1217
 msgid "to New _Clip..."
 msgstr ""
 
-#: src/gui.c:1222
+#: src/gui.c:1221
 msgid "to _Selection"
 msgstr ""
 
-#: src/gui.c:1230
+#: src/gui.c:1229
 msgid "Fade Audio _In..."
 msgstr ""
 
-#: src/gui.c:1234
+#: src/gui.c:1233
 msgid "Fade Audio _Out..."
 msgstr ""
 
-#: src/gui.c:1244
+#: src/gui.c:1243
 msgid "_Export Audio..."
 msgstr ""
 
-#: src/gui.c:1257
+#: src/gui.c:1256
 msgid "Export _Selected Audio..."
 msgstr ""
 
-#: src/gui.c:1261
+#: src/gui.c:1260
 msgid "Export _All Audio..."
 msgstr ""
 
-#: src/gui.c:1265
+#: src/gui.c:1264
 msgid "_Append Audio..."
 msgstr ""
 
-#: src/gui.c:1270
+#: src/gui.c:1269
 msgid "_Trim/Pad Audio..."
 msgstr ""
 
-#: src/gui.c:1283
+#: src/gui.c:1282
 msgid "Trim/Pad Audio to _Selection"
 msgstr ""
 
-#: src/gui.c:1288
+#: src/gui.c:1287
 msgid "Trim/Pad Audio from Beginning to _Play Start"
 msgstr ""
 
-#: src/gui.c:1293
+#: src/gui.c:1292
 msgid "_Delete Audio..."
 msgstr ""
 
-#: src/gui.c:1306
+#: src/gui.c:1305
 msgid "Delete _Selected Audio"
 msgstr ""
 
-#: src/gui.c:1310
+#: src/gui.c:1309
 msgid "Delete _All Audio"
 msgstr ""
 
-#: src/gui.c:1314
+#: src/gui.c:1313
 msgid "Insert _Silence in Selection"
 msgstr ""
 
-#: src/gui.c:1319
+#: src/gui.c:1318
 msgid "_Resample Audio..."
 msgstr ""
 
-#: src/gui.c:1324
+#: src/gui.c:1323
 msgid "_Info"
 msgstr ""
 
-#: src/gui.c:1336
+#: src/gui.c:1335
 msgid "Show Clip _Info"
 msgstr ""
 
-#: src/gui.c:1344
+#: src/gui.c:1343
 msgid "Show/_Edit File Comments"
 msgstr ""
 
-#: src/gui.c:1349
+#: src/gui.c:1348
 msgid "Show _Clipboard Info"
 msgstr ""
 
-#: src/gui.c:1360 src/multitrack.c:7286
+#: src/gui.c:1359 src/multitrack.c:7462
 msgid "Show _Messages"
 msgstr ""
 
-#: src/gui.c:1364 src/multitrack.c:7365
+#: src/gui.c:1363 src/multitrack.c:7541
 msgid "Show _Layout Errors"
 msgstr ""
 
-#: src/gui.c:1369 src/multitrack.c:7263
+#: src/gui.c:1368 src/multitrack.c:7439
 msgid "_Clips"
 msgstr ""
 
-#: src/gui.c:1381
+#: src/gui.c:1380
 msgid "_Rename Current Clip in Menu..."
 msgstr ""
 
-#: src/gui.c:1399
+#: src/gui.c:1398
 msgid "A_dvanced"
 msgstr ""
 
-#: src/gui.c:1412
+#: src/gui.c:1411
 msgid "_RFX Effects/Tools/Utilities"
 msgstr ""
 
-#: src/gui.c:1424
+#: src/gui.c:1423
 msgid "_New Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1428
+#: src/gui.c:1427
 msgid "_Copy RFX Script to Test..."
 msgstr ""
 
-#: src/gui.c:1432
+#: src/gui.c:1431
 msgid "_Edit Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1436
+#: src/gui.c:1435
 msgid "Rena_me Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1440
+#: src/gui.c:1439
 msgid "_Delete Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1450
+#: src/gui.c:1449
 msgid "_Promote Test Rendered Effect/Tool/Generator..."
 msgstr ""
 
-#: src/gui.c:1457
+#: src/gui.c:1456
 msgid "_Import Custom RFX script..."
 msgstr ""
 
-#: src/gui.c:1461
+#: src/gui.c:1460
 msgid "E_xport Custom RFX script..."
 msgstr ""
 
-#: src/gui.c:1465
+#: src/gui.c:1464
 msgid "De_lete Custom RFX Script..."
 msgstr ""
 
-#: src/gui.c:1472
+#: src/gui.c:1471
 msgid "Re_build all RFX plugins"
 msgstr ""
 
-#: src/gui.c:1501
+#: src/gui.c:1498
 msgid "Receive _LiVES stream from..."
 msgstr ""
 
-#: src/gui.c:1506
+#: src/gui.c:1503
 msgid "_Send LiVES stream to..."
 msgstr ""
 
-#: src/gui.c:1515
+#: src/gui.c:1512
 #, c-format
 msgid "Open _yuv4mpeg stream on %sstream.yuv..."
 msgstr ""
 
-#: src/gui.c:1536
+#: src/gui.c:1534
 msgid "_Import Project (.lv2)..."
 msgstr ""
 
-#: src/gui.c:1540
+#: src/gui.c:1538
 msgid "E_xport Project (.lv2)..."
 msgstr ""
 
-#: src/gui.c:1545
+#: src/gui.c:1543
 msgid "_VJ"
 msgstr ""
 
-#: src/gui.c:1557
+#: src/gui.c:1555
 msgid "Real Time _Effect Mapping"
 msgstr ""
 
-#: src/gui.c:1563
+#: src/gui.c:1561
 msgid "Bind real time effects to ctrl-number keys."
 msgstr ""
 
-#: src/gui.c:1565
+#: src/gui.c:1563
 msgid "Set Real Time Effect _Defaults"
 msgstr ""
 
-#: src/gui.c:1567
+#: src/gui.c:1565
 msgid "Set default parameter values for real time effects."
 msgstr ""
 
-#: src/gui.c:1580
+#: src/gui.c:1578
 msgid "Save Real Time Effect _Defaults"
 msgstr ""
 
-#: src/gui.c:1583
+#: src/gui.c:1581
 msgid ""
 "Save real time effect defaults so they will be restored each time you use "
 "LiVES."
 msgstr ""
 
-#: src/gui.c:1589
+#: src/gui.c:1587
 msgid "_Reset all playback speeds and positions"
 msgstr ""
 
-#: src/gui.c:1592
+#: src/gui.c:1590
 msgid ""
 "Reset all playback positions to frame 1, and reset all playback frame rates."
 msgstr ""
 
-#: src/gui.c:1594
+#: src/gui.c:1592
 msgid "_MIDI/joystick interface"
 msgstr ""
 
-#: src/gui.c:1609
+#: src/gui.c:1607
 msgid "_MIDI/joystick learner..."
 msgstr ""
 
-#: src/gui.c:1614
+#: src/gui.c:1612
 msgid "_Save device mapping..."
 msgstr ""
 
-#: src/gui.c:1620
+#: src/gui.c:1618
 msgid "_Load device mapping..."
 msgstr ""
 
-#: src/gui.c:1628
+#: src/gui.c:1626
 msgid "Show VJ _Keys"
 msgstr ""
 
-#: src/gui.c:1632
+#: src/gui.c:1630
 msgid "To_ys"
 msgstr ""
 
-#: src/gui.c:1644
+#: src/gui.c:1642
 msgid "_None"
 msgstr ""
 
-#: src/gui.c:1652
+#: src/gui.c:1650
 msgid "_Autolives"
 msgstr ""
 
-#: src/gui.c:1657
+#: src/gui.c:1655
 msgid "_Mad Frames"
 msgstr ""
 
-#: src/gui.c:1662
+#: src/gui.c:1660
 msgid "_LiVES TV (broadband)"
 msgstr ""
 
-#: src/gui.c:1672 src/multitrack.c:7387
+#: src/gui.c:1670 src/multitrack.c:7563
 msgid "_Help"
 msgstr ""
 
-#: src/gui.c:1684 src/multitrack.c:7407
+#: src/gui.c:1682 src/multitrack.c:7583
 msgid "_Manual (opens in browser)"
 msgstr ""
 
-#: src/gui.c:1691 src/multitrack.c:7416
+#: src/gui.c:1689 src/multitrack.c:7592
 msgid "_Donate to the project !"
 msgstr ""
 
-#: src/gui.c:1695 src/multitrack.c:7420
+#: src/gui.c:1693 src/multitrack.c:7596
 msgid "_Email the author"
 msgstr ""
 
-#: src/gui.c:1699 src/multitrack.c:7424
+#: src/gui.c:1697 src/multitrack.c:7600
 msgid "Report a _bug"
 msgstr ""
 
-#: src/gui.c:1703 src/multitrack.c:7428
+#: src/gui.c:1701 src/multitrack.c:7604
 msgid "Suggest a _feature"
 msgstr ""
 
-#: src/gui.c:1707 src/multitrack.c:7432
+#: src/gui.c:1705 src/multitrack.c:7608
 msgid "Assist with _translating"
 msgstr ""
 
-#: src/gui.c:1714 src/multitrack.c:7439
+#: src/gui.c:1712 src/multitrack.c:7615
 msgid "_Troubleshoot"
 msgstr ""
 
-#: src/gui.c:1718 src/multitrack.c:7443
+#: src/gui.c:1716 src/multitrack.c:7619
 msgid "_About"
 msgstr ""
 
-#: src/gui.c:1752
+#: src/gui.c:1750
 msgid "Rewind to start (w)"
 msgstr ""
 
-#: src/gui.c:1760 src/multitrack.c:16720
+#: src/gui.c:1758 src/multitrack.c:17010
 msgid "Play all (p)"
 msgstr ""
 
-#: src/gui.c:1768 src/gui.c:1877
+#: src/gui.c:1766 src/gui.c:1876
 msgid "Stop playback (q)"
 msgstr ""
 
-#: src/gui.c:1779
+#: src/gui.c:1777
 msgid "Play selection (y)"
 msgstr ""
 
-#: src/gui.c:1832
+#: src/gui.c:1829
 msgid "Volume"
 msgstr ""
 
-#: src/gui.c:1854
+#: src/gui.c:1853
 msgid "Audio volume (1.00)"
 msgstr ""
 
-#: src/gui.c:1883
+#: src/gui.c:1882
 msgid "Unblank background (b)"
 msgstr ""
 
-#: src/gui.c:1929
+#: src/gui.c:1928
 msgid "Play slower (ctrl-down)"
 msgstr ""
 
-#: src/gui.c:1935
+#: src/gui.c:1934
 msgid "Play faster (ctrl-up)"
 msgstr ""
 
-#: src/gui.c:1942
+#: src/gui.c:1941
 msgid "Skip back (ctrl-left)"
 msgstr ""
 
-#: src/gui.c:1948
+#: src/gui.c:1947
 msgid "Skip forward (ctrl-right)"
 msgstr ""
 
-#: src/gui.c:1954
+#: src/gui.c:1953
 msgid "Show clip info (i)"
 msgstr ""
 
-#: src/gui.c:1960
+#: src/gui.c:1959
 msgid "Hide this toolbar"
 msgstr ""
 
-#: src/gui.c:1962
+#: src/gui.c:1961
 msgid ""
 "Press \"s\" to toggle separate play window for improved performance, \"q\" "
 "to stop."
 msgstr ""
 
 #. TRANSLATORS: please keep the translated string the same length
-#: src/gui.c:1995
+#: src/gui.c:1994
 msgid "     Video playback speed (frames per second)        "
 msgstr ""
 
-#: src/gui.c:2009
+#: src/gui.c:2008
 msgid "Vary the video speed"
 msgstr ""
 
-#: src/gui.c:2092 src/gui.c:3218
+#: src/gui.c:2090 src/gui.c:3329
 msgid "First Frame"
 msgstr ""
 
-#: src/gui.c:2193 src/gui.c:3226
+#: src/gui.c:2191 src/gui.c:3336
 msgid "Last Frame"
 msgstr ""
 
-#: src/gui.c:2210
+#: src/gui.c:2208
 msgid "The first selected frame in this clip"
 msgstr ""
 
-#: src/gui.c:2248
+#: src/gui.c:2246
 msgid "The last selected frame in this clip"
 msgstr ""
 
-#: src/gui.c:2532
+#: src/gui.c:2546
 msgid "Starting...\n"
 msgstr ""
 
-#: src/gui.c:3074
+#: src/gui.c:3181
 msgid "    Press 'q' to stop recording.  DO NOT COVER THE PLAY WINDOW !   "
 msgstr ""
 
-#: src/gui.c:3521
+#: src/gui.c:3643
 msgid "Frame number to preview"
 msgstr ""
 
-#: src/gui.c:3538
+#: src/gui.c:3660
 msgid "_Free"
 msgstr ""
 
-#: src/gui.c:3539
+#: src/gui.c:3661
 msgid "Free choice of frame number"
 msgstr ""
 
-#: src/gui.c:3543
+#: src/gui.c:3666
 msgid "_Start"
 msgstr ""
 
-#: src/gui.c:3544
+#: src/gui.c:3667
 msgid "Frame number is linked to start frame"
 msgstr ""
 
-#: src/gui.c:3551
+#: src/gui.c:3675
 msgid "_End"
 msgstr ""
 
-#: src/gui.c:3552
+#: src/gui.c:3676
 msgid "Frame number is linked to end frame"
 msgstr ""
 
-#: src/gui.c:3559
+#: src/gui.c:3684
 msgid "_Pointer"
 msgstr ""
 
-#: src/gui.c:3560
+#: src/gui.c:3685
 msgid "Frame number is linked to playback pointer"
 msgstr ""
 
-#: src/gui.c:3581
+#: src/gui.c:3707
 msgid "Rewind"
 msgstr ""
 
-#: src/gui.c:3592 src/dialogs.c:894 src/dialogs.c:896 src/dialogs.c:1817
-#: src/dialogs.c:1819
+#: src/gui.c:3718 src/dialogs.c:960 src/dialogs.c:962 src/dialogs.c:1873
+#: src/dialogs.c:1875
 msgid "Play all"
 msgstr ""
 
-#: src/gui.c:3605
+#: src/gui.c:3731
 msgid "Play Selection"
 msgstr ""
 
-#: src/gui.c:3619
+#: src/gui.c:3745
 msgid "Loop On/Off"
 msgstr ""
 
-#: src/gui.c:3693
+#: src/gui.c:3819
 msgid "Start _recording"
 msgstr ""
 
-#: src/gui.c:3698
+#: src/gui.c:3824
 msgid "Stop _recording"
 msgstr ""
 
-#: src/gui.c:3703
+#: src/gui.c:3829
 msgid "_Record Performance"
 msgstr ""
 
-#: src/gui.c:3851
+#: src/gui.c:3974
 msgid "Hide Play Window"
 msgstr ""
 
-#: src/gui.c:4232
+#: src/gui.c:4333
 msgid "Show Play Window"
 msgstr ""
 
-#: src/ce_thumbs.c:222
+#: src/ce_thumbs.c:242
 #, c-format
 msgid "Mapped to ctrl-%d"
 msgstr ""
 
-#: src/ce_thumbs.c:276 src/effects.c:85 src/preferences.c:3195
+#: src/ce_thumbs.c:296 src/effects.c:86 src/preferences.c:3247
 msgid "Effects"
 msgstr ""
 
-#: src/ce_thumbs.c:279 src/multitrack.c:5615
+#: src/ce_thumbs.c:299 src/multitrack.c:5791
 msgid "Clips"
 msgstr ""
 
-#: src/ce_thumbs.c:303
+#: src/ce_thumbs.c:323
 #, c-format
 msgid "Show / apply effects to %s\n"
 msgstr ""
 
-#: src/ce_thumbs.c:315
+#: src/ce_thumbs.c:335
 #, c-format
 msgid "Select clip for %s\n"
 msgstr ""
 
-#: src/ce_thumbs.c:515
+#: src/ce_thumbs.c:536
 msgid "_Pin"
 msgstr ""
 
-#: src/ce_thumbs.c:515
+#: src/ce_thumbs.c:537
 msgid "Pin the parameter box to the window"
 msgstr ""
 
 #. TRANSLATORS: Exabytes
-#: src/utils.c:794
+#: src/utils.c:800
 #, c-format
 msgid "%.2f EB"
 msgstr ""
 
 #. TRANSLATORS: Petabytes
-#: src/utils.c:798
+#: src/utils.c:803
 #, c-format
 msgid "%.2f PB"
 msgstr ""
 
 #. TRANSLATORS: Terabytes
-#: src/utils.c:802
+#: src/utils.c:806
 #, c-format
 msgid "%.2f TB"
 msgstr ""
 
 #. TRANSLATORS: Gigabytes
-#: src/utils.c:806
+#: src/utils.c:809
 #, c-format
 msgid "%.2f GB"
 msgstr ""
 
 #. TRANSLATORS: Megabytes
-#: src/utils.c:810
+#: src/utils.c:812
 #, c-format
 msgid "%.2f MB"
 msgstr ""
 
 #. TRANSLATORS: Kilobytes (1024 bytes)
-#: src/utils.c:814
+#: src/utils.c:815
 #, c-format
 msgid "%.2f KiB"
 msgstr ""
@@ -3600,7 +3590,7 @@
 msgid "%d bytes"
 msgstr ""
 
-#: src/utils.c:1841
+#: src/utils.c:1835
 msgid "Clearing the clipboard"
 msgstr ""
 
@@ -3612,81 +3602,81 @@
 "Switched to clip %s\n"
 msgstr ""
 
-#: src/utils.c:1880
+#: src/utils.c:1877
 msgid ""
 "\n"
 "==============================\n"
 "Switched to empty clip\n"
 msgstr ""
 
-#: src/utils.c:1917
+#: src/utils.c:1916
 msgid "(blank)"
 msgstr ""
 
-#: src/utils.c:1920
+#: src/utils.c:1919
 #, c-format
 msgid ""
 "The set name has been changed from %s to %s. Affected layouts have been "
 "updated accordingly\n"
 msgstr ""
 
-#: src/utils.c:1928
+#: src/utils.c:1927
 #, c-format
 msgid ""
 "The clip %s is missing from this set.\n"
 "It is required by the following layouts:\n"
 msgstr ""
 
-#: src/utils.c:1932
+#: src/utils.c:1931
 #, c-format
 msgid ""
 "The clip %s has been closed.\n"
 "It is required by the following layouts:\n"
 msgstr ""
 
-#: src/utils.c:1937
+#: src/utils.c:1936
 #, c-format
 msgid ""
 "Frames have been shifted in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1942
+#: src/utils.c:1941
 #, c-format
 msgid ""
 "Frames have been deleted from the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1947
+#: src/utils.c:1946
 #, c-format
 msgid ""
 "Audio has been deleted from the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1952
+#: src/utils.c:1951
 #, c-format
 msgid ""
 "Audio has been shifted in clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1957
+#: src/utils.c:1956
 #, c-format
 msgid ""
 "Audio has been altered in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1962
+#: src/utils.c:1961
 #, c-format
 msgid ""
 "Frames have been altered in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:2135
+#: src/utils.c:2134
 #, c-format
 msgid ""
 "Set %s\n"
@@ -3694,7 +3684,7 @@
 "by another copy of LiVES.\n"
 msgstr ""
 
-#: src/utils.c:2142
+#: src/utils.c:2140
 #, c-format
 msgid ""
 "\n"
@@ -3740,67 +3730,67 @@
 msgid "Removing layout %s\n"
 msgstr ""
 
-#: src/utils.c:3014
+#: src/utils.c:2996
 msgid "Video [opening...]"
 msgstr ""
 
-#: src/utils.c:3018
+#: src/utils.c:2999
 #, c-format
 msgid "Video [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:3022
+#: src/utils.c:3002
 msgid "(Undefined)"
 msgstr ""
 
-#: src/utils.c:3025
+#: src/utils.c:3004
 msgid "(No video)"
 msgstr ""
 
-#: src/utils.c:3032
+#: src/utils.c:3011
 msgid "(No audio)"
 msgstr ""
 
-#: src/utils.c:3037
+#: src/utils.c:3015
 msgid "Mono  [opening...]"
 msgstr ""
 
-#: src/utils.c:3040
+#: src/utils.c:3017
 msgid "Left Audio [opening...]"
 msgstr ""
 
-#: src/utils.c:3045
+#: src/utils.c:3021
 #, c-format
 msgid "Mono [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:3048
+#: src/utils.c:3023
 #, c-format
 msgid "Left Audio [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:3056
+#: src/utils.c:3031
 msgid "Right Audio [opening...]"
 msgstr ""
 
-#: src/utils.c:3059
+#: src/utils.c:3033
 #, c-format
 msgid "Right Audio [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:3506
+#: src/utils.c:3472
 msgid "LiVES cannot switch to mplayer whilst clips are loading."
 msgstr ""
 
-#: src/utils.c:3559
+#: src/utils.c:3525
 msgid "LiVES cannot switch to mplayer2 whilst clips are loading."
 msgstr ""
 
-#: src/utils.c:3809
+#: src/utils.c:3775
 msgid "Cleaning up clip"
 msgstr ""
 
-#: src/utils.c:3913
+#: src/utils.c:3874
 #, c-format
 msgid ""
 "\n"
@@ -3810,30 +3800,29 @@
 "Overwrite ?\n"
 msgstr ""
 
-#: src/utils.c:4305 src/utils.c:4337 src/multitrack.c:4503
+#: src/utils.c:4250 src/utils.c:4280 src/multitrack.c:4672
 #, c-format
 msgid "_Undo %s"
 msgstr ""
 
-#: src/utils.c:4306 src/utils.c:4338 src/multitrack.c:4525
+#: src/utils.c:4251 src/utils.c:4281 src/multitrack.c:4693
 #, c-format
 msgid "_Redo %s"
 msgstr ""
 
-#: src/utils.c:4363
+#: src/utils.c:4305
 msgid "-------------Selection------------"
 msgstr ""
 
-#. TRANSLATORS: - try to keep the text of the middle part the same length, by deleting "-" if necessary
-#: src/utils.c:4371
+#: src/utils.c:4313
 msgid " sec ] ----------Selection---------- [ "
 msgstr ""
 
-#: src/utils.c:4371
+#: src/utils.c:4314
 msgid " frames ] ----------"
 msgstr ""
 
-#: src/utils.c:5360
+#: src/utils.c:5302
 msgid ""
 "Your version of mplayer/ffmpeg may be broken !\n"
 "See http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2071\n"
@@ -3844,11 +3833,11 @@
 "Try running Help/Troubleshoot for more information."
 msgstr ""
 
-#: src/saveplay.c:178
+#: src/saveplay.c:179
 msgid "Examining file header"
 msgstr ""
 
-#: src/saveplay.c:315 src/saveplay.c:789
+#: src/saveplay.c:316 src/saveplay.c:779
 #, c-format
 msgid "Opening %s"
 msgstr ""
@@ -3858,36 +3847,36 @@
 msgid "Opening %s start time %.2f sec. frames %d"
 msgstr ""
 
-#: src/saveplay.c:326 src/saveplay.c:4001
+#: src/saveplay.c:326 src/saveplay.c:3927
 msgid " without sound"
 msgstr ""
 
-#: src/saveplay.c:396
+#: src/saveplay.c:395
 #, c-format
 msgid "Opening audio for %s"
 msgstr ""
 
-#: src/saveplay.c:557
+#: src/saveplay.c:554
 #, c-format
 msgid "Auto trimming %.2f seconds of audio at start..."
 msgstr ""
 
-#: src/saveplay.c:567
+#: src/saveplay.c:562
 #, c-format
 msgid "Auto trimming %.2f seconds of audio at end..."
 msgstr ""
 
-#: src/saveplay.c:584
+#: src/saveplay.c:577
 #, c-format
 msgid "Auto padding with %.2f seconds of silence at start..."
 msgstr ""
 
-#: src/saveplay.c:599
+#: src/saveplay.c:590
 #, c-format
 msgid "Auto padding with %.2f seconds of silence at end..."
 msgstr ""
 
-#: src/saveplay.c:671
+#: src/saveplay.c:661
 #, c-format
 msgid ""
 "\n"
@@ -3899,11 +3888,11 @@
 "Are you sure you wish to continue ?"
 msgstr ""
 
-#: src/saveplay.c:685
+#: src/saveplay.c:676
 msgid " - please be patient."
 msgstr ""
 
-#: src/saveplay.c:938
+#: src/saveplay.c:926
 msgid ""
 "\n"
 "\n"
@@ -3911,14 +3900,14 @@
 "Please check the terminal window for more details.\n"
 msgstr ""
 
-#: src/saveplay.c:940
+#: src/saveplay.c:928
 msgid ""
 "\n"
 "\n"
 "You may need to install mplayer to open this file.\n"
 msgstr ""
 
-#: src/saveplay.c:948
+#: src/saveplay.c:934
 msgid ""
 "\n"
 "\n"
@@ -3926,29 +3915,29 @@
 "Tools|Preferences|Decoding\n"
 msgstr ""
 
-#: src/saveplay.c:1014
+#: src/saveplay.c:995
 msgid "Adding image..."
 msgstr ""
 
-#: src/saveplay.c:1108
+#: src/saveplay.c:1089
 #, c-format
 msgid "Subtitles were saved as %s\n"
 msgstr ""
 
-#: src/saveplay.c:1192
+#: src/saveplay.c:1171
 #, c-format
 msgid "LiVES: Save Frame %d as..."
 msgstr ""
 
-#: src/saveplay.c:1195
+#: src/saveplay.c:1174
 msgid "LiVES: Save Frame as..."
 msgstr ""
 
-#: src/saveplay.c:1322
+#: src/saveplay.c:1303
 msgid "LiVES: Save Clip as..."
 msgstr ""
 
-#: src/saveplay.c:1390
+#: src/saveplay.c:1369
 msgid ""
 "Saving your video could lead to a loss of quality !\n"
 "You are strongly advised to 'Save As' to a new file.\n"
@@ -3956,67 +3945,67 @@
 "Do you still wish to continue ?"
 msgstr ""
 
-#: src/saveplay.c:1517 src/saveplay.c:1683 src/saveplay.c:1762
-#: src/saveplay.c:4014
+#: src/saveplay.c:1494 src/saveplay.c:1659 src/saveplay.c:1738
+#: src/saveplay.c:3940
 msgid "Pulling frames from clip"
 msgstr ""
 
-#: src/saveplay.c:1588 src/saveplay.c:1727
+#: src/saveplay.c:1565 src/saveplay.c:1703
 msgid "Linking selection"
 msgstr ""
 
-#: src/saveplay.c:1779
+#: src/saveplay.c:1755
 msgid " (with no sound)\n"
 msgstr ""
 
-#: src/saveplay.c:1786
+#: src/saveplay.c:1761
 #, c-format
 msgid "Saving frames %d to %d%s as \"%s\" : encoder = %s : format = %s..."
 msgstr ""
 
-#: src/saveplay.c:1790
+#: src/saveplay.c:1765
 #, c-format
 msgid "Saving frames 1 to %d%s as \"%s\" : encoder %s : format = %s..."
 msgstr ""
 
-#: src/saveplay.c:1909
+#: src/saveplay.c:1890
 msgid "Saving [can take a long time]"
 msgstr ""
 
-#: src/saveplay.c:2057
+#: src/saveplay.c:2044
 msgid ""
 "\n"
 "\n"
 "Encoder error - output file was not created !\n"
 msgstr ""
 
-#: src/saveplay.c:2094
+#: src/saveplay.c:2081
 msgid "Clearing letterbox"
 msgstr ""
 
-#: src/saveplay.c:2183
+#: src/saveplay.c:2168
 #, c-format
 msgid "File size was %s\n"
 msgstr ""
 
-#: src/saveplay.c:2284
+#: src/saveplay.c:2265
 msgid "recording aborted by preview.\n"
 msgstr ""
 
-#: src/saveplay.c:2288
+#: src/saveplay.c:2268
 msgid "recording aborted by clipboard playback.\n"
 msgstr ""
 
-#: src/saveplay.c:2291
+#: src/saveplay.c:2270
 msgid "Recording performance..."
 msgstr ""
 
-#: src/saveplay.c:3293
+#: src/saveplay.c:3251
 #, c-format
 msgid "Average FPS was %.4f\n"
 msgstr ""
 
-#: src/saveplay.c:3299
+#: src/saveplay.c:3256
 msgid ""
 "\n"
 "\n"
@@ -4025,16 +4014,21 @@
 "and resize all frames to the current size.\n"
 msgstr ""
 
-#: src/saveplay.c:3479
+#: src/saveplay.c:3429
 msgid "Unknown"
 msgstr ""
 
-#: src/saveplay.c:3588 src/saveplay.c:4585
+#: src/saveplay.c:3538 src/saveplay.c:4502
 #, c-format
 msgid "Untitled%d"
 msgstr ""
 
-#: src/saveplay.c:3633
+#: src/saveplay.c:3567
+#, c-format
+msgid "%d frames are enough !\n"
+msgstr ""
+
+#: src/saveplay.c:3579
 #, c-format
 msgid ""
 "\n"
@@ -4042,7 +4036,7 @@
 "Bad things may happen with this clip.\n"
 msgstr ""
 
-#: src/saveplay.c:3723
+#: src/saveplay.c:3667
 #, c-format
 msgid ""
 "\n"
@@ -4050,73 +4044,73 @@
 "Default can be set in Tools | Preferences | Misc.\n"
 msgstr ""
 
-#: src/saveplay.c:3735
+#: src/saveplay.c:3677
 #, c-format
 msgid "Playback speed was adjusted to %.3f frames per second to fit audio.\n"
 msgstr ""
 
-#: src/saveplay.c:3754
+#: src/saveplay.c:3694
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d *bpp=Greyscale* fps=%.3f\n"
 "Audio:"
 msgstr ""
 
-#: src/saveplay.c:3758 src/saveplay.c:4762
+#: src/saveplay.c:3698 src/saveplay.c:4671
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d bpp=%d fps=%.3f\n"
 "Audio:"
 msgstr ""
 
-#: src/saveplay.c:3762 src/saveplay.c:4766
+#: src/saveplay.c:3703 src/saveplay.c:4676
 #, c-format
 msgid "%s none\n"
 msgstr ""
 
-#: src/saveplay.c:3774
+#: src/saveplay.c:3714
 #, c-format
 msgid " - Author: %s\n"
 msgstr ""
 
-#: src/saveplay.c:3779
+#: src/saveplay.c:3717
 #, c-format
 msgid " - Title: %s\n"
 msgstr ""
 
-#: src/saveplay.c:3784
+#: src/saveplay.c:3720
 #, c-format
 msgid " - Comment: %s\n"
 msgstr ""
 
-#: src/saveplay.c:3897
+#: src/saveplay.c:3829
 #, c-format
 msgid "Saving frame %d as %s..."
 msgstr ""
 
-#: src/saveplay.c:3996
+#: src/saveplay.c:3924
 #, c-format
 msgid "Backing up %s to %s"
 msgstr ""
 
-#: src/saveplay.c:4049
+#: src/saveplay.c:3975
 msgid "Backing up"
 msgstr ""
 
-#: src/saveplay.c:4083
+#: src/saveplay.c:4009
 msgid "performance data was backed up..."
 msgstr ""
 
-#: src/saveplay.c:4661
+#: src/saveplay.c:4574
 #, c-format
 msgid "Restoring %s..."
 msgstr ""
 
-#: src/saveplay.c:4692
+#: src/saveplay.c:4603
 msgid "Restoring"
 msgstr ""
 
-#: src/saveplay.c:4714
+#: src/saveplay.c:4625
 #, c-format
 msgid ""
 "\n"
@@ -4126,22 +4120,22 @@
 msgstr ""
 
 #. TRANSLATORS: rec(ord) %.2f M(ega)B(ytes)
-#: src/saveplay.c:5207
+#: src/saveplay.c:5118
 #, c-format
 msgid "rec %.2f MB"
 msgstr ""
 
-#: src/saveplay.c:5213
+#: src/saveplay.c:5123
 #, c-format
 msgid "!rec %.2f MB"
 msgstr ""
 
 #. TRANSLATORS: rec(ord) ?? M(ega)B(ytes)
-#: src/saveplay.c:5216
+#: src/saveplay.c:5126
 msgid "rec ?? MB"
 msgstr ""
 
-#: src/saveplay.c:5241
+#: src/saveplay.c:5151
 #, c-format
 msgid ""
 "\n"
@@ -4149,54 +4143,74 @@
 "Record stop level can be set in Preferences.\n"
 msgstr ""
 
-#: src/saveplay.c:5535
+#: src/saveplay.c:5447
 msgid ""
 "\n"
 "Files from a previous run of LiVES were found.\n"
 "Do you want to attempt to recover them ?\n"
 msgstr ""
 
-#: src/saveplay.c:5557
+#: src/saveplay.c:5469
 msgid "Recovering files"
 msgstr ""
 
-#: src/saveplay.c:5560
+#: src/saveplay.c:5472
 msgid "Recovering files..."
 msgstr ""
 
-#: src/dialogs.c:72
+#: src/dialogs.c:71
 msgid "Show affected _layouts"
 msgstr ""
 
-#: src/dialogs.c:128
+#: src/dialogs.c:113
+msgid ""
+"Do _not show this warning any more\n"
+"(can be turned back on from Preferences/Warnings)"
+msgstr ""
+
+#: src/dialogs.c:127
 msgid "_Recover disk space"
 msgstr ""
 
-#: src/dialogs.c:143
+#: src/dialogs.c:142
 msgid " _Advanced Settings >>"
 msgstr ""
 
-#: src/dialogs.c:184
+#: src/dialogs.c:183 src/dialogs.c:221
 msgid "LiVES: - Warning !"
 msgstr ""
 
 #: src/dialogs.c:194
+#, fuzzy
+msgid "LiVES: - Error !"
+msgstr "LiVES: - Insera"
+
+#: src/dialogs.c:204
+#, fuzzy
+msgid "LiVES: - Information"
+msgstr "LiVES: - Insera"
+
+#: src/dialogs.c:230
 msgid "LiVES: - Question"
 msgstr ""
 
-#: src/dialogs.c:204
+#: src/dialogs.c:239
 msgid "LiVES: - File Error"
 msgstr ""
 
-#: src/dialogs.c:208
+#: src/dialogs.c:241
 msgid "_Abort"
 msgstr ""
 
-#: src/dialogs.c:213
+#: src/dialogs.c:246
 msgid "_Retry"
 msgstr ""
 
-#: src/dialogs.c:597
+#: src/dialogs.c:306
+msgid "Show _Details"
+msgstr ""
+
+#: src/dialogs.c:657
 #, c-format
 msgid ""
 "FREE SPACE IN THE PARTITION CONTAINING\n"
@@ -4207,7 +4221,7 @@
 "(Disk warning levels can be configured in Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:615
+#: src/dialogs.c:676
 #, c-format
 msgid ""
 "Free space in the partition containing\n"
@@ -4219,11 +4233,11 @@
 "Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:627
+#: src/dialogs.c:688
 msgid "Audio players cannot be switched during playback."
 msgstr ""
 
-#: src/dialogs.c:632
+#: src/dialogs.c:694
 msgid ""
 "\n"
 "\n"
@@ -4231,46 +4245,46 @@
 "Please try closing some other applications first.\n"
 msgstr ""
 
-#: src/dialogs.c:752
+#: src/dialogs.c:820
 msgid "Processing has been paused."
 msgstr ""
 
-#: src/dialogs.c:937
+#: src/dialogs.c:1002
 #, c-format
 msgid ""
 "\n"
 "%s%d%% done. Time remaining: %u sec%s\n"
 msgstr ""
 
-#: src/dialogs.c:1335
+#: src/dialogs.c:1391
 #, c-format
 msgid ""
 "\n"
 "%d/%d frames opened. Time remaining %u sec.\n"
 msgstr ""
 
-#: src/dialogs.c:1337
+#: src/dialogs.c:1393
 #, c-format
 msgid ""
 "\n"
 "%d/%d frames opened.\n"
 msgstr ""
 
-#: src/dialogs.c:1341
+#: src/dialogs.c:1396
 #, c-format
 msgid ""
 "\n"
 "%d frames opened.\n"
 msgstr ""
 
-#: src/dialogs.c:1940
+#: src/dialogs.c:1993
 #, c-format
 msgid ""
 "\n"
 "Time remaining: %d sec"
 msgstr ""
 
-#: src/dialogs.c:1988
+#: src/dialogs.c:2040
 #, c-format
 msgid ""
 "\n"
@@ -4278,7 +4292,7 @@
 "Please close a file and then try again."
 msgstr ""
 
-#: src/dialogs.c:1994
+#: src/dialogs.c:2047
 #, c-format
 msgid ""
 "LiVES was unable to write to its temporary directory.\n"
@@ -4290,27 +4304,27 @@
 "Please make sure you can write to this directory."
 msgstr ""
 
-#: src/dialogs.c:2005
+#: src/dialogs.c:2059
 msgid ""
 "\n"
 "LiVES currently requires either 'mplayer', 'mplayer2', or 'sox' to function. "
 "Please install one or other of these, and try again.\n"
 msgstr ""
 
-#: src/dialogs.c:2010
+#: src/dialogs.c:2064
 msgid ""
 "Audio was not loaded; please install mplayer or mplayer2 if you expected "
 "audio for this clip.\n"
 msgstr ""
 
-#: src/dialogs.c:2014
+#: src/dialogs.c:2069
 msgid ""
 "Audio resampling is required for this format.\n"
 "Please install 'sox'\n"
 "Or switch to another encoder format in Tools | Preferences | Encoding\n"
 msgstr ""
 
-#: src/dialogs.c:2019
+#: src/dialogs.c:2075
 msgid ""
 "\n"
 "\n"
@@ -4318,19 +4332,19 @@
 "Please set the audio codec in Tools|Preferences|Encoding\n"
 msgstr ""
 
-#: src/dialogs.c:2024
+#: src/dialogs.c:2080
 msgid ""
 "This layout includes generated frames.\n"
 "It cannot be saved, you must render it to a clip first.\n"
 msgstr ""
 
-#: src/dialogs.c:2029
+#: src/dialogs.c:2085
 msgid ""
 "This layout includes generated or recorded audio.\n"
 "It cannot be saved, you must render it to a clip first.\n"
 msgstr ""
 
-#: src/dialogs.c:2039 src/dialogs.c:2137
+#: src/dialogs.c:2095 src/dialogs.c:2189
 #, c-format
 msgid ""
 "\n"
@@ -4338,83 +4352,83 @@
 "Due to restrictions in the %s format\n"
 msgstr ""
 
-#: src/dialogs.c:2059
+#: src/dialogs.c:2115
 msgid ""
 "LiVES recommends the following settings:\n"
 "\n"
 msgstr ""
 
-#: src/dialogs.c:2065 src/dialogs.c:2174 src/resample.c:850
+#: src/dialogs.c:2121 src/dialogs.c:2225 src/resample.c:839
 msgid ", signed"
 msgstr ""
 
-#: src/dialogs.c:2066 src/dialogs.c:2175 src/resample.c:853
+#: src/dialogs.c:2122 src/dialogs.c:2226 src/resample.c:841
 msgid ", unsigned"
 msgstr ""
 
-#: src/dialogs.c:2070 src/dialogs.c:2179 src/resample.c:858
+#: src/dialogs.c:2126 src/dialogs.c:2230 src/resample.c:846
 msgid ", little-endian"
 msgstr ""
 
-#: src/dialogs.c:2071 src/dialogs.c:2180 src/resample.c:861
+#: src/dialogs.c:2127 src/dialogs.c:2231 src/resample.c:848
 msgid ", big-endian"
 msgstr ""
 
-#: src/dialogs.c:2077
+#: src/dialogs.c:2132
 #, c-format
 msgid "Use an audio rate of %d Hz%s%s\n"
 msgstr ""
 
-#: src/dialogs.c:2085
+#: src/dialogs.c:2140
 #, c-format
 msgid "Set video rate to %.3f frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:2089
+#: src/dialogs.c:2143
 #, c-format
 msgid "Set video rate to %d:%d frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:2094 src/dialogs.c:2209
+#: src/dialogs.c:2148 src/dialogs.c:2258
 #, c-format
 msgid "Set video size to %d x %d pixels\n"
 msgstr ""
 
-#: src/dialogs.c:2102 src/dialogs.c:2208
+#: src/dialogs.c:2156 src/dialogs.c:2257
 msgid ""
 "\n"
 "You may wish to:\n"
 msgstr ""
 
-#: src/dialogs.c:2105 src/dialogs.c:2200
+#: src/dialogs.c:2159 src/dialogs.c:2249
 #, c-format
 msgid "resize video to %d x %d pixels\n"
 msgstr ""
 
-#: src/dialogs.c:2110
+#: src/dialogs.c:2163
 msgid "disable audio, since the target encoder cannot encode audio\n"
 msgstr ""
 
-#: src/dialogs.c:2170
+#: src/dialogs.c:2221
 msgid "LiVES must:\n"
 msgstr ""
 
-#: src/dialogs.c:2185
+#: src/dialogs.c:2235
 #, c-format
 msgid "resample audio to %d Hz%s%s\n"
 msgstr ""
 
-#: src/dialogs.c:2192
+#: src/dialogs.c:2242
 #, c-format
 msgid "resample video to %.3f frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:2196
+#: src/dialogs.c:2245
 #, c-format
 msgid "resample video to %d:%d frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:2215
+#: src/dialogs.c:2263
 msgid ""
 "\n"
 "You will be able to undo these changes afterwards.\n"
@@ -4423,14 +4437,14 @@
 "\n"
 msgstr ""
 
-#: src/dialogs.c:2218
+#: src/dialogs.c:2265
 msgid ""
 "\n"
 "Changes applied to the selection will not be permanent.\n"
 "\n"
 msgstr ""
 
-#: src/dialogs.c:2237
+#: src/dialogs.c:2285
 msgid ""
 "\n"
 "\n"
@@ -4439,7 +4453,7 @@
 "Try recording for just a selection of the file."
 msgstr ""
 
-#: src/dialogs.c:2244
+#: src/dialogs.c:2293
 msgid ""
 "The playback speed (fps), or the audio rate\n"
 " of the clipboard does not match\n"
@@ -4450,7 +4464,7 @@
 "Please press Cancel to abort the insert, or OK to continue."
 msgstr ""
 
-#: src/dialogs.c:2253
+#: src/dialogs.c:2304
 #, c-format
 msgid ""
 "When opening a yuvmpeg stream, you should first create a fifo file in:\n"
@@ -4463,11 +4477,11 @@
 "click Cancel."
 msgstr ""
 
-#: src/dialogs.c:2305
+#: src/dialogs.c:2356
 msgid "Show Keys"
 msgstr ""
 
-#: src/dialogs.c:2306
+#: src/dialogs.c:2358
 msgid ""
 "You can use the following keys during playback to control LiVES:-\n"
 "\n"
@@ -4509,11 +4523,11 @@
 "g                             ping pong loops\n"
 msgstr ""
 
-#: src/dialogs.c:2313
+#: src/dialogs.c:2365
 msgid "Multitrack Keys"
 msgstr ""
 
-#: src/dialogs.c:2314
+#: src/dialogs.c:2367
 msgid ""
 "You can use the following keys to control the multitrack window:-\n"
 "\n"
@@ -4535,18 +4549,18 @@
 "For other keys, see the menus.\n"
 msgstr ""
 
-#: src/dialogs.c:2322
+#: src/dialogs.c:2375
 msgid "Message History"
 msgstr ""
 
-#: src/dialogs.c:2335
+#: src/dialogs.c:2388
 #, c-format
 msgid ""
 "After upgrading/installing, you may need to adjust the <prefix_dir> setting "
 "in your %s file"
 msgstr ""
 
-#: src/dialogs.c:2344
+#: src/dialogs.c:2399
 #, c-format
 msgid ""
 "\n"
@@ -4557,25 +4571,25 @@
 "or change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/dialogs.c:2352
+#: src/dialogs.c:2408
 msgid ""
 "Sorry, unknown audio type.\n"
 "\n"
 " (Filenames must end in .mp3, .ogg, .wav, .mod, .xm or .it)"
 msgstr ""
 
-#: src/dialogs.c:2353
+#: src/dialogs.c:2409
 msgid "failed (unknown type)\n"
 msgstr ""
 
-#: src/dialogs.c:2358
+#: src/dialogs.c:2415
 msgid ""
 "\n"
 "Do you wish to remove the layout files associated with this set ?\n"
 "(They will not be usable without the set).\n"
 msgstr ""
 
-#: src/dialogs.c:2363
+#: src/dialogs.c:2421
 #, c-format
 msgid ""
 "\n"
@@ -4584,7 +4598,7 @@
 "Click Cancel to pick a new name.\n"
 msgstr ""
 
-#: src/dialogs.c:2370
+#: src/dialogs.c:2429
 msgid ""
 "\n"
 "Frames from this clip are used in some multitrack layouts.\n"
@@ -4592,7 +4606,7 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2374
+#: src/dialogs.c:2433
 msgid ""
 "\n"
 "Audio from this clip is used in some multitrack layouts.\n"
@@ -4600,7 +4614,7 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2378
+#: src/dialogs.c:2438
 #, c-format
 msgid ""
 "\n"
@@ -4611,7 +4625,7 @@
 "Otherwise click Cancel to skip loading this file.\n"
 msgstr ""
 
-#: src/dialogs.c:2385
+#: src/dialogs.c:2446
 #, c-format
 msgid ""
 "\n"
@@ -4621,7 +4635,7 @@
 "The clip could not be loaded.\n"
 msgstr ""
 
-#: src/dialogs.c:2392
+#: src/dialogs.c:2455
 msgid ""
 "\n"
 "Dear user, the jack developers decided to remove the -Z option from jackd.\n"
@@ -4629,7 +4643,7 @@
 "Alternately, select a different audio player in Preferences.\n"
 msgstr ""
 
-#: src/dialogs.c:2396
+#: src/dialogs.c:2460
 msgid ""
 "\n"
 "Unable to start up jack. Please ensure that alsa is set up correctly on your "
@@ -4638,13 +4652,13 @@
 "Automatic jack startup will be disabled now.\n"
 msgstr ""
 
-#: src/dialogs.c:2402
+#: src/dialogs.c:2466
 msgid ""
 "\n"
 "Unable to connect to jack server. Please start jack before starting LiVES\n"
 msgstr ""
 
-#: src/dialogs.c:2411
+#: src/dialogs.c:2475
 #, c-format
 msgid ""
 "\n"
@@ -4655,13 +4669,13 @@
 "%s\n"
 msgstr ""
 
-#: src/dialogs.c:2418
+#: src/dialogs.c:2482
 msgid ""
 "\n"
 "Alternately, you can restart LiVES and select another audio player.\n"
 msgstr ""
 
-#: src/dialogs.c:2423
+#: src/dialogs.c:2488
 #, c-format
 msgid ""
 "\n"
@@ -4671,7 +4685,7 @@
 "It is recommended to increase it to at least %d MB"
 msgstr ""
 
-#: src/dialogs.c:2429
+#: src/dialogs.c:2496
 #, c-format
 msgid ""
 "\n"
@@ -4680,7 +4694,7 @@
 "Do you wish to delete them ?\n"
 msgstr ""
 
-#: src/dialogs.c:2436
+#: src/dialogs.c:2504
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for multitrack undo.\n"
@@ -4688,7 +4702,7 @@
 "using Preferences/Multitrack/Undo Memory\n"
 msgstr ""
 
-#: src/dialogs.c:2440
+#: src/dialogs.c:2508
 msgid ""
 "\n"
 "Out of memory for undo.\n"
@@ -4696,63 +4710,63 @@
 "using Preferences/Multitrack/Undo Memory\n"
 msgstr ""
 
-#: src/dialogs.c:2444
+#: src/dialogs.c:2512
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for the multitrack undo buffer.\n"
 msgstr ""
 
-#: src/dialogs.c:2446
+#: src/dialogs.c:2514
 msgid "or enter a smaller value.\n"
 msgstr ""
 
-#: src/dialogs.c:2448
+#: src/dialogs.c:2516
 msgid "Try again from the clip editor, try closing some other applications\n"
 msgstr ""
 
-#: src/dialogs.c:2449
+#: src/dialogs.c:2517
 msgid "Try closing some other applications\n"
 msgstr ""
 
-#: src/dialogs.c:2460
+#: src/dialogs.c:2529
 msgid ""
 "Multitrack is set to 0 audio channels, but this layout has audio.\n"
 "You should adjust the audio settings from the Tools menu.\n"
 msgstr ""
 
-#: src/dialogs.c:2464
+#: src/dialogs.c:2534
 msgid ""
 "The current layout has audio, so audio channels may not be set to zero.\n"
 msgstr ""
 
-#: src/dialogs.c:2468
+#: src/dialogs.c:2539
 msgid ""
 "Multitrack audio preview is only available with the\n"
 "\"jack\" or \"pulse audio\" audio player.\n"
 "You can set this in Tools|Preferences|Playback."
 msgstr ""
 
-#: src/dialogs.c:2472
+#: src/dialogs.c:2545
 msgid ""
 "Errors were detected in the layout (which may be due to transferring from "
 "another system, or from an older version of LiVES).\n"
 "Should I try to repair the disk copy of the layout ?\n"
 msgstr ""
 
-#: src/dialogs.c:2476
+#: src/dialogs.c:2549
 msgid ""
 "LiVES was unable to load the layout.\n"
 "Sorry.\n"
 msgstr ""
 
-#: src/dialogs.c:2482
+#: src/dialogs.c:2555
 msgid ""
 "\n"
 "\n"
 "Audio rate must be greater than 0.\n"
 msgstr ""
 
-#: src/dialogs.c:2486
+#: src/dialogs.c:2559
 msgid ""
 "\n"
 "Event list will be very large\n"
@@ -4760,14 +4774,14 @@
 "Are you sure you wish to view it ?\n"
 msgstr ""
 
-#: src/dialogs.c:2491
+#: src/dialogs.c:2564
 msgid ""
 "\n"
 "\n"
 "You must install 'dvgrab' to use this function.\n"
 msgstr ""
 
-#: src/dialogs.c:2496
+#: src/dialogs.c:2570
 msgid ""
 "\n"
 "\n"
@@ -4776,25 +4790,25 @@
 "You may need to select one of these in Tools/Preferences/Playback.\n"
 msgstr ""
 
-#: src/dialogs.c:2500
+#: src/dialogs.c:2574
 msgid "Video playback plugin failed to initialise palette !\n"
 msgstr ""
 
-#: src/dialogs.c:2504
+#: src/dialogs.c:2579
 msgid "Decoder plugin failed to initialise palette !\n"
 msgstr ""
 
-#: src/dialogs.c:2509
+#: src/dialogs.c:2584
 msgid "Unable to set framerate of video plugin\n"
 msgstr ""
 
-#: src/dialogs.c:2514
+#: src/dialogs.c:2590
 msgid ""
 "After a crash, it is advisable to clean up the disk with\n"
 "File|Clean up disk space\n"
 msgstr ""
 
-#: src/dialogs.c:2526
+#: src/dialogs.c:2604
 #, c-format
 msgid ""
 "Stream frame size is too large for your network buffers.\n"
@@ -4803,33 +4817,33 @@
 "echo %d > /proc/sys/net/core/rmem_max\n"
 msgstr ""
 
-#: src/dialogs.c:2714
+#: src/dialogs.c:2800
 msgid "cancelled.\n"
 msgstr ""
 
-#: src/dialogs.c:2721
+#: src/dialogs.c:2805
 msgid "failed.\n"
 msgstr ""
 
-#: src/dialogs.c:2728
+#: src/dialogs.c:2810
 msgid "done.\n"
 msgstr ""
 
-#: src/dialogs.c:2732
+#: src/dialogs.c:2814
 msgid "error in file. Failed.\n"
 msgstr ""
 
-#: src/dialogs.c:2766 src/dialogs.c:2815 src/dialogs.c:2839
+#: src/dialogs.c:2848 src/dialogs.c:2897 src/dialogs.c:2921
 #, c-format
 msgid "Additional info: %s\n"
 msgstr ""
 
-#: src/dialogs.c:2769
+#: src/dialogs.c:2851
 #, c-format
 msgid "The error value was %d%s\n"
 msgstr ""
 
-#: src/dialogs.c:2772
+#: src/dialogs.c:2854
 #, c-format
 msgid ""
 "\n"
@@ -4839,7 +4853,7 @@
 "%s%s%s"
 msgstr ""
 
-#: src/dialogs.c:2818
+#: src/dialogs.c:2900
 #, c-format
 msgid ""
 "\n"
@@ -4849,7 +4863,7 @@
 "%s"
 msgstr ""
 
-#: src/dialogs.c:2842
+#: src/dialogs.c:2924
 #, c-format
 msgid ""
 "\n"
@@ -4859,7 +4873,7 @@
 "%s"
 msgstr ""
 
-#: src/dialogs.c:2886
+#: src/dialogs.c:2968
 #, c-format
 msgid ""
 "\n"
@@ -4868,7 +4882,7 @@
 "Please check for possible error causes.\n"
 msgstr ""
 
-#: src/dialogs.c:2890
+#: src/dialogs.c:2971
 #, c-format
 msgid ""
 "\n"
@@ -4878,7 +4892,7 @@
 "%s.\n"
 msgstr ""
 
-#: src/dialogs.c:2921
+#: src/dialogs.c:3002
 #, c-format
 msgid ""
 "\n"
@@ -4887,7 +4901,7 @@
 "Please check for possible error causes.\n"
 msgstr ""
 
-#: src/dialogs.c:2925
+#: src/dialogs.c:3005
 #, c-format
 msgid ""
 "\n"
@@ -4897,12 +4911,12 @@
 "%s.\n"
 msgstr ""
 
-#: src/dialogs.c:2993
+#: src/dialogs.c:3073
 #, c-format
 msgid "Value for \"%s\" could not be read."
 msgstr ""
 
-#: src/dialogs.c:3011
+#: src/dialogs.c:3091
 #, c-format
 msgid ""
 "\n"
@@ -4911,7 +4925,7 @@
 "Please check your system for errors.\n"
 msgstr ""
 
-#: src/dialogs.c:3020
+#: src/dialogs.c:3100
 #, c-format
 msgid ""
 "\n"
@@ -4920,7 +4934,7 @@
 "Please check the file permissions and try again."
 msgstr ""
 
-#: src/dialogs.c:3027
+#: src/dialogs.c:3109
 #, c-format
 msgid ""
 "\n"
@@ -4929,7 +4943,7 @@
 "Please check the directory permissions and try again."
 msgstr ""
 
-#: src/dialogs.c:3034
+#: src/dialogs.c:3116
 #, c-format
 msgid ""
 "\n"
@@ -4937,14 +4951,14 @@
 "%s\n"
 msgstr ""
 
-#: src/dialogs.c:3041
+#: src/dialogs.c:3123
 msgid ""
 "\n"
 "Abort and exit immediately from LiVES\n"
 "Are you sure ?\n"
 msgstr ""
 
-#: src/dialogs.c:3047
+#: src/dialogs.c:3129
 #, c-format
 msgid ""
 "\n"
@@ -4952,13 +4966,13 @@
 "Please select another encoder from the list.\n"
 msgstr ""
 
-#: src/dialogs.c:3056
+#: src/dialogs.c:3139
 msgid ""
 "\n"
 "This card is already in use and cannot be opened multiple times.\n"
 msgstr ""
 
-#: src/dialogs.c:3061
+#: src/dialogs.c:3145
 #, c-format
 msgid ""
 "\n"
@@ -4968,27 +4982,27 @@
 "- Check if the device actually exists.\n"
 msgstr ""
 
-#: src/dialogs.c:3068
+#: src/dialogs.c:3153
 msgid ""
 "\n"
 "This file already has subtitles loaded.\n"
 "Do you wish to overwrite the existing subtitles ?\n"
 msgstr ""
 
-#: src/dialogs.c:3072
+#: src/dialogs.c:3157
 msgid ""
 "\n"
 "LiVES currently only supports subtitles of type .srt and .sub.\n"
 msgstr ""
 
-#: src/dialogs.c:3076
+#: src/dialogs.c:3161
 msgid ""
 "\n"
 "Erase all subtitles from this clip.\n"
 "Are you sure ?\n"
 msgstr ""
 
-#: src/dialogs.c:3082
+#: src/dialogs.c:3168
 #, c-format
 msgid ""
 "\n"
@@ -4997,14 +5011,14 @@
 "or OK to continue and save as type \"%s\"\n"
 msgstr ""
 
-#: src/dialogs.c:3089
+#: src/dialogs.c:3176
 msgid ""
 "\n"
 "Do you wish to move the current clip sets to the new directory ?\n"
 "(If unsure, click Yes)\n"
 msgstr ""
 
-#: src/dialogs.c:3093
+#: src/dialogs.c:3181
 #, c-format
 msgid ""
 "\n"
@@ -5015,19 +5029,19 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:3099
+#: src/dialogs.c:3188
 msgid ""
 "\n"
 "No video input devices could be found.\n"
 msgstr ""
 
-#: src/dialogs.c:3103
+#: src/dialogs.c:3192
 msgid ""
 "\n"
 "All video input devices are already in use.\n"
 msgstr ""
 
-#: src/dialogs.c:3107
+#: src/dialogs.c:3196
 msgid ""
 "\n"
 "\n"
@@ -5035,15 +5049,14 @@
 "DO NOT SHUT DOWN OR CLOSE LIVES !\n"
 msgstr ""
 
-#: src/dialogs.c:3127
+#: src/dialogs.c:3203
 #, c-format
 msgid ""
 "No clips were recovered for set (%s).\n"
 "Please check the spelling of the set name and try again.\n"
 msgstr ""
 
-#. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:3136
+#: src/dialogs.c:3214
 #, c-format
 msgid ""
 "\n"
@@ -5055,7 +5068,7 @@
 msgstr ""
 
 #. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:3144
+#: src/dialogs.c:3222
 #, c-format
 msgid ""
 "\n"
@@ -5064,34 +5077,34 @@
 "\n"
 msgstr ""
 
-#: src/dialogs.c:3150
+#: src/dialogs.c:3228
 msgid ""
 "\n"
 "You must have autolives.pl installed and in your path to use this toy.\n"
 "Consult your package distributor.\n"
 msgstr ""
 
-#: src/dialogs.c:3154
+#: src/dialogs.c:3232
 msgid ""
 "\n"
 "You must have a minimum of one clip loaded to use this toy.\n"
 msgstr ""
 
-#: src/dialogs.c:3158
+#: src/dialogs.c:3236
 msgid ""
 "\n"
 "LiVES lost its connection to jack and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:3162
+#: src/dialogs.c:3240
 msgid ""
 "\n"
 "LiVES lost its connection to pulseaudio and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:3175
+#: src/dialogs.c:3254
 #, c-format
 msgid ""
 "\n"
@@ -5100,543 +5113,543 @@
 "Do you wish to allow this (for this session only) ?\n"
 msgstr ""
 
-#: src/effects.c:60
+#: src/effects.c:61
 msgid "generator"
 msgstr ""
 
-#: src/effects.c:61
+#: src/effects.c:62
 msgid "Generators"
 msgstr ""
 
-#: src/effects.c:63
+#: src/effects.c:64
 msgid "audio generator"
 msgstr ""
 
-#: src/effects.c:64
+#: src/effects.c:65
 msgid "Audio Generators"
 msgstr ""
 
-#: src/effects.c:66
+#: src/effects.c:67
 msgid "audio/video generator"
 msgstr ""
 
-#: src/effects.c:67
+#: src/effects.c:68
 msgid "Audio/Video Generators"
 msgstr ""
 
-#: src/effects.c:69
+#: src/effects.c:70
 msgid "data generator"
 msgstr ""
 
-#: src/effects.c:70
+#: src/effects.c:71
 msgid "Data Generators"
 msgstr ""
 
-#: src/effects.c:72
+#: src/effects.c:73
 msgid "data visualiser"
 msgstr ""
 
-#: src/effects.c:73
+#: src/effects.c:74
 msgid "Data Visualisers"
 msgstr ""
 
-#: src/effects.c:75
+#: src/effects.c:76
 msgid "data processor"
 msgstr ""
 
-#: src/effects.c:76
+#: src/effects.c:77
 msgid "Data Processors"
 msgstr ""
 
-#: src/effects.c:78
+#: src/effects.c:79
 msgid "data source"
 msgstr ""
 
-#: src/effects.c:79
+#: src/effects.c:80
 msgid "Data Sources"
 msgstr ""
 
-#: src/effects.c:81
+#: src/effects.c:82
 msgid "transition"
 msgstr ""
 
-#: src/effects.c:82
+#: src/effects.c:83
 msgid "Transitions"
 msgstr ""
 
-#: src/effects.c:84
+#: src/effects.c:85
 msgid "effect"
 msgstr ""
 
-#: src/effects.c:87 src/rfx-builder.c:187
+#: src/effects.c:88 src/rfx-builder.c:187
 msgid "utility"
 msgstr ""
 
-#: src/effects.c:88
+#: src/effects.c:89
 msgid "Utilities"
 msgstr ""
 
-#: src/effects.c:90
+#: src/effects.c:91
 msgid "compositor"
 msgstr ""
 
-#: src/effects.c:91
+#: src/effects.c:92
 msgid "Compositors"
 msgstr ""
 
-#: src/effects.c:93
+#: src/effects.c:94
 msgid "tap"
 msgstr ""
 
-#: src/effects.c:94
+#: src/effects.c:95
 msgid "Taps"
 msgstr ""
 
-#: src/effects.c:96
+#: src/effects.c:97
 msgid "splitter"
 msgstr ""
 
-#: src/effects.c:97
+#: src/effects.c:98
 msgid "Splitters"
 msgstr ""
 
-#: src/effects.c:99
+#: src/effects.c:100
 msgid "converter"
 msgstr ""
 
-#: src/effects.c:100
+#: src/effects.c:101
 msgid "Converters"
 msgstr ""
 
-#: src/effects.c:102
+#: src/effects.c:103
 msgid "analyser"
 msgstr ""
 
-#: src/effects.c:103
+#: src/effects.c:104
 msgid "Analysers"
 msgstr ""
 
-#: src/effects.c:108
+#: src/effects.c:109
 msgid "audio/video"
 msgstr ""
 
-#: src/effects.c:109
+#: src/effects.c:110
 msgid "Audio/Video Transitions"
 msgstr ""
 
-#: src/effects.c:111
+#: src/effects.c:112
 msgid "video only"
 msgstr ""
 
-#: src/effects.c:112
+#: src/effects.c:113
 msgid "Video only Transitions"
 msgstr ""
 
-#: src/effects.c:114 src/multitrack.c:10740
+#: src/effects.c:115 src/multitrack.c:10962
 msgid "audio only"
 msgstr ""
 
-#: src/effects.c:115
+#: src/effects.c:116
 msgid "Audio only Transitions"
 msgstr ""
 
-#: src/effects.c:117 src/effects.c:120 src/multitrack.c:18757
+#: src/effects.c:118 src/effects.c:121 src/multitrack.c:19097
 msgid "audio"
 msgstr ""
 
-#: src/effects.c:118
+#: src/effects.c:119
 msgid "Audio Mixers"
 msgstr ""
 
-#: src/effects.c:121
+#: src/effects.c:122
 msgid "Audio Effects"
 msgstr ""
 
-#: src/effects.c:123
+#: src/effects.c:124
 msgid "video"
 msgstr ""
 
-#: src/effects.c:124
+#: src/effects.c:125
 msgid "Video Effects"
 msgstr ""
 
-#: src/effects.c:126
+#: src/effects.c:127
 msgid "audio volume controller"
 msgstr ""
 
-#: src/effects.c:127
+#: src/effects.c:128
 msgid "Audio Volume Controllers"
 msgstr ""
 
-#: src/effects.c:129
+#: src/effects.c:130
 msgid "video analyser"
 msgstr ""
 
-#: src/effects.c:130
+#: src/effects.c:131
 msgid "Video analysers"
 msgstr ""
 
-#: src/effects.c:132
+#: src/effects.c:133
 msgid "audio analyser"
 msgstr ""
 
-#: src/effects.c:133
+#: src/effects.c:134
 msgid "Audio Analysers"
 msgstr ""
 
-#: src/effects.c:137 src/plugins.c:2559 src/plugins.c:2573
+#: src/effects.c:138 src/plugins.c:2507 src/plugins.c:2521
 msgid "unknown"
 msgstr ""
 
-#: src/effects.c:238
+#: src/effects.c:235
 #, c-format
 msgid "%s all frames..."
 msgstr ""
 
-#: src/effects.c:243
+#: src/effects.c:239
 #, c-format
 msgid "%s clipboard into frames %d to %d..."
 msgstr ""
 
-#: src/effects.c:250
+#: src/effects.c:245
 #, c-format
 msgid "%s to clipboard..."
 msgstr ""
 
-#: src/effects.c:254
+#: src/effects.c:248
 #, c-format
 msgid "%s to new clip..."
 msgstr ""
 
-#: src/effects.c:259
+#: src/effects.c:252
 #, c-format
 msgid "%s frames %d to %d..."
 msgstr ""
 
-#: src/effects.c:290
+#: src/effects.c:283
 #, c-format
 msgid "%s clipboard with selection"
 msgstr ""
 
-#: src/effects.c:295
+#: src/effects.c:287
 #, c-format
 msgid "%s to clipboard"
 msgstr ""
 
-#: src/effects.c:299
+#: src/effects.c:290
 #, c-format
 msgid "%s to new clip"
 msgstr ""
 
-#: src/effects.c:304
+#: src/effects.c:294
 #, c-format
 msgid "%s frames %d to %d"
 msgstr ""
 
-#: src/effects.c:456 src/effects.c:523
+#: src/effects.c:443 src/effects.c:507
 msgid ""
 "\n"
 "No frames were generated.\n"
 msgstr ""
 
-#: src/effects-weed.c:431
+#: src/effects-weed.c:452
 msgid "integer"
 msgstr ""
 
-#: src/effects-weed.c:432
+#: src/effects-weed.c:454
 msgid "int64"
 msgstr ""
 
-#: src/effects-weed.c:433
+#: src/effects-weed.c:456
 msgid "boolean"
 msgstr ""
 
-#: src/effects-weed.c:434
+#: src/effects-weed.c:458
 msgid "double"
 msgstr ""
 
-#: src/effects-weed.c:435
+#: src/effects-weed.c:460
 msgid "string"
 msgstr ""
 
-#: src/effects-weed.c:436
+#: src/effects-weed.c:462
 msgid "pointer"
 msgstr ""
 
-#: src/effects-weed.c:4591
+#: src/effects-weed.c:4581
 #, c-format
 msgid "Error: plugin %s has no weed_setup() function.\n"
 msgstr ""
 
-#: src/effects-weed.c:4606
+#: src/effects-weed.c:4595
 #, c-format
 msgid "No usable filters found in plugin %s\n"
 msgstr ""
 
-#: src/effects-weed.c:4680
+#: src/effects-weed.c:4668
 #, c-format
 msgid "Found duplicate plugin %s"
 msgstr ""
 
-#: src/effects-weed.c:4734
+#: src/effects-weed.c:4723
 #, c-format
 msgid ""
 "Info: Unable to load plugin %s\n"
 "Error was: %s\n"
 msgstr ""
 
-#: src/effects-weed.c:4737 src/effects-weed.c:5858
+#: src/effects-weed.c:4726 src/effects-weed.c:5847
 msgid "Some plugin directories"
 msgstr ""
 
 #. TRANSLATORS: example " - LADSPA plugins -"
-#: src/effects-weed.c:4812 src/rte_window.c:2105
+#: src/effects-weed.c:4801 src/rte_window.c:2107
 #, c-format
 msgid " - %s plugins -"
 msgstr ""
 
-#: src/effects-weed.c:5012
+#: src/effects-weed.c:4998
 #, c-format
 msgid "Successfully loaded %d Weed filters\n"
 msgstr ""
 
-#: src/effects-weed.c:5177
+#: src/effects-weed.c:5162
 #, c-format
 msgid "Invalid compound effect %s - has conflicting target_fps\n"
 msgstr ""
 
-#: src/effects-weed.c:5197
+#: src/effects-weed.c:5182
 #, c-format
 msgid "Invalid compound effect %s - has multiple transition parameters\n"
 msgstr ""
 
-#: src/effects-weed.c:5211
+#: src/effects-weed.c:5196
 #, c-format
 msgid "Invalid compound effect %s - has multiple master volume parameters\n"
 msgstr ""
 
-#: src/effects-weed.c:5346
+#: src/effects-weed.c:5329
 #, c-format
 msgid "Invalid compound effect %s - must have >1 sub filters\n"
 msgstr ""
 
-#: src/effects-weed.c:5366
+#: src/effects-weed.c:5349
 #, c-format
 msgid "Invalid effect %s found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5381
+#: src/effects-weed.c:5364
 #, c-format
 msgid "Invalid default found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5392
+#: src/effects-weed.c:5375
 #, c-format
 msgid "Invalid filter %d for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5406
+#: src/effects-weed.c:5389
 #, c-format
 msgid "Invalid param %d for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5433
+#: src/effects-weed.c:5416
 #, c-format
 msgid ""
 "Invalid number of values for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5467
+#: src/effects-weed.c:5450
 #, c-format
 msgid ""
 "Invalid non-boolean value for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5500
+#: src/effects-weed.c:5483
 #, c-format
 msgid "Invalid param link found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5511
+#: src/effects-weed.c:5494
 #, c-format
 msgid ""
 "Invalid out filter %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5529
+#: src/effects-weed.c:5513
 #, c-format
 msgid ""
 "Invalid out param %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5541
+#: src/effects-weed.c:5526
 #, c-format
 msgid ""
 "Invalid non-boolean value for autoscale found in compound effect %s, line "
 "%d\n"
 msgstr ""
 
-#: src/effects-weed.c:5552
+#: src/effects-weed.c:5537
 #, c-format
 msgid ""
 "Invalid in filter %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5566
+#: src/effects-weed.c:5552
 #, c-format
 msgid ""
 "Invalid in param %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5594
+#: src/effects-weed.c:5581
 #, c-format
 msgid "Invalid channel link found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5605
+#: src/effects-weed.c:5592
 #, c-format
 msgid ""
 "Invalid out filter %d for link channels found in compound effect %s, line "
 "%d\n"
 msgstr ""
 
-#: src/effects-weed.c:5623
+#: src/effects-weed.c:5611
 #, c-format
 msgid ""
 "Invalid out channel %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5633
+#: src/effects-weed.c:5622
 #, c-format
 msgid ""
 "Invalid in filter %d for link channels found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5651
+#: src/effects-weed.c:5641
 #, c-format
 msgid ""
 "Invalid in channel %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5687
+#: src/effects-weed.c:5678
 #, c-format
 msgid "Compound:%s"
 msgstr ""
 
-#: src/effects-weed.c:5758
+#: src/effects-weed.c:5749
 #, c-format
 msgid "Successfully loaded %d compound filters\n"
 msgstr ""
 
-#: src/effects-weed.c:6591
+#: src/effects-weed.c:6570
 #, c-format
 msgid "Effect %s cannot be used with this audio player.\n"
 msgstr ""
 
-#: src/effects-weed.c:6737
+#: src/effects-weed.c:6718
 #, c-format
 msgid "Failed to start instance %s, error code %d\n"
 msgstr ""
 
-#: src/effects-weed.c:6814
+#: src/effects-weed.c:6797
 #, c-format
 msgid "Unable to start generator %s\n"
 msgstr ""
 
-#: src/effects-weed.c:7621
+#: src/effects-weed.c:7607
 #, c-format
 msgid "Failed to start generator %s\n"
 msgstr ""
 
-#: src/effects-weed.c:7718
+#: src/effects-weed.c:7701
 #, c-format
 msgid "Failed to start generator %s, error %d\n"
 msgstr ""
 
-#: src/effects-weed.c:9012
+#: src/effects-weed.c:8993
 #, c-format
 msgid "%s [unstable] (%s)"
 msgstr ""
 
-#: src/effects-data.c:3278
+#: src/effects-data.c:3234
 #, c-format
 msgid "ACTIVATE (%s)"
 msgstr ""
 
-#: src/effects-data.c:3548
+#: src/effects-data.c:3501
 msgid "ACTIVATE"
 msgstr ""
 
-#: src/effects-data.c:3876
+#: src/effects-data.c:3829
 #, c-format
 msgid "Key slot %d"
 msgstr ""
 
-#: src/effects-data.c:3998
+#: src/effects-data.c:3951
 msgid "Autoscale"
 msgstr ""
 
-#: src/effects-data.c:4089
+#: src/effects-data.c:4042
 msgid "Add another connection for this output parameter"
 msgstr ""
 
-#: src/effects-data.c:4102 src/effects-data.c:4151
+#: src/effects-data.c:4055 src/effects-data.c:4104
 msgid "Delete this connection"
 msgstr ""
 
-#: src/effects-data.c:4138
+#: src/effects-data.c:4091
 msgid "Add another connection for this output channel"
 msgstr ""
 
-#: src/effects-data.c:4223
+#: src/effects-data.c:4176
 msgid "Connected to -->"
 msgstr ""
 
-#: src/effects-data.c:4243
+#: src/effects-data.c:4196
 #, c-format
 msgid "%s - Alpha Channel Connections"
 msgstr ""
 
-#: src/effects-data.c:4316
+#: src/effects-data.c:4269
 #, c-format
 msgid "%s - Parameter Data Connections"
 msgstr ""
 
-#: src/effects-data.c:4336
+#: src/effects-data.c:4289
 msgid "Autoscale All"
 msgstr ""
 
-#: src/effects-data.c:4361 src/effects-data.c:4890
+#: src/effects-data.c:4314 src/effects-data.c:4841
 msgid "ACTIVATED"
 msgstr ""
 
-#: src/effects-data.c:4774
+#: src/effects-data.c:4726
 msgid "LiVES: - Parameter and Alpha Channel Connections"
 msgstr ""
 
-#: src/effects-data.c:4785
+#: src/effects-data.c:4736
 msgid "Auto Connect Channels"
 msgstr ""
 
-#: src/effects-data.c:4797
+#: src/effects-data.c:4748
 msgid "Auto Connect Parameters"
 msgstr ""
 
-#: src/effects-data.c:4807
+#: src/effects-data.c:4758
 msgid "Disconnect All"
 msgstr ""
 
-#: src/effects-data.c:4875
+#: src/effects-data.c:4826
 #, c-format
 msgid "Input channel is already connected from (%d,%d) %s"
 msgstr ""
 
-#: src/effects-data.c:4891
+#: src/effects-data.c:4842
 #, c-format
 msgid "Input parameter is already connected from (%d,%d) %s"
 msgstr ""
 
-#: src/effects-data.c:4899
+#: src/effects-data.c:4851
 msgid "Input and output parameters are not compatible"
 msgstr ""
 
@@ -5648,43 +5661,43 @@
 msgid "_Reset Values"
 msgstr ""
 
-#: src/framedraw.c:267
+#: src/framedraw.c:265
 msgid "_Frame"
 msgstr ""
 
-#: src/paramspecial.c:266
+#: src/paramspecial.c:259
 msgid "Maintain _Aspect Ratio"
 msgstr ""
 
-#: src/paramspecial.c:267
+#: src/paramspecial.c:260
 msgid "Maintain aspect ratio of original frame"
 msgstr ""
 
-#: src/paramspecial.c:341
+#: src/paramspecial.c:335
 msgid "Display Password"
 msgstr ""
 
-#: src/paramwindow.c:450
+#: src/paramwindow.c:447
 msgid "Transition _In"
 msgstr ""
 
-#: src/paramwindow.c:452
+#: src/paramwindow.c:449
 msgid "Click to set the transition parameter to show only the front frame"
 msgstr ""
 
-#: src/paramwindow.c:474
+#: src/paramwindow.c:472
 msgid "Crossfade audio"
 msgstr ""
 
-#: src/paramwindow.c:475
+#: src/paramwindow.c:473
 msgid "Check the box to make audio transition with the video"
 msgstr ""
 
-#: src/paramwindow.c:493
+#: src/paramwindow.c:492
 msgid "Transition _Out"
 msgstr ""
 
-#: src/paramwindow.c:495
+#: src/paramwindow.c:494
 msgid "Click to set the transition parameter to show only the rear frame"
 msgstr ""
 
@@ -5697,23 +5710,23 @@
 msgid "%s : size"
 msgstr ""
 
-#: src/paramwindow.c:598
+#: src/paramwindow.c:597
 msgid "New size (pixels)"
 msgstr ""
 
-#: src/paramwindow.c:617 src/plugins.c:997
+#: src/paramwindow.c:616 src/plugins.c:973
 msgid "_Width"
 msgstr ""
 
-#: src/paramwindow.c:636 src/plugins.c:1003
+#: src/paramwindow.c:635 src/plugins.c:979
 msgid "_Height"
 msgstr ""
 
-#: src/paramwindow.c:684
+#: src/paramwindow.c:683
 msgid "Generate to _Clipboard"
 msgstr ""
 
-#: src/paramwindow.c:686
+#: src/paramwindow.c:685
 msgid "Generate frames to the clipboard"
 msgstr ""
 
@@ -5725,7 +5738,7 @@
 msgid "Generate frames to a new clip"
 msgstr ""
 
-#: src/paramwindow.c:822
+#: src/paramwindow.c:824
 #, c-format
 msgid ""
 "\n"
@@ -5733,71 +5746,71 @@
 "\n"
 msgstr ""
 
-#: src/paramwindow.c:920 src/paramwindow.c:930
+#: src/paramwindow.c:934 src/paramwindow.c:942
 msgid "Set as default"
 msgstr ""
 
-#: src/paramwindow.c:922 src/paramwindow.c:938
+#: src/paramwindow.c:936 src/paramwindow.c:950
 msgid "Reset"
 msgstr ""
 
-#: src/paramwindow.c:932 src/rte_window.c:2401 src/omc-learn.c:1357
+#: src/paramwindow.c:944 src/rte_window.c:2394 src/omc-learn.c:1347
 msgid "Close _window"
 msgstr ""
 
-#: src/paramwindow.c:1337
+#: src/paramwindow.c:1340
 msgid "No parameters"
 msgstr ""
 
-#: src/paramwindow.c:1419
+#: src/paramwindow.c:1424
 msgid "Invalid parameter"
 msgstr ""
 
-#: src/paramwindow.c:1611
+#: src/paramwindow.c:1610
 msgid "LiVES: - Select Colour"
 msgstr ""
 
-#: src/paramwindow.c:1616
+#: src/paramwindow.c:1615
 msgid "Click to set the colour"
 msgstr ""
 
-#: src/paramwindow.c:1628
+#: src/paramwindow.c:1626
 msgid "_Red"
 msgstr ""
 
-#: src/paramwindow.c:1629
+#: src/paramwindow.c:1627
 msgid "The red value (0 - 255)"
 msgstr ""
 
-#: src/paramwindow.c:1632
+#: src/paramwindow.c:1630
 msgid "_Green"
 msgstr ""
 
-#: src/paramwindow.c:1633
+#: src/paramwindow.c:1631
 msgid "The green value (0 - 255)"
 msgstr ""
 
-#: src/paramwindow.c:1636
+#: src/paramwindow.c:1634
 msgid "_Blue"
 msgstr ""
 
-#: src/paramwindow.c:1637
+#: src/paramwindow.c:1635
 msgid "The blue value (0 - 255)"
 msgstr ""
 
-#: src/plugins.c:85
+#: src/plugins.c:86
 #, c-format
 msgid ""
 "\n"
 "Plugin error: %s failed with code %d"
 msgstr ""
 
-#: src/plugins.c:87
+#: src/plugins.c:88
 #, c-format
 msgid " : message was %s\n"
 msgstr ""
 
-#: src/plugins.c:387
+#: src/plugins.c:375
 #, c-format
 msgid ""
 "\n"
@@ -5807,17 +5820,17 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/plugins.c:397
+#: src/plugins.c:385
 #, c-format
 msgid "Updating video playback plugin defaults in %s\n"
 msgstr ""
 
-#: src/plugins.c:452
+#: src/plugins.c:444
 #, c-format
 msgid "Loading video playback plugin defaults from %s..."
 msgstr ""
 
-#: src/plugins.c:515
+#: src/plugins.c:505
 #, c-format
 msgid ""
 "\n"
@@ -5827,32 +5840,32 @@
 "\n"
 msgstr ""
 
-#: src/plugins.c:855
+#: src/plugins.c:836
 #, c-format
 msgid "Saving playback plugin defaults to %s..."
 msgstr ""
 
-#: src/plugins.c:962
+#: src/plugins.c:939
 msgid "_FPS"
 msgstr ""
 
-#: src/plugins.c:963
+#: src/plugins.c:940
 msgid "Fixed framerate for plugin.\n"
 msgstr ""
 
-#: src/plugins.c:1032
+#: src/plugins.c:1008
 msgid "_Colourspace"
 msgstr ""
 
-#: src/plugins.c:1033
+#: src/plugins.c:1009
 msgid "Colourspace input to the plugin.\n"
 msgstr ""
 
-#: src/plugins.c:1089
+#: src/plugins.c:1065
 msgid "Save settings to an alternate file.\n"
 msgstr ""
 
-#: src/plugins.c:1206
+#: src/plugins.c:1182
 #, c-format
 msgid ""
 "\n"
@@ -5861,7 +5874,7 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/plugins.c:1252
+#: src/plugins.c:1228
 #, c-format
 msgid ""
 "\n"
@@ -5871,38 +5884,38 @@
 "Unable to use it.\n"
 msgstr ""
 
-#: src/plugins.c:1265
+#: src/plugins.c:1241
 #, c-format
 msgid ""
 "Video playback plugin failed to initialise.\n"
 "Error was: %s\n"
 msgstr ""
 
-#: src/plugins.c:1461
+#: src/plugins.c:1428
 msgid ""
 "\n"
 "Warning ! Video playback plugin will not send key presses. Keyboard may be "
 "disabled during plugin use !\n"
 msgstr ""
 
-#: src/plugins.c:1465
+#: src/plugins.c:1433
 #, c-format
 msgid ""
 "*** Using %s plugin for fs playback, agreed to use palette type %d ( %s ). "
 "***\n"
 msgstr ""
 
-#: src/plugins.c:1571
+#: src/plugins.c:1537
 #, c-format
 msgid "Audio stream unable to use preferred format '%s'\n"
 msgstr ""
 
-#: src/plugins.c:1579
+#: src/plugins.c:1543
 #, c-format
 msgid "Using format '%s' instead.\n"
 msgstr ""
 
-#: src/plugins.c:1616
+#: src/plugins.c:1579
 #, c-format
 msgid ""
 "LiVES was unable to find its encoder plugins. Please make sure you have the "
@@ -5911,7 +5924,7 @@
 "or change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/plugins.c:1624
+#: src/plugins.c:1589
 #, c-format
 msgid ""
 "LiVES did not receive a response from the encoder plugin called '%s'.\n"
@@ -5920,11 +5933,11 @@
 "or switch to another plugin using Tools|Preferences|Encoding\n"
 msgstr ""
 
-#: src/plugins.c:2032
+#: src/plugins.c:1987
 msgid "Unable to resize, please install imageMagick\n"
 msgstr ""
 
-#: src/plugins.c:2231
+#: src/plugins.c:2183
 #, c-format
 msgid ""
 "\n"
@@ -5932,12 +5945,12 @@
 "No decoders found in %s !\n"
 msgstr ""
 
-#: src/plugins.c:2415
+#: src/plugins.c:2369
 #, c-format
 msgid " using %s"
 msgstr ""
 
-#: src/plugins.c:2499
+#: src/plugins.c:2451
 #, c-format
 msgid ""
 "\n"
@@ -5946,7 +5959,7 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/plugins.c:2522
+#: src/plugins.c:2472
 #, c-format
 msgid ""
 "\n"
@@ -5956,24 +5969,24 @@
 "Unable to use it.\n"
 msgstr ""
 
-#: src/plugins.c:2564
+#: src/plugins.c:2512
 msgid "/unknown"
 msgstr ""
 
-#: src/plugins.c:2651
+#: src/plugins.c:2598
 msgid "LiVES: - Decoder Plugins"
 msgstr ""
 
-#: src/plugins.c:2669
+#: src/plugins.c:2616
 msgid "Enabled Video Decoders (uncheck to disable)"
 msgstr ""
 
-#: src/plugins.c:2726
+#: src/plugins.c:2672
 #, c-format
 msgid "Failed to load %s, transitions may not resize.\n"
 msgstr ""
 
-#: src/plugins.c:3854
+#: src/plugins.c:3797
 #, c-format
 msgid "%s advanced settings"
 msgstr ""
@@ -5982,15 +5995,15 @@
 msgid "LiVES: - New Test RFX"
 msgstr ""
 
-#: src/rfx-builder.c:136
+#: src/rfx-builder.c:135
 msgid "LiVES: - Edit Test RFX"
 msgstr ""
 
-#: src/rfx-builder.c:166
+#: src/rfx-builder.c:165
 msgid "Type:"
 msgstr ""
 
-#: src/rfx-builder.c:184
+#: src/rfx-builder.c:183
 msgid "tool"
 msgstr ""
 
@@ -6002,130 +6015,130 @@
 msgid "The name of the plugin. No spaces allowed."
 msgstr ""
 
-#: src/rfx-builder.c:201
+#: src/rfx-builder.c:202
 msgid "Version:       "
 msgstr ""
 
-#: src/rfx-builder.c:203
+#: src/rfx-builder.c:204
 msgid "The script version."
 msgstr ""
 
-#: src/rfx-builder.c:210
+#: src/rfx-builder.c:212
 msgid "    Author:       "
 msgstr ""
 
-#: src/rfx-builder.c:211
+#: src/rfx-builder.c:213
 msgid "The script author."
 msgstr ""
 
-#: src/rfx-builder.c:217
+#: src/rfx-builder.c:220
 msgid "    URL (optional):       "
 msgstr ""
 
-#: src/rfx-builder.c:218
+#: src/rfx-builder.c:221
 msgid "URL for the plugin maintainer."
 msgstr ""
 
-#: src/rfx-builder.c:226
+#: src/rfx-builder.c:230
 msgid "Menu text:    "
 msgstr ""
 
-#: src/rfx-builder.c:227
+#: src/rfx-builder.c:231
 msgid "The text to show in the menu."
 msgstr ""
 
-#: src/rfx-builder.c:239
+#: src/rfx-builder.c:244
 msgid "Action description:        "
 msgstr ""
 
-#: src/rfx-builder.c:241
+#: src/rfx-builder.c:246
 msgid "Describe what the plugin is doing. E.g. \"Edge detecting\""
 msgstr ""
 
-#: src/rfx-builder.c:246
+#: src/rfx-builder.c:251
 msgid "Minimum frames:"
 msgstr ""
 
-#: src/rfx-builder.c:249
+#: src/rfx-builder.c:254
 msgid ""
 "Minimum number of frames this effect/tool can be applied to. Normally 1."
 msgstr ""
 
-#: src/rfx-builder.c:260
+#: src/rfx-builder.c:265
 msgid "_Requirements..."
 msgstr ""
 
-#: src/rfx-builder.c:263
+#: src/rfx-builder.c:268
 msgid "Enter any binaries required by the plugin."
 msgstr ""
 
-#: src/rfx-builder.c:267
+#: src/rfx-builder.c:272
 msgid "_Properties..."
 msgstr ""
 
-#: src/rfx-builder.c:270
+#: src/rfx-builder.c:275
 msgid "Set properties for the plugin. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:274
+#: src/rfx-builder.c:279
 msgid "_Parameters..."
 msgstr ""
 
-#: src/rfx-builder.c:277
+#: src/rfx-builder.c:282
 msgid "Set up parameters used in pre/loop/post/trigger code. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:281
+#: src/rfx-builder.c:286
 msgid "Parameter _Window Hints..."
 msgstr ""
 
-#: src/rfx-builder.c:284
+#: src/rfx-builder.c:289
 msgid "Set hints about how to lay out the parameter window. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:290
+#: src/rfx-builder.c:295
 msgid "_Language code:"
 msgstr ""
 
-#: src/rfx-builder.c:291
+#: src/rfx-builder.c:296
 msgid "Language for pre/loop/post/triggers. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:300
+#: src/rfx-builder.c:305
 msgid "_Pre loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:303
+#: src/rfx-builder.c:308
 msgid "Code to be executed before the loop. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:307
+#: src/rfx-builder.c:312
 msgid "_Loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:310
+#: src/rfx-builder.c:315
 msgid "Loop code to be applied to each frame."
 msgstr ""
 
-#: src/rfx-builder.c:314
+#: src/rfx-builder.c:319
 msgid "_Post loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:317
+#: src/rfx-builder.c:322
 msgid "Code to be executed after the loop. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:321
+#: src/rfx-builder.c:326
 msgid "_Trigger code..."
 msgstr ""
 
-#: src/rfx-builder.c:324
+#: src/rfx-builder.c:329
 msgid ""
 "Set trigger code for when the parameter window is shown, or when a parameter "
 "is changed. Optional (except for Utilities)."
 msgstr ""
 
-#: src/rfx-builder.c:421
+#: src/rfx-builder.c:426
 #, c-format
 msgid ""
 "\n"
@@ -6135,55 +6148,55 @@
 "%s\n"
 msgstr ""
 
-#: src/rfx-builder.c:544
+#: src/rfx-builder.c:541
 msgid "LiVES: - RFX Requirements"
 msgstr ""
 
-#: src/rfx-builder.c:548
+#: src/rfx-builder.c:544
 msgid "LiVES: - RFX Parameters"
 msgstr ""
 
-#: src/rfx-builder.c:552
+#: src/rfx-builder.c:547
 msgid "LiVES: - RFX Parameter Window Hints"
 msgstr ""
 
-#: src/rfx-builder.c:556
+#: src/rfx-builder.c:550
 msgid "LiVES: - RFX Triggers"
 msgstr ""
 
-#: src/rfx-builder.c:622
+#: src/rfx-builder.c:613
 msgid "_New Entry"
 msgstr ""
 
-#: src/rfx-builder.c:625
+#: src/rfx-builder.c:616
 msgid "_Edit Entry"
 msgstr ""
 
-#: src/rfx-builder.c:628
+#: src/rfx-builder.c:619
 msgid "_Remove Entry"
 msgstr ""
 
-#: src/rfx-builder.c:632
+#: src/rfx-builder.c:623
 msgid "Move _Up"
 msgstr ""
 
-#: src/rfx-builder.c:635
+#: src/rfx-builder.c:626
 msgid "Move _Down"
 msgstr ""
 
-#: src/rfx-builder.c:1004
+#: src/rfx-builder.c:984
 msgid "LiVES: - RFX Properties"
 msgstr ""
 
-#: src/rfx-builder.c:1013
+#: src/rfx-builder.c:993
 msgid "_Slow (hint to GUI)"
 msgstr ""
 
-#: src/rfx-builder.c:1024
+#: src/rfx-builder.c:1004
 msgid "_Batch mode generator"
 msgstr ""
 
-#: src/rfx-builder.c:1831
+#: src/rfx-builder.c:1790
 msgid ""
 "\n"
 "\n"
@@ -6192,7 +6205,7 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:1875
+#: src/rfx-builder.c:1834
 msgid ""
 "\n"
 "\n"
@@ -6200,219 +6213,219 @@
 "Please check the trigger code.\n"
 msgstr ""
 
-#: src/rfx-builder.c:1994
+#: src/rfx-builder.c:1950
 msgid "LiVES: - New RFX Parameter"
 msgstr ""
 
-#: src/rfx-builder.c:1997
+#: src/rfx-builder.c:1952
 msgid "LiVES: - Edit RFX Parameter"
 msgstr ""
 
-#: src/rfx-builder.c:2013
+#: src/rfx-builder.c:1968
 msgid "_Name:    "
 msgstr ""
 
-#: src/rfx-builder.c:2016
+#: src/rfx-builder.c:1971
 msgid "Name of the parameter, must be unique in the plugin."
 msgstr ""
 
-#: src/rfx-builder.c:2025
+#: src/rfx-builder.c:1981
 msgid "_Label:    "
 msgstr ""
 
-#: src/rfx-builder.c:2028
+#: src/rfx-builder.c:1984
 msgid ""
 "Label to be shown by the parameter. An underscore represents mnemonic "
 "accelerator."
 msgstr ""
 
-#: src/rfx-builder.c:2039
+#: src/rfx-builder.c:1996
 msgid "_Type:         "
 msgstr ""
 
-#: src/rfx-builder.c:2040
+#: src/rfx-builder.c:1997
 msgid "Parameter type (select from list)."
 msgstr ""
 
-#: src/rfx-builder.c:2073
+#: src/rfx-builder.c:2029
 msgid "Decimal _places: "
 msgstr ""
 
-#: src/rfx-builder.c:2082 src/rfx-builder.c:2477 src/rfx-builder.c:2495
+#: src/rfx-builder.c:2038 src/rfx-builder.c:2430 src/rfx-builder.c:2447
 msgid "_Default value:    "
 msgstr ""
 
-#: src/rfx-builder.c:2098
+#: src/rfx-builder.c:2054
 msgid "_Default: "
 msgstr ""
 
-#: src/rfx-builder.c:2132
+#: src/rfx-builder.c:2087
 msgid "Button _Group: "
 msgstr ""
 
-#: src/rfx-builder.c:2134
+#: src/rfx-builder.c:2089
 msgid "A non-zero value can be used to group radio buttons."
 msgstr ""
 
-#: src/rfx-builder.c:2142 src/rfx-builder.c:2478
+#: src/rfx-builder.c:2097 src/rfx-builder.c:2431
 msgid "_Minimum value: "
 msgstr ""
 
-#: src/rfx-builder.c:2148 src/rfx-builder.c:2479
+#: src/rfx-builder.c:2103 src/rfx-builder.c:2432
 msgid "Ma_ximum value: "
 msgstr ""
 
-#: src/rfx-builder.c:2157
+#: src/rfx-builder.c:2113
 msgid "     _Step size:   "
 msgstr ""
 
-#: src/rfx-builder.c:2160
+#: src/rfx-builder.c:2117
 msgid ""
 "How much the parameter is adjusted when the spinbutton arrows are pressed."
 msgstr ""
 
-#: src/rfx-builder.c:2171
+#: src/rfx-builder.c:2129
 msgid "_Wrap value"
 msgstr ""
 
-#: src/rfx-builder.c:2172
+#: src/rfx-builder.c:2131
 msgid "Whether the value wraps max->min and min->max."
 msgstr ""
 
-#: src/rfx-builder.c:2470
+#: src/rfx-builder.c:2424
 msgid "Set _values"
 msgstr ""
 
-#: src/rfx-builder.c:2512
+#: src/rfx-builder.c:2463
 msgid "Default _Red:  "
 msgstr ""
 
-#: src/rfx-builder.c:2513
+#: src/rfx-builder.c:2464
 msgid "Default _Green:"
 msgstr ""
 
-#: src/rfx-builder.c:2514
+#: src/rfx-builder.c:2465
 msgid "Default _Blue: "
 msgstr ""
 
-#: src/rfx-builder.c:2538
+#: src/rfx-builder.c:2488
 msgid "Set _default"
 msgstr ""
 
-#: src/rfx-builder.c:2540
+#: src/rfx-builder.c:2490
 msgid "Default value:  "
 msgstr ""
 
-#: src/rfx-builder.c:2541
+#: src/rfx-builder.c:2491
 msgid "Maximum length (chars): "
 msgstr ""
 
-#: src/rfx-builder.c:2576
+#: src/rfx-builder.c:2526
 msgid "LiVES: - New RFX Parameter Window Hint"
 msgstr ""
 
-#: src/rfx-builder.c:2579
+#: src/rfx-builder.c:2528
 msgid "LiVES: - Edit RFX Parameter Window Hint"
 msgstr ""
 
-#: src/rfx-builder.c:2622
+#: src/rfx-builder.c:2569
 msgid "_Keyword:         "
 msgstr ""
 
-#: src/rfx-builder.c:2639
+#: src/rfx-builder.c:2586
 msgid "Special _Type:         "
 msgstr ""
 
-#: src/rfx-builder.c:2656
+#: src/rfx-builder.c:2602
 msgid "Special _Subtype:         "
 msgstr ""
 
-#: src/rfx-builder.c:2667 src/rfx-builder.c:2706
+#: src/rfx-builder.c:2613 src/rfx-builder.c:2651
 msgid "Row:    "
 msgstr ""
 
-#: src/rfx-builder.c:2732
+#: src/rfx-builder.c:2676
 #, c-format
 msgid "Linked parameters (%d):    "
 msgstr ""
 
-#: src/rfx-builder.c:2749
+#: src/rfx-builder.c:2693
 msgid "Linked parameters (4):    "
 msgstr ""
 
-#: src/rfx-builder.c:2752
+#: src/rfx-builder.c:2695
 msgid "Linked parameters (2):    "
 msgstr ""
 
-#: src/rfx-builder.c:2777
+#: src/rfx-builder.c:2720
 msgid "LiVES: - New RFX Trigger"
 msgstr ""
 
-#: src/rfx-builder.c:2780
+#: src/rfx-builder.c:2722
 msgid "LiVES: - Edit RFX Trigger"
 msgstr ""
 
-#: src/rfx-builder.c:2808
+#: src/rfx-builder.c:2750
 msgid "When:         "
 msgstr ""
 
-#: src/rfx-builder.c:2904
+#: src/rfx-builder.c:2846
 msgid "LiVES: - Pre Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:2911
+#: src/rfx-builder.c:2853
 msgid "LiVES: - Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:2918
+#: src/rfx-builder.c:2860
 msgid "LiVES: - Post Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:2931
+#: src/rfx-builder.c:2873
 #, c-format
 msgid "LiVES: - Default text (max length %d)"
 msgstr ""
 
-#: src/rfx-builder.c:2944
+#: src/rfx-builder.c:2885
 msgid "LiVES: - Enter values, one per line"
 msgstr ""
 
-#: src/rfx-builder.c:3055
+#: src/rfx-builder.c:2996
 msgid ""
 "\n"
 "\n"
 "Name must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3060
+#: src/rfx-builder.c:3001
 msgid ""
 "\n"
 "\n"
 "Name must not contain spaces.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3065
+#: src/rfx-builder.c:3006
 msgid ""
 "\n"
 "\n"
 "Menu text must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3071
+#: src/rfx-builder.c:3012
 msgid ""
 "\n"
 "\n"
 "Action description must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3076
+#: src/rfx-builder.c:3017
 msgid ""
 "\n"
 "\n"
 "Author must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3085 src/rfx-builder.c:4339
+#: src/rfx-builder.c:3026 src/rfx-builder.c:4253
 msgid ""
 "\n"
 "\n"
@@ -6420,28 +6433,28 @@
 "Name must be unique.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3092
+#: src/rfx-builder.c:3033
 msgid ""
 "\n"
 "\n"
 "Loop code should not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3098
+#: src/rfx-builder.c:3039
 msgid ""
 "\n"
 "\n"
 "Trigger code should not be blank for a utility.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3111
+#: src/rfx-builder.c:3052
 msgid ""
 "\n"
 "\n"
 "Parameter name must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3117
+#: src/rfx-builder.c:3058
 msgid ""
 "\n"
 "\n"
@@ -6450,41 +6463,41 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:3171
+#: src/rfx-builder.c:3111
 #, c-format
 msgid "Writing script file %s..."
 msgstr ""
 
-#: src/rfx-builder.c:3477
+#: src/rfx-builder.c:3411
 msgid "No <define> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3484 src/rfx-builder.c:3493
+#: src/rfx-builder.c:3418 src/rfx-builder.c:3427
 msgid "Bad script version.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3505
+#: src/rfx-builder.c:3439
 msgid "No <name> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3513
+#: src/rfx-builder.c:3447
 msgid "No <version> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3522
+#: src/rfx-builder.c:3456
 msgid "No <author> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3536
+#: src/rfx-builder.c:3470
 msgid "No <description> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3540
+#: src/rfx-builder.c:3474
 #, c-format
 msgid "Bad description. (%s)\n"
 msgstr ""
 
-#: src/rfx-builder.c:3702
+#: src/rfx-builder.c:3627
 #, c-format
 msgid ""
 "\n"
@@ -6494,27 +6507,27 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:3859
+#: src/rfx-builder.c:3780
 msgid "Rebuilding all RFX scripts...builtin..."
 msgstr ""
 
-#: src/rfx-builder.c:3860
+#: src/rfx-builder.c:3781
 msgid "Rebuilding scripts"
 msgstr ""
 
-#: src/rfx-builder.c:3868
+#: src/rfx-builder.c:3789
 msgid "custom..."
 msgstr ""
 
-#: src/rfx-builder.c:3872
+#: src/rfx-builder.c:3793
 msgid "test..."
 msgstr ""
 
-#: src/rfx-builder.c:3878
+#: src/rfx-builder.c:3799
 msgid "rebuilding dynamic menu entries..."
 msgstr ""
 
-#: src/rfx-builder.c:3905 src/rfx-builder.c:3912
+#: src/rfx-builder.c:3826 src/rfx-builder.c:3834
 #, c-format
 msgid ""
 "\n"
@@ -6523,7 +6536,7 @@
 "Please check this program is in your path and executable.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3951
+#: src/rfx-builder.c:3874
 #, c-format
 msgid ""
 "\n"
@@ -6533,12 +6546,12 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:3960
+#: src/rfx-builder.c:3884
 #, c-format
 msgid "Deleting rfx script %s..."
 msgstr ""
 
-#: src/rfx-builder.c:3980
+#: src/rfx-builder.c:3902
 #, c-format
 msgid ""
 "\n"
@@ -6548,7 +6561,7 @@
 "Error code was %d\n"
 msgstr ""
 
-#: src/rfx-builder.c:4016
+#: src/rfx-builder.c:3938
 #, c-format
 msgid ""
 "\n"
@@ -6558,12 +6571,12 @@
 "Please delete it first, or rename the test script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4027
+#: src/rfx-builder.c:3950
 #, c-format
 msgid "Promoting rfx test plugin %s to custom..."
 msgstr ""
 
-#: src/rfx-builder.c:4044
+#: src/rfx-builder.c:3965
 #, c-format
 msgid ""
 "\n"
@@ -6574,20 +6587,20 @@
 "Return code was %d (%s)\n"
 msgstr ""
 
-#: src/rfx-builder.c:4070
+#: src/rfx-builder.c:3990
 msgid "LiVES: - Export Script to..."
 msgstr ""
 
-#: src/rfx-builder.c:4077 src/rfx-builder.c:4156
+#: src/rfx-builder.c:3997 src/rfx-builder.c:4074
 #, c-format
 msgid "Copying %s to %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4105
+#: src/rfx-builder.c:4024
 msgid "LiVES: Import Script from..."
 msgstr ""
 
-#: src/rfx-builder.c:4148
+#: src/rfx-builder.c:4067
 #, c-format
 msgid ""
 "\n"
@@ -6597,43 +6610,43 @@
 "Please delete it first, or rename the import script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4249
+#: src/rfx-builder.c:4166
 msgid "LiVES: - Copy RFX Script"
 msgstr ""
 
-#: src/rfx-builder.c:4251
+#: src/rfx-builder.c:4168
 msgid "_From type:    "
 msgstr ""
 
-#: src/rfx-builder.c:4258
+#: src/rfx-builder.c:4175
 msgid "   Script:    "
 msgstr ""
 
-#: src/rfx-builder.c:4267
+#: src/rfx-builder.c:4183
 msgid "LiVES: - Rename test RFX Script"
 msgstr ""
 
-#: src/rfx-builder.c:4268
+#: src/rfx-builder.c:4184
 msgid "From script: "
 msgstr ""
 
-#: src/rfx-builder.c:4273
+#: src/rfx-builder.c:4188
 msgid "LiVES: - RFX Script name"
 msgstr ""
 
-#: src/rfx-builder.c:4274
+#: src/rfx-builder.c:4189
 msgid "Script name: "
 msgstr ""
 
-#: src/rfx-builder.c:4294
+#: src/rfx-builder.c:4209
 msgid "New name: "
 msgstr ""
 
-#: src/rfx-builder.c:4297
+#: src/rfx-builder.c:4212
 msgid "New script name: "
 msgstr ""
 
-#: src/rfx-builder.c:4372
+#: src/rfx-builder.c:4286
 msgid ""
 "\n"
 "\n"
@@ -6641,12 +6654,12 @@
 "Script name must be unique.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4384
+#: src/rfx-builder.c:4297
 #, c-format
 msgid "Renaming RFX test script %s to %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4390
+#: src/rfx-builder.c:4302
 #, c-format
 msgid ""
 "\n"
@@ -6657,21 +6670,21 @@
 "Return code was %d\n"
 msgstr ""
 
-#: src/rfx-builder.c:4610
+#: src/rfx-builder.c:4518
 msgid "_Apply Real Time Effects to Selection"
 msgstr ""
 
-#: src/rfx-builder.c:4664
+#: src/rfx-builder.c:4572
 #, c-format
 msgid "Loading rendered effect %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4766
+#: src/rfx-builder.c:4674
 msgid ""
 "See: VJ - show VJ keys. Set the realtime effects, and then apply them here."
 msgstr ""
 
-#: src/preferences.c:359
+#: src/preferences.c:351
 msgid ""
 "\n"
 "\n"
@@ -6679,7 +6692,7 @@
 "full screen, separate window (fs) mode\n"
 msgstr ""
 
-#: src/preferences.c:408
+#: src/preferences.c:400
 msgid ""
 "\n"
 "\n"
@@ -6687,7 +6700,7 @@
 "(Free space = UNKNOWN)"
 msgstr ""
 
-#: src/preferences.c:412
+#: src/preferences.c:403
 #, c-format
 msgid ""
 "\n"
@@ -6696,14 +6709,14 @@
 "(Free space = %s)"
 msgstr ""
 
-#: src/preferences.c:416
+#: src/preferences.c:408
 msgid ""
 "The temp directory is LiVES working directory where opened clips and sets "
 "are stored.\n"
 "It should be in a partition with plenty of free disk space.\n"
 msgstr ""
 
-#: src/preferences.c:784
+#: src/preferences.c:839
 #, c-format
 msgid ""
 "Unable to create or write to the new temporary directory.\n"
@@ -6714,7 +6727,7 @@
 "The directory will not be changed now.\n"
 msgstr ""
 
-#: src/preferences.c:786
+#: src/preferences.c:843
 #, c-format
 msgid ""
 "Unable to create or write to the new temporary directory.\n"
@@ -6724,7 +6737,7 @@
 "The directory will not be changed now.\n"
 msgstr ""
 
-#: src/preferences.c:798
+#: src/preferences.c:856
 msgid ""
 "You have chosen to change the temporary directory.\n"
 "Please make sure you have no other copies of LiVES open.\n"
@@ -6736,20 +6749,20 @@
 "original setting."
 msgstr ""
 
-#: src/preferences.c:1169
+#: src/preferences.c:1221
 msgid ""
 "\n"
 "Unable to switch audio players to jack - jackd must be installed first.\n"
 "See http://jackaudio.org\n"
 msgstr ""
 
-#: src/preferences.c:1175
+#: src/preferences.c:1226
 msgid ""
 "\n"
 "Switching audio players requires restart (jackd must not be running)\n"
 msgstr ""
 
-#: src/preferences.c:1202
+#: src/preferences.c:1253
 msgid ""
 "\n"
 "Unable to switch audio players to pulse audio\n"
@@ -6757,814 +6770,814 @@
 "See http://www.pulseaudio.org\n"
 msgstr ""
 
-#: src/preferences.c:1502
+#: src/preferences.c:1544
 msgid "PCM (highest quality; largest files)"
 msgstr ""
 
-#: src/preferences.c:2063
+#: src/preferences.c:2096
 msgid "LiVES: - Preferences"
 msgstr ""
 
-#: src/preferences.c:2142
+#: src/preferences.c:2177
 msgid "Open file selection maximised"
 msgstr ""
 
-#: src/preferences.c:2149
+#: src/preferences.c:2184
 msgid "Show recent files in the File menu"
 msgstr ""
 
-#: src/preferences.c:2158
+#: src/preferences.c:2193
 msgid "Stop screensaver on playback    "
 msgstr ""
 
-#: src/preferences.c:2165
+#: src/preferences.c:2200
 msgid "Open main window maximised"
 msgstr ""
 
-#: src/preferences.c:2173
+#: src/preferences.c:2208
 msgid "Show toolbar when background is blanked"
 msgstr ""
 
-#: src/preferences.c:2181
+#: src/preferences.c:2216
 msgid "Allow mouse wheel to switch clips"
 msgstr ""
 
-#: src/preferences.c:2192
+#: src/preferences.c:2227
 msgid "Shrink previews to fit in interface"
 msgstr ""
 
-#: src/preferences.c:2202
+#: src/preferences.c:2237
 msgid "Startup mode:"
 msgstr ""
 
-#: src/preferences.c:2206
+#: src/preferences.c:2241
 msgid "_Clip editor"
 msgstr ""
 
-#: src/preferences.c:2210
+#: src/preferences.c:2245
 msgid "_Multitrack mode"
 msgstr ""
 
-#: src/preferences.c:2234
+#: src/preferences.c:2268
 msgid "Multi-head support"
 msgstr ""
 
-#: src/preferences.c:2242
+#: src/preferences.c:2276
 msgid " monitor number for LiVES interface"
 msgstr ""
 
-#: src/preferences.c:2248
+#: src/preferences.c:2282
 msgid " monitor number for playback"
 msgstr ""
 
-#: src/preferences.c:2260
+#: src/preferences.c:2294
 msgid ""
 "A setting of 0 means use all available monitors (only works with some "
 "playback plugins)."
 msgstr ""
 
-#: src/preferences.c:2270
+#: src/preferences.c:2304
 msgid "Force single monitor"
 msgstr ""
 
-#: src/preferences.c:2271
+#: src/preferences.c:2305
 msgid "Ignore all except the first monitor."
 msgstr ""
 
-#: src/preferences.c:2293
+#: src/preferences.c:2327
 msgid "Show clip thumbnails during playback"
 msgstr ""
 
-#: src/preferences.c:2306
+#: src/preferences.c:2340
 msgid "GUI"
 msgstr ""
 
-#: src/preferences.c:2321
+#: src/preferences.c:2355
 msgid "When entering Multitrack mode:"
 msgstr ""
 
-#: src/preferences.c:2330
+#: src/preferences.c:2364
 msgid "_Prompt me for width, height, fps and audio settings"
 msgstr ""
 
-#: src/preferences.c:2336
+#: src/preferences.c:2370
 msgid "_Always use the following values:"
 msgstr ""
 
-#: src/preferences.c:2345
+#: src/preferences.c:2379
 msgid "Use these same _values for rendering a new clip"
 msgstr ""
 
-#: src/preferences.c:2370
+#: src/preferences.c:2404
 msgid "_Width           "
 msgstr ""
 
-#: src/preferences.c:2375
+#: src/preferences.c:2409
 msgid "          _Height      "
 msgstr ""
 
-#: src/preferences.c:2379
+#: src/preferences.c:2413
 msgid "          _FPS"
 msgstr ""
 
-#: src/preferences.c:2387
+#: src/preferences.c:2421
 msgid "Enable backing audio track"
 msgstr ""
 
-#: src/preferences.c:2394
+#: src/preferences.c:2428
 msgid "Audio track per video track"
 msgstr ""
 
-#: src/preferences.c:2423
+#: src/preferences.c:2457
 msgid "    _Undo buffer size (MB)    "
 msgstr ""
 
-#: src/preferences.c:2432
+#: src/preferences.c:2466
 msgid "_Exit multitrack mode after rendering"
 msgstr ""
 
-#: src/preferences.c:2440
+#: src/preferences.c:2474
 msgid "Auto backup layouts"
 msgstr ""
 
-#: src/preferences.c:2445
+#: src/preferences.c:2479
 msgid "_Every"
 msgstr ""
 
-#: src/preferences.c:2453
+#: src/preferences.c:2487
 msgid "seconds"
 msgstr ""
 
-#: src/preferences.c:2461
+#: src/preferences.c:2495
 msgid "After every _change"
 msgstr ""
 
-#: src/preferences.c:2467
+#: src/preferences.c:2501
 msgid "_Never"
 msgstr ""
 
-#: src/preferences.c:2490
+#: src/preferences.c:2523
 msgid "Multitrack/Render"
 msgstr ""
 
-#: src/preferences.c:2508
+#: src/preferences.c:2541
 msgid "Use instant opening when possible"
 msgstr ""
 
-#: src/preferences.c:2509
+#: src/preferences.c:2543
 msgid "Enable instant opening of some file types using decoder plugins"
 msgstr ""
 
-#: src/preferences.c:2531
+#: src/preferences.c:2567
 msgid "Video open command (fallback)"
 msgstr ""
 
-#: src/preferences.c:2543
+#: src/preferences.c:2579
 msgid "Open/render compression"
 msgstr ""
 
-#: src/preferences.c:2546
+#: src/preferences.c:2582
 msgid " %     ( lower = slower, larger files; for jpeg, higher quality )"
 msgstr ""
 
-#: src/preferences.c:2558
+#: src/preferences.c:2594
 msgid "Default image format"
 msgstr ""
 
-#: src/preferences.c:2562
+#: src/preferences.c:2598
 msgid "_jpeg"
 msgstr ""
 
-#: src/preferences.c:2565
+#: src/preferences.c:2601
 msgid "_png"
 msgstr ""
 
-#: src/preferences.c:2572
+#: src/preferences.c:2608
 msgid "(Check Help/Troubleshoot to see which image formats are supported)"
 msgstr ""
 
-#: src/preferences.c:2580
+#: src/preferences.c:2616
 msgid "Enable automatic deinterlacing when possible"
 msgstr ""
 
-#: src/preferences.c:2582
+#: src/preferences.c:2619
 msgid "Automatically deinterlace frames when a plugin suggests it"
 msgstr ""
 
-#: src/preferences.c:2593
+#: src/preferences.c:2632
 msgid "Automatic trimming / padding of audio when possible"
 msgstr ""
 
-#: src/preferences.c:2595
+#: src/preferences.c:2634
 msgid "Automatically trim or pad audio when a plugin suggests it"
 msgstr ""
 
-#: src/preferences.c:2606
+#: src/preferences.c:2646
 msgid "Ignore blank borders when possible"
 msgstr ""
 
-#: src/preferences.c:2608
+#: src/preferences.c:2648
 msgid "Clip any blank borders from frames where possible"
 msgstr ""
 
-#: src/preferences.c:2619
+#: src/preferences.c:2660
 msgid "When opening multiple files, concatenate images into one clip"
 msgstr ""
 
-#: src/preferences.c:2629
+#: src/preferences.c:2670
 msgid "Decoding"
 msgstr ""
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:2652
+#: src/preferences.c:2693
 msgid "Low - can improve performance on slower machines"
 msgstr ""
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:2654
+#: src/preferences.c:2695
 msgid "Normal - recommended for most users"
 msgstr ""
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:2656
+#: src/preferences.c:2697
 msgid "High - can improve quality on very fast machines"
 msgstr ""
 
-#: src/preferences.c:2659
+#: src/preferences.c:2700
 msgid "Preview _quality"
 msgstr ""
 
-#: src/preferences.c:2660
+#: src/preferences.c:2701
 msgid "The preview quality for video playback - affects resizing"
 msgstr ""
 
-#: src/preferences.c:2675
+#: src/preferences.c:2717
 msgid "_Show FPS statistics"
 msgstr ""
 
-#: src/preferences.c:2694
+#: src/preferences.c:2736
 msgid "_Plugin"
 msgstr ""
 
-#: src/preferences.c:2718
+#: src/preferences.c:2760
 msgid "Stream audio"
 msgstr ""
 
-#: src/preferences.c:2721
+#: src/preferences.c:2763
 msgid "Stream audio to playback plugin"
 msgstr ""
 
-#: src/preferences.c:2734
+#: src/preferences.c:2778
 msgid "Record player output"
 msgstr ""
 
-#: src/preferences.c:2737
+#: src/preferences.c:2781
 msgid "Record output from player instead of input to player"
 msgstr ""
 
-#: src/preferences.c:2744
+#: src/preferences.c:2789
 msgid "VIDEO"
 msgstr ""
 
-#: src/preferences.c:2787
+#: src/preferences.c:2833
 msgid "_Player"
 msgstr ""
 
-#: src/preferences.c:2792
+#: src/preferences.c:2838
 msgid "(See also the Jack Integration tab for jack startup options)"
 msgstr ""
 
-#: src/preferences.c:2819
+#: src/preferences.c:2865
 msgid "mplayer"
 msgstr ""
 
-#: src/preferences.c:2830
+#: src/preferences.c:2876
 msgid "mplayer2"
 msgstr ""
 
-#: src/preferences.c:2833
+#: src/preferences.c:2879
 msgid "Audio play _command"
 msgstr ""
 
-#: src/preferences.c:2840
+#: src/preferences.c:2886
 msgid "- internal -"
 msgstr ""
 
-#: src/preferences.c:2849
+#: src/preferences.c:2895
 msgid "Audio follows video _rate/direction"
 msgstr ""
 
-#: src/preferences.c:2857
+#: src/preferences.c:2903
 msgid "Audio follows _clip switches"
 msgstr ""
 
-#: src/preferences.c:2864
+#: src/preferences.c:2910
 msgid "Source:"
 msgstr ""
 
-#: src/preferences.c:2868
+#: src/preferences.c:2914
 msgid "_Internal"
 msgstr ""
 
-#: src/preferences.c:2873
+#: src/preferences.c:2919
 msgid "_External (requires jack or pulse audio player)"
 msgstr ""
 
-#: src/preferences.c:2892
+#: src/preferences.c:2940
 msgid "AUDIO"
 msgstr ""
 
-#: src/preferences.c:2902
+#: src/preferences.c:2950
 msgid "Playback"
 msgstr ""
 
-#: src/preferences.c:2925
+#: src/preferences.c:2973
 msgid ""
 "Record audio when capturing an e_xternal window\n"
 " (requires jack or pulse audio)"
 msgstr ""
 
-#: src/preferences.c:2940
+#: src/preferences.c:2988
 msgid "      What to record when 'r' is pressed   "
 msgstr ""
 
-#: src/preferences.c:2949
+#: src/preferences.c:2997
 msgid "_Frame changes"
 msgstr ""
 
-#: src/preferences.c:2964
+#: src/preferences.c:3012
 msgid "F_PS changes"
 msgstr ""
 
-#: src/preferences.c:2982
+#: src/preferences.c:3030
 msgid "_Real time effects"
 msgstr ""
 
-#: src/preferences.c:2993
+#: src/preferences.c:3041
 msgid "_Clip switches"
 msgstr ""
 
-#: src/preferences.c:3004
+#: src/preferences.c:3052
 msgid "_Audio (requires jack or pulse audio player)"
 msgstr ""
 
-#: src/preferences.c:3024
+#: src/preferences.c:3072
 msgid "Pause recording if free disk space falls below"
 msgstr ""
 
 #. TRANSLATORS: gigabytes
-#: src/preferences.c:3030
+#: src/preferences.c:3078
 msgid "GB"
 msgstr ""
 
-#: src/preferences.c:3037
+#: src/preferences.c:3085
 msgid "Recording"
 msgstr ""
 
-#: src/preferences.c:3055
+#: src/preferences.c:3103
 msgid "Encoder"
 msgstr ""
 
-#: src/preferences.c:3090
+#: src/preferences.c:3137
 msgid "Output format"
 msgstr ""
 
-#: src/preferences.c:3106
+#: src/preferences.c:3153
 msgid "Audio codec"
 msgstr ""
 
-#: src/preferences.c:3119
+#: src/preferences.c:3165
 msgid "Encoding"
 msgstr ""
 
-#: src/preferences.c:3134
+#: src/preferences.c:3180
 msgid "Use _antialiasing when resizing"
 msgstr ""
 
-#: src/preferences.c:3143
+#: src/preferences.c:3189
 msgid "Number of _real time effect keys"
 msgstr ""
 
-#: src/preferences.c:3145
+#: src/preferences.c:3192
 msgid ""
 "The number of \"virtual\" real time effect keys. They can be controlled "
 "through the real time effects window, or via network (OSC)."
 msgstr ""
 
-#: src/preferences.c:3152
+#: src/preferences.c:3199
 msgid "Use _threads where possible when applying effects"
 msgstr ""
 
-#: src/preferences.c:3159
+#: src/preferences.c:3207
 msgid "Number of _threads"
 msgstr ""
 
-#: src/preferences.c:3172
+#: src/preferences.c:3221
 msgid "Restart is required if any of the following paths are changed:"
 msgstr ""
 
-#: src/preferences.c:3182
+#: src/preferences.c:3231
 msgid "Weed plugin path"
 msgstr ""
 
-#: src/preferences.c:3184
+#: src/preferences.c:3234
 msgid "Frei0r plugin path"
 msgstr ""
 
-#: src/preferences.c:3186
+#: src/preferences.c:3237
 msgid "LADSPA plugin path"
 msgstr ""
 
-#: src/preferences.c:3209
+#: src/preferences.c:3261
 msgid "      Video load directory (default)      "
 msgstr ""
 
-#: src/preferences.c:3215
+#: src/preferences.c:3267
 msgid "      Video save directory (default) "
 msgstr ""
 
-#: src/preferences.c:3221
+#: src/preferences.c:3273
 msgid "      Audio load directory (default) "
 msgstr ""
 
-#: src/preferences.c:3227
+#: src/preferences.c:3279
 msgid "      Image directory (default) "
 msgstr ""
 
-#: src/preferences.c:3233
+#: src/preferences.c:3285
 msgid "      Backup/Restore directory (default) "
 msgstr ""
 
-#: src/preferences.c:3239
+#: src/preferences.c:3291
 msgid "      Temp directory (do not remove) "
 msgstr ""
 
-#: src/preferences.c:3252
+#: src/preferences.c:3304
 msgid "The default directory for loading video clips from"
 msgstr ""
 
-#: src/preferences.c:3277
+#: src/preferences.c:3329
 msgid "The default directory for saving encoded clips to"
 msgstr ""
 
-#: src/preferences.c:3285
+#: src/preferences.c:3337
 msgid "The default directory for loading and saving audio"
 msgstr ""
 
-#: src/preferences.c:3293
+#: src/preferences.c:3345
 msgid "The default directory for saving frameshots to"
 msgstr ""
 
-#: src/preferences.c:3301
+#: src/preferences.c:3353
 msgid "The default directory for backing up/restoring single clips"
 msgstr ""
 
-#: src/preferences.c:3309
+#: src/preferences.c:3361
 msgid "LiVES working directory."
 msgstr ""
 
-#: src/preferences.c:3359
+#: src/preferences.c:3412
 msgid "Directories"
 msgstr ""
 
-#: src/preferences.c:3374
+#: src/preferences.c:3427
 msgid "Warn if diskspace falls below: "
 msgstr ""
 
-#: src/preferences.c:3380 src/preferences.c:3394
+#: src/preferences.c:3433 src/preferences.c:3447
 msgid " MB [set to 0 to disable]"
 msgstr ""
 
-#: src/preferences.c:3389
+#: src/preferences.c:3442
 msgid "Diskspace critical level: "
 msgstr ""
 
-#: src/preferences.c:3407
+#: src/preferences.c:3461
 msgid ""
 "Warn on Insert / Merge if _frame rate of clipboard does not match frame rate "
 "of selection"
 msgstr ""
 
-#: src/preferences.c:3417
+#: src/preferences.c:3471
 msgid "Warn on Open if file _size exceeds "
 msgstr ""
 
-#: src/preferences.c:3425
+#: src/preferences.c:3479
 msgid " MB"
 msgstr ""
 
-#: src/preferences.c:3432
+#: src/preferences.c:3486
 msgid "Show a warning before saving a se_t"
 msgstr ""
 
-#: src/preferences.c:3442
+#: src/preferences.c:3496
 msgid ""
 "Show a warning if _mplayer/mplayer2, sox, composite or convert is not found "
 "when LiVES is started."
 msgstr ""
 
-#: src/preferences.c:3452
+#: src/preferences.c:3506
 msgid "Show a warning if no _rendered effects are found at startup."
 msgstr ""
 
-#: src/preferences.c:3464
+#: src/preferences.c:3518
 msgid "Show a warning if no _encoder plugins are found at startup."
 msgstr ""
 
-#: src/preferences.c:3474
+#: src/preferences.c:3528
 msgid "Show a warning if a _duplicate set name is entered."
 msgstr ""
 
-#: src/preferences.c:3485
+#: src/preferences.c:3539
 msgid "When a set is loaded, warn if clips are missing from _layouts."
 msgstr ""
 
-#: src/preferences.c:3495
+#: src/preferences.c:3550
 msgid "Warn if a clip used in a layout is about to be closed."
 msgstr ""
 
-#: src/preferences.c:3505
+#: src/preferences.c:3561
 msgid "Warn if frames used in a layout are about to be deleted."
 msgstr ""
 
-#: src/preferences.c:3515
+#: src/preferences.c:3572
 msgid "Warn if frames used in a layout are about to be shifted."
 msgstr ""
 
-#: src/preferences.c:3525
+#: src/preferences.c:3583
 msgid "Warn if frames used in a layout are about to be altered."
 msgstr ""
 
-#: src/preferences.c:3535
+#: src/preferences.c:3594
 msgid "Warn if audio used in a layout is about to be deleted."
 msgstr ""
 
-#: src/preferences.c:3546
+#: src/preferences.c:3606
 msgid "Warn if audio used in a layout is about to be shifted."
 msgstr ""
 
-#: src/preferences.c:3556
+#: src/preferences.c:3617
 msgid "Warn if audio used in a layout is about to be altered."
 msgstr ""
 
-#: src/preferences.c:3566
+#: src/preferences.c:3628
 msgid "Popup layout errors after clip changes."
 msgstr ""
 
-#: src/preferences.c:3577
+#: src/preferences.c:3639
 msgid "Warn if the layout has not been saved when leaving multitrack mode."
 msgstr ""
 
-#: src/preferences.c:3588
+#: src/preferences.c:3650
 msgid ""
 "Warn if multitrack has no audio channels, and a layout with audio is loaded."
 msgstr ""
 
-#: src/preferences.c:3598
+#: src/preferences.c:3660
 msgid ""
 "Warn if multitrack has audio channels, and your audio player is not \"jack\" "
 "or \"pulse audio\"."
 msgstr ""
 
-#: src/preferences.c:3610
+#: src/preferences.c:3672
 msgid "Show info message after importing from firewire device."
 msgstr ""
 
-#: src/preferences.c:3626
+#: src/preferences.c:3688
 msgid "Show a warning before opening a yuv4mpeg stream (advanced)."
 msgstr ""
 
-#: src/preferences.c:3639
+#: src/preferences.c:3701
 msgid "Show a warning when multitrack is low on backup space."
 msgstr ""
 
-#: src/preferences.c:3650
+#: src/preferences.c:3713
 msgid "Show a warning advising cleaning of disk space after a crash."
 msgstr ""
 
-#: src/preferences.c:3661
+#: src/preferences.c:3725
 msgid "Show a warning if unable to connect to pulseaudio player."
 msgstr ""
 
-#: src/preferences.c:3673
+#: src/preferences.c:3737
 msgid "Show a warning before wiping a layout which has unsaved changes."
 msgstr ""
 
-#: src/preferences.c:3685
+#: src/preferences.c:3749
 msgid "Warnings"
 msgstr ""
 
-#: src/preferences.c:3703
+#: src/preferences.c:3767
 msgid "Midi synch (requires the files midistart and midistop)"
 msgstr ""
 
-#: src/preferences.c:3715
+#: src/preferences.c:3779
 msgid "When inserting/merging frames:  "
 msgstr ""
 
-#: src/preferences.c:3719
+#: src/preferences.c:3783
 msgid "_Speed Up/Slow Down Insertion"
 msgstr ""
 
-#: src/preferences.c:3723
+#: src/preferences.c:3787
 msgid "_Resample Insertion"
 msgstr ""
 
-#: src/preferences.c:3730
+#: src/preferences.c:3794
 msgid "CD device           "
 msgstr ""
 
-#: src/preferences.c:3733
+#: src/preferences.c:3797
 msgid "LiVES can load audio tracks from this CD"
 msgstr ""
 
-#: src/preferences.c:3746
+#: src/preferences.c:3813
 msgid "Default FPS        "
 msgstr ""
 
-#: src/preferences.c:3749
+#: src/preferences.c:3816
 msgid "Frames per second to use when none is specified"
 msgstr ""
 
-#: src/preferences.c:3757
+#: src/preferences.c:3825
 msgid "Misc"
 msgstr ""
 
-#: src/preferences.c:3782
+#: src/preferences.c:3850
 msgid "New theme:           "
 msgstr ""
 
-#: src/preferences.c:3800
+#: src/preferences.c:3867
 msgid "Themes"
 msgstr ""
 
-#: src/preferences.c:3815
+#: src/preferences.c:3882
 msgid "Download bandwidth (Kb/s)       "
 msgstr ""
 
-#: src/preferences.c:3823
+#: src/preferences.c:3890
 msgid "LiVES must be compiled without \"configure --disable-OSC\" to use OMC"
 msgstr ""
 
-#: src/preferences.c:3833
+#: src/preferences.c:3900
 msgid "OMC remote control enabled"
 msgstr ""
 
-#: src/preferences.c:3841
+#: src/preferences.c:3908
 msgid "UDP port       "
 msgstr ""
 
-#: src/preferences.c:3850
+#: src/preferences.c:3917
 msgid "Start OMC on startup"
 msgstr ""
 
-#: src/preferences.c:3870
+#: src/preferences.c:3937
 msgid "Streaming/Networking"
 msgstr ""
 
-#: src/preferences.c:3882
+#: src/preferences.c:3949
 msgid "Jack transport"
 msgstr ""
 
-#: src/preferences.c:3886
+#: src/preferences.c:3953
 msgid ""
 "LiVES must be compiled with jack/transport.h and jack/jack.h present to use "
 "jack transport"
 msgstr ""
 
-#: src/preferences.c:3892
+#: src/preferences.c:3959
 msgid "Jack _transport config file"
 msgstr ""
 
-#: src/preferences.c:3899 src/preferences.c:3989
+#: src/preferences.c:3967 src/preferences.c:4058
 msgid "Start _server on LiVES startup"
 msgstr ""
 
-#: src/preferences.c:3911
+#: src/preferences.c:3979
 msgid "Jack transport _master (start and stop)"
 msgstr ""
 
-#: src/preferences.c:3921
+#: src/preferences.c:3989
 msgid "Jack transport _client (start and stop)"
 msgstr ""
 
-#: src/preferences.c:3935
+#: src/preferences.c:4003
 msgid "Jack transport sets start position"
 msgstr ""
 
-#: src/preferences.c:3952
+#: src/preferences.c:4020
 msgid "Jack transport timebase slave"
 msgstr ""
 
-#: src/preferences.c:3963
+#: src/preferences.c:4031
 msgid "(See also Playback -> Audio follows video rate/direction)"
 msgstr ""
 
-#: src/preferences.c:3971
+#: src/preferences.c:4039
 msgid "Jack audio"
 msgstr ""
 
-#: src/preferences.c:3975
+#: src/preferences.c:4043
 msgid "LiVES must be compiled with jack/jack.h present to use jack audio"
 msgstr ""
 
-#: src/preferences.c:3978
+#: src/preferences.c:4046
 msgid ""
 "You MUST set the audio player to \"jack\" in the Playback tab to use jack "
 "audio"
 msgstr ""
 
-#: src/preferences.c:3984
+#: src/preferences.c:4052
 msgid "Jack _audio server config file"
 msgstr ""
 
-#: src/preferences.c:3996
+#: src/preferences.c:4065
 msgid "Play audio even when transport is _paused"
 msgstr ""
 
-#: src/preferences.c:4008
+#: src/preferences.c:4077
 msgid "Automatically connect to System Out ports when 'playing' External Audio"
 msgstr ""
 
-#: src/preferences.c:4021
+#: src/preferences.c:4090
 msgid "Jack Integration"
 msgstr ""
 
-#: src/preferences.c:4035
+#: src/preferences.c:4104
 msgid "Events to respond to:"
 msgstr ""
 
-#: src/preferences.c:4044
+#: src/preferences.c:4113
 msgid "_Joystick events"
 msgstr ""
 
-#: src/preferences.c:4051
+#: src/preferences.c:4120
 msgid "_Joystick device"
 msgstr ""
 
-#: src/preferences.c:4053
+#: src/preferences.c:4122
 msgid "The joystick device, e.g. /dev/input/js0"
 msgstr ""
 
-#: src/preferences.c:4071
+#: src/preferences.c:4142
 msgid "_MIDI events"
 msgstr ""
 
-#: src/preferences.c:4080
+#: src/preferences.c:4151
 msgid "Use _ALSA MIDI (recommended)"
 msgstr ""
 
-#: src/preferences.c:4082
+#: src/preferences.c:4153
 msgid "Create an ALSA MIDI port which other MIDI devices can be connected to"
 msgstr ""
 
-#: src/preferences.c:4090
+#: src/preferences.c:4162
 msgid "Use _raw MIDI"
 msgstr ""
 
-#: src/preferences.c:4092
+#: src/preferences.c:4164
 msgid "Read directly from the MIDI device"
 msgstr ""
 
-#: src/preferences.c:4104
+#: src/preferences.c:4177
 msgid "_MIDI device"
 msgstr ""
 
-#: src/preferences.c:4106
+#: src/preferences.c:4179
 msgid "The MIDI device, e.g. /dev/input/midi0"
 msgstr ""
 
-#: src/preferences.c:4118
+#: src/preferences.c:4193
 msgid "Advanced"
 msgstr ""
 
-#: src/preferences.c:4124
+#: src/preferences.c:4199
 msgid "MIDI check _rate"
 msgstr ""
 
-#: src/preferences.c:4127
+#: src/preferences.c:4203
 msgid ""
 "Number of MIDI checks per keyboard tick. Increasing this may improve MIDI "
 "responsiveness, but may slow down playback."
 msgstr ""
 
-#: src/preferences.c:4134
+#: src/preferences.c:4211
 msgid "MIDI repeat"
 msgstr ""
 
-#: src/preferences.c:4137
+#: src/preferences.c:4214
 msgid "Number of non-reads allowed between succesive reads."
 msgstr ""
 
-#: src/preferences.c:4140
+#: src/preferences.c:4218
 msgid "(Warning: setting this value too high can slow down playback.)"
 msgstr ""
 
-#: src/preferences.c:4159
+#: src/preferences.c:4237
 msgid "MIDI/Joystick learner"
 msgstr ""
 
-#: src/preferences.c:4499
+#: src/preferences.c:4679
 msgid ""
 "\n"
 "LiVES will now shut down. You need to restart it for the directory change to "
@@ -7572,214 +7585,214 @@
 "Click OK to continue.\n"
 msgstr ""
 
-#: src/preferences.c:4523
+#: src/preferences.c:4703
 msgid ""
 "For the directory change to take effect LiVES will restart when preferences "
 "dialog closes."
 msgstr ""
 
-#: src/preferences.c:4527
+#: src/preferences.c:4707
 msgid "Theme changes will not take effect until the next time you start LiVES."
 msgstr ""
 
-#: src/preferences.c:4531
+#: src/preferences.c:4711
 msgid "Jack options will not take effect until the next time you start LiVES."
 msgstr ""
 
-#: src/osc.c:2585
+#: src/osc.c:2616
 #, c-format
 msgid "Syncing to external framerate of %.8f frames per second.\n"
 msgstr ""
 
-#: src/osc.c:6746
+#: src/osc.c:6938
 msgid "Cannot initialize OSC receiver\n"
 msgstr ""
 
-#: src/osc.c:6770
+#: src/osc.c:6961
 #, c-format
 msgid "WARNING: Cannot start OSC server at UDP port %d\n"
 msgstr ""
 
-#: src/osc.c:6775
+#: src/osc.c:6963
 #, c-format
 msgid "Started OSC server at UDP port %d\n"
 msgstr ""
 
-#: src/osc.c:6890
+#: src/osc.c:7076
 #, c-format
 msgid "Cannot start OSC/UDP server at port %d \n"
 msgstr ""
 
-#: src/resample.c:125 src/resample.c:304
+#: src/resample.c:131 src/resample.c:305
 #, c-format
 msgid "Resizing frames 1 to %d"
 msgstr ""
 
-#: src/resample.c:140 src/resample.c:318
+#: src/resample.c:145 src/resample.c:318
 #, c-format
 msgid "Resizing/letterboxing frames 1 to %d"
 msgstr ""
 
-#: src/resample.c:361 src/resample.c:385
+#: src/resample.c:360 src/resample.c:384
 msgid "Resize"
 msgstr ""
 
-#: src/resample.c:395
+#: src/resample.c:394
 msgid "Resample/Resize"
 msgstr ""
 
-#: src/resample.c:680
+#: src/resample.c:676
 #, c-format
 msgid "Length of video is now %d frames.\n"
 msgstr ""
 
-#: src/resample.c:745
+#: src/resample.c:737
 msgid ""
 "\n"
 "\n"
 "New rate must be greater than 0\n"
 msgstr ""
 
-#: src/resample.c:797 src/resample.c:813
+#: src/resample.c:788 src/resample.c:803
 msgid "Resampling audio"
 msgstr ""
 
-#: src/resample.c:831
+#: src/resample.c:821
 msgid "LiVES was unable to resample the audio as requested.\n"
 msgstr ""
 
-#: src/resample.c:833 src/resample.c:837
+#: src/resample.c:823 src/resample.c:827
 msgid "Resample Audio"
 msgstr ""
 
-#: src/resample.c:845
+#: src/resample.c:835
 #, c-format
 msgid "Audio was resampled to %d Hz, %d channels, %d bit"
 msgstr ""
 
-#: src/resample.c:1034
+#: src/resample.c:1016
 #, c-format
 msgid "Resampling video at %.8f frames per second..."
 msgstr ""
 
-#: src/resample.c:1037
+#: src/resample.c:1018
 #, c-format
 msgid "Resampling video at %.3f frames per second..."
 msgstr ""
 
-#: src/resample.c:1068
+#: src/resample.c:1049
 msgid "Reordering error !\n"
 msgstr ""
 
-#: src/resample.c:1079
+#: src/resample.c:1060
 msgid "Resample"
 msgstr ""
 
-#: src/resample.c:1192
+#: src/resample.c:1173
 msgid "LiVES: - Resample Audio"
 msgstr ""
 
-#: src/resample.c:1195
+#: src/resample.c:1175
 msgid "LiVES: - Insert Silence"
 msgstr ""
 
-#: src/resample.c:1198
+#: src/resample.c:1177
 msgid "LiVES: - New Clip Audio"
 msgstr ""
 
-#: src/resample.c:1201
+#: src/resample.c:1179
 msgid "LiVES: - External Clip Settings"
 msgstr ""
 
-#: src/resample.c:1238 src/resample.c:1358
+#: src/resample.c:1215 src/resample.c:1332
 msgid "Rate (Hz) "
 msgstr ""
 
-#: src/resample.c:1245 src/resample.c:1372
+#: src/resample.c:1222 src/resample.c:1346
 msgid "Channels"
 msgstr ""
 
-#: src/resample.c:1252
+#: src/resample.c:1229
 msgid "Sample Size "
 msgstr ""
 
-#: src/resample.c:1268 src/resample.c:1425
+#: src/resample.c:1245 src/resample.c:1399
 msgid "Signed"
 msgstr ""
 
-#: src/resample.c:1274 src/resample.c:1435
+#: src/resample.c:1251 src/resample.c:1409
 msgid "Unsigned"
 msgstr ""
 
-#: src/resample.c:1297 src/resample.c:1460
+#: src/resample.c:1273 src/resample.c:1433
 msgid "Little Endian"
 msgstr ""
 
-#: src/resample.c:1303 src/resample.c:1468
+#: src/resample.c:1279 src/resample.c:1441
 msgid "Big Endian"
 msgstr ""
 
-#: src/resample.c:1315
+#: src/resample.c:1290
 msgid "Current"
 msgstr ""
 
-#: src/resample.c:1340
+#: src/resample.c:1315
 msgid "_Enable audio"
 msgstr ""
 
-#: src/resample.c:1372
+#: src/resample.c:1346
 msgid "_Channels"
 msgstr ""
 
-#: src/resample.c:1394
+#: src/resample.c:1368
 msgid "_Sample Size"
 msgstr ""
 
-#: src/resample.c:1394
+#: src/resample.c:1368
 msgid "Sample Size"
 msgstr ""
 
-#: src/resample.c:1489
+#: src/resample.c:1461
 msgid "New"
 msgstr ""
 
-#: src/resample.c:1512
+#: src/resample.c:1484
 msgid "_Frames Per Second "
 msgstr ""
 
-#: src/resample.c:1530
+#: src/resample.c:1502
 msgid "Record for maximum:  "
 msgstr ""
 
-#: src/resample.c:1533
+#: src/resample.c:1505
 msgid " hours  "
 msgstr ""
 
-#: src/resample.c:1536
+#: src/resample.c:1508
 msgid " minutes  "
 msgstr ""
 
-#: src/resample.c:1538
+#: src/resample.c:1510
 msgid " seconds  "
 msgstr ""
 
-#: src/resample.c:1545
+#: src/resample.c:1517
 msgid "Unlimited"
 msgstr ""
 
-#: src/resample.c:1561
+#: src/resample.c:1533
 msgid "Click OK to begin recording, or Cancel to quit."
 msgstr ""
 
-#: src/resample.c:1670
+#: src/resample.c:1638
 msgid "LiVES: - Change playback speed"
 msgstr ""
 
-#: src/resample.c:1673
+#: src/resample.c:1640
 msgid "LiVES: - Resample Video"
 msgstr ""
 
-#: src/resample.c:1696
+#: src/resample.c:1663
 #, c-format
 msgid ""
 "\n"
@@ -7790,7 +7803,7 @@
 "in _frames per second"
 msgstr ""
 
-#: src/resample.c:1701
+#: src/resample.c:1667
 #, c-format
 msgid ""
 "\n"
@@ -7801,89 +7814,89 @@
 "in frames per second"
 msgstr ""
 
-#: src/resample.c:1723
+#: src/resample.c:1688
 msgid "OR enter the desired clip length in _seconds"
 msgstr ""
 
-#: src/resample.c:1745
+#: src/resample.c:1710
 msgid "Change the _audio speed as well"
 msgstr ""
 
-#: src/resample.c:1846
+#: src/resample.c:1810
 msgid ""
 "\n"
 "Speeding up the clip will cause missing frames in some multitrack layouts.\n"
 "Are you sure you wish to change the speed ?\n"
 msgstr ""
 
-#: src/resample.c:1863
+#: src/resample.c:1829
 msgid ""
 "\n"
 "Speeding up the clip will cause missing audio in some multitrack layouts.\n"
 "Are you sure you wish to change the speed ?\n"
 msgstr ""
 
-#: src/resample.c:1878
+#: src/resample.c:1847
 msgid ""
 "\n"
 "Changing the speed will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/resample.c:1892
+#: src/resample.c:1863
 msgid ""
 "\n"
 "Changing the speed will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/resample.c:1938
+#: src/resample.c:1911
 msgid "Speed Change"
 msgstr ""
 
-#: src/resample.c:1947
+#: src/resample.c:1920
 #, c-format
 msgid "Changed playback speed to %.3f frames per second and audio to %d Hz.\n"
 msgstr ""
 
-#: src/resample.c:1950
+#: src/resample.c:1922
 #, c-format
 msgid "Changed playback speed to %.3f frames per second.\n"
 msgstr ""
 
-#: src/resample.c:2035
+#: src/resample.c:2006
 msgid "Resampling video"
 msgstr ""
 
-#: src/resample.c:2042 src/resample.c:2160 src/resample.c:2182
+#: src/resample.c:2012 src/resample.c:2127 src/resample.c:2148
 msgid "Resampling clipboard video"
 msgstr ""
 
-#: src/resample.c:2047
+#: src/resample.c:2016
 msgid "Reordering frames"
 msgstr ""
 
-#: src/resample.c:2056
+#: src/resample.c:2025
 msgid ""
 "\n"
 "\n"
 "LiVES was unable to reorder the frames."
 msgstr ""
 
-#: src/resample.c:2104
+#: src/resample.c:2071
 msgid "Deordering frames"
 msgstr ""
 
-#: src/resample.c:2199
+#: src/resample.c:2165
 msgid "resampling error..."
 msgstr ""
 
-#: src/rte_window.c:85 src/rte_window.c:1708
+#: src/rte_window.c:124 src/rte_window.c:1709
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
-#: src/rte_window.c:112
+#: src/rte_window.c:150
 msgid ""
 "\n"
 "\n"
@@ -7893,7 +7906,7 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:426
+#: src/rte_window.c:460
 msgid ""
 "\n"
 "\n"
@@ -7901,19 +7914,19 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:432
+#: src/rte_window.c:466
 #, c-format
 msgid "Saving keymap to %s\n"
 msgstr ""
 
-#: src/rte_window.c:439
+#: src/rte_window.c:471
 #, c-format
 msgid ""
 "\n"
 "Updating keymap file %s..."
 msgstr ""
 
-#: src/rte_window.c:446
+#: src/rte_window.c:477
 #, c-format
 msgid ""
 "\n"
@@ -7923,12 +7936,12 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/rte_window.c:526
+#: src/rte_window.c:556
 #, c-format
 msgid "Saving real time effect defaults to %s..."
 msgstr ""
 
-#: src/rte_window.c:535
+#: src/rte_window.c:563
 #, c-format
 msgid ""
 "\n"
@@ -7938,22 +7951,22 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/rte_window.c:632
+#: src/rte_window.c:657
 #, c-format
 msgid "Loading real time effect defaults from %s..."
 msgstr ""
 
-#: src/rte_window.c:681
+#: src/rte_window.c:701
 #, c-format
 msgid "Loading generator default sizes from %s..."
 msgstr ""
 
-#: src/rte_window.c:1306
+#: src/rte_window.c:1319
 #, c-format
 msgid "Loading default keymap from %s..."
 msgstr ""
 
-#: src/rte_window.c:1329
+#: src/rte_window.c:1339
 #, c-format
 msgid ""
 "\n"
@@ -7963,48 +7976,48 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/rte_window.c:1403
+#: src/rte_window.c:1412
 #, c-format
 msgid "Invalid line %d in %s\n"
 msgstr ""
 
-#: src/rte_window.c:1483
+#: src/rte_window.c:1490
 #, c-format
 msgid "Invalid key %d in %s\n"
 msgstr ""
 
-#: src/rte_window.c:1498
+#: src/rte_window.c:1505
 #, c-format
 msgid "Invalid effect %s in %s\n"
 msgstr ""
 
-#: src/rte_window.c:1517
+#: src/rte_window.c:1524
 #, c-format
 msgid "Unknown effect %s in %s\n"
 msgstr ""
 
-#: src/rte_window.c:1535
+#: src/rte_window.c:1542
 #, c-format
 msgid ""
 "This version of LiVES cannot mix generators/non-generators on the same key "
 "(%d) !\n"
 msgstr ""
 
-#: src/rte_window.c:1547
+#: src/rte_window.c:1554
 #, c-format
 msgid "Too many effects bound to key %d.\n"
 msgstr ""
 
-#: src/rte_window.c:1587
+#: src/rte_window.c:1593
 msgid "update required.\n"
 msgstr ""
 
-#: src/rte_window.c:1603
+#: src/rte_window.c:1607
 #, c-format
 msgid "Loading data connection map from %s..."
 msgstr ""
 
-#: src/rte_window.c:1612
+#: src/rte_window.c:1614
 msgid ""
 "\n"
 "\n"
@@ -8012,41 +8025,41 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:1691
+#: src/rte_window.c:1692
 #, c-format
 msgid "LiVES: Information for %s"
 msgstr ""
 
-#: src/rte_window.c:1704
+#: src/rte_window.c:1705
 #, c-format
 msgid "Effect name: %s"
 msgstr ""
 
-#: src/rte_window.c:1712
+#: src/rte_window.c:1713
 #, c-format
 msgid "Plugin name: %s"
 msgstr ""
 
-#: src/rte_window.c:1716
+#: src/rte_window.c:1717
 #, c-format
 msgid "Author: %s"
 msgstr ""
 
-#: src/rte_window.c:1721
+#: src/rte_window.c:1722
 #, c-format
 msgid "and: %s"
 msgstr ""
 
-#: src/rte_window.c:1726
+#: src/rte_window.c:1727
 #, c-format
 msgid "Version: %d"
 msgstr ""
 
-#: src/rte_window.c:1734
+#: src/rte_window.c:1735
 msgid "Description: "
 msgstr ""
 
-#: src/rte_window.c:1960
+#: src/rte_window.c:1963
 msgid ""
 "\n"
 "\n"
@@ -8055,69 +8068,69 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:2024
+#: src/rte_window.c:2027
 #, c-format
 msgid "LiVES could not locate the effect %s.\n"
 msgstr ""
 
-#: src/rte_window.c:2225
+#: src/rte_window.c:2216
 msgid "LiVES: Real time effect mapping"
 msgstr ""
 
-#: src/rte_window.c:2257
+#: src/rte_window.c:2248
 #, c-format
 msgid "Ctrl-%d"
 msgstr ""
 
-#: src/rte_window.c:2264
+#: src/rte_window.c:2255
 msgid "Key active"
 msgstr ""
 
-#: src/rte_window.c:2279
+#: src/rte_window.c:2271
 msgid "Key grab"
 msgstr ""
 
-#: src/rte_window.c:2280
+#: src/rte_window.c:2272
 msgid "Grab keyboard for this effect key"
 msgstr ""
 
-#: src/rte_window.c:2290
+#: src/rte_window.c:2283
 msgid "_Clear all effects"
 msgstr ""
 
-#: src/rte_window.c:2304
+#: src/rte_window.c:2297
 msgid "Mode active"
 msgstr ""
 
-#: src/rte_window.c:2314 src/multitrack.c:8568
+#: src/rte_window.c:2307 src/multitrack.c:8762
 msgid "Info"
 msgstr ""
 
-#: src/rte_window.c:2315
+#: src/rte_window.c:2308
 msgid "Set Parameters"
 msgstr ""
 
-#: src/rte_window.c:2316
+#: src/rte_window.c:2309
 msgid "Set Connections"
 msgstr ""
 
-#: src/rte_window.c:2317
+#: src/rte_window.c:2310
 msgid "Clear"
 msgstr ""
 
-#: src/rte_window.c:2326
+#: src/rte_window.c:2319
 msgid "Effect name:"
 msgstr ""
 
-#: src/rte_window.c:2391
+#: src/rte_window.c:2384
 msgid "_Save as default keymap"
 msgstr ""
 
-#: src/rte_window.c:2396
+#: src/rte_window.c:2389
 msgid "_Load default keymap"
 msgstr ""
 
-#: src/rte_window.c:2840
+#: src/rte_window.c:2833
 #, c-format
 msgid ""
 "Unable to create default keymap file: %s\n"
@@ -8175,86 +8188,86 @@
 msgid "none\n"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:494
+#: src/lives-yuv4mpeg.c:493
 #, c-format
 msgid ""
 "Unable to set display framerate to %.3f fps.\n"
 "\n"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:503
+#: src/lives-yuv4mpeg.c:502
 #, c-format
 msgid "Unable to open yuv4mpeg out stream %s\n"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:628
+#: src/lives-yuv4mpeg.c:626
 #, c-format
 msgid "TV card %d"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:713
+#: src/lives-yuv4mpeg.c:710
 #, c-format
 msgid "Opened TV card %d (%s)"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:760
+#: src/lives-yuv4mpeg.c:757
 #, c-format
 msgid "Firewire card %d"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:796
+#: src/lives-yuv4mpeg.c:793
 #, c-format
 msgid "Opened firewire card %d"
 msgstr ""
 
-#: src/multitrack.c:666
+#: src/multitrack.c:736
 msgid "Auto backup"
 msgstr ""
 
-#: src/multitrack.c:868
+#: src/multitrack.c:935
 msgid "Backing audio"
 msgstr ""
 
-#: src/multitrack.c:1435
+#: src/multitrack.c:1515
 #, c-format
 msgid "%s : parameters for %s"
 msgstr ""
 
-#: src/multitrack.c:1809 src/multitrack.c:3483
+#: src/multitrack.c:1881 src/multitrack.c:3635
 #, c-format
 msgid "Current track: %s (layer %d)\n"
 msgstr ""
 
-#: src/multitrack.c:1813 src/multitrack.c:3484
+#: src/multitrack.c:1885 src/multitrack.c:3637
 msgid "Current track: Backing audio\n"
 msgstr ""
 
-#: src/multitrack.c:1814
+#: src/multitrack.c:1886
 #, c-format
 msgid "Current track: Layer %d audio\n"
 msgstr ""
 
-#: src/multitrack.c:1817
+#: src/multitrack.c:1889
 #, c-format
 msgid "%.2f sec.\n"
 msgstr ""
 
-#: src/multitrack.c:1822 src/multitrack.c:3490
+#: src/multitrack.c:1894 src/multitrack.c:3643
 #, c-format
 msgid "Source: %s"
 msgstr ""
 
-#: src/multitrack.c:1825 src/multitrack.c:3492
+#: src/multitrack.c:1897 src/multitrack.c:3645
 msgid "Right click for context menu.\n"
 msgstr ""
 
-#: src/multitrack.c:1827
+#: src/multitrack.c:1899
 msgid ""
 "Double click on a block\n"
 "to select it."
 msgstr ""
 
-#: src/multitrack.c:3312
+#: src/multitrack.c:3452
 msgid ""
 "\n"
 "\n"
@@ -8263,7 +8276,7 @@
 "right or double clicking on it.\n"
 msgstr ""
 
-#: src/multitrack.c:3315
+#: src/multitrack.c:3455
 msgid ""
 "\n"
 "\n"
@@ -8271,14 +8284,14 @@
 "Select an effect in FX stack first to view its parameters.\n"
 msgstr ""
 
-#: src/multitrack.c:3318
+#: src/multitrack.c:3458
 msgid ""
 "\n"
 "\n"
 "No clips loaded.\n"
 msgstr ""
 
-#: src/multitrack.c:3321
+#: src/multitrack.c:3462
 msgid ""
 "You must select two video tracks\n"
 "and a time region\n"
@@ -8288,7 +8301,7 @@
 "before inserting clips into the timeline."
 msgstr ""
 
-#: src/multitrack.c:3324
+#: src/multitrack.c:3465
 msgid ""
 "\n"
 "\n"
@@ -8297,210 +8310,210 @@
 "to apply compositors.\n"
 msgstr ""
 
-#: src/multitrack.c:3487
+#: src/multitrack.c:3640
 #, c-format
 msgid "%.2f sec. to %.2f sec.\n"
 msgstr ""
 
-#: src/multitrack.c:3493
+#: src/multitrack.c:3646
 msgid ""
 "Single click on timeline\n"
 "to select a frame.\n"
 msgstr ""
 
-#: src/multitrack.c:3711 src/multitrack.c:6790
+#: src/multitrack.c:3858 src/multitrack.c:6972
 #, c-format
 msgid "%s [unstable]"
 msgstr ""
 
-#: src/multitrack.c:3822
+#: src/multitrack.c:3973
 msgid ""
 "You can click and drag\n"
 "below the timeline"
 msgstr ""
 
-#: src/multitrack.c:3823
+#: src/multitrack.c:3974
 msgid "to select a time region.\n"
 msgstr ""
 
-#: src/multitrack.c:3985
+#: src/multitrack.c:4137
 msgid "LiVES: Selected clip"
 msgstr ""
 
-#: src/multitrack.c:3993
+#: src/multitrack.c:4145
 msgid "_Adjust start and end points"
 msgstr ""
 
-#: src/multitrack.c:4002
+#: src/multitrack.c:4154
 msgid "_Edit/encode in clip editor"
 msgstr ""
 
-#: src/multitrack.c:4009
+#: src/multitrack.c:4161
 msgid "_Show clip information"
 msgstr ""
 
-#: src/multitrack.c:4016
+#: src/multitrack.c:4168
 msgid "_Close this clip"
 msgstr ""
 
-#: src/multitrack.c:4236
+#: src/multitrack.c:4388
 msgid "Audio mixer (ctrl-m)"
 msgstr ""
 
-#: src/multitrack.c:4336
+#: src/multitrack.c:4488
 msgid "Single click on timeline"
 msgstr ""
 
-#: src/multitrack.c:4337
+#: src/multitrack.c:4489
 msgid "to select a frame."
 msgstr ""
 
-#: src/multitrack.c:4338
+#: src/multitrack.c:4490
 msgid "Double click or right click on timeline"
 msgstr ""
 
-#: src/multitrack.c:4339
+#: src/multitrack.c:4491
 msgid "to select a block."
 msgstr ""
 
-#: src/multitrack.c:4340
+#: src/multitrack.c:4492
 msgid "Clips can be dragged"
 msgstr ""
 
-#: src/multitrack.c:4341
+#: src/multitrack.c:4493
 msgid "onto the timeline."
 msgstr ""
 
-#: src/multitrack.c:4343
+#: src/multitrack.c:4495
 msgid "Mouse mode is: Move"
 msgstr ""
 
-#: src/multitrack.c:4344
+#: src/multitrack.c:4496
 msgid "clips can be moved around."
 msgstr ""
 
-#: src/multitrack.c:4349
+#: src/multitrack.c:4500
 msgid "Mouse mode is: Select."
 msgstr ""
 
-#: src/multitrack.c:4350
+#: src/multitrack.c:4501
 msgid "Drag with mouse on timeline"
 msgstr ""
 
-#: src/multitrack.c:4351
+#: src/multitrack.c:4502
 msgid "to select tracks and time."
 msgstr ""
 
-#: src/multitrack.c:4362
+#: src/multitrack.c:4509
 msgid "_Insert mode: Normal"
 msgstr ""
 
-#: src/multitrack.c:4378
+#: src/multitrack.c:4537
 msgid "_Mouse mode: Move"
 msgstr ""
 
-#: src/multitrack.c:4382
+#: src/multitrack.c:4540
 msgid "_Mouse mode: Select"
 msgstr ""
 
-#: src/multitrack.c:4405 src/multitrack.c:7925
+#: src/multitrack.c:4563 src/multitrack.c:8104
 msgid "Gravity: Normal"
 msgstr ""
 
-#: src/multitrack.c:4409
+#: src/multitrack.c:4565
 msgid "Gravity: Left"
 msgstr ""
 
-#: src/multitrack.c:4414
+#: src/multitrack.c:4569
 msgid "Gravity: Right"
 msgstr ""
 
-#: src/multitrack.c:4416
+#: src/multitrack.c:4570
 msgid "Close _last gap(s) in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:4419
+#: src/multitrack.c:4572
 msgid "Close _first gap(s) in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:4458
+#: src/multitrack.c:4627
 msgid "Close gaps"
 msgstr ""
 
-#: src/multitrack.c:4460
+#: src/multitrack.c:4629
 msgid "Move block"
 msgstr ""
 
-#: src/multitrack.c:4462
+#: src/multitrack.c:4631
 msgid "Move audio block"
 msgstr ""
 
-#: src/multitrack.c:4464
+#: src/multitrack.c:4633
 msgid "Delete block"
 msgstr ""
 
-#: src/multitrack.c:4466
+#: src/multitrack.c:4635
 msgid "Delete audio block"
 msgstr ""
 
-#: src/multitrack.c:4468
+#: src/multitrack.c:4637
 msgid "Split tracks"
 msgstr ""
 
-#: src/multitrack.c:4470
+#: src/multitrack.c:4639
 msgid "Split block"
 msgstr ""
 
-#: src/multitrack.c:4473
+#: src/multitrack.c:4642
 #, c-format
 msgid "Apply %s"
 msgstr ""
 
-#: src/multitrack.c:4478
+#: src/multitrack.c:4647
 #, c-format
 msgid "Delete %s"
 msgstr ""
 
-#: src/multitrack.c:4482
+#: src/multitrack.c:4651
 msgid "Insert block"
 msgstr ""
 
-#: src/multitrack.c:4484
+#: src/multitrack.c:4653
 msgid "Insert gap"
 msgstr ""
 
-#: src/multitrack.c:4486
+#: src/multitrack.c:4655
 msgid "Insert audio block"
 msgstr ""
 
-#: src/multitrack.c:4488
+#: src/multitrack.c:4657
 msgid "Effect order change"
 msgstr ""
 
-#: src/multitrack.c:4898
+#: src/multitrack.c:5064
 msgid "unsigned "
 msgstr ""
 
-#: src/multitrack.c:4899
+#: src/multitrack.c:5065
 msgid "signed "
 msgstr ""
 
-#: src/multitrack.c:4904
+#: src/multitrack.c:5071
 #, c-format
 msgid ""
 "Multitrack values set to %.3f fps, frame size %d x %d, audio channels %d, "
 "audio rate %d, audio sample size %d, %s.\n"
 msgstr ""
 
-#: src/multitrack.c:4938
+#: src/multitrack.c:5104
 msgid "invalid event list. Failed.\n"
 msgstr ""
 
-#: src/multitrack.c:4944
+#: src/multitrack.c:5110
 msgid "event list has invalid fps. Failed.\n"
 msgstr ""
 
-#: src/multitrack.c:4953
+#: src/multitrack.c:5122
 #, c-format
 msgid ""
 "\n"
@@ -8510,7 +8523,7 @@
 "then load in the new set from the File menu.\n"
 msgstr ""
 
-#: src/multitrack.c:4993
+#: src/multitrack.c:5163
 #, c-format
 msgid ""
 "\n"
@@ -8518,600 +8531,592 @@
 "It cannot be loaded.\n"
 msgstr ""
 
-#: src/multitrack.c:5329 src/multitrack.c:5338 src/multitrack.c:21133
+#: src/multitrack.c:5452
 msgid "Layout was wiped.\n"
 msgstr ""
 
-#: src/multitrack.c:5374
+#: src/multitrack.c:5547
 #, c-format
 msgid "LiVES-%s: Multitrack %dx%d : %d bpp %.3f fps"
 msgstr ""
 
-#: src/multitrack.c:5617
+#: src/multitrack.c:5793
 msgid "In/out"
 msgstr ""
 
-#: src/multitrack.c:5619
+#: src/multitrack.c:5795
 msgid "FX stack"
 msgstr ""
 
-#: src/multitrack.c:5627 src/omc-learn.c:673
+#: src/multitrack.c:5803 src/omc-learn.c:659
 msgid "Params."
 msgstr ""
 
-#: src/multitrack.c:5978
+#: src/multitrack.c:6157
 msgid "_Open..."
 msgstr ""
 
-#: src/multitrack.c:5996
+#: src/multitrack.c:6175
 msgid "O_pen File Selection..."
 msgstr ""
 
-#: src/multitrack.c:6040
+#: src/multitrack.c:6219
 msgid "Import Selection from _dvd/vcd..."
 msgstr ""
 
-#: src/multitrack.c:6050
+#: src/multitrack.c:6229
 msgid "Import Selection from _dvd"
 msgstr ""
 
-#: src/multitrack.c:6060
+#: src/multitrack.c:6239
 msgid "Import Selection from _vcd"
 msgstr ""
 
-#: src/multitrack.c:6076
+#: src/multitrack.c:6255
 msgid "_Import from Device"
 msgstr ""
 
-#: src/multitrack.c:6103
+#: src/multitrack.c:6282
 msgid "_Close the selected clip"
 msgstr ""
 
-#: src/multitrack.c:6198
+#: src/multitrack.c:6377
 msgid "_Save layout as..."
 msgstr ""
 
-#: src/multitrack.c:6206
+#: src/multitrack.c:6385
 msgid "_Load layout..."
 msgstr ""
 
-#: src/multitrack.c:6210
+#: src/multitrack.c:6389
 msgid "_Wipe/Delete layout..."
 msgstr ""
 
-#: src/multitrack.c:6236
+#: src/multitrack.c:6415
 msgid "_Ignore width, height and audio values from loaded layouts"
 msgstr ""
 
-#: src/multitrack.c:6240
+#: src/multitrack.c:6419
 msgid "Auto load _subtitles with clips"
 msgstr ""
 
-#: src/multitrack.c:6322
+#: src/multitrack.c:6501
 msgid "_CLIP EDITOR"
 msgstr ""
 
-#: src/multitrack.c:6334
+#: src/multitrack.c:6513
 msgid "_Adjust selected clip start/end points"
 msgstr ""
 
-#: src/multitrack.c:6343
+#: src/multitrack.c:6522
 msgid "_Insert selected clip"
 msgstr ""
 
-#: src/multitrack.c:6355
+#: src/multitrack.c:6534
 msgid "_Insert selected clip audio"
 msgstr ""
 
-#: src/multitrack.c:6364
+#: src/multitrack.c:6543
 msgid "_Delete selected block"
 msgstr ""
 
-#: src/multitrack.c:6373
+#: src/multitrack.c:6555
 msgid "_Jump to previous block boundary"
 msgstr ""
 
-#: src/multitrack.c:6382
+#: src/multitrack.c:6564
 msgid "_Jump to next block boundary"
 msgstr ""
 
-#: src/multitrack.c:6395
+#: src/multitrack.c:6577
 msgid "Clear _marks from timeline"
 msgstr ""
 
-#: src/multitrack.c:6403
+#: src/multitrack.c:6585
 msgid "Ignore selection limits when inserting"
 msgstr ""
 
-#: src/multitrack.c:6420 src/multitrack.c:16719
+#: src/multitrack.c:6602 src/multitrack.c:17009
 msgid "_Play from Timeline Position"
 msgstr ""
 
-#: src/multitrack.c:6434
+#: src/multitrack.c:6616
 msgid "Pla_y selected time only"
 msgstr ""
 
-#: src/multitrack.c:6518
+#: src/multitrack.c:6700
 msgid "_Move effects with blocks"
 msgstr ""
 
-#: src/multitrack.c:6531
+#: src/multitrack.c:6713
 msgid "Select _autotransition effect..."
 msgstr ""
 
-#: src/multitrack.c:6542
+#: src/multitrack.c:6724
 msgid "Crossfade audio with autotransition"
 msgstr ""
 
-#: src/multitrack.c:6550
+#: src/multitrack.c:6732
 msgid "View/_Edit selected effect"
 msgstr ""
 
-#: src/multitrack.c:6554
+#: src/multitrack.c:6736
 msgid "_Delete selected effect"
 msgstr ""
 
-#: src/multitrack.c:6562
+#: src/multitrack.c:6744
 msgid "Apply effect to _block..."
 msgstr ""
 
-#: src/multitrack.c:6619
+#: src/multitrack.c:6801
 msgid "Apply effect to _region..."
 msgstr ""
 
-#: src/multitrack.c:6885
+#: src/multitrack.c:7061
 msgid "_Tracks"
 msgstr ""
 
-#: src/multitrack.c:6896
+#: src/multitrack.c:7072
 msgid "Rename current track"
 msgstr ""
 
-#: src/multitrack.c:6904
+#: src/multitrack.c:7080
 msgid "Make _Backing Audio current track"
 msgstr ""
 
-#: src/multitrack.c:6915
+#: src/multitrack.c:7091
 msgid "Add Video Track at _Rear"
 msgstr ""
 
-#: src/multitrack.c:6923
+#: src/multitrack.c:7099
 msgid "Add Video Track at _Front"
 msgstr ""
 
-#: src/multitrack.c:6936
+#: src/multitrack.c:7112
 msgid "_Split current track at cursor"
 msgstr ""
 
-#: src/multitrack.c:6948
+#: src/multitrack.c:7124
 msgid "_Split selected video tracks"
 msgstr ""
 
-#: src/multitrack.c:6961
+#: src/multitrack.c:7137
 msgid "Insert gap in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:6969
+#: src/multitrack.c:7145
 msgid "Insert gap in current track/selected time"
 msgstr ""
 
-#: src/multitrack.c:6981
+#: src/multitrack.c:7157
 msgid "Close all _gaps in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:7007
+#: src/multitrack.c:7183
 msgid "Se_lection"
 msgstr ""
 
-#: src/multitrack.c:7018
+#: src/multitrack.c:7194
 msgid "_Select Current Track"
 msgstr ""
 
-#: src/multitrack.c:7025
+#: src/multitrack.c:7201
 msgid "Select _all video tracks"
 msgstr ""
 
-#: src/multitrack.c:7032
+#: src/multitrack.c:7208
 msgid "Select _no video tracks"
 msgstr ""
 
-#: src/multitrack.c:7039
+#: src/multitrack.c:7215
 msgid "Select all _time"
 msgstr ""
 
-#: src/multitrack.c:7050
+#: src/multitrack.c:7226
 msgid "Select from _zero time"
 msgstr ""
 
-#: src/multitrack.c:7057
+#: src/multitrack.c:7233
 msgid "Select to _end time"
 msgstr ""
 
-#: src/multitrack.c:7064
+#: src/multitrack.c:7240
 msgid "_Copy..."
 msgstr ""
 
-#: src/multitrack.c:7075
+#: src/multitrack.c:7251
 msgid "_Timecode to region start"
 msgstr ""
 
-#: src/multitrack.c:7082
+#: src/multitrack.c:7258
 msgid "_Timecode to region end"
 msgstr ""
 
-#: src/multitrack.c:7089
+#: src/multitrack.c:7265
 msgid "_Region start to timecode"
 msgstr ""
 
-#: src/multitrack.c:7096
+#: src/multitrack.c:7272
 msgid "_Region end to timecode"
 msgstr ""
 
-#: src/multitrack.c:7110
+#: src/multitrack.c:7286
 msgid "Select/deselect block at current track/time"
 msgstr ""
 
-#: src/multitrack.c:7135
+#: src/multitrack.c:7311
 msgid "_Change width, height and audio values..."
 msgstr ""
 
-#: src/multitrack.c:7194
+#: src/multitrack.c:7370
 msgid "_Render"
 msgstr ""
 
-#: src/multitrack.c:7205
+#: src/multitrack.c:7381
 msgid "_Render all to new clip"
 msgstr ""
 
-#: src/multitrack.c:7220
+#: src/multitrack.c:7396
 msgid "Render _video"
 msgstr ""
 
-#: src/multitrack.c:7225
+#: src/multitrack.c:7401
 msgid "Render _audio"
 msgstr ""
 
-#: src/multitrack.c:7235
+#: src/multitrack.c:7411
 msgid "_Normalise rendered audio"
 msgstr ""
 
-#: src/multitrack.c:7242
+#: src/multitrack.c:7418
 msgid "_Pre-render audio"
 msgstr ""
 
-#: src/multitrack.c:7251
+#: src/multitrack.c:7427
 msgid "_View"
 msgstr ""
 
-#: src/multitrack.c:7270
+#: src/multitrack.c:7446
 msgid "Block _In/out points"
 msgstr ""
 
-#: src/multitrack.c:7279
+#: src/multitrack.c:7455
 msgid "_Effects at current"
 msgstr ""
 
-#: src/multitrack.c:7297
+#: src/multitrack.c:7473
 msgid "Audio parameters"
 msgstr ""
 
-#: src/multitrack.c:7308
+#: src/multitrack.c:7484
 msgid "Show backing _audio track"
 msgstr ""
 
-#: src/multitrack.c:7312
+#: src/multitrack.c:7488
 msgid "Compact view"
 msgstr ""
 
-#: src/multitrack.c:7320
+#: src/multitrack.c:7496
 msgid "Maximum tracks to display..."
 msgstr ""
 
-#: src/multitrack.c:7327
+#: src/multitrack.c:7503
 msgid "Scroll to follow playback"
 msgstr ""
 
-#: src/multitrack.c:7331
+#: src/multitrack.c:7507
 msgid "_Center on cursor"
 msgstr ""
 
-#: src/multitrack.c:7338
+#: src/multitrack.c:7514
 msgid "_Zoom in"
 msgstr ""
 
-#: src/multitrack.c:7349
+#: src/multitrack.c:7525
 msgid "_Zoom out"
 msgstr ""
 
-#: src/multitrack.c:7361
+#: src/multitrack.c:7537
 msgid "Multitrack _details"
 msgstr ""
 
-#: src/multitrack.c:7374
+#: src/multitrack.c:7550
 msgid "_Event Window"
 msgstr ""
 
-#: src/multitrack.c:7378
+#: src/multitrack.c:7554
 msgid "_Event Window (selected time only)"
 msgstr ""
 
-#: src/multitrack.c:7382
+#: src/multitrack.c:7558
 msgid "_Show FRAME events"
 msgstr ""
 
-#: src/multitrack.c:7399
+#: src/multitrack.c:7575
 msgid "_Show multitrack keys"
 msgstr ""
 
-#: src/multitrack.c:7468
+#: src/multitrack.c:7644
 msgid "Mouse mode: _Move"
 msgstr ""
 
-#: src/multitrack.c:7476
+#: src/multitrack.c:7652
 msgid "Mouse mode: _Select"
 msgstr ""
 
-#: src/multitrack.c:7505
+#: src/multitrack.c:7681
 msgid "Insert mode: _Normal"
 msgstr ""
 
-#: src/multitrack.c:7733
+#: src/multitrack.c:7909
 msgid "Insert with _audio"
 msgstr ""
 
-#: src/multitrack.c:7734
+#: src/multitrack.c:7910
 msgid ""
 "Select whether video clips are inserted and moved with their audio or not"
 msgstr ""
 
-#: src/multitrack.c:7829
+#: src/multitrack.c:8007
 msgid "Select _overlap"
 msgstr ""
 
-#: src/multitrack.c:7830
+#: src/multitrack.c:8008
 msgid ""
 "Select whether timeline selection snaps to overlap between selected tracks "
 "or not"
 msgstr ""
 
-#: src/multitrack.c:7894 src/multitrack.c:14198
+#: src/multitrack.c:8073 src/multitrack.c:14422
 msgid "Expanded View (d)"
 msgstr ""
 
-#: src/multitrack.c:7897 src/multitrack.c:14205
+#: src/multitrack.c:8076 src/multitrack.c:14428
 msgid "Compact View (d)"
 msgstr ""
 
-#: src/multitrack.c:7939
+#: src/multitrack.c:8118
 msgid "Gravity: _Normal"
 msgstr ""
 
-#: src/multitrack.c:7952
+#: src/multitrack.c:8131
 msgid "Gravity: _Left"
 msgstr ""
 
-#: src/multitrack.c:7967
+#: src/multitrack.c:8146
 msgid "Gravity: _Right"
 msgstr ""
 
-#: src/multitrack.c:8297
+#: src/multitrack.c:8496
 msgid "_Apply"
 msgstr ""
 
-#: src/multitrack.c:8319
+#: src/multitrack.c:8518
 msgid "Time"
 msgstr ""
 
-#: src/multitrack.c:8333
+#: src/multitrack.c:8532
 msgid "_Del. node"
 msgstr ""
 
-#: src/multitrack.c:8341
+#: src/multitrack.c:8540
 msgid "_Next node"
 msgstr ""
 
-#: src/multitrack.c:8349
+#: src/multitrack.c:8548
 msgid "_Prev node"
 msgstr ""
 
-#: src/multitrack.c:8373
+#: src/multitrack.c:8574
 msgid "_Reverse playback  "
 msgstr ""
 
-#: src/multitrack.c:8395
+#: src/multitrack.c:8596
 msgid "_Velocity  "
 msgstr ""
 
-#: src/multitrack.c:8464
+#: src/multitrack.c:8664
 msgid "Anchor _start"
 msgstr ""
 
-#: src/multitrack.c:8465
+#: src/multitrack.c:8665
 msgid "Anchor the start point to the timeline"
 msgstr ""
 
-#: src/multitrack.c:8481
-msgid "Start frame"
-msgstr ""
-
-#: src/multitrack.c:8533
+#: src/multitrack.c:8728
 msgid "Anchor _end"
 msgstr ""
 
-#: src/multitrack.c:8534
+#: src/multitrack.c:8729
 msgid "Anchor the end point to the timeline"
 msgstr ""
 
-#: src/multitrack.c:8546
-msgid "End frame"
-msgstr ""
-
-#: src/multitrack.c:8739
+#: src/multitrack.c:8929
 msgid "Scroll"
 msgstr ""
 
-#: src/multitrack.c:9316
+#: src/multitrack.c:9502
 msgid ""
 "\n"
 "==============================\n"
 "Switched to Clip Edit mode\n"
 msgstr ""
 
-#: src/multitrack.c:9502
+#: src/multitrack.c:9708
 msgid "Timeline (seconds)"
 msgstr ""
 
-#: src/multitrack.c:9984
+#: src/multitrack.c:10202
 msgid " Backing audio"
 msgstr ""
 
-#: src/multitrack.c:9987
+#: src/multitrack.c:10204
 #, c-format
 msgid " Layer %d audio"
 msgstr ""
 
-#: src/multitrack.c:9995
+#: src/multitrack.c:10212
 msgid "Show/hide audio details"
 msgstr ""
 
-#: src/multitrack.c:10010 src/multitrack.c:10232
+#: src/multitrack.c:10227 src/multitrack.c:10452
 #, c-format
 msgid "Layer %d audio"
 msgstr ""
 
-#: src/multitrack.c:10144 src/multitrack.c:10261
+#: src/multitrack.c:10353 src/multitrack.c:10481
 #, c-format
 msgid "%s (layer %d)"
 msgstr ""
 
-#: src/multitrack.c:10184
+#: src/multitrack.c:10403
 msgid "Select track"
 msgstr ""
 
-#: src/multitrack.c:10188
+#: src/multitrack.c:10407
 msgid "Show/hide audio"
 msgstr ""
 
-#: src/multitrack.c:10194
+#: src/multitrack.c:10413
 #, c-format
 msgid "Video %d"
 msgstr ""
 
-#: src/multitrack.c:10233
+#: src/multitrack.c:10453
 #, c-format
 msgid " %s"
 msgstr ""
 
-#: src/multitrack.c:10346
+#: src/multitrack.c:10574
 msgid "LiVES: Selected effect"
 msgstr ""
 
-#: src/multitrack.c:10358
+#: src/multitrack.c:10586
 msgid "_View/Edit this effect"
 msgstr ""
 
-#: src/multitrack.c:10361
+#: src/multitrack.c:10588
 msgid "_View this effect"
 msgstr ""
 
-#: src/multitrack.c:10369
+#: src/multitrack.c:10596
 msgid "_Delete this effect"
 msgstr ""
 
-#: src/multitrack.c:10422
+#: src/multitrack.c:10648
 msgid "Cannot insert after this effect"
 msgstr ""
 
-#: src/multitrack.c:10451
+#: src/multitrack.c:10677
 msgid "This effect cannot be moved"
 msgstr ""
 
-#: src/multitrack.c:10499
+#: src/multitrack.c:10724
 #, c-format
 msgid "  %d to %d selected  "
 msgstr ""
 
-#: src/multitrack.c:10502 src/multitrack.c:10746
+#: src/multitrack.c:10727 src/multitrack.c:10968
 #, c-format
 msgid "%.2f sec."
 msgstr ""
 
-#: src/multitrack.c:10717
+#: src/multitrack.c:10940
 #, c-format
 msgid "%d frames"
 msgstr ""
 
-#: src/multitrack.c:11070
+#: src/multitrack.c:11299
 msgid ""
 "\n"
 "==============================\n"
 "Switched to Multitrack mode\n"
 msgstr ""
 
-#: src/multitrack.c:12691
+#: src/multitrack.c:12939
 msgid "Drag the time slider to where you"
 msgstr ""
 
-#: src/multitrack.c:12692
+#: src/multitrack.c:12940
 msgid "want to set effect parameters"
 msgstr ""
 
-#: src/multitrack.c:12693
+#: src/multitrack.c:12941
 msgid "Set parameters, then click \"Apply\"\n"
 msgstr ""
 
-#: src/multitrack.c:12694
+#: src/multitrack.c:12942
 msgid ""
 "NODES are points where parameters\n"
 "have been set.\n"
 "Nodes can be deleted."
 msgstr ""
 
-#: src/multitrack.c:12697
+#: src/multitrack.c:12944
 msgid "Effect has no parameters.\n"
 msgstr ""
 
-#: src/multitrack.c:12788
+#: src/multitrack.c:13033
 #, c-format
 msgid "%s output"
 msgstr ""
 
-#: src/multitrack.c:12794 src/multitrack.c:12804
+#: src/multitrack.c:13038 src/multitrack.c:13046
 #, c-format
 msgid "layer %d"
 msgstr ""
 
-#: src/multitrack.c:12796 src/multitrack.c:12806
+#: src/multitrack.c:13039 src/multitrack.c:13047
 msgid "audio track"
 msgstr ""
 
-#: src/multitrack.c:12797
+#: src/multitrack.c:13040
 #, c-format
 msgid "%s to %s"
 msgstr ""
 
-#: src/multitrack.c:12807
+#: src/multitrack.c:13048
 #, c-format
 msgid "%s from %s"
 msgstr ""
 
-#: src/multitrack.c:12860
+#: src/multitrack.c:13099
 msgid "_Prev filter map"
 msgstr ""
 
-#: src/multitrack.c:12871
+#: src/multitrack.c:13110
 msgid "Insert _before"
 msgstr ""
 
-#: src/multitrack.c:12881
+#: src/multitrack.c:13120
 msgid "Insert _after"
 msgstr ""
 
-#: src/multitrack.c:12896
+#: src/multitrack.c:13134
 msgid "_Next filter map"
 msgstr ""
 
-#: src/multitrack.c:12911
+#: src/multitrack.c:13148
 msgid ""
 "\n"
 "\n"
@@ -9119,272 +9124,272 @@
 "current time.\n"
 msgstr ""
 
-#: src/multitrack.c:12929
+#: src/multitrack.c:13166
 msgid ""
 "Drag a compositor anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:12936
+#: src/multitrack.c:13173
 msgid ""
 "Drag a transition anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:12944
+#: src/multitrack.c:13181
 msgid ""
 "Effects can be dragged\n"
 "onto blocks on the timeline."
 msgstr ""
 
-#: src/multitrack.c:13166
+#: src/multitrack.c:13406
 msgid "LiVES: Selected block/frame"
 msgstr ""
 
-#: src/multitrack.c:13173
+#: src/multitrack.c:13413
 msgid "_Select this block"
 msgstr ""
 
-#: src/multitrack.c:13183
+#: src/multitrack.c:13423
 msgid "_Split block here"
 msgstr ""
 
-#: src/multitrack.c:13191
+#: src/multitrack.c:13431
 msgid "List _effects here"
 msgstr ""
 
-#: src/multitrack.c:13200 src/multitrack.c:13277
+#: src/multitrack.c:13440 src/multitrack.c:13518
 #, c-format
 msgid "_Adjust %s"
 msgstr ""
 
-#: src/multitrack.c:13215
+#: src/multitrack.c:13455
 msgid "_Delete this block"
 msgstr ""
 
-#: src/multitrack.c:13258
+#: src/multitrack.c:13500
 msgid "_Insert here"
 msgstr ""
 
-#: src/multitrack.c:13264
+#: src/multitrack.c:13505
 msgid "_Insert audio here"
 msgstr ""
 
-#: src/multitrack.c:14801
+#: src/multitrack.c:15017
 #, c-format
 msgid "Inserted gap in selected tracks from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:14835
+#: src/multitrack.c:15048
 #, c-format
 msgid "Inserted gap in track %s from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15036
+#: src/multitrack.c:15244
 #, c-format
 msgid "Undid %s\n"
 msgstr ""
 
-#: src/multitrack.c:15235
+#: src/multitrack.c:15445
 #, c-format
 msgid "Redid %s\n"
 msgstr ""
 
-#: src/multitrack.c:15268
+#: src/multitrack.c:15475
 msgid ""
 "\n"
 " (variable)"
 msgstr ""
 
-#: src/multitrack.c:15502 src/multitrack.c:15614 src/multitrack.c:18736
-#: src/multitrack.c:18748
+#: src/multitrack.c:15710 src/multitrack.c:15823 src/multitrack.c:19077
+#: src/multitrack.c:19089
 #, c-format
 msgid "track %s"
 msgstr ""
 
-#: src/multitrack.c:15507 src/multitrack.c:15619 src/multitrack.c:18741
+#: src/multitrack.c:15715 src/multitrack.c:15828 src/multitrack.c:19082
 #, c-format
 msgid "tracks %s and %s"
 msgstr ""
 
-#: src/multitrack.c:15513 src/multitrack.c:15625 src/multitrack.c:18751
+#: src/multitrack.c:15721 src/multitrack.c:15834 src/multitrack.c:19091
 msgid "selected tracks"
 msgstr ""
 
-#: src/multitrack.c:15516
+#: src/multitrack.c:15726
 #, c-format
 msgid "Added %s %s to %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15550
+#: src/multitrack.c:15760
 #, c-format
 msgid "Added effect %s to track %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15631
+#: src/multitrack.c:15845
 #, c-format
 msgid "Deleted %s %s from %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15935
+#: src/multitrack.c:16143
 #, c-format
 msgid "rendered %d frames to new clip.\n"
 msgstr ""
 
-#: src/multitrack.c:16025
+#: src/multitrack.c:16230
 msgid "Cleaning up..."
 msgstr ""
 
-#: src/multitrack.c:16712
+#: src/multitrack.c:17003
 msgid "_Pause"
 msgstr ""
 
-#: src/multitrack.c:16713
+#: src/multitrack.c:17004
 msgid "Pause (p)"
 msgstr ""
 
-#: src/multitrack.c:16856
+#: src/multitrack.c:17151
 msgid "Press 'm' during playback"
 msgstr ""
 
-#: src/multitrack.c:16857
+#: src/multitrack.c:17152
 msgid "to make a mark on the timeline"
 msgstr ""
 
-#: src/multitrack.c:17154
+#: src/multitrack.c:17498
 #, c-format
 msgid ""
 "Inserted audio %.4f to %.4f from clip %s into backing audio from time %.4f "
 "to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:17414
+#: src/multitrack.c:17759
 #, c-format
 msgid ""
 "Inserted frames %d to %d from clip %s into track %s from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:17998
+#: src/multitrack.c:18332
 #, c-format
 msgid ""
 "Time region %.3f to %.3f\n"
 "selected.\n"
 msgstr ""
 
-#: src/multitrack.c:18002
+#: src/multitrack.c:18336
 msgid ""
 "select one or more tracks\n"
 "to create a region.\n"
 msgstr ""
 
-#: src/multitrack.c:18004
+#: src/multitrack.c:18337
 #, c-format
 msgid "%d video tracks selected.\n"
 msgstr ""
 
-#: src/multitrack.c:18006
+#: src/multitrack.c:18339
 msgid ""
 "Double click on timeline\n"
 "to deselect time region."
 msgstr ""
 
-#: src/multitrack.c:18013
+#: src/multitrack.c:18346
 msgid ""
 "Single click on an effect\n"
 "to select it."
 msgstr ""
 
-#: src/multitrack.c:18014
+#: src/multitrack.c:18347
 msgid ""
 "Double click on an effect\n"
 "to edit it."
 msgstr ""
 
-#: src/multitrack.c:18015
+#: src/multitrack.c:18348
 msgid ""
 "Right click on an effect\n"
 "for context menu.\n"
 msgstr ""
 
-#: src/multitrack.c:18017
+#: src/multitrack.c:18350
 msgid ""
 "Effect order can be changed at\n"
 "FILTER MAPS"
 msgstr ""
 
-#: src/multitrack.c:18024
+#: src/multitrack.c:18357
 msgid ""
 "You can select an effect,\n"
 "then use the INSERT BEFORE"
 msgstr ""
 
-#: src/multitrack.c:18025
+#: src/multitrack.c:18358
 msgid "or INSERT AFTER buttons to move it."
 msgstr ""
 
-#: src/multitrack.c:18307 src/multitrack.c:18320
+#: src/multitrack.c:18639 src/multitrack.c:18652
 msgid "Click on another effect,"
 msgstr ""
 
-#: src/multitrack.c:18308 src/multitrack.c:18321
+#: src/multitrack.c:18640 src/multitrack.c:18653
 msgid ""
 "and the selected one\n"
 "will be inserted"
 msgstr ""
 
-#: src/multitrack.c:18309
+#: src/multitrack.c:18641
 msgid "after it.\n"
 msgstr ""
 
-#: src/multitrack.c:18322
+#: src/multitrack.c:18654
 msgid "before it.\n"
 msgstr ""
 
-#: src/multitrack.c:18551
+#: src/multitrack.c:18889
 #, c-format
 msgid "Removed parameter values for effect %s at time %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:18759
+#: src/multitrack.c:19100
 #, c-format
 msgid "Set parameter values for %s %s on %s at time %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:19251 src/multitrack.c:20873
+#: src/multitrack.c:19630 src/multitrack.c:21195
 msgid "_Autoreload each time"
 msgstr ""
 
-#: src/multitrack.c:19323
+#: src/multitrack.c:19702
 #, fuzzy
 msgid "Saving layout"
 msgstr "_Salvaţi aspectul"
 
-#: src/multitrack.c:19345
+#: src/multitrack.c:19725
 #, c-format
 msgid "Saved layout to %s\n"
 msgstr ""
 
-#: src/multitrack.c:20783
+#: src/multitrack.c:21125
 msgid "clips and frames"
 msgstr ""
 
-#: src/multitrack.c:20787
+#: src/multitrack.c:21128
 msgid "clips"
 msgstr ""
 
-#: src/multitrack.c:20790
+#: src/multitrack.c:21130
 msgid "frames"
 msgstr ""
 
-#: src/multitrack.c:20800
+#: src/multitrack.c:21140
 msgid ""
 "\n"
 "Auto reload layout.\n"
 msgstr ""
 
-#: src/multitrack.c:20803
+#: src/multitrack.c:21143
 #, c-format
 msgid ""
 "%s\n"
@@ -9392,100 +9397,100 @@
 "Therefore it could not be loaded properly.\n"
 msgstr ""
 
-#: src/multitrack.c:20920
+#: src/multitrack.c:21284
 msgid "auto backup"
 msgstr ""
 
-#: src/multitrack.c:20923
+#: src/multitrack.c:21287
 #, c-format
 msgid ""
 "\n"
 "Unable to load layout file %s\n"
 msgstr ""
 
-#: src/multitrack.c:20944
+#: src/multitrack.c:21308
 #, c-format
 msgid "Loading layout from %s..."
 msgstr ""
 
-#: src/multitrack.c:20978
+#: src/multitrack.c:21338
 #, c-format
 msgid "Got %d events...processing..."
 msgstr ""
 
-#: src/multitrack.c:20991
+#: src/multitrack.c:21349
 msgid "Checking and rebuilding event list"
 msgstr ""
 
-#: src/multitrack.c:21017
+#: src/multitrack.c:21374
 #, c-format
 msgid "%d errors detected.\n"
 msgstr ""
 
-#: src/multitrack.c:21068
+#: src/multitrack.c:21422
 #, c-format
 msgid "Multitrack fps set to %.3f\n"
 msgstr ""
 
-#: src/multitrack.c:21225
+#: src/multitrack.c:21576
 msgid ""
 "The current layout has changes which have not been saved.\n"
 "Are you sure you wish to wipe it ?\n"
 msgstr ""
 
-#: src/multitrack.c:22047
+#: src/multitrack.c:22385
 msgid "LiVES: Multitrack audio mixer"
 msgstr ""
 
-#: src/multitrack.c:22077
+#: src/multitrack.c:22414
 msgid "_Reset values"
 msgstr ""
 
-#: src/multitrack.c:22081
+#: src/multitrack.c:22418
 msgid "_Close mixer"
 msgstr ""
 
-#: src/multitrack.c:22130
+#: src/multitrack.c:22466
 msgid ""
 "_Invert backing audio\n"
 "and layer volumes"
 msgstr ""
 
-#: src/multitrack.c:22132
+#: src/multitrack.c:22468
 msgid "Adjust backing and layer audio values so that they sum to 1.0"
 msgstr ""
 
-#: src/multitrack.c:22175
+#: src/multitrack.c:22510
 msgid "_Gang layer audio"
 msgstr ""
 
-#: src/multitrack.c:22177
+#: src/multitrack.c:22512
 msgid "Adjust all layer audio values to the same value"
 msgstr ""
 
-#: src/jack.c:104
+#: src/jack.c:102
 msgid "JACK server started\n"
 msgstr ""
 
-#: src/jack.c:1284 src/jack.c:1353
+#: src/jack.c:1265 src/jack.c:1334
 msgid "Unable to connect to JACK server\n"
 msgstr ""
 
-#: src/jack.c:1512
+#: src/jack.c:1491
 msgid "Started jack audio subsystem.\n"
 msgstr ""
 
-#: src/jack.c:1623
+#: src/jack.c:1600
 msgid "Started jack audio reader.\n"
 msgstr ""
 
-#: src/jack.c:1838
+#: src/jack.c:1815
 msgid ""
 "\n"
 "Connection to jack audio was reset.\n"
 msgstr ""
 
-#: src/pulse.c:87
+#: src/pulse.c:88
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -9493,7 +9498,7 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:92
+#: src/pulse.c:94
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -9501,7 +9506,7 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:96
+#: src/pulse.c:99
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -9509,335 +9514,335 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:101
+#: src/pulse.c:104
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
 msgstr ""
 
-#: src/pulse.c:107
+#: src/pulse.c:109
 msgid "LiVES will exit and you can choose another audio player.\n"
 msgstr ""
 
-#: src/pulse.c:1352
+#: src/pulse.c:1335
 msgid ""
 "\n"
 "Connection to pulse audio was reset.\n"
 msgstr ""
 
-#: src/colourspace.c:1100
+#: src/colourspace.c:1092
 msgid "unclamped"
 msgstr ""
 
-#: src/colourspace.c:1101
+#: src/colourspace.c:1093
 msgid "clamped"
 msgstr ""
 
-#: src/omc-learn.c:195
+#: src/omc-learn.c:191
 #, c-format
 msgid "Responding to joystick events from %s\n"
 msgstr ""
 
-#: src/omc-learn.c:289
+#: src/omc-learn.c:279
 msgid "Creating ALSA seq port..."
 msgstr ""
 
-#: src/omc-learn.c:325
+#: src/omc-learn.c:313
 #, c-format
 msgid "Responding to MIDI events from %s\n"
 msgstr ""
 
-#: src/omc-learn.c:568
+#: src/omc-learn.c:554
 msgid "data"
 msgstr ""
 
-#: src/omc-learn.c:571
+#: src/omc-learn.c:557
 msgid "velocity"
 msgstr ""
 
-#: src/omc-learn.c:572
+#: src/omc-learn.c:558
 msgid "note"
 msgstr ""
 
-#: src/omc-learn.c:574 src/omc-learn.c:736 src/omc-learn.c:1105
-#: src/omc-learn.c:1591 src/omc-learn.c:1640
+#: src/omc-learn.c:560 src/omc-learn.c:724 src/omc-learn.c:1092
+#: src/omc-learn.c:1581 src/omc-learn.c:1630
 msgid "value"
 msgstr ""
 
-#: src/omc-learn.c:576
+#: src/omc-learn.c:562
 msgid "state"
 msgstr ""
 
-#: src/omc-learn.c:688
+#: src/omc-learn.c:674
 msgid "variable"
 msgstr ""
 
-#: src/omc-learn.c:1001
+#: src/omc-learn.c:989
 msgid "Vars."
 msgstr ""
 
-#: src/omc-learn.c:1054
+#: src/omc-learn.c:1041
 #, c-format
 msgid "MIDI ch %d note on"
 msgstr ""
 
-#: src/omc-learn.c:1058
+#: src/omc-learn.c:1045
 #, c-format
 msgid "MIDI ch %d note off"
 msgstr ""
 
-#: src/omc-learn.c:1062
+#: src/omc-learn.c:1049
 #, c-format
 msgid "MIDI ch %d controller %d"
 msgstr ""
 
-#: src/omc-learn.c:1066
+#: src/omc-learn.c:1053
 #, c-format
 msgid "MIDI ch %d pitch bend"
 msgstr ""
 
-#: src/omc-learn.c:1070
+#: src/omc-learn.c:1057
 #, c-format
 msgid "MIDI ch %d pgm change"
 msgstr ""
 
-#: src/omc-learn.c:1073
+#: src/omc-learn.c:1060
 #, c-format
 msgid "Joystick button %d"
 msgstr ""
 
-#: src/omc-learn.c:1076
+#: src/omc-learn.c:1063
 #, c-format
 msgid "Joystick axis %d"
 msgstr ""
 
-#: src/omc-learn.c:1113
+#: src/omc-learn.c:1100
 msgid "x"
 msgstr ""
 
-#: src/omc-learn.c:1122
+#: src/omc-learn.c:1109
 msgid "range"
 msgstr ""
 
-#: src/omc-learn.c:1143
+#: src/omc-learn.c:1130
 msgid "+ offset1"
 msgstr ""
 
-#: src/omc-learn.c:1161
+#: src/omc-learn.c:1150
 msgid "* scale"
 msgstr ""
 
-#: src/omc-learn.c:1179
+#: src/omc-learn.c:1170
 msgid "+ offset2"
 msgstr ""
 
-#: src/omc-learn.c:1280
+#: src/omc-learn.c:1270
 msgid ""
 "\n"
 "Click OK to delete all entries\n"
 msgstr ""
 
-#: src/omc-learn.c:1318
+#: src/omc-learn.c:1308
 msgid "LiVES: OMC learner"
 msgstr ""
 
-#: src/omc-learn.c:1334
+#: src/omc-learn.c:1324
 msgid "Clear _unmatched"
 msgstr ""
 
-#: src/omc-learn.c:1345
+#: src/omc-learn.c:1335
 msgid "_Delete all"
 msgstr ""
 
-#: src/omc-learn.c:1411
+#: src/omc-learn.c:1401
 msgid "Start video playback"
 msgstr ""
 
-#: src/omc-learn.c:1414
+#: src/omc-learn.c:1404
 msgid "Stop video playback"
 msgstr ""
 
-#: src/omc-learn.c:1418
+#: src/omc-learn.c:1408
 msgid "Clip select <clipnum>"
 msgstr ""
 
-#: src/omc-learn.c:1419
+#: src/omc-learn.c:1409
 msgid "Switch foreground clip to the nth valid clip"
 msgstr ""
 
-#: src/omc-learn.c:1423
+#: src/omc-learn.c:1413
 msgid "Play forwards"
 msgstr ""
 
-#: src/omc-learn.c:1424
+#: src/omc-learn.c:1414
 msgid "Play video in a forwards direction"
 msgstr ""
 
-#: src/omc-learn.c:1427
+#: src/omc-learn.c:1417
 msgid "Play backwards"
 msgstr ""
 
-#: src/omc-learn.c:1428
+#: src/omc-learn.c:1418
 msgid "Play video in a backwards direction"
 msgstr ""
 
-#: src/omc-learn.c:1431
+#: src/omc-learn.c:1421
 msgid "Reverse playback direction"
 msgstr ""
 
-#: src/omc-learn.c:1432
+#: src/omc-learn.c:1422
 msgid "Reverse direction of video playback"
 msgstr ""
 
-#: src/omc-learn.c:1435
+#: src/omc-learn.c:1425
 msgid "Play video faster"
 msgstr ""
 
-#: src/omc-learn.c:1436
+#: src/omc-learn.c:1426
 msgid "Play video at a slightly faster rate"
 msgstr ""
 
-#: src/omc-learn.c:1439
+#: src/omc-learn.c:1429
 msgid "Play video slower"
 msgstr ""
 
-#: src/omc-learn.c:1440
+#: src/omc-learn.c:1430
 msgid "Play video at a slightly slower rate"
 msgstr ""
 
-#: src/omc-learn.c:1443
+#: src/omc-learn.c:1433
 msgid "Toggle video freeze"
 msgstr ""
 
-#: src/omc-learn.c:1444
+#: src/omc-learn.c:1434
 msgid "Freeze video, or if already frozen, unfreeze it"
 msgstr ""
 
-#: src/omc-learn.c:1447
+#: src/omc-learn.c:1437
 msgid "Set video framerate to <fps>"
 msgstr ""
 
-#: src/omc-learn.c:1448
+#: src/omc-learn.c:1438
 msgid "Set framerate of foreground clip to <float fps>"
 msgstr ""
 
-#: src/omc-learn.c:1452
+#: src/omc-learn.c:1442
 msgid "Start recording"
 msgstr ""
 
-#: src/omc-learn.c:1455
+#: src/omc-learn.c:1445
 msgid "Stop recording"
 msgstr ""
 
-#: src/omc-learn.c:1458
+#: src/omc-learn.c:1448
 msgid "Toggle recording state"
 msgstr ""
 
-#: src/omc-learn.c:1461
+#: src/omc-learn.c:1451
 msgid "Swap foreground and background clips"
 msgstr ""
 
-#: src/omc-learn.c:1463
+#: src/omc-learn.c:1453
 msgid "Reset effect keys"
 msgstr ""
 
-#: src/omc-learn.c:1464
+#: src/omc-learn.c:1454
 msgid "Switch all effects off."
 msgstr ""
 
-#: src/omc-learn.c:1467
+#: src/omc-learn.c:1457
 msgid "Enable effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1471
+#: src/omc-learn.c:1461
 msgid "Disable effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1475
+#: src/omc-learn.c:1465
 msgid "Toggle effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1479
+#: src/omc-learn.c:1469
 msgid "Set parameter value <key> <pnum> = <value>"
 msgstr ""
 
-#: src/omc-learn.c:1480
+#: src/omc-learn.c:1470
 msgid "Set <value> of pth (numerical) parameter for effect key <key>."
 msgstr ""
 
-#: src/omc-learn.c:1484
+#: src/omc-learn.c:1474
 msgid "Switch foreground to next clip"
 msgstr ""
 
-#: src/omc-learn.c:1487
+#: src/omc-learn.c:1477
 msgid "Switch foreground to previous clip"
 msgstr ""
 
-#: src/omc-learn.c:1490
+#: src/omc-learn.c:1480
 msgid "Set video framerate to ratio <fps_ratio>"
 msgstr ""
 
-#: src/omc-learn.c:1491
+#: src/omc-learn.c:1481
 msgid "Set framerate ratio of foreground clip to <float fps_ratio>"
 msgstr ""
 
-#: src/omc-learn.c:1495
+#: src/omc-learn.c:1485
 msgid "Retrigger clip <clipnum>"
 msgstr ""
 
-#: src/omc-learn.c:1496
+#: src/omc-learn.c:1486
 msgid ""
 "Switch foreground clip to the nth valid clip, and reset the frame number"
 msgstr ""
 
-#: src/omc-learn.c:1500
+#: src/omc-learn.c:1490
 msgid "Cycle to next mode for effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1504
+#: src/omc-learn.c:1494
 msgid "Cycle to previous mode for effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1508
+#: src/omc-learn.c:1498
 msgid "Set playback plugin parameter value <pnum> = <value>"
 msgstr ""
 
-#: src/omc-learn.c:1509
+#: src/omc-learn.c:1499
 msgid "Set <value> of pth parameter for the playback plugin."
 msgstr ""
 
 #. TRANSLATORS: short form of "clip number"
-#: src/omc-learn.c:1536 src/omc-learn.c:1607
+#: src/omc-learn.c:1526 src/omc-learn.c:1597
 msgid "clipnum"
 msgstr ""
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1545
+#: src/omc-learn.c:1535
 msgid "fps"
 msgstr ""
 
 #. TRANSLATORS: as in keyboard key
-#: src/omc-learn.c:1553 src/omc-learn.c:1560 src/omc-learn.c:1567
-#: src/omc-learn.c:1575 src/omc-learn.c:1615 src/omc-learn.c:1623
+#: src/omc-learn.c:1543 src/omc-learn.c:1550 src/omc-learn.c:1557
+#: src/omc-learn.c:1565 src/omc-learn.c:1605 src/omc-learn.c:1613
 msgid "key"
 msgstr ""
 
 #. TRANSLATORS: short form of "parameter number"
-#: src/omc-learn.c:1583 src/omc-learn.c:1632
+#: src/omc-learn.c:1573 src/omc-learn.c:1622
 msgid "pnum"
 msgstr ""
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1599
+#: src/omc-learn.c:1589
 msgid "fps_ratio"
 msgstr ""
 
-#: src/omc-learn.c:2443
+#: src/omc-learn.c:2417
 #, c-format
 msgid "Saving device mapping to file %s..."
 msgstr ""
 
-#: src/omc-learn.c:2527
+#: src/omc-learn.c:2498
 #, c-format
 msgid ""
 "\n"
@@ -9846,7 +9851,7 @@
 "%s\n"
 msgstr ""
 
-#: src/omc-learn.c:2534
+#: src/omc-learn.c:2505
 #, c-format
 msgid ""
 "\n"
@@ -9855,12 +9860,12 @@
 "%s\n"
 msgstr ""
 
-#: src/omc-learn.c:2571
+#: src/omc-learn.c:2541
 #, c-format
 msgid "Loading device mapping from file %s..."
 msgstr ""
 
-#: src/omc-learn.c:2576
+#: src/omc-learn.c:2544
 #, c-format
 msgid ""
 "\n"
@@ -9870,12 +9875,12 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/videodev.c:547
+#: src/videodev.c:539
 #, c-format
 msgid "Unable to open device %s\n"
 msgstr ""
 
-#: src/videodev.c:564
+#: src/videodev.c:554
 #, c-format
 msgid "Opened device %s\n"
 msgstr ""
@@ -10404,6 +10409,13 @@
 #~ "LiVES nu a putut pentru a capta această imagine\n"
 #~ "\n"
 
+#, fuzzy
+#~ msgid "LiVES audio error."
+#~ msgstr "LiVES: - Insera"
+
+#~ msgid "Pause"
+#~ msgstr "Pauză"
+
 #~ msgid "                                                            "
 #~ msgstr "                                                            "

LiVES-2.2.8.tar.bz2/po/ru.po -> LiVES-2.4.1.tar.bz2/po/ru.po Changed

@@ -7,19 +7,18 @@
 msgstr ""
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n"
-"POT-Creation-Date: 2015-02-08 17:18-0300\n"
-"PO-Revision-Date: 2013-12-08 07:42+0000\n"
-"Last-Translator: Alexander Litvinov <aleclitvinov1980@gmail.com>\n"
+"POT-Creation-Date: 2015-08-09 14:52-0300\n"
+"PO-Revision-Date: 2015-04-06 05:53+0000\n"
+"Last-Translator: ☠Jay ZDLin☠ <Unknown>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-04-13 13:01+0000\n"
-"X-Generator: Launchpad (build 16976)\n"
+"X-Launchpad-Export-Date: 2015-05-03 15:41+0000\n"
+"X-Generator: Launchpad (build 17474)\n"
 
-#. TRANSLATORS: do not translate this message
-#: src/main.c:118
+#: src/main.c:128
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -33,22 +32,22 @@
 "Все переводчики должны прочитать заметки по переводу LiVES на\n"
 "http://lives.sourceforge.net/TRANS-README.txt"
 
-#: src/main.c:134
+#: src/main.c:153
 #, c-format
 msgid "%s Warning: %s\n"
 msgstr "%s Внимание: %s\n"
 
-#: src/main.c:138
+#: src/main.c:157
 #, c-format
 msgid "%s Critical error: %s\n"
 msgstr "%s Критическая ошибка: %s\n"
 
-#: src/main.c:139
+#: src/main.c:158
 #, c-format
 msgid "%s Fatal error: %s\n"
 msgstr "%s Неисправимая ошибка: %s\n"
 
-#: src/main.c:176
+#: src/main.c:198
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -62,7 +61,7 @@
 "tracker/?group_id=64341&atid=507139\n"
 "Спасибо. Для восстановления перезапустите LiVES.\n"
 
-#: src/main.c:177
+#: src/main.c:199
 msgid ""
 "\n"
 "\n"
@@ -74,7 +73,7 @@
 "В отчете об ошибке, пожалуйста, сообщите о вашей операционной системе, "
 "дистрибутиве, а также версию LiVES ("
 
-#: src/main.c:180
+#: src/main.c:203
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -82,7 +81,7 @@
 "и другую информацию, как указано ниже:\n"
 "\n"
 
-#: src/main.c:184
+#: src/main.c:206
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
@@ -92,83 +91,83 @@
 "чтобы собрать больше информации.\n"
 "\n"
 
-#: src/main.c:192
+#: src/main.c:216
 msgid "Preserving set.\n"
 msgstr "Сохранение сборки.\n"
 
-#: src/main.c:636
+#: src/main.c:691
 msgid "Resizing"
 msgstr "Масштабирование"
 
-#: src/main.c:643
+#: src/main.c:698
 msgid "_Resize All Frames"
 msgstr "_Масштабировать все кадры"
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:895
+#: src/main.c:948
 msgid "Any"
 msgstr "Любой"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:897
+#: src/main.c:950
 msgid "None"
 msgstr "Нет"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:899
+#: src/main.c:952
 msgid "recommended"
 msgstr "рекомендуемые"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:901
+#: src/main.c:954
 msgid "disabled !"
 msgstr "отключено!"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:903
+#: src/main.c:956
 msgid "**The current layout**"
 msgstr "Текущее размещение"
 
 #. TRANSLATORS: adjective for "Built in" type effects
-#: src/main.c:905
+#: src/main.c:958
 msgid "Builtin"
 msgstr "Встроенный"
 
 #. TRANSLATORS: adjective for "Custom" type effects
-#: src/main.c:907
+#: src/main.c:960
 msgid "Custom"
 msgstr "Настраиваемый"
 
 #. TRANSLATORS: adjective for "Test" type effects
-#: src/main.c:909
+#: src/main.c:962
 msgid "Test"
 msgstr "Тест"
 
-#: src/main.c:1054
+#: src/main.c:1107
 msgid "Foreground"
 msgstr "Передний план"
 
-#: src/main.c:1055
+#: src/main.c:1108
 msgid "Background"
 msgstr "Фон"
 
-#: src/main.c:1566
+#: src/main.c:1624
 msgid "Loading realtime effect plugins..."
 msgstr "Загрузка плагина эффектов реального времени..."
 
-#: src/main.c:1631
+#: src/main.c:1690
 msgid "Starting jack audio server..."
 msgstr "Запуск звукового сервера jack..."
 
-#: src/main.c:1633
+#: src/main.c:1692
 msgid "Starting jack transport server..."
 msgstr "Запуск передающего сервера jack..."
 
-#: src/main.c:1634
+#: src/main.c:1693
 msgid "Connecting to jack transport server..."
 msgstr "Подключение к передающему jack-серверу..."
 
-#: src/main.c:1663
+#: src/main.c:1723
 #, c-format
 msgid ""
 "\n"
@@ -189,114 +188,114 @@
 "Также, вы можете попробовать запустить программу таким образом \"lives -"
 "jackopts 16\" или "
 
-#: src/main.c:1697
+#: src/main.c:1758
 msgid "Starting pulse audio server..."
 msgstr "Запуск сервера pulse audio..."
 
-#: src/main.c:1765
+#: src/main.c:1825
 msgid "Checking optional dependencies:"
 msgstr "Проверка опциональных зависимостей:"
 
-#: src/main.c:1766
+#: src/main.c:1826
 msgid "mplayer...detected..."
 msgstr "mplayer...обнаружен..."
 
-#: src/main.c:1767
+#: src/main.c:1827
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...НЕ ОБНАРУЖЕН..."
 
-#: src/main.c:1768
+#: src/main.c:1828
 #, fuzzy
 msgid "mplayer2...detected..."
 msgstr "mplayer...обнаружен..."
 
-#: src/main.c:1769
+#: src/main.c:1829
 #, fuzzy
 msgid "mplayer2...NOT DETECTED..."
 msgstr "mplayer...НЕ ОБНАРУЖЕН..."
 
-#: src/main.c:1770
+#: src/main.c:1830
 msgid "convert...detected..."
 msgstr "convert...обнаружен..."
 
-#: src/main.c:1771
+#: src/main.c:1831
 msgid "convert...NOT DETECTED..."
 msgstr "convert...НЕ ОБНАРУЖЕН..."
 
-#: src/main.c:1772
+#: src/main.c:1832
 msgid "composite...detected..."
 msgstr "composite...обнаружен..."
 
-#: src/main.c:1773
+#: src/main.c:1833
 msgid "composite...NOT DETECTED..."
 msgstr "composite...НЕ ОБНАРУЖЕН..."
 
-#: src/main.c:1774
+#: src/main.c:1834
 msgid "sox...detected\n"
 msgstr "sox...обнаружен...\n"
 
-#: src/main.c:1775
+#: src/main.c:1835
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...НЕ ОБНАРУЖЕН...\n"
 
-#: src/main.c:1776
+#: src/main.c:1836
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...обнаружен..."
 
-#: src/main.c:1777
+#: src/main.c:1837
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...НЕ ОБНАРУЖЕН..."
 
-#: src/main.c:1778
+#: src/main.c:1838
 msgid "jackd...detected..."
 msgstr "jackd...обнаружен..."
 
-#: src/main.c:1779
+#: src/main.c:1839
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...НЕ ОБНАРУЖЕН..."
 
-#: src/main.c:1780
+#: src/main.c:1840
 msgid "pulse audio...detected..."
 msgstr "pulse audio...обнаружен..."
 
-#: src/main.c:1781
+#: src/main.c:1841
 msgid "pulse audio...NOT DETECTED..."
 msgstr "pulse audio...НЕ ОБНАРУЖЕН..."
 
-#: src/main.c:1782
+#: src/main.c:1842
 msgid "python...detected..."
 msgstr "python...обнаружен..."
 
-#: src/main.c:1783
+#: src/main.c:1843
 msgid "python...NOT DETECTED..."
 msgstr "python...НЕ ОБНАРУЖЕН..."
 
-#: src/main.c:1784
+#: src/main.c:1844
 msgid "dvgrab...detected..."
 msgstr "dvgrab...обнаружен..."
 
-#: src/main.c:1785
+#: src/main.c:1845
 msgid "dvgrab...NOT DETECTED..."
 msgstr "dvgrab...НЕ ОБНАРУЖЕН..."
 
-#: src/main.c:1786
+#: src/main.c:1846
 msgid "xwininfo...detected..."
 msgstr "xwininfo...обнаружен..."
 
-#: src/main.c:1787
+#: src/main.c:1847
 msgid "xwininfo...NOT DETECTED..."
 msgstr "xwininfo...НЕ ОБНАРУЖЕН..."
 
-#: src/main.c:1793
+#: src/main.c:1853
 #, c-format
 msgid "Windows version %04X"
 msgstr "Версия Windows %04X"
 
-#: src/main.c:1795
+#: src/main.c:1855
 msgid "UNKNOWN - please patch me !"
 msgstr ""
 
-#: src/main.c:1799
+#: src/main.c:1859
 #, c-format
 msgid ""
 "\n"
@@ -307,48 +306,48 @@
 "\n"
 "Менеджер интерфейса определен как \"%s\"; "
 
-#: src/main.c:1802
+#: src/main.c:1862
 #, c-format
 msgid "number of monitors detected: %d\n"
 msgstr "обнаружено мониторов: %d\n"
 
-#: src/main.c:1805
+#: src/main.c:1865
 #, c-format
 msgid "Number of CPUs detected: %d "
 msgstr "Количество обнаруженных ЦПУ: %d "
 
-#: src/main.c:1808 src/multitrack.c:4902
+#: src/main.c:1868 src/multitrack.c:5068
 msgid "little endian"
 msgstr ""
 
-#: src/main.c:1809 src/multitrack.c:4901
+#: src/main.c:1869 src/multitrack.c:5067
 msgid "big endian"
 msgstr ""
 
-#: src/main.c:1810
+#: src/main.c:1870
 #, c-format
 msgid "(%d bits, %s)\n"
 msgstr "(%d бит, %s)\n"
 
-#: src/main.c:1814
+#: src/main.c:1874
 msgid "GUI type is: "
 msgstr "Тип графической оболочки: "
 
-#: src/main.c:1818
+#: src/main.c:1878
 #, c-format
 msgid "GTK+ version %d.%d.%d (compiled with %d.%d.%d)"
 msgstr "GTK+ версии %d.%d.%d (сборка %d.%d.%d)"
 
-#: src/main.c:1840
+#: src/main.c:1900
 msgid ", with cairo support"
 msgstr ", с поддержкой cairo"
 
-#: src/main.c:1847
+#: src/main.c:1907
 #, c-format
 msgid "Temp directory is %s\n"
 msgstr "Временный каталог: %s\n"
 
-#: src/main.c:1851
+#: src/main.c:1911
 msgid ""
 "WARNING - this version of LiVES was compiled without either\n"
 "jack or pulse audio support.\n"
@@ -358,15 +357,15 @@
 "без поддержки jack или pulse audio.\n"
 "Многие аудиофункции будут недоступны.\n"
 
-#: src/main.c:1854
+#: src/main.c:1914
 msgid "Compiled with jack support, good !\n"
 msgstr "Скомпилировано с поддержкой jack, отлично!\n"
 
-#: src/main.c:1857
+#: src/main.c:1917
 msgid "Compiled with pulse audio support, wonderful !\n"
 msgstr "Скомпоновано с поддержкой pulse audio, замечательно !\n"
 
-#: src/main.c:1861
+#: src/main.c:1921
 #, c-format
 msgid ""
 "Welcome to LiVES version %s.\n"
@@ -375,7 +374,7 @@
 "Добро пожаловать в LiVES версии %s.\n"
 "\n"
 
-#: src/main.c:2306
+#: src/main.c:2380
 #, c-format
 msgid ""
 "\n"
@@ -384,88 +383,94 @@
 "\n"
 "Синтаксис запуска: %s [opts] [filename [start_time] [frames]]\n"
 
-#: src/main.c:2307
+#: src/main.c:2381
 msgid "Where: filename is the name of a media file or backup file.\n"
 msgstr "Где: filename - это имя медиафайла или резервной копии файла.\n"
 
-#: src/main.c:2308
+#: src/main.c:2382
 msgid "start_time : filename start time in seconds\n"
 msgstr "start_time - время начала filename (в сек.)\n"
 
-#: src/main.c:2309
+#: src/main.c:2383
 msgid "frames : maximum number of frames to open\n"
 msgstr "frames : максимальное количество кадров, которые будут открыты\n"
 
-#: src/main.c:2311
+#: src/main.c:2385
 msgid "opts can be:\n"
 msgstr "opts могут быть следующие:\n"
 
-#: src/main.c:2312
+#: src/main.c:2386
 msgid "-help            : show this help text and exit\n"
 msgstr "-help : показать этот текст помощи и выйти\n"
 
-#: src/main.c:2313
+#: src/main.c:2387
 msgid "-tmpdir <tempdir>: use alternate working directory (e.g /var/ramdisk)\n"
 msgstr ""
 "-tmpdir <tempdir>: использовать другой рабочий каталог (например /var/"
 "ramdisk)\n"
 
-#: src/main.c:2314
+#: src/main.c:2388
 msgid "-set <setname>   : autoload clip set setname\n"
 msgstr "-set <setname>   : автоматическая загрузка сборки <setname>\n"
 
-#: src/main.c:2315
+#: src/main.c:2389
 msgid "-noset           : do not load any set on startup\n"
 msgstr "-noset           : не загружать какую-либо сборку при запуске\n"
 
-#: src/main.c:2316
+#: src/main.c:2390
 msgid "-norecover       : force no-loading of crash recovery\n"
 msgstr "-norecover       : загрузка без режима восстановления после сбоя\n"
 
-#: src/main.c:2317
+#: src/main.c:2391
 msgid "-recover         : force loading of crash recovery\n"
 msgstr "-recover         : загрузка в режиме восстановления после сбоя\n"
 
-#: src/main.c:2318
-msgid "-nothreaddialog  : doe nothing - retained for backwards compatibility\n"
+#: src/main.c:2392
+#, fuzzy
+msgid ""
+"-nothreaddialog  : does nothing - retained for backwards compatibility\n"
 msgstr ""
 "-nothreaddialog  : ничего не делать, сохранено для обратной совместимости\n"
 
-#: src/main.c:2319
+#: src/main.c:2393
 msgid "-nogui           : do not show the gui\n"
 msgstr "-nogui: не показывать графический интерфейс\n"
 
-#: src/main.c:2320
+#: src/main.c:2394
 msgid "-nosplash        : do not show the splash window\n"
 msgstr "-nosplash        : не показывать заставку программы\n"
 
-#: src/main.c:2321
+#: src/main.c:2395
 msgid "-noplaywin       : do not show the play window\n"
 msgstr "-noplaywin       : не показывать окно воспроизведения\n"
 
-#: src/main.c:2322
+#: src/main.c:2396
+msgid "-noninteractive  : disable menu interactivity\n"
+msgstr ""
+
+#: src/main.c:2397
 msgid "-startup-ce      : start in clip editor mode\n"
 msgstr "-startup-ce : запуск в режиме редактора\n"
 
-#: src/main.c:2323
+#: src/main.c:2398
 msgid "-startup-mt      : start in multitrack mode\n"
 msgstr "-startup-mt      : запуск в режиме multitrack\n"
 
-#: src/main.c:2324
+#: src/main.c:2399
 msgid ""
 "-fxmodesmax <n>  : allow <n> modes per effect key (minimum is 1, default is "
 "8)\n"
 msgstr ""
 
-#: src/main.c:2326
+#: src/main.c:2401
 msgid "-oscstart <port> : start OSC listener on UDP port <port>\n"
 msgstr "-oscstart <port> : запуск демона OSC на UDP порту <port>\n"
 
-#: src/main.c:2327
+#: src/main.c:2402
 msgid "-nooscstart      : do not start OSC listener\n"
 msgstr "-nooscstart      : не запускать OSC демон\n"
 
-#: src/main.c:2329
+#: src/main.c:2404
 #, fuzzy
 msgid ""
 "-aplayer <ap>    : start with selected audio player. <ap> can be mplayer, "
@@ -475,15 +480,15 @@
 "указать mplayer"
 
 #. TRANSLATORS: pulse (audio)
-#: src/main.c:2332
+#: src/main.c:2407
 msgid ", pulse"
 msgstr ", pulse"
 
-#: src/main.c:2335
+#: src/main.c:2410
 msgid ", sox or jack\n"
 msgstr ", sox или jack\n"
 
-#: src/main.c:2336
+#: src/main.c:2412
 msgid ""
 "-jackopts <opts>    : opts is a bitmap of jack startup options [1 = jack "
 "transport client, 2 = jack transport master, 4 = start jack transport "
@@ -494,31 +499,31 @@
 "транспорт сервер, 8 = остановить звук когда остановлено видео, 16 = "
 "запустить звуковой jack сервер] \n"
 
-#: src/main.c:2338
+#: src/main.c:2414
 msgid " or sox\n"
 msgstr " или sox\n"
 
-#: src/main.c:2340
+#: src/main.c:2416
 msgid "-devicemap <mapname>          : autoload devicemap\n"
 msgstr ""
 "-devicemap <mapname>          : автоматическая загрузка карты устройств\n"
 
-#: src/main.c:2341
+#: src/main.c:2418
 msgid ""
 "-vppdefaults <file>          : load video playback plugin defaults from "
 "<file> (Note: only sets the settings, not the plugin type)\n"
 msgstr ""
 
-#: src/main.c:2342
+#: src/main.c:2419
 msgid "-debug            : try to debug crashes (requires 'gdb' installed)\n"
 msgstr ""
 "-debug : использовать для отладки ошибок (требуется установленный 'gdb')\n"
 
-#: src/main.c:2373 src/gui.c:1128
+#: src/main.c:2449 src/gui.c:1127
 msgid "Starting GUI..."
 msgstr "Запуск графической оболочки..."
 
-#: src/main.c:2396
+#: src/main.c:2475
 #, c-format
 msgid ""
 "\n"
@@ -535,7 +540,7 @@
 "%s/%s.\n"
 "(Возможно вам необходимо изменить значение <prefix_dir> в файле %s)\n"
 
-#: src/main.c:2410
+#: src/main.c:2492
 #, c-format
 msgid ""
 "\n"
@@ -547,7 +552,7 @@
 "Пожалуйста, убедитесь, что у вас есть разрешение на запись в %s и повторите "
 "снова.\n"
 
-#: src/main.c:2415
+#: src/main.c:2498
 msgid ""
 "\n"
 "`smogrify` must be in your path, and be executable\n"
@@ -561,7 +566,7 @@
 "Пожалуйста, изучите файл README, входящий в этот пакет\n"
 "перед запуском LiVES.\n"
 
-#: src/main.c:2421
+#: src/main.c:2504
 #, c-format
 msgid ""
 "\n"
@@ -576,7 +581,7 @@
 "\n"
 "Пожалуйста, проверьте разрешения файла и повторите снова.\n"
 
-#: src/main.c:2428
+#: src/main.c:2512
 #, c-format
 msgid ""
 "\n"
@@ -593,7 +598,7 @@
 "Пожалуйста, проверьте разрешения файла и каталога,\n"
 "затем повторите снова.\n"
 
-#: src/main.c:2438
+#: src/main.c:2522
 #, c-format
 msgid ""
 "Please check the <tempdir> setting in \n"
@@ -604,7 +609,7 @@
 "%s\n"
 "и повторите снова.\n"
 
-#: src/main.c:2445
+#: src/main.c:2528
 #, c-format
 msgid ""
 "\n"
@@ -619,7 +624,7 @@
 "\n"
 "%s"
 
-#: src/main.c:2453
+#: src/main.c:2536
 msgid ""
 "\n"
 "An incorrect version of smogrify was found in your path.\n"
@@ -637,7 +642,7 @@
 "\n"
 "Спасибо.\n"
 
-#: src/main.c:2458
+#: src/main.c:2541
 #, fuzzy
 msgid ""
 "\n"
@@ -648,7 +653,7 @@
 "Для работы LiVES требуется 'mplayer' или 'sox'. Установите любой из этих "
 "пакетов и повторите ещё раз.\n"
 
-#: src/main.c:2462
+#: src/main.c:2546
 #, fuzzy
 msgid ""
 "\n"
@@ -659,7 +664,7 @@
 "Для обеспечение работоспособности, LiVES необходимы 'mplayer' и 'sox'. "
 "Пожалуйста, установите их и повторите снова.\n"
 
-#: src/main.c:2472
+#: src/main.c:2556
 #, fuzzy
 msgid ""
 "\n"
@@ -670,7 +675,7 @@
 "LiVES не обнаружила 'mplayer'. Для полноценного использования LiVES "
 "желательно установить mplayer.\n"
 
-#: src/main.c:2475
+#: src/main.c:2561
 msgid ""
 "\n"
 "LiVES was unable to locate 'convert'. You should install convert and image-"
@@ -680,7 +685,7 @@
 "LiVES не обнаружила 'convert'. Для наложения эффектов необходимо установить "
 "convert и image-magick.\n"
 
-#: src/main.c:2478
+#: src/main.c:2566
 msgid ""
 "\n"
 "LiVES was unable to locate 'composite'. You should install composite and "
@@ -690,7 +695,7 @@
 "LiVES не обнаружила 'composite'. Если вы планируете использовать "
 "композиционные функции, необходимо установить composite и image-magick.\n"
 
-#: src/main.c:2481
+#: src/main.c:2570
 msgid ""
 "\n"
 "LiVES was unable to locate 'sox'. Some audio features may not work. You "
@@ -700,7 +705,7 @@
 "LiVES не обнаружила 'sox'. Некоторые звуковые функции не будут доступны. "
 "Необходимо установить 'sox'.\n"
 
-#: src/main.c:2484
+#: src/main.c:2575
 #, c-format
 msgid ""
 "\n"
@@ -717,59 +722,59 @@
 "При их отсутствии, вы не сможете выполнять 'Сохранение'.\n"
 "Возможно вам понадобится изменить значение <lib_dir> в %s\n"
 
-#: src/main.c:2611
+#: src/main.c:2707
 #, c-format
 msgid "Autoloading set %s..."
 msgstr "Загрузка сборки %s..."
 
 #. TRANSLATORS: localised name may be used here
-#: src/main.c:2781 src/interface.c:738
+#: src/main.c:2902
 msgid "LiVES"
 msgstr "LiVES"
 
-#: src/main.c:2948
+#: src/main.c:3066
 #, c-format
 msgid "Invalid audio player %s\n"
 msgstr "Непригодный аудиоплеер %s\n"
 
-#: src/main.c:3077
+#: src/main.c:3214
 #, c-format
 msgid "LiVES-%s: <Untitled%d> %dx%d : %d frames %d bpp %.3f fps"
 msgstr "LiVES-%s: <Неизвестный%d> %dx%d : %d кадров %d bpp %.3f fps"
 
-#: src/main.c:3082
+#: src/main.c:3219
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : ??? frames ??? bpp %.3f fps"
 msgstr "LiVES-%s: <%s> %dx%d : ??? кадров ??? bpp %.3f fps"
 
-#: src/main.c:3086
+#: src/main.c:3222
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : %d frames %d bpp %.3f fps"
 msgstr "LiVES-%s: <%s> %dx%d : %d кадров %d bpp %.3f fps"
 
-#: src/main.c:3094
+#: src/main.c:3229
 #, c-format
 msgid "LiVES-%s: <No File>"
 msgstr "LiVES-%s: <Нет файла>"
 
 #. TRANSLATORS: rec(ord)
-#: src/main.c:5085
+#: src/main.c:5201
 #, c-format
 msgid "rec %9d/%d"
 msgstr ""
 
 #. TRANSLATORS: out of memory (rec(ord))
-#: src/main.c:5091
+#: src/main.c:5206
 #, c-format
 msgid "!rec %9d/%d"
 msgstr ""
 
-#: src/main.c:5398 src/main.c:5399 src/gui.c:2110 src/gui.c:3220
-#: src/saveplay.c:2336
+#: src/main.c:5500 src/main.c:5501 src/gui.c:2108 src/gui.c:3331
+#: src/saveplay.c:2315
 msgid "Play"
 msgstr "Воспроизвести"
 
-#: src/main.c:6128
+#: src/main.c:6216
 msgid ""
 "LiVES was unable to capture this image\n"
 "\n"
@@ -777,35 +782,35 @@
 "LiVES не может загрузить это изображение\n"
 "\n"
 
-#: src/main.c:6250
+#: src/main.c:6345
 #, c-format
 msgid "Closed file %s\n"
 msgstr "Закрыть файл %s\n"
 
-#: src/main.c:6452 src/gui.c:648 src/utils.c:4312 src/utils.c:4344
-#: src/saveplay.c:3550 src/multitrack.c:4510 src/multitrack.c:6268
+#: src/main.c:6542 src/gui.c:647 src/utils.c:4256 src/utils.c:4286
+#: src/saveplay.c:3500 src/multitrack.c:4678 src/multitrack.c:6447
 msgid "_Undo"
 msgstr "_Отменить"
 
-#: src/main.c:6453 src/gui.c:666 src/utils.c:4313 src/utils.c:4345
-#: src/saveplay.c:3551 src/multitrack.c:4531 src/multitrack.c:6293
+#: src/main.c:6543 src/gui.c:665 src/utils.c:4257 src/utils.c:4287
+#: src/saveplay.c:3501 src/multitrack.c:4698 src/multitrack.c:6472
 msgid "_Redo"
 msgstr "_Вернуть"
 
-#: src/main.c:6493 src/interface.c:470 src/gui.c:2326 src/preferences.c:2357
-#: src/resample.c:1516
+#: src/main.c:6583 src/interface.c:457 src/gui.c:2324 src/preferences.c:2391
+#: src/resample.c:1488
 msgid "Video"
 msgstr "Видео"
 
-#: src/main.c:6494 src/interface.c:483 src/gui.c:2351
+#: src/main.c:6584 src/interface.c:470 src/gui.c:2348
 msgid "Left Audio"
 msgstr "Левый звуковой канал"
 
-#: src/main.c:6495 src/gui.c:2375
+#: src/main.c:6585 src/gui.c:2371
 msgid "Right Audio"
 msgstr "Правый звуковой канал"
 
-#: src/main.c:6540
+#: src/main.c:6630
 #, fuzzy
 msgid ""
 "\n"
@@ -820,11 +825,11 @@
 "выбран mplayer.\n"
 "Измените параметры просмотра в меню Настройки и повторите ещё раз.\n"
 
-#: src/main.c:7051 src/plugins.c:1502
+#: src/main.c:7134 src/plugins.c:1468
 msgid "LiVES: - Play Window"
 msgstr "LiVES: - Окно проигрывателя"
 
-#: src/startup.c:25
+#: src/startup.c:24
 #, c-format
 msgid ""
 "A directory named\n"
@@ -839,7 +844,7 @@
 "\n"
 "(Свободно = %s)\n"
 
-#: src/startup.c:32
+#: src/startup.c:29
 #, c-format
 msgid ""
 "A directory named\n"
@@ -855,7 +860,7 @@
 "свободном месте.\n"
 "Пожалуйста, выберите другое расположение.\n"
 
-#: src/startup.c:49
+#: src/startup.c:46
 #, c-format
 msgid ""
 "\n"
@@ -872,7 +877,7 @@
 "\n"
 "(Свободно = %s)"
 
-#: src/startup.c:54
+#: src/startup.c:50
 #, c-format
 msgid ""
 "\n"
@@ -885,11 +890,11 @@
 "%s\n"
 "Пожалуйста, повторите снова и выберите другое расположение.\n"
 
-#: src/startup.c:96
+#: src/startup.c:92
 msgid "Directory name is too long !"
 msgstr "Имя директории слишком длинное !"
 
-#: src/startup.c:223
+#: src/startup.c:216
 msgid ""
 "LiVES FAILED TO START YOUR SELECTED AUDIO PLAYER !\n"
 "\n"
@@ -897,7 +902,7 @@
 "LiVES не удалось запустить выбранный вами аудиоплеер!\n"
 "\n"
 
-#: src/startup.c:230
+#: src/startup.c:222
 msgid ""
 "Before starting LiVES, you need to choose an audio player.\n"
 "\n"
@@ -907,7 +912,7 @@
 "\n"
 "PULSE AUDIO рекомендуется большинству пользователей"
 
-#: src/startup.c:233
+#: src/startup.c:225
 msgid ""
 ", but this version of LiVES was not compiled with pulse audio support.\n"
 "\n"
@@ -915,7 +920,7 @@
 ", но данная версия LiVES была скомпонована без поддержки pulse audio.\n"
 "\n"
 
-#: src/startup.c:236
+#: src/startup.c:229
 msgid ""
 ", but you do not have pulse audio installed on your system.\n"
 " You are advised to install pulse audio first before running LiVES.\n"
@@ -925,11 +930,11 @@
 " Перед тем, как начать пользоваться LiVES, следует установить pulse audio.\n"
 "\n"
 
-#: src/startup.c:241
+#: src/startup.c:233
 msgid "JACK audio is recommended for pro users"
 msgstr "JACK audio рекомендуется продвинутым пользователям"
 
-#: src/startup.c:244
+#: src/startup.c:236
 msgid ""
 ", but this version of LiVES was not compiled with jack audio support.\n"
 "\n"
@@ -937,7 +942,7 @@
 ", но данная версия LiVES была скомпонована без поддержки jack audio.\n"
 "\n"
 
-#: src/startup.c:247
+#: src/startup.c:239
 msgid ""
 ", but you do not have jackd installed. You may wish to install jackd first "
 "before running LiVES.\n"
@@ -947,7 +952,7 @@
 "LiVES, следует установить jackd.\n"
 "\n"
 
-#: src/startup.c:250
+#: src/startup.c:242
 msgid ""
 ", but may prevent LiVES from starting on some systems.\n"
 "If LiVES will not start with jack, you can restart and try with another "
@@ -960,12 +965,12 @@
 "другим аудиоплеером.\n"
 "\n"
 
-#: src/startup.c:254
+#: src/startup.c:246
 msgid "SOX may be used if neither of the preceding players work, "
 msgstr ""
 "SOX обычно используется, если ни один из вышеуказанных плееров не работает, "
 
-#: src/startup.c:257
+#: src/startup.c:249
 msgid ""
 "but some audio features will be disabled.\n"
 "\n"
@@ -973,7 +978,7 @@
 "но некоторые аудиофункции не будут работать.\n"
 "\n"
 
-#: src/startup.c:260
+#: src/startup.c:251
 msgid ""
 "but you do not have sox installed.\n"
 "You are advised to install it before running LiVES.\n"
@@ -983,7 +988,7 @@
 "Вам следует установить его, прежде чем запустить LiVES.\n"
 "\n"
 
-#: src/startup.c:264
+#: src/startup.c:255
 #, fuzzy
 msgid ""
 "The MPLAYER/MPLAYER2 audio player is only recommended for testing purposes.\n"
@@ -992,96 +997,96 @@
 "Плеер MPLAYER рекомендуется использовать исключительно для тестирования.\n"
 "\n"
 
-#: src/startup.c:281
+#: src/startup.c:271
 msgid "LiVES: - Choose an audio player"
 msgstr "LiVES: - Выберите аудиоплеер"
 
-#: src/startup.c:298
+#: src/startup.c:288
 msgid "Use _pulse audio player"
 msgstr "Использовать аудиоплеер _pulse"
 
-#: src/startup.c:320
+#: src/startup.c:310
 msgid "Use _jack audio player"
 msgstr "Использовать аудиоплеер _jack"
 
-#: src/startup.c:340
+#: src/startup.c:330
 msgid "Use _sox audio player"
 msgstr "Использовать аудиоплеер _sox"
 
-#: src/startup.c:361
+#: src/startup.c:351
 msgid "Use _mplayer audio player"
 msgstr "Использовать аудиоплеер _mplayer"
 
-#: src/startup.c:381
+#: src/startup.c:371
 #, fuzzy
 msgid "Use _mplayer2 audio player"
 msgstr "Использовать аудиоплеер _mplayer"
 
-#: src/startup.c:405 src/startup.c:580 src/interface.c:1506
+#: src/startup.c:395 src/startup.c:569 src/interface.c:1398
 msgid "_Next"
 msgstr "_Далее"
 
-#: src/startup.c:445
+#: src/startup.c:435
 msgid "Skipped"
 msgstr "Пропущено"
 
-#: src/startup.c:460
+#: src/startup.c:450
 msgid "Passed"
 msgstr "Пройдено"
 
-#: src/startup.c:493
+#: src/startup.c:483
 msgid "Failed"
 msgstr "Ошибка"
 
-#: src/startup.c:552
+#: src/startup.c:542
 msgid "LiVES: - Testing Configuration"
 msgstr "LiVES: - Тестирование настроек"
 
-#: src/startup.c:555
+#: src/startup.c:544
 msgid "LiVES: - Troubleshoot"
 msgstr "LiVES: - Проблемы"
 
-#: src/startup.c:568
+#: src/startup.c:557
 msgid "LiVES will now run some basic configuration tests\n"
 msgstr "LiVES теперь выполнят некоторые тесты базовой конфигурации\n"
 
-#: src/startup.c:603
+#: src/startup.c:591
 msgid "Checking for \"sox\" presence"
 msgstr "Проверка представлений \"sox\""
 
-#: src/startup.c:607
+#: src/startup.c:595
 msgid ""
 "You should install sox to be able to use all the audio features in LiVES"
 msgstr ""
 "Вы должны установить sox для использования всех звуковых эффектов в LiVES"
 
-#: src/startup.c:615
+#: src/startup.c:602
 msgid "Checking if sox can convert audio"
 msgstr "Проверка возможностей sox для конвертации звука"
 
-#: src/startup.c:638
+#: src/startup.c:625
 msgid "Unable to allocate 176400 bytes memory."
 msgstr "Невозможно выделить 176400 байт памяти."
 
-#: src/startup.c:653
+#: src/startup.c:639
 #, c-format
 msgid "Unable to write to: %s"
 msgstr "Невозможно ваыполнить запись: %s"
 
-#: src/startup.c:667 src/startup.c:807
+#: src/startup.c:653 src/startup.c:789
 #, c-format
 msgid "Command failed: %s"
 msgstr "Ошибка выполнения команды: %s"
 
-#: src/startup.c:689
+#: src/startup.c:675
 msgid "You should install sox_fmt_all or similar"
 msgstr "Вы должны установить sox_fmt_all или аналогичное"
 
-#: src/startup.c:717
+#: src/startup.c:703
 msgid "Checking for \"mplayer\" presence"
 msgstr "Проверка представлений для \"mplayer\""
 
-#: src/startup.c:721
+#: src/startup.c:707
 #, fuzzy
 msgid ""
 "You should install mplayer or mplayer2 to be able to use all the decoding "
@@ -1090,44 +1095,44 @@
 "Вы должны установить mplayer для возможности использовать все видеоэффекты в "
 "LiVES"
 
-#: src/startup.c:747
+#: src/startup.c:732
 msgid "Checking if mplayer can convert audio"
 msgstr "Проверка возможностей mplayer для конвертации звука"
 
-#: src/startup.c:768
+#: src/startup.c:751
 #, fuzzy
 msgid "You should install mplayer or mplayer2 with pcm/wav support"
 msgstr "Вы должны утановить mplayer с поддержкой pcm/wav"
 
-#: src/startup.c:785
+#: src/startup.c:767
 msgid "Checking if mplayer can decode to png/alpha"
 msgstr "Проверка возможностей mplayer декодирования в png/alpha"
 
-#: src/startup.c:828
+#: src/startup.c:810
 msgid "You may wish to upgrade mplayer to a newer version"
 msgstr "Вы можете обновить mplayer на новую версию"
 
-#: src/startup.c:854
+#: src/startup.c:836
 msgid "Checking if mplayer can decode to jpeg"
 msgstr "Проверка возможностей mplayer декодирования в jpeg"
 
-#: src/startup.c:882
+#: src/startup.c:862
 msgid "You should install mplayer with either png/alpha or jpeg support"
 msgstr "Вы должны установить mplayer с поддержкой png/alpha или jpeg"
 
-#: src/startup.c:883
+#: src/startup.c:863
 msgid "You may wish to add jpeg output support to mplayer"
 msgstr "Вы можете добавить поддержку вывода jpeg в mplayer"
 
-#: src/startup.c:892
+#: src/startup.c:872
 msgid "Checking for \"convert\" presence"
 msgstr "Проверка для представлений \"convert\""
 
-#: src/startup.c:896
+#: src/startup.c:876
 msgid "Install imageMagick to be able to use all of the rendered effects"
 msgstr "Установите imageMagick для возможности использовать все рендер-эффекты"
 
-#: src/startup.c:909
+#: src/startup.c:889
 msgid ""
 "\n"
 "\n"
@@ -1139,7 +1144,7 @@
 "    Тип преобразования изображения был изменён на jpeg. Вы можете внести "
 "изменение в Параметры/Декодирование.    \n"
 
-#: src/startup.c:915
+#: src/startup.c:894
 msgid ""
 "\n"
 "\n"
@@ -1151,7 +1156,7 @@
 "    Нажмиет Отмена для выхода и устанвоки всех недостающих компонентов, или "
 "Далее чтобы продолжить    \n"
 
-#: src/startup.c:949
+#: src/startup.c:928
 msgid ""
 "\n"
 "\n"
@@ -1161,7 +1166,7 @@
 "\n"
 "Завершение, вы можете выбрать стартовый стандартный интерфейс для LiVES.\n"
 
-#: src/startup.c:950
+#: src/startup.c:929
 msgid ""
 "\n"
 "\n"
@@ -1172,7 +1177,7 @@
 "LiVES имеет два основных интерфейса и вы можете выбрать любой из них для "
 "запуска.\n"
 
-#: src/startup.c:951
+#: src/startup.c:930
 msgid ""
 "\n"
 "\n"
@@ -1182,31 +1187,31 @@
 "\n"
 "Умолчания можно изменить позднее в меню Предпочтения.\n"
 
-#: src/startup.c:961
+#: src/startup.c:940
 msgid "LiVES: - Choose the startup interface"
 msgstr "LiVES: - Выберите начальный интерфейс"
 
-#: src/startup.c:972
+#: src/startup.c:951
 msgid "Start in _Clip Edit mode"
 msgstr "Запустить в режиме фрагментного редактирования"
 
-#: src/startup.c:975
+#: src/startup.c:954
 msgid "This is the best choice for simple editing tasks and for VJs\n"
 msgstr ""
 "Наилучший вариант для задач простого редактирования, а также для VJ`ев\n"
 
-#: src/startup.c:981
+#: src/startup.c:960
 msgid "Start in _Multitrack mode"
 msgstr "Запустить в режиме с _несколькими дорожками"
 
-#: src/startup.c:983
+#: src/startup.c:962
 msgid ""
 "This is a better choice for complex editing tasks involving multiple clips.\n"
 msgstr ""
 "Наилучший вариант для редактирования сложных задач с несколькими "
 "фрагментами.\n"
 
-#: src/startup.c:992
+#: src/startup.c:971
 msgid "_Finish"
 msgstr "_Завершить"
 
@@ -1223,37 +1228,37 @@
 msgid "Apply _Deinterlace"
 msgstr ""
 
-#: src/interface.c:66
+#: src/interface.c:65
 msgid "If this is set, frames will be deinterlaced as they are imported."
 msgstr "Если включить, чересстрочная развёртка будет устранена при импорте."
 
-#: src/interface.c:113 src/callbacks.c:9623 src/callbacks.c:9646
-#: src/callbacks.c:9647 src/gui.c:3223 src/gui.c:3821 src/saveplay.c:2339
-#: src/saveplay.c:3138 src/dialogs.c:1514 src/dialogs.c:1515
-#: src/dialogs.c:1746 src/dialogs.c:1747 src/framedraw.c:238
-#: src/multitrack.c:8031
+#: src/interface.c:106 src/callbacks.c:9542 src/callbacks.c:9564
+#: src/callbacks.c:9565 src/gui.c:3333 src/gui.c:3946 src/saveplay.c:2317
+#: src/saveplay.c:3097 src/dialogs.c:1575 src/dialogs.c:1576
+#: src/dialogs.c:1804 src/dialogs.c:1805 src/framedraw.c:236
+#: src/multitrack.c:8210
 msgid "Preview"
 msgstr "Предпросмотр"
 
-#: src/interface.c:132
+#: src/interface.c:125
 msgid "Click here to _Preview any selected video, image or audio file"
 msgstr ""
 "Кликните сюда для _Предпросмотра выбранного видео, графического или "
 "звукового файла"
 
-#: src/interface.c:135
+#: src/interface.c:127
 msgid "Click here to _Preview any selected audio file"
 msgstr "Кликните сюда для _Предпросмотра выбранного звукового файла"
 
-#: src/interface.c:138
+#: src/interface.c:129
 msgid "Click here to _Preview the video"
 msgstr "Кликните сюда для _Предпросмотра видео"
 
-#: src/interface.c:181 src/dialogs.c:2542
+#: src/interface.c:169 src/dialogs.c:2621
 msgid "LiVES: - Processing..."
 msgstr "LiVES: - Обработка..."
 
-#: src/interface.c:217
+#: src/interface.c:205
 msgid ""
 "\n"
 "\n"
@@ -1267,8 +1272,8 @@
 "\n"
 "Не забудьте отключить эффекты (ctrl-0) позже!"
 
-#: src/interface.c:222 src/callbacks.c:9373 src/callbacks.c:9420
-#: src/dialogs.c:2570
+#: src/interface.c:210 src/callbacks.c:9283 src/callbacks.c:9332
+#: src/dialogs.c:2649
 msgid ""
 "\n"
 "Please Wait"
@@ -1276,190 +1281,178 @@
 "\n"
 "Подождите"
 
-#: src/interface.c:242
+#: src/interface.c:230
 msgid "Show Details"
 msgstr "Показать сведения"
 
-#: src/interface.c:254 src/dialogs.c:2584
+#: src/interface.c:242 src/dialogs.c:2663
 msgid "_Enough"
 msgstr "_Достаточно"
 
-#: src/interface.c:255 src/framedraw.c:278
+#: src/interface.c:243 src/framedraw.c:276
 msgid "_Preview"
 msgstr "_Предпросмотр"
 
-#: src/interface.c:257
+#: src/interface.c:245 src/callbacks.c:9282 src/callbacks.c:9330
 msgid "Paus_e"
 msgstr "Прио_становить"
 
-#: src/interface.c:258 src/callbacks.c:9417
+#: src/interface.c:246 src/callbacks.c:9329
 msgid "Pause/_Enough"
 msgstr ""
 
-#: src/interface.c:285
+#: src/interface.c:273
 msgid "_Cancel"
 msgstr "_Отмена"
 
-#: src/interface.c:374
+#: src/interface.c:361
 #, c-format
 msgid "LiVES: - %s"
 msgstr "LiVES: - %s"
 
-#: src/interface.c:376
+#: src/interface.c:363
 msgid "LiVES: - Multitrack details"
 msgstr "LiVES: - Сведения о нескольких дорожках"
 
-#: src/interface.c:407
+#: src/interface.c:394
 msgid "Format"
 msgstr "Формат"
 
-#: src/interface.c:412
+#: src/interface.c:399
 msgid "Frame size"
 msgstr "Размер кадра"
 
-#: src/interface.c:417
+#: src/interface.c:404
 msgid "File size"
 msgstr "Размер файла"
 
-#: src/interface.c:418
+#: src/interface.c:405
 msgid "Byte size"
 msgstr "Размер в байтах"
 
-#: src/interface.c:423 src/interface.c:1891
+#: src/interface.c:410 src/interface.c:1760
 msgid "FPS"
 msgstr "FPS"
 
-#: src/interface.c:428
+#: src/interface.c:415
 msgid "Frames"
 msgstr "Кадры"
 
-#: src/interface.c:429
+#: src/interface.c:416
 msgid "Events"
 msgstr "События"
 
-#: src/interface.c:434 src/interface.c:500 src/interface.c:542
+#: src/interface.c:421 src/interface.c:486 src/interface.c:528
 msgid "Total time"
 msgstr "Общая продолжительность"
 
-#: src/interface.c:486 src/resample.c:1488
+#: src/interface.c:472 src/resample.c:1460
 msgid "Audio"
 msgstr "Звук"
 
-#: src/interface.c:511 src/interface.c:553
+#: src/interface.c:497 src/interface.c:539
 msgid "Rate/size"
 msgstr "Поток/размер"
 
-#: src/interface.c:530
+#: src/interface.c:516
 msgid "Right audio"
 msgstr "Правый звуковой канал"
 
-#: src/interface.c:622
+#: src/interface.c:607
 msgid "LiVES: - Encoding options"
 msgstr "LiVES: - Настройки кодирования"
 
-#: src/interface.c:636
+#: src/interface.c:621
 msgid "<------------- (Check the box to re_size as suggested)"
 msgstr ""
 
-#: src/interface.c:637
+#: src/interface.c:622
 msgid "<------------- (Check the box to use the _size recommendation)"
 msgstr ""
 
-#: src/interface.c:662
+#: src/interface.c:646
 msgid "Use _letterboxing to maintain aspect ratio (optional)"
 msgstr ""
 
-#: src/interface.c:663
+#: src/interface.c:647
 msgid ""
 "Draw black rectangles either above or to the sides of the image, to prevent "
 "it from stretching."
 msgstr ""
 
-#: src/interface.c:694
+#: src/interface.c:677
 msgid "Keep _my settings"
 msgstr "Сохранить _мои настройки"
 
-#: src/interface.c:695
+#: src/interface.c:678
 msgid "Use _recommended settings"
 msgstr "Использовать _рекомендованные настройки"
 
-#: src/interface.c:775 src/dialogs.c:114
-msgid ""
-"Do _not show this warning any more\n"
-"(can be turned back on from Preferences/Warnings)"
-msgstr ""
-"Больше _не показывать это предупреждение\n"
-"(можно вернуть обратно в меню Настройки/Предупреждения)"
-
-#: src/interface.c:787
-msgid "Show _Details"
-msgstr "Показать _подробности"
-
-#: src/interface.c:881
+#: src/interface.c:769
 msgid "_Close Window"
 msgstr "_Закрыть окно"
 
-#: src/interface.c:883
+#: src/interface.c:771
 msgid "_Save to file"
 msgstr "_Сохранить в файл"
 
-#: src/interface.c:928
+#: src/interface.c:816
 msgid "LiVES: - Insert"
 msgstr "LiVES: - Вставить"
 
-#: src/interface.c:945
+#: src/interface.c:833
 msgid "_Number of times to insert"
 msgstr "_Количество раз для вставки"
 
-#: src/interface.c:954
+#: src/interface.c:842
 msgid "_Insert to fit audio"
 msgstr "_Вставить по совпадению звука"
 
-#: src/interface.c:968
+#: src/interface.c:856
 msgid "Insert _before selection"
 msgstr "Вставить _до выделенного"
 
-#: src/interface.c:970
+#: src/interface.c:858
 msgid "Insert clipboard before selected frames"
 msgstr "Вставить содержимое буфера обмена до выделенного кадра"
 
-#: src/interface.c:986
+#: src/interface.c:875
 msgid "Insert _after selection"
 msgstr "Вставить _за выделеннием"
 
-#: src/interface.c:988
+#: src/interface.c:877
 msgid "Insert clipboard after selected frames"
 msgstr "Вставить содержимое буфера обмена после выделенных кадров"
 
-#: src/interface.c:999
+#: src/interface.c:888
 msgid "Insert _with sound"
 msgstr "Вставить _со звуком"
 
-#: src/interface.c:1012
+#: src/interface.c:901
 msgid "Insert with_out sound"
 msgstr "Вставить бе_з звука"
 
-#: src/interface.c:1093
+#: src/interface.c:985
 msgid "LiVES: - Open Selection"
 msgstr "LiVES: - Открыть выбранное"
 
-#: src/interface.c:1111
+#: src/interface.c:1004
 msgid "Selection start time (sec)"
-msgstr ""
+msgstr "Выбор времени начала (сек)"
 
-#: src/interface.c:1117
+#: src/interface.c:1010
 msgid "Number of frames to open"
 msgstr "Количество кадров для открытия"
 
-#: src/interface.c:1193
+#: src/interface.c:1088
 msgid "LiVES: - Open Location"
 msgstr "LiVES: - Открыть путь"
 
-#: src/interface.c:1195
+#: src/interface.c:1090
 msgid "LiVES: - Open Youtube Clip"
 msgstr "LiVES: - Oткрыть фрагмент из Youtube"
 
-#: src/interface.c:1213
+#: src/interface.c:1109
 msgid ""
 "\n"
 "\n"
@@ -1476,7 +1469,7 @@
 "Потоки\n"
 "\n"
 
-#: src/interface.c:1216
+#: src/interface.c:1112
 msgid ""
 "\n"
 "\n"
@@ -1492,7 +1485,7 @@
 "программы.\n"
 "\n"
 
-#: src/interface.c:1220
+#: src/interface.c:1116
 msgid ""
 "Enter the URL of the clip below.\n"
 "E.g: http://www.youtube.com/watch?v=WCR6f6WzjP8\n"
@@ -1502,55 +1495,56 @@
 "Например: http://www.youtube.com/watch?v=WCR6f6WzjP8\n"
 "\n"
 
-#: src/interface.c:1231
+#: src/interface.c:1127
 msgid "URL : "
 msgstr "URL: "
 
-#: src/interface.c:1231
+#: src/interface.c:1127
 msgid "Youtube URL : "
 msgstr "Веб-ссылка Youtube : "
 
-#: src/interface.c:1235
+#: src/interface.c:1131
 msgid "Do not send bandwidth information"
 msgstr "Не посылать сведения о пропускной способности"
 
-#: src/interface.c:1237
+#: src/interface.c:1133
 msgid "Try this setting if you are having problems getting a stream"
 msgstr "Попробуйте эту настройку, если возникли проблемы с получением потока"
 
-#: src/interface.c:1258
+#: src/interface.c:1155
 msgid "Download to _Directory : "
 msgstr "Сохранить в _каталог : "
 
-#: src/interface.c:1276
+#: src/interface.c:1173
 msgid "Download _File Name : "
 msgstr "Имя загружаемого _файла : "
 
-#: src/interface.c:1281
+#: src/interface.c:1178
 msgid ".webm"
 msgstr ".webm"
 
-#: src/interface.c:1359
+#: src/interface.c:1256
 msgid "LiVES: - Rename Clip"
 msgstr "LiVES: - Переименовать клип"
 
-#: src/interface.c:1362
-msgid "LiVES: - Enter Set Name"
+#: src/interface.c:1258
+#, fuzzy
+msgid "LiVES: - Enter Set Name to Save as"
 msgstr "LiVES: - Введите имя набора"
 
-#: src/interface.c:1365
+#: src/interface.c:1260
 msgid "LiVES: - Enter a Set Name to Reload"
 msgstr ""
 
-#: src/interface.c:1368
+#: src/interface.c:1262
 msgid "LiVES: - Choose a Working Directory"
 msgstr "LiVES: - Выберите рабочий каталог"
 
-#: src/interface.c:1371
+#: src/interface.c:1264
 msgid "LiVES: - Rename Current Track"
 msgstr "LiVES: - Переименовать текущую дорожку"
 
-#: src/interface.c:1391
+#: src/interface.c:1283
 msgid ""
 "You need to enter a name for the current clip set.\n"
 "This will allow you reload the layout with the same clips later.\n"
@@ -1563,7 +1557,7 @@
 "LiVES напомнит вам о необходимости сохранить набор отрезков, когда вы "
 "попытаетесь выйти.\n"
 
-#: src/interface.c:1397
+#: src/interface.c:1289
 msgid ""
 "In order to export this project, you must enter a name for this clip set.\n"
 "This will also be used for the project name.\n"
@@ -1572,7 +1566,7 @@
 "отрезков.\n"
 "Оно так же будет использовано для имени проекта.\n"
 
-#: src/interface.c:1404
+#: src/interface.c:1296
 msgid ""
 "Welcome to LiVES !\n"
 "This startup wizard will guide you through the\n"
@@ -1582,7 +1576,7 @@
 "Мастер ознакомит вас с начальными настройками,\n"
 "таким образом вы сможете полноценно пользоваться программой.\n"
 
-#: src/interface.c:1408
+#: src/interface.c:1300
 msgid ""
 "\n"
 "First of all you need to choose a working directory for LiVES.\n"
@@ -1592,193 +1586,193 @@
 "Первоначально, вам необходимо выбрать рабочий каталог для LiVES.\n"
 "Это должен быть каталог с достаточным свободным местом.\n"
 
-#: src/interface.c:1427
+#: src/interface.c:1317
 msgid "New name "
 msgstr "Новое имя "
 
-#: src/interface.c:1430
+#: src/interface.c:1319
 msgid "Set name "
 msgstr "Имя набора "
 
-#: src/interface.c:1550
+#: src/interface.c:1435
 msgid "Use def_aults"
 msgstr "По умолчанию"
 
-#: src/interface.c:1553 src/interface.c:1840 src/preferences.c:2515
-#: src/preferences.c:2697
+#: src/interface.c:1437 src/interface.c:1709 src/preferences.c:2550
+#: src/preferences.c:2739
 msgid "_Advanced"
 msgstr "_Дополнительно"
 
-#: src/interface.c:1604
+#: src/interface.c:1487
 msgid "LiVES:- Select input device"
 msgstr "LiVES:- Выберите устройство ввода"
 
-#: src/interface.c:1622
+#: src/interface.c:1504
 msgid "Select input device:"
 msgstr "Выберите устройство ввода"
 
-#: src/interface.c:1686
+#: src/interface.c:1568
 msgid "LiVES:- Load CD Track"
 msgstr "LiVES:- Загрузить трек с CD"
 
-#: src/interface.c:1689
+#: src/interface.c:1570
 msgid "LiVES:- Select DVD Title/Chapter"
 msgstr "LiVES:- Выбрать на DVD название или главу"
 
-#: src/interface.c:1692
+#: src/interface.c:1572
 msgid "LiVES:- Select VCD Title"
 msgstr "LiVES:- Выбрать на VCD название"
 
-#: src/interface.c:1695
+#: src/interface.c:1574
 msgid "LiVES:- Change Maximum Visible Tracks"
 msgstr "LiVES:- Изменить максимальное количество видимых треков"
 
-#: src/interface.c:1698
+#: src/interface.c:1576
 msgid "LiVES:- Device details"
 msgstr "LiVES:- Сведения об устройстве"
 
-#: src/interface.c:1721
+#: src/interface.c:1598
 #, c-format
 msgid "Track to load (from %s)"
 msgstr "Трек для загрузки (из %s)"
 
-#: src/interface.c:1724
+#: src/interface.c:1600
 msgid "DVD Title"
 msgstr "Название DVD"
 
-#: src/interface.c:1727
+#: src/interface.c:1602
 msgid "VCD Title"
 msgstr "Название VCD"
 
-#: src/interface.c:1730
+#: src/interface.c:1604
 msgid "Maximum number of tracks to display"
 msgstr "Максимальное количество показываемых треков"
 
-#: src/interface.c:1733
+#: src/interface.c:1606
 msgid "Device:        /dev/video"
 msgstr "Устройство:        /dev/video"
 
-#: src/interface.c:1736
+#: src/interface.c:1608
 msgid "Device:        fw:"
 msgstr ""
 
-#: src/interface.c:1771
+#: src/interface.c:1641
 msgid "Chapter  "
 msgstr "Глава  "
 
-#: src/interface.c:1776
+#: src/interface.c:1645
 msgid "Channel  "
 msgstr "Канал  "
 
-#: src/interface.c:1791
+#: src/interface.c:1660
 msgid "Audio ID  "
 msgstr "ID аудио  "
 
-#: src/interface.c:1857
+#: src/interface.c:1726
 msgid "Input number"
 msgstr ""
 
-#: src/interface.c:1865
+#: src/interface.c:1734
 msgid "Use default width, height and FPS"
 msgstr "Использовать ширину, высоту и кадров/с. по умолчанию"
 
-#: src/interface.c:1879
+#: src/interface.c:1748
 msgid "Width"
 msgstr "Ширина"
 
-#: src/interface.c:1885
+#: src/interface.c:1754
 msgid "Height"
 msgstr "Высота"
 
-#: src/interface.c:1899
+#: src/interface.c:1768
 msgid "_Driver"
 msgstr "_Драйвер"
 
-#: src/interface.c:1902
+#: src/interface.c:1771
 msgid "_Output format"
 msgstr "Формат _вывода"
 
-#: src/interface.c:1998
+#: src/interface.c:1865
 msgid "LiVES:- Fade Audio In"
 msgstr "LiVES:- Усилить звук"
 
-#: src/interface.c:2001
+#: src/interface.c:1867
 msgid "LiVES:- Fade Audio Out"
 msgstr "LiVES:- Приглушить звук"
 
-#: src/interface.c:2017
+#: src/interface.c:1883
 msgid "Fade in over  "
 msgstr "Усилить звук на протяжении  "
 
-#: src/interface.c:2018
+#: src/interface.c:1884
 msgid "first"
 msgstr "первых"
 
-#: src/interface.c:2021
+#: src/interface.c:1886
 msgid "Fade out over  "
 msgstr "Приглушить на протяжении  "
 
-#: src/interface.c:2022
+#: src/interface.c:1887
 msgid "last"
 msgstr "последних"
 
-#: src/interface.c:2044
+#: src/interface.c:1909
 msgid "seconds."
 msgstr "секунд."
 
-#: src/interface.c:2052 src/saveplay.c:1507
+#: src/interface.c:1917 src/saveplay.c:1484
 msgid "selection"
 msgstr "выделения"
 
-#: src/interface.c:2092
+#: src/interface.c:1956
 msgid "LiVES: - File Comments (optional)"
 msgstr "LiVES: - Комментарии к файлу (не обязательно)"
 
-#: src/interface.c:2107
+#: src/interface.c:1971
 msgid "Title/Name : "
 msgstr "Название/Имя : "
 
-#: src/interface.c:2114
+#: src/interface.c:1978
 msgid "Author/Artist : "
 msgstr "Автор/Создатель : "
 
-#: src/interface.c:2121
+#: src/interface.c:1985
 msgid "Comments : "
 msgstr "Комментарии : "
 
-#: src/interface.c:2151
+#: src/interface.c:2015
 msgid "_Options"
 msgstr "_Параметры"
 
-#: src/interface.c:2158
+#: src/interface.c:2022
 msgid "Save _subtitles to file"
 msgstr "Сохранить _субтитры в файл"
 
-#: src/interface.c:2170
+#: src/interface.c:2033
 msgid "Subtitle file"
 msgstr "Файл субтитров"
 
-#: src/interface.c:2172
+#: src/interface.c:2035
 msgid "Browse..."
 msgstr "Обзор…"
 
-#: src/interface.c:2255
+#: src/interface.c:2132
 msgid "LiVES: - choose a device"
 msgstr "LiVES: - выберите устройство"
 
-#: src/interface.c:2259
+#: src/interface.c:2135
 msgid "LiVES: - choose a directory"
 msgstr "LiVES: - выберите папку"
 
-#: src/interface.c:2262
+#: src/interface.c:2137
 msgid "LiVES: - choose a file"
 msgstr "LiVES: - выберите файл"
 
-#: src/interface.c:2445
+#: src/interface.c:2381
 msgid "LiVES: - Cancel/Discard/Save"
 msgstr "LiVES: - Отменить/Сбросить изменения/Сохранить"
 
-#: src/interface.c:2460
+#: src/interface.c:2397
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has not been saved.\n"
@@ -1788,7 +1782,7 @@
 "Текущая схема размещения не была сохранена.\n"
 "Что вы хотите сделать?\n"
 
-#: src/interface.c:2463
+#: src/interface.c:2400
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has been changed since the last save.\n"
@@ -1798,7 +1792,7 @@
 "Текущая схема размещения была изменена при предыдущем сохранении.\n"
 "Что вы хотите сделать?\n"
 
-#: src/interface.c:2467
+#: src/interface.c:2404
 msgid ""
 "You are about to exit LiVES.\n"
 "The current clip set can be saved.\n"
@@ -1808,7 +1802,7 @@
 "Текущий набор отрезков может быть сохранён.\n"
 "Что вы хотите сделать?\n"
 
-#: src/interface.c:2468
+#: src/interface.c:2405
 msgid ""
 "The current clip set has not been saved.\n"
 "What would you like to do ?\n"
@@ -1816,7 +1810,7 @@
 "Текущий набор отрезков не был сохранён.\n"
 "Что вы хотите сделать?\n"
 
-#: src/interface.c:2472
+#: src/interface.c:2408
 msgid ""
 "The current layout has not been saved.\n"
 "What would you like to do ?\n"
@@ -1824,58 +1818,58 @@
 "Макет не был сохранён.\n"
 "Что вы хотите сделать?\n"
 
-#: src/interface.c:2475
+#: src/interface.c:2410
 msgid ""
 "The current layout has *not* been changed since it was last saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:2480
+#: src/interface.c:2415
 msgid ""
 "The current layout contains generated frames and cannot be retained.\n"
 "You may wish to render it before exiting multitrack mode.\n"
 msgstr ""
 
-#: src/interface.c:2483
+#: src/interface.c:2418
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout contains generated frames and cannot be retained.\n"
 "What do you wish to do ?"
 msgstr ""
 
-#: src/interface.c:2496
+#: src/interface.c:2431
 msgid "Clip set _name"
 msgstr "Название набора клипов"
 
-#: src/interface.c:2502
+#: src/interface.c:2437
 msgid "_Auto reload next time"
 msgstr "_Автоматически загрузить в следующий раз"
 
-#: src/interface.c:2538 src/interface.c:2547
+#: src/interface.c:2473 src/interface.c:2482
 msgid "_Wipe layout"
 msgstr "_Очистить макет"
 
-#: src/interface.c:2539
+#: src/interface.c:2474
 msgid "_Ignore changes"
 msgstr "_Игнорировать изменения"
 
-#: src/interface.c:2540
+#: src/interface.c:2475
 msgid "_Delete clip set"
 msgstr "_Удалить набор клипов"
 
-#: src/interface.c:2541
+#: src/interface.c:2476
 msgid "_Delete layout"
 msgstr "_Удалить макет"
 
-#: src/interface.c:2545
+#: src/interface.c:2480
 msgid "_Save layout"
 msgstr "_Сохранить макет"
 
-#: src/interface.c:2546
+#: src/interface.c:2481
 msgid "_Save clip set"
 msgstr "_Сохранить набор клипов"
 
-#: src/interface.c:2565
+#: src/interface.c:2502
 msgid ""
 "\n"
 "LiVES has detected a multitrack layout from a previous session.\n"
@@ -1885,57 +1879,57 @@
 "LiVES обнаружил многодорожечное размещение в прошлом сеансе работы.\n"
 "Хотите восстановить и использовать его ?\n"
 
-#: src/interface.c:2589
+#: src/interface.c:2528
 msgid "LiVES: - Disk Recovery Options"
 msgstr "LiVES: - Параметры восстановления диска"
 
-#: src/interface.c:2608
+#: src/interface.c:2549
 msgid "Delete _Orphaned Clips"
 msgstr ""
 
-#: src/interface.c:2609
+#: src/interface.c:2550
 msgid "Delete any clips which are not currently loaded or part of a set"
 msgstr "Удалить все незагруженные в данный момент фрагменты"
 
-#: src/interface.c:2622
+#: src/interface.c:2564
 msgid "Clear _Backup Files from Closed Clips"
 msgstr "Очистить _резервные файлы из закрытых фрагментов"
 
-#: src/interface.c:2633
+#: src/interface.c:2575
 msgid "Remove Sets which have _Layouts but no Clips"
 msgstr ""
 
-#: src/interface.c:2644
+#: src/interface.c:2586
 msgid "_Reset to Defaults"
 msgstr "По _умолчанию"
 
-#: src/interface.c:2651
+#: src/interface.c:2593
 msgid "_Accept"
 msgstr "_Принять"
 
-#: src/callbacks.c:198
+#: src/callbacks.c:208
 #, c-format
 msgid "Saving as set %s..."
 msgstr "Сохранить сборку как %s..."
 
-#: src/callbacks.c:833
+#: src/callbacks.c:852
 msgid "Please enter the name of the file to save the clip as.\n"
 msgstr "Введите имя файла, под которым сохранить фрагмент.\n"
 
-#: src/callbacks.c:841
+#: src/callbacks.c:860
 msgid "Please enter a valid URL for the download.\n"
 msgstr "Пожалуйста, введите правильную ссылку для загрузки.\n"
 
-#: src/callbacks.c:867
+#: src/callbacks.c:886
 #, c-format
 msgid "Downloading %s to %s..."
 msgstr "Загрузка %s в %s..."
 
-#: src/callbacks.c:895
+#: src/callbacks.c:912
 msgid "Downloading clip"
 msgstr "Загрузка фрагмента"
 
-#: src/callbacks.c:933
+#: src/callbacks.c:950
 msgid ""
 "\n"
 "LiVES was unable to download the clip.\n"
@@ -1947,17 +1941,19 @@
 "Пожалуйста, проверьте правильность ссылки, а также, \n"
 " установлена ли последняя версия youtube-dl.\n"
 
-#: src/callbacks.c:1114 src/callbacks.c:1149
+#: src/callbacks.c:1131 src/callbacks.c:1166
 msgid "This file"
 msgstr "Этот файл"
 
-#: src/callbacks.c:1115
+#: src/callbacks.c:1132
 msgid ""
 ",\n"
 " - including the current layout - "
 msgstr ""
+",\n"
+" - включая текущую раскладку - "
 
-#: src/callbacks.c:1117
+#: src/callbacks.c:1134
 #, c-format
 msgid ""
 "\n"
@@ -1967,7 +1963,7 @@
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1119
+#: src/callbacks.c:1136
 #, c-format
 msgid ""
 "\n"
@@ -1976,8 +1972,13 @@
 "\n"
 "Really close it ?"
 msgstr ""
+"\n"
+"%s\n"
+"используется в текущей раскладке.\n"
+"\n"
+"Всё равно закрыть?"
 
-#: src/callbacks.c:1150
+#: src/callbacks.c:1167
 msgid ""
 "Changes made to this clip have not been saved or backed up.\n"
 "\n"
@@ -1988,7 +1989,7 @@
 "\n"
 "Вы действительно хотите закрыть его ?"
 
-#: src/callbacks.c:1343
+#: src/callbacks.c:1356
 msgid ""
 "\n"
 "Invalid project file.\n"
@@ -1996,7 +1997,7 @@
 "\n"
 "Неправильный файл проекта.\n"
 
-#: src/callbacks.c:1356
+#: src/callbacks.c:1370
 #, c-format
 msgid ""
 "\n"
@@ -2018,33 +2019,33 @@
 "название или отказаться от этого.\n"
 "После чего вы можете импортировать новый проект.\n"
 
-#: src/callbacks.c:1366
+#: src/callbacks.c:1381
 #, c-format
 msgid "Importing the project %s as set %s..."
 msgstr "Импортировать проект %s как сборку %s..."
 
-#: src/callbacks.c:1386
+#: src/callbacks.c:1399
 msgid "Importing project"
 msgstr "Импорт проекта"
 
-#: src/callbacks.c:1472
+#: src/callbacks.c:1481
 #, c-format
 msgid "Exporting project %s..."
 msgstr "Экспорт проекта %s..."
 
-#: src/callbacks.c:1490
+#: src/callbacks.c:1497
 msgid "Exporting project"
 msgstr "Экспорт проекта"
 
-#: src/callbacks.c:1506
+#: src/callbacks.c:1513
 msgid "Backup as .lv1 file"
 msgstr "Сохранить резервную копию в файл .lv1"
 
-#: src/callbacks.c:1522
+#: src/callbacks.c:1529
 msgid "Restore .lv1 file"
 msgstr "Восстановить файл .lv1"
 
-#: src/callbacks.c:1664
+#: src/callbacks.c:1671
 msgid ""
 "\n"
 "\n"
@@ -2056,89 +2057,94 @@
 "Сборка будет удалена с диска.\n"
 "Вы уверены ?\n"
 
-#: src/callbacks.c:1725
+#: src/callbacks.c:1732
 #, c-format
 msgid "Deleting set %s..."
 msgstr "Удаление группы %s..."
 
-#: src/callbacks.c:1727
+#: src/callbacks.c:1734
 msgid "Deleting set..."
 msgstr "Удаление сборки..."
 
-#: src/callbacks.c:1731
+#: src/callbacks.c:1738
 msgid "Deleting set"
 msgstr "Удалить сборку"
 
-#: src/callbacks.c:1739
+#: src/callbacks.c:1746
 #, c-format
 msgid "Set %s was permanently deleted from the disk.\n"
 msgstr "Сборка %s была полностью удалена с диска.\n"
 
-#: src/callbacks.c:1787 src/callbacks.c:11764
+#: src/callbacks.c:1792 src/callbacks.c:11676
 msgid "Insert Silence"
 msgstr "Вставить тишину"
 
-#: src/callbacks.c:1840 src/callbacks.c:1923 src/callbacks.c:2086
+#: src/callbacks.c:1844 src/callbacks.c:1927 src/callbacks.c:2089
 msgid "Undoing"
 msgstr "Отмена операции"
 
-#: src/callbacks.c:1936 src/callbacks.c:2147
+#: src/callbacks.c:1940 src/callbacks.c:2150
 msgid "Restoring audio..."
 msgstr "Восстановление аудио..."
 
-#: src/callbacks.c:1952
+#: src/callbacks.c:1956
 msgid "Clearing frame images"
 msgstr "Очищение изображений кадра"
 
-#: src/callbacks.c:1985
+#: src/callbacks.c:1988
 msgid "Deleting excess frames"
-msgstr ""
+msgstr "Удаление избыточных кадров"
 
-#: src/callbacks.c:2229
+#: src/callbacks.c:2232
 #, c-format
 msgid "Length of video is now %d frames at %.3f frames per second.\n"
 msgstr "Сейчас длина видео составляет %d кадров при %.3f кадрах в секунду.\n"
 
-#: src/callbacks.c:2233 src/resample.c:683 src/resample.c:2166
+#: src/callbacks.c:2235 src/resample.c:678 src/resample.c:2133
 #, c-format
 msgid "Clipboard was resampled to %d frames.\n"
 msgstr "Буфер обмена был повторно выбран к кадрам %d.\n"
 
-#: src/callbacks.c:2394 src/callbacks.c:2423
+#: src/callbacks.c:2396 src/callbacks.c:2425
 msgid "Redoing"
 msgstr "Возврат операции"
 
-#: src/callbacks.c:2462
-#, c-format
-msgid "Copying frames %d to %d%s to the clipboard..."
+#: src/callbacks.c:2472
+#, fuzzy, c-format
+msgid "Copying frames %d to %d (with sound) to the clipboard..."
+msgstr "Копирование кадров в буфер обмена: с %d по %d%s..."
+
+#: src/callbacks.c:2474
+#, fuzzy, c-format
+msgid "Copying frames %d to %d to the clipboard..."
 msgstr "Копирование кадров в буфер обмена: с %d по %d%s..."
 
-#: src/callbacks.c:2525
+#: src/callbacks.c:2526
 msgid "Copying to the clipboard"
 msgstr "Копировать в буфер обмена"
 
-#: src/callbacks.c:2600
+#: src/callbacks.c:2601
 msgid "Cut"
 msgstr "Вырезать"
 
-#: src/callbacks.c:2641 src/callbacks.c:3068 src/callbacks.c:8026
+#: src/callbacks.c:2641 src/callbacks.c:3063 src/callbacks.c:7631
 msgid "Pulling frames from clipboard"
-msgstr ""
+msgstr "Вставка кадров из буфера"
 
 #: src/callbacks.c:2654
 #, c-format
 msgid "Pasting %d frames to new clip %s..."
 msgstr "Вставка %d кадров в новый фрагмент %s..."
 
-#: src/callbacks.c:2678
+#: src/callbacks.c:2676
 msgid "Pasting"
 msgstr "Вставить"
 
-#: src/callbacks.c:2694
+#: src/callbacks.c:2692
 msgid "...added audio..."
 msgstr "...добавлен звук..."
 
-#: src/callbacks.c:2778
+#: src/callbacks.c:2775
 msgid ""
 "This operation requires resizing or converting of frames.\n"
 "Please install 'convert' from the Image-magick package, and then restart "
@@ -2148,7 +2154,7 @@
 "Пожалуйста установите 'convert' из пакета Image-magick, и затем "
 "перезапустите LiVES.\n"
 
-#: src/callbacks.c:2795
+#: src/callbacks.c:2793
 msgid ""
 "\n"
 "\n"
@@ -2162,7 +2168,7 @@
 "Выберите все кадры и обратитесь к функции \n"
 "'Trim Audio' в меню Аудио."
 
-#: src/callbacks.c:2819
+#: src/callbacks.c:2817
 msgid ""
 "LiVES cannot insert because the audio rates do not match.\n"
 "Please install 'sox', and try again."
@@ -2171,7 +2177,7 @@
 "соответствуют.\n"
 "Пожалуйста установите 'sox', и попробуйте снова."
 
-#: src/callbacks.c:2838
+#: src/callbacks.c:2835
 msgid ""
 "\n"
 "Insertion will cause frames to shift in some multitrack layouts.\n"
@@ -2181,7 +2187,7 @@
 "Вставка кадров приведет к сдвигу в размещении мультитрековых дорожек.\n"
 "Вы уверены, что хотите продолжить ?\n"
 
-#: src/callbacks.c:2888 src/callbacks.c:11692
+#: src/callbacks.c:2883 src/callbacks.c:11606
 msgid ""
 "\n"
 "Insertion will cause audio to shift in some multitrack layouts.\n"
@@ -2191,11 +2197,11 @@
 "Вставка звука приведет к сдвигу в размещении мультитрековых дорожек.\n"
 "Вы уверены, что хотите продолжить ?\n"
 
-#: src/callbacks.c:2996 src/callbacks.c:3025
+#: src/callbacks.c:2987 src/callbacks.c:3016
 msgid "Resampling clipboard audio"
 msgstr "Повторный выбор буфера обмена звука"
 
-#: src/callbacks.c:3041
+#: src/callbacks.c:3032
 msgid ""
 "\n"
 "\n"
@@ -2207,7 +2213,7 @@
 "LiVES не может повторно выбрать буфер обмена звука. \n"
 "Буфер обмена звука был очищен.\n"
 
-#: src/callbacks.c:3055
+#: src/callbacks.c:3045
 msgid ""
 "\n"
 "\n"
@@ -2216,30 +2222,30 @@
 "using unchanged audio ?\n"
 msgstr ""
 
-#: src/callbacks.c:3137 src/callbacks.c:3311
+#: src/callbacks.c:3132 src/callbacks.c:3299
 #, c-format
 msgid "Inserting %d%s frames from the clipboard..."
 msgstr "Будут вставлены %d%s кадров из буфера обмена..."
 
-#: src/callbacks.c:3162 src/callbacks.c:3236 src/callbacks.c:3339
+#: src/callbacks.c:3155 src/callbacks.c:3224 src/callbacks.c:3325
 msgid "Inserting"
 msgstr "Вставка"
 
-#: src/callbacks.c:3193
+#: src/callbacks.c:3187
 #, c-format
 msgid "Inserting %d times from the clipboard%s..."
 msgstr "Вставка %d отрезка из буфера обмена%s..."
 
-#: src/callbacks.c:3200
+#: src/callbacks.c:3191
 #, c-format
 msgid "Inserting %d frames from the clipboard%s..."
 msgstr "Вставка %d кадров из буфера обмена%s..."
 
-#: src/callbacks.c:3418
+#: src/callbacks.c:3404
 msgid "Insert"
 msgstr "Вставить"
 
-#: src/callbacks.c:3486
+#: src/callbacks.c:3471
 msgid ""
 "\n"
 "Deleting all frames will close this file.\n"
@@ -2249,7 +2255,7 @@
 "Удаление всех файлов приведет к закрытию файла.\n"
 "Вы уверены ?"
 
-#: src/callbacks.c:3495
+#: src/callbacks.c:3480
 msgid ""
 "\n"
 "Deletion will cause missing frames in some multitrack layouts.\n"
@@ -2260,8 +2266,8 @@
 "дорожек.\n"
 "Вы уверены, что хотите продолжить ?\n"
 
-#: src/callbacks.c:3515 src/callbacks.c:10920 src/callbacks.c:11162
-#: src/callbacks.c:11228
+#: src/callbacks.c:3500 src/callbacks.c:10851 src/callbacks.c:11087
+#: src/callbacks.c:11152
 msgid ""
 "\n"
 "Deletion will cause missing audio in some multitrack layouts.\n"
@@ -2272,7 +2278,7 @@
 "дорожек.\n"
 "Вы уверены, что хотите продолжить ?\n"
 
-#: src/callbacks.c:3534
+#: src/callbacks.c:3519
 msgid ""
 "\n"
 "Deletion will cause frames to shift in some multitrack layouts.\n"
@@ -2283,7 +2289,7 @@
 "дорожек.\n"
 "Вы уверены, что хотите продолжить ?\n"
 
-#: src/callbacks.c:3553 src/callbacks.c:11210
+#: src/callbacks.c:3538 src/callbacks.c:11134
 msgid ""
 "\n"
 "Deletion will cause audio to shift in some multitrack layouts.\n"
@@ -2294,20 +2300,20 @@
 "дорожек.\n"
 "Вы уверены, что хотите продолжить ?\n"
 
-#: src/callbacks.c:3611
+#: src/callbacks.c:3597
 #, c-format
 msgid "Deleting frames %d to %d%s..."
 msgstr "Удаление кадров с %d по %d%s..."
 
-#: src/callbacks.c:3636
+#: src/callbacks.c:3619
 msgid "Deleting"
 msgstr "Удаление"
 
-#: src/callbacks.c:3717
+#: src/callbacks.c:3699
 msgid "Delete"
 msgstr "Удалить"
 
-#: src/callbacks.c:3738
+#: src/callbacks.c:3717
 msgid ""
 "\n"
 "\n"
@@ -2317,7 +2323,7 @@
 "\n"
 "Выбранное заблокировано.\n"
 
-#: src/callbacks.c:4092
+#: src/callbacks.c:4056
 msgid ""
 "Ready to record. Use 'control' and cursor keys during playback to record "
 "your performance.\n"
@@ -2325,11 +2331,11 @@
 "play.)\n"
 msgstr ""
 
-#: src/callbacks.c:4098
+#: src/callbacks.c:4061
 msgid "Record cancelled.\n"
 msgstr "Запись отменена.\n"
 
-#: src/callbacks.c:4237
+#: src/callbacks.c:4197
 #, c-format
 msgid ""
 "\n"
@@ -2342,7 +2348,7 @@
 "Отчеты плагина '%s':\n"
 "%s\n"
 
-#: src/callbacks.c:4241
+#: src/callbacks.c:4200
 #, c-format
 msgid ""
 "\n"
@@ -2355,7 +2361,7 @@
 "Невозможно найти метод 'init' в плагине %s.\n"
 "Плагин, возможно, поврежден или неправильно установлен."
 
-#: src/callbacks.c:4571
+#: src/callbacks.c:4532
 #, c-format
 msgid ""
 "Saving the set will cause copies of all loaded clips to remain on the disk"
@@ -2368,22 +2374,22 @@
 "\n"
 "Пожалуйста нажмите \"Отмена\", если вам это не нужно.\n"
 
-#: src/callbacks.c:4654
+#: src/callbacks.c:4617
 #, c-format
 msgid "Saving set %s"
 msgstr "Сохранение сборки %s"
 
-#: src/callbacks.c:5005
+#: src/callbacks.c:4964
 #, c-format
 msgid "Loading clips from set %s"
 msgstr "Загрузка клипов из сборки %s"
 
-#: src/callbacks.c:5093
+#: src/callbacks.c:5051
 #, c-format
 msgid "%d clips and %d layouts were recovered from set (%s).\n"
 msgstr ""
 
-#: src/callbacks.c:5312
+#: src/callbacks.c:5259
 msgid ""
 "LiVES will attempt to recover some disk space.\n"
 "You should ONLY run this if you have no other copies of LiVES running on "
@@ -2395,24 +2401,24 @@
 "этой машине.\n"
 "Нажмите OK для запуска.\n"
 
-#: src/callbacks.c:5317
+#: src/callbacks.c:5264
 msgid "Cleaning up disk space..."
 msgstr "Очистка места на диске..."
 
-#: src/callbacks.c:5387
+#: src/callbacks.c:5334
 msgid "Recovering disk space"
 msgstr "Восстановление свободного места на диске"
 
-#: src/callbacks.c:5439
+#: src/callbacks.c:5386
 #, c-format
 msgid "%s of disk space was recovered.\n"
 msgstr "%s свободного места на диске было восстановлено.\n"
 
-#: src/callbacks.c:5482
+#: src/callbacks.c:5428
 msgid "Resetting frame rates and frame values..."
 msgstr "Восстановление частоты кадров и значений кадров..."
 
-#: src/callbacks.c:5523
+#: src/callbacks.c:5469
 #, c-format
 msgid ""
 "\n"
@@ -2420,12 +2426,12 @@
 "Internal: %s (%d bpp) / %s\n"
 msgstr ""
 
-#: src/callbacks.c:5525
+#: src/callbacks.c:5471
 msgid "buffered"
 msgstr ""
 
-#: src/callbacks.c:5538 src/callbacks.c:5557 src/callbacks.c:5575
-#: src/callbacks.c:5609
+#: src/callbacks.c:5484 src/callbacks.c:5502 src/callbacks.c:5518
+#: src/callbacks.c:5551
 msgid ""
 "\n"
 "  Opening..."
@@ -2433,7 +2439,7 @@
 "\n"
 "  Открывание..."
 
-#: src/callbacks.c:5545
+#: src/callbacks.c:5490
 #, c-format
 msgid ""
 "\n"
@@ -2442,7 +2448,7 @@
 "\n"
 "(%d виртуальный)"
 
-#: src/callbacks.c:5548
+#: src/callbacks.c:5493
 #, c-format
 msgid ""
 "\n"
@@ -2451,7 +2457,7 @@
 "\n"
 "(%d декодированный)"
 
-#: src/callbacks.c:5560 src/callbacks.c:5578 src/callbacks.c:5612
+#: src/callbacks.c:5504 src/callbacks.c:5520 src/callbacks.c:5553
 #, c-format
 msgid ""
 "\n"
@@ -2460,7 +2466,7 @@
 "\n"
 "  %.2f сек."
 
-#: src/callbacks.c:5569
+#: src/callbacks.c:5512
 msgid ""
 "\n"
 "  Unknown"
@@ -2468,23 +2474,23 @@
 "\n"
 "  Неизвестно"
 
-#: src/callbacks.c:5582 src/callbacks.c:5596
+#: src/callbacks.c:5524 src/callbacks.c:5538
 msgid "unsigned"
 msgstr "неподписан"
 
-#: src/callbacks.c:5583 src/callbacks.c:5597
+#: src/callbacks.c:5525 src/callbacks.c:5539
 msgid "signed"
 msgstr "подписан"
 
-#: src/callbacks.c:5585 src/callbacks.c:5599
+#: src/callbacks.c:5527 src/callbacks.c:5541
 msgid "big-endian"
 msgstr "big-endian"
 
-#: src/callbacks.c:5586 src/callbacks.c:5600
+#: src/callbacks.c:5528 src/callbacks.c:5542
 msgid "little-endian"
 msgstr "little-endian"
 
-#: src/callbacks.c:5588 src/callbacks.c:5602
+#: src/callbacks.c:5530 src/callbacks.c:5544
 #, c-format
 msgid ""
 "  %d Hz %d bit\n"
@@ -2493,7 +2499,7 @@
 "  %d Гц %d бит\n"
 "%s %s"
 
-#: src/callbacks.c:5707
+#: src/callbacks.c:5647
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -2510,15 +2516,15 @@
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA.\n"
 msgstr ""
 
-#: src/callbacks.c:5721
+#: src/callbacks.c:5661
 msgid "A video editor and VJ program."
 msgstr "Видеоредактор и VJ-студия."
 
-#: src/callbacks.c:5722
+#: src/callbacks.c:5662
 msgid "About LiVES"
 msgstr "Сведения о LiVES"
 
-#: src/callbacks.c:5724
+#: src/callbacks.c:5664
 msgid "translator_credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -2527,9 +2533,10 @@
 "  Eugene Marshal https://launchpad.net/~lowrider\n"
 "  Georgiy https://launchpad.net/~g-trofimof\n"
 "  Guybrush88 https://launchpad.net/~guybrush\n"
-"  Sergey Sedov https://launchpad.net/~serg-sedov"
+"  Sergey Sedov https://launchpad.net/~serg-sedov\n"
+"  ☠Jay ZDLin☠ https://launchpad.net/~black-buddha666"
 
-#: src/callbacks.c:5758
+#: src/callbacks.c:5699
 #, c-format
 msgid ""
 "LiVES Version %s\n"
@@ -2543,7 +2550,7 @@
 "Homepage: http://lives.sourceforge.net"
 msgstr ""
 
-#: src/callbacks.c:6037
+#: src/callbacks.c:5996
 #, fuzzy
 msgid ""
 "\n"
@@ -2555,7 +2562,7 @@
 "Чтобы выполнить предварительный просмотр этого файла, установите mplayer или "
 "imageMagick.\n"
 
-#: src/callbacks.c:6040
+#: src/callbacks.c:5998
 #, fuzzy
 msgid ""
 "\n"
@@ -2568,43 +2575,7 @@
 "Чтобы выполнить предварительный просмотр этого файла, установите mplayer или "
 "imageMagick.\n"
 
-#: src/callbacks.c:6423 src/callbacks.c:8289
-msgid ""
-"\n"
-"Loading new audio may cause missing audio in some multitrack layouts.\n"
-"Are you sure you wish to continue ?\n"
-"."
-msgstr ""
-"\n"
-"Загрузка нового звука может вызвать потерю звука в размещении некоторых "
-"мультитрековых дорожек.\n"
-"Вы уверены, что хотите продолжить ?\n"
-"."
-
-#: src/callbacks.c:6523
-#, c-format
-msgid "Opening audio %s, type %s..."
-msgstr "Открывание звука %s, тип %s..."
-
-#: src/callbacks.c:6556 src/saveplay.c:480
-msgid "Opening audio"
-msgstr "Открывание звука"
-
-#: src/callbacks.c:6565 src/callbacks.c:6612 src/callbacks.c:8387
-#: src/callbacks.c:8429 src/callbacks.c:8472 src/callbacks.c:10846
-msgid "Cancelling"
-msgstr "Отмена"
-
-#: src/callbacks.c:6660 src/callbacks.c:8514 src/callbacks.c:10876
-#: src/callbacks.c:11563
-msgid "Committing audio"
-msgstr "Наложение звука"
-
-#: src/callbacks.c:6672 src/callbacks.c:8546
-msgid "New Audio"
-msgstr "Новый звук"
-
-#: src/callbacks.c:6779
+#: src/callbacks.c:6459
 #, c-format
 msgid ""
 "Text was saved as\n"
@@ -2613,152 +2584,183 @@
 "Текст сохранен как\n"
 "%s\n"
 
-#: src/callbacks.c:6951 src/saveplay.c:3618
-#, c-format
-msgid "%d frames are enough !\n"
-msgstr "%d кадров достаточно !\n"
-
-#: src/callbacks.c:7050
+#: src/callbacks.c:6706
 msgid "LiVES: - Encoder debug output"
 msgstr "LiVES: - Вывод отладки кодировщика"
 
-#: src/callbacks.c:7087 src/gui.c:1922
+#: src/callbacks.c:6743 src/gui.c:1921
 msgid "Fullscreen playback (f)"
 msgstr "Полноэкранное воспроизведение"
 
-#: src/callbacks.c:7089
+#: src/callbacks.c:6744
 msgid "Fullscreen playback off (f)"
 msgstr "Выключить полноэкранное воспроизведение"
 
-#: src/callbacks.c:7188 src/callbacks.c:7336 src/callbacks.c:7664
-#: src/callbacks.c:7681 src/gui.c:3712 src/saveplay.c:2467 src/saveplay.c:2501
-#: src/saveplay.c:3115 src/saveplay.c:3220 src/saveplay.c:3239
-#: src/multitrack.c:9340 src/multitrack.c:11060
+#: src/callbacks.c:6841 src/callbacks.c:6983 src/callbacks.c:7283
+#: src/callbacks.c:7298 src/gui.c:3838 src/saveplay.c:2442 src/saveplay.c:2475
+#: src/saveplay.c:3074 src/saveplay.c:3178 src/saveplay.c:3197
+#: src/multitrack.c:9526 src/multitrack.c:11288
 #, c-format
 msgid " (%d %% scale)"
 msgstr ""
 
-#: src/callbacks.c:7190 src/callbacks.c:7338 src/callbacks.c:7666
-#: src/gui.c:3716 src/saveplay.c:2469 src/saveplay.c:2503
+#: src/callbacks.c:6843 src/callbacks.c:6985 src/callbacks.c:7285
+#: src/gui.c:3842 src/saveplay.c:2444 src/saveplay.c:2477
 #, c-format
 msgid "LiVES: - Play Window%s"
 msgstr "LiVES: - Окно воспроизведения %s"
 
-#: src/callbacks.c:7302 src/gui.c:1907
+#: src/callbacks.c:6950 src/gui.c:1906
 msgid "Double size (d)"
 msgstr "Двойной размер (d)"
 
-#: src/callbacks.c:7309
+#: src/callbacks.c:6956
 msgid "Single size (d)"
 msgstr "Стандартный размер (d)"
 
-#: src/callbacks.c:7442 src/callbacks.c:7443
+#: src/callbacks.c:7087 src/callbacks.c:7088
 msgid "Hide the play window (s)"
 msgstr "Скрыть окно проигрывателя (s)"
 
-#: src/callbacks.c:7452 src/gui.c:1746
+#: src/callbacks.c:7096 src/gui.c:1744
 msgid "Show the play window (s)"
 msgstr "Показать окно проигрывателя (s)"
 
-#: src/callbacks.c:7453 src/gui.c:1896
+#: src/callbacks.c:7097 src/gui.c:1895
 msgid "Play in separate window (s)"
 msgstr "Проигрывать в отдельном окне (s)"
 
-#: src/callbacks.c:7535 src/gui.c:4060 src/saveplay.c:2498
+#: src/callbacks.c:7175 src/gui.c:4169 src/saveplay.c:2472
 msgid "LiVES: - Streaming"
 msgstr ""
 
-#: src/callbacks.c:7778
+#: src/callbacks.c:7388
 msgid "Switch continuous looping off (o)"
 msgstr "Режим непрывного выполнения цикла выключен (o)"
 
-#: src/callbacks.c:7785 src/gui.c:1795
+#: src/callbacks.c:7394 src/gui.c:1793
 msgid "Switch continuous looping on (o)"
 msgstr "Режим непрывного выполнения цикла включен (o)"
 
-#: src/callbacks.c:7837
+#: src/callbacks.c:7444
 #, c-format
 msgid "Audio volume (%.2f)"
 msgstr "Громкость звука (%.2f)"
 
-#: src/callbacks.c:7876 src/callbacks.c:7877 src/gui.c:3640
+#: src/callbacks.c:7483 src/callbacks.c:7484 src/gui.c:3766
 msgid "Unmute the audio (z)"
 msgstr "Включить звук (z)"
 
-#: src/callbacks.c:7888 src/callbacks.c:7889 src/gui.c:1808 src/gui.c:3639
+#: src/callbacks.c:7494 src/callbacks.c:7495 src/gui.c:1806 src/gui.c:3765
 msgid "Mute the audio (z)"
 msgstr "Выключить звук (z)"
 
-#: src/callbacks.c:8038
+#: src/callbacks.c:7643
 msgid "Reversing clipboard..."
 msgstr "Изменение буфера обмена..."
 
-#: src/callbacks.c:8052
+#: src/callbacks.c:7657
 msgid "Reversing clipboard"
 msgstr "Изменение буфера обмена"
 
-#: src/callbacks.c:8084
+#: src/callbacks.c:7689
 msgid "LiVES: Load subtitles from..."
 msgstr "LiVES: Загрузить субтитры из..."
 
-#: src/callbacks.c:8151 src/saveplay.c:970
+#: src/callbacks.c:7753 src/saveplay.c:956
 #, c-format
 msgid "Loaded subtitle file: %s\n"
 msgstr "Загружен файл субтитров: %s\n"
 
-#: src/callbacks.c:8220
+#: src/callbacks.c:7821
 msgid "Subtitles were erased.\n"
 msgstr "Субтитры были стёрты.\n"
 
-#: src/callbacks.c:8239
+#: src/callbacks.c:7843
 msgid "LiVES: - Select Audio File"
 msgstr "LiVES: - Выберите звуковой файл"
 
-#: src/callbacks.c:8250
+#: src/callbacks.c:7878 src/callbacks.c:8232
+msgid ""
+"\n"
+"Loading new audio may cause missing audio in some multitrack layouts.\n"
+"Are you sure you wish to continue ?\n"
+"."
+msgstr ""
+"\n"
+"Загрузка нового звука может вызвать потерю звука в размещении некоторых "
+"мультитрековых дорожек.\n"
+"Вы уверены, что хотите продолжить ?\n"
+"."
+
+#: src/callbacks.c:7989
+#, c-format
+msgid "Opening audio %s, type %s..."
+msgstr "Открывание звука %s, тип %s..."
+
+#: src/callbacks.c:8023 src/saveplay.c:477
+msgid "Opening audio"
+msgstr "Открывание звука"
+
+#: src/callbacks.c:8032 src/callbacks.c:8083 src/callbacks.c:8327
+#: src/callbacks.c:8369 src/callbacks.c:8412 src/callbacks.c:10766
+msgid "Cancelling"
+msgstr "Отмена"
+
+#: src/callbacks.c:8137 src/callbacks.c:8454 src/callbacks.c:10803
+#: src/callbacks.c:11477
+msgid "Committing audio"
+msgstr "Наложение звука"
+
+#: src/callbacks.c:8153 src/callbacks.c:8484
+msgid "New Audio"
+msgstr "Новый звук"
+
+#: src/callbacks.c:8194
 msgid "Please set your CD play device in Tools | Preferences | Misc\n"
 msgstr ""
 "Пожалуйста, выберите ваше устройство для проигрывания CD в Инструменты | "
 "Предпочтения | Прочее\n"
 
-#: src/callbacks.c:8321
+#: src/callbacks.c:8264
 #, c-format
 msgid "Opening CD track %d from %s..."
 msgstr "Открыть CD трэк %d из %s..."
 
-#: src/callbacks.c:8326
+#: src/callbacks.c:8267
 #, c-format
 msgid "CD track %d"
 msgstr "CD трэк %d"
 
-#: src/callbacks.c:8373
+#: src/callbacks.c:8313
 msgid "Opening CD track..."
 msgstr "Открытие CD трэка..."
 
-#: src/callbacks.c:8415 src/callbacks.c:8461
+#: src/callbacks.c:8355 src/callbacks.c:8401
 msgid "Error loading CD track\n"
 msgstr "Ошибка загрузки CD трэка\n"
 
-#: src/callbacks.c:8584
+#: src/callbacks.c:8518
 msgid "layout errors"
 msgstr "ошибка размещения"
 
-#: src/callbacks.c:8595
+#: src/callbacks.c:8529
 msgid "Close _Window"
 msgstr "Закрыть окно (_W)"
 
-#: src/callbacks.c:8606
+#: src/callbacks.c:8540
 msgid "Clear _Errors"
 msgstr "Убрать ошибки (_E)"
 
-#: src/callbacks.c:8617
+#: src/callbacks.c:8551
 msgid "_Delete affected layouts"
 msgstr "Удалить затронутые слои размещения (_D)"
 
-#: src/callbacks.c:9343 src/callbacks.c:9388
+#: src/callbacks.c:9253 src/callbacks.c:9298
 msgid "Resume"
 msgstr "Продолжить"
 
-#: src/callbacks.c:9344
+#: src/callbacks.c:9254
 msgid ""
 "\n"
 "Paused\n"
@@ -2768,27 +2770,23 @@
 "Приостановлено\n"
 "(Щёлкните Возобновить, чтобы продолжить процесс)"
 
-#: src/callbacks.c:9345 src/callbacks.c:9406
+#: src/callbacks.c:9255 src/callbacks.c:9315
 msgid "paused..."
 msgstr "приостановлено..."
 
-#: src/callbacks.c:9372 src/callbacks.c:9418
-msgid "Pause"
-msgstr "Приостановить"
-
-#: src/callbacks.c:9374 src/callbacks.c:9421
+#: src/callbacks.c:9284 src/callbacks.c:9333
 msgid "resumed..."
 msgstr "возобновление..."
 
-#: src/callbacks.c:9393
+#: src/callbacks.c:9303
 msgid "Keep"
 msgstr "Оставить"
 
-#: src/callbacks.c:9396
+#: src/callbacks.c:9305
 msgid "Enough"
 msgstr ""
 
-#: src/callbacks.c:9401
+#: src/callbacks.c:9310
 #, c-format
 msgid ""
 "\n"
@@ -2797,28 +2795,28 @@
 "(click Resume to continue processing)"
 msgstr ""
 
-#: src/callbacks.c:9419
+#: src/callbacks.c:9331
 msgid "Cancel"
 msgstr "Отмена"
 
-#: src/callbacks.c:9558
+#: src/callbacks.c:9478
 msgid "Stop"
 msgstr "Остановить"
 
-#: src/callbacks.c:10053 src/multitrack.c:13247
+#: src/callbacks.c:9968 src/multitrack.c:13489
 msgid "LiVES: Selected frame"
 msgstr "LiVES: Выбранный кадр"
 
-#: src/callbacks.c:10061
+#: src/callbacks.c:9976
 msgid "_Save frame as..."
 msgstr "_Сохранить кадр как..."
 
-#: src/callbacks.c:10290
+#: src/callbacks.c:10202
 #, c-format
 msgid "Audio is ahead of video by %.4f secs. at frame %d, with fps %.4f\n"
 msgstr "Звук опережает видео на %.4f c. с кадра %d с частотой кадров/с. %.4f\n"
 
-#: src/callbacks.c:10347
+#: src/callbacks.c:10255
 msgid ""
 "\n"
 "\n"
@@ -2827,7 +2825,7 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10353
+#: src/callbacks.c:10261
 msgid ""
 "\n"
 "\n"
@@ -2839,7 +2837,7 @@
 "Вы должны установить \"xwininfo\" перед использованием этой опции\n"
 "\n"
 
-#: src/callbacks.c:10429 src/callbacks.c:11479
+#: src/callbacks.c:10334 src/callbacks.c:11395
 msgid ""
 "\n"
 "Record time must be greater than 0.\n"
@@ -2847,7 +2845,7 @@
 "\n"
 "Время записи должно быть не нулевым.\n"
 
-#: src/callbacks.c:10440
+#: src/callbacks.c:10346
 msgid ""
 "Capture an External Window:\n"
 "\n"
@@ -2861,11 +2859,11 @@
 "Кликните 'Отмена' чтобы отказаться\n"
 "\n"
 
-#: src/callbacks.c:10445
+#: src/callbacks.c:10351
 msgid "External window was released.\n"
 msgstr "Было выпущено внешнее окно.\n"
 
-#: src/callbacks.c:10479
+#: src/callbacks.c:10385
 msgid ""
 "Click on a Window to Capture it\n"
 "Press 'q' to stop recording"
@@ -2873,7 +2871,7 @@
 "Кликните на окне для его захвата\n"
 "Нажмите 'q' для остановки записи"
 
-#: src/callbacks.c:10513
+#: src/callbacks.c:10419
 #, c-format
 msgid ""
 "\n"
@@ -2888,19 +2886,19 @@
 "Остановить или 'q' для выхода.\n"
 "(По-умолчанию используется %.3f кадров в секунду.)\n"
 
-#: src/callbacks.c:10539
+#: src/callbacks.c:10443
 msgid "LiVES was unable to capture this window. Sorry.\n"
 msgstr "LiVES не может захватить это окно. Извините.\n"
 
-#: src/callbacks.c:10695
+#: src/callbacks.c:10601
 msgid "Export Selected Audio as..."
 msgstr "Экспортировать выбранный звук как..."
 
-#: src/callbacks.c:10699
+#: src/callbacks.c:10604
 msgid "Export Audio as..."
 msgstr "Экспортировать звук как..."
 
-#: src/callbacks.c:10714
+#: src/callbacks.c:10619
 msgid ""
 "\n"
 "\n"
@@ -2914,86 +2912,86 @@
 "Кликните 'OK' для экспорта с новой скоростью, или 'Отмена' для экспорта "
 "оригинала.\n"
 
-#: src/callbacks.c:10720
+#: src/callbacks.c:10625
 #, c-format
 msgid "Exporting audio frames %d to %d as %s..."
 msgstr "Экспорт звука кадров с %d по %d как %s..."
 
-#: src/callbacks.c:10725
+#: src/callbacks.c:10629
 #, c-format
 msgid "Exporting audio as %s..."
 msgstr "Экспорт звука как %s..."
 
-#: src/callbacks.c:10751
+#: src/callbacks.c:10655
 msgid "Exporting audio"
 msgstr "Экспортирование звука"
 
-#: src/callbacks.c:10782
+#: src/callbacks.c:10695
 msgid "LiVES: - Append Audio File"
 msgstr "LiVES: - Добавить звуковой файл"
 
-#: src/callbacks.c:10825
+#: src/callbacks.c:10739
 #, c-format
 msgid "Appending audio file %s..."
 msgstr "Добавление звукового файла %s..."
 
-#: src/callbacks.c:10836
+#: src/callbacks.c:10756
 msgid "Appending audio"
 msgstr "Добавление звука"
 
-#: src/callbacks.c:10892
+#: src/callbacks.c:10818
 msgid "Append Audio"
 msgstr "Добавить звук"
 
-#: src/callbacks.c:10952
+#: src/callbacks.c:10883
 #, c-format
 msgid "Padding audio to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10954
+#: src/callbacks.c:10885
 #, c-format
 msgid "Trimming audio from %.2f to %.2f seconds..."
 msgstr "Удаление звука с %.2f по %.2f секунды..."
 
-#: src/callbacks.c:10973
+#: src/callbacks.c:10904
 msgid "Trimming/Padding audio"
 msgstr ""
 
-#: src/callbacks.c:10981
+#: src/callbacks.c:10912
 msgid "Trim/Pad Audio"
 msgstr "Удаление/Добавление звука"
 
-#: src/callbacks.c:11055
+#: src/callbacks.c:10982
 msgid "Fading audio in"
 msgstr "Изменение входящего звука"
 
-#: src/callbacks.c:11056
+#: src/callbacks.c:10983
 msgid "Fade audio in"
 msgstr "Изменить входящий звук"
 
-#: src/callbacks.c:11061
+#: src/callbacks.c:10987
 msgid "Fading audio out"
 msgstr "Изменение исходящего звука"
 
-#: src/callbacks.c:11062
+#: src/callbacks.c:10988
 msgid "Fade audio out"
 msgstr "Изменить исходящий звук"
 
-#: src/callbacks.c:11085
+#: src/callbacks.c:11011
 #, c-format
 msgid "%s over %.1f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11087
+#: src/callbacks.c:11013
 #, c-format
 msgid "%s from time %.2f seconds to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11094
+#: src/callbacks.c:11020
 msgid "Fading audio..."
 msgstr "Изменение звука..."
 
-#: src/callbacks.c:11194
+#: src/callbacks.c:11119
 msgid ""
 "\n"
 "Deleting all audio will close this file.\n"
@@ -3003,949 +3001,949 @@
 "Удаление всего звука приведет к закрытию файла.\n"
 "Вы уверены ?"
 
-#: src/callbacks.c:11197
+#: src/callbacks.c:11122
 msgid "Deleting all audio..."
 msgstr "Удаление всего звука..."
 
-#: src/callbacks.c:11203
+#: src/callbacks.c:11127
 #, c-format
 msgid "Deleting audio from %.2f to %.2f seconds..."
 msgstr "Удаление звука с %.2f по %.2f секунды..."
 
-#: src/callbacks.c:11290
+#: src/callbacks.c:11214
 msgid "Deleting Audio"
 msgstr "Удаление звука"
 
-#: src/callbacks.c:11297
+#: src/callbacks.c:11221
 msgid "Delete Audio"
 msgstr "Удалить звук"
 
-#: src/callbacks.c:11636
+#: src/callbacks.c:11550
 msgid "Record new audio"
 msgstr "Записать новый звук"
 
-#: src/callbacks.c:11725
+#: src/callbacks.c:11640
 #, c-format
 msgid "Inserting silence from %.2f to %.2f seconds..."
 msgstr "Вставка тишины с %.2f по %.2f секунды..."
 
-#: src/callbacks.c:11754
+#: src/callbacks.c:11666
 msgid "Inserting Silence"
 msgstr "Вставка тишины"
 
-#: src/merge.c:85
+#: src/merge.c:96
 msgid "LiVES: - Merge"
 msgstr "LiVES: - Замещение"
 
-#: src/merge.c:102
+#: src/merge.c:113
 #, c-format
 msgid "Merge Clipboard [ %d Frames ]       With Selection [ %d Frames ]"
 msgstr "Заменить буфер обмена [ %d кадров ] выделенным [ %d кадров ]"
 
-#: src/merge.c:107
+#: src/merge.c:118
 #, c-format
 msgid ""
 "Merge Clipboard [ %d Frames (resampled) ]       With Selection [ %d Frames ]"
 msgstr ""
 
-#: src/merge.c:118
+#: src/merge.c:130
 msgid "Align _Starts"
 msgstr "Выровнить начало (_S)"
 
-#: src/merge.c:123
+#: src/merge.c:135
 msgid "Align _Ends"
 msgstr "Выровнить конец (_E)"
 
-#: src/merge.c:134
+#: src/merge.c:146
 msgid "What to do with extra clipboard frames -"
 msgstr ""
 
-#: src/merge.c:137
+#: src/merge.c:149
 msgid "_Insert Frames"
 msgstr "Вставить кадры (_I)"
 
-#: src/merge.c:143
+#: src/merge.c:155
 msgid "_Drop Frames"
 msgstr "Удалить кадры (_D)"
 
-#: src/merge.c:149
+#: src/merge.c:160
 msgid "Number of Times to Loop Clipboard"
 msgstr ""
 
-#: src/merge.c:160
+#: src/merge.c:171
 msgid "_Loop Clipboard to Fit Selection"
 msgstr ""
 
-#: src/merge.c:173
+#: src/merge.c:184
 msgid "_Transition Method:"
 msgstr "_Переходный метод:"
 
-#: src/merge.c:394
+#: src/merge.c:395
 msgid "Merging clipboard with selection..."
 msgstr ""
 
-#: src/merge.c:551
+#: src/merge.c:539
 msgid "Merge done.\n"
 msgstr "Слияние сделано.\n"
 
-#: src/gui.c:123
+#: src/gui.c:122
 msgid "_Custom Generators"
 msgstr ""
 
-#: src/gui.c:124
+#: src/gui.c:123
 msgid "_Custom Effects"
 msgstr "_Пользовательские"
 
-#: src/gui.c:125
+#: src/gui.c:124
 msgid "Custom _Utilities"
 msgstr ""
 
-#: src/gui.c:352 src/multitrack.c:5964
+#: src/gui.c:351 src/multitrack.c:6143
 msgid "_File"
 msgstr "_Файл"
 
-#: src/gui.c:367 src/multitrack.c:5989
+#: src/gui.c:366 src/multitrack.c:6168
 msgid "_Open File/Directory"
 msgstr "Открыть файл/директорию (_O)"
 
-#: src/gui.c:373
+#: src/gui.c:372
 msgid "O_pen Part of File..."
 msgstr "O_ткрыть часть файла..."
 
-#: src/gui.c:379 src/gui.c:383 src/multitrack.c:6006 src/multitrack.c:6023
-#: src/multitrack.c:6028
+#: src/gui.c:378 src/gui.c:382 src/multitrack.c:6185 src/multitrack.c:6202
+#: src/multitrack.c:6207
 msgid "Open _Location/Stream..."
 msgstr "Открыть размещение/поток (_L)..."
 
-#: src/gui.c:393 src/multitrack.c:6016
+#: src/gui.c:392 src/multitrack.c:6195
 msgid "Open _Youtube Clip..."
 msgstr "Oткрыть фрагмент из _Youtube..."
 
-#: src/gui.c:404
+#: src/gui.c:403
 msgid "Import from _dvd/vcd..."
 msgstr "Импортировать из _DVD/VCD..."
 
-#: src/gui.c:413
+#: src/gui.c:412
 msgid "Import from _dvd"
 msgstr "Импортировать из _DVD"
 
-#: src/gui.c:416
+#: src/gui.c:415
 msgid "Import from _vcd"
 msgstr "Импортировать из _VCD"
 
-#: src/gui.c:419
+#: src/gui.c:418
 msgid "_Import from Firewire"
 msgstr "_Импортировать через интерфейс Firewire"
 
-#: src/gui.c:428 src/multitrack.c:6086
+#: src/gui.c:427 src/multitrack.c:6265
 msgid "Import from _Firewire Device (dv)"
 msgstr "Импортировать с устройства _Firewire (dv)"
 
-#: src/gui.c:429 src/multitrack.c:6094
+#: src/gui.c:428 src/multitrack.c:6273
 msgid "Import from _Firewire Device (hdv)"
 msgstr "Импортировать с устройства _Firewire (hdv)"
 
-#: src/gui.c:457
+#: src/gui.c:456
 msgid "_Add Webcam/TV card..."
 msgstr "_Добавить веб-камеру или тв-карту..."
 
-#: src/gui.c:476
+#: src/gui.c:475
 msgid "Add _Unicap Device"
 msgstr ""
 
-#: src/gui.c:486
+#: src/gui.c:485
 msgid "Add Live _Firewire Device"
 msgstr ""
 
-#: src/gui.c:495
+#: src/gui.c:494
 msgid "Add _TV Device"
 msgstr "Добавить _телевизионное устройство"
 
-#: src/gui.c:510 src/multitrack.c:6117
+#: src/gui.c:509 src/multitrack.c:6296
 msgid "_Recent Files..."
 msgstr "_Последние файлы..."
 
-#: src/gui.c:560 src/multitrack.c:6177
+#: src/gui.c:559 src/multitrack.c:6356
 msgid "_Reload Clip Set..."
 msgstr ""
 
-#: src/gui.c:564 src/multitrack.c:6185
+#: src/gui.c:563 src/multitrack.c:6364
 msgid "Close/Sa_ve All Clips"
 msgstr "Закрыть/Сохрани_ть все фрагменты"
 
-#: src/gui.c:575
+#: src/gui.c:574
 msgid "_Encode Clip As..."
 msgstr "_Кодировать фрагмент как..."
 
-#: src/gui.c:577
+#: src/gui.c:576
 msgid "Encode _Selection As..."
 msgstr "Кодировать выбранное как (_S)..."
 
-#: src/gui.c:584
+#: src/gui.c:583
 msgid "_Close This Clip"
 msgstr "Закрыть текущий клип (_C)"
 
-#: src/gui.c:595
+#: src/gui.c:594
 msgid "_Backup Clip as .lv1..."
 msgstr "Сохранить клип как *.lv1 (_B) ..."
 
-#: src/gui.c:604
+#: src/gui.c:603
 msgid "_Restore Clip from .lv1..."
 msgstr "Восстановить клип из *.lv1 (_R) ..."
 
-#: src/gui.c:615
+#: src/gui.c:614
 msgid "Encode/Load/Backup _with Sound"
 msgstr "Кодировать/Загружать/Сохранять со звуком (_w)"
 
-#: src/gui.c:620
+#: src/gui.c:619
 msgid "Auto load subtitles"
 msgstr "Автоматическая загрузка субтитров"
 
-#: src/gui.c:628 src/multitrack.c:6224
+#: src/gui.c:627 src/multitrack.c:6403
 msgid "Clean _up Diskspace"
 msgstr "Очистить место на диске (_u)"
 
-#: src/gui.c:636 src/multitrack.c:6257
+#: src/gui.c:635 src/multitrack.c:6436
 msgid "_Edit"
 msgstr "_Правка"
 
-#: src/gui.c:685
+#: src/gui.c:684
 msgid "_MULTITRACK mode"
 msgstr "_MULTITRACK режим"
 
-#: src/gui.c:696
+#: src/gui.c:695
 msgid "_Copy Selection"
 msgstr "_Копировать выделенное"
 
-#: src/gui.c:705
+#: src/gui.c:704
 msgid "Cu_t Selection"
 msgstr "Вырез_ать выбора"
 
-#: src/gui.c:714
+#: src/gui.c:713
 msgid "_Insert from Clipboard..."
 msgstr "_Вставить из буфера обмена..."
 
-#: src/gui.c:730
+#: src/gui.c:729
 msgid "Paste as _New"
 msgstr "Вставить как _новое"
 
-#: src/gui.c:739
+#: src/gui.c:738
 msgid "_Merge Clipboard with Selection..."
 msgstr "_ Объединить содержимое буфера обмена с выделенным..."
 
-#: src/gui.c:746
+#: src/gui.c:745
 msgid "_Delete Selection"
 msgstr "Удалить _выделение"
 
-#: src/gui.c:764
+#: src/gui.c:763
 msgid "Decouple _Video from Audio"
 msgstr "Отделить _видео от звука"
 
-#: src/gui.c:772
+#: src/gui.c:771
 msgid "_Select..."
 msgstr "_Выбрать..."
 
-#: src/gui.c:786
+#: src/gui.c:785
 msgid "Select _All Frames"
 msgstr "Выделить _все кадры"
 
-#: src/gui.c:794
+#: src/gui.c:793
 msgid "_Start Frame Only"
 msgstr ""
 
-#: src/gui.c:802
+#: src/gui.c:801
 msgid "_End Frame Only"
 msgstr ""
 
-#: src/gui.c:813
+#: src/gui.c:812
 msgid "Select from _First Frame"
 msgstr ""
 
-#: src/gui.c:817
+#: src/gui.c:816
 msgid "Select to _Last Frame"
 msgstr ""
 
-#: src/gui.c:821
+#: src/gui.c:820
 msgid "Select Last Insertion/_Merge"
 msgstr ""
 
-#: src/gui.c:825
+#: src/gui.c:824
 msgid "Select Last _Effect"
 msgstr ""
 
-#: src/gui.c:829
+#: src/gui.c:828
 msgid "_Invert Selection"
 msgstr "_Обратить выделение"
 
-#: src/gui.c:837
+#: src/gui.c:836
 msgid "_Lock Selection Width"
 msgstr ""
 
-#: src/gui.c:842 src/multitrack.c:6409
+#: src/gui.c:841 src/multitrack.c:6591
 msgid "_Play"
 msgstr "_Играть"
 
-#: src/gui.c:854
+#: src/gui.c:853
 msgid "_Play All"
 msgstr "_Воспроизвести все"
 
-#: src/gui.c:869
+#: src/gui.c:868
 msgid "Pla_y Selection"
 msgstr "Во_спроизвести выделенное"
 
-#: src/gui.c:877
+#: src/gui.c:876
 msgid "Play _Clipboard"
 msgstr "Воспроизвести содержимое _буфера обмена"
 
-#: src/gui.c:899 src/multitrack.c:6441
+#: src/gui.c:898 src/multitrack.c:6623
 msgid "_Stop"
 msgstr "_Стоп"
 
-#: src/gui.c:914 src/multitrack.c:6453
+#: src/gui.c:913 src/multitrack.c:6635
 msgid "Re_wind"
 msgstr ""
 
-#: src/gui.c:946 src/multitrack.c:6471
+#: src/gui.c:945 src/multitrack.c:6653
 msgid "_Full Screen"
 msgstr "_Полный экран"
 
-#: src/gui.c:955
+#: src/gui.c:954
 msgid "_Double Size"
 msgstr "_Удвоенный размер"
 
-#: src/gui.c:963 src/multitrack.c:6479
+#: src/gui.c:962 src/multitrack.c:6661
 msgid "Play in _Separate Window"
 msgstr "Воспроизвести в _отдельном окне"
 
-#: src/gui.c:972
+#: src/gui.c:971
 msgid "_Blank Background"
 msgstr ""
 
-#: src/gui.c:979
+#: src/gui.c:978
 msgid "(Auto)_loop Video (to fit audio track)"
 msgstr ""
 
-#: src/gui.c:988 src/multitrack.c:6487
+#: src/gui.c:987 src/multitrack.c:6669
 msgid "L_oop Continuously"
 msgstr ""
 
-#: src/gui.c:997
+#: src/gui.c:996
 msgid "Pin_g Pong Loops"
 msgstr ""
 
-#: src/gui.c:1005 src/multitrack.c:6495
+#: src/gui.c:1004 src/multitrack.c:6677
 msgid "_Mute"
 msgstr "_Приглушить"
 
-#: src/gui.c:1017
+#: src/gui.c:1016
 msgid "Separate Window 'S_ticky' Mode"
 msgstr ""
 
-#: src/gui.c:1025
+#: src/gui.c:1024
 msgid "S_how Frame Counter"
 msgstr ""
 
-#: src/gui.c:1035
+#: src/gui.c:1034
 msgid "Show Subtitles"
 msgstr "Показать субтитры"
 
-#: src/gui.c:1045
+#: src/gui.c:1044
 msgid "Letterbox mode"
 msgstr ""
 
-#: src/gui.c:1051 src/multitrack.c:6507
+#: src/gui.c:1050 src/multitrack.c:6689
 msgid "Effect_s"
 msgstr "Воздейст_вие"
 
-#: src/gui.c:1054
+#: src/gui.c:1053
 msgid "Effects are applied to the current selection."
 msgstr "Эффекты применены к текущему выделению."
 
-#: src/gui.c:1067
+#: src/gui.c:1066
 msgid "_Run Test Rendered Effect/Tool/Generator..."
 msgstr ""
 
-#: src/gui.c:1072 src/multitrack.c:7123
+#: src/gui.c:1071 src/multitrack.c:7299
 msgid "_Tools"
 msgstr "_Инструменты"
 
-#: src/gui.c:1075
+#: src/gui.c:1074
 msgid "Tools are applied to complete clips."
 msgstr ""
 
-#: src/gui.c:1085
+#: src/gui.c:1084
 msgid "_Reverse Clipboard"
 msgstr ""
 
-#: src/gui.c:1094
+#: src/gui.c:1093
 msgid "_Change Playback/Save Speed..."
 msgstr "_Изменить скорость воспроизведения/сохранения"
 
-#: src/gui.c:1099
+#: src/gui.c:1098
 msgid "Resample _Video to New Frame Rate..."
 msgstr ""
 
-#: src/gui.c:1105
+#: src/gui.c:1104
 msgid "_Utilities"
 msgstr "_Утилиты"
 
-#: src/gui.c:1110
+#: src/gui.c:1109
 msgid "Custom _Tools"
 msgstr ""
 
-#: src/gui.c:1116 src/multitrack.c:7149
+#: src/gui.c:1115 src/multitrack.c:7325
 msgid "_Generate"
 msgstr "_Создать"
 
-#: src/gui.c:1126
+#: src/gui.c:1125
 msgid "Loading rendered effect plugins..."
 msgstr "Загрузка надстроек готовых эффектов"
 
-#: src/gui.c:1139
+#: src/gui.c:1138
 msgid "Load _Subtitles from File..."
 msgstr "Загрузить _субтитры из файла..."
 
-#: src/gui.c:1144
+#: src/gui.c:1143
 msgid "Erase subtitles"
 msgstr "Стереть субтитры"
 
-#: src/gui.c:1152 src/multitrack.c:7158
+#: src/gui.c:1151 src/multitrack.c:7334
 msgid "Capture _External Window... "
 msgstr ""
 
-#: src/gui.c:1159 src/multitrack.c:7173
+#: src/gui.c:1158 src/multitrack.c:7349
 msgid "_Preferences..."
 msgstr "_Параметры..."
 
-#: src/gui.c:1172
+#: src/gui.c:1171
 msgid "_Audio"
 msgstr "_Аудио"
 
-#: src/gui.c:1184
+#: src/gui.c:1183
 msgid "Load _New Audio for Clip..."
 msgstr "Загрузить _новый звуковой фрагмент..."
 
-#: src/gui.c:1190
+#: src/gui.c:1189
 msgid "Load _CD Track..."
 msgstr "Загрузить дорожку _компакт-диска"
 
-#: src/gui.c:1191
+#: src/gui.c:1190
 msgid "E_ject CD"
 msgstr "И_звлечь компакт-диск"
 
-#: src/gui.c:1205
+#: src/gui.c:1204
 msgid "Record E_xternal Audio..."
 msgstr "Записать звук с _внешнего источника..."
 
-#: src/gui.c:1218
+#: src/gui.c:1217
 msgid "to New _Clip..."
 msgstr "в новый _фрагмент..."
 
-#: src/gui.c:1222
+#: src/gui.c:1221
 msgid "to _Selection"
 msgstr ""
 
-#: src/gui.c:1230
+#: src/gui.c:1229
 msgid "Fade Audio _In..."
 msgstr ""
 
-#: src/gui.c:1234
+#: src/gui.c:1233
 msgid "Fade Audio _Out..."
 msgstr ""
 
-#: src/gui.c:1244
+#: src/gui.c:1243
 msgid "_Export Audio..."
 msgstr "_Экспортировать звук..."
 
-#: src/gui.c:1257
+#: src/gui.c:1256
 msgid "Export _Selected Audio..."
 msgstr "Экспортировать _выделенный звук..."
 
-#: src/gui.c:1261
+#: src/gui.c:1260
 msgid "Export _All Audio..."
 msgstr "Экспортировать _все звуковые данные..."
 
-#: src/gui.c:1265
+#: src/gui.c:1264
 msgid "_Append Audio..."
 msgstr "_Добавить звук..."
 
-#: src/gui.c:1270
+#: src/gui.c:1269
 msgid "_Trim/Pad Audio..."
 msgstr ""
 
-#: src/gui.c:1283
+#: src/gui.c:1282
 msgid "Trim/Pad Audio to _Selection"
 msgstr ""
 
-#: src/gui.c:1288
+#: src/gui.c:1287
 msgid "Trim/Pad Audio from Beginning to _Play Start"
 msgstr ""
 
-#: src/gui.c:1293
+#: src/gui.c:1292
 msgid "_Delete Audio..."
 msgstr "_Удалить звук..."
 
-#: src/gui.c:1306
+#: src/gui.c:1305
 msgid "Delete _Selected Audio"
 msgstr "Удалить _выделенные звуковые данные..."
 
-#: src/gui.c:1310
+#: src/gui.c:1309
 msgid "Delete _All Audio"
 msgstr "Удалить _все звуковые данные"
 
-#: src/gui.c:1314
+#: src/gui.c:1313
 msgid "Insert _Silence in Selection"
 msgstr "Вставить в выделенное фрагмент _без звука"
 
-#: src/gui.c:1319
+#: src/gui.c:1318
 msgid "_Resample Audio..."
 msgstr ""
 
-#: src/gui.c:1324
+#: src/gui.c:1323
 msgid "_Info"
 msgstr "_Информация"
 
-#: src/gui.c:1336
+#: src/gui.c:1335
 msgid "Show Clip _Info"
 msgstr "Показать сведения _о файле"
 
-#: src/gui.c:1344
+#: src/gui.c:1343
 msgid "Show/_Edit File Comments"
 msgstr "Показать/_изменить описание файла"
 
-#: src/gui.c:1349
+#: src/gui.c:1348
 msgid "Show _Clipboard Info"
 msgstr "Показать сведения _буфера обмена"
 
-#: src/gui.c:1360 src/multitrack.c:7286
+#: src/gui.c:1359 src/multitrack.c:7462
 msgid "Show _Messages"
 msgstr "Показать _сообщения"
 
-#: src/gui.c:1364 src/multitrack.c:7365
+#: src/gui.c:1363 src/multitrack.c:7541
 msgid "Show _Layout Errors"
 msgstr ""
 
-#: src/gui.c:1369 src/multitrack.c:7263
+#: src/gui.c:1368 src/multitrack.c:7439
 msgid "_Clips"
 msgstr "_Фрагменты"
 
-#: src/gui.c:1381
+#: src/gui.c:1380
 msgid "_Rename Current Clip in Menu..."
 msgstr "_Переименовать текущий фрагмент в меню..."
 
-#: src/gui.c:1399
+#: src/gui.c:1398
 msgid "A_dvanced"
 msgstr "_Дополнительные"
 
-#: src/gui.c:1412
+#: src/gui.c:1411
 msgid "_RFX Effects/Tools/Utilities"
 msgstr ""
 
-#: src/gui.c:1424
+#: src/gui.c:1423
 msgid "_New Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1428
+#: src/gui.c:1427
 msgid "_Copy RFX Script to Test..."
 msgstr ""
 
-#: src/gui.c:1432
+#: src/gui.c:1431
 msgid "_Edit Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1436
+#: src/gui.c:1435
 msgid "Rena_me Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1440
+#: src/gui.c:1439
 msgid "_Delete Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1450
+#: src/gui.c:1449
 msgid "_Promote Test Rendered Effect/Tool/Generator..."
 msgstr ""
 
-#: src/gui.c:1457
+#: src/gui.c:1456
 msgid "_Import Custom RFX script..."
 msgstr "Импортировать _настроенный сценарий RFX..."
 
-#: src/gui.c:1461
+#: src/gui.c:1460
 msgid "E_xport Custom RFX script..."
 msgstr "Экспортировать _настроенный сценарий RFX..."
 
-#: src/gui.c:1465
+#: src/gui.c:1464
 msgid "De_lete Custom RFX Script..."
 msgstr "_Удалить настроенный сценарий RFX..."
 
-#: src/gui.c:1472
+#: src/gui.c:1471
 msgid "Re_build all RFX plugins"
 msgstr ""
 
-#: src/gui.c:1501
+#: src/gui.c:1498
 msgid "Receive _LiVES stream from..."
 msgstr "Загрузить поток _LiVES из..."
 
-#: src/gui.c:1506
+#: src/gui.c:1503
 msgid "_Send LiVES stream to..."
 msgstr "_Отправить LiVES поток..."
 
-#: src/gui.c:1515
+#: src/gui.c:1512
 #, c-format
 msgid "Open _yuv4mpeg stream on %sstream.yuv..."
 msgstr ""
 
-#: src/gui.c:1536
+#: src/gui.c:1534
 msgid "_Import Project (.lv2)..."
 msgstr "Импортировать проект *.lv2 (_I) ..."
 
-#: src/gui.c:1540
+#: src/gui.c:1538
 msgid "E_xport Project (.lv2)..."
 msgstr "Экспортировать проект *.lv2 (_x)..."
 
-#: src/gui.c:1545
+#: src/gui.c:1543
 msgid "_VJ"
 msgstr "_VJ"
 
-#: src/gui.c:1557
+#: src/gui.c:1555
 msgid "Real Time _Effect Mapping"
 msgstr ""
 
-#: src/gui.c:1563
+#: src/gui.c:1561
 msgid "Bind real time effects to ctrl-number keys."
 msgstr ""
 
-#: src/gui.c:1565
+#: src/gui.c:1563
 msgid "Set Real Time Effect _Defaults"
 msgstr ""
 
-#: src/gui.c:1567
+#: src/gui.c:1565
 msgid "Set default parameter values for real time effects."
 msgstr ""
 
-#: src/gui.c:1580
+#: src/gui.c:1578
 msgid "Save Real Time Effect _Defaults"
 msgstr ""
 
-#: src/gui.c:1583
+#: src/gui.c:1581
 msgid ""
 "Save real time effect defaults so they will be restored each time you use "
 "LiVES."
 msgstr ""
 
-#: src/gui.c:1589
+#: src/gui.c:1587
 msgid "_Reset all playback speeds and positions"
 msgstr "_Сбросить все скорости воспроизведения и позиции"
 
-#: src/gui.c:1592
+#: src/gui.c:1590
 msgid ""
 "Reset all playback positions to frame 1, and reset all playback frame rates."
 msgstr ""
 
-#: src/gui.c:1594
+#: src/gui.c:1592
 msgid "_MIDI/joystick interface"
 msgstr "_MIDI/джойстик Интерфейс"
 
-#: src/gui.c:1609
+#: src/gui.c:1607
 msgid "_MIDI/joystick learner..."
 msgstr "_MIDI/джойстик учащегося..."
 
-#: src/gui.c:1614
+#: src/gui.c:1612
 msgid "_Save device mapping..."
 msgstr "_Сохранить раскладку устройства..."
 
-#: src/gui.c:1620
+#: src/gui.c:1618
 msgid "_Load device mapping..."
 msgstr "_Загрузить раскладку устройства..."
 
-#: src/gui.c:1628
+#: src/gui.c:1626
 msgid "Show VJ _Keys"
 msgstr ""
 
-#: src/gui.c:1632
+#: src/gui.c:1630
 msgid "To_ys"
 msgstr "_Развлечение"
 
-#: src/gui.c:1644
+#: src/gui.c:1642
 msgid "_None"
 msgstr "_Никакого"
 
-#: src/gui.c:1652
+#: src/gui.c:1650
 msgid "_Autolives"
 msgstr ""
 
-#: src/gui.c:1657
+#: src/gui.c:1655
 msgid "_Mad Frames"
 msgstr ""
 
-#: src/gui.c:1662
+#: src/gui.c:1660
 msgid "_LiVES TV (broadband)"
 msgstr "_LiVES ТВ (ШПД)"
 
-#: src/gui.c:1672 src/multitrack.c:7387
+#: src/gui.c:1670 src/multitrack.c:7563
 msgid "_Help"
 msgstr "_Справка"
 
-#: src/gui.c:1684 src/multitrack.c:7407
+#: src/gui.c:1682 src/multitrack.c:7583
 msgid "_Manual (opens in browser)"
 msgstr "_Руководства (открывается в браузере)"
 
-#: src/gui.c:1691 src/multitrack.c:7416
+#: src/gui.c:1689 src/multitrack.c:7592
 msgid "_Donate to the project !"
 msgstr "_жертвовать к проекту !"
 
-#: src/gui.c:1695 src/multitrack.c:7420
+#: src/gui.c:1693 src/multitrack.c:7596
 msgid "_Email the author"
 msgstr "_Электронная почта автора"
 
-#: src/gui.c:1699 src/multitrack.c:7424
+#: src/gui.c:1697 src/multitrack.c:7600
 msgid "Report a _bug"
 msgstr "_Сообщить об ошибке"
 
-#: src/gui.c:1703 src/multitrack.c:7428
+#: src/gui.c:1701 src/multitrack.c:7604
 msgid "Suggest a _feature"
 msgstr "Предложить новую _возможность"
 
-#: src/gui.c:1707 src/multitrack.c:7432
+#: src/gui.c:1705 src/multitrack.c:7608
 msgid "Assist with _translating"
 msgstr "Предложить перевод программы"
 
-#: src/gui.c:1714 src/multitrack.c:7439
+#: src/gui.c:1712 src/multitrack.c:7615
 msgid "_Troubleshoot"
 msgstr "Устранение _неполадок"
 
-#: src/gui.c:1718 src/multitrack.c:7443
+#: src/gui.c:1716 src/multitrack.c:7619
 msgid "_About"
 msgstr "_О Программе"
 
-#: src/gui.c:1752
+#: src/gui.c:1750
 msgid "Rewind to start (w)"
 msgstr "Перейти к началу (w)"
 
-#: src/gui.c:1760 src/multitrack.c:16720
+#: src/gui.c:1758 src/multitrack.c:17010
 msgid "Play all (p)"
 msgstr "Воспроизвести все (P)"
 
-#: src/gui.c:1768 src/gui.c:1877
+#: src/gui.c:1766 src/gui.c:1876
 msgid "Stop playback (q)"
 msgstr "Остановка воспроизведения (Q)"
 
-#: src/gui.c:1779
+#: src/gui.c:1777
 msgid "Play selection (y)"
 msgstr "Воспроизвести выделенное (y)"
 
-#: src/gui.c:1832
+#: src/gui.c:1829
 msgid "Volume"
 msgstr "Объём"
 
-#: src/gui.c:1854
+#: src/gui.c:1853
 msgid "Audio volume (1.00)"
 msgstr "Громкость звука (1.00)"
 
-#: src/gui.c:1883
+#: src/gui.c:1882
 msgid "Unblank background (b)"
 msgstr ""
 
-#: src/gui.c:1929
+#: src/gui.c:1928
 msgid "Play slower (ctrl-down)"
 msgstr "Воспроизвести с замедлением (ctrl-стрелка вниз)"
 
-#: src/gui.c:1935
+#: src/gui.c:1934
 msgid "Play faster (ctrl-up)"
 msgstr "Воспроизвести с ускорением (ctrl-стрелка вверх)"
 
-#: src/gui.c:1942
+#: src/gui.c:1941
 msgid "Skip back (ctrl-left)"
 msgstr ""
 
-#: src/gui.c:1948
+#: src/gui.c:1947
 msgid "Skip forward (ctrl-right)"
 msgstr ""
 
-#: src/gui.c:1954
+#: src/gui.c:1953
 msgid "Show clip info (i)"
 msgstr "Показать сведения о фрагменте (i)"
 
-#: src/gui.c:1960
+#: src/gui.c:1959
 msgid "Hide this toolbar"
 msgstr "Скрыть эту панель инструментов"
 
-#: src/gui.c:1962
+#: src/gui.c:1961
 msgid ""
 "Press \"s\" to toggle separate play window for improved performance, \"q\" "
 "to stop."
 msgstr ""
 
 #. TRANSLATORS: please keep the translated string the same length
-#: src/gui.c:1995
+#: src/gui.c:1994
 msgid "     Video playback speed (frames per second)        "
 msgstr "     Скорость воспроизведения видео (кадры в секунду)        "
 
-#: src/gui.c:2009
+#: src/gui.c:2008
 msgid "Vary the video speed"
 msgstr ""
 
-#: src/gui.c:2092 src/gui.c:3218
+#: src/gui.c:2090 src/gui.c:3329
 msgid "First Frame"
 msgstr "Первый кадр"
 
-#: src/gui.c:2193 src/gui.c:3226
+#: src/gui.c:2191 src/gui.c:3336
 msgid "Last Frame"
 msgstr "Последний кадр"
 
-#: src/gui.c:2210
+#: src/gui.c:2208
 msgid "The first selected frame in this clip"
 msgstr ""
 
-#: src/gui.c:2248
+#: src/gui.c:2246
 msgid "The last selected frame in this clip"
 msgstr ""
 
-#: src/gui.c:2532
+#: src/gui.c:2546
 msgid "Starting...\n"
 msgstr ""
 
-#: src/gui.c:3074
+#: src/gui.c:3181
 msgid "    Press 'q' to stop recording.  DO NOT COVER THE PLAY WINDOW !   "
 msgstr ""
 "    Нажмите 'q', чтобы остановить запись. НЕ ПЕРЕКРЫВАЙТЕ ОКНО "
 "ВОСПРОИЗВЕДЕНИЯ !   "
 
-#: src/gui.c:3521
+#: src/gui.c:3643
 msgid "Frame number to preview"
 msgstr ""
 
-#: src/gui.c:3538
+#: src/gui.c:3660
 msgid "_Free"
 msgstr "_Свободная"
 
-#: src/gui.c:3539
+#: src/gui.c:3661
 msgid "Free choice of frame number"
 msgstr ""
 
-#: src/gui.c:3543
+#: src/gui.c:3666
 msgid "_Start"
 msgstr "_Начать"
 
-#: src/gui.c:3544
+#: src/gui.c:3667
 msgid "Frame number is linked to start frame"
 msgstr ""
 
-#: src/gui.c:3551
+#: src/gui.c:3675
 msgid "_End"
 msgstr "_Конец"
 
-#: src/gui.c:3552
+#: src/gui.c:3676
 msgid "Frame number is linked to end frame"
 msgstr ""
 
-#: src/gui.c:3559
+#: src/gui.c:3684
 msgid "_Pointer"
 msgstr "_Указатель"
 
-#: src/gui.c:3560
+#: src/gui.c:3685
 msgid "Frame number is linked to playback pointer"
 msgstr ""
 
-#: src/gui.c:3581
+#: src/gui.c:3707
 msgid "Rewind"
 msgstr "Перемотать назад"
 
-#: src/gui.c:3592 src/dialogs.c:894 src/dialogs.c:896 src/dialogs.c:1817
-#: src/dialogs.c:1819
+#: src/gui.c:3718 src/dialogs.c:960 src/dialogs.c:962 src/dialogs.c:1873
+#: src/dialogs.c:1875
 msgid "Play all"
 msgstr "Слушать все"
 
-#: src/gui.c:3605
+#: src/gui.c:3731
 msgid "Play Selection"
 msgstr "Воспроизвести выделенное"
 
-#: src/gui.c:3619
+#: src/gui.c:3745
 msgid "Loop On/Off"
 msgstr "Включить или выключить цикл"
 
-#: src/gui.c:3693
+#: src/gui.c:3819
 msgid "Start _recording"
 msgstr "Начать _запись"
 
-#: src/gui.c:3698
+#: src/gui.c:3824
 msgid "Stop _recording"
 msgstr "Остановить _запись"
 
-#: src/gui.c:3703
+#: src/gui.c:3829
 msgid "_Record Performance"
 msgstr ""
 
-#: src/gui.c:3851
+#: src/gui.c:3974
 msgid "Hide Play Window"
 msgstr "Скрыть окно воспроизведения"
 
-#: src/gui.c:4232
+#: src/gui.c:4333
 msgid "Show Play Window"
 msgstr "Показать окно воспроизведения"
 
-#: src/ce_thumbs.c:222
+#: src/ce_thumbs.c:242
 #, c-format
 msgid "Mapped to ctrl-%d"
 msgstr ""
 
-#: src/ce_thumbs.c:276 src/effects.c:85 src/preferences.c:3195
+#: src/ce_thumbs.c:296 src/effects.c:86 src/preferences.c:3247
 msgid "Effects"
 msgstr "Эффекты"
 
-#: src/ce_thumbs.c:279 src/multitrack.c:5615
+#: src/ce_thumbs.c:299 src/multitrack.c:5791
 msgid "Clips"
 msgstr ""
 
-#: src/ce_thumbs.c:303
+#: src/ce_thumbs.c:323
 #, c-format
 msgid "Show / apply effects to %s\n"
 msgstr ""
 
-#: src/ce_thumbs.c:315
+#: src/ce_thumbs.c:335
 #, c-format
 msgid "Select clip for %s\n"
 msgstr ""
 
-#: src/ce_thumbs.c:515
+#: src/ce_thumbs.c:536
 msgid "_Pin"
 msgstr ""
 
-#: src/ce_thumbs.c:515
+#: src/ce_thumbs.c:537
 msgid "Pin the parameter box to the window"
 msgstr ""
 
 #. TRANSLATORS: Exabytes
-#: src/utils.c:794
+#: src/utils.c:800
 #, c-format
 msgid "%.2f EB"
 msgstr "%.2f ЭБ"
 
 #. TRANSLATORS: Petabytes
-#: src/utils.c:798
+#: src/utils.c:803
 #, c-format
 msgid "%.2f PB"
 msgstr "%.2f ПБ"
 
 #. TRANSLATORS: Terabytes
-#: src/utils.c:802
+#: src/utils.c:806
 #, c-format
 msgid "%.2f TB"
 msgstr "%.2f ТБ"
 
 #. TRANSLATORS: Gigabytes
-#: src/utils.c:806
+#: src/utils.c:809
 #, c-format
 msgid "%.2f GB"
 msgstr "%.2f ГБ"
 
 #. TRANSLATORS: Megabytes
-#: src/utils.c:810
+#: src/utils.c:812
 #, c-format
 msgid "%.2f MB"
 msgstr "%.2f МБ"
 
 #. TRANSLATORS: Kilobytes (1024 bytes)
-#: src/utils.c:814
+#: src/utils.c:815
 #, c-format
 msgid "%.2f KiB"
 msgstr "%.2f КБ"
@@ -3955,7 +3953,7 @@
 msgid "%d bytes"
 msgstr "%d байт"
 
-#: src/utils.c:1841
+#: src/utils.c:1835
 msgid "Clearing the clipboard"
 msgstr "Очистка буфера обмена"
 
@@ -3967,81 +3965,81 @@
 "Switched to clip %s\n"
 msgstr ""
 
-#: src/utils.c:1880
+#: src/utils.c:1877
 msgid ""
 "\n"
 "==============================\n"
 "Switched to empty clip\n"
 msgstr ""
 
-#: src/utils.c:1917
+#: src/utils.c:1916
 msgid "(blank)"
 msgstr ""
 
-#: src/utils.c:1920
+#: src/utils.c:1919
 #, c-format
 msgid ""
 "The set name has been changed from %s to %s. Affected layouts have been "
 "updated accordingly\n"
 msgstr ""
 
-#: src/utils.c:1928
+#: src/utils.c:1927
 #, c-format
 msgid ""
 "The clip %s is missing from this set.\n"
 "It is required by the following layouts:\n"
 msgstr ""
 
-#: src/utils.c:1932
+#: src/utils.c:1931
 #, c-format
 msgid ""
 "The clip %s has been closed.\n"
 "It is required by the following layouts:\n"
 msgstr ""
 
-#: src/utils.c:1937
+#: src/utils.c:1936
 #, c-format
 msgid ""
 "Frames have been shifted in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1942
+#: src/utils.c:1941
 #, c-format
 msgid ""
 "Frames have been deleted from the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1947
+#: src/utils.c:1946
 #, c-format
 msgid ""
 "Audio has been deleted from the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1952
+#: src/utils.c:1951
 #, c-format
 msgid ""
 "Audio has been shifted in clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1957
+#: src/utils.c:1956
 #, c-format
 msgid ""
 "Audio has been altered in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1962
+#: src/utils.c:1961
 #, c-format
 msgid ""
 "Frames have been altered in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:2135
+#: src/utils.c:2134
 #, c-format
 msgid ""
 "Set %s\n"
@@ -4049,7 +4047,7 @@
 "by another copy of LiVES.\n"
 msgstr ""
 
-#: src/utils.c:2142
+#: src/utils.c:2140
 #, c-format
 msgid ""
 "\n"
@@ -4095,67 +4093,67 @@
 msgid "Removing layout %s\n"
 msgstr ""
 
-#: src/utils.c:3014
+#: src/utils.c:2996
 msgid "Video [opening...]"
 msgstr "Видео [открытие...]"
 
-#: src/utils.c:3018
+#: src/utils.c:2999
 #, c-format
 msgid "Video [%.2f sec]"
 msgstr "Видео [%.2f с.]"
 
-#: src/utils.c:3022
+#: src/utils.c:3002
 msgid "(Undefined)"
 msgstr "(Не определена)"
 
-#: src/utils.c:3025
+#: src/utils.c:3004
 msgid "(No video)"
 msgstr "(Без видео)"
 
-#: src/utils.c:3032
+#: src/utils.c:3011
 msgid "(No audio)"
 msgstr "(Нет звука)"
 
-#: src/utils.c:3037
+#: src/utils.c:3015
 msgid "Mono  [opening...]"
 msgstr "моно [открытие...]"
 
-#: src/utils.c:3040
+#: src/utils.c:3017
 msgid "Left Audio [opening...]"
 msgstr ""
 
-#: src/utils.c:3045
+#: src/utils.c:3021
 #, c-format
 msgid "Mono [%.2f sec]"
 msgstr "моно [%.2f с.]"
 
-#: src/utils.c:3048
+#: src/utils.c:3023
 #, c-format
 msgid "Left Audio [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:3056
+#: src/utils.c:3031
 msgid "Right Audio [opening...]"
 msgstr ""
 
-#: src/utils.c:3059
+#: src/utils.c:3033
 #, c-format
 msgid "Right Audio [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:3506
+#: src/utils.c:3472
 msgid "LiVES cannot switch to mplayer whilst clips are loading."
 msgstr ""
 
-#: src/utils.c:3559
+#: src/utils.c:3525
 msgid "LiVES cannot switch to mplayer2 whilst clips are loading."
 msgstr ""
 
-#: src/utils.c:3809
+#: src/utils.c:3775
 msgid "Cleaning up clip"
 msgstr ""
 
-#: src/utils.c:3913
+#: src/utils.c:3874
 #, c-format
 msgid ""
 "\n"
@@ -4170,30 +4168,29 @@
 "\n"
 "Заменить ?\n"
 
-#: src/utils.c:4305 src/utils.c:4337 src/multitrack.c:4503
+#: src/utils.c:4250 src/utils.c:4280 src/multitrack.c:4672
 #, c-format
 msgid "_Undo %s"
 msgstr "_Отменить %s"
 
-#: src/utils.c:4306 src/utils.c:4338 src/multitrack.c:4525
+#: src/utils.c:4251 src/utils.c:4281 src/multitrack.c:4693
 #, c-format
 msgid "_Redo %s"
 msgstr "По_вторить %s"
 
-#: src/utils.c:4363
+#: src/utils.c:4305
 msgid "-------------Selection------------"
 msgstr "-------------Выбор------------"
 
-#. TRANSLATORS: - try to keep the text of the middle part the same length, by deleting "-" if necessary
-#: src/utils.c:4371
+#: src/utils.c:4313
 msgid " sec ] ----------Selection---------- [ "
 msgstr ""
 
-#: src/utils.c:4371
+#: src/utils.c:4314
 msgid " frames ] ----------"
 msgstr ""
 
-#: src/utils.c:5360
+#: src/utils.c:5302
 msgid ""
 "Your version of mplayer/ffmpeg may be broken !\n"
 "See http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2071\n"
@@ -4204,11 +4201,11 @@
 "Try running Help/Troubleshoot for more information."
 msgstr ""
 
-#: src/saveplay.c:178
+#: src/saveplay.c:179
 msgid "Examining file header"
 msgstr ""
 
-#: src/saveplay.c:315 src/saveplay.c:789
+#: src/saveplay.c:316 src/saveplay.c:779
 #, c-format
 msgid "Opening %s"
 msgstr "Открытие %s"
@@ -4218,36 +4215,36 @@
 msgid "Opening %s start time %.2f sec. frames %d"
 msgstr ""
 
-#: src/saveplay.c:326 src/saveplay.c:4001
+#: src/saveplay.c:326 src/saveplay.c:3927
 msgid " without sound"
 msgstr " без звука"
 
-#: src/saveplay.c:396
+#: src/saveplay.c:395
 #, c-format
 msgid "Opening audio for %s"
 msgstr "Открытие звука для %s"
 
-#: src/saveplay.c:557
+#: src/saveplay.c:554
 #, c-format
 msgid "Auto trimming %.2f seconds of audio at start..."
 msgstr ""
 
-#: src/saveplay.c:567
+#: src/saveplay.c:562
 #, c-format
 msgid "Auto trimming %.2f seconds of audio at end..."
 msgstr ""
 
-#: src/saveplay.c:584
+#: src/saveplay.c:577
 #, c-format
 msgid "Auto padding with %.2f seconds of silence at start..."
 msgstr ""
 
-#: src/saveplay.c:599
+#: src/saveplay.c:590
 #, c-format
 msgid "Auto padding with %.2f seconds of silence at end..."
 msgstr ""
 
-#: src/saveplay.c:671
+#: src/saveplay.c:661
 #, c-format
 msgid ""
 "\n"
@@ -4267,11 +4264,11 @@
 "\n"
 "Вы действительно хотите продолжить ?"
 
-#: src/saveplay.c:685
+#: src/saveplay.c:676
 msgid " - please be patient."
 msgstr " - Пожалуйста, будьте терпеливы."
 
-#: src/saveplay.c:938
+#: src/saveplay.c:926
 msgid ""
 "\n"
 "\n"
@@ -4284,7 +4281,7 @@
 "Для получения дополнительных сведений, пожалуйста, обратитесь к окну "
 "терминала.\n"
 
-#: src/saveplay.c:940
+#: src/saveplay.c:928
 msgid ""
 "\n"
 "\n"
@@ -4294,7 +4291,7 @@
 "\n"
 "Вам может потребоваться установка MPlayer, чтобы открыть этот файл.\n"
 
-#: src/saveplay.c:948
+#: src/saveplay.c:934
 msgid ""
 "\n"
 "\n"
@@ -4302,29 +4299,29 @@
 "Tools|Preferences|Decoding\n"
 msgstr ""
 
-#: src/saveplay.c:1014
+#: src/saveplay.c:995
 msgid "Adding image..."
 msgstr "Добавление изображения..."
 
-#: src/saveplay.c:1108
+#: src/saveplay.c:1089
 #, c-format
 msgid "Subtitles were saved as %s\n"
 msgstr "Субтитры сохранены как %s\n"
 
-#: src/saveplay.c:1192
+#: src/saveplay.c:1171
 #, c-format
 msgid "LiVES: Save Frame %d as..."
 msgstr ""
 
-#: src/saveplay.c:1195
+#: src/saveplay.c:1174
 msgid "LiVES: Save Frame as..."
 msgstr ""
 
-#: src/saveplay.c:1322
+#: src/saveplay.c:1303
 msgid "LiVES: Save Clip as..."
 msgstr "LiVES: Сохранить фрагмент как..."
 
-#: src/saveplay.c:1390
+#: src/saveplay.c:1369
 msgid ""
 "Saving your video could lead to a loss of quality !\n"
 "You are strongly advised to 'Save As' to a new file.\n"
@@ -4332,34 +4329,34 @@
 "Do you still wish to continue ?"
 msgstr ""
 
-#: src/saveplay.c:1517 src/saveplay.c:1683 src/saveplay.c:1762
-#: src/saveplay.c:4014
+#: src/saveplay.c:1494 src/saveplay.c:1659 src/saveplay.c:1738
+#: src/saveplay.c:3940
 msgid "Pulling frames from clip"
 msgstr "Извлечение кадров из клипа"
 
-#: src/saveplay.c:1588 src/saveplay.c:1727
+#: src/saveplay.c:1565 src/saveplay.c:1703
 msgid "Linking selection"
 msgstr ""
 
-#: src/saveplay.c:1779
+#: src/saveplay.c:1755
 msgid " (with no sound)\n"
 msgstr " (без звука)\n"
 
-#: src/saveplay.c:1786
+#: src/saveplay.c:1761
 #, c-format
 msgid "Saving frames %d to %d%s as \"%s\" : encoder = %s : format = %s..."
 msgstr ""
 
-#: src/saveplay.c:1790
+#: src/saveplay.c:1765
 #, c-format
 msgid "Saving frames 1 to %d%s as \"%s\" : encoder %s : format = %s..."
 msgstr ""
 
-#: src/saveplay.c:1909
+#: src/saveplay.c:1890
 msgid "Saving [can take a long time]"
 msgstr "Сохранение [может занять некоторое время]"
 
-#: src/saveplay.c:2057
+#: src/saveplay.c:2044
 msgid ""
 "\n"
 "\n"
@@ -4369,33 +4366,33 @@
 "\n"
 "Ошибка кодера - готовый файл не был создан !\n"
 
-#: src/saveplay.c:2094
+#: src/saveplay.c:2081
 msgid "Clearing letterbox"
 msgstr ""
 
-#: src/saveplay.c:2183
+#: src/saveplay.c:2168
 #, c-format
 msgid "File size was %s\n"
 msgstr ""
 
-#: src/saveplay.c:2284
+#: src/saveplay.c:2265
 msgid "recording aborted by preview.\n"
 msgstr "запись прервана предварительным просмотром.\n"
 
-#: src/saveplay.c:2288
+#: src/saveplay.c:2268
 msgid "recording aborted by clipboard playback.\n"
 msgstr "запись прервана из-за воспроизведения данных буфера обмена.\n"
 
-#: src/saveplay.c:2291
+#: src/saveplay.c:2270
 msgid "Recording performance..."
 msgstr ""
 
-#: src/saveplay.c:3293
+#: src/saveplay.c:3251
 #, c-format
 msgid "Average FPS was %.4f\n"
 msgstr ""
 
-#: src/saveplay.c:3299
+#: src/saveplay.c:3256
 msgid ""
 "\n"
 "\n"
@@ -4404,16 +4401,21 @@
 "and resize all frames to the current size.\n"
 msgstr ""
 
-#: src/saveplay.c:3479
+#: src/saveplay.c:3429
 msgid "Unknown"
 msgstr "Неизвестно"
 
-#: src/saveplay.c:3588 src/saveplay.c:4585
+#: src/saveplay.c:3538 src/saveplay.c:4502
 #, c-format
 msgid "Untitled%d"
 msgstr "Безымянный_%d"
 
-#: src/saveplay.c:3633
+#: src/saveplay.c:3567
+#, c-format
+msgid "%d frames are enough !\n"
+msgstr "%d кадров достаточно !\n"
+
+#: src/saveplay.c:3579
 #, c-format
 msgid ""
 "\n"
@@ -4421,7 +4423,7 @@
 "Bad things may happen with this clip.\n"
 msgstr ""
 
-#: src/saveplay.c:3723
+#: src/saveplay.c:3667
 #, c-format
 msgid ""
 "\n"
@@ -4429,75 +4431,75 @@
 "Default can be set in Tools | Preferences | Misc.\n"
 msgstr ""
 
-#: src/saveplay.c:3735
+#: src/saveplay.c:3677
 #, c-format
 msgid "Playback speed was adjusted to %.3f frames per second to fit audio.\n"
 msgstr ""
 "Скорость воспроизведения была выставлена со значением %.3f кадров/с. для "
 "соответствия звуку.\n"
 
-#: src/saveplay.c:3754
+#: src/saveplay.c:3694
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d *bpp=Greyscale* fps=%.3f\n"
 "Audio:"
 msgstr ""
 
-#: src/saveplay.c:3758 src/saveplay.c:4762
+#: src/saveplay.c:3698 src/saveplay.c:4671
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d bpp=%d fps=%.3f\n"
 "Audio:"
 msgstr ""
 
-#: src/saveplay.c:3762 src/saveplay.c:4766
+#: src/saveplay.c:3703 src/saveplay.c:4676
 #, c-format
 msgid "%s none\n"
 msgstr ""
 
-#: src/saveplay.c:3774
+#: src/saveplay.c:3714
 #, c-format
 msgid " - Author: %s\n"
 msgstr ""
 
-#: src/saveplay.c:3779
+#: src/saveplay.c:3717
 #, c-format
 msgid " - Title: %s\n"
 msgstr ""
 
-#: src/saveplay.c:3784
+#: src/saveplay.c:3720
 #, c-format
 msgid " - Comment: %s\n"
 msgstr " - Описание: %s\n"
 
-#: src/saveplay.c:3897
+#: src/saveplay.c:3829
 #, c-format
 msgid "Saving frame %d as %s..."
 msgstr ""
 
-#: src/saveplay.c:3996
+#: src/saveplay.c:3924
 #, c-format
 msgid "Backing up %s to %s"
 msgstr "Резервное копирование %s в %s"
 
-#: src/saveplay.c:4049
+#: src/saveplay.c:3975
 msgid "Backing up"
 msgstr "Резервное сохранение"
 
-#: src/saveplay.c:4083
+#: src/saveplay.c:4009
 msgid "performance data was backed up..."
 msgstr ""
 
-#: src/saveplay.c:4661
+#: src/saveplay.c:4574
 #, c-format
 msgid "Restoring %s..."
 msgstr "Восстановление %s..."
 
-#: src/saveplay.c:4692
+#: src/saveplay.c:4603
 msgid "Restoring"
 msgstr "Восстановление файлов"
 
-#: src/saveplay.c:4714
+#: src/saveplay.c:4625
 #, c-format
 msgid ""
 "\n"
@@ -4511,22 +4513,22 @@
 "LiVES не может восстановить его.\n"
 
 #. TRANSLATORS: rec(ord) %.2f M(ega)B(ytes)
-#: src/saveplay.c:5207
+#: src/saveplay.c:5118
 #, c-format
 msgid "rec %.2f MB"
 msgstr ""
 
-#: src/saveplay.c:5213
+#: src/saveplay.c:5123
 #, c-format
 msgid "!rec %.2f MB"
 msgstr ""
 
 #. TRANSLATORS: rec(ord) ?? M(ega)B(ytes)
-#: src/saveplay.c:5216
+#: src/saveplay.c:5126
 msgid "rec ?? MB"
 msgstr ""
 
-#: src/saveplay.c:5241
+#: src/saveplay.c:5151
 #, c-format
 msgid ""
 "\n"
@@ -4534,54 +4536,76 @@
 "Record stop level can be set in Preferences.\n"
 msgstr ""
 
-#: src/saveplay.c:5535
+#: src/saveplay.c:5447
 msgid ""
 "\n"
 "Files from a previous run of LiVES were found.\n"
 "Do you want to attempt to recover them ?\n"
 msgstr ""
 
-#: src/saveplay.c:5557
+#: src/saveplay.c:5469
 msgid "Recovering files"
 msgstr ""
 
-#: src/saveplay.c:5560
+#: src/saveplay.c:5472
 msgid "Recovering files..."
 msgstr ""
 
-#: src/dialogs.c:72
+#: src/dialogs.c:71
 msgid "Show affected _layouts"
 msgstr ""
 
-#: src/dialogs.c:128
+#: src/dialogs.c:113
+msgid ""
+"Do _not show this warning any more\n"
+"(can be turned back on from Preferences/Warnings)"
+msgstr ""
+"Больше _не показывать это предупреждение\n"
+"(можно вернуть обратно в меню Настройки/Предупреждения)"
+
+#: src/dialogs.c:127
 msgid "_Recover disk space"
 msgstr ""
 
-#: src/dialogs.c:143
+#: src/dialogs.c:142
 msgid " _Advanced Settings >>"
 msgstr " _Дополнительные настройки >>"
 
-#: src/dialogs.c:184
+#: src/dialogs.c:183 src/dialogs.c:221
 msgid "LiVES: - Warning !"
 msgstr "LiVES: - Внимание !"
 
 #: src/dialogs.c:194
+#, fuzzy
+msgid "LiVES: - Error !"
+msgstr "LiVES: - Ошибка файла"
+
+#: src/dialogs.c:204
+#, fuzzy
+msgid "LiVES: - Information"
+msgstr "LiVES: - Открыть путь"
+
+#: src/dialogs.c:230
 msgid "LiVES: - Question"
 msgstr "LiVES: - Вопрос"
 
-#: src/dialogs.c:204
+#: src/dialogs.c:239
 msgid "LiVES: - File Error"
 msgstr "LiVES: - Ошибка файла"
 
-#: src/dialogs.c:208
+#: src/dialogs.c:241
 msgid "_Abort"
 msgstr "Пре_рвать"
 
-#: src/dialogs.c:213
+#: src/dialogs.c:246
 msgid "_Retry"
 msgstr "_Повторить"
 
-#: src/dialogs.c:597
+#: src/dialogs.c:306
+msgid "Show _Details"
+msgstr "Показать _подробности"
+
+#: src/dialogs.c:657
 #, c-format
 msgid ""
 "FREE SPACE IN THE PARTITION CONTAINING\n"
@@ -4592,7 +4616,7 @@
 "(Disk warning levels can be configured in Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:615
+#: src/dialogs.c:676
 #, c-format
 msgid ""
 "Free space in the partition containing\n"
@@ -4604,11 +4628,11 @@
 "Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:627
+#: src/dialogs.c:688
 msgid "Audio players cannot be switched during playback."
 msgstr ""
 
-#: src/dialogs.c:632
+#: src/dialogs.c:694
 msgid ""
 "\n"
 "\n"
@@ -4620,11 +4644,11 @@
 "LiVES не может выполнить эту операцию, так как недостаточно памяти.\n"
 "Пожалуйста, попробуйте закрыть другие открытые приложения.\n"
 
-#: src/dialogs.c:752
+#: src/dialogs.c:820
 msgid "Processing has been paused."
 msgstr "Выполнение было приостановлено."
 
-#: src/dialogs.c:937
+#: src/dialogs.c:1002
 #, c-format
 msgid ""
 "\n"
@@ -4633,35 +4657,35 @@
 "\n"
 "%s%d%% готово. Оставшееся время: %u с.%s\n"
 
-#: src/dialogs.c:1335
+#: src/dialogs.c:1391
 #, c-format
 msgid ""
 "\n"
 "%d/%d frames opened. Time remaining %u sec.\n"
 msgstr ""
 
-#: src/dialogs.c:1337
+#: src/dialogs.c:1393
 #, c-format
 msgid ""
 "\n"
 "%d/%d frames opened.\n"
 msgstr ""
 
-#: src/dialogs.c:1341
+#: src/dialogs.c:1396
 #, c-format
 msgid ""
 "\n"
 "%d frames opened.\n"
 msgstr ""
 
-#: src/dialogs.c:1940
+#: src/dialogs.c:1993
 #, c-format
 msgid ""
 "\n"
 "Time remaining: %d sec"
 msgstr ""
 
-#: src/dialogs.c:1988
+#: src/dialogs.c:2040
 #, c-format
 msgid ""
 "\n"
@@ -4672,7 +4696,7 @@
 "Извините, но LiVES позволяет открывать только %d файлов за раз.\n"
 "Пожалуйста, закройте файл и затем попробуйте снова."
 
-#: src/dialogs.c:1994
+#: src/dialogs.c:2047
 #, c-format
 msgid ""
 "LiVES was unable to write to its temporary directory.\n"
@@ -4691,7 +4715,7 @@
 "\n"
 "Пожалуйста, проверьте разрешения на запись в этот каталог."
 
-#: src/dialogs.c:2005
+#: src/dialogs.c:2059
 #, fuzzy
 msgid ""
 "\n"
@@ -4702,20 +4726,20 @@
 "Для работы LiVES требуется 'mplayer' или 'sox'. Установите любой из этих "
 "пакетов и повторите ещё раз.\n"
 
-#: src/dialogs.c:2010
+#: src/dialogs.c:2064
 msgid ""
 "Audio was not loaded; please install mplayer or mplayer2 if you expected "
 "audio for this clip.\n"
 msgstr ""
 
-#: src/dialogs.c:2014
+#: src/dialogs.c:2069
 msgid ""
 "Audio resampling is required for this format.\n"
 "Please install 'sox'\n"
 "Or switch to another encoder format in Tools | Preferences | Encoding\n"
 msgstr ""
 
-#: src/dialogs.c:2019
+#: src/dialogs.c:2075
 msgid ""
 "\n"
 "\n"
@@ -4723,19 +4747,19 @@
 "Please set the audio codec in Tools|Preferences|Encoding\n"
 msgstr ""
 
-#: src/dialogs.c:2024
+#: src/dialogs.c:2080
 msgid ""
 "This layout includes generated frames.\n"
 "It cannot be saved, you must render it to a clip first.\n"
 msgstr ""
 
-#: src/dialogs.c:2029
+#: src/dialogs.c:2085
 msgid ""
 "This layout includes generated or recorded audio.\n"
 "It cannot be saved, you must render it to a clip first.\n"
 msgstr ""
 
-#: src/dialogs.c:2039 src/dialogs.c:2137
+#: src/dialogs.c:2095 src/dialogs.c:2189
 #, c-format
 msgid ""
 "\n"
@@ -4746,7 +4770,7 @@
 "\n"
 "В связи с ограничениями в формате %s\n"
 
-#: src/dialogs.c:2059
+#: src/dialogs.c:2115
 msgid ""
 "LiVES recommends the following settings:\n"
 "\n"
@@ -4754,43 +4778,43 @@
 "LiVES рекомендует следующие настройки:\n"
 "\n"
 
-#: src/dialogs.c:2065 src/dialogs.c:2174 src/resample.c:850
+#: src/dialogs.c:2121 src/dialogs.c:2225 src/resample.c:839
 msgid ", signed"
 msgstr ""
 
-#: src/dialogs.c:2066 src/dialogs.c:2175 src/resample.c:853
+#: src/dialogs.c:2122 src/dialogs.c:2226 src/resample.c:841
 msgid ", unsigned"
 msgstr ""
 
-#: src/dialogs.c:2070 src/dialogs.c:2179 src/resample.c:858
+#: src/dialogs.c:2126 src/dialogs.c:2230 src/resample.c:846
 msgid ", little-endian"
 msgstr ""
 
-#: src/dialogs.c:2071 src/dialogs.c:2180 src/resample.c:861
+#: src/dialogs.c:2127 src/dialogs.c:2231 src/resample.c:848
 msgid ", big-endian"
 msgstr ""
 
-#: src/dialogs.c:2077
+#: src/dialogs.c:2132
 #, c-format
 msgid "Use an audio rate of %d Hz%s%s\n"
 msgstr "Использовать частоту звука %d Гц%s%s\n"
 
-#: src/dialogs.c:2085
+#: src/dialogs.c:2140
 #, c-format
 msgid "Set video rate to %.3f frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:2089
+#: src/dialogs.c:2143
 #, c-format
 msgid "Set video rate to %d:%d frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:2094 src/dialogs.c:2209
+#: src/dialogs.c:2148 src/dialogs.c:2258
 #, c-format
 msgid "Set video size to %d x %d pixels\n"
 msgstr ""
 
-#: src/dialogs.c:2102 src/dialogs.c:2208
+#: src/dialogs.c:2156 src/dialogs.c:2257
 msgid ""
 "\n"
 "You may wish to:\n"
@@ -4798,35 +4822,35 @@
 "\n"
 "Возможно вы захотите:\n"
 
-#: src/dialogs.c:2105 src/dialogs.c:2200
+#: src/dialogs.c:2159 src/dialogs.c:2249
 #, c-format
 msgid "resize video to %d x %d pixels\n"
 msgstr "изменить размер видео на %d x %d пикселей\n"
 
-#: src/dialogs.c:2110
+#: src/dialogs.c:2163
 msgid "disable audio, since the target encoder cannot encode audio\n"
 msgstr ""
 
-#: src/dialogs.c:2170
+#: src/dialogs.c:2221
 msgid "LiVES must:\n"
 msgstr ""
 
-#: src/dialogs.c:2185
+#: src/dialogs.c:2235
 #, c-format
 msgid "resample audio to %d Hz%s%s\n"
 msgstr ""
 
-#: src/dialogs.c:2192
+#: src/dialogs.c:2242
 #, c-format
 msgid "resample video to %.3f frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:2196
+#: src/dialogs.c:2245
 #, c-format
 msgid "resample video to %d:%d frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:2215
+#: src/dialogs.c:2263
 msgid ""
 "\n"
 "You will be able to undo these changes afterwards.\n"
@@ -4835,14 +4859,14 @@
 "\n"
 msgstr ""
 
-#: src/dialogs.c:2218
+#: src/dialogs.c:2265
 msgid ""
 "\n"
 "Changes applied to the selection will not be permanent.\n"
 "\n"
 msgstr ""
 
-#: src/dialogs.c:2237
+#: src/dialogs.c:2285
 msgid ""
 "\n"
 "\n"
@@ -4851,7 +4875,7 @@
 "Try recording for just a selection of the file."
 msgstr ""
 
-#: src/dialogs.c:2244
+#: src/dialogs.c:2293
 msgid ""
 "The playback speed (fps), or the audio rate\n"
 " of the clipboard does not match\n"
@@ -4862,7 +4886,7 @@
 "Please press Cancel to abort the insert, or OK to continue."
 msgstr ""
 
-#: src/dialogs.c:2253
+#: src/dialogs.c:2304
 #, c-format
 msgid ""
 "When opening a yuvmpeg stream, you should first create a fifo file in:\n"
@@ -4875,11 +4899,11 @@
 "click Cancel."
 msgstr ""
 
-#: src/dialogs.c:2305
+#: src/dialogs.c:2356
 msgid "Show Keys"
 msgstr ""
 
-#: src/dialogs.c:2306
+#: src/dialogs.c:2358
 msgid ""
 "You can use the following keys during playback to control LiVES:-\n"
 "\n"
@@ -4921,11 +4945,11 @@
 "g                             ping pong loops\n"
 msgstr ""
 
-#: src/dialogs.c:2313
+#: src/dialogs.c:2365
 msgid "Multitrack Keys"
 msgstr ""
 
-#: src/dialogs.c:2314
+#: src/dialogs.c:2367
 msgid ""
 "You can use the following keys to control the multitrack window:-\n"
 "\n"
@@ -4947,18 +4971,18 @@
 "For other keys, see the menus.\n"
 msgstr ""
 
-#: src/dialogs.c:2322
+#: src/dialogs.c:2375
 msgid "Message History"
 msgstr "Журнал сообщений"
 
-#: src/dialogs.c:2335
+#: src/dialogs.c:2388
 #, c-format
 msgid ""
 "After upgrading/installing, you may need to adjust the <prefix_dir> setting "
 "in your %s file"
 msgstr ""
 
-#: src/dialogs.c:2344
+#: src/dialogs.c:2399
 #, c-format
 msgid ""
 "\n"
@@ -4969,25 +4993,25 @@
 "or change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/dialogs.c:2352
+#: src/dialogs.c:2408
 msgid ""
 "Sorry, unknown audio type.\n"
 "\n"
 " (Filenames must end in .mp3, .ogg, .wav, .mod, .xm or .it)"
 msgstr ""
 
-#: src/dialogs.c:2353
+#: src/dialogs.c:2409
 msgid "failed (unknown type)\n"
 msgstr ""
 
-#: src/dialogs.c:2358
+#: src/dialogs.c:2415
 msgid ""
 "\n"
 "Do you wish to remove the layout files associated with this set ?\n"
 "(They will not be usable without the set).\n"
 msgstr ""
 
-#: src/dialogs.c:2363
+#: src/dialogs.c:2421
 #, c-format
 msgid ""
 "\n"
@@ -4996,7 +5020,7 @@
 "Click Cancel to pick a new name.\n"
 msgstr ""
 
-#: src/dialogs.c:2370
+#: src/dialogs.c:2429
 msgid ""
 "\n"
 "Frames from this clip are used in some multitrack layouts.\n"
@@ -5004,7 +5028,7 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2374
+#: src/dialogs.c:2433
 msgid ""
 "\n"
 "Audio from this clip is used in some multitrack layouts.\n"
@@ -5012,7 +5036,7 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2378
+#: src/dialogs.c:2438
 #, c-format
 msgid ""
 "\n"
@@ -5030,7 +5054,7 @@
 "расположение.\n"
 "В противном случае, нажмите Отмена, чтобы пропустить загрузку этого файла.\n"
 
-#: src/dialogs.c:2385
+#: src/dialogs.c:2446
 #, c-format
 msgid ""
 "\n"
@@ -5045,7 +5069,7 @@
 "%s\n"
 "Фрагмент не может быть загружен.\n"
 
-#: src/dialogs.c:2392
+#: src/dialogs.c:2455
 msgid ""
 "\n"
 "Dear user, the jack developers decided to remove the -Z option from jackd.\n"
@@ -5053,7 +5077,7 @@
 "Alternately, select a different audio player in Preferences.\n"
 msgstr ""
 
-#: src/dialogs.c:2396
+#: src/dialogs.c:2460
 msgid ""
 "\n"
 "Unable to start up jack. Please ensure that alsa is set up correctly on your "
@@ -5062,7 +5086,7 @@
 "Automatic jack startup will be disabled now.\n"
 msgstr ""
 
-#: src/dialogs.c:2402
+#: src/dialogs.c:2466
 msgid ""
 "\n"
 "Unable to connect to jack server. Please start jack before starting LiVES\n"
@@ -5071,7 +5095,7 @@
 "Невозможно подключиться к серверу jack. Пожалуйста, запустите jack перед "
 "запуском LiVES\n"
 
-#: src/dialogs.c:2411
+#: src/dialogs.c:2475
 #, c-format
 msgid ""
 "\n"
@@ -5088,7 +5112,7 @@
 "\n"
 "%s\n"
 
-#: src/dialogs.c:2418
+#: src/dialogs.c:2482
 msgid ""
 "\n"
 "Alternately, you can restart LiVES and select another audio player.\n"
@@ -5097,7 +5121,7 @@
 "Также вы можете перезапустить LiVES и выбрать другой музыкальный "
 "проигрыватель.\n"
 
-#: src/dialogs.c:2423
+#: src/dialogs.c:2488
 #, c-format
 msgid ""
 "\n"
@@ -5107,7 +5131,7 @@
 "It is recommended to increase it to at least %d MB"
 msgstr ""
 
-#: src/dialogs.c:2429
+#: src/dialogs.c:2496
 #, c-format
 msgid ""
 "\n"
@@ -5116,7 +5140,7 @@
 "Do you wish to delete them ?\n"
 msgstr ""
 
-#: src/dialogs.c:2436
+#: src/dialogs.c:2504
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for multitrack undo.\n"
@@ -5130,7 +5154,7 @@
 "функции отмены,\n"
 "используя Параметры/Несколько дорожек/Память функции отмены\n"
 
-#: src/dialogs.c:2440
+#: src/dialogs.c:2508
 msgid ""
 "\n"
 "Out of memory for undo.\n"
@@ -5142,7 +5166,7 @@
 "Вам необходимо увеличить количество памяти для функции отмены,\n"
 "используя Параметры/Несколько дорожек/Память функции отмены\n"
 
-#: src/dialogs.c:2444
+#: src/dialogs.c:2512
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for the multitrack undo buffer.\n"
@@ -5151,52 +5175,52 @@
 "LiVES не может зарезервировать достаточное количество памяти для буфера "
 "функции отмены в режиме нескольких дорожек.\n"
 
-#: src/dialogs.c:2446
+#: src/dialogs.c:2514
 msgid "or enter a smaller value.\n"
 msgstr "или введите меньшее значение.\n"
 
-#: src/dialogs.c:2448
+#: src/dialogs.c:2516
 msgid "Try again from the clip editor, try closing some other applications\n"
 msgstr ""
 "Попробуйте в редакторе фрагментов, а также попробуйте закрыть некоторые "
 "открытые приложения\n"
 
-#: src/dialogs.c:2449
+#: src/dialogs.c:2517
 msgid "Try closing some other applications\n"
 msgstr "Попробуйте закрыть некоторые открытые приложения\n"
 
-#: src/dialogs.c:2460
+#: src/dialogs.c:2529
 msgid ""
 "Multitrack is set to 0 audio channels, but this layout has audio.\n"
 "You should adjust the audio settings from the Tools menu.\n"
 msgstr ""
 
-#: src/dialogs.c:2464
+#: src/dialogs.c:2534
 msgid ""
 "The current layout has audio, so audio channels may not be set to zero.\n"
 msgstr ""
 
-#: src/dialogs.c:2468
+#: src/dialogs.c:2539
 msgid ""
 "Multitrack audio preview is only available with the\n"
 "\"jack\" or \"pulse audio\" audio player.\n"
 "You can set this in Tools|Preferences|Playback."
 msgstr ""
 
-#: src/dialogs.c:2472
+#: src/dialogs.c:2545
 msgid ""
 "Errors were detected in the layout (which may be due to transferring from "
 "another system, or from an older version of LiVES).\n"
 "Should I try to repair the disk copy of the layout ?\n"
 msgstr ""
 
-#: src/dialogs.c:2476
+#: src/dialogs.c:2549
 msgid ""
 "LiVES was unable to load the layout.\n"
 "Sorry.\n"
 msgstr ""
 
-#: src/dialogs.c:2482
+#: src/dialogs.c:2555
 msgid ""
 "\n"
 "\n"
@@ -5206,7 +5230,7 @@
 "\n"
 "Частота звука должна превышать 0.\n"
 
-#: src/dialogs.c:2486
+#: src/dialogs.c:2559
 msgid ""
 "\n"
 "Event list will be very large\n"
@@ -5218,7 +5242,7 @@
 "и может занять длительное время для отображения.\n"
 "Вы действительно хотите просмотреть его ?\n"
 
-#: src/dialogs.c:2491
+#: src/dialogs.c:2564
 msgid ""
 "\n"
 "\n"
@@ -5228,7 +5252,7 @@
 "\n"
 "Чтобы использовать эту возможность, необходимо установить 'dvgrab'.\n"
 
-#: src/dialogs.c:2496
+#: src/dialogs.c:2570
 msgid ""
 "\n"
 "\n"
@@ -5242,25 +5266,25 @@
 "звукового проигрывателя \"jack\" или \"pulse audio\".\n"
 "Вам необходимо назначить это в Сервис/Параметры/Воспроизведение.\n"
 
-#: src/dialogs.c:2500
+#: src/dialogs.c:2574
 msgid "Video playback plugin failed to initialise palette !\n"
 msgstr ""
 
-#: src/dialogs.c:2504
+#: src/dialogs.c:2579
 msgid "Decoder plugin failed to initialise palette !\n"
 msgstr ""
 
-#: src/dialogs.c:2509
+#: src/dialogs.c:2584
 msgid "Unable to set framerate of video plugin\n"
 msgstr ""
 
-#: src/dialogs.c:2514
+#: src/dialogs.c:2590
 msgid ""
 "After a crash, it is advisable to clean up the disk with\n"
 "File|Clean up disk space\n"
 msgstr ""
 
-#: src/dialogs.c:2526
+#: src/dialogs.c:2604
 #, c-format
 msgid ""
 "Stream frame size is too large for your network buffers.\n"
@@ -5269,33 +5293,33 @@
 "echo %d > /proc/sys/net/core/rmem_max\n"
 msgstr ""
 
-#: src/dialogs.c:2714
+#: src/dialogs.c:2800
 msgid "cancelled.\n"
 msgstr "отменена.\n"
 
-#: src/dialogs.c:2721
+#: src/dialogs.c:2805
 msgid "failed.\n"
 msgstr "сбой.\n"
 
-#: src/dialogs.c:2728
+#: src/dialogs.c:2810
 msgid "done.\n"
 msgstr "готово.\n"
 
-#: src/dialogs.c:2732
+#: src/dialogs.c:2814
 msgid "error in file. Failed.\n"
 msgstr "Ошибка в файле. Ошибка.\n"
 
-#: src/dialogs.c:2766 src/dialogs.c:2815 src/dialogs.c:2839
+#: src/dialogs.c:2848 src/dialogs.c:2897 src/dialogs.c:2921
 #, c-format
 msgid "Additional info: %s\n"
 msgstr "Дополнительные сведения: %s\n"
 
-#: src/dialogs.c:2769
+#: src/dialogs.c:2851
 #, c-format
 msgid "The error value was %d%s\n"
 msgstr ""
 
-#: src/dialogs.c:2772
+#: src/dialogs.c:2854
 #, c-format
 msgid ""
 "\n"
@@ -5310,7 +5334,7 @@
 "Пожалуйста, проверьте систему на ошибки.\n"
 "%s%s%s"
 
-#: src/dialogs.c:2818
+#: src/dialogs.c:2900
 #, c-format
 msgid ""
 "\n"
@@ -5320,7 +5344,7 @@
 "%s"
 msgstr ""
 
-#: src/dialogs.c:2842
+#: src/dialogs.c:2924
 #, c-format
 msgid ""
 "\n"
@@ -5330,7 +5354,7 @@
 "%s"
 msgstr ""
 
-#: src/dialogs.c:2886
+#: src/dialogs.c:2968
 #, c-format
 msgid ""
 "\n"
@@ -5339,7 +5363,7 @@
 "Please check for possible error causes.\n"
 msgstr ""
 
-#: src/dialogs.c:2890
+#: src/dialogs.c:2971
 #, c-format
 msgid ""
 "\n"
@@ -5349,7 +5373,7 @@
 "%s.\n"
 msgstr ""
 
-#: src/dialogs.c:2921
+#: src/dialogs.c:3002
 #, c-format
 msgid ""
 "\n"
@@ -5358,7 +5382,7 @@
 "Please check for possible error causes.\n"
 msgstr ""
 
-#: src/dialogs.c:2925
+#: src/dialogs.c:3005
 #, c-format
 msgid ""
 "\n"
@@ -5368,12 +5392,12 @@
 "%s.\n"
 msgstr ""
 
-#: src/dialogs.c:2993
+#: src/dialogs.c:3073
 #, c-format
 msgid "Value for \"%s\" could not be read."
 msgstr ""
 
-#: src/dialogs.c:3011
+#: src/dialogs.c:3091
 #, c-format
 msgid ""
 "\n"
@@ -5382,7 +5406,7 @@
 "Please check your system for errors.\n"
 msgstr ""
 
-#: src/dialogs.c:3020
+#: src/dialogs.c:3100
 #, c-format
 msgid ""
 "\n"
@@ -5391,7 +5415,7 @@
 "Please check the file permissions and try again."
 msgstr ""
 
-#: src/dialogs.c:3027
+#: src/dialogs.c:3109
 #, c-format
 msgid ""
 "\n"
@@ -5400,7 +5424,7 @@
 "Please check the directory permissions and try again."
 msgstr ""
 
-#: src/dialogs.c:3034
+#: src/dialogs.c:3116
 #, c-format
 msgid ""
 "\n"
@@ -5408,7 +5432,7 @@
 "%s\n"
 msgstr ""
 
-#: src/dialogs.c:3041
+#: src/dialogs.c:3123
 msgid ""
 "\n"
 "Abort and exit immediately from LiVES\n"
@@ -5418,7 +5442,7 @@
 "Прервать и выйти немедленно из LiVES\n"
 "Вы действительно хотите выйти ?\n"
 
-#: src/dialogs.c:3047
+#: src/dialogs.c:3129
 #, c-format
 msgid ""
 "\n"
@@ -5426,13 +5450,13 @@
 "Please select another encoder from the list.\n"
 msgstr ""
 
-#: src/dialogs.c:3056
+#: src/dialogs.c:3139
 msgid ""
 "\n"
 "This card is already in use and cannot be opened multiple times.\n"
 msgstr ""
 
-#: src/dialogs.c:3061
+#: src/dialogs.c:3145
 #, c-format
 msgid ""
 "\n"
@@ -5447,7 +5471,7 @@
 "- Проверьте, не используется ли устройство другой программой.\n"
 "- Проверьте, имеется ли само устройство.\n"
 
-#: src/dialogs.c:3068
+#: src/dialogs.c:3153
 msgid ""
 "\n"
 "This file already has subtitles loaded.\n"
@@ -5457,7 +5481,7 @@
 "Этот файл уже имеет загруженные субтитры.\n"
 "Вы действительно хотите заменить существующие субтитры ?\n"
 
-#: src/dialogs.c:3072
+#: src/dialogs.c:3157
 msgid ""
 "\n"
 "LiVES currently only supports subtitles of type .srt and .sub.\n"
@@ -5465,7 +5489,7 @@
 "\n"
 "В настоящее время LiVES поддерживает только субтитры формата .srt и .sub.\n"
 
-#: src/dialogs.c:3076
+#: src/dialogs.c:3161
 msgid ""
 "\n"
 "Erase all subtitles from this clip.\n"
@@ -5475,7 +5499,7 @@
 "Стереть все субтитры из этого фргамента.\n"
 "Вы действительно хотите стереть ?\n"
 
-#: src/dialogs.c:3082
+#: src/dialogs.c:3168
 #, c-format
 msgid ""
 "\n"
@@ -5488,7 +5512,7 @@
 "Щёлкните Отмена, чтобы назначить другое имя файла\n"
 "или OK, чтобы продолжить и сохранить как тип \"%s\"\n"
 
-#: src/dialogs.c:3089
+#: src/dialogs.c:3176
 msgid ""
 "\n"
 "Do you wish to move the current clip sets to the new directory ?\n"
@@ -5499,7 +5523,7 @@
 "каталог ?\n"
 "(Если не уверены, щёлкните Да)\n"
 
-#: src/dialogs.c:3093
+#: src/dialogs.c:3181
 #, c-format
 msgid ""
 "\n"
@@ -5516,7 +5540,7 @@
 "продолжения - OK\n"
 "."
 
-#: src/dialogs.c:3099
+#: src/dialogs.c:3188
 msgid ""
 "\n"
 "No video input devices could be found.\n"
@@ -5524,7 +5548,7 @@
 "\n"
 "Устройства ввода видео не найдены.\n"
 
-#: src/dialogs.c:3103
+#: src/dialogs.c:3192
 msgid ""
 "\n"
 "All video input devices are already in use.\n"
@@ -5532,7 +5556,7 @@
 "\n"
 "Все устройства ввода видео уже используются.\n"
 
-#: src/dialogs.c:3107
+#: src/dialogs.c:3196
 msgid ""
 "\n"
 "\n"
@@ -5540,15 +5564,14 @@
 "DO NOT SHUT DOWN OR CLOSE LIVES !\n"
 msgstr ""
 
-#: src/dialogs.c:3127
+#: src/dialogs.c:3203
 #, c-format
 msgid ""
 "No clips were recovered for set (%s).\n"
 "Please check the spelling of the set name and try again.\n"
 msgstr ""
 
-#. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:3136
+#: src/dialogs.c:3214
 #, c-format
 msgid ""
 "\n"
@@ -5566,7 +5589,7 @@
 "Файл -> Очистить диск\n"
 
 #. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:3144
+#: src/dialogs.c:3222
 #, c-format
 msgid ""
 "\n"
@@ -5579,20 +5602,20 @@
 "Добро пожаловать в LiVES версии %s !\n"
 "\n"
 
-#: src/dialogs.c:3150
+#: src/dialogs.c:3228
 msgid ""
 "\n"
 "You must have autolives.pl installed and in your path to use this toy.\n"
 "Consult your package distributor.\n"
 msgstr ""
 
-#: src/dialogs.c:3154
+#: src/dialogs.c:3232
 msgid ""
 "\n"
 "You must have a minimum of one clip loaded to use this toy.\n"
 msgstr ""
 
-#: src/dialogs.c:3158
+#: src/dialogs.c:3236
 msgid ""
 "\n"
 "LiVES lost its connection to jack and was unable to reconnect.\n"
@@ -5602,7 +5625,7 @@
 "LiVES прервал соединение с jack и не смог выполнить повторное подключение.\n"
 "Рекомендуется выполнить перезапуск LiVES.\n"
 
-#: src/dialogs.c:3162
+#: src/dialogs.c:3240
 msgid ""
 "\n"
 "LiVES lost its connection to pulseaudio and was unable to reconnect.\n"
@@ -5613,7 +5636,7 @@
 "подключение.\n"
 "Рекомендуется выполнить перезапуск LiVES.\n"
 
-#: src/dialogs.c:3175
+#: src/dialogs.c:3254
 #, c-format
 msgid ""
 "\n"
@@ -5622,285 +5645,285 @@
 "Do you wish to allow this (for this session only) ?\n"
 msgstr ""
 
-#: src/effects.c:60
+#: src/effects.c:61
 msgid "generator"
 msgstr ""
 
-#: src/effects.c:61
+#: src/effects.c:62
 msgid "Generators"
 msgstr ""
 
-#: src/effects.c:63
+#: src/effects.c:64
 msgid "audio generator"
 msgstr ""
 
-#: src/effects.c:64
+#: src/effects.c:65
 msgid "Audio Generators"
 msgstr ""
 
-#: src/effects.c:66
+#: src/effects.c:67
 msgid "audio/video generator"
 msgstr ""
 
-#: src/effects.c:67
+#: src/effects.c:68
 msgid "Audio/Video Generators"
 msgstr ""
 
-#: src/effects.c:69
+#: src/effects.c:70
 msgid "data generator"
 msgstr ""
 
-#: src/effects.c:70
+#: src/effects.c:71
 msgid "Data Generators"
 msgstr ""
 
-#: src/effects.c:72
+#: src/effects.c:73
 msgid "data visualiser"
 msgstr ""
 
-#: src/effects.c:73
+#: src/effects.c:74
 msgid "Data Visualisers"
 msgstr ""
 
-#: src/effects.c:75
+#: src/effects.c:76
 msgid "data processor"
 msgstr ""
 
-#: src/effects.c:76
+#: src/effects.c:77
 msgid "Data Processors"
 msgstr ""
 
-#: src/effects.c:78
+#: src/effects.c:79
 msgid "data source"
 msgstr ""
 
-#: src/effects.c:79
+#: src/effects.c:80
 msgid "Data Sources"
 msgstr "Источники данных"
 
-#: src/effects.c:81
+#: src/effects.c:82
 msgid "transition"
 msgstr ""
 
-#: src/effects.c:82
+#: src/effects.c:83
 msgid "Transitions"
 msgstr "Переходы состояний"
 
-#: src/effects.c:84
+#: src/effects.c:85
 msgid "effect"
 msgstr "эффект"
 
-#: src/effects.c:87 src/rfx-builder.c:187
+#: src/effects.c:88 src/rfx-builder.c:187
 msgid "utility"
 msgstr ""
 
-#: src/effects.c:88
+#: src/effects.c:89
 msgid "Utilities"
 msgstr "Утилиты"
 
-#: src/effects.c:90
+#: src/effects.c:91
 msgid "compositor"
 msgstr ""
 
-#: src/effects.c:91
+#: src/effects.c:92
 msgid "Compositors"
 msgstr ""
 
-#: src/effects.c:93
+#: src/effects.c:94
 msgid "tap"
 msgstr ""
 
-#: src/effects.c:94
+#: src/effects.c:95
 msgid "Taps"
 msgstr ""
 
-#: src/effects.c:96
+#: src/effects.c:97
 msgid "splitter"
 msgstr ""
 
-#: src/effects.c:97
+#: src/effects.c:98
 msgid "Splitters"
 msgstr ""
 
-#: src/effects.c:99
+#: src/effects.c:100
 msgid "converter"
 msgstr ""
 
-#: src/effects.c:100
+#: src/effects.c:101
 msgid "Converters"
 msgstr ""
 
-#: src/effects.c:102
+#: src/effects.c:103
 msgid "analyser"
 msgstr ""
 
-#: src/effects.c:103
+#: src/effects.c:104
 msgid "Analysers"
 msgstr ""
 
-#: src/effects.c:108
+#: src/effects.c:109
 msgid "audio/video"
 msgstr ""
 
-#: src/effects.c:109
+#: src/effects.c:110
 msgid "Audio/Video Transitions"
 msgstr ""
 
-#: src/effects.c:111
+#: src/effects.c:112
 msgid "video only"
 msgstr "только видео"
 
-#: src/effects.c:112
+#: src/effects.c:113
 msgid "Video only Transitions"
 msgstr ""
 
-#: src/effects.c:114 src/multitrack.c:10740
+#: src/effects.c:115 src/multitrack.c:10962
 msgid "audio only"
 msgstr "только звук"
 
-#: src/effects.c:115
+#: src/effects.c:116
 msgid "Audio only Transitions"
 msgstr ""
 
-#: src/effects.c:117 src/effects.c:120 src/multitrack.c:18757
+#: src/effects.c:118 src/effects.c:121 src/multitrack.c:19097
 msgid "audio"
 msgstr "аудио"
 
-#: src/effects.c:118
+#: src/effects.c:119
 msgid "Audio Mixers"
 msgstr "Аудио микшеры"
 
-#: src/effects.c:121
+#: src/effects.c:122
 msgid "Audio Effects"
 msgstr "Звуковые эффекты"
 
-#: src/effects.c:123
+#: src/effects.c:124
 msgid "video"
 msgstr "видео"
 
-#: src/effects.c:124
+#: src/effects.c:125
 msgid "Video Effects"
 msgstr "Видео эффекты"
 
-#: src/effects.c:126
+#: src/effects.c:127
 msgid "audio volume controller"
 msgstr ""
 
-#: src/effects.c:127
+#: src/effects.c:128
 msgid "Audio Volume Controllers"
 msgstr ""
 
-#: src/effects.c:129
+#: src/effects.c:130
 msgid "video analyser"
 msgstr ""
 
-#: src/effects.c:130
+#: src/effects.c:131
 msgid "Video analysers"
 msgstr ""
 
-#: src/effects.c:132
+#: src/effects.c:133
 msgid "audio analyser"
 msgstr ""
 
-#: src/effects.c:133
+#: src/effects.c:134
 msgid "Audio Analysers"
 msgstr ""
 
-#: src/effects.c:137 src/plugins.c:2559 src/plugins.c:2573
+#: src/effects.c:138 src/plugins.c:2507 src/plugins.c:2521
 msgid "unknown"
 msgstr "неизвестный"
 
-#: src/effects.c:238
+#: src/effects.c:235
 #, c-format
 msgid "%s all frames..."
 msgstr ""
 
-#: src/effects.c:243
+#: src/effects.c:239
 #, c-format
 msgid "%s clipboard into frames %d to %d..."
 msgstr ""
 
-#: src/effects.c:250
+#: src/effects.c:245
 #, c-format
 msgid "%s to clipboard..."
 msgstr "%s в буфер обмена..."
 
-#: src/effects.c:254
+#: src/effects.c:248
 #, c-format
 msgid "%s to new clip..."
 msgstr "%s в новый фрагмент..."
 
-#: src/effects.c:259
+#: src/effects.c:252
 #, c-format
 msgid "%s frames %d to %d..."
 msgstr ""
 
-#: src/effects.c:290
+#: src/effects.c:283
 #, c-format
 msgid "%s clipboard with selection"
 msgstr ""
 
-#: src/effects.c:295
+#: src/effects.c:287
 #, c-format
 msgid "%s to clipboard"
 msgstr "%s в буфер обмена"
 
-#: src/effects.c:299
+#: src/effects.c:290
 #, c-format
 msgid "%s to new clip"
 msgstr "%s в новый фрагмент"
 
-#: src/effects.c:304
+#: src/effects.c:294
 #, c-format
 msgid "%s frames %d to %d"
 msgstr ""
 
-#: src/effects.c:456 src/effects.c:523
+#: src/effects.c:443 src/effects.c:507
 msgid ""
 "\n"
 "No frames were generated.\n"
 msgstr ""
 
-#: src/effects-weed.c:431
+#: src/effects-weed.c:452
 msgid "integer"
 msgstr ""
 
-#: src/effects-weed.c:432
+#: src/effects-weed.c:454
 msgid "int64"
 msgstr ""
 
-#: src/effects-weed.c:433
+#: src/effects-weed.c:456
 msgid "boolean"
 msgstr ""
 
-#: src/effects-weed.c:434
+#: src/effects-weed.c:458
 msgid "double"
 msgstr ""
 
-#: src/effects-weed.c:435
+#: src/effects-weed.c:460
 msgid "string"
 msgstr ""
 
-#: src/effects-weed.c:436
+#: src/effects-weed.c:462
 msgid "pointer"
 msgstr ""
 
-#: src/effects-weed.c:4591
+#: src/effects-weed.c:4581
 #, c-format
 msgid "Error: plugin %s has no weed_setup() function.\n"
 msgstr ""
 
-#: src/effects-weed.c:4606
+#: src/effects-weed.c:4595
 #, c-format
 msgid "No usable filters found in plugin %s\n"
 msgstr ""
 
-#: src/effects-weed.c:4680
+#: src/effects-weed.c:4668
 #, c-format
 msgid "Found duplicate plugin %s"
 msgstr ""
 
-#: src/effects-weed.c:4734
+#: src/effects-weed.c:4723
 #, c-format
 msgid ""
 "Info: Unable to load plugin %s\n"
@@ -5909,258 +5932,258 @@
 "сведения: Невозможно загрузить надстройку %s\n"
 "Ошибка: %s\n"
 
-#: src/effects-weed.c:4737 src/effects-weed.c:5858
+#: src/effects-weed.c:4726 src/effects-weed.c:5847
 msgid "Some plugin directories"
 msgstr ""
 
 #. TRANSLATORS: example " - LADSPA plugins -"
-#: src/effects-weed.c:4812 src/rte_window.c:2105
+#: src/effects-weed.c:4801 src/rte_window.c:2107
 #, c-format
 msgid " - %s plugins -"
 msgstr " - надстройки %s -"
 
-#: src/effects-weed.c:5012
+#: src/effects-weed.c:4998
 #, c-format
 msgid "Successfully loaded %d Weed filters\n"
 msgstr ""
 
-#: src/effects-weed.c:5177
+#: src/effects-weed.c:5162
 #, c-format
 msgid "Invalid compound effect %s - has conflicting target_fps\n"
 msgstr ""
 
-#: src/effects-weed.c:5197
+#: src/effects-weed.c:5182
 #, c-format
 msgid "Invalid compound effect %s - has multiple transition parameters\n"
 msgstr ""
 
-#: src/effects-weed.c:5211
+#: src/effects-weed.c:5196
 #, c-format
 msgid "Invalid compound effect %s - has multiple master volume parameters\n"
 msgstr ""
 
-#: src/effects-weed.c:5346
+#: src/effects-weed.c:5329
 #, c-format
 msgid "Invalid compound effect %s - must have >1 sub filters\n"
 msgstr ""
 
-#: src/effects-weed.c:5366
+#: src/effects-weed.c:5349
 #, c-format
 msgid "Invalid effect %s found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5381
+#: src/effects-weed.c:5364
 #, c-format
 msgid "Invalid default found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5392
+#: src/effects-weed.c:5375
 #, c-format
 msgid "Invalid filter %d for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5406
+#: src/effects-weed.c:5389
 #, c-format
 msgid "Invalid param %d for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5433
+#: src/effects-weed.c:5416
 #, c-format
 msgid ""
 "Invalid number of values for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5467
+#: src/effects-weed.c:5450
 #, c-format
 msgid ""
 "Invalid non-boolean value for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5500
+#: src/effects-weed.c:5483
 #, c-format
 msgid "Invalid param link found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5511
+#: src/effects-weed.c:5494
 #, c-format
 msgid ""
 "Invalid out filter %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5529
+#: src/effects-weed.c:5513
 #, c-format
 msgid ""
 "Invalid out param %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5541
+#: src/effects-weed.c:5526
 #, c-format
 msgid ""
 "Invalid non-boolean value for autoscale found in compound effect %s, line "
 "%d\n"
 msgstr ""
 
-#: src/effects-weed.c:5552
+#: src/effects-weed.c:5537
 #, c-format
 msgid ""
 "Invalid in filter %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5566
+#: src/effects-weed.c:5552
 #, c-format
 msgid ""
 "Invalid in param %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5594
+#: src/effects-weed.c:5581
 #, c-format
 msgid "Invalid channel link found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5605
+#: src/effects-weed.c:5592
 #, c-format
 msgid ""
 "Invalid out filter %d for link channels found in compound effect %s, line "
 "%d\n"
 msgstr ""
 
-#: src/effects-weed.c:5623
+#: src/effects-weed.c:5611
 #, c-format
 msgid ""
 "Invalid out channel %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5633
+#: src/effects-weed.c:5622
 #, c-format
 msgid ""
 "Invalid in filter %d for link channels found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5651
+#: src/effects-weed.c:5641
 #, c-format
 msgid ""
 "Invalid in channel %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5687
+#: src/effects-weed.c:5678
 #, c-format
 msgid "Compound:%s"
 msgstr ""
 
-#: src/effects-weed.c:5758
+#: src/effects-weed.c:5749
 #, c-format
 msgid "Successfully loaded %d compound filters\n"
 msgstr ""
 
-#: src/effects-weed.c:6591
+#: src/effects-weed.c:6570
 #, c-format
 msgid "Effect %s cannot be used with this audio player.\n"
 msgstr ""
 
-#: src/effects-weed.c:6737
+#: src/effects-weed.c:6718
 #, c-format
 msgid "Failed to start instance %s, error code %d\n"
 msgstr ""
 
-#: src/effects-weed.c:6814
+#: src/effects-weed.c:6797
 #, c-format
 msgid "Unable to start generator %s\n"
 msgstr ""
 
-#: src/effects-weed.c:7621
+#: src/effects-weed.c:7607
 #, c-format
 msgid "Failed to start generator %s\n"
 msgstr ""
 
-#: src/effects-weed.c:7718
+#: src/effects-weed.c:7701
 #, c-format
 msgid "Failed to start generator %s, error %d\n"
 msgstr ""
 
-#: src/effects-weed.c:9012
+#: src/effects-weed.c:8993
 #, c-format
 msgid "%s [unstable] (%s)"
 msgstr ""
 
-#: src/effects-data.c:3278
+#: src/effects-data.c:3234
 #, c-format
 msgid "ACTIVATE (%s)"
 msgstr ""
 
-#: src/effects-data.c:3548
+#: src/effects-data.c:3501
 msgid "ACTIVATE"
 msgstr ""
 
-#: src/effects-data.c:3876
+#: src/effects-data.c:3829
 #, c-format
 msgid "Key slot %d"
 msgstr ""
 
-#: src/effects-data.c:3998
+#: src/effects-data.c:3951
 msgid "Autoscale"
 msgstr ""
 
-#: src/effects-data.c:4089
+#: src/effects-data.c:4042
 msgid "Add another connection for this output parameter"
 msgstr ""
 
-#: src/effects-data.c:4102 src/effects-data.c:4151
+#: src/effects-data.c:4055 src/effects-data.c:4104
 msgid "Delete this connection"
 msgstr ""
 
-#: src/effects-data.c:4138
+#: src/effects-data.c:4091
 msgid "Add another connection for this output channel"
 msgstr ""
 
-#: src/effects-data.c:4223
+#: src/effects-data.c:4176
 msgid "Connected to -->"
 msgstr ""
 
-#: src/effects-data.c:4243
+#: src/effects-data.c:4196
 #, c-format
 msgid "%s - Alpha Channel Connections"
 msgstr ""
 
-#: src/effects-data.c:4316
+#: src/effects-data.c:4269
 #, c-format
 msgid "%s - Parameter Data Connections"
 msgstr ""
 
-#: src/effects-data.c:4336
+#: src/effects-data.c:4289
 msgid "Autoscale All"
 msgstr ""
 
-#: src/effects-data.c:4361 src/effects-data.c:4890
+#: src/effects-data.c:4314 src/effects-data.c:4841
 msgid "ACTIVATED"
 msgstr ""
 
-#: src/effects-data.c:4774
+#: src/effects-data.c:4726
 msgid "LiVES: - Parameter and Alpha Channel Connections"
 msgstr ""
 
-#: src/effects-data.c:4785
+#: src/effects-data.c:4736
 msgid "Auto Connect Channels"
 msgstr ""
 
-#: src/effects-data.c:4797
+#: src/effects-data.c:4748
 msgid "Auto Connect Parameters"
 msgstr ""
 
-#: src/effects-data.c:4807
+#: src/effects-data.c:4758
 msgid "Disconnect All"
 msgstr ""
 
-#: src/effects-data.c:4875
+#: src/effects-data.c:4826
 #, c-format
 msgid "Input channel is already connected from (%d,%d) %s"
 msgstr ""
 
-#: src/effects-data.c:4891
+#: src/effects-data.c:4842
 #, c-format
 msgid "Input parameter is already connected from (%d,%d) %s"
 msgstr ""
 
-#: src/effects-data.c:4899
+#: src/effects-data.c:4851
 msgid "Input and output parameters are not compatible"
 msgstr ""
 
@@ -6172,43 +6195,43 @@
 msgid "_Reset Values"
 msgstr "_Сбросить значения"
 
-#: src/framedraw.c:267
+#: src/framedraw.c:265
 msgid "_Frame"
 msgstr ""
 
-#: src/paramspecial.c:266
+#: src/paramspecial.c:259
 msgid "Maintain _Aspect Ratio"
 msgstr ""
 
-#: src/paramspecial.c:267
+#: src/paramspecial.c:260
 msgid "Maintain aspect ratio of original frame"
 msgstr ""
 
-#: src/paramspecial.c:341
+#: src/paramspecial.c:335
 msgid "Display Password"
 msgstr ""
 
-#: src/paramwindow.c:450
+#: src/paramwindow.c:447
 msgid "Transition _In"
 msgstr ""
 
-#: src/paramwindow.c:452
+#: src/paramwindow.c:449
 msgid "Click to set the transition parameter to show only the front frame"
 msgstr ""
 
-#: src/paramwindow.c:474
+#: src/paramwindow.c:472
 msgid "Crossfade audio"
 msgstr ""
 
-#: src/paramwindow.c:475
+#: src/paramwindow.c:473
 msgid "Check the box to make audio transition with the video"
 msgstr ""
 
-#: src/paramwindow.c:493
+#: src/paramwindow.c:492
 msgid "Transition _Out"
 msgstr ""
 
-#: src/paramwindow.c:495
+#: src/paramwindow.c:494
 msgid "Click to set the transition parameter to show only the rear frame"
 msgstr ""
 
@@ -6221,23 +6244,23 @@
 msgid "%s : size"
 msgstr ""
 
-#: src/paramwindow.c:598
+#: src/paramwindow.c:597
 msgid "New size (pixels)"
 msgstr ""
 
-#: src/paramwindow.c:617 src/plugins.c:997
+#: src/paramwindow.c:616 src/plugins.c:973
 msgid "_Width"
 msgstr "_Ширина"
 
-#: src/paramwindow.c:636 src/plugins.c:1003
+#: src/paramwindow.c:635 src/plugins.c:979
 msgid "_Height"
 msgstr "_Высота"
 
-#: src/paramwindow.c:684
+#: src/paramwindow.c:683
 msgid "Generate to _Clipboard"
 msgstr ""
 
-#: src/paramwindow.c:686
+#: src/paramwindow.c:685
 msgid "Generate frames to the clipboard"
 msgstr ""
 
@@ -6249,7 +6272,7 @@
 msgid "Generate frames to a new clip"
 msgstr ""
 
-#: src/paramwindow.c:822
+#: src/paramwindow.c:824
 #, c-format
 msgid ""
 "\n"
@@ -6257,71 +6280,71 @@
 "\n"
 msgstr ""
 
-#: src/paramwindow.c:920 src/paramwindow.c:930
+#: src/paramwindow.c:934 src/paramwindow.c:942
 msgid "Set as default"
 msgstr ""
 
-#: src/paramwindow.c:922 src/paramwindow.c:938
+#: src/paramwindow.c:936 src/paramwindow.c:950
 msgid "Reset"
 msgstr ""
 
-#: src/paramwindow.c:932 src/rte_window.c:2401 src/omc-learn.c:1357
+#: src/paramwindow.c:944 src/rte_window.c:2394 src/omc-learn.c:1347
 msgid "Close _window"
 msgstr "_Закрыть окно"
 
-#: src/paramwindow.c:1337
+#: src/paramwindow.c:1340
 msgid "No parameters"
 msgstr "Нет параметры"
 
-#: src/paramwindow.c:1419
+#: src/paramwindow.c:1424
 msgid "Invalid parameter"
 msgstr "Неверный параметр"
 
-#: src/paramwindow.c:1611
+#: src/paramwindow.c:1610
 msgid "LiVES: - Select Colour"
 msgstr "LiVES: - Выберите цвет"
 
-#: src/paramwindow.c:1616
+#: src/paramwindow.c:1615
 msgid "Click to set the colour"
 msgstr "Нажмите, чтобы установить цвета"
 
-#: src/paramwindow.c:1628
+#: src/paramwindow.c:1626
 msgid "_Red"
 msgstr ""
 
-#: src/paramwindow.c:1629
+#: src/paramwindow.c:1627
 msgid "The red value (0 - 255)"
 msgstr "Красный значения (0 - 255)"
 
-#: src/paramwindow.c:1632
+#: src/paramwindow.c:1630
 msgid "_Green"
 msgstr ""
 
-#: src/paramwindow.c:1633
+#: src/paramwindow.c:1631
 msgid "The green value (0 - 255)"
 msgstr "Зеленый значения (0 - 255)"
 
-#: src/paramwindow.c:1636
+#: src/paramwindow.c:1634
 msgid "_Blue"
 msgstr ""
 
-#: src/paramwindow.c:1637
+#: src/paramwindow.c:1635
 msgid "The blue value (0 - 255)"
 msgstr ""
 
-#: src/plugins.c:85
+#: src/plugins.c:86
 #, c-format
 msgid ""
 "\n"
 "Plugin error: %s failed with code %d"
 msgstr ""
 
-#: src/plugins.c:87
+#: src/plugins.c:88
 #, c-format
 msgid " : message was %s\n"
 msgstr ""
 
-#: src/plugins.c:387
+#: src/plugins.c:375
 #, c-format
 msgid ""
 "\n"
@@ -6331,17 +6354,17 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/plugins.c:397
+#: src/plugins.c:385
 #, c-format
 msgid "Updating video playback plugin defaults in %s\n"
 msgstr ""
 
-#: src/plugins.c:452
+#: src/plugins.c:444
 #, c-format
 msgid "Loading video playback plugin defaults from %s..."
 msgstr ""
 
-#: src/plugins.c:515
+#: src/plugins.c:505
 #, c-format
 msgid ""
 "\n"
@@ -6351,32 +6374,32 @@
 "\n"
 msgstr ""
 
-#: src/plugins.c:855
+#: src/plugins.c:836
 #, c-format
 msgid "Saving playback plugin defaults to %s..."
 msgstr ""
 
-#: src/plugins.c:962
+#: src/plugins.c:939
 msgid "_FPS"
 msgstr "_FPS"
 
-#: src/plugins.c:963
+#: src/plugins.c:940
 msgid "Fixed framerate for plugin.\n"
 msgstr ""
 
-#: src/plugins.c:1032
+#: src/plugins.c:1008
 msgid "_Colourspace"
 msgstr ""
 
-#: src/plugins.c:1033
+#: src/plugins.c:1009
 msgid "Colourspace input to the plugin.\n"
 msgstr ""
 
-#: src/plugins.c:1089
+#: src/plugins.c:1065
 msgid "Save settings to an alternate file.\n"
 msgstr ""
 
-#: src/plugins.c:1206
+#: src/plugins.c:1182
 #, c-format
 msgid ""
 "\n"
@@ -6385,7 +6408,7 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/plugins.c:1252
+#: src/plugins.c:1228
 #, c-format
 msgid ""
 "\n"
@@ -6395,38 +6418,38 @@
 "Unable to use it.\n"
 msgstr ""
 
-#: src/plugins.c:1265
+#: src/plugins.c:1241
 #, c-format
 msgid ""
 "Video playback plugin failed to initialise.\n"
 "Error was: %s\n"
 msgstr ""
 
-#: src/plugins.c:1461
+#: src/plugins.c:1428
 msgid ""
 "\n"
 "Warning ! Video playback plugin will not send key presses. Keyboard may be "
 "disabled during plugin use !\n"
 msgstr ""
 
-#: src/plugins.c:1465
+#: src/plugins.c:1433
 #, c-format
 msgid ""
 "*** Using %s plugin for fs playback, agreed to use palette type %d ( %s ). "
 "***\n"
 msgstr ""
 
-#: src/plugins.c:1571
+#: src/plugins.c:1537
 #, c-format
 msgid "Audio stream unable to use preferred format '%s'\n"
 msgstr ""
 
-#: src/plugins.c:1579
+#: src/plugins.c:1543
 #, c-format
 msgid "Using format '%s' instead.\n"
 msgstr ""
 
-#: src/plugins.c:1616
+#: src/plugins.c:1579
 #, c-format
 msgid ""
 "LiVES was unable to find its encoder plugins. Please make sure you have the "
@@ -6435,7 +6458,7 @@
 "or change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/plugins.c:1624
+#: src/plugins.c:1589
 #, c-format
 msgid ""
 "LiVES did not receive a response from the encoder plugin called '%s'.\n"
@@ -6444,11 +6467,11 @@
 "or switch to another plugin using Tools|Preferences|Encoding\n"
 msgstr ""
 
-#: src/plugins.c:2032
+#: src/plugins.c:1987
 msgid "Unable to resize, please install imageMagick\n"
 msgstr ""
 
-#: src/plugins.c:2231
+#: src/plugins.c:2183
 #, c-format
 msgid ""
 "\n"
@@ -6456,12 +6479,12 @@
 "No decoders found in %s !\n"
 msgstr ""
 
-#: src/plugins.c:2415
+#: src/plugins.c:2369
 #, c-format
 msgid " using %s"
 msgstr ""
 
-#: src/plugins.c:2499
+#: src/plugins.c:2451
 #, c-format
 msgid ""
 "\n"
@@ -6470,7 +6493,7 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/plugins.c:2522
+#: src/plugins.c:2472
 #, c-format
 msgid ""
 "\n"
@@ -6480,24 +6503,24 @@
 "Unable to use it.\n"
 msgstr ""
 
-#: src/plugins.c:2564
+#: src/plugins.c:2512
 msgid "/unknown"
 msgstr ""
 
-#: src/plugins.c:2651
+#: src/plugins.c:2598
 msgid "LiVES: - Decoder Plugins"
 msgstr ""
 
-#: src/plugins.c:2669
+#: src/plugins.c:2616
 msgid "Enabled Video Decoders (uncheck to disable)"
 msgstr ""
 
-#: src/plugins.c:2726
+#: src/plugins.c:2672
 #, c-format
 msgid "Failed to load %s, transitions may not resize.\n"
 msgstr ""
 
-#: src/plugins.c:3854
+#: src/plugins.c:3797
 #, c-format
 msgid "%s advanced settings"
 msgstr ""
@@ -6506,15 +6529,15 @@
 msgid "LiVES: - New Test RFX"
 msgstr ""
 
-#: src/rfx-builder.c:136
+#: src/rfx-builder.c:135
 msgid "LiVES: - Edit Test RFX"
 msgstr ""
 
-#: src/rfx-builder.c:166
+#: src/rfx-builder.c:165
 msgid "Type:"
 msgstr "Тип:"
 
-#: src/rfx-builder.c:184
+#: src/rfx-builder.c:183
 msgid "tool"
 msgstr ""
 
@@ -6526,130 +6549,130 @@
 msgid "The name of the plugin. No spaces allowed."
 msgstr ""
 
-#: src/rfx-builder.c:201
+#: src/rfx-builder.c:202
 msgid "Version:       "
 msgstr "Версии:       "
 
-#: src/rfx-builder.c:203
+#: src/rfx-builder.c:204
 msgid "The script version."
 msgstr "Версия сценария."
 
-#: src/rfx-builder.c:210
+#: src/rfx-builder.c:212
 msgid "    Author:       "
 msgstr "    Автор:       "
 
-#: src/rfx-builder.c:211
+#: src/rfx-builder.c:213
 msgid "The script author."
 msgstr "Автор сценария."
 
-#: src/rfx-builder.c:217
+#: src/rfx-builder.c:220
 msgid "    URL (optional):       "
 msgstr "    URL (необязательно):       "
 
-#: src/rfx-builder.c:218
+#: src/rfx-builder.c:221
 msgid "URL for the plugin maintainer."
 msgstr "URL для плагина Сопровождающий."
 
-#: src/rfx-builder.c:226
+#: src/rfx-builder.c:230
 msgid "Menu text:    "
 msgstr "Текст меню:    "
 
-#: src/rfx-builder.c:227
+#: src/rfx-builder.c:231
 msgid "The text to show in the menu."
 msgstr "Текст для показа в меню."
 
-#: src/rfx-builder.c:239
+#: src/rfx-builder.c:244
 msgid "Action description:        "
 msgstr "Действие Описание:        "
 
-#: src/rfx-builder.c:241
+#: src/rfx-builder.c:246
 msgid "Describe what the plugin is doing. E.g. \"Edge detecting\""
 msgstr "Опишите, что плагин делает. Например, \"Граница обнаружения\""
 
-#: src/rfx-builder.c:246
+#: src/rfx-builder.c:251
 msgid "Minimum frames:"
 msgstr "Минимальная кадры:"
 
-#: src/rfx-builder.c:249
+#: src/rfx-builder.c:254
 msgid ""
 "Minimum number of frames this effect/tool can be applied to. Normally 1."
 msgstr ""
 
-#: src/rfx-builder.c:260
+#: src/rfx-builder.c:265
 msgid "_Requirements..."
 msgstr "_Требования..."
 
-#: src/rfx-builder.c:263
+#: src/rfx-builder.c:268
 msgid "Enter any binaries required by the plugin."
 msgstr "Введите любое исполняемых файлов требуется плагин."
 
-#: src/rfx-builder.c:267
+#: src/rfx-builder.c:272
 msgid "_Properties..."
 msgstr "_Параметры..."
 
-#: src/rfx-builder.c:270
+#: src/rfx-builder.c:275
 msgid "Set properties for the plugin. Optional."
 msgstr "Установка свойств для плагина. Необязательно."
 
-#: src/rfx-builder.c:274
+#: src/rfx-builder.c:279
 msgid "_Parameters..."
 msgstr "_Параметры..."
 
-#: src/rfx-builder.c:277
+#: src/rfx-builder.c:282
 msgid "Set up parameters used in pre/loop/post/trigger code. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:281
+#: src/rfx-builder.c:286
 msgid "Parameter _Window Hints..."
 msgstr ""
 
-#: src/rfx-builder.c:284
+#: src/rfx-builder.c:289
 msgid "Set hints about how to lay out the parameter window. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:290
+#: src/rfx-builder.c:295
 msgid "_Language code:"
 msgstr ""
 
-#: src/rfx-builder.c:291
+#: src/rfx-builder.c:296
 msgid "Language for pre/loop/post/triggers. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:300
+#: src/rfx-builder.c:305
 msgid "_Pre loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:303
+#: src/rfx-builder.c:308
 msgid "Code to be executed before the loop. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:307
+#: src/rfx-builder.c:312
 msgid "_Loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:310
+#: src/rfx-builder.c:315
 msgid "Loop code to be applied to each frame."
 msgstr ""
 
-#: src/rfx-builder.c:314
+#: src/rfx-builder.c:319
 msgid "_Post loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:317
+#: src/rfx-builder.c:322
 msgid "Code to be executed after the loop. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:321
+#: src/rfx-builder.c:326
 msgid "_Trigger code..."
 msgstr ""
 
-#: src/rfx-builder.c:324
+#: src/rfx-builder.c:329
 msgid ""
 "Set trigger code for when the parameter window is shown, or when a parameter "
 "is changed. Optional (except for Utilities)."
 msgstr ""
 
-#: src/rfx-builder.c:421
+#: src/rfx-builder.c:426
 #, c-format
 msgid ""
 "\n"
@@ -6659,55 +6682,55 @@
 "%s\n"
 msgstr ""
 
-#: src/rfx-builder.c:544
+#: src/rfx-builder.c:541
 msgid "LiVES: - RFX Requirements"
 msgstr ""
 
-#: src/rfx-builder.c:548
+#: src/rfx-builder.c:544
 msgid "LiVES: - RFX Parameters"
 msgstr ""
 
-#: src/rfx-builder.c:552
+#: src/rfx-builder.c:547
 msgid "LiVES: - RFX Parameter Window Hints"
 msgstr ""
 
-#: src/rfx-builder.c:556
+#: src/rfx-builder.c:550
 msgid "LiVES: - RFX Triggers"
 msgstr ""
 
-#: src/rfx-builder.c:622
+#: src/rfx-builder.c:613
 msgid "_New Entry"
 msgstr "_Новая запись"
 
-#: src/rfx-builder.c:625
+#: src/rfx-builder.c:616
 msgid "_Edit Entry"
 msgstr ""
 
-#: src/rfx-builder.c:628
+#: src/rfx-builder.c:619
 msgid "_Remove Entry"
 msgstr "_Удалить вступлению"
 
-#: src/rfx-builder.c:632
+#: src/rfx-builder.c:623
 msgid "Move _Up"
 msgstr "В_верх"
 
-#: src/rfx-builder.c:635
+#: src/rfx-builder.c:626
 msgid "Move _Down"
 msgstr "В_низ"
 
-#: src/rfx-builder.c:1004
+#: src/rfx-builder.c:984
 msgid "LiVES: - RFX Properties"
 msgstr ""
 
-#: src/rfx-builder.c:1013
+#: src/rfx-builder.c:993
 msgid "_Slow (hint to GUI)"
 msgstr ""
 
-#: src/rfx-builder.c:1024
+#: src/rfx-builder.c:1004
 msgid "_Batch mode generator"
 msgstr ""
 
-#: src/rfx-builder.c:1831
+#: src/rfx-builder.c:1790
 msgid ""
 "\n"
 "\n"
@@ -6716,7 +6739,7 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:1875
+#: src/rfx-builder.c:1834
 msgid ""
 "\n"
 "\n"
@@ -6724,191 +6747,191 @@
 "Please check the trigger code.\n"
 msgstr ""
 
-#: src/rfx-builder.c:1994
+#: src/rfx-builder.c:1950
 msgid "LiVES: - New RFX Parameter"
 msgstr ""
 
-#: src/rfx-builder.c:1997
+#: src/rfx-builder.c:1952
 msgid "LiVES: - Edit RFX Parameter"
 msgstr ""
 
-#: src/rfx-builder.c:2013
+#: src/rfx-builder.c:1968
 msgid "_Name:    "
 msgstr "_Имя:    "
 
-#: src/rfx-builder.c:2016
+#: src/rfx-builder.c:1971
 msgid "Name of the parameter, must be unique in the plugin."
 msgstr "Название параметра, должен быть уникальным в плагине."
 
-#: src/rfx-builder.c:2025
+#: src/rfx-builder.c:1981
 msgid "_Label:    "
 msgstr "_Лейбл:    "
 
-#: src/rfx-builder.c:2028
+#: src/rfx-builder.c:1984
 msgid ""
 "Label to be shown by the parameter. An underscore represents mnemonic "
 "accelerator."
 msgstr ""
 
-#: src/rfx-builder.c:2039
+#: src/rfx-builder.c:1996
 msgid "_Type:         "
 msgstr "_Тип:         "
 
-#: src/rfx-builder.c:2040
+#: src/rfx-builder.c:1997
 msgid "Parameter type (select from list)."
 msgstr "Параметр типа (выберите из списка)."
 
-#: src/rfx-builder.c:2073
+#: src/rfx-builder.c:2029
 msgid "Decimal _places: "
 msgstr ""
 
-#: src/rfx-builder.c:2082 src/rfx-builder.c:2477 src/rfx-builder.c:2495
+#: src/rfx-builder.c:2038 src/rfx-builder.c:2430 src/rfx-builder.c:2447
 msgid "_Default value:    "
 msgstr ""
 
-#: src/rfx-builder.c:2098
+#: src/rfx-builder.c:2054
 msgid "_Default: "
 msgstr ""
 
-#: src/rfx-builder.c:2132
+#: src/rfx-builder.c:2087
 msgid "Button _Group: "
 msgstr ""
 
-#: src/rfx-builder.c:2134
+#: src/rfx-builder.c:2089
 msgid "A non-zero value can be used to group radio buttons."
 msgstr ""
 
-#: src/rfx-builder.c:2142 src/rfx-builder.c:2478
+#: src/rfx-builder.c:2097 src/rfx-builder.c:2431
 msgid "_Minimum value: "
 msgstr ""
 
-#: src/rfx-builder.c:2148 src/rfx-builder.c:2479
+#: src/rfx-builder.c:2103 src/rfx-builder.c:2432
 msgid "Ma_ximum value: "
 msgstr ""
 
-#: src/rfx-builder.c:2157
+#: src/rfx-builder.c:2113
 msgid "     _Step size:   "
 msgstr ""
 
-#: src/rfx-builder.c:2160
+#: src/rfx-builder.c:2117
 msgid ""
 "How much the parameter is adjusted when the spinbutton arrows are pressed."
 msgstr ""
 
-#: src/rfx-builder.c:2171
+#: src/rfx-builder.c:2129
 msgid "_Wrap value"
 msgstr ""
 
-#: src/rfx-builder.c:2172
+#: src/rfx-builder.c:2131
 msgid "Whether the value wraps max->min and min->max."
 msgstr ""
 
-#: src/rfx-builder.c:2470
+#: src/rfx-builder.c:2424
 msgid "Set _values"
 msgstr ""
 
-#: src/rfx-builder.c:2512
+#: src/rfx-builder.c:2463
 msgid "Default _Red:  "
 msgstr ""
 
-#: src/rfx-builder.c:2513
+#: src/rfx-builder.c:2464
 msgid "Default _Green:"
 msgstr ""
 
-#: src/rfx-builder.c:2514
+#: src/rfx-builder.c:2465
 msgid "Default _Blue: "
 msgstr ""
 
-#: src/rfx-builder.c:2538
+#: src/rfx-builder.c:2488
 msgid "Set _default"
 msgstr ""
 
-#: src/rfx-builder.c:2540
+#: src/rfx-builder.c:2490
 msgid "Default value:  "
 msgstr ""
 
-#: src/rfx-builder.c:2541
+#: src/rfx-builder.c:2491
 msgid "Maximum length (chars): "
 msgstr ""
 
-#: src/rfx-builder.c:2576
+#: src/rfx-builder.c:2526
 msgid "LiVES: - New RFX Parameter Window Hint"
 msgstr ""
 
-#: src/rfx-builder.c:2579
+#: src/rfx-builder.c:2528
 msgid "LiVES: - Edit RFX Parameter Window Hint"
 msgstr ""
 
-#: src/rfx-builder.c:2622
+#: src/rfx-builder.c:2569
 msgid "_Keyword:         "
 msgstr ""
 
-#: src/rfx-builder.c:2639
+#: src/rfx-builder.c:2586
 msgid "Special _Type:         "
 msgstr ""
 
-#: src/rfx-builder.c:2656
+#: src/rfx-builder.c:2602
 msgid "Special _Subtype:         "
 msgstr ""
 
-#: src/rfx-builder.c:2667 src/rfx-builder.c:2706
+#: src/rfx-builder.c:2613 src/rfx-builder.c:2651
 msgid "Row:    "
 msgstr "Ряд:    "
 
-#: src/rfx-builder.c:2732
+#: src/rfx-builder.c:2676
 #, c-format
 msgid "Linked parameters (%d):    "
 msgstr ""
 
-#: src/rfx-builder.c:2749
+#: src/rfx-builder.c:2693
 msgid "Linked parameters (4):    "
 msgstr ""
 
-#: src/rfx-builder.c:2752
+#: src/rfx-builder.c:2695
 msgid "Linked parameters (2):    "
 msgstr ""
 
-#: src/rfx-builder.c:2777
+#: src/rfx-builder.c:2720
 msgid "LiVES: - New RFX Trigger"
 msgstr ""
 
-#: src/rfx-builder.c:2780
+#: src/rfx-builder.c:2722
 msgid "LiVES: - Edit RFX Trigger"
 msgstr ""
 
-#: src/rfx-builder.c:2808
+#: src/rfx-builder.c:2750
 msgid "When:         "
 msgstr "Когда:         "
 
-#: src/rfx-builder.c:2904
+#: src/rfx-builder.c:2846
 msgid "LiVES: - Pre Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:2911
+#: src/rfx-builder.c:2853
 msgid "LiVES: - Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:2918
+#: src/rfx-builder.c:2860
 msgid "LiVES: - Post Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:2931
+#: src/rfx-builder.c:2873
 #, c-format
 msgid "LiVES: - Default text (max length %d)"
 msgstr ""
 
-#: src/rfx-builder.c:2944
+#: src/rfx-builder.c:2885
 msgid "LiVES: - Enter values, one per line"
 msgstr ""
 
-#: src/rfx-builder.c:3055
+#: src/rfx-builder.c:2996
 msgid ""
 "\n"
 "\n"
 "Name must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3060
+#: src/rfx-builder.c:3001
 msgid ""
 "\n"
 "\n"
@@ -6918,21 +6941,21 @@
 "\n"
 "Название не должно содержать пробелов.\n"
 
-#: src/rfx-builder.c:3065
+#: src/rfx-builder.c:3006
 msgid ""
 "\n"
 "\n"
 "Menu text must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3071
+#: src/rfx-builder.c:3012
 msgid ""
 "\n"
 "\n"
 "Action description must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3076
+#: src/rfx-builder.c:3017
 msgid ""
 "\n"
 "\n"
@@ -6942,7 +6965,7 @@
 "\n"
 "Автор не должен быть пустым.\n"
 
-#: src/rfx-builder.c:3085 src/rfx-builder.c:4339
+#: src/rfx-builder.c:3026 src/rfx-builder.c:4253
 msgid ""
 "\n"
 "\n"
@@ -6950,21 +6973,21 @@
 "Name must be unique.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3092
+#: src/rfx-builder.c:3033
 msgid ""
 "\n"
 "\n"
 "Loop code should not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3098
+#: src/rfx-builder.c:3039
 msgid ""
 "\n"
 "\n"
 "Trigger code should not be blank for a utility.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3111
+#: src/rfx-builder.c:3052
 msgid ""
 "\n"
 "\n"
@@ -6974,7 +6997,7 @@
 "\n"
 "Параметр не должен быть пустым.\n"
 
-#: src/rfx-builder.c:3117
+#: src/rfx-builder.c:3058
 msgid ""
 "\n"
 "\n"
@@ -6983,41 +7006,41 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:3171
+#: src/rfx-builder.c:3111
 #, c-format
 msgid "Writing script file %s..."
 msgstr ""
 
-#: src/rfx-builder.c:3477
+#: src/rfx-builder.c:3411
 msgid "No <define> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3484 src/rfx-builder.c:3493
+#: src/rfx-builder.c:3418 src/rfx-builder.c:3427
 msgid "Bad script version.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3505
+#: src/rfx-builder.c:3439
 msgid "No <name> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3513
+#: src/rfx-builder.c:3447
 msgid "No <version> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3522
+#: src/rfx-builder.c:3456
 msgid "No <author> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3536
+#: src/rfx-builder.c:3470
 msgid "No <description> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3540
+#: src/rfx-builder.c:3474
 #, c-format
 msgid "Bad description. (%s)\n"
 msgstr ""
 
-#: src/rfx-builder.c:3702
+#: src/rfx-builder.c:3627
 #, c-format
 msgid ""
 "\n"
@@ -7027,27 +7050,27 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:3859
+#: src/rfx-builder.c:3780
 msgid "Rebuilding all RFX scripts...builtin..."
 msgstr ""
 
-#: src/rfx-builder.c:3860
+#: src/rfx-builder.c:3781
 msgid "Rebuilding scripts"
 msgstr ""
 
-#: src/rfx-builder.c:3868
+#: src/rfx-builder.c:3789
 msgid "custom..."
 msgstr ""
 
-#: src/rfx-builder.c:3872
+#: src/rfx-builder.c:3793
 msgid "test..."
 msgstr ""
 
-#: src/rfx-builder.c:3878
+#: src/rfx-builder.c:3799
 msgid "rebuilding dynamic menu entries..."
 msgstr ""
 
-#: src/rfx-builder.c:3905 src/rfx-builder.c:3912
+#: src/rfx-builder.c:3826 src/rfx-builder.c:3834
 #, c-format
 msgid ""
 "\n"
@@ -7056,7 +7079,7 @@
 "Please check this program is in your path and executable.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3951
+#: src/rfx-builder.c:3874
 #, c-format
 msgid ""
 "\n"
@@ -7066,12 +7089,12 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:3960
+#: src/rfx-builder.c:3884
 #, c-format
 msgid "Deleting rfx script %s..."
 msgstr ""
 
-#: src/rfx-builder.c:3980
+#: src/rfx-builder.c:3902
 #, c-format
 msgid ""
 "\n"
@@ -7081,7 +7104,7 @@
 "Error code was %d\n"
 msgstr ""
 
-#: src/rfx-builder.c:4016
+#: src/rfx-builder.c:3938
 #, c-format
 msgid ""
 "\n"
@@ -7091,12 +7114,12 @@
 "Please delete it first, or rename the test script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4027
+#: src/rfx-builder.c:3950
 #, c-format
 msgid "Promoting rfx test plugin %s to custom..."
 msgstr ""
 
-#: src/rfx-builder.c:4044
+#: src/rfx-builder.c:3965
 #, c-format
 msgid ""
 "\n"
@@ -7107,20 +7130,20 @@
 "Return code was %d (%s)\n"
 msgstr ""
 
-#: src/rfx-builder.c:4070
+#: src/rfx-builder.c:3990
 msgid "LiVES: - Export Script to..."
 msgstr ""
 
-#: src/rfx-builder.c:4077 src/rfx-builder.c:4156
+#: src/rfx-builder.c:3997 src/rfx-builder.c:4074
 #, c-format
 msgid "Copying %s to %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4105
+#: src/rfx-builder.c:4024
 msgid "LiVES: Import Script from..."
 msgstr ""
 
-#: src/rfx-builder.c:4148
+#: src/rfx-builder.c:4067
 #, c-format
 msgid ""
 "\n"
@@ -7130,43 +7153,43 @@
 "Please delete it first, or rename the import script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4249
+#: src/rfx-builder.c:4166
 msgid "LiVES: - Copy RFX Script"
 msgstr ""
 
-#: src/rfx-builder.c:4251
+#: src/rfx-builder.c:4168
 msgid "_From type:    "
 msgstr ""
 
-#: src/rfx-builder.c:4258
+#: src/rfx-builder.c:4175
 msgid "   Script:    "
 msgstr "   Сценарист:    "
 
-#: src/rfx-builder.c:4267
+#: src/rfx-builder.c:4183
 msgid "LiVES: - Rename test RFX Script"
 msgstr ""
 
-#: src/rfx-builder.c:4268
+#: src/rfx-builder.c:4184
 msgid "From script: "
 msgstr ""
 
-#: src/rfx-builder.c:4273
+#: src/rfx-builder.c:4188
 msgid "LiVES: - RFX Script name"
 msgstr ""
 
-#: src/rfx-builder.c:4274
+#: src/rfx-builder.c:4189
 msgid "Script name: "
 msgstr "Имя сценария: "
 
-#: src/rfx-builder.c:4294
+#: src/rfx-builder.c:4209
 msgid "New name: "
 msgstr "Новое имя: "
 
-#: src/rfx-builder.c:4297
+#: src/rfx-builder.c:4212
 msgid "New script name: "
 msgstr ""
 
-#: src/rfx-builder.c:4372
+#: src/rfx-builder.c:4286
 msgid ""
 "\n"
 "\n"
@@ -7174,12 +7197,12 @@
 "Script name must be unique.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4384
+#: src/rfx-builder.c:4297
 #, c-format
 msgid "Renaming RFX test script %s to %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4390
+#: src/rfx-builder.c:4302
 #, c-format
 msgid ""
 "\n"
@@ -7190,21 +7213,21 @@
 "Return code was %d\n"
 msgstr ""
 
-#: src/rfx-builder.c:4610
+#: src/rfx-builder.c:4518
 msgid "_Apply Real Time Effects to Selection"
 msgstr ""
 
-#: src/rfx-builder.c:4664
+#: src/rfx-builder.c:4572
 #, c-format
 msgid "Loading rendered effect %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4766
+#: src/rfx-builder.c:4674
 msgid ""
 "See: VJ - show VJ keys. Set the realtime effects, and then apply them here."
 msgstr ""
 
-#: src/preferences.c:359
+#: src/preferences.c:351
 msgid ""
 "\n"
 "\n"
@@ -7212,7 +7235,7 @@
 "full screen, separate window (fs) mode\n"
 msgstr ""
 
-#: src/preferences.c:408
+#: src/preferences.c:400
 msgid ""
 "\n"
 "\n"
@@ -7220,7 +7243,7 @@
 "(Free space = UNKNOWN)"
 msgstr ""
 
-#: src/preferences.c:412
+#: src/preferences.c:403
 #, c-format
 msgid ""
 "\n"
@@ -7229,14 +7252,14 @@
 "(Free space = %s)"
 msgstr ""
 
-#: src/preferences.c:416
+#: src/preferences.c:408
 msgid ""
 "The temp directory is LiVES working directory where opened clips and sets "
 "are stored.\n"
 "It should be in a partition with plenty of free disk space.\n"
 msgstr ""
 
-#: src/preferences.c:784
+#: src/preferences.c:839
 #, c-format
 msgid ""
 "Unable to create or write to the new temporary directory.\n"
@@ -7247,7 +7270,7 @@
 "The directory will not be changed now.\n"
 msgstr ""
 
-#: src/preferences.c:786
+#: src/preferences.c:843
 #, c-format
 msgid ""
 "Unable to create or write to the new temporary directory.\n"
@@ -7257,7 +7280,7 @@
 "The directory will not be changed now.\n"
 msgstr ""
 
-#: src/preferences.c:798
+#: src/preferences.c:856
 msgid ""
 "You have chosen to change the temporary directory.\n"
 "Please make sure you have no other copies of LiVES open.\n"
@@ -7269,20 +7292,20 @@
 "original setting."
 msgstr ""
 
-#: src/preferences.c:1169
+#: src/preferences.c:1221
 msgid ""
 "\n"
 "Unable to switch audio players to jack - jackd must be installed first.\n"
 "See http://jackaudio.org\n"
 msgstr ""
 
-#: src/preferences.c:1175
+#: src/preferences.c:1226
 msgid ""
 "\n"
 "Switching audio players requires restart (jackd must not be running)\n"
 msgstr ""
 
-#: src/preferences.c:1202
+#: src/preferences.c:1253
 msgid ""
 "\n"
 "Unable to switch audio players to pulse audio\n"
@@ -7290,817 +7313,817 @@
 "See http://www.pulseaudio.org\n"
 msgstr ""
 
-#: src/preferences.c:1502
+#: src/preferences.c:1544
 msgid "PCM (highest quality; largest files)"
 msgstr ""
 
-#: src/preferences.c:2063
+#: src/preferences.c:2096
 msgid "LiVES: - Preferences"
 msgstr ""
 
-#: src/preferences.c:2142
+#: src/preferences.c:2177
 msgid "Open file selection maximised"
 msgstr ""
 
-#: src/preferences.c:2149
+#: src/preferences.c:2184
 msgid "Show recent files in the File menu"
 msgstr ""
 
-#: src/preferences.c:2158
+#: src/preferences.c:2193
 msgid "Stop screensaver on playback    "
 msgstr ""
 
-#: src/preferences.c:2165
+#: src/preferences.c:2200
 msgid "Open main window maximised"
 msgstr ""
 
-#: src/preferences.c:2173
+#: src/preferences.c:2208
 msgid "Show toolbar when background is blanked"
 msgstr ""
 
-#: src/preferences.c:2181
+#: src/preferences.c:2216
 msgid "Allow mouse wheel to switch clips"
 msgstr ""
 
-#: src/preferences.c:2192
+#: src/preferences.c:2227
 msgid "Shrink previews to fit in interface"
 msgstr ""
 
-#: src/preferences.c:2202
+#: src/preferences.c:2237
 msgid "Startup mode:"
 msgstr ""
 
-#: src/preferences.c:2206
+#: src/preferences.c:2241
 msgid "_Clip editor"
 msgstr ""
 
-#: src/preferences.c:2210
+#: src/preferences.c:2245
 msgid "_Multitrack mode"
 msgstr ""
 
-#: src/preferences.c:2234
+#: src/preferences.c:2268
 msgid "Multi-head support"
 msgstr ""
 
-#: src/preferences.c:2242
+#: src/preferences.c:2276
 msgid " monitor number for LiVES interface"
 msgstr ""
 
-#: src/preferences.c:2248
+#: src/preferences.c:2282
 msgid " monitor number for playback"
 msgstr ""
 
-#: src/preferences.c:2260
+#: src/preferences.c:2294
 msgid ""
 "A setting of 0 means use all available monitors (only works with some "
 "playback plugins)."
 msgstr ""
 
-#: src/preferences.c:2270
+#: src/preferences.c:2304
 msgid "Force single monitor"
 msgstr ""
 
-#: src/preferences.c:2271
+#: src/preferences.c:2305
 msgid "Ignore all except the first monitor."
 msgstr ""
 
-#: src/preferences.c:2293
+#: src/preferences.c:2327
 msgid "Show clip thumbnails during playback"
 msgstr ""
 
-#: src/preferences.c:2306
+#: src/preferences.c:2340
 msgid "GUI"
 msgstr "GUI"
 
-#: src/preferences.c:2321
+#: src/preferences.c:2355
 msgid "When entering Multitrack mode:"
 msgstr ""
 
-#: src/preferences.c:2330
+#: src/preferences.c:2364
 msgid "_Prompt me for width, height, fps and audio settings"
 msgstr ""
 
-#: src/preferences.c:2336
+#: src/preferences.c:2370
 msgid "_Always use the following values:"
 msgstr ""
 
-#: src/preferences.c:2345
+#: src/preferences.c:2379
 msgid "Use these same _values for rendering a new clip"
 msgstr ""
 
-#: src/preferences.c:2370
+#: src/preferences.c:2404
 msgid "_Width           "
 msgstr "_Ширина           "
 
-#: src/preferences.c:2375
+#: src/preferences.c:2409
 msgid "          _Height      "
 msgstr "          _Высота      "
 
-#: src/preferences.c:2379
+#: src/preferences.c:2413
 msgid "          _FPS"
 msgstr ""
 
-#: src/preferences.c:2387
+#: src/preferences.c:2421
 msgid "Enable backing audio track"
 msgstr ""
 
-#: src/preferences.c:2394
+#: src/preferences.c:2428
 msgid "Audio track per video track"
 msgstr ""
 
-#: src/preferences.c:2423
+#: src/preferences.c:2457
 msgid "    _Undo buffer size (MB)    "
 msgstr ""
 
-#: src/preferences.c:2432
+#: src/preferences.c:2466
 msgid "_Exit multitrack mode after rendering"
 msgstr ""
 
-#: src/preferences.c:2440
+#: src/preferences.c:2474
 msgid "Auto backup layouts"
 msgstr ""
 
-#: src/preferences.c:2445
+#: src/preferences.c:2479
 msgid "_Every"
 msgstr "_Каждый"
 
-#: src/preferences.c:2453
+#: src/preferences.c:2487
 msgid "seconds"
 msgstr "секунды"
 
-#: src/preferences.c:2461
+#: src/preferences.c:2495
 msgid "After every _change"
 msgstr ""
 
-#: src/preferences.c:2467
+#: src/preferences.c:2501
 msgid "_Never"
 msgstr "_Никогда"
 
-#: src/preferences.c:2490
+#: src/preferences.c:2523
 msgid "Multitrack/Render"
 msgstr ""
 
-#: src/preferences.c:2508
+#: src/preferences.c:2541
 msgid "Use instant opening when possible"
 msgstr ""
 
-#: src/preferences.c:2509
+#: src/preferences.c:2543
 msgid "Enable instant opening of some file types using decoder plugins"
 msgstr ""
 
-#: src/preferences.c:2531
+#: src/preferences.c:2567
 msgid "Video open command (fallback)"
 msgstr ""
 
-#: src/preferences.c:2543
+#: src/preferences.c:2579
 msgid "Open/render compression"
 msgstr ""
 
-#: src/preferences.c:2546
+#: src/preferences.c:2582
 msgid " %     ( lower = slower, larger files; for jpeg, higher quality )"
 msgstr ""
 
-#: src/preferences.c:2558
+#: src/preferences.c:2594
 msgid "Default image format"
 msgstr ""
 
-#: src/preferences.c:2562
+#: src/preferences.c:2598
 msgid "_jpeg"
 msgstr "_jpeg"
 
-#: src/preferences.c:2565
+#: src/preferences.c:2601
 msgid "_png"
 msgstr "_png"
 
-#: src/preferences.c:2572
+#: src/preferences.c:2608
 msgid "(Check Help/Troubleshoot to see which image formats are supported)"
 msgstr ""
 
-#: src/preferences.c:2580
+#: src/preferences.c:2616
 msgid "Enable automatic deinterlacing when possible"
 msgstr ""
 
-#: src/preferences.c:2582
+#: src/preferences.c:2619
 msgid "Automatically deinterlace frames when a plugin suggests it"
 msgstr ""
 
-#: src/preferences.c:2593
+#: src/preferences.c:2632
 msgid "Automatic trimming / padding of audio when possible"
 msgstr ""
 
-#: src/preferences.c:2595
+#: src/preferences.c:2634
 msgid "Automatically trim or pad audio when a plugin suggests it"
 msgstr ""
 
-#: src/preferences.c:2606
+#: src/preferences.c:2646
 msgid "Ignore blank borders when possible"
 msgstr ""
 
-#: src/preferences.c:2608
+#: src/preferences.c:2648
 msgid "Clip any blank borders from frames where possible"
 msgstr ""
 
-#: src/preferences.c:2619
+#: src/preferences.c:2660
 msgid "When opening multiple files, concatenate images into one clip"
 msgstr ""
 
-#: src/preferences.c:2629
+#: src/preferences.c:2670
 msgid "Decoding"
 msgstr "Декодирование"
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:2652
+#: src/preferences.c:2693
 msgid "Low - can improve performance on slower machines"
 msgstr "Минимум - может повысить производительность на медленных машинах"
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:2654
+#: src/preferences.c:2695
 msgid "Normal - recommended for most users"
 msgstr "Нормальная - рекомендуется для большинства пользователей"
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:2656
+#: src/preferences.c:2697
 msgid "High - can improve quality on very fast machines"
 msgstr "Максимум - можно улучшить качество на очень быстрых машинах"
 
-#: src/preferences.c:2659
+#: src/preferences.c:2700
 msgid "Preview _quality"
 msgstr "Предварительный _качество"
 
-#: src/preferences.c:2660
+#: src/preferences.c:2701
 msgid "The preview quality for video playback - affects resizing"
 msgstr ""
 
-#: src/preferences.c:2675
+#: src/preferences.c:2717
 msgid "_Show FPS statistics"
 msgstr ""
 
-#: src/preferences.c:2694
+#: src/preferences.c:2736
 msgid "_Plugin"
 msgstr "_Модуль"
 
-#: src/preferences.c:2718
+#: src/preferences.c:2760
 msgid "Stream audio"
 msgstr ""
 
-#: src/preferences.c:2721
+#: src/preferences.c:2763
 msgid "Stream audio to playback plugin"
 msgstr ""
 
-#: src/preferences.c:2734
+#: src/preferences.c:2778
 msgid "Record player output"
 msgstr ""
 
-#: src/preferences.c:2737
+#: src/preferences.c:2781
 msgid "Record output from player instead of input to player"
 msgstr ""
 
-#: src/preferences.c:2744
+#: src/preferences.c:2789
 msgid "VIDEO"
 msgstr "ВИДЕО"
 
-#: src/preferences.c:2787
+#: src/preferences.c:2833
 msgid "_Player"
 msgstr "_Игроки"
 
-#: src/preferences.c:2792
+#: src/preferences.c:2838
 msgid "(See also the Jack Integration tab for jack startup options)"
 msgstr ""
 
-#: src/preferences.c:2819
+#: src/preferences.c:2865
 msgid "mplayer"
 msgstr "mplayer"
 
-#: src/preferences.c:2830
+#: src/preferences.c:2876
 #, fuzzy
 msgid "mplayer2"
 msgstr "mplayer"
 
-#: src/preferences.c:2833
+#: src/preferences.c:2879
 msgid "Audio play _command"
 msgstr ""
 
-#: src/preferences.c:2840
+#: src/preferences.c:2886
 msgid "- internal -"
 msgstr ""
 
-#: src/preferences.c:2849
+#: src/preferences.c:2895
 msgid "Audio follows video _rate/direction"
 msgstr ""
 
-#: src/preferences.c:2857
+#: src/preferences.c:2903
 msgid "Audio follows _clip switches"
 msgstr ""
 
-#: src/preferences.c:2864
+#: src/preferences.c:2910
 msgid "Source:"
 msgstr ""
 
-#: src/preferences.c:2868
+#: src/preferences.c:2914
 msgid "_Internal"
 msgstr ""
 
-#: src/preferences.c:2873
+#: src/preferences.c:2919
 msgid "_External (requires jack or pulse audio player)"
 msgstr ""
 
-#: src/preferences.c:2892
+#: src/preferences.c:2940
 msgid "AUDIO"
 msgstr "АУДИО"
 
-#: src/preferences.c:2902
+#: src/preferences.c:2950
 msgid "Playback"
 msgstr "Воспроизведение"
 
-#: src/preferences.c:2925
+#: src/preferences.c:2973
 msgid ""
 "Record audio when capturing an e_xternal window\n"
 " (requires jack or pulse audio)"
 msgstr ""
 
-#: src/preferences.c:2940
+#: src/preferences.c:2988
 msgid "      What to record when 'r' is pressed   "
 msgstr ""
 
-#: src/preferences.c:2949
+#: src/preferences.c:2997
 msgid "_Frame changes"
 msgstr ""
 
-#: src/preferences.c:2964
+#: src/preferences.c:3012
 msgid "F_PS changes"
 msgstr ""
 
-#: src/preferences.c:2982
+#: src/preferences.c:3030
 msgid "_Real time effects"
 msgstr ""
 
-#: src/preferences.c:2993
+#: src/preferences.c:3041
 msgid "_Clip switches"
 msgstr ""
 
-#: src/preferences.c:3004
+#: src/preferences.c:3052
 msgid "_Audio (requires jack or pulse audio player)"
 msgstr ""
 
-#: src/preferences.c:3024
+#: src/preferences.c:3072
 msgid "Pause recording if free disk space falls below"
 msgstr ""
 
 #. TRANSLATORS: gigabytes
-#: src/preferences.c:3030
+#: src/preferences.c:3078
 msgid "GB"
 msgstr ""
 
-#: src/preferences.c:3037
+#: src/preferences.c:3085
 msgid "Recording"
 msgstr "Записывается"
 
-#: src/preferences.c:3055
+#: src/preferences.c:3103
 msgid "Encoder"
 msgstr ""
 
-#: src/preferences.c:3090
+#: src/preferences.c:3137
 msgid "Output format"
 msgstr "Выходной формат"
 
-#: src/preferences.c:3106
+#: src/preferences.c:3153
 msgid "Audio codec"
 msgstr "Аудио кодек"
 
-#: src/preferences.c:3119
+#: src/preferences.c:3165
 msgid "Encoding"
 msgstr "Кодирование"
 
-#: src/preferences.c:3134
+#: src/preferences.c:3180
 msgid "Use _antialiasing when resizing"
 msgstr ""
 
-#: src/preferences.c:3143
+#: src/preferences.c:3189
 msgid "Number of _real time effect keys"
 msgstr ""
 
-#: src/preferences.c:3145
+#: src/preferences.c:3192
 msgid ""
 "The number of \"virtual\" real time effect keys. They can be controlled "
 "through the real time effects window, or via network (OSC)."
 msgstr ""
 
-#: src/preferences.c:3152
+#: src/preferences.c:3199
 msgid "Use _threads where possible when applying effects"
 msgstr ""
 
-#: src/preferences.c:3159
+#: src/preferences.c:3207
 msgid "Number of _threads"
 msgstr ""
 
-#: src/preferences.c:3172
+#: src/preferences.c:3221
 msgid "Restart is required if any of the following paths are changed:"
 msgstr ""
 
-#: src/preferences.c:3182
+#: src/preferences.c:3231
 msgid "Weed plugin path"
 msgstr ""
 
-#: src/preferences.c:3184
+#: src/preferences.c:3234
 msgid "Frei0r plugin path"
 msgstr ""
 
-#: src/preferences.c:3186
+#: src/preferences.c:3237
 msgid "LADSPA plugin path"
 msgstr ""
 
-#: src/preferences.c:3209
+#: src/preferences.c:3261
 msgid "      Video load directory (default)      "
 msgstr ""
 
-#: src/preferences.c:3215
+#: src/preferences.c:3267
 msgid "      Video save directory (default) "
 msgstr ""
 
-#: src/preferences.c:3221
+#: src/preferences.c:3273
 msgid "      Audio load directory (default) "
 msgstr ""
 
-#: src/preferences.c:3227
+#: src/preferences.c:3279
 msgid "      Image directory (default) "
 msgstr ""
 
-#: src/preferences.c:3233
+#: src/preferences.c:3285
 msgid "      Backup/Restore directory (default) "
 msgstr ""
 
-#: src/preferences.c:3239
+#: src/preferences.c:3291
 msgid "      Temp directory (do not remove) "
 msgstr ""
 
-#: src/preferences.c:3252
+#: src/preferences.c:3304
 msgid "The default directory for loading video clips from"
 msgstr ""
 
-#: src/preferences.c:3277
+#: src/preferences.c:3329
 msgid "The default directory for saving encoded clips to"
 msgstr ""
 
-#: src/preferences.c:3285
+#: src/preferences.c:3337
 msgid "The default directory for loading and saving audio"
 msgstr ""
 
-#: src/preferences.c:3293
+#: src/preferences.c:3345
 msgid "The default directory for saving frameshots to"
 msgstr ""
 
-#: src/preferences.c:3301
+#: src/preferences.c:3353
 msgid "The default directory for backing up/restoring single clips"
 msgstr ""
 
-#: src/preferences.c:3309
+#: src/preferences.c:3361
 msgid "LiVES working directory."
 msgstr ""
 
-#: src/preferences.c:3359
+#: src/preferences.c:3412
 msgid "Directories"
 msgstr "Каталоги"
 
-#: src/preferences.c:3374
+#: src/preferences.c:3427
 msgid "Warn if diskspace falls below: "
 msgstr ""
 
-#: src/preferences.c:3380 src/preferences.c:3394
+#: src/preferences.c:3433 src/preferences.c:3447
 msgid " MB [set to 0 to disable]"
 msgstr ""
 
-#: src/preferences.c:3389
+#: src/preferences.c:3442
 msgid "Diskspace critical level: "
 msgstr ""
 
-#: src/preferences.c:3407
+#: src/preferences.c:3461
 msgid ""
 "Warn on Insert / Merge if _frame rate of clipboard does not match frame rate "
 "of selection"
 msgstr ""
 
-#: src/preferences.c:3417
+#: src/preferences.c:3471
 msgid "Warn on Open if file _size exceeds "
 msgstr ""
 
-#: src/preferences.c:3425
+#: src/preferences.c:3479
 msgid " MB"
 msgstr " МБ"
 
-#: src/preferences.c:3432
+#: src/preferences.c:3486
 msgid "Show a warning before saving a se_t"
 msgstr ""
 
-#: src/preferences.c:3442
+#: src/preferences.c:3496
 msgid ""
 "Show a warning if _mplayer/mplayer2, sox, composite or convert is not found "
 "when LiVES is started."
 msgstr ""
 
-#: src/preferences.c:3452
+#: src/preferences.c:3506
 msgid "Show a warning if no _rendered effects are found at startup."
 msgstr ""
 
-#: src/preferences.c:3464
+#: src/preferences.c:3518
 msgid "Show a warning if no _encoder plugins are found at startup."
 msgstr ""
 
-#: src/preferences.c:3474
+#: src/preferences.c:3528
 msgid "Show a warning if a _duplicate set name is entered."
 msgstr ""
 
-#: src/preferences.c:3485
+#: src/preferences.c:3539
 msgid "When a set is loaded, warn if clips are missing from _layouts."
 msgstr ""
 
-#: src/preferences.c:3495
+#: src/preferences.c:3550
 msgid "Warn if a clip used in a layout is about to be closed."
 msgstr ""
 
-#: src/preferences.c:3505
+#: src/preferences.c:3561
 msgid "Warn if frames used in a layout are about to be deleted."
 msgstr ""
 
-#: src/preferences.c:3515
+#: src/preferences.c:3572
 msgid "Warn if frames used in a layout are about to be shifted."
 msgstr ""
 
-#: src/preferences.c:3525
+#: src/preferences.c:3583
 msgid "Warn if frames used in a layout are about to be altered."
 msgstr ""
 
-#: src/preferences.c:3535
+#: src/preferences.c:3594
 msgid "Warn if audio used in a layout is about to be deleted."
 msgstr ""
 
-#: src/preferences.c:3546
+#: src/preferences.c:3606
 msgid "Warn if audio used in a layout is about to be shifted."
 msgstr ""
 
-#: src/preferences.c:3556
+#: src/preferences.c:3617
 msgid "Warn if audio used in a layout is about to be altered."
 msgstr ""
 
-#: src/preferences.c:3566
+#: src/preferences.c:3628
 msgid "Popup layout errors after clip changes."
 msgstr ""
 
-#: src/preferences.c:3577
+#: src/preferences.c:3639
 msgid "Warn if the layout has not been saved when leaving multitrack mode."
 msgstr ""
 
-#: src/preferences.c:3588
+#: src/preferences.c:3650
 msgid ""
 "Warn if multitrack has no audio channels, and a layout with audio is loaded."
 msgstr ""
 
-#: src/preferences.c:3598
+#: src/preferences.c:3660
 msgid ""
 "Warn if multitrack has audio channels, and your audio player is not \"jack\" "
 "or \"pulse audio\"."
 msgstr ""
 
-#: src/preferences.c:3610
+#: src/preferences.c:3672
 msgid "Show info message after importing from firewire device."
 msgstr ""
 
-#: src/preferences.c:3626
+#: src/preferences.c:3688
 msgid "Show a warning before opening a yuv4mpeg stream (advanced)."
 msgstr ""
 
-#: src/preferences.c:3639
+#: src/preferences.c:3701
 msgid "Show a warning when multitrack is low on backup space."
 msgstr ""
 "Показать предупреждение при многодорожечной заканчивается резервного "
 "пространства."
 
-#: src/preferences.c:3650
+#: src/preferences.c:3713
 msgid "Show a warning advising cleaning of disk space after a crash."
 msgstr ""
 
-#: src/preferences.c:3661
+#: src/preferences.c:3725
 msgid "Show a warning if unable to connect to pulseaudio player."
 msgstr ""
 
-#: src/preferences.c:3673
+#: src/preferences.c:3737
 msgid "Show a warning before wiping a layout which has unsaved changes."
 msgstr ""
 
-#: src/preferences.c:3685
+#: src/preferences.c:3749
 msgid "Warnings"
 msgstr "Предупреждения"
 
-#: src/preferences.c:3703
+#: src/preferences.c:3767
 msgid "Midi synch (requires the files midistart and midistop)"
 msgstr ""
 
-#: src/preferences.c:3715
+#: src/preferences.c:3779
 msgid "When inserting/merging frames:  "
 msgstr ""
 
-#: src/preferences.c:3719
+#: src/preferences.c:3783
 msgid "_Speed Up/Slow Down Insertion"
 msgstr ""
 
-#: src/preferences.c:3723
+#: src/preferences.c:3787
 msgid "_Resample Insertion"
 msgstr ""
 
-#: src/preferences.c:3730
+#: src/preferences.c:3794
 msgid "CD device           "
 msgstr "Устройство чтения           "
 
-#: src/preferences.c:3733
+#: src/preferences.c:3797
 msgid "LiVES can load audio tracks from this CD"
 msgstr ""
 
-#: src/preferences.c:3746
+#: src/preferences.c:3813
 msgid "Default FPS        "
 msgstr ""
 
-#: src/preferences.c:3749
+#: src/preferences.c:3816
 msgid "Frames per second to use when none is specified"
 msgstr ""
 
-#: src/preferences.c:3757
+#: src/preferences.c:3825
 msgid "Misc"
 msgstr "Прочее"
 
-#: src/preferences.c:3782
+#: src/preferences.c:3850
 msgid "New theme:           "
 msgstr "Новые темы:           "
 
-#: src/preferences.c:3800
+#: src/preferences.c:3867
 msgid "Themes"
 msgstr "Темы"
 
-#: src/preferences.c:3815
+#: src/preferences.c:3882
 msgid "Download bandwidth (Kb/s)       "
 msgstr ""
 
-#: src/preferences.c:3823
+#: src/preferences.c:3890
 msgid "LiVES must be compiled without \"configure --disable-OSC\" to use OMC"
 msgstr ""
 
-#: src/preferences.c:3833
+#: src/preferences.c:3900
 msgid "OMC remote control enabled"
 msgstr ""
 
-#: src/preferences.c:3841
+#: src/preferences.c:3908
 msgid "UDP port       "
 msgstr ""
 
-#: src/preferences.c:3850
+#: src/preferences.c:3917
 msgid "Start OMC on startup"
 msgstr ""
 
-#: src/preferences.c:3870
+#: src/preferences.c:3937
 msgid "Streaming/Networking"
 msgstr ""
 
-#: src/preferences.c:3882
+#: src/preferences.c:3949
 msgid "Jack transport"
 msgstr ""
 
-#: src/preferences.c:3886
+#: src/preferences.c:3953
 msgid ""
 "LiVES must be compiled with jack/transport.h and jack/jack.h present to use "
 "jack transport"
 msgstr ""
 
-#: src/preferences.c:3892
+#: src/preferences.c:3959
 msgid "Jack _transport config file"
 msgstr ""
 
-#: src/preferences.c:3899 src/preferences.c:3989
+#: src/preferences.c:3967 src/preferences.c:4058
 msgid "Start _server on LiVES startup"
 msgstr ""
 
-#: src/preferences.c:3911
+#: src/preferences.c:3979
 msgid "Jack transport _master (start and stop)"
 msgstr ""
 
-#: src/preferences.c:3921
+#: src/preferences.c:3989
 msgid "Jack transport _client (start and stop)"
 msgstr ""
 
-#: src/preferences.c:3935
+#: src/preferences.c:4003
 msgid "Jack transport sets start position"
 msgstr ""
 
-#: src/preferences.c:3952
+#: src/preferences.c:4020
 msgid "Jack transport timebase slave"
 msgstr ""
 
-#: src/preferences.c:3963
+#: src/preferences.c:4031
 msgid "(See also Playback -> Audio follows video rate/direction)"
 msgstr ""
 
-#: src/preferences.c:3971
+#: src/preferences.c:4039
 msgid "Jack audio"
 msgstr ""
 
-#: src/preferences.c:3975
+#: src/preferences.c:4043
 msgid "LiVES must be compiled with jack/jack.h present to use jack audio"
 msgstr ""
 
-#: src/preferences.c:3978
+#: src/preferences.c:4046
 msgid ""
 "You MUST set the audio player to \"jack\" in the Playback tab to use jack "
 "audio"
 msgstr ""
 
-#: src/preferences.c:3984
+#: src/preferences.c:4052
 msgid "Jack _audio server config file"
 msgstr ""
 
-#: src/preferences.c:3996
+#: src/preferences.c:4065
 msgid "Play audio even when transport is _paused"
 msgstr ""
 
-#: src/preferences.c:4008
+#: src/preferences.c:4077
 msgid "Automatically connect to System Out ports when 'playing' External Audio"
 msgstr ""
 
-#: src/preferences.c:4021
+#: src/preferences.c:4090
 msgid "Jack Integration"
 msgstr ""
 
-#: src/preferences.c:4035
+#: src/preferences.c:4104
 msgid "Events to respond to:"
 msgstr ""
 
-#: src/preferences.c:4044
+#: src/preferences.c:4113
 msgid "_Joystick events"
 msgstr "_Джойстик события"
 
-#: src/preferences.c:4051
+#: src/preferences.c:4120
 msgid "_Joystick device"
 msgstr "_Джойстик устройство"
 
-#: src/preferences.c:4053
+#: src/preferences.c:4122
 msgid "The joystick device, e.g. /dev/input/js0"
 msgstr "Джойстиком устройства, например /dev/input/js0"
 
-#: src/preferences.c:4071
+#: src/preferences.c:4142
 msgid "_MIDI events"
 msgstr ""
 
-#: src/preferences.c:4080
+#: src/preferences.c:4151
 msgid "Use _ALSA MIDI (recommended)"
 msgstr ""
 
-#: src/preferences.c:4082
+#: src/preferences.c:4153
 msgid "Create an ALSA MIDI port which other MIDI devices can be connected to"
 msgstr ""
 
-#: src/preferences.c:4090
+#: src/preferences.c:4162
 msgid "Use _raw MIDI"
 msgstr ""
 
-#: src/preferences.c:4092
+#: src/preferences.c:4164
 msgid "Read directly from the MIDI device"
 msgstr ""
 
-#: src/preferences.c:4104
+#: src/preferences.c:4177
 msgid "_MIDI device"
 msgstr ""
 
-#: src/preferences.c:4106
+#: src/preferences.c:4179
 msgid "The MIDI device, e.g. /dev/input/midi0"
 msgstr ""
 
-#: src/preferences.c:4118
+#: src/preferences.c:4193
 msgid "Advanced"
 msgstr "Дополнительно"
 
-#: src/preferences.c:4124
+#: src/preferences.c:4199
 msgid "MIDI check _rate"
 msgstr ""
 
-#: src/preferences.c:4127
+#: src/preferences.c:4203
 msgid ""
 "Number of MIDI checks per keyboard tick. Increasing this may improve MIDI "
 "responsiveness, but may slow down playback."
 msgstr ""
 
-#: src/preferences.c:4134
+#: src/preferences.c:4211
 msgid "MIDI repeat"
 msgstr ""
 
-#: src/preferences.c:4137
+#: src/preferences.c:4214
 msgid "Number of non-reads allowed between succesive reads."
 msgstr ""
 
-#: src/preferences.c:4140
+#: src/preferences.c:4218
 msgid "(Warning: setting this value too high can slow down playback.)"
 msgstr ""
 
-#: src/preferences.c:4159
+#: src/preferences.c:4237
 msgid "MIDI/Joystick learner"
 msgstr ""
 
-#: src/preferences.c:4499
+#: src/preferences.c:4679
 msgid ""
 "\n"
 "LiVES will now shut down. You need to restart it for the directory change to "
@@ -8108,214 +8131,214 @@
 "Click OK to continue.\n"
 msgstr ""
 
-#: src/preferences.c:4523
+#: src/preferences.c:4703
 msgid ""
 "For the directory change to take effect LiVES will restart when preferences "
 "dialog closes."
 msgstr ""
 
-#: src/preferences.c:4527
+#: src/preferences.c:4707
 msgid "Theme changes will not take effect until the next time you start LiVES."
 msgstr ""
 
-#: src/preferences.c:4531
+#: src/preferences.c:4711
 msgid "Jack options will not take effect until the next time you start LiVES."
 msgstr ""
 
-#: src/osc.c:2585
+#: src/osc.c:2616
 #, c-format
 msgid "Syncing to external framerate of %.8f frames per second.\n"
 msgstr ""
 
-#: src/osc.c:6746
+#: src/osc.c:6938
 msgid "Cannot initialize OSC receiver\n"
 msgstr ""
 
-#: src/osc.c:6770
+#: src/osc.c:6961
 #, c-format
 msgid "WARNING: Cannot start OSC server at UDP port %d\n"
 msgstr ""
 
-#: src/osc.c:6775
+#: src/osc.c:6963
 #, c-format
 msgid "Started OSC server at UDP port %d\n"
 msgstr ""
 
-#: src/osc.c:6890
+#: src/osc.c:7076
 #, c-format
 msgid "Cannot start OSC/UDP server at port %d \n"
 msgstr ""
 
-#: src/resample.c:125 src/resample.c:304
+#: src/resample.c:131 src/resample.c:305
 #, c-format
 msgid "Resizing frames 1 to %d"
 msgstr ""
 
-#: src/resample.c:140 src/resample.c:318
+#: src/resample.c:145 src/resample.c:318
 #, c-format
 msgid "Resizing/letterboxing frames 1 to %d"
 msgstr ""
 
-#: src/resample.c:361 src/resample.c:385
+#: src/resample.c:360 src/resample.c:384
 msgid "Resize"
 msgstr "Размер"
 
-#: src/resample.c:395
+#: src/resample.c:394
 msgid "Resample/Resize"
 msgstr ""
 
-#: src/resample.c:680
+#: src/resample.c:676
 #, c-format
 msgid "Length of video is now %d frames.\n"
 msgstr "Сейчас длина видео составляет %d кадров.\n"
 
-#: src/resample.c:745
+#: src/resample.c:737
 msgid ""
 "\n"
 "\n"
 "New rate must be greater than 0\n"
 msgstr ""
 
-#: src/resample.c:797 src/resample.c:813
+#: src/resample.c:788 src/resample.c:803
 msgid "Resampling audio"
 msgstr ""
 
-#: src/resample.c:831
+#: src/resample.c:821
 msgid "LiVES was unable to resample the audio as requested.\n"
 msgstr ""
 
-#: src/resample.c:833 src/resample.c:837
+#: src/resample.c:823 src/resample.c:827
 msgid "Resample Audio"
 msgstr ""
 
-#: src/resample.c:845
+#: src/resample.c:835
 #, c-format
 msgid "Audio was resampled to %d Hz, %d channels, %d bit"
 msgstr ""
 
-#: src/resample.c:1034
+#: src/resample.c:1016
 #, c-format
 msgid "Resampling video at %.8f frames per second..."
 msgstr ""
 
-#: src/resample.c:1037
+#: src/resample.c:1018
 #, c-format
 msgid "Resampling video at %.3f frames per second..."
 msgstr ""
 
-#: src/resample.c:1068
+#: src/resample.c:1049
 msgid "Reordering error !\n"
 msgstr ""
 
-#: src/resample.c:1079
+#: src/resample.c:1060
 msgid "Resample"
 msgstr "Размер"
 
-#: src/resample.c:1192
+#: src/resample.c:1173
 msgid "LiVES: - Resample Audio"
 msgstr ""
 
-#: src/resample.c:1195
+#: src/resample.c:1175
 msgid "LiVES: - Insert Silence"
 msgstr ""
 
-#: src/resample.c:1198
+#: src/resample.c:1177
 msgid "LiVES: - New Clip Audio"
 msgstr ""
 
-#: src/resample.c:1201
+#: src/resample.c:1179
 msgid "LiVES: - External Clip Settings"
 msgstr ""
 
-#: src/resample.c:1238 src/resample.c:1358
+#: src/resample.c:1215 src/resample.c:1332
 msgid "Rate (Hz) "
 msgstr ""
 
-#: src/resample.c:1245 src/resample.c:1372
+#: src/resample.c:1222 src/resample.c:1346
 msgid "Channels"
 msgstr ""
 
-#: src/resample.c:1252
+#: src/resample.c:1229
 msgid "Sample Size "
 msgstr ""
 
-#: src/resample.c:1268 src/resample.c:1425
+#: src/resample.c:1245 src/resample.c:1399
 msgid "Signed"
 msgstr ""
 
-#: src/resample.c:1274 src/resample.c:1435
+#: src/resample.c:1251 src/resample.c:1409
 msgid "Unsigned"
 msgstr "Беззнаковый"
 
-#: src/resample.c:1297 src/resample.c:1460
+#: src/resample.c:1273 src/resample.c:1433
 msgid "Little Endian"
 msgstr ""
 
-#: src/resample.c:1303 src/resample.c:1468
+#: src/resample.c:1279 src/resample.c:1441
 msgid "Big Endian"
 msgstr ""
 
-#: src/resample.c:1315
+#: src/resample.c:1290
 msgid "Current"
 msgstr "Текущий"
 
-#: src/resample.c:1340
+#: src/resample.c:1315
 msgid "_Enable audio"
 msgstr ""
 
-#: src/resample.c:1372
+#: src/resample.c:1346
 msgid "_Channels"
 msgstr ""
 
-#: src/resample.c:1394
+#: src/resample.c:1368
 msgid "_Sample Size"
 msgstr ""
 
-#: src/resample.c:1394
+#: src/resample.c:1368
 msgid "Sample Size"
 msgstr ""
 
-#: src/resample.c:1489
+#: src/resample.c:1461
 msgid "New"
 msgstr "Создать"
 
-#: src/resample.c:1512
+#: src/resample.c:1484
 msgid "_Frames Per Second "
 msgstr ""
 
-#: src/resample.c:1530
+#: src/resample.c:1502
 msgid "Record for maximum:  "
 msgstr ""
 
-#: src/resample.c:1533
+#: src/resample.c:1505
 msgid " hours  "
 msgstr ""
 
-#: src/resample.c:1536
+#: src/resample.c:1508
 msgid " minutes  "
 msgstr ""
 
-#: src/resample.c:1538
+#: src/resample.c:1510
 msgid " seconds  "
 msgstr ""
 
-#: src/resample.c:1545
+#: src/resample.c:1517
 msgid "Unlimited"
 msgstr "Неограниченно"
 
-#: src/resample.c:1561
+#: src/resample.c:1533
 msgid "Click OK to begin recording, or Cancel to quit."
 msgstr ""
 
-#: src/resample.c:1670
+#: src/resample.c:1638
 msgid "LiVES: - Change playback speed"
 msgstr ""
 
-#: src/resample.c:1673
+#: src/resample.c:1640
 msgid "LiVES: - Resample Video"
 msgstr ""
 
-#: src/resample.c:1696
+#: src/resample.c:1663
 #, c-format
 msgid ""
 "\n"
@@ -8326,7 +8349,7 @@
 "in _frames per second"
 msgstr ""
 
-#: src/resample.c:1701
+#: src/resample.c:1667
 #, c-format
 msgid ""
 "\n"
@@ -8337,89 +8360,89 @@
 "in frames per second"
 msgstr ""
 
-#: src/resample.c:1723
+#: src/resample.c:1688
 msgid "OR enter the desired clip length in _seconds"
 msgstr ""
 
-#: src/resample.c:1745
+#: src/resample.c:1710
 msgid "Change the _audio speed as well"
 msgstr ""
 
-#: src/resample.c:1846
+#: src/resample.c:1810
 msgid ""
 "\n"
 "Speeding up the clip will cause missing frames in some multitrack layouts.\n"
 "Are you sure you wish to change the speed ?\n"
 msgstr ""
 
-#: src/resample.c:1863
+#: src/resample.c:1829
 msgid ""
 "\n"
 "Speeding up the clip will cause missing audio in some multitrack layouts.\n"
 "Are you sure you wish to change the speed ?\n"
 msgstr ""
 
-#: src/resample.c:1878
+#: src/resample.c:1847
 msgid ""
 "\n"
 "Changing the speed will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/resample.c:1892
+#: src/resample.c:1863
 msgid ""
 "\n"
 "Changing the speed will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/resample.c:1938
+#: src/resample.c:1911
 msgid "Speed Change"
 msgstr "Изменение скорости"
 
-#: src/resample.c:1947
+#: src/resample.c:1920
 #, c-format
 msgid "Changed playback speed to %.3f frames per second and audio to %d Hz.\n"
 msgstr ""
 
-#: src/resample.c:1950
+#: src/resample.c:1922
 #, c-format
 msgid "Changed playback speed to %.3f frames per second.\n"
 msgstr ""
 
-#: src/resample.c:2035
+#: src/resample.c:2006
 msgid "Resampling video"
 msgstr ""
 
-#: src/resample.c:2042 src/resample.c:2160 src/resample.c:2182
+#: src/resample.c:2012 src/resample.c:2127 src/resample.c:2148
 msgid "Resampling clipboard video"
 msgstr ""
 
-#: src/resample.c:2047
+#: src/resample.c:2016
 msgid "Reordering frames"
 msgstr ""
 
-#: src/resample.c:2056
+#: src/resample.c:2025
 msgid ""
 "\n"
 "\n"
 "LiVES was unable to reorder the frames."
 msgstr ""
 
-#: src/resample.c:2104
+#: src/resample.c:2071
 msgid "Deordering frames"
 msgstr ""
 
-#: src/resample.c:2199
+#: src/resample.c:2165
 msgid "resampling error..."
 msgstr ""
 
-#: src/rte_window.c:85 src/rte_window.c:1708
+#: src/rte_window.c:124 src/rte_window.c:1709
 #, c-format
 msgid "Type: %s"
 msgstr "Тип: %s"
 
-#: src/rte_window.c:112
+#: src/rte_window.c:150
 msgid ""
 "\n"
 "\n"
@@ -8429,7 +8452,7 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:426
+#: src/rte_window.c:460
 msgid ""
 "\n"
 "\n"
@@ -8437,19 +8460,19 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:432
+#: src/rte_window.c:466
 #, c-format
 msgid "Saving keymap to %s\n"
 msgstr ""
 
-#: src/rte_window.c:439
+#: src/rte_window.c:471
 #, c-format
 msgid ""
 "\n"
 "Updating keymap file %s..."
 msgstr ""
 
-#: src/rte_window.c:446
+#: src/rte_window.c:477
 #, c-format
 msgid ""
 "\n"
@@ -8459,12 +8482,12 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/rte_window.c:526
+#: src/rte_window.c:556
 #, c-format
 msgid "Saving real time effect defaults to %s..."
 msgstr ""
 
-#: src/rte_window.c:535
+#: src/rte_window.c:563
 #, c-format
 msgid ""
 "\n"
@@ -8474,22 +8497,22 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/rte_window.c:632
+#: src/rte_window.c:657
 #, c-format
 msgid "Loading real time effect defaults from %s..."
 msgstr ""
 
-#: src/rte_window.c:681
+#: src/rte_window.c:701
 #, c-format
 msgid "Loading generator default sizes from %s..."
 msgstr ""
 
-#: src/rte_window.c:1306
+#: src/rte_window.c:1319
 #, c-format
 msgid "Loading default keymap from %s..."
 msgstr ""
 
-#: src/rte_window.c:1329
+#: src/rte_window.c:1339
 #, c-format
 msgid ""
 "\n"
@@ -8499,48 +8522,48 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/rte_window.c:1403
+#: src/rte_window.c:1412
 #, c-format
 msgid "Invalid line %d in %s\n"
 msgstr ""
 
-#: src/rte_window.c:1483
+#: src/rte_window.c:1490
 #, c-format
 msgid "Invalid key %d in %s\n"
 msgstr ""
 
-#: src/rte_window.c:1498
+#: src/rte_window.c:1505
 #, c-format
 msgid "Invalid effect %s in %s\n"
 msgstr ""
 
-#: src/rte_window.c:1517
+#: src/rte_window.c:1524
 #, c-format
 msgid "Unknown effect %s in %s\n"
 msgstr ""
 
-#: src/rte_window.c:1535
+#: src/rte_window.c:1542
 #, c-format
 msgid ""
 "This version of LiVES cannot mix generators/non-generators on the same key "
 "(%d) !\n"
 msgstr ""
 
-#: src/rte_window.c:1547
+#: src/rte_window.c:1554
 #, c-format
 msgid "Too many effects bound to key %d.\n"
 msgstr ""
 
-#: src/rte_window.c:1587
+#: src/rte_window.c:1593
 msgid "update required.\n"
 msgstr ""
 
-#: src/rte_window.c:1603
+#: src/rte_window.c:1607
 #, c-format
 msgid "Loading data connection map from %s..."
 msgstr ""
 
-#: src/rte_window.c:1612
+#: src/rte_window.c:1614
 msgid ""
 "\n"
 "\n"
@@ -8548,41 +8571,41 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:1691
+#: src/rte_window.c:1692
 #, c-format
 msgid "LiVES: Information for %s"
 msgstr ""
 
-#: src/rte_window.c:1704
+#: src/rte_window.c:1705
 #, c-format
 msgid "Effect name: %s"
 msgstr ""
 
-#: src/rte_window.c:1712
+#: src/rte_window.c:1713
 #, c-format
 msgid "Plugin name: %s"
 msgstr ""
 
-#: src/rte_window.c:1716
+#: src/rte_window.c:1717
 #, c-format
 msgid "Author: %s"
 msgstr "Автор: %s"
 
-#: src/rte_window.c:1721
+#: src/rte_window.c:1722
 #, c-format
 msgid "and: %s"
 msgstr ""
 
-#: src/rte_window.c:1726
+#: src/rte_window.c:1727
 #, c-format
 msgid "Version: %d"
 msgstr ""
 
-#: src/rte_window.c:1734
+#: src/rte_window.c:1735
 msgid "Description: "
 msgstr "Описание: "
 
-#: src/rte_window.c:1960
+#: src/rte_window.c:1963
 msgid ""
 "\n"
 "\n"
@@ -8591,69 +8614,69 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:2024
+#: src/rte_window.c:2027
 #, c-format
 msgid "LiVES could not locate the effect %s.\n"
 msgstr ""
 
-#: src/rte_window.c:2225
+#: src/rte_window.c:2216
 msgid "LiVES: Real time effect mapping"
 msgstr ""
 
-#: src/rte_window.c:2257
+#: src/rte_window.c:2248
 #, c-format
 msgid "Ctrl-%d"
 msgstr ""
 
-#: src/rte_window.c:2264
+#: src/rte_window.c:2255
 msgid "Key active"
 msgstr ""
 
-#: src/rte_window.c:2279
+#: src/rte_window.c:2271
 msgid "Key grab"
 msgstr ""
 
-#: src/rte_window.c:2280
+#: src/rte_window.c:2272
 msgid "Grab keyboard for this effect key"
 msgstr ""
 
-#: src/rte_window.c:2290
+#: src/rte_window.c:2283
 msgid "_Clear all effects"
 msgstr ""
 
-#: src/rte_window.c:2304
+#: src/rte_window.c:2297
 msgid "Mode active"
 msgstr ""
 
-#: src/rte_window.c:2314 src/multitrack.c:8568
+#: src/rte_window.c:2307 src/multitrack.c:8762
 msgid "Info"
 msgstr "Сведения"
 
-#: src/rte_window.c:2315
+#: src/rte_window.c:2308
 msgid "Set Parameters"
 msgstr "Параметры моделирования"
 
-#: src/rte_window.c:2316
+#: src/rte_window.c:2309
 msgid "Set Connections"
 msgstr ""
 
-#: src/rte_window.c:2317
+#: src/rte_window.c:2310
 msgid "Clear"
 msgstr "Очистить"
 
-#: src/rte_window.c:2326
+#: src/rte_window.c:2319
 msgid "Effect name:"
 msgstr ""
 
-#: src/rte_window.c:2391
+#: src/rte_window.c:2384
 msgid "_Save as default keymap"
 msgstr ""
 
-#: src/rte_window.c:2396
+#: src/rte_window.c:2389
 msgid "_Load default keymap"
 msgstr ""
 
-#: src/rte_window.c:2840
+#: src/rte_window.c:2833
 #, c-format
 msgid ""
 "Unable to create default keymap file: %s\n"
@@ -8711,86 +8734,86 @@
 msgid "none\n"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:494
+#: src/lives-yuv4mpeg.c:493
 #, c-format
 msgid ""
 "Unable to set display framerate to %.3f fps.\n"
 "\n"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:503
+#: src/lives-yuv4mpeg.c:502
 #, c-format
 msgid "Unable to open yuv4mpeg out stream %s\n"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:628
+#: src/lives-yuv4mpeg.c:626
 #, c-format
 msgid "TV card %d"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:713
+#: src/lives-yuv4mpeg.c:710
 #, c-format
 msgid "Opened TV card %d (%s)"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:760
+#: src/lives-yuv4mpeg.c:757
 #, c-format
 msgid "Firewire card %d"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:796
+#: src/lives-yuv4mpeg.c:793
 #, c-format
 msgid "Opened firewire card %d"
 msgstr ""
 
-#: src/multitrack.c:666
+#: src/multitrack.c:736
 msgid "Auto backup"
 msgstr ""
 
-#: src/multitrack.c:868
+#: src/multitrack.c:935
 msgid "Backing audio"
 msgstr ""
 
-#: src/multitrack.c:1435
+#: src/multitrack.c:1515
 #, c-format
 msgid "%s : parameters for %s"
 msgstr ""
 
-#: src/multitrack.c:1809 src/multitrack.c:3483
+#: src/multitrack.c:1881 src/multitrack.c:3635
 #, c-format
 msgid "Current track: %s (layer %d)\n"
 msgstr ""
 
-#: src/multitrack.c:1813 src/multitrack.c:3484
+#: src/multitrack.c:1885 src/multitrack.c:3637
 msgid "Current track: Backing audio\n"
 msgstr ""
 
-#: src/multitrack.c:1814
+#: src/multitrack.c:1886
 #, c-format
 msgid "Current track: Layer %d audio\n"
 msgstr ""
 
-#: src/multitrack.c:1817
+#: src/multitrack.c:1889
 #, c-format
 msgid "%.2f sec.\n"
 msgstr ""
 
-#: src/multitrack.c:1822 src/multitrack.c:3490
+#: src/multitrack.c:1894 src/multitrack.c:3643
 #, c-format
 msgid "Source: %s"
 msgstr "Источник: %s"
 
-#: src/multitrack.c:1825 src/multitrack.c:3492
+#: src/multitrack.c:1897 src/multitrack.c:3645
 msgid "Right click for context menu.\n"
 msgstr ""
 
-#: src/multitrack.c:1827
+#: src/multitrack.c:1899
 msgid ""
 "Double click on a block\n"
 "to select it."
 msgstr ""
 
-#: src/multitrack.c:3312
+#: src/multitrack.c:3452
 msgid ""
 "\n"
 "\n"
@@ -8799,7 +8822,7 @@
 "right or double clicking on it.\n"
 msgstr ""
 
-#: src/multitrack.c:3315
+#: src/multitrack.c:3455
 msgid ""
 "\n"
 "\n"
@@ -8807,14 +8830,14 @@
 "Select an effect in FX stack first to view its parameters.\n"
 msgstr ""
 
-#: src/multitrack.c:3318
+#: src/multitrack.c:3458
 msgid ""
 "\n"
 "\n"
 "No clips loaded.\n"
 msgstr ""
 
-#: src/multitrack.c:3321
+#: src/multitrack.c:3462
 msgid ""
 "You must select two video tracks\n"
 "and a time region\n"
@@ -8824,7 +8847,7 @@
 "before inserting clips into the timeline."
 msgstr ""
 
-#: src/multitrack.c:3324
+#: src/multitrack.c:3465
 msgid ""
 "\n"
 "\n"
@@ -8833,210 +8856,210 @@
 "to apply compositors.\n"
 msgstr ""
 
-#: src/multitrack.c:3487
+#: src/multitrack.c:3640
 #, c-format
 msgid "%.2f sec. to %.2f sec.\n"
 msgstr ""
 
-#: src/multitrack.c:3493
+#: src/multitrack.c:3646
 msgid ""
 "Single click on timeline\n"
 "to select a frame.\n"
 msgstr ""
 
-#: src/multitrack.c:3711 src/multitrack.c:6790
+#: src/multitrack.c:3858 src/multitrack.c:6972
 #, c-format
 msgid "%s [unstable]"
 msgstr ""
 
-#: src/multitrack.c:3822
+#: src/multitrack.c:3973
 msgid ""
 "You can click and drag\n"
 "below the timeline"
 msgstr ""
 
-#: src/multitrack.c:3823
+#: src/multitrack.c:3974
 msgid "to select a time region.\n"
 msgstr ""
 
-#: src/multitrack.c:3985
+#: src/multitrack.c:4137
 msgid "LiVES: Selected clip"
 msgstr ""
 
-#: src/multitrack.c:3993
+#: src/multitrack.c:4145
 msgid "_Adjust start and end points"
 msgstr ""
 
-#: src/multitrack.c:4002
+#: src/multitrack.c:4154
 msgid "_Edit/encode in clip editor"
 msgstr ""
 
-#: src/multitrack.c:4009
+#: src/multitrack.c:4161
 msgid "_Show clip information"
 msgstr ""
 
-#: src/multitrack.c:4016
+#: src/multitrack.c:4168
 msgid "_Close this clip"
 msgstr ""
 
-#: src/multitrack.c:4236
+#: src/multitrack.c:4388
 msgid "Audio mixer (ctrl-m)"
 msgstr ""
 
-#: src/multitrack.c:4336
+#: src/multitrack.c:4488
 msgid "Single click on timeline"
 msgstr ""
 
-#: src/multitrack.c:4337
+#: src/multitrack.c:4489
 msgid "to select a frame."
 msgstr ""
 
-#: src/multitrack.c:4338
+#: src/multitrack.c:4490
 msgid "Double click or right click on timeline"
 msgstr ""
 
-#: src/multitrack.c:4339
+#: src/multitrack.c:4491
 msgid "to select a block."
 msgstr ""
 
-#: src/multitrack.c:4340
+#: src/multitrack.c:4492
 msgid "Clips can be dragged"
 msgstr ""
 
-#: src/multitrack.c:4341
+#: src/multitrack.c:4493
 msgid "onto the timeline."
 msgstr ""
 
-#: src/multitrack.c:4343
+#: src/multitrack.c:4495
 msgid "Mouse mode is: Move"
 msgstr ""
 
-#: src/multitrack.c:4344
+#: src/multitrack.c:4496
 msgid "clips can be moved around."
 msgstr ""
 
-#: src/multitrack.c:4349
+#: src/multitrack.c:4500
 msgid "Mouse mode is: Select."
 msgstr ""
 
-#: src/multitrack.c:4350
+#: src/multitrack.c:4501
 msgid "Drag with mouse on timeline"
 msgstr ""
 
-#: src/multitrack.c:4351
+#: src/multitrack.c:4502
 msgid "to select tracks and time."
 msgstr ""
 
-#: src/multitrack.c:4362
+#: src/multitrack.c:4509
 msgid "_Insert mode: Normal"
 msgstr ""
 
-#: src/multitrack.c:4378
+#: src/multitrack.c:4537
 msgid "_Mouse mode: Move"
 msgstr ""
 
-#: src/multitrack.c:4382
+#: src/multitrack.c:4540
 msgid "_Mouse mode: Select"
 msgstr ""
 
-#: src/multitrack.c:4405 src/multitrack.c:7925
+#: src/multitrack.c:4563 src/multitrack.c:8104
 msgid "Gravity: Normal"
 msgstr ""
 
-#: src/multitrack.c:4409
+#: src/multitrack.c:4565
 msgid "Gravity: Left"
 msgstr ""
 
-#: src/multitrack.c:4414
+#: src/multitrack.c:4569
 msgid "Gravity: Right"
 msgstr ""
 
-#: src/multitrack.c:4416
+#: src/multitrack.c:4570
 msgid "Close _last gap(s) in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:4419
+#: src/multitrack.c:4572
 msgid "Close _first gap(s) in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:4458
+#: src/multitrack.c:4627
 msgid "Close gaps"
 msgstr "Закрыть интервалы"
 
-#: src/multitrack.c:4460
+#: src/multitrack.c:4629
 msgid "Move block"
 msgstr ""
 
-#: src/multitrack.c:4462
+#: src/multitrack.c:4631
 msgid "Move audio block"
 msgstr ""
 
-#: src/multitrack.c:4464
+#: src/multitrack.c:4633
 msgid "Delete block"
 msgstr "Удалить блок"
 
-#: src/multitrack.c:4466
+#: src/multitrack.c:4635
 msgid "Delete audio block"
 msgstr ""
 
-#: src/multitrack.c:4468
+#: src/multitrack.c:4637
 msgid "Split tracks"
 msgstr ""
 
-#: src/multitrack.c:4470
+#: src/multitrack.c:4639
 msgid "Split block"
 msgstr ""
 
-#: src/multitrack.c:4473
+#: src/multitrack.c:4642
 #, c-format
 msgid "Apply %s"
 msgstr ""
 
-#: src/multitrack.c:4478
+#: src/multitrack.c:4647
 #, c-format
 msgid "Delete %s"
 msgstr "Удалить %s"
 
-#: src/multitrack.c:4482
+#: src/multitrack.c:4651
 msgid "Insert block"
 msgstr "Вставить блок"
 
-#: src/multitrack.c:4484
+#: src/multitrack.c:4653
 msgid "Insert gap"
 msgstr ""
 
-#: src/multitrack.c:4486
+#: src/multitrack.c:4655
 msgid "Insert audio block"
 msgstr ""
 
-#: src/multitrack.c:4488
+#: src/multitrack.c:4657
 msgid "Effect order change"
 msgstr ""
 
-#: src/multitrack.c:4898
+#: src/multitrack.c:5064
 msgid "unsigned "
 msgstr ""
 
-#: src/multitrack.c:4899
+#: src/multitrack.c:5065
 msgid "signed "
 msgstr ""
 
-#: src/multitrack.c:4904
+#: src/multitrack.c:5071
 #, c-format
 msgid ""
 "Multitrack values set to %.3f fps, frame size %d x %d, audio channels %d, "
 "audio rate %d, audio sample size %d, %s.\n"
 msgstr ""
 
-#: src/multitrack.c:4938
+#: src/multitrack.c:5104
 msgid "invalid event list. Failed.\n"
 msgstr ""
 
-#: src/multitrack.c:4944
+#: src/multitrack.c:5110
 msgid "event list has invalid fps. Failed.\n"
 msgstr ""
 
-#: src/multitrack.c:4953
+#: src/multitrack.c:5122
 #, c-format
 msgid ""
 "\n"
@@ -9046,7 +9069,7 @@
 "then load in the new set from the File menu.\n"
 msgstr ""
 
-#: src/multitrack.c:4993
+#: src/multitrack.c:5163
 #, c-format
 msgid ""
 "\n"
@@ -9054,439 +9077,431 @@
 "It cannot be loaded.\n"
 msgstr ""
 
-#: src/multitrack.c:5329 src/multitrack.c:5338 src/multitrack.c:21133
+#: src/multitrack.c:5452
 msgid "Layout was wiped.\n"
 msgstr ""
 
-#: src/multitrack.c:5374
+#: src/multitrack.c:5547
 #, c-format
 msgid "LiVES-%s: Multitrack %dx%d : %d bpp %.3f fps"
 msgstr ""
 
-#: src/multitrack.c:5617
+#: src/multitrack.c:5793
 msgid "In/out"
 msgstr ""
 
-#: src/multitrack.c:5619
+#: src/multitrack.c:5795
 msgid "FX stack"
 msgstr ""
 
-#: src/multitrack.c:5627 src/omc-learn.c:673
+#: src/multitrack.c:5803 src/omc-learn.c:659
 msgid "Params."
 msgstr ""
 
-#: src/multitrack.c:5978
+#: src/multitrack.c:6157
 msgid "_Open..."
 msgstr ""
 
-#: src/multitrack.c:5996
+#: src/multitrack.c:6175
 msgid "O_pen File Selection..."
 msgstr "Открыть файл выборочно (_p)..."
 
-#: src/multitrack.c:6040
+#: src/multitrack.c:6219
 msgid "Import Selection from _dvd/vcd..."
 msgstr "Импортировать выборочно с dvd/vcd (_d)..."
 
-#: src/multitrack.c:6050
+#: src/multitrack.c:6229
 msgid "Import Selection from _dvd"
 msgstr "Импортировать выборочно с dvd (_d)"
 
-#: src/multitrack.c:6060
+#: src/multitrack.c:6239
 msgid "Import Selection from _vcd"
 msgstr "Импортировать выборочно с vcd (_v)"
 
-#: src/multitrack.c:6076
+#: src/multitrack.c:6255
 msgid "_Import from Device"
 msgstr "Импортривать с устройства (_I)"
 
-#: src/multitrack.c:6103
+#: src/multitrack.c:6282
 msgid "_Close the selected clip"
 msgstr ""
 
-#: src/multitrack.c:6198
+#: src/multitrack.c:6377
 msgid "_Save layout as..."
 msgstr "_Сохранить раскладку, как ..."
 
-#: src/multitrack.c:6206
+#: src/multitrack.c:6385
 msgid "_Load layout..."
 msgstr "_Нагрузка макет ..."
 
-#: src/multitrack.c:6210
+#: src/multitrack.c:6389
 msgid "_Wipe/Delete layout..."
 msgstr ""
 
-#: src/multitrack.c:6236
+#: src/multitrack.c:6415
 msgid "_Ignore width, height and audio values from loaded layouts"
 msgstr ""
 
-#: src/multitrack.c:6240
+#: src/multitrack.c:6419
 msgid "Auto load _subtitles with clips"
 msgstr ""
 
-#: src/multitrack.c:6322
+#: src/multitrack.c:6501
 msgid "_CLIP EDITOR"
 msgstr ""
 
-#: src/multitrack.c:6334
+#: src/multitrack.c:6513
 msgid "_Adjust selected clip start/end points"
 msgstr ""
 
-#: src/multitrack.c:6343
+#: src/multitrack.c:6522
 msgid "_Insert selected clip"
 msgstr ""
 
-#: src/multitrack.c:6355
+#: src/multitrack.c:6534
 msgid "_Insert selected clip audio"
 msgstr ""
 
-#: src/multitrack.c:6364
+#: src/multitrack.c:6543
 msgid "_Delete selected block"
 msgstr ""
 
-#: src/multitrack.c:6373
+#: src/multitrack.c:6555
 msgid "_Jump to previous block boundary"
 msgstr ""
 
-#: src/multitrack.c:6382
+#: src/multitrack.c:6564
 msgid "_Jump to next block boundary"
 msgstr ""
 
-#: src/multitrack.c:6395
+#: src/multitrack.c:6577
 msgid "Clear _marks from timeline"
 msgstr ""
 
-#: src/multitrack.c:6403
+#: src/multitrack.c:6585
 msgid "Ignore selection limits when inserting"
 msgstr ""
 
-#: src/multitrack.c:6420 src/multitrack.c:16719
+#: src/multitrack.c:6602 src/multitrack.c:17009
 msgid "_Play from Timeline Position"
 msgstr ""
 
-#: src/multitrack.c:6434
+#: src/multitrack.c:6616
 msgid "Pla_y selected time only"
 msgstr ""
 
-#: src/multitrack.c:6518
+#: src/multitrack.c:6700
 msgid "_Move effects with blocks"
 msgstr ""
 
-#: src/multitrack.c:6531
+#: src/multitrack.c:6713
 msgid "Select _autotransition effect..."
 msgstr ""
 
-#: src/multitrack.c:6542
+#: src/multitrack.c:6724
 msgid "Crossfade audio with autotransition"
 msgstr ""
 
-#: src/multitrack.c:6550
+#: src/multitrack.c:6732
 msgid "View/_Edit selected effect"
 msgstr ""
 
-#: src/multitrack.c:6554
+#: src/multitrack.c:6736
 msgid "_Delete selected effect"
 msgstr ""
 
-#: src/multitrack.c:6562
+#: src/multitrack.c:6744
 msgid "Apply effect to _block..."
 msgstr ""
 
-#: src/multitrack.c:6619
+#: src/multitrack.c:6801
 msgid "Apply effect to _region..."
 msgstr ""
 
-#: src/multitrack.c:6885
+#: src/multitrack.c:7061
 msgid "_Tracks"
 msgstr "_Композиции"
 
-#: src/multitrack.c:6896
+#: src/multitrack.c:7072
 msgid "Rename current track"
 msgstr ""
 
-#: src/multitrack.c:6904
+#: src/multitrack.c:7080
 msgid "Make _Backing Audio current track"
 msgstr ""
 
-#: src/multitrack.c:6915
+#: src/multitrack.c:7091
 msgid "Add Video Track at _Rear"
 msgstr ""
 
-#: src/multitrack.c:6923
+#: src/multitrack.c:7099
 msgid "Add Video Track at _Front"
 msgstr ""
 
-#: src/multitrack.c:6936
+#: src/multitrack.c:7112
 msgid "_Split current track at cursor"
 msgstr ""
 
-#: src/multitrack.c:6948
+#: src/multitrack.c:7124
 msgid "_Split selected video tracks"
 msgstr ""
 
-#: src/multitrack.c:6961
+#: src/multitrack.c:7137
 msgid "Insert gap in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:6969
+#: src/multitrack.c:7145
 msgid "Insert gap in current track/selected time"
 msgstr ""
 
-#: src/multitrack.c:6981
+#: src/multitrack.c:7157
 msgid "Close all _gaps in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:7007
+#: src/multitrack.c:7183
 msgid "Se_lection"
 msgstr "В_ыбор"
 
-#: src/multitrack.c:7018
+#: src/multitrack.c:7194
 msgid "_Select Current Track"
 msgstr "_Выберите Текущий трек"
 
-#: src/multitrack.c:7025
+#: src/multitrack.c:7201
 msgid "Select _all video tracks"
 msgstr ""
 
-#: src/multitrack.c:7032
+#: src/multitrack.c:7208
 msgid "Select _no video tracks"
 msgstr ""
 
-#: src/multitrack.c:7039
+#: src/multitrack.c:7215
 msgid "Select all _time"
 msgstr ""
 
-#: src/multitrack.c:7050
+#: src/multitrack.c:7226
 msgid "Select from _zero time"
 msgstr ""
 
-#: src/multitrack.c:7057
+#: src/multitrack.c:7233
 msgid "Select to _end time"
 msgstr ""
 
-#: src/multitrack.c:7064
+#: src/multitrack.c:7240
 msgid "_Copy..."
 msgstr "_Копировать..."
 
-#: src/multitrack.c:7075
+#: src/multitrack.c:7251
 msgid "_Timecode to region start"
 msgstr ""
 
-#: src/multitrack.c:7082
+#: src/multitrack.c:7258
 msgid "_Timecode to region end"
 msgstr ""
 
-#: src/multitrack.c:7089
+#: src/multitrack.c:7265
 msgid "_Region start to timecode"
 msgstr ""
 
-#: src/multitrack.c:7096
+#: src/multitrack.c:7272
 msgid "_Region end to timecode"
 msgstr ""
 
-#: src/multitrack.c:7110
+#: src/multitrack.c:7286
 msgid "Select/deselect block at current track/time"
 msgstr ""
 
-#: src/multitrack.c:7135
+#: src/multitrack.c:7311
 msgid "_Change width, height and audio values..."
 msgstr ""
 
-#: src/multitrack.c:7194
+#: src/multitrack.c:7370
 msgid "_Render"
 msgstr "_Применить"
 
-#: src/multitrack.c:7205
+#: src/multitrack.c:7381
 msgid "_Render all to new clip"
 msgstr ""
 
-#: src/multitrack.c:7220
+#: src/multitrack.c:7396
 msgid "Render _video"
 msgstr ""
 
-#: src/multitrack.c:7225
+#: src/multitrack.c:7401
 msgid "Render _audio"
 msgstr ""
 
-#: src/multitrack.c:7235
+#: src/multitrack.c:7411
 msgid "_Normalise rendered audio"
 msgstr ""
 
-#: src/multitrack.c:7242
+#: src/multitrack.c:7418
 msgid "_Pre-render audio"
 msgstr ""
 
-#: src/multitrack.c:7251
+#: src/multitrack.c:7427
 msgid "_View"
 msgstr "_Вид"
 
-#: src/multitrack.c:7270
+#: src/multitrack.c:7446
 msgid "Block _In/out points"
 msgstr ""
 
-#: src/multitrack.c:7279
+#: src/multitrack.c:7455
 msgid "_Effects at current"
 msgstr "_Воздействие на текущий"
 
-#: src/multitrack.c:7297
+#: src/multitrack.c:7473
 msgid "Audio parameters"
 msgstr "Параметры звука"
 
-#: src/multitrack.c:7308
+#: src/multitrack.c:7484
 msgid "Show backing _audio track"
 msgstr ""
 
-#: src/multitrack.c:7312
+#: src/multitrack.c:7488
 msgid "Compact view"
 msgstr "Компактный список"
 
-#: src/multitrack.c:7320
+#: src/multitrack.c:7496
 msgid "Maximum tracks to display..."
 msgstr ""
 
-#: src/multitrack.c:7327
+#: src/multitrack.c:7503
 msgid "Scroll to follow playback"
 msgstr ""
 
-#: src/multitrack.c:7331
+#: src/multitrack.c:7507
 msgid "_Center on cursor"
 msgstr "_Центр по курсором"
 
-#: src/multitrack.c:7338
+#: src/multitrack.c:7514
 msgid "_Zoom in"
 msgstr "_Увеличить"
 
-#: src/multitrack.c:7349
+#: src/multitrack.c:7525
 msgid "_Zoom out"
 msgstr "_Уменьшить"
 
-#: src/multitrack.c:7361
+#: src/multitrack.c:7537
 msgid "Multitrack _details"
 msgstr ""
 
-#: src/multitrack.c:7374
+#: src/multitrack.c:7550
 msgid "_Event Window"
 msgstr "_События окна"
 
-#: src/multitrack.c:7378
+#: src/multitrack.c:7554
 msgid "_Event Window (selected time only)"
 msgstr ""
 
-#: src/multitrack.c:7382
+#: src/multitrack.c:7558
 msgid "_Show FRAME events"
 msgstr ""
 
-#: src/multitrack.c:7399
+#: src/multitrack.c:7575
 msgid "_Show multitrack keys"
 msgstr ""
 
-#: src/multitrack.c:7468
+#: src/multitrack.c:7644
 msgid "Mouse mode: _Move"
 msgstr ""
 
-#: src/multitrack.c:7476
+#: src/multitrack.c:7652
 msgid "Mouse mode: _Select"
 msgstr ""
 
-#: src/multitrack.c:7505
+#: src/multitrack.c:7681
 msgid "Insert mode: _Normal"
 msgstr ""
 
-#: src/multitrack.c:7733
+#: src/multitrack.c:7909
 msgid "Insert with _audio"
 msgstr ""
 
-#: src/multitrack.c:7734
+#: src/multitrack.c:7910
 msgid ""
 "Select whether video clips are inserted and moved with their audio or not"
 msgstr ""
 
-#: src/multitrack.c:7829
+#: src/multitrack.c:8007
 msgid "Select _overlap"
 msgstr ""
 
-#: src/multitrack.c:7830
+#: src/multitrack.c:8008
 msgid ""
 "Select whether timeline selection snaps to overlap between selected tracks "
 "or not"
 msgstr ""
 
-#: src/multitrack.c:7894 src/multitrack.c:14198
+#: src/multitrack.c:8073 src/multitrack.c:14422
 msgid "Expanded View (d)"
 msgstr ""
 
-#: src/multitrack.c:7897 src/multitrack.c:14205
+#: src/multitrack.c:8076 src/multitrack.c:14428
 msgid "Compact View (d)"
 msgstr ""
 
-#: src/multitrack.c:7939
+#: src/multitrack.c:8118
 msgid "Gravity: _Normal"
 msgstr ""
 
-#: src/multitrack.c:7952
+#: src/multitrack.c:8131
 msgid "Gravity: _Left"
 msgstr ""
 
-#: src/multitrack.c:7967
+#: src/multitrack.c:8146
 msgid "Gravity: _Right"
 msgstr ""
 
-#: src/multitrack.c:8297
+#: src/multitrack.c:8496
 msgid "_Apply"
 msgstr "_Применить"
 
-#: src/multitrack.c:8319
+#: src/multitrack.c:8518
 msgid "Time"
 msgstr "Время"
 
-#: src/multitrack.c:8333
+#: src/multitrack.c:8532
 msgid "_Del. node"
 msgstr ""
 
-#: src/multitrack.c:8341
+#: src/multitrack.c:8540
 msgid "_Next node"
 msgstr ""
 
-#: src/multitrack.c:8349
+#: src/multitrack.c:8548
 msgid "_Prev node"
 msgstr ""
 
-#: src/multitrack.c:8373
+#: src/multitrack.c:8574
 msgid "_Reverse playback  "
 msgstr ""
 
-#: src/multitrack.c:8395
+#: src/multitrack.c:8596
 msgid "_Velocity  "
 msgstr "_Скорость  "
 
-#: src/multitrack.c:8464
+#: src/multitrack.c:8664
 msgid "Anchor _start"
 msgstr ""
 
-#: src/multitrack.c:8465
+#: src/multitrack.c:8665
 msgid "Anchor the start point to the timeline"
 msgstr ""
 
-#: src/multitrack.c:8481
-msgid "Start frame"
-msgstr "Стартовый кадр"
-
-#: src/multitrack.c:8533
+#: src/multitrack.c:8728
 msgid "Anchor _end"
 msgstr ""
 
-#: src/multitrack.c:8534
+#: src/multitrack.c:8729
 msgid "Anchor the end point to the timeline"
 msgstr ""
 
-#: src/multitrack.c:8546
-msgid "End frame"
-msgstr "Конечный кадр"
-
-#: src/multitrack.c:8739
+#: src/multitrack.c:8929
 msgid "Scroll"
 msgstr "Прокрутка"
 
-#: src/multitrack.c:9316
+#: src/multitrack.c:9502
 msgid ""
 "\n"
 "==============================\n"
@@ -9496,161 +9511,161 @@
 "==============================\n"
 "Перешли на Clip режиме редактирования\n"
 
-#: src/multitrack.c:9502
+#: src/multitrack.c:9708
 msgid "Timeline (seconds)"
 msgstr "Сроки (в секундах)"
 
-#: src/multitrack.c:9984
+#: src/multitrack.c:10202
 msgid " Backing audio"
 msgstr ""
 
-#: src/multitrack.c:9987
+#: src/multitrack.c:10204
 #, c-format
 msgid " Layer %d audio"
 msgstr ""
 
-#: src/multitrack.c:9995
+#: src/multitrack.c:10212
 msgid "Show/hide audio details"
 msgstr ""
 
-#: src/multitrack.c:10010 src/multitrack.c:10232
+#: src/multitrack.c:10227 src/multitrack.c:10452
 #, c-format
 msgid "Layer %d audio"
 msgstr ""
 
-#: src/multitrack.c:10144 src/multitrack.c:10261
+#: src/multitrack.c:10353 src/multitrack.c:10481
 #, c-format
 msgid "%s (layer %d)"
 msgstr ""
 
-#: src/multitrack.c:10184
+#: src/multitrack.c:10403
 msgid "Select track"
 msgstr "Выберите трек"
 
-#: src/multitrack.c:10188
+#: src/multitrack.c:10407
 msgid "Show/hide audio"
 msgstr ""
 
-#: src/multitrack.c:10194
+#: src/multitrack.c:10413
 #, c-format
 msgid "Video %d"
 msgstr ""
 
-#: src/multitrack.c:10233
+#: src/multitrack.c:10453
 #, c-format
 msgid " %s"
 msgstr " %s"
 
-#: src/multitrack.c:10346
+#: src/multitrack.c:10574
 msgid "LiVES: Selected effect"
 msgstr "LiVES: Выбранный эффекта"
 
-#: src/multitrack.c:10358
+#: src/multitrack.c:10586
 msgid "_View/Edit this effect"
 msgstr ""
 
-#: src/multitrack.c:10361
+#: src/multitrack.c:10588
 msgid "_View this effect"
 msgstr "_Открыть этот эффект"
 
-#: src/multitrack.c:10369
+#: src/multitrack.c:10596
 msgid "_Delete this effect"
 msgstr "_Удалить этот эффект"
 
-#: src/multitrack.c:10422
+#: src/multitrack.c:10648
 msgid "Cannot insert after this effect"
 msgstr ""
 
-#: src/multitrack.c:10451
+#: src/multitrack.c:10677
 msgid "This effect cannot be moved"
 msgstr ""
 
-#: src/multitrack.c:10499
+#: src/multitrack.c:10724
 #, c-format
 msgid "  %d to %d selected  "
 msgstr ""
 
-#: src/multitrack.c:10502 src/multitrack.c:10746
+#: src/multitrack.c:10727 src/multitrack.c:10968
 #, c-format
 msgid "%.2f sec."
 msgstr ""
 
-#: src/multitrack.c:10717
+#: src/multitrack.c:10940
 #, c-format
 msgid "%d frames"
 msgstr "%d кадров"
 
-#: src/multitrack.c:11070
+#: src/multitrack.c:11299
 msgid ""
 "\n"
 "==============================\n"
 "Switched to Multitrack mode\n"
 msgstr ""
 
-#: src/multitrack.c:12691
+#: src/multitrack.c:12939
 msgid "Drag the time slider to where you"
 msgstr ""
 
-#: src/multitrack.c:12692
+#: src/multitrack.c:12940
 msgid "want to set effect parameters"
 msgstr ""
 
-#: src/multitrack.c:12693
+#: src/multitrack.c:12941
 msgid "Set parameters, then click \"Apply\"\n"
 msgstr ""
 
-#: src/multitrack.c:12694
+#: src/multitrack.c:12942
 msgid ""
 "NODES are points where parameters\n"
 "have been set.\n"
 "Nodes can be deleted."
 msgstr ""
 
-#: src/multitrack.c:12697
+#: src/multitrack.c:12944
 msgid "Effect has no parameters.\n"
 msgstr ""
 
-#: src/multitrack.c:12788
+#: src/multitrack.c:13033
 #, c-format
 msgid "%s output"
 msgstr ""
 
-#: src/multitrack.c:12794 src/multitrack.c:12804
+#: src/multitrack.c:13038 src/multitrack.c:13046
 #, c-format
 msgid "layer %d"
 msgstr "слой %d"
 
-#: src/multitrack.c:12796 src/multitrack.c:12806
+#: src/multitrack.c:13039 src/multitrack.c:13047
 msgid "audio track"
 msgstr "звуковая дорожка"
 
-#: src/multitrack.c:12797
+#: src/multitrack.c:13040
 #, c-format
 msgid "%s to %s"
 msgstr "%s по %s"
 
-#: src/multitrack.c:12807
+#: src/multitrack.c:13048
 #, c-format
 msgid "%s from %s"
 msgstr ""
 
-#: src/multitrack.c:12860
+#: src/multitrack.c:13099
 msgid "_Prev filter map"
 msgstr ""
 
-#: src/multitrack.c:12871
+#: src/multitrack.c:13110
 msgid "Insert _before"
 msgstr ""
 
-#: src/multitrack.c:12881
+#: src/multitrack.c:13120
 msgid "Insert _after"
 msgstr ""
 
-#: src/multitrack.c:12896
+#: src/multitrack.c:13134
 msgid "_Next filter map"
 msgstr ""
 
-#: src/multitrack.c:12911
+#: src/multitrack.c:13148
 msgid ""
 "\n"
 "\n"
@@ -9662,161 +9677,161 @@
 "Не влияет на текущий трек,\n"
 "текущее время.\n"
 
-#: src/multitrack.c:12929
+#: src/multitrack.c:13166
 msgid ""
 "Drag a compositor anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:12936
+#: src/multitrack.c:13173
 msgid ""
 "Drag a transition anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:12944
+#: src/multitrack.c:13181
 msgid ""
 "Effects can be dragged\n"
 "onto blocks on the timeline."
 msgstr ""
 
-#: src/multitrack.c:13166
+#: src/multitrack.c:13406
 msgid "LiVES: Selected block/frame"
 msgstr "LiVES: Выбранный блок / кадр"
 
-#: src/multitrack.c:13173
+#: src/multitrack.c:13413
 msgid "_Select this block"
 msgstr "_Выберите этот блок"
 
-#: src/multitrack.c:13183
+#: src/multitrack.c:13423
 msgid "_Split block here"
 msgstr ""
 
-#: src/multitrack.c:13191
+#: src/multitrack.c:13431
 msgid "List _effects here"
 msgstr ""
 
-#: src/multitrack.c:13200 src/multitrack.c:13277
+#: src/multitrack.c:13440 src/multitrack.c:13518
 #, c-format
 msgid "_Adjust %s"
 msgstr ""
 
-#: src/multitrack.c:13215
+#: src/multitrack.c:13455
 msgid "_Delete this block"
 msgstr "_Удалить этот блок"
 
-#: src/multitrack.c:13258
+#: src/multitrack.c:13500
 msgid "_Insert here"
 msgstr "_Вставьте здесь"
 
-#: src/multitrack.c:13264
+#: src/multitrack.c:13505
 msgid "_Insert audio here"
 msgstr "_Вставьте аудио здесь"
 
-#: src/multitrack.c:14801
+#: src/multitrack.c:15017
 #, c-format
 msgid "Inserted gap in selected tracks from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:14835
+#: src/multitrack.c:15048
 #, c-format
 msgid "Inserted gap in track %s from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15036
+#: src/multitrack.c:15244
 #, c-format
 msgid "Undid %s\n"
 msgstr ""
 
-#: src/multitrack.c:15235
+#: src/multitrack.c:15445
 #, c-format
 msgid "Redid %s\n"
 msgstr ""
 
-#: src/multitrack.c:15268
+#: src/multitrack.c:15475
 msgid ""
 "\n"
 " (variable)"
 msgstr ""
 
-#: src/multitrack.c:15502 src/multitrack.c:15614 src/multitrack.c:18736
-#: src/multitrack.c:18748
+#: src/multitrack.c:15710 src/multitrack.c:15823 src/multitrack.c:19077
+#: src/multitrack.c:19089
 #, c-format
 msgid "track %s"
 msgstr "путь %s"
 
-#: src/multitrack.c:15507 src/multitrack.c:15619 src/multitrack.c:18741
+#: src/multitrack.c:15715 src/multitrack.c:15828 src/multitrack.c:19082
 #, c-format
 msgid "tracks %s and %s"
 msgstr ""
 
-#: src/multitrack.c:15513 src/multitrack.c:15625 src/multitrack.c:18751
+#: src/multitrack.c:15721 src/multitrack.c:15834 src/multitrack.c:19091
 msgid "selected tracks"
 msgstr "выбранных композиций"
 
-#: src/multitrack.c:15516
+#: src/multitrack.c:15726
 #, c-format
 msgid "Added %s %s to %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15550
+#: src/multitrack.c:15760
 #, c-format
 msgid "Added effect %s to track %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15631
+#: src/multitrack.c:15845
 #, c-format
 msgid "Deleted %s %s from %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15935
+#: src/multitrack.c:16143
 #, c-format
 msgid "rendered %d frames to new clip.\n"
 msgstr ""
 
-#: src/multitrack.c:16025
+#: src/multitrack.c:16230
 msgid "Cleaning up..."
 msgstr "Очистка..."
 
-#: src/multitrack.c:16712
+#: src/multitrack.c:17003
 msgid "_Pause"
 msgstr "_Приостановить"
 
-#: src/multitrack.c:16713
+#: src/multitrack.c:17004
 msgid "Pause (p)"
 msgstr "Пауза (p)"
 
-#: src/multitrack.c:16856
+#: src/multitrack.c:17151
 msgid "Press 'm' during playback"
 msgstr ""
 
-#: src/multitrack.c:16857
+#: src/multitrack.c:17152
 msgid "to make a mark on the timeline"
 msgstr ""
 
-#: src/multitrack.c:17154
+#: src/multitrack.c:17498
 #, c-format
 msgid ""
 "Inserted audio %.4f to %.4f from clip %s into backing audio from time %.4f "
 "to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:17414
+#: src/multitrack.c:17759
 #, c-format
 msgid ""
 "Inserted frames %d to %d from clip %s into track %s from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:17998
+#: src/multitrack.c:18332
 #, c-format
 msgid ""
 "Time region %.3f to %.3f\n"
 "selected.\n"
 msgstr ""
 
-#: src/multitrack.c:18002
+#: src/multitrack.c:18336
 msgid ""
 "select one or more tracks\n"
 "to create a region.\n"
@@ -9824,111 +9839,111 @@
 "Выберите одну или несколько композиций\n"
 "создать регионе.\n"
 
-#: src/multitrack.c:18004
+#: src/multitrack.c:18337
 #, c-format
 msgid "%d video tracks selected.\n"
 msgstr "%d видеодорожек выбран.\n"
 
-#: src/multitrack.c:18006
+#: src/multitrack.c:18339
 msgid ""
 "Double click on timeline\n"
 "to deselect time region."
 msgstr ""
 
-#: src/multitrack.c:18013
+#: src/multitrack.c:18346
 msgid ""
 "Single click on an effect\n"
 "to select it."
 msgstr ""
 
-#: src/multitrack.c:18014
+#: src/multitrack.c:18347
 msgid ""
 "Double click on an effect\n"
 "to edit it."
 msgstr ""
 
-#: src/multitrack.c:18015
+#: src/multitrack.c:18348
 msgid ""
 "Right click on an effect\n"
 "for context menu.\n"
 msgstr ""
 
-#: src/multitrack.c:18017
+#: src/multitrack.c:18350
 msgid ""
 "Effect order can be changed at\n"
 "FILTER MAPS"
 msgstr ""
 
-#: src/multitrack.c:18024
+#: src/multitrack.c:18357
 msgid ""
 "You can select an effect,\n"
 "then use the INSERT BEFORE"
 msgstr ""
 
-#: src/multitrack.c:18025
+#: src/multitrack.c:18358
 msgid "or INSERT AFTER buttons to move it."
 msgstr ""
 
-#: src/multitrack.c:18307 src/multitrack.c:18320
+#: src/multitrack.c:18639 src/multitrack.c:18652
 msgid "Click on another effect,"
 msgstr ""
 
-#: src/multitrack.c:18308 src/multitrack.c:18321
+#: src/multitrack.c:18640 src/multitrack.c:18653
 msgid ""
 "and the selected one\n"
 "will be inserted"
 msgstr ""
 
-#: src/multitrack.c:18309
+#: src/multitrack.c:18641
 msgid "after it.\n"
 msgstr "после него.\n"
 
-#: src/multitrack.c:18322
+#: src/multitrack.c:18654
 msgid "before it.\n"
 msgstr "pered nim.\n"
 
-#: src/multitrack.c:18551
+#: src/multitrack.c:18889
 #, c-format
 msgid "Removed parameter values for effect %s at time %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:18759
+#: src/multitrack.c:19100
 #, c-format
 msgid "Set parameter values for %s %s on %s at time %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:19251 src/multitrack.c:20873
+#: src/multitrack.c:19630 src/multitrack.c:21195
 msgid "_Autoreload each time"
 msgstr ""
 
-#: src/multitrack.c:19323
+#: src/multitrack.c:19702
 msgid "Saving layout"
 msgstr ""
 
-#: src/multitrack.c:19345
+#: src/multitrack.c:19725
 #, c-format
 msgid "Saved layout to %s\n"
 msgstr ""
 
-#: src/multitrack.c:20783
+#: src/multitrack.c:21125
 msgid "clips and frames"
 msgstr "клипы и кадры"
 
-#: src/multitrack.c:20787
+#: src/multitrack.c:21128
 msgid "clips"
 msgstr "Клипы"
 
-#: src/multitrack.c:20790
+#: src/multitrack.c:21130
 msgid "frames"
 msgstr "кадров"
 
-#: src/multitrack.c:20800
+#: src/multitrack.c:21140
 msgid ""
 "\n"
 "Auto reload layout.\n"
 msgstr ""
 
-#: src/multitrack.c:20803
+#: src/multitrack.c:21143
 #, c-format
 msgid ""
 "%s\n"
@@ -9936,100 +9951,100 @@
 "Therefore it could not be loaded properly.\n"
 msgstr ""
 
-#: src/multitrack.c:20920
+#: src/multitrack.c:21284
 msgid "auto backup"
 msgstr ""
 
-#: src/multitrack.c:20923
+#: src/multitrack.c:21287
 #, c-format
 msgid ""
 "\n"
 "Unable to load layout file %s\n"
 msgstr ""
 
-#: src/multitrack.c:20944
+#: src/multitrack.c:21308
 #, c-format
 msgid "Loading layout from %s..."
 msgstr ""
 
-#: src/multitrack.c:20978
+#: src/multitrack.c:21338
 #, c-format
 msgid "Got %d events...processing..."
 msgstr ""
 
-#: src/multitrack.c:20991
+#: src/multitrack.c:21349
 msgid "Checking and rebuilding event list"
 msgstr ""
 
-#: src/multitrack.c:21017
+#: src/multitrack.c:21374
 #, c-format
 msgid "%d errors detected.\n"
 msgstr ""
 
-#: src/multitrack.c:21068
+#: src/multitrack.c:21422
 #, c-format
 msgid "Multitrack fps set to %.3f\n"
 msgstr ""
 
-#: src/multitrack.c:21225
+#: src/multitrack.c:21576
 msgid ""
 "The current layout has changes which have not been saved.\n"
 "Are you sure you wish to wipe it ?\n"
 msgstr ""
 
-#: src/multitrack.c:22047
+#: src/multitrack.c:22385
 msgid "LiVES: Multitrack audio mixer"
 msgstr ""
 
-#: src/multitrack.c:22077
+#: src/multitrack.c:22414
 msgid "_Reset values"
 msgstr "_Сброс значений"
 
-#: src/multitrack.c:22081
+#: src/multitrack.c:22418
 msgid "_Close mixer"
 msgstr "_Закрыть смеситель"
 
-#: src/multitrack.c:22130
+#: src/multitrack.c:22466
 msgid ""
 "_Invert backing audio\n"
 "and layer volumes"
 msgstr ""
 
-#: src/multitrack.c:22132
+#: src/multitrack.c:22468
 msgid "Adjust backing and layer audio values so that they sum to 1.0"
 msgstr ""
 
-#: src/multitrack.c:22175
+#: src/multitrack.c:22510
 msgid "_Gang layer audio"
 msgstr ""
 
-#: src/multitrack.c:22177
+#: src/multitrack.c:22512
 msgid "Adjust all layer audio values to the same value"
 msgstr ""
 
-#: src/jack.c:104
+#: src/jack.c:102
 msgid "JACK server started\n"
 msgstr ""
 
-#: src/jack.c:1284 src/jack.c:1353
+#: src/jack.c:1265 src/jack.c:1334
 msgid "Unable to connect to JACK server\n"
 msgstr ""
 
-#: src/jack.c:1512
+#: src/jack.c:1491
 msgid "Started jack audio subsystem.\n"
 msgstr ""
 
-#: src/jack.c:1623
+#: src/jack.c:1600
 msgid "Started jack audio reader.\n"
 msgstr ""
 
-#: src/jack.c:1838
+#: src/jack.c:1815
 msgid ""
 "\n"
 "Connection to jack audio was reset.\n"
 msgstr ""
 
-#: src/pulse.c:87
+#: src/pulse.c:88
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -10037,7 +10052,7 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:92
+#: src/pulse.c:94
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -10045,7 +10060,7 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:96
+#: src/pulse.c:99
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -10053,335 +10068,335 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:101
+#: src/pulse.c:104
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
 msgstr ""
 
-#: src/pulse.c:107
+#: src/pulse.c:109
 msgid "LiVES will exit and you can choose another audio player.\n"
 msgstr ""
 
-#: src/pulse.c:1352
+#: src/pulse.c:1335
 msgid ""
 "\n"
 "Connection to pulse audio was reset.\n"
 msgstr ""
 
-#: src/colourspace.c:1100
+#: src/colourspace.c:1092
 msgid "unclamped"
 msgstr ""
 
-#: src/colourspace.c:1101
+#: src/colourspace.c:1093
 msgid "clamped"
 msgstr ""
 
-#: src/omc-learn.c:195
+#: src/omc-learn.c:191
 #, c-format
 msgid "Responding to joystick events from %s\n"
 msgstr ""
 
-#: src/omc-learn.c:289
+#: src/omc-learn.c:279
 msgid "Creating ALSA seq port..."
 msgstr ""
 
-#: src/omc-learn.c:325
+#: src/omc-learn.c:313
 #, c-format
 msgid "Responding to MIDI events from %s\n"
 msgstr ""
 
-#: src/omc-learn.c:568
+#: src/omc-learn.c:554
 msgid "data"
 msgstr "данные"
 
-#: src/omc-learn.c:571
+#: src/omc-learn.c:557
 msgid "velocity"
 msgstr "скорость"
 
-#: src/omc-learn.c:572
+#: src/omc-learn.c:558
 msgid "note"
 msgstr "заметка"
 
-#: src/omc-learn.c:574 src/omc-learn.c:736 src/omc-learn.c:1105
-#: src/omc-learn.c:1591 src/omc-learn.c:1640
+#: src/omc-learn.c:560 src/omc-learn.c:724 src/omc-learn.c:1092
+#: src/omc-learn.c:1581 src/omc-learn.c:1630
 msgid "value"
 msgstr "значение"
 
-#: src/omc-learn.c:576
+#: src/omc-learn.c:562
 msgid "state"
 msgstr "состояние"
 
-#: src/omc-learn.c:688
+#: src/omc-learn.c:674
 msgid "variable"
 msgstr "переменная"
 
-#: src/omc-learn.c:1001
+#: src/omc-learn.c:989
 msgid "Vars."
 msgstr ""
 
-#: src/omc-learn.c:1054
+#: src/omc-learn.c:1041
 #, c-format
 msgid "MIDI ch %d note on"
 msgstr ""
 
-#: src/omc-learn.c:1058
+#: src/omc-learn.c:1045
 #, c-format
 msgid "MIDI ch %d note off"
 msgstr ""
 
-#: src/omc-learn.c:1062
+#: src/omc-learn.c:1049
 #, c-format
 msgid "MIDI ch %d controller %d"
 msgstr ""
 
-#: src/omc-learn.c:1066
+#: src/omc-learn.c:1053
 #, c-format
 msgid "MIDI ch %d pitch bend"
 msgstr ""
 
-#: src/omc-learn.c:1070
+#: src/omc-learn.c:1057
 #, c-format
 msgid "MIDI ch %d pgm change"
 msgstr ""
 
-#: src/omc-learn.c:1073
+#: src/omc-learn.c:1060
 #, c-format
 msgid "Joystick button %d"
 msgstr ""
 
-#: src/omc-learn.c:1076
+#: src/omc-learn.c:1063
 #, c-format
 msgid "Joystick axis %d"
 msgstr ""
 
-#: src/omc-learn.c:1113
+#: src/omc-learn.c:1100
 msgid "x"
 msgstr "x"
 
-#: src/omc-learn.c:1122
+#: src/omc-learn.c:1109
 msgid "range"
 msgstr "диапазон"
 
-#: src/omc-learn.c:1143
+#: src/omc-learn.c:1130
 msgid "+ offset1"
 msgstr ""
 
-#: src/omc-learn.c:1161
+#: src/omc-learn.c:1150
 msgid "* scale"
 msgstr ""
 
-#: src/omc-learn.c:1179
+#: src/omc-learn.c:1170
 msgid "+ offset2"
 msgstr ""
 
-#: src/omc-learn.c:1280
+#: src/omc-learn.c:1270
 msgid ""
 "\n"
 "Click OK to delete all entries\n"
 msgstr ""
 
-#: src/omc-learn.c:1318
+#: src/omc-learn.c:1308
 msgid "LiVES: OMC learner"
 msgstr ""
 
-#: src/omc-learn.c:1334
+#: src/omc-learn.c:1324
 msgid "Clear _unmatched"
 msgstr ""
 
-#: src/omc-learn.c:1345
+#: src/omc-learn.c:1335
 msgid "_Delete all"
 msgstr "_Удалить все"
 
-#: src/omc-learn.c:1411
+#: src/omc-learn.c:1401
 msgid "Start video playback"
 msgstr ""
 
-#: src/omc-learn.c:1414
+#: src/omc-learn.c:1404
 msgid "Stop video playback"
 msgstr "Остановка воспроизведения видео"
 
-#: src/omc-learn.c:1418
+#: src/omc-learn.c:1408
 msgid "Clip select <clipnum>"
 msgstr ""
 
-#: src/omc-learn.c:1419
+#: src/omc-learn.c:1409
 msgid "Switch foreground clip to the nth valid clip"
 msgstr ""
 
-#: src/omc-learn.c:1423
+#: src/omc-learn.c:1413
 msgid "Play forwards"
 msgstr "Слушать Вперед"
 
-#: src/omc-learn.c:1424
+#: src/omc-learn.c:1414
 msgid "Play video in a forwards direction"
 msgstr "Воспроизводит видео в направлении вперед"
 
-#: src/omc-learn.c:1427
+#: src/omc-learn.c:1417
 msgid "Play backwards"
 msgstr "Слушать назад"
 
-#: src/omc-learn.c:1428
+#: src/omc-learn.c:1418
 msgid "Play video in a backwards direction"
 msgstr "Воспроизводит видео в обратном направлении"
 
-#: src/omc-learn.c:1431
+#: src/omc-learn.c:1421
 msgid "Reverse playback direction"
 msgstr "Обратное направление воспроизведения"
 
-#: src/omc-learn.c:1432
+#: src/omc-learn.c:1422
 msgid "Reverse direction of video playback"
 msgstr "Обратное направление воспроизведения видео"
 
-#: src/omc-learn.c:1435
+#: src/omc-learn.c:1425
 msgid "Play video faster"
 msgstr "Воспроизведение видео быстро"
 
-#: src/omc-learn.c:1436
+#: src/omc-learn.c:1426
 msgid "Play video at a slightly faster rate"
 msgstr "Воспроизведение видео на несколько более быстрыми темпами"
 
-#: src/omc-learn.c:1439
+#: src/omc-learn.c:1429
 msgid "Play video slower"
 msgstr "Воспроизведение видео медленный"
 
-#: src/omc-learn.c:1440
+#: src/omc-learn.c:1430
 msgid "Play video at a slightly slower rate"
 msgstr "Воспроизведение видео на несколько более медленными темпами"
 
-#: src/omc-learn.c:1443
+#: src/omc-learn.c:1433
 msgid "Toggle video freeze"
 msgstr ""
 
-#: src/omc-learn.c:1444
+#: src/omc-learn.c:1434
 msgid "Freeze video, or if already frozen, unfreeze it"
 msgstr ""
 
-#: src/omc-learn.c:1447
+#: src/omc-learn.c:1437
 msgid "Set video framerate to <fps>"
 msgstr ""
 
-#: src/omc-learn.c:1448
+#: src/omc-learn.c:1438
 msgid "Set framerate of foreground clip to <float fps>"
 msgstr ""
 
-#: src/omc-learn.c:1452
+#: src/omc-learn.c:1442
 msgid "Start recording"
 msgstr "Начать запись"
 
-#: src/omc-learn.c:1455
+#: src/omc-learn.c:1445
 msgid "Stop recording"
 msgstr "Остановить запись"
 
-#: src/omc-learn.c:1458
+#: src/omc-learn.c:1448
 msgid "Toggle recording state"
 msgstr ""
 
-#: src/omc-learn.c:1461
+#: src/omc-learn.c:1451
 msgid "Swap foreground and background clips"
 msgstr ""
 
-#: src/omc-learn.c:1463
+#: src/omc-learn.c:1453
 msgid "Reset effect keys"
 msgstr "Ключи Сбросить эффекта"
 
-#: src/omc-learn.c:1464
+#: src/omc-learn.c:1454
 msgid "Switch all effects off."
 msgstr ""
 
-#: src/omc-learn.c:1467
+#: src/omc-learn.c:1457
 msgid "Enable effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1471
+#: src/omc-learn.c:1461
 msgid "Disable effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1475
+#: src/omc-learn.c:1465
 msgid "Toggle effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1479
+#: src/omc-learn.c:1469
 msgid "Set parameter value <key> <pnum> = <value>"
 msgstr ""
 
-#: src/omc-learn.c:1480
+#: src/omc-learn.c:1470
 msgid "Set <value> of pth (numerical) parameter for effect key <key>."
 msgstr ""
 
-#: src/omc-learn.c:1484
+#: src/omc-learn.c:1474
 msgid "Switch foreground to next clip"
 msgstr ""
 
-#: src/omc-learn.c:1487
+#: src/omc-learn.c:1477
 msgid "Switch foreground to previous clip"
 msgstr ""
 
-#: src/omc-learn.c:1490
+#: src/omc-learn.c:1480
 msgid "Set video framerate to ratio <fps_ratio>"
 msgstr ""
 
-#: src/omc-learn.c:1491
+#: src/omc-learn.c:1481
 msgid "Set framerate ratio of foreground clip to <float fps_ratio>"
 msgstr ""
 
-#: src/omc-learn.c:1495
+#: src/omc-learn.c:1485
 msgid "Retrigger clip <clipnum>"
 msgstr ""
 
-#: src/omc-learn.c:1496
+#: src/omc-learn.c:1486
 msgid ""
 "Switch foreground clip to the nth valid clip, and reset the frame number"
 msgstr ""
 
-#: src/omc-learn.c:1500
+#: src/omc-learn.c:1490
 msgid "Cycle to next mode for effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1504
+#: src/omc-learn.c:1494
 msgid "Cycle to previous mode for effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1508
+#: src/omc-learn.c:1498
 msgid "Set playback plugin parameter value <pnum> = <value>"
 msgstr ""
 
-#: src/omc-learn.c:1509
+#: src/omc-learn.c:1499
 msgid "Set <value> of pth parameter for the playback plugin."
 msgstr ""
 
 #. TRANSLATORS: short form of "clip number"
-#: src/omc-learn.c:1536 src/omc-learn.c:1607
+#: src/omc-learn.c:1526 src/omc-learn.c:1597
 msgid "clipnum"
 msgstr ""
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1545
+#: src/omc-learn.c:1535
 msgid "fps"
 msgstr "кадров/с"
 
 #. TRANSLATORS: as in keyboard key
-#: src/omc-learn.c:1553 src/omc-learn.c:1560 src/omc-learn.c:1567
-#: src/omc-learn.c:1575 src/omc-learn.c:1615 src/omc-learn.c:1623
+#: src/omc-learn.c:1543 src/omc-learn.c:1550 src/omc-learn.c:1557
+#: src/omc-learn.c:1565 src/omc-learn.c:1605 src/omc-learn.c:1613
 msgid "key"
 msgstr "клавиша"
 
 #. TRANSLATORS: short form of "parameter number"
-#: src/omc-learn.c:1583 src/omc-learn.c:1632
+#: src/omc-learn.c:1573 src/omc-learn.c:1622
 msgid "pnum"
 msgstr "pnum"
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1599
+#: src/omc-learn.c:1589
 msgid "fps_ratio"
 msgstr ""
 
-#: src/omc-learn.c:2443
+#: src/omc-learn.c:2417
 #, c-format
 msgid "Saving device mapping to file %s..."
 msgstr ""
 
-#: src/omc-learn.c:2527
+#: src/omc-learn.c:2498
 #, c-format
 msgid ""
 "\n"
@@ -10390,7 +10405,7 @@
 "%s\n"
 msgstr ""
 
-#: src/omc-learn.c:2534
+#: src/omc-learn.c:2505
 #, c-format
 msgid ""
 "\n"
@@ -10399,12 +10414,12 @@
 "%s\n"
 msgstr ""
 
-#: src/omc-learn.c:2571
+#: src/omc-learn.c:2541
 #, c-format
 msgid "Loading device mapping from file %s..."
 msgstr ""
 
-#: src/omc-learn.c:2576
+#: src/omc-learn.c:2544
 #, c-format
 msgid ""
 "\n"
@@ -10414,12 +10429,12 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/videodev.c:547
+#: src/videodev.c:539
 #, c-format
 msgid "Unable to open device %s\n"
 msgstr ""
 
-#: src/videodev.c:564
+#: src/videodev.c:554
 #, c-format
 msgid "Opened device %s\n"
 msgstr ""
@@ -10489,34 +10504,10 @@
 #~ msgstr "_ Объединить содержимое буфера обмена с выделенным..."
 
 #, fuzzy
-#~ msgid "Colorize"
-#~ msgstr "Масштабирование"
-
-#, fuzzy
 #~ msgid "Colorizing"
 #~ msgstr "Масштабирование"
 
 #, fuzzy
-#~ msgid "Colour cycle"
-#~ msgstr "Масштабирование"
-
-#, fuzzy
-#~ msgid "Colour cycling"
-#~ msgstr "Масштабирование"
-
-#, fuzzy
-#~ msgid "Colour filter"
-#~ msgstr "Масштабирование"
-
-#, fuzzy
-#~ msgid "Colour filtering"
-#~ msgstr "Масштабирование"
-
-#, fuzzy
-#~ msgid "Colour replace"
-#~ msgstr "Масштабирование"
-
-#, fuzzy
 #~ msgid "Cycle _Step"
 #~ msgstr "_Начать"
 
@@ -10565,10 +10556,6 @@
 #~ msgstr "Изменить исходящий звук"
 
 #, fuzzy
-#~ msgid "Frame Calculator"
-#~ msgstr "Изменить исходящий звук"
-
-#, fuzzy
 #~ msgid "Frame _Colour"
 #~ msgstr "Изменить исходящий звук"
 
@@ -10589,14 +10576,6 @@
 #~ msgstr "Размер кадра"
 
 #, fuzzy
-#~ msgid "Frames _per second (FPS)"
-#~ msgstr "Сроки (в секундах)"
-
-#, fuzzy
-#~ msgid "Gamma _end"
-#~ msgstr "_Начать"
-
-#, fuzzy
 #~ msgid "Gamma _start"
 #~ msgstr "_Начать"
 
@@ -10606,7 +10585,7 @@
 
 #, fuzzy
 #~ msgid "Generate blank frames"
-#~ msgstr "Вставка тишины"
+#~ msgstr "Удаление избыточных кадров"
 
 #, fuzzy
 #~ msgid "Generate clip from image"
@@ -10614,15 +10593,15 @@
 
 #, fuzzy
 #~ msgid "Generate coloured frames"
-#~ msgstr "Вставка тишины"
+#~ msgstr "Удаление избыточных кадров"
 
 #, fuzzy
 #~ msgid "Generate title frames"
-#~ msgstr "Вставка тишины"
+#~ msgstr "Удаление избыточных кадров"
 
 #, fuzzy
 #~ msgid "Generating blank frames"
-#~ msgstr "Вставка тишины"
+#~ msgstr "Удаление избыточных кадров"
 
 #, fuzzy
 #~ msgid "Generating clip from image"
@@ -10630,15 +10609,11 @@
 
 #, fuzzy
 #~ msgid "Generating coloured frames"
-#~ msgstr "Вставка тишины"
+#~ msgstr "Удаление избыточных кадров"
 
 #, fuzzy
 #~ msgid "Generating title frames"
-#~ msgstr "Вставка тишины"
-
-#, fuzzy
-#~ msgid "Hue _end"
-#~ msgstr "Изменить входящий звук"
+#~ msgstr "Удаление избыточных кадров"
 
 #, fuzzy
 #~ msgid "Hue _start"
@@ -10649,18 +10624,10 @@
 #~ msgstr "_Игнорировать изменения"
 
 #, fuzzy
-#~ msgid "Hue end"
-#~ msgstr "Изменить входящий звук"
-
-#, fuzzy
 #~ msgid "Hue start"
 #~ msgstr "_Начать"
 
 #, fuzzy
-#~ msgid "Modulate (BSH)"
-#~ msgstr "Вставить"
-
-#, fuzzy
 #~ msgid "Modulating"
 #~ msgstr "Вставить"
 
@@ -10673,10 +10640,6 @@
 #~ msgstr "Вставить"
 
 #, fuzzy
-#~ msgid "Normalize"
-#~ msgstr "Масштабирование"
-
-#, fuzzy
 #~ msgid "Normalizing"
 #~ msgstr "Масштабирование"
 
@@ -10721,34 +10684,10 @@
 #~ msgstr "_Начать"
 
 #, fuzzy
-#~ msgid "Saturation _end"
-#~ msgstr "Переходы состояний"
-
-#, fuzzy
-#~ msgid "Saturation _start"
-#~ msgstr "Переходы состояний"
-
-#, fuzzy
-#~ msgid "Saturation change"
-#~ msgstr "Переходы состояний"
-
-#, fuzzy
-#~ msgid "Saturation end"
-#~ msgstr "Переходы состояний"
-
-#, fuzzy
-#~ msgid "Saturation start"
-#~ msgstr "Переходы состояний"
-
-#, fuzzy
 #~ msgid "Skip forward"
 #~ msgstr "Слушать Вперед"
 
 #, fuzzy
-#~ msgid "Solarize"
-#~ msgstr "Масштабирование"
-
-#, fuzzy
 #~ msgid "Solarizing"
 #~ msgstr "Масштабирование"
 
@@ -10773,18 +10712,6 @@
 #~ msgstr "_Начать"
 
 #, fuzzy
-#~ msgid "Swirl s_tep"
-#~ msgstr "_Начать"
-
-#, fuzzy
-#~ msgid "Swirl"
-#~ msgstr "_Начать"
-
-#, fuzzy
-#~ msgid "Swirling"
-#~ msgstr "_Начать"
-
-#, fuzzy
 #~ msgid "Tunnel"
 #~ msgstr "Отмена"
 
@@ -10801,10 +10728,6 @@
 #~ msgstr "Фон"
 
 #, fuzzy
-#~ msgid "_Calculate"
-#~ msgstr "Изменить исходящий звук"
-
-#, fuzzy
 #~ msgid "_Cycle Start"
 #~ msgstr "_Начать"
 
@@ -10817,10 +10740,6 @@
 #~ msgstr "Конечный кадр"
 
 #, fuzzy
-#~ msgid "_Fade level"
-#~ msgstr "Изменить входящий звук"
-
-#, fuzzy
 #~ msgid "_Fade start"
 #~ msgstr "_Начать"
 
@@ -10833,10 +10752,6 @@
 #~ msgstr "Первый кадр"
 
 #, fuzzy
-#~ msgid "_Flash for"
-#~ msgstr "Изменить исходящий звук"
-
-#, fuzzy
 #~ msgid "_Frames per second"
 #~ msgstr "Сроки (в секундах)"
 
@@ -10845,10 +10760,6 @@
 #~ msgstr "Кадры"
 
 #, fuzzy
-#~ msgid "_Hold for"
-#~ msgstr "Изменить исходящий звук"
-
-#, fuzzy
 #~ msgid "_Image File"
 #~ msgstr "_Файл"
 
@@ -10869,20 +10780,12 @@
 #~ msgstr "_Указатель"
 
 #, fuzzy
-#~ msgid "_Radius end"
-#~ msgstr "_Начать"
-
-#, fuzzy
 #~ msgid "_Radius start"
 #~ msgstr "_Начать"
 
 #, fuzzy
-#~ msgid "_Radius"
-#~ msgstr "_Начать"
-
-#, fuzzy
 #~ msgid "_Random colour each frame"
-#~ msgstr "Вставка тишины"
+#~ msgstr "Удаление избыточных кадров"
 
 #, fuzzy
 #~ msgid "_Right"
@@ -10957,18 +10860,6 @@
 #~ msgstr "_Игнорировать изменения"
 
 #, fuzzy
-#~ msgid "colorize"
-#~ msgstr "Масштабирование"
-
-#, fuzzy
-#~ msgid "colour_filter"
-#~ msgstr "Масштабирование"
-
-#, fuzzy
-#~ msgid "colour_replace"
-#~ msgstr "Вставка тишины"
-
-#, fuzzy
 #~ msgid "enhance"
 #~ msgstr "Отмена"
 
@@ -10981,14 +10872,6 @@
 #~ msgstr "Изменить исходящий звук"
 
 #, fuzzy
-#~ msgid "frame_calculator"
-#~ msgstr "Изменить исходящий звук"
-
-#, fuzzy
-#~ msgid "gamma_change"
-#~ msgstr "_Игнорировать изменения"
-
-#, fuzzy
 #~ msgid "gen_blank_frames"
 #~ msgstr "кадров"
 
@@ -10998,25 +10881,13 @@
 
 #, fuzzy
 #~ msgid "gen_coloured_frames"
-#~ msgstr "Вставка тишины"
+#~ msgstr "Удаление избыточных кадров"
 
 #, fuzzy
 #~ msgid "hue_change"
 #~ msgstr "_Игнорировать изменения"
 
 #, fuzzy
-#~ msgid "modulate"
-#~ msgstr "Вставить"
-
-#, fuzzy
-#~ msgid "negate"
-#~ msgstr "Вставить"
-
-#, fuzzy
-#~ msgid "normalize"
-#~ msgstr "Масштабирование"
-
-#, fuzzy
 #~ msgid "pixilate"
 #~ msgstr "Вставить"
 
@@ -11041,18 +10912,10 @@
 #~ msgstr "Слушать Вперед"
 
 #, fuzzy
-#~ msgid "solarize"
-#~ msgstr "Масштабирование"
-
-#, fuzzy
 #~ msgid "spread"
 #~ msgstr "Остановить запись"
 
 #, fuzzy
-#~ msgid "swirl"
-#~ msgstr "_Начать"
-
-#, fuzzy
 #~ msgid "transition_bwthresh"
 #~ msgstr "Переходы состояний"
 
@@ -11126,3 +10989,6 @@
 #~ "\n"
 #~ "\n"
 #~ "Вам нужно установить mplayer для предварительного просмотра этого файла.\n"
+
+#~ msgid "Pause"
+#~ msgstr "Приостановить"

LiVES-2.2.8.tar.bz2/po/sk.po -> LiVES-2.4.1.tar.bz2/po/sk.po Changed

@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n"
-"POT-Creation-Date: 2015-02-08 17:18-0300\n"
+"POT-Creation-Date: 2015-08-09 14:52-0300\n"
 "PO-Revision-Date: 2013-03-14 12:31+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Slovak <sk@li.org>\n"
@@ -18,8 +18,7 @@
 "X-Launchpad-Export-Date: 2013-03-28 10:57+0000\n"
 "X-Generator: Launchpad (build 16546)\n"
 
-#. TRANSLATORS: do not translate this message
-#: src/main.c:118
+#: src/main.c:128
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -33,22 +32,22 @@
 "All translators should read the LiVES translation notes at\n"
 "http://lives.sourceforge.net/TRANS-README.txt"
 
-#: src/main.c:134
+#: src/main.c:153
 #, c-format
 msgid "%s Warning: %s\n"
 msgstr ""
 
-#: src/main.c:138
+#: src/main.c:157
 #, c-format
 msgid "%s Critical error: %s\n"
 msgstr ""
 
-#: src/main.c:139
+#: src/main.c:158
 #, c-format
 msgid "%s Fatal error: %s\n"
 msgstr ""
 
-#: src/main.c:176
+#: src/main.c:198
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -62,7 +61,7 @@
 "group_id=64341&atid=507139\n"
 "Ďakujeme. Obnovenie by malo byť možné po reštartovaní LiVES.\n"
 
-#: src/main.c:177
+#: src/main.c:199
 msgid ""
 "\n"
 "\n"
@@ -74,7 +73,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:180
+#: src/main.c:203
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -82,7 +81,7 @@
 "a všetky informácie uvedené nižšie:\n"
 "\n"
 
-#: src/main.c:184
+#: src/main.c:206
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
@@ -92,84 +91,84 @@
 "zhromaždenie viac informácií.\n"
 "\n"
 
-#: src/main.c:192
+#: src/main.c:216
 msgid "Preserving set.\n"
 msgstr "Nastavenie zachovania.\n"
 
-#: src/main.c:636
+#: src/main.c:691
 msgid "Resizing"
 msgstr "Zmena veľkosti"
 
-#: src/main.c:643
+#: src/main.c:698
 msgid "_Resize All Frames"
 msgstr "_Zmeniť veľkosť všetkých snímkov"
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:895
+#: src/main.c:948
 msgid "Any"
 msgstr "Ktorýkoľvek"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:897
+#: src/main.c:950
 msgid "None"
 msgstr "Žiaden"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:899
+#: src/main.c:952
 msgid "recommended"
 msgstr "doporučené"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:901
+#: src/main.c:954
 msgid "disabled !"
 msgstr "zakázané !"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:903
+#: src/main.c:956
 msgid "**The current layout**"
 msgstr "**Súčasné rozloženie**"
 
 #. TRANSLATORS: adjective for "Built in" type effects
-#: src/main.c:905
+#: src/main.c:958
 msgid "Builtin"
 msgstr "Vstavané"
 
 #. TRANSLATORS: adjective for "Custom" type effects
-#: src/main.c:907
+#: src/main.c:960
 msgid "Custom"
 msgstr "Vlastné"
 
 #. TRANSLATORS: adjective for "Test" type effects
-#: src/main.c:909
+#: src/main.c:962
 msgid "Test"
 msgstr "Otestovať"
 
-#: src/main.c:1054
+#: src/main.c:1107
 msgid "Foreground"
 msgstr ""
 
-#: src/main.c:1055
+#: src/main.c:1108
 #, fuzzy
 msgid "Background"
 msgstr "_Prázdne pozadie"
 
-#: src/main.c:1566
+#: src/main.c:1624
 msgid "Loading realtime effect plugins..."
 msgstr "Načítavam efekt rozšírenia v réálnom čase..."
 
-#: src/main.c:1631
+#: src/main.c:1690
 msgid "Starting jack audio server..."
 msgstr "Spúšťam zvukový server jack..."
 
-#: src/main.c:1633
+#: src/main.c:1692
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1634
+#: src/main.c:1693
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1663
+#: src/main.c:1723
 #, c-format
 msgid ""
 "\n"
@@ -181,114 +180,114 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1697
+#: src/main.c:1758
 msgid "Starting pulse audio server..."
 msgstr "Spúšťam pulse audio server..."
 
-#: src/main.c:1765
+#: src/main.c:1825
 msgid "Checking optional dependencies:"
 msgstr "Kontrola dodatočných záavislostí:"
 
-#: src/main.c:1766
+#: src/main.c:1826
 msgid "mplayer...detected..."
 msgstr "mplayer...nájdený..."
 
-#: src/main.c:1767
+#: src/main.c:1827
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...NENÁJDENÝ..."
 
-#: src/main.c:1768
+#: src/main.c:1828
 #, fuzzy
 msgid "mplayer2...detected..."
 msgstr "mplayer...nájdený..."
 
-#: src/main.c:1769
+#: src/main.c:1829
 #, fuzzy
 msgid "mplayer2...NOT DETECTED..."
 msgstr "mplayer...NENÁJDENÝ..."
 
-#: src/main.c:1770
+#: src/main.c:1830
 msgid "convert...detected..."
 msgstr "convert...nájdený..."
 
-#: src/main.c:1771
+#: src/main.c:1831
 msgid "convert...NOT DETECTED..."
 msgstr "convert...NENÁJDENÝ..."
 
-#: src/main.c:1772
+#: src/main.c:1832
 msgid "composite...detected..."
 msgstr "composite...nájdený..."
 
-#: src/main.c:1773
+#: src/main.c:1833
 msgid "composite...NOT DETECTED..."
 msgstr "composite...NENÁJDENÝ..."
 
-#: src/main.c:1774
+#: src/main.c:1834
 msgid "sox...detected\n"
 msgstr "sox...nájdený\n"
 
-#: src/main.c:1775
+#: src/main.c:1835
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...NENÁJDENÝ\n"
 
-#: src/main.c:1776
+#: src/main.c:1836
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...nájdený..."
 
-#: src/main.c:1777
+#: src/main.c:1837
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...NENÁJDENÝ..."
 
-#: src/main.c:1778
+#: src/main.c:1838
 msgid "jackd...detected..."
 msgstr "jackd...nájdený..."
 
-#: src/main.c:1779
+#: src/main.c:1839
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...NENÁJDENÝ..."
 
-#: src/main.c:1780
+#: src/main.c:1840
 msgid "pulse audio...detected..."
 msgstr "pulse audio...nájdené..."
 
-#: src/main.c:1781
+#: src/main.c:1841
 msgid "pulse audio...NOT DETECTED..."
 msgstr "pulse audio...NENÁJDENÉ..."
 
-#: src/main.c:1782
+#: src/main.c:1842
 msgid "python...detected..."
 msgstr "python...nájdený..."
 
-#: src/main.c:1783
+#: src/main.c:1843
 msgid "python...NOT DETECTED..."
 msgstr "python...NENÁJDENÝ..."
 
-#: src/main.c:1784
+#: src/main.c:1844
 msgid "dvgrab...detected..."
 msgstr "dvgrab...nájdený..."
 
-#: src/main.c:1785
+#: src/main.c:1845
 msgid "dvgrab...NOT DETECTED..."
 msgstr "dvgrab...NENÁJDENÝ..."
 
-#: src/main.c:1786
+#: src/main.c:1846
 msgid "xwininfo...detected..."
 msgstr "xwininfo...nájdený..."
 
-#: src/main.c:1787
+#: src/main.c:1847
 msgid "xwininfo...NOT DETECTED..."
 msgstr "xwininfo...NENÁJDENÝ..."
 
-#: src/main.c:1793
+#: src/main.c:1853
 #, c-format
 msgid "Windows version %04X"
 msgstr ""
 
-#: src/main.c:1795
+#: src/main.c:1855
 msgid "UNKNOWN - please patch me !"
 msgstr ""
 
-#: src/main.c:1799
+#: src/main.c:1859
 #, c-format
 msgid ""
 "\n"
@@ -299,48 +298,48 @@
 "\n"
 "Správa manažéra okien ako \"%s\"; "
 
-#: src/main.c:1802
+#: src/main.c:1862
 #, c-format
 msgid "number of monitors detected: %d\n"
 msgstr "počet nájdených monitorov: %d\n"
 
-#: src/main.c:1805
+#: src/main.c:1865
 #, c-format
 msgid "Number of CPUs detected: %d "
 msgstr ""
 
-#: src/main.c:1808 src/multitrack.c:4902
+#: src/main.c:1868 src/multitrack.c:5068
 msgid "little endian"
 msgstr "malý endian"
 
-#: src/main.c:1809 src/multitrack.c:4901
+#: src/main.c:1869 src/multitrack.c:5067
 msgid "big endian"
 msgstr "veľký endian"
 
-#: src/main.c:1810
+#: src/main.c:1870
 #, c-format
 msgid "(%d bits, %s)\n"
 msgstr ""
 
-#: src/main.c:1814
+#: src/main.c:1874
 msgid "GUI type is: "
 msgstr ""
 
-#: src/main.c:1818
+#: src/main.c:1878
 #, c-format
 msgid "GTK+ version %d.%d.%d (compiled with %d.%d.%d)"
 msgstr ""
 
-#: src/main.c:1840
+#: src/main.c:1900
 msgid ", with cairo support"
 msgstr ""
 
-#: src/main.c:1847
+#: src/main.c:1907
 #, c-format
 msgid "Temp directory is %s\n"
 msgstr "Dočasný adresár je %s\n"
 
-#: src/main.c:1851
+#: src/main.c:1911
 msgid ""
 "WARNING - this version of LiVES was compiled without either\n"
 "jack or pulse audio support.\n"
@@ -350,15 +349,15 @@
 "podpory jack alebo pulse audio.\n"
 "Mnohé audio funkcie nebudú k dispozícii.\n"
 
-#: src/main.c:1854
+#: src/main.c:1914
 msgid "Compiled with jack support, good !\n"
 msgstr "Kompilované s podporou jack, dobrá práca!\n"
 
-#: src/main.c:1857
+#: src/main.c:1917
 msgid "Compiled with pulse audio support, wonderful !\n"
 msgstr "Kompilované s podporou pulse audio, nádhera !\n"
 
-#: src/main.c:1861
+#: src/main.c:1921
 #, c-format
 msgid ""
 "Welcome to LiVES version %s.\n"
@@ -367,7 +366,7 @@
 "Vítajte vo verzii LiVES %s.\n"
 "\n"
 
-#: src/main.c:2306
+#: src/main.c:2380
 #, c-format
 msgid ""
 "\n"
@@ -376,86 +375,91 @@
 "\n"
 "Štartovací syntax je: %s [opts] [filename [start_time] [frames]]\n"
 
-#: src/main.c:2307
+#: src/main.c:2381
 msgid "Where: filename is the name of a media file or backup file.\n"
 msgstr ""
 "Kde: názov súboru je názvom mediálneho súboru alebo záložného súboru.\n"
 
-#: src/main.c:2308
+#: src/main.c:2382
 msgid "start_time : filename start time in seconds\n"
 msgstr "čas_spustenia : čas do spustenia súboru v sekundách\n"
 
-#: src/main.c:2309
+#: src/main.c:2383
 msgid "frames : maximum number of frames to open\n"
 msgstr "snímky : maximálny počet snímkov, ktoré je možné otvoriť\n"
 
-#: src/main.c:2311
+#: src/main.c:2385
 msgid "opts can be:\n"
 msgstr "opts môže byť:\n"
 
-#: src/main.c:2312
+#: src/main.c:2386
 msgid "-help            : show this help text and exit\n"
 msgstr "-help : zobraziť túto nápovedu a ukončiť\n"
 
-#: src/main.c:2313
+#: src/main.c:2387
 msgid "-tmpdir <tempdir>: use alternate working directory (e.g /var/ramdisk)\n"
 msgstr ""
 
-#: src/main.c:2314
+#: src/main.c:2388
 msgid "-set <setname>   : autoload clip set setname\n"
 msgstr "-set <setname> : automaticky nastaviť zostavu klipu\n"
 
-#: src/main.c:2315
+#: src/main.c:2389
 msgid "-noset           : do not load any set on startup\n"
 msgstr "-noset : pri spustení nenahrať zostavu\n"
 
-#: src/main.c:2316
+#: src/main.c:2390
 msgid "-norecover       : force no-loading of crash recovery\n"
 msgstr "-nerocover : nenahrávať havarijnú zálohu\n"
 
-#: src/main.c:2317
+#: src/main.c:2391
 msgid "-recover         : force loading of crash recovery\n"
 msgstr "-recover : nahrať havarijnú zálohu\n"
 
-#: src/main.c:2318
-msgid "-nothreaddialog  : doe nothing - retained for backwards compatibility\n"
+#: src/main.c:2392
+msgid ""
+"-nothreaddialog  : does nothing - retained for backwards compatibility\n"
 msgstr ""
 
-#: src/main.c:2319
+#: src/main.c:2393
 msgid "-nogui           : do not show the gui\n"
 msgstr "-nogui : nezobrazovať gui\n"
 
-#: src/main.c:2320
+#: src/main.c:2394
 msgid "-nosplash        : do not show the splash window\n"
 msgstr ""
 
-#: src/main.c:2321
+#: src/main.c:2395
 msgid "-noplaywin       : do not show the play window\n"
 msgstr ""
 
-#: src/main.c:2322
+#: src/main.c:2396
+msgid "-noninteractive  : disable menu interactivity\n"
+msgstr ""
+
+#: src/main.c:2397
 msgid "-startup-ce      : start in clip editor mode\n"
 msgstr "-startup-ce : spustiť v režime editora klipu\n"
 
-#: src/main.c:2323
+#: src/main.c:2398
 msgid "-startup-mt      : start in multitrack mode\n"
 msgstr "-startup-mt : spustiť v režime viacstopého editora\n"
 
-#: src/main.c:2324
+#: src/main.c:2399
 msgid ""
 "-fxmodesmax <n>  : allow <n> modes per effect key (minimum is 1, default is "
 "8)\n"
 msgstr ""
 
-#: src/main.c:2326
+#: src/main.c:2401
 msgid "-oscstart <port> : start OSC listener on UDP port <port>\n"
 msgstr "-oscstart <port> : spustiť počúvanie na UDP porte <port>\n"
 
-#: src/main.c:2327
+#: src/main.c:2402
 msgid "-nooscstart      : do not start OSC listener\n"
 msgstr "-nooscstart : nespúšťať OSC počúvanie\n"
 
-#: src/main.c:2329
+#: src/main.c:2404
 #, fuzzy
 msgid ""
 "-aplayer <ap>    : start with selected audio player. <ap> can be mplayer, "
@@ -464,44 +468,44 @@
 "-aplayer <ap> : spustenie s vybraným audio prehrávačom. <ap> môže byť mplayer"
 
 #. TRANSLATORS: pulse (audio)
-#: src/main.c:2332
+#: src/main.c:2407
 msgid ", pulse"
 msgstr ", pulse"
 
-#: src/main.c:2335
+#: src/main.c:2410
 msgid ", sox or jack\n"
 msgstr ", sox alebo jack\n"
 
-#: src/main.c:2336
+#: src/main.c:2412
 msgid ""
 "-jackopts <opts>    : opts is a bitmap of jack startup options [1 = jack "
 "transport client, 2 = jack transport master, 4 = start jack transport "
 "server, 8 = pause audio when video paused, 16 = start jack audio server] \n"
 msgstr ""
 
-#: src/main.c:2338
+#: src/main.c:2414
 msgid " or sox\n"
 msgstr " alebo sox\n"
 
-#: src/main.c:2340
+#: src/main.c:2416
 msgid "-devicemap <mapname>          : autoload devicemap\n"
 msgstr "-devicemap <mapname> : automatické spustenie mapovania jednotky\n"
 
-#: src/main.c:2341
+#: src/main.c:2418
 msgid ""
 "-vppdefaults <file>          : load video playback plugin defaults from "
 "<file> (Note: only sets the settings, not the plugin type)\n"
 msgstr ""
 
-#: src/main.c:2342
+#: src/main.c:2419
 msgid "-debug            : try to debug crashes (requires 'gdb' installed)\n"
 msgstr "-debug : skúsiť ladenie zlyhania (vyžaduje nainštalovaný 'gdb' )\n"
 
-#: src/main.c:2373 src/gui.c:1128
+#: src/main.c:2449 src/gui.c:1127
 msgid "Starting GUI..."
 msgstr "Spúšťam GUI..."
 
-#: src/main.c:2396
+#: src/main.c:2475
 #, c-format
 msgid ""
 "\n"
@@ -512,7 +516,7 @@
 "(Maybe you need to change the value of <prefix_dir> in your %s file)\n"
 msgstr ""
 
-#: src/main.c:2410
+#: src/main.c:2492
 #, c-format
 msgid ""
 "\n"
@@ -520,7 +524,7 @@
 "Please make sure you have write access to %s and try again.\n"
 msgstr ""
 
-#: src/main.c:2415
+#: src/main.c:2498
 msgid ""
 "\n"
 "`smogrify` must be in your path, and be executable\n"
@@ -534,7 +538,7 @@
 "Prosim, prečítajte si ešte raz súbor README dodaný s týmto balíčkom\n"
 "pred spustením LiVES.\n"
 
-#: src/main.c:2421
+#: src/main.c:2504
 #, c-format
 msgid ""
 "\n"
@@ -544,7 +548,7 @@
 "Please check the file permissions for this file and try again.\n"
 msgstr ""
 
-#: src/main.c:2428
+#: src/main.c:2512
 #, c-format
 msgid ""
 "\n"
@@ -555,7 +559,7 @@
 "and try again.\n"
 msgstr ""
 
-#: src/main.c:2438
+#: src/main.c:2522
 #, c-format
 msgid ""
 "Please check the <tempdir> setting in \n"
@@ -563,7 +567,7 @@
 "and try again.\n"
 msgstr ""
 
-#: src/main.c:2445
+#: src/main.c:2528
 #, c-format
 msgid ""
 "\n"
@@ -573,7 +577,7 @@
 "%s"
 msgstr ""
 
-#: src/main.c:2453
+#: src/main.c:2536
 msgid ""
 "\n"
 "An incorrect version of smogrify was found in your path.\n"
@@ -591,7 +595,7 @@
 "\n"
 "Ďakujem.\n"
 
-#: src/main.c:2458
+#: src/main.c:2541
 #, fuzzy
 msgid ""
 "\n"
@@ -602,7 +606,7 @@
 "LiVES momentálne vyžaduje k spusteniu 'mplayer' alebo 'sox'. Prosím "
 "nainštalujte jeden z uvedených a skúste opäť.\n"
 
-#: src/main.c:2462
+#: src/main.c:2546
 #, fuzzy
 msgid ""
 "\n"
@@ -613,7 +617,7 @@
 "LiVES momentálne vyžaduje k spusteniu 'mplayer' alebo 'sox'. Prosím "
 "nainštalujte jeden z uvedených a skúste opäť.\n"
 
-#: src/main.c:2472
+#: src/main.c:2556
 #, fuzzy
 msgid ""
 "\n"
@@ -624,7 +628,7 @@
 "LiVES nemôže nájsť 'mplayer'. Inštaláciou mplayer-a bude LiVES plne "
 "funkčný.\n"
 
-#: src/main.c:2475
+#: src/main.c:2561
 msgid ""
 "\n"
 "LiVES was unable to locate 'convert'. You should install convert and image-"
@@ -634,7 +638,7 @@
 "LiVES nemôže nájsť 'convert'. Mali by ste nainštalovať convert a image magic "
 "ak chcete využiť efekty vykresľovania.\n"
 
-#: src/main.c:2478
+#: src/main.c:2566
 msgid ""
 "\n"
 "LiVES was unable to locate 'composite'. You should install composite and "
@@ -644,7 +648,7 @@
 "LiVES nemôže nájsť 'composite'. Mali by ste nainštalovať composite a image "
 "magic ak chcete využiť funkciu  spájania.\n"
 
-#: src/main.c:2481
+#: src/main.c:2570
 msgid ""
 "\n"
 "LiVES was unable to locate 'sox'. Some audio features may not work. You "
@@ -654,7 +658,7 @@
 "LiVES nemôže nájsť 'sox'. Niektoré zvukové funkcie nebudú fungovať. Mali by "
 "ste nainštalovať 'sox'.\n"
 
-#: src/main.c:2484
+#: src/main.c:2575
 #, c-format
 msgid ""
 "\n"
@@ -665,59 +669,59 @@
 "You may need to change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/main.c:2611
+#: src/main.c:2707
 #, c-format
 msgid "Autoloading set %s..."
 msgstr "Automaticky načítavam %s..."
 
 #. TRANSLATORS: localised name may be used here
-#: src/main.c:2781 src/interface.c:738
+#: src/main.c:2902
 msgid "LiVES"
 msgstr ""
 
-#: src/main.c:2948
+#: src/main.c:3066
 #, c-format
 msgid "Invalid audio player %s\n"
 msgstr "Neplatný prehrávač zvuku %s\n"
 
-#: src/main.c:3077
+#: src/main.c:3214
 #, c-format
 msgid "LiVES-%s: <Untitled%d> %dx%d : %d frames %d bpp %.3f fps"
 msgstr "LiVES-%s: <Untitled%d> %dx%d : %d frames %d bpp %.3f fps"
 
-#: src/main.c:3082
+#: src/main.c:3219
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : ??? frames ??? bpp %.3f fps"
 msgstr "LiVES-%s: <%s> %dx%d : ??? snímky ??? bpp %.3f fps"
 
-#: src/main.c:3086
+#: src/main.c:3222
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : %d frames %d bpp %.3f fps"
 msgstr "LiVES-%s: <%s> %dx%d : %d snímky %d bpp %.3f fps"
 
-#: src/main.c:3094
+#: src/main.c:3229
 #, c-format
 msgid "LiVES-%s: <No File>"
 msgstr "LiVES-%s: <No File>"
 
 #. TRANSLATORS: rec(ord)
-#: src/main.c:5085
+#: src/main.c:5201
 #, c-format
 msgid "rec %9d/%d"
 msgstr "rec %9d/%d"
 
 #. TRANSLATORS: out of memory (rec(ord))
-#: src/main.c:5091
+#: src/main.c:5206
 #, c-format
 msgid "!rec %9d/%d"
 msgstr "!rec %9d/%d"
 
-#: src/main.c:5398 src/main.c:5399 src/gui.c:2110 src/gui.c:3220
-#: src/saveplay.c:2336
+#: src/main.c:5500 src/main.c:5501 src/gui.c:2108 src/gui.c:3331
+#: src/saveplay.c:2315
 msgid "Play"
 msgstr "Prehrať"
 
-#: src/main.c:6128
+#: src/main.c:6216
 msgid ""
 "LiVES was unable to capture this image\n"
 "\n"
@@ -725,35 +729,35 @@
 "LiVES nebol schopný zachytiť tento obrázok\n"
 "\n"
 
-#: src/main.c:6250
+#: src/main.c:6345
 #, c-format
 msgid "Closed file %s\n"
 msgstr "Zatvorený súbor %s\n"
 
-#: src/main.c:6452 src/gui.c:648 src/utils.c:4312 src/utils.c:4344
-#: src/saveplay.c:3550 src/multitrack.c:4510 src/multitrack.c:6268
+#: src/main.c:6542 src/gui.c:647 src/utils.c:4256 src/utils.c:4286
+#: src/saveplay.c:3500 src/multitrack.c:4678 src/multitrack.c:6447
 msgid "_Undo"
 msgstr "_Späť"
 
-#: src/main.c:6453 src/gui.c:666 src/utils.c:4313 src/utils.c:4345
-#: src/saveplay.c:3551 src/multitrack.c:4531 src/multitrack.c:6293
+#: src/main.c:6543 src/gui.c:665 src/utils.c:4257 src/utils.c:4287
+#: src/saveplay.c:3501 src/multitrack.c:4698 src/multitrack.c:6472
 msgid "_Redo"
 msgstr "_Znova"
 
-#: src/main.c:6493 src/interface.c:470 src/gui.c:2326 src/preferences.c:2357
-#: src/resample.c:1516
+#: src/main.c:6583 src/interface.c:457 src/gui.c:2324 src/preferences.c:2391
+#: src/resample.c:1488
 msgid "Video"
 msgstr "Video"
 
-#: src/main.c:6494 src/interface.c:483 src/gui.c:2351
+#: src/main.c:6584 src/interface.c:470 src/gui.c:2348
 msgid "Left Audio"
 msgstr "Ľavý audio kanál"
 
-#: src/main.c:6495 src/gui.c:2375
+#: src/main.c:6585 src/gui.c:2371
 msgid "Right Audio"
 msgstr "Pravý audio kanál"
 
-#: src/main.c:6540
+#: src/main.c:6630
 #, fuzzy
 msgid ""
 "\n"
@@ -768,11 +772,11 @@
 "prehrávač je nastavený mplayer.\n"
 "Prosím upravte nastavenia prehrávania v Nastaveniach a skúste opäť.\n"
 
-#: src/main.c:7051 src/plugins.c:1502
+#: src/main.c:7134 src/plugins.c:1468
 msgid "LiVES: - Play Window"
 msgstr "LiVES: - Okno prehrávania"
 
-#: src/startup.c:25
+#: src/startup.c:24
 #, c-format
 msgid ""
 "A directory named\n"
@@ -782,7 +786,7 @@
 "(Free space = %s)\n"
 msgstr ""
 
-#: src/startup.c:32
+#: src/startup.c:29
 #, c-format
 msgid ""
 "A directory named\n"
@@ -792,7 +796,7 @@
 "Please select another location.\n"
 msgstr ""
 
-#: src/startup.c:49
+#: src/startup.c:46
 #, c-format
 msgid ""
 "\n"
@@ -803,7 +807,7 @@
 "(Free space = %s)"
 msgstr ""
 
-#: src/startup.c:54
+#: src/startup.c:50
 #, c-format
 msgid ""
 "\n"
@@ -812,11 +816,11 @@
 "Please try again and choose a different location.\n"
 msgstr ""
 
-#: src/startup.c:96
+#: src/startup.c:92
 msgid "Directory name is too long !"
 msgstr "Názov adresára je príliš dlhý !"
 
-#: src/startup.c:223
+#: src/startup.c:216
 msgid ""
 "LiVES FAILED TO START YOUR SELECTED AUDIO PLAYER !\n"
 "\n"
@@ -824,7 +828,7 @@
 "LiVES NESPUSTIL VAMI VYBRANÝ PREHRÁVAČ ZVUKU !\n"
 "\n"
 
-#: src/startup.c:230
+#: src/startup.c:222
 msgid ""
 "Before starting LiVES, you need to choose an audio player.\n"
 "\n"
@@ -834,7 +838,7 @@
 "\n"
 "PULSE AUDIO je doporučené pre väčšinu používateľov"
 
-#: src/startup.c:233
+#: src/startup.c:225
 msgid ""
 ", but this version of LiVES was not compiled with pulse audio support.\n"
 "\n"
@@ -842,7 +846,7 @@
 ", ale táto verzia LiVES nebola kompilovaná pre podporu pulse audio.\n"
 "\n"
 
-#: src/startup.c:236
+#: src/startup.c:229
 msgid ""
 ", but you do not have pulse audio installed on your system.\n"
 " You are advised to install pulse audio first before running LiVES.\n"
@@ -852,11 +856,11 @@
 " Odporúčame nainštalovať pulse audio skôr, ako spustíte LiVES.\n"
 "\n"
 
-#: src/startup.c:241
+#: src/startup.c:233
 msgid "JACK audio is recommended for pro users"
 msgstr "JACK audio je doporučené pre skúsených používateľov"
 
-#: src/startup.c:244
+#: src/startup.c:236
 msgid ""
 ", but this version of LiVES was not compiled with jack audio support.\n"
 "\n"
@@ -864,7 +868,7 @@
 ", ale táto verzia LiVES nebola kompilovaná pre podporu jack audio.\n"
 "\n"
 
-#: src/startup.c:247
+#: src/startup.c:239
 msgid ""
 ", but you do not have jackd installed. You may wish to install jackd first "
 "before running LiVES.\n"
@@ -874,7 +878,7 @@
 "pred spustením LiVES.\n"
 "\n"
 
-#: src/startup.c:250
+#: src/startup.c:242
 msgid ""
 ", but may prevent LiVES from starting on some systems.\n"
 "If LiVES will not start with jack, you can restart and try with another "
@@ -886,13 +890,13 @@
 "zvuku.\n"
 "\n"
 
-#: src/startup.c:254
+#: src/startup.c:246
 msgid "SOX may be used if neither of the preceding players work, "
 msgstr ""
 "SOX, môže byť použitý, ak nefunguje ani jeden z predchádzajúcich "
 "prehrávačov, "
 
-#: src/startup.c:257
+#: src/startup.c:249
 msgid ""
 "but some audio features will be disabled.\n"
 "\n"
@@ -900,7 +904,7 @@
 "ale niektoré zvukové funkcie, budú zakázané.\n"
 "\n"
 
-#: src/startup.c:260
+#: src/startup.c:251
 msgid ""
 "but you do not have sox installed.\n"
 "You are advised to install it before running LiVES.\n"
@@ -910,7 +914,7 @@
 "Odporúčame nainštalovať ho pred spustením LiVES.\n"
 "\n"
 
-#: src/startup.c:264
+#: src/startup.c:255
 #, fuzzy
 msgid ""
 "The MPLAYER/MPLAYER2 audio player is only recommended for testing purposes.\n"
@@ -919,97 +923,97 @@
 "Prehrávač MPLAYER je doporučený len pre účely testovania.\n"
 "\n"
 
-#: src/startup.c:281
+#: src/startup.c:271
 msgid "LiVES: - Choose an audio player"
 msgstr "LiVES: - Vybrať audio prehrávač"
 
-#: src/startup.c:298
+#: src/startup.c:288
 msgid "Use _pulse audio player"
 msgstr "Použi _pulse audio prehrávač"
 
-#: src/startup.c:320
+#: src/startup.c:310
 msgid "Use _jack audio player"
 msgstr "Použi _jack audio prehrávač"
 
-#: src/startup.c:340
+#: src/startup.c:330
 msgid "Use _sox audio player"
 msgstr "Použi _sox audio prehrávač"
 
-#: src/startup.c:361
+#: src/startup.c:351
 msgid "Use _mplayer audio player"
 msgstr "Použi _mplayer audio prehrávač"
 
-#: src/startup.c:381
+#: src/startup.c:371
 #, fuzzy
 msgid "Use _mplayer2 audio player"
 msgstr "Použi _mplayer audio prehrávač"
 
-#: src/startup.c:405 src/startup.c:580 src/interface.c:1506
+#: src/startup.c:395 src/startup.c:569 src/interface.c:1398
 msgid "_Next"
 msgstr "_Nasledujúci"
 
-#: src/startup.c:445
+#: src/startup.c:435
 msgid "Skipped"
 msgstr "Preskočené"
 
-#: src/startup.c:460
+#: src/startup.c:450
 msgid "Passed"
 msgstr ""
 
-#: src/startup.c:493
+#: src/startup.c:483
 msgid "Failed"
 msgstr "Zlyhalo"
 
-#: src/startup.c:552
+#: src/startup.c:542
 msgid "LiVES: - Testing Configuration"
 msgstr "LiVES: - Testovacia konfigurácia"
 
-#: src/startup.c:555
+#: src/startup.c:544
 msgid "LiVES: - Troubleshoot"
 msgstr "LiVES: - Riešenie problémov"
 
-#: src/startup.c:568
+#: src/startup.c:557
 msgid "LiVES will now run some basic configuration tests\n"
 msgstr "LiVES teraz spustí jednoduché testy konfigurácie\n"
 
-#: src/startup.c:603
+#: src/startup.c:591
 msgid "Checking for \"sox\" presence"
 msgstr "Kontrola prítomnosti \"Sox\""
 
-#: src/startup.c:607
+#: src/startup.c:595
 msgid ""
 "You should install sox to be able to use all the audio features in LiVES"
 msgstr ""
 "Mali by ste nainštalovať sox, aby ste v LIVES mohli využívať všetky audio "
 "funkcie"
 
-#: src/startup.c:615
+#: src/startup.c:602
 msgid "Checking if sox can convert audio"
 msgstr "Kontrola, či sox dokáže konvertovať audio"
 
-#: src/startup.c:638
+#: src/startup.c:625
 msgid "Unable to allocate 176400 bytes memory."
 msgstr ""
 
-#: src/startup.c:653
+#: src/startup.c:639
 #, c-format
 msgid "Unable to write to: %s"
 msgstr ""
 
-#: src/startup.c:667 src/startup.c:807
+#: src/startup.c:653 src/startup.c:789
 #, c-format
 msgid "Command failed: %s"
 msgstr ""
 
-#: src/startup.c:689
+#: src/startup.c:675
 msgid "You should install sox_fmt_all or similar"
 msgstr "Mali by ste nainštalovať sox_fmt_all alebo podobné"
 
-#: src/startup.c:717
+#: src/startup.c:703
 msgid "Checking for \"mplayer\" presence"
 msgstr "Kontrola prítomnosti \"mplayer\""
 
-#: src/startup.c:721
+#: src/startup.c:707
 #, fuzzy
 msgid ""
 "You should install mplayer or mplayer2 to be able to use all the decoding "
@@ -1018,44 +1022,44 @@
 "Mali by ste nainštalovať mplayer, aby ste v LiVES mohli využívať všetky "
 "audio funkcie"
 
-#: src/startup.c:747
+#: src/startup.c:732
 msgid "Checking if mplayer can convert audio"
 msgstr "Kontrola, či mplayer dokáže konvertovať audio"
 
-#: src/startup.c:768
+#: src/startup.c:751
 #, fuzzy
 msgid "You should install mplayer or mplayer2 with pcm/wav support"
 msgstr "Mali by ste nainštalovať mplayer a podporou pcm/wav"
 
-#: src/startup.c:785
+#: src/startup.c:767
 msgid "Checking if mplayer can decode to png/alpha"
 msgstr "Kontrola, či mplayer dokáže dekódovať na png/alpha"
 
-#: src/startup.c:828
+#: src/startup.c:810
 msgid "You may wish to upgrade mplayer to a newer version"
 msgstr "Mali by ste aktualizovať mplayer na novšiu verziu"
 
-#: src/startup.c:854
+#: src/startup.c:836
 msgid "Checking if mplayer can decode to jpeg"
 msgstr "Kontrola, či mplayer dokáže dekódovať na jpeg"
 
-#: src/startup.c:882
+#: src/startup.c:862
 msgid "You should install mplayer with either png/alpha or jpeg support"
 msgstr "Mali by ste nainštalovať mplayer s podporou buď png/alfa alebo jpeg"
 
-#: src/startup.c:883
+#: src/startup.c:863
 msgid "You may wish to add jpeg output support to mplayer"
 msgstr "Možno budete chcieť pridať podporu jpeg pre mplayer"
 
-#: src/startup.c:892
+#: src/startup.c:872
 msgid "Checking for \"convert\" presence"
 msgstr "Kontrola prítomnosti \"convert\""
 
-#: src/startup.c:896
+#: src/startup.c:876
 msgid "Install imageMagick to be able to use all of the rendered effects"
 msgstr "Nainštalujte ImageMagick aby ste mohli využiť všetky poskytnuté efekty"
 
-#: src/startup.c:909
+#: src/startup.c:889
 msgid ""
 "\n"
 "\n"
@@ -1063,7 +1067,7 @@
 "Preferences/Decoding.    \n"
 msgstr ""
 
-#: src/startup.c:915
+#: src/startup.c:894
 msgid ""
 "\n"
 "\n"
@@ -1075,7 +1079,7 @@
 "    Kliknite na tlačidlo zrušiť pre ukončenie a nainštalovať chýbajúce "
 "súčasti, alebo ďalej pre pokračovanie    \n"
 
-#: src/startup.c:949
+#: src/startup.c:928
 msgid ""
 "\n"
 "\n"
@@ -1085,7 +1089,7 @@
 "\n"
 "Nakoniec si môžete vybrať predvolené rozhranie pre spustenie LiVES.\n"
 
-#: src/startup.c:950
+#: src/startup.c:929
 msgid ""
 "\n"
 "\n"
@@ -1095,7 +1099,7 @@
 "\n"
 "LiVES má dve hlavné rozhrania a môžete začať s niektorým z nich.\n"
 
-#: src/startup.c:951
+#: src/startup.c:930
 msgid ""
 "\n"
 "\n"
@@ -1105,28 +1109,28 @@
 "\n"
 "Predvolené možno kedykoľvek zmeniť v Nastaveniach.\n"
 
-#: src/startup.c:961
+#: src/startup.c:940
 msgid "LiVES: - Choose the startup interface"
 msgstr "LiVES: - Vyberte rozhranie pri spustení"
 
-#: src/startup.c:972
+#: src/startup.c:951
 msgid "Start in _Clip Edit mode"
 msgstr "Spustiť v móde Úprava _klipu"
 
-#: src/startup.c:975
+#: src/startup.c:954
 msgid "This is the best choice for simple editing tasks and for VJs\n"
 msgstr ""
 
-#: src/startup.c:981
+#: src/startup.c:960
 msgid "Start in _Multitrack mode"
 msgstr "Spustiť vo _Viacstopom móde"
 
-#: src/startup.c:983
+#: src/startup.c:962
 msgid ""
 "This is a better choice for complex editing tasks involving multiple clips.\n"
 msgstr ""
 
-#: src/startup.c:992
+#: src/startup.c:971
 msgid "_Finish"
 msgstr "_Dokončiť"
 
@@ -1143,38 +1147,38 @@
 msgid "Apply _Deinterlace"
 msgstr ""
 
-#: src/interface.c:66
+#: src/interface.c:65
 msgid "If this is set, frames will be deinterlaced as they are imported."
 msgstr ""
 "Ak je zapnuté, zo snímkov bude odstránené prekladanie tak, ako sú "
 "importované."
 
-#: src/interface.c:113 src/callbacks.c:9623 src/callbacks.c:9646
-#: src/callbacks.c:9647 src/gui.c:3223 src/gui.c:3821 src/saveplay.c:2339
-#: src/saveplay.c:3138 src/dialogs.c:1514 src/dialogs.c:1515
-#: src/dialogs.c:1746 src/dialogs.c:1747 src/framedraw.c:238
-#: src/multitrack.c:8031
+#: src/interface.c:106 src/callbacks.c:9542 src/callbacks.c:9564
+#: src/callbacks.c:9565 src/gui.c:3333 src/gui.c:3946 src/saveplay.c:2317
+#: src/saveplay.c:3097 src/dialogs.c:1575 src/dialogs.c:1576
+#: src/dialogs.c:1804 src/dialogs.c:1805 src/framedraw.c:236
+#: src/multitrack.c:8210
 msgid "Preview"
 msgstr "Náhľad"
 
-#: src/interface.c:132
+#: src/interface.c:125
 msgid "Click here to _Preview any selected video, image or audio file"
 msgstr ""
 "Kliknutím získate _náhľad vybraného videa, obrázku alebo zvukového súboru"
 
-#: src/interface.c:135
+#: src/interface.c:127
 msgid "Click here to _Preview any selected audio file"
 msgstr "Kliknutím zobrazíte _ukážku vybraných zvukových súborov"
 
-#: src/interface.c:138
+#: src/interface.c:129
 msgid "Click here to _Preview the video"
 msgstr "Kliknutím zobrazíte _ukážku vybraných video súborov"
 
-#: src/interface.c:181 src/dialogs.c:2542
+#: src/interface.c:169 src/dialogs.c:2621
 msgid "LiVES: - Processing..."
 msgstr "LiVES: -Spracovávanie..."
 
-#: src/interface.c:217
+#: src/interface.c:205
 msgid ""
 "\n"
 "\n"
@@ -1188,8 +1192,8 @@
 "\n"
 "Nezabudnite potom vypnúť efekty (ctrl-0) !"
 
-#: src/interface.c:222 src/callbacks.c:9373 src/callbacks.c:9420
-#: src/dialogs.c:2570
+#: src/interface.c:210 src/callbacks.c:9283 src/callbacks.c:9332
+#: src/dialogs.c:2649
 msgid ""
 "\n"
 "Please Wait"
@@ -1197,190 +1201,178 @@
 "\n"
 "Prosím čakajte"
 
-#: src/interface.c:242
+#: src/interface.c:230
 msgid "Show Details"
 msgstr ""
 
-#: src/interface.c:254 src/dialogs.c:2584
+#: src/interface.c:242 src/dialogs.c:2663
 msgid "_Enough"
 msgstr "_Dostatočne"
 
-#: src/interface.c:255 src/framedraw.c:278
+#: src/interface.c:243 src/framedraw.c:276
 msgid "_Preview"
 msgstr "_Náhľad"
 
-#: src/interface.c:257
+#: src/interface.c:245 src/callbacks.c:9282 src/callbacks.c:9330
 msgid "Paus_e"
 msgstr ""
 
-#: src/interface.c:258 src/callbacks.c:9417
+#: src/interface.c:246 src/callbacks.c:9329
 msgid "Pause/_Enough"
 msgstr ""
 
-#: src/interface.c:285
+#: src/interface.c:273
 msgid "_Cancel"
 msgstr "_Zrušiť"
 
-#: src/interface.c:374
+#: src/interface.c:361
 #, c-format
 msgid "LiVES: - %s"
 msgstr ""
 
-#: src/interface.c:376
+#: src/interface.c:363
 msgid "LiVES: - Multitrack details"
 msgstr ""
 
-#: src/interface.c:407
+#: src/interface.c:394
 msgid "Format"
 msgstr "Formátovanie"
 
-#: src/interface.c:412
+#: src/interface.c:399
 msgid "Frame size"
 msgstr "Veľkosť snímku"
 
-#: src/interface.c:417
+#: src/interface.c:404
 msgid "File size"
 msgstr "Veľkosť súboru"
 
-#: src/interface.c:418
+#: src/interface.c:405
 msgid "Byte size"
 msgstr "Veľkosť v bitoch"
 
-#: src/interface.c:423 src/interface.c:1891
+#: src/interface.c:410 src/interface.c:1760
 msgid "FPS"
 msgstr "FPS"
 
-#: src/interface.c:428
+#: src/interface.c:415
 msgid "Frames"
 msgstr "Snímky"
 
-#: src/interface.c:429
+#: src/interface.c:416
 msgid "Events"
 msgstr "Udalosti"
 
-#: src/interface.c:434 src/interface.c:500 src/interface.c:542
+#: src/interface.c:421 src/interface.c:486 src/interface.c:528
 msgid "Total time"
 msgstr "Celkový čas"
 
-#: src/interface.c:486 src/resample.c:1488
+#: src/interface.c:472 src/resample.c:1460
 msgid "Audio"
 msgstr "Zvuk"
 
-#: src/interface.c:511 src/interface.c:553
+#: src/interface.c:497 src/interface.c:539
 msgid "Rate/size"
 msgstr "Pomer/veľkosť"
 
-#: src/interface.c:530
+#: src/interface.c:516
 msgid "Right audio"
 msgstr "Zvuk vpravo"
 
-#: src/interface.c:622
+#: src/interface.c:607
 msgid "LiVES: - Encoding options"
 msgstr "LiVES: - nastavenie kódovania"
 
-#: src/interface.c:636
+#: src/interface.c:621
 msgid "<------------- (Check the box to re_size as suggested)"
 msgstr ""
 
-#: src/interface.c:637
+#: src/interface.c:622
 msgid "<------------- (Check the box to use the _size recommendation)"
 msgstr ""
 
-#: src/interface.c:662
+#: src/interface.c:646
 msgid "Use _letterboxing to maintain aspect ratio (optional)"
 msgstr ""
 
-#: src/interface.c:663
+#: src/interface.c:647
 msgid ""
 "Draw black rectangles either above or to the sides of the image, to prevent "
 "it from stretching."
 msgstr ""
 
-#: src/interface.c:694
+#: src/interface.c:677
 msgid "Keep _my settings"
 msgstr "Ponechať _moje nastavenia"
 
-#: src/interface.c:695
+#: src/interface.c:678
 msgid "Use _recommended settings"
 msgstr "Použiť _doporučené nastavenia"
 
-#: src/interface.c:775 src/dialogs.c:114
-msgid ""
-"Do _not show this warning any more\n"
-"(can be turned back on from Preferences/Warnings)"
-msgstr ""
-"_Nezobrazovať už toto upozornenie\n"
-"(zmenu nastavenia urobíte v Predvoľby/Upozornenia)"
-
-#: src/interface.c:787
-msgid "Show _Details"
-msgstr "Zobraziť_podrobnosti"
-
-#: src/interface.c:881
+#: src/interface.c:769
 msgid "_Close Window"
 msgstr "_Zatvoriť okno"
 
-#: src/interface.c:883
+#: src/interface.c:771
 msgid "_Save to file"
 msgstr "_Uložiť do súboru"
 
-#: src/interface.c:928
+#: src/interface.c:816
 msgid "LiVES: - Insert"
 msgstr "LiVES: - Vložiť"
 
-#: src/interface.c:945
+#: src/interface.c:833
 msgid "_Number of times to insert"
 msgstr "_Koľkokrát vložiť"
 
-#: src/interface.c:954
+#: src/interface.c:842
 msgid "_Insert to fit audio"
 msgstr "_Vložiť do dľžky zvuku"
 
-#: src/interface.c:968
+#: src/interface.c:856
 msgid "Insert _before selection"
 msgstr "Vložiť _pred výberom"
 
-#: src/interface.c:970
+#: src/interface.c:858
 msgid "Insert clipboard before selected frames"
 msgstr "Vložiť obsah stránky pred vybrané snímky"
 
-#: src/interface.c:986
+#: src/interface.c:875
 msgid "Insert _after selection"
 msgstr "Vložiť _za výber"
 
-#: src/interface.c:988
+#: src/interface.c:877
 msgid "Insert clipboard after selected frames"
 msgstr "Vložiť obsah stránky za vybrané snímky"
 
-#: src/interface.c:999
+#: src/interface.c:888
 msgid "Insert _with sound"
 msgstr "Vložiť _so zvukom"
 
-#: src/interface.c:1012
+#: src/interface.c:901
 msgid "Insert with_out sound"
 msgstr "Vložiť _bez zvuku"
 
-#: src/interface.c:1093
+#: src/interface.c:985
 msgid "LiVES: - Open Selection"
 msgstr "LiVES: - Otvoriť výber"
 
-#: src/interface.c:1111
+#: src/interface.c:1004
 msgid "Selection start time (sec)"
 msgstr ""
 
-#: src/interface.c:1117
+#: src/interface.c:1010
 msgid "Number of frames to open"
 msgstr ""
 
-#: src/interface.c:1193
+#: src/interface.c:1088
 msgid "LiVES: - Open Location"
 msgstr "LiVES: - Otvoriť umiestnenie"
 
-#: src/interface.c:1195
+#: src/interface.c:1090
 msgid "LiVES: - Open Youtube Clip"
 msgstr ""
 
-#: src/interface.c:1213
+#: src/interface.c:1109
 msgid ""
 "\n"
 "\n"
@@ -1396,7 +1388,7 @@
 "Tiež sa presvedčte, či máte nastavenú šírku pásma v Nastavenia|Streaming\n"
 "\n"
 
-#: src/interface.c:1216
+#: src/interface.c:1112
 msgid ""
 "\n"
 "\n"
@@ -1405,62 +1397,63 @@
 "\n"
 msgstr ""
 
-#: src/interface.c:1220
+#: src/interface.c:1116
 msgid ""
 "Enter the URL of the clip below.\n"
 "E.g: http://www.youtube.com/watch?v=WCR6f6WzjP8\n"
 "\n"
 msgstr ""
 
-#: src/interface.c:1231
+#: src/interface.c:1127
 msgid "URL : "
 msgstr "URL: "
 
-#: src/interface.c:1231
+#: src/interface.c:1127
 msgid "Youtube URL : "
 msgstr ""
 
-#: src/interface.c:1235
+#: src/interface.c:1131
 msgid "Do not send bandwidth information"
 msgstr "Neposielať informácie o šírke pásma"
 
-#: src/interface.c:1237
+#: src/interface.c:1133
 msgid "Try this setting if you are having problems getting a stream"
 msgstr "Ak máte problém s príjmom, skúste tieto nastavenia"
 
-#: src/interface.c:1258
+#: src/interface.c:1155
 msgid "Download to _Directory : "
 msgstr ""
 
-#: src/interface.c:1276
+#: src/interface.c:1173
 msgid "Download _File Name : "
 msgstr ""
 
-#: src/interface.c:1281
+#: src/interface.c:1178
 msgid ".webm"
 msgstr ""
 
-#: src/interface.c:1359
+#: src/interface.c:1256
 msgid "LiVES: - Rename Clip"
 msgstr "LiVES: - Premenovať klip"
 
-#: src/interface.c:1362
-msgid "LiVES: - Enter Set Name"
+#: src/interface.c:1258
+#, fuzzy
+msgid "LiVES: - Enter Set Name to Save as"
 msgstr "LiVES: - Zadajte názov zostavy"
 
-#: src/interface.c:1365
+#: src/interface.c:1260
 msgid "LiVES: - Enter a Set Name to Reload"
 msgstr ""
 
-#: src/interface.c:1368
+#: src/interface.c:1262
 msgid "LiVES: - Choose a Working Directory"
 msgstr "LiVES: - Vybrať Pracovný adresár"
 
-#: src/interface.c:1371
+#: src/interface.c:1264
 msgid "LiVES: - Rename Current Track"
 msgstr ""
 
-#: src/interface.c:1391
+#: src/interface.c:1283
 msgid ""
 "You need to enter a name for the current clip set.\n"
 "This will allow you reload the layout with the same clips later.\n"
@@ -1472,7 +1465,7 @@
 "Prosím napíšte názov zostavy, ktorý chcete použiť.\n"
 "LiVES Vám pripomenie uloženie zostavy pri ukončovaní.\n"
 
-#: src/interface.c:1397
+#: src/interface.c:1289
 msgid ""
 "In order to export this project, you must enter a name for this clip set.\n"
 "This will also be used for the project name.\n"
@@ -1481,7 +1474,7 @@
 "projekt.\n"
 "Ten bude použitý jako názov projektu.\n"
 
-#: src/interface.c:1404
+#: src/interface.c:1296
 msgid ""
 "Welcome to LiVES !\n"
 "This startup wizard will guide you through the\n"
@@ -1491,200 +1484,200 @@
 "Sprievodca spustením vás prevedie\n"
 "začiatkom inštalácie, aby ste získali čo najviac z tejto aplikácie.\n"
 
-#: src/interface.c:1408
+#: src/interface.c:1300
 msgid ""
 "\n"
 "First of all you need to choose a working directory for LiVES.\n"
 "This should be a directory with plenty of disk space available.\n"
 msgstr ""
 
-#: src/interface.c:1427
+#: src/interface.c:1317
 msgid "New name "
 msgstr "Nový názov "
 
-#: src/interface.c:1430
+#: src/interface.c:1319
 msgid "Set name "
 msgstr "Zadať názov "
 
-#: src/interface.c:1550
+#: src/interface.c:1435
 msgid "Use def_aults"
 msgstr ""
 
-#: src/interface.c:1553 src/interface.c:1840 src/preferences.c:2515
-#: src/preferences.c:2697
+#: src/interface.c:1437 src/interface.c:1709 src/preferences.c:2550
+#: src/preferences.c:2739
 msgid "_Advanced"
 msgstr "_Pokročilé"
 
-#: src/interface.c:1604
+#: src/interface.c:1487
 msgid "LiVES:- Select input device"
 msgstr ""
 
-#: src/interface.c:1622
+#: src/interface.c:1504
 msgid "Select input device:"
 msgstr ""
 
-#: src/interface.c:1686
+#: src/interface.c:1568
 msgid "LiVES:- Load CD Track"
 msgstr "LiVES:- Nahrajte CD stopu"
 
-#: src/interface.c:1689
+#: src/interface.c:1570
 msgid "LiVES:- Select DVD Title/Chapter"
 msgstr "LiVES:- Zvoliť DVD titul/kapitolu"
 
-#: src/interface.c:1692
+#: src/interface.c:1572
 msgid "LiVES:- Select VCD Title"
 msgstr "LiVES:- Zvoliť VCD titul"
 
-#: src/interface.c:1695
+#: src/interface.c:1574
 msgid "LiVES:- Change Maximum Visible Tracks"
 msgstr "LiVES:- Zmeniť maximum viditeľných stôp"
 
-#: src/interface.c:1698
+#: src/interface.c:1576
 msgid "LiVES:- Device details"
 msgstr "LiVES:- Podrobnosti zariadenia"
 
-#: src/interface.c:1721
+#: src/interface.c:1598
 #, c-format
 msgid "Track to load (from %s)"
 msgstr "Nahrať stopu (z %s)"
 
-#: src/interface.c:1724
+#: src/interface.c:1600
 msgid "DVD Title"
 msgstr "DVD titul"
 
-#: src/interface.c:1727
+#: src/interface.c:1602
 msgid "VCD Title"
 msgstr "VCD titul"
 
-#: src/interface.c:1730
+#: src/interface.c:1604
 msgid "Maximum number of tracks to display"
 msgstr "Maximálny počet zobrazených stôp"
 
-#: src/interface.c:1733
+#: src/interface.c:1606
 msgid "Device:        /dev/video"
 msgstr "Jednotka: /dev/video"
 
-#: src/interface.c:1736
+#: src/interface.c:1608
 msgid "Device:        fw:"
 msgstr "Jednotka: fw:"
 
-#: src/interface.c:1771
+#: src/interface.c:1641
 msgid "Chapter  "
 msgstr "Kapitola  "
 
-#: src/interface.c:1776
+#: src/interface.c:1645
 msgid "Channel  "
 msgstr "Kanál  "
 
-#: src/interface.c:1791
+#: src/interface.c:1660
 msgid "Audio ID  "
 msgstr "Audio ID  "
 
-#: src/interface.c:1857
+#: src/interface.c:1726
 msgid "Input number"
 msgstr ""
 
-#: src/interface.c:1865
+#: src/interface.c:1734
 msgid "Use default width, height and FPS"
 msgstr ""
 
-#: src/interface.c:1879
+#: src/interface.c:1748
 msgid "Width"
 msgstr ""
 
-#: src/interface.c:1885
+#: src/interface.c:1754
 msgid "Height"
 msgstr ""
 
-#: src/interface.c:1899
+#: src/interface.c:1768
 msgid "_Driver"
 msgstr ""
 
-#: src/interface.c:1902
+#: src/interface.c:1771
 msgid "_Output format"
 msgstr ""
 
-#: src/interface.c:1998
+#: src/interface.c:1865
 msgid "LiVES:- Fade Audio In"
 msgstr "LiVES:- Postupne zosilniť zvuk"
 
-#: src/interface.c:2001
+#: src/interface.c:1867
 msgid "LiVES:- Fade Audio Out"
 msgstr "LiVES:- Postupne zoslabiť zvuk"
 
-#: src/interface.c:2017
+#: src/interface.c:1883
 msgid "Fade in over  "
 msgstr "Zosilniť cez  "
 
-#: src/interface.c:2018
+#: src/interface.c:1884
 msgid "first"
 msgstr "prvý"
 
-#: src/interface.c:2021
+#: src/interface.c:1886
 msgid "Fade out over  "
 msgstr "Zoslabiť cez  "
 
-#: src/interface.c:2022
+#: src/interface.c:1887
 msgid "last"
 msgstr "posledný"
 
-#: src/interface.c:2044
+#: src/interface.c:1909
 msgid "seconds."
 msgstr "sekundy."
 
-#: src/interface.c:2052 src/saveplay.c:1507
+#: src/interface.c:1917 src/saveplay.c:1484
 msgid "selection"
 msgstr "výber"
 
-#: src/interface.c:2092
+#: src/interface.c:1956
 msgid "LiVES: - File Comments (optional)"
 msgstr "LiVES: - Komentár k súboru (nepovinné)"
 
-#: src/interface.c:2107
+#: src/interface.c:1971
 msgid "Title/Name : "
 msgstr "Titul/Názov : "
 
-#: src/interface.c:2114
+#: src/interface.c:1978
 msgid "Author/Artist : "
 msgstr "Autor/Umelec : "
 
-#: src/interface.c:2121
+#: src/interface.c:1985
 msgid "Comments : "
 msgstr "Komentáre : "
 
-#: src/interface.c:2151
+#: src/interface.c:2015
 msgid "_Options"
 msgstr ""
 
-#: src/interface.c:2158
+#: src/interface.c:2022
 msgid "Save _subtitles to file"
 msgstr ""
 
-#: src/interface.c:2170
+#: src/interface.c:2033
 msgid "Subtitle file"
 msgstr ""
 
-#: src/interface.c:2172
+#: src/interface.c:2035
 msgid "Browse..."
 msgstr ""
 
-#: src/interface.c:2255
+#: src/interface.c:2132
 msgid "LiVES: - choose a device"
 msgstr ""
 
-#: src/interface.c:2259
+#: src/interface.c:2135
 msgid "LiVES: - choose a directory"
 msgstr ""
 
-#: src/interface.c:2262
+#: src/interface.c:2137
 msgid "LiVES: - choose a file"
 msgstr ""
 
-#: src/interface.c:2445
+#: src/interface.c:2381
 msgid "LiVES: - Cancel/Discard/Save"
 msgstr "LiVES: - Zrušiť/odstrániť/uložiť"
 
-#: src/interface.c:2460
+#: src/interface.c:2397
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has not been saved.\n"
@@ -1694,7 +1687,7 @@
 "Súčasné zmeny neboli uložené.\n"
 "Čo chcete urobiť ?\n"
 
-#: src/interface.c:2463
+#: src/interface.c:2400
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has been changed since the last save.\n"
@@ -1704,7 +1697,7 @@
 "Súčasné zmeny boli zmenené od posledného uloženia.\n"
 "Čo chcete urobiť ?\n"
 
-#: src/interface.c:2467
+#: src/interface.c:2404
 msgid ""
 "You are about to exit LiVES.\n"
 "The current clip set can be saved.\n"
@@ -1714,7 +1707,7 @@
 "Súčasná zostava klipov nebola uložená.\n"
 "Čo chcete urobiť ?\n"
 
-#: src/interface.c:2468
+#: src/interface.c:2405
 msgid ""
 "The current clip set has not been saved.\n"
 "What would you like to do ?\n"
@@ -1722,7 +1715,7 @@
 "Súčasná zostava klipov nebola uložená.\n"
 "Čo chcete urobiť ?\n"
 
-#: src/interface.c:2472
+#: src/interface.c:2408
 msgid ""
 "The current layout has not been saved.\n"
 "What would you like to do ?\n"
@@ -1730,7 +1723,7 @@
 "Súčasné rozloženie nebolo uložené.\n"
 "Čo chcete urobiť ?\n"
 
-#: src/interface.c:2475
+#: src/interface.c:2410
 #, fuzzy
 msgid ""
 "The current layout has *not* been changed since it was last saved.\n"
@@ -1739,7 +1732,7 @@
 "Aktuálna usporiadanie sa nezmenilo, pretože bolo naposledy uložené.\n"
 "Čo chcete robiť?\n"
 
-#: src/interface.c:2480
+#: src/interface.c:2415
 msgid ""
 "The current layout contains generated frames and cannot be retained.\n"
 "You may wish to render it before exiting multitrack mode.\n"
@@ -1747,7 +1740,7 @@
 "Súčasné rozloženie obsahuje vytvorené snímky a nemôže byť zachované.\n"
 "Možno tak budete chcieť urobiť pred ukončením viacstopového režimu.\n"
 
-#: src/interface.c:2483
+#: src/interface.c:2418
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout contains generated frames and cannot be retained.\n"
@@ -1757,39 +1750,39 @@
 "Súčasné rozloženie obsahuje vytvorené snímky a nemôže byť zachované.\n"
 "Čo chcete urobiť ?"
 
-#: src/interface.c:2496
+#: src/interface.c:2431
 msgid "Clip set _name"
 msgstr "Zadať názov _klipu"
 
-#: src/interface.c:2502
+#: src/interface.c:2437
 msgid "_Auto reload next time"
 msgstr "_Automatické otvorenie pri ďaľšom  spusteni"
 
-#: src/interface.c:2538 src/interface.c:2547
+#: src/interface.c:2473 src/interface.c:2482
 msgid "_Wipe layout"
 msgstr "_Vymazať rozloženie"
 
-#: src/interface.c:2539
+#: src/interface.c:2474
 msgid "_Ignore changes"
 msgstr "_Ignorovať zmeny"
 
-#: src/interface.c:2540
+#: src/interface.c:2475
 msgid "_Delete clip set"
 msgstr "_Odstrániť zostavu klipov"
 
-#: src/interface.c:2541
+#: src/interface.c:2476
 msgid "_Delete layout"
 msgstr "_Odstrániť rozloženie"
 
-#: src/interface.c:2545
+#: src/interface.c:2480
 msgid "_Save layout"
 msgstr "_Uložiť rozloženie"
 
-#: src/interface.c:2546
+#: src/interface.c:2481
 msgid "_Save clip set"
 msgstr "_Uložiť zostavu klipov"
 
-#: src/interface.c:2565
+#: src/interface.c:2502
 msgid ""
 "\n"
 "LiVES has detected a multitrack layout from a previous session.\n"
@@ -1799,57 +1792,57 @@
 "LiVES zistil viacstopé rozloženie z predchádzajúceho sedenia.\n"
 "Chcete sa pokúsiť o jej obnovenie ?\n"
 
-#: src/interface.c:2589
+#: src/interface.c:2528
 msgid "LiVES: - Disk Recovery Options"
 msgstr ""
 
-#: src/interface.c:2608
+#: src/interface.c:2549
 msgid "Delete _Orphaned Clips"
 msgstr ""
 
-#: src/interface.c:2609
+#: src/interface.c:2550
 msgid "Delete any clips which are not currently loaded or part of a set"
 msgstr ""
 
-#: src/interface.c:2622
+#: src/interface.c:2564
 msgid "Clear _Backup Files from Closed Clips"
 msgstr ""
 
-#: src/interface.c:2633
+#: src/interface.c:2575
 msgid "Remove Sets which have _Layouts but no Clips"
 msgstr ""
 
-#: src/interface.c:2644
+#: src/interface.c:2586
 msgid "_Reset to Defaults"
 msgstr ""
 
-#: src/interface.c:2651
+#: src/interface.c:2593
 msgid "_Accept"
 msgstr ""
 
-#: src/callbacks.c:198
+#: src/callbacks.c:208
 #, c-format
 msgid "Saving as set %s..."
 msgstr "Uložiť ako zostavu %s..."
 
-#: src/callbacks.c:833
+#: src/callbacks.c:852
 msgid "Please enter the name of the file to save the clip as.\n"
 msgstr ""
 
-#: src/callbacks.c:841
+#: src/callbacks.c:860
 msgid "Please enter a valid URL for the download.\n"
 msgstr ""
 
-#: src/callbacks.c:867
+#: src/callbacks.c:886
 #, c-format
 msgid "Downloading %s to %s..."
 msgstr ""
 
-#: src/callbacks.c:895
+#: src/callbacks.c:912
 msgid "Downloading clip"
 msgstr ""
 
-#: src/callbacks.c:933
+#: src/callbacks.c:950
 msgid ""
 "\n"
 "LiVES was unable to download the clip.\n"
@@ -1857,11 +1850,11 @@
 "the latest youtube-dl installed.\n"
 msgstr ""
 
-#: src/callbacks.c:1114 src/callbacks.c:1149
+#: src/callbacks.c:1131 src/callbacks.c:1166
 msgid "This file"
 msgstr "Tento súbor"
 
-#: src/callbacks.c:1115
+#: src/callbacks.c:1132
 msgid ""
 ",\n"
 " - including the current layout - "
@@ -1869,7 +1862,7 @@
 ",\n"
 " - vrátane aktuálneho rozloženia - "
 
-#: src/callbacks.c:1117
+#: src/callbacks.c:1134
 #, c-format
 msgid ""
 "\n"
@@ -1884,7 +1877,7 @@
 "\n"
 "Skutočne ukončiť ?"
 
-#: src/callbacks.c:1119
+#: src/callbacks.c:1136
 #, c-format
 msgid ""
 "\n"
@@ -1899,14 +1892,14 @@
 "\n"
 "Skutočne chcete ukončiť ?"
 
-#: src/callbacks.c:1150
+#: src/callbacks.c:1167
 msgid ""
 "Changes made to this clip have not been saved or backed up.\n"
 "\n"
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1343
+#: src/callbacks.c:1356
 msgid ""
 "\n"
 "Invalid project file.\n"
@@ -1914,7 +1907,7 @@
 "\n"
 "Neplatný súbor projektu.\n"
 
-#: src/callbacks.c:1356
+#: src/callbacks.c:1370
 #, c-format
 msgid ""
 "\n"
@@ -1936,33 +1929,33 @@
 "vymažte.\n"
 "Ak to urobíte, potom môžete importovať nový projekt.\n"
 
-#: src/callbacks.c:1366
+#: src/callbacks.c:1381
 #, c-format
 msgid "Importing the project %s as set %s..."
 msgstr "Importujem projekt %s ako zostavu %s..."
 
-#: src/callbacks.c:1386
+#: src/callbacks.c:1399
 msgid "Importing project"
 msgstr "Importujem projekt"
 
-#: src/callbacks.c:1472
+#: src/callbacks.c:1481
 #, c-format
 msgid "Exporting project %s..."
 msgstr "Exportujem projekt %s..."
 
-#: src/callbacks.c:1490
+#: src/callbacks.c:1497
 msgid "Exporting project"
 msgstr "Exportujem projekt"
 
-#: src/callbacks.c:1506
+#: src/callbacks.c:1513
 msgid "Backup as .lv1 file"
 msgstr "Zálohovať ako .lv1 súbor"
 
-#: src/callbacks.c:1522
+#: src/callbacks.c:1529
 msgid "Restore .lv1 file"
 msgstr "Obnoviť .lv1 súbor"
 
-#: src/callbacks.c:1664
+#: src/callbacks.c:1671
 msgid ""
 "\n"
 "\n"
@@ -1974,72 +1967,77 @@
 "Zostava bude odstránená z disku.\n"
 "Ste si istý ?\n"
 
-#: src/callbacks.c:1725
+#: src/callbacks.c:1732
 #, c-format
 msgid "Deleting set %s..."
 msgstr ""
 
-#: src/callbacks.c:1727
+#: src/callbacks.c:1734
 msgid "Deleting set..."
 msgstr "Odstraňujem zostavu..."
 
-#: src/callbacks.c:1731
+#: src/callbacks.c:1738
 msgid "Deleting set"
 msgstr "Odstraňujem zostavu"
 
-#: src/callbacks.c:1739
+#: src/callbacks.c:1746
 #, c-format
 msgid "Set %s was permanently deleted from the disk.\n"
 msgstr "Zostava %s bola navždy odstránená z disku.\n"
 
-#: src/callbacks.c:1787 src/callbacks.c:11764
+#: src/callbacks.c:1792 src/callbacks.c:11676
 msgid "Insert Silence"
 msgstr "Vložiť ticho"
 
-#: src/callbacks.c:1840 src/callbacks.c:1923 src/callbacks.c:2086
+#: src/callbacks.c:1844 src/callbacks.c:1927 src/callbacks.c:2089
 msgid "Undoing"
 msgstr "Vraciam späť"
 
-#: src/callbacks.c:1936 src/callbacks.c:2147
+#: src/callbacks.c:1940 src/callbacks.c:2150
 msgid "Restoring audio..."
 msgstr "Obnovenie zvuku..."
 
-#: src/callbacks.c:1952
+#: src/callbacks.c:1956
 msgid "Clearing frame images"
 msgstr "Čistenie rámu obrázkov"
 
-#: src/callbacks.c:1985
+#: src/callbacks.c:1988
 msgid "Deleting excess frames"
 msgstr "Mazanie nadbytočných snímkov"
 
-#: src/callbacks.c:2229
+#: src/callbacks.c:2232
 #, c-format
 msgid "Length of video is now %d frames at %.3f frames per second.\n"
 msgstr "Dĺžka videa je teraz %d obrázkov pri %.3f snímkov za sekundu.\n"
 
-#: src/callbacks.c:2233 src/resample.c:683 src/resample.c:2166
+#: src/callbacks.c:2235 src/resample.c:678 src/resample.c:2133
 #, c-format
 msgid "Clipboard was resampled to %d frames.\n"
 msgstr "Schránka bola prevzorkovaná na %d snímkov.\n"
 
-#: src/callbacks.c:2394 src/callbacks.c:2423
+#: src/callbacks.c:2396 src/callbacks.c:2425
 msgid "Redoing"
 msgstr "Prestavba"
 
-#: src/callbacks.c:2462
-#, c-format
-msgid "Copying frames %d to %d%s to the clipboard..."
+#: src/callbacks.c:2472
+#, fuzzy, c-format
+msgid "Copying frames %d to %d (with sound) to the clipboard..."
+msgstr "Kopírovanie snímkov %dLiVES do %d%s do schránky..."
+
+#: src/callbacks.c:2474
+#, fuzzy, c-format
+msgid "Copying frames %d to %d to the clipboard..."
 msgstr "Kopírovanie snímkov %dLiVES do %d%s do schránky..."
 
-#: src/callbacks.c:2525
+#: src/callbacks.c:2526
 msgid "Copying to the clipboard"
 msgstr "Kopírovanie do schránky"
 
-#: src/callbacks.c:2600
+#: src/callbacks.c:2601
 msgid "Cut"
 msgstr "Vystrihnúť"
 
-#: src/callbacks.c:2641 src/callbacks.c:3068 src/callbacks.c:8026
+#: src/callbacks.c:2641 src/callbacks.c:3063 src/callbacks.c:7631
 #, fuzzy
 msgid "Pulling frames from clipboard"
 msgstr "Ťahanie snímkov z klipu"
@@ -2049,15 +2047,15 @@
 msgid "Pasting %d frames to new clip %s..."
 msgstr ""
 
-#: src/callbacks.c:2678
+#: src/callbacks.c:2676
 msgid "Pasting"
 msgstr "Vložiť"
 
-#: src/callbacks.c:2694
+#: src/callbacks.c:2692
 msgid "...added audio..."
 msgstr ""
 
-#: src/callbacks.c:2778
+#: src/callbacks.c:2775
 msgid ""
 "This operation requires resizing or converting of frames.\n"
 "Please install 'convert' from the Image-magick package, and then restart "
@@ -2066,7 +2064,7 @@
 "Táto operácia si vyžaduje zmenu veľkosti alebo konverziu snímok.\n"
 "Prosím, nainštalujte 'convert' z balíčka Image-magick a reštartujte LiVES.\n"
 
-#: src/callbacks.c:2795
+#: src/callbacks.c:2793
 msgid ""
 "\n"
 "\n"
@@ -2080,7 +2078,7 @@
 "Skúste označiť všetky snímky a potom použite \n"
 "Funkciu 'Trim Audio' z ponuky zvuku."
 
-#: src/callbacks.c:2819
+#: src/callbacks.c:2817
 msgid ""
 "LiVES cannot insert because the audio rates do not match.\n"
 "Please install 'sox', and try again."
@@ -2088,7 +2086,7 @@
 "LiVES nemohol vložiť pretože nesúhlasí pomer zvuku.\n"
 "Prosím nainštalujte 'sox' a skúste znova."
 
-#: src/callbacks.c:2838
+#: src/callbacks.c:2835
 msgid ""
 "\n"
 "Insertion will cause frames to shift in some multitrack layouts.\n"
@@ -2098,7 +2096,7 @@
 "Vložením dôjde k posunu snímkov v niektorých viacstopových rozmiestneniach.\n"
 "Skutočne chcete pokračovať ?\n"
 
-#: src/callbacks.c:2888 src/callbacks.c:11692
+#: src/callbacks.c:2883 src/callbacks.c:11606
 msgid ""
 "\n"
 "Insertion will cause audio to shift in some multitrack layouts.\n"
@@ -2108,11 +2106,11 @@
 "Vložením dôjde k posunu zvuku v niektorých viacstopových rozmiestneniach.\n"
 "Skutočne chcete pokračovať ?\n"
 
-#: src/callbacks.c:2996 src/callbacks.c:3025
+#: src/callbacks.c:2987 src/callbacks.c:3016
 msgid "Resampling clipboard audio"
 msgstr "Prevzorkovať zvuk v schránke"
 
-#: src/callbacks.c:3041
+#: src/callbacks.c:3032
 msgid ""
 "\n"
 "\n"
@@ -2124,7 +2122,7 @@
 "LiVES nemohol prevzokovať zvuk v schránke. \n"
 "Zvuk bol zo schránky vymazaný.\n"
 
-#: src/callbacks.c:3055
+#: src/callbacks.c:3045
 msgid ""
 "\n"
 "\n"
@@ -2138,30 +2136,30 @@
 "Chcete pokračovať s vložením \n"
 "nezmeneného zvuku ?\n"
 
-#: src/callbacks.c:3137 src/callbacks.c:3311
+#: src/callbacks.c:3132 src/callbacks.c:3299
 #, c-format
 msgid "Inserting %d%s frames from the clipboard..."
 msgstr "Vkladám %d%s snímkov zo schránky..."
 
-#: src/callbacks.c:3162 src/callbacks.c:3236 src/callbacks.c:3339
+#: src/callbacks.c:3155 src/callbacks.c:3224 src/callbacks.c:3325
 msgid "Inserting"
 msgstr "Vkladám"
 
-#: src/callbacks.c:3193
+#: src/callbacks.c:3187
 #, c-format
 msgid "Inserting %d times from the clipboard%s..."
 msgstr "Vložiť %d krát zo schránky%s..."
 
-#: src/callbacks.c:3200
+#: src/callbacks.c:3191
 #, c-format
 msgid "Inserting %d frames from the clipboard%s..."
 msgstr "Vloženie %d snímkov zo schránky%s..."
 
-#: src/callbacks.c:3418
+#: src/callbacks.c:3404
 msgid "Insert"
 msgstr "Vložiť"
 
-#: src/callbacks.c:3486
+#: src/callbacks.c:3471
 msgid ""
 "\n"
 "Deleting all frames will close this file.\n"
@@ -2171,7 +2169,7 @@
 "Odstránenie všetkých snímkov zatvorí súbor.\n"
 "Ste si istý ?"
 
-#: src/callbacks.c:3495
+#: src/callbacks.c:3480
 msgid ""
 "\n"
 "Deletion will cause missing frames in some multitrack layouts.\n"
@@ -2182,8 +2180,8 @@
 "rozdeleniach.\n"
 "Ste si istý, že chcete pokračovať ?\n"
 
-#: src/callbacks.c:3515 src/callbacks.c:10920 src/callbacks.c:11162
-#: src/callbacks.c:11228
+#: src/callbacks.c:3500 src/callbacks.c:10851 src/callbacks.c:11087
+#: src/callbacks.c:11152
 msgid ""
 "\n"
 "Deletion will cause missing audio in some multitrack layouts.\n"
@@ -2194,7 +2192,7 @@
 "rozdeleniach.\n"
 "Ste si istý, že chcete pokračovať ?\n"
 
-#: src/callbacks.c:3534
+#: src/callbacks.c:3519
 msgid ""
 "\n"
 "Deletion will cause frames to shift in some multitrack layouts.\n"
@@ -2204,7 +2202,7 @@
 "Odstránenie spôsobí posun snímkov v niektorých viacstopových rozdeleniach.\n"
 "Ste si istý, že chcete pokračovať ?\n"
 
-#: src/callbacks.c:3553 src/callbacks.c:11210
+#: src/callbacks.c:3538 src/callbacks.c:11134
 msgid ""
 "\n"
 "Deletion will cause audio to shift in some multitrack layouts.\n"
@@ -2214,20 +2212,20 @@
 "Odstránenie spôsobí posun zvuku v niektorých viacstopových rozdeleniach.\n"
 "Ste si istý, že chcete pokračovať ?\n"
 
-#: src/callbacks.c:3611
+#: src/callbacks.c:3597
 #, c-format
 msgid "Deleting frames %d to %d%s..."
 msgstr "Odstraňujem snímky %d do %d%s..."
 
-#: src/callbacks.c:3636
+#: src/callbacks.c:3619
 msgid "Deleting"
 msgstr "Odstraňuje sa"
 
-#: src/callbacks.c:3717
+#: src/callbacks.c:3699
 msgid "Delete"
 msgstr "Odstrániť"
 
-#: src/callbacks.c:3738
+#: src/callbacks.c:3717
 msgid ""
 "\n"
 "\n"
@@ -2237,7 +2235,7 @@
 "\n"
 "Výber je zamknutý.\n"
 
-#: src/callbacks.c:4092
+#: src/callbacks.c:4056
 msgid ""
 "Ready to record. Use 'control' and cursor keys during playback to record "
 "your performance.\n"
@@ -2249,11 +2247,11 @@
 "(Pre zrušenie, stlačte 'r' alebo kliknite na Prehrať|Nahrávať opäť pred "
 "prehraním.)\n"
 
-#: src/callbacks.c:4098
+#: src/callbacks.c:4061
 msgid "Record cancelled.\n"
 msgstr "Nahrávanie zrušené.\n"
 
-#: src/callbacks.c:4237
+#: src/callbacks.c:4197
 #, c-format
 msgid ""
 "\n"
@@ -2266,7 +2264,7 @@
 "Správy '%s' o rozšírení:\n"
 "%s\n"
 
-#: src/callbacks.c:4241
+#: src/callbacks.c:4200
 #, c-format
 msgid ""
 "\n"
@@ -2279,7 +2277,7 @@
 "Nedá sa nájsť 'init' metóda v %s rozšírení.\n"
 "Rozšírenie môže byť poškodené alebo nie je správne nainštalované."
 
-#: src/callbacks.c:4571
+#: src/callbacks.c:4532
 #, c-format
 msgid ""
 "Saving the set will cause copies of all loaded clips to remain on the disk"
@@ -2292,22 +2290,22 @@
 "\n"
 "Prosím stlačte 'Zrušit' ak nesúhlasíte.\n"
 
-#: src/callbacks.c:4654
+#: src/callbacks.c:4617
 #, c-format
 msgid "Saving set %s"
 msgstr "Uloženie zostavy %s"
 
-#: src/callbacks.c:5005
+#: src/callbacks.c:4964
 #, c-format
 msgid "Loading clips from set %s"
 msgstr "Načítavam klipy zo zostavy %s"
 
-#: src/callbacks.c:5093
+#: src/callbacks.c:5051
 #, c-format
 msgid "%d clips and %d layouts were recovered from set (%s).\n"
 msgstr ""
 
-#: src/callbacks.c:5312
+#: src/callbacks.c:5259
 msgid ""
 "LiVES will attempt to recover some disk space.\n"
 "You should ONLY run this if you have no other copies of LiVES running on "
@@ -2318,24 +2316,24 @@
 "Pokračujte IBA ak nemáte spustenú dalšiu kópiu LiVES.\n"
 "Pokračujete kliknutím na OK.\n"
 
-#: src/callbacks.c:5317
+#: src/callbacks.c:5264
 msgid "Cleaning up disk space..."
 msgstr "Čistenie disku..."
 
-#: src/callbacks.c:5387
+#: src/callbacks.c:5334
 msgid "Recovering disk space"
 msgstr ""
 
-#: src/callbacks.c:5439
+#: src/callbacks.c:5386
 #, c-format
 msgid "%s of disk space was recovered.\n"
 msgstr ""
 
-#: src/callbacks.c:5482
+#: src/callbacks.c:5428
 msgid "Resetting frame rates and frame values..."
 msgstr "Resetovanie hodnotenia snímkov a hodnoty snímkov..."
 
-#: src/callbacks.c:5523
+#: src/callbacks.c:5469
 #, c-format
 msgid ""
 "\n"
@@ -2343,12 +2341,12 @@
 "Internal: %s (%d bpp) / %s\n"
 msgstr ""
 
-#: src/callbacks.c:5525
+#: src/callbacks.c:5471
 msgid "buffered"
 msgstr ""
 
-#: src/callbacks.c:5538 src/callbacks.c:5557 src/callbacks.c:5575
-#: src/callbacks.c:5609
+#: src/callbacks.c:5484 src/callbacks.c:5502 src/callbacks.c:5518
+#: src/callbacks.c:5551
 msgid ""
 "\n"
 "  Opening..."
@@ -2356,7 +2354,7 @@
 "\n"
 "  Otváram..."
 
-#: src/callbacks.c:5545
+#: src/callbacks.c:5490
 #, c-format
 msgid ""
 "\n"
@@ -2365,7 +2363,7 @@
 "\n"
 "(%d virtuálnej)"
 
-#: src/callbacks.c:5548
+#: src/callbacks.c:5493
 #, c-format
 msgid ""
 "\n"
@@ -2374,7 +2372,7 @@
 "\n"
 "(%d dekódované)"
 
-#: src/callbacks.c:5560 src/callbacks.c:5578 src/callbacks.c:5612
+#: src/callbacks.c:5504 src/callbacks.c:5520 src/callbacks.c:5553
 #, c-format
 msgid ""
 "\n"
@@ -2383,7 +2381,7 @@
 "\n"
 "  %.2f sek."
 
-#: src/callbacks.c:5569
+#: src/callbacks.c:5512
 msgid ""
 "\n"
 "  Unknown"
@@ -2391,23 +2389,23 @@
 "\n"
 "  Neznáme"
 
-#: src/callbacks.c:5582 src/callbacks.c:5596
+#: src/callbacks.c:5524 src/callbacks.c:5538
 msgid "unsigned"
 msgstr "nepodpísané"
 
-#: src/callbacks.c:5583 src/callbacks.c:5597
+#: src/callbacks.c:5525 src/callbacks.c:5539
 msgid "signed"
 msgstr "podpísané"
 
-#: src/callbacks.c:5585 src/callbacks.c:5599
+#: src/callbacks.c:5527 src/callbacks.c:5541
 msgid "big-endian"
 msgstr "veľký-endian"
 
-#: src/callbacks.c:5586 src/callbacks.c:5600
+#: src/callbacks.c:5528 src/callbacks.c:5542
 msgid "little-endian"
 msgstr "malý-endian"
 
-#: src/callbacks.c:5588 src/callbacks.c:5602
+#: src/callbacks.c:5530 src/callbacks.c:5544
 #, c-format
 msgid ""
 "  %d Hz %d bit\n"
@@ -2416,7 +2414,7 @@
 "  %d Hz %d bit\n"
 "%s %s"
 
-#: src/callbacks.c:5707
+#: src/callbacks.c:5647
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -2433,22 +2431,22 @@
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA.\n"
 msgstr ""
 
-#: src/callbacks.c:5721
+#: src/callbacks.c:5661
 msgid "A video editor and VJ program."
 msgstr "Úprava videa a VJ program"
 
-#: src/callbacks.c:5722
+#: src/callbacks.c:5662
 msgid "About LiVES"
 msgstr ""
 
-#: src/callbacks.c:5724
+#: src/callbacks.c:5664
 msgid "translator_credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Milan Slovák https://launchpad.net/~milboys\n"
 "  salsaman https://launchpad.net/~salsaman"
 
-#: src/callbacks.c:5758
+#: src/callbacks.c:5699
 #, c-format
 msgid ""
 "LiVES Version %s\n"
@@ -2462,7 +2460,7 @@
 "Homepage: http://lives.sourceforge.net"
 msgstr ""
 
-#: src/callbacks.c:6037
+#: src/callbacks.c:5996
 #, fuzzy
 msgid ""
 "\n"
@@ -2473,7 +2471,7 @@
 "\n"
 "Je nutné nainštalovať mplayer, aby bol možný náhľad tohoto súboru.\n"
 
-#: src/callbacks.c:6040
+#: src/callbacks.c:5998
 #, fuzzy
 msgid ""
 "\n"
@@ -2485,221 +2483,212 @@
 "\n"
 "Je nutné nainštalovať mplayer, aby bol možný náhľad tohoto súboru.\n"
 
-#: src/callbacks.c:6423 src/callbacks.c:8289
-msgid ""
-"\n"
-"Loading new audio may cause missing audio in some multitrack layouts.\n"
-"Are you sure you wish to continue ?\n"
-"."
-msgstr ""
-"\n"
-"Načítanie nového zvuku môže spôsobiť stratenie zvuku v niektorých "
-"viacstopých rozloženiach. \n"
-"Naozaj chcete pokračovať?"
-
-#: src/callbacks.c:6523
-#, c-format
-msgid "Opening audio %s, type %s..."
-msgstr "Otváram zvuk %s, typ %s..."
-
-#: src/callbacks.c:6556 src/saveplay.c:480
-msgid "Opening audio"
-msgstr "Otváram zvuk"
-
-#: src/callbacks.c:6565 src/callbacks.c:6612 src/callbacks.c:8387
-#: src/callbacks.c:8429 src/callbacks.c:8472 src/callbacks.c:10846
-msgid "Cancelling"
-msgstr "Rušenie"
-
-#: src/callbacks.c:6660 src/callbacks.c:8514 src/callbacks.c:10876
-#: src/callbacks.c:11563
-msgid "Committing audio"
-msgstr "Vytvoriť zvuk"
-
-#: src/callbacks.c:6672 src/callbacks.c:8546
-msgid "New Audio"
-msgstr "Nový zvuk"
-
-#: src/callbacks.c:6779
+#: src/callbacks.c:6459
 #, c-format
 msgid ""
 "Text was saved as\n"
 "%s\n"
 msgstr ""
 
-#: src/callbacks.c:6951 src/saveplay.c:3618
-#, c-format
-msgid "%d frames are enough !\n"
-msgstr "%d snímkov je postačujúcich !\n"
-
-#: src/callbacks.c:7050
+#: src/callbacks.c:6706
 msgid "LiVES: - Encoder debug output"
 msgstr "LiVES: - Kódovač výstupu ladenia"
 
-#: src/callbacks.c:7087 src/gui.c:1922
+#: src/callbacks.c:6743 src/gui.c:1921
 msgid "Fullscreen playback (f)"
 msgstr "Prehranie na celej obrazovke (f)"
 
-#: src/callbacks.c:7089
+#: src/callbacks.c:6744
 msgid "Fullscreen playback off (f)"
 msgstr "Prehranie na celej obrazovke vypnuté (f)"
 
-#: src/callbacks.c:7188 src/callbacks.c:7336 src/callbacks.c:7664
-#: src/callbacks.c:7681 src/gui.c:3712 src/saveplay.c:2467 src/saveplay.c:2501
-#: src/saveplay.c:3115 src/saveplay.c:3220 src/saveplay.c:3239
-#: src/multitrack.c:9340 src/multitrack.c:11060
+#: src/callbacks.c:6841 src/callbacks.c:6983 src/callbacks.c:7283
+#: src/callbacks.c:7298 src/gui.c:3838 src/saveplay.c:2442 src/saveplay.c:2475
+#: src/saveplay.c:3074 src/saveplay.c:3178 src/saveplay.c:3197
+#: src/multitrack.c:9526 src/multitrack.c:11288
 #, c-format
 msgid " (%d %% scale)"
 msgstr ""
 
-#: src/callbacks.c:7190 src/callbacks.c:7338 src/callbacks.c:7666
-#: src/gui.c:3716 src/saveplay.c:2469 src/saveplay.c:2503
+#: src/callbacks.c:6843 src/callbacks.c:6985 src/callbacks.c:7285
+#: src/gui.c:3842 src/saveplay.c:2444 src/saveplay.c:2477
 #, c-format
 msgid "LiVES: - Play Window%s"
 msgstr ""
 
-#: src/callbacks.c:7302 src/gui.c:1907
+#: src/callbacks.c:6950 src/gui.c:1906
 msgid "Double size (d)"
 msgstr "Dvojitá veľkosť (d)"
 
-#: src/callbacks.c:7309
+#: src/callbacks.c:6956
 msgid "Single size (d)"
 msgstr "Vlastná veľkosť (d)"
 
-#: src/callbacks.c:7442 src/callbacks.c:7443
+#: src/callbacks.c:7087 src/callbacks.c:7088
 msgid "Hide the play window (s)"
 msgstr "Skryť okno s prehrávaním (s)"
 
-#: src/callbacks.c:7452 src/gui.c:1746
+#: src/callbacks.c:7096 src/gui.c:1744
 msgid "Show the play window (s)"
 msgstr "Zobraziť okno s prehrávaním (s)"
 
-#: src/callbacks.c:7453 src/gui.c:1896
+#: src/callbacks.c:7097 src/gui.c:1895
 msgid "Play in separate window (s)"
 msgstr "Prehrať v oddelenom okne (s)"
 
-#: src/callbacks.c:7535 src/gui.c:4060 src/saveplay.c:2498
+#: src/callbacks.c:7175 src/gui.c:4169 src/saveplay.c:2472
 msgid "LiVES: - Streaming"
 msgstr ""
 
-#: src/callbacks.c:7778
+#: src/callbacks.c:7388
 msgid "Switch continuous looping off (o)"
 msgstr "Vypnúť nekonečnú sľučku (o)"
 
-#: src/callbacks.c:7785 src/gui.c:1795
+#: src/callbacks.c:7394 src/gui.c:1793
 msgid "Switch continuous looping on (o)"
 msgstr "Zapnúť nekonečnú sľučku (o)"
 
-#: src/callbacks.c:7837
+#: src/callbacks.c:7444
 #, c-format
 msgid "Audio volume (%.2f)"
 msgstr "Hlasitosť zvuku (%.2f)"
 
-#: src/callbacks.c:7876 src/callbacks.c:7877 src/gui.c:3640
+#: src/callbacks.c:7483 src/callbacks.c:7484 src/gui.c:3766
 msgid "Unmute the audio (z)"
 msgstr "Zapnúť zvuk (z)"
 
-#: src/callbacks.c:7888 src/callbacks.c:7889 src/gui.c:1808 src/gui.c:3639
+#: src/callbacks.c:7494 src/callbacks.c:7495 src/gui.c:1806 src/gui.c:3765
 msgid "Mute the audio (z)"
 msgstr "Vypnúť zvuk (z)"
 
-#: src/callbacks.c:8038
+#: src/callbacks.c:7643
 msgid "Reversing clipboard..."
 msgstr "Vratná schránka..."
 
-#: src/callbacks.c:8052
+#: src/callbacks.c:7657
 msgid "Reversing clipboard"
 msgstr "Vratná schránka"
 
-#: src/callbacks.c:8084
+#: src/callbacks.c:7689
 msgid "LiVES: Load subtitles from..."
 msgstr ""
 
-#: src/callbacks.c:8151 src/saveplay.c:970
+#: src/callbacks.c:7753 src/saveplay.c:956
 #, c-format
 msgid "Loaded subtitle file: %s\n"
 msgstr ""
 
-#: src/callbacks.c:8220
+#: src/callbacks.c:7821
 msgid "Subtitles were erased.\n"
 msgstr ""
 
-#: src/callbacks.c:8239
+#: src/callbacks.c:7843
 msgid "LiVES: - Select Audio File"
 msgstr ""
 
-#: src/callbacks.c:8250
+#: src/callbacks.c:7878 src/callbacks.c:8232
+msgid ""
+"\n"
+"Loading new audio may cause missing audio in some multitrack layouts.\n"
+"Are you sure you wish to continue ?\n"
+"."
+msgstr ""
+"\n"
+"Načítanie nového zvuku môže spôsobiť stratenie zvuku v niektorých "
+"viacstopých rozloženiach. \n"
+"Naozaj chcete pokračovať?"
+
+#: src/callbacks.c:7989
+#, c-format
+msgid "Opening audio %s, type %s..."
+msgstr "Otváram zvuk %s, typ %s..."
+
+#: src/callbacks.c:8023 src/saveplay.c:477
+msgid "Opening audio"
+msgstr "Otváram zvuk"
+
+#: src/callbacks.c:8032 src/callbacks.c:8083 src/callbacks.c:8327
+#: src/callbacks.c:8369 src/callbacks.c:8412 src/callbacks.c:10766
+msgid "Cancelling"
+msgstr "Rušenie"
+
+#: src/callbacks.c:8137 src/callbacks.c:8454 src/callbacks.c:10803
+#: src/callbacks.c:11477
+msgid "Committing audio"
+msgstr "Vytvoriť zvuk"
+
+#: src/callbacks.c:8153 src/callbacks.c:8484
+msgid "New Audio"
+msgstr "Nový zvuk"
+
+#: src/callbacks.c:8194
 msgid "Please set your CD play device in Tools | Preferences | Misc\n"
 msgstr ""
 "Prosím nastavte si CD prehrávaciu jednotku v menu Nástroje | Nastavenie | "
 "Misc\n"
 
-#: src/callbacks.c:8321
+#: src/callbacks.c:8264
 #, c-format
 msgid "Opening CD track %d from %s..."
 msgstr "Otváranie stopy na CD %d od %s..."
 
-#: src/callbacks.c:8326
+#: src/callbacks.c:8267
 #, c-format
 msgid "CD track %d"
 msgstr "Stopa na CD %d"
 
-#: src/callbacks.c:8373
+#: src/callbacks.c:8313
 msgid "Opening CD track..."
 msgstr "Otváram stopu na CD..."
 
-#: src/callbacks.c:8415 src/callbacks.c:8461
+#: src/callbacks.c:8355 src/callbacks.c:8401
 msgid "Error loading CD track\n"
 msgstr "Chyba pri načítaní CD stopy\n"
 
-#: src/callbacks.c:8584
+#: src/callbacks.c:8518
 msgid "layout errors"
 msgstr "rozloženie chýb"
 
-#: src/callbacks.c:8595
+#: src/callbacks.c:8529
 msgid "Close _Window"
 msgstr "Zatvoriť _okno"
 
-#: src/callbacks.c:8606
+#: src/callbacks.c:8540
 msgid "Clear _Errors"
 msgstr "Vymazanie _chýb"
 
-#: src/callbacks.c:8617
+#: src/callbacks.c:8551
 msgid "_Delete affected layouts"
 msgstr "_Odstrániť postihnuté rozloženia"
 
-#: src/callbacks.c:9343 src/callbacks.c:9388
+#: src/callbacks.c:9253 src/callbacks.c:9298
 msgid "Resume"
 msgstr "Obnoviť"
 
-#: src/callbacks.c:9344
+#: src/callbacks.c:9254
 msgid ""
 "\n"
 "Paused\n"
 "(click Resume to continue processing)"
 msgstr ""
 
-#: src/callbacks.c:9345 src/callbacks.c:9406
+#: src/callbacks.c:9255 src/callbacks.c:9315
 msgid "paused..."
 msgstr "pozastavené..."
 
-#: src/callbacks.c:9372 src/callbacks.c:9418
-msgid "Pause"
-msgstr "Pauza"
-
-#: src/callbacks.c:9374 src/callbacks.c:9421
+#: src/callbacks.c:9284 src/callbacks.c:9333
 msgid "resumed..."
 msgstr "pokračovanie..."
 
-#: src/callbacks.c:9393
+#: src/callbacks.c:9303
 msgid "Keep"
 msgstr "Ponechať"
 
-#: src/callbacks.c:9396
+#: src/callbacks.c:9305
 msgid "Enough"
 msgstr ""
 
-#: src/callbacks.c:9401
+#: src/callbacks.c:9310
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2710,28 +2699,28 @@
 "\n"
 "Pauza"
 
-#: src/callbacks.c:9419
+#: src/callbacks.c:9331
 msgid "Cancel"
 msgstr "Zrušiť"
 
-#: src/callbacks.c:9558
+#: src/callbacks.c:9478
 msgid "Stop"
 msgstr ""
 
-#: src/callbacks.c:10053 src/multitrack.c:13247
+#: src/callbacks.c:9968 src/multitrack.c:13489
 msgid "LiVES: Selected frame"
 msgstr "LiVES: Vybraný snímok"
 
-#: src/callbacks.c:10061
+#: src/callbacks.c:9976
 msgid "_Save frame as..."
 msgstr ""
 
-#: src/callbacks.c:10290
+#: src/callbacks.c:10202
 #, c-format
 msgid "Audio is ahead of video by %.4f secs. at frame %d, with fps %.4f\n"
 msgstr ""
 
-#: src/callbacks.c:10347
+#: src/callbacks.c:10255
 msgid ""
 "\n"
 "\n"
@@ -2740,7 +2729,7 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10353
+#: src/callbacks.c:10261
 msgid ""
 "\n"
 "\n"
@@ -2753,7 +2742,7 @@
 "funkciu\n"
 "\n"
 
-#: src/callbacks.c:10429 src/callbacks.c:11479
+#: src/callbacks.c:10334 src/callbacks.c:11395
 msgid ""
 "\n"
 "Record time must be greater than 0.\n"
@@ -2761,7 +2750,7 @@
 "\n"
 "Nahrávací čas musí byť väčší ako 0.\n"
 
-#: src/callbacks.c:10440
+#: src/callbacks.c:10346
 msgid ""
 "Capture an External Window:\n"
 "\n"
@@ -2775,11 +2764,11 @@
 "Kliknite na 'Zrušiť' pre zrušenie\n"
 "\n"
 
-#: src/callbacks.c:10445
+#: src/callbacks.c:10351
 msgid "External window was released.\n"
 msgstr "Vonkajšie okno bola uvoľnené.\n"
 
-#: src/callbacks.c:10479
+#: src/callbacks.c:10385
 msgid ""
 "Click on a Window to Capture it\n"
 "Press 'q' to stop recording"
@@ -2787,7 +2776,7 @@
 "Kliknite na Okno pre nahrávanie\n"
 "Stlačte tlačidlo 'q' pre ukončenie nahrávania"
 
-#: src/callbacks.c:10513
+#: src/callbacks.c:10419
 #, c-format
 msgid ""
 "\n"
@@ -2802,19 +2791,19 @@
 "Stop nebo 'q' pre ukončenie.\n"
 "(Bude použité predvolené nastavenie %.3f snímkov za sekundu.)\n"
 
-#: src/callbacks.c:10539
+#: src/callbacks.c:10443
 msgid "LiVES was unable to capture this window. Sorry.\n"
 msgstr "LiVES nemôže zaznamenať toto okno. Prepáčte.\n"
 
-#: src/callbacks.c:10695
+#: src/callbacks.c:10601
 msgid "Export Selected Audio as..."
 msgstr "Exportovanie vybraného zvuku ako..."
 
-#: src/callbacks.c:10699
+#: src/callbacks.c:10604
 msgid "Export Audio as..."
 msgstr "Exportovať zvuk ako..."
 
-#: src/callbacks.c:10714
+#: src/callbacks.c:10619
 msgid ""
 "\n"
 "\n"
@@ -2828,86 +2817,86 @@
 "Kliknite na 'OK' pre export s novou rýchlosťou alebo 'Zrušiť' a exportovat "
 "originálnym pomerom.\n"
 
-#: src/callbacks.c:10720
+#: src/callbacks.c:10625
 #, c-format
 msgid "Exporting audio frames %d to %d as %s..."
 msgstr "Exportovanie zvukových snímkov %d do %d ako %s..."
 
-#: src/callbacks.c:10725
+#: src/callbacks.c:10629
 #, c-format
 msgid "Exporting audio as %s..."
 msgstr "Export zvuku ako %s..."
 
-#: src/callbacks.c:10751
+#: src/callbacks.c:10655
 msgid "Exporting audio"
 msgstr "Exportujem zvuk"
 
-#: src/callbacks.c:10782
+#: src/callbacks.c:10695
 msgid "LiVES: - Append Audio File"
 msgstr ""
 
-#: src/callbacks.c:10825
+#: src/callbacks.c:10739
 #, c-format
 msgid "Appending audio file %s..."
 msgstr "Pridávam zvukový súbor %s..."
 
-#: src/callbacks.c:10836
+#: src/callbacks.c:10756
 msgid "Appending audio"
 msgstr "Pridávam zvuk"
 
-#: src/callbacks.c:10892
+#: src/callbacks.c:10818
 msgid "Append Audio"
 msgstr "Pridať zvuk"
 
-#: src/callbacks.c:10952
+#: src/callbacks.c:10883
 #, c-format
 msgid "Padding audio to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10954
+#: src/callbacks.c:10885
 #, c-format
 msgid "Trimming audio from %.2f to %.2f seconds..."
 msgstr "Orezanie zvuku z %.2f to %.2f sekundy..."
 
-#: src/callbacks.c:10973
+#: src/callbacks.c:10904
 msgid "Trimming/Padding audio"
 msgstr "Orezanie/vyplnenie zvuku"
 
-#: src/callbacks.c:10981
+#: src/callbacks.c:10912
 msgid "Trim/Pad Audio"
 msgstr "Orezať/Doplniť zvuk"
 
-#: src/callbacks.c:11055
+#: src/callbacks.c:10982
 msgid "Fading audio in"
 msgstr "Zoslabovanie zvuku v"
 
-#: src/callbacks.c:11056
+#: src/callbacks.c:10983
 msgid "Fade audio in"
 msgstr "Zoslabujúci zvuk v"
 
-#: src/callbacks.c:11061
+#: src/callbacks.c:10987
 msgid "Fading audio out"
 msgstr "Stíšenie zvuku"
 
-#: src/callbacks.c:11062
+#: src/callbacks.c:10988
 msgid "Fade audio out"
 msgstr "Stíšiť zvuk"
 
-#: src/callbacks.c:11085
+#: src/callbacks.c:11011
 #, c-format
 msgid "%s over %.1f seconds..."
 msgstr "%s nad %.1f sekundy..."
 
-#: src/callbacks.c:11087
+#: src/callbacks.c:11013
 #, c-format
 msgid "%s from time %.2f seconds to %.2f seconds..."
 msgstr "%s od času %.2f sekúnd do %.2f sekúnd..."
 
-#: src/callbacks.c:11094
+#: src/callbacks.c:11020
 msgid "Fading audio..."
 msgstr "Stišovanie zvuku"
 
-#: src/callbacks.c:11194
+#: src/callbacks.c:11119
 msgid ""
 "\n"
 "Deleting all audio will close this file.\n"
@@ -2916,631 +2905,631 @@
 "\n"
 "Odstránenie všetkých zvukov zatvorí tento súbor."
 
-#: src/callbacks.c:11197
+#: src/callbacks.c:11122
 msgid "Deleting all audio..."
 msgstr "Odstránenie všetkých zvukov..."
 
-#: src/callbacks.c:11203
+#: src/callbacks.c:11127
 #, c-format
 msgid "Deleting audio from %.2f to %.2f seconds..."
 msgstr "Odstránenie zvuku od %.2f do %.2f sekundy..."
 
-#: src/callbacks.c:11290
+#: src/callbacks.c:11214
 msgid "Deleting Audio"
 msgstr "Odstraňujem zvuk"
 
-#: src/callbacks.c:11297
+#: src/callbacks.c:11221
 msgid "Delete Audio"
 msgstr "Odstrániť zvuk"
 
-#: src/callbacks.c:11636
+#: src/callbacks.c:11550
 msgid "Record new audio"
 msgstr "Nahrať nový zvuk"
 
-#: src/callbacks.c:11725
+#: src/callbacks.c:11640
 #, c-format
 msgid "Inserting silence from %.2f to %.2f seconds..."
 msgstr "Vložiť ticho od %.2f do %.2f sekundy..."
 
-#: src/callbacks.c:11754
+#: src/callbacks.c:11666
 msgid "Inserting Silence"
 msgstr "Vložiť ticho"
 
-#: src/merge.c:85
+#: src/merge.c:96
 msgid "LiVES: - Merge"
 msgstr "LiVES: - Spojiť"
 
-#: src/merge.c:102
+#: src/merge.c:113
 #, c-format
 msgid "Merge Clipboard [ %d Frames ]       With Selection [ %d Frames ]"
 msgstr "Zlúčiť schránku [ %d snímkov ] s výberom [ %d snímkov ]"
 
-#: src/merge.c:107
+#: src/merge.c:118
 #, c-format
 msgid ""
 "Merge Clipboard [ %d Frames (resampled) ]       With Selection [ %d Frames ]"
 msgstr ""
 "Zlúčiť schránku [ %d snímkov (prevzorkované) ] s výberom [ %d snímkov ]"
 
-#: src/merge.c:118
+#: src/merge.c:130
 msgid "Align _Starts"
 msgstr "Zosúladiť _Štart"
 
-#: src/merge.c:123
+#: src/merge.c:135
 msgid "Align _Ends"
 msgstr "Zosúladiť _Koniec"
 
-#: src/merge.c:134
+#: src/merge.c:146
 msgid "What to do with extra clipboard frames -"
 msgstr "Čo robiť s extra snímkami v schránke -"
 
-#: src/merge.c:137
+#: src/merge.c:149
 msgid "_Insert Frames"
 msgstr "_Vložiť snímky"
 
-#: src/merge.c:143
+#: src/merge.c:155
 msgid "_Drop Frames"
 msgstr "_Vyhodiť snímky"
 
-#: src/merge.c:149
+#: src/merge.c:160
 msgid "Number of Times to Loop Clipboard"
 msgstr "Počet opakovaní schránky"
 
-#: src/merge.c:160
+#: src/merge.c:171
 msgid "_Loop Clipboard to Fit Selection"
 msgstr ""
 
-#: src/merge.c:173
+#: src/merge.c:184
 msgid "_Transition Method:"
 msgstr "_Metóda prechodu:"
 
-#: src/merge.c:394
+#: src/merge.c:395
 msgid "Merging clipboard with selection..."
 msgstr "Zlúčiť schránku s výberom..."
 
-#: src/merge.c:551
+#: src/merge.c:539
 msgid "Merge done.\n"
 msgstr "Zlúčenie skončené.\n"
 
-#: src/gui.c:123
+#: src/gui.c:122
 msgid "_Custom Generators"
 msgstr ""
 
-#: src/gui.c:124
+#: src/gui.c:123
 msgid "_Custom Effects"
 msgstr "_Vlastné efekty"
 
-#: src/gui.c:125
+#: src/gui.c:124
 msgid "Custom _Utilities"
 msgstr "Vlastné _pomôcky"
 
-#: src/gui.c:352 src/multitrack.c:5964
+#: src/gui.c:351 src/multitrack.c:6143
 msgid "_File"
 msgstr "_Súbor"
 
-#: src/gui.c:367 src/multitrack.c:5989
+#: src/gui.c:366 src/multitrack.c:6168
 msgid "_Open File/Directory"
 msgstr "_Otvoriť súbor/Adresár"
 
-#: src/gui.c:373
+#: src/gui.c:372
 msgid "O_pen Part of File..."
 msgstr ""
 
-#: src/gui.c:379 src/gui.c:383 src/multitrack.c:6006 src/multitrack.c:6023
-#: src/multitrack.c:6028
+#: src/gui.c:378 src/gui.c:382 src/multitrack.c:6185 src/multitrack.c:6202
+#: src/multitrack.c:6207
 msgid "Open _Location/Stream..."
 msgstr "Otvoriť _umiestnenie/stream..."
 
-#: src/gui.c:393 src/multitrack.c:6016
+#: src/gui.c:392 src/multitrack.c:6195
 msgid "Open _Youtube Clip..."
 msgstr ""
 
-#: src/gui.c:404
+#: src/gui.c:403
 msgid "Import from _dvd/vcd..."
 msgstr ""
 
-#: src/gui.c:413
+#: src/gui.c:412
 msgid "Import from _dvd"
 msgstr ""
 
-#: src/gui.c:416
+#: src/gui.c:415
 msgid "Import from _vcd"
 msgstr ""
 
-#: src/gui.c:419
+#: src/gui.c:418
 msgid "_Import from Firewire"
 msgstr ""
 
-#: src/gui.c:428 src/multitrack.c:6086
+#: src/gui.c:427 src/multitrack.c:6265
 msgid "Import from _Firewire Device (dv)"
 msgstr "Importovať z _Firewire  jednotky (dv)"
 
-#: src/gui.c:429 src/multitrack.c:6094
+#: src/gui.c:428 src/multitrack.c:6273
 msgid "Import from _Firewire Device (hdv)"
 msgstr "Importovať z _Firewire  jednotky (hdv)"
 
-#: src/gui.c:457
+#: src/gui.c:456
 msgid "_Add Webcam/TV card..."
 msgstr ""
 
-#: src/gui.c:476
+#: src/gui.c:475
 msgid "Add _Unicap Device"
 msgstr ""
 
-#: src/gui.c:486
+#: src/gui.c:485
 msgid "Add Live _Firewire Device"
 msgstr "Pridať live _Firewire zariadenie"
 
-#: src/gui.c:495
+#: src/gui.c:494
 msgid "Add _TV Device"
 msgstr ""
 
-#: src/gui.c:510 src/multitrack.c:6117
+#: src/gui.c:509 src/multitrack.c:6296
 msgid "_Recent Files..."
 msgstr "_Nedávne súbory..."
 
-#: src/gui.c:560 src/multitrack.c:6177
+#: src/gui.c:559 src/multitrack.c:6356
 msgid "_Reload Clip Set..."
 msgstr "Znovu otvoriť sadu klipov..."
 
-#: src/gui.c:564 src/multitrack.c:6185
+#: src/gui.c:563 src/multitrack.c:6364
 msgid "Close/Sa_ve All Clips"
 msgstr "Zavrieť/Ul_ožiť všetky klipy"
 
-#: src/gui.c:575
+#: src/gui.c:574
 msgid "_Encode Clip As..."
 msgstr "_Dekódovať klip ako..."
 
-#: src/gui.c:577
+#: src/gui.c:576
 msgid "Encode _Selection As..."
 msgstr "Kódovať _výber ako..."
 
-#: src/gui.c:584
+#: src/gui.c:583
 msgid "_Close This Clip"
 msgstr "_Zavrieť tento klip"
 
-#: src/gui.c:595
+#: src/gui.c:594
 msgid "_Backup Clip as .lv1..."
 msgstr "_Zálohovať klip ako .lv1..."
 
-#: src/gui.c:604
+#: src/gui.c:603
 msgid "_Restore Clip from .lv1..."
 msgstr "_Obnoviť klip z .lv1..."
 
-#: src/gui.c:615
+#: src/gui.c:614
 msgid "Encode/Load/Backup _with Sound"
 msgstr "Kódovať/Otvoriť/Zálohovať _zo zvukom"
 
-#: src/gui.c:620
+#: src/gui.c:619
 msgid "Auto load subtitles"
 msgstr ""
 
-#: src/gui.c:628 src/multitrack.c:6224
+#: src/gui.c:627 src/multitrack.c:6403
 msgid "Clean _up Diskspace"
 msgstr "_Vyčistiť disk"
 
-#: src/gui.c:636 src/multitrack.c:6257
+#: src/gui.c:635 src/multitrack.c:6436
 msgid "_Edit"
 msgstr "_Upraviť"
 
-#: src/gui.c:685
+#: src/gui.c:684
 msgid "_MULTITRACK mode"
 msgstr "_VIACSTOPOVÝ režim"
 
-#: src/gui.c:696
+#: src/gui.c:695
 msgid "_Copy Selection"
 msgstr "_Kopírovať vybrané"
 
-#: src/gui.c:705
+#: src/gui.c:704
 msgid "Cu_t Selection"
 msgstr "Vy_strihnúť vybrané"
 
-#: src/gui.c:714
+#: src/gui.c:713
 msgid "_Insert from Clipboard..."
 msgstr "_Vloťiť zo schránky"
 
-#: src/gui.c:730
+#: src/gui.c:729
 msgid "Paste as _New"
 msgstr "Vložiť ako _nový"
 
-#: src/gui.c:739
+#: src/gui.c:738
 msgid "_Merge Clipboard with Selection..."
 msgstr "_Zlúčiť schránku s výberom..."
 
-#: src/gui.c:746
+#: src/gui.c:745
 msgid "_Delete Selection"
 msgstr "_Zmazať výber"
 
-#: src/gui.c:764
+#: src/gui.c:763
 msgid "Decouple _Video from Audio"
 msgstr "Oddeliť _Video od zvuku"
 
-#: src/gui.c:772
+#: src/gui.c:771
 msgid "_Select..."
 msgstr "_Vybrať..."
 
-#: src/gui.c:786
+#: src/gui.c:785
 msgid "Select _All Frames"
 msgstr "Vybrať všetky snímky"
 
-#: src/gui.c:794
+#: src/gui.c:793
 msgid "_Start Frame Only"
 msgstr "_Iba počiatočný snímok"
 
-#: src/gui.c:802
+#: src/gui.c:801
 msgid "_End Frame Only"
 msgstr "_Iba posledný snímok"
 
-#: src/gui.c:813
+#: src/gui.c:812
 msgid "Select from _First Frame"
 msgstr "Vybrať od _prvého snímku"
 
-#: src/gui.c:817
+#: src/gui.c:816
 msgid "Select to _Last Frame"
 msgstr "Vybrať do _posledného snímku"
 
-#: src/gui.c:821
+#: src/gui.c:820
 msgid "Select Last Insertion/_Merge"
 msgstr "Vybrať posledný vložený/_Zlúčiť"
 
-#: src/gui.c:825
+#: src/gui.c:824
 msgid "Select Last _Effect"
 msgstr "Vybrať posledný efekt"
 
-#: src/gui.c:829
+#: src/gui.c:828
 msgid "_Invert Selection"
 msgstr "_Obrátiť výber"
 
-#: src/gui.c:837
+#: src/gui.c:836
 msgid "_Lock Selection Width"
 msgstr "_Zamknúť šírku výberu"
 
-#: src/gui.c:842 src/multitrack.c:6409
+#: src/gui.c:841 src/multitrack.c:6591
 msgid "_Play"
 msgstr "_Prehrať"
 
-#: src/gui.c:854
+#: src/gui.c:853
 msgid "_Play All"
 msgstr "_Prehrať všetko"
 
-#: src/gui.c:869
+#: src/gui.c:868
 msgid "Pla_y Selection"
 msgstr "Pre_hrať výber"
 
-#: src/gui.c:877
+#: src/gui.c:876
 msgid "Play _Clipboard"
 msgstr "Prehrať _schránku"
 
-#: src/gui.c:899 src/multitrack.c:6441
+#: src/gui.c:898 src/multitrack.c:6623
 msgid "_Stop"
 msgstr "_Zastaviť"
 
-#: src/gui.c:914 src/multitrack.c:6453
+#: src/gui.c:913 src/multitrack.c:6635
 msgid "Re_wind"
 msgstr "Pre_vinúť"
 
-#: src/gui.c:946 src/multitrack.c:6471
+#: src/gui.c:945 src/multitrack.c:6653
 msgid "_Full Screen"
 msgstr "Na _celú obrazovku"
 
-#: src/gui.c:955
+#: src/gui.c:954
 msgid "_Double Size"
 msgstr "_Dvojitá veľkosť"
 
-#: src/gui.c:963 src/multitrack.c:6479
+#: src/gui.c:962 src/multitrack.c:6661
 msgid "Play in _Separate Window"
 msgstr "Prehrať v _oddelenom okne"
 
-#: src/gui.c:972
+#: src/gui.c:971
 msgid "_Blank Background"
 msgstr "_Prázdne pozadie"
 
-#: src/gui.c:979
+#: src/gui.c:978
 msgid "(Auto)_loop Video (to fit audio track)"
 msgstr "(Automaticky)_opakovať video (vyplniť podľa zvuku)"
 
-#: src/gui.c:988 src/multitrack.c:6487
+#: src/gui.c:987 src/multitrack.c:6669
 msgid "L_oop Continuously"
 msgstr "Ne_pretržitá sľučka"
 
-#: src/gui.c:997
+#: src/gui.c:996
 msgid "Pin_g Pong Loops"
 msgstr "Pin_g Pong sľučky"
 
-#: src/gui.c:1005 src/multitrack.c:6495
+#: src/gui.c:1004 src/multitrack.c:6677
 msgid "_Mute"
 msgstr "_Ztlmiť zvuk"
 
-#: src/gui.c:1017
+#: src/gui.c:1016
 msgid "Separate Window 'S_ticky' Mode"
 msgstr "Oddelené okno 'L_epivý' mód"
 
-#: src/gui.c:1025
+#: src/gui.c:1024
 msgid "S_how Frame Counter"
 msgstr "U_káž počítadlo snímkov"
 
-#: src/gui.c:1035
+#: src/gui.c:1034
 msgid "Show Subtitles"
 msgstr ""
 
-#: src/gui.c:1045
+#: src/gui.c:1044
 msgid "Letterbox mode"
 msgstr ""
 
-#: src/gui.c:1051 src/multitrack.c:6507
+#: src/gui.c:1050 src/multitrack.c:6689
 msgid "Effect_s"
 msgstr "Efekt_y"
 
-#: src/gui.c:1054
+#: src/gui.c:1053
 msgid "Effects are applied to the current selection."
 msgstr "Efekty sú pužité na súčasný výber."
 
-#: src/gui.c:1067
+#: src/gui.c:1066
 msgid "_Run Test Rendered Effect/Tool/Generator..."
 msgstr "_Spustiť test Vykresľovanie efektov/Nástroje/Generátor..."
 
-#: src/gui.c:1072 src/multitrack.c:7123
+#: src/gui.c:1071 src/multitrack.c:7299
 msgid "_Tools"
 msgstr "_Nástroje"
 
-#: src/gui.c:1075
+#: src/gui.c:1074
 msgid "Tools are applied to complete clips."
 msgstr "Nástroje sú použité na dokončenie klipov."
 
-#: src/gui.c:1085
+#: src/gui.c:1084
 msgid "_Reverse Clipboard"
 msgstr "_Otočiť schránku"
 
-#: src/gui.c:1094
+#: src/gui.c:1093
 msgid "_Change Playback/Save Speed..."
 msgstr "_Zmeniť prehrávanie/Uložiť rýchlosť"
 
-#: src/gui.c:1099
+#: src/gui.c:1098
 msgid "Resample _Video to New Frame Rate..."
 msgstr "Prevzorkovať _video na nový pomer..."
 
-#: src/gui.c:1105
+#: src/gui.c:1104
 msgid "_Utilities"
 msgstr "_Nástroje"
 
-#: src/gui.c:1110
+#: src/gui.c:1109
 msgid "Custom _Tools"
 msgstr "Vlastné _nástroje"
 
-#: src/gui.c:1116 src/multitrack.c:7149
+#: src/gui.c:1115 src/multitrack.c:7325
 msgid "_Generate"
 msgstr "Vy_generovať"
 
-#: src/gui.c:1126
+#: src/gui.c:1125
 msgid "Loading rendered effect plugins..."
 msgstr "Spúšťam rozšírenie vykresľovanie efektov"
 
-#: src/gui.c:1139
+#: src/gui.c:1138
 msgid "Load _Subtitles from File..."
 msgstr ""
 
-#: src/gui.c:1144
+#: src/gui.c:1143
 msgid "Erase subtitles"
 msgstr ""
 
-#: src/gui.c:1152 src/multitrack.c:7158
+#: src/gui.c:1151 src/multitrack.c:7334
 msgid "Capture _External Window... "
 msgstr "Zachytiť _externé okno "
 
-#: src/gui.c:1159 src/multitrack.c:7173
+#: src/gui.c:1158 src/multitrack.c:7349
 msgid "_Preferences..."
 msgstr "_Predvoľby..."
 
-#: src/gui.c:1172
+#: src/gui.c:1171
 msgid "_Audio"
 msgstr "_Zvuk"
 
-#: src/gui.c:1184
+#: src/gui.c:1183
 msgid "Load _New Audio for Clip..."
 msgstr "Nahrať _nový zvuk pre klip ..."
 
-#: src/gui.c:1190
+#: src/gui.c:1189
 msgid "Load _CD Track..."
 msgstr "Nahrať _CD stopu..."
 
-#: src/gui.c:1191
+#: src/gui.c:1190
 msgid "E_ject CD"
 msgstr "V_ysunúť CD"
 
-#: src/gui.c:1205
+#: src/gui.c:1204
 msgid "Record E_xternal Audio..."
 msgstr "Nahrávanie e_xterného zvuku..."
 
-#: src/gui.c:1218
+#: src/gui.c:1217
 msgid "to New _Clip..."
 msgstr "do nového _klipu..."
 
-#: src/gui.c:1222
+#: src/gui.c:1221
 msgid "to _Selection"
 msgstr "do _výberu"
 
-#: src/gui.c:1230
+#: src/gui.c:1229
 msgid "Fade Audio _In..."
 msgstr "_Zosilniť zvuk..."
 
-#: src/gui.c:1234
+#: src/gui.c:1233
 msgid "Fade Audio _Out..."
 msgstr "_Zoslabiť zvuk..."
 
-#: src/gui.c:1244
+#: src/gui.c:1243
 msgid "_Export Audio..."
 msgstr "_Exportovať zvuk..."
 
-#: src/gui.c:1257
+#: src/gui.c:1256
 msgid "Export _Selected Audio..."
 msgstr "_Exportovať _vybraný zvuk..."
 
-#: src/gui.c:1261
+#: src/gui.c:1260
 msgid "Export _All Audio..."
 msgstr "_Exportovať _všetky zvuky..."
 
-#: src/gui.c:1265
+#: src/gui.c:1264
 msgid "_Append Audio..."
 msgstr "_Pripojiť zvuk..."
 
-#: src/gui.c:1270
+#: src/gui.c:1269
 msgid "_Trim/Pad Audio..."
 msgstr ""
 
-#: src/gui.c:1283
+#: src/gui.c:1282
 msgid "Trim/Pad Audio to _Selection"
 msgstr ""
 
-#: src/gui.c:1288
+#: src/gui.c:1287
 msgid "Trim/Pad Audio from Beginning to _Play Start"
 msgstr ""
 
-#: src/gui.c:1293
+#: src/gui.c:1292
 msgid "_Delete Audio..."
 msgstr "_Odstrániť zvuk..."
 
-#: src/gui.c:1306
+#: src/gui.c:1305
 msgid "Delete _Selected Audio"
 msgstr "Odstrániť _vybraný zvuk..."
 
-#: src/gui.c:1310
+#: src/gui.c:1309
 msgid "Delete _All Audio"
 msgstr "Odstrániť _všetky zvuky..."
 
-#: src/gui.c:1314
+#: src/gui.c:1313
 msgid "Insert _Silence in Selection"
 msgstr "Vložiť _ticho vo vybranom"
 
-#: src/gui.c:1319
+#: src/gui.c:1318
 msgid "_Resample Audio..."
 msgstr "_Prevzorkovať zvuk..."
 
-#: src/gui.c:1324
+#: src/gui.c:1323
 msgid "_Info"
 msgstr "_Informácie"
 
-#: src/gui.c:1336
+#: src/gui.c:1335
 msgid "Show Clip _Info"
 msgstr "Zobraziť informáciu o _klipe"
 
-#: src/gui.c:1344
+#: src/gui.c:1343
 msgid "Show/_Edit File Comments"
 msgstr "Zobraziť/ _Upraviť komentáre k súboru"
 
-#: src/gui.c:1349
+#: src/gui.c:1348
 msgid "Show _Clipboard Info"
 msgstr "Zobraziť informáciu o _schránke"
 
-#: src/gui.c:1360 src/multitrack.c:7286
+#: src/gui.c:1359 src/multitrack.c:7462
 msgid "Show _Messages"
 msgstr "Zobraziť _správy"
 
-#: src/gui.c:1364 src/multitrack.c:7365
+#: src/gui.c:1363 src/multitrack.c:7541
 msgid "Show _Layout Errors"
 msgstr "Zobraziť chyby _rozloženia"
 
-#: src/gui.c:1369 src/multitrack.c:7263
+#: src/gui.c:1368 src/multitrack.c:7439
 msgid "_Clips"
 msgstr "_Klipy"
 
-#: src/gui.c:1381
+#: src/gui.c:1380
 msgid "_Rename Current Clip in Menu..."
 msgstr "_Premenovať aktuálny klip v menu..."
 
-#: src/gui.c:1399
+#: src/gui.c:1398
 msgid "A_dvanced"
 msgstr "Po_kročilé"
 
-#: src/gui.c:1412
+#: src/gui.c:1411
 msgid "_RFX Effects/Tools/Utilities"
 msgstr "_RFX Efekty/Nástroje/Pomôcky"
 
-#: src/gui.c:1424
+#: src/gui.c:1423
 msgid "_New Test RFX Script..."
 msgstr "_Nový test RFX skriptu..."
 
-#: src/gui.c:1428
+#: src/gui.c:1427
 msgid "_Copy RFX Script to Test..."
 msgstr "_Koirovať RFX skript do testu..."
 
-#: src/gui.c:1432
+#: src/gui.c:1431
 msgid "_Edit Test RFX Script..."
 msgstr "_Upraviť test RFX skriptu..."
 
-#: src/gui.c:1436
+#: src/gui.c:1435
 msgid "Rena_me Test RFX Script..."
 msgstr "Premeno_vať test RFT skriptu..."
 
-#: src/gui.c:1440
+#: src/gui.c:1439
 msgid "_Delete Test RFX Script..."
 msgstr "_Odstrániť test RFX skriptu..."
 
-#: src/gui.c:1450
+#: src/gui.c:1449
 msgid "_Promote Test Rendered Effect/Tool/Generator..."
 msgstr ""
 
-#: src/gui.c:1457
+#: src/gui.c:1456
 msgid "_Import Custom RFX script..."
 msgstr "_Importovať vlastný RFX skript..."
 
-#: src/gui.c:1461
+#: src/gui.c:1460
 msgid "E_xport Custom RFX script..."
 msgstr "E_xportovať vlastný RFX skript..."
 
-#: src/gui.c:1465
+#: src/gui.c:1464
 msgid "De_lete Custom RFX Script..."
 msgstr "Od_strániť vlastný RFX skript..."
 
-#: src/gui.c:1472
+#: src/gui.c:1471
 msgid "Re_build all RFX plugins"
 msgstr "Re_konštruovať všetky RFX rozšírenia"
 
-#: src/gui.c:1501
+#: src/gui.c:1498
 msgid "Receive _LiVES stream from..."
 msgstr "Získať _LiVES stream od..."
 
-#: src/gui.c:1506
+#: src/gui.c:1503
 msgid "_Send LiVES stream to..."
 msgstr "_Poslať LiVES stream do..."
 
-#: src/gui.c:1515
+#: src/gui.c:1512
 #, c-format
 msgid "Open _yuv4mpeg stream on %sstream.yuv..."
 msgstr "Otvoriť _yuv4mpeg stream na %sstream.yuv"
 
-#: src/gui.c:1536
+#: src/gui.c:1534
 msgid "_Import Project (.lv2)..."
 msgstr "_Importovať projekt (.lv2)..."
 
-#: src/gui.c:1540
+#: src/gui.c:1538
 msgid "E_xport Project (.lv2)..."
 msgstr "E_xportovať projekt (.lv2)..."
 
-#: src/gui.c:1545
+#: src/gui.c:1543
 msgid "_VJ"
 msgstr "_VJ"
 
-#: src/gui.c:1557
+#: src/gui.c:1555
 msgid "Real Time _Effect Mapping"
 msgstr "Mapovanie real time _efektu"
 
-#: src/gui.c:1563
+#: src/gui.c:1561
 msgid "Bind real time effects to ctrl-number keys."
 msgstr "Priradiť real time efekty k ctrl-numerickým klávesam."
 
-#: src/gui.c:1565
+#: src/gui.c:1563
 msgid "Set Real Time Effect _Defaults"
 msgstr "Nastaviť _predvolený real time efekt"
 
-#: src/gui.c:1567
+#: src/gui.c:1565
 msgid "Set default parameter values for real time effects."
 msgstr "Nastaviť _predvolenú hodnotu pre real time efekty."
 
-#: src/gui.c:1580
+#: src/gui.c:1578
 msgid "Save Real Time Effect _Defaults"
 msgstr "Uložiť _predvolený real time efekt"
 
-#: src/gui.c:1583
+#: src/gui.c:1581
 msgid ""
 "Save real time effect defaults so they will be restored each time you use "
 "LiVES."
@@ -3548,146 +3537,146 @@
 "Uložiť predvolené hodnoty real time efektov, budú použité pri každom "
 "spustení LiVES."
 
-#: src/gui.c:1589
+#: src/gui.c:1587
 msgid "_Reset all playback speeds and positions"
 msgstr "_Resetovať všetky rýchlosti prehrávania a pozícií"
 
-#: src/gui.c:1592
+#: src/gui.c:1590
 msgid ""
 "Reset all playback positions to frame 1, and reset all playback frame rates."
 msgstr ""
 "Resetovanie všetkých prehraných pozícií na snímok 1 a resetovanie všetkých "
 "prehraných snímkov."
 
-#: src/gui.c:1594
+#: src/gui.c:1592
 msgid "_MIDI/joystick interface"
 msgstr "Rozhranie _MIDI/Joystick"
 
-#: src/gui.c:1609
+#: src/gui.c:1607
 msgid "_MIDI/joystick learner..."
 msgstr ""
 
-#: src/gui.c:1614
+#: src/gui.c:1612
 msgid "_Save device mapping..."
 msgstr "_Uložiť mapu zariadenia..."
 
-#: src/gui.c:1620
+#: src/gui.c:1618
 msgid "_Load device mapping..."
 msgstr "_Načítať mapu zariadenia..."
 
-#: src/gui.c:1628
+#: src/gui.c:1626
 msgid "Show VJ _Keys"
 msgstr "Zobraziť VJ _\tKlávesy"
 
-#: src/gui.c:1632
+#: src/gui.c:1630
 msgid "To_ys"
 msgstr "_Hračky"
 
-#: src/gui.c:1644
+#: src/gui.c:1642
 msgid "_None"
 msgstr "Žia_dny"
 
-#: src/gui.c:1652
+#: src/gui.c:1650
 msgid "_Autolives"
 msgstr ""
 
-#: src/gui.c:1657
+#: src/gui.c:1655
 msgid "_Mad Frames"
 msgstr "_Bláznivé snḿky"
 
-#: src/gui.c:1662
+#: src/gui.c:1660
 msgid "_LiVES TV (broadband)"
 msgstr "_LiVES TV (širokopásmová)"
 
-#: src/gui.c:1672 src/multitrack.c:7387
+#: src/gui.c:1670 src/multitrack.c:7563
 msgid "_Help"
 msgstr "_Pomocník"
 
-#: src/gui.c:1684 src/multitrack.c:7407
+#: src/gui.c:1682 src/multitrack.c:7583
 msgid "_Manual (opens in browser)"
 msgstr "_Manuál (otvoriť v prehliadači)"
 
-#: src/gui.c:1691 src/multitrack.c:7416
+#: src/gui.c:1689 src/multitrack.c:7592
 msgid "_Donate to the project !"
 msgstr "_Prispieť na projekt !"
 
-#: src/gui.c:1695 src/multitrack.c:7420
+#: src/gui.c:1693 src/multitrack.c:7596
 msgid "_Email the author"
 msgstr "_Mailová adresa autora"
 
-#: src/gui.c:1699 src/multitrack.c:7424
+#: src/gui.c:1697 src/multitrack.c:7600
 msgid "Report a _bug"
 msgstr "Nahlásiť _chybu"
 
-#: src/gui.c:1703 src/multitrack.c:7428
+#: src/gui.c:1701 src/multitrack.c:7604
 msgid "Suggest a _feature"
 msgstr "Navrhnite _funkciu"
 
-#: src/gui.c:1707 src/multitrack.c:7432
+#: src/gui.c:1705 src/multitrack.c:7608
 msgid "Assist with _translating"
 msgstr "Pomôcť s _prekladom"
 
-#: src/gui.c:1714 src/multitrack.c:7439
+#: src/gui.c:1712 src/multitrack.c:7615
 msgid "_Troubleshoot"
 msgstr "Riešenie _problémov"
 
-#: src/gui.c:1718 src/multitrack.c:7443
+#: src/gui.c:1716 src/multitrack.c:7619
 msgid "_About"
 msgstr "_O programe"
 
-#: src/gui.c:1752
+#: src/gui.c:1750
 msgid "Rewind to start (w)"
 msgstr "Previnúť na štart (w)"
 
-#: src/gui.c:1760 src/multitrack.c:16720
+#: src/gui.c:1758 src/multitrack.c:17010
 msgid "Play all (p)"
 msgstr "Prehrať všetko (p)"
 
-#: src/gui.c:1768 src/gui.c:1877
+#: src/gui.c:1766 src/gui.c:1876
 msgid "Stop playback (q)"
 msgstr "Zastaviť prehrávanie (q)"
 
-#: src/gui.c:1779
+#: src/gui.c:1777
 msgid "Play selection (y)"
 msgstr "Prehrať vybrané (y)"
 
-#: src/gui.c:1832
+#: src/gui.c:1829
 msgid "Volume"
 msgstr "Hlasitosť"
 
-#: src/gui.c:1854
+#: src/gui.c:1853
 msgid "Audio volume (1.00)"
 msgstr "Hlasitosť zvuku (1.00)"
 
-#: src/gui.c:1883
+#: src/gui.c:1882
 msgid "Unblank background (b)"
 msgstr "Vyplnené pozadie (b)"
 
-#: src/gui.c:1929
+#: src/gui.c:1928
 msgid "Play slower (ctrl-down)"
 msgstr "Prehrať pomalšie (ctrl-down)"
 
-#: src/gui.c:1935
+#: src/gui.c:1934
 msgid "Play faster (ctrl-up)"
 msgstr "Prehrať rýchlejšie (ctrl-hore)"
 
-#: src/gui.c:1942
+#: src/gui.c:1941
 msgid "Skip back (ctrl-left)"
 msgstr "Preskočiť späť (ctrl-vľavo)"
 
-#: src/gui.c:1948
+#: src/gui.c:1947
 msgid "Skip forward (ctrl-right)"
 msgstr "Preskočiť vpred (ctrl-vpravo)"
 
-#: src/gui.c:1954
+#: src/gui.c:1953
 msgid "Show clip info (i)"
 msgstr "Zobraziť info o klipe (i)"
 
-#: src/gui.c:1960
+#: src/gui.c:1959
 msgid "Hide this toolbar"
 msgstr "Skryť túto lištu s nástrojmi"
 
-#: src/gui.c:1962
+#: src/gui.c:1961
 msgid ""
 "Press \"s\" to toggle separate play window for improved performance, \"q\" "
 "to stop."
@@ -3696,174 +3685,174 @@
 "zastavte s \"q\"."
 
 #. TRANSLATORS: please keep the translated string the same length
-#: src/gui.c:1995
+#: src/gui.c:1994
 msgid "     Video playback speed (frames per second)        "
 msgstr "     Rýchlosť prehrávania videa (snímky za sekundu)        "
 
-#: src/gui.c:2009
+#: src/gui.c:2008
 msgid "Vary the video speed"
 msgstr "Odlíšiť rýchlosť videa"
 
-#: src/gui.c:2092 src/gui.c:3218
+#: src/gui.c:2090 src/gui.c:3329
 msgid "First Frame"
 msgstr "Prvý snímok"
 
-#: src/gui.c:2193 src/gui.c:3226
+#: src/gui.c:2191 src/gui.c:3336
 msgid "Last Frame"
 msgstr "Posledný snímok"
 
-#: src/gui.c:2210
+#: src/gui.c:2208
 msgid "The first selected frame in this clip"
 msgstr "Prvý vybraný snímok v tomto klipe"
 
-#: src/gui.c:2248
+#: src/gui.c:2246
 msgid "The last selected frame in this clip"
 msgstr "Posledný vybraný snímok v tomto klipe"
 
-#: src/gui.c:2532
+#: src/gui.c:2546
 msgid "Starting...\n"
 msgstr "Začínam...\n"
 
-#: src/gui.c:3074
+#: src/gui.c:3181
 msgid "    Press 'q' to stop recording.  DO NOT COVER THE PLAY WINDOW !   "
 msgstr "    Stlač 'q' k zastaveniu nahrávania. NEPREKRÝVAJTE HRACIE OKNO !   "
 
-#: src/gui.c:3521
+#: src/gui.c:3643
 msgid "Frame number to preview"
 msgstr "Čísla snímkov k náhľadu"
 
-#: src/gui.c:3538
+#: src/gui.c:3660
 msgid "_Free"
 msgstr "_Voľná"
 
-#: src/gui.c:3539
+#: src/gui.c:3661
 msgid "Free choice of frame number"
 msgstr "Voľný výber čísla snímku"
 
-#: src/gui.c:3543
+#: src/gui.c:3666
 msgid "_Start"
 msgstr "_Štart"
 
-#: src/gui.c:3544
+#: src/gui.c:3667
 msgid "Frame number is linked to start frame"
 msgstr "Číslo snímku ukazuje na prvý snímok"
 
-#: src/gui.c:3551
+#: src/gui.c:3675
 msgid "_End"
 msgstr "_Koniec"
 
-#: src/gui.c:3552
+#: src/gui.c:3676
 msgid "Frame number is linked to end frame"
 msgstr "Číslo snímku ukazuje na posledný snímok"
 
-#: src/gui.c:3559
+#: src/gui.c:3684
 msgid "_Pointer"
 msgstr "_Kurzor"
 
-#: src/gui.c:3560
+#: src/gui.c:3685
 msgid "Frame number is linked to playback pointer"
 msgstr "Číslo snímku ukazuje na ukazovateľ prehrávania"
 
-#: src/gui.c:3581
+#: src/gui.c:3707
 msgid "Rewind"
 msgstr "Previnúť"
 
-#: src/gui.c:3592 src/dialogs.c:894 src/dialogs.c:896 src/dialogs.c:1817
-#: src/dialogs.c:1819
+#: src/gui.c:3718 src/dialogs.c:960 src/dialogs.c:962 src/dialogs.c:1873
+#: src/dialogs.c:1875
 msgid "Play all"
 msgstr "Prehrať všetko"
 
-#: src/gui.c:3605
+#: src/gui.c:3731
 msgid "Play Selection"
 msgstr "Prehrať vybrané"
 
-#: src/gui.c:3619
+#: src/gui.c:3745
 msgid "Loop On/Off"
 msgstr "Slučka Zap/Vyp"
 
-#: src/gui.c:3693
+#: src/gui.c:3819
 msgid "Start _recording"
 msgstr "Spustiť _nahrávanie"
 
-#: src/gui.c:3698
+#: src/gui.c:3824
 msgid "Stop _recording"
 msgstr "Zastaviť _nahrávanie"
 
-#: src/gui.c:3703
+#: src/gui.c:3829
 msgid "_Record Performance"
 msgstr ""
 
-#: src/gui.c:3851
+#: src/gui.c:3974
 msgid "Hide Play Window"
 msgstr "Skryť okno s prehrávaním"
 
-#: src/gui.c:4232
+#: src/gui.c:4333
 msgid "Show Play Window"
 msgstr "Zobraziť okno s prehrávaním"
 
-#: src/ce_thumbs.c:222
+#: src/ce_thumbs.c:242
 #, c-format
 msgid "Mapped to ctrl-%d"
 msgstr ""
 
-#: src/ce_thumbs.c:276 src/effects.c:85 src/preferences.c:3195
+#: src/ce_thumbs.c:296 src/effects.c:86 src/preferences.c:3247
 msgid "Effects"
 msgstr "Efekty"
 
-#: src/ce_thumbs.c:279 src/multitrack.c:5615
+#: src/ce_thumbs.c:299 src/multitrack.c:5791
 msgid "Clips"
 msgstr "Klipy"
 
-#: src/ce_thumbs.c:303
+#: src/ce_thumbs.c:323
 #, fuzzy, c-format
 msgid "Show / apply effects to %s\n"
 msgstr "Vypnúť všetky efekty."
 
-#: src/ce_thumbs.c:315
+#: src/ce_thumbs.c:335
 #, fuzzy, c-format
 msgid "Select clip for %s\n"
 msgstr "_Odstrániť zostavu klipov"
 
-#: src/ce_thumbs.c:515
+#: src/ce_thumbs.c:536
 msgid "_Pin"
 msgstr ""
 
-#: src/ce_thumbs.c:515
+#: src/ce_thumbs.c:537
 msgid "Pin the parameter box to the window"
 msgstr ""
 
 #. TRANSLATORS: Exabytes
-#: src/utils.c:794
+#: src/utils.c:800
 #, c-format
 msgid "%.2f EB"
 msgstr ""
 
 #. TRANSLATORS: Petabytes
-#: src/utils.c:798
+#: src/utils.c:803
 #, c-format
 msgid "%.2f PB"
 msgstr ""
 
 #. TRANSLATORS: Terabytes
-#: src/utils.c:802
+#: src/utils.c:806
 #, c-format
 msgid "%.2f TB"
 msgstr ""
 
 #. TRANSLATORS: Gigabytes
-#: src/utils.c:806
+#: src/utils.c:809
 #, c-format
 msgid "%.2f GB"
 msgstr ""
 
 #. TRANSLATORS: Megabytes
-#: src/utils.c:810
+#: src/utils.c:812
 #, c-format
 msgid "%.2f MB"
 msgstr ""
 
 #. TRANSLATORS: Kilobytes (1024 bytes)
-#: src/utils.c:814
+#: src/utils.c:815
 #, c-format
 msgid "%.2f KiB"
 msgstr ""
@@ -3873,7 +3862,7 @@
 msgid "%d bytes"
 msgstr ""
 
-#: src/utils.c:1841
+#: src/utils.c:1835
 msgid "Clearing the clipboard"
 msgstr "Vyprázdnenie schránky"
 
@@ -3888,7 +3877,7 @@
 "==============================\n"
 "Prepnuté na klip %s\n"
 
-#: src/utils.c:1880
+#: src/utils.c:1877
 msgid ""
 "\n"
 "==============================\n"
@@ -3898,11 +3887,11 @@
 "==============================\n"
 "Prepnuté na prázdny klip\n"
 
-#: src/utils.c:1917
+#: src/utils.c:1916
 msgid "(blank)"
 msgstr "(čisté)"
 
-#: src/utils.c:1920
+#: src/utils.c:1919
 #, c-format
 msgid ""
 "The set name has been changed from %s to %s. Affected layouts have been "
@@ -3911,7 +3900,7 @@
 "Názov zostavy bol zmenený z %s na %s. Súvisiace rozmiestnenie bude primerane "
 "aktualizované\n"
 
-#: src/utils.c:1928
+#: src/utils.c:1927
 #, c-format
 msgid ""
 "The clip %s is missing from this set.\n"
@@ -3920,7 +3909,7 @@
 "Klip %s nebol nájdený v tejto zostave.\n"
 "Je vyžadované nasledujúce rozloženie:\n"
 
-#: src/utils.c:1932
+#: src/utils.c:1931
 #, c-format
 msgid ""
 "The clip %s has been closed.\n"
@@ -3929,7 +3918,7 @@
 "Klip %s bol zatvorený.\n"
 "Je požadované nasledujúce rozloženie:\n"
 
-#: src/utils.c:1937
+#: src/utils.c:1936
 #, c-format
 msgid ""
 "Frames have been shifted in the clip %s.\n"
@@ -3938,7 +3927,7 @@
 "Snímky v klipe %s boli posunuté.\n"
 "Nasledujúce rozloženie bude ovplyvnené:\n"
 
-#: src/utils.c:1942
+#: src/utils.c:1941
 #, c-format
 msgid ""
 "Frames have been deleted from the clip %s.\n"
@@ -3947,7 +3936,7 @@
 "Snímky z klipu %s boli zmazané.\n"
 "Nasledujúce rozdelenie bude ovplyvnené:\n"
 
-#: src/utils.c:1947
+#: src/utils.c:1946
 #, c-format
 msgid ""
 "Audio has been deleted from the clip %s.\n"
@@ -3956,7 +3945,7 @@
 "Z klipu %s bol odstránený zvuk.\n"
 "Nasledujúce rozdelenie bude ovplyvnené:\n"
 
-#: src/utils.c:1952
+#: src/utils.c:1951
 #, c-format
 msgid ""
 "Audio has been shifted in clip %s.\n"
@@ -3965,7 +3954,7 @@
 "V klipe %s bol posunutý zvuk.\n"
 "Nasledujúce rozdelenie bude ovplyvnené:\n"
 
-#: src/utils.c:1957
+#: src/utils.c:1956
 #, c-format
 msgid ""
 "Audio has been altered in the clip %s.\n"
@@ -3974,7 +3963,7 @@
 "V klipe %s bol zmenený zvuk.\n"
 "Nasledujúce rozdelenie bude ovplyvnené:\n"
 
-#: src/utils.c:1962
+#: src/utils.c:1961
 #, c-format
 msgid ""
 "Frames have been altered in the clip %s.\n"
@@ -3983,7 +3972,7 @@
 "V klipe %s boli zmenené snímky.\n"
 "Nasledujúce rozdelenie bude ovplyvnené:\n"
 
-#: src/utils.c:2135
+#: src/utils.c:2134
 #, c-format
 msgid ""
 "Set %s\n"
@@ -3994,7 +3983,7 @@
 "sa nedá otvoriť, pretože je používaná\n"
 "inou kópiou LiVES.\n"
 
-#: src/utils.c:2142
+#: src/utils.c:2140
 #, c-format
 msgid ""
 "\n"
@@ -4050,68 +4039,68 @@
 msgid "Removing layout %s\n"
 msgstr "Odstraňujem rozloženia %s\n"
 
-#: src/utils.c:3014
+#: src/utils.c:2996
 msgid "Video [opening...]"
 msgstr "Video [otváram...]"
 
-#: src/utils.c:3018
+#: src/utils.c:2999
 #, c-format
 msgid "Video [%.2f sec]"
 msgstr "Video [%.2f sek]"
 
-#: src/utils.c:3022
+#: src/utils.c:3002
 msgid "(Undefined)"
 msgstr "(Nedefinované)"
 
-#: src/utils.c:3025
+#: src/utils.c:3004
 msgid "(No video)"
 msgstr "(Žiadne video)"
 
-#: src/utils.c:3032
+#: src/utils.c:3011
 msgid "(No audio)"
 msgstr "(Žiadny zvuk)"
 
-#: src/utils.c:3037
+#: src/utils.c:3015
 msgid "Mono  [opening...]"
 msgstr "Mono [otváram...]"
 
-#: src/utils.c:3040
+#: src/utils.c:3017
 msgid "Left Audio [opening...]"
 msgstr "Ľavý zvukový kanál [otváram...]"
 
-#: src/utils.c:3045
+#: src/utils.c:3021
 #, c-format
 msgid "Mono [%.2f sec]"
 msgstr "Mono [%.2f sek]"
 
-#: src/utils.c:3048
+#: src/utils.c:3023
 #, c-format
 msgid "Left Audio [%.2f sec]"
 msgstr "Ľavý zvukový kanál [%.2f sek]"
 
-#: src/utils.c:3056
+#: src/utils.c:3031
 msgid "Right Audio [opening...]"
 msgstr "Pravý zvukový kanál [otváram...]"
 
-#: src/utils.c:3059
+#: src/utils.c:3033
 #, c-format
 msgid "Right Audio [%.2f sec]"
 msgstr "Pravý zvukový kanál [%.2f sek]"
 
-#: src/utils.c:3506
+#: src/utils.c:3472
 msgid "LiVES cannot switch to mplayer whilst clips are loading."
 msgstr "LiVES nemôže při načítání klipov prepnúť na mplayer."
 
-#: src/utils.c:3559
+#: src/utils.c:3525
 #, fuzzy
 msgid "LiVES cannot switch to mplayer2 whilst clips are loading."
 msgstr "LiVES nemôže při načítání klipov prepnúť na mplayer."
 
-#: src/utils.c:3809
+#: src/utils.c:3775
 msgid "Cleaning up clip"
 msgstr "Vyčistenie klipu"
 
-#: src/utils.c:3913
+#: src/utils.c:3874
 #, c-format
 msgid ""
 "\n"
@@ -4126,30 +4115,29 @@
 "\n"
 "Prepísať ?\n"
 
-#: src/utils.c:4305 src/utils.c:4337 src/multitrack.c:4503
+#: src/utils.c:4250 src/utils.c:4280 src/multitrack.c:4672
 #, c-format
 msgid "_Undo %s"
 msgstr "_Vrátiť %s"
 
-#: src/utils.c:4306 src/utils.c:4338 src/multitrack.c:4525
+#: src/utils.c:4251 src/utils.c:4281 src/multitrack.c:4693
 #, c-format
 msgid "_Redo %s"
 msgstr "_Znovu %s"
 
-#: src/utils.c:4363
+#: src/utils.c:4305
 msgid "-------------Selection------------"
 msgstr "-------------Výber------------"
 
-#. TRANSLATORS: - try to keep the text of the middle part the same length, by deleting "-" if necessary
-#: src/utils.c:4371
+#: src/utils.c:4313
 msgid " sec ] ----------Selection---------- [ "
 msgstr " sek ] ----------výber---------- [ "
 
-#: src/utils.c:4371
+#: src/utils.c:4314
 msgid " frames ] ----------"
 msgstr " snímky ] ----------"
 
-#: src/utils.c:5360
+#: src/utils.c:5302
 msgid ""
 "Your version of mplayer/ffmpeg may be broken !\n"
 "See http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2071\n"
@@ -4160,11 +4148,11 @@
 "Try running Help/Troubleshoot for more information."
 msgstr ""
 
-#: src/saveplay.c:178
+#: src/saveplay.c:179
 msgid "Examining file header"
 msgstr "Kontrolujem hlavičku súboru"
 
-#: src/saveplay.c:315 src/saveplay.c:789
+#: src/saveplay.c:316 src/saveplay.c:779
 #, c-format
 msgid "Opening %s"
 msgstr "Otváram %s"
@@ -4174,36 +4162,36 @@
 msgid "Opening %s start time %.2f sec. frames %d"
 msgstr "Otváranie %s začiatok %.2f sek. snímkov %d"
 
-#: src/saveplay.c:326 src/saveplay.c:4001
+#: src/saveplay.c:326 src/saveplay.c:3927
 msgid " without sound"
 msgstr " bez zvuku"
 
-#: src/saveplay.c:396
+#: src/saveplay.c:395
 #, c-format
 msgid "Opening audio for %s"
 msgstr "Otváram zvuk pre %s"
 
-#: src/saveplay.c:557
+#: src/saveplay.c:554
 #, c-format
 msgid "Auto trimming %.2f seconds of audio at start..."
 msgstr ""
 
-#: src/saveplay.c:567
+#: src/saveplay.c:562
 #, fuzzy, c-format
 msgid "Auto trimming %.2f seconds of audio at end..."
 msgstr "%s od času %.2f sekúnd do %.2f sekúnd..."
 
-#: src/saveplay.c:584
+#: src/saveplay.c:577
 #, c-format
 msgid "Auto padding with %.2f seconds of silence at start..."
 msgstr ""
 
-#: src/saveplay.c:599
+#: src/saveplay.c:590
 #, c-format
 msgid "Auto padding with %.2f seconds of silence at end..."
 msgstr ""
 
-#: src/saveplay.c:671
+#: src/saveplay.c:661
 #, c-format
 msgid ""
 "\n"
@@ -4215,11 +4203,11 @@
 "Are you sure you wish to continue ?"
 msgstr ""
 
-#: src/saveplay.c:685
+#: src/saveplay.c:676
 msgid " - please be patient."
 msgstr " - prosím o trpezlivosť."
 
-#: src/saveplay.c:938
+#: src/saveplay.c:926
 msgid ""
 "\n"
 "\n"
@@ -4231,7 +4219,7 @@
 "LiVES nebol schopný dať ukážku buď videa, alebo zvuku.\n"
 "Prosím, pre viac informácií skontrolujte okno terminálu.\n"
 
-#: src/saveplay.c:940
+#: src/saveplay.c:928
 msgid ""
 "\n"
 "\n"
@@ -4241,7 +4229,7 @@
 "\n"
 "Musíte nainštalovať mplayer k otvoreniu tohto súboru.\n"
 
-#: src/saveplay.c:948
+#: src/saveplay.c:934
 msgid ""
 "\n"
 "\n"
@@ -4253,29 +4241,29 @@
 "Skontrolujte nastavenie príkazu pre otvorenie videa v\n"
 "Nástroje|Predvoľby|Dekódovanie\n"
 
-#: src/saveplay.c:1014
+#: src/saveplay.c:995
 msgid "Adding image..."
 msgstr ""
 
-#: src/saveplay.c:1108
+#: src/saveplay.c:1089
 #, c-format
 msgid "Subtitles were saved as %s\n"
 msgstr ""
 
-#: src/saveplay.c:1192
+#: src/saveplay.c:1171
 #, c-format
 msgid "LiVES: Save Frame %d as..."
 msgstr ""
 
-#: src/saveplay.c:1195
+#: src/saveplay.c:1174
 msgid "LiVES: Save Frame as..."
 msgstr ""
 
-#: src/saveplay.c:1322
+#: src/saveplay.c:1303
 msgid "LiVES: Save Clip as..."
 msgstr ""
 
-#: src/saveplay.c:1390
+#: src/saveplay.c:1369
 msgid ""
 "Saving your video could lead to a loss of quality !\n"
 "You are strongly advised to 'Save As' to a new file.\n"
@@ -4287,34 +4275,34 @@
 "\t\n"
 "Prajete si napriek tomu pokračovať ?"
 
-#: src/saveplay.c:1517 src/saveplay.c:1683 src/saveplay.c:1762
-#: src/saveplay.c:4014
+#: src/saveplay.c:1494 src/saveplay.c:1659 src/saveplay.c:1738
+#: src/saveplay.c:3940
 msgid "Pulling frames from clip"
 msgstr "Ťahanie snímkov z klipu"
 
-#: src/saveplay.c:1588 src/saveplay.c:1727
+#: src/saveplay.c:1565 src/saveplay.c:1703
 msgid "Linking selection"
 msgstr "Prepojenie výberu"
 
-#: src/saveplay.c:1779
+#: src/saveplay.c:1755
 msgid " (with no sound)\n"
 msgstr " (bez zvuku)\n"
 
-#: src/saveplay.c:1786
+#: src/saveplay.c:1761
 #, c-format
 msgid "Saving frames %d to %d%s as \"%s\" : encoder = %s : format = %s..."
 msgstr "Uložiť snímky %d do %d%s ako \"%s\" : enkodér = %s : formát = %s..."
 
-#: src/saveplay.c:1790
+#: src/saveplay.c:1765
 #, c-format
 msgid "Saving frames 1 to %d%s as \"%s\" : encoder %s : format = %s..."
 msgstr "Uložiť snímky 1 do %d%s ako \"%s\" : enkodér %s : formát = %s..."
 
-#: src/saveplay.c:1909
+#: src/saveplay.c:1890
 msgid "Saving [can take a long time]"
 msgstr "Ukladanie [môže to chvíľu trvať]"
 
-#: src/saveplay.c:2057
+#: src/saveplay.c:2044
 msgid ""
 "\n"
 "\n"
@@ -4324,33 +4312,33 @@
 "\n"
 "Chyby kódovača - výstupný súbor nebol vytvorený !\n"
 
-#: src/saveplay.c:2094
+#: src/saveplay.c:2081
 msgid "Clearing letterbox"
 msgstr ""
 
-#: src/saveplay.c:2183
+#: src/saveplay.c:2168
 #, c-format
 msgid "File size was %s\n"
 msgstr ""
 
-#: src/saveplay.c:2284
+#: src/saveplay.c:2265
 msgid "recording aborted by preview.\n"
 msgstr "nahrávanie prerušené náhľadom.\n"
 
-#: src/saveplay.c:2288
+#: src/saveplay.c:2268
 msgid "recording aborted by clipboard playback.\n"
 msgstr "nahrávanie prerušené prehrávaním zo schránky.\n"
 
-#: src/saveplay.c:2291
+#: src/saveplay.c:2270
 msgid "Recording performance..."
 msgstr ""
 
-#: src/saveplay.c:3293
+#: src/saveplay.c:3251
 #, c-format
 msgid "Average FPS was %.4f\n"
 msgstr "Priemerná hodnota FPS bola %.4f\n"
 
-#: src/saveplay.c:3299
+#: src/saveplay.c:3256
 msgid ""
 "\n"
 "\n"
@@ -4364,16 +4352,21 @@
 "Kliknite na Nástroje--->Zmeniť veľkosť všetkých\n"
 "a zmeňte veľkosť všetkých snímkov na \taktuálnu veľkosť.\n"
 
-#: src/saveplay.c:3479
+#: src/saveplay.c:3429
 msgid "Unknown"
 msgstr "Neznáme"
 
-#: src/saveplay.c:3588 src/saveplay.c:4585
+#: src/saveplay.c:3538 src/saveplay.c:4502
 #, c-format
 msgid "Untitled%d"
 msgstr "Bez názvu %d"
 
-#: src/saveplay.c:3633
+#: src/saveplay.c:3567
+#, c-format
+msgid "%d frames are enough !\n"
+msgstr "%d snímkov je postačujúcich !\n"
+
+#: src/saveplay.c:3579
 #, c-format
 msgid ""
 "\n"
@@ -4381,7 +4374,7 @@
 "Bad things may happen with this clip.\n"
 msgstr ""
 
-#: src/saveplay.c:3723
+#: src/saveplay.c:3667
 #, c-format
 msgid ""
 "\n"
@@ -4393,14 +4386,14 @@
 "fps . \n"
 "Predvolené hodnoty možno nastaviť v Nástroje | Predvoľby | Rôzne.\n"
 
-#: src/saveplay.c:3735
+#: src/saveplay.c:3677
 #, c-format
 msgid "Playback speed was adjusted to %.3f frames per second to fit audio.\n"
 msgstr ""
 "Rýchlosť prehrávania bola nastavená na %.3f snímky za sekundu, aby "
 "zodpovedal zvuku.\n"
 
-#: src/saveplay.c:3754
+#: src/saveplay.c:3694
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d *bpp=Greyscale* fps=%.3f\n"
@@ -4410,7 +4403,7 @@
 "%.3f\n"
 "Zvuk:"
 
-#: src/saveplay.c:3758 src/saveplay.c:4762
+#: src/saveplay.c:3698 src/saveplay.c:4671
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d bpp=%d fps=%.3f\n"
@@ -4419,54 +4412,54 @@
 "Snímky=%d typ=%s veľkosť=%dx%d bpp=%d snímkov za sekundu =%.3f\n"
 "Zvuk:"
 
-#: src/saveplay.c:3762 src/saveplay.c:4766
+#: src/saveplay.c:3703 src/saveplay.c:4676
 #, c-format
 msgid "%s none\n"
 msgstr "%s žiadny\n"
 
-#: src/saveplay.c:3774
+#: src/saveplay.c:3714
 #, fuzzy, c-format
 msgid " - Author: %s\n"
 msgstr "Autor: %s"
 
-#: src/saveplay.c:3779
+#: src/saveplay.c:3717
 #, fuzzy, c-format
 msgid " - Title: %s\n"
 msgstr " - Komentár: %s\n"
 
-#: src/saveplay.c:3784
+#: src/saveplay.c:3720
 #, c-format
 msgid " - Comment: %s\n"
 msgstr " - Komentár: %s\n"
 
-#: src/saveplay.c:3897
+#: src/saveplay.c:3829
 #, c-format
 msgid "Saving frame %d as %s..."
 msgstr "Ukladám snímky %d ako %s..."
 
-#: src/saveplay.c:3996
+#: src/saveplay.c:3924
 #, c-format
 msgid "Backing up %s to %s"
 msgstr "Zálohovanie %s do %s"
 
-#: src/saveplay.c:4049
+#: src/saveplay.c:3975
 msgid "Backing up"
 msgstr "Zálohujem"
 
-#: src/saveplay.c:4083
+#: src/saveplay.c:4009
 msgid "performance data was backed up..."
 msgstr "dáta boli zálohované..."
 
-#: src/saveplay.c:4661
+#: src/saveplay.c:4574
 #, c-format
 msgid "Restoring %s..."
 msgstr "Obnovovanie %s..."
 
-#: src/saveplay.c:4692
+#: src/saveplay.c:4603
 msgid "Restoring"
 msgstr "Obnovovanie"
 
-#: src/saveplay.c:4714
+#: src/saveplay.c:4625
 #, c-format
 msgid ""
 "\n"
@@ -4480,22 +4473,22 @@
 "LiVES ho nemohol obnoviť.\n"
 
 #. TRANSLATORS: rec(ord) %.2f M(ega)B(ytes)
-#: src/saveplay.c:5207
+#: src/saveplay.c:5118
 #, c-format
 msgid "rec %.2f MB"
 msgstr "rec %.2f MB"
 
-#: src/saveplay.c:5213
+#: src/saveplay.c:5123
 #, c-format
 msgid "!rec %.2f MB"
 msgstr "!rec %.2f MB"
 
 #. TRANSLATORS: rec(ord) ?? M(ega)B(ytes)
-#: src/saveplay.c:5216
+#: src/saveplay.c:5126
 msgid "rec ?? MB"
 msgstr ""
 
-#: src/saveplay.c:5241
+#: src/saveplay.c:5151
 #, c-format
 msgid ""
 "\n"
@@ -4503,7 +4496,7 @@
 "Record stop level can be set in Preferences.\n"
 msgstr ""
 
-#: src/saveplay.c:5535
+#: src/saveplay.c:5447
 msgid ""
 "\n"
 "Files from a previous run of LiVES were found.\n"
@@ -4513,47 +4506,69 @@
 "Byly nájdené súbory z predchádzajúceho spustenia LiVES.\n"
 "Chcete sa pokúsit se o ich obnovenie ?\n"
 
-#: src/saveplay.c:5557
+#: src/saveplay.c:5469
 msgid "Recovering files"
 msgstr "Obnovujem súbory"
 
-#: src/saveplay.c:5560
+#: src/saveplay.c:5472
 msgid "Recovering files..."
 msgstr "Obnovenie súborov ..."
 
-#: src/dialogs.c:72
+#: src/dialogs.c:71
 msgid "Show affected _layouts"
 msgstr "Zobraziť postihnuté _rozloženia"
 
-#: src/dialogs.c:128
+#: src/dialogs.c:113
+msgid ""
+"Do _not show this warning any more\n"
+"(can be turned back on from Preferences/Warnings)"
+msgstr ""
+"_Nezobrazovať už toto upozornenie\n"
+"(zmenu nastavenia urobíte v Predvoľby/Upozornenia)"
+
+#: src/dialogs.c:127
 msgid "_Recover disk space"
 msgstr ""
 
-#: src/dialogs.c:143
+#: src/dialogs.c:142
 msgid " _Advanced Settings >>"
 msgstr ""
 
-#: src/dialogs.c:184
+#: src/dialogs.c:183 src/dialogs.c:221
 msgid "LiVES: - Warning !"
 msgstr "LiVES: - Upozornenie !"
 
 #: src/dialogs.c:194
+#, fuzzy
+msgid "LiVES: - Error !"
+msgstr "LiVES: - Upozornenie !"
+
+#: src/dialogs.c:204
+#, fuzzy
+msgid "LiVES: - Information"
+msgstr "LiVES: Informácie pre %s"
+
+#: src/dialogs.c:230
 msgid "LiVES: - Question"
 msgstr ""
 
-#: src/dialogs.c:204
+#: src/dialogs.c:239
 msgid "LiVES: - File Error"
 msgstr ""
 
-#: src/dialogs.c:208
+#: src/dialogs.c:241
 msgid "_Abort"
 msgstr ""
 
-#: src/dialogs.c:213
+#: src/dialogs.c:246
 msgid "_Retry"
 msgstr ""
 
-#: src/dialogs.c:597
+#: src/dialogs.c:306
+msgid "Show _Details"
+msgstr "Zobraziť_podrobnosti"
+
+#: src/dialogs.c:657
 #, c-format
 msgid ""
 "FREE SPACE IN THE PARTITION CONTAINING\n"
@@ -4564,7 +4579,7 @@
 "(Disk warning levels can be configured in Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:615
+#: src/dialogs.c:676
 #, c-format
 msgid ""
 "Free space in the partition containing\n"
@@ -4576,11 +4591,11 @@
 "Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:627
+#: src/dialogs.c:688
 msgid "Audio players cannot be switched during playback."
 msgstr "Prehrávače zvuku nemôžu byť prepnuté počas prehrávania."
 
-#: src/dialogs.c:632
+#: src/dialogs.c:694
 msgid ""
 "\n"
 "\n"
@@ -4592,18 +4607,18 @@
 "LiVES nemohol vykonať túto operáciu kvôli nedostatku pamäte.\n"
 "Prosím skúste najskôr zatvoriť daľšie aplikácie.\n"
 
-#: src/dialogs.c:752
+#: src/dialogs.c:820
 msgid "Processing has been paused."
 msgstr ""
 
-#: src/dialogs.c:937
+#: src/dialogs.c:1002
 #, c-format
 msgid ""
 "\n"
 "%s%d%% done. Time remaining: %u sec%s\n"
 msgstr ""
 
-#: src/dialogs.c:1335
+#: src/dialogs.c:1391
 #, c-format
 msgid ""
 "\n"
@@ -4612,14 +4627,14 @@
 "\n"
 "%d/%d otvorených snímkov. Zostávajúci čas %u sek.\n"
 
-#: src/dialogs.c:1337
+#: src/dialogs.c:1393
 #, c-format
 msgid ""
 "\n"
 "%d/%d frames opened.\n"
 msgstr ""
 
-#: src/dialogs.c:1341
+#: src/dialogs.c:1396
 #, c-format
 msgid ""
 "\n"
@@ -4628,7 +4643,7 @@
 "\n"
 "%d otvorených snímkov.\n"
 
-#: src/dialogs.c:1940
+#: src/dialogs.c:1993
 #, c-format
 msgid ""
 "\n"
@@ -4637,7 +4652,7 @@
 "\n"
 "Zostávajúci čas: %d sek"
 
-#: src/dialogs.c:1988
+#: src/dialogs.c:2040
 #, c-format
 msgid ""
 "\n"
@@ -4648,7 +4663,7 @@
 "Prepáčte, LiVES môže súčasne otvoriť %d súborov.\n"
 "Prosím zatvorte súbor a skúste to znova."
 
-#: src/dialogs.c:1994
+#: src/dialogs.c:2047
 #, c-format
 msgid ""
 "LiVES was unable to write to its temporary directory.\n"
@@ -4667,7 +4682,7 @@
 "\n"
 "Uistite sa prosím, že do tohoto adresára môžete zapisovať."
 
-#: src/dialogs.c:2005
+#: src/dialogs.c:2059
 #, fuzzy
 msgid ""
 "\n"
@@ -4678,13 +4693,13 @@
 "LiVES momentálne vyžaduje k spusteniu 'mplayer' alebo 'sox'. Prosím "
 "nainštalujte jeden z uvedených a skúste opäť.\n"
 
-#: src/dialogs.c:2010
+#: src/dialogs.c:2064
 msgid ""
 "Audio was not loaded; please install mplayer or mplayer2 if you expected "
 "audio for this clip.\n"
 msgstr ""
 
-#: src/dialogs.c:2014
+#: src/dialogs.c:2069
 msgid ""
 "Audio resampling is required for this format.\n"
 "Please install 'sox'\n"
@@ -4694,7 +4709,7 @@
 "Prosím nainštalujte 'sox'\n"
 "Alebo vyberte iný formát kódovania v Nástroje | Nastavenia | Encoding\n"
 
-#: src/dialogs.c:2019
+#: src/dialogs.c:2075
 msgid ""
 "\n"
 "\n"
@@ -4706,7 +4721,7 @@
 "Tento formát sa nedá použiť s vybraným zvukovým kodekom.\n"
 "Nastavte zvukový kodek v Nástroje|Nastavenia|Encoding\n"
 
-#: src/dialogs.c:2024
+#: src/dialogs.c:2080
 msgid ""
 "This layout includes generated frames.\n"
 "It cannot be saved, you must render it to a clip first.\n"
@@ -4714,13 +4729,13 @@
 "Toto rozloženie obsahuje vygenerované snímky.\n"
 "Nedá sa uložiť, musíte ich najskôr vykresliť do klipu.\n"
 
-#: src/dialogs.c:2029
+#: src/dialogs.c:2085
 msgid ""
 "This layout includes generated or recorded audio.\n"
 "It cannot be saved, you must render it to a clip first.\n"
 msgstr ""
 
-#: src/dialogs.c:2039 src/dialogs.c:2137
+#: src/dialogs.c:2095 src/dialogs.c:2189
 #, c-format
 msgid ""
 "\n"
@@ -4731,7 +4746,7 @@
 "\n"
 "Vzhľadom na obmedzenia vo %s formáte\n"
 
-#: src/dialogs.c:2059
+#: src/dialogs.c:2115
 msgid ""
 "LiVES recommends the following settings:\n"
 "\n"
@@ -4739,43 +4754,43 @@
 "LiVES doporučuje nasledujúce nastavenia:\n"
 "\n"
 
-#: src/dialogs.c:2065 src/dialogs.c:2174 src/resample.c:850
+#: src/dialogs.c:2121 src/dialogs.c:2225 src/resample.c:839
 msgid ", signed"
 msgstr ", podpísané"
 
-#: src/dialogs.c:2066 src/dialogs.c:2175 src/resample.c:853
+#: src/dialogs.c:2122 src/dialogs.c:2226 src/resample.c:841
 msgid ", unsigned"
 msgstr ". nepodpísané"
 
-#: src/dialogs.c:2070 src/dialogs.c:2179 src/resample.c:858
+#: src/dialogs.c:2126 src/dialogs.c:2230 src/resample.c:846
 msgid ", little-endian"
 msgstr ", malý-endian"
 
-#: src/dialogs.c:2071 src/dialogs.c:2180 src/resample.c:861
+#: src/dialogs.c:2127 src/dialogs.c:2231 src/resample.c:848
 msgid ", big-endian"
 msgstr ", veľký-endian"
 
-#: src/dialogs.c:2077
+#: src/dialogs.c:2132
 #, c-format
 msgid "Use an audio rate of %d Hz%s%s\n"
 msgstr ""
 
-#: src/dialogs.c:2085
+#: src/dialogs.c:2140
 #, c-format
 msgid "Set video rate to %.3f frames per second\n"
 msgstr "Nastaviť video na %.3f snímkov za sekundu\n"
 
-#: src/dialogs.c:2089
+#: src/dialogs.c:2143
 #, c-format
 msgid "Set video rate to %d:%d frames per second\n"
 msgstr "Nastaviť video na %d:%d snímkov za sekundu\n"
 
-#: src/dialogs.c:2094 src/dialogs.c:2209
+#: src/dialogs.c:2148 src/dialogs.c:2258
 #, c-format
 msgid "Set video size to %d x %d pixels\n"
 msgstr "Nastaviť veľkosť videa na %d x %d pixelov\n"
 
-#: src/dialogs.c:2102 src/dialogs.c:2208
+#: src/dialogs.c:2156 src/dialogs.c:2257
 msgid ""
 "\n"
 "You may wish to:\n"
@@ -4783,35 +4798,35 @@
 "\n"
 "Možno si budete priať:\n"
 
-#: src/dialogs.c:2105 src/dialogs.c:2200
+#: src/dialogs.c:2159 src/dialogs.c:2249
 #, c-format
 msgid "resize video to %d x %d pixels\n"
 msgstr "zmeniť veľkosť videa na %d x %d pixelov\n"
 
-#: src/dialogs.c:2110
+#: src/dialogs.c:2163
 msgid "disable audio, since the target encoder cannot encode audio\n"
 msgstr "vypnúť zvuk, pretože cieľový enkodér nemohol zakódovať zvuk\n"
 
-#: src/dialogs.c:2170
+#: src/dialogs.c:2221
 msgid "LiVES must:\n"
 msgstr "LiVES musí:\n"
 
-#: src/dialogs.c:2185
+#: src/dialogs.c:2235
 #, c-format
 msgid "resample audio to %d Hz%s%s\n"
 msgstr ""
 
-#: src/dialogs.c:2192
+#: src/dialogs.c:2242
 #, c-format
 msgid "resample video to %.3f frames per second\n"
 msgstr "prevzorkovať video na %.3f snímkov za sekundu\n"
 
-#: src/dialogs.c:2196
+#: src/dialogs.c:2245
 #, c-format
 msgid "resample video to %d:%d frames per second\n"
 msgstr "prevzorkovať video na %d:%d snímkov za sekundu\n"
 
-#: src/dialogs.c:2215
+#: src/dialogs.c:2263
 msgid ""
 "\n"
 "You will be able to undo these changes afterwards.\n"
@@ -4825,7 +4840,7 @@
 "Kliknite na `OK` pre pokračovanie, `Zrušiť` pre stornovanie.\n"
 "\n"
 
-#: src/dialogs.c:2218
+#: src/dialogs.c:2265
 msgid ""
 "\n"
 "Changes applied to the selection will not be permanent.\n"
@@ -4835,7 +4850,7 @@
 "Zmeny použité do výberu nebudú trvalé.\n"
 "\n"
 
-#: src/dialogs.c:2237
+#: src/dialogs.c:2285
 msgid ""
 "\n"
 "\n"
@@ -4849,7 +4864,7 @@
 "pamäte.\n"
 "Skúste nahrať len vybranú časť súboru."
 
-#: src/dialogs.c:2244
+#: src/dialogs.c:2293
 msgid ""
 "The playback speed (fps), or the audio rate\n"
 " of the clipboard does not match\n"
@@ -4868,7 +4883,7 @@
 "\n"
 "Vyberte Zrušiť pre ukončenie vkladania alebo OK pre pokračovanie."
 
-#: src/dialogs.c:2253
+#: src/dialogs.c:2304
 #, c-format
 msgid ""
 "When opening a yuvmpeg stream, you should first create a fifo file in:\n"
@@ -4881,11 +4896,11 @@
 "click Cancel."
 msgstr ""
 
-#: src/dialogs.c:2305
+#: src/dialogs.c:2356
 msgid "Show Keys"
 msgstr "Zobraziť klávesy"
 
-#: src/dialogs.c:2306
+#: src/dialogs.c:2358
 msgid ""
 "You can use the following keys during playback to control LiVES:-\n"
 "\n"
@@ -4927,11 +4942,11 @@
 "g                             ping pong loops\n"
 msgstr ""
 
-#: src/dialogs.c:2313
+#: src/dialogs.c:2365
 msgid "Multitrack Keys"
 msgstr "Klávesy pre výber stopy"
 
-#: src/dialogs.c:2314
+#: src/dialogs.c:2367
 msgid ""
 "You can use the following keys to control the multitrack window:-\n"
 "\n"
@@ -4953,18 +4968,18 @@
 "For other keys, see the menus.\n"
 msgstr ""
 
-#: src/dialogs.c:2322
+#: src/dialogs.c:2375
 msgid "Message History"
 msgstr "História správy"
 
-#: src/dialogs.c:2335
+#: src/dialogs.c:2388
 #, c-format
 msgid ""
 "After upgrading/installing, you may need to adjust the <prefix_dir> setting "
 "in your %s file"
 msgstr ""
 
-#: src/dialogs.c:2344
+#: src/dialogs.c:2399
 #, c-format
 msgid ""
 "\n"
@@ -4975,7 +4990,7 @@
 "or change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/dialogs.c:2352
+#: src/dialogs.c:2408
 msgid ""
 "Sorry, unknown audio type.\n"
 "\n"
@@ -4985,18 +5000,18 @@
 "\n"
 " (Názov súboru musí mať koncovku .mp3, .ogg, .wav, .mod, .xm alebo .it)"
 
-#: src/dialogs.c:2353
+#: src/dialogs.c:2409
 msgid "failed (unknown type)\n"
 msgstr "zlyhalo (neznámy typ)\n"
 
-#: src/dialogs.c:2358
+#: src/dialogs.c:2415
 msgid ""
 "\n"
 "Do you wish to remove the layout files associated with this set ?\n"
 "(They will not be usable without the set).\n"
 msgstr ""
 
-#: src/dialogs.c:2363
+#: src/dialogs.c:2421
 #, c-format
 msgid ""
 "\n"
@@ -5009,7 +5024,7 @@
 "Kliknitím na OK pridáte aktuálne klipy a rozloženia da existujúcej zostavy.\n"
 "Kliknutím na Zrušiť vyberiete nový názov.\n"
 
-#: src/dialogs.c:2370
+#: src/dialogs.c:2429
 msgid ""
 "\n"
 "Frames from this clip are used in some multitrack layouts.\n"
@@ -5020,7 +5035,7 @@
 "Snímky z tohoto klipu sú použité v niektorých viacstopých rozloženiach.\n"
 "Ste si istý že chcete pokračovať ?"
 
-#: src/dialogs.c:2374
+#: src/dialogs.c:2433
 msgid ""
 "\n"
 "Audio from this clip is used in some multitrack layouts.\n"
@@ -5031,7 +5046,7 @@
 "Zvuky z tohoto klipu sú použité v niektorých viacstopých rozloženiach.\n"
 "Ste si istý že chcete pokračovať ?"
 
-#: src/dialogs.c:2378
+#: src/dialogs.c:2438
 #, c-format
 msgid ""
 "\n"
@@ -5042,7 +5057,7 @@
 "Otherwise click Cancel to skip loading this file.\n"
 msgstr ""
 
-#: src/dialogs.c:2385
+#: src/dialogs.c:2446
 #, c-format
 msgid ""
 "\n"
@@ -5057,7 +5072,7 @@
 "%s\n"
 "Klip sa nedá načítať.\n"
 
-#: src/dialogs.c:2392
+#: src/dialogs.c:2455
 msgid ""
 "\n"
 "Dear user, the jack developers decided to remove the -Z option from jackd.\n"
@@ -5065,7 +5080,7 @@
 "Alternately, select a different audio player in Preferences.\n"
 msgstr ""
 
-#: src/dialogs.c:2396
+#: src/dialogs.c:2460
 msgid ""
 "\n"
 "Unable to start up jack. Please ensure that alsa is set up correctly on your "
@@ -5074,13 +5089,13 @@
 "Automatic jack startup will be disabled now.\n"
 msgstr ""
 
-#: src/dialogs.c:2402
+#: src/dialogs.c:2466
 msgid ""
 "\n"
 "Unable to connect to jack server. Please start jack before starting LiVES\n"
 msgstr ""
 
-#: src/dialogs.c:2411
+#: src/dialogs.c:2475
 #, c-format
 msgid ""
 "\n"
@@ -5091,7 +5106,7 @@
 "%s\n"
 msgstr ""
 
-#: src/dialogs.c:2418
+#: src/dialogs.c:2482
 msgid ""
 "\n"
 "Alternately, you can restart LiVES and select another audio player.\n"
@@ -5099,7 +5114,7 @@
 "\n"
 "Môžete tiež reštartovať LiVES a vybrať iný audio prehrávač.\n"
 
-#: src/dialogs.c:2423
+#: src/dialogs.c:2488
 #, c-format
 msgid ""
 "\n"
@@ -5114,7 +5129,7 @@
 "Môžete zvýšiť hodnoty v Preferences/Multitrack.\n"
 "Odporúča sa zvýšiť aspoň o %d MB"
 
-#: src/dialogs.c:2429
+#: src/dialogs.c:2496
 #, c-format
 msgid ""
 "\n"
@@ -5123,7 +5138,7 @@
 "Do you wish to delete them ?\n"
 msgstr ""
 
-#: src/dialogs.c:2436
+#: src/dialogs.c:2504
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for multitrack undo.\n"
@@ -5131,7 +5146,7 @@
 "using Preferences/Multitrack/Undo Memory\n"
 msgstr ""
 
-#: src/dialogs.c:2440
+#: src/dialogs.c:2508
 msgid ""
 "\n"
 "Out of memory for undo.\n"
@@ -5143,7 +5158,7 @@
 "Zvýšte veľkosť pamäte pre krok späť\n"
 "v Nastavenia/Multitrack/Pamäť späť\n"
 
-#: src/dialogs.c:2444
+#: src/dialogs.c:2512
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for the multitrack undo buffer.\n"
@@ -5152,20 +5167,20 @@
 "LiVES nemohol rezervovať dostatok pamäte pre zásobník viacstopého kroku "
 "späť.\n"
 
-#: src/dialogs.c:2446
+#: src/dialogs.c:2514
 msgid "or enter a smaller value.\n"
 msgstr "alebo vložte nižšiu hodnotu.\n"
 
-#: src/dialogs.c:2448
+#: src/dialogs.c:2516
 msgid "Try again from the clip editor, try closing some other applications\n"
 msgstr ""
 "Skúste opäť z editora klipov, skúste zavrieť niektoré ďaľšie aplikácie\n"
 
-#: src/dialogs.c:2449
+#: src/dialogs.c:2517
 msgid "Try closing some other applications\n"
 msgstr "Skúste zavrieť niektoré ďaľšie aplikácie\n"
 
-#: src/dialogs.c:2460
+#: src/dialogs.c:2529
 msgid ""
 "Multitrack is set to 0 audio channels, but this layout has audio.\n"
 "You should adjust the audio settings from the Tools menu.\n"
@@ -5174,14 +5189,14 @@
 "zvuk.\n"
 "Upravte nastavenie zvuku v menu Nástroje.\n"
 
-#: src/dialogs.c:2464
+#: src/dialogs.c:2534
 msgid ""
 "The current layout has audio, so audio channels may not be set to zero.\n"
 msgstr ""
 "Súčasné nastavenie obsahuje zvuk, ale zvukové kanály nemôžu byť nastavené na "
 "nulu.\n"
 
-#: src/dialogs.c:2468
+#: src/dialogs.c:2539
 msgid ""
 "Multitrack audio preview is only available with the\n"
 "\"jack\" or \"pulse audio\" audio player.\n"
@@ -5191,7 +5206,7 @@
 "\"jack\" alebo \"pulse audio\" prehrávačom.\n"
 "Môžete to nastaviť v Nástroje|Predvoľby|Prehrávanie."
 
-#: src/dialogs.c:2472
+#: src/dialogs.c:2545
 msgid ""
 "Errors were detected in the layout (which may be due to transferring from "
 "another system, or from an older version of LiVES).\n"
@@ -5201,7 +5216,7 @@
 "systému, alebo zo staršej verzie LiVES).\n"
 "Mám skúsiť opravu disku kópiou rozloženia?\n"
 
-#: src/dialogs.c:2476
+#: src/dialogs.c:2549
 msgid ""
 "LiVES was unable to load the layout.\n"
 "Sorry.\n"
@@ -5209,7 +5224,7 @@
 "LiVES nebol schopný načítať rozloženie.\n"
 "Ospravedlňujeme sa.\n"
 
-#: src/dialogs.c:2482
+#: src/dialogs.c:2555
 msgid ""
 "\n"
 "\n"
@@ -5219,7 +5234,7 @@
 "\n"
 "Zvukový pomer musí byť väčší ako 0.\n"
 
-#: src/dialogs.c:2486
+#: src/dialogs.c:2559
 msgid ""
 "\n"
 "Event list will be very large\n"
@@ -5231,7 +5246,7 @@
 "a jeho zobrazenie môže trvať veľmi dlho.\n"
 "Ste si istí, že chcete zobraziť?\n"
 
-#: src/dialogs.c:2491
+#: src/dialogs.c:2564
 msgid ""
 "\n"
 "\n"
@@ -5241,7 +5256,7 @@
 "\n"
 "Musíte nainštalovať 'dvgrab' aby ste mohli používať túto funkciu.\n"
 
-#: src/dialogs.c:2496
+#: src/dialogs.c:2570
 msgid ""
 "\n"
 "\n"
@@ -5250,19 +5265,19 @@
 "You may need to select one of these in Tools/Preferences/Playback.\n"
 msgstr ""
 
-#: src/dialogs.c:2500
+#: src/dialogs.c:2574
 msgid "Video playback plugin failed to initialise palette !\n"
 msgstr "Zlyhalo rozšírenie video prehrávania k inicializovaniu palety !\n"
 
-#: src/dialogs.c:2504
+#: src/dialogs.c:2579
 msgid "Decoder plugin failed to initialise palette !\n"
 msgstr "Zlyhalo rozšírenie dekodéra k inicializovaniu palety !\n"
 
-#: src/dialogs.c:2509
+#: src/dialogs.c:2584
 msgid "Unable to set framerate of video plugin\n"
 msgstr "Nedá sa nastaviť pomer snímkov video rozšírenia\n"
 
-#: src/dialogs.c:2514
+#: src/dialogs.c:2590
 msgid ""
 "After a crash, it is advisable to clean up the disk with\n"
 "File|Clean up disk space\n"
@@ -5270,7 +5285,7 @@
 "Po havárii, je vhodné použiť vyčistenie disku s\n"
 "Súbor|Čistenie disku\n"
 
-#: src/dialogs.c:2526
+#: src/dialogs.c:2604
 #, c-format
 msgid ""
 "Stream frame size is too large for your network buffers.\n"
@@ -5279,33 +5294,33 @@
 "echo %d > /proc/sys/net/core/rmem_max\n"
 msgstr ""
 
-#: src/dialogs.c:2714
+#: src/dialogs.c:2800
 msgid "cancelled.\n"
 msgstr "zrušené.\n"
 
-#: src/dialogs.c:2721
+#: src/dialogs.c:2805
 msgid "failed.\n"
 msgstr "zlyhalo.\n"
 
-#: src/dialogs.c:2728
+#: src/dialogs.c:2810
 msgid "done.\n"
 msgstr "dokončené.\n"
 
-#: src/dialogs.c:2732
+#: src/dialogs.c:2814
 msgid "error in file. Failed.\n"
 msgstr "chyba v súbore. Zlyhanie.\n"
 
-#: src/dialogs.c:2766 src/dialogs.c:2815 src/dialogs.c:2839
+#: src/dialogs.c:2848 src/dialogs.c:2897 src/dialogs.c:2921
 #, c-format
 msgid "Additional info: %s\n"
 msgstr ""
 
-#: src/dialogs.c:2769
+#: src/dialogs.c:2851
 #, c-format
 msgid "The error value was %d%s\n"
 msgstr ""
 
-#: src/dialogs.c:2772
+#: src/dialogs.c:2854
 #, c-format
 msgid ""
 "\n"
@@ -5315,7 +5330,7 @@
 "%s%s%s"
 msgstr ""
 
-#: src/dialogs.c:2818
+#: src/dialogs.c:2900
 #, c-format
 msgid ""
 "\n"
@@ -5325,7 +5340,7 @@
 "%s"
 msgstr ""
 
-#: src/dialogs.c:2842
+#: src/dialogs.c:2924
 #, c-format
 msgid ""
 "\n"
@@ -5335,7 +5350,7 @@
 "%s"
 msgstr ""
 
-#: src/dialogs.c:2886
+#: src/dialogs.c:2968
 #, c-format
 msgid ""
 "\n"
@@ -5344,7 +5359,7 @@
 "Please check for possible error causes.\n"
 msgstr ""
 
-#: src/dialogs.c:2890
+#: src/dialogs.c:2971
 #, c-format
 msgid ""
 "\n"
@@ -5354,7 +5369,7 @@
 "%s.\n"
 msgstr ""
 
-#: src/dialogs.c:2921
+#: src/dialogs.c:3002
 #, c-format
 msgid ""
 "\n"
@@ -5363,7 +5378,7 @@
 "Please check for possible error causes.\n"
 msgstr ""
 
-#: src/dialogs.c:2925
+#: src/dialogs.c:3005
 #, c-format
 msgid ""
 "\n"
@@ -5373,12 +5388,12 @@
 "%s.\n"
 msgstr ""
 
-#: src/dialogs.c:2993
+#: src/dialogs.c:3073
 #, c-format
 msgid "Value for \"%s\" could not be read."
 msgstr ""
 
-#: src/dialogs.c:3011
+#: src/dialogs.c:3091
 #, c-format
 msgid ""
 "\n"
@@ -5387,7 +5402,7 @@
 "Please check your system for errors.\n"
 msgstr ""
 
-#: src/dialogs.c:3020
+#: src/dialogs.c:3100
 #, c-format
 msgid ""
 "\n"
@@ -5400,7 +5415,7 @@
 "%s\n"
 "Prosím skontrolujte práva k súboru a skúste znova."
 
-#: src/dialogs.c:3027
+#: src/dialogs.c:3109
 #, c-format
 msgid ""
 "\n"
@@ -5413,7 +5428,7 @@
 "%s\n"
 "Skontrolujte, či máte oprávnenia pre adresár a skúste znova."
 
-#: src/dialogs.c:3034
+#: src/dialogs.c:3116
 #, c-format
 msgid ""
 "\n"
@@ -5421,14 +5436,14 @@
 "%s\n"
 msgstr ""
 
-#: src/dialogs.c:3041
+#: src/dialogs.c:3123
 msgid ""
 "\n"
 "Abort and exit immediately from LiVES\n"
 "Are you sure ?\n"
 msgstr ""
 
-#: src/dialogs.c:3047
+#: src/dialogs.c:3129
 #, c-format
 msgid ""
 "\n"
@@ -5439,7 +5454,7 @@
 "%s nemôže dekódovať klipy s obrázkami typu %s.\n"
 "Prosím vyberte iný dekodér zo zoznamu.\n"
 
-#: src/dialogs.c:3056
+#: src/dialogs.c:3139
 msgid ""
 "\n"
 "This card is already in use and cannot be opened multiple times.\n"
@@ -5447,7 +5462,7 @@
 "\n"
 "Táto karta je už používaná a nedá sa otvoriť viackrát.\n"
 
-#: src/dialogs.c:3061
+#: src/dialogs.c:3145
 #, c-format
 msgid ""
 "\n"
@@ -5462,27 +5477,27 @@
 "- Skontrolujte, či zariadenie nie je používané iným programom.\n"
 "- Skontrolujte, či zariadenie skutočne existuje.\n"
 
-#: src/dialogs.c:3068
+#: src/dialogs.c:3153
 msgid ""
 "\n"
 "This file already has subtitles loaded.\n"
 "Do you wish to overwrite the existing subtitles ?\n"
 msgstr ""
 
-#: src/dialogs.c:3072
+#: src/dialogs.c:3157
 msgid ""
 "\n"
 "LiVES currently only supports subtitles of type .srt and .sub.\n"
 msgstr ""
 
-#: src/dialogs.c:3076
+#: src/dialogs.c:3161
 msgid ""
 "\n"
 "Erase all subtitles from this clip.\n"
 "Are you sure ?\n"
 msgstr ""
 
-#: src/dialogs.c:3082
+#: src/dialogs.c:3168
 #, c-format
 msgid ""
 "\n"
@@ -5491,14 +5506,14 @@
 "or OK to continue and save as type \"%s\"\n"
 msgstr ""
 
-#: src/dialogs.c:3089
+#: src/dialogs.c:3176
 msgid ""
 "\n"
 "Do you wish to move the current clip sets to the new directory ?\n"
 "(If unsure, click Yes)\n"
 msgstr ""
 
-#: src/dialogs.c:3093
+#: src/dialogs.c:3181
 #, c-format
 msgid ""
 "\n"
@@ -5509,19 +5524,19 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:3099
+#: src/dialogs.c:3188
 msgid ""
 "\n"
 "No video input devices could be found.\n"
 msgstr ""
 
-#: src/dialogs.c:3103
+#: src/dialogs.c:3192
 msgid ""
 "\n"
 "All video input devices are already in use.\n"
 msgstr ""
 
-#: src/dialogs.c:3107
+#: src/dialogs.c:3196
 msgid ""
 "\n"
 "\n"
@@ -5529,15 +5544,14 @@
 "DO NOT SHUT DOWN OR CLOSE LIVES !\n"
 msgstr ""
 
-#: src/dialogs.c:3127
+#: src/dialogs.c:3203
 #, c-format
 msgid ""
 "No clips were recovered for set (%s).\n"
 "Please check the spelling of the set name and try again.\n"
 msgstr ""
 
-#. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:3136
+#: src/dialogs.c:3214
 #, c-format
 msgid ""
 "\n"
@@ -5549,7 +5563,7 @@
 msgstr ""
 
 #. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:3144
+#: src/dialogs.c:3222
 #, c-format
 msgid ""
 "\n"
@@ -5558,34 +5572,34 @@
 "\n"
 msgstr ""
 
-#: src/dialogs.c:3150
+#: src/dialogs.c:3228
 msgid ""
 "\n"
 "You must have autolives.pl installed and in your path to use this toy.\n"
 "Consult your package distributor.\n"
 msgstr ""
 
-#: src/dialogs.c:3154
+#: src/dialogs.c:3232
 msgid ""
 "\n"
 "You must have a minimum of one clip loaded to use this toy.\n"
 msgstr ""
 
-#: src/dialogs.c:3158
+#: src/dialogs.c:3236
 msgid ""
 "\n"
 "LiVES lost its connection to jack and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:3162
+#: src/dialogs.c:3240
 msgid ""
 "\n"
 "LiVES lost its connection to pulseaudio and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:3175
+#: src/dialogs.c:3254
 #, c-format
 msgid ""
 "\n"
@@ -5594,240 +5608,240 @@
 "Do you wish to allow this (for this session only) ?\n"
 msgstr ""
 
-#: src/effects.c:60
+#: src/effects.c:61
 msgid "generator"
 msgstr "generátor"
 
-#: src/effects.c:61
+#: src/effects.c:62
 msgid "Generators"
 msgstr "Generátory"
 
-#: src/effects.c:63
+#: src/effects.c:64
 msgid "audio generator"
 msgstr ""
 
-#: src/effects.c:64
+#: src/effects.c:65
 msgid "Audio Generators"
 msgstr ""
 
-#: src/effects.c:66
+#: src/effects.c:67
 msgid "audio/video generator"
 msgstr ""
 
-#: src/effects.c:67
+#: src/effects.c:68
 msgid "Audio/Video Generators"
 msgstr ""
 
-#: src/effects.c:69
+#: src/effects.c:70
 msgid "data generator"
 msgstr ""
 
-#: src/effects.c:70
+#: src/effects.c:71
 msgid "Data Generators"
 msgstr ""
 
-#: src/effects.c:72
+#: src/effects.c:73
 msgid "data visualiser"
 msgstr ""
 
-#: src/effects.c:73
+#: src/effects.c:74
 msgid "Data Visualisers"
 msgstr ""
 
-#: src/effects.c:75
+#: src/effects.c:76
 msgid "data processor"
 msgstr ""
 
-#: src/effects.c:76
+#: src/effects.c:77
 msgid "Data Processors"
 msgstr ""
 
-#: src/effects.c:78
+#: src/effects.c:79
 msgid "data source"
 msgstr ""
 
-#: src/effects.c:79
+#: src/effects.c:80
 msgid "Data Sources"
 msgstr ""
 
-#: src/effects.c:81
+#: src/effects.c:82
 msgid "transition"
 msgstr "prechod"
 
-#: src/effects.c:82
+#: src/effects.c:83
 msgid "Transitions"
 msgstr "Prechody"
 
-#: src/effects.c:84
+#: src/effects.c:85
 msgid "effect"
 msgstr "efekt"
 
-#: src/effects.c:87 src/rfx-builder.c:187
+#: src/effects.c:88 src/rfx-builder.c:187
 msgid "utility"
 msgstr "pomôcka"
 
-#: src/effects.c:88
+#: src/effects.c:89
 msgid "Utilities"
 msgstr "Pomôcky"
 
-#: src/effects.c:90
+#: src/effects.c:91
 msgid "compositor"
 msgstr "sádzač"
 
-#: src/effects.c:91
+#: src/effects.c:92
 msgid "Compositors"
 msgstr "Sádzače"
 
-#: src/effects.c:93
+#: src/effects.c:94
 msgid "tap"
 msgstr ""
 
-#: src/effects.c:94
+#: src/effects.c:95
 msgid "Taps"
 msgstr ""
 
-#: src/effects.c:96
+#: src/effects.c:97
 msgid "splitter"
 msgstr "rozdeľovač"
 
-#: src/effects.c:97
+#: src/effects.c:98
 msgid "Splitters"
 msgstr "Rozbočovače"
 
-#: src/effects.c:99
+#: src/effects.c:100
 msgid "converter"
 msgstr "konvertor"
 
-#: src/effects.c:100
+#: src/effects.c:101
 msgid "Converters"
 msgstr "Konvertory"
 
-#: src/effects.c:102
+#: src/effects.c:103
 msgid "analyser"
 msgstr ""
 
-#: src/effects.c:103
+#: src/effects.c:104
 msgid "Analysers"
 msgstr ""
 
-#: src/effects.c:108
+#: src/effects.c:109
 msgid "audio/video"
 msgstr "zvuk/video"
 
-#: src/effects.c:109
+#: src/effects.c:110
 msgid "Audio/Video Transitions"
 msgstr "Zvuk/Video prevody"
 
-#: src/effects.c:111
+#: src/effects.c:112
 msgid "video only"
 msgstr "iba video"
 
-#: src/effects.c:112
+#: src/effects.c:113
 msgid "Video only Transitions"
 msgstr "Iba prevody videa"
 
-#: src/effects.c:114 src/multitrack.c:10740
+#: src/effects.c:115 src/multitrack.c:10962
 msgid "audio only"
 msgstr "iba zvuk"
 
-#: src/effects.c:115
+#: src/effects.c:116
 msgid "Audio only Transitions"
 msgstr "Iba prevody zvuku"
 
-#: src/effects.c:117 src/effects.c:120 src/multitrack.c:18757
+#: src/effects.c:118 src/effects.c:121 src/multitrack.c:19097
 msgid "audio"
 msgstr "zvuk"
 
-#: src/effects.c:118
+#: src/effects.c:119
 msgid "Audio Mixers"
 msgstr "Mixovanie zvukov"
 
-#: src/effects.c:121
+#: src/effects.c:122
 msgid "Audio Effects"
 msgstr "Zvukové efekty"
 
-#: src/effects.c:123
+#: src/effects.c:124
 msgid "video"
 msgstr ""
 
-#: src/effects.c:124
+#: src/effects.c:125
 msgid "Video Effects"
 msgstr ""
 
-#: src/effects.c:126
+#: src/effects.c:127
 msgid "audio volume controller"
 msgstr "Ovládač hlasitosti zvuku"
 
-#: src/effects.c:127
+#: src/effects.c:128
 msgid "Audio Volume Controllers"
 msgstr "Ovládače hlasitosti zvuku"
 
-#: src/effects.c:129
+#: src/effects.c:130
 msgid "video analyser"
 msgstr ""
 
-#: src/effects.c:130
+#: src/effects.c:131
 msgid "Video analysers"
 msgstr ""
 
-#: src/effects.c:132
+#: src/effects.c:133
 msgid "audio analyser"
 msgstr ""
 
-#: src/effects.c:133
+#: src/effects.c:134
 msgid "Audio Analysers"
 msgstr ""
 
-#: src/effects.c:137 src/plugins.c:2559 src/plugins.c:2573
+#: src/effects.c:138 src/plugins.c:2507 src/plugins.c:2521
 msgid "unknown"
 msgstr "neznáme"
 
-#: src/effects.c:238
+#: src/effects.c:235
 #, c-format
 msgid "%s all frames..."
 msgstr "%s všetky snímky..."
 
-#: src/effects.c:243
+#: src/effects.c:239
 #, c-format
 msgid "%s clipboard into frames %d to %d..."
 msgstr "%s schránka na snímky %d do %d..."
 
-#: src/effects.c:250
+#: src/effects.c:245
 #, c-format
 msgid "%s to clipboard..."
 msgstr "%s do schránky..."
 
-#: src/effects.c:254
+#: src/effects.c:248
 #, c-format
 msgid "%s to new clip..."
 msgstr "%s do nových klipov..."
 
-#: src/effects.c:259
+#: src/effects.c:252
 #, c-format
 msgid "%s frames %d to %d..."
 msgstr "%s snímkov %d do %d..."
 
-#: src/effects.c:290
+#: src/effects.c:283
 #, c-format
 msgid "%s clipboard with selection"
 msgstr "%s schránka s výberom"
 
-#: src/effects.c:295
+#: src/effects.c:287
 #, c-format
 msgid "%s to clipboard"
 msgstr "%s do schránky"
 
-#: src/effects.c:299
+#: src/effects.c:290
 #, c-format
 msgid "%s to new clip"
 msgstr "%s do nového klipu"
 
-#: src/effects.c:304
+#: src/effects.c:294
 #, c-format
 msgid "%s frames %d to %d"
 msgstr "%s snímkov %d do %d"
 
-#: src/effects.c:456 src/effects.c:523
+#: src/effects.c:443 src/effects.c:507
 msgid ""
 "\n"
 "No frames were generated.\n"
@@ -5835,46 +5849,46 @@
 "\n"
 "Neboli generované snímky.\n"
 
-#: src/effects-weed.c:431
+#: src/effects-weed.c:452
 msgid "integer"
 msgstr ""
 
-#: src/effects-weed.c:432
+#: src/effects-weed.c:454
 msgid "int64"
 msgstr ""
 
-#: src/effects-weed.c:433
+#: src/effects-weed.c:456
 msgid "boolean"
 msgstr ""
 
-#: src/effects-weed.c:434
+#: src/effects-weed.c:458
 msgid "double"
 msgstr ""
 
-#: src/effects-weed.c:435
+#: src/effects-weed.c:460
 msgid "string"
 msgstr ""
 
-#: src/effects-weed.c:436
+#: src/effects-weed.c:462
 msgid "pointer"
 msgstr ""
 
-#: src/effects-weed.c:4591
+#: src/effects-weed.c:4581
 #, c-format
 msgid "Error: plugin %s has no weed_setup() function.\n"
 msgstr "Chyba: rozšírenie %s nemá weed_setup () funkciu.\n"
 
-#: src/effects-weed.c:4606
+#: src/effects-weed.c:4595
 #, c-format
 msgid "No usable filters found in plugin %s\n"
 msgstr ""
 
-#: src/effects-weed.c:4680
+#: src/effects-weed.c:4668
 #, c-format
 msgid "Found duplicate plugin %s"
 msgstr ""
 
-#: src/effects-weed.c:4734
+#: src/effects-weed.c:4723
 #, c-format
 msgid ""
 "Info: Unable to load plugin %s\n"
@@ -5883,259 +5897,259 @@
 "Info: Nemožno nahrať rozšírenie %s\n"
 "Chyba bola: %s\n"
 
-#: src/effects-weed.c:4737 src/effects-weed.c:5858
+#: src/effects-weed.c:4726 src/effects-weed.c:5847
 msgid "Some plugin directories"
 msgstr ""
 
 #. TRANSLATORS: example " - LADSPA plugins -"
-#: src/effects-weed.c:4812 src/rte_window.c:2105
+#: src/effects-weed.c:4801 src/rte_window.c:2107
 #, c-format
 msgid " - %s plugins -"
 msgstr ""
 
-#: src/effects-weed.c:5012
+#: src/effects-weed.c:4998
 #, c-format
 msgid "Successfully loaded %d Weed filters\n"
 msgstr "Úspešne načítané %d Weed filtre\n"
 
-#: src/effects-weed.c:5177
+#: src/effects-weed.c:5162
 #, c-format
 msgid "Invalid compound effect %s - has conflicting target_fps\n"
 msgstr ""
 
-#: src/effects-weed.c:5197
+#: src/effects-weed.c:5182
 #, c-format
 msgid "Invalid compound effect %s - has multiple transition parameters\n"
 msgstr ""
 
-#: src/effects-weed.c:5211
+#: src/effects-weed.c:5196
 #, c-format
 msgid "Invalid compound effect %s - has multiple master volume parameters\n"
 msgstr ""
 
-#: src/effects-weed.c:5346
+#: src/effects-weed.c:5329
 #, c-format
 msgid "Invalid compound effect %s - must have >1 sub filters\n"
 msgstr ""
 
-#: src/effects-weed.c:5366
+#: src/effects-weed.c:5349
 #, c-format
 msgid "Invalid effect %s found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5381
+#: src/effects-weed.c:5364
 #, c-format
 msgid "Invalid default found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5392
+#: src/effects-weed.c:5375
 #, c-format
 msgid "Invalid filter %d for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5406
+#: src/effects-weed.c:5389
 #, c-format
 msgid "Invalid param %d for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5433
+#: src/effects-weed.c:5416
 #, c-format
 msgid ""
 "Invalid number of values for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5467
+#: src/effects-weed.c:5450
 #, c-format
 msgid ""
 "Invalid non-boolean value for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5500
+#: src/effects-weed.c:5483
 #, c-format
 msgid "Invalid param link found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5511
+#: src/effects-weed.c:5494
 #, c-format
 msgid ""
 "Invalid out filter %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5529
+#: src/effects-weed.c:5513
 #, c-format
 msgid ""
 "Invalid out param %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5541
+#: src/effects-weed.c:5526
 #, c-format
 msgid ""
 "Invalid non-boolean value for autoscale found in compound effect %s, line "
 "%d\n"
 msgstr ""
 
-#: src/effects-weed.c:5552
+#: src/effects-weed.c:5537
 #, c-format
 msgid ""
 "Invalid in filter %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5566
+#: src/effects-weed.c:5552
 #, c-format
 msgid ""
 "Invalid in param %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5594
+#: src/effects-weed.c:5581
 #, c-format
 msgid "Invalid channel link found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5605
+#: src/effects-weed.c:5592
 #, c-format
 msgid ""
 "Invalid out filter %d for link channels found in compound effect %s, line "
 "%d\n"
 msgstr ""
 
-#: src/effects-weed.c:5623
+#: src/effects-weed.c:5611
 #, c-format
 msgid ""
 "Invalid out channel %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5633
+#: src/effects-weed.c:5622
 #, c-format
 msgid ""
 "Invalid in filter %d for link channels found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5651
+#: src/effects-weed.c:5641
 #, c-format
 msgid ""
 "Invalid in channel %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5687
+#: src/effects-weed.c:5678
 #, c-format
 msgid "Compound:%s"
 msgstr ""
 
-#: src/effects-weed.c:5758
+#: src/effects-weed.c:5749
 #, c-format
 msgid "Successfully loaded %d compound filters\n"
 msgstr ""
 
-#: src/effects-weed.c:6591
+#: src/effects-weed.c:6570
 #, c-format
 msgid "Effect %s cannot be used with this audio player.\n"
 msgstr ""
 
-#: src/effects-weed.c:6737
+#: src/effects-weed.c:6718
 #, c-format
 msgid "Failed to start instance %s, error code %d\n"
 msgstr "Nepodarilo sa spustiť inštanciu %s, kód chyby %d\n"
 
-#: src/effects-weed.c:6814
+#: src/effects-weed.c:6797
 #, c-format
 msgid "Unable to start generator %s\n"
 msgstr "Nedá sa spustiť generátor %s\n"
 
-#: src/effects-weed.c:7621
+#: src/effects-weed.c:7607
 #, c-format
 msgid "Failed to start generator %s\n"
 msgstr "Nepodarilo sa spustiť generátor %s\n"
 
-#: src/effects-weed.c:7718
+#: src/effects-weed.c:7701
 #, c-format
 msgid "Failed to start generator %s, error %d\n"
 msgstr "Nepodarilo sa spustiť generátor %s, chyba %d\n"
 
-#: src/effects-weed.c:9012
+#: src/effects-weed.c:8993
 #, c-format
 msgid "%s [unstable] (%s)"
 msgstr ""
 
-#: src/effects-data.c:3278
+#: src/effects-data.c:3234
 #, c-format
 msgid "ACTIVATE (%s)"
 msgstr ""
 
-#: src/effects-data.c:3548
+#: src/effects-data.c:3501
 msgid "ACTIVATE"
 msgstr ""
 
-#: src/effects-data.c:3876
+#: src/effects-data.c:3829
 #, c-format
 msgid "Key slot %d"
 msgstr ""
 
-#: src/effects-data.c:3998
+#: src/effects-data.c:3951
 msgid "Autoscale"
 msgstr ""
 
-#: src/effects-data.c:4089
+#: src/effects-data.c:4042
 msgid "Add another connection for this output parameter"
 msgstr ""
 
-#: src/effects-data.c:4102 src/effects-data.c:4151
+#: src/effects-data.c:4055 src/effects-data.c:4104
 #, fuzzy
 msgid "Delete this connection"
 msgstr "_Odstrániť tento efekt"
 
-#: src/effects-data.c:4138
+#: src/effects-data.c:4091
 msgid "Add another connection for this output channel"
 msgstr ""
 
-#: src/effects-data.c:4223
+#: src/effects-data.c:4176
 msgid "Connected to -->"
 msgstr ""
 
-#: src/effects-data.c:4243
+#: src/effects-data.c:4196
 #, c-format
 msgid "%s - Alpha Channel Connections"
 msgstr ""
 
-#: src/effects-data.c:4316
+#: src/effects-data.c:4269
 #, c-format
 msgid "%s - Parameter Data Connections"
 msgstr ""
 
-#: src/effects-data.c:4336
+#: src/effects-data.c:4289
 msgid "Autoscale All"
 msgstr ""
 
-#: src/effects-data.c:4361 src/effects-data.c:4890
+#: src/effects-data.c:4314 src/effects-data.c:4841
 msgid "ACTIVATED"
 msgstr ""
 
-#: src/effects-data.c:4774
+#: src/effects-data.c:4726
 msgid "LiVES: - Parameter and Alpha Channel Connections"
 msgstr ""
 
-#: src/effects-data.c:4785
+#: src/effects-data.c:4736
 msgid "Auto Connect Channels"
 msgstr ""
 
-#: src/effects-data.c:4797
+#: src/effects-data.c:4748
 msgid "Auto Connect Parameters"
 msgstr ""
 
-#: src/effects-data.c:4807
+#: src/effects-data.c:4758
 msgid "Disconnect All"
 msgstr ""
 
-#: src/effects-data.c:4875
+#: src/effects-data.c:4826
 #, c-format
 msgid "Input channel is already connected from (%d,%d) %s"
 msgstr ""
 
-#: src/effects-data.c:4891
+#: src/effects-data.c:4842
 #, c-format
 msgid "Input parameter is already connected from (%d,%d) %s"
 msgstr ""
 
-#: src/effects-data.c:4899
+#: src/effects-data.c:4851
 msgid "Input and output parameters are not compatible"
 msgstr ""
 
@@ -6147,43 +6161,43 @@
 msgid "_Reset Values"
 msgstr "_Vymazanie hodnôt"
 
-#: src/framedraw.c:267
+#: src/framedraw.c:265
 msgid "_Frame"
 msgstr ""
 
-#: src/paramspecial.c:266
+#: src/paramspecial.c:259
 msgid "Maintain _Aspect Ratio"
 msgstr "Zachovať _pomer strán"
 
-#: src/paramspecial.c:267
+#: src/paramspecial.c:260
 msgid "Maintain aspect ratio of original frame"
 msgstr "Zachovať pomer strán pôvodnej snímky"
 
-#: src/paramspecial.c:341
+#: src/paramspecial.c:335
 msgid "Display Password"
 msgstr ""
 
-#: src/paramwindow.c:450
+#: src/paramwindow.c:447
 msgid "Transition _In"
 msgstr "Prechod _v"
 
-#: src/paramwindow.c:452
+#: src/paramwindow.c:449
 msgid "Click to set the transition parameter to show only the front frame"
 msgstr ""
 
-#: src/paramwindow.c:474
+#: src/paramwindow.c:472
 msgid "Crossfade audio"
 msgstr ""
 
-#: src/paramwindow.c:475
+#: src/paramwindow.c:473
 msgid "Check the box to make audio transition with the video"
 msgstr "Začiarknite políčko, pre urobenie prechodu zvuku  s videom"
 
-#: src/paramwindow.c:493
+#: src/paramwindow.c:492
 msgid "Transition _Out"
 msgstr "Prechod _z"
 
-#: src/paramwindow.c:495
+#: src/paramwindow.c:494
 msgid "Click to set the transition parameter to show only the rear frame"
 msgstr ""
 
@@ -6196,23 +6210,23 @@
 msgid "%s : size"
 msgstr "%s : veľkosť"
 
-#: src/paramwindow.c:598
+#: src/paramwindow.c:597
 msgid "New size (pixels)"
 msgstr "Nová veľkosť (pixely)"
 
-#: src/paramwindow.c:617 src/plugins.c:997
+#: src/paramwindow.c:616 src/plugins.c:973
 msgid "_Width"
 msgstr "_Šírka"
 
-#: src/paramwindow.c:636 src/plugins.c:1003
+#: src/paramwindow.c:635 src/plugins.c:979
 msgid "_Height"
 msgstr "_Výška"
 
-#: src/paramwindow.c:684
+#: src/paramwindow.c:683
 msgid "Generate to _Clipboard"
 msgstr "Generovať do _schránky"
 
-#: src/paramwindow.c:686
+#: src/paramwindow.c:685
 msgid "Generate frames to the clipboard"
 msgstr "Generovať snímky do schránky"
 
@@ -6224,7 +6238,7 @@
 msgid "Generate frames to a new clip"
 msgstr "Generovať snímky do nového klipu"
 
-#: src/paramwindow.c:822
+#: src/paramwindow.c:824
 #, c-format
 msgid ""
 "\n"
@@ -6235,59 +6249,59 @@
 "Musíte vybrať najmenej %d snímkov k použitiu tohto efektu.\n"
 "\n"
 
-#: src/paramwindow.c:920 src/paramwindow.c:930
+#: src/paramwindow.c:934 src/paramwindow.c:942
 msgid "Set as default"
 msgstr "Nastaviť ako štandardné"
 
-#: src/paramwindow.c:922 src/paramwindow.c:938
+#: src/paramwindow.c:936 src/paramwindow.c:950
 msgid "Reset"
 msgstr ""
 
-#: src/paramwindow.c:932 src/rte_window.c:2401 src/omc-learn.c:1357
+#: src/paramwindow.c:944 src/rte_window.c:2394 src/omc-learn.c:1347
 msgid "Close _window"
 msgstr "Zavrieť okno"
 
-#: src/paramwindow.c:1337
+#: src/paramwindow.c:1340
 msgid "No parameters"
 msgstr "Žiadne parametre"
 
-#: src/paramwindow.c:1419
+#: src/paramwindow.c:1424
 msgid "Invalid parameter"
 msgstr "Neplatný parameter"
 
-#: src/paramwindow.c:1611
+#: src/paramwindow.c:1610
 msgid "LiVES: - Select Colour"
 msgstr "LiVES: - Vybrať farbu"
 
-#: src/paramwindow.c:1616
+#: src/paramwindow.c:1615
 msgid "Click to set the colour"
 msgstr "Kliknite pre nastavenie farby"
 
-#: src/paramwindow.c:1628
+#: src/paramwindow.c:1626
 msgid "_Red"
 msgstr ""
 
-#: src/paramwindow.c:1629
+#: src/paramwindow.c:1627
 msgid "The red value (0 - 255)"
 msgstr "Červená hodnota (0 - 255)"
 
-#: src/paramwindow.c:1632
+#: src/paramwindow.c:1630
 msgid "_Green"
 msgstr ""
 
-#: src/paramwindow.c:1633
+#: src/paramwindow.c:1631
 msgid "The green value (0 - 255)"
 msgstr "Zelená hodnota (0 - 255)"
 
-#: src/paramwindow.c:1636
+#: src/paramwindow.c:1634
 msgid "_Blue"
 msgstr ""
 
-#: src/paramwindow.c:1637
+#: src/paramwindow.c:1635
 msgid "The blue value (0 - 255)"
 msgstr "Modrá hodnota (0 - 255)"
 
-#: src/plugins.c:85
+#: src/plugins.c:86
 #, c-format
 msgid ""
 "\n"
@@ -6296,12 +6310,12 @@
 "\n"
 "Chyba rozšírenia: %s chyba s kódom %d"
 
-#: src/plugins.c:87
+#: src/plugins.c:88
 #, c-format
 msgid " : message was %s\n"
 msgstr " : správa %s\n"
 
-#: src/plugins.c:387
+#: src/plugins.c:375
 #, c-format
 msgid ""
 "\n"
@@ -6316,17 +6330,17 @@
 "%s\n"
 "Kód chyby %d\n"
 
-#: src/plugins.c:397
+#: src/plugins.c:385
 #, c-format
 msgid "Updating video playback plugin defaults in %s\n"
 msgstr "Aktualizácia prehrania rozšírenia videa predvolene v %s\n"
 
-#: src/plugins.c:452
+#: src/plugins.c:444
 #, c-format
 msgid "Loading video playback plugin defaults from %s..."
 msgstr "Načítavam video rozšírenie predvolene z %s..."
 
-#: src/plugins.c:515
+#: src/plugins.c:505
 #, c-format
 msgid ""
 "\n"
@@ -6341,32 +6355,32 @@
 " Nástroje|Preferences|Prehrávanie|Pokročilé rozšírenie prehrávania\n"
 "\n"
 
-#: src/plugins.c:855
+#: src/plugins.c:836
 #, c-format
 msgid "Saving playback plugin defaults to %s..."
 msgstr ""
 
-#: src/plugins.c:962
+#: src/plugins.c:939
 msgid "_FPS"
 msgstr "_FPS"
 
-#: src/plugins.c:963
+#: src/plugins.c:940
 msgid "Fixed framerate for plugin.\n"
 msgstr "Fixný počet snímkov pre rozšírenie.\n"
 
-#: src/plugins.c:1032
+#: src/plugins.c:1008
 msgid "_Colourspace"
 msgstr "_Farebný priestor"
 
-#: src/plugins.c:1033
+#: src/plugins.c:1009
 msgid "Colourspace input to the plugin.\n"
 msgstr ""
 
-#: src/plugins.c:1089
+#: src/plugins.c:1065
 msgid "Save settings to an alternate file.\n"
 msgstr ""
 
-#: src/plugins.c:1206
+#: src/plugins.c:1182
 #, c-format
 msgid ""
 "\n"
@@ -6379,7 +6393,7 @@
 "Zlyhalo otvorenie rozšírenia prehrávanie %s\n"
 "Chyba bola: %s\n"
 
-#: src/plugins.c:1252
+#: src/plugins.c:1228
 #, c-format
 msgid ""
 "\n"
@@ -6394,7 +6408,7 @@
 "chýbajú povinné funkcie.\n"
 "Nedá sa použiť.\n"
 
-#: src/plugins.c:1265
+#: src/plugins.c:1241
 #, c-format
 msgid ""
 "Video playback plugin failed to initialise.\n"
@@ -6403,14 +6417,14 @@
 "Nepodarilo sa inicializovať rozšírenie videa.\n"
 "Chyba bola: %s\n"
 
-#: src/plugins.c:1461
+#: src/plugins.c:1428
 msgid ""
 "\n"
 "Warning ! Video playback plugin will not send key presses. Keyboard may be "
 "disabled during plugin use !\n"
 msgstr ""
 
-#: src/plugins.c:1465
+#: src/plugins.c:1433
 #, c-format
 msgid ""
 "*** Using %s plugin for fs playback, agreed to use palette type %d ( %s ). "
@@ -6419,17 +6433,17 @@
 "*** Použitím %s rozšírenia pre fs prehrávanie, súhlasíte s použitím palety "
 "typu %d ( %s ).***\n"
 
-#: src/plugins.c:1571
+#: src/plugins.c:1537
 #, c-format
 msgid "Audio stream unable to use preferred format '%s'\n"
 msgstr ""
 
-#: src/plugins.c:1579
+#: src/plugins.c:1543
 #, c-format
 msgid "Using format '%s' instead.\n"
 msgstr ""
 
-#: src/plugins.c:1616
+#: src/plugins.c:1579
 #, c-format
 msgid ""
 "LiVES was unable to find its encoder plugins. Please make sure you have the "
@@ -6438,7 +6452,7 @@
 "or change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/plugins.c:1624
+#: src/plugins.c:1589
 #, c-format
 msgid ""
 "LiVES did not receive a response from the encoder plugin called '%s'.\n"
@@ -6447,11 +6461,11 @@
 "or switch to another plugin using Tools|Preferences|Encoding\n"
 msgstr ""
 
-#: src/plugins.c:2032
+#: src/plugins.c:1987
 msgid "Unable to resize, please install imageMagick\n"
 msgstr "Nedá sa zmeniť veľkosť, prosím nainštalujte imageMagic\n"
 
-#: src/plugins.c:2231
+#: src/plugins.c:2183
 #, c-format
 msgid ""
 "\n"
@@ -6459,12 +6473,12 @@
 "No decoders found in %s !\n"
 msgstr ""
 
-#: src/plugins.c:2415
+#: src/plugins.c:2369
 #, fuzzy, c-format
 msgid " using %s"
 msgstr "Otváram %s"
 
-#: src/plugins.c:2499
+#: src/plugins.c:2451
 #, c-format
 msgid ""
 "\n"
@@ -6477,7 +6491,7 @@
 "Nepodarilo sa otvoriť rozšírenie dekodéra  %s\n"
 "Chyba bola %s\n"
 
-#: src/plugins.c:2522
+#: src/plugins.c:2472
 #, c-format
 msgid ""
 "\n"
@@ -6492,24 +6506,24 @@
 "chýbajú povinné funkcie.\n"
 "Nedá sa použiť.\n"
 
-#: src/plugins.c:2564
+#: src/plugins.c:2512
 msgid "/unknown"
 msgstr "/neznámy"
 
-#: src/plugins.c:2651
+#: src/plugins.c:2598
 msgid "LiVES: - Decoder Plugins"
 msgstr ""
 
-#: src/plugins.c:2669
+#: src/plugins.c:2616
 msgid "Enabled Video Decoders (uncheck to disable)"
 msgstr ""
 
-#: src/plugins.c:2726
+#: src/plugins.c:2672
 #, c-format
 msgid "Failed to load %s, transitions may not resize.\n"
 msgstr "Zlyhalo spustenie %s, nie je možné zmenit veľkosť prechodu.\n"
 
-#: src/plugins.c:3854
+#: src/plugins.c:3797
 #, c-format
 msgid "%s advanced settings"
 msgstr "%s pokročilé nastavenia"
@@ -6518,15 +6532,15 @@
 msgid "LiVES: - New Test RFX"
 msgstr "LiVES: - Nový test RFX"
 
-#: src/rfx-builder.c:136
+#: src/rfx-builder.c:135
 msgid "LiVES: - Edit Test RFX"
 msgstr "LiVES: - Upraviť test RFX"
 
-#: src/rfx-builder.c:166
+#: src/rfx-builder.c:165
 msgid "Type:"
 msgstr "Typ:"
 
-#: src/rfx-builder.c:184
+#: src/rfx-builder.c:183
 msgid "tool"
 msgstr ""
 
@@ -6538,126 +6552,126 @@
 msgid "The name of the plugin. No spaces allowed."
 msgstr "Názov rozšírenia. Bez medzier."
 
-#: src/rfx-builder.c:201
+#: src/rfx-builder.c:202
 msgid "Version:       "
 msgstr "Verzia       "
 
-#: src/rfx-builder.c:203
+#: src/rfx-builder.c:204
 msgid "The script version."
 msgstr "Verzia skriptu."
 
-#: src/rfx-builder.c:210
+#: src/rfx-builder.c:212
 msgid "    Author:       "
 msgstr "    Autor       "
 
-#: src/rfx-builder.c:211
+#: src/rfx-builder.c:213
 msgid "The script author."
 msgstr "Autor skriptu."
 
-#: src/rfx-builder.c:217
+#: src/rfx-builder.c:220
 msgid "    URL (optional):       "
 msgstr "    URL (nepovinné):       "
 
-#: src/rfx-builder.c:218
+#: src/rfx-builder.c:221
 msgid "URL for the plugin maintainer."
 msgstr "URL pre správcu rozšírenia."
 
-#: src/rfx-builder.c:226
+#: src/rfx-builder.c:230
 msgid "Menu text:    "
 msgstr "Text menu:    "
 
-#: src/rfx-builder.c:227
+#: src/rfx-builder.c:231
 msgid "The text to show in the menu."
 msgstr "Text zobrazený v menu."
 
-#: src/rfx-builder.c:239
+#: src/rfx-builder.c:244
 msgid "Action description:        "
 msgstr "Popis akcie:        "
 
-#: src/rfx-builder.c:241
+#: src/rfx-builder.c:246
 msgid "Describe what the plugin is doing. E.g. \"Edge detecting\""
 msgstr "Opíšte, čo plugin robí. Napr. \"Odhaľovanie rohov\""
 
-#: src/rfx-builder.c:246
+#: src/rfx-builder.c:251
 msgid "Minimum frames:"
 msgstr "Minimálny počet snímkov:"
 
-#: src/rfx-builder.c:249
+#: src/rfx-builder.c:254
 msgid ""
 "Minimum number of frames this effect/tool can be applied to. Normally 1."
 msgstr ""
 "Minimálny počet snímkov, ktorým nemôže byť tento efekt/nástroj aplikovaný. "
 "Normálne 1."
 
-#: src/rfx-builder.c:260
+#: src/rfx-builder.c:265
 msgid "_Requirements..."
 msgstr "_Požiadavky..."
 
-#: src/rfx-builder.c:263
+#: src/rfx-builder.c:268
 msgid "Enter any binaries required by the plugin."
 msgstr "Vypíšte binárky požadované rozšírením."
 
-#: src/rfx-builder.c:267
+#: src/rfx-builder.c:272
 msgid "_Properties..."
 msgstr "_Vlastnosti..."
 
-#: src/rfx-builder.c:270
+#: src/rfx-builder.c:275
 msgid "Set properties for the plugin. Optional."
 msgstr "Nastaviť vlastnosti pre rozšírenie. Nepovinné."
 
-#: src/rfx-builder.c:274
+#: src/rfx-builder.c:279
 msgid "_Parameters..."
 msgstr "_Parametre..."
 
-#: src/rfx-builder.c:277
+#: src/rfx-builder.c:282
 msgid "Set up parameters used in pre/loop/post/trigger code. Optional."
 msgstr "Nastaviť parametre použité v pre/sľučka/po/spúšťač kódu. Nepovinné."
 
-#: src/rfx-builder.c:281
+#: src/rfx-builder.c:286
 msgid "Parameter _Window Hints..."
 msgstr "Parameter _okna nápovedy..."
 
-#: src/rfx-builder.c:284
+#: src/rfx-builder.c:289
 msgid "Set hints about how to lay out the parameter window. Optional."
 msgstr "Nastaviť nápovedy ako rozložiť okno s parametrami. Nepovinné."
 
-#: src/rfx-builder.c:290
+#: src/rfx-builder.c:295
 msgid "_Language code:"
 msgstr ""
 
-#: src/rfx-builder.c:291
+#: src/rfx-builder.c:296
 msgid "Language for pre/loop/post/triggers. Optional."
 msgstr "Jazyk pre pre/sľučka/post/triggers. Nepovinné."
 
-#: src/rfx-builder.c:300
+#: src/rfx-builder.c:305
 msgid "_Pre loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:303
+#: src/rfx-builder.c:308
 msgid "Code to be executed before the loop. Optional."
 msgstr "Kód spustený pred sľučkou. Nepovinné."
 
-#: src/rfx-builder.c:307
+#: src/rfx-builder.c:312
 msgid "_Loop code..."
 msgstr "_Kód sľučky..."
 
-#: src/rfx-builder.c:310
+#: src/rfx-builder.c:315
 msgid "Loop code to be applied to each frame."
 msgstr "Kód sľučky použitý na každý snímok."
 
-#: src/rfx-builder.c:314
+#: src/rfx-builder.c:319
 msgid "_Post loop code..."
 msgstr "Kód _po sľučke..."
 
-#: src/rfx-builder.c:317
+#: src/rfx-builder.c:322
 msgid "Code to be executed after the loop. Optional."
 msgstr "Kód spustený po sľučke. Nepovinné."
 
-#: src/rfx-builder.c:321
+#: src/rfx-builder.c:326
 msgid "_Trigger code..."
 msgstr "_Spúšťací kód..."
 
-#: src/rfx-builder.c:324
+#: src/rfx-builder.c:329
 msgid ""
 "Set trigger code for when the parameter window is shown, or when a parameter "
 "is changed. Optional (except for Utilities)."
@@ -6665,7 +6679,7 @@
 "Nastaviť spúšťací kód pre situáciu, kedy parameter okna je zobrazený, alebo "
 "parameter je pozmenený. Nepovinné (okrem Pomôcok)."
 
-#: src/rfx-builder.c:421
+#: src/rfx-builder.c:426
 #, c-format
 msgid ""
 "\n"
@@ -6680,55 +6694,55 @@
 "%s\n"
 "%s\n"
 
-#: src/rfx-builder.c:544
+#: src/rfx-builder.c:541
 msgid "LiVES: - RFX Requirements"
 msgstr "LiVES: - RFX požiadavky"
 
-#: src/rfx-builder.c:548
+#: src/rfx-builder.c:544
 msgid "LiVES: - RFX Parameters"
 msgstr "LiVES: - RFX Parametre"
 
-#: src/rfx-builder.c:552
+#: src/rfx-builder.c:547
 msgid "LiVES: - RFX Parameter Window Hints"
 msgstr "LiVES: - RFX Parametre okna nápovedy"
 
-#: src/rfx-builder.c:556
+#: src/rfx-builder.c:550
 msgid "LiVES: - RFX Triggers"
 msgstr "LiVES: - RFX Spúšťače"
 
-#: src/rfx-builder.c:622
+#: src/rfx-builder.c:613
 msgid "_New Entry"
 msgstr "_Nový záznam"
 
-#: src/rfx-builder.c:625
+#: src/rfx-builder.c:616
 msgid "_Edit Entry"
 msgstr "_Upraviť záznam"
 
-#: src/rfx-builder.c:628
+#: src/rfx-builder.c:619
 msgid "_Remove Entry"
 msgstr "_Odstrániť záznam"
 
-#: src/rfx-builder.c:632
+#: src/rfx-builder.c:623
 msgid "Move _Up"
 msgstr "Presunúť _hore"
 
-#: src/rfx-builder.c:635
+#: src/rfx-builder.c:626
 msgid "Move _Down"
 msgstr "Posunúť _dolu"
 
-#: src/rfx-builder.c:1004
+#: src/rfx-builder.c:984
 msgid "LiVES: - RFX Properties"
 msgstr "LiVES: - RFX Vlastnosti"
 
-#: src/rfx-builder.c:1013
+#: src/rfx-builder.c:993
 msgid "_Slow (hint to GUI)"
 msgstr "_Pomaly (nápověda GUI)"
 
-#: src/rfx-builder.c:1024
+#: src/rfx-builder.c:1004
 msgid "_Batch mode generator"
 msgstr "_Generátor dávkového režimu"
 
-#: src/rfx-builder.c:1831
+#: src/rfx-builder.c:1790
 msgid ""
 "\n"
 "\n"
@@ -6742,7 +6756,7 @@
 "Prosím najskôr odstránte spúšťač.\n"
 "\n"
 
-#: src/rfx-builder.c:1875
+#: src/rfx-builder.c:1834
 msgid ""
 "\n"
 "\n"
@@ -6754,27 +6768,27 @@
 "Niektoré spúšťače boli nastavené.\n"
 "Prosím skontrolujte kód spúšťača.\n"
 
-#: src/rfx-builder.c:1994
+#: src/rfx-builder.c:1950
 msgid "LiVES: - New RFX Parameter"
 msgstr "LiVES: - Nový RFX Parameter"
 
-#: src/rfx-builder.c:1997
+#: src/rfx-builder.c:1952
 msgid "LiVES: - Edit RFX Parameter"
 msgstr "LiVES: - Upraviť RFX Parameter"
 
-#: src/rfx-builder.c:2013
+#: src/rfx-builder.c:1968
 msgid "_Name:    "
 msgstr "_Názov:    "
 
-#: src/rfx-builder.c:2016
+#: src/rfx-builder.c:1971
 msgid "Name of the parameter, must be unique in the plugin."
 msgstr "Názov parametru musí byť v rozšírení jedinečný."
 
-#: src/rfx-builder.c:2025
+#: src/rfx-builder.c:1981
 msgid "_Label:    "
 msgstr "_Štítok    "
 
-#: src/rfx-builder.c:2028
+#: src/rfx-builder.c:1984
 msgid ""
 "Label to be shown by the parameter. An underscore represents mnemonic "
 "accelerator."
@@ -6782,158 +6796,158 @@
 "Štítok zobrazený parametrom. Podtrhnutie predstavuje mnemotechnický "
 "akcelerátor."
 
-#: src/rfx-builder.c:2039
+#: src/rfx-builder.c:1996
 msgid "_Type:         "
 msgstr "_Typ         "
 
-#: src/rfx-builder.c:2040
+#: src/rfx-builder.c:1997
 msgid "Parameter type (select from list)."
 msgstr "Typ prametra (vybrať zo zoznamu)."
 
-#: src/rfx-builder.c:2073
+#: src/rfx-builder.c:2029
 msgid "Decimal _places: "
 msgstr "Desatinné _miesta: "
 
-#: src/rfx-builder.c:2082 src/rfx-builder.c:2477 src/rfx-builder.c:2495
+#: src/rfx-builder.c:2038 src/rfx-builder.c:2430 src/rfx-builder.c:2447
 msgid "_Default value:    "
 msgstr "_Predvolená hodnota:    "
 
-#: src/rfx-builder.c:2098
+#: src/rfx-builder.c:2054
 msgid "_Default: "
 msgstr "Predvolené: "
 
-#: src/rfx-builder.c:2132
+#: src/rfx-builder.c:2087
 msgid "Button _Group: "
 msgstr "Tlačítko _Skupina: "
 
-#: src/rfx-builder.c:2134
+#: src/rfx-builder.c:2089
 msgid "A non-zero value can be used to group radio buttons."
 msgstr "Nie-nulová hodnota môže byť použitá pre skupinu prepínačov."
 
-#: src/rfx-builder.c:2142 src/rfx-builder.c:2478
+#: src/rfx-builder.c:2097 src/rfx-builder.c:2431
 msgid "_Minimum value: "
 msgstr "_Minimálna hodnota: "
 
-#: src/rfx-builder.c:2148 src/rfx-builder.c:2479
+#: src/rfx-builder.c:2103 src/rfx-builder.c:2432
 msgid "Ma_ximum value: "
 msgstr "Ma_ximálna hodnota: "
 
-#: src/rfx-builder.c:2157
+#: src/rfx-builder.c:2113
 msgid "     _Step size:   "
 msgstr "     _Veľkosť kroku:   "
 
-#: src/rfx-builder.c:2160
+#: src/rfx-builder.c:2117
 msgid ""
 "How much the parameter is adjusted when the spinbutton arrows are pressed."
 msgstr "O koľko je upravený parametr po stlačení otáčacích šípiek."
 
-#: src/rfx-builder.c:2171
+#: src/rfx-builder.c:2129
 msgid "_Wrap value"
 msgstr ""
 
-#: src/rfx-builder.c:2172
+#: src/rfx-builder.c:2131
 msgid "Whether the value wraps max->min and min->max."
 msgstr ""
 
-#: src/rfx-builder.c:2470
+#: src/rfx-builder.c:2424
 msgid "Set _values"
 msgstr "Nastaviť _hodnoty"
 
-#: src/rfx-builder.c:2512
+#: src/rfx-builder.c:2463
 msgid "Default _Red:  "
 msgstr "Predvolená _Červená:  "
 
-#: src/rfx-builder.c:2513
+#: src/rfx-builder.c:2464
 msgid "Default _Green:"
 msgstr "Predvolená _Zelená:"
 
-#: src/rfx-builder.c:2514
+#: src/rfx-builder.c:2465
 msgid "Default _Blue: "
 msgstr "Predvolená _Modrá: "
 
-#: src/rfx-builder.c:2538
+#: src/rfx-builder.c:2488
 msgid "Set _default"
 msgstr "Nastaviť predvolené"
 
-#: src/rfx-builder.c:2540
+#: src/rfx-builder.c:2490
 msgid "Default value:  "
 msgstr "Predvolená hodnota:  "
 
-#: src/rfx-builder.c:2541
+#: src/rfx-builder.c:2491
 msgid "Maximum length (chars): "
 msgstr "Maximálna dĺžka (znakov): "
 
-#: src/rfx-builder.c:2576
+#: src/rfx-builder.c:2526
 msgid "LiVES: - New RFX Parameter Window Hint"
 msgstr "LiVES: - Nový RFX Parameter okna nápovedy"
 
-#: src/rfx-builder.c:2579
+#: src/rfx-builder.c:2528
 msgid "LiVES: - Edit RFX Parameter Window Hint"
 msgstr "LiVES: - Upraviť RFX Parameter okna nápovedy"
 
-#: src/rfx-builder.c:2622
+#: src/rfx-builder.c:2569
 msgid "_Keyword:         "
 msgstr ""
 
-#: src/rfx-builder.c:2639
+#: src/rfx-builder.c:2586
 msgid "Special _Type:         "
 msgstr ""
 
-#: src/rfx-builder.c:2656
+#: src/rfx-builder.c:2602
 msgid "Special _Subtype:         "
 msgstr ""
 
-#: src/rfx-builder.c:2667 src/rfx-builder.c:2706
+#: src/rfx-builder.c:2613 src/rfx-builder.c:2651
 msgid "Row:    "
 msgstr "Rada:    "
 
-#: src/rfx-builder.c:2732
+#: src/rfx-builder.c:2676
 #, c-format
 msgid "Linked parameters (%d):    "
 msgstr "Súvisiace parametre (%d):    "
 
-#: src/rfx-builder.c:2749
+#: src/rfx-builder.c:2693
 msgid "Linked parameters (4):    "
 msgstr "Súvisiace parametre (4):    "
 
-#: src/rfx-builder.c:2752
+#: src/rfx-builder.c:2695
 msgid "Linked parameters (2):    "
 msgstr "Súvisiace parametre (2):    "
 
-#: src/rfx-builder.c:2777
+#: src/rfx-builder.c:2720
 msgid "LiVES: - New RFX Trigger"
 msgstr "LiVES: - Nový RFX spúšťač"
 
-#: src/rfx-builder.c:2780
+#: src/rfx-builder.c:2722
 msgid "LiVES: - Edit RFX Trigger"
 msgstr "LiVES: - Upraviť RFX spúšťač"
 
-#: src/rfx-builder.c:2808
+#: src/rfx-builder.c:2750
 msgid "When:         "
 msgstr "Kedy:         "
 
-#: src/rfx-builder.c:2904
+#: src/rfx-builder.c:2846
 msgid "LiVES: - Pre Loop Code"
 msgstr "LiVES: - Pred sľučkový kód"
 
-#: src/rfx-builder.c:2911
+#: src/rfx-builder.c:2853
 msgid "LiVES: - Loop Code"
 msgstr "LiVES: - Sľučkový kód"
 
-#: src/rfx-builder.c:2918
+#: src/rfx-builder.c:2860
 msgid "LiVES: - Post Loop Code"
 msgstr "LiVES: - Po sľučkový kód"
 
-#: src/rfx-builder.c:2931
+#: src/rfx-builder.c:2873
 #, c-format
 msgid "LiVES: - Default text (max length %d)"
 msgstr "LiVES: - Predvolený text (max dĺžka %d)"
 
-#: src/rfx-builder.c:2944
+#: src/rfx-builder.c:2885
 msgid "LiVES: - Enter values, one per line"
 msgstr "LiVES: - Vložte hodnoty, jedna na riadok"
 
-#: src/rfx-builder.c:3055
+#: src/rfx-builder.c:2996
 msgid ""
 "\n"
 "\n"
@@ -6943,7 +6957,7 @@
 "\n"
 "Názov nesmie byť prázdny.\n"
 
-#: src/rfx-builder.c:3060
+#: src/rfx-builder.c:3001
 msgid ""
 "\n"
 "\n"
@@ -6953,7 +6967,7 @@
 "\n"
 "Názov nesmie obsahovať medzery.\n"
 
-#: src/rfx-builder.c:3065
+#: src/rfx-builder.c:3006
 msgid ""
 "\n"
 "\n"
@@ -6963,7 +6977,7 @@
 "\n"
 "Menu textu nesmie byť prázdne.\n"
 
-#: src/rfx-builder.c:3071
+#: src/rfx-builder.c:3012
 msgid ""
 "\n"
 "\n"
@@ -6973,7 +6987,7 @@
 "\n"
 "Popis akcie nesmie byť prázdny.\n"
 
-#: src/rfx-builder.c:3076
+#: src/rfx-builder.c:3017
 msgid ""
 "\n"
 "\n"
@@ -6983,7 +6997,7 @@
 "\n"
 "Autor nesmie byť prázdny.\n"
 
-#: src/rfx-builder.c:3085 src/rfx-builder.c:4339
+#: src/rfx-builder.c:3026 src/rfx-builder.c:4253
 msgid ""
 "\n"
 "\n"
@@ -6995,7 +7009,7 @@
 "Rozšírenie s týmto názvom už existuje.\n"
 "Názov musí byť jedinečný.\n"
 
-#: src/rfx-builder.c:3092
+#: src/rfx-builder.c:3033
 msgid ""
 "\n"
 "\n"
@@ -7005,7 +7019,7 @@
 "\n"
 "Kód sľučky by nemal byt prázdny.\n"
 
-#: src/rfx-builder.c:3098
+#: src/rfx-builder.c:3039
 msgid ""
 "\n"
 "\n"
@@ -7015,7 +7029,7 @@
 "\n"
 "Spúšťací kód pre pomôcku by nemal byť prázdny.\n"
 
-#: src/rfx-builder.c:3111
+#: src/rfx-builder.c:3052
 msgid ""
 "\n"
 "\n"
@@ -7025,7 +7039,7 @@
 "\n"
 "Parameter názvu nesmie byť prázdny.\n"
 
-#: src/rfx-builder.c:3117
+#: src/rfx-builder.c:3058
 msgid ""
 "\n"
 "\n"
@@ -7039,41 +7053,41 @@
 "jedinečný.\n"
 "\n"
 
-#: src/rfx-builder.c:3171
+#: src/rfx-builder.c:3111
 #, c-format
 msgid "Writing script file %s..."
 msgstr "Zápis skriptu súboru %s..."
 
-#: src/rfx-builder.c:3477
+#: src/rfx-builder.c:3411
 msgid "No <define> section found in script.\n"
 msgstr "Žiadna <define> sekcia nebola nájdená v skripte.\n"
 
-#: src/rfx-builder.c:3484 src/rfx-builder.c:3493
+#: src/rfx-builder.c:3418 src/rfx-builder.c:3427
 msgid "Bad script version.\n"
 msgstr "Chybná verzia skriptu.\n"
 
-#: src/rfx-builder.c:3505
+#: src/rfx-builder.c:3439
 msgid "No <name> section found in script.\n"
 msgstr "Žiadna <name> sekcia nebola nájdená v skripte.\n"
 
-#: src/rfx-builder.c:3513
+#: src/rfx-builder.c:3447
 msgid "No <version> section found in script.\n"
 msgstr "Žiadna <version> sekcia nebola nájdená v skripte.\n"
 
-#: src/rfx-builder.c:3522
+#: src/rfx-builder.c:3456
 msgid "No <author> section found in script.\n"
 msgstr "Žiadna <author> sekcia nebola nájdená v skripte.\n"
 
-#: src/rfx-builder.c:3536
+#: src/rfx-builder.c:3470
 msgid "No <description> section found in script.\n"
 msgstr "Žiadna <description> sekcia nebola nájdená v skripte.\n"
 
-#: src/rfx-builder.c:3540
+#: src/rfx-builder.c:3474
 #, c-format
 msgid "Bad description. (%s)\n"
 msgstr "Zlý popis.(%s)\n"
 
-#: src/rfx-builder.c:3702
+#: src/rfx-builder.c:3627
 #, c-format
 msgid ""
 "\n"
@@ -7088,27 +7102,27 @@
 "Nájdený v skripte.\n"
 "\n"
 
-#: src/rfx-builder.c:3859
+#: src/rfx-builder.c:3780
 msgid "Rebuilding all RFX scripts...builtin..."
 msgstr "Prerobenie všetkých RFX skriptov...vstavané..."
 
-#: src/rfx-builder.c:3860
+#: src/rfx-builder.c:3781
 msgid "Rebuilding scripts"
 msgstr "Prerobenie skriptov"
 
-#: src/rfx-builder.c:3868
+#: src/rfx-builder.c:3789
 msgid "custom..."
 msgstr "vlastný..."
 
-#: src/rfx-builder.c:3872
+#: src/rfx-builder.c:3793
 msgid "test..."
 msgstr "test..."
 
-#: src/rfx-builder.c:3878
+#: src/rfx-builder.c:3799
 msgid "rebuilding dynamic menu entries..."
 msgstr "prerobenie vstupov dynamického menu..."
 
-#: src/rfx-builder.c:3905 src/rfx-builder.c:3912
+#: src/rfx-builder.c:3826 src/rfx-builder.c:3834
 #, c-format
 msgid ""
 "\n"
@@ -7121,7 +7135,7 @@
 "LiVES nemôže nájsť program %s.\n"
 "Prosím skontrolujte cestu k programu a či je spustiteľný.\n"
 
-#: src/rfx-builder.c:3951
+#: src/rfx-builder.c:3874
 #, c-format
 msgid ""
 "\n"
@@ -7136,12 +7150,12 @@
 "%s ?\n"
 "\n"
 
-#: src/rfx-builder.c:3960
+#: src/rfx-builder.c:3884
 #, c-format
 msgid "Deleting rfx script %s..."
 msgstr "Odstránenie rfx skriptu %s..."
 
-#: src/rfx-builder.c:3980
+#: src/rfx-builder.c:3902
 #, c-format
 msgid ""
 "\n"
@@ -7156,7 +7170,7 @@
 "%s\n"
 "Kód chyby bol %d\n"
 
-#: src/rfx-builder.c:4016
+#: src/rfx-builder.c:3938
 #, c-format
 msgid ""
 "\n"
@@ -7171,12 +7185,12 @@
 "už existuje.\n"
 "Prosím, najskôr ho vymažte, alebo premenujtee testovací skript.\n"
 
-#: src/rfx-builder.c:4027
+#: src/rfx-builder.c:3950
 #, c-format
 msgid "Promoting rfx test plugin %s to custom..."
 msgstr "Podpora rfx test rozšírenia %s do vlastného..."
 
-#: src/rfx-builder.c:4044
+#: src/rfx-builder.c:3965
 #, c-format
 msgid ""
 "\n"
@@ -7187,20 +7201,20 @@
 "Return code was %d (%s)\n"
 msgstr ""
 
-#: src/rfx-builder.c:4070
+#: src/rfx-builder.c:3990
 msgid "LiVES: - Export Script to..."
 msgstr ""
 
-#: src/rfx-builder.c:4077 src/rfx-builder.c:4156
+#: src/rfx-builder.c:3997 src/rfx-builder.c:4074
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "Kopírovanie %s do %s..."
 
-#: src/rfx-builder.c:4105
+#: src/rfx-builder.c:4024
 msgid "LiVES: Import Script from..."
 msgstr ""
 
-#: src/rfx-builder.c:4148
+#: src/rfx-builder.c:4067
 #, c-format
 msgid ""
 "\n"
@@ -7215,43 +7229,43 @@
 "už existuje.\n"
 "Prosím, najskôr ho vymažte, alebo premenujte importovaný skript.\n"
 
-#: src/rfx-builder.c:4249
+#: src/rfx-builder.c:4166
 msgid "LiVES: - Copy RFX Script"
 msgstr "LiVES: - Kopírovať RFX skript"
 
-#: src/rfx-builder.c:4251
+#: src/rfx-builder.c:4168
 msgid "_From type:    "
 msgstr ""
 
-#: src/rfx-builder.c:4258
+#: src/rfx-builder.c:4175
 msgid "   Script:    "
 msgstr "   Skript:    "
 
-#: src/rfx-builder.c:4267
+#: src/rfx-builder.c:4183
 msgid "LiVES: - Rename test RFX Script"
 msgstr "LiVES: - Premenovať testovací RFX skript"
 
-#: src/rfx-builder.c:4268
+#: src/rfx-builder.c:4184
 msgid "From script: "
 msgstr "Zo skriptu: "
 
-#: src/rfx-builder.c:4273
+#: src/rfx-builder.c:4188
 msgid "LiVES: - RFX Script name"
 msgstr "LiVES: - Názov RFX skriptu"
 
-#: src/rfx-builder.c:4274
+#: src/rfx-builder.c:4189
 msgid "Script name: "
 msgstr "Názov skriptu: "
 
-#: src/rfx-builder.c:4294
+#: src/rfx-builder.c:4209
 msgid "New name: "
 msgstr "Nový názov: "
 
-#: src/rfx-builder.c:4297
+#: src/rfx-builder.c:4212
 msgid "New script name: "
 msgstr "Nový názov skriptu: "
 
-#: src/rfx-builder.c:4372
+#: src/rfx-builder.c:4286
 msgid ""
 "\n"
 "\n"
@@ -7263,12 +7277,12 @@
 "Testovací skript s týmto názvom už existuje.\n"
 "Názov skriptu musí byť jedinečný.\n"
 
-#: src/rfx-builder.c:4384
+#: src/rfx-builder.c:4297
 #, c-format
 msgid "Renaming RFX test script %s to %s..."
 msgstr "Premenovanie RFX testovacieho skriptu %s na %s..."
 
-#: src/rfx-builder.c:4390
+#: src/rfx-builder.c:4302
 #, c-format
 msgid ""
 "\n"
@@ -7285,23 +7299,23 @@
 "%s\n"
 "Návratový kód je %d\n"
 
-#: src/rfx-builder.c:4610
+#: src/rfx-builder.c:4518
 msgid "_Apply Real Time Effects to Selection"
 msgstr "_Použiť Real Time efekty do výberu"
 
-#: src/rfx-builder.c:4664
+#: src/rfx-builder.c:4572
 #, c-format
 msgid "Loading rendered effect %s..."
 msgstr "Spúšťam vykresľovanie efektu %s..."
 
-#: src/rfx-builder.c:4766
+#: src/rfx-builder.c:4674
 msgid ""
 "See: VJ - show VJ keys. Set the realtime effects, and then apply them here."
 msgstr ""
 "Pozri: VJ - zobraziť VJ klávesy. Nastaviť real time efekty a potom ich "
 "použiť."
 
-#: src/preferences.c:359
+#: src/preferences.c:351
 msgid ""
 "\n"
 "\n"
@@ -7313,7 +7327,7 @@
 "Video rozšírenia sú aktivované iba v\n"
 "režim celej obrazovky, mód (fs) oddeleného okna\n"
 
-#: src/preferences.c:408
+#: src/preferences.c:400
 msgid ""
 "\n"
 "\n"
@@ -7321,7 +7335,7 @@
 "(Free space = UNKNOWN)"
 msgstr ""
 
-#: src/preferences.c:412
+#: src/preferences.c:403
 #, c-format
 msgid ""
 "\n"
@@ -7330,14 +7344,14 @@
 "(Free space = %s)"
 msgstr ""
 
-#: src/preferences.c:416
+#: src/preferences.c:408
 msgid ""
 "The temp directory is LiVES working directory where opened clips and sets "
 "are stored.\n"
 "It should be in a partition with plenty of free disk space.\n"
 msgstr ""
 
-#: src/preferences.c:784
+#: src/preferences.c:839
 #, c-format
 msgid ""
 "Unable to create or write to the new temporary directory.\n"
@@ -7348,7 +7362,7 @@
 "The directory will not be changed now.\n"
 msgstr ""
 
-#: src/preferences.c:786
+#: src/preferences.c:843
 #, c-format
 msgid ""
 "Unable to create or write to the new temporary directory.\n"
@@ -7358,7 +7372,7 @@
 "The directory will not be changed now.\n"
 msgstr ""
 
-#: src/preferences.c:798
+#: src/preferences.c:856
 msgid ""
 "You have chosen to change the temporary directory.\n"
 "Please make sure you have no other copies of LiVES open.\n"
@@ -7376,7 +7390,7 @@
 "\n"
 "Stlačením 'Zrušit' obnovíte predvolená nastavenie dočasného adresára."
 
-#: src/preferences.c:1169
+#: src/preferences.c:1221
 msgid ""
 "\n"
 "Unable to switch audio players to jack - jackd must be installed first.\n"
@@ -7386,7 +7400,7 @@
 "Nedá sa prepnúť prehrávač zvuku na jack - najprv musíte nainštalovať jack.\n"
 "Pozri http://jackaudio.org\n"
 
-#: src/preferences.c:1175
+#: src/preferences.c:1226
 msgid ""
 "\n"
 "Switching audio players requires restart (jackd must not be running)\n"
@@ -7394,7 +7408,7 @@
 "\n"
 "Prepnutie prehrávača zvuku vyžaduje reštart (jackd nesnie byť spustený)\n"
 
-#: src/preferences.c:1202
+#: src/preferences.c:1253
 msgid ""
 "\n"
 "Unable to switch audio players to pulse audio\n"
@@ -7406,401 +7420,401 @@
 "najskôr musíte nainštalovať pulse audio.\n"
 "Pozrite http://www.pulseaudio.org\n"
 
-#: src/preferences.c:1502
+#: src/preferences.c:1544
 msgid "PCM (highest quality; largest files)"
 msgstr "PCM (vysoká kvalita; veľké súbory)"
 
-#: src/preferences.c:2063
+#: src/preferences.c:2096
 msgid "LiVES: - Preferences"
 msgstr "LiVES: - Predvoľby"
 
-#: src/preferences.c:2142
+#: src/preferences.c:2177
 msgid "Open file selection maximised"
 msgstr "Otvoriť výber súboru maximalizovaný"
 
-#: src/preferences.c:2149
+#: src/preferences.c:2184
 msgid "Show recent files in the File menu"
 msgstr "Ukáž posledné súbory v ponuke Súbor"
 
-#: src/preferences.c:2158
+#: src/preferences.c:2193
 msgid "Stop screensaver on playback    "
 msgstr "Zastaviť šetrič obrazovky pri prehrávaní    "
 
-#: src/preferences.c:2165
+#: src/preferences.c:2200
 msgid "Open main window maximised"
 msgstr "Otvoriť hlavné okno maximalizované"
 
-#: src/preferences.c:2173
+#: src/preferences.c:2208
 msgid "Show toolbar when background is blanked"
 msgstr "Zobraziť panel s nástrojmi ak je pozadie čisté"
 
-#: src/preferences.c:2181
+#: src/preferences.c:2216
 msgid "Allow mouse wheel to switch clips"
 msgstr "Umožniť prepínanie klipov kolieskom myši"
 
-#: src/preferences.c:2192
+#: src/preferences.c:2227
 msgid "Shrink previews to fit in interface"
 msgstr "Zmenšenie náhľadov, aby sa vošli do rozhrania"
 
-#: src/preferences.c:2202
+#: src/preferences.c:2237
 msgid "Startup mode:"
 msgstr "Mód pri spustení:"
 
-#: src/preferences.c:2206
+#: src/preferences.c:2241
 msgid "_Clip editor"
 msgstr "Editor _klipov"
 
-#: src/preferences.c:2210
+#: src/preferences.c:2245
 msgid "_Multitrack mode"
 msgstr "_Viacstopý mód"
 
-#: src/preferences.c:2234
+#: src/preferences.c:2268
 msgid "Multi-head support"
 msgstr "Podpora Multi-head"
 
-#: src/preferences.c:2242
+#: src/preferences.c:2276
 msgid " monitor number for LiVES interface"
 msgstr " sledovať počet rozhraní pre LiVES"
 
-#: src/preferences.c:2248
+#: src/preferences.c:2282
 msgid " monitor number for playback"
 msgstr " sledovať počet pre prehrávanie"
 
-#: src/preferences.c:2260
+#: src/preferences.c:2294
 msgid ""
 "A setting of 0 means use all available monitors (only works with some "
 "playback plugins)."
 msgstr ""
 
-#: src/preferences.c:2270
+#: src/preferences.c:2304
 msgid "Force single monitor"
 msgstr "Vynútiť jeden monitor"
 
-#: src/preferences.c:2271
+#: src/preferences.c:2305
 msgid "Ignore all except the first monitor."
 msgstr ""
 
-#: src/preferences.c:2293
+#: src/preferences.c:2327
 msgid "Show clip thumbnails during playback"
 msgstr ""
 
-#: src/preferences.c:2306
+#: src/preferences.c:2340
 msgid "GUI"
 msgstr "Grafické"
 
-#: src/preferences.c:2321
+#: src/preferences.c:2355
 msgid "When entering Multitrack mode:"
 msgstr "Pri spustení viacstopého módu:"
 
-#: src/preferences.c:2330
+#: src/preferences.c:2364
 msgid "_Prompt me for width, height, fps and audio settings"
 msgstr "_Vyzvi ma k nastaveniu šírky, výšky, fps a zvuku"
 
-#: src/preferences.c:2336
+#: src/preferences.c:2370
 msgid "_Always use the following values:"
 msgstr "_Vždy použiť nasledujúce hodnoty:"
 
-#: src/preferences.c:2345
+#: src/preferences.c:2379
 msgid "Use these same _values for rendering a new clip"
 msgstr "Použi rovnaké _hodnoty pre vykresľovanie nového klipu"
 
-#: src/preferences.c:2370
+#: src/preferences.c:2404
 msgid "_Width           "
 msgstr "_Šírka           "
 
-#: src/preferences.c:2375
+#: src/preferences.c:2409
 msgid "          _Height      "
 msgstr "          _Výška      "
 
-#: src/preferences.c:2379
+#: src/preferences.c:2413
 msgid "          _FPS"
 msgstr ""
 
-#: src/preferences.c:2387
+#: src/preferences.c:2421
 msgid "Enable backing audio track"
 msgstr "Zapnúť podporu audio stopy"
 
-#: src/preferences.c:2394
+#: src/preferences.c:2428
 msgid "Audio track per video track"
 msgstr "Zvuková stopa na video stopu"
 
-#: src/preferences.c:2423
+#: src/preferences.c:2457
 msgid "    _Undo buffer size (MB)    "
 msgstr "    _Vrátiť veľkosť vyrovnávacej pamäte (MB)    "
 
-#: src/preferences.c:2432
+#: src/preferences.c:2466
 msgid "_Exit multitrack mode after rendering"
 msgstr "_Ukončiť viacstopý mód po vykreslení"
 
-#: src/preferences.c:2440
+#: src/preferences.c:2474
 msgid "Auto backup layouts"
 msgstr "Automatické zálohovanie rozložení"
 
-#: src/preferences.c:2445
+#: src/preferences.c:2479
 msgid "_Every"
 msgstr "_Každý"
 
-#: src/preferences.c:2453
+#: src/preferences.c:2487
 msgid "seconds"
 msgstr "sekundy"
 
-#: src/preferences.c:2461
+#: src/preferences.c:2495
 msgid "After every _change"
 msgstr "Po kažej _zmene"
 
-#: src/preferences.c:2467
+#: src/preferences.c:2501
 msgid "_Never"
 msgstr "_Nikdy"
 
-#: src/preferences.c:2490
+#: src/preferences.c:2523
 msgid "Multitrack/Render"
 msgstr "Viacstopé/Vykresliť"
 
-#: src/preferences.c:2508
+#: src/preferences.c:2541
 msgid "Use instant opening when possible"
 msgstr "Použite okamžité otvorenie pokiaľ je to možné"
 
-#: src/preferences.c:2509
+#: src/preferences.c:2543
 msgid "Enable instant opening of some file types using decoder plugins"
 msgstr ""
 "Povoliť okamžité otvorenie niektorých typov súborov použitím rozšírení "
 "dekodéru"
 
-#: src/preferences.c:2531
+#: src/preferences.c:2567
 msgid "Video open command (fallback)"
 msgstr ""
 
-#: src/preferences.c:2543
+#: src/preferences.c:2579
 msgid "Open/render compression"
 msgstr ""
 
-#: src/preferences.c:2546
+#: src/preferences.c:2582
 msgid " %     ( lower = slower, larger files; for jpeg, higher quality )"
 msgstr " % ( nižšie = pomalšie, väčšie súbory; pre jpeg, vysoká kvalita )"
 
-#: src/preferences.c:2558
+#: src/preferences.c:2594
 msgid "Default image format"
 msgstr ""
 
-#: src/preferences.c:2562
+#: src/preferences.c:2598
 msgid "_jpeg"
 msgstr "_jpeg"
 
-#: src/preferences.c:2565
+#: src/preferences.c:2601
 msgid "_png"
 msgstr "_png"
 
-#: src/preferences.c:2572
+#: src/preferences.c:2608
 msgid "(Check Help/Troubleshoot to see which image formats are supported)"
 msgstr ""
 "(Skontrolujte Pomocníka/Riešenie problémov pre zistenie, ktoré formáty "
 "obrázkov sú podporované)"
 
-#: src/preferences.c:2580
+#: src/preferences.c:2616
 msgid "Enable automatic deinterlacing when possible"
 msgstr "Povoliť automatické deinterlacing pokiaľ je to možné"
 
-#: src/preferences.c:2582
+#: src/preferences.c:2619
 msgid "Automatically deinterlace frames when a plugin suggests it"
 msgstr ""
 
-#: src/preferences.c:2593
+#: src/preferences.c:2632
 #, fuzzy
 msgid "Automatic trimming / padding of audio when possible"
 msgstr "Povoliť automatické deinterlacing pokiaľ je to možné"
 
-#: src/preferences.c:2595
+#: src/preferences.c:2634
 msgid "Automatically trim or pad audio when a plugin suggests it"
 msgstr ""
 
-#: src/preferences.c:2606
+#: src/preferences.c:2646
 msgid "Ignore blank borders when possible"
 msgstr ""
 
-#: src/preferences.c:2608
+#: src/preferences.c:2648
 msgid "Clip any blank borders from frames where possible"
 msgstr ""
 
-#: src/preferences.c:2619
+#: src/preferences.c:2660
 msgid "When opening multiple files, concatenate images into one clip"
 msgstr "Pri otvorení viac súborov, spájať obrazy do jedného klipu"
 
-#: src/preferences.c:2629
+#: src/preferences.c:2670
 msgid "Decoding"
 msgstr "Dekódovanie"
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:2652
+#: src/preferences.c:2693
 msgid "Low - can improve performance on slower machines"
 msgstr "Nízka - môže zvýšiť výkon na pomalších strojoch"
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:2654
+#: src/preferences.c:2695
 msgid "Normal - recommended for most users"
 msgstr "Normálne - doporučené pre väčšinu používateľov"
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:2656
+#: src/preferences.c:2697
 msgid "High - can improve quality on very fast machines"
 msgstr "Vysoká - môže zlepšiť kvalitu na veľmi rýchlych strojoch"
 
-#: src/preferences.c:2659
+#: src/preferences.c:2700
 msgid "Preview _quality"
 msgstr "Kvalita _náhľadu"
 
-#: src/preferences.c:2660
+#: src/preferences.c:2701
 msgid "The preview quality for video playback - affects resizing"
 msgstr "Úroveň náhľadu pre prehrávanie videa - po zmene veľkosti"
 
-#: src/preferences.c:2675
+#: src/preferences.c:2717
 msgid "_Show FPS statistics"
 msgstr "_Zobraziť FPS štatistiku"
 
-#: src/preferences.c:2694
+#: src/preferences.c:2736
 msgid "_Plugin"
 msgstr "_Rozšírenie"
 
-#: src/preferences.c:2718
+#: src/preferences.c:2760
 msgid "Stream audio"
 msgstr ""
 
-#: src/preferences.c:2721
+#: src/preferences.c:2763
 msgid "Stream audio to playback plugin"
 msgstr ""
 
-#: src/preferences.c:2734
+#: src/preferences.c:2778
 msgid "Record player output"
 msgstr ""
 
-#: src/preferences.c:2737
+#: src/preferences.c:2781
 msgid "Record output from player instead of input to player"
 msgstr ""
 
-#: src/preferences.c:2744
+#: src/preferences.c:2789
 msgid "VIDEO"
 msgstr "VIDEO"
 
-#: src/preferences.c:2787
+#: src/preferences.c:2833
 msgid "_Player"
 msgstr "_Prehrávač"
 
-#: src/preferences.c:2792
+#: src/preferences.c:2838
 msgid "(See also the Jack Integration tab for jack startup options)"
 msgstr ""
 
-#: src/preferences.c:2819
+#: src/preferences.c:2865
 msgid "mplayer"
 msgstr "mplayer"
 
-#: src/preferences.c:2830
+#: src/preferences.c:2876
 #, fuzzy
 msgid "mplayer2"
 msgstr "mplayer"
 
-#: src/preferences.c:2833
+#: src/preferences.c:2879
 msgid "Audio play _command"
 msgstr "Príkaz na _prehranie zvuku"
 
-#: src/preferences.c:2840
+#: src/preferences.c:2886
 msgid "- internal -"
 msgstr "- vnútorné -"
 
-#: src/preferences.c:2849
+#: src/preferences.c:2895
 msgid "Audio follows video _rate/direction"
 msgstr "Zvuk kopíruje video _tempo/adresa"
 
-#: src/preferences.c:2857
+#: src/preferences.c:2903
 msgid "Audio follows _clip switches"
 msgstr "Zvuk nasleduje prepínanie _klipov"
 
-#: src/preferences.c:2864
+#: src/preferences.c:2910
 msgid "Source:"
 msgstr ""
 
-#: src/preferences.c:2868
+#: src/preferences.c:2914
 msgid "_Internal"
 msgstr ""
 
-#: src/preferences.c:2873
+#: src/preferences.c:2919
 msgid "_External (requires jack or pulse audio player)"
 msgstr ""
 
-#: src/preferences.c:2892
+#: src/preferences.c:2940
 msgid "AUDIO"
 msgstr "ZVUK"
 
-#: src/preferences.c:2902
+#: src/preferences.c:2950
 msgid "Playback"
 msgstr "Prehrať"
 
-#: src/preferences.c:2925
+#: src/preferences.c:2973
 msgid ""
 "Record audio when capturing an e_xternal window\n"
 " (requires jack or pulse audio)"
 msgstr ""
 
-#: src/preferences.c:2940
+#: src/preferences.c:2988
 msgid "      What to record when 'r' is pressed   "
 msgstr "      Čo sa nahráva keď je stlačené 'r'   "
 
-#: src/preferences.c:2949
+#: src/preferences.c:2997
 msgid "_Frame changes"
 msgstr "Zmena _snímku"
 
-#: src/preferences.c:2964
+#: src/preferences.c:3012
 msgid "F_PS changes"
 msgstr "F_PS zmeny"
 
-#: src/preferences.c:2982
+#: src/preferences.c:3030
 msgid "_Real time effects"
 msgstr "_Real time efekty"
 
-#: src/preferences.c:2993
+#: src/preferences.c:3041
 msgid "_Clip switches"
 msgstr "_Klip Prepínače"
 
-#: src/preferences.c:3004
+#: src/preferences.c:3052
 msgid "_Audio (requires jack or pulse audio player)"
 msgstr ""
 
-#: src/preferences.c:3024
+#: src/preferences.c:3072
 msgid "Pause recording if free disk space falls below"
 msgstr ""
 
 #. TRANSLATORS: gigabytes
-#: src/preferences.c:3030
+#: src/preferences.c:3078
 msgid "GB"
 msgstr ""
 
-#: src/preferences.c:3037
+#: src/preferences.c:3085
 msgid "Recording"
 msgstr "Nahrávanie"
 
-#: src/preferences.c:3055
+#: src/preferences.c:3103
 msgid "Encoder"
 msgstr ""
 
-#: src/preferences.c:3090
+#: src/preferences.c:3137
 msgid "Output format"
 msgstr "Výstupný formát"
 
-#: src/preferences.c:3106
+#: src/preferences.c:3153
 msgid "Audio codec"
 msgstr "Zvukový kodek"
 
-#: src/preferences.c:3119
+#: src/preferences.c:3165
 msgid "Encoding"
 msgstr "Kódovanie"
 
-#: src/preferences.c:3134
+#: src/preferences.c:3180
 msgid "Use _antialiasing when resizing"
 msgstr "Použite _antialiasing pri zmene veľkosti"
 
-#: src/preferences.c:3143
+#: src/preferences.c:3189
 msgid "Number of _real time effect keys"
 msgstr ""
 
-#: src/preferences.c:3145
+#: src/preferences.c:3192
 msgid ""
 "The number of \"virtual\" real time effect keys. They can be controlled "
 "through the real time effects window, or via network (OSC)."
@@ -7808,95 +7822,95 @@
 "Počet \"virtuálnych\" kláves realtime efektov. Je možné ich ovládať v okne "
 "realtime efektov, alebo cez sieť (OSC)."
 
-#: src/preferences.c:3152
+#: src/preferences.c:3199
 msgid "Use _threads where possible when applying effects"
 msgstr ""
 
-#: src/preferences.c:3159
+#: src/preferences.c:3207
 msgid "Number of _threads"
 msgstr ""
 
-#: src/preferences.c:3172
+#: src/preferences.c:3221
 msgid "Restart is required if any of the following paths are changed:"
 msgstr ""
 
-#: src/preferences.c:3182
+#: src/preferences.c:3231
 msgid "Weed plugin path"
 msgstr ""
 
-#: src/preferences.c:3184
+#: src/preferences.c:3234
 msgid "Frei0r plugin path"
 msgstr ""
 
-#: src/preferences.c:3186
+#: src/preferences.c:3237
 msgid "LADSPA plugin path"
 msgstr ""
 
-#: src/preferences.c:3209
+#: src/preferences.c:3261
 msgid "      Video load directory (default)      "
 msgstr "      Načítanie adresára video (predvolené)      "
 
-#: src/preferences.c:3215
+#: src/preferences.c:3267
 msgid "      Video save directory (default) "
 msgstr "      Adresár pre ukladanie videa (predvolene) "
 
-#: src/preferences.c:3221
+#: src/preferences.c:3273
 msgid "      Audio load directory (default) "
 msgstr "      Načítanie adresára  zvuku (predvolené) "
 
-#: src/preferences.c:3227
+#: src/preferences.c:3279
 msgid "      Image directory (default) "
 msgstr "      Adresár s obrázkami (predvolene) "
 
-#: src/preferences.c:3233
+#: src/preferences.c:3285
 msgid "      Backup/Restore directory (default) "
 msgstr "      Záloha/obnovenie adresára (predvolene) "
 
-#: src/preferences.c:3239
+#: src/preferences.c:3291
 msgid "      Temp directory (do not remove) "
 msgstr "      Dočasný adresár (neodstraňovať) "
 
-#: src/preferences.c:3252
+#: src/preferences.c:3304
 msgid "The default directory for loading video clips from"
 msgstr "Predvolený adresár pre spustenie video klipov z"
 
-#: src/preferences.c:3277
+#: src/preferences.c:3329
 msgid "The default directory for saving encoded clips to"
 msgstr "Predvolený adresár pre uloženie kódovaných klipov do"
 
-#: src/preferences.c:3285
+#: src/preferences.c:3337
 msgid "The default directory for loading and saving audio"
 msgstr "Predvolený adresár pre nahrávanie a ukladanie zvuku"
 
-#: src/preferences.c:3293
+#: src/preferences.c:3345
 msgid "The default directory for saving frameshots to"
 msgstr "Predvolený adresár pre uloženie snímkov do"
 
-#: src/preferences.c:3301
+#: src/preferences.c:3353
 msgid "The default directory for backing up/restoring single clips"
 msgstr "Predvolený adresár pre zálohovanie/obnovu jednotlivých klipov"
 
-#: src/preferences.c:3309
+#: src/preferences.c:3361
 msgid "LiVES working directory."
 msgstr "LiVES pracovný adresár."
 
-#: src/preferences.c:3359
+#: src/preferences.c:3412
 msgid "Directories"
 msgstr "Adresáre"
 
-#: src/preferences.c:3374
+#: src/preferences.c:3427
 msgid "Warn if diskspace falls below: "
 msgstr ""
 
-#: src/preferences.c:3380 src/preferences.c:3394
+#: src/preferences.c:3433 src/preferences.c:3447
 msgid " MB [set to 0 to disable]"
 msgstr ""
 
-#: src/preferences.c:3389
+#: src/preferences.c:3442
 msgid "Diskspace critical level: "
 msgstr ""
 
-#: src/preferences.c:3407
+#: src/preferences.c:3461
 msgid ""
 "Warn on Insert / Merge if _frame rate of clipboard does not match frame rate "
 "of selection"
@@ -7904,87 +7918,87 @@
 "Upozorniť pri Vložení / Zlúčiť ak tempo snímkov v schránke nesúhlasí s "
 "tempom výberu"
 
-#: src/preferences.c:3417
+#: src/preferences.c:3471
 msgid "Warn on Open if file _size exceeds "
 msgstr "Upozorniť pri otvorení ak _veľkosť súboru presiahne "
 
-#: src/preferences.c:3425
+#: src/preferences.c:3479
 msgid " MB"
 msgstr " MB"
 
-#: src/preferences.c:3432
+#: src/preferences.c:3486
 msgid "Show a warning before saving a se_t"
 msgstr "Zobraziť varovanie pred uložením zo_stavy"
 
-#: src/preferences.c:3442
+#: src/preferences.c:3496
 msgid ""
 "Show a warning if _mplayer/mplayer2, sox, composite or convert is not found "
 "when LiVES is started."
 msgstr ""
 
-#: src/preferences.c:3452
+#: src/preferences.c:3506
 msgid "Show a warning if no _rendered effects are found at startup."
 msgstr "Zobraziť varovanie ak nebol nájdený efekt vykresľovania pri spustení."
 
-#: src/preferences.c:3464
+#: src/preferences.c:3518
 msgid "Show a warning if no _encoder plugins are found at startup."
 msgstr ""
 "Zobraziť varovanie ak nebolo nájdené rozšírenie kódovania pri spustení."
 
-#: src/preferences.c:3474
+#: src/preferences.c:3528
 msgid "Show a warning if a _duplicate set name is entered."
 msgstr "Zobraziť varovanie ak bol vložený už existujúci názov zostavy."
 
-#: src/preferences.c:3485
+#: src/preferences.c:3539
 msgid "When a set is loaded, warn if clips are missing from _layouts."
 msgstr ""
 "Ak je zostava nahraná, zobraziť varovanie ak chýbajú klipy v _rozložení"
 
-#: src/preferences.c:3495
+#: src/preferences.c:3550
 msgid "Warn if a clip used in a layout is about to be closed."
 msgstr "Upozorniť ak klip použitý v rozložení má byť ukončený."
 
-#: src/preferences.c:3505
+#: src/preferences.c:3561
 msgid "Warn if frames used in a layout are about to be deleted."
 msgstr "Upozorniť ak snímky použité v rozložení majú byť odstránené."
 
-#: src/preferences.c:3515
+#: src/preferences.c:3572
 msgid "Warn if frames used in a layout are about to be shifted."
 msgstr "Upozorniť ak snímky použité v rozložení majú byť presunuté."
 
-#: src/preferences.c:3525
+#: src/preferences.c:3583
 msgid "Warn if frames used in a layout are about to be altered."
 msgstr "Upozorniť ak snímky použité v rozložení majú byť zmenené."
 
-#: src/preferences.c:3535
+#: src/preferences.c:3594
 msgid "Warn if audio used in a layout is about to be deleted."
 msgstr "Upozorniť ak zvuk použitý v rozložení má byť odstránený."
 
-#: src/preferences.c:3546
+#: src/preferences.c:3606
 msgid "Warn if audio used in a layout is about to be shifted."
 msgstr "Upozorniť, ak použitý zvuk v rozložení má byť posunutý."
 
-#: src/preferences.c:3556
+#: src/preferences.c:3617
 msgid "Warn if audio used in a layout is about to be altered."
 msgstr "Upozorniť, ak použitý zvuk v rozložení má byť zmenený."
 
-#: src/preferences.c:3566
+#: src/preferences.c:3628
 msgid "Popup layout errors after clip changes."
 msgstr ""
 
-#: src/preferences.c:3577
+#: src/preferences.c:3639
 msgid "Warn if the layout has not been saved when leaving multitrack mode."
 msgstr ""
 "Upozorniť pri opustení viacstopového módu, ak rozloženie nie je uložené."
 
-#: src/preferences.c:3588
+#: src/preferences.c:3650
 msgid ""
 "Warn if multitrack has no audio channels, and a layout with audio is loaded."
 msgstr ""
 "Zobraziť varovanie ak v multitracku nie sú zvukové stopy a rozloženie zo "
 "zvukom je nahrané."
 
-#: src/preferences.c:3598
+#: src/preferences.c:3660
 msgid ""
 "Warn if multitrack has audio channels, and your audio player is not \"jack\" "
 "or \"pulse audio\"."
@@ -7992,110 +8006,110 @@
 "Zobraziť varovanie ak v multitracku nie sú zvukové stopy a vašim prehrávačom "
 "zvuku nie je \"jack\" alebo \"pulse audio\"."
 
-#: src/preferences.c:3610
+#: src/preferences.c:3672
 msgid "Show info message after importing from firewire device."
 msgstr "Zobraziť info správu po importovaní z firewire jednotky."
 
-#: src/preferences.c:3626
+#: src/preferences.c:3688
 msgid "Show a warning before opening a yuv4mpeg stream (advanced)."
 msgstr "Zobraziť upozornenie pred otvorením yuv4mpeg streamu (pokročilé)."
 
-#: src/preferences.c:3639
+#: src/preferences.c:3701
 msgid "Show a warning when multitrack is low on backup space."
 msgstr ""
 "Zobraziť upozornenie ak nie je dostatok miesta pre zálohovanie multitracku."
 
-#: src/preferences.c:3650
+#: src/preferences.c:3713
 msgid "Show a warning advising cleaning of disk space after a crash."
 msgstr ""
 
-#: src/preferences.c:3661
+#: src/preferences.c:3725
 msgid "Show a warning if unable to connect to pulseaudio player."
 msgstr ""
 
-#: src/preferences.c:3673
+#: src/preferences.c:3737
 #, fuzzy
 msgid "Show a warning before wiping a layout which has unsaved changes."
 msgstr "Zobraziť upozornenie pred otvorením yuv4mpeg streamu (pokročilé)."
 
-#: src/preferences.c:3685
+#: src/preferences.c:3749
 msgid "Warnings"
 msgstr "Varovania"
 
-#: src/preferences.c:3703
+#: src/preferences.c:3767
 msgid "Midi synch (requires the files midistart and midistop)"
 msgstr "Midi synchronizácia (vyžaduje súbory midistart a midistop)"
 
-#: src/preferences.c:3715
+#: src/preferences.c:3779
 msgid "When inserting/merging frames:  "
 msgstr "Pri vkladaní/zlučovaní snímkov:  "
 
-#: src/preferences.c:3719
+#: src/preferences.c:3783
 msgid "_Speed Up/Slow Down Insertion"
 msgstr "_Zrýchliť/Spomaliť vkladanie"
 
-#: src/preferences.c:3723
+#: src/preferences.c:3787
 msgid "_Resample Insertion"
 msgstr "_Prevzorkovanie vkladania"
 
-#: src/preferences.c:3730
+#: src/preferences.c:3794
 msgid "CD device           "
 msgstr "CD jednotka           "
 
-#: src/preferences.c:3733
+#: src/preferences.c:3797
 msgid "LiVES can load audio tracks from this CD"
 msgstr "LiVES nemôže spustiť zvukovú stopu z tohto CD"
 
-#: src/preferences.c:3746
+#: src/preferences.c:3813
 msgid "Default FPS        "
 msgstr "Predvolené FPS        "
 
-#: src/preferences.c:3749
+#: src/preferences.c:3816
 msgid "Frames per second to use when none is specified"
 msgstr "Použiť snímkov za sekundu, ak nie je uvedené inak"
 
-#: src/preferences.c:3757
+#: src/preferences.c:3825
 msgid "Misc"
 msgstr "Rôzne"
 
-#: src/preferences.c:3782
+#: src/preferences.c:3850
 msgid "New theme:           "
 msgstr "Nová téma:           "
 
-#: src/preferences.c:3800
+#: src/preferences.c:3867
 msgid "Themes"
 msgstr "Témy vzhľadu"
 
-#: src/preferences.c:3815
+#: src/preferences.c:3882
 msgid "Download bandwidth (Kb/s)       "
 msgstr "Rýchlosť sťahovania (Kb/s)       "
 
-#: src/preferences.c:3823
+#: src/preferences.c:3890
 msgid "LiVES must be compiled without \"configure --disable-OSC\" to use OMC"
 msgstr ""
 "LiVES musí byť skompilovaný bez \"configure --disable-OCS\" pre použitie OMC"
 
-#: src/preferences.c:3833
+#: src/preferences.c:3900
 msgid "OMC remote control enabled"
 msgstr "OMC diaľkové ovládanie povolené"
 
-#: src/preferences.c:3841
+#: src/preferences.c:3908
 msgid "UDP port       "
 msgstr "UDP port       "
 
-#: src/preferences.c:3850
+#: src/preferences.c:3917
 msgid "Start OMC on startup"
 msgstr "Spustiť OMC pri štarte"
 
-#: src/preferences.c:3870
+#: src/preferences.c:3937
 msgid "Streaming/Networking"
 msgstr "Streaming/Siete"
 
-#: src/preferences.c:3882
+#: src/preferences.c:3949
 msgid "Jack transport"
 msgstr "Prenos jack"
 
-#: src/preferences.c:3886
+#: src/preferences.c:3953
 msgid ""
 "LiVES must be compiled with jack/transport.h and jack/jack.h present to use "
 "jack transport"
@@ -8103,43 +8117,43 @@
 "LiVES musí byť skompilovaný s jack/transport.h a jack/jack.h pre použitie "
 "prenosu cez jack"
 
-#: src/preferences.c:3892
+#: src/preferences.c:3959
 msgid "Jack _transport config file"
 msgstr "Jack _transport konfiguračný súbor"
 
-#: src/preferences.c:3899 src/preferences.c:3989
+#: src/preferences.c:3967 src/preferences.c:4058
 msgid "Start _server on LiVES startup"
 msgstr "Spustiť LiVES _server pri spustení"
 
-#: src/preferences.c:3911
+#: src/preferences.c:3979
 msgid "Jack transport _master (start and stop)"
 msgstr ""
 
-#: src/preferences.c:3921
+#: src/preferences.c:3989
 msgid "Jack transport _client (start and stop)"
 msgstr ""
 
-#: src/preferences.c:3935
+#: src/preferences.c:4003
 msgid "Jack transport sets start position"
 msgstr ""
 
-#: src/preferences.c:3952
+#: src/preferences.c:4020
 msgid "Jack transport timebase slave"
 msgstr ""
 
-#: src/preferences.c:3963
+#: src/preferences.c:4031
 msgid "(See also Playback -> Audio follows video rate/direction)"
 msgstr ""
 
-#: src/preferences.c:3971
+#: src/preferences.c:4039
 msgid "Jack audio"
 msgstr "Jack zvuk"
 
-#: src/preferences.c:3975
+#: src/preferences.c:4043
 msgid "LiVES must be compiled with jack/jack.h present to use jack audio"
 msgstr "LiVES musí byť skompilovaný s jack/jack.h pre použitie zvuku jack"
 
-#: src/preferences.c:3978
+#: src/preferences.c:4046
 msgid ""
 "You MUST set the audio player to \"jack\" in the Playback tab to use jack "
 "audio"
@@ -8147,99 +8161,99 @@
 "MUSÍTE nastaviť prehrávač zvuku na \"jack\" v záložke Prehrávanie k použitiu "
 "zvuku jack"
 
-#: src/preferences.c:3984
+#: src/preferences.c:4052
 msgid "Jack _audio server config file"
 msgstr "Jack _audio server konfiguračný súbor"
 
-#: src/preferences.c:3996
+#: src/preferences.c:4065
 msgid "Play audio even when transport is _paused"
 msgstr "Prehrávať zvuk aj keď je transport _pozastavený"
 
-#: src/preferences.c:4008
+#: src/preferences.c:4077
 msgid "Automatically connect to System Out ports when 'playing' External Audio"
 msgstr ""
 
-#: src/preferences.c:4021
+#: src/preferences.c:4090
 msgid "Jack Integration"
 msgstr "Integrácia jack"
 
-#: src/preferences.c:4035
+#: src/preferences.c:4104
 msgid "Events to respond to:"
 msgstr "Udalosti v reakcii na:"
 
-#: src/preferences.c:4044
+#: src/preferences.c:4113
 msgid "_Joystick events"
 msgstr ""
 
-#: src/preferences.c:4051
+#: src/preferences.c:4120
 msgid "_Joystick device"
 msgstr "_Joystick jednotka"
 
-#: src/preferences.c:4053
+#: src/preferences.c:4122
 msgid "The joystick device, e.g. /dev/input/js0"
 msgstr "Joystick jednotka, napr. /dev/input/js0"
 
-#: src/preferences.c:4071
+#: src/preferences.c:4142
 msgid "_MIDI events"
 msgstr "_MIDI udalosti"
 
-#: src/preferences.c:4080
+#: src/preferences.c:4151
 msgid "Use _ALSA MIDI (recommended)"
 msgstr "Použiť _ALSA MIDI (doporučené)"
 
-#: src/preferences.c:4082
+#: src/preferences.c:4153
 msgid "Create an ALSA MIDI port which other MIDI devices can be connected to"
 msgstr ""
 
-#: src/preferences.c:4090
+#: src/preferences.c:4162
 msgid "Use _raw MIDI"
 msgstr ""
 
-#: src/preferences.c:4092
+#: src/preferences.c:4164
 msgid "Read directly from the MIDI device"
 msgstr "Čítať priamo z MIDI jednotky"
 
-#: src/preferences.c:4104
+#: src/preferences.c:4177
 msgid "_MIDI device"
 msgstr "_MIDI jednotka"
 
-#: src/preferences.c:4106
+#: src/preferences.c:4179
 msgid "The MIDI device, e.g. /dev/input/midi0"
 msgstr "MIDI jednotka, napr. /dev/input/midi0"
 
-#: src/preferences.c:4118
+#: src/preferences.c:4193
 msgid "Advanced"
 msgstr "Pokročilé"
 
-#: src/preferences.c:4124
+#: src/preferences.c:4199
 msgid "MIDI check _rate"
 msgstr ""
 
-#: src/preferences.c:4127
+#: src/preferences.c:4203
 msgid ""
 "Number of MIDI checks per keyboard tick. Increasing this may improve MIDI "
 "responsiveness, but may slow down playback."
 msgstr ""
 
-#: src/preferences.c:4134
+#: src/preferences.c:4211
 msgid "MIDI repeat"
 msgstr "MIDI opakovať"
 
-#: src/preferences.c:4137
+#: src/preferences.c:4214
 msgid "Number of non-reads allowed between succesive reads."
 msgstr ""
 
-#: src/preferences.c:4140
+#: src/preferences.c:4218
 msgid "(Warning: setting this value too high can slow down playback.)"
 msgstr ""
 "(Upozornenie: nastavenie  tejto hodnoty je príliš vysoké, môže spomaliť "
 "prehrávanie.)"
 
-#: src/preferences.c:4159
+#: src/preferences.c:4237
 msgid "MIDI/Joystick learner"
 msgstr ""
 
-#: src/preferences.c:4499
+#: src/preferences.c:4679
 msgid ""
 "\n"
 "LiVES will now shut down. You need to restart it for the directory change to "
@@ -8250,68 +8264,68 @@
 "LiVES bude ukončený. Je potrebné reštartovať, aby bola uplatnená zmena "
 "adresára.\n"
 
-#: src/preferences.c:4523
+#: src/preferences.c:4703
 msgid ""
 "For the directory change to take effect LiVES will restart when preferences "
 "dialog closes."
 msgstr ""
 
-#: src/preferences.c:4527
+#: src/preferences.c:4707
 msgid "Theme changes will not take effect until the next time you start LiVES."
 msgstr "Zmena témy nebude mať vplyv až do ďalšieho spustenia LiVES."
 
-#: src/preferences.c:4531
+#: src/preferences.c:4711
 msgid "Jack options will not take effect until the next time you start LiVES."
 msgstr "Zmeny nastavenia jack se prejavia po reštarte LiVES."
 
-#: src/osc.c:2585
+#: src/osc.c:2616
 #, c-format
 msgid "Syncing to external framerate of %.8f frames per second.\n"
 msgstr "Synchronizácia s externou frekvenciou %.8f snímkov za sekundu.\n"
 
-#: src/osc.c:6746
+#: src/osc.c:6938
 msgid "Cannot initialize OSC receiver\n"
 msgstr "Nemožno inicializovať OSC prijímač\n"
 
-#: src/osc.c:6770
+#: src/osc.c:6961
 #, c-format
 msgid "WARNING: Cannot start OSC server at UDP port %d\n"
 msgstr "UPOZORNENIE: Nedá sa spustiť OSC server na UDP porte %d\n"
 
-#: src/osc.c:6775
+#: src/osc.c:6963
 #, c-format
 msgid "Started OSC server at UDP port %d\n"
 msgstr "Spustený OSC server na UDP porte %d\n"
 
-#: src/osc.c:6890
+#: src/osc.c:7076
 #, c-format
 msgid "Cannot start OSC/UDP server at port %d \n"
 msgstr "Nedá sa spustiť OSC/UDP server na porte %d \n"
 
-#: src/resample.c:125 src/resample.c:304
+#: src/resample.c:131 src/resample.c:305
 #, c-format
 msgid "Resizing frames 1 to %d"
 msgstr "Zmeniť veľkosť obrázkov 1 do %d"
 
-#: src/resample.c:140 src/resample.c:318
+#: src/resample.c:145 src/resample.c:318
 #, c-format
 msgid "Resizing/letterboxing frames 1 to %d"
 msgstr ""
 
-#: src/resample.c:361 src/resample.c:385
+#: src/resample.c:360 src/resample.c:384
 msgid "Resize"
 msgstr "Zmeniť veľkosť"
 
-#: src/resample.c:395
+#: src/resample.c:394
 msgid "Resample/Resize"
 msgstr "Prevzorkovanie/Zmena veľkosti"
 
-#: src/resample.c:680
+#: src/resample.c:676
 #, c-format
 msgid "Length of video is now %d frames.\n"
 msgstr "Dĺžka videa je teraz %d obrázkov.\n"
 
-#: src/resample.c:745
+#: src/resample.c:737
 msgid ""
 "\n"
 "\n"
@@ -8321,146 +8335,146 @@
 "\n"
 "Nový pomer musí byť väčší ako 0\n"
 
-#: src/resample.c:797 src/resample.c:813
+#: src/resample.c:788 src/resample.c:803
 msgid "Resampling audio"
 msgstr "Prevzorkovanie zvuku"
 
-#: src/resample.c:831
+#: src/resample.c:821
 msgid "LiVES was unable to resample the audio as requested.\n"
 msgstr "LiVES nebol schopný prevzorkovať zvuk tak, ako bolo požadované.\n"
 
-#: src/resample.c:833 src/resample.c:837
+#: src/resample.c:823 src/resample.c:827
 msgid "Resample Audio"
 msgstr "Prevzorkovať zvuk"
 
-#: src/resample.c:845
+#: src/resample.c:835
 #, c-format
 msgid "Audio was resampled to %d Hz, %d channels, %d bit"
 msgstr "Zvuk bol prevzorkovaný do %d Hz, %d chanels, %d bit"
 
-#: src/resample.c:1034
+#: src/resample.c:1016
 #, c-format
 msgid "Resampling video at %.8f frames per second..."
 msgstr "Prevzorkovať video na %.8f snímkov za sekundu..."
 
-#: src/resample.c:1037
+#: src/resample.c:1018
 #, c-format
 msgid "Resampling video at %.3f frames per second..."
 msgstr "Prevzorkovať video na %.3f snímkov za sekundu..."
 
-#: src/resample.c:1068
+#: src/resample.c:1049
 msgid "Reordering error !\n"
 msgstr "Chyba preradenia !\n"
 
-#: src/resample.c:1079
+#: src/resample.c:1060
 msgid "Resample"
 msgstr "Prevzorkovať"
 
-#: src/resample.c:1192
+#: src/resample.c:1173
 msgid "LiVES: - Resample Audio"
 msgstr "LiVES: - Prevzorkovať zvuk"
 
-#: src/resample.c:1195
+#: src/resample.c:1175
 msgid "LiVES: - Insert Silence"
 msgstr "LiVES: - Vložiť ticho"
 
-#: src/resample.c:1198
+#: src/resample.c:1177
 msgid "LiVES: - New Clip Audio"
 msgstr "LiVES: - Nový zvukový klip"
 
-#: src/resample.c:1201
+#: src/resample.c:1179
 msgid "LiVES: - External Clip Settings"
 msgstr "LiVES: - Nastavenia externého klipu"
 
-#: src/resample.c:1238 src/resample.c:1358
+#: src/resample.c:1215 src/resample.c:1332
 msgid "Rate (Hz) "
 msgstr "Frekvencia (Hz) "
 
-#: src/resample.c:1245 src/resample.c:1372
+#: src/resample.c:1222 src/resample.c:1346
 msgid "Channels"
 msgstr ""
 
-#: src/resample.c:1252
+#: src/resample.c:1229
 msgid "Sample Size "
 msgstr ""
 
-#: src/resample.c:1268 src/resample.c:1425
+#: src/resample.c:1245 src/resample.c:1399
 msgid "Signed"
 msgstr "Podpísané"
 
-#: src/resample.c:1274 src/resample.c:1435
+#: src/resample.c:1251 src/resample.c:1409
 msgid "Unsigned"
 msgstr "Nepodpísané"
 
-#: src/resample.c:1297 src/resample.c:1460
+#: src/resample.c:1273 src/resample.c:1433
 msgid "Little Endian"
 msgstr "Malý endian"
 
-#: src/resample.c:1303 src/resample.c:1468
+#: src/resample.c:1279 src/resample.c:1441
 msgid "Big Endian"
 msgstr "Veľký endian"
 
-#: src/resample.c:1315
+#: src/resample.c:1290
 msgid "Current"
 msgstr "Aktuálne"
 
-#: src/resample.c:1340
+#: src/resample.c:1315
 msgid "_Enable audio"
 msgstr "_Povovliť zvuk"
 
-#: src/resample.c:1372
+#: src/resample.c:1346
 msgid "_Channels"
 msgstr ""
 
-#: src/resample.c:1394
+#: src/resample.c:1368
 msgid "_Sample Size"
 msgstr ""
 
-#: src/resample.c:1394
+#: src/resample.c:1368
 msgid "Sample Size"
 msgstr ""
 
-#: src/resample.c:1489
+#: src/resample.c:1461
 msgid "New"
 msgstr "Nový"
 
-#: src/resample.c:1512
+#: src/resample.c:1484
 msgid "_Frames Per Second "
 msgstr "_Snímok za sekundu "
 
-#: src/resample.c:1530
+#: src/resample.c:1502
 msgid "Record for maximum:  "
 msgstr "Nahrať maximálne:  "
 
-#: src/resample.c:1533
+#: src/resample.c:1505
 msgid " hours  "
 msgstr " hodiny  "
 
-#: src/resample.c:1536
+#: src/resample.c:1508
 msgid " minutes  "
 msgstr " minúty  "
 
-#: src/resample.c:1538
+#: src/resample.c:1510
 msgid " seconds  "
 msgstr " sekundy  "
 
-#: src/resample.c:1545
+#: src/resample.c:1517
 msgid "Unlimited"
 msgstr "Bez obmedzenia"
 
-#: src/resample.c:1561
+#: src/resample.c:1533
 msgid "Click OK to begin recording, or Cancel to quit."
 msgstr "Kliknite na OK pre začatie nahrávania, alebo Zrušiť pre ukončenie."
 
-#: src/resample.c:1670
+#: src/resample.c:1638
 msgid "LiVES: - Change playback speed"
 msgstr "LiVES: - Zmeniť rýchlosť prehrávania"
 
-#: src/resample.c:1673
+#: src/resample.c:1640
 msgid "LiVES: - Resample Video"
 msgstr "LiVES: - Prevzorkovať video"
 
-#: src/resample.c:1696
+#: src/resample.c:1663
 #, c-format
 msgid ""
 "\n"
@@ -8477,7 +8491,7 @@
 "Prosím, zadajte požadovanú rýchlosť prehrávania\n"
 "v _snímkoch za sekundu"
 
-#: src/resample.c:1701
+#: src/resample.c:1667
 #, c-format
 msgid ""
 "\n"
@@ -8494,15 +8508,15 @@
 "Prosím vložte _prevzorkovanú hodnotu\n"
 "v snímkoch za sekundu"
 
-#: src/resample.c:1723
+#: src/resample.c:1688
 msgid "OR enter the desired clip length in _seconds"
 msgstr "ALEBO zadajte požadovanú dĺžku klipu v _sekundách"
 
-#: src/resample.c:1745
+#: src/resample.c:1710
 msgid "Change the _audio speed as well"
 msgstr "Zmeniť rovnako rýchlosť _zvuku"
 
-#: src/resample.c:1846
+#: src/resample.c:1810
 msgid ""
 "\n"
 "Speeding up the clip will cause missing frames in some multitrack layouts.\n"
@@ -8513,7 +8527,7 @@
 "rozloženiach.\n"
 "Skutočne chcete zmeniť rýchlosť ?\n"
 
-#: src/resample.c:1863
+#: src/resample.c:1829
 msgid ""
 "\n"
 "Speeding up the clip will cause missing audio in some multitrack layouts.\n"
@@ -8524,48 +8538,48 @@
 "rozloženiach.\n"
 "Skutočne chcete zmeniť rýchlosť ?\n"
 
-#: src/resample.c:1878
+#: src/resample.c:1847
 msgid ""
 "\n"
 "Changing the speed will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/resample.c:1892
+#: src/resample.c:1863
 msgid ""
 "\n"
 "Changing the speed will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/resample.c:1938
+#: src/resample.c:1911
 msgid "Speed Change"
 msgstr "Zmena rýchlosti"
 
-#: src/resample.c:1947
+#: src/resample.c:1920
 #, c-format
 msgid "Changed playback speed to %.3f frames per second and audio to %d Hz.\n"
 msgstr ""
 "Zmeniť rýchlosť prehrávania na %.3f snḿkov za sekundu a zvuku na %d Hz.\n"
 
-#: src/resample.c:1950
+#: src/resample.c:1922
 #, c-format
 msgid "Changed playback speed to %.3f frames per second.\n"
 msgstr "Zmena rýchlosti prehrávania na %.3f snímky za sekundu.\n"
 
-#: src/resample.c:2035
+#: src/resample.c:2006
 msgid "Resampling video"
 msgstr "Prevzorkovanie videa"
 
-#: src/resample.c:2042 src/resample.c:2160 src/resample.c:2182
+#: src/resample.c:2012 src/resample.c:2127 src/resample.c:2148
 msgid "Resampling clipboard video"
 msgstr "Prevzorkovanie videa zo schránky"
 
-#: src/resample.c:2047
+#: src/resample.c:2016
 msgid "Reordering frames"
 msgstr "Preradenie snímkov"
 
-#: src/resample.c:2056
+#: src/resample.c:2025
 msgid ""
 "\n"
 "\n"
@@ -8575,20 +8589,20 @@
 "\n"
 "LiVES nemôže preradiť snímky."
 
-#: src/resample.c:2104
+#: src/resample.c:2071
 msgid "Deordering frames"
 msgstr ""
 
-#: src/resample.c:2199
+#: src/resample.c:2165
 msgid "resampling error..."
 msgstr "chyba prevzorkovania..."
 
-#: src/rte_window.c:85 src/rte_window.c:1708
+#: src/rte_window.c:124 src/rte_window.c:1709
 #, c-format
 msgid "Type: %s"
 msgstr "Typ: %s"
 
-#: src/rte_window.c:112
+#: src/rte_window.c:150
 msgid ""
 "\n"
 "\n"
@@ -8604,7 +8618,7 @@
 "Ste si istý ?\n"
 "\n"
 
-#: src/rte_window.c:426
+#: src/rte_window.c:460
 msgid ""
 "\n"
 "\n"
@@ -8616,12 +8630,12 @@
 "Kliknitím na OK uložíte rozloženie kláves ako predvolené\n"
 "\n"
 
-#: src/rte_window.c:432
+#: src/rte_window.c:466
 #, c-format
 msgid "Saving keymap to %s\n"
 msgstr "Uložiť rozloženie kláves do %s\n"
 
-#: src/rte_window.c:439
+#: src/rte_window.c:471
 #, c-format
 msgid ""
 "\n"
@@ -8630,7 +8644,7 @@
 "\n"
 "Aktualizovať súbor s rozložením kláves %s..."
 
-#: src/rte_window.c:446
+#: src/rte_window.c:477
 #, c-format
 msgid ""
 "\n"
@@ -8640,12 +8654,12 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/rte_window.c:526
+#: src/rte_window.c:556
 #, c-format
 msgid "Saving real time effect defaults to %s..."
 msgstr "Uložiť real time efekt predvolene do %s..."
 
-#: src/rte_window.c:535
+#: src/rte_window.c:563
 #, c-format
 msgid ""
 "\n"
@@ -8660,22 +8674,22 @@
 "%s\n"
 "Kód chyby %d\n"
 
-#: src/rte_window.c:632
+#: src/rte_window.c:657
 #, c-format
 msgid "Loading real time effect defaults from %s..."
 msgstr "Načítať predvolené hodnoty real time efektu z %s..."
 
-#: src/rte_window.c:681
+#: src/rte_window.c:701
 #, c-format
 msgid "Loading generator default sizes from %s..."
 msgstr "Nahrávánie predvolených rozmerov generátora z %s..."
 
-#: src/rte_window.c:1306
+#: src/rte_window.c:1319
 #, c-format
 msgid "Loading default keymap from %s..."
 msgstr "Nahrávánie predvoleného rozloženia kláves z %s..."
 
-#: src/rte_window.c:1329
+#: src/rte_window.c:1339
 #, c-format
 msgid ""
 "\n"
@@ -8690,27 +8704,27 @@
 "%s\n"
 "Kód chyby %d\n"
 
-#: src/rte_window.c:1403
+#: src/rte_window.c:1412
 #, c-format
 msgid "Invalid line %d in %s\n"
 msgstr "Neplatná linka %d v %s\n"
 
-#: src/rte_window.c:1483
+#: src/rte_window.c:1490
 #, c-format
 msgid "Invalid key %d in %s\n"
 msgstr "Neplatný kľúč %d v %s\n"
 
-#: src/rte_window.c:1498
+#: src/rte_window.c:1505
 #, c-format
 msgid "Invalid effect %s in %s\n"
 msgstr "Neplatný efekt %s v %s\n"
 
-#: src/rte_window.c:1517
+#: src/rte_window.c:1524
 #, c-format
 msgid "Unknown effect %s in %s\n"
 msgstr ""
 
-#: src/rte_window.c:1535
+#: src/rte_window.c:1542
 #, c-format
 msgid ""
 "This version of LiVES cannot mix generators/non-generators on the same key "
@@ -8719,21 +8733,21 @@
 "Táto verzia LiVES neumožňuje kombináciu generátorov/ne-generátorov na "
 "rovnakej klávese (%d) !\n"
 
-#: src/rte_window.c:1547
+#: src/rte_window.c:1554
 #, c-format
 msgid "Too many effects bound to key %d.\n"
 msgstr "Pre klávesu %d je priradených priveľa efektov.\n"
 
-#: src/rte_window.c:1587
+#: src/rte_window.c:1593
 msgid "update required.\n"
 msgstr "vyžaduje aktualizáciu.\n"
 
-#: src/rte_window.c:1603
+#: src/rte_window.c:1607
 #, c-format
 msgid "Loading data connection map from %s..."
 msgstr ""
 
-#: src/rte_window.c:1612
+#: src/rte_window.c:1614
 msgid ""
 "\n"
 "\n"
@@ -8745,41 +8759,41 @@
 "Niektoré efekty sa nedajú nájsť.\n"
 "\n"
 
-#: src/rte_window.c:1691
+#: src/rte_window.c:1692
 #, c-format
 msgid "LiVES: Information for %s"
 msgstr "LiVES: Informácie pre %s"
 
-#: src/rte_window.c:1704
+#: src/rte_window.c:1705
 #, c-format
 msgid "Effect name: %s"
 msgstr "Názov efektu: %s"
 
-#: src/rte_window.c:1712
+#: src/rte_window.c:1713
 #, c-format
 msgid "Plugin name: %s"
 msgstr "Názov rozšírenia: %s"
 
-#: src/rte_window.c:1716
+#: src/rte_window.c:1717
 #, c-format
 msgid "Author: %s"
 msgstr "Autor: %s"
 
-#: src/rte_window.c:1721
+#: src/rte_window.c:1722
 #, c-format
 msgid "and: %s"
 msgstr ""
 
-#: src/rte_window.c:1726
+#: src/rte_window.c:1727
 #, c-format
 msgid "Version: %d"
 msgstr "Verzia: %d"
 
-#: src/rte_window.c:1734
+#: src/rte_window.c:1735
 msgid "Description: "
 msgstr "Popis: "
 
-#: src/rte_window.c:1960
+#: src/rte_window.c:1963
 msgid ""
 "\n"
 "\n"
@@ -8793,69 +8807,69 @@
 "rovnakej klávese.\n"
 "\n"
 
-#: src/rte_window.c:2024
+#: src/rte_window.c:2027
 #, c-format
 msgid "LiVES could not locate the effect %s.\n"
 msgstr "LiVES nemohol nájsť efekt %s.\n"
 
-#: src/rte_window.c:2225
+#: src/rte_window.c:2216
 msgid "LiVES: Real time effect mapping"
 msgstr "LiVES: Zobrazenie efektu v reálnom čase"
 
-#: src/rte_window.c:2257
+#: src/rte_window.c:2248
 #, c-format
 msgid "Ctrl-%d"
 msgstr "Ctrl-%d"
 
-#: src/rte_window.c:2264
+#: src/rte_window.c:2255
 msgid "Key active"
 msgstr "Aktívne klávesy"
 
-#: src/rte_window.c:2279
+#: src/rte_window.c:2271
 msgid "Key grab"
 msgstr "Zachytenie kláves"
 
-#: src/rte_window.c:2280
+#: src/rte_window.c:2272
 msgid "Grab keyboard for this effect key"
 msgstr ""
 
-#: src/rte_window.c:2290
+#: src/rte_window.c:2283
 msgid "_Clear all effects"
 msgstr "_Vyčistiť všetky efekty"
 
-#: src/rte_window.c:2304
+#: src/rte_window.c:2297
 msgid "Mode active"
 msgstr "Aktívny mód"
 
-#: src/rte_window.c:2314 src/multitrack.c:8568
+#: src/rte_window.c:2307 src/multitrack.c:8762
 msgid "Info"
 msgstr "Informácia"
 
-#: src/rte_window.c:2315
+#: src/rte_window.c:2308
 msgid "Set Parameters"
 msgstr "Nastaviť parametre"
 
-#: src/rte_window.c:2316
+#: src/rte_window.c:2309
 msgid "Set Connections"
 msgstr ""
 
-#: src/rte_window.c:2317
+#: src/rte_window.c:2310
 msgid "Clear"
 msgstr "Zmazať"
 
-#: src/rte_window.c:2326
+#: src/rte_window.c:2319
 msgid "Effect name:"
 msgstr "Názov efektu:"
 
-#: src/rte_window.c:2391
+#: src/rte_window.c:2384
 msgid "_Save as default keymap"
 msgstr "_Uložiť ako predvolenú mapu kláves"
 
-#: src/rte_window.c:2396
+#: src/rte_window.c:2389
 msgid "_Load default keymap"
 msgstr "_Nahrať predvolenú mapu kláves"
 
-#: src/rte_window.c:2840
+#: src/rte_window.c:2833
 #, c-format
 msgid ""
 "Unable to create default keymap file: %s\n"
@@ -8916,7 +8930,7 @@
 msgid "none\n"
 msgstr "žiadny\n"
 
-#: src/lives-yuv4mpeg.c:494
+#: src/lives-yuv4mpeg.c:493
 #, c-format
 msgid ""
 "Unable to set display framerate to %.3f fps.\n"
@@ -8925,73 +8939,73 @@
 "Nedá sa nastaviť zobrazenie pomeru snímkov %.3f fps.\n"
 "\n"
 
-#: src/lives-yuv4mpeg.c:503
+#: src/lives-yuv4mpeg.c:502
 #, c-format
 msgid "Unable to open yuv4mpeg out stream %s\n"
 msgstr "Nemožno otvoriť yuv4mpeg mimo streamu %s\n"
 
-#: src/lives-yuv4mpeg.c:628
+#: src/lives-yuv4mpeg.c:626
 #, c-format
 msgid "TV card %d"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:713
+#: src/lives-yuv4mpeg.c:710
 #, c-format
 msgid "Opened TV card %d (%s)"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:760
+#: src/lives-yuv4mpeg.c:757
 #, c-format
 msgid "Firewire card %d"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:796
+#: src/lives-yuv4mpeg.c:793
 #, c-format
 msgid "Opened firewire card %d"
 msgstr ""
 
-#: src/multitrack.c:666
+#: src/multitrack.c:736
 msgid "Auto backup"
 msgstr "Automatické zálohovanie"
 
-#: src/multitrack.c:868
+#: src/multitrack.c:935
 msgid "Backing audio"
 msgstr "Podpora zvuku"
 
-#: src/multitrack.c:1435
+#: src/multitrack.c:1515
 #, fuzzy, c-format
 msgid "%s : parameters for %s"
 msgstr "Žiadne parametre"
 
-#: src/multitrack.c:1809 src/multitrack.c:3483
+#: src/multitrack.c:1881 src/multitrack.c:3635
 #, c-format
 msgid "Current track: %s (layer %d)\n"
 msgstr "Aktuálna stopa: %s (vrstva %d)\n"
 
-#: src/multitrack.c:1813 src/multitrack.c:3484
+#: src/multitrack.c:1885 src/multitrack.c:3637
 msgid "Current track: Backing audio\n"
 msgstr "Aktuálna stopa: Podpora zvuku\n"
 
-#: src/multitrack.c:1814
+#: src/multitrack.c:1886
 #, c-format
 msgid "Current track: Layer %d audio\n"
 msgstr "Aktuálna stopa: Vrstva %d zvuku\n"
 
-#: src/multitrack.c:1817
+#: src/multitrack.c:1889
 #, c-format
 msgid "%.2f sec.\n"
 msgstr "%.2f sek.\n"
 
-#: src/multitrack.c:1822 src/multitrack.c:3490
+#: src/multitrack.c:1894 src/multitrack.c:3643
 #, c-format
 msgid "Source: %s"
 msgstr "Zdroj: %s"
 
-#: src/multitrack.c:1825 src/multitrack.c:3492
+#: src/multitrack.c:1897 src/multitrack.c:3645
 msgid "Right click for context menu.\n"
 msgstr "Kliknite pravým tlačidlom na kontextové menu.\n"
 
-#: src/multitrack.c:1827
+#: src/multitrack.c:1899
 msgid ""
 "Double click on a block\n"
 "to select it."
@@ -8999,7 +9013,7 @@
 "dvojitým kliknutím na blok\n"
 "ho vyberiete."
 
-#: src/multitrack.c:3312
+#: src/multitrack.c:3452
 msgid ""
 "\n"
 "\n"
@@ -9008,7 +9022,7 @@
 "right or double clicking on it.\n"
 msgstr ""
 
-#: src/multitrack.c:3315
+#: src/multitrack.c:3455
 msgid ""
 "\n"
 "\n"
@@ -9016,7 +9030,7 @@
 "Select an effect in FX stack first to view its parameters.\n"
 msgstr ""
 
-#: src/multitrack.c:3318
+#: src/multitrack.c:3458
 msgid ""
 "\n"
 "\n"
@@ -9026,7 +9040,7 @@
 "\n"
 "Nie je načítaný žiaden klip.\n"
 
-#: src/multitrack.c:3321
+#: src/multitrack.c:3462
 msgid ""
 "You must select two video tracks\n"
 "and a time region\n"
@@ -9036,7 +9050,7 @@
 "before inserting clips into the timeline."
 msgstr ""
 
-#: src/multitrack.c:3324
+#: src/multitrack.c:3465
 msgid ""
 "\n"
 "\n"
@@ -9050,12 +9064,12 @@
 "a časovú zónu\n"
 "pre uplatnenie kompozítorov.\n"
 
-#: src/multitrack.c:3487
+#: src/multitrack.c:3640
 #, c-format
 msgid "%.2f sec. to %.2f sec.\n"
 msgstr "%.2f sek.do %.2f sek.\n"
 
-#: src/multitrack.c:3493
+#: src/multitrack.c:3646
 msgid ""
 "Single click on timeline\n"
 "to select a frame.\n"
@@ -9063,184 +9077,184 @@
 "Jedným kliknutím na časovú stopu\n"
 "vyberte snímok.\n"
 
-#: src/multitrack.c:3711 src/multitrack.c:6790
+#: src/multitrack.c:3858 src/multitrack.c:6972
 #, c-format
 msgid "%s [unstable]"
 msgstr ""
 
-#: src/multitrack.c:3822
+#: src/multitrack.c:3973
 msgid ""
 "You can click and drag\n"
 "below the timeline"
 msgstr ""
 
-#: src/multitrack.c:3823
+#: src/multitrack.c:3974
 msgid "to select a time region.\n"
 msgstr "vybrať časové pásmo.\n"
 
-#: src/multitrack.c:3985
+#: src/multitrack.c:4137
 msgid "LiVES: Selected clip"
 msgstr "LiVES: Vybraný klip"
 
-#: src/multitrack.c:3993
+#: src/multitrack.c:4145
 msgid "_Adjust start and end points"
 msgstr "_Nastavenie počiatočných a koncových bodov"
 
-#: src/multitrack.c:4002
+#: src/multitrack.c:4154
 msgid "_Edit/encode in clip editor"
 msgstr ""
 
-#: src/multitrack.c:4009
+#: src/multitrack.c:4161
 msgid "_Show clip information"
 msgstr "_Zobraziť informácie o klipe"
 
-#: src/multitrack.c:4016
+#: src/multitrack.c:4168
 msgid "_Close this clip"
 msgstr "_Zatvoriť tento klip"
 
-#: src/multitrack.c:4236
+#: src/multitrack.c:4388
 msgid "Audio mixer (ctrl-m)"
 msgstr "Zvukový mixér (ctrl-m)"
 
-#: src/multitrack.c:4336
+#: src/multitrack.c:4488
 msgid "Single click on timeline"
 msgstr "Jednoduché kliknutie na časovej ose"
 
-#: src/multitrack.c:4337
+#: src/multitrack.c:4489
 msgid "to select a frame."
 msgstr "pre vybranie snímku."
 
-#: src/multitrack.c:4338
+#: src/multitrack.c:4490
 msgid "Double click or right click on timeline"
 msgstr ""
 
-#: src/multitrack.c:4339
+#: src/multitrack.c:4491
 msgid "to select a block."
 msgstr "pre vybranie bloku."
 
-#: src/multitrack.c:4340
+#: src/multitrack.c:4492
 msgid "Clips can be dragged"
 msgstr "Klipy možno preťahovať"
 
-#: src/multitrack.c:4341
+#: src/multitrack.c:4493
 msgid "onto the timeline."
 msgstr "na časovej osi."
 
-#: src/multitrack.c:4343
+#: src/multitrack.c:4495
 msgid "Mouse mode is: Move"
 msgstr "Mód myši je: Pohyb"
 
-#: src/multitrack.c:4344
+#: src/multitrack.c:4496
 msgid "clips can be moved around."
 msgstr "s klipmi môžete pohybovať."
 
-#: src/multitrack.c:4349
+#: src/multitrack.c:4500
 msgid "Mouse mode is: Select."
 msgstr "Mód myši je: Vybrať."
 
-#: src/multitrack.c:4350
+#: src/multitrack.c:4501
 msgid "Drag with mouse on timeline"
 msgstr "Ťahaním myšou na časovej osi"
 
-#: src/multitrack.c:4351
+#: src/multitrack.c:4502
 msgid "to select tracks and time."
 msgstr "vybrať skladby a čas."
 
-#: src/multitrack.c:4362
+#: src/multitrack.c:4509
 msgid "_Insert mode: Normal"
 msgstr ""
 
-#: src/multitrack.c:4378
+#: src/multitrack.c:4537
 msgid "_Mouse mode: Move"
 msgstr "Mód _myši: Pohyb"
 
-#: src/multitrack.c:4382
+#: src/multitrack.c:4540
 msgid "_Mouse mode: Select"
 msgstr "Mód _myši: Výber"
 
-#: src/multitrack.c:4405 src/multitrack.c:7925
+#: src/multitrack.c:4563 src/multitrack.c:8104
 msgid "Gravity: Normal"
 msgstr ""
 
-#: src/multitrack.c:4409
+#: src/multitrack.c:4565
 msgid "Gravity: Left"
 msgstr ""
 
-#: src/multitrack.c:4414
+#: src/multitrack.c:4569
 msgid "Gravity: Right"
 msgstr ""
 
-#: src/multitrack.c:4416
+#: src/multitrack.c:4570
 msgid "Close _last gap(s) in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:4419
+#: src/multitrack.c:4572
 msgid "Close _first gap(s) in selected tracks/time"
 msgstr "Zatvoriť _prvú medzeru(y) v aktuálnej skladbe/čase"
 
-#: src/multitrack.c:4458
+#: src/multitrack.c:4627
 msgid "Close gaps"
 msgstr "Zatvoriť medzery"
 
-#: src/multitrack.c:4460
+#: src/multitrack.c:4629
 msgid "Move block"
 msgstr "Posunúť blok"
 
-#: src/multitrack.c:4462
+#: src/multitrack.c:4631
 msgid "Move audio block"
 msgstr "Posunúť zvukový blok"
 
-#: src/multitrack.c:4464
+#: src/multitrack.c:4633
 msgid "Delete block"
 msgstr "Odstrániť blok"
 
-#: src/multitrack.c:4466
+#: src/multitrack.c:4635
 msgid "Delete audio block"
 msgstr "Odstrániť zvukový blok"
 
-#: src/multitrack.c:4468
+#: src/multitrack.c:4637
 msgid "Split tracks"
 msgstr "Rozdeliť stopy"
 
-#: src/multitrack.c:4470
+#: src/multitrack.c:4639
 msgid "Split block"
 msgstr "Rozdeliť bloky"
 
-#: src/multitrack.c:4473
+#: src/multitrack.c:4642
 #, c-format
 msgid "Apply %s"
 msgstr "Použiť %s"
 
-#: src/multitrack.c:4478
+#: src/multitrack.c:4647
 #, c-format
 msgid "Delete %s"
 msgstr "Odstrániť %s"
 
-#: src/multitrack.c:4482
+#: src/multitrack.c:4651
 msgid "Insert block"
 msgstr "Vložiť blok"
 
-#: src/multitrack.c:4484
+#: src/multitrack.c:4653
 msgid "Insert gap"
 msgstr "Vložiť medzeru"
 
-#: src/multitrack.c:4486
+#: src/multitrack.c:4655
 msgid "Insert audio block"
 msgstr "Vložiť blok zvuku"
 
-#: src/multitrack.c:4488
+#: src/multitrack.c:4657
 msgid "Effect order change"
 msgstr "Zmeniť poradie efektov"
 
-#: src/multitrack.c:4898
+#: src/multitrack.c:5064
 msgid "unsigned "
 msgstr "neoznačený "
 
-#: src/multitrack.c:4899
+#: src/multitrack.c:5065
 msgid "signed "
 msgstr "označený "
 
-#: src/multitrack.c:4904
+#: src/multitrack.c:5071
 #, c-format
 msgid ""
 "Multitrack values set to %.3f fps, frame size %d x %d, audio channels %d, "
@@ -9249,15 +9263,15 @@
 "Multitrack hodnoty nastavené na %.3f fps, veľkosť snímku %d x %d, zvukové "
 "kanály %d, pomer zvuku %d, veľkosť  vzorky zvuku %d, %s.\n"
 
-#: src/multitrack.c:4938
+#: src/multitrack.c:5104
 msgid "invalid event list. Failed.\n"
 msgstr "Neplatný zoznam udalostí. Zlyhanie.\n"
 
-#: src/multitrack.c:4944
+#: src/multitrack.c:5110
 msgid "event list has invalid fps. Failed.\n"
 msgstr "zoznam udalostí má neplatné fps. Zlyhanie.\n"
 
-#: src/multitrack.c:4953
+#: src/multitrack.c:5122
 #, c-format
 msgid ""
 "\n"
@@ -9272,7 +9286,7 @@
 "zatvorte aktuálnu zostavu,\n"
 "potom spustite novú zostavu z menu súbora.\n"
 
-#: src/multitrack.c:4993
+#: src/multitrack.c:5163
 #, c-format
 msgid ""
 "\n"
@@ -9283,439 +9297,431 @@
 "LiVES našiel neplatný počet zvukových kanálov (%d).\n"
 "Nemohlo byť spustené.\n"
 
-#: src/multitrack.c:5329 src/multitrack.c:5338 src/multitrack.c:21133
+#: src/multitrack.c:5452
 msgid "Layout was wiped.\n"
 msgstr ""
 
-#: src/multitrack.c:5374
+#: src/multitrack.c:5547
 #, c-format
 msgid "LiVES-%s: Multitrack %dx%d : %d bpp %.3f fps"
 msgstr "LiVES-%s: Multitrack %dx%d : %d bpp %.3f fps"
 
-#: src/multitrack.c:5617
+#: src/multitrack.c:5793
 msgid "In/out"
 msgstr ""
 
-#: src/multitrack.c:5619
+#: src/multitrack.c:5795
 msgid "FX stack"
 msgstr "FX zásobník"
 
-#: src/multitrack.c:5627 src/omc-learn.c:673
+#: src/multitrack.c:5803 src/omc-learn.c:659
 msgid "Params."
 msgstr ""
 
-#: src/multitrack.c:5978
+#: src/multitrack.c:6157
 msgid "_Open..."
 msgstr "_Otvoriť..."
 
-#: src/multitrack.c:5996
+#: src/multitrack.c:6175
 msgid "O_pen File Selection..."
 msgstr "O_tvoriť súbor výberu..."
 
-#: src/multitrack.c:6040
+#: src/multitrack.c:6219
 msgid "Import Selection from _dvd/vcd..."
 msgstr "Importovať výber z _dvd/vcd..."
 
-#: src/multitrack.c:6050
+#: src/multitrack.c:6229
 msgid "Import Selection from _dvd"
 msgstr "Importovať výber z _dvd"
 
-#: src/multitrack.c:6060
+#: src/multitrack.c:6239
 msgid "Import Selection from _vcd"
 msgstr "Importovať výber z _vcd"
 
-#: src/multitrack.c:6076
+#: src/multitrack.c:6255
 msgid "_Import from Device"
 msgstr "_Importovať výber z jednotky"
 
-#: src/multitrack.c:6103
+#: src/multitrack.c:6282
 msgid "_Close the selected clip"
 msgstr ""
 
-#: src/multitrack.c:6198
+#: src/multitrack.c:6377
 msgid "_Save layout as..."
 msgstr "_Uložiť rozloženie ako..."
 
-#: src/multitrack.c:6206
+#: src/multitrack.c:6385
 msgid "_Load layout..."
 msgstr "_Nahrať rozloženie..."
 
-#: src/multitrack.c:6210
+#: src/multitrack.c:6389
 msgid "_Wipe/Delete layout..."
 msgstr "_Vyčistiť/Zmazať rozloženie..."
 
-#: src/multitrack.c:6236
+#: src/multitrack.c:6415
 msgid "_Ignore width, height and audio values from loaded layouts"
 msgstr "_Ignorovať šírku, výšku a hodnoty zvuku z nahraného rozloženia"
 
-#: src/multitrack.c:6240
+#: src/multitrack.c:6419
 msgid "Auto load _subtitles with clips"
 msgstr ""
 
-#: src/multitrack.c:6322
+#: src/multitrack.c:6501
 msgid "_CLIP EDITOR"
 msgstr "_KLIP EDITOR"
 
-#: src/multitrack.c:6334
+#: src/multitrack.c:6513
 msgid "_Adjust selected clip start/end points"
 msgstr ""
 
-#: src/multitrack.c:6343
+#: src/multitrack.c:6522
 msgid "_Insert selected clip"
 msgstr "_Vložiť vybraný klip"
 
-#: src/multitrack.c:6355
+#: src/multitrack.c:6534
 msgid "_Insert selected clip audio"
 msgstr "_Vložiť vybraný zvuk klipu"
 
-#: src/multitrack.c:6364
+#: src/multitrack.c:6543
 msgid "_Delete selected block"
 msgstr "_Odstrániť vybraný blok"
 
-#: src/multitrack.c:6373
+#: src/multitrack.c:6555
 msgid "_Jump to previous block boundary"
 msgstr "_Skočiť na predchádzajúcu hranicu bloku"
 
-#: src/multitrack.c:6382
+#: src/multitrack.c:6564
 msgid "_Jump to next block boundary"
 msgstr "_Skočiť na hranicu ďaľšieho bloku"
 
-#: src/multitrack.c:6395
+#: src/multitrack.c:6577
 msgid "Clear _marks from timeline"
 msgstr "Vymazať _značky z časovej osi"
 
-#: src/multitrack.c:6403
+#: src/multitrack.c:6585
 msgid "Ignore selection limits when inserting"
 msgstr "Ignorovať obmedzenia výberu pri vkladaní"
 
-#: src/multitrack.c:6420 src/multitrack.c:16719
+#: src/multitrack.c:6602 src/multitrack.c:17009
 msgid "_Play from Timeline Position"
 msgstr "_Prehrať z určitého miesta na časovej osi"
 
-#: src/multitrack.c:6434
+#: src/multitrack.c:6616
 msgid "Pla_y selected time only"
 msgstr ""
 
-#: src/multitrack.c:6518
+#: src/multitrack.c:6700
 msgid "_Move effects with blocks"
 msgstr "_Presunúť efekty s blokmi"
 
-#: src/multitrack.c:6531
+#: src/multitrack.c:6713
 msgid "Select _autotransition effect..."
 msgstr ""
 
-#: src/multitrack.c:6542
+#: src/multitrack.c:6724
 msgid "Crossfade audio with autotransition"
 msgstr ""
 
-#: src/multitrack.c:6550
+#: src/multitrack.c:6732
 msgid "View/_Edit selected effect"
 msgstr "Zobraziť/_Upraviť vybraný efekt"
 
-#: src/multitrack.c:6554
+#: src/multitrack.c:6736
 msgid "_Delete selected effect"
 msgstr "_Odstrániť vybraný efekt"
 
-#: src/multitrack.c:6562
+#: src/multitrack.c:6744
 msgid "Apply effect to _block..."
 msgstr "Použiť efekt na _blok..."
 
-#: src/multitrack.c:6619
+#: src/multitrack.c:6801
 msgid "Apply effect to _region..."
 msgstr "Použiť efekt na _región..."
 
-#: src/multitrack.c:6885
+#: src/multitrack.c:7061
 msgid "_Tracks"
 msgstr "_Stopy"
 
-#: src/multitrack.c:6896
+#: src/multitrack.c:7072
 msgid "Rename current track"
 msgstr ""
 
-#: src/multitrack.c:6904
+#: src/multitrack.c:7080
 msgid "Make _Backing Audio current track"
 msgstr "Presun aktuálnej zvukovej stopy na _pozadie"
 
-#: src/multitrack.c:6915
+#: src/multitrack.c:7091
 msgid "Add Video Track at _Rear"
 msgstr "Pridať video stopu na _koniec"
 
-#: src/multitrack.c:6923
+#: src/multitrack.c:7099
 msgid "Add Video Track at _Front"
 msgstr "Pridať video stopu na _začiatok"
 
-#: src/multitrack.c:6936
+#: src/multitrack.c:7112
 msgid "_Split current track at cursor"
 msgstr "_Rozdeliť súčasnú stopu na kurzor"
 
-#: src/multitrack.c:6948
+#: src/multitrack.c:7124
 msgid "_Split selected video tracks"
 msgstr "_Rozdeliť vybrané video stopy"
 
-#: src/multitrack.c:6961
+#: src/multitrack.c:7137
 msgid "Insert gap in selected tracks/time"
 msgstr "Vložiť medzeru vo zvolenej skladbe/čase"
 
-#: src/multitrack.c:6969
+#: src/multitrack.c:7145
 msgid "Insert gap in current track/selected time"
 msgstr "Vložiť medzeru v aktuálnej skladbe/vybranom čase"
 
-#: src/multitrack.c:6981
+#: src/multitrack.c:7157
 msgid "Close all _gaps in selected tracks/time"
 msgstr "Zatvoriť všetky _medzery v aktuálnej skladbe/čase"
 
-#: src/multitrack.c:7007
+#: src/multitrack.c:7183
 msgid "Se_lection"
 msgstr "Vý_ber"
 
-#: src/multitrack.c:7018
+#: src/multitrack.c:7194
 msgid "_Select Current Track"
 msgstr "_Vybrať aktuálnu stopu"
 
-#: src/multitrack.c:7025
+#: src/multitrack.c:7201
 msgid "Select _all video tracks"
 msgstr "Vybrať _všetky video stopy"
 
-#: src/multitrack.c:7032
+#: src/multitrack.c:7208
 msgid "Select _no video tracks"
 msgstr "Nevybrať _žiadne video stopy"
 
-#: src/multitrack.c:7039
+#: src/multitrack.c:7215
 msgid "Select all _time"
 msgstr "Vybrať všetko"
 
-#: src/multitrack.c:7050
+#: src/multitrack.c:7226
 msgid "Select from _zero time"
 msgstr "Vybrať od začiatku"
 
-#: src/multitrack.c:7057
+#: src/multitrack.c:7233
 msgid "Select to _end time"
 msgstr "Vybrať do konca"
 
-#: src/multitrack.c:7064
+#: src/multitrack.c:7240
 msgid "_Copy..."
 msgstr "_Kopírovať..."
 
-#: src/multitrack.c:7075
+#: src/multitrack.c:7251
 msgid "_Timecode to region start"
 msgstr "_Časový kód pre začiatok oblasti"
 
-#: src/multitrack.c:7082
+#: src/multitrack.c:7258
 msgid "_Timecode to region end"
 msgstr "_Časový kód pre koniec oblasti"
 
-#: src/multitrack.c:7089
+#: src/multitrack.c:7265
 msgid "_Region start to timecode"
 msgstr "_Spustiť v čase"
 
-#: src/multitrack.c:7096
+#: src/multitrack.c:7272
 msgid "_Region end to timecode"
 msgstr "_Ukončiť v čase"
 
-#: src/multitrack.c:7110
+#: src/multitrack.c:7286
 msgid "Select/deselect block at current track/time"
 msgstr ""
 
-#: src/multitrack.c:7135
+#: src/multitrack.c:7311
 msgid "_Change width, height and audio values..."
 msgstr "_Zmeniť šírku, výšku a hodnoty zvuku..."
 
-#: src/multitrack.c:7194
+#: src/multitrack.c:7370
 msgid "_Render"
 msgstr "_Vykresliť"
 
-#: src/multitrack.c:7205
+#: src/multitrack.c:7381
 msgid "_Render all to new clip"
 msgstr "_Vykresliť všetko do nového klipu"
 
-#: src/multitrack.c:7220
+#: src/multitrack.c:7396
 msgid "Render _video"
 msgstr "Vykresliť _video"
 
-#: src/multitrack.c:7225
+#: src/multitrack.c:7401
 msgid "Render _audio"
 msgstr "Vykresliť _zvuk"
 
-#: src/multitrack.c:7235
+#: src/multitrack.c:7411
 msgid "_Normalise rendered audio"
 msgstr ""
 
-#: src/multitrack.c:7242
+#: src/multitrack.c:7418
 msgid "_Pre-render audio"
 msgstr ""
 
-#: src/multitrack.c:7251
+#: src/multitrack.c:7427
 msgid "_View"
 msgstr "_Zobrazenie"
 
-#: src/multitrack.c:7270
+#: src/multitrack.c:7446
 msgid "Block _In/out points"
 msgstr "Blokovať body _vstupu/výstupu"
 
-#: src/multitrack.c:7279
+#: src/multitrack.c:7455
 msgid "_Effects at current"
 msgstr "Aktuálne _efekty"
 
-#: src/multitrack.c:7297
+#: src/multitrack.c:7473
 msgid "Audio parameters"
 msgstr "Parametre zvuku"
 
-#: src/multitrack.c:7308
+#: src/multitrack.c:7484
 msgid "Show backing _audio track"
 msgstr "Zobraziť _zvukovú stopu na pozadí"
 
-#: src/multitrack.c:7312
+#: src/multitrack.c:7488
 msgid "Compact view"
 msgstr "Kompaktný pohľad"
 
-#: src/multitrack.c:7320
+#: src/multitrack.c:7496
 msgid "Maximum tracks to display..."
 msgstr "Maximum stôp k zobrazeniu..."
 
-#: src/multitrack.c:7327
+#: src/multitrack.c:7503
 msgid "Scroll to follow playback"
 msgstr "Prejdite na nasledujúce prehrávanie"
 
-#: src/multitrack.c:7331
+#: src/multitrack.c:7507
 msgid "_Center on cursor"
 msgstr "_Vystrediť na kurzor"
 
-#: src/multitrack.c:7338
+#: src/multitrack.c:7514
 msgid "_Zoom in"
 msgstr "_Priblížiť"
 
-#: src/multitrack.c:7349
+#: src/multitrack.c:7525
 msgid "_Zoom out"
 msgstr "_Oddialiť"
 
-#: src/multitrack.c:7361
+#: src/multitrack.c:7537
 msgid "Multitrack _details"
 msgstr "_Detaily o multitracku"
 
-#: src/multitrack.c:7374
+#: src/multitrack.c:7550
 msgid "_Event Window"
 msgstr "_Okno udalosti"
 
-#: src/multitrack.c:7378
+#: src/multitrack.c:7554
 msgid "_Event Window (selected time only)"
 msgstr "_Okno udalosti (iba vybraný čas)"
 
-#: src/multitrack.c:7382
+#: src/multitrack.c:7558
 msgid "_Show FRAME events"
 msgstr "_Zobraziť udalosti SNÍMKY"
 
-#: src/multitrack.c:7399
+#: src/multitrack.c:7575
 msgid "_Show multitrack keys"
 msgstr "_Zobraziť multitrack klávesy"
 
-#: src/multitrack.c:7468
+#: src/multitrack.c:7644
 msgid "Mouse mode: _Move"
 msgstr "Mód myši: _Pohyb"
 
-#: src/multitrack.c:7476
+#: src/multitrack.c:7652
 msgid "Mouse mode: _Select"
 msgstr "Mód myši: _Výber"
 
-#: src/multitrack.c:7505
+#: src/multitrack.c:7681
 msgid "Insert mode: _Normal"
 msgstr ""
 
-#: src/multitrack.c:7733
+#: src/multitrack.c:7909
 msgid "Insert with _audio"
 msgstr "Vložiť so _zvukom"
 
-#: src/multitrack.c:7734
+#: src/multitrack.c:7910
 msgid ""
 "Select whether video clips are inserted and moved with their audio or not"
 msgstr ""
 
-#: src/multitrack.c:7829
+#: src/multitrack.c:8007
 msgid "Select _overlap"
 msgstr "Vybrať _prekrytie"
 
-#: src/multitrack.c:7830
+#: src/multitrack.c:8008
 msgid ""
 "Select whether timeline selection snaps to overlap between selected tracks "
 "or not"
 msgstr ""
 
-#: src/multitrack.c:7894 src/multitrack.c:14198
+#: src/multitrack.c:8073 src/multitrack.c:14422
 msgid "Expanded View (d)"
 msgstr "Rozšírený pohľad (d)"
 
-#: src/multitrack.c:7897 src/multitrack.c:14205
+#: src/multitrack.c:8076 src/multitrack.c:14428
 msgid "Compact View (d)"
 msgstr "Kompaktný pohľad (d)"
 
-#: src/multitrack.c:7939
+#: src/multitrack.c:8118
 msgid "Gravity: _Normal"
 msgstr ""
 
-#: src/multitrack.c:7952
+#: src/multitrack.c:8131
 msgid "Gravity: _Left"
 msgstr ""
 
-#: src/multitrack.c:7967
+#: src/multitrack.c:8146
 msgid "Gravity: _Right"
 msgstr ""
 
-#: src/multitrack.c:8297
+#: src/multitrack.c:8496
 msgid "_Apply"
 msgstr "_Použiť"
 
-#: src/multitrack.c:8319
+#: src/multitrack.c:8518
 msgid "Time"
 msgstr "Čas"
 
-#: src/multitrack.c:8333
+#: src/multitrack.c:8532
 msgid "_Del. node"
 msgstr "_Odstrániť uzol"
 
-#: src/multitrack.c:8341
+#: src/multitrack.c:8540
 msgid "_Next node"
 msgstr "_Ďaľší uzol"
 
-#: src/multitrack.c:8349
+#: src/multitrack.c:8548
 msgid "_Prev node"
 msgstr "_Predchádzajúci uzol"
 
-#: src/multitrack.c:8373
+#: src/multitrack.c:8574
 msgid "_Reverse playback  "
 msgstr "_Opačné prehrávanie  "
 
-#: src/multitrack.c:8395
+#: src/multitrack.c:8596
 msgid "_Velocity  "
 msgstr "_Rýchlosť  "
 
-#: src/multitrack.c:8464
+#: src/multitrack.c:8664
 msgid "Anchor _start"
 msgstr "Ukotviť _štart"
 
-#: src/multitrack.c:8465
+#: src/multitrack.c:8665
 msgid "Anchor the start point to the timeline"
 msgstr "Ukotviť bod štartu na časovej osi"
 
-#: src/multitrack.c:8481
-msgid "Start frame"
-msgstr "Prvý snímok"
-
-#: src/multitrack.c:8533
+#: src/multitrack.c:8728
 msgid "Anchor _end"
 msgstr "Ukotviť _koniec"
 
-#: src/multitrack.c:8534
+#: src/multitrack.c:8729
 msgid "Anchor the end point to the timeline"
 msgstr "Ukotviť bod konca na časovej osi"
 
-#: src/multitrack.c:8546
-msgid "End frame"
-msgstr "Posledný snímok"
-
-#: src/multitrack.c:8739
+#: src/multitrack.c:8929
 msgid "Scroll"
 msgstr "Prejdite"
 
-#: src/multitrack.c:9316
+#: src/multitrack.c:9502
 msgid ""
 "\n"
 "==============================\n"
@@ -9725,91 +9731,91 @@
 "==============================\n"
 "Prepnuté do režimu úpravy klipu\n"
 
-#: src/multitrack.c:9502
+#: src/multitrack.c:9708
 msgid "Timeline (seconds)"
 msgstr "Časová os (sekundy)"
 
-#: src/multitrack.c:9984
+#: src/multitrack.c:10202
 msgid " Backing audio"
 msgstr " Zvuk v pozadí"
 
-#: src/multitrack.c:9987
+#: src/multitrack.c:10204
 #, c-format
 msgid " Layer %d audio"
 msgstr " Vrstva %d zvuku"
 
-#: src/multitrack.c:9995
+#: src/multitrack.c:10212
 msgid "Show/hide audio details"
 msgstr "Zobraziť/skryť detaily zvuku"
 
-#: src/multitrack.c:10010 src/multitrack.c:10232
+#: src/multitrack.c:10227 src/multitrack.c:10452
 #, c-format
 msgid "Layer %d audio"
 msgstr "Vrstva %d zvuku"
 
-#: src/multitrack.c:10144 src/multitrack.c:10261
+#: src/multitrack.c:10353 src/multitrack.c:10481
 #, c-format
 msgid "%s (layer %d)"
 msgstr "%s (vrstva %d)"
 
-#: src/multitrack.c:10184
+#: src/multitrack.c:10403
 msgid "Select track"
 msgstr "Vybrať stopu"
 
-#: src/multitrack.c:10188
+#: src/multitrack.c:10407
 msgid "Show/hide audio"
 msgstr "Zobraziť/skryť zvuk"
 
-#: src/multitrack.c:10194
+#: src/multitrack.c:10413
 #, c-format
 msgid "Video %d"
 msgstr "Video %d"
 
-#: src/multitrack.c:10233
+#: src/multitrack.c:10453
 #, c-format
 msgid " %s"
 msgstr " %s"
 
-#: src/multitrack.c:10346
+#: src/multitrack.c:10574
 msgid "LiVES: Selected effect"
 msgstr "LiVES: Vybraný efekt"
 
-#: src/multitrack.c:10358
+#: src/multitrack.c:10586
 msgid "_View/Edit this effect"
 msgstr "_Zobraziť/upraviť tento efekt"
 
-#: src/multitrack.c:10361
+#: src/multitrack.c:10588
 msgid "_View this effect"
 msgstr "_Zobraziť tento efekt"
 
-#: src/multitrack.c:10369
+#: src/multitrack.c:10596
 msgid "_Delete this effect"
 msgstr "_Odstrániť tento efekt"
 
-#: src/multitrack.c:10422
+#: src/multitrack.c:10648
 msgid "Cannot insert after this effect"
 msgstr "Nedá sa vložiť po tomto efekte"
 
-#: src/multitrack.c:10451
+#: src/multitrack.c:10677
 msgid "This effect cannot be moved"
 msgstr "Tento efekt nemôže byť premiestnený"
 
-#: src/multitrack.c:10499
+#: src/multitrack.c:10724
 #, c-format
 msgid "  %d to %d selected  "
 msgstr "  %d do %d vybraného  "
 
-#: src/multitrack.c:10502 src/multitrack.c:10746
+#: src/multitrack.c:10727 src/multitrack.c:10968
 #, c-format
 msgid "%.2f sec."
 msgstr "%.2f sek."
 
-#: src/multitrack.c:10717
+#: src/multitrack.c:10940
 #, c-format
 msgid "%d frames"
 msgstr "%d snímkov"
 
-#: src/multitrack.c:11070
+#: src/multitrack.c:11299
 msgid ""
 "\n"
 "==============================\n"
@@ -9819,19 +9825,19 @@
 "==============================\n"
 "Prepnúť do Multitrack módu\n"
 
-#: src/multitrack.c:12691
+#: src/multitrack.c:12939
 msgid "Drag the time slider to where you"
 msgstr ""
 
-#: src/multitrack.c:12692
+#: src/multitrack.c:12940
 msgid "want to set effect parameters"
 msgstr "chcete nastaviť parametre efektu"
 
-#: src/multitrack.c:12693
+#: src/multitrack.c:12941
 msgid "Set parameters, then click \"Apply\"\n"
 msgstr "Nastavte parametre a potom kliknite na tlačidlo \"Použiť\"\n"
 
-#: src/multitrack.c:12694
+#: src/multitrack.c:12942
 msgid ""
 "NODES are points where parameters\n"
 "have been set.\n"
@@ -9841,51 +9847,51 @@
 "boli nastavené.\n"
 "Nodes môžu byť odstránené."
 
-#: src/multitrack.c:12697
+#: src/multitrack.c:12944
 msgid "Effect has no parameters.\n"
 msgstr "Efekt nemá žiadne parametre.\n"
 
-#: src/multitrack.c:12788
+#: src/multitrack.c:13033
 #, c-format
 msgid "%s output"
 msgstr "%s výstup"
 
-#: src/multitrack.c:12794 src/multitrack.c:12804
+#: src/multitrack.c:13038 src/multitrack.c:13046
 #, c-format
 msgid "layer %d"
 msgstr "vrstva %d"
 
-#: src/multitrack.c:12796 src/multitrack.c:12806
+#: src/multitrack.c:13039 src/multitrack.c:13047
 msgid "audio track"
 msgstr "zvuková stopa"
 
-#: src/multitrack.c:12797
+#: src/multitrack.c:13040
 #, c-format
 msgid "%s to %s"
 msgstr "%s na %s"
 
-#: src/multitrack.c:12807
+#: src/multitrack.c:13048
 #, c-format
 msgid "%s from %s"
 msgstr ""
 
-#: src/multitrack.c:12860
+#: src/multitrack.c:13099
 msgid "_Prev filter map"
 msgstr "Mapa _predchádzajúceho filtra"
 
-#: src/multitrack.c:12871
+#: src/multitrack.c:13110
 msgid "Insert _before"
 msgstr "Vložiť _pred"
 
-#: src/multitrack.c:12881
+#: src/multitrack.c:13120
 msgid "Insert _after"
 msgstr "Vložiť _po"
 
-#: src/multitrack.c:12896
+#: src/multitrack.c:13134
 msgid "_Next filter map"
 msgstr "Mapa _nasledujúceho filtra"
 
-#: src/multitrack.c:12911
+#: src/multitrack.c:13148
 msgid ""
 "\n"
 "\n"
@@ -9897,80 +9903,80 @@
 "Žiaden efekt na aktuálnej stope,\n"
 "aktuálny čas.\n"
 
-#: src/multitrack.c:12929
+#: src/multitrack.c:13166
 msgid ""
 "Drag a compositor anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:12936
+#: src/multitrack.c:13173
 msgid ""
 "Drag a transition anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:12944
+#: src/multitrack.c:13181
 msgid ""
 "Effects can be dragged\n"
 "onto blocks on the timeline."
 msgstr ""
 
-#: src/multitrack.c:13166
+#: src/multitrack.c:13406
 msgid "LiVES: Selected block/frame"
 msgstr "LiVES: Vybraný blok/snímok"
 
-#: src/multitrack.c:13173
+#: src/multitrack.c:13413
 msgid "_Select this block"
 msgstr "_Vybrať tento blok"
 
-#: src/multitrack.c:13183
+#: src/multitrack.c:13423
 msgid "_Split block here"
 msgstr "Tu _rozdeliť bloky"
 
-#: src/multitrack.c:13191
+#: src/multitrack.c:13431
 msgid "List _effects here"
 msgstr "Zoznam _efektov"
 
-#: src/multitrack.c:13200 src/multitrack.c:13277
+#: src/multitrack.c:13440 src/multitrack.c:13518
 #, c-format
 msgid "_Adjust %s"
 msgstr "_Nastaviť %s"
 
-#: src/multitrack.c:13215
+#: src/multitrack.c:13455
 msgid "_Delete this block"
 msgstr "_Odstrániť tento blok"
 
-#: src/multitrack.c:13258
+#: src/multitrack.c:13500
 msgid "_Insert here"
 msgstr "_Vložiť sem"
 
-#: src/multitrack.c:13264
+#: src/multitrack.c:13505
 msgid "_Insert audio here"
 msgstr "_Vložiť zvuk sem"
 
-#: src/multitrack.c:14801
+#: src/multitrack.c:15017
 #, c-format
 msgid "Inserted gap in selected tracks from time %.4f to %.4f\n"
 msgstr "Vložená medzera vo vybranej stope od %.4f do %.4f\n"
 
-#: src/multitrack.c:14835
+#: src/multitrack.c:15048
 #, c-format
 msgid "Inserted gap in track %s from time %.4f to %.4f\n"
 msgstr "Vložená medzera v stope %s od %.4f do %.4f\n"
 
-#: src/multitrack.c:15036
+#: src/multitrack.c:15244
 #, c-format
 msgid "Undid %s\n"
 msgstr "Zrušený %s\n"
 
-#: src/multitrack.c:15235
+#: src/multitrack.c:15445
 #, c-format
 msgid "Redid %s\n"
 msgstr "Prerobiť %s\n"
 
-#: src/multitrack.c:15268
+#: src/multitrack.c:15475
 msgid ""
 "\n"
 " (variable)"
@@ -9978,62 +9984,62 @@
 "\n"
 " (variabilný)"
 
-#: src/multitrack.c:15502 src/multitrack.c:15614 src/multitrack.c:18736
-#: src/multitrack.c:18748
+#: src/multitrack.c:15710 src/multitrack.c:15823 src/multitrack.c:19077
+#: src/multitrack.c:19089
 #, c-format
 msgid "track %s"
 msgstr "stopa %s"
 
-#: src/multitrack.c:15507 src/multitrack.c:15619 src/multitrack.c:18741
+#: src/multitrack.c:15715 src/multitrack.c:15828 src/multitrack.c:19082
 #, c-format
 msgid "tracks %s and %s"
 msgstr "stopy %s a %s"
 
-#: src/multitrack.c:15513 src/multitrack.c:15625 src/multitrack.c:18751
+#: src/multitrack.c:15721 src/multitrack.c:15834 src/multitrack.c:19091
 msgid "selected tracks"
 msgstr "vybrané stopy"
 
-#: src/multitrack.c:15516
+#: src/multitrack.c:15726
 #, c-format
 msgid "Added %s %s to %s from %.4f to %.4f\n"
 msgstr "Pridané %s %s do %s z %.4f do %.4f\n"
 
-#: src/multitrack.c:15550
+#: src/multitrack.c:15760
 #, c-format
 msgid "Added effect %s to track %s from %.4f to %.4f\n"
 msgstr "Pridaný efekt %s do stopy %s z %.4f do %.4f\n"
 
-#: src/multitrack.c:15631
+#: src/multitrack.c:15845
 #, c-format
 msgid "Deleted %s %s from %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15935
+#: src/multitrack.c:16143
 #, c-format
 msgid "rendered %d frames to new clip.\n"
 msgstr "vykreslené %d snímky do nového klipu.\n"
 
-#: src/multitrack.c:16025
+#: src/multitrack.c:16230
 msgid "Cleaning up..."
 msgstr "Prebieha čistenie..."
 
-#: src/multitrack.c:16712
+#: src/multitrack.c:17003
 msgid "_Pause"
 msgstr "_Pozastaviť"
 
-#: src/multitrack.c:16713
+#: src/multitrack.c:17004
 msgid "Pause (p)"
 msgstr "Pozastavené (p)"
 
-#: src/multitrack.c:16856
+#: src/multitrack.c:17151
 msgid "Press 'm' during playback"
 msgstr "Stlač 'm' počas prehrávania"
 
-#: src/multitrack.c:16857
+#: src/multitrack.c:17152
 msgid "to make a mark on the timeline"
 msgstr "urobiť značku na časovej osi"
 
-#: src/multitrack.c:17154
+#: src/multitrack.c:17498
 #, c-format
 msgid ""
 "Inserted audio %.4f to %.4f from clip %s into backing audio from time %.4f "
@@ -10041,13 +10047,13 @@
 msgstr ""
 "Vložený zvuk %.4f do %.4f z klipu %s do zvuku v pozadí od %.4f do %.4f\n"
 
-#: src/multitrack.c:17414
+#: src/multitrack.c:17759
 #, c-format
 msgid ""
 "Inserted frames %d to %d from clip %s into track %s from time %.4f to %.4f\n"
 msgstr "Vložené snímky %d do %d z klipu %s do do stopy %s od %.4f do %.4f\n"
 
-#: src/multitrack.c:17998
+#: src/multitrack.c:18332
 #, c-format
 msgid ""
 "Time region %.3f to %.3f\n"
@@ -10056,7 +10062,7 @@
 "Časová zóna%.3f do %.3f\n"
 "vybraná.\n"
 
-#: src/multitrack.c:18002
+#: src/multitrack.c:18336
 msgid ""
 "select one or more tracks\n"
 "to create a region.\n"
@@ -10064,12 +10070,12 @@
 "vyberte jednu alebo viac stôp\n"
 "k vytvoreniu regionu.\n"
 
-#: src/multitrack.c:18004
+#: src/multitrack.c:18337
 #, c-format
 msgid "%d video tracks selected.\n"
 msgstr "%d video stopa vybraná.\n"
 
-#: src/multitrack.c:18006
+#: src/multitrack.c:18339
 msgid ""
 "Double click on timeline\n"
 "to deselect time region."
@@ -10077,7 +10083,7 @@
 "dvojité kliknutie na časovú zónu\n"
 "pre odznačenie časovej oblasti."
 
-#: src/multitrack.c:18013
+#: src/multitrack.c:18346
 msgid ""
 "Single click on an effect\n"
 "to select it."
@@ -10085,7 +10091,7 @@
 "Jednoduché kliknutie na efekt\n"
 "pre jeho vybratie."
 
-#: src/multitrack.c:18014
+#: src/multitrack.c:18347
 msgid ""
 "Double click on an effect\n"
 "to edit it."
@@ -10093,7 +10099,7 @@
 "Dvojité kliknutie na efekt\n"
 "pre jeho úpravu"
 
-#: src/multitrack.c:18015
+#: src/multitrack.c:18348
 msgid ""
 "Right click on an effect\n"
 "for context menu.\n"
@@ -10101,27 +10107,27 @@
 "Kliknite pravým tlačidlom myši na efekt\n"
 "pre kontextové menu.\n"
 
-#: src/multitrack.c:18017
+#: src/multitrack.c:18350
 msgid ""
 "Effect order can be changed at\n"
 "FILTER MAPS"
 msgstr ""
 
-#: src/multitrack.c:18024
+#: src/multitrack.c:18357
 msgid ""
 "You can select an effect,\n"
 "then use the INSERT BEFORE"
 msgstr ""
 
-#: src/multitrack.c:18025
+#: src/multitrack.c:18358
 msgid "or INSERT AFTER buttons to move it."
 msgstr "alebo VLOŽIŤ PO tlačítkom pre pohyb."
 
-#: src/multitrack.c:18307 src/multitrack.c:18320
+#: src/multitrack.c:18639 src/multitrack.c:18652
 msgid "Click on another effect,"
 msgstr "Kliknite na daľší efekt,"
 
-#: src/multitrack.c:18308 src/multitrack.c:18321
+#: src/multitrack.c:18640 src/multitrack.c:18653
 msgid ""
 "and the selected one\n"
 "will be inserted"
@@ -10129,51 +10135,51 @@
 "a jeho vybraním\n"
 "bude vložený"
 
-#: src/multitrack.c:18309
+#: src/multitrack.c:18641
 msgid "after it.\n"
 msgstr "po.\n"
 
-#: src/multitrack.c:18322
+#: src/multitrack.c:18654
 msgid "before it.\n"
 msgstr "pred.\n"
 
-#: src/multitrack.c:18551
+#: src/multitrack.c:18889
 #, c-format
 msgid "Removed parameter values for effect %s at time %.4f\n"
 msgstr "Odstránené hodnoty pre efekt %s v čase %.4f\n"
 
-#: src/multitrack.c:18759
+#: src/multitrack.c:19100
 #, c-format
 msgid "Set parameter values for %s %s on %s at time %.4f\n"
 msgstr "Nastaviť hodnoty pre %s %s na %s v čase %.4f\n"
 
-#: src/multitrack.c:19251 src/multitrack.c:20873
+#: src/multitrack.c:19630 src/multitrack.c:21195
 msgid "_Autoreload each time"
 msgstr "_Automatické znovu načítanie"
 
-#: src/multitrack.c:19323
+#: src/multitrack.c:19702
 #, fuzzy
 msgid "Saving layout"
 msgstr "_Uložiť rozloženie"
 
-#: src/multitrack.c:19345
+#: src/multitrack.c:19725
 #, c-format
 msgid "Saved layout to %s\n"
 msgstr "Rozloženie uložené do %s\n"
 
-#: src/multitrack.c:20783
+#: src/multitrack.c:21125
 msgid "clips and frames"
 msgstr "klipy a snímky"
 
-#: src/multitrack.c:20787
+#: src/multitrack.c:21128
 msgid "clips"
 msgstr "klipy"
 
-#: src/multitrack.c:20790
+#: src/multitrack.c:21130
 msgid "frames"
 msgstr "snímky"
 
-#: src/multitrack.c:20800
+#: src/multitrack.c:21140
 msgid ""
 "\n"
 "Auto reload layout.\n"
@@ -10181,7 +10187,7 @@
 "\n"
 "Automatické načítanie rozloženia.\n"
 
-#: src/multitrack.c:20803
+#: src/multitrack.c:21143
 #, c-format
 msgid ""
 "%s\n"
@@ -10192,11 +10198,11 @@
 "Niektoré %s sa nenachádzajú v rozložení%s\n"
 "Preto nemohli byť správne otvorené.\n"
 
-#: src/multitrack.c:20920
+#: src/multitrack.c:21284
 msgid "auto backup"
 msgstr "automatické zálohovanie"
 
-#: src/multitrack.c:20923
+#: src/multitrack.c:21287
 #, c-format
 msgid ""
 "\n"
@@ -10205,31 +10211,31 @@
 "\n"
 "Nedá sa načítať súbor s rozložením %s\n"
 
-#: src/multitrack.c:20944
+#: src/multitrack.c:21308
 #, c-format
 msgid "Loading layout from %s..."
 msgstr "Načítavam rozloženie z %s..."
 
-#: src/multitrack.c:20978
+#: src/multitrack.c:21338
 #, c-format
 msgid "Got %d events...processing..."
 msgstr "%d udalostí...spracovávam..."
 
-#: src/multitrack.c:20991
+#: src/multitrack.c:21349
 msgid "Checking and rebuilding event list"
 msgstr "Kontrolujem a opäť vytváram zoznam udalostí"
 
-#: src/multitrack.c:21017
+#: src/multitrack.c:21374
 #, c-format
 msgid "%d errors detected.\n"
 msgstr "%d nájdených chýb.\n"
 
-#: src/multitrack.c:21068
+#: src/multitrack.c:21422
 #, c-format
 msgid "Multitrack fps set to %.3f\n"
 msgstr "Multitrack fps nastavené na %.3f\n"
 
-#: src/multitrack.c:21225
+#: src/multitrack.c:21576
 #, fuzzy
 msgid ""
 "The current layout has changes which have not been saved.\n"
@@ -10238,59 +10244,59 @@
 "Súčasné rozloženie nebolo uložené.\n"
 "Čo chcete urobiť ?\n"
 
-#: src/multitrack.c:22047
+#: src/multitrack.c:22385
 msgid "LiVES: Multitrack audio mixer"
 msgstr "LiVES: Multitrack mixovanie zvuku"
 
-#: src/multitrack.c:22077
+#: src/multitrack.c:22414
 msgid "_Reset values"
 msgstr "_Vynulovať hodnoty"
 
-#: src/multitrack.c:22081
+#: src/multitrack.c:22418
 msgid "_Close mixer"
 msgstr "_Zatvoriť mixér"
 
-#: src/multitrack.c:22130
+#: src/multitrack.c:22466
 msgid ""
 "_Invert backing audio\n"
 "and layer volumes"
 msgstr ""
 
-#: src/multitrack.c:22132
+#: src/multitrack.c:22468
 msgid "Adjust backing and layer audio values so that they sum to 1.0"
 msgstr ""
 
-#: src/multitrack.c:22175
+#: src/multitrack.c:22510
 msgid "_Gang layer audio"
 msgstr "_Usporiadanie vrstvy zvuku"
 
-#: src/multitrack.c:22177
+#: src/multitrack.c:22512
 msgid "Adjust all layer audio values to the same value"
 msgstr "Nastavte všetky hladiny hodnôt zvuku na rovnakú hodnotu"
 
-#: src/jack.c:104
+#: src/jack.c:102
 msgid "JACK server started\n"
 msgstr "JACK server spustený\n"
 
-#: src/jack.c:1284 src/jack.c:1353
+#: src/jack.c:1265 src/jack.c:1334
 msgid "Unable to connect to JACK server\n"
 msgstr "Nepodarilo sa pripojiť na JACK server\n"
 
-#: src/jack.c:1512
+#: src/jack.c:1491
 msgid "Started jack audio subsystem.\n"
 msgstr "Spustený podsystém jack audio.\n"
 
-#: src/jack.c:1623
+#: src/jack.c:1600
 msgid "Started jack audio reader.\n"
 msgstr "Spustená čítačka jack audio.\n"
 
-#: src/jack.c:1838
+#: src/jack.c:1815
 msgid ""
 "\n"
 "Connection to jack audio was reset.\n"
 msgstr ""
 
-#: src/pulse.c:87
+#: src/pulse.c:88
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -10298,7 +10304,7 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:92
+#: src/pulse.c:94
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -10306,7 +10312,7 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:96
+#: src/pulse.c:99
 #, fuzzy
 msgid ""
 "\n"
@@ -10318,129 +10324,129 @@
 "\"jack\" alebo \"pulse audio\" prehrávačom.\n"
 "Môžete to nastaviť v Nástroje|Predvoľby|Prehrávanie."
 
-#: src/pulse.c:101
+#: src/pulse.c:104
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
 msgstr ""
 
-#: src/pulse.c:107
+#: src/pulse.c:109
 msgid "LiVES will exit and you can choose another audio player.\n"
 msgstr ""
 
-#: src/pulse.c:1352
+#: src/pulse.c:1335
 msgid ""
 "\n"
 "Connection to pulse audio was reset.\n"
 msgstr ""
 
-#: src/colourspace.c:1100
+#: src/colourspace.c:1092
 msgid "unclamped"
 msgstr "nevnorený"
 
-#: src/colourspace.c:1101
+#: src/colourspace.c:1093
 msgid "clamped"
 msgstr "vnorený"
 
-#: src/omc-learn.c:195
+#: src/omc-learn.c:191
 #, c-format
 msgid "Responding to joystick events from %s\n"
 msgstr "Reakcia na udalosti joysticku z %s\n"
 
-#: src/omc-learn.c:289
+#: src/omc-learn.c:279
 msgid "Creating ALSA seq port..."
 msgstr ""
 
-#: src/omc-learn.c:325
+#: src/omc-learn.c:313
 #, c-format
 msgid "Responding to MIDI events from %s\n"
 msgstr "Reakcia na MIDI udalosti z %s\n"
 
-#: src/omc-learn.c:568
+#: src/omc-learn.c:554
 msgid "data"
 msgstr "údaje"
 
-#: src/omc-learn.c:571
+#: src/omc-learn.c:557
 msgid "velocity"
 msgstr "frekvencia"
 
-#: src/omc-learn.c:572
+#: src/omc-learn.c:558
 msgid "note"
 msgstr "poznámka"
 
-#: src/omc-learn.c:574 src/omc-learn.c:736 src/omc-learn.c:1105
-#: src/omc-learn.c:1591 src/omc-learn.c:1640
+#: src/omc-learn.c:560 src/omc-learn.c:724 src/omc-learn.c:1092
+#: src/omc-learn.c:1581 src/omc-learn.c:1630
 msgid "value"
 msgstr "hodnota"
 
-#: src/omc-learn.c:576
+#: src/omc-learn.c:562
 msgid "state"
 msgstr "stav"
 
-#: src/omc-learn.c:688
+#: src/omc-learn.c:674
 msgid "variable"
 msgstr "premenná"
 
-#: src/omc-learn.c:1001
+#: src/omc-learn.c:989
 msgid "Vars."
 msgstr ""
 
-#: src/omc-learn.c:1054
+#: src/omc-learn.c:1041
 #, c-format
 msgid "MIDI ch %d note on"
 msgstr "MIDI ch %d poznámka zapnutá"
 
-#: src/omc-learn.c:1058
+#: src/omc-learn.c:1045
 #, c-format
 msgid "MIDI ch %d note off"
 msgstr "MIDI ch %d poznámka vypnutá"
 
-#: src/omc-learn.c:1062
+#: src/omc-learn.c:1049
 #, c-format
 msgid "MIDI ch %d controller %d"
 msgstr "MIDI ch %d radič %d"
 
-#: src/omc-learn.c:1066
+#: src/omc-learn.c:1053
 #, c-format
 msgid "MIDI ch %d pitch bend"
 msgstr "MIDI ch %d rozstup ohybu"
 
-#: src/omc-learn.c:1070
+#: src/omc-learn.c:1057
 #, c-format
 msgid "MIDI ch %d pgm change"
 msgstr "Zmena MIDI ch %d pgm"
 
-#: src/omc-learn.c:1073
+#: src/omc-learn.c:1060
 #, c-format
 msgid "Joystick button %d"
 msgstr "Tlačítko joysticku %d"
 
-#: src/omc-learn.c:1076
+#: src/omc-learn.c:1063
 #, c-format
 msgid "Joystick axis %d"
 msgstr "Joystick osa %d"
 
-#: src/omc-learn.c:1113
+#: src/omc-learn.c:1100
 msgid "x"
 msgstr "x"
 
-#: src/omc-learn.c:1122
+#: src/omc-learn.c:1109
 msgid "range"
 msgstr "rozsah"
 
-#: src/omc-learn.c:1143
+#: src/omc-learn.c:1130
 msgid "+ offset1"
 msgstr "+ odchylka1"
 
-#: src/omc-learn.c:1161
+#: src/omc-learn.c:1150
 msgid "* scale"
 msgstr "* stupnica"
 
-#: src/omc-learn.c:1179
+#: src/omc-learn.c:1170
 msgid "+ offset2"
 msgstr "+ odchylka2"
 
-#: src/omc-learn.c:1280
+#: src/omc-learn.c:1270
 msgid ""
 "\n"
 "Click OK to delete all entries\n"
@@ -10448,207 +10454,207 @@
 "\n"
 "Kliknite na OK pre odstránenie všetkých vstupov\n"
 
-#: src/omc-learn.c:1318
+#: src/omc-learn.c:1308
 msgid "LiVES: OMC learner"
 msgstr ""
 
-#: src/omc-learn.c:1334
+#: src/omc-learn.c:1324
 msgid "Clear _unmatched"
 msgstr ""
 
-#: src/omc-learn.c:1345
+#: src/omc-learn.c:1335
 msgid "_Delete all"
 msgstr "_Odstrániť všetko"
 
-#: src/omc-learn.c:1411
+#: src/omc-learn.c:1401
 msgid "Start video playback"
 msgstr "Spustiť prehrávanie videa"
 
-#: src/omc-learn.c:1414
+#: src/omc-learn.c:1404
 msgid "Stop video playback"
 msgstr "Zastaviť prehrávanie videa"
 
-#: src/omc-learn.c:1418
+#: src/omc-learn.c:1408
 msgid "Clip select <clipnum>"
 msgstr "Výber klipu <clipnum>"
 
-#: src/omc-learn.c:1419
+#: src/omc-learn.c:1409
 msgid "Switch foreground clip to the nth valid clip"
 msgstr ""
 
-#: src/omc-learn.c:1423
+#: src/omc-learn.c:1413
 msgid "Play forwards"
 msgstr "Prehrať dopredu"
 
-#: src/omc-learn.c:1424
+#: src/omc-learn.c:1414
 msgid "Play video in a forwards direction"
 msgstr "Prehrávanie videa v smere dopredu"
 
-#: src/omc-learn.c:1427
+#: src/omc-learn.c:1417
 msgid "Play backwards"
 msgstr "Prehrať opačne"
 
-#: src/omc-learn.c:1428
+#: src/omc-learn.c:1418
 msgid "Play video in a backwards direction"
 msgstr "Prehrávanie videa v opačnom smere"
 
-#: src/omc-learn.c:1431
+#: src/omc-learn.c:1421
 msgid "Reverse playback direction"
 msgstr "Reverzné prehrávanie"
 
-#: src/omc-learn.c:1432
+#: src/omc-learn.c:1422
 msgid "Reverse direction of video playback"
 msgstr "Reverzné prehrávanie videa"
 
-#: src/omc-learn.c:1435
+#: src/omc-learn.c:1425
 msgid "Play video faster"
 msgstr "Prehrať video rýchlejšie"
 
-#: src/omc-learn.c:1436
+#: src/omc-learn.c:1426
 msgid "Play video at a slightly faster rate"
 msgstr "Prehrať video nepatrne rýchlejšie"
 
-#: src/omc-learn.c:1439
+#: src/omc-learn.c:1429
 msgid "Play video slower"
 msgstr "Prehrať video pomalšie"
 
-#: src/omc-learn.c:1440
+#: src/omc-learn.c:1430
 msgid "Play video at a slightly slower rate"
 msgstr "Prehrať video nepatrne pomalšie"
 
-#: src/omc-learn.c:1443
+#: src/omc-learn.c:1433
 msgid "Toggle video freeze"
 msgstr "Prepnúť zmrznutie videa"
 
-#: src/omc-learn.c:1444
+#: src/omc-learn.c:1434
 msgid "Freeze video, or if already frozen, unfreeze it"
 msgstr "Zamrznutie videa, alebo ak už zamrzlo, uvoľniť ho"
 
-#: src/omc-learn.c:1447
+#: src/omc-learn.c:1437
 msgid "Set video framerate to <fps>"
 msgstr "Nastaviť pomer videa na <fps>"
 
-#: src/omc-learn.c:1448
+#: src/omc-learn.c:1438
 msgid "Set framerate of foreground clip to <float fps>"
 msgstr "Nastaviť pomer výstupu klipu k <float fps>"
 
-#: src/omc-learn.c:1452
+#: src/omc-learn.c:1442
 msgid "Start recording"
 msgstr "Štart nahrávania"
 
-#: src/omc-learn.c:1455
+#: src/omc-learn.c:1445
 msgid "Stop recording"
 msgstr "Zastaviť nahrávanie"
 
-#: src/omc-learn.c:1458
+#: src/omc-learn.c:1448
 msgid "Toggle recording state"
 msgstr "Prepnúť zaznamenávanie stavu"
 
-#: src/omc-learn.c:1461
+#: src/omc-learn.c:1451
 msgid "Swap foreground and background clips"
 msgstr "Prehodiť popredie a pozadie klipu"
 
-#: src/omc-learn.c:1463
+#: src/omc-learn.c:1453
 msgid "Reset effect keys"
 msgstr "Vynulovať klávesy efektov"
 
-#: src/omc-learn.c:1464
+#: src/omc-learn.c:1454
 msgid "Switch all effects off."
 msgstr "Vypnúť všetky efekty."
 
-#: src/omc-learn.c:1467
+#: src/omc-learn.c:1457
 msgid "Enable effect key <key>"
 msgstr "Povoliť klávesu efektu <key>"
 
-#: src/omc-learn.c:1471
+#: src/omc-learn.c:1461
 msgid "Disable effect key <key>"
 msgstr "Zakázať klávesu efektu <key>"
 
-#: src/omc-learn.c:1475
+#: src/omc-learn.c:1465
 msgid "Toggle effect key <key>"
 msgstr "Prepnúť klávesu efektu <key>"
 
-#: src/omc-learn.c:1479
+#: src/omc-learn.c:1469
 msgid "Set parameter value <key> <pnum> = <value>"
 msgstr "Nastaviť parameter hodnoty <key> <pnum> = <value>"
 
-#: src/omc-learn.c:1480
+#: src/omc-learn.c:1470
 msgid "Set <value> of pth (numerical) parameter for effect key <key>."
 msgstr "Nastaviť <value> z pth (číselný) parameter pre klávesu efektu <key>."
 
-#: src/omc-learn.c:1484
+#: src/omc-learn.c:1474
 msgid "Switch foreground to next clip"
 msgstr "Prepnúť popredie na ďaľší klip"
 
-#: src/omc-learn.c:1487
+#: src/omc-learn.c:1477
 msgid "Switch foreground to previous clip"
 msgstr "Prepnúť popredie na predchádzajúci klip"
 
-#: src/omc-learn.c:1490
+#: src/omc-learn.c:1480
 msgid "Set video framerate to ratio <fps_ratio>"
 msgstr ""
 
-#: src/omc-learn.c:1491
+#: src/omc-learn.c:1481
 msgid "Set framerate ratio of foreground clip to <float fps_ratio>"
 msgstr ""
 
-#: src/omc-learn.c:1495
+#: src/omc-learn.c:1485
 msgid "Retrigger clip <clipnum>"
 msgstr ""
 
-#: src/omc-learn.c:1496
+#: src/omc-learn.c:1486
 msgid ""
 "Switch foreground clip to the nth valid clip, and reset the frame number"
 msgstr ""
 
-#: src/omc-learn.c:1500
+#: src/omc-learn.c:1490
 msgid "Cycle to next mode for effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1504
+#: src/omc-learn.c:1494
 msgid "Cycle to previous mode for effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1508
+#: src/omc-learn.c:1498
 msgid "Set playback plugin parameter value <pnum> = <value>"
 msgstr ""
 
-#: src/omc-learn.c:1509
+#: src/omc-learn.c:1499
 msgid "Set <value> of pth parameter for the playback plugin."
 msgstr ""
 
 #. TRANSLATORS: short form of "clip number"
-#: src/omc-learn.c:1536 src/omc-learn.c:1607
+#: src/omc-learn.c:1526 src/omc-learn.c:1597
 msgid "clipnum"
 msgstr ""
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1545
+#: src/omc-learn.c:1535
 msgid "fps"
 msgstr "fps"
 
 #. TRANSLATORS: as in keyboard key
-#: src/omc-learn.c:1553 src/omc-learn.c:1560 src/omc-learn.c:1567
-#: src/omc-learn.c:1575 src/omc-learn.c:1615 src/omc-learn.c:1623
+#: src/omc-learn.c:1543 src/omc-learn.c:1550 src/omc-learn.c:1557
+#: src/omc-learn.c:1565 src/omc-learn.c:1605 src/omc-learn.c:1613
 msgid "key"
 msgstr "klávesa"
 
 #. TRANSLATORS: short form of "parameter number"
-#: src/omc-learn.c:1583 src/omc-learn.c:1632
+#: src/omc-learn.c:1573 src/omc-learn.c:1622
 msgid "pnum"
 msgstr ""
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1599
+#: src/omc-learn.c:1589
 msgid "fps_ratio"
 msgstr "fps_pomer"
 
-#: src/omc-learn.c:2443
+#: src/omc-learn.c:2417
 #, c-format
 msgid "Saving device mapping to file %s..."
 msgstr "Ukladanie zariadenia pre mapovanie do súboru %s..."
 
-#: src/omc-learn.c:2527
+#: src/omc-learn.c:2498
 #, c-format
 msgid ""
 "\n"
@@ -10661,7 +10667,7 @@
 "Chyba pri analýze súboru \n"
 "%s\n"
 
-#: src/omc-learn.c:2534
+#: src/omc-learn.c:2505
 #, c-format
 msgid ""
 "\n"
@@ -10674,12 +10680,12 @@
 "Chybná verzia v súbore\n"
 "%s\n"
 
-#: src/omc-learn.c:2571
+#: src/omc-learn.c:2541
 #, c-format
 msgid "Loading device mapping from file %s..."
 msgstr "Načítavam zariadenie pre mapovanie zo súboru %s..."
 
-#: src/omc-learn.c:2576
+#: src/omc-learn.c:2544
 #, c-format
 msgid ""
 "\n"
@@ -10694,12 +10700,12 @@
 "%s\n"
 "Kód chyby %d\n"
 
-#: src/videodev.c:547
+#: src/videodev.c:539
 #, c-format
 msgid "Unable to open device %s\n"
 msgstr ""
 
-#: src/videodev.c:564
+#: src/videodev.c:554
 #, c-format
 msgid "Opened device %s\n"
 msgstr ""
@@ -11646,6 +11652,15 @@
 #~ msgid "$error"
 #~ msgstr "$chyba"
 
+#~ msgid "Pause"
+#~ msgstr "Pauza"
+
+#~ msgid "Start frame"
+#~ msgstr "Prvý snímok"
+
+#~ msgid "End frame"
+#~ msgstr "Posledný snímok"
+
 #, fuzzy
 #~ msgid "_Open"
 #~ msgstr "_Otvoriť..."

LiVES-2.2.8.tar.bz2/po/te.po -> LiVES-2.4.1.tar.bz2/po/te.po Changed

LiVES-2.2.8.tar.bz2/po/tr.po -> LiVES-2.4.1.tar.bz2/po/tr.po Changed

@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n"
-"POT-Creation-Date: 2015-02-08 17:18-0300\n"
+"POT-Creation-Date: 2015-08-09 14:52-0300\n"
 "PO-Revision-Date: 2013-03-14 12:31+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Turkish <tr@li.org>\n"
@@ -18,8 +18,7 @@
 "X-Launchpad-Export-Date: 2013-03-28 10:57+0000\n"
 "X-Generator: Launchpad (build 16546)\n"
 
-#. TRANSLATORS: do not translate this message
-#: src/main.c:118
+#: src/main.c:128
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -28,22 +27,22 @@
 "http://lives.sourceforge.net/TRANS-README.txt"
 msgstr ""
 
-#: src/main.c:134
+#: src/main.c:153
 #, c-format
 msgid "%s Warning: %s\n"
 msgstr ""
 
-#: src/main.c:138
+#: src/main.c:157
 #, c-format
 msgid "%s Critical error: %s\n"
 msgstr ""
 
-#: src/main.c:139
+#: src/main.c:158
 #, c-format
 msgid "%s Fatal error: %s\n"
 msgstr ""
 
-#: src/main.c:176
+#: src/main.c:198
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -58,7 +57,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:177
+#: src/main.c:199
 msgid ""
 "\n"
 "\n"
@@ -70,7 +69,7 @@
 "Lütfen hata raporuna İşletim sistemi, dağıtım ve LiVES sürüm bilgilerini "
 "ekleyiniz ("
 
-#: src/main.c:180
+#: src/main.c:203
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -78,7 +77,7 @@
 "ve daha fazla bilgi aşağıda gösterilmiştir:\n"
 "\n"
 
-#: src/main.c:184
+#: src/main.c:206
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
@@ -88,84 +87,84 @@
 "birlikte çalıştırın.\n"
 "\n"
 
-#: src/main.c:192
+#: src/main.c:216
 msgid "Preserving set.\n"
 msgstr "Koruma ayarları.\n"
 
-#: src/main.c:636
+#: src/main.c:691
 msgid "Resizing"
 msgstr "Yeniden boyutlandırma"
 
-#: src/main.c:643
+#: src/main.c:698
 msgid "_Resize All Frames"
 msgstr "Tüm çerçeveleri yeniden boyutlandır"
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:895
+#: src/main.c:948
 msgid "Any"
 msgstr "Herhangi"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:897
+#: src/main.c:950
 msgid "None"
 msgstr "Boş"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:899
+#: src/main.c:952
 msgid "recommended"
 msgstr "tavsiye"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:901
+#: src/main.c:954
 msgid "disabled !"
 msgstr "Engelli!"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:903
+#: src/main.c:956
 msgid "**The current layout**"
 msgstr "**Mevcut yerleşim düzeni**"
 
 #. TRANSLATORS: adjective for "Built in" type effects
-#: src/main.c:905
+#: src/main.c:958
 msgid "Builtin"
 msgstr "Yapısal"
 
 #. TRANSLATORS: adjective for "Custom" type effects
-#: src/main.c:907
+#: src/main.c:960
 msgid "Custom"
 msgstr "Özel"
 
 #. TRANSLATORS: adjective for "Test" type effects
-#: src/main.c:909
+#: src/main.c:962
 msgid "Test"
 msgstr "Sınama"
 
-#: src/main.c:1054
+#: src/main.c:1107
 msgid "Foreground"
 msgstr ""
 
-#: src/main.c:1055
+#: src/main.c:1108
 #, fuzzy
 msgid "Background"
 msgstr "_Boş arkaplan"
 
-#: src/main.c:1566
+#: src/main.c:1624
 msgid "Loading realtime effect plugins..."
 msgstr "Gerçek zaman efekt eklentileri yükleniyor"
 
-#: src/main.c:1631
+#: src/main.c:1690
 msgid "Starting jack audio server..."
 msgstr "Jack audio sunucusu başlıyor..."
 
-#: src/main.c:1633
+#: src/main.c:1692
 msgid "Starting jack transport server..."
 msgstr "Jack taşıma sunucusu başlıyor"
 
-#: src/main.c:1634
+#: src/main.c:1693
 msgid "Connecting to jack transport server..."
 msgstr "Jack taşıma sunucusuna bağlanılıyor"
 
-#: src/main.c:1663
+#: src/main.c:1723
 #, c-format
 msgid ""
 "\n"
@@ -177,114 +176,114 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1697
+#: src/main.c:1758
 msgid "Starting pulse audio server..."
 msgstr "Pulse audio sunucusu başlıyor"
 
-#: src/main.c:1765
+#: src/main.c:1825
 msgid "Checking optional dependencies:"
 msgstr "Isteğe bağlı bağımlılıkları denetleme:"
 
-#: src/main.c:1766
+#: src/main.c:1826
 msgid "mplayer...detected..."
 msgstr "mplayer ... bulundu ..."
 
-#: src/main.c:1767
+#: src/main.c:1827
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer ... BULUNAMADI ..."
 
-#: src/main.c:1768
+#: src/main.c:1828
 #, fuzzy
 msgid "mplayer2...detected..."
 msgstr "mplayer ... bulundu ..."
 
-#: src/main.c:1769
+#: src/main.c:1829
 #, fuzzy
 msgid "mplayer2...NOT DETECTED..."
 msgstr "mplayer ... BULUNAMADI ..."
 
-#: src/main.c:1770
+#: src/main.c:1830
 msgid "convert...detected..."
 msgstr "convert...bulundu..."
 
-#: src/main.c:1771
+#: src/main.c:1831
 msgid "convert...NOT DETECTED..."
 msgstr "convert...BULUNAMADI..."
 
-#: src/main.c:1772
+#: src/main.c:1832
 msgid "composite...detected..."
 msgstr "composite ... bulundu ..."
 
-#: src/main.c:1773
+#: src/main.c:1833
 msgid "composite...NOT DETECTED..."
 msgstr "composite ... BULUNAMADI ..."
 
-#: src/main.c:1774
+#: src/main.c:1834
 msgid "sox...detected\n"
 msgstr "sox...bulundu\n"
 
-#: src/main.c:1775
+#: src/main.c:1835
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...BULUNAMADI\n"
 
-#: src/main.c:1776
+#: src/main.c:1836
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...bulundu..."
 
-#: src/main.c:1777
+#: src/main.c:1837
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...BULUNAMADI..."
 
-#: src/main.c:1778
+#: src/main.c:1838
 msgid "jackd...detected..."
 msgstr "jackd...bulundu..."
 
-#: src/main.c:1779
+#: src/main.c:1839
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...BULUNAMADI..."
 
-#: src/main.c:1780
+#: src/main.c:1840
 msgid "pulse audio...detected..."
 msgstr "Pulse audio... algılandı..."
 
-#: src/main.c:1781
+#: src/main.c:1841
 msgid "pulse audio...NOT DETECTED..."
 msgstr "Pulse audio...ALGILANMADI..."
 
-#: src/main.c:1782
+#: src/main.c:1842
 msgid "python...detected..."
 msgstr "python...bulundu..."
 
-#: src/main.c:1783
+#: src/main.c:1843
 msgid "python...NOT DETECTED..."
 msgstr "python...BULUNAMADI..."
 
-#: src/main.c:1784
+#: src/main.c:1844
 msgid "dvgrab...detected..."
 msgstr "dvgrab...bulundu..."
 
-#: src/main.c:1785
+#: src/main.c:1845
 msgid "dvgrab...NOT DETECTED..."
 msgstr "dvgrab...BULUNAMADI..."
 
-#: src/main.c:1786
+#: src/main.c:1846
 msgid "xwininfo...detected..."
 msgstr "xwininfo...bulundu..."
 
-#: src/main.c:1787
+#: src/main.c:1847
 msgid "xwininfo...NOT DETECTED..."
 msgstr "xwininfo...BULUNAMADI..."
 
-#: src/main.c:1793
+#: src/main.c:1853
 #, c-format
 msgid "Windows version %04X"
 msgstr ""
 
-#: src/main.c:1795
+#: src/main.c:1855
 msgid "UNKNOWN - please patch me !"
 msgstr ""
 
-#: src/main.c:1799
+#: src/main.c:1859
 #, c-format
 msgid ""
 "\n"
@@ -295,48 +294,48 @@
 "\n"
 "Pencere yöneticisi raporları olarak \"%s\"; "
 
-#: src/main.c:1802
+#: src/main.c:1862
 #, c-format
 msgid "number of monitors detected: %d\n"
 msgstr "bulunan monitor sayısı : %d\n"
 
-#: src/main.c:1805
+#: src/main.c:1865
 #, c-format
 msgid "Number of CPUs detected: %d "
 msgstr ""
 
-#: src/main.c:1808 src/multitrack.c:4902
+#: src/main.c:1868 src/multitrack.c:5068
 msgid "little endian"
 msgstr ""
 
-#: src/main.c:1809 src/multitrack.c:4901
+#: src/main.c:1869 src/multitrack.c:5067
 msgid "big endian"
 msgstr ""
 
-#: src/main.c:1810
+#: src/main.c:1870
 #, c-format
 msgid "(%d bits, %s)\n"
 msgstr ""
 
-#: src/main.c:1814
+#: src/main.c:1874
 msgid "GUI type is: "
 msgstr ""
 
-#: src/main.c:1818
+#: src/main.c:1878
 #, c-format
 msgid "GTK+ version %d.%d.%d (compiled with %d.%d.%d)"
 msgstr ""
 
-#: src/main.c:1840
+#: src/main.c:1900
 msgid ", with cairo support"
 msgstr ""
 
-#: src/main.c:1847
+#: src/main.c:1907
 #, c-format
 msgid "Temp directory is %s\n"
 msgstr "Geçici dizin:% s\n"
 
-#: src/main.c:1851
+#: src/main.c:1911
 msgid ""
 "WARNING - this version of LiVES was compiled without either\n"
 "jack or pulse audio support.\n"
@@ -346,15 +345,15 @@
 "ses desteği olmadan derlenmiştir.\n"
 "Bir çok ses özelliği kullanılamaz.\n"
 
-#: src/main.c:1854
+#: src/main.c:1914
 msgid "Compiled with jack support, good !\n"
 msgstr "Jack desteği ile derlendi, iyi!\n"
 
-#: src/main.c:1857
+#: src/main.c:1917
 msgid "Compiled with pulse audio support, wonderful !\n"
 msgstr "Pulse audio desteğiyle derlendi, mükemmel!\n"
 
-#: src/main.c:1861
+#: src/main.c:1921
 #, c-format
 msgid ""
 "Welcome to LiVES version %s.\n"
@@ -363,7 +362,7 @@
 "LiVES'a Hoşgeldiniz version %s.\n"
 "\n"
 
-#: src/main.c:2306
+#: src/main.c:2380
 #, c-format
 msgid ""
 "\n"
@@ -372,85 +371,90 @@
 "\n"
 "Başlangıç yazım şekli: % s [opts] [dosyaadı [başlangıç zamanı] [kare]]\n"
 
-#: src/main.c:2307
+#: src/main.c:2381
 msgid "Where: filename is the name of a media file or backup file.\n"
 msgstr ""
 
-#: src/main.c:2308
+#: src/main.c:2382
 msgid "start_time : filename start time in seconds\n"
 msgstr "başlama_zamanı : Saniye cinsinden dosya ismi başlama zamanı\n"
 
-#: src/main.c:2309
+#: src/main.c:2383
 msgid "frames : maximum number of frames to open\n"
 msgstr "Çerçeveler: en çok sayıda çerçeve açmak için\n"
 
-#: src/main.c:2311
+#: src/main.c:2385
 msgid "opts can be:\n"
 msgstr "opts olabilir:\n"
 
-#: src/main.c:2312
+#: src/main.c:2386
 msgid "-help            : show this help text and exit\n"
 msgstr "-help: Bu yardım metnini ve çıkışı gösterir\n"
 
-#: src/main.c:2313
+#: src/main.c:2387
 msgid "-tmpdir <tempdir>: use alternate working directory (e.g /var/ramdisk)\n"
 msgstr ""
 
-#: src/main.c:2314
+#: src/main.c:2388
 msgid "-set <setname>   : autoload clip set setname\n"
 msgstr ""
 
-#: src/main.c:2315
+#: src/main.c:2389
 msgid "-noset           : do not load any set on startup\n"
 msgstr "-noset : Başlangıçta herhangi bir ayar yükleme\n"
 
-#: src/main.c:2316
+#: src/main.c:2390
 msgid "-norecover       : force no-loading of crash recovery\n"
 msgstr "-norecover : çökmesi durumunda zorla yükleme\n"
 
-#: src/main.c:2317
+#: src/main.c:2391
 msgid "-recover         : force loading of crash recovery\n"
 msgstr "-recover : çökmesi durumunda zorla yükle\n"
 
-#: src/main.c:2318
-msgid "-nothreaddialog  : doe nothing - retained for backwards compatibility\n"
+#: src/main.c:2392
+msgid ""
+"-nothreaddialog  : does nothing - retained for backwards compatibility\n"
 msgstr ""
 
-#: src/main.c:2319
+#: src/main.c:2393
 msgid "-nogui           : do not show the gui\n"
 msgstr "-nogui :arayüzü gösterme\n"
 
-#: src/main.c:2320
+#: src/main.c:2394
 msgid "-nosplash        : do not show the splash window\n"
 msgstr ""
 
-#: src/main.c:2321
+#: src/main.c:2395
 msgid "-noplaywin       : do not show the play window\n"
 msgstr ""
 
-#: src/main.c:2322
+#: src/main.c:2396
+msgid "-noninteractive  : disable menu interactivity\n"
+msgstr ""
+
+#: src/main.c:2397
 msgid "-startup-ce      : start in clip editor mode\n"
 msgstr "-startup-ce : Klip düzenleyici kipinde başlat\n"
 
-#: src/main.c:2323
+#: src/main.c:2398
 msgid "-startup-mt      : start in multitrack mode\n"
 msgstr "-startup-mt : çok parçalı kipte başlatmak\n"
 
-#: src/main.c:2324
+#: src/main.c:2399
 msgid ""
 "-fxmodesmax <n>  : allow <n> modes per effect key (minimum is 1, default is "
 "8)\n"
 msgstr ""
 
-#: src/main.c:2326
+#: src/main.c:2401
 msgid "-oscstart <port> : start OSC listener on UDP port <port>\n"
 msgstr ""
 
-#: src/main.c:2327
+#: src/main.c:2402
 msgid "-nooscstart      : do not start OSC listener\n"
 msgstr "-nooscstart : OSC dinleyicisini başlatma\n"
 
-#: src/main.c:2329
+#: src/main.c:2404
 #, fuzzy
 msgid ""
 "-aplayer <ap>    : start with selected audio player. <ap> can be mplayer, "
@@ -459,46 +463,46 @@
 "-aplayer <ap> : Seçili audio oynatıcı ile başlat. <ap> mplayer olabilir."
 
 #. TRANSLATORS: pulse (audio)
-#: src/main.c:2332
+#: src/main.c:2407
 msgid ", pulse"
 msgstr ""
 
-#: src/main.c:2335
+#: src/main.c:2410
 msgid ", sox or jack\n"
 msgstr "sox veya jack\n"
 
-#: src/main.c:2336
+#: src/main.c:2412
 msgid ""
 "-jackopts <opts>    : opts is a bitmap of jack startup options [1 = jack "
 "transport client, 2 = jack transport master, 4 = start jack transport "
 "server, 8 = pause audio when video paused, 16 = start jack audio server] \n"
 msgstr ""
 
-#: src/main.c:2338
+#: src/main.c:2414
 msgid " or sox\n"
 msgstr " veya sox\n"
 
-#: src/main.c:2340
+#: src/main.c:2416
 msgid "-devicemap <mapname>          : autoload devicemap\n"
 msgstr ""
 
-#: src/main.c:2341
+#: src/main.c:2418
 msgid ""
 "-vppdefaults <file>          : load video playback plugin defaults from "
 "<file> (Note: only sets the settings, not the plugin type)\n"
 msgstr ""
 
-#: src/main.c:2342
+#: src/main.c:2419
 msgid "-debug            : try to debug crashes (requires 'gdb' installed)\n"
 msgstr ""
 "-debug            : Çöküş nedeni bulmak için ('gdb' kurulu olması "
 "gereklidir)\n"
 
-#: src/main.c:2373 src/gui.c:1128
+#: src/main.c:2449 src/gui.c:1127
 msgid "Starting GUI..."
 msgstr "Grafiksel kullanıcı arayüzü başlıyor..."
 
-#: src/main.c:2396
+#: src/main.c:2475
 #, c-format
 msgid ""
 "\n"
@@ -509,7 +513,7 @@
 "(Maybe you need to change the value of <prefix_dir> in your %s file)\n"
 msgstr ""
 
-#: src/main.c:2410
+#: src/main.c:2492
 #, c-format
 msgid ""
 "\n"
@@ -517,7 +521,7 @@
 "Please make sure you have write access to %s and try again.\n"
 msgstr ""
 
-#: src/main.c:2415
+#: src/main.c:2498
 msgid ""
 "\n"
 "`smogrify` must be in your path, and be executable\n"
@@ -531,7 +535,7 @@
 "Lütfen LiVES ı çalıştımadan önce paket ile birlikte\n"
 "gelen README dosyasını inceleyin.\n"
 
-#: src/main.c:2421
+#: src/main.c:2504
 #, c-format
 msgid ""
 "\n"
@@ -541,7 +545,7 @@
 "Please check the file permissions for this file and try again.\n"
 msgstr ""
 
-#: src/main.c:2428
+#: src/main.c:2512
 #, c-format
 msgid ""
 "\n"
@@ -552,7 +556,7 @@
 "and try again.\n"
 msgstr ""
 
-#: src/main.c:2438
+#: src/main.c:2522
 #, c-format
 msgid ""
 "Please check the <tempdir> setting in \n"
@@ -560,7 +564,7 @@
 "and try again.\n"
 msgstr ""
 
-#: src/main.c:2445
+#: src/main.c:2528
 #, c-format
 msgid ""
 "\n"
@@ -570,7 +574,7 @@
 "%s"
 msgstr ""
 
-#: src/main.c:2453
+#: src/main.c:2536
 msgid ""
 "\n"
 "An incorrect version of smogrify was found in your path.\n"
@@ -588,7 +592,7 @@
 "\n"
 "Teşekkür ederim.\n"
 
-#: src/main.c:2458
+#: src/main.c:2541
 #, fuzzy
 msgid ""
 "\n"
@@ -599,7 +603,7 @@
 "LiVES  çalışması için 'mplayer' veya 'sox'  gereklidir. Lütfen birini yada "
 "her ikisini yükleyin ve yeniden deneyin.\n"
 
-#: src/main.c:2462
+#: src/main.c:2546
 #, fuzzy
 msgid ""
 "\n"
@@ -610,7 +614,7 @@
 "LiVES  çalışması için 'mplayer' veya 'sox'  gereklidir. Lütfen birini yada "
 "her ikisini yükleyin ve yeniden deneyin.\n"
 
-#: src/main.c:2472
+#: src/main.c:2556
 #, fuzzy
 msgid ""
 "\n"
@@ -621,7 +625,7 @@
 "LiVES 'mplayer' ı bulamadı. Tüm işlevleri kullanabilmek için mplayer "
 "yükleyebilirsiniz.\n"
 
-#: src/main.c:2475
+#: src/main.c:2561
 msgid ""
 "\n"
 "LiVES was unable to locate 'convert'. You should install convert and image-"
@@ -631,7 +635,7 @@
 "LiVES convert'  bulunamadı. Render efektlerini kullanabilmeniz için convert "
 "ve image-magick yüklemeniz gereklidir.\n"
 
-#: src/main.c:2478
+#: src/main.c:2566
 msgid ""
 "\n"
 "LiVES was unable to locate 'composite'. You should install composite and "
@@ -641,7 +645,7 @@
 "LiVES 'composite' bulunamadı. Birleştirme işlevlerini kullanabilmeniz için "
 "composite ve image-magick  yüklemeniz gereklidir.\n"
 
-#: src/main.c:2481
+#: src/main.c:2570
 msgid ""
 "\n"
 "LiVES was unable to locate 'sox'. Some audio features may not work. You "
@@ -651,7 +655,7 @@
 "LiVES 'sox' 'bulamadı. Bazı ses özellikleri çalışmayabilir. 'sox' yüklemeniz "
 "gereklidir.\n"
 
-#: src/main.c:2484
+#: src/main.c:2575
 #, c-format
 msgid ""
 "\n"
@@ -662,59 +666,59 @@
 "You may need to change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/main.c:2611
+#: src/main.c:2707
 #, c-format
 msgid "Autoloading set %s..."
 msgstr "%s ayarı otomatik yükleniyor..."
 
 #. TRANSLATORS: localised name may be used here
-#: src/main.c:2781 src/interface.c:738
+#: src/main.c:2902
 msgid "LiVES"
 msgstr ""
 
-#: src/main.c:2948
+#: src/main.c:3066
 #, c-format
 msgid "Invalid audio player %s\n"
 msgstr "Geçersiz ses çalar % s\n"
 
-#: src/main.c:3077
+#: src/main.c:3214
 #, c-format
 msgid "LiVES-%s: <Untitled%d> %dx%d : %d frames %d bpp %.3f fps"
 msgstr ""
 
-#: src/main.c:3082
+#: src/main.c:3219
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : ??? frames ??? bpp %.3f fps"
 msgstr ""
 
-#: src/main.c:3086
+#: src/main.c:3222
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : %d frames %d bpp %.3f fps"
 msgstr "LiVES-%s: <%s> %dx%d : %d çerçeveler %d bpp %.3f fps"
 
-#: src/main.c:3094
+#: src/main.c:3229
 #, c-format
 msgid "LiVES-%s: <No File>"
 msgstr "LiVES-%s: <Dosya Yok>"
 
 #. TRANSLATORS: rec(ord)
-#: src/main.c:5085
+#: src/main.c:5201
 #, c-format
 msgid "rec %9d/%d"
 msgstr "kayıt %9d/%d"
 
 #. TRANSLATORS: out of memory (rec(ord))
-#: src/main.c:5091
+#: src/main.c:5206
 #, c-format
 msgid "!rec %9d/%d"
 msgstr "!kayıt %9d/%d"
 
-#: src/main.c:5398 src/main.c:5399 src/gui.c:2110 src/gui.c:3220
-#: src/saveplay.c:2336
+#: src/main.c:5500 src/main.c:5501 src/gui.c:2108 src/gui.c:3331
+#: src/saveplay.c:2315
 msgid "Play"
 msgstr "Oynat"
 
-#: src/main.c:6128
+#: src/main.c:6216
 msgid ""
 "LiVES was unable to capture this image\n"
 "\n"
@@ -722,35 +726,35 @@
 "LiVES görüntü yakalanamadı\n"
 "\n"
 
-#: src/main.c:6250
+#: src/main.c:6345
 #, c-format
 msgid "Closed file %s\n"
 msgstr "Dosya kapandı %s\n"
 
-#: src/main.c:6452 src/gui.c:648 src/utils.c:4312 src/utils.c:4344
-#: src/saveplay.c:3550 src/multitrack.c:4510 src/multitrack.c:6268
+#: src/main.c:6542 src/gui.c:647 src/utils.c:4256 src/utils.c:4286
+#: src/saveplay.c:3500 src/multitrack.c:4678 src/multitrack.c:6447
 msgid "_Undo"
 msgstr "_Geri Al"
 
-#: src/main.c:6453 src/gui.c:666 src/utils.c:4313 src/utils.c:4345
-#: src/saveplay.c:3551 src/multitrack.c:4531 src/multitrack.c:6293
+#: src/main.c:6543 src/gui.c:665 src/utils.c:4257 src/utils.c:4287
+#: src/saveplay.c:3501 src/multitrack.c:4698 src/multitrack.c:6472
 msgid "_Redo"
 msgstr "_Yinele"
 
-#: src/main.c:6493 src/interface.c:470 src/gui.c:2326 src/preferences.c:2357
-#: src/resample.c:1516
+#: src/main.c:6583 src/interface.c:457 src/gui.c:2324 src/preferences.c:2391
+#: src/resample.c:1488
 msgid "Video"
 msgstr "Video"
 
-#: src/main.c:6494 src/interface.c:483 src/gui.c:2351
+#: src/main.c:6584 src/interface.c:470 src/gui.c:2348
 msgid "Left Audio"
 msgstr "Sol Ses"
 
-#: src/main.c:6495 src/gui.c:2375
+#: src/main.c:6585 src/gui.c:2371
 msgid "Right Audio"
 msgstr "Sağ ses"
 
-#: src/main.c:6540
+#: src/main.c:6630
 #, fuzzy
 msgid ""
 "\n"
@@ -765,11 +769,11 @@
 "arasında geçiş yapamazsınız.\n"
 "Lütfen Tercihlerden çalma seçeneklerini ayarlayın ve tekrar deneyin.\n"
 
-#: src/main.c:7051 src/plugins.c:1502
+#: src/main.c:7134 src/plugins.c:1468
 msgid "LiVES: - Play Window"
 msgstr "LiVES: - Oynatma Penceresi"
 
-#: src/startup.c:25
+#: src/startup.c:24
 #, c-format
 msgid ""
 "A directory named\n"
@@ -779,7 +783,7 @@
 "(Free space = %s)\n"
 msgstr ""
 
-#: src/startup.c:32
+#: src/startup.c:29
 #, c-format
 msgid ""
 "A directory named\n"
@@ -789,7 +793,7 @@
 "Please select another location.\n"
 msgstr ""
 
-#: src/startup.c:49
+#: src/startup.c:46
 #, c-format
 msgid ""
 "\n"
@@ -800,7 +804,7 @@
 "(Free space = %s)"
 msgstr ""
 
-#: src/startup.c:54
+#: src/startup.c:50
 #, c-format
 msgid ""
 "\n"
@@ -809,11 +813,11 @@
 "Please try again and choose a different location.\n"
 msgstr ""
 
-#: src/startup.c:96
+#: src/startup.c:92
 msgid "Directory name is too long !"
 msgstr "Dizin adı çok uzun !"
 
-#: src/startup.c:223
+#: src/startup.c:216
 msgid ""
 "LiVES FAILED TO START YOUR SELECTED AUDIO PLAYER !\n"
 "\n"
@@ -821,7 +825,7 @@
 "LiVES İÇİN SEÇTİĞİNİZ AUDIO PLAYER BAŞLATILAMADI!\n"
 "\n"
 
-#: src/startup.c:230
+#: src/startup.c:222
 msgid ""
 "Before starting LiVES, you need to choose an audio player.\n"
 "\n"
@@ -831,7 +835,7 @@
 "\n"
 "PULSE AUDIO çoğu kullanıcı için önerilir"
 
-#: src/startup.c:233
+#: src/startup.c:225
 msgid ""
 ", but this version of LiVES was not compiled with pulse audio support.\n"
 "\n"
@@ -839,7 +843,7 @@
 ", ama LiVES ın bu sürümü pulse audio desteği ile derlenmedi.\n"
 "\n"
 
-#: src/startup.c:236
+#: src/startup.c:229
 msgid ""
 ", but you do not have pulse audio installed on your system.\n"
 " You are advised to install pulse audio first before running LiVES.\n"
@@ -849,11 +853,11 @@
 "LiVES çalıştırmadan önce pulse audio yüklemeniz tavsiye edilir.\n"
 "\n"
 
-#: src/startup.c:241
+#: src/startup.c:233
 msgid "JACK audio is recommended for pro users"
 msgstr "JACK ses profesyonel kullanıcılar için önerilir"
 
-#: src/startup.c:244
+#: src/startup.c:236
 msgid ""
 ", but this version of LiVES was not compiled with jack audio support.\n"
 "\n"
@@ -861,7 +865,7 @@
 ", ama LiVES bu sürümü jack ses desteği ile derlenmemiş.\n"
 "\n"
 
-#: src/startup.c:247
+#: src/startup.c:239
 msgid ""
 ", but you do not have jackd installed. You may wish to install jackd first "
 "before running LiVES.\n"
@@ -871,7 +875,7 @@
 "isteyebilirsiniz.\n"
 "\n"
 
-#: src/startup.c:250
+#: src/startup.c:242
 msgid ""
 ", but may prevent LiVES from starting on some systems.\n"
 "If LiVES will not start with jack, you can restart and try with another "
@@ -882,11 +886,11 @@
 "LiVES jack ile başlamaz ise yeniden başka bir ses çalar ile deneyin.\n"
 "\n"
 
-#: src/startup.c:254
+#: src/startup.c:246
 msgid "SOX may be used if neither of the preceding players work, "
 msgstr ""
 
-#: src/startup.c:257
+#: src/startup.c:249
 msgid ""
 "but some audio features will be disabled.\n"
 "\n"
@@ -894,7 +898,7 @@
 "ancak bazı ses özellikleri devre dışı bırakılır.\n"
 "\n"
 
-#: src/startup.c:260
+#: src/startup.c:251
 msgid ""
 "but you do not have sox installed.\n"
 "You are advised to install it before running LiVES.\n"
@@ -904,7 +908,7 @@
 "LiVES çalıştırmadan önce yüklemeniz tavsiye edilir.\n"
 "\n"
 
-#: src/startup.c:264
+#: src/startup.c:255
 #, fuzzy
 msgid ""
 "The MPLAYER/MPLAYER2 audio player is only recommended for testing purposes.\n"
@@ -913,95 +917,95 @@
 "MPlayer ses çalar için sadece test amaçlı önerilmektedir.\n"
 "\n"
 
-#: src/startup.c:281
+#: src/startup.c:271
 msgid "LiVES: - Choose an audio player"
 msgstr "LiVES - ses çalar seçin"
 
-#: src/startup.c:298
+#: src/startup.c:288
 msgid "Use _pulse audio player"
 msgstr "_pulse ses çalıcısı kullan"
 
-#: src/startup.c:320
+#: src/startup.c:310
 msgid "Use _jack audio player"
 msgstr "Ses çalar jack kullanıyor"
 
-#: src/startup.c:340
+#: src/startup.c:330
 msgid "Use _sox audio player"
 msgstr "_sox ses çalıcısı kullan"
 
-#: src/startup.c:361
+#: src/startup.c:351
 msgid "Use _mplayer audio player"
 msgstr "_mplayer ses çalıcısı kullan"
 
-#: src/startup.c:381
+#: src/startup.c:371
 #, fuzzy
 msgid "Use _mplayer2 audio player"
 msgstr "_mplayer ses çalıcısı kullan"
 
-#: src/startup.c:405 src/startup.c:580 src/interface.c:1506
+#: src/startup.c:395 src/startup.c:569 src/interface.c:1398
 msgid "_Next"
 msgstr "_Sonraki"
 
-#: src/startup.c:445
+#: src/startup.c:435
 msgid "Skipped"
 msgstr "Atlandı"
 
-#: src/startup.c:460
+#: src/startup.c:450
 msgid "Passed"
 msgstr "Geçti"
 
-#: src/startup.c:493
+#: src/startup.c:483
 msgid "Failed"
 msgstr "Başarısız"
 
-#: src/startup.c:552
+#: src/startup.c:542
 msgid "LiVES: - Testing Configuration"
 msgstr "LiVES: - Yapılandırma Kontrol Ediliyor"
 
-#: src/startup.c:555
+#: src/startup.c:544
 msgid "LiVES: - Troubleshoot"
 msgstr "LiVES: - Sorun giderme"
 
-#: src/startup.c:568
+#: src/startup.c:557
 msgid "LiVES will now run some basic configuration tests\n"
 msgstr "LiVES temel yapılandırma testi başlatılıyor\n"
 
-#: src/startup.c:603
+#: src/startup.c:591
 msgid "Checking for \"sox\" presence"
 msgstr ""
 
-#: src/startup.c:607
+#: src/startup.c:595
 msgid ""
 "You should install sox to be able to use all the audio features in LiVES"
 msgstr "LiVES tüm ses özellikleri kullanabilmek için sox yüklemek gerekir"
 
-#: src/startup.c:615
+#: src/startup.c:602
 msgid "Checking if sox can convert audio"
 msgstr "sox ile ses dönüştürme kontrol ediliyor"
 
-#: src/startup.c:638
+#: src/startup.c:625
 msgid "Unable to allocate 176400 bytes memory."
 msgstr ""
 
-#: src/startup.c:653
+#: src/startup.c:639
 #, c-format
 msgid "Unable to write to: %s"
 msgstr ""
 
-#: src/startup.c:667 src/startup.c:807
+#: src/startup.c:653 src/startup.c:789
 #, c-format
 msgid "Command failed: %s"
 msgstr ""
 
-#: src/startup.c:689
+#: src/startup.c:675
 msgid "You should install sox_fmt_all or similar"
 msgstr "sox_fmt_all or similar ve benzeri yüklemelisiniz"
 
-#: src/startup.c:717
+#: src/startup.c:703
 msgid "Checking for \"mplayer\" presence"
 msgstr "\"Mplayer\" varlığının kontrol edilmesi"
 
-#: src/startup.c:721
+#: src/startup.c:707
 #, fuzzy
 msgid ""
 "You should install mplayer or mplayer2 to be able to use all the decoding "
@@ -1009,44 +1013,44 @@
 msgstr ""
 "LiVES'ın tüm çözme özelliklerini kullanabilmek için mplayer yüklemelisiniz"
 
-#: src/startup.c:747
+#: src/startup.c:732
 msgid "Checking if mplayer can convert audio"
 msgstr "mplayer ile ses dönüştürme kontrol ediliyor"
 
-#: src/startup.c:768
+#: src/startup.c:751
 #, fuzzy
 msgid "You should install mplayer or mplayer2 with pcm/wav support"
 msgstr "pcm/wav desteği için mplayer yüklemelisiniz"
 
-#: src/startup.c:785
+#: src/startup.c:767
 msgid "Checking if mplayer can decode to png/alpha"
 msgstr ""
 
-#: src/startup.c:828
+#: src/startup.c:810
 msgid "You may wish to upgrade mplayer to a newer version"
 msgstr "Yeni bir sürüme yükseltmek istiyormusunuz"
 
-#: src/startup.c:854
+#: src/startup.c:836
 msgid "Checking if mplayer can decode to jpeg"
 msgstr ""
 
-#: src/startup.c:882
+#: src/startup.c:862
 msgid "You should install mplayer with either png/alpha or jpeg support"
 msgstr "png/alpha veya jpeg desteği için mplayer yüklemelisiniz."
 
-#: src/startup.c:883
+#: src/startup.c:863
 msgid "You may wish to add jpeg output support to mplayer"
 msgstr "jpeg çıkış desteği eklemek için mplayer yükleyebilirsiniz"
 
-#: src/startup.c:892
+#: src/startup.c:872
 msgid "Checking for \"convert\" presence"
 msgstr "\"convert\"  varlığının kontrol edilmesi"
 
-#: src/startup.c:896
+#: src/startup.c:876
 msgid "Install imageMagick to be able to use all of the rendered effects"
 msgstr "Tüm render efektlerini kullanmak için  imageMagick yükleyebilirsiniz"
 
-#: src/startup.c:909
+#: src/startup.c:889
 msgid ""
 "\n"
 "\n"
@@ -1054,7 +1058,7 @@
 "Preferences/Decoding.    \n"
 msgstr ""
 
-#: src/startup.c:915
+#: src/startup.c:894
 msgid ""
 "\n"
 "\n"
@@ -1066,7 +1070,7 @@
 "    İptal tuşuna basıp çıkabilirsiniz ve eksik bileşenleri yükleyebilirsiniz "
 "veya devamı için ileri tuşuna    \n"
 
-#: src/startup.c:949
+#: src/startup.c:928
 msgid ""
 "\n"
 "\n"
@@ -1076,7 +1080,7 @@
 "\n"
 "Son olarak, LiVES için başlatma arayüzü öntanımlı seçebilirsiniz.\n"
 
-#: src/startup.c:950
+#: src/startup.c:929
 msgid ""
 "\n"
 "\n"
@@ -1087,7 +1091,7 @@
 "LiVES iki ana arayüzü bulunmaktadır ve başlangıçta onlar ile "
 "başlayabilirsiniz.\n"
 
-#: src/startup.c:951
+#: src/startup.c:930
 msgid ""
 "\n"
 "\n"
@@ -1097,28 +1101,28 @@
 "\n"
 "Tercihlerden ön tanımlılar her zaman değiştirilebilr.\n"
 
-#: src/startup.c:961
+#: src/startup.c:940
 msgid "LiVES: - Choose the startup interface"
 msgstr "LiVES: - Başlangıç arayüz seçimi"
 
-#: src/startup.c:972
+#: src/startup.c:951
 msgid "Start in _Clip Edit mode"
 msgstr "_Klip düzenleme kipinde başla"
 
-#: src/startup.c:975
+#: src/startup.c:954
 msgid "This is the best choice for simple editing tasks and for VJs\n"
 msgstr ""
 
-#: src/startup.c:981
+#: src/startup.c:960
 msgid "Start in _Multitrack mode"
 msgstr ""
 
-#: src/startup.c:983
+#: src/startup.c:962
 msgid ""
 "This is a better choice for complex editing tasks involving multiple clips.\n"
 msgstr ""
 
-#: src/startup.c:992
+#: src/startup.c:971
 msgid "_Finish"
 msgstr "_Son"
 
@@ -1135,35 +1139,35 @@
 msgid "Apply _Deinterlace"
 msgstr ""
 
-#: src/interface.c:66
+#: src/interface.c:65
 msgid "If this is set, frames will be deinterlaced as they are imported."
 msgstr ""
 
-#: src/interface.c:113 src/callbacks.c:9623 src/callbacks.c:9646
-#: src/callbacks.c:9647 src/gui.c:3223 src/gui.c:3821 src/saveplay.c:2339
-#: src/saveplay.c:3138 src/dialogs.c:1514 src/dialogs.c:1515
-#: src/dialogs.c:1746 src/dialogs.c:1747 src/framedraw.c:238
-#: src/multitrack.c:8031
+#: src/interface.c:106 src/callbacks.c:9542 src/callbacks.c:9564
+#: src/callbacks.c:9565 src/gui.c:3333 src/gui.c:3946 src/saveplay.c:2317
+#: src/saveplay.c:3097 src/dialogs.c:1575 src/dialogs.c:1576
+#: src/dialogs.c:1804 src/dialogs.c:1805 src/framedraw.c:236
+#: src/multitrack.c:8210
 msgid "Preview"
 msgstr "Önizleme"
 
-#: src/interface.c:132
+#: src/interface.c:125
 msgid "Click here to _Preview any selected video, image or audio file"
 msgstr ""
 
-#: src/interface.c:135
+#: src/interface.c:127
 msgid "Click here to _Preview any selected audio file"
 msgstr ""
 
-#: src/interface.c:138
+#: src/interface.c:129
 msgid "Click here to _Preview the video"
 msgstr "video _önizleme için buraya tıklayın"
 
-#: src/interface.c:181 src/dialogs.c:2542
+#: src/interface.c:169 src/dialogs.c:2621
 msgid "LiVES: - Processing..."
 msgstr "LiVES: - İşleniyor..."
 
-#: src/interface.c:217
+#: src/interface.c:205
 msgid ""
 "\n"
 "\n"
@@ -1175,8 +1179,8 @@
 "\n"
 "Lütfen Bekleyin"
 
-#: src/interface.c:222 src/callbacks.c:9373 src/callbacks.c:9420
-#: src/dialogs.c:2570
+#: src/interface.c:210 src/callbacks.c:9283 src/callbacks.c:9332
+#: src/dialogs.c:2649
 msgid ""
 "\n"
 "Please Wait"
@@ -1184,190 +1188,178 @@
 "\n"
 "Lütfen Bekleyin"
 
-#: src/interface.c:242
+#: src/interface.c:230
 msgid "Show Details"
 msgstr ""
 
-#: src/interface.c:254 src/dialogs.c:2584
+#: src/interface.c:242 src/dialogs.c:2663
 msgid "_Enough"
 msgstr "_Yeterli"
 
-#: src/interface.c:255 src/framedraw.c:278
+#: src/interface.c:243 src/framedraw.c:276
 msgid "_Preview"
 msgstr "_Önizleme"
 
-#: src/interface.c:257
+#: src/interface.c:245 src/callbacks.c:9282 src/callbacks.c:9330
 msgid "Paus_e"
 msgstr "Durakla_t"
 
-#: src/interface.c:258 src/callbacks.c:9417
+#: src/interface.c:246 src/callbacks.c:9329
 msgid "Pause/_Enough"
 msgstr "Duraklat/_Yeterli"
 
-#: src/interface.c:285
+#: src/interface.c:273
 msgid "_Cancel"
 msgstr "_İptal"
 
-#: src/interface.c:374
+#: src/interface.c:361
 #, c-format
 msgid "LiVES: - %s"
 msgstr ""
 
-#: src/interface.c:376
+#: src/interface.c:363
 msgid "LiVES: - Multitrack details"
 msgstr ""
 
-#: src/interface.c:407
+#: src/interface.c:394
 msgid "Format"
 msgstr "Biçim"
 
-#: src/interface.c:412
+#: src/interface.c:399
 msgid "Frame size"
 msgstr "Çerçeve boyutu"
 
-#: src/interface.c:417
+#: src/interface.c:404
 msgid "File size"
 msgstr "Dosya boyutu"
 
-#: src/interface.c:418
+#: src/interface.c:405
 msgid "Byte size"
 msgstr "Bayt boyutu"
 
-#: src/interface.c:423 src/interface.c:1891
+#: src/interface.c:410 src/interface.c:1760
 msgid "FPS"
 msgstr "FPS"
 
-#: src/interface.c:428
+#: src/interface.c:415
 msgid "Frames"
 msgstr "Çerçeveler"
 
-#: src/interface.c:429
+#: src/interface.c:416
 msgid "Events"
 msgstr "Eylemler"
 
-#: src/interface.c:434 src/interface.c:500 src/interface.c:542
+#: src/interface.c:421 src/interface.c:486 src/interface.c:528
 msgid "Total time"
 msgstr "Toplam süre"
 
-#: src/interface.c:486 src/resample.c:1488
+#: src/interface.c:472 src/resample.c:1460
 msgid "Audio"
 msgstr "Ses"
 
-#: src/interface.c:511 src/interface.c:553
+#: src/interface.c:497 src/interface.c:539
 msgid "Rate/size"
 msgstr "Oran / boyut"
 
-#: src/interface.c:530
+#: src/interface.c:516
 msgid "Right audio"
 msgstr "Sağ ses"
 
-#: src/interface.c:622
+#: src/interface.c:607
 msgid "LiVES: - Encoding options"
 msgstr "LIVES - Kodlama seçenekleri"
 
-#: src/interface.c:636
+#: src/interface.c:621
 msgid "<------------- (Check the box to re_size as suggested)"
 msgstr ""
 
-#: src/interface.c:637
+#: src/interface.c:622
 msgid "<------------- (Check the box to use the _size recommendation)"
 msgstr ""
 
-#: src/interface.c:662
+#: src/interface.c:646
 msgid "Use _letterboxing to maintain aspect ratio (optional)"
 msgstr ""
 
-#: src/interface.c:663
+#: src/interface.c:647
 msgid ""
 "Draw black rectangles either above or to the sides of the image, to prevent "
 "it from stretching."
 msgstr ""
 
-#: src/interface.c:694
+#: src/interface.c:677
 msgid "Keep _my settings"
 msgstr "Ayarlarımı tut"
 
-#: src/interface.c:695
+#: src/interface.c:678
 msgid "Use _recommended settings"
 msgstr "Tavsiye edilen ayarları kullan"
 
-#: src/interface.c:775 src/dialogs.c:114
-msgid ""
-"Do _not show this warning any more\n"
-"(can be turned back on from Preferences/Warnings)"
-msgstr ""
-"bu ve diğer uyarıları gösterme.\n"
-"(Tercihler / Uyarılar dan tekrar geri dönülebilir)"
-
-#: src/interface.c:787
-msgid "Show _Details"
-msgstr "_Detayları Göster"
-
-#: src/interface.c:881
+#: src/interface.c:769
 msgid "_Close Window"
 msgstr "_Pencereyi Kapat"
 
-#: src/interface.c:883
+#: src/interface.c:771
 msgid "_Save to file"
 msgstr "Dosyaya _kaydet"
 
-#: src/interface.c:928
+#: src/interface.c:816
 msgid "LiVES: - Insert"
 msgstr "LIVES - Ekle"
 
-#: src/interface.c:945
+#: src/interface.c:833
 msgid "_Number of times to insert"
 msgstr ""
 
-#: src/interface.c:954
+#: src/interface.c:842
 msgid "_Insert to fit audio"
 msgstr "Ses uyacak şekilde ekle"
 
-#: src/interface.c:968
+#: src/interface.c:856
 msgid "Insert _before selection"
 msgstr "Seçim _öncesi ekle"
 
-#: src/interface.c:970
+#: src/interface.c:858
 msgid "Insert clipboard before selected frames"
 msgstr ""
 
-#: src/interface.c:986
+#: src/interface.c:875
 msgid "Insert _after selection"
 msgstr "Seçim _sonrası ekle"
 
-#: src/interface.c:988
+#: src/interface.c:877
 msgid "Insert clipboard after selected frames"
 msgstr "Seçildikten sonra çerçeveyi panoya ekle"
 
-#: src/interface.c:999
+#: src/interface.c:888
 msgid "Insert _with sound"
 msgstr "Ses ile ekle"
 
-#: src/interface.c:1012
+#: src/interface.c:901
 msgid "Insert with_out sound"
 msgstr "Ses olmadan ekle"
 
-#: src/interface.c:1093
+#: src/interface.c:985
 msgid "LiVES: - Open Selection"
 msgstr "LiVES - Seçimi aç"
 
-#: src/interface.c:1111
+#: src/interface.c:1004
 msgid "Selection start time (sec)"
 msgstr ""
 
-#: src/interface.c:1117
+#: src/interface.c:1010
 msgid "Number of frames to open"
 msgstr ""
 
-#: src/interface.c:1193
+#: src/interface.c:1088
 msgid "LiVES: - Open Location"
 msgstr "LIVES - Açma Konumu"
 
-#: src/interface.c:1195
+#: src/interface.c:1090
 msgid "LiVES: - Open Youtube Clip"
 msgstr ""
 
-#: src/interface.c:1213
+#: src/interface.c:1109
 msgid ""
 "\n"
 "\n"
@@ -1384,7 +1376,7 @@
 "olun\n"
 "\n"
 
-#: src/interface.c:1216
+#: src/interface.c:1112
 msgid ""
 "\n"
 "\n"
@@ -1393,62 +1385,63 @@
 "\n"
 msgstr ""
 
-#: src/interface.c:1220
+#: src/interface.c:1116
 msgid ""
 "Enter the URL of the clip below.\n"
 "E.g: http://www.youtube.com/watch?v=WCR6f6WzjP8\n"
 "\n"
 msgstr ""
 
-#: src/interface.c:1231
+#: src/interface.c:1127
 msgid "URL : "
 msgstr "URL : "
 
-#: src/interface.c:1231
+#: src/interface.c:1127
 msgid "Youtube URL : "
 msgstr ""
 
-#: src/interface.c:1235
+#: src/interface.c:1131
 msgid "Do not send bandwidth information"
 msgstr "bant genişliği bilgisi gönderme"
 
-#: src/interface.c:1237
+#: src/interface.c:1133
 msgid "Try this setting if you are having problems getting a stream"
 msgstr "Eğer akışta problem yaşıyorsanız bu ayarı deneyin"
 
-#: src/interface.c:1258
+#: src/interface.c:1155
 msgid "Download to _Directory : "
 msgstr ""
 
-#: src/interface.c:1276
+#: src/interface.c:1173
 msgid "Download _File Name : "
 msgstr ""
 
-#: src/interface.c:1281
+#: src/interface.c:1178
 msgid ".webm"
 msgstr ""
 
-#: src/interface.c:1359
+#: src/interface.c:1256
 msgid "LiVES: - Rename Clip"
 msgstr "LiVES: - klip in ismini değiştir"
 
-#: src/interface.c:1362
-msgid "LiVES: - Enter Set Name"
+#: src/interface.c:1258
+#, fuzzy
+msgid "LiVES: - Enter Set Name to Save as"
 msgstr "LiVES: - Ayarlama Adını Girin"
 
-#: src/interface.c:1365
+#: src/interface.c:1260
 msgid "LiVES: - Enter a Set Name to Reload"
 msgstr ""
 
-#: src/interface.c:1368
+#: src/interface.c:1262
 msgid "LiVES: - Choose a Working Directory"
 msgstr "LiVES: - Çalışma Dizini Seçin"
 
-#: src/interface.c:1371
+#: src/interface.c:1264
 msgid "LiVES: - Rename Current Track"
 msgstr ""
 
-#: src/interface.c:1391
+#: src/interface.c:1283
 msgid ""
 "You need to enter a name for the current clip set.\n"
 "This will allow you reload the layout with the same clips later.\n"
@@ -1460,7 +1453,7 @@
 "Lütfen kullanmak istediğiniz adını girin.\n"
 "LiVES çıkmak istediğinizde klibi kaydetmek için hatırlatacaktır\n"
 
-#: src/interface.c:1397
+#: src/interface.c:1289
 msgid ""
 "In order to export this project, you must enter a name for this clip set.\n"
 "This will also be used for the project name.\n"
@@ -1468,7 +1461,7 @@
 "Bu projeyi dışarı çıkarmak için bu klip için isim girmelisiniz.\n"
 "Bu aynı zamanda projenin adı kullanılır.\n"
 
-#: src/interface.c:1404
+#: src/interface.c:1296
 msgid ""
 "Welcome to LiVES !\n"
 "This startup wizard will guide you through the\n"
@@ -1478,200 +1471,200 @@
 "This startup wizard will guide you through the\n"
 "initial install so that you can get the most from this application.\n"
 
-#: src/interface.c:1408
+#: src/interface.c:1300
 msgid ""
 "\n"
 "First of all you need to choose a working directory for LiVES.\n"
 "This should be a directory with plenty of disk space available.\n"
 msgstr ""
 
-#: src/interface.c:1427
+#: src/interface.c:1317
 msgid "New name "
 msgstr "Yeni isim "
 
-#: src/interface.c:1430
+#: src/interface.c:1319
 msgid "Set name "
 msgstr "Ayar ismi "
 
-#: src/interface.c:1550
+#: src/interface.c:1435
 msgid "Use def_aults"
 msgstr "Varsayılanı kullan"
 
-#: src/interface.c:1553 src/interface.c:1840 src/preferences.c:2515
-#: src/preferences.c:2697
+#: src/interface.c:1437 src/interface.c:1709 src/preferences.c:2550
+#: src/preferences.c:2739
 msgid "_Advanced"
 msgstr "_Gelişmiş"
 
-#: src/interface.c:1604
+#: src/interface.c:1487
 msgid "LiVES:- Select input device"
 msgstr ""
 
-#: src/interface.c:1622
+#: src/interface.c:1504
 msgid "Select input device:"
 msgstr ""
 
-#: src/interface.c:1686
+#: src/interface.c:1568
 msgid "LiVES:- Load CD Track"
 msgstr "LiVES:- CD parçası yükle"
 
-#: src/interface.c:1689
+#: src/interface.c:1570
 msgid "LiVES:- Select DVD Title/Chapter"
 msgstr "LIVES: - DVD Başlık / Bölüm seçimi"
 
-#: src/interface.c:1692
+#: src/interface.c:1572
 msgid "LiVES:- Select VCD Title"
 msgstr "LIVES: - VCD Başlığı Seçiniz"
 
-#: src/interface.c:1695
+#: src/interface.c:1574
 msgid "LiVES:- Change Maximum Visible Tracks"
 msgstr "LIVES - Maksimum Görünür Parça Sayısını Değiştir"
 
-#: src/interface.c:1698
+#: src/interface.c:1576
 msgid "LiVES:- Device details"
 msgstr "LiVES:- Aygıt detayları"
 
-#: src/interface.c:1721
+#: src/interface.c:1598
 #, c-format
 msgid "Track to load (from %s)"
 msgstr "Parça yükleme ( %s den)"
 
-#: src/interface.c:1724
+#: src/interface.c:1600
 msgid "DVD Title"
 msgstr "DVD Başlığı"
 
-#: src/interface.c:1727
+#: src/interface.c:1602
 msgid "VCD Title"
 msgstr "VCD Başlığı"
 
-#: src/interface.c:1730
+#: src/interface.c:1604
 msgid "Maximum number of tracks to display"
 msgstr "parça azami sayısını görüntülemek için"
 
-#: src/interface.c:1733
+#: src/interface.c:1606
 msgid "Device:        /dev/video"
 msgstr "Aygıt: /dev/video"
 
-#: src/interface.c:1736
+#: src/interface.c:1608
 msgid "Device:        fw:"
 msgstr "Aygıt:        fw:"
 
-#: src/interface.c:1771
+#: src/interface.c:1641
 msgid "Chapter  "
 msgstr "Bölüm  "
 
-#: src/interface.c:1776
+#: src/interface.c:1645
 msgid "Channel  "
 msgstr "Kanal  "
 
-#: src/interface.c:1791
+#: src/interface.c:1660
 msgid "Audio ID  "
 msgstr "Ses nosu  "
 
-#: src/interface.c:1857
+#: src/interface.c:1726
 msgid "Input number"
 msgstr "Giriş numarası"
 
-#: src/interface.c:1865
+#: src/interface.c:1734
 msgid "Use default width, height and FPS"
 msgstr "Ön tanımlı genişlik, yükseklik ve FPS kullanımı"
 
-#: src/interface.c:1879
+#: src/interface.c:1748
 msgid "Width"
 msgstr "Genişlik"
 
-#: src/interface.c:1885
+#: src/interface.c:1754
 msgid "Height"
 msgstr "Yükseklik"
 
-#: src/interface.c:1899
+#: src/interface.c:1768
 msgid "_Driver"
 msgstr ""
 
-#: src/interface.c:1902
+#: src/interface.c:1771
 msgid "_Output format"
 msgstr ""
 
-#: src/interface.c:1998
+#: src/interface.c:1865
 msgid "LiVES:- Fade Audio In"
 msgstr "LiVES:- Ses girişini zayıflatmak"
 
-#: src/interface.c:2001
+#: src/interface.c:1867
 msgid "LiVES:- Fade Audio Out"
 msgstr "LiVES:- Ses çıkışını zayıflatmak"
 
-#: src/interface.c:2017
+#: src/interface.c:1883
 msgid "Fade in over  "
 msgstr ""
 
-#: src/interface.c:2018
+#: src/interface.c:1884
 msgid "first"
 msgstr "birinci"
 
-#: src/interface.c:2021
+#: src/interface.c:1886
 msgid "Fade out over  "
 msgstr ""
 
-#: src/interface.c:2022
+#: src/interface.c:1887
 msgid "last"
 msgstr "sonuncu"
 
-#: src/interface.c:2044
+#: src/interface.c:1909
 msgid "seconds."
 msgstr "saniye."
 
-#: src/interface.c:2052 src/saveplay.c:1507
+#: src/interface.c:1917 src/saveplay.c:1484
 msgid "selection"
 msgstr "seleksiyon"
 
-#: src/interface.c:2092
+#: src/interface.c:1956
 msgid "LiVES: - File Comments (optional)"
 msgstr "LiVES - Dosya Yorumları (isteğe bağlı)"
 
-#: src/interface.c:2107
+#: src/interface.c:1971
 msgid "Title/Name : "
 msgstr "Başlık / İsim: "
 
-#: src/interface.c:2114
+#: src/interface.c:1978
 msgid "Author/Artist : "
 msgstr "Yazar / Sanatçı: "
 
-#: src/interface.c:2121
+#: src/interface.c:1985
 msgid "Comments : "
 msgstr "Açıklama: "
 
-#: src/interface.c:2151
+#: src/interface.c:2015
 msgid "_Options"
 msgstr "_Seçenekler"
 
-#: src/interface.c:2158
+#: src/interface.c:2022
 msgid "Save _subtitles to file"
 msgstr ""
 
-#: src/interface.c:2170
+#: src/interface.c:2033
 msgid "Subtitle file"
 msgstr ""
 
-#: src/interface.c:2172
+#: src/interface.c:2035
 msgid "Browse..."
 msgstr "Gözat..."
 
-#: src/interface.c:2255
+#: src/interface.c:2132
 msgid "LiVES: - choose a device"
 msgstr ""
 
-#: src/interface.c:2259
+#: src/interface.c:2135
 msgid "LiVES: - choose a directory"
 msgstr ""
 
-#: src/interface.c:2262
+#: src/interface.c:2137
 msgid "LiVES: - choose a file"
 msgstr ""
 
-#: src/interface.c:2445
+#: src/interface.c:2381
 msgid "LiVES: - Cancel/Discard/Save"
 msgstr "LiVES - İptal / Sil / Kaydet"
 
-#: src/interface.c:2460
+#: src/interface.c:2397
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has not been saved.\n"
@@ -1681,7 +1674,7 @@
 "Geçerli yerleşim düzeni kaydedilemedi\n"
 "Ne yapmak istiyorsunuz?\n"
 
-#: src/interface.c:2463
+#: src/interface.c:2400
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has been changed since the last save.\n"
@@ -1691,14 +1684,14 @@
 "Geçerli yerleşim düzeni son kayıttan bu yana değiştirilmiştir.\n"
 "Ne yapmak istiyorsunuz?\n"
 
-#: src/interface.c:2467
+#: src/interface.c:2404
 msgid ""
 "You are about to exit LiVES.\n"
 "The current clip set can be saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:2468
+#: src/interface.c:2405
 msgid ""
 "The current clip set has not been saved.\n"
 "What would you like to do ?\n"
@@ -1706,7 +1699,7 @@
 "Geçerli klip set kaydedilmedi.\n"
 "Ne yapmak istiyorsunuz?\n"
 
-#: src/interface.c:2472
+#: src/interface.c:2408
 msgid ""
 "The current layout has not been saved.\n"
 "What would you like to do ?\n"
@@ -1714,7 +1707,7 @@
 "Mevcut düzen kaydedilmedi.\n"
 "Ne yapmak istiyorsunuz?\n"
 
-#: src/interface.c:2475
+#: src/interface.c:2410
 #, fuzzy
 msgid ""
 "The current layout has *not* been changed since it was last saved.\n"
@@ -1723,109 +1716,109 @@
 "Mevcut yerleşim düzeninde o son kaydedilen bu yana değişlik olmamıştır.\n"
 "Ne yapmak istiyorsunuz?\n"
 
-#: src/interface.c:2480
+#: src/interface.c:2415
 msgid ""
 "The current layout contains generated frames and cannot be retained.\n"
 "You may wish to render it before exiting multitrack mode.\n"
 msgstr ""
 
-#: src/interface.c:2483
+#: src/interface.c:2418
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout contains generated frames and cannot be retained.\n"
 "What do you wish to do ?"
 msgstr ""
 
-#: src/interface.c:2496
+#: src/interface.c:2431
 msgid "Clip set _name"
 msgstr "Klip ayar ismi"
 
-#: src/interface.c:2502
+#: src/interface.c:2437
 msgid "_Auto reload next time"
 msgstr ""
 
-#: src/interface.c:2538 src/interface.c:2547
+#: src/interface.c:2473 src/interface.c:2482
 msgid "_Wipe layout"
 msgstr ""
 
-#: src/interface.c:2539
+#: src/interface.c:2474
 msgid "_Ignore changes"
 msgstr "Değişiklikleri Yoksay"
 
-#: src/interface.c:2540
+#: src/interface.c:2475
 msgid "_Delete clip set"
 msgstr "Klip ayarlarını sil"
 
-#: src/interface.c:2541
+#: src/interface.c:2476
 msgid "_Delete layout"
 msgstr "Düzeni sil"
 
-#: src/interface.c:2545
+#: src/interface.c:2480
 msgid "_Save layout"
 msgstr "Yerleşim Düzenini _Kaydet"
 
-#: src/interface.c:2546
+#: src/interface.c:2481
 msgid "_Save clip set"
 msgstr "Klip ayarlarını kaydet"
 
-#: src/interface.c:2565
+#: src/interface.c:2502
 msgid ""
 "\n"
 "LiVES has detected a multitrack layout from a previous session.\n"
 "Would you like to try and recover it ?\n"
 msgstr ""
 
-#: src/interface.c:2589
+#: src/interface.c:2528
 msgid "LiVES: - Disk Recovery Options"
 msgstr ""
 
-#: src/interface.c:2608
+#: src/interface.c:2549
 msgid "Delete _Orphaned Clips"
 msgstr ""
 
-#: src/interface.c:2609
+#: src/interface.c:2550
 msgid "Delete any clips which are not currently loaded or part of a set"
 msgstr ""
 
-#: src/interface.c:2622
+#: src/interface.c:2564
 msgid "Clear _Backup Files from Closed Clips"
 msgstr ""
 
-#: src/interface.c:2633
+#: src/interface.c:2575
 msgid "Remove Sets which have _Layouts but no Clips"
 msgstr ""
 
-#: src/interface.c:2644
+#: src/interface.c:2586
 msgid "_Reset to Defaults"
 msgstr ""
 
-#: src/interface.c:2651
+#: src/interface.c:2593
 msgid "_Accept"
 msgstr ""
 
-#: src/callbacks.c:198
+#: src/callbacks.c:208
 #, c-format
 msgid "Saving as set %s..."
 msgstr "Ayarlar kaydediliyor %s..."
 
-#: src/callbacks.c:833
+#: src/callbacks.c:852
 msgid "Please enter the name of the file to save the clip as.\n"
 msgstr ""
 
-#: src/callbacks.c:841
+#: src/callbacks.c:860
 msgid "Please enter a valid URL for the download.\n"
 msgstr ""
 
-#: src/callbacks.c:867
+#: src/callbacks.c:886
 #, c-format
 msgid "Downloading %s to %s..."
 msgstr ""
 
-#: src/callbacks.c:895
+#: src/callbacks.c:912
 msgid "Downloading clip"
 msgstr ""
 
-#: src/callbacks.c:933
+#: src/callbacks.c:950
 msgid ""
 "\n"
 "LiVES was unable to download the clip.\n"
@@ -1833,17 +1826,17 @@
 "the latest youtube-dl installed.\n"
 msgstr ""
 
-#: src/callbacks.c:1114 src/callbacks.c:1149
+#: src/callbacks.c:1131 src/callbacks.c:1166
 msgid "This file"
 msgstr "Bu dosya"
 
-#: src/callbacks.c:1115
+#: src/callbacks.c:1132
 msgid ""
 ",\n"
 " - including the current layout - "
 msgstr ""
 
-#: src/callbacks.c:1117
+#: src/callbacks.c:1134
 #, c-format
 msgid ""
 "\n"
@@ -1853,7 +1846,7 @@
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1119
+#: src/callbacks.c:1136
 #, c-format
 msgid ""
 "\n"
@@ -1863,14 +1856,14 @@
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1150
+#: src/callbacks.c:1167
 msgid ""
 "Changes made to this clip have not been saved or backed up.\n"
 "\n"
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1343
+#: src/callbacks.c:1356
 msgid ""
 "\n"
 "Invalid project file.\n"
@@ -1878,7 +1871,7 @@
 "\n"
 "Geçersiz proje dosyası.\n"
 
-#: src/callbacks.c:1356
+#: src/callbacks.c:1370
 #, c-format
 msgid ""
 "\n"
@@ -1891,33 +1884,33 @@
 "Once you have done this, you will be able to import the new project.\n"
 msgstr ""
 
-#: src/callbacks.c:1366
+#: src/callbacks.c:1381
 #, c-format
 msgid "Importing the project %s as set %s..."
 msgstr ""
 
-#: src/callbacks.c:1386
+#: src/callbacks.c:1399
 msgid "Importing project"
 msgstr "Proje içeriye alınıyor"
 
-#: src/callbacks.c:1472
+#: src/callbacks.c:1481
 #, c-format
 msgid "Exporting project %s..."
 msgstr "%s... Proje dışarıya aktarılıyor"
 
-#: src/callbacks.c:1490
+#: src/callbacks.c:1497
 msgid "Exporting project"
 msgstr "Proje dışarıya çıkartılıyor"
 
-#: src/callbacks.c:1506
+#: src/callbacks.c:1513
 msgid "Backup as .lv1 file"
 msgstr ".lv1 dosyası olarak yedekle"
 
-#: src/callbacks.c:1522
+#: src/callbacks.c:1529
 msgid "Restore .lv1 file"
 msgstr ".lv1 dosyası geri yükleniyor"
 
-#: src/callbacks.c:1664
+#: src/callbacks.c:1671
 msgid ""
 "\n"
 "\n"
@@ -1925,72 +1918,77 @@
 "Are you sure ?\n"
 msgstr ""
 
-#: src/callbacks.c:1725
+#: src/callbacks.c:1732
 #, c-format
 msgid "Deleting set %s..."
 msgstr ""
 
-#: src/callbacks.c:1727
+#: src/callbacks.c:1734
 msgid "Deleting set..."
 msgstr "Ayar siliniyor..."
 
-#: src/callbacks.c:1731
+#: src/callbacks.c:1738
 msgid "Deleting set"
 msgstr "Ayarları sil"
 
-#: src/callbacks.c:1739
+#: src/callbacks.c:1746
 #, c-format
 msgid "Set %s was permanently deleted from the disk.\n"
 msgstr ""
 
-#: src/callbacks.c:1787 src/callbacks.c:11764
+#: src/callbacks.c:1792 src/callbacks.c:11676
 msgid "Insert Silence"
 msgstr "Sessiz ekle"
 
-#: src/callbacks.c:1840 src/callbacks.c:1923 src/callbacks.c:2086
+#: src/callbacks.c:1844 src/callbacks.c:1927 src/callbacks.c:2089
 msgid "Undoing"
 msgstr "Geri alınıyor"
 
-#: src/callbacks.c:1936 src/callbacks.c:2147
+#: src/callbacks.c:1940 src/callbacks.c:2150
 msgid "Restoring audio..."
 msgstr ""
 
-#: src/callbacks.c:1952
+#: src/callbacks.c:1956
 msgid "Clearing frame images"
 msgstr "Çerçeve resimleri siliniyor"
 
-#: src/callbacks.c:1985
+#: src/callbacks.c:1988
 msgid "Deleting excess frames"
 msgstr "Fazla çerçeveler siliniyor"
 
-#: src/callbacks.c:2229
+#: src/callbacks.c:2232
 #, c-format
 msgid "Length of video is now %d frames at %.3f frames per second.\n"
 msgstr ""
 
-#: src/callbacks.c:2233 src/resample.c:683 src/resample.c:2166
+#: src/callbacks.c:2235 src/resample.c:678 src/resample.c:2133
 #, c-format
 msgid "Clipboard was resampled to %d frames.\n"
 msgstr ""
 
-#: src/callbacks.c:2394 src/callbacks.c:2423
+#: src/callbacks.c:2396 src/callbacks.c:2425
 msgid "Redoing"
 msgstr "Yineleniyor"
 
-#: src/callbacks.c:2462
-#, c-format
-msgid "Copying frames %d to %d%s to the clipboard..."
-msgstr ""
+#: src/callbacks.c:2472
+#, fuzzy, c-format
+msgid "Copying frames %d to %d (with sound) to the clipboard..."
+msgstr "Çerçeveler%d panodan%s ekleniyor..."
 
-#: src/callbacks.c:2525
+#: src/callbacks.c:2474
+#, fuzzy, c-format
+msgid "Copying frames %d to %d to the clipboard..."
+msgstr "Panoya kopyalanıyor"
+
+#: src/callbacks.c:2526
 msgid "Copying to the clipboard"
 msgstr "Panoya kopyalanıyor"
 
-#: src/callbacks.c:2600
+#: src/callbacks.c:2601
 msgid "Cut"
 msgstr "Kes"
 
-#: src/callbacks.c:2641 src/callbacks.c:3068 src/callbacks.c:8026
+#: src/callbacks.c:2641 src/callbacks.c:3063 src/callbacks.c:7631
 #, fuzzy
 msgid "Pulling frames from clipboard"
 msgstr "Klipten çerçeveler alınıyor"
@@ -2000,22 +1998,22 @@
 msgid "Pasting %d frames to new clip %s..."
 msgstr ""
 
-#: src/callbacks.c:2678
+#: src/callbacks.c:2676
 msgid "Pasting"
 msgstr "Yapıştırılıyor"
 
-#: src/callbacks.c:2694
+#: src/callbacks.c:2692
 msgid "...added audio..."
 msgstr ""
 
-#: src/callbacks.c:2778
+#: src/callbacks.c:2775
 msgid ""
 "This operation requires resizing or converting of frames.\n"
 "Please install 'convert' from the Image-magick package, and then restart "
 "LiVES.\n"
 msgstr ""
 
-#: src/callbacks.c:2795
+#: src/callbacks.c:2793
 msgid ""
 "\n"
 "\n"
@@ -2029,31 +2027,31 @@
 "Try selecting all frames, and then using \n"
 "the 'Trim Audio' function from the Audio menu."
 
-#: src/callbacks.c:2819
+#: src/callbacks.c:2817
 msgid ""
 "LiVES cannot insert because the audio rates do not match.\n"
 "Please install 'sox', and try again."
 msgstr ""
 
-#: src/callbacks.c:2838
+#: src/callbacks.c:2835
 msgid ""
 "\n"
 "Insertion will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:2888 src/callbacks.c:11692
+#: src/callbacks.c:2883 src/callbacks.c:11606
 msgid ""
 "\n"
 "Insertion will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:2996 src/callbacks.c:3025
+#: src/callbacks.c:2987 src/callbacks.c:3016
 msgid "Resampling clipboard audio"
 msgstr ""
 
-#: src/callbacks.c:3041
+#: src/callbacks.c:3032
 msgid ""
 "\n"
 "\n"
@@ -2061,7 +2059,7 @@
 "Clipboard audio has been erased.\n"
 msgstr ""
 
-#: src/callbacks.c:3055
+#: src/callbacks.c:3045
 msgid ""
 "\n"
 "\n"
@@ -2070,30 +2068,30 @@
 "using unchanged audio ?\n"
 msgstr ""
 
-#: src/callbacks.c:3137 src/callbacks.c:3311
+#: src/callbacks.c:3132 src/callbacks.c:3299
 #, c-format
 msgid "Inserting %d%s frames from the clipboard..."
 msgstr ""
 
-#: src/callbacks.c:3162 src/callbacks.c:3236 src/callbacks.c:3339
+#: src/callbacks.c:3155 src/callbacks.c:3224 src/callbacks.c:3325
 msgid "Inserting"
 msgstr "Ekleniyor"
 
-#: src/callbacks.c:3193
+#: src/callbacks.c:3187
 #, c-format
 msgid "Inserting %d times from the clipboard%s..."
 msgstr "Zamanlar%d panodan%s ekleniyor..."
 
-#: src/callbacks.c:3200
+#: src/callbacks.c:3191
 #, c-format
 msgid "Inserting %d frames from the clipboard%s..."
 msgstr "Çerçeveler%d panodan%s ekleniyor..."
 
-#: src/callbacks.c:3418
+#: src/callbacks.c:3404
 msgid "Insert"
 msgstr "Ekle"
 
-#: src/callbacks.c:3486
+#: src/callbacks.c:3471
 msgid ""
 "\n"
 "Deleting all frames will close this file.\n"
@@ -2103,49 +2101,49 @@
 "Bu dosyayı kapatınca tüm çerçeveler silinecek.\n"
 "Emin misiniz ?"
 
-#: src/callbacks.c:3495
+#: src/callbacks.c:3480
 msgid ""
 "\n"
 "Deletion will cause missing frames in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3515 src/callbacks.c:10920 src/callbacks.c:11162
-#: src/callbacks.c:11228
+#: src/callbacks.c:3500 src/callbacks.c:10851 src/callbacks.c:11087
+#: src/callbacks.c:11152
 msgid ""
 "\n"
 "Deletion will cause missing audio in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3534
+#: src/callbacks.c:3519
 msgid ""
 "\n"
 "Deletion will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3553 src/callbacks.c:11210
+#: src/callbacks.c:3538 src/callbacks.c:11134
 msgid ""
 "\n"
 "Deletion will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3611
+#: src/callbacks.c:3597
 #, c-format
 msgid "Deleting frames %d to %d%s..."
 msgstr "Çerçeveler siliniyor %d to %d%s..."
 
-#: src/callbacks.c:3636
+#: src/callbacks.c:3619
 msgid "Deleting"
 msgstr "Siliniyor"
 
-#: src/callbacks.c:3717
+#: src/callbacks.c:3699
 msgid "Delete"
 msgstr "Sil"
 
-#: src/callbacks.c:3738
+#: src/callbacks.c:3717
 msgid ""
 "\n"
 "\n"
@@ -2155,7 +2153,7 @@
 "\n"
 "Seçim kilitlendi.\n"
 
-#: src/callbacks.c:4092
+#: src/callbacks.c:4056
 msgid ""
 "Ready to record. Use 'control' and cursor keys during playback to record "
 "your performance.\n"
@@ -2163,11 +2161,11 @@
 "play.)\n"
 msgstr ""
 
-#: src/callbacks.c:4098
+#: src/callbacks.c:4061
 msgid "Record cancelled.\n"
 msgstr "Kayıt iptal edildi.\n"
 
-#: src/callbacks.c:4237
+#: src/callbacks.c:4197
 #, c-format
 msgid ""
 "\n"
@@ -2180,7 +2178,7 @@
 "'%s' eklenti raporu:\n"
 "%s\n"
 
-#: src/callbacks.c:4241
+#: src/callbacks.c:4200
 #, c-format
 msgid ""
 "\n"
@@ -2189,7 +2187,7 @@
 "The plugin may be broken or not installed correctly."
 msgstr ""
 
-#: src/callbacks.c:4571
+#: src/callbacks.c:4532
 #, c-format
 msgid ""
 "Saving the set will cause copies of all loaded clips to remain on the disk"
@@ -2198,22 +2196,22 @@
 "Please press 'Cancel' if that is not what you want.\n"
 msgstr ""
 
-#: src/callbacks.c:4654
+#: src/callbacks.c:4617
 #, c-format
 msgid "Saving set %s"
 msgstr "Ayarlar kaydediliyor %s"
 
-#: src/callbacks.c:5005
+#: src/callbacks.c:4964
 #, c-format
 msgid "Loading clips from set %s"
 msgstr "Klip ayarlardan yükleniyor %s"
 
-#: src/callbacks.c:5093
+#: src/callbacks.c:5051
 #, c-format
 msgid "%d clips and %d layouts were recovered from set (%s).\n"
 msgstr ""
 
-#: src/callbacks.c:5312
+#: src/callbacks.c:5259
 msgid ""
 "LiVES will attempt to recover some disk space.\n"
 "You should ONLY run this if you have no other copies of LiVES running on "
@@ -2221,24 +2219,24 @@
 "Click OK to proceed.\n"
 msgstr ""
 
-#: src/callbacks.c:5317
+#: src/callbacks.c:5264
 msgid "Cleaning up disk space..."
 msgstr "Disk alanı temizleniyor..."
 
-#: src/callbacks.c:5387
+#: src/callbacks.c:5334
 msgid "Recovering disk space"
 msgstr ""
 
-#: src/callbacks.c:5439
+#: src/callbacks.c:5386
 #, c-format
 msgid "%s of disk space was recovered.\n"
 msgstr ""
 
-#: src/callbacks.c:5482
+#: src/callbacks.c:5428
 msgid "Resetting frame rates and frame values..."
 msgstr "Çerçeve hızları ve çerçeve değerleri sıfırlanıyor..."
 
-#: src/callbacks.c:5523
+#: src/callbacks.c:5469
 #, c-format
 msgid ""
 "\n"
@@ -2246,12 +2244,12 @@
 "Internal: %s (%d bpp) / %s\n"
 msgstr ""
 
-#: src/callbacks.c:5525
+#: src/callbacks.c:5471
 msgid "buffered"
 msgstr "ara belleğe alınmış"
 
-#: src/callbacks.c:5538 src/callbacks.c:5557 src/callbacks.c:5575
-#: src/callbacks.c:5609
+#: src/callbacks.c:5484 src/callbacks.c:5502 src/callbacks.c:5518
+#: src/callbacks.c:5551
 msgid ""
 "\n"
 "  Opening..."
@@ -2259,7 +2257,7 @@
 "\n"
 "  Açılıyor..."
 
-#: src/callbacks.c:5545
+#: src/callbacks.c:5490
 #, c-format
 msgid ""
 "\n"
@@ -2268,7 +2266,7 @@
 "\n"
 "(%d sanal)"
 
-#: src/callbacks.c:5548
+#: src/callbacks.c:5493
 #, c-format
 msgid ""
 "\n"
@@ -2277,7 +2275,7 @@
 "\n"
 "(%d çözümlenmiş)"
 
-#: src/callbacks.c:5560 src/callbacks.c:5578 src/callbacks.c:5612
+#: src/callbacks.c:5504 src/callbacks.c:5520 src/callbacks.c:5553
 #, c-format
 msgid ""
 "\n"
@@ -2286,7 +2284,7 @@
 "\n"
 "  %.2f sn."
 
-#: src/callbacks.c:5569
+#: src/callbacks.c:5512
 msgid ""
 "\n"
 "  Unknown"
@@ -2294,23 +2292,23 @@
 "\n"
 "  Bilinmiyor"
 
-#: src/callbacks.c:5582 src/callbacks.c:5596
+#: src/callbacks.c:5524 src/callbacks.c:5538
 msgid "unsigned"
 msgstr "imzasız"
 
-#: src/callbacks.c:5583 src/callbacks.c:5597
+#: src/callbacks.c:5525 src/callbacks.c:5539
 msgid "signed"
 msgstr "imzalandı"
 
-#: src/callbacks.c:5585 src/callbacks.c:5599
+#: src/callbacks.c:5527 src/callbacks.c:5541
 msgid "big-endian"
 msgstr ""
 
-#: src/callbacks.c:5586 src/callbacks.c:5600
+#: src/callbacks.c:5528 src/callbacks.c:5542
 msgid "little-endian"
 msgstr ""
 
-#: src/callbacks.c:5588 src/callbacks.c:5602
+#: src/callbacks.c:5530 src/callbacks.c:5544
 #, c-format
 msgid ""
 "  %d Hz %d bit\n"
@@ -2319,7 +2317,7 @@
 "  %d Hz %d bit\n"
 "%s %s"
 
-#: src/callbacks.c:5707
+#: src/callbacks.c:5647
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -2336,15 +2334,15 @@
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA.\n"
 msgstr ""
 
-#: src/callbacks.c:5721
+#: src/callbacks.c:5661
 msgid "A video editor and VJ program."
 msgstr "Bir video düzenleyicisi ve VJ programı."
 
-#: src/callbacks.c:5722
+#: src/callbacks.c:5662
 msgid "About LiVES"
 msgstr ""
 
-#: src/callbacks.c:5724
+#: src/callbacks.c:5664
 msgid "translator_credits"
 msgstr ""
 "Launchpad Contributions:\n"
@@ -2356,7 +2354,7 @@
 "  salsaman https://launchpad.net/~salsaman\n"
 "  zeugma https://launchpad.net/~sunder67"
 
-#: src/callbacks.c:5758
+#: src/callbacks.c:5699
 #, c-format
 msgid ""
 "LiVES Version %s\n"
@@ -2370,7 +2368,7 @@
 "Homepage: http://lives.sourceforge.net"
 msgstr ""
 
-#: src/callbacks.c:6037
+#: src/callbacks.c:5996
 #, fuzzy
 msgid ""
 "\n"
@@ -2381,7 +2379,7 @@
 "\n"
 "Dosyayı açmak için mplayer yüklemeniz gerekebilir.\n"
 
-#: src/callbacks.c:6040
+#: src/callbacks.c:5998
 #, fuzzy
 msgid ""
 "\n"
@@ -2393,190 +2391,185 @@
 "\n"
 "Dosyayı açmak için mplayer yüklemeniz gerekebilir.\n"
 
-#: src/callbacks.c:6423 src/callbacks.c:8289
-msgid ""
-"\n"
-"Loading new audio may cause missing audio in some multitrack layouts.\n"
-"Are you sure you wish to continue ?\n"
-"."
-msgstr ""
-
-#: src/callbacks.c:6523
-#, c-format
-msgid "Opening audio %s, type %s..."
-msgstr ""
-
-#: src/callbacks.c:6556 src/saveplay.c:480
-msgid "Opening audio"
-msgstr "Ses açılıyor"
-
-#: src/callbacks.c:6565 src/callbacks.c:6612 src/callbacks.c:8387
-#: src/callbacks.c:8429 src/callbacks.c:8472 src/callbacks.c:10846
-msgid "Cancelling"
-msgstr "İptal ediliyor"
-
-#: src/callbacks.c:6660 src/callbacks.c:8514 src/callbacks.c:10876
-#: src/callbacks.c:11563
-msgid "Committing audio"
-msgstr ""
-
-#: src/callbacks.c:6672 src/callbacks.c:8546
-msgid "New Audio"
-msgstr "Yeni ses"
-
-#: src/callbacks.c:6779
+#: src/callbacks.c:6459
 #, c-format
 msgid ""
 "Text was saved as\n"
 "%s\n"
 msgstr ""
 
-#: src/callbacks.c:6951 src/saveplay.c:3618
-#, c-format
-msgid "%d frames are enough !\n"
-msgstr "%d çerçeve yeterli !\n"
-
-#: src/callbacks.c:7050
+#: src/callbacks.c:6706
 msgid "LiVES: - Encoder debug output"
 msgstr ""
 
-#: src/callbacks.c:7087 src/gui.c:1922
+#: src/callbacks.c:6743 src/gui.c:1921
 msgid "Fullscreen playback (f)"
 msgstr "Tam ekran oynatma (f)"
 
-#: src/callbacks.c:7089
+#: src/callbacks.c:6744
 msgid "Fullscreen playback off (f)"
 msgstr "Tam ekran oynatma (f)"
 
-#: src/callbacks.c:7188 src/callbacks.c:7336 src/callbacks.c:7664
-#: src/callbacks.c:7681 src/gui.c:3712 src/saveplay.c:2467 src/saveplay.c:2501
-#: src/saveplay.c:3115 src/saveplay.c:3220 src/saveplay.c:3239
-#: src/multitrack.c:9340 src/multitrack.c:11060
+#: src/callbacks.c:6841 src/callbacks.c:6983 src/callbacks.c:7283
+#: src/callbacks.c:7298 src/gui.c:3838 src/saveplay.c:2442 src/saveplay.c:2475
+#: src/saveplay.c:3074 src/saveplay.c:3178 src/saveplay.c:3197
+#: src/multitrack.c:9526 src/multitrack.c:11288
 #, c-format
 msgid " (%d %% scale)"
 msgstr ""
 
-#: src/callbacks.c:7190 src/callbacks.c:7338 src/callbacks.c:7666
-#: src/gui.c:3716 src/saveplay.c:2469 src/saveplay.c:2503
+#: src/callbacks.c:6843 src/callbacks.c:6985 src/callbacks.c:7285
+#: src/gui.c:3842 src/saveplay.c:2444 src/saveplay.c:2477
 #, c-format
 msgid "LiVES: - Play Window%s"
 msgstr ""
 
-#: src/callbacks.c:7302 src/gui.c:1907
+#: src/callbacks.c:6950 src/gui.c:1906
 msgid "Double size (d)"
 msgstr "Çift boyut (d)"
 
-#: src/callbacks.c:7309
+#: src/callbacks.c:6956
 msgid "Single size (d)"
 msgstr "Tek boyut (d)"
 
-#: src/callbacks.c:7442 src/callbacks.c:7443
+#: src/callbacks.c:7087 src/callbacks.c:7088
 msgid "Hide the play window (s)"
 msgstr "Oynatma penceresini gizle (s)"
 
-#: src/callbacks.c:7452 src/gui.c:1746
+#: src/callbacks.c:7096 src/gui.c:1744
 msgid "Show the play window (s)"
 msgstr "Oynatma penceresini göster (s)"
 
-#: src/callbacks.c:7453 src/gui.c:1896
+#: src/callbacks.c:7097 src/gui.c:1895
 msgid "Play in separate window (s)"
 msgstr ""
 
-#: src/callbacks.c:7535 src/gui.c:4060 src/saveplay.c:2498
+#: src/callbacks.c:7175 src/gui.c:4169 src/saveplay.c:2472
 msgid "LiVES: - Streaming"
 msgstr ""
 
-#: src/callbacks.c:7778
+#: src/callbacks.c:7388
 msgid "Switch continuous looping off (o)"
 msgstr ""
 
-#: src/callbacks.c:7785 src/gui.c:1795
+#: src/callbacks.c:7394 src/gui.c:1793
 msgid "Switch continuous looping on (o)"
 msgstr ""
 
-#: src/callbacks.c:7837
+#: src/callbacks.c:7444
 #, c-format
 msgid "Audio volume (%.2f)"
 msgstr "Ses hacmi (%.2f)"
 
-#: src/callbacks.c:7876 src/callbacks.c:7877 src/gui.c:3640
+#: src/callbacks.c:7483 src/callbacks.c:7484 src/gui.c:3766
 msgid "Unmute the audio (z)"
 msgstr "Sesi kesme (z)"
 
-#: src/callbacks.c:7888 src/callbacks.c:7889 src/gui.c:1808 src/gui.c:3639
+#: src/callbacks.c:7494 src/callbacks.c:7495 src/gui.c:1806 src/gui.c:3765
 msgid "Mute the audio (z)"
 msgstr "Sesi kes (z)"
 
-#: src/callbacks.c:8038
+#: src/callbacks.c:7643
 msgid "Reversing clipboard..."
 msgstr ""
 
-#: src/callbacks.c:8052
+#: src/callbacks.c:7657
 msgid "Reversing clipboard"
 msgstr ""
 
-#: src/callbacks.c:8084
+#: src/callbacks.c:7689
 msgid "LiVES: Load subtitles from..."
 msgstr ""
 
-#: src/callbacks.c:8151 src/saveplay.c:970
+#: src/callbacks.c:7753 src/saveplay.c:956
 #, c-format
 msgid "Loaded subtitle file: %s\n"
 msgstr "Yüklenen altyazı dosyası: %s\n"
 
-#: src/callbacks.c:8220
+#: src/callbacks.c:7821
 msgid "Subtitles were erased.\n"
 msgstr "Altyazılar silindi.\n"
 
-#: src/callbacks.c:8239
+#: src/callbacks.c:7843
 msgid "LiVES: - Select Audio File"
 msgstr ""
 
-#: src/callbacks.c:8250
+#: src/callbacks.c:7878 src/callbacks.c:8232
+msgid ""
+"\n"
+"Loading new audio may cause missing audio in some multitrack layouts.\n"
+"Are you sure you wish to continue ?\n"
+"."
+msgstr ""
+
+#: src/callbacks.c:7989
+#, c-format
+msgid "Opening audio %s, type %s..."
+msgstr ""
+
+#: src/callbacks.c:8023 src/saveplay.c:477
+msgid "Opening audio"
+msgstr "Ses açılıyor"
+
+#: src/callbacks.c:8032 src/callbacks.c:8083 src/callbacks.c:8327
+#: src/callbacks.c:8369 src/callbacks.c:8412 src/callbacks.c:10766
+msgid "Cancelling"
+msgstr "İptal ediliyor"
+
+#: src/callbacks.c:8137 src/callbacks.c:8454 src/callbacks.c:10803
+#: src/callbacks.c:11477
+msgid "Committing audio"
+msgstr ""
+
+#: src/callbacks.c:8153 src/callbacks.c:8484
+msgid "New Audio"
+msgstr "Yeni ses"
+
+#: src/callbacks.c:8194
 msgid "Please set your CD play device in Tools | Preferences | Misc\n"
 msgstr ""
 "Lütfen Araçlar | Tercihler | Çeşitli  menüsünden CD oynatma aygıtını "
 "ayarlayınız.\n"
 
-#: src/callbacks.c:8321
+#: src/callbacks.c:8264
 #, c-format
 msgid "Opening CD track %d from %s..."
 msgstr ""
 
-#: src/callbacks.c:8326
+#: src/callbacks.c:8267
 #, c-format
 msgid "CD track %d"
 msgstr "CD parçası %d"
 
-#: src/callbacks.c:8373
+#: src/callbacks.c:8313
 msgid "Opening CD track..."
 msgstr "CD parçası açılıyor..."
 
-#: src/callbacks.c:8415 src/callbacks.c:8461
+#: src/callbacks.c:8355 src/callbacks.c:8401
 msgid "Error loading CD track\n"
 msgstr "CD parçası yüklenirken hata veriyor\n"
 
-#: src/callbacks.c:8584
+#: src/callbacks.c:8518
 msgid "layout errors"
 msgstr "Düzen hataları"
 
-#: src/callbacks.c:8595
+#: src/callbacks.c:8529
 msgid "Close _Window"
 msgstr "Pencere Kapat"
 
-#: src/callbacks.c:8606
+#: src/callbacks.c:8540
 msgid "Clear _Errors"
 msgstr "Hataları sil"
 
-#: src/callbacks.c:8617
+#: src/callbacks.c:8551
 msgid "_Delete affected layouts"
 msgstr "Etkilenen düzenleri sil"
 
-#: src/callbacks.c:9343 src/callbacks.c:9388
+#: src/callbacks.c:9253 src/callbacks.c:9298
 msgid "Resume"
 msgstr "Devam Et"
 
-#: src/callbacks.c:9344
+#: src/callbacks.c:9254
 msgid ""
 "\n"
 "Paused\n"
@@ -2586,27 +2579,23 @@
 "Duraklatıldı\n"
 "(İşleme devam etmek için tıklayınız )"
 
-#: src/callbacks.c:9345 src/callbacks.c:9406
+#: src/callbacks.c:9255 src/callbacks.c:9315
 msgid "paused..."
 msgstr "duraklatıldı..."
 
-#: src/callbacks.c:9372 src/callbacks.c:9418
-msgid "Pause"
-msgstr "Durdur"
-
-#: src/callbacks.c:9374 src/callbacks.c:9421
+#: src/callbacks.c:9284 src/callbacks.c:9333
 msgid "resumed..."
 msgstr ""
 
-#: src/callbacks.c:9393
+#: src/callbacks.c:9303
 msgid "Keep"
 msgstr "Koru"
 
-#: src/callbacks.c:9396
+#: src/callbacks.c:9305
 msgid "Enough"
 msgstr "Yeter"
 
-#: src/callbacks.c:9401
+#: src/callbacks.c:9310
 #, fuzzy, c-format
 msgid ""
 "\n"
@@ -2618,28 +2607,28 @@
 "Duraklatıldı\n"
 "(İşleme devam etmek için tıklayınız )"
 
-#: src/callbacks.c:9419
+#: src/callbacks.c:9331
 msgid "Cancel"
 msgstr "İptal"
 
-#: src/callbacks.c:9558
+#: src/callbacks.c:9478
 msgid "Stop"
 msgstr ""
 
-#: src/callbacks.c:10053 src/multitrack.c:13247
+#: src/callbacks.c:9968 src/multitrack.c:13489
 msgid "LiVES: Selected frame"
 msgstr ""
 
-#: src/callbacks.c:10061
+#: src/callbacks.c:9976
 msgid "_Save frame as..."
 msgstr ""
 
-#: src/callbacks.c:10290
+#: src/callbacks.c:10202
 #, c-format
 msgid "Audio is ahead of video by %.4f secs. at frame %d, with fps %.4f\n"
 msgstr ""
 
-#: src/callbacks.c:10347
+#: src/callbacks.c:10255
 msgid ""
 "\n"
 "\n"
@@ -2648,7 +2637,7 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10353
+#: src/callbacks.c:10261
 msgid ""
 "\n"
 "\n"
@@ -2656,7 +2645,7 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10429 src/callbacks.c:11479
+#: src/callbacks.c:10334 src/callbacks.c:11395
 msgid ""
 "\n"
 "Record time must be greater than 0.\n"
@@ -2664,7 +2653,7 @@
 "\n"
 "Kayıt süresi 0'dan büyük olmalıdır.\n"
 
-#: src/callbacks.c:10440
+#: src/callbacks.c:10346
 msgid ""
 "Capture an External Window:\n"
 "\n"
@@ -2673,17 +2662,17 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10445
+#: src/callbacks.c:10351
 msgid "External window was released.\n"
 msgstr ""
 
-#: src/callbacks.c:10479
+#: src/callbacks.c:10385
 msgid ""
 "Click on a Window to Capture it\n"
 "Press 'q' to stop recording"
 msgstr ""
 
-#: src/callbacks.c:10513
+#: src/callbacks.c:10419
 #, c-format
 msgid ""
 "\n"
@@ -2693,19 +2682,19 @@
 "(Default of %.3f frames per second will be used.)\n"
 msgstr ""
 
-#: src/callbacks.c:10539
+#: src/callbacks.c:10443
 msgid "LiVES was unable to capture this window. Sorry.\n"
 msgstr ""
 
-#: src/callbacks.c:10695
+#: src/callbacks.c:10601
 msgid "Export Selected Audio as..."
 msgstr ""
 
-#: src/callbacks.c:10699
+#: src/callbacks.c:10604
 msgid "Export Audio as..."
 msgstr ""
 
-#: src/callbacks.c:10714
+#: src/callbacks.c:10619
 msgid ""
 "\n"
 "\n"
@@ -2714,1034 +2703,1034 @@
 "rate.\n"
 msgstr ""
 
-#: src/callbacks.c:10720
+#: src/callbacks.c:10625
 #, c-format
 msgid "Exporting audio frames %d to %d as %s..."
 msgstr ""
 
-#: src/callbacks.c:10725
+#: src/callbacks.c:10629
 #, c-format
 msgid "Exporting audio as %s..."
 msgstr ""
 
-#: src/callbacks.c:10751
+#: src/callbacks.c:10655
 msgid "Exporting audio"
 msgstr "Ses dışa aktarılıyor"
 
-#: src/callbacks.c:10782
+#: src/callbacks.c:10695
 msgid "LiVES: - Append Audio File"
 msgstr ""
 
-#: src/callbacks.c:10825
+#: src/callbacks.c:10739
 #, c-format
 msgid "Appending audio file %s..."
 msgstr "%s Ses dosyası  ekleniyor"
 
-#: src/callbacks.c:10836
+#: src/callbacks.c:10756
 msgid "Appending audio"
 msgstr "ses ekleniyor"
 
-#: src/callbacks.c:10892
+#: src/callbacks.c:10818
 msgid "Append Audio"
 msgstr "Ses ekle"
 
-#: src/callbacks.c:10952
+#: src/callbacks.c:10883
 #, c-format
 msgid "Padding audio to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10954
+#: src/callbacks.c:10885
 #, c-format
 msgid "Trimming audio from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10973
+#: src/callbacks.c:10904
 msgid "Trimming/Padding audio"
 msgstr "Ses Kırpılıyor/Dolgulanıyor"
 
-#: src/callbacks.c:10981
+#: src/callbacks.c:10912
 msgid "Trim/Pad Audio"
 msgstr "Ses Kırp/Dolgu"
 
-#: src/callbacks.c:11055
+#: src/callbacks.c:10982
 msgid "Fading audio in"
 msgstr ""
 
-#: src/callbacks.c:11056
+#: src/callbacks.c:10983
 msgid "Fade audio in"
 msgstr ""
 
-#: src/callbacks.c:11061
+#: src/callbacks.c:10987
 msgid "Fading audio out"
 msgstr ""
 
-#: src/callbacks.c:11062
+#: src/callbacks.c:10988
 msgid "Fade audio out"
 msgstr ""
 
-#: src/callbacks.c:11085
+#: src/callbacks.c:11011
 #, c-format
 msgid "%s over %.1f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11087
+#: src/callbacks.c:11013
 #, c-format
 msgid "%s from time %.2f seconds to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11094
+#: src/callbacks.c:11020
 msgid "Fading audio..."
 msgstr ""
 
-#: src/callbacks.c:11194
+#: src/callbacks.c:11119
 msgid ""
 "\n"
 "Deleting all audio will close this file.\n"
 "Are you sure ?"
 msgstr ""
 
-#: src/callbacks.c:11197
+#: src/callbacks.c:11122
 msgid "Deleting all audio..."
 msgstr "Tüm sesler siliniyor..."
 
-#: src/callbacks.c:11203
+#: src/callbacks.c:11127
 #, c-format
 msgid "Deleting audio from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11290
+#: src/callbacks.c:11214
 msgid "Deleting Audio"
 msgstr "Ses siliniyor"
 
-#: src/callbacks.c:11297
+#: src/callbacks.c:11221
 msgid "Delete Audio"
 msgstr "Sesi sil"
 
-#: src/callbacks.c:11636
+#: src/callbacks.c:11550
 msgid "Record new audio"
 msgstr "Yeni ses kaydet"
 
-#: src/callbacks.c:11725
+#: src/callbacks.c:11640
 #, c-format
 msgid "Inserting silence from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11754
+#: src/callbacks.c:11666
 msgid "Inserting Silence"
 msgstr ""
 
-#: src/merge.c:85
+#: src/merge.c:96
 msgid "LiVES: - Merge"
 msgstr "LiVES: - Birleştir"
 
-#: src/merge.c:102
+#: src/merge.c:113
 #, c-format
 msgid "Merge Clipboard [ %d Frames ]       With Selection [ %d Frames ]"
 msgstr ""
 
-#: src/merge.c:107
+#: src/merge.c:118
 #, c-format
 msgid ""
 "Merge Clipboard [ %d Frames (resampled) ]       With Selection [ %d Frames ]"
 msgstr ""
 
-#: src/merge.c:118
+#: src/merge.c:130
 msgid "Align _Starts"
 msgstr ""
 
-#: src/merge.c:123
+#: src/merge.c:135
 msgid "Align _Ends"
 msgstr ""
 
-#: src/merge.c:134
+#: src/merge.c:146
 msgid "What to do with extra clipboard frames -"
 msgstr ""
 
-#: src/merge.c:137
+#: src/merge.c:149
 msgid "_Insert Frames"
 msgstr "_Çerçeve _ekle"
 
-#: src/merge.c:143
+#: src/merge.c:155
 msgid "_Drop Frames"
 msgstr "Çerçeve _Çıkar"
 
-#: src/merge.c:149
+#: src/merge.c:160
 msgid "Number of Times to Loop Clipboard"
 msgstr ""
 
-#: src/merge.c:160
+#: src/merge.c:171
 msgid "_Loop Clipboard to Fit Selection"
 msgstr ""
 
-#: src/merge.c:173
+#: src/merge.c:184
 msgid "_Transition Method:"
 msgstr "_Geçiş Yöntemi:"
 
-#: src/merge.c:394
+#: src/merge.c:395
 msgid "Merging clipboard with selection..."
 msgstr ""
 
-#: src/merge.c:551
+#: src/merge.c:539
 msgid "Merge done.\n"
 msgstr "Birleştirme yapıldı.\n"
 
-#: src/gui.c:123
+#: src/gui.c:122
 msgid "_Custom Generators"
 msgstr ""
 
-#: src/gui.c:124
+#: src/gui.c:123
 msgid "_Custom Effects"
 msgstr "_Özel Efektler"
 
-#: src/gui.c:125
+#: src/gui.c:124
 msgid "Custom _Utilities"
 msgstr "Özel _Yardımcılar"
 
-#: src/gui.c:352 src/multitrack.c:5964
+#: src/gui.c:351 src/multitrack.c:6143
 msgid "_File"
 msgstr "_Dosya"
 
-#: src/gui.c:367 src/multitrack.c:5989
+#: src/gui.c:366 src/multitrack.c:6168
 msgid "_Open File/Directory"
 msgstr "_Dosya/Klasör Aç"
 
-#: src/gui.c:373
+#: src/gui.c:372
 msgid "O_pen Part of File..."
 msgstr ""
 
-#: src/gui.c:379 src/gui.c:383 src/multitrack.c:6006 src/multitrack.c:6023
-#: src/multitrack.c:6028
+#: src/gui.c:378 src/gui.c:382 src/multitrack.c:6185 src/multitrack.c:6202
+#: src/multitrack.c:6207
 msgid "Open _Location/Stream..."
 msgstr "_Konum/Akış Aç..."
 
-#: src/gui.c:393 src/multitrack.c:6016
+#: src/gui.c:392 src/multitrack.c:6195
 msgid "Open _Youtube Clip..."
 msgstr ""
 
-#: src/gui.c:404
+#: src/gui.c:403
 msgid "Import from _dvd/vcd..."
 msgstr ""
 
-#: src/gui.c:413
+#: src/gui.c:412
 msgid "Import from _dvd"
 msgstr ""
 
-#: src/gui.c:416
+#: src/gui.c:415
 msgid "Import from _vcd"
 msgstr ""
 
-#: src/gui.c:419
+#: src/gui.c:418
 msgid "_Import from Firewire"
 msgstr ""
 
-#: src/gui.c:428 src/multitrack.c:6086
+#: src/gui.c:427 src/multitrack.c:6265
 msgid "Import from _Firewire Device (dv)"
 msgstr "_Firewire aygıtından (dv) içeri al"
 
-#: src/gui.c:429 src/multitrack.c:6094
+#: src/gui.c:428 src/multitrack.c:6273
 msgid "Import from _Firewire Device (hdv)"
 msgstr "_Firewire aygıtından (hdv) içeri al"
 
-#: src/gui.c:457
+#: src/gui.c:456
 msgid "_Add Webcam/TV card..."
 msgstr ""
 
-#: src/gui.c:476
+#: src/gui.c:475
 msgid "Add _Unicap Device"
 msgstr ""
 
-#: src/gui.c:486
+#: src/gui.c:485
 msgid "Add Live _Firewire Device"
 msgstr "_Firewire aygıtı canlı yayın ekle"
 
-#: src/gui.c:495
+#: src/gui.c:494
 msgid "Add _TV Device"
 msgstr ""
 
-#: src/gui.c:510 src/multitrack.c:6117
+#: src/gui.c:509 src/multitrack.c:6296
 msgid "_Recent Files..."
 msgstr "_Son Dosyalar ..."
 
-#: src/gui.c:560 src/multitrack.c:6177
+#: src/gui.c:559 src/multitrack.c:6356
 msgid "_Reload Clip Set..."
 msgstr "Klip ayarını _tekrar yükle"
 
-#: src/gui.c:564 src/multitrack.c:6185
+#: src/gui.c:563 src/multitrack.c:6364
 msgid "Close/Sa_ve All Clips"
 msgstr "_Tüm klipleri kaydet/kapat"
 
-#: src/gui.c:575
+#: src/gui.c:574
 msgid "_Encode Clip As..."
 msgstr "Klibi farklı adla _kodla..."
 
-#: src/gui.c:577
+#: src/gui.c:576
 msgid "Encode _Selection As..."
 msgstr "Seçimii farklı adla _kodla..."
 
-#: src/gui.c:584
+#: src/gui.c:583
 msgid "_Close This Clip"
 msgstr "Bu klibi _kapat"
 
-#: src/gui.c:595
+#: src/gui.c:594
 msgid "_Backup Clip as .lv1..."
 msgstr "Klip _Yedeği .lv1 i Farklı Kaydet..."
 
-#: src/gui.c:604
+#: src/gui.c:603
 msgid "_Restore Clip from .lv1..."
 msgstr ".lv1 den klibi _geri yükle..."
 
-#: src/gui.c:615
+#: src/gui.c:614
 msgid "Encode/Load/Backup _with Sound"
 msgstr "Sesli Kodla/Yükle/Yedek"
 
-#: src/gui.c:620
+#: src/gui.c:619
 msgid "Auto load subtitles"
 msgstr "Altyazıları otomatik yükle"
 
-#: src/gui.c:628 src/multitrack.c:6224
+#: src/gui.c:627 src/multitrack.c:6403
 msgid "Clean _up Diskspace"
 msgstr "Disk alanını temizle"
 
-#: src/gui.c:636 src/multitrack.c:6257
+#: src/gui.c:635 src/multitrack.c:6436
 msgid "_Edit"
 msgstr "_Düzenle"
 
-#: src/gui.c:685
+#: src/gui.c:684
 msgid "_MULTITRACK mode"
 msgstr "Çok parçalı kip"
 
-#: src/gui.c:696
+#: src/gui.c:695
 msgid "_Copy Selection"
 msgstr "Seçimi _kopyala"
 
-#: src/gui.c:705
+#: src/gui.c:704
 msgid "Cu_t Selection"
 msgstr "Seçimi ke_s"
 
-#: src/gui.c:714
+#: src/gui.c:713
 msgid "_Insert from Clipboard..."
 msgstr "Panodan _ekle..."
 
-#: src/gui.c:730
+#: src/gui.c:729
 msgid "Paste as _New"
 msgstr "_Yeni Olarak Yapıştır"
 
-#: src/gui.c:739
+#: src/gui.c:738
 msgid "_Merge Clipboard with Selection..."
 msgstr "Seçimi pano ile _birleştir..."
 
-#: src/gui.c:746
+#: src/gui.c:745
 msgid "_Delete Selection"
 msgstr "_Seçimi sil"
 
-#: src/gui.c:764
+#: src/gui.c:763
 msgid "Decouple _Video from Audio"
 msgstr ""
 
-#: src/gui.c:772
+#: src/gui.c:771
 msgid "_Select..."
 msgstr "_Seç..."
 
-#: src/gui.c:786
+#: src/gui.c:785
 msgid "Select _All Frames"
 msgstr "_Tüm çerçeveleri seç"
 
-#: src/gui.c:794
+#: src/gui.c:793
 msgid "_Start Frame Only"
 msgstr ""
 
-#: src/gui.c:802
+#: src/gui.c:801
 msgid "_End Frame Only"
 msgstr ""
 
-#: src/gui.c:813
+#: src/gui.c:812
 msgid "Select from _First Frame"
 msgstr ""
 
-#: src/gui.c:817
+#: src/gui.c:816
 msgid "Select to _Last Frame"
 msgstr ""
 
-#: src/gui.c:821
+#: src/gui.c:820
 msgid "Select Last Insertion/_Merge"
 msgstr ""
 
-#: src/gui.c:825
+#: src/gui.c:824
 msgid "Select Last _Effect"
 msgstr "Son  _efektii seç"
 
-#: src/gui.c:829
+#: src/gui.c:828
 msgid "_Invert Selection"
 msgstr "_Seçimi Tersine Çevir"
 
-#: src/gui.c:837
+#: src/gui.c:836
 msgid "_Lock Selection Width"
 msgstr "Genişlik Seçimini _Kilitle"
 
-#: src/gui.c:842 src/multitrack.c:6409
+#: src/gui.c:841 src/multitrack.c:6591
 msgid "_Play"
 msgstr "_Oynat"
 
-#: src/gui.c:854
+#: src/gui.c:853
 msgid "_Play All"
 msgstr "Tümünü _Oynat"
 
-#: src/gui.c:869
+#: src/gui.c:868
 msgid "Pla_y Selection"
 msgstr "Seçim O_ynat"
 
-#: src/gui.c:877
+#: src/gui.c:876
 msgid "Play _Clipboard"
 msgstr "_Panoyu oynat"
 
-#: src/gui.c:899 src/multitrack.c:6441
+#: src/gui.c:898 src/multitrack.c:6623
 msgid "_Stop"
 msgstr "_Durdur"
 
-#: src/gui.c:914 src/multitrack.c:6453
+#: src/gui.c:913 src/multitrack.c:6635
 msgid "Re_wind"
 msgstr "_Geriye sar"
 
-#: src/gui.c:946 src/multitrack.c:6471
+#: src/gui.c:945 src/multitrack.c:6653
 msgid "_Full Screen"
 msgstr "_Tam Ekran"
 
-#: src/gui.c:955
+#: src/gui.c:954
 msgid "_Double Size"
 msgstr "_Çift boyut"
 
-#: src/gui.c:963 src/multitrack.c:6479
+#: src/gui.c:962 src/multitrack.c:6661
 msgid "Play in _Separate Window"
 msgstr ""
 
-#: src/gui.c:972
+#: src/gui.c:971
 msgid "_Blank Background"
 msgstr "_Boş arkaplan"
 
-#: src/gui.c:979
+#: src/gui.c:978
 msgid "(Auto)_loop Video (to fit audio track)"
 msgstr "(Otomatik) Video _döngüsü (ses e uyacak şekilde)"
 
-#: src/gui.c:988 src/multitrack.c:6487
+#: src/gui.c:987 src/multitrack.c:6669
 msgid "L_oop Continuously"
 msgstr "Sürekli dö_ngü"
 
-#: src/gui.c:997
+#: src/gui.c:996
 msgid "Pin_g Pong Loops"
 msgstr ""
 
-#: src/gui.c:1005 src/multitrack.c:6495
+#: src/gui.c:1004 src/multitrack.c:6677
 msgid "_Mute"
 msgstr "_Sessiz"
 
-#: src/gui.c:1017
+#: src/gui.c:1016
 msgid "Separate Window 'S_ticky' Mode"
 msgstr ""
 
-#: src/gui.c:1025
+#: src/gui.c:1024
 msgid "S_how Frame Counter"
 msgstr "Çerçeve saymayı _göster"
 
-#: src/gui.c:1035
+#: src/gui.c:1034
 msgid "Show Subtitles"
 msgstr "Altyazıları Göster"
 
-#: src/gui.c:1045
+#: src/gui.c:1044
 msgid "Letterbox mode"
 msgstr ""
 
-#: src/gui.c:1051 src/multitrack.c:6507
+#: src/gui.c:1050 src/multitrack.c:6689
 msgid "Effect_s"
 msgstr "Efekt_ler"
 
-#: src/gui.c:1054
+#: src/gui.c:1053
 msgid "Effects are applied to the current selection."
 msgstr "Geçerli seçime efektleri uygula"
 
-#: src/gui.c:1067
+#: src/gui.c:1066
 msgid "_Run Test Rendered Effect/Tool/Generator..."
 msgstr ""
 
-#: src/gui.c:1072 src/multitrack.c:7123
+#: src/gui.c:1071 src/multitrack.c:7299
 msgid "_Tools"
 msgstr "_Araçlar"
 
-#: src/gui.c:1075
+#: src/gui.c:1074
 msgid "Tools are applied to complete clips."
 msgstr ""
 
-#: src/gui.c:1085
+#: src/gui.c:1084
 msgid "_Reverse Clipboard"
 msgstr ""
 
-#: src/gui.c:1094
+#: src/gui.c:1093
 msgid "_Change Playback/Save Speed..."
 msgstr ""
 
-#: src/gui.c:1099
+#: src/gui.c:1098
 msgid "Resample _Video to New Frame Rate..."
 msgstr ""
 
-#: src/gui.c:1105
+#: src/gui.c:1104
 msgid "_Utilities"
 msgstr "_Yardımcılar"
 
-#: src/gui.c:1110
+#: src/gui.c:1109
 msgid "Custom _Tools"
 msgstr "Özel _Araçlar"
 
-#: src/gui.c:1116 src/multitrack.c:7149
+#: src/gui.c:1115 src/multitrack.c:7325
 msgid "_Generate"
 msgstr "_Üret"
 
-#: src/gui.c:1126
+#: src/gui.c:1125
 msgid "Loading rendered effect plugins..."
 msgstr "redener efekt eklentisi yükleniyor"
 
-#: src/gui.c:1139
+#: src/gui.c:1138
 msgid "Load _Subtitles from File..."
 msgstr ""
 
-#: src/gui.c:1144
+#: src/gui.c:1143
 msgid "Erase subtitles"
 msgstr "Altyazıları silme"
 
-#: src/gui.c:1152 src/multitrack.c:7158
+#: src/gui.c:1151 src/multitrack.c:7334
 msgid "Capture _External Window... "
 msgstr "_Dış Pencere Yakala... "
 
-#: src/gui.c:1159 src/multitrack.c:7173
+#: src/gui.c:1158 src/multitrack.c:7349
 msgid "_Preferences..."
 msgstr "_Tercihler"
 
-#: src/gui.c:1172
+#: src/gui.c:1171
 msgid "_Audio"
 msgstr "_Ses"
 
-#: src/gui.c:1184
+#: src/gui.c:1183
 msgid "Load _New Audio for Clip..."
 msgstr "Klip için _Yeni Ses Yükle..."
 
-#: src/gui.c:1190
+#: src/gui.c:1189
 msgid "Load _CD Track..."
 msgstr "_CD Parçası Yükle..."
 
-#: src/gui.c:1191
+#: src/gui.c:1190
 msgid "E_ject CD"
 msgstr "_CD'yi Çıkart"
 
-#: src/gui.c:1205
+#: src/gui.c:1204
 msgid "Record E_xternal Audio..."
 msgstr "_Dış Kaynaklı Ses kaydı"
 
-#: src/gui.c:1218
+#: src/gui.c:1217
 msgid "to New _Clip..."
 msgstr "Yeni _Klip e..."
 
-#: src/gui.c:1222
+#: src/gui.c:1221
 msgid "to _Selection"
 msgstr "_Seçime"
 
-#: src/gui.c:1230
+#: src/gui.c:1229
 msgid "Fade Audio _In..."
 msgstr ""
 
-#: src/gui.c:1234
+#: src/gui.c:1233
 msgid "Fade Audio _Out..."
 msgstr ""
 
-#: src/gui.c:1244
+#: src/gui.c:1243
 msgid "_Export Audio..."
 msgstr "Ses _Çıkart..."
 
-#: src/gui.c:1257
+#: src/gui.c:1256
 msgid "Export _Selected Audio..."
 msgstr "_Seçili Sesi Çıkart..."
 
-#: src/gui.c:1261
+#: src/gui.c:1260
 msgid "Export _All Audio..."
 msgstr "_Tüm sesleri çıkart"
 
-#: src/gui.c:1265
+#: src/gui.c:1264
 msgid "_Append Audio..."
 msgstr ""
 
-#: src/gui.c:1270
+#: src/gui.c:1269
 msgid "_Trim/Pad Audio..."
 msgstr ""
 
-#: src/gui.c:1283
+#: src/gui.c:1282
 msgid "Trim/Pad Audio to _Selection"
 msgstr ""
 
-#: src/gui.c:1288
+#: src/gui.c:1287
 msgid "Trim/Pad Audio from Beginning to _Play Start"
 msgstr ""
 
-#: src/gui.c:1293
+#: src/gui.c:1292
 msgid "_Delete Audio..."
 msgstr "Sesi _sil"
 
-#: src/gui.c:1306
+#: src/gui.c:1305
 msgid "Delete _Selected Audio"
 msgstr "Seçilmiş Sesi sil"
 
-#: src/gui.c:1310
+#: src/gui.c:1309
 msgid "Delete _All Audio"
 msgstr "Tüm sesi sil"
 
-#: src/gui.c:1314
+#: src/gui.c:1313
 msgid "Insert _Silence in Selection"
 msgstr ""
 
-#: src/gui.c:1319
+#: src/gui.c:1318
 msgid "_Resample Audio..."
 msgstr ""
 
-#: src/gui.c:1324
+#: src/gui.c:1323
 msgid "_Info"
 msgstr "_Bilgi"
 
-#: src/gui.c:1336
+#: src/gui.c:1335
 msgid "Show Clip _Info"
 msgstr "Klip Bilgisini _Göster"
 
-#: src/gui.c:1344
+#: src/gui.c:1343
 msgid "Show/_Edit File Comments"
 msgstr "Dosya Açıklamalarını Düzenle_/Göster"
 
-#: src/gui.c:1349
+#: src/gui.c:1348
 msgid "Show _Clipboard Info"
 msgstr "_Pano Bilgisini Göster"
 
-#: src/gui.c:1360 src/multitrack.c:7286
+#: src/gui.c:1359 src/multitrack.c:7462
 msgid "Show _Messages"
 msgstr "_Mesajları Göster"
 
-#: src/gui.c:1364 src/multitrack.c:7365
+#: src/gui.c:1363 src/multitrack.c:7541
 msgid "Show _Layout Errors"
 msgstr "_Yerleşim düzeni hatalarını göster"
 
-#: src/gui.c:1369 src/multitrack.c:7263
+#: src/gui.c:1368 src/multitrack.c:7439
 msgid "_Clips"
 msgstr "_Klipler"
 
-#: src/gui.c:1381
+#: src/gui.c:1380
 msgid "_Rename Current Clip in Menu..."
 msgstr ""
 
-#: src/gui.c:1399
+#: src/gui.c:1398
 msgid "A_dvanced"
 msgstr "_Gelişmiş"
 
-#: src/gui.c:1412
+#: src/gui.c:1411
 msgid "_RFX Effects/Tools/Utilities"
 msgstr ""
 
-#: src/gui.c:1424
+#: src/gui.c:1423
 msgid "_New Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1428
+#: src/gui.c:1427
 msgid "_Copy RFX Script to Test..."
 msgstr ""
 
-#: src/gui.c:1432
+#: src/gui.c:1431
 msgid "_Edit Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1436
+#: src/gui.c:1435
 msgid "Rena_me Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1440
+#: src/gui.c:1439
 msgid "_Delete Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1450
+#: src/gui.c:1449
 msgid "_Promote Test Rendered Effect/Tool/Generator..."
 msgstr ""
 
-#: src/gui.c:1457
+#: src/gui.c:1456
 msgid "_Import Custom RFX script..."
 msgstr ""
 
-#: src/gui.c:1461
+#: src/gui.c:1460
 msgid "E_xport Custom RFX script..."
 msgstr ""
 
-#: src/gui.c:1465
+#: src/gui.c:1464
 msgid "De_lete Custom RFX Script..."
 msgstr ""
 
-#: src/gui.c:1472
+#: src/gui.c:1471
 msgid "Re_build all RFX plugins"
 msgstr ""
 
-#: src/gui.c:1501
+#: src/gui.c:1498
 msgid "Receive _LiVES stream from..."
 msgstr ""
 
-#: src/gui.c:1506
+#: src/gui.c:1503
 msgid "_Send LiVES stream to..."
 msgstr ""
 
-#: src/gui.c:1515
+#: src/gui.c:1512
 #, c-format
 msgid "Open _yuv4mpeg stream on %sstream.yuv..."
 msgstr ""
 
-#: src/gui.c:1536
+#: src/gui.c:1534
 msgid "_Import Project (.lv2)..."
 msgstr ""
 
-#: src/gui.c:1540
+#: src/gui.c:1538
 msgid "E_xport Project (.lv2)..."
 msgstr "Proje (.lv2) _dışarı çıkartılıyor..."
 
-#: src/gui.c:1545
+#: src/gui.c:1543
 msgid "_VJ"
 msgstr "_VJ"
 
-#: src/gui.c:1557
+#: src/gui.c:1555
 msgid "Real Time _Effect Mapping"
 msgstr "Gerçek Zamanlı _Efekt Haritası"
 
-#: src/gui.c:1563
+#: src/gui.c:1561
 msgid "Bind real time effects to ctrl-number keys."
 msgstr "Gerçek zamanlı efektler için ctrl-sayı tuşları atama."
 
-#: src/gui.c:1565
+#: src/gui.c:1563
 msgid "Set Real Time Effect _Defaults"
 msgstr "Gerçek zamanlı efekt ön tanımları ayarla"
 
-#: src/gui.c:1567
+#: src/gui.c:1565
 msgid "Set default parameter values for real time effects."
 msgstr ""
 
-#: src/gui.c:1580
+#: src/gui.c:1578
 msgid "Save Real Time Effect _Defaults"
 msgstr ""
 
-#: src/gui.c:1583
+#: src/gui.c:1581
 msgid ""
 "Save real time effect defaults so they will be restored each time you use "
 "LiVES."
 msgstr ""
 
-#: src/gui.c:1589
+#: src/gui.c:1587
 msgid "_Reset all playback speeds and positions"
 msgstr ""
 
-#: src/gui.c:1592
+#: src/gui.c:1590
 msgid ""
 "Reset all playback positions to frame 1, and reset all playback frame rates."
 msgstr ""
 
-#: src/gui.c:1594
+#: src/gui.c:1592
 msgid "_MIDI/joystick interface"
 msgstr "_MIDI/denetim kolu arayüz"
 
-#: src/gui.c:1609
+#: src/gui.c:1607
 msgid "_MIDI/joystick learner..."
 msgstr ""
 
-#: src/gui.c:1614
+#: src/gui.c:1612
 msgid "_Save device mapping..."
 msgstr ""
 
-#: src/gui.c:1620
+#: src/gui.c:1618
 msgid "_Load device mapping..."
 msgstr ""
 
-#: src/gui.c:1628
+#: src/gui.c:1626
 msgid "Show VJ _Keys"
 msgstr "VJ _Tuşlarını Göster"
 
-#: src/gui.c:1632
+#: src/gui.c:1630
 msgid "To_ys"
 msgstr "_Araçlar"
 
-#: src/gui.c:1644
+#: src/gui.c:1642
 msgid "_None"
 msgstr "_Hiçbiri"
 
-#: src/gui.c:1652
+#: src/gui.c:1650
 msgid "_Autolives"
 msgstr ""
 
-#: src/gui.c:1657
+#: src/gui.c:1655
 msgid "_Mad Frames"
 msgstr ""
 
-#: src/gui.c:1662
+#: src/gui.c:1660
 msgid "_LiVES TV (broadband)"
 msgstr "_LiVES TV (Geniş band)"
 
-#: src/gui.c:1672 src/multitrack.c:7387
+#: src/gui.c:1670 src/multitrack.c:7563
 msgid "_Help"
 msgstr "_Yardım"
 
-#: src/gui.c:1684 src/multitrack.c:7407
+#: src/gui.c:1682 src/multitrack.c:7583
 msgid "_Manual (opens in browser)"
 msgstr "Kılavuz (tarayıcıda açılır)"
 
-#: src/gui.c:1691 src/multitrack.c:7416
+#: src/gui.c:1689 src/multitrack.c:7592
 msgid "_Donate to the project !"
 msgstr "Projeye _Bağış !"
 
-#: src/gui.c:1695 src/multitrack.c:7420
+#: src/gui.c:1693 src/multitrack.c:7596
 msgid "_Email the author"
 msgstr "Yazara _E-posta"
 
-#: src/gui.c:1699 src/multitrack.c:7424
+#: src/gui.c:1697 src/multitrack.c:7600
 msgid "Report a _bug"
 msgstr "_Hata Raporu"
 
-#: src/gui.c:1703 src/multitrack.c:7428
+#: src/gui.c:1701 src/multitrack.c:7604
 msgid "Suggest a _feature"
 msgstr "Bir özellik _önerin"
 
-#: src/gui.c:1707 src/multitrack.c:7432
+#: src/gui.c:1705 src/multitrack.c:7608
 msgid "Assist with _translating"
 msgstr ""
 
-#: src/gui.c:1714 src/multitrack.c:7439
+#: src/gui.c:1712 src/multitrack.c:7615
 msgid "_Troubleshoot"
 msgstr "_Sorun Giderici"
 
-#: src/gui.c:1718 src/multitrack.c:7443
+#: src/gui.c:1716 src/multitrack.c:7619
 msgid "_About"
 msgstr "_Hakkında"
 
-#: src/gui.c:1752
+#: src/gui.c:1750
 msgid "Rewind to start (w)"
 msgstr ""
 
-#: src/gui.c:1760 src/multitrack.c:16720
+#: src/gui.c:1758 src/multitrack.c:17010
 msgid "Play all (p)"
 msgstr "Tümünü oynat (p)"
 
-#: src/gui.c:1768 src/gui.c:1877
+#: src/gui.c:1766 src/gui.c:1876
 msgid "Stop playback (q)"
 msgstr "Oynatmayı durdur (q)"
 
-#: src/gui.c:1779
+#: src/gui.c:1777
 msgid "Play selection (y)"
 msgstr "Seçimi oynat (y)"
 
-#: src/gui.c:1832
+#: src/gui.c:1829
 msgid "Volume"
 msgstr "Ses Düzeyi"
 
-#: src/gui.c:1854
+#: src/gui.c:1853
 msgid "Audio volume (1.00)"
 msgstr "Ses düzeyi (1.00)"
 
-#: src/gui.c:1883
+#: src/gui.c:1882
 msgid "Unblank background (b)"
 msgstr "Dolu arkaplan (b)"
 
-#: src/gui.c:1929
+#: src/gui.c:1928
 msgid "Play slower (ctrl-down)"
 msgstr "Yavaş oynat (ctrl-down)"
 
-#: src/gui.c:1935
+#: src/gui.c:1934
 msgid "Play faster (ctrl-up)"
 msgstr "Hızlı oynat (ctrl-up)"
 
-#: src/gui.c:1942
+#: src/gui.c:1941
 msgid "Skip back (ctrl-left)"
 msgstr ""
 
-#: src/gui.c:1948
+#: src/gui.c:1947
 msgid "Skip forward (ctrl-right)"
 msgstr "İleri gitme (ctrl-right)"
 
-#: src/gui.c:1954
+#: src/gui.c:1953
 msgid "Show clip info (i)"
 msgstr "Klip bilgisini göster (i)"
 
-#: src/gui.c:1960
+#: src/gui.c:1959
 msgid "Hide this toolbar"
 msgstr "Araç çubuğunu gizle"
 
-#: src/gui.c:1962
+#: src/gui.c:1961
 msgid ""
 "Press \"s\" to toggle separate play window for improved performance, \"q\" "
 "to stop."
 msgstr ""
 
 #. TRANSLATORS: please keep the translated string the same length
-#: src/gui.c:1995
+#: src/gui.c:1994
 msgid "     Video playback speed (frames per second)        "
 msgstr ""
 
-#: src/gui.c:2009
+#: src/gui.c:2008
 msgid "Vary the video speed"
 msgstr ""
 
-#: src/gui.c:2092 src/gui.c:3218
+#: src/gui.c:2090 src/gui.c:3329
 msgid "First Frame"
 msgstr "İlk Kare"
 
-#: src/gui.c:2193 src/gui.c:3226
+#: src/gui.c:2191 src/gui.c:3336
 msgid "Last Frame"
 msgstr "Son Çerçeve"
 
-#: src/gui.c:2210
+#: src/gui.c:2208
 msgid "The first selected frame in this clip"
 msgstr ""
 
-#: src/gui.c:2248
+#: src/gui.c:2246
 msgid "The last selected frame in this clip"
 msgstr ""
 
-#: src/gui.c:2532
+#: src/gui.c:2546
 msgid "Starting...\n"
 msgstr "Başlatılıyor ...\n"
 
-#: src/gui.c:3074
+#: src/gui.c:3181
 msgid "    Press 'q' to stop recording.  DO NOT COVER THE PLAY WINDOW !   "
 msgstr ""
 "    Kayıt durdurmak için 'q'  tuşuna bas. OYNATMA PENCERESİNİ KAPATMAYIN !   "
 
-#: src/gui.c:3521
+#: src/gui.c:3643
 msgid "Frame number to preview"
 msgstr "Önizleme için çerçeve sayısı"
 
-#: src/gui.c:3538
+#: src/gui.c:3660
 msgid "_Free"
 msgstr "_Serbest"
 
-#: src/gui.c:3539
+#: src/gui.c:3661
 msgid "Free choice of frame number"
 msgstr "Çerçeve sayısı özgür seçim"
 
-#: src/gui.c:3543
+#: src/gui.c:3666
 msgid "_Start"
 msgstr "_Başlat"
 
-#: src/gui.c:3544
+#: src/gui.c:3667
 msgid "Frame number is linked to start frame"
 msgstr ""
 
-#: src/gui.c:3551
+#: src/gui.c:3675
 msgid "_End"
 msgstr "_Son"
 
-#: src/gui.c:3552
+#: src/gui.c:3676
 msgid "Frame number is linked to end frame"
 msgstr ""
 
-#: src/gui.c:3559
+#: src/gui.c:3684
 msgid "_Pointer"
 msgstr "_İşaretçi"
 
-#: src/gui.c:3560
+#: src/gui.c:3685
 msgid "Frame number is linked to playback pointer"
 msgstr ""
 
-#: src/gui.c:3581
+#: src/gui.c:3707
 msgid "Rewind"
 msgstr "Geriye Sar"
 
-#: src/gui.c:3592 src/dialogs.c:894 src/dialogs.c:896 src/dialogs.c:1817
-#: src/dialogs.c:1819
+#: src/gui.c:3718 src/dialogs.c:960 src/dialogs.c:962 src/dialogs.c:1873
+#: src/dialogs.c:1875
 msgid "Play all"
 msgstr "Tümünü oynat"
 
-#: src/gui.c:3605
+#: src/gui.c:3731
 msgid "Play Selection"
 msgstr "Seçimi oynat"
 
-#: src/gui.c:3619
+#: src/gui.c:3745
 msgid "Loop On/Off"
 msgstr "Döngüyü Aç/Kapat"
 
-#: src/gui.c:3693
+#: src/gui.c:3819
 msgid "Start _recording"
 msgstr "_Kaydı başlat"
 
-#: src/gui.c:3698
+#: src/gui.c:3824
 msgid "Stop _recording"
 msgstr "_Kaydı durdur"
 
-#: src/gui.c:3703
+#: src/gui.c:3829
 msgid "_Record Performance"
 msgstr "_Kayıt Performansı"
 
-#: src/gui.c:3851
+#: src/gui.c:3974
 msgid "Hide Play Window"
 msgstr "Oynatma Penceresini Gizle"
 
-#: src/gui.c:4232
+#: src/gui.c:4333
 msgid "Show Play Window"
 msgstr "Oynatma Penceresini Göster"
 
-#: src/ce_thumbs.c:222
+#: src/ce_thumbs.c:242
 #, c-format
 msgid "Mapped to ctrl-%d"
 msgstr ""
 
-#: src/ce_thumbs.c:276 src/effects.c:85 src/preferences.c:3195
+#: src/ce_thumbs.c:296 src/effects.c:86 src/preferences.c:3247
 msgid "Effects"
 msgstr "Efektler"
 
-#: src/ce_thumbs.c:279 src/multitrack.c:5615
+#: src/ce_thumbs.c:299 src/multitrack.c:5791
 msgid "Clips"
 msgstr "Klipler"
 
-#: src/ce_thumbs.c:303
+#: src/ce_thumbs.c:323
 #, c-format
 msgid "Show / apply effects to %s\n"
 msgstr ""
 
-#: src/ce_thumbs.c:315
+#: src/ce_thumbs.c:335
 #, fuzzy, c-format
 msgid "Select clip for %s\n"
 msgstr "Klip ayarlarını sil"
 
-#: src/ce_thumbs.c:515
+#: src/ce_thumbs.c:536
 msgid "_Pin"
 msgstr ""
 
-#: src/ce_thumbs.c:515
+#: src/ce_thumbs.c:537
 msgid "Pin the parameter box to the window"
 msgstr ""
 
 #. TRANSLATORS: Exabytes
-#: src/utils.c:794
+#: src/utils.c:800
 #, c-format
 msgid "%.2f EB"
 msgstr ""
 
 #. TRANSLATORS: Petabytes
-#: src/utils.c:798
+#: src/utils.c:803
 #, c-format
 msgid "%.2f PB"
 msgstr ""
 
 #. TRANSLATORS: Terabytes
-#: src/utils.c:802
+#: src/utils.c:806
 #, c-format
 msgid "%.2f TB"
 msgstr ""
 
 #. TRANSLATORS: Gigabytes
-#: src/utils.c:806
+#: src/utils.c:809
 #, c-format
 msgid "%.2f GB"
 msgstr ""
 
 #. TRANSLATORS: Megabytes
-#: src/utils.c:810
+#: src/utils.c:812
 #, c-format
 msgid "%.2f MB"
 msgstr ""
 
 #. TRANSLATORS: Kilobytes (1024 bytes)
-#: src/utils.c:814
+#: src/utils.c:815
 #, c-format
 msgid "%.2f KiB"
 msgstr ""
@@ -3751,7 +3740,7 @@
 msgid "%d bytes"
 msgstr ""
 
-#: src/utils.c:1841
+#: src/utils.c:1835
 msgid "Clearing the clipboard"
 msgstr "Panoyu temizle"
 
@@ -3763,81 +3752,81 @@
 "Switched to clip %s\n"
 msgstr ""
 
-#: src/utils.c:1880
+#: src/utils.c:1877
 msgid ""
 "\n"
 "==============================\n"
 "Switched to empty clip\n"
 msgstr ""
 
-#: src/utils.c:1917
+#: src/utils.c:1916
 msgid "(blank)"
 msgstr ""
 
-#: src/utils.c:1920
+#: src/utils.c:1919
 #, c-format
 msgid ""
 "The set name has been changed from %s to %s. Affected layouts have been "
 "updated accordingly\n"
 msgstr ""
 
-#: src/utils.c:1928
+#: src/utils.c:1927
 #, c-format
 msgid ""
 "The clip %s is missing from this set.\n"
 "It is required by the following layouts:\n"
 msgstr ""
 
-#: src/utils.c:1932
+#: src/utils.c:1931
 #, c-format
 msgid ""
 "The clip %s has been closed.\n"
 "It is required by the following layouts:\n"
 msgstr ""
 
-#: src/utils.c:1937
+#: src/utils.c:1936
 #, c-format
 msgid ""
 "Frames have been shifted in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1942
+#: src/utils.c:1941
 #, c-format
 msgid ""
 "Frames have been deleted from the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1947
+#: src/utils.c:1946
 #, c-format
 msgid ""
 "Audio has been deleted from the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1952
+#: src/utils.c:1951
 #, c-format
 msgid ""
 "Audio has been shifted in clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1957
+#: src/utils.c:1956
 #, c-format
 msgid ""
 "Audio has been altered in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1962
+#: src/utils.c:1961
 #, c-format
 msgid ""
 "Frames have been altered in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:2135
+#: src/utils.c:2134
 #, c-format
 msgid ""
 "Set %s\n"
@@ -3845,7 +3834,7 @@
 "by another copy of LiVES.\n"
 msgstr ""
 
-#: src/utils.c:2142
+#: src/utils.c:2140
 #, c-format
 msgid ""
 "\n"
@@ -3891,67 +3880,67 @@
 msgid "Removing layout %s\n"
 msgstr "%s Yerleşim düzeni kaldırıldı\n"
 
-#: src/utils.c:3014
+#: src/utils.c:2996
 msgid "Video [opening...]"
 msgstr "Video [açılıyor ...]"
 
-#: src/utils.c:3018
+#: src/utils.c:2999
 #, c-format
 msgid "Video [%.2f sec]"
 msgstr "Video [%.2f sn]"
 
-#: src/utils.c:3022
+#: src/utils.c:3002
 msgid "(Undefined)"
 msgstr "(Tanımsız)"
 
-#: src/utils.c:3025
+#: src/utils.c:3004
 msgid "(No video)"
 msgstr "(Video yok)"
 
-#: src/utils.c:3032
+#: src/utils.c:3011
 msgid "(No audio)"
 msgstr "(Ses yok)"
 
-#: src/utils.c:3037
+#: src/utils.c:3015
 msgid "Mono  [opening...]"
 msgstr "Mono  [açılıyor...]"
 
-#: src/utils.c:3040
+#: src/utils.c:3017
 msgid "Left Audio [opening...]"
 msgstr "Sol Ses [açılıyor...]"
 
-#: src/utils.c:3045
+#: src/utils.c:3021
 #, c-format
 msgid "Mono [%.2f sec]"
 msgstr "Mono [%.2f sn]"
 
-#: src/utils.c:3048
+#: src/utils.c:3023
 #, c-format
 msgid "Left Audio [%.2f sec]"
 msgstr "Sol Ses [%.2f sn]"
 
-#: src/utils.c:3056
+#: src/utils.c:3031
 msgid "Right Audio [opening...]"
 msgstr "Sağ Ses [açılıyor...]"
 
-#: src/utils.c:3059
+#: src/utils.c:3033
 #, c-format
 msgid "Right Audio [%.2f sec]"
 msgstr "Sağ Ses [%.2f sn]"
 
-#: src/utils.c:3506
+#: src/utils.c:3472
 msgid "LiVES cannot switch to mplayer whilst clips are loading."
 msgstr ""
 
-#: src/utils.c:3559
+#: src/utils.c:3525
 msgid "LiVES cannot switch to mplayer2 whilst clips are loading."
 msgstr ""
 
-#: src/utils.c:3809
+#: src/utils.c:3775
 msgid "Cleaning up clip"
 msgstr ""
 
-#: src/utils.c:3913
+#: src/utils.c:3874
 #, c-format
 msgid ""
 "\n"
@@ -3966,30 +3955,29 @@
 "\n"
 "Üzerine yazayım mı ?\n"
 
-#: src/utils.c:4305 src/utils.c:4337 src/multitrack.c:4503
+#: src/utils.c:4250 src/utils.c:4280 src/multitrack.c:4672
 #, c-format
 msgid "_Undo %s"
 msgstr "_Geri al %s"
 
-#: src/utils.c:4306 src/utils.c:4338 src/multitrack.c:4525
+#: src/utils.c:4251 src/utils.c:4281 src/multitrack.c:4693
 #, c-format
 msgid "_Redo %s"
 msgstr "_Yinele %s"
 
-#: src/utils.c:4363
+#: src/utils.c:4305
 msgid "-------------Selection------------"
 msgstr "------------- Seçim ------------"
 
-#. TRANSLATORS: - try to keep the text of the middle part the same length, by deleting "-" if necessary
-#: src/utils.c:4371
+#: src/utils.c:4313
 msgid " sec ] ----------Selection---------- [ "
 msgstr " sn ] ----------Seçim---------- [ "
 
-#: src/utils.c:4371
+#: src/utils.c:4314
 msgid " frames ] ----------"
 msgstr " çerçeve ] ----------"
 
-#: src/utils.c:5360
+#: src/utils.c:5302
 msgid ""
 "Your version of mplayer/ffmpeg may be broken !\n"
 "See http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2071\n"
@@ -4000,11 +3988,11 @@
 "Try running Help/Troubleshoot for more information."
 msgstr ""
 
-#: src/saveplay.c:178
+#: src/saveplay.c:179
 msgid "Examining file header"
 msgstr "Dosya başlığı incelenmesi"
 
-#: src/saveplay.c:315 src/saveplay.c:789
+#: src/saveplay.c:316 src/saveplay.c:779
 #, c-format
 msgid "Opening %s"
 msgstr "%s açılıyor"
@@ -4014,36 +4002,36 @@
 msgid "Opening %s start time %.2f sec. frames %d"
 msgstr ""
 
-#: src/saveplay.c:326 src/saveplay.c:4001
+#: src/saveplay.c:326 src/saveplay.c:3927
 msgid " without sound"
 msgstr " sessiz"
 
-#: src/saveplay.c:396
+#: src/saveplay.c:395
 #, c-format
 msgid "Opening audio for %s"
 msgstr ""
 
-#: src/saveplay.c:557
+#: src/saveplay.c:554
 #, c-format
 msgid "Auto trimming %.2f seconds of audio at start..."
 msgstr ""
 
-#: src/saveplay.c:567
+#: src/saveplay.c:562
 #, c-format
 msgid "Auto trimming %.2f seconds of audio at end..."
 msgstr ""
 
-#: src/saveplay.c:584
+#: src/saveplay.c:577
 #, c-format
 msgid "Auto padding with %.2f seconds of silence at start..."
 msgstr ""
 
-#: src/saveplay.c:599
+#: src/saveplay.c:590
 #, c-format
 msgid "Auto padding with %.2f seconds of silence at end..."
 msgstr ""
 
-#: src/saveplay.c:671
+#: src/saveplay.c:661
 #, c-format
 msgid ""
 "\n"
@@ -4055,11 +4043,11 @@
 "Are you sure you wish to continue ?"
 msgstr ""
 
-#: src/saveplay.c:685
+#: src/saveplay.c:676
 msgid " - please be patient."
 msgstr ""
 
-#: src/saveplay.c:938
+#: src/saveplay.c:926
 msgid ""
 "\n"
 "\n"
@@ -4067,7 +4055,7 @@
 "Please check the terminal window for more details.\n"
 msgstr ""
 
-#: src/saveplay.c:940
+#: src/saveplay.c:928
 msgid ""
 "\n"
 "\n"
@@ -4077,7 +4065,7 @@
 "\n"
 "Dosyayı açmak için mplayer yüklemeniz gerekebilir.\n"
 
-#: src/saveplay.c:948
+#: src/saveplay.c:934
 msgid ""
 "\n"
 "\n"
@@ -4089,29 +4077,29 @@
 "Lütfen Araçlar | Tercihler | Çözücü menüsündeki\n"
 "video ayarlarını kontrol edin.\n"
 
-#: src/saveplay.c:1014
+#: src/saveplay.c:995
 msgid "Adding image..."
 msgstr ""
 
-#: src/saveplay.c:1108
+#: src/saveplay.c:1089
 #, c-format
 msgid "Subtitles were saved as %s\n"
 msgstr ""
 
-#: src/saveplay.c:1192
+#: src/saveplay.c:1171
 #, c-format
 msgid "LiVES: Save Frame %d as..."
 msgstr ""
 
-#: src/saveplay.c:1195
+#: src/saveplay.c:1174
 msgid "LiVES: Save Frame as..."
 msgstr ""
 
-#: src/saveplay.c:1322
+#: src/saveplay.c:1303
 msgid "LiVES: Save Clip as..."
 msgstr ""
 
-#: src/saveplay.c:1390
+#: src/saveplay.c:1369
 msgid ""
 "Saving your video could lead to a loss of quality !\n"
 "You are strongly advised to 'Save As' to a new file.\n"
@@ -4119,34 +4107,34 @@
 "Do you still wish to continue ?"
 msgstr ""
 
-#: src/saveplay.c:1517 src/saveplay.c:1683 src/saveplay.c:1762
-#: src/saveplay.c:4014
+#: src/saveplay.c:1494 src/saveplay.c:1659 src/saveplay.c:1738
+#: src/saveplay.c:3940
 msgid "Pulling frames from clip"
 msgstr "Klipten çerçeveler alınıyor"
 
-#: src/saveplay.c:1588 src/saveplay.c:1727
+#: src/saveplay.c:1565 src/saveplay.c:1703
 msgid "Linking selection"
 msgstr "seçimi bağlama"
 
-#: src/saveplay.c:1779
+#: src/saveplay.c:1755
 msgid " (with no sound)\n"
 msgstr " (sessiz)\n"
 
-#: src/saveplay.c:1786
+#: src/saveplay.c:1761
 #, c-format
 msgid "Saving frames %d to %d%s as \"%s\" : encoder = %s : format = %s..."
 msgstr ""
 
-#: src/saveplay.c:1790
+#: src/saveplay.c:1765
 #, c-format
 msgid "Saving frames 1 to %d%s as \"%s\" : encoder %s : format = %s..."
 msgstr ""
 
-#: src/saveplay.c:1909
+#: src/saveplay.c:1890
 msgid "Saving [can take a long time]"
 msgstr "Kaydetmek [Uzun bir zaman alabilir]"
 
-#: src/saveplay.c:2057
+#: src/saveplay.c:2044
 msgid ""
 "\n"
 "\n"
@@ -4156,33 +4144,33 @@
 "\n"
 "Kodlama hatası - çıktı dosyası oluşturulamadı!\n"
 
-#: src/saveplay.c:2094
+#: src/saveplay.c:2081
 msgid "Clearing letterbox"
 msgstr ""
 
-#: src/saveplay.c:2183
+#: src/saveplay.c:2168
 #, c-format
 msgid "File size was %s\n"
 msgstr ""
 
-#: src/saveplay.c:2284
+#: src/saveplay.c:2265
 msgid "recording aborted by preview.\n"
 msgstr ""
 
-#: src/saveplay.c:2288
+#: src/saveplay.c:2268
 msgid "recording aborted by clipboard playback.\n"
 msgstr ""
 
-#: src/saveplay.c:2291
+#: src/saveplay.c:2270
 msgid "Recording performance..."
 msgstr "Kayıt performansı ..."
 
-#: src/saveplay.c:3293
+#: src/saveplay.c:3251
 #, c-format
 msgid "Average FPS was %.4f\n"
 msgstr "Ortalama  FPS %.4f\n"
 
-#: src/saveplay.c:3299
+#: src/saveplay.c:3256
 msgid ""
 "\n"
 "\n"
@@ -4191,16 +4179,21 @@
 "and resize all frames to the current size.\n"
 msgstr ""
 
-#: src/saveplay.c:3479
+#: src/saveplay.c:3429
 msgid "Unknown"
 msgstr "Bilinmeyen"
 
-#: src/saveplay.c:3588 src/saveplay.c:4585
+#: src/saveplay.c:3538 src/saveplay.c:4502
 #, c-format
 msgid "Untitled%d"
 msgstr "Adsız Belge%d"
 
-#: src/saveplay.c:3633
+#: src/saveplay.c:3567
+#, c-format
+msgid "%d frames are enough !\n"
+msgstr "%d çerçeve yeterli !\n"
+
+#: src/saveplay.c:3579
 #, c-format
 msgid ""
 "\n"
@@ -4208,7 +4201,7 @@
 "Bad things may happen with this clip.\n"
 msgstr ""
 
-#: src/saveplay.c:3723
+#: src/saveplay.c:3667
 #, c-format
 msgid ""
 "\n"
@@ -4220,12 +4213,12 @@
 "fps \n"
 "Ön tanımlılar Araçlar | Tercihler | Çeşitli menüsünden ayarlanabilir.\n"
 
-#: src/saveplay.c:3735
+#: src/saveplay.c:3677
 #, c-format
 msgid "Playback speed was adjusted to %.3f frames per second to fit audio.\n"
 msgstr ""
 
-#: src/saveplay.c:3754
+#: src/saveplay.c:3694
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d *bpp=Greyscale* fps=%.3f\n"
@@ -4234,7 +4227,7 @@
 "Çerçeveler=%d tipi=%s boyut=%dx%d *bpp=Gri tonlama* fps=%.3f\n"
 "Ses:"
 
-#: src/saveplay.c:3758 src/saveplay.c:4762
+#: src/saveplay.c:3698 src/saveplay.c:4671
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d bpp=%d fps=%.3f\n"
@@ -4243,54 +4236,54 @@
 "Çerçeveler=%d tipi=%s boyut=%dx%d bpp=%d fps=%.3f\n"
 "Ses:"
 
-#: src/saveplay.c:3762 src/saveplay.c:4766
+#: src/saveplay.c:3703 src/saveplay.c:4676
 #, c-format
 msgid "%s none\n"
 msgstr ""
 
-#: src/saveplay.c:3774
+#: src/saveplay.c:3714
 #, fuzzy, c-format
 msgid " - Author: %s\n"
 msgstr "Yayıncı: %s"
 
-#: src/saveplay.c:3779
+#: src/saveplay.c:3717
 #, fuzzy, c-format
 msgid " - Title: %s\n"
 msgstr " - Yorum: %s\n"
 
-#: src/saveplay.c:3784
+#: src/saveplay.c:3720
 #, c-format
 msgid " - Comment: %s\n"
 msgstr " - Yorum: %s\n"
 
-#: src/saveplay.c:3897
+#: src/saveplay.c:3829
 #, c-format
 msgid "Saving frame %d as %s..."
 msgstr ""
 
-#: src/saveplay.c:3996
+#: src/saveplay.c:3924
 #, c-format
 msgid "Backing up %s to %s"
 msgstr ""
 
-#: src/saveplay.c:4049
+#: src/saveplay.c:3975
 msgid "Backing up"
 msgstr "Yedekleniyor"
 
-#: src/saveplay.c:4083
+#: src/saveplay.c:4009
 msgid "performance data was backed up..."
 msgstr ""
 
-#: src/saveplay.c:4661
+#: src/saveplay.c:4574
 #, c-format
 msgid "Restoring %s..."
 msgstr "Yeniden Yükleniyor %s..."
 
-#: src/saveplay.c:4692
+#: src/saveplay.c:4603
 msgid "Restoring"
 msgstr "Yeniden Yükleniyor"
 
-#: src/saveplay.c:4714
+#: src/saveplay.c:4625
 #, c-format
 msgid ""
 "\n"
@@ -4300,22 +4293,22 @@
 msgstr ""
 
 #. TRANSLATORS: rec(ord) %.2f M(ega)B(ytes)
-#: src/saveplay.c:5207
+#: src/saveplay.c:5118
 #, c-format
 msgid "rec %.2f MB"
 msgstr "kayıt %.2f MB"
 
-#: src/saveplay.c:5213
+#: src/saveplay.c:5123
 #, c-format
 msgid "!rec %.2f MB"
 msgstr "!kayıt %.2f MB"
 
 #. TRANSLATORS: rec(ord) ?? M(ega)B(ytes)
-#: src/saveplay.c:5216
+#: src/saveplay.c:5126
 msgid "rec ?? MB"
 msgstr ""
 
-#: src/saveplay.c:5241
+#: src/saveplay.c:5151
 #, c-format
 msgid ""
 "\n"
@@ -4323,7 +4316,7 @@
 "Record stop level can be set in Preferences.\n"
 msgstr ""
 
-#: src/saveplay.c:5535
+#: src/saveplay.c:5447
 msgid ""
 "\n"
 "Files from a previous run of LiVES were found.\n"
@@ -4333,47 +4326,69 @@
 "LiVES ın bir önceki çalışmasından dosyalar bulundu.\n"
 "Onları kurtarmak için istiyor musunuz?\n"
 
-#: src/saveplay.c:5557
+#: src/saveplay.c:5469
 msgid "Recovering files"
 msgstr "Dosyalar kurtarılıyor"
 
-#: src/saveplay.c:5560
+#: src/saveplay.c:5472
 msgid "Recovering files..."
 msgstr "Dosyalar kurtarılıyor..."
 
-#: src/dialogs.c:72
+#: src/dialogs.c:71
 msgid "Show affected _layouts"
 msgstr "Etkilenen _yerleşim düzenini göster"
 
-#: src/dialogs.c:128
+#: src/dialogs.c:113
+msgid ""
+"Do _not show this warning any more\n"
+"(can be turned back on from Preferences/Warnings)"
+msgstr ""
+"bu ve diğer uyarıları gösterme.\n"
+"(Tercihler / Uyarılar dan tekrar geri dönülebilir)"
+
+#: src/dialogs.c:127
 msgid "_Recover disk space"
 msgstr ""
 
-#: src/dialogs.c:143
+#: src/dialogs.c:142
 msgid " _Advanced Settings >>"
 msgstr ""
 
-#: src/dialogs.c:184
+#: src/dialogs.c:183 src/dialogs.c:221
 msgid "LiVES: - Warning !"
 msgstr "LiVES: - Uyarı !"
 
 #: src/dialogs.c:194
+#, fuzzy
+msgid "LiVES: - Error !"
+msgstr "LiVES: - Uyarı !"
+
+#: src/dialogs.c:204
+#, fuzzy
+msgid "LiVES: - Information"
+msgstr "LIVES - Açma Konumu"
+
+#: src/dialogs.c:230
 msgid "LiVES: - Question"
 msgstr ""
 
-#: src/dialogs.c:204
+#: src/dialogs.c:239
 msgid "LiVES: - File Error"
 msgstr ""
 
-#: src/dialogs.c:208
+#: src/dialogs.c:241
 msgid "_Abort"
 msgstr ""
 
-#: src/dialogs.c:213
+#: src/dialogs.c:246
 msgid "_Retry"
 msgstr ""
 
-#: src/dialogs.c:597
+#: src/dialogs.c:306
+msgid "Show _Details"
+msgstr "_Detayları Göster"
+
+#: src/dialogs.c:657
 #, c-format
 msgid ""
 "FREE SPACE IN THE PARTITION CONTAINING\n"
@@ -4384,7 +4399,7 @@
 "(Disk warning levels can be configured in Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:615
+#: src/dialogs.c:676
 #, c-format
 msgid ""
 "Free space in the partition containing\n"
@@ -4396,11 +4411,11 @@
 "Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:627
+#: src/dialogs.c:688
 msgid "Audio players cannot be switched during playback."
 msgstr ""
 
-#: src/dialogs.c:632
+#: src/dialogs.c:694
 msgid ""
 "\n"
 "\n"
@@ -4412,25 +4427,25 @@
 "LiVES Bu işlemi yetersiz hafıza nedeniyle gerçekleştiremedi.\n"
 "Lütfen önce diğer bazı uygulamaları kapatarak deneyin.\n"
 
-#: src/dialogs.c:752
+#: src/dialogs.c:820
 msgid "Processing has been paused."
 msgstr ""
 
-#: src/dialogs.c:937
+#: src/dialogs.c:1002
 #, c-format
 msgid ""
 "\n"
 "%s%d%% done. Time remaining: %u sec%s\n"
 msgstr ""
 
-#: src/dialogs.c:1335
+#: src/dialogs.c:1391
 #, c-format
 msgid ""
 "\n"
 "%d/%d frames opened. Time remaining %u sec.\n"
 msgstr ""
 
-#: src/dialogs.c:1337
+#: src/dialogs.c:1393
 #, c-format
 msgid ""
 "\n"
@@ -4439,7 +4454,7 @@
 "\n"
 "%d/%d çerçeve açıldı.\n"
 
-#: src/dialogs.c:1341
+#: src/dialogs.c:1396
 #, c-format
 msgid ""
 "\n"
@@ -4448,7 +4463,7 @@
 "\n"
 "%d çerçeve açıldı.\n"
 
-#: src/dialogs.c:1940
+#: src/dialogs.c:1993
 #, c-format
 msgid ""
 "\n"
@@ -4457,7 +4472,7 @@
 "\n"
 "Kalan süre:% d saniye"
 
-#: src/dialogs.c:1988
+#: src/dialogs.c:2040
 #, c-format
 msgid ""
 "\n"
@@ -4468,7 +4483,7 @@
 "Üzgünüz, LiVES bir seferde sadece d% dosya açabilirsiniz \n"
 "Lütfen bir dosyayı kapatın ve yeniden deneyin."
 
-#: src/dialogs.c:1994
+#: src/dialogs.c:2047
 #, c-format
 msgid ""
 "LiVES was unable to write to its temporary directory.\n"
@@ -4487,7 +4502,7 @@
 "\n"
 "Lütfen bu dizine yazabilir olduğuna emin olun."
 
-#: src/dialogs.c:2005
+#: src/dialogs.c:2059
 #, fuzzy
 msgid ""
 "\n"
@@ -4498,13 +4513,13 @@
 "LiVES  çalışması için 'mplayer' veya 'sox'  gereklidir. Lütfen birini yada "
 "her ikisini yükleyin ve yeniden deneyin.\n"
 
-#: src/dialogs.c:2010
+#: src/dialogs.c:2064
 msgid ""
 "Audio was not loaded; please install mplayer or mplayer2 if you expected "
 "audio for this clip.\n"
 msgstr ""
 
-#: src/dialogs.c:2014
+#: src/dialogs.c:2069
 msgid ""
 "Audio resampling is required for this format.\n"
 "Please install 'sox'\n"
@@ -4515,7 +4530,7 @@
 "veya Araçlar | Tercihler | Kodlayıcı  menüsünden başka kodlama biçimini "
 "ayarlayın.\n"
 
-#: src/dialogs.c:2019
+#: src/dialogs.c:2075
 msgid ""
 "\n"
 "\n"
@@ -4523,19 +4538,19 @@
 "Please set the audio codec in Tools|Preferences|Encoding\n"
 msgstr ""
 
-#: src/dialogs.c:2024
+#: src/dialogs.c:2080
 msgid ""
 "This layout includes generated frames.\n"
 "It cannot be saved, you must render it to a clip first.\n"
 msgstr ""
 
-#: src/dialogs.c:2029
+#: src/dialogs.c:2085
 msgid ""
 "This layout includes generated or recorded audio.\n"
 "It cannot be saved, you must render it to a clip first.\n"
 msgstr ""
 
-#: src/dialogs.c:2039 src/dialogs.c:2137
+#: src/dialogs.c:2095 src/dialogs.c:2189
 #, c-format
 msgid ""
 "\n"
@@ -4543,83 +4558,83 @@
 "Due to restrictions in the %s format\n"
 msgstr ""
 
-#: src/dialogs.c:2059
+#: src/dialogs.c:2115
 msgid ""
 "LiVES recommends the following settings:\n"
 "\n"
 msgstr ""
 
-#: src/dialogs.c:2065 src/dialogs.c:2174 src/resample.c:850
+#: src/dialogs.c:2121 src/dialogs.c:2225 src/resample.c:839
 msgid ", signed"
 msgstr ", Imzalandı"
 
-#: src/dialogs.c:2066 src/dialogs.c:2175 src/resample.c:853
+#: src/dialogs.c:2122 src/dialogs.c:2226 src/resample.c:841
 msgid ", unsigned"
 msgstr ", imzasız"
 
-#: src/dialogs.c:2070 src/dialogs.c:2179 src/resample.c:858
+#: src/dialogs.c:2126 src/dialogs.c:2230 src/resample.c:846
 msgid ", little-endian"
 msgstr ""
 
-#: src/dialogs.c:2071 src/dialogs.c:2180 src/resample.c:861
+#: src/dialogs.c:2127 src/dialogs.c:2231 src/resample.c:848
 msgid ", big-endian"
 msgstr ""
 
-#: src/dialogs.c:2077
+#: src/dialogs.c:2132
 #, c-format
 msgid "Use an audio rate of %d Hz%s%s\n"
 msgstr ""
 
-#: src/dialogs.c:2085
+#: src/dialogs.c:2140
 #, c-format
 msgid "Set video rate to %.3f frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:2089
+#: src/dialogs.c:2143
 #, c-format
 msgid "Set video rate to %d:%d frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:2094 src/dialogs.c:2209
+#: src/dialogs.c:2148 src/dialogs.c:2258
 #, c-format
 msgid "Set video size to %d x %d pixels\n"
 msgstr "%d x %d piksel için dosya boyutu ayarla\n"
 
-#: src/dialogs.c:2102 src/dialogs.c:2208
+#: src/dialogs.c:2156 src/dialogs.c:2257
 msgid ""
 "\n"
 "You may wish to:\n"
 msgstr ""
 
-#: src/dialogs.c:2105 src/dialogs.c:2200
+#: src/dialogs.c:2159 src/dialogs.c:2249
 #, c-format
 msgid "resize video to %d x %d pixels\n"
 msgstr "%d x %d piksel için dosya boyutu\n"
 
-#: src/dialogs.c:2110
+#: src/dialogs.c:2163
 msgid "disable audio, since the target encoder cannot encode audio\n"
 msgstr ""
 
-#: src/dialogs.c:2170
+#: src/dialogs.c:2221
 msgid "LiVES must:\n"
 msgstr "LiVES gerekli:\n"
 
-#: src/dialogs.c:2185
+#: src/dialogs.c:2235
 #, c-format
 msgid "resample audio to %d Hz%s%s\n"
 msgstr ""
 
-#: src/dialogs.c:2192
+#: src/dialogs.c:2242
 #, c-format
 msgid "resample video to %.3f frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:2196
+#: src/dialogs.c:2245
 #, c-format
 msgid "resample video to %d:%d frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:2215
+#: src/dialogs.c:2263
 msgid ""
 "\n"
 "You will be able to undo these changes afterwards.\n"
@@ -4628,14 +4643,14 @@
 "\n"
 msgstr ""
 
-#: src/dialogs.c:2218
+#: src/dialogs.c:2265
 msgid ""
 "\n"
 "Changes applied to the selection will not be permanent.\n"
 "\n"
 msgstr ""
 
-#: src/dialogs.c:2237
+#: src/dialogs.c:2285
 msgid ""
 "\n"
 "\n"
@@ -4644,7 +4659,7 @@
 "Try recording for just a selection of the file."
 msgstr ""
 
-#: src/dialogs.c:2244
+#: src/dialogs.c:2293
 msgid ""
 "The playback speed (fps), or the audio rate\n"
 " of the clipboard does not match\n"
@@ -4655,7 +4670,7 @@
 "Please press Cancel to abort the insert, or OK to continue."
 msgstr ""
 
-#: src/dialogs.c:2253
+#: src/dialogs.c:2304
 #, c-format
 msgid ""
 "When opening a yuvmpeg stream, you should first create a fifo file in:\n"
@@ -4668,11 +4683,11 @@
 "click Cancel."
 msgstr ""
 
-#: src/dialogs.c:2305
+#: src/dialogs.c:2356
 msgid "Show Keys"
 msgstr "Kısayol Tuşları Göster"
 
-#: src/dialogs.c:2306
+#: src/dialogs.c:2358
 msgid ""
 "You can use the following keys during playback to control LiVES:-\n"
 "\n"
@@ -4714,11 +4729,11 @@
 "g                             ping pong loops\n"
 msgstr ""
 
-#: src/dialogs.c:2313
+#: src/dialogs.c:2365
 msgid "Multitrack Keys"
 msgstr "Çoklu parça kip tuşları"
 
-#: src/dialogs.c:2314
+#: src/dialogs.c:2367
 msgid ""
 "You can use the following keys to control the multitrack window:-\n"
 "\n"
@@ -4740,18 +4755,18 @@
 "For other keys, see the menus.\n"
 msgstr ""
 
-#: src/dialogs.c:2322
+#: src/dialogs.c:2375
 msgid "Message History"
 msgstr "Mesaj geçmişi"
 
-#: src/dialogs.c:2335
+#: src/dialogs.c:2388
 #, c-format
 msgid ""
 "After upgrading/installing, you may need to adjust the <prefix_dir> setting "
 "in your %s file"
 msgstr ""
 
-#: src/dialogs.c:2344
+#: src/dialogs.c:2399
 #, c-format
 msgid ""
 "\n"
@@ -4762,7 +4777,7 @@
 "or change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/dialogs.c:2352
+#: src/dialogs.c:2408
 msgid ""
 "Sorry, unknown audio type.\n"
 "\n"
@@ -4772,18 +4787,18 @@
 "\n"
 " (Dosya adları ile sona ermelidir .mp3,. .ogg, .wav,. .mod, .xm veya .it)"
 
-#: src/dialogs.c:2353
+#: src/dialogs.c:2409
 msgid "failed (unknown type)\n"
 msgstr "başarısız (Bilinmeyen tip)\n"
 
-#: src/dialogs.c:2358
+#: src/dialogs.c:2415
 msgid ""
 "\n"
 "Do you wish to remove the layout files associated with this set ?\n"
 "(They will not be usable without the set).\n"
 msgstr ""
 
-#: src/dialogs.c:2363
+#: src/dialogs.c:2421
 #, c-format
 msgid ""
 "\n"
@@ -4792,7 +4807,7 @@
 "Click Cancel to pick a new name.\n"
 msgstr ""
 
-#: src/dialogs.c:2370
+#: src/dialogs.c:2429
 msgid ""
 "\n"
 "Frames from this clip are used in some multitrack layouts.\n"
@@ -4800,7 +4815,7 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2374
+#: src/dialogs.c:2433
 msgid ""
 "\n"
 "Audio from this clip is used in some multitrack layouts.\n"
@@ -4808,7 +4823,7 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2378
+#: src/dialogs.c:2438
 #, c-format
 msgid ""
 "\n"
@@ -4819,7 +4834,7 @@
 "Otherwise click Cancel to skip loading this file.\n"
 msgstr ""
 
-#: src/dialogs.c:2385
+#: src/dialogs.c:2446
 #, c-format
 msgid ""
 "\n"
@@ -4829,7 +4844,7 @@
 "The clip could not be loaded.\n"
 msgstr ""
 
-#: src/dialogs.c:2392
+#: src/dialogs.c:2455
 msgid ""
 "\n"
 "Dear user, the jack developers decided to remove the -Z option from jackd.\n"
@@ -4837,7 +4852,7 @@
 "Alternately, select a different audio player in Preferences.\n"
 msgstr ""
 
-#: src/dialogs.c:2396
+#: src/dialogs.c:2460
 msgid ""
 "\n"
 "Unable to start up jack. Please ensure that alsa is set up correctly on your "
@@ -4846,13 +4861,13 @@
 "Automatic jack startup will be disabled now.\n"
 msgstr ""
 
-#: src/dialogs.c:2402
+#: src/dialogs.c:2466
 msgid ""
 "\n"
 "Unable to connect to jack server. Please start jack before starting LiVES\n"
 msgstr ""
 
-#: src/dialogs.c:2411
+#: src/dialogs.c:2475
 #, c-format
 msgid ""
 "\n"
@@ -4863,13 +4878,13 @@
 "%s\n"
 msgstr ""
 
-#: src/dialogs.c:2418
+#: src/dialogs.c:2482
 msgid ""
 "\n"
 "Alternately, you can restart LiVES and select another audio player.\n"
 msgstr ""
 
-#: src/dialogs.c:2423
+#: src/dialogs.c:2488
 #, c-format
 msgid ""
 "\n"
@@ -4879,7 +4894,7 @@
 "It is recommended to increase it to at least %d MB"
 msgstr ""
 
-#: src/dialogs.c:2429
+#: src/dialogs.c:2496
 #, c-format
 msgid ""
 "\n"
@@ -4888,7 +4903,7 @@
 "Do you wish to delete them ?\n"
 msgstr ""
 
-#: src/dialogs.c:2436
+#: src/dialogs.c:2504
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for multitrack undo.\n"
@@ -4896,7 +4911,7 @@
 "using Preferences/Multitrack/Undo Memory\n"
 msgstr ""
 
-#: src/dialogs.c:2440
+#: src/dialogs.c:2508
 msgid ""
 "\n"
 "Out of memory for undo.\n"
@@ -4904,63 +4919,63 @@
 "using Preferences/Multitrack/Undo Memory\n"
 msgstr ""
 
-#: src/dialogs.c:2444
+#: src/dialogs.c:2512
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for the multitrack undo buffer.\n"
 msgstr ""
 
-#: src/dialogs.c:2446
+#: src/dialogs.c:2514
 msgid "or enter a smaller value.\n"
 msgstr ""
 
-#: src/dialogs.c:2448
+#: src/dialogs.c:2516
 msgid "Try again from the clip editor, try closing some other applications\n"
 msgstr ""
 
-#: src/dialogs.c:2449
+#: src/dialogs.c:2517
 msgid "Try closing some other applications\n"
 msgstr ""
 
-#: src/dialogs.c:2460
+#: src/dialogs.c:2529
 msgid ""
 "Multitrack is set to 0 audio channels, but this layout has audio.\n"
 "You should adjust the audio settings from the Tools menu.\n"
 msgstr ""
 
-#: src/dialogs.c:2464
+#: src/dialogs.c:2534
 msgid ""
 "The current layout has audio, so audio channels may not be set to zero.\n"
 msgstr ""
 
-#: src/dialogs.c:2468
+#: src/dialogs.c:2539
 msgid ""
 "Multitrack audio preview is only available with the\n"
 "\"jack\" or \"pulse audio\" audio player.\n"
 "You can set this in Tools|Preferences|Playback."
 msgstr ""
 
-#: src/dialogs.c:2472
+#: src/dialogs.c:2545
 msgid ""
 "Errors were detected in the layout (which may be due to transferring from "
 "another system, or from an older version of LiVES).\n"
 "Should I try to repair the disk copy of the layout ?\n"
 msgstr ""
 
-#: src/dialogs.c:2476
+#: src/dialogs.c:2549
 msgid ""
 "LiVES was unable to load the layout.\n"
 "Sorry.\n"
 msgstr ""
 
-#: src/dialogs.c:2482
+#: src/dialogs.c:2555
 msgid ""
 "\n"
 "\n"
 "Audio rate must be greater than 0.\n"
 msgstr ""
 
-#: src/dialogs.c:2486
+#: src/dialogs.c:2559
 msgid ""
 "\n"
 "Event list will be very large\n"
@@ -4968,14 +4983,14 @@
 "Are you sure you wish to view it ?\n"
 msgstr ""
 
-#: src/dialogs.c:2491
+#: src/dialogs.c:2564
 msgid ""
 "\n"
 "\n"
 "You must install 'dvgrab' to use this function.\n"
 msgstr ""
 
-#: src/dialogs.c:2496
+#: src/dialogs.c:2570
 msgid ""
 "\n"
 "\n"
@@ -4984,25 +4999,25 @@
 "You may need to select one of these in Tools/Preferences/Playback.\n"
 msgstr ""
 
-#: src/dialogs.c:2500
+#: src/dialogs.c:2574
 msgid "Video playback plugin failed to initialise palette !\n"
 msgstr ""
 
-#: src/dialogs.c:2504
+#: src/dialogs.c:2579
 msgid "Decoder plugin failed to initialise palette !\n"
 msgstr ""
 
-#: src/dialogs.c:2509
+#: src/dialogs.c:2584
 msgid "Unable to set framerate of video plugin\n"
 msgstr ""
 
-#: src/dialogs.c:2514
+#: src/dialogs.c:2590
 msgid ""
 "After a crash, it is advisable to clean up the disk with\n"
 "File|Clean up disk space\n"
 msgstr ""
 
-#: src/dialogs.c:2526
+#: src/dialogs.c:2604
 #, c-format
 msgid ""
 "Stream frame size is too large for your network buffers.\n"
@@ -5011,33 +5026,33 @@
 "echo %d > /proc/sys/net/core/rmem_max\n"
 msgstr ""
 
-#: src/dialogs.c:2714
+#: src/dialogs.c:2800
 msgid "cancelled.\n"
 msgstr "iptal edildi.\n"
 
-#: src/dialogs.c:2721
+#: src/dialogs.c:2805
 msgid "failed.\n"
 msgstr "başarısız.\n"
 
-#: src/dialogs.c:2728
+#: src/dialogs.c:2810
 msgid "done.\n"
 msgstr "tamam.\n"
 
-#: src/dialogs.c:2732
+#: src/dialogs.c:2814
 msgid "error in file. Failed.\n"
 msgstr "Başarısız . dosyada hata\n"
 
-#: src/dialogs.c:2766 src/dialogs.c:2815 src/dialogs.c:2839
+#: src/dialogs.c:2848 src/dialogs.c:2897 src/dialogs.c:2921
 #, c-format
 msgid "Additional info: %s\n"
 msgstr ""
 
-#: src/dialogs.c:2769
+#: src/dialogs.c:2851
 #, c-format
 msgid "The error value was %d%s\n"
 msgstr ""
 
-#: src/dialogs.c:2772
+#: src/dialogs.c:2854
 #, c-format
 msgid ""
 "\n"
@@ -5047,7 +5062,7 @@
 "%s%s%s"
 msgstr ""
 
-#: src/dialogs.c:2818
+#: src/dialogs.c:2900
 #, c-format
 msgid ""
 "\n"
@@ -5057,7 +5072,7 @@
 "%s"
 msgstr ""
 
-#: src/dialogs.c:2842
+#: src/dialogs.c:2924
 #, c-format
 msgid ""
 "\n"
@@ -5067,7 +5082,7 @@
 "%s"
 msgstr ""
 
-#: src/dialogs.c:2886
+#: src/dialogs.c:2968
 #, c-format
 msgid ""
 "\n"
@@ -5076,7 +5091,7 @@
 "Please check for possible error causes.\n"
 msgstr ""
 
-#: src/dialogs.c:2890
+#: src/dialogs.c:2971
 #, c-format
 msgid ""
 "\n"
@@ -5086,7 +5101,7 @@
 "%s.\n"
 msgstr ""
 
-#: src/dialogs.c:2921
+#: src/dialogs.c:3002
 #, c-format
 msgid ""
 "\n"
@@ -5095,7 +5110,7 @@
 "Please check for possible error causes.\n"
 msgstr ""
 
-#: src/dialogs.c:2925
+#: src/dialogs.c:3005
 #, c-format
 msgid ""
 "\n"
@@ -5105,12 +5120,12 @@
 "%s.\n"
 msgstr ""
 
-#: src/dialogs.c:2993
+#: src/dialogs.c:3073
 #, c-format
 msgid "Value for \"%s\" could not be read."
 msgstr ""
 
-#: src/dialogs.c:3011
+#: src/dialogs.c:3091
 #, c-format
 msgid ""
 "\n"
@@ -5119,7 +5134,7 @@
 "Please check your system for errors.\n"
 msgstr ""
 
-#: src/dialogs.c:3020
+#: src/dialogs.c:3100
 #, c-format
 msgid ""
 "\n"
@@ -5128,7 +5143,7 @@
 "Please check the file permissions and try again."
 msgstr ""
 
-#: src/dialogs.c:3027
+#: src/dialogs.c:3109
 #, c-format
 msgid ""
 "\n"
@@ -5137,7 +5152,7 @@
 "Please check the directory permissions and try again."
 msgstr ""
 
-#: src/dialogs.c:3034
+#: src/dialogs.c:3116
 #, c-format
 msgid ""
 "\n"
@@ -5145,14 +5160,14 @@
 "%s\n"
 msgstr ""
 
-#: src/dialogs.c:3041
+#: src/dialogs.c:3123
 msgid ""
 "\n"
 "Abort and exit immediately from LiVES\n"
 "Are you sure ?\n"
 msgstr ""
 
-#: src/dialogs.c:3047
+#: src/dialogs.c:3129
 #, c-format
 msgid ""
 "\n"
@@ -5160,13 +5175,13 @@
 "Please select another encoder from the list.\n"
 msgstr ""
 
-#: src/dialogs.c:3056
+#: src/dialogs.c:3139
 msgid ""
 "\n"
 "This card is already in use and cannot be opened multiple times.\n"
 msgstr ""
 
-#: src/dialogs.c:3061
+#: src/dialogs.c:3145
 #, c-format
 msgid ""
 "\n"
@@ -5176,27 +5191,27 @@
 "- Check if the device actually exists.\n"
 msgstr ""
 
-#: src/dialogs.c:3068
+#: src/dialogs.c:3153
 msgid ""
 "\n"
 "This file already has subtitles loaded.\n"
 "Do you wish to overwrite the existing subtitles ?\n"
 msgstr ""
 
-#: src/dialogs.c:3072
+#: src/dialogs.c:3157
 msgid ""
 "\n"
 "LiVES currently only supports subtitles of type .srt and .sub.\n"
 msgstr ""
 
-#: src/dialogs.c:3076
+#: src/dialogs.c:3161
 msgid ""
 "\n"
 "Erase all subtitles from this clip.\n"
 "Are you sure ?\n"
 msgstr ""
 
-#: src/dialogs.c:3082
+#: src/dialogs.c:3168
 #, c-format
 msgid ""
 "\n"
@@ -5205,14 +5220,14 @@
 "or OK to continue and save as type \"%s\"\n"
 msgstr ""
 
-#: src/dialogs.c:3089
+#: src/dialogs.c:3176
 msgid ""
 "\n"
 "Do you wish to move the current clip sets to the new directory ?\n"
 "(If unsure, click Yes)\n"
 msgstr ""
 
-#: src/dialogs.c:3093
+#: src/dialogs.c:3181
 #, c-format
 msgid ""
 "\n"
@@ -5223,19 +5238,19 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:3099
+#: src/dialogs.c:3188
 msgid ""
 "\n"
 "No video input devices could be found.\n"
 msgstr ""
 
-#: src/dialogs.c:3103
+#: src/dialogs.c:3192
 msgid ""
 "\n"
 "All video input devices are already in use.\n"
 msgstr ""
 
-#: src/dialogs.c:3107
+#: src/dialogs.c:3196
 msgid ""
 "\n"
 "\n"
@@ -5243,15 +5258,14 @@
 "DO NOT SHUT DOWN OR CLOSE LIVES !\n"
 msgstr ""
 
-#: src/dialogs.c:3127
+#: src/dialogs.c:3203
 #, c-format
 msgid ""
 "No clips were recovered for set (%s).\n"
 "Please check the spelling of the set name and try again.\n"
 msgstr ""
 
-#. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:3136
+#: src/dialogs.c:3214
 #, c-format
 msgid ""
 "\n"
@@ -5263,7 +5277,7 @@
 msgstr ""
 
 #. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:3144
+#: src/dialogs.c:3222
 #, c-format
 msgid ""
 "\n"
@@ -5272,34 +5286,34 @@
 "\n"
 msgstr ""
 
-#: src/dialogs.c:3150
+#: src/dialogs.c:3228
 msgid ""
 "\n"
 "You must have autolives.pl installed and in your path to use this toy.\n"
 "Consult your package distributor.\n"
 msgstr ""
 
-#: src/dialogs.c:3154
+#: src/dialogs.c:3232
 msgid ""
 "\n"
 "You must have a minimum of one clip loaded to use this toy.\n"
 msgstr ""
 
-#: src/dialogs.c:3158
+#: src/dialogs.c:3236
 msgid ""
 "\n"
 "LiVES lost its connection to jack and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:3162
+#: src/dialogs.c:3240
 msgid ""
 "\n"
 "LiVES lost its connection to pulseaudio and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:3175
+#: src/dialogs.c:3254
 #, c-format
 msgid ""
 "\n"
@@ -5308,285 +5322,285 @@
 "Do you wish to allow this (for this session only) ?\n"
 msgstr ""
 
-#: src/effects.c:60
+#: src/effects.c:61
 msgid "generator"
 msgstr "üretici"
 
-#: src/effects.c:61
+#: src/effects.c:62
 msgid "Generators"
 msgstr ""
 
-#: src/effects.c:63
+#: src/effects.c:64
 msgid "audio generator"
 msgstr ""
 
-#: src/effects.c:64
+#: src/effects.c:65
 msgid "Audio Generators"
 msgstr ""
 
-#: src/effects.c:66
+#: src/effects.c:67
 msgid "audio/video generator"
 msgstr ""
 
-#: src/effects.c:67
+#: src/effects.c:68
 msgid "Audio/Video Generators"
 msgstr ""
 
-#: src/effects.c:69
+#: src/effects.c:70
 msgid "data generator"
 msgstr ""
 
-#: src/effects.c:70
+#: src/effects.c:71
 msgid "Data Generators"
 msgstr ""
 
-#: src/effects.c:72
+#: src/effects.c:73
 msgid "data visualiser"
 msgstr ""
 
-#: src/effects.c:73
+#: src/effects.c:74
 msgid "Data Visualisers"
 msgstr ""
 
-#: src/effects.c:75
+#: src/effects.c:76
 msgid "data processor"
 msgstr ""
 
-#: src/effects.c:76
+#: src/effects.c:77
 msgid "Data Processors"
 msgstr ""
 
-#: src/effects.c:78
+#: src/effects.c:79
 msgid "data source"
 msgstr ""
 
-#: src/effects.c:79
+#: src/effects.c:80
 msgid "Data Sources"
 msgstr ""
 
-#: src/effects.c:81
+#: src/effects.c:82
 msgid "transition"
 msgstr "geçiş"
 
-#: src/effects.c:82
+#: src/effects.c:83
 msgid "Transitions"
 msgstr "Geçişler"
 
-#: src/effects.c:84
+#: src/effects.c:85
 msgid "effect"
 msgstr "efekt"
 
-#: src/effects.c:87 src/rfx-builder.c:187
+#: src/effects.c:88 src/rfx-builder.c:187
 msgid "utility"
 msgstr ""
 
-#: src/effects.c:88
+#: src/effects.c:89
 msgid "Utilities"
 msgstr "Yardımcı Araçlar"
 
-#: src/effects.c:90
+#: src/effects.c:91
 msgid "compositor"
 msgstr ""
 
-#: src/effects.c:91
+#: src/effects.c:92
 msgid "Compositors"
 msgstr ""
 
-#: src/effects.c:93
+#: src/effects.c:94
 msgid "tap"
 msgstr ""
 
-#: src/effects.c:94
+#: src/effects.c:95
 msgid "Taps"
 msgstr ""
 
-#: src/effects.c:96
+#: src/effects.c:97
 msgid "splitter"
 msgstr "ayrac"
 
-#: src/effects.c:97
+#: src/effects.c:98
 msgid "Splitters"
 msgstr ""
 
-#: src/effects.c:99
+#: src/effects.c:100
 msgid "converter"
 msgstr "dönüştürücü"
 
-#: src/effects.c:100
+#: src/effects.c:101
 msgid "Converters"
 msgstr "dönüştürücüler"
 
-#: src/effects.c:102
+#: src/effects.c:103
 msgid "analyser"
 msgstr ""
 
-#: src/effects.c:103
+#: src/effects.c:104
 msgid "Analysers"
 msgstr ""
 
-#: src/effects.c:108
+#: src/effects.c:109
 msgid "audio/video"
 msgstr "ses / video"
 
-#: src/effects.c:109
+#: src/effects.c:110
 msgid "Audio/Video Transitions"
 msgstr "Ses/Video geçişleri"
 
-#: src/effects.c:111
+#: src/effects.c:112
 msgid "video only"
 msgstr "sadece video"
 
-#: src/effects.c:112
+#: src/effects.c:113
 msgid "Video only Transitions"
 msgstr "Sadece Video Geçişleri"
 
-#: src/effects.c:114 src/multitrack.c:10740
+#: src/effects.c:115 src/multitrack.c:10962
 msgid "audio only"
 msgstr "sadece ses"
 
-#: src/effects.c:115
+#: src/effects.c:116
 msgid "Audio only Transitions"
 msgstr "Sadece  Ses Geçişleri"
 
-#: src/effects.c:117 src/effects.c:120 src/multitrack.c:18757
+#: src/effects.c:118 src/effects.c:121 src/multitrack.c:19097
 msgid "audio"
 msgstr "ses"
 
-#: src/effects.c:118
+#: src/effects.c:119
 msgid "Audio Mixers"
 msgstr "Ses Mikserleri"
 
-#: src/effects.c:121
+#: src/effects.c:122
 msgid "Audio Effects"
 msgstr "Ses Efekti"
 
-#: src/effects.c:123
+#: src/effects.c:124
 msgid "video"
 msgstr ""
 
-#: src/effects.c:124
+#: src/effects.c:125
 msgid "Video Effects"
 msgstr ""
 
-#: src/effects.c:126
+#: src/effects.c:127
 msgid "audio volume controller"
 msgstr ""
 
-#: src/effects.c:127
+#: src/effects.c:128
 msgid "Audio Volume Controllers"
 msgstr "Ses Seviye Kontrolleri"
 
-#: src/effects.c:129
+#: src/effects.c:130
 msgid "video analyser"
 msgstr ""
 
-#: src/effects.c:130
+#: src/effects.c:131
 msgid "Video analysers"
 msgstr ""
 
-#: src/effects.c:132
+#: src/effects.c:133
 msgid "audio analyser"
 msgstr ""
 
-#: src/effects.c:133
+#: src/effects.c:134
 msgid "Audio Analysers"
 msgstr ""
 
-#: src/effects.c:137 src/plugins.c:2559 src/plugins.c:2573
+#: src/effects.c:138 src/plugins.c:2507 src/plugins.c:2521
 msgid "unknown"
 msgstr "bilinmeyen"
 
-#: src/effects.c:238
+#: src/effects.c:235
 #, c-format
 msgid "%s all frames..."
 msgstr "%s tüm kareler..."
 
-#: src/effects.c:243
+#: src/effects.c:239
 #, c-format
 msgid "%s clipboard into frames %d to %d..."
 msgstr ""
 
-#: src/effects.c:250
+#: src/effects.c:245
 #, c-format
 msgid "%s to clipboard..."
 msgstr "Panoya %s ..."
 
-#: src/effects.c:254
+#: src/effects.c:248
 #, c-format
 msgid "%s to new clip..."
 msgstr "Yeni klip için %s ..."
 
-#: src/effects.c:259
+#: src/effects.c:252
 #, c-format
 msgid "%s frames %d to %d..."
 msgstr ""
 
-#: src/effects.c:290
+#: src/effects.c:283
 #, c-format
 msgid "%s clipboard with selection"
 msgstr ""
 
-#: src/effects.c:295
+#: src/effects.c:287
 #, c-format
 msgid "%s to clipboard"
 msgstr ""
 
-#: src/effects.c:299
+#: src/effects.c:290
 #, c-format
 msgid "%s to new clip"
 msgstr "Yeni klip için %s"
 
-#: src/effects.c:304
+#: src/effects.c:294
 #, c-format
 msgid "%s frames %d to %d"
 msgstr ""
 
-#: src/effects.c:456 src/effects.c:523
+#: src/effects.c:443 src/effects.c:507
 msgid ""
 "\n"
 "No frames were generated.\n"
 msgstr ""
 
-#: src/effects-weed.c:431
+#: src/effects-weed.c:452
 msgid "integer"
 msgstr ""
 
-#: src/effects-weed.c:432
+#: src/effects-weed.c:454
 msgid "int64"
 msgstr ""
 
-#: src/effects-weed.c:433
+#: src/effects-weed.c:456
 msgid "boolean"
 msgstr ""
 
-#: src/effects-weed.c:434
+#: src/effects-weed.c:458
 msgid "double"
 msgstr ""
 
-#: src/effects-weed.c:435
+#: src/effects-weed.c:460
 msgid "string"
 msgstr ""
 
-#: src/effects-weed.c:436
+#: src/effects-weed.c:462
 msgid "pointer"
 msgstr ""
 
-#: src/effects-weed.c:4591
+#: src/effects-weed.c:4581
 #, c-format
 msgid "Error: plugin %s has no weed_setup() function.\n"
 msgstr ""
 
-#: src/effects-weed.c:4606
+#: src/effects-weed.c:4595
 #, c-format
 msgid "No usable filters found in plugin %s\n"
 msgstr ""
 
-#: src/effects-weed.c:4680
+#: src/effects-weed.c:4668
 #, c-format
 msgid "Found duplicate plugin %s"
 msgstr ""
 
-#: src/effects-weed.c:4734
+#: src/effects-weed.c:4723
 #, c-format
 msgid ""
 "Info: Unable to load plugin %s\n"
@@ -5595,259 +5609,259 @@
 "Bilgi: %s eklentisi yüklenemiyor\n"
 "Hata:% s\n"
 
-#: src/effects-weed.c:4737 src/effects-weed.c:5858
+#: src/effects-weed.c:4726 src/effects-weed.c:5847
 msgid "Some plugin directories"
 msgstr ""
 
 #. TRANSLATORS: example " - LADSPA plugins -"
-#: src/effects-weed.c:4812 src/rte_window.c:2105
+#: src/effects-weed.c:4801 src/rte_window.c:2107
 #, c-format
 msgid " - %s plugins -"
 msgstr ""
 
-#: src/effects-weed.c:5012
+#: src/effects-weed.c:4998
 #, c-format
 msgid "Successfully loaded %d Weed filters\n"
 msgstr "%d Weed filtresi başarıyla yüklendi\n"
 
-#: src/effects-weed.c:5177
+#: src/effects-weed.c:5162
 #, c-format
 msgid "Invalid compound effect %s - has conflicting target_fps\n"
 msgstr ""
 
-#: src/effects-weed.c:5197
+#: src/effects-weed.c:5182
 #, c-format
 msgid "Invalid compound effect %s - has multiple transition parameters\n"
 msgstr ""
 
-#: src/effects-weed.c:5211
+#: src/effects-weed.c:5196
 #, c-format
 msgid "Invalid compound effect %s - has multiple master volume parameters\n"
 msgstr ""
 
-#: src/effects-weed.c:5346
+#: src/effects-weed.c:5329
 #, c-format
 msgid "Invalid compound effect %s - must have >1 sub filters\n"
 msgstr ""
 
-#: src/effects-weed.c:5366
+#: src/effects-weed.c:5349
 #, c-format
 msgid "Invalid effect %s found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5381
+#: src/effects-weed.c:5364
 #, c-format
 msgid "Invalid default found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5392
+#: src/effects-weed.c:5375
 #, c-format
 msgid "Invalid filter %d for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5406
+#: src/effects-weed.c:5389
 #, c-format
 msgid "Invalid param %d for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5433
+#: src/effects-weed.c:5416
 #, c-format
 msgid ""
 "Invalid number of values for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5467
+#: src/effects-weed.c:5450
 #, c-format
 msgid ""
 "Invalid non-boolean value for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5500
+#: src/effects-weed.c:5483
 #, c-format
 msgid "Invalid param link found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5511
+#: src/effects-weed.c:5494
 #, c-format
 msgid ""
 "Invalid out filter %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5529
+#: src/effects-weed.c:5513
 #, c-format
 msgid ""
 "Invalid out param %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5541
+#: src/effects-weed.c:5526
 #, c-format
 msgid ""
 "Invalid non-boolean value for autoscale found in compound effect %s, line "
 "%d\n"
 msgstr ""
 
-#: src/effects-weed.c:5552
+#: src/effects-weed.c:5537
 #, c-format
 msgid ""
 "Invalid in filter %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5566
+#: src/effects-weed.c:5552
 #, c-format
 msgid ""
 "Invalid in param %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5594
+#: src/effects-weed.c:5581
 #, c-format
 msgid "Invalid channel link found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5605
+#: src/effects-weed.c:5592
 #, c-format
 msgid ""
 "Invalid out filter %d for link channels found in compound effect %s, line "
 "%d\n"
 msgstr ""
 
-#: src/effects-weed.c:5623
+#: src/effects-weed.c:5611
 #, c-format
 msgid ""
 "Invalid out channel %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5633
+#: src/effects-weed.c:5622
 #, c-format
 msgid ""
 "Invalid in filter %d for link channels found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5651
+#: src/effects-weed.c:5641
 #, c-format
 msgid ""
 "Invalid in channel %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5687
+#: src/effects-weed.c:5678
 #, c-format
 msgid "Compound:%s"
 msgstr ""
 
-#: src/effects-weed.c:5758
+#: src/effects-weed.c:5749
 #, c-format
 msgid "Successfully loaded %d compound filters\n"
 msgstr ""
 
-#: src/effects-weed.c:6591
+#: src/effects-weed.c:6570
 #, c-format
 msgid "Effect %s cannot be used with this audio player.\n"
 msgstr ""
 
-#: src/effects-weed.c:6737
+#: src/effects-weed.c:6718
 #, c-format
 msgid "Failed to start instance %s, error code %d\n"
 msgstr ""
 
-#: src/effects-weed.c:6814
+#: src/effects-weed.c:6797
 #, c-format
 msgid "Unable to start generator %s\n"
 msgstr "%s üretci başlayamıyor\n"
 
-#: src/effects-weed.c:7621
+#: src/effects-weed.c:7607
 #, c-format
 msgid "Failed to start generator %s\n"
 msgstr "%s üretici başlatılamadı\n"
 
-#: src/effects-weed.c:7718
+#: src/effects-weed.c:7701
 #, c-format
 msgid "Failed to start generator %s, error %d\n"
 msgstr ""
 
-#: src/effects-weed.c:9012
+#: src/effects-weed.c:8993
 #, c-format
 msgid "%s [unstable] (%s)"
 msgstr ""
 
-#: src/effects-data.c:3278
+#: src/effects-data.c:3234
 #, c-format
 msgid "ACTIVATE (%s)"
 msgstr ""
 
-#: src/effects-data.c:3548
+#: src/effects-data.c:3501
 msgid "ACTIVATE"
 msgstr ""
 
-#: src/effects-data.c:3876
+#: src/effects-data.c:3829
 #, c-format
 msgid "Key slot %d"
 msgstr ""
 
-#: src/effects-data.c:3998
+#: src/effects-data.c:3951
 msgid "Autoscale"
 msgstr ""
 
-#: src/effects-data.c:4089
+#: src/effects-data.c:4042
 msgid "Add another connection for this output parameter"
 msgstr ""
 
-#: src/effects-data.c:4102 src/effects-data.c:4151
+#: src/effects-data.c:4055 src/effects-data.c:4104
 #, fuzzy
 msgid "Delete this connection"
 msgstr "_Seçimi sil"
 
-#: src/effects-data.c:4138
+#: src/effects-data.c:4091
 msgid "Add another connection for this output channel"
 msgstr ""
 
-#: src/effects-data.c:4223
+#: src/effects-data.c:4176
 msgid "Connected to -->"
 msgstr ""
 
-#: src/effects-data.c:4243
+#: src/effects-data.c:4196
 #, c-format
 msgid "%s - Alpha Channel Connections"
 msgstr ""
 
-#: src/effects-data.c:4316
+#: src/effects-data.c:4269
 #, c-format
 msgid "%s - Parameter Data Connections"
 msgstr ""
 
-#: src/effects-data.c:4336
+#: src/effects-data.c:4289
 msgid "Autoscale All"
 msgstr ""
 
-#: src/effects-data.c:4361 src/effects-data.c:4890
+#: src/effects-data.c:4314 src/effects-data.c:4841
 msgid "ACTIVATED"
 msgstr ""
 
-#: src/effects-data.c:4774
+#: src/effects-data.c:4726
 msgid "LiVES: - Parameter and Alpha Channel Connections"
 msgstr ""
 
-#: src/effects-data.c:4785
+#: src/effects-data.c:4736
 msgid "Auto Connect Channels"
 msgstr ""
 
-#: src/effects-data.c:4797
+#: src/effects-data.c:4748
 msgid "Auto Connect Parameters"
 msgstr ""
 
-#: src/effects-data.c:4807
+#: src/effects-data.c:4758
 msgid "Disconnect All"
 msgstr ""
 
-#: src/effects-data.c:4875
+#: src/effects-data.c:4826
 #, c-format
 msgid "Input channel is already connected from (%d,%d) %s"
 msgstr ""
 
-#: src/effects-data.c:4891
+#: src/effects-data.c:4842
 #, c-format
 msgid "Input parameter is already connected from (%d,%d) %s"
 msgstr ""
 
-#: src/effects-data.c:4899
+#: src/effects-data.c:4851
 msgid "Input and output parameters are not compatible"
 msgstr ""
 
@@ -5859,43 +5873,43 @@
 msgid "_Reset Values"
 msgstr "_Değerleri Sıfırla"
 
-#: src/framedraw.c:267
+#: src/framedraw.c:265
 msgid "_Frame"
 msgstr ""
 
-#: src/paramspecial.c:266
+#: src/paramspecial.c:259
 msgid "Maintain _Aspect Ratio"
 msgstr ""
 
-#: src/paramspecial.c:267
+#: src/paramspecial.c:260
 msgid "Maintain aspect ratio of original frame"
 msgstr ""
 
-#: src/paramspecial.c:341
+#: src/paramspecial.c:335
 msgid "Display Password"
 msgstr ""
 
-#: src/paramwindow.c:450
+#: src/paramwindow.c:447
 msgid "Transition _In"
 msgstr "Geçiş _İçeri"
 
-#: src/paramwindow.c:452
+#: src/paramwindow.c:449
 msgid "Click to set the transition parameter to show only the front frame"
 msgstr ""
 
-#: src/paramwindow.c:474
+#: src/paramwindow.c:472
 msgid "Crossfade audio"
 msgstr ""
 
-#: src/paramwindow.c:475
+#: src/paramwindow.c:473
 msgid "Check the box to make audio transition with the video"
 msgstr "video ile ses geçiş yapmak için kutuyu işaretleyin"
 
-#: src/paramwindow.c:493
+#: src/paramwindow.c:492
 msgid "Transition _Out"
 msgstr "Geçiş dışarı"
 
-#: src/paramwindow.c:495
+#: src/paramwindow.c:494
 msgid "Click to set the transition parameter to show only the rear frame"
 msgstr ""
 
@@ -5908,23 +5922,23 @@
 msgid "%s : size"
 msgstr "%s : boyut"
 
-#: src/paramwindow.c:598
+#: src/paramwindow.c:597
 msgid "New size (pixels)"
 msgstr "Yeni boyut (pixels)"
 
-#: src/paramwindow.c:617 src/plugins.c:997
+#: src/paramwindow.c:616 src/plugins.c:973
 msgid "_Width"
 msgstr "_Genişlik"
 
-#: src/paramwindow.c:636 src/plugins.c:1003
+#: src/paramwindow.c:635 src/plugins.c:979
 msgid "_Height"
 msgstr "_Yükseklik"
 
-#: src/paramwindow.c:684
+#: src/paramwindow.c:683
 msgid "Generate to _Clipboard"
 msgstr ""
 
-#: src/paramwindow.c:686
+#: src/paramwindow.c:685
 msgid "Generate frames to the clipboard"
 msgstr ""
 
@@ -5936,7 +5950,7 @@
 msgid "Generate frames to a new clip"
 msgstr ""
 
-#: src/paramwindow.c:822
+#: src/paramwindow.c:824
 #, c-format
 msgid ""
 "\n"
@@ -5944,71 +5958,71 @@
 "\n"
 msgstr ""
 
-#: src/paramwindow.c:920 src/paramwindow.c:930
+#: src/paramwindow.c:934 src/paramwindow.c:942
 msgid "Set as default"
 msgstr "Öntanımlı olarak ata"
 
-#: src/paramwindow.c:922 src/paramwindow.c:938
+#: src/paramwindow.c:936 src/paramwindow.c:950
 msgid "Reset"
 msgstr ""
 
-#: src/paramwindow.c:932 src/rte_window.c:2401 src/omc-learn.c:1357
+#: src/paramwindow.c:944 src/rte_window.c:2394 src/omc-learn.c:1347
 msgid "Close _window"
 msgstr "Pencereyi kapat"
 
-#: src/paramwindow.c:1337
+#: src/paramwindow.c:1340
 msgid "No parameters"
 msgstr "Parametre yok"
 
-#: src/paramwindow.c:1419
+#: src/paramwindow.c:1424
 msgid "Invalid parameter"
 msgstr "Geçersiz parametre"
 
-#: src/paramwindow.c:1611
+#: src/paramwindow.c:1610
 msgid "LiVES: - Select Colour"
 msgstr "LiVES: - Renk Seçimi"
 
-#: src/paramwindow.c:1616
+#: src/paramwindow.c:1615
 msgid "Click to set the colour"
 msgstr "Renk atamak için tıklayın"
 
-#: src/paramwindow.c:1628
+#: src/paramwindow.c:1626
 msgid "_Red"
 msgstr ""
 
-#: src/paramwindow.c:1629
+#: src/paramwindow.c:1627
 msgid "The red value (0 - 255)"
 msgstr "Kırmızı değeri (0 - 255)"
 
-#: src/paramwindow.c:1632
+#: src/paramwindow.c:1630
 msgid "_Green"
 msgstr ""
 
-#: src/paramwindow.c:1633
+#: src/paramwindow.c:1631
 msgid "The green value (0 - 255)"
 msgstr "Yeşil değeri (0 - 255)"
 
-#: src/paramwindow.c:1636
+#: src/paramwindow.c:1634
 msgid "_Blue"
 msgstr ""
 
-#: src/paramwindow.c:1637
+#: src/paramwindow.c:1635
 msgid "The blue value (0 - 255)"
 msgstr "Mavi değeri (0 - 255)"
 
-#: src/plugins.c:85
+#: src/plugins.c:86
 #, c-format
 msgid ""
 "\n"
 "Plugin error: %s failed with code %d"
 msgstr ""
 
-#: src/plugins.c:87
+#: src/plugins.c:88
 #, c-format
 msgid " : message was %s\n"
 msgstr " :  %s mesajı oldu\n"
 
-#: src/plugins.c:387
+#: src/plugins.c:375
 #, c-format
 msgid ""
 "\n"
@@ -6018,17 +6032,17 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/plugins.c:397
+#: src/plugins.c:385
 #, c-format
 msgid "Updating video playback plugin defaults in %s\n"
 msgstr ""
 
-#: src/plugins.c:452
+#: src/plugins.c:444
 #, c-format
 msgid "Loading video playback plugin defaults from %s..."
 msgstr "ön tanımlı %s adresten video oynatma eklentisi yükleniyor ..."
 
-#: src/plugins.c:515
+#: src/plugins.c:505
 #, c-format
 msgid ""
 "\n"
@@ -6038,32 +6052,32 @@
 "\n"
 msgstr ""
 
-#: src/plugins.c:855
+#: src/plugins.c:836
 #, c-format
 msgid "Saving playback plugin defaults to %s..."
 msgstr ""
 
-#: src/plugins.c:962
+#: src/plugins.c:939
 msgid "_FPS"
 msgstr "_FPS"
 
-#: src/plugins.c:963
+#: src/plugins.c:940
 msgid "Fixed framerate for plugin.\n"
 msgstr "eklenti için çerçeve hızı düzeltildi.\n"
 
-#: src/plugins.c:1032
+#: src/plugins.c:1008
 msgid "_Colourspace"
 msgstr ""
 
-#: src/plugins.c:1033
+#: src/plugins.c:1009
 msgid "Colourspace input to the plugin.\n"
 msgstr ""
 
-#: src/plugins.c:1089
+#: src/plugins.c:1065
 msgid "Save settings to an alternate file.\n"
 msgstr ""
 
-#: src/plugins.c:1206
+#: src/plugins.c:1182
 #, c-format
 msgid ""
 "\n"
@@ -6072,7 +6086,7 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/plugins.c:1252
+#: src/plugins.c:1228
 #, c-format
 msgid ""
 "\n"
@@ -6082,38 +6096,38 @@
 "Unable to use it.\n"
 msgstr ""
 
-#: src/plugins.c:1265
+#: src/plugins.c:1241
 #, c-format
 msgid ""
 "Video playback plugin failed to initialise.\n"
 "Error was: %s\n"
 msgstr ""
 
-#: src/plugins.c:1461
+#: src/plugins.c:1428
 msgid ""
 "\n"
 "Warning ! Video playback plugin will not send key presses. Keyboard may be "
 "disabled during plugin use !\n"
 msgstr ""
 
-#: src/plugins.c:1465
+#: src/plugins.c:1433
 #, c-format
 msgid ""
 "*** Using %s plugin for fs playback, agreed to use palette type %d ( %s ). "
 "***\n"
 msgstr ""
 
-#: src/plugins.c:1571
+#: src/plugins.c:1537
 #, c-format
 msgid "Audio stream unable to use preferred format '%s'\n"
 msgstr ""
 
-#: src/plugins.c:1579
+#: src/plugins.c:1543
 #, c-format
 msgid "Using format '%s' instead.\n"
 msgstr ""
 
-#: src/plugins.c:1616
+#: src/plugins.c:1579
 #, c-format
 msgid ""
 "LiVES was unable to find its encoder plugins. Please make sure you have the "
@@ -6122,7 +6136,7 @@
 "or change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/plugins.c:1624
+#: src/plugins.c:1589
 #, c-format
 msgid ""
 "LiVES did not receive a response from the encoder plugin called '%s'.\n"
@@ -6131,11 +6145,11 @@
 "or switch to another plugin using Tools|Preferences|Encoding\n"
 msgstr ""
 
-#: src/plugins.c:2032
+#: src/plugins.c:1987
 msgid "Unable to resize, please install imageMagick\n"
 msgstr "Yeniden boyutlandırılamadı, lütfen imageMagick yükleyin.\n"
 
-#: src/plugins.c:2231
+#: src/plugins.c:2183
 #, c-format
 msgid ""
 "\n"
@@ -6143,12 +6157,12 @@
 "No decoders found in %s !\n"
 msgstr ""
 
-#: src/plugins.c:2415
+#: src/plugins.c:2369
 #, fuzzy, c-format
 msgid " using %s"
 msgstr "%s açılıyor"
 
-#: src/plugins.c:2499
+#: src/plugins.c:2451
 #, c-format
 msgid ""
 "\n"
@@ -6157,7 +6171,7 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/plugins.c:2522
+#: src/plugins.c:2472
 #, c-format
 msgid ""
 "\n"
@@ -6167,24 +6181,24 @@
 "Unable to use it.\n"
 msgstr ""
 
-#: src/plugins.c:2564
+#: src/plugins.c:2512
 msgid "/unknown"
 msgstr "/bilinmeyen"
 
-#: src/plugins.c:2651
+#: src/plugins.c:2598
 msgid "LiVES: - Decoder Plugins"
 msgstr ""
 
-#: src/plugins.c:2669
+#: src/plugins.c:2616
 msgid "Enabled Video Decoders (uncheck to disable)"
 msgstr ""
 
-#: src/plugins.c:2726
+#: src/plugins.c:2672
 #, c-format
 msgid "Failed to load %s, transitions may not resize.\n"
 msgstr ""
 
-#: src/plugins.c:3854
+#: src/plugins.c:3797
 #, c-format
 msgid "%s advanced settings"
 msgstr "%s gelişmiş ayarlar"
@@ -6193,15 +6207,15 @@
 msgid "LiVES: - New Test RFX"
 msgstr "LiVES: - RFX Yeni Test"
 
-#: src/rfx-builder.c:136
+#: src/rfx-builder.c:135
 msgid "LiVES: - Edit Test RFX"
 msgstr ""
 
-#: src/rfx-builder.c:166
+#: src/rfx-builder.c:165
 msgid "Type:"
 msgstr "Tip:"
 
-#: src/rfx-builder.c:184
+#: src/rfx-builder.c:183
 msgid "tool"
 msgstr ""
 
@@ -6213,130 +6227,130 @@
 msgid "The name of the plugin. No spaces allowed."
 msgstr ""
 
-#: src/rfx-builder.c:201
+#: src/rfx-builder.c:202
 msgid "Version:       "
 msgstr "Sürüm:       "
 
-#: src/rfx-builder.c:203
+#: src/rfx-builder.c:204
 msgid "The script version."
 msgstr "Betik vsürümü."
 
-#: src/rfx-builder.c:210
+#: src/rfx-builder.c:212
 msgid "    Author:       "
 msgstr "    Geliştirici:       "
 
-#: src/rfx-builder.c:211
+#: src/rfx-builder.c:213
 msgid "The script author."
 msgstr "Betik Geliştiricisi"
 
-#: src/rfx-builder.c:217
+#: src/rfx-builder.c:220
 msgid "    URL (optional):       "
 msgstr "    URL (isteğe bağlı):       "
 
-#: src/rfx-builder.c:218
+#: src/rfx-builder.c:221
 msgid "URL for the plugin maintainer."
 msgstr "Eklenti bakımcısı için URL"
 
-#: src/rfx-builder.c:226
+#: src/rfx-builder.c:230
 msgid "Menu text:    "
 msgstr "Menü metni:    "
 
-#: src/rfx-builder.c:227
+#: src/rfx-builder.c:231
 msgid "The text to show in the menu."
 msgstr ""
 
-#: src/rfx-builder.c:239
+#: src/rfx-builder.c:244
 msgid "Action description:        "
 msgstr "Eylem açıklaması:        "
 
-#: src/rfx-builder.c:241
+#: src/rfx-builder.c:246
 msgid "Describe what the plugin is doing. E.g. \"Edge detecting\""
 msgstr ""
 
-#: src/rfx-builder.c:246
+#: src/rfx-builder.c:251
 msgid "Minimum frames:"
 msgstr "En az çerçeve sayısı"
 
-#: src/rfx-builder.c:249
+#: src/rfx-builder.c:254
 msgid ""
 "Minimum number of frames this effect/tool can be applied to. Normally 1."
 msgstr ""
 
-#: src/rfx-builder.c:260
+#: src/rfx-builder.c:265
 msgid "_Requirements..."
 msgstr "_Gereksinimler...."
 
-#: src/rfx-builder.c:263
+#: src/rfx-builder.c:268
 msgid "Enter any binaries required by the plugin."
 msgstr ""
 
-#: src/rfx-builder.c:267
+#: src/rfx-builder.c:272
 msgid "_Properties..."
 msgstr "_Özellikler..."
 
-#: src/rfx-builder.c:270
+#: src/rfx-builder.c:275
 msgid "Set properties for the plugin. Optional."
 msgstr "Eklenti özelliklerini ayarlama. İsteğe bağlı."
 
-#: src/rfx-builder.c:274
+#: src/rfx-builder.c:279
 msgid "_Parameters..."
 msgstr "_Parametreler..."
 
-#: src/rfx-builder.c:277
+#: src/rfx-builder.c:282
 msgid "Set up parameters used in pre/loop/post/trigger code. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:281
+#: src/rfx-builder.c:286
 msgid "Parameter _Window Hints..."
 msgstr "Parametre _Pencere İpuçları..."
 
-#: src/rfx-builder.c:284
+#: src/rfx-builder.c:289
 msgid "Set hints about how to lay out the parameter window. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:290
+#: src/rfx-builder.c:295
 msgid "_Language code:"
 msgstr ""
 
-#: src/rfx-builder.c:291
+#: src/rfx-builder.c:296
 msgid "Language for pre/loop/post/triggers. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:300
+#: src/rfx-builder.c:305
 msgid "_Pre loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:303
+#: src/rfx-builder.c:308
 msgid "Code to be executed before the loop. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:307
+#: src/rfx-builder.c:312
 msgid "_Loop code..."
 msgstr "_Döngü kodu..."
 
-#: src/rfx-builder.c:310
+#: src/rfx-builder.c:315
 msgid "Loop code to be applied to each frame."
 msgstr ""
 
-#: src/rfx-builder.c:314
+#: src/rfx-builder.c:319
 msgid "_Post loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:317
+#: src/rfx-builder.c:322
 msgid "Code to be executed after the loop. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:321
+#: src/rfx-builder.c:326
 msgid "_Trigger code..."
 msgstr ""
 
-#: src/rfx-builder.c:324
+#: src/rfx-builder.c:329
 msgid ""
 "Set trigger code for when the parameter window is shown, or when a parameter "
 "is changed. Optional (except for Utilities)."
 msgstr ""
 
-#: src/rfx-builder.c:421
+#: src/rfx-builder.c:426
 #, c-format
 msgid ""
 "\n"
@@ -6351,55 +6365,55 @@
 "%s\n"
 "%s\n"
 
-#: src/rfx-builder.c:544
+#: src/rfx-builder.c:541
 msgid "LiVES: - RFX Requirements"
 msgstr "LiVES: - RFX Gereklilikleri"
 
-#: src/rfx-builder.c:548
+#: src/rfx-builder.c:544
 msgid "LiVES: - RFX Parameters"
 msgstr "LiVES: - RFX Parametreleri"
 
-#: src/rfx-builder.c:552
+#: src/rfx-builder.c:547
 msgid "LiVES: - RFX Parameter Window Hints"
 msgstr ""
 
-#: src/rfx-builder.c:556
+#: src/rfx-builder.c:550
 msgid "LiVES: - RFX Triggers"
 msgstr ""
 
-#: src/rfx-builder.c:622
+#: src/rfx-builder.c:613
 msgid "_New Entry"
 msgstr "_Yeni Girdi"
 
-#: src/rfx-builder.c:625
+#: src/rfx-builder.c:616
 msgid "_Edit Entry"
 msgstr "_Girdiyi düzenle"
 
-#: src/rfx-builder.c:628
+#: src/rfx-builder.c:619
 msgid "_Remove Entry"
 msgstr "_Girdiyi kaldır"
 
-#: src/rfx-builder.c:632
+#: src/rfx-builder.c:623
 msgid "Move _Up"
 msgstr "_Yukarı Taşı"
 
-#: src/rfx-builder.c:635
+#: src/rfx-builder.c:626
 msgid "Move _Down"
 msgstr "_Aşağı Taşı"
 
-#: src/rfx-builder.c:1004
+#: src/rfx-builder.c:984
 msgid "LiVES: - RFX Properties"
 msgstr "LiVES: - RFX Özellikleri"
 
-#: src/rfx-builder.c:1013
+#: src/rfx-builder.c:993
 msgid "_Slow (hint to GUI)"
 msgstr ""
 
-#: src/rfx-builder.c:1024
+#: src/rfx-builder.c:1004
 msgid "_Batch mode generator"
 msgstr ""
 
-#: src/rfx-builder.c:1831
+#: src/rfx-builder.c:1790
 msgid ""
 "\n"
 "\n"
@@ -6408,7 +6422,7 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:1875
+#: src/rfx-builder.c:1834
 msgid ""
 "\n"
 "\n"
@@ -6416,219 +6430,219 @@
 "Please check the trigger code.\n"
 msgstr ""
 
-#: src/rfx-builder.c:1994
+#: src/rfx-builder.c:1950
 msgid "LiVES: - New RFX Parameter"
 msgstr "LiVES: - Yeni RFX Parametresi"
 
-#: src/rfx-builder.c:1997
+#: src/rfx-builder.c:1952
 msgid "LiVES: - Edit RFX Parameter"
 msgstr "LiVES: - RFX Parametresini düzenle"
 
-#: src/rfx-builder.c:2013
+#: src/rfx-builder.c:1968
 msgid "_Name:    "
 msgstr "_İsim:    "
 
-#: src/rfx-builder.c:2016
+#: src/rfx-builder.c:1971
 msgid "Name of the parameter, must be unique in the plugin."
 msgstr ""
 
-#: src/rfx-builder.c:2025
+#: src/rfx-builder.c:1981
 msgid "_Label:    "
 msgstr "_Etiket:    "
 
-#: src/rfx-builder.c:2028
+#: src/rfx-builder.c:1984
 msgid ""
 "Label to be shown by the parameter. An underscore represents mnemonic "
 "accelerator."
 msgstr ""
 
-#: src/rfx-builder.c:2039
+#: src/rfx-builder.c:1996
 msgid "_Type:         "
 msgstr "_Tip:         "
 
-#: src/rfx-builder.c:2040
+#: src/rfx-builder.c:1997
 msgid "Parameter type (select from list)."
 msgstr "Parametre tipi (listeden seçin)."
 
-#: src/rfx-builder.c:2073
+#: src/rfx-builder.c:2029
 msgid "Decimal _places: "
 msgstr ""
 
-#: src/rfx-builder.c:2082 src/rfx-builder.c:2477 src/rfx-builder.c:2495
+#: src/rfx-builder.c:2038 src/rfx-builder.c:2430 src/rfx-builder.c:2447
 msgid "_Default value:    "
 msgstr "_Ön tanımlı değer:    "
 
-#: src/rfx-builder.c:2098
+#: src/rfx-builder.c:2054
 msgid "_Default: "
 msgstr "_Ön tanımlı "
 
-#: src/rfx-builder.c:2132
+#: src/rfx-builder.c:2087
 msgid "Button _Group: "
 msgstr "Buton _Grubu: "
 
-#: src/rfx-builder.c:2134
+#: src/rfx-builder.c:2089
 msgid "A non-zero value can be used to group radio buttons."
 msgstr ""
 
-#: src/rfx-builder.c:2142 src/rfx-builder.c:2478
+#: src/rfx-builder.c:2097 src/rfx-builder.c:2431
 msgid "_Minimum value: "
 msgstr "_En küçük değer: "
 
-#: src/rfx-builder.c:2148 src/rfx-builder.c:2479
+#: src/rfx-builder.c:2103 src/rfx-builder.c:2432
 msgid "Ma_ximum value: "
 msgstr "En _büyük değer: "
 
-#: src/rfx-builder.c:2157
+#: src/rfx-builder.c:2113
 msgid "     _Step size:   "
 msgstr "     _Adım büyüklüğü:   "
 
-#: src/rfx-builder.c:2160
+#: src/rfx-builder.c:2117
 msgid ""
 "How much the parameter is adjusted when the spinbutton arrows are pressed."
 msgstr ""
 
-#: src/rfx-builder.c:2171
+#: src/rfx-builder.c:2129
 msgid "_Wrap value"
 msgstr ""
 
-#: src/rfx-builder.c:2172
+#: src/rfx-builder.c:2131
 msgid "Whether the value wraps max->min and min->max."
 msgstr ""
 
-#: src/rfx-builder.c:2470
+#: src/rfx-builder.c:2424
 msgid "Set _values"
 msgstr ""
 
-#: src/rfx-builder.c:2512
+#: src/rfx-builder.c:2463
 msgid "Default _Red:  "
 msgstr "Ön tanımlı _Kırmızı:  "
 
-#: src/rfx-builder.c:2513
+#: src/rfx-builder.c:2464
 msgid "Default _Green:"
 msgstr "Ön tanımlı _Yeşil:"
 
-#: src/rfx-builder.c:2514
+#: src/rfx-builder.c:2465
 msgid "Default _Blue: "
 msgstr "Ön tanımlı _Mavi: "
 
-#: src/rfx-builder.c:2538
+#: src/rfx-builder.c:2488
 msgid "Set _default"
 msgstr ""
 
-#: src/rfx-builder.c:2540
+#: src/rfx-builder.c:2490
 msgid "Default value:  "
 msgstr "ön tanımlı değer:  "
 
-#: src/rfx-builder.c:2541
+#: src/rfx-builder.c:2491
 msgid "Maximum length (chars): "
 msgstr "En büyük uzunluk (karakter): "
 
-#: src/rfx-builder.c:2576
+#: src/rfx-builder.c:2526
 msgid "LiVES: - New RFX Parameter Window Hint"
 msgstr ""
 
-#: src/rfx-builder.c:2579
+#: src/rfx-builder.c:2528
 msgid "LiVES: - Edit RFX Parameter Window Hint"
 msgstr ""
 
-#: src/rfx-builder.c:2622
+#: src/rfx-builder.c:2569
 msgid "_Keyword:         "
 msgstr ""
 
-#: src/rfx-builder.c:2639
+#: src/rfx-builder.c:2586
 msgid "Special _Type:         "
 msgstr ""
 
-#: src/rfx-builder.c:2656
+#: src/rfx-builder.c:2602
 msgid "Special _Subtype:         "
 msgstr ""
 
-#: src/rfx-builder.c:2667 src/rfx-builder.c:2706
+#: src/rfx-builder.c:2613 src/rfx-builder.c:2651
 msgid "Row:    "
 msgstr "Satır:    "
 
-#: src/rfx-builder.c:2732
+#: src/rfx-builder.c:2676
 #, c-format
 msgid "Linked parameters (%d):    "
 msgstr "Bağlantılı parametreler (%d):    "
 
-#: src/rfx-builder.c:2749
+#: src/rfx-builder.c:2693
 msgid "Linked parameters (4):    "
 msgstr "Bağlantılı parametreler (4):    "
 
-#: src/rfx-builder.c:2752
+#: src/rfx-builder.c:2695
 msgid "Linked parameters (2):    "
 msgstr "Bağlantılı parametreler (2):    "
 
-#: src/rfx-builder.c:2777
+#: src/rfx-builder.c:2720
 msgid "LiVES: - New RFX Trigger"
 msgstr ""
 
-#: src/rfx-builder.c:2780
+#: src/rfx-builder.c:2722
 msgid "LiVES: - Edit RFX Trigger"
 msgstr ""
 
-#: src/rfx-builder.c:2808
+#: src/rfx-builder.c:2750
 msgid "When:         "
 msgstr ""
 
-#: src/rfx-builder.c:2904
+#: src/rfx-builder.c:2846
 msgid "LiVES: - Pre Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:2911
+#: src/rfx-builder.c:2853
 msgid "LiVES: - Loop Code"
 msgstr "LiVES: - Döngü Kodu"
 
-#: src/rfx-builder.c:2918
+#: src/rfx-builder.c:2860
 msgid "LiVES: - Post Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:2931
+#: src/rfx-builder.c:2873
 #, c-format
 msgid "LiVES: - Default text (max length %d)"
 msgstr "LiVES: - Varsayılan metin (mak. uzunluk %d)"
 
-#: src/rfx-builder.c:2944
+#: src/rfx-builder.c:2885
 msgid "LiVES: - Enter values, one per line"
 msgstr ""
 
-#: src/rfx-builder.c:3055
+#: src/rfx-builder.c:2996
 msgid ""
 "\n"
 "\n"
 "Name must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3060
+#: src/rfx-builder.c:3001
 msgid ""
 "\n"
 "\n"
 "Name must not contain spaces.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3065
+#: src/rfx-builder.c:3006
 msgid ""
 "\n"
 "\n"
 "Menu text must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3071
+#: src/rfx-builder.c:3012
 msgid ""
 "\n"
 "\n"
 "Action description must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3076
+#: src/rfx-builder.c:3017
 msgid ""
 "\n"
 "\n"
 "Author must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3085 src/rfx-builder.c:4339
+#: src/rfx-builder.c:3026 src/rfx-builder.c:4253
 msgid ""
 "\n"
 "\n"
@@ -6636,28 +6650,28 @@
 "Name must be unique.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3092
+#: src/rfx-builder.c:3033
 msgid ""
 "\n"
 "\n"
 "Loop code should not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3098
+#: src/rfx-builder.c:3039
 msgid ""
 "\n"
 "\n"
 "Trigger code should not be blank for a utility.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3111
+#: src/rfx-builder.c:3052
 msgid ""
 "\n"
 "\n"
 "Parameter name must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3117
+#: src/rfx-builder.c:3058
 msgid ""
 "\n"
 "\n"
@@ -6666,41 +6680,41 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:3171
+#: src/rfx-builder.c:3111
 #, c-format
 msgid "Writing script file %s..."
 msgstr ""
 
-#: src/rfx-builder.c:3477
+#: src/rfx-builder.c:3411
 msgid "No <define> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3484 src/rfx-builder.c:3493
+#: src/rfx-builder.c:3418 src/rfx-builder.c:3427
 msgid "Bad script version.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3505
+#: src/rfx-builder.c:3439
 msgid "No <name> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3513
+#: src/rfx-builder.c:3447
 msgid "No <version> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3522
+#: src/rfx-builder.c:3456
 msgid "No <author> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3536
+#: src/rfx-builder.c:3470
 msgid "No <description> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3540
+#: src/rfx-builder.c:3474
 #, c-format
 msgid "Bad description. (%s)\n"
 msgstr ""
 
-#: src/rfx-builder.c:3702
+#: src/rfx-builder.c:3627
 #, c-format
 msgid ""
 "\n"
@@ -6710,27 +6724,27 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:3859
+#: src/rfx-builder.c:3780
 msgid "Rebuilding all RFX scripts...builtin..."
 msgstr ""
 
-#: src/rfx-builder.c:3860
+#: src/rfx-builder.c:3781
 msgid "Rebuilding scripts"
 msgstr ""
 
-#: src/rfx-builder.c:3868
+#: src/rfx-builder.c:3789
 msgid "custom..."
 msgstr "özel..."
 
-#: src/rfx-builder.c:3872
+#: src/rfx-builder.c:3793
 msgid "test..."
 msgstr "test..."
 
-#: src/rfx-builder.c:3878
+#: src/rfx-builder.c:3799
 msgid "rebuilding dynamic menu entries..."
 msgstr ""
 
-#: src/rfx-builder.c:3905 src/rfx-builder.c:3912
+#: src/rfx-builder.c:3826 src/rfx-builder.c:3834
 #, c-format
 msgid ""
 "\n"
@@ -6739,7 +6753,7 @@
 "Please check this program is in your path and executable.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3951
+#: src/rfx-builder.c:3874
 #, c-format
 msgid ""
 "\n"
@@ -6749,12 +6763,12 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:3960
+#: src/rfx-builder.c:3884
 #, c-format
 msgid "Deleting rfx script %s..."
 msgstr ""
 
-#: src/rfx-builder.c:3980
+#: src/rfx-builder.c:3902
 #, c-format
 msgid ""
 "\n"
@@ -6764,7 +6778,7 @@
 "Error code was %d\n"
 msgstr ""
 
-#: src/rfx-builder.c:4016
+#: src/rfx-builder.c:3938
 #, c-format
 msgid ""
 "\n"
@@ -6774,12 +6788,12 @@
 "Please delete it first, or rename the test script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4027
+#: src/rfx-builder.c:3950
 #, c-format
 msgid "Promoting rfx test plugin %s to custom..."
 msgstr ""
 
-#: src/rfx-builder.c:4044
+#: src/rfx-builder.c:3965
 #, c-format
 msgid ""
 "\n"
@@ -6790,20 +6804,20 @@
 "Return code was %d (%s)\n"
 msgstr ""
 
-#: src/rfx-builder.c:4070
+#: src/rfx-builder.c:3990
 msgid "LiVES: - Export Script to..."
 msgstr ""
 
-#: src/rfx-builder.c:4077 src/rfx-builder.c:4156
+#: src/rfx-builder.c:3997 src/rfx-builder.c:4074
 #, c-format
 msgid "Copying %s to %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4105
+#: src/rfx-builder.c:4024
 msgid "LiVES: Import Script from..."
 msgstr ""
 
-#: src/rfx-builder.c:4148
+#: src/rfx-builder.c:4067
 #, c-format
 msgid ""
 "\n"
@@ -6813,43 +6827,43 @@
 "Please delete it first, or rename the import script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4249
+#: src/rfx-builder.c:4166
 msgid "LiVES: - Copy RFX Script"
 msgstr ""
 
-#: src/rfx-builder.c:4251
+#: src/rfx-builder.c:4168
 msgid "_From type:    "
 msgstr ""
 
-#: src/rfx-builder.c:4258
+#: src/rfx-builder.c:4175
 msgid "   Script:    "
 msgstr ""
 
-#: src/rfx-builder.c:4267
+#: src/rfx-builder.c:4183
 msgid "LiVES: - Rename test RFX Script"
 msgstr ""
 
-#: src/rfx-builder.c:4268
+#: src/rfx-builder.c:4184
 msgid "From script: "
 msgstr ""
 
-#: src/rfx-builder.c:4273
+#: src/rfx-builder.c:4188
 msgid "LiVES: - RFX Script name"
 msgstr ""
 
-#: src/rfx-builder.c:4274
+#: src/rfx-builder.c:4189
 msgid "Script name: "
 msgstr ""
 
-#: src/rfx-builder.c:4294
+#: src/rfx-builder.c:4209
 msgid "New name: "
 msgstr "Yeni isim: "
 
-#: src/rfx-builder.c:4297
+#: src/rfx-builder.c:4212
 msgid "New script name: "
 msgstr ""
 
-#: src/rfx-builder.c:4372
+#: src/rfx-builder.c:4286
 msgid ""
 "\n"
 "\n"
@@ -6857,12 +6871,12 @@
 "Script name must be unique.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4384
+#: src/rfx-builder.c:4297
 #, c-format
 msgid "Renaming RFX test script %s to %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4390
+#: src/rfx-builder.c:4302
 #, c-format
 msgid ""
 "\n"
@@ -6873,21 +6887,21 @@
 "Return code was %d\n"
 msgstr ""
 
-#: src/rfx-builder.c:4610
+#: src/rfx-builder.c:4518
 msgid "_Apply Real Time Effects to Selection"
 msgstr ""
 
-#: src/rfx-builder.c:4664
+#: src/rfx-builder.c:4572
 #, c-format
 msgid "Loading rendered effect %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4766
+#: src/rfx-builder.c:4674
 msgid ""
 "See: VJ - show VJ keys. Set the realtime effects, and then apply them here."
 msgstr ""
 
-#: src/preferences.c:359
+#: src/preferences.c:351
 msgid ""
 "\n"
 "\n"
@@ -6895,7 +6909,7 @@
 "full screen, separate window (fs) mode\n"
 msgstr ""
 
-#: src/preferences.c:408
+#: src/preferences.c:400
 msgid ""
 "\n"
 "\n"
@@ -6903,7 +6917,7 @@
 "(Free space = UNKNOWN)"
 msgstr ""
 
-#: src/preferences.c:412
+#: src/preferences.c:403
 #, c-format
 msgid ""
 "\n"
@@ -6912,14 +6926,14 @@
 "(Free space = %s)"
 msgstr ""
 
-#: src/preferences.c:416
+#: src/preferences.c:408
 msgid ""
 "The temp directory is LiVES working directory where opened clips and sets "
 "are stored.\n"
 "It should be in a partition with plenty of free disk space.\n"
 msgstr ""
 
-#: src/preferences.c:784
+#: src/preferences.c:839
 #, c-format
 msgid ""
 "Unable to create or write to the new temporary directory.\n"
@@ -6930,7 +6944,7 @@
 "The directory will not be changed now.\n"
 msgstr ""
 
-#: src/preferences.c:786
+#: src/preferences.c:843
 #, c-format
 msgid ""
 "Unable to create or write to the new temporary directory.\n"
@@ -6940,7 +6954,7 @@
 "The directory will not be changed now.\n"
 msgstr ""
 
-#: src/preferences.c:798
+#: src/preferences.c:856
 msgid ""
 "You have chosen to change the temporary directory.\n"
 "Please make sure you have no other copies of LiVES open.\n"
@@ -6952,20 +6966,20 @@
 "original setting."
 msgstr ""
 
-#: src/preferences.c:1169
+#: src/preferences.c:1221
 msgid ""
 "\n"
 "Unable to switch audio players to jack - jackd must be installed first.\n"
 "See http://jackaudio.org\n"
 msgstr ""
 
-#: src/preferences.c:1175
+#: src/preferences.c:1226
 msgid ""
 "\n"
 "Switching audio players requires restart (jackd must not be running)\n"
 msgstr ""
 
-#: src/preferences.c:1202
+#: src/preferences.c:1253
 msgid ""
 "\n"
 "Unable to switch audio players to pulse audio\n"
@@ -6973,815 +6987,815 @@
 "See http://www.pulseaudio.org\n"
 msgstr ""
 
-#: src/preferences.c:1502
+#: src/preferences.c:1544
 msgid "PCM (highest quality; largest files)"
 msgstr ""
 
-#: src/preferences.c:2063
+#: src/preferences.c:2096
 msgid "LiVES: - Preferences"
 msgstr "LiVES: - Tercihler"
 
-#: src/preferences.c:2142
+#: src/preferences.c:2177
 msgid "Open file selection maximised"
 msgstr ""
 
-#: src/preferences.c:2149
+#: src/preferences.c:2184
 msgid "Show recent files in the File menu"
 msgstr ""
 
-#: src/preferences.c:2158
+#: src/preferences.c:2193
 msgid "Stop screensaver on playback    "
 msgstr ""
 
-#: src/preferences.c:2165
+#: src/preferences.c:2200
 msgid "Open main window maximised"
 msgstr ""
 
-#: src/preferences.c:2173
+#: src/preferences.c:2208
 msgid "Show toolbar when background is blanked"
 msgstr ""
 
-#: src/preferences.c:2181
+#: src/preferences.c:2216
 msgid "Allow mouse wheel to switch clips"
 msgstr ""
 
-#: src/preferences.c:2192
+#: src/preferences.c:2227
 msgid "Shrink previews to fit in interface"
 msgstr ""
 
-#: src/preferences.c:2202
+#: src/preferences.c:2237
 msgid "Startup mode:"
 msgstr ""
 
-#: src/preferences.c:2206
+#: src/preferences.c:2241
 msgid "_Clip editor"
 msgstr ""
 
-#: src/preferences.c:2210
+#: src/preferences.c:2245
 msgid "_Multitrack mode"
 msgstr ""
 
-#: src/preferences.c:2234
+#: src/preferences.c:2268
 msgid "Multi-head support"
 msgstr ""
 
-#: src/preferences.c:2242
+#: src/preferences.c:2276
 msgid " monitor number for LiVES interface"
 msgstr ""
 
-#: src/preferences.c:2248
+#: src/preferences.c:2282
 msgid " monitor number for playback"
 msgstr ""
 
-#: src/preferences.c:2260
+#: src/preferences.c:2294
 msgid ""
 "A setting of 0 means use all available monitors (only works with some "
 "playback plugins)."
 msgstr ""
 
-#: src/preferences.c:2270
+#: src/preferences.c:2304
 msgid "Force single monitor"
 msgstr ""
 
-#: src/preferences.c:2271
+#: src/preferences.c:2305
 msgid "Ignore all except the first monitor."
 msgstr ""
 
-#: src/preferences.c:2293
+#: src/preferences.c:2327
 msgid "Show clip thumbnails during playback"
 msgstr ""
 
-#: src/preferences.c:2306
+#: src/preferences.c:2340
 msgid "GUI"
 msgstr "GUI"
 
-#: src/preferences.c:2321
+#: src/preferences.c:2355
 msgid "When entering Multitrack mode:"
 msgstr ""
 
-#: src/preferences.c:2330
+#: src/preferences.c:2364
 msgid "_Prompt me for width, height, fps and audio settings"
 msgstr ""
 
-#: src/preferences.c:2336
+#: src/preferences.c:2370
 msgid "_Always use the following values:"
 msgstr ""
 
-#: src/preferences.c:2345
+#: src/preferences.c:2379
 msgid "Use these same _values for rendering a new clip"
 msgstr ""
 
-#: src/preferences.c:2370
+#: src/preferences.c:2404
 msgid "_Width           "
 msgstr "_Genişlik           "
 
-#: src/preferences.c:2375
+#: src/preferences.c:2409
 msgid "          _Height      "
 msgstr "          _Yükseklik      "
 
-#: src/preferences.c:2379
+#: src/preferences.c:2413
 msgid "          _FPS"
 msgstr "          _FPS"
 
-#: src/preferences.c:2387
+#: src/preferences.c:2421
 msgid "Enable backing audio track"
 msgstr ""
 
-#: src/preferences.c:2394
+#: src/preferences.c:2428
 msgid "Audio track per video track"
 msgstr ""
 
-#: src/preferences.c:2423
+#: src/preferences.c:2457
 msgid "    _Undo buffer size (MB)    "
 msgstr ""
 
-#: src/preferences.c:2432
+#: src/preferences.c:2466
 msgid "_Exit multitrack mode after rendering"
 msgstr ""
 
-#: src/preferences.c:2440
+#: src/preferences.c:2474
 msgid "Auto backup layouts"
 msgstr ""
 
-#: src/preferences.c:2445
+#: src/preferences.c:2479
 msgid "_Every"
 msgstr ""
 
-#: src/preferences.c:2453
+#: src/preferences.c:2487
 msgid "seconds"
 msgstr "saniye"
 
-#: src/preferences.c:2461
+#: src/preferences.c:2495
 msgid "After every _change"
 msgstr ""
 
-#: src/preferences.c:2467
+#: src/preferences.c:2501
 msgid "_Never"
 msgstr "_Hiçbir Zaman"
 
-#: src/preferences.c:2490
+#: src/preferences.c:2523
 msgid "Multitrack/Render"
 msgstr ""
 
-#: src/preferences.c:2508
+#: src/preferences.c:2541
 msgid "Use instant opening when possible"
 msgstr ""
 
-#: src/preferences.c:2509
+#: src/preferences.c:2543
 msgid "Enable instant opening of some file types using decoder plugins"
 msgstr ""
 
-#: src/preferences.c:2531
+#: src/preferences.c:2567
 msgid "Video open command (fallback)"
 msgstr ""
 
-#: src/preferences.c:2543
+#: src/preferences.c:2579
 msgid "Open/render compression"
 msgstr ""
 
-#: src/preferences.c:2546
+#: src/preferences.c:2582
 msgid " %     ( lower = slower, larger files; for jpeg, higher quality )"
 msgstr ""
 
-#: src/preferences.c:2558
+#: src/preferences.c:2594
 msgid "Default image format"
 msgstr ""
 
-#: src/preferences.c:2562
+#: src/preferences.c:2598
 msgid "_jpeg"
 msgstr "_jpeg"
 
-#: src/preferences.c:2565
+#: src/preferences.c:2601
 msgid "_png"
 msgstr "_png"
 
-#: src/preferences.c:2572
+#: src/preferences.c:2608
 msgid "(Check Help/Troubleshoot to see which image formats are supported)"
 msgstr ""
 
-#: src/preferences.c:2580
+#: src/preferences.c:2616
 msgid "Enable automatic deinterlacing when possible"
 msgstr ""
 
-#: src/preferences.c:2582
+#: src/preferences.c:2619
 msgid "Automatically deinterlace frames when a plugin suggests it"
 msgstr ""
 
-#: src/preferences.c:2593
+#: src/preferences.c:2632
 msgid "Automatic trimming / padding of audio when possible"
 msgstr ""
 
-#: src/preferences.c:2595
+#: src/preferences.c:2634
 msgid "Automatically trim or pad audio when a plugin suggests it"
 msgstr ""
 
-#: src/preferences.c:2606
+#: src/preferences.c:2646
 msgid "Ignore blank borders when possible"
 msgstr ""
 
-#: src/preferences.c:2608
+#: src/preferences.c:2648
 msgid "Clip any blank borders from frames where possible"
 msgstr ""
 
-#: src/preferences.c:2619
+#: src/preferences.c:2660
 msgid "When opening multiple files, concatenate images into one clip"
 msgstr ""
 
-#: src/preferences.c:2629
+#: src/preferences.c:2670
 msgid "Decoding"
 msgstr ""
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:2652
+#: src/preferences.c:2693
 msgid "Low - can improve performance on slower machines"
 msgstr ""
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:2654
+#: src/preferences.c:2695
 msgid "Normal - recommended for most users"
 msgstr ""
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:2656
+#: src/preferences.c:2697
 msgid "High - can improve quality on very fast machines"
 msgstr ""
 
-#: src/preferences.c:2659
+#: src/preferences.c:2700
 msgid "Preview _quality"
 msgstr ""
 
-#: src/preferences.c:2660
+#: src/preferences.c:2701
 msgid "The preview quality for video playback - affects resizing"
 msgstr ""
 
-#: src/preferences.c:2675
+#: src/preferences.c:2717
 msgid "_Show FPS statistics"
 msgstr ""
 
-#: src/preferences.c:2694
+#: src/preferences.c:2736
 msgid "_Plugin"
 msgstr "_Eklenti"
 
-#: src/preferences.c:2718
+#: src/preferences.c:2760
 msgid "Stream audio"
 msgstr ""
 
-#: src/preferences.c:2721
+#: src/preferences.c:2763
 msgid "Stream audio to playback plugin"
 msgstr ""
 
-#: src/preferences.c:2734
+#: src/preferences.c:2778
 msgid "Record player output"
 msgstr ""
 
-#: src/preferences.c:2737
+#: src/preferences.c:2781
 msgid "Record output from player instead of input to player"
 msgstr ""
 
-#: src/preferences.c:2744
+#: src/preferences.c:2789
 msgid "VIDEO"
 msgstr "VİDEO"
 
-#: src/preferences.c:2787
+#: src/preferences.c:2833
 msgid "_Player"
 msgstr ""
 
-#: src/preferences.c:2792
+#: src/preferences.c:2838
 msgid "(See also the Jack Integration tab for jack startup options)"
 msgstr ""
 
-#: src/preferences.c:2819
+#: src/preferences.c:2865
 msgid "mplayer"
 msgstr "mplayer"
 
-#: src/preferences.c:2830
+#: src/preferences.c:2876
 #, fuzzy
 msgid "mplayer2"
 msgstr "mplayer"
 
-#: src/preferences.c:2833
+#: src/preferences.c:2879
 msgid "Audio play _command"
 msgstr ""
 
-#: src/preferences.c:2840
+#: src/preferences.c:2886
 msgid "- internal -"
 msgstr ""
 
-#: src/preferences.c:2849
+#: src/preferences.c:2895
 msgid "Audio follows video _rate/direction"
 msgstr ""
 
-#: src/preferences.c:2857
+#: src/preferences.c:2903
 msgid "Audio follows _clip switches"
 msgstr ""
 
-#: src/preferences.c:2864
+#: src/preferences.c:2910
 msgid "Source:"
 msgstr ""
 
-#: src/preferences.c:2868
+#: src/preferences.c:2914
 msgid "_Internal"
 msgstr ""
 
-#: src/preferences.c:2873
+#: src/preferences.c:2919
 msgid "_External (requires jack or pulse audio player)"
 msgstr ""
 
-#: src/preferences.c:2892
+#: src/preferences.c:2940
 msgid "AUDIO"
 msgstr "SES"
 
-#: src/preferences.c:2902
+#: src/preferences.c:2950
 msgid "Playback"
 msgstr "Oynat"
 
-#: src/preferences.c:2925
+#: src/preferences.c:2973
 msgid ""
 "Record audio when capturing an e_xternal window\n"
 " (requires jack or pulse audio)"
 msgstr ""
 
-#: src/preferences.c:2940
+#: src/preferences.c:2988
 msgid "      What to record when 'r' is pressed   "
 msgstr ""
 
-#: src/preferences.c:2949
+#: src/preferences.c:2997
 msgid "_Frame changes"
 msgstr "_Çerçeve değişiklikleri"
 
-#: src/preferences.c:2964
+#: src/preferences.c:3012
 msgid "F_PS changes"
 msgstr "_FPS değişiklikleri"
 
-#: src/preferences.c:2982
+#: src/preferences.c:3030
 msgid "_Real time effects"
 msgstr ""
 
-#: src/preferences.c:2993
+#: src/preferences.c:3041
 msgid "_Clip switches"
 msgstr ""
 
-#: src/preferences.c:3004
+#: src/preferences.c:3052
 msgid "_Audio (requires jack or pulse audio player)"
 msgstr ""
 
-#: src/preferences.c:3024
+#: src/preferences.c:3072
 msgid "Pause recording if free disk space falls below"
 msgstr ""
 
 #. TRANSLATORS: gigabytes
-#: src/preferences.c:3030
+#: src/preferences.c:3078
 msgid "GB"
 msgstr "GB"
 
-#: src/preferences.c:3037
+#: src/preferences.c:3085
 msgid "Recording"
 msgstr "Kaydediliyor"
 
-#: src/preferences.c:3055
+#: src/preferences.c:3103
 msgid "Encoder"
 msgstr ""
 
-#: src/preferences.c:3090
+#: src/preferences.c:3137
 msgid "Output format"
 msgstr "Çıktı biçimi"
 
-#: src/preferences.c:3106
+#: src/preferences.c:3153
 msgid "Audio codec"
 msgstr "Ses çözücüsü"
 
-#: src/preferences.c:3119
+#: src/preferences.c:3165
 msgid "Encoding"
 msgstr "Kodlama"
 
-#: src/preferences.c:3134
+#: src/preferences.c:3180
 msgid "Use _antialiasing when resizing"
 msgstr ""
 
-#: src/preferences.c:3143
+#: src/preferences.c:3189
 msgid "Number of _real time effect keys"
 msgstr ""
 
-#: src/preferences.c:3145
+#: src/preferences.c:3192
 msgid ""
 "The number of \"virtual\" real time effect keys. They can be controlled "
 "through the real time effects window, or via network (OSC)."
 msgstr ""
 
-#: src/preferences.c:3152
+#: src/preferences.c:3199
 msgid "Use _threads where possible when applying effects"
 msgstr ""
 
-#: src/preferences.c:3159
+#: src/preferences.c:3207
 msgid "Number of _threads"
 msgstr ""
 
-#: src/preferences.c:3172
+#: src/preferences.c:3221
 msgid "Restart is required if any of the following paths are changed:"
 msgstr ""
 
-#: src/preferences.c:3182
+#: src/preferences.c:3231
 msgid "Weed plugin path"
 msgstr ""
 
-#: src/preferences.c:3184
+#: src/preferences.c:3234
 msgid "Frei0r plugin path"
 msgstr ""
 
-#: src/preferences.c:3186
+#: src/preferences.c:3237
 msgid "LADSPA plugin path"
 msgstr ""
 
-#: src/preferences.c:3209
+#: src/preferences.c:3261
 msgid "      Video load directory (default)      "
 msgstr "      Video yükleme dizini (varsayılan)      "
 
-#: src/preferences.c:3215
+#: src/preferences.c:3267
 msgid "      Video save directory (default) "
 msgstr "      Video kaydetme dizini (varsayılan) "
 
-#: src/preferences.c:3221
+#: src/preferences.c:3273
 msgid "      Audio load directory (default) "
 msgstr "      Ses yükleme dizini (varsayılan) "
 
-#: src/preferences.c:3227
+#: src/preferences.c:3279
 msgid "      Image directory (default) "
 msgstr "      Resim dizini (varsayılan) "
 
-#: src/preferences.c:3233
+#: src/preferences.c:3285
 msgid "      Backup/Restore directory (default) "
 msgstr ""
 
-#: src/preferences.c:3239
+#: src/preferences.c:3291
 msgid "      Temp directory (do not remove) "
 msgstr ""
 
-#: src/preferences.c:3252
+#: src/preferences.c:3304
 msgid "The default directory for loading video clips from"
 msgstr ""
 
-#: src/preferences.c:3277
+#: src/preferences.c:3329
 msgid "The default directory for saving encoded clips to"
 msgstr ""
 
-#: src/preferences.c:3285
+#: src/preferences.c:3337
 msgid "The default directory for loading and saving audio"
 msgstr ""
 
-#: src/preferences.c:3293
+#: src/preferences.c:3345
 msgid "The default directory for saving frameshots to"
 msgstr ""
 
-#: src/preferences.c:3301
+#: src/preferences.c:3353
 msgid "The default directory for backing up/restoring single clips"
 msgstr ""
 
-#: src/preferences.c:3309
+#: src/preferences.c:3361
 msgid "LiVES working directory."
 msgstr "LiVES çalışma dizini."
 
-#: src/preferences.c:3359
+#: src/preferences.c:3412
 msgid "Directories"
 msgstr "Dizinler"
 
-#: src/preferences.c:3374
+#: src/preferences.c:3427
 msgid "Warn if diskspace falls below: "
 msgstr ""
 
-#: src/preferences.c:3380 src/preferences.c:3394
+#: src/preferences.c:3433 src/preferences.c:3447
 msgid " MB [set to 0 to disable]"
 msgstr ""
 
-#: src/preferences.c:3389
+#: src/preferences.c:3442
 msgid "Diskspace critical level: "
 msgstr ""
 
-#: src/preferences.c:3407
+#: src/preferences.c:3461
 msgid ""
 "Warn on Insert / Merge if _frame rate of clipboard does not match frame rate "
 "of selection"
 msgstr ""
 
-#: src/preferences.c:3417
+#: src/preferences.c:3471
 msgid "Warn on Open if file _size exceeds "
 msgstr ""
 
-#: src/preferences.c:3425
+#: src/preferences.c:3479
 msgid " MB"
 msgstr " MB"
 
-#: src/preferences.c:3432
+#: src/preferences.c:3486
 msgid "Show a warning before saving a se_t"
 msgstr ""
 
-#: src/preferences.c:3442
+#: src/preferences.c:3496
 msgid ""
 "Show a warning if _mplayer/mplayer2, sox, composite or convert is not found "
 "when LiVES is started."
 msgstr ""
 
-#: src/preferences.c:3452
+#: src/preferences.c:3506
 msgid "Show a warning if no _rendered effects are found at startup."
 msgstr ""
 
-#: src/preferences.c:3464
+#: src/preferences.c:3518
 msgid "Show a warning if no _encoder plugins are found at startup."
 msgstr ""
 
-#: src/preferences.c:3474
+#: src/preferences.c:3528
 msgid "Show a warning if a _duplicate set name is entered."
 msgstr ""
 
-#: src/preferences.c:3485
+#: src/preferences.c:3539
 msgid "When a set is loaded, warn if clips are missing from _layouts."
 msgstr ""
 
-#: src/preferences.c:3495
+#: src/preferences.c:3550
 msgid "Warn if a clip used in a layout is about to be closed."
 msgstr ""
 
-#: src/preferences.c:3505
+#: src/preferences.c:3561
 msgid "Warn if frames used in a layout are about to be deleted."
 msgstr ""
 
-#: src/preferences.c:3515
+#: src/preferences.c:3572
 msgid "Warn if frames used in a layout are about to be shifted."
 msgstr ""
 
-#: src/preferences.c:3525
+#: src/preferences.c:3583
 msgid "Warn if frames used in a layout are about to be altered."
 msgstr ""
 
-#: src/preferences.c:3535
+#: src/preferences.c:3594
 msgid "Warn if audio used in a layout is about to be deleted."
 msgstr ""
 
-#: src/preferences.c:3546
+#: src/preferences.c:3606
 msgid "Warn if audio used in a layout is about to be shifted."
 msgstr ""
 
-#: src/preferences.c:3556
+#: src/preferences.c:3617
 msgid "Warn if audio used in a layout is about to be altered."
 msgstr ""
 
-#: src/preferences.c:3566
+#: src/preferences.c:3628
 msgid "Popup layout errors after clip changes."
 msgstr ""
 
-#: src/preferences.c:3577
+#: src/preferences.c:3639
 msgid "Warn if the layout has not been saved when leaving multitrack mode."
 msgstr ""
 
-#: src/preferences.c:3588
+#: src/preferences.c:3650
 msgid ""
 "Warn if multitrack has no audio channels, and a layout with audio is loaded."
 msgstr ""
 
-#: src/preferences.c:3598
+#: src/preferences.c:3660
 msgid ""
 "Warn if multitrack has audio channels, and your audio player is not \"jack\" "
 "or \"pulse audio\"."
 msgstr ""
 
-#: src/preferences.c:3610
+#: src/preferences.c:3672
 msgid "Show info message after importing from firewire device."
 msgstr ""
 
-#: src/preferences.c:3626
+#: src/preferences.c:3688
 msgid "Show a warning before opening a yuv4mpeg stream (advanced)."
 msgstr ""
 
-#: src/preferences.c:3639
+#: src/preferences.c:3701
 msgid "Show a warning when multitrack is low on backup space."
 msgstr ""
 
-#: src/preferences.c:3650
+#: src/preferences.c:3713
 msgid "Show a warning advising cleaning of disk space after a crash."
 msgstr ""
 
-#: src/preferences.c:3661
+#: src/preferences.c:3725
 msgid "Show a warning if unable to connect to pulseaudio player."
 msgstr ""
 
-#: src/preferences.c:3673
+#: src/preferences.c:3737
 msgid "Show a warning before wiping a layout which has unsaved changes."
 msgstr ""
 
-#: src/preferences.c:3685
+#: src/preferences.c:3749
 msgid "Warnings"
 msgstr "Uyarılar"
 
-#: src/preferences.c:3703
+#: src/preferences.c:3767
 msgid "Midi synch (requires the files midistart and midistop)"
 msgstr ""
 
-#: src/preferences.c:3715
+#: src/preferences.c:3779
 msgid "When inserting/merging frames:  "
 msgstr ""
 
-#: src/preferences.c:3719
+#: src/preferences.c:3783
 msgid "_Speed Up/Slow Down Insertion"
 msgstr ""
 
-#: src/preferences.c:3723
+#: src/preferences.c:3787
 msgid "_Resample Insertion"
 msgstr ""
 
-#: src/preferences.c:3730
+#: src/preferences.c:3794
 msgid "CD device           "
 msgstr "CD aygıtı           "
 
-#: src/preferences.c:3733
+#: src/preferences.c:3797
 msgid "LiVES can load audio tracks from this CD"
 msgstr ""
 
-#: src/preferences.c:3746
+#: src/preferences.c:3813
 msgid "Default FPS        "
 msgstr ""
 
-#: src/preferences.c:3749
+#: src/preferences.c:3816
 msgid "Frames per second to use when none is specified"
 msgstr ""
 
-#: src/preferences.c:3757
+#: src/preferences.c:3825
 msgid "Misc"
 msgstr "Çeşitli"
 
-#: src/preferences.c:3782
+#: src/preferences.c:3850
 msgid "New theme:           "
 msgstr "Yeni tema:           "
 
-#: src/preferences.c:3800
+#: src/preferences.c:3867
 msgid "Themes"
 msgstr "Temalar"
 
-#: src/preferences.c:3815
+#: src/preferences.c:3882
 msgid "Download bandwidth (Kb/s)       "
 msgstr ""
 
-#: src/preferences.c:3823
+#: src/preferences.c:3890
 msgid "LiVES must be compiled without \"configure --disable-OSC\" to use OMC"
 msgstr ""
 
-#: src/preferences.c:3833
+#: src/preferences.c:3900
 msgid "OMC remote control enabled"
 msgstr ""
 
-#: src/preferences.c:3841
+#: src/preferences.c:3908
 msgid "UDP port       "
 msgstr ""
 
-#: src/preferences.c:3850
+#: src/preferences.c:3917
 msgid "Start OMC on startup"
 msgstr ""
 
-#: src/preferences.c:3870
+#: src/preferences.c:3937
 msgid "Streaming/Networking"
 msgstr ""
 
-#: src/preferences.c:3882
+#: src/preferences.c:3949
 msgid "Jack transport"
 msgstr ""
 
-#: src/preferences.c:3886
+#: src/preferences.c:3953
 msgid ""
 "LiVES must be compiled with jack/transport.h and jack/jack.h present to use "
 "jack transport"
 msgstr ""
 
-#: src/preferences.c:3892
+#: src/preferences.c:3959
 msgid "Jack _transport config file"
 msgstr ""
 
-#: src/preferences.c:3899 src/preferences.c:3989
+#: src/preferences.c:3967 src/preferences.c:4058
 msgid "Start _server on LiVES startup"
 msgstr ""
 
-#: src/preferences.c:3911
+#: src/preferences.c:3979
 msgid "Jack transport _master (start and stop)"
 msgstr ""
 
-#: src/preferences.c:3921
+#: src/preferences.c:3989
 msgid "Jack transport _client (start and stop)"
 msgstr ""
 
-#: src/preferences.c:3935
+#: src/preferences.c:4003
 msgid "Jack transport sets start position"
 msgstr ""
 
-#: src/preferences.c:3952
+#: src/preferences.c:4020
 msgid "Jack transport timebase slave"
 msgstr ""
 
-#: src/preferences.c:3963
+#: src/preferences.c:4031
 msgid "(See also Playback -> Audio follows video rate/direction)"
 msgstr ""
 
-#: src/preferences.c:3971
+#: src/preferences.c:4039
 msgid "Jack audio"
 msgstr ""
 
-#: src/preferences.c:3975
+#: src/preferences.c:4043
 msgid "LiVES must be compiled with jack/jack.h present to use jack audio"
 msgstr ""
 
-#: src/preferences.c:3978
+#: src/preferences.c:4046
 msgid ""
 "You MUST set the audio player to \"jack\" in the Playback tab to use jack "
 "audio"
 msgstr ""
 
-#: src/preferences.c:3984
+#: src/preferences.c:4052
 msgid "Jack _audio server config file"
 msgstr ""
 
-#: src/preferences.c:3996
+#: src/preferences.c:4065
 msgid "Play audio even when transport is _paused"
 msgstr ""
 
-#: src/preferences.c:4008
+#: src/preferences.c:4077
 msgid "Automatically connect to System Out ports when 'playing' External Audio"
 msgstr ""
 
-#: src/preferences.c:4021
+#: src/preferences.c:4090
 msgid "Jack Integration"
 msgstr ""
 
-#: src/preferences.c:4035
+#: src/preferences.c:4104
 msgid "Events to respond to:"
 msgstr ""
 
-#: src/preferences.c:4044
+#: src/preferences.c:4113
 msgid "_Joystick events"
 msgstr ""
 
-#: src/preferences.c:4051
+#: src/preferences.c:4120
 msgid "_Joystick device"
 msgstr ""
 
-#: src/preferences.c:4053
+#: src/preferences.c:4122
 msgid "The joystick device, e.g. /dev/input/js0"
 msgstr ""
 
-#: src/preferences.c:4071
+#: src/preferences.c:4142
 msgid "_MIDI events"
 msgstr ""
 
-#: src/preferences.c:4080
+#: src/preferences.c:4151
 msgid "Use _ALSA MIDI (recommended)"
 msgstr ""
 
-#: src/preferences.c:4082
+#: src/preferences.c:4153
 msgid "Create an ALSA MIDI port which other MIDI devices can be connected to"
 msgstr ""
 
-#: src/preferences.c:4090
+#: src/preferences.c:4162
 msgid "Use _raw MIDI"
 msgstr ""
 
-#: src/preferences.c:4092
+#: src/preferences.c:4164
 msgid "Read directly from the MIDI device"
 msgstr ""
 
-#: src/preferences.c:4104
+#: src/preferences.c:4177
 msgid "_MIDI device"
 msgstr ""
 
-#: src/preferences.c:4106
+#: src/preferences.c:4179
 msgid "The MIDI device, e.g. /dev/input/midi0"
 msgstr ""
 
-#: src/preferences.c:4118
+#: src/preferences.c:4193
 msgid "Advanced"
 msgstr "Gelişmiş"
 
-#: src/preferences.c:4124
+#: src/preferences.c:4199
 msgid "MIDI check _rate"
 msgstr ""
 
-#: src/preferences.c:4127
+#: src/preferences.c:4203
 msgid ""
 "Number of MIDI checks per keyboard tick. Increasing this may improve MIDI "
 "responsiveness, but may slow down playback."
 msgstr ""
 
-#: src/preferences.c:4134
+#: src/preferences.c:4211
 msgid "MIDI repeat"
 msgstr ""
 
-#: src/preferences.c:4137
+#: src/preferences.c:4214
 msgid "Number of non-reads allowed between succesive reads."
 msgstr ""
 
-#: src/preferences.c:4140
+#: src/preferences.c:4218
 msgid "(Warning: setting this value too high can slow down playback.)"
 msgstr ""
 
-#: src/preferences.c:4159
+#: src/preferences.c:4237
 msgid "MIDI/Joystick learner"
 msgstr ""
 
-#: src/preferences.c:4499
+#: src/preferences.c:4679
 msgid ""
 "\n"
 "LiVES will now shut down. You need to restart it for the directory change to "
@@ -7789,214 +7803,214 @@
 "Click OK to continue.\n"
 msgstr ""
 
-#: src/preferences.c:4523
+#: src/preferences.c:4703
 msgid ""
 "For the directory change to take effect LiVES will restart when preferences "
 "dialog closes."
 msgstr ""
 
-#: src/preferences.c:4527
+#: src/preferences.c:4707
 msgid "Theme changes will not take effect until the next time you start LiVES."
 msgstr ""
 
-#: src/preferences.c:4531
+#: src/preferences.c:4711
 msgid "Jack options will not take effect until the next time you start LiVES."
 msgstr ""
 
-#: src/osc.c:2585
+#: src/osc.c:2616
 #, c-format
 msgid "Syncing to external framerate of %.8f frames per second.\n"
 msgstr ""
 
-#: src/osc.c:6746
+#: src/osc.c:6938
 msgid "Cannot initialize OSC receiver\n"
 msgstr ""
 
-#: src/osc.c:6770
+#: src/osc.c:6961
 #, c-format
 msgid "WARNING: Cannot start OSC server at UDP port %d\n"
 msgstr ""
 
-#: src/osc.c:6775
+#: src/osc.c:6963
 #, c-format
 msgid "Started OSC server at UDP port %d\n"
 msgstr ""
 
-#: src/osc.c:6890
+#: src/osc.c:7076
 #, c-format
 msgid "Cannot start OSC/UDP server at port %d \n"
 msgstr ""
 
-#: src/resample.c:125 src/resample.c:304
+#: src/resample.c:131 src/resample.c:305
 #, c-format
 msgid "Resizing frames 1 to %d"
 msgstr ""
 
-#: src/resample.c:140 src/resample.c:318
+#: src/resample.c:145 src/resample.c:318
 #, c-format
 msgid "Resizing/letterboxing frames 1 to %d"
 msgstr ""
 
-#: src/resample.c:361 src/resample.c:385
+#: src/resample.c:360 src/resample.c:384
 msgid "Resize"
 msgstr "Yeniden Boyutlandır"
 
-#: src/resample.c:395
+#: src/resample.c:394
 msgid "Resample/Resize"
 msgstr ""
 
-#: src/resample.c:680
+#: src/resample.c:676
 #, c-format
 msgid "Length of video is now %d frames.\n"
 msgstr ""
 
-#: src/resample.c:745
+#: src/resample.c:737
 msgid ""
 "\n"
 "\n"
 "New rate must be greater than 0\n"
 msgstr ""
 
-#: src/resample.c:797 src/resample.c:813
+#: src/resample.c:788 src/resample.c:803
 msgid "Resampling audio"
 msgstr ""
 
-#: src/resample.c:831
+#: src/resample.c:821
 msgid "LiVES was unable to resample the audio as requested.\n"
 msgstr ""
 
-#: src/resample.c:833 src/resample.c:837
+#: src/resample.c:823 src/resample.c:827
 msgid "Resample Audio"
 msgstr ""
 
-#: src/resample.c:845
+#: src/resample.c:835
 #, c-format
 msgid "Audio was resampled to %d Hz, %d channels, %d bit"
 msgstr ""
 
-#: src/resample.c:1034
+#: src/resample.c:1016
 #, c-format
 msgid "Resampling video at %.8f frames per second..."
 msgstr ""
 
-#: src/resample.c:1037
+#: src/resample.c:1018
 #, c-format
 msgid "Resampling video at %.3f frames per second..."
 msgstr ""
 
-#: src/resample.c:1068
+#: src/resample.c:1049
 msgid "Reordering error !\n"
 msgstr ""
 
-#: src/resample.c:1079
+#: src/resample.c:1060
 msgid "Resample"
 msgstr "Örnek tekrar"
 
-#: src/resample.c:1192
+#: src/resample.c:1173
 msgid "LiVES: - Resample Audio"
 msgstr ""
 
-#: src/resample.c:1195
+#: src/resample.c:1175
 msgid "LiVES: - Insert Silence"
 msgstr ""
 
-#: src/resample.c:1198
+#: src/resample.c:1177
 msgid "LiVES: - New Clip Audio"
 msgstr ""
 
-#: src/resample.c:1201
+#: src/resample.c:1179
 msgid "LiVES: - External Clip Settings"
 msgstr ""
 
-#: src/resample.c:1238 src/resample.c:1358
+#: src/resample.c:1215 src/resample.c:1332
 msgid "Rate (Hz) "
 msgstr ""
 
-#: src/resample.c:1245 src/resample.c:1372
+#: src/resample.c:1222 src/resample.c:1346
 msgid "Channels"
 msgstr ""
 
-#: src/resample.c:1252
+#: src/resample.c:1229
 msgid "Sample Size "
 msgstr ""
 
-#: src/resample.c:1268 src/resample.c:1425
+#: src/resample.c:1245 src/resample.c:1399
 msgid "Signed"
 msgstr ""
 
-#: src/resample.c:1274 src/resample.c:1435
+#: src/resample.c:1251 src/resample.c:1409
 msgid "Unsigned"
 msgstr "İşaretsiz"
 
-#: src/resample.c:1297 src/resample.c:1460
+#: src/resample.c:1273 src/resample.c:1433
 msgid "Little Endian"
 msgstr ""
 
-#: src/resample.c:1303 src/resample.c:1468
+#: src/resample.c:1279 src/resample.c:1441
 msgid "Big Endian"
 msgstr ""
 
-#: src/resample.c:1315
+#: src/resample.c:1290
 msgid "Current"
 msgstr "Güncel"
 
-#: src/resample.c:1340
+#: src/resample.c:1315
 msgid "_Enable audio"
 msgstr ""
 
-#: src/resample.c:1372
+#: src/resample.c:1346
 msgid "_Channels"
 msgstr ""
 
-#: src/resample.c:1394
+#: src/resample.c:1368
 msgid "_Sample Size"
 msgstr ""
 
-#: src/resample.c:1394
+#: src/resample.c:1368
 msgid "Sample Size"
 msgstr ""
 
-#: src/resample.c:1489
+#: src/resample.c:1461
 msgid "New"
 msgstr "Yeni"
 
-#: src/resample.c:1512
+#: src/resample.c:1484
 msgid "_Frames Per Second "
 msgstr ""
 
-#: src/resample.c:1530
+#: src/resample.c:1502
 msgid "Record for maximum:  "
 msgstr ""
 
-#: src/resample.c:1533
+#: src/resample.c:1505
 msgid " hours  "
 msgstr " saat  "
 
-#: src/resample.c:1536
+#: src/resample.c:1508
 msgid " minutes  "
 msgstr " dakika  "
 
-#: src/resample.c:1538
+#: src/resample.c:1510
 msgid " seconds  "
 msgstr " saniye  "
 
-#: src/resample.c:1545
+#: src/resample.c:1517
 msgid "Unlimited"
 msgstr "Sınırsız"
 
-#: src/resample.c:1561
+#: src/resample.c:1533
 msgid "Click OK to begin recording, or Cancel to quit."
 msgstr ""
 
-#: src/resample.c:1670
+#: src/resample.c:1638
 msgid "LiVES: - Change playback speed"
 msgstr ""
 
-#: src/resample.c:1673
+#: src/resample.c:1640
 msgid "LiVES: - Resample Video"
 msgstr ""
 
-#: src/resample.c:1696
+#: src/resample.c:1663
 #, c-format
 msgid ""
 "\n"
@@ -8007,7 +8021,7 @@
 "in _frames per second"
 msgstr ""
 
-#: src/resample.c:1701
+#: src/resample.c:1667
 #, c-format
 msgid ""
 "\n"
@@ -8018,89 +8032,89 @@
 "in frames per second"
 msgstr ""
 
-#: src/resample.c:1723
+#: src/resample.c:1688
 msgid "OR enter the desired clip length in _seconds"
 msgstr ""
 
-#: src/resample.c:1745
+#: src/resample.c:1710
 msgid "Change the _audio speed as well"
 msgstr ""
 
-#: src/resample.c:1846
+#: src/resample.c:1810
 msgid ""
 "\n"
 "Speeding up the clip will cause missing frames in some multitrack layouts.\n"
 "Are you sure you wish to change the speed ?\n"
 msgstr ""
 
-#: src/resample.c:1863
+#: src/resample.c:1829
 msgid ""
 "\n"
 "Speeding up the clip will cause missing audio in some multitrack layouts.\n"
 "Are you sure you wish to change the speed ?\n"
 msgstr ""
 
-#: src/resample.c:1878
+#: src/resample.c:1847
 msgid ""
 "\n"
 "Changing the speed will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/resample.c:1892
+#: src/resample.c:1863
 msgid ""
 "\n"
 "Changing the speed will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/resample.c:1938
+#: src/resample.c:1911
 msgid "Speed Change"
 msgstr ""
 
-#: src/resample.c:1947
+#: src/resample.c:1920
 #, c-format
 msgid "Changed playback speed to %.3f frames per second and audio to %d Hz.\n"
 msgstr ""
 
-#: src/resample.c:1950
+#: src/resample.c:1922
 #, c-format
 msgid "Changed playback speed to %.3f frames per second.\n"
 msgstr ""
 
-#: src/resample.c:2035
+#: src/resample.c:2006
 msgid "Resampling video"
 msgstr ""
 
-#: src/resample.c:2042 src/resample.c:2160 src/resample.c:2182
+#: src/resample.c:2012 src/resample.c:2127 src/resample.c:2148
 msgid "Resampling clipboard video"
 msgstr ""
 
-#: src/resample.c:2047
+#: src/resample.c:2016
 msgid "Reordering frames"
 msgstr ""
 
-#: src/resample.c:2056
+#: src/resample.c:2025
 msgid ""
 "\n"
 "\n"
 "LiVES was unable to reorder the frames."
 msgstr ""
 
-#: src/resample.c:2104
+#: src/resample.c:2071
 msgid "Deordering frames"
 msgstr ""
 
-#: src/resample.c:2199
+#: src/resample.c:2165
 msgid "resampling error..."
 msgstr ""
 
-#: src/rte_window.c:85 src/rte_window.c:1708
+#: src/rte_window.c:124 src/rte_window.c:1709
 #, c-format
 msgid "Type: %s"
 msgstr "Tür: %s"
 
-#: src/rte_window.c:112
+#: src/rte_window.c:150
 msgid ""
 "\n"
 "\n"
@@ -8110,7 +8124,7 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:426
+#: src/rte_window.c:460
 msgid ""
 "\n"
 "\n"
@@ -8118,19 +8132,19 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:432
+#: src/rte_window.c:466
 #, c-format
 msgid "Saving keymap to %s\n"
 msgstr ""
 
-#: src/rte_window.c:439
+#: src/rte_window.c:471
 #, c-format
 msgid ""
 "\n"
 "Updating keymap file %s..."
 msgstr ""
 
-#: src/rte_window.c:446
+#: src/rte_window.c:477
 #, c-format
 msgid ""
 "\n"
@@ -8140,12 +8154,12 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/rte_window.c:526
+#: src/rte_window.c:556
 #, c-format
 msgid "Saving real time effect defaults to %s..."
 msgstr ""
 
-#: src/rte_window.c:535
+#: src/rte_window.c:563
 #, c-format
 msgid ""
 "\n"
@@ -8155,22 +8169,22 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/rte_window.c:632
+#: src/rte_window.c:657
 #, c-format
 msgid "Loading real time effect defaults from %s..."
 msgstr ""
 
-#: src/rte_window.c:681
+#: src/rte_window.c:701
 #, c-format
 msgid "Loading generator default sizes from %s..."
 msgstr ""
 
-#: src/rte_window.c:1306
+#: src/rte_window.c:1319
 #, c-format
 msgid "Loading default keymap from %s..."
 msgstr ""
 
-#: src/rte_window.c:1329
+#: src/rte_window.c:1339
 #, c-format
 msgid ""
 "\n"
@@ -8180,48 +8194,48 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/rte_window.c:1403
+#: src/rte_window.c:1412
 #, c-format
 msgid "Invalid line %d in %s\n"
 msgstr ""
 
-#: src/rte_window.c:1483
+#: src/rte_window.c:1490
 #, c-format
 msgid "Invalid key %d in %s\n"
 msgstr ""
 
-#: src/rte_window.c:1498
+#: src/rte_window.c:1505
 #, c-format
 msgid "Invalid effect %s in %s\n"
 msgstr ""
 
-#: src/rte_window.c:1517
+#: src/rte_window.c:1524
 #, c-format
 msgid "Unknown effect %s in %s\n"
 msgstr ""
 
-#: src/rte_window.c:1535
+#: src/rte_window.c:1542
 #, c-format
 msgid ""
 "This version of LiVES cannot mix generators/non-generators on the same key "
 "(%d) !\n"
 msgstr ""
 
-#: src/rte_window.c:1547
+#: src/rte_window.c:1554
 #, c-format
 msgid "Too many effects bound to key %d.\n"
 msgstr ""
 
-#: src/rte_window.c:1587
+#: src/rte_window.c:1593
 msgid "update required.\n"
 msgstr ""
 
-#: src/rte_window.c:1603
+#: src/rte_window.c:1607
 #, c-format
 msgid "Loading data connection map from %s..."
 msgstr ""
 
-#: src/rte_window.c:1612
+#: src/rte_window.c:1614
 msgid ""
 "\n"
 "\n"
@@ -8229,41 +8243,41 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:1691
+#: src/rte_window.c:1692
 #, c-format
 msgid "LiVES: Information for %s"
 msgstr ""
 
-#: src/rte_window.c:1704
+#: src/rte_window.c:1705
 #, c-format
 msgid "Effect name: %s"
 msgstr "Efekt ismi: %s"
 
-#: src/rte_window.c:1712
+#: src/rte_window.c:1713
 #, c-format
 msgid "Plugin name: %s"
 msgstr "Eklenti adı: %s"
 
-#: src/rte_window.c:1716
+#: src/rte_window.c:1717
 #, c-format
 msgid "Author: %s"
 msgstr "Yayıncı: %s"
 
-#: src/rte_window.c:1721
+#: src/rte_window.c:1722
 #, c-format
 msgid "and: %s"
 msgstr ""
 
-#: src/rte_window.c:1726
+#: src/rte_window.c:1727
 #, c-format
 msgid "Version: %d"
 msgstr "Sürüm: %d"
 
-#: src/rte_window.c:1734
+#: src/rte_window.c:1735
 msgid "Description: "
 msgstr "Açıklama: "
 
-#: src/rte_window.c:1960
+#: src/rte_window.c:1963
 msgid ""
 "\n"
 "\n"
@@ -8272,69 +8286,69 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:2024
+#: src/rte_window.c:2027
 #, c-format
 msgid "LiVES could not locate the effect %s.\n"
 msgstr ""
 
-#: src/rte_window.c:2225
+#: src/rte_window.c:2216
 msgid "LiVES: Real time effect mapping"
 msgstr ""
 
-#: src/rte_window.c:2257
+#: src/rte_window.c:2248
 #, c-format
 msgid "Ctrl-%d"
 msgstr "Ctrl-%d"
 
-#: src/rte_window.c:2264
+#: src/rte_window.c:2255
 msgid "Key active"
 msgstr ""
 
-#: src/rte_window.c:2279
+#: src/rte_window.c:2271
 msgid "Key grab"
 msgstr ""
 
-#: src/rte_window.c:2280
+#: src/rte_window.c:2272
 msgid "Grab keyboard for this effect key"
 msgstr ""
 
-#: src/rte_window.c:2290
+#: src/rte_window.c:2283
 msgid "_Clear all effects"
 msgstr ""
 
-#: src/rte_window.c:2304
+#: src/rte_window.c:2297
 msgid "Mode active"
 msgstr ""
 
-#: src/rte_window.c:2314 src/multitrack.c:8568
+#: src/rte_window.c:2307 src/multitrack.c:8762
 msgid "Info"
 msgstr "Bilgiler"
 
-#: src/rte_window.c:2315
+#: src/rte_window.c:2308
 msgid "Set Parameters"
 msgstr ""
 
-#: src/rte_window.c:2316
+#: src/rte_window.c:2309
 msgid "Set Connections"
 msgstr ""
 
-#: src/rte_window.c:2317
+#: src/rte_window.c:2310
 msgid "Clear"
 msgstr "Temizle"
 
-#: src/rte_window.c:2326
+#: src/rte_window.c:2319
 msgid "Effect name:"
 msgstr "Efekt adı:"
 
-#: src/rte_window.c:2391
+#: src/rte_window.c:2384
 msgid "_Save as default keymap"
 msgstr ""
 
-#: src/rte_window.c:2396
+#: src/rte_window.c:2389
 msgid "_Load default keymap"
 msgstr ""
 
-#: src/rte_window.c:2840
+#: src/rte_window.c:2833
 #, c-format
 msgid ""
 "Unable to create default keymap file: %s\n"
@@ -8392,86 +8406,86 @@
 msgid "none\n"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:494
+#: src/lives-yuv4mpeg.c:493
 #, c-format
 msgid ""
 "Unable to set display framerate to %.3f fps.\n"
 "\n"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:503
+#: src/lives-yuv4mpeg.c:502
 #, c-format
 msgid "Unable to open yuv4mpeg out stream %s\n"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:628
+#: src/lives-yuv4mpeg.c:626
 #, c-format
 msgid "TV card %d"
 msgstr "%d TV kartı"
 
-#: src/lives-yuv4mpeg.c:713
+#: src/lives-yuv4mpeg.c:710
 #, c-format
 msgid "Opened TV card %d (%s)"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:760
+#: src/lives-yuv4mpeg.c:757
 #, c-format
 msgid "Firewire card %d"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:796
+#: src/lives-yuv4mpeg.c:793
 #, c-format
 msgid "Opened firewire card %d"
 msgstr ""
 
-#: src/multitrack.c:666
+#: src/multitrack.c:736
 msgid "Auto backup"
 msgstr ""
 
-#: src/multitrack.c:868
+#: src/multitrack.c:935
 msgid "Backing audio"
 msgstr ""
 
-#: src/multitrack.c:1435
+#: src/multitrack.c:1515
 #, fuzzy, c-format
 msgid "%s : parameters for %s"
 msgstr "Parametre yok"
 
-#: src/multitrack.c:1809 src/multitrack.c:3483
+#: src/multitrack.c:1881 src/multitrack.c:3635
 #, c-format
 msgid "Current track: %s (layer %d)\n"
 msgstr ""
 
-#: src/multitrack.c:1813 src/multitrack.c:3484
+#: src/multitrack.c:1885 src/multitrack.c:3637
 msgid "Current track: Backing audio\n"
 msgstr ""
 
-#: src/multitrack.c:1814
+#: src/multitrack.c:1886
 #, c-format
 msgid "Current track: Layer %d audio\n"
 msgstr ""
 
-#: src/multitrack.c:1817
+#: src/multitrack.c:1889
 #, c-format
 msgid "%.2f sec.\n"
 msgstr "%.2f saniye.\n"
 
-#: src/multitrack.c:1822 src/multitrack.c:3490
+#: src/multitrack.c:1894 src/multitrack.c:3643
 #, c-format
 msgid "Source: %s"
 msgstr "Kaynak: %s"
 
-#: src/multitrack.c:1825 src/multitrack.c:3492
+#: src/multitrack.c:1897 src/multitrack.c:3645
 msgid "Right click for context menu.\n"
 msgstr ""
 
-#: src/multitrack.c:1827
+#: src/multitrack.c:1899
 msgid ""
 "Double click on a block\n"
 "to select it."
 msgstr ""
 
-#: src/multitrack.c:3312
+#: src/multitrack.c:3452
 msgid ""
 "\n"
 "\n"
@@ -8480,7 +8494,7 @@
 "right or double clicking on it.\n"
 msgstr ""
 
-#: src/multitrack.c:3315
+#: src/multitrack.c:3455
 msgid ""
 "\n"
 "\n"
@@ -8488,14 +8502,14 @@
 "Select an effect in FX stack first to view its parameters.\n"
 msgstr ""
 
-#: src/multitrack.c:3318
+#: src/multitrack.c:3458
 msgid ""
 "\n"
 "\n"
 "No clips loaded.\n"
 msgstr ""
 
-#: src/multitrack.c:3321
+#: src/multitrack.c:3462
 msgid ""
 "You must select two video tracks\n"
 "and a time region\n"
@@ -8505,7 +8519,7 @@
 "before inserting clips into the timeline."
 msgstr ""
 
-#: src/multitrack.c:3324
+#: src/multitrack.c:3465
 msgid ""
 "\n"
 "\n"
@@ -8514,210 +8528,210 @@
 "to apply compositors.\n"
 msgstr ""
 
-#: src/multitrack.c:3487
+#: src/multitrack.c:3640
 #, c-format
 msgid "%.2f sec. to %.2f sec.\n"
 msgstr ""
 
-#: src/multitrack.c:3493
+#: src/multitrack.c:3646
 msgid ""
 "Single click on timeline\n"
 "to select a frame.\n"
 msgstr ""
 
-#: src/multitrack.c:3711 src/multitrack.c:6790
+#: src/multitrack.c:3858 src/multitrack.c:6972
 #, c-format
 msgid "%s [unstable]"
 msgstr ""
 
-#: src/multitrack.c:3822
+#: src/multitrack.c:3973
 msgid ""
 "You can click and drag\n"
 "below the timeline"
 msgstr ""
 
-#: src/multitrack.c:3823
+#: src/multitrack.c:3974
 msgid "to select a time region.\n"
 msgstr ""
 
-#: src/multitrack.c:3985
+#: src/multitrack.c:4137
 msgid "LiVES: Selected clip"
 msgstr ""
 
-#: src/multitrack.c:3993
+#: src/multitrack.c:4145
 msgid "_Adjust start and end points"
 msgstr ""
 
-#: src/multitrack.c:4002
+#: src/multitrack.c:4154
 msgid "_Edit/encode in clip editor"
 msgstr ""
 
-#: src/multitrack.c:4009
+#: src/multitrack.c:4161
 msgid "_Show clip information"
 msgstr ""
 
-#: src/multitrack.c:4016
+#: src/multitrack.c:4168
 msgid "_Close this clip"
 msgstr ""
 
-#: src/multitrack.c:4236
+#: src/multitrack.c:4388
 msgid "Audio mixer (ctrl-m)"
 msgstr ""
 
-#: src/multitrack.c:4336
+#: src/multitrack.c:4488
 msgid "Single click on timeline"
 msgstr ""
 
-#: src/multitrack.c:4337
+#: src/multitrack.c:4489
 msgid "to select a frame."
 msgstr ""
 
-#: src/multitrack.c:4338
+#: src/multitrack.c:4490
 msgid "Double click or right click on timeline"
 msgstr ""
 
-#: src/multitrack.c:4339
+#: src/multitrack.c:4491
 msgid "to select a block."
 msgstr ""
 
-#: src/multitrack.c:4340
+#: src/multitrack.c:4492
 msgid "Clips can be dragged"
 msgstr ""
 
-#: src/multitrack.c:4341
+#: src/multitrack.c:4493
 msgid "onto the timeline."
 msgstr ""
 
-#: src/multitrack.c:4343
+#: src/multitrack.c:4495
 msgid "Mouse mode is: Move"
 msgstr ""
 
-#: src/multitrack.c:4344
+#: src/multitrack.c:4496
 msgid "clips can be moved around."
 msgstr ""
 
-#: src/multitrack.c:4349
+#: src/multitrack.c:4500
 msgid "Mouse mode is: Select."
 msgstr ""
 
-#: src/multitrack.c:4350
+#: src/multitrack.c:4501
 msgid "Drag with mouse on timeline"
 msgstr ""
 
-#: src/multitrack.c:4351
+#: src/multitrack.c:4502
 msgid "to select tracks and time."
 msgstr ""
 
-#: src/multitrack.c:4362
+#: src/multitrack.c:4509
 msgid "_Insert mode: Normal"
 msgstr ""
 
-#: src/multitrack.c:4378
+#: src/multitrack.c:4537
 msgid "_Mouse mode: Move"
 msgstr ""
 
-#: src/multitrack.c:4382
+#: src/multitrack.c:4540
 msgid "_Mouse mode: Select"
 msgstr ""
 
-#: src/multitrack.c:4405 src/multitrack.c:7925
+#: src/multitrack.c:4563 src/multitrack.c:8104
 msgid "Gravity: Normal"
 msgstr ""
 
-#: src/multitrack.c:4409
+#: src/multitrack.c:4565
 msgid "Gravity: Left"
 msgstr ""
 
-#: src/multitrack.c:4414
+#: src/multitrack.c:4569
 msgid "Gravity: Right"
 msgstr ""
 
-#: src/multitrack.c:4416
+#: src/multitrack.c:4570
 msgid "Close _last gap(s) in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:4419
+#: src/multitrack.c:4572
 msgid "Close _first gap(s) in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:4458
+#: src/multitrack.c:4627
 msgid "Close gaps"
 msgstr ""
 
-#: src/multitrack.c:4460
+#: src/multitrack.c:4629
 msgid "Move block"
 msgstr ""
 
-#: src/multitrack.c:4462
+#: src/multitrack.c:4631
 msgid "Move audio block"
 msgstr ""
 
-#: src/multitrack.c:4464
+#: src/multitrack.c:4633
 msgid "Delete block"
 msgstr ""
 
-#: src/multitrack.c:4466
+#: src/multitrack.c:4635
 msgid "Delete audio block"
 msgstr ""
 
-#: src/multitrack.c:4468
+#: src/multitrack.c:4637
 msgid "Split tracks"
 msgstr ""
 
-#: src/multitrack.c:4470
+#: src/multitrack.c:4639
 msgid "Split block"
 msgstr ""
 
-#: src/multitrack.c:4473
+#: src/multitrack.c:4642
 #, c-format
 msgid "Apply %s"
 msgstr "%s Uygula"
 
-#: src/multitrack.c:4478
+#: src/multitrack.c:4647
 #, c-format
 msgid "Delete %s"
 msgstr "%s Sil"
 
-#: src/multitrack.c:4482
+#: src/multitrack.c:4651
 msgid "Insert block"
 msgstr ""
 
-#: src/multitrack.c:4484
+#: src/multitrack.c:4653
 msgid "Insert gap"
 msgstr ""
 
-#: src/multitrack.c:4486
+#: src/multitrack.c:4655
 msgid "Insert audio block"
 msgstr ""
 
-#: src/multitrack.c:4488
+#: src/multitrack.c:4657
 msgid "Effect order change"
 msgstr ""
 
-#: src/multitrack.c:4898
+#: src/multitrack.c:5064
 msgid "unsigned "
 msgstr ""
 
-#: src/multitrack.c:4899
+#: src/multitrack.c:5065
 msgid "signed "
 msgstr ""
 
-#: src/multitrack.c:4904
+#: src/multitrack.c:5071
 #, c-format
 msgid ""
 "Multitrack values set to %.3f fps, frame size %d x %d, audio channels %d, "
 "audio rate %d, audio sample size %d, %s.\n"
 msgstr ""
 
-#: src/multitrack.c:4938
+#: src/multitrack.c:5104
 msgid "invalid event list. Failed.\n"
 msgstr ""
 
-#: src/multitrack.c:4944
+#: src/multitrack.c:5110
 msgid "event list has invalid fps. Failed.\n"
 msgstr ""
 
-#: src/multitrack.c:4953
+#: src/multitrack.c:5122
 #, c-format
 msgid ""
 "\n"
@@ -8727,7 +8741,7 @@
 "then load in the new set from the File menu.\n"
 msgstr ""
 
-#: src/multitrack.c:4993
+#: src/multitrack.c:5163
 #, c-format
 msgid ""
 "\n"
@@ -8735,600 +8749,592 @@
 "It cannot be loaded.\n"
 msgstr ""
 
-#: src/multitrack.c:5329 src/multitrack.c:5338 src/multitrack.c:21133
+#: src/multitrack.c:5452
 msgid "Layout was wiped.\n"
 msgstr ""
 
-#: src/multitrack.c:5374
+#: src/multitrack.c:5547
 #, c-format
 msgid "LiVES-%s: Multitrack %dx%d : %d bpp %.3f fps"
 msgstr ""
 
-#: src/multitrack.c:5617
+#: src/multitrack.c:5793
 msgid "In/out"
 msgstr ""
 
-#: src/multitrack.c:5619
+#: src/multitrack.c:5795
 msgid "FX stack"
 msgstr ""
 
-#: src/multitrack.c:5627 src/omc-learn.c:673
+#: src/multitrack.c:5803 src/omc-learn.c:659
 msgid "Params."
 msgstr ""
 
-#: src/multitrack.c:5978
+#: src/multitrack.c:6157
 msgid "_Open..."
 msgstr "_Aç..."
 
-#: src/multitrack.c:5996
+#: src/multitrack.c:6175
 msgid "O_pen File Selection..."
 msgstr "_Seçili dosyayı aç"
 
-#: src/multitrack.c:6040
+#: src/multitrack.c:6219
 msgid "Import Selection from _dvd/vcd..."
 msgstr "_dvd/vcd den seçimi içeri al"
 
-#: src/multitrack.c:6050
+#: src/multitrack.c:6229
 msgid "Import Selection from _dvd"
 msgstr "_dvd den seçimi içeri al"
 
-#: src/multitrack.c:6060
+#: src/multitrack.c:6239
 msgid "Import Selection from _vcd"
 msgstr "_vcd den seçimi içeri al"
 
-#: src/multitrack.c:6076
+#: src/multitrack.c:6255
 msgid "_Import from Device"
 msgstr "_Aygıttan içeri al"
 
-#: src/multitrack.c:6103
+#: src/multitrack.c:6282
 msgid "_Close the selected clip"
 msgstr ""
 
-#: src/multitrack.c:6198
+#: src/multitrack.c:6377
 msgid "_Save layout as..."
 msgstr ""
 
-#: src/multitrack.c:6206
+#: src/multitrack.c:6385
 msgid "_Load layout..."
 msgstr ""
 
-#: src/multitrack.c:6210
+#: src/multitrack.c:6389
 msgid "_Wipe/Delete layout..."
 msgstr ""
 
-#: src/multitrack.c:6236
+#: src/multitrack.c:6415
 msgid "_Ignore width, height and audio values from loaded layouts"
 msgstr ""
 
-#: src/multitrack.c:6240
+#: src/multitrack.c:6419
 msgid "Auto load _subtitles with clips"
 msgstr ""
 
-#: src/multitrack.c:6322
+#: src/multitrack.c:6501
 msgid "_CLIP EDITOR"
 msgstr ""
 
-#: src/multitrack.c:6334
+#: src/multitrack.c:6513
 msgid "_Adjust selected clip start/end points"
 msgstr ""
 
-#: src/multitrack.c:6343
+#: src/multitrack.c:6522
 msgid "_Insert selected clip"
 msgstr ""
 
-#: src/multitrack.c:6355
+#: src/multitrack.c:6534
 msgid "_Insert selected clip audio"
 msgstr ""
 
-#: src/multitrack.c:6364
+#: src/multitrack.c:6543
 msgid "_Delete selected block"
 msgstr ""
 
-#: src/multitrack.c:6373
+#: src/multitrack.c:6555
 msgid "_Jump to previous block boundary"
 msgstr ""
 
-#: src/multitrack.c:6382
+#: src/multitrack.c:6564
 msgid "_Jump to next block boundary"
 msgstr ""
 
-#: src/multitrack.c:6395
+#: src/multitrack.c:6577
 msgid "Clear _marks from timeline"
 msgstr ""
 
-#: src/multitrack.c:6403
+#: src/multitrack.c:6585
 msgid "Ignore selection limits when inserting"
 msgstr ""
 
-#: src/multitrack.c:6420 src/multitrack.c:16719
+#: src/multitrack.c:6602 src/multitrack.c:17009
 msgid "_Play from Timeline Position"
 msgstr ""
 
-#: src/multitrack.c:6434
+#: src/multitrack.c:6616
 msgid "Pla_y selected time only"
 msgstr ""
 
-#: src/multitrack.c:6518
+#: src/multitrack.c:6700
 msgid "_Move effects with blocks"
 msgstr ""
 
-#: src/multitrack.c:6531
+#: src/multitrack.c:6713
 msgid "Select _autotransition effect..."
 msgstr ""
 
-#: src/multitrack.c:6542
+#: src/multitrack.c:6724
 msgid "Crossfade audio with autotransition"
 msgstr ""
 
-#: src/multitrack.c:6550
+#: src/multitrack.c:6732
 msgid "View/_Edit selected effect"
 msgstr ""
 
-#: src/multitrack.c:6554
+#: src/multitrack.c:6736
 msgid "_Delete selected effect"
 msgstr ""
 
-#: src/multitrack.c:6562
+#: src/multitrack.c:6744
 msgid "Apply effect to _block..."
 msgstr ""
 
-#: src/multitrack.c:6619
+#: src/multitrack.c:6801
 msgid "Apply effect to _region..."
 msgstr ""
 
-#: src/multitrack.c:6885
+#: src/multitrack.c:7061
 msgid "_Tracks"
 msgstr ""
 
-#: src/multitrack.c:6896
+#: src/multitrack.c:7072
 msgid "Rename current track"
 msgstr ""
 
-#: src/multitrack.c:6904
+#: src/multitrack.c:7080
 msgid "Make _Backing Audio current track"
 msgstr ""
 
-#: src/multitrack.c:6915
+#: src/multitrack.c:7091
 msgid "Add Video Track at _Rear"
 msgstr ""
 
-#: src/multitrack.c:6923
+#: src/multitrack.c:7099
 msgid "Add Video Track at _Front"
 msgstr ""
 
-#: src/multitrack.c:6936
+#: src/multitrack.c:7112
 msgid "_Split current track at cursor"
 msgstr ""
 
-#: src/multitrack.c:6948
+#: src/multitrack.c:7124
 msgid "_Split selected video tracks"
 msgstr ""
 
-#: src/multitrack.c:6961
+#: src/multitrack.c:7137
 msgid "Insert gap in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:6969
+#: src/multitrack.c:7145
 msgid "Insert gap in current track/selected time"
 msgstr ""
 
-#: src/multitrack.c:6981
+#: src/multitrack.c:7157
 msgid "Close all _gaps in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:7007
+#: src/multitrack.c:7183
 msgid "Se_lection"
 msgstr "Seçi_m"
 
-#: src/multitrack.c:7018
+#: src/multitrack.c:7194
 msgid "_Select Current Track"
 msgstr ""
 
-#: src/multitrack.c:7025
+#: src/multitrack.c:7201
 msgid "Select _all video tracks"
 msgstr ""
 
-#: src/multitrack.c:7032
+#: src/multitrack.c:7208
 msgid "Select _no video tracks"
 msgstr ""
 
-#: src/multitrack.c:7039
+#: src/multitrack.c:7215
 msgid "Select all _time"
 msgstr ""
 
-#: src/multitrack.c:7050
+#: src/multitrack.c:7226
 msgid "Select from _zero time"
 msgstr ""
 
-#: src/multitrack.c:7057
+#: src/multitrack.c:7233
 msgid "Select to _end time"
 msgstr ""
 
-#: src/multitrack.c:7064
+#: src/multitrack.c:7240
 msgid "_Copy..."
 msgstr "_Kopyala..."
 
-#: src/multitrack.c:7075
+#: src/multitrack.c:7251
 msgid "_Timecode to region start"
 msgstr ""
 
-#: src/multitrack.c:7082
+#: src/multitrack.c:7258
 msgid "_Timecode to region end"
 msgstr ""
 
-#: src/multitrack.c:7089
+#: src/multitrack.c:7265
 msgid "_Region start to timecode"
 msgstr ""
 
-#: src/multitrack.c:7096
+#: src/multitrack.c:7272
 msgid "_Region end to timecode"
 msgstr ""
 
-#: src/multitrack.c:7110
+#: src/multitrack.c:7286
 msgid "Select/deselect block at current track/time"
 msgstr ""
 
-#: src/multitrack.c:7135
+#: src/multitrack.c:7311
 msgid "_Change width, height and audio values..."
 msgstr ""
 
-#: src/multitrack.c:7194
+#: src/multitrack.c:7370
 msgid "_Render"
 msgstr "_Tarama"
 
-#: src/multitrack.c:7205
+#: src/multitrack.c:7381
 msgid "_Render all to new clip"
 msgstr ""
 
-#: src/multitrack.c:7220
+#: src/multitrack.c:7396
 msgid "Render _video"
 msgstr ""
 
-#: src/multitrack.c:7225
+#: src/multitrack.c:7401
 msgid "Render _audio"
 msgstr ""
 
-#: src/multitrack.c:7235
+#: src/multitrack.c:7411
 msgid "_Normalise rendered audio"
 msgstr ""
 
-#: src/multitrack.c:7242
+#: src/multitrack.c:7418
 msgid "_Pre-render audio"
 msgstr ""
 
-#: src/multitrack.c:7251
+#: src/multitrack.c:7427
 msgid "_View"
 msgstr "_Göster"
 
-#: src/multitrack.c:7270
+#: src/multitrack.c:7446
 msgid "Block _In/out points"
 msgstr ""
 
-#: src/multitrack.c:7279
+#: src/multitrack.c:7455
 msgid "_Effects at current"
 msgstr ""
 
-#: src/multitrack.c:7297
+#: src/multitrack.c:7473
 msgid "Audio parameters"
 msgstr "Ses  parametreleri"
 
-#: src/multitrack.c:7308
+#: src/multitrack.c:7484
 msgid "Show backing _audio track"
 msgstr ""
 
-#: src/multitrack.c:7312
+#: src/multitrack.c:7488
 msgid "Compact view"
 msgstr "Yoğun görünüm"
 
-#: src/multitrack.c:7320
+#: src/multitrack.c:7496
 msgid "Maximum tracks to display..."
 msgstr ""
 
-#: src/multitrack.c:7327
+#: src/multitrack.c:7503
 msgid "Scroll to follow playback"
 msgstr ""
 
-#: src/multitrack.c:7331
+#: src/multitrack.c:7507
 msgid "_Center on cursor"
 msgstr ""
 
-#: src/multitrack.c:7338
+#: src/multitrack.c:7514
 msgid "_Zoom in"
 msgstr ""
 
-#: src/multitrack.c:7349
+#: src/multitrack.c:7525
 msgid "_Zoom out"
 msgstr ""
 
-#: src/multitrack.c:7361
+#: src/multitrack.c:7537
 msgid "Multitrack _details"
 msgstr ""
 
-#: src/multitrack.c:7374
+#: src/multitrack.c:7550
 msgid "_Event Window"
 msgstr ""
 
-#: src/multitrack.c:7378
+#: src/multitrack.c:7554
 msgid "_Event Window (selected time only)"
 msgstr ""
 
-#: src/multitrack.c:7382
+#: src/multitrack.c:7558
 msgid "_Show FRAME events"
 msgstr ""
 
-#: src/multitrack.c:7399
+#: src/multitrack.c:7575
 msgid "_Show multitrack keys"
 msgstr ""
 
-#: src/multitrack.c:7468
+#: src/multitrack.c:7644
 msgid "Mouse mode: _Move"
 msgstr ""
 
-#: src/multitrack.c:7476
+#: src/multitrack.c:7652
 msgid "Mouse mode: _Select"
 msgstr ""
 
-#: src/multitrack.c:7505
+#: src/multitrack.c:7681
 msgid "Insert mode: _Normal"
 msgstr ""
 
-#: src/multitrack.c:7733
+#: src/multitrack.c:7909
 msgid "Insert with _audio"
 msgstr ""
 
-#: src/multitrack.c:7734
+#: src/multitrack.c:7910
 msgid ""
 "Select whether video clips are inserted and moved with their audio or not"
 msgstr ""
 
-#: src/multitrack.c:7829
+#: src/multitrack.c:8007
 msgid "Select _overlap"
 msgstr ""
 
-#: src/multitrack.c:7830
+#: src/multitrack.c:8008
 msgid ""
 "Select whether timeline selection snaps to overlap between selected tracks "
 "or not"
 msgstr ""
 
-#: src/multitrack.c:7894 src/multitrack.c:14198
+#: src/multitrack.c:8073 src/multitrack.c:14422
 msgid "Expanded View (d)"
 msgstr ""
 
-#: src/multitrack.c:7897 src/multitrack.c:14205
+#: src/multitrack.c:8076 src/multitrack.c:14428
 msgid "Compact View (d)"
 msgstr ""
 
-#: src/multitrack.c:7939
+#: src/multitrack.c:8118
 msgid "Gravity: _Normal"
 msgstr ""
 
-#: src/multitrack.c:7952
+#: src/multitrack.c:8131
 msgid "Gravity: _Left"
 msgstr ""
 
-#: src/multitrack.c:7967
+#: src/multitrack.c:8146
 msgid "Gravity: _Right"
 msgstr ""
 
-#: src/multitrack.c:8297
+#: src/multitrack.c:8496
 msgid "_Apply"
 msgstr "_Uygula"
 
-#: src/multitrack.c:8319
+#: src/multitrack.c:8518
 msgid "Time"
 msgstr "Süre"
 
-#: src/multitrack.c:8333
+#: src/multitrack.c:8532
 msgid "_Del. node"
 msgstr ""
 
-#: src/multitrack.c:8341
+#: src/multitrack.c:8540
 msgid "_Next node"
 msgstr ""
 
-#: src/multitrack.c:8349
+#: src/multitrack.c:8548
 msgid "_Prev node"
 msgstr ""
 
-#: src/multitrack.c:8373
+#: src/multitrack.c:8574
 msgid "_Reverse playback  "
 msgstr ""
 
-#: src/multitrack.c:8395
+#: src/multitrack.c:8596
 msgid "_Velocity  "
 msgstr ""
 
-#: src/multitrack.c:8464
+#: src/multitrack.c:8664
 msgid "Anchor _start"
 msgstr ""
 
-#: src/multitrack.c:8465
+#: src/multitrack.c:8665
 msgid "Anchor the start point to the timeline"
 msgstr ""
 
-#: src/multitrack.c:8481
-msgid "Start frame"
-msgstr ""
-
-#: src/multitrack.c:8533
+#: src/multitrack.c:8728
 msgid "Anchor _end"
 msgstr ""
 
-#: src/multitrack.c:8534
+#: src/multitrack.c:8729
 msgid "Anchor the end point to the timeline"
 msgstr ""
 
-#: src/multitrack.c:8546
-msgid "End frame"
-msgstr ""
-
-#: src/multitrack.c:8739
+#: src/multitrack.c:8929
 msgid "Scroll"
 msgstr "Kaydırma"
 
-#: src/multitrack.c:9316
+#: src/multitrack.c:9502
 msgid ""
 "\n"
 "==============================\n"
 "Switched to Clip Edit mode\n"
 msgstr ""
 
-#: src/multitrack.c:9502
+#: src/multitrack.c:9708
 msgid "Timeline (seconds)"
 msgstr ""
 
-#: src/multitrack.c:9984
+#: src/multitrack.c:10202
 msgid " Backing audio"
 msgstr ""
 
-#: src/multitrack.c:9987
+#: src/multitrack.c:10204
 #, c-format
 msgid " Layer %d audio"
 msgstr ""
 
-#: src/multitrack.c:9995
+#: src/multitrack.c:10212
 msgid "Show/hide audio details"
 msgstr ""
 
-#: src/multitrack.c:10010 src/multitrack.c:10232
+#: src/multitrack.c:10227 src/multitrack.c:10452
 #, c-format
 msgid "Layer %d audio"
 msgstr ""
 
-#: src/multitrack.c:10144 src/multitrack.c:10261
+#: src/multitrack.c:10353 src/multitrack.c:10481
 #, c-format
 msgid "%s (layer %d)"
 msgstr "%s ( %d katman)"
 
-#: src/multitrack.c:10184
+#: src/multitrack.c:10403
 msgid "Select track"
 msgstr ""
 
-#: src/multitrack.c:10188
+#: src/multitrack.c:10407
 msgid "Show/hide audio"
 msgstr "Ses göster/gizle"
 
-#: src/multitrack.c:10194
+#: src/multitrack.c:10413
 #, c-format
 msgid "Video %d"
 msgstr "%d video"
 
-#: src/multitrack.c:10233
+#: src/multitrack.c:10453
 #, c-format
 msgid " %s"
 msgstr " %s"
 
-#: src/multitrack.c:10346
+#: src/multitrack.c:10574
 msgid "LiVES: Selected effect"
 msgstr ""
 
-#: src/multitrack.c:10358
+#: src/multitrack.c:10586
 msgid "_View/Edit this effect"
 msgstr ""
 
-#: src/multitrack.c:10361
+#: src/multitrack.c:10588
 msgid "_View this effect"
 msgstr ""
 
-#: src/multitrack.c:10369
+#: src/multitrack.c:10596
 msgid "_Delete this effect"
 msgstr ""
 
-#: src/multitrack.c:10422
+#: src/multitrack.c:10648
 msgid "Cannot insert after this effect"
 msgstr ""
 
-#: src/multitrack.c:10451
+#: src/multitrack.c:10677
 msgid "This effect cannot be moved"
 msgstr ""
 
-#: src/multitrack.c:10499
+#: src/multitrack.c:10724
 #, c-format
 msgid "  %d to %d selected  "
 msgstr ""
 
-#: src/multitrack.c:10502 src/multitrack.c:10746
+#: src/multitrack.c:10727 src/multitrack.c:10968
 #, c-format
 msgid "%.2f sec."
 msgstr "%.2f sn."
 
-#: src/multitrack.c:10717
+#: src/multitrack.c:10940
 #, c-format
 msgid "%d frames"
 msgstr ""
 
-#: src/multitrack.c:11070
+#: src/multitrack.c:11299
 msgid ""
 "\n"
 "==============================\n"
 "Switched to Multitrack mode\n"
 msgstr ""
 
-#: src/multitrack.c:12691
+#: src/multitrack.c:12939
 msgid "Drag the time slider to where you"
 msgstr ""
 
-#: src/multitrack.c:12692
+#: src/multitrack.c:12940
 msgid "want to set effect parameters"
 msgstr ""
 
-#: src/multitrack.c:12693
+#: src/multitrack.c:12941
 msgid "Set parameters, then click \"Apply\"\n"
 msgstr ""
 
-#: src/multitrack.c:12694
+#: src/multitrack.c:12942
 msgid ""
 "NODES are points where parameters\n"
 "have been set.\n"
 "Nodes can be deleted."
 msgstr ""
 
-#: src/multitrack.c:12697
+#: src/multitrack.c:12944
 msgid "Effect has no parameters.\n"
 msgstr ""
 
-#: src/multitrack.c:12788
+#: src/multitrack.c:13033
 #, c-format
 msgid "%s output"
 msgstr ""
 
-#: src/multitrack.c:12794 src/multitrack.c:12804
+#: src/multitrack.c:13038 src/multitrack.c:13046
 #, c-format
 msgid "layer %d"
 msgstr "%d katman"
 
-#: src/multitrack.c:12796 src/multitrack.c:12806
+#: src/multitrack.c:13039 src/multitrack.c:13047
 msgid "audio track"
 msgstr ""
 
-#: src/multitrack.c:12797
+#: src/multitrack.c:13040
 #, c-format
 msgid "%s to %s"
 msgstr "%s'den %s'e"
 
-#: src/multitrack.c:12807
+#: src/multitrack.c:13048
 #, c-format
 msgid "%s from %s"
 msgstr ""
 
-#: src/multitrack.c:12860
+#: src/multitrack.c:13099
 msgid "_Prev filter map"
 msgstr ""
 
-#: src/multitrack.c:12871
+#: src/multitrack.c:13110
 msgid "Insert _before"
 msgstr ""
 
-#: src/multitrack.c:12881
+#: src/multitrack.c:13120
 msgid "Insert _after"
 msgstr ""
 
-#: src/multitrack.c:12896
+#: src/multitrack.c:13134
 msgid "_Next filter map"
 msgstr ""
 
-#: src/multitrack.c:12911
+#: src/multitrack.c:13148
 msgid ""
 "\n"
 "\n"
@@ -9336,272 +9342,272 @@
 "current time.\n"
 msgstr ""
 
-#: src/multitrack.c:12929
+#: src/multitrack.c:13166
 msgid ""
 "Drag a compositor anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:12936
+#: src/multitrack.c:13173
 msgid ""
 "Drag a transition anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:12944
+#: src/multitrack.c:13181
 msgid ""
 "Effects can be dragged\n"
 "onto blocks on the timeline."
 msgstr ""
 
-#: src/multitrack.c:13166
+#: src/multitrack.c:13406
 msgid "LiVES: Selected block/frame"
 msgstr ""
 
-#: src/multitrack.c:13173
+#: src/multitrack.c:13413
 msgid "_Select this block"
 msgstr ""
 
-#: src/multitrack.c:13183
+#: src/multitrack.c:13423
 msgid "_Split block here"
 msgstr ""
 
-#: src/multitrack.c:13191
+#: src/multitrack.c:13431
 msgid "List _effects here"
 msgstr ""
 
-#: src/multitrack.c:13200 src/multitrack.c:13277
+#: src/multitrack.c:13440 src/multitrack.c:13518
 #, c-format
 msgid "_Adjust %s"
 msgstr ""
 
-#: src/multitrack.c:13215
+#: src/multitrack.c:13455
 msgid "_Delete this block"
 msgstr ""
 
-#: src/multitrack.c:13258
+#: src/multitrack.c:13500
 msgid "_Insert here"
 msgstr ""
 
-#: src/multitrack.c:13264
+#: src/multitrack.c:13505
 msgid "_Insert audio here"
 msgstr ""
 
-#: src/multitrack.c:14801
+#: src/multitrack.c:15017
 #, c-format
 msgid "Inserted gap in selected tracks from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:14835
+#: src/multitrack.c:15048
 #, c-format
 msgid "Inserted gap in track %s from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15036
+#: src/multitrack.c:15244
 #, c-format
 msgid "Undid %s\n"
 msgstr ""
 
-#: src/multitrack.c:15235
+#: src/multitrack.c:15445
 #, c-format
 msgid "Redid %s\n"
 msgstr ""
 
-#: src/multitrack.c:15268
+#: src/multitrack.c:15475
 msgid ""
 "\n"
 " (variable)"
 msgstr ""
 
-#: src/multitrack.c:15502 src/multitrack.c:15614 src/multitrack.c:18736
-#: src/multitrack.c:18748
+#: src/multitrack.c:15710 src/multitrack.c:15823 src/multitrack.c:19077
+#: src/multitrack.c:19089
 #, c-format
 msgid "track %s"
 msgstr ""
 
-#: src/multitrack.c:15507 src/multitrack.c:15619 src/multitrack.c:18741
+#: src/multitrack.c:15715 src/multitrack.c:15828 src/multitrack.c:19082
 #, c-format
 msgid "tracks %s and %s"
 msgstr ""
 
-#: src/multitrack.c:15513 src/multitrack.c:15625 src/multitrack.c:18751
+#: src/multitrack.c:15721 src/multitrack.c:15834 src/multitrack.c:19091
 msgid "selected tracks"
 msgstr ""
 
-#: src/multitrack.c:15516
+#: src/multitrack.c:15726
 #, c-format
 msgid "Added %s %s to %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15550
+#: src/multitrack.c:15760
 #, c-format
 msgid "Added effect %s to track %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15631
+#: src/multitrack.c:15845
 #, c-format
 msgid "Deleted %s %s from %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15935
+#: src/multitrack.c:16143
 #, c-format
 msgid "rendered %d frames to new clip.\n"
 msgstr ""
 
-#: src/multitrack.c:16025
+#: src/multitrack.c:16230
 msgid "Cleaning up..."
 msgstr "Temizleniyor..."
 
-#: src/multitrack.c:16712
+#: src/multitrack.c:17003
 msgid "_Pause"
 msgstr "_Duraklat"
 
-#: src/multitrack.c:16713
+#: src/multitrack.c:17004
 msgid "Pause (p)"
 msgstr "Duraklat (p)"
 
-#: src/multitrack.c:16856
+#: src/multitrack.c:17151
 msgid "Press 'm' during playback"
 msgstr ""
 
-#: src/multitrack.c:16857
+#: src/multitrack.c:17152
 msgid "to make a mark on the timeline"
 msgstr ""
 
-#: src/multitrack.c:17154
+#: src/multitrack.c:17498
 #, c-format
 msgid ""
 "Inserted audio %.4f to %.4f from clip %s into backing audio from time %.4f "
 "to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:17414
+#: src/multitrack.c:17759
 #, c-format
 msgid ""
 "Inserted frames %d to %d from clip %s into track %s from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:17998
+#: src/multitrack.c:18332
 #, c-format
 msgid ""
 "Time region %.3f to %.3f\n"
 "selected.\n"
 msgstr ""
 
-#: src/multitrack.c:18002
+#: src/multitrack.c:18336
 msgid ""
 "select one or more tracks\n"
 "to create a region.\n"
 msgstr ""
 
-#: src/multitrack.c:18004
+#: src/multitrack.c:18337
 #, c-format
 msgid "%d video tracks selected.\n"
 msgstr ""
 
-#: src/multitrack.c:18006
+#: src/multitrack.c:18339
 msgid ""
 "Double click on timeline\n"
 "to deselect time region."
 msgstr ""
 
-#: src/multitrack.c:18013
+#: src/multitrack.c:18346
 msgid ""
 "Single click on an effect\n"
 "to select it."
 msgstr ""
 
-#: src/multitrack.c:18014
+#: src/multitrack.c:18347
 msgid ""
 "Double click on an effect\n"
 "to edit it."
 msgstr ""
 
-#: src/multitrack.c:18015
+#: src/multitrack.c:18348
 msgid ""
 "Right click on an effect\n"
 "for context menu.\n"
 msgstr ""
 
-#: src/multitrack.c:18017
+#: src/multitrack.c:18350
 msgid ""
 "Effect order can be changed at\n"
 "FILTER MAPS"
 msgstr ""
 
-#: src/multitrack.c:18024
+#: src/multitrack.c:18357
 msgid ""
 "You can select an effect,\n"
 "then use the INSERT BEFORE"
 msgstr ""
 
-#: src/multitrack.c:18025
+#: src/multitrack.c:18358
 msgid "or INSERT AFTER buttons to move it."
 msgstr ""
 
-#: src/multitrack.c:18307 src/multitrack.c:18320
+#: src/multitrack.c:18639 src/multitrack.c:18652
 msgid "Click on another effect,"
 msgstr ""
 
-#: src/multitrack.c:18308 src/multitrack.c:18321
+#: src/multitrack.c:18640 src/multitrack.c:18653
 msgid ""
 "and the selected one\n"
 "will be inserted"
 msgstr ""
 
-#: src/multitrack.c:18309
+#: src/multitrack.c:18641
 msgid "after it.\n"
 msgstr ""
 
-#: src/multitrack.c:18322
+#: src/multitrack.c:18654
 msgid "before it.\n"
 msgstr ""
 
-#: src/multitrack.c:18551
+#: src/multitrack.c:18889
 #, c-format
 msgid "Removed parameter values for effect %s at time %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:18759
+#: src/multitrack.c:19100
 #, c-format
 msgid "Set parameter values for %s %s on %s at time %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:19251 src/multitrack.c:20873
+#: src/multitrack.c:19630 src/multitrack.c:21195
 msgid "_Autoreload each time"
 msgstr ""
 
-#: src/multitrack.c:19323
+#: src/multitrack.c:19702
 #, fuzzy
 msgid "Saving layout"
 msgstr "Yerleşim Düzenini _Kaydet"
 
-#: src/multitrack.c:19345
+#: src/multitrack.c:19725
 #, c-format
 msgid "Saved layout to %s\n"
 msgstr ""
 
-#: src/multitrack.c:20783
+#: src/multitrack.c:21125
 msgid "clips and frames"
 msgstr ""
 
-#: src/multitrack.c:20787
+#: src/multitrack.c:21128
 msgid "clips"
 msgstr "klipler"
 
-#: src/multitrack.c:20790
+#: src/multitrack.c:21130
 msgid "frames"
 msgstr "çerçeve"
 
-#: src/multitrack.c:20800
+#: src/multitrack.c:21140
 msgid ""
 "\n"
 "Auto reload layout.\n"
 msgstr ""
 
-#: src/multitrack.c:20803
+#: src/multitrack.c:21143
 #, c-format
 msgid ""
 "%s\n"
@@ -9609,42 +9615,42 @@
 "Therefore it could not be loaded properly.\n"
 msgstr ""
 
-#: src/multitrack.c:20920
+#: src/multitrack.c:21284
 msgid "auto backup"
 msgstr ""
 
-#: src/multitrack.c:20923
+#: src/multitrack.c:21287
 #, c-format
 msgid ""
 "\n"
 "Unable to load layout file %s\n"
 msgstr ""
 
-#: src/multitrack.c:20944
+#: src/multitrack.c:21308
 #, c-format
 msgid "Loading layout from %s..."
 msgstr ""
 
-#: src/multitrack.c:20978
+#: src/multitrack.c:21338
 #, c-format
 msgid "Got %d events...processing..."
 msgstr ""
 
-#: src/multitrack.c:20991
+#: src/multitrack.c:21349
 msgid "Checking and rebuilding event list"
 msgstr ""
 
-#: src/multitrack.c:21017
+#: src/multitrack.c:21374
 #, c-format
 msgid "%d errors detected.\n"
 msgstr ""
 
-#: src/multitrack.c:21068
+#: src/multitrack.c:21422
 #, c-format
 msgid "Multitrack fps set to %.3f\n"
 msgstr ""
 
-#: src/multitrack.c:21225
+#: src/multitrack.c:21576
 #, fuzzy
 msgid ""
 "The current layout has changes which have not been saved.\n"
@@ -9653,59 +9659,59 @@
 "Mevcut düzen kaydedilmedi.\n"
 "Ne yapmak istiyorsunuz?\n"
 
-#: src/multitrack.c:22047
+#: src/multitrack.c:22385
 msgid "LiVES: Multitrack audio mixer"
 msgstr ""
 
-#: src/multitrack.c:22077
+#: src/multitrack.c:22414
 msgid "_Reset values"
 msgstr "_Değerleri sıfırla"
 
-#: src/multitrack.c:22081
+#: src/multitrack.c:22418
 msgid "_Close mixer"
 msgstr ""
 
-#: src/multitrack.c:22130
+#: src/multitrack.c:22466
 msgid ""
 "_Invert backing audio\n"
 "and layer volumes"
 msgstr ""
 
-#: src/multitrack.c:22132
+#: src/multitrack.c:22468
 msgid "Adjust backing and layer audio values so that they sum to 1.0"
 msgstr ""
 
-#: src/multitrack.c:22175
+#: src/multitrack.c:22510
 msgid "_Gang layer audio"
 msgstr ""
 
-#: src/multitrack.c:22177
+#: src/multitrack.c:22512
 msgid "Adjust all layer audio values to the same value"
 msgstr ""
 
-#: src/jack.c:104
+#: src/jack.c:102
 msgid "JACK server started\n"
 msgstr ""
 
-#: src/jack.c:1284 src/jack.c:1353
+#: src/jack.c:1265 src/jack.c:1334
 msgid "Unable to connect to JACK server\n"
 msgstr ""
 
-#: src/jack.c:1512
+#: src/jack.c:1491
 msgid "Started jack audio subsystem.\n"
 msgstr ""
 
-#: src/jack.c:1623
+#: src/jack.c:1600
 msgid "Started jack audio reader.\n"
 msgstr ""
 
-#: src/jack.c:1838
+#: src/jack.c:1815
 msgid ""
 "\n"
 "Connection to jack audio was reset.\n"
 msgstr ""
 
-#: src/pulse.c:87
+#: src/pulse.c:88
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -9713,7 +9719,7 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:92
+#: src/pulse.c:94
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -9721,7 +9727,7 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:96
+#: src/pulse.c:99
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -9729,335 +9735,335 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:101
+#: src/pulse.c:104
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
 msgstr ""
 
-#: src/pulse.c:107
+#: src/pulse.c:109
 msgid "LiVES will exit and you can choose another audio player.\n"
 msgstr ""
 
-#: src/pulse.c:1352
+#: src/pulse.c:1335
 msgid ""
 "\n"
 "Connection to pulse audio was reset.\n"
 msgstr ""
 
-#: src/colourspace.c:1100
+#: src/colourspace.c:1092
 msgid "unclamped"
 msgstr ""
 
-#: src/colourspace.c:1101
+#: src/colourspace.c:1093
 msgid "clamped"
 msgstr ""
 
-#: src/omc-learn.c:195
+#: src/omc-learn.c:191
 #, c-format
 msgid "Responding to joystick events from %s\n"
 msgstr ""
 
-#: src/omc-learn.c:289
+#: src/omc-learn.c:279
 msgid "Creating ALSA seq port..."
 msgstr ""
 
-#: src/omc-learn.c:325
+#: src/omc-learn.c:313
 #, c-format
 msgid "Responding to MIDI events from %s\n"
 msgstr ""
 
-#: src/omc-learn.c:568
+#: src/omc-learn.c:554
 msgid "data"
 msgstr "veri"
 
-#: src/omc-learn.c:571
+#: src/omc-learn.c:557
 msgid "velocity"
 msgstr "hız"
 
-#: src/omc-learn.c:572
+#: src/omc-learn.c:558
 msgid "note"
 msgstr "not"
 
-#: src/omc-learn.c:574 src/omc-learn.c:736 src/omc-learn.c:1105
-#: src/omc-learn.c:1591 src/omc-learn.c:1640
+#: src/omc-learn.c:560 src/omc-learn.c:724 src/omc-learn.c:1092
+#: src/omc-learn.c:1581 src/omc-learn.c:1630
 msgid "value"
 msgstr "değer"
 
-#: src/omc-learn.c:576
+#: src/omc-learn.c:562
 msgid "state"
 msgstr "şehir"
 
-#: src/omc-learn.c:688
+#: src/omc-learn.c:674
 msgid "variable"
 msgstr "değişken"
 
-#: src/omc-learn.c:1001
+#: src/omc-learn.c:989
 msgid "Vars."
 msgstr ""
 
-#: src/omc-learn.c:1054
+#: src/omc-learn.c:1041
 #, c-format
 msgid "MIDI ch %d note on"
 msgstr ""
 
-#: src/omc-learn.c:1058
+#: src/omc-learn.c:1045
 #, c-format
 msgid "MIDI ch %d note off"
 msgstr ""
 
-#: src/omc-learn.c:1062
+#: src/omc-learn.c:1049
 #, c-format
 msgid "MIDI ch %d controller %d"
 msgstr ""
 
-#: src/omc-learn.c:1066
+#: src/omc-learn.c:1053
 #, c-format
 msgid "MIDI ch %d pitch bend"
 msgstr ""
 
-#: src/omc-learn.c:1070
+#: src/omc-learn.c:1057
 #, c-format
 msgid "MIDI ch %d pgm change"
 msgstr ""
 
-#: src/omc-learn.c:1073
+#: src/omc-learn.c:1060
 #, c-format
 msgid "Joystick button %d"
 msgstr ""
 
-#: src/omc-learn.c:1076
+#: src/omc-learn.c:1063
 #, c-format
 msgid "Joystick axis %d"
 msgstr ""
 
-#: src/omc-learn.c:1113
+#: src/omc-learn.c:1100
 msgid "x"
 msgstr "x"
 
-#: src/omc-learn.c:1122
+#: src/omc-learn.c:1109
 msgid "range"
 msgstr "aralık"
 
-#: src/omc-learn.c:1143
+#: src/omc-learn.c:1130
 msgid "+ offset1"
 msgstr ""
 
-#: src/omc-learn.c:1161
+#: src/omc-learn.c:1150
 msgid "* scale"
 msgstr ""
 
-#: src/omc-learn.c:1179
+#: src/omc-learn.c:1170
 msgid "+ offset2"
 msgstr ""
 
-#: src/omc-learn.c:1280
+#: src/omc-learn.c:1270
 msgid ""
 "\n"
 "Click OK to delete all entries\n"
 msgstr ""
 
-#: src/omc-learn.c:1318
+#: src/omc-learn.c:1308
 msgid "LiVES: OMC learner"
 msgstr ""
 
-#: src/omc-learn.c:1334
+#: src/omc-learn.c:1324
 msgid "Clear _unmatched"
 msgstr ""
 
-#: src/omc-learn.c:1345
+#: src/omc-learn.c:1335
 msgid "_Delete all"
 msgstr "He_psini sil"
 
-#: src/omc-learn.c:1411
+#: src/omc-learn.c:1401
 msgid "Start video playback"
 msgstr ""
 
-#: src/omc-learn.c:1414
+#: src/omc-learn.c:1404
 msgid "Stop video playback"
 msgstr ""
 
-#: src/omc-learn.c:1418
+#: src/omc-learn.c:1408
 msgid "Clip select <clipnum>"
 msgstr ""
 
-#: src/omc-learn.c:1419
+#: src/omc-learn.c:1409
 msgid "Switch foreground clip to the nth valid clip"
 msgstr ""
 
-#: src/omc-learn.c:1423
+#: src/omc-learn.c:1413
 msgid "Play forwards"
 msgstr ""
 
-#: src/omc-learn.c:1424
+#: src/omc-learn.c:1414
 msgid "Play video in a forwards direction"
 msgstr ""
 
-#: src/omc-learn.c:1427
+#: src/omc-learn.c:1417
 msgid "Play backwards"
 msgstr ""
 
-#: src/omc-learn.c:1428
+#: src/omc-learn.c:1418
 msgid "Play video in a backwards direction"
 msgstr ""
 
-#: src/omc-learn.c:1431
+#: src/omc-learn.c:1421
 msgid "Reverse playback direction"
 msgstr ""
 
-#: src/omc-learn.c:1432
+#: src/omc-learn.c:1422
 msgid "Reverse direction of video playback"
 msgstr ""
 
-#: src/omc-learn.c:1435
+#: src/omc-learn.c:1425
 msgid "Play video faster"
 msgstr ""
 
-#: src/omc-learn.c:1436
+#: src/omc-learn.c:1426
 msgid "Play video at a slightly faster rate"
 msgstr ""
 
-#: src/omc-learn.c:1439
+#: src/omc-learn.c:1429
 msgid "Play video slower"
 msgstr ""
 
-#: src/omc-learn.c:1440
+#: src/omc-learn.c:1430
 msgid "Play video at a slightly slower rate"
 msgstr ""
 
-#: src/omc-learn.c:1443
+#: src/omc-learn.c:1433
 msgid "Toggle video freeze"
 msgstr ""
 
-#: src/omc-learn.c:1444
+#: src/omc-learn.c:1434
 msgid "Freeze video, or if already frozen, unfreeze it"
 msgstr ""
 
-#: src/omc-learn.c:1447
+#: src/omc-learn.c:1437
 msgid "Set video framerate to <fps>"
 msgstr ""
 
-#: src/omc-learn.c:1448
+#: src/omc-learn.c:1438
 msgid "Set framerate of foreground clip to <float fps>"
 msgstr ""
 
-#: src/omc-learn.c:1452
+#: src/omc-learn.c:1442
 msgid "Start recording"
 msgstr ""
 
-#: src/omc-learn.c:1455
+#: src/omc-learn.c:1445
 msgid "Stop recording"
 msgstr "Kaydı durdur"
 
-#: src/omc-learn.c:1458
+#: src/omc-learn.c:1448
 msgid "Toggle recording state"
 msgstr ""
 
-#: src/omc-learn.c:1461
+#: src/omc-learn.c:1451
 msgid "Swap foreground and background clips"
 msgstr ""
 
-#: src/omc-learn.c:1463
+#: src/omc-learn.c:1453
 msgid "Reset effect keys"
 msgstr ""
 
-#: src/omc-learn.c:1464
+#: src/omc-learn.c:1454
 msgid "Switch all effects off."
 msgstr ""
 
-#: src/omc-learn.c:1467
+#: src/omc-learn.c:1457
 msgid "Enable effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1471
+#: src/omc-learn.c:1461
 msgid "Disable effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1475
+#: src/omc-learn.c:1465
 msgid "Toggle effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1479
+#: src/omc-learn.c:1469
 msgid "Set parameter value <key> <pnum> = <value>"
 msgstr ""
 
-#: src/omc-learn.c:1480
+#: src/omc-learn.c:1470
 msgid "Set <value> of pth (numerical) parameter for effect key <key>."
 msgstr ""
 
-#: src/omc-learn.c:1484
+#: src/omc-learn.c:1474
 msgid "Switch foreground to next clip"
 msgstr ""
 
-#: src/omc-learn.c:1487
+#: src/omc-learn.c:1477
 msgid "Switch foreground to previous clip"
 msgstr ""
 
-#: src/omc-learn.c:1490
+#: src/omc-learn.c:1480
 msgid "Set video framerate to ratio <fps_ratio>"
 msgstr ""
 
-#: src/omc-learn.c:1491
+#: src/omc-learn.c:1481
 msgid "Set framerate ratio of foreground clip to <float fps_ratio>"
 msgstr ""
 
-#: src/omc-learn.c:1495
+#: src/omc-learn.c:1485
 msgid "Retrigger clip <clipnum>"
 msgstr ""
 
-#: src/omc-learn.c:1496
+#: src/omc-learn.c:1486
 msgid ""
 "Switch foreground clip to the nth valid clip, and reset the frame number"
 msgstr ""
 
-#: src/omc-learn.c:1500
+#: src/omc-learn.c:1490
 msgid "Cycle to next mode for effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1504
+#: src/omc-learn.c:1494
 msgid "Cycle to previous mode for effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1508
+#: src/omc-learn.c:1498
 msgid "Set playback plugin parameter value <pnum> = <value>"
 msgstr ""
 
-#: src/omc-learn.c:1509
+#: src/omc-learn.c:1499
 msgid "Set <value> of pth parameter for the playback plugin."
 msgstr ""
 
 #. TRANSLATORS: short form of "clip number"
-#: src/omc-learn.c:1536 src/omc-learn.c:1607
+#: src/omc-learn.c:1526 src/omc-learn.c:1597
 msgid "clipnum"
 msgstr ""
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1545
+#: src/omc-learn.c:1535
 msgid "fps"
 msgstr "fps"
 
 #. TRANSLATORS: as in keyboard key
-#: src/omc-learn.c:1553 src/omc-learn.c:1560 src/omc-learn.c:1567
-#: src/omc-learn.c:1575 src/omc-learn.c:1615 src/omc-learn.c:1623
+#: src/omc-learn.c:1543 src/omc-learn.c:1550 src/omc-learn.c:1557
+#: src/omc-learn.c:1565 src/omc-learn.c:1605 src/omc-learn.c:1613
 msgid "key"
 msgstr "anahtar"
 
 #. TRANSLATORS: short form of "parameter number"
-#: src/omc-learn.c:1583 src/omc-learn.c:1632
+#: src/omc-learn.c:1573 src/omc-learn.c:1622
 msgid "pnum"
 msgstr "pnum"
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1599
+#: src/omc-learn.c:1589
 msgid "fps_ratio"
 msgstr "fps_ratio"
 
-#: src/omc-learn.c:2443
+#: src/omc-learn.c:2417
 #, c-format
 msgid "Saving device mapping to file %s..."
 msgstr ""
 
-#: src/omc-learn.c:2527
+#: src/omc-learn.c:2498
 #, c-format
 msgid ""
 "\n"
@@ -10066,7 +10072,7 @@
 "%s\n"
 msgstr ""
 
-#: src/omc-learn.c:2534
+#: src/omc-learn.c:2505
 #, c-format
 msgid ""
 "\n"
@@ -10075,12 +10081,12 @@
 "%s\n"
 msgstr ""
 
-#: src/omc-learn.c:2571
+#: src/omc-learn.c:2541
 #, c-format
 msgid "Loading device mapping from file %s..."
 msgstr ""
 
-#: src/omc-learn.c:2576
+#: src/omc-learn.c:2544
 #, c-format
 msgid ""
 "\n"
@@ -10090,12 +10096,12 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/videodev.c:547
+#: src/videodev.c:539
 #, c-format
 msgid "Unable to open device %s\n"
 msgstr ""
 
-#: src/videodev.c:564
+#: src/videodev.c:554
 #, c-format
 msgid "Opened device %s\n"
 msgstr ""
@@ -10984,6 +10990,9 @@
 #~ msgid "$error"
 #~ msgstr "$hata"
 
+#~ msgid "Pause"
+#~ msgstr "Durdur"
+
 #, fuzzy
 #~ msgid "_Open"
 #~ msgstr "_Aç..."

LiVES-2.2.8.tar.bz2/po/ug.po -> LiVES-2.4.1.tar.bz2/po/ug.po Changed

@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n"
-"POT-Creation-Date: 2015-02-08 17:18-0300\n"
+"POT-Creation-Date: 2015-08-09 14:52-0300\n"
 "PO-Revision-Date: 2013-03-14 12:31+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Uyghur <ug@li.org>\n"
@@ -18,8 +18,7 @@
 "X-Launchpad-Export-Date: 2013-03-28 10:57+0000\n"
 "X-Generator: Launchpad (build 16546)\n"
 
-#. TRANSLATORS: do not translate this message
-#: src/main.c:118
+#: src/main.c:128
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -28,22 +27,22 @@
 "http://lives.sourceforge.net/TRANS-README.txt"
 msgstr ""
 
-#: src/main.c:134
+#: src/main.c:153
 #, c-format
 msgid "%s Warning: %s\n"
 msgstr ""
 
-#: src/main.c:138
+#: src/main.c:157
 #, c-format
 msgid "%s Critical error: %s\n"
 msgstr ""
 
-#: src/main.c:139
+#: src/main.c:158
 #, c-format
 msgid "%s Fatal error: %s\n"
 msgstr ""
 
-#: src/main.c:176
+#: src/main.c:198
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -52,7 +51,7 @@
 "Thanks. Recovery should be possible if you restart LiVES.\n"
 msgstr ""
 
-#: src/main.c:177
+#: src/main.c:199
 msgid ""
 "\n"
 "\n"
@@ -60,97 +59,97 @@
 "distribution, and the LiVES version ("
 msgstr ""
 
-#: src/main.c:180
+#: src/main.c:203
 msgid ""
 "and any information shown below:\n"
 "\n"
 msgstr ""
 
-#: src/main.c:184
+#: src/main.c:206
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
 "\n"
 msgstr ""
 
-#: src/main.c:192
+#: src/main.c:216
 msgid "Preserving set.\n"
 msgstr ""
 
-#: src/main.c:636
+#: src/main.c:691
 msgid "Resizing"
 msgstr ""
 
-#: src/main.c:643
+#: src/main.c:698
 msgid "_Resize All Frames"
 msgstr ""
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:895
+#: src/main.c:948
 msgid "Any"
 msgstr "خالىغان"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:897
+#: src/main.c:950
 msgid "None"
 msgstr "يوق"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:899
+#: src/main.c:952
 msgid "recommended"
 msgstr "تەۋسىيە قىلغان"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:901
+#: src/main.c:954
 msgid "disabled !"
 msgstr "چەكلەنگەن!"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:903
+#: src/main.c:956
 msgid "**The current layout**"
 msgstr ""
 
 #. TRANSLATORS: adjective for "Built in" type effects
-#: src/main.c:905
+#: src/main.c:958
 msgid "Builtin"
 msgstr "ئىچكى"
 
 #. TRANSLATORS: adjective for "Custom" type effects
-#: src/main.c:907
+#: src/main.c:960
 msgid "Custom"
 msgstr "ئىختىيارى"
 
 #. TRANSLATORS: adjective for "Test" type effects
-#: src/main.c:909
+#: src/main.c:962
 msgid "Test"
 msgstr "سىناق"
 
-#: src/main.c:1054
+#: src/main.c:1107
 msgid "Foreground"
 msgstr ""
 
-#: src/main.c:1055
+#: src/main.c:1108
 #, fuzzy
 msgid "Background"
 msgstr "باشلا(_S)"
 
-#: src/main.c:1566
+#: src/main.c:1624
 msgid "Loading realtime effect plugins..."
 msgstr ""
 
-#: src/main.c:1631
+#: src/main.c:1690
 msgid "Starting jack audio server..."
 msgstr ""
 
-#: src/main.c:1633
+#: src/main.c:1692
 msgid "Starting jack transport server..."
 msgstr ""
 
-#: src/main.c:1634
+#: src/main.c:1693
 msgid "Connecting to jack transport server..."
 msgstr ""
 
-#: src/main.c:1663
+#: src/main.c:1723
 #, c-format
 msgid ""
 "\n"
@@ -162,112 +161,112 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1697
+#: src/main.c:1758
 msgid "Starting pulse audio server..."
 msgstr ""
 
-#: src/main.c:1765
+#: src/main.c:1825
 msgid "Checking optional dependencies:"
 msgstr ""
 
-#: src/main.c:1766
+#: src/main.c:1826
 msgid "mplayer...detected..."
 msgstr ""
 
-#: src/main.c:1767
+#: src/main.c:1827
 msgid "mplayer...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1768
+#: src/main.c:1828
 msgid "mplayer2...detected..."
 msgstr ""
 
-#: src/main.c:1769
+#: src/main.c:1829
 msgid "mplayer2...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1770
+#: src/main.c:1830
 msgid "convert...detected..."
 msgstr ""
 
-#: src/main.c:1771
+#: src/main.c:1831
 msgid "convert...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1772
+#: src/main.c:1832
 msgid "composite...detected..."
 msgstr ""
 
-#: src/main.c:1773
+#: src/main.c:1833
 msgid "composite...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1774
+#: src/main.c:1834
 msgid "sox...detected\n"
 msgstr ""
 
-#: src/main.c:1775
+#: src/main.c:1835
 msgid "sox...NOT DETECTED\n"
 msgstr ""
 
-#: src/main.c:1776
+#: src/main.c:1836
 msgid "cdda2wav...detected..."
 msgstr ""
 
-#: src/main.c:1777
+#: src/main.c:1837
 msgid "cdda2wav...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1778
+#: src/main.c:1838
 msgid "jackd...detected..."
 msgstr ""
 
-#: src/main.c:1779
+#: src/main.c:1839
 msgid "jackd...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1780
+#: src/main.c:1840
 msgid "pulse audio...detected..."
 msgstr ""
 
-#: src/main.c:1781
+#: src/main.c:1841
 msgid "pulse audio...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1782
+#: src/main.c:1842
 msgid "python...detected..."
 msgstr ""
 
-#: src/main.c:1783
+#: src/main.c:1843
 msgid "python...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1784
+#: src/main.c:1844
 msgid "dvgrab...detected..."
 msgstr ""
 
-#: src/main.c:1785
+#: src/main.c:1845
 msgid "dvgrab...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1786
+#: src/main.c:1846
 msgid "xwininfo...detected..."
 msgstr ""
 
-#: src/main.c:1787
+#: src/main.c:1847
 msgid "xwininfo...NOT DETECTED..."
 msgstr ""
 
-#: src/main.c:1793
+#: src/main.c:1853
 #, c-format
 msgid "Windows version %04X"
 msgstr ""
 
-#: src/main.c:1795
+#: src/main.c:1855
 msgid "UNKNOWN - please patch me !"
 msgstr ""
 
-#: src/main.c:1799
+#: src/main.c:1859
 #, c-format
 msgid ""
 "\n"
@@ -275,199 +274,204 @@
 "Window manager reports as \"%s\"; "
 msgstr ""
 
-#: src/main.c:1802
+#: src/main.c:1862
 #, c-format
 msgid "number of monitors detected: %d\n"
 msgstr ""
 
-#: src/main.c:1805
+#: src/main.c:1865
 #, c-format
 msgid "Number of CPUs detected: %d "
 msgstr ""
 
-#: src/main.c:1808 src/multitrack.c:4902
+#: src/main.c:1868 src/multitrack.c:5068
 msgid "little endian"
 msgstr ""
 
-#: src/main.c:1809 src/multitrack.c:4901
+#: src/main.c:1869 src/multitrack.c:5067
 msgid "big endian"
 msgstr ""
 
-#: src/main.c:1810
+#: src/main.c:1870
 #, c-format
 msgid "(%d bits, %s)\n"
 msgstr ""
 
-#: src/main.c:1814
+#: src/main.c:1874
 msgid "GUI type is: "
 msgstr ""
 
-#: src/main.c:1818
+#: src/main.c:1878
 #, c-format
 msgid "GTK+ version %d.%d.%d (compiled with %d.%d.%d)"
 msgstr ""
 
-#: src/main.c:1840
+#: src/main.c:1900
 msgid ", with cairo support"
 msgstr ""
 
-#: src/main.c:1847
+#: src/main.c:1907
 #, c-format
 msgid "Temp directory is %s\n"
 msgstr ""
 
-#: src/main.c:1851
+#: src/main.c:1911
 msgid ""
 "WARNING - this version of LiVES was compiled without either\n"
 "jack or pulse audio support.\n"
 "Many audio features will be unavailable.\n"
 msgstr ""
 
-#: src/main.c:1854
+#: src/main.c:1914
 msgid "Compiled with jack support, good !\n"
 msgstr ""
 
-#: src/main.c:1857
+#: src/main.c:1917
 msgid "Compiled with pulse audio support, wonderful !\n"
 msgstr ""
 
-#: src/main.c:1861
+#: src/main.c:1921
 #, c-format
 msgid ""
 "Welcome to LiVES version %s.\n"
 "\n"
 msgstr ""
 
-#: src/main.c:2306
+#: src/main.c:2380
 #, c-format
 msgid ""
 "\n"
 "Startup syntax is: %s [opts] [filename [start_time] [frames]]\n"
 msgstr ""
 
-#: src/main.c:2307
+#: src/main.c:2381
 msgid "Where: filename is the name of a media file or backup file.\n"
 msgstr ""
 
-#: src/main.c:2308
+#: src/main.c:2382
 msgid "start_time : filename start time in seconds\n"
 msgstr ""
 
-#: src/main.c:2309
+#: src/main.c:2383
 msgid "frames : maximum number of frames to open\n"
 msgstr ""
 
-#: src/main.c:2311
+#: src/main.c:2385
 msgid "opts can be:\n"
 msgstr ""
 
-#: src/main.c:2312
+#: src/main.c:2386
 msgid "-help            : show this help text and exit\n"
 msgstr ""
 
-#: src/main.c:2313
+#: src/main.c:2387
 msgid "-tmpdir <tempdir>: use alternate working directory (e.g /var/ramdisk)\n"
 msgstr ""
 
-#: src/main.c:2314
+#: src/main.c:2388
 msgid "-set <setname>   : autoload clip set setname\n"
 msgstr ""
 
-#: src/main.c:2315
+#: src/main.c:2389
 msgid "-noset           : do not load any set on startup\n"
 msgstr ""
 
-#: src/main.c:2316
+#: src/main.c:2390
 msgid "-norecover       : force no-loading of crash recovery\n"
 msgstr ""
 
-#: src/main.c:2317
+#: src/main.c:2391
 msgid "-recover         : force loading of crash recovery\n"
 msgstr ""
 
-#: src/main.c:2318
-msgid "-nothreaddialog  : doe nothing - retained for backwards compatibility\n"
+#: src/main.c:2392
+msgid ""
+"-nothreaddialog  : does nothing - retained for backwards compatibility\n"
 msgstr ""
 
-#: src/main.c:2319
+#: src/main.c:2393
 msgid "-nogui           : do not show the gui\n"
 msgstr ""
 
-#: src/main.c:2320
+#: src/main.c:2394
 msgid "-nosplash        : do not show the splash window\n"
 msgstr ""
 
-#: src/main.c:2321
+#: src/main.c:2395
 msgid "-noplaywin       : do not show the play window\n"
 msgstr ""
 
-#: src/main.c:2322
+#: src/main.c:2396
+msgid "-noninteractive  : disable menu interactivity\n"
+msgstr ""
+
+#: src/main.c:2397
 msgid "-startup-ce      : start in clip editor mode\n"
 msgstr ""
 
-#: src/main.c:2323
+#: src/main.c:2398
 msgid "-startup-mt      : start in multitrack mode\n"
 msgstr ""
 
-#: src/main.c:2324
+#: src/main.c:2399
 msgid ""
 "-fxmodesmax <n>  : allow <n> modes per effect key (minimum is 1, default is "
 "8)\n"
 msgstr ""
 
-#: src/main.c:2326
+#: src/main.c:2401
 msgid "-oscstart <port> : start OSC listener on UDP port <port>\n"
 msgstr ""
 
-#: src/main.c:2327
+#: src/main.c:2402
 msgid "-nooscstart      : do not start OSC listener\n"
 msgstr ""
 
-#: src/main.c:2329
+#: src/main.c:2404
 msgid ""
 "-aplayer <ap>    : start with selected audio player. <ap> can be mplayer, "
 "mplayer2"
 msgstr ""
 
 #. TRANSLATORS: pulse (audio)
-#: src/main.c:2332
+#: src/main.c:2407
 msgid ", pulse"
 msgstr ""
 
-#: src/main.c:2335
+#: src/main.c:2410
 msgid ", sox or jack\n"
 msgstr ""
 
-#: src/main.c:2336
+#: src/main.c:2412
 msgid ""
 "-jackopts <opts>    : opts is a bitmap of jack startup options [1 = jack "
 "transport client, 2 = jack transport master, 4 = start jack transport "
 "server, 8 = pause audio when video paused, 16 = start jack audio server] \n"
 msgstr ""
 
-#: src/main.c:2338
+#: src/main.c:2414
 msgid " or sox\n"
 msgstr ""
 
-#: src/main.c:2340
+#: src/main.c:2416
 msgid "-devicemap <mapname>          : autoload devicemap\n"
 msgstr ""
 
-#: src/main.c:2341
+#: src/main.c:2418
 msgid ""
 "-vppdefaults <file>          : load video playback plugin defaults from "
 "<file> (Note: only sets the settings, not the plugin type)\n"
 msgstr ""
 
-#: src/main.c:2342
+#: src/main.c:2419
 msgid "-debug            : try to debug crashes (requires 'gdb' installed)\n"
 msgstr ""
 
-#: src/main.c:2373 src/gui.c:1128
+#: src/main.c:2449 src/gui.c:1127
 msgid "Starting GUI..."
 msgstr ""
 
-#: src/main.c:2396
+#: src/main.c:2475
 #, c-format
 msgid ""
 "\n"
@@ -478,7 +482,7 @@
 "(Maybe you need to change the value of <prefix_dir> in your %s file)\n"
 msgstr ""
 
-#: src/main.c:2410
+#: src/main.c:2492
 #, c-format
 msgid ""
 "\n"
@@ -486,7 +490,7 @@
 "Please make sure you have write access to %s and try again.\n"
 msgstr ""
 
-#: src/main.c:2415
+#: src/main.c:2498
 msgid ""
 "\n"
 "`smogrify` must be in your path, and be executable\n"
@@ -495,7 +499,7 @@
 "before running LiVES.\n"
 msgstr ""
 
-#: src/main.c:2421
+#: src/main.c:2504
 #, c-format
 msgid ""
 "\n"
@@ -505,7 +509,7 @@
 "Please check the file permissions for this file and try again.\n"
 msgstr ""
 
-#: src/main.c:2428
+#: src/main.c:2512
 #, c-format
 msgid ""
 "\n"
@@ -516,7 +520,7 @@
 "and try again.\n"
 msgstr ""
 
-#: src/main.c:2438
+#: src/main.c:2522
 #, c-format
 msgid ""
 "Please check the <tempdir> setting in \n"
@@ -524,7 +528,7 @@
 "and try again.\n"
 msgstr ""
 
-#: src/main.c:2445
+#: src/main.c:2528
 #, c-format
 msgid ""
 "\n"
@@ -534,7 +538,7 @@
 "%s"
 msgstr ""
 
-#: src/main.c:2453
+#: src/main.c:2536
 msgid ""
 "\n"
 "An incorrect version of smogrify was found in your path.\n"
@@ -545,49 +549,49 @@
 "Thankyou.\n"
 msgstr ""
 
-#: src/main.c:2458
+#: src/main.c:2541
 msgid ""
 "\n"
 "LiVES currently requires 'mplayer', 'mplayer2' or 'sox' to function. Please "
 "install one or other of these, and try again.\n"
 msgstr ""
 
-#: src/main.c:2462
+#: src/main.c:2546
 msgid ""
 "\n"
 "LiVES currently requires both 'mplayer' or 'mplayer2' and 'sox' to function. "
 "Please install these, and try again.\n"
 msgstr ""
 
-#: src/main.c:2472
+#: src/main.c:2556
 msgid ""
 "\n"
 "LiVES was unable to locate 'mplayer' or 'mplayer2'. You may wish to install "
 "either one to use LiVES more fully.\n"
 msgstr ""
 
-#: src/main.c:2475
+#: src/main.c:2561
 msgid ""
 "\n"
 "LiVES was unable to locate 'convert'. You should install convert and image-"
 "magick if you want to use rendered effects.\n"
 msgstr ""
 
-#: src/main.c:2478
+#: src/main.c:2566
 msgid ""
 "\n"
 "LiVES was unable to locate 'composite'. You should install composite and "
 "image-magick if you want to use the merge function.\n"
 msgstr ""
 
-#: src/main.c:2481
+#: src/main.c:2570
 msgid ""
 "\n"
 "LiVES was unable to locate 'sox'. Some audio features may not work. You "
 "should install 'sox'.\n"
 msgstr ""
 
-#: src/main.c:2484
+#: src/main.c:2575
 #, c-format
 msgid ""
 "\n"
@@ -598,93 +602,93 @@
 "You may need to change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/main.c:2611
+#: src/main.c:2707
 #, c-format
 msgid "Autoloading set %s..."
 msgstr ""
 
 #. TRANSLATORS: localised name may be used here
-#: src/main.c:2781 src/interface.c:738
+#: src/main.c:2902
 msgid "LiVES"
 msgstr ""
 
-#: src/main.c:2948
+#: src/main.c:3066
 #, c-format
 msgid "Invalid audio player %s\n"
 msgstr ""
 
-#: src/main.c:3077
+#: src/main.c:3214
 #, c-format
 msgid "LiVES-%s: <Untitled%d> %dx%d : %d frames %d bpp %.3f fps"
 msgstr ""
 
-#: src/main.c:3082
+#: src/main.c:3219
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : ??? frames ??? bpp %.3f fps"
 msgstr ""
 
-#: src/main.c:3086
+#: src/main.c:3222
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : %d frames %d bpp %.3f fps"
 msgstr ""
 
-#: src/main.c:3094
+#: src/main.c:3229
 #, c-format
 msgid "LiVES-%s: <No File>"
 msgstr ""
 
 #. TRANSLATORS: rec(ord)
-#: src/main.c:5085
+#: src/main.c:5201
 #, c-format
 msgid "rec %9d/%d"
 msgstr ""
 
 #. TRANSLATORS: out of memory (rec(ord))
-#: src/main.c:5091
+#: src/main.c:5206
 #, c-format
 msgid "!rec %9d/%d"
 msgstr ""
 
-#: src/main.c:5398 src/main.c:5399 src/gui.c:2110 src/gui.c:3220
-#: src/saveplay.c:2336
+#: src/main.c:5500 src/main.c:5501 src/gui.c:2108 src/gui.c:3331
+#: src/saveplay.c:2315
 msgid "Play"
 msgstr "قوي"
 
-#: src/main.c:6128
+#: src/main.c:6216
 msgid ""
 "LiVES was unable to capture this image\n"
 "\n"
 msgstr ""
 
-#: src/main.c:6250
+#: src/main.c:6345
 #, c-format
 msgid "Closed file %s\n"
 msgstr ""
 
-#: src/main.c:6452 src/gui.c:648 src/utils.c:4312 src/utils.c:4344
-#: src/saveplay.c:3550 src/multitrack.c:4510 src/multitrack.c:6268
+#: src/main.c:6542 src/gui.c:647 src/utils.c:4256 src/utils.c:4286
+#: src/saveplay.c:3500 src/multitrack.c:4678 src/multitrack.c:6447
 msgid "_Undo"
 msgstr "يېنىۋال(_U)"
 
-#: src/main.c:6453 src/gui.c:666 src/utils.c:4313 src/utils.c:4345
-#: src/saveplay.c:3551 src/multitrack.c:4531 src/multitrack.c:6293
+#: src/main.c:6543 src/gui.c:665 src/utils.c:4257 src/utils.c:4287
+#: src/saveplay.c:3501 src/multitrack.c:4698 src/multitrack.c:6472
 msgid "_Redo"
 msgstr "قايتىلا(_R)"
 
-#: src/main.c:6493 src/interface.c:470 src/gui.c:2326 src/preferences.c:2357
-#: src/resample.c:1516
+#: src/main.c:6583 src/interface.c:457 src/gui.c:2324 src/preferences.c:2391
+#: src/resample.c:1488
 msgid "Video"
 msgstr "سىن"
 
-#: src/main.c:6494 src/interface.c:483 src/gui.c:2351
+#: src/main.c:6584 src/interface.c:470 src/gui.c:2348
 msgid "Left Audio"
 msgstr "سول ئۈن"
 
-#: src/main.c:6495 src/gui.c:2375
+#: src/main.c:6585 src/gui.c:2371
 msgid "Right Audio"
 msgstr "ئوڭ ئۈن"
 
-#: src/main.c:6540
+#: src/main.c:6630
 msgid ""
 "\n"
 "\n"
@@ -693,11 +697,11 @@
 "Please adjust the playback options in Preferences and try again.\n"
 msgstr ""
 
-#: src/main.c:7051 src/plugins.c:1502
+#: src/main.c:7134 src/plugins.c:1468
 msgid "LiVES: - Play Window"
 msgstr ""
 
-#: src/startup.c:25
+#: src/startup.c:24
 #, c-format
 msgid ""
 "A directory named\n"
@@ -707,7 +711,7 @@
 "(Free space = %s)\n"
 msgstr ""
 
-#: src/startup.c:32
+#: src/startup.c:29
 #, c-format
 msgid ""
 "A directory named\n"
@@ -717,7 +721,7 @@
 "Please select another location.\n"
 msgstr ""
 
-#: src/startup.c:49
+#: src/startup.c:46
 #, c-format
 msgid ""
 "\n"
@@ -728,7 +732,7 @@
 "(Free space = %s)"
 msgstr ""
 
-#: src/startup.c:54
+#: src/startup.c:50
 #, c-format
 msgid ""
 "\n"
@@ -737,54 +741,54 @@
 "Please try again and choose a different location.\n"
 msgstr ""
 
-#: src/startup.c:96
+#: src/startup.c:92
 msgid "Directory name is too long !"
 msgstr ""
 
-#: src/startup.c:223
+#: src/startup.c:216
 msgid ""
 "LiVES FAILED TO START YOUR SELECTED AUDIO PLAYER !\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:230
+#: src/startup.c:222
 msgid ""
 "Before starting LiVES, you need to choose an audio player.\n"
 "\n"
 "PULSE AUDIO is recommended for most users"
 msgstr ""
 
-#: src/startup.c:233
+#: src/startup.c:225
 msgid ""
 ", but this version of LiVES was not compiled with pulse audio support.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:236
+#: src/startup.c:229
 msgid ""
 ", but you do not have pulse audio installed on your system.\n"
 " You are advised to install pulse audio first before running LiVES.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:241
+#: src/startup.c:233
 msgid "JACK audio is recommended for pro users"
 msgstr ""
 
-#: src/startup.c:244
+#: src/startup.c:236
 msgid ""
 ", but this version of LiVES was not compiled with jack audio support.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:247
+#: src/startup.c:239
 msgid ""
 ", but you do not have jackd installed. You may wish to install jackd first "
 "before running LiVES.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:250
+#: src/startup.c:242
 msgid ""
 ", but may prevent LiVES from starting on some systems.\n"
 "If LiVES will not start with jack, you can restart and try with another "
@@ -792,159 +796,159 @@
 "\n"
 msgstr ""
 
-#: src/startup.c:254
+#: src/startup.c:246
 msgid "SOX may be used if neither of the preceding players work, "
 msgstr ""
 
-#: src/startup.c:257
+#: src/startup.c:249
 msgid ""
 "but some audio features will be disabled.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:260
+#: src/startup.c:251
 msgid ""
 "but you do not have sox installed.\n"
 "You are advised to install it before running LiVES.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:264
+#: src/startup.c:255
 msgid ""
 "The MPLAYER/MPLAYER2 audio player is only recommended for testing purposes.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:281
+#: src/startup.c:271
 msgid "LiVES: - Choose an audio player"
 msgstr ""
 
-#: src/startup.c:298
+#: src/startup.c:288
 msgid "Use _pulse audio player"
 msgstr ""
 
-#: src/startup.c:320
+#: src/startup.c:310
 msgid "Use _jack audio player"
 msgstr ""
 
-#: src/startup.c:340
+#: src/startup.c:330
 msgid "Use _sox audio player"
 msgstr ""
 
-#: src/startup.c:361
+#: src/startup.c:351
 msgid "Use _mplayer audio player"
 msgstr ""
 
-#: src/startup.c:381
+#: src/startup.c:371
 msgid "Use _mplayer2 audio player"
 msgstr ""
 
-#: src/startup.c:405 src/startup.c:580 src/interface.c:1506
+#: src/startup.c:395 src/startup.c:569 src/interface.c:1398
 msgid "_Next"
 msgstr "كېيىنكى(_N)"
 
-#: src/startup.c:445
+#: src/startup.c:435
 msgid "Skipped"
 msgstr "ئاتلاپ ئۆتتى"
 
-#: src/startup.c:460
+#: src/startup.c:450
 msgid "Passed"
 msgstr "ئۆتتى"
 
-#: src/startup.c:493
+#: src/startup.c:483
 msgid "Failed"
 msgstr "مەغلۇپ بولدى"
 
-#: src/startup.c:552
+#: src/startup.c:542
 msgid "LiVES: - Testing Configuration"
 msgstr ""
 
-#: src/startup.c:555
+#: src/startup.c:544
 msgid "LiVES: - Troubleshoot"
 msgstr ""
 
-#: src/startup.c:568
+#: src/startup.c:557
 msgid "LiVES will now run some basic configuration tests\n"
 msgstr ""
 
-#: src/startup.c:603
+#: src/startup.c:591
 msgid "Checking for \"sox\" presence"
 msgstr ""
 
-#: src/startup.c:607
+#: src/startup.c:595
 msgid ""
 "You should install sox to be able to use all the audio features in LiVES"
 msgstr ""
 
-#: src/startup.c:615
+#: src/startup.c:602
 msgid "Checking if sox can convert audio"
 msgstr ""
 
-#: src/startup.c:638
+#: src/startup.c:625
 msgid "Unable to allocate 176400 bytes memory."
 msgstr ""
 
-#: src/startup.c:653
+#: src/startup.c:639
 #, c-format
 msgid "Unable to write to: %s"
 msgstr ""
 
-#: src/startup.c:667 src/startup.c:807
+#: src/startup.c:653 src/startup.c:789
 #, c-format
 msgid "Command failed: %s"
 msgstr ""
 
-#: src/startup.c:689
+#: src/startup.c:675
 msgid "You should install sox_fmt_all or similar"
 msgstr ""
 
-#: src/startup.c:717
+#: src/startup.c:703
 msgid "Checking for \"mplayer\" presence"
 msgstr ""
 
-#: src/startup.c:721
+#: src/startup.c:707
 msgid ""
 "You should install mplayer or mplayer2 to be able to use all the decoding "
 "features in LiVES"
 msgstr ""
 
-#: src/startup.c:747
+#: src/startup.c:732
 msgid "Checking if mplayer can convert audio"
 msgstr ""
 
-#: src/startup.c:768
+#: src/startup.c:751
 msgid "You should install mplayer or mplayer2 with pcm/wav support"
 msgstr ""
 
-#: src/startup.c:785
+#: src/startup.c:767
 msgid "Checking if mplayer can decode to png/alpha"
 msgstr ""
 
-#: src/startup.c:828
+#: src/startup.c:810
 msgid "You may wish to upgrade mplayer to a newer version"
 msgstr ""
 
-#: src/startup.c:854
+#: src/startup.c:836
 msgid "Checking if mplayer can decode to jpeg"
 msgstr ""
 
-#: src/startup.c:882
+#: src/startup.c:862
 msgid "You should install mplayer with either png/alpha or jpeg support"
 msgstr ""
 
-#: src/startup.c:883
+#: src/startup.c:863
 msgid "You may wish to add jpeg output support to mplayer"
 msgstr ""
 
-#: src/startup.c:892
+#: src/startup.c:872
 msgid "Checking for \"convert\" presence"
 msgstr ""
 
-#: src/startup.c:896
+#: src/startup.c:876
 msgid "Install imageMagick to be able to use all of the rendered effects"
 msgstr ""
 
-#: src/startup.c:909
+#: src/startup.c:889
 msgid ""
 "\n"
 "\n"
@@ -952,7 +956,7 @@
 "Preferences/Decoding.    \n"
 msgstr ""
 
-#: src/startup.c:915
+#: src/startup.c:894
 msgid ""
 "\n"
 "\n"
@@ -960,49 +964,49 @@
 "continue    \n"
 msgstr ""
 
-#: src/startup.c:949
+#: src/startup.c:928
 msgid ""
 "\n"
 "\n"
 "Finally, you can choose the default startup interface for LiVES.\n"
 msgstr ""
 
-#: src/startup.c:950
+#: src/startup.c:929
 msgid ""
 "\n"
 "\n"
 "LiVES has two main interfaces and you can start up with either of them.\n"
 msgstr ""
 
-#: src/startup.c:951
+#: src/startup.c:930
 msgid ""
 "\n"
 "\n"
 "The default can always be changed later from Preferences.\n"
 msgstr ""
 
-#: src/startup.c:961
+#: src/startup.c:940
 msgid "LiVES: - Choose the startup interface"
 msgstr ""
 
-#: src/startup.c:972
+#: src/startup.c:951
 msgid "Start in _Clip Edit mode"
 msgstr ""
 
-#: src/startup.c:975
+#: src/startup.c:954
 msgid "This is the best choice for simple editing tasks and for VJs\n"
 msgstr ""
 
-#: src/startup.c:981
+#: src/startup.c:960
 msgid "Start in _Multitrack mode"
 msgstr ""
 
-#: src/startup.c:983
+#: src/startup.c:962
 msgid ""
 "This is a better choice for complex editing tasks involving multiple clips.\n"
 msgstr ""
 
-#: src/startup.c:992
+#: src/startup.c:971
 msgid "_Finish"
 msgstr "تاماملا(_F)"
 
@@ -1019,35 +1023,35 @@
 msgid "Apply _Deinterlace"
 msgstr ""
 
-#: src/interface.c:66
+#: src/interface.c:65
 msgid "If this is set, frames will be deinterlaced as they are imported."
 msgstr ""
 
-#: src/interface.c:113 src/callbacks.c:9623 src/callbacks.c:9646
-#: src/callbacks.c:9647 src/gui.c:3223 src/gui.c:3821 src/saveplay.c:2339
-#: src/saveplay.c:3138 src/dialogs.c:1514 src/dialogs.c:1515
-#: src/dialogs.c:1746 src/dialogs.c:1747 src/framedraw.c:238
-#: src/multitrack.c:8031
+#: src/interface.c:106 src/callbacks.c:9542 src/callbacks.c:9564
+#: src/callbacks.c:9565 src/gui.c:3333 src/gui.c:3946 src/saveplay.c:2317
+#: src/saveplay.c:3097 src/dialogs.c:1575 src/dialogs.c:1576
+#: src/dialogs.c:1804 src/dialogs.c:1805 src/framedraw.c:236
+#: src/multitrack.c:8210
 msgid "Preview"
 msgstr "ئالدىن كۆزەت"
 
-#: src/interface.c:132
+#: src/interface.c:125
 msgid "Click here to _Preview any selected video, image or audio file"
 msgstr ""
 
-#: src/interface.c:135
+#: src/interface.c:127
 msgid "Click here to _Preview any selected audio file"
 msgstr ""
 
-#: src/interface.c:138
+#: src/interface.c:129
 msgid "Click here to _Preview the video"
 msgstr ""
 
-#: src/interface.c:181 src/dialogs.c:2542
+#: src/interface.c:169 src/dialogs.c:2621
 msgid "LiVES: - Processing..."
 msgstr ""
 
-#: src/interface.c:217
+#: src/interface.c:205
 msgid ""
 "\n"
 "\n"
@@ -1056,8 +1060,8 @@
 "Remember to switch off effects (ctrl-0) afterwards !"
 msgstr ""
 
-#: src/interface.c:222 src/callbacks.c:9373 src/callbacks.c:9420
-#: src/dialogs.c:2570
+#: src/interface.c:210 src/callbacks.c:9283 src/callbacks.c:9332
+#: src/dialogs.c:2649
 msgid ""
 "\n"
 "Please Wait"
@@ -1065,188 +1069,178 @@
 "\n"
 "سەل ساقلاڭ"
 
-#: src/interface.c:242
+#: src/interface.c:230
 msgid "Show Details"
 msgstr ""
 
-#: src/interface.c:254 src/dialogs.c:2584
+#: src/interface.c:242 src/dialogs.c:2663
 msgid "_Enough"
 msgstr ""
 
-#: src/interface.c:255 src/framedraw.c:278
+#: src/interface.c:243 src/framedraw.c:276
 msgid "_Preview"
 msgstr "ئالدىن كۆزەت(_P)"
 
-#: src/interface.c:257
+#: src/interface.c:245 src/callbacks.c:9282 src/callbacks.c:9330
 msgid "Paus_e"
 msgstr ""
 
-#: src/interface.c:258 src/callbacks.c:9417
+#: src/interface.c:246 src/callbacks.c:9329
 msgid "Pause/_Enough"
 msgstr ""
 
-#: src/interface.c:285
+#: src/interface.c:273
 msgid "_Cancel"
 msgstr "ئەمەلدىن قالدۇر(_C)"
 
-#: src/interface.c:374
+#: src/interface.c:361
 #, c-format
 msgid "LiVES: - %s"
 msgstr ""
 
-#: src/interface.c:376
+#: src/interface.c:363
 msgid "LiVES: - Multitrack details"
 msgstr ""
 
-#: src/interface.c:407
+#: src/interface.c:394
 msgid "Format"
 msgstr "پىچىمى"
 
-#: src/interface.c:412
+#: src/interface.c:399
 msgid "Frame size"
 msgstr "كاندۇك چوڭلۇقى"
 
-#: src/interface.c:417
+#: src/interface.c:404
 msgid "File size"
 msgstr "ھۆججەت چوڭلۇقى"
 
-#: src/interface.c:418
+#: src/interface.c:405
 msgid "Byte size"
 msgstr "بايت چوڭلۇقى"
 
-#: src/interface.c:423 src/interface.c:1891
+#: src/interface.c:410 src/interface.c:1760
 msgid "FPS"
 msgstr "FPS"
 
-#: src/interface.c:428
+#: src/interface.c:415
 msgid "Frames"
 msgstr "كاندۇكلار"
 
-#: src/interface.c:429
+#: src/interface.c:416
 msgid "Events"
 msgstr "ھادىسە"
 
-#: src/interface.c:434 src/interface.c:500 src/interface.c:542
+#: src/interface.c:421 src/interface.c:486 src/interface.c:528
 msgid "Total time"
 msgstr "ئومۇمىي ۋاقىت"
 
-#: src/interface.c:486 src/resample.c:1488
+#: src/interface.c:472 src/resample.c:1460
 msgid "Audio"
 msgstr "ئۈن"
 
-#: src/interface.c:511 src/interface.c:553
+#: src/interface.c:497 src/interface.c:539
 msgid "Rate/size"
 msgstr ""
 
-#: src/interface.c:530
+#: src/interface.c:516
 msgid "Right audio"
 msgstr "ئوڭ ئۈن"
 
-#: src/interface.c:622
+#: src/interface.c:607
 msgid "LiVES: - Encoding options"
 msgstr ""
 
-#: src/interface.c:636
+#: src/interface.c:621
 msgid "<------------- (Check the box to re_size as suggested)"
 msgstr ""
 
-#: src/interface.c:637
+#: src/interface.c:622
 msgid "<------------- (Check the box to use the _size recommendation)"
 msgstr ""
 
-#: src/interface.c:662
+#: src/interface.c:646
 msgid "Use _letterboxing to maintain aspect ratio (optional)"
 msgstr ""
 
-#: src/interface.c:663
+#: src/interface.c:647
 msgid ""
 "Draw black rectangles either above or to the sides of the image, to prevent "
 "it from stretching."
 msgstr ""
 
-#: src/interface.c:694
+#: src/interface.c:677
 msgid "Keep _my settings"
 msgstr ""
 
-#: src/interface.c:695
+#: src/interface.c:678
 msgid "Use _recommended settings"
 msgstr ""
 
-#: src/interface.c:775 src/dialogs.c:114
-msgid ""
-"Do _not show this warning any more\n"
-"(can be turned back on from Preferences/Warnings)"
-msgstr ""
-
-#: src/interface.c:787
-msgid "Show _Details"
-msgstr ""
-
-#: src/interface.c:881
+#: src/interface.c:769
 msgid "_Close Window"
 msgstr "كۆزنەك ياپ(_C)"
 
-#: src/interface.c:883
+#: src/interface.c:771
 msgid "_Save to file"
 msgstr "ھۆججەتكە ساقلا(_S)"
 
-#: src/interface.c:928
+#: src/interface.c:816
 msgid "LiVES: - Insert"
 msgstr ""
 
-#: src/interface.c:945
+#: src/interface.c:833
 msgid "_Number of times to insert"
 msgstr ""
 
-#: src/interface.c:954
+#: src/interface.c:842
 msgid "_Insert to fit audio"
 msgstr ""
 
-#: src/interface.c:968
+#: src/interface.c:856
 msgid "Insert _before selection"
 msgstr ""
 
-#: src/interface.c:970
+#: src/interface.c:858
 msgid "Insert clipboard before selected frames"
 msgstr ""
 
-#: src/interface.c:986
+#: src/interface.c:875
 msgid "Insert _after selection"
 msgstr ""
 
-#: src/interface.c:988
+#: src/interface.c:877
 msgid "Insert clipboard after selected frames"
 msgstr ""
 
-#: src/interface.c:999
+#: src/interface.c:888
 msgid "Insert _with sound"
 msgstr ""
 
-#: src/interface.c:1012
+#: src/interface.c:901
 msgid "Insert with_out sound"
 msgstr ""
 
-#: src/interface.c:1093
+#: src/interface.c:985
 msgid "LiVES: - Open Selection"
 msgstr ""
 
-#: src/interface.c:1111
+#: src/interface.c:1004
 msgid "Selection start time (sec)"
 msgstr ""
 
-#: src/interface.c:1117
+#: src/interface.c:1010
 msgid "Number of frames to open"
 msgstr ""
 
-#: src/interface.c:1193
+#: src/interface.c:1088
 msgid "LiVES: - Open Location"
 msgstr ""
 
-#: src/interface.c:1195
+#: src/interface.c:1090
 msgid "LiVES: - Open Youtube Clip"
 msgstr ""
 
-#: src/interface.c:1213
+#: src/interface.c:1109
 msgid ""
 "\n"
 "\n"
@@ -1256,7 +1250,7 @@
 "\n"
 msgstr ""
 
-#: src/interface.c:1216
+#: src/interface.c:1112
 msgid ""
 "\n"
 "\n"
@@ -1265,62 +1259,62 @@
 "\n"
 msgstr ""
 
-#: src/interface.c:1220
+#: src/interface.c:1116
 msgid ""
 "Enter the URL of the clip below.\n"
 "E.g: http://www.youtube.com/watch?v=WCR6f6WzjP8\n"
 "\n"
 msgstr ""
 
-#: src/interface.c:1231
+#: src/interface.c:1127
 msgid "URL : "
 msgstr "URL : "
 
-#: src/interface.c:1231
+#: src/interface.c:1127
 msgid "Youtube URL : "
 msgstr ""
 
-#: src/interface.c:1235
+#: src/interface.c:1131
 msgid "Do not send bandwidth information"
 msgstr ""
 
-#: src/interface.c:1237
+#: src/interface.c:1133
 msgid "Try this setting if you are having problems getting a stream"
 msgstr ""
 
-#: src/interface.c:1258
+#: src/interface.c:1155
 msgid "Download to _Directory : "
 msgstr ""
 
-#: src/interface.c:1276
+#: src/interface.c:1173
 msgid "Download _File Name : "
 msgstr ""
 
-#: src/interface.c:1281
+#: src/interface.c:1178
 msgid ".webm"
 msgstr ""
 
-#: src/interface.c:1359
+#: src/interface.c:1256
 msgid "LiVES: - Rename Clip"
 msgstr ""
 
-#: src/interface.c:1362
-msgid "LiVES: - Enter Set Name"
+#: src/interface.c:1258
+msgid "LiVES: - Enter Set Name to Save as"
 msgstr ""
 
-#: src/interface.c:1365
+#: src/interface.c:1260
 msgid "LiVES: - Enter a Set Name to Reload"
 msgstr ""
 
-#: src/interface.c:1368
+#: src/interface.c:1262
 msgid "LiVES: - Choose a Working Directory"
 msgstr ""
 
-#: src/interface.c:1371
+#: src/interface.c:1264
 msgid "LiVES: - Rename Current Track"
 msgstr ""
 
-#: src/interface.c:1391
+#: src/interface.c:1283
 msgid ""
 "You need to enter a name for the current clip set.\n"
 "This will allow you reload the layout with the same clips later.\n"
@@ -1328,354 +1322,354 @@
 "LiVES will remind you to save the clip set later when you try to exit.\n"
 msgstr ""
 
-#: src/interface.c:1397
+#: src/interface.c:1289
 msgid ""
 "In order to export this project, you must enter a name for this clip set.\n"
 "This will also be used for the project name.\n"
 msgstr ""
 
-#: src/interface.c:1404
+#: src/interface.c:1296
 msgid ""
 "Welcome to LiVES !\n"
 "This startup wizard will guide you through the\n"
 "initial install so that you can get the most from this application.\n"
 msgstr ""
 
-#: src/interface.c:1408
+#: src/interface.c:1300
 msgid ""
 "\n"
 "First of all you need to choose a working directory for LiVES.\n"
 "This should be a directory with plenty of disk space available.\n"
 msgstr ""
 
-#: src/interface.c:1427
+#: src/interface.c:1317
 msgid "New name "
 msgstr "يېڭى ئات "
 
-#: src/interface.c:1430
+#: src/interface.c:1319
 msgid "Set name "
 msgstr "ئاتىنى بەلگىلەش "
 
-#: src/interface.c:1550
+#: src/interface.c:1435
 msgid "Use def_aults"
 msgstr "كۆڭۈلدىكىلەرنى ئىشلەت"
 
-#: src/interface.c:1553 src/interface.c:1840 src/preferences.c:2515
-#: src/preferences.c:2697
+#: src/interface.c:1437 src/interface.c:1709 src/preferences.c:2550
+#: src/preferences.c:2739
 msgid "_Advanced"
 msgstr "ئالىي(_A)"
 
-#: src/interface.c:1604
+#: src/interface.c:1487
 msgid "LiVES:- Select input device"
 msgstr ""
 
-#: src/interface.c:1622
+#: src/interface.c:1504
 msgid "Select input device:"
 msgstr ""
 
-#: src/interface.c:1686
+#: src/interface.c:1568
 msgid "LiVES:- Load CD Track"
 msgstr ""
 
-#: src/interface.c:1689
+#: src/interface.c:1570
 msgid "LiVES:- Select DVD Title/Chapter"
 msgstr ""
 
-#: src/interface.c:1692
+#: src/interface.c:1572
 msgid "LiVES:- Select VCD Title"
 msgstr ""
 
-#: src/interface.c:1695
+#: src/interface.c:1574
 msgid "LiVES:- Change Maximum Visible Tracks"
 msgstr ""
 
-#: src/interface.c:1698
+#: src/interface.c:1576
 msgid "LiVES:- Device details"
 msgstr ""
 
-#: src/interface.c:1721
+#: src/interface.c:1598
 #, c-format
 msgid "Track to load (from %s)"
 msgstr ""
 
-#: src/interface.c:1724
+#: src/interface.c:1600
 msgid "DVD Title"
 msgstr ""
 
-#: src/interface.c:1727
+#: src/interface.c:1602
 msgid "VCD Title"
 msgstr ""
 
-#: src/interface.c:1730
+#: src/interface.c:1604
 msgid "Maximum number of tracks to display"
 msgstr ""
 
-#: src/interface.c:1733
+#: src/interface.c:1606
 msgid "Device:        /dev/video"
 msgstr ""
 
-#: src/interface.c:1736
+#: src/interface.c:1608
 msgid "Device:        fw:"
 msgstr ""
 
-#: src/interface.c:1771
+#: src/interface.c:1641
 msgid "Chapter  "
 msgstr "باب  "
 
-#: src/interface.c:1776
+#: src/interface.c:1645
 msgid "Channel  "
 msgstr "قانال  "
 
-#: src/interface.c:1791
+#: src/interface.c:1660
 msgid "Audio ID  "
 msgstr ""
 
-#: src/interface.c:1857
+#: src/interface.c:1726
 msgid "Input number"
 msgstr ""
 
-#: src/interface.c:1865
+#: src/interface.c:1734
 msgid "Use default width, height and FPS"
 msgstr ""
 
-#: src/interface.c:1879
+#: src/interface.c:1748
 msgid "Width"
 msgstr "كەڭلىك"
 
-#: src/interface.c:1885
+#: src/interface.c:1754
 msgid "Height"
 msgstr "ئېگىزلىك"
 
-#: src/interface.c:1899
+#: src/interface.c:1768
 msgid "_Driver"
 msgstr ""
 
-#: src/interface.c:1902
+#: src/interface.c:1771
 msgid "_Output format"
 msgstr ""
 
-#: src/interface.c:1998
+#: src/interface.c:1865
 msgid "LiVES:- Fade Audio In"
 msgstr ""
 
-#: src/interface.c:2001
+#: src/interface.c:1867
 msgid "LiVES:- Fade Audio Out"
 msgstr ""
 
-#: src/interface.c:2017
+#: src/interface.c:1883
 msgid "Fade in over  "
 msgstr ""
 
-#: src/interface.c:2018
+#: src/interface.c:1884
 msgid "first"
 msgstr "بىرىنچى"
 
-#: src/interface.c:2021
+#: src/interface.c:1886
 msgid "Fade out over  "
 msgstr ""
 
-#: src/interface.c:2022
+#: src/interface.c:1887
 msgid "last"
 msgstr "ئاخىرقى"
 
-#: src/interface.c:2044
+#: src/interface.c:1909
 msgid "seconds."
 msgstr ""
 
-#: src/interface.c:2052 src/saveplay.c:1507
+#: src/interface.c:1917 src/saveplay.c:1484
 msgid "selection"
 msgstr ""
 
-#: src/interface.c:2092
+#: src/interface.c:1956
 msgid "LiVES: - File Comments (optional)"
 msgstr ""
 
-#: src/interface.c:2107
+#: src/interface.c:1971
 msgid "Title/Name : "
 msgstr ""
 
-#: src/interface.c:2114
+#: src/interface.c:1978
 msgid "Author/Artist : "
 msgstr ""
 
-#: src/interface.c:2121
+#: src/interface.c:1985
 msgid "Comments : "
 msgstr ""
 
-#: src/interface.c:2151
+#: src/interface.c:2015
 msgid "_Options"
 msgstr "تاللانما(_O)"
 
-#: src/interface.c:2158
+#: src/interface.c:2022
 msgid "Save _subtitles to file"
 msgstr ""
 
-#: src/interface.c:2170
+#: src/interface.c:2033
 msgid "Subtitle file"
 msgstr ""
 
-#: src/interface.c:2172
+#: src/interface.c:2035
 msgid "Browse..."
 msgstr "كۆز يۈگۈرت…"
 
-#: src/interface.c:2255
+#: src/interface.c:2132
 msgid "LiVES: - choose a device"
 msgstr ""
 
-#: src/interface.c:2259
+#: src/interface.c:2135
 msgid "LiVES: - choose a directory"
 msgstr ""
 
-#: src/interface.c:2262
+#: src/interface.c:2137
 msgid "LiVES: - choose a file"
 msgstr ""
 
-#: src/interface.c:2445
+#: src/interface.c:2381
 msgid "LiVES: - Cancel/Discard/Save"
 msgstr ""
 
-#: src/interface.c:2460
+#: src/interface.c:2397
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has not been saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:2463
+#: src/interface.c:2400
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has been changed since the last save.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:2467
+#: src/interface.c:2404
 msgid ""
 "You are about to exit LiVES.\n"
 "The current clip set can be saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:2468
+#: src/interface.c:2405
 msgid ""
 "The current clip set has not been saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:2472
+#: src/interface.c:2408
 msgid ""
 "The current layout has not been saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:2475
+#: src/interface.c:2410
 msgid ""
 "The current layout has *not* been changed since it was last saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:2480
+#: src/interface.c:2415
 msgid ""
 "The current layout contains generated frames and cannot be retained.\n"
 "You may wish to render it before exiting multitrack mode.\n"
 msgstr ""
 
-#: src/interface.c:2483
+#: src/interface.c:2418
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout contains generated frames and cannot be retained.\n"
 "What do you wish to do ?"
 msgstr ""
 
-#: src/interface.c:2496
+#: src/interface.c:2431
 msgid "Clip set _name"
 msgstr ""
 
-#: src/interface.c:2502
+#: src/interface.c:2437
 msgid "_Auto reload next time"
 msgstr ""
 
-#: src/interface.c:2538 src/interface.c:2547
+#: src/interface.c:2473 src/interface.c:2482
 msgid "_Wipe layout"
 msgstr ""
 
-#: src/interface.c:2539
+#: src/interface.c:2474
 msgid "_Ignore changes"
 msgstr ""
 
-#: src/interface.c:2540
+#: src/interface.c:2475
 msgid "_Delete clip set"
 msgstr ""
 
-#: src/interface.c:2541
+#: src/interface.c:2476
 msgid "_Delete layout"
 msgstr ""
 
-#: src/interface.c:2545
+#: src/interface.c:2480
 msgid "_Save layout"
 msgstr ""
 
-#: src/interface.c:2546
+#: src/interface.c:2481
 msgid "_Save clip set"
 msgstr ""
 
-#: src/interface.c:2565
+#: src/interface.c:2502
 msgid ""
 "\n"
 "LiVES has detected a multitrack layout from a previous session.\n"
 "Would you like to try and recover it ?\n"
 msgstr ""
 
-#: src/interface.c:2589
+#: src/interface.c:2528
 msgid "LiVES: - Disk Recovery Options"
 msgstr ""
 
-#: src/interface.c:2608
+#: src/interface.c:2549
 msgid "Delete _Orphaned Clips"
 msgstr ""
 
-#: src/interface.c:2609
+#: src/interface.c:2550
 msgid "Delete any clips which are not currently loaded or part of a set"
 msgstr ""
 
-#: src/interface.c:2622
+#: src/interface.c:2564
 msgid "Clear _Backup Files from Closed Clips"
 msgstr ""
 
-#: src/interface.c:2633
+#: src/interface.c:2575
 msgid "Remove Sets which have _Layouts but no Clips"
 msgstr ""
 
-#: src/interface.c:2644
+#: src/interface.c:2586
 msgid "_Reset to Defaults"
 msgstr ""
 
-#: src/interface.c:2651
+#: src/interface.c:2593
 msgid "_Accept"
 msgstr ""
 
-#: src/callbacks.c:198
+#: src/callbacks.c:208
 #, c-format
 msgid "Saving as set %s..."
 msgstr ""
 
-#: src/callbacks.c:833
+#: src/callbacks.c:852
 msgid "Please enter the name of the file to save the clip as.\n"
 msgstr ""
 
-#: src/callbacks.c:841
+#: src/callbacks.c:860
 msgid "Please enter a valid URL for the download.\n"
 msgstr ""
 
-#: src/callbacks.c:867
+#: src/callbacks.c:886
 #, c-format
 msgid "Downloading %s to %s..."
 msgstr ""
 
-#: src/callbacks.c:895
+#: src/callbacks.c:912
 msgid "Downloading clip"
 msgstr ""
 
-#: src/callbacks.c:933
+#: src/callbacks.c:950
 msgid ""
 "\n"
 "LiVES was unable to download the clip.\n"
@@ -1683,17 +1677,17 @@
 "the latest youtube-dl installed.\n"
 msgstr ""
 
-#: src/callbacks.c:1114 src/callbacks.c:1149
+#: src/callbacks.c:1131 src/callbacks.c:1166
 msgid "This file"
 msgstr ""
 
-#: src/callbacks.c:1115
+#: src/callbacks.c:1132
 msgid ""
 ",\n"
 " - including the current layout - "
 msgstr ""
 
-#: src/callbacks.c:1117
+#: src/callbacks.c:1134
 #, c-format
 msgid ""
 "\n"
@@ -1703,7 +1697,7 @@
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1119
+#: src/callbacks.c:1136
 #, c-format
 msgid ""
 "\n"
@@ -1713,20 +1707,20 @@
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1150
+#: src/callbacks.c:1167
 msgid ""
 "Changes made to this clip have not been saved or backed up.\n"
 "\n"
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1343
+#: src/callbacks.c:1356
 msgid ""
 "\n"
 "Invalid project file.\n"
 msgstr ""
 
-#: src/callbacks.c:1356
+#: src/callbacks.c:1370
 #, c-format
 msgid ""
 "\n"
@@ -1739,33 +1733,33 @@
 "Once you have done this, you will be able to import the new project.\n"
 msgstr ""
 
-#: src/callbacks.c:1366
+#: src/callbacks.c:1381
 #, c-format
 msgid "Importing the project %s as set %s..."
 msgstr ""
 
-#: src/callbacks.c:1386
+#: src/callbacks.c:1399
 msgid "Importing project"
 msgstr ""
 
-#: src/callbacks.c:1472
+#: src/callbacks.c:1481
 #, c-format
 msgid "Exporting project %s..."
 msgstr ""
 
-#: src/callbacks.c:1490
+#: src/callbacks.c:1497
 msgid "Exporting project"
 msgstr ""
 
-#: src/callbacks.c:1506
+#: src/callbacks.c:1513
 msgid "Backup as .lv1 file"
 msgstr ""
 
-#: src/callbacks.c:1522
+#: src/callbacks.c:1529
 msgid "Restore .lv1 file"
 msgstr ""
 
-#: src/callbacks.c:1664
+#: src/callbacks.c:1671
 msgid ""
 "\n"
 "\n"
@@ -1773,72 +1767,77 @@
 "Are you sure ?\n"
 msgstr ""
 
-#: src/callbacks.c:1725
+#: src/callbacks.c:1732
 #, c-format
 msgid "Deleting set %s..."
 msgstr ""
 
-#: src/callbacks.c:1727
+#: src/callbacks.c:1734
 msgid "Deleting set..."
 msgstr ""
 
-#: src/callbacks.c:1731
+#: src/callbacks.c:1738
 msgid "Deleting set"
 msgstr ""
 
-#: src/callbacks.c:1739
+#: src/callbacks.c:1746
 #, c-format
 msgid "Set %s was permanently deleted from the disk.\n"
 msgstr ""
 
-#: src/callbacks.c:1787 src/callbacks.c:11764
+#: src/callbacks.c:1792 src/callbacks.c:11676
 msgid "Insert Silence"
 msgstr ""
 
-#: src/callbacks.c:1840 src/callbacks.c:1923 src/callbacks.c:2086
+#: src/callbacks.c:1844 src/callbacks.c:1927 src/callbacks.c:2089
 msgid "Undoing"
 msgstr ""
 
-#: src/callbacks.c:1936 src/callbacks.c:2147
+#: src/callbacks.c:1940 src/callbacks.c:2150
 msgid "Restoring audio..."
 msgstr ""
 
-#: src/callbacks.c:1952
+#: src/callbacks.c:1956
 msgid "Clearing frame images"
 msgstr ""
 
-#: src/callbacks.c:1985
+#: src/callbacks.c:1988
 msgid "Deleting excess frames"
 msgstr ""
 
-#: src/callbacks.c:2229
+#: src/callbacks.c:2232
 #, c-format
 msgid "Length of video is now %d frames at %.3f frames per second.\n"
 msgstr ""
 
-#: src/callbacks.c:2233 src/resample.c:683 src/resample.c:2166
+#: src/callbacks.c:2235 src/resample.c:678 src/resample.c:2133
 #, c-format
 msgid "Clipboard was resampled to %d frames.\n"
 msgstr ""
 
-#: src/callbacks.c:2394 src/callbacks.c:2423
+#: src/callbacks.c:2396 src/callbacks.c:2425
 msgid "Redoing"
 msgstr ""
 
-#: src/callbacks.c:2462
+#: src/callbacks.c:2472
 #, c-format
-msgid "Copying frames %d to %d%s to the clipboard..."
+msgid "Copying frames %d to %d (with sound) to the clipboard..."
 msgstr ""
 
-#: src/callbacks.c:2525
+#: src/callbacks.c:2474
+#, c-format
+msgid "Copying frames %d to %d to the clipboard..."
+msgstr ""
+
+#: src/callbacks.c:2526
 msgid "Copying to the clipboard"
 msgstr ""
 
-#: src/callbacks.c:2600
+#: src/callbacks.c:2601
 msgid "Cut"
 msgstr "كەس"
 
-#: src/callbacks.c:2641 src/callbacks.c:3068 src/callbacks.c:8026
+#: src/callbacks.c:2641 src/callbacks.c:3063 src/callbacks.c:7631
 msgid "Pulling frames from clipboard"
 msgstr ""
 
@@ -1847,22 +1846,22 @@
 msgid "Pasting %d frames to new clip %s..."
 msgstr ""
 
-#: src/callbacks.c:2678
+#: src/callbacks.c:2676
 msgid "Pasting"
 msgstr ""
 
-#: src/callbacks.c:2694
+#: src/callbacks.c:2692
 msgid "...added audio..."
 msgstr ""
 
-#: src/callbacks.c:2778
+#: src/callbacks.c:2775
 msgid ""
 "This operation requires resizing or converting of frames.\n"
 "Please install 'convert' from the Image-magick package, and then restart "
 "LiVES.\n"
 msgstr ""
 
-#: src/callbacks.c:2795
+#: src/callbacks.c:2793
 msgid ""
 "\n"
 "\n"
@@ -1871,31 +1870,31 @@
 "the 'Trim Audio' function from the Audio menu."
 msgstr ""
 
-#: src/callbacks.c:2819
+#: src/callbacks.c:2817
 msgid ""
 "LiVES cannot insert because the audio rates do not match.\n"
 "Please install 'sox', and try again."
 msgstr ""
 
-#: src/callbacks.c:2838
+#: src/callbacks.c:2835
 msgid ""
 "\n"
 "Insertion will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:2888 src/callbacks.c:11692
+#: src/callbacks.c:2883 src/callbacks.c:11606
 msgid ""
 "\n"
 "Insertion will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:2996 src/callbacks.c:3025
+#: src/callbacks.c:2987 src/callbacks.c:3016
 msgid "Resampling clipboard audio"
 msgstr ""
 
-#: src/callbacks.c:3041
+#: src/callbacks.c:3032
 msgid ""
 "\n"
 "\n"
@@ -1903,7 +1902,7 @@
 "Clipboard audio has been erased.\n"
 msgstr ""
 
-#: src/callbacks.c:3055
+#: src/callbacks.c:3045
 msgid ""
 "\n"
 "\n"
@@ -1912,79 +1911,79 @@
 "using unchanged audio ?\n"
 msgstr ""
 
-#: src/callbacks.c:3137 src/callbacks.c:3311
+#: src/callbacks.c:3132 src/callbacks.c:3299
 #, c-format
 msgid "Inserting %d%s frames from the clipboard..."
 msgstr ""
 
-#: src/callbacks.c:3162 src/callbacks.c:3236 src/callbacks.c:3339
+#: src/callbacks.c:3155 src/callbacks.c:3224 src/callbacks.c:3325
 msgid "Inserting"
 msgstr ""
 
-#: src/callbacks.c:3193
+#: src/callbacks.c:3187
 #, c-format
 msgid "Inserting %d times from the clipboard%s..."
 msgstr ""
 
-#: src/callbacks.c:3200
+#: src/callbacks.c:3191
 #, c-format
 msgid "Inserting %d frames from the clipboard%s..."
 msgstr ""
 
-#: src/callbacks.c:3418
+#: src/callbacks.c:3404
 msgid "Insert"
 msgstr "قىستۇر"
 
-#: src/callbacks.c:3486
+#: src/callbacks.c:3471
 msgid ""
 "\n"
 "Deleting all frames will close this file.\n"
 "Are you sure ?"
 msgstr ""
 
-#: src/callbacks.c:3495
+#: src/callbacks.c:3480
 msgid ""
 "\n"
 "Deletion will cause missing frames in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3515 src/callbacks.c:10920 src/callbacks.c:11162
-#: src/callbacks.c:11228
+#: src/callbacks.c:3500 src/callbacks.c:10851 src/callbacks.c:11087
+#: src/callbacks.c:11152
 msgid ""
 "\n"
 "Deletion will cause missing audio in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3534
+#: src/callbacks.c:3519
 msgid ""
 "\n"
 "Deletion will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3553 src/callbacks.c:11210
+#: src/callbacks.c:3538 src/callbacks.c:11134
 msgid ""
 "\n"
 "Deletion will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3611
+#: src/callbacks.c:3597
 #, c-format
 msgid "Deleting frames %d to %d%s..."
 msgstr ""
 
-#: src/callbacks.c:3636
+#: src/callbacks.c:3619
 msgid "Deleting"
 msgstr "ئۆچۈرۈۋاتىدۇ"
 
-#: src/callbacks.c:3717
+#: src/callbacks.c:3699
 msgid "Delete"
 msgstr "ئۆچۈر"
 
-#: src/callbacks.c:3738
+#: src/callbacks.c:3717
 msgid ""
 "\n"
 "\n"
@@ -1994,7 +1993,7 @@
 "\n"
 "تاللاش قۇلۇپلانغان\n"
 
-#: src/callbacks.c:4092
+#: src/callbacks.c:4056
 msgid ""
 "Ready to record. Use 'control' and cursor keys during playback to record "
 "your performance.\n"
@@ -2002,11 +2001,11 @@
 "play.)\n"
 msgstr ""
 
-#: src/callbacks.c:4098
+#: src/callbacks.c:4061
 msgid "Record cancelled.\n"
 msgstr ""
 
-#: src/callbacks.c:4237
+#: src/callbacks.c:4197
 #, c-format
 msgid ""
 "\n"
@@ -2015,7 +2014,7 @@
 "%s\n"
 msgstr ""
 
-#: src/callbacks.c:4241
+#: src/callbacks.c:4200
 #, c-format
 msgid ""
 "\n"
@@ -2024,7 +2023,7 @@
 "The plugin may be broken or not installed correctly."
 msgstr ""
 
-#: src/callbacks.c:4571
+#: src/callbacks.c:4532
 #, c-format
 msgid ""
 "Saving the set will cause copies of all loaded clips to remain on the disk"
@@ -2033,22 +2032,22 @@
 "Please press 'Cancel' if that is not what you want.\n"
 msgstr ""
 
-#: src/callbacks.c:4654
+#: src/callbacks.c:4617
 #, c-format
 msgid "Saving set %s"
 msgstr ""
 
-#: src/callbacks.c:5005
+#: src/callbacks.c:4964
 #, c-format
 msgid "Loading clips from set %s"
 msgstr ""
 
-#: src/callbacks.c:5093
+#: src/callbacks.c:5051
 #, c-format
 msgid "%d clips and %d layouts were recovered from set (%s).\n"
 msgstr ""
 
-#: src/callbacks.c:5312
+#: src/callbacks.c:5259
 msgid ""
 "LiVES will attempt to recover some disk space.\n"
 "You should ONLY run this if you have no other copies of LiVES running on "
@@ -2056,24 +2055,24 @@
 "Click OK to proceed.\n"
 msgstr ""
 
-#: src/callbacks.c:5317
+#: src/callbacks.c:5264
 msgid "Cleaning up disk space..."
 msgstr ""
 
-#: src/callbacks.c:5387
+#: src/callbacks.c:5334
 msgid "Recovering disk space"
 msgstr ""
 
-#: src/callbacks.c:5439
+#: src/callbacks.c:5386
 #, c-format
 msgid "%s of disk space was recovered.\n"
 msgstr ""
 
-#: src/callbacks.c:5482
+#: src/callbacks.c:5428
 msgid "Resetting frame rates and frame values..."
 msgstr ""
 
-#: src/callbacks.c:5523
+#: src/callbacks.c:5469
 #, c-format
 msgid ""
 "\n"
@@ -2081,39 +2080,39 @@
 "Internal: %s (%d bpp) / %s\n"
 msgstr ""
 
-#: src/callbacks.c:5525
+#: src/callbacks.c:5471
 msgid "buffered"
 msgstr ""
 
-#: src/callbacks.c:5538 src/callbacks.c:5557 src/callbacks.c:5575
-#: src/callbacks.c:5609
+#: src/callbacks.c:5484 src/callbacks.c:5502 src/callbacks.c:5518
+#: src/callbacks.c:5551
 msgid ""
 "\n"
 "  Opening..."
 msgstr ""
 
-#: src/callbacks.c:5545
+#: src/callbacks.c:5490
 #, c-format
 msgid ""
 "\n"
 "(%d virtual)"
 msgstr ""
 
-#: src/callbacks.c:5548
+#: src/callbacks.c:5493
 #, c-format
 msgid ""
 "\n"
 "(%d decoded)"
 msgstr ""
 
-#: src/callbacks.c:5560 src/callbacks.c:5578 src/callbacks.c:5612
+#: src/callbacks.c:5504 src/callbacks.c:5520 src/callbacks.c:5553
 #, c-format
 msgid ""
 "\n"
 "  %.2f sec."
 msgstr ""
 
-#: src/callbacks.c:5569
+#: src/callbacks.c:5512
 msgid ""
 "\n"
 "  Unknown"
@@ -2121,30 +2120,30 @@
 "\n"
 "  نامەلۇم"
 
-#: src/callbacks.c:5582 src/callbacks.c:5596
+#: src/callbacks.c:5524 src/callbacks.c:5538
 msgid "unsigned"
 msgstr ""
 
-#: src/callbacks.c:5583 src/callbacks.c:5597
+#: src/callbacks.c:5525 src/callbacks.c:5539
 msgid "signed"
 msgstr ""
 
-#: src/callbacks.c:5585 src/callbacks.c:5599
+#: src/callbacks.c:5527 src/callbacks.c:5541
 msgid "big-endian"
 msgstr ""
 
-#: src/callbacks.c:5586 src/callbacks.c:5600
+#: src/callbacks.c:5528 src/callbacks.c:5542
 msgid "little-endian"
 msgstr ""
 
-#: src/callbacks.c:5588 src/callbacks.c:5602
+#: src/callbacks.c:5530 src/callbacks.c:5544
 #, c-format
 msgid ""
 "  %d Hz %d bit\n"
 "%s %s"
 msgstr ""
 
-#: src/callbacks.c:5707
+#: src/callbacks.c:5647
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -2161,22 +2160,22 @@
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA.\n"
 msgstr ""
 
-#: src/callbacks.c:5721
+#: src/callbacks.c:5661
 msgid "A video editor and VJ program."
 msgstr ""
 
-#: src/callbacks.c:5722
+#: src/callbacks.c:5662
 msgid "About LiVES"
 msgstr ""
 
-#: src/callbacks.c:5724
+#: src/callbacks.c:5664
 msgid "translator_credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Gheyret T.Kenji https://launchpad.net/~gheyretkenji\n"
 "  salsaman https://launchpad.net/~salsaman"
 
-#: src/callbacks.c:5758
+#: src/callbacks.c:5699
 #, c-format
 msgid ""
 "LiVES Version %s\n"
@@ -2190,14 +2189,14 @@
 "Homepage: http://lives.sourceforge.net"
 msgstr ""
 
-#: src/callbacks.c:6037
+#: src/callbacks.c:5996
 msgid ""
 "\n"
 "\n"
 "You need to install mplayer or mplayer2 to be able to preview this file.\n"
 msgstr ""
 
-#: src/callbacks.c:6040
+#: src/callbacks.c:5998
 msgid ""
 "\n"
 "\n"
@@ -2205,215 +2204,206 @@
 "this file.\n"
 msgstr ""
 
-#: src/callbacks.c:6423 src/callbacks.c:8289
-msgid ""
-"\n"
-"Loading new audio may cause missing audio in some multitrack layouts.\n"
-"Are you sure you wish to continue ?\n"
-"."
-msgstr ""
-
-#: src/callbacks.c:6523
-#, c-format
-msgid "Opening audio %s, type %s..."
-msgstr ""
-
-#: src/callbacks.c:6556 src/saveplay.c:480
-msgid "Opening audio"
-msgstr ""
-
-#: src/callbacks.c:6565 src/callbacks.c:6612 src/callbacks.c:8387
-#: src/callbacks.c:8429 src/callbacks.c:8472 src/callbacks.c:10846
-msgid "Cancelling"
-msgstr "ئەمەلدىن قالدۇرۇۋاتىدۇ"
-
-#: src/callbacks.c:6660 src/callbacks.c:8514 src/callbacks.c:10876
-#: src/callbacks.c:11563
-msgid "Committing audio"
-msgstr ""
-
-#: src/callbacks.c:6672 src/callbacks.c:8546
-msgid "New Audio"
-msgstr ""
-
-#: src/callbacks.c:6779
+#: src/callbacks.c:6459
 #, c-format
 msgid ""
 "Text was saved as\n"
 "%s\n"
 msgstr ""
 
-#: src/callbacks.c:6951 src/saveplay.c:3618
-#, c-format
-msgid "%d frames are enough !\n"
-msgstr ""
-
-#: src/callbacks.c:7050
+#: src/callbacks.c:6706
 msgid "LiVES: - Encoder debug output"
 msgstr ""
 
-#: src/callbacks.c:7087 src/gui.c:1922
+#: src/callbacks.c:6743 src/gui.c:1921
 msgid "Fullscreen playback (f)"
 msgstr ""
 
-#: src/callbacks.c:7089
+#: src/callbacks.c:6744
 msgid "Fullscreen playback off (f)"
 msgstr ""
 
-#: src/callbacks.c:7188 src/callbacks.c:7336 src/callbacks.c:7664
-#: src/callbacks.c:7681 src/gui.c:3712 src/saveplay.c:2467 src/saveplay.c:2501
-#: src/saveplay.c:3115 src/saveplay.c:3220 src/saveplay.c:3239
-#: src/multitrack.c:9340 src/multitrack.c:11060
+#: src/callbacks.c:6841 src/callbacks.c:6983 src/callbacks.c:7283
+#: src/callbacks.c:7298 src/gui.c:3838 src/saveplay.c:2442 src/saveplay.c:2475
+#: src/saveplay.c:3074 src/saveplay.c:3178 src/saveplay.c:3197
+#: src/multitrack.c:9526 src/multitrack.c:11288
 #, c-format
 msgid " (%d %% scale)"
 msgstr ""
 
-#: src/callbacks.c:7190 src/callbacks.c:7338 src/callbacks.c:7666
-#: src/gui.c:3716 src/saveplay.c:2469 src/saveplay.c:2503
+#: src/callbacks.c:6843 src/callbacks.c:6985 src/callbacks.c:7285
+#: src/gui.c:3842 src/saveplay.c:2444 src/saveplay.c:2477
 #, c-format
 msgid "LiVES: - Play Window%s"
 msgstr ""
 
-#: src/callbacks.c:7302 src/gui.c:1907
+#: src/callbacks.c:6950 src/gui.c:1906
 msgid "Double size (d)"
 msgstr ""
 
-#: src/callbacks.c:7309
+#: src/callbacks.c:6956
 msgid "Single size (d)"
 msgstr ""
 
-#: src/callbacks.c:7442 src/callbacks.c:7443
+#: src/callbacks.c:7087 src/callbacks.c:7088
 msgid "Hide the play window (s)"
 msgstr ""
 
-#: src/callbacks.c:7452 src/gui.c:1746
+#: src/callbacks.c:7096 src/gui.c:1744
 msgid "Show the play window (s)"
 msgstr ""
 
-#: src/callbacks.c:7453 src/gui.c:1896
+#: src/callbacks.c:7097 src/gui.c:1895
 msgid "Play in separate window (s)"
 msgstr ""
 
-#: src/callbacks.c:7535 src/gui.c:4060 src/saveplay.c:2498
+#: src/callbacks.c:7175 src/gui.c:4169 src/saveplay.c:2472
 msgid "LiVES: - Streaming"
 msgstr ""
 
-#: src/callbacks.c:7778
+#: src/callbacks.c:7388
 msgid "Switch continuous looping off (o)"
 msgstr ""
 
-#: src/callbacks.c:7785 src/gui.c:1795
+#: src/callbacks.c:7394 src/gui.c:1793
 msgid "Switch continuous looping on (o)"
 msgstr ""
 
-#: src/callbacks.c:7837
+#: src/callbacks.c:7444
 #, c-format
 msgid "Audio volume (%.2f)"
 msgstr ""
 
-#: src/callbacks.c:7876 src/callbacks.c:7877 src/gui.c:3640
+#: src/callbacks.c:7483 src/callbacks.c:7484 src/gui.c:3766
 msgid "Unmute the audio (z)"
 msgstr ""
 
-#: src/callbacks.c:7888 src/callbacks.c:7889 src/gui.c:1808 src/gui.c:3639
+#: src/callbacks.c:7494 src/callbacks.c:7495 src/gui.c:1806 src/gui.c:3765
 msgid "Mute the audio (z)"
 msgstr ""
 
-#: src/callbacks.c:8038
+#: src/callbacks.c:7643
 msgid "Reversing clipboard..."
 msgstr ""
 
-#: src/callbacks.c:8052
+#: src/callbacks.c:7657
 msgid "Reversing clipboard"
 msgstr ""
 
-#: src/callbacks.c:8084
+#: src/callbacks.c:7689
 msgid "LiVES: Load subtitles from..."
 msgstr ""
 
-#: src/callbacks.c:8151 src/saveplay.c:970
+#: src/callbacks.c:7753 src/saveplay.c:956
 #, c-format
 msgid "Loaded subtitle file: %s\n"
 msgstr ""
 
-#: src/callbacks.c:8220
+#: src/callbacks.c:7821
 msgid "Subtitles were erased.\n"
 msgstr ""
 
-#: src/callbacks.c:8239
+#: src/callbacks.c:7843
 msgid "LiVES: - Select Audio File"
 msgstr ""
 
-#: src/callbacks.c:8250
+#: src/callbacks.c:7878 src/callbacks.c:8232
+msgid ""
+"\n"
+"Loading new audio may cause missing audio in some multitrack layouts.\n"
+"Are you sure you wish to continue ?\n"
+"."
+msgstr ""
+
+#: src/callbacks.c:7989
+#, c-format
+msgid "Opening audio %s, type %s..."
+msgstr ""
+
+#: src/callbacks.c:8023 src/saveplay.c:477
+msgid "Opening audio"
+msgstr ""
+
+#: src/callbacks.c:8032 src/callbacks.c:8083 src/callbacks.c:8327
+#: src/callbacks.c:8369 src/callbacks.c:8412 src/callbacks.c:10766
+msgid "Cancelling"
+msgstr "ئەمەلدىن قالدۇرۇۋاتىدۇ"
+
+#: src/callbacks.c:8137 src/callbacks.c:8454 src/callbacks.c:10803
+#: src/callbacks.c:11477
+msgid "Committing audio"
+msgstr ""
+
+#: src/callbacks.c:8153 src/callbacks.c:8484
+msgid "New Audio"
+msgstr ""
+
+#: src/callbacks.c:8194
 msgid "Please set your CD play device in Tools | Preferences | Misc\n"
 msgstr ""
 
-#: src/callbacks.c:8321
+#: src/callbacks.c:8264
 #, c-format
 msgid "Opening CD track %d from %s..."
 msgstr ""
 
-#: src/callbacks.c:8326
+#: src/callbacks.c:8267
 #, c-format
 msgid "CD track %d"
 msgstr ""
 
-#: src/callbacks.c:8373
+#: src/callbacks.c:8313
 msgid "Opening CD track..."
 msgstr ""
 
-#: src/callbacks.c:8415 src/callbacks.c:8461
+#: src/callbacks.c:8355 src/callbacks.c:8401
 msgid "Error loading CD track\n"
 msgstr ""
 
-#: src/callbacks.c:8584
+#: src/callbacks.c:8518
 msgid "layout errors"
 msgstr ""
 
-#: src/callbacks.c:8595
+#: src/callbacks.c:8529
 msgid "Close _Window"
 msgstr ""
 
-#: src/callbacks.c:8606
+#: src/callbacks.c:8540
 msgid "Clear _Errors"
 msgstr ""
 
-#: src/callbacks.c:8617
+#: src/callbacks.c:8551
 msgid "_Delete affected layouts"
 msgstr ""
 
-#: src/callbacks.c:9343 src/callbacks.c:9388
+#: src/callbacks.c:9253 src/callbacks.c:9298
 msgid "Resume"
 msgstr "داۋاملاشتۇر"
 
-#: src/callbacks.c:9344
+#: src/callbacks.c:9254
 msgid ""
 "\n"
 "Paused\n"
 "(click Resume to continue processing)"
 msgstr ""
 
-#: src/callbacks.c:9345 src/callbacks.c:9406
+#: src/callbacks.c:9255 src/callbacks.c:9315
 msgid "paused..."
 msgstr ""
 
-#: src/callbacks.c:9372 src/callbacks.c:9418
-msgid "Pause"
-msgstr "ۋاقىتلىق توختا"
-
-#: src/callbacks.c:9374 src/callbacks.c:9421
+#: src/callbacks.c:9284 src/callbacks.c:9333
 msgid "resumed..."
 msgstr ""
 
-#: src/callbacks.c:9393
+#: src/callbacks.c:9303
 msgid "Keep"
 msgstr "تەگمە"
 
-#: src/callbacks.c:9396
+#: src/callbacks.c:9305
 msgid "Enough"
 msgstr ""
 
-#: src/callbacks.c:9401
+#: src/callbacks.c:9310
 #, c-format
 msgid ""
 "\n"
@@ -2422,28 +2412,28 @@
 "(click Resume to continue processing)"
 msgstr ""
 
-#: src/callbacks.c:9419
+#: src/callbacks.c:9331
 msgid "Cancel"
 msgstr "ئەمەلدىن قالدۇرۇش"
 
-#: src/callbacks.c:9558
+#: src/callbacks.c:9478
 msgid "Stop"
 msgstr ""
 
-#: src/callbacks.c:10053 src/multitrack.c:13247
+#: src/callbacks.c:9968 src/multitrack.c:13489
 msgid "LiVES: Selected frame"
 msgstr ""
 
-#: src/callbacks.c:10061
+#: src/callbacks.c:9976
 msgid "_Save frame as..."
 msgstr ""
 
-#: src/callbacks.c:10290
+#: src/callbacks.c:10202
 #, c-format
 msgid "Audio is ahead of video by %.4f secs. at frame %d, with fps %.4f\n"
 msgstr ""
 
-#: src/callbacks.c:10347
+#: src/callbacks.c:10255
 msgid ""
 "\n"
 "\n"
@@ -2452,7 +2442,7 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10353
+#: src/callbacks.c:10261
 msgid ""
 "\n"
 "\n"
@@ -2460,13 +2450,13 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10429 src/callbacks.c:11479
+#: src/callbacks.c:10334 src/callbacks.c:11395
 msgid ""
 "\n"
 "Record time must be greater than 0.\n"
 msgstr ""
 
-#: src/callbacks.c:10440
+#: src/callbacks.c:10346
 msgid ""
 "Capture an External Window:\n"
 "\n"
@@ -2475,17 +2465,17 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10445
+#: src/callbacks.c:10351
 msgid "External window was released.\n"
 msgstr ""
 
-#: src/callbacks.c:10479
+#: src/callbacks.c:10385
 msgid ""
 "Click on a Window to Capture it\n"
 "Press 'q' to stop recording"
 msgstr ""
 
-#: src/callbacks.c:10513
+#: src/callbacks.c:10419
 #, c-format
 msgid ""
 "\n"
@@ -2495,19 +2485,19 @@
 "(Default of %.3f frames per second will be used.)\n"
 msgstr ""
 
-#: src/callbacks.c:10539
+#: src/callbacks.c:10443
 msgid "LiVES was unable to capture this window. Sorry.\n"
 msgstr ""
 
-#: src/callbacks.c:10695
+#: src/callbacks.c:10601
 msgid "Export Selected Audio as..."
 msgstr ""
 
-#: src/callbacks.c:10699
+#: src/callbacks.c:10604
 msgid "Export Audio as..."
 msgstr ""
 
-#: src/callbacks.c:10714
+#: src/callbacks.c:10619
 msgid ""
 "\n"
 "\n"
@@ -2516,1033 +2506,1033 @@
 "rate.\n"
 msgstr ""
 
-#: src/callbacks.c:10720
+#: src/callbacks.c:10625
 #, c-format
 msgid "Exporting audio frames %d to %d as %s..."
 msgstr ""
 
-#: src/callbacks.c:10725
+#: src/callbacks.c:10629
 #, c-format
 msgid "Exporting audio as %s..."
 msgstr ""
 
-#: src/callbacks.c:10751
+#: src/callbacks.c:10655
 msgid "Exporting audio"
 msgstr ""
 
-#: src/callbacks.c:10782
+#: src/callbacks.c:10695
 msgid "LiVES: - Append Audio File"
 msgstr ""
 
-#: src/callbacks.c:10825
+#: src/callbacks.c:10739
 #, c-format
 msgid "Appending audio file %s..."
 msgstr ""
 
-#: src/callbacks.c:10836
+#: src/callbacks.c:10756
 msgid "Appending audio"
 msgstr ""
 
-#: src/callbacks.c:10892
+#: src/callbacks.c:10818
 msgid "Append Audio"
 msgstr ""
 
-#: src/callbacks.c:10952
+#: src/callbacks.c:10883
 #, c-format
 msgid "Padding audio to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10954
+#: src/callbacks.c:10885
 #, c-format
 msgid "Trimming audio from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10973
+#: src/callbacks.c:10904
 msgid "Trimming/Padding audio"
 msgstr ""
 
-#: src/callbacks.c:10981
+#: src/callbacks.c:10912
 msgid "Trim/Pad Audio"
 msgstr ""
 
-#: src/callbacks.c:11055
+#: src/callbacks.c:10982
 msgid "Fading audio in"
 msgstr ""
 
-#: src/callbacks.c:11056
+#: src/callbacks.c:10983
 msgid "Fade audio in"
 msgstr ""
 
-#: src/callbacks.c:11061
+#: src/callbacks.c:10987
 msgid "Fading audio out"
 msgstr ""
 
-#: src/callbacks.c:11062
+#: src/callbacks.c:10988
 msgid "Fade audio out"
 msgstr ""
 
-#: src/callbacks.c:11085
+#: src/callbacks.c:11011
 #, c-format
 msgid "%s over %.1f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11087
+#: src/callbacks.c:11013
 #, c-format
 msgid "%s from time %.2f seconds to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11094
+#: src/callbacks.c:11020
 msgid "Fading audio..."
 msgstr ""
 
-#: src/callbacks.c:11194
+#: src/callbacks.c:11119
 msgid ""
 "\n"
 "Deleting all audio will close this file.\n"
 "Are you sure ?"
 msgstr ""
 
-#: src/callbacks.c:11197
+#: src/callbacks.c:11122
 msgid "Deleting all audio..."
 msgstr ""
 
-#: src/callbacks.c:11203
+#: src/callbacks.c:11127
 #, c-format
 msgid "Deleting audio from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11290
+#: src/callbacks.c:11214
 msgid "Deleting Audio"
 msgstr ""
 
-#: src/callbacks.c:11297
+#: src/callbacks.c:11221
 msgid "Delete Audio"
 msgstr ""
 
-#: src/callbacks.c:11636
+#: src/callbacks.c:11550
 msgid "Record new audio"
 msgstr ""
 
-#: src/callbacks.c:11725
+#: src/callbacks.c:11640
 #, c-format
 msgid "Inserting silence from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11754
+#: src/callbacks.c:11666
 msgid "Inserting Silence"
 msgstr ""
 
-#: src/merge.c:85
+#: src/merge.c:96
 msgid "LiVES: - Merge"
 msgstr ""
 
-#: src/merge.c:102
+#: src/merge.c:113
 #, c-format
 msgid "Merge Clipboard [ %d Frames ]       With Selection [ %d Frames ]"
 msgstr ""
 
-#: src/merge.c:107
+#: src/merge.c:118
 #, c-format
 msgid ""
 "Merge Clipboard [ %d Frames (resampled) ]       With Selection [ %d Frames ]"
 msgstr ""
 
-#: src/merge.c:118
+#: src/merge.c:130
 msgid "Align _Starts"
 msgstr ""
 
-#: src/merge.c:123
+#: src/merge.c:135
 msgid "Align _Ends"
 msgstr ""
 
-#: src/merge.c:134
+#: src/merge.c:146
 msgid "What to do with extra clipboard frames -"
 msgstr ""
 
-#: src/merge.c:137
+#: src/merge.c:149
 msgid "_Insert Frames"
 msgstr ""
 
-#: src/merge.c:143
+#: src/merge.c:155
 msgid "_Drop Frames"
 msgstr ""
 
-#: src/merge.c:149
+#: src/merge.c:160
 msgid "Number of Times to Loop Clipboard"
 msgstr ""
 
-#: src/merge.c:160
+#: src/merge.c:171
 msgid "_Loop Clipboard to Fit Selection"
 msgstr ""
 
-#: src/merge.c:173
+#: src/merge.c:184
 msgid "_Transition Method:"
 msgstr ""
 
-#: src/merge.c:394
+#: src/merge.c:395
 msgid "Merging clipboard with selection..."
 msgstr ""
 
-#: src/merge.c:551
+#: src/merge.c:539
 msgid "Merge done.\n"
 msgstr ""
 
-#: src/gui.c:123
+#: src/gui.c:122
 msgid "_Custom Generators"
 msgstr ""
 
-#: src/gui.c:124
+#: src/gui.c:123
 msgid "_Custom Effects"
 msgstr ""
 
-#: src/gui.c:125
+#: src/gui.c:124
 msgid "Custom _Utilities"
 msgstr ""
 
-#: src/gui.c:352 src/multitrack.c:5964
+#: src/gui.c:351 src/multitrack.c:6143
 msgid "_File"
 msgstr "ھۆججەت(_F)"
 
-#: src/gui.c:367 src/multitrack.c:5989
+#: src/gui.c:366 src/multitrack.c:6168
 msgid "_Open File/Directory"
 msgstr ""
 
-#: src/gui.c:373
+#: src/gui.c:372
 msgid "O_pen Part of File..."
 msgstr ""
 
-#: src/gui.c:379 src/gui.c:383 src/multitrack.c:6006 src/multitrack.c:6023
-#: src/multitrack.c:6028
+#: src/gui.c:378 src/gui.c:382 src/multitrack.c:6185 src/multitrack.c:6202
+#: src/multitrack.c:6207
 msgid "Open _Location/Stream..."
 msgstr ""
 
-#: src/gui.c:393 src/multitrack.c:6016
+#: src/gui.c:392 src/multitrack.c:6195
 msgid "Open _Youtube Clip..."
 msgstr ""
 
-#: src/gui.c:404
+#: src/gui.c:403
 msgid "Import from _dvd/vcd..."
 msgstr ""
 
-#: src/gui.c:413
+#: src/gui.c:412
 msgid "Import from _dvd"
 msgstr ""
 
-#: src/gui.c:416
+#: src/gui.c:415
 msgid "Import from _vcd"
 msgstr ""
 
-#: src/gui.c:419
+#: src/gui.c:418
 msgid "_Import from Firewire"
 msgstr ""
 
-#: src/gui.c:428 src/multitrack.c:6086
+#: src/gui.c:427 src/multitrack.c:6265
 msgid "Import from _Firewire Device (dv)"
 msgstr ""
 
-#: src/gui.c:429 src/multitrack.c:6094
+#: src/gui.c:428 src/multitrack.c:6273
 msgid "Import from _Firewire Device (hdv)"
 msgstr ""
 
-#: src/gui.c:457
+#: src/gui.c:456
 msgid "_Add Webcam/TV card..."
 msgstr ""
 
-#: src/gui.c:476
+#: src/gui.c:475
 msgid "Add _Unicap Device"
 msgstr ""
 
-#: src/gui.c:486
+#: src/gui.c:485
 msgid "Add Live _Firewire Device"
 msgstr ""
 
-#: src/gui.c:495
+#: src/gui.c:494
 msgid "Add _TV Device"
 msgstr ""
 
-#: src/gui.c:510 src/multitrack.c:6117
+#: src/gui.c:509 src/multitrack.c:6296
 msgid "_Recent Files..."
 msgstr ""
 
-#: src/gui.c:560 src/multitrack.c:6177
+#: src/gui.c:559 src/multitrack.c:6356
 msgid "_Reload Clip Set..."
 msgstr ""
 
-#: src/gui.c:564 src/multitrack.c:6185
+#: src/gui.c:563 src/multitrack.c:6364
 msgid "Close/Sa_ve All Clips"
 msgstr ""
 
-#: src/gui.c:575
+#: src/gui.c:574
 msgid "_Encode Clip As..."
 msgstr ""
 
-#: src/gui.c:577
+#: src/gui.c:576
 msgid "Encode _Selection As..."
 msgstr ""
 
-#: src/gui.c:584
+#: src/gui.c:583
 msgid "_Close This Clip"
 msgstr ""
 
-#: src/gui.c:595
+#: src/gui.c:594
 msgid "_Backup Clip as .lv1..."
 msgstr ""
 
-#: src/gui.c:604
+#: src/gui.c:603
 msgid "_Restore Clip from .lv1..."
 msgstr ""
 
-#: src/gui.c:615
+#: src/gui.c:614
 msgid "Encode/Load/Backup _with Sound"
 msgstr ""
 
-#: src/gui.c:620
+#: src/gui.c:619
 msgid "Auto load subtitles"
 msgstr ""
 
-#: src/gui.c:628 src/multitrack.c:6224
+#: src/gui.c:627 src/multitrack.c:6403
 msgid "Clean _up Diskspace"
 msgstr ""
 
-#: src/gui.c:636 src/multitrack.c:6257
+#: src/gui.c:635 src/multitrack.c:6436
 msgid "_Edit"
 msgstr "تەھرىر(_E)"
 
-#: src/gui.c:685
+#: src/gui.c:684
 msgid "_MULTITRACK mode"
 msgstr ""
 
-#: src/gui.c:696
+#: src/gui.c:695
 msgid "_Copy Selection"
 msgstr ""
 
-#: src/gui.c:705
+#: src/gui.c:704
 msgid "Cu_t Selection"
 msgstr ""
 
-#: src/gui.c:714
+#: src/gui.c:713
 msgid "_Insert from Clipboard..."
 msgstr ""
 
-#: src/gui.c:730
+#: src/gui.c:729
 msgid "Paste as _New"
 msgstr ""
 
-#: src/gui.c:739
+#: src/gui.c:738
 msgid "_Merge Clipboard with Selection..."
 msgstr ""
 
-#: src/gui.c:746
+#: src/gui.c:745
 msgid "_Delete Selection"
 msgstr ""
 
-#: src/gui.c:764
+#: src/gui.c:763
 msgid "Decouple _Video from Audio"
 msgstr ""
 
-#: src/gui.c:772
+#: src/gui.c:771
 msgid "_Select..."
 msgstr "تاللا(_S)…"
 
-#: src/gui.c:786
+#: src/gui.c:785
 msgid "Select _All Frames"
 msgstr ""
 
-#: src/gui.c:794
+#: src/gui.c:793
 msgid "_Start Frame Only"
 msgstr ""
 
-#: src/gui.c:802
+#: src/gui.c:801
 msgid "_End Frame Only"
 msgstr ""
 
-#: src/gui.c:813
+#: src/gui.c:812
 msgid "Select from _First Frame"
 msgstr ""
 
-#: src/gui.c:817
+#: src/gui.c:816
 msgid "Select to _Last Frame"
 msgstr ""
 
-#: src/gui.c:821
+#: src/gui.c:820
 msgid "Select Last Insertion/_Merge"
 msgstr ""
 
-#: src/gui.c:825
+#: src/gui.c:824
 msgid "Select Last _Effect"
 msgstr ""
 
-#: src/gui.c:829
+#: src/gui.c:828
 msgid "_Invert Selection"
 msgstr "ئەكسىچە تاللا(_I)"
 
-#: src/gui.c:837
+#: src/gui.c:836
 msgid "_Lock Selection Width"
 msgstr ""
 
-#: src/gui.c:842 src/multitrack.c:6409
+#: src/gui.c:841 src/multitrack.c:6591
 msgid "_Play"
 msgstr "قوي(_P)"
 
-#: src/gui.c:854
+#: src/gui.c:853
 msgid "_Play All"
 msgstr ""
 
-#: src/gui.c:869
+#: src/gui.c:868
 msgid "Pla_y Selection"
 msgstr ""
 
-#: src/gui.c:877
+#: src/gui.c:876
 msgid "Play _Clipboard"
 msgstr ""
 
-#: src/gui.c:899 src/multitrack.c:6441
+#: src/gui.c:898 src/multitrack.c:6623
 msgid "_Stop"
 msgstr "توختا (&S)"
 
-#: src/gui.c:914 src/multitrack.c:6453
+#: src/gui.c:913 src/multitrack.c:6635
 msgid "Re_wind"
 msgstr ""
 
-#: src/gui.c:946 src/multitrack.c:6471
+#: src/gui.c:945 src/multitrack.c:6653
 msgid "_Full Screen"
 msgstr "پۈتۈن ئېكران(_F)"
 
-#: src/gui.c:955
+#: src/gui.c:954
 msgid "_Double Size"
 msgstr ""
 
-#: src/gui.c:963 src/multitrack.c:6479
+#: src/gui.c:962 src/multitrack.c:6661
 msgid "Play in _Separate Window"
 msgstr ""
 
-#: src/gui.c:972
+#: src/gui.c:971
 msgid "_Blank Background"
 msgstr ""
 
-#: src/gui.c:979
+#: src/gui.c:978
 msgid "(Auto)_loop Video (to fit audio track)"
 msgstr ""
 
-#: src/gui.c:988 src/multitrack.c:6487
+#: src/gui.c:987 src/multitrack.c:6669
 msgid "L_oop Continuously"
 msgstr ""
 
-#: src/gui.c:997
+#: src/gui.c:996
 msgid "Pin_g Pong Loops"
 msgstr ""
 
-#: src/gui.c:1005 src/multitrack.c:6495
+#: src/gui.c:1004 src/multitrack.c:6677
 msgid "_Mute"
 msgstr "ئۈنسىز(_M)"
 
-#: src/gui.c:1017
+#: src/gui.c:1016
 msgid "Separate Window 'S_ticky' Mode"
 msgstr ""
 
-#: src/gui.c:1025
+#: src/gui.c:1024
 msgid "S_how Frame Counter"
 msgstr ""
 
-#: src/gui.c:1035
+#: src/gui.c:1034
 msgid "Show Subtitles"
 msgstr ""
 
-#: src/gui.c:1045
+#: src/gui.c:1044
 msgid "Letterbox mode"
 msgstr ""
 
-#: src/gui.c:1051 src/multitrack.c:6507
+#: src/gui.c:1050 src/multitrack.c:6689
 msgid "Effect_s"
 msgstr ""
 
-#: src/gui.c:1054
+#: src/gui.c:1053
 msgid "Effects are applied to the current selection."
 msgstr ""
 
-#: src/gui.c:1067
+#: src/gui.c:1066
 msgid "_Run Test Rendered Effect/Tool/Generator..."
 msgstr ""
 
-#: src/gui.c:1072 src/multitrack.c:7123
+#: src/gui.c:1071 src/multitrack.c:7299
 msgid "_Tools"
 msgstr "قوراللار(_T)"
 
-#: src/gui.c:1075
+#: src/gui.c:1074
 msgid "Tools are applied to complete clips."
 msgstr ""
 
-#: src/gui.c:1085
+#: src/gui.c:1084
 msgid "_Reverse Clipboard"
 msgstr ""
 
-#: src/gui.c:1094
+#: src/gui.c:1093
 msgid "_Change Playback/Save Speed..."
 msgstr ""
 
-#: src/gui.c:1099
+#: src/gui.c:1098
 msgid "Resample _Video to New Frame Rate..."
 msgstr ""
 
-#: src/gui.c:1105
+#: src/gui.c:1104
 msgid "_Utilities"
 msgstr "قوراللار(_U)"
 
-#: src/gui.c:1110
+#: src/gui.c:1109
 msgid "Custom _Tools"
 msgstr ""
 
-#: src/gui.c:1116 src/multitrack.c:7149
+#: src/gui.c:1115 src/multitrack.c:7325
 msgid "_Generate"
 msgstr "قۇر(_G)"
 
-#: src/gui.c:1126
+#: src/gui.c:1125
 msgid "Loading rendered effect plugins..."
 msgstr ""
 
-#: src/gui.c:1139
+#: src/gui.c:1138
 msgid "Load _Subtitles from File..."
 msgstr ""
 
-#: src/gui.c:1144
+#: src/gui.c:1143
 msgid "Erase subtitles"
 msgstr ""
 
-#: src/gui.c:1152 src/multitrack.c:7158
+#: src/gui.c:1151 src/multitrack.c:7334
 msgid "Capture _External Window... "
 msgstr ""
 
-#: src/gui.c:1159 src/multitrack.c:7173
+#: src/gui.c:1158 src/multitrack.c:7349
 msgid "_Preferences..."
 msgstr "پارامېتىرلار(_P)..."
 
-#: src/gui.c:1172
+#: src/gui.c:1171
 msgid "_Audio"
 msgstr "ئۈن(_A)"
 
-#: src/gui.c:1184
+#: src/gui.c:1183
 msgid "Load _New Audio for Clip..."
 msgstr ""
 
-#: src/gui.c:1190
+#: src/gui.c:1189
 msgid "Load _CD Track..."
 msgstr ""
 
-#: src/gui.c:1191
+#: src/gui.c:1190
 msgid "E_ject CD"
 msgstr ""
 
-#: src/gui.c:1205
+#: src/gui.c:1204
 msgid "Record E_xternal Audio..."
 msgstr ""
 
-#: src/gui.c:1218
+#: src/gui.c:1217
 msgid "to New _Clip..."
 msgstr ""
 
-#: src/gui.c:1222
+#: src/gui.c:1221
 msgid "to _Selection"
 msgstr ""
 
-#: src/gui.c:1230
+#: src/gui.c:1229
 msgid "Fade Audio _In..."
 msgstr ""
 
-#: src/gui.c:1234
+#: src/gui.c:1233
 msgid "Fade Audio _Out..."
 msgstr ""
 
-#: src/gui.c:1244
+#: src/gui.c:1243
 msgid "_Export Audio..."
 msgstr ""
 
-#: src/gui.c:1257
+#: src/gui.c:1256
 msgid "Export _Selected Audio..."
 msgstr ""
 
-#: src/gui.c:1261
+#: src/gui.c:1260
 msgid "Export _All Audio..."
 msgstr ""
 
-#: src/gui.c:1265
+#: src/gui.c:1264
 msgid "_Append Audio..."
 msgstr ""
 
-#: src/gui.c:1270
+#: src/gui.c:1269
 msgid "_Trim/Pad Audio..."
 msgstr ""
 
-#: src/gui.c:1283
+#: src/gui.c:1282
 msgid "Trim/Pad Audio to _Selection"
 msgstr ""
 
-#: src/gui.c:1288
+#: src/gui.c:1287
 msgid "Trim/Pad Audio from Beginning to _Play Start"
 msgstr ""
 
-#: src/gui.c:1293
+#: src/gui.c:1292
 msgid "_Delete Audio..."
 msgstr ""
 
-#: src/gui.c:1306
+#: src/gui.c:1305
 msgid "Delete _Selected Audio"
 msgstr ""
 
-#: src/gui.c:1310
+#: src/gui.c:1309
 msgid "Delete _All Audio"
 msgstr ""
 
-#: src/gui.c:1314
+#: src/gui.c:1313
 msgid "Insert _Silence in Selection"
 msgstr ""
 
-#: src/gui.c:1319
+#: src/gui.c:1318
 msgid "_Resample Audio..."
 msgstr ""
 
-#: src/gui.c:1324
+#: src/gui.c:1323
 msgid "_Info"
 msgstr "ئۇچۇر(_I)"
 
-#: src/gui.c:1336
+#: src/gui.c:1335
 msgid "Show Clip _Info"
 msgstr ""
 
-#: src/gui.c:1344
+#: src/gui.c:1343
 msgid "Show/_Edit File Comments"
 msgstr ""
 
-#: src/gui.c:1349
+#: src/gui.c:1348
 msgid "Show _Clipboard Info"
 msgstr ""
 
-#: src/gui.c:1360 src/multitrack.c:7286
+#: src/gui.c:1359 src/multitrack.c:7462
 msgid "Show _Messages"
 msgstr ""
 
-#: src/gui.c:1364 src/multitrack.c:7365
+#: src/gui.c:1363 src/multitrack.c:7541
 msgid "Show _Layout Errors"
 msgstr ""
 
-#: src/gui.c:1369 src/multitrack.c:7263
+#: src/gui.c:1368 src/multitrack.c:7439
 msgid "_Clips"
 msgstr ""
 
-#: src/gui.c:1381
+#: src/gui.c:1380
 msgid "_Rename Current Clip in Menu..."
 msgstr ""
 
-#: src/gui.c:1399
+#: src/gui.c:1398
 msgid "A_dvanced"
 msgstr ""
 
-#: src/gui.c:1412
+#: src/gui.c:1411
 msgid "_RFX Effects/Tools/Utilities"
 msgstr ""
 
-#: src/gui.c:1424
+#: src/gui.c:1423
 msgid "_New Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1428
+#: src/gui.c:1427
 msgid "_Copy RFX Script to Test..."
 msgstr ""
 
-#: src/gui.c:1432
+#: src/gui.c:1431
 msgid "_Edit Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1436
+#: src/gui.c:1435
 msgid "Rena_me Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1440
+#: src/gui.c:1439
 msgid "_Delete Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1450
+#: src/gui.c:1449
 msgid "_Promote Test Rendered Effect/Tool/Generator..."
 msgstr ""
 
-#: src/gui.c:1457
+#: src/gui.c:1456
 msgid "_Import Custom RFX script..."
 msgstr ""
 
-#: src/gui.c:1461
+#: src/gui.c:1460
 msgid "E_xport Custom RFX script..."
 msgstr ""
 
-#: src/gui.c:1465
+#: src/gui.c:1464
 msgid "De_lete Custom RFX Script..."
 msgstr ""
 
-#: src/gui.c:1472
+#: src/gui.c:1471
 msgid "Re_build all RFX plugins"
 msgstr ""
 
-#: src/gui.c:1501
+#: src/gui.c:1498
 msgid "Receive _LiVES stream from..."
 msgstr ""
 
-#: src/gui.c:1506
+#: src/gui.c:1503
 msgid "_Send LiVES stream to..."
 msgstr ""
 
-#: src/gui.c:1515
+#: src/gui.c:1512
 #, c-format
 msgid "Open _yuv4mpeg stream on %sstream.yuv..."
 msgstr ""
 
-#: src/gui.c:1536
+#: src/gui.c:1534
 msgid "_Import Project (.lv2)..."
 msgstr ""
 
-#: src/gui.c:1540
+#: src/gui.c:1538
 msgid "E_xport Project (.lv2)..."
 msgstr ""
 
-#: src/gui.c:1545
+#: src/gui.c:1543
 msgid "_VJ"
 msgstr ""
 
-#: src/gui.c:1557
+#: src/gui.c:1555
 msgid "Real Time _Effect Mapping"
 msgstr ""
 
-#: src/gui.c:1563
+#: src/gui.c:1561
 msgid "Bind real time effects to ctrl-number keys."
 msgstr ""
 
-#: src/gui.c:1565
+#: src/gui.c:1563
 msgid "Set Real Time Effect _Defaults"
 msgstr ""
 
-#: src/gui.c:1567
+#: src/gui.c:1565
 msgid "Set default parameter values for real time effects."
 msgstr ""
 
-#: src/gui.c:1580
+#: src/gui.c:1578
 msgid "Save Real Time Effect _Defaults"
 msgstr ""
 
-#: src/gui.c:1583
+#: src/gui.c:1581
 msgid ""
 "Save real time effect defaults so they will be restored each time you use "
 "LiVES."
 msgstr ""
 
-#: src/gui.c:1589
+#: src/gui.c:1587
 msgid "_Reset all playback speeds and positions"
 msgstr ""
 
-#: src/gui.c:1592
+#: src/gui.c:1590
 msgid ""
 "Reset all playback positions to frame 1, and reset all playback frame rates."
 msgstr ""
 
-#: src/gui.c:1594
+#: src/gui.c:1592
 msgid "_MIDI/joystick interface"
 msgstr ""
 
-#: src/gui.c:1609
+#: src/gui.c:1607
 msgid "_MIDI/joystick learner..."
 msgstr ""
 
-#: src/gui.c:1614
+#: src/gui.c:1612
 msgid "_Save device mapping..."
 msgstr ""
 
-#: src/gui.c:1620
+#: src/gui.c:1618
 msgid "_Load device mapping..."
 msgstr ""
 
-#: src/gui.c:1628
+#: src/gui.c:1626
 msgid "Show VJ _Keys"
 msgstr ""
 
-#: src/gui.c:1632
+#: src/gui.c:1630
 msgid "To_ys"
 msgstr ""
 
-#: src/gui.c:1644
+#: src/gui.c:1642
 msgid "_None"
 msgstr "يوق(_N)"
 
-#: src/gui.c:1652
+#: src/gui.c:1650
 msgid "_Autolives"
 msgstr ""
 
-#: src/gui.c:1657
+#: src/gui.c:1655
 msgid "_Mad Frames"
 msgstr ""
 
-#: src/gui.c:1662
+#: src/gui.c:1660
 msgid "_LiVES TV (broadband)"
 msgstr ""
 
-#: src/gui.c:1672 src/multitrack.c:7387
+#: src/gui.c:1670 src/multitrack.c:7563
 msgid "_Help"
 msgstr "ياردەم(_H)"
 
-#: src/gui.c:1684 src/multitrack.c:7407
+#: src/gui.c:1682 src/multitrack.c:7583
 msgid "_Manual (opens in browser)"
 msgstr ""
 
-#: src/gui.c:1691 src/multitrack.c:7416
+#: src/gui.c:1689 src/multitrack.c:7592
 msgid "_Donate to the project !"
 msgstr ""
 
-#: src/gui.c:1695 src/multitrack.c:7420
+#: src/gui.c:1693 src/multitrack.c:7596
 msgid "_Email the author"
 msgstr ""
 
-#: src/gui.c:1699 src/multitrack.c:7424
+#: src/gui.c:1697 src/multitrack.c:7600
 msgid "Report a _bug"
 msgstr ""
 
-#: src/gui.c:1703 src/multitrack.c:7428
+#: src/gui.c:1701 src/multitrack.c:7604
 msgid "Suggest a _feature"
 msgstr ""
 
-#: src/gui.c:1707 src/multitrack.c:7432
+#: src/gui.c:1705 src/multitrack.c:7608
 msgid "Assist with _translating"
 msgstr ""
 
-#: src/gui.c:1714 src/multitrack.c:7439
+#: src/gui.c:1712 src/multitrack.c:7615
 msgid "_Troubleshoot"
 msgstr "مەسىلە ھەل قىل(_T)"
 
-#: src/gui.c:1718 src/multitrack.c:7443
+#: src/gui.c:1716 src/multitrack.c:7619
 msgid "_About"
 msgstr "ھەققىدە(_A)"
 
-#: src/gui.c:1752
+#: src/gui.c:1750
 msgid "Rewind to start (w)"
 msgstr ""
 
-#: src/gui.c:1760 src/multitrack.c:16720
+#: src/gui.c:1758 src/multitrack.c:17010
 msgid "Play all (p)"
 msgstr ""
 
-#: src/gui.c:1768 src/gui.c:1877
+#: src/gui.c:1766 src/gui.c:1876
 msgid "Stop playback (q)"
 msgstr ""
 
-#: src/gui.c:1779
+#: src/gui.c:1777
 msgid "Play selection (y)"
 msgstr ""
 
-#: src/gui.c:1832
+#: src/gui.c:1829
 msgid "Volume"
 msgstr "ئاۋاز مىقدارى"
 
-#: src/gui.c:1854
+#: src/gui.c:1853
 msgid "Audio volume (1.00)"
 msgstr ""
 
-#: src/gui.c:1883
+#: src/gui.c:1882
 msgid "Unblank background (b)"
 msgstr ""
 
-#: src/gui.c:1929
+#: src/gui.c:1928
 msgid "Play slower (ctrl-down)"
 msgstr ""
 
-#: src/gui.c:1935
+#: src/gui.c:1934
 msgid "Play faster (ctrl-up)"
 msgstr ""
 
-#: src/gui.c:1942
+#: src/gui.c:1941
 msgid "Skip back (ctrl-left)"
 msgstr ""
 
-#: src/gui.c:1948
+#: src/gui.c:1947
 msgid "Skip forward (ctrl-right)"
 msgstr ""
 
-#: src/gui.c:1954
+#: src/gui.c:1953
 msgid "Show clip info (i)"
 msgstr ""
 
-#: src/gui.c:1960
+#: src/gui.c:1959
 msgid "Hide this toolbar"
 msgstr ""
 
-#: src/gui.c:1962
+#: src/gui.c:1961
 msgid ""
 "Press \"s\" to toggle separate play window for improved performance, \"q\" "
 "to stop."
 msgstr ""
 
 #. TRANSLATORS: please keep the translated string the same length
-#: src/gui.c:1995
+#: src/gui.c:1994
 msgid "     Video playback speed (frames per second)        "
 msgstr ""
 
-#: src/gui.c:2009
+#: src/gui.c:2008
 msgid "Vary the video speed"
 msgstr ""
 
-#: src/gui.c:2092 src/gui.c:3218
+#: src/gui.c:2090 src/gui.c:3329
 msgid "First Frame"
 msgstr "بىرىنچى كاندۇك"
 
-#: src/gui.c:2193 src/gui.c:3226
+#: src/gui.c:2191 src/gui.c:3336
 msgid "Last Frame"
 msgstr "ئاخىرقى كاندۇك"
 
-#: src/gui.c:2210
+#: src/gui.c:2208
 msgid "The first selected frame in this clip"
 msgstr ""
 
-#: src/gui.c:2248
+#: src/gui.c:2246
 msgid "The last selected frame in this clip"
 msgstr ""
 
-#: src/gui.c:2532
+#: src/gui.c:2546
 msgid "Starting...\n"
 msgstr "باشلاۋاتىدۇ…\n"
 
-#: src/gui.c:3074
+#: src/gui.c:3181
 msgid "    Press 'q' to stop recording.  DO NOT COVER THE PLAY WINDOW !   "
 msgstr ""
 
-#: src/gui.c:3521
+#: src/gui.c:3643
 msgid "Frame number to preview"
 msgstr ""
 
-#: src/gui.c:3538
+#: src/gui.c:3660
 msgid "_Free"
 msgstr "ئەركىن(_F)"
 
-#: src/gui.c:3539
+#: src/gui.c:3661
 msgid "Free choice of frame number"
 msgstr ""
 
-#: src/gui.c:3543
+#: src/gui.c:3666
 msgid "_Start"
 msgstr "باشلا(_S)"
 
-#: src/gui.c:3544
+#: src/gui.c:3667
 msgid "Frame number is linked to start frame"
 msgstr ""
 
-#: src/gui.c:3551
+#: src/gui.c:3675
 msgid "_End"
 msgstr ""
 
-#: src/gui.c:3552
+#: src/gui.c:3676
 msgid "Frame number is linked to end frame"
 msgstr ""
 
-#: src/gui.c:3559
+#: src/gui.c:3684
 msgid "_Pointer"
 msgstr ""
 
-#: src/gui.c:3560
+#: src/gui.c:3685
 msgid "Frame number is linked to playback pointer"
 msgstr ""
 
-#: src/gui.c:3581
+#: src/gui.c:3707
 msgid "Rewind"
 msgstr "كەينىگە"
 
-#: src/gui.c:3592 src/dialogs.c:894 src/dialogs.c:896 src/dialogs.c:1817
-#: src/dialogs.c:1819
+#: src/gui.c:3718 src/dialogs.c:960 src/dialogs.c:962 src/dialogs.c:1873
+#: src/dialogs.c:1875
 msgid "Play all"
 msgstr ""
 
-#: src/gui.c:3605
+#: src/gui.c:3731
 msgid "Play Selection"
 msgstr ""
 
-#: src/gui.c:3619
+#: src/gui.c:3745
 msgid "Loop On/Off"
 msgstr ""
 
-#: src/gui.c:3693
+#: src/gui.c:3819
 msgid "Start _recording"
 msgstr ""
 
-#: src/gui.c:3698
+#: src/gui.c:3824
 msgid "Stop _recording"
 msgstr ""
 
-#: src/gui.c:3703
+#: src/gui.c:3829
 msgid "_Record Performance"
 msgstr ""
 
-#: src/gui.c:3851
+#: src/gui.c:3974
 msgid "Hide Play Window"
 msgstr ""
 
-#: src/gui.c:4232
+#: src/gui.c:4333
 msgid "Show Play Window"
 msgstr ""
 
-#: src/ce_thumbs.c:222
+#: src/ce_thumbs.c:242
 #, c-format
 msgid "Mapped to ctrl-%d"
 msgstr ""
 
-#: src/ce_thumbs.c:276 src/effects.c:85 src/preferences.c:3195
+#: src/ce_thumbs.c:296 src/effects.c:86 src/preferences.c:3247
 msgid "Effects"
 msgstr "ئۈنۈملەر"
 
-#: src/ce_thumbs.c:279 src/multitrack.c:5615
+#: src/ce_thumbs.c:299 src/multitrack.c:5791
 msgid "Clips"
 msgstr ""
 
-#: src/ce_thumbs.c:303
+#: src/ce_thumbs.c:323
 #, c-format
 msgid "Show / apply effects to %s\n"
 msgstr ""
 
-#: src/ce_thumbs.c:315
+#: src/ce_thumbs.c:335
 #, c-format
 msgid "Select clip for %s\n"
 msgstr ""
 
-#: src/ce_thumbs.c:515
+#: src/ce_thumbs.c:536
 msgid "_Pin"
 msgstr ""
 
-#: src/ce_thumbs.c:515
+#: src/ce_thumbs.c:537
 msgid "Pin the parameter box to the window"
 msgstr ""
 
 #. TRANSLATORS: Exabytes
-#: src/utils.c:794
+#: src/utils.c:800
 #, c-format
 msgid "%.2f EB"
 msgstr ""
 
 #. TRANSLATORS: Petabytes
-#: src/utils.c:798
+#: src/utils.c:803
 #, c-format
 msgid "%.2f PB"
 msgstr ""
 
 #. TRANSLATORS: Terabytes
-#: src/utils.c:802
+#: src/utils.c:806
 #, c-format
 msgid "%.2f TB"
 msgstr ""
 
 #. TRANSLATORS: Gigabytes
-#: src/utils.c:806
+#: src/utils.c:809
 #, c-format
 msgid "%.2f GB"
 msgstr ""
 
 #. TRANSLATORS: Megabytes
-#: src/utils.c:810
+#: src/utils.c:812
 #, c-format
 msgid "%.2f MB"
 msgstr ""
 
 #. TRANSLATORS: Kilobytes (1024 bytes)
-#: src/utils.c:814
+#: src/utils.c:815
 #, c-format
 msgid "%.2f KiB"
 msgstr ""
@@ -3552,7 +3542,7 @@
 msgid "%d bytes"
 msgstr ""
 
-#: src/utils.c:1841
+#: src/utils.c:1835
 msgid "Clearing the clipboard"
 msgstr ""
 
@@ -3564,81 +3554,81 @@
 "Switched to clip %s\n"
 msgstr ""
 
-#: src/utils.c:1880
+#: src/utils.c:1877
 msgid ""
 "\n"
 "==============================\n"
 "Switched to empty clip\n"
 msgstr ""
 
-#: src/utils.c:1917
+#: src/utils.c:1916
 msgid "(blank)"
 msgstr ""
 
-#: src/utils.c:1920
+#: src/utils.c:1919
 #, c-format
 msgid ""
 "The set name has been changed from %s to %s. Affected layouts have been "
 "updated accordingly\n"
 msgstr ""
 
-#: src/utils.c:1928
+#: src/utils.c:1927
 #, c-format
 msgid ""
 "The clip %s is missing from this set.\n"
 "It is required by the following layouts:\n"
 msgstr ""
 
-#: src/utils.c:1932
+#: src/utils.c:1931
 #, c-format
 msgid ""
 "The clip %s has been closed.\n"
 "It is required by the following layouts:\n"
 msgstr ""
 
-#: src/utils.c:1937
+#: src/utils.c:1936
 #, c-format
 msgid ""
 "Frames have been shifted in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1942
+#: src/utils.c:1941
 #, c-format
 msgid ""
 "Frames have been deleted from the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1947
+#: src/utils.c:1946
 #, c-format
 msgid ""
 "Audio has been deleted from the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1952
+#: src/utils.c:1951
 #, c-format
 msgid ""
 "Audio has been shifted in clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1957
+#: src/utils.c:1956
 #, c-format
 msgid ""
 "Audio has been altered in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1962
+#: src/utils.c:1961
 #, c-format
 msgid ""
 "Frames have been altered in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:2135
+#: src/utils.c:2134
 #, c-format
 msgid ""
 "Set %s\n"
@@ -3646,7 +3636,7 @@
 "by another copy of LiVES.\n"
 msgstr ""
 
-#: src/utils.c:2142
+#: src/utils.c:2140
 #, c-format
 msgid ""
 "\n"
@@ -3692,67 +3682,67 @@
 msgid "Removing layout %s\n"
 msgstr ""
 
-#: src/utils.c:3014
+#: src/utils.c:2996
 msgid "Video [opening...]"
 msgstr ""
 
-#: src/utils.c:3018
+#: src/utils.c:2999
 #, c-format
 msgid "Video [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:3022
+#: src/utils.c:3002
 msgid "(Undefined)"
 msgstr ""
 
-#: src/utils.c:3025
+#: src/utils.c:3004
 msgid "(No video)"
 msgstr ""
 
-#: src/utils.c:3032
+#: src/utils.c:3011
 msgid "(No audio)"
 msgstr ""
 
-#: src/utils.c:3037
+#: src/utils.c:3015
 msgid "Mono  [opening...]"
 msgstr ""
 
-#: src/utils.c:3040
+#: src/utils.c:3017
 msgid "Left Audio [opening...]"
 msgstr ""
 
-#: src/utils.c:3045
+#: src/utils.c:3021
 #, c-format
 msgid "Mono [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:3048
+#: src/utils.c:3023
 #, c-format
 msgid "Left Audio [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:3056
+#: src/utils.c:3031
 msgid "Right Audio [opening...]"
 msgstr ""
 
-#: src/utils.c:3059
+#: src/utils.c:3033
 #, c-format
 msgid "Right Audio [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:3506
+#: src/utils.c:3472
 msgid "LiVES cannot switch to mplayer whilst clips are loading."
 msgstr ""
 
-#: src/utils.c:3559
+#: src/utils.c:3525
 msgid "LiVES cannot switch to mplayer2 whilst clips are loading."
 msgstr ""
 
-#: src/utils.c:3809
+#: src/utils.c:3775
 msgid "Cleaning up clip"
 msgstr ""
 
-#: src/utils.c:3913
+#: src/utils.c:3874
 #, c-format
 msgid ""
 "\n"
@@ -3762,30 +3752,29 @@
 "Overwrite ?\n"
 msgstr ""
 
-#: src/utils.c:4305 src/utils.c:4337 src/multitrack.c:4503
+#: src/utils.c:4250 src/utils.c:4280 src/multitrack.c:4672
 #, c-format
 msgid "_Undo %s"
 msgstr ""
 
-#: src/utils.c:4306 src/utils.c:4338 src/multitrack.c:4525
+#: src/utils.c:4251 src/utils.c:4281 src/multitrack.c:4693
 #, c-format
 msgid "_Redo %s"
 msgstr ""
 
-#: src/utils.c:4363
+#: src/utils.c:4305
 msgid "-------------Selection------------"
 msgstr ""
 
-#. TRANSLATORS: - try to keep the text of the middle part the same length, by deleting "-" if necessary
-#: src/utils.c:4371
+#: src/utils.c:4313
 msgid " sec ] ----------Selection---------- [ "
 msgstr ""
 
-#: src/utils.c:4371
+#: src/utils.c:4314
 msgid " frames ] ----------"
 msgstr ""
 
-#: src/utils.c:5360
+#: src/utils.c:5302
 msgid ""
 "Your version of mplayer/ffmpeg may be broken !\n"
 "See http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2071\n"
@@ -3796,11 +3785,11 @@
 "Try running Help/Troubleshoot for more information."
 msgstr ""
 
-#: src/saveplay.c:178
+#: src/saveplay.c:179
 msgid "Examining file header"
 msgstr ""
 
-#: src/saveplay.c:315 src/saveplay.c:789
+#: src/saveplay.c:316 src/saveplay.c:779
 #, c-format
 msgid "Opening %s"
 msgstr "%s نى ئېچىۋاتىدۇ"
@@ -3810,36 +3799,36 @@
 msgid "Opening %s start time %.2f sec. frames %d"
 msgstr ""
 
-#: src/saveplay.c:326 src/saveplay.c:4001
+#: src/saveplay.c:326 src/saveplay.c:3927
 msgid " without sound"
 msgstr ""
 
-#: src/saveplay.c:396
+#: src/saveplay.c:395
 #, c-format
 msgid "Opening audio for %s"
 msgstr ""
 
-#: src/saveplay.c:557
+#: src/saveplay.c:554
 #, c-format
 msgid "Auto trimming %.2f seconds of audio at start..."
 msgstr ""
 
-#: src/saveplay.c:567
+#: src/saveplay.c:562
 #, c-format
 msgid "Auto trimming %.2f seconds of audio at end..."
 msgstr ""
 
-#: src/saveplay.c:584
+#: src/saveplay.c:577
 #, c-format
 msgid "Auto padding with %.2f seconds of silence at start..."
 msgstr ""
 
-#: src/saveplay.c:599
+#: src/saveplay.c:590
 #, c-format
 msgid "Auto padding with %.2f seconds of silence at end..."
 msgstr ""
 
-#: src/saveplay.c:671
+#: src/saveplay.c:661
 #, c-format
 msgid ""
 "\n"
@@ -3851,11 +3840,11 @@
 "Are you sure you wish to continue ?"
 msgstr ""
 
-#: src/saveplay.c:685
+#: src/saveplay.c:676
 msgid " - please be patient."
 msgstr ""
 
-#: src/saveplay.c:938
+#: src/saveplay.c:926
 msgid ""
 "\n"
 "\n"
@@ -3863,14 +3852,14 @@
 "Please check the terminal window for more details.\n"
 msgstr ""
 
-#: src/saveplay.c:940
+#: src/saveplay.c:928
 msgid ""
 "\n"
 "\n"
 "You may need to install mplayer to open this file.\n"
 msgstr ""
 
-#: src/saveplay.c:948
+#: src/saveplay.c:934
 msgid ""
 "\n"
 "\n"
@@ -3878,29 +3867,29 @@
 "Tools|Preferences|Decoding\n"
 msgstr ""
 
-#: src/saveplay.c:1014
+#: src/saveplay.c:995
 msgid "Adding image..."
 msgstr ""
 
-#: src/saveplay.c:1108
+#: src/saveplay.c:1089
 #, c-format
 msgid "Subtitles were saved as %s\n"
 msgstr ""
 
-#: src/saveplay.c:1192
+#: src/saveplay.c:1171
 #, c-format
 msgid "LiVES: Save Frame %d as..."
 msgstr ""
 
-#: src/saveplay.c:1195
+#: src/saveplay.c:1174
 msgid "LiVES: Save Frame as..."
 msgstr ""
 
-#: src/saveplay.c:1322
+#: src/saveplay.c:1303
 msgid "LiVES: Save Clip as..."
 msgstr ""
 
-#: src/saveplay.c:1390
+#: src/saveplay.c:1369
 msgid ""
 "Saving your video could lead to a loss of quality !\n"
 "You are strongly advised to 'Save As' to a new file.\n"
@@ -3908,67 +3897,67 @@
 "Do you still wish to continue ?"
 msgstr ""
 
-#: src/saveplay.c:1517 src/saveplay.c:1683 src/saveplay.c:1762
-#: src/saveplay.c:4014
+#: src/saveplay.c:1494 src/saveplay.c:1659 src/saveplay.c:1738
+#: src/saveplay.c:3940
 msgid "Pulling frames from clip"
 msgstr ""
 
-#: src/saveplay.c:1588 src/saveplay.c:1727
+#: src/saveplay.c:1565 src/saveplay.c:1703
 msgid "Linking selection"
 msgstr ""
 
-#: src/saveplay.c:1779
+#: src/saveplay.c:1755
 msgid " (with no sound)\n"
 msgstr ""
 
-#: src/saveplay.c:1786
+#: src/saveplay.c:1761
 #, c-format
 msgid "Saving frames %d to %d%s as \"%s\" : encoder = %s : format = %s..."
 msgstr ""
 
-#: src/saveplay.c:1790
+#: src/saveplay.c:1765
 #, c-format
 msgid "Saving frames 1 to %d%s as \"%s\" : encoder %s : format = %s..."
 msgstr ""
 
-#: src/saveplay.c:1909
+#: src/saveplay.c:1890
 msgid "Saving [can take a long time]"
 msgstr ""
 
-#: src/saveplay.c:2057
+#: src/saveplay.c:2044
 msgid ""
 "\n"
 "\n"
 "Encoder error - output file was not created !\n"
 msgstr ""
 
-#: src/saveplay.c:2094
+#: src/saveplay.c:2081
 msgid "Clearing letterbox"
 msgstr ""
 
-#: src/saveplay.c:2183
+#: src/saveplay.c:2168
 #, c-format
 msgid "File size was %s\n"
 msgstr ""
 
-#: src/saveplay.c:2284
+#: src/saveplay.c:2265
 msgid "recording aborted by preview.\n"
 msgstr ""
 
-#: src/saveplay.c:2288
+#: src/saveplay.c:2268
 msgid "recording aborted by clipboard playback.\n"
 msgstr ""
 
-#: src/saveplay.c:2291
+#: src/saveplay.c:2270
 msgid "Recording performance..."
 msgstr ""
 
-#: src/saveplay.c:3293
+#: src/saveplay.c:3251
 #, c-format
 msgid "Average FPS was %.4f\n"
 msgstr ""
 
-#: src/saveplay.c:3299
+#: src/saveplay.c:3256
 msgid ""
 "\n"
 "\n"
@@ -3977,16 +3966,21 @@
 "and resize all frames to the current size.\n"
 msgstr ""
 
-#: src/saveplay.c:3479
+#: src/saveplay.c:3429
 msgid "Unknown"
 msgstr "نامەلۇم"
 
-#: src/saveplay.c:3588 src/saveplay.c:4585
+#: src/saveplay.c:3538 src/saveplay.c:4502
 #, c-format
 msgid "Untitled%d"
 msgstr ""
 
-#: src/saveplay.c:3633
+#: src/saveplay.c:3567
+#, c-format
+msgid "%d frames are enough !\n"
+msgstr ""
+
+#: src/saveplay.c:3579
 #, c-format
 msgid ""
 "\n"
@@ -3994,7 +3988,7 @@
 "Bad things may happen with this clip.\n"
 msgstr ""
 
-#: src/saveplay.c:3723
+#: src/saveplay.c:3667
 #, c-format
 msgid ""
 "\n"
@@ -4002,73 +3996,73 @@
 "Default can be set in Tools | Preferences | Misc.\n"
 msgstr ""
 
-#: src/saveplay.c:3735
+#: src/saveplay.c:3677
 #, c-format
 msgid "Playback speed was adjusted to %.3f frames per second to fit audio.\n"
 msgstr ""
 
-#: src/saveplay.c:3754
+#: src/saveplay.c:3694
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d *bpp=Greyscale* fps=%.3f\n"
 "Audio:"
 msgstr ""
 
-#: src/saveplay.c:3758 src/saveplay.c:4762
+#: src/saveplay.c:3698 src/saveplay.c:4671
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d bpp=%d fps=%.3f\n"
 "Audio:"
 msgstr ""
 
-#: src/saveplay.c:3762 src/saveplay.c:4766
+#: src/saveplay.c:3703 src/saveplay.c:4676
 #, c-format
 msgid "%s none\n"
 msgstr ""
 
-#: src/saveplay.c:3774
+#: src/saveplay.c:3714
 #, fuzzy, c-format
 msgid " - Author: %s\n"
 msgstr "ئاپتور: ‎%s"
 
-#: src/saveplay.c:3779
+#: src/saveplay.c:3717
 #, c-format
 msgid " - Title: %s\n"
 msgstr ""
 
-#: src/saveplay.c:3784
+#: src/saveplay.c:3720
 #, c-format
 msgid " - Comment: %s\n"
 msgstr ""
 
-#: src/saveplay.c:3897
+#: src/saveplay.c:3829
 #, c-format
 msgid "Saving frame %d as %s..."
 msgstr ""
 
-#: src/saveplay.c:3996
+#: src/saveplay.c:3924
 #, c-format
 msgid "Backing up %s to %s"
 msgstr ""
 
-#: src/saveplay.c:4049
+#: src/saveplay.c:3975
 msgid "Backing up"
 msgstr ""
 
-#: src/saveplay.c:4083
+#: src/saveplay.c:4009
 msgid "performance data was backed up..."
 msgstr ""
 
-#: src/saveplay.c:4661
+#: src/saveplay.c:4574
 #, c-format
 msgid "Restoring %s..."
 msgstr ""
 
-#: src/saveplay.c:4692
+#: src/saveplay.c:4603
 msgid "Restoring"
 msgstr ""
 
-#: src/saveplay.c:4714
+#: src/saveplay.c:4625
 #, c-format
 msgid ""
 "\n"
@@ -4078,22 +4072,22 @@
 msgstr ""
 
 #. TRANSLATORS: rec(ord) %.2f M(ega)B(ytes)
-#: src/saveplay.c:5207
+#: src/saveplay.c:5118
 #, c-format
 msgid "rec %.2f MB"
 msgstr ""
 
-#: src/saveplay.c:5213
+#: src/saveplay.c:5123
 #, c-format
 msgid "!rec %.2f MB"
 msgstr ""
 
 #. TRANSLATORS: rec(ord) ?? M(ega)B(ytes)
-#: src/saveplay.c:5216
+#: src/saveplay.c:5126
 msgid "rec ?? MB"
 msgstr ""
 
-#: src/saveplay.c:5241
+#: src/saveplay.c:5151
 #, c-format
 msgid ""
 "\n"
@@ -4101,54 +4095,72 @@
 "Record stop level can be set in Preferences.\n"
 msgstr ""
 
-#: src/saveplay.c:5535
+#: src/saveplay.c:5447
 msgid ""
 "\n"
 "Files from a previous run of LiVES were found.\n"
 "Do you want to attempt to recover them ?\n"
 msgstr ""
 
-#: src/saveplay.c:5557
+#: src/saveplay.c:5469
 msgid "Recovering files"
 msgstr ""
 
-#: src/saveplay.c:5560
+#: src/saveplay.c:5472
 msgid "Recovering files..."
 msgstr ""
 
-#: src/dialogs.c:72
+#: src/dialogs.c:71
 msgid "Show affected _layouts"
 msgstr ""
 
-#: src/dialogs.c:128
+#: src/dialogs.c:113
+msgid ""
+"Do _not show this warning any more\n"
+"(can be turned back on from Preferences/Warnings)"
+msgstr ""
+
+#: src/dialogs.c:127
 msgid "_Recover disk space"
 msgstr ""
 
-#: src/dialogs.c:143
+#: src/dialogs.c:142
 msgid " _Advanced Settings >>"
 msgstr ""
 
-#: src/dialogs.c:184
+#: src/dialogs.c:183 src/dialogs.c:221
 msgid "LiVES: - Warning !"
 msgstr ""
 
 #: src/dialogs.c:194
-msgid "LiVES: - Question"
+msgid "LiVES: - Error !"
 msgstr ""
 
 #: src/dialogs.c:204
+msgid "LiVES: - Information"
+msgstr ""
+
+#: src/dialogs.c:230
+msgid "LiVES: - Question"
+msgstr ""
+
+#: src/dialogs.c:239
 msgid "LiVES: - File Error"
 msgstr ""
 
-#: src/dialogs.c:208
+#: src/dialogs.c:241
 msgid "_Abort"
 msgstr ""
 
-#: src/dialogs.c:213
+#: src/dialogs.c:246
 msgid "_Retry"
 msgstr ""
 
-#: src/dialogs.c:597
+#: src/dialogs.c:306
+msgid "Show _Details"
+msgstr ""
+
+#: src/dialogs.c:657
 #, c-format
 msgid ""
 "FREE SPACE IN THE PARTITION CONTAINING\n"
@@ -4159,7 +4171,7 @@
 "(Disk warning levels can be configured in Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:615
+#: src/dialogs.c:676
 #, c-format
 msgid ""
 "Free space in the partition containing\n"
@@ -4171,11 +4183,11 @@
 "Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:627
+#: src/dialogs.c:688
 msgid "Audio players cannot be switched during playback."
 msgstr ""
 
-#: src/dialogs.c:632
+#: src/dialogs.c:694
 msgid ""
 "\n"
 "\n"
@@ -4183,46 +4195,46 @@
 "Please try closing some other applications first.\n"
 msgstr ""
 
-#: src/dialogs.c:752
+#: src/dialogs.c:820
 msgid "Processing has been paused."
 msgstr ""
 
-#: src/dialogs.c:937
+#: src/dialogs.c:1002
 #, c-format
 msgid ""
 "\n"
 "%s%d%% done. Time remaining: %u sec%s\n"
 msgstr ""
 
-#: src/dialogs.c:1335
+#: src/dialogs.c:1391
 #, c-format
 msgid ""
 "\n"
 "%d/%d frames opened. Time remaining %u sec.\n"
 msgstr ""
 
-#: src/dialogs.c:1337
+#: src/dialogs.c:1393
 #, c-format
 msgid ""
 "\n"
 "%d/%d frames opened.\n"
 msgstr ""
 
-#: src/dialogs.c:1341
+#: src/dialogs.c:1396
 #, c-format
 msgid ""
 "\n"
 "%d frames opened.\n"
 msgstr ""
 
-#: src/dialogs.c:1940
+#: src/dialogs.c:1993
 #, c-format
 msgid ""
 "\n"
 "Time remaining: %d sec"
 msgstr ""
 
-#: src/dialogs.c:1988
+#: src/dialogs.c:2040
 #, c-format
 msgid ""
 "\n"
@@ -4230,7 +4242,7 @@
 "Please close a file and then try again."
 msgstr ""
 
-#: src/dialogs.c:1994
+#: src/dialogs.c:2047
 #, c-format
 msgid ""
 "LiVES was unable to write to its temporary directory.\n"
@@ -4242,27 +4254,27 @@
 "Please make sure you can write to this directory."
 msgstr ""
 
-#: src/dialogs.c:2005
+#: src/dialogs.c:2059
 msgid ""
 "\n"
 "LiVES currently requires either 'mplayer', 'mplayer2', or 'sox' to function. "
 "Please install one or other of these, and try again.\n"
 msgstr ""
 
-#: src/dialogs.c:2010
+#: src/dialogs.c:2064
 msgid ""
 "Audio was not loaded; please install mplayer or mplayer2 if you expected "
 "audio for this clip.\n"
 msgstr ""
 
-#: src/dialogs.c:2014
+#: src/dialogs.c:2069
 msgid ""
 "Audio resampling is required for this format.\n"
 "Please install 'sox'\n"
 "Or switch to another encoder format in Tools | Preferences | Encoding\n"
 msgstr ""
 
-#: src/dialogs.c:2019
+#: src/dialogs.c:2075
 msgid ""
 "\n"
 "\n"
@@ -4270,19 +4282,19 @@
 "Please set the audio codec in Tools|Preferences|Encoding\n"
 msgstr ""
 
-#: src/dialogs.c:2024
+#: src/dialogs.c:2080
 msgid ""
 "This layout includes generated frames.\n"
 "It cannot be saved, you must render it to a clip first.\n"
 msgstr ""
 
-#: src/dialogs.c:2029
+#: src/dialogs.c:2085
 msgid ""
 "This layout includes generated or recorded audio.\n"
 "It cannot be saved, you must render it to a clip first.\n"
 msgstr ""
 
-#: src/dialogs.c:2039 src/dialogs.c:2137
+#: src/dialogs.c:2095 src/dialogs.c:2189
 #, c-format
 msgid ""
 "\n"
@@ -4290,83 +4302,83 @@
 "Due to restrictions in the %s format\n"
 msgstr ""
 
-#: src/dialogs.c:2059
+#: src/dialogs.c:2115
 msgid ""
 "LiVES recommends the following settings:\n"
 "\n"
 msgstr ""
 
-#: src/dialogs.c:2065 src/dialogs.c:2174 src/resample.c:850
+#: src/dialogs.c:2121 src/dialogs.c:2225 src/resample.c:839
 msgid ", signed"
 msgstr ""
 
-#: src/dialogs.c:2066 src/dialogs.c:2175 src/resample.c:853
+#: src/dialogs.c:2122 src/dialogs.c:2226 src/resample.c:841
 msgid ", unsigned"
 msgstr ""
 
-#: src/dialogs.c:2070 src/dialogs.c:2179 src/resample.c:858
+#: src/dialogs.c:2126 src/dialogs.c:2230 src/resample.c:846
 msgid ", little-endian"
 msgstr ""
 
-#: src/dialogs.c:2071 src/dialogs.c:2180 src/resample.c:861
+#: src/dialogs.c:2127 src/dialogs.c:2231 src/resample.c:848
 msgid ", big-endian"
 msgstr ""
 
-#: src/dialogs.c:2077
+#: src/dialogs.c:2132
 #, c-format
 msgid "Use an audio rate of %d Hz%s%s\n"
 msgstr ""
 
-#: src/dialogs.c:2085
+#: src/dialogs.c:2140
 #, c-format
 msgid "Set video rate to %.3f frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:2089
+#: src/dialogs.c:2143
 #, c-format
 msgid "Set video rate to %d:%d frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:2094 src/dialogs.c:2209
+#: src/dialogs.c:2148 src/dialogs.c:2258
 #, c-format
 msgid "Set video size to %d x %d pixels\n"
 msgstr ""
 
-#: src/dialogs.c:2102 src/dialogs.c:2208
+#: src/dialogs.c:2156 src/dialogs.c:2257
 msgid ""
 "\n"
 "You may wish to:\n"
 msgstr ""
 
-#: src/dialogs.c:2105 src/dialogs.c:2200
+#: src/dialogs.c:2159 src/dialogs.c:2249
 #, c-format
 msgid "resize video to %d x %d pixels\n"
 msgstr ""
 
-#: src/dialogs.c:2110
+#: src/dialogs.c:2163
 msgid "disable audio, since the target encoder cannot encode audio\n"
 msgstr ""
 
-#: src/dialogs.c:2170
+#: src/dialogs.c:2221
 msgid "LiVES must:\n"
 msgstr ""
 
-#: src/dialogs.c:2185
+#: src/dialogs.c:2235
 #, c-format
 msgid "resample audio to %d Hz%s%s\n"
 msgstr ""
 
-#: src/dialogs.c:2192
+#: src/dialogs.c:2242
 #, c-format
 msgid "resample video to %.3f frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:2196
+#: src/dialogs.c:2245
 #, c-format
 msgid "resample video to %d:%d frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:2215
+#: src/dialogs.c:2263
 msgid ""
 "\n"
 "You will be able to undo these changes afterwards.\n"
@@ -4375,14 +4387,14 @@
 "\n"
 msgstr ""
 
-#: src/dialogs.c:2218
+#: src/dialogs.c:2265
 msgid ""
 "\n"
 "Changes applied to the selection will not be permanent.\n"
 "\n"
 msgstr ""
 
-#: src/dialogs.c:2237
+#: src/dialogs.c:2285
 msgid ""
 "\n"
 "\n"
@@ -4391,7 +4403,7 @@
 "Try recording for just a selection of the file."
 msgstr ""
 
-#: src/dialogs.c:2244
+#: src/dialogs.c:2293
 msgid ""
 "The playback speed (fps), or the audio rate\n"
 " of the clipboard does not match\n"
@@ -4402,7 +4414,7 @@
 "Please press Cancel to abort the insert, or OK to continue."
 msgstr ""
 
-#: src/dialogs.c:2253
+#: src/dialogs.c:2304
 #, c-format
 msgid ""
 "When opening a yuvmpeg stream, you should first create a fifo file in:\n"
@@ -4415,11 +4427,11 @@
 "click Cancel."
 msgstr ""
 
-#: src/dialogs.c:2305
+#: src/dialogs.c:2356
 msgid "Show Keys"
 msgstr ""
 
-#: src/dialogs.c:2306
+#: src/dialogs.c:2358
 msgid ""
 "You can use the following keys during playback to control LiVES:-\n"
 "\n"
@@ -4461,11 +4473,11 @@
 "g                             ping pong loops\n"
 msgstr ""
 
-#: src/dialogs.c:2313
+#: src/dialogs.c:2365
 msgid "Multitrack Keys"
 msgstr ""
 
-#: src/dialogs.c:2314
+#: src/dialogs.c:2367
 msgid ""
 "You can use the following keys to control the multitrack window:-\n"
 "\n"
@@ -4487,18 +4499,18 @@
 "For other keys, see the menus.\n"
 msgstr ""
 
-#: src/dialogs.c:2322
+#: src/dialogs.c:2375
 msgid "Message History"
 msgstr ""
 
-#: src/dialogs.c:2335
+#: src/dialogs.c:2388
 #, c-format
 msgid ""
 "After upgrading/installing, you may need to adjust the <prefix_dir> setting "
 "in your %s file"
 msgstr ""
 
-#: src/dialogs.c:2344
+#: src/dialogs.c:2399
 #, c-format
 msgid ""
 "\n"
@@ -4509,25 +4521,25 @@
 "or change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/dialogs.c:2352
+#: src/dialogs.c:2408
 msgid ""
 "Sorry, unknown audio type.\n"
 "\n"
 " (Filenames must end in .mp3, .ogg, .wav, .mod, .xm or .it)"
 msgstr ""
 
-#: src/dialogs.c:2353
+#: src/dialogs.c:2409
 msgid "failed (unknown type)\n"
 msgstr ""
 
-#: src/dialogs.c:2358
+#: src/dialogs.c:2415
 msgid ""
 "\n"
 "Do you wish to remove the layout files associated with this set ?\n"
 "(They will not be usable without the set).\n"
 msgstr ""
 
-#: src/dialogs.c:2363
+#: src/dialogs.c:2421
 #, c-format
 msgid ""
 "\n"
@@ -4536,7 +4548,7 @@
 "Click Cancel to pick a new name.\n"
 msgstr ""
 
-#: src/dialogs.c:2370
+#: src/dialogs.c:2429
 msgid ""
 "\n"
 "Frames from this clip are used in some multitrack layouts.\n"
@@ -4544,7 +4556,7 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2374
+#: src/dialogs.c:2433
 msgid ""
 "\n"
 "Audio from this clip is used in some multitrack layouts.\n"
@@ -4552,7 +4564,7 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2378
+#: src/dialogs.c:2438
 #, c-format
 msgid ""
 "\n"
@@ -4563,7 +4575,7 @@
 "Otherwise click Cancel to skip loading this file.\n"
 msgstr ""
 
-#: src/dialogs.c:2385
+#: src/dialogs.c:2446
 #, c-format
 msgid ""
 "\n"
@@ -4573,7 +4585,7 @@
 "The clip could not be loaded.\n"
 msgstr ""
 
-#: src/dialogs.c:2392
+#: src/dialogs.c:2455
 msgid ""
 "\n"
 "Dear user, the jack developers decided to remove the -Z option from jackd.\n"
@@ -4581,7 +4593,7 @@
 "Alternately, select a different audio player in Preferences.\n"
 msgstr ""
 
-#: src/dialogs.c:2396
+#: src/dialogs.c:2460
 msgid ""
 "\n"
 "Unable to start up jack. Please ensure that alsa is set up correctly on your "
@@ -4590,13 +4602,13 @@
 "Automatic jack startup will be disabled now.\n"
 msgstr ""
 
-#: src/dialogs.c:2402
+#: src/dialogs.c:2466
 msgid ""
 "\n"
 "Unable to connect to jack server. Please start jack before starting LiVES\n"
 msgstr ""
 
-#: src/dialogs.c:2411
+#: src/dialogs.c:2475
 #, c-format
 msgid ""
 "\n"
@@ -4607,13 +4619,13 @@
 "%s\n"
 msgstr ""
 
-#: src/dialogs.c:2418
+#: src/dialogs.c:2482
 msgid ""
 "\n"
 "Alternately, you can restart LiVES and select another audio player.\n"
 msgstr ""
 
-#: src/dialogs.c:2423
+#: src/dialogs.c:2488
 #, c-format
 msgid ""
 "\n"
@@ -4623,7 +4635,7 @@
 "It is recommended to increase it to at least %d MB"
 msgstr ""
 
-#: src/dialogs.c:2429
+#: src/dialogs.c:2496
 #, c-format
 msgid ""
 "\n"
@@ -4632,7 +4644,7 @@
 "Do you wish to delete them ?\n"
 msgstr ""
 
-#: src/dialogs.c:2436
+#: src/dialogs.c:2504
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for multitrack undo.\n"
@@ -4640,7 +4652,7 @@
 "using Preferences/Multitrack/Undo Memory\n"
 msgstr ""
 
-#: src/dialogs.c:2440
+#: src/dialogs.c:2508
 msgid ""
 "\n"
 "Out of memory for undo.\n"
@@ -4648,63 +4660,63 @@
 "using Preferences/Multitrack/Undo Memory\n"
 msgstr ""
 
-#: src/dialogs.c:2444
+#: src/dialogs.c:2512
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for the multitrack undo buffer.\n"
 msgstr ""
 
-#: src/dialogs.c:2446
+#: src/dialogs.c:2514
 msgid "or enter a smaller value.\n"
 msgstr ""
 
-#: src/dialogs.c:2448
+#: src/dialogs.c:2516
 msgid "Try again from the clip editor, try closing some other applications\n"
 msgstr ""
 
-#: src/dialogs.c:2449
+#: src/dialogs.c:2517
 msgid "Try closing some other applications\n"
 msgstr ""
 
-#: src/dialogs.c:2460
+#: src/dialogs.c:2529
 msgid ""
 "Multitrack is set to 0 audio channels, but this layout has audio.\n"
 "You should adjust the audio settings from the Tools menu.\n"
 msgstr ""
 
-#: src/dialogs.c:2464
+#: src/dialogs.c:2534
 msgid ""
 "The current layout has audio, so audio channels may not be set to zero.\n"
 msgstr ""
 
-#: src/dialogs.c:2468
+#: src/dialogs.c:2539
 msgid ""
 "Multitrack audio preview is only available with the\n"
 "\"jack\" or \"pulse audio\" audio player.\n"
 "You can set this in Tools|Preferences|Playback."
 msgstr ""
 
-#: src/dialogs.c:2472
+#: src/dialogs.c:2545
 msgid ""
 "Errors were detected in the layout (which may be due to transferring from "
 "another system, or from an older version of LiVES).\n"
 "Should I try to repair the disk copy of the layout ?\n"
 msgstr ""
 
-#: src/dialogs.c:2476
+#: src/dialogs.c:2549
 msgid ""
 "LiVES was unable to load the layout.\n"
 "Sorry.\n"
 msgstr ""
 
-#: src/dialogs.c:2482
+#: src/dialogs.c:2555
 msgid ""
 "\n"
 "\n"
 "Audio rate must be greater than 0.\n"
 msgstr ""
 
-#: src/dialogs.c:2486
+#: src/dialogs.c:2559
 msgid ""
 "\n"
 "Event list will be very large\n"
@@ -4712,14 +4724,14 @@
 "Are you sure you wish to view it ?\n"
 msgstr ""
 
-#: src/dialogs.c:2491
+#: src/dialogs.c:2564
 msgid ""
 "\n"
 "\n"
 "You must install 'dvgrab' to use this function.\n"
 msgstr ""
 
-#: src/dialogs.c:2496
+#: src/dialogs.c:2570
 msgid ""
 "\n"
 "\n"
@@ -4728,25 +4740,25 @@
 "You may need to select one of these in Tools/Preferences/Playback.\n"
 msgstr ""
 
-#: src/dialogs.c:2500
+#: src/dialogs.c:2574
 msgid "Video playback plugin failed to initialise palette !\n"
 msgstr ""
 
-#: src/dialogs.c:2504
+#: src/dialogs.c:2579
 msgid "Decoder plugin failed to initialise palette !\n"
 msgstr ""
 
-#: src/dialogs.c:2509
+#: src/dialogs.c:2584
 msgid "Unable to set framerate of video plugin\n"
 msgstr ""
 
-#: src/dialogs.c:2514
+#: src/dialogs.c:2590
 msgid ""
 "After a crash, it is advisable to clean up the disk with\n"
 "File|Clean up disk space\n"
 msgstr ""
 
-#: src/dialogs.c:2526
+#: src/dialogs.c:2604
 #, c-format
 msgid ""
 "Stream frame size is too large for your network buffers.\n"
@@ -4755,33 +4767,33 @@
 "echo %d > /proc/sys/net/core/rmem_max\n"
 msgstr ""
 
-#: src/dialogs.c:2714
+#: src/dialogs.c:2800
 msgid "cancelled.\n"
 msgstr ""
 
-#: src/dialogs.c:2721
+#: src/dialogs.c:2805
 msgid "failed.\n"
 msgstr ""
 
-#: src/dialogs.c:2728
+#: src/dialogs.c:2810
 msgid "done.\n"
 msgstr ""
 
-#: src/dialogs.c:2732
+#: src/dialogs.c:2814
 msgid "error in file. Failed.\n"
 msgstr ""
 
-#: src/dialogs.c:2766 src/dialogs.c:2815 src/dialogs.c:2839
+#: src/dialogs.c:2848 src/dialogs.c:2897 src/dialogs.c:2921
 #, c-format
 msgid "Additional info: %s\n"
 msgstr ""
 
-#: src/dialogs.c:2769
+#: src/dialogs.c:2851
 #, c-format
 msgid "The error value was %d%s\n"
 msgstr ""
 
-#: src/dialogs.c:2772
+#: src/dialogs.c:2854
 #, c-format
 msgid ""
 "\n"
@@ -4791,7 +4803,7 @@
 "%s%s%s"
 msgstr ""
 
-#: src/dialogs.c:2818
+#: src/dialogs.c:2900
 #, c-format
 msgid ""
 "\n"
@@ -4801,7 +4813,7 @@
 "%s"
 msgstr ""
 
-#: src/dialogs.c:2842
+#: src/dialogs.c:2924
 #, c-format
 msgid ""
 "\n"
@@ -4811,7 +4823,7 @@
 "%s"
 msgstr ""
 
-#: src/dialogs.c:2886
+#: src/dialogs.c:2968
 #, c-format
 msgid ""
 "\n"
@@ -4820,7 +4832,7 @@
 "Please check for possible error causes.\n"
 msgstr ""
 
-#: src/dialogs.c:2890
+#: src/dialogs.c:2971
 #, c-format
 msgid ""
 "\n"
@@ -4830,7 +4842,7 @@
 "%s.\n"
 msgstr ""
 
-#: src/dialogs.c:2921
+#: src/dialogs.c:3002
 #, c-format
 msgid ""
 "\n"
@@ -4839,7 +4851,7 @@
 "Please check for possible error causes.\n"
 msgstr ""
 
-#: src/dialogs.c:2925
+#: src/dialogs.c:3005
 #, c-format
 msgid ""
 "\n"
@@ -4849,12 +4861,12 @@
 "%s.\n"
 msgstr ""
 
-#: src/dialogs.c:2993
+#: src/dialogs.c:3073
 #, c-format
 msgid "Value for \"%s\" could not be read."
 msgstr ""
 
-#: src/dialogs.c:3011
+#: src/dialogs.c:3091
 #, c-format
 msgid ""
 "\n"
@@ -4863,7 +4875,7 @@
 "Please check your system for errors.\n"
 msgstr ""
 
-#: src/dialogs.c:3020
+#: src/dialogs.c:3100
 #, c-format
 msgid ""
 "\n"
@@ -4872,7 +4884,7 @@
 "Please check the file permissions and try again."
 msgstr ""
 
-#: src/dialogs.c:3027
+#: src/dialogs.c:3109
 #, c-format
 msgid ""
 "\n"
@@ -4881,7 +4893,7 @@
 "Please check the directory permissions and try again."
 msgstr ""
 
-#: src/dialogs.c:3034
+#: src/dialogs.c:3116
 #, c-format
 msgid ""
 "\n"
@@ -4889,14 +4901,14 @@
 "%s\n"
 msgstr ""
 
-#: src/dialogs.c:3041
+#: src/dialogs.c:3123
 msgid ""
 "\n"
 "Abort and exit immediately from LiVES\n"
 "Are you sure ?\n"
 msgstr ""
 
-#: src/dialogs.c:3047
+#: src/dialogs.c:3129
 #, c-format
 msgid ""
 "\n"
@@ -4904,13 +4916,13 @@
 "Please select another encoder from the list.\n"
 msgstr ""
 
-#: src/dialogs.c:3056
+#: src/dialogs.c:3139
 msgid ""
 "\n"
 "This card is already in use and cannot be opened multiple times.\n"
 msgstr ""
 
-#: src/dialogs.c:3061
+#: src/dialogs.c:3145
 #, c-format
 msgid ""
 "\n"
@@ -4920,27 +4932,27 @@
 "- Check if the device actually exists.\n"
 msgstr ""
 
-#: src/dialogs.c:3068
+#: src/dialogs.c:3153
 msgid ""
 "\n"
 "This file already has subtitles loaded.\n"
 "Do you wish to overwrite the existing subtitles ?\n"
 msgstr ""
 
-#: src/dialogs.c:3072
+#: src/dialogs.c:3157
 msgid ""
 "\n"
 "LiVES currently only supports subtitles of type .srt and .sub.\n"
 msgstr ""
 
-#: src/dialogs.c:3076
+#: src/dialogs.c:3161
 msgid ""
 "\n"
 "Erase all subtitles from this clip.\n"
 "Are you sure ?\n"
 msgstr ""
 
-#: src/dialogs.c:3082
+#: src/dialogs.c:3168
 #, c-format
 msgid ""
 "\n"
@@ -4949,14 +4961,14 @@
 "or OK to continue and save as type \"%s\"\n"
 msgstr ""
 
-#: src/dialogs.c:3089
+#: src/dialogs.c:3176
 msgid ""
 "\n"
 "Do you wish to move the current clip sets to the new directory ?\n"
 "(If unsure, click Yes)\n"
 msgstr ""
 
-#: src/dialogs.c:3093
+#: src/dialogs.c:3181
 #, c-format
 msgid ""
 "\n"
@@ -4967,19 +4979,19 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:3099
+#: src/dialogs.c:3188
 msgid ""
 "\n"
 "No video input devices could be found.\n"
 msgstr ""
 
-#: src/dialogs.c:3103
+#: src/dialogs.c:3192
 msgid ""
 "\n"
 "All video input devices are already in use.\n"
 msgstr ""
 
-#: src/dialogs.c:3107
+#: src/dialogs.c:3196
 msgid ""
 "\n"
 "\n"
@@ -4987,15 +4999,14 @@
 "DO NOT SHUT DOWN OR CLOSE LIVES !\n"
 msgstr ""
 
-#: src/dialogs.c:3127
+#: src/dialogs.c:3203
 #, c-format
 msgid ""
 "No clips were recovered for set (%s).\n"
 "Please check the spelling of the set name and try again.\n"
 msgstr ""
 
-#. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:3136
+#: src/dialogs.c:3214
 #, c-format
 msgid ""
 "\n"
@@ -5007,7 +5018,7 @@
 msgstr ""
 
 #. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:3144
+#: src/dialogs.c:3222
 #, c-format
 msgid ""
 "\n"
@@ -5016,34 +5027,34 @@
 "\n"
 msgstr ""
 
-#: src/dialogs.c:3150
+#: src/dialogs.c:3228
 msgid ""
 "\n"
 "You must have autolives.pl installed and in your path to use this toy.\n"
 "Consult your package distributor.\n"
 msgstr ""
 
-#: src/dialogs.c:3154
+#: src/dialogs.c:3232
 msgid ""
 "\n"
 "You must have a minimum of one clip loaded to use this toy.\n"
 msgstr ""
 
-#: src/dialogs.c:3158
+#: src/dialogs.c:3236
 msgid ""
 "\n"
 "LiVES lost its connection to jack and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:3162
+#: src/dialogs.c:3240
 msgid ""
 "\n"
 "LiVES lost its connection to pulseaudio and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:3175
+#: src/dialogs.c:3254
 #, c-format
 msgid ""
 "\n"
@@ -5052,543 +5063,543 @@
 "Do you wish to allow this (for this session only) ?\n"
 msgstr ""
 
-#: src/effects.c:60
+#: src/effects.c:61
 msgid "generator"
 msgstr ""
 
-#: src/effects.c:61
+#: src/effects.c:62
 msgid "Generators"
 msgstr ""
 
-#: src/effects.c:63
+#: src/effects.c:64
 msgid "audio generator"
 msgstr ""
 
-#: src/effects.c:64
+#: src/effects.c:65
 msgid "Audio Generators"
 msgstr ""
 
-#: src/effects.c:66
+#: src/effects.c:67
 msgid "audio/video generator"
 msgstr ""
 
-#: src/effects.c:67
+#: src/effects.c:68
 msgid "Audio/Video Generators"
 msgstr ""
 
-#: src/effects.c:69
+#: src/effects.c:70
 msgid "data generator"
 msgstr ""
 
-#: src/effects.c:70
+#: src/effects.c:71
 msgid "Data Generators"
 msgstr ""
 
-#: src/effects.c:72
+#: src/effects.c:73
 msgid "data visualiser"
 msgstr ""
 
-#: src/effects.c:73
+#: src/effects.c:74
 msgid "Data Visualisers"
 msgstr ""
 
-#: src/effects.c:75
+#: src/effects.c:76
 msgid "data processor"
 msgstr ""
 
-#: src/effects.c:76
+#: src/effects.c:77
 msgid "Data Processors"
 msgstr ""
 
-#: src/effects.c:78
+#: src/effects.c:79
 msgid "data source"
 msgstr ""
 
-#: src/effects.c:79
+#: src/effects.c:80
 msgid "Data Sources"
 msgstr ""
 
-#: src/effects.c:81
+#: src/effects.c:82
 msgid "transition"
 msgstr ""
 
-#: src/effects.c:82
+#: src/effects.c:83
 msgid "Transitions"
 msgstr "ئالماشتۇر"
 
-#: src/effects.c:84
+#: src/effects.c:85
 msgid "effect"
 msgstr "ئۈنۈم"
 
-#: src/effects.c:87 src/rfx-builder.c:187
+#: src/effects.c:88 src/rfx-builder.c:187
 msgid "utility"
 msgstr ""
 
-#: src/effects.c:88
+#: src/effects.c:89
 msgid "Utilities"
 msgstr "قوراللار"
 
-#: src/effects.c:90
+#: src/effects.c:91
 msgid "compositor"
 msgstr ""
 
-#: src/effects.c:91
+#: src/effects.c:92
 msgid "Compositors"
 msgstr ""
 
-#: src/effects.c:93
+#: src/effects.c:94
 msgid "tap"
 msgstr ""
 
-#: src/effects.c:94
+#: src/effects.c:95
 msgid "Taps"
 msgstr ""
 
-#: src/effects.c:96
+#: src/effects.c:97
 msgid "splitter"
 msgstr ""
 
-#: src/effects.c:97
+#: src/effects.c:98
 msgid "Splitters"
 msgstr ""
 
-#: src/effects.c:99
+#: src/effects.c:100
 msgid "converter"
 msgstr ""
 
-#: src/effects.c:100
+#: src/effects.c:101
 msgid "Converters"
 msgstr ""
 
-#: src/effects.c:102
+#: src/effects.c:103
 msgid "analyser"
 msgstr ""
 
-#: src/effects.c:103
+#: src/effects.c:104
 msgid "Analysers"
 msgstr ""
 
-#: src/effects.c:108
+#: src/effects.c:109
 msgid "audio/video"
 msgstr ""
 
-#: src/effects.c:109
+#: src/effects.c:110
 msgid "Audio/Video Transitions"
 msgstr ""
 
-#: src/effects.c:111
+#: src/effects.c:112
 msgid "video only"
 msgstr ""
 
-#: src/effects.c:112
+#: src/effects.c:113
 msgid "Video only Transitions"
 msgstr ""
 
-#: src/effects.c:114 src/multitrack.c:10740
+#: src/effects.c:115 src/multitrack.c:10962
 msgid "audio only"
 msgstr ""
 
-#: src/effects.c:115
+#: src/effects.c:116
 msgid "Audio only Transitions"
 msgstr ""
 
-#: src/effects.c:117 src/effects.c:120 src/multitrack.c:18757
+#: src/effects.c:118 src/effects.c:121 src/multitrack.c:19097
 msgid "audio"
 msgstr "ئۈن"
 
-#: src/effects.c:118
+#: src/effects.c:119
 msgid "Audio Mixers"
 msgstr ""
 
-#: src/effects.c:121
+#: src/effects.c:122
 msgid "Audio Effects"
 msgstr ""
 
-#: src/effects.c:123
+#: src/effects.c:124
 msgid "video"
 msgstr ""
 
-#: src/effects.c:124
+#: src/effects.c:125
 msgid "Video Effects"
 msgstr ""
 
-#: src/effects.c:126
+#: src/effects.c:127
 msgid "audio volume controller"
 msgstr ""
 
-#: src/effects.c:127
+#: src/effects.c:128
 msgid "Audio Volume Controllers"
 msgstr ""
 
-#: src/effects.c:129
+#: src/effects.c:130
 msgid "video analyser"
 msgstr ""
 
-#: src/effects.c:130
+#: src/effects.c:131
 msgid "Video analysers"
 msgstr ""
 
-#: src/effects.c:132
+#: src/effects.c:133
 msgid "audio analyser"
 msgstr ""
 
-#: src/effects.c:133
+#: src/effects.c:134
 msgid "Audio Analysers"
 msgstr ""
 
-#: src/effects.c:137 src/plugins.c:2559 src/plugins.c:2573
+#: src/effects.c:138 src/plugins.c:2507 src/plugins.c:2521
 msgid "unknown"
 msgstr "نامەلۇم"
 
-#: src/effects.c:238
+#: src/effects.c:235
 #, c-format
 msgid "%s all frames..."
 msgstr ""
 
-#: src/effects.c:243
+#: src/effects.c:239
 #, c-format
 msgid "%s clipboard into frames %d to %d..."
 msgstr ""
 
-#: src/effects.c:250
+#: src/effects.c:245
 #, c-format
 msgid "%s to clipboard..."
 msgstr ""
 
-#: src/effects.c:254
+#: src/effects.c:248
 #, c-format
 msgid "%s to new clip..."
 msgstr ""
 
-#: src/effects.c:259
+#: src/effects.c:252
 #, c-format
 msgid "%s frames %d to %d..."
 msgstr ""
 
-#: src/effects.c:290
+#: src/effects.c:283
 #, c-format
 msgid "%s clipboard with selection"
 msgstr ""
 
-#: src/effects.c:295
+#: src/effects.c:287
 #, c-format
 msgid "%s to clipboard"
 msgstr ""
 
-#: src/effects.c:299
+#: src/effects.c:290
 #, c-format
 msgid "%s to new clip"
 msgstr ""
 
-#: src/effects.c:304
+#: src/effects.c:294
 #, c-format
 msgid "%s frames %d to %d"
 msgstr ""
 
-#: src/effects.c:456 src/effects.c:523
+#: src/effects.c:443 src/effects.c:507
 msgid ""
 "\n"
 "No frames were generated.\n"
 msgstr ""
 
-#: src/effects-weed.c:431
+#: src/effects-weed.c:452
 msgid "integer"
 msgstr ""
 
-#: src/effects-weed.c:432
+#: src/effects-weed.c:454
 msgid "int64"
 msgstr ""
 
-#: src/effects-weed.c:433
+#: src/effects-weed.c:456
 msgid "boolean"
 msgstr ""
 
-#: src/effects-weed.c:434
+#: src/effects-weed.c:458
 msgid "double"
 msgstr ""
 
-#: src/effects-weed.c:435
+#: src/effects-weed.c:460
 msgid "string"
 msgstr ""
 
-#: src/effects-weed.c:436
+#: src/effects-weed.c:462
 msgid "pointer"
 msgstr ""
 
-#: src/effects-weed.c:4591
+#: src/effects-weed.c:4581
 #, c-format
 msgid "Error: plugin %s has no weed_setup() function.\n"
 msgstr ""
 
-#: src/effects-weed.c:4606
+#: src/effects-weed.c:4595
 #, c-format
 msgid "No usable filters found in plugin %s\n"
 msgstr ""
 
-#: src/effects-weed.c:4680
+#: src/effects-weed.c:4668
 #, c-format
 msgid "Found duplicate plugin %s"
 msgstr ""
 
-#: src/effects-weed.c:4734
+#: src/effects-weed.c:4723
 #, c-format
 msgid ""
 "Info: Unable to load plugin %s\n"
 "Error was: %s\n"
 msgstr ""
 
-#: src/effects-weed.c:4737 src/effects-weed.c:5858
+#: src/effects-weed.c:4726 src/effects-weed.c:5847
 msgid "Some plugin directories"
 msgstr ""
 
 #. TRANSLATORS: example " - LADSPA plugins -"
-#: src/effects-weed.c:4812 src/rte_window.c:2105
+#: src/effects-weed.c:4801 src/rte_window.c:2107
 #, c-format
 msgid " - %s plugins -"
 msgstr ""
 
-#: src/effects-weed.c:5012
+#: src/effects-weed.c:4998
 #, c-format
 msgid "Successfully loaded %d Weed filters\n"
 msgstr ""
 
-#: src/effects-weed.c:5177
+#: src/effects-weed.c:5162
 #, c-format
 msgid "Invalid compound effect %s - has conflicting target_fps\n"
 msgstr ""
 
-#: src/effects-weed.c:5197
+#: src/effects-weed.c:5182
 #, c-format
 msgid "Invalid compound effect %s - has multiple transition parameters\n"
 msgstr ""
 
-#: src/effects-weed.c:5211
+#: src/effects-weed.c:5196
 #, c-format
 msgid "Invalid compound effect %s - has multiple master volume parameters\n"
 msgstr ""
 
-#: src/effects-weed.c:5346
+#: src/effects-weed.c:5329
 #, c-format
 msgid "Invalid compound effect %s - must have >1 sub filters\n"
 msgstr ""
 
-#: src/effects-weed.c:5366
+#: src/effects-weed.c:5349
 #, c-format
 msgid "Invalid effect %s found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5381
+#: src/effects-weed.c:5364
 #, c-format
 msgid "Invalid default found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5392
+#: src/effects-weed.c:5375
 #, c-format
 msgid "Invalid filter %d for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5406
+#: src/effects-weed.c:5389
 #, c-format
 msgid "Invalid param %d for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5433
+#: src/effects-weed.c:5416
 #, c-format
 msgid ""
 "Invalid number of values for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5467
+#: src/effects-weed.c:5450
 #, c-format
 msgid ""
 "Invalid non-boolean value for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5500
+#: src/effects-weed.c:5483
 #, c-format
 msgid "Invalid param link found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5511
+#: src/effects-weed.c:5494
 #, c-format
 msgid ""
 "Invalid out filter %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5529
+#: src/effects-weed.c:5513
 #, c-format
 msgid ""
 "Invalid out param %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5541
+#: src/effects-weed.c:5526
 #, c-format
 msgid ""
 "Invalid non-boolean value for autoscale found in compound effect %s, line "
 "%d\n"
 msgstr ""
 
-#: src/effects-weed.c:5552
+#: src/effects-weed.c:5537
 #, c-format
 msgid ""
 "Invalid in filter %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5566
+#: src/effects-weed.c:5552
 #, c-format
 msgid ""
 "Invalid in param %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5594
+#: src/effects-weed.c:5581
 #, c-format
 msgid "Invalid channel link found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5605
+#: src/effects-weed.c:5592
 #, c-format
 msgid ""
 "Invalid out filter %d for link channels found in compound effect %s, line "
 "%d\n"
 msgstr ""
 
-#: src/effects-weed.c:5623
+#: src/effects-weed.c:5611
 #, c-format
 msgid ""
 "Invalid out channel %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5633
+#: src/effects-weed.c:5622
 #, c-format
 msgid ""
 "Invalid in filter %d for link channels found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5651
+#: src/effects-weed.c:5641
 #, c-format
 msgid ""
 "Invalid in channel %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5687
+#: src/effects-weed.c:5678
 #, c-format
 msgid "Compound:%s"
 msgstr ""
 
-#: src/effects-weed.c:5758
+#: src/effects-weed.c:5749
 #, c-format
 msgid "Successfully loaded %d compound filters\n"
 msgstr ""
 
-#: src/effects-weed.c:6591
+#: src/effects-weed.c:6570
 #, c-format
 msgid "Effect %s cannot be used with this audio player.\n"
 msgstr ""
 
-#: src/effects-weed.c:6737
+#: src/effects-weed.c:6718
 #, c-format
 msgid "Failed to start instance %s, error code %d\n"
 msgstr ""
 
-#: src/effects-weed.c:6814
+#: src/effects-weed.c:6797
 #, c-format
 msgid "Unable to start generator %s\n"
 msgstr ""
 
-#: src/effects-weed.c:7621
+#: src/effects-weed.c:7607
 #, c-format
 msgid "Failed to start generator %s\n"
 msgstr ""
 
-#: src/effects-weed.c:7718
+#: src/effects-weed.c:7701
 #, c-format
 msgid "Failed to start generator %s, error %d\n"
 msgstr ""
 
-#: src/effects-weed.c:9012
+#: src/effects-weed.c:8993
 #, c-format
 msgid "%s [unstable] (%s)"
 msgstr ""
 
-#: src/effects-data.c:3278
+#: src/effects-data.c:3234
 #, c-format
 msgid "ACTIVATE (%s)"
 msgstr ""
 
-#: src/effects-data.c:3548
+#: src/effects-data.c:3501
 msgid "ACTIVATE"
 msgstr ""
 
-#: src/effects-data.c:3876
+#: src/effects-data.c:3829
 #, c-format
 msgid "Key slot %d"
 msgstr ""
 
-#: src/effects-data.c:3998
+#: src/effects-data.c:3951
 msgid "Autoscale"
 msgstr ""
 
-#: src/effects-data.c:4089
+#: src/effects-data.c:4042
 msgid "Add another connection for this output parameter"
 msgstr ""
 
-#: src/effects-data.c:4102 src/effects-data.c:4151
+#: src/effects-data.c:4055 src/effects-data.c:4104
 msgid "Delete this connection"
 msgstr ""
 
-#: src/effects-data.c:4138
+#: src/effects-data.c:4091
 msgid "Add another connection for this output channel"
 msgstr ""
 
-#: src/effects-data.c:4223
+#: src/effects-data.c:4176
 msgid "Connected to -->"
 msgstr ""
 
-#: src/effects-data.c:4243
+#: src/effects-data.c:4196
 #, c-format
 msgid "%s - Alpha Channel Connections"
 msgstr ""
 
-#: src/effects-data.c:4316
+#: src/effects-data.c:4269
 #, c-format
 msgid "%s - Parameter Data Connections"
 msgstr ""
 
-#: src/effects-data.c:4336
+#: src/effects-data.c:4289
 msgid "Autoscale All"
 msgstr ""
 
-#: src/effects-data.c:4361 src/effects-data.c:4890
+#: src/effects-data.c:4314 src/effects-data.c:4841
 msgid "ACTIVATED"
 msgstr ""
 
-#: src/effects-data.c:4774
+#: src/effects-data.c:4726
 msgid "LiVES: - Parameter and Alpha Channel Connections"
 msgstr ""
 
-#: src/effects-data.c:4785
+#: src/effects-data.c:4736
 msgid "Auto Connect Channels"
 msgstr ""
 
-#: src/effects-data.c:4797
+#: src/effects-data.c:4748
 msgid "Auto Connect Parameters"
 msgstr ""
 
-#: src/effects-data.c:4807
+#: src/effects-data.c:4758
 msgid "Disconnect All"
 msgstr ""
 
-#: src/effects-data.c:4875
+#: src/effects-data.c:4826
 #, c-format
 msgid "Input channel is already connected from (%d,%d) %s"
 msgstr ""
 
-#: src/effects-data.c:4891
+#: src/effects-data.c:4842
 #, c-format
 msgid "Input parameter is already connected from (%d,%d) %s"
 msgstr ""
 
-#: src/effects-data.c:4899
+#: src/effects-data.c:4851
 msgid "Input and output parameters are not compatible"
 msgstr ""
 
@@ -5600,43 +5611,43 @@
 msgid "_Reset Values"
 msgstr ""
 
-#: src/framedraw.c:267
+#: src/framedraw.c:265
 msgid "_Frame"
 msgstr ""
 
-#: src/paramspecial.c:266
+#: src/paramspecial.c:259
 msgid "Maintain _Aspect Ratio"
 msgstr ""
 
-#: src/paramspecial.c:267
+#: src/paramspecial.c:260
 msgid "Maintain aspect ratio of original frame"
 msgstr ""
 
-#: src/paramspecial.c:341
+#: src/paramspecial.c:335
 msgid "Display Password"
 msgstr ""
 
-#: src/paramwindow.c:450
+#: src/paramwindow.c:447
 msgid "Transition _In"
 msgstr ""
 
-#: src/paramwindow.c:452
+#: src/paramwindow.c:449
 msgid "Click to set the transition parameter to show only the front frame"
 msgstr ""
 
-#: src/paramwindow.c:474
+#: src/paramwindow.c:472
 msgid "Crossfade audio"
 msgstr ""
 
-#: src/paramwindow.c:475
+#: src/paramwindow.c:473
 msgid "Check the box to make audio transition with the video"
 msgstr ""
 
-#: src/paramwindow.c:493
+#: src/paramwindow.c:492
 msgid "Transition _Out"
 msgstr ""
 
-#: src/paramwindow.c:495
+#: src/paramwindow.c:494
 msgid "Click to set the transition parameter to show only the rear frame"
 msgstr ""
 
@@ -5649,23 +5660,23 @@
 msgid "%s : size"
 msgstr ""
 
-#: src/paramwindow.c:598
+#: src/paramwindow.c:597
 msgid "New size (pixels)"
 msgstr ""
 
-#: src/paramwindow.c:617 src/plugins.c:997
+#: src/paramwindow.c:616 src/plugins.c:973
 msgid "_Width"
 msgstr ""
 
-#: src/paramwindow.c:636 src/plugins.c:1003
+#: src/paramwindow.c:635 src/plugins.c:979
 msgid "_Height"
 msgstr ""
 
-#: src/paramwindow.c:684
+#: src/paramwindow.c:683
 msgid "Generate to _Clipboard"
 msgstr ""
 
-#: src/paramwindow.c:686
+#: src/paramwindow.c:685
 msgid "Generate frames to the clipboard"
 msgstr ""
 
@@ -5677,7 +5688,7 @@
 msgid "Generate frames to a new clip"
 msgstr ""
 
-#: src/paramwindow.c:822
+#: src/paramwindow.c:824
 #, c-format
 msgid ""
 "\n"
@@ -5685,71 +5696,71 @@
 "\n"
 msgstr ""
 
-#: src/paramwindow.c:920 src/paramwindow.c:930
+#: src/paramwindow.c:934 src/paramwindow.c:942
 msgid "Set as default"
 msgstr "كۆڭۈلدىكى قىممەتكە تەڭشە"
 
-#: src/paramwindow.c:922 src/paramwindow.c:938
+#: src/paramwindow.c:936 src/paramwindow.c:950
 msgid "Reset"
 msgstr ""
 
-#: src/paramwindow.c:932 src/rte_window.c:2401 src/omc-learn.c:1357
+#: src/paramwindow.c:944 src/rte_window.c:2394 src/omc-learn.c:1347
 msgid "Close _window"
 msgstr ""
 
-#: src/paramwindow.c:1337
+#: src/paramwindow.c:1340
 msgid "No parameters"
 msgstr ""
 
-#: src/paramwindow.c:1419
+#: src/paramwindow.c:1424
 msgid "Invalid parameter"
 msgstr ""
 
-#: src/paramwindow.c:1611
+#: src/paramwindow.c:1610
 msgid "LiVES: - Select Colour"
 msgstr ""
 
-#: src/paramwindow.c:1616
+#: src/paramwindow.c:1615
 msgid "Click to set the colour"
 msgstr ""
 
-#: src/paramwindow.c:1628
+#: src/paramwindow.c:1626
 msgid "_Red"
 msgstr ""
 
-#: src/paramwindow.c:1629
+#: src/paramwindow.c:1627
 msgid "The red value (0 - 255)"
 msgstr ""
 
-#: src/paramwindow.c:1632
+#: src/paramwindow.c:1630
 msgid "_Green"
 msgstr ""
 
-#: src/paramwindow.c:1633
+#: src/paramwindow.c:1631
 msgid "The green value (0 - 255)"
 msgstr ""
 
-#: src/paramwindow.c:1636
+#: src/paramwindow.c:1634
 msgid "_Blue"
 msgstr ""
 
-#: src/paramwindow.c:1637
+#: src/paramwindow.c:1635
 msgid "The blue value (0 - 255)"
 msgstr ""
 
-#: src/plugins.c:85
+#: src/plugins.c:86
 #, c-format
 msgid ""
 "\n"
 "Plugin error: %s failed with code %d"
 msgstr ""
 
-#: src/plugins.c:87
+#: src/plugins.c:88
 #, c-format
 msgid " : message was %s\n"
 msgstr ""
 
-#: src/plugins.c:387
+#: src/plugins.c:375
 #, c-format
 msgid ""
 "\n"
@@ -5759,17 +5770,17 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/plugins.c:397
+#: src/plugins.c:385
 #, c-format
 msgid "Updating video playback plugin defaults in %s\n"
 msgstr ""
 
-#: src/plugins.c:452
+#: src/plugins.c:444
 #, c-format
 msgid "Loading video playback plugin defaults from %s..."
 msgstr ""
 
-#: src/plugins.c:515
+#: src/plugins.c:505
 #, c-format
 msgid ""
 "\n"
@@ -5779,32 +5790,32 @@
 "\n"
 msgstr ""
 
-#: src/plugins.c:855
+#: src/plugins.c:836
 #, c-format
 msgid "Saving playback plugin defaults to %s..."
 msgstr ""
 
-#: src/plugins.c:962
+#: src/plugins.c:939
 msgid "_FPS"
 msgstr ""
 
-#: src/plugins.c:963
+#: src/plugins.c:940
 msgid "Fixed framerate for plugin.\n"
 msgstr ""
 
-#: src/plugins.c:1032
+#: src/plugins.c:1008
 msgid "_Colourspace"
 msgstr ""
 
-#: src/plugins.c:1033
+#: src/plugins.c:1009
 msgid "Colourspace input to the plugin.\n"
 msgstr ""
 
-#: src/plugins.c:1089
+#: src/plugins.c:1065
 msgid "Save settings to an alternate file.\n"
 msgstr ""
 
-#: src/plugins.c:1206
+#: src/plugins.c:1182
 #, c-format
 msgid ""
 "\n"
@@ -5813,7 +5824,7 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/plugins.c:1252
+#: src/plugins.c:1228
 #, c-format
 msgid ""
 "\n"
@@ -5823,38 +5834,38 @@
 "Unable to use it.\n"
 msgstr ""
 
-#: src/plugins.c:1265
+#: src/plugins.c:1241
 #, c-format
 msgid ""
 "Video playback plugin failed to initialise.\n"
 "Error was: %s\n"
 msgstr ""
 
-#: src/plugins.c:1461
+#: src/plugins.c:1428
 msgid ""
 "\n"
 "Warning ! Video playback plugin will not send key presses. Keyboard may be "
 "disabled during plugin use !\n"
 msgstr ""
 
-#: src/plugins.c:1465
+#: src/plugins.c:1433
 #, c-format
 msgid ""
 "*** Using %s plugin for fs playback, agreed to use palette type %d ( %s ). "
 "***\n"
 msgstr ""
 
-#: src/plugins.c:1571
+#: src/plugins.c:1537
 #, c-format
 msgid "Audio stream unable to use preferred format '%s'\n"
 msgstr ""
 
-#: src/plugins.c:1579
+#: src/plugins.c:1543
 #, c-format
 msgid "Using format '%s' instead.\n"
 msgstr ""
 
-#: src/plugins.c:1616
+#: src/plugins.c:1579
 #, c-format
 msgid ""
 "LiVES was unable to find its encoder plugins. Please make sure you have the "
@@ -5863,7 +5874,7 @@
 "or change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/plugins.c:1624
+#: src/plugins.c:1589
 #, c-format
 msgid ""
 "LiVES did not receive a response from the encoder plugin called '%s'.\n"
@@ -5872,11 +5883,11 @@
 "or switch to another plugin using Tools|Preferences|Encoding\n"
 msgstr ""
 
-#: src/plugins.c:2032
+#: src/plugins.c:1987
 msgid "Unable to resize, please install imageMagick\n"
 msgstr ""
 
-#: src/plugins.c:2231
+#: src/plugins.c:2183
 #, c-format
 msgid ""
 "\n"
@@ -5884,12 +5895,12 @@
 "No decoders found in %s !\n"
 msgstr ""
 
-#: src/plugins.c:2415
+#: src/plugins.c:2369
 #, fuzzy, c-format
 msgid " using %s"
 msgstr "%s نى ئېچىۋاتىدۇ"
 
-#: src/plugins.c:2499
+#: src/plugins.c:2451
 #, c-format
 msgid ""
 "\n"
@@ -5898,7 +5909,7 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/plugins.c:2522
+#: src/plugins.c:2472
 #, c-format
 msgid ""
 "\n"
@@ -5908,24 +5919,24 @@
 "Unable to use it.\n"
 msgstr ""
 
-#: src/plugins.c:2564
+#: src/plugins.c:2512
 msgid "/unknown"
 msgstr ""
 
-#: src/plugins.c:2651
+#: src/plugins.c:2598
 msgid "LiVES: - Decoder Plugins"
 msgstr ""
 
-#: src/plugins.c:2669
+#: src/plugins.c:2616
 msgid "Enabled Video Decoders (uncheck to disable)"
 msgstr ""
 
-#: src/plugins.c:2726
+#: src/plugins.c:2672
 #, c-format
 msgid "Failed to load %s, transitions may not resize.\n"
 msgstr ""
 
-#: src/plugins.c:3854
+#: src/plugins.c:3797
 #, c-format
 msgid "%s advanced settings"
 msgstr ""
@@ -5934,15 +5945,15 @@
 msgid "LiVES: - New Test RFX"
 msgstr ""
 
-#: src/rfx-builder.c:136
+#: src/rfx-builder.c:135
 msgid "LiVES: - Edit Test RFX"
 msgstr ""
 
-#: src/rfx-builder.c:166
+#: src/rfx-builder.c:165
 msgid "Type:"
 msgstr "تىپى:"
 
-#: src/rfx-builder.c:184
+#: src/rfx-builder.c:183
 msgid "tool"
 msgstr ""
 
@@ -5954,130 +5965,130 @@
 msgid "The name of the plugin. No spaces allowed."
 msgstr ""
 
-#: src/rfx-builder.c:201
+#: src/rfx-builder.c:202
 msgid "Version:       "
 msgstr "نەشرى:       "
 
-#: src/rfx-builder.c:203
+#: src/rfx-builder.c:204
 msgid "The script version."
 msgstr ""
 
-#: src/rfx-builder.c:210
+#: src/rfx-builder.c:212
 msgid "    Author:       "
 msgstr "    ئاپتور:       "
 
-#: src/rfx-builder.c:211
+#: src/rfx-builder.c:213
 msgid "The script author."
 msgstr ""
 
-#: src/rfx-builder.c:217
+#: src/rfx-builder.c:220
 msgid "    URL (optional):       "
 msgstr ""
 
-#: src/rfx-builder.c:218
+#: src/rfx-builder.c:221
 msgid "URL for the plugin maintainer."
 msgstr ""
 
-#: src/rfx-builder.c:226
+#: src/rfx-builder.c:230
 msgid "Menu text:    "
 msgstr ""
 
-#: src/rfx-builder.c:227
+#: src/rfx-builder.c:231
 msgid "The text to show in the menu."
 msgstr ""
 
-#: src/rfx-builder.c:239
+#: src/rfx-builder.c:244
 msgid "Action description:        "
 msgstr ""
 
-#: src/rfx-builder.c:241
+#: src/rfx-builder.c:246
 msgid "Describe what the plugin is doing. E.g. \"Edge detecting\""
 msgstr ""
 
-#: src/rfx-builder.c:246
+#: src/rfx-builder.c:251
 msgid "Minimum frames:"
 msgstr ""
 
-#: src/rfx-builder.c:249
+#: src/rfx-builder.c:254
 msgid ""
 "Minimum number of frames this effect/tool can be applied to. Normally 1."
 msgstr ""
 
-#: src/rfx-builder.c:260
+#: src/rfx-builder.c:265
 msgid "_Requirements..."
 msgstr ""
 
-#: src/rfx-builder.c:263
+#: src/rfx-builder.c:268
 msgid "Enter any binaries required by the plugin."
 msgstr ""
 
-#: src/rfx-builder.c:267
+#: src/rfx-builder.c:272
 msgid "_Properties..."
 msgstr ""
 
-#: src/rfx-builder.c:270
+#: src/rfx-builder.c:275
 msgid "Set properties for the plugin. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:274
+#: src/rfx-builder.c:279
 msgid "_Parameters..."
 msgstr ""
 
-#: src/rfx-builder.c:277
+#: src/rfx-builder.c:282
 msgid "Set up parameters used in pre/loop/post/trigger code. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:281
+#: src/rfx-builder.c:286
 msgid "Parameter _Window Hints..."
 msgstr ""
 
-#: src/rfx-builder.c:284
+#: src/rfx-builder.c:289
 msgid "Set hints about how to lay out the parameter window. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:290
+#: src/rfx-builder.c:295
 msgid "_Language code:"
 msgstr ""
 
-#: src/rfx-builder.c:291
+#: src/rfx-builder.c:296
 msgid "Language for pre/loop/post/triggers. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:300
+#: src/rfx-builder.c:305
 msgid "_Pre loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:303
+#: src/rfx-builder.c:308
 msgid "Code to be executed before the loop. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:307
+#: src/rfx-builder.c:312
 msgid "_Loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:310
+#: src/rfx-builder.c:315
 msgid "Loop code to be applied to each frame."
 msgstr ""
 
-#: src/rfx-builder.c:314
+#: src/rfx-builder.c:319
 msgid "_Post loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:317
+#: src/rfx-builder.c:322
 msgid "Code to be executed after the loop. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:321
+#: src/rfx-builder.c:326
 msgid "_Trigger code..."
 msgstr ""
 
-#: src/rfx-builder.c:324
+#: src/rfx-builder.c:329
 msgid ""
 "Set trigger code for when the parameter window is shown, or when a parameter "
 "is changed. Optional (except for Utilities)."
 msgstr ""
 
-#: src/rfx-builder.c:421
+#: src/rfx-builder.c:426
 #, c-format
 msgid ""
 "\n"
@@ -6087,55 +6098,55 @@
 "%s\n"
 msgstr ""
 
-#: src/rfx-builder.c:544
+#: src/rfx-builder.c:541
 msgid "LiVES: - RFX Requirements"
 msgstr ""
 
-#: src/rfx-builder.c:548
+#: src/rfx-builder.c:544
 msgid "LiVES: - RFX Parameters"
 msgstr ""
 
-#: src/rfx-builder.c:552
+#: src/rfx-builder.c:547
 msgid "LiVES: - RFX Parameter Window Hints"
 msgstr ""
 
-#: src/rfx-builder.c:556
+#: src/rfx-builder.c:550
 msgid "LiVES: - RFX Triggers"
 msgstr ""
 
-#: src/rfx-builder.c:622
+#: src/rfx-builder.c:613
 msgid "_New Entry"
 msgstr ""
 
-#: src/rfx-builder.c:625
+#: src/rfx-builder.c:616
 msgid "_Edit Entry"
 msgstr ""
 
-#: src/rfx-builder.c:628
+#: src/rfx-builder.c:619
 msgid "_Remove Entry"
 msgstr ""
 
-#: src/rfx-builder.c:632
+#: src/rfx-builder.c:623
 msgid "Move _Up"
 msgstr "يۇقىرىغا(_U)"
 
-#: src/rfx-builder.c:635
+#: src/rfx-builder.c:626
 msgid "Move _Down"
 msgstr "تۆۋەنگە(_D)"
 
-#: src/rfx-builder.c:1004
+#: src/rfx-builder.c:984
 msgid "LiVES: - RFX Properties"
 msgstr ""
 
-#: src/rfx-builder.c:1013
+#: src/rfx-builder.c:993
 msgid "_Slow (hint to GUI)"
 msgstr ""
 
-#: src/rfx-builder.c:1024
+#: src/rfx-builder.c:1004
 msgid "_Batch mode generator"
 msgstr ""
 
-#: src/rfx-builder.c:1831
+#: src/rfx-builder.c:1790
 msgid ""
 "\n"
 "\n"
@@ -6144,7 +6155,7 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:1875
+#: src/rfx-builder.c:1834
 msgid ""
 "\n"
 "\n"
@@ -6152,219 +6163,219 @@
 "Please check the trigger code.\n"
 msgstr ""
 
-#: src/rfx-builder.c:1994
+#: src/rfx-builder.c:1950
 msgid "LiVES: - New RFX Parameter"
 msgstr ""
 
-#: src/rfx-builder.c:1997
+#: src/rfx-builder.c:1952
 msgid "LiVES: - Edit RFX Parameter"
 msgstr ""
 
-#: src/rfx-builder.c:2013
+#: src/rfx-builder.c:1968
 msgid "_Name:    "
 msgstr "ئاتى(_N):    "
 
-#: src/rfx-builder.c:2016
+#: src/rfx-builder.c:1971
 msgid "Name of the parameter, must be unique in the plugin."
 msgstr ""
 
-#: src/rfx-builder.c:2025
+#: src/rfx-builder.c:1981
 msgid "_Label:    "
 msgstr "ئەن(_L):    "
 
-#: src/rfx-builder.c:2028
+#: src/rfx-builder.c:1984
 msgid ""
 "Label to be shown by the parameter. An underscore represents mnemonic "
 "accelerator."
 msgstr ""
 
-#: src/rfx-builder.c:2039
+#: src/rfx-builder.c:1996
 msgid "_Type:         "
 msgstr "تىپى(_T):         "
 
-#: src/rfx-builder.c:2040
+#: src/rfx-builder.c:1997
 msgid "Parameter type (select from list)."
 msgstr ""
 
-#: src/rfx-builder.c:2073
+#: src/rfx-builder.c:2029
 msgid "Decimal _places: "
 msgstr ""
 
-#: src/rfx-builder.c:2082 src/rfx-builder.c:2477 src/rfx-builder.c:2495
+#: src/rfx-builder.c:2038 src/rfx-builder.c:2430 src/rfx-builder.c:2447
 msgid "_Default value:    "
 msgstr ""
 
-#: src/rfx-builder.c:2098
+#: src/rfx-builder.c:2054
 msgid "_Default: "
 msgstr "كۆڭۈلدىكى(_D) "
 
-#: src/rfx-builder.c:2132
+#: src/rfx-builder.c:2087
 msgid "Button _Group: "
 msgstr ""
 
-#: src/rfx-builder.c:2134
+#: src/rfx-builder.c:2089
 msgid "A non-zero value can be used to group radio buttons."
 msgstr ""
 
-#: src/rfx-builder.c:2142 src/rfx-builder.c:2478
+#: src/rfx-builder.c:2097 src/rfx-builder.c:2431
 msgid "_Minimum value: "
 msgstr ""
 
-#: src/rfx-builder.c:2148 src/rfx-builder.c:2479
+#: src/rfx-builder.c:2103 src/rfx-builder.c:2432
 msgid "Ma_ximum value: "
 msgstr ""
 
-#: src/rfx-builder.c:2157
+#: src/rfx-builder.c:2113
 msgid "     _Step size:   "
 msgstr ""
 
-#: src/rfx-builder.c:2160
+#: src/rfx-builder.c:2117
 msgid ""
 "How much the parameter is adjusted when the spinbutton arrows are pressed."
 msgstr ""
 
-#: src/rfx-builder.c:2171
+#: src/rfx-builder.c:2129
 msgid "_Wrap value"
 msgstr ""
 
-#: src/rfx-builder.c:2172
+#: src/rfx-builder.c:2131
 msgid "Whether the value wraps max->min and min->max."
 msgstr ""
 
-#: src/rfx-builder.c:2470
+#: src/rfx-builder.c:2424
 msgid "Set _values"
 msgstr ""
 
-#: src/rfx-builder.c:2512
+#: src/rfx-builder.c:2463
 msgid "Default _Red:  "
 msgstr ""
 
-#: src/rfx-builder.c:2513
+#: src/rfx-builder.c:2464
 msgid "Default _Green:"
 msgstr ""
 
-#: src/rfx-builder.c:2514
+#: src/rfx-builder.c:2465
 msgid "Default _Blue: "
 msgstr ""
 
-#: src/rfx-builder.c:2538
+#: src/rfx-builder.c:2488
 msgid "Set _default"
 msgstr ""
 
-#: src/rfx-builder.c:2540
+#: src/rfx-builder.c:2490
 msgid "Default value:  "
 msgstr ""
 
-#: src/rfx-builder.c:2541
+#: src/rfx-builder.c:2491
 msgid "Maximum length (chars): "
 msgstr ""
 
-#: src/rfx-builder.c:2576
+#: src/rfx-builder.c:2526
 msgid "LiVES: - New RFX Parameter Window Hint"
 msgstr ""
 
-#: src/rfx-builder.c:2579
+#: src/rfx-builder.c:2528
 msgid "LiVES: - Edit RFX Parameter Window Hint"
 msgstr ""
 
-#: src/rfx-builder.c:2622
+#: src/rfx-builder.c:2569
 msgid "_Keyword:         "
 msgstr ""
 
-#: src/rfx-builder.c:2639
+#: src/rfx-builder.c:2586
 msgid "Special _Type:         "
 msgstr ""
 
-#: src/rfx-builder.c:2656
+#: src/rfx-builder.c:2602
 msgid "Special _Subtype:         "
 msgstr ""
 
-#: src/rfx-builder.c:2667 src/rfx-builder.c:2706
+#: src/rfx-builder.c:2613 src/rfx-builder.c:2651
 msgid "Row:    "
 msgstr ""
 
-#: src/rfx-builder.c:2732
+#: src/rfx-builder.c:2676
 #, c-format
 msgid "Linked parameters (%d):    "
 msgstr ""
 
-#: src/rfx-builder.c:2749
+#: src/rfx-builder.c:2693
 msgid "Linked parameters (4):    "
 msgstr ""
 
-#: src/rfx-builder.c:2752
+#: src/rfx-builder.c:2695
 msgid "Linked parameters (2):    "
 msgstr ""
 
-#: src/rfx-builder.c:2777
+#: src/rfx-builder.c:2720
 msgid "LiVES: - New RFX Trigger"
 msgstr ""
 
-#: src/rfx-builder.c:2780
+#: src/rfx-builder.c:2722
 msgid "LiVES: - Edit RFX Trigger"
 msgstr ""
 
-#: src/rfx-builder.c:2808
+#: src/rfx-builder.c:2750
 msgid "When:         "
 msgstr ""
 
-#: src/rfx-builder.c:2904
+#: src/rfx-builder.c:2846
 msgid "LiVES: - Pre Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:2911
+#: src/rfx-builder.c:2853
 msgid "LiVES: - Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:2918
+#: src/rfx-builder.c:2860
 msgid "LiVES: - Post Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:2931
+#: src/rfx-builder.c:2873
 #, c-format
 msgid "LiVES: - Default text (max length %d)"
 msgstr ""
 
-#: src/rfx-builder.c:2944
+#: src/rfx-builder.c:2885
 msgid "LiVES: - Enter values, one per line"
 msgstr ""
 
-#: src/rfx-builder.c:3055
+#: src/rfx-builder.c:2996
 msgid ""
 "\n"
 "\n"
 "Name must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3060
+#: src/rfx-builder.c:3001
 msgid ""
 "\n"
 "\n"
 "Name must not contain spaces.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3065
+#: src/rfx-builder.c:3006
 msgid ""
 "\n"
 "\n"
 "Menu text must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3071
+#: src/rfx-builder.c:3012
 msgid ""
 "\n"
 "\n"
 "Action description must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3076
+#: src/rfx-builder.c:3017
 msgid ""
 "\n"
 "\n"
 "Author must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3085 src/rfx-builder.c:4339
+#: src/rfx-builder.c:3026 src/rfx-builder.c:4253
 msgid ""
 "\n"
 "\n"
@@ -6372,28 +6383,28 @@
 "Name must be unique.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3092
+#: src/rfx-builder.c:3033
 msgid ""
 "\n"
 "\n"
 "Loop code should not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3098
+#: src/rfx-builder.c:3039
 msgid ""
 "\n"
 "\n"
 "Trigger code should not be blank for a utility.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3111
+#: src/rfx-builder.c:3052
 msgid ""
 "\n"
 "\n"
 "Parameter name must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3117
+#: src/rfx-builder.c:3058
 msgid ""
 "\n"
 "\n"
@@ -6402,41 +6413,41 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:3171
+#: src/rfx-builder.c:3111
 #, c-format
 msgid "Writing script file %s..."
 msgstr ""
 
-#: src/rfx-builder.c:3477
+#: src/rfx-builder.c:3411
 msgid "No <define> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3484 src/rfx-builder.c:3493
+#: src/rfx-builder.c:3418 src/rfx-builder.c:3427
 msgid "Bad script version.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3505
+#: src/rfx-builder.c:3439
 msgid "No <name> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3513
+#: src/rfx-builder.c:3447
 msgid "No <version> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3522
+#: src/rfx-builder.c:3456
 msgid "No <author> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3536
+#: src/rfx-builder.c:3470
 msgid "No <description> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3540
+#: src/rfx-builder.c:3474
 #, c-format
 msgid "Bad description. (%s)\n"
 msgstr ""
 
-#: src/rfx-builder.c:3702
+#: src/rfx-builder.c:3627
 #, c-format
 msgid ""
 "\n"
@@ -6446,27 +6457,27 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:3859
+#: src/rfx-builder.c:3780
 msgid "Rebuilding all RFX scripts...builtin..."
 msgstr ""
 
-#: src/rfx-builder.c:3860
+#: src/rfx-builder.c:3781
 msgid "Rebuilding scripts"
 msgstr ""
 
-#: src/rfx-builder.c:3868
+#: src/rfx-builder.c:3789
 msgid "custom..."
 msgstr ""
 
-#: src/rfx-builder.c:3872
+#: src/rfx-builder.c:3793
 msgid "test..."
 msgstr ""
 
-#: src/rfx-builder.c:3878
+#: src/rfx-builder.c:3799
 msgid "rebuilding dynamic menu entries..."
 msgstr ""
 
-#: src/rfx-builder.c:3905 src/rfx-builder.c:3912
+#: src/rfx-builder.c:3826 src/rfx-builder.c:3834
 #, c-format
 msgid ""
 "\n"
@@ -6475,7 +6486,7 @@
 "Please check this program is in your path and executable.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3951
+#: src/rfx-builder.c:3874
 #, c-format
 msgid ""
 "\n"
@@ -6485,12 +6496,12 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:3960
+#: src/rfx-builder.c:3884
 #, c-format
 msgid "Deleting rfx script %s..."
 msgstr ""
 
-#: src/rfx-builder.c:3980
+#: src/rfx-builder.c:3902
 #, c-format
 msgid ""
 "\n"
@@ -6500,7 +6511,7 @@
 "Error code was %d\n"
 msgstr ""
 
-#: src/rfx-builder.c:4016
+#: src/rfx-builder.c:3938
 #, c-format
 msgid ""
 "\n"
@@ -6510,12 +6521,12 @@
 "Please delete it first, or rename the test script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4027
+#: src/rfx-builder.c:3950
 #, c-format
 msgid "Promoting rfx test plugin %s to custom..."
 msgstr ""
 
-#: src/rfx-builder.c:4044
+#: src/rfx-builder.c:3965
 #, c-format
 msgid ""
 "\n"
@@ -6526,20 +6537,20 @@
 "Return code was %d (%s)\n"
 msgstr ""
 
-#: src/rfx-builder.c:4070
+#: src/rfx-builder.c:3990
 msgid "LiVES: - Export Script to..."
 msgstr ""
 
-#: src/rfx-builder.c:4077 src/rfx-builder.c:4156
+#: src/rfx-builder.c:3997 src/rfx-builder.c:4074
 #, c-format
 msgid "Copying %s to %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4105
+#: src/rfx-builder.c:4024
 msgid "LiVES: Import Script from..."
 msgstr ""
 
-#: src/rfx-builder.c:4148
+#: src/rfx-builder.c:4067
 #, c-format
 msgid ""
 "\n"
@@ -6549,43 +6560,43 @@
 "Please delete it first, or rename the import script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4249
+#: src/rfx-builder.c:4166
 msgid "LiVES: - Copy RFX Script"
 msgstr ""
 
-#: src/rfx-builder.c:4251
+#: src/rfx-builder.c:4168
 msgid "_From type:    "
 msgstr ""
 
-#: src/rfx-builder.c:4258
+#: src/rfx-builder.c:4175
 msgid "   Script:    "
 msgstr ""
 
-#: src/rfx-builder.c:4267
+#: src/rfx-builder.c:4183
 msgid "LiVES: - Rename test RFX Script"
 msgstr ""
 
-#: src/rfx-builder.c:4268
+#: src/rfx-builder.c:4184
 msgid "From script: "
 msgstr ""
 
-#: src/rfx-builder.c:4273
+#: src/rfx-builder.c:4188
 msgid "LiVES: - RFX Script name"
 msgstr ""
 
-#: src/rfx-builder.c:4274
+#: src/rfx-builder.c:4189
 msgid "Script name: "
 msgstr "قوليازما نامى: "
 
-#: src/rfx-builder.c:4294
+#: src/rfx-builder.c:4209
 msgid "New name: "
 msgstr "يېڭى ئات: "
 
-#: src/rfx-builder.c:4297
+#: src/rfx-builder.c:4212
 msgid "New script name: "
 msgstr ""
 
-#: src/rfx-builder.c:4372
+#: src/rfx-builder.c:4286
 msgid ""
 "\n"
 "\n"
@@ -6593,12 +6604,12 @@
 "Script name must be unique.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4384
+#: src/rfx-builder.c:4297
 #, c-format
 msgid "Renaming RFX test script %s to %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4390
+#: src/rfx-builder.c:4302
 #, c-format
 msgid ""
 "\n"
@@ -6609,21 +6620,21 @@
 "Return code was %d\n"
 msgstr ""
 
-#: src/rfx-builder.c:4610
+#: src/rfx-builder.c:4518
 msgid "_Apply Real Time Effects to Selection"
 msgstr ""
 
-#: src/rfx-builder.c:4664
+#: src/rfx-builder.c:4572
 #, c-format
 msgid "Loading rendered effect %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4766
+#: src/rfx-builder.c:4674
 msgid ""
 "See: VJ - show VJ keys. Set the realtime effects, and then apply them here."
 msgstr ""
 
-#: src/preferences.c:359
+#: src/preferences.c:351
 msgid ""
 "\n"
 "\n"
@@ -6631,7 +6642,7 @@
 "full screen, separate window (fs) mode\n"
 msgstr ""
 
-#: src/preferences.c:408
+#: src/preferences.c:400
 msgid ""
 "\n"
 "\n"
@@ -6639,7 +6650,7 @@
 "(Free space = UNKNOWN)"
 msgstr ""
 
-#: src/preferences.c:412
+#: src/preferences.c:403
 #, c-format
 msgid ""
 "\n"
@@ -6648,14 +6659,14 @@
 "(Free space = %s)"
 msgstr ""
 
-#: src/preferences.c:416
+#: src/preferences.c:408
 msgid ""
 "The temp directory is LiVES working directory where opened clips and sets "
 "are stored.\n"
 "It should be in a partition with plenty of free disk space.\n"
 msgstr ""
 
-#: src/preferences.c:784
+#: src/preferences.c:839
 #, c-format
 msgid ""
 "Unable to create or write to the new temporary directory.\n"
@@ -6666,7 +6677,7 @@
 "The directory will not be changed now.\n"
 msgstr ""
 
-#: src/preferences.c:786
+#: src/preferences.c:843
 #, c-format
 msgid ""
 "Unable to create or write to the new temporary directory.\n"
@@ -6676,7 +6687,7 @@
 "The directory will not be changed now.\n"
 msgstr ""
 
-#: src/preferences.c:798
+#: src/preferences.c:856
 msgid ""
 "You have chosen to change the temporary directory.\n"
 "Please make sure you have no other copies of LiVES open.\n"
@@ -6688,20 +6699,20 @@
 "original setting."
 msgstr ""
 
-#: src/preferences.c:1169
+#: src/preferences.c:1221
 msgid ""
 "\n"
 "Unable to switch audio players to jack - jackd must be installed first.\n"
 "See http://jackaudio.org\n"
 msgstr ""
 
-#: src/preferences.c:1175
+#: src/preferences.c:1226
 msgid ""
 "\n"
 "Switching audio players requires restart (jackd must not be running)\n"
 msgstr ""
 
-#: src/preferences.c:1202
+#: src/preferences.c:1253
 msgid ""
 "\n"
 "Unable to switch audio players to pulse audio\n"
@@ -6709,814 +6720,814 @@
 "See http://www.pulseaudio.org\n"
 msgstr ""
 
-#: src/preferences.c:1502
+#: src/preferences.c:1544
 msgid "PCM (highest quality; largest files)"
 msgstr ""
 
-#: src/preferences.c:2063
+#: src/preferences.c:2096
 msgid "LiVES: - Preferences"
 msgstr ""
 
-#: src/preferences.c:2142
+#: src/preferences.c:2177
 msgid "Open file selection maximised"
 msgstr ""
 
-#: src/preferences.c:2149
+#: src/preferences.c:2184
 msgid "Show recent files in the File menu"
 msgstr ""
 
-#: src/preferences.c:2158
+#: src/preferences.c:2193
 msgid "Stop screensaver on playback    "
 msgstr ""
 
-#: src/preferences.c:2165
+#: src/preferences.c:2200
 msgid "Open main window maximised"
 msgstr ""
 
-#: src/preferences.c:2173
+#: src/preferences.c:2208
 msgid "Show toolbar when background is blanked"
 msgstr ""
 
-#: src/preferences.c:2181
+#: src/preferences.c:2216
 msgid "Allow mouse wheel to switch clips"
 msgstr ""
 
-#: src/preferences.c:2192
+#: src/preferences.c:2227
 msgid "Shrink previews to fit in interface"
 msgstr ""
 
-#: src/preferences.c:2202
+#: src/preferences.c:2237
 msgid "Startup mode:"
 msgstr ""
 
-#: src/preferences.c:2206
+#: src/preferences.c:2241
 msgid "_Clip editor"
 msgstr ""
 
-#: src/preferences.c:2210
+#: src/preferences.c:2245
 msgid "_Multitrack mode"
 msgstr ""
 
-#: src/preferences.c:2234
+#: src/preferences.c:2268
 msgid "Multi-head support"
 msgstr ""
 
-#: src/preferences.c:2242
+#: src/preferences.c:2276
 msgid " monitor number for LiVES interface"
 msgstr ""
 
-#: src/preferences.c:2248
+#: src/preferences.c:2282
 msgid " monitor number for playback"
 msgstr ""
 
-#: src/preferences.c:2260
+#: src/preferences.c:2294
 msgid ""
 "A setting of 0 means use all available monitors (only works with some "
 "playback plugins)."
 msgstr ""
 
-#: src/preferences.c:2270
+#: src/preferences.c:2304
 msgid "Force single monitor"
 msgstr ""
 
-#: src/preferences.c:2271
+#: src/preferences.c:2305
 msgid "Ignore all except the first monitor."
 msgstr ""
 
-#: src/preferences.c:2293
+#: src/preferences.c:2327
 msgid "Show clip thumbnails during playback"
 msgstr ""
 
-#: src/preferences.c:2306
+#: src/preferences.c:2340
 msgid "GUI"
 msgstr ""
 
-#: src/preferences.c:2321
+#: src/preferences.c:2355
 msgid "When entering Multitrack mode:"
 msgstr ""
 
-#: src/preferences.c:2330
+#: src/preferences.c:2364
 msgid "_Prompt me for width, height, fps and audio settings"
 msgstr ""
 
-#: src/preferences.c:2336
+#: src/preferences.c:2370
 msgid "_Always use the following values:"
 msgstr ""
 
-#: src/preferences.c:2345
+#: src/preferences.c:2379
 msgid "Use these same _values for rendering a new clip"
 msgstr ""
 
-#: src/preferences.c:2370
+#: src/preferences.c:2404
 msgid "_Width           "
 msgstr ""
 
-#: src/preferences.c:2375
+#: src/preferences.c:2409
 msgid "          _Height      "
 msgstr ""
 
-#: src/preferences.c:2379
+#: src/preferences.c:2413
 msgid "          _FPS"
 msgstr ""
 
-#: src/preferences.c:2387
+#: src/preferences.c:2421
 msgid "Enable backing audio track"
 msgstr ""
 
-#: src/preferences.c:2394
+#: src/preferences.c:2428
 msgid "Audio track per video track"
 msgstr ""
 
-#: src/preferences.c:2423
+#: src/preferences.c:2457
 msgid "    _Undo buffer size (MB)    "
 msgstr ""
 
-#: src/preferences.c:2432
+#: src/preferences.c:2466
 msgid "_Exit multitrack mode after rendering"
 msgstr ""
 
-#: src/preferences.c:2440
+#: src/preferences.c:2474
 msgid "Auto backup layouts"
 msgstr ""
 
-#: src/preferences.c:2445
+#: src/preferences.c:2479
 msgid "_Every"
 msgstr ""
 
-#: src/preferences.c:2453
+#: src/preferences.c:2487
 msgid "seconds"
 msgstr "سېكۇنت"
 
-#: src/preferences.c:2461
+#: src/preferences.c:2495
 msgid "After every _change"
 msgstr ""
 
-#: src/preferences.c:2467
+#: src/preferences.c:2501
 msgid "_Never"
 msgstr "ھەرگىز(_N)"
 
-#: src/preferences.c:2490
+#: src/preferences.c:2523
 msgid "Multitrack/Render"
 msgstr ""
 
-#: src/preferences.c:2508
+#: src/preferences.c:2541
 msgid "Use instant opening when possible"
 msgstr ""
 
-#: src/preferences.c:2509
+#: src/preferences.c:2543
 msgid "Enable instant opening of some file types using decoder plugins"
 msgstr ""
 
-#: src/preferences.c:2531
+#: src/preferences.c:2567
 msgid "Video open command (fallback)"
 msgstr ""
 
-#: src/preferences.c:2543
+#: src/preferences.c:2579
 msgid "Open/render compression"
 msgstr ""
 
-#: src/preferences.c:2546
+#: src/preferences.c:2582
 msgid " %     ( lower = slower, larger files; for jpeg, higher quality )"
 msgstr ""
 
-#: src/preferences.c:2558
+#: src/preferences.c:2594
 msgid "Default image format"
 msgstr ""
 
-#: src/preferences.c:2562
+#: src/preferences.c:2598
 msgid "_jpeg"
 msgstr ""
 
-#: src/preferences.c:2565
+#: src/preferences.c:2601
 msgid "_png"
 msgstr ""
 
-#: src/preferences.c:2572
+#: src/preferences.c:2608
 msgid "(Check Help/Troubleshoot to see which image formats are supported)"
 msgstr ""
 
-#: src/preferences.c:2580
+#: src/preferences.c:2616
 msgid "Enable automatic deinterlacing when possible"
 msgstr ""
 
-#: src/preferences.c:2582
+#: src/preferences.c:2619
 msgid "Automatically deinterlace frames when a plugin suggests it"
 msgstr ""
 
-#: src/preferences.c:2593
+#: src/preferences.c:2632
 msgid "Automatic trimming / padding of audio when possible"
 msgstr ""
 
-#: src/preferences.c:2595
+#: src/preferences.c:2634
 msgid "Automatically trim or pad audio when a plugin suggests it"
 msgstr ""
 
-#: src/preferences.c:2606
+#: src/preferences.c:2646
 msgid "Ignore blank borders when possible"
 msgstr ""
 
-#: src/preferences.c:2608
+#: src/preferences.c:2648
 msgid "Clip any blank borders from frames where possible"
 msgstr ""
 
-#: src/preferences.c:2619
+#: src/preferences.c:2660
 msgid "When opening multiple files, concatenate images into one clip"
 msgstr ""
 
-#: src/preferences.c:2629
+#: src/preferences.c:2670
 msgid "Decoding"
 msgstr ""
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:2652
+#: src/preferences.c:2693
 msgid "Low - can improve performance on slower machines"
 msgstr ""
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:2654
+#: src/preferences.c:2695
 msgid "Normal - recommended for most users"
 msgstr ""
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:2656
+#: src/preferences.c:2697
 msgid "High - can improve quality on very fast machines"
 msgstr ""
 
-#: src/preferences.c:2659
+#: src/preferences.c:2700
 msgid "Preview _quality"
 msgstr ""
 
-#: src/preferences.c:2660
+#: src/preferences.c:2701
 msgid "The preview quality for video playback - affects resizing"
 msgstr ""
 
-#: src/preferences.c:2675
+#: src/preferences.c:2717
 msgid "_Show FPS statistics"
 msgstr ""
 
-#: src/preferences.c:2694
+#: src/preferences.c:2736
 msgid "_Plugin"
 msgstr ""
 
-#: src/preferences.c:2718
+#: src/preferences.c:2760
 msgid "Stream audio"
 msgstr ""
 
-#: src/preferences.c:2721
+#: src/preferences.c:2763
 msgid "Stream audio to playback plugin"
 msgstr ""
 
-#: src/preferences.c:2734
+#: src/preferences.c:2778
 msgid "Record player output"
 msgstr ""
 
-#: src/preferences.c:2737
+#: src/preferences.c:2781
 msgid "Record output from player instead of input to player"
 msgstr ""
 
-#: src/preferences.c:2744
+#: src/preferences.c:2789
 msgid "VIDEO"
 msgstr ""
 
-#: src/preferences.c:2787
+#: src/preferences.c:2833
 msgid "_Player"
 msgstr ""
 
-#: src/preferences.c:2792
+#: src/preferences.c:2838
 msgid "(See also the Jack Integration tab for jack startup options)"
 msgstr ""
 
-#: src/preferences.c:2819
+#: src/preferences.c:2865
 msgid "mplayer"
 msgstr ""
 
-#: src/preferences.c:2830
+#: src/preferences.c:2876
 msgid "mplayer2"
 msgstr ""
 
-#: src/preferences.c:2833
+#: src/preferences.c:2879
 msgid "Audio play _command"
 msgstr ""
 
-#: src/preferences.c:2840
+#: src/preferences.c:2886
 msgid "- internal -"
 msgstr ""
 
-#: src/preferences.c:2849
+#: src/preferences.c:2895
 msgid "Audio follows video _rate/direction"
 msgstr ""
 
-#: src/preferences.c:2857
+#: src/preferences.c:2903
 msgid "Audio follows _clip switches"
 msgstr ""
 
-#: src/preferences.c:2864
+#: src/preferences.c:2910
 msgid "Source:"
 msgstr ""
 
-#: src/preferences.c:2868
+#: src/preferences.c:2914
 msgid "_Internal"
 msgstr ""
 
-#: src/preferences.c:2873
+#: src/preferences.c:2919
 msgid "_External (requires jack or pulse audio player)"
 msgstr ""
 
-#: src/preferences.c:2892
+#: src/preferences.c:2940
 msgid "AUDIO"
 msgstr ""
 
-#: src/preferences.c:2902
+#: src/preferences.c:2950
 msgid "Playback"
 msgstr "قويۇش"
 
-#: src/preferences.c:2925
+#: src/preferences.c:2973
 msgid ""
 "Record audio when capturing an e_xternal window\n"
 " (requires jack or pulse audio)"
 msgstr ""
 
-#: src/preferences.c:2940
+#: src/preferences.c:2988
 msgid "      What to record when 'r' is pressed   "
 msgstr ""
 
-#: src/preferences.c:2949
+#: src/preferences.c:2997
 msgid "_Frame changes"
 msgstr ""
 
-#: src/preferences.c:2964
+#: src/preferences.c:3012
 msgid "F_PS changes"
 msgstr ""
 
-#: src/preferences.c:2982
+#: src/preferences.c:3030
 msgid "_Real time effects"
 msgstr ""
 
-#: src/preferences.c:2993
+#: src/preferences.c:3041
 msgid "_Clip switches"
 msgstr ""
 
-#: src/preferences.c:3004
+#: src/preferences.c:3052
 msgid "_Audio (requires jack or pulse audio player)"
 msgstr ""
 
-#: src/preferences.c:3024
+#: src/preferences.c:3072
 msgid "Pause recording if free disk space falls below"
 msgstr ""
 
 #. TRANSLATORS: gigabytes
-#: src/preferences.c:3030
+#: src/preferences.c:3078
 msgid "GB"
 msgstr "گىگابايت"
 
-#: src/preferences.c:3037
+#: src/preferences.c:3085
 msgid "Recording"
 msgstr "خاتىرىلەۋاتىدۇ"
 
-#: src/preferences.c:3055
+#: src/preferences.c:3103
 msgid "Encoder"
 msgstr ""
 
-#: src/preferences.c:3090
+#: src/preferences.c:3137
 msgid "Output format"
 msgstr ""
 
-#: src/preferences.c:3106
+#: src/preferences.c:3153
 msgid "Audio codec"
 msgstr "ئاۋاز كودېك"
 
-#: src/preferences.c:3119
+#: src/preferences.c:3165
 msgid "Encoding"
 msgstr "كودلاش"
 
-#: src/preferences.c:3134
+#: src/preferences.c:3180
 msgid "Use _antialiasing when resizing"
 msgstr ""
 
-#: src/preferences.c:3143
+#: src/preferences.c:3189
 msgid "Number of _real time effect keys"
 msgstr ""
 
-#: src/preferences.c:3145
+#: src/preferences.c:3192
 msgid ""
 "The number of \"virtual\" real time effect keys. They can be controlled "
 "through the real time effects window, or via network (OSC)."
 msgstr ""
 
-#: src/preferences.c:3152
+#: src/preferences.c:3199
 msgid "Use _threads where possible when applying effects"
 msgstr ""
 
-#: src/preferences.c:3159
+#: src/preferences.c:3207
 msgid "Number of _threads"
 msgstr ""
 
-#: src/preferences.c:3172
+#: src/preferences.c:3221
 msgid "Restart is required if any of the following paths are changed:"
 msgstr ""
 
-#: src/preferences.c:3182
+#: src/preferences.c:3231
 msgid "Weed plugin path"
 msgstr ""
 
-#: src/preferences.c:3184
+#: src/preferences.c:3234
 msgid "Frei0r plugin path"
 msgstr ""
 
-#: src/preferences.c:3186
+#: src/preferences.c:3237
 msgid "LADSPA plugin path"
 msgstr ""
 
-#: src/preferences.c:3209
+#: src/preferences.c:3261
 msgid "      Video load directory (default)      "
 msgstr ""
 
-#: src/preferences.c:3215
+#: src/preferences.c:3267
 msgid "      Video save directory (default) "
 msgstr ""
 
-#: src/preferences.c:3221
+#: src/preferences.c:3273
 msgid "      Audio load directory (default) "
 msgstr ""
 
-#: src/preferences.c:3227
+#: src/preferences.c:3279
 msgid "      Image directory (default) "
 msgstr ""
 
-#: src/preferences.c:3233
+#: src/preferences.c:3285
 msgid "      Backup/Restore directory (default) "
 msgstr ""
 
-#: src/preferences.c:3239
+#: src/preferences.c:3291
 msgid "      Temp directory (do not remove) "
 msgstr ""
 
-#: src/preferences.c:3252
+#: src/preferences.c:3304
 msgid "The default directory for loading video clips from"
 msgstr ""
 
-#: src/preferences.c:3277
+#: src/preferences.c:3329
 msgid "The default directory for saving encoded clips to"
 msgstr ""
 
-#: src/preferences.c:3285
+#: src/preferences.c:3337
 msgid "The default directory for loading and saving audio"
 msgstr ""
 
-#: src/preferences.c:3293
+#: src/preferences.c:3345
 msgid "The default directory for saving frameshots to"
 msgstr ""
 
-#: src/preferences.c:3301
+#: src/preferences.c:3353
 msgid "The default directory for backing up/restoring single clips"
 msgstr ""
 
-#: src/preferences.c:3309
+#: src/preferences.c:3361
 msgid "LiVES working directory."
 msgstr ""
 
-#: src/preferences.c:3359
+#: src/preferences.c:3412
 msgid "Directories"
 msgstr "مۇندەرىجىلەر"
 
-#: src/preferences.c:3374
+#: src/preferences.c:3427
 msgid "Warn if diskspace falls below: "
 msgstr ""
 
-#: src/preferences.c:3380 src/preferences.c:3394
+#: src/preferences.c:3433 src/preferences.c:3447
 msgid " MB [set to 0 to disable]"
 msgstr ""
 
-#: src/preferences.c:3389
+#: src/preferences.c:3442
 msgid "Diskspace critical level: "
 msgstr ""
 
-#: src/preferences.c:3407
+#: src/preferences.c:3461
 msgid ""
 "Warn on Insert / Merge if _frame rate of clipboard does not match frame rate "
 "of selection"
 msgstr ""
 
-#: src/preferences.c:3417
+#: src/preferences.c:3471
 msgid "Warn on Open if file _size exceeds "
 msgstr ""
 
-#: src/preferences.c:3425
+#: src/preferences.c:3479
 msgid " MB"
 msgstr " مېگابايت"
 
-#: src/preferences.c:3432
+#: src/preferences.c:3486
 msgid "Show a warning before saving a se_t"
 msgstr ""
 
-#: src/preferences.c:3442
+#: src/preferences.c:3496
 msgid ""
 "Show a warning if _mplayer/mplayer2, sox, composite or convert is not found "
 "when LiVES is started."
 msgstr ""
 
-#: src/preferences.c:3452
+#: src/preferences.c:3506
 msgid "Show a warning if no _rendered effects are found at startup."
 msgstr ""
 
-#: src/preferences.c:3464
+#: src/preferences.c:3518
 msgid "Show a warning if no _encoder plugins are found at startup."
 msgstr ""
 
-#: src/preferences.c:3474
+#: src/preferences.c:3528
 msgid "Show a warning if a _duplicate set name is entered."
 msgstr ""
 
-#: src/preferences.c:3485
+#: src/preferences.c:3539
 msgid "When a set is loaded, warn if clips are missing from _layouts."
 msgstr ""
 
-#: src/preferences.c:3495
+#: src/preferences.c:3550
 msgid "Warn if a clip used in a layout is about to be closed."
 msgstr ""
 
-#: src/preferences.c:3505
+#: src/preferences.c:3561
 msgid "Warn if frames used in a layout are about to be deleted."
 msgstr ""
 
-#: src/preferences.c:3515
+#: src/preferences.c:3572
 msgid "Warn if frames used in a layout are about to be shifted."
 msgstr ""
 
-#: src/preferences.c:3525
+#: src/preferences.c:3583
 msgid "Warn if frames used in a layout are about to be altered."
 msgstr ""
 
-#: src/preferences.c:3535
+#: src/preferences.c:3594
 msgid "Warn if audio used in a layout is about to be deleted."
 msgstr ""
 
-#: src/preferences.c:3546
+#: src/preferences.c:3606
 msgid "Warn if audio used in a layout is about to be shifted."
 msgstr ""
 
-#: src/preferences.c:3556
+#: src/preferences.c:3617
 msgid "Warn if audio used in a layout is about to be altered."
 msgstr ""
 
-#: src/preferences.c:3566
+#: src/preferences.c:3628
 msgid "Popup layout errors after clip changes."
 msgstr ""
 
-#: src/preferences.c:3577
+#: src/preferences.c:3639
 msgid "Warn if the layout has not been saved when leaving multitrack mode."
 msgstr ""
 
-#: src/preferences.c:3588
+#: src/preferences.c:3650
 msgid ""
 "Warn if multitrack has no audio channels, and a layout with audio is loaded."
 msgstr ""
 
-#: src/preferences.c:3598
+#: src/preferences.c:3660
 msgid ""
 "Warn if multitrack has audio channels, and your audio player is not \"jack\" "
 "or \"pulse audio\"."
 msgstr ""
 
-#: src/preferences.c:3610
+#: src/preferences.c:3672
 msgid "Show info message after importing from firewire device."
 msgstr ""
 
-#: src/preferences.c:3626
+#: src/preferences.c:3688
 msgid "Show a warning before opening a yuv4mpeg stream (advanced)."
 msgstr ""
 
-#: src/preferences.c:3639
+#: src/preferences.c:3701
 msgid "Show a warning when multitrack is low on backup space."
 msgstr ""
 
-#: src/preferences.c:3650
+#: src/preferences.c:3713
 msgid "Show a warning advising cleaning of disk space after a crash."
 msgstr ""
 
-#: src/preferences.c:3661
+#: src/preferences.c:3725
 msgid "Show a warning if unable to connect to pulseaudio player."
 msgstr ""
 
-#: src/preferences.c:3673
+#: src/preferences.c:3737
 msgid "Show a warning before wiping a layout which has unsaved changes."
 msgstr ""
 
-#: src/preferences.c:3685
+#: src/preferences.c:3749
 msgid "Warnings"
 msgstr "ئاگاھلاندۇرۇش"
 
-#: src/preferences.c:3703
+#: src/preferences.c:3767
 msgid "Midi synch (requires the files midistart and midistop)"
 msgstr ""
 
-#: src/preferences.c:3715
+#: src/preferences.c:3779
 msgid "When inserting/merging frames:  "
 msgstr ""
 
-#: src/preferences.c:3719
+#: src/preferences.c:3783
 msgid "_Speed Up/Slow Down Insertion"
 msgstr ""
 
-#: src/preferences.c:3723
+#: src/preferences.c:3787
 msgid "_Resample Insertion"
 msgstr ""
 
-#: src/preferences.c:3730
+#: src/preferences.c:3794
 msgid "CD device           "
 msgstr ""
 
-#: src/preferences.c:3733
+#: src/preferences.c:3797
 msgid "LiVES can load audio tracks from this CD"
 msgstr ""
 
-#: src/preferences.c:3746
+#: src/preferences.c:3813
 msgid "Default FPS        "
 msgstr ""
 
-#: src/preferences.c:3749
+#: src/preferences.c:3816
 msgid "Frames per second to use when none is specified"
 msgstr ""
 
-#: src/preferences.c:3757
+#: src/preferences.c:3825
 msgid "Misc"
 msgstr "ئارىلاش"
 
-#: src/preferences.c:3782
+#: src/preferences.c:3850
 msgid "New theme:           "
 msgstr ""
 
-#: src/preferences.c:3800
+#: src/preferences.c:3867
 msgid "Themes"
 msgstr "ئۆرنەكلەر"
 
-#: src/preferences.c:3815
+#: src/preferences.c:3882
 msgid "Download bandwidth (Kb/s)       "
 msgstr ""
 
-#: src/preferences.c:3823
+#: src/preferences.c:3890
 msgid "LiVES must be compiled without \"configure --disable-OSC\" to use OMC"
 msgstr ""
 
-#: src/preferences.c:3833
+#: src/preferences.c:3900
 msgid "OMC remote control enabled"
 msgstr ""
 
-#: src/preferences.c:3841
+#: src/preferences.c:3908
 msgid "UDP port       "
 msgstr ""
 
-#: src/preferences.c:3850
+#: src/preferences.c:3917
 msgid "Start OMC on startup"
 msgstr ""
 
-#: src/preferences.c:3870
+#: src/preferences.c:3937
 msgid "Streaming/Networking"
 msgstr ""
 
-#: src/preferences.c:3882
+#: src/preferences.c:3949
 msgid "Jack transport"
 msgstr ""
 
-#: src/preferences.c:3886
+#: src/preferences.c:3953
 msgid ""
 "LiVES must be compiled with jack/transport.h and jack/jack.h present to use "
 "jack transport"
 msgstr ""
 
-#: src/preferences.c:3892
+#: src/preferences.c:3959
 msgid "Jack _transport config file"
 msgstr ""
 
-#: src/preferences.c:3899 src/preferences.c:3989
+#: src/preferences.c:3967 src/preferences.c:4058
 msgid "Start _server on LiVES startup"
 msgstr ""
 
-#: src/preferences.c:3911
+#: src/preferences.c:3979
 msgid "Jack transport _master (start and stop)"
 msgstr ""
 
-#: src/preferences.c:3921
+#: src/preferences.c:3989
 msgid "Jack transport _client (start and stop)"
 msgstr ""
 
-#: src/preferences.c:3935
+#: src/preferences.c:4003
 msgid "Jack transport sets start position"
 msgstr ""
 
-#: src/preferences.c:3952
+#: src/preferences.c:4020
 msgid "Jack transport timebase slave"
 msgstr ""
 
-#: src/preferences.c:3963
+#: src/preferences.c:4031
 msgid "(See also Playback -> Audio follows video rate/direction)"
 msgstr ""
 
-#: src/preferences.c:3971
+#: src/preferences.c:4039
 msgid "Jack audio"
 msgstr ""
 
-#: src/preferences.c:3975
+#: src/preferences.c:4043
 msgid "LiVES must be compiled with jack/jack.h present to use jack audio"
 msgstr ""
 
-#: src/preferences.c:3978
+#: src/preferences.c:4046
 msgid ""
 "You MUST set the audio player to \"jack\" in the Playback tab to use jack "
 "audio"
 msgstr ""
 
-#: src/preferences.c:3984
+#: src/preferences.c:4052
 msgid "Jack _audio server config file"
 msgstr ""
 
-#: src/preferences.c:3996
+#: src/preferences.c:4065
 msgid "Play audio even when transport is _paused"
 msgstr ""
 
-#: src/preferences.c:4008
+#: src/preferences.c:4077
 msgid "Automatically connect to System Out ports when 'playing' External Audio"
 msgstr ""
 
-#: src/preferences.c:4021
+#: src/preferences.c:4090
 msgid "Jack Integration"
 msgstr ""
 
-#: src/preferences.c:4035
+#: src/preferences.c:4104
 msgid "Events to respond to:"
 msgstr ""
 
-#: src/preferences.c:4044
+#: src/preferences.c:4113
 msgid "_Joystick events"
 msgstr ""
 
-#: src/preferences.c:4051
+#: src/preferences.c:4120
 msgid "_Joystick device"
 msgstr ""
 
-#: src/preferences.c:4053
+#: src/preferences.c:4122
 msgid "The joystick device, e.g. /dev/input/js0"
 msgstr ""
 
-#: src/preferences.c:4071
+#: src/preferences.c:4142
 msgid "_MIDI events"
 msgstr ""
 
-#: src/preferences.c:4080
+#: src/preferences.c:4151
 msgid "Use _ALSA MIDI (recommended)"
 msgstr ""
 
-#: src/preferences.c:4082
+#: src/preferences.c:4153
 msgid "Create an ALSA MIDI port which other MIDI devices can be connected to"
 msgstr ""
 
-#: src/preferences.c:4090
+#: src/preferences.c:4162
 msgid "Use _raw MIDI"
 msgstr ""
 
-#: src/preferences.c:4092
+#: src/preferences.c:4164
 msgid "Read directly from the MIDI device"
 msgstr ""
 
-#: src/preferences.c:4104
+#: src/preferences.c:4177
 msgid "_MIDI device"
 msgstr ""
 
-#: src/preferences.c:4106
+#: src/preferences.c:4179
 msgid "The MIDI device, e.g. /dev/input/midi0"
 msgstr ""
 
-#: src/preferences.c:4118
+#: src/preferences.c:4193
 msgid "Advanced"
 msgstr "ئالىي"
 
-#: src/preferences.c:4124
+#: src/preferences.c:4199
 msgid "MIDI check _rate"
 msgstr ""
 
-#: src/preferences.c:4127
+#: src/preferences.c:4203
 msgid ""
 "Number of MIDI checks per keyboard tick. Increasing this may improve MIDI "
 "responsiveness, but may slow down playback."
 msgstr ""
 
-#: src/preferences.c:4134
+#: src/preferences.c:4211
 msgid "MIDI repeat"
 msgstr ""
 
-#: src/preferences.c:4137
+#: src/preferences.c:4214
 msgid "Number of non-reads allowed between succesive reads."
 msgstr ""
 
-#: src/preferences.c:4140
+#: src/preferences.c:4218
 msgid "(Warning: setting this value too high can slow down playback.)"
 msgstr ""
 
-#: src/preferences.c:4159
+#: src/preferences.c:4237
 msgid "MIDI/Joystick learner"
 msgstr ""
 
-#: src/preferences.c:4499
+#: src/preferences.c:4679
 msgid ""
 "\n"
 "LiVES will now shut down. You need to restart it for the directory change to "
@@ -7524,214 +7535,214 @@
 "Click OK to continue.\n"
 msgstr ""
 
-#: src/preferences.c:4523
+#: src/preferences.c:4703
 msgid ""
 "For the directory change to take effect LiVES will restart when preferences "
 "dialog closes."
 msgstr ""
 
-#: src/preferences.c:4527
+#: src/preferences.c:4707
 msgid "Theme changes will not take effect until the next time you start LiVES."
 msgstr ""
 
-#: src/preferences.c:4531
+#: src/preferences.c:4711
 msgid "Jack options will not take effect until the next time you start LiVES."
 msgstr ""
 
-#: src/osc.c:2585
+#: src/osc.c:2616
 #, c-format
 msgid "Syncing to external framerate of %.8f frames per second.\n"
 msgstr ""
 
-#: src/osc.c:6746
+#: src/osc.c:6938
 msgid "Cannot initialize OSC receiver\n"
 msgstr ""
 
-#: src/osc.c:6770
+#: src/osc.c:6961
 #, c-format
 msgid "WARNING: Cannot start OSC server at UDP port %d\n"
 msgstr ""
 
-#: src/osc.c:6775
+#: src/osc.c:6963
 #, c-format
 msgid "Started OSC server at UDP port %d\n"
 msgstr ""
 
-#: src/osc.c:6890
+#: src/osc.c:7076
 #, c-format
 msgid "Cannot start OSC/UDP server at port %d \n"
 msgstr ""
 
-#: src/resample.c:125 src/resample.c:304
+#: src/resample.c:131 src/resample.c:305
 #, c-format
 msgid "Resizing frames 1 to %d"
 msgstr ""
 
-#: src/resample.c:140 src/resample.c:318
+#: src/resample.c:145 src/resample.c:318
 #, c-format
 msgid "Resizing/letterboxing frames 1 to %d"
 msgstr ""
 
-#: src/resample.c:361 src/resample.c:385
+#: src/resample.c:360 src/resample.c:384
 msgid "Resize"
 msgstr "چوڭلۇقىنى ئۆزگەرت"
 
-#: src/resample.c:395
+#: src/resample.c:394
 msgid "Resample/Resize"
 msgstr ""
 
-#: src/resample.c:680
+#: src/resample.c:676
 #, c-format
 msgid "Length of video is now %d frames.\n"
 msgstr ""
 
-#: src/resample.c:745
+#: src/resample.c:737
 msgid ""
 "\n"
 "\n"
 "New rate must be greater than 0\n"
 msgstr ""
 
-#: src/resample.c:797 src/resample.c:813
+#: src/resample.c:788 src/resample.c:803
 msgid "Resampling audio"
 msgstr ""
 
-#: src/resample.c:831
+#: src/resample.c:821
 msgid "LiVES was unable to resample the audio as requested.\n"
 msgstr ""
 
-#: src/resample.c:833 src/resample.c:837
+#: src/resample.c:823 src/resample.c:827
 msgid "Resample Audio"
 msgstr ""
 
-#: src/resample.c:845
+#: src/resample.c:835
 #, c-format
 msgid "Audio was resampled to %d Hz, %d channels, %d bit"
 msgstr ""
 
-#: src/resample.c:1034
+#: src/resample.c:1016
 #, c-format
 msgid "Resampling video at %.8f frames per second..."
 msgstr ""
 
-#: src/resample.c:1037
+#: src/resample.c:1018
 #, c-format
 msgid "Resampling video at %.3f frames per second..."
 msgstr ""
 
-#: src/resample.c:1068
+#: src/resample.c:1049
 msgid "Reordering error !\n"
 msgstr ""
 
-#: src/resample.c:1079
+#: src/resample.c:1060
 msgid "Resample"
 msgstr ""
 
-#: src/resample.c:1192
+#: src/resample.c:1173
 msgid "LiVES: - Resample Audio"
 msgstr ""
 
-#: src/resample.c:1195
+#: src/resample.c:1175
 msgid "LiVES: - Insert Silence"
 msgstr ""
 
-#: src/resample.c:1198
+#: src/resample.c:1177
 msgid "LiVES: - New Clip Audio"
 msgstr ""
 
-#: src/resample.c:1201
+#: src/resample.c:1179
 msgid "LiVES: - External Clip Settings"
 msgstr ""
 
-#: src/resample.c:1238 src/resample.c:1358
+#: src/resample.c:1215 src/resample.c:1332
 msgid "Rate (Hz) "
 msgstr ""
 
-#: src/resample.c:1245 src/resample.c:1372
+#: src/resample.c:1222 src/resample.c:1346
 msgid "Channels"
 msgstr ""
 
-#: src/resample.c:1252
+#: src/resample.c:1229
 msgid "Sample Size "
 msgstr ""
 
-#: src/resample.c:1268 src/resample.c:1425
+#: src/resample.c:1245 src/resample.c:1399
 msgid "Signed"
 msgstr ""
 
-#: src/resample.c:1274 src/resample.c:1435
+#: src/resample.c:1251 src/resample.c:1409
 msgid "Unsigned"
 msgstr "ئىمزاسىز"
 
-#: src/resample.c:1297 src/resample.c:1460
+#: src/resample.c:1273 src/resample.c:1433
 msgid "Little Endian"
 msgstr ""
 
-#: src/resample.c:1303 src/resample.c:1468
+#: src/resample.c:1279 src/resample.c:1441
 msgid "Big Endian"
 msgstr ""
 
-#: src/resample.c:1315
+#: src/resample.c:1290
 msgid "Current"
 msgstr "نۆۋەتتىكى"
 
-#: src/resample.c:1340
+#: src/resample.c:1315
 msgid "_Enable audio"
 msgstr ""
 
-#: src/resample.c:1372
+#: src/resample.c:1346
 msgid "_Channels"
 msgstr ""
 
-#: src/resample.c:1394
+#: src/resample.c:1368
 msgid "_Sample Size"
 msgstr ""
 
-#: src/resample.c:1394
+#: src/resample.c:1368
 msgid "Sample Size"
 msgstr ""
 
-#: src/resample.c:1489
+#: src/resample.c:1461
 msgid "New"
 msgstr "يېڭى"
 
-#: src/resample.c:1512
+#: src/resample.c:1484
 msgid "_Frames Per Second "
 msgstr ""
 
-#: src/resample.c:1530
+#: src/resample.c:1502
 msgid "Record for maximum:  "
 msgstr ""
 
-#: src/resample.c:1533
+#: src/resample.c:1505
 msgid " hours  "
 msgstr " سائەت  "
 
-#: src/resample.c:1536
+#: src/resample.c:1508
 msgid " minutes  "
 msgstr " مىنۇت  "
 
-#: src/resample.c:1538
+#: src/resample.c:1510
 msgid " seconds  "
 msgstr " سېكۇنت  "
 
-#: src/resample.c:1545
+#: src/resample.c:1517
 msgid "Unlimited"
 msgstr "چەكسىز"
 
-#: src/resample.c:1561
+#: src/resample.c:1533
 msgid "Click OK to begin recording, or Cancel to quit."
 msgstr ""
 
-#: src/resample.c:1670
+#: src/resample.c:1638
 msgid "LiVES: - Change playback speed"
 msgstr ""
 
-#: src/resample.c:1673
+#: src/resample.c:1640
 msgid "LiVES: - Resample Video"
 msgstr ""
 
-#: src/resample.c:1696
+#: src/resample.c:1663
 #, c-format
 msgid ""
 "\n"
@@ -7742,7 +7753,7 @@
 "in _frames per second"
 msgstr ""
 
-#: src/resample.c:1701
+#: src/resample.c:1667
 #, c-format
 msgid ""
 "\n"
@@ -7753,89 +7764,89 @@
 "in frames per second"
 msgstr ""
 
-#: src/resample.c:1723
+#: src/resample.c:1688
 msgid "OR enter the desired clip length in _seconds"
 msgstr ""
 
-#: src/resample.c:1745
+#: src/resample.c:1710
 msgid "Change the _audio speed as well"
 msgstr ""
 
-#: src/resample.c:1846
+#: src/resample.c:1810
 msgid ""
 "\n"
 "Speeding up the clip will cause missing frames in some multitrack layouts.\n"
 "Are you sure you wish to change the speed ?\n"
 msgstr ""
 
-#: src/resample.c:1863
+#: src/resample.c:1829
 msgid ""
 "\n"
 "Speeding up the clip will cause missing audio in some multitrack layouts.\n"
 "Are you sure you wish to change the speed ?\n"
 msgstr ""
 
-#: src/resample.c:1878
+#: src/resample.c:1847
 msgid ""
 "\n"
 "Changing the speed will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/resample.c:1892
+#: src/resample.c:1863
 msgid ""
 "\n"
 "Changing the speed will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/resample.c:1938
+#: src/resample.c:1911
 msgid "Speed Change"
 msgstr ""
 
-#: src/resample.c:1947
+#: src/resample.c:1920
 #, c-format
 msgid "Changed playback speed to %.3f frames per second and audio to %d Hz.\n"
 msgstr ""
 
-#: src/resample.c:1950
+#: src/resample.c:1922
 #, c-format
 msgid "Changed playback speed to %.3f frames per second.\n"
 msgstr ""
 
-#: src/resample.c:2035
+#: src/resample.c:2006
 msgid "Resampling video"
 msgstr ""
 
-#: src/resample.c:2042 src/resample.c:2160 src/resample.c:2182
+#: src/resample.c:2012 src/resample.c:2127 src/resample.c:2148
 msgid "Resampling clipboard video"
 msgstr ""
 
-#: src/resample.c:2047
+#: src/resample.c:2016
 msgid "Reordering frames"
 msgstr ""
 
-#: src/resample.c:2056
+#: src/resample.c:2025
 msgid ""
 "\n"
 "\n"
 "LiVES was unable to reorder the frames."
 msgstr ""
 
-#: src/resample.c:2104
+#: src/resample.c:2071
 msgid "Deordering frames"
 msgstr ""
 
-#: src/resample.c:2199
+#: src/resample.c:2165
 msgid "resampling error..."
 msgstr ""
 
-#: src/rte_window.c:85 src/rte_window.c:1708
+#: src/rte_window.c:124 src/rte_window.c:1709
 #, c-format
 msgid "Type: %s"
 msgstr "تىپى: %s"
 
-#: src/rte_window.c:112
+#: src/rte_window.c:150
 msgid ""
 "\n"
 "\n"
@@ -7845,7 +7856,7 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:426
+#: src/rte_window.c:460
 msgid ""
 "\n"
 "\n"
@@ -7853,19 +7864,19 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:432
+#: src/rte_window.c:466
 #, c-format
 msgid "Saving keymap to %s\n"
 msgstr ""
 
-#: src/rte_window.c:439
+#: src/rte_window.c:471
 #, c-format
 msgid ""
 "\n"
 "Updating keymap file %s..."
 msgstr ""
 
-#: src/rte_window.c:446
+#: src/rte_window.c:477
 #, c-format
 msgid ""
 "\n"
@@ -7875,12 +7886,12 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/rte_window.c:526
+#: src/rte_window.c:556
 #, c-format
 msgid "Saving real time effect defaults to %s..."
 msgstr ""
 
-#: src/rte_window.c:535
+#: src/rte_window.c:563
 #, c-format
 msgid ""
 "\n"
@@ -7890,22 +7901,22 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/rte_window.c:632
+#: src/rte_window.c:657
 #, c-format
 msgid "Loading real time effect defaults from %s..."
 msgstr ""
 
-#: src/rte_window.c:681
+#: src/rte_window.c:701
 #, c-format
 msgid "Loading generator default sizes from %s..."
 msgstr ""
 
-#: src/rte_window.c:1306
+#: src/rte_window.c:1319
 #, c-format
 msgid "Loading default keymap from %s..."
 msgstr ""
 
-#: src/rte_window.c:1329
+#: src/rte_window.c:1339
 #, c-format
 msgid ""
 "\n"
@@ -7915,48 +7926,48 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/rte_window.c:1403
+#: src/rte_window.c:1412
 #, c-format
 msgid "Invalid line %d in %s\n"
 msgstr ""
 
-#: src/rte_window.c:1483
+#: src/rte_window.c:1490
 #, c-format
 msgid "Invalid key %d in %s\n"
 msgstr ""
 
-#: src/rte_window.c:1498
+#: src/rte_window.c:1505
 #, c-format
 msgid "Invalid effect %s in %s\n"
 msgstr ""
 
-#: src/rte_window.c:1517
+#: src/rte_window.c:1524
 #, c-format
 msgid "Unknown effect %s in %s\n"
 msgstr ""
 
-#: src/rte_window.c:1535
+#: src/rte_window.c:1542
 #, c-format
 msgid ""
 "This version of LiVES cannot mix generators/non-generators on the same key "
 "(%d) !\n"
 msgstr ""
 
-#: src/rte_window.c:1547
+#: src/rte_window.c:1554
 #, c-format
 msgid "Too many effects bound to key %d.\n"
 msgstr ""
 
-#: src/rte_window.c:1587
+#: src/rte_window.c:1593
 msgid "update required.\n"
 msgstr ""
 
-#: src/rte_window.c:1603
+#: src/rte_window.c:1607
 #, c-format
 msgid "Loading data connection map from %s..."
 msgstr ""
 
-#: src/rte_window.c:1612
+#: src/rte_window.c:1614
 msgid ""
 "\n"
 "\n"
@@ -7964,41 +7975,41 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:1691
+#: src/rte_window.c:1692
 #, c-format
 msgid "LiVES: Information for %s"
 msgstr ""
 
-#: src/rte_window.c:1704
+#: src/rte_window.c:1705
 #, c-format
 msgid "Effect name: %s"
 msgstr ""
 
-#: src/rte_window.c:1712
+#: src/rte_window.c:1713
 #, c-format
 msgid "Plugin name: %s"
 msgstr ""
 
-#: src/rte_window.c:1716
+#: src/rte_window.c:1717
 #, c-format
 msgid "Author: %s"
 msgstr "ئاپتور: ‎%s"
 
-#: src/rte_window.c:1721
+#: src/rte_window.c:1722
 #, c-format
 msgid "and: %s"
 msgstr ""
 
-#: src/rte_window.c:1726
+#: src/rte_window.c:1727
 #, c-format
 msgid "Version: %d"
 msgstr ""
 
-#: src/rte_window.c:1734
+#: src/rte_window.c:1735
 msgid "Description: "
 msgstr "چۈشەندۈرۈش: "
 
-#: src/rte_window.c:1960
+#: src/rte_window.c:1963
 msgid ""
 "\n"
 "\n"
@@ -8007,69 +8018,69 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:2024
+#: src/rte_window.c:2027
 #, c-format
 msgid "LiVES could not locate the effect %s.\n"
 msgstr ""
 
-#: src/rte_window.c:2225
+#: src/rte_window.c:2216
 msgid "LiVES: Real time effect mapping"
 msgstr ""
 
-#: src/rte_window.c:2257
+#: src/rte_window.c:2248
 #, c-format
 msgid "Ctrl-%d"
 msgstr ""
 
-#: src/rte_window.c:2264
+#: src/rte_window.c:2255
 msgid "Key active"
 msgstr ""
 
-#: src/rte_window.c:2279
+#: src/rte_window.c:2271
 msgid "Key grab"
 msgstr ""
 
-#: src/rte_window.c:2280
+#: src/rte_window.c:2272
 msgid "Grab keyboard for this effect key"
 msgstr ""
 
-#: src/rte_window.c:2290
+#: src/rte_window.c:2283
 msgid "_Clear all effects"
 msgstr ""
 
-#: src/rte_window.c:2304
+#: src/rte_window.c:2297
 msgid "Mode active"
 msgstr ""
 
-#: src/rte_window.c:2314 src/multitrack.c:8568
+#: src/rte_window.c:2307 src/multitrack.c:8762
 msgid "Info"
 msgstr "ئۇچۇرى"
 
-#: src/rte_window.c:2315
+#: src/rte_window.c:2308
 msgid "Set Parameters"
 msgstr ""
 
-#: src/rte_window.c:2316
+#: src/rte_window.c:2309
 msgid "Set Connections"
 msgstr ""
 
-#: src/rte_window.c:2317
+#: src/rte_window.c:2310
 msgid "Clear"
 msgstr "تازىلا"
 
-#: src/rte_window.c:2326
+#: src/rte_window.c:2319
 msgid "Effect name:"
 msgstr ""
 
-#: src/rte_window.c:2391
+#: src/rte_window.c:2384
 msgid "_Save as default keymap"
 msgstr ""
 
-#: src/rte_window.c:2396
+#: src/rte_window.c:2389
 msgid "_Load default keymap"
 msgstr ""
 
-#: src/rte_window.c:2840
+#: src/rte_window.c:2833
 #, c-format
 msgid ""
 "Unable to create default keymap file: %s\n"
@@ -8127,86 +8138,86 @@
 msgid "none\n"
 msgstr "يوق\n"
 
-#: src/lives-yuv4mpeg.c:494
+#: src/lives-yuv4mpeg.c:493
 #, c-format
 msgid ""
 "Unable to set display framerate to %.3f fps.\n"
 "\n"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:503
+#: src/lives-yuv4mpeg.c:502
 #, c-format
 msgid "Unable to open yuv4mpeg out stream %s\n"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:628
+#: src/lives-yuv4mpeg.c:626
 #, c-format
 msgid "TV card %d"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:713
+#: src/lives-yuv4mpeg.c:710
 #, c-format
 msgid "Opened TV card %d (%s)"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:760
+#: src/lives-yuv4mpeg.c:757
 #, c-format
 msgid "Firewire card %d"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:796
+#: src/lives-yuv4mpeg.c:793
 #, c-format
 msgid "Opened firewire card %d"
 msgstr ""
 
-#: src/multitrack.c:666
+#: src/multitrack.c:736
 msgid "Auto backup"
 msgstr ""
 
-#: src/multitrack.c:868
+#: src/multitrack.c:935
 msgid "Backing audio"
 msgstr ""
 
-#: src/multitrack.c:1435
+#: src/multitrack.c:1515
 #, c-format
 msgid "%s : parameters for %s"
 msgstr ""
 
-#: src/multitrack.c:1809 src/multitrack.c:3483
+#: src/multitrack.c:1881 src/multitrack.c:3635
 #, c-format
 msgid "Current track: %s (layer %d)\n"
 msgstr ""
 
-#: src/multitrack.c:1813 src/multitrack.c:3484
+#: src/multitrack.c:1885 src/multitrack.c:3637
 msgid "Current track: Backing audio\n"
 msgstr ""
 
-#: src/multitrack.c:1814
+#: src/multitrack.c:1886
 #, c-format
 msgid "Current track: Layer %d audio\n"
 msgstr ""
 
-#: src/multitrack.c:1817
+#: src/multitrack.c:1889
 #, c-format
 msgid "%.2f sec.\n"
 msgstr ""
 
-#: src/multitrack.c:1822 src/multitrack.c:3490
+#: src/multitrack.c:1894 src/multitrack.c:3643
 #, c-format
 msgid "Source: %s"
 msgstr "مەنبە: %s"
 
-#: src/multitrack.c:1825 src/multitrack.c:3492
+#: src/multitrack.c:1897 src/multitrack.c:3645
 msgid "Right click for context menu.\n"
 msgstr ""
 
-#: src/multitrack.c:1827
+#: src/multitrack.c:1899
 msgid ""
 "Double click on a block\n"
 "to select it."
 msgstr ""
 
-#: src/multitrack.c:3312
+#: src/multitrack.c:3452
 msgid ""
 "\n"
 "\n"
@@ -8215,7 +8226,7 @@
 "right or double clicking on it.\n"
 msgstr ""
 
-#: src/multitrack.c:3315
+#: src/multitrack.c:3455
 msgid ""
 "\n"
 "\n"
@@ -8223,14 +8234,14 @@
 "Select an effect in FX stack first to view its parameters.\n"
 msgstr ""
 
-#: src/multitrack.c:3318
+#: src/multitrack.c:3458
 msgid ""
 "\n"
 "\n"
 "No clips loaded.\n"
 msgstr ""
 
-#: src/multitrack.c:3321
+#: src/multitrack.c:3462
 msgid ""
 "You must select two video tracks\n"
 "and a time region\n"
@@ -8240,7 +8251,7 @@
 "before inserting clips into the timeline."
 msgstr ""
 
-#: src/multitrack.c:3324
+#: src/multitrack.c:3465
 msgid ""
 "\n"
 "\n"
@@ -8249,210 +8260,210 @@
 "to apply compositors.\n"
 msgstr ""
 
-#: src/multitrack.c:3487
+#: src/multitrack.c:3640
 #, c-format
 msgid "%.2f sec. to %.2f sec.\n"
 msgstr ""
 
-#: src/multitrack.c:3493
+#: src/multitrack.c:3646
 msgid ""
 "Single click on timeline\n"
 "to select a frame.\n"
 msgstr ""
 
-#: src/multitrack.c:3711 src/multitrack.c:6790
+#: src/multitrack.c:3858 src/multitrack.c:6972
 #, c-format
 msgid "%s [unstable]"
 msgstr ""
 
-#: src/multitrack.c:3822
+#: src/multitrack.c:3973
 msgid ""
 "You can click and drag\n"
 "below the timeline"
 msgstr ""
 
-#: src/multitrack.c:3823
+#: src/multitrack.c:3974
 msgid "to select a time region.\n"
 msgstr ""
 
-#: src/multitrack.c:3985
+#: src/multitrack.c:4137
 msgid "LiVES: Selected clip"
 msgstr ""
 
-#: src/multitrack.c:3993
+#: src/multitrack.c:4145
 msgid "_Adjust start and end points"
 msgstr ""
 
-#: src/multitrack.c:4002
+#: src/multitrack.c:4154
 msgid "_Edit/encode in clip editor"
 msgstr ""
 
-#: src/multitrack.c:4009
+#: src/multitrack.c:4161
 msgid "_Show clip information"
 msgstr ""
 
-#: src/multitrack.c:4016
+#: src/multitrack.c:4168
 msgid "_Close this clip"
 msgstr ""
 
-#: src/multitrack.c:4236
+#: src/multitrack.c:4388
 msgid "Audio mixer (ctrl-m)"
 msgstr ""
 
-#: src/multitrack.c:4336
+#: src/multitrack.c:4488
 msgid "Single click on timeline"
 msgstr ""
 
-#: src/multitrack.c:4337
+#: src/multitrack.c:4489
 msgid "to select a frame."
 msgstr ""
 
-#: src/multitrack.c:4338
+#: src/multitrack.c:4490
 msgid "Double click or right click on timeline"
 msgstr ""
 
-#: src/multitrack.c:4339
+#: src/multitrack.c:4491
 msgid "to select a block."
 msgstr ""
 
-#: src/multitrack.c:4340
+#: src/multitrack.c:4492
 msgid "Clips can be dragged"
 msgstr ""
 
-#: src/multitrack.c:4341
+#: src/multitrack.c:4493
 msgid "onto the timeline."
 msgstr ""
 
-#: src/multitrack.c:4343
+#: src/multitrack.c:4495
 msgid "Mouse mode is: Move"
 msgstr ""
 
-#: src/multitrack.c:4344
+#: src/multitrack.c:4496
 msgid "clips can be moved around."
 msgstr ""
 
-#: src/multitrack.c:4349
+#: src/multitrack.c:4500
 msgid "Mouse mode is: Select."
 msgstr ""
 
-#: src/multitrack.c:4350
+#: src/multitrack.c:4501
 msgid "Drag with mouse on timeline"
 msgstr ""
 
-#: src/multitrack.c:4351
+#: src/multitrack.c:4502
 msgid "to select tracks and time."
 msgstr ""
 
-#: src/multitrack.c:4362
+#: src/multitrack.c:4509
 msgid "_Insert mode: Normal"
 msgstr ""
 
-#: src/multitrack.c:4378
+#: src/multitrack.c:4537
 msgid "_Mouse mode: Move"
 msgstr ""
 
-#: src/multitrack.c:4382
+#: src/multitrack.c:4540
 msgid "_Mouse mode: Select"
 msgstr ""
 
-#: src/multitrack.c:4405 src/multitrack.c:7925
+#: src/multitrack.c:4563 src/multitrack.c:8104
 msgid "Gravity: Normal"
 msgstr ""
 
-#: src/multitrack.c:4409
+#: src/multitrack.c:4565
 msgid "Gravity: Left"
 msgstr ""
 
-#: src/multitrack.c:4414
+#: src/multitrack.c:4569
 msgid "Gravity: Right"
 msgstr ""
 
-#: src/multitrack.c:4416
+#: src/multitrack.c:4570
 msgid "Close _last gap(s) in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:4419
+#: src/multitrack.c:4572
 msgid "Close _first gap(s) in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:4458
+#: src/multitrack.c:4627
 msgid "Close gaps"
 msgstr ""
 
-#: src/multitrack.c:4460
+#: src/multitrack.c:4629
 msgid "Move block"
 msgstr ""
 
-#: src/multitrack.c:4462
+#: src/multitrack.c:4631
 msgid "Move audio block"
 msgstr ""
 
-#: src/multitrack.c:4464
+#: src/multitrack.c:4633
 msgid "Delete block"
 msgstr ""
 
-#: src/multitrack.c:4466
+#: src/multitrack.c:4635
 msgid "Delete audio block"
 msgstr ""
 
-#: src/multitrack.c:4468
+#: src/multitrack.c:4637
 msgid "Split tracks"
 msgstr ""
 
-#: src/multitrack.c:4470
+#: src/multitrack.c:4639
 msgid "Split block"
 msgstr ""
 
-#: src/multitrack.c:4473
+#: src/multitrack.c:4642
 #, c-format
 msgid "Apply %s"
 msgstr ""
 
-#: src/multitrack.c:4478
+#: src/multitrack.c:4647
 #, c-format
 msgid "Delete %s"
 msgstr "%s نى ئۆچۈر"
 
-#: src/multitrack.c:4482
+#: src/multitrack.c:4651
 msgid "Insert block"
 msgstr ""
 
-#: src/multitrack.c:4484
+#: src/multitrack.c:4653
 msgid "Insert gap"
 msgstr ""
 
-#: src/multitrack.c:4486
+#: src/multitrack.c:4655
 msgid "Insert audio block"
 msgstr ""
 
-#: src/multitrack.c:4488
+#: src/multitrack.c:4657
 msgid "Effect order change"
 msgstr ""
 
-#: src/multitrack.c:4898
+#: src/multitrack.c:5064
 msgid "unsigned "
 msgstr ""
 
-#: src/multitrack.c:4899
+#: src/multitrack.c:5065
 msgid "signed "
 msgstr ""
 
-#: src/multitrack.c:4904
+#: src/multitrack.c:5071
 #, c-format
 msgid ""
 "Multitrack values set to %.3f fps, frame size %d x %d, audio channels %d, "
 "audio rate %d, audio sample size %d, %s.\n"
 msgstr ""
 
-#: src/multitrack.c:4938
+#: src/multitrack.c:5104
 msgid "invalid event list. Failed.\n"
 msgstr ""
 
-#: src/multitrack.c:4944
+#: src/multitrack.c:5110
 msgid "event list has invalid fps. Failed.\n"
 msgstr ""
 
-#: src/multitrack.c:4953
+#: src/multitrack.c:5122
 #, c-format
 msgid ""
 "\n"
@@ -8462,7 +8473,7 @@
 "then load in the new set from the File menu.\n"
 msgstr ""
 
-#: src/multitrack.c:4993
+#: src/multitrack.c:5163
 #, c-format
 msgid ""
 "\n"
@@ -8470,600 +8481,592 @@
 "It cannot be loaded.\n"
 msgstr ""
 
-#: src/multitrack.c:5329 src/multitrack.c:5338 src/multitrack.c:21133
+#: src/multitrack.c:5452
 msgid "Layout was wiped.\n"
 msgstr ""
 
-#: src/multitrack.c:5374
+#: src/multitrack.c:5547
 #, c-format
 msgid "LiVES-%s: Multitrack %dx%d : %d bpp %.3f fps"
 msgstr ""
 
-#: src/multitrack.c:5617
+#: src/multitrack.c:5793
 msgid "In/out"
 msgstr ""
 
-#: src/multitrack.c:5619
+#: src/multitrack.c:5795
 msgid "FX stack"
 msgstr ""
 
-#: src/multitrack.c:5627 src/omc-learn.c:673
+#: src/multitrack.c:5803 src/omc-learn.c:659
 msgid "Params."
 msgstr ""
 
-#: src/multitrack.c:5978
+#: src/multitrack.c:6157
 msgid "_Open..."
 msgstr "ئاچ(_O)…"
 
-#: src/multitrack.c:5996
+#: src/multitrack.c:6175
 msgid "O_pen File Selection..."
 msgstr ""
 
-#: src/multitrack.c:6040
+#: src/multitrack.c:6219
 msgid "Import Selection from _dvd/vcd..."
 msgstr ""
 
-#: src/multitrack.c:6050
+#: src/multitrack.c:6229
 msgid "Import Selection from _dvd"
 msgstr ""
 
-#: src/multitrack.c:6060
+#: src/multitrack.c:6239
 msgid "Import Selection from _vcd"
 msgstr ""
 
-#: src/multitrack.c:6076
+#: src/multitrack.c:6255
 msgid "_Import from Device"
 msgstr ""
 
-#: src/multitrack.c:6103
+#: src/multitrack.c:6282
 msgid "_Close the selected clip"
 msgstr ""
 
-#: src/multitrack.c:6198
+#: src/multitrack.c:6377
 msgid "_Save layout as..."
 msgstr ""
 
-#: src/multitrack.c:6206
+#: src/multitrack.c:6385
 msgid "_Load layout..."
 msgstr ""
 
-#: src/multitrack.c:6210
+#: src/multitrack.c:6389
 msgid "_Wipe/Delete layout..."
 msgstr ""
 
-#: src/multitrack.c:6236
+#: src/multitrack.c:6415
 msgid "_Ignore width, height and audio values from loaded layouts"
 msgstr ""
 
-#: src/multitrack.c:6240
+#: src/multitrack.c:6419
 msgid "Auto load _subtitles with clips"
 msgstr ""
 
-#: src/multitrack.c:6322
+#: src/multitrack.c:6501
 msgid "_CLIP EDITOR"
 msgstr ""
 
-#: src/multitrack.c:6334
+#: src/multitrack.c:6513
 msgid "_Adjust selected clip start/end points"
 msgstr ""
 
-#: src/multitrack.c:6343
+#: src/multitrack.c:6522
 msgid "_Insert selected clip"
 msgstr ""
 
-#: src/multitrack.c:6355
+#: src/multitrack.c:6534
 msgid "_Insert selected clip audio"
 msgstr ""
 
-#: src/multitrack.c:6364
+#: src/multitrack.c:6543
 msgid "_Delete selected block"
 msgstr ""
 
-#: src/multitrack.c:6373
+#: src/multitrack.c:6555
 msgid "_Jump to previous block boundary"
 msgstr ""
 
-#: src/multitrack.c:6382
+#: src/multitrack.c:6564
 msgid "_Jump to next block boundary"
 msgstr ""
 
-#: src/multitrack.c:6395
+#: src/multitrack.c:6577
 msgid "Clear _marks from timeline"
 msgstr ""
 
-#: src/multitrack.c:6403
+#: src/multitrack.c:6585
 msgid "Ignore selection limits when inserting"
 msgstr ""
 
-#: src/multitrack.c:6420 src/multitrack.c:16719
+#: src/multitrack.c:6602 src/multitrack.c:17009
 msgid "_Play from Timeline Position"
 msgstr ""
 
-#: src/multitrack.c:6434
+#: src/multitrack.c:6616
 msgid "Pla_y selected time only"
 msgstr ""
 
-#: src/multitrack.c:6518
+#: src/multitrack.c:6700
 msgid "_Move effects with blocks"
 msgstr ""
 
-#: src/multitrack.c:6531
+#: src/multitrack.c:6713
 msgid "Select _autotransition effect..."
 msgstr ""
 
-#: src/multitrack.c:6542
+#: src/multitrack.c:6724
 msgid "Crossfade audio with autotransition"
 msgstr ""
 
-#: src/multitrack.c:6550
+#: src/multitrack.c:6732
 msgid "View/_Edit selected effect"
 msgstr ""
 
-#: src/multitrack.c:6554
+#: src/multitrack.c:6736
 msgid "_Delete selected effect"
 msgstr ""
 
-#: src/multitrack.c:6562
+#: src/multitrack.c:6744
 msgid "Apply effect to _block..."
 msgstr ""
 
-#: src/multitrack.c:6619
+#: src/multitrack.c:6801
 msgid "Apply effect to _region..."
 msgstr ""
 
-#: src/multitrack.c:6885
+#: src/multitrack.c:7061
 msgid "_Tracks"
 msgstr ""
 
-#: src/multitrack.c:6896
+#: src/multitrack.c:7072
 msgid "Rename current track"
 msgstr ""
 
-#: src/multitrack.c:6904
+#: src/multitrack.c:7080
 msgid "Make _Backing Audio current track"
 msgstr ""
 
-#: src/multitrack.c:6915
+#: src/multitrack.c:7091
 msgid "Add Video Track at _Rear"
 msgstr ""
 
-#: src/multitrack.c:6923
+#: src/multitrack.c:7099
 msgid "Add Video Track at _Front"
 msgstr ""
 
-#: src/multitrack.c:6936
+#: src/multitrack.c:7112
 msgid "_Split current track at cursor"
 msgstr ""
 
-#: src/multitrack.c:6948
+#: src/multitrack.c:7124
 msgid "_Split selected video tracks"
 msgstr ""
 
-#: src/multitrack.c:6961
+#: src/multitrack.c:7137
 msgid "Insert gap in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:6969
+#: src/multitrack.c:7145
 msgid "Insert gap in current track/selected time"
 msgstr ""
 
-#: src/multitrack.c:6981
+#: src/multitrack.c:7157
 msgid "Close all _gaps in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:7007
+#: src/multitrack.c:7183
 msgid "Se_lection"
 msgstr "تاللا(_L)"
 
-#: src/multitrack.c:7018
+#: src/multitrack.c:7194
 msgid "_Select Current Track"
 msgstr ""
 
-#: src/multitrack.c:7025
+#: src/multitrack.c:7201
 msgid "Select _all video tracks"
 msgstr ""
 
-#: src/multitrack.c:7032
+#: src/multitrack.c:7208
 msgid "Select _no video tracks"
 msgstr ""
 
-#: src/multitrack.c:7039
+#: src/multitrack.c:7215
 msgid "Select all _time"
 msgstr ""
 
-#: src/multitrack.c:7050
+#: src/multitrack.c:7226
 msgid "Select from _zero time"
 msgstr ""
 
-#: src/multitrack.c:7057
+#: src/multitrack.c:7233
 msgid "Select to _end time"
 msgstr ""
 
-#: src/multitrack.c:7064
+#: src/multitrack.c:7240
 msgid "_Copy..."
 msgstr "كۆچۈر(_C)…"
 
-#: src/multitrack.c:7075
+#: src/multitrack.c:7251
 msgid "_Timecode to region start"
 msgstr ""
 
-#: src/multitrack.c:7082
+#: src/multitrack.c:7258
 msgid "_Timecode to region end"
 msgstr ""
 
-#: src/multitrack.c:7089
+#: src/multitrack.c:7265
 msgid "_Region start to timecode"
 msgstr ""
 
-#: src/multitrack.c:7096
+#: src/multitrack.c:7272
 msgid "_Region end to timecode"
 msgstr ""
 
-#: src/multitrack.c:7110
+#: src/multitrack.c:7286
 msgid "Select/deselect block at current track/time"
 msgstr ""
 
-#: src/multitrack.c:7135
+#: src/multitrack.c:7311
 msgid "_Change width, height and audio values..."
 msgstr ""
 
-#: src/multitrack.c:7194
+#: src/multitrack.c:7370
 msgid "_Render"
 msgstr ""
 
-#: src/multitrack.c:7205
+#: src/multitrack.c:7381
 msgid "_Render all to new clip"
 msgstr ""
 
-#: src/multitrack.c:7220
+#: src/multitrack.c:7396
 msgid "Render _video"
 msgstr ""
 
-#: src/multitrack.c:7225
+#: src/multitrack.c:7401
 msgid "Render _audio"
 msgstr ""
 
-#: src/multitrack.c:7235
+#: src/multitrack.c:7411
 msgid "_Normalise rendered audio"
 msgstr ""
 
-#: src/multitrack.c:7242
+#: src/multitrack.c:7418
 msgid "_Pre-render audio"
 msgstr ""
 
-#: src/multitrack.c:7251
+#: src/multitrack.c:7427
 msgid "_View"
 msgstr "كۆرۈنۈش(_V)"
 
-#: src/multitrack.c:7270
+#: src/multitrack.c:7446
 msgid "Block _In/out points"
 msgstr ""
 
-#: src/multitrack.c:7279
+#: src/multitrack.c:7455
 msgid "_Effects at current"
 msgstr ""
 
-#: src/multitrack.c:7297
+#: src/multitrack.c:7473
 msgid "Audio parameters"
 msgstr ""
 
-#: src/multitrack.c:7308
+#: src/multitrack.c:7484
 msgid "Show backing _audio track"
 msgstr ""
 
-#: src/multitrack.c:7312
+#: src/multitrack.c:7488
 msgid "Compact view"
 msgstr ""
 
-#: src/multitrack.c:7320
+#: src/multitrack.c:7496
 msgid "Maximum tracks to display..."
 msgstr ""
 
-#: src/multitrack.c:7327
+#: src/multitrack.c:7503
 msgid "Scroll to follow playback"
 msgstr ""
 
-#: src/multitrack.c:7331
+#: src/multitrack.c:7507
 msgid "_Center on cursor"
 msgstr ""
 
-#: src/multitrack.c:7338
+#: src/multitrack.c:7514
 msgid "_Zoom in"
 msgstr ""
 
-#: src/multitrack.c:7349
+#: src/multitrack.c:7525
 msgid "_Zoom out"
 msgstr ""
 
-#: src/multitrack.c:7361
+#: src/multitrack.c:7537
 msgid "Multitrack _details"
 msgstr ""
 
-#: src/multitrack.c:7374
+#: src/multitrack.c:7550
 msgid "_Event Window"
 msgstr ""
 
-#: src/multitrack.c:7378
+#: src/multitrack.c:7554
 msgid "_Event Window (selected time only)"
 msgstr ""
 
-#: src/multitrack.c:7382
+#: src/multitrack.c:7558
 msgid "_Show FRAME events"
 msgstr ""
 
-#: src/multitrack.c:7399
+#: src/multitrack.c:7575
 msgid "_Show multitrack keys"
 msgstr ""
 
-#: src/multitrack.c:7468
+#: src/multitrack.c:7644
 msgid "Mouse mode: _Move"
 msgstr ""
 
-#: src/multitrack.c:7476
+#: src/multitrack.c:7652
 msgid "Mouse mode: _Select"
 msgstr ""
 
-#: src/multitrack.c:7505
+#: src/multitrack.c:7681
 msgid "Insert mode: _Normal"
 msgstr ""
 
-#: src/multitrack.c:7733
+#: src/multitrack.c:7909
 msgid "Insert with _audio"
 msgstr ""
 
-#: src/multitrack.c:7734
+#: src/multitrack.c:7910
 msgid ""
 "Select whether video clips are inserted and moved with their audio or not"
 msgstr ""
 
-#: src/multitrack.c:7829
+#: src/multitrack.c:8007
 msgid "Select _overlap"
 msgstr ""
 
-#: src/multitrack.c:7830
+#: src/multitrack.c:8008
 msgid ""
 "Select whether timeline selection snaps to overlap between selected tracks "
 "or not"
 msgstr ""
 
-#: src/multitrack.c:7894 src/multitrack.c:14198
+#: src/multitrack.c:8073 src/multitrack.c:14422
 msgid "Expanded View (d)"
 msgstr ""
 
-#: src/multitrack.c:7897 src/multitrack.c:14205
+#: src/multitrack.c:8076 src/multitrack.c:14428
 msgid "Compact View (d)"
 msgstr ""
 
-#: src/multitrack.c:7939
+#: src/multitrack.c:8118
 msgid "Gravity: _Normal"
 msgstr ""
 
-#: src/multitrack.c:7952
+#: src/multitrack.c:8131
 msgid "Gravity: _Left"
 msgstr ""
 
-#: src/multitrack.c:7967
+#: src/multitrack.c:8146
 msgid "Gravity: _Right"
 msgstr ""
 
-#: src/multitrack.c:8297
+#: src/multitrack.c:8496
 msgid "_Apply"
 msgstr "قوللان(_A)"
 
-#: src/multitrack.c:8319
+#: src/multitrack.c:8518
 msgid "Time"
 msgstr "ۋاقىت"
 
-#: src/multitrack.c:8333
+#: src/multitrack.c:8532
 msgid "_Del. node"
 msgstr ""
 
-#: src/multitrack.c:8341
+#: src/multitrack.c:8540
 msgid "_Next node"
 msgstr ""
 
-#: src/multitrack.c:8349
+#: src/multitrack.c:8548
 msgid "_Prev node"
 msgstr ""
 
-#: src/multitrack.c:8373
+#: src/multitrack.c:8574
 msgid "_Reverse playback  "
 msgstr ""
 
-#: src/multitrack.c:8395
+#: src/multitrack.c:8596
 msgid "_Velocity  "
 msgstr ""
 
-#: src/multitrack.c:8464
+#: src/multitrack.c:8664
 msgid "Anchor _start"
 msgstr ""
 
-#: src/multitrack.c:8465
+#: src/multitrack.c:8665
 msgid "Anchor the start point to the timeline"
 msgstr ""
 
-#: src/multitrack.c:8481
-msgid "Start frame"
-msgstr ""
-
-#: src/multitrack.c:8533
+#: src/multitrack.c:8728
 msgid "Anchor _end"
 msgstr ""
 
-#: src/multitrack.c:8534
+#: src/multitrack.c:8729
 msgid "Anchor the end point to the timeline"
 msgstr ""
 
-#: src/multitrack.c:8546
-msgid "End frame"
-msgstr ""
-
-#: src/multitrack.c:8739
+#: src/multitrack.c:8929
 msgid "Scroll"
 msgstr "سىيرىش"
 
-#: src/multitrack.c:9316
+#: src/multitrack.c:9502
 msgid ""
 "\n"
 "==============================\n"
 "Switched to Clip Edit mode\n"
 msgstr ""
 
-#: src/multitrack.c:9502
+#: src/multitrack.c:9708
 msgid "Timeline (seconds)"
 msgstr ""
 
-#: src/multitrack.c:9984
+#: src/multitrack.c:10202
 msgid " Backing audio"
 msgstr ""
 
-#: src/multitrack.c:9987
+#: src/multitrack.c:10204
 #, c-format
 msgid " Layer %d audio"
 msgstr ""
 
-#: src/multitrack.c:9995
+#: src/multitrack.c:10212
 msgid "Show/hide audio details"
 msgstr ""
 
-#: src/multitrack.c:10010 src/multitrack.c:10232
+#: src/multitrack.c:10227 src/multitrack.c:10452
 #, c-format
 msgid "Layer %d audio"
 msgstr ""
 
-#: src/multitrack.c:10144 src/multitrack.c:10261
+#: src/multitrack.c:10353 src/multitrack.c:10481
 #, c-format
 msgid "%s (layer %d)"
 msgstr ""
 
-#: src/multitrack.c:10184
+#: src/multitrack.c:10403
 msgid "Select track"
 msgstr ""
 
-#: src/multitrack.c:10188
+#: src/multitrack.c:10407
 msgid "Show/hide audio"
 msgstr ""
 
-#: src/multitrack.c:10194
+#: src/multitrack.c:10413
 #, c-format
 msgid "Video %d"
 msgstr ""
 
-#: src/multitrack.c:10233
+#: src/multitrack.c:10453
 #, c-format
 msgid " %s"
 msgstr " %s"
 
-#: src/multitrack.c:10346
+#: src/multitrack.c:10574
 msgid "LiVES: Selected effect"
 msgstr ""
 
-#: src/multitrack.c:10358
+#: src/multitrack.c:10586
 msgid "_View/Edit this effect"
 msgstr ""
 
-#: src/multitrack.c:10361
+#: src/multitrack.c:10588
 msgid "_View this effect"
 msgstr ""
 
-#: src/multitrack.c:10369
+#: src/multitrack.c:10596
 msgid "_Delete this effect"
 msgstr ""
 
-#: src/multitrack.c:10422
+#: src/multitrack.c:10648
 msgid "Cannot insert after this effect"
 msgstr ""
 
-#: src/multitrack.c:10451
+#: src/multitrack.c:10677
 msgid "This effect cannot be moved"
 msgstr ""
 
-#: src/multitrack.c:10499
+#: src/multitrack.c:10724
 #, c-format
 msgid "  %d to %d selected  "
 msgstr ""
 
-#: src/multitrack.c:10502 src/multitrack.c:10746
+#: src/multitrack.c:10727 src/multitrack.c:10968
 #, c-format
 msgid "%.2f sec."
 msgstr ""
 
-#: src/multitrack.c:10717
+#: src/multitrack.c:10940
 #, c-format
 msgid "%d frames"
 msgstr ""
 
-#: src/multitrack.c:11070
+#: src/multitrack.c:11299
 msgid ""
 "\n"
 "==============================\n"
 "Switched to Multitrack mode\n"
 msgstr ""
 
-#: src/multitrack.c:12691
+#: src/multitrack.c:12939
 msgid "Drag the time slider to where you"
 msgstr ""
 
-#: src/multitrack.c:12692
+#: src/multitrack.c:12940
 msgid "want to set effect parameters"
 msgstr ""
 
-#: src/multitrack.c:12693
+#: src/multitrack.c:12941
 msgid "Set parameters, then click \"Apply\"\n"
 msgstr ""
 
-#: src/multitrack.c:12694
+#: src/multitrack.c:12942
 msgid ""
 "NODES are points where parameters\n"
 "have been set.\n"
 "Nodes can be deleted."
 msgstr ""
 
-#: src/multitrack.c:12697
+#: src/multitrack.c:12944
 msgid "Effect has no parameters.\n"
 msgstr ""
 
-#: src/multitrack.c:12788
+#: src/multitrack.c:13033
 #, c-format
 msgid "%s output"
 msgstr ""
 
-#: src/multitrack.c:12794 src/multitrack.c:12804
+#: src/multitrack.c:13038 src/multitrack.c:13046
 #, c-format
 msgid "layer %d"
 msgstr ""
 
-#: src/multitrack.c:12796 src/multitrack.c:12806
+#: src/multitrack.c:13039 src/multitrack.c:13047
 msgid "audio track"
 msgstr ""
 
-#: src/multitrack.c:12797
+#: src/multitrack.c:13040
 #, c-format
 msgid "%s to %s"
 msgstr ""
 
-#: src/multitrack.c:12807
+#: src/multitrack.c:13048
 #, c-format
 msgid "%s from %s"
 msgstr ""
 
-#: src/multitrack.c:12860
+#: src/multitrack.c:13099
 msgid "_Prev filter map"
 msgstr ""
 
-#: src/multitrack.c:12871
+#: src/multitrack.c:13110
 msgid "Insert _before"
 msgstr ""
 
-#: src/multitrack.c:12881
+#: src/multitrack.c:13120
 msgid "Insert _after"
 msgstr ""
 
-#: src/multitrack.c:12896
+#: src/multitrack.c:13134
 msgid "_Next filter map"
 msgstr ""
 
-#: src/multitrack.c:12911
+#: src/multitrack.c:13148
 msgid ""
 "\n"
 "\n"
@@ -9071,271 +9074,271 @@
 "current time.\n"
 msgstr ""
 
-#: src/multitrack.c:12929
+#: src/multitrack.c:13166
 msgid ""
 "Drag a compositor anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:12936
+#: src/multitrack.c:13173
 msgid ""
 "Drag a transition anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:12944
+#: src/multitrack.c:13181
 msgid ""
 "Effects can be dragged\n"
 "onto blocks on the timeline."
 msgstr ""
 
-#: src/multitrack.c:13166
+#: src/multitrack.c:13406
 msgid "LiVES: Selected block/frame"
 msgstr ""
 
-#: src/multitrack.c:13173
+#: src/multitrack.c:13413
 msgid "_Select this block"
 msgstr ""
 
-#: src/multitrack.c:13183
+#: src/multitrack.c:13423
 msgid "_Split block here"
 msgstr ""
 
-#: src/multitrack.c:13191
+#: src/multitrack.c:13431
 msgid "List _effects here"
 msgstr ""
 
-#: src/multitrack.c:13200 src/multitrack.c:13277
+#: src/multitrack.c:13440 src/multitrack.c:13518
 #, c-format
 msgid "_Adjust %s"
 msgstr ""
 
-#: src/multitrack.c:13215
+#: src/multitrack.c:13455
 msgid "_Delete this block"
 msgstr ""
 
-#: src/multitrack.c:13258
+#: src/multitrack.c:13500
 msgid "_Insert here"
 msgstr ""
 
-#: src/multitrack.c:13264
+#: src/multitrack.c:13505
 msgid "_Insert audio here"
 msgstr ""
 
-#: src/multitrack.c:14801
+#: src/multitrack.c:15017
 #, c-format
 msgid "Inserted gap in selected tracks from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:14835
+#: src/multitrack.c:15048
 #, c-format
 msgid "Inserted gap in track %s from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15036
+#: src/multitrack.c:15244
 #, c-format
 msgid "Undid %s\n"
 msgstr ""
 
-#: src/multitrack.c:15235
+#: src/multitrack.c:15445
 #, c-format
 msgid "Redid %s\n"
 msgstr ""
 
-#: src/multitrack.c:15268
+#: src/multitrack.c:15475
 msgid ""
 "\n"
 " (variable)"
 msgstr ""
 
-#: src/multitrack.c:15502 src/multitrack.c:15614 src/multitrack.c:18736
-#: src/multitrack.c:18748
+#: src/multitrack.c:15710 src/multitrack.c:15823 src/multitrack.c:19077
+#: src/multitrack.c:19089
 #, c-format
 msgid "track %s"
 msgstr ""
 
-#: src/multitrack.c:15507 src/multitrack.c:15619 src/multitrack.c:18741
+#: src/multitrack.c:15715 src/multitrack.c:15828 src/multitrack.c:19082
 #, c-format
 msgid "tracks %s and %s"
 msgstr ""
 
-#: src/multitrack.c:15513 src/multitrack.c:15625 src/multitrack.c:18751
+#: src/multitrack.c:15721 src/multitrack.c:15834 src/multitrack.c:19091
 msgid "selected tracks"
 msgstr ""
 
-#: src/multitrack.c:15516
+#: src/multitrack.c:15726
 #, c-format
 msgid "Added %s %s to %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15550
+#: src/multitrack.c:15760
 #, c-format
 msgid "Added effect %s to track %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15631
+#: src/multitrack.c:15845
 #, c-format
 msgid "Deleted %s %s from %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15935
+#: src/multitrack.c:16143
 #, c-format
 msgid "rendered %d frames to new clip.\n"
 msgstr ""
 
-#: src/multitrack.c:16025
+#: src/multitrack.c:16230
 msgid "Cleaning up..."
 msgstr "تازىلاۋاتىدۇ…"
 
-#: src/multitrack.c:16712
+#: src/multitrack.c:17003
 msgid "_Pause"
 msgstr "ۋاقىتلىق توختا(_P)"
 
-#: src/multitrack.c:16713
+#: src/multitrack.c:17004
 msgid "Pause (p)"
 msgstr ""
 
-#: src/multitrack.c:16856
+#: src/multitrack.c:17151
 msgid "Press 'm' during playback"
 msgstr ""
 
-#: src/multitrack.c:16857
+#: src/multitrack.c:17152
 msgid "to make a mark on the timeline"
 msgstr ""
 
-#: src/multitrack.c:17154
+#: src/multitrack.c:17498
 #, c-format
 msgid ""
 "Inserted audio %.4f to %.4f from clip %s into backing audio from time %.4f "
 "to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:17414
+#: src/multitrack.c:17759
 #, c-format
 msgid ""
 "Inserted frames %d to %d from clip %s into track %s from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:17998
+#: src/multitrack.c:18332
 #, c-format
 msgid ""
 "Time region %.3f to %.3f\n"
 "selected.\n"
 msgstr ""
 
-#: src/multitrack.c:18002
+#: src/multitrack.c:18336
 msgid ""
 "select one or more tracks\n"
 "to create a region.\n"
 msgstr ""
 
-#: src/multitrack.c:18004
+#: src/multitrack.c:18337
 #, c-format
 msgid "%d video tracks selected.\n"
 msgstr ""
 
-#: src/multitrack.c:18006
+#: src/multitrack.c:18339
 msgid ""
 "Double click on timeline\n"
 "to deselect time region."
 msgstr ""
 
-#: src/multitrack.c:18013
+#: src/multitrack.c:18346
 msgid ""
 "Single click on an effect\n"
 "to select it."
 msgstr ""
 
-#: src/multitrack.c:18014
+#: src/multitrack.c:18347
 msgid ""
 "Double click on an effect\n"
 "to edit it."
 msgstr ""
 
-#: src/multitrack.c:18015
+#: src/multitrack.c:18348
 msgid ""
 "Right click on an effect\n"
 "for context menu.\n"
 msgstr ""
 
-#: src/multitrack.c:18017
+#: src/multitrack.c:18350
 msgid ""
 "Effect order can be changed at\n"
 "FILTER MAPS"
 msgstr ""
 
-#: src/multitrack.c:18024
+#: src/multitrack.c:18357
 msgid ""
 "You can select an effect,\n"
 "then use the INSERT BEFORE"
 msgstr ""
 
-#: src/multitrack.c:18025
+#: src/multitrack.c:18358
 msgid "or INSERT AFTER buttons to move it."
 msgstr ""
 
-#: src/multitrack.c:18307 src/multitrack.c:18320
+#: src/multitrack.c:18639 src/multitrack.c:18652
 msgid "Click on another effect,"
 msgstr ""
 
-#: src/multitrack.c:18308 src/multitrack.c:18321
+#: src/multitrack.c:18640 src/multitrack.c:18653
 msgid ""
 "and the selected one\n"
 "will be inserted"
 msgstr ""
 
-#: src/multitrack.c:18309
+#: src/multitrack.c:18641
 msgid "after it.\n"
 msgstr ""
 
-#: src/multitrack.c:18322
+#: src/multitrack.c:18654
 msgid "before it.\n"
 msgstr ""
 
-#: src/multitrack.c:18551
+#: src/multitrack.c:18889
 #, c-format
 msgid "Removed parameter values for effect %s at time %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:18759
+#: src/multitrack.c:19100
 #, c-format
 msgid "Set parameter values for %s %s on %s at time %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:19251 src/multitrack.c:20873
+#: src/multitrack.c:19630 src/multitrack.c:21195
 msgid "_Autoreload each time"
 msgstr ""
 
-#: src/multitrack.c:19323
+#: src/multitrack.c:19702
 msgid "Saving layout"
 msgstr ""
 
-#: src/multitrack.c:19345
+#: src/multitrack.c:19725
 #, c-format
 msgid "Saved layout to %s\n"
 msgstr ""
 
-#: src/multitrack.c:20783
+#: src/multitrack.c:21125
 msgid "clips and frames"
 msgstr ""
 
-#: src/multitrack.c:20787
+#: src/multitrack.c:21128
 msgid "clips"
 msgstr ""
 
-#: src/multitrack.c:20790
+#: src/multitrack.c:21130
 msgid "frames"
 msgstr "كاندۇك"
 
-#: src/multitrack.c:20800
+#: src/multitrack.c:21140
 msgid ""
 "\n"
 "Auto reload layout.\n"
 msgstr ""
 
-#: src/multitrack.c:20803
+#: src/multitrack.c:21143
 #, c-format
 msgid ""
 "%s\n"
@@ -9343,100 +9346,100 @@
 "Therefore it could not be loaded properly.\n"
 msgstr ""
 
-#: src/multitrack.c:20920
+#: src/multitrack.c:21284
 msgid "auto backup"
 msgstr ""
 
-#: src/multitrack.c:20923
+#: src/multitrack.c:21287
 #, c-format
 msgid ""
 "\n"
 "Unable to load layout file %s\n"
 msgstr ""
 
-#: src/multitrack.c:20944
+#: src/multitrack.c:21308
 #, c-format
 msgid "Loading layout from %s..."
 msgstr ""
 
-#: src/multitrack.c:20978
+#: src/multitrack.c:21338
 #, c-format
 msgid "Got %d events...processing..."
 msgstr ""
 
-#: src/multitrack.c:20991
+#: src/multitrack.c:21349
 msgid "Checking and rebuilding event list"
 msgstr ""
 
-#: src/multitrack.c:21017
+#: src/multitrack.c:21374
 #, c-format
 msgid "%d errors detected.\n"
 msgstr ""
 
-#: src/multitrack.c:21068
+#: src/multitrack.c:21422
 #, c-format
 msgid "Multitrack fps set to %.3f\n"
 msgstr ""
 
-#: src/multitrack.c:21225
+#: src/multitrack.c:21576
 msgid ""
 "The current layout has changes which have not been saved.\n"
 "Are you sure you wish to wipe it ?\n"
 msgstr ""
 
-#: src/multitrack.c:22047
+#: src/multitrack.c:22385
 msgid "LiVES: Multitrack audio mixer"
 msgstr ""
 
-#: src/multitrack.c:22077
+#: src/multitrack.c:22414
 msgid "_Reset values"
 msgstr ""
 
-#: src/multitrack.c:22081
+#: src/multitrack.c:22418
 msgid "_Close mixer"
 msgstr ""
 
-#: src/multitrack.c:22130
+#: src/multitrack.c:22466
 msgid ""
 "_Invert backing audio\n"
 "and layer volumes"
 msgstr ""
 
-#: src/multitrack.c:22132
+#: src/multitrack.c:22468
 msgid "Adjust backing and layer audio values so that they sum to 1.0"
 msgstr ""
 
-#: src/multitrack.c:22175
+#: src/multitrack.c:22510
 msgid "_Gang layer audio"
 msgstr ""
 
-#: src/multitrack.c:22177
+#: src/multitrack.c:22512
 msgid "Adjust all layer audio values to the same value"
 msgstr ""
 
-#: src/jack.c:104
+#: src/jack.c:102
 msgid "JACK server started\n"
 msgstr ""
 
-#: src/jack.c:1284 src/jack.c:1353
+#: src/jack.c:1265 src/jack.c:1334
 msgid "Unable to connect to JACK server\n"
 msgstr ""
 
-#: src/jack.c:1512
+#: src/jack.c:1491
 msgid "Started jack audio subsystem.\n"
 msgstr ""
 
-#: src/jack.c:1623
+#: src/jack.c:1600
 msgid "Started jack audio reader.\n"
 msgstr ""
 
-#: src/jack.c:1838
+#: src/jack.c:1815
 msgid ""
 "\n"
 "Connection to jack audio was reset.\n"
 msgstr ""
 
-#: src/pulse.c:87
+#: src/pulse.c:88
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -9444,7 +9447,7 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:92
+#: src/pulse.c:94
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -9452,7 +9455,7 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:96
+#: src/pulse.c:99
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -9460,335 +9463,335 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:101
+#: src/pulse.c:104
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
 msgstr ""
 
-#: src/pulse.c:107
+#: src/pulse.c:109
 msgid "LiVES will exit and you can choose another audio player.\n"
 msgstr ""
 
-#: src/pulse.c:1352
+#: src/pulse.c:1335
 msgid ""
 "\n"
 "Connection to pulse audio was reset.\n"
 msgstr ""
 
-#: src/colourspace.c:1100
+#: src/colourspace.c:1092
 msgid "unclamped"
 msgstr ""
 
-#: src/colourspace.c:1101
+#: src/colourspace.c:1093
 msgid "clamped"
 msgstr ""
 
-#: src/omc-learn.c:195
+#: src/omc-learn.c:191
 #, c-format
 msgid "Responding to joystick events from %s\n"
 msgstr ""
 
-#: src/omc-learn.c:289
+#: src/omc-learn.c:279
 msgid "Creating ALSA seq port..."
 msgstr ""
 
-#: src/omc-learn.c:325
+#: src/omc-learn.c:313
 #, c-format
 msgid "Responding to MIDI events from %s\n"
 msgstr ""
 
-#: src/omc-learn.c:568
+#: src/omc-learn.c:554
 msgid "data"
 msgstr ""
 
-#: src/omc-learn.c:571
+#: src/omc-learn.c:557
 msgid "velocity"
 msgstr "تېزلىك"
 
-#: src/omc-learn.c:572
+#: src/omc-learn.c:558
 msgid "note"
 msgstr "ئىزاھ"
 
-#: src/omc-learn.c:574 src/omc-learn.c:736 src/omc-learn.c:1105
-#: src/omc-learn.c:1591 src/omc-learn.c:1640
+#: src/omc-learn.c:560 src/omc-learn.c:724 src/omc-learn.c:1092
+#: src/omc-learn.c:1581 src/omc-learn.c:1630
 msgid "value"
 msgstr "قىممىتى"
 
-#: src/omc-learn.c:576
+#: src/omc-learn.c:562
 msgid "state"
 msgstr ""
 
-#: src/omc-learn.c:688
+#: src/omc-learn.c:674
 msgid "variable"
 msgstr "ئۆزگەرگۈچى"
 
-#: src/omc-learn.c:1001
+#: src/omc-learn.c:989
 msgid "Vars."
 msgstr ""
 
-#: src/omc-learn.c:1054
+#: src/omc-learn.c:1041
 #, c-format
 msgid "MIDI ch %d note on"
 msgstr ""
 
-#: src/omc-learn.c:1058
+#: src/omc-learn.c:1045
 #, c-format
 msgid "MIDI ch %d note off"
 msgstr ""
 
-#: src/omc-learn.c:1062
+#: src/omc-learn.c:1049
 #, c-format
 msgid "MIDI ch %d controller %d"
 msgstr ""
 
-#: src/omc-learn.c:1066
+#: src/omc-learn.c:1053
 #, c-format
 msgid "MIDI ch %d pitch bend"
 msgstr ""
 
-#: src/omc-learn.c:1070
+#: src/omc-learn.c:1057
 #, c-format
 msgid "MIDI ch %d pgm change"
 msgstr ""
 
-#: src/omc-learn.c:1073
+#: src/omc-learn.c:1060
 #, c-format
 msgid "Joystick button %d"
 msgstr ""
 
-#: src/omc-learn.c:1076
+#: src/omc-learn.c:1063
 #, c-format
 msgid "Joystick axis %d"
 msgstr ""
 
-#: src/omc-learn.c:1113
+#: src/omc-learn.c:1100
 msgid "x"
 msgstr "x"
 
-#: src/omc-learn.c:1122
+#: src/omc-learn.c:1109
 msgid "range"
 msgstr ""
 
-#: src/omc-learn.c:1143
+#: src/omc-learn.c:1130
 msgid "+ offset1"
 msgstr ""
 
-#: src/omc-learn.c:1161
+#: src/omc-learn.c:1150
 msgid "* scale"
 msgstr ""
 
-#: src/omc-learn.c:1179
+#: src/omc-learn.c:1170
 msgid "+ offset2"
 msgstr ""
 
-#: src/omc-learn.c:1280
+#: src/omc-learn.c:1270
 msgid ""
 "\n"
 "Click OK to delete all entries\n"
 msgstr ""
 
-#: src/omc-learn.c:1318
+#: src/omc-learn.c:1308
 msgid "LiVES: OMC learner"
 msgstr ""
 
-#: src/omc-learn.c:1334
+#: src/omc-learn.c:1324
 msgid "Clear _unmatched"
 msgstr ""
 
-#: src/omc-learn.c:1345
+#: src/omc-learn.c:1335
 msgid "_Delete all"
 msgstr ""
 
-#: src/omc-learn.c:1411
+#: src/omc-learn.c:1401
 msgid "Start video playback"
 msgstr ""
 
-#: src/omc-learn.c:1414
+#: src/omc-learn.c:1404
 msgid "Stop video playback"
 msgstr ""
 
-#: src/omc-learn.c:1418
+#: src/omc-learn.c:1408
 msgid "Clip select <clipnum>"
 msgstr ""
 
-#: src/omc-learn.c:1419
+#: src/omc-learn.c:1409
 msgid "Switch foreground clip to the nth valid clip"
 msgstr ""
 
-#: src/omc-learn.c:1423
+#: src/omc-learn.c:1413
 msgid "Play forwards"
 msgstr ""
 
-#: src/omc-learn.c:1424
+#: src/omc-learn.c:1414
 msgid "Play video in a forwards direction"
 msgstr ""
 
-#: src/omc-learn.c:1427
+#: src/omc-learn.c:1417
 msgid "Play backwards"
 msgstr ""
 
-#: src/omc-learn.c:1428
+#: src/omc-learn.c:1418
 msgid "Play video in a backwards direction"
 msgstr ""
 
-#: src/omc-learn.c:1431
+#: src/omc-learn.c:1421
 msgid "Reverse playback direction"
 msgstr ""
 
-#: src/omc-learn.c:1432
+#: src/omc-learn.c:1422
 msgid "Reverse direction of video playback"
 msgstr ""
 
-#: src/omc-learn.c:1435
+#: src/omc-learn.c:1425
 msgid "Play video faster"
 msgstr ""
 
-#: src/omc-learn.c:1436
+#: src/omc-learn.c:1426
 msgid "Play video at a slightly faster rate"
 msgstr ""
 
-#: src/omc-learn.c:1439
+#: src/omc-learn.c:1429
 msgid "Play video slower"
 msgstr ""
 
-#: src/omc-learn.c:1440
+#: src/omc-learn.c:1430
 msgid "Play video at a slightly slower rate"
 msgstr ""
 
-#: src/omc-learn.c:1443
+#: src/omc-learn.c:1433
 msgid "Toggle video freeze"
 msgstr ""
 
-#: src/omc-learn.c:1444
+#: src/omc-learn.c:1434
 msgid "Freeze video, or if already frozen, unfreeze it"
 msgstr ""
 
-#: src/omc-learn.c:1447
+#: src/omc-learn.c:1437
 msgid "Set video framerate to <fps>"
 msgstr ""
 
-#: src/omc-learn.c:1448
+#: src/omc-learn.c:1438
 msgid "Set framerate of foreground clip to <float fps>"
 msgstr ""
 
-#: src/omc-learn.c:1452
+#: src/omc-learn.c:1442
 msgid "Start recording"
 msgstr ""
 
-#: src/omc-learn.c:1455
+#: src/omc-learn.c:1445
 msgid "Stop recording"
 msgstr ""
 
-#: src/omc-learn.c:1458
+#: src/omc-learn.c:1448
 msgid "Toggle recording state"
 msgstr ""
 
-#: src/omc-learn.c:1461
+#: src/omc-learn.c:1451
 msgid "Swap foreground and background clips"
 msgstr ""
 
-#: src/omc-learn.c:1463
+#: src/omc-learn.c:1453
 msgid "Reset effect keys"
 msgstr ""
 
-#: src/omc-learn.c:1464
+#: src/omc-learn.c:1454
 msgid "Switch all effects off."
 msgstr ""
 
-#: src/omc-learn.c:1467
+#: src/omc-learn.c:1457
 msgid "Enable effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1471
+#: src/omc-learn.c:1461
 msgid "Disable effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1475
+#: src/omc-learn.c:1465
 msgid "Toggle effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1479
+#: src/omc-learn.c:1469
 msgid "Set parameter value <key> <pnum> = <value>"
 msgstr ""
 
-#: src/omc-learn.c:1480
+#: src/omc-learn.c:1470
 msgid "Set <value> of pth (numerical) parameter for effect key <key>."
 msgstr ""
 
-#: src/omc-learn.c:1484
+#: src/omc-learn.c:1474
 msgid "Switch foreground to next clip"
 msgstr ""
 
-#: src/omc-learn.c:1487
+#: src/omc-learn.c:1477
 msgid "Switch foreground to previous clip"
 msgstr ""
 
-#: src/omc-learn.c:1490
+#: src/omc-learn.c:1480
 msgid "Set video framerate to ratio <fps_ratio>"
 msgstr ""
 
-#: src/omc-learn.c:1491
+#: src/omc-learn.c:1481
 msgid "Set framerate ratio of foreground clip to <float fps_ratio>"
 msgstr ""
 
-#: src/omc-learn.c:1495
+#: src/omc-learn.c:1485
 msgid "Retrigger clip <clipnum>"
 msgstr ""
 
-#: src/omc-learn.c:1496
+#: src/omc-learn.c:1486
 msgid ""
 "Switch foreground clip to the nth valid clip, and reset the frame number"
 msgstr ""
 
-#: src/omc-learn.c:1500
+#: src/omc-learn.c:1490
 msgid "Cycle to next mode for effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1504
+#: src/omc-learn.c:1494
 msgid "Cycle to previous mode for effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1508
+#: src/omc-learn.c:1498
 msgid "Set playback plugin parameter value <pnum> = <value>"
 msgstr ""
 
-#: src/omc-learn.c:1509
+#: src/omc-learn.c:1499
 msgid "Set <value> of pth parameter for the playback plugin."
 msgstr ""
 
 #. TRANSLATORS: short form of "clip number"
-#: src/omc-learn.c:1536 src/omc-learn.c:1607
+#: src/omc-learn.c:1526 src/omc-learn.c:1597
 msgid "clipnum"
 msgstr ""
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1545
+#: src/omc-learn.c:1535
 msgid "fps"
 msgstr "fps"
 
 #. TRANSLATORS: as in keyboard key
-#: src/omc-learn.c:1553 src/omc-learn.c:1560 src/omc-learn.c:1567
-#: src/omc-learn.c:1575 src/omc-learn.c:1615 src/omc-learn.c:1623
+#: src/omc-learn.c:1543 src/omc-learn.c:1550 src/omc-learn.c:1557
+#: src/omc-learn.c:1565 src/omc-learn.c:1605 src/omc-learn.c:1613
 msgid "key"
 msgstr "ئاچقۇچ"
 
 #. TRANSLATORS: short form of "parameter number"
-#: src/omc-learn.c:1583 src/omc-learn.c:1632
+#: src/omc-learn.c:1573 src/omc-learn.c:1622
 msgid "pnum"
 msgstr ""
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1599
+#: src/omc-learn.c:1589
 msgid "fps_ratio"
 msgstr ""
 
-#: src/omc-learn.c:2443
+#: src/omc-learn.c:2417
 #, c-format
 msgid "Saving device mapping to file %s..."
 msgstr ""
 
-#: src/omc-learn.c:2527
+#: src/omc-learn.c:2498
 #, c-format
 msgid ""
 "\n"
@@ -9797,7 +9800,7 @@
 "%s\n"
 msgstr ""
 
-#: src/omc-learn.c:2534
+#: src/omc-learn.c:2505
 #, c-format
 msgid ""
 "\n"
@@ -9806,12 +9809,12 @@
 "%s\n"
 msgstr ""
 
-#: src/omc-learn.c:2571
+#: src/omc-learn.c:2541
 #, c-format
 msgid "Loading device mapping from file %s..."
 msgstr ""
 
-#: src/omc-learn.c:2576
+#: src/omc-learn.c:2544
 #, c-format
 msgid ""
 "\n"
@@ -9821,12 +9824,12 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/videodev.c:547
+#: src/videodev.c:539
 #, c-format
 msgid "Unable to open device %s\n"
 msgstr ""
 
-#: src/videodev.c:564
+#: src/videodev.c:554
 #, c-format
 msgid "Opened device %s\n"
 msgstr ""
@@ -10598,6 +10601,9 @@
 #~ msgid "$error"
 #~ msgstr "$error"
 
+#~ msgid "Pause"
+#~ msgstr "ۋاقىتلىق توختا"
+
 #, fuzzy
 #~ msgid "_Open"
 #~ msgstr "ئاچ(_O)…"

LiVES-2.2.8.tar.bz2/po/uk.po -> LiVES-2.4.1.tar.bz2/po/uk.po Changed

@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n"
-"POT-Creation-Date: 2015-02-08 17:18-0300\n"
+"POT-Creation-Date: 2015-08-09 14:52-0300\n"
 "PO-Revision-Date: 2013-12-13 17:20+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@gmail.com>\n"
 "Language-Team: Ukrainian <translation@linux.org.ua>\n"
@@ -19,8 +19,7 @@
 "X-Launchpad-Export-Date: 2014-04-13 13:12+0000\n"
 "X-Generator: Launchpad (build 16976)\n"
 
-#. TRANSLATORS: do not translate this message
-#: src/main.c:118
+#: src/main.c:128
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -34,22 +33,22 @@
 "All translators should read the LiVES translation notes at\n"
 "http://lives.sourceforge.net/TRANS-README.txt"
 
-#: src/main.c:134
+#: src/main.c:153
 #, c-format
 msgid "%s Warning: %s\n"
 msgstr "%s, попередження: %s\n"
 
-#: src/main.c:138
+#: src/main.c:157
 #, c-format
 msgid "%s Critical error: %s\n"
 msgstr "%s, критична помилка: %s\n"
 
-#: src/main.c:139
+#: src/main.c:158
 #, c-format
 msgid "%s Fatal error: %s\n"
 msgstr "%s, аварія: %s\n"
 
-#: src/main.c:176
+#: src/main.c:198
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -63,7 +62,7 @@
 "group_id=64341&atid=507139\n"
 "Дякуємо. Відновити дані можна буде після перезапуску LiVES.\n"
 
-#: src/main.c:177
+#: src/main.c:199
 msgid ""
 "\n"
 "\n"
@@ -75,7 +74,7 @@
 "Будь ласка, у повідомленнях про помилки у програмі вказуйте назву вашої "
 "операційної системи, дистрибутива та номер версії LiVES ("
 
-#: src/main.c:180
+#: src/main.c:203
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -83,7 +82,7 @@
 "а також дані, наведені нижче:\n"
 "\n"
 
-#: src/main.c:184
+#: src/main.c:206
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
@@ -93,83 +92,83 @@
 "зібрати більше даних.\n"
 "\n"
 
-#: src/main.c:192
+#: src/main.c:216
 msgid "Preserving set.\n"
 msgstr "Збереження набору.\n"
 
-#: src/main.c:636
+#: src/main.c:691
 msgid "Resizing"
 msgstr "Зміна розміру"
 
-#: src/main.c:643
+#: src/main.c:698
 msgid "_Resize All Frames"
 msgstr "_Змінити розміри всіх кадрів"
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:895
+#: src/main.c:948
 msgid "Any"
 msgstr "Будь-який"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:897
+#: src/main.c:950
 msgid "None"
 msgstr "Жодного"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:899
+#: src/main.c:952
 msgid "recommended"
 msgstr "найліпший"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:901
+#: src/main.c:954
 msgid "disabled !"
 msgstr "вимкнено!"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:903
+#: src/main.c:956
 msgid "**The current layout**"
 msgstr "**Поточне компонування**"
 
 #. TRANSLATORS: adjective for "Built in" type effects
-#: src/main.c:905
+#: src/main.c:958
 msgid "Builtin"
 msgstr "Вбудований"
 
 #. TRANSLATORS: adjective for "Custom" type effects
-#: src/main.c:907
+#: src/main.c:960
 msgid "Custom"
 msgstr "Нетиповий"
 
 #. TRANSLATORS: adjective for "Test" type effects
-#: src/main.c:909
+#: src/main.c:962
 msgid "Test"
 msgstr "Перевірити"
 
-#: src/main.c:1054
+#: src/main.c:1107
 msgid "Foreground"
 msgstr "Передній план"
 
-#: src/main.c:1055
+#: src/main.c:1108
 msgid "Background"
 msgstr "Тло"
 
-#: src/main.c:1566
+#: src/main.c:1624
 msgid "Loading realtime effect plugins..."
 msgstr "Завантаження додатків ефектів реального часу…"
 
-#: src/main.c:1631
+#: src/main.c:1690
 msgid "Starting jack audio server..."
 msgstr "Запуск звукового сервера jack…"
 
-#: src/main.c:1633
+#: src/main.c:1692
 msgid "Starting jack transport server..."
 msgstr "Запуск сервера передавання даних jack…"
 
-#: src/main.c:1634
+#: src/main.c:1693
 msgid "Connecting to jack transport server..."
 msgstr "Встановлення з’єднання з сервером передавання даних jack…"
 
-#: src/main.c:1663
+#: src/main.c:1723
 #, c-format
 msgid ""
 "\n"
@@ -188,114 +187,114 @@
 "\n"
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 
-#: src/main.c:1697
+#: src/main.c:1758
 msgid "Starting pulse audio server..."
 msgstr "Запуск звукового сервера PulseAudio…"
 
-#: src/main.c:1765
+#: src/main.c:1825
 msgid "Checking optional dependencies:"
 msgstr "Пошук додаткових залежностей:"
 
-#: src/main.c:1766
+#: src/main.c:1826
 msgid "mplayer...detected..."
 msgstr "mplayer… виявлено…"
 
-#: src/main.c:1767
+#: src/main.c:1827
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer…НЕ ВИЯВЛЕНО…"
 
-#: src/main.c:1768
+#: src/main.c:1828
 #, fuzzy
 msgid "mplayer2...detected..."
 msgstr "mplayer… виявлено…"
 
-#: src/main.c:1769
+#: src/main.c:1829
 #, fuzzy
 msgid "mplayer2...NOT DETECTED..."
 msgstr "mplayer…НЕ ВИЯВЛЕНО…"
 
-#: src/main.c:1770
+#: src/main.c:1830
 msgid "convert...detected..."
 msgstr "convert…виявлено…"
 
-#: src/main.c:1771
+#: src/main.c:1831
 msgid "convert...NOT DETECTED..."
 msgstr "convert...НЕ ВИЯВЛЕНО…"
 
-#: src/main.c:1772
+#: src/main.c:1832
 msgid "composite...detected..."
 msgstr "composite…виявлено…"
 
-#: src/main.c:1773
+#: src/main.c:1833
 msgid "composite...NOT DETECTED..."
 msgstr "composite…НЕ ВИЯВЛЕНО…"
 
-#: src/main.c:1774
+#: src/main.c:1834
 msgid "sox...detected\n"
 msgstr "sox…виявлено\n"
 
-#: src/main.c:1775
+#: src/main.c:1835
 msgid "sox...NOT DETECTED\n"
 msgstr "sox…НЕ ВИЯВЛЕНО\n"
 
-#: src/main.c:1776
+#: src/main.c:1836
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...виявлено..."
 
-#: src/main.c:1777
+#: src/main.c:1837
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...НЕ ВИЯВЛЕНО..."
 
-#: src/main.c:1778
+#: src/main.c:1838
 msgid "jackd...detected..."
 msgstr "jackd…виявлено…"
 
-#: src/main.c:1779
+#: src/main.c:1839
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd…НЕ ВИЯВЛЕНО…"
 
-#: src/main.c:1780
+#: src/main.c:1840
 msgid "pulse audio...detected..."
 msgstr "pulse audio…виявлено…"
 
-#: src/main.c:1781
+#: src/main.c:1841
 msgid "pulse audio...NOT DETECTED..."
 msgstr "pulse audio…НЕ ВИЯВЛЕНО…"
 
-#: src/main.c:1782
+#: src/main.c:1842
 msgid "python...detected..."
 msgstr "python…виявлено…"
 
-#: src/main.c:1783
+#: src/main.c:1843
 msgid "python...NOT DETECTED..."
 msgstr "python…НЕ ВИЯВЛЕНО…"
 
-#: src/main.c:1784
+#: src/main.c:1844
 msgid "dvgrab...detected..."
 msgstr "dvgrab…виявлено…"
 
-#: src/main.c:1785
+#: src/main.c:1845
 msgid "dvgrab...NOT DETECTED..."
 msgstr "dvgrab…НЕ ВИЯВЛЕНО…"
 
-#: src/main.c:1786
+#: src/main.c:1846
 msgid "xwininfo...detected..."
 msgstr "xwininfo…виявлено…"
 
-#: src/main.c:1787
+#: src/main.c:1847
 msgid "xwininfo...NOT DETECTED..."
 msgstr "xwininfo…НЕ ВИЯВЛЕНО…"
 
-#: src/main.c:1793
+#: src/main.c:1853
 #, c-format
 msgid "Windows version %04X"
 msgstr "Версія Windows %04X"
 
-#: src/main.c:1795
+#: src/main.c:1855
 msgid "UNKNOWN - please patch me !"
 msgstr "НЕВІДОМИЙ — будь ласка, накладіть латку!"
 
-#: src/main.c:1799
+#: src/main.c:1859
 #, c-format
 msgid ""
 "\n"
@@ -306,48 +305,48 @@
 "\n"
 "Інструмент керування вікнами — «%s»; "
 
-#: src/main.c:1802
+#: src/main.c:1862
 #, c-format
 msgid "number of monitors detected: %d\n"
 msgstr "виявлена кількість моніторів: %d\n"
 
-#: src/main.c:1805
+#: src/main.c:1865
 #, c-format
 msgid "Number of CPUs detected: %d "
 msgstr "Кількість виявлених процесорів: %d "
 
-#: src/main.c:1808 src/multitrack.c:4902
+#: src/main.c:1868 src/multitrack.c:5068
 msgid "little endian"
 msgstr "little endian"
 
-#: src/main.c:1809 src/multitrack.c:4901
+#: src/main.c:1869 src/multitrack.c:5067
 msgid "big endian"
 msgstr "big endian"
 
-#: src/main.c:1810
+#: src/main.c:1870
 #, c-format
 msgid "(%d bits, %s)\n"
 msgstr "(%d-бітова, %s)\n"
 
-#: src/main.c:1814
+#: src/main.c:1874
 msgid "GUI type is: "
 msgstr "Тип графічного інтерфейсу: "
 
-#: src/main.c:1818
+#: src/main.c:1878
 #, c-format
 msgid "GTK+ version %d.%d.%d (compiled with %d.%d.%d)"
 msgstr "Версія GTK+ %d.%d.%d (зібрано з %d.%d.%d)"
 
-#: src/main.c:1840
+#: src/main.c:1900
 msgid ", with cairo support"
 msgstr ", з підтримкою cairo"
 
-#: src/main.c:1847
+#: src/main.c:1907
 #, c-format
 msgid "Temp directory is %s\n"
 msgstr "Каталог тимчасових файлів — %s\n"
 
-#: src/main.c:1851
+#: src/main.c:1911
 msgid ""
 "WARNING - this version of LiVES was compiled without either\n"
 "jack or pulse audio support.\n"
@@ -357,15 +356,15 @@
 "jack або PulseAudio.\n"
 "Ви не зможете скористатися багатьма можливостями з обробки звуку.\n"
 
-#: src/main.c:1854
+#: src/main.c:1914
 msgid "Compiled with jack support, good !\n"
 msgstr "Зібрано з підтримкою jack, добре!\n"
 
-#: src/main.c:1857
+#: src/main.c:1917
 msgid "Compiled with pulse audio support, wonderful !\n"
 msgstr "Зібрано з підтримкою PulseAudio, чудово!\n"
 
-#: src/main.c:1861
+#: src/main.c:1921
 #, c-format
 msgid ""
 "Welcome to LiVES version %s.\n"
@@ -374,7 +373,7 @@
 "Вітаємо у LiVES версії %s.\n"
 "\n"
 
-#: src/main.c:2306
+#: src/main.c:2380
 #, c-format
 msgid ""
 "\n"
@@ -384,83 +383,89 @@
 "Синтаксис команди запуску: %s [параметри] [назва файла [початок_за_часом] "
 "[кількість кадрів]]\n"
 
-#: src/main.c:2307
+#: src/main.c:2381
 msgid "Where: filename is the name of a media file or backup file.\n"
 msgstr ""
 "де «назва файла» — назва файла мультимедійних даних або резервної копії.\n"
 
-#: src/main.c:2308
+#: src/main.c:2382
 msgid "start_time : filename start time in seconds\n"
 msgstr ""
 "початок_за_часом: початок за часом у файлі з вказаною назвою у секундах\n"
 
-#: src/main.c:2309
+#: src/main.c:2383
 msgid "frames : maximum number of frames to open\n"
 msgstr "кількість кадрів: максимальна кількість кадрів, які слід відкрити\n"
 
-#: src/main.c:2311
+#: src/main.c:2385
 msgid "opts can be:\n"
 msgstr "параметри можуть бути такими:\n"
 
-#: src/main.c:2312
+#: src/main.c:2386
 msgid "-help            : show this help text and exit\n"
 msgstr "-help               : показати текст цієї довідки і завершити роботу\n"
 
-#: src/main.c:2313
+#: src/main.c:2387
 msgid "-tmpdir <tempdir>: use alternate working directory (e.g /var/ramdisk)\n"
 msgstr ""
 "-tmpdir <тимч. каталог>: використовувати інший робочий каталог (наприклад /"
 "var/ramdisk)\n"
 
-#: src/main.c:2314
+#: src/main.c:2388
 msgid "-set <setname>   : autoload clip set setname\n"
 msgstr ""
 "-set <назва_набору> : автоматично завантажити набір кліпів з вказаною "
 "назвою\n"
 
-#: src/main.c:2315
+#: src/main.c:2389
 msgid "-noset           : do not load any set on startup\n"
 msgstr "-noset              : не завантажувати жодного набору після запуску\n"
 
-#: src/main.c:2316
+#: src/main.c:2390
 msgid "-norecover       : force no-loading of crash recovery\n"
 msgstr ""
 "-norecover          : не завантажувати відновлені дані під час перезапуску "
 "після аварії\n"
 
-#: src/main.c:2317
+#: src/main.c:2391
 msgid "-recover         : force loading of crash recovery\n"
 msgstr ""
 "-recover            : завантажити відновлені дані під час перезапуску після "
 "аварії\n"
 
-#: src/main.c:2318
-msgid "-nothreaddialog  : doe nothing - retained for backwards compatibility\n"
+#: src/main.c:2392
+#, fuzzy
+msgid ""
+"-nothreaddialog  : does nothing - retained for backwards compatibility\n"
 msgstr ""
 "-nothreaddialog  : нічого не робити — залишено з міркувань зворотної "
 "сумісності\n"
 
-#: src/main.c:2319
+#: src/main.c:2393
 msgid "-nogui           : do not show the gui\n"
 msgstr "-nogui              : не показувати графічного інтерфейсу\n"
 
-#: src/main.c:2320
+#: src/main.c:2394
 msgid "-nosplash        : do not show the splash window\n"
 msgstr "-nosplash        : не показувати вікна вітання\n"
 
-#: src/main.c:2321
+#: src/main.c:2395
 msgid "-noplaywin       : do not show the play window\n"
 msgstr "-noplaywin       : не показувати вікна відтворення\n"
 
-#: src/main.c:2322
+#: src/main.c:2396
+msgid "-noninteractive  : disable menu interactivity\n"
+msgstr ""
+
+#: src/main.c:2397
 msgid "-startup-ce      : start in clip editor mode\n"
 msgstr "-startup-ce      : запустити у режимі редактора кліпів\n"
 
-#: src/main.c:2323
+#: src/main.c:2398
 msgid "-startup-mt      : start in multitrack mode\n"
 msgstr "-startup-mt      : запустити у режимі роботи з декількома доріжками\n"
 
-#: src/main.c:2324
+#: src/main.c:2399
 msgid ""
 "-fxmodesmax <n>  : allow <n> modes per effect key (minimum is 1, default is "
 "8)\n"
@@ -468,17 +473,17 @@
 "-fxmodesmax <n>  : надати змогу використовувати <n> режимів на клавішу "
 "ефекту (мінімальне значення — 1, типове — 8)\n"
 
-#: src/main.c:2326
+#: src/main.c:2401
 msgid "-oscstart <port> : start OSC listener on UDP port <port>\n"
 msgstr ""
 "-oscstart <порт>    : запустити програму очікування на дані OSC на вказаному "
 "порті UDP\n"
 
-#: src/main.c:2327
+#: src/main.c:2402
 msgid "-nooscstart      : do not start OSC listener\n"
 msgstr "-nooscstart         : не запускати програми очікування на дані OSC\n"
 
-#: src/main.c:2329
+#: src/main.c:2404
 #, fuzzy
 msgid ""
 "-aplayer <ap>    : start with selected audio player. <ap> can be mplayer, "
@@ -488,15 +493,15 @@
 "Програвачем <ap> може бути, наприклад, mplayer"
 
 #. TRANSLATORS: pulse (audio)
-#: src/main.c:2332
+#: src/main.c:2407
 msgid ", pulse"
 msgstr ", pulse"
 
-#: src/main.c:2335
+#: src/main.c:2410
 msgid ", sox or jack\n"
 msgstr ", sox або jack\n"
 
-#: src/main.c:2336
+#: src/main.c:2412
 msgid ""
 "-jackopts <opts>    : opts is a bitmap of jack startup options [1 = jack "
 "transport client, 2 = jack transport master, 4 = start jack transport "
@@ -507,16 +512,16 @@
 "запуск сервера передавання даних jack, 8 = призупинка відтворення звуку, "
 "якщо призупинено відтворення відео, 16 = запуск звукового сервера jack] \n"
 
-#: src/main.c:2338
+#: src/main.c:2414
 msgid " or sox\n"
 msgstr " або sox\n"
 
-#: src/main.c:2340
+#: src/main.c:2416
 msgid "-devicemap <mapname>          : autoload devicemap\n"
 msgstr ""
 "-devicemap <назва карти>         : автоматично завантажити карту пристроїв\n"
 
-#: src/main.c:2341
+#: src/main.c:2418
 msgid ""
 "-vppdefaults <file>          : load video playback plugin defaults from "
 "<file> (Note: only sets the settings, not the plugin type)\n"
@@ -525,17 +530,17 @@
 "відтворення відео з  <файл>-а (Зауваження: встановлюються лише параметри, а "
 "не тип додатка)\n"
 
-#: src/main.c:2342
+#: src/main.c:2419
 msgid "-debug            : try to debug crashes (requires 'gdb' installed)\n"
 msgstr ""
 "-debug               : спробувати виконати діагностику аварії (доведеться "
 "встановити «gdb»)\n"
 
-#: src/main.c:2373 src/gui.c:1128
+#: src/main.c:2449 src/gui.c:1127
 msgid "Starting GUI..."
 msgstr "Запуск графічного інтерфейсу..."
 
-#: src/main.c:2396
+#: src/main.c:2475
 #, c-format
 msgid ""
 "\n"
@@ -553,7 +558,7 @@
 "(Можливо, вам доведеться змінити значення параметра <prefix_dir> у вашому "
 "файлі %s)\n"
 
-#: src/main.c:2410
+#: src/main.c:2492
 #, c-format
 msgid ""
 "\n"
@@ -565,7 +570,7 @@
 "Будь ласка, переконайтеся, що маєте права доступу на запис до %s і повторіть "
 "спробу.\n"
 
-#: src/main.c:2415
+#: src/main.c:2498
 msgid ""
 "\n"
 "`smogrify` must be in your path, and be executable\n"
@@ -580,7 +585,7 @@
 "Будь ласка, ознайомтеся з файлом README, який постачається\n"
 "разом з цим пакунком, перед запуском LiVES.\n"
 
-#: src/main.c:2421
+#: src/main.c:2504
 #, c-format
 msgid ""
 "\n"
@@ -595,7 +600,7 @@
 "\n"
 "Будь ласка, змініть права доступу до цього файла і повторіть спробу.\n"
 
-#: src/main.c:2428
+#: src/main.c:2512
 #, c-format
 msgid ""
 "\n"
@@ -612,7 +617,7 @@
 "Будь ласка, перевірте права доступу на цей файл і каталог,\n"
 "а потім повторіть спробу.\n"
 
-#: src/main.c:2438
+#: src/main.c:2522
 #, c-format
 msgid ""
 "Please check the <tempdir> setting in \n"
@@ -623,7 +628,7 @@
 "%s\n"
 "і повторіть спробу.\n"
 
-#: src/main.c:2445
+#: src/main.c:2528
 #, c-format
 msgid ""
 "\n"
@@ -638,7 +643,7 @@
 "\n"
 "%s"
 
-#: src/main.c:2453
+#: src/main.c:2536
 msgid ""
 "\n"
 "An incorrect version of smogrify was found in your path.\n"
@@ -656,7 +661,7 @@
 "\n"
 "Дякуємо.\n"
 
-#: src/main.c:2458
+#: src/main.c:2541
 #, fuzzy
 msgid ""
 "\n"
@@ -668,7 +673,7 @@
 "програма «sox». Будь ласка, встановіть одну з цих програм і повторіть "
 "спробу.\n"
 
-#: src/main.c:2462
+#: src/main.c:2546
 #, fuzzy
 msgid ""
 "\n"
@@ -679,7 +684,7 @@
 "Для роботи поточної версії LiVES потрібні програми «mplayer» та «sox». Будь "
 "ласка, встановіть ці програми і повторіть спробу.\n"
 
-#: src/main.c:2472
+#: src/main.c:2556
 #, fuzzy
 msgid ""
 "\n"
@@ -690,7 +695,7 @@
 "LiVES не вдалося виявити програму «mplayer». Вам варто встановити mplayer, "
 "щоб скористатися усіма можливостями LiVES.\n"
 
-#: src/main.c:2475
+#: src/main.c:2561
 msgid ""
 "\n"
 "LiVES was unable to locate 'convert'. You should install convert and image-"
@@ -700,7 +705,7 @@
 "LiVES не вдалося виявити програми «convert». Якщо ви маєте намір "
 "користуватися ефектами показу, вам слід встановити convert і image-magick.\n"
 
-#: src/main.c:2478
+#: src/main.c:2566
 msgid ""
 "\n"
 "LiVES was unable to locate 'composite'. You should install composite and "
@@ -711,7 +716,7 @@
 "користуватися функціональними можливостями об’єднання, вам слід встановити "
 "composite і image-magick.\n"
 
-#: src/main.c:2481
+#: src/main.c:2570
 msgid ""
 "\n"
 "LiVES was unable to locate 'sox'. Some audio features may not work. You "
@@ -722,7 +727,7 @@
 "програму, програма не зможе виконувати деякі з функцій обробки звуку. Вам "
 "слід встановити «sox».\n"
 
-#: src/main.c:2484
+#: src/main.c:2575
 #, c-format
 msgid ""
 "\n"
@@ -739,59 +744,59 @@
 "Без цих додатків ви не зможете скористатися пунктом «Зберегти».\n"
 "Можливо, вам слід змінити значення параметра <lib_dir> у %s\n"
 
-#: src/main.c:2611
+#: src/main.c:2707
 #, c-format
 msgid "Autoloading set %s..."
 msgstr "Автоматичне завантаження набору %s..."
 
 #. TRANSLATORS: localised name may be used here
-#: src/main.c:2781 src/interface.c:738
+#: src/main.c:2902
 msgid "LiVES"
 msgstr "LiVES"
 
-#: src/main.c:2948
+#: src/main.c:3066
 #, c-format
 msgid "Invalid audio player %s\n"
 msgstr "Помилковий аудіопрогравач %s\n"
 
-#: src/main.c:3077
+#: src/main.c:3214
 #, c-format
 msgid "LiVES-%s: <Untitled%d> %dx%d : %d frames %d bpp %.3f fps"
 msgstr "LiVES-%s: <Untitled%d> %dx%d : %d кадрів %d бітів/пк %.3f кд/с"
 
-#: src/main.c:3082
+#: src/main.c:3219
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : ??? frames ??? bpp %.3f fps"
 msgstr "LiVES-%s: <%s> %dx%d : ??? кадрів ??? бітів/пк %.3f кд/с"
 
-#: src/main.c:3086
+#: src/main.c:3222
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : %d frames %d bpp %.3f fps"
 msgstr "LiVES-%s: <%s> %dx%d : %d кадрів %d бітів/пк %.3f кд/с"
 
-#: src/main.c:3094
+#: src/main.c:3229
 #, c-format
 msgid "LiVES-%s: <No File>"
 msgstr "LiVES-%s: <файла не вказано>"
 
 #. TRANSLATORS: rec(ord)
-#: src/main.c:5085
+#: src/main.c:5201
 #, c-format
 msgid "rec %9d/%d"
 msgstr "зап %9d/%d"
 
 #. TRANSLATORS: out of memory (rec(ord))
-#: src/main.c:5091
+#: src/main.c:5206
 #, c-format
 msgid "!rec %9d/%d"
 msgstr "!зап %9d/%d"
 
-#: src/main.c:5398 src/main.c:5399 src/gui.c:2110 src/gui.c:3220
-#: src/saveplay.c:2336
+#: src/main.c:5500 src/main.c:5501 src/gui.c:2108 src/gui.c:3331
+#: src/saveplay.c:2315
 msgid "Play"
 msgstr "Пуск"
 
-#: src/main.c:6128
+#: src/main.c:6216
 msgid ""
 "LiVES was unable to capture this image\n"
 "\n"
@@ -799,35 +804,35 @@
 "LiVES не вдалося захопити це зображення.\n"
 "\n"
 
-#: src/main.c:6250
+#: src/main.c:6345
 #, c-format
 msgid "Closed file %s\n"
 msgstr "Закритий файл %s\n"
 
-#: src/main.c:6452 src/gui.c:648 src/utils.c:4312 src/utils.c:4344
-#: src/saveplay.c:3550 src/multitrack.c:4510 src/multitrack.c:6268
+#: src/main.c:6542 src/gui.c:647 src/utils.c:4256 src/utils.c:4286
+#: src/saveplay.c:3500 src/multitrack.c:4678 src/multitrack.c:6447
 msgid "_Undo"
 msgstr "В_ернути"
 
-#: src/main.c:6453 src/gui.c:666 src/utils.c:4313 src/utils.c:4345
-#: src/saveplay.c:3551 src/multitrack.c:4531 src/multitrack.c:6293
+#: src/main.c:6543 src/gui.c:665 src/utils.c:4257 src/utils.c:4287
+#: src/saveplay.c:3501 src/multitrack.c:4698 src/multitrack.c:6472
 msgid "_Redo"
 msgstr "Повт_орити"
 
-#: src/main.c:6493 src/interface.c:470 src/gui.c:2326 src/preferences.c:2357
-#: src/resample.c:1516
+#: src/main.c:6583 src/interface.c:457 src/gui.c:2324 src/preferences.c:2391
+#: src/resample.c:1488
 msgid "Video"
 msgstr "Відео"
 
-#: src/main.c:6494 src/interface.c:483 src/gui.c:2351
+#: src/main.c:6584 src/interface.c:470 src/gui.c:2348
 msgid "Left Audio"
 msgstr "Лівий канал звуку"
 
-#: src/main.c:6495 src/gui.c:2375
+#: src/main.c:6585 src/gui.c:2371
 msgid "Right Audio"
 msgstr "Правий канал звуку"
 
-#: src/main.c:6540
+#: src/main.c:6630
 #, fuzzy
 msgid ""
 "\n"
@@ -842,11 +847,11 @@
 "визначено mplayer.\n"
 "Будь ласка, змініть налаштування у «Параметрах» і повторіть спробу.\n"
 
-#: src/main.c:7051 src/plugins.c:1502
+#: src/main.c:7134 src/plugins.c:1468
 msgid "LiVES: - Play Window"
 msgstr "LiVES: - Вікно відтворення"
 
-#: src/startup.c:25
+#: src/startup.c:24
 #, c-format
 msgid ""
 "A directory named\n"
@@ -861,7 +866,7 @@
 "\n"
 "(Вільного місця = %s)\n"
 
-#: src/startup.c:32
+#: src/startup.c:29
 #, c-format
 msgid ""
 "A directory named\n"
@@ -877,7 +882,7 @@
 "вільного місця у ньому.\n"
 "Будь ласка, виберіть інший каталог.\n"
 
-#: src/startup.c:49
+#: src/startup.c:46
 #, c-format
 msgid ""
 "\n"
@@ -894,7 +899,7 @@
 "\n"
 "(Вільного місця = %s)"
 
-#: src/startup.c:54
+#: src/startup.c:50
 #, c-format
 msgid ""
 "\n"
@@ -907,11 +912,11 @@
 "%s\n"
 "Будь ласка, повторіть спробу з іншим каталогом.\n"
 
-#: src/startup.c:96
+#: src/startup.c:92
 msgid "Directory name is too long !"
 msgstr "Назва каталогу занадто довга!"
 
-#: src/startup.c:223
+#: src/startup.c:216
 msgid ""
 "LiVES FAILED TO START YOUR SELECTED AUDIO PLAYER !\n"
 "\n"
@@ -919,7 +924,7 @@
 "LiVES НЕ ВДАЛОСЯ ЗАПУСТИТИ ВКАЗАНИЙ ВАМИ АУДІОПРОГРАВАЧ!\n"
 "\n"
 
-#: src/startup.c:230
+#: src/startup.c:222
 msgid ""
 "Before starting LiVES, you need to choose an audio player.\n"
 "\n"
@@ -929,7 +934,7 @@
 "\n"
 "Звичайним користувачам ми рекомендуємо скористатися PulseAudio"
 
-#: src/startup.c:233
+#: src/startup.c:225
 msgid ""
 ", but this version of LiVES was not compiled with pulse audio support.\n"
 "\n"
@@ -937,7 +942,7 @@
 ", але цю версію LiVES було зібрано без підтримки PulseAudio.\n"
 "\n"
 
-#: src/startup.c:236
+#: src/startup.c:229
 msgid ""
 ", but you do not have pulse audio installed on your system.\n"
 " You are advised to install pulse audio first before running LiVES.\n"
@@ -947,11 +952,11 @@
 " Радимо вам встановити PulseAudio, перед запуском LiVES.\n"
 "\n"
 
-#: src/startup.c:241
+#: src/startup.c:233
 msgid "JACK audio is recommended for pro users"
 msgstr "Сервер JACK варто використовувати користувачам-професіоналам"
 
-#: src/startup.c:244
+#: src/startup.c:236
 msgid ""
 ", but this version of LiVES was not compiled with jack audio support.\n"
 "\n"
@@ -959,7 +964,7 @@
 ", але цю версію LiVES було зібрано без підтримки Jack.\n"
 "\n"
 
-#: src/startup.c:247
+#: src/startup.c:239
 msgid ""
 ", but you do not have jackd installed. You may wish to install jackd first "
 "before running LiVES.\n"
@@ -969,7 +974,7 @@
 "ніж ви запустите LiVES.\n"
 "\n"
 
-#: src/startup.c:250
+#: src/startup.c:242
 msgid ""
 ", but may prevent LiVES from starting on some systems.\n"
 "If LiVES will not start with jack, you can restart and try with another "
@@ -981,13 +986,13 @@
 "спробувати якийсь інший аудіопрогравач.\n"
 "\n"
 
-#: src/startup.c:254
+#: src/startup.c:246
 msgid "SOX may be used if neither of the preceding players work, "
 msgstr ""
 "SOX можна скористатися, якщо не працюватиме жоден з запропонованих вище "
 "програвачів, "
 
-#: src/startup.c:257
+#: src/startup.c:249
 msgid ""
 "but some audio features will be disabled.\n"
 "\n"
@@ -995,7 +1000,7 @@
 "але деякі з можливостей роботи зі звуком буде вимкнено.\n"
 "\n"
 
-#: src/startup.c:260
+#: src/startup.c:251
 msgid ""
 "but you do not have sox installed.\n"
 "You are advised to install it before running LiVES.\n"
@@ -1005,7 +1010,7 @@
 "Радимо вам встановити його до того, як ви почнете користуватися LiVES.\n"
 "\n"
 
-#: src/startup.c:264
+#: src/startup.c:255
 #, fuzzy
 msgid ""
 "The MPLAYER/MPLAYER2 audio player is only recommended for testing purposes.\n"
@@ -1014,97 +1019,97 @@
 "Звуковий програвач Mplayer варто використовувати лише з метою тестування.\n"
 "\n"
 
-#: src/startup.c:281
+#: src/startup.c:271
 msgid "LiVES: - Choose an audio player"
 msgstr "LiVES: - Вибір звукового програвача"
 
-#: src/startup.c:298
+#: src/startup.c:288
 msgid "Use _pulse audio player"
 msgstr "Вик_ористовувати програвач PulseAudio"
 
-#: src/startup.c:320
+#: src/startup.c:310
 msgid "Use _jack audio player"
 msgstr "Ви_користовувати звуковий програвач Jack"
 
-#: src/startup.c:340
+#: src/startup.c:330
 msgid "Use _sox audio player"
 msgstr "Вико_ристовувати звуковий програвач Sox"
 
-#: src/startup.c:361
+#: src/startup.c:351
 msgid "Use _mplayer audio player"
 msgstr "В_икористовувати звуковий програвач mplayer"
 
-#: src/startup.c:381
+#: src/startup.c:371
 #, fuzzy
 msgid "Use _mplayer2 audio player"
 msgstr "В_икористовувати звуковий програвач mplayer"
 
-#: src/startup.c:405 src/startup.c:580 src/interface.c:1506
+#: src/startup.c:395 src/startup.c:569 src/interface.c:1398
 msgid "_Next"
 msgstr "_Далі"
 
-#: src/startup.c:445
+#: src/startup.c:435
 msgid "Skipped"
 msgstr "Пропущено"
 
-#: src/startup.c:460
+#: src/startup.c:450
 msgid "Passed"
 msgstr "Пройдено"
 
-#: src/startup.c:493
+#: src/startup.c:483
 msgid "Failed"
 msgstr "Невдача"
 
-#: src/startup.c:552
+#: src/startup.c:542
 msgid "LiVES: - Testing Configuration"
 msgstr "LiVES: - перевірка налаштувань"
 
-#: src/startup.c:555
+#: src/startup.c:544
 msgid "LiVES: - Troubleshoot"
 msgstr "LiVES: - усування вад"
 
-#: src/startup.c:568
+#: src/startup.c:557
 msgid "LiVES will now run some basic configuration tests\n"
 msgstr "Зараз LiVES виконає декілька перевірок основних налаштувань\n"
 
-#: src/startup.c:603
+#: src/startup.c:591
 msgid "Checking for \"sox\" presence"
 msgstr "Перевірка наявності «sox»"
 
-#: src/startup.c:607
+#: src/startup.c:595
 msgid ""
 "You should install sox to be able to use all the audio features in LiVES"
 msgstr ""
 "Щоб мати змогу скористатися всіма можливостями з обробки звуку у LiVES, вам "
 "слід встановити sox"
 
-#: src/startup.c:615
+#: src/startup.c:602
 msgid "Checking if sox can convert audio"
 msgstr "Перевірка можливості перетворення звукових даних sox"
 
-#: src/startup.c:638
+#: src/startup.c:625
 msgid "Unable to allocate 176400 bytes memory."
 msgstr "Не вдалося отримати 176400 байтів пам’яті."
 
-#: src/startup.c:653
+#: src/startup.c:639
 #, c-format
 msgid "Unable to write to: %s"
 msgstr "Не вдалося виконати запис до %s"
 
-#: src/startup.c:667 src/startup.c:807
+#: src/startup.c:653 src/startup.c:789
 #, c-format
 msgid "Command failed: %s"
 msgstr "Помилка команди: %s"
 
-#: src/startup.c:689
+#: src/startup.c:675
 msgid "You should install sox_fmt_all or similar"
 msgstr "Вам слід встановити sox_fmt_all або подібну програму"
 
-#: src/startup.c:717
+#: src/startup.c:703
 msgid "Checking for \"mplayer\" presence"
 msgstr "Перевірка наявності «mplayer»"
 
-#: src/startup.c:721
+#: src/startup.c:707
 #, fuzzy
 msgid ""
 "You should install mplayer or mplayer2 to be able to use all the decoding "
@@ -1113,46 +1118,46 @@
 "Щоб мати змогу скористатися всіма можливостями з декодування звуку у LiVES, "
 "вам слід встановити mplayer"
 
-#: src/startup.c:747
+#: src/startup.c:732
 msgid "Checking if mplayer can convert audio"
 msgstr "Перевірка можливості перетворення звуку за допомогою mplayer"
 
-#: src/startup.c:768
+#: src/startup.c:751
 #, fuzzy
 msgid "You should install mplayer or mplayer2 with pcm/wav support"
 msgstr "Щоб скористатися підтримкою pcm/wav, вам слід встановити mplayer"
 
-#: src/startup.c:785
+#: src/startup.c:767
 msgid "Checking if mplayer can decode to png/alpha"
 msgstr "Перевірка можливості декодування png/alpha за допомогою mplayer"
 
-#: src/startup.c:828
+#: src/startup.c:810
 msgid "You may wish to upgrade mplayer to a newer version"
 msgstr "Вам варто оновити пакунок mplayer"
 
-#: src/startup.c:854
+#: src/startup.c:836
 msgid "Checking if mplayer can decode to jpeg"
 msgstr "Перевірка можливості декодування jpeg за допомогою mplayer"
 
-#: src/startup.c:882
+#: src/startup.c:862
 msgid "You should install mplayer with either png/alpha or jpeg support"
 msgstr ""
 "Щоб скористатися підтримкою png/alpha або jpeg, вам слід встановити mplayer"
 
-#: src/startup.c:883
+#: src/startup.c:863
 msgid "You may wish to add jpeg output support to mplayer"
 msgstr "Вам варто додати підтримку виведення у форматі jpeg до пакунка mplayer"
 
-#: src/startup.c:892
+#: src/startup.c:872
 msgid "Checking for \"convert\" presence"
 msgstr "Перевірка наявності «convert»"
 
-#: src/startup.c:896
+#: src/startup.c:876
 msgid "Install imageMagick to be able to use all of the rendered effects"
 msgstr ""
 "Щоб мати змогу скористатися усіма ефектами обробки, встановіть imageMagick"
 
-#: src/startup.c:909
+#: src/startup.c:889
 msgid ""
 "\n"
 "\n"
@@ -1165,7 +1170,7 @@
 "попереднього типу можна за допомогою пункту «Налаштування-"
 ">Декодування».    \n"
 
-#: src/startup.c:915
+#: src/startup.c:894
 msgid ""
 "\n"
 "\n"
@@ -1178,7 +1183,7 @@
 "додаткові компоненти, а бо натисніть кнопку «Далі», щоб продовжити "
 "роботу    \n"
 
-#: src/startup.c:949
+#: src/startup.c:928
 msgid ""
 "\n"
 "\n"
@@ -1188,7 +1193,7 @@
 "\n"
 "Нарешті, ви можете вибрати типовий інтерфейс запуску LiVES.\n"
 
-#: src/startup.c:950
+#: src/startup.c:929
 msgid ""
 "\n"
 "\n"
@@ -1199,7 +1204,7 @@
 "У LiVES передбачено два основних інтерфейси, ви можете запускати програму з "
 "будь-яким з цих інтерфейсів.\n"
 
-#: src/startup.c:951
+#: src/startup.c:930
 msgid ""
 "\n"
 "\n"
@@ -1210,32 +1215,32 @@
 "Типовий інтерфейс згодом можна змінити за допомогою діалогового вікна "
 "«Параметри».\n"
 
-#: src/startup.c:961
+#: src/startup.c:940
 msgid "LiVES: - Choose the startup interface"
 msgstr "LiVES: - вибір інтерфейсу запуску"
 
-#: src/startup.c:972
+#: src/startup.c:951
 msgid "Start in _Clip Edit mode"
 msgstr "Запускати у режимі редагування _кліпів"
 
-#: src/startup.c:975
+#: src/startup.c:954
 msgid "This is the best choice for simple editing tasks and for VJs\n"
 msgstr ""
 "Цей режим є найкращим вибором для простих завдань з редагування і для ві-"
 "джеїв\n"
 
-#: src/startup.c:981
+#: src/startup.c:960
 msgid "Start in _Multitrack mode"
 msgstr "Запускати у _багатодоріжковому режимі"
 
-#: src/startup.c:983
+#: src/startup.c:962
 msgid ""
 "This is a better choice for complex editing tasks involving multiple clips.\n"
 msgstr ""
 "Цей режим буде кращим вибором для складних завдань з одночасного редагування "
 "декількох кліпів.\n"
 
-#: src/startup.c:992
+#: src/startup.c:971
 msgid "_Finish"
 msgstr "_Завершити"
 
@@ -1252,39 +1257,39 @@
 msgid "Apply _Deinterlace"
 msgstr "_Усунути черезрядковість"
 
-#: src/interface.c:66
+#: src/interface.c:65
 msgid "If this is set, frames will be deinterlaced as they are imported."
 msgstr ""
 "Якщо позначити цей пункт, програма усуватиме черезрядковість з кадрів під "
 "час імпортування."
 
-#: src/interface.c:113 src/callbacks.c:9623 src/callbacks.c:9646
-#: src/callbacks.c:9647 src/gui.c:3223 src/gui.c:3821 src/saveplay.c:2339
-#: src/saveplay.c:3138 src/dialogs.c:1514 src/dialogs.c:1515
-#: src/dialogs.c:1746 src/dialogs.c:1747 src/framedraw.c:238
-#: src/multitrack.c:8031
+#: src/interface.c:106 src/callbacks.c:9542 src/callbacks.c:9564
+#: src/callbacks.c:9565 src/gui.c:3333 src/gui.c:3946 src/saveplay.c:2317
+#: src/saveplay.c:3097 src/dialogs.c:1575 src/dialogs.c:1576
+#: src/dialogs.c:1804 src/dialogs.c:1805 src/framedraw.c:236
+#: src/multitrack.c:8210
 msgid "Preview"
 msgstr "Перегляд"
 
-#: src/interface.c:132
+#: src/interface.c:125
 msgid "Click here to _Preview any selected video, image or audio file"
 msgstr ""
 "Натисніть, щоб _переглянути будь-який позначений файл відео, зображення або "
 "звукових даних"
 
-#: src/interface.c:135
+#: src/interface.c:127
 msgid "Click here to _Preview any selected audio file"
 msgstr "Натисніть, щоб _переглянути будь-який позначений файл звукових даних"
 
-#: src/interface.c:138
+#: src/interface.c:129
 msgid "Click here to _Preview the video"
 msgstr "Натисніть, щоб _переглянути відео"
 
-#: src/interface.c:181 src/dialogs.c:2542
+#: src/interface.c:169 src/dialogs.c:2621
 msgid "LiVES: - Processing..."
 msgstr "LiVES: - Обробка…"
 
-#: src/interface.c:217
+#: src/interface.c:205
 msgid ""
 "\n"
 "\n"
@@ -1298,8 +1303,8 @@
 "\n"
 "Не забудьте потім вимкнути ефекти (ctrl-0)!"
 
-#: src/interface.c:222 src/callbacks.c:9373 src/callbacks.c:9420
-#: src/dialogs.c:2570
+#: src/interface.c:210 src/callbacks.c:9283 src/callbacks.c:9332
+#: src/dialogs.c:2649
 msgid ""
 "\n"
 "Please Wait"
@@ -1307,101 +1312,101 @@
 "\n"
 "Будь ласка, зачекайте"
 
-#: src/interface.c:242
+#: src/interface.c:230
 msgid "Show Details"
 msgstr "Показати подробиці"
 
-#: src/interface.c:254 src/dialogs.c:2584
+#: src/interface.c:242 src/dialogs.c:2663
 msgid "_Enough"
 msgstr "_Досить"
 
-#: src/interface.c:255 src/framedraw.c:278
+#: src/interface.c:243 src/framedraw.c:276
 msgid "_Preview"
 msgstr "П_ереглянути"
 
-#: src/interface.c:257
+#: src/interface.c:245 src/callbacks.c:9282 src/callbacks.c:9330
 msgid "Paus_e"
 msgstr "Приз_упинити"
 
-#: src/interface.c:258 src/callbacks.c:9417
+#: src/interface.c:246 src/callbacks.c:9329
 msgid "Pause/_Enough"
 msgstr "Призупинити/_Досить"
 
-#: src/interface.c:285
+#: src/interface.c:273
 msgid "_Cancel"
 msgstr "_Скасувати"
 
-#: src/interface.c:374
+#: src/interface.c:361
 #, c-format
 msgid "LiVES: - %s"
 msgstr "LiVES: — %s"
 
-#: src/interface.c:376
+#: src/interface.c:363
 msgid "LiVES: - Multitrack details"
 msgstr "LiVES: — Подробиці щодо набору доріжок"
 
-#: src/interface.c:407
+#: src/interface.c:394
 msgid "Format"
 msgstr "Формат"
 
-#: src/interface.c:412
+#: src/interface.c:399
 msgid "Frame size"
 msgstr "Розміри кадру"
 
-#: src/interface.c:417
+#: src/interface.c:404
 msgid "File size"
 msgstr "Розмір файла"
 
-#: src/interface.c:418
+#: src/interface.c:405
 msgid "Byte size"
 msgstr "Розмір у байтах"
 
-#: src/interface.c:423 src/interface.c:1891
+#: src/interface.c:410 src/interface.c:1760
 msgid "FPS"
 msgstr "кадрів/с"
 
-#: src/interface.c:428
+#: src/interface.c:415
 msgid "Frames"
 msgstr "Кадри"
 
-#: src/interface.c:429
+#: src/interface.c:416
 msgid "Events"
 msgstr "Події"
 
-#: src/interface.c:434 src/interface.c:500 src/interface.c:542
+#: src/interface.c:421 src/interface.c:486 src/interface.c:528
 msgid "Total time"
 msgstr "Загальний час"
 
-#: src/interface.c:486 src/resample.c:1488
+#: src/interface.c:472 src/resample.c:1460
 msgid "Audio"
 msgstr "Звук"
 
-#: src/interface.c:511 src/interface.c:553
+#: src/interface.c:497 src/interface.c:539
 msgid "Rate/size"
 msgstr "Швидкість/Розмір"
 
-#: src/interface.c:530
+#: src/interface.c:516
 msgid "Right audio"
 msgstr "Правий канал звуку"
 
-#: src/interface.c:622
+#: src/interface.c:607
 msgid "LiVES: - Encoding options"
 msgstr "LiVES: - Параметри кодування"
 
-#: src/interface.c:636
+#: src/interface.c:621
 msgid "<------------- (Check the box to re_size as suggested)"
 msgstr ""
 "<------------- (Позначте, щоб змінити _розміри відповідно до пропозиції)"
 
-#: src/interface.c:637
+#: src/interface.c:622
 msgid "<------------- (Check the box to use the _size recommendation)"
 msgstr "<------------- (Позначте, щоб було використано _рекомендований розмір)"
 
-#: src/interface.c:662
+#: src/interface.c:646
 msgid "Use _letterboxing to maintain aspect ratio (optional)"
 msgstr "_Чорні смуги для збереження співвідношення розмірів (необов’язкове)"
 
-#: src/interface.c:663
+#: src/interface.c:647
 msgid ""
 "Draw black rectangles either above or to the sides of the image, to prevent "
 "it from stretching."
@@ -1409,91 +1414,79 @@
 "Додавати чорні смуги над і під зображенням, або з боків зображення, щоб "
 "запобігти розтягуванню."
 
-#: src/interface.c:694
+#: src/interface.c:677
 msgid "Keep _my settings"
 msgstr "Зберегти _мої параметри"
 
-#: src/interface.c:695
+#: src/interface.c:678
 msgid "Use _recommended settings"
 msgstr "Використати _рекомендовані параметри"
 
-#: src/interface.c:775 src/dialogs.c:114
-msgid ""
-"Do _not show this warning any more\n"
-"(can be turned back on from Preferences/Warnings)"
-msgstr ""
-"Н_е показувати більше цього попередження\n"
-"(увімкнути показ можна у вікні «Параметри/Попередження»)"
-
-#: src/interface.c:787
-msgid "Show _Details"
-msgstr "Показати по_дробиці"
-
-#: src/interface.c:881
+#: src/interface.c:769
 msgid "_Close Window"
 msgstr "За_крити вікно"
 
-#: src/interface.c:883
+#: src/interface.c:771
 msgid "_Save to file"
 msgstr "_Зберегти до файла"
 
-#: src/interface.c:928
+#: src/interface.c:816
 msgid "LiVES: - Insert"
 msgstr "LiVES: - Вставка"
 
-#: src/interface.c:945
+#: src/interface.c:833
 msgid "_Number of times to insert"
 msgstr "_Кількість повторних вставок"
 
-#: src/interface.c:954
+#: src/interface.c:842
 msgid "_Insert to fit audio"
 msgstr "В_ставити відповідно до звукових даних"
 
-#: src/interface.c:968
+#: src/interface.c:856
 msgid "Insert _before selection"
 msgstr "Вставити п_еред позначеним"
 
-#: src/interface.c:970
+#: src/interface.c:858
 msgid "Insert clipboard before selected frames"
 msgstr "Вставити вміст буфера обміну даними перед позначеними кадрами"
 
-#: src/interface.c:986
+#: src/interface.c:875
 msgid "Insert _after selection"
 msgstr "Вставити п_ісля позначеного"
 
-#: src/interface.c:988
+#: src/interface.c:877
 msgid "Insert clipboard after selected frames"
 msgstr "Вставити вміст буфера обміну даними після позначених кадрів"
 
-#: src/interface.c:999
+#: src/interface.c:888
 msgid "Insert _with sound"
 msgstr "Вставити _зі звуком"
 
-#: src/interface.c:1012
+#: src/interface.c:901
 msgid "Insert with_out sound"
 msgstr "Вставити _без звуку"
 
-#: src/interface.c:1093
+#: src/interface.c:985
 msgid "LiVES: - Open Selection"
 msgstr "LiVES: - Відкриття позначеного"
 
-#: src/interface.c:1111
+#: src/interface.c:1004
 msgid "Selection start time (sec)"
 msgstr "Початок позначення (сек.)"
 
-#: src/interface.c:1117
+#: src/interface.c:1010
 msgid "Number of frames to open"
 msgstr "Кількість кадрів, які слід відкрити"
 
-#: src/interface.c:1193
+#: src/interface.c:1088
 msgid "LiVES: - Open Location"
 msgstr "LiVES: - Відкриття адреси"
 
-#: src/interface.c:1195
+#: src/interface.c:1090
 msgid "LiVES: - Open Youtube Clip"
 msgstr "LiVES: — відкриття кліпу з Youtube"
 
-#: src/interface.c:1213
+#: src/interface.c:1109
 msgid ""
 "\n"
 "\n"
@@ -1510,7 +1503,7 @@
 "Потокові дані\n"
 "\n"
 
-#: src/interface.c:1216
+#: src/interface.c:1112
 msgid ""
 "\n"
 "\n"
@@ -1525,7 +1518,7 @@
 "Будь ласка, переконайтеся, що встановлено найсвіжішу версію цієї програми.\n"
 "\n"
 
-#: src/interface.c:1220
+#: src/interface.c:1116
 msgid ""
 "Enter the URL of the clip below.\n"
 "E.g: http://www.youtube.com/watch?v=WCR6f6WzjP8\n"
@@ -1535,57 +1528,58 @@
 "Приклад: http://www.youtube.com/watch?v=WCR6f6WzjP8\n"
 "\n"
 
-#: src/interface.c:1231
+#: src/interface.c:1127
 msgid "URL : "
 msgstr "URL: "
 
-#: src/interface.c:1231
+#: src/interface.c:1127
 msgid "Youtube URL : "
 msgstr "Адреса на Youtube: "
 
-#: src/interface.c:1235
+#: src/interface.c:1131
 msgid "Do not send bandwidth information"
 msgstr "Не надсилати даних щодо потужності каналу"
 
-#: src/interface.c:1237
+#: src/interface.c:1133
 msgid "Try this setting if you are having problems getting a stream"
 msgstr ""
 "Спробуйте скористатися цим пунктом, якщо у вас виникають проблеми з "
 "отриманням потоку даних"
 
-#: src/interface.c:1258
+#: src/interface.c:1155
 msgid "Download to _Directory : "
 msgstr "Звантаження до _каталогу: "
 
-#: src/interface.c:1276
+#: src/interface.c:1173
 msgid "Download _File Name : "
 msgstr "Назва звантаженого _файла: "
 
-#: src/interface.c:1281
+#: src/interface.c:1178
 msgid ".webm"
 msgstr ".webm"
 
-#: src/interface.c:1359
+#: src/interface.c:1256
 msgid "LiVES: - Rename Clip"
 msgstr "LiVES: - Перейменування кліпу"
 
-#: src/interface.c:1362
-msgid "LiVES: - Enter Set Name"
-msgstr "LiVES: - Введіть назву набору"
+#: src/interface.c:1258
+#, fuzzy
+msgid "LiVES: - Enter Set Name to Save as"
+msgstr "LiVES: — вкажіть назву набору для перезавантаження"
 
-#: src/interface.c:1365
+#: src/interface.c:1260
 msgid "LiVES: - Enter a Set Name to Reload"
 msgstr "LiVES: — вкажіть назву набору для перезавантаження"
 
-#: src/interface.c:1368
+#: src/interface.c:1262
 msgid "LiVES: - Choose a Working Directory"
 msgstr "LiVES: - Виберіть робочий каталог"
 
-#: src/interface.c:1371
+#: src/interface.c:1264
 msgid "LiVES: - Rename Current Track"
 msgstr "LiVES: - Перейменування поточної доріжки"
 
-#: src/interface.c:1391
+#: src/interface.c:1283
 msgid ""
 "You need to enter a name for the current clip set.\n"
 "This will allow you reload the layout with the same clips later.\n"
@@ -1598,7 +1592,7 @@
 "LiVES нагадає вам про те, що слід зберегти набір кліпів пізніше, якщо ви "
 "спробуєте вийти.\n"
 
-#: src/interface.c:1397
+#: src/interface.c:1289
 msgid ""
 "In order to export this project, you must enter a name for this clip set.\n"
 "This will also be used for the project name.\n"
@@ -1606,7 +1600,7 @@
 "Щоб експортувати цей проект, вам слід ввести назву цього набору кліпів.\n"
 "Цю назву також буде використано для проекту.\n"
 
-#: src/interface.c:1404
+#: src/interface.c:1296
 msgid ""
 "Welcome to LiVES !\n"
 "This startup wizard will guide you through the\n"
@@ -1617,7 +1611,7 @@
 "ви зможете зробити так, щоб програма змогла працювати на максимумі "
 "потужностей.\n"
 
-#: src/interface.c:1408
+#: src/interface.c:1300
 msgid ""
 "\n"
 "First of all you need to choose a working directory for LiVES.\n"
@@ -1627,193 +1621,193 @@
 "Спочатку вам слід вибрати робочий каталог для LiVES\n"
 "Цей каталог має зберігатися на диску, де дуже багато вільного місця.\n"
 
-#: src/interface.c:1427
+#: src/interface.c:1317
 msgid "New name "
 msgstr "Нова назва "
 
-#: src/interface.c:1430
+#: src/interface.c:1319
 msgid "Set name "
 msgstr "Встановити назву "
 
-#: src/interface.c:1550
+#: src/interface.c:1435
 msgid "Use def_aults"
 msgstr "Використовувати т_ипові"
 
-#: src/interface.c:1553 src/interface.c:1840 src/preferences.c:2515
-#: src/preferences.c:2697
+#: src/interface.c:1437 src/interface.c:1709 src/preferences.c:2550
+#: src/preferences.c:2739
 msgid "_Advanced"
 msgstr "Д_одатково"
 
-#: src/interface.c:1604
+#: src/interface.c:1487
 msgid "LiVES:- Select input device"
 msgstr "LiVES: Вибір пристрою вхідних даних"
 
-#: src/interface.c:1622
+#: src/interface.c:1504
 msgid "Select input device:"
 msgstr "Виберіть пристрій вхідних даних:"
 
-#: src/interface.c:1686
+#: src/interface.c:1568
 msgid "LiVES:- Load CD Track"
 msgstr "LiVES:- Завантаження композиції з КД"
 
-#: src/interface.c:1689
+#: src/interface.c:1570
 msgid "LiVES:- Select DVD Title/Chapter"
 msgstr "LiVES:- Вибір частини або глави DVD"
 
-#: src/interface.c:1692
+#: src/interface.c:1572
 msgid "LiVES:- Select VCD Title"
 msgstr "LiVES:- Вибір заголовка VCD"
 
-#: src/interface.c:1695
+#: src/interface.c:1574
 msgid "LiVES:- Change Maximum Visible Tracks"
 msgstr "LiVES:- Зміна максимальної кількості видимих доріжок"
 
-#: src/interface.c:1698
+#: src/interface.c:1576
 msgid "LiVES:- Device details"
 msgstr "LiVES:- Параметри пристроїв"
 
-#: src/interface.c:1721
+#: src/interface.c:1598
 #, c-format
 msgid "Track to load (from %s)"
 msgstr "Доріжка, яку слід завантажити (з %s)"
 
-#: src/interface.c:1724
+#: src/interface.c:1600
 msgid "DVD Title"
 msgstr "Частина DVD"
 
-#: src/interface.c:1727
+#: src/interface.c:1602
 msgid "VCD Title"
 msgstr "Частина VCD"
 
-#: src/interface.c:1730
+#: src/interface.c:1604
 msgid "Maximum number of tracks to display"
 msgstr "Максимальна кількість доріжок для показу"
 
-#: src/interface.c:1733
+#: src/interface.c:1606
 msgid "Device:        /dev/video"
 msgstr "Пристрій:        /dev/video"
 
-#: src/interface.c:1736
+#: src/interface.c:1608
 msgid "Device:        fw:"
 msgstr "Пристрій:        fw:"
 
-#: src/interface.c:1771
+#: src/interface.c:1641
 msgid "Chapter  "
 msgstr "Частина  "
 
-#: src/interface.c:1776
+#: src/interface.c:1645
 msgid "Channel  "
 msgstr "Канал  "
 
-#: src/interface.c:1791
+#: src/interface.c:1660
 msgid "Audio ID  "
 msgstr "Ідент. звуку  "
 
-#: src/interface.c:1857
+#: src/interface.c:1726
 msgid "Input number"
 msgstr "Кількість входів"
 
-#: src/interface.c:1865
+#: src/interface.c:1734
 msgid "Use default width, height and FPS"
 msgstr "Використовувати типову ширину, висоту і частоту кадрів"
 
-#: src/interface.c:1879
+#: src/interface.c:1748
 msgid "Width"
 msgstr "Ширина"
 
-#: src/interface.c:1885
+#: src/interface.c:1754
 msgid "Height"
 msgstr "Висота"
 
-#: src/interface.c:1899
+#: src/interface.c:1768
 msgid "_Driver"
 msgstr "Д_райвер"
 
-#: src/interface.c:1902
+#: src/interface.c:1771
 msgid "_Output format"
 msgstr "Формат _виведення"
 
-#: src/interface.c:1998
+#: src/interface.c:1865
 msgid "LiVES:- Fade Audio In"
 msgstr "LiVES:- Поступове наростання гучності"
 
-#: src/interface.c:2001
+#: src/interface.c:1867
 msgid "LiVES:- Fade Audio Out"
 msgstr "LiVES:- Поступове зменшення гучності"
 
-#: src/interface.c:2017
+#: src/interface.c:1883
 msgid "Fade in over  "
 msgstr "Наростання завершується після  "
 
-#: src/interface.c:2018
+#: src/interface.c:1884
 msgid "first"
 msgstr "перших"
 
-#: src/interface.c:2021
+#: src/interface.c:1886
 msgid "Fade out over  "
 msgstr "Зменшення завершується після  "
 
-#: src/interface.c:2022
+#: src/interface.c:1887
 msgid "last"
 msgstr "останній"
 
-#: src/interface.c:2044
+#: src/interface.c:1909
 msgid "seconds."
 msgstr "секунд."
 
-#: src/interface.c:2052 src/saveplay.c:1507
+#: src/interface.c:1917 src/saveplay.c:1484
 msgid "selection"
 msgstr "позначене"
 
-#: src/interface.c:2092
+#: src/interface.c:1956
 msgid "LiVES: - File Comments (optional)"
 msgstr "LiVES: - Коментарі до файла (необов’язкові)"
 
-#: src/interface.c:2107
+#: src/interface.c:1971
 msgid "Title/Name : "
 msgstr "Заголовок/Назва: "
 
-#: src/interface.c:2114
+#: src/interface.c:1978
 msgid "Author/Artist : "
 msgstr "Автор/Виконавець: "
 
-#: src/interface.c:2121
+#: src/interface.c:1985
 msgid "Comments : "
 msgstr "Коментарі: "
 
-#: src/interface.c:2151
+#: src/interface.c:2015
 msgid "_Options"
 msgstr "П_араметри"
 
-#: src/interface.c:2158
+#: src/interface.c:2022
 msgid "Save _subtitles to file"
 msgstr "Зберегти с_убтитри до файла"
 
-#: src/interface.c:2170
+#: src/interface.c:2033
 msgid "Subtitle file"
 msgstr "Файл субтитрів"
 
-#: src/interface.c:2172
+#: src/interface.c:2035
 msgid "Browse..."
 msgstr "Вибрати..."
 
-#: src/interface.c:2255
+#: src/interface.c:2132
 msgid "LiVES: - choose a device"
 msgstr "LiVES: - виберіть пристрій"
 
-#: src/interface.c:2259
+#: src/interface.c:2135
 msgid "LiVES: - choose a directory"
 msgstr "LiVES: - виберіть каталог"
 
-#: src/interface.c:2262
+#: src/interface.c:2137
 msgid "LiVES: - choose a file"
 msgstr "LiVES: - виберіть файл"
 
-#: src/interface.c:2445
+#: src/interface.c:2381
 msgid "LiVES: - Cancel/Discard/Save"
 msgstr "LiVES: - Скасування/Відкидання/Збереження"
 
-#: src/interface.c:2460
+#: src/interface.c:2397
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has not been saved.\n"
@@ -1823,7 +1817,7 @@
 "Поточне компонування не було збережено.\n"
 "Що слід робити програмі?\n"
 
-#: src/interface.c:2463
+#: src/interface.c:2400
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has been changed since the last save.\n"
@@ -1833,7 +1827,7 @@
 "Поточне компонування було змінено з часу останнього збереження.\n"
 "Що слід робити програмі?\n"
 
-#: src/interface.c:2467
+#: src/interface.c:2404
 msgid ""
 "You are about to exit LiVES.\n"
 "The current clip set can be saved.\n"
@@ -1843,7 +1837,7 @@
 "Можна зберегти поточний набір кліпів.\n"
 "Що слід робити програмі?\n"
 
-#: src/interface.c:2468
+#: src/interface.c:2405
 msgid ""
 "The current clip set has not been saved.\n"
 "What would you like to do ?\n"
@@ -1851,7 +1845,7 @@
 "Поточний набір кліпів не було збережено.\n"
 "Що слід робити програмі?\n"
 
-#: src/interface.c:2472
+#: src/interface.c:2408
 msgid ""
 "The current layout has not been saved.\n"
 "What would you like to do ?\n"
@@ -1859,7 +1853,7 @@
 "Поточне компонування не було збережено.\n"
 "Що слід робити програмі?\n"
 
-#: src/interface.c:2475
+#: src/interface.c:2410
 msgid ""
 "The current layout has *not* been changed since it was last saved.\n"
 "What would you like to do ?\n"
@@ -1868,7 +1862,7 @@
 "збереження.\n"
 "Яку дію слід виконати?\n"
 
-#: src/interface.c:2480
+#: src/interface.c:2415
 msgid ""
 "The current layout contains generated frames and cannot be retained.\n"
 "You may wish to render it before exiting multitrack mode.\n"
@@ -1877,7 +1871,7 @@
 "Ймовірно, вам варто виконати обробку перед виходом з режиму роботи з "
 "декількома доріжками.\n"
 
-#: src/interface.c:2483
+#: src/interface.c:2418
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout contains generated frames and cannot be retained.\n"
@@ -1887,39 +1881,39 @@
 "Поточне компонування містить створені кадри, отже його неможливо зберегти.\n"
 "Що слід робити програмі?"
 
-#: src/interface.c:2496
+#: src/interface.c:2431
 msgid "Clip set _name"
 msgstr "_Назва набору кліпів"
 
-#: src/interface.c:2502
+#: src/interface.c:2437
 msgid "_Auto reload next time"
 msgstr "_Автоматично перезавантажити наступного разу"
 
-#: src/interface.c:2538 src/interface.c:2547
+#: src/interface.c:2473 src/interface.c:2482
 msgid "_Wipe layout"
 msgstr "Ви_терти компонування"
 
-#: src/interface.c:2539
+#: src/interface.c:2474
 msgid "_Ignore changes"
 msgstr "_Ігнорувати зміни"
 
-#: src/interface.c:2540
+#: src/interface.c:2475
 msgid "_Delete clip set"
 msgstr "Ви_лучити набір кліпів"
 
-#: src/interface.c:2541
+#: src/interface.c:2476
 msgid "_Delete layout"
 msgstr "Ви_лучити компонування"
 
-#: src/interface.c:2545
+#: src/interface.c:2480
 msgid "_Save layout"
 msgstr "_Зберегти компонування"
 
-#: src/interface.c:2546
+#: src/interface.c:2481
 msgid "_Save clip set"
 msgstr "_Зберегти набір кліпів"
 
-#: src/interface.c:2565
+#: src/interface.c:2502
 msgid ""
 "\n"
 "LiVES has detected a multitrack layout from a previous session.\n"
@@ -1929,58 +1923,58 @@
 "LiVES було виявлено багатодоріжкове компонування з попереднього сеансу.\n"
 "Бажаєте, щоб програма спробувала його відновити?\n"
 
-#: src/interface.c:2589
+#: src/interface.c:2528
 msgid "LiVES: - Disk Recovery Options"
 msgstr "LiVES: — Параметри спорожнення диска"
 
-#: src/interface.c:2608
+#: src/interface.c:2549
 msgid "Delete _Orphaned Clips"
 msgstr "Вилучити _невикористані кліпи"
 
-#: src/interface.c:2609
+#: src/interface.c:2550
 msgid "Delete any clips which are not currently loaded or part of a set"
 msgstr ""
 "Вилучити всі кліпи, які зараз не завантажено або які не є частиною набору"
 
-#: src/interface.c:2622
+#: src/interface.c:2564
 msgid "Clear _Backup Files from Closed Clips"
 msgstr "Вилучити файли _резервних копій закритих кліпів"
 
-#: src/interface.c:2633
+#: src/interface.c:2575
 msgid "Remove Sets which have _Layouts but no Clips"
 msgstr "Вилучити набори, які мають записи _компонування, але не мають кліпів"
 
-#: src/interface.c:2644
+#: src/interface.c:2586
 msgid "_Reset to Defaults"
 msgstr "_Типові значення"
 
-#: src/interface.c:2651
+#: src/interface.c:2593
 msgid "_Accept"
 msgstr "При_йняти"
 
-#: src/callbacks.c:198
+#: src/callbacks.c:208
 #, c-format
 msgid "Saving as set %s..."
 msgstr "Зберігання набору %s…"
 
-#: src/callbacks.c:833
+#: src/callbacks.c:852
 msgid "Please enter the name of the file to save the clip as.\n"
 msgstr "Будь ласка, вкажіть назву файла, до якого слід зберегти кліп.\n"
 
-#: src/callbacks.c:841
+#: src/callbacks.c:860
 msgid "Please enter a valid URL for the download.\n"
 msgstr "Будь ласка, вкажіть коректну адресу для отримання даних.\n"
 
-#: src/callbacks.c:867
+#: src/callbacks.c:886
 #, c-format
 msgid "Downloading %s to %s..."
 msgstr "Звантаження %s до %s…"
 
-#: src/callbacks.c:895
+#: src/callbacks.c:912
 msgid "Downloading clip"
 msgstr "Звантаження кліпу"
 
-#: src/callbacks.c:933
+#: src/callbacks.c:950
 msgid ""
 "\n"
 "LiVES was unable to download the clip.\n"
@@ -1992,11 +1986,11 @@
 "Будь ласка, перевірте, чи правильно вказано адресу кліпу\n"
 "і чи встановлено найсвіжішу версію youtube-dl.\n"
 
-#: src/callbacks.c:1114 src/callbacks.c:1149
+#: src/callbacks.c:1131 src/callbacks.c:1166
 msgid "This file"
 msgstr "Поточний файл"
 
-#: src/callbacks.c:1115
+#: src/callbacks.c:1132
 msgid ""
 ",\n"
 " - including the current layout - "
@@ -2004,7 +1998,7 @@
 ",\n"
 " - разом з поточним компонуванням - "
 
-#: src/callbacks.c:1117
+#: src/callbacks.c:1134
 #, c-format
 msgid ""
 "\n"
@@ -2019,7 +2013,7 @@
 "\n"
 "Ви справді бажаєте його закрити?"
 
-#: src/callbacks.c:1119
+#: src/callbacks.c:1136
 #, c-format
 msgid ""
 "\n"
@@ -2034,7 +2028,7 @@
 "\n"
 "Ви справді бажаєте його закрити?"
 
-#: src/callbacks.c:1150
+#: src/callbacks.c:1167
 msgid ""
 "Changes made to this clip have not been saved or backed up.\n"
 "\n"
@@ -2045,7 +2039,7 @@
 "\n"
 "Закрити кліп попри це?"
 
-#: src/callbacks.c:1343
+#: src/callbacks.c:1356
 msgid ""
 "\n"
 "Invalid project file.\n"
@@ -2053,7 +2047,7 @@
 "\n"
 "Некоректний файл проекту.\n"
 
-#: src/callbacks.c:1356
+#: src/callbacks.c:1370
 #, c-format
 msgid ""
 "\n"
@@ -2076,33 +2070,33 @@
 "нову назву або відкинути набір.\n"
 "Після завершення цих дій ви зможете імпортувати новий проект.\n"
 
-#: src/callbacks.c:1366
+#: src/callbacks.c:1381
 #, c-format
 msgid "Importing the project %s as set %s..."
 msgstr "Імпортування проекту %s як набору %s…"
 
-#: src/callbacks.c:1386
+#: src/callbacks.c:1399
 msgid "Importing project"
 msgstr "Імпортування проекту"
 
-#: src/callbacks.c:1472
+#: src/callbacks.c:1481
 #, c-format
 msgid "Exporting project %s..."
 msgstr "Експортування проекту %s…"
 
-#: src/callbacks.c:1490
+#: src/callbacks.c:1497
 msgid "Exporting project"
 msgstr "Експортування проекту"
 
-#: src/callbacks.c:1506
+#: src/callbacks.c:1513
 msgid "Backup as .lv1 file"
 msgstr "Створити резервну копію у файлі .lv1"
 
-#: src/callbacks.c:1522
+#: src/callbacks.c:1529
 msgid "Restore .lv1 file"
 msgstr "Відновити файл .lv1"
 
-#: src/callbacks.c:1664
+#: src/callbacks.c:1671
 msgid ""
 "\n"
 "\n"
@@ -2114,73 +2108,78 @@
 "Набір буде вилучено з диска.\n"
 "Ви справді цього бажаєте?\n"
 
-#: src/callbacks.c:1725
+#: src/callbacks.c:1732
 #, c-format
 msgid "Deleting set %s..."
 msgstr "Вилучення набору %s…"
 
-#: src/callbacks.c:1727
+#: src/callbacks.c:1734
 msgid "Deleting set..."
 msgstr "Вилучення набору…"
 
-#: src/callbacks.c:1731
+#: src/callbacks.c:1738
 msgid "Deleting set"
 msgstr "Вилучення набору"
 
-#: src/callbacks.c:1739
+#: src/callbacks.c:1746
 #, c-format
 msgid "Set %s was permanently deleted from the disk.\n"
 msgstr "Набір %s було остаточно вилучено з диска.\n"
 
-#: src/callbacks.c:1787 src/callbacks.c:11764
+#: src/callbacks.c:1792 src/callbacks.c:11676
 msgid "Insert Silence"
 msgstr "Вставити тишу"
 
-#: src/callbacks.c:1840 src/callbacks.c:1923 src/callbacks.c:2086
+#: src/callbacks.c:1844 src/callbacks.c:1927 src/callbacks.c:2089
 msgid "Undoing"
 msgstr "Скасування"
 
-#: src/callbacks.c:1936 src/callbacks.c:2147
+#: src/callbacks.c:1940 src/callbacks.c:2150
 msgid "Restoring audio..."
 msgstr "Відновлення звуку…"
 
-#: src/callbacks.c:1952
+#: src/callbacks.c:1956
 msgid "Clearing frame images"
 msgstr "Спорожнення зображень кадрів"
 
-#: src/callbacks.c:1985
+#: src/callbacks.c:1988
 msgid "Deleting excess frames"
 msgstr "Вилучення зайвих кадрів"
 
-#: src/callbacks.c:2229
+#: src/callbacks.c:2232
 #, c-format
 msgid "Length of video is now %d frames at %.3f frames per second.\n"
 msgstr ""
 "Поточна тривалість відео — %d кадрів на швидкості %.3f кадрів на секунду.\n"
 
-#: src/callbacks.c:2233 src/resample.c:683 src/resample.c:2166
+#: src/callbacks.c:2235 src/resample.c:678 src/resample.c:2133
 #, c-format
 msgid "Clipboard was resampled to %d frames.\n"
 msgstr "Вміст буфера обміну даних було розбито на %d кадрів.\n"
 
-#: src/callbacks.c:2394 src/callbacks.c:2423
+#: src/callbacks.c:2396 src/callbacks.c:2425
 msgid "Redoing"
 msgstr "Повторення"
 
-#: src/callbacks.c:2462
-#, c-format
-msgid "Copying frames %d to %d%s to the clipboard..."
+#: src/callbacks.c:2472
+#, fuzzy, c-format
+msgid "Copying frames %d to %d (with sound) to the clipboard..."
+msgstr "Копіювання кадрів з %d до %d%s до буфера даних…"
+
+#: src/callbacks.c:2474
+#, fuzzy, c-format
+msgid "Copying frames %d to %d to the clipboard..."
 msgstr "Копіювання кадрів з %d до %d%s до буфера даних…"
 
-#: src/callbacks.c:2525
+#: src/callbacks.c:2526
 msgid "Copying to the clipboard"
 msgstr "Копіювання до буфера"
 
-#: src/callbacks.c:2600
+#: src/callbacks.c:2601
 msgid "Cut"
 msgstr "Вирізати"
 
-#: src/callbacks.c:2641 src/callbacks.c:3068 src/callbacks.c:8026
+#: src/callbacks.c:2641 src/callbacks.c:3063 src/callbacks.c:7631
 msgid "Pulling frames from clipboard"
 msgstr "Отримуємо кадри з буфера обміну даними"
 
@@ -2189,15 +2188,15 @@
 msgid "Pasting %d frames to new clip %s..."
 msgstr "Вставлення %d кадрів до нового кліпу %s…"
 
-#: src/callbacks.c:2678
+#: src/callbacks.c:2676
 msgid "Pasting"
 msgstr "Вставка"
 
-#: src/callbacks.c:2694
+#: src/callbacks.c:2692
 msgid "...added audio..."
 msgstr "…додано звукові дані…"
 
-#: src/callbacks.c:2778
+#: src/callbacks.c:2775
 msgid ""
 "This operation requires resizing or converting of frames.\n"
 "Please install 'convert' from the Image-magick package, and then restart "
@@ -2207,7 +2206,7 @@
 "Будь ласка, встановіть програму «convert» з пакунка Imagemagick, а потім "
 "перезапустіть LiVES.\n"
 
-#: src/callbacks.c:2795
+#: src/callbacks.c:2793
 msgid ""
 "\n"
 "\n"
@@ -2221,7 +2220,7 @@
 "Спробуйте позначити всі кадри, а потім скористайтеся пунктом \n"
 "«Обрізати/Доповнити звукову доріжку» з меню «Звук»."
 
-#: src/callbacks.c:2819
+#: src/callbacks.c:2817
 msgid ""
 "LiVES cannot insert because the audio rates do not match.\n"
 "Please install 'sox', and try again."
@@ -2230,7 +2229,7 @@
 "дискретизації.\n"
 "Будь ласка, встановіть «sox», а потім повторіть спробу."
 
-#: src/callbacks.c:2838
+#: src/callbacks.c:2835
 msgid ""
 "\n"
 "Insertion will cause frames to shift in some multitrack layouts.\n"
@@ -2241,7 +2240,7 @@
 "компонувань.\n"
 "Ви саме цього і хотіли?\n"
 
-#: src/callbacks.c:2888 src/callbacks.c:11692
+#: src/callbacks.c:2883 src/callbacks.c:11606
 msgid ""
 "\n"
 "Insertion will cause audio to shift in some multitrack layouts.\n"
@@ -2252,11 +2251,11 @@
 "компонувань.\n"
 "Ви саме цього і хотіли?\n"
 
-#: src/callbacks.c:2996 src/callbacks.c:3025
+#: src/callbacks.c:2987 src/callbacks.c:3016
 msgid "Resampling clipboard audio"
 msgstr "Повторна дискретизація звукових даних буфера"
 
-#: src/callbacks.c:3041
+#: src/callbacks.c:3032
 msgid ""
 "\n"
 "\n"
@@ -2268,7 +2267,7 @@
 "LiVES не вдалося змінити частоту дискретизації звукових даних у буфері. \n"
 "Звукові дані у буфері вилучено.\n"
 
-#: src/callbacks.c:3055
+#: src/callbacks.c:3045
 msgid ""
 "\n"
 "\n"
@@ -2282,30 +2281,30 @@
 "Бажаєте продовжувати процедуру вставлення \n"
 "на основі незмінених звукових даних?\n"
 
-#: src/callbacks.c:3137 src/callbacks.c:3311
+#: src/callbacks.c:3132 src/callbacks.c:3299
 #, c-format
 msgid "Inserting %d%s frames from the clipboard..."
 msgstr "Вставка %d%s кадрів з буфера обміну даними…"
 
-#: src/callbacks.c:3162 src/callbacks.c:3236 src/callbacks.c:3339
+#: src/callbacks.c:3155 src/callbacks.c:3224 src/callbacks.c:3325
 msgid "Inserting"
 msgstr "Вставлення"
 
-#: src/callbacks.c:3193
+#: src/callbacks.c:3187
 #, c-format
 msgid "Inserting %d times from the clipboard%s..."
 msgstr "Вставка %d копій даних з буфера%s…"
 
-#: src/callbacks.c:3200
+#: src/callbacks.c:3191
 #, c-format
 msgid "Inserting %d frames from the clipboard%s..."
 msgstr "Вставка %d кадрів з буфера обміну даними%s…"
 
-#: src/callbacks.c:3418
+#: src/callbacks.c:3404
 msgid "Insert"
 msgstr "Вставити"
 
-#: src/callbacks.c:3486
+#: src/callbacks.c:3471
 msgid ""
 "\n"
 "Deleting all frames will close this file.\n"
@@ -2315,7 +2314,7 @@
 "Вилучення всіх кадрів призведе до закриття цього файла.\n"
 "Чи впевнені ви у своїх діях?"
 
-#: src/callbacks.c:3495
+#: src/callbacks.c:3480
 msgid ""
 "\n"
 "Deletion will cause missing frames in some multitrack layouts.\n"
@@ -2326,8 +2325,8 @@
 "компонувань.\n"
 "Ви справді бажаєте продовжувати?\n"
 
-#: src/callbacks.c:3515 src/callbacks.c:10920 src/callbacks.c:11162
-#: src/callbacks.c:11228
+#: src/callbacks.c:3500 src/callbacks.c:10851 src/callbacks.c:11087
+#: src/callbacks.c:11152
 msgid ""
 "\n"
 "Deletion will cause missing audio in some multitrack layouts.\n"
@@ -2338,7 +2337,7 @@
 "компонувань.\n"
 "Ви справді бажаєте продовжувати?\n"
 
-#: src/callbacks.c:3534
+#: src/callbacks.c:3519
 msgid ""
 "\n"
 "Deletion will cause frames to shift in some multitrack layouts.\n"
@@ -2348,7 +2347,7 @@
 "Вилучення призведе до зсуву кадрів у деяких з багатодоріжкових компонувань.\n"
 "Ви справді бажаєте продовжувати?\n"
 
-#: src/callbacks.c:3553 src/callbacks.c:11210
+#: src/callbacks.c:3538 src/callbacks.c:11134
 msgid ""
 "\n"
 "Deletion will cause audio to shift in some multitrack layouts.\n"
@@ -2359,20 +2358,20 @@
 "компонувань.\n"
 "Ви справді бажаєте продовжувати?\n"
 
-#: src/callbacks.c:3611
+#: src/callbacks.c:3597
 #, c-format
 msgid "Deleting frames %d to %d%s..."
 msgstr "Вилучення кадрів від %d до %d%s…"
 
-#: src/callbacks.c:3636
+#: src/callbacks.c:3619
 msgid "Deleting"
 msgstr "Вилучення"
 
-#: src/callbacks.c:3717
+#: src/callbacks.c:3699
 msgid "Delete"
 msgstr "Вилучити"
 
-#: src/callbacks.c:3738
+#: src/callbacks.c:3717
 msgid ""
 "\n"
 "\n"
@@ -2382,7 +2381,7 @@
 "\n"
 "Позначення заблоковано.\n"
 
-#: src/callbacks.c:4092
+#: src/callbacks.c:4056
 msgid ""
 "Ready to record. Use 'control' and cursor keys during playback to record "
 "your performance.\n"
@@ -2394,11 +2393,11 @@
 "(Щоб скасувати запис, натисніть клавішу «r» або скористайтеся пунктом меню "
 "«Відтворення->Виконати запис» ще раз перед початком запису.)\n"
 
-#: src/callbacks.c:4098
+#: src/callbacks.c:4061
 msgid "Record cancelled.\n"
 msgstr "Запис скасовано.\n"
 
-#: src/callbacks.c:4237
+#: src/callbacks.c:4197
 #, c-format
 msgid ""
 "\n"
@@ -2411,7 +2410,7 @@
 "Повідомлення додатка «%s»:\n"
 "%s\n"
 
-#: src/callbacks.c:4241
+#: src/callbacks.c:4200
 #, c-format
 msgid ""
 "\n"
@@ -2424,7 +2423,7 @@
 "У додатку %s не вдалося виявити методу «init».\n"
 "Ймовірно, файли додатка пошкоджено або встановлено неналежним чином."
 
-#: src/callbacks.c:4571
+#: src/callbacks.c:4532
 #, c-format
 msgid ""
 "Saving the set will cause copies of all loaded clips to remain on the disk"
@@ -2437,22 +2436,22 @@
 "\n"
 "Будь ласка, натисніть «Скасувати», якщо це суперечить вашим планам.\n"
 
-#: src/callbacks.c:4654
+#: src/callbacks.c:4617
 #, c-format
 msgid "Saving set %s"
 msgstr "Зберігання набору %s"
 
-#: src/callbacks.c:5005
+#: src/callbacks.c:4964
 #, c-format
 msgid "Loading clips from set %s"
 msgstr "Завантаження кліпів з набору %s"
 
-#: src/callbacks.c:5093
+#: src/callbacks.c:5051
 #, c-format
 msgid "%d clips and %d layouts were recovered from set (%s).\n"
 msgstr "%d кліпів і %d компонувань було відновлено з набору (%s).\n"
 
-#: src/callbacks.c:5312
+#: src/callbacks.c:5259
 msgid ""
 "LiVES will attempt to recover some disk space.\n"
 "You should ONLY run this if you have no other copies of LiVES running on "
@@ -2464,24 +2463,24 @@
 "запущено жодної іншої копії LiVES.\n"
 "Натисніть кнопку «Гаразд», щоб продовжити виконання дії.\n"
 
-#: src/callbacks.c:5317
+#: src/callbacks.c:5264
 msgid "Cleaning up disk space..."
 msgstr "Спорожнення простору на диску…"
 
-#: src/callbacks.c:5387
+#: src/callbacks.c:5334
 msgid "Recovering disk space"
 msgstr "Звільнення місця на диску"
 
-#: src/callbacks.c:5439
+#: src/callbacks.c:5386
 #, c-format
 msgid "%s of disk space was recovered.\n"
 msgstr "Звільнено %s місця на диску.\n"
 
-#: src/callbacks.c:5482
+#: src/callbacks.c:5428
 msgid "Resetting frame rates and frame values..."
 msgstr "Відновлення частоти кадрів та параметрів кадрів…"
 
-#: src/callbacks.c:5523
+#: src/callbacks.c:5469
 #, c-format
 msgid ""
 "\n"
@@ -2492,12 +2491,12 @@
 "Зовнішня: %s\n"
 "Внутрішня: %s (%d біт/тчк) / %s\n"
 
-#: src/callbacks.c:5525
+#: src/callbacks.c:5471
 msgid "buffered"
 msgstr "буферизовано"
 
-#: src/callbacks.c:5538 src/callbacks.c:5557 src/callbacks.c:5575
-#: src/callbacks.c:5609
+#: src/callbacks.c:5484 src/callbacks.c:5502 src/callbacks.c:5518
+#: src/callbacks.c:5551
 msgid ""
 "\n"
 "  Opening..."
@@ -2505,7 +2504,7 @@
 "\n"
 "  Відкриття…"
 
-#: src/callbacks.c:5545
+#: src/callbacks.c:5490
 #, c-format
 msgid ""
 "\n"
@@ -2514,7 +2513,7 @@
 "\n"
 "(%d віртуальних)"
 
-#: src/callbacks.c:5548
+#: src/callbacks.c:5493
 #, c-format
 msgid ""
 "\n"
@@ -2523,7 +2522,7 @@
 "\n"
 "(%d декодовано)"
 
-#: src/callbacks.c:5560 src/callbacks.c:5578 src/callbacks.c:5612
+#: src/callbacks.c:5504 src/callbacks.c:5520 src/callbacks.c:5553
 #, c-format
 msgid ""
 "\n"
@@ -2532,7 +2531,7 @@
 "\n"
 "  %.2f с"
 
-#: src/callbacks.c:5569
+#: src/callbacks.c:5512
 msgid ""
 "\n"
 "  Unknown"
@@ -2540,23 +2539,23 @@
 "\n"
 "  Невідомо"
 
-#: src/callbacks.c:5582 src/callbacks.c:5596
+#: src/callbacks.c:5524 src/callbacks.c:5538
 msgid "unsigned"
 msgstr "unsigned"
 
-#: src/callbacks.c:5583 src/callbacks.c:5597
+#: src/callbacks.c:5525 src/callbacks.c:5539
 msgid "signed"
 msgstr "signed"
 
-#: src/callbacks.c:5585 src/callbacks.c:5599
+#: src/callbacks.c:5527 src/callbacks.c:5541
 msgid "big-endian"
 msgstr "big-endian"
 
-#: src/callbacks.c:5586 src/callbacks.c:5600
+#: src/callbacks.c:5528 src/callbacks.c:5542
 msgid "little-endian"
 msgstr "little-endian"
 
-#: src/callbacks.c:5588 src/callbacks.c:5602
+#: src/callbacks.c:5530 src/callbacks.c:5544
 #, c-format
 msgid ""
 "  %d Hz %d bit\n"
@@ -2565,7 +2564,7 @@
 "  %d Гц %d бітів\n"
 "%s %s"
 
-#: src/callbacks.c:5707
+#: src/callbacks.c:5647
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -2596,22 +2595,22 @@
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, "
 "USA\n"
 
-#: src/callbacks.c:5721
+#: src/callbacks.c:5661
 msgid "A video editor and VJ program."
 msgstr "Відеоредактор та програма для ві-джеїв."
 
-#: src/callbacks.c:5722
+#: src/callbacks.c:5662
 msgid "About LiVES"
 msgstr "Про LiVES"
 
-#: src/callbacks.c:5724
+#: src/callbacks.c:5664
 msgid "translator_credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Yuri Chornoivan https://launchpad.net/~yurchor-gmail\n"
 "  yurchor https://launchpad.net/~yurchor-deactivatedaccount"
 
-#: src/callbacks.c:5758
+#: src/callbacks.c:5699
 #, c-format
 msgid ""
 "LiVES Version %s\n"
@@ -2635,7 +2634,7 @@
 "salsaman@gmail.com\n"
 "Домашня сторінка: http://lives.sourceforge.net"
 
-#: src/callbacks.c:6037
+#: src/callbacks.c:5996
 #, fuzzy
 msgid ""
 "\n"
@@ -2647,7 +2646,7 @@
 "Вам слід встановити mplayer або ImageMagick, щоб мати змогу переглянути цей "
 "файл.\n"
 
-#: src/callbacks.c:6040
+#: src/callbacks.c:5998
 #, fuzzy
 msgid ""
 "\n"
@@ -2660,43 +2659,7 @@
 "Вам слід встановити mplayer або ImageMagick, щоб мати змогу переглянути цей "
 "файл.\n"
 
-#: src/callbacks.c:6423 src/callbacks.c:8289
-msgid ""
-"\n"
-"Loading new audio may cause missing audio in some multitrack layouts.\n"
-"Are you sure you wish to continue ?\n"
-"."
-msgstr ""
-"\n"
-"Завантаження нових звукових даних може призвести до втрати звукових даних у "
-"деяких з багатодоріжкових компонувань.\n"
-"Бажаєте продовжити завантаження?\n"
-"."
-
-#: src/callbacks.c:6523
-#, c-format
-msgid "Opening audio %s, type %s..."
-msgstr "Відкриття звукових даних %s, тип %s…"
-
-#: src/callbacks.c:6556 src/saveplay.c:480
-msgid "Opening audio"
-msgstr "Відкриття звукових даних"
-
-#: src/callbacks.c:6565 src/callbacks.c:6612 src/callbacks.c:8387
-#: src/callbacks.c:8429 src/callbacks.c:8472 src/callbacks.c:10846
-msgid "Cancelling"
-msgstr "Скасування"
-
-#: src/callbacks.c:6660 src/callbacks.c:8514 src/callbacks.c:10876
-#: src/callbacks.c:11563
-msgid "Committing audio"
-msgstr "Додавання звукових даних"
-
-#: src/callbacks.c:6672 src/callbacks.c:8546
-msgid "New Audio"
-msgstr "Новий звук"
-
-#: src/callbacks.c:6779
+#: src/callbacks.c:6459
 #, c-format
 msgid ""
 "Text was saved as\n"
@@ -2705,152 +2668,183 @@
 "Текст збережено як\n"
 "%s\n"
 
-#: src/callbacks.c:6951 src/saveplay.c:3618
-#, c-format
-msgid "%d frames are enough !\n"
-msgstr "Достатньо %d кадрів!\n"
-
-#: src/callbacks.c:7050
+#: src/callbacks.c:6706
 msgid "LiVES: - Encoder debug output"
 msgstr "LiVES: - Дані зневаджування інструменту кодування"
 
-#: src/callbacks.c:7087 src/gui.c:1922
+#: src/callbacks.c:6743 src/gui.c:1921
 msgid "Fullscreen playback (f)"
 msgstr "Повноекранне відтворення (f)"
 
-#: src/callbacks.c:7089
+#: src/callbacks.c:6744
 msgid "Fullscreen playback off (f)"
 msgstr "Вимкнути повноекранне відтворення (f)"
 
-#: src/callbacks.c:7188 src/callbacks.c:7336 src/callbacks.c:7664
-#: src/callbacks.c:7681 src/gui.c:3712 src/saveplay.c:2467 src/saveplay.c:2501
-#: src/saveplay.c:3115 src/saveplay.c:3220 src/saveplay.c:3239
-#: src/multitrack.c:9340 src/multitrack.c:11060
+#: src/callbacks.c:6841 src/callbacks.c:6983 src/callbacks.c:7283
+#: src/callbacks.c:7298 src/gui.c:3838 src/saveplay.c:2442 src/saveplay.c:2475
+#: src/saveplay.c:3074 src/saveplay.c:3178 src/saveplay.c:3197
+#: src/multitrack.c:9526 src/multitrack.c:11288
 #, c-format
 msgid " (%d %% scale)"
 msgstr " (масштаб: %d %%)"
 
-#: src/callbacks.c:7190 src/callbacks.c:7338 src/callbacks.c:7666
-#: src/gui.c:3716 src/saveplay.c:2469 src/saveplay.c:2503
+#: src/callbacks.c:6843 src/callbacks.c:6985 src/callbacks.c:7285
+#: src/gui.c:3842 src/saveplay.c:2444 src/saveplay.c:2477
 #, c-format
 msgid "LiVES: - Play Window%s"
 msgstr "LiVES: вікно відтворення%s"
 
-#: src/callbacks.c:7302 src/gui.c:1907
+#: src/callbacks.c:6950 src/gui.c:1906
 msgid "Double size (d)"
 msgstr "Подвійний розмір (d)"
 
-#: src/callbacks.c:7309
+#: src/callbacks.c:6956
 msgid "Single size (d)"
 msgstr "Одинарний розмір (d)"
 
-#: src/callbacks.c:7442 src/callbacks.c:7443
+#: src/callbacks.c:7087 src/callbacks.c:7088
 msgid "Hide the play window (s)"
 msgstr "Сховати вікно відтворення (s)"
 
-#: src/callbacks.c:7452 src/gui.c:1746
+#: src/callbacks.c:7096 src/gui.c:1744
 msgid "Show the play window (s)"
 msgstr "Показати вікно відтворення (s)"
 
-#: src/callbacks.c:7453 src/gui.c:1896
+#: src/callbacks.c:7097 src/gui.c:1895
 msgid "Play in separate window (s)"
 msgstr "Відтворити у окремому вікні (s)"
 
-#: src/callbacks.c:7535 src/gui.c:4060 src/saveplay.c:2498
+#: src/callbacks.c:7175 src/gui.c:4169 src/saveplay.c:2472
 msgid "LiVES: - Streaming"
 msgstr "LiVES — Обробка потокових даних"
 
-#: src/callbacks.c:7778
+#: src/callbacks.c:7388
 msgid "Switch continuous looping off (o)"
 msgstr "Вимикання неперервного циклічного відтворення (o)"
 
-#: src/callbacks.c:7785 src/gui.c:1795
+#: src/callbacks.c:7394 src/gui.c:1793
 msgid "Switch continuous looping on (o)"
 msgstr "Вмикання неперервного циклічного відтворення (o)"
 
-#: src/callbacks.c:7837
+#: src/callbacks.c:7444
 #, c-format
 msgid "Audio volume (%.2f)"
 msgstr "Гучність (%.2f)"
 
-#: src/callbacks.c:7876 src/callbacks.c:7877 src/gui.c:3640
+#: src/callbacks.c:7483 src/callbacks.c:7484 src/gui.c:3766
 msgid "Unmute the audio (z)"
 msgstr "Увімкнути звук (z)"
 
-#: src/callbacks.c:7888 src/callbacks.c:7889 src/gui.c:1808 src/gui.c:3639
+#: src/callbacks.c:7494 src/callbacks.c:7495 src/gui.c:1806 src/gui.c:3765
 msgid "Mute the audio (z)"
 msgstr "Вимкнути звук (z)"
 
-#: src/callbacks.c:8038
+#: src/callbacks.c:7643
 msgid "Reversing clipboard..."
 msgstr "Обернення за часом даних з буфера…"
 
-#: src/callbacks.c:8052
+#: src/callbacks.c:7657
 msgid "Reversing clipboard"
 msgstr "Обернення за часом даних з буфера"
 
-#: src/callbacks.c:8084
+#: src/callbacks.c:7689
 msgid "LiVES: Load subtitles from..."
 msgstr "LiVES: Завантажити субтитри з…"
 
-#: src/callbacks.c:8151 src/saveplay.c:970
+#: src/callbacks.c:7753 src/saveplay.c:956
 #, c-format
 msgid "Loaded subtitle file: %s\n"
 msgstr "Завантажений файл субтитрів: %s\n"
 
-#: src/callbacks.c:8220
+#: src/callbacks.c:7821
 msgid "Subtitles were erased.\n"
 msgstr "Субтитри було вилучено.\n"
 
-#: src/callbacks.c:8239
+#: src/callbacks.c:7843
 msgid "LiVES: - Select Audio File"
 msgstr "LiVES: - виберіть файл звукових даних"
 
-#: src/callbacks.c:8250
+#: src/callbacks.c:7878 src/callbacks.c:8232
+msgid ""
+"\n"
+"Loading new audio may cause missing audio in some multitrack layouts.\n"
+"Are you sure you wish to continue ?\n"
+"."
+msgstr ""
+"\n"
+"Завантаження нових звукових даних може призвести до втрати звукових даних у "
+"деяких з багатодоріжкових компонувань.\n"
+"Бажаєте продовжити завантаження?\n"
+"."
+
+#: src/callbacks.c:7989
+#, c-format
+msgid "Opening audio %s, type %s..."
+msgstr "Відкриття звукових даних %s, тип %s…"
+
+#: src/callbacks.c:8023 src/saveplay.c:477
+msgid "Opening audio"
+msgstr "Відкриття звукових даних"
+
+#: src/callbacks.c:8032 src/callbacks.c:8083 src/callbacks.c:8327
+#: src/callbacks.c:8369 src/callbacks.c:8412 src/callbacks.c:10766
+msgid "Cancelling"
+msgstr "Скасування"
+
+#: src/callbacks.c:8137 src/callbacks.c:8454 src/callbacks.c:10803
+#: src/callbacks.c:11477
+msgid "Committing audio"
+msgstr "Додавання звукових даних"
+
+#: src/callbacks.c:8153 src/callbacks.c:8484
+msgid "New Audio"
+msgstr "Новий звук"
+
+#: src/callbacks.c:8194
 msgid "Please set your CD play device in Tools | Preferences | Misc\n"
 msgstr ""
 "Будь ласка, вкажіть ваш пристрій відтворення КД у меню «Інструменти | "
 "Параметри | Інше»\n"
 
-#: src/callbacks.c:8321
+#: src/callbacks.c:8264
 #, c-format
 msgid "Opening CD track %d from %s..."
 msgstr "Відкриття доріжки КД №%d з %s…"
 
-#: src/callbacks.c:8326
+#: src/callbacks.c:8267
 #, c-format
 msgid "CD track %d"
 msgstr "Доріжка КД %d"
 
-#: src/callbacks.c:8373
+#: src/callbacks.c:8313
 msgid "Opening CD track..."
 msgstr "Відкриття доріжки КД…"
 
-#: src/callbacks.c:8415 src/callbacks.c:8461
+#: src/callbacks.c:8355 src/callbacks.c:8401
 msgid "Error loading CD track\n"
 msgstr "Помилка під час завантаження доріжки КД\n"
 
-#: src/callbacks.c:8584
+#: src/callbacks.c:8518
 msgid "layout errors"
 msgstr "помилки компонування"
 
-#: src/callbacks.c:8595
+#: src/callbacks.c:8529
 msgid "Close _Window"
 msgstr "Закрити в_ікно"
 
-#: src/callbacks.c:8606
+#: src/callbacks.c:8540
 msgid "Clear _Errors"
 msgstr "Вилучити записи про п_омилки"
 
-#: src/callbacks.c:8617
+#: src/callbacks.c:8551
 msgid "_Delete affected layouts"
 msgstr "Ви_лучити відповідні компонування"
 
-#: src/callbacks.c:9343 src/callbacks.c:9388
+#: src/callbacks.c:9253 src/callbacks.c:9298
 msgid "Resume"
 msgstr "Поновити"
 
-#: src/callbacks.c:9344
+#: src/callbacks.c:9254
 msgid ""
 "\n"
 "Paused\n"
@@ -2860,27 +2854,23 @@
 "Призупинено\n"
 "(натисніть «Поновити», щоб продовжити обробку)"
 
-#: src/callbacks.c:9345 src/callbacks.c:9406
+#: src/callbacks.c:9255 src/callbacks.c:9315
 msgid "paused..."
 msgstr "призупинено…"
 
-#: src/callbacks.c:9372 src/callbacks.c:9418
-msgid "Pause"
-msgstr "Призупинити"
-
-#: src/callbacks.c:9374 src/callbacks.c:9421
+#: src/callbacks.c:9284 src/callbacks.c:9333
 msgid "resumed..."
 msgstr "поновлено…"
 
-#: src/callbacks.c:9393
+#: src/callbacks.c:9303
 msgid "Keep"
 msgstr "Залишити"
 
-#: src/callbacks.c:9396
+#: src/callbacks.c:9305
 msgid "Enough"
 msgstr "Досить"
 
-#: src/callbacks.c:9401
+#: src/callbacks.c:9310
 #, c-format
 msgid ""
 "\n"
@@ -2893,29 +2883,29 @@
 "(натисніть «%s», щоб зберегти поточне і зупинити обробку)\n"
 "(натисніть «Поновити», щоб продовжити обробку)"
 
-#: src/callbacks.c:9419
+#: src/callbacks.c:9331
 msgid "Cancel"
 msgstr "Скасувати"
 
-#: src/callbacks.c:9558
+#: src/callbacks.c:9478
 msgid "Stop"
 msgstr "Зупинити"
 
-#: src/callbacks.c:10053 src/multitrack.c:13247
+#: src/callbacks.c:9968 src/multitrack.c:13489
 msgid "LiVES: Selected frame"
 msgstr "LiVES: позначений кадр"
 
-#: src/callbacks.c:10061
+#: src/callbacks.c:9976
 msgid "_Save frame as..."
 msgstr "_Зберегти кадр як…"
 
-#: src/callbacks.c:10290
+#: src/callbacks.c:10202
 #, c-format
 msgid "Audio is ahead of video by %.4f secs. at frame %d, with fps %.4f\n"
 msgstr ""
 "Звук випереджає відео на %.4f секунд у кадрі %d, частота кадрів — %.4f\n"
 
-#: src/callbacks.c:10347
+#: src/callbacks.c:10255
 msgid ""
 "\n"
 "\n"
@@ -2929,7 +2919,7 @@
 "Щоб змусити її працювати на інших платформах, надсилайте латки до коду.\n"
 "\n"
 
-#: src/callbacks.c:10353
+#: src/callbacks.c:10261
 msgid ""
 "\n"
 "\n"
@@ -2942,7 +2932,7 @@
 "програму «xwininfo».\n"
 "\n"
 
-#: src/callbacks.c:10429 src/callbacks.c:11479
+#: src/callbacks.c:10334 src/callbacks.c:11395
 msgid ""
 "\n"
 "Record time must be greater than 0.\n"
@@ -2950,7 +2940,7 @@
 "\n"
 "Час запису має бути більшим за 0.\n"
 
-#: src/callbacks.c:10440
+#: src/callbacks.c:10346
 msgid ""
 "Capture an External Window:\n"
 "\n"
@@ -2965,11 +2955,11 @@
 "Натисніть «Скасувати», щоб скасувати дію.\n"
 "\n"
 
-#: src/callbacks.c:10445
+#: src/callbacks.c:10351
 msgid "External window was released.\n"
 msgstr "Зовнішнє вікно було закрито.\n"
 
-#: src/callbacks.c:10479
+#: src/callbacks.c:10385
 msgid ""
 "Click on a Window to Capture it\n"
 "Press 'q' to stop recording"
@@ -2977,7 +2967,7 @@
 "Клацніть кнопкою миші у вікні, щоб почати захоплення зображення.\n"
 "Натисніть клавішу «q», щоб припинити запис."
 
-#: src/callbacks.c:10513
+#: src/callbacks.c:10419
 #, c-format
 msgid ""
 "\n"
@@ -2993,19 +2983,19 @@
 "Натисніть «Зупинити» або клавішу «q», щоб завершити захоплення.\n"
 "(Типово, буде використано швидкість захоплення у %.3f кадрів на секунду.)\n"
 
-#: src/callbacks.c:10539
+#: src/callbacks.c:10443
 msgid "LiVES was unable to capture this window. Sorry.\n"
 msgstr "LiVES не вдалося захопити дані з цього вікна. Вибачте.\n"
 
-#: src/callbacks.c:10695
+#: src/callbacks.c:10601
 msgid "Export Selected Audio as..."
 msgstr "Експортувати позначені звукові дані як…"
 
-#: src/callbacks.c:10699
+#: src/callbacks.c:10604
 msgid "Export Audio as..."
 msgstr "Експортувати звукові дані як…"
 
-#: src/callbacks.c:10714
+#: src/callbacks.c:10619
 msgid ""
 "\n"
 "\n"
@@ -3019,86 +3009,86 @@
 "Натисніть кнопку «Гаразд», щоб експорт було виконано на новій швидкості, або "
 "кнопку «Скасувати», щоб експортувати його з початковою швидкістю.\n"
 
-#: src/callbacks.c:10720
+#: src/callbacks.c:10625
 #, c-format
 msgid "Exporting audio frames %d to %d as %s..."
 msgstr "Експортування звуку кадрів від %d до %d як %s…"
 
-#: src/callbacks.c:10725
+#: src/callbacks.c:10629
 #, c-format
 msgid "Exporting audio as %s..."
 msgstr "Експортування звуку як %s…"
 
-#: src/callbacks.c:10751
+#: src/callbacks.c:10655
 msgid "Exporting audio"
 msgstr "Експортування звукових даних"
 
-#: src/callbacks.c:10782
+#: src/callbacks.c:10695
 msgid "LiVES: - Append Audio File"
 msgstr "LiVES: - долучення файла звукових даних"
 
-#: src/callbacks.c:10825
+#: src/callbacks.c:10739
 #, c-format
 msgid "Appending audio file %s..."
 msgstr "Долучення звукового файла %s…"
 
-#: src/callbacks.c:10836
+#: src/callbacks.c:10756
 msgid "Appending audio"
 msgstr "Долучення звукових даних"
 
-#: src/callbacks.c:10892
+#: src/callbacks.c:10818
 msgid "Append Audio"
 msgstr "Долучення звуку"
 
-#: src/callbacks.c:10952
+#: src/callbacks.c:10883
 #, c-format
 msgid "Padding audio to %.2f seconds..."
 msgstr "Доповнення звукових даних до %.2f секунд…"
 
-#: src/callbacks.c:10954
+#: src/callbacks.c:10885
 #, c-format
 msgid "Trimming audio from %.2f to %.2f seconds..."
 msgstr "Обрізання звукових даних від позиції %.2f с до позиції %.2f с…"
 
-#: src/callbacks.c:10973
+#: src/callbacks.c:10904
 msgid "Trimming/Padding audio"
 msgstr "Обрізання/Доповнення звукових даних"
 
-#: src/callbacks.c:10981
+#: src/callbacks.c:10912
 msgid "Trim/Pad Audio"
 msgstr "Обрізати/Доповнити звукові дані"
 
-#: src/callbacks.c:11055
+#: src/callbacks.c:10982
 msgid "Fading audio in"
 msgstr "Наростання звуку"
 
-#: src/callbacks.c:11056
+#: src/callbacks.c:10983
 msgid "Fade audio in"
 msgstr "Наростання звуку"
 
-#: src/callbacks.c:11061
+#: src/callbacks.c:10987
 msgid "Fading audio out"
 msgstr "Поступове зменшення гучності"
 
-#: src/callbacks.c:11062
+#: src/callbacks.c:10988
 msgid "Fade audio out"
 msgstr "Поступове зменшення гучності"
 
-#: src/callbacks.c:11085
+#: src/callbacks.c:11011
 #, c-format
 msgid "%s over %.1f seconds..."
 msgstr "%s після %.1f секунд…"
 
-#: src/callbacks.c:11087
+#: src/callbacks.c:11013
 #, c-format
 msgid "%s from time %.2f seconds to %.2f seconds..."
 msgstr "%s від часу %.2f секунд до часу %.2f секунд…"
 
-#: src/callbacks.c:11094
+#: src/callbacks.c:11020
 msgid "Fading audio..."
 msgstr "Зміна гучності…"
 
-#: src/callbacks.c:11194
+#: src/callbacks.c:11119
 msgid ""
 "\n"
 "Deleting all audio will close this file.\n"
@@ -3108,46 +3098,46 @@
 "Вилучення всіх звукових даних призведе до закриття цього файла.\n"
 "Ви бажаєте саме цього?"
 
-#: src/callbacks.c:11197
+#: src/callbacks.c:11122
 msgid "Deleting all audio..."
 msgstr "Вилучення всіх звукових даних…"
 
-#: src/callbacks.c:11203
+#: src/callbacks.c:11127
 #, c-format
 msgid "Deleting audio from %.2f to %.2f seconds..."
 msgstr "Вилучення звукових даних від позиції %.2f с до позиції %.2f с…"
 
-#: src/callbacks.c:11290
+#: src/callbacks.c:11214
 msgid "Deleting Audio"
 msgstr "Вилучення звуку"
 
-#: src/callbacks.c:11297
+#: src/callbacks.c:11221
 msgid "Delete Audio"
 msgstr "Вилучити звук"
 
-#: src/callbacks.c:11636
+#: src/callbacks.c:11550
 msgid "Record new audio"
 msgstr "Запис нових звукових даних"
 
-#: src/callbacks.c:11725
+#: src/callbacks.c:11640
 #, c-format
 msgid "Inserting silence from %.2f to %.2f seconds..."
 msgstr "Вставка тиші від позиції %.2f с до позиції %.2f с…"
 
-#: src/callbacks.c:11754
+#: src/callbacks.c:11666
 msgid "Inserting Silence"
 msgstr "Вставка тиші"
 
-#: src/merge.c:85
+#: src/merge.c:96
 msgid "LiVES: - Merge"
 msgstr "LiVES: - Об’єднання"
 
-#: src/merge.c:102
+#: src/merge.c:113
 #, c-format
 msgid "Merge Clipboard [ %d Frames ]       With Selection [ %d Frames ]"
 msgstr "Об’єднання буфера [ %d кадрів ]       з позначеним [ %d кадрів ]"
 
-#: src/merge.c:107
+#: src/merge.c:118
 #, c-format
 msgid ""
 "Merge Clipboard [ %d Frames (resampled) ]       With Selection [ %d Frames ]"
@@ -3155,585 +3145,585 @@
 "Об’єднання буфера [ %d кадрів (змінена дискретизація) ]       з позначеним "
 "[ %d кадрів ]"
 
-#: src/merge.c:118
+#: src/merge.c:130
 msgid "Align _Starts"
 msgstr "Вирівняти по_чатки"
 
-#: src/merge.c:123
+#: src/merge.c:135
 msgid "Align _Ends"
 msgstr "Вирівняти _кінці"
 
-#: src/merge.c:134
+#: src/merge.c:146
 msgid "What to do with extra clipboard frames -"
 msgstr "Спосіб обробки додаткових кадрів з буфера даних —"
 
-#: src/merge.c:137
+#: src/merge.c:149
 msgid "_Insert Frames"
 msgstr "_Вставити кадри"
 
-#: src/merge.c:143
+#: src/merge.c:155
 msgid "_Drop Frames"
 msgstr "Ви_кинути кадри"
 
-#: src/merge.c:149
+#: src/merge.c:160
 msgid "Number of Times to Loop Clipboard"
 msgstr "Кількість повторень даних з буфера даних"
 
-#: src/merge.c:160
+#: src/merge.c:171
 msgid "_Loop Clipboard to Fit Selection"
 msgstr "_Циклічно додати для заповнення позначеної ділянки"
 
-#: src/merge.c:173
+#: src/merge.c:184
 msgid "_Transition Method:"
 msgstr "Спосіб п_ереходу:"
 
-#: src/merge.c:394
+#: src/merge.c:395
 msgid "Merging clipboard with selection..."
 msgstr "Об’єднання даних з буфера з позначеною ділянкою…"
 
-#: src/merge.c:551
+#: src/merge.c:539
 msgid "Merge done.\n"
 msgstr "Об’єднання завершено.\n"
 
-#: src/gui.c:123
+#: src/gui.c:122
 msgid "_Custom Generators"
 msgstr "_Нетипові породжувачі"
 
-#: src/gui.c:124
+#: src/gui.c:123
 msgid "_Custom Effects"
 msgstr "_Нетипові ефекти"
 
-#: src/gui.c:125
+#: src/gui.c:124
 msgid "Custom _Utilities"
 msgstr "Нетипові _допоміжні програми"
 
-#: src/gui.c:352 src/multitrack.c:5964
+#: src/gui.c:351 src/multitrack.c:6143
 msgid "_File"
 msgstr "_Файл"
 
-#: src/gui.c:367 src/multitrack.c:5989
+#: src/gui.c:366 src/multitrack.c:6168
 msgid "_Open File/Directory"
 msgstr "_Відкрити файл або каталог"
 
-#: src/gui.c:373
+#: src/gui.c:372
 msgid "O_pen Part of File..."
 msgstr "В_ідкрити частину файла…"
 
-#: src/gui.c:379 src/gui.c:383 src/multitrack.c:6006 src/multitrack.c:6023
-#: src/multitrack.c:6028
+#: src/gui.c:378 src/gui.c:382 src/multitrack.c:6185 src/multitrack.c:6202
+#: src/multitrack.c:6207
 msgid "Open _Location/Stream..."
 msgstr "Відкрити _адресу/потік…"
 
-#: src/gui.c:393 src/multitrack.c:6016
+#: src/gui.c:392 src/multitrack.c:6195
 msgid "Open _Youtube Clip..."
 msgstr "Відкрити к_ліп Youtube…"
 
-#: src/gui.c:404
+#: src/gui.c:403
 msgid "Import from _dvd/vcd..."
 msgstr "Ім_портувати з DVD/VCD…"
 
-#: src/gui.c:413
+#: src/gui.c:412
 msgid "Import from _dvd"
 msgstr "Імпорт_увати з DVD"
 
-#: src/gui.c:416
+#: src/gui.c:415
 msgid "Import from _vcd"
 msgstr "Імпорту_вати з VCD"
 
-#: src/gui.c:419
+#: src/gui.c:418
 msgid "_Import from Firewire"
 msgstr "І_мпортувати з Firewire"
 
-#: src/gui.c:428 src/multitrack.c:6086
+#: src/gui.c:427 src/multitrack.c:6265
 msgid "Import from _Firewire Device (dv)"
 msgstr "Імпортувати з п_ристрою Firewire (dv)"
 
-#: src/gui.c:429 src/multitrack.c:6094
+#: src/gui.c:428 src/multitrack.c:6273
 msgid "Import from _Firewire Device (hdv)"
 msgstr "Імпортувати з п_ристрою Firewire (hdv)"
 
-#: src/gui.c:457
+#: src/gui.c:456
 msgid "_Add Webcam/TV card..."
 msgstr "_Додати вебкамеру/ТБ-картку…"
 
-#: src/gui.c:476
+#: src/gui.c:475
 msgid "Add _Unicap Device"
 msgstr "Додати прис_трій unicap"
 
-#: src/gui.c:486
+#: src/gui.c:485
 msgid "Add Live _Firewire Device"
 msgstr "Додати потік даних з п_ристрою firewire"
 
-#: src/gui.c:495
+#: src/gui.c:494
 msgid "Add _TV Device"
 msgstr "Додати п_ристрій ТБ"
 
-#: src/gui.c:510 src/multitrack.c:6117
+#: src/gui.c:509 src/multitrack.c:6296
 msgid "_Recent Files..."
 msgstr "_Нещодавні файли…"
 
-#: src/gui.c:560 src/multitrack.c:6177
+#: src/gui.c:559 src/multitrack.c:6356
 msgid "_Reload Clip Set..."
 msgstr "П_ерезавантажити набір кліпів…"
 
-#: src/gui.c:564 src/multitrack.c:6185
+#: src/gui.c:563 src/multitrack.c:6364
 msgid "Close/Sa_ve All Clips"
 msgstr "Закрити/З_берегти всі кліпи"
 
-#: src/gui.c:575
+#: src/gui.c:574
 msgid "_Encode Clip As..."
 msgstr "За_кодувати кліп як…"
 
-#: src/gui.c:577
+#: src/gui.c:576
 msgid "Encode _Selection As..."
 msgstr "Закодувати _позначене як…"
 
-#: src/gui.c:584
+#: src/gui.c:583
 msgid "_Close This Clip"
 msgstr "_Закрити цей кліп"
 
-#: src/gui.c:595
+#: src/gui.c:594
 msgid "_Backup Clip as .lv1..."
 msgstr "Створити _резервну копію кліпу як .lv1…"
 
-#: src/gui.c:604
+#: src/gui.c:603
 msgid "_Restore Clip from .lv1..."
 msgstr "Ві_дновити кліп з .lv1…"
 
-#: src/gui.c:615
+#: src/gui.c:614
 msgid "Encode/Load/Backup _with Sound"
 msgstr "Кодування/Завантаження/Резервне копіювання з_і звуком"
 
-#: src/gui.c:620
+#: src/gui.c:619
 msgid "Auto load subtitles"
 msgstr "Автоматично завантажувати субтитри"
 
-#: src/gui.c:628 src/multitrack.c:6224
+#: src/gui.c:627 src/multitrack.c:6403
 msgid "Clean _up Diskspace"
 msgstr "Споро_жнити місце на диску"
 
-#: src/gui.c:636 src/multitrack.c:6257
+#: src/gui.c:635 src/multitrack.c:6436
 msgid "_Edit"
 msgstr "З_міни"
 
-#: src/gui.c:685
+#: src/gui.c:684
 msgid "_MULTITRACK mode"
 msgstr "Режим _декількох доріжок"
 
-#: src/gui.c:696
+#: src/gui.c:695
 msgid "_Copy Selection"
 msgstr "_Копіювати позначене"
 
-#: src/gui.c:705
+#: src/gui.c:704
 msgid "Cu_t Selection"
 msgstr "Ви_різати позначене"
 
-#: src/gui.c:714
+#: src/gui.c:713
 msgid "_Insert from Clipboard..."
 msgstr "В_ставити з буфера обміну…"
 
-#: src/gui.c:730
+#: src/gui.c:729
 msgid "Paste as _New"
 msgstr "Вставити як _новий"
 
-#: src/gui.c:739
+#: src/gui.c:738
 msgid "_Merge Clipboard with Selection..."
 msgstr "_Об’єднати вміст буфера з позначеним…"
 
-#: src/gui.c:746
+#: src/gui.c:745
 msgid "_Delete Selection"
 msgstr "Ви_лучити позначене"
 
-#: src/gui.c:764
+#: src/gui.c:763
 msgid "Decouple _Video from Audio"
 msgstr "Розділити _відео і звук"
 
-#: src/gui.c:772
+#: src/gui.c:771
 msgid "_Select..."
 msgstr "По_значити…"
 
-#: src/gui.c:786
+#: src/gui.c:785
 msgid "Select _All Frames"
 msgstr "Позна_чити всі кадри"
 
-#: src/gui.c:794
+#: src/gui.c:793
 msgid "_Start Frame Only"
 msgstr "_Лише перший кадр"
 
-#: src/gui.c:802
+#: src/gui.c:801
 msgid "_End Frame Only"
 msgstr "Лише _останній кадр"
 
-#: src/gui.c:813
+#: src/gui.c:812
 msgid "Select from _First Frame"
 msgstr "Позначити від п_ершого кадру"
 
-#: src/gui.c:817
+#: src/gui.c:816
 msgid "Select to _Last Frame"
 msgstr "Позначити від _останнього кадру"
 
-#: src/gui.c:821
+#: src/gui.c:820
 msgid "Select Last Insertion/_Merge"
 msgstr "Позначити останню вставку/о_б’єднання"
 
-#: src/gui.c:825
+#: src/gui.c:824
 msgid "Select Last _Effect"
 msgstr "Позначити ділянку останнього _ефекту"
 
-#: src/gui.c:829
+#: src/gui.c:828
 msgid "_Invert Selection"
 msgstr "І_нвертувати позначення"
 
-#: src/gui.c:837
+#: src/gui.c:836
 msgid "_Lock Selection Width"
 msgstr "За_блокувати тривалість позначеного"
 
-#: src/gui.c:842 src/multitrack.c:6409
+#: src/gui.c:841 src/multitrack.c:6591
 msgid "_Play"
 msgstr "_Відтворення"
 
-#: src/gui.c:854
+#: src/gui.c:853
 msgid "_Play All"
 msgstr "_Відтворити все"
 
-#: src/gui.c:869
+#: src/gui.c:868
 msgid "Pla_y Selection"
 msgstr "Ві_дтворити позначене"
 
-#: src/gui.c:877
+#: src/gui.c:876
 msgid "Play _Clipboard"
 msgstr "Відтворити да_ні з буфера обміну"
 
-#: src/gui.c:899 src/multitrack.c:6441
+#: src/gui.c:898 src/multitrack.c:6623
 msgid "_Stop"
 msgstr "З_упинити"
 
-#: src/gui.c:914 src/multitrack.c:6453
+#: src/gui.c:913 src/multitrack.c:6635
 msgid "Re_wind"
 msgstr "На по_чаток"
 
-#: src/gui.c:946 src/multitrack.c:6471
+#: src/gui.c:945 src/multitrack.c:6653
 msgid "_Full Screen"
 msgstr "_Повноекранний режим"
 
-#: src/gui.c:955
+#: src/gui.c:954
 msgid "_Double Size"
 msgstr "Подв_ійний розмір"
 
-#: src/gui.c:963 src/multitrack.c:6479
+#: src/gui.c:962 src/multitrack.c:6661
 msgid "Play in _Separate Window"
 msgstr "Відтворити у _окремому вікні"
 
-#: src/gui.c:972
+#: src/gui.c:971
 msgid "_Blank Background"
 msgstr "Спо_рожнити тло"
 
-#: src/gui.c:979
+#: src/gui.c:978
 msgid "(Auto)_loop Video (to fit audio track)"
 msgstr "(Авто)з_ациклити відео (відповідно до звукової доріжки)"
 
-#: src/gui.c:988 src/multitrack.c:6487
+#: src/gui.c:987 src/multitrack.c:6669
 msgid "L_oop Continuously"
 msgstr "Неперервний _цикл"
 
-#: src/gui.c:997
+#: src/gui.c:996
 msgid "Pin_g Pong Loops"
 msgstr "Ци_кл з відбиттям"
 
-#: src/gui.c:1005 src/multitrack.c:6495
+#: src/gui.c:1004 src/multitrack.c:6677
 msgid "_Mute"
 msgstr "В_имкнути звук"
 
-#: src/gui.c:1017
+#: src/gui.c:1016
 msgid "Separate Window 'S_ticky' Mode"
 msgstr "Ре_жим «прилипання» окремих вікон"
 
-#: src/gui.c:1025
+#: src/gui.c:1024
 msgid "S_how Frame Counter"
 msgstr "По_казати лічильник кадрів"
 
-#: src/gui.c:1035
+#: src/gui.c:1034
 msgid "Show Subtitles"
 msgstr "Показати субтитри"
 
-#: src/gui.c:1045
+#: src/gui.c:1044
 msgid "Letterbox mode"
 msgstr "Режим додавання чорних смуг"
 
-#: src/gui.c:1051 src/multitrack.c:6507
+#: src/gui.c:1050 src/multitrack.c:6689
 msgid "Effect_s"
 msgstr "Е_фекти"
 
-#: src/gui.c:1054
+#: src/gui.c:1053
 msgid "Effects are applied to the current selection."
 msgstr "Ефекти застосовують до поточного позначеного фрагмента."
 
-#: src/gui.c:1067
+#: src/gui.c:1066
 msgid "_Run Test Rendered Effect/Tool/Generator..."
 msgstr "_Запустити тестовий ефект обробки/інструмент/породжувач…"
 
-#: src/gui.c:1072 src/multitrack.c:7123
+#: src/gui.c:1071 src/multitrack.c:7299
 msgid "_Tools"
 msgstr "_Інструменти"
 
-#: src/gui.c:1075
+#: src/gui.c:1074
 msgid "Tools are applied to complete clips."
 msgstr "Інструменти застосовують до цілих кліпів."
 
-#: src/gui.c:1085
+#: src/gui.c:1084
 msgid "_Reverse Clipboard"
 msgstr "_Обернути порядок у буфері обміну даних"
 
-#: src/gui.c:1094
+#: src/gui.c:1093
 msgid "_Change Playback/Save Speed..."
 msgstr "З_мінити швидкість відтворення або збереження…"
 
-#: src/gui.c:1099
+#: src/gui.c:1098
 msgid "Resample _Video to New Frame Rate..."
 msgstr "_Змінити частоту кадрів відео…"
 
-#: src/gui.c:1105
+#: src/gui.c:1104
 msgid "_Utilities"
 msgstr "_Допоміжні програми"
 
-#: src/gui.c:1110
+#: src/gui.c:1109
 msgid "Custom _Tools"
 msgstr "Нетипові _інструменти"
 
-#: src/gui.c:1116 src/multitrack.c:7149
+#: src/gui.c:1115 src/multitrack.c:7325
 msgid "_Generate"
 msgstr "С_творити"
 
-#: src/gui.c:1126
+#: src/gui.c:1125
 msgid "Loading rendered effect plugins..."
 msgstr "Завантаження додатків ефектів показу…"
 
-#: src/gui.c:1139
+#: src/gui.c:1138
 msgid "Load _Subtitles from File..."
 msgstr "Завантажити с_убтитри з файла…"
 
-#: src/gui.c:1144
+#: src/gui.c:1143
 msgid "Erase subtitles"
 msgstr "Вилучити субтитри"
 
-#: src/gui.c:1152 src/multitrack.c:7158
+#: src/gui.c:1151 src/multitrack.c:7334
 msgid "Capture _External Window... "
 msgstr "Захоплення відео з зовні_шнього вікна… "
 
-#: src/gui.c:1159 src/multitrack.c:7173
+#: src/gui.c:1158 src/multitrack.c:7349
 msgid "_Preferences..."
 msgstr "_Параметри…"
 
-#: src/gui.c:1172
+#: src/gui.c:1171
 msgid "_Audio"
 msgstr "_Звук"
 
-#: src/gui.c:1184
+#: src/gui.c:1183
 msgid "Load _New Audio for Clip..."
 msgstr "Завантажити _новий звук для кліпу…"
 
-#: src/gui.c:1190
+#: src/gui.c:1189
 msgid "Load _CD Track..."
 msgstr "Завантажити _композицію з КД…"
 
-#: src/gui.c:1191
+#: src/gui.c:1190
 msgid "E_ject CD"
 msgstr "Ви_штовхнути лоток КД"
 
-#: src/gui.c:1205
+#: src/gui.c:1204
 msgid "Record E_xternal Audio..."
 msgstr "Записати з_овнішній звук…"
 
-#: src/gui.c:1218
+#: src/gui.c:1217
 msgid "to New _Clip..."
 msgstr "до нового _кліпу…"
 
-#: src/gui.c:1222
+#: src/gui.c:1221
 msgid "to _Selection"
 msgstr "до _позначеного"
 
-#: src/gui.c:1230
+#: src/gui.c:1229
 msgid "Fade Audio _In..."
 msgstr "Поступове на_ростання гучності…"
 
-#: src/gui.c:1234
+#: src/gui.c:1233
 msgid "Fade Audio _Out..."
 msgstr "Поступове змен_шення гучності…"
 
-#: src/gui.c:1244
+#: src/gui.c:1243
 msgid "_Export Audio..."
 msgstr "_Експортувати звук…"
 
-#: src/gui.c:1257
+#: src/gui.c:1256
 msgid "Export _Selected Audio..."
 msgstr "Експортувати поз_начений звук…"
 
-#: src/gui.c:1261
+#: src/gui.c:1260
 msgid "Export _All Audio..."
 msgstr "Експорт_увати весь звук…"
 
-#: src/gui.c:1265
+#: src/gui.c:1264
 msgid "_Append Audio..."
 msgstr "Д_олучити звук…"
 
-#: src/gui.c:1270
+#: src/gui.c:1269
 msgid "_Trim/Pad Audio..."
 msgstr "_Обрізати/Доповнити звукову доріжку…"
 
-#: src/gui.c:1283
+#: src/gui.c:1282
 msgid "Trim/Pad Audio to _Selection"
 msgstr "Обрізати/Доповнити звукову доріжку до _позначеного"
 
-#: src/gui.c:1288
+#: src/gui.c:1287
 msgid "Trim/Pad Audio from Beginning to _Play Start"
 msgstr "Обрізати/Доповнити звукову доріжку від початку до позиції _відтворення"
 
-#: src/gui.c:1293
+#: src/gui.c:1292
 msgid "_Delete Audio..."
 msgstr "В_илучити звук…"
 
-#: src/gui.c:1306
+#: src/gui.c:1305
 msgid "Delete _Selected Audio"
 msgstr "Вилучити _позначений звук"
 
-#: src/gui.c:1310
+#: src/gui.c:1309
 msgid "Delete _All Audio"
 msgstr "Вилучити в_есь звук"
 
-#: src/gui.c:1314
+#: src/gui.c:1313
 msgid "Insert _Silence in Selection"
 msgstr "Вставити _тишу у позначене"
 
-#: src/gui.c:1319
+#: src/gui.c:1318
 msgid "_Resample Audio..."
 msgstr "Змінити _частоту звуку…"
 
-#: src/gui.c:1324
+#: src/gui.c:1323
 msgid "_Info"
 msgstr "І_нформація"
 
-#: src/gui.c:1336
+#: src/gui.c:1335
 msgid "Show Clip _Info"
 msgstr "Показати _відомості щодо кліпу"
 
-#: src/gui.c:1344
+#: src/gui.c:1343
 msgid "Show/_Edit File Comments"
 msgstr "Переглянути або _змінити коментарі у файлі"
 
-#: src/gui.c:1349
+#: src/gui.c:1348
 msgid "Show _Clipboard Info"
 msgstr "Показати відомості щодо _буфера даних"
 
-#: src/gui.c:1360 src/multitrack.c:7286
+#: src/gui.c:1359 src/multitrack.c:7462
 msgid "Show _Messages"
 msgstr "Показати _повідомлення"
 
-#: src/gui.c:1364 src/multitrack.c:7365
+#: src/gui.c:1363 src/multitrack.c:7541
 msgid "Show _Layout Errors"
 msgstr "Показати помилки _компонування"
 
-#: src/gui.c:1369 src/multitrack.c:7263
+#: src/gui.c:1368 src/multitrack.c:7439
 msgid "_Clips"
 msgstr "_Кліпи"
 
-#: src/gui.c:1381
+#: src/gui.c:1380
 msgid "_Rename Current Clip in Menu..."
 msgstr "П_ерейменувати поточний кліп у меню…"
 
-#: src/gui.c:1399
+#: src/gui.c:1398
 msgid "A_dvanced"
 msgstr "Д_одаткові"
 
-#: src/gui.c:1412
+#: src/gui.c:1411
 msgid "_RFX Effects/Tools/Utilities"
 msgstr "_Ефекти/Інструменти/Допоміжні програми RFX"
 
-#: src/gui.c:1424
+#: src/gui.c:1423
 msgid "_New Test RFX Script..."
 msgstr "_Створити тестовий скрипт RFX…"
 
-#: src/gui.c:1428
+#: src/gui.c:1427
 msgid "_Copy RFX Script to Test..."
 msgstr "К_опіювати скрипт RFX до тестових…"
 
-#: src/gui.c:1432
+#: src/gui.c:1431
 msgid "_Edit Test RFX Script..."
 msgstr "_Змінити тестовий скрипт RFX…"
 
-#: src/gui.c:1436
+#: src/gui.c:1435
 msgid "Rena_me Test RFX Script..."
 msgstr "Пере_йментувати тестовий скрипт RFX…"
 
-#: src/gui.c:1440
+#: src/gui.c:1439
 msgid "_Delete Test RFX Script..."
 msgstr "_Вилучити тестовий скрипт RFX…"
 
-#: src/gui.c:1450
+#: src/gui.c:1449
 msgid "_Promote Test Rendered Effect/Tool/Generator..."
 msgstr "Підн_яти тестовий ефект обробки/інструмент/породжувач у списку…"
 
-#: src/gui.c:1457
+#: src/gui.c:1456
 msgid "_Import Custom RFX script..."
 msgstr "_Імпортувати нетиповий скрипт RFX…"
 
-#: src/gui.c:1461
+#: src/gui.c:1460
 msgid "E_xport Custom RFX script..."
 msgstr "Е_кспортувати нетиповий скрипт RFX…"
 
-#: src/gui.c:1465
+#: src/gui.c:1464
 msgid "De_lete Custom RFX Script..."
 msgstr "Ви_лучити нетиповий скрипт RFX…"
 
-#: src/gui.c:1472
+#: src/gui.c:1471
 msgid "Re_build all RFX plugins"
 msgstr "Перез_ібрати всі додатки RFX"
 
-#: src/gui.c:1501
+#: src/gui.c:1498
 msgid "Receive _LiVES stream from..."
 msgstr "_Отримати потік даних LiVES з…"
 
-#: src/gui.c:1506
+#: src/gui.c:1503
 msgid "_Send LiVES stream to..."
 msgstr "_Надіслати потік даних LiVES до…"
 
-#: src/gui.c:1515
+#: src/gui.c:1512
 #, c-format
 msgid "Open _yuv4mpeg stream on %sstream.yuv..."
 msgstr "Відкрити по_тік yuv4mpeg на %sstream.yuv..."
 
-#: src/gui.c:1536
+#: src/gui.c:1534
 msgid "_Import Project (.lv2)..."
 msgstr "_Імпортувати проект (.lv2)…"
 
-#: src/gui.c:1540
+#: src/gui.c:1538
 msgid "E_xport Project (.lv2)..."
 msgstr "Е_кспортувати проект (.lv2)…"
 
-#: src/gui.c:1545
+#: src/gui.c:1543
 msgid "_VJ"
 msgstr "Ві-д_жей"
 
-#: src/gui.c:1557
+#: src/gui.c:1555
 msgid "Real Time _Effect Mapping"
 msgstr "Відображення _ефектів реального часу"
 
-#: src/gui.c:1563
+#: src/gui.c:1561
 msgid "Bind real time effects to ctrl-number keys."
 msgstr "Пов’язати ефекти реального часу з комбінаціями клавіш ctrl-цифра."
 
-#: src/gui.c:1565
+#: src/gui.c:1563
 msgid "Set Real Time Effect _Defaults"
 msgstr "Встановити _типові параметри ефектів реального часу"
 
-#: src/gui.c:1567
+#: src/gui.c:1565
 msgid "Set default parameter values for real time effects."
 msgstr "Встановити типові значення параметрів ефектів реального часу."
 
-#: src/gui.c:1580
+#: src/gui.c:1578
 msgid "Save Real Time Effect _Defaults"
 msgstr "Зберегти _типові параметри ефектів реального часу"
 
-#: src/gui.c:1583
+#: src/gui.c:1581
 msgid ""
 "Save real time effect defaults so they will be restored each time you use "
 "LiVES."
@@ -3741,146 +3731,146 @@
 "Зберегти типові параметри ефектів реального часу, щоб програма завантажувала "
 "їх кожного разу, коли ви користуєтеся LiVES."
 
-#: src/gui.c:1589
+#: src/gui.c:1587
 msgid "_Reset all playback speeds and positions"
 msgstr "С_кинути всі швидкості та позиції відтворення"
 
-#: src/gui.c:1592
+#: src/gui.c:1590
 msgid ""
 "Reset all playback positions to frame 1, and reset all playback frame rates."
 msgstr ""
 "Перевести всі позиції відтворення на перший кадр та відновити початкові "
 "значення частоти кадрів відтворення."
 
-#: src/gui.c:1594
+#: src/gui.c:1592
 msgid "_MIDI/joystick interface"
 msgstr "_Інтерфейс MIDI/джойстика"
 
-#: src/gui.c:1609
+#: src/gui.c:1607
 msgid "_MIDI/joystick learner..."
 msgstr "_Навчання MIDI/джойстика…"
 
-#: src/gui.c:1614
+#: src/gui.c:1612
 msgid "_Save device mapping..."
 msgstr "З_берегти карту відображення пристроїв…"
 
-#: src/gui.c:1620
+#: src/gui.c:1618
 msgid "_Load device mapping..."
 msgstr "_Завантажити карту відображення пристроїв…"
 
-#: src/gui.c:1628
+#: src/gui.c:1626
 msgid "Show VJ _Keys"
 msgstr "Показати _клавіші ві-джея"
 
-#: src/gui.c:1632
+#: src/gui.c:1630
 msgid "To_ys"
 msgstr "За_бавки"
 
-#: src/gui.c:1644
+#: src/gui.c:1642
 msgid "_None"
 msgstr "_Жодних"
 
-#: src/gui.c:1652
+#: src/gui.c:1650
 msgid "_Autolives"
 msgstr "_Автоматика"
 
-#: src/gui.c:1657
+#: src/gui.c:1655
 msgid "_Mad Frames"
 msgstr "_Шалені кадри"
 
-#: src/gui.c:1662
+#: src/gui.c:1660
 msgid "_LiVES TV (broadband)"
 msgstr "_ТБ LiVES (широкосмугове)"
 
-#: src/gui.c:1672 src/multitrack.c:7387
+#: src/gui.c:1670 src/multitrack.c:7563
 msgid "_Help"
 msgstr "_Довідка"
 
-#: src/gui.c:1684 src/multitrack.c:7407
+#: src/gui.c:1682 src/multitrack.c:7583
 msgid "_Manual (opens in browser)"
 msgstr "_Підручник (буде відкрито у переглядачі)"
 
-#: src/gui.c:1691 src/multitrack.c:7416
+#: src/gui.c:1689 src/multitrack.c:7592
 msgid "_Donate to the project !"
 msgstr "Підтримати проект _фінансово!"
 
-#: src/gui.c:1695 src/multitrack.c:7420
+#: src/gui.c:1693 src/multitrack.c:7596
 msgid "_Email the author"
 msgstr "_Надіслати електронного листа авторові"
 
-#: src/gui.c:1699 src/multitrack.c:7424
+#: src/gui.c:1697 src/multitrack.c:7600
 msgid "Report a _bug"
 msgstr "Повідомити про _ваду"
 
-#: src/gui.c:1703 src/multitrack.c:7428
+#: src/gui.c:1701 src/multitrack.c:7604
 msgid "Suggest a _feature"
 msgstr "Запропонувати _можливість"
 
-#: src/gui.c:1707 src/multitrack.c:7432
+#: src/gui.c:1705 src/multitrack.c:7608
 msgid "Assist with _translating"
 msgstr "Допомогти з п_ерекладом"
 
-#: src/gui.c:1714 src/multitrack.c:7439
+#: src/gui.c:1712 src/multitrack.c:7615
 msgid "_Troubleshoot"
 msgstr "_Усування вад"
 
-#: src/gui.c:1718 src/multitrack.c:7443
+#: src/gui.c:1716 src/multitrack.c:7619
 msgid "_About"
 msgstr "_Про програму"
 
-#: src/gui.c:1752
+#: src/gui.c:1750
 msgid "Rewind to start (w)"
 msgstr "Повернутися на початок (w)"
 
-#: src/gui.c:1760 src/multitrack.c:16720
+#: src/gui.c:1758 src/multitrack.c:17010
 msgid "Play all (p)"
 msgstr "Відтворити все (p)"
 
-#: src/gui.c:1768 src/gui.c:1877
+#: src/gui.c:1766 src/gui.c:1876
 msgid "Stop playback (q)"
 msgstr "Зупинити відтворення (q)"
 
-#: src/gui.c:1779
+#: src/gui.c:1777
 msgid "Play selection (y)"
 msgstr "Відтворити позначене (y)"
 
-#: src/gui.c:1832
+#: src/gui.c:1829
 msgid "Volume"
 msgstr "Гучність"
 
-#: src/gui.c:1854
+#: src/gui.c:1853
 msgid "Audio volume (1.00)"
 msgstr "Гучність звуку (1.00)"
 
-#: src/gui.c:1883
+#: src/gui.c:1882
 msgid "Unblank background (b)"
 msgstr "Показати тло (b)"
 
-#: src/gui.c:1929
+#: src/gui.c:1928
 msgid "Play slower (ctrl-down)"
 msgstr "Уповільнити відтворення (ctrl-вниз)"
 
-#: src/gui.c:1935
+#: src/gui.c:1934
 msgid "Play faster (ctrl-up)"
 msgstr "Пришвидшити відтворення (ctrl-вгору)"
 
-#: src/gui.c:1942
+#: src/gui.c:1941
 msgid "Skip back (ctrl-left)"
 msgstr "Повернутися назад (ctrl-ліворуч)"
 
-#: src/gui.c:1948
+#: src/gui.c:1947
 msgid "Skip forward (ctrl-right)"
 msgstr "Перейти вперед (ctrl-праворуч)"
 
-#: src/gui.c:1954
+#: src/gui.c:1953
 msgid "Show clip info (i)"
 msgstr "Показати відомості щодо кліпу (i)"
 
-#: src/gui.c:1960
+#: src/gui.c:1959
 msgid "Hide this toolbar"
 msgstr "Приховати цю панель інструментів"
 
-#: src/gui.c:1962
+#: src/gui.c:1961
 msgid ""
 "Press \"s\" to toggle separate play window for improved performance, \"q\" "
 "to stop."
@@ -3889,175 +3879,175 @@
 "швидкодії, натискання «q» призведе до закриття вікна."
 
 #. TRANSLATORS: please keep the translated string the same length
-#: src/gui.c:1995
+#: src/gui.c:1994
 msgid "     Video playback speed (frames per second)        "
 msgstr "     Швидкість відтворення відео (у кадрах на секунду)        "
 
-#: src/gui.c:2009
+#: src/gui.c:2008
 msgid "Vary the video speed"
 msgstr "Змінювати швидкість відео"
 
-#: src/gui.c:2092 src/gui.c:3218
+#: src/gui.c:2090 src/gui.c:3329
 msgid "First Frame"
 msgstr "Перший кадр"
 
-#: src/gui.c:2193 src/gui.c:3226
+#: src/gui.c:2191 src/gui.c:3336
 msgid "Last Frame"
 msgstr "Останній кадр"
 
-#: src/gui.c:2210
+#: src/gui.c:2208
 msgid "The first selected frame in this clip"
 msgstr "Перший позначений кадр цього кліпу"
 
-#: src/gui.c:2248
+#: src/gui.c:2246
 msgid "The last selected frame in this clip"
 msgstr "Останній позначений кадр цього кліпу"
 
-#: src/gui.c:2532
+#: src/gui.c:2546
 msgid "Starting...\n"
 msgstr "Запуск...\n"
 
-#: src/gui.c:3074
+#: src/gui.c:3181
 msgid "    Press 'q' to stop recording.  DO NOT COVER THE PLAY WINDOW !   "
 msgstr ""
 "    Натисніть «q», щоб зупинити запис. НЕ ЗАКРИВАЙТЕ ВІКНО ВІДТВОРЕННЯ!   "
 
-#: src/gui.c:3521
+#: src/gui.c:3643
 msgid "Frame number to preview"
 msgstr "Кількість кадрів для перегляду"
 
-#: src/gui.c:3538
+#: src/gui.c:3660
 msgid "_Free"
 msgstr "Виві_льнити"
 
-#: src/gui.c:3539
+#: src/gui.c:3661
 msgid "Free choice of frame number"
 msgstr "Довільний вибір номера кадру"
 
-#: src/gui.c:3543
+#: src/gui.c:3666
 msgid "_Start"
 msgstr "П_очаток"
 
-#: src/gui.c:3544
+#: src/gui.c:3667
 msgid "Frame number is linked to start frame"
 msgstr "Кількість кадрів пов’язано з початковим кадром"
 
-#: src/gui.c:3551
+#: src/gui.c:3675
 msgid "_End"
 msgstr "_Кінець"
 
-#: src/gui.c:3552
+#: src/gui.c:3676
 msgid "Frame number is linked to end frame"
 msgstr "Кількість кадрів пов’язано з кінцевим кадром"
 
-#: src/gui.c:3559
+#: src/gui.c:3684
 msgid "_Pointer"
 msgstr "В_казівник"
 
-#: src/gui.c:3560
+#: src/gui.c:3685
 msgid "Frame number is linked to playback pointer"
 msgstr "Кількість кадрів пов’язано з позначкою позиції відтворення"
 
-#: src/gui.c:3581
+#: src/gui.c:3707
 msgid "Rewind"
 msgstr "Повний назад"
 
-#: src/gui.c:3592 src/dialogs.c:894 src/dialogs.c:896 src/dialogs.c:1817
-#: src/dialogs.c:1819
+#: src/gui.c:3718 src/dialogs.c:960 src/dialogs.c:962 src/dialogs.c:1873
+#: src/dialogs.c:1875
 msgid "Play all"
 msgstr "Відтворити все"
 
-#: src/gui.c:3605
+#: src/gui.c:3731
 msgid "Play Selection"
 msgstr "Відтворити позначене"
 
-#: src/gui.c:3619
+#: src/gui.c:3745
 msgid "Loop On/Off"
 msgstr "Вмикання/Вимикання циклу"
 
-#: src/gui.c:3693
+#: src/gui.c:3819
 msgid "Start _recording"
 msgstr "Почати _запис"
 
-#: src/gui.c:3698
+#: src/gui.c:3824
 msgid "Stop _recording"
 msgstr "Зупинити _запис"
 
-#: src/gui.c:3703
+#: src/gui.c:3829
 msgid "_Record Performance"
 msgstr "_Виконати запис"
 
-#: src/gui.c:3851
+#: src/gui.c:3974
 msgid "Hide Play Window"
 msgstr "Приховати вікно відтворення"
 
-#: src/gui.c:4232
+#: src/gui.c:4333
 msgid "Show Play Window"
 msgstr "Показати вікно відтворення"
 
-#: src/ce_thumbs.c:222
+#: src/ce_thumbs.c:242
 #, c-format
 msgid "Mapped to ctrl-%d"
 msgstr "Пов’язано з Ctrl-%d"
 
-#: src/ce_thumbs.c:276 src/effects.c:85 src/preferences.c:3195
+#: src/ce_thumbs.c:296 src/effects.c:86 src/preferences.c:3247
 msgid "Effects"
 msgstr "Ефекти"
 
-#: src/ce_thumbs.c:279 src/multitrack.c:5615
+#: src/ce_thumbs.c:299 src/multitrack.c:5791
 msgid "Clips"
 msgstr "Кліпи"
 
-#: src/ce_thumbs.c:303
+#: src/ce_thumbs.c:323
 #, c-format
 msgid "Show / apply effects to %s\n"
 msgstr "Показати або застосувати ефекти до %s\n"
 
-#: src/ce_thumbs.c:315
+#: src/ce_thumbs.c:335
 #, c-format
 msgid "Select clip for %s\n"
 msgstr "Виберіть кліп для %s\n"
 
-#: src/ce_thumbs.c:515
+#: src/ce_thumbs.c:536
 msgid "_Pin"
 msgstr "При_шпилити"
 
-#: src/ce_thumbs.c:515
+#: src/ce_thumbs.c:537
 msgid "Pin the parameter box to the window"
 msgstr "Пришпилити панель параметра до вікна"
 
 #. TRANSLATORS: Exabytes
-#: src/utils.c:794
+#: src/utils.c:800
 #, c-format
 msgid "%.2f EB"
 msgstr "%.2f ЕБ"
 
 #. TRANSLATORS: Petabytes
-#: src/utils.c:798
+#: src/utils.c:803
 #, c-format
 msgid "%.2f PB"
 msgstr "%.2f ПБ"
 
 #. TRANSLATORS: Terabytes
-#: src/utils.c:802
+#: src/utils.c:806
 #, c-format
 msgid "%.2f TB"
 msgstr "%.2f ТБ"
 
 #. TRANSLATORS: Gigabytes
-#: src/utils.c:806
+#: src/utils.c:809
 #, c-format
 msgid "%.2f GB"
 msgstr "%.2f ГБ"
 
 #. TRANSLATORS: Megabytes
-#: src/utils.c:810
+#: src/utils.c:812
 #, c-format
 msgid "%.2f MB"
 msgstr "%.2f МБ"
 
 #. TRANSLATORS: Kilobytes (1024 bytes)
-#: src/utils.c:814
+#: src/utils.c:815
 #, c-format
 msgid "%.2f KiB"
 msgstr "%.2f КіБ"
@@ -4067,7 +4057,7 @@
 msgid "%d bytes"
 msgstr "%d байтів"
 
-#: src/utils.c:1841
+#: src/utils.c:1835
 msgid "Clearing the clipboard"
 msgstr "Спорожнення буфера обміну даними"
 
@@ -4082,7 +4072,7 @@
 "==============================\n"
 "Перемкнуто на кліп %s\n"
 
-#: src/utils.c:1880
+#: src/utils.c:1877
 msgid ""
 "\n"
 "==============================\n"
@@ -4092,11 +4082,11 @@
 "==============================\n"
 "Перемкнуто на порожній кліп\n"
 
-#: src/utils.c:1917
+#: src/utils.c:1916
 msgid "(blank)"
 msgstr "(порожній)"
 
-#: src/utils.c:1920
+#: src/utils.c:1919
 #, c-format
 msgid ""
 "The set name has been changed from %s to %s. Affected layouts have been "
@@ -4105,7 +4095,7 @@
 "Назву набору було змінено з %s на %s. Виконано відповідне оновлення "
 "пов’язаних з ним компонувань.\n"
 
-#: src/utils.c:1928
+#: src/utils.c:1927
 #, c-format
 msgid ""
 "The clip %s is missing from this set.\n"
@@ -4114,7 +4104,7 @@
 "У цьому наборі немає кліпу %s.\n"
 "Цей кліп потрібен для таких компонувань:\n"
 
-#: src/utils.c:1932
+#: src/utils.c:1931
 #, c-format
 msgid ""
 "The clip %s has been closed.\n"
@@ -4123,7 +4113,7 @@
 "Кліп %s було закрито.\n"
 "Цей кліп потрібен для таких компонувань:\n"
 
-#: src/utils.c:1937
+#: src/utils.c:1936
 #, c-format
 msgid ""
 "Frames have been shifted in the clip %s.\n"
@@ -4132,7 +4122,7 @@
 "У кліпі %s було зсунуто кадри.\n"
 "Це вплинуло на такі компонування:\n"
 
-#: src/utils.c:1942
+#: src/utils.c:1941
 #, c-format
 msgid ""
 "Frames have been deleted from the clip %s.\n"
@@ -4141,7 +4131,7 @@
 "З кліпу %s було вилучено кадри.\n"
 "Це вплинуло на такі компонування:\n"
 
-#: src/utils.c:1947
+#: src/utils.c:1946
 #, c-format
 msgid ""
 "Audio has been deleted from the clip %s.\n"
@@ -4150,7 +4140,7 @@
 "З кліпу %s було вилучено звукові дані.\n"
 "Це вплинуло на такі компонування:\n"
 
-#: src/utils.c:1952
+#: src/utils.c:1951
 #, c-format
 msgid ""
 "Audio has been shifted in clip %s.\n"
@@ -4159,7 +4149,7 @@
 "У кліпі %s було зсунуто звукові дані.\n"
 "Це вплинуло на такі компонування:\n"
 
-#: src/utils.c:1957
+#: src/utils.c:1956
 #, c-format
 msgid ""
 "Audio has been altered in the clip %s.\n"
@@ -4168,7 +4158,7 @@
 "У кліпі %s було замінено звукові дані.\n"
 "Це вплинуло на такі компонування:\n"
 
-#: src/utils.c:1962
+#: src/utils.c:1961
 #, c-format
 msgid ""
 "Frames have been altered in the clip %s.\n"
@@ -4177,7 +4167,7 @@
 "У кліпі %s було замінено кадри.\n"
 "Це вплинуло на такі компонування:\n"
 
-#: src/utils.c:2135
+#: src/utils.c:2134
 #, c-format
 msgid ""
 "Set %s\n"
@@ -4188,7 +4178,7 @@
 "оскільки його вже використано\n"
 "іншою копією програми LiVES.\n"
 
-#: src/utils.c:2142
+#: src/utils.c:2140
 #, c-format
 msgid ""
 "\n"
@@ -4249,68 +4239,68 @@
 msgid "Removing layout %s\n"
 msgstr "Вилучення компонування %s\n"
 
-#: src/utils.c:3014
+#: src/utils.c:2996
 msgid "Video [opening...]"
 msgstr "Відео [відкриття…]"
 
-#: src/utils.c:3018
+#: src/utils.c:2999
 #, c-format
 msgid "Video [%.2f sec]"
 msgstr "Відео [%.2f с]"
 
-#: src/utils.c:3022
+#: src/utils.c:3002
 msgid "(Undefined)"
 msgstr "(Не визначено)"
 
-#: src/utils.c:3025
+#: src/utils.c:3004
 msgid "(No video)"
 msgstr "(Немає відео)"
 
-#: src/utils.c:3032
+#: src/utils.c:3011
 msgid "(No audio)"
 msgstr "(Немає звуку)"
 
-#: src/utils.c:3037
+#: src/utils.c:3015
 msgid "Mono  [opening...]"
 msgstr "Моно [відкриття…]"
 
-#: src/utils.c:3040
+#: src/utils.c:3017
 msgid "Left Audio [opening...]"
 msgstr "Лівий канал звуку [відкриття…]"
 
-#: src/utils.c:3045
+#: src/utils.c:3021
 #, c-format
 msgid "Mono [%.2f sec]"
 msgstr "Моно [%.2f с]"
 
-#: src/utils.c:3048
+#: src/utils.c:3023
 #, c-format
 msgid "Left Audio [%.2f sec]"
 msgstr "Лівий канал звуку [%.2f с]"
 
-#: src/utils.c:3056
+#: src/utils.c:3031
 msgid "Right Audio [opening...]"
 msgstr "Правий канал звуку [відкриття…]"
 
-#: src/utils.c:3059
+#: src/utils.c:3033
 #, c-format
 msgid "Right Audio [%.2f sec]"
 msgstr "Правий канал звуку [%.2f с]"
 
-#: src/utils.c:3506
+#: src/utils.c:3472
 msgid "LiVES cannot switch to mplayer whilst clips are loading."
 msgstr "LiVES не може перемикатися на mplayer під час завантаження кліпів."
 
-#: src/utils.c:3559
+#: src/utils.c:3525
 #, fuzzy
 msgid "LiVES cannot switch to mplayer2 whilst clips are loading."
 msgstr "LiVES не може перемикатися на mplayer під час завантаження кліпів."
 
-#: src/utils.c:3809
+#: src/utils.c:3775
 msgid "Cleaning up clip"
 msgstr "Спорожнення кліпу"
 
-#: src/utils.c:3913
+#: src/utils.c:3874
 #, c-format
 msgid ""
 "\n"
@@ -4325,30 +4315,29 @@
 "\n"
 "Перезаписати?\n"
 
-#: src/utils.c:4305 src/utils.c:4337 src/multitrack.c:4503
+#: src/utils.c:4250 src/utils.c:4280 src/multitrack.c:4672
 #, c-format
 msgid "_Undo %s"
 msgstr "В_ернути %s"
 
-#: src/utils.c:4306 src/utils.c:4338 src/multitrack.c:4525
+#: src/utils.c:4251 src/utils.c:4281 src/multitrack.c:4693
 #, c-format
 msgid "_Redo %s"
 msgstr "П_овторити %s"
 
-#: src/utils.c:4363
+#: src/utils.c:4305
 msgid "-------------Selection------------"
 msgstr "-------------Позначене------------"
 
-#. TRANSLATORS: - try to keep the text of the middle part the same length, by deleting "-" if necessary
-#: src/utils.c:4371
+#: src/utils.c:4313
 msgid " sec ] ----------Selection---------- [ "
 msgstr " с ] ----------Позначене---------- [ "
 
-#: src/utils.c:4371
+#: src/utils.c:4314
 msgid " frames ] ----------"
 msgstr " кадрів ] ----------"
 
-#: src/utils.c:5360
+#: src/utils.c:5302
 msgid ""
 "Your version of mplayer/ffmpeg may be broken !\n"
 "See http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2071\n"
@@ -4366,11 +4355,11 @@
 "\n"
 "Щоб дізнатися більше, скористайтеся пунктом «Довідка->Усування вад»."
 
-#: src/saveplay.c:178
+#: src/saveplay.c:179
 msgid "Examining file header"
 msgstr "Вивчення заголовка файла"
 
-#: src/saveplay.c:315 src/saveplay.c:789
+#: src/saveplay.c:316 src/saveplay.c:779
 #, c-format
 msgid "Opening %s"
 msgstr "Відкриття %s"
@@ -4380,36 +4369,36 @@
 msgid "Opening %s start time %.2f sec. frames %d"
 msgstr "Відкриття %s час початку — %.2f с, %d кадрів"
 
-#: src/saveplay.c:326 src/saveplay.c:4001
+#: src/saveplay.c:326 src/saveplay.c:3927
 msgid " without sound"
 msgstr " без звуку"
 
-#: src/saveplay.c:396
+#: src/saveplay.c:395
 #, c-format
 msgid "Opening audio for %s"
 msgstr "Відкриття звуку для %s"
 
-#: src/saveplay.c:557
+#: src/saveplay.c:554
 #, c-format
 msgid "Auto trimming %.2f seconds of audio at start..."
 msgstr "Автоматично обрізаємо %.2f секунд звуку на початку…"
 
-#: src/saveplay.c:567
+#: src/saveplay.c:562
 #, c-format
 msgid "Auto trimming %.2f seconds of audio at end..."
 msgstr "Автообрізання %.2f секунд звукових даних наприкінці…"
 
-#: src/saveplay.c:584
+#: src/saveplay.c:577
 #, c-format
 msgid "Auto padding with %.2f seconds of silence at start..."
 msgstr "Автоматично додаємо %.2f секунд тиші на початку…"
 
-#: src/saveplay.c:599
+#: src/saveplay.c:590
 #, c-format
 msgid "Auto padding with %.2f seconds of silence at end..."
 msgstr "Автододавання %.2f секунд тиші наприкінці…"
 
-#: src/saveplay.c:671
+#: src/saveplay.c:661
 #, c-format
 msgid ""
 "\n"
@@ -4429,11 +4418,11 @@
 "\n"
 "Ви справді бажаєте відкрити цей файл?"
 
-#: src/saveplay.c:685
+#: src/saveplay.c:676
 msgid " - please be patient."
 msgstr " - будь ласка, зачекайте."
 
-#: src/saveplay.c:938
+#: src/saveplay.c:926
 msgid ""
 "\n"
 "\n"
@@ -4445,7 +4434,7 @@
 "LiVES не вдалося видобути дані або зображення або звуку.\n"
 "Подробиці можна знайти на панелі термінала.\n"
 
-#: src/saveplay.c:940
+#: src/saveplay.c:928
 msgid ""
 "\n"
 "\n"
@@ -4455,7 +4444,7 @@
 "\n"
 "Ймовірно, для відкриття цього файла вам доведеться встановити mplayer.\n"
 
-#: src/saveplay.c:948
+#: src/saveplay.c:934
 msgid ""
 "\n"
 "\n"
@@ -4468,29 +4457,29 @@
 "меню\n"
 "«Інструменти|Параметри|Декодування»\n"
 
-#: src/saveplay.c:1014
+#: src/saveplay.c:995
 msgid "Adding image..."
 msgstr "Додавання зображення…"
 
-#: src/saveplay.c:1108
+#: src/saveplay.c:1089
 #, c-format
 msgid "Subtitles were saved as %s\n"
 msgstr "Субтитри було збережено до %s\n"
 
-#: src/saveplay.c:1192
+#: src/saveplay.c:1171
 #, c-format
 msgid "LiVES: Save Frame %d as..."
 msgstr "LiVES: Зберегти кадр %d як…"
 
-#: src/saveplay.c:1195
+#: src/saveplay.c:1174
 msgid "LiVES: Save Frame as..."
 msgstr "LiVES: Зберегти кадр як…"
 
-#: src/saveplay.c:1322
+#: src/saveplay.c:1303
 msgid "LiVES: Save Clip as..."
 msgstr "LiVES: Зберегти кліп з новою назвою…"
 
-#: src/saveplay.c:1390
+#: src/saveplay.c:1369
 msgid ""
 "Saving your video could lead to a loss of quality !\n"
 "You are strongly advised to 'Save As' to a new file.\n"
@@ -4502,37 +4491,37 @@
 "\n"
 "Бажаєте зберегти дані до поточного файла?"
 
-#: src/saveplay.c:1517 src/saveplay.c:1683 src/saveplay.c:1762
-#: src/saveplay.c:4014
+#: src/saveplay.c:1494 src/saveplay.c:1659 src/saveplay.c:1738
+#: src/saveplay.c:3940
 msgid "Pulling frames from clip"
 msgstr "Отримання кадрів з кліпу"
 
-#: src/saveplay.c:1588 src/saveplay.c:1727
+#: src/saveplay.c:1565 src/saveplay.c:1703
 msgid "Linking selection"
 msgstr "Пов’язування позначеного"
 
-#: src/saveplay.c:1779
+#: src/saveplay.c:1755
 msgid " (with no sound)\n"
 msgstr " (без звуку)\n"
 
-#: src/saveplay.c:1786
+#: src/saveplay.c:1761
 #, c-format
 msgid "Saving frames %d to %d%s as \"%s\" : encoder = %s : format = %s..."
 msgstr ""
 "Збереження кадрів від %d до %d%s як «%s»: програма кодування = %s: формат = "
 "%s…"
 
-#: src/saveplay.c:1790
+#: src/saveplay.c:1765
 #, c-format
 msgid "Saving frames 1 to %d%s as \"%s\" : encoder %s : format = %s..."
 msgstr ""
 "Збереження кадрів від 1 до %d%s як «%s»: програма кодування %s: формат = %s…"
 
-#: src/saveplay.c:1909
+#: src/saveplay.c:1890
 msgid "Saving [can take a long time]"
 msgstr "Збереження [може тривати досить довго]"
 
-#: src/saveplay.c:2057
+#: src/saveplay.c:2044
 msgid ""
 "\n"
 "\n"
@@ -4542,33 +4531,33 @@
 "\n"
 "Помилка кодування. Файл даних не було створено!\n"
 
-#: src/saveplay.c:2094
+#: src/saveplay.c:2081
 msgid "Clearing letterbox"
 msgstr "Зняття додавання чорних смуг"
 
-#: src/saveplay.c:2183
+#: src/saveplay.c:2168
 #, c-format
 msgid "File size was %s\n"
 msgstr "Розмір файла: %s\n"
 
-#: src/saveplay.c:2284
+#: src/saveplay.c:2265
 msgid "recording aborted by preview.\n"
 msgstr "запис перервано переглядом.\n"
 
-#: src/saveplay.c:2288
+#: src/saveplay.c:2268
 msgid "recording aborted by clipboard playback.\n"
 msgstr "запис перервано відтворенням даних з буфера.\n"
 
-#: src/saveplay.c:2291
+#: src/saveplay.c:2270
 msgid "Recording performance..."
 msgstr "Виконання запису…"
 
-#: src/saveplay.c:3293
+#: src/saveplay.c:3251
 #, c-format
 msgid "Average FPS was %.4f\n"
 msgstr "Середня частота кадрів — %.4f\n"
 
-#: src/saveplay.c:3299
+#: src/saveplay.c:3256
 msgid ""
 "\n"
 "\n"
@@ -4583,16 +4572,21 @@
 "кадрів»\n"
 "і змінити розміри всіх кадрів до поточного значення.\n"
 
-#: src/saveplay.c:3479
+#: src/saveplay.c:3429
 msgid "Unknown"
 msgstr "Невідомо"
 
-#: src/saveplay.c:3588 src/saveplay.c:4585
+#: src/saveplay.c:3538 src/saveplay.c:4502
 #, c-format
 msgid "Untitled%d"
 msgstr "Без_назви%d"
 
-#: src/saveplay.c:3633
+#: src/saveplay.c:3567
+#, c-format
+msgid "%d frames are enough !\n"
+msgstr "Достатньо %d кадрів!\n"
+
+#: src/saveplay.c:3579
 #, c-format
 msgid ""
 "\n"
@@ -4603,7 +4597,7 @@
 "Помилка під час спроби отримання даних щодо кліпу %s.\n"
 "Можливо, дані цього кліпу пошкоджено.\n"
 
-#: src/saveplay.c:3723
+#: src/saveplay.c:3667
 #, c-format
 msgid ""
 "\n"
@@ -4616,14 +4610,14 @@
 "Типову частоту кадрів можна встановити за допомогою пункту меню «Інструменти "
 "| Параметри | Інше».\n"
 
-#: src/saveplay.c:3735
+#: src/saveplay.c:3677
 #, c-format
 msgid "Playback speed was adjusted to %.3f frames per second to fit audio.\n"
 msgstr ""
 "Швидкість відтворення було скориговано до значення %.3f кадрів на секунду, "
 "щоб зберегти відповідність з звуковими даними.\n"
 
-#: src/saveplay.c:3754
+#: src/saveplay.c:3694
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d *bpp=Greyscale* fps=%.3f\n"
@@ -4633,7 +4627,7 @@
 "%.3f\n"
 "Звукові дані:"
 
-#: src/saveplay.c:3758 src/saveplay.c:4762
+#: src/saveplay.c:3698 src/saveplay.c:4671
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d bpp=%d fps=%.3f\n"
@@ -4642,54 +4636,54 @@
 "Кадрів=%d тип=%s розмір=%dx%d глибина кольорів=%d частота кадрів=%.3f\n"
 "Звукові дані:"
 
-#: src/saveplay.c:3762 src/saveplay.c:4766
+#: src/saveplay.c:3703 src/saveplay.c:4676
 #, c-format
 msgid "%s none\n"
 msgstr "%s немає\n"
 
-#: src/saveplay.c:3774
+#: src/saveplay.c:3714
 #, c-format
 msgid " - Author: %s\n"
 msgstr " - Автор: %s\n"
 
-#: src/saveplay.c:3779
+#: src/saveplay.c:3717
 #, c-format
 msgid " - Title: %s\n"
 msgstr " - Назва: %s\n"
 
-#: src/saveplay.c:3784
+#: src/saveplay.c:3720
 #, c-format
 msgid " - Comment: %s\n"
 msgstr " - Коментар: %s\n"
 
-#: src/saveplay.c:3897
+#: src/saveplay.c:3829
 #, c-format
 msgid "Saving frame %d as %s..."
 msgstr "Збереження кадру %d як %s..."
 
-#: src/saveplay.c:3996
+#: src/saveplay.c:3924
 #, c-format
 msgid "Backing up %s to %s"
 msgstr "Створення резервної копії %s на %s"
 
-#: src/saveplay.c:4049
+#: src/saveplay.c:3975
 msgid "Backing up"
 msgstr "Створення резервної копії"
 
-#: src/saveplay.c:4083
+#: src/saveplay.c:4009
 msgid "performance data was backed up..."
 msgstr "було створено резервну копію записаних даних…"
 
-#: src/saveplay.c:4661
+#: src/saveplay.c:4574
 #, c-format
 msgid "Restoring %s..."
 msgstr "Відновлення %s…"
 
-#: src/saveplay.c:4692
+#: src/saveplay.c:4603
 msgid "Restoring"
 msgstr "Відновлення"
 
-#: src/saveplay.c:4714
+#: src/saveplay.c:4625
 #, c-format
 msgid ""
 "\n"
@@ -4703,22 +4697,22 @@
 "LiVES не вдалося відновити їх.\n"
 
 #. TRANSLATORS: rec(ord) %.2f M(ega)B(ytes)
-#: src/saveplay.c:5207
+#: src/saveplay.c:5118
 #, c-format
 msgid "rec %.2f MB"
 msgstr "зап %.2f МБ"
 
-#: src/saveplay.c:5213
+#: src/saveplay.c:5123
 #, c-format
 msgid "!rec %.2f MB"
 msgstr "!зап %.2f МБ"
 
 #. TRANSLATORS: rec(ord) ?? M(ega)B(ytes)
-#: src/saveplay.c:5216
+#: src/saveplay.c:5126
 msgid "rec ?? MB"
 msgstr "зап. ?? МБ"
 
-#: src/saveplay.c:5241
+#: src/saveplay.c:5151
 #, c-format
 msgid ""
 "\n"
@@ -4731,7 +4725,7 @@
 "Визначити обмеження щодо призупинення запису можна за допомогою вікна "
 "параметрів програми.\n"
 
-#: src/saveplay.c:5535
+#: src/saveplay.c:5447
 msgid ""
 "\n"
 "Files from a previous run of LiVES were found.\n"
@@ -4741,47 +4735,69 @@
 "Було знайдено файли від попереднього запуску LiVES.\n"
 "Бажаєте, щоб програма спробувала їх відновити?\n"
 
-#: src/saveplay.c:5557
+#: src/saveplay.c:5469
 msgid "Recovering files"
 msgstr "Відновлення файлів"
 
-#: src/saveplay.c:5560
+#: src/saveplay.c:5472
 msgid "Recovering files..."
 msgstr "Відновлення файлів…"
 
-#: src/dialogs.c:72
+#: src/dialogs.c:71
 msgid "Show affected _layouts"
 msgstr "Показати _компонування, які буде змінено"
 
-#: src/dialogs.c:128
+#: src/dialogs.c:113
+msgid ""
+"Do _not show this warning any more\n"
+"(can be turned back on from Preferences/Warnings)"
+msgstr ""
+"Н_е показувати більше цього попередження\n"
+"(увімкнути показ можна у вікні «Параметри/Попередження»)"
+
+#: src/dialogs.c:127
 msgid "_Recover disk space"
 msgstr "_Відновити місце на диску"
 
-#: src/dialogs.c:143
+#: src/dialogs.c:142
 msgid " _Advanced Settings >>"
 msgstr " _Додаткові параметри >>"
 
-#: src/dialogs.c:184
+#: src/dialogs.c:183 src/dialogs.c:221
 msgid "LiVES: - Warning !"
 msgstr "LiVES: - Попередження!"
 
 #: src/dialogs.c:194
+#, fuzzy
+msgid "LiVES: - Error !"
+msgstr "LiVES: — Помилка під час роботи з файлом"
+
+#: src/dialogs.c:204
+#, fuzzy
+msgid "LiVES: - Information"
+msgstr "LiVES: відомості про %s"
+
+#: src/dialogs.c:230
 msgid "LiVES: - Question"
 msgstr "LiVES — Запитання"
 
-#: src/dialogs.c:204
+#: src/dialogs.c:239
 msgid "LiVES: - File Error"
 msgstr "LiVES: — Помилка під час роботи з файлом"
 
-#: src/dialogs.c:208
+#: src/dialogs.c:241
 msgid "_Abort"
 msgstr "_Перервати"
 
-#: src/dialogs.c:213
+#: src/dialogs.c:246
 msgid "_Retry"
 msgstr "П_овторити"
 
-#: src/dialogs.c:597
+#: src/dialogs.c:306
+msgid "Show _Details"
+msgstr "Показати по_дробиці"
+
+#: src/dialogs.c:657
 #, c-format
 msgid ""
 "FREE SPACE IN THE PARTITION CONTAINING\n"
@@ -4798,7 +4814,7 @@
 "\n"
 "Критичний рівень можна змінити у налаштуваннях програми."
 
-#: src/dialogs.c:615
+#: src/dialogs.c:676
 #, c-format
 msgid ""
 "Free space in the partition containing\n"
@@ -4817,11 +4833,11 @@
 "Наступне попередження буде показано, якщо залишиться менше за %s.\n"
 "Критичний рівень можна змінити у налаштуваннях програми."
 
-#: src/dialogs.c:627
+#: src/dialogs.c:688
 msgid "Audio players cannot be switched during playback."
 msgstr "Перемикання програвачів під час відтворення неможливе."
 
-#: src/dialogs.c:632
+#: src/dialogs.c:694
 msgid ""
 "\n"
 "\n"
@@ -4833,11 +4849,11 @@
 "LiVES не вдалося виконати цю дію через недостатній об’єм пам’яті.\n"
 "Будь ласка, спробуйте завершити роботу сторонніх програм.\n"
 
-#: src/dialogs.c:752
+#: src/dialogs.c:820
 msgid "Processing has been paused."
 msgstr "Обробку було призупинено."
 
-#: src/dialogs.c:937
+#: src/dialogs.c:1002
 #, c-format
 msgid ""
 "\n"
@@ -4846,7 +4862,7 @@
 "\n"
 "%sВиконано %d%%. Залишилося часу: %u с%s\n"
 
-#: src/dialogs.c:1335
+#: src/dialogs.c:1391
 #, c-format
 msgid ""
 "\n"
@@ -4855,7 +4871,7 @@
 "\n"
 "Відкрито %d з %d кадрів. Зачекайте ще %u с.\n"
 
-#: src/dialogs.c:1337
+#: src/dialogs.c:1393
 #, c-format
 msgid ""
 "\n"
@@ -4864,7 +4880,7 @@
 "\n"
 "Відкрито %d з %d кадрів.\n"
 
-#: src/dialogs.c:1341
+#: src/dialogs.c:1396
 #, c-format
 msgid ""
 "\n"
@@ -4873,7 +4889,7 @@
 "\n"
 "відкрито %d кадрів.\n"
 
-#: src/dialogs.c:1940
+#: src/dialogs.c:1993
 #, c-format
 msgid ""
 "\n"
@@ -4882,7 +4898,7 @@
 "\n"
 "Залишилося часу: %d с"
 
-#: src/dialogs.c:1988
+#: src/dialogs.c:2040
 #, c-format
 msgid ""
 "\n"
@@ -4893,7 +4909,7 @@
 "Вибачте, LiVES не може одночасно відкривати більше %d файлів.\n"
 "Будь ласка, закрийте один з файлів і повторіть вашу спробу."
 
-#: src/dialogs.c:1994
+#: src/dialogs.c:2047
 #, c-format
 msgid ""
 "LiVES was unable to write to its temporary directory.\n"
@@ -4912,7 +4928,7 @@
 "\n"
 "Будь ласка, переконайтеся, що ви можете здійснювати запис до цього каталогу."
 
-#: src/dialogs.c:2005
+#: src/dialogs.c:2059
 #, fuzzy
 msgid ""
 "\n"
@@ -4924,7 +4940,7 @@
 "програма «sox». Будь ласка, встановіть одну з цих програм і повторіть "
 "спробу.\n"
 
-#: src/dialogs.c:2010
+#: src/dialogs.c:2064
 #, fuzzy
 msgid ""
 "Audio was not loaded; please install mplayer or mplayer2 if you expected "
@@ -4933,7 +4949,7 @@
 "Звукові дані не завантажено. Будь ласка, встановіть mplayer, якщо вам "
 "потрібні звукові дані для цього кліпу.\n"
 
-#: src/dialogs.c:2014
+#: src/dialogs.c:2069
 msgid ""
 "Audio resampling is required for this format.\n"
 "Please install 'sox'\n"
@@ -4944,7 +4960,7 @@
 "або перемкніть формат кодування за допомогою пункту «Інструменти | Параметри "
 "| Кодування»\n"
 
-#: src/dialogs.c:2019
+#: src/dialogs.c:2075
 msgid ""
 "\n"
 "\n"
@@ -4958,7 +4974,7 @@
 "Будь ласка, змініть кодек для звукових даних за допомогою меню «Інструменти|"
 "Параметри|Кодування»\n"
 
-#: src/dialogs.c:2024
+#: src/dialogs.c:2080
 msgid ""
 "This layout includes generated frames.\n"
 "It cannot be saved, you must render it to a clip first.\n"
@@ -4967,7 +4983,7 @@
 "Зберегти таке компонування неможливо, спочатку вам слід виконати обробку "
 "кліпу.\n"
 
-#: src/dialogs.c:2029
+#: src/dialogs.c:2085
 msgid ""
 "This layout includes generated or recorded audio.\n"
 "It cannot be saved, you must render it to a clip first.\n"
@@ -4976,7 +4992,7 @@
 "Зберегти таке компонування неможливо, спочатку вам слід виконати обробку "
 "кліпу.\n"
 
-#: src/dialogs.c:2039 src/dialogs.c:2137
+#: src/dialogs.c:2095 src/dialogs.c:2189
 #, c-format
 msgid ""
 "\n"
@@ -4987,7 +5003,7 @@
 "\n"
 "Через обмеження формату %s\n"
 
-#: src/dialogs.c:2059
+#: src/dialogs.c:2115
 msgid ""
 "LiVES recommends the following settings:\n"
 "\n"
@@ -4995,43 +5011,43 @@
 "LiVES рекомендує вам такі параметри:\n"
 "\n"
 
-#: src/dialogs.c:2065 src/dialogs.c:2174 src/resample.c:850
+#: src/dialogs.c:2121 src/dialogs.c:2225 src/resample.c:839
 msgid ", signed"
 msgstr ", signed"
 
-#: src/dialogs.c:2066 src/dialogs.c:2175 src/resample.c:853
+#: src/dialogs.c:2122 src/dialogs.c:2226 src/resample.c:841
 msgid ", unsigned"
 msgstr ", unsigned"
 
-#: src/dialogs.c:2070 src/dialogs.c:2179 src/resample.c:858
+#: src/dialogs.c:2126 src/dialogs.c:2230 src/resample.c:846
 msgid ", little-endian"
 msgstr ", little-endian"
 
-#: src/dialogs.c:2071 src/dialogs.c:2180 src/resample.c:861
+#: src/dialogs.c:2127 src/dialogs.c:2231 src/resample.c:848
 msgid ", big-endian"
 msgstr ", big-endian"
 
-#: src/dialogs.c:2077
+#: src/dialogs.c:2132
 #, c-format
 msgid "Use an audio rate of %d Hz%s%s\n"
 msgstr "Використовувати частоту дискретизації звуку %d Гц%s%s\n"
 
-#: src/dialogs.c:2085
+#: src/dialogs.c:2140
 #, c-format
 msgid "Set video rate to %.3f frames per second\n"
 msgstr "Встановлення частоти кадрів відео у значення %.3f кадрів на секунду\n"
 
-#: src/dialogs.c:2089
+#: src/dialogs.c:2143
 #, c-format
 msgid "Set video rate to %d:%d frames per second\n"
 msgstr "Встановлення частоти кадрів відео у значення %d:%d кадрів на секунду\n"
 
-#: src/dialogs.c:2094 src/dialogs.c:2209
+#: src/dialogs.c:2148 src/dialogs.c:2258
 #, c-format
 msgid "Set video size to %d x %d pixels\n"
 msgstr "Встановлення розмірів відео %d x %d пікселів\n"
 
-#: src/dialogs.c:2102 src/dialogs.c:2208
+#: src/dialogs.c:2156 src/dialogs.c:2257
 msgid ""
 "\n"
 "You may wish to:\n"
@@ -5039,37 +5055,37 @@
 "\n"
 "Ймовірні варіанти дій:\n"
 
-#: src/dialogs.c:2105 src/dialogs.c:2200
+#: src/dialogs.c:2159 src/dialogs.c:2249
 #, c-format
 msgid "resize video to %d x %d pixels\n"
 msgstr "зміна розмірів відео до %d x %d пікселів\n"
 
-#: src/dialogs.c:2110
+#: src/dialogs.c:2163
 msgid "disable audio, since the target encoder cannot encode audio\n"
 msgstr ""
 "вимкнення звуку через те, що інструмент кодування не може закодувати звукові "
 "дані\n"
 
-#: src/dialogs.c:2170
+#: src/dialogs.c:2221
 msgid "LiVES must:\n"
 msgstr "LiVES має:\n"
 
-#: src/dialogs.c:2185
+#: src/dialogs.c:2235
 #, c-format
 msgid "resample audio to %d Hz%s%s\n"
 msgstr "зміна дискретизації звуку до %d Гц%s%s\n"
 
-#: src/dialogs.c:2192
+#: src/dialogs.c:2242
 #, c-format
 msgid "resample video to %.3f frames per second\n"
 msgstr "зміна дискретизації відео до %.3f кадрів на секунду\n"
 
-#: src/dialogs.c:2196
+#: src/dialogs.c:2245
 #, c-format
 msgid "resample video to %d:%d frames per second\n"
 msgstr "зміна дискретизації відео до %d:%d кадрів на секунду\n"
 
-#: src/dialogs.c:2215
+#: src/dialogs.c:2263
 msgid ""
 "\n"
 "You will be able to undo these changes afterwards.\n"
@@ -5084,7 +5100,7 @@
 "дії.\n"
 "\n"
 
-#: src/dialogs.c:2218
+#: src/dialogs.c:2265
 msgid ""
 "\n"
 "Changes applied to the selection will not be permanent.\n"
@@ -5094,7 +5110,7 @@
 "Зміни внесені до позначеної ділянки не будуть остаточними.\n"
 "\n"
 
-#: src/dialogs.c:2237
+#: src/dialogs.c:2285
 msgid ""
 "\n"
 "\n"
@@ -5108,7 +5124,7 @@
 "пам’яті.\n"
 "Спробуйте зберегти запис лише частини файла."
 
-#: src/dialogs.c:2244
+#: src/dialogs.c:2293
 msgid ""
 "The playback speed (fps), or the audio rate\n"
 " of the clipboard does not match\n"
@@ -5128,7 +5144,7 @@
 "Натисніть кнопку «Скасувати», щоб скасувати вставлення або кнопку «Гаразд», "
 "щоб виконати коригування."
 
-#: src/dialogs.c:2253
+#: src/dialogs.c:2304
 #, c-format
 msgid ""
 "When opening a yuvmpeg stream, you should first create a fifo file in:\n"
@@ -5150,11 +5166,11 @@
 "Натисніть кнопку «Гаразд», якщо ви цілком розумієте наслідки цих дій. Якщо ж "
 "у вас є сумніви, натисніть кнопку «Скасувати»."
 
-#: src/dialogs.c:2305
+#: src/dialogs.c:2356
 msgid "Show Keys"
 msgstr "Клавіатурні скорочення показу"
 
-#: src/dialogs.c:2306
+#: src/dialogs.c:2358
 msgid ""
 "You can use the following keys during playback to control LiVES:-\n"
 "\n"
@@ -5237,11 +5253,11 @@
 "d                             подвоїти розміри\n"
 "g                             циклічне відтворення з відбиттям\n"
 
-#: src/dialogs.c:2313
+#: src/dialogs.c:2365
 msgid "Multitrack Keys"
 msgstr "Клавіатурні скорочення режиму декількох доріжок"
 
-#: src/dialogs.c:2314
+#: src/dialogs.c:2367
 msgid ""
 "You can use the following keys to control the multitrack window:-\n"
 "\n"
@@ -5287,11 +5303,11 @@
 "\n"
 "Інші комбінації клавіш наведено в меню.\n"
 
-#: src/dialogs.c:2322
+#: src/dialogs.c:2375
 msgid "Message History"
 msgstr "Журнал повідомлень"
 
-#: src/dialogs.c:2335
+#: src/dialogs.c:2388
 #, c-format
 msgid ""
 "After upgrading/installing, you may need to adjust the <prefix_dir> setting "
@@ -5300,7 +5316,7 @@
 "Після оновлення або встановлення, ймовірно, вам слід виправити значення "
 "параметра <prefix_dir> у вашому файлі %s"
 
-#: src/dialogs.c:2344
+#: src/dialogs.c:2399
 #, c-format
 msgid ""
 "\n"
@@ -5317,7 +5333,7 @@
 "%s%s%s\n"
 "або змініть значення змінної <lib_dir> у файлі %s\n"
 
-#: src/dialogs.c:2352
+#: src/dialogs.c:2408
 msgid ""
 "Sorry, unknown audio type.\n"
 "\n"
@@ -5328,11 +5344,11 @@
 " (Програма може працювати з даними у файлах .mp3, .ogg, .wav, .mod, .xm або ."
 "it)"
 
-#: src/dialogs.c:2353
+#: src/dialogs.c:2409
 msgid "failed (unknown type)\n"
 msgstr "невдало (невідомий тип)\n"
 
-#: src/dialogs.c:2358
+#: src/dialogs.c:2415
 msgid ""
 "\n"
 "Do you wish to remove the layout files associated with this set ?\n"
@@ -5342,7 +5358,7 @@
 "Бажаєте вилучити файли компонування, пов’язані з цим набором кліпів?\n"
 "(Цими файлами не можна буде скористатися без самого набору).\n"
 
-#: src/dialogs.c:2363
+#: src/dialogs.c:2421
 #, c-format
 msgid ""
 "\n"
@@ -5356,7 +5372,7 @@
 "існуючого набору.\n"
 "Натисніть кнопку «Скасувати», щоб ввести нову назву.\n"
 
-#: src/dialogs.c:2370
+#: src/dialogs.c:2429
 msgid ""
 "\n"
 "Frames from this clip are used in some multitrack layouts.\n"
@@ -5368,7 +5384,7 @@
 "Ви справді бажаєте продовжити виконання дії?\n"
 "."
 
-#: src/dialogs.c:2374
+#: src/dialogs.c:2433
 msgid ""
 "\n"
 "Audio from this clip is used in some multitrack layouts.\n"
@@ -5381,7 +5397,7 @@
 "Ви справді бажаєте продовжити виконання дії?\n"
 "."
 
-#: src/dialogs.c:2378
+#: src/dialogs.c:2438
 #, c-format
 msgid ""
 "\n"
@@ -5399,7 +5415,7 @@
 "Якщо файл втрачено, натисніть кнопку «Скасувати», щоб пропустити його "
 "завантаження.\n"
 
-#: src/dialogs.c:2385
+#: src/dialogs.c:2446
 #, c-format
 msgid ""
 "\n"
@@ -5414,7 +5430,7 @@
 "%s\n"
 "Отже, кліп не вдалося завантажити.\n"
 
-#: src/dialogs.c:2392
+#: src/dialogs.c:2455
 msgid ""
 "\n"
 "Dear user, the jack developers decided to remove the -Z option from jackd.\n"
@@ -5428,7 +5444,7 @@
 "Крім того, у вікні «Налаштування» ви можете вибрати інший звуковий\n"
 "програвач.\n"
 
-#: src/dialogs.c:2396
+#: src/dialogs.c:2460
 msgid ""
 "\n"
 "Unable to start up jack. Please ensure that alsa is set up correctly on your "
@@ -5442,7 +5458,7 @@
 "сторонньою програмою.\n"
 "Автоматичний запуск jack буде вимкнено.\n"
 
-#: src/dialogs.c:2402
+#: src/dialogs.c:2466
 msgid ""
 "\n"
 "Unable to connect to jack server. Please start jack before starting LiVES\n"
@@ -5451,7 +5467,7 @@
 "Не вдалося встановити з’єднання з сервером jack. jack слід запустити до "
 "запуску LiVES\n"
 
-#: src/dialogs.c:2411
+#: src/dialogs.c:2475
 #, c-format
 msgid ""
 "\n"
@@ -5468,7 +5484,7 @@
 "\n"
 "%s\n"
 
-#: src/dialogs.c:2418
+#: src/dialogs.c:2482
 msgid ""
 "\n"
 "Alternately, you can restart LiVES and select another audio player.\n"
@@ -5477,7 +5493,7 @@
 "Крім того, ви можете перезапустити LiVES і вказати інший програвач звукових "
 "даних.\n"
 
-#: src/dialogs.c:2423
+#: src/dialogs.c:2488
 #, c-format
 msgid ""
 "\n"
@@ -5492,7 +5508,7 @@
 "Збільшити відповідне значення можна у вікні Параметри->Доріжки/Обробка.\n"
 "Рекомендуємо збільшити значення принаймні до %d МБ"
 
-#: src/dialogs.c:2429
+#: src/dialogs.c:2496
 #, c-format
 msgid ""
 "\n"
@@ -5505,7 +5521,7 @@
 "Рекомендуємо вам вилучити ці компонування.\n"
 "Вилучити старі компонування?\n"
 
-#: src/dialogs.c:2436
+#: src/dialogs.c:2504
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for multitrack undo.\n"
@@ -5519,7 +5535,7 @@
 "буфера скасування дій\n"
 "за допомогою пункту Параметри/Доріжки/Обробка/Розмір буфера скасування\n"
 
-#: src/dialogs.c:2440
+#: src/dialogs.c:2508
 msgid ""
 "\n"
 "Out of memory for undo.\n"
@@ -5531,7 +5547,7 @@
 "Ймовірно, вам слід збільшити об’єм буфера дій\n"
 "за допомогою пункту Параметри/Доріжки/Обробка/Розмір буфера скасування\n"
 
-#: src/dialogs.c:2444
+#: src/dialogs.c:2512
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for the multitrack undo buffer.\n"
@@ -5540,21 +5556,21 @@
 "LiVES не вдалося зарезервувати достатньо пам’яті для буфера скасування "
 "багатодоріжкового режиму.\n"
 
-#: src/dialogs.c:2446
+#: src/dialogs.c:2514
 msgid "or enter a smaller value.\n"
 msgstr "або введіть менше значення.\n"
 
-#: src/dialogs.c:2448
+#: src/dialogs.c:2516
 msgid "Try again from the clip editor, try closing some other applications\n"
 msgstr ""
 "Спробуйте повторити дію з редактора кліпів, спробуйте завершити роботу "
 "сторонніх програм,\n"
 
-#: src/dialogs.c:2449
+#: src/dialogs.c:2517
 msgid "Try closing some other applications\n"
 msgstr "Спробуйте завершити роботу сторонніх програм\n"
 
-#: src/dialogs.c:2460
+#: src/dialogs.c:2529
 msgid ""
 "Multitrack is set to 0 audio channels, but this layout has audio.\n"
 "You should adjust the audio settings from the Tools menu.\n"
@@ -5564,14 +5580,14 @@
 "Вам слід скоригувати параметри звукових даних за допомогою меню "
 "«Інструменти».\n"
 
-#: src/dialogs.c:2464
+#: src/dialogs.c:2534
 msgid ""
 "The current layout has audio, so audio channels may not be set to zero.\n"
 msgstr ""
 "У поточному компонуванні є звукові дані, отже не можна встановлювати нульову "
 "кількість каналів звуку.\n"
 
-#: src/dialogs.c:2468
+#: src/dialogs.c:2539
 msgid ""
 "Multitrack audio preview is only available with the\n"
 "\"jack\" or \"pulse audio\" audio player.\n"
@@ -5582,7 +5598,7 @@
 "Змінити програвач можна за допомогою вкладки Інструменти|Параметри|"
 "Відтворення."
 
-#: src/dialogs.c:2472
+#: src/dialogs.c:2545
 msgid ""
 "Errors were detected in the layout (which may be due to transferring from "
 "another system, or from an older version of LiVES).\n"
@@ -5592,7 +5608,7 @@
 "іншої системи або зі старішої версії LiVES).\n"
 "Спробувати виправити копію компонування на диску?\n"
 
-#: src/dialogs.c:2476
+#: src/dialogs.c:2549
 msgid ""
 "LiVES was unable to load the layout.\n"
 "Sorry.\n"
@@ -5600,7 +5616,7 @@
 "LiVES не вдалося завантажити компонування.\n"
 "Вибачте.\n"
 
-#: src/dialogs.c:2482
+#: src/dialogs.c:2555
 msgid ""
 "\n"
 "\n"
@@ -5610,7 +5626,7 @@
 "\n"
 "Значення частоти звукових даних має бути більшим за 0.\n"
 
-#: src/dialogs.c:2486
+#: src/dialogs.c:2559
 msgid ""
 "\n"
 "Event list will be very large\n"
@@ -5622,7 +5638,7 @@
 "його показ може тривати досить довго.\n"
 "Ви справді бажаєте його переглянути?\n"
 
-#: src/dialogs.c:2491
+#: src/dialogs.c:2564
 msgid ""
 "\n"
 "\n"
@@ -5632,7 +5648,7 @@
 "\n"
 "Щоб скористатися цією можливістю, вам слід встановити програму «dvgrab».\n"
 
-#: src/dialogs.c:2496
+#: src/dialogs.c:2570
 msgid ""
 "\n"
 "\n"
@@ -5647,19 +5663,19 @@
 "Вам варто вибрати один з цих серверів на вкладці «Інструменти/Параметри/"
 "Відтворення».\n"
 
-#: src/dialogs.c:2500
+#: src/dialogs.c:2574
 msgid "Video playback plugin failed to initialise palette !\n"
 msgstr "Додатку відтворення відео не вдалося ініціалізувати палітру!\n"
 
-#: src/dialogs.c:2504
+#: src/dialogs.c:2579
 msgid "Decoder plugin failed to initialise palette !\n"
 msgstr "Додатку декодування не вдалося ініціалізувати палітру!\n"
 
-#: src/dialogs.c:2509
+#: src/dialogs.c:2584
 msgid "Unable to set framerate of video plugin\n"
 msgstr "Не вдалося встановити частоту кадрів додатка роботи з відео\n"
 
-#: src/dialogs.c:2514
+#: src/dialogs.c:2590
 msgid ""
 "After a crash, it is advisable to clean up the disk with\n"
 "File|Clean up disk space\n"
@@ -5668,7 +5684,7 @@
 "допомогою пункту меню\n"
 "«Файл|Спорожнити місце на диску»\n"
 
-#: src/dialogs.c:2526
+#: src/dialogs.c:2604
 #, c-format
 msgid ""
 "Stream frame size is too large for your network buffers.\n"
@@ -5681,33 +5697,33 @@
 "\n"
 "echo %d > /proc/sys/net/core/rmem_max\n"
 
-#: src/dialogs.c:2714
+#: src/dialogs.c:2800
 msgid "cancelled.\n"
 msgstr "скасовано.\n"
 
-#: src/dialogs.c:2721
+#: src/dialogs.c:2805
 msgid "failed.\n"
 msgstr "невдало.\n"
 
-#: src/dialogs.c:2728
+#: src/dialogs.c:2810
 msgid "done.\n"
 msgstr "виконано.\n"
 
-#: src/dialogs.c:2732
+#: src/dialogs.c:2814
 msgid "error in file. Failed.\n"
 msgstr "помилка у файлі. Виконання перервано.\n"
 
-#: src/dialogs.c:2766 src/dialogs.c:2815 src/dialogs.c:2839
+#: src/dialogs.c:2848 src/dialogs.c:2897 src/dialogs.c:2921
 #, c-format
 msgid "Additional info: %s\n"
 msgstr "Додаткова інформація: %s\n"
 
-#: src/dialogs.c:2769
+#: src/dialogs.c:2851
 #, c-format
 msgid "The error value was %d%s\n"
 msgstr "Значення помилки: %d%s\n"
 
-#: src/dialogs.c:2772
+#: src/dialogs.c:2854
 #, c-format
 msgid ""
 "\n"
@@ -5722,7 +5738,7 @@
 "Будь ласка, перевірте, чи не пошкоджено основні файли вашої системи.\n"
 "%s%s%s"
 
-#: src/dialogs.c:2818
+#: src/dialogs.c:2900
 #, c-format
 msgid ""
 "\n"
@@ -5737,7 +5753,7 @@
 "Будь ласка, перевірте, чи не спричинено цю помилку однією з типових причин.\n"
 "%s"
 
-#: src/dialogs.c:2842
+#: src/dialogs.c:2924
 #, c-format
 msgid ""
 "\n"
@@ -5752,7 +5768,7 @@
 "Будь ласка, перевірте, чи не спричинено цю помилку однією з типових причин.\n"
 "%s"
 
-#: src/dialogs.c:2886
+#: src/dialogs.c:2968
 #, c-format
 msgid ""
 "\n"
@@ -5765,7 +5781,7 @@
 "%s\n"
 "Будь ласка, перевірте, чи не спричинено цю помилку однією з типових причин.\n"
 
-#: src/dialogs.c:2890
+#: src/dialogs.c:2971
 #, c-format
 msgid ""
 "\n"
@@ -5780,7 +5796,7 @@
 "Повідомлення про помилку:\n"
 "%s\n"
 
-#: src/dialogs.c:2921
+#: src/dialogs.c:3002
 #, c-format
 msgid ""
 "\n"
@@ -5793,7 +5809,7 @@
 "%s\n"
 "Будь ласка, перевірте, чи не спричинено цю помилку однією з типових причин.\n"
 
-#: src/dialogs.c:2925
+#: src/dialogs.c:3005
 #, c-format
 msgid ""
 "\n"
@@ -5808,12 +5824,12 @@
 "Повідомлення про помилку:\n"
 "%s\n"
 
-#: src/dialogs.c:2993
+#: src/dialogs.c:3073
 #, c-format
 msgid "Value for \"%s\" could not be read."
 msgstr "Не вдалося прочитати значення «%s»."
 
-#: src/dialogs.c:3011
+#: src/dialogs.c:3091
 #, c-format
 msgid ""
 "\n"
@@ -5826,7 +5842,7 @@
 "%s\n"
 "Будь ласка, перевірте, чи не є причиною пошкодження у вашій системі.\n"
 
-#: src/dialogs.c:3020
+#: src/dialogs.c:3100
 #, c-format
 msgid ""
 "\n"
@@ -5839,7 +5855,7 @@
 "%s\n"
 "Будь ласка, змініть права доступу до теки і повторіть спробу."
 
-#: src/dialogs.c:3027
+#: src/dialogs.c:3109
 #, c-format
 msgid ""
 "\n"
@@ -5852,7 +5868,7 @@
 "%s\n"
 "Будь ласка, змініть права доступу до каталогу і повторіть спробу."
 
-#: src/dialogs.c:3034
+#: src/dialogs.c:3116
 #, c-format
 msgid ""
 "\n"
@@ -5863,7 +5879,7 @@
 "LiVES не може прочитати дані з каталогу:\n"
 "%s\n"
 
-#: src/dialogs.c:3041
+#: src/dialogs.c:3123
 msgid ""
 "\n"
 "Abort and exit immediately from LiVES\n"
@@ -5873,7 +5889,7 @@
 "Перервати виконання всіх завдань і негайно завершити роботу LiVES.\n"
 "Ви справді цього хочете?\n"
 
-#: src/dialogs.c:3047
+#: src/dialogs.c:3129
 #, c-format
 msgid ""
 "\n"
@@ -5884,7 +5900,7 @@
 "%s не придатний для кодування кліпів з зображеннями типу %s.\n"
 "Будь ласка, вкажіть інший інструмент кодування зі списку.\n"
 
-#: src/dialogs.c:3056
+#: src/dialogs.c:3139
 msgid ""
 "\n"
 "This card is already in use and cannot be opened multiple times.\n"
@@ -5893,7 +5909,7 @@
 "Дані цієї картки вже використовуються, потік даних не можна відкривати "
 "декілька разів.\n"
 
-#: src/dialogs.c:3061
+#: src/dialogs.c:3145
 #, c-format
 msgid ""
 "\n"
@@ -5908,7 +5924,7 @@
 "- Перевірте, чи не користується цим пристроєм стороння програма.\n"
 "- Перевірте, чи створено системою файл пристрою.\n"
 
-#: src/dialogs.c:3068
+#: src/dialogs.c:3153
 msgid ""
 "\n"
 "This file already has subtitles loaded.\n"
@@ -5918,7 +5934,7 @@
 "Для цього файла вже завантажено субтитри.\n"
 "Бажаєте перезаписати поточні субтитри?\n"
 
-#: src/dialogs.c:3072
+#: src/dialogs.c:3157
 msgid ""
 "\n"
 "LiVES currently only supports subtitles of type .srt and .sub.\n"
@@ -5927,7 +5943,7 @@
 "У поточній версії LiVES передбачено підтримку субтитрів лише у форматах .srt "
 "і .sub.\n"
 
-#: src/dialogs.c:3076
+#: src/dialogs.c:3161
 msgid ""
 "\n"
 "Erase all subtitles from this clip.\n"
@@ -5937,7 +5953,7 @@
 "Вилучення всіх субтитрів з цього кліпу.\n"
 "Ви впевнені у своїх діях?\n"
 
-#: src/dialogs.c:3082
+#: src/dialogs.c:3168
 #, c-format
 msgid ""
 "\n"
@@ -5950,7 +5966,7 @@
 "Натисніть кнопку «Скасуват», щоб вказати файл з іншою назвою,\n"
 "або кнопку «Гаразд», щоб наказати програмі зберегти файл типу «%s»\n"
 
-#: src/dialogs.c:3089
+#: src/dialogs.c:3176
 msgid ""
 "\n"
 "Do you wish to move the current clip sets to the new directory ?\n"
@@ -5960,7 +5976,7 @@
 "Бажаєте пересунути поточні набори кліпів до нового каталогу?\n"
 "(Якщо непевні, натисніть кнопку «Так».)\n"
 
-#: src/dialogs.c:3093
+#: src/dialogs.c:3181
 #, c-format
 msgid ""
 "\n"
@@ -5976,7 +5992,7 @@
 "Наполегливо рекомендуємо вам завершити роботу цього екземпляра до натискання "
 "кнопки «Гаразд»."
 
-#: src/dialogs.c:3099
+#: src/dialogs.c:3188
 msgid ""
 "\n"
 "No video input devices could be found.\n"
@@ -5984,7 +6000,7 @@
 "\n"
 "Не вдалося виявити жодного пристрою вхідних даних.\n"
 
-#: src/dialogs.c:3103
+#: src/dialogs.c:3192
 msgid ""
 "\n"
 "All video input devices are already in use.\n"
@@ -5992,7 +6008,7 @@
 "\n"
 "Всі пристрої вхідних відеоданих вже використовуються.\n"
 
-#: src/dialogs.c:3107
+#: src/dialogs.c:3196
 msgid ""
 "\n"
 "\n"
@@ -6004,7 +6020,7 @@
 "ВИЛУЧЕННЯ І КОПІЮВАННЯ ФАЙЛІВ. МОЖЕ ТРИВАТИ ДОСИТЬ ДОВГО.\n"
 "НЕ ЗАВЕРШУЙТЕ РОБОТУ І НЕ ЗАКРИВАЙТЕ ВІКНО LIVES !\n"
 
-#: src/dialogs.c:3127
+#: src/dialogs.c:3203
 #, c-format
 msgid ""
 "No clips were recovered for set (%s).\n"
@@ -6014,8 +6030,7 @@
 "Будь ласка, перевірте, чи правильно вказано назву набору і повторіть "
 "спробу.\n"
 
-#. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:3136
+#: src/dialogs.c:3214
 #, c-format
 msgid ""
 "\n"
@@ -6033,7 +6048,7 @@
 "Файл -> Спорожнити місце на диску\n"
 
 #. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:3144
+#: src/dialogs.c:3222
 #, c-format
 msgid ""
 "\n"
@@ -6046,7 +6061,7 @@
 "Вітаємо у LiVES версії %s!\n"
 "\n"
 
-#: src/dialogs.c:3150
+#: src/dialogs.c:3228
 msgid ""
 "\n"
 "You must have autolives.pl installed and in your path to use this toy.\n"
@@ -6058,7 +6073,7 @@
 "Докладні настанови щодо встановлення цієї змінної можна знайти у "
 "документації до вашого дистрибутива.\n"
 
-#: src/dialogs.c:3154
+#: src/dialogs.c:3232
 msgid ""
 "\n"
 "You must have a minimum of one clip loaded to use this toy.\n"
@@ -6066,7 +6081,7 @@
 "\n"
 "Для використання цієї забавки вам слід завантажити принаймні один кліп.\n"
 
-#: src/dialogs.c:3158
+#: src/dialogs.c:3236
 msgid ""
 "\n"
 "LiVES lost its connection to jack and was unable to reconnect.\n"
@@ -6077,7 +6092,7 @@
 "завершилися невдало.\n"
 "Рекомендуємо вам перезапустити LiVES.\n"
 
-#: src/dialogs.c:3162
+#: src/dialogs.c:3240
 msgid ""
 "\n"
 "LiVES lost its connection to pulseaudio and was unable to reconnect.\n"
@@ -6088,7 +6103,7 @@
 "з’єднання завершилися невдало.\n"
 "Рекомендуємо вам перезапустити LiVES.\n"
 
-#: src/dialogs.c:3175
+#: src/dialogs.c:3254
 #, c-format
 msgid ""
 "\n"
@@ -6101,240 +6116,240 @@
 "щоб інші програми могли обмінюватися даними з LiVES.\n"
 "Бажаєте дозволити таке з’єднання (лише протягом цього сеансу)?\n"
 
-#: src/effects.c:60
+#: src/effects.c:61
 msgid "generator"
 msgstr "породжувач"
 
-#: src/effects.c:61
+#: src/effects.c:62
 msgid "Generators"
 msgstr "Породжувачі"
 
-#: src/effects.c:63
+#: src/effects.c:64
 msgid "audio generator"
 msgstr "породжувач звуку"
 
-#: src/effects.c:64
+#: src/effects.c:65
 msgid "Audio Generators"
 msgstr "Породжувачі звуку"
 
-#: src/effects.c:66
+#: src/effects.c:67
 msgid "audio/video generator"
 msgstr "породжувач звуку або відео"
 
-#: src/effects.c:67
+#: src/effects.c:68
 msgid "Audio/Video Generators"
 msgstr "Породжувачі звуку або відео"
 
-#: src/effects.c:69
+#: src/effects.c:70
 msgid "data generator"
 msgstr "породжувач даних"
 
-#: src/effects.c:70
+#: src/effects.c:71
 msgid "Data Generators"
 msgstr "Породжувачі даних"
 
-#: src/effects.c:72
+#: src/effects.c:73
 msgid "data visualiser"
 msgstr "візуалізатор даних"
 
-#: src/effects.c:73
+#: src/effects.c:74
 msgid "Data Visualisers"
 msgstr "Візуалізатори даних"
 
-#: src/effects.c:75
+#: src/effects.c:76
 msgid "data processor"
 msgstr "обробник даних"
 
-#: src/effects.c:76
+#: src/effects.c:77
 msgid "Data Processors"
 msgstr "Обробники даних"
 
-#: src/effects.c:78
+#: src/effects.c:79
 msgid "data source"
 msgstr "джерело даних"
 
-#: src/effects.c:79
+#: src/effects.c:80
 msgid "Data Sources"
 msgstr "Джерела даних"
 
-#: src/effects.c:81
+#: src/effects.c:82
 msgid "transition"
 msgstr "перехід"
 
-#: src/effects.c:82
+#: src/effects.c:83
 msgid "Transitions"
 msgstr "Переходи"
 
-#: src/effects.c:84
+#: src/effects.c:85
 msgid "effect"
 msgstr "ефект"
 
-#: src/effects.c:87 src/rfx-builder.c:187
+#: src/effects.c:88 src/rfx-builder.c:187
 msgid "utility"
 msgstr "утиліта"
 
-#: src/effects.c:88
+#: src/effects.c:89
 msgid "Utilities"
 msgstr "Утиліти"
 
-#: src/effects.c:90
+#: src/effects.c:91
 msgid "compositor"
 msgstr "складання"
 
-#: src/effects.c:91
+#: src/effects.c:92
 msgid "Compositors"
 msgstr "Складання"
 
-#: src/effects.c:93
+#: src/effects.c:94
 msgid "tap"
 msgstr "удар"
 
-#: src/effects.c:94
+#: src/effects.c:95
 msgid "Taps"
 msgstr "Удари"
 
-#: src/effects.c:96
+#: src/effects.c:97
 msgid "splitter"
 msgstr "роздільник"
 
-#: src/effects.c:97
+#: src/effects.c:98
 msgid "Splitters"
 msgstr "Роздільники"
 
-#: src/effects.c:99
+#: src/effects.c:100
 msgid "converter"
 msgstr "перетворювач"
 
-#: src/effects.c:100
+#: src/effects.c:101
 msgid "Converters"
 msgstr "Перетворювачі"
 
-#: src/effects.c:102
+#: src/effects.c:103
 msgid "analyser"
 msgstr "аналізатор"
 
-#: src/effects.c:103
+#: src/effects.c:104
 msgid "Analysers"
 msgstr "Аналізатори"
 
-#: src/effects.c:108
+#: src/effects.c:109
 msgid "audio/video"
 msgstr "звук/відео"
 
-#: src/effects.c:109
+#: src/effects.c:110
 msgid "Audio/Video Transitions"
 msgstr "Переходи звуку/зображення"
 
-#: src/effects.c:111
+#: src/effects.c:112
 msgid "video only"
 msgstr "лише відео"
 
-#: src/effects.c:112
+#: src/effects.c:113
 msgid "Video only Transitions"
 msgstr "Переходи лише зображення"
 
-#: src/effects.c:114 src/multitrack.c:10740
+#: src/effects.c:115 src/multitrack.c:10962
 msgid "audio only"
 msgstr "лише звук"
 
-#: src/effects.c:115
+#: src/effects.c:116
 msgid "Audio only Transitions"
 msgstr "Лише звук з переходами"
 
-#: src/effects.c:117 src/effects.c:120 src/multitrack.c:18757
+#: src/effects.c:118 src/effects.c:121 src/multitrack.c:19097
 msgid "audio"
 msgstr "звук"
 
-#: src/effects.c:118
+#: src/effects.c:119
 msgid "Audio Mixers"
 msgstr "Аудіомікшери"
 
-#: src/effects.c:121
+#: src/effects.c:122
 msgid "Audio Effects"
 msgstr "Звукові ефекти"
 
-#: src/effects.c:123
+#: src/effects.c:124
 msgid "video"
 msgstr "відео"
 
-#: src/effects.c:124
+#: src/effects.c:125
 msgid "Video Effects"
 msgstr "Відеоефекти"
 
-#: src/effects.c:126
+#: src/effects.c:127
 msgid "audio volume controller"
 msgstr "регулятор гучності"
 
-#: src/effects.c:127
+#: src/effects.c:128
 msgid "Audio Volume Controllers"
 msgstr "Регулятори гучності"
 
-#: src/effects.c:129
+#: src/effects.c:130
 msgid "video analyser"
 msgstr "відеоаналізатор"
 
-#: src/effects.c:130
+#: src/effects.c:131
 msgid "Video analysers"
 msgstr "Відеоаналізатори"
 
-#: src/effects.c:132
+#: src/effects.c:133
 msgid "audio analyser"
 msgstr "аналізатор звуку"
 
-#: src/effects.c:133
+#: src/effects.c:134
 msgid "Audio Analysers"
 msgstr "Засоби аналізу звукових даних"
 
-#: src/effects.c:137 src/plugins.c:2559 src/plugins.c:2573
+#: src/effects.c:138 src/plugins.c:2507 src/plugins.c:2521
 msgid "unknown"
 msgstr "невідомий"
 
-#: src/effects.c:238
+#: src/effects.c:235
 #, c-format
 msgid "%s all frames..."
 msgstr "%s всі кадри…"
 
-#: src/effects.c:243
+#: src/effects.c:239
 #, c-format
 msgid "%s clipboard into frames %d to %d..."
 msgstr "%s вміст буфера обміну у кадри з %d до %d…"
 
-#: src/effects.c:250
+#: src/effects.c:245
 #, c-format
 msgid "%s to clipboard..."
 msgstr "%s до буфера…"
 
-#: src/effects.c:254
+#: src/effects.c:248
 #, c-format
 msgid "%s to new clip..."
 msgstr "%s до нового кліпу…"
 
-#: src/effects.c:259
+#: src/effects.c:252
 #, c-format
 msgid "%s frames %d to %d..."
 msgstr "%s кадри з %d до %d…"
 
-#: src/effects.c:290
+#: src/effects.c:283
 #, c-format
 msgid "%s clipboard with selection"
 msgstr "%s вміст буфера обміну даними з позначеною ділянкою"
 
-#: src/effects.c:295
+#: src/effects.c:287
 #, c-format
 msgid "%s to clipboard"
 msgstr "%s до буфера"
 
-#: src/effects.c:299
+#: src/effects.c:290
 #, c-format
 msgid "%s to new clip"
 msgstr "%s до нового кліпу"
 
-#: src/effects.c:304
+#: src/effects.c:294
 #, c-format
 msgid "%s frames %d to %d"
 msgstr "%s кадри від %d до %d"
 
-#: src/effects.c:456 src/effects.c:523
+#: src/effects.c:443 src/effects.c:507
 msgid ""
 "\n"
 "No frames were generated.\n"
@@ -6342,46 +6357,46 @@
 "\n"
 "Не було створено жодного кадру.\n"
 
-#: src/effects-weed.c:431
+#: src/effects-weed.c:452
 msgid "integer"
 msgstr "ціле число"
 
-#: src/effects-weed.c:432
+#: src/effects-weed.c:454
 msgid "int64"
 msgstr "int64"
 
-#: src/effects-weed.c:433
+#: src/effects-weed.c:456
 msgid "boolean"
 msgstr "булеве"
 
-#: src/effects-weed.c:434
+#: src/effects-weed.c:458
 msgid "double"
 msgstr "double"
 
-#: src/effects-weed.c:435
+#: src/effects-weed.c:460
 msgid "string"
 msgstr "рядок"
 
-#: src/effects-weed.c:436
+#: src/effects-weed.c:462
 msgid "pointer"
 msgstr "вказівник"
 
-#: src/effects-weed.c:4591
+#: src/effects-weed.c:4581
 #, c-format
 msgid "Error: plugin %s has no weed_setup() function.\n"
 msgstr "Помилка: у додатку %s не визначено функції weed_setup().\n"
 
-#: src/effects-weed.c:4606
+#: src/effects-weed.c:4595
 #, c-format
 msgid "No usable filters found in plugin %s\n"
 msgstr "У додатку %s не знайдено придатних до використання фільтрів\n"
 
-#: src/effects-weed.c:4680
+#: src/effects-weed.c:4668
 #, c-format
 msgid "Found duplicate plugin %s"
 msgstr "Виявлено дублювання додатка %s"
 
-#: src/effects-weed.c:4734
+#: src/effects-weed.c:4723
 #, c-format
 msgid ""
 "Info: Unable to load plugin %s\n"
@@ -6390,69 +6405,69 @@
 "Інформація: не вдалося завантажити додаток %s\n"
 "Повідомлення про помилку: %s\n"
 
-#: src/effects-weed.c:4737 src/effects-weed.c:5858
+#: src/effects-weed.c:4726 src/effects-weed.c:5847
 msgid "Some plugin directories"
 msgstr "Каталоги додатків"
 
 #. TRANSLATORS: example " - LADSPA plugins -"
-#: src/effects-weed.c:4812 src/rte_window.c:2105
+#: src/effects-weed.c:4801 src/rte_window.c:2107
 #, c-format
 msgid " - %s plugins -"
 msgstr " - додатки %s -"
 
-#: src/effects-weed.c:5012
+#: src/effects-weed.c:4998
 #, c-format
 msgid "Successfully loaded %d Weed filters\n"
 msgstr "Успішно завантажено %d фільтрів Weed\n"
 
-#: src/effects-weed.c:5177
+#: src/effects-weed.c:5162
 #, c-format
 msgid "Invalid compound effect %s - has conflicting target_fps\n"
 msgstr "Некоректний комплексний ефект %s — суперечливі значення target_fps\n"
 
-#: src/effects-weed.c:5197
+#: src/effects-weed.c:5182
 #, c-format
 msgid "Invalid compound effect %s - has multiple transition parameters\n"
 msgstr "Некоректний комплексний ефект %s — декілька параметрів переходу\n"
 
-#: src/effects-weed.c:5211
+#: src/effects-weed.c:5196
 #, c-format
 msgid "Invalid compound effect %s - has multiple master volume parameters\n"
 msgstr ""
 "Некоректний комплексний ефект %s — вказано декілька параметрів гучності "
 "основного каналу\n"
 
-#: src/effects-weed.c:5346
+#: src/effects-weed.c:5329
 #, c-format
 msgid "Invalid compound effect %s - must have >1 sub filters\n"
 msgstr "Некоректний комплексний ефект %s — має бути більше одного підфільтра\n"
 
-#: src/effects-weed.c:5366
+#: src/effects-weed.c:5349
 #, c-format
 msgid "Invalid effect %s found in compound effect %s, line %d\n"
 msgstr "Виявлено некоректний ефект %s у комплексному ефекті %s, рядок %d\n"
 
-#: src/effects-weed.c:5381
+#: src/effects-weed.c:5364
 #, c-format
 msgid "Invalid default found in compound effect %s, line %d\n"
 msgstr ""
 "Виявлено некоректне типове значення у комплексному ефекті %s, рядок %d\n"
 
-#: src/effects-weed.c:5392
+#: src/effects-weed.c:5375
 #, c-format
 msgid "Invalid filter %d for defaults found in compound effect %s, line %d\n"
 msgstr ""
 "Виявлено некоректний фільтр %d для типових значень у комплексному ефекті %s, "
 "рядок %d\n"
 
-#: src/effects-weed.c:5406
+#: src/effects-weed.c:5389
 #, c-format
 msgid "Invalid param %d for defaults found in compound effect %s, line %d\n"
 msgstr ""
 "Виявлено некоректний параметр %d для типових значень у комплексному ефекті "
 "%s, рядок %d\n"
 
-#: src/effects-weed.c:5433
+#: src/effects-weed.c:5416
 #, c-format
 msgid ""
 "Invalid number of values for defaults found in compound effect %s, line %d\n"
@@ -6460,7 +6475,7 @@
 "Виявлено некоректну кількість типових значень у комплексному ефекті %s, "
 "рядок %d\n"
 
-#: src/effects-weed.c:5467
+#: src/effects-weed.c:5450
 #, c-format
 msgid ""
 "Invalid non-boolean value for defaults found in compound effect %s, line %d\n"
@@ -6468,13 +6483,13 @@
 "Виявлено небулеве значення для типового параметра у комплексному ефекті %s, "
 "рядок %d\n"
 
-#: src/effects-weed.c:5500
+#: src/effects-weed.c:5483
 #, c-format
 msgid "Invalid param link found in compound effect %s, line %d\n"
 msgstr ""
 "Виявлено некоректний параметр посилання у комплексному ефекті %s, рядок %d\n"
 
-#: src/effects-weed.c:5511
+#: src/effects-weed.c:5494
 #, c-format
 msgid ""
 "Invalid out filter %d for link params found in compound effect %s, line %d\n"
@@ -6482,7 +6497,7 @@
 "Виявлено некоректний фільтр виведення даних %d для параметрів посилань у "
 "комплексному ефекті %s, рядок %d\n"
 
-#: src/effects-weed.c:5529
+#: src/effects-weed.c:5513
 #, c-format
 msgid ""
 "Invalid out param %d for link params found in compound effect %s, line %d\n"
@@ -6490,7 +6505,7 @@
 "Виявлено некоректний параметр виведення даних %d для параметрів посилань у "
 "комплексному ефекті %s, рядок %d\n"
 
-#: src/effects-weed.c:5541
+#: src/effects-weed.c:5526
 #, c-format
 msgid ""
 "Invalid non-boolean value for autoscale found in compound effect %s, line "
@@ -6499,7 +6514,7 @@
 "Виявлено небулеве значення для автоматичного масштабування у комплексному "
 "ефекті %s, рядок %d\n"
 
-#: src/effects-weed.c:5552
+#: src/effects-weed.c:5537
 #, c-format
 msgid ""
 "Invalid in filter %d for link params found in compound effect %s, line %d\n"
@@ -6507,7 +6522,7 @@
 "Виявлено некоректний фільтр вхідних даних %d для параметрів посилань у "
 "комплексному ефекті %s, рядок %d\n"
 
-#: src/effects-weed.c:5566
+#: src/effects-weed.c:5552
 #, c-format
 msgid ""
 "Invalid in param %d for link params found in compound effect %s, line %d\n"
@@ -6515,13 +6530,13 @@
 "Виявлено некоректний параметр вхідних даних %d для параметрів посилань у "
 "комплексному ефекті %s, рядок %d\n"
 
-#: src/effects-weed.c:5594
+#: src/effects-weed.c:5581
 #, c-format
 msgid "Invalid channel link found in compound effect %s, line %d\n"
 msgstr ""
 "Виявлено некоректне посилання на канал у комплексному ефекті %s, рядок %d\n"
 
-#: src/effects-weed.c:5605
+#: src/effects-weed.c:5592
 #, c-format
 msgid ""
 "Invalid out filter %d for link channels found in compound effect %s, line "
@@ -6530,7 +6545,7 @@
 "Виявлено некоректний фільтр виведення даних %d для каналів прив’язки у "
 "комплексному ефекті %s, рядок %d\n"
 
-#: src/effects-weed.c:5623
+#: src/effects-weed.c:5611
 #, c-format
 msgid ""
 "Invalid out channel %d for link params found in compound effect %s, line %d\n"
@@ -6538,7 +6553,7 @@
 "Виявлено некоректний канал виведення даних %d для параметрів посилань у "
 "комплексному ефекті %s, рядок %d\n"
 
-#: src/effects-weed.c:5633
+#: src/effects-weed.c:5622
 #, c-format
 msgid ""
 "Invalid in filter %d for link channels found in compound effect %s, line %d\n"
@@ -6546,7 +6561,7 @@
 "Виявлено некоректний фільтр вхідних даних %d для каналів прив’язки у "
 "комплексному ефекті %s, рядок %d\n"
 
-#: src/effects-weed.c:5651
+#: src/effects-weed.c:5641
 #, c-format
 msgid ""
 "Invalid in channel %d for link params found in compound effect %s, line %d\n"
@@ -6554,125 +6569,125 @@
 "Виявлено некоректний канал вхідних даних %d для параметрів посилань у "
 "комплексному ефекті %s, рядок %d\n"
 
-#: src/effects-weed.c:5687
+#: src/effects-weed.c:5678
 #, c-format
 msgid "Compound:%s"
 msgstr "Комплексний: %s"
 
-#: src/effects-weed.c:5758
+#: src/effects-weed.c:5749
 #, c-format
 msgid "Successfully loaded %d compound filters\n"
 msgstr "Успішно завантажено %d комплексних фільтрів\n"
 
-#: src/effects-weed.c:6591
+#: src/effects-weed.c:6570
 #, c-format
 msgid "Effect %s cannot be used with this audio player.\n"
 msgstr "Не можна використовувати ефект %s з цим програвачем звукових даних.\n"
 
-#: src/effects-weed.c:6737
+#: src/effects-weed.c:6718
 #, c-format
 msgid "Failed to start instance %s, error code %d\n"
 msgstr "Не вдалося запустити екземпляр %s, код помилки: %d\n"
 
-#: src/effects-weed.c:6814
+#: src/effects-weed.c:6797
 #, c-format
 msgid "Unable to start generator %s\n"
 msgstr "Не вдалося запустити породжувач %s\n"
 
-#: src/effects-weed.c:7621
+#: src/effects-weed.c:7607
 #, c-format
 msgid "Failed to start generator %s\n"
 msgstr "Не вдалося запустити породжувач %s\n"
 
-#: src/effects-weed.c:7718
+#: src/effects-weed.c:7701
 #, c-format
 msgid "Failed to start generator %s, error %d\n"
 msgstr "Не вдалося запустити породжувач %s, помилка: %d\n"
 
-#: src/effects-weed.c:9012
+#: src/effects-weed.c:8993
 #, c-format
 msgid "%s [unstable] (%s)"
 msgstr "%s [нестабільний] (%s)"
 
-#: src/effects-data.c:3278
+#: src/effects-data.c:3234
 #, c-format
 msgid "ACTIVATE (%s)"
 msgstr "ЗАДІЯТИ (%s)"
 
-#: src/effects-data.c:3548
+#: src/effects-data.c:3501
 msgid "ACTIVATE"
 msgstr "ЗАДІЯТИ"
 
-#: src/effects-data.c:3876
+#: src/effects-data.c:3829
 #, c-format
 msgid "Key slot %d"
 msgstr "Слот ключа %d"
 
-#: src/effects-data.c:3998
+#: src/effects-data.c:3951
 msgid "Autoscale"
 msgstr "Автомасштаб"
 
-#: src/effects-data.c:4089
+#: src/effects-data.c:4042
 msgid "Add another connection for this output parameter"
 msgstr "Додати інше з’єднання для цього параметра виведення"
 
-#: src/effects-data.c:4102 src/effects-data.c:4151
+#: src/effects-data.c:4055 src/effects-data.c:4104
 msgid "Delete this connection"
 msgstr "Вилучити це з’єднання"
 
-#: src/effects-data.c:4138
+#: src/effects-data.c:4091
 msgid "Add another connection for this output channel"
 msgstr "Додати інше з’єднання для цього каналу виведення"
 
-#: src/effects-data.c:4223
+#: src/effects-data.c:4176
 msgid "Connected to -->"
 msgstr "З’єднано з →"
 
-#: src/effects-data.c:4243
+#: src/effects-data.c:4196
 #, c-format
 msgid "%s - Alpha Channel Connections"
 msgstr "%s — з’єднання каналу прозорості"
 
-#: src/effects-data.c:4316
+#: src/effects-data.c:4269
 #, c-format
 msgid "%s - Parameter Data Connections"
 msgstr "%s — з’єднання параметрів даних"
 
-#: src/effects-data.c:4336
+#: src/effects-data.c:4289
 msgid "Autoscale All"
 msgstr "Автомасштаб для всього"
 
-#: src/effects-data.c:4361 src/effects-data.c:4890
+#: src/effects-data.c:4314 src/effects-data.c:4841
 msgid "ACTIVATED"
 msgstr "ЗАДІЯНО"
 
-#: src/effects-data.c:4774
+#: src/effects-data.c:4726
 msgid "LiVES: - Parameter and Alpha Channel Connections"
 msgstr "LiVES: З’єднання параметрів та каналів прозорості"
 
-#: src/effects-data.c:4785
+#: src/effects-data.c:4736
 msgid "Auto Connect Channels"
 msgstr "Автоз’єднання каналів"
 
-#: src/effects-data.c:4797
+#: src/effects-data.c:4748
 msgid "Auto Connect Parameters"
 msgstr "Автоз’єднання параметрів"
 
-#: src/effects-data.c:4807
+#: src/effects-data.c:4758
 msgid "Disconnect All"
 msgstr "Від’єднати все"
 
-#: src/effects-data.c:4875
+#: src/effects-data.c:4826
 #, c-format
 msgid "Input channel is already connected from (%d,%d) %s"
 msgstr "Канал вхідних даних вже з’єднано з (%d,%d) %s"
 
-#: src/effects-data.c:4891
+#: src/effects-data.c:4842
 #, c-format
 msgid "Input parameter is already connected from (%d,%d) %s"
 msgstr "Вхідний параметр вже з’єднано з (%d,%d) %s"
 
-#: src/effects-data.c:4899
+#: src/effects-data.c:4851
 msgid "Input and output parameters are not compatible"
 msgstr "Вхідні і вихідні параметри є несумісними"
 
@@ -6686,47 +6701,47 @@
 msgid "_Reset Values"
 msgstr "Від_новити значення"
 
-#: src/framedraw.c:267
+#: src/framedraw.c:265
 msgid "_Frame"
 msgstr "_Кадр"
 
-#: src/paramspecial.c:266
+#: src/paramspecial.c:259
 msgid "Maintain _Aspect Ratio"
 msgstr "З_берігати співвідношення розмірів"
 
-#: src/paramspecial.c:267
+#: src/paramspecial.c:260
 msgid "Maintain aspect ratio of original frame"
 msgstr "Зберігати співвідношення розмірів початкового кадру"
 
-#: src/paramspecial.c:341
+#: src/paramspecial.c:335
 msgid "Display Password"
 msgstr "Показувати пароль"
 
-#: src/paramwindow.c:450
+#: src/paramwindow.c:447
 msgid "Transition _In"
 msgstr "В_хідна позиція переходу"
 
-#: src/paramwindow.c:452
+#: src/paramwindow.c:449
 msgid "Click to set the transition parameter to show only the front frame"
 msgstr ""
 "Клацніть, щоб визначити параметр переходу, пов’язаний з показом лише кадру "
 "переднього плану"
 
-#: src/paramwindow.c:474
+#: src/paramwindow.c:472
 msgid "Crossfade audio"
 msgstr "Поступовий перехід звуку"
 
-#: src/paramwindow.c:475
+#: src/paramwindow.c:473
 msgid "Check the box to make audio transition with the video"
 msgstr ""
 "Позначте цей пункт, щоб наказати програмі виконати перехід звуку разом з "
 "переходом зображення"
 
-#: src/paramwindow.c:493
+#: src/paramwindow.c:492
 msgid "Transition _Out"
 msgstr "В_ихідна позиція переходу"
 
-#: src/paramwindow.c:495
+#: src/paramwindow.c:494
 msgid "Click to set the transition parameter to show only the rear frame"
 msgstr ""
 "Клацніть, щоб визначити параметр переходу, пов’язаний з показом лише кадру "
@@ -6741,23 +6756,23 @@
 msgid "%s : size"
 msgstr "%s: розмір"
 
-#: src/paramwindow.c:598
+#: src/paramwindow.c:597
 msgid "New size (pixels)"
 msgstr "Новий розмір (у пікселях):"
 
-#: src/paramwindow.c:617 src/plugins.c:997
+#: src/paramwindow.c:616 src/plugins.c:973
 msgid "_Width"
 msgstr "_Ширина"
 
-#: src/paramwindow.c:636 src/plugins.c:1003
+#: src/paramwindow.c:635 src/plugins.c:979
 msgid "_Height"
 msgstr "_Висота"
 
-#: src/paramwindow.c:684
+#: src/paramwindow.c:683
 msgid "Generate to _Clipboard"
 msgstr "Створити до _буфера"
 
-#: src/paramwindow.c:686
+#: src/paramwindow.c:685
 msgid "Generate frames to the clipboard"
 msgstr "Створити кадри у буфері обміну даними"
 
@@ -6769,7 +6784,7 @@
 msgid "Generate frames to a new clip"
 msgstr "Створити кадри у новому кліпі"
 
-#: src/paramwindow.c:822
+#: src/paramwindow.c:824
 #, c-format
 msgid ""
 "\n"
@@ -6780,59 +6795,59 @@
 "Для застосування цього ефекту вам слід позначити принаймні %d кадрів.\n"
 "\n"
 
-#: src/paramwindow.c:920 src/paramwindow.c:930
+#: src/paramwindow.c:934 src/paramwindow.c:942
 msgid "Set as default"
 msgstr "Зробити типовим"
 
-#: src/paramwindow.c:922 src/paramwindow.c:938
+#: src/paramwindow.c:936 src/paramwindow.c:950
 msgid "Reset"
 msgstr "Скинути"
 
-#: src/paramwindow.c:932 src/rte_window.c:2401 src/omc-learn.c:1357
+#: src/paramwindow.c:944 src/rte_window.c:2394 src/omc-learn.c:1347
 msgid "Close _window"
 msgstr "За_крити вікно"
 
-#: src/paramwindow.c:1337
+#: src/paramwindow.c:1340
 msgid "No parameters"
 msgstr "Без параметрів"
 
-#: src/paramwindow.c:1419
+#: src/paramwindow.c:1424
 msgid "Invalid parameter"
 msgstr "Некоректний параметр"
 
-#: src/paramwindow.c:1611
+#: src/paramwindow.c:1610
 msgid "LiVES: - Select Colour"
 msgstr "LiVES: - Вибір кольору"
 
-#: src/paramwindow.c:1616
+#: src/paramwindow.c:1615
 msgid "Click to set the colour"
 msgstr "Натисніть, щоб вказати колір"
 
-#: src/paramwindow.c:1628
+#: src/paramwindow.c:1626
 msgid "_Red"
 msgstr "_Червоний"
 
-#: src/paramwindow.c:1629
+#: src/paramwindow.c:1627
 msgid "The red value (0 - 255)"
 msgstr "Значення червоного (0-255)"
 
-#: src/paramwindow.c:1632
+#: src/paramwindow.c:1630
 msgid "_Green"
 msgstr "_Зелений"
 
-#: src/paramwindow.c:1633
+#: src/paramwindow.c:1631
 msgid "The green value (0 - 255)"
 msgstr "Значення зеленого (0-255)"
 
-#: src/paramwindow.c:1636
+#: src/paramwindow.c:1634
 msgid "_Blue"
 msgstr "С_иній"
 
-#: src/paramwindow.c:1637
+#: src/paramwindow.c:1635
 msgid "The blue value (0 - 255)"
 msgstr "Значення синього (0-255)"
 
-#: src/plugins.c:85
+#: src/plugins.c:86
 #, c-format
 msgid ""
 "\n"
@@ -6841,12 +6856,12 @@
 "\n"
 "Помилка додатка: виконання %s завершилося помилкою з кодом %d"
 
-#: src/plugins.c:87
+#: src/plugins.c:88
 #, c-format
 msgid " : message was %s\n"
 msgstr " : повідомлення: %s\n"
 
-#: src/plugins.c:387
+#: src/plugins.c:375
 #, c-format
 msgid ""
 "\n"
@@ -6861,18 +6876,18 @@
 "%s\n"
 "Код помилки %d\n"
 
-#: src/plugins.c:397
+#: src/plugins.c:385
 #, c-format
 msgid "Updating video playback plugin defaults in %s\n"
 msgstr "Оновлення типових значень параметра відтворення відео у %s\n"
 
-#: src/plugins.c:452
+#: src/plugins.c:444
 #, c-format
 msgid "Loading video playback plugin defaults from %s..."
 msgstr ""
 "Завантаження типових значень параметрів додатка відтворення відео з %s..."
 
-#: src/plugins.c:515
+#: src/plugins.c:505
 #, c-format
 msgid ""
 "\n"
@@ -6887,32 +6902,32 @@
 " Інструменти|Параметри|Відтворення|Додаткові параметри відтворення\n"
 "\n"
 
-#: src/plugins.c:855
+#: src/plugins.c:836
 #, c-format
 msgid "Saving playback plugin defaults to %s..."
 msgstr "Збереження типових параметрів додатка відтворення до %s…"
 
-#: src/plugins.c:962
+#: src/plugins.c:939
 msgid "_FPS"
 msgstr "_Частота кадрів"
 
-#: src/plugins.c:963
+#: src/plugins.c:940
 msgid "Fixed framerate for plugin.\n"
 msgstr "Фіксована частота кадрів для додатка.\n"
 
-#: src/plugins.c:1032
+#: src/plugins.c:1008
 msgid "_Colourspace"
 msgstr "_Простір кольорів"
 
-#: src/plugins.c:1033
+#: src/plugins.c:1009
 msgid "Colourspace input to the plugin.\n"
 msgstr "Вхідний простір кольорів для додатка.\n"
 
-#: src/plugins.c:1089
+#: src/plugins.c:1065
 msgid "Save settings to an alternate file.\n"
 msgstr "Зберегти параметри до іншого файла.\n"
 
-#: src/plugins.c:1206
+#: src/plugins.c:1182
 #, c-format
 msgid ""
 "\n"
@@ -6925,7 +6940,7 @@
 "Не вдалося відкрити додаток відтворення %s\n"
 "Помилка: %s\n"
 
-#: src/plugins.c:1252
+#: src/plugins.c:1228
 #, c-format
 msgid ""
 "\n"
@@ -6940,7 +6955,7 @@
 "не передбачено обов’язкової функції.\n"
 "Його використання неможливе.\n"
 
-#: src/plugins.c:1265
+#: src/plugins.c:1241
 #, c-format
 msgid ""
 "Video playback plugin failed to initialise.\n"
@@ -6949,7 +6964,7 @@
 "Не вдалося ініціалізувати додаток відтворення.\n"
 "Помилка: %s\n"
 
-#: src/plugins.c:1461
+#: src/plugins.c:1428
 msgid ""
 "\n"
 "Warning ! Video playback plugin will not send key presses. Keyboard may be "
@@ -6960,7 +6975,7 @@
 "натискання клавіш. Під час користування додатком клавіатурні скорочення може "
 "бути вимкнено!\n"
 
-#: src/plugins.c:1465
+#: src/plugins.c:1433
 #, c-format
 msgid ""
 "*** Using %s plugin for fs playback, agreed to use palette type %d ( %s ). "
@@ -6969,17 +6984,17 @@
 "*** Використання додатка %s для повноекранного відтворення призведе до "
 "використання типу палітри %d ( %s ). ***\n"
 
-#: src/plugins.c:1571
+#: src/plugins.c:1537
 #, c-format
 msgid "Audio stream unable to use preferred format '%s'\n"
 msgstr "Поток звукових даних не може використовувати бажаний формат «%s»\n"
 
-#: src/plugins.c:1579
+#: src/plugins.c:1543
 #, c-format
 msgid "Using format '%s' instead.\n"
 msgstr "Використовуємо формат «%s».\n"
 
-#: src/plugins.c:1616
+#: src/plugins.c:1579
 #, c-format
 msgid ""
 "LiVES was unable to find its encoder plugins. Please make sure you have the "
@@ -6992,7 +7007,7 @@
 "%s%s%s\n"
 "або змініть значення параметра <lib_dir> у %s\n"
 
-#: src/plugins.c:1624
+#: src/plugins.c:1589
 #, c-format
 msgid ""
 "LiVES did not receive a response from the encoder plugin called '%s'.\n"
@@ -7006,11 +7021,11 @@
 "або перемкніть програму на використання іншого додатка за допомогою вкладки "
 "«Інструменти|Параметри|Кодування»\n"
 
-#: src/plugins.c:2032
+#: src/plugins.c:1987
 msgid "Unable to resize, please install imageMagick\n"
 msgstr "Зміна розмірів неможлива, будь ласка, встановіть imageMagick\n"
 
-#: src/plugins.c:2231
+#: src/plugins.c:2183
 #, c-format
 msgid ""
 "\n"
@@ -7021,12 +7036,12 @@
 "\n"
 "У %s не знайдено декодувальників!\n"
 
-#: src/plugins.c:2415
+#: src/plugins.c:2369
 #, c-format
 msgid " using %s"
 msgstr " за використання %s"
 
-#: src/plugins.c:2499
+#: src/plugins.c:2451
 #, c-format
 msgid ""
 "\n"
@@ -7039,7 +7054,7 @@
 "Не вдалося відкрити додаток декодування %s\n"
 "Помилка: %s\n"
 
-#: src/plugins.c:2522
+#: src/plugins.c:2472
 #, c-format
 msgid ""
 "\n"
@@ -7054,24 +7069,24 @@
 "немає обов’язкової функції.\n"
 "Його використання неможливе.\n"
 
-#: src/plugins.c:2564
+#: src/plugins.c:2512
 msgid "/unknown"
 msgstr "/невідомо"
 
-#: src/plugins.c:2651
+#: src/plugins.c:2598
 msgid "LiVES: - Decoder Plugins"
 msgstr "LiVES: - Додаток декодування"
 
-#: src/plugins.c:2669
+#: src/plugins.c:2616
 msgid "Enabled Video Decoders (uncheck to disable)"
 msgstr "Увімкнені декодери відео (зніміть позначку, щоб вимкнути)"
 
-#: src/plugins.c:2726
+#: src/plugins.c:2672
 #, c-format
 msgid "Failed to load %s, transitions may not resize.\n"
 msgstr "Не вдалося завантажити %s, при переходах зміна розмірів неможлива.\n"
 
-#: src/plugins.c:3854
+#: src/plugins.c:3797
 #, c-format
 msgid "%s advanced settings"
 msgstr "Додаткові параметри %s"
@@ -7080,15 +7095,15 @@
 msgid "LiVES: - New Test RFX"
 msgstr "LiVES: - Створення тестового RFX"
 
-#: src/rfx-builder.c:136
+#: src/rfx-builder.c:135
 msgid "LiVES: - Edit Test RFX"
 msgstr "LiVES: - Зміна тестового RFX"
 
-#: src/rfx-builder.c:166
+#: src/rfx-builder.c:165
 msgid "Type:"
 msgstr "Тип:"
 
-#: src/rfx-builder.c:184
+#: src/rfx-builder.c:183
 msgid "tool"
 msgstr "інструмент"
 
@@ -7100,130 +7115,130 @@
 msgid "The name of the plugin. No spaces allowed."
 msgstr "Назва додатка. Не можна використовувати пробіли."
 
-#: src/rfx-builder.c:201
+#: src/rfx-builder.c:202
 msgid "Version:       "
 msgstr "Версія:       "
 
-#: src/rfx-builder.c:203
+#: src/rfx-builder.c:204
 msgid "The script version."
 msgstr "Версія скрипту."
 
-#: src/rfx-builder.c:210
+#: src/rfx-builder.c:212
 msgid "    Author:       "
 msgstr "    Автор:       "
 
-#: src/rfx-builder.c:211
+#: src/rfx-builder.c:213
 msgid "The script author."
 msgstr "Автор скрипту."
 
-#: src/rfx-builder.c:217
+#: src/rfx-builder.c:220
 msgid "    URL (optional):       "
 msgstr "    Адреса URL (необов’язкова):       "
 
-#: src/rfx-builder.c:218
+#: src/rfx-builder.c:221
 msgid "URL for the plugin maintainer."
 msgstr "Адреса сторінки супровідника додатка."
 
-#: src/rfx-builder.c:226
+#: src/rfx-builder.c:230
 msgid "Menu text:    "
 msgstr "Текст меню:    "
 
-#: src/rfx-builder.c:227
+#: src/rfx-builder.c:231
 msgid "The text to show in the menu."
 msgstr "Текст, який буде показано у меню."
 
-#: src/rfx-builder.c:239
+#: src/rfx-builder.c:244
 msgid "Action description:        "
 msgstr "Опис дії:        "
 
-#: src/rfx-builder.c:241
+#: src/rfx-builder.c:246
 msgid "Describe what the plugin is doing. E.g. \"Edge detecting\""
 msgstr "Опишіть дії, які виконує додаток. Наприклад, «Визначення меж»"
 
-#: src/rfx-builder.c:246
+#: src/rfx-builder.c:251
 msgid "Minimum frames:"
 msgstr "Мінімальна к-ть кадрів:"
 
-#: src/rfx-builder.c:249
+#: src/rfx-builder.c:254
 msgid ""
 "Minimum number of frames this effect/tool can be applied to. Normally 1."
 msgstr ""
 "Мінімальна кількість кадрів, до якої можна застосовувати цей ефект або "
 "інструмент. Зазвичай, 1."
 
-#: src/rfx-builder.c:260
+#: src/rfx-builder.c:265
 msgid "_Requirements..."
 msgstr "_Залежності…"
 
-#: src/rfx-builder.c:263
+#: src/rfx-builder.c:268
 msgid "Enter any binaries required by the plugin."
 msgstr "Введіть список бінарних файлів, потрібних для роботи додатка."
 
-#: src/rfx-builder.c:267
+#: src/rfx-builder.c:272
 msgid "_Properties..."
 msgstr "_Властивості…"
 
-#: src/rfx-builder.c:270
+#: src/rfx-builder.c:275
 msgid "Set properties for the plugin. Optional."
 msgstr "Вкажіть властивості додатка. Не є обов’язковим."
 
-#: src/rfx-builder.c:274
+#: src/rfx-builder.c:279
 msgid "_Parameters..."
 msgstr "_Параметри…"
 
-#: src/rfx-builder.c:277
+#: src/rfx-builder.c:282
 msgid "Set up parameters used in pre/loop/post/trigger code. Optional."
 msgstr ""
 "Визначіть параметри, які буде використано у коді перед, після, у циклі або у "
 "коді перемикача. Не є обов’язковими."
 
-#: src/rfx-builder.c:281
+#: src/rfx-builder.c:286
 msgid "Parameter _Window Hints..."
 msgstr "Підказки _вікна параметрів…"
 
-#: src/rfx-builder.c:284
+#: src/rfx-builder.c:289
 msgid "Set hints about how to lay out the parameter window. Optional."
 msgstr ""
 "Вкажіть підказки щодо заповнення вікна параметрів. Підказки не є "
 "обов’язковими."
 
-#: src/rfx-builder.c:290
+#: src/rfx-builder.c:295
 msgid "_Language code:"
 msgstr "Код _мови:"
 
-#: src/rfx-builder.c:291
+#: src/rfx-builder.c:296
 msgid "Language for pre/loop/post/triggers. Optional."
 msgstr "Мова коду перед, після, у циклі або перемикачів. Не є обов’язковою."
 
-#: src/rfx-builder.c:300
+#: src/rfx-builder.c:305
 msgid "_Pre loop code..."
 msgstr "Код _до циклу…"
 
-#: src/rfx-builder.c:303
+#: src/rfx-builder.c:308
 msgid "Code to be executed before the loop. Optional."
 msgstr "Код, який буде виконано до циклу. Необов’язковий."
 
-#: src/rfx-builder.c:307
+#: src/rfx-builder.c:312
 msgid "_Loop code..."
 msgstr "Код _циклу…"
 
-#: src/rfx-builder.c:310
+#: src/rfx-builder.c:315
 msgid "Loop code to be applied to each frame."
 msgstr "Код циклу, який буде застосовано до кожного кадру."
 
-#: src/rfx-builder.c:314
+#: src/rfx-builder.c:319
 msgid "_Post loop code..."
 msgstr "Код _після циклу…"
 
-#: src/rfx-builder.c:317
+#: src/rfx-builder.c:322
 msgid "Code to be executed after the loop. Optional."
 msgstr "Код, який буде виконано після циклу. Необов’язковий."
 
-#: src/rfx-builder.c:321
+#: src/rfx-builder.c:326
 msgid "_Trigger code..."
 msgstr "Код пере_микача…"
 
-#: src/rfx-builder.c:324
+#: src/rfx-builder.c:329
 msgid ""
 "Set trigger code for when the parameter window is shown, or when a parameter "
 "is changed. Optional (except for Utilities)."
@@ -7231,7 +7246,7 @@
 "Встановіть код перемикання для показу вікна параметра або зміни параметра. "
 "Не є обов’язковим (окрім допоміжних інструментів)."
 
-#: src/rfx-builder.c:421
+#: src/rfx-builder.c:426
 #, c-format
 msgid ""
 "\n"
@@ -7246,55 +7261,55 @@
 "%s\n"
 "%s\n"
 
-#: src/rfx-builder.c:544
+#: src/rfx-builder.c:541
 msgid "LiVES: - RFX Requirements"
 msgstr "LiVES: - Залежності RFX"
 
-#: src/rfx-builder.c:548
+#: src/rfx-builder.c:544
 msgid "LiVES: - RFX Parameters"
 msgstr "LiVES: - Параметри RFX"
 
-#: src/rfx-builder.c:552
+#: src/rfx-builder.c:547
 msgid "LiVES: - RFX Parameter Window Hints"
 msgstr "LiVES: - Підказки вікна параметрів RFX"
 
-#: src/rfx-builder.c:556
+#: src/rfx-builder.c:550
 msgid "LiVES: - RFX Triggers"
 msgstr "LiVES: - RFX Triggers"
 
-#: src/rfx-builder.c:622
+#: src/rfx-builder.c:613
 msgid "_New Entry"
 msgstr "С_творити запис"
 
-#: src/rfx-builder.c:625
+#: src/rfx-builder.c:616
 msgid "_Edit Entry"
 msgstr "_Змінити запис"
 
-#: src/rfx-builder.c:628
+#: src/rfx-builder.c:619
 msgid "_Remove Entry"
 msgstr "Ви_лучити запис"
 
-#: src/rfx-builder.c:632
+#: src/rfx-builder.c:623
 msgid "Move _Up"
 msgstr "Пересунути в_гору"
 
-#: src/rfx-builder.c:635
+#: src/rfx-builder.c:626
 msgid "Move _Down"
 msgstr "Пересунути в_низ"
 
-#: src/rfx-builder.c:1004
+#: src/rfx-builder.c:984
 msgid "LiVES: - RFX Properties"
 msgstr "LiVES: - Властивості RFX"
 
-#: src/rfx-builder.c:1013
+#: src/rfx-builder.c:993
 msgid "_Slow (hint to GUI)"
 msgstr "Пов_ільно (підказка до інтерфейсу)"
 
-#: src/rfx-builder.c:1024
+#: src/rfx-builder.c:1004
 msgid "_Batch mode generator"
 msgstr "_Породжувач пакетного режиму"
 
-#: src/rfx-builder.c:1831
+#: src/rfx-builder.c:1790
 msgid ""
 "\n"
 "\n"
@@ -7308,7 +7323,7 @@
 "Будь ласка, спочатку вилучіть перемикач.\n"
 "\n"
 
-#: src/rfx-builder.c:1875
+#: src/rfx-builder.c:1834
 msgid ""
 "\n"
 "\n"
@@ -7320,27 +7335,27 @@
 "Було скориговано деякі з перемикачів.\n"
 "Будь ласка, перевірте код перемикачів.\n"
 
-#: src/rfx-builder.c:1994
+#: src/rfx-builder.c:1950
 msgid "LiVES: - New RFX Parameter"
 msgstr "LiVES: - Новий параметр RFX"
 
-#: src/rfx-builder.c:1997
+#: src/rfx-builder.c:1952
 msgid "LiVES: - Edit RFX Parameter"
 msgstr "LiVES: - Зміна параметра RFX"
 
-#: src/rfx-builder.c:2013
+#: src/rfx-builder.c:1968
 msgid "_Name:    "
 msgstr "_Назва:    "
 
-#: src/rfx-builder.c:2016
+#: src/rfx-builder.c:1971
 msgid "Name of the parameter, must be unique in the plugin."
 msgstr "Назва параметра, не повинна повторюватися в межах додатка."
 
-#: src/rfx-builder.c:2025
+#: src/rfx-builder.c:1981
 msgid "_Label:    "
 msgstr "_Мітка:    "
 
-#: src/rfx-builder.c:2028
+#: src/rfx-builder.c:1984
 msgid ""
 "Label to be shown by the parameter. An underscore represents mnemonic "
 "accelerator."
@@ -7348,162 +7363,162 @@
 "Мітка, яку буде показано поряд з параметром. Символ підкреслювання "
 "відповідатиме клавіатурному акселератору."
 
-#: src/rfx-builder.c:2039
+#: src/rfx-builder.c:1996
 msgid "_Type:         "
 msgstr "_Тип:         "
 
-#: src/rfx-builder.c:2040
+#: src/rfx-builder.c:1997
 msgid "Parameter type (select from list)."
 msgstr "Тип параметра (виберіть зі списку)."
 
-#: src/rfx-builder.c:2073
+#: src/rfx-builder.c:2029
 msgid "Decimal _places: "
 msgstr "Десяткових п_озицій: "
 
-#: src/rfx-builder.c:2082 src/rfx-builder.c:2477 src/rfx-builder.c:2495
+#: src/rfx-builder.c:2038 src/rfx-builder.c:2430 src/rfx-builder.c:2447
 msgid "_Default value:    "
 msgstr "_Типове значення:    "
 
-#: src/rfx-builder.c:2098
+#: src/rfx-builder.c:2054
 msgid "_Default: "
 msgstr "_Типовий: "
 
-#: src/rfx-builder.c:2132
+#: src/rfx-builder.c:2087
 msgid "Button _Group: "
 msgstr "_Група кнопок: "
 
-#: src/rfx-builder.c:2134
+#: src/rfx-builder.c:2089
 msgid "A non-zero value can be used to group radio buttons."
 msgstr "Для групування пунктів варіантів можна ввести ненульове число."
 
-#: src/rfx-builder.c:2142 src/rfx-builder.c:2478
+#: src/rfx-builder.c:2097 src/rfx-builder.c:2431
 msgid "_Minimum value: "
 msgstr "_Мінімальне значення: "
 
-#: src/rfx-builder.c:2148 src/rfx-builder.c:2479
+#: src/rfx-builder.c:2103 src/rfx-builder.c:2432
 msgid "Ma_ximum value: "
 msgstr "Ма_ксимальне значення: "
 
-#: src/rfx-builder.c:2157
+#: src/rfx-builder.c:2113
 msgid "     _Step size:   "
 msgstr "     Розмір _кроку:   "
 
-#: src/rfx-builder.c:2160
+#: src/rfx-builder.c:2117
 msgid ""
 "How much the parameter is adjusted when the spinbutton arrows are pressed."
 msgstr ""
 "Крок зміни параметра у відповідь на натискання кнопок зі стрілками поряд з "
 "полем лічильника."
 
-#: src/rfx-builder.c:2171
+#: src/rfx-builder.c:2129
 msgid "_Wrap value"
 msgstr "_Циклічна зміна"
 
-#: src/rfx-builder.c:2172
+#: src/rfx-builder.c:2131
 msgid "Whether the value wraps max->min and min->max."
 msgstr ""
 "Визначає, чи буде значення зациклено переходами максимальне->мінімальне та "
 "мінімальне->максимальне."
 
-#: src/rfx-builder.c:2470
+#: src/rfx-builder.c:2424
 msgid "Set _values"
 msgstr "Вказати _значення"
 
-#: src/rfx-builder.c:2512
+#: src/rfx-builder.c:2463
 msgid "Default _Red:  "
 msgstr "Типовий _червоний:  "
 
-#: src/rfx-builder.c:2513
+#: src/rfx-builder.c:2464
 msgid "Default _Green:"
 msgstr "Типовий _зелений:"
 
-#: src/rfx-builder.c:2514
+#: src/rfx-builder.c:2465
 msgid "Default _Blue: "
 msgstr "Типовий _синій: "
 
-#: src/rfx-builder.c:2538
+#: src/rfx-builder.c:2488
 msgid "Set _default"
 msgstr "Зробити _типовим"
 
-#: src/rfx-builder.c:2540
+#: src/rfx-builder.c:2490
 msgid "Default value:  "
 msgstr "Типове значення:  "
 
-#: src/rfx-builder.c:2541
+#: src/rfx-builder.c:2491
 msgid "Maximum length (chars): "
 msgstr "Максимальна довжина (у літерах): "
 
-#: src/rfx-builder.c:2576
+#: src/rfx-builder.c:2526
 msgid "LiVES: - New RFX Parameter Window Hint"
 msgstr "LiVES: - Створення підказки вікна параметрів RFX"
 
-#: src/rfx-builder.c:2579
+#: src/rfx-builder.c:2528
 msgid "LiVES: - Edit RFX Parameter Window Hint"
 msgstr "LiVES: - Зміна підказки вікна параметрів перемикача RFX"
 
-#: src/rfx-builder.c:2622
+#: src/rfx-builder.c:2569
 msgid "_Keyword:         "
 msgstr "_Ключове слово:         "
 
-#: src/rfx-builder.c:2639
+#: src/rfx-builder.c:2586
 msgid "Special _Type:         "
 msgstr "Особливий _тип:         "
 
-#: src/rfx-builder.c:2656
+#: src/rfx-builder.c:2602
 msgid "Special _Subtype:         "
 msgstr "Особливий _підтип:         "
 
-#: src/rfx-builder.c:2667 src/rfx-builder.c:2706
+#: src/rfx-builder.c:2613 src/rfx-builder.c:2651
 msgid "Row:    "
 msgstr "Рядок:    "
 
-#: src/rfx-builder.c:2732
+#: src/rfx-builder.c:2676
 #, c-format
 msgid "Linked parameters (%d):    "
 msgstr "Пов’язані параметри (%d):    "
 
-#: src/rfx-builder.c:2749
+#: src/rfx-builder.c:2693
 msgid "Linked parameters (4):    "
 msgstr "Пов’язані параметри (4):    "
 
-#: src/rfx-builder.c:2752
+#: src/rfx-builder.c:2695
 msgid "Linked parameters (2):    "
 msgstr "Пов’язані параметри (2):    "
 
-#: src/rfx-builder.c:2777
+#: src/rfx-builder.c:2720
 msgid "LiVES: - New RFX Trigger"
 msgstr "LiVES: - Створення перемикача RFX"
 
-#: src/rfx-builder.c:2780
+#: src/rfx-builder.c:2722
 msgid "LiVES: - Edit RFX Trigger"
 msgstr "LiVES: - Зміна перемикача RFX"
 
-#: src/rfx-builder.c:2808
+#: src/rfx-builder.c:2750
 msgid "When:         "
 msgstr "Якщо:         "
 
-#: src/rfx-builder.c:2904
+#: src/rfx-builder.c:2846
 msgid "LiVES: - Pre Loop Code"
 msgstr "LiVES: - Код перед циклом"
 
-#: src/rfx-builder.c:2911
+#: src/rfx-builder.c:2853
 msgid "LiVES: - Loop Code"
 msgstr "LiVES: - Код циклу"
 
-#: src/rfx-builder.c:2918
+#: src/rfx-builder.c:2860
 msgid "LiVES: - Post Loop Code"
 msgstr "LiVES: - Код після циклу"
 
-#: src/rfx-builder.c:2931
+#: src/rfx-builder.c:2873
 #, c-format
 msgid "LiVES: - Default text (max length %d)"
 msgstr "LiVES: - Типовий текст (максимальна довжина — %d)"
 
-#: src/rfx-builder.c:2944
+#: src/rfx-builder.c:2885
 msgid "LiVES: - Enter values, one per line"
 msgstr "LiVES: - Введіть значення, по одному на рядок"
 
-#: src/rfx-builder.c:3055
+#: src/rfx-builder.c:2996
 msgid ""
 "\n"
 "\n"
@@ -7513,7 +7528,7 @@
 "\n"
 "Назва не повинна бути порожньою.\n"
 
-#: src/rfx-builder.c:3060
+#: src/rfx-builder.c:3001
 msgid ""
 "\n"
 "\n"
@@ -7523,7 +7538,7 @@
 "\n"
 "У назві не повинно міститися пробілів.\n"
 
-#: src/rfx-builder.c:3065
+#: src/rfx-builder.c:3006
 msgid ""
 "\n"
 "\n"
@@ -7533,7 +7548,7 @@
 "\n"
 "Текст меню не повинен бути порожнім.\n"
 
-#: src/rfx-builder.c:3071
+#: src/rfx-builder.c:3012
 msgid ""
 "\n"
 "\n"
@@ -7543,7 +7558,7 @@
 "\n"
 "Опис дії не повинен бути порожнім.\n"
 
-#: src/rfx-builder.c:3076
+#: src/rfx-builder.c:3017
 msgid ""
 "\n"
 "\n"
@@ -7553,7 +7568,7 @@
 "\n"
 "Поле автора не повинно бути порожнім.\n"
 
-#: src/rfx-builder.c:3085 src/rfx-builder.c:4339
+#: src/rfx-builder.c:3026 src/rfx-builder.c:4253
 msgid ""
 "\n"
 "\n"
@@ -7565,7 +7580,7 @@
 "Додаток з вказаною назвою вже існує.\n"
 "Назва не повинна повторюватися.\n"
 
-#: src/rfx-builder.c:3092
+#: src/rfx-builder.c:3033
 msgid ""
 "\n"
 "\n"
@@ -7575,7 +7590,7 @@
 "\n"
 "Область коду циклу не повинна бути порожньою.\n"
 
-#: src/rfx-builder.c:3098
+#: src/rfx-builder.c:3039
 msgid ""
 "\n"
 "\n"
@@ -7585,7 +7600,7 @@
 "\n"
 "Код перемикача допоміжного інструменту не повинен бути порожнім.\n"
 
-#: src/rfx-builder.c:3111
+#: src/rfx-builder.c:3052
 msgid ""
 "\n"
 "\n"
@@ -7595,7 +7610,7 @@
 "\n"
 "Поле назви параметра не повинно бути порожнім.\n"
 
-#: src/rfx-builder.c:3117
+#: src/rfx-builder.c:3058
 msgid ""
 "\n"
 "\n"
@@ -7609,41 +7624,41 @@
 "повторюватися у межах додатка.\n"
 "\n"
 
-#: src/rfx-builder.c:3171
+#: src/rfx-builder.c:3111
 #, c-format
 msgid "Writing script file %s..."
 msgstr "Запис файла скрипту %s…"
 
-#: src/rfx-builder.c:3477
+#: src/rfx-builder.c:3411
 msgid "No <define> section found in script.\n"
 msgstr "У скрипті не знайдено розділу <define>.\n"
 
-#: src/rfx-builder.c:3484 src/rfx-builder.c:3493
+#: src/rfx-builder.c:3418 src/rfx-builder.c:3427
 msgid "Bad script version.\n"
 msgstr "Помилкова версія скрипту.\n"
 
-#: src/rfx-builder.c:3505
+#: src/rfx-builder.c:3439
 msgid "No <name> section found in script.\n"
 msgstr "У скрипті не знайдено розділу <name>.\n"
 
-#: src/rfx-builder.c:3513
+#: src/rfx-builder.c:3447
 msgid "No <version> section found in script.\n"
 msgstr "У скрипті не знайдено розділу <version>.\n"
 
-#: src/rfx-builder.c:3522
+#: src/rfx-builder.c:3456
 msgid "No <author> section found in script.\n"
 msgstr "У скрипті не знайдено розділу <author>.\n"
 
-#: src/rfx-builder.c:3536
+#: src/rfx-builder.c:3470
 msgid "No <description> section found in script.\n"
 msgstr "У скрипті не знайдено розділу <description>.\n"
 
-#: src/rfx-builder.c:3540
+#: src/rfx-builder.c:3474
 #, c-format
 msgid "Bad description. (%s)\n"
 msgstr "Помилковий опис. (%s)\n"
 
-#: src/rfx-builder.c:3702
+#: src/rfx-builder.c:3627
 #, c-format
 msgid ""
 "\n"
@@ -7658,27 +7673,27 @@
 "некоректний перемикач (%s).\n"
 "\n"
 
-#: src/rfx-builder.c:3859
+#: src/rfx-builder.c:3780
 msgid "Rebuilding all RFX scripts...builtin..."
 msgstr "Перезбирання всіх скриптів RFX… вбудовані…"
 
-#: src/rfx-builder.c:3860
+#: src/rfx-builder.c:3781
 msgid "Rebuilding scripts"
 msgstr "Перезбирання скриптів"
 
-#: src/rfx-builder.c:3868
+#: src/rfx-builder.c:3789
 msgid "custom..."
 msgstr "нетиповий…"
 
-#: src/rfx-builder.c:3872
+#: src/rfx-builder.c:3793
 msgid "test..."
 msgstr "перевірка…"
 
-#: src/rfx-builder.c:3878
+#: src/rfx-builder.c:3799
 msgid "rebuilding dynamic menu entries..."
 msgstr "перезбирання динамічних пунктів меню…"
 
-#: src/rfx-builder.c:3905 src/rfx-builder.c:3912
+#: src/rfx-builder.c:3826 src/rfx-builder.c:3834
 #, c-format
 msgid ""
 "\n"
@@ -7692,7 +7707,7 @@
 "Будь ласка, перевірте, чи зберігається ця програма за шляхом зі змінної PATH "
 "та чи є її файл виконуваним.\n"
 
-#: src/rfx-builder.c:3951
+#: src/rfx-builder.c:3874
 #, c-format
 msgid ""
 "\n"
@@ -7707,12 +7722,12 @@
 "%s ?\n"
 "\n"
 
-#: src/rfx-builder.c:3960
+#: src/rfx-builder.c:3884
 #, c-format
 msgid "Deleting rfx script %s..."
 msgstr "Вилучення скрипту rfx %s..."
 
-#: src/rfx-builder.c:3980
+#: src/rfx-builder.c:3902
 #, c-format
 msgid ""
 "\n"
@@ -7727,7 +7742,7 @@
 "%s\n"
 "Код помилки: %d\n"
 
-#: src/rfx-builder.c:4016
+#: src/rfx-builder.c:3938
 #, c-format
 msgid ""
 "\n"
@@ -7742,12 +7757,12 @@
 "вже існує.\n"
 "Будь ласка, спочатку вилучіть цей файл або перейменуйте тестовий скрипт.\n"
 
-#: src/rfx-builder.c:4027
+#: src/rfx-builder.c:3950
 #, c-format
 msgid "Promoting rfx test plugin %s to custom..."
 msgstr "Переведення тестового додатка rfx %s до списку нетипових…"
 
-#: src/rfx-builder.c:4044
+#: src/rfx-builder.c:3965
 #, c-format
 msgid ""
 "\n"
@@ -7764,20 +7779,20 @@
 "%s\n"
 "Повернуто код помилки %d (%s)\n"
 
-#: src/rfx-builder.c:4070
+#: src/rfx-builder.c:3990
 msgid "LiVES: - Export Script to..."
 msgstr "LiVES: Експортувати скрипт до…"
 
-#: src/rfx-builder.c:4077 src/rfx-builder.c:4156
+#: src/rfx-builder.c:3997 src/rfx-builder.c:4074
 #, c-format
 msgid "Copying %s to %s..."
 msgstr "Копіювання %s до %s…"
 
-#: src/rfx-builder.c:4105
+#: src/rfx-builder.c:4024
 msgid "LiVES: Import Script from..."
 msgstr "LiVES: Імпортувати скрипт з…"
 
-#: src/rfx-builder.c:4148
+#: src/rfx-builder.c:4067
 #, c-format
 msgid ""
 "\n"
@@ -7793,43 +7808,43 @@
 "Будь ласка, спочатку вилучіть цей файл або перейменуйте скрипт, який "
 "імпортується.\n"
 
-#: src/rfx-builder.c:4249
+#: src/rfx-builder.c:4166
 msgid "LiVES: - Copy RFX Script"
 msgstr "LiVES: - Копіювання скрипту RFX"
 
-#: src/rfx-builder.c:4251
+#: src/rfx-builder.c:4168
 msgid "_From type:    "
 msgstr "_З типу:    "
 
-#: src/rfx-builder.c:4258
+#: src/rfx-builder.c:4175
 msgid "   Script:    "
 msgstr "   Скрипт:    "
 
-#: src/rfx-builder.c:4267
+#: src/rfx-builder.c:4183
 msgid "LiVES: - Rename test RFX Script"
 msgstr "LiVES: - Перейменування тестового скрипту RFX"
 
-#: src/rfx-builder.c:4268
+#: src/rfx-builder.c:4184
 msgid "From script: "
 msgstr "Зі скрипту: "
 
-#: src/rfx-builder.c:4273
+#: src/rfx-builder.c:4188
 msgid "LiVES: - RFX Script name"
 msgstr "LiVES: - Назва текстового скрипту RFX"
 
-#: src/rfx-builder.c:4274
+#: src/rfx-builder.c:4189
 msgid "Script name: "
 msgstr "Назва скрипту: "
 
-#: src/rfx-builder.c:4294
+#: src/rfx-builder.c:4209
 msgid "New name: "
 msgstr "Нова назва: "
 
-#: src/rfx-builder.c:4297
+#: src/rfx-builder.c:4212
 msgid "New script name: "
 msgstr "Нова назва скрипту: "
 
-#: src/rfx-builder.c:4372
+#: src/rfx-builder.c:4286
 msgid ""
 "\n"
 "\n"
@@ -7841,12 +7856,12 @@
 "Тестовий скрипт з вказаною назвою вже існує.\n"
 "Назва скрипту не повинна повторюватися.\n"
 
-#: src/rfx-builder.c:4384
+#: src/rfx-builder.c:4297
 #, c-format
 msgid "Renaming RFX test script %s to %s..."
 msgstr "Перейменування тестового скрипту RFX %s на %s…"
 
-#: src/rfx-builder.c:4390
+#: src/rfx-builder.c:4302
 #, c-format
 msgid ""
 "\n"
@@ -7863,23 +7878,23 @@
 "%s\n"
 "Повернуто код помилки %d\n"
 
-#: src/rfx-builder.c:4610
+#: src/rfx-builder.c:4518
 msgid "_Apply Real Time Effects to Selection"
 msgstr "_Застосувати ефекти реального часу до позначеного"
 
-#: src/rfx-builder.c:4664
+#: src/rfx-builder.c:4572
 #, c-format
 msgid "Loading rendered effect %s..."
 msgstr "Завантаження ефекту обробки %s…"
 
-#: src/rfx-builder.c:4766
+#: src/rfx-builder.c:4674
 msgid ""
 "See: VJ - show VJ keys. Set the realtime effects, and then apply them here."
 msgstr ""
 "Див.: Ві-джей - Показати клавіші ві-джея. Встановіть ефекти реального часу, "
 "а потім застосуйте їх тут."
 
-#: src/preferences.c:359
+#: src/preferences.c:351
 msgid ""
 "\n"
 "\n"
@@ -7891,7 +7906,7 @@
 "Додатки відтворення відео буде задіяно лише у\n"
 "повноекранному режимі або режимі окремого вікна\n"
 
-#: src/preferences.c:408
+#: src/preferences.c:400
 msgid ""
 "\n"
 "\n"
@@ -7903,7 +7918,7 @@
 "\n"
 "(Вільного місця = НЕВІДОМО)"
 
-#: src/preferences.c:412
+#: src/preferences.c:403
 #, c-format
 msgid ""
 "\n"
@@ -7916,7 +7931,7 @@
 "\n"
 "(Вільно %s)"
 
-#: src/preferences.c:416
+#: src/preferences.c:408
 msgid ""
 "The temp directory is LiVES working directory where opened clips and sets "
 "are stored.\n"
@@ -7926,7 +7941,7 @@
 "відкриті кліпи та набори.\n"
 "Його має бути розташовано на розділі, де досить багато вільного місця.\n"
 
-#: src/preferences.c:784
+#: src/preferences.c:839
 #, c-format
 msgid ""
 "Unable to create or write to the new temporary directory.\n"
@@ -7944,7 +7959,7 @@
 "\n"
 "Зараз каталог змінено не буде.\n"
 
-#: src/preferences.c:786
+#: src/preferences.c:843
 #, c-format
 msgid ""
 "Unable to create or write to the new temporary directory.\n"
@@ -7960,7 +7975,7 @@
 "\n"
 "Зараз каталог змінено не буде.\n"
 
-#: src/preferences.c:798
+#: src/preferences.c:856
 msgid ""
 "You have chosen to change the temporary directory.\n"
 "Please make sure you have no other copies of LiVES open.\n"
@@ -7980,7 +7995,7 @@
 "Ви також можете натиснути кнопку «Скасувати», щоб відновити початкову адресу "
 "каталогу тимчасових файлів."
 
-#: src/preferences.c:1169
+#: src/preferences.c:1221
 msgid ""
 "\n"
 "Unable to switch audio players to jack - jackd must be installed first.\n"
@@ -7991,7 +8006,7 @@
 "jackd.\n"
 "Див. http://jackaudio.org\n"
 
-#: src/preferences.c:1175
+#: src/preferences.c:1226
 msgid ""
 "\n"
 "Switching audio players requires restart (jackd must not be running)\n"
@@ -8000,7 +8015,7 @@
 "Перемикання інструментів відтворення звуку вимагає перезапуску програми "
 "(доведеться запустити jackd)\n"
 
-#: src/preferences.c:1202
+#: src/preferences.c:1253
 msgid ""
 "\n"
 "Unable to switch audio players to pulse audio\n"
@@ -8012,67 +8027,67 @@
 "Слід спочатку встановити PulseAudio\n"
 "Див. http://www.pulseaudio.org\n"
 
-#: src/preferences.c:1502
+#: src/preferences.c:1544
 msgid "PCM (highest quality; largest files)"
 msgstr "PCM (найвища якість, найбільші файли)"
 
-#: src/preferences.c:2063
+#: src/preferences.c:2096
 msgid "LiVES: - Preferences"
 msgstr "LiVES: - Параметри"
 
-#: src/preferences.c:2142
+#: src/preferences.c:2177
 msgid "Open file selection maximised"
 msgstr "Відкривати частини файлів максимізованими"
 
-#: src/preferences.c:2149
+#: src/preferences.c:2184
 msgid "Show recent files in the File menu"
 msgstr "Показувати нещодавні файли у меню «Файл»"
 
-#: src/preferences.c:2158
+#: src/preferences.c:2193
 msgid "Stop screensaver on playback    "
 msgstr "Зупиняти зберігач екрана на час відтворення    "
 
-#: src/preferences.c:2165
+#: src/preferences.c:2200
 msgid "Open main window maximised"
 msgstr "Відкривати вікно максимізованим"
 
-#: src/preferences.c:2173
+#: src/preferences.c:2208
 msgid "Show toolbar when background is blanked"
 msgstr "Показувати панель, якщо тло спорожнено"
 
-#: src/preferences.c:2181
+#: src/preferences.c:2216
 msgid "Allow mouse wheel to switch clips"
 msgstr "Дозволити перемикання між кліпами коліщатком миші"
 
-#: src/preferences.c:2192
+#: src/preferences.c:2227
 msgid "Shrink previews to fit in interface"
 msgstr "Стискати перегляд відповідно до розмірів інтерфейсу"
 
-#: src/preferences.c:2202
+#: src/preferences.c:2237
 msgid "Startup mode:"
 msgstr "Початковий режим:"
 
-#: src/preferences.c:2206
+#: src/preferences.c:2241
 msgid "_Clip editor"
 msgstr "_Редактор кліпів"
 
-#: src/preferences.c:2210
+#: src/preferences.c:2245
 msgid "_Multitrack mode"
 msgstr "Режим _декількох доріжок"
 
-#: src/preferences.c:2234
+#: src/preferences.c:2268
 msgid "Multi-head support"
 msgstr "Підтримка роботи з декількома моніторами"
 
-#: src/preferences.c:2242
+#: src/preferences.c:2276
 msgid " monitor number for LiVES interface"
 msgstr " кількість моніторів для інтерфейсу LiVES"
 
-#: src/preferences.c:2248
+#: src/preferences.c:2282
 msgid " monitor number for playback"
 msgstr " кількість моніторів для відтворення"
 
-#: src/preferences.c:2260
+#: src/preferences.c:2294
 msgid ""
 "A setting of 0 means use all available monitors (only works with some "
 "playback plugins)."
@@ -8080,272 +8095,272 @@
 "У разі встановлення значення 0 буде використано всі доступні монітори "
 "(працює не з усіма додатками відтворення)."
 
-#: src/preferences.c:2270
+#: src/preferences.c:2304
 msgid "Force single monitor"
 msgstr "Примусово на одному моніторі"
 
-#: src/preferences.c:2271
+#: src/preferences.c:2305
 msgid "Ignore all except the first monitor."
 msgstr "Ігнорувати всі монітори, окрім першого"
 
-#: src/preferences.c:2293
+#: src/preferences.c:2327
 msgid "Show clip thumbnails during playback"
 msgstr "Показувати мініатюри кліпу під час відтворення"
 
-#: src/preferences.c:2306
+#: src/preferences.c:2340
 msgid "GUI"
 msgstr "Інтерфейс"
 
-#: src/preferences.c:2321
+#: src/preferences.c:2355
 msgid "When entering Multitrack mode:"
 msgstr "Після входу до режиму декількох доріжок:"
 
-#: src/preferences.c:2330
+#: src/preferences.c:2364
 msgid "_Prompt me for width, height, fps and audio settings"
 msgstr "_Запитати про ширину, висоту, частоту кадрів та параметри звуку"
 
-#: src/preferences.c:2336
+#: src/preferences.c:2370
 msgid "_Always use the following values:"
 msgstr "_Завжди використовувати такі значення:"
 
-#: src/preferences.c:2345
+#: src/preferences.c:2379
 msgid "Use these same _values for rendering a new clip"
 msgstr "Використовувати ці з_начення для обробки нових кліпів"
 
-#: src/preferences.c:2370
+#: src/preferences.c:2404
 msgid "_Width           "
 msgstr "_Ширина           "
 
-#: src/preferences.c:2375
+#: src/preferences.c:2409
 msgid "          _Height      "
 msgstr "          _Висота      "
 
-#: src/preferences.c:2379
+#: src/preferences.c:2413
 msgid "          _FPS"
 msgstr "          _Частота кадрів"
 
-#: src/preferences.c:2387
+#: src/preferences.c:2421
 msgid "Enable backing audio track"
 msgstr "Увімкнути резервне копіювання звукової доріжки"
 
-#: src/preferences.c:2394
+#: src/preferences.c:2428
 msgid "Audio track per video track"
 msgstr "Кількість звукових доріжок на відеодоріжку"
 
-#: src/preferences.c:2423
+#: src/preferences.c:2457
 msgid "    _Undo buffer size (MB)    "
 msgstr "    Розмір _буфера скасування (у МБ)    "
 
-#: src/preferences.c:2432
+#: src/preferences.c:2466
 msgid "_Exit multitrack mode after rendering"
 msgstr "Ви_йти з багато доріжкового режиму після обробки"
 
-#: src/preferences.c:2440
+#: src/preferences.c:2474
 msgid "Auto backup layouts"
 msgstr "Автоматичне створення копій компонування"
 
-#: src/preferences.c:2445
+#: src/preferences.c:2479
 msgid "_Every"
 msgstr "_Кожні"
 
-#: src/preferences.c:2453
+#: src/preferences.c:2487
 msgid "seconds"
 msgstr "секунд"
 
-#: src/preferences.c:2461
+#: src/preferences.c:2495
 msgid "After every _change"
 msgstr "Після к_ожної зміни"
 
-#: src/preferences.c:2467
+#: src/preferences.c:2501
 msgid "_Never"
 msgstr "_Ніколи"
 
-#: src/preferences.c:2490
+#: src/preferences.c:2523
 msgid "Multitrack/Render"
 msgstr "Доріжки/Обробка"
 
-#: src/preferences.c:2508
+#: src/preferences.c:2541
 msgid "Use instant opening when possible"
 msgstr "За можливості, користуватися негайним відкриттям"
 
-#: src/preferences.c:2509
+#: src/preferences.c:2543
 msgid "Enable instant opening of some file types using decoder plugins"
 msgstr ""
 "Увімкнути негайне відкриття файлів деяких типів за допомогою додатків "
 "декодування"
 
-#: src/preferences.c:2531
+#: src/preferences.c:2567
 msgid "Video open command (fallback)"
 msgstr "Команда відкриття відео (резервна)"
 
-#: src/preferences.c:2543
+#: src/preferences.c:2579
 msgid "Open/render compression"
 msgstr "Стискання відкриття/обробки"
 
-#: src/preferences.c:2546
+#: src/preferences.c:2582
 msgid " %     ( lower = slower, larger files; for jpeg, higher quality )"
 msgstr ""
 " %     ( менше значення = повільніше, більші файли; для jpeg — вища якість )"
 
-#: src/preferences.c:2558
+#: src/preferences.c:2594
 msgid "Default image format"
 msgstr "Типовий формат зображень"
 
-#: src/preferences.c:2562
+#: src/preferences.c:2598
 msgid "_jpeg"
 msgstr "_jpeg"
 
-#: src/preferences.c:2565
+#: src/preferences.c:2601
 msgid "_png"
 msgstr "_png"
 
-#: src/preferences.c:2572
+#: src/preferences.c:2608
 msgid "(Check Help/Troubleshoot to see which image formats are supported)"
 msgstr ""
 "(Скористайтеся пунктом меню «Довідка/Усування вад», щоб переглянути список "
 "підтримуваних форматів зображень)"
 
-#: src/preferences.c:2580
+#: src/preferences.c:2616
 msgid "Enable automatic deinterlacing when possible"
 msgstr "За можливості, увімкнути автоматичне усування черезрядковості"
 
-#: src/preferences.c:2582
+#: src/preferences.c:2619
 msgid "Automatically deinterlace frames when a plugin suggests it"
 msgstr "Автоматично усувати черезрядковість, якщо це пропонує додаток"
 
-#: src/preferences.c:2593
+#: src/preferences.c:2632
 msgid "Automatic trimming / padding of audio when possible"
 msgstr "Автоматичне обрізання або додавання звукових даних, якщо можна"
 
-#: src/preferences.c:2595
+#: src/preferences.c:2634
 msgid "Automatically trim or pad audio when a plugin suggests it"
 msgstr ""
 "Автоматично обрізати або додавати звукові дані, якщо це пропонується додатком"
 
-#: src/preferences.c:2606
+#: src/preferences.c:2646
 msgid "Ignore blank borders when possible"
 msgstr "Якщо можна, ігнорувати порожні поля"
 
-#: src/preferences.c:2608
+#: src/preferences.c:2648
 msgid "Clip any blank borders from frames where possible"
 msgstr "Якщо можна, вирізати всі порожні поля з кадрів"
 
-#: src/preferences.c:2619
+#: src/preferences.c:2660
 msgid "When opening multiple files, concatenate images into one clip"
 msgstr "Якщо буде відкрито декілька зображень, об’єднати їх у один кліп"
 
-#: src/preferences.c:2629
+#: src/preferences.c:2670
 msgid "Decoding"
 msgstr "Декодування"
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:2652
+#: src/preferences.c:2693
 msgid "Low - can improve performance on slower machines"
 msgstr "Низька — може покращити швидкодію на повільних комп’ютерах"
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:2654
+#: src/preferences.c:2695
 msgid "Normal - recommended for most users"
 msgstr "Звичайна — рекомендована для більшості користувачів"
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:2656
+#: src/preferences.c:2697
 msgid "High - can improve quality on very fast machines"
 msgstr "Висока — може покращити якість на дуже швидких комп’ютерах"
 
-#: src/preferences.c:2659
+#: src/preferences.c:2700
 msgid "Preview _quality"
 msgstr "_Якість перегляду"
 
-#: src/preferences.c:2660
+#: src/preferences.c:2701
 msgid "The preview quality for video playback - affects resizing"
 msgstr ""
 "Якість попереднього перегляду відтворення відео (впливає на зміну розмірів)"
 
-#: src/preferences.c:2675
+#: src/preferences.c:2717
 msgid "_Show FPS statistics"
 msgstr "П_оказувати дані щодо частоти кадрів"
 
-#: src/preferences.c:2694
+#: src/preferences.c:2736
 msgid "_Plugin"
 msgstr "_Додаток"
 
-#: src/preferences.c:2718
+#: src/preferences.c:2760
 msgid "Stream audio"
 msgstr "Потоковий звук"
 
-#: src/preferences.c:2721
+#: src/preferences.c:2763
 msgid "Stream audio to playback plugin"
 msgstr "Додаток відтворення потокового звуку"
 
-#: src/preferences.c:2734
+#: src/preferences.c:2778
 msgid "Record player output"
 msgstr "Записувати дані, що відтворюються"
 
-#: src/preferences.c:2737
+#: src/preferences.c:2781
 msgid "Record output from player instead of input to player"
 msgstr "Записувати дані щодо відтворюються, а не виводити дані для відтворення"
 
-#: src/preferences.c:2744
+#: src/preferences.c:2789
 msgid "VIDEO"
 msgstr "ВІДЕО"
 
-#: src/preferences.c:2787
+#: src/preferences.c:2833
 msgid "_Player"
 msgstr "П_рогравач"
 
-#: src/preferences.c:2792
+#: src/preferences.c:2838
 msgid "(See also the Jack Integration tab for jack startup options)"
 msgstr ""
 "(Додаткові параметри запуску Jack можна знайти на вкладці «Інтеграція з "
 "Jack»)"
 
-#: src/preferences.c:2819
+#: src/preferences.c:2865
 msgid "mplayer"
 msgstr "mplayer"
 
-#: src/preferences.c:2830
+#: src/preferences.c:2876
 #, fuzzy
 msgid "mplayer2"
 msgstr "mplayer"
 
-#: src/preferences.c:2833
+#: src/preferences.c:2879
 msgid "Audio play _command"
 msgstr "_Команда відтворення звуку"
 
-#: src/preferences.c:2840
+#: src/preferences.c:2886
 msgid "- internal -"
 msgstr "- вбудована -"
 
-#: src/preferences.c:2849
+#: src/preferences.c:2895
 msgid "Audio follows video _rate/direction"
 msgstr "Параметри звуку змінюються за _частотою/напрямком відтворення відео"
 
-#: src/preferences.c:2857
+#: src/preferences.c:2903
 msgid "Audio follows _clip switches"
 msgstr "Параметри звуку змінюються за перемиканням _кліпів"
 
-#: src/preferences.c:2864
+#: src/preferences.c:2910
 msgid "Source:"
 msgstr "Джерело:"
 
-#: src/preferences.c:2868
+#: src/preferences.c:2914
 msgid "_Internal"
 msgstr "В_нутрішні"
 
-#: src/preferences.c:2873
+#: src/preferences.c:2919
 msgid "_External (requires jack or pulse audio player)"
 msgstr "З_овнішні (потрібен звуковий програвач з підтримкою jack або pulse)"
 
-#: src/preferences.c:2892
+#: src/preferences.c:2940
 msgid "AUDIO"
 msgstr "ЗВУК"
 
-#: src/preferences.c:2902
+#: src/preferences.c:2950
 msgid "Playback"
 msgstr "Відтворення"
 
-#: src/preferences.c:2925
+#: src/preferences.c:2973
 msgid ""
 "Record audio when capturing an e_xternal window\n"
 " (requires jack or pulse audio)"
@@ -8353,68 +8368,68 @@
 "Записувати звук під час захоплення відео з з_овнішнього вікна\n"
 " (потрібен сервер Jack або PulseAudio)"
 
-#: src/preferences.c:2940
+#: src/preferences.c:2988
 msgid "      What to record when 'r' is pressed   "
 msgstr "      Джерело даних для запису після натискання клавіші «r»   "
 
-#: src/preferences.c:2949
+#: src/preferences.c:2997
 msgid "_Frame changes"
 msgstr "З_мінюється номер кадру"
 
-#: src/preferences.c:2964
+#: src/preferences.c:3012
 msgid "F_PS changes"
 msgstr "Змі_нюється частота кадрів"
 
-#: src/preferences.c:2982
+#: src/preferences.c:3030
 msgid "_Real time effects"
 msgstr "Ефекти _реального часу"
 
-#: src/preferences.c:2993
+#: src/preferences.c:3041
 msgid "_Clip switches"
 msgstr "П_еремикання кліпів"
 
-#: src/preferences.c:3004
+#: src/preferences.c:3052
 msgid "_Audio (requires jack or pulse audio player)"
 msgstr "_Звук (потрібен звуковий програвач з підтримкою jack або pulse)"
 
-#: src/preferences.c:3024
+#: src/preferences.c:3072
 msgid "Pause recording if free disk space falls below"
 msgstr "Призупинити запис, якщо на диску залишилося менше"
 
 #. TRANSLATORS: gigabytes
-#: src/preferences.c:3030
+#: src/preferences.c:3078
 msgid "GB"
 msgstr "ГБ"
 
-#: src/preferences.c:3037
+#: src/preferences.c:3085
 msgid "Recording"
 msgstr "Запис"
 
-#: src/preferences.c:3055
+#: src/preferences.c:3103
 msgid "Encoder"
 msgstr "Кодувальник"
 
-#: src/preferences.c:3090
+#: src/preferences.c:3137
 msgid "Output format"
 msgstr "Формат виводу"
 
-#: src/preferences.c:3106
+#: src/preferences.c:3153
 msgid "Audio codec"
 msgstr "Аудіокодек"
 
-#: src/preferences.c:3119
+#: src/preferences.c:3165
 msgid "Encoding"
 msgstr "Кодування"
 
-#: src/preferences.c:3134
+#: src/preferences.c:3180
 msgid "Use _antialiasing when resizing"
 msgstr "Використовувати під час зміни розмірів з_гладжування"
 
-#: src/preferences.c:3143
+#: src/preferences.c:3189
 msgid "Number of _real time effect keys"
 msgstr "Кількість клавіш ефектів _реального часу"
 
-#: src/preferences.c:3145
+#: src/preferences.c:3192
 msgid ""
 "The number of \"virtual\" real time effect keys. They can be controlled "
 "through the real time effects window, or via network (OSC)."
@@ -8423,98 +8438,98 @@
 "можна або за допомогою вікна ефектів реального часу, або за допомогою мережі "
 "(OSC)."
 
-#: src/preferences.c:3152
+#: src/preferences.c:3199
 msgid "Use _threads where possible when applying effects"
 msgstr "_Розподілене виконання під час застосування ефектів"
 
-#: src/preferences.c:3159
+#: src/preferences.c:3207
 msgid "Number of _threads"
 msgstr "Кількість _потоків"
 
-#: src/preferences.c:3172
+#: src/preferences.c:3221
 msgid "Restart is required if any of the following paths are changed:"
 msgstr ""
 "У разі внесення змін до будь-якого з вказаних нижче шляхів програму "
 "доведеться перезапустити:"
 
-#: src/preferences.c:3182
+#: src/preferences.c:3231
 msgid "Weed plugin path"
 msgstr "Шлях до додатків Weed"
 
-#: src/preferences.c:3184
+#: src/preferences.c:3234
 msgid "Frei0r plugin path"
 msgstr "Шлях до додатків Frei0r"
 
-#: src/preferences.c:3186
+#: src/preferences.c:3237
 msgid "LADSPA plugin path"
 msgstr "Шлях до додатків LADSPA"
 
-#: src/preferences.c:3209
+#: src/preferences.c:3261
 msgid "      Video load directory (default)      "
 msgstr "      Каталог завантаження відео (типовий)      "
 
-#: src/preferences.c:3215
+#: src/preferences.c:3267
 msgid "      Video save directory (default) "
 msgstr "      Каталог збереження відео (типовий) "
 
-#: src/preferences.c:3221
+#: src/preferences.c:3273
 msgid "      Audio load directory (default) "
 msgstr "      Каталог завантаження звукових даних (типовий) "
 
-#: src/preferences.c:3227
+#: src/preferences.c:3279
 msgid "      Image directory (default) "
 msgstr "      Каталог зображень (типовий) "
 
-#: src/preferences.c:3233
+#: src/preferences.c:3285
 msgid "      Backup/Restore directory (default) "
 msgstr "      Каталог резервних копій/Відновлення (типовий) "
 
-#: src/preferences.c:3239
+#: src/preferences.c:3291
 msgid "      Temp directory (do not remove) "
 msgstr "      Каталог тимчасових файлів (не вилучати) "
 
-#: src/preferences.c:3252
+#: src/preferences.c:3304
 msgid "The default directory for loading video clips from"
 msgstr "Типовий каталог, з якого завантажуватимуться відеокліпи"
 
-#: src/preferences.c:3277
+#: src/preferences.c:3329
 msgid "The default directory for saving encoded clips to"
 msgstr "Типовий каталог, до якого зберігатимуться закодовані кліпи"
 
-#: src/preferences.c:3285
+#: src/preferences.c:3337
 msgid "The default directory for loading and saving audio"
 msgstr "Типовий каталог для збереження та завантаження звукових даних"
 
-#: src/preferences.c:3293
+#: src/preferences.c:3345
 msgid "The default directory for saving frameshots to"
 msgstr "Типовий каталог, до якого зберігатимуться зображення кадрів"
 
-#: src/preferences.c:3301
+#: src/preferences.c:3353
 msgid "The default directory for backing up/restoring single clips"
 msgstr ""
 "Типовий каталог для створення резервних копій або відновлення окремих кліпів"
 
-#: src/preferences.c:3309
+#: src/preferences.c:3361
 msgid "LiVES working directory."
 msgstr "Робочий каталог LiVES."
 
-#: src/preferences.c:3359
+#: src/preferences.c:3412
 msgid "Directories"
 msgstr "Каталоги"
 
-#: src/preferences.c:3374
+#: src/preferences.c:3427
 msgid "Warn if diskspace falls below: "
 msgstr "Попереджати, якщо місця менше за: "
 
-#: src/preferences.c:3380 src/preferences.c:3394
+#: src/preferences.c:3433 src/preferences.c:3447
 msgid " MB [set to 0 to disable]"
 msgstr " МБ [0 — вимкнути попередження]"
 
-#: src/preferences.c:3389
+#: src/preferences.c:3442
 msgid "Diskspace critical level: "
 msgstr "Критичний рівень місця на диску: "
 
-#: src/preferences.c:3407
+#: src/preferences.c:3461
 msgid ""
 "Warn on Insert / Merge if _frame rate of clipboard does not match frame rate "
 "of selection"
@@ -8522,19 +8537,19 @@
 "Попереджати під час вставки/об’єднання, якщо _частота кадрів у буфері даних "
 "не збігається з частотою кадрів позначеного"
 
-#: src/preferences.c:3417
+#: src/preferences.c:3471
 msgid "Warn on Open if file _size exceeds "
 msgstr "Попереджати під час відкриття, якщо _розмір перевищує "
 
-#: src/preferences.c:3425
+#: src/preferences.c:3479
 msgid " MB"
 msgstr " МБ"
 
-#: src/preferences.c:3432
+#: src/preferences.c:3486
 msgid "Show a warning before saving a se_t"
 msgstr "Показувати попередження перед збереженням _набору"
 
-#: src/preferences.c:3442
+#: src/preferences.c:3496
 #, fuzzy
 msgid ""
 "Show a warning if _mplayer/mplayer2, sox, composite or convert is not found "
@@ -8543,76 +8558,76 @@
 "Показувати попередження, як_що під час запуску LiVES не буде знайдено "
 "mplayer, sox, composite або convert."
 
-#: src/preferences.c:3452
+#: src/preferences.c:3506
 msgid "Show a warning if no _rendered effects are found at startup."
 msgstr ""
 "Показувати попередження, якщо при запуску у системі не буде знайдено ефектів "
 "_обробки."
 
-#: src/preferences.c:3464
+#: src/preferences.c:3518
 msgid "Show a warning if no _encoder plugins are found at startup."
 msgstr ""
 "Показувати попередження, якщо при запуску у системі не буде знайдено "
 "_додатків кодування."
 
-#: src/preferences.c:3474
+#: src/preferences.c:3528
 msgid "Show a warning if a _duplicate set name is entered."
 msgstr "Показувати попередження, якщо буде введено _дублікат назви набору."
 
-#: src/preferences.c:3485
+#: src/preferences.c:3539
 msgid "When a set is loaded, warn if clips are missing from _layouts."
 msgstr ""
 "Під час завантаження набору попереджати про те, що не вдалося знайти кліпів "
 "_компонувань."
 
-#: src/preferences.c:3495
+#: src/preferences.c:3550
 msgid "Warn if a clip used in a layout is about to be closed."
 msgstr "Попередження про намір закрити кліп, використаний у компонуванні."
 
-#: src/preferences.c:3505
+#: src/preferences.c:3561
 msgid "Warn if frames used in a layout are about to be deleted."
 msgstr "Попередження про вилучення кадрів, використаних у компонуванні."
 
-#: src/preferences.c:3515
+#: src/preferences.c:3572
 msgid "Warn if frames used in a layout are about to be shifted."
 msgstr "Попередження про пересування кадрів, використаних у компонуванні."
 
-#: src/preferences.c:3525
+#: src/preferences.c:3583
 msgid "Warn if frames used in a layout are about to be altered."
 msgstr "Попередження про заміну кадрів, використаних у компонуванні."
 
-#: src/preferences.c:3535
+#: src/preferences.c:3594
 msgid "Warn if audio used in a layout is about to be deleted."
 msgstr ""
 "Попередження про вилучення звукових даних, використаних у компонуванні."
 
-#: src/preferences.c:3546
+#: src/preferences.c:3606
 msgid "Warn if audio used in a layout is about to be shifted."
 msgstr ""
 "Попередження про пересування звукових даних, використаних у компонуванні."
 
-#: src/preferences.c:3556
+#: src/preferences.c:3617
 msgid "Warn if audio used in a layout is about to be altered."
 msgstr "Попередження про заміну звукових даних, використаних у компонуванні."
 
-#: src/preferences.c:3566
+#: src/preferences.c:3628
 msgid "Popup layout errors after clip changes."
 msgstr "Контекстні підказки про помилки компонування після змін у кліпі."
 
-#: src/preferences.c:3577
+#: src/preferences.c:3639
 msgid "Warn if the layout has not been saved when leaving multitrack mode."
 msgstr ""
 "Попереджати про те, що компонування не було збережено під час завершення "
 "роботи у багатодоріжковому режимі."
 
-#: src/preferences.c:3588
+#: src/preferences.c:3650
 msgid ""
 "Warn if multitrack has no audio channels, and a layout with audio is loaded."
 msgstr ""
 "Попереджати про завантаження компонування зі звуковими доріжками у "
 "багатодоріжковому режимі без звуку."
 
-#: src/preferences.c:3598
+#: src/preferences.c:3660
 msgid ""
 "Warn if multitrack has audio channels, and your audio player is not \"jack\" "
 "or \"pulse audio\"."
@@ -8620,117 +8635,117 @@
 "Попереджати, якщо у багатодоріжковому режимі є звукові канали, а програвачем "
 "звуку не є «jack» або «PulseAudio»."
 
-#: src/preferences.c:3610
+#: src/preferences.c:3672
 msgid "Show info message after importing from firewire device."
 msgstr "Показувати сповіщення після імпортування даних пристрою firewire."
 
-#: src/preferences.c:3626
+#: src/preferences.c:3688
 msgid "Show a warning before opening a yuv4mpeg stream (advanced)."
 msgstr "Показувати попередження перед відкриттям потоку yuv4mpeg."
 
-#: src/preferences.c:3639
+#: src/preferences.c:3701
 msgid "Show a warning when multitrack is low on backup space."
 msgstr ""
 "Показувати попередження про вичерпання простору для резервування у "
 "багатодоріжковому режимі."
 
-#: src/preferences.c:3650
+#: src/preferences.c:3713
 msgid "Show a warning advising cleaning of disk space after a crash."
 msgstr ""
 "Показувати після аварійного завершення діалогове вікно з пропозицією "
 "звільнити місце на диску."
 
-#: src/preferences.c:3661
+#: src/preferences.c:3725
 msgid "Show a warning if unable to connect to pulseaudio player."
 msgstr ""
 "Показувати попередження, якщо не вдасться зв’язатися з відтворювачем "
 "pulseaudio."
 
-#: src/preferences.c:3673
+#: src/preferences.c:3737
 msgid "Show a warning before wiping a layout which has unsaved changes."
 msgstr ""
 "Попереджати перед вилученням компонування, зміни у якому не було збережено."
 
-#: src/preferences.c:3685
+#: src/preferences.c:3749
 msgid "Warnings"
 msgstr "Попередження"
 
-#: src/preferences.c:3703
+#: src/preferences.c:3767
 msgid "Midi synch (requires the files midistart and midistop)"
 msgstr "MIDI-синхронізація (потрібні файли midistart і midistop)"
 
-#: src/preferences.c:3715
+#: src/preferences.c:3779
 msgid "When inserting/merging frames:  "
 msgstr "Вставка/Об’єднання кадрів:  "
 
-#: src/preferences.c:3719
+#: src/preferences.c:3783
 msgid "_Speed Up/Slow Down Insertion"
 msgstr "При_швидшити/Сповільнити вставлене"
 
-#: src/preferences.c:3723
+#: src/preferences.c:3787
 msgid "_Resample Insertion"
 msgstr "_Змінити частоту кадрів у вставленому"
 
-#: src/preferences.c:3730
+#: src/preferences.c:3794
 msgid "CD device           "
 msgstr "Пристрій КД           "
 
-#: src/preferences.c:3733
+#: src/preferences.c:3797
 msgid "LiVES can load audio tracks from this CD"
 msgstr "LiVES може завантажувати звукові композиції з цього КД"
 
-#: src/preferences.c:3746
+#: src/preferences.c:3813
 msgid "Default FPS        "
 msgstr "Типово кд/с        "
 
-#: src/preferences.c:3749
+#: src/preferences.c:3816
 msgid "Frames per second to use when none is specified"
 msgstr ""
 "Кількість кадрів на секунду, яку слід використовувати, якщо кількість не "
 "визначено"
 
-#: src/preferences.c:3757
+#: src/preferences.c:3825
 msgid "Misc"
 msgstr "Інше"
 
-#: src/preferences.c:3782
+#: src/preferences.c:3850
 msgid "New theme:           "
 msgstr "Нова тема:           "
 
-#: src/preferences.c:3800
+#: src/preferences.c:3867
 msgid "Themes"
 msgstr "Теми"
 
-#: src/preferences.c:3815
+#: src/preferences.c:3882
 msgid "Download bandwidth (Kb/s)       "
 msgstr "Ширина каналу звантаження (кб/с)       "
 
-#: src/preferences.c:3823
+#: src/preferences.c:3890
 msgid "LiVES must be compiled without \"configure --disable-OSC\" to use OMC"
 msgstr ""
 "Для використання OMC LiVES має бути зібрано без \"configure --disable-OSC\""
 
-#: src/preferences.c:3833
+#: src/preferences.c:3900
 msgid "OMC remote control enabled"
 msgstr "Увімкнено віддалене керування OMC"
 
-#: src/preferences.c:3841
+#: src/preferences.c:3908
 msgid "UDP port       "
 msgstr "Порт UDP       "
 
-#: src/preferences.c:3850
+#: src/preferences.c:3917
 msgid "Start OMC on startup"
 msgstr "Вмикати OMC під час запуску програми"
 
-#: src/preferences.c:3870
+#: src/preferences.c:3937
 msgid "Streaming/Networking"
 msgstr "Потокові дані/Мережа"
 
-#: src/preferences.c:3882
+#: src/preferences.c:3949
 msgid "Jack transport"
 msgstr "Передавання даних Jack"
 
-#: src/preferences.c:3886
+#: src/preferences.c:3953
 msgid ""
 "LiVES must be compiled with jack/transport.h and jack/jack.h present to use "
 "jack transport"
@@ -8738,47 +8753,47 @@
 "Щоб мати змогу використовувати передавання даних Jack, LiVES має бути "
 "зібрано з файлами заголовків jack/transport.h та jack/jack.h"
 
-#: src/preferences.c:3892
+#: src/preferences.c:3959
 msgid "Jack _transport config file"
 msgstr "Файл налаштування _передавання даних Jack"
 
-#: src/preferences.c:3899 src/preferences.c:3989
+#: src/preferences.c:3967 src/preferences.c:4058
 msgid "Start _server on LiVES startup"
 msgstr "Запускати с_ервер при запуску LiVES"
 
-#: src/preferences.c:3911
+#: src/preferences.c:3979
 msgid "Jack transport _master (start and stop)"
 msgstr "С_ервер передавання даних Jack (запуск і зупинка)"
 
-#: src/preferences.c:3921
+#: src/preferences.c:3989
 msgid "Jack transport _client (start and stop)"
 msgstr "_Клієнт передавання даних Jack (запуск і зупинка)"
 
-#: src/preferences.c:3935
+#: src/preferences.c:4003
 msgid "Jack transport sets start position"
 msgstr "Початкову позицію встановлює передавання Jack"
 
-#: src/preferences.c:3952
+#: src/preferences.c:4020
 msgid "Jack transport timebase slave"
 msgstr "Допоміжний засіб відліку часу передавання Jack"
 
-#: src/preferences.c:3963
+#: src/preferences.c:4031
 msgid "(See also Playback -> Audio follows video rate/direction)"
 msgstr ""
 "(Див. також «Відтворення -> Параметри звуку змінюються з частотою/напрямком "
 "відтворення відео»)"
 
-#: src/preferences.c:3971
+#: src/preferences.c:4039
 msgid "Jack audio"
 msgstr "Звук Jack"
 
-#: src/preferences.c:3975
+#: src/preferences.c:4043
 msgid "LiVES must be compiled with jack/jack.h present to use jack audio"
 msgstr ""
 "Щоб мати змогу скористатися звуковим сервером Jack, вам слід зібрати LiVES з "
 "jack/jack.h"
 
-#: src/preferences.c:3978
+#: src/preferences.c:4046
 msgid ""
 "You MUST set the audio player to \"jack\" in the Playback tab to use jack "
 "audio"
@@ -8786,78 +8801,78 @@
 "Щоб скористатися звуковими можливостями Jack, вам СЛІД вказати звуковий "
 "програвач «jack» на вкладці «Відтворення»"
 
-#: src/preferences.c:3984
+#: src/preferences.c:4052
 msgid "Jack _audio server config file"
 msgstr "Фа_йл налаштування звукового сервера Jack"
 
-#: src/preferences.c:3996
+#: src/preferences.c:4065
 msgid "Play audio even when transport is _paused"
 msgstr "Відтворювати звук, навіть якщо передавання пр_изупинено"
 
-#: src/preferences.c:4008
+#: src/preferences.c:4077
 msgid "Automatically connect to System Out ports when 'playing' External Audio"
 msgstr ""
 "Автоматично встановлювати з’єднання з портами виведення звуку під час "
 "«відтворення» зовнішнього звуку"
 
-#: src/preferences.c:4021
+#: src/preferences.c:4090
 msgid "Jack Integration"
 msgstr "Інтеграція з Jack"
 
-#: src/preferences.c:4035
+#: src/preferences.c:4104
 msgid "Events to respond to:"
 msgstr "Події, на які слід реагувати:"
 
-#: src/preferences.c:4044
+#: src/preferences.c:4113
 msgid "_Joystick events"
 msgstr "Події д_жойстика"
 
-#: src/preferences.c:4051
+#: src/preferences.c:4120
 msgid "_Joystick device"
 msgstr "Пристрій _джойстика"
 
-#: src/preferences.c:4053
+#: src/preferences.c:4122
 msgid "The joystick device, e.g. /dev/input/js0"
 msgstr "Пристрій джойстика, наприклад, /dev/input/js0"
 
-#: src/preferences.c:4071
+#: src/preferences.c:4142
 msgid "_MIDI events"
 msgstr "П_одії MIDI"
 
-#: src/preferences.c:4080
+#: src/preferences.c:4151
 msgid "Use _ALSA MIDI (recommended)"
 msgstr "Вико_ристати MIDI ALSA (рекомендовано)"
 
-#: src/preferences.c:4082
+#: src/preferences.c:4153
 msgid "Create an ALSA MIDI port which other MIDI devices can be connected to"
 msgstr ""
 "Створити порт MIDI ALSA, з яким можна буде з’єднувати інші MIDI-пристрої"
 
-#: src/preferences.c:4090
+#: src/preferences.c:4162
 msgid "Use _raw MIDI"
 msgstr "Використовувати MIDI б_ез обробки"
 
-#: src/preferences.c:4092
+#: src/preferences.c:4164
 msgid "Read directly from the MIDI device"
 msgstr "Читання безпосередньо з пристрою MIDI"
 
-#: src/preferences.c:4104
+#: src/preferences.c:4177
 msgid "_MIDI device"
 msgstr "Пр_истрій MIDI"
 
-#: src/preferences.c:4106
+#: src/preferences.c:4179
 msgid "The MIDI device, e.g. /dev/input/midi0"
 msgstr "Пристрій MIDI, наприклад, /dev/input/midi0"
 
-#: src/preferences.c:4118
+#: src/preferences.c:4193
 msgid "Advanced"
 msgstr "Додатково"
 
-#: src/preferences.c:4124
+#: src/preferences.c:4199
 msgid "MIDI check _rate"
 msgstr "_Частота перевірки MIDI"
 
-#: src/preferences.c:4127
+#: src/preferences.c:4203
 msgid ""
 "Number of MIDI checks per keyboard tick. Increasing this may improve MIDI "
 "responsiveness, but may slow down playback."
@@ -8866,25 +8881,25 @@
 "значення може покращити інтерактивність MIDI, але може сповільнити "
 "відтворення."
 
-#: src/preferences.c:4134
+#: src/preferences.c:4211
 msgid "MIDI repeat"
 msgstr "Повторення MIDI"
 
-#: src/preferences.c:4137
+#: src/preferences.c:4214
 msgid "Number of non-reads allowed between succesive reads."
 msgstr "Кількість тактів відсутності сигналу між двома послідовними сигналами."
 
-#: src/preferences.c:4140
+#: src/preferences.c:4218
 msgid "(Warning: setting this value too high can slow down playback.)"
 msgstr ""
 "(Попередження: визначення занадто великих значень може уповільнити "
 "відтворення.)"
 
-#: src/preferences.c:4159
+#: src/preferences.c:4237
 msgid "MIDI/Joystick learner"
 msgstr "Навчання MIDI/джойстика"
 
-#: src/preferences.c:4499
+#: src/preferences.c:4679
 msgid ""
 "\n"
 "LiVES will now shut down. You need to restart it for the directory change to "
@@ -8896,7 +8911,7 @@
 "щоб зміна каталогів набула чинності.\n"
 "Натисніть «Гаразд», щоб програма завершила роботу.\n"
 
-#: src/preferences.c:4523
+#: src/preferences.c:4703
 msgid ""
 "For the directory change to take effect LiVES will restart when preferences "
 "dialog closes."
@@ -8904,63 +8919,63 @@
 "Щоб зміни у розташуванні каталогів набули чинності, LiVES буде перезапущено "
 "після закриття діалогового вікна налаштування."
 
-#: src/preferences.c:4527
+#: src/preferences.c:4707
 msgid "Theme changes will not take effect until the next time you start LiVES."
 msgstr "Зміна теми набуде чинності лише під час наступного запуску LiVES."
 
-#: src/preferences.c:4531
+#: src/preferences.c:4711
 msgid "Jack options will not take effect until the next time you start LiVES."
 msgstr ""
 "Параметри Jack набудуть чинності лише під час наступного запуску LiVES."
 
-#: src/osc.c:2585
+#: src/osc.c:2616
 #, c-format
 msgid "Syncing to external framerate of %.8f frames per second.\n"
 msgstr "Синхронізація зовнішньої частоти кадрів у %.8f кадрів на секунду.\n"
 
-#: src/osc.c:6746
+#: src/osc.c:6938
 msgid "Cannot initialize OSC receiver\n"
 msgstr "Не вдалося ініціалізувати отримувач даних OSC\n"
 
-#: src/osc.c:6770
+#: src/osc.c:6961
 #, c-format
 msgid "WARNING: Cannot start OSC server at UDP port %d\n"
 msgstr "ПОПЕРЕДЖЕННЯ: Не вдалося запустити сервер OSC на порту UDP %d\n"
 
-#: src/osc.c:6775
+#: src/osc.c:6963
 #, c-format
 msgid "Started OSC server at UDP port %d\n"
 msgstr "Запущено сервер OSC на порту UDP %d\n"
 
-#: src/osc.c:6890
+#: src/osc.c:7076
 #, c-format
 msgid "Cannot start OSC/UDP server at port %d \n"
 msgstr "Не вдалося запустити сервер OSC/UDP на порту %d \n"
 
-#: src/resample.c:125 src/resample.c:304
+#: src/resample.c:131 src/resample.c:305
 #, c-format
 msgid "Resizing frames 1 to %d"
 msgstr "Зміна розмірів кадрів від 1 до %d"
 
-#: src/resample.c:140 src/resample.c:318
+#: src/resample.c:145 src/resample.c:318
 #, c-format
 msgid "Resizing/letterboxing frames 1 to %d"
 msgstr "Зміна розмірів кадрів з 1 до %d"
 
-#: src/resample.c:361 src/resample.c:385
+#: src/resample.c:360 src/resample.c:384
 msgid "Resize"
 msgstr "Змінити розмір"
 
-#: src/resample.c:395
+#: src/resample.c:394
 msgid "Resample/Resize"
 msgstr "Зміна дискретизації/розмірів"
 
-#: src/resample.c:680
+#: src/resample.c:676
 #, c-format
 msgid "Length of video is now %d frames.\n"
 msgstr "Тепер відео складається з %d кадрів.\n"
 
-#: src/resample.c:745
+#: src/resample.c:737
 msgid ""
 "\n"
 "\n"
@@ -8970,147 +8985,147 @@
 "\n"
 "Нове значення частоти має бути більшим за 0\n"
 
-#: src/resample.c:797 src/resample.c:813
+#: src/resample.c:788 src/resample.c:803
 msgid "Resampling audio"
 msgstr "Зміна дискретизації звукових даних"
 
-#: src/resample.c:831
+#: src/resample.c:821
 msgid "LiVES was unable to resample the audio as requested.\n"
 msgstr "LiVES не вдалося змінити дискретизацію звукових даних бажаним чином.\n"
 
-#: src/resample.c:833 src/resample.c:837
+#: src/resample.c:823 src/resample.c:827
 msgid "Resample Audio"
 msgstr "Зміна дискретизації звуку"
 
-#: src/resample.c:845
+#: src/resample.c:835
 #, c-format
 msgid "Audio was resampled to %d Hz, %d channels, %d bit"
 msgstr "Частоту звукових даних було змінено на %d Гц, %d каналів, %d бітів"
 
-#: src/resample.c:1034
+#: src/resample.c:1016
 #, c-format
 msgid "Resampling video at %.8f frames per second..."
 msgstr "Зміна дискретизації відео при %.8f кадрах на секунду…"
 
-#: src/resample.c:1037
+#: src/resample.c:1018
 #, c-format
 msgid "Resampling video at %.3f frames per second..."
 msgstr "Зміна дискретизації відео при %.3f кадрах на секунду…"
 
-#: src/resample.c:1068
+#: src/resample.c:1049
 msgid "Reordering error !\n"
 msgstr "Помилка перевпорядкування!\n"
 
-#: src/resample.c:1079
+#: src/resample.c:1060
 msgid "Resample"
 msgstr "Змінити частоту"
 
-#: src/resample.c:1192
+#: src/resample.c:1173
 msgid "LiVES: - Resample Audio"
 msgstr "LiVES: - Зміна дискретизації звуку"
 
-#: src/resample.c:1195
+#: src/resample.c:1175
 msgid "LiVES: - Insert Silence"
 msgstr "LiVES: - Вставка тиші"
 
-#: src/resample.c:1198
+#: src/resample.c:1177
 msgid "LiVES: - New Clip Audio"
 msgstr "LiVES: - Новий звук кліпу"
 
-#: src/resample.c:1201
+#: src/resample.c:1179
 msgid "LiVES: - External Clip Settings"
 msgstr "LiVES: - Параметри зовнішнього кліпу"
 
-#: src/resample.c:1238 src/resample.c:1358
+#: src/resample.c:1215 src/resample.c:1332
 msgid "Rate (Hz) "
 msgstr "Частота (Гц) "
 
-#: src/resample.c:1245 src/resample.c:1372
+#: src/resample.c:1222 src/resample.c:1346
 msgid "Channels"
 msgstr "Канали"
 
-#: src/resample.c:1252
+#: src/resample.c:1229
 msgid "Sample Size "
 msgstr "Розмір фрагмента "
 
-#: src/resample.c:1268 src/resample.c:1425
+#: src/resample.c:1245 src/resample.c:1399
 msgid "Signed"
 msgstr "Signed"
 
-#: src/resample.c:1274 src/resample.c:1435
+#: src/resample.c:1251 src/resample.c:1409
 msgid "Unsigned"
 msgstr "Unsigned"
 
-#: src/resample.c:1297 src/resample.c:1460
+#: src/resample.c:1273 src/resample.c:1433
 msgid "Little Endian"
 msgstr "Little Endian"
 
-#: src/resample.c:1303 src/resample.c:1468
+#: src/resample.c:1279 src/resample.c:1441
 msgid "Big Endian"
 msgstr "Big Endian"
 
-#: src/resample.c:1315
+#: src/resample.c:1290
 msgid "Current"
 msgstr "Поточний"
 
-#: src/resample.c:1340
+#: src/resample.c:1315
 msgid "_Enable audio"
 msgstr "_Увімкнути звук"
 
-#: src/resample.c:1372
+#: src/resample.c:1346
 msgid "_Channels"
 msgstr "_Канали"
 
-#: src/resample.c:1394
+#: src/resample.c:1368
 msgid "_Sample Size"
 msgstr "_Розмір фрагмента"
 
-#: src/resample.c:1394
+#: src/resample.c:1368
 msgid "Sample Size"
 msgstr "Розмір фрагмента"
 
-#: src/resample.c:1489
+#: src/resample.c:1461
 msgid "New"
 msgstr "Створити"
 
-#: src/resample.c:1512
+#: src/resample.c:1484
 msgid "_Frames Per Second "
 msgstr "_Кадрів на секунду "
 
-#: src/resample.c:1530
+#: src/resample.c:1502
 msgid "Record for maximum:  "
 msgstr "Запис триватиме максимум  "
 
-#: src/resample.c:1533
+#: src/resample.c:1505
 msgid " hours  "
 msgstr " годин  "
 
-#: src/resample.c:1536
+#: src/resample.c:1508
 msgid " minutes  "
 msgstr " хвилин  "
 
-#: src/resample.c:1538
+#: src/resample.c:1510
 msgid " seconds  "
 msgstr " секунд  "
 
-#: src/resample.c:1545
+#: src/resample.c:1517
 msgid "Unlimited"
 msgstr "Не обмежено"
 
-#: src/resample.c:1561
+#: src/resample.c:1533
 msgid "Click OK to begin recording, or Cancel to quit."
 msgstr ""
 "Натисніть «Гаразд», щоб почати запис, або «Скасувати», щоб скасувати запис."
 
-#: src/resample.c:1670
+#: src/resample.c:1638
 msgid "LiVES: - Change playback speed"
 msgstr "LiVES: - Зміна швидкості відтворення"
 
-#: src/resample.c:1673
+#: src/resample.c:1640
 msgid "LiVES: - Resample Video"
 msgstr "LiVES: - Зміна дискретизації відео"
 
-#: src/resample.c:1696
+#: src/resample.c:1663
 #, c-format
 msgid ""
 "\n"
@@ -9127,7 +9142,7 @@
 "Будь ласка, введіть бажану швидкість відтворення\n"
 "у _кадрах на секунду"
 
-#: src/resample.c:1701
+#: src/resample.c:1667
 #, c-format
 msgid ""
 "\n"
@@ -9144,15 +9159,15 @@
 "Будь ласка, введіть з_мінену частоту дискретизації\n"
 "у кадрах на секунду"
 
-#: src/resample.c:1723
+#: src/resample.c:1688
 msgid "OR enter the desired clip length in _seconds"
 msgstr "АБО введіть бажану _тривалість кліпу у секундах"
 
-#: src/resample.c:1745
+#: src/resample.c:1710
 msgid "Change the _audio speed as well"
 msgstr "Змінити також швидкість _звукових даних"
 
-#: src/resample.c:1846
+#: src/resample.c:1810
 msgid ""
 "\n"
 "Speeding up the clip will cause missing frames in some multitrack layouts.\n"
@@ -9163,7 +9178,7 @@
 "компонувань.\n"
 "Ви справді бажаєте змінити швидкість?\n"
 
-#: src/resample.c:1863
+#: src/resample.c:1829
 msgid ""
 "\n"
 "Speeding up the clip will cause missing audio in some multitrack layouts.\n"
@@ -9174,7 +9189,7 @@
 "багатодоріжкових компонувань.\n"
 "Ви справді бажаєте змінити швидкість?\n"
 
-#: src/resample.c:1878
+#: src/resample.c:1847
 msgid ""
 "\n"
 "Changing the speed will cause frames to shift in some multitrack layouts.\n"
@@ -9185,7 +9200,7 @@
 "компонувань.\n"
 "Ви справді бажаєте продовжувати?\n"
 
-#: src/resample.c:1892
+#: src/resample.c:1863
 msgid ""
 "\n"
 "Changing the speed will cause audio to shift in some multitrack layouts.\n"
@@ -9196,35 +9211,35 @@
 "компонувань.\n"
 "Ви справді бажаєте продовжувати?\n"
 
-#: src/resample.c:1938
+#: src/resample.c:1911
 msgid "Speed Change"
 msgstr "Зміна швидкості"
 
-#: src/resample.c:1947
+#: src/resample.c:1920
 #, c-format
 msgid "Changed playback speed to %.3f frames per second and audio to %d Hz.\n"
 msgstr ""
 "Швидкість відтворення змінено на %3f кадрів на секунду, а частоту звукових "
 "даних на %d Гц.\n"
 
-#: src/resample.c:1950
+#: src/resample.c:1922
 #, c-format
 msgid "Changed playback speed to %.3f frames per second.\n"
 msgstr "Швидкість відтворення змінено на %.3f кадрів на секунду.\n"
 
-#: src/resample.c:2035
+#: src/resample.c:2006
 msgid "Resampling video"
 msgstr "Зміна дискретизації відео"
 
-#: src/resample.c:2042 src/resample.c:2160 src/resample.c:2182
+#: src/resample.c:2012 src/resample.c:2127 src/resample.c:2148
 msgid "Resampling clipboard video"
 msgstr "Зміна дискретизації відео у буфері даних"
 
-#: src/resample.c:2047
+#: src/resample.c:2016
 msgid "Reordering frames"
 msgstr "Перевпорядкування кадрів"
 
-#: src/resample.c:2056
+#: src/resample.c:2025
 msgid ""
 "\n"
 "\n"
@@ -9234,20 +9249,20 @@
 "\n"
 "LiVES не вдалося перевпорядкувати кадри."
 
-#: src/resample.c:2104
+#: src/resample.c:2071
 msgid "Deordering frames"
 msgstr "Скасування впорядкування кадрів"
 
-#: src/resample.c:2199
+#: src/resample.c:2165
 msgid "resampling error..."
 msgstr "помилка зміни дискретизації…"
 
-#: src/rte_window.c:85 src/rte_window.c:1708
+#: src/rte_window.c:124 src/rte_window.c:1709
 #, c-format
 msgid "Type: %s"
 msgstr "Тип: %s"
 
-#: src/rte_window.c:112
+#: src/rte_window.c:150
 msgid ""
 "\n"
 "\n"
@@ -9263,7 +9278,7 @@
 "Ви хочете саме цього?\n"
 "\n"
 
-#: src/rte_window.c:426
+#: src/rte_window.c:460
 msgid ""
 "\n"
 "\n"
@@ -9276,12 +9291,12 @@
 "файл\n"
 "\n"
 
-#: src/rte_window.c:432
+#: src/rte_window.c:466
 #, c-format
 msgid "Saving keymap to %s\n"
 msgstr "Збереження прив’язки клавіш до %s\n"
 
-#: src/rte_window.c:439
+#: src/rte_window.c:471
 #, c-format
 msgid ""
 "\n"
@@ -9290,7 +9305,7 @@
 "\n"
 "Оновлення файла прив’язки клавіш %s…"
 
-#: src/rte_window.c:446
+#: src/rte_window.c:477
 #, c-format
 msgid ""
 "\n"
@@ -9305,12 +9320,12 @@
 "%s\n"
 "Повідомлення про помилку: %s\n"
 
-#: src/rte_window.c:526
+#: src/rte_window.c:556
 #, c-format
 msgid "Saving real time effect defaults to %s..."
 msgstr "Збереження типових параметрів ефектів реального часу до %s…"
 
-#: src/rte_window.c:535
+#: src/rte_window.c:563
 #, c-format
 msgid ""
 "\n"
@@ -9325,22 +9340,22 @@
 "%s\n"
 "Код помилки: %d\n"
 
-#: src/rte_window.c:632
+#: src/rte_window.c:657
 #, c-format
 msgid "Loading real time effect defaults from %s..."
 msgstr "Завантаження типових параметрів ефектів реального часу з %s…"
 
-#: src/rte_window.c:681
+#: src/rte_window.c:701
 #, c-format
 msgid "Loading generator default sizes from %s..."
 msgstr "Завантаження типових розмірів інструментів створення з %s…"
 
-#: src/rte_window.c:1306
+#: src/rte_window.c:1319
 #, c-format
 msgid "Loading default keymap from %s..."
 msgstr "Завантаження клавіатурних скорочень з %s…"
 
-#: src/rte_window.c:1329
+#: src/rte_window.c:1339
 #, c-format
 msgid ""
 "\n"
@@ -9355,27 +9370,27 @@
 "%s\n"
 "Код помилки: %d\n"
 
-#: src/rte_window.c:1403
+#: src/rte_window.c:1412
 #, c-format
 msgid "Invalid line %d in %s\n"
 msgstr "Некоректний рядок %d у %s\n"
 
-#: src/rte_window.c:1483
+#: src/rte_window.c:1490
 #, c-format
 msgid "Invalid key %d in %s\n"
 msgstr "Некоректна клавіша %d у %s\n"
 
-#: src/rte_window.c:1498
+#: src/rte_window.c:1505
 #, c-format
 msgid "Invalid effect %s in %s\n"
 msgstr "Некоректний ефект %s у %s\n"
 
-#: src/rte_window.c:1517
+#: src/rte_window.c:1524
 #, c-format
 msgid "Unknown effect %s in %s\n"
 msgstr "Невідомий ефект %s у %s\n"
 
-#: src/rte_window.c:1535
+#: src/rte_window.c:1542
 #, c-format
 msgid ""
 "This version of LiVES cannot mix generators/non-generators on the same key "
@@ -9384,21 +9399,21 @@
 "У цій версії LiVES неможливо призначати породжувачі і непороджувачі на одну "
 "клавішу (%d) !\n"
 
-#: src/rte_window.c:1547
+#: src/rte_window.c:1554
 #, c-format
 msgid "Too many effects bound to key %d.\n"
 msgstr "З клавішею %d пов’язано занадто багато ефектів.\n"
 
-#: src/rte_window.c:1587
+#: src/rte_window.c:1593
 msgid "update required.\n"
 msgstr "потрібне оновлення.\n"
 
-#: src/rte_window.c:1603
+#: src/rte_window.c:1607
 #, c-format
 msgid "Loading data connection map from %s..."
 msgstr "Завантажуємо карту прив’язування даних з %s…"
 
-#: src/rte_window.c:1612
+#: src/rte_window.c:1614
 msgid ""
 "\n"
 "\n"
@@ -9410,41 +9425,41 @@
 "Не вдалося знайти деяких з ефектів.\n"
 "\n"
 
-#: src/rte_window.c:1691
+#: src/rte_window.c:1692
 #, c-format
 msgid "LiVES: Information for %s"
 msgstr "LiVES: відомості про %s"
 
-#: src/rte_window.c:1704
+#: src/rte_window.c:1705
 #, c-format
 msgid "Effect name: %s"
 msgstr "Назва ефекту: %s"
 
-#: src/rte_window.c:1712
+#: src/rte_window.c:1713
 #, c-format
 msgid "Plugin name: %s"
 msgstr "Назва додатка: %s"
 
-#: src/rte_window.c:1716
+#: src/rte_window.c:1717
 #, c-format
 msgid "Author: %s"
 msgstr "Автор: %s"
 
-#: src/rte_window.c:1721
+#: src/rte_window.c:1722
 #, c-format
 msgid "and: %s"
 msgstr "і: %s"
 
-#: src/rte_window.c:1726
+#: src/rte_window.c:1727
 #, c-format
 msgid "Version: %d"
 msgstr "Версія: %d"
 
-#: src/rte_window.c:1734
+#: src/rte_window.c:1735
 msgid "Description: "
 msgstr "Опис: "
 
-#: src/rte_window.c:1960
+#: src/rte_window.c:1963
 msgid ""
 "\n"
 "\n"
@@ -9458,69 +9473,69 @@
 "клавіші.\n"
 "\n"
 
-#: src/rte_window.c:2024
+#: src/rte_window.c:2027
 #, c-format
 msgid "LiVES could not locate the effect %s.\n"
 msgstr "LiVES не вдалося знайти ефект %s.\n"
 
-#: src/rte_window.c:2225
+#: src/rte_window.c:2216
 msgid "LiVES: Real time effect mapping"
 msgstr "LiVES: прив’язка ефектів реального часу"
 
-#: src/rte_window.c:2257
+#: src/rte_window.c:2248
 #, c-format
 msgid "Ctrl-%d"
 msgstr "Ctrl-%d"
 
-#: src/rte_window.c:2264
+#: src/rte_window.c:2255
 msgid "Key active"
 msgstr "Активізація клавіші"
 
-#: src/rte_window.c:2279
+#: src/rte_window.c:2271
 msgid "Key grab"
 msgstr "Захоплення клавіші"
 
-#: src/rte_window.c:2280
+#: src/rte_window.c:2272
 msgid "Grab keyboard for this effect key"
 msgstr "Захопити клавіатуру для цієї клавіші ефекту"
 
-#: src/rte_window.c:2290
+#: src/rte_window.c:2283
 msgid "_Clear all effects"
 msgstr "Ви_лучити всі ефекти"
 
-#: src/rte_window.c:2304
+#: src/rte_window.c:2297
 msgid "Mode active"
 msgstr "Активізація режиму"
 
-#: src/rte_window.c:2314 src/multitrack.c:8568
+#: src/rte_window.c:2307 src/multitrack.c:8762
 msgid "Info"
 msgstr "Інформація"
 
-#: src/rte_window.c:2315
+#: src/rte_window.c:2308
 msgid "Set Parameters"
 msgstr "Вказати параметри"
 
-#: src/rte_window.c:2316
+#: src/rte_window.c:2309
 msgid "Set Connections"
 msgstr "Встановити з’єднання"
 
-#: src/rte_window.c:2317
+#: src/rte_window.c:2310
 msgid "Clear"
 msgstr "Спорожнити"
 
-#: src/rte_window.c:2326
+#: src/rte_window.c:2319
 msgid "Effect name:"
 msgstr "Назва ефекту:"
 
-#: src/rte_window.c:2391
+#: src/rte_window.c:2384
 msgid "_Save as default keymap"
 msgstr "З_берегти як типовий набір прив’язок"
 
-#: src/rte_window.c:2396
+#: src/rte_window.c:2389
 msgid "_Load default keymap"
 msgstr "З_авантажити типові клавіатурні скорочення"
 
-#: src/rte_window.c:2840
+#: src/rte_window.c:2833
 #, c-format
 msgid ""
 "Unable to create default keymap file: %s\n"
@@ -9582,7 +9597,7 @@
 msgid "none\n"
 msgstr "немає\n"
 
-#: src/lives-yuv4mpeg.c:494
+#: src/lives-yuv4mpeg.c:493
 #, c-format
 msgid ""
 "Unable to set display framerate to %.3f fps.\n"
@@ -9591,73 +9606,73 @@
 "Не вдалося встановити частоту кадрів показу у %.3f кд/с.\n"
 "\n"
 
-#: src/lives-yuv4mpeg.c:503
+#: src/lives-yuv4mpeg.c:502
 #, c-format
 msgid "Unable to open yuv4mpeg out stream %s\n"
 msgstr "Не вдалося відкрити вихідний потік yuv4mpeg %s\n"
 
-#: src/lives-yuv4mpeg.c:628
+#: src/lives-yuv4mpeg.c:626
 #, c-format
 msgid "TV card %d"
 msgstr "ТБ-картка %d"
 
-#: src/lives-yuv4mpeg.c:713
+#: src/lives-yuv4mpeg.c:710
 #, c-format
 msgid "Opened TV card %d (%s)"
 msgstr "Відкрито ТБ-картку %d (%s)"
 
-#: src/lives-yuv4mpeg.c:760
+#: src/lives-yuv4mpeg.c:757
 #, c-format
 msgid "Firewire card %d"
 msgstr "Firewire-картка %d"
 
-#: src/lives-yuv4mpeg.c:796
+#: src/lives-yuv4mpeg.c:793
 #, c-format
 msgid "Opened firewire card %d"
 msgstr "Відкрито firewire-картку %d"
 
-#: src/multitrack.c:666
+#: src/multitrack.c:736
 msgid "Auto backup"
 msgstr "Авторезервування"
 
-#: src/multitrack.c:868
+#: src/multitrack.c:935
 msgid "Backing audio"
 msgstr "Звуковий супровід"
 
-#: src/multitrack.c:1435
+#: src/multitrack.c:1515
 #, c-format
 msgid "%s : parameters for %s"
 msgstr "%s: параметри %s"
 
-#: src/multitrack.c:1809 src/multitrack.c:3483
+#: src/multitrack.c:1881 src/multitrack.c:3635
 #, c-format
 msgid "Current track: %s (layer %d)\n"
 msgstr "Поточна доріжка: %s (шар %d)\n"
 
-#: src/multitrack.c:1813 src/multitrack.c:3484
+#: src/multitrack.c:1885 src/multitrack.c:3637
 msgid "Current track: Backing audio\n"
 msgstr "Current track: Backing audio\n"
 
-#: src/multitrack.c:1814
+#: src/multitrack.c:1886
 #, c-format
 msgid "Current track: Layer %d audio\n"
 msgstr "Поточна доріжка: шар %d звуку\n"
 
-#: src/multitrack.c:1817
+#: src/multitrack.c:1889
 #, c-format
 msgid "%.2f sec.\n"
 msgstr "%.2f с\n"
 
-#: src/multitrack.c:1822 src/multitrack.c:3490
+#: src/multitrack.c:1894 src/multitrack.c:3643
 #, c-format
 msgid "Source: %s"
 msgstr "Джерело: %s"
 
-#: src/multitrack.c:1825 src/multitrack.c:3492
+#: src/multitrack.c:1897 src/multitrack.c:3645
 msgid "Right click for context menu.\n"
 msgstr "Клацніть правою кнопкою миші, щоб відкрити контекстне меню.\n"
 
-#: src/multitrack.c:1827
+#: src/multitrack.c:1899
 msgid ""
 "Double click on a block\n"
 "to select it."
@@ -9665,7 +9680,7 @@
 "Двічі клацніть лівою кнопкою\n"
 "миші на блоці, щоб позначити його."
 
-#: src/multitrack.c:3312
+#: src/multitrack.c:3452
 msgid ""
 "\n"
 "\n"
@@ -9680,7 +9695,7 @@
 "подвійним клацанням лівою або\n"
 "правою кнопкою миші.\n"
 
-#: src/multitrack.c:3315
+#: src/multitrack.c:3455
 msgid ""
 "\n"
 "\n"
@@ -9692,7 +9707,7 @@
 "Не вказано жодного ефекту.\n"
 "Спочатку позначте ефект у стосі, щоб переглянути його властивості.\n"
 
-#: src/multitrack.c:3318
+#: src/multitrack.c:3458
 msgid ""
 "\n"
 "\n"
@@ -9702,7 +9717,7 @@
 "\n"
 "Не завантажено жодного кліпу.\n"
 
-#: src/multitrack.c:3321
+#: src/multitrack.c:3462
 msgid ""
 "You must select two video tracks\n"
 "and a time region\n"
@@ -9718,7 +9733,7 @@
 "Крім того, ви можете увімкнути автоматичні переходи у\n"
 "меню «Ефекти» перед додаванням кліпів на монтажний стіл."
 
-#: src/multitrack.c:3324
+#: src/multitrack.c:3465
 msgid ""
 "\n"
 "\n"
@@ -9732,12 +9747,12 @@
 "позначити принаймні одну відеодоріжку\n"
 "і ділянку за часом.\n"
 
-#: src/multitrack.c:3487
+#: src/multitrack.c:3640
 #, c-format
 msgid "%.2f sec. to %.2f sec.\n"
 msgstr "від %.2f с до %.2f с\n"
 
-#: src/multitrack.c:3493
+#: src/multitrack.c:3646
 msgid ""
 "Single click on timeline\n"
 "to select a frame.\n"
@@ -9745,12 +9760,12 @@
 "Клацніть лівою кнопкою миші\n"
 "на монтажному столі, щоб позначити кадр.\n"
 
-#: src/multitrack.c:3711 src/multitrack.c:6790
+#: src/multitrack.c:3858 src/multitrack.c:6972
 #, c-format
 msgid "%s [unstable]"
 msgstr "%s [нестабільний]"
 
-#: src/multitrack.c:3822
+#: src/multitrack.c:3973
 msgid ""
 "You can click and drag\n"
 "below the timeline"
@@ -9758,173 +9773,173 @@
 "Ви можете натиснути кнопку миші\n"
 "і перетягнути вказівник монтажним столом"
 
-#: src/multitrack.c:3823
+#: src/multitrack.c:3974
 msgid "to select a time region.\n"
 msgstr "щоб позначити діапазон часу.\n"
 
-#: src/multitrack.c:3985
+#: src/multitrack.c:4137
 msgid "LiVES: Selected clip"
 msgstr "LiVES: позначений кліп"
 
-#: src/multitrack.c:3993
+#: src/multitrack.c:4145
 msgid "_Adjust start and end points"
 msgstr "_Коригування початкової і кінцевої позицій"
 
-#: src/multitrack.c:4002
+#: src/multitrack.c:4154
 msgid "_Edit/encode in clip editor"
 msgstr "З_мінити/Закодувати у редакторі кліпів"
 
-#: src/multitrack.c:4009
+#: src/multitrack.c:4161
 msgid "_Show clip information"
 msgstr "П_оказати відомості щодо кліпу"
 
-#: src/multitrack.c:4016
+#: src/multitrack.c:4168
 msgid "_Close this clip"
 msgstr "З_акрити цей кліп"
 
-#: src/multitrack.c:4236
+#: src/multitrack.c:4388
 msgid "Audio mixer (ctrl-m)"
 msgstr "Звуковий мікшер (ctrl-m)"
 
-#: src/multitrack.c:4336
+#: src/multitrack.c:4488
 msgid "Single click on timeline"
 msgstr "Клацніть лівою кнопкою миші на монтажному столі,"
 
-#: src/multitrack.c:4337
+#: src/multitrack.c:4489
 msgid "to select a frame."
 msgstr "щоб позначити кадр."
 
-#: src/multitrack.c:4338
+#: src/multitrack.c:4490
 msgid "Double click or right click on timeline"
 msgstr "Двічі клацніть лівою або правою кнопкою миші на монтажному столі,"
 
-#: src/multitrack.c:4339
+#: src/multitrack.c:4491
 msgid "to select a block."
 msgstr "щоб позначити блок."
 
-#: src/multitrack.c:4340
+#: src/multitrack.c:4492
 msgid "Clips can be dragged"
 msgstr "Кліпи можна перетягувати"
 
-#: src/multitrack.c:4341
+#: src/multitrack.c:4493
 msgid "onto the timeline."
 msgstr "на монтажний стіл."
 
-#: src/multitrack.c:4343
+#: src/multitrack.c:4495
 msgid "Mouse mode is: Move"
 msgstr "Режим миші: пересування"
 
-#: src/multitrack.c:4344
+#: src/multitrack.c:4496
 msgid "clips can be moved around."
 msgstr "кліпи можна пересувати."
 
-#: src/multitrack.c:4349
+#: src/multitrack.c:4500
 msgid "Mouse mode is: Select."
 msgstr "Режим миші: позначення."
 
-#: src/multitrack.c:4350
+#: src/multitrack.c:4501
 msgid "Drag with mouse on timeline"
 msgstr "Натисніть кнопку миші і перетягніть вказівник монтажного стола,"
 
-#: src/multitrack.c:4351
+#: src/multitrack.c:4502
 msgid "to select tracks and time."
 msgstr "щоб позначити доріжки і часові ділянки."
 
-#: src/multitrack.c:4362
+#: src/multitrack.c:4509
 msgid "_Insert mode: Normal"
 msgstr "_Вставлення: звичайне"
 
-#: src/multitrack.c:4378
+#: src/multitrack.c:4537
 msgid "_Mouse mode: Move"
 msgstr "_Миша: пересування"
 
-#: src/multitrack.c:4382
+#: src/multitrack.c:4540
 msgid "_Mouse mode: Select"
 msgstr "_Миша: позначення"
 
-#: src/multitrack.c:4405 src/multitrack.c:7925
+#: src/multitrack.c:4563 src/multitrack.c:8104
 msgid "Gravity: Normal"
 msgstr "Тяжіння: звичайне"
 
-#: src/multitrack.c:4409
+#: src/multitrack.c:4565
 msgid "Gravity: Left"
 msgstr "Тяжіння: ліворуч"
 
-#: src/multitrack.c:4414
+#: src/multitrack.c:4569
 msgid "Gravity: Right"
 msgstr "Тяжіння: праворуч"
 
-#: src/multitrack.c:4416
+#: src/multitrack.c:4570
 msgid "Close _last gap(s) in selected tracks/time"
 msgstr "Закрити за_лишкові прогалини у позначених доріжках/проміжку часу"
 
-#: src/multitrack.c:4419
+#: src/multitrack.c:4572
 msgid "Close _first gap(s) in selected tracks/time"
 msgstr "Закрити пер_шу прогалину в позначених доріжках/часовому фрагменті"
 
-#: src/multitrack.c:4458
+#: src/multitrack.c:4627
 msgid "Close gaps"
 msgstr "Закрити проміжки"
 
-#: src/multitrack.c:4460
+#: src/multitrack.c:4629
 msgid "Move block"
 msgstr "Пересунути блок"
 
-#: src/multitrack.c:4462
+#: src/multitrack.c:4631
 msgid "Move audio block"
 msgstr "Пересунути блок звуку"
 
-#: src/multitrack.c:4464
+#: src/multitrack.c:4633
 msgid "Delete block"
 msgstr "Вилучити блок"
 
-#: src/multitrack.c:4466
+#: src/multitrack.c:4635
 msgid "Delete audio block"
 msgstr "Вилучити блок звуку"
 
-#: src/multitrack.c:4468
+#: src/multitrack.c:4637
 msgid "Split tracks"
 msgstr "Розділити доріжки"
 
-#: src/multitrack.c:4470
+#: src/multitrack.c:4639
 msgid "Split block"
 msgstr "Розділити блок"
 
-#: src/multitrack.c:4473
+#: src/multitrack.c:4642
 #, c-format
 msgid "Apply %s"
 msgstr "Застосувати %s"
 
-#: src/multitrack.c:4478
+#: src/multitrack.c:4647
 #, c-format
 msgid "Delete %s"
 msgstr "Вилучити %s"
 
-#: src/multitrack.c:4482
+#: src/multitrack.c:4651
 msgid "Insert block"
 msgstr "Вставити блок"
 
-#: src/multitrack.c:4484
+#: src/multitrack.c:4653
 msgid "Insert gap"
 msgstr "Вставити проміжок"
 
-#: src/multitrack.c:4486
+#: src/multitrack.c:4655
 msgid "Insert audio block"
 msgstr "Вставити звуковий блок"
 
-#: src/multitrack.c:4488
+#: src/multitrack.c:4657
 msgid "Effect order change"
 msgstr "Зміна порядку ефектів"
 
-#: src/multitrack.c:4898
+#: src/multitrack.c:5064
 msgid "unsigned "
 msgstr "unsigned "
 
-#: src/multitrack.c:4899
+#: src/multitrack.c:5065
 msgid "signed "
 msgstr "signed "
 
-#: src/multitrack.c:4904
+#: src/multitrack.c:5071
 #, c-format
 msgid ""
 "Multitrack values set to %.3f fps, frame size %d x %d, audio channels %d, "
@@ -9934,15 +9949,15 @@
 "x %d, кількість каналів звуку %d, частота звуку %d, розмір семпла звуку %d, "
 "%s.\n"
 
-#: src/multitrack.c:4938
+#: src/multitrack.c:5104
 msgid "invalid event list. Failed.\n"
 msgstr "некоректний список подій. Помилка.\n"
 
-#: src/multitrack.c:4944
+#: src/multitrack.c:5110
 msgid "event list has invalid fps. Failed.\n"
 msgstr "у списку подій вказано некоректну частоту кадрів. Помилка.\n"
 
-#: src/multitrack.c:4953
+#: src/multitrack.c:5122
 #, c-format
 msgid ""
 "\n"
@@ -9957,7 +9972,7 @@
 "закрити поточний набір,\n"
 "а потім завантажити новий набір за допомогою меню «Файл».\n"
 
-#: src/multitrack.c:4993
+#: src/multitrack.c:5163
 #, c-format
 msgid ""
 "\n"
@@ -9968,361 +9983,361 @@
 "Вказано некоректну для LiVES кількість каналів звукових даних (%d).\n"
 "Не вдалося завантажити.\n"
 
-#: src/multitrack.c:5329 src/multitrack.c:5338 src/multitrack.c:21133
+#: src/multitrack.c:5452
 msgid "Layout was wiped.\n"
 msgstr "Компонування було вилучено.\n"
 
-#: src/multitrack.c:5374
+#: src/multitrack.c:5547
 #, c-format
 msgid "LiVES-%s: Multitrack %dx%d : %d bpp %.3f fps"
 msgstr "LiVES-%s: багатодоріжковий %dx%d: глибина кольору %d %.3f кд/с"
 
-#: src/multitrack.c:5617
+#: src/multitrack.c:5793
 msgid "In/out"
 msgstr "Вхід/Вихід"
 
-#: src/multitrack.c:5619
+#: src/multitrack.c:5795
 msgid "FX stack"
 msgstr "Стос ефектів"
 
-#: src/multitrack.c:5627 src/omc-learn.c:673
+#: src/multitrack.c:5803 src/omc-learn.c:659
 msgid "Params."
 msgstr "Параметри"
 
-#: src/multitrack.c:5978
+#: src/multitrack.c:6157
 msgid "_Open..."
 msgstr "_Відкрити…"
 
-#: src/multitrack.c:5996
+#: src/multitrack.c:6175
 msgid "O_pen File Selection..."
 msgstr "В_ідкрити частину файла…"
 
-#: src/multitrack.c:6040
+#: src/multitrack.c:6219
 msgid "Import Selection from _dvd/vcd..."
 msgstr "Імпортувати позна_чене з DVD/VCD…"
 
-#: src/multitrack.c:6050
+#: src/multitrack.c:6229
 msgid "Import Selection from _dvd"
 msgstr "Імпортувати познач_ене з DVD"
 
-#: src/multitrack.c:6060
+#: src/multitrack.c:6239
 msgid "Import Selection from _vcd"
 msgstr "Імпортувати позна_чене з VCD"
 
-#: src/multitrack.c:6076
+#: src/multitrack.c:6255
 msgid "_Import from Device"
 msgstr "_Імпортувати з пристрою"
 
-#: src/multitrack.c:6103
+#: src/multitrack.c:6282
 msgid "_Close the selected clip"
 msgstr "За_крити вікно позначеного кліпу"
 
-#: src/multitrack.c:6198
+#: src/multitrack.c:6377
 msgid "_Save layout as..."
 msgstr "З_берегти компонування як…"
 
-#: src/multitrack.c:6206
+#: src/multitrack.c:6385
 msgid "_Load layout..."
 msgstr "_Завантажити компонування…"
 
-#: src/multitrack.c:6210
+#: src/multitrack.c:6389
 msgid "_Wipe/Delete layout..."
 msgstr "Ви_лучити компонування…"
 
-#: src/multitrack.c:6236
+#: src/multitrack.c:6415
 msgid "_Ignore width, height and audio values from loaded layouts"
 msgstr ""
 "_Ігнорувати дані про ширину, висоту та параметри звуку з завантажених "
 "компонувань"
 
-#: src/multitrack.c:6240
+#: src/multitrack.c:6419
 msgid "Auto load _subtitles with clips"
 msgstr "Авто_матично завантажувати субтитри з кліпами"
 
-#: src/multitrack.c:6322
+#: src/multitrack.c:6501
 msgid "_CLIP EDITOR"
 msgstr "_РЕДАКТОР КЛІПІВ"
 
-#: src/multitrack.c:6334
+#: src/multitrack.c:6513
 msgid "_Adjust selected clip start/end points"
 msgstr "С_коригувати початкову або кінцеву позицію позначеного кліпу"
 
-#: src/multitrack.c:6343
+#: src/multitrack.c:6522
 msgid "_Insert selected clip"
 msgstr "_Вставити позначений кліп"
 
-#: src/multitrack.c:6355
+#: src/multitrack.c:6534
 msgid "_Insert selected clip audio"
 msgstr "В_ставити позначений звуковий кліп"
 
-#: src/multitrack.c:6364
+#: src/multitrack.c:6543
 msgid "_Delete selected block"
 msgstr "Ви_лучити позначений блок"
 
-#: src/multitrack.c:6373
+#: src/multitrack.c:6555
 msgid "_Jump to previous block boundary"
 msgstr "П_ерейти до межі попереднього блоку"
 
-#: src/multitrack.c:6382
+#: src/multitrack.c:6564
 msgid "_Jump to next block boundary"
 msgstr "П_ерейти до межі наступного блоку"
 
-#: src/multitrack.c:6395
+#: src/multitrack.c:6577
 msgid "Clear _marks from timeline"
 msgstr "Вилучити позна_чки з монтажного стола"
 
-#: src/multitrack.c:6403
+#: src/multitrack.c:6585
 msgid "Ignore selection limits when inserting"
 msgstr "Ігнорувати обмеження позначеного під час вставлення"
 
-#: src/multitrack.c:6420 src/multitrack.c:16719
+#: src/multitrack.c:6602 src/multitrack.c:17009
 msgid "_Play from Timeline Position"
 msgstr "Від_творити від позиції на монтажному столі"
 
-#: src/multitrack.c:6434
+#: src/multitrack.c:6616
 msgid "Pla_y selected time only"
 msgstr "Від_творити лише позначений фрагмент"
 
-#: src/multitrack.c:6518
+#: src/multitrack.c:6700
 msgid "_Move effects with blocks"
 msgstr "П_ересунути ефекти з блоками"
 
-#: src/multitrack.c:6531
+#: src/multitrack.c:6713
 msgid "Select _autotransition effect..."
 msgstr "Вибрати ефект _автопереходу…"
 
-#: src/multitrack.c:6542
+#: src/multitrack.c:6724
 msgid "Crossfade audio with autotransition"
 msgstr "Перетікання звуку з автопереходом"
 
-#: src/multitrack.c:6550
+#: src/multitrack.c:6732
 msgid "View/_Edit selected effect"
 msgstr "Переглянути/З_мінити позначений ефект"
 
-#: src/multitrack.c:6554
+#: src/multitrack.c:6736
 msgid "_Delete selected effect"
 msgstr "Ви_лучити позначений ефект"
 
-#: src/multitrack.c:6562
+#: src/multitrack.c:6744
 msgid "Apply effect to _block..."
 msgstr "Застосувати ефект до _блоку…"
 
-#: src/multitrack.c:6619
+#: src/multitrack.c:6801
 msgid "Apply effect to _region..."
 msgstr "Застосувати ефект до _ділянки…"
 
-#: src/multitrack.c:6885
+#: src/multitrack.c:7061
 msgid "_Tracks"
 msgstr "_Доріжки"
 
-#: src/multitrack.c:6896
+#: src/multitrack.c:7072
 msgid "Rename current track"
 msgstr "Перейменувати поточну доріжку"
 
-#: src/multitrack.c:6904
+#: src/multitrack.c:7080
 msgid "Make _Backing Audio current track"
 msgstr "Зробити зв_уковий супровід поточною доріжкою"
 
-#: src/multitrack.c:6915
+#: src/multitrack.c:7091
 msgid "Add Video Track at _Rear"
 msgstr "Додати відеодоріжку на _задній план"
 
-#: src/multitrack.c:6923
+#: src/multitrack.c:7099
 msgid "Add Video Track at _Front"
 msgstr "Додати відеодоріжку на п_ередній план"
 
-#: src/multitrack.c:6936
+#: src/multitrack.c:7112
 msgid "_Split current track at cursor"
 msgstr "_Розділити поточну доріжку на позиції курсора"
 
-#: src/multitrack.c:6948
+#: src/multitrack.c:7124
 msgid "_Split selected video tracks"
 msgstr "_Розділити позначені відеодоріжки"
 
-#: src/multitrack.c:6961
+#: src/multitrack.c:7137
 msgid "Insert gap in selected tracks/time"
 msgstr "Вставити прогалину у позначені доріжки/позицію часу"
 
-#: src/multitrack.c:6969
+#: src/multitrack.c:7145
 msgid "Insert gap in current track/selected time"
 msgstr "Вставити прогалину у поточну доріжку/позначений час"
 
-#: src/multitrack.c:6981
+#: src/multitrack.c:7157
 msgid "Close all _gaps in selected tracks/time"
 msgstr "Закрити всі про_галини у позначених доріжках/часових фрагментах"
 
-#: src/multitrack.c:7007
+#: src/multitrack.c:7183
 msgid "Se_lection"
 msgstr "По_значене"
 
-#: src/multitrack.c:7018
+#: src/multitrack.c:7194
 msgid "_Select Current Track"
 msgstr "П_означити поточну доріжку"
 
-#: src/multitrack.c:7025
+#: src/multitrack.c:7201
 msgid "Select _all video tracks"
 msgstr "Позначити в_сі відеодоріжки"
 
-#: src/multitrack.c:7032
+#: src/multitrack.c:7208
 msgid "Select _no video tracks"
 msgstr "Зн_яти позначення з усіх відеодоріжок"
 
-#: src/multitrack.c:7039
+#: src/multitrack.c:7215
 msgid "Select all _time"
 msgstr "Позначити весь _час"
 
-#: src/multitrack.c:7050
+#: src/multitrack.c:7226
 msgid "Select from _zero time"
 msgstr "Позначити від _нульового часу"
 
-#: src/multitrack.c:7057
+#: src/multitrack.c:7233
 msgid "Select to _end time"
 msgstr "Позначити до _кінцевого часу"
 
-#: src/multitrack.c:7064
+#: src/multitrack.c:7240
 msgid "_Copy..."
 msgstr "_Копіювати…"
 
-#: src/multitrack.c:7075
+#: src/multitrack.c:7251
 msgid "_Timecode to region start"
 msgstr "_Часовий відлік до початку області"
 
-#: src/multitrack.c:7082
+#: src/multitrack.c:7258
 msgid "_Timecode to region end"
 msgstr "_Часовий відлік до кінця області"
 
-#: src/multitrack.c:7089
+#: src/multitrack.c:7265
 msgid "_Region start to timecode"
 msgstr "Від початку _ділянки до часового відліку"
 
-#: src/multitrack.c:7096
+#: src/multitrack.c:7272
 msgid "_Region end to timecode"
 msgstr "Від кінця _ділянки до часового відліку"
 
-#: src/multitrack.c:7110
+#: src/multitrack.c:7286
 msgid "Select/deselect block at current track/time"
 msgstr ""
 "Позначити або зняти позначення з блоку на поточній доріжці або у поточній "
 "позиції часу"
 
-#: src/multitrack.c:7135
+#: src/multitrack.c:7311
 msgid "_Change width, height and audio values..."
 msgstr "_Змінити ширину, висоту та гучність звуку…"
 
-#: src/multitrack.c:7194
+#: src/multitrack.c:7370
 msgid "_Render"
 msgstr "_Обробка"
 
-#: src/multitrack.c:7205
+#: src/multitrack.c:7381
 msgid "_Render all to new clip"
 msgstr "_Обробити дані до нового кліпу"
 
-#: src/multitrack.c:7220
+#: src/multitrack.c:7396
 msgid "Render _video"
 msgstr "Обробити _відео"
 
-#: src/multitrack.c:7225
+#: src/multitrack.c:7401
 msgid "Render _audio"
 msgstr "Обробити _звук"
 
-#: src/multitrack.c:7235
+#: src/multitrack.c:7411
 msgid "_Normalise rendered audio"
 msgstr "_Нормалізувати оброблений звук"
 
-#: src/multitrack.c:7242
+#: src/multitrack.c:7418
 msgid "_Pre-render audio"
 msgstr "Попередн_ьо обробити звук"
 
-#: src/multitrack.c:7251
+#: src/multitrack.c:7427
 msgid "_View"
 msgstr "П_ерегляд"
 
-#: src/multitrack.c:7270
+#: src/multitrack.c:7446
 msgid "Block _In/out points"
 msgstr "По_часткова/кінцева точки блоку"
 
-#: src/multitrack.c:7279
+#: src/multitrack.c:7455
 msgid "_Effects at current"
 msgstr "Е_фекти у поточній позиції"
 
-#: src/multitrack.c:7297
+#: src/multitrack.c:7473
 msgid "Audio parameters"
 msgstr "Параметри звуку"
 
-#: src/multitrack.c:7308
+#: src/multitrack.c:7484
 msgid "Show backing _audio track"
 msgstr "Показати доріжку _звукового супроводу"
 
-#: src/multitrack.c:7312
+#: src/multitrack.c:7488
 msgid "Compact view"
 msgstr "Компактний перегляд"
 
-#: src/multitrack.c:7320
+#: src/multitrack.c:7496
 msgid "Maximum tracks to display..."
 msgstr "Максимальна к-ть доріжок…"
 
-#: src/multitrack.c:7327
+#: src/multitrack.c:7503
 msgid "Scroll to follow playback"
 msgstr "Гортати за відтворенням"
 
-#: src/multitrack.c:7331
+#: src/multitrack.c:7507
 msgid "_Center on cursor"
 msgstr "_Центрувати за курсором"
 
-#: src/multitrack.c:7338
+#: src/multitrack.c:7514
 msgid "_Zoom in"
 msgstr "З_більшити"
 
-#: src/multitrack.c:7349
+#: src/multitrack.c:7525
 msgid "_Zoom out"
 msgstr "З_меншити"
 
-#: src/multitrack.c:7361
+#: src/multitrack.c:7537
 msgid "Multitrack _details"
 msgstr "П_араметри багатодоріжкової частини"
 
-#: src/multitrack.c:7374
+#: src/multitrack.c:7550
 msgid "_Event Window"
 msgstr "Вікно п_одій"
 
-#: src/multitrack.c:7378
+#: src/multitrack.c:7554
 msgid "_Event Window (selected time only)"
 msgstr "Вікно по_дій (лише для позначеного часу)"
 
-#: src/multitrack.c:7382
+#: src/multitrack.c:7558
 msgid "_Show FRAME events"
 msgstr "_Показувати події FRAME"
 
-#: src/multitrack.c:7399
+#: src/multitrack.c:7575
 msgid "_Show multitrack keys"
 msgstr "_Показувати клавіші доріжок"
 
-#: src/multitrack.c:7468
+#: src/multitrack.c:7644
 msgid "Mouse mode: _Move"
 msgstr "Режим миші: _пересування"
 
-#: src/multitrack.c:7476
+#: src/multitrack.c:7652
 msgid "Mouse mode: _Select"
 msgstr "Режим миші: _вибір"
 
-#: src/multitrack.c:7505
+#: src/multitrack.c:7681
 msgid "Insert mode: _Normal"
 msgstr "Режим вставлення: _звичайний"
 
-#: src/multitrack.c:7733
+#: src/multitrack.c:7909
 msgid "Insert with _audio"
 msgstr "Вставляти зі _звуком"
 
-#: src/multitrack.c:7734
+#: src/multitrack.c:7910
 msgid ""
 "Select whether video clips are inserted and moved with their audio or not"
 msgstr "Визначає, вставлятиме програма відеокліпи зі звуковими даними чи ні"
 
-#: src/multitrack.c:7829
+#: src/multitrack.c:8007
 msgid "Select _overlap"
 msgstr "Позначене пере_кривається"
 
-#: src/multitrack.c:7830
+#: src/multitrack.c:8008
 msgid ""
 "Select whether timeline selection snaps to overlap between selected tracks "
 "or not"
@@ -10330,83 +10345,75 @@
 "Визначає, будуть фрагменти записів монтажного стола прилипати до перекриття "
 "один до одного між позначеними доріжками чи ні"
 
-#: src/multitrack.c:7894 src/multitrack.c:14198
+#: src/multitrack.c:8073 src/multitrack.c:14422
 msgid "Expanded View (d)"
 msgstr "Розгорнутий перегляд (d)"
 
-#: src/multitrack.c:7897 src/multitrack.c:14205
+#: src/multitrack.c:8076 src/multitrack.c:14428
 msgid "Compact View (d)"
 msgstr "Компактний перегляд (d)"
 
-#: src/multitrack.c:7939
+#: src/multitrack.c:8118
 msgid "Gravity: _Normal"
 msgstr "Тяжіння: _звичайне"
 
-#: src/multitrack.c:7952
+#: src/multitrack.c:8131
 msgid "Gravity: _Left"
 msgstr "Тяжіння: _ліворуч"
 
-#: src/multitrack.c:7967
+#: src/multitrack.c:8146
 msgid "Gravity: _Right"
 msgstr "Тяжіння: _праворуч"
 
-#: src/multitrack.c:8297
+#: src/multitrack.c:8496
 msgid "_Apply"
 msgstr "_Застосувати"
 
-#: src/multitrack.c:8319
+#: src/multitrack.c:8518
 msgid "Time"
 msgstr "Час"
 
-#: src/multitrack.c:8333
+#: src/multitrack.c:8532
 msgid "_Del. node"
 msgstr "Ви_л. вузол"
 
-#: src/multitrack.c:8341
+#: src/multitrack.c:8540
 msgid "_Next node"
 msgstr "_Наст. вузол"
 
-#: src/multitrack.c:8349
+#: src/multitrack.c:8548
 msgid "_Prev node"
 msgstr "П_опер. вузол"
 
-#: src/multitrack.c:8373
+#: src/multitrack.c:8574
 msgid "_Reverse playback  "
 msgstr "Зв_оротне відтворення  "
 
-#: src/multitrack.c:8395
+#: src/multitrack.c:8596
 msgid "_Velocity  "
 msgstr "_Швидкість  "
 
-#: src/multitrack.c:8464
+#: src/multitrack.c:8664
 msgid "Anchor _start"
 msgstr "Зафіксувати по_чаток"
 
-#: src/multitrack.c:8465
+#: src/multitrack.c:8665
 msgid "Anchor the start point to the timeline"
 msgstr "Прив’язати початкову точку до монтажного стола"
 
-#: src/multitrack.c:8481
-msgid "Start frame"
-msgstr "Початковий кадр"
-
-#: src/multitrack.c:8533
+#: src/multitrack.c:8728
 msgid "Anchor _end"
 msgstr "Зафіксувати _кінець"
 
-#: src/multitrack.c:8534
+#: src/multitrack.c:8729
 msgid "Anchor the end point to the timeline"
 msgstr "Прив’язати кінцеву точку до монтажного столу"
 
-#: src/multitrack.c:8546
-msgid "End frame"
-msgstr "Кінцевий кадр"
-
-#: src/multitrack.c:8739
+#: src/multitrack.c:8929
 msgid "Scroll"
 msgstr "Гортання"
 
-#: src/multitrack.c:9316
+#: src/multitrack.c:9502
 msgid ""
 "\n"
 "==============================\n"
@@ -10416,91 +10423,91 @@
 "==============================\n"
 "Перемкнено у режим редагування кліпів\n"
 
-#: src/multitrack.c:9502
+#: src/multitrack.c:9708
 msgid "Timeline (seconds)"
 msgstr "Монтажний стіл (секунди)"
 
-#: src/multitrack.c:9984
+#: src/multitrack.c:10202
 msgid " Backing audio"
 msgstr " Звуковий супровід"
 
-#: src/multitrack.c:9987
+#: src/multitrack.c:10204
 #, c-format
 msgid " Layer %d audio"
 msgstr " Шар %d звуку"
 
-#: src/multitrack.c:9995
+#: src/multitrack.c:10212
 msgid "Show/hide audio details"
 msgstr "Показати/Приховати параметри звуку"
 
-#: src/multitrack.c:10010 src/multitrack.c:10232
+#: src/multitrack.c:10227 src/multitrack.c:10452
 #, c-format
 msgid "Layer %d audio"
 msgstr "Шар %d звуку"
 
-#: src/multitrack.c:10144 src/multitrack.c:10261
+#: src/multitrack.c:10353 src/multitrack.c:10481
 #, c-format
 msgid "%s (layer %d)"
 msgstr "%s (шар %d)"
 
-#: src/multitrack.c:10184
+#: src/multitrack.c:10403
 msgid "Select track"
 msgstr "Вибрати доріжку"
 
-#: src/multitrack.c:10188
+#: src/multitrack.c:10407
 msgid "Show/hide audio"
 msgstr "Показати/Приховати звукові доріжки"
 
-#: src/multitrack.c:10194
+#: src/multitrack.c:10413
 #, c-format
 msgid "Video %d"
 msgstr "Відео %d"
 
-#: src/multitrack.c:10233
+#: src/multitrack.c:10453
 #, c-format
 msgid " %s"
 msgstr " %s"
 
-#: src/multitrack.c:10346
+#: src/multitrack.c:10574
 msgid "LiVES: Selected effect"
 msgstr "LiVES: позначений ефект"
 
-#: src/multitrack.c:10358
+#: src/multitrack.c:10586
 msgid "_View/Edit this effect"
 msgstr "П_ереглянути/Змінити цей ефект"
 
-#: src/multitrack.c:10361
+#: src/multitrack.c:10588
 msgid "_View this effect"
 msgstr "П_ереглянути цей ефект"
 
-#: src/multitrack.c:10369
+#: src/multitrack.c:10596
 msgid "_Delete this effect"
 msgstr "Ви_лучити цей ефект"
 
-#: src/multitrack.c:10422
+#: src/multitrack.c:10648
 msgid "Cannot insert after this effect"
 msgstr "Не вдалося вставити після цього ефекту"
 
-#: src/multitrack.c:10451
+#: src/multitrack.c:10677
 msgid "This effect cannot be moved"
 msgstr "Цей ефект не вдалося пересунути"
 
-#: src/multitrack.c:10499
+#: src/multitrack.c:10724
 #, c-format
 msgid "  %d to %d selected  "
 msgstr "  позначено від %d до %d  "
 
-#: src/multitrack.c:10502 src/multitrack.c:10746
+#: src/multitrack.c:10727 src/multitrack.c:10968
 #, c-format
 msgid "%.2f sec."
 msgstr "%.2f с"
 
-#: src/multitrack.c:10717
+#: src/multitrack.c:10940
 #, c-format
 msgid "%d frames"
 msgstr "%d кадрів"
 
-#: src/multitrack.c:11070
+#: src/multitrack.c:11299
 msgid ""
 "\n"
 "==============================\n"
@@ -10510,19 +10517,19 @@
 "==============================\n"
 "Перемкнено у режим роботи з багатьма доріжками\n"
 
-#: src/multitrack.c:12691
+#: src/multitrack.c:12939
 msgid "Drag the time slider to where you"
 msgstr "Перетягніть повзунок часу у позицію, де ви"
 
-#: src/multitrack.c:12692
+#: src/multitrack.c:12940
 msgid "want to set effect parameters"
 msgstr "бажаєте встановити параметри ефектів"
 
-#: src/multitrack.c:12693
+#: src/multitrack.c:12941
 msgid "Set parameters, then click \"Apply\"\n"
 msgstr "Вкажіть параметри, а потім натисніть кнопку «Застосувати»\n"
 
-#: src/multitrack.c:12694
+#: src/multitrack.c:12942
 msgid ""
 "NODES are points where parameters\n"
 "have been set.\n"
@@ -10532,51 +10539,51 @@
 "встановлено параметри.\n"
 "Вузли можна вилучати."
 
-#: src/multitrack.c:12697
+#: src/multitrack.c:12944
 msgid "Effect has no parameters.\n"
 msgstr "Для ефекту не передбачено парамтрів.\n"
 
-#: src/multitrack.c:12788
+#: src/multitrack.c:13033
 #, c-format
 msgid "%s output"
 msgstr "вивід %s"
 
-#: src/multitrack.c:12794 src/multitrack.c:12804
+#: src/multitrack.c:13038 src/multitrack.c:13046
 #, c-format
 msgid "layer %d"
 msgstr "шар %d"
 
-#: src/multitrack.c:12796 src/multitrack.c:12806
+#: src/multitrack.c:13039 src/multitrack.c:13047
 msgid "audio track"
 msgstr "звукова доріжка"
 
-#: src/multitrack.c:12797
+#: src/multitrack.c:13040
 #, c-format
 msgid "%s to %s"
 msgstr "від %s до %s"
 
-#: src/multitrack.c:12807
+#: src/multitrack.c:13048
 #, c-format
 msgid "%s from %s"
 msgstr "%s з %s"
 
-#: src/multitrack.c:12860
+#: src/multitrack.c:13099
 msgid "_Prev filter map"
 msgstr "_Попередня карта фільтрування"
 
-#: src/multitrack.c:12871
+#: src/multitrack.c:13110
 msgid "Insert _before"
 msgstr "Вставити п_еред"
 
-#: src/multitrack.c:12881
+#: src/multitrack.c:13120
 msgid "Insert _after"
 msgstr "Вставити п_ісля"
 
-#: src/multitrack.c:12896
+#: src/multitrack.c:13134
 msgid "_Next filter map"
 msgstr "_Наступна карта фільтрування"
 
-#: src/multitrack.c:12911
+#: src/multitrack.c:13148
 msgid ""
 "\n"
 "\n"
@@ -10588,7 +10595,7 @@
 "До поточної доріж�и у поточний момент часу,\n"
 "не призначено ефектів.\n"
 
-#: src/multitrack.c:12929
+#: src/multitrack.c:13166
 msgid ""
 "Drag a compositor anywhere\n"
 "on the timeline\n"
@@ -10598,7 +10605,7 @@
 "позицію монтажного столу,\n"
 "щоб застосувати його до позначеної області."
 
-#: src/multitrack.c:12936
+#: src/multitrack.c:13173
 msgid ""
 "Drag a transition anywhere\n"
 "on the timeline\n"
@@ -10608,7 +10615,7 @@
 "позицію монтажного столу,\n"
 "щоб застосувати його до позначеної області."
 
-#: src/multitrack.c:12944
+#: src/multitrack.c:13181
 msgid ""
 "Effects can be dragged\n"
 "onto blocks on the timeline."
@@ -10616,63 +10623,63 @@
 "Ефекти можна просто перетягувати\n"
 "на блоки монтажного столу."
 
-#: src/multitrack.c:13166
+#: src/multitrack.c:13406
 msgid "LiVES: Selected block/frame"
 msgstr "LiVES: позначений блок або кадр"
 
-#: src/multitrack.c:13173
+#: src/multitrack.c:13413
 msgid "_Select this block"
 msgstr "П_означити цей блок"
 
-#: src/multitrack.c:13183
+#: src/multitrack.c:13423
 msgid "_Split block here"
 msgstr "_Розділити блок тут"
 
-#: src/multitrack.c:13191
+#: src/multitrack.c:13431
 msgid "List _effects here"
 msgstr "Показати список _ефектів тут"
 
-#: src/multitrack.c:13200 src/multitrack.c:13277
+#: src/multitrack.c:13440 src/multitrack.c:13518
 #, c-format
 msgid "_Adjust %s"
 msgstr "_Коригувати %s"
 
-#: src/multitrack.c:13215
+#: src/multitrack.c:13455
 msgid "_Delete this block"
 msgstr "Ви_лучити цей блок"
 
-#: src/multitrack.c:13258
+#: src/multitrack.c:13500
 msgid "_Insert here"
 msgstr "_Вставити тут"
 
-#: src/multitrack.c:13264
+#: src/multitrack.c:13505
 msgid "_Insert audio here"
 msgstr "_Вставити звук тут"
 
-#: src/multitrack.c:14801
+#: src/multitrack.c:15017
 #, c-format
 msgid "Inserted gap in selected tracks from time %.4f to %.4f\n"
 msgstr ""
 "Вставлено прогалину у позначені доріжки від позиції часу %.4f до позиції "
 "часу %.4f\n"
 
-#: src/multitrack.c:14835
+#: src/multitrack.c:15048
 #, c-format
 msgid "Inserted gap in track %s from time %.4f to %.4f\n"
 msgstr ""
 "Вставлено прогалину у доріжку %s від позиції часу %.4f до позиції часу %.4f\n"
 
-#: src/multitrack.c:15036
+#: src/multitrack.c:15244
 #, c-format
 msgid "Undid %s\n"
 msgstr "Скасування %s\n"
 
-#: src/multitrack.c:15235
+#: src/multitrack.c:15445
 #, c-format
 msgid "Redid %s\n"
 msgstr "Повторення %s\n"
 
-#: src/multitrack.c:15268
+#: src/multitrack.c:15475
 msgid ""
 "\n"
 " (variable)"
@@ -10680,62 +10687,62 @@
 "\n"
 " (змінна)"
 
-#: src/multitrack.c:15502 src/multitrack.c:15614 src/multitrack.c:18736
-#: src/multitrack.c:18748
+#: src/multitrack.c:15710 src/multitrack.c:15823 src/multitrack.c:19077
+#: src/multitrack.c:19089
 #, c-format
 msgid "track %s"
 msgstr "доріжка %s"
 
-#: src/multitrack.c:15507 src/multitrack.c:15619 src/multitrack.c:18741
+#: src/multitrack.c:15715 src/multitrack.c:15828 src/multitrack.c:19082
 #, c-format
 msgid "tracks %s and %s"
 msgstr "доріжки %s і %s"
 
-#: src/multitrack.c:15513 src/multitrack.c:15625 src/multitrack.c:18751
+#: src/multitrack.c:15721 src/multitrack.c:15834 src/multitrack.c:19091
 msgid "selected tracks"
 msgstr "позначені доріжки"
 
-#: src/multitrack.c:15516
+#: src/multitrack.c:15726
 #, c-format
 msgid "Added %s %s to %s from %.4f to %.4f\n"
 msgstr "Додано %s %s до %s від %.4f до %.4f\n"
 
-#: src/multitrack.c:15550
+#: src/multitrack.c:15760
 #, c-format
 msgid "Added effect %s to track %s from %.4f to %.4f\n"
 msgstr "Додано ефект %s до доріжки %s від %.4f до %.4f\n"
 
-#: src/multitrack.c:15631
+#: src/multitrack.c:15845
 #, c-format
 msgid "Deleted %s %s from %s from %.4f to %.4f\n"
 msgstr "Вилучено %s %s з %s, від %.4f до %.4f\n"
 
-#: src/multitrack.c:15935
+#: src/multitrack.c:16143
 #, c-format
 msgid "rendered %d frames to new clip.\n"
 msgstr "оброблено %d кадрів зі спрямуванням до нового кліпу.\n"
 
-#: src/multitrack.c:16025
+#: src/multitrack.c:16230
 msgid "Cleaning up..."
 msgstr "Спорожнення…"
 
-#: src/multitrack.c:16712
+#: src/multitrack.c:17003
 msgid "_Pause"
 msgstr "П_ризупинити"
 
-#: src/multitrack.c:16713
+#: src/multitrack.c:17004
 msgid "Pause (p)"
 msgstr "Призупинити (p)"
 
-#: src/multitrack.c:16856
+#: src/multitrack.c:17151
 msgid "Press 'm' during playback"
 msgstr "Натисніть «m» під час відтворення"
 
-#: src/multitrack.c:16857
+#: src/multitrack.c:17152
 msgid "to make a mark on the timeline"
 msgstr "для створення позначки на монтажному столі"
 
-#: src/multitrack.c:17154
+#: src/multitrack.c:17498
 #, c-format
 msgid ""
 "Inserted audio %.4f to %.4f from clip %s into backing audio from time %.4f "
@@ -10744,7 +10751,7 @@
 "Вставлено звукові дані від %.4f до %.4f з кліпу %s до звукового супроводу з "
 "часової позначки %.4f до %.4f\n"
 
-#: src/multitrack.c:17414
+#: src/multitrack.c:17759
 #, c-format
 msgid ""
 "Inserted frames %d to %d from clip %s into track %s from time %.4f to %.4f\n"
@@ -10752,14 +10759,14 @@
 "Вставлено кадри від %d до %d з кліпу %s до доріжки %s з часової позначки "
 "%.4f до %.4f\n"
 
-#: src/multitrack.c:17998
+#: src/multitrack.c:18332
 #, c-format
 msgid ""
 "Time region %.3f to %.3f\n"
 "selected.\n"
 msgstr "Позначено ділянку часу від %.3f до %.3f.\n"
 
-#: src/multitrack.c:18002
+#: src/multitrack.c:18336
 msgid ""
 "select one or more tracks\n"
 "to create a region.\n"
@@ -10767,12 +10774,12 @@
 "позначте одну або декілька доріжок,\n"
 "щоб створити область.\n"
 
-#: src/multitrack.c:18004
+#: src/multitrack.c:18337
 #, c-format
 msgid "%d video tracks selected.\n"
 msgstr "Позначено %d відеодоріжок.\n"
 
-#: src/multitrack.c:18006
+#: src/multitrack.c:18339
 msgid ""
 "Double click on timeline\n"
 "to deselect time region."
@@ -10780,7 +10787,7 @@
 "Двічі клацніть лівою кнопкою миші на монтажному столі,\n"
 "щоб зняти позначення з області."
 
-#: src/multitrack.c:18013
+#: src/multitrack.c:18346
 msgid ""
 "Single click on an effect\n"
 "to select it."
@@ -10788,7 +10795,7 @@
 "Один раз клацніть на позначці ефекту,\n"
 "щоб позначити ефект."
 
-#: src/multitrack.c:18014
+#: src/multitrack.c:18347
 msgid ""
 "Double click on an effect\n"
 "to edit it."
@@ -10796,7 +10803,7 @@
 "Двічі клацніть на позначці ефекту,\n"
 "щоб змінити його параметри."
 
-#: src/multitrack.c:18015
+#: src/multitrack.c:18348
 msgid ""
 "Right click on an effect\n"
 "for context menu.\n"
@@ -10804,7 +10811,7 @@
 "Клацанням правою кнопкою миші на позначці\n"
 "ефекту можна викликати контекстне меню.\n"
 
-#: src/multitrack.c:18017
+#: src/multitrack.c:18350
 msgid ""
 "Effect order can be changed at\n"
 "FILTER MAPS"
@@ -10812,7 +10819,7 @@
 "Порядок застосування ефектів можна\n"
 "змінити у КАРТАХ ЕФЕКТІВ"
 
-#: src/multitrack.c:18024
+#: src/multitrack.c:18357
 msgid ""
 "You can select an effect,\n"
 "then use the INSERT BEFORE"
@@ -10820,15 +10827,15 @@
 "Ви можете позначити ефект,\n"
 "а потім скористатися кнопкою ВСТАВИТИ ПЕРЕД"
 
-#: src/multitrack.c:18025
+#: src/multitrack.c:18358
 msgid "or INSERT AFTER buttons to move it."
 msgstr "або ВСТАВИТИ ПІСЛЯ, щоб пересунути його."
 
-#: src/multitrack.c:18307 src/multitrack.c:18320
+#: src/multitrack.c:18639 src/multitrack.c:18652
 msgid "Click on another effect,"
 msgstr "Натисніть на пункті іншого ефекту"
 
-#: src/multitrack.c:18308 src/multitrack.c:18321
+#: src/multitrack.c:18640 src/multitrack.c:18653
 msgid ""
 "and the selected one\n"
 "will be inserted"
@@ -10836,50 +10843,50 @@
 "і позначений ефект\n"
 "буде вставлено"
 
-#: src/multitrack.c:18309
+#: src/multitrack.c:18641
 msgid "after it.\n"
 msgstr "після.\n"
 
-#: src/multitrack.c:18322
+#: src/multitrack.c:18654
 msgid "before it.\n"
 msgstr "перед.\n"
 
-#: src/multitrack.c:18551
+#: src/multitrack.c:18889
 #, c-format
 msgid "Removed parameter values for effect %s at time %.4f\n"
 msgstr "Вилучено значення параметрів ефекту %s у позиції часу %.4f\n"
 
-#: src/multitrack.c:18759
+#: src/multitrack.c:19100
 #, c-format
 msgid "Set parameter values for %s %s on %s at time %.4f\n"
 msgstr "Встановлено значення параметрів %s %s у %s для позиції часу %.4f\n"
 
-#: src/multitrack.c:19251 src/multitrack.c:20873
+#: src/multitrack.c:19630 src/multitrack.c:21195
 msgid "_Autoreload each time"
 msgstr "_Автоматично перезавантажувати кожного разу"
 
-#: src/multitrack.c:19323
+#: src/multitrack.c:19702
 msgid "Saving layout"
 msgstr "Зберігаємо компонування"
 
-#: src/multitrack.c:19345
+#: src/multitrack.c:19725
 #, c-format
 msgid "Saved layout to %s\n"
 msgstr "Збережено компонування для %s\n"
 
-#: src/multitrack.c:20783
+#: src/multitrack.c:21125
 msgid "clips and frames"
 msgstr "кліпи і кадри"
 
-#: src/multitrack.c:20787
+#: src/multitrack.c:21128
 msgid "clips"
 msgstr "кліпи"
 
-#: src/multitrack.c:20790
+#: src/multitrack.c:21130
 msgid "frames"
 msgstr "кадрів"
 
-#: src/multitrack.c:20800
+#: src/multitrack.c:21140
 msgid ""
 "\n"
 "Auto reload layout.\n"
@@ -10887,7 +10894,7 @@
 "\n"
 "Автоматичне перезавантаження компонування.\n"
 
-#: src/multitrack.c:20803
+#: src/multitrack.c:21143
 #, c-format
 msgid ""
 "%s\n"
@@ -10898,11 +10905,11 @@
 "Не вистачає деяких %s з компонування %s\n"
 "Отже належне завантаження неможливе.\n"
 
-#: src/multitrack.c:20920
+#: src/multitrack.c:21284
 msgid "auto backup"
 msgstr "автоматичне створення резервних копій"
 
-#: src/multitrack.c:20923
+#: src/multitrack.c:21287
 #, c-format
 msgid ""
 "\n"
@@ -10911,31 +10918,31 @@
 "\n"
 "Не вдалося завантажити файл компонування %s\n"
 
-#: src/multitrack.c:20944
+#: src/multitrack.c:21308
 #, c-format
 msgid "Loading layout from %s..."
 msgstr "Завантаження компонування з %s…"
 
-#: src/multitrack.c:20978
+#: src/multitrack.c:21338
 #, c-format
 msgid "Got %d events...processing..."
 msgstr "Отримано %d повідомлень про події… обробка…"
 
-#: src/multitrack.c:20991
+#: src/multitrack.c:21349
 msgid "Checking and rebuilding event list"
 msgstr "Перевірка і перебудова списку подій"
 
-#: src/multitrack.c:21017
+#: src/multitrack.c:21374
 #, c-format
 msgid "%d errors detected.\n"
 msgstr "Виявлено %d помилок.\n"
 
-#: src/multitrack.c:21068
+#: src/multitrack.c:21422
 #, c-format
 msgid "Multitrack fps set to %.3f\n"
 msgstr "Частоту кадрів багатодоріжкової області встановлено у значення %.3f\n"
 
-#: src/multitrack.c:21225
+#: src/multitrack.c:21576
 msgid ""
 "The current layout has changes which have not been saved.\n"
 "Are you sure you wish to wipe it ?\n"
@@ -10943,19 +10950,19 @@
 "До поточного компонування було внесено зміни, які не було збережено.\n"
 "Ви справді хочете вилучити це компонування?\n"
 
-#: src/multitrack.c:22047
+#: src/multitrack.c:22385
 msgid "LiVES: Multitrack audio mixer"
 msgstr "LiVES: мікшер багатодоріжкового звуку"
 
-#: src/multitrack.c:22077
+#: src/multitrack.c:22414
 msgid "_Reset values"
 msgstr "Від_новити значення"
 
-#: src/multitrack.c:22081
+#: src/multitrack.c:22418
 msgid "_Close mixer"
 msgstr "_Закрити вікно мікшера"
 
-#: src/multitrack.c:22130
+#: src/multitrack.c:22466
 msgid ""
 "_Invert backing audio\n"
 "and layer volumes"
@@ -10963,37 +10970,37 @@
 "_Інвертувати гучності\n"
 "звукового супроводу і шарів"
 
-#: src/multitrack.c:22132
+#: src/multitrack.c:22468
 msgid "Adjust backing and layer audio values so that they sum to 1.0"
 msgstr ""
 "Скоригувати гучності звукового супроводу і шарів звуку так, щоб їх сума "
 "складала 1,0"
 
-#: src/multitrack.c:22175
+#: src/multitrack.c:22510
 msgid "_Gang layer audio"
 msgstr "Звук з’_єднаного шару"
 
-#: src/multitrack.c:22177
+#: src/multitrack.c:22512
 msgid "Adjust all layer audio values to the same value"
 msgstr "Вирівняти гучності всіх шарів звукових даних"
 
-#: src/jack.c:104
+#: src/jack.c:102
 msgid "JACK server started\n"
 msgstr "Запущено сервер JACK\n"
 
-#: src/jack.c:1284 src/jack.c:1353
+#: src/jack.c:1265 src/jack.c:1334
 msgid "Unable to connect to JACK server\n"
 msgstr "Не вдалося з’єднатися з сервером JACK\n"
 
-#: src/jack.c:1512
+#: src/jack.c:1491
 msgid "Started jack audio subsystem.\n"
 msgstr "Запущено звукову підсистему Jack.\n"
 
-#: src/jack.c:1623
+#: src/jack.c:1600
 msgid "Started jack audio reader.\n"
 msgstr "Запущено інструмент читання звуку Jack.\n"
 
-#: src/jack.c:1838
+#: src/jack.c:1815
 msgid ""
 "\n"
 "Connection to jack audio was reset.\n"
@@ -11001,7 +11008,7 @@
 "\n"
 "З’єднання зі звуковим каналом jack було розірвано.\n"
 
-#: src/pulse.c:87
+#: src/pulse.c:88
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -11014,7 +11021,7 @@
 "Змінити параметри звукових серверів можна на сторінці «Налаштування -> "
 "Відтворення»\n"
 
-#: src/pulse.c:92
+#: src/pulse.c:94
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -11027,7 +11034,7 @@
 "Змінити параметри звукових серверів можна на сторінці «Налаштування -> "
 "Відтворення»\n"
 
-#: src/pulse.c:96
+#: src/pulse.c:99
 #, fuzzy
 msgid ""
 "\n"
@@ -11041,7 +11048,7 @@
 "Змінити параметри звукових серверів можна на сторінці «Налаштування -> "
 "Відтворення»\n"
 
-#: src/pulse.c:101
+#: src/pulse.c:104
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -11049,11 +11056,11 @@
 "\n"
 "Не вдалося встановити з’єднання з сервером PulseAudio.\n"
 
-#: src/pulse.c:107
+#: src/pulse.c:109
 msgid "LiVES will exit and you can choose another audio player.\n"
 msgstr "LiVES завершить роботу, ви зможете вибрати інший звуковий програвач.\n"
 
-#: src/pulse.c:1352
+#: src/pulse.c:1335
 msgid ""
 "\n"
 "Connection to pulse audio was reset.\n"
@@ -11061,113 +11068,113 @@
 "\n"
 "З’єднання зі звуковим сервером PulseAudio було розірвано.\n"
 
-#: src/colourspace.c:1100
+#: src/colourspace.c:1092
 msgid "unclamped"
 msgstr "незатиснуте"
 
-#: src/colourspace.c:1101
+#: src/colourspace.c:1093
 msgid "clamped"
 msgstr "затиснуте"
 
-#: src/omc-learn.c:195
+#: src/omc-learn.c:191
 #, c-format
 msgid "Responding to joystick events from %s\n"
 msgstr "Відповідь на події з джойстика від %s\n"
 
-#: src/omc-learn.c:289
+#: src/omc-learn.c:279
 msgid "Creating ALSA seq port..."
 msgstr "Створення порту seq ALSA…"
 
-#: src/omc-learn.c:325
+#: src/omc-learn.c:313
 #, c-format
 msgid "Responding to MIDI events from %s\n"
 msgstr "Відповідь на події з MIDI від %s\n"
 
-#: src/omc-learn.c:568
+#: src/omc-learn.c:554
 msgid "data"
 msgstr "дані"
 
-#: src/omc-learn.c:571
+#: src/omc-learn.c:557
 msgid "velocity"
 msgstr "швидкість"
 
-#: src/omc-learn.c:572
+#: src/omc-learn.c:558
 msgid "note"
 msgstr "нотатка"
 
-#: src/omc-learn.c:574 src/omc-learn.c:736 src/omc-learn.c:1105
-#: src/omc-learn.c:1591 src/omc-learn.c:1640
+#: src/omc-learn.c:560 src/omc-learn.c:724 src/omc-learn.c:1092
+#: src/omc-learn.c:1581 src/omc-learn.c:1630
 msgid "value"
 msgstr "значення"
 
-#: src/omc-learn.c:576
+#: src/omc-learn.c:562
 msgid "state"
 msgstr "стан"
 
-#: src/omc-learn.c:688
+#: src/omc-learn.c:674
 msgid "variable"
 msgstr "змінна"
 
-#: src/omc-learn.c:1001
+#: src/omc-learn.c:989
 msgid "Vars."
 msgstr "Змінні"
 
-#: src/omc-learn.c:1054
+#: src/omc-learn.c:1041
 #, c-format
 msgid "MIDI ch %d note on"
 msgstr "Увімкнено ноту каналу MIDI %d"
 
-#: src/omc-learn.c:1058
+#: src/omc-learn.c:1045
 #, c-format
 msgid "MIDI ch %d note off"
 msgstr "Вимкнено ноту каналу MIDI %d"
 
-#: src/omc-learn.c:1062
+#: src/omc-learn.c:1049
 #, c-format
 msgid "MIDI ch %d controller %d"
 msgstr "Канал MIDI %d контролер %d"
 
-#: src/omc-learn.c:1066
+#: src/omc-learn.c:1053
 #, c-format
 msgid "MIDI ch %d pitch bend"
 msgstr "Канал MIDI %d смуга тону"
 
-#: src/omc-learn.c:1070
+#: src/omc-learn.c:1057
 #, c-format
 msgid "MIDI ch %d pgm change"
 msgstr "Канал MIDI %d зміна pgm"
 
-#: src/omc-learn.c:1073
+#: src/omc-learn.c:1060
 #, c-format
 msgid "Joystick button %d"
 msgstr "Кнопка джойстика %d"
 
-#: src/omc-learn.c:1076
+#: src/omc-learn.c:1063
 #, c-format
 msgid "Joystick axis %d"
 msgstr "Вісь джойстика %d"
 
-#: src/omc-learn.c:1113
+#: src/omc-learn.c:1100
 msgid "x"
 msgstr "x"
 
-#: src/omc-learn.c:1122
+#: src/omc-learn.c:1109
 msgid "range"
 msgstr "діапазон"
 
-#: src/omc-learn.c:1143
+#: src/omc-learn.c:1130
 msgid "+ offset1"
 msgstr "+ зсув1"
 
-#: src/omc-learn.c:1161
+#: src/omc-learn.c:1150
 msgid "* scale"
 msgstr "* масштаб"
 
-#: src/omc-learn.c:1179
+#: src/omc-learn.c:1170
 msgid "+ offset2"
 msgstr "+ зсув2"
 
-#: src/omc-learn.c:1280
+#: src/omc-learn.c:1270
 msgid ""
 "\n"
 "Click OK to delete all entries\n"
@@ -11175,211 +11182,211 @@
 "\n"
 "Натисніть кнопку «Гаразд», щоб вилучити всі записи\n"
 
-#: src/omc-learn.c:1318
+#: src/omc-learn.c:1308
 msgid "LiVES: OMC learner"
 msgstr "LiVES: навчання OMC"
 
-#: src/omc-learn.c:1334
+#: src/omc-learn.c:1324
 msgid "Clear _unmatched"
 msgstr "Вилучити _невідповідне"
 
-#: src/omc-learn.c:1345
+#: src/omc-learn.c:1335
 msgid "_Delete all"
 msgstr "Ви_лучити все"
 
-#: src/omc-learn.c:1411
+#: src/omc-learn.c:1401
 msgid "Start video playback"
 msgstr "Почати відтворення відео"
 
-#: src/omc-learn.c:1414
+#: src/omc-learn.c:1404
 msgid "Stop video playback"
 msgstr "Зупинити відтворення відео"
 
-#: src/omc-learn.c:1418
+#: src/omc-learn.c:1408
 msgid "Clip select <clipnum>"
 msgstr "Позначення кліпу <clipnum>"
 
-#: src/omc-learn.c:1419
+#: src/omc-learn.c:1409
 msgid "Switch foreground clip to the nth valid clip"
 msgstr "Перемкнути кліп переднього плану з n-им коректним кліпом"
 
-#: src/omc-learn.c:1423
+#: src/omc-learn.c:1413
 msgid "Play forwards"
 msgstr "Відтворити у прямому порядку"
 
-#: src/omc-learn.c:1424
+#: src/omc-learn.c:1414
 msgid "Play video in a forwards direction"
 msgstr "Відтворити відео у прямому порядку"
 
-#: src/omc-learn.c:1427
+#: src/omc-learn.c:1417
 msgid "Play backwards"
 msgstr "Відтворити у оберненому порядку"
 
-#: src/omc-learn.c:1428
+#: src/omc-learn.c:1418
 msgid "Play video in a backwards direction"
 msgstr "Відтворити відео у оберненому порядку"
 
-#: src/omc-learn.c:1431
+#: src/omc-learn.c:1421
 msgid "Reverse playback direction"
 msgstr "Змінити напрям відтворення"
 
-#: src/omc-learn.c:1432
+#: src/omc-learn.c:1422
 msgid "Reverse direction of video playback"
 msgstr "Змінити напрям відтворення відео"
 
-#: src/omc-learn.c:1435
+#: src/omc-learn.c:1425
 msgid "Play video faster"
 msgstr "Пришвидшити відтворення відео"
 
-#: src/omc-learn.c:1436
+#: src/omc-learn.c:1426
 msgid "Play video at a slightly faster rate"
 msgstr "Відтворювати відео з трохи збільшеною швидкістю"
 
-#: src/omc-learn.c:1439
+#: src/omc-learn.c:1429
 msgid "Play video slower"
 msgstr "Уповільнити відтворення відео"
 
-#: src/omc-learn.c:1440
+#: src/omc-learn.c:1430
 msgid "Play video at a slightly slower rate"
 msgstr "Відтворювати відео з трохи зменшеною швидкістю"
 
-#: src/omc-learn.c:1443
+#: src/omc-learn.c:1433
 msgid "Toggle video freeze"
 msgstr "Увімкнути/Вимкнути заморожування зображення"
 
-#: src/omc-learn.c:1444
+#: src/omc-learn.c:1434
 msgid "Freeze video, or if already frozen, unfreeze it"
 msgstr "Заморозити відео, якщо вже заморожено, розморозити"
 
-#: src/omc-learn.c:1447
+#: src/omc-learn.c:1437
 msgid "Set video framerate to <fps>"
 msgstr "Встановити значення частоти кадрів відео <fps>"
 
-#: src/omc-learn.c:1448
+#: src/omc-learn.c:1438
 msgid "Set framerate of foreground clip to <float fps>"
 msgstr "Встановити частоту кадрів для кліпу переднього плану <float fps>"
 
-#: src/omc-learn.c:1452
+#: src/omc-learn.c:1442
 msgid "Start recording"
 msgstr "Почати запис"
 
-#: src/omc-learn.c:1455
+#: src/omc-learn.c:1445
 msgid "Stop recording"
 msgstr "Зупинити запис"
 
-#: src/omc-learn.c:1458
+#: src/omc-learn.c:1448
 msgid "Toggle recording state"
 msgstr "Увімкнути/Вимкнути стан запису"
 
-#: src/omc-learn.c:1461
+#: src/omc-learn.c:1451
 msgid "Swap foreground and background clips"
 msgstr "Поміняти місцями кліпи переднього і заднього планів"
 
-#: src/omc-learn.c:1463
+#: src/omc-learn.c:1453
 msgid "Reset effect keys"
 msgstr "Відновити початкові параметри всіх ефектів"
 
-#: src/omc-learn.c:1464
+#: src/omc-learn.c:1454
 msgid "Switch all effects off."
 msgstr "Вимкнути всі ефекти."
 
-#: src/omc-learn.c:1467
+#: src/omc-learn.c:1457
 msgid "Enable effect key <key>"
 msgstr "Увімкнути клавішу ефекту <key>"
 
-#: src/omc-learn.c:1471
+#: src/omc-learn.c:1461
 msgid "Disable effect key <key>"
 msgstr "Вимкнути клавішу ефекту <key>"
 
-#: src/omc-learn.c:1475
+#: src/omc-learn.c:1465
 msgid "Toggle effect key <key>"
 msgstr "Увімкнути або вимкнути клавішу ефекту <key>"
 
-#: src/omc-learn.c:1479
+#: src/omc-learn.c:1469
 msgid "Set parameter value <key> <pnum> = <value>"
 msgstr "Встановити значення параметра <key> <pnum> = <value>"
 
-#: src/omc-learn.c:1480
+#: src/omc-learn.c:1470
 msgid "Set <value> of pth (numerical) parameter for effect key <key>."
 msgstr "Встановити <value> p-го (числового) параметра клавіші ефекту <key>."
 
-#: src/omc-learn.c:1484
+#: src/omc-learn.c:1474
 msgid "Switch foreground to next clip"
 msgstr "Перемкнути передній план на наступний кліп"
 
-#: src/omc-learn.c:1487
+#: src/omc-learn.c:1477
 msgid "Switch foreground to previous clip"
 msgstr "Перемкнути передній план на попередній кліп"
 
-#: src/omc-learn.c:1490
+#: src/omc-learn.c:1480
 msgid "Set video framerate to ratio <fps_ratio>"
 msgstr "Встановити частоту кадрів відео у співвідношення <fps_ratio>"
 
-#: src/omc-learn.c:1491
+#: src/omc-learn.c:1481
 msgid "Set framerate ratio of foreground clip to <float fps_ratio>"
 msgstr ""
 "Встановити коефіцієнт частоти кадрів для кліпу переднього плану у <float "
 "fps_ratio>"
 
-#: src/omc-learn.c:1495
+#: src/omc-learn.c:1485
 msgid "Retrigger clip <clipnum>"
 msgstr "Перемкнути кліп <clipnum>"
 
-#: src/omc-learn.c:1496
+#: src/omc-learn.c:1486
 msgid ""
 "Switch foreground clip to the nth valid clip, and reset the frame number"
 msgstr ""
 "Перемкнути кліп переднього плану з n-им коректним кліпом і скинути значення "
 "номера кадру"
 
-#: src/omc-learn.c:1500
+#: src/omc-learn.c:1490
 msgid "Cycle to next mode for effect key <key>"
 msgstr "Cycle to next mode for effect key <key>"
 
-#: src/omc-learn.c:1504
+#: src/omc-learn.c:1494
 msgid "Cycle to previous mode for effect key <key>"
 msgstr "Циклічний перехід до попереднього режиму клавіші ефекту <key>"
 
-#: src/omc-learn.c:1508
+#: src/omc-learn.c:1498
 msgid "Set playback plugin parameter value <pnum> = <value>"
 msgstr "Встановити значення параметра додатка відтворення <pnum> = <value>"
 
-#: src/omc-learn.c:1509
+#: src/omc-learn.c:1499
 msgid "Set <value> of pth parameter for the playback plugin."
 msgstr "Встановити <value> p-го параметра додатка відтворення."
 
 #. TRANSLATORS: short form of "clip number"
-#: src/omc-learn.c:1536 src/omc-learn.c:1607
+#: src/omc-learn.c:1526 src/omc-learn.c:1597
 msgid "clipnum"
 msgstr "clipnum"
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1545
+#: src/omc-learn.c:1535
 msgid "fps"
 msgstr "кд/с"
 
 #. TRANSLATORS: as in keyboard key
-#: src/omc-learn.c:1553 src/omc-learn.c:1560 src/omc-learn.c:1567
-#: src/omc-learn.c:1575 src/omc-learn.c:1615 src/omc-learn.c:1623
+#: src/omc-learn.c:1543 src/omc-learn.c:1550 src/omc-learn.c:1557
+#: src/omc-learn.c:1565 src/omc-learn.c:1605 src/omc-learn.c:1613
 msgid "key"
 msgstr "клавіша"
 
 #. TRANSLATORS: short form of "parameter number"
-#: src/omc-learn.c:1583 src/omc-learn.c:1632
+#: src/omc-learn.c:1573 src/omc-learn.c:1622
 msgid "pnum"
 msgstr "pnum"
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1599
+#: src/omc-learn.c:1589
 msgid "fps_ratio"
 msgstr "fps_ratio"
 
-#: src/omc-learn.c:2443
+#: src/omc-learn.c:2417
 #, c-format
 msgid "Saving device mapping to file %s..."
 msgstr "Збереження карти відображення пристроїв до файла %s…"
 
-#: src/omc-learn.c:2527
+#: src/omc-learn.c:2498
 #, c-format
 msgid ""
 "\n"
@@ -11392,7 +11399,7 @@
 "Помилка під час обробки файла\n"
 "%s\n"
 
-#: src/omc-learn.c:2534
+#: src/omc-learn.c:2505
 #, c-format
 msgid ""
 "\n"
@@ -11405,12 +11412,12 @@
 "Некоректна версія у файлі\n"
 "%s\n"
 
-#: src/omc-learn.c:2571
+#: src/omc-learn.c:2541
 #, c-format
 msgid "Loading device mapping from file %s..."
 msgstr "Завантаження карти відображення пристрої з файла %s…"
 
-#: src/omc-learn.c:2576
+#: src/omc-learn.c:2544
 #, c-format
 msgid ""
 "\n"
@@ -11425,12 +11432,12 @@
 "%s\n"
 "Код помилки: %d\n"
 
-#: src/videodev.c:547
+#: src/videodev.c:539
 #, c-format
 msgid "Unable to open device %s\n"
 msgstr "Не вдалося відкрити пристрій %s\n"
 
-#: src/videodev.c:564
+#: src/videodev.c:554
 #, c-format
 msgid "Opened device %s\n"
 msgstr "Відкрито пристрій %s\n"
@@ -12426,6 +12433,18 @@
 #~ msgid "$error"
 #~ msgstr "$error"
 
+#~ msgid "Pause"
+#~ msgstr "Призупинити"
+
+#~ msgid "Start frame"
+#~ msgstr "Початковий кадр"
+
+#~ msgid "End frame"
+#~ msgstr "Кінцевий кадр"
+
+#~ msgid "LiVES: - Enter Set Name"
+#~ msgstr "LiVES: - Введіть назву набору"
+
 #, fuzzy
 #~ msgid "_Open"
 #~ msgstr "_Відкрити…"

LiVES-2.2.8.tar.bz2/po/uz.po -> LiVES-2.4.1.tar.bz2/po/uz.po Changed

@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n"
-"POT-Creation-Date: 2015-02-08 17:18-0300\n"
+"POT-Creation-Date: 2015-08-09 14:52-0300\n"
 "PO-Revision-Date: 2013-03-14 12:31+0000\n"
 "Last-Translator: Launchpad Translations Administrators <Unknown>\n"
 "Language-Team: Uzbek <uz@li.org>\n"
@@ -18,8 +18,7 @@
 "X-Launchpad-Export-Date: 2013-03-28 10:57+0000\n"
 "X-Generator: Launchpad (build 16546)\n"
 
-#. TRANSLATORS: do not translate this message
-#: src/main.c:118
+#: src/main.c:128
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -33,22 +32,22 @@
 "Барча таржимонлар LiVES таржима эслатмасаларини \n"
 "http://lives.sourceforge.net/TRANS-README.txt файлидан ўқишлари керак."
 
-#: src/main.c:134
+#: src/main.c:153
 #, c-format
 msgid "%s Warning: %s\n"
 msgstr ""
 
-#: src/main.c:138
+#: src/main.c:157
 #, c-format
 msgid "%s Critical error: %s\n"
 msgstr ""
 
-#: src/main.c:139
+#: src/main.c:158
 #, c-format
 msgid "%s Fatal error: %s\n"
 msgstr ""
 
-#: src/main.c:176
+#: src/main.c:198
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -63,7 +62,7 @@
 "Раҳмат. Тиклаш жараёни LiVES. дастурини қайтадан ишга туширсангиз мавжуд "
 "бўлиши керак.\n"
 
-#: src/main.c:177
+#: src/main.c:199
 msgid ""
 "\n"
 "\n"
@@ -75,7 +74,7 @@
 "Носозлик ҳақида хабар берганингизда, илтимос, операцион тизимингиз, "
 "дистрибутивингиз ва LiVES дастури версияси маълумотларини ҳам қўшинг ("
 
-#: src/main.c:180
+#: src/main.c:203
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -83,7 +82,7 @@
 "ва бошқа маълумот қуйида кўрсатилади:\n"
 "\n"
 
-#: src/main.c:184
+#: src/main.c:206
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
@@ -93,84 +92,84 @@
 "debug мосламаси билан ишга туширинг.\n"
 "\n"
 
-#: src/main.c:192
+#: src/main.c:216
 msgid "Preserving set.\n"
 msgstr "Йиғилганларни сақлаш\n"
 
-#: src/main.c:636
+#: src/main.c:691
 msgid "Resizing"
 msgstr "Ҳажми ўзгартирилмоқда"
 
-#: src/main.c:643
+#: src/main.c:698
 msgid "_Resize All Frames"
 msgstr "Барча кадрларнинг _ҳажмини ўзгартириш"
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:895
+#: src/main.c:948
 msgid "Any"
 msgstr "Исталган"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:897
+#: src/main.c:950
 msgid "None"
 msgstr "Йўқ"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:899
+#: src/main.c:952
 msgid "recommended"
 msgstr "тавсия қилинди"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:901
+#: src/main.c:954
 msgid "disabled !"
 msgstr "ўчирилди !"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:903
+#: src/main.c:956
 msgid "**The current layout**"
 msgstr "**Жорий қатлам**"
 
 #. TRANSLATORS: adjective for "Built in" type effects
-#: src/main.c:905
+#: src/main.c:958
 msgid "Builtin"
 msgstr ""
 
 #. TRANSLATORS: adjective for "Custom" type effects
-#: src/main.c:907
+#: src/main.c:960
 msgid "Custom"
 msgstr "Бошқа"
 
 #. TRANSLATORS: adjective for "Test" type effects
-#: src/main.c:909
+#: src/main.c:962
 msgid "Test"
 msgstr "Синаш"
 
-#: src/main.c:1054
+#: src/main.c:1107
 msgid "Foreground"
 msgstr ""
 
-#: src/main.c:1055
+#: src/main.c:1108
 #, fuzzy
 msgid "Background"
 msgstr "Сўниш"
 
-#: src/main.c:1566
+#: src/main.c:1624
 msgid "Loading realtime effect plugins..."
 msgstr "Реал вақт эффект плагинлари юкланмоқда..."
 
-#: src/main.c:1631
+#: src/main.c:1690
 msgid "Starting jack audio server..."
 msgstr "Jack аудио сервер ишга туширилмоқда..."
 
-#: src/main.c:1633
+#: src/main.c:1692
 msgid "Starting jack transport server..."
 msgstr "Jack транспорт сервери ишга туширилмоқда..."
 
-#: src/main.c:1634
+#: src/main.c:1693
 msgid "Connecting to jack transport server..."
 msgstr "Jack транспорт серверига уланмоқда..."
 
-#: src/main.c:1663
+#: src/main.c:1723
 #, c-format
 msgid ""
 "\n"
@@ -182,114 +181,114 @@
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
 
-#: src/main.c:1697
+#: src/main.c:1758
 msgid "Starting pulse audio server..."
 msgstr "Аудио сервер пульси ишга туширилмоқда..."
 
-#: src/main.c:1765
+#: src/main.c:1825
 msgid "Checking optional dependencies:"
 msgstr ""
 
-#: src/main.c:1766
+#: src/main.c:1826
 msgid "mplayer...detected..."
 msgstr "mplayer...аниқланди..."
 
-#: src/main.c:1767
+#: src/main.c:1827
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...АНИҚЛАНМАДИ..."
 
-#: src/main.c:1768
+#: src/main.c:1828
 #, fuzzy
 msgid "mplayer2...detected..."
 msgstr "mplayer...аниқланди..."
 
-#: src/main.c:1769
+#: src/main.c:1829
 #, fuzzy
 msgid "mplayer2...NOT DETECTED..."
 msgstr "mplayer...АНИҚЛАНМАДИ..."
 
-#: src/main.c:1770
+#: src/main.c:1830
 msgid "convert...detected..."
 msgstr "конвертлаш...аниқланди..."
 
-#: src/main.c:1771
+#: src/main.c:1831
 msgid "convert...NOT DETECTED..."
 msgstr "конвертлаш...АНИҚЛАНМАДИ..."
 
-#: src/main.c:1772
+#: src/main.c:1832
 msgid "composite...detected..."
 msgstr "composite...аниқланди..."
 
-#: src/main.c:1773
+#: src/main.c:1833
 msgid "composite...NOT DETECTED..."
 msgstr "composite...АНИҚЛАНМАДИ..."
 
-#: src/main.c:1774
+#: src/main.c:1834
 msgid "sox...detected\n"
 msgstr "sox...аниқланди\n"
 
-#: src/main.c:1775
+#: src/main.c:1835
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...АНИҚЛАНМАДИ\n"
 
-#: src/main.c:1776
+#: src/main.c:1836
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...аниқланди..."
 
-#: src/main.c:1777
+#: src/main.c:1837
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...АНИҚЛАНМАДИ..."
 
-#: src/main.c:1778
+#: src/main.c:1838
 msgid "jackd...detected..."
 msgstr "jackd...аниқланди..."
 
-#: src/main.c:1779
+#: src/main.c:1839
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...АНИҚЛАНМАДИ..."
 
-#: src/main.c:1780
+#: src/main.c:1840
 msgid "pulse audio...detected..."
 msgstr "pulse audio...аниқланди..."
 
-#: src/main.c:1781
+#: src/main.c:1841
 msgid "pulse audio...NOT DETECTED..."
 msgstr "pulse audio...АНИҚЛАНМАДИ..."
 
-#: src/main.c:1782
+#: src/main.c:1842
 msgid "python...detected..."
 msgstr "python...аниқланди..."
 
-#: src/main.c:1783
+#: src/main.c:1843
 msgid "python...NOT DETECTED..."
 msgstr "python...АНИҚЛАНМАДИ..."
 
-#: src/main.c:1784
+#: src/main.c:1844
 msgid "dvgrab...detected..."
 msgstr "dvgrab...аниқланди..."
 
-#: src/main.c:1785
+#: src/main.c:1845
 msgid "dvgrab...NOT DETECTED..."
 msgstr "dvgrab...АНИҚЛАНМАДИ..."
 
-#: src/main.c:1786
+#: src/main.c:1846
 msgid "xwininfo...detected..."
 msgstr "xwininfo...аниқланди..."
 
-#: src/main.c:1787
+#: src/main.c:1847
 msgid "xwininfo...NOT DETECTED..."
 msgstr "xwininfo...АНИҚЛАНМАДИ..."
 
-#: src/main.c:1793
+#: src/main.c:1853
 #, c-format
 msgid "Windows version %04X"
 msgstr ""
 
-#: src/main.c:1795
+#: src/main.c:1855
 msgid "UNKNOWN - please patch me !"
 msgstr ""
 
-#: src/main.c:1799
+#: src/main.c:1859
 #, c-format
 msgid ""
 "\n"
@@ -300,199 +299,204 @@
 "\n"
 "Ойна бошқарувчиси \"%s\"сифатида маълумот берди; "
 
-#: src/main.c:1802
+#: src/main.c:1862
 #, c-format
 msgid "number of monitors detected: %d\n"
 msgstr "мониторлар миқдори аниқланди: %d\n"
 
-#: src/main.c:1805
+#: src/main.c:1865
 #, c-format
 msgid "Number of CPUs detected: %d "
 msgstr ""
 
-#: src/main.c:1808 src/multitrack.c:4902
+#: src/main.c:1868 src/multitrack.c:5068
 msgid "little endian"
 msgstr ""
 
-#: src/main.c:1809 src/multitrack.c:4901
+#: src/main.c:1869 src/multitrack.c:5067
 msgid "big endian"
 msgstr ""
 
-#: src/main.c:1810
+#: src/main.c:1870
 #, c-format
 msgid "(%d bits, %s)\n"
 msgstr ""
 
-#: src/main.c:1814
+#: src/main.c:1874
 msgid "GUI type is: "
 msgstr ""
 
-#: src/main.c:1818
+#: src/main.c:1878
 #, c-format
 msgid "GTK+ version %d.%d.%d (compiled with %d.%d.%d)"
 msgstr ""
 
-#: src/main.c:1840
+#: src/main.c:1900
 msgid ", with cairo support"
 msgstr ""
 
-#: src/main.c:1847
+#: src/main.c:1907
 #, c-format
 msgid "Temp directory is %s\n"
 msgstr "Temp директорияси: %s\n"
 
-#: src/main.c:1851
+#: src/main.c:1911
 msgid ""
 "WARNING - this version of LiVES was compiled without either\n"
 "jack or pulse audio support.\n"
 "Many audio features will be unavailable.\n"
 msgstr ""
 
-#: src/main.c:1854
+#: src/main.c:1914
 msgid "Compiled with jack support, good !\n"
 msgstr ""
 
-#: src/main.c:1857
+#: src/main.c:1917
 msgid "Compiled with pulse audio support, wonderful !\n"
 msgstr ""
 
-#: src/main.c:1861
+#: src/main.c:1921
 #, c-format
 msgid ""
 "Welcome to LiVES version %s.\n"
 "\n"
 msgstr ""
 
-#: src/main.c:2306
+#: src/main.c:2380
 #, c-format
 msgid ""
 "\n"
 "Startup syntax is: %s [opts] [filename [start_time] [frames]]\n"
 msgstr ""
 
-#: src/main.c:2307
+#: src/main.c:2381
 msgid "Where: filename is the name of a media file or backup file.\n"
 msgstr ""
 
-#: src/main.c:2308
+#: src/main.c:2382
 msgid "start_time : filename start time in seconds\n"
 msgstr ""
 
-#: src/main.c:2309
+#: src/main.c:2383
 msgid "frames : maximum number of frames to open\n"
 msgstr ""
 
-#: src/main.c:2311
+#: src/main.c:2385
 msgid "opts can be:\n"
 msgstr ""
 
-#: src/main.c:2312
+#: src/main.c:2386
 msgid "-help            : show this help text and exit\n"
 msgstr ""
 
-#: src/main.c:2313
+#: src/main.c:2387
 msgid "-tmpdir <tempdir>: use alternate working directory (e.g /var/ramdisk)\n"
 msgstr ""
 
-#: src/main.c:2314
+#: src/main.c:2388
 msgid "-set <setname>   : autoload clip set setname\n"
 msgstr ""
 
-#: src/main.c:2315
+#: src/main.c:2389
 msgid "-noset           : do not load any set on startup\n"
 msgstr ""
 
-#: src/main.c:2316
+#: src/main.c:2390
 msgid "-norecover       : force no-loading of crash recovery\n"
 msgstr ""
 
-#: src/main.c:2317
+#: src/main.c:2391
 msgid "-recover         : force loading of crash recovery\n"
 msgstr ""
 
-#: src/main.c:2318
-msgid "-nothreaddialog  : doe nothing - retained for backwards compatibility\n"
+#: src/main.c:2392
+msgid ""
+"-nothreaddialog  : does nothing - retained for backwards compatibility\n"
 msgstr ""
 
-#: src/main.c:2319
+#: src/main.c:2393
 msgid "-nogui           : do not show the gui\n"
 msgstr ""
 
-#: src/main.c:2320
+#: src/main.c:2394
 msgid "-nosplash        : do not show the splash window\n"
 msgstr ""
 
-#: src/main.c:2321
+#: src/main.c:2395
 msgid "-noplaywin       : do not show the play window\n"
 msgstr ""
 
-#: src/main.c:2322
+#: src/main.c:2396
+msgid "-noninteractive  : disable menu interactivity\n"
+msgstr ""
+
+#: src/main.c:2397
 msgid "-startup-ce      : start in clip editor mode\n"
 msgstr ""
 
-#: src/main.c:2323
+#: src/main.c:2398
 msgid "-startup-mt      : start in multitrack mode\n"
 msgstr ""
 
-#: src/main.c:2324
+#: src/main.c:2399
 msgid ""
 "-fxmodesmax <n>  : allow <n> modes per effect key (minimum is 1, default is "
 "8)\n"
 msgstr ""
 
-#: src/main.c:2326
+#: src/main.c:2401
 msgid "-oscstart <port> : start OSC listener on UDP port <port>\n"
 msgstr ""
 
-#: src/main.c:2327
+#: src/main.c:2402
 msgid "-nooscstart      : do not start OSC listener\n"
 msgstr ""
 
-#: src/main.c:2329
+#: src/main.c:2404
 msgid ""
 "-aplayer <ap>    : start with selected audio player. <ap> can be mplayer, "
 "mplayer2"
 msgstr ""
 
 #. TRANSLATORS: pulse (audio)
-#: src/main.c:2332
+#: src/main.c:2407
 msgid ", pulse"
 msgstr ""
 
-#: src/main.c:2335
+#: src/main.c:2410
 msgid ", sox or jack\n"
 msgstr ""
 
-#: src/main.c:2336
+#: src/main.c:2412
 msgid ""
 "-jackopts <opts>    : opts is a bitmap of jack startup options [1 = jack "
 "transport client, 2 = jack transport master, 4 = start jack transport "
 "server, 8 = pause audio when video paused, 16 = start jack audio server] \n"
 msgstr ""
 
-#: src/main.c:2338
+#: src/main.c:2414
 msgid " or sox\n"
 msgstr ""
 
-#: src/main.c:2340
+#: src/main.c:2416
 msgid "-devicemap <mapname>          : autoload devicemap\n"
 msgstr ""
 
-#: src/main.c:2341
+#: src/main.c:2418
 msgid ""
 "-vppdefaults <file>          : load video playback plugin defaults from "
 "<file> (Note: only sets the settings, not the plugin type)\n"
 msgstr ""
 
-#: src/main.c:2342
+#: src/main.c:2419
 msgid "-debug            : try to debug crashes (requires 'gdb' installed)\n"
 msgstr ""
 
-#: src/main.c:2373 src/gui.c:1128
+#: src/main.c:2449 src/gui.c:1127
 msgid "Starting GUI..."
 msgstr ""
 
-#: src/main.c:2396
+#: src/main.c:2475
 #, c-format
 msgid ""
 "\n"
@@ -503,7 +507,7 @@
 "(Maybe you need to change the value of <prefix_dir> in your %s file)\n"
 msgstr ""
 
-#: src/main.c:2410
+#: src/main.c:2492
 #, c-format
 msgid ""
 "\n"
@@ -511,7 +515,7 @@
 "Please make sure you have write access to %s and try again.\n"
 msgstr ""
 
-#: src/main.c:2415
+#: src/main.c:2498
 msgid ""
 "\n"
 "`smogrify` must be in your path, and be executable\n"
@@ -520,7 +524,7 @@
 "before running LiVES.\n"
 msgstr ""
 
-#: src/main.c:2421
+#: src/main.c:2504
 #, c-format
 msgid ""
 "\n"
@@ -530,7 +534,7 @@
 "Please check the file permissions for this file and try again.\n"
 msgstr ""
 
-#: src/main.c:2428
+#: src/main.c:2512
 #, c-format
 msgid ""
 "\n"
@@ -541,7 +545,7 @@
 "and try again.\n"
 msgstr ""
 
-#: src/main.c:2438
+#: src/main.c:2522
 #, c-format
 msgid ""
 "Please check the <tempdir> setting in \n"
@@ -549,7 +553,7 @@
 "and try again.\n"
 msgstr ""
 
-#: src/main.c:2445
+#: src/main.c:2528
 #, c-format
 msgid ""
 "\n"
@@ -559,7 +563,7 @@
 "%s"
 msgstr ""
 
-#: src/main.c:2453
+#: src/main.c:2536
 msgid ""
 "\n"
 "An incorrect version of smogrify was found in your path.\n"
@@ -570,49 +574,49 @@
 "Thankyou.\n"
 msgstr ""
 
-#: src/main.c:2458
+#: src/main.c:2541
 msgid ""
 "\n"
 "LiVES currently requires 'mplayer', 'mplayer2' or 'sox' to function. Please "
 "install one or other of these, and try again.\n"
 msgstr ""
 
-#: src/main.c:2462
+#: src/main.c:2546
 msgid ""
 "\n"
 "LiVES currently requires both 'mplayer' or 'mplayer2' and 'sox' to function. "
 "Please install these, and try again.\n"
 msgstr ""
 
-#: src/main.c:2472
+#: src/main.c:2556
 msgid ""
 "\n"
 "LiVES was unable to locate 'mplayer' or 'mplayer2'. You may wish to install "
 "either one to use LiVES more fully.\n"
 msgstr ""
 
-#: src/main.c:2475
+#: src/main.c:2561
 msgid ""
 "\n"
 "LiVES was unable to locate 'convert'. You should install convert and image-"
 "magick if you want to use rendered effects.\n"
 msgstr ""
 
-#: src/main.c:2478
+#: src/main.c:2566
 msgid ""
 "\n"
 "LiVES was unable to locate 'composite'. You should install composite and "
 "image-magick if you want to use the merge function.\n"
 msgstr ""
 
-#: src/main.c:2481
+#: src/main.c:2570
 msgid ""
 "\n"
 "LiVES was unable to locate 'sox'. Some audio features may not work. You "
 "should install 'sox'.\n"
 msgstr ""
 
-#: src/main.c:2484
+#: src/main.c:2575
 #, c-format
 msgid ""
 "\n"
@@ -623,93 +627,93 @@
 "You may need to change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/main.c:2611
+#: src/main.c:2707
 #, c-format
 msgid "Autoloading set %s..."
 msgstr ""
 
 #. TRANSLATORS: localised name may be used here
-#: src/main.c:2781 src/interface.c:738
+#: src/main.c:2902
 msgid "LiVES"
 msgstr ""
 
-#: src/main.c:2948
+#: src/main.c:3066
 #, c-format
 msgid "Invalid audio player %s\n"
 msgstr ""
 
-#: src/main.c:3077
+#: src/main.c:3214
 #, c-format
 msgid "LiVES-%s: <Untitled%d> %dx%d : %d frames %d bpp %.3f fps"
 msgstr ""
 
-#: src/main.c:3082
+#: src/main.c:3219
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : ??? frames ??? bpp %.3f fps"
 msgstr ""
 
-#: src/main.c:3086
+#: src/main.c:3222
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : %d frames %d bpp %.3f fps"
 msgstr ""
 
-#: src/main.c:3094
+#: src/main.c:3229
 #, c-format
 msgid "LiVES-%s: <No File>"
 msgstr ""
 
 #. TRANSLATORS: rec(ord)
-#: src/main.c:5085
+#: src/main.c:5201
 #, c-format
 msgid "rec %9d/%d"
 msgstr ""
 
 #. TRANSLATORS: out of memory (rec(ord))
-#: src/main.c:5091
+#: src/main.c:5206
 #, c-format
 msgid "!rec %9d/%d"
 msgstr ""
 
-#: src/main.c:5398 src/main.c:5399 src/gui.c:2110 src/gui.c:3220
-#: src/saveplay.c:2336
+#: src/main.c:5500 src/main.c:5501 src/gui.c:2108 src/gui.c:3331
+#: src/saveplay.c:2315
 msgid "Play"
 msgstr "Ўйнаш"
 
-#: src/main.c:6128
+#: src/main.c:6216
 msgid ""
 "LiVES was unable to capture this image\n"
 "\n"
 msgstr ""
 
-#: src/main.c:6250
+#: src/main.c:6345
 #, c-format
 msgid "Closed file %s\n"
 msgstr ""
 
-#: src/main.c:6452 src/gui.c:648 src/utils.c:4312 src/utils.c:4344
-#: src/saveplay.c:3550 src/multitrack.c:4510 src/multitrack.c:6268
+#: src/main.c:6542 src/gui.c:647 src/utils.c:4256 src/utils.c:4286
+#: src/saveplay.c:3500 src/multitrack.c:4678 src/multitrack.c:6447
 msgid "_Undo"
 msgstr "_Бекор қилиш"
 
-#: src/main.c:6453 src/gui.c:666 src/utils.c:4313 src/utils.c:4345
-#: src/saveplay.c:3551 src/multitrack.c:4531 src/multitrack.c:6293
+#: src/main.c:6543 src/gui.c:665 src/utils.c:4257 src/utils.c:4287
+#: src/saveplay.c:3501 src/multitrack.c:4698 src/multitrack.c:6472
 msgid "_Redo"
 msgstr "_Қайтариш"
 
-#: src/main.c:6493 src/interface.c:470 src/gui.c:2326 src/preferences.c:2357
-#: src/resample.c:1516
+#: src/main.c:6583 src/interface.c:457 src/gui.c:2324 src/preferences.c:2391
+#: src/resample.c:1488
 msgid "Video"
 msgstr "Видео"
 
-#: src/main.c:6494 src/interface.c:483 src/gui.c:2351
+#: src/main.c:6584 src/interface.c:470 src/gui.c:2348
 msgid "Left Audio"
 msgstr ""
 
-#: src/main.c:6495 src/gui.c:2375
+#: src/main.c:6585 src/gui.c:2371
 msgid "Right Audio"
 msgstr ""
 
-#: src/main.c:6540
+#: src/main.c:6630
 msgid ""
 "\n"
 "\n"
@@ -718,11 +722,11 @@
 "Please adjust the playback options in Preferences and try again.\n"
 msgstr ""
 
-#: src/main.c:7051 src/plugins.c:1502
+#: src/main.c:7134 src/plugins.c:1468
 msgid "LiVES: - Play Window"
 msgstr ""
 
-#: src/startup.c:25
+#: src/startup.c:24
 #, c-format
 msgid ""
 "A directory named\n"
@@ -732,7 +736,7 @@
 "(Free space = %s)\n"
 msgstr ""
 
-#: src/startup.c:32
+#: src/startup.c:29
 #, c-format
 msgid ""
 "A directory named\n"
@@ -742,7 +746,7 @@
 "Please select another location.\n"
 msgstr ""
 
-#: src/startup.c:49
+#: src/startup.c:46
 #, c-format
 msgid ""
 "\n"
@@ -753,7 +757,7 @@
 "(Free space = %s)"
 msgstr ""
 
-#: src/startup.c:54
+#: src/startup.c:50
 #, c-format
 msgid ""
 "\n"
@@ -762,54 +766,54 @@
 "Please try again and choose a different location.\n"
 msgstr ""
 
-#: src/startup.c:96
+#: src/startup.c:92
 msgid "Directory name is too long !"
 msgstr ""
 
-#: src/startup.c:223
+#: src/startup.c:216
 msgid ""
 "LiVES FAILED TO START YOUR SELECTED AUDIO PLAYER !\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:230
+#: src/startup.c:222
 msgid ""
 "Before starting LiVES, you need to choose an audio player.\n"
 "\n"
 "PULSE AUDIO is recommended for most users"
 msgstr ""
 
-#: src/startup.c:233
+#: src/startup.c:225
 msgid ""
 ", but this version of LiVES was not compiled with pulse audio support.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:236
+#: src/startup.c:229
 msgid ""
 ", but you do not have pulse audio installed on your system.\n"
 " You are advised to install pulse audio first before running LiVES.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:241
+#: src/startup.c:233
 msgid "JACK audio is recommended for pro users"
 msgstr ""
 
-#: src/startup.c:244
+#: src/startup.c:236
 msgid ""
 ", but this version of LiVES was not compiled with jack audio support.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:247
+#: src/startup.c:239
 msgid ""
 ", but you do not have jackd installed. You may wish to install jackd first "
 "before running LiVES.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:250
+#: src/startup.c:242
 msgid ""
 ", but may prevent LiVES from starting on some systems.\n"
 "If LiVES will not start with jack, you can restart and try with another "
@@ -817,159 +821,159 @@
 "\n"
 msgstr ""
 
-#: src/startup.c:254
+#: src/startup.c:246
 msgid "SOX may be used if neither of the preceding players work, "
 msgstr ""
 
-#: src/startup.c:257
+#: src/startup.c:249
 msgid ""
 "but some audio features will be disabled.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:260
+#: src/startup.c:251
 msgid ""
 "but you do not have sox installed.\n"
 "You are advised to install it before running LiVES.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:264
+#: src/startup.c:255
 msgid ""
 "The MPLAYER/MPLAYER2 audio player is only recommended for testing purposes.\n"
 "\n"
 msgstr ""
 
-#: src/startup.c:281
+#: src/startup.c:271
 msgid "LiVES: - Choose an audio player"
 msgstr ""
 
-#: src/startup.c:298
+#: src/startup.c:288
 msgid "Use _pulse audio player"
 msgstr ""
 
-#: src/startup.c:320
+#: src/startup.c:310
 msgid "Use _jack audio player"
 msgstr ""
 
-#: src/startup.c:340
+#: src/startup.c:330
 msgid "Use _sox audio player"
 msgstr ""
 
-#: src/startup.c:361
+#: src/startup.c:351
 msgid "Use _mplayer audio player"
 msgstr ""
 
-#: src/startup.c:381
+#: src/startup.c:371
 msgid "Use _mplayer2 audio player"
 msgstr ""
 
-#: src/startup.c:405 src/startup.c:580 src/interface.c:1506
+#: src/startup.c:395 src/startup.c:569 src/interface.c:1398
 msgid "_Next"
 msgstr ""
 
-#: src/startup.c:445
+#: src/startup.c:435
 msgid "Skipped"
 msgstr ""
 
-#: src/startup.c:460
+#: src/startup.c:450
 msgid "Passed"
 msgstr ""
 
-#: src/startup.c:493
+#: src/startup.c:483
 msgid "Failed"
 msgstr ""
 
-#: src/startup.c:552
+#: src/startup.c:542
 msgid "LiVES: - Testing Configuration"
 msgstr ""
 
-#: src/startup.c:555
+#: src/startup.c:544
 msgid "LiVES: - Troubleshoot"
 msgstr ""
 
-#: src/startup.c:568
+#: src/startup.c:557
 msgid "LiVES will now run some basic configuration tests\n"
 msgstr ""
 
-#: src/startup.c:603
+#: src/startup.c:591
 msgid "Checking for \"sox\" presence"
 msgstr ""
 
-#: src/startup.c:607
+#: src/startup.c:595
 msgid ""
 "You should install sox to be able to use all the audio features in LiVES"
 msgstr ""
 
-#: src/startup.c:615
+#: src/startup.c:602
 msgid "Checking if sox can convert audio"
 msgstr ""
 
-#: src/startup.c:638
+#: src/startup.c:625
 msgid "Unable to allocate 176400 bytes memory."
 msgstr ""
 
-#: src/startup.c:653
+#: src/startup.c:639
 #, c-format
 msgid "Unable to write to: %s"
 msgstr ""
 
-#: src/startup.c:667 src/startup.c:807
+#: src/startup.c:653 src/startup.c:789
 #, c-format
 msgid "Command failed: %s"
 msgstr ""
 
-#: src/startup.c:689
+#: src/startup.c:675
 msgid "You should install sox_fmt_all or similar"
 msgstr ""
 
-#: src/startup.c:717
+#: src/startup.c:703
 msgid "Checking for \"mplayer\" presence"
 msgstr ""
 
-#: src/startup.c:721
+#: src/startup.c:707
 msgid ""
 "You should install mplayer or mplayer2 to be able to use all the decoding "
 "features in LiVES"
 msgstr ""
 
-#: src/startup.c:747
+#: src/startup.c:732
 msgid "Checking if mplayer can convert audio"
 msgstr ""
 
-#: src/startup.c:768
+#: src/startup.c:751
 msgid "You should install mplayer or mplayer2 with pcm/wav support"
 msgstr ""
 
-#: src/startup.c:785
+#: src/startup.c:767
 msgid "Checking if mplayer can decode to png/alpha"
 msgstr ""
 
-#: src/startup.c:828
+#: src/startup.c:810
 msgid "You may wish to upgrade mplayer to a newer version"
 msgstr ""
 
-#: src/startup.c:854
+#: src/startup.c:836
 msgid "Checking if mplayer can decode to jpeg"
 msgstr ""
 
-#: src/startup.c:882
+#: src/startup.c:862
 msgid "You should install mplayer with either png/alpha or jpeg support"
 msgstr ""
 
-#: src/startup.c:883
+#: src/startup.c:863
 msgid "You may wish to add jpeg output support to mplayer"
 msgstr ""
 
-#: src/startup.c:892
+#: src/startup.c:872
 msgid "Checking for \"convert\" presence"
 msgstr ""
 
-#: src/startup.c:896
+#: src/startup.c:876
 msgid "Install imageMagick to be able to use all of the rendered effects"
 msgstr ""
 
-#: src/startup.c:909
+#: src/startup.c:889
 msgid ""
 "\n"
 "\n"
@@ -977,7 +981,7 @@
 "Preferences/Decoding.    \n"
 msgstr ""
 
-#: src/startup.c:915
+#: src/startup.c:894
 msgid ""
 "\n"
 "\n"
@@ -985,49 +989,49 @@
 "continue    \n"
 msgstr ""
 
-#: src/startup.c:949
+#: src/startup.c:928
 msgid ""
 "\n"
 "\n"
 "Finally, you can choose the default startup interface for LiVES.\n"
 msgstr ""
 
-#: src/startup.c:950
+#: src/startup.c:929
 msgid ""
 "\n"
 "\n"
 "LiVES has two main interfaces and you can start up with either of them.\n"
 msgstr ""
 
-#: src/startup.c:951
+#: src/startup.c:930
 msgid ""
 "\n"
 "\n"
 "The default can always be changed later from Preferences.\n"
 msgstr ""
 
-#: src/startup.c:961
+#: src/startup.c:940
 msgid "LiVES: - Choose the startup interface"
 msgstr ""
 
-#: src/startup.c:972
+#: src/startup.c:951
 msgid "Start in _Clip Edit mode"
 msgstr ""
 
-#: src/startup.c:975
+#: src/startup.c:954
 msgid "This is the best choice for simple editing tasks and for VJs\n"
 msgstr ""
 
-#: src/startup.c:981
+#: src/startup.c:960
 msgid "Start in _Multitrack mode"
 msgstr ""
 
-#: src/startup.c:983
+#: src/startup.c:962
 msgid ""
 "This is a better choice for complex editing tasks involving multiple clips.\n"
 msgstr ""
 
-#: src/startup.c:992
+#: src/startup.c:971
 msgid "_Finish"
 msgstr ""
 
@@ -1044,35 +1048,35 @@
 msgid "Apply _Deinterlace"
 msgstr ""
 
-#: src/interface.c:66
+#: src/interface.c:65
 msgid "If this is set, frames will be deinterlaced as they are imported."
 msgstr ""
 
-#: src/interface.c:113 src/callbacks.c:9623 src/callbacks.c:9646
-#: src/callbacks.c:9647 src/gui.c:3223 src/gui.c:3821 src/saveplay.c:2339
-#: src/saveplay.c:3138 src/dialogs.c:1514 src/dialogs.c:1515
-#: src/dialogs.c:1746 src/dialogs.c:1747 src/framedraw.c:238
-#: src/multitrack.c:8031
+#: src/interface.c:106 src/callbacks.c:9542 src/callbacks.c:9564
+#: src/callbacks.c:9565 src/gui.c:3333 src/gui.c:3946 src/saveplay.c:2317
+#: src/saveplay.c:3097 src/dialogs.c:1575 src/dialogs.c:1576
+#: src/dialogs.c:1804 src/dialogs.c:1805 src/framedraw.c:236
+#: src/multitrack.c:8210
 msgid "Preview"
 msgstr "Олдиндан кўриш"
 
-#: src/interface.c:132
+#: src/interface.c:125
 msgid "Click here to _Preview any selected video, image or audio file"
 msgstr ""
 
-#: src/interface.c:135
+#: src/interface.c:127
 msgid "Click here to _Preview any selected audio file"
 msgstr ""
 
-#: src/interface.c:138
+#: src/interface.c:129
 msgid "Click here to _Preview the video"
 msgstr ""
 
-#: src/interface.c:181 src/dialogs.c:2542
+#: src/interface.c:169 src/dialogs.c:2621
 msgid "LiVES: - Processing..."
 msgstr ""
 
-#: src/interface.c:217
+#: src/interface.c:205
 msgid ""
 "\n"
 "\n"
@@ -1081,195 +1085,185 @@
 "Remember to switch off effects (ctrl-0) afterwards !"
 msgstr ""
 
-#: src/interface.c:222 src/callbacks.c:9373 src/callbacks.c:9420
-#: src/dialogs.c:2570
+#: src/interface.c:210 src/callbacks.c:9283 src/callbacks.c:9332
+#: src/dialogs.c:2649
 msgid ""
 "\n"
 "Please Wait"
 msgstr ""
 
-#: src/interface.c:242
+#: src/interface.c:230
 msgid "Show Details"
 msgstr ""
 
-#: src/interface.c:254 src/dialogs.c:2584
+#: src/interface.c:242 src/dialogs.c:2663
 msgid "_Enough"
 msgstr ""
 
-#: src/interface.c:255 src/framedraw.c:278
+#: src/interface.c:243 src/framedraw.c:276
 msgid "_Preview"
 msgstr "_Олдиндан кўриш"
 
-#: src/interface.c:257
+#: src/interface.c:245 src/callbacks.c:9282 src/callbacks.c:9330
 msgid "Paus_e"
 msgstr ""
 
-#: src/interface.c:258 src/callbacks.c:9417
+#: src/interface.c:246 src/callbacks.c:9329
 msgid "Pause/_Enough"
 msgstr ""
 
-#: src/interface.c:285
+#: src/interface.c:273
 msgid "_Cancel"
 msgstr "_Бекор қилиш"
 
-#: src/interface.c:374
+#: src/interface.c:361
 #, c-format
 msgid "LiVES: - %s"
 msgstr ""
 
-#: src/interface.c:376
+#: src/interface.c:363
 msgid "LiVES: - Multitrack details"
 msgstr ""
 
-#: src/interface.c:407
+#: src/interface.c:394
 msgid "Format"
 msgstr "Форматлаш"
 
-#: src/interface.c:412
+#: src/interface.c:399
 msgid "Frame size"
 msgstr ""
 
-#: src/interface.c:417
+#: src/interface.c:404
 msgid "File size"
 msgstr ""
 
-#: src/interface.c:418
+#: src/interface.c:405
 msgid "Byte size"
 msgstr ""
 
-#: src/interface.c:423 src/interface.c:1891
+#: src/interface.c:410 src/interface.c:1760
 msgid "FPS"
 msgstr "FPS"
 
-#: src/interface.c:428
+#: src/interface.c:415
 msgid "Frames"
 msgstr "Freymlar"
 
-#: src/interface.c:429
+#: src/interface.c:416
 msgid "Events"
 msgstr "Ҳодисалар"
 
-#: src/interface.c:434 src/interface.c:500 src/interface.c:542
+#: src/interface.c:421 src/interface.c:486 src/interface.c:528
 msgid "Total time"
 msgstr ""
 
-#: src/interface.c:486 src/resample.c:1488
+#: src/interface.c:472 src/resample.c:1460
 msgid "Audio"
 msgstr "Аудио"
 
-#: src/interface.c:511 src/interface.c:553
+#: src/interface.c:497 src/interface.c:539
 msgid "Rate/size"
 msgstr ""
 
-#: src/interface.c:530
+#: src/interface.c:516
 msgid "Right audio"
 msgstr ""
 
-#: src/interface.c:622
+#: src/interface.c:607
 msgid "LiVES: - Encoding options"
 msgstr ""
 
-#: src/interface.c:636
+#: src/interface.c:621
 msgid "<------------- (Check the box to re_size as suggested)"
 msgstr ""
 
-#: src/interface.c:637
+#: src/interface.c:622
 msgid "<------------- (Check the box to use the _size recommendation)"
 msgstr ""
 
-#: src/interface.c:662
+#: src/interface.c:646
 msgid "Use _letterboxing to maintain aspect ratio (optional)"
 msgstr ""
 
-#: src/interface.c:663
+#: src/interface.c:647
 msgid ""
 "Draw black rectangles either above or to the sides of the image, to prevent "
 "it from stretching."
 msgstr ""
 
-#: src/interface.c:694
+#: src/interface.c:677
 msgid "Keep _my settings"
 msgstr ""
 
-#: src/interface.c:695
+#: src/interface.c:678
 msgid "Use _recommended settings"
 msgstr ""
 
-#: src/interface.c:775 src/dialogs.c:114
-msgid ""
-"Do _not show this warning any more\n"
-"(can be turned back on from Preferences/Warnings)"
-msgstr ""
-
-#: src/interface.c:787
-msgid "Show _Details"
-msgstr ""
-
-#: src/interface.c:881
+#: src/interface.c:769
 msgid "_Close Window"
 msgstr "Ойнани _ёпиш"
 
-#: src/interface.c:883
+#: src/interface.c:771
 msgid "_Save to file"
 msgstr ""
 
-#: src/interface.c:928
+#: src/interface.c:816
 msgid "LiVES: - Insert"
 msgstr ""
 
-#: src/interface.c:945
+#: src/interface.c:833
 msgid "_Number of times to insert"
 msgstr ""
 
-#: src/interface.c:954
+#: src/interface.c:842
 msgid "_Insert to fit audio"
 msgstr ""
 
-#: src/interface.c:968
+#: src/interface.c:856
 msgid "Insert _before selection"
 msgstr ""
 
-#: src/interface.c:970
+#: src/interface.c:858
 msgid "Insert clipboard before selected frames"
 msgstr ""
 
-#: src/interface.c:986
+#: src/interface.c:875
 msgid "Insert _after selection"
 msgstr ""
 
-#: src/interface.c:988
+#: src/interface.c:877
 msgid "Insert clipboard after selected frames"
 msgstr ""
 
-#: src/interface.c:999
+#: src/interface.c:888
 msgid "Insert _with sound"
 msgstr ""
 
-#: src/interface.c:1012
+#: src/interface.c:901
 msgid "Insert with_out sound"
 msgstr ""
 
-#: src/interface.c:1093
+#: src/interface.c:985
 msgid "LiVES: - Open Selection"
 msgstr ""
 
-#: src/interface.c:1111
+#: src/interface.c:1004
 msgid "Selection start time (sec)"
 msgstr ""
 
-#: src/interface.c:1117
+#: src/interface.c:1010
 msgid "Number of frames to open"
 msgstr ""
 
-#: src/interface.c:1193
+#: src/interface.c:1088
 msgid "LiVES: - Open Location"
 msgstr ""
 
-#: src/interface.c:1195
+#: src/interface.c:1090
 msgid "LiVES: - Open Youtube Clip"
 msgstr ""
 
-#: src/interface.c:1213
+#: src/interface.c:1109
 msgid ""
 "\n"
 "\n"
@@ -1279,7 +1273,7 @@
 "\n"
 msgstr ""
 
-#: src/interface.c:1216
+#: src/interface.c:1112
 msgid ""
 "\n"
 "\n"
@@ -1288,62 +1282,62 @@
 "\n"
 msgstr ""
 
-#: src/interface.c:1220
+#: src/interface.c:1116
 msgid ""
 "Enter the URL of the clip below.\n"
 "E.g: http://www.youtube.com/watch?v=WCR6f6WzjP8\n"
 "\n"
 msgstr ""
 
-#: src/interface.c:1231
+#: src/interface.c:1127
 msgid "URL : "
 msgstr ""
 
-#: src/interface.c:1231
+#: src/interface.c:1127
 msgid "Youtube URL : "
 msgstr ""
 
-#: src/interface.c:1235
+#: src/interface.c:1131
 msgid "Do not send bandwidth information"
 msgstr ""
 
-#: src/interface.c:1237
+#: src/interface.c:1133
 msgid "Try this setting if you are having problems getting a stream"
 msgstr ""
 
-#: src/interface.c:1258
+#: src/interface.c:1155
 msgid "Download to _Directory : "
 msgstr ""
 
-#: src/interface.c:1276
+#: src/interface.c:1173
 msgid "Download _File Name : "
 msgstr ""
 
-#: src/interface.c:1281
+#: src/interface.c:1178
 msgid ".webm"
 msgstr ""
 
-#: src/interface.c:1359
+#: src/interface.c:1256
 msgid "LiVES: - Rename Clip"
 msgstr ""
 
-#: src/interface.c:1362
-msgid "LiVES: - Enter Set Name"
+#: src/interface.c:1258
+msgid "LiVES: - Enter Set Name to Save as"
 msgstr ""
 
-#: src/interface.c:1365
+#: src/interface.c:1260
 msgid "LiVES: - Enter a Set Name to Reload"
 msgstr ""
 
-#: src/interface.c:1368
+#: src/interface.c:1262
 msgid "LiVES: - Choose a Working Directory"
 msgstr ""
 
-#: src/interface.c:1371
+#: src/interface.c:1264
 msgid "LiVES: - Rename Current Track"
 msgstr ""
 
-#: src/interface.c:1391
+#: src/interface.c:1283
 msgid ""
 "You need to enter a name for the current clip set.\n"
 "This will allow you reload the layout with the same clips later.\n"
@@ -1351,354 +1345,354 @@
 "LiVES will remind you to save the clip set later when you try to exit.\n"
 msgstr ""
 
-#: src/interface.c:1397
+#: src/interface.c:1289
 msgid ""
 "In order to export this project, you must enter a name for this clip set.\n"
 "This will also be used for the project name.\n"
 msgstr ""
 
-#: src/interface.c:1404
+#: src/interface.c:1296
 msgid ""
 "Welcome to LiVES !\n"
 "This startup wizard will guide you through the\n"
 "initial install so that you can get the most from this application.\n"
 msgstr ""
 
-#: src/interface.c:1408
+#: src/interface.c:1300
 msgid ""
 "\n"
 "First of all you need to choose a working directory for LiVES.\n"
 "This should be a directory with plenty of disk space available.\n"
 msgstr ""
 
-#: src/interface.c:1427
+#: src/interface.c:1317
 msgid "New name "
 msgstr ""
 
-#: src/interface.c:1430
+#: src/interface.c:1319
 msgid "Set name "
 msgstr ""
 
-#: src/interface.c:1550
+#: src/interface.c:1435
 msgid "Use def_aults"
 msgstr ""
 
-#: src/interface.c:1553 src/interface.c:1840 src/preferences.c:2515
-#: src/preferences.c:2697
+#: src/interface.c:1437 src/interface.c:1709 src/preferences.c:2550
+#: src/preferences.c:2739
 msgid "_Advanced"
 msgstr ""
 
-#: src/interface.c:1604
+#: src/interface.c:1487
 msgid "LiVES:- Select input device"
 msgstr ""
 
-#: src/interface.c:1622
+#: src/interface.c:1504
 msgid "Select input device:"
 msgstr ""
 
-#: src/interface.c:1686
+#: src/interface.c:1568
 msgid "LiVES:- Load CD Track"
 msgstr ""
 
-#: src/interface.c:1689
+#: src/interface.c:1570
 msgid "LiVES:- Select DVD Title/Chapter"
 msgstr ""
 
-#: src/interface.c:1692
+#: src/interface.c:1572
 msgid "LiVES:- Select VCD Title"
 msgstr ""
 
-#: src/interface.c:1695
+#: src/interface.c:1574
 msgid "LiVES:- Change Maximum Visible Tracks"
 msgstr ""
 
-#: src/interface.c:1698
+#: src/interface.c:1576
 msgid "LiVES:- Device details"
 msgstr ""
 
-#: src/interface.c:1721
+#: src/interface.c:1598
 #, c-format
 msgid "Track to load (from %s)"
 msgstr ""
 
-#: src/interface.c:1724
+#: src/interface.c:1600
 msgid "DVD Title"
 msgstr ""
 
-#: src/interface.c:1727
+#: src/interface.c:1602
 msgid "VCD Title"
 msgstr ""
 
-#: src/interface.c:1730
+#: src/interface.c:1604
 msgid "Maximum number of tracks to display"
 msgstr ""
 
-#: src/interface.c:1733
+#: src/interface.c:1606
 msgid "Device:        /dev/video"
 msgstr ""
 
-#: src/interface.c:1736
+#: src/interface.c:1608
 msgid "Device:        fw:"
 msgstr ""
 
-#: src/interface.c:1771
+#: src/interface.c:1641
 msgid "Chapter  "
 msgstr ""
 
-#: src/interface.c:1776
+#: src/interface.c:1645
 msgid "Channel  "
 msgstr ""
 
-#: src/interface.c:1791
+#: src/interface.c:1660
 msgid "Audio ID  "
 msgstr ""
 
-#: src/interface.c:1857
+#: src/interface.c:1726
 msgid "Input number"
 msgstr ""
 
-#: src/interface.c:1865
+#: src/interface.c:1734
 msgid "Use default width, height and FPS"
 msgstr ""
 
-#: src/interface.c:1879
+#: src/interface.c:1748
 msgid "Width"
 msgstr ""
 
-#: src/interface.c:1885
+#: src/interface.c:1754
 msgid "Height"
 msgstr ""
 
-#: src/interface.c:1899
+#: src/interface.c:1768
 msgid "_Driver"
 msgstr ""
 
-#: src/interface.c:1902
+#: src/interface.c:1771
 msgid "_Output format"
 msgstr ""
 
-#: src/interface.c:1998
+#: src/interface.c:1865
 msgid "LiVES:- Fade Audio In"
 msgstr ""
 
-#: src/interface.c:2001
+#: src/interface.c:1867
 msgid "LiVES:- Fade Audio Out"
 msgstr ""
 
-#: src/interface.c:2017
+#: src/interface.c:1883
 msgid "Fade in over  "
 msgstr ""
 
-#: src/interface.c:2018
+#: src/interface.c:1884
 msgid "first"
 msgstr ""
 
-#: src/interface.c:2021
+#: src/interface.c:1886
 msgid "Fade out over  "
 msgstr ""
 
-#: src/interface.c:2022
+#: src/interface.c:1887
 msgid "last"
 msgstr ""
 
-#: src/interface.c:2044
+#: src/interface.c:1909
 msgid "seconds."
 msgstr ""
 
-#: src/interface.c:2052 src/saveplay.c:1507
+#: src/interface.c:1917 src/saveplay.c:1484
 msgid "selection"
 msgstr ""
 
-#: src/interface.c:2092
+#: src/interface.c:1956
 msgid "LiVES: - File Comments (optional)"
 msgstr ""
 
-#: src/interface.c:2107
+#: src/interface.c:1971
 msgid "Title/Name : "
 msgstr ""
 
-#: src/interface.c:2114
+#: src/interface.c:1978
 msgid "Author/Artist : "
 msgstr ""
 
-#: src/interface.c:2121
+#: src/interface.c:1985
 msgid "Comments : "
 msgstr ""
 
-#: src/interface.c:2151
+#: src/interface.c:2015
 msgid "_Options"
 msgstr ""
 
-#: src/interface.c:2158
+#: src/interface.c:2022
 msgid "Save _subtitles to file"
 msgstr ""
 
-#: src/interface.c:2170
+#: src/interface.c:2033
 msgid "Subtitle file"
 msgstr ""
 
-#: src/interface.c:2172
+#: src/interface.c:2035
 msgid "Browse..."
 msgstr ""
 
-#: src/interface.c:2255
+#: src/interface.c:2132
 msgid "LiVES: - choose a device"
 msgstr ""
 
-#: src/interface.c:2259
+#: src/interface.c:2135
 msgid "LiVES: - choose a directory"
 msgstr ""
 
-#: src/interface.c:2262
+#: src/interface.c:2137
 msgid "LiVES: - choose a file"
 msgstr ""
 
-#: src/interface.c:2445
+#: src/interface.c:2381
 msgid "LiVES: - Cancel/Discard/Save"
 msgstr ""
 
-#: src/interface.c:2460
+#: src/interface.c:2397
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has not been saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:2463
+#: src/interface.c:2400
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has been changed since the last save.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:2467
+#: src/interface.c:2404
 msgid ""
 "You are about to exit LiVES.\n"
 "The current clip set can be saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:2468
+#: src/interface.c:2405
 msgid ""
 "The current clip set has not been saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:2472
+#: src/interface.c:2408
 msgid ""
 "The current layout has not been saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:2475
+#: src/interface.c:2410
 msgid ""
 "The current layout has *not* been changed since it was last saved.\n"
 "What would you like to do ?\n"
 msgstr ""
 
-#: src/interface.c:2480
+#: src/interface.c:2415
 msgid ""
 "The current layout contains generated frames and cannot be retained.\n"
 "You may wish to render it before exiting multitrack mode.\n"
 msgstr ""
 
-#: src/interface.c:2483
+#: src/interface.c:2418
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout contains generated frames and cannot be retained.\n"
 "What do you wish to do ?"
 msgstr ""
 
-#: src/interface.c:2496
+#: src/interface.c:2431
 msgid "Clip set _name"
 msgstr ""
 
-#: src/interface.c:2502
+#: src/interface.c:2437
 msgid "_Auto reload next time"
 msgstr ""
 
-#: src/interface.c:2538 src/interface.c:2547
+#: src/interface.c:2473 src/interface.c:2482
 msgid "_Wipe layout"
 msgstr ""
 
-#: src/interface.c:2539
+#: src/interface.c:2474
 msgid "_Ignore changes"
 msgstr ""
 
-#: src/interface.c:2540
+#: src/interface.c:2475
 msgid "_Delete clip set"
 msgstr ""
 
-#: src/interface.c:2541
+#: src/interface.c:2476
 msgid "_Delete layout"
 msgstr ""
 
-#: src/interface.c:2545
+#: src/interface.c:2480
 msgid "_Save layout"
 msgstr ""
 
-#: src/interface.c:2546
+#: src/interface.c:2481
 msgid "_Save clip set"
 msgstr ""
 
-#: src/interface.c:2565
+#: src/interface.c:2502
 msgid ""
 "\n"
 "LiVES has detected a multitrack layout from a previous session.\n"
 "Would you like to try and recover it ?\n"
 msgstr ""
 
-#: src/interface.c:2589
+#: src/interface.c:2528
 msgid "LiVES: - Disk Recovery Options"
 msgstr ""
 
-#: src/interface.c:2608
+#: src/interface.c:2549
 msgid "Delete _Orphaned Clips"
 msgstr ""
 
-#: src/interface.c:2609
+#: src/interface.c:2550
 msgid "Delete any clips which are not currently loaded or part of a set"
 msgstr ""
 
-#: src/interface.c:2622
+#: src/interface.c:2564
 msgid "Clear _Backup Files from Closed Clips"
 msgstr ""
 
-#: src/interface.c:2633
+#: src/interface.c:2575
 msgid "Remove Sets which have _Layouts but no Clips"
 msgstr ""
 
-#: src/interface.c:2644
+#: src/interface.c:2586
 msgid "_Reset to Defaults"
 msgstr ""
 
-#: src/interface.c:2651
+#: src/interface.c:2593
 msgid "_Accept"
 msgstr ""
 
-#: src/callbacks.c:198
+#: src/callbacks.c:208
 #, c-format
 msgid "Saving as set %s..."
 msgstr ""
 
-#: src/callbacks.c:833
+#: src/callbacks.c:852
 msgid "Please enter the name of the file to save the clip as.\n"
 msgstr ""
 
-#: src/callbacks.c:841
+#: src/callbacks.c:860
 msgid "Please enter a valid URL for the download.\n"
 msgstr ""
 
-#: src/callbacks.c:867
+#: src/callbacks.c:886
 #, c-format
 msgid "Downloading %s to %s..."
 msgstr ""
 
-#: src/callbacks.c:895
+#: src/callbacks.c:912
 msgid "Downloading clip"
 msgstr ""
 
-#: src/callbacks.c:933
+#: src/callbacks.c:950
 msgid ""
 "\n"
 "LiVES was unable to download the clip.\n"
@@ -1706,17 +1700,17 @@
 "the latest youtube-dl installed.\n"
 msgstr ""
 
-#: src/callbacks.c:1114 src/callbacks.c:1149
+#: src/callbacks.c:1131 src/callbacks.c:1166
 msgid "This file"
 msgstr ""
 
-#: src/callbacks.c:1115
+#: src/callbacks.c:1132
 msgid ""
 ",\n"
 " - including the current layout - "
 msgstr ""
 
-#: src/callbacks.c:1117
+#: src/callbacks.c:1134
 #, c-format
 msgid ""
 "\n"
@@ -1726,7 +1720,7 @@
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1119
+#: src/callbacks.c:1136
 #, c-format
 msgid ""
 "\n"
@@ -1736,20 +1730,20 @@
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1150
+#: src/callbacks.c:1167
 msgid ""
 "Changes made to this clip have not been saved or backed up.\n"
 "\n"
 "Really close it ?"
 msgstr ""
 
-#: src/callbacks.c:1343
+#: src/callbacks.c:1356
 msgid ""
 "\n"
 "Invalid project file.\n"
 msgstr ""
 
-#: src/callbacks.c:1356
+#: src/callbacks.c:1370
 #, c-format
 msgid ""
 "\n"
@@ -1762,33 +1756,33 @@
 "Once you have done this, you will be able to import the new project.\n"
 msgstr ""
 
-#: src/callbacks.c:1366
+#: src/callbacks.c:1381
 #, c-format
 msgid "Importing the project %s as set %s..."
 msgstr ""
 
-#: src/callbacks.c:1386
+#: src/callbacks.c:1399
 msgid "Importing project"
 msgstr ""
 
-#: src/callbacks.c:1472
+#: src/callbacks.c:1481
 #, c-format
 msgid "Exporting project %s..."
 msgstr ""
 
-#: src/callbacks.c:1490
+#: src/callbacks.c:1497
 msgid "Exporting project"
 msgstr ""
 
-#: src/callbacks.c:1506
+#: src/callbacks.c:1513
 msgid "Backup as .lv1 file"
 msgstr ""
 
-#: src/callbacks.c:1522
+#: src/callbacks.c:1529
 msgid "Restore .lv1 file"
 msgstr ""
 
-#: src/callbacks.c:1664
+#: src/callbacks.c:1671
 msgid ""
 "\n"
 "\n"
@@ -1796,72 +1790,77 @@
 "Are you sure ?\n"
 msgstr ""
 
-#: src/callbacks.c:1725
+#: src/callbacks.c:1732
 #, c-format
 msgid "Deleting set %s..."
 msgstr ""
 
-#: src/callbacks.c:1727
+#: src/callbacks.c:1734
 msgid "Deleting set..."
 msgstr ""
 
-#: src/callbacks.c:1731
+#: src/callbacks.c:1738
 msgid "Deleting set"
 msgstr ""
 
-#: src/callbacks.c:1739
+#: src/callbacks.c:1746
 #, c-format
 msgid "Set %s was permanently deleted from the disk.\n"
 msgstr ""
 
-#: src/callbacks.c:1787 src/callbacks.c:11764
+#: src/callbacks.c:1792 src/callbacks.c:11676
 msgid "Insert Silence"
 msgstr ""
 
-#: src/callbacks.c:1840 src/callbacks.c:1923 src/callbacks.c:2086
+#: src/callbacks.c:1844 src/callbacks.c:1927 src/callbacks.c:2089
 msgid "Undoing"
 msgstr ""
 
-#: src/callbacks.c:1936 src/callbacks.c:2147
+#: src/callbacks.c:1940 src/callbacks.c:2150
 msgid "Restoring audio..."
 msgstr ""
 
-#: src/callbacks.c:1952
+#: src/callbacks.c:1956
 msgid "Clearing frame images"
 msgstr ""
 
-#: src/callbacks.c:1985
+#: src/callbacks.c:1988
 msgid "Deleting excess frames"
 msgstr ""
 
-#: src/callbacks.c:2229
+#: src/callbacks.c:2232
 #, c-format
 msgid "Length of video is now %d frames at %.3f frames per second.\n"
 msgstr ""
 
-#: src/callbacks.c:2233 src/resample.c:683 src/resample.c:2166
+#: src/callbacks.c:2235 src/resample.c:678 src/resample.c:2133
 #, c-format
 msgid "Clipboard was resampled to %d frames.\n"
 msgstr ""
 
-#: src/callbacks.c:2394 src/callbacks.c:2423
+#: src/callbacks.c:2396 src/callbacks.c:2425
 msgid "Redoing"
 msgstr ""
 
-#: src/callbacks.c:2462
+#: src/callbacks.c:2472
 #, c-format
-msgid "Copying frames %d to %d%s to the clipboard..."
+msgid "Copying frames %d to %d (with sound) to the clipboard..."
 msgstr ""
 
-#: src/callbacks.c:2525
+#: src/callbacks.c:2474
+#, c-format
+msgid "Copying frames %d to %d to the clipboard..."
+msgstr ""
+
+#: src/callbacks.c:2526
 msgid "Copying to the clipboard"
 msgstr ""
 
-#: src/callbacks.c:2600
+#: src/callbacks.c:2601
 msgid "Cut"
 msgstr "Кесиш"
 
-#: src/callbacks.c:2641 src/callbacks.c:3068 src/callbacks.c:8026
+#: src/callbacks.c:2641 src/callbacks.c:3063 src/callbacks.c:7631
 msgid "Pulling frames from clipboard"
 msgstr ""
 
@@ -1870,22 +1869,22 @@
 msgid "Pasting %d frames to new clip %s..."
 msgstr ""
 
-#: src/callbacks.c:2678
+#: src/callbacks.c:2676
 msgid "Pasting"
 msgstr ""
 
-#: src/callbacks.c:2694
+#: src/callbacks.c:2692
 msgid "...added audio..."
 msgstr ""
 
-#: src/callbacks.c:2778
+#: src/callbacks.c:2775
 msgid ""
 "This operation requires resizing or converting of frames.\n"
 "Please install 'convert' from the Image-magick package, and then restart "
 "LiVES.\n"
 msgstr ""
 
-#: src/callbacks.c:2795
+#: src/callbacks.c:2793
 msgid ""
 "\n"
 "\n"
@@ -1894,31 +1893,31 @@
 "the 'Trim Audio' function from the Audio menu."
 msgstr ""
 
-#: src/callbacks.c:2819
+#: src/callbacks.c:2817
 msgid ""
 "LiVES cannot insert because the audio rates do not match.\n"
 "Please install 'sox', and try again."
 msgstr ""
 
-#: src/callbacks.c:2838
+#: src/callbacks.c:2835
 msgid ""
 "\n"
 "Insertion will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:2888 src/callbacks.c:11692
+#: src/callbacks.c:2883 src/callbacks.c:11606
 msgid ""
 "\n"
 "Insertion will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:2996 src/callbacks.c:3025
+#: src/callbacks.c:2987 src/callbacks.c:3016
 msgid "Resampling clipboard audio"
 msgstr ""
 
-#: src/callbacks.c:3041
+#: src/callbacks.c:3032
 msgid ""
 "\n"
 "\n"
@@ -1926,7 +1925,7 @@
 "Clipboard audio has been erased.\n"
 msgstr ""
 
-#: src/callbacks.c:3055
+#: src/callbacks.c:3045
 msgid ""
 "\n"
 "\n"
@@ -1935,86 +1934,86 @@
 "using unchanged audio ?\n"
 msgstr ""
 
-#: src/callbacks.c:3137 src/callbacks.c:3311
+#: src/callbacks.c:3132 src/callbacks.c:3299
 #, c-format
 msgid "Inserting %d%s frames from the clipboard..."
 msgstr ""
 
-#: src/callbacks.c:3162 src/callbacks.c:3236 src/callbacks.c:3339
+#: src/callbacks.c:3155 src/callbacks.c:3224 src/callbacks.c:3325
 msgid "Inserting"
 msgstr ""
 
-#: src/callbacks.c:3193
+#: src/callbacks.c:3187
 #, c-format
 msgid "Inserting %d times from the clipboard%s..."
 msgstr ""
 
-#: src/callbacks.c:3200
+#: src/callbacks.c:3191
 #, c-format
 msgid "Inserting %d frames from the clipboard%s..."
 msgstr ""
 
-#: src/callbacks.c:3418
+#: src/callbacks.c:3404
 msgid "Insert"
 msgstr "тиқ"
 
-#: src/callbacks.c:3486
+#: src/callbacks.c:3471
 msgid ""
 "\n"
 "Deleting all frames will close this file.\n"
 "Are you sure ?"
 msgstr ""
 
-#: src/callbacks.c:3495
+#: src/callbacks.c:3480
 msgid ""
 "\n"
 "Deletion will cause missing frames in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3515 src/callbacks.c:10920 src/callbacks.c:11162
-#: src/callbacks.c:11228
+#: src/callbacks.c:3500 src/callbacks.c:10851 src/callbacks.c:11087
+#: src/callbacks.c:11152
 msgid ""
 "\n"
 "Deletion will cause missing audio in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3534
+#: src/callbacks.c:3519
 msgid ""
 "\n"
 "Deletion will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3553 src/callbacks.c:11210
+#: src/callbacks.c:3538 src/callbacks.c:11134
 msgid ""
 "\n"
 "Deletion will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/callbacks.c:3611
+#: src/callbacks.c:3597
 #, c-format
 msgid "Deleting frames %d to %d%s..."
 msgstr ""
 
-#: src/callbacks.c:3636
+#: src/callbacks.c:3619
 msgid "Deleting"
 msgstr "Ўчирилмоқда"
 
-#: src/callbacks.c:3717
+#: src/callbacks.c:3699
 msgid "Delete"
 msgstr "Olib tashlash"
 
-#: src/callbacks.c:3738
+#: src/callbacks.c:3717
 msgid ""
 "\n"
 "\n"
 "Selection is locked.\n"
 msgstr ""
 
-#: src/callbacks.c:4092
+#: src/callbacks.c:4056
 msgid ""
 "Ready to record. Use 'control' and cursor keys during playback to record "
 "your performance.\n"
@@ -2022,11 +2021,11 @@
 "play.)\n"
 msgstr ""
 
-#: src/callbacks.c:4098
+#: src/callbacks.c:4061
 msgid "Record cancelled.\n"
 msgstr ""
 
-#: src/callbacks.c:4237
+#: src/callbacks.c:4197
 #, c-format
 msgid ""
 "\n"
@@ -2035,7 +2034,7 @@
 "%s\n"
 msgstr ""
 
-#: src/callbacks.c:4241
+#: src/callbacks.c:4200
 #, c-format
 msgid ""
 "\n"
@@ -2044,7 +2043,7 @@
 "The plugin may be broken or not installed correctly."
 msgstr ""
 
-#: src/callbacks.c:4571
+#: src/callbacks.c:4532
 #, c-format
 msgid ""
 "Saving the set will cause copies of all loaded clips to remain on the disk"
@@ -2053,22 +2052,22 @@
 "Please press 'Cancel' if that is not what you want.\n"
 msgstr ""
 
-#: src/callbacks.c:4654
+#: src/callbacks.c:4617
 #, c-format
 msgid "Saving set %s"
 msgstr ""
 
-#: src/callbacks.c:5005
+#: src/callbacks.c:4964
 #, c-format
 msgid "Loading clips from set %s"
 msgstr ""
 
-#: src/callbacks.c:5093
+#: src/callbacks.c:5051
 #, c-format
 msgid "%d clips and %d layouts were recovered from set (%s).\n"
 msgstr ""
 
-#: src/callbacks.c:5312
+#: src/callbacks.c:5259
 msgid ""
 "LiVES will attempt to recover some disk space.\n"
 "You should ONLY run this if you have no other copies of LiVES running on "
@@ -2076,24 +2075,24 @@
 "Click OK to proceed.\n"
 msgstr ""
 
-#: src/callbacks.c:5317
+#: src/callbacks.c:5264
 msgid "Cleaning up disk space..."
 msgstr ""
 
-#: src/callbacks.c:5387
+#: src/callbacks.c:5334
 msgid "Recovering disk space"
 msgstr ""
 
-#: src/callbacks.c:5439
+#: src/callbacks.c:5386
 #, c-format
 msgid "%s of disk space was recovered.\n"
 msgstr ""
 
-#: src/callbacks.c:5482
+#: src/callbacks.c:5428
 msgid "Resetting frame rates and frame values..."
 msgstr ""
 
-#: src/callbacks.c:5523
+#: src/callbacks.c:5469
 #, c-format
 msgid ""
 "\n"
@@ -2101,68 +2100,68 @@
 "Internal: %s (%d bpp) / %s\n"
 msgstr ""
 
-#: src/callbacks.c:5525
+#: src/callbacks.c:5471
 msgid "buffered"
 msgstr ""
 
-#: src/callbacks.c:5538 src/callbacks.c:5557 src/callbacks.c:5575
-#: src/callbacks.c:5609
+#: src/callbacks.c:5484 src/callbacks.c:5502 src/callbacks.c:5518
+#: src/callbacks.c:5551
 msgid ""
 "\n"
 "  Opening..."
 msgstr ""
 
-#: src/callbacks.c:5545
+#: src/callbacks.c:5490
 #, c-format
 msgid ""
 "\n"
 "(%d virtual)"
 msgstr ""
 
-#: src/callbacks.c:5548
+#: src/callbacks.c:5493
 #, c-format
 msgid ""
 "\n"
 "(%d decoded)"
 msgstr ""
 
-#: src/callbacks.c:5560 src/callbacks.c:5578 src/callbacks.c:5612
+#: src/callbacks.c:5504 src/callbacks.c:5520 src/callbacks.c:5553
 #, c-format
 msgid ""
 "\n"
 "  %.2f sec."
 msgstr ""
 
-#: src/callbacks.c:5569
+#: src/callbacks.c:5512
 msgid ""
 "\n"
 "  Unknown"
 msgstr ""
 
-#: src/callbacks.c:5582 src/callbacks.c:5596
+#: src/callbacks.c:5524 src/callbacks.c:5538
 msgid "unsigned"
 msgstr ""
 
-#: src/callbacks.c:5583 src/callbacks.c:5597
+#: src/callbacks.c:5525 src/callbacks.c:5539
 msgid "signed"
 msgstr ""
 
-#: src/callbacks.c:5585 src/callbacks.c:5599
+#: src/callbacks.c:5527 src/callbacks.c:5541
 msgid "big-endian"
 msgstr ""
 
-#: src/callbacks.c:5586 src/callbacks.c:5600
+#: src/callbacks.c:5528 src/callbacks.c:5542
 msgid "little-endian"
 msgstr ""
 
-#: src/callbacks.c:5588 src/callbacks.c:5602
+#: src/callbacks.c:5530 src/callbacks.c:5544
 #, c-format
 msgid ""
 "  %d Hz %d bit\n"
 "%s %s"
 msgstr ""
 
-#: src/callbacks.c:5707
+#: src/callbacks.c:5647
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -2179,22 +2178,22 @@
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA.\n"
 msgstr ""
 
-#: src/callbacks.c:5721
+#: src/callbacks.c:5661
 msgid "A video editor and VJ program."
 msgstr ""
 
-#: src/callbacks.c:5722
+#: src/callbacks.c:5662
 msgid "About LiVES"
 msgstr ""
 
-#: src/callbacks.c:5724
+#: src/callbacks.c:5664
 msgid "translator_credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Akmal Xushvaqov https://launchpad.net/~uzadmin\n"
 "  Guybrush88 https://launchpad.net/~guybrush"
 
-#: src/callbacks.c:5758
+#: src/callbacks.c:5699
 #, c-format
 msgid ""
 "LiVES Version %s\n"
@@ -2208,14 +2207,14 @@
 "Homepage: http://lives.sourceforge.net"
 msgstr ""
 
-#: src/callbacks.c:6037
+#: src/callbacks.c:5996
 msgid ""
 "\n"
 "\n"
 "You need to install mplayer or mplayer2 to be able to preview this file.\n"
 msgstr ""
 
-#: src/callbacks.c:6040
+#: src/callbacks.c:5998
 msgid ""
 "\n"
 "\n"
@@ -2223,215 +2222,206 @@
 "this file.\n"
 msgstr ""
 
-#: src/callbacks.c:6423 src/callbacks.c:8289
-msgid ""
-"\n"
-"Loading new audio may cause missing audio in some multitrack layouts.\n"
-"Are you sure you wish to continue ?\n"
-"."
-msgstr ""
-
-#: src/callbacks.c:6523
-#, c-format
-msgid "Opening audio %s, type %s..."
-msgstr ""
-
-#: src/callbacks.c:6556 src/saveplay.c:480
-msgid "Opening audio"
-msgstr ""
-
-#: src/callbacks.c:6565 src/callbacks.c:6612 src/callbacks.c:8387
-#: src/callbacks.c:8429 src/callbacks.c:8472 src/callbacks.c:10846
-msgid "Cancelling"
-msgstr ""
-
-#: src/callbacks.c:6660 src/callbacks.c:8514 src/callbacks.c:10876
-#: src/callbacks.c:11563
-msgid "Committing audio"
-msgstr ""
-
-#: src/callbacks.c:6672 src/callbacks.c:8546
-msgid "New Audio"
-msgstr ""
-
-#: src/callbacks.c:6779
+#: src/callbacks.c:6459
 #, c-format
 msgid ""
 "Text was saved as\n"
 "%s\n"
 msgstr ""
 
-#: src/callbacks.c:6951 src/saveplay.c:3618
-#, c-format
-msgid "%d frames are enough !\n"
-msgstr ""
-
-#: src/callbacks.c:7050
+#: src/callbacks.c:6706
 msgid "LiVES: - Encoder debug output"
 msgstr ""
 
-#: src/callbacks.c:7087 src/gui.c:1922
+#: src/callbacks.c:6743 src/gui.c:1921
 msgid "Fullscreen playback (f)"
 msgstr ""
 
-#: src/callbacks.c:7089
+#: src/callbacks.c:6744
 msgid "Fullscreen playback off (f)"
 msgstr ""
 
-#: src/callbacks.c:7188 src/callbacks.c:7336 src/callbacks.c:7664
-#: src/callbacks.c:7681 src/gui.c:3712 src/saveplay.c:2467 src/saveplay.c:2501
-#: src/saveplay.c:3115 src/saveplay.c:3220 src/saveplay.c:3239
-#: src/multitrack.c:9340 src/multitrack.c:11060
+#: src/callbacks.c:6841 src/callbacks.c:6983 src/callbacks.c:7283
+#: src/callbacks.c:7298 src/gui.c:3838 src/saveplay.c:2442 src/saveplay.c:2475
+#: src/saveplay.c:3074 src/saveplay.c:3178 src/saveplay.c:3197
+#: src/multitrack.c:9526 src/multitrack.c:11288
 #, c-format
 msgid " (%d %% scale)"
 msgstr ""
 
-#: src/callbacks.c:7190 src/callbacks.c:7338 src/callbacks.c:7666
-#: src/gui.c:3716 src/saveplay.c:2469 src/saveplay.c:2503
+#: src/callbacks.c:6843 src/callbacks.c:6985 src/callbacks.c:7285
+#: src/gui.c:3842 src/saveplay.c:2444 src/saveplay.c:2477
 #, c-format
 msgid "LiVES: - Play Window%s"
 msgstr ""
 
-#: src/callbacks.c:7302 src/gui.c:1907
+#: src/callbacks.c:6950 src/gui.c:1906
 msgid "Double size (d)"
 msgstr ""
 
-#: src/callbacks.c:7309
+#: src/callbacks.c:6956
 msgid "Single size (d)"
 msgstr ""
 
-#: src/callbacks.c:7442 src/callbacks.c:7443
+#: src/callbacks.c:7087 src/callbacks.c:7088
 msgid "Hide the play window (s)"
 msgstr ""
 
-#: src/callbacks.c:7452 src/gui.c:1746
+#: src/callbacks.c:7096 src/gui.c:1744
 msgid "Show the play window (s)"
 msgstr ""
 
-#: src/callbacks.c:7453 src/gui.c:1896
+#: src/callbacks.c:7097 src/gui.c:1895
 msgid "Play in separate window (s)"
 msgstr ""
 
-#: src/callbacks.c:7535 src/gui.c:4060 src/saveplay.c:2498
+#: src/callbacks.c:7175 src/gui.c:4169 src/saveplay.c:2472
 msgid "LiVES: - Streaming"
 msgstr ""
 
-#: src/callbacks.c:7778
+#: src/callbacks.c:7388
 msgid "Switch continuous looping off (o)"
 msgstr ""
 
-#: src/callbacks.c:7785 src/gui.c:1795
+#: src/callbacks.c:7394 src/gui.c:1793
 msgid "Switch continuous looping on (o)"
 msgstr ""
 
-#: src/callbacks.c:7837
+#: src/callbacks.c:7444
 #, c-format
 msgid "Audio volume (%.2f)"
 msgstr ""
 
-#: src/callbacks.c:7876 src/callbacks.c:7877 src/gui.c:3640
+#: src/callbacks.c:7483 src/callbacks.c:7484 src/gui.c:3766
 msgid "Unmute the audio (z)"
 msgstr ""
 
-#: src/callbacks.c:7888 src/callbacks.c:7889 src/gui.c:1808 src/gui.c:3639
+#: src/callbacks.c:7494 src/callbacks.c:7495 src/gui.c:1806 src/gui.c:3765
 msgid "Mute the audio (z)"
 msgstr ""
 
-#: src/callbacks.c:8038
+#: src/callbacks.c:7643
 msgid "Reversing clipboard..."
 msgstr ""
 
-#: src/callbacks.c:8052
+#: src/callbacks.c:7657
 msgid "Reversing clipboard"
 msgstr ""
 
-#: src/callbacks.c:8084
+#: src/callbacks.c:7689
 msgid "LiVES: Load subtitles from..."
 msgstr ""
 
-#: src/callbacks.c:8151 src/saveplay.c:970
+#: src/callbacks.c:7753 src/saveplay.c:956
 #, c-format
 msgid "Loaded subtitle file: %s\n"
 msgstr ""
 
-#: src/callbacks.c:8220
+#: src/callbacks.c:7821
 msgid "Subtitles were erased.\n"
 msgstr ""
 
-#: src/callbacks.c:8239
+#: src/callbacks.c:7843
 msgid "LiVES: - Select Audio File"
 msgstr ""
 
-#: src/callbacks.c:8250
+#: src/callbacks.c:7878 src/callbacks.c:8232
+msgid ""
+"\n"
+"Loading new audio may cause missing audio in some multitrack layouts.\n"
+"Are you sure you wish to continue ?\n"
+"."
+msgstr ""
+
+#: src/callbacks.c:7989
+#, c-format
+msgid "Opening audio %s, type %s..."
+msgstr ""
+
+#: src/callbacks.c:8023 src/saveplay.c:477
+msgid "Opening audio"
+msgstr ""
+
+#: src/callbacks.c:8032 src/callbacks.c:8083 src/callbacks.c:8327
+#: src/callbacks.c:8369 src/callbacks.c:8412 src/callbacks.c:10766
+msgid "Cancelling"
+msgstr ""
+
+#: src/callbacks.c:8137 src/callbacks.c:8454 src/callbacks.c:10803
+#: src/callbacks.c:11477
+msgid "Committing audio"
+msgstr ""
+
+#: src/callbacks.c:8153 src/callbacks.c:8484
+msgid "New Audio"
+msgstr ""
+
+#: src/callbacks.c:8194
 msgid "Please set your CD play device in Tools | Preferences | Misc\n"
 msgstr ""
 
-#: src/callbacks.c:8321
+#: src/callbacks.c:8264
 #, c-format
 msgid "Opening CD track %d from %s..."
 msgstr ""
 
-#: src/callbacks.c:8326
+#: src/callbacks.c:8267
 #, c-format
 msgid "CD track %d"
 msgstr ""
 
-#: src/callbacks.c:8373
+#: src/callbacks.c:8313
 msgid "Opening CD track..."
 msgstr ""
 
-#: src/callbacks.c:8415 src/callbacks.c:8461
+#: src/callbacks.c:8355 src/callbacks.c:8401
 msgid "Error loading CD track\n"
 msgstr ""
 
-#: src/callbacks.c:8584
+#: src/callbacks.c:8518
 msgid "layout errors"
 msgstr ""
 
-#: src/callbacks.c:8595
+#: src/callbacks.c:8529
 msgid "Close _Window"
 msgstr ""
 
-#: src/callbacks.c:8606
+#: src/callbacks.c:8540
 msgid "Clear _Errors"
 msgstr ""
 
-#: src/callbacks.c:8617
+#: src/callbacks.c:8551
 msgid "_Delete affected layouts"
 msgstr ""
 
-#: src/callbacks.c:9343 src/callbacks.c:9388
+#: src/callbacks.c:9253 src/callbacks.c:9298
 msgid "Resume"
 msgstr "Давом этиш"
 
-#: src/callbacks.c:9344
+#: src/callbacks.c:9254
 msgid ""
 "\n"
 "Paused\n"
 "(click Resume to continue processing)"
 msgstr ""
 
-#: src/callbacks.c:9345 src/callbacks.c:9406
+#: src/callbacks.c:9255 src/callbacks.c:9315
 msgid "paused..."
 msgstr ""
 
-#: src/callbacks.c:9372 src/callbacks.c:9418
-msgid "Pause"
-msgstr "Вақтинча тўхтатиш"
-
-#: src/callbacks.c:9374 src/callbacks.c:9421
+#: src/callbacks.c:9284 src/callbacks.c:9333
 msgid "resumed..."
 msgstr ""
 
-#: src/callbacks.c:9393
+#: src/callbacks.c:9303
 msgid "Keep"
 msgstr "Шундай қолдириш"
 
-#: src/callbacks.c:9396
+#: src/callbacks.c:9305
 msgid "Enough"
 msgstr ""
 
-#: src/callbacks.c:9401
+#: src/callbacks.c:9310
 #, c-format
 msgid ""
 "\n"
@@ -2440,28 +2430,28 @@
 "(click Resume to continue processing)"
 msgstr ""
 
-#: src/callbacks.c:9419
+#: src/callbacks.c:9331
 msgid "Cancel"
 msgstr "Бекор қилиш"
 
-#: src/callbacks.c:9558
+#: src/callbacks.c:9478
 msgid "Stop"
 msgstr ""
 
-#: src/callbacks.c:10053 src/multitrack.c:13247
+#: src/callbacks.c:9968 src/multitrack.c:13489
 msgid "LiVES: Selected frame"
 msgstr ""
 
-#: src/callbacks.c:10061
+#: src/callbacks.c:9976
 msgid "_Save frame as..."
 msgstr ""
 
-#: src/callbacks.c:10290
+#: src/callbacks.c:10202
 #, c-format
 msgid "Audio is ahead of video by %.4f secs. at frame %d, with fps %.4f\n"
 msgstr ""
 
-#: src/callbacks.c:10347
+#: src/callbacks.c:10255
 msgid ""
 "\n"
 "\n"
@@ -2470,7 +2460,7 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10353
+#: src/callbacks.c:10261
 msgid ""
 "\n"
 "\n"
@@ -2478,13 +2468,13 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10429 src/callbacks.c:11479
+#: src/callbacks.c:10334 src/callbacks.c:11395
 msgid ""
 "\n"
 "Record time must be greater than 0.\n"
 msgstr ""
 
-#: src/callbacks.c:10440
+#: src/callbacks.c:10346
 msgid ""
 "Capture an External Window:\n"
 "\n"
@@ -2493,17 +2483,17 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10445
+#: src/callbacks.c:10351
 msgid "External window was released.\n"
 msgstr ""
 
-#: src/callbacks.c:10479
+#: src/callbacks.c:10385
 msgid ""
 "Click on a Window to Capture it\n"
 "Press 'q' to stop recording"
 msgstr ""
 
-#: src/callbacks.c:10513
+#: src/callbacks.c:10419
 #, c-format
 msgid ""
 "\n"
@@ -2513,19 +2503,19 @@
 "(Default of %.3f frames per second will be used.)\n"
 msgstr ""
 
-#: src/callbacks.c:10539
+#: src/callbacks.c:10443
 msgid "LiVES was unable to capture this window. Sorry.\n"
 msgstr ""
 
-#: src/callbacks.c:10695
+#: src/callbacks.c:10601
 msgid "Export Selected Audio as..."
 msgstr ""
 
-#: src/callbacks.c:10699
+#: src/callbacks.c:10604
 msgid "Export Audio as..."
 msgstr ""
 
-#: src/callbacks.c:10714
+#: src/callbacks.c:10619
 msgid ""
 "\n"
 "\n"
@@ -2534,1033 +2524,1033 @@
 "rate.\n"
 msgstr ""
 
-#: src/callbacks.c:10720
+#: src/callbacks.c:10625
 #, c-format
 msgid "Exporting audio frames %d to %d as %s..."
 msgstr ""
 
-#: src/callbacks.c:10725
+#: src/callbacks.c:10629
 #, c-format
 msgid "Exporting audio as %s..."
 msgstr ""
 
-#: src/callbacks.c:10751
+#: src/callbacks.c:10655
 msgid "Exporting audio"
 msgstr ""
 
-#: src/callbacks.c:10782
+#: src/callbacks.c:10695
 msgid "LiVES: - Append Audio File"
 msgstr ""
 
-#: src/callbacks.c:10825
+#: src/callbacks.c:10739
 #, c-format
 msgid "Appending audio file %s..."
 msgstr ""
 
-#: src/callbacks.c:10836
+#: src/callbacks.c:10756
 msgid "Appending audio"
 msgstr ""
 
-#: src/callbacks.c:10892
+#: src/callbacks.c:10818
 msgid "Append Audio"
 msgstr ""
 
-#: src/callbacks.c:10952
+#: src/callbacks.c:10883
 #, c-format
 msgid "Padding audio to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10954
+#: src/callbacks.c:10885
 #, c-format
 msgid "Trimming audio from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10973
+#: src/callbacks.c:10904
 msgid "Trimming/Padding audio"
 msgstr ""
 
-#: src/callbacks.c:10981
+#: src/callbacks.c:10912
 msgid "Trim/Pad Audio"
 msgstr ""
 
-#: src/callbacks.c:11055
+#: src/callbacks.c:10982
 msgid "Fading audio in"
 msgstr ""
 
-#: src/callbacks.c:11056
+#: src/callbacks.c:10983
 msgid "Fade audio in"
 msgstr ""
 
-#: src/callbacks.c:11061
+#: src/callbacks.c:10987
 msgid "Fading audio out"
 msgstr ""
 
-#: src/callbacks.c:11062
+#: src/callbacks.c:10988
 msgid "Fade audio out"
 msgstr ""
 
-#: src/callbacks.c:11085
+#: src/callbacks.c:11011
 #, c-format
 msgid "%s over %.1f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11087
+#: src/callbacks.c:11013
 #, c-format
 msgid "%s from time %.2f seconds to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11094
+#: src/callbacks.c:11020
 msgid "Fading audio..."
 msgstr ""
 
-#: src/callbacks.c:11194
+#: src/callbacks.c:11119
 msgid ""
 "\n"
 "Deleting all audio will close this file.\n"
 "Are you sure ?"
 msgstr ""
 
-#: src/callbacks.c:11197
+#: src/callbacks.c:11122
 msgid "Deleting all audio..."
 msgstr ""
 
-#: src/callbacks.c:11203
+#: src/callbacks.c:11127
 #, c-format
 msgid "Deleting audio from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11290
+#: src/callbacks.c:11214
 msgid "Deleting Audio"
 msgstr ""
 
-#: src/callbacks.c:11297
+#: src/callbacks.c:11221
 msgid "Delete Audio"
 msgstr ""
 
-#: src/callbacks.c:11636
+#: src/callbacks.c:11550
 msgid "Record new audio"
 msgstr ""
 
-#: src/callbacks.c:11725
+#: src/callbacks.c:11640
 #, c-format
 msgid "Inserting silence from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11754
+#: src/callbacks.c:11666
 msgid "Inserting Silence"
 msgstr ""
 
-#: src/merge.c:85
+#: src/merge.c:96
 msgid "LiVES: - Merge"
 msgstr ""
 
-#: src/merge.c:102
+#: src/merge.c:113
 #, c-format
 msgid "Merge Clipboard [ %d Frames ]       With Selection [ %d Frames ]"
 msgstr ""
 
-#: src/merge.c:107
+#: src/merge.c:118
 #, c-format
 msgid ""
 "Merge Clipboard [ %d Frames (resampled) ]       With Selection [ %d Frames ]"
 msgstr ""
 
-#: src/merge.c:118
+#: src/merge.c:130
 msgid "Align _Starts"
 msgstr ""
 
-#: src/merge.c:123
+#: src/merge.c:135
 msgid "Align _Ends"
 msgstr ""
 
-#: src/merge.c:134
+#: src/merge.c:146
 msgid "What to do with extra clipboard frames -"
 msgstr ""
 
-#: src/merge.c:137
+#: src/merge.c:149
 msgid "_Insert Frames"
 msgstr ""
 
-#: src/merge.c:143
+#: src/merge.c:155
 msgid "_Drop Frames"
 msgstr ""
 
-#: src/merge.c:149
+#: src/merge.c:160
 msgid "Number of Times to Loop Clipboard"
 msgstr ""
 
-#: src/merge.c:160
+#: src/merge.c:171
 msgid "_Loop Clipboard to Fit Selection"
 msgstr ""
 
-#: src/merge.c:173
+#: src/merge.c:184
 msgid "_Transition Method:"
 msgstr ""
 
-#: src/merge.c:394
+#: src/merge.c:395
 msgid "Merging clipboard with selection..."
 msgstr ""
 
-#: src/merge.c:551
+#: src/merge.c:539
 msgid "Merge done.\n"
 msgstr ""
 
-#: src/gui.c:123
+#: src/gui.c:122
 msgid "_Custom Generators"
 msgstr ""
 
-#: src/gui.c:124
+#: src/gui.c:123
 msgid "_Custom Effects"
 msgstr ""
 
-#: src/gui.c:125
+#: src/gui.c:124
 msgid "Custom _Utilities"
 msgstr ""
 
-#: src/gui.c:352 src/multitrack.c:5964
+#: src/gui.c:351 src/multitrack.c:6143
 msgid "_File"
 msgstr "_Файл"
 
-#: src/gui.c:367 src/multitrack.c:5989
+#: src/gui.c:366 src/multitrack.c:6168
 msgid "_Open File/Directory"
 msgstr ""
 
-#: src/gui.c:373
+#: src/gui.c:372
 msgid "O_pen Part of File..."
 msgstr ""
 
-#: src/gui.c:379 src/gui.c:383 src/multitrack.c:6006 src/multitrack.c:6023
-#: src/multitrack.c:6028
+#: src/gui.c:378 src/gui.c:382 src/multitrack.c:6185 src/multitrack.c:6202
+#: src/multitrack.c:6207
 msgid "Open _Location/Stream..."
 msgstr ""
 
-#: src/gui.c:393 src/multitrack.c:6016
+#: src/gui.c:392 src/multitrack.c:6195
 msgid "Open _Youtube Clip..."
 msgstr ""
 
-#: src/gui.c:404
+#: src/gui.c:403
 msgid "Import from _dvd/vcd..."
 msgstr ""
 
-#: src/gui.c:413
+#: src/gui.c:412
 msgid "Import from _dvd"
 msgstr ""
 
-#: src/gui.c:416
+#: src/gui.c:415
 msgid "Import from _vcd"
 msgstr ""
 
-#: src/gui.c:419
+#: src/gui.c:418
 msgid "_Import from Firewire"
 msgstr ""
 
-#: src/gui.c:428 src/multitrack.c:6086
+#: src/gui.c:427 src/multitrack.c:6265
 msgid "Import from _Firewire Device (dv)"
 msgstr ""
 
-#: src/gui.c:429 src/multitrack.c:6094
+#: src/gui.c:428 src/multitrack.c:6273
 msgid "Import from _Firewire Device (hdv)"
 msgstr ""
 
-#: src/gui.c:457
+#: src/gui.c:456
 msgid "_Add Webcam/TV card..."
 msgstr ""
 
-#: src/gui.c:476
+#: src/gui.c:475
 msgid "Add _Unicap Device"
 msgstr ""
 
-#: src/gui.c:486
+#: src/gui.c:485
 msgid "Add Live _Firewire Device"
 msgstr ""
 
-#: src/gui.c:495
+#: src/gui.c:494
 msgid "Add _TV Device"
 msgstr ""
 
-#: src/gui.c:510 src/multitrack.c:6117
+#: src/gui.c:509 src/multitrack.c:6296
 msgid "_Recent Files..."
 msgstr ""
 
-#: src/gui.c:560 src/multitrack.c:6177
+#: src/gui.c:559 src/multitrack.c:6356
 msgid "_Reload Clip Set..."
 msgstr ""
 
-#: src/gui.c:564 src/multitrack.c:6185
+#: src/gui.c:563 src/multitrack.c:6364
 msgid "Close/Sa_ve All Clips"
 msgstr ""
 
-#: src/gui.c:575
+#: src/gui.c:574
 msgid "_Encode Clip As..."
 msgstr ""
 
-#: src/gui.c:577
+#: src/gui.c:576
 msgid "Encode _Selection As..."
 msgstr ""
 
-#: src/gui.c:584
+#: src/gui.c:583
 msgid "_Close This Clip"
 msgstr ""
 
-#: src/gui.c:595
+#: src/gui.c:594
 msgid "_Backup Clip as .lv1..."
 msgstr ""
 
-#: src/gui.c:604
+#: src/gui.c:603
 msgid "_Restore Clip from .lv1..."
 msgstr ""
 
-#: src/gui.c:615
+#: src/gui.c:614
 msgid "Encode/Load/Backup _with Sound"
 msgstr ""
 
-#: src/gui.c:620
+#: src/gui.c:619
 msgid "Auto load subtitles"
 msgstr ""
 
-#: src/gui.c:628 src/multitrack.c:6224
+#: src/gui.c:627 src/multitrack.c:6403
 msgid "Clean _up Diskspace"
 msgstr ""
 
-#: src/gui.c:636 src/multitrack.c:6257
+#: src/gui.c:635 src/multitrack.c:6436
 msgid "_Edit"
 msgstr "_Таҳрирлаш"
 
-#: src/gui.c:685
+#: src/gui.c:684
 msgid "_MULTITRACK mode"
 msgstr ""
 
-#: src/gui.c:696
+#: src/gui.c:695
 msgid "_Copy Selection"
 msgstr ""
 
-#: src/gui.c:705
+#: src/gui.c:704
 msgid "Cu_t Selection"
 msgstr ""
 
-#: src/gui.c:714
+#: src/gui.c:713
 msgid "_Insert from Clipboard..."
 msgstr ""
 
-#: src/gui.c:730
+#: src/gui.c:729
 msgid "Paste as _New"
 msgstr ""
 
-#: src/gui.c:739
+#: src/gui.c:738
 msgid "_Merge Clipboard with Selection..."
 msgstr ""
 
-#: src/gui.c:746
+#: src/gui.c:745
 msgid "_Delete Selection"
 msgstr ""
 
-#: src/gui.c:764
+#: src/gui.c:763
 msgid "Decouple _Video from Audio"
 msgstr ""
 
-#: src/gui.c:772
+#: src/gui.c:771
 msgid "_Select..."
 msgstr ""
 
-#: src/gui.c:786
+#: src/gui.c:785
 msgid "Select _All Frames"
 msgstr ""
 
-#: src/gui.c:794
+#: src/gui.c:793
 msgid "_Start Frame Only"
 msgstr ""
 
-#: src/gui.c:802
+#: src/gui.c:801
 msgid "_End Frame Only"
 msgstr ""
 
-#: src/gui.c:813
+#: src/gui.c:812
 msgid "Select from _First Frame"
 msgstr ""
 
-#: src/gui.c:817
+#: src/gui.c:816
 msgid "Select to _Last Frame"
 msgstr ""
 
-#: src/gui.c:821
+#: src/gui.c:820
 msgid "Select Last Insertion/_Merge"
 msgstr ""
 
-#: src/gui.c:825
+#: src/gui.c:824
 msgid "Select Last _Effect"
 msgstr ""
 
-#: src/gui.c:829
+#: src/gui.c:828
 msgid "_Invert Selection"
 msgstr "_Тескарисига танлаш"
 
-#: src/gui.c:837
+#: src/gui.c:836
 msgid "_Lock Selection Width"
 msgstr ""
 
-#: src/gui.c:842 src/multitrack.c:6409
+#: src/gui.c:841 src/multitrack.c:6591
 msgid "_Play"
 msgstr ""
 
-#: src/gui.c:854
+#: src/gui.c:853
 msgid "_Play All"
 msgstr ""
 
-#: src/gui.c:869
+#: src/gui.c:868
 msgid "Pla_y Selection"
 msgstr ""
 
-#: src/gui.c:877
+#: src/gui.c:876
 msgid "Play _Clipboard"
 msgstr ""
 
-#: src/gui.c:899 src/multitrack.c:6441
+#: src/gui.c:898 src/multitrack.c:6623
 msgid "_Stop"
 msgstr "_Тўхтатиш"
 
-#: src/gui.c:914 src/multitrack.c:6453
+#: src/gui.c:913 src/multitrack.c:6635
 msgid "Re_wind"
 msgstr ""
 
-#: src/gui.c:946 src/multitrack.c:6471
+#: src/gui.c:945 src/multitrack.c:6653
 msgid "_Full Screen"
 msgstr "_Бутун экранга"
 
-#: src/gui.c:955
+#: src/gui.c:954
 msgid "_Double Size"
 msgstr ""
 
-#: src/gui.c:963 src/multitrack.c:6479
+#: src/gui.c:962 src/multitrack.c:6661
 msgid "Play in _Separate Window"
 msgstr ""
 
-#: src/gui.c:972
+#: src/gui.c:971
 msgid "_Blank Background"
 msgstr ""
 
-#: src/gui.c:979
+#: src/gui.c:978
 msgid "(Auto)_loop Video (to fit audio track)"
 msgstr ""
 
-#: src/gui.c:988 src/multitrack.c:6487
+#: src/gui.c:987 src/multitrack.c:6669
 msgid "L_oop Continuously"
 msgstr ""
 
-#: src/gui.c:997
+#: src/gui.c:996
 msgid "Pin_g Pong Loops"
 msgstr ""
 
-#: src/gui.c:1005 src/multitrack.c:6495
+#: src/gui.c:1004 src/multitrack.c:6677
 msgid "_Mute"
 msgstr ""
 
-#: src/gui.c:1017
+#: src/gui.c:1016
 msgid "Separate Window 'S_ticky' Mode"
 msgstr ""
 
-#: src/gui.c:1025
+#: src/gui.c:1024
 msgid "S_how Frame Counter"
 msgstr ""
 
-#: src/gui.c:1035
+#: src/gui.c:1034
 msgid "Show Subtitles"
 msgstr ""
 
-#: src/gui.c:1045
+#: src/gui.c:1044
 msgid "Letterbox mode"
 msgstr ""
 
-#: src/gui.c:1051 src/multitrack.c:6507
+#: src/gui.c:1050 src/multitrack.c:6689
 msgid "Effect_s"
 msgstr ""
 
-#: src/gui.c:1054
+#: src/gui.c:1053
 msgid "Effects are applied to the current selection."
 msgstr ""
 
-#: src/gui.c:1067
+#: src/gui.c:1066
 msgid "_Run Test Rendered Effect/Tool/Generator..."
 msgstr ""
 
-#: src/gui.c:1072 src/multitrack.c:7123
+#: src/gui.c:1071 src/multitrack.c:7299
 msgid "_Tools"
 msgstr ""
 
-#: src/gui.c:1075
+#: src/gui.c:1074
 msgid "Tools are applied to complete clips."
 msgstr ""
 
-#: src/gui.c:1085
+#: src/gui.c:1084
 msgid "_Reverse Clipboard"
 msgstr ""
 
-#: src/gui.c:1094
+#: src/gui.c:1093
 msgid "_Change Playback/Save Speed..."
 msgstr ""
 
-#: src/gui.c:1099
+#: src/gui.c:1098
 msgid "Resample _Video to New Frame Rate..."
 msgstr ""
 
-#: src/gui.c:1105
+#: src/gui.c:1104
 msgid "_Utilities"
 msgstr ""
 
-#: src/gui.c:1110
+#: src/gui.c:1109
 msgid "Custom _Tools"
 msgstr ""
 
-#: src/gui.c:1116 src/multitrack.c:7149
+#: src/gui.c:1115 src/multitrack.c:7325
 msgid "_Generate"
 msgstr ""
 
-#: src/gui.c:1126
+#: src/gui.c:1125
 msgid "Loading rendered effect plugins..."
 msgstr ""
 
-#: src/gui.c:1139
+#: src/gui.c:1138
 msgid "Load _Subtitles from File..."
 msgstr ""
 
-#: src/gui.c:1144
+#: src/gui.c:1143
 msgid "Erase subtitles"
 msgstr ""
 
-#: src/gui.c:1152 src/multitrack.c:7158
+#: src/gui.c:1151 src/multitrack.c:7334
 msgid "Capture _External Window... "
 msgstr ""
 
-#: src/gui.c:1159 src/multitrack.c:7173
+#: src/gui.c:1158 src/multitrack.c:7349
 msgid "_Preferences..."
 msgstr ""
 
-#: src/gui.c:1172
+#: src/gui.c:1171
 msgid "_Audio"
 msgstr ""
 
-#: src/gui.c:1184
+#: src/gui.c:1183
 msgid "Load _New Audio for Clip..."
 msgstr ""
 
-#: src/gui.c:1190
+#: src/gui.c:1189
 msgid "Load _CD Track..."
 msgstr ""
 
-#: src/gui.c:1191
+#: src/gui.c:1190
 msgid "E_ject CD"
 msgstr ""
 
-#: src/gui.c:1205
+#: src/gui.c:1204
 msgid "Record E_xternal Audio..."
 msgstr ""
 
-#: src/gui.c:1218
+#: src/gui.c:1217
 msgid "to New _Clip..."
 msgstr ""
 
-#: src/gui.c:1222
+#: src/gui.c:1221
 msgid "to _Selection"
 msgstr ""
 
-#: src/gui.c:1230
+#: src/gui.c:1229
 msgid "Fade Audio _In..."
 msgstr ""
 
-#: src/gui.c:1234
+#: src/gui.c:1233
 msgid "Fade Audio _Out..."
 msgstr ""
 
-#: src/gui.c:1244
+#: src/gui.c:1243
 msgid "_Export Audio..."
 msgstr ""
 
-#: src/gui.c:1257
+#: src/gui.c:1256
 msgid "Export _Selected Audio..."
 msgstr ""
 
-#: src/gui.c:1261
+#: src/gui.c:1260
 msgid "Export _All Audio..."
 msgstr ""
 
-#: src/gui.c:1265
+#: src/gui.c:1264
 msgid "_Append Audio..."
 msgstr ""
 
-#: src/gui.c:1270
+#: src/gui.c:1269
 msgid "_Trim/Pad Audio..."
 msgstr ""
 
-#: src/gui.c:1283
+#: src/gui.c:1282
 msgid "Trim/Pad Audio to _Selection"
 msgstr ""
 
-#: src/gui.c:1288
+#: src/gui.c:1287
 msgid "Trim/Pad Audio from Beginning to _Play Start"
 msgstr ""
 
-#: src/gui.c:1293
+#: src/gui.c:1292
 msgid "_Delete Audio..."
 msgstr ""
 
-#: src/gui.c:1306
+#: src/gui.c:1305
 msgid "Delete _Selected Audio"
 msgstr ""
 
-#: src/gui.c:1310
+#: src/gui.c:1309
 msgid "Delete _All Audio"
 msgstr ""
 
-#: src/gui.c:1314
+#: src/gui.c:1313
 msgid "Insert _Silence in Selection"
 msgstr ""
 
-#: src/gui.c:1319
+#: src/gui.c:1318
 msgid "_Resample Audio..."
 msgstr ""
 
-#: src/gui.c:1324
+#: src/gui.c:1323
 msgid "_Info"
 msgstr ""
 
-#: src/gui.c:1336
+#: src/gui.c:1335
 msgid "Show Clip _Info"
 msgstr ""
 
-#: src/gui.c:1344
+#: src/gui.c:1343
 msgid "Show/_Edit File Comments"
 msgstr ""
 
-#: src/gui.c:1349
+#: src/gui.c:1348
 msgid "Show _Clipboard Info"
 msgstr ""
 
-#: src/gui.c:1360 src/multitrack.c:7286
+#: src/gui.c:1359 src/multitrack.c:7462
 msgid "Show _Messages"
 msgstr ""
 
-#: src/gui.c:1364 src/multitrack.c:7365
+#: src/gui.c:1363 src/multitrack.c:7541
 msgid "Show _Layout Errors"
 msgstr ""
 
-#: src/gui.c:1369 src/multitrack.c:7263
+#: src/gui.c:1368 src/multitrack.c:7439
 msgid "_Clips"
 msgstr ""
 
-#: src/gui.c:1381
+#: src/gui.c:1380
 msgid "_Rename Current Clip in Menu..."
 msgstr ""
 
-#: src/gui.c:1399
+#: src/gui.c:1398
 msgid "A_dvanced"
 msgstr ""
 
-#: src/gui.c:1412
+#: src/gui.c:1411
 msgid "_RFX Effects/Tools/Utilities"
 msgstr ""
 
-#: src/gui.c:1424
+#: src/gui.c:1423
 msgid "_New Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1428
+#: src/gui.c:1427
 msgid "_Copy RFX Script to Test..."
 msgstr ""
 
-#: src/gui.c:1432
+#: src/gui.c:1431
 msgid "_Edit Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1436
+#: src/gui.c:1435
 msgid "Rena_me Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1440
+#: src/gui.c:1439
 msgid "_Delete Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1450
+#: src/gui.c:1449
 msgid "_Promote Test Rendered Effect/Tool/Generator..."
 msgstr ""
 
-#: src/gui.c:1457
+#: src/gui.c:1456
 msgid "_Import Custom RFX script..."
 msgstr ""
 
-#: src/gui.c:1461
+#: src/gui.c:1460
 msgid "E_xport Custom RFX script..."
 msgstr ""
 
-#: src/gui.c:1465
+#: src/gui.c:1464
 msgid "De_lete Custom RFX Script..."
 msgstr ""
 
-#: src/gui.c:1472
+#: src/gui.c:1471
 msgid "Re_build all RFX plugins"
 msgstr ""
 
-#: src/gui.c:1501
+#: src/gui.c:1498
 msgid "Receive _LiVES stream from..."
 msgstr ""
 
-#: src/gui.c:1506
+#: src/gui.c:1503
 msgid "_Send LiVES stream to..."
 msgstr ""
 
-#: src/gui.c:1515
+#: src/gui.c:1512
 #, c-format
 msgid "Open _yuv4mpeg stream on %sstream.yuv..."
 msgstr ""
 
-#: src/gui.c:1536
+#: src/gui.c:1534
 msgid "_Import Project (.lv2)..."
 msgstr ""
 
-#: src/gui.c:1540
+#: src/gui.c:1538
 msgid "E_xport Project (.lv2)..."
 msgstr ""
 
-#: src/gui.c:1545
+#: src/gui.c:1543
 msgid "_VJ"
 msgstr ""
 
-#: src/gui.c:1557
+#: src/gui.c:1555
 msgid "Real Time _Effect Mapping"
 msgstr ""
 
-#: src/gui.c:1563
+#: src/gui.c:1561
 msgid "Bind real time effects to ctrl-number keys."
 msgstr ""
 
-#: src/gui.c:1565
+#: src/gui.c:1563
 msgid "Set Real Time Effect _Defaults"
 msgstr ""
 
-#: src/gui.c:1567
+#: src/gui.c:1565
 msgid "Set default parameter values for real time effects."
 msgstr ""
 
-#: src/gui.c:1580
+#: src/gui.c:1578
 msgid "Save Real Time Effect _Defaults"
 msgstr ""
 
-#: src/gui.c:1583
+#: src/gui.c:1581
 msgid ""
 "Save real time effect defaults so they will be restored each time you use "
 "LiVES."
 msgstr ""
 
-#: src/gui.c:1589
+#: src/gui.c:1587
 msgid "_Reset all playback speeds and positions"
 msgstr ""
 
-#: src/gui.c:1592
+#: src/gui.c:1590
 msgid ""
 "Reset all playback positions to frame 1, and reset all playback frame rates."
 msgstr ""
 
-#: src/gui.c:1594
+#: src/gui.c:1592
 msgid "_MIDI/joystick interface"
 msgstr ""
 
-#: src/gui.c:1609
+#: src/gui.c:1607
 msgid "_MIDI/joystick learner..."
 msgstr ""
 
-#: src/gui.c:1614
+#: src/gui.c:1612
 msgid "_Save device mapping..."
 msgstr ""
 
-#: src/gui.c:1620
+#: src/gui.c:1618
 msgid "_Load device mapping..."
 msgstr ""
 
-#: src/gui.c:1628
+#: src/gui.c:1626
 msgid "Show VJ _Keys"
 msgstr ""
 
-#: src/gui.c:1632
+#: src/gui.c:1630
 msgid "To_ys"
 msgstr ""
 
-#: src/gui.c:1644
+#: src/gui.c:1642
 msgid "_None"
 msgstr "_Йўқ"
 
-#: src/gui.c:1652
+#: src/gui.c:1650
 msgid "_Autolives"
 msgstr ""
 
-#: src/gui.c:1657
+#: src/gui.c:1655
 msgid "_Mad Frames"
 msgstr ""
 
-#: src/gui.c:1662
+#: src/gui.c:1660
 msgid "_LiVES TV (broadband)"
 msgstr ""
 
-#: src/gui.c:1672 src/multitrack.c:7387
+#: src/gui.c:1670 src/multitrack.c:7563
 msgid "_Help"
 msgstr "_Ёрдам"
 
-#: src/gui.c:1684 src/multitrack.c:7407
+#: src/gui.c:1682 src/multitrack.c:7583
 msgid "_Manual (opens in browser)"
 msgstr ""
 
-#: src/gui.c:1691 src/multitrack.c:7416
+#: src/gui.c:1689 src/multitrack.c:7592
 msgid "_Donate to the project !"
 msgstr ""
 
-#: src/gui.c:1695 src/multitrack.c:7420
+#: src/gui.c:1693 src/multitrack.c:7596
 msgid "_Email the author"
 msgstr ""
 
-#: src/gui.c:1699 src/multitrack.c:7424
+#: src/gui.c:1697 src/multitrack.c:7600
 msgid "Report a _bug"
 msgstr ""
 
-#: src/gui.c:1703 src/multitrack.c:7428
+#: src/gui.c:1701 src/multitrack.c:7604
 msgid "Suggest a _feature"
 msgstr ""
 
-#: src/gui.c:1707 src/multitrack.c:7432
+#: src/gui.c:1705 src/multitrack.c:7608
 msgid "Assist with _translating"
 msgstr ""
 
-#: src/gui.c:1714 src/multitrack.c:7439
+#: src/gui.c:1712 src/multitrack.c:7615
 msgid "_Troubleshoot"
 msgstr ""
 
-#: src/gui.c:1718 src/multitrack.c:7443
+#: src/gui.c:1716 src/multitrack.c:7619
 msgid "_About"
 msgstr "_Ҳақида"
 
-#: src/gui.c:1752
+#: src/gui.c:1750
 msgid "Rewind to start (w)"
 msgstr ""
 
-#: src/gui.c:1760 src/multitrack.c:16720
+#: src/gui.c:1758 src/multitrack.c:17010
 msgid "Play all (p)"
 msgstr ""
 
-#: src/gui.c:1768 src/gui.c:1877
+#: src/gui.c:1766 src/gui.c:1876
 msgid "Stop playback (q)"
 msgstr ""
 
-#: src/gui.c:1779
+#: src/gui.c:1777
 msgid "Play selection (y)"
 msgstr ""
 
-#: src/gui.c:1832
+#: src/gui.c:1829
 msgid "Volume"
 msgstr "Товуш"
 
-#: src/gui.c:1854
+#: src/gui.c:1853
 msgid "Audio volume (1.00)"
 msgstr ""
 
-#: src/gui.c:1883
+#: src/gui.c:1882
 msgid "Unblank background (b)"
 msgstr ""
 
-#: src/gui.c:1929
+#: src/gui.c:1928
 msgid "Play slower (ctrl-down)"
 msgstr ""
 
-#: src/gui.c:1935
+#: src/gui.c:1934
 msgid "Play faster (ctrl-up)"
 msgstr ""
 
-#: src/gui.c:1942
+#: src/gui.c:1941
 msgid "Skip back (ctrl-left)"
 msgstr ""
 
-#: src/gui.c:1948
+#: src/gui.c:1947
 msgid "Skip forward (ctrl-right)"
 msgstr ""
 
-#: src/gui.c:1954
+#: src/gui.c:1953
 msgid "Show clip info (i)"
 msgstr ""
 
-#: src/gui.c:1960
+#: src/gui.c:1959
 msgid "Hide this toolbar"
 msgstr ""
 
-#: src/gui.c:1962
+#: src/gui.c:1961
 msgid ""
 "Press \"s\" to toggle separate play window for improved performance, \"q\" "
 "to stop."
 msgstr ""
 
 #. TRANSLATORS: please keep the translated string the same length
-#: src/gui.c:1995
+#: src/gui.c:1994
 msgid "     Video playback speed (frames per second)        "
 msgstr ""
 
-#: src/gui.c:2009
+#: src/gui.c:2008
 msgid "Vary the video speed"
 msgstr ""
 
-#: src/gui.c:2092 src/gui.c:3218
+#: src/gui.c:2090 src/gui.c:3329
 msgid "First Frame"
 msgstr ""
 
-#: src/gui.c:2193 src/gui.c:3226
+#: src/gui.c:2191 src/gui.c:3336
 msgid "Last Frame"
 msgstr ""
 
-#: src/gui.c:2210
+#: src/gui.c:2208
 msgid "The first selected frame in this clip"
 msgstr ""
 
-#: src/gui.c:2248
+#: src/gui.c:2246
 msgid "The last selected frame in this clip"
 msgstr ""
 
-#: src/gui.c:2532
+#: src/gui.c:2546
 msgid "Starting...\n"
 msgstr ""
 
-#: src/gui.c:3074
+#: src/gui.c:3181
 msgid "    Press 'q' to stop recording.  DO NOT COVER THE PLAY WINDOW !   "
 msgstr ""
 
-#: src/gui.c:3521
+#: src/gui.c:3643
 msgid "Frame number to preview"
 msgstr ""
 
-#: src/gui.c:3538
+#: src/gui.c:3660
 msgid "_Free"
 msgstr ""
 
-#: src/gui.c:3539
+#: src/gui.c:3661
 msgid "Free choice of frame number"
 msgstr ""
 
-#: src/gui.c:3543
+#: src/gui.c:3666
 msgid "_Start"
 msgstr ""
 
-#: src/gui.c:3544
+#: src/gui.c:3667
 msgid "Frame number is linked to start frame"
 msgstr ""
 
-#: src/gui.c:3551
+#: src/gui.c:3675
 msgid "_End"
 msgstr ""
 
-#: src/gui.c:3552
+#: src/gui.c:3676
 msgid "Frame number is linked to end frame"
 msgstr ""
 
-#: src/gui.c:3559
+#: src/gui.c:3684
 msgid "_Pointer"
 msgstr ""
 
-#: src/gui.c:3560
+#: src/gui.c:3685
 msgid "Frame number is linked to playback pointer"
 msgstr ""
 
-#: src/gui.c:3581
+#: src/gui.c:3707
 msgid "Rewind"
 msgstr "Орқага"
 
-#: src/gui.c:3592 src/dialogs.c:894 src/dialogs.c:896 src/dialogs.c:1817
-#: src/dialogs.c:1819
+#: src/gui.c:3718 src/dialogs.c:960 src/dialogs.c:962 src/dialogs.c:1873
+#: src/dialogs.c:1875
 msgid "Play all"
 msgstr ""
 
-#: src/gui.c:3605
+#: src/gui.c:3731
 msgid "Play Selection"
 msgstr ""
 
-#: src/gui.c:3619
+#: src/gui.c:3745
 msgid "Loop On/Off"
 msgstr ""
 
-#: src/gui.c:3693
+#: src/gui.c:3819
 msgid "Start _recording"
 msgstr ""
 
-#: src/gui.c:3698
+#: src/gui.c:3824
 msgid "Stop _recording"
 msgstr ""
 
-#: src/gui.c:3703
+#: src/gui.c:3829
 msgid "_Record Performance"
 msgstr ""
 
-#: src/gui.c:3851
+#: src/gui.c:3974
 msgid "Hide Play Window"
 msgstr ""
 
-#: src/gui.c:4232
+#: src/gui.c:4333
 msgid "Show Play Window"
 msgstr ""
 
-#: src/ce_thumbs.c:222
+#: src/ce_thumbs.c:242
 #, c-format
 msgid "Mapped to ctrl-%d"
 msgstr ""
 
-#: src/ce_thumbs.c:276 src/effects.c:85 src/preferences.c:3195
+#: src/ce_thumbs.c:296 src/effects.c:86 src/preferences.c:3247
 msgid "Effects"
 msgstr "Эффектлар"
 
-#: src/ce_thumbs.c:279 src/multitrack.c:5615
+#: src/ce_thumbs.c:299 src/multitrack.c:5791
 msgid "Clips"
 msgstr ""
 
-#: src/ce_thumbs.c:303
+#: src/ce_thumbs.c:323
 #, c-format
 msgid "Show / apply effects to %s\n"
 msgstr ""
 
-#: src/ce_thumbs.c:315
+#: src/ce_thumbs.c:335
 #, c-format
 msgid "Select clip for %s\n"
 msgstr ""
 
-#: src/ce_thumbs.c:515
+#: src/ce_thumbs.c:536
 msgid "_Pin"
 msgstr ""
 
-#: src/ce_thumbs.c:515
+#: src/ce_thumbs.c:537
 msgid "Pin the parameter box to the window"
 msgstr ""
 
 #. TRANSLATORS: Exabytes
-#: src/utils.c:794
+#: src/utils.c:800
 #, c-format
 msgid "%.2f EB"
 msgstr ""
 
 #. TRANSLATORS: Petabytes
-#: src/utils.c:798
+#: src/utils.c:803
 #, c-format
 msgid "%.2f PB"
 msgstr ""
 
 #. TRANSLATORS: Terabytes
-#: src/utils.c:802
+#: src/utils.c:806
 #, c-format
 msgid "%.2f TB"
 msgstr ""
 
 #. TRANSLATORS: Gigabytes
-#: src/utils.c:806
+#: src/utils.c:809
 #, c-format
 msgid "%.2f GB"
 msgstr ""
 
 #. TRANSLATORS: Megabytes
-#: src/utils.c:810
+#: src/utils.c:812
 #, c-format
 msgid "%.2f MB"
 msgstr ""
 
 #. TRANSLATORS: Kilobytes (1024 bytes)
-#: src/utils.c:814
+#: src/utils.c:815
 #, c-format
 msgid "%.2f KiB"
 msgstr ""
@@ -3570,7 +3560,7 @@
 msgid "%d bytes"
 msgstr ""
 
-#: src/utils.c:1841
+#: src/utils.c:1835
 msgid "Clearing the clipboard"
 msgstr ""
 
@@ -3582,81 +3572,81 @@
 "Switched to clip %s\n"
 msgstr ""
 
-#: src/utils.c:1880
+#: src/utils.c:1877
 msgid ""
 "\n"
 "==============================\n"
 "Switched to empty clip\n"
 msgstr ""
 
-#: src/utils.c:1917
+#: src/utils.c:1916
 msgid "(blank)"
 msgstr ""
 
-#: src/utils.c:1920
+#: src/utils.c:1919
 #, c-format
 msgid ""
 "The set name has been changed from %s to %s. Affected layouts have been "
 "updated accordingly\n"
 msgstr ""
 
-#: src/utils.c:1928
+#: src/utils.c:1927
 #, c-format
 msgid ""
 "The clip %s is missing from this set.\n"
 "It is required by the following layouts:\n"
 msgstr ""
 
-#: src/utils.c:1932
+#: src/utils.c:1931
 #, c-format
 msgid ""
 "The clip %s has been closed.\n"
 "It is required by the following layouts:\n"
 msgstr ""
 
-#: src/utils.c:1937
+#: src/utils.c:1936
 #, c-format
 msgid ""
 "Frames have been shifted in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1942
+#: src/utils.c:1941
 #, c-format
 msgid ""
 "Frames have been deleted from the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1947
+#: src/utils.c:1946
 #, c-format
 msgid ""
 "Audio has been deleted from the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1952
+#: src/utils.c:1951
 #, c-format
 msgid ""
 "Audio has been shifted in clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1957
+#: src/utils.c:1956
 #, c-format
 msgid ""
 "Audio has been altered in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1962
+#: src/utils.c:1961
 #, c-format
 msgid ""
 "Frames have been altered in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:2135
+#: src/utils.c:2134
 #, c-format
 msgid ""
 "Set %s\n"
@@ -3664,7 +3654,7 @@
 "by another copy of LiVES.\n"
 msgstr ""
 
-#: src/utils.c:2142
+#: src/utils.c:2140
 #, c-format
 msgid ""
 "\n"
@@ -3710,67 +3700,67 @@
 msgid "Removing layout %s\n"
 msgstr ""
 
-#: src/utils.c:3014
+#: src/utils.c:2996
 msgid "Video [opening...]"
 msgstr ""
 
-#: src/utils.c:3018
+#: src/utils.c:2999
 #, c-format
 msgid "Video [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:3022
+#: src/utils.c:3002
 msgid "(Undefined)"
 msgstr ""
 
-#: src/utils.c:3025
+#: src/utils.c:3004
 msgid "(No video)"
 msgstr ""
 
-#: src/utils.c:3032
+#: src/utils.c:3011
 msgid "(No audio)"
 msgstr ""
 
-#: src/utils.c:3037
+#: src/utils.c:3015
 msgid "Mono  [opening...]"
 msgstr ""
 
-#: src/utils.c:3040
+#: src/utils.c:3017
 msgid "Left Audio [opening...]"
 msgstr ""
 
-#: src/utils.c:3045
+#: src/utils.c:3021
 #, c-format
 msgid "Mono [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:3048
+#: src/utils.c:3023
 #, c-format
 msgid "Left Audio [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:3056
+#: src/utils.c:3031
 msgid "Right Audio [opening...]"
 msgstr ""
 
-#: src/utils.c:3059
+#: src/utils.c:3033
 #, c-format
 msgid "Right Audio [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:3506
+#: src/utils.c:3472
 msgid "LiVES cannot switch to mplayer whilst clips are loading."
 msgstr ""
 
-#: src/utils.c:3559
+#: src/utils.c:3525
 msgid "LiVES cannot switch to mplayer2 whilst clips are loading."
 msgstr ""
 
-#: src/utils.c:3809
+#: src/utils.c:3775
 msgid "Cleaning up clip"
 msgstr ""
 
-#: src/utils.c:3913
+#: src/utils.c:3874
 #, c-format
 msgid ""
 "\n"
@@ -3780,30 +3770,29 @@
 "Overwrite ?\n"
 msgstr ""
 
-#: src/utils.c:4305 src/utils.c:4337 src/multitrack.c:4503
+#: src/utils.c:4250 src/utils.c:4280 src/multitrack.c:4672
 #, c-format
 msgid "_Undo %s"
 msgstr ""
 
-#: src/utils.c:4306 src/utils.c:4338 src/multitrack.c:4525
+#: src/utils.c:4251 src/utils.c:4281 src/multitrack.c:4693
 #, c-format
 msgid "_Redo %s"
 msgstr ""
 
-#: src/utils.c:4363
+#: src/utils.c:4305
 msgid "-------------Selection------------"
 msgstr ""
 
-#. TRANSLATORS: - try to keep the text of the middle part the same length, by deleting "-" if necessary
-#: src/utils.c:4371
+#: src/utils.c:4313
 msgid " sec ] ----------Selection---------- [ "
 msgstr ""
 
-#: src/utils.c:4371
+#: src/utils.c:4314
 msgid " frames ] ----------"
 msgstr ""
 
-#: src/utils.c:5360
+#: src/utils.c:5302
 msgid ""
 "Your version of mplayer/ffmpeg may be broken !\n"
 "See http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2071\n"
@@ -3814,11 +3803,11 @@
 "Try running Help/Troubleshoot for more information."
 msgstr ""
 
-#: src/saveplay.c:178
+#: src/saveplay.c:179
 msgid "Examining file header"
 msgstr ""
 
-#: src/saveplay.c:315 src/saveplay.c:789
+#: src/saveplay.c:316 src/saveplay.c:779
 #, c-format
 msgid "Opening %s"
 msgstr "%s очилмоқда"
@@ -3828,36 +3817,36 @@
 msgid "Opening %s start time %.2f sec. frames %d"
 msgstr ""
 
-#: src/saveplay.c:326 src/saveplay.c:4001
+#: src/saveplay.c:326 src/saveplay.c:3927
 msgid " without sound"
 msgstr ""
 
-#: src/saveplay.c:396
+#: src/saveplay.c:395
 #, c-format
 msgid "Opening audio for %s"
 msgstr ""
 
-#: src/saveplay.c:557
+#: src/saveplay.c:554
 #, c-format
 msgid "Auto trimming %.2f seconds of audio at start..."
 msgstr ""
 
-#: src/saveplay.c:567
+#: src/saveplay.c:562
 #, c-format
 msgid "Auto trimming %.2f seconds of audio at end..."
 msgstr ""
 
-#: src/saveplay.c:584
+#: src/saveplay.c:577
 #, c-format
 msgid "Auto padding with %.2f seconds of silence at start..."
 msgstr ""
 
-#: src/saveplay.c:599
+#: src/saveplay.c:590
 #, c-format
 msgid "Auto padding with %.2f seconds of silence at end..."
 msgstr ""
 
-#: src/saveplay.c:671
+#: src/saveplay.c:661
 #, c-format
 msgid ""
 "\n"
@@ -3869,11 +3858,11 @@
 "Are you sure you wish to continue ?"
 msgstr ""
 
-#: src/saveplay.c:685
+#: src/saveplay.c:676
 msgid " - please be patient."
 msgstr ""
 
-#: src/saveplay.c:938
+#: src/saveplay.c:926
 msgid ""
 "\n"
 "\n"
@@ -3881,14 +3870,14 @@
 "Please check the terminal window for more details.\n"
 msgstr ""
 
-#: src/saveplay.c:940
+#: src/saveplay.c:928
 msgid ""
 "\n"
 "\n"
 "You may need to install mplayer to open this file.\n"
 msgstr ""
 
-#: src/saveplay.c:948
+#: src/saveplay.c:934
 msgid ""
 "\n"
 "\n"
@@ -3896,29 +3885,29 @@
 "Tools|Preferences|Decoding\n"
 msgstr ""
 
-#: src/saveplay.c:1014
+#: src/saveplay.c:995
 msgid "Adding image..."
 msgstr ""
 
-#: src/saveplay.c:1108
+#: src/saveplay.c:1089
 #, c-format
 msgid "Subtitles were saved as %s\n"
 msgstr ""
 
-#: src/saveplay.c:1192
+#: src/saveplay.c:1171
 #, c-format
 msgid "LiVES: Save Frame %d as..."
 msgstr ""
 
-#: src/saveplay.c:1195
+#: src/saveplay.c:1174
 msgid "LiVES: Save Frame as..."
 msgstr ""
 
-#: src/saveplay.c:1322
+#: src/saveplay.c:1303
 msgid "LiVES: Save Clip as..."
 msgstr ""
 
-#: src/saveplay.c:1390
+#: src/saveplay.c:1369
 msgid ""
 "Saving your video could lead to a loss of quality !\n"
 "You are strongly advised to 'Save As' to a new file.\n"
@@ -3926,67 +3915,67 @@
 "Do you still wish to continue ?"
 msgstr ""
 
-#: src/saveplay.c:1517 src/saveplay.c:1683 src/saveplay.c:1762
-#: src/saveplay.c:4014
+#: src/saveplay.c:1494 src/saveplay.c:1659 src/saveplay.c:1738
+#: src/saveplay.c:3940
 msgid "Pulling frames from clip"
 msgstr ""
 
-#: src/saveplay.c:1588 src/saveplay.c:1727
+#: src/saveplay.c:1565 src/saveplay.c:1703
 msgid "Linking selection"
 msgstr ""
 
-#: src/saveplay.c:1779
+#: src/saveplay.c:1755
 msgid " (with no sound)\n"
 msgstr ""
 
-#: src/saveplay.c:1786
+#: src/saveplay.c:1761
 #, c-format
 msgid "Saving frames %d to %d%s as \"%s\" : encoder = %s : format = %s..."
 msgstr ""
 
-#: src/saveplay.c:1790
+#: src/saveplay.c:1765
 #, c-format
 msgid "Saving frames 1 to %d%s as \"%s\" : encoder %s : format = %s..."
 msgstr ""
 
-#: src/saveplay.c:1909
+#: src/saveplay.c:1890
 msgid "Saving [can take a long time]"
 msgstr ""
 
-#: src/saveplay.c:2057
+#: src/saveplay.c:2044
 msgid ""
 "\n"
 "\n"
 "Encoder error - output file was not created !\n"
 msgstr ""
 
-#: src/saveplay.c:2094
+#: src/saveplay.c:2081
 msgid "Clearing letterbox"
 msgstr ""
 
-#: src/saveplay.c:2183
+#: src/saveplay.c:2168
 #, c-format
 msgid "File size was %s\n"
 msgstr ""
 
-#: src/saveplay.c:2284
+#: src/saveplay.c:2265
 msgid "recording aborted by preview.\n"
 msgstr ""
 
-#: src/saveplay.c:2288
+#: src/saveplay.c:2268
 msgid "recording aborted by clipboard playback.\n"
 msgstr ""
 
-#: src/saveplay.c:2291
+#: src/saveplay.c:2270
 msgid "Recording performance..."
 msgstr ""
 
-#: src/saveplay.c:3293
+#: src/saveplay.c:3251
 #, c-format
 msgid "Average FPS was %.4f\n"
 msgstr ""
 
-#: src/saveplay.c:3299
+#: src/saveplay.c:3256
 msgid ""
 "\n"
 "\n"
@@ -3995,16 +3984,21 @@
 "and resize all frames to the current size.\n"
 msgstr ""
 
-#: src/saveplay.c:3479
+#: src/saveplay.c:3429
 msgid "Unknown"
 msgstr "Номаълум"
 
-#: src/saveplay.c:3588 src/saveplay.c:4585
+#: src/saveplay.c:3538 src/saveplay.c:4502
 #, c-format
 msgid "Untitled%d"
 msgstr ""
 
-#: src/saveplay.c:3633
+#: src/saveplay.c:3567
+#, c-format
+msgid "%d frames are enough !\n"
+msgstr ""
+
+#: src/saveplay.c:3579
 #, c-format
 msgid ""
 "\n"
@@ -4012,7 +4006,7 @@
 "Bad things may happen with this clip.\n"
 msgstr ""
 
-#: src/saveplay.c:3723
+#: src/saveplay.c:3667
 #, c-format
 msgid ""
 "\n"
@@ -4020,73 +4014,73 @@
 "Default can be set in Tools | Preferences | Misc.\n"
 msgstr ""
 
-#: src/saveplay.c:3735
+#: src/saveplay.c:3677
 #, c-format
 msgid "Playback speed was adjusted to %.3f frames per second to fit audio.\n"
 msgstr ""
 
-#: src/saveplay.c:3754
+#: src/saveplay.c:3694
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d *bpp=Greyscale* fps=%.3f\n"
 "Audio:"
 msgstr ""
 
-#: src/saveplay.c:3758 src/saveplay.c:4762
+#: src/saveplay.c:3698 src/saveplay.c:4671
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d bpp=%d fps=%.3f\n"
 "Audio:"
 msgstr ""
 
-#: src/saveplay.c:3762 src/saveplay.c:4766
+#: src/saveplay.c:3703 src/saveplay.c:4676
 #, c-format
 msgid "%s none\n"
 msgstr ""
 
-#: src/saveplay.c:3774
+#: src/saveplay.c:3714
 #, c-format
 msgid " - Author: %s\n"
 msgstr ""
 
-#: src/saveplay.c:3779
+#: src/saveplay.c:3717
 #, c-format
 msgid " - Title: %s\n"
 msgstr ""
 
-#: src/saveplay.c:3784
+#: src/saveplay.c:3720
 #, c-format
 msgid " - Comment: %s\n"
 msgstr ""
 
-#: src/saveplay.c:3897
+#: src/saveplay.c:3829
 #, c-format
 msgid "Saving frame %d as %s..."
 msgstr ""
 
-#: src/saveplay.c:3996
+#: src/saveplay.c:3924
 #, c-format
 msgid "Backing up %s to %s"
 msgstr ""
 
-#: src/saveplay.c:4049
+#: src/saveplay.c:3975
 msgid "Backing up"
 msgstr ""
 
-#: src/saveplay.c:4083
+#: src/saveplay.c:4009
 msgid "performance data was backed up..."
 msgstr ""
 
-#: src/saveplay.c:4661
+#: src/saveplay.c:4574
 #, c-format
 msgid "Restoring %s..."
 msgstr ""
 
-#: src/saveplay.c:4692
+#: src/saveplay.c:4603
 msgid "Restoring"
 msgstr ""
 
-#: src/saveplay.c:4714
+#: src/saveplay.c:4625
 #, c-format
 msgid ""
 "\n"
@@ -4096,22 +4090,22 @@
 msgstr ""
 
 #. TRANSLATORS: rec(ord) %.2f M(ega)B(ytes)
-#: src/saveplay.c:5207
+#: src/saveplay.c:5118
 #, c-format
 msgid "rec %.2f MB"
 msgstr ""
 
-#: src/saveplay.c:5213
+#: src/saveplay.c:5123
 #, c-format
 msgid "!rec %.2f MB"
 msgstr ""
 
 #. TRANSLATORS: rec(ord) ?? M(ega)B(ytes)
-#: src/saveplay.c:5216
+#: src/saveplay.c:5126
 msgid "rec ?? MB"
 msgstr ""
 
-#: src/saveplay.c:5241
+#: src/saveplay.c:5151
 #, c-format
 msgid ""
 "\n"
@@ -4119,54 +4113,72 @@
 "Record stop level can be set in Preferences.\n"
 msgstr ""
 
-#: src/saveplay.c:5535
+#: src/saveplay.c:5447
 msgid ""
 "\n"
 "Files from a previous run of LiVES were found.\n"
 "Do you want to attempt to recover them ?\n"
 msgstr ""
 
-#: src/saveplay.c:5557
+#: src/saveplay.c:5469
 msgid "Recovering files"
 msgstr ""
 
-#: src/saveplay.c:5560
+#: src/saveplay.c:5472
 msgid "Recovering files..."
 msgstr ""
 
-#: src/dialogs.c:72
+#: src/dialogs.c:71
 msgid "Show affected _layouts"
 msgstr ""
 
-#: src/dialogs.c:128
+#: src/dialogs.c:113
+msgid ""
+"Do _not show this warning any more\n"
+"(can be turned back on from Preferences/Warnings)"
+msgstr ""
+
+#: src/dialogs.c:127
 msgid "_Recover disk space"
 msgstr ""
 
-#: src/dialogs.c:143
+#: src/dialogs.c:142
 msgid " _Advanced Settings >>"
 msgstr ""
 
-#: src/dialogs.c:184
+#: src/dialogs.c:183 src/dialogs.c:221
 msgid "LiVES: - Warning !"
 msgstr ""
 
 #: src/dialogs.c:194
-msgid "LiVES: - Question"
+msgid "LiVES: - Error !"
 msgstr ""
 
 #: src/dialogs.c:204
+msgid "LiVES: - Information"
+msgstr ""
+
+#: src/dialogs.c:230
+msgid "LiVES: - Question"
+msgstr ""
+
+#: src/dialogs.c:239
 msgid "LiVES: - File Error"
 msgstr ""
 
-#: src/dialogs.c:208
+#: src/dialogs.c:241
 msgid "_Abort"
 msgstr ""
 
-#: src/dialogs.c:213
+#: src/dialogs.c:246
 msgid "_Retry"
 msgstr ""
 
-#: src/dialogs.c:597
+#: src/dialogs.c:306
+msgid "Show _Details"
+msgstr ""
+
+#: src/dialogs.c:657
 #, c-format
 msgid ""
 "FREE SPACE IN THE PARTITION CONTAINING\n"
@@ -4177,7 +4189,7 @@
 "(Disk warning levels can be configured in Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:615
+#: src/dialogs.c:676
 #, c-format
 msgid ""
 "Free space in the partition containing\n"
@@ -4189,11 +4201,11 @@
 "Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:627
+#: src/dialogs.c:688
 msgid "Audio players cannot be switched during playback."
 msgstr ""
 
-#: src/dialogs.c:632
+#: src/dialogs.c:694
 msgid ""
 "\n"
 "\n"
@@ -4201,46 +4213,46 @@
 "Please try closing some other applications first.\n"
 msgstr ""
 
-#: src/dialogs.c:752
+#: src/dialogs.c:820
 msgid "Processing has been paused."
 msgstr ""
 
-#: src/dialogs.c:937
+#: src/dialogs.c:1002
 #, c-format
 msgid ""
 "\n"
 "%s%d%% done. Time remaining: %u sec%s\n"
 msgstr ""
 
-#: src/dialogs.c:1335
+#: src/dialogs.c:1391
 #, c-format
 msgid ""
 "\n"
 "%d/%d frames opened. Time remaining %u sec.\n"
 msgstr ""
 
-#: src/dialogs.c:1337
+#: src/dialogs.c:1393
 #, c-format
 msgid ""
 "\n"
 "%d/%d frames opened.\n"
 msgstr ""
 
-#: src/dialogs.c:1341
+#: src/dialogs.c:1396
 #, c-format
 msgid ""
 "\n"
 "%d frames opened.\n"
 msgstr ""
 
-#: src/dialogs.c:1940
+#: src/dialogs.c:1993
 #, c-format
 msgid ""
 "\n"
 "Time remaining: %d sec"
 msgstr ""
 
-#: src/dialogs.c:1988
+#: src/dialogs.c:2040
 #, c-format
 msgid ""
 "\n"
@@ -4248,7 +4260,7 @@
 "Please close a file and then try again."
 msgstr ""
 
-#: src/dialogs.c:1994
+#: src/dialogs.c:2047
 #, c-format
 msgid ""
 "LiVES was unable to write to its temporary directory.\n"
@@ -4260,27 +4272,27 @@
 "Please make sure you can write to this directory."
 msgstr ""
 
-#: src/dialogs.c:2005
+#: src/dialogs.c:2059
 msgid ""
 "\n"
 "LiVES currently requires either 'mplayer', 'mplayer2', or 'sox' to function. "
 "Please install one or other of these, and try again.\n"
 msgstr ""
 
-#: src/dialogs.c:2010
+#: src/dialogs.c:2064
 msgid ""
 "Audio was not loaded; please install mplayer or mplayer2 if you expected "
 "audio for this clip.\n"
 msgstr ""
 
-#: src/dialogs.c:2014
+#: src/dialogs.c:2069
 msgid ""
 "Audio resampling is required for this format.\n"
 "Please install 'sox'\n"
 "Or switch to another encoder format in Tools | Preferences | Encoding\n"
 msgstr ""
 
-#: src/dialogs.c:2019
+#: src/dialogs.c:2075
 msgid ""
 "\n"
 "\n"
@@ -4288,19 +4300,19 @@
 "Please set the audio codec in Tools|Preferences|Encoding\n"
 msgstr ""
 
-#: src/dialogs.c:2024
+#: src/dialogs.c:2080
 msgid ""
 "This layout includes generated frames.\n"
 "It cannot be saved, you must render it to a clip first.\n"
 msgstr ""
 
-#: src/dialogs.c:2029
+#: src/dialogs.c:2085
 msgid ""
 "This layout includes generated or recorded audio.\n"
 "It cannot be saved, you must render it to a clip first.\n"
 msgstr ""
 
-#: src/dialogs.c:2039 src/dialogs.c:2137
+#: src/dialogs.c:2095 src/dialogs.c:2189
 #, c-format
 msgid ""
 "\n"
@@ -4308,83 +4320,83 @@
 "Due to restrictions in the %s format\n"
 msgstr ""
 
-#: src/dialogs.c:2059
+#: src/dialogs.c:2115
 msgid ""
 "LiVES recommends the following settings:\n"
 "\n"
 msgstr ""
 
-#: src/dialogs.c:2065 src/dialogs.c:2174 src/resample.c:850
+#: src/dialogs.c:2121 src/dialogs.c:2225 src/resample.c:839
 msgid ", signed"
 msgstr ""
 
-#: src/dialogs.c:2066 src/dialogs.c:2175 src/resample.c:853
+#: src/dialogs.c:2122 src/dialogs.c:2226 src/resample.c:841
 msgid ", unsigned"
 msgstr ""
 
-#: src/dialogs.c:2070 src/dialogs.c:2179 src/resample.c:858
+#: src/dialogs.c:2126 src/dialogs.c:2230 src/resample.c:846
 msgid ", little-endian"
 msgstr ""
 
-#: src/dialogs.c:2071 src/dialogs.c:2180 src/resample.c:861
+#: src/dialogs.c:2127 src/dialogs.c:2231 src/resample.c:848
 msgid ", big-endian"
 msgstr ""
 
-#: src/dialogs.c:2077
+#: src/dialogs.c:2132
 #, c-format
 msgid "Use an audio rate of %d Hz%s%s\n"
 msgstr ""
 
-#: src/dialogs.c:2085
+#: src/dialogs.c:2140
 #, c-format
 msgid "Set video rate to %.3f frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:2089
+#: src/dialogs.c:2143
 #, c-format
 msgid "Set video rate to %d:%d frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:2094 src/dialogs.c:2209
+#: src/dialogs.c:2148 src/dialogs.c:2258
 #, c-format
 msgid "Set video size to %d x %d pixels\n"
 msgstr ""
 
-#: src/dialogs.c:2102 src/dialogs.c:2208
+#: src/dialogs.c:2156 src/dialogs.c:2257
 msgid ""
 "\n"
 "You may wish to:\n"
 msgstr ""
 
-#: src/dialogs.c:2105 src/dialogs.c:2200
+#: src/dialogs.c:2159 src/dialogs.c:2249
 #, c-format
 msgid "resize video to %d x %d pixels\n"
 msgstr ""
 
-#: src/dialogs.c:2110
+#: src/dialogs.c:2163
 msgid "disable audio, since the target encoder cannot encode audio\n"
 msgstr ""
 
-#: src/dialogs.c:2170
+#: src/dialogs.c:2221
 msgid "LiVES must:\n"
 msgstr ""
 
-#: src/dialogs.c:2185
+#: src/dialogs.c:2235
 #, c-format
 msgid "resample audio to %d Hz%s%s\n"
 msgstr ""
 
-#: src/dialogs.c:2192
+#: src/dialogs.c:2242
 #, c-format
 msgid "resample video to %.3f frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:2196
+#: src/dialogs.c:2245
 #, c-format
 msgid "resample video to %d:%d frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:2215
+#: src/dialogs.c:2263
 msgid ""
 "\n"
 "You will be able to undo these changes afterwards.\n"
@@ -4393,14 +4405,14 @@
 "\n"
 msgstr ""
 
-#: src/dialogs.c:2218
+#: src/dialogs.c:2265
 msgid ""
 "\n"
 "Changes applied to the selection will not be permanent.\n"
 "\n"
 msgstr ""
 
-#: src/dialogs.c:2237
+#: src/dialogs.c:2285
 msgid ""
 "\n"
 "\n"
@@ -4409,7 +4421,7 @@
 "Try recording for just a selection of the file."
 msgstr ""
 
-#: src/dialogs.c:2244
+#: src/dialogs.c:2293
 msgid ""
 "The playback speed (fps), or the audio rate\n"
 " of the clipboard does not match\n"
@@ -4420,7 +4432,7 @@
 "Please press Cancel to abort the insert, or OK to continue."
 msgstr ""
 
-#: src/dialogs.c:2253
+#: src/dialogs.c:2304
 #, c-format
 msgid ""
 "When opening a yuvmpeg stream, you should first create a fifo file in:\n"
@@ -4433,11 +4445,11 @@
 "click Cancel."
 msgstr ""
 
-#: src/dialogs.c:2305
+#: src/dialogs.c:2356
 msgid "Show Keys"
 msgstr ""
 
-#: src/dialogs.c:2306
+#: src/dialogs.c:2358
 msgid ""
 "You can use the following keys during playback to control LiVES:-\n"
 "\n"
@@ -4479,11 +4491,11 @@
 "g                             ping pong loops\n"
 msgstr ""
 
-#: src/dialogs.c:2313
+#: src/dialogs.c:2365
 msgid "Multitrack Keys"
 msgstr ""
 
-#: src/dialogs.c:2314
+#: src/dialogs.c:2367
 msgid ""
 "You can use the following keys to control the multitrack window:-\n"
 "\n"
@@ -4505,18 +4517,18 @@
 "For other keys, see the menus.\n"
 msgstr ""
 
-#: src/dialogs.c:2322
+#: src/dialogs.c:2375
 msgid "Message History"
 msgstr ""
 
-#: src/dialogs.c:2335
+#: src/dialogs.c:2388
 #, c-format
 msgid ""
 "After upgrading/installing, you may need to adjust the <prefix_dir> setting "
 "in your %s file"
 msgstr ""
 
-#: src/dialogs.c:2344
+#: src/dialogs.c:2399
 #, c-format
 msgid ""
 "\n"
@@ -4527,25 +4539,25 @@
 "or change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/dialogs.c:2352
+#: src/dialogs.c:2408
 msgid ""
 "Sorry, unknown audio type.\n"
 "\n"
 " (Filenames must end in .mp3, .ogg, .wav, .mod, .xm or .it)"
 msgstr ""
 
-#: src/dialogs.c:2353
+#: src/dialogs.c:2409
 msgid "failed (unknown type)\n"
 msgstr ""
 
-#: src/dialogs.c:2358
+#: src/dialogs.c:2415
 msgid ""
 "\n"
 "Do you wish to remove the layout files associated with this set ?\n"
 "(They will not be usable without the set).\n"
 msgstr ""
 
-#: src/dialogs.c:2363
+#: src/dialogs.c:2421
 #, c-format
 msgid ""
 "\n"
@@ -4554,7 +4566,7 @@
 "Click Cancel to pick a new name.\n"
 msgstr ""
 
-#: src/dialogs.c:2370
+#: src/dialogs.c:2429
 msgid ""
 "\n"
 "Frames from this clip are used in some multitrack layouts.\n"
@@ -4562,7 +4574,7 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2374
+#: src/dialogs.c:2433
 msgid ""
 "\n"
 "Audio from this clip is used in some multitrack layouts.\n"
@@ -4570,7 +4582,7 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2378
+#: src/dialogs.c:2438
 #, c-format
 msgid ""
 "\n"
@@ -4581,7 +4593,7 @@
 "Otherwise click Cancel to skip loading this file.\n"
 msgstr ""
 
-#: src/dialogs.c:2385
+#: src/dialogs.c:2446
 #, c-format
 msgid ""
 "\n"
@@ -4591,7 +4603,7 @@
 "The clip could not be loaded.\n"
 msgstr ""
 
-#: src/dialogs.c:2392
+#: src/dialogs.c:2455
 msgid ""
 "\n"
 "Dear user, the jack developers decided to remove the -Z option from jackd.\n"
@@ -4599,7 +4611,7 @@
 "Alternately, select a different audio player in Preferences.\n"
 msgstr ""
 
-#: src/dialogs.c:2396
+#: src/dialogs.c:2460
 msgid ""
 "\n"
 "Unable to start up jack. Please ensure that alsa is set up correctly on your "
@@ -4608,13 +4620,13 @@
 "Automatic jack startup will be disabled now.\n"
 msgstr ""
 
-#: src/dialogs.c:2402
+#: src/dialogs.c:2466
 msgid ""
 "\n"
 "Unable to connect to jack server. Please start jack before starting LiVES\n"
 msgstr ""
 
-#: src/dialogs.c:2411
+#: src/dialogs.c:2475
 #, c-format
 msgid ""
 "\n"
@@ -4625,13 +4637,13 @@
 "%s\n"
 msgstr ""
 
-#: src/dialogs.c:2418
+#: src/dialogs.c:2482
 msgid ""
 "\n"
 "Alternately, you can restart LiVES and select another audio player.\n"
 msgstr ""
 
-#: src/dialogs.c:2423
+#: src/dialogs.c:2488
 #, c-format
 msgid ""
 "\n"
@@ -4641,7 +4653,7 @@
 "It is recommended to increase it to at least %d MB"
 msgstr ""
 
-#: src/dialogs.c:2429
+#: src/dialogs.c:2496
 #, c-format
 msgid ""
 "\n"
@@ -4650,7 +4662,7 @@
 "Do you wish to delete them ?\n"
 msgstr ""
 
-#: src/dialogs.c:2436
+#: src/dialogs.c:2504
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for multitrack undo.\n"
@@ -4658,7 +4670,7 @@
 "using Preferences/Multitrack/Undo Memory\n"
 msgstr ""
 
-#: src/dialogs.c:2440
+#: src/dialogs.c:2508
 msgid ""
 "\n"
 "Out of memory for undo.\n"
@@ -4666,63 +4678,63 @@
 "using Preferences/Multitrack/Undo Memory\n"
 msgstr ""
 
-#: src/dialogs.c:2444
+#: src/dialogs.c:2512
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for the multitrack undo buffer.\n"
 msgstr ""
 
-#: src/dialogs.c:2446
+#: src/dialogs.c:2514
 msgid "or enter a smaller value.\n"
 msgstr ""
 
-#: src/dialogs.c:2448
+#: src/dialogs.c:2516
 msgid "Try again from the clip editor, try closing some other applications\n"
 msgstr ""
 
-#: src/dialogs.c:2449
+#: src/dialogs.c:2517
 msgid "Try closing some other applications\n"
 msgstr ""
 
-#: src/dialogs.c:2460
+#: src/dialogs.c:2529
 msgid ""
 "Multitrack is set to 0 audio channels, but this layout has audio.\n"
 "You should adjust the audio settings from the Tools menu.\n"
 msgstr ""
 
-#: src/dialogs.c:2464
+#: src/dialogs.c:2534
 msgid ""
 "The current layout has audio, so audio channels may not be set to zero.\n"
 msgstr ""
 
-#: src/dialogs.c:2468
+#: src/dialogs.c:2539
 msgid ""
 "Multitrack audio preview is only available with the\n"
 "\"jack\" or \"pulse audio\" audio player.\n"
 "You can set this in Tools|Preferences|Playback."
 msgstr ""
 
-#: src/dialogs.c:2472
+#: src/dialogs.c:2545
 msgid ""
 "Errors were detected in the layout (which may be due to transferring from "
 "another system, or from an older version of LiVES).\n"
 "Should I try to repair the disk copy of the layout ?\n"
 msgstr ""
 
-#: src/dialogs.c:2476
+#: src/dialogs.c:2549
 msgid ""
 "LiVES was unable to load the layout.\n"
 "Sorry.\n"
 msgstr ""
 
-#: src/dialogs.c:2482
+#: src/dialogs.c:2555
 msgid ""
 "\n"
 "\n"
 "Audio rate must be greater than 0.\n"
 msgstr ""
 
-#: src/dialogs.c:2486
+#: src/dialogs.c:2559
 msgid ""
 "\n"
 "Event list will be very large\n"
@@ -4730,14 +4742,14 @@
 "Are you sure you wish to view it ?\n"
 msgstr ""
 
-#: src/dialogs.c:2491
+#: src/dialogs.c:2564
 msgid ""
 "\n"
 "\n"
 "You must install 'dvgrab' to use this function.\n"
 msgstr ""
 
-#: src/dialogs.c:2496
+#: src/dialogs.c:2570
 msgid ""
 "\n"
 "\n"
@@ -4746,25 +4758,25 @@
 "You may need to select one of these in Tools/Preferences/Playback.\n"
 msgstr ""
 
-#: src/dialogs.c:2500
+#: src/dialogs.c:2574
 msgid "Video playback plugin failed to initialise palette !\n"
 msgstr ""
 
-#: src/dialogs.c:2504
+#: src/dialogs.c:2579
 msgid "Decoder plugin failed to initialise palette !\n"
 msgstr ""
 
-#: src/dialogs.c:2509
+#: src/dialogs.c:2584
 msgid "Unable to set framerate of video plugin\n"
 msgstr ""
 
-#: src/dialogs.c:2514
+#: src/dialogs.c:2590
 msgid ""
 "After a crash, it is advisable to clean up the disk with\n"
 "File|Clean up disk space\n"
 msgstr ""
 
-#: src/dialogs.c:2526
+#: src/dialogs.c:2604
 #, c-format
 msgid ""
 "Stream frame size is too large for your network buffers.\n"
@@ -4773,33 +4785,33 @@
 "echo %d > /proc/sys/net/core/rmem_max\n"
 msgstr ""
 
-#: src/dialogs.c:2714
+#: src/dialogs.c:2800
 msgid "cancelled.\n"
 msgstr ""
 
-#: src/dialogs.c:2721
+#: src/dialogs.c:2805
 msgid "failed.\n"
 msgstr ""
 
-#: src/dialogs.c:2728
+#: src/dialogs.c:2810
 msgid "done.\n"
 msgstr ""
 
-#: src/dialogs.c:2732
+#: src/dialogs.c:2814
 msgid "error in file. Failed.\n"
 msgstr ""
 
-#: src/dialogs.c:2766 src/dialogs.c:2815 src/dialogs.c:2839
+#: src/dialogs.c:2848 src/dialogs.c:2897 src/dialogs.c:2921
 #, c-format
 msgid "Additional info: %s\n"
 msgstr ""
 
-#: src/dialogs.c:2769
+#: src/dialogs.c:2851
 #, c-format
 msgid "The error value was %d%s\n"
 msgstr ""
 
-#: src/dialogs.c:2772
+#: src/dialogs.c:2854
 #, c-format
 msgid ""
 "\n"
@@ -4809,7 +4821,7 @@
 "%s%s%s"
 msgstr ""
 
-#: src/dialogs.c:2818
+#: src/dialogs.c:2900
 #, c-format
 msgid ""
 "\n"
@@ -4819,7 +4831,7 @@
 "%s"
 msgstr ""
 
-#: src/dialogs.c:2842
+#: src/dialogs.c:2924
 #, c-format
 msgid ""
 "\n"
@@ -4829,7 +4841,7 @@
 "%s"
 msgstr ""
 
-#: src/dialogs.c:2886
+#: src/dialogs.c:2968
 #, c-format
 msgid ""
 "\n"
@@ -4838,7 +4850,7 @@
 "Please check for possible error causes.\n"
 msgstr ""
 
-#: src/dialogs.c:2890
+#: src/dialogs.c:2971
 #, c-format
 msgid ""
 "\n"
@@ -4848,7 +4860,7 @@
 "%s.\n"
 msgstr ""
 
-#: src/dialogs.c:2921
+#: src/dialogs.c:3002
 #, c-format
 msgid ""
 "\n"
@@ -4857,7 +4869,7 @@
 "Please check for possible error causes.\n"
 msgstr ""
 
-#: src/dialogs.c:2925
+#: src/dialogs.c:3005
 #, c-format
 msgid ""
 "\n"
@@ -4867,12 +4879,12 @@
 "%s.\n"
 msgstr ""
 
-#: src/dialogs.c:2993
+#: src/dialogs.c:3073
 #, c-format
 msgid "Value for \"%s\" could not be read."
 msgstr ""
 
-#: src/dialogs.c:3011
+#: src/dialogs.c:3091
 #, c-format
 msgid ""
 "\n"
@@ -4881,7 +4893,7 @@
 "Please check your system for errors.\n"
 msgstr ""
 
-#: src/dialogs.c:3020
+#: src/dialogs.c:3100
 #, c-format
 msgid ""
 "\n"
@@ -4890,7 +4902,7 @@
 "Please check the file permissions and try again."
 msgstr ""
 
-#: src/dialogs.c:3027
+#: src/dialogs.c:3109
 #, c-format
 msgid ""
 "\n"
@@ -4899,7 +4911,7 @@
 "Please check the directory permissions and try again."
 msgstr ""
 
-#: src/dialogs.c:3034
+#: src/dialogs.c:3116
 #, c-format
 msgid ""
 "\n"
@@ -4907,14 +4919,14 @@
 "%s\n"
 msgstr ""
 
-#: src/dialogs.c:3041
+#: src/dialogs.c:3123
 msgid ""
 "\n"
 "Abort and exit immediately from LiVES\n"
 "Are you sure ?\n"
 msgstr ""
 
-#: src/dialogs.c:3047
+#: src/dialogs.c:3129
 #, c-format
 msgid ""
 "\n"
@@ -4922,13 +4934,13 @@
 "Please select another encoder from the list.\n"
 msgstr ""
 
-#: src/dialogs.c:3056
+#: src/dialogs.c:3139
 msgid ""
 "\n"
 "This card is already in use and cannot be opened multiple times.\n"
 msgstr ""
 
-#: src/dialogs.c:3061
+#: src/dialogs.c:3145
 #, c-format
 msgid ""
 "\n"
@@ -4938,27 +4950,27 @@
 "- Check if the device actually exists.\n"
 msgstr ""
 
-#: src/dialogs.c:3068
+#: src/dialogs.c:3153
 msgid ""
 "\n"
 "This file already has subtitles loaded.\n"
 "Do you wish to overwrite the existing subtitles ?\n"
 msgstr ""
 
-#: src/dialogs.c:3072
+#: src/dialogs.c:3157
 msgid ""
 "\n"
 "LiVES currently only supports subtitles of type .srt and .sub.\n"
 msgstr ""
 
-#: src/dialogs.c:3076
+#: src/dialogs.c:3161
 msgid ""
 "\n"
 "Erase all subtitles from this clip.\n"
 "Are you sure ?\n"
 msgstr ""
 
-#: src/dialogs.c:3082
+#: src/dialogs.c:3168
 #, c-format
 msgid ""
 "\n"
@@ -4967,14 +4979,14 @@
 "or OK to continue and save as type \"%s\"\n"
 msgstr ""
 
-#: src/dialogs.c:3089
+#: src/dialogs.c:3176
 msgid ""
 "\n"
 "Do you wish to move the current clip sets to the new directory ?\n"
 "(If unsure, click Yes)\n"
 msgstr ""
 
-#: src/dialogs.c:3093
+#: src/dialogs.c:3181
 #, c-format
 msgid ""
 "\n"
@@ -4985,19 +4997,19 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:3099
+#: src/dialogs.c:3188
 msgid ""
 "\n"
 "No video input devices could be found.\n"
 msgstr ""
 
-#: src/dialogs.c:3103
+#: src/dialogs.c:3192
 msgid ""
 "\n"
 "All video input devices are already in use.\n"
 msgstr ""
 
-#: src/dialogs.c:3107
+#: src/dialogs.c:3196
 msgid ""
 "\n"
 "\n"
@@ -5005,15 +5017,14 @@
 "DO NOT SHUT DOWN OR CLOSE LIVES !\n"
 msgstr ""
 
-#: src/dialogs.c:3127
+#: src/dialogs.c:3203
 #, c-format
 msgid ""
 "No clips were recovered for set (%s).\n"
 "Please check the spelling of the set name and try again.\n"
 msgstr ""
 
-#. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:3136
+#: src/dialogs.c:3214
 #, c-format
 msgid ""
 "\n"
@@ -5025,7 +5036,7 @@
 msgstr ""
 
 #. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:3144
+#: src/dialogs.c:3222
 #, c-format
 msgid ""
 "\n"
@@ -5034,34 +5045,34 @@
 "\n"
 msgstr ""
 
-#: src/dialogs.c:3150
+#: src/dialogs.c:3228
 msgid ""
 "\n"
 "You must have autolives.pl installed and in your path to use this toy.\n"
 "Consult your package distributor.\n"
 msgstr ""
 
-#: src/dialogs.c:3154
+#: src/dialogs.c:3232
 msgid ""
 "\n"
 "You must have a minimum of one clip loaded to use this toy.\n"
 msgstr ""
 
-#: src/dialogs.c:3158
+#: src/dialogs.c:3236
 msgid ""
 "\n"
 "LiVES lost its connection to jack and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:3162
+#: src/dialogs.c:3240
 msgid ""
 "\n"
 "LiVES lost its connection to pulseaudio and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:3175
+#: src/dialogs.c:3254
 #, c-format
 msgid ""
 "\n"
@@ -5070,543 +5081,543 @@
 "Do you wish to allow this (for this session only) ?\n"
 msgstr ""
 
-#: src/effects.c:60
+#: src/effects.c:61
 msgid "generator"
 msgstr ""
 
-#: src/effects.c:61
+#: src/effects.c:62
 msgid "Generators"
 msgstr ""
 
-#: src/effects.c:63
+#: src/effects.c:64
 msgid "audio generator"
 msgstr ""
 
-#: src/effects.c:64
+#: src/effects.c:65
 msgid "Audio Generators"
 msgstr ""
 
-#: src/effects.c:66
+#: src/effects.c:67
 msgid "audio/video generator"
 msgstr ""
 
-#: src/effects.c:67
+#: src/effects.c:68
 msgid "Audio/Video Generators"
 msgstr ""
 
-#: src/effects.c:69
+#: src/effects.c:70
 msgid "data generator"
 msgstr ""
 
-#: src/effects.c:70
+#: src/effects.c:71
 msgid "Data Generators"
 msgstr ""
 
-#: src/effects.c:72
+#: src/effects.c:73
 msgid "data visualiser"
 msgstr ""
 
-#: src/effects.c:73
+#: src/effects.c:74
 msgid "Data Visualisers"
 msgstr ""
 
-#: src/effects.c:75
+#: src/effects.c:76
 msgid "data processor"
 msgstr ""
 
-#: src/effects.c:76
+#: src/effects.c:77
 msgid "Data Processors"
 msgstr ""
 
-#: src/effects.c:78
+#: src/effects.c:79
 msgid "data source"
 msgstr ""
 
-#: src/effects.c:79
+#: src/effects.c:80
 msgid "Data Sources"
 msgstr ""
 
-#: src/effects.c:81
+#: src/effects.c:82
 msgid "transition"
 msgstr ""
 
-#: src/effects.c:82
+#: src/effects.c:83
 msgid "Transitions"
 msgstr "Oʻtishlar"
 
-#: src/effects.c:84
+#: src/effects.c:85
 msgid "effect"
 msgstr ""
 
-#: src/effects.c:87 src/rfx-builder.c:187
+#: src/effects.c:88 src/rfx-builder.c:187
 msgid "utility"
 msgstr ""
 
-#: src/effects.c:88
+#: src/effects.c:89
 msgid "Utilities"
 msgstr "Воситалар"
 
-#: src/effects.c:90
+#: src/effects.c:91
 msgid "compositor"
 msgstr ""
 
-#: src/effects.c:91
+#: src/effects.c:92
 msgid "Compositors"
 msgstr ""
 
-#: src/effects.c:93
+#: src/effects.c:94
 msgid "tap"
 msgstr ""
 
-#: src/effects.c:94
+#: src/effects.c:95
 msgid "Taps"
 msgstr ""
 
-#: src/effects.c:96
+#: src/effects.c:97
 msgid "splitter"
 msgstr ""
 
-#: src/effects.c:97
+#: src/effects.c:98
 msgid "Splitters"
 msgstr ""
 
-#: src/effects.c:99
+#: src/effects.c:100
 msgid "converter"
 msgstr ""
 
-#: src/effects.c:100
+#: src/effects.c:101
 msgid "Converters"
 msgstr ""
 
-#: src/effects.c:102
+#: src/effects.c:103
 msgid "analyser"
 msgstr ""
 
-#: src/effects.c:103
+#: src/effects.c:104
 msgid "Analysers"
 msgstr ""
 
-#: src/effects.c:108
+#: src/effects.c:109
 msgid "audio/video"
 msgstr ""
 
-#: src/effects.c:109
+#: src/effects.c:110
 msgid "Audio/Video Transitions"
 msgstr ""
 
-#: src/effects.c:111
+#: src/effects.c:112
 msgid "video only"
 msgstr ""
 
-#: src/effects.c:112
+#: src/effects.c:113
 msgid "Video only Transitions"
 msgstr ""
 
-#: src/effects.c:114 src/multitrack.c:10740
+#: src/effects.c:115 src/multitrack.c:10962
 msgid "audio only"
 msgstr ""
 
-#: src/effects.c:115
+#: src/effects.c:116
 msgid "Audio only Transitions"
 msgstr ""
 
-#: src/effects.c:117 src/effects.c:120 src/multitrack.c:18757
+#: src/effects.c:118 src/effects.c:121 src/multitrack.c:19097
 msgid "audio"
 msgstr ""
 
-#: src/effects.c:118
+#: src/effects.c:119
 msgid "Audio Mixers"
 msgstr ""
 
-#: src/effects.c:121
+#: src/effects.c:122
 msgid "Audio Effects"
 msgstr ""
 
-#: src/effects.c:123
+#: src/effects.c:124
 msgid "video"
 msgstr ""
 
-#: src/effects.c:124
+#: src/effects.c:125
 msgid "Video Effects"
 msgstr ""
 
-#: src/effects.c:126
+#: src/effects.c:127
 msgid "audio volume controller"
 msgstr ""
 
-#: src/effects.c:127
+#: src/effects.c:128
 msgid "Audio Volume Controllers"
 msgstr ""
 
-#: src/effects.c:129
+#: src/effects.c:130
 msgid "video analyser"
 msgstr ""
 
-#: src/effects.c:130
+#: src/effects.c:131
 msgid "Video analysers"
 msgstr ""
 
-#: src/effects.c:132
+#: src/effects.c:133
 msgid "audio analyser"
 msgstr ""
 
-#: src/effects.c:133
+#: src/effects.c:134
 msgid "Audio Analysers"
 msgstr ""
 
-#: src/effects.c:137 src/plugins.c:2559 src/plugins.c:2573
+#: src/effects.c:138 src/plugins.c:2507 src/plugins.c:2521
 msgid "unknown"
 msgstr "номаълум"
 
-#: src/effects.c:238
+#: src/effects.c:235
 #, c-format
 msgid "%s all frames..."
 msgstr ""
 
-#: src/effects.c:243
+#: src/effects.c:239
 #, c-format
 msgid "%s clipboard into frames %d to %d..."
 msgstr ""
 
-#: src/effects.c:250
+#: src/effects.c:245
 #, c-format
 msgid "%s to clipboard..."
 msgstr ""
 
-#: src/effects.c:254
+#: src/effects.c:248
 #, c-format
 msgid "%s to new clip..."
 msgstr ""
 
-#: src/effects.c:259
+#: src/effects.c:252
 #, c-format
 msgid "%s frames %d to %d..."
 msgstr ""
 
-#: src/effects.c:290
+#: src/effects.c:283
 #, c-format
 msgid "%s clipboard with selection"
 msgstr ""
 
-#: src/effects.c:295
+#: src/effects.c:287
 #, c-format
 msgid "%s to clipboard"
 msgstr ""
 
-#: src/effects.c:299
+#: src/effects.c:290
 #, c-format
 msgid "%s to new clip"
 msgstr ""
 
-#: src/effects.c:304
+#: src/effects.c:294
 #, c-format
 msgid "%s frames %d to %d"
 msgstr ""
 
-#: src/effects.c:456 src/effects.c:523
+#: src/effects.c:443 src/effects.c:507
 msgid ""
 "\n"
 "No frames were generated.\n"
 msgstr ""
 
-#: src/effects-weed.c:431
+#: src/effects-weed.c:452
 msgid "integer"
 msgstr ""
 
-#: src/effects-weed.c:432
+#: src/effects-weed.c:454
 msgid "int64"
 msgstr ""
 
-#: src/effects-weed.c:433
+#: src/effects-weed.c:456
 msgid "boolean"
 msgstr ""
 
-#: src/effects-weed.c:434
+#: src/effects-weed.c:458
 msgid "double"
 msgstr ""
 
-#: src/effects-weed.c:435
+#: src/effects-weed.c:460
 msgid "string"
 msgstr ""
 
-#: src/effects-weed.c:436
+#: src/effects-weed.c:462
 msgid "pointer"
 msgstr ""
 
-#: src/effects-weed.c:4591
+#: src/effects-weed.c:4581
 #, c-format
 msgid "Error: plugin %s has no weed_setup() function.\n"
 msgstr ""
 
-#: src/effects-weed.c:4606
+#: src/effects-weed.c:4595
 #, c-format
 msgid "No usable filters found in plugin %s\n"
 msgstr ""
 
-#: src/effects-weed.c:4680
+#: src/effects-weed.c:4668
 #, c-format
 msgid "Found duplicate plugin %s"
 msgstr ""
 
-#: src/effects-weed.c:4734
+#: src/effects-weed.c:4723
 #, c-format
 msgid ""
 "Info: Unable to load plugin %s\n"
 "Error was: %s\n"
 msgstr ""
 
-#: src/effects-weed.c:4737 src/effects-weed.c:5858
+#: src/effects-weed.c:4726 src/effects-weed.c:5847
 msgid "Some plugin directories"
 msgstr ""
 
 #. TRANSLATORS: example " - LADSPA plugins -"
-#: src/effects-weed.c:4812 src/rte_window.c:2105
+#: src/effects-weed.c:4801 src/rte_window.c:2107
 #, c-format
 msgid " - %s plugins -"
 msgstr ""
 
-#: src/effects-weed.c:5012
+#: src/effects-weed.c:4998
 #, c-format
 msgid "Successfully loaded %d Weed filters\n"
 msgstr ""
 
-#: src/effects-weed.c:5177
+#: src/effects-weed.c:5162
 #, c-format
 msgid "Invalid compound effect %s - has conflicting target_fps\n"
 msgstr ""
 
-#: src/effects-weed.c:5197
+#: src/effects-weed.c:5182
 #, c-format
 msgid "Invalid compound effect %s - has multiple transition parameters\n"
 msgstr ""
 
-#: src/effects-weed.c:5211
+#: src/effects-weed.c:5196
 #, c-format
 msgid "Invalid compound effect %s - has multiple master volume parameters\n"
 msgstr ""
 
-#: src/effects-weed.c:5346
+#: src/effects-weed.c:5329
 #, c-format
 msgid "Invalid compound effect %s - must have >1 sub filters\n"
 msgstr ""
 
-#: src/effects-weed.c:5366
+#: src/effects-weed.c:5349
 #, c-format
 msgid "Invalid effect %s found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5381
+#: src/effects-weed.c:5364
 #, c-format
 msgid "Invalid default found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5392
+#: src/effects-weed.c:5375
 #, c-format
 msgid "Invalid filter %d for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5406
+#: src/effects-weed.c:5389
 #, c-format
 msgid "Invalid param %d for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5433
+#: src/effects-weed.c:5416
 #, c-format
 msgid ""
 "Invalid number of values for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5467
+#: src/effects-weed.c:5450
 #, c-format
 msgid ""
 "Invalid non-boolean value for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5500
+#: src/effects-weed.c:5483
 #, c-format
 msgid "Invalid param link found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5511
+#: src/effects-weed.c:5494
 #, c-format
 msgid ""
 "Invalid out filter %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5529
+#: src/effects-weed.c:5513
 #, c-format
 msgid ""
 "Invalid out param %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5541
+#: src/effects-weed.c:5526
 #, c-format
 msgid ""
 "Invalid non-boolean value for autoscale found in compound effect %s, line "
 "%d\n"
 msgstr ""
 
-#: src/effects-weed.c:5552
+#: src/effects-weed.c:5537
 #, c-format
 msgid ""
 "Invalid in filter %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5566
+#: src/effects-weed.c:5552
 #, c-format
 msgid ""
 "Invalid in param %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5594
+#: src/effects-weed.c:5581
 #, c-format
 msgid "Invalid channel link found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5605
+#: src/effects-weed.c:5592
 #, c-format
 msgid ""
 "Invalid out filter %d for link channels found in compound effect %s, line "
 "%d\n"
 msgstr ""
 
-#: src/effects-weed.c:5623
+#: src/effects-weed.c:5611
 #, c-format
 msgid ""
 "Invalid out channel %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5633
+#: src/effects-weed.c:5622
 #, c-format
 msgid ""
 "Invalid in filter %d for link channels found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5651
+#: src/effects-weed.c:5641
 #, c-format
 msgid ""
 "Invalid in channel %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5687
+#: src/effects-weed.c:5678
 #, c-format
 msgid "Compound:%s"
 msgstr ""
 
-#: src/effects-weed.c:5758
+#: src/effects-weed.c:5749
 #, c-format
 msgid "Successfully loaded %d compound filters\n"
 msgstr ""
 
-#: src/effects-weed.c:6591
+#: src/effects-weed.c:6570
 #, c-format
 msgid "Effect %s cannot be used with this audio player.\n"
 msgstr ""
 
-#: src/effects-weed.c:6737
+#: src/effects-weed.c:6718
 #, c-format
 msgid "Failed to start instance %s, error code %d\n"
 msgstr ""
 
-#: src/effects-weed.c:6814
+#: src/effects-weed.c:6797
 #, c-format
 msgid "Unable to start generator %s\n"
 msgstr ""
 
-#: src/effects-weed.c:7621
+#: src/effects-weed.c:7607
 #, c-format
 msgid "Failed to start generator %s\n"
 msgstr ""
 
-#: src/effects-weed.c:7718
+#: src/effects-weed.c:7701
 #, c-format
 msgid "Failed to start generator %s, error %d\n"
 msgstr ""
 
-#: src/effects-weed.c:9012
+#: src/effects-weed.c:8993
 #, c-format
 msgid "%s [unstable] (%s)"
 msgstr ""
 
-#: src/effects-data.c:3278
+#: src/effects-data.c:3234
 #, c-format
 msgid "ACTIVATE (%s)"
 msgstr ""
 
-#: src/effects-data.c:3548
+#: src/effects-data.c:3501
 msgid "ACTIVATE"
 msgstr ""
 
-#: src/effects-data.c:3876
+#: src/effects-data.c:3829
 #, c-format
 msgid "Key slot %d"
 msgstr ""
 
-#: src/effects-data.c:3998
+#: src/effects-data.c:3951
 msgid "Autoscale"
 msgstr ""
 
-#: src/effects-data.c:4089
+#: src/effects-data.c:4042
 msgid "Add another connection for this output parameter"
 msgstr ""
 
-#: src/effects-data.c:4102 src/effects-data.c:4151
+#: src/effects-data.c:4055 src/effects-data.c:4104
 msgid "Delete this connection"
 msgstr ""
 
-#: src/effects-data.c:4138
+#: src/effects-data.c:4091
 msgid "Add another connection for this output channel"
 msgstr ""
 
-#: src/effects-data.c:4223
+#: src/effects-data.c:4176
 msgid "Connected to -->"
 msgstr ""
 
-#: src/effects-data.c:4243
+#: src/effects-data.c:4196
 #, c-format
 msgid "%s - Alpha Channel Connections"
 msgstr ""
 
-#: src/effects-data.c:4316
+#: src/effects-data.c:4269
 #, c-format
 msgid "%s - Parameter Data Connections"
 msgstr ""
 
-#: src/effects-data.c:4336
+#: src/effects-data.c:4289
 msgid "Autoscale All"
 msgstr ""
 
-#: src/effects-data.c:4361 src/effects-data.c:4890
+#: src/effects-data.c:4314 src/effects-data.c:4841
 msgid "ACTIVATED"
 msgstr ""
 
-#: src/effects-data.c:4774
+#: src/effects-data.c:4726
 msgid "LiVES: - Parameter and Alpha Channel Connections"
 msgstr ""
 
-#: src/effects-data.c:4785
+#: src/effects-data.c:4736
 msgid "Auto Connect Channels"
 msgstr ""
 
-#: src/effects-data.c:4797
+#: src/effects-data.c:4748
 msgid "Auto Connect Parameters"
 msgstr ""
 
-#: src/effects-data.c:4807
+#: src/effects-data.c:4758
 msgid "Disconnect All"
 msgstr ""
 
-#: src/effects-data.c:4875
+#: src/effects-data.c:4826
 #, c-format
 msgid "Input channel is already connected from (%d,%d) %s"
 msgstr ""
 
-#: src/effects-data.c:4891
+#: src/effects-data.c:4842
 #, c-format
 msgid "Input parameter is already connected from (%d,%d) %s"
 msgstr ""
 
-#: src/effects-data.c:4899
+#: src/effects-data.c:4851
 msgid "Input and output parameters are not compatible"
 msgstr ""
 
@@ -5618,43 +5629,43 @@
 msgid "_Reset Values"
 msgstr ""
 
-#: src/framedraw.c:267
+#: src/framedraw.c:265
 msgid "_Frame"
 msgstr ""
 
-#: src/paramspecial.c:266
+#: src/paramspecial.c:259
 msgid "Maintain _Aspect Ratio"
 msgstr ""
 
-#: src/paramspecial.c:267
+#: src/paramspecial.c:260
 msgid "Maintain aspect ratio of original frame"
 msgstr ""
 
-#: src/paramspecial.c:341
+#: src/paramspecial.c:335
 msgid "Display Password"
 msgstr ""
 
-#: src/paramwindow.c:450
+#: src/paramwindow.c:447
 msgid "Transition _In"
 msgstr ""
 
-#: src/paramwindow.c:452
+#: src/paramwindow.c:449
 msgid "Click to set the transition parameter to show only the front frame"
 msgstr ""
 
-#: src/paramwindow.c:474
+#: src/paramwindow.c:472
 msgid "Crossfade audio"
 msgstr ""
 
-#: src/paramwindow.c:475
+#: src/paramwindow.c:473
 msgid "Check the box to make audio transition with the video"
 msgstr ""
 
-#: src/paramwindow.c:493
+#: src/paramwindow.c:492
 msgid "Transition _Out"
 msgstr ""
 
-#: src/paramwindow.c:495
+#: src/paramwindow.c:494
 msgid "Click to set the transition parameter to show only the rear frame"
 msgstr ""
 
@@ -5667,23 +5678,23 @@
 msgid "%s : size"
 msgstr ""
 
-#: src/paramwindow.c:598
+#: src/paramwindow.c:597
 msgid "New size (pixels)"
 msgstr ""
 
-#: src/paramwindow.c:617 src/plugins.c:997
+#: src/paramwindow.c:616 src/plugins.c:973
 msgid "_Width"
 msgstr ""
 
-#: src/paramwindow.c:636 src/plugins.c:1003
+#: src/paramwindow.c:635 src/plugins.c:979
 msgid "_Height"
 msgstr ""
 
-#: src/paramwindow.c:684
+#: src/paramwindow.c:683
 msgid "Generate to _Clipboard"
 msgstr ""
 
-#: src/paramwindow.c:686
+#: src/paramwindow.c:685
 msgid "Generate frames to the clipboard"
 msgstr ""
 
@@ -5695,7 +5706,7 @@
 msgid "Generate frames to a new clip"
 msgstr ""
 
-#: src/paramwindow.c:822
+#: src/paramwindow.c:824
 #, c-format
 msgid ""
 "\n"
@@ -5703,71 +5714,71 @@
 "\n"
 msgstr ""
 
-#: src/paramwindow.c:920 src/paramwindow.c:930
+#: src/paramwindow.c:934 src/paramwindow.c:942
 msgid "Set as default"
 msgstr ""
 
-#: src/paramwindow.c:922 src/paramwindow.c:938
+#: src/paramwindow.c:936 src/paramwindow.c:950
 msgid "Reset"
 msgstr ""
 
-#: src/paramwindow.c:932 src/rte_window.c:2401 src/omc-learn.c:1357
+#: src/paramwindow.c:944 src/rte_window.c:2394 src/omc-learn.c:1347
 msgid "Close _window"
 msgstr ""
 
-#: src/paramwindow.c:1337
+#: src/paramwindow.c:1340
 msgid "No parameters"
 msgstr ""
 
-#: src/paramwindow.c:1419
+#: src/paramwindow.c:1424
 msgid "Invalid parameter"
 msgstr ""
 
-#: src/paramwindow.c:1611
+#: src/paramwindow.c:1610
 msgid "LiVES: - Select Colour"
 msgstr ""
 
-#: src/paramwindow.c:1616
+#: src/paramwindow.c:1615
 msgid "Click to set the colour"
 msgstr ""
 
-#: src/paramwindow.c:1628
+#: src/paramwindow.c:1626
 msgid "_Red"
 msgstr ""
 
-#: src/paramwindow.c:1629
+#: src/paramwindow.c:1627
 msgid "The red value (0 - 255)"
 msgstr ""
 
-#: src/paramwindow.c:1632
+#: src/paramwindow.c:1630
 msgid "_Green"
 msgstr ""
 
-#: src/paramwindow.c:1633
+#: src/paramwindow.c:1631
 msgid "The green value (0 - 255)"
 msgstr ""
 
-#: src/paramwindow.c:1636
+#: src/paramwindow.c:1634
 msgid "_Blue"
 msgstr ""
 
-#: src/paramwindow.c:1637
+#: src/paramwindow.c:1635
 msgid "The blue value (0 - 255)"
 msgstr ""
 
-#: src/plugins.c:85
+#: src/plugins.c:86
 #, c-format
 msgid ""
 "\n"
 "Plugin error: %s failed with code %d"
 msgstr ""
 
-#: src/plugins.c:87
+#: src/plugins.c:88
 #, c-format
 msgid " : message was %s\n"
 msgstr ""
 
-#: src/plugins.c:387
+#: src/plugins.c:375
 #, c-format
 msgid ""
 "\n"
@@ -5777,17 +5788,17 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/plugins.c:397
+#: src/plugins.c:385
 #, c-format
 msgid "Updating video playback plugin defaults in %s\n"
 msgstr ""
 
-#: src/plugins.c:452
+#: src/plugins.c:444
 #, c-format
 msgid "Loading video playback plugin defaults from %s..."
 msgstr ""
 
-#: src/plugins.c:515
+#: src/plugins.c:505
 #, c-format
 msgid ""
 "\n"
@@ -5797,32 +5808,32 @@
 "\n"
 msgstr ""
 
-#: src/plugins.c:855
+#: src/plugins.c:836
 #, c-format
 msgid "Saving playback plugin defaults to %s..."
 msgstr ""
 
-#: src/plugins.c:962
+#: src/plugins.c:939
 msgid "_FPS"
 msgstr "_FPS"
 
-#: src/plugins.c:963
+#: src/plugins.c:940
 msgid "Fixed framerate for plugin.\n"
 msgstr ""
 
-#: src/plugins.c:1032
+#: src/plugins.c:1008
 msgid "_Colourspace"
 msgstr ""
 
-#: src/plugins.c:1033
+#: src/plugins.c:1009
 msgid "Colourspace input to the plugin.\n"
 msgstr ""
 
-#: src/plugins.c:1089
+#: src/plugins.c:1065
 msgid "Save settings to an alternate file.\n"
 msgstr ""
 
-#: src/plugins.c:1206
+#: src/plugins.c:1182
 #, c-format
 msgid ""
 "\n"
@@ -5831,7 +5842,7 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/plugins.c:1252
+#: src/plugins.c:1228
 #, c-format
 msgid ""
 "\n"
@@ -5841,38 +5852,38 @@
 "Unable to use it.\n"
 msgstr ""
 
-#: src/plugins.c:1265
+#: src/plugins.c:1241
 #, c-format
 msgid ""
 "Video playback plugin failed to initialise.\n"
 "Error was: %s\n"
 msgstr ""
 
-#: src/plugins.c:1461
+#: src/plugins.c:1428
 msgid ""
 "\n"
 "Warning ! Video playback plugin will not send key presses. Keyboard may be "
 "disabled during plugin use !\n"
 msgstr ""
 
-#: src/plugins.c:1465
+#: src/plugins.c:1433
 #, c-format
 msgid ""
 "*** Using %s plugin for fs playback, agreed to use palette type %d ( %s ). "
 "***\n"
 msgstr ""
 
-#: src/plugins.c:1571
+#: src/plugins.c:1537
 #, c-format
 msgid "Audio stream unable to use preferred format '%s'\n"
 msgstr ""
 
-#: src/plugins.c:1579
+#: src/plugins.c:1543
 #, c-format
 msgid "Using format '%s' instead.\n"
 msgstr ""
 
-#: src/plugins.c:1616
+#: src/plugins.c:1579
 #, c-format
 msgid ""
 "LiVES was unable to find its encoder plugins. Please make sure you have the "
@@ -5881,7 +5892,7 @@
 "or change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/plugins.c:1624
+#: src/plugins.c:1589
 #, c-format
 msgid ""
 "LiVES did not receive a response from the encoder plugin called '%s'.\n"
@@ -5890,11 +5901,11 @@
 "or switch to another plugin using Tools|Preferences|Encoding\n"
 msgstr ""
 
-#: src/plugins.c:2032
+#: src/plugins.c:1987
 msgid "Unable to resize, please install imageMagick\n"
 msgstr ""
 
-#: src/plugins.c:2231
+#: src/plugins.c:2183
 #, c-format
 msgid ""
 "\n"
@@ -5902,12 +5913,12 @@
 "No decoders found in %s !\n"
 msgstr ""
 
-#: src/plugins.c:2415
+#: src/plugins.c:2369
 #, fuzzy, c-format
 msgid " using %s"
 msgstr "%s очилмоқда"
 
-#: src/plugins.c:2499
+#: src/plugins.c:2451
 #, c-format
 msgid ""
 "\n"
@@ -5916,7 +5927,7 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/plugins.c:2522
+#: src/plugins.c:2472
 #, c-format
 msgid ""
 "\n"
@@ -5926,24 +5937,24 @@
 "Unable to use it.\n"
 msgstr ""
 
-#: src/plugins.c:2564
+#: src/plugins.c:2512
 msgid "/unknown"
 msgstr ""
 
-#: src/plugins.c:2651
+#: src/plugins.c:2598
 msgid "LiVES: - Decoder Plugins"
 msgstr ""
 
-#: src/plugins.c:2669
+#: src/plugins.c:2616
 msgid "Enabled Video Decoders (uncheck to disable)"
 msgstr ""
 
-#: src/plugins.c:2726
+#: src/plugins.c:2672
 #, c-format
 msgid "Failed to load %s, transitions may not resize.\n"
 msgstr ""
 
-#: src/plugins.c:3854
+#: src/plugins.c:3797
 #, c-format
 msgid "%s advanced settings"
 msgstr ""
@@ -5952,15 +5963,15 @@
 msgid "LiVES: - New Test RFX"
 msgstr ""
 
-#: src/rfx-builder.c:136
+#: src/rfx-builder.c:135
 msgid "LiVES: - Edit Test RFX"
 msgstr ""
 
-#: src/rfx-builder.c:166
+#: src/rfx-builder.c:165
 msgid "Type:"
 msgstr "Тури:"
 
-#: src/rfx-builder.c:184
+#: src/rfx-builder.c:183
 msgid "tool"
 msgstr ""
 
@@ -5972,130 +5983,130 @@
 msgid "The name of the plugin. No spaces allowed."
 msgstr ""
 
-#: src/rfx-builder.c:201
+#: src/rfx-builder.c:202
 msgid "Version:       "
 msgstr ""
 
-#: src/rfx-builder.c:203
+#: src/rfx-builder.c:204
 msgid "The script version."
 msgstr ""
 
-#: src/rfx-builder.c:210
+#: src/rfx-builder.c:212
 msgid "    Author:       "
 msgstr ""
 
-#: src/rfx-builder.c:211
+#: src/rfx-builder.c:213
 msgid "The script author."
 msgstr ""
 
-#: src/rfx-builder.c:217
+#: src/rfx-builder.c:220
 msgid "    URL (optional):       "
 msgstr ""
 
-#: src/rfx-builder.c:218
+#: src/rfx-builder.c:221
 msgid "URL for the plugin maintainer."
 msgstr ""
 
-#: src/rfx-builder.c:226
+#: src/rfx-builder.c:230
 msgid "Menu text:    "
 msgstr ""
 
-#: src/rfx-builder.c:227
+#: src/rfx-builder.c:231
 msgid "The text to show in the menu."
 msgstr ""
 
-#: src/rfx-builder.c:239
+#: src/rfx-builder.c:244
 msgid "Action description:        "
 msgstr ""
 
-#: src/rfx-builder.c:241
+#: src/rfx-builder.c:246
 msgid "Describe what the plugin is doing. E.g. \"Edge detecting\""
 msgstr ""
 
-#: src/rfx-builder.c:246
+#: src/rfx-builder.c:251
 msgid "Minimum frames:"
 msgstr ""
 
-#: src/rfx-builder.c:249
+#: src/rfx-builder.c:254
 msgid ""
 "Minimum number of frames this effect/tool can be applied to. Normally 1."
 msgstr ""
 
-#: src/rfx-builder.c:260
+#: src/rfx-builder.c:265
 msgid "_Requirements..."
 msgstr ""
 
-#: src/rfx-builder.c:263
+#: src/rfx-builder.c:268
 msgid "Enter any binaries required by the plugin."
 msgstr ""
 
-#: src/rfx-builder.c:267
+#: src/rfx-builder.c:272
 msgid "_Properties..."
 msgstr ""
 
-#: src/rfx-builder.c:270
+#: src/rfx-builder.c:275
 msgid "Set properties for the plugin. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:274
+#: src/rfx-builder.c:279
 msgid "_Parameters..."
 msgstr ""
 
-#: src/rfx-builder.c:277
+#: src/rfx-builder.c:282
 msgid "Set up parameters used in pre/loop/post/trigger code. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:281
+#: src/rfx-builder.c:286
 msgid "Parameter _Window Hints..."
 msgstr ""
 
-#: src/rfx-builder.c:284
+#: src/rfx-builder.c:289
 msgid "Set hints about how to lay out the parameter window. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:290
+#: src/rfx-builder.c:295
 msgid "_Language code:"
 msgstr ""
 
-#: src/rfx-builder.c:291
+#: src/rfx-builder.c:296
 msgid "Language for pre/loop/post/triggers. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:300
+#: src/rfx-builder.c:305
 msgid "_Pre loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:303
+#: src/rfx-builder.c:308
 msgid "Code to be executed before the loop. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:307
+#: src/rfx-builder.c:312
 msgid "_Loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:310
+#: src/rfx-builder.c:315
 msgid "Loop code to be applied to each frame."
 msgstr ""
 
-#: src/rfx-builder.c:314
+#: src/rfx-builder.c:319
 msgid "_Post loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:317
+#: src/rfx-builder.c:322
 msgid "Code to be executed after the loop. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:321
+#: src/rfx-builder.c:326
 msgid "_Trigger code..."
 msgstr ""
 
-#: src/rfx-builder.c:324
+#: src/rfx-builder.c:329
 msgid ""
 "Set trigger code for when the parameter window is shown, or when a parameter "
 "is changed. Optional (except for Utilities)."
 msgstr ""
 
-#: src/rfx-builder.c:421
+#: src/rfx-builder.c:426
 #, c-format
 msgid ""
 "\n"
@@ -6105,55 +6116,55 @@
 "%s\n"
 msgstr ""
 
-#: src/rfx-builder.c:544
+#: src/rfx-builder.c:541
 msgid "LiVES: - RFX Requirements"
 msgstr ""
 
-#: src/rfx-builder.c:548
+#: src/rfx-builder.c:544
 msgid "LiVES: - RFX Parameters"
 msgstr ""
 
-#: src/rfx-builder.c:552
+#: src/rfx-builder.c:547
 msgid "LiVES: - RFX Parameter Window Hints"
 msgstr ""
 
-#: src/rfx-builder.c:556
+#: src/rfx-builder.c:550
 msgid "LiVES: - RFX Triggers"
 msgstr ""
 
-#: src/rfx-builder.c:622
+#: src/rfx-builder.c:613
 msgid "_New Entry"
 msgstr ""
 
-#: src/rfx-builder.c:625
+#: src/rfx-builder.c:616
 msgid "_Edit Entry"
 msgstr ""
 
-#: src/rfx-builder.c:628
+#: src/rfx-builder.c:619
 msgid "_Remove Entry"
 msgstr ""
 
-#: src/rfx-builder.c:632
+#: src/rfx-builder.c:623
 msgid "Move _Up"
 msgstr "_Юқорига кўтариш"
 
-#: src/rfx-builder.c:635
+#: src/rfx-builder.c:626
 msgid "Move _Down"
 msgstr ""
 
-#: src/rfx-builder.c:1004
+#: src/rfx-builder.c:984
 msgid "LiVES: - RFX Properties"
 msgstr ""
 
-#: src/rfx-builder.c:1013
+#: src/rfx-builder.c:993
 msgid "_Slow (hint to GUI)"
 msgstr ""
 
-#: src/rfx-builder.c:1024
+#: src/rfx-builder.c:1004
 msgid "_Batch mode generator"
 msgstr ""
 
-#: src/rfx-builder.c:1831
+#: src/rfx-builder.c:1790
 msgid ""
 "\n"
 "\n"
@@ -6162,7 +6173,7 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:1875
+#: src/rfx-builder.c:1834
 msgid ""
 "\n"
 "\n"
@@ -6170,219 +6181,219 @@
 "Please check the trigger code.\n"
 msgstr ""
 
-#: src/rfx-builder.c:1994
+#: src/rfx-builder.c:1950
 msgid "LiVES: - New RFX Parameter"
 msgstr ""
 
-#: src/rfx-builder.c:1997
+#: src/rfx-builder.c:1952
 msgid "LiVES: - Edit RFX Parameter"
 msgstr ""
 
-#: src/rfx-builder.c:2013
+#: src/rfx-builder.c:1968
 msgid "_Name:    "
 msgstr ""
 
-#: src/rfx-builder.c:2016
+#: src/rfx-builder.c:1971
 msgid "Name of the parameter, must be unique in the plugin."
 msgstr ""
 
-#: src/rfx-builder.c:2025
+#: src/rfx-builder.c:1981
 msgid "_Label:    "
 msgstr ""
 
-#: src/rfx-builder.c:2028
+#: src/rfx-builder.c:1984
 msgid ""
 "Label to be shown by the parameter. An underscore represents mnemonic "
 "accelerator."
 msgstr ""
 
-#: src/rfx-builder.c:2039
+#: src/rfx-builder.c:1996
 msgid "_Type:         "
 msgstr ""
 
-#: src/rfx-builder.c:2040
+#: src/rfx-builder.c:1997
 msgid "Parameter type (select from list)."
 msgstr ""
 
-#: src/rfx-builder.c:2073
+#: src/rfx-builder.c:2029
 msgid "Decimal _places: "
 msgstr ""
 
-#: src/rfx-builder.c:2082 src/rfx-builder.c:2477 src/rfx-builder.c:2495
+#: src/rfx-builder.c:2038 src/rfx-builder.c:2430 src/rfx-builder.c:2447
 msgid "_Default value:    "
 msgstr ""
 
-#: src/rfx-builder.c:2098
+#: src/rfx-builder.c:2054
 msgid "_Default: "
 msgstr ""
 
-#: src/rfx-builder.c:2132
+#: src/rfx-builder.c:2087
 msgid "Button _Group: "
 msgstr ""
 
-#: src/rfx-builder.c:2134
+#: src/rfx-builder.c:2089
 msgid "A non-zero value can be used to group radio buttons."
 msgstr ""
 
-#: src/rfx-builder.c:2142 src/rfx-builder.c:2478
+#: src/rfx-builder.c:2097 src/rfx-builder.c:2431
 msgid "_Minimum value: "
 msgstr ""
 
-#: src/rfx-builder.c:2148 src/rfx-builder.c:2479
+#: src/rfx-builder.c:2103 src/rfx-builder.c:2432
 msgid "Ma_ximum value: "
 msgstr ""
 
-#: src/rfx-builder.c:2157
+#: src/rfx-builder.c:2113
 msgid "     _Step size:   "
 msgstr ""
 
-#: src/rfx-builder.c:2160
+#: src/rfx-builder.c:2117
 msgid ""
 "How much the parameter is adjusted when the spinbutton arrows are pressed."
 msgstr ""
 
-#: src/rfx-builder.c:2171
+#: src/rfx-builder.c:2129
 msgid "_Wrap value"
 msgstr ""
 
-#: src/rfx-builder.c:2172
+#: src/rfx-builder.c:2131
 msgid "Whether the value wraps max->min and min->max."
 msgstr ""
 
-#: src/rfx-builder.c:2470
+#: src/rfx-builder.c:2424
 msgid "Set _values"
 msgstr ""
 
-#: src/rfx-builder.c:2512
+#: src/rfx-builder.c:2463
 msgid "Default _Red:  "
 msgstr ""
 
-#: src/rfx-builder.c:2513
+#: src/rfx-builder.c:2464
 msgid "Default _Green:"
 msgstr ""
 
-#: src/rfx-builder.c:2514
+#: src/rfx-builder.c:2465
 msgid "Default _Blue: "
 msgstr ""
 
-#: src/rfx-builder.c:2538
+#: src/rfx-builder.c:2488
 msgid "Set _default"
 msgstr ""
 
-#: src/rfx-builder.c:2540
+#: src/rfx-builder.c:2490
 msgid "Default value:  "
 msgstr ""
 
-#: src/rfx-builder.c:2541
+#: src/rfx-builder.c:2491
 msgid "Maximum length (chars): "
 msgstr ""
 
-#: src/rfx-builder.c:2576
+#: src/rfx-builder.c:2526
 msgid "LiVES: - New RFX Parameter Window Hint"
 msgstr ""
 
-#: src/rfx-builder.c:2579
+#: src/rfx-builder.c:2528
 msgid "LiVES: - Edit RFX Parameter Window Hint"
 msgstr ""
 
-#: src/rfx-builder.c:2622
+#: src/rfx-builder.c:2569
 msgid "_Keyword:         "
 msgstr ""
 
-#: src/rfx-builder.c:2639
+#: src/rfx-builder.c:2586
 msgid "Special _Type:         "
 msgstr ""
 
-#: src/rfx-builder.c:2656
+#: src/rfx-builder.c:2602
 msgid "Special _Subtype:         "
 msgstr ""
 
-#: src/rfx-builder.c:2667 src/rfx-builder.c:2706
+#: src/rfx-builder.c:2613 src/rfx-builder.c:2651
 msgid "Row:    "
 msgstr ""
 
-#: src/rfx-builder.c:2732
+#: src/rfx-builder.c:2676
 #, c-format
 msgid "Linked parameters (%d):    "
 msgstr ""
 
-#: src/rfx-builder.c:2749
+#: src/rfx-builder.c:2693
 msgid "Linked parameters (4):    "
 msgstr ""
 
-#: src/rfx-builder.c:2752
+#: src/rfx-builder.c:2695
 msgid "Linked parameters (2):    "
 msgstr ""
 
-#: src/rfx-builder.c:2777
+#: src/rfx-builder.c:2720
 msgid "LiVES: - New RFX Trigger"
 msgstr ""
 
-#: src/rfx-builder.c:2780
+#: src/rfx-builder.c:2722
 msgid "LiVES: - Edit RFX Trigger"
 msgstr ""
 
-#: src/rfx-builder.c:2808
+#: src/rfx-builder.c:2750
 msgid "When:         "
 msgstr ""
 
-#: src/rfx-builder.c:2904
+#: src/rfx-builder.c:2846
 msgid "LiVES: - Pre Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:2911
+#: src/rfx-builder.c:2853
 msgid "LiVES: - Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:2918
+#: src/rfx-builder.c:2860
 msgid "LiVES: - Post Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:2931
+#: src/rfx-builder.c:2873
 #, c-format
 msgid "LiVES: - Default text (max length %d)"
 msgstr ""
 
-#: src/rfx-builder.c:2944
+#: src/rfx-builder.c:2885
 msgid "LiVES: - Enter values, one per line"
 msgstr ""
 
-#: src/rfx-builder.c:3055
+#: src/rfx-builder.c:2996
 msgid ""
 "\n"
 "\n"
 "Name must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3060
+#: src/rfx-builder.c:3001
 msgid ""
 "\n"
 "\n"
 "Name must not contain spaces.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3065
+#: src/rfx-builder.c:3006
 msgid ""
 "\n"
 "\n"
 "Menu text must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3071
+#: src/rfx-builder.c:3012
 msgid ""
 "\n"
 "\n"
 "Action description must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3076
+#: src/rfx-builder.c:3017
 msgid ""
 "\n"
 "\n"
 "Author must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3085 src/rfx-builder.c:4339
+#: src/rfx-builder.c:3026 src/rfx-builder.c:4253
 msgid ""
 "\n"
 "\n"
@@ -6390,28 +6401,28 @@
 "Name must be unique.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3092
+#: src/rfx-builder.c:3033
 msgid ""
 "\n"
 "\n"
 "Loop code should not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3098
+#: src/rfx-builder.c:3039
 msgid ""
 "\n"
 "\n"
 "Trigger code should not be blank for a utility.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3111
+#: src/rfx-builder.c:3052
 msgid ""
 "\n"
 "\n"
 "Parameter name must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3117
+#: src/rfx-builder.c:3058
 msgid ""
 "\n"
 "\n"
@@ -6420,41 +6431,41 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:3171
+#: src/rfx-builder.c:3111
 #, c-format
 msgid "Writing script file %s..."
 msgstr ""
 
-#: src/rfx-builder.c:3477
+#: src/rfx-builder.c:3411
 msgid "No <define> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3484 src/rfx-builder.c:3493
+#: src/rfx-builder.c:3418 src/rfx-builder.c:3427
 msgid "Bad script version.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3505
+#: src/rfx-builder.c:3439
 msgid "No <name> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3513
+#: src/rfx-builder.c:3447
 msgid "No <version> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3522
+#: src/rfx-builder.c:3456
 msgid "No <author> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3536
+#: src/rfx-builder.c:3470
 msgid "No <description> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3540
+#: src/rfx-builder.c:3474
 #, c-format
 msgid "Bad description. (%s)\n"
 msgstr ""
 
-#: src/rfx-builder.c:3702
+#: src/rfx-builder.c:3627
 #, c-format
 msgid ""
 "\n"
@@ -6464,27 +6475,27 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:3859
+#: src/rfx-builder.c:3780
 msgid "Rebuilding all RFX scripts...builtin..."
 msgstr ""
 
-#: src/rfx-builder.c:3860
+#: src/rfx-builder.c:3781
 msgid "Rebuilding scripts"
 msgstr ""
 
-#: src/rfx-builder.c:3868
+#: src/rfx-builder.c:3789
 msgid "custom..."
 msgstr ""
 
-#: src/rfx-builder.c:3872
+#: src/rfx-builder.c:3793
 msgid "test..."
 msgstr ""
 
-#: src/rfx-builder.c:3878
+#: src/rfx-builder.c:3799
 msgid "rebuilding dynamic menu entries..."
 msgstr ""
 
-#: src/rfx-builder.c:3905 src/rfx-builder.c:3912
+#: src/rfx-builder.c:3826 src/rfx-builder.c:3834
 #, c-format
 msgid ""
 "\n"
@@ -6493,7 +6504,7 @@
 "Please check this program is in your path and executable.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3951
+#: src/rfx-builder.c:3874
 #, c-format
 msgid ""
 "\n"
@@ -6503,12 +6514,12 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:3960
+#: src/rfx-builder.c:3884
 #, c-format
 msgid "Deleting rfx script %s..."
 msgstr ""
 
-#: src/rfx-builder.c:3980
+#: src/rfx-builder.c:3902
 #, c-format
 msgid ""
 "\n"
@@ -6518,7 +6529,7 @@
 "Error code was %d\n"
 msgstr ""
 
-#: src/rfx-builder.c:4016
+#: src/rfx-builder.c:3938
 #, c-format
 msgid ""
 "\n"
@@ -6528,12 +6539,12 @@
 "Please delete it first, or rename the test script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4027
+#: src/rfx-builder.c:3950
 #, c-format
 msgid "Promoting rfx test plugin %s to custom..."
 msgstr ""
 
-#: src/rfx-builder.c:4044
+#: src/rfx-builder.c:3965
 #, c-format
 msgid ""
 "\n"
@@ -6544,20 +6555,20 @@
 "Return code was %d (%s)\n"
 msgstr ""
 
-#: src/rfx-builder.c:4070
+#: src/rfx-builder.c:3990
 msgid "LiVES: - Export Script to..."
 msgstr ""
 
-#: src/rfx-builder.c:4077 src/rfx-builder.c:4156
+#: src/rfx-builder.c:3997 src/rfx-builder.c:4074
 #, c-format
 msgid "Copying %s to %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4105
+#: src/rfx-builder.c:4024
 msgid "LiVES: Import Script from..."
 msgstr ""
 
-#: src/rfx-builder.c:4148
+#: src/rfx-builder.c:4067
 #, c-format
 msgid ""
 "\n"
@@ -6567,43 +6578,43 @@
 "Please delete it first, or rename the import script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4249
+#: src/rfx-builder.c:4166
 msgid "LiVES: - Copy RFX Script"
 msgstr ""
 
-#: src/rfx-builder.c:4251
+#: src/rfx-builder.c:4168
 msgid "_From type:    "
 msgstr ""
 
-#: src/rfx-builder.c:4258
+#: src/rfx-builder.c:4175
 msgid "   Script:    "
 msgstr ""
 
-#: src/rfx-builder.c:4267
+#: src/rfx-builder.c:4183
 msgid "LiVES: - Rename test RFX Script"
 msgstr ""
 
-#: src/rfx-builder.c:4268
+#: src/rfx-builder.c:4184
 msgid "From script: "
 msgstr ""
 
-#: src/rfx-builder.c:4273
+#: src/rfx-builder.c:4188
 msgid "LiVES: - RFX Script name"
 msgstr ""
 
-#: src/rfx-builder.c:4274
+#: src/rfx-builder.c:4189
 msgid "Script name: "
 msgstr ""
 
-#: src/rfx-builder.c:4294
+#: src/rfx-builder.c:4209
 msgid "New name: "
 msgstr ""
 
-#: src/rfx-builder.c:4297
+#: src/rfx-builder.c:4212
 msgid "New script name: "
 msgstr ""
 
-#: src/rfx-builder.c:4372
+#: src/rfx-builder.c:4286
 msgid ""
 "\n"
 "\n"
@@ -6611,12 +6622,12 @@
 "Script name must be unique.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4384
+#: src/rfx-builder.c:4297
 #, c-format
 msgid "Renaming RFX test script %s to %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4390
+#: src/rfx-builder.c:4302
 #, c-format
 msgid ""
 "\n"
@@ -6627,21 +6638,21 @@
 "Return code was %d\n"
 msgstr ""
 
-#: src/rfx-builder.c:4610
+#: src/rfx-builder.c:4518
 msgid "_Apply Real Time Effects to Selection"
 msgstr ""
 
-#: src/rfx-builder.c:4664
+#: src/rfx-builder.c:4572
 #, c-format
 msgid "Loading rendered effect %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4766
+#: src/rfx-builder.c:4674
 msgid ""
 "See: VJ - show VJ keys. Set the realtime effects, and then apply them here."
 msgstr ""
 
-#: src/preferences.c:359
+#: src/preferences.c:351
 msgid ""
 "\n"
 "\n"
@@ -6649,7 +6660,7 @@
 "full screen, separate window (fs) mode\n"
 msgstr ""
 
-#: src/preferences.c:408
+#: src/preferences.c:400
 msgid ""
 "\n"
 "\n"
@@ -6657,7 +6668,7 @@
 "(Free space = UNKNOWN)"
 msgstr ""
 
-#: src/preferences.c:412
+#: src/preferences.c:403
 #, c-format
 msgid ""
 "\n"
@@ -6666,14 +6677,14 @@
 "(Free space = %s)"
 msgstr ""
 
-#: src/preferences.c:416
+#: src/preferences.c:408
 msgid ""
 "The temp directory is LiVES working directory where opened clips and sets "
 "are stored.\n"
 "It should be in a partition with plenty of free disk space.\n"
 msgstr ""
 
-#: src/preferences.c:784
+#: src/preferences.c:839
 #, c-format
 msgid ""
 "Unable to create or write to the new temporary directory.\n"
@@ -6684,7 +6695,7 @@
 "The directory will not be changed now.\n"
 msgstr ""
 
-#: src/preferences.c:786
+#: src/preferences.c:843
 #, c-format
 msgid ""
 "Unable to create or write to the new temporary directory.\n"
@@ -6694,7 +6705,7 @@
 "The directory will not be changed now.\n"
 msgstr ""
 
-#: src/preferences.c:798
+#: src/preferences.c:856
 msgid ""
 "You have chosen to change the temporary directory.\n"
 "Please make sure you have no other copies of LiVES open.\n"
@@ -6706,20 +6717,20 @@
 "original setting."
 msgstr ""
 
-#: src/preferences.c:1169
+#: src/preferences.c:1221
 msgid ""
 "\n"
 "Unable to switch audio players to jack - jackd must be installed first.\n"
 "See http://jackaudio.org\n"
 msgstr ""
 
-#: src/preferences.c:1175
+#: src/preferences.c:1226
 msgid ""
 "\n"
 "Switching audio players requires restart (jackd must not be running)\n"
 msgstr ""
 
-#: src/preferences.c:1202
+#: src/preferences.c:1253
 msgid ""
 "\n"
 "Unable to switch audio players to pulse audio\n"
@@ -6727,815 +6738,815 @@
 "See http://www.pulseaudio.org\n"
 msgstr ""
 
-#: src/preferences.c:1502
+#: src/preferences.c:1544
 msgid "PCM (highest quality; largest files)"
 msgstr ""
 
-#: src/preferences.c:2063
+#: src/preferences.c:2096
 msgid "LiVES: - Preferences"
 msgstr ""
 
-#: src/preferences.c:2142
+#: src/preferences.c:2177
 msgid "Open file selection maximised"
 msgstr ""
 
-#: src/preferences.c:2149
+#: src/preferences.c:2184
 msgid "Show recent files in the File menu"
 msgstr ""
 
-#: src/preferences.c:2158
+#: src/preferences.c:2193
 msgid "Stop screensaver on playback    "
 msgstr ""
 
-#: src/preferences.c:2165
+#: src/preferences.c:2200
 msgid "Open main window maximised"
 msgstr ""
 
-#: src/preferences.c:2173
+#: src/preferences.c:2208
 msgid "Show toolbar when background is blanked"
 msgstr ""
 
-#: src/preferences.c:2181
+#: src/preferences.c:2216
 msgid "Allow mouse wheel to switch clips"
 msgstr ""
 
-#: src/preferences.c:2192
+#: src/preferences.c:2227
 msgid "Shrink previews to fit in interface"
 msgstr ""
 
-#: src/preferences.c:2202
+#: src/preferences.c:2237
 msgid "Startup mode:"
 msgstr ""
 
-#: src/preferences.c:2206
+#: src/preferences.c:2241
 msgid "_Clip editor"
 msgstr ""
 
-#: src/preferences.c:2210
+#: src/preferences.c:2245
 msgid "_Multitrack mode"
 msgstr ""
 
-#: src/preferences.c:2234
+#: src/preferences.c:2268
 msgid "Multi-head support"
 msgstr ""
 
-#: src/preferences.c:2242
+#: src/preferences.c:2276
 msgid " monitor number for LiVES interface"
 msgstr ""
 
-#: src/preferences.c:2248
+#: src/preferences.c:2282
 msgid " monitor number for playback"
 msgstr ""
 
-#: src/preferences.c:2260
+#: src/preferences.c:2294
 msgid ""
 "A setting of 0 means use all available monitors (only works with some "
 "playback plugins)."
 msgstr ""
 
-#: src/preferences.c:2270
+#: src/preferences.c:2304
 msgid "Force single monitor"
 msgstr ""
 
-#: src/preferences.c:2271
+#: src/preferences.c:2305
 msgid "Ignore all except the first monitor."
 msgstr ""
 
-#: src/preferences.c:2293
+#: src/preferences.c:2327
 msgid "Show clip thumbnails during playback"
 msgstr ""
 
-#: src/preferences.c:2306
+#: src/preferences.c:2340
 msgid "GUI"
 msgstr ""
 
-#: src/preferences.c:2321
+#: src/preferences.c:2355
 msgid "When entering Multitrack mode:"
 msgstr ""
 
-#: src/preferences.c:2330
+#: src/preferences.c:2364
 msgid "_Prompt me for width, height, fps and audio settings"
 msgstr ""
 
-#: src/preferences.c:2336
+#: src/preferences.c:2370
 msgid "_Always use the following values:"
 msgstr ""
 
-#: src/preferences.c:2345
+#: src/preferences.c:2379
 msgid "Use these same _values for rendering a new clip"
 msgstr ""
 
-#: src/preferences.c:2370
+#: src/preferences.c:2404
 msgid "_Width           "
 msgstr ""
 
-#: src/preferences.c:2375
+#: src/preferences.c:2409
 msgid "          _Height      "
 msgstr ""
 
-#: src/preferences.c:2379
+#: src/preferences.c:2413
 msgid "          _FPS"
 msgstr ""
 
-#: src/preferences.c:2387
+#: src/preferences.c:2421
 msgid "Enable backing audio track"
 msgstr ""
 
-#: src/preferences.c:2394
+#: src/preferences.c:2428
 msgid "Audio track per video track"
 msgstr ""
 
-#: src/preferences.c:2423
+#: src/preferences.c:2457
 msgid "    _Undo buffer size (MB)    "
 msgstr ""
 
-#: src/preferences.c:2432
+#: src/preferences.c:2466
 msgid "_Exit multitrack mode after rendering"
 msgstr ""
 
-#: src/preferences.c:2440
+#: src/preferences.c:2474
 msgid "Auto backup layouts"
 msgstr ""
 
-#: src/preferences.c:2445
+#: src/preferences.c:2479
 msgid "_Every"
 msgstr ""
 
-#: src/preferences.c:2453
+#: src/preferences.c:2487
 msgid "seconds"
 msgstr "сония"
 
-#: src/preferences.c:2461
+#: src/preferences.c:2495
 msgid "After every _change"
 msgstr ""
 
-#: src/preferences.c:2467
+#: src/preferences.c:2501
 msgid "_Never"
 msgstr "_Ҳеч қачон"
 
-#: src/preferences.c:2490
+#: src/preferences.c:2523
 msgid "Multitrack/Render"
 msgstr ""
 
-#: src/preferences.c:2508
+#: src/preferences.c:2541
 msgid "Use instant opening when possible"
 msgstr ""
 
-#: src/preferences.c:2509
+#: src/preferences.c:2543
 msgid "Enable instant opening of some file types using decoder plugins"
 msgstr ""
 
-#: src/preferences.c:2531
+#: src/preferences.c:2567
 msgid "Video open command (fallback)"
 msgstr ""
 
-#: src/preferences.c:2543
+#: src/preferences.c:2579
 msgid "Open/render compression"
 msgstr ""
 
-#: src/preferences.c:2546
+#: src/preferences.c:2582
 msgid " %     ( lower = slower, larger files; for jpeg, higher quality )"
 msgstr ""
 
-#: src/preferences.c:2558
+#: src/preferences.c:2594
 msgid "Default image format"
 msgstr ""
 
-#: src/preferences.c:2562
+#: src/preferences.c:2598
 msgid "_jpeg"
 msgstr "_jpeg"
 
-#: src/preferences.c:2565
+#: src/preferences.c:2601
 msgid "_png"
 msgstr "_png"
 
-#: src/preferences.c:2572
+#: src/preferences.c:2608
 msgid "(Check Help/Troubleshoot to see which image formats are supported)"
 msgstr ""
 
-#: src/preferences.c:2580
+#: src/preferences.c:2616
 msgid "Enable automatic deinterlacing when possible"
 msgstr ""
 
-#: src/preferences.c:2582
+#: src/preferences.c:2619
 msgid "Automatically deinterlace frames when a plugin suggests it"
 msgstr ""
 
-#: src/preferences.c:2593
+#: src/preferences.c:2632
 msgid "Automatic trimming / padding of audio when possible"
 msgstr ""
 
-#: src/preferences.c:2595
+#: src/preferences.c:2634
 msgid "Automatically trim or pad audio when a plugin suggests it"
 msgstr ""
 
-#: src/preferences.c:2606
+#: src/preferences.c:2646
 msgid "Ignore blank borders when possible"
 msgstr ""
 
-#: src/preferences.c:2608
+#: src/preferences.c:2648
 msgid "Clip any blank borders from frames where possible"
 msgstr ""
 
-#: src/preferences.c:2619
+#: src/preferences.c:2660
 msgid "When opening multiple files, concatenate images into one clip"
 msgstr ""
 
-#: src/preferences.c:2629
+#: src/preferences.c:2670
 msgid "Decoding"
 msgstr ""
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:2652
+#: src/preferences.c:2693
 msgid "Low - can improve performance on slower machines"
 msgstr ""
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:2654
+#: src/preferences.c:2695
 msgid "Normal - recommended for most users"
 msgstr ""
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:2656
+#: src/preferences.c:2697
 msgid "High - can improve quality on very fast machines"
 msgstr ""
 
-#: src/preferences.c:2659
+#: src/preferences.c:2700
 msgid "Preview _quality"
 msgstr ""
 
-#: src/preferences.c:2660
+#: src/preferences.c:2701
 msgid "The preview quality for video playback - affects resizing"
 msgstr ""
 
-#: src/preferences.c:2675
+#: src/preferences.c:2717
 msgid "_Show FPS statistics"
 msgstr ""
 
-#: src/preferences.c:2694
+#: src/preferences.c:2736
 msgid "_Plugin"
 msgstr ""
 
-#: src/preferences.c:2718
+#: src/preferences.c:2760
 msgid "Stream audio"
 msgstr ""
 
-#: src/preferences.c:2721
+#: src/preferences.c:2763
 msgid "Stream audio to playback plugin"
 msgstr ""
 
-#: src/preferences.c:2734
+#: src/preferences.c:2778
 msgid "Record player output"
 msgstr ""
 
-#: src/preferences.c:2737
+#: src/preferences.c:2781
 msgid "Record output from player instead of input to player"
 msgstr ""
 
-#: src/preferences.c:2744
+#: src/preferences.c:2789
 msgid "VIDEO"
 msgstr ""
 
-#: src/preferences.c:2787
+#: src/preferences.c:2833
 msgid "_Player"
 msgstr ""
 
-#: src/preferences.c:2792
+#: src/preferences.c:2838
 msgid "(See also the Jack Integration tab for jack startup options)"
 msgstr ""
 
-#: src/preferences.c:2819
+#: src/preferences.c:2865
 msgid "mplayer"
 msgstr "mplayer"
 
-#: src/preferences.c:2830
+#: src/preferences.c:2876
 #, fuzzy
 msgid "mplayer2"
 msgstr "mplayer"
 
-#: src/preferences.c:2833
+#: src/preferences.c:2879
 msgid "Audio play _command"
 msgstr ""
 
-#: src/preferences.c:2840
+#: src/preferences.c:2886
 msgid "- internal -"
 msgstr ""
 
-#: src/preferences.c:2849
+#: src/preferences.c:2895
 msgid "Audio follows video _rate/direction"
 msgstr ""
 
-#: src/preferences.c:2857
+#: src/preferences.c:2903
 msgid "Audio follows _clip switches"
 msgstr ""
 
-#: src/preferences.c:2864
+#: src/preferences.c:2910
 msgid "Source:"
 msgstr ""
 
-#: src/preferences.c:2868
+#: src/preferences.c:2914
 msgid "_Internal"
 msgstr ""
 
-#: src/preferences.c:2873
+#: src/preferences.c:2919
 msgid "_External (requires jack or pulse audio player)"
 msgstr ""
 
-#: src/preferences.c:2892
+#: src/preferences.c:2940
 msgid "AUDIO"
 msgstr ""
 
-#: src/preferences.c:2902
+#: src/preferences.c:2950
 msgid "Playback"
 msgstr "Ўйнаш"
 
-#: src/preferences.c:2925
+#: src/preferences.c:2973
 msgid ""
 "Record audio when capturing an e_xternal window\n"
 " (requires jack or pulse audio)"
 msgstr ""
 
-#: src/preferences.c:2940
+#: src/preferences.c:2988
 msgid "      What to record when 'r' is pressed   "
 msgstr ""
 
-#: src/preferences.c:2949
+#: src/preferences.c:2997
 msgid "_Frame changes"
 msgstr ""
 
-#: src/preferences.c:2964
+#: src/preferences.c:3012
 msgid "F_PS changes"
 msgstr ""
 
-#: src/preferences.c:2982
+#: src/preferences.c:3030
 msgid "_Real time effects"
 msgstr ""
 
-#: src/preferences.c:2993
+#: src/preferences.c:3041
 msgid "_Clip switches"
 msgstr ""
 
-#: src/preferences.c:3004
+#: src/preferences.c:3052
 msgid "_Audio (requires jack or pulse audio player)"
 msgstr ""
 
-#: src/preferences.c:3024
+#: src/preferences.c:3072
 msgid "Pause recording if free disk space falls below"
 msgstr ""
 
 #. TRANSLATORS: gigabytes
-#: src/preferences.c:3030
+#: src/preferences.c:3078
 msgid "GB"
 msgstr ""
 
-#: src/preferences.c:3037
+#: src/preferences.c:3085
 msgid "Recording"
 msgstr ""
 
-#: src/preferences.c:3055
+#: src/preferences.c:3103
 msgid "Encoder"
 msgstr ""
 
-#: src/preferences.c:3090
+#: src/preferences.c:3137
 msgid "Output format"
 msgstr ""
 
-#: src/preferences.c:3106
+#: src/preferences.c:3153
 msgid "Audio codec"
 msgstr ""
 
-#: src/preferences.c:3119
+#: src/preferences.c:3165
 msgid "Encoding"
 msgstr "Кодлаш усули"
 
-#: src/preferences.c:3134
+#: src/preferences.c:3180
 msgid "Use _antialiasing when resizing"
 msgstr ""
 
-#: src/preferences.c:3143
+#: src/preferences.c:3189
 msgid "Number of _real time effect keys"
 msgstr ""
 
-#: src/preferences.c:3145
+#: src/preferences.c:3192
 msgid ""
 "The number of \"virtual\" real time effect keys. They can be controlled "
 "through the real time effects window, or via network (OSC)."
 msgstr ""
 
-#: src/preferences.c:3152
+#: src/preferences.c:3199
 msgid "Use _threads where possible when applying effects"
 msgstr ""
 
-#: src/preferences.c:3159
+#: src/preferences.c:3207
 msgid "Number of _threads"
 msgstr ""
 
-#: src/preferences.c:3172
+#: src/preferences.c:3221
 msgid "Restart is required if any of the following paths are changed:"
 msgstr ""
 
-#: src/preferences.c:3182
+#: src/preferences.c:3231
 msgid "Weed plugin path"
 msgstr ""
 
-#: src/preferences.c:3184
+#: src/preferences.c:3234
 msgid "Frei0r plugin path"
 msgstr ""
 
-#: src/preferences.c:3186
+#: src/preferences.c:3237
 msgid "LADSPA plugin path"
 msgstr ""
 
-#: src/preferences.c:3209
+#: src/preferences.c:3261
 msgid "      Video load directory (default)      "
 msgstr ""
 
-#: src/preferences.c:3215
+#: src/preferences.c:3267
 msgid "      Video save directory (default) "
 msgstr ""
 
-#: src/preferences.c:3221
+#: src/preferences.c:3273
 msgid "      Audio load directory (default) "
 msgstr ""
 
-#: src/preferences.c:3227
+#: src/preferences.c:3279
 msgid "      Image directory (default) "
 msgstr ""
 
-#: src/preferences.c:3233
+#: src/preferences.c:3285
 msgid "      Backup/Restore directory (default) "
 msgstr ""
 
-#: src/preferences.c:3239
+#: src/preferences.c:3291
 msgid "      Temp directory (do not remove) "
 msgstr ""
 
-#: src/preferences.c:3252
+#: src/preferences.c:3304
 msgid "The default directory for loading video clips from"
 msgstr ""
 
-#: src/preferences.c:3277
+#: src/preferences.c:3329
 msgid "The default directory for saving encoded clips to"
 msgstr ""
 
-#: src/preferences.c:3285
+#: src/preferences.c:3337
 msgid "The default directory for loading and saving audio"
 msgstr ""
 
-#: src/preferences.c:3293
+#: src/preferences.c:3345
 msgid "The default directory for saving frameshots to"
 msgstr ""
 
-#: src/preferences.c:3301
+#: src/preferences.c:3353
 msgid "The default directory for backing up/restoring single clips"
 msgstr ""
 
-#: src/preferences.c:3309
+#: src/preferences.c:3361
 msgid "LiVES working directory."
 msgstr ""
 
-#: src/preferences.c:3359
+#: src/preferences.c:3412
 msgid "Directories"
 msgstr "Директориялар"
 
-#: src/preferences.c:3374
+#: src/preferences.c:3427
 msgid "Warn if diskspace falls below: "
 msgstr ""
 
-#: src/preferences.c:3380 src/preferences.c:3394
+#: src/preferences.c:3433 src/preferences.c:3447
 msgid " MB [set to 0 to disable]"
 msgstr ""
 
-#: src/preferences.c:3389
+#: src/preferences.c:3442
 msgid "Diskspace critical level: "
 msgstr ""
 
-#: src/preferences.c:3407
+#: src/preferences.c:3461
 msgid ""
 "Warn on Insert / Merge if _frame rate of clipboard does not match frame rate "
 "of selection"
 msgstr ""
 
-#: src/preferences.c:3417
+#: src/preferences.c:3471
 msgid "Warn on Open if file _size exceeds "
 msgstr ""
 
-#: src/preferences.c:3425
+#: src/preferences.c:3479
 msgid " MB"
 msgstr " Мб"
 
-#: src/preferences.c:3432
+#: src/preferences.c:3486
 msgid "Show a warning before saving a se_t"
 msgstr ""
 
-#: src/preferences.c:3442
+#: src/preferences.c:3496
 msgid ""
 "Show a warning if _mplayer/mplayer2, sox, composite or convert is not found "
 "when LiVES is started."
 msgstr ""
 
-#: src/preferences.c:3452
+#: src/preferences.c:3506
 msgid "Show a warning if no _rendered effects are found at startup."
 msgstr ""
 
-#: src/preferences.c:3464
+#: src/preferences.c:3518
 msgid "Show a warning if no _encoder plugins are found at startup."
 msgstr ""
 
-#: src/preferences.c:3474
+#: src/preferences.c:3528
 msgid "Show a warning if a _duplicate set name is entered."
 msgstr ""
 
-#: src/preferences.c:3485
+#: src/preferences.c:3539
 msgid "When a set is loaded, warn if clips are missing from _layouts."
 msgstr ""
 
-#: src/preferences.c:3495
+#: src/preferences.c:3550
 msgid "Warn if a clip used in a layout is about to be closed."
 msgstr ""
 
-#: src/preferences.c:3505
+#: src/preferences.c:3561
 msgid "Warn if frames used in a layout are about to be deleted."
 msgstr ""
 
-#: src/preferences.c:3515
+#: src/preferences.c:3572
 msgid "Warn if frames used in a layout are about to be shifted."
 msgstr ""
 
-#: src/preferences.c:3525
+#: src/preferences.c:3583
 msgid "Warn if frames used in a layout are about to be altered."
 msgstr ""
 
-#: src/preferences.c:3535
+#: src/preferences.c:3594
 msgid "Warn if audio used in a layout is about to be deleted."
 msgstr ""
 
-#: src/preferences.c:3546
+#: src/preferences.c:3606
 msgid "Warn if audio used in a layout is about to be shifted."
 msgstr ""
 
-#: src/preferences.c:3556
+#: src/preferences.c:3617
 msgid "Warn if audio used in a layout is about to be altered."
 msgstr ""
 
-#: src/preferences.c:3566
+#: src/preferences.c:3628
 msgid "Popup layout errors after clip changes."
 msgstr ""
 
-#: src/preferences.c:3577
+#: src/preferences.c:3639
 msgid "Warn if the layout has not been saved when leaving multitrack mode."
 msgstr ""
 
-#: src/preferences.c:3588
+#: src/preferences.c:3650
 msgid ""
 "Warn if multitrack has no audio channels, and a layout with audio is loaded."
 msgstr ""
 
-#: src/preferences.c:3598
+#: src/preferences.c:3660
 msgid ""
 "Warn if multitrack has audio channels, and your audio player is not \"jack\" "
 "or \"pulse audio\"."
 msgstr ""
 
-#: src/preferences.c:3610
+#: src/preferences.c:3672
 msgid "Show info message after importing from firewire device."
 msgstr ""
 
-#: src/preferences.c:3626
+#: src/preferences.c:3688
 msgid "Show a warning before opening a yuv4mpeg stream (advanced)."
 msgstr ""
 
-#: src/preferences.c:3639
+#: src/preferences.c:3701
 msgid "Show a warning when multitrack is low on backup space."
 msgstr ""
 
-#: src/preferences.c:3650
+#: src/preferences.c:3713
 msgid "Show a warning advising cleaning of disk space after a crash."
 msgstr ""
 
-#: src/preferences.c:3661
+#: src/preferences.c:3725
 msgid "Show a warning if unable to connect to pulseaudio player."
 msgstr ""
 
-#: src/preferences.c:3673
+#: src/preferences.c:3737
 msgid "Show a warning before wiping a layout which has unsaved changes."
 msgstr ""
 
-#: src/preferences.c:3685
+#: src/preferences.c:3749
 msgid "Warnings"
 msgstr "Огоҳномалар"
 
-#: src/preferences.c:3703
+#: src/preferences.c:3767
 msgid "Midi synch (requires the files midistart and midistop)"
 msgstr ""
 
-#: src/preferences.c:3715
+#: src/preferences.c:3779
 msgid "When inserting/merging frames:  "
 msgstr ""
 
-#: src/preferences.c:3719
+#: src/preferences.c:3783
 msgid "_Speed Up/Slow Down Insertion"
 msgstr ""
 
-#: src/preferences.c:3723
+#: src/preferences.c:3787
 msgid "_Resample Insertion"
 msgstr ""
 
-#: src/preferences.c:3730
+#: src/preferences.c:3794
 msgid "CD device           "
 msgstr ""
 
-#: src/preferences.c:3733
+#: src/preferences.c:3797
 msgid "LiVES can load audio tracks from this CD"
 msgstr ""
 
-#: src/preferences.c:3746
+#: src/preferences.c:3813
 msgid "Default FPS        "
 msgstr ""
 
-#: src/preferences.c:3749
+#: src/preferences.c:3816
 msgid "Frames per second to use when none is specified"
 msgstr ""
 
-#: src/preferences.c:3757
+#: src/preferences.c:3825
 msgid "Misc"
 msgstr "Хар ҳил"
 
-#: src/preferences.c:3782
+#: src/preferences.c:3850
 msgid "New theme:           "
 msgstr ""
 
-#: src/preferences.c:3800
+#: src/preferences.c:3867
 msgid "Themes"
 msgstr "Мавзулар"
 
-#: src/preferences.c:3815
+#: src/preferences.c:3882
 msgid "Download bandwidth (Kb/s)       "
 msgstr ""
 
-#: src/preferences.c:3823
+#: src/preferences.c:3890
 msgid "LiVES must be compiled without \"configure --disable-OSC\" to use OMC"
 msgstr ""
 
-#: src/preferences.c:3833
+#: src/preferences.c:3900
 msgid "OMC remote control enabled"
 msgstr ""
 
-#: src/preferences.c:3841
+#: src/preferences.c:3908
 msgid "UDP port       "
 msgstr ""
 
-#: src/preferences.c:3850
+#: src/preferences.c:3917
 msgid "Start OMC on startup"
 msgstr ""
 
-#: src/preferences.c:3870
+#: src/preferences.c:3937
 msgid "Streaming/Networking"
 msgstr ""
 
-#: src/preferences.c:3882
+#: src/preferences.c:3949
 msgid "Jack transport"
 msgstr ""
 
-#: src/preferences.c:3886
+#: src/preferences.c:3953
 msgid ""
 "LiVES must be compiled with jack/transport.h and jack/jack.h present to use "
 "jack transport"
 msgstr ""
 
-#: src/preferences.c:3892
+#: src/preferences.c:3959
 msgid "Jack _transport config file"
 msgstr ""
 
-#: src/preferences.c:3899 src/preferences.c:3989
+#: src/preferences.c:3967 src/preferences.c:4058
 msgid "Start _server on LiVES startup"
 msgstr ""
 
-#: src/preferences.c:3911
+#: src/preferences.c:3979
 msgid "Jack transport _master (start and stop)"
 msgstr ""
 
-#: src/preferences.c:3921
+#: src/preferences.c:3989
 msgid "Jack transport _client (start and stop)"
 msgstr ""
 
-#: src/preferences.c:3935
+#: src/preferences.c:4003
 msgid "Jack transport sets start position"
 msgstr ""
 
-#: src/preferences.c:3952
+#: src/preferences.c:4020
 msgid "Jack transport timebase slave"
 msgstr ""
 
-#: src/preferences.c:3963
+#: src/preferences.c:4031
 msgid "(See also Playback -> Audio follows video rate/direction)"
 msgstr ""
 
-#: src/preferences.c:3971
+#: src/preferences.c:4039
 msgid "Jack audio"
 msgstr ""
 
-#: src/preferences.c:3975
+#: src/preferences.c:4043
 msgid "LiVES must be compiled with jack/jack.h present to use jack audio"
 msgstr ""
 
-#: src/preferences.c:3978
+#: src/preferences.c:4046
 msgid ""
 "You MUST set the audio player to \"jack\" in the Playback tab to use jack "
 "audio"
 msgstr ""
 
-#: src/preferences.c:3984
+#: src/preferences.c:4052
 msgid "Jack _audio server config file"
 msgstr ""
 
-#: src/preferences.c:3996
+#: src/preferences.c:4065
 msgid "Play audio even when transport is _paused"
 msgstr ""
 
-#: src/preferences.c:4008
+#: src/preferences.c:4077
 msgid "Automatically connect to System Out ports when 'playing' External Audio"
 msgstr ""
 
-#: src/preferences.c:4021
+#: src/preferences.c:4090
 msgid "Jack Integration"
 msgstr ""
 
-#: src/preferences.c:4035
+#: src/preferences.c:4104
 msgid "Events to respond to:"
 msgstr ""
 
-#: src/preferences.c:4044
+#: src/preferences.c:4113
 msgid "_Joystick events"
 msgstr ""
 
-#: src/preferences.c:4051
+#: src/preferences.c:4120
 msgid "_Joystick device"
 msgstr ""
 
-#: src/preferences.c:4053
+#: src/preferences.c:4122
 msgid "The joystick device, e.g. /dev/input/js0"
 msgstr ""
 
-#: src/preferences.c:4071
+#: src/preferences.c:4142
 msgid "_MIDI events"
 msgstr ""
 
-#: src/preferences.c:4080
+#: src/preferences.c:4151
 msgid "Use _ALSA MIDI (recommended)"
 msgstr ""
 
-#: src/preferences.c:4082
+#: src/preferences.c:4153
 msgid "Create an ALSA MIDI port which other MIDI devices can be connected to"
 msgstr ""
 
-#: src/preferences.c:4090
+#: src/preferences.c:4162
 msgid "Use _raw MIDI"
 msgstr ""
 
-#: src/preferences.c:4092
+#: src/preferences.c:4164
 msgid "Read directly from the MIDI device"
 msgstr ""
 
-#: src/preferences.c:4104
+#: src/preferences.c:4177
 msgid "_MIDI device"
 msgstr ""
 
-#: src/preferences.c:4106
+#: src/preferences.c:4179
 msgid "The MIDI device, e.g. /dev/input/midi0"
 msgstr ""
 
-#: src/preferences.c:4118
+#: src/preferences.c:4193
 msgid "Advanced"
 msgstr "Қўшимча"
 
-#: src/preferences.c:4124
+#: src/preferences.c:4199
 msgid "MIDI check _rate"
 msgstr ""
 
-#: src/preferences.c:4127
+#: src/preferences.c:4203
 msgid ""
 "Number of MIDI checks per keyboard tick. Increasing this may improve MIDI "
 "responsiveness, but may slow down playback."
 msgstr ""
 
-#: src/preferences.c:4134
+#: src/preferences.c:4211
 msgid "MIDI repeat"
 msgstr ""
 
-#: src/preferences.c:4137
+#: src/preferences.c:4214
 msgid "Number of non-reads allowed between succesive reads."
 msgstr ""
 
-#: src/preferences.c:4140
+#: src/preferences.c:4218
 msgid "(Warning: setting this value too high can slow down playback.)"
 msgstr ""
 
-#: src/preferences.c:4159
+#: src/preferences.c:4237
 msgid "MIDI/Joystick learner"
 msgstr ""
 
-#: src/preferences.c:4499
+#: src/preferences.c:4679
 msgid ""
 "\n"
 "LiVES will now shut down. You need to restart it for the directory change to "
@@ -7543,214 +7554,214 @@
 "Click OK to continue.\n"
 msgstr ""
 
-#: src/preferences.c:4523
+#: src/preferences.c:4703
 msgid ""
 "For the directory change to take effect LiVES will restart when preferences "
 "dialog closes."
 msgstr ""
 
-#: src/preferences.c:4527
+#: src/preferences.c:4707
 msgid "Theme changes will not take effect until the next time you start LiVES."
 msgstr ""
 
-#: src/preferences.c:4531
+#: src/preferences.c:4711
 msgid "Jack options will not take effect until the next time you start LiVES."
 msgstr ""
 
-#: src/osc.c:2585
+#: src/osc.c:2616
 #, c-format
 msgid "Syncing to external framerate of %.8f frames per second.\n"
 msgstr ""
 
-#: src/osc.c:6746
+#: src/osc.c:6938
 msgid "Cannot initialize OSC receiver\n"
 msgstr ""
 
-#: src/osc.c:6770
+#: src/osc.c:6961
 #, c-format
 msgid "WARNING: Cannot start OSC server at UDP port %d\n"
 msgstr ""
 
-#: src/osc.c:6775
+#: src/osc.c:6963
 #, c-format
 msgid "Started OSC server at UDP port %d\n"
 msgstr ""
 
-#: src/osc.c:6890
+#: src/osc.c:7076
 #, c-format
 msgid "Cannot start OSC/UDP server at port %d \n"
 msgstr ""
 
-#: src/resample.c:125 src/resample.c:304
+#: src/resample.c:131 src/resample.c:305
 #, c-format
 msgid "Resizing frames 1 to %d"
 msgstr ""
 
-#: src/resample.c:140 src/resample.c:318
+#: src/resample.c:145 src/resample.c:318
 #, c-format
 msgid "Resizing/letterboxing frames 1 to %d"
 msgstr ""
 
-#: src/resample.c:361 src/resample.c:385
+#: src/resample.c:360 src/resample.c:384
 msgid "Resize"
 msgstr "Ўлчамини ўзгартириш"
 
-#: src/resample.c:395
+#: src/resample.c:394
 msgid "Resample/Resize"
 msgstr ""
 
-#: src/resample.c:680
+#: src/resample.c:676
 #, c-format
 msgid "Length of video is now %d frames.\n"
 msgstr ""
 
-#: src/resample.c:745
+#: src/resample.c:737
 msgid ""
 "\n"
 "\n"
 "New rate must be greater than 0\n"
 msgstr ""
 
-#: src/resample.c:797 src/resample.c:813
+#: src/resample.c:788 src/resample.c:803
 msgid "Resampling audio"
 msgstr ""
 
-#: src/resample.c:831
+#: src/resample.c:821
 msgid "LiVES was unable to resample the audio as requested.\n"
 msgstr ""
 
-#: src/resample.c:833 src/resample.c:837
+#: src/resample.c:823 src/resample.c:827
 msgid "Resample Audio"
 msgstr ""
 
-#: src/resample.c:845
+#: src/resample.c:835
 #, c-format
 msgid "Audio was resampled to %d Hz, %d channels, %d bit"
 msgstr ""
 
-#: src/resample.c:1034
+#: src/resample.c:1016
 #, c-format
 msgid "Resampling video at %.8f frames per second..."
 msgstr ""
 
-#: src/resample.c:1037
+#: src/resample.c:1018
 #, c-format
 msgid "Resampling video at %.3f frames per second..."
 msgstr ""
 
-#: src/resample.c:1068
+#: src/resample.c:1049
 msgid "Reordering error !\n"
 msgstr ""
 
-#: src/resample.c:1079
+#: src/resample.c:1060
 msgid "Resample"
 msgstr ""
 
-#: src/resample.c:1192
+#: src/resample.c:1173
 msgid "LiVES: - Resample Audio"
 msgstr ""
 
-#: src/resample.c:1195
+#: src/resample.c:1175
 msgid "LiVES: - Insert Silence"
 msgstr ""
 
-#: src/resample.c:1198
+#: src/resample.c:1177
 msgid "LiVES: - New Clip Audio"
 msgstr ""
 
-#: src/resample.c:1201
+#: src/resample.c:1179
 msgid "LiVES: - External Clip Settings"
 msgstr ""
 
-#: src/resample.c:1238 src/resample.c:1358
+#: src/resample.c:1215 src/resample.c:1332
 msgid "Rate (Hz) "
 msgstr ""
 
-#: src/resample.c:1245 src/resample.c:1372
+#: src/resample.c:1222 src/resample.c:1346
 msgid "Channels"
 msgstr ""
 
-#: src/resample.c:1252
+#: src/resample.c:1229
 msgid "Sample Size "
 msgstr ""
 
-#: src/resample.c:1268 src/resample.c:1425
+#: src/resample.c:1245 src/resample.c:1399
 msgid "Signed"
 msgstr ""
 
-#: src/resample.c:1274 src/resample.c:1435
+#: src/resample.c:1251 src/resample.c:1409
 msgid "Unsigned"
 msgstr ""
 
-#: src/resample.c:1297 src/resample.c:1460
+#: src/resample.c:1273 src/resample.c:1433
 msgid "Little Endian"
 msgstr ""
 
-#: src/resample.c:1303 src/resample.c:1468
+#: src/resample.c:1279 src/resample.c:1441
 msgid "Big Endian"
 msgstr ""
 
-#: src/resample.c:1315
+#: src/resample.c:1290
 msgid "Current"
 msgstr "Жорий"
 
-#: src/resample.c:1340
+#: src/resample.c:1315
 msgid "_Enable audio"
 msgstr ""
 
-#: src/resample.c:1372
+#: src/resample.c:1346
 msgid "_Channels"
 msgstr ""
 
-#: src/resample.c:1394
+#: src/resample.c:1368
 msgid "_Sample Size"
 msgstr ""
 
-#: src/resample.c:1394
+#: src/resample.c:1368
 msgid "Sample Size"
 msgstr ""
 
-#: src/resample.c:1489
+#: src/resample.c:1461
 msgid "New"
 msgstr "Янги"
 
-#: src/resample.c:1512
+#: src/resample.c:1484
 msgid "_Frames Per Second "
 msgstr ""
 
-#: src/resample.c:1530
+#: src/resample.c:1502
 msgid "Record for maximum:  "
 msgstr ""
 
-#: src/resample.c:1533
+#: src/resample.c:1505
 msgid " hours  "
 msgstr ""
 
-#: src/resample.c:1536
+#: src/resample.c:1508
 msgid " minutes  "
 msgstr ""
 
-#: src/resample.c:1538
+#: src/resample.c:1510
 msgid " seconds  "
 msgstr ""
 
-#: src/resample.c:1545
+#: src/resample.c:1517
 msgid "Unlimited"
 msgstr "Чексиз"
 
-#: src/resample.c:1561
+#: src/resample.c:1533
 msgid "Click OK to begin recording, or Cancel to quit."
 msgstr ""
 
-#: src/resample.c:1670
+#: src/resample.c:1638
 msgid "LiVES: - Change playback speed"
 msgstr ""
 
-#: src/resample.c:1673
+#: src/resample.c:1640
 msgid "LiVES: - Resample Video"
 msgstr ""
 
-#: src/resample.c:1696
+#: src/resample.c:1663
 #, c-format
 msgid ""
 "\n"
@@ -7761,7 +7772,7 @@
 "in _frames per second"
 msgstr ""
 
-#: src/resample.c:1701
+#: src/resample.c:1667
 #, c-format
 msgid ""
 "\n"
@@ -7772,89 +7783,89 @@
 "in frames per second"
 msgstr ""
 
-#: src/resample.c:1723
+#: src/resample.c:1688
 msgid "OR enter the desired clip length in _seconds"
 msgstr ""
 
-#: src/resample.c:1745
+#: src/resample.c:1710
 msgid "Change the _audio speed as well"
 msgstr ""
 
-#: src/resample.c:1846
+#: src/resample.c:1810
 msgid ""
 "\n"
 "Speeding up the clip will cause missing frames in some multitrack layouts.\n"
 "Are you sure you wish to change the speed ?\n"
 msgstr ""
 
-#: src/resample.c:1863
+#: src/resample.c:1829
 msgid ""
 "\n"
 "Speeding up the clip will cause missing audio in some multitrack layouts.\n"
 "Are you sure you wish to change the speed ?\n"
 msgstr ""
 
-#: src/resample.c:1878
+#: src/resample.c:1847
 msgid ""
 "\n"
 "Changing the speed will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/resample.c:1892
+#: src/resample.c:1863
 msgid ""
 "\n"
 "Changing the speed will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/resample.c:1938
+#: src/resample.c:1911
 msgid "Speed Change"
 msgstr ""
 
-#: src/resample.c:1947
+#: src/resample.c:1920
 #, c-format
 msgid "Changed playback speed to %.3f frames per second and audio to %d Hz.\n"
 msgstr ""
 
-#: src/resample.c:1950
+#: src/resample.c:1922
 #, c-format
 msgid "Changed playback speed to %.3f frames per second.\n"
 msgstr ""
 
-#: src/resample.c:2035
+#: src/resample.c:2006
 msgid "Resampling video"
 msgstr ""
 
-#: src/resample.c:2042 src/resample.c:2160 src/resample.c:2182
+#: src/resample.c:2012 src/resample.c:2127 src/resample.c:2148
 msgid "Resampling clipboard video"
 msgstr ""
 
-#: src/resample.c:2047
+#: src/resample.c:2016
 msgid "Reordering frames"
 msgstr ""
 
-#: src/resample.c:2056
+#: src/resample.c:2025
 msgid ""
 "\n"
 "\n"
 "LiVES was unable to reorder the frames."
 msgstr ""
 
-#: src/resample.c:2104
+#: src/resample.c:2071
 msgid "Deordering frames"
 msgstr ""
 
-#: src/resample.c:2199
+#: src/resample.c:2165
 msgid "resampling error..."
 msgstr ""
 
-#: src/rte_window.c:85 src/rte_window.c:1708
+#: src/rte_window.c:124 src/rte_window.c:1709
 #, c-format
 msgid "Type: %s"
 msgstr ""
 
-#: src/rte_window.c:112
+#: src/rte_window.c:150
 msgid ""
 "\n"
 "\n"
@@ -7864,7 +7875,7 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:426
+#: src/rte_window.c:460
 msgid ""
 "\n"
 "\n"
@@ -7872,19 +7883,19 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:432
+#: src/rte_window.c:466
 #, c-format
 msgid "Saving keymap to %s\n"
 msgstr ""
 
-#: src/rte_window.c:439
+#: src/rte_window.c:471
 #, c-format
 msgid ""
 "\n"
 "Updating keymap file %s..."
 msgstr ""
 
-#: src/rte_window.c:446
+#: src/rte_window.c:477
 #, c-format
 msgid ""
 "\n"
@@ -7894,12 +7905,12 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/rte_window.c:526
+#: src/rte_window.c:556
 #, c-format
 msgid "Saving real time effect defaults to %s..."
 msgstr ""
 
-#: src/rte_window.c:535
+#: src/rte_window.c:563
 #, c-format
 msgid ""
 "\n"
@@ -7909,22 +7920,22 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/rte_window.c:632
+#: src/rte_window.c:657
 #, c-format
 msgid "Loading real time effect defaults from %s..."
 msgstr ""
 
-#: src/rte_window.c:681
+#: src/rte_window.c:701
 #, c-format
 msgid "Loading generator default sizes from %s..."
 msgstr ""
 
-#: src/rte_window.c:1306
+#: src/rte_window.c:1319
 #, c-format
 msgid "Loading default keymap from %s..."
 msgstr ""
 
-#: src/rte_window.c:1329
+#: src/rte_window.c:1339
 #, c-format
 msgid ""
 "\n"
@@ -7934,48 +7945,48 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/rte_window.c:1403
+#: src/rte_window.c:1412
 #, c-format
 msgid "Invalid line %d in %s\n"
 msgstr ""
 
-#: src/rte_window.c:1483
+#: src/rte_window.c:1490
 #, c-format
 msgid "Invalid key %d in %s\n"
 msgstr ""
 
-#: src/rte_window.c:1498
+#: src/rte_window.c:1505
 #, c-format
 msgid "Invalid effect %s in %s\n"
 msgstr ""
 
-#: src/rte_window.c:1517
+#: src/rte_window.c:1524
 #, c-format
 msgid "Unknown effect %s in %s\n"
 msgstr ""
 
-#: src/rte_window.c:1535
+#: src/rte_window.c:1542
 #, c-format
 msgid ""
 "This version of LiVES cannot mix generators/non-generators on the same key "
 "(%d) !\n"
 msgstr ""
 
-#: src/rte_window.c:1547
+#: src/rte_window.c:1554
 #, c-format
 msgid "Too many effects bound to key %d.\n"
 msgstr ""
 
-#: src/rte_window.c:1587
+#: src/rte_window.c:1593
 msgid "update required.\n"
 msgstr ""
 
-#: src/rte_window.c:1603
+#: src/rte_window.c:1607
 #, c-format
 msgid "Loading data connection map from %s..."
 msgstr ""
 
-#: src/rte_window.c:1612
+#: src/rte_window.c:1614
 msgid ""
 "\n"
 "\n"
@@ -7983,41 +7994,41 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:1691
+#: src/rte_window.c:1692
 #, c-format
 msgid "LiVES: Information for %s"
 msgstr ""
 
-#: src/rte_window.c:1704
+#: src/rte_window.c:1705
 #, c-format
 msgid "Effect name: %s"
 msgstr ""
 
-#: src/rte_window.c:1712
+#: src/rte_window.c:1713
 #, c-format
 msgid "Plugin name: %s"
 msgstr ""
 
-#: src/rte_window.c:1716
+#: src/rte_window.c:1717
 #, c-format
 msgid "Author: %s"
 msgstr ""
 
-#: src/rte_window.c:1721
+#: src/rte_window.c:1722
 #, c-format
 msgid "and: %s"
 msgstr ""
 
-#: src/rte_window.c:1726
+#: src/rte_window.c:1727
 #, c-format
 msgid "Version: %d"
 msgstr ""
 
-#: src/rte_window.c:1734
+#: src/rte_window.c:1735
 msgid "Description: "
 msgstr ""
 
-#: src/rte_window.c:1960
+#: src/rte_window.c:1963
 msgid ""
 "\n"
 "\n"
@@ -8026,69 +8037,69 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:2024
+#: src/rte_window.c:2027
 #, c-format
 msgid "LiVES could not locate the effect %s.\n"
 msgstr ""
 
-#: src/rte_window.c:2225
+#: src/rte_window.c:2216
 msgid "LiVES: Real time effect mapping"
 msgstr ""
 
-#: src/rte_window.c:2257
+#: src/rte_window.c:2248
 #, c-format
 msgid "Ctrl-%d"
 msgstr "Ctrl-%d"
 
-#: src/rte_window.c:2264
+#: src/rte_window.c:2255
 msgid "Key active"
 msgstr ""
 
-#: src/rte_window.c:2279
+#: src/rte_window.c:2271
 msgid "Key grab"
 msgstr ""
 
-#: src/rte_window.c:2280
+#: src/rte_window.c:2272
 msgid "Grab keyboard for this effect key"
 msgstr ""
 
-#: src/rte_window.c:2290
+#: src/rte_window.c:2283
 msgid "_Clear all effects"
 msgstr ""
 
-#: src/rte_window.c:2304
+#: src/rte_window.c:2297
 msgid "Mode active"
 msgstr ""
 
-#: src/rte_window.c:2314 src/multitrack.c:8568
+#: src/rte_window.c:2307 src/multitrack.c:8762
 msgid "Info"
 msgstr "Маълумот"
 
-#: src/rte_window.c:2315
+#: src/rte_window.c:2308
 msgid "Set Parameters"
 msgstr ""
 
-#: src/rte_window.c:2316
+#: src/rte_window.c:2309
 msgid "Set Connections"
 msgstr ""
 
-#: src/rte_window.c:2317
+#: src/rte_window.c:2310
 msgid "Clear"
 msgstr "Тозалаш"
 
-#: src/rte_window.c:2326
+#: src/rte_window.c:2319
 msgid "Effect name:"
 msgstr ""
 
-#: src/rte_window.c:2391
+#: src/rte_window.c:2384
 msgid "_Save as default keymap"
 msgstr ""
 
-#: src/rte_window.c:2396
+#: src/rte_window.c:2389
 msgid "_Load default keymap"
 msgstr ""
 
-#: src/rte_window.c:2840
+#: src/rte_window.c:2833
 #, c-format
 msgid ""
 "Unable to create default keymap file: %s\n"
@@ -8146,86 +8157,86 @@
 msgid "none\n"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:494
+#: src/lives-yuv4mpeg.c:493
 #, c-format
 msgid ""
 "Unable to set display framerate to %.3f fps.\n"
 "\n"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:503
+#: src/lives-yuv4mpeg.c:502
 #, c-format
 msgid "Unable to open yuv4mpeg out stream %s\n"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:628
+#: src/lives-yuv4mpeg.c:626
 #, c-format
 msgid "TV card %d"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:713
+#: src/lives-yuv4mpeg.c:710
 #, c-format
 msgid "Opened TV card %d (%s)"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:760
+#: src/lives-yuv4mpeg.c:757
 #, c-format
 msgid "Firewire card %d"
 msgstr ""
 
-#: src/lives-yuv4mpeg.c:796
+#: src/lives-yuv4mpeg.c:793
 #, c-format
 msgid "Opened firewire card %d"
 msgstr ""
 
-#: src/multitrack.c:666
+#: src/multitrack.c:736
 msgid "Auto backup"
 msgstr ""
 
-#: src/multitrack.c:868
+#: src/multitrack.c:935
 msgid "Backing audio"
 msgstr ""
 
-#: src/multitrack.c:1435
+#: src/multitrack.c:1515
 #, c-format
 msgid "%s : parameters for %s"
 msgstr ""
 
-#: src/multitrack.c:1809 src/multitrack.c:3483
+#: src/multitrack.c:1881 src/multitrack.c:3635
 #, c-format
 msgid "Current track: %s (layer %d)\n"
 msgstr ""
 
-#: src/multitrack.c:1813 src/multitrack.c:3484
+#: src/multitrack.c:1885 src/multitrack.c:3637
 msgid "Current track: Backing audio\n"
 msgstr ""
 
-#: src/multitrack.c:1814
+#: src/multitrack.c:1886
 #, c-format
 msgid "Current track: Layer %d audio\n"
 msgstr ""
 
-#: src/multitrack.c:1817
+#: src/multitrack.c:1889
 #, c-format
 msgid "%.2f sec.\n"
 msgstr ""
 
-#: src/multitrack.c:1822 src/multitrack.c:3490
+#: src/multitrack.c:1894 src/multitrack.c:3643
 #, c-format
 msgid "Source: %s"
 msgstr ""
 
-#: src/multitrack.c:1825 src/multitrack.c:3492
+#: src/multitrack.c:1897 src/multitrack.c:3645
 msgid "Right click for context menu.\n"
 msgstr ""
 
-#: src/multitrack.c:1827
+#: src/multitrack.c:1899
 msgid ""
 "Double click on a block\n"
 "to select it."
 msgstr ""
 
-#: src/multitrack.c:3312
+#: src/multitrack.c:3452
 msgid ""
 "\n"
 "\n"
@@ -8234,7 +8245,7 @@
 "right or double clicking on it.\n"
 msgstr ""
 
-#: src/multitrack.c:3315
+#: src/multitrack.c:3455
 msgid ""
 "\n"
 "\n"
@@ -8242,14 +8253,14 @@
 "Select an effect in FX stack first to view its parameters.\n"
 msgstr ""
 
-#: src/multitrack.c:3318
+#: src/multitrack.c:3458
 msgid ""
 "\n"
 "\n"
 "No clips loaded.\n"
 msgstr ""
 
-#: src/multitrack.c:3321
+#: src/multitrack.c:3462
 msgid ""
 "You must select two video tracks\n"
 "and a time region\n"
@@ -8259,7 +8270,7 @@
 "before inserting clips into the timeline."
 msgstr ""
 
-#: src/multitrack.c:3324
+#: src/multitrack.c:3465
 msgid ""
 "\n"
 "\n"
@@ -8268,210 +8279,210 @@
 "to apply compositors.\n"
 msgstr ""
 
-#: src/multitrack.c:3487
+#: src/multitrack.c:3640
 #, c-format
 msgid "%.2f sec. to %.2f sec.\n"
 msgstr ""
 
-#: src/multitrack.c:3493
+#: src/multitrack.c:3646
 msgid ""
 "Single click on timeline\n"
 "to select a frame.\n"
 msgstr ""
 
-#: src/multitrack.c:3711 src/multitrack.c:6790
+#: src/multitrack.c:3858 src/multitrack.c:6972
 #, c-format
 msgid "%s [unstable]"
 msgstr ""
 
-#: src/multitrack.c:3822
+#: src/multitrack.c:3973
 msgid ""
 "You can click and drag\n"
 "below the timeline"
 msgstr ""
 
-#: src/multitrack.c:3823
+#: src/multitrack.c:3974
 msgid "to select a time region.\n"
 msgstr ""
 
-#: src/multitrack.c:3985
+#: src/multitrack.c:4137
 msgid "LiVES: Selected clip"
 msgstr ""
 
-#: src/multitrack.c:3993
+#: src/multitrack.c:4145
 msgid "_Adjust start and end points"
 msgstr ""
 
-#: src/multitrack.c:4002
+#: src/multitrack.c:4154
 msgid "_Edit/encode in clip editor"
 msgstr ""
 
-#: src/multitrack.c:4009
+#: src/multitrack.c:4161
 msgid "_Show clip information"
 msgstr ""
 
-#: src/multitrack.c:4016
+#: src/multitrack.c:4168
 msgid "_Close this clip"
 msgstr ""
 
-#: src/multitrack.c:4236
+#: src/multitrack.c:4388
 msgid "Audio mixer (ctrl-m)"
 msgstr ""
 
-#: src/multitrack.c:4336
+#: src/multitrack.c:4488
 msgid "Single click on timeline"
 msgstr ""
 
-#: src/multitrack.c:4337
+#: src/multitrack.c:4489
 msgid "to select a frame."
 msgstr ""
 
-#: src/multitrack.c:4338
+#: src/multitrack.c:4490
 msgid "Double click or right click on timeline"
 msgstr ""
 
-#: src/multitrack.c:4339
+#: src/multitrack.c:4491
 msgid "to select a block."
 msgstr ""
 
-#: src/multitrack.c:4340
+#: src/multitrack.c:4492
 msgid "Clips can be dragged"
 msgstr ""
 
-#: src/multitrack.c:4341
+#: src/multitrack.c:4493
 msgid "onto the timeline."
 msgstr ""
 
-#: src/multitrack.c:4343
+#: src/multitrack.c:4495
 msgid "Mouse mode is: Move"
 msgstr ""
 
-#: src/multitrack.c:4344
+#: src/multitrack.c:4496
 msgid "clips can be moved around."
 msgstr ""
 
-#: src/multitrack.c:4349
+#: src/multitrack.c:4500
 msgid "Mouse mode is: Select."
 msgstr ""
 
-#: src/multitrack.c:4350
+#: src/multitrack.c:4501
 msgid "Drag with mouse on timeline"
 msgstr ""
 
-#: src/multitrack.c:4351
+#: src/multitrack.c:4502
 msgid "to select tracks and time."
 msgstr ""
 
-#: src/multitrack.c:4362
+#: src/multitrack.c:4509
 msgid "_Insert mode: Normal"
 msgstr ""
 
-#: src/multitrack.c:4378
+#: src/multitrack.c:4537
 msgid "_Mouse mode: Move"
 msgstr ""
 
-#: src/multitrack.c:4382
+#: src/multitrack.c:4540
 msgid "_Mouse mode: Select"
 msgstr ""
 
-#: src/multitrack.c:4405 src/multitrack.c:7925
+#: src/multitrack.c:4563 src/multitrack.c:8104
 msgid "Gravity: Normal"
 msgstr ""
 
-#: src/multitrack.c:4409
+#: src/multitrack.c:4565
 msgid "Gravity: Left"
 msgstr ""
 
-#: src/multitrack.c:4414
+#: src/multitrack.c:4569
 msgid "Gravity: Right"
 msgstr ""
 
-#: src/multitrack.c:4416
+#: src/multitrack.c:4570
 msgid "Close _last gap(s) in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:4419
+#: src/multitrack.c:4572
 msgid "Close _first gap(s) in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:4458
+#: src/multitrack.c:4627
 msgid "Close gaps"
 msgstr ""
 
-#: src/multitrack.c:4460
+#: src/multitrack.c:4629
 msgid "Move block"
 msgstr ""
 
-#: src/multitrack.c:4462
+#: src/multitrack.c:4631
 msgid "Move audio block"
 msgstr ""
 
-#: src/multitrack.c:4464
+#: src/multitrack.c:4633
 msgid "Delete block"
 msgstr ""
 
-#: src/multitrack.c:4466
+#: src/multitrack.c:4635
 msgid "Delete audio block"
 msgstr ""
 
-#: src/multitrack.c:4468
+#: src/multitrack.c:4637
 msgid "Split tracks"
 msgstr ""
 
-#: src/multitrack.c:4470
+#: src/multitrack.c:4639
 msgid "Split block"
 msgstr ""
 
-#: src/multitrack.c:4473
+#: src/multitrack.c:4642
 #, c-format
 msgid "Apply %s"
 msgstr ""
 
-#: src/multitrack.c:4478
+#: src/multitrack.c:4647
 #, c-format
 msgid "Delete %s"
 msgstr ""
 
-#: src/multitrack.c:4482
+#: src/multitrack.c:4651
 msgid "Insert block"
 msgstr ""
 
-#: src/multitrack.c:4484
+#: src/multitrack.c:4653
 msgid "Insert gap"
 msgstr ""
 
-#: src/multitrack.c:4486
+#: src/multitrack.c:4655
 msgid "Insert audio block"
 msgstr ""
 
-#: src/multitrack.c:4488
+#: src/multitrack.c:4657
 msgid "Effect order change"
 msgstr ""
 
-#: src/multitrack.c:4898
+#: src/multitrack.c:5064
 msgid "unsigned "
 msgstr ""
 
-#: src/multitrack.c:4899
+#: src/multitrack.c:5065
 msgid "signed "
 msgstr ""
 
-#: src/multitrack.c:4904
+#: src/multitrack.c:5071
 #, c-format
 msgid ""
 "Multitrack values set to %.3f fps, frame size %d x %d, audio channels %d, "
 "audio rate %d, audio sample size %d, %s.\n"
 msgstr ""
 
-#: src/multitrack.c:4938
+#: src/multitrack.c:5104
 msgid "invalid event list. Failed.\n"
 msgstr ""
 
-#: src/multitrack.c:4944
+#: src/multitrack.c:5110
 msgid "event list has invalid fps. Failed.\n"
 msgstr ""
 
-#: src/multitrack.c:4953
+#: src/multitrack.c:5122
 #, c-format
 msgid ""
 "\n"
@@ -8481,7 +8492,7 @@
 "then load in the new set from the File menu.\n"
 msgstr ""
 
-#: src/multitrack.c:4993
+#: src/multitrack.c:5163
 #, c-format
 msgid ""
 "\n"
@@ -8489,600 +8500,592 @@
 "It cannot be loaded.\n"
 msgstr ""
 
-#: src/multitrack.c:5329 src/multitrack.c:5338 src/multitrack.c:21133
+#: src/multitrack.c:5452
 msgid "Layout was wiped.\n"
 msgstr ""
 
-#: src/multitrack.c:5374
+#: src/multitrack.c:5547
 #, c-format
 msgid "LiVES-%s: Multitrack %dx%d : %d bpp %.3f fps"
 msgstr ""
 
-#: src/multitrack.c:5617
+#: src/multitrack.c:5793
 msgid "In/out"
 msgstr ""
 
-#: src/multitrack.c:5619
+#: src/multitrack.c:5795
 msgid "FX stack"
 msgstr ""
 
-#: src/multitrack.c:5627 src/omc-learn.c:673
+#: src/multitrack.c:5803 src/omc-learn.c:659
 msgid "Params."
 msgstr ""
 
-#: src/multitrack.c:5978
+#: src/multitrack.c:6157
 msgid "_Open..."
 msgstr ""
 
-#: src/multitrack.c:5996
+#: src/multitrack.c:6175
 msgid "O_pen File Selection..."
 msgstr ""
 
-#: src/multitrack.c:6040
+#: src/multitrack.c:6219
 msgid "Import Selection from _dvd/vcd..."
 msgstr ""
 
-#: src/multitrack.c:6050
+#: src/multitrack.c:6229
 msgid "Import Selection from _dvd"
 msgstr ""
 
-#: src/multitrack.c:6060
+#: src/multitrack.c:6239
 msgid "Import Selection from _vcd"
 msgstr ""
 
-#: src/multitrack.c:6076
+#: src/multitrack.c:6255
 msgid "_Import from Device"
 msgstr ""
 
-#: src/multitrack.c:6103
+#: src/multitrack.c:6282
 msgid "_Close the selected clip"
 msgstr ""
 
-#: src/multitrack.c:6198
+#: src/multitrack.c:6377
 msgid "_Save layout as..."
 msgstr ""
 
-#: src/multitrack.c:6206
+#: src/multitrack.c:6385
 msgid "_Load layout..."
 msgstr ""
 
-#: src/multitrack.c:6210
+#: src/multitrack.c:6389
 msgid "_Wipe/Delete layout..."
 msgstr ""
 
-#: src/multitrack.c:6236
+#: src/multitrack.c:6415
 msgid "_Ignore width, height and audio values from loaded layouts"
 msgstr ""
 
-#: src/multitrack.c:6240
+#: src/multitrack.c:6419
 msgid "Auto load _subtitles with clips"
 msgstr ""
 
-#: src/multitrack.c:6322
+#: src/multitrack.c:6501
 msgid "_CLIP EDITOR"
 msgstr ""
 
-#: src/multitrack.c:6334
+#: src/multitrack.c:6513
 msgid "_Adjust selected clip start/end points"
 msgstr ""
 
-#: src/multitrack.c:6343
+#: src/multitrack.c:6522
 msgid "_Insert selected clip"
 msgstr ""
 
-#: src/multitrack.c:6355
+#: src/multitrack.c:6534
 msgid "_Insert selected clip audio"
 msgstr ""
 
-#: src/multitrack.c:6364
+#: src/multitrack.c:6543
 msgid "_Delete selected block"
 msgstr ""
 
-#: src/multitrack.c:6373
+#: src/multitrack.c:6555
 msgid "_Jump to previous block boundary"
 msgstr ""
 
-#: src/multitrack.c:6382
+#: src/multitrack.c:6564
 msgid "_Jump to next block boundary"
 msgstr ""
 
-#: src/multitrack.c:6395
+#: src/multitrack.c:6577
 msgid "Clear _marks from timeline"
 msgstr ""
 
-#: src/multitrack.c:6403
+#: src/multitrack.c:6585
 msgid "Ignore selection limits when inserting"
 msgstr ""
 
-#: src/multitrack.c:6420 src/multitrack.c:16719
+#: src/multitrack.c:6602 src/multitrack.c:17009
 msgid "_Play from Timeline Position"
 msgstr ""
 
-#: src/multitrack.c:6434
+#: src/multitrack.c:6616
 msgid "Pla_y selected time only"
 msgstr ""
 
-#: src/multitrack.c:6518
+#: src/multitrack.c:6700
 msgid "_Move effects with blocks"
 msgstr ""
 
-#: src/multitrack.c:6531
+#: src/multitrack.c:6713
 msgid "Select _autotransition effect..."
 msgstr ""
 
-#: src/multitrack.c:6542
+#: src/multitrack.c:6724
 msgid "Crossfade audio with autotransition"
 msgstr ""
 
-#: src/multitrack.c:6550
+#: src/multitrack.c:6732
 msgid "View/_Edit selected effect"
 msgstr ""
 
-#: src/multitrack.c:6554
+#: src/multitrack.c:6736
 msgid "_Delete selected effect"
 msgstr ""
 
-#: src/multitrack.c:6562
+#: src/multitrack.c:6744
 msgid "Apply effect to _block..."
 msgstr ""
 
-#: src/multitrack.c:6619
+#: src/multitrack.c:6801
 msgid "Apply effect to _region..."
 msgstr ""
 
-#: src/multitrack.c:6885
+#: src/multitrack.c:7061
 msgid "_Tracks"
 msgstr ""
 
-#: src/multitrack.c:6896
+#: src/multitrack.c:7072
 msgid "Rename current track"
 msgstr ""
 
-#: src/multitrack.c:6904
+#: src/multitrack.c:7080
 msgid "Make _Backing Audio current track"
 msgstr ""
 
-#: src/multitrack.c:6915
+#: src/multitrack.c:7091
 msgid "Add Video Track at _Rear"
 msgstr ""
 
-#: src/multitrack.c:6923
+#: src/multitrack.c:7099
 msgid "Add Video Track at _Front"
 msgstr ""
 
-#: src/multitrack.c:6936
+#: src/multitrack.c:7112
 msgid "_Split current track at cursor"
 msgstr ""
 
-#: src/multitrack.c:6948
+#: src/multitrack.c:7124
 msgid "_Split selected video tracks"
 msgstr ""
 
-#: src/multitrack.c:6961
+#: src/multitrack.c:7137
 msgid "Insert gap in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:6969
+#: src/multitrack.c:7145
 msgid "Insert gap in current track/selected time"
 msgstr ""
 
-#: src/multitrack.c:6981
+#: src/multitrack.c:7157
 msgid "Close all _gaps in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:7007
+#: src/multitrack.c:7183
 msgid "Se_lection"
 msgstr ""
 
-#: src/multitrack.c:7018
+#: src/multitrack.c:7194
 msgid "_Select Current Track"
 msgstr ""
 
-#: src/multitrack.c:7025
+#: src/multitrack.c:7201
 msgid "Select _all video tracks"
 msgstr ""
 
-#: src/multitrack.c:7032
+#: src/multitrack.c:7208
 msgid "Select _no video tracks"
 msgstr ""
 
-#: src/multitrack.c:7039
+#: src/multitrack.c:7215
 msgid "Select all _time"
 msgstr ""
 
-#: src/multitrack.c:7050
+#: src/multitrack.c:7226
 msgid "Select from _zero time"
 msgstr ""
 
-#: src/multitrack.c:7057
+#: src/multitrack.c:7233
 msgid "Select to _end time"
 msgstr ""
 
-#: src/multitrack.c:7064
+#: src/multitrack.c:7240
 msgid "_Copy..."
 msgstr ""
 
-#: src/multitrack.c:7075
+#: src/multitrack.c:7251
 msgid "_Timecode to region start"
 msgstr ""
 
-#: src/multitrack.c:7082
+#: src/multitrack.c:7258
 msgid "_Timecode to region end"
 msgstr ""
 
-#: src/multitrack.c:7089
+#: src/multitrack.c:7265
 msgid "_Region start to timecode"
 msgstr ""
 
-#: src/multitrack.c:7096
+#: src/multitrack.c:7272
 msgid "_Region end to timecode"
 msgstr ""
 
-#: src/multitrack.c:7110
+#: src/multitrack.c:7286
 msgid "Select/deselect block at current track/time"
 msgstr ""
 
-#: src/multitrack.c:7135
+#: src/multitrack.c:7311
 msgid "_Change width, height and audio values..."
 msgstr ""
 
-#: src/multitrack.c:7194
+#: src/multitrack.c:7370
 msgid "_Render"
 msgstr ""
 
-#: src/multitrack.c:7205
+#: src/multitrack.c:7381
 msgid "_Render all to new clip"
 msgstr ""
 
-#: src/multitrack.c:7220
+#: src/multitrack.c:7396
 msgid "Render _video"
 msgstr ""
 
-#: src/multitrack.c:7225
+#: src/multitrack.c:7401
 msgid "Render _audio"
 msgstr ""
 
-#: src/multitrack.c:7235
+#: src/multitrack.c:7411
 msgid "_Normalise rendered audio"
 msgstr ""
 
-#: src/multitrack.c:7242
+#: src/multitrack.c:7418
 msgid "_Pre-render audio"
 msgstr ""
 
-#: src/multitrack.c:7251
+#: src/multitrack.c:7427
 msgid "_View"
 msgstr "_Кўриниш"
 
-#: src/multitrack.c:7270
+#: src/multitrack.c:7446
 msgid "Block _In/out points"
 msgstr ""
 
-#: src/multitrack.c:7279
+#: src/multitrack.c:7455
 msgid "_Effects at current"
 msgstr ""
 
-#: src/multitrack.c:7297
+#: src/multitrack.c:7473
 msgid "Audio parameters"
 msgstr ""
 
-#: src/multitrack.c:7308
+#: src/multitrack.c:7484
 msgid "Show backing _audio track"
 msgstr ""
 
-#: src/multitrack.c:7312
+#: src/multitrack.c:7488
 msgid "Compact view"
 msgstr ""
 
-#: src/multitrack.c:7320
+#: src/multitrack.c:7496
 msgid "Maximum tracks to display..."
 msgstr ""
 
-#: src/multitrack.c:7327
+#: src/multitrack.c:7503
 msgid "Scroll to follow playback"
 msgstr ""
 
-#: src/multitrack.c:7331
+#: src/multitrack.c:7507
 msgid "_Center on cursor"
 msgstr ""
 
-#: src/multitrack.c:7338
+#: src/multitrack.c:7514
 msgid "_Zoom in"
 msgstr ""
 
-#: src/multitrack.c:7349
+#: src/multitrack.c:7525
 msgid "_Zoom out"
 msgstr ""
 
-#: src/multitrack.c:7361
+#: src/multitrack.c:7537
 msgid "Multitrack _details"
 msgstr ""
 
-#: src/multitrack.c:7374
+#: src/multitrack.c:7550
 msgid "_Event Window"
 msgstr ""
 
-#: src/multitrack.c:7378
+#: src/multitrack.c:7554
 msgid "_Event Window (selected time only)"
 msgstr ""
 
-#: src/multitrack.c:7382
+#: src/multitrack.c:7558
 msgid "_Show FRAME events"
 msgstr ""
 
-#: src/multitrack.c:7399
+#: src/multitrack.c:7575
 msgid "_Show multitrack keys"
 msgstr ""
 
-#: src/multitrack.c:7468
+#: src/multitrack.c:7644
 msgid "Mouse mode: _Move"
 msgstr ""
 
-#: src/multitrack.c:7476
+#: src/multitrack.c:7652
 msgid "Mouse mode: _Select"
 msgstr ""
 
-#: src/multitrack.c:7505
+#: src/multitrack.c:7681
 msgid "Insert mode: _Normal"
 msgstr ""
 
-#: src/multitrack.c:7733
+#: src/multitrack.c:7909
 msgid "Insert with _audio"
 msgstr ""
 
-#: src/multitrack.c:7734
+#: src/multitrack.c:7910
 msgid ""
 "Select whether video clips are inserted and moved with their audio or not"
 msgstr ""
 
-#: src/multitrack.c:7829
+#: src/multitrack.c:8007
 msgid "Select _overlap"
 msgstr ""
 
-#: src/multitrack.c:7830
+#: src/multitrack.c:8008
 msgid ""
 "Select whether timeline selection snaps to overlap between selected tracks "
 "or not"
 msgstr ""
 
-#: src/multitrack.c:7894 src/multitrack.c:14198
+#: src/multitrack.c:8073 src/multitrack.c:14422
 msgid "Expanded View (d)"
 msgstr ""
 
-#: src/multitrack.c:7897 src/multitrack.c:14205
+#: src/multitrack.c:8076 src/multitrack.c:14428
 msgid "Compact View (d)"
 msgstr ""
 
-#: src/multitrack.c:7939
+#: src/multitrack.c:8118
 msgid "Gravity: _Normal"
 msgstr ""
 
-#: src/multitrack.c:7952
+#: src/multitrack.c:8131
 msgid "Gravity: _Left"
 msgstr ""
 
-#: src/multitrack.c:7967
+#: src/multitrack.c:8146
 msgid "Gravity: _Right"
 msgstr ""
 
-#: src/multitrack.c:8297
+#: src/multitrack.c:8496
 msgid "_Apply"
 msgstr "_Қўллаш"
 
-#: src/multitrack.c:8319
+#: src/multitrack.c:8518
 msgid "Time"
 msgstr ""
 
-#: src/multitrack.c:8333
+#: src/multitrack.c:8532
 msgid "_Del. node"
 msgstr ""
 
-#: src/multitrack.c:8341
+#: src/multitrack.c:8540
 msgid "_Next node"
 msgstr ""
 
-#: src/multitrack.c:8349
+#: src/multitrack.c:8548
 msgid "_Prev node"
 msgstr ""
 
-#: src/multitrack.c:8373
+#: src/multitrack.c:8574
 msgid "_Reverse playback  "
 msgstr ""
 
-#: src/multitrack.c:8395
+#: src/multitrack.c:8596
 msgid "_Velocity  "
 msgstr ""
 
-#: src/multitrack.c:8464
+#: src/multitrack.c:8664
 msgid "Anchor _start"
 msgstr ""
 
-#: src/multitrack.c:8465
+#: src/multitrack.c:8665
 msgid "Anchor the start point to the timeline"
 msgstr ""
 
-#: src/multitrack.c:8481
-msgid "Start frame"
-msgstr ""
-
-#: src/multitrack.c:8533
+#: src/multitrack.c:8728
 msgid "Anchor _end"
 msgstr ""
 
-#: src/multitrack.c:8534
+#: src/multitrack.c:8729
 msgid "Anchor the end point to the timeline"
 msgstr ""
 
-#: src/multitrack.c:8546
-msgid "End frame"
-msgstr ""
-
-#: src/multitrack.c:8739
+#: src/multitrack.c:8929
 msgid "Scroll"
 msgstr ""
 
-#: src/multitrack.c:9316
+#: src/multitrack.c:9502
 msgid ""
 "\n"
 "==============================\n"
 "Switched to Clip Edit mode\n"
 msgstr ""
 
-#: src/multitrack.c:9502
+#: src/multitrack.c:9708
 msgid "Timeline (seconds)"
 msgstr ""
 
-#: src/multitrack.c:9984
+#: src/multitrack.c:10202
 msgid " Backing audio"
 msgstr ""
 
-#: src/multitrack.c:9987
+#: src/multitrack.c:10204
 #, c-format
 msgid " Layer %d audio"
 msgstr ""
 
-#: src/multitrack.c:9995
+#: src/multitrack.c:10212
 msgid "Show/hide audio details"
 msgstr ""
 
-#: src/multitrack.c:10010 src/multitrack.c:10232
+#: src/multitrack.c:10227 src/multitrack.c:10452
 #, c-format
 msgid "Layer %d audio"
 msgstr ""
 
-#: src/multitrack.c:10144 src/multitrack.c:10261
+#: src/multitrack.c:10353 src/multitrack.c:10481
 #, c-format
 msgid "%s (layer %d)"
 msgstr ""
 
-#: src/multitrack.c:10184
+#: src/multitrack.c:10403
 msgid "Select track"
 msgstr ""
 
-#: src/multitrack.c:10188
+#: src/multitrack.c:10407
 msgid "Show/hide audio"
 msgstr ""
 
-#: src/multitrack.c:10194
+#: src/multitrack.c:10413
 #, c-format
 msgid "Video %d"
 msgstr ""
 
-#: src/multitrack.c:10233
+#: src/multitrack.c:10453
 #, c-format
 msgid " %s"
 msgstr " %s"
 
-#: src/multitrack.c:10346
+#: src/multitrack.c:10574
 msgid "LiVES: Selected effect"
 msgstr ""
 
-#: src/multitrack.c:10358
+#: src/multitrack.c:10586
 msgid "_View/Edit this effect"
 msgstr ""
 
-#: src/multitrack.c:10361
+#: src/multitrack.c:10588
 msgid "_View this effect"
 msgstr ""
 
-#: src/multitrack.c:10369
+#: src/multitrack.c:10596
 msgid "_Delete this effect"
 msgstr ""
 
-#: src/multitrack.c:10422
+#: src/multitrack.c:10648
 msgid "Cannot insert after this effect"
 msgstr ""
 
-#: src/multitrack.c:10451
+#: src/multitrack.c:10677
 msgid "This effect cannot be moved"
 msgstr ""
 
-#: src/multitrack.c:10499
+#: src/multitrack.c:10724
 #, c-format
 msgid "  %d to %d selected  "
 msgstr ""
 
-#: src/multitrack.c:10502 src/multitrack.c:10746
+#: src/multitrack.c:10727 src/multitrack.c:10968
 #, c-format
 msgid "%.2f sec."
 msgstr ""
 
-#: src/multitrack.c:10717
+#: src/multitrack.c:10940
 #, c-format
 msgid "%d frames"
 msgstr ""
 
-#: src/multitrack.c:11070
+#: src/multitrack.c:11299
 msgid ""
 "\n"
 "==============================\n"
 "Switched to Multitrack mode\n"
 msgstr ""
 
-#: src/multitrack.c:12691
+#: src/multitrack.c:12939
 msgid "Drag the time slider to where you"
 msgstr ""
 
-#: src/multitrack.c:12692
+#: src/multitrack.c:12940
 msgid "want to set effect parameters"
 msgstr ""
 
-#: src/multitrack.c:12693
+#: src/multitrack.c:12941
 msgid "Set parameters, then click \"Apply\"\n"
 msgstr ""
 
-#: src/multitrack.c:12694
+#: src/multitrack.c:12942
 msgid ""
 "NODES are points where parameters\n"
 "have been set.\n"
 "Nodes can be deleted."
 msgstr ""
 
-#: src/multitrack.c:12697
+#: src/multitrack.c:12944
 msgid "Effect has no parameters.\n"
 msgstr ""
 
-#: src/multitrack.c:12788
+#: src/multitrack.c:13033
 #, c-format
 msgid "%s output"
 msgstr ""
 
-#: src/multitrack.c:12794 src/multitrack.c:12804
+#: src/multitrack.c:13038 src/multitrack.c:13046
 #, c-format
 msgid "layer %d"
 msgstr ""
 
-#: src/multitrack.c:12796 src/multitrack.c:12806
+#: src/multitrack.c:13039 src/multitrack.c:13047
 msgid "audio track"
 msgstr ""
 
-#: src/multitrack.c:12797
+#: src/multitrack.c:13040
 #, c-format
 msgid "%s to %s"
 msgstr ""
 
-#: src/multitrack.c:12807
+#: src/multitrack.c:13048
 #, c-format
 msgid "%s from %s"
 msgstr ""
 
-#: src/multitrack.c:12860
+#: src/multitrack.c:13099
 msgid "_Prev filter map"
 msgstr ""
 
-#: src/multitrack.c:12871
+#: src/multitrack.c:13110
 msgid "Insert _before"
 msgstr ""
 
-#: src/multitrack.c:12881
+#: src/multitrack.c:13120
 msgid "Insert _after"
 msgstr ""
 
-#: src/multitrack.c:12896
+#: src/multitrack.c:13134
 msgid "_Next filter map"
 msgstr ""
 
-#: src/multitrack.c:12911
+#: src/multitrack.c:13148
 msgid ""
 "\n"
 "\n"
@@ -9090,271 +9093,271 @@
 "current time.\n"
 msgstr ""
 
-#: src/multitrack.c:12929
+#: src/multitrack.c:13166
 msgid ""
 "Drag a compositor anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:12936
+#: src/multitrack.c:13173
 msgid ""
 "Drag a transition anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:12944
+#: src/multitrack.c:13181
 msgid ""
 "Effects can be dragged\n"
 "onto blocks on the timeline."
 msgstr ""
 
-#: src/multitrack.c:13166
+#: src/multitrack.c:13406
 msgid "LiVES: Selected block/frame"
 msgstr ""
 
-#: src/multitrack.c:13173
+#: src/multitrack.c:13413
 msgid "_Select this block"
 msgstr ""
 
-#: src/multitrack.c:13183
+#: src/multitrack.c:13423
 msgid "_Split block here"
 msgstr ""
 
-#: src/multitrack.c:13191
+#: src/multitrack.c:13431
 msgid "List _effects here"
 msgstr ""
 
-#: src/multitrack.c:13200 src/multitrack.c:13277
+#: src/multitrack.c:13440 src/multitrack.c:13518
 #, c-format
 msgid "_Adjust %s"
 msgstr ""
 
-#: src/multitrack.c:13215
+#: src/multitrack.c:13455
 msgid "_Delete this block"
 msgstr ""
 
-#: src/multitrack.c:13258
+#: src/multitrack.c:13500
 msgid "_Insert here"
 msgstr ""
 
-#: src/multitrack.c:13264
+#: src/multitrack.c:13505
 msgid "_Insert audio here"
 msgstr ""
 
-#: src/multitrack.c:14801
+#: src/multitrack.c:15017
 #, c-format
 msgid "Inserted gap in selected tracks from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:14835
+#: src/multitrack.c:15048
 #, c-format
 msgid "Inserted gap in track %s from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15036
+#: src/multitrack.c:15244
 #, c-format
 msgid "Undid %s\n"
 msgstr ""
 
-#: src/multitrack.c:15235
+#: src/multitrack.c:15445
 #, c-format
 msgid "Redid %s\n"
 msgstr ""
 
-#: src/multitrack.c:15268
+#: src/multitrack.c:15475
 msgid ""
 "\n"
 " (variable)"
 msgstr ""
 
-#: src/multitrack.c:15502 src/multitrack.c:15614 src/multitrack.c:18736
-#: src/multitrack.c:18748
+#: src/multitrack.c:15710 src/multitrack.c:15823 src/multitrack.c:19077
+#: src/multitrack.c:19089
 #, c-format
 msgid "track %s"
 msgstr ""
 
-#: src/multitrack.c:15507 src/multitrack.c:15619 src/multitrack.c:18741
+#: src/multitrack.c:15715 src/multitrack.c:15828 src/multitrack.c:19082
 #, c-format
 msgid "tracks %s and %s"
 msgstr ""
 
-#: src/multitrack.c:15513 src/multitrack.c:15625 src/multitrack.c:18751
+#: src/multitrack.c:15721 src/multitrack.c:15834 src/multitrack.c:19091
 msgid "selected tracks"
 msgstr ""
 
-#: src/multitrack.c:15516
+#: src/multitrack.c:15726
 #, c-format
 msgid "Added %s %s to %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15550
+#: src/multitrack.c:15760
 #, c-format
 msgid "Added effect %s to track %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15631
+#: src/multitrack.c:15845
 #, c-format
 msgid "Deleted %s %s from %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15935
+#: src/multitrack.c:16143
 #, c-format
 msgid "rendered %d frames to new clip.\n"
 msgstr ""
 
-#: src/multitrack.c:16025
+#: src/multitrack.c:16230
 msgid "Cleaning up..."
 msgstr ""
 
-#: src/multitrack.c:16712
+#: src/multitrack.c:17003
 msgid "_Pause"
 msgstr ""
 
-#: src/multitrack.c:16713
+#: src/multitrack.c:17004
 msgid "Pause (p)"
 msgstr ""
 
-#: src/multitrack.c:16856
+#: src/multitrack.c:17151
 msgid "Press 'm' during playback"
 msgstr ""
 
-#: src/multitrack.c:16857
+#: src/multitrack.c:17152
 msgid "to make a mark on the timeline"
 msgstr ""
 
-#: src/multitrack.c:17154
+#: src/multitrack.c:17498
 #, c-format
 msgid ""
 "Inserted audio %.4f to %.4f from clip %s into backing audio from time %.4f "
 "to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:17414
+#: src/multitrack.c:17759
 #, c-format
 msgid ""
 "Inserted frames %d to %d from clip %s into track %s from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:17998
+#: src/multitrack.c:18332
 #, c-format
 msgid ""
 "Time region %.3f to %.3f\n"
 "selected.\n"
 msgstr ""
 
-#: src/multitrack.c:18002
+#: src/multitrack.c:18336
 msgid ""
 "select one or more tracks\n"
 "to create a region.\n"
 msgstr ""
 
-#: src/multitrack.c:18004
+#: src/multitrack.c:18337
 #, c-format
 msgid "%d video tracks selected.\n"
 msgstr ""
 
-#: src/multitrack.c:18006
+#: src/multitrack.c:18339
 msgid ""
 "Double click on timeline\n"
 "to deselect time region."
 msgstr ""
 
-#: src/multitrack.c:18013
+#: src/multitrack.c:18346
 msgid ""
 "Single click on an effect\n"
 "to select it."
 msgstr ""
 
-#: src/multitrack.c:18014
+#: src/multitrack.c:18347
 msgid ""
 "Double click on an effect\n"
 "to edit it."
 msgstr ""
 
-#: src/multitrack.c:18015
+#: src/multitrack.c:18348
 msgid ""
 "Right click on an effect\n"
 "for context menu.\n"
 msgstr ""
 
-#: src/multitrack.c:18017
+#: src/multitrack.c:18350
 msgid ""
 "Effect order can be changed at\n"
 "FILTER MAPS"
 msgstr ""
 
-#: src/multitrack.c:18024
+#: src/multitrack.c:18357
 msgid ""
 "You can select an effect,\n"
 "then use the INSERT BEFORE"
 msgstr ""
 
-#: src/multitrack.c:18025
+#: src/multitrack.c:18358
 msgid "or INSERT AFTER buttons to move it."
 msgstr ""
 
-#: src/multitrack.c:18307 src/multitrack.c:18320
+#: src/multitrack.c:18639 src/multitrack.c:18652
 msgid "Click on another effect,"
 msgstr ""
 
-#: src/multitrack.c:18308 src/multitrack.c:18321
+#: src/multitrack.c:18640 src/multitrack.c:18653
 msgid ""
 "and the selected one\n"
 "will be inserted"
 msgstr ""
 
-#: src/multitrack.c:18309
+#: src/multitrack.c:18641
 msgid "after it.\n"
 msgstr ""
 
-#: src/multitrack.c:18322
+#: src/multitrack.c:18654
 msgid "before it.\n"
 msgstr ""
 
-#: src/multitrack.c:18551
+#: src/multitrack.c:18889
 #, c-format
 msgid "Removed parameter values for effect %s at time %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:18759
+#: src/multitrack.c:19100
 #, c-format
 msgid "Set parameter values for %s %s on %s at time %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:19251 src/multitrack.c:20873
+#: src/multitrack.c:19630 src/multitrack.c:21195
 msgid "_Autoreload each time"
 msgstr ""
 
-#: src/multitrack.c:19323
+#: src/multitrack.c:19702
 msgid "Saving layout"
 msgstr ""
 
-#: src/multitrack.c:19345
+#: src/multitrack.c:19725
 #, c-format
 msgid "Saved layout to %s\n"
 msgstr ""
 
-#: src/multitrack.c:20783
+#: src/multitrack.c:21125
 msgid "clips and frames"
 msgstr ""
 
-#: src/multitrack.c:20787
+#: src/multitrack.c:21128
 msgid "clips"
 msgstr ""
 
-#: src/multitrack.c:20790
+#: src/multitrack.c:21130
 msgid "frames"
 msgstr "кадрлар"
 
-#: src/multitrack.c:20800
+#: src/multitrack.c:21140
 msgid ""
 "\n"
 "Auto reload layout.\n"
 msgstr ""
 
-#: src/multitrack.c:20803
+#: src/multitrack.c:21143
 #, c-format
 msgid ""
 "%s\n"
@@ -9362,100 +9365,100 @@
 "Therefore it could not be loaded properly.\n"
 msgstr ""
 
-#: src/multitrack.c:20920
+#: src/multitrack.c:21284
 msgid "auto backup"
 msgstr ""
 
-#: src/multitrack.c:20923
+#: src/multitrack.c:21287
 #, c-format
 msgid ""
 "\n"
 "Unable to load layout file %s\n"
 msgstr ""
 
-#: src/multitrack.c:20944
+#: src/multitrack.c:21308
 #, c-format
 msgid "Loading layout from %s..."
 msgstr ""
 
-#: src/multitrack.c:20978
+#: src/multitrack.c:21338
 #, c-format
 msgid "Got %d events...processing..."
 msgstr ""
 
-#: src/multitrack.c:20991
+#: src/multitrack.c:21349
 msgid "Checking and rebuilding event list"
 msgstr ""
 
-#: src/multitrack.c:21017
+#: src/multitrack.c:21374
 #, c-format
 msgid "%d errors detected.\n"
 msgstr ""
 
-#: src/multitrack.c:21068
+#: src/multitrack.c:21422
 #, c-format
 msgid "Multitrack fps set to %.3f\n"
 msgstr ""
 
-#: src/multitrack.c:21225
+#: src/multitrack.c:21576
 msgid ""
 "The current layout has changes which have not been saved.\n"
 "Are you sure you wish to wipe it ?\n"
 msgstr ""
 
-#: src/multitrack.c:22047
+#: src/multitrack.c:22385
 msgid "LiVES: Multitrack audio mixer"
 msgstr ""
 
-#: src/multitrack.c:22077
+#: src/multitrack.c:22414
 msgid "_Reset values"
 msgstr ""
 
-#: src/multitrack.c:22081
+#: src/multitrack.c:22418
 msgid "_Close mixer"
 msgstr ""
 
-#: src/multitrack.c:22130
+#: src/multitrack.c:22466
 msgid ""
 "_Invert backing audio\n"
 "and layer volumes"
 msgstr ""
 
-#: src/multitrack.c:22132
+#: src/multitrack.c:22468
 msgid "Adjust backing and layer audio values so that they sum to 1.0"
 msgstr ""
 
-#: src/multitrack.c:22175
+#: src/multitrack.c:22510
 msgid "_Gang layer audio"
 msgstr ""
 
-#: src/multitrack.c:22177
+#: src/multitrack.c:22512
 msgid "Adjust all layer audio values to the same value"
 msgstr ""
 
-#: src/jack.c:104
+#: src/jack.c:102
 msgid "JACK server started\n"
 msgstr ""
 
-#: src/jack.c:1284 src/jack.c:1353
+#: src/jack.c:1265 src/jack.c:1334
 msgid "Unable to connect to JACK server\n"
 msgstr ""
 
-#: src/jack.c:1512
+#: src/jack.c:1491
 msgid "Started jack audio subsystem.\n"
 msgstr ""
 
-#: src/jack.c:1623
+#: src/jack.c:1600
 msgid "Started jack audio reader.\n"
 msgstr ""
 
-#: src/jack.c:1838
+#: src/jack.c:1815
 msgid ""
 "\n"
 "Connection to jack audio was reset.\n"
 msgstr ""
 
-#: src/pulse.c:87
+#: src/pulse.c:88
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -9463,7 +9466,7 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:92
+#: src/pulse.c:94
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -9471,7 +9474,7 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:96
+#: src/pulse.c:99
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -9479,335 +9482,335 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:101
+#: src/pulse.c:104
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
 msgstr ""
 
-#: src/pulse.c:107
+#: src/pulse.c:109
 msgid "LiVES will exit and you can choose another audio player.\n"
 msgstr ""
 
-#: src/pulse.c:1352
+#: src/pulse.c:1335
 msgid ""
 "\n"
 "Connection to pulse audio was reset.\n"
 msgstr ""
 
-#: src/colourspace.c:1100
+#: src/colourspace.c:1092
 msgid "unclamped"
 msgstr ""
 
-#: src/colourspace.c:1101
+#: src/colourspace.c:1093
 msgid "clamped"
 msgstr ""
 
-#: src/omc-learn.c:195
+#: src/omc-learn.c:191
 #, c-format
 msgid "Responding to joystick events from %s\n"
 msgstr ""
 
-#: src/omc-learn.c:289
+#: src/omc-learn.c:279
 msgid "Creating ALSA seq port..."
 msgstr ""
 
-#: src/omc-learn.c:325
+#: src/omc-learn.c:313
 #, c-format
 msgid "Responding to MIDI events from %s\n"
 msgstr ""
 
-#: src/omc-learn.c:568
+#: src/omc-learn.c:554
 msgid "data"
 msgstr "maʼlumot"
 
-#: src/omc-learn.c:571
+#: src/omc-learn.c:557
 msgid "velocity"
 msgstr ""
 
-#: src/omc-learn.c:572
+#: src/omc-learn.c:558
 msgid "note"
 msgstr "изоҳ"
 
-#: src/omc-learn.c:574 src/omc-learn.c:736 src/omc-learn.c:1105
-#: src/omc-learn.c:1591 src/omc-learn.c:1640
+#: src/omc-learn.c:560 src/omc-learn.c:724 src/omc-learn.c:1092
+#: src/omc-learn.c:1581 src/omc-learn.c:1630
 msgid "value"
 msgstr "qiymat"
 
-#: src/omc-learn.c:576
+#: src/omc-learn.c:562
 msgid "state"
 msgstr ""
 
-#: src/omc-learn.c:688
+#: src/omc-learn.c:674
 msgid "variable"
 msgstr ""
 
-#: src/omc-learn.c:1001
+#: src/omc-learn.c:989
 msgid "Vars."
 msgstr ""
 
-#: src/omc-learn.c:1054
+#: src/omc-learn.c:1041
 #, c-format
 msgid "MIDI ch %d note on"
 msgstr ""
 
-#: src/omc-learn.c:1058
+#: src/omc-learn.c:1045
 #, c-format
 msgid "MIDI ch %d note off"
 msgstr ""
 
-#: src/omc-learn.c:1062
+#: src/omc-learn.c:1049
 #, c-format
 msgid "MIDI ch %d controller %d"
 msgstr ""
 
-#: src/omc-learn.c:1066
+#: src/omc-learn.c:1053
 #, c-format
 msgid "MIDI ch %d pitch bend"
 msgstr ""
 
-#: src/omc-learn.c:1070
+#: src/omc-learn.c:1057
 #, c-format
 msgid "MIDI ch %d pgm change"
 msgstr ""
 
-#: src/omc-learn.c:1073
+#: src/omc-learn.c:1060
 #, c-format
 msgid "Joystick button %d"
 msgstr ""
 
-#: src/omc-learn.c:1076
+#: src/omc-learn.c:1063
 #, c-format
 msgid "Joystick axis %d"
 msgstr ""
 
-#: src/omc-learn.c:1113
+#: src/omc-learn.c:1100
 msgid "x"
 msgstr "x"
 
-#: src/omc-learn.c:1122
+#: src/omc-learn.c:1109
 msgid "range"
 msgstr "oraliq"
 
-#: src/omc-learn.c:1143
+#: src/omc-learn.c:1130
 msgid "+ offset1"
 msgstr ""
 
-#: src/omc-learn.c:1161
+#: src/omc-learn.c:1150
 msgid "* scale"
 msgstr ""
 
-#: src/omc-learn.c:1179
+#: src/omc-learn.c:1170
 msgid "+ offset2"
 msgstr ""
 
-#: src/omc-learn.c:1280
+#: src/omc-learn.c:1270
 msgid ""
 "\n"
 "Click OK to delete all entries\n"
 msgstr ""
 
-#: src/omc-learn.c:1318
+#: src/omc-learn.c:1308
 msgid "LiVES: OMC learner"
 msgstr ""
 
-#: src/omc-learn.c:1334
+#: src/omc-learn.c:1324
 msgid "Clear _unmatched"
 msgstr ""
 
-#: src/omc-learn.c:1345
+#: src/omc-learn.c:1335
 msgid "_Delete all"
 msgstr ""
 
-#: src/omc-learn.c:1411
+#: src/omc-learn.c:1401
 msgid "Start video playback"
 msgstr ""
 
-#: src/omc-learn.c:1414
+#: src/omc-learn.c:1404
 msgid "Stop video playback"
 msgstr ""
 
-#: src/omc-learn.c:1418
+#: src/omc-learn.c:1408
 msgid "Clip select <clipnum>"
 msgstr ""
 
-#: src/omc-learn.c:1419
+#: src/omc-learn.c:1409
 msgid "Switch foreground clip to the nth valid clip"
 msgstr ""
 
-#: src/omc-learn.c:1423
+#: src/omc-learn.c:1413
 msgid "Play forwards"
 msgstr ""
 
-#: src/omc-learn.c:1424
+#: src/omc-learn.c:1414
 msgid "Play video in a forwards direction"
 msgstr ""
 
-#: src/omc-learn.c:1427
+#: src/omc-learn.c:1417
 msgid "Play backwards"
 msgstr ""
 
-#: src/omc-learn.c:1428
+#: src/omc-learn.c:1418
 msgid "Play video in a backwards direction"
 msgstr ""
 
-#: src/omc-learn.c:1431
+#: src/omc-learn.c:1421
 msgid "Reverse playback direction"
 msgstr ""
 
-#: src/omc-learn.c:1432
+#: src/omc-learn.c:1422
 msgid "Reverse direction of video playback"
 msgstr ""
 
-#: src/omc-learn.c:1435
+#: src/omc-learn.c:1425
 msgid "Play video faster"
 msgstr ""
 
-#: src/omc-learn.c:1436
+#: src/omc-learn.c:1426
 msgid "Play video at a slightly faster rate"
 msgstr ""
 
-#: src/omc-learn.c:1439
+#: src/omc-learn.c:1429
 msgid "Play video slower"
 msgstr ""
 
-#: src/omc-learn.c:1440
+#: src/omc-learn.c:1430
 msgid "Play video at a slightly slower rate"
 msgstr ""
 
-#: src/omc-learn.c:1443
+#: src/omc-learn.c:1433
 msgid "Toggle video freeze"
 msgstr ""
 
-#: src/omc-learn.c:1444
+#: src/omc-learn.c:1434
 msgid "Freeze video, or if already frozen, unfreeze it"
 msgstr ""
 
-#: src/omc-learn.c:1447
+#: src/omc-learn.c:1437
 msgid "Set video framerate to <fps>"
 msgstr ""
 
-#: src/omc-learn.c:1448
+#: src/omc-learn.c:1438
 msgid "Set framerate of foreground clip to <float fps>"
 msgstr ""
 
-#: src/omc-learn.c:1452
+#: src/omc-learn.c:1442
 msgid "Start recording"
 msgstr ""
 
-#: src/omc-learn.c:1455
+#: src/omc-learn.c:1445
 msgid "Stop recording"
 msgstr ""
 
-#: src/omc-learn.c:1458
+#: src/omc-learn.c:1448
 msgid "Toggle recording state"
 msgstr ""
 
-#: src/omc-learn.c:1461
+#: src/omc-learn.c:1451
 msgid "Swap foreground and background clips"
 msgstr ""
 
-#: src/omc-learn.c:1463
+#: src/omc-learn.c:1453
 msgid "Reset effect keys"
 msgstr ""
 
-#: src/omc-learn.c:1464
+#: src/omc-learn.c:1454
 msgid "Switch all effects off."
 msgstr ""
 
-#: src/omc-learn.c:1467
+#: src/omc-learn.c:1457
 msgid "Enable effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1471
+#: src/omc-learn.c:1461
 msgid "Disable effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1475
+#: src/omc-learn.c:1465
 msgid "Toggle effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1479
+#: src/omc-learn.c:1469
 msgid "Set parameter value <key> <pnum> = <value>"
 msgstr ""
 
-#: src/omc-learn.c:1480
+#: src/omc-learn.c:1470
 msgid "Set <value> of pth (numerical) parameter for effect key <key>."
 msgstr ""
 
-#: src/omc-learn.c:1484
+#: src/omc-learn.c:1474
 msgid "Switch foreground to next clip"
 msgstr ""
 
-#: src/omc-learn.c:1487
+#: src/omc-learn.c:1477
 msgid "Switch foreground to previous clip"
 msgstr ""
 
-#: src/omc-learn.c:1490
+#: src/omc-learn.c:1480
 msgid "Set video framerate to ratio <fps_ratio>"
 msgstr ""
 
-#: src/omc-learn.c:1491
+#: src/omc-learn.c:1481
 msgid "Set framerate ratio of foreground clip to <float fps_ratio>"
 msgstr ""
 
-#: src/omc-learn.c:1495
+#: src/omc-learn.c:1485
 msgid "Retrigger clip <clipnum>"
 msgstr ""
 
-#: src/omc-learn.c:1496
+#: src/omc-learn.c:1486
 msgid ""
 "Switch foreground clip to the nth valid clip, and reset the frame number"
 msgstr ""
 
-#: src/omc-learn.c:1500
+#: src/omc-learn.c:1490
 msgid "Cycle to next mode for effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1504
+#: src/omc-learn.c:1494
 msgid "Cycle to previous mode for effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1508
+#: src/omc-learn.c:1498
 msgid "Set playback plugin parameter value <pnum> = <value>"
 msgstr ""
 
-#: src/omc-learn.c:1509
+#: src/omc-learn.c:1499
 msgid "Set <value> of pth parameter for the playback plugin."
 msgstr ""
 
 #. TRANSLATORS: short form of "clip number"
-#: src/omc-learn.c:1536 src/omc-learn.c:1607
+#: src/omc-learn.c:1526 src/omc-learn.c:1597
 msgid "clipnum"
 msgstr ""
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1545
+#: src/omc-learn.c:1535
 msgid "fps"
 msgstr "fps"
 
 #. TRANSLATORS: as in keyboard key
-#: src/omc-learn.c:1553 src/omc-learn.c:1560 src/omc-learn.c:1567
-#: src/omc-learn.c:1575 src/omc-learn.c:1615 src/omc-learn.c:1623
+#: src/omc-learn.c:1543 src/omc-learn.c:1550 src/omc-learn.c:1557
+#: src/omc-learn.c:1565 src/omc-learn.c:1605 src/omc-learn.c:1613
 msgid "key"
 msgstr ""
 
 #. TRANSLATORS: short form of "parameter number"
-#: src/omc-learn.c:1583 src/omc-learn.c:1632
+#: src/omc-learn.c:1573 src/omc-learn.c:1622
 msgid "pnum"
 msgstr ""
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1599
+#: src/omc-learn.c:1589
 msgid "fps_ratio"
 msgstr ""
 
-#: src/omc-learn.c:2443
+#: src/omc-learn.c:2417
 #, c-format
 msgid "Saving device mapping to file %s..."
 msgstr ""
 
-#: src/omc-learn.c:2527
+#: src/omc-learn.c:2498
 #, c-format
 msgid ""
 "\n"
@@ -9816,7 +9819,7 @@
 "%s\n"
 msgstr ""
 
-#: src/omc-learn.c:2534
+#: src/omc-learn.c:2505
 #, c-format
 msgid ""
 "\n"
@@ -9825,12 +9828,12 @@
 "%s\n"
 msgstr ""
 
-#: src/omc-learn.c:2571
+#: src/omc-learn.c:2541
 #, c-format
 msgid "Loading device mapping from file %s..."
 msgstr ""
 
-#: src/omc-learn.c:2576
+#: src/omc-learn.c:2544
 #, c-format
 msgid ""
 "\n"
@@ -9840,12 +9843,12 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/videodev.c:547
+#: src/videodev.c:539
 #, c-format
 msgid "Unable to open device %s\n"
 msgstr ""
 
-#: src/videodev.c:564
+#: src/videodev.c:554
 #, c-format
 msgid "Opened device %s\n"
 msgstr ""
@@ -10469,5 +10472,8 @@
 #~ msgid "$error"
 #~ msgstr "$error"
 
+#~ msgid "Pause"
+#~ msgstr "Вақтинча тўхтатиш"
+
 #~ msgid "                                                            "
 #~ msgstr "                                                            "

LiVES-2.2.8.tar.bz2/po/zh_CN.po -> LiVES-2.4.1.tar.bz2/po/zh_CN.po Changed

@@ -7,19 +7,18 @@
 msgstr ""
 "Project-Id-Version: lives\n"
 "Report-Msgid-Bugs-To: https://sourceforge.net/p/lives/bugs/\n"
-"POT-Creation-Date: 2015-02-08 17:18-0300\n"
-"PO-Revision-Date: 2013-03-14 12:31+0000\n"
-"Last-Translator: Launchpad Translations Administrators <Unknown>\n"
+"POT-Creation-Date: 2015-08-09 14:52-0300\n"
+"PO-Revision-Date: 2015-04-05 16:35+0000\n"
+"Last-Translator: Timothy Gu <timothy_gu@hotmail.com>\n"
 "Language-Team: Simplified Chinese <zh_CN@li.org>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-03-28 10:41+0000\n"
-"X-Generator: Launchpad (build 16546)\n"
+"X-Launchpad-Export-Date: 2015-05-03 15:41+0000\n"
+"X-Generator: Launchpad (build 17474)\n"
 
-#. TRANSLATORS: do not translate this message
-#: src/main.c:118
+#: src/main.c:128
 msgid ""
 "Attention Translators !\n"
 "This message is intended for you, so please do not translate it.\n"
@@ -28,22 +27,22 @@
 "http://lives.sourceforge.net/TRANS-README.txt"
 msgstr ""
 
-#: src/main.c:134
+#: src/main.c:153
 #, c-format
 msgid "%s Warning: %s\n"
-msgstr ""
+msgstr "%s 警告： %s\n"
 
-#: src/main.c:138
+#: src/main.c:157
 #, c-format
 msgid "%s Critical error: %s\n"
-msgstr ""
+msgstr "%s 严重错误： %s\n"
 
-#: src/main.c:139
+#: src/main.c:158
 #, c-format
 msgid "%s Fatal error: %s\n"
-msgstr ""
+msgstr "%s 致命错误： %s\n"
 
-#: src/main.c:176
+#: src/main.c:198
 msgid ""
 "\n"
 "Unfortunately LiVES crashed.\n"
@@ -57,7 +56,7 @@
 "谢。\n"
 "重启 LiVES 之后应该可以恢复。\n"
 
-#: src/main.c:177
+#: src/main.c:199
 msgid ""
 "\n"
 "\n"
@@ -68,7 +67,7 @@
 "\n"
 "报告崩溃时请包括操作系统、发行版及 LiVES 版本信息 ("
 
-#: src/main.c:180
+#: src/main.c:203
 msgid ""
 "and any information shown below:\n"
 "\n"
@@ -76,7 +75,7 @@
 "以及下面的信息：\n"
 "\n"
 
-#: src/main.c:184
+#: src/main.c:206
 msgid ""
 "Please install gdb and then run LiVES with the -debug option to collect more "
 "information.\n"
@@ -85,84 +84,83 @@
 "请安装 gdb 然后添加 -debug 选项运行 LiVES 以便收集更多信息。\n"
 "\n"
 
-#: src/main.c:192
+#: src/main.c:216
 msgid "Preserving set.\n"
 msgstr "正在保存场景。\n"
 
-#: src/main.c:636
+#: src/main.c:691
 msgid "Resizing"
 msgstr "正在调整尺寸"
 
-#: src/main.c:643
+#: src/main.c:698
 msgid "_Resize All Frames"
 msgstr "调整所有帧的尺寸(_R)"
 
 #. TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-#: src/main.c:895
+#: src/main.c:948
 msgid "Any"
 msgstr "任意"
 
 #. TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-#: src/main.c:897
+#: src/main.c:950
 msgid "None"
 msgstr "无"
 
 #. TRANSLATORS: text saying "recommended", for plugin names, etc.
-#: src/main.c:899
+#: src/main.c:952
 msgid "recommended"
 msgstr "推荐"
 
 #. TRANSLATORS: text saying "disabled", (as in "not enabled")
-#: src/main.c:901
+#: src/main.c:954
 msgid "disabled !"
 msgstr "已禁用 ！"
 
 #. TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-#: src/main.c:903
+#: src/main.c:956
 msgid "**The current layout**"
 msgstr "**当前的布局**"
 
 #. TRANSLATORS: adjective for "Built in" type effects
-#: src/main.c:905
+#: src/main.c:958
 msgid "Builtin"
 msgstr "内置"
 
 #. TRANSLATORS: adjective for "Custom" type effects
-#: src/main.c:907
+#: src/main.c:960
 msgid "Custom"
 msgstr "自定义"
 
 #. TRANSLATORS: adjective for "Test" type effects
-#: src/main.c:909
+#: src/main.c:962
 msgid "Test"
 msgstr "测试"
 
-#: src/main.c:1054
+#: src/main.c:1107
 msgid "Foreground"
 msgstr ""
 
-#: src/main.c:1055
-#, fuzzy
+#: src/main.c:1108
 msgid "Background"
-msgstr "空白背景(_B)"
+msgstr ""
 
-#: src/main.c:1566
+#: src/main.c:1624
 msgid "Loading realtime effect plugins..."
 msgstr "正在加载实时效果插件..."
 
-#: src/main.c:1631
+#: src/main.c:1690
 msgid "Starting jack audio server..."
 msgstr "正在启动 jack 音频服务器..."
 
-#: src/main.c:1633
+#: src/main.c:1692
 msgid "Starting jack transport server..."
 msgstr "正在启动 jack 传输服务器..."
 
-#: src/main.c:1634
+#: src/main.c:1693
 msgid "Connecting to jack transport server..."
 msgstr "正在连接 jack 传输服务器..."
 
-#: src/main.c:1663
+#: src/main.c:1723
 #, c-format
 msgid ""
 "\n"
@@ -173,115 +171,122 @@
 "\n"
 "Alternatively, try to start lives with either \"lives -jackopts 16\", or "
 msgstr ""
+"\n"
+"\n"
+"需要手动启动jackd。请确认jackd已在运行。 \n"
+"或者把在 %s 中的<jack_opts>值改为16\n"
+"并重新启动LiVES。\n"
+"\n"
+"除此之外，尝试用启动命令行“lives -jackopts 16\"或 "
 
-#: src/main.c:1697
+#: src/main.c:1758
 msgid "Starting pulse audio server..."
 msgstr "正在开启 pulse 音频服务..."
 
-#: src/main.c:1765
+#: src/main.c:1825
 msgid "Checking optional dependencies:"
 msgstr "检查可选的依赖："
 
-#: src/main.c:1766
+#: src/main.c:1826
 msgid "mplayer...detected..."
 msgstr "mplayer...发现..."
 
-#: src/main.c:1767
+#: src/main.c:1827
 msgid "mplayer...NOT DETECTED..."
 msgstr "mplayer...未发现..."
 
-#: src/main.c:1768
+#: src/main.c:1828
 #, fuzzy
 msgid "mplayer2...detected..."
 msgstr "mplayer...发现..."
 
-#: src/main.c:1769
+#: src/main.c:1829
 #, fuzzy
 msgid "mplayer2...NOT DETECTED..."
 msgstr "mplayer...未发现..."
 
-#: src/main.c:1770
+#: src/main.c:1830
 msgid "convert...detected..."
 msgstr "convert...发现..."
 
-#: src/main.c:1771
+#: src/main.c:1831
 msgid "convert...NOT DETECTED..."
 msgstr "convert...未发现..."
 
-#: src/main.c:1772
+#: src/main.c:1832
 msgid "composite...detected..."
 msgstr "composite...发现..."
 
-#: src/main.c:1773
+#: src/main.c:1833
 msgid "composite...NOT DETECTED..."
 msgstr "composite...未发现..."
 
-#: src/main.c:1774
+#: src/main.c:1834
 msgid "sox...detected\n"
 msgstr "sox...发现\n"
 
-#: src/main.c:1775
+#: src/main.c:1835
 msgid "sox...NOT DETECTED\n"
 msgstr "sox...未发现\n"
 
-#: src/main.c:1776
+#: src/main.c:1836
 msgid "cdda2wav...detected..."
 msgstr "cdda2wav...发现..."
 
-#: src/main.c:1777
+#: src/main.c:1837
 msgid "cdda2wav...NOT DETECTED..."
 msgstr "cdda2wav...未发现..."
 
-#: src/main.c:1778
+#: src/main.c:1838
 msgid "jackd...detected..."
 msgstr "jackd...发现..."
 
-#: src/main.c:1779
+#: src/main.c:1839
 msgid "jackd...NOT DETECTED..."
 msgstr "jackd...未发现..."
 
-#: src/main.c:1780
+#: src/main.c:1840
 msgid "pulse audio...detected..."
 msgstr "pulse audio...发现..."
 
-#: src/main.c:1781
+#: src/main.c:1841
 msgid "pulse audio...NOT DETECTED..."
 msgstr "pulse 音频...未发现..."
 
-#: src/main.c:1782
+#: src/main.c:1842
 msgid "python...detected..."
 msgstr "python...发现..."
 
-#: src/main.c:1783
+#: src/main.c:1843
 msgid "python...NOT DETECTED..."
 msgstr "python...未发现..."
 
-#: src/main.c:1784
+#: src/main.c:1844
 msgid "dvgrab...detected..."
 msgstr "dvgrab...发现..."
 
-#: src/main.c:1785
+#: src/main.c:1845
 msgid "dvgrab...NOT DETECTED..."
 msgstr "dvgrab...未发现..."
 
-#: src/main.c:1786
+#: src/main.c:1846
 msgid "xwininfo...detected..."
 msgstr "xwininfo...发现..."
 
-#: src/main.c:1787
+#: src/main.c:1847
 msgid "xwininfo...NOT DETECTED..."
 msgstr "xwininfo...未发现..."
 
-#: src/main.c:1793
+#: src/main.c:1853
 #, c-format
 msgid "Windows version %04X"
-msgstr ""
+msgstr "Windows 版本为 %04X"
 
-#: src/main.c:1795
+#: src/main.c:1855
 msgid "UNKNOWN - please patch me !"
-msgstr ""
+msgstr "未知 - 请给我打上补丁！"
 
-#: src/main.c:1799
+#: src/main.c:1859
 #, c-format
 msgid ""
 "\n"
@@ -292,48 +297,48 @@
 "\n"
 "窗口管理器报告为\"%s\"； "
 
-#: src/main.c:1802
+#: src/main.c:1862
 #, c-format
 msgid "number of monitors detected: %d\n"
 msgstr "检测到的显视器数量：%d\n"
 
-#: src/main.c:1805
+#: src/main.c:1865
 #, c-format
 msgid "Number of CPUs detected: %d "
-msgstr ""
+msgstr "检测到CPU个数：%d "
 
-#: src/main.c:1808 src/multitrack.c:4902
+#: src/main.c:1868 src/multitrack.c:5068
 msgid "little endian"
 msgstr "小端"
 
-#: src/main.c:1809 src/multitrack.c:4901
+#: src/main.c:1869 src/multitrack.c:5067
 msgid "big endian"
 msgstr "大端"
 
-#: src/main.c:1810
+#: src/main.c:1870
 #, c-format
 msgid "(%d bits, %s)\n"
 msgstr ""
 
-#: src/main.c:1814
+#: src/main.c:1874
 msgid "GUI type is: "
 msgstr ""
 
-#: src/main.c:1818
+#: src/main.c:1878
 #, c-format
 msgid "GTK+ version %d.%d.%d (compiled with %d.%d.%d)"
-msgstr ""
+msgstr "GTK+ 版本 %d.%d.%d (编译器版本 %d.%d.%d)"
 
-#: src/main.c:1840
+#: src/main.c:1900
 msgid ", with cairo support"
-msgstr ""
+msgstr "，基于cairo绘图库"
 
-#: src/main.c:1847
+#: src/main.c:1907
 #, c-format
 msgid "Temp directory is %s\n"
 msgstr "临时文件夹为 %s\n"
 
-#: src/main.c:1851
+#: src/main.c:1911
 msgid ""
 "WARNING - this version of LiVES was compiled without either\n"
 "jack or pulse audio support.\n"
@@ -343,15 +348,15 @@
 "jack 或 pulse 音频支持。\n"
 "许多音频功能将不可用。\n"
 
-#: src/main.c:1854
+#: src/main.c:1914
 msgid "Compiled with jack support, good !\n"
 msgstr "编译上 jack 支持了，好！\n"
 
-#: src/main.c:1857
+#: src/main.c:1917
 msgid "Compiled with pulse audio support, wonderful !\n"
 msgstr "编译上 pulse 音频支持了，很好！\n"
 
-#: src/main.c:1861
+#: src/main.c:1921
 #, c-format
 msgid ""
 "Welcome to LiVES version %s.\n"
@@ -360,7 +365,7 @@
 "欢迎来到 LiVES 版本 %s。\n"
 "\n"
 
-#: src/main.c:2306
+#: src/main.c:2380
 #, c-format
 msgid ""
 "\n"
@@ -369,85 +374,92 @@
 "\n"
 "启动语法为： %s [opts] [filename [start_time] [frames]]\n"
 
-#: src/main.c:2307
+#: src/main.c:2381
 msgid "Where: filename is the name of a media file or backup file.\n"
 msgstr "其中：filename 为媒体文件或备份文件名。\n"
 
-#: src/main.c:2308
+#: src/main.c:2382
 msgid "start_time : filename start time in seconds\n"
 msgstr "start_time : 文件名以秒计的开始时间\n"
 
-#: src/main.c:2309
+#: src/main.c:2383
 msgid "frames : maximum number of frames to open\n"
 msgstr "frames : 要打开的最大帧数\n"
 
-#: src/main.c:2311
+#: src/main.c:2385
 msgid "opts can be:\n"
 msgstr "选项可以是：\n"
 
-#: src/main.c:2312
+#: src/main.c:2386
 msgid "-help            : show this help text and exit\n"
 msgstr "-help            : 显示此帮助文字并退出\n"
 
-#: src/main.c:2313
+#: src/main.c:2387
 msgid "-tmpdir <tempdir>: use alternate working directory (e.g /var/ramdisk)\n"
 msgstr "-tmpdir <tempdir> ：使用其它的工作目录(例如 /var/ramdisk)\n"
 
-#: src/main.c:2314
+#: src/main.c:2388
 msgid "-set <setname>   : autoload clip set setname\n"
 msgstr "-set <setname> : 自动加载场景 setname\n"
 
-#: src/main.c:2315
+#: src/main.c:2389
 msgid "-noset           : do not load any set on startup\n"
 msgstr "-noset : 启动时不加载任何场景\n"
 
-#: src/main.c:2316
+#: src/main.c:2390
 msgid "-norecover       : force no-loading of crash recovery\n"
 msgstr "-norecover : 强制不从崩溃中恢复\n"
 
-#: src/main.c:2317
+#: src/main.c:2391
 msgid "-recover         : force loading of crash recovery\n"
 msgstr "-recover         : 强制载入崩溃恢复\n"
 
-#: src/main.c:2318
-msgid "-nothreaddialog  : doe nothing - retained for backwards compatibility\n"
-msgstr ""
+#: src/main.c:2392
+#, fuzzy
+msgid ""
+"-nothreaddialog  : does nothing - retained for backwards compatibility\n"
+msgstr "-nothreaddialog : 不做任何事 - 保留向后兼容\n"
 
-#: src/main.c:2319
+#: src/main.c:2393
 msgid "-nogui           : do not show the gui\n"
 msgstr "-nogui : 不显示图形用户界面\n"
 
-#: src/main.c:2320
+#: src/main.c:2394
 msgid "-nosplash        : do not show the splash window\n"
 msgstr "-nosplash：不显示启动画面\n"
 
-#: src/main.c:2321
+#: src/main.c:2395
 msgid "-noplaywin       : do not show the play window\n"
 msgstr "-noplaywin：不显示播放窗口\n"
 
-#: src/main.c:2322
+#: src/main.c:2396
+msgid "-noninteractive  : disable menu interactivity\n"
+msgstr ""
+
+#: src/main.c:2397
 msgid "-startup-ce      : start in clip editor mode\n"
 msgstr "-startup-ce : 以剪辑编辑模式启动\n"
 
-#: src/main.c:2323
+#: src/main.c:2398
 msgid "-startup-mt      : start in multitrack mode\n"
 msgstr "-startup-mt : 以多轨模式启动\n"
 
-#: src/main.c:2324
+#: src/main.c:2399
 msgid ""
 "-fxmodesmax <n>  : allow <n> modes per effect key (minimum is 1, default is "
 "8)\n"
 msgstr ""
+"-fxmodesmax <n> : 每个特效帧允许 <n> 个模式 （最小值为 1，缺省值为 8）\n"
 
-#: src/main.c:2326
+#: src/main.c:2401
 msgid "-oscstart <port> : start OSC listener on UDP port <port>\n"
 msgstr "-oscstart <port> : 在 UDP 端口 <port> 启动 OSC 监听\n"
 
-#: src/main.c:2327
+#: src/main.c:2402
 msgid "-nooscstart      : do not start OSC listener\n"
 msgstr "-nooscstart : 不启动 OSC 监听\n"
 
-#: src/main.c:2329
+#: src/main.c:2404
 #, fuzzy
 msgid ""
 "-aplayer <ap>    : start with selected audio player. <ap> can be mplayer, "
@@ -455,15 +467,15 @@
 msgstr "-aplayer <ap>    : 和选择的音频播放器一起启动。<ap> 可以是 mplayer"
 
 #. TRANSLATORS: pulse (audio)
-#: src/main.c:2332
+#: src/main.c:2407
 msgid ", pulse"
 msgstr ", pulse"
 
-#: src/main.c:2335
+#: src/main.c:2410
 msgid ", sox or jack\n"
 msgstr "、 sox 或 jack\n"
 
-#: src/main.c:2336
+#: src/main.c:2412
 msgid ""
 "-jackopts <opts>    : opts is a bitmap of jack startup options [1 = jack "
 "transport client, 2 = jack transport master, 4 = start jack transport "
@@ -473,29 +485,29 @@
 "client, 2 = jack transport master, 4 = start jack transport server, 8 = "
 "pause audio when video paused, 16 = start jack audio server] \n"
 
-#: src/main.c:2338
+#: src/main.c:2414
 msgid " or sox\n"
 msgstr " 或 sox\n"
 
-#: src/main.c:2340
+#: src/main.c:2416
 msgid "-devicemap <mapname>          : autoload devicemap\n"
 msgstr "-devicemap <mapname>          : 自动加载 devicemap\n"
 
-#: src/main.c:2341
+#: src/main.c:2418
 msgid ""
 "-vppdefaults <file>          : load video playback plugin defaults from "
 "<file> (Note: only sets the settings, not the plugin type)\n"
 msgstr ""
 
-#: src/main.c:2342
+#: src/main.c:2419
 msgid "-debug            : try to debug crashes (requires 'gdb' installed)\n"
 msgstr "-debug : 尝试调试崩溃（需要安装 gdb）\n"
 
-#: src/main.c:2373 src/gui.c:1128
+#: src/main.c:2449 src/gui.c:1127
 msgid "Starting GUI..."
 msgstr "正在启动图形用户界面..."
 
-#: src/main.c:2396
+#: src/main.c:2475
 #, c-format
 msgid ""
 "\n"
@@ -506,7 +518,7 @@
 "(Maybe you need to change the value of <prefix_dir> in your %s file)\n"
 msgstr ""
 
-#: src/main.c:2410
+#: src/main.c:2492
 #, c-format
 msgid ""
 "\n"
@@ -514,7 +526,7 @@
 "Please make sure you have write access to %s and try again.\n"
 msgstr ""
 
-#: src/main.c:2415
+#: src/main.c:2498
 msgid ""
 "\n"
 "`smogrify` must be in your path, and be executable\n"
@@ -528,7 +540,7 @@
 "请在运行 LiVES 前\n"
 "参阅 README 文件。\n"
 
-#: src/main.c:2421
+#: src/main.c:2504
 #, c-format
 msgid ""
 "\n"
@@ -538,7 +550,7 @@
 "Please check the file permissions for this file and try again.\n"
 msgstr ""
 
-#: src/main.c:2428
+#: src/main.c:2512
 #, c-format
 msgid ""
 "\n"
@@ -549,7 +561,7 @@
 "and try again.\n"
 msgstr ""
 
-#: src/main.c:2438
+#: src/main.c:2522
 #, c-format
 msgid ""
 "Please check the <tempdir> setting in \n"
@@ -557,7 +569,7 @@
 "and try again.\n"
 msgstr ""
 
-#: src/main.c:2445
+#: src/main.c:2528
 #, c-format
 msgid ""
 "\n"
@@ -567,7 +579,7 @@
 "%s"
 msgstr ""
 
-#: src/main.c:2453
+#: src/main.c:2536
 msgid ""
 "\n"
 "An incorrect version of smogrify was found in your path.\n"
@@ -585,7 +597,7 @@
 "\n"
 "谢谢。\n"
 
-#: src/main.c:2458
+#: src/main.c:2541
 #, fuzzy
 msgid ""
 "\n"
@@ -595,7 +607,7 @@
 "\n"
 "LiVES 目前需要 'mplayer' 或 'sox' 以正常工作。请至少安装其中之一并重试。\n"
 
-#: src/main.c:2462
+#: src/main.c:2546
 #, fuzzy
 msgid ""
 "\n"
@@ -605,7 +617,7 @@
 "\n"
 "LiVES 目前需要 'mplayer' 或 'sox' 以正常工作。请至少安装其中之一并重试。\n"
 
-#: src/main.c:2472
+#: src/main.c:2556
 #, fuzzy
 msgid ""
 "\n"
@@ -615,7 +627,7 @@
 "\n"
 "LiVES 无法定位 'mplayer'。您可以安装 mplayer 来获得更完整的 LiVES 功能。\n"
 
-#: src/main.c:2475
+#: src/main.c:2561
 msgid ""
 "\n"
 "LiVES was unable to locate 'convert'. You should install convert and image-"
@@ -625,7 +637,7 @@
 "LiVES 无法定位 'convert'。您可以安装 convert 和 image-magick 来使用渲染效"
 "果。\n"
 
-#: src/main.c:2478
+#: src/main.c:2566
 msgid ""
 "\n"
 "LiVES was unable to locate 'composite'. You should install composite and "
@@ -635,7 +647,7 @@
 "LiVES 无法定位 'composite'。您需要安装 composite 和 image-magick 来使用融合功"
 "能。\n"
 
-#: src/main.c:2481
+#: src/main.c:2570
 msgid ""
 "\n"
 "LiVES was unable to locate 'sox'. Some audio features may not work. You "
@@ -644,7 +656,7 @@
 "\n"
 "LiVES 无法定位 'sox'。有些音频特性可能无法工作。您应该安装 'sox'。\n"
 
-#: src/main.c:2484
+#: src/main.c:2575
 #, c-format
 msgid ""
 "\n"
@@ -655,59 +667,59 @@
 "You may need to change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/main.c:2611
+#: src/main.c:2707
 #, c-format
 msgid "Autoloading set %s..."
 msgstr "自动装载场景 %s..."
 
 #. TRANSLATORS: localised name may be used here
-#: src/main.c:2781 src/interface.c:738
+#: src/main.c:2902
 msgid "LiVES"
 msgstr ""
 
-#: src/main.c:2948
+#: src/main.c:3066
 #, c-format
 msgid "Invalid audio player %s\n"
 msgstr "无效的音频播放器 %s\n"
 
-#: src/main.c:3077
+#: src/main.c:3214
 #, c-format
 msgid "LiVES-%s: <Untitled%d> %dx%d : %d frames %d bpp %.3f fps"
 msgstr "LiVES-%s: <Untitled%d> %dx%d : %d 帧 %d bpp %.3f fps"
 
-#: src/main.c:3082
+#: src/main.c:3219
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : ??? frames ??? bpp %.3f fps"
 msgstr "LiVES-%s: <%s> %dx%d : ??? 帧 ??? bpp %.3f fps"
 
-#: src/main.c:3086
+#: src/main.c:3222
 #, c-format
 msgid "LiVES-%s: <%s> %dx%d : %d frames %d bpp %.3f fps"
 msgstr "LiVES-%s: <%s> %dx%d : %d 帧 %d bpp %.3f fps"
 
-#: src/main.c:3094
+#: src/main.c:3229
 #, c-format
 msgid "LiVES-%s: <No File>"
 msgstr "LiVES-%s: <没有文件>"
 
 #. TRANSLATORS: rec(ord)
-#: src/main.c:5085
+#: src/main.c:5201
 #, c-format
 msgid "rec %9d/%d"
 msgstr ""
 
 #. TRANSLATORS: out of memory (rec(ord))
-#: src/main.c:5091
+#: src/main.c:5206
 #, c-format
 msgid "!rec %9d/%d"
 msgstr ""
 
-#: src/main.c:5398 src/main.c:5399 src/gui.c:2110 src/gui.c:3220
-#: src/saveplay.c:2336
+#: src/main.c:5500 src/main.c:5501 src/gui.c:2108 src/gui.c:3331
+#: src/saveplay.c:2315
 msgid "Play"
 msgstr "播放"
 
-#: src/main.c:6128
+#: src/main.c:6216
 msgid ""
 "LiVES was unable to capture this image\n"
 "\n"
@@ -715,35 +727,35 @@
 "LiVES 无法捕获此图片\n"
 "\n"
 
-#: src/main.c:6250
+#: src/main.c:6345
 #, c-format
 msgid "Closed file %s\n"
 msgstr "已关闭文件 %s\n"
 
-#: src/main.c:6452 src/gui.c:648 src/utils.c:4312 src/utils.c:4344
-#: src/saveplay.c:3550 src/multitrack.c:4510 src/multitrack.c:6268
+#: src/main.c:6542 src/gui.c:647 src/utils.c:4256 src/utils.c:4286
+#: src/saveplay.c:3500 src/multitrack.c:4678 src/multitrack.c:6447
 msgid "_Undo"
 msgstr "撤消(_U)"
 
-#: src/main.c:6453 src/gui.c:666 src/utils.c:4313 src/utils.c:4345
-#: src/saveplay.c:3551 src/multitrack.c:4531 src/multitrack.c:6293
+#: src/main.c:6543 src/gui.c:665 src/utils.c:4257 src/utils.c:4287
+#: src/saveplay.c:3501 src/multitrack.c:4698 src/multitrack.c:6472
 msgid "_Redo"
 msgstr "重做(_R)"
 
-#: src/main.c:6493 src/interface.c:470 src/gui.c:2326 src/preferences.c:2357
-#: src/resample.c:1516
+#: src/main.c:6583 src/interface.c:457 src/gui.c:2324 src/preferences.c:2391
+#: src/resample.c:1488
 msgid "Video"
 msgstr "视频"
 
-#: src/main.c:6494 src/interface.c:483 src/gui.c:2351
+#: src/main.c:6584 src/interface.c:470 src/gui.c:2348
 msgid "Left Audio"
 msgstr "左声道"
 
-#: src/main.c:6495 src/gui.c:2375
+#: src/main.c:6585 src/gui.c:2371
 msgid "Right Audio"
 msgstr "右声道"
 
-#: src/main.c:6540
+#: src/main.c:6630
 #, fuzzy
 msgid ""
 "\n"
@@ -757,11 +769,11 @@
 "如果指定音频播放器为 mplayer，LiVES 无法在同时打开的片段见切换。\n"
 "请调整首选项中的回放设置并重试。\n"
 
-#: src/main.c:7051 src/plugins.c:1502
+#: src/main.c:7134 src/plugins.c:1468
 msgid "LiVES: - Play Window"
 msgstr "LiVES: - 播放窗口"
 
-#: src/startup.c:25
+#: src/startup.c:24
 #, c-format
 msgid ""
 "A directory named\n"
@@ -771,7 +783,7 @@
 "(Free space = %s)\n"
 msgstr ""
 
-#: src/startup.c:32
+#: src/startup.c:29
 #, c-format
 msgid ""
 "A directory named\n"
@@ -781,7 +793,7 @@
 "Please select another location.\n"
 msgstr ""
 
-#: src/startup.c:49
+#: src/startup.c:46
 #, c-format
 msgid ""
 "\n"
@@ -792,7 +804,7 @@
 "(Free space = %s)"
 msgstr ""
 
-#: src/startup.c:54
+#: src/startup.c:50
 #, c-format
 msgid ""
 "\n"
@@ -801,11 +813,11 @@
 "Please try again and choose a different location.\n"
 msgstr ""
 
-#: src/startup.c:96
+#: src/startup.c:92
 msgid "Directory name is too long !"
 msgstr "目录名太长!"
 
-#: src/startup.c:223
+#: src/startup.c:216
 msgid ""
 "LiVES FAILED TO START YOUR SELECTED AUDIO PLAYER !\n"
 "\n"
@@ -813,7 +825,7 @@
 "LIVES 无法启动您选定的音频播放器!\n"
 "\n"
 
-#: src/startup.c:230
+#: src/startup.c:222
 msgid ""
 "Before starting LiVES, you need to choose an audio player.\n"
 "\n"
@@ -823,7 +835,7 @@
 "\n"
 "推荐大多数用户使用 PULSEAUDIO"
 
-#: src/startup.c:233
+#: src/startup.c:225
 msgid ""
 ", but this version of LiVES was not compiled with pulse audio support.\n"
 "\n"
@@ -831,7 +843,7 @@
 "，但是本版本 LIVES 编译时未加入对 pulse 音频的支持\n"
 "\n"
 
-#: src/startup.c:236
+#: src/startup.c:229
 msgid ""
 ", but you do not have pulse audio installed on your system.\n"
 " You are advised to install pulse audio first before running LiVES.\n"
@@ -841,11 +853,11 @@
 " 建议您在运行 LIVES 前安装 pulse 音频。\n"
 "\n"
 
-#: src/startup.c:241
+#: src/startup.c:233
 msgid "JACK audio is recommended for pro users"
 msgstr "推荐专业用户使用 JACK 音频系统"
 
-#: src/startup.c:244
+#: src/startup.c:236
 msgid ""
 ", but this version of LiVES was not compiled with jack audio support.\n"
 "\n"
@@ -853,7 +865,7 @@
 "，但是本版本 LIVES 编译时未加入对 jack 音频的支持。\n"
 "\n"
 
-#: src/startup.c:247
+#: src/startup.c:239
 msgid ""
 ", but you do not have jackd installed. You may wish to install jackd first "
 "before running LiVES.\n"
@@ -863,7 +875,7 @@
 "频。\n"
 "\n"
 
-#: src/startup.c:250
+#: src/startup.c:242
 msgid ""
 ", but may prevent LiVES from starting on some systems.\n"
 "If LiVES will not start with jack, you can restart and try with another "
@@ -874,11 +886,11 @@
 "如果 LIVES 不能与 jack 一同启动，您可以重启并选择其它的音频播放器。\n"
 "\n"
 
-#: src/startup.c:254
+#: src/startup.c:246
 msgid "SOX may be used if neither of the preceding players work, "
 msgstr "如果前述播放器均不能工作，可以尝试 SOX， "
 
-#: src/startup.c:257
+#: src/startup.c:249
 msgid ""
 "but some audio features will be disabled.\n"
 "\n"
@@ -886,7 +898,7 @@
 "但一些音频功能将被禁用。\n"
 "\n"
 
-#: src/startup.c:260
+#: src/startup.c:251
 msgid ""
 "but you do not have sox installed.\n"
 "You are advised to install it before running LiVES.\n"
@@ -896,7 +908,7 @@
 "建议您在运行 LIVES 前安装 SOX。\n"
 "\n"
 
-#: src/startup.c:264
+#: src/startup.c:255
 #, fuzzy
 msgid ""
 "The MPLAYER/MPLAYER2 audio player is only recommended for testing purposes.\n"
@@ -905,139 +917,139 @@
 "MPlayer 的音频播放器只推荐用于测试目的。\n"
 "\n"
 
-#: src/startup.c:281
+#: src/startup.c:271
 msgid "LiVES: - Choose an audio player"
 msgstr "LIVES： -选择一款音频播放器"
 
-#: src/startup.c:298
+#: src/startup.c:288
 msgid "Use _pulse audio player"
 msgstr "音频播放器使用_pulse"
 
-#: src/startup.c:320
+#: src/startup.c:310
 msgid "Use _jack audio player"
 msgstr "音频播放器使用_jack"
 
-#: src/startup.c:340
+#: src/startup.c:330
 msgid "Use _sox audio player"
 msgstr "音频播放器使用_sox"
 
-#: src/startup.c:361
+#: src/startup.c:351
 msgid "Use _mplayer audio player"
 msgstr "音频播放器使用_mplayer"
 
-#: src/startup.c:381
+#: src/startup.c:371
 #, fuzzy
 msgid "Use _mplayer2 audio player"
 msgstr "音频播放器使用_mplayer"
 
-#: src/startup.c:405 src/startup.c:580 src/interface.c:1506
+#: src/startup.c:395 src/startup.c:569 src/interface.c:1398
 msgid "_Next"
 msgstr "下一步(_N)"
 
-#: src/startup.c:445
+#: src/startup.c:435
 msgid "Skipped"
 msgstr "已跳过"
 
-#: src/startup.c:460
+#: src/startup.c:450
 msgid "Passed"
 msgstr "已通过"
 
-#: src/startup.c:493
+#: src/startup.c:483
 msgid "Failed"
 msgstr "已失败"
 
-#: src/startup.c:552
+#: src/startup.c:542
 msgid "LiVES: - Testing Configuration"
 msgstr "LIVES： - 测试配置"
 
-#: src/startup.c:555
+#: src/startup.c:544
 msgid "LiVES: - Troubleshoot"
 msgstr "LIVES： - 疑难解答"
 
-#: src/startup.c:568
+#: src/startup.c:557
 msgid "LiVES will now run some basic configuration tests\n"
 msgstr "LIVES 现在将进行一些基本的配置测试\n"
 
-#: src/startup.c:603
+#: src/startup.c:591
 msgid "Checking for \"sox\" presence"
 msgstr "检查\"sox\"的存在"
 
-#: src/startup.c:607
+#: src/startup.c:595
 msgid ""
 "You should install sox to be able to use all the audio features in LiVES"
 msgstr "要使用 LIVES 的所有音频功能您应该安装 sox"
 
-#: src/startup.c:615
+#: src/startup.c:602
 msgid "Checking if sox can convert audio"
 msgstr "检查 sox 是否可以转换音频"
 
-#: src/startup.c:638
+#: src/startup.c:625
 msgid "Unable to allocate 176400 bytes memory."
 msgstr ""
 
-#: src/startup.c:653
+#: src/startup.c:639
 #, c-format
 msgid "Unable to write to: %s"
 msgstr ""
 
-#: src/startup.c:667 src/startup.c:807
+#: src/startup.c:653 src/startup.c:789
 #, c-format
 msgid "Command failed: %s"
 msgstr ""
 
-#: src/startup.c:689
+#: src/startup.c:675
 msgid "You should install sox_fmt_all or similar"
 msgstr "您应该安装 sox_fmt_all 或类似软件包"
 
-#: src/startup.c:717
+#: src/startup.c:703
 msgid "Checking for \"mplayer\" presence"
 msgstr "检查\"mplayer\"是否存在"
 
-#: src/startup.c:721
+#: src/startup.c:707
 #, fuzzy
 msgid ""
 "You should install mplayer or mplayer2 to be able to use all the decoding "
 "features in LiVES"
 msgstr "要使用 LIVES 全部的解码功能，需要安装 mplayer"
 
-#: src/startup.c:747
+#: src/startup.c:732
 msgid "Checking if mplayer can convert audio"
 msgstr "检查 mplayer 是否可以转换音频"
 
-#: src/startup.c:768
+#: src/startup.c:751
 #, fuzzy
 msgid "You should install mplayer or mplayer2 with pcm/wav support"
 msgstr "您应该安装带 pcm/wav 支持的 mplayer"
 
-#: src/startup.c:785
+#: src/startup.c:767
 msgid "Checking if mplayer can decode to png/alpha"
 msgstr "检查 mplayer 是否可以解码为 png/alpha"
 
-#: src/startup.c:828
+#: src/startup.c:810
 msgid "You may wish to upgrade mplayer to a newer version"
 msgstr "您可能要升级到 mplayer 的新版本"
 
-#: src/startup.c:854
+#: src/startup.c:836
 msgid "Checking if mplayer can decode to jpeg"
 msgstr "检查 mplayer 是否可以解码为 jpeg"
 
-#: src/startup.c:882
+#: src/startup.c:862
 msgid "You should install mplayer with either png/alpha or jpeg support"
 msgstr "您应该安装带 png/alpha 或 jpeg 支持的 mplayer"
 
-#: src/startup.c:883
+#: src/startup.c:863
 msgid "You may wish to add jpeg output support to mplayer"
 msgstr "您可能需要向 mplayer 添加 jpeg 输出支持"
 
-#: src/startup.c:892
+#: src/startup.c:872
 msgid "Checking for \"convert\" presence"
 msgstr "检查\"convert\"是否存在"
 
-#: src/startup.c:896
+#: src/startup.c:876
 msgid "Install imageMagick to be able to use all of the rendered effects"
 msgstr "安装 imageMagic 以使用所有的渲染效果"
 
-#: src/startup.c:909
+#: src/startup.c:889
 msgid ""
 "\n"
 "\n"
@@ -1045,7 +1057,7 @@
 "Preferences/Decoding.    \n"
 msgstr ""
 
-#: src/startup.c:915
+#: src/startup.c:894
 msgid ""
 "\n"
 "\n"
@@ -1056,7 +1068,7 @@
 "\n"
 "    点击\"取消\"退出然后安装缺失的任何组件或者\"下一步\"继续    \n"
 
-#: src/startup.c:949
+#: src/startup.c:928
 msgid ""
 "\n"
 "\n"
@@ -1066,7 +1078,7 @@
 "\n"
 "最后您可以为 LIVES 选择一个默认的启动界面。\n"
 
-#: src/startup.c:950
+#: src/startup.c:929
 msgid ""
 "\n"
 "\n"
@@ -1076,7 +1088,7 @@
 "\n"
 "LIVES有两个主要的用户界面，您可以选择任意一个作为启动界面\n"
 
-#: src/startup.c:951
+#: src/startup.c:930
 msgid ""
 "\n"
 "\n"
@@ -1086,28 +1098,28 @@
 "\n"
 "默认的画面以后在首选项中可以随时修改。\n"
 
-#: src/startup.c:961
+#: src/startup.c:940
 msgid "LiVES: - Choose the startup interface"
 msgstr "LIVES： - 选择启动界面"
 
-#: src/startup.c:972
+#: src/startup.c:951
 msgid "Start in _Clip Edit mode"
 msgstr "以剪辑编辑模式启动(_C)"
 
-#: src/startup.c:975
+#: src/startup.c:954
 msgid "This is the best choice for simple editing tasks and for VJs\n"
 msgstr ""
 
-#: src/startup.c:981
+#: src/startup.c:960
 msgid "Start in _Multitrack mode"
 msgstr "多轨道模式启动(_M)"
 
-#: src/startup.c:983
+#: src/startup.c:962
 msgid ""
 "This is a better choice for complex editing tasks involving multiple clips.\n"
 msgstr "这更适合包含多剪辑片段的复杂编辑任务。\n"
 
-#: src/startup.c:992
+#: src/startup.c:971
 msgid "_Finish"
 msgstr "完成(_F)"
 
@@ -1124,35 +1136,35 @@
 msgid "Apply _Deinterlace"
 msgstr ""
 
-#: src/interface.c:66
+#: src/interface.c:65
 msgid "If this is set, frames will be deinterlaced as they are imported."
 msgstr "如果设置此项，视频在导入时将被反交错化。"
 
-#: src/interface.c:113 src/callbacks.c:9623 src/callbacks.c:9646
-#: src/callbacks.c:9647 src/gui.c:3223 src/gui.c:3821 src/saveplay.c:2339
-#: src/saveplay.c:3138 src/dialogs.c:1514 src/dialogs.c:1515
-#: src/dialogs.c:1746 src/dialogs.c:1747 src/framedraw.c:238
-#: src/multitrack.c:8031
+#: src/interface.c:106 src/callbacks.c:9542 src/callbacks.c:9564
+#: src/callbacks.c:9565 src/gui.c:3333 src/gui.c:3946 src/saveplay.c:2317
+#: src/saveplay.c:3097 src/dialogs.c:1575 src/dialogs.c:1576
+#: src/dialogs.c:1804 src/dialogs.c:1805 src/framedraw.c:236
+#: src/multitrack.c:8210
 msgid "Preview"
 msgstr "预览"
 
-#: src/interface.c:132
+#: src/interface.c:125
 msgid "Click here to _Preview any selected video, image or audio file"
 msgstr "点击此处预览（_P）选定的视频、图像或音频文件"
 
-#: src/interface.c:135
+#: src/interface.c:127
 msgid "Click here to _Preview any selected audio file"
 msgstr "点击此处预览（_P）任何选定的音频文件"
 
-#: src/interface.c:138
+#: src/interface.c:129
 msgid "Click here to _Preview the video"
 msgstr "点击此处预览（_P）视频"
 
-#: src/interface.c:181 src/dialogs.c:2542
+#: src/interface.c:169 src/dialogs.c:2621
 msgid "LiVES: - Processing..."
 msgstr "LiVES: - 正在处理..."
 
-#: src/interface.c:217
+#: src/interface.c:205
 msgid ""
 "\n"
 "\n"
@@ -1166,8 +1178,8 @@
 "\n"
 "请不要忘记之后关闭效果（ctrl-0）！"
 
-#: src/interface.c:222 src/callbacks.c:9373 src/callbacks.c:9420
-#: src/dialogs.c:2570
+#: src/interface.c:210 src/callbacks.c:9283 src/callbacks.c:9332
+#: src/dialogs.c:2649
 msgid ""
 "\n"
 "Please Wait"
@@ -1175,190 +1187,178 @@
 "\n"
 "请稍候"
 
-#: src/interface.c:242
+#: src/interface.c:230
 msgid "Show Details"
 msgstr ""
 
-#: src/interface.c:254 src/dialogs.c:2584
+#: src/interface.c:242 src/dialogs.c:2663
 msgid "_Enough"
 msgstr "可以了（_E）"
 
-#: src/interface.c:255 src/framedraw.c:278
+#: src/interface.c:243 src/framedraw.c:276
 msgid "_Preview"
 msgstr "预览(_P)"
 
-#: src/interface.c:257
+#: src/interface.c:245 src/callbacks.c:9282 src/callbacks.c:9330
 msgid "Paus_e"
 msgstr "暂停(_E)"
 
-#: src/interface.c:258 src/callbacks.c:9417
+#: src/interface.c:246 src/callbacks.c:9329
 msgid "Pause/_Enough"
 msgstr ""
 
-#: src/interface.c:285
+#: src/interface.c:273
 msgid "_Cancel"
 msgstr "取消(_C)"
 
-#: src/interface.c:374
+#: src/interface.c:361
 #, c-format
 msgid "LiVES: - %s"
 msgstr ""
 
-#: src/interface.c:376
+#: src/interface.c:363
 msgid "LiVES: - Multitrack details"
 msgstr ""
 
-#: src/interface.c:407
+#: src/interface.c:394
 msgid "Format"
 msgstr "格式"
 
-#: src/interface.c:412
+#: src/interface.c:399
 msgid "Frame size"
 msgstr "帧尺寸"
 
-#: src/interface.c:417
+#: src/interface.c:404
 msgid "File size"
 msgstr "文件大小"
 
-#: src/interface.c:418
+#: src/interface.c:405
 msgid "Byte size"
 msgstr "字节大小"
 
-#: src/interface.c:423 src/interface.c:1891
+#: src/interface.c:410 src/interface.c:1760
 msgid "FPS"
 msgstr "帧每秒"
 
-#: src/interface.c:428
+#: src/interface.c:415
 msgid "Frames"
 msgstr "帧"
 
-#: src/interface.c:429
+#: src/interface.c:416
 msgid "Events"
 msgstr "事件"
 
-#: src/interface.c:434 src/interface.c:500 src/interface.c:542
+#: src/interface.c:421 src/interface.c:486 src/interface.c:528
 msgid "Total time"
 msgstr "总时间"
 
-#: src/interface.c:486 src/resample.c:1488
+#: src/interface.c:472 src/resample.c:1460
 msgid "Audio"
 msgstr "音频"
 
-#: src/interface.c:511 src/interface.c:553
+#: src/interface.c:497 src/interface.c:539
 msgid "Rate/size"
 msgstr "速率/尺寸"
 
-#: src/interface.c:530
+#: src/interface.c:516
 msgid "Right audio"
 msgstr "右声道"
 
-#: src/interface.c:622
+#: src/interface.c:607
 msgid "LiVES: - Encoding options"
 msgstr "LiVES: - 编码选项"
 
-#: src/interface.c:636
+#: src/interface.c:621
 msgid "<------------- (Check the box to re_size as suggested)"
 msgstr ""
 
-#: src/interface.c:637
+#: src/interface.c:622
 msgid "<------------- (Check the box to use the _size recommendation)"
 msgstr ""
 
-#: src/interface.c:662
+#: src/interface.c:646
 msgid "Use _letterboxing to maintain aspect ratio (optional)"
 msgstr ""
 
-#: src/interface.c:663
+#: src/interface.c:647
 msgid ""
 "Draw black rectangles either above or to the sides of the image, to prevent "
 "it from stretching."
 msgstr ""
 
-#: src/interface.c:694
+#: src/interface.c:677
 msgid "Keep _my settings"
 msgstr "记住我的设置(_M)"
 
-#: src/interface.c:695
+#: src/interface.c:678
 msgid "Use _recommended settings"
 msgstr "使用推荐设置(_R)"
 
-#: src/interface.c:775 src/dialogs.c:114
-msgid ""
-"Do _not show this warning any more\n"
-"(can be turned back on from Preferences/Warnings)"
-msgstr ""
-"不再显示此警告(_N)\n"
-"(可以从 偏好设置/警告 中重新开启)"
-
-#: src/interface.c:787
-msgid "Show _Details"
-msgstr "显示详情（_D）"
-
-#: src/interface.c:881
+#: src/interface.c:769
 msgid "_Close Window"
 msgstr "关闭窗口(_C)"
 
-#: src/interface.c:883
+#: src/interface.c:771
 msgid "_Save to file"
 msgstr "保存到文件（_S）"
 
-#: src/interface.c:928
+#: src/interface.c:816
 msgid "LiVES: - Insert"
 msgstr "LiVES: - 插入"
 
-#: src/interface.c:945
+#: src/interface.c:833
 msgid "_Number of times to insert"
 msgstr "插入次数（_N）"
 
-#: src/interface.c:954
+#: src/interface.c:842
 msgid "_Insert to fit audio"
 msgstr "插入以适应音频（_I）"
 
-#: src/interface.c:968
+#: src/interface.c:856
 msgid "Insert _before selection"
 msgstr "插入到选区前（_B）"
 
-#: src/interface.c:970
+#: src/interface.c:858
 msgid "Insert clipboard before selected frames"
 msgstr "插入剪切板内容到选定帧之前"
 
-#: src/interface.c:986
+#: src/interface.c:875
 msgid "Insert _after selection"
 msgstr "插入到选区后（_A）"
 
-#: src/interface.c:988
+#: src/interface.c:877
 msgid "Insert clipboard after selected frames"
 msgstr "插入剪切板内容到选定帧之后"
 
-#: src/interface.c:999
+#: src/interface.c:888
 msgid "Insert _with sound"
 msgstr "带声音插入（_W）"
 
-#: src/interface.c:1012
+#: src/interface.c:901
 msgid "Insert with_out sound"
 msgstr "不带声音插入（_O）"
 
-#: src/interface.c:1093
+#: src/interface.c:985
 msgid "LiVES: - Open Selection"
 msgstr "LiVES: - 打开选区"
 
-#: src/interface.c:1111
+#: src/interface.c:1004
 msgid "Selection start time (sec)"
 msgstr ""
 
-#: src/interface.c:1117
+#: src/interface.c:1010
 msgid "Number of frames to open"
 msgstr ""
 
-#: src/interface.c:1193
+#: src/interface.c:1088
 msgid "LiVES: - Open Location"
 msgstr "LiVES: - 打开位置"
 
-#: src/interface.c:1195
+#: src/interface.c:1090
 msgid "LiVES: - Open Youtube Clip"
 msgstr ""
 
-#: src/interface.c:1213
+#: src/interface.c:1109
 msgid ""
 "\n"
 "\n"
@@ -1373,7 +1373,7 @@
 "并保证在 首选向|流媒体 中设置了带宽\n"
 "\n"
 
-#: src/interface.c:1216
+#: src/interface.c:1112
 msgid ""
 "\n"
 "\n"
@@ -1382,62 +1382,63 @@
 "\n"
 msgstr ""
 
-#: src/interface.c:1220
+#: src/interface.c:1116
 msgid ""
 "Enter the URL of the clip below.\n"
 "E.g: http://www.youtube.com/watch?v=WCR6f6WzjP8\n"
 "\n"
 msgstr ""
 
-#: src/interface.c:1231
+#: src/interface.c:1127
 msgid "URL : "
 msgstr "URL : "
 
-#: src/interface.c:1231
+#: src/interface.c:1127
 msgid "Youtube URL : "
 msgstr ""
 
-#: src/interface.c:1235
+#: src/interface.c:1131
 msgid "Do not send bandwidth information"
 msgstr "不发送带宽信息"
 
-#: src/interface.c:1237
+#: src/interface.c:1133
 msgid "Try this setting if you are having problems getting a stream"
 msgstr "如果获取流媒体有问题是请尝试此选项"
 
-#: src/interface.c:1258
+#: src/interface.c:1155
 msgid "Download to _Directory : "
 msgstr ""
 
-#: src/interface.c:1276
+#: src/interface.c:1173
 msgid "Download _File Name : "
 msgstr ""
 
-#: src/interface.c:1281
+#: src/interface.c:1178
 msgid ".webm"
 msgstr ""
 
-#: src/interface.c:1359
+#: src/interface.c:1256
 msgid "LiVES: - Rename Clip"
 msgstr "LiVES: - 重命名剪辑"
 
-#: src/interface.c:1362
-msgid "LiVES: - Enter Set Name"
+#: src/interface.c:1258
+#, fuzzy
+msgid "LiVES: - Enter Set Name to Save as"
 msgstr "LiVES: - 输入场景名"
 
-#: src/interface.c:1365
+#: src/interface.c:1260
 msgid "LiVES: - Enter a Set Name to Reload"
 msgstr ""
 
-#: src/interface.c:1368
+#: src/interface.c:1262
 msgid "LiVES: - Choose a Working Directory"
 msgstr "LiVES: - 选择工作目录"
 
-#: src/interface.c:1371
+#: src/interface.c:1264
 msgid "LiVES: - Rename Current Track"
 msgstr ""
 
-#: src/interface.c:1391
+#: src/interface.c:1283
 msgid ""
 "You need to enter a name for the current clip set.\n"
 "This will allow you reload the layout with the same clips later.\n"
@@ -1449,7 +1450,7 @@
 "请输入您希望使用的场景名字。\n"
 "LiVES 将会在稍后退出时提示您保存剪辑场景。\n"
 
-#: src/interface.c:1397
+#: src/interface.c:1289
 msgid ""
 "In order to export this project, you must enter a name for this clip set.\n"
 "This will also be used for the project name.\n"
@@ -1457,7 +1458,7 @@
 "为了导出此项目，您必须为剪辑场景起个名字。\n"
 "这个名字同时也是项目名字。\n"
 
-#: src/interface.c:1404
+#: src/interface.c:1296
 msgid ""
 "Welcome to LiVES !\n"
 "This startup wizard will guide you through the\n"
@@ -1467,200 +1468,200 @@
 "启动向导将指引您进行初始安装，\n"
 "以尽可能开启本程序功能。\n"
 
-#: src/interface.c:1408
+#: src/interface.c:1300
 msgid ""
 "\n"
 "First of all you need to choose a working directory for LiVES.\n"
 "This should be a directory with plenty of disk space available.\n"
 msgstr ""
 
-#: src/interface.c:1427
+#: src/interface.c:1317
 msgid "New name "
 msgstr "新名称 "
 
-#: src/interface.c:1430
+#: src/interface.c:1319
 msgid "Set name "
 msgstr "场景名 "
 
-#: src/interface.c:1550
+#: src/interface.c:1435
 msgid "Use def_aults"
 msgstr "用默认值(_A)"
 
-#: src/interface.c:1553 src/interface.c:1840 src/preferences.c:2515
-#: src/preferences.c:2697
+#: src/interface.c:1437 src/interface.c:1709 src/preferences.c:2550
+#: src/preferences.c:2739
 msgid "_Advanced"
 msgstr "高级(_A)"
 
-#: src/interface.c:1604
+#: src/interface.c:1487
 msgid "LiVES:- Select input device"
 msgstr "LiVES：- 选择输入设备"
 
-#: src/interface.c:1622
+#: src/interface.c:1504
 msgid "Select input device:"
 msgstr "选择输入设备:"
 
-#: src/interface.c:1686
+#: src/interface.c:1568
 msgid "LiVES:- Load CD Track"
 msgstr "LiVES:- 载入 CD 音轨"
 
-#: src/interface.c:1689
+#: src/interface.c:1570
 msgid "LiVES:- Select DVD Title/Chapter"
 msgstr "LiVES:- 选择 DVD 标题/章节"
 
-#: src/interface.c:1692
+#: src/interface.c:1572
 msgid "LiVES:- Select VCD Title"
 msgstr "LiVES:- 选择 VCD 标题"
 
-#: src/interface.c:1695
+#: src/interface.c:1574
 msgid "LiVES:- Change Maximum Visible Tracks"
 msgstr "LiVES:- 更改最大可见Change Maximum Visible Tracks"
 
-#: src/interface.c:1698
+#: src/interface.c:1576
 msgid "LiVES:- Device details"
 msgstr "LiVES:-设备明细"
 
-#: src/interface.c:1721
+#: src/interface.c:1598
 #, c-format
 msgid "Track to load (from %s)"
 msgstr "载入音轨 (从 %s)"
 
-#: src/interface.c:1724
+#: src/interface.c:1600
 msgid "DVD Title"
 msgstr "DVD 标题"
 
-#: src/interface.c:1727
+#: src/interface.c:1602
 msgid "VCD Title"
 msgstr "VCD 标题"
 
-#: src/interface.c:1730
+#: src/interface.c:1604
 msgid "Maximum number of tracks to display"
 msgstr "显示的最大音轨数"
 
-#: src/interface.c:1733
+#: src/interface.c:1606
 msgid "Device:        /dev/video"
 msgstr "设备：/dev/video"
 
-#: src/interface.c:1736
+#: src/interface.c:1608
 msgid "Device:        fw:"
 msgstr "设备： fw:"
 
-#: src/interface.c:1771
+#: src/interface.c:1641
 msgid "Chapter  "
 msgstr "章  "
 
-#: src/interface.c:1776
+#: src/interface.c:1645
 msgid "Channel  "
 msgstr "通道  "
 
-#: src/interface.c:1791
+#: src/interface.c:1660
 msgid "Audio ID  "
 msgstr "音频 ID  "
 
-#: src/interface.c:1857
+#: src/interface.c:1726
 msgid "Input number"
 msgstr "输入数字"
 
-#: src/interface.c:1865
+#: src/interface.c:1734
 msgid "Use default width, height and FPS"
 msgstr "使用默认的宽度、高度和帧率"
 
-#: src/interface.c:1879
+#: src/interface.c:1748
 msgid "Width"
 msgstr "宽度"
 
-#: src/interface.c:1885
+#: src/interface.c:1754
 msgid "Height"
 msgstr "高度"
 
-#: src/interface.c:1899
+#: src/interface.c:1768
 msgid "_Driver"
 msgstr ""
 
-#: src/interface.c:1902
+#: src/interface.c:1771
 msgid "_Output format"
 msgstr ""
 
-#: src/interface.c:1998
+#: src/interface.c:1865
 msgid "LiVES:- Fade Audio In"
 msgstr "LiVES:- 音频渐强"
 
-#: src/interface.c:2001
+#: src/interface.c:1867
 msgid "LiVES:- Fade Audio Out"
 msgstr "LiVES:- 音频渐弱"
 
-#: src/interface.c:2017
+#: src/interface.c:1883
 msgid "Fade in over  "
 msgstr "结束时淡出  "
 
-#: src/interface.c:2018
+#: src/interface.c:1884
 msgid "first"
 msgstr "第一个"
 
-#: src/interface.c:2021
+#: src/interface.c:1886
 msgid "Fade out over  "
 msgstr "渐弱结束  "
 
-#: src/interface.c:2022
+#: src/interface.c:1887
 msgid "last"
 msgstr "最后一个"
 
-#: src/interface.c:2044
+#: src/interface.c:1909
 msgid "seconds."
 msgstr "秒。"
 
-#: src/interface.c:2052 src/saveplay.c:1507
+#: src/interface.c:1917 src/saveplay.c:1484
 msgid "selection"
 msgstr "选区"
 
-#: src/interface.c:2092
+#: src/interface.c:1956
 msgid "LiVES: - File Comments (optional)"
 msgstr "LiVES: - 文件注释（可选）"
 
-#: src/interface.c:2107
+#: src/interface.c:1971
 msgid "Title/Name : "
 msgstr "标题/名称： "
 
-#: src/interface.c:2114
+#: src/interface.c:1978
 msgid "Author/Artist : "
 msgstr "作者/艺术家： "
 
-#: src/interface.c:2121
+#: src/interface.c:1985
 msgid "Comments : "
 msgstr "评论： "
 
-#: src/interface.c:2151
+#: src/interface.c:2015
 msgid "_Options"
 msgstr "选项(_O)"
 
-#: src/interface.c:2158
+#: src/interface.c:2022
 msgid "Save _subtitles to file"
 msgstr "将字幕保存到文件(_S)"
 
-#: src/interface.c:2170
+#: src/interface.c:2033
 msgid "Subtitle file"
 msgstr "字幕文件"
 
-#: src/interface.c:2172
+#: src/interface.c:2035
 msgid "Browse..."
 msgstr "浏览…"
 
-#: src/interface.c:2255
+#: src/interface.c:2132
 msgid "LiVES: - choose a device"
 msgstr ""
 
-#: src/interface.c:2259
+#: src/interface.c:2135
 msgid "LiVES: - choose a directory"
 msgstr ""
 
-#: src/interface.c:2262
+#: src/interface.c:2137
 msgid "LiVES: - choose a file"
 msgstr ""
 
-#: src/interface.c:2445
+#: src/interface.c:2381
 msgid "LiVES: - Cancel/Discard/Save"
 msgstr "LiVES: - 取消/放弃/保存"
 
-#: src/interface.c:2460
+#: src/interface.c:2397
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has not been saved.\n"
@@ -1670,7 +1671,7 @@
 "当前布局（layout）还没有保存。\n"
 "你打算保存吗？\n"
 
-#: src/interface.c:2463
+#: src/interface.c:2400
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout has been changed since the last save.\n"
@@ -1680,7 +1681,7 @@
 "当前布局（layout）至上一次保存已经有改动。\n"
 "你打算保存吗？\n"
 
-#: src/interface.c:2467
+#: src/interface.c:2404
 msgid ""
 "You are about to exit LiVES.\n"
 "The current clip set can be saved.\n"
@@ -1690,7 +1691,7 @@
 "当前剪辑设置可以保存。\n"
 "您打算保存吗？\n"
 
-#: src/interface.c:2468
+#: src/interface.c:2405
 msgid ""
 "The current clip set has not been saved.\n"
 "What would you like to do ?\n"
@@ -1698,7 +1699,7 @@
 "目前的剪辑尚未保存。\n"
 "你打算保存吗？\n"
 
-#: src/interface.c:2472
+#: src/interface.c:2408
 msgid ""
 "The current layout has not been saved.\n"
 "What would you like to do ?\n"
@@ -1706,16 +1707,13 @@
 "当前的布局尚未保存。\n"
 "你打算保存吗？\n"
 
-#: src/interface.c:2475
-#, fuzzy
+#: src/interface.c:2410
 msgid ""
 "The current layout has *not* been changed since it was last saved.\n"
 "What would you like to do ?\n"
 msgstr ""
-"当前布局（layout）至上一次保存并未改动。\n"
-"你打算做什么？\n"
 
-#: src/interface.c:2480
+#: src/interface.c:2415
 msgid ""
 "The current layout contains generated frames and cannot be retained.\n"
 "You may wish to render it before exiting multitrack mode.\n"
@@ -1723,7 +1721,7 @@
 "当前的布局包含生成的帧，并且不能保留。\n"
 "你在离开多轨（multitrack）模式前最好渲染一下这些帧。\n"
 
-#: src/interface.c:2483
+#: src/interface.c:2418
 msgid ""
 "You are about to leave multitrack mode.\n"
 "The current layout contains generated frames and cannot be retained.\n"
@@ -1733,39 +1731,39 @@
 "当前的布局包含生成的帧，并且不能保留。\n"
 "你打算做什么？"
 
-#: src/interface.c:2496
+#: src/interface.c:2431
 msgid "Clip set _name"
 msgstr ""
 
-#: src/interface.c:2502
+#: src/interface.c:2437
 msgid "_Auto reload next time"
 msgstr "_下一次自动加载"
 
-#: src/interface.c:2538 src/interface.c:2547
+#: src/interface.c:2473 src/interface.c:2482
 msgid "_Wipe layout"
 msgstr "_擦除布局"
 
-#: src/interface.c:2539
+#: src/interface.c:2474
 msgid "_Ignore changes"
 msgstr "_忽略的变化"
 
-#: src/interface.c:2540
+#: src/interface.c:2475
 msgid "_Delete clip set"
 msgstr "_夹上删除"
 
-#: src/interface.c:2541
+#: src/interface.c:2476
 msgid "_Delete layout"
 msgstr "_删除布局"
 
-#: src/interface.c:2545
+#: src/interface.c:2480
 msgid "_Save layout"
 msgstr "_保存布局"
 
-#: src/interface.c:2546
+#: src/interface.c:2481
 msgid "_Save clip set"
 msgstr "_夹上保存"
 
-#: src/interface.c:2565
+#: src/interface.c:2502
 msgid ""
 "\n"
 "LiVES has detected a multitrack layout from a previous session.\n"
@@ -1775,57 +1773,57 @@
 "LiVES检测到先前的多轨布局\n"
 "你要恢复到这个布局吗？\n"
 
-#: src/interface.c:2589
+#: src/interface.c:2528
 msgid "LiVES: - Disk Recovery Options"
 msgstr ""
 
-#: src/interface.c:2608
+#: src/interface.c:2549
 msgid "Delete _Orphaned Clips"
 msgstr ""
 
-#: src/interface.c:2609
+#: src/interface.c:2550
 msgid "Delete any clips which are not currently loaded or part of a set"
 msgstr ""
 
-#: src/interface.c:2622
+#: src/interface.c:2564
 msgid "Clear _Backup Files from Closed Clips"
 msgstr ""
 
-#: src/interface.c:2633
+#: src/interface.c:2575
 msgid "Remove Sets which have _Layouts but no Clips"
 msgstr ""
 
-#: src/interface.c:2644
+#: src/interface.c:2586
 msgid "_Reset to Defaults"
 msgstr ""
 
-#: src/interface.c:2651
+#: src/interface.c:2593
 msgid "_Accept"
 msgstr ""
 
-#: src/callbacks.c:198
+#: src/callbacks.c:208
 #, c-format
 msgid "Saving as set %s..."
 msgstr "将场景保存为 %s..."
 
-#: src/callbacks.c:833
+#: src/callbacks.c:852
 msgid "Please enter the name of the file to save the clip as.\n"
 msgstr ""
 
-#: src/callbacks.c:841
+#: src/callbacks.c:860
 msgid "Please enter a valid URL for the download.\n"
 msgstr ""
 
-#: src/callbacks.c:867
+#: src/callbacks.c:886
 #, c-format
 msgid "Downloading %s to %s..."
 msgstr ""
 
-#: src/callbacks.c:895
+#: src/callbacks.c:912
 msgid "Downloading clip"
 msgstr ""
 
-#: src/callbacks.c:933
+#: src/callbacks.c:950
 msgid ""
 "\n"
 "LiVES was unable to download the clip.\n"
@@ -1833,11 +1831,11 @@
 "the latest youtube-dl installed.\n"
 msgstr ""
 
-#: src/callbacks.c:1114 src/callbacks.c:1149
+#: src/callbacks.c:1131 src/callbacks.c:1166
 msgid "This file"
 msgstr "文件"
 
-#: src/callbacks.c:1115
+#: src/callbacks.c:1132
 msgid ""
 ",\n"
 " - including the current layout - "
@@ -1845,7 +1843,7 @@
 "，\n"
 " - 包括当前的布局 - "
 
-#: src/callbacks.c:1117
+#: src/callbacks.c:1134
 #, c-format
 msgid ""
 "\n"
@@ -1860,7 +1858,7 @@
 "\n"
 "确实要关闭吗？"
 
-#: src/callbacks.c:1119
+#: src/callbacks.c:1136
 #, c-format
 msgid ""
 "\n"
@@ -1875,7 +1873,7 @@
 "\n"
 "确实要关闭吗？"
 
-#: src/callbacks.c:1150
+#: src/callbacks.c:1167
 msgid ""
 "Changes made to this clip have not been saved or backed up.\n"
 "\n"
@@ -1884,7 +1882,7 @@
 "对此剪辑所做的更改还未保存或备份。\n"
 "真的要关闭吗？"
 
-#: src/callbacks.c:1343
+#: src/callbacks.c:1356
 msgid ""
 "\n"
 "Invalid project file.\n"
@@ -1892,7 +1890,7 @@
 "\n"
 "无效的项目文件。\n"
 
-#: src/callbacks.c:1356
+#: src/callbacks.c:1370
 #, c-format
 msgid ""
 "\n"
@@ -1912,33 +1910,33 @@
 "然后通过 文件|关闭/保存所有剪辑 并且提供新的场景名称或者忽略。\n"
 "一旦你完成这些，你就可以导入新工程了。.\n"
 
-#: src/callbacks.c:1366
+#: src/callbacks.c:1381
 #, c-format
 msgid "Importing the project %s as set %s..."
 msgstr "导入工程 %s 为场景 %s..."
 
-#: src/callbacks.c:1386
+#: src/callbacks.c:1399
 msgid "Importing project"
 msgstr "导入项目"
 
-#: src/callbacks.c:1472
+#: src/callbacks.c:1481
 #, c-format
 msgid "Exporting project %s..."
 msgstr "导出工程为%s..."
 
-#: src/callbacks.c:1490
+#: src/callbacks.c:1497
 msgid "Exporting project"
 msgstr "导出工程"
 
-#: src/callbacks.c:1506
+#: src/callbacks.c:1513
 msgid "Backup as .lv1 file"
 msgstr "备份为 .lv1文件"
 
-#: src/callbacks.c:1522
+#: src/callbacks.c:1529
 msgid "Restore .lv1 file"
 msgstr "恢复 .lv1文件"
 
-#: src/callbacks.c:1664
+#: src/callbacks.c:1671
 msgid ""
 "\n"
 "\n"
@@ -1950,90 +1948,94 @@
 "设置将被删除从磁盘。\n"
 "你确定吗？\n"
 
-#: src/callbacks.c:1725
+#: src/callbacks.c:1732
 #, c-format
 msgid "Deleting set %s..."
 msgstr ""
 
-#: src/callbacks.c:1727
+#: src/callbacks.c:1734
 msgid "Deleting set..."
 msgstr "删除设置..."
 
-#: src/callbacks.c:1731
+#: src/callbacks.c:1738
 msgid "Deleting set"
 msgstr "删除设置"
 
-#: src/callbacks.c:1739
+#: src/callbacks.c:1746
 #, c-format
 msgid "Set %s was permanently deleted from the disk.\n"
 msgstr "%s的设置永久删除磁盘。\n"
 
-#: src/callbacks.c:1787 src/callbacks.c:11764
+#: src/callbacks.c:1792 src/callbacks.c:11676
 msgid "Insert Silence"
 msgstr "插入沉默"
 
-#: src/callbacks.c:1840 src/callbacks.c:1923 src/callbacks.c:2086
+#: src/callbacks.c:1844 src/callbacks.c:1927 src/callbacks.c:2089
 msgid "Undoing"
 msgstr "撤消"
 
-#: src/callbacks.c:1936 src/callbacks.c:2147
+#: src/callbacks.c:1940 src/callbacks.c:2150
 msgid "Restoring audio..."
 msgstr "还原音频..."
 
-#: src/callbacks.c:1952
+#: src/callbacks.c:1956
 msgid "Clearing frame images"
 msgstr "结算帧图像"
 
-#: src/callbacks.c:1985
+#: src/callbacks.c:1988
 msgid "Deleting excess frames"
 msgstr "删除多余的帧"
 
-#: src/callbacks.c:2229
+#: src/callbacks.c:2232
 #, c-format
 msgid "Length of video is now %d frames at %.3f frames per second.\n"
 msgstr "视频长度现在为 %d帧，播放速度为 %.3f帧/秒。\n"
 
-#: src/callbacks.c:2233 src/resample.c:683 src/resample.c:2166
+#: src/callbacks.c:2235 src/resample.c:678 src/resample.c:2133
 #, c-format
 msgid "Clipboard was resampled to %d frames.\n"
 msgstr "剪贴板已经被重新取样为 %d 帧\n"
 
-#: src/callbacks.c:2394 src/callbacks.c:2423
+#: src/callbacks.c:2396 src/callbacks.c:2425
 msgid "Redoing"
 msgstr "重做"
 
-#: src/callbacks.c:2462
-#, c-format
-msgid "Copying frames %d to %d%s to the clipboard..."
+#: src/callbacks.c:2472
+#, fuzzy, c-format
+msgid "Copying frames %d to %d (with sound) to the clipboard..."
+msgstr "正在将%d 到 %d%s 帧拷贝到剪贴板……"
+
+#: src/callbacks.c:2474
+#, fuzzy, c-format
+msgid "Copying frames %d to %d to the clipboard..."
 msgstr "正在将%d 到 %d%s 帧拷贝到剪贴板……"
 
-#: src/callbacks.c:2525
+#: src/callbacks.c:2526
 msgid "Copying to the clipboard"
 msgstr "正在拷贝到剪贴板……"
 
-#: src/callbacks.c:2600
+#: src/callbacks.c:2601
 msgid "Cut"
 msgstr "剪切"
 
-#: src/callbacks.c:2641 src/callbacks.c:3068 src/callbacks.c:8026
-#, fuzzy
+#: src/callbacks.c:2641 src/callbacks.c:3063 src/callbacks.c:7631
 msgid "Pulling frames from clipboard"
-msgstr "从剪辑中抽取帧"
+msgstr ""
 
 #: src/callbacks.c:2654
 #, c-format
 msgid "Pasting %d frames to new clip %s..."
 msgstr "正在粘贴 %d 帧至新剪辑 %s ..."
 
-#: src/callbacks.c:2678
+#: src/callbacks.c:2676
 msgid "Pasting"
 msgstr "粘贴"
 
-#: src/callbacks.c:2694
+#: src/callbacks.c:2692
 msgid "...added audio..."
 msgstr "...已添加音频..."
 
-#: src/callbacks.c:2778
+#: src/callbacks.c:2775
 msgid ""
 "This operation requires resizing or converting of frames.\n"
 "Please install 'convert' from the Image-magick package, and then restart "
@@ -2042,7 +2044,7 @@
 "此操作需要调整帧尺寸或转换帧。\n"
 "请安装 Image-magick 软件包中的“convert”程序并重新启动 LiVES。\n"
 
-#: src/callbacks.c:2795
+#: src/callbacks.c:2793
 msgid ""
 "\n"
 "\n"
@@ -2056,7 +2058,7 @@
 "请尝试选择所有帧,然后使用 \n"
 "音频菜单中的“剪切音频”功能。"
 
-#: src/callbacks.c:2819
+#: src/callbacks.c:2817
 msgid ""
 "LiVES cannot insert because the audio rates do not match.\n"
 "Please install 'sox', and try again."
@@ -2064,7 +2066,7 @@
 "无法插入因为音频码率不符。\n"
 "请安装“sox”后重试。"
 
-#: src/callbacks.c:2838
+#: src/callbacks.c:2835
 msgid ""
 "\n"
 "Insertion will cause frames to shift in some multitrack layouts.\n"
@@ -2074,7 +2076,7 @@
 "插入帧将导致一些转向多轨布局。\n"
 "您确定要继续吗？\n"
 
-#: src/callbacks.c:2888 src/callbacks.c:11692
+#: src/callbacks.c:2883 src/callbacks.c:11606
 msgid ""
 "\n"
 "Insertion will cause audio to shift in some multitrack layouts.\n"
@@ -2084,11 +2086,11 @@
 "插入音频会导致一些转移多轨布局。\n"
 "您确定要继续吗？\n"
 
-#: src/callbacks.c:2996 src/callbacks.c:3025
+#: src/callbacks.c:2987 src/callbacks.c:3016
 msgid "Resampling clipboard audio"
 msgstr "音频重采样剪贴板"
 
-#: src/callbacks.c:3041
+#: src/callbacks.c:3032
 msgid ""
 "\n"
 "\n"
@@ -2100,7 +2102,7 @@
 "无法重采样剪切板中的音频。 \n"
 "剪切板中的音频已经被清除。\n"
 
-#: src/callbacks.c:3055
+#: src/callbacks.c:3045
 msgid ""
 "\n"
 "\n"
@@ -2109,30 +2111,30 @@
 "using unchanged audio ?\n"
 msgstr ""
 
-#: src/callbacks.c:3137 src/callbacks.c:3311
+#: src/callbacks.c:3132 src/callbacks.c:3299
 #, c-format
 msgid "Inserting %d%s frames from the clipboard..."
 msgstr "正在从剪切板中插入 %d%s 帧..."
 
-#: src/callbacks.c:3162 src/callbacks.c:3236 src/callbacks.c:3339
+#: src/callbacks.c:3155 src/callbacks.c:3224 src/callbacks.c:3325
 msgid "Inserting"
 msgstr "正在插入"
 
-#: src/callbacks.c:3193
+#: src/callbacks.c:3187
 #, c-format
 msgid "Inserting %d times from the clipboard%s..."
 msgstr ""
 
-#: src/callbacks.c:3200
+#: src/callbacks.c:3191
 #, c-format
 msgid "Inserting %d frames from the clipboard%s..."
 msgstr ""
 
-#: src/callbacks.c:3418
+#: src/callbacks.c:3404
 msgid "Insert"
 msgstr "插入"
 
-#: src/callbacks.c:3486
+#: src/callbacks.c:3471
 msgid ""
 "\n"
 "Deleting all frames will close this file.\n"
@@ -2142,7 +2144,7 @@
 "删除所有的帧将关闭该文件。\n"
 "你确定吗？"
 
-#: src/callbacks.c:3495
+#: src/callbacks.c:3480
 msgid ""
 "\n"
 "Deletion will cause missing frames in some multitrack layouts.\n"
@@ -2152,8 +2154,8 @@
 "删除将导致丢失一些多轨布局框架。\n"
 "您确定要继续吗？\n"
 
-#: src/callbacks.c:3515 src/callbacks.c:10920 src/callbacks.c:11162
-#: src/callbacks.c:11228
+#: src/callbacks.c:3500 src/callbacks.c:10851 src/callbacks.c:11087
+#: src/callbacks.c:11152
 msgid ""
 "\n"
 "Deletion will cause missing audio in some multitrack layouts.\n"
@@ -2163,7 +2165,7 @@
 "删除会导致一些失踪的多轨音频布局。\n"
 "您确定要继续吗？\n"
 
-#: src/callbacks.c:3534
+#: src/callbacks.c:3519
 msgid ""
 "\n"
 "Deletion will cause frames to shift in some multitrack layouts.\n"
@@ -2173,7 +2175,7 @@
 "帧删除会导致一些转移多轨布局。\n"
 "您确定要继续吗？\n"
 
-#: src/callbacks.c:3553 src/callbacks.c:11210
+#: src/callbacks.c:3538 src/callbacks.c:11134
 msgid ""
 "\n"
 "Deletion will cause audio to shift in some multitrack layouts.\n"
@@ -2183,20 +2185,20 @@
 "删除会导致音频转向一些多轨布局。\n"
 "您确定要继续吗？\n"
 
-#: src/callbacks.c:3611
+#: src/callbacks.c:3597
 #, c-format
 msgid "Deleting frames %d to %d%s..."
 msgstr "正在删除帧 %d 到 %d%s..."
 
-#: src/callbacks.c:3636
+#: src/callbacks.c:3619
 msgid "Deleting"
 msgstr "删除中"
 
-#: src/callbacks.c:3717
+#: src/callbacks.c:3699
 msgid "Delete"
 msgstr "删除"
 
-#: src/callbacks.c:3738
+#: src/callbacks.c:3717
 msgid ""
 "\n"
 "\n"
@@ -2206,7 +2208,7 @@
 "\n"
 "选择被锁定。\n"
 
-#: src/callbacks.c:4092
+#: src/callbacks.c:4056
 msgid ""
 "Ready to record. Use 'control' and cursor keys during playback to record "
 "your performance.\n"
@@ -2214,11 +2216,11 @@
 "play.)\n"
 msgstr ""
 
-#: src/callbacks.c:4098
+#: src/callbacks.c:4061
 msgid "Record cancelled.\n"
 msgstr "记录取消。\n"
 
-#: src/callbacks.c:4237
+#: src/callbacks.c:4197
 #, c-format
 msgid ""
 "\n"
@@ -2231,7 +2233,7 @@
 "插件 '%s' 报告：\n"
 "%s\n"
 
-#: src/callbacks.c:4241
+#: src/callbacks.c:4200
 #, c-format
 msgid ""
 "\n"
@@ -2240,7 +2242,7 @@
 "The plugin may be broken or not installed correctly."
 msgstr ""
 
-#: src/callbacks.c:4571
+#: src/callbacks.c:4532
 #, c-format
 msgid ""
 "Saving the set will cause copies of all loaded clips to remain on the disk"
@@ -2249,22 +2251,22 @@
 "Please press 'Cancel' if that is not what you want.\n"
 msgstr ""
 
-#: src/callbacks.c:4654
+#: src/callbacks.c:4617
 #, c-format
 msgid "Saving set %s"
 msgstr ""
 
-#: src/callbacks.c:5005
+#: src/callbacks.c:4964
 #, c-format
 msgid "Loading clips from set %s"
 msgstr ""
 
-#: src/callbacks.c:5093
+#: src/callbacks.c:5051
 #, c-format
 msgid "%d clips and %d layouts were recovered from set (%s).\n"
 msgstr ""
 
-#: src/callbacks.c:5312
+#: src/callbacks.c:5259
 msgid ""
 "LiVES will attempt to recover some disk space.\n"
 "You should ONLY run this if you have no other copies of LiVES running on "
@@ -2272,24 +2274,24 @@
 "Click OK to proceed.\n"
 msgstr ""
 
-#: src/callbacks.c:5317
+#: src/callbacks.c:5264
 msgid "Cleaning up disk space..."
 msgstr "清理磁盘空间..."
 
-#: src/callbacks.c:5387
+#: src/callbacks.c:5334
 msgid "Recovering disk space"
 msgstr ""
 
-#: src/callbacks.c:5439
+#: src/callbacks.c:5386
 #, c-format
 msgid "%s of disk space was recovered.\n"
 msgstr ""
 
-#: src/callbacks.c:5482
+#: src/callbacks.c:5428
 msgid "Resetting frame rates and frame values..."
 msgstr ""
 
-#: src/callbacks.c:5523
+#: src/callbacks.c:5469
 #, c-format
 msgid ""
 "\n"
@@ -2297,12 +2299,12 @@
 "Internal: %s (%d bpp) / %s\n"
 msgstr ""
 
-#: src/callbacks.c:5525
+#: src/callbacks.c:5471
 msgid "buffered"
 msgstr "已缓冲"
 
-#: src/callbacks.c:5538 src/callbacks.c:5557 src/callbacks.c:5575
-#: src/callbacks.c:5609
+#: src/callbacks.c:5484 src/callbacks.c:5502 src/callbacks.c:5518
+#: src/callbacks.c:5551
 msgid ""
 "\n"
 "  Opening..."
@@ -2310,7 +2312,7 @@
 "\n"
 "  开幕..."
 
-#: src/callbacks.c:5545
+#: src/callbacks.c:5490
 #, c-format
 msgid ""
 "\n"
@@ -2319,7 +2321,7 @@
 "\n"
 "（%d个虚拟）"
 
-#: src/callbacks.c:5548
+#: src/callbacks.c:5493
 #, c-format
 msgid ""
 "\n"
@@ -2328,7 +2330,7 @@
 "\n"
 "（%d个解码）"
 
-#: src/callbacks.c:5560 src/callbacks.c:5578 src/callbacks.c:5612
+#: src/callbacks.c:5504 src/callbacks.c:5520 src/callbacks.c:5553
 #, c-format
 msgid ""
 "\n"
@@ -2337,7 +2339,7 @@
 "\n"
 "  %.2f 秒"
 
-#: src/callbacks.c:5569
+#: src/callbacks.c:5512
 msgid ""
 "\n"
 "  Unknown"
@@ -2345,23 +2347,23 @@
 "\n"
 "  未知"
 
-#: src/callbacks.c:5582 src/callbacks.c:5596
+#: src/callbacks.c:5524 src/callbacks.c:5538
 msgid "unsigned"
 msgstr "无符号"
 
-#: src/callbacks.c:5583 src/callbacks.c:5597
+#: src/callbacks.c:5525 src/callbacks.c:5539
 msgid "signed"
 msgstr "有符号"
 
-#: src/callbacks.c:5585 src/callbacks.c:5599
+#: src/callbacks.c:5527 src/callbacks.c:5541
 msgid "big-endian"
 msgstr "大端"
 
-#: src/callbacks.c:5586 src/callbacks.c:5600
+#: src/callbacks.c:5528 src/callbacks.c:5542
 msgid "little-endian"
 msgstr "小端"
 
-#: src/callbacks.c:5588 src/callbacks.c:5602
+#: src/callbacks.c:5530 src/callbacks.c:5544
 #, c-format
 msgid ""
 "  %d Hz %d bit\n"
@@ -2370,7 +2372,7 @@
 "  %d Hz %d bit\n"
 "%s %s"
 
-#: src/callbacks.c:5707
+#: src/callbacks.c:5647
 msgid ""
 "This program is free software; you can redistribute it and/or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
@@ -2387,26 +2389,26 @@
 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA.\n"
 msgstr ""
 
-#: src/callbacks.c:5721
+#: src/callbacks.c:5661
 msgid "A video editor and VJ program."
 msgstr "阿视频编辑和南军的计划。"
 
-#: src/callbacks.c:5722
+#: src/callbacks.c:5662
 msgid "About LiVES"
 msgstr ""
 
-#: src/callbacks.c:5724
+#: src/callbacks.c:5664
 msgid "translator_credits"
 msgstr ""
 "Launchpad Contributions:\n"
 "  Guybrush88 https://launchpad.net/~guybrush\n"
 "  Liu Hui https://launchpad.net/~dannul\n"
+"  Revolution1 https://launchpad.net/~crj93106\n"
 "  Timothy Gu https://launchpad.net/~timothy-gu\n"
 "  Wylmer Wang https://launchpad.net/~wantinghard\n"
-"  salsaman https://launchpad.net/~salsaman\n"
-"  zhanshime https://launchpad.net/~zhanshime"
+"  salsaman https://launchpad.net/~salsaman"
 
-#: src/callbacks.c:5758
+#: src/callbacks.c:5699
 #, c-format
 msgid ""
 "LiVES Version %s\n"
@@ -2420,7 +2422,7 @@
 "Homepage: http://lives.sourceforge.net"
 msgstr ""
 
-#: src/callbacks.c:6037
+#: src/callbacks.c:5996
 #, fuzzy
 msgid ""
 "\n"
@@ -2431,7 +2433,7 @@
 "\n"
 "您需要安装mplayer的能够预览该文件。\n"
 
-#: src/callbacks.c:6040
+#: src/callbacks.c:5998
 #, fuzzy
 msgid ""
 "\n"
@@ -2443,191 +2445,186 @@
 "\n"
 "您需要安装mplayer的能够预览该文件。\n"
 
-#: src/callbacks.c:6423 src/callbacks.c:8289
-msgid ""
-"\n"
-"Loading new audio may cause missing audio in some multitrack layouts.\n"
-"Are you sure you wish to continue ?\n"
-"."
-msgstr ""
-"\n"
-"载入新的音频可能会导致丢失一些多轨音频布局。\n"
-"您确定要继续吗？"
-
-#: src/callbacks.c:6523
-#, c-format
-msgid "Opening audio %s, type %s..."
-msgstr "正在打开音频 %s，类型为 %s..."
-
-#: src/callbacks.c:6556 src/saveplay.c:480
-msgid "Opening audio"
-msgstr "开幕式音频"
-
-#: src/callbacks.c:6565 src/callbacks.c:6612 src/callbacks.c:8387
-#: src/callbacks.c:8429 src/callbacks.c:8472 src/callbacks.c:10846
-msgid "Cancelling"
-msgstr "正在取消"
-
-#: src/callbacks.c:6660 src/callbacks.c:8514 src/callbacks.c:10876
-#: src/callbacks.c:11563
-msgid "Committing audio"
-msgstr "提交音频"
-
-#: src/callbacks.c:6672 src/callbacks.c:8546
-msgid "New Audio"
-msgstr "新的音频"
-
-#: src/callbacks.c:6779
+#: src/callbacks.c:6459
 #, c-format
 msgid ""
 "Text was saved as\n"
 "%s\n"
 msgstr ""
 
-#: src/callbacks.c:6951 src/saveplay.c:3618
-#, c-format
-msgid "%d frames are enough !\n"
-msgstr "%d个帧够了！\n"
-
-#: src/callbacks.c:7050
+#: src/callbacks.c:6706
 msgid "LiVES: - Encoder debug output"
 msgstr ""
 
-#: src/callbacks.c:7087 src/gui.c:1922
+#: src/callbacks.c:6743 src/gui.c:1921
 msgid "Fullscreen playback (f)"
 msgstr "全屏播放 (f)"
 
-#: src/callbacks.c:7089
+#: src/callbacks.c:6744
 msgid "Fullscreen playback off (f)"
 msgstr "全屏播放关 (f)"
 
-#: src/callbacks.c:7188 src/callbacks.c:7336 src/callbacks.c:7664
-#: src/callbacks.c:7681 src/gui.c:3712 src/saveplay.c:2467 src/saveplay.c:2501
-#: src/saveplay.c:3115 src/saveplay.c:3220 src/saveplay.c:3239
-#: src/multitrack.c:9340 src/multitrack.c:11060
+#: src/callbacks.c:6841 src/callbacks.c:6983 src/callbacks.c:7283
+#: src/callbacks.c:7298 src/gui.c:3838 src/saveplay.c:2442 src/saveplay.c:2475
+#: src/saveplay.c:3074 src/saveplay.c:3178 src/saveplay.c:3197
+#: src/multitrack.c:9526 src/multitrack.c:11288
 #, c-format
 msgid " (%d %% scale)"
 msgstr ""
 
-#: src/callbacks.c:7190 src/callbacks.c:7338 src/callbacks.c:7666
-#: src/gui.c:3716 src/saveplay.c:2469 src/saveplay.c:2503
+#: src/callbacks.c:6843 src/callbacks.c:6985 src/callbacks.c:7285
+#: src/gui.c:3842 src/saveplay.c:2444 src/saveplay.c:2477
 #, c-format
 msgid "LiVES: - Play Window%s"
 msgstr ""
 
-#: src/callbacks.c:7302 src/gui.c:1907
+#: src/callbacks.c:6950 src/gui.c:1906
 msgid "Double size (d)"
 msgstr "双倍尺寸 (d)"
 
-#: src/callbacks.c:7309
+#: src/callbacks.c:6956
 msgid "Single size (d)"
 msgstr "单倍尺寸 (d)"
 
-#: src/callbacks.c:7442 src/callbacks.c:7443
+#: src/callbacks.c:7087 src/callbacks.c:7088
 msgid "Hide the play window (s)"
 msgstr "隐藏播放窗口 (s)"
 
-#: src/callbacks.c:7452 src/gui.c:1746
+#: src/callbacks.c:7096 src/gui.c:1744
 msgid "Show the play window (s)"
 msgstr "显示播放窗口 (s)"
 
-#: src/callbacks.c:7453 src/gui.c:1896
+#: src/callbacks.c:7097 src/gui.c:1895
 msgid "Play in separate window (s)"
 msgstr "在单独的窗口中播放 (s)"
 
-#: src/callbacks.c:7535 src/gui.c:4060 src/saveplay.c:2498
+#: src/callbacks.c:7175 src/gui.c:4169 src/saveplay.c:2472
 msgid "LiVES: - Streaming"
 msgstr ""
 
-#: src/callbacks.c:7778
+#: src/callbacks.c:7388
 msgid "Switch continuous looping off (o)"
 msgstr "连续循环开关关闭（海外）"
 
-#: src/callbacks.c:7785 src/gui.c:1795
+#: src/callbacks.c:7394 src/gui.c:1793
 msgid "Switch continuous looping on (o)"
 msgstr "开关连续循环的（海外）"
 
-#: src/callbacks.c:7837
+#: src/callbacks.c:7444
 #, c-format
 msgid "Audio volume (%.2f)"
 msgstr "音量 (%.2f)"
 
-#: src/callbacks.c:7876 src/callbacks.c:7877 src/gui.c:3640
+#: src/callbacks.c:7483 src/callbacks.c:7484 src/gui.c:3766
 msgid "Unmute the audio (z)"
 msgstr "取消静音 (z)"
 
-#: src/callbacks.c:7888 src/callbacks.c:7889 src/gui.c:1808 src/gui.c:3639
+#: src/callbacks.c:7494 src/callbacks.c:7495 src/gui.c:1806 src/gui.c:3765
 msgid "Mute the audio (z)"
 msgstr "静音 (z)"
 
-#: src/callbacks.c:8038
+#: src/callbacks.c:7643
 msgid "Reversing clipboard..."
 msgstr ""
 
-#: src/callbacks.c:8052
+#: src/callbacks.c:7657
 msgid "Reversing clipboard"
 msgstr ""
 
-#: src/callbacks.c:8084
+#: src/callbacks.c:7689
 msgid "LiVES: Load subtitles from..."
 msgstr ""
 
-#: src/callbacks.c:8151 src/saveplay.c:970
+#: src/callbacks.c:7753 src/saveplay.c:956
 #, c-format
 msgid "Loaded subtitle file: %s\n"
 msgstr "已加载字幕文件：%s\n"
 
-#: src/callbacks.c:8220
+#: src/callbacks.c:7821
 msgid "Subtitles were erased.\n"
 msgstr "字幕已擦除。\n"
 
-#: src/callbacks.c:8239
+#: src/callbacks.c:7843
 msgid "LiVES: - Select Audio File"
 msgstr ""
 
-#: src/callbacks.c:8250
+#: src/callbacks.c:7878 src/callbacks.c:8232
+msgid ""
+"\n"
+"Loading new audio may cause missing audio in some multitrack layouts.\n"
+"Are you sure you wish to continue ?\n"
+"."
+msgstr ""
+"\n"
+"载入新的音频可能会导致丢失一些多轨音频布局。\n"
+"您确定要继续吗？"
+
+#: src/callbacks.c:7989
+#, c-format
+msgid "Opening audio %s, type %s..."
+msgstr "正在打开音频 %s，类型为 %s..."
+
+#: src/callbacks.c:8023 src/saveplay.c:477
+msgid "Opening audio"
+msgstr "开幕式音频"
+
+#: src/callbacks.c:8032 src/callbacks.c:8083 src/callbacks.c:8327
+#: src/callbacks.c:8369 src/callbacks.c:8412 src/callbacks.c:10766
+msgid "Cancelling"
+msgstr "正在取消"
+
+#: src/callbacks.c:8137 src/callbacks.c:8454 src/callbacks.c:10803
+#: src/callbacks.c:11477
+msgid "Committing audio"
+msgstr "提交音频"
+
+#: src/callbacks.c:8153 src/callbacks.c:8484
+msgid "New Audio"
+msgstr "新的音频"
+
+#: src/callbacks.c:8194
 msgid "Please set your CD play device in Tools | Preferences | Misc\n"
 msgstr "请在 工具 | 首选项 | 杂项 中设置您的光盘播放设备\n"
 
-#: src/callbacks.c:8321
+#: src/callbacks.c:8264
 #, c-format
 msgid "Opening CD track %d from %s..."
 msgstr ""
 
-#: src/callbacks.c:8326
+#: src/callbacks.c:8267
 #, c-format
 msgid "CD track %d"
 msgstr "光盘音轨 %d"
 
-#: src/callbacks.c:8373
+#: src/callbacks.c:8313
 msgid "Opening CD track..."
 msgstr "正在打开光盘音轨..."
 
-#: src/callbacks.c:8415 src/callbacks.c:8461
+#: src/callbacks.c:8355 src/callbacks.c:8401
 msgid "Error loading CD track\n"
 msgstr "加载光盘音轨出错\n"
 
-#: src/callbacks.c:8584
+#: src/callbacks.c:8518
 msgid "layout errors"
 msgstr "布局错误"
 
-#: src/callbacks.c:8595
+#: src/callbacks.c:8529
 msgid "Close _Window"
 msgstr "关闭_窗口"
 
-#: src/callbacks.c:8606
+#: src/callbacks.c:8540
 msgid "Clear _Errors"
 msgstr "清除_错误"
 
-#: src/callbacks.c:8617
+#: src/callbacks.c:8551
 msgid "_Delete affected layouts"
 msgstr "_删除受影响的布局"
 
-#: src/callbacks.c:9343 src/callbacks.c:9388
+#: src/callbacks.c:9253 src/callbacks.c:9298
 msgid "Resume"
 msgstr "恢复"
 
-#: src/callbacks.c:9344
+#: src/callbacks.c:9254
 msgid ""
 "\n"
 "Paused\n"
@@ -2637,61 +2634,53 @@
 "已暂停\n"
 "(点击恢复继续处理)"
 
-#: src/callbacks.c:9345 src/callbacks.c:9406
+#: src/callbacks.c:9255 src/callbacks.c:9315
 msgid "paused..."
 msgstr "暂停..."
 
-#: src/callbacks.c:9372 src/callbacks.c:9418
-msgid "Pause"
-msgstr "暂停"
-
-#: src/callbacks.c:9374 src/callbacks.c:9421
+#: src/callbacks.c:9284 src/callbacks.c:9333
 msgid "resumed..."
 msgstr "恢复..."
 
-#: src/callbacks.c:9393
+#: src/callbacks.c:9303
 msgid "Keep"
 msgstr "不压缩"
 
-#: src/callbacks.c:9396
+#: src/callbacks.c:9305
 msgid "Enough"
 msgstr ""
 
-#: src/callbacks.c:9401
-#, fuzzy, c-format
+#: src/callbacks.c:9310
+#, c-format
 msgid ""
 "\n"
 "Paused\n"
 "(click %s to keep what you have and stop)\n"
 "(click Resume to continue processing)"
 msgstr ""
-"\n"
-"已暂停\n"
-"（点击保持来保留现有工作并停止）\n"
-"（点击恢复继续处理）"
 
-#: src/callbacks.c:9419
+#: src/callbacks.c:9331
 msgid "Cancel"
 msgstr "取消"
 
-#: src/callbacks.c:9558
+#: src/callbacks.c:9478
 msgid "Stop"
 msgstr ""
 
-#: src/callbacks.c:10053 src/multitrack.c:13247
+#: src/callbacks.c:9968 src/multitrack.c:13489
 msgid "LiVES: Selected frame"
 msgstr "LiVES：已选择的帧"
 
-#: src/callbacks.c:10061
+#: src/callbacks.c:9976
 msgid "_Save frame as..."
 msgstr ""
 
-#: src/callbacks.c:10290
+#: src/callbacks.c:10202
 #, c-format
 msgid "Audio is ahead of video by %.4f secs. at frame %d, with fps %.4f\n"
 msgstr ""
 
-#: src/callbacks.c:10347
+#: src/callbacks.c:10255
 msgid ""
 "\n"
 "\n"
@@ -2700,7 +2689,7 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10353
+#: src/callbacks.c:10261
 msgid ""
 "\n"
 "\n"
@@ -2712,7 +2701,7 @@
 "您必须安装“xwininfo”，然后才能使用此功能\n"
 "\n"
 
-#: src/callbacks.c:10429 src/callbacks.c:11479
+#: src/callbacks.c:10334 src/callbacks.c:11395
 msgid ""
 "\n"
 "Record time must be greater than 0.\n"
@@ -2720,7 +2709,7 @@
 "\n"
 "记录时间必须大于零。\n"
 
-#: src/callbacks.c:10440
+#: src/callbacks.c:10346
 msgid ""
 "Capture an External Window:\n"
 "\n"
@@ -2729,17 +2718,17 @@
 "\n"
 msgstr ""
 
-#: src/callbacks.c:10445
+#: src/callbacks.c:10351
 msgid "External window was released.\n"
 msgstr "对外窗口被释放。\n"
 
-#: src/callbacks.c:10479
+#: src/callbacks.c:10385
 msgid ""
 "Click on a Window to Capture it\n"
 "Press 'q' to stop recording"
 msgstr ""
 
-#: src/callbacks.c:10513
+#: src/callbacks.c:10419
 #, c-format
 msgid ""
 "\n"
@@ -2749,19 +2738,19 @@
 "(Default of %.3f frames per second will be used.)\n"
 msgstr ""
 
-#: src/callbacks.c:10539
+#: src/callbacks.c:10443
 msgid "LiVES was unable to capture this window. Sorry.\n"
 msgstr "LiVES 无法捕获此窗口。对不起。\n"
 
-#: src/callbacks.c:10695
+#: src/callbacks.c:10601
 msgid "Export Selected Audio as..."
 msgstr "音频输出选择的..."
 
-#: src/callbacks.c:10699
+#: src/callbacks.c:10604
 msgid "Export Audio as..."
 msgstr "音频输出为..."
 
-#: src/callbacks.c:10714
+#: src/callbacks.c:10619
 msgid ""
 "\n"
 "\n"
@@ -2774,86 +2763,86 @@
 "此剪辑的音频播放速度已被更改。\n"
 "点击'确定'以新速度输出，或'取消'以原速度输出。\n"
 
-#: src/callbacks.c:10720
+#: src/callbacks.c:10625
 #, c-format
 msgid "Exporting audio frames %d to %d as %s..."
 msgstr ""
 
-#: src/callbacks.c:10725
+#: src/callbacks.c:10629
 #, c-format
 msgid "Exporting audio as %s..."
 msgstr ""
 
-#: src/callbacks.c:10751
+#: src/callbacks.c:10655
 msgid "Exporting audio"
 msgstr "音频输出"
 
-#: src/callbacks.c:10782
+#: src/callbacks.c:10695
 msgid "LiVES: - Append Audio File"
 msgstr ""
 
-#: src/callbacks.c:10825
+#: src/callbacks.c:10739
 #, c-format
 msgid "Appending audio file %s..."
 msgstr ""
 
-#: src/callbacks.c:10836
+#: src/callbacks.c:10756
 msgid "Appending audio"
 msgstr "正在附加音频"
 
-#: src/callbacks.c:10892
+#: src/callbacks.c:10818
 msgid "Append Audio"
 msgstr "附加音频"
 
-#: src/callbacks.c:10952
+#: src/callbacks.c:10883
 #, c-format
 msgid "Padding audio to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10954
+#: src/callbacks.c:10885
 #, c-format
 msgid "Trimming audio from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:10973
+#: src/callbacks.c:10904
 msgid "Trimming/Padding audio"
 msgstr ""
 
-#: src/callbacks.c:10981
+#: src/callbacks.c:10912
 msgid "Trim/Pad Audio"
 msgstr ""
 
-#: src/callbacks.c:11055
+#: src/callbacks.c:10982
 msgid "Fading audio in"
 msgstr "正在淡入音频"
 
-#: src/callbacks.c:11056
+#: src/callbacks.c:10983
 msgid "Fade audio in"
 msgstr "淡入音频"
 
-#: src/callbacks.c:11061
+#: src/callbacks.c:10987
 msgid "Fading audio out"
 msgstr "正在淡出音频"
 
-#: src/callbacks.c:11062
+#: src/callbacks.c:10988
 msgid "Fade audio out"
 msgstr "淡出音频"
 
-#: src/callbacks.c:11085
+#: src/callbacks.c:11011
 #, c-format
 msgid "%s over %.1f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11087
+#: src/callbacks.c:11013
 #, c-format
 msgid "%s from time %.2f seconds to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11094
+#: src/callbacks.c:11020
 msgid "Fading audio..."
 msgstr "淡入淡出音频..."
 
-#: src/callbacks.c:11194
+#: src/callbacks.c:11119
 msgid ""
 "\n"
 "Deleting all audio will close this file.\n"
@@ -2863,947 +2852,947 @@
 "删除所有音频将关闭该文件。\n"
 "你确定吗？"
 
-#: src/callbacks.c:11197
+#: src/callbacks.c:11122
 msgid "Deleting all audio..."
 msgstr "删除所有音频..."
 
-#: src/callbacks.c:11203
+#: src/callbacks.c:11127
 #, c-format
 msgid "Deleting audio from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11290
+#: src/callbacks.c:11214
 msgid "Deleting Audio"
 msgstr "正在删除音频"
 
-#: src/callbacks.c:11297
+#: src/callbacks.c:11221
 msgid "Delete Audio"
 msgstr "删除音频"
 
-#: src/callbacks.c:11636
+#: src/callbacks.c:11550
 msgid "Record new audio"
 msgstr "新的音频记录"
 
-#: src/callbacks.c:11725
+#: src/callbacks.c:11640
 #, c-format
 msgid "Inserting silence from %.2f to %.2f seconds..."
 msgstr ""
 
-#: src/callbacks.c:11754
+#: src/callbacks.c:11666
 msgid "Inserting Silence"
 msgstr ""
 
-#: src/merge.c:85
+#: src/merge.c:96
 msgid "LiVES: - Merge"
 msgstr ""
 
-#: src/merge.c:102
+#: src/merge.c:113
 #, c-format
 msgid "Merge Clipboard [ %d Frames ]       With Selection [ %d Frames ]"
 msgstr ""
 
-#: src/merge.c:107
+#: src/merge.c:118
 #, c-format
 msgid ""
 "Merge Clipboard [ %d Frames (resampled) ]       With Selection [ %d Frames ]"
 msgstr ""
 
-#: src/merge.c:118
+#: src/merge.c:130
 msgid "Align _Starts"
 msgstr ""
 
-#: src/merge.c:123
+#: src/merge.c:135
 msgid "Align _Ends"
 msgstr ""
 
-#: src/merge.c:134
+#: src/merge.c:146
 msgid "What to do with extra clipboard frames -"
 msgstr ""
 
-#: src/merge.c:137
+#: src/merge.c:149
 msgid "_Insert Frames"
 msgstr "_插入帧"
 
-#: src/merge.c:143
+#: src/merge.c:155
 msgid "_Drop Frames"
 msgstr "_丢弃帧"
 
-#: src/merge.c:149
+#: src/merge.c:160
 msgid "Number of Times to Loop Clipboard"
 msgstr ""
 
-#: src/merge.c:160
+#: src/merge.c:171
 msgid "_Loop Clipboard to Fit Selection"
 msgstr ""
 
-#: src/merge.c:173
+#: src/merge.c:184
 msgid "_Transition Method:"
 msgstr "_过渡方法："
 
-#: src/merge.c:394
+#: src/merge.c:395
 msgid "Merging clipboard with selection..."
 msgstr ""
 
-#: src/merge.c:551
+#: src/merge.c:539
 msgid "Merge done.\n"
 msgstr "合并完成。\n"
 
-#: src/gui.c:123
+#: src/gui.c:122
 msgid "_Custom Generators"
 msgstr ""
 
-#: src/gui.c:124
+#: src/gui.c:123
 msgid "_Custom Effects"
 msgstr "自定义效果(_C)"
 
-#: src/gui.c:125
+#: src/gui.c:124
 msgid "Custom _Utilities"
 msgstr "自定义工具(_U)"
 
-#: src/gui.c:352 src/multitrack.c:5964
+#: src/gui.c:351 src/multitrack.c:6143
 msgid "_File"
 msgstr "文件(_F)"
 
-#: src/gui.c:367 src/multitrack.c:5989
+#: src/gui.c:366 src/multitrack.c:6168
 msgid "_Open File/Directory"
 msgstr ""
 
-#: src/gui.c:373
+#: src/gui.c:372
 msgid "O_pen Part of File..."
 msgstr ""
 
-#: src/gui.c:379 src/gui.c:383 src/multitrack.c:6006 src/multitrack.c:6023
-#: src/multitrack.c:6028
+#: src/gui.c:378 src/gui.c:382 src/multitrack.c:6185 src/multitrack.c:6202
+#: src/multitrack.c:6207
 msgid "Open _Location/Stream..."
 msgstr "打开_位置/流..."
 
-#: src/gui.c:393 src/multitrack.c:6016
+#: src/gui.c:392 src/multitrack.c:6195
 msgid "Open _Youtube Clip..."
 msgstr ""
 
-#: src/gui.c:404
+#: src/gui.c:403
 msgid "Import from _dvd/vcd..."
 msgstr ""
 
-#: src/gui.c:413
+#: src/gui.c:412
 msgid "Import from _dvd"
 msgstr ""
 
-#: src/gui.c:416
+#: src/gui.c:415
 msgid "Import from _vcd"
 msgstr ""
 
-#: src/gui.c:419
+#: src/gui.c:418
 msgid "_Import from Firewire"
 msgstr ""
 
-#: src/gui.c:428 src/multitrack.c:6086
+#: src/gui.c:427 src/multitrack.c:6265
 msgid "Import from _Firewire Device (dv)"
 msgstr ""
 
-#: src/gui.c:429 src/multitrack.c:6094
+#: src/gui.c:428 src/multitrack.c:6273
 msgid "Import from _Firewire Device (hdv)"
 msgstr ""
 
-#: src/gui.c:457
+#: src/gui.c:456
 msgid "_Add Webcam/TV card..."
 msgstr ""
 
-#: src/gui.c:476
+#: src/gui.c:475
 msgid "Add _Unicap Device"
 msgstr ""
 
-#: src/gui.c:486
+#: src/gui.c:485
 msgid "Add Live _Firewire Device"
 msgstr ""
 
-#: src/gui.c:495
+#: src/gui.c:494
 msgid "Add _TV Device"
 msgstr ""
 
-#: src/gui.c:510 src/multitrack.c:6117
+#: src/gui.c:509 src/multitrack.c:6296
 msgid "_Recent Files..."
 msgstr "_最近的文件..."
 
-#: src/gui.c:560 src/multitrack.c:6177
+#: src/gui.c:559 src/multitrack.c:6356
 msgid "_Reload Clip Set..."
 msgstr ""
 
-#: src/gui.c:564 src/multitrack.c:6185
+#: src/gui.c:563 src/multitrack.c:6364
 msgid "Close/Sa_ve All Clips"
 msgstr ""
 
-#: src/gui.c:575
+#: src/gui.c:574
 msgid "_Encode Clip As..."
 msgstr ""
 
-#: src/gui.c:577
+#: src/gui.c:576
 msgid "Encode _Selection As..."
 msgstr ""
 
-#: src/gui.c:584
+#: src/gui.c:583
 msgid "_Close This Clip"
 msgstr "_关闭此影片"
 
-#: src/gui.c:595
+#: src/gui.c:594
 msgid "_Backup Clip as .lv1..."
 msgstr ""
 
-#: src/gui.c:604
+#: src/gui.c:603
 msgid "_Restore Clip from .lv1..."
 msgstr ""
 
-#: src/gui.c:615
+#: src/gui.c:614
 msgid "Encode/Load/Backup _with Sound"
 msgstr ""
 
-#: src/gui.c:620
+#: src/gui.c:619
 msgid "Auto load subtitles"
 msgstr ""
 
-#: src/gui.c:628 src/multitrack.c:6224
+#: src/gui.c:627 src/multitrack.c:6403
 msgid "Clean _up Diskspace"
 msgstr ""
 
-#: src/gui.c:636 src/multitrack.c:6257
+#: src/gui.c:635 src/multitrack.c:6436
 msgid "_Edit"
 msgstr "编辑(_E)"
 
-#: src/gui.c:685
+#: src/gui.c:684
 msgid "_MULTITRACK mode"
 msgstr ""
 
-#: src/gui.c:696
+#: src/gui.c:695
 msgid "_Copy Selection"
 msgstr "_复制选择"
 
-#: src/gui.c:705
+#: src/gui.c:704
 msgid "Cu_t Selection"
 msgstr "_切的选择"
 
-#: src/gui.c:714
+#: src/gui.c:713
 msgid "_Insert from Clipboard..."
 msgstr ""
 
-#: src/gui.c:730
+#: src/gui.c:729
 msgid "Paste as _New"
 msgstr "粘贴为新图像(_N)"
 
-#: src/gui.c:739
+#: src/gui.c:738
 msgid "_Merge Clipboard with Selection..."
 msgstr ""
 
-#: src/gui.c:746
+#: src/gui.c:745
 msgid "_Delete Selection"
 msgstr "删除选中区域(_D)"
 
-#: src/gui.c:764
+#: src/gui.c:763
 msgid "Decouple _Video from Audio"
 msgstr ""
 
-#: src/gui.c:772
+#: src/gui.c:771
 msgid "_Select..."
 msgstr "选择(_S)..."
 
-#: src/gui.c:786
+#: src/gui.c:785
 msgid "Select _All Frames"
 msgstr "选择_所有帧"
 
-#: src/gui.c:794
+#: src/gui.c:793
 msgid "_Start Frame Only"
 msgstr ""
 
-#: src/gui.c:802
+#: src/gui.c:801
 msgid "_End Frame Only"
 msgstr ""
 
-#: src/gui.c:813
+#: src/gui.c:812
 msgid "Select from _First Frame"
 msgstr ""
 
-#: src/gui.c:817
+#: src/gui.c:816
 msgid "Select to _Last Frame"
 msgstr ""
 
-#: src/gui.c:821
+#: src/gui.c:820
 msgid "Select Last Insertion/_Merge"
 msgstr ""
 
-#: src/gui.c:825
+#: src/gui.c:824
 msgid "Select Last _Effect"
 msgstr "选择最后的_影响"
 
-#: src/gui.c:829
+#: src/gui.c:828
 msgid "_Invert Selection"
 msgstr "反转选择(_I)"
 
-#: src/gui.c:837
+#: src/gui.c:836
 msgid "_Lock Selection Width"
 msgstr "锁定选区宽度(_L)"
 
-#: src/gui.c:842 src/multitrack.c:6409
+#: src/gui.c:841 src/multitrack.c:6591
 msgid "_Play"
 msgstr "播放(_P)"
 
-#: src/gui.c:854
+#: src/gui.c:853
 msgid "_Play All"
 msgstr "全部播放(_P)"
 
-#: src/gui.c:869
+#: src/gui.c:868
 msgid "Pla_y Selection"
 msgstr "播放选择(_Y)"
 
-#: src/gui.c:877
+#: src/gui.c:876
 msgid "Play _Clipboard"
 msgstr ""
 
-#: src/gui.c:899 src/multitrack.c:6441
+#: src/gui.c:898 src/multitrack.c:6623
 msgid "_Stop"
 msgstr "停止(_S)"
 
-#: src/gui.c:914 src/multitrack.c:6453
+#: src/gui.c:913 src/multitrack.c:6635
 msgid "Re_wind"
 msgstr ""
 
-#: src/gui.c:946 src/multitrack.c:6471
+#: src/gui.c:945 src/multitrack.c:6653
 msgid "_Full Screen"
 msgstr "全屏(_F)"
 
-#: src/gui.c:955
+#: src/gui.c:954
 msgid "_Double Size"
 msgstr "_双倍大小"
 
-#: src/gui.c:963 src/multitrack.c:6479
+#: src/gui.c:962 src/multitrack.c:6661
 msgid "Play in _Separate Window"
 msgstr ""
 
-#: src/gui.c:972
+#: src/gui.c:971
 msgid "_Blank Background"
 msgstr "空白背景(_B)"
 
-#: src/gui.c:979
+#: src/gui.c:978
 msgid "(Auto)_loop Video (to fit audio track)"
 msgstr "(自动)循环视频(以适应音轨)(_L)"
 
-#: src/gui.c:988 src/multitrack.c:6487
+#: src/gui.c:987 src/multitrack.c:6669
 msgid "L_oop Continuously"
 msgstr "持续循环(_O)"
 
-#: src/gui.c:997
+#: src/gui.c:996
 msgid "Pin_g Pong Loops"
 msgstr "乒乓循环(_G)"
 
-#: src/gui.c:1005 src/multitrack.c:6495
+#: src/gui.c:1004 src/multitrack.c:6677
 msgid "_Mute"
 msgstr "静音(_M)"
 
-#: src/gui.c:1017
+#: src/gui.c:1016
 msgid "Separate Window 'S_ticky' Mode"
 msgstr ""
 
-#: src/gui.c:1025
+#: src/gui.c:1024
 msgid "S_how Frame Counter"
 msgstr "显示帧计数器(_H)"
 
-#: src/gui.c:1035
+#: src/gui.c:1034
 msgid "Show Subtitles"
 msgstr "显示字幕"
 
-#: src/gui.c:1045
+#: src/gui.c:1044
 msgid "Letterbox mode"
 msgstr ""
 
-#: src/gui.c:1051 src/multitrack.c:6507
+#: src/gui.c:1050 src/multitrack.c:6689
 msgid "Effect_s"
 msgstr "效果(_S)"
 
-#: src/gui.c:1054
+#: src/gui.c:1053
 msgid "Effects are applied to the current selection."
 msgstr "效果应用到当前的选区。"
 
-#: src/gui.c:1067
+#: src/gui.c:1066
 msgid "_Run Test Rendered Effect/Tool/Generator..."
 msgstr ""
 
-#: src/gui.c:1072 src/multitrack.c:7123
+#: src/gui.c:1071 src/multitrack.c:7299
 msgid "_Tools"
 msgstr "工具(_T)"
 
-#: src/gui.c:1075
+#: src/gui.c:1074
 msgid "Tools are applied to complete clips."
 msgstr "工具应用到剪辑完成。"
 
-#: src/gui.c:1085
+#: src/gui.c:1084
 msgid "_Reverse Clipboard"
 msgstr ""
 
-#: src/gui.c:1094
+#: src/gui.c:1093
 msgid "_Change Playback/Save Speed..."
 msgstr ""
 
-#: src/gui.c:1099
+#: src/gui.c:1098
 msgid "Resample _Video to New Frame Rate..."
 msgstr ""
 
-#: src/gui.c:1105
+#: src/gui.c:1104
 msgid "_Utilities"
 msgstr "工具(_U)"
 
-#: src/gui.c:1110
+#: src/gui.c:1109
 msgid "Custom _Tools"
 msgstr "自定义工具(_T)"
 
-#: src/gui.c:1116 src/multitrack.c:7149
+#: src/gui.c:1115 src/multitrack.c:7325
 msgid "_Generate"
 msgstr "生成(_G)"
 
-#: src/gui.c:1126
+#: src/gui.c:1125
 msgid "Loading rendered effect plugins..."
 msgstr ""
 
-#: src/gui.c:1139
+#: src/gui.c:1138
 msgid "Load _Subtitles from File..."
 msgstr ""
 
-#: src/gui.c:1144
+#: src/gui.c:1143
 msgid "Erase subtitles"
 msgstr ""
 
-#: src/gui.c:1152 src/multitrack.c:7158
+#: src/gui.c:1151 src/multitrack.c:7334
 msgid "Capture _External Window... "
 msgstr ""
 
-#: src/gui.c:1159 src/multitrack.c:7173
+#: src/gui.c:1158 src/multitrack.c:7349
 msgid "_Preferences..."
 msgstr "偏好设置(_P)..."
 
-#: src/gui.c:1172
+#: src/gui.c:1171
 msgid "_Audio"
 msgstr ""
 
-#: src/gui.c:1184
+#: src/gui.c:1183
 msgid "Load _New Audio for Clip..."
 msgstr ""
 
-#: src/gui.c:1190
+#: src/gui.c:1189
 msgid "Load _CD Track..."
 msgstr ""
 
-#: src/gui.c:1191
+#: src/gui.c:1190
 msgid "E_ject CD"
 msgstr "弹出 CD(_J)"
 
-#: src/gui.c:1205
+#: src/gui.c:1204
 msgid "Record E_xternal Audio..."
 msgstr ""
 
-#: src/gui.c:1218
+#: src/gui.c:1217
 msgid "to New _Clip..."
 msgstr "到新剪辑(_C)..."
 
-#: src/gui.c:1222
+#: src/gui.c:1221
 msgid "to _Selection"
 msgstr "到选区(_S)"
 
-#: src/gui.c:1230
+#: src/gui.c:1229
 msgid "Fade Audio _In..."
 msgstr ""
 
-#: src/gui.c:1234
+#: src/gui.c:1233
 msgid "Fade Audio _Out..."
 msgstr ""
 
-#: src/gui.c:1244
+#: src/gui.c:1243
 msgid "_Export Audio..."
 msgstr "输出音频(_E)..."
 
-#: src/gui.c:1257
+#: src/gui.c:1256
 msgid "Export _Selected Audio..."
 msgstr ""
 
-#: src/gui.c:1261
+#: src/gui.c:1260
 msgid "Export _All Audio..."
 msgstr ""
 
-#: src/gui.c:1265
+#: src/gui.c:1264
 msgid "_Append Audio..."
 msgstr "附加音频(_A)..."
 
-#: src/gui.c:1270
+#: src/gui.c:1269
 msgid "_Trim/Pad Audio..."
 msgstr ""
 
-#: src/gui.c:1283
+#: src/gui.c:1282
 msgid "Trim/Pad Audio to _Selection"
 msgstr ""
 
-#: src/gui.c:1288
+#: src/gui.c:1287
 msgid "Trim/Pad Audio from Beginning to _Play Start"
 msgstr ""
 
-#: src/gui.c:1293
+#: src/gui.c:1292
 msgid "_Delete Audio..."
 msgstr "删除音频(_D)..."
 
-#: src/gui.c:1306
+#: src/gui.c:1305
 msgid "Delete _Selected Audio"
 msgstr ""
 
-#: src/gui.c:1310
+#: src/gui.c:1309
 msgid "Delete _All Audio"
 msgstr ""
 
-#: src/gui.c:1314
+#: src/gui.c:1313
 msgid "Insert _Silence in Selection"
 msgstr ""
 
-#: src/gui.c:1319
+#: src/gui.c:1318
 msgid "_Resample Audio..."
 msgstr "重采样音频(_R)..."
 
-#: src/gui.c:1324
+#: src/gui.c:1323
 msgid "_Info"
 msgstr "信息(_I)"
 
-#: src/gui.c:1336
+#: src/gui.c:1335
 msgid "Show Clip _Info"
 msgstr ""
 
-#: src/gui.c:1344
+#: src/gui.c:1343
 msgid "Show/_Edit File Comments"
 msgstr ""
 
-#: src/gui.c:1349
+#: src/gui.c:1348
 msgid "Show _Clipboard Info"
 msgstr ""
 
-#: src/gui.c:1360 src/multitrack.c:7286
+#: src/gui.c:1359 src/multitrack.c:7462
 msgid "Show _Messages"
 msgstr "显示消息(_M)"
 
-#: src/gui.c:1364 src/multitrack.c:7365
+#: src/gui.c:1363 src/multitrack.c:7541
 msgid "Show _Layout Errors"
 msgstr "显示布局错误(_L)"
 
-#: src/gui.c:1369 src/multitrack.c:7263
+#: src/gui.c:1368 src/multitrack.c:7439
 msgid "_Clips"
 msgstr "剪辑(_C)"
 
-#: src/gui.c:1381
+#: src/gui.c:1380
 msgid "_Rename Current Clip in Menu..."
 msgstr ""
 
-#: src/gui.c:1399
+#: src/gui.c:1398
 msgid "A_dvanced"
 msgstr "高级(_D)"
 
-#: src/gui.c:1412
+#: src/gui.c:1411
 msgid "_RFX Effects/Tools/Utilities"
 msgstr ""
 
-#: src/gui.c:1424
+#: src/gui.c:1423
 msgid "_New Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1428
+#: src/gui.c:1427
 msgid "_Copy RFX Script to Test..."
 msgstr ""
 
-#: src/gui.c:1432
+#: src/gui.c:1431
 msgid "_Edit Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1436
+#: src/gui.c:1435
 msgid "Rena_me Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1440
+#: src/gui.c:1439
 msgid "_Delete Test RFX Script..."
 msgstr ""
 
-#: src/gui.c:1450
+#: src/gui.c:1449
 msgid "_Promote Test Rendered Effect/Tool/Generator..."
 msgstr ""
 
-#: src/gui.c:1457
+#: src/gui.c:1456
 msgid "_Import Custom RFX script..."
 msgstr ""
 
-#: src/gui.c:1461
+#: src/gui.c:1460
 msgid "E_xport Custom RFX script..."
 msgstr ""
 
-#: src/gui.c:1465
+#: src/gui.c:1464
 msgid "De_lete Custom RFX Script..."
 msgstr ""
 
-#: src/gui.c:1472
+#: src/gui.c:1471
 msgid "Re_build all RFX plugins"
 msgstr ""
 
-#: src/gui.c:1501
+#: src/gui.c:1498
 msgid "Receive _LiVES stream from..."
 msgstr ""
 
-#: src/gui.c:1506
+#: src/gui.c:1503
 msgid "_Send LiVES stream to..."
 msgstr ""
 
-#: src/gui.c:1515
+#: src/gui.c:1512
 #, c-format
 msgid "Open _yuv4mpeg stream on %sstream.yuv..."
 msgstr ""
 
-#: src/gui.c:1536
+#: src/gui.c:1534
 msgid "_Import Project (.lv2)..."
 msgstr ""
 
-#: src/gui.c:1540
+#: src/gui.c:1538
 msgid "E_xport Project (.lv2)..."
 msgstr ""
 
-#: src/gui.c:1545
+#: src/gui.c:1543
 msgid "_VJ"
 msgstr "_VJ"
 
-#: src/gui.c:1557
+#: src/gui.c:1555
 msgid "Real Time _Effect Mapping"
 msgstr ""
 
-#: src/gui.c:1563
+#: src/gui.c:1561
 msgid "Bind real time effects to ctrl-number keys."
 msgstr ""
 
-#: src/gui.c:1565
+#: src/gui.c:1563
 msgid "Set Real Time Effect _Defaults"
 msgstr ""
 
-#: src/gui.c:1567
+#: src/gui.c:1565
 msgid "Set default parameter values for real time effects."
 msgstr ""
 
-#: src/gui.c:1580
+#: src/gui.c:1578
 msgid "Save Real Time Effect _Defaults"
 msgstr ""
 
-#: src/gui.c:1583
+#: src/gui.c:1581
 msgid ""
 "Save real time effect defaults so they will be restored each time you use "
 "LiVES."
 msgstr ""
 
-#: src/gui.c:1589
+#: src/gui.c:1587
 msgid "_Reset all playback speeds and positions"
 msgstr ""
 
-#: src/gui.c:1592
+#: src/gui.c:1590
 msgid ""
 "Reset all playback positions to frame 1, and reset all playback frame rates."
 msgstr ""
 
-#: src/gui.c:1594
+#: src/gui.c:1592
 msgid "_MIDI/joystick interface"
 msgstr "_MIDI/游戏杆接口"
 
-#: src/gui.c:1609
+#: src/gui.c:1607
 msgid "_MIDI/joystick learner..."
 msgstr "_MIDI/游戏杆学习者..."
 
-#: src/gui.c:1614
+#: src/gui.c:1612
 msgid "_Save device mapping..."
 msgstr "保存设备映射(_S)..."
 
-#: src/gui.c:1620
+#: src/gui.c:1618
 msgid "_Load device mapping..."
 msgstr "加载设备映射(_L)..."
 
-#: src/gui.c:1628
+#: src/gui.c:1626
 msgid "Show VJ _Keys"
 msgstr "显示 VJ 键(_K)"
 
-#: src/gui.c:1632
+#: src/gui.c:1630
 msgid "To_ys"
 msgstr "玩具(_Y)"
 
-#: src/gui.c:1644
+#: src/gui.c:1642
 msgid "_None"
 msgstr "无(_N)"
 
-#: src/gui.c:1652
+#: src/gui.c:1650
 msgid "_Autolives"
 msgstr ""
 
-#: src/gui.c:1657
+#: src/gui.c:1655
 msgid "_Mad Frames"
 msgstr "_疯狂框架"
 
-#: src/gui.c:1662
+#: src/gui.c:1660
 msgid "_LiVES TV (broadband)"
 msgstr "_LiVES 电视(宽带)"
 
-#: src/gui.c:1672 src/multitrack.c:7387
+#: src/gui.c:1670 src/multitrack.c:7563
 msgid "_Help"
 msgstr "帮助(_H)"
 
-#: src/gui.c:1684 src/multitrack.c:7407
+#: src/gui.c:1682 src/multitrack.c:7583
 msgid "_Manual (opens in browser)"
 msgstr "手动(打开浏览器)(_M)"
 
-#: src/gui.c:1691 src/multitrack.c:7416
+#: src/gui.c:1689 src/multitrack.c:7592
 msgid "_Donate to the project !"
 msgstr "向项目捐款(_D)！"
 
-#: src/gui.c:1695 src/multitrack.c:7420
+#: src/gui.c:1693 src/multitrack.c:7596
 msgid "_Email the author"
 msgstr "给作者发邮件(_E)"
 
-#: src/gui.c:1699 src/multitrack.c:7424
+#: src/gui.c:1697 src/multitrack.c:7600
 msgid "Report a _bug"
 msgstr "报告错误(_B)"
 
-#: src/gui.c:1703 src/multitrack.c:7428
+#: src/gui.c:1701 src/multitrack.c:7604
 msgid "Suggest a _feature"
 msgstr "功能建议(_F)"
 
-#: src/gui.c:1707 src/multitrack.c:7432
+#: src/gui.c:1705 src/multitrack.c:7608
 msgid "Assist with _translating"
 msgstr "帮助翻译(_T)"
 
-#: src/gui.c:1714 src/multitrack.c:7439
+#: src/gui.c:1712 src/multitrack.c:7615
 msgid "_Troubleshoot"
 msgstr "故障诊断(_T)"
 
-#: src/gui.c:1718 src/multitrack.c:7443
+#: src/gui.c:1716 src/multitrack.c:7619
 msgid "_About"
 msgstr "关于(_A)"
 
-#: src/gui.c:1752
+#: src/gui.c:1750
 msgid "Rewind to start (w)"
 msgstr "倒带启动 (w)"
 
-#: src/gui.c:1760 src/multitrack.c:16720
+#: src/gui.c:1758 src/multitrack.c:17010
 msgid "Play all (p)"
 msgstr "播放所有 (p)"
 
-#: src/gui.c:1768 src/gui.c:1877
+#: src/gui.c:1766 src/gui.c:1876
 msgid "Stop playback (q)"
 msgstr "停止播放 (q)"
 
-#: src/gui.c:1779
+#: src/gui.c:1777
 msgid "Play selection (y)"
 msgstr "播放选区 (y)"
 
-#: src/gui.c:1832
+#: src/gui.c:1829
 msgid "Volume"
 msgstr "音量"
 
-#: src/gui.c:1854
+#: src/gui.c:1853
 msgid "Audio volume (1.00)"
 msgstr ""
 
-#: src/gui.c:1883
+#: src/gui.c:1882
 msgid "Unblank background (b)"
 msgstr ""
 
-#: src/gui.c:1929
+#: src/gui.c:1928
 msgid "Play slower (ctrl-down)"
 msgstr ""
 
-#: src/gui.c:1935
+#: src/gui.c:1934
 msgid "Play faster (ctrl-up)"
 msgstr ""
 
-#: src/gui.c:1942
+#: src/gui.c:1941
 msgid "Skip back (ctrl-left)"
 msgstr ""
 
-#: src/gui.c:1948
+#: src/gui.c:1947
 msgid "Skip forward (ctrl-right)"
 msgstr ""
 
-#: src/gui.c:1954
+#: src/gui.c:1953
 msgid "Show clip info (i)"
 msgstr "显示剪辑信息 (i)"
 
-#: src/gui.c:1960
+#: src/gui.c:1959
 msgid "Hide this toolbar"
 msgstr "隐藏此工具栏"
 
-#: src/gui.c:1962
+#: src/gui.c:1961
 msgid ""
 "Press \"s\" to toggle separate play window for improved performance, \"q\" "
 "to stop."
 msgstr ""
 
 #. TRANSLATORS: please keep the translated string the same length
-#: src/gui.c:1995
+#: src/gui.c:1994
 msgid "     Video playback speed (frames per second)        "
 msgstr ""
 
-#: src/gui.c:2009
+#: src/gui.c:2008
 msgid "Vary the video speed"
 msgstr "不同的视频播放速度"
 
-#: src/gui.c:2092 src/gui.c:3218
+#: src/gui.c:2090 src/gui.c:3329
 msgid "First Frame"
 msgstr "首帧"
 
-#: src/gui.c:2193 src/gui.c:3226
+#: src/gui.c:2191 src/gui.c:3336
 msgid "Last Frame"
 msgstr "末帧"
 
-#: src/gui.c:2210
+#: src/gui.c:2208
 msgid "The first selected frame in this clip"
 msgstr "此剪辑中所选择的第一帧"
 
-#: src/gui.c:2248
+#: src/gui.c:2246
 msgid "The last selected frame in this clip"
 msgstr "此剪辑中所选择的最后一帧"
 
-#: src/gui.c:2532
+#: src/gui.c:2546
 msgid "Starting...\n"
 msgstr "正在启动...\n"
 
-#: src/gui.c:3074
+#: src/gui.c:3181
 msgid "    Press 'q' to stop recording.  DO NOT COVER THE PLAY WINDOW !   "
 msgstr ""
 
-#: src/gui.c:3521
+#: src/gui.c:3643
 msgid "Frame number to preview"
 msgstr ""
 
-#: src/gui.c:3538
+#: src/gui.c:3660
 msgid "_Free"
 msgstr "空闲(_F)"
 
-#: src/gui.c:3539
+#: src/gui.c:3661
 msgid "Free choice of frame number"
 msgstr "自由选择的帧号"
 
-#: src/gui.c:3543
+#: src/gui.c:3666
 msgid "_Start"
 msgstr "起始(_S)"
 
-#: src/gui.c:3544
+#: src/gui.c:3667
 msgid "Frame number is linked to start frame"
 msgstr ""
 
-#: src/gui.c:3551
+#: src/gui.c:3675
 msgid "_End"
 msgstr "_结尾"
 
-#: src/gui.c:3552
+#: src/gui.c:3676
 msgid "Frame number is linked to end frame"
 msgstr ""
 
-#: src/gui.c:3559
+#: src/gui.c:3684
 msgid "_Pointer"
 msgstr "指针(_P)"
 
-#: src/gui.c:3560
+#: src/gui.c:3685
 msgid "Frame number is linked to playback pointer"
 msgstr ""
 
-#: src/gui.c:3581
+#: src/gui.c:3707
 msgid "Rewind"
 msgstr "倒回"
 
-#: src/gui.c:3592 src/dialogs.c:894 src/dialogs.c:896 src/dialogs.c:1817
-#: src/dialogs.c:1819
+#: src/gui.c:3718 src/dialogs.c:960 src/dialogs.c:962 src/dialogs.c:1873
+#: src/dialogs.c:1875
 msgid "Play all"
 msgstr "播放所有"
 
-#: src/gui.c:3605
+#: src/gui.c:3731
 msgid "Play Selection"
 msgstr "播放选择"
 
-#: src/gui.c:3619
+#: src/gui.c:3745
 msgid "Loop On/Off"
 msgstr "循环开/关"
 
-#: src/gui.c:3693
+#: src/gui.c:3819
 msgid "Start _recording"
 msgstr ""
 
-#: src/gui.c:3698
+#: src/gui.c:3824
 msgid "Stop _recording"
 msgstr ""
 
-#: src/gui.c:3703
+#: src/gui.c:3829
 msgid "_Record Performance"
 msgstr "记录性能(_R)"
 
-#: src/gui.c:3851
+#: src/gui.c:3974
 msgid "Hide Play Window"
 msgstr "隐藏播放窗口"
 
-#: src/gui.c:4232
+#: src/gui.c:4333
 msgid "Show Play Window"
 msgstr "显示播放窗口"
 
-#: src/ce_thumbs.c:222
+#: src/ce_thumbs.c:242
 #, c-format
 msgid "Mapped to ctrl-%d"
 msgstr ""
 
-#: src/ce_thumbs.c:276 src/effects.c:85 src/preferences.c:3195
+#: src/ce_thumbs.c:296 src/effects.c:86 src/preferences.c:3247
 msgid "Effects"
 msgstr "特效"
 
-#: src/ce_thumbs.c:279 src/multitrack.c:5615
+#: src/ce_thumbs.c:299 src/multitrack.c:5791
 msgid "Clips"
 msgstr "剪辑"
 
-#: src/ce_thumbs.c:303
-#, fuzzy, c-format
+#: src/ce_thumbs.c:323
+#, c-format
 msgid "Show / apply effects to %s\n"
-msgstr "关闭所有效果。"
+msgstr ""
 
-#: src/ce_thumbs.c:315
-#, fuzzy, c-format
+#: src/ce_thumbs.c:335
+#, c-format
 msgid "Select clip for %s\n"
-msgstr "_夹上删除"
+msgstr ""
 
-#: src/ce_thumbs.c:515
+#: src/ce_thumbs.c:536
 msgid "_Pin"
 msgstr ""
 
-#: src/ce_thumbs.c:515
+#: src/ce_thumbs.c:537
 msgid "Pin the parameter box to the window"
 msgstr ""
 
 #. TRANSLATORS: Exabytes
-#: src/utils.c:794
+#: src/utils.c:800
 #, c-format
 msgid "%.2f EB"
 msgstr ""
 
 #. TRANSLATORS: Petabytes
-#: src/utils.c:798
+#: src/utils.c:803
 #, c-format
 msgid "%.2f PB"
 msgstr ""
 
 #. TRANSLATORS: Terabytes
-#: src/utils.c:802
+#: src/utils.c:806
 #, c-format
 msgid "%.2f TB"
 msgstr ""
 
 #. TRANSLATORS: Gigabytes
-#: src/utils.c:806
+#: src/utils.c:809
 #, c-format
 msgid "%.2f GB"
 msgstr ""
 
 #. TRANSLATORS: Megabytes
-#: src/utils.c:810
+#: src/utils.c:812
 #, c-format
 msgid "%.2f MB"
 msgstr ""
 
 #. TRANSLATORS: Kilobytes (1024 bytes)
-#: src/utils.c:814
+#: src/utils.c:815
 #, c-format
 msgid "%.2f KiB"
 msgstr ""
@@ -3813,7 +3802,7 @@
 msgid "%d bytes"
 msgstr ""
 
-#: src/utils.c:1841
+#: src/utils.c:1835
 msgid "Clearing the clipboard"
 msgstr ""
 
@@ -3825,7 +3814,7 @@
 "Switched to clip %s\n"
 msgstr ""
 
-#: src/utils.c:1880
+#: src/utils.c:1877
 msgid ""
 "\n"
 "==============================\n"
@@ -3835,74 +3824,74 @@
 "==============================\n"
 "切换到空剪辑\n"
 
-#: src/utils.c:1917
+#: src/utils.c:1916
 msgid "(blank)"
 msgstr ""
 
-#: src/utils.c:1920
+#: src/utils.c:1919
 #, c-format
 msgid ""
 "The set name has been changed from %s to %s. Affected layouts have been "
 "updated accordingly\n"
 msgstr ""
 
-#: src/utils.c:1928
+#: src/utils.c:1927
 #, c-format
 msgid ""
 "The clip %s is missing from this set.\n"
 "It is required by the following layouts:\n"
 msgstr ""
 
-#: src/utils.c:1932
+#: src/utils.c:1931
 #, c-format
 msgid ""
 "The clip %s has been closed.\n"
 "It is required by the following layouts:\n"
 msgstr ""
 
-#: src/utils.c:1937
+#: src/utils.c:1936
 #, c-format
 msgid ""
 "Frames have been shifted in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1942
+#: src/utils.c:1941
 #, c-format
 msgid ""
 "Frames have been deleted from the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1947
+#: src/utils.c:1946
 #, c-format
 msgid ""
 "Audio has been deleted from the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1952
+#: src/utils.c:1951
 #, c-format
 msgid ""
 "Audio has been shifted in clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1957
+#: src/utils.c:1956
 #, c-format
 msgid ""
 "Audio has been altered in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:1962
+#: src/utils.c:1961
 #, c-format
 msgid ""
 "Frames have been altered in the clip %s.\n"
 "The following layouts are affected:\n"
 msgstr ""
 
-#: src/utils.c:2135
+#: src/utils.c:2134
 #, c-format
 msgid ""
 "Set %s\n"
@@ -3910,7 +3899,7 @@
 "by another copy of LiVES.\n"
 msgstr ""
 
-#: src/utils.c:2142
+#: src/utils.c:2140
 #, c-format
 msgid ""
 "\n"
@@ -3958,67 +3947,67 @@
 msgid "Removing layout %s\n"
 msgstr ""
 
-#: src/utils.c:3014
+#: src/utils.c:2996
 msgid "Video [opening...]"
 msgstr ""
 
-#: src/utils.c:3018
+#: src/utils.c:2999
 #, c-format
 msgid "Video [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:3022
+#: src/utils.c:3002
 msgid "(Undefined)"
 msgstr ""
 
-#: src/utils.c:3025
+#: src/utils.c:3004
 msgid "(No video)"
 msgstr "（无视频）"
 
-#: src/utils.c:3032
+#: src/utils.c:3011
 msgid "(No audio)"
 msgstr "（无音频）"
 
-#: src/utils.c:3037
+#: src/utils.c:3015
 msgid "Mono  [opening...]"
 msgstr ""
 
-#: src/utils.c:3040
+#: src/utils.c:3017
 msgid "Left Audio [opening...]"
 msgstr ""
 
-#: src/utils.c:3045
+#: src/utils.c:3021
 #, c-format
 msgid "Mono [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:3048
+#: src/utils.c:3023
 #, c-format
 msgid "Left Audio [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:3056
+#: src/utils.c:3031
 msgid "Right Audio [opening...]"
 msgstr ""
 
-#: src/utils.c:3059
+#: src/utils.c:3033
 #, c-format
 msgid "Right Audio [%.2f sec]"
 msgstr ""
 
-#: src/utils.c:3506
+#: src/utils.c:3472
 msgid "LiVES cannot switch to mplayer whilst clips are loading."
 msgstr ""
 
-#: src/utils.c:3559
+#: src/utils.c:3525
 msgid "LiVES cannot switch to mplayer2 whilst clips are loading."
 msgstr ""
 
-#: src/utils.c:3809
+#: src/utils.c:3775
 msgid "Cleaning up clip"
 msgstr "清理剪辑"
 
-#: src/utils.c:3913
+#: src/utils.c:3874
 #, c-format
 msgid ""
 "\n"
@@ -4028,30 +4017,29 @@
 "Overwrite ?\n"
 msgstr ""
 
-#: src/utils.c:4305 src/utils.c:4337 src/multitrack.c:4503
+#: src/utils.c:4250 src/utils.c:4280 src/multitrack.c:4672
 #, c-format
 msgid "_Undo %s"
 msgstr "撤消 %s(_U)"
 
-#: src/utils.c:4306 src/utils.c:4338 src/multitrack.c:4525
+#: src/utils.c:4251 src/utils.c:4281 src/multitrack.c:4693
 #, c-format
 msgid "_Redo %s"
 msgstr "重做 %s(_R)"
 
-#: src/utils.c:4363
+#: src/utils.c:4305
 msgid "-------------Selection------------"
 msgstr "-------------选择------------"
 
-#. TRANSLATORS: - try to keep the text of the middle part the same length, by deleting "-" if necessary
-#: src/utils.c:4371
+#: src/utils.c:4313
 msgid " sec ] ----------Selection---------- [ "
 msgstr ""
 
-#: src/utils.c:4371
+#: src/utils.c:4314
 msgid " frames ] ----------"
 msgstr " 帧 ] ----------"
 
-#: src/utils.c:5360
+#: src/utils.c:5302
 msgid ""
 "Your version of mplayer/ffmpeg may be broken !\n"
 "See http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2071\n"
@@ -4062,11 +4050,11 @@
 "Try running Help/Troubleshoot for more information."
 msgstr ""
 
-#: src/saveplay.c:178
+#: src/saveplay.c:179
 msgid "Examining file header"
 msgstr "检查文件头"
 
-#: src/saveplay.c:315 src/saveplay.c:789
+#: src/saveplay.c:316 src/saveplay.c:779
 #, c-format
 msgid "Opening %s"
 msgstr "正在打开 %s"
@@ -4076,36 +4064,36 @@
 msgid "Opening %s start time %.2f sec. frames %d"
 msgstr ""
 
-#: src/saveplay.c:326 src/saveplay.c:4001
+#: src/saveplay.c:326 src/saveplay.c:3927
 msgid " without sound"
 msgstr " 无声"
 
-#: src/saveplay.c:396
+#: src/saveplay.c:395
 #, c-format
 msgid "Opening audio for %s"
 msgstr ""
 
-#: src/saveplay.c:557
+#: src/saveplay.c:554
 #, c-format
 msgid "Auto trimming %.2f seconds of audio at start..."
 msgstr ""
 
-#: src/saveplay.c:567
+#: src/saveplay.c:562
 #, c-format
 msgid "Auto trimming %.2f seconds of audio at end..."
 msgstr ""
 
-#: src/saveplay.c:584
+#: src/saveplay.c:577
 #, c-format
 msgid "Auto padding with %.2f seconds of silence at start..."
 msgstr ""
 
-#: src/saveplay.c:599
+#: src/saveplay.c:590
 #, c-format
 msgid "Auto padding with %.2f seconds of silence at end..."
 msgstr ""
 
-#: src/saveplay.c:671
+#: src/saveplay.c:661
 #, c-format
 msgid ""
 "\n"
@@ -4117,11 +4105,11 @@
 "Are you sure you wish to continue ?"
 msgstr ""
 
-#: src/saveplay.c:685
+#: src/saveplay.c:676
 msgid " - please be patient."
 msgstr " - 请耐心等待。"
 
-#: src/saveplay.c:938
+#: src/saveplay.c:926
 msgid ""
 "\n"
 "\n"
@@ -4129,7 +4117,7 @@
 "Please check the terminal window for more details.\n"
 msgstr ""
 
-#: src/saveplay.c:940
+#: src/saveplay.c:928
 msgid ""
 "\n"
 "\n"
@@ -4139,7 +4127,7 @@
 "\n"
 "您可能需要安装 mplayer 才能打开这个文件。\n"
 
-#: src/saveplay.c:948
+#: src/saveplay.c:934
 msgid ""
 "\n"
 "\n"
@@ -4147,29 +4135,29 @@
 "Tools|Preferences|Decoding\n"
 msgstr ""
 
-#: src/saveplay.c:1014
+#: src/saveplay.c:995
 msgid "Adding image..."
 msgstr ""
 
-#: src/saveplay.c:1108
+#: src/saveplay.c:1089
 #, c-format
 msgid "Subtitles were saved as %s\n"
 msgstr ""
 
-#: src/saveplay.c:1192
+#: src/saveplay.c:1171
 #, c-format
 msgid "LiVES: Save Frame %d as..."
 msgstr ""
 
-#: src/saveplay.c:1195
+#: src/saveplay.c:1174
 msgid "LiVES: Save Frame as..."
 msgstr ""
 
-#: src/saveplay.c:1322
+#: src/saveplay.c:1303
 msgid "LiVES: Save Clip as..."
 msgstr ""
 
-#: src/saveplay.c:1390
+#: src/saveplay.c:1369
 msgid ""
 "Saving your video could lead to a loss of quality !\n"
 "You are strongly advised to 'Save As' to a new file.\n"
@@ -4177,67 +4165,67 @@
 "Do you still wish to continue ?"
 msgstr ""
 
-#: src/saveplay.c:1517 src/saveplay.c:1683 src/saveplay.c:1762
-#: src/saveplay.c:4014
+#: src/saveplay.c:1494 src/saveplay.c:1659 src/saveplay.c:1738
+#: src/saveplay.c:3940
 msgid "Pulling frames from clip"
 msgstr "从剪辑中抽取帧"
 
-#: src/saveplay.c:1588 src/saveplay.c:1727
+#: src/saveplay.c:1565 src/saveplay.c:1703
 msgid "Linking selection"
 msgstr "连接选区"
 
-#: src/saveplay.c:1779
+#: src/saveplay.c:1755
 msgid " (with no sound)\n"
 msgstr ""
 
-#: src/saveplay.c:1786
+#: src/saveplay.c:1761
 #, c-format
 msgid "Saving frames %d to %d%s as \"%s\" : encoder = %s : format = %s..."
 msgstr ""
 
-#: src/saveplay.c:1790
+#: src/saveplay.c:1765
 #, c-format
 msgid "Saving frames 1 to %d%s as \"%s\" : encoder %s : format = %s..."
 msgstr ""
 
-#: src/saveplay.c:1909
+#: src/saveplay.c:1890
 msgid "Saving [can take a long time]"
 msgstr "保存[可能需要较长时间]"
 
-#: src/saveplay.c:2057
+#: src/saveplay.c:2044
 msgid ""
 "\n"
 "\n"
 "Encoder error - output file was not created !\n"
 msgstr ""
 
-#: src/saveplay.c:2094
+#: src/saveplay.c:2081
 msgid "Clearing letterbox"
 msgstr ""
 
-#: src/saveplay.c:2183
+#: src/saveplay.c:2168
 #, c-format
 msgid "File size was %s\n"
 msgstr ""
 
-#: src/saveplay.c:2284
+#: src/saveplay.c:2265
 msgid "recording aborted by preview.\n"
 msgstr "记录被预览中止。\n"
 
-#: src/saveplay.c:2288
+#: src/saveplay.c:2268
 msgid "recording aborted by clipboard playback.\n"
 msgstr "记录被剪贴板回放中止。\n"
 
-#: src/saveplay.c:2291
+#: src/saveplay.c:2270
 msgid "Recording performance..."
 msgstr "记录性能..."
 
-#: src/saveplay.c:3293
+#: src/saveplay.c:3251
 #, c-format
 msgid "Average FPS was %.4f\n"
 msgstr ""
 
-#: src/saveplay.c:3299
+#: src/saveplay.c:3256
 msgid ""
 "\n"
 "\n"
@@ -4246,16 +4234,21 @@
 "and resize all frames to the current size.\n"
 msgstr ""
 
-#: src/saveplay.c:3479
+#: src/saveplay.c:3429
 msgid "Unknown"
 msgstr "未知"
 
-#: src/saveplay.c:3588 src/saveplay.c:4585
+#: src/saveplay.c:3538 src/saveplay.c:4502
 #, c-format
 msgid "Untitled%d"
 msgstr "未命名%d"
 
-#: src/saveplay.c:3633
+#: src/saveplay.c:3567
+#, c-format
+msgid "%d frames are enough !\n"
+msgstr "%d个帧够了！\n"
+
+#: src/saveplay.c:3579
 #, c-format
 msgid ""
 "\n"
@@ -4263,7 +4256,7 @@
 "Bad things may happen with this clip.\n"
 msgstr ""
 
-#: src/saveplay.c:3723
+#: src/saveplay.c:3667
 #, c-format
 msgid ""
 "\n"
@@ -4271,73 +4264,73 @@
 "Default can be set in Tools | Preferences | Misc.\n"
 msgstr ""
 
-#: src/saveplay.c:3735
+#: src/saveplay.c:3677
 #, c-format
 msgid "Playback speed was adjusted to %.3f frames per second to fit audio.\n"
 msgstr ""
 
-#: src/saveplay.c:3754
+#: src/saveplay.c:3694
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d *bpp=Greyscale* fps=%.3f\n"
 "Audio:"
 msgstr ""
 
-#: src/saveplay.c:3758 src/saveplay.c:4762
+#: src/saveplay.c:3698 src/saveplay.c:4671
 #, c-format
 msgid ""
 "Frames=%d type=%s size=%dx%d bpp=%d fps=%.3f\n"
 "Audio:"
 msgstr ""
 
-#: src/saveplay.c:3762 src/saveplay.c:4766
+#: src/saveplay.c:3703 src/saveplay.c:4676
 #, c-format
 msgid "%s none\n"
 msgstr ""
 
-#: src/saveplay.c:3774
-#, fuzzy, c-format
+#: src/saveplay.c:3714
+#, c-format
 msgid " - Author: %s\n"
-msgstr "作者：%s"
+msgstr ""
 
-#: src/saveplay.c:3779
+#: src/saveplay.c:3717
 #, c-format
 msgid " - Title: %s\n"
 msgstr ""
 
-#: src/saveplay.c:3784
+#: src/saveplay.c:3720
 #, c-format
 msgid " - Comment: %s\n"
 msgstr ""
 
-#: src/saveplay.c:3897
+#: src/saveplay.c:3829
 #, c-format
 msgid "Saving frame %d as %s..."
 msgstr ""
 
-#: src/saveplay.c:3996
+#: src/saveplay.c:3924
 #, c-format
 msgid "Backing up %s to %s"
 msgstr ""
 
-#: src/saveplay.c:4049
+#: src/saveplay.c:3975
 msgid "Backing up"
 msgstr "备份"
 
-#: src/saveplay.c:4083
+#: src/saveplay.c:4009
 msgid "performance data was backed up..."
 msgstr "性能数据备份..."
 
-#: src/saveplay.c:4661
+#: src/saveplay.c:4574
 #, c-format
 msgid "Restoring %s..."
 msgstr ""
 
-#: src/saveplay.c:4692
+#: src/saveplay.c:4603
 msgid "Restoring"
 msgstr "还原中"
 
-#: src/saveplay.c:4714
+#: src/saveplay.c:4625
 #, c-format
 msgid ""
 "\n"
@@ -4347,22 +4340,22 @@
 msgstr ""
 
 #. TRANSLATORS: rec(ord) %.2f M(ega)B(ytes)
-#: src/saveplay.c:5207
+#: src/saveplay.c:5118
 #, c-format
 msgid "rec %.2f MB"
 msgstr ""
 
-#: src/saveplay.c:5213
+#: src/saveplay.c:5123
 #, c-format
 msgid "!rec %.2f MB"
 msgstr ""
 
 #. TRANSLATORS: rec(ord) ?? M(ega)B(ytes)
-#: src/saveplay.c:5216
+#: src/saveplay.c:5126
 msgid "rec ?? MB"
 msgstr ""
 
-#: src/saveplay.c:5241
+#: src/saveplay.c:5151
 #, c-format
 msgid ""
 "\n"
@@ -4370,54 +4363,76 @@
 "Record stop level can be set in Preferences.\n"
 msgstr ""
 
-#: src/saveplay.c:5535
+#: src/saveplay.c:5447
 msgid ""
 "\n"
 "Files from a previous run of LiVES were found.\n"
 "Do you want to attempt to recover them ?\n"
 msgstr ""
 
-#: src/saveplay.c:5557
+#: src/saveplay.c:5469
 msgid "Recovering files"
 msgstr "恢复文件"
 
-#: src/saveplay.c:5560
+#: src/saveplay.c:5472
 msgid "Recovering files..."
 msgstr ""
 
-#: src/dialogs.c:72
+#: src/dialogs.c:71
 msgid "Show affected _layouts"
 msgstr "显示受影响的布局(_L)"
 
-#: src/dialogs.c:128
+#: src/dialogs.c:113
+msgid ""
+"Do _not show this warning any more\n"
+"(can be turned back on from Preferences/Warnings)"
+msgstr ""
+"不再显示此警告(_N)\n"
+"(可以从 偏好设置/警告 中重新开启)"
+
+#: src/dialogs.c:127
 msgid "_Recover disk space"
 msgstr ""
 
-#: src/dialogs.c:143
+#: src/dialogs.c:142
 msgid " _Advanced Settings >>"
 msgstr ""
 
-#: src/dialogs.c:184
+#: src/dialogs.c:183 src/dialogs.c:221
 msgid "LiVES: - Warning !"
 msgstr ""
 
 #: src/dialogs.c:194
+#, fuzzy
+msgid "LiVES: - Error !"
+msgstr "LiVES: - 插入"
+
+#: src/dialogs.c:204
+#, fuzzy
+msgid "LiVES: - Information"
+msgstr "LiVES：%s 信息"
+
+#: src/dialogs.c:230
 msgid "LiVES: - Question"
 msgstr ""
 
-#: src/dialogs.c:204
+#: src/dialogs.c:239
 msgid "LiVES: - File Error"
 msgstr ""
 
-#: src/dialogs.c:208
+#: src/dialogs.c:241
 msgid "_Abort"
 msgstr ""
 
-#: src/dialogs.c:213
+#: src/dialogs.c:246
 msgid "_Retry"
 msgstr ""
 
-#: src/dialogs.c:597
+#: src/dialogs.c:306
+msgid "Show _Details"
+msgstr "显示详情（_D）"
+
+#: src/dialogs.c:657
 #, c-format
 msgid ""
 "FREE SPACE IN THE PARTITION CONTAINING\n"
@@ -4428,7 +4443,7 @@
 "(Disk warning levels can be configured in Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:615
+#: src/dialogs.c:676
 #, c-format
 msgid ""
 "Free space in the partition containing\n"
@@ -4440,11 +4455,11 @@
 "Preferences.)"
 msgstr ""
 
-#: src/dialogs.c:627
+#: src/dialogs.c:688
 msgid "Audio players cannot be switched during playback."
 msgstr "音频播放器不能播放过程中进行切换。"
 
-#: src/dialogs.c:632
+#: src/dialogs.c:694
 msgid ""
 "\n"
 "\n"
@@ -4452,46 +4467,46 @@
 "Please try closing some other applications first.\n"
 msgstr ""
 
-#: src/dialogs.c:752
+#: src/dialogs.c:820
 msgid "Processing has been paused."
 msgstr ""
 
-#: src/dialogs.c:937
+#: src/dialogs.c:1002
 #, c-format
 msgid ""
 "\n"
 "%s%d%% done. Time remaining: %u sec%s\n"
 msgstr ""
 
-#: src/dialogs.c:1335
+#: src/dialogs.c:1391
 #, c-format
 msgid ""
 "\n"
 "%d/%d frames opened. Time remaining %u sec.\n"
 msgstr ""
 
-#: src/dialogs.c:1337
+#: src/dialogs.c:1393
 #, c-format
 msgid ""
 "\n"
 "%d/%d frames opened.\n"
 msgstr ""
 
-#: src/dialogs.c:1341
+#: src/dialogs.c:1396
 #, c-format
 msgid ""
 "\n"
 "%d frames opened.\n"
 msgstr ""
 
-#: src/dialogs.c:1940
+#: src/dialogs.c:1993
 #, c-format
 msgid ""
 "\n"
 "Time remaining: %d sec"
 msgstr ""
 
-#: src/dialogs.c:1988
+#: src/dialogs.c:2040
 #, c-format
 msgid ""
 "\n"
@@ -4499,7 +4514,7 @@
 "Please close a file and then try again."
 msgstr ""
 
-#: src/dialogs.c:1994
+#: src/dialogs.c:2047
 #, c-format
 msgid ""
 "LiVES was unable to write to its temporary directory.\n"
@@ -4511,7 +4526,7 @@
 "Please make sure you can write to this directory."
 msgstr ""
 
-#: src/dialogs.c:2005
+#: src/dialogs.c:2059
 #, fuzzy
 msgid ""
 "\n"
@@ -4521,20 +4536,20 @@
 "\n"
 "LiVES 目前需要 'mplayer' 或 'sox' 以正常工作。请至少安装其中之一并重试。\n"
 
-#: src/dialogs.c:2010
+#: src/dialogs.c:2064
 msgid ""
 "Audio was not loaded; please install mplayer or mplayer2 if you expected "
 "audio for this clip.\n"
 msgstr ""
 
-#: src/dialogs.c:2014
+#: src/dialogs.c:2069
 msgid ""
 "Audio resampling is required for this format.\n"
 "Please install 'sox'\n"
 "Or switch to another encoder format in Tools | Preferences | Encoding\n"
 msgstr ""
 
-#: src/dialogs.c:2019
+#: src/dialogs.c:2075
 msgid ""
 "\n"
 "\n"
@@ -4542,19 +4557,19 @@
 "Please set the audio codec in Tools|Preferences|Encoding\n"
 msgstr ""
 
-#: src/dialogs.c:2024
+#: src/dialogs.c:2080
 msgid ""
 "This layout includes generated frames.\n"
 "It cannot be saved, you must render it to a clip first.\n"
 msgstr ""
 
-#: src/dialogs.c:2029
+#: src/dialogs.c:2085
 msgid ""
 "This layout includes generated or recorded audio.\n"
 "It cannot be saved, you must render it to a clip first.\n"
 msgstr ""
 
-#: src/dialogs.c:2039 src/dialogs.c:2137
+#: src/dialogs.c:2095 src/dialogs.c:2189
 #, c-format
 msgid ""
 "\n"
@@ -4562,49 +4577,49 @@
 "Due to restrictions in the %s format\n"
 msgstr ""
 
-#: src/dialogs.c:2059
+#: src/dialogs.c:2115
 msgid ""
 "LiVES recommends the following settings:\n"
 "\n"
 msgstr ""
 
-#: src/dialogs.c:2065 src/dialogs.c:2174 src/resample.c:850
+#: src/dialogs.c:2121 src/dialogs.c:2225 src/resample.c:839
 msgid ", signed"
 msgstr ""
 
-#: src/dialogs.c:2066 src/dialogs.c:2175 src/resample.c:853
+#: src/dialogs.c:2122 src/dialogs.c:2226 src/resample.c:841
 msgid ", unsigned"
 msgstr ""
 
-#: src/dialogs.c:2070 src/dialogs.c:2179 src/resample.c:858
+#: src/dialogs.c:2126 src/dialogs.c:2230 src/resample.c:846
 msgid ", little-endian"
 msgstr "，小端"
 
-#: src/dialogs.c:2071 src/dialogs.c:2180 src/resample.c:861
+#: src/dialogs.c:2127 src/dialogs.c:2231 src/resample.c:848
 msgid ", big-endian"
 msgstr "，大端"
 
-#: src/dialogs.c:2077
+#: src/dialogs.c:2132
 #, c-format
 msgid "Use an audio rate of %d Hz%s%s\n"
 msgstr ""
 
-#: src/dialogs.c:2085
+#: src/dialogs.c:2140
 #, c-format
 msgid "Set video rate to %.3f frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:2089
+#: src/dialogs.c:2143
 #, c-format
 msgid "Set video rate to %d:%d frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:2094 src/dialogs.c:2209
+#: src/dialogs.c:2148 src/dialogs.c:2258
 #, c-format
 msgid "Set video size to %d x %d pixels\n"
 msgstr ""
 
-#: src/dialogs.c:2102 src/dialogs.c:2208
+#: src/dialogs.c:2156 src/dialogs.c:2257
 msgid ""
 "\n"
 "You may wish to:\n"
@@ -4612,35 +4627,35 @@
 "\n"
 "您可能希望：\n"
 
-#: src/dialogs.c:2105 src/dialogs.c:2200
+#: src/dialogs.c:2159 src/dialogs.c:2249
 #, c-format
 msgid "resize video to %d x %d pixels\n"
 msgstr ""
 
-#: src/dialogs.c:2110
+#: src/dialogs.c:2163
 msgid "disable audio, since the target encoder cannot encode audio\n"
 msgstr ""
 
-#: src/dialogs.c:2170
+#: src/dialogs.c:2221
 msgid "LiVES must:\n"
 msgstr ""
 
-#: src/dialogs.c:2185
+#: src/dialogs.c:2235
 #, c-format
 msgid "resample audio to %d Hz%s%s\n"
 msgstr ""
 
-#: src/dialogs.c:2192
+#: src/dialogs.c:2242
 #, c-format
 msgid "resample video to %.3f frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:2196
+#: src/dialogs.c:2245
 #, c-format
 msgid "resample video to %d:%d frames per second\n"
 msgstr ""
 
-#: src/dialogs.c:2215
+#: src/dialogs.c:2263
 msgid ""
 "\n"
 "You will be able to undo these changes afterwards.\n"
@@ -4649,7 +4664,7 @@
 "\n"
 msgstr ""
 
-#: src/dialogs.c:2218
+#: src/dialogs.c:2265
 msgid ""
 "\n"
 "Changes applied to the selection will not be permanent.\n"
@@ -4659,7 +4674,7 @@
 "更改应用到的选区不会是永久的。\n"
 "\n"
 
-#: src/dialogs.c:2237
+#: src/dialogs.c:2285
 msgid ""
 "\n"
 "\n"
@@ -4668,7 +4683,7 @@
 "Try recording for just a selection of the file."
 msgstr ""
 
-#: src/dialogs.c:2244
+#: src/dialogs.c:2293
 msgid ""
 "The playback speed (fps), or the audio rate\n"
 " of the clipboard does not match\n"
@@ -4679,7 +4694,7 @@
 "Please press Cancel to abort the insert, or OK to continue."
 msgstr ""
 
-#: src/dialogs.c:2253
+#: src/dialogs.c:2304
 #, c-format
 msgid ""
 "When opening a yuvmpeg stream, you should first create a fifo file in:\n"
@@ -4692,11 +4707,11 @@
 "click Cancel."
 msgstr ""
 
-#: src/dialogs.c:2305
+#: src/dialogs.c:2356
 msgid "Show Keys"
 msgstr "显示键"
 
-#: src/dialogs.c:2306
+#: src/dialogs.c:2358
 msgid ""
 "You can use the following keys during playback to control LiVES:-\n"
 "\n"
@@ -4738,11 +4753,11 @@
 "g                             ping pong loops\n"
 msgstr ""
 
-#: src/dialogs.c:2313
+#: src/dialogs.c:2365
 msgid "Multitrack Keys"
 msgstr "多轨钥匙"
 
-#: src/dialogs.c:2314
+#: src/dialogs.c:2367
 msgid ""
 "You can use the following keys to control the multitrack window:-\n"
 "\n"
@@ -4764,18 +4779,18 @@
 "For other keys, see the menus.\n"
 msgstr ""
 
-#: src/dialogs.c:2322
+#: src/dialogs.c:2375
 msgid "Message History"
 msgstr "消息历史"
 
-#: src/dialogs.c:2335
+#: src/dialogs.c:2388
 #, c-format
 msgid ""
 "After upgrading/installing, you may need to adjust the <prefix_dir> setting "
 "in your %s file"
 msgstr ""
 
-#: src/dialogs.c:2344
+#: src/dialogs.c:2399
 #, c-format
 msgid ""
 "\n"
@@ -4786,25 +4801,25 @@
 "or change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/dialogs.c:2352
+#: src/dialogs.c:2408
 msgid ""
 "Sorry, unknown audio type.\n"
 "\n"
 " (Filenames must end in .mp3, .ogg, .wav, .mod, .xm or .it)"
 msgstr ""
 
-#: src/dialogs.c:2353
+#: src/dialogs.c:2409
 msgid "failed (unknown type)\n"
 msgstr ""
 
-#: src/dialogs.c:2358
+#: src/dialogs.c:2415
 msgid ""
 "\n"
 "Do you wish to remove the layout files associated with this set ?\n"
 "(They will not be usable without the set).\n"
 msgstr ""
 
-#: src/dialogs.c:2363
+#: src/dialogs.c:2421
 #, c-format
 msgid ""
 "\n"
@@ -4813,7 +4828,7 @@
 "Click Cancel to pick a new name.\n"
 msgstr ""
 
-#: src/dialogs.c:2370
+#: src/dialogs.c:2429
 msgid ""
 "\n"
 "Frames from this clip are used in some multitrack layouts.\n"
@@ -4821,7 +4836,7 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2374
+#: src/dialogs.c:2433
 msgid ""
 "\n"
 "Audio from this clip is used in some multitrack layouts.\n"
@@ -4829,7 +4844,7 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:2378
+#: src/dialogs.c:2438
 #, c-format
 msgid ""
 "\n"
@@ -4840,7 +4855,7 @@
 "Otherwise click Cancel to skip loading this file.\n"
 msgstr ""
 
-#: src/dialogs.c:2385
+#: src/dialogs.c:2446
 #, c-format
 msgid ""
 "\n"
@@ -4850,7 +4865,7 @@
 "The clip could not be loaded.\n"
 msgstr ""
 
-#: src/dialogs.c:2392
+#: src/dialogs.c:2455
 msgid ""
 "\n"
 "Dear user, the jack developers decided to remove the -Z option from jackd.\n"
@@ -4858,7 +4873,7 @@
 "Alternately, select a different audio player in Preferences.\n"
 msgstr ""
 
-#: src/dialogs.c:2396
+#: src/dialogs.c:2460
 msgid ""
 "\n"
 "Unable to start up jack. Please ensure that alsa is set up correctly on your "
@@ -4867,13 +4882,13 @@
 "Automatic jack startup will be disabled now.\n"
 msgstr ""
 
-#: src/dialogs.c:2402
+#: src/dialogs.c:2466
 msgid ""
 "\n"
 "Unable to connect to jack server. Please start jack before starting LiVES\n"
 msgstr ""
 
-#: src/dialogs.c:2411
+#: src/dialogs.c:2475
 #, c-format
 msgid ""
 "\n"
@@ -4884,13 +4899,13 @@
 "%s\n"
 msgstr ""
 
-#: src/dialogs.c:2418
+#: src/dialogs.c:2482
 msgid ""
 "\n"
 "Alternately, you can restart LiVES and select another audio player.\n"
 msgstr ""
 
-#: src/dialogs.c:2423
+#: src/dialogs.c:2488
 #, c-format
 msgid ""
 "\n"
@@ -4900,7 +4915,7 @@
 "It is recommended to increase it to at least %d MB"
 msgstr ""
 
-#: src/dialogs.c:2429
+#: src/dialogs.c:2496
 #, c-format
 msgid ""
 "\n"
@@ -4909,7 +4924,7 @@
 "Do you wish to delete them ?\n"
 msgstr ""
 
-#: src/dialogs.c:2436
+#: src/dialogs.c:2504
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for multitrack undo.\n"
@@ -4917,7 +4932,7 @@
 "using Preferences/Multitrack/Undo Memory\n"
 msgstr ""
 
-#: src/dialogs.c:2440
+#: src/dialogs.c:2508
 msgid ""
 "\n"
 "Out of memory for undo.\n"
@@ -4925,63 +4940,63 @@
 "using Preferences/Multitrack/Undo Memory\n"
 msgstr ""
 
-#: src/dialogs.c:2444
+#: src/dialogs.c:2512
 msgid ""
 "\n"
 "LiVES was unable to reserve enough memory for the multitrack undo buffer.\n"
 msgstr ""
 
-#: src/dialogs.c:2446
+#: src/dialogs.c:2514
 msgid "or enter a smaller value.\n"
 msgstr ""
 
-#: src/dialogs.c:2448
+#: src/dialogs.c:2516
 msgid "Try again from the clip editor, try closing some other applications\n"
 msgstr ""
 
-#: src/dialogs.c:2449
+#: src/dialogs.c:2517
 msgid "Try closing some other applications\n"
 msgstr ""
 
-#: src/dialogs.c:2460
+#: src/dialogs.c:2529
 msgid ""
 "Multitrack is set to 0 audio channels, but this layout has audio.\n"
 "You should adjust the audio settings from the Tools menu.\n"
 msgstr ""
 
-#: src/dialogs.c:2464
+#: src/dialogs.c:2534
 msgid ""
 "The current layout has audio, so audio channels may not be set to zero.\n"
 msgstr ""
 
-#: src/dialogs.c:2468
+#: src/dialogs.c:2539
 msgid ""
 "Multitrack audio preview is only available with the\n"
 "\"jack\" or \"pulse audio\" audio player.\n"
 "You can set this in Tools|Preferences|Playback."
 msgstr ""
 
-#: src/dialogs.c:2472
+#: src/dialogs.c:2545
 msgid ""
 "Errors were detected in the layout (which may be due to transferring from "
 "another system, or from an older version of LiVES).\n"
 "Should I try to repair the disk copy of the layout ?\n"
 msgstr ""
 
-#: src/dialogs.c:2476
+#: src/dialogs.c:2549
 msgid ""
 "LiVES was unable to load the layout.\n"
 "Sorry.\n"
 msgstr ""
 
-#: src/dialogs.c:2482
+#: src/dialogs.c:2555
 msgid ""
 "\n"
 "\n"
 "Audio rate must be greater than 0.\n"
 msgstr ""
 
-#: src/dialogs.c:2486
+#: src/dialogs.c:2559
 msgid ""
 "\n"
 "Event list will be very large\n"
@@ -4989,14 +5004,14 @@
 "Are you sure you wish to view it ?\n"
 msgstr ""
 
-#: src/dialogs.c:2491
+#: src/dialogs.c:2564
 msgid ""
 "\n"
 "\n"
 "You must install 'dvgrab' to use this function.\n"
 msgstr ""
 
-#: src/dialogs.c:2496
+#: src/dialogs.c:2570
 msgid ""
 "\n"
 "\n"
@@ -5005,25 +5020,25 @@
 "You may need to select one of these in Tools/Preferences/Playback.\n"
 msgstr ""
 
-#: src/dialogs.c:2500
+#: src/dialogs.c:2574
 msgid "Video playback plugin failed to initialise palette !\n"
 msgstr ""
 
-#: src/dialogs.c:2504
+#: src/dialogs.c:2579
 msgid "Decoder plugin failed to initialise palette !\n"
 msgstr ""
 
-#: src/dialogs.c:2509
+#: src/dialogs.c:2584
 msgid "Unable to set framerate of video plugin\n"
 msgstr ""
 
-#: src/dialogs.c:2514
+#: src/dialogs.c:2590
 msgid ""
 "After a crash, it is advisable to clean up the disk with\n"
 "File|Clean up disk space\n"
 msgstr ""
 
-#: src/dialogs.c:2526
+#: src/dialogs.c:2604
 #, c-format
 msgid ""
 "Stream frame size is too large for your network buffers.\n"
@@ -5032,33 +5047,33 @@
 "echo %d > /proc/sys/net/core/rmem_max\n"
 msgstr ""
 
-#: src/dialogs.c:2714
+#: src/dialogs.c:2800
 msgid "cancelled.\n"
 msgstr ""
 
-#: src/dialogs.c:2721
+#: src/dialogs.c:2805
 msgid "failed.\n"
 msgstr "失败。\n"
 
-#: src/dialogs.c:2728
+#: src/dialogs.c:2810
 msgid "done.\n"
 msgstr "完成。\n"
 
-#: src/dialogs.c:2732
+#: src/dialogs.c:2814
 msgid "error in file. Failed.\n"
 msgstr ""
 
-#: src/dialogs.c:2766 src/dialogs.c:2815 src/dialogs.c:2839
+#: src/dialogs.c:2848 src/dialogs.c:2897 src/dialogs.c:2921
 #, c-format
 msgid "Additional info: %s\n"
 msgstr ""
 
-#: src/dialogs.c:2769
+#: src/dialogs.c:2851
 #, c-format
 msgid "The error value was %d%s\n"
 msgstr ""
 
-#: src/dialogs.c:2772
+#: src/dialogs.c:2854
 #, c-format
 msgid ""
 "\n"
@@ -5068,7 +5083,7 @@
 "%s%s%s"
 msgstr ""
 
-#: src/dialogs.c:2818
+#: src/dialogs.c:2900
 #, c-format
 msgid ""
 "\n"
@@ -5078,7 +5093,7 @@
 "%s"
 msgstr ""
 
-#: src/dialogs.c:2842
+#: src/dialogs.c:2924
 #, c-format
 msgid ""
 "\n"
@@ -5088,7 +5103,7 @@
 "%s"
 msgstr ""
 
-#: src/dialogs.c:2886
+#: src/dialogs.c:2968
 #, c-format
 msgid ""
 "\n"
@@ -5097,7 +5112,7 @@
 "Please check for possible error causes.\n"
 msgstr ""
 
-#: src/dialogs.c:2890
+#: src/dialogs.c:2971
 #, c-format
 msgid ""
 "\n"
@@ -5107,7 +5122,7 @@
 "%s.\n"
 msgstr ""
 
-#: src/dialogs.c:2921
+#: src/dialogs.c:3002
 #, c-format
 msgid ""
 "\n"
@@ -5116,7 +5131,7 @@
 "Please check for possible error causes.\n"
 msgstr ""
 
-#: src/dialogs.c:2925
+#: src/dialogs.c:3005
 #, c-format
 msgid ""
 "\n"
@@ -5126,12 +5141,12 @@
 "%s.\n"
 msgstr ""
 
-#: src/dialogs.c:2993
+#: src/dialogs.c:3073
 #, c-format
 msgid "Value for \"%s\" could not be read."
 msgstr ""
 
-#: src/dialogs.c:3011
+#: src/dialogs.c:3091
 #, c-format
 msgid ""
 "\n"
@@ -5140,7 +5155,7 @@
 "Please check your system for errors.\n"
 msgstr ""
 
-#: src/dialogs.c:3020
+#: src/dialogs.c:3100
 #, c-format
 msgid ""
 "\n"
@@ -5149,7 +5164,7 @@
 "Please check the file permissions and try again."
 msgstr ""
 
-#: src/dialogs.c:3027
+#: src/dialogs.c:3109
 #, c-format
 msgid ""
 "\n"
@@ -5158,7 +5173,7 @@
 "Please check the directory permissions and try again."
 msgstr ""
 
-#: src/dialogs.c:3034
+#: src/dialogs.c:3116
 #, c-format
 msgid ""
 "\n"
@@ -5166,14 +5181,14 @@
 "%s\n"
 msgstr ""
 
-#: src/dialogs.c:3041
+#: src/dialogs.c:3123
 msgid ""
 "\n"
 "Abort and exit immediately from LiVES\n"
 "Are you sure ?\n"
 msgstr ""
 
-#: src/dialogs.c:3047
+#: src/dialogs.c:3129
 #, c-format
 msgid ""
 "\n"
@@ -5181,13 +5196,13 @@
 "Please select another encoder from the list.\n"
 msgstr ""
 
-#: src/dialogs.c:3056
+#: src/dialogs.c:3139
 msgid ""
 "\n"
 "This card is already in use and cannot be opened multiple times.\n"
 msgstr ""
 
-#: src/dialogs.c:3061
+#: src/dialogs.c:3145
 #, c-format
 msgid ""
 "\n"
@@ -5197,27 +5212,27 @@
 "- Check if the device actually exists.\n"
 msgstr ""
 
-#: src/dialogs.c:3068
+#: src/dialogs.c:3153
 msgid ""
 "\n"
 "This file already has subtitles loaded.\n"
 "Do you wish to overwrite the existing subtitles ?\n"
 msgstr ""
 
-#: src/dialogs.c:3072
+#: src/dialogs.c:3157
 msgid ""
 "\n"
 "LiVES currently only supports subtitles of type .srt and .sub.\n"
 msgstr ""
 
-#: src/dialogs.c:3076
+#: src/dialogs.c:3161
 msgid ""
 "\n"
 "Erase all subtitles from this clip.\n"
 "Are you sure ?\n"
 msgstr ""
 
-#: src/dialogs.c:3082
+#: src/dialogs.c:3168
 #, c-format
 msgid ""
 "\n"
@@ -5226,14 +5241,14 @@
 "or OK to continue and save as type \"%s\"\n"
 msgstr ""
 
-#: src/dialogs.c:3089
+#: src/dialogs.c:3176
 msgid ""
 "\n"
 "Do you wish to move the current clip sets to the new directory ?\n"
 "(If unsure, click Yes)\n"
 msgstr ""
 
-#: src/dialogs.c:3093
+#: src/dialogs.c:3181
 #, c-format
 msgid ""
 "\n"
@@ -5244,19 +5259,19 @@
 "."
 msgstr ""
 
-#: src/dialogs.c:3099
+#: src/dialogs.c:3188
 msgid ""
 "\n"
 "No video input devices could be found.\n"
 msgstr ""
 
-#: src/dialogs.c:3103
+#: src/dialogs.c:3192
 msgid ""
 "\n"
 "All video input devices are already in use.\n"
 msgstr ""
 
-#: src/dialogs.c:3107
+#: src/dialogs.c:3196
 msgid ""
 "\n"
 "\n"
@@ -5264,15 +5279,14 @@
 "DO NOT SHUT DOWN OR CLOSE LIVES !\n"
 msgstr ""
 
-#: src/dialogs.c:3127
+#: src/dialogs.c:3203
 #, c-format
 msgid ""
 "No clips were recovered for set (%s).\n"
 "Please check the spelling of the set name and try again.\n"
 msgstr ""
 
-#. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:3136
+#: src/dialogs.c:3214
 #, c-format
 msgid ""
 "\n"
@@ -5284,7 +5298,7 @@
 msgstr ""
 
 #. TRANSLATORS: make sure the menu text matches what is in gui.c
-#: src/dialogs.c:3144
+#: src/dialogs.c:3222
 #, c-format
 msgid ""
 "\n"
@@ -5293,34 +5307,34 @@
 "\n"
 msgstr ""
 
-#: src/dialogs.c:3150
+#: src/dialogs.c:3228
 msgid ""
 "\n"
 "You must have autolives.pl installed and in your path to use this toy.\n"
 "Consult your package distributor.\n"
 msgstr ""
 
-#: src/dialogs.c:3154
+#: src/dialogs.c:3232
 msgid ""
 "\n"
 "You must have a minimum of one clip loaded to use this toy.\n"
 msgstr ""
 
-#: src/dialogs.c:3158
+#: src/dialogs.c:3236
 msgid ""
 "\n"
 "LiVES lost its connection to jack and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:3162
+#: src/dialogs.c:3240
 msgid ""
 "\n"
 "LiVES lost its connection to pulseaudio and was unable to reconnect.\n"
 "Restarting LiVES is recommended.\n"
 msgstr ""
 
-#: src/dialogs.c:3175
+#: src/dialogs.c:3254
 #, c-format
 msgid ""
 "\n"
@@ -5329,544 +5343,543 @@
 "Do you wish to allow this (for this session only) ?\n"
 msgstr ""
 
-#: src/effects.c:60
+#: src/effects.c:61
 msgid "generator"
 msgstr "生成器"
 
-#: src/effects.c:61
+#: src/effects.c:62
 msgid "Generators"
 msgstr ""
 
-#: src/effects.c:63
+#: src/effects.c:64
 msgid "audio generator"
 msgstr ""
 
-#: src/effects.c:64
+#: src/effects.c:65
 msgid "Audio Generators"
 msgstr ""
 
-#: src/effects.c:66
+#: src/effects.c:67
 msgid "audio/video generator"
 msgstr ""
 
-#: src/effects.c:67
+#: src/effects.c:68
 msgid "Audio/Video Generators"
 msgstr ""
 
-#: src/effects.c:69
+#: src/effects.c:70
 msgid "data generator"
 msgstr ""
 
-#: src/effects.c:70
+#: src/effects.c:71
 msgid "Data Generators"
 msgstr ""
 
-#: src/effects.c:72
+#: src/effects.c:73
 msgid "data visualiser"
 msgstr ""
 
-#: src/effects.c:73
+#: src/effects.c:74
 msgid "Data Visualisers"
 msgstr ""
 
-#: src/effects.c:75
+#: src/effects.c:76
 msgid "data processor"
 msgstr ""
 
-#: src/effects.c:76
+#: src/effects.c:77
 msgid "Data Processors"
 msgstr ""
 
-#: src/effects.c:78
+#: src/effects.c:79
 msgid "data source"
 msgstr ""
 
-#: src/effects.c:79
+#: src/effects.c:80
 msgid "Data Sources"
 msgstr ""
 
-#: src/effects.c:81
+#: src/effects.c:82
 msgid "transition"
 msgstr ""
 
-#: src/effects.c:82
+#: src/effects.c:83
 msgid "Transitions"
 msgstr "过渡"
 
-#: src/effects.c:84
+#: src/effects.c:85
 msgid "effect"
 msgstr "特效"
 
-#: src/effects.c:87 src/rfx-builder.c:187
+#: src/effects.c:88 src/rfx-builder.c:187
 msgid "utility"
 msgstr "工具"
 
-#: src/effects.c:88
+#: src/effects.c:89
 msgid "Utilities"
 msgstr "工具"
 
-#: src/effects.c:90
+#: src/effects.c:91
 msgid "compositor"
 msgstr ""
 
-#: src/effects.c:91
+#: src/effects.c:92
 msgid "Compositors"
 msgstr ""
 
-#: src/effects.c:93
+#: src/effects.c:94
 msgid "tap"
 msgstr ""
 
-#: src/effects.c:94
+#: src/effects.c:95
 msgid "Taps"
 msgstr ""
 
-#: src/effects.c:96
+#: src/effects.c:97
 msgid "splitter"
 msgstr ""
 
-#: src/effects.c:97
+#: src/effects.c:98
 msgid "Splitters"
 msgstr "分隔器"
 
-#: src/effects.c:99
+#: src/effects.c:100
 msgid "converter"
 msgstr ""
 
-#: src/effects.c:100
+#: src/effects.c:101
 msgid "Converters"
 msgstr ""
 
-#: src/effects.c:102
+#: src/effects.c:103
 msgid "analyser"
 msgstr ""
 
-#: src/effects.c:103
+#: src/effects.c:104
 msgid "Analysers"
 msgstr ""
 
-#: src/effects.c:108
+#: src/effects.c:109
 msgid "audio/video"
 msgstr ""
 
-#: src/effects.c:109
+#: src/effects.c:110
 msgid "Audio/Video Transitions"
 msgstr ""
 
-#: src/effects.c:111
+#: src/effects.c:112
 msgid "video only"
 msgstr ""
 
-#: src/effects.c:112
+#: src/effects.c:113
 msgid "Video only Transitions"
 msgstr ""
 
-#: src/effects.c:114 src/multitrack.c:10740
+#: src/effects.c:115 src/multitrack.c:10962
 msgid "audio only"
 msgstr ""
 
-#: src/effects.c:115
+#: src/effects.c:116
 msgid "Audio only Transitions"
 msgstr ""
 
-#: src/effects.c:117 src/effects.c:120 src/multitrack.c:18757
+#: src/effects.c:118 src/effects.c:121 src/multitrack.c:19097
 msgid "audio"
 msgstr "音频"
 
-#: src/effects.c:118
+#: src/effects.c:119
 msgid "Audio Mixers"
 msgstr ""
 
-#: src/effects.c:121
+#: src/effects.c:122
 msgid "Audio Effects"
 msgstr ""
 
-#: src/effects.c:123
+#: src/effects.c:124
 msgid "video"
 msgstr ""
 
-#: src/effects.c:124
+#: src/effects.c:125
 msgid "Video Effects"
 msgstr ""
 
-#: src/effects.c:126
+#: src/effects.c:127
 msgid "audio volume controller"
 msgstr ""
 
-#: src/effects.c:127
+#: src/effects.c:128
 msgid "Audio Volume Controllers"
 msgstr ""
 
-#: src/effects.c:129
+#: src/effects.c:130
 msgid "video analyser"
 msgstr ""
 
-#: src/effects.c:130
+#: src/effects.c:131
 msgid "Video analysers"
 msgstr ""
 
-#: src/effects.c:132
+#: src/effects.c:133
 msgid "audio analyser"
 msgstr ""
 
-#: src/effects.c:133
+#: src/effects.c:134
 msgid "Audio Analysers"
 msgstr ""
 
-#: src/effects.c:137 src/plugins.c:2559 src/plugins.c:2573
+#: src/effects.c:138 src/plugins.c:2507 src/plugins.c:2521
 msgid "unknown"
 msgstr "未知"
 
-#: src/effects.c:238
+#: src/effects.c:235
 #, c-format
 msgid "%s all frames..."
 msgstr ""
 
-#: src/effects.c:243
+#: src/effects.c:239
 #, c-format
 msgid "%s clipboard into frames %d to %d..."
 msgstr ""
 
-#: src/effects.c:250
+#: src/effects.c:245
 #, c-format
 msgid "%s to clipboard..."
 msgstr ""
 
-#: src/effects.c:254
+#: src/effects.c:248
 #, c-format
 msgid "%s to new clip..."
 msgstr ""
 
-#: src/effects.c:259
+#: src/effects.c:252
 #, c-format
 msgid "%s frames %d to %d..."
 msgstr ""
 
-#: src/effects.c:290
+#: src/effects.c:283
 #, c-format
 msgid "%s clipboard with selection"
 msgstr ""
 
-#: src/effects.c:295
+#: src/effects.c:287
 #, c-format
 msgid "%s to clipboard"
 msgstr ""
 
-#: src/effects.c:299
+#: src/effects.c:290
 #, c-format
 msgid "%s to new clip"
 msgstr ""
 
-#: src/effects.c:304
+#: src/effects.c:294
 #, c-format
 msgid "%s frames %d to %d"
 msgstr ""
 
-#: src/effects.c:456 src/effects.c:523
+#: src/effects.c:443 src/effects.c:507
 msgid ""
 "\n"
 "No frames were generated.\n"
 msgstr ""
 
-#: src/effects-weed.c:431
+#: src/effects-weed.c:452
 msgid "integer"
 msgstr ""
 
-#: src/effects-weed.c:432
+#: src/effects-weed.c:454
 msgid "int64"
 msgstr ""
 
-#: src/effects-weed.c:433
+#: src/effects-weed.c:456
 msgid "boolean"
 msgstr ""
 
-#: src/effects-weed.c:434
+#: src/effects-weed.c:458
 msgid "double"
 msgstr ""
 
-#: src/effects-weed.c:435
+#: src/effects-weed.c:460
 msgid "string"
 msgstr ""
 
-#: src/effects-weed.c:436
+#: src/effects-weed.c:462
 msgid "pointer"
 msgstr ""
 
-#: src/effects-weed.c:4591
+#: src/effects-weed.c:4581
 #, c-format
 msgid "Error: plugin %s has no weed_setup() function.\n"
 msgstr ""
 
-#: src/effects-weed.c:4606
+#: src/effects-weed.c:4595
 #, c-format
 msgid "No usable filters found in plugin %s\n"
 msgstr ""
 
-#: src/effects-weed.c:4680
+#: src/effects-weed.c:4668
 #, c-format
 msgid "Found duplicate plugin %s"
 msgstr ""
 
-#: src/effects-weed.c:4734
+#: src/effects-weed.c:4723
 #, c-format
 msgid ""
 "Info: Unable to load plugin %s\n"
 "Error was: %s\n"
 msgstr ""
 
-#: src/effects-weed.c:4737 src/effects-weed.c:5858
+#: src/effects-weed.c:4726 src/effects-weed.c:5847
 msgid "Some plugin directories"
 msgstr ""
 
 #. TRANSLATORS: example " - LADSPA plugins -"
-#: src/effects-weed.c:4812 src/rte_window.c:2105
+#: src/effects-weed.c:4801 src/rte_window.c:2107
 #, c-format
 msgid " - %s plugins -"
 msgstr ""
 
-#: src/effects-weed.c:5012
+#: src/effects-weed.c:4998
 #, c-format
 msgid "Successfully loaded %d Weed filters\n"
 msgstr ""
 
-#: src/effects-weed.c:5177
+#: src/effects-weed.c:5162
 #, c-format
 msgid "Invalid compound effect %s - has conflicting target_fps\n"
 msgstr ""
 
-#: src/effects-weed.c:5197
+#: src/effects-weed.c:5182
 #, c-format
 msgid "Invalid compound effect %s - has multiple transition parameters\n"
 msgstr ""
 
-#: src/effects-weed.c:5211
+#: src/effects-weed.c:5196
 #, c-format
 msgid "Invalid compound effect %s - has multiple master volume parameters\n"
 msgstr ""
 
-#: src/effects-weed.c:5346
+#: src/effects-weed.c:5329
 #, c-format
 msgid "Invalid compound effect %s - must have >1 sub filters\n"
 msgstr ""
 
-#: src/effects-weed.c:5366
+#: src/effects-weed.c:5349
 #, c-format
 msgid "Invalid effect %s found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5381
+#: src/effects-weed.c:5364
 #, c-format
 msgid "Invalid default found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5392
+#: src/effects-weed.c:5375
 #, c-format
 msgid "Invalid filter %d for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5406
+#: src/effects-weed.c:5389
 #, c-format
 msgid "Invalid param %d for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5433
+#: src/effects-weed.c:5416
 #, c-format
 msgid ""
 "Invalid number of values for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5467
+#: src/effects-weed.c:5450
 #, c-format
 msgid ""
 "Invalid non-boolean value for defaults found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5500
+#: src/effects-weed.c:5483
 #, c-format
 msgid "Invalid param link found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5511
+#: src/effects-weed.c:5494
 #, c-format
 msgid ""
 "Invalid out filter %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5529
+#: src/effects-weed.c:5513
 #, c-format
 msgid ""
 "Invalid out param %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5541
+#: src/effects-weed.c:5526
 #, c-format
 msgid ""
 "Invalid non-boolean value for autoscale found in compound effect %s, line "
 "%d\n"
 msgstr ""
 
-#: src/effects-weed.c:5552
+#: src/effects-weed.c:5537
 #, c-format
 msgid ""
 "Invalid in filter %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5566
+#: src/effects-weed.c:5552
 #, c-format
 msgid ""
 "Invalid in param %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5594
+#: src/effects-weed.c:5581
 #, c-format
 msgid "Invalid channel link found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5605
+#: src/effects-weed.c:5592
 #, c-format
 msgid ""
 "Invalid out filter %d for link channels found in compound effect %s, line "
 "%d\n"
 msgstr ""
 
-#: src/effects-weed.c:5623
+#: src/effects-weed.c:5611
 #, c-format
 msgid ""
 "Invalid out channel %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5633
+#: src/effects-weed.c:5622
 #, c-format
 msgid ""
 "Invalid in filter %d for link channels found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5651
+#: src/effects-weed.c:5641
 #, c-format
 msgid ""
 "Invalid in channel %d for link params found in compound effect %s, line %d\n"
 msgstr ""
 
-#: src/effects-weed.c:5687
+#: src/effects-weed.c:5678
 #, c-format
 msgid "Compound:%s"
 msgstr ""
 
-#: src/effects-weed.c:5758
+#: src/effects-weed.c:5749
 #, c-format
 msgid "Successfully loaded %d compound filters\n"
 msgstr ""
 
-#: src/effects-weed.c:6591
+#: src/effects-weed.c:6570
 #, c-format
 msgid "Effect %s cannot be used with this audio player.\n"
 msgstr ""
 
-#: src/effects-weed.c:6737
+#: src/effects-weed.c:6718
 #, c-format
 msgid "Failed to start instance %s, error code %d\n"
 msgstr ""
 
-#: src/effects-weed.c:6814
+#: src/effects-weed.c:6797
 #, c-format
 msgid "Unable to start generator %s\n"
 msgstr ""
 
-#: src/effects-weed.c:7621
+#: src/effects-weed.c:7607
 #, c-format
 msgid "Failed to start generator %s\n"
 msgstr ""
 
-#: src/effects-weed.c:7718
+#: src/effects-weed.c:7701
 #, c-format
 msgid "Failed to start generator %s, error %d\n"
 msgstr ""
 
-#: src/effects-weed.c:9012
+#: src/effects-weed.c:8993
 #, c-format
 msgid "%s [unstable] (%s)"
 msgstr ""
 
-#: src/effects-data.c:3278
+#: src/effects-data.c:3234
 #, c-format
 msgid "ACTIVATE (%s)"
 msgstr ""
 
-#: src/effects-data.c:3548
+#: src/effects-data.c:3501
 msgid "ACTIVATE"
 msgstr ""
 
-#: src/effects-data.c:3876
+#: src/effects-data.c:3829
 #, c-format
 msgid "Key slot %d"
 msgstr ""
 
-#: src/effects-data.c:3998
+#: src/effects-data.c:3951
 msgid "Autoscale"
 msgstr ""
 
-#: src/effects-data.c:4089
+#: src/effects-data.c:4042
 msgid "Add another connection for this output parameter"
 msgstr ""
 
-#: src/effects-data.c:4102 src/effects-data.c:4151
-#, fuzzy
+#: src/effects-data.c:4055 src/effects-data.c:4104
 msgid "Delete this connection"
-msgstr "删除此特效(_D)"
+msgstr ""
 
-#: src/effects-data.c:4138
+#: src/effects-data.c:4091
 msgid "Add another connection for this output channel"
 msgstr ""
 
-#: src/effects-data.c:4223
+#: src/effects-data.c:4176
 msgid "Connected to -->"
 msgstr ""
 
-#: src/effects-data.c:4243
+#: src/effects-data.c:4196
 #, c-format
 msgid "%s - Alpha Channel Connections"
 msgstr ""
 
-#: src/effects-data.c:4316
+#: src/effects-data.c:4269
 #, c-format
 msgid "%s - Parameter Data Connections"
 msgstr ""
 
-#: src/effects-data.c:4336
+#: src/effects-data.c:4289
 msgid "Autoscale All"
 msgstr ""
 
-#: src/effects-data.c:4361 src/effects-data.c:4890
+#: src/effects-data.c:4314 src/effects-data.c:4841
 msgid "ACTIVATED"
 msgstr ""
 
-#: src/effects-data.c:4774
+#: src/effects-data.c:4726
 msgid "LiVES: - Parameter and Alpha Channel Connections"
 msgstr ""
 
-#: src/effects-data.c:4785
+#: src/effects-data.c:4736
 msgid "Auto Connect Channels"
 msgstr ""
 
-#: src/effects-data.c:4797
+#: src/effects-data.c:4748
 msgid "Auto Connect Parameters"
 msgstr ""
 
-#: src/effects-data.c:4807
+#: src/effects-data.c:4758
 msgid "Disconnect All"
 msgstr ""
 
-#: src/effects-data.c:4875
+#: src/effects-data.c:4826
 #, c-format
 msgid "Input channel is already connected from (%d,%d) %s"
 msgstr ""
 
-#: src/effects-data.c:4891
+#: src/effects-data.c:4842
 #, c-format
 msgid "Input parameter is already connected from (%d,%d) %s"
 msgstr ""
 
-#: src/effects-data.c:4899
+#: src/effects-data.c:4851
 msgid "Input and output parameters are not compatible"
 msgstr ""
 
@@ -5878,43 +5891,43 @@
 msgid "_Reset Values"
 msgstr ""
 
-#: src/framedraw.c:267
+#: src/framedraw.c:265
 msgid "_Frame"
 msgstr ""
 
-#: src/paramspecial.c:266
+#: src/paramspecial.c:259
 msgid "Maintain _Aspect Ratio"
 msgstr ""
 
-#: src/paramspecial.c:267
+#: src/paramspecial.c:260
 msgid "Maintain aspect ratio of original frame"
 msgstr ""
 
-#: src/paramspecial.c:341
+#: src/paramspecial.c:335
 msgid "Display Password"
 msgstr ""
 
-#: src/paramwindow.c:450
+#: src/paramwindow.c:447
 msgid "Transition _In"
 msgstr ""
 
-#: src/paramwindow.c:452
+#: src/paramwindow.c:449
 msgid "Click to set the transition parameter to show only the front frame"
 msgstr ""
 
-#: src/paramwindow.c:474
+#: src/paramwindow.c:472
 msgid "Crossfade audio"
 msgstr ""
 
-#: src/paramwindow.c:475
+#: src/paramwindow.c:473
 msgid "Check the box to make audio transition with the video"
 msgstr ""
 
-#: src/paramwindow.c:493
+#: src/paramwindow.c:492
 msgid "Transition _Out"
 msgstr ""
 
-#: src/paramwindow.c:495
+#: src/paramwindow.c:494
 msgid "Click to set the transition parameter to show only the rear frame"
 msgstr ""
 
@@ -5927,23 +5940,23 @@
 msgid "%s : size"
 msgstr ""
 
-#: src/paramwindow.c:598
+#: src/paramwindow.c:597
 msgid "New size (pixels)"
 msgstr ""
 
-#: src/paramwindow.c:617 src/plugins.c:997
+#: src/paramwindow.c:616 src/plugins.c:973
 msgid "_Width"
 msgstr "宽度(_W)"
 
-#: src/paramwindow.c:636 src/plugins.c:1003
+#: src/paramwindow.c:635 src/plugins.c:979
 msgid "_Height"
 msgstr "高度(_H)"
 
-#: src/paramwindow.c:684
+#: src/paramwindow.c:683
 msgid "Generate to _Clipboard"
 msgstr ""
 
-#: src/paramwindow.c:686
+#: src/paramwindow.c:685
 msgid "Generate frames to the clipboard"
 msgstr ""
 
@@ -5955,7 +5968,7 @@
 msgid "Generate frames to a new clip"
 msgstr ""
 
-#: src/paramwindow.c:822
+#: src/paramwindow.c:824
 #, c-format
 msgid ""
 "\n"
@@ -5963,71 +5976,71 @@
 "\n"
 msgstr ""
 
-#: src/paramwindow.c:920 src/paramwindow.c:930
+#: src/paramwindow.c:934 src/paramwindow.c:942
 msgid "Set as default"
 msgstr "设置为默认"
 
-#: src/paramwindow.c:922 src/paramwindow.c:938
+#: src/paramwindow.c:936 src/paramwindow.c:950
 msgid "Reset"
 msgstr ""
 
-#: src/paramwindow.c:932 src/rte_window.c:2401 src/omc-learn.c:1357
+#: src/paramwindow.c:944 src/rte_window.c:2394 src/omc-learn.c:1347
 msgid "Close _window"
 msgstr "关闭窗口(_W)"
 
-#: src/paramwindow.c:1337
+#: src/paramwindow.c:1340
 msgid "No parameters"
 msgstr ""
 
-#: src/paramwindow.c:1419
+#: src/paramwindow.c:1424
 msgid "Invalid parameter"
 msgstr "无效参数"
 
-#: src/paramwindow.c:1611
+#: src/paramwindow.c:1610
 msgid "LiVES: - Select Colour"
 msgstr ""
 
-#: src/paramwindow.c:1616
+#: src/paramwindow.c:1615
 msgid "Click to set the colour"
 msgstr ""
 
-#: src/paramwindow.c:1628
+#: src/paramwindow.c:1626
 msgid "_Red"
 msgstr ""
 
-#: src/paramwindow.c:1629
+#: src/paramwindow.c:1627
 msgid "The red value (0 - 255)"
 msgstr ""
 
-#: src/paramwindow.c:1632
+#: src/paramwindow.c:1630
 msgid "_Green"
 msgstr ""
 
-#: src/paramwindow.c:1633
+#: src/paramwindow.c:1631
 msgid "The green value (0 - 255)"
 msgstr ""
 
-#: src/paramwindow.c:1636
+#: src/paramwindow.c:1634
 msgid "_Blue"
 msgstr ""
 
-#: src/paramwindow.c:1637
+#: src/paramwindow.c:1635
 msgid "The blue value (0 - 255)"
 msgstr ""
 
-#: src/plugins.c:85
+#: src/plugins.c:86
 #, c-format
 msgid ""
 "\n"
 "Plugin error: %s failed with code %d"
 msgstr ""
 
-#: src/plugins.c:87
+#: src/plugins.c:88
 #, c-format
 msgid " : message was %s\n"
 msgstr ""
 
-#: src/plugins.c:387
+#: src/plugins.c:375
 #, c-format
 msgid ""
 "\n"
@@ -6037,17 +6050,17 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/plugins.c:397
+#: src/plugins.c:385
 #, c-format
 msgid "Updating video playback plugin defaults in %s\n"
 msgstr ""
 
-#: src/plugins.c:452
+#: src/plugins.c:444
 #, c-format
 msgid "Loading video playback plugin defaults from %s..."
 msgstr ""
 
-#: src/plugins.c:515
+#: src/plugins.c:505
 #, c-format
 msgid ""
 "\n"
@@ -6057,32 +6070,32 @@
 "\n"
 msgstr ""
 
-#: src/plugins.c:855
+#: src/plugins.c:836
 #, c-format
 msgid "Saving playback plugin defaults to %s..."
 msgstr ""
 
-#: src/plugins.c:962
+#: src/plugins.c:939
 msgid "_FPS"
 msgstr ""
 
-#: src/plugins.c:963
+#: src/plugins.c:940
 msgid "Fixed framerate for plugin.\n"
 msgstr ""
 
-#: src/plugins.c:1032
+#: src/plugins.c:1008
 msgid "_Colourspace"
 msgstr ""
 
-#: src/plugins.c:1033
+#: src/plugins.c:1009
 msgid "Colourspace input to the plugin.\n"
 msgstr ""
 
-#: src/plugins.c:1089
+#: src/plugins.c:1065
 msgid "Save settings to an alternate file.\n"
 msgstr ""
 
-#: src/plugins.c:1206
+#: src/plugins.c:1182
 #, c-format
 msgid ""
 "\n"
@@ -6091,7 +6104,7 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/plugins.c:1252
+#: src/plugins.c:1228
 #, c-format
 msgid ""
 "\n"
@@ -6101,38 +6114,38 @@
 "Unable to use it.\n"
 msgstr ""
 
-#: src/plugins.c:1265
+#: src/plugins.c:1241
 #, c-format
 msgid ""
 "Video playback plugin failed to initialise.\n"
 "Error was: %s\n"
 msgstr ""
 
-#: src/plugins.c:1461
+#: src/plugins.c:1428
 msgid ""
 "\n"
 "Warning ! Video playback plugin will not send key presses. Keyboard may be "
 "disabled during plugin use !\n"
 msgstr ""
 
-#: src/plugins.c:1465
+#: src/plugins.c:1433
 #, c-format
 msgid ""
 "*** Using %s plugin for fs playback, agreed to use palette type %d ( %s ). "
 "***\n"
 msgstr ""
 
-#: src/plugins.c:1571
+#: src/plugins.c:1537
 #, c-format
 msgid "Audio stream unable to use preferred format '%s'\n"
 msgstr ""
 
-#: src/plugins.c:1579
+#: src/plugins.c:1543
 #, c-format
 msgid "Using format '%s' instead.\n"
 msgstr ""
 
-#: src/plugins.c:1616
+#: src/plugins.c:1579
 #, c-format
 msgid ""
 "LiVES was unable to find its encoder plugins. Please make sure you have the "
@@ -6141,7 +6154,7 @@
 "or change the value of <lib_dir> in %s\n"
 msgstr ""
 
-#: src/plugins.c:1624
+#: src/plugins.c:1589
 #, c-format
 msgid ""
 "LiVES did not receive a response from the encoder plugin called '%s'.\n"
@@ -6150,11 +6163,11 @@
 "or switch to another plugin using Tools|Preferences|Encoding\n"
 msgstr ""
 
-#: src/plugins.c:2032
+#: src/plugins.c:1987
 msgid "Unable to resize, please install imageMagick\n"
 msgstr ""
 
-#: src/plugins.c:2231
+#: src/plugins.c:2183
 #, c-format
 msgid ""
 "\n"
@@ -6162,12 +6175,12 @@
 "No decoders found in %s !\n"
 msgstr ""
 
-#: src/plugins.c:2415
-#, fuzzy, c-format
+#: src/plugins.c:2369
+#, c-format
 msgid " using %s"
-msgstr "正在打开 %s"
+msgstr ""
 
-#: src/plugins.c:2499
+#: src/plugins.c:2451
 #, c-format
 msgid ""
 "\n"
@@ -6176,7 +6189,7 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/plugins.c:2522
+#: src/plugins.c:2472
 #, c-format
 msgid ""
 "\n"
@@ -6186,24 +6199,24 @@
 "Unable to use it.\n"
 msgstr ""
 
-#: src/plugins.c:2564
+#: src/plugins.c:2512
 msgid "/unknown"
 msgstr ""
 
-#: src/plugins.c:2651
+#: src/plugins.c:2598
 msgid "LiVES: - Decoder Plugins"
 msgstr ""
 
-#: src/plugins.c:2669
+#: src/plugins.c:2616
 msgid "Enabled Video Decoders (uncheck to disable)"
 msgstr ""
 
-#: src/plugins.c:2726
+#: src/plugins.c:2672
 #, c-format
 msgid "Failed to load %s, transitions may not resize.\n"
 msgstr ""
 
-#: src/plugins.c:3854
+#: src/plugins.c:3797
 #, c-format
 msgid "%s advanced settings"
 msgstr ""
@@ -6212,15 +6225,15 @@
 msgid "LiVES: - New Test RFX"
 msgstr ""
 
-#: src/rfx-builder.c:136
+#: src/rfx-builder.c:135
 msgid "LiVES: - Edit Test RFX"
 msgstr ""
 
-#: src/rfx-builder.c:166
+#: src/rfx-builder.c:165
 msgid "Type:"
 msgstr "类型:"
 
-#: src/rfx-builder.c:184
+#: src/rfx-builder.c:183
 msgid "tool"
 msgstr ""
 
@@ -6232,130 +6245,130 @@
 msgid "The name of the plugin. No spaces allowed."
 msgstr ""
 
-#: src/rfx-builder.c:201
+#: src/rfx-builder.c:202
 msgid "Version:       "
 msgstr ""
 
-#: src/rfx-builder.c:203
+#: src/rfx-builder.c:204
 msgid "The script version."
 msgstr ""
 
-#: src/rfx-builder.c:210
+#: src/rfx-builder.c:212
 msgid "    Author:       "
 msgstr ""
 
-#: src/rfx-builder.c:211
+#: src/rfx-builder.c:213
 msgid "The script author."
 msgstr ""
 
-#: src/rfx-builder.c:217
+#: src/rfx-builder.c:220
 msgid "    URL (optional):       "
 msgstr ""
 
-#: src/rfx-builder.c:218
+#: src/rfx-builder.c:221
 msgid "URL for the plugin maintainer."
 msgstr ""
 
-#: src/rfx-builder.c:226
+#: src/rfx-builder.c:230
 msgid "Menu text:    "
 msgstr ""
 
-#: src/rfx-builder.c:227
+#: src/rfx-builder.c:231
 msgid "The text to show in the menu."
 msgstr ""
 
-#: src/rfx-builder.c:239
+#: src/rfx-builder.c:244
 msgid "Action description:        "
 msgstr ""
 
-#: src/rfx-builder.c:241
+#: src/rfx-builder.c:246
 msgid "Describe what the plugin is doing. E.g. \"Edge detecting\""
 msgstr ""
 
-#: src/rfx-builder.c:246
+#: src/rfx-builder.c:251
 msgid "Minimum frames:"
 msgstr ""
 
-#: src/rfx-builder.c:249
+#: src/rfx-builder.c:254
 msgid ""
 "Minimum number of frames this effect/tool can be applied to. Normally 1."
 msgstr ""
 
-#: src/rfx-builder.c:260
+#: src/rfx-builder.c:265
 msgid "_Requirements..."
 msgstr ""
 
-#: src/rfx-builder.c:263
+#: src/rfx-builder.c:268
 msgid "Enter any binaries required by the plugin."
 msgstr ""
 
-#: src/rfx-builder.c:267
+#: src/rfx-builder.c:272
 msgid "_Properties..."
 msgstr "文档选项(_P)..."
 
-#: src/rfx-builder.c:270
+#: src/rfx-builder.c:275
 msgid "Set properties for the plugin. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:274
+#: src/rfx-builder.c:279
 msgid "_Parameters..."
 msgstr ""
 
-#: src/rfx-builder.c:277
+#: src/rfx-builder.c:282
 msgid "Set up parameters used in pre/loop/post/trigger code. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:281
+#: src/rfx-builder.c:286
 msgid "Parameter _Window Hints..."
 msgstr ""
 
-#: src/rfx-builder.c:284
+#: src/rfx-builder.c:289
 msgid "Set hints about how to lay out the parameter window. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:290
+#: src/rfx-builder.c:295
 msgid "_Language code:"
 msgstr ""
 
-#: src/rfx-builder.c:291
+#: src/rfx-builder.c:296
 msgid "Language for pre/loop/post/triggers. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:300
+#: src/rfx-builder.c:305
 msgid "_Pre loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:303
+#: src/rfx-builder.c:308
 msgid "Code to be executed before the loop. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:307
+#: src/rfx-builder.c:312
 msgid "_Loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:310
+#: src/rfx-builder.c:315
 msgid "Loop code to be applied to each frame."
 msgstr ""
 
-#: src/rfx-builder.c:314
+#: src/rfx-builder.c:319
 msgid "_Post loop code..."
 msgstr ""
 
-#: src/rfx-builder.c:317
+#: src/rfx-builder.c:322
 msgid "Code to be executed after the loop. Optional."
 msgstr ""
 
-#: src/rfx-builder.c:321
+#: src/rfx-builder.c:326
 msgid "_Trigger code..."
 msgstr ""
 
-#: src/rfx-builder.c:324
+#: src/rfx-builder.c:329
 msgid ""
 "Set trigger code for when the parameter window is shown, or when a parameter "
 "is changed. Optional (except for Utilities)."
 msgstr ""
 
-#: src/rfx-builder.c:421
+#: src/rfx-builder.c:426
 #, c-format
 msgid ""
 "\n"
@@ -6365,55 +6378,55 @@
 "%s\n"
 msgstr ""
 
-#: src/rfx-builder.c:544
+#: src/rfx-builder.c:541
 msgid "LiVES: - RFX Requirements"
 msgstr ""
 
-#: src/rfx-builder.c:548
+#: src/rfx-builder.c:544
 msgid "LiVES: - RFX Parameters"
 msgstr ""
 
-#: src/rfx-builder.c:552
+#: src/rfx-builder.c:547
 msgid "LiVES: - RFX Parameter Window Hints"
 msgstr ""
 
-#: src/rfx-builder.c:556
+#: src/rfx-builder.c:550
 msgid "LiVES: - RFX Triggers"
 msgstr ""
 
-#: src/rfx-builder.c:622
+#: src/rfx-builder.c:613
 msgid "_New Entry"
 msgstr "新条目(_N)"
 
-#: src/rfx-builder.c:625
+#: src/rfx-builder.c:616
 msgid "_Edit Entry"
 msgstr ""
 
-#: src/rfx-builder.c:628
+#: src/rfx-builder.c:619
 msgid "_Remove Entry"
 msgstr "删除条目(_R)"
 
-#: src/rfx-builder.c:632
+#: src/rfx-builder.c:623
 msgid "Move _Up"
 msgstr "向上移动(_U)"
 
-#: src/rfx-builder.c:635
+#: src/rfx-builder.c:626
 msgid "Move _Down"
 msgstr "向下移动(_D)"
 
-#: src/rfx-builder.c:1004
+#: src/rfx-builder.c:984
 msgid "LiVES: - RFX Properties"
 msgstr ""
 
-#: src/rfx-builder.c:1013
+#: src/rfx-builder.c:993
 msgid "_Slow (hint to GUI)"
 msgstr ""
 
-#: src/rfx-builder.c:1024
+#: src/rfx-builder.c:1004
 msgid "_Batch mode generator"
 msgstr ""
 
-#: src/rfx-builder.c:1831
+#: src/rfx-builder.c:1790
 msgid ""
 "\n"
 "\n"
@@ -6422,7 +6435,7 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:1875
+#: src/rfx-builder.c:1834
 msgid ""
 "\n"
 "\n"
@@ -6430,219 +6443,219 @@
 "Please check the trigger code.\n"
 msgstr ""
 
-#: src/rfx-builder.c:1994
+#: src/rfx-builder.c:1950
 msgid "LiVES: - New RFX Parameter"
 msgstr ""
 
-#: src/rfx-builder.c:1997
+#: src/rfx-builder.c:1952
 msgid "LiVES: - Edit RFX Parameter"
 msgstr ""
 
-#: src/rfx-builder.c:2013
+#: src/rfx-builder.c:1968
 msgid "_Name:    "
 msgstr ""
 
-#: src/rfx-builder.c:2016
+#: src/rfx-builder.c:1971
 msgid "Name of the parameter, must be unique in the plugin."
 msgstr ""
 
-#: src/rfx-builder.c:2025
+#: src/rfx-builder.c:1981
 msgid "_Label:    "
 msgstr ""
 
-#: src/rfx-builder.c:2028
+#: src/rfx-builder.c:1984
 msgid ""
 "Label to be shown by the parameter. An underscore represents mnemonic "
 "accelerator."
 msgstr ""
 
-#: src/rfx-builder.c:2039
+#: src/rfx-builder.c:1996
 msgid "_Type:         "
 msgstr ""
 
-#: src/rfx-builder.c:2040
+#: src/rfx-builder.c:1997
 msgid "Parameter type (select from list)."
 msgstr ""
 
-#: src/rfx-builder.c:2073
+#: src/rfx-builder.c:2029
 msgid "Decimal _places: "
 msgstr ""
 
-#: src/rfx-builder.c:2082 src/rfx-builder.c:2477 src/rfx-builder.c:2495
+#: src/rfx-builder.c:2038 src/rfx-builder.c:2430 src/rfx-builder.c:2447
 msgid "_Default value:    "
 msgstr ""
 
-#: src/rfx-builder.c:2098
+#: src/rfx-builder.c:2054
 msgid "_Default: "
 msgstr ""
 
-#: src/rfx-builder.c:2132
+#: src/rfx-builder.c:2087
 msgid "Button _Group: "
 msgstr ""
 
-#: src/rfx-builder.c:2134
+#: src/rfx-builder.c:2089
 msgid "A non-zero value can be used to group radio buttons."
 msgstr ""
 
-#: src/rfx-builder.c:2142 src/rfx-builder.c:2478
+#: src/rfx-builder.c:2097 src/rfx-builder.c:2431
 msgid "_Minimum value: "
 msgstr ""
 
-#: src/rfx-builder.c:2148 src/rfx-builder.c:2479
+#: src/rfx-builder.c:2103 src/rfx-builder.c:2432
 msgid "Ma_ximum value: "
 msgstr ""
 
-#: src/rfx-builder.c:2157
+#: src/rfx-builder.c:2113
 msgid "     _Step size:   "
 msgstr ""
 
-#: src/rfx-builder.c:2160
+#: src/rfx-builder.c:2117
 msgid ""
 "How much the parameter is adjusted when the spinbutton arrows are pressed."
 msgstr ""
 
-#: src/rfx-builder.c:2171
+#: src/rfx-builder.c:2129
 msgid "_Wrap value"
 msgstr ""
 
-#: src/rfx-builder.c:2172
+#: src/rfx-builder.c:2131
 msgid "Whether the value wraps max->min and min->max."
 msgstr ""
 
-#: src/rfx-builder.c:2470
+#: src/rfx-builder.c:2424
 msgid "Set _values"
 msgstr ""
 
-#: src/rfx-builder.c:2512
+#: src/rfx-builder.c:2463
 msgid "Default _Red:  "
 msgstr ""
 
-#: src/rfx-builder.c:2513
+#: src/rfx-builder.c:2464
 msgid "Default _Green:"
 msgstr ""
 
-#: src/rfx-builder.c:2514
+#: src/rfx-builder.c:2465
 msgid "Default _Blue: "
 msgstr ""
 
-#: src/rfx-builder.c:2538
+#: src/rfx-builder.c:2488
 msgid "Set _default"
 msgstr ""
 
-#: src/rfx-builder.c:2540
+#: src/rfx-builder.c:2490
 msgid "Default value:  "
 msgstr ""
 
-#: src/rfx-builder.c:2541
+#: src/rfx-builder.c:2491
 msgid "Maximum length (chars): "
 msgstr ""
 
-#: src/rfx-builder.c:2576
+#: src/rfx-builder.c:2526
 msgid "LiVES: - New RFX Parameter Window Hint"
 msgstr ""
 
-#: src/rfx-builder.c:2579
+#: src/rfx-builder.c:2528
 msgid "LiVES: - Edit RFX Parameter Window Hint"
 msgstr ""
 
-#: src/rfx-builder.c:2622
+#: src/rfx-builder.c:2569
 msgid "_Keyword:         "
 msgstr ""
 
-#: src/rfx-builder.c:2639
+#: src/rfx-builder.c:2586
 msgid "Special _Type:         "
 msgstr ""
 
-#: src/rfx-builder.c:2656
+#: src/rfx-builder.c:2602
 msgid "Special _Subtype:         "
 msgstr ""
 
-#: src/rfx-builder.c:2667 src/rfx-builder.c:2706
+#: src/rfx-builder.c:2613 src/rfx-builder.c:2651
 msgid "Row:    "
 msgstr ""
 
-#: src/rfx-builder.c:2732
+#: src/rfx-builder.c:2676
 #, c-format
 msgid "Linked parameters (%d):    "
 msgstr ""
 
-#: src/rfx-builder.c:2749
+#: src/rfx-builder.c:2693
 msgid "Linked parameters (4):    "
 msgstr ""
 
-#: src/rfx-builder.c:2752
+#: src/rfx-builder.c:2695
 msgid "Linked parameters (2):    "
 msgstr ""
 
-#: src/rfx-builder.c:2777
+#: src/rfx-builder.c:2720
 msgid "LiVES: - New RFX Trigger"
 msgstr ""
 
-#: src/rfx-builder.c:2780
+#: src/rfx-builder.c:2722
 msgid "LiVES: - Edit RFX Trigger"
 msgstr ""
 
-#: src/rfx-builder.c:2808
+#: src/rfx-builder.c:2750
 msgid "When:         "
 msgstr ""
 
-#: src/rfx-builder.c:2904
+#: src/rfx-builder.c:2846
 msgid "LiVES: - Pre Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:2911
+#: src/rfx-builder.c:2853
 msgid "LiVES: - Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:2918
+#: src/rfx-builder.c:2860
 msgid "LiVES: - Post Loop Code"
 msgstr ""
 
-#: src/rfx-builder.c:2931
+#: src/rfx-builder.c:2873
 #, c-format
 msgid "LiVES: - Default text (max length %d)"
 msgstr ""
 
-#: src/rfx-builder.c:2944
+#: src/rfx-builder.c:2885
 msgid "LiVES: - Enter values, one per line"
 msgstr ""
 
-#: src/rfx-builder.c:3055
+#: src/rfx-builder.c:2996
 msgid ""
 "\n"
 "\n"
 "Name must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3060
+#: src/rfx-builder.c:3001
 msgid ""
 "\n"
 "\n"
 "Name must not contain spaces.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3065
+#: src/rfx-builder.c:3006
 msgid ""
 "\n"
 "\n"
 "Menu text must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3071
+#: src/rfx-builder.c:3012
 msgid ""
 "\n"
 "\n"
 "Action description must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3076
+#: src/rfx-builder.c:3017
 msgid ""
 "\n"
 "\n"
 "Author must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3085 src/rfx-builder.c:4339
+#: src/rfx-builder.c:3026 src/rfx-builder.c:4253
 msgid ""
 "\n"
 "\n"
@@ -6650,28 +6663,28 @@
 "Name must be unique.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3092
+#: src/rfx-builder.c:3033
 msgid ""
 "\n"
 "\n"
 "Loop code should not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3098
+#: src/rfx-builder.c:3039
 msgid ""
 "\n"
 "\n"
 "Trigger code should not be blank for a utility.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3111
+#: src/rfx-builder.c:3052
 msgid ""
 "\n"
 "\n"
 "Parameter name must not be blank.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3117
+#: src/rfx-builder.c:3058
 msgid ""
 "\n"
 "\n"
@@ -6680,41 +6693,41 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:3171
+#: src/rfx-builder.c:3111
 #, c-format
 msgid "Writing script file %s..."
 msgstr ""
 
-#: src/rfx-builder.c:3477
+#: src/rfx-builder.c:3411
 msgid "No <define> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3484 src/rfx-builder.c:3493
+#: src/rfx-builder.c:3418 src/rfx-builder.c:3427
 msgid "Bad script version.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3505
+#: src/rfx-builder.c:3439
 msgid "No <name> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3513
+#: src/rfx-builder.c:3447
 msgid "No <version> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3522
+#: src/rfx-builder.c:3456
 msgid "No <author> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3536
+#: src/rfx-builder.c:3470
 msgid "No <description> section found in script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3540
+#: src/rfx-builder.c:3474
 #, c-format
 msgid "Bad description. (%s)\n"
 msgstr ""
 
-#: src/rfx-builder.c:3702
+#: src/rfx-builder.c:3627
 #, c-format
 msgid ""
 "\n"
@@ -6724,27 +6737,27 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:3859
+#: src/rfx-builder.c:3780
 msgid "Rebuilding all RFX scripts...builtin..."
 msgstr ""
 
-#: src/rfx-builder.c:3860
+#: src/rfx-builder.c:3781
 msgid "Rebuilding scripts"
 msgstr ""
 
-#: src/rfx-builder.c:3868
+#: src/rfx-builder.c:3789
 msgid "custom..."
 msgstr ""
 
-#: src/rfx-builder.c:3872
+#: src/rfx-builder.c:3793
 msgid "test..."
 msgstr ""
 
-#: src/rfx-builder.c:3878
+#: src/rfx-builder.c:3799
 msgid "rebuilding dynamic menu entries..."
 msgstr ""
 
-#: src/rfx-builder.c:3905 src/rfx-builder.c:3912
+#: src/rfx-builder.c:3826 src/rfx-builder.c:3834
 #, c-format
 msgid ""
 "\n"
@@ -6753,7 +6766,7 @@
 "Please check this program is in your path and executable.\n"
 msgstr ""
 
-#: src/rfx-builder.c:3951
+#: src/rfx-builder.c:3874
 #, c-format
 msgid ""
 "\n"
@@ -6763,12 +6776,12 @@
 "\n"
 msgstr ""
 
-#: src/rfx-builder.c:3960
+#: src/rfx-builder.c:3884
 #, c-format
 msgid "Deleting rfx script %s..."
 msgstr ""
 
-#: src/rfx-builder.c:3980
+#: src/rfx-builder.c:3902
 #, c-format
 msgid ""
 "\n"
@@ -6778,7 +6791,7 @@
 "Error code was %d\n"
 msgstr ""
 
-#: src/rfx-builder.c:4016
+#: src/rfx-builder.c:3938
 #, c-format
 msgid ""
 "\n"
@@ -6788,12 +6801,12 @@
 "Please delete it first, or rename the test script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4027
+#: src/rfx-builder.c:3950
 #, c-format
 msgid "Promoting rfx test plugin %s to custom..."
 msgstr ""
 
-#: src/rfx-builder.c:4044
+#: src/rfx-builder.c:3965
 #, c-format
 msgid ""
 "\n"
@@ -6804,20 +6817,20 @@
 "Return code was %d (%s)\n"
 msgstr ""
 
-#: src/rfx-builder.c:4070
+#: src/rfx-builder.c:3990
 msgid "LiVES: - Export Script to..."
 msgstr ""
 
-#: src/rfx-builder.c:4077 src/rfx-builder.c:4156
+#: src/rfx-builder.c:3997 src/rfx-builder.c:4074
 #, c-format
 msgid "Copying %s to %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4105
+#: src/rfx-builder.c:4024
 msgid "LiVES: Import Script from..."
 msgstr ""
 
-#: src/rfx-builder.c:4148
+#: src/rfx-builder.c:4067
 #, c-format
 msgid ""
 "\n"
@@ -6827,43 +6840,43 @@
 "Please delete it first, or rename the import script.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4249
+#: src/rfx-builder.c:4166
 msgid "LiVES: - Copy RFX Script"
 msgstr ""
 
-#: src/rfx-builder.c:4251
+#: src/rfx-builder.c:4168
 msgid "_From type:    "
 msgstr ""
 
-#: src/rfx-builder.c:4258
+#: src/rfx-builder.c:4175
 msgid "   Script:    "
 msgstr ""
 
-#: src/rfx-builder.c:4267
+#: src/rfx-builder.c:4183
 msgid "LiVES: - Rename test RFX Script"
 msgstr ""
 
-#: src/rfx-builder.c:4268
+#: src/rfx-builder.c:4184
 msgid "From script: "
 msgstr ""
 
-#: src/rfx-builder.c:4273
+#: src/rfx-builder.c:4188
 msgid "LiVES: - RFX Script name"
 msgstr ""
 
-#: src/rfx-builder.c:4274
+#: src/rfx-builder.c:4189
 msgid "Script name: "
 msgstr ""
 
-#: src/rfx-builder.c:4294
+#: src/rfx-builder.c:4209
 msgid "New name: "
 msgstr ""
 
-#: src/rfx-builder.c:4297
+#: src/rfx-builder.c:4212
 msgid "New script name: "
 msgstr ""
 
-#: src/rfx-builder.c:4372
+#: src/rfx-builder.c:4286
 msgid ""
 "\n"
 "\n"
@@ -6871,12 +6884,12 @@
 "Script name must be unique.\n"
 msgstr ""
 
-#: src/rfx-builder.c:4384
+#: src/rfx-builder.c:4297
 #, c-format
 msgid "Renaming RFX test script %s to %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4390
+#: src/rfx-builder.c:4302
 #, c-format
 msgid ""
 "\n"
@@ -6887,21 +6900,21 @@
 "Return code was %d\n"
 msgstr ""
 
-#: src/rfx-builder.c:4610
+#: src/rfx-builder.c:4518
 msgid "_Apply Real Time Effects to Selection"
 msgstr ""
 
-#: src/rfx-builder.c:4664
+#: src/rfx-builder.c:4572
 #, c-format
 msgid "Loading rendered effect %s..."
 msgstr ""
 
-#: src/rfx-builder.c:4766
+#: src/rfx-builder.c:4674
 msgid ""
 "See: VJ - show VJ keys. Set the realtime effects, and then apply them here."
 msgstr ""
 
-#: src/preferences.c:359
+#: src/preferences.c:351
 msgid ""
 "\n"
 "\n"
@@ -6909,7 +6922,7 @@
 "full screen, separate window (fs) mode\n"
 msgstr ""
 
-#: src/preferences.c:408
+#: src/preferences.c:400
 msgid ""
 "\n"
 "\n"
@@ -6917,7 +6930,7 @@
 "(Free space = UNKNOWN)"
 msgstr ""
 
-#: src/preferences.c:412
+#: src/preferences.c:403
 #, c-format
 msgid ""
 "\n"
@@ -6926,14 +6939,14 @@
 "(Free space = %s)"
 msgstr ""
 
-#: src/preferences.c:416
+#: src/preferences.c:408
 msgid ""
 "The temp directory is LiVES working directory where opened clips and sets "
 "are stored.\n"
 "It should be in a partition with plenty of free disk space.\n"
 msgstr ""
 
-#: src/preferences.c:784
+#: src/preferences.c:839
 #, c-format
 msgid ""
 "Unable to create or write to the new temporary directory.\n"
@@ -6944,7 +6957,7 @@
 "The directory will not be changed now.\n"
 msgstr ""
 
-#: src/preferences.c:786
+#: src/preferences.c:843
 #, c-format
 msgid ""
 "Unable to create or write to the new temporary directory.\n"
@@ -6954,7 +6967,7 @@
 "The directory will not be changed now.\n"
 msgstr ""
 
-#: src/preferences.c:798
+#: src/preferences.c:856
 msgid ""
 "You have chosen to change the temporary directory.\n"
 "Please make sure you have no other copies of LiVES open.\n"
@@ -6966,20 +6979,20 @@
 "original setting."
 msgstr ""
 
-#: src/preferences.c:1169
+#: src/preferences.c:1221
 msgid ""
 "\n"
 "Unable to switch audio players to jack - jackd must be installed first.\n"
 "See http://jackaudio.org\n"
 msgstr ""
 
-#: src/preferences.c:1175
+#: src/preferences.c:1226
 msgid ""
 "\n"
 "Switching audio players requires restart (jackd must not be running)\n"
 msgstr ""
 
-#: src/preferences.c:1202
+#: src/preferences.c:1253
 msgid ""
 "\n"
 "Unable to switch audio players to pulse audio\n"
@@ -6987,815 +7000,815 @@
 "See http://www.pulseaudio.org\n"
 msgstr ""
 
-#: src/preferences.c:1502
+#: src/preferences.c:1544
 msgid "PCM (highest quality; largest files)"
 msgstr ""
 
-#: src/preferences.c:2063
+#: src/preferences.c:2096
 msgid "LiVES: - Preferences"
 msgstr ""
 
-#: src/preferences.c:2142
+#: src/preferences.c:2177
 msgid "Open file selection maximised"
 msgstr ""
 
-#: src/preferences.c:2149
+#: src/preferences.c:2184
 msgid "Show recent files in the File menu"
 msgstr ""
 
-#: src/preferences.c:2158
+#: src/preferences.c:2193
 msgid "Stop screensaver on playback    "
 msgstr ""
 
-#: src/preferences.c:2165
+#: src/preferences.c:2200
 msgid "Open main window maximised"
 msgstr ""
 
-#: src/preferences.c:2173
+#: src/preferences.c:2208
 msgid "Show toolbar when background is blanked"
 msgstr ""
 
-#: src/preferences.c:2181
+#: src/preferences.c:2216
 msgid "Allow mouse wheel to switch clips"
 msgstr ""
 
-#: src/preferences.c:2192
+#: src/preferences.c:2227
 msgid "Shrink previews to fit in interface"
 msgstr ""
 
-#: src/preferences.c:2202
+#: src/preferences.c:2237
 msgid "Startup mode:"
 msgstr ""
 
-#: src/preferences.c:2206
+#: src/preferences.c:2241
 msgid "_Clip editor"
 msgstr ""
 
-#: src/preferences.c:2210
+#: src/preferences.c:2245
 msgid "_Multitrack mode"
 msgstr ""
 
-#: src/preferences.c:2234
+#: src/preferences.c:2268
 msgid "Multi-head support"
 msgstr ""
 
-#: src/preferences.c:2242
+#: src/preferences.c:2276
 msgid " monitor number for LiVES interface"
 msgstr ""
 
-#: src/preferences.c:2248
+#: src/preferences.c:2282
 msgid " monitor number for playback"
 msgstr ""
 
-#: src/preferences.c:2260
+#: src/preferences.c:2294
 msgid ""
 "A setting of 0 means use all available monitors (only works with some "
 "playback plugins)."
 msgstr ""
 
-#: src/preferences.c:2270
+#: src/preferences.c:2304
 msgid "Force single monitor"
 msgstr ""
 
-#: src/preferences.c:2271
+#: src/preferences.c:2305
 msgid "Ignore all except the first monitor."
 msgstr ""
 
-#: src/preferences.c:2293
+#: src/preferences.c:2327
 msgid "Show clip thumbnails during playback"
 msgstr ""
 
-#: src/preferences.c:2306
+#: src/preferences.c:2340
 msgid "GUI"
 msgstr "GUI"
 
-#: src/preferences.c:2321
+#: src/preferences.c:2355
 msgid "When entering Multitrack mode:"
 msgstr ""
 
-#: src/preferences.c:2330
+#: src/preferences.c:2364
 msgid "_Prompt me for width, height, fps and audio settings"
 msgstr ""
 
-#: src/preferences.c:2336
+#: src/preferences.c:2370
 msgid "_Always use the following values:"
 msgstr ""
 
-#: src/preferences.c:2345
+#: src/preferences.c:2379
 msgid "Use these same _values for rendering a new clip"
 msgstr ""
 
-#: src/preferences.c:2370
+#: src/preferences.c:2404
 msgid "_Width           "
 msgstr ""
 
-#: src/preferences.c:2375
+#: src/preferences.c:2409
 msgid "          _Height      "
 msgstr ""
 
-#: src/preferences.c:2379
+#: src/preferences.c:2413
 msgid "          _FPS"
 msgstr ""
 
-#: src/preferences.c:2387
+#: src/preferences.c:2421
 msgid "Enable backing audio track"
 msgstr ""
 
-#: src/preferences.c:2394
+#: src/preferences.c:2428
 msgid "Audio track per video track"
 msgstr ""
 
-#: src/preferences.c:2423
+#: src/preferences.c:2457
 msgid "    _Undo buffer size (MB)    "
 msgstr ""
 
-#: src/preferences.c:2432
+#: src/preferences.c:2466
 msgid "_Exit multitrack mode after rendering"
 msgstr ""
 
-#: src/preferences.c:2440
+#: src/preferences.c:2474
 msgid "Auto backup layouts"
 msgstr ""
 
-#: src/preferences.c:2445
+#: src/preferences.c:2479
 msgid "_Every"
 msgstr ""
 
-#: src/preferences.c:2453
+#: src/preferences.c:2487
 msgid "seconds"
 msgstr "秒"
 
-#: src/preferences.c:2461
+#: src/preferences.c:2495
 msgid "After every _change"
 msgstr ""
 
-#: src/preferences.c:2467
+#: src/preferences.c:2501
 msgid "_Never"
 msgstr "从不(_N)"
 
-#: src/preferences.c:2490
+#: src/preferences.c:2523
 msgid "Multitrack/Render"
 msgstr ""
 
-#: src/preferences.c:2508
+#: src/preferences.c:2541
 msgid "Use instant opening when possible"
 msgstr ""
 
-#: src/preferences.c:2509
+#: src/preferences.c:2543
 msgid "Enable instant opening of some file types using decoder plugins"
 msgstr ""
 
-#: src/preferences.c:2531
+#: src/preferences.c:2567
 msgid "Video open command (fallback)"
 msgstr ""
 
-#: src/preferences.c:2543
+#: src/preferences.c:2579
 msgid "Open/render compression"
 msgstr ""
 
-#: src/preferences.c:2546
+#: src/preferences.c:2582
 msgid " %     ( lower = slower, larger files; for jpeg, higher quality )"
 msgstr ""
 
-#: src/preferences.c:2558
+#: src/preferences.c:2594
 msgid "Default image format"
 msgstr ""
 
-#: src/preferences.c:2562
+#: src/preferences.c:2598
 msgid "_jpeg"
 msgstr ""
 
-#: src/preferences.c:2565
+#: src/preferences.c:2601
 msgid "_png"
 msgstr ""
 
-#: src/preferences.c:2572
+#: src/preferences.c:2608
 msgid "(Check Help/Troubleshoot to see which image formats are supported)"
 msgstr ""
 
-#: src/preferences.c:2580
+#: src/preferences.c:2616
 msgid "Enable automatic deinterlacing when possible"
 msgstr ""
 
-#: src/preferences.c:2582
+#: src/preferences.c:2619
 msgid "Automatically deinterlace frames when a plugin suggests it"
 msgstr ""
 
-#: src/preferences.c:2593
+#: src/preferences.c:2632
 msgid "Automatic trimming / padding of audio when possible"
 msgstr ""
 
-#: src/preferences.c:2595
+#: src/preferences.c:2634
 msgid "Automatically trim or pad audio when a plugin suggests it"
 msgstr ""
 
-#: src/preferences.c:2606
+#: src/preferences.c:2646
 msgid "Ignore blank borders when possible"
 msgstr ""
 
-#: src/preferences.c:2608
+#: src/preferences.c:2648
 msgid "Clip any blank borders from frames where possible"
 msgstr ""
 
-#: src/preferences.c:2619
+#: src/preferences.c:2660
 msgid "When opening multiple files, concatenate images into one clip"
 msgstr ""
 
-#: src/preferences.c:2629
+#: src/preferences.c:2670
 msgid "Decoding"
 msgstr "解码中"
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:2652
+#: src/preferences.c:2693
 msgid "Low - can improve performance on slower machines"
 msgstr ""
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:2654
+#: src/preferences.c:2695
 msgid "Normal - recommended for most users"
 msgstr ""
 
 #. TRANSLATORS: video quality, max len 50
-#: src/preferences.c:2656
+#: src/preferences.c:2697
 msgid "High - can improve quality on very fast machines"
 msgstr ""
 
-#: src/preferences.c:2659
+#: src/preferences.c:2700
 msgid "Preview _quality"
 msgstr ""
 
-#: src/preferences.c:2660
+#: src/preferences.c:2701
 msgid "The preview quality for video playback - affects resizing"
 msgstr ""
 
-#: src/preferences.c:2675
+#: src/preferences.c:2717
 msgid "_Show FPS statistics"
 msgstr ""
 
-#: src/preferences.c:2694
+#: src/preferences.c:2736
 msgid "_Plugin"
 msgstr "插件(_P)"
 
-#: src/preferences.c:2718
+#: src/preferences.c:2760
 msgid "Stream audio"
 msgstr ""
 
-#: src/preferences.c:2721
+#: src/preferences.c:2763
 msgid "Stream audio to playback plugin"
 msgstr ""
 
-#: src/preferences.c:2734
+#: src/preferences.c:2778
 msgid "Record player output"
 msgstr ""
 
-#: src/preferences.c:2737
+#: src/preferences.c:2781
 msgid "Record output from player instead of input to player"
 msgstr ""
 
-#: src/preferences.c:2744
+#: src/preferences.c:2789
 msgid "VIDEO"
 msgstr "视频"
 
-#: src/preferences.c:2787
+#: src/preferences.c:2833
 msgid "_Player"
 msgstr ""
 
-#: src/preferences.c:2792
+#: src/preferences.c:2838
 msgid "(See also the Jack Integration tab for jack startup options)"
 msgstr ""
 
-#: src/preferences.c:2819
+#: src/preferences.c:2865
 msgid "mplayer"
 msgstr ""
 
-#: src/preferences.c:2830
+#: src/preferences.c:2876
 #, fuzzy
 msgid "mplayer2"
 msgstr "层 %d"
 
-#: src/preferences.c:2833
+#: src/preferences.c:2879
 msgid "Audio play _command"
 msgstr ""
 
-#: src/preferences.c:2840
+#: src/preferences.c:2886
 msgid "- internal -"
 msgstr ""
 
-#: src/preferences.c:2849
+#: src/preferences.c:2895
 msgid "Audio follows video _rate/direction"
 msgstr ""
 
-#: src/preferences.c:2857
+#: src/preferences.c:2903
 msgid "Audio follows _clip switches"
 msgstr ""
 
-#: src/preferences.c:2864
+#: src/preferences.c:2910
 msgid "Source:"
 msgstr ""
 
-#: src/preferences.c:2868
+#: src/preferences.c:2914
 msgid "_Internal"
 msgstr ""
 
-#: src/preferences.c:2873
+#: src/preferences.c:2919
 msgid "_External (requires jack or pulse audio player)"
 msgstr ""
 
-#: src/preferences.c:2892
+#: src/preferences.c:2940
 msgid "AUDIO"
 msgstr ""
 
-#: src/preferences.c:2902
+#: src/preferences.c:2950
 msgid "Playback"
 msgstr "回放"
 
-#: src/preferences.c:2925
+#: src/preferences.c:2973
 msgid ""
 "Record audio when capturing an e_xternal window\n"
 " (requires jack or pulse audio)"
 msgstr ""
 
-#: src/preferences.c:2940
+#: src/preferences.c:2988
 msgid "      What to record when 'r' is pressed   "
 msgstr ""
 
-#: src/preferences.c:2949
+#: src/preferences.c:2997
 msgid "_Frame changes"
 msgstr ""
 
-#: src/preferences.c:2964
+#: src/preferences.c:3012
 msgid "F_PS changes"
 msgstr ""
 
-#: src/preferences.c:2982
+#: src/preferences.c:3030
 msgid "_Real time effects"
 msgstr ""
 
-#: src/preferences.c:2993
+#: src/preferences.c:3041
 msgid "_Clip switches"
 msgstr ""
 
-#: src/preferences.c:3004
+#: src/preferences.c:3052
 msgid "_Audio (requires jack or pulse audio player)"
 msgstr ""
 
-#: src/preferences.c:3024
+#: src/preferences.c:3072
 msgid "Pause recording if free disk space falls below"
 msgstr ""
 
 #. TRANSLATORS: gigabytes
-#: src/preferences.c:3030
+#: src/preferences.c:3078
 msgid "GB"
 msgstr ""
 
-#: src/preferences.c:3037
+#: src/preferences.c:3085
 msgid "Recording"
 msgstr "正在录音"
 
-#: src/preferences.c:3055
+#: src/preferences.c:3103
 msgid "Encoder"
 msgstr ""
 
-#: src/preferences.c:3090
+#: src/preferences.c:3137
 msgid "Output format"
 msgstr "输出格式"
 
-#: src/preferences.c:3106
+#: src/preferences.c:3153
 msgid "Audio codec"
 msgstr "音频编解码器"
 
-#: src/preferences.c:3119
+#: src/preferences.c:3165
 msgid "Encoding"
 msgstr "编码中"
 
-#: src/preferences.c:3134
+#: src/preferences.c:3180
 msgid "Use _antialiasing when resizing"
 msgstr ""
 
-#: src/preferences.c:3143
+#: src/preferences.c:3189
 msgid "Number of _real time effect keys"
 msgstr ""
 
-#: src/preferences.c:3145
+#: src/preferences.c:3192
 msgid ""
 "The number of \"virtual\" real time effect keys. They can be controlled "
 "through the real time effects window, or via network (OSC)."
 msgstr ""
 
-#: src/preferences.c:3152
+#: src/preferences.c:3199
 msgid "Use _threads where possible when applying effects"
 msgstr ""
 
-#: src/preferences.c:3159
+#: src/preferences.c:3207
 msgid "Number of _threads"
 msgstr ""
 
-#: src/preferences.c:3172
+#: src/preferences.c:3221
 msgid "Restart is required if any of the following paths are changed:"
 msgstr ""
 
-#: src/preferences.c:3182
+#: src/preferences.c:3231
 msgid "Weed plugin path"
 msgstr ""
 
-#: src/preferences.c:3184
+#: src/preferences.c:3234
 msgid "Frei0r plugin path"
 msgstr ""
 
-#: src/preferences.c:3186
+#: src/preferences.c:3237
 msgid "LADSPA plugin path"
 msgstr ""
 
-#: src/preferences.c:3209
+#: src/preferences.c:3261
 msgid "      Video load directory (default)      "
 msgstr ""
 
-#: src/preferences.c:3215
+#: src/preferences.c:3267
 msgid "      Video save directory (default) "
 msgstr ""
 
-#: src/preferences.c:3221
+#: src/preferences.c:3273
 msgid "      Audio load directory (default) "
 msgstr ""
 
-#: src/preferences.c:3227
+#: src/preferences.c:3279
 msgid "      Image directory (default) "
 msgstr ""
 
-#: src/preferences.c:3233
+#: src/preferences.c:3285
 msgid "      Backup/Restore directory (default) "
 msgstr ""
 
-#: src/preferences.c:3239
+#: src/preferences.c:3291
 msgid "      Temp directory (do not remove) "
 msgstr ""
 
-#: src/preferences.c:3252
+#: src/preferences.c:3304
 msgid "The default directory for loading video clips from"
 msgstr ""
 
-#: src/preferences.c:3277
+#: src/preferences.c:3329
 msgid "The default directory for saving encoded clips to"
 msgstr ""
 
-#: src/preferences.c:3285
+#: src/preferences.c:3337
 msgid "The default directory for loading and saving audio"
 msgstr ""
 
-#: src/preferences.c:3293
+#: src/preferences.c:3345
 msgid "The default directory for saving frameshots to"
 msgstr ""
 
-#: src/preferences.c:3301
+#: src/preferences.c:3353
 msgid "The default directory for backing up/restoring single clips"
 msgstr ""
 
-#: src/preferences.c:3309
+#: src/preferences.c:3361
 msgid "LiVES working directory."
 msgstr ""
 
-#: src/preferences.c:3359
+#: src/preferences.c:3412
 msgid "Directories"
 msgstr "目录列表"
 
-#: src/preferences.c:3374
+#: src/preferences.c:3427
 msgid "Warn if diskspace falls below: "
 msgstr ""
 
-#: src/preferences.c:3380 src/preferences.c:3394
+#: src/preferences.c:3433 src/preferences.c:3447
 msgid " MB [set to 0 to disable]"
 msgstr ""
 
-#: src/preferences.c:3389
+#: src/preferences.c:3442
 msgid "Diskspace critical level: "
 msgstr ""
 
-#: src/preferences.c:3407
+#: src/preferences.c:3461
 msgid ""
 "Warn on Insert / Merge if _frame rate of clipboard does not match frame rate "
 "of selection"
 msgstr ""
 
-#: src/preferences.c:3417
+#: src/preferences.c:3471
 msgid "Warn on Open if file _size exceeds "
 msgstr ""
 
-#: src/preferences.c:3425
+#: src/preferences.c:3479
 msgid " MB"
 msgstr " MB"
 
-#: src/preferences.c:3432
+#: src/preferences.c:3486
 msgid "Show a warning before saving a se_t"
 msgstr ""
 
-#: src/preferences.c:3442
+#: src/preferences.c:3496
 msgid ""
 "Show a warning if _mplayer/mplayer2, sox, composite or convert is not found "
 "when LiVES is started."
 msgstr ""
 
-#: src/preferences.c:3452
+#: src/preferences.c:3506
 msgid "Show a warning if no _rendered effects are found at startup."
 msgstr ""
 
-#: src/preferences.c:3464
+#: src/preferences.c:3518
 msgid "Show a warning if no _encoder plugins are found at startup."
 msgstr ""
 
-#: src/preferences.c:3474
+#: src/preferences.c:3528
 msgid "Show a warning if a _duplicate set name is entered."
 msgstr ""
 
-#: src/preferences.c:3485
+#: src/preferences.c:3539
 msgid "When a set is loaded, warn if clips are missing from _layouts."
 msgstr ""
 
-#: src/preferences.c:3495
+#: src/preferences.c:3550
 msgid "Warn if a clip used in a layout is about to be closed."
 msgstr ""
 
-#: src/preferences.c:3505
+#: src/preferences.c:3561
 msgid "Warn if frames used in a layout are about to be deleted."
 msgstr ""
 
-#: src/preferences.c:3515
+#: src/preferences.c:3572
 msgid "Warn if frames used in a layout are about to be shifted."
 msgstr ""
 
-#: src/preferences.c:3525
+#: src/preferences.c:3583
 msgid "Warn if frames used in a layout are about to be altered."
 msgstr ""
 
-#: src/preferences.c:3535
+#: src/preferences.c:3594
 msgid "Warn if audio used in a layout is about to be deleted."
 msgstr ""
 
-#: src/preferences.c:3546
+#: src/preferences.c:3606
 msgid "Warn if audio used in a layout is about to be shifted."
 msgstr ""
 
-#: src/preferences.c:3556
+#: src/preferences.c:3617
 msgid "Warn if audio used in a layout is about to be altered."
 msgstr ""
 
-#: src/preferences.c:3566
+#: src/preferences.c:3628
 msgid "Popup layout errors after clip changes."
 msgstr ""
 
-#: src/preferences.c:3577
+#: src/preferences.c:3639
 msgid "Warn if the layout has not been saved when leaving multitrack mode."
 msgstr ""
 
-#: src/preferences.c:3588
+#: src/preferences.c:3650
 msgid ""
 "Warn if multitrack has no audio channels, and a layout with audio is loaded."
 msgstr ""
 
-#: src/preferences.c:3598
+#: src/preferences.c:3660
 msgid ""
 "Warn if multitrack has audio channels, and your audio player is not \"jack\" "
 "or \"pulse audio\"."
 msgstr ""
 
-#: src/preferences.c:3610
+#: src/preferences.c:3672
 msgid "Show info message after importing from firewire device."
 msgstr ""
 
-#: src/preferences.c:3626
+#: src/preferences.c:3688
 msgid "Show a warning before opening a yuv4mpeg stream (advanced)."
 msgstr ""
 
-#: src/preferences.c:3639
+#: src/preferences.c:3701
 msgid "Show a warning when multitrack is low on backup space."
 msgstr ""
 
-#: src/preferences.c:3650
+#: src/preferences.c:3713
 msgid "Show a warning advising cleaning of disk space after a crash."
 msgstr ""
 
-#: src/preferences.c:3661
+#: src/preferences.c:3725
 msgid "Show a warning if unable to connect to pulseaudio player."
 msgstr ""
 
-#: src/preferences.c:3673
+#: src/preferences.c:3737
 msgid "Show a warning before wiping a layout which has unsaved changes."
 msgstr ""
 
-#: src/preferences.c:3685
+#: src/preferences.c:3749
 msgid "Warnings"
 msgstr "警告"
 
-#: src/preferences.c:3703
+#: src/preferences.c:3767
 msgid "Midi synch (requires the files midistart and midistop)"
 msgstr ""
 
-#: src/preferences.c:3715
+#: src/preferences.c:3779
 msgid "When inserting/merging frames:  "
 msgstr ""
 
-#: src/preferences.c:3719
+#: src/preferences.c:3783
 msgid "_Speed Up/Slow Down Insertion"
 msgstr ""
 
-#: src/preferences.c:3723
+#: src/preferences.c:3787
 msgid "_Resample Insertion"
 msgstr ""
 
-#: src/preferences.c:3730
+#: src/preferences.c:3794
 msgid "CD device           "
 msgstr ""
 
-#: src/preferences.c:3733
+#: src/preferences.c:3797
 msgid "LiVES can load audio tracks from this CD"
 msgstr ""
 
-#: src/preferences.c:3746
+#: src/preferences.c:3813
 msgid "Default FPS        "
 msgstr "默认帧率        "
 
-#: src/preferences.c:3749
+#: src/preferences.c:3816
 msgid "Frames per second to use when none is specified"
 msgstr ""
 
-#: src/preferences.c:3757
+#: src/preferences.c:3825
 msgid "Misc"
 msgstr "杂项"
 
-#: src/preferences.c:3782
+#: src/preferences.c:3850
 msgid "New theme:           "
 msgstr "新主题：           "
 
-#: src/preferences.c:3800
+#: src/preferences.c:3867
 msgid "Themes"
 msgstr "主题"
 
-#: src/preferences.c:3815
+#: src/preferences.c:3882
 msgid "Download bandwidth (Kb/s)       "
 msgstr ""
 
-#: src/preferences.c:3823
+#: src/preferences.c:3890
 msgid "LiVES must be compiled without \"configure --disable-OSC\" to use OMC"
 msgstr ""
 
-#: src/preferences.c:3833
+#: src/preferences.c:3900
 msgid "OMC remote control enabled"
 msgstr ""
 
-#: src/preferences.c:3841
+#: src/preferences.c:3908
 msgid "UDP port       "
 msgstr "UDP 端口       "
 
-#: src/preferences.c:3850
+#: src/preferences.c:3917
 msgid "Start OMC on startup"
 msgstr "启动时运行 OMC"
 
-#: src/preferences.c:3870
+#: src/preferences.c:3937
 msgid "Streaming/Networking"
 msgstr "流媒体/网络"
 
-#: src/preferences.c:3882
+#: src/preferences.c:3949
 msgid "Jack transport"
 msgstr ""
 
-#: src/preferences.c:3886
+#: src/preferences.c:3953
 msgid ""
 "LiVES must be compiled with jack/transport.h and jack/jack.h present to use "
 "jack transport"
 msgstr ""
 
-#: src/preferences.c:3892
+#: src/preferences.c:3959
 msgid "Jack _transport config file"
 msgstr ""
 
-#: src/preferences.c:3899 src/preferences.c:3989
+#: src/preferences.c:3967 src/preferences.c:4058
 msgid "Start _server on LiVES startup"
 msgstr "在 LiVES 启动时运行服务器(_S)"
 
-#: src/preferences.c:3911
+#: src/preferences.c:3979
 msgid "Jack transport _master (start and stop)"
 msgstr ""
 
-#: src/preferences.c:3921
+#: src/preferences.c:3989
 msgid "Jack transport _client (start and stop)"
 msgstr ""
 
-#: src/preferences.c:3935
+#: src/preferences.c:4003
 msgid "Jack transport sets start position"
 msgstr ""
 
-#: src/preferences.c:3952
+#: src/preferences.c:4020
 msgid "Jack transport timebase slave"
 msgstr ""
 
-#: src/preferences.c:3963
+#: src/preferences.c:4031
 msgid "(See also Playback -> Audio follows video rate/direction)"
 msgstr ""
 
-#: src/preferences.c:3971
+#: src/preferences.c:4039
 msgid "Jack audio"
 msgstr "Jack 音频"
 
-#: src/preferences.c:3975
+#: src/preferences.c:4043
 msgid "LiVES must be compiled with jack/jack.h present to use jack audio"
 msgstr ""
 
-#: src/preferences.c:3978
+#: src/preferences.c:4046
 msgid ""
 "You MUST set the audio player to \"jack\" in the Playback tab to use jack "
 "audio"
 msgstr ""
 
-#: src/preferences.c:3984
+#: src/preferences.c:4052
 msgid "Jack _audio server config file"
 msgstr "Jack 音频服务器配置文件(_A)"
 
-#: src/preferences.c:3996
+#: src/preferences.c:4065
 msgid "Play audio even when transport is _paused"
 msgstr ""
 
-#: src/preferences.c:4008
+#: src/preferences.c:4077
 msgid "Automatically connect to System Out ports when 'playing' External Audio"
 msgstr ""
 
-#: src/preferences.c:4021
+#: src/preferences.c:4090
 msgid "Jack Integration"
 msgstr ""
 
-#: src/preferences.c:4035
+#: src/preferences.c:4104
 msgid "Events to respond to:"
 msgstr ""
 
-#: src/preferences.c:4044
+#: src/preferences.c:4113
 msgid "_Joystick events"
 msgstr ""
 
-#: src/preferences.c:4051
+#: src/preferences.c:4120
 msgid "_Joystick device"
 msgstr ""
 
-#: src/preferences.c:4053
+#: src/preferences.c:4122
 msgid "The joystick device, e.g. /dev/input/js0"
 msgstr ""
 
-#: src/preferences.c:4071
+#: src/preferences.c:4142
 msgid "_MIDI events"
 msgstr "_MIDI 事件"
 
-#: src/preferences.c:4080
+#: src/preferences.c:4151
 msgid "Use _ALSA MIDI (recommended)"
 msgstr "使用 _ALSA MIDI(推荐)"
 
-#: src/preferences.c:4082
+#: src/preferences.c:4153
 msgid "Create an ALSA MIDI port which other MIDI devices can be connected to"
 msgstr ""
 
-#: src/preferences.c:4090
+#: src/preferences.c:4162
 msgid "Use _raw MIDI"
 msgstr "使用原始 MIDI(_R)"
 
-#: src/preferences.c:4092
+#: src/preferences.c:4164
 msgid "Read directly from the MIDI device"
 msgstr "从 MIDI 设备直接读取"
 
-#: src/preferences.c:4104
+#: src/preferences.c:4177
 msgid "_MIDI device"
 msgstr "_MIDI 设备"
 
-#: src/preferences.c:4106
+#: src/preferences.c:4179
 msgid "The MIDI device, e.g. /dev/input/midi0"
 msgstr "MIDI 设备，如 /dev/input/midi0"
 
-#: src/preferences.c:4118
+#: src/preferences.c:4193
 msgid "Advanced"
 msgstr "高级"
 
-#: src/preferences.c:4124
+#: src/preferences.c:4199
 msgid "MIDI check _rate"
 msgstr ""
 
-#: src/preferences.c:4127
+#: src/preferences.c:4203
 msgid ""
 "Number of MIDI checks per keyboard tick. Increasing this may improve MIDI "
 "responsiveness, but may slow down playback."
 msgstr ""
 
-#: src/preferences.c:4134
+#: src/preferences.c:4211
 msgid "MIDI repeat"
 msgstr "MIDI 重复"
 
-#: src/preferences.c:4137
+#: src/preferences.c:4214
 msgid "Number of non-reads allowed between succesive reads."
 msgstr ""
 
-#: src/preferences.c:4140
+#: src/preferences.c:4218
 msgid "(Warning: setting this value too high can slow down playback.)"
 msgstr "(警告：将此值设得过大会拖慢播放。)"
 
-#: src/preferences.c:4159
+#: src/preferences.c:4237
 msgid "MIDI/Joystick learner"
 msgstr ""
 
-#: src/preferences.c:4499
+#: src/preferences.c:4679
 msgid ""
 "\n"
 "LiVES will now shut down. You need to restart it for the directory change to "
@@ -7806,214 +7819,214 @@
 "LiVES 即将关闭。您需要重新启动它以使目录更改生效。\n"
 "点击确定继续。\n"
 
-#: src/preferences.c:4523
+#: src/preferences.c:4703
 msgid ""
 "For the directory change to take effect LiVES will restart when preferences "
 "dialog closes."
 msgstr "为使目录更改生效，LiVES 将在关闭首选项对话框后重新启动。"
 
-#: src/preferences.c:4527
+#: src/preferences.c:4707
 msgid "Theme changes will not take effect until the next time you start LiVES."
 msgstr "主题的更改只有在您下次启动 LiVES 时才会生效。"
 
-#: src/preferences.c:4531
+#: src/preferences.c:4711
 msgid "Jack options will not take effect until the next time you start LiVES."
 msgstr "Jack 选项在您下次启动 LiVES 时才会生效。"
 
-#: src/osc.c:2585
+#: src/osc.c:2616
 #, c-format
 msgid "Syncing to external framerate of %.8f frames per second.\n"
 msgstr ""
 
-#: src/osc.c:6746
+#: src/osc.c:6938
 msgid "Cannot initialize OSC receiver\n"
 msgstr "无法初始化 OSC 接收器\n"
 
-#: src/osc.c:6770
+#: src/osc.c:6961
 #, c-format
 msgid "WARNING: Cannot start OSC server at UDP port %d\n"
 msgstr "警告：无法在 UDP 端口 %d 上启动 OSC 服务器\n"
 
-#: src/osc.c:6775
+#: src/osc.c:6963
 #, c-format
 msgid "Started OSC server at UDP port %d\n"
 msgstr "已在 UDP 端口 %d 上启动 OSC 服务器\n"
 
-#: src/osc.c:6890
+#: src/osc.c:7076
 #, c-format
 msgid "Cannot start OSC/UDP server at port %d \n"
 msgstr "无法在端口 %d 上启动 OSC/UDP 服务器 \n"
 
-#: src/resample.c:125 src/resample.c:304
+#: src/resample.c:131 src/resample.c:305
 #, c-format
 msgid "Resizing frames 1 to %d"
 msgstr ""
 
-#: src/resample.c:140 src/resample.c:318
+#: src/resample.c:145 src/resample.c:318
 #, c-format
 msgid "Resizing/letterboxing frames 1 to %d"
 msgstr ""
 
-#: src/resample.c:361 src/resample.c:385
+#: src/resample.c:360 src/resample.c:384
 msgid "Resize"
 msgstr "更改大小"
 
-#: src/resample.c:395
+#: src/resample.c:394
 msgid "Resample/Resize"
 msgstr ""
 
-#: src/resample.c:680
+#: src/resample.c:676
 #, c-format
 msgid "Length of video is now %d frames.\n"
 msgstr ""
 
-#: src/resample.c:745
+#: src/resample.c:737
 msgid ""
 "\n"
 "\n"
 "New rate must be greater than 0\n"
 msgstr ""
 
-#: src/resample.c:797 src/resample.c:813
+#: src/resample.c:788 src/resample.c:803
 msgid "Resampling audio"
 msgstr "正在重采样音频"
 
-#: src/resample.c:831
+#: src/resample.c:821
 msgid "LiVES was unable to resample the audio as requested.\n"
 msgstr "LiVES 无法按要求对音频进行重采样。\n"
 
-#: src/resample.c:833 src/resample.c:837
+#: src/resample.c:823 src/resample.c:827
 msgid "Resample Audio"
 msgstr "重采样音频"
 
-#: src/resample.c:845
+#: src/resample.c:835
 #, c-format
 msgid "Audio was resampled to %d Hz, %d channels, %d bit"
 msgstr ""
 
-#: src/resample.c:1034
+#: src/resample.c:1016
 #, c-format
 msgid "Resampling video at %.8f frames per second..."
 msgstr ""
 
-#: src/resample.c:1037
+#: src/resample.c:1018
 #, c-format
 msgid "Resampling video at %.3f frames per second..."
 msgstr ""
 
-#: src/resample.c:1068
+#: src/resample.c:1049
 msgid "Reordering error !\n"
 msgstr ""
 
-#: src/resample.c:1079
+#: src/resample.c:1060
 msgid "Resample"
 msgstr "重采样"
 
-#: src/resample.c:1192
+#: src/resample.c:1173
 msgid "LiVES: - Resample Audio"
 msgstr "LiVES：- 重采样音频"
 
-#: src/resample.c:1195
+#: src/resample.c:1175
 msgid "LiVES: - Insert Silence"
 msgstr "LiVES：- 插入静音"
 
-#: src/resample.c:1198
+#: src/resample.c:1177
 msgid "LiVES: - New Clip Audio"
 msgstr "LiVES：- 新剪辑音频"
 
-#: src/resample.c:1201
+#: src/resample.c:1179
 msgid "LiVES: - External Clip Settings"
 msgstr "LiVES：- 外部剪辑设置"
 
-#: src/resample.c:1238 src/resample.c:1358
+#: src/resample.c:1215 src/resample.c:1332
 msgid "Rate (Hz) "
 msgstr ""
 
-#: src/resample.c:1245 src/resample.c:1372
+#: src/resample.c:1222 src/resample.c:1346
 msgid "Channels"
 msgstr ""
 
-#: src/resample.c:1252
+#: src/resample.c:1229
 msgid "Sample Size "
 msgstr ""
 
-#: src/resample.c:1268 src/resample.c:1425
+#: src/resample.c:1245 src/resample.c:1399
 msgid "Signed"
 msgstr "有符号"
 
-#: src/resample.c:1274 src/resample.c:1435
+#: src/resample.c:1251 src/resample.c:1409
 msgid "Unsigned"
 msgstr "无符号"
 
-#: src/resample.c:1297 src/resample.c:1460
+#: src/resample.c:1273 src/resample.c:1433
 msgid "Little Endian"
 msgstr "小端"
 
-#: src/resample.c:1303 src/resample.c:1468
+#: src/resample.c:1279 src/resample.c:1441
 msgid "Big Endian"
 msgstr "大端"
 
-#: src/resample.c:1315
+#: src/resample.c:1290
 msgid "Current"
 msgstr "当前"
 
-#: src/resample.c:1340
+#: src/resample.c:1315
 msgid "_Enable audio"
 msgstr "启用音频(_E)"
 
-#: src/resample.c:1372
+#: src/resample.c:1346
 msgid "_Channels"
 msgstr ""
 
-#: src/resample.c:1394
+#: src/resample.c:1368
 msgid "_Sample Size"
 msgstr ""
 
-#: src/resample.c:1394
+#: src/resample.c:1368
 msgid "Sample Size"
 msgstr ""
 
-#: src/resample.c:1489
+#: src/resample.c:1461
 msgid "New"
 msgstr "新建"
 
-#: src/resample.c:1512
+#: src/resample.c:1484
 msgid "_Frames Per Second "
 msgstr "帧每秒(_F) "
 
-#: src/resample.c:1530
+#: src/resample.c:1502
 msgid "Record for maximum:  "
 msgstr "最多录制：  "
 
-#: src/resample.c:1533
+#: src/resample.c:1505
 msgid " hours  "
 msgstr " 时  "
 
-#: src/resample.c:1536
+#: src/resample.c:1508
 msgid " minutes  "
 msgstr " 分  "
 
-#: src/resample.c:1538
+#: src/resample.c:1510
 msgid " seconds  "
 msgstr " 秒  "
 
-#: src/resample.c:1545
+#: src/resample.c:1517
 msgid "Unlimited"
 msgstr "无限制"
 
-#: src/resample.c:1561
+#: src/resample.c:1533
 msgid "Click OK to begin recording, or Cancel to quit."
 msgstr "点击确定进行录制，或点击取消退出。"
 
-#: src/resample.c:1670
+#: src/resample.c:1638
 msgid "LiVES: - Change playback speed"
 msgstr "LiVES：- 更改播放速度"
 
-#: src/resample.c:1673
+#: src/resample.c:1640
 msgid "LiVES: - Resample Video"
 msgstr "LiVES：- 重采样视频"
 
-#: src/resample.c:1696
+#: src/resample.c:1663
 #, c-format
 msgid ""
 "\n"
@@ -8024,7 +8037,7 @@
 "in _frames per second"
 msgstr ""
 
-#: src/resample.c:1701
+#: src/resample.c:1667
 #, c-format
 msgid ""
 "\n"
@@ -8035,89 +8048,89 @@
 "in frames per second"
 msgstr ""
 
-#: src/resample.c:1723
+#: src/resample.c:1688
 msgid "OR enter the desired clip length in _seconds"
 msgstr ""
 
-#: src/resample.c:1745
+#: src/resample.c:1710
 msgid "Change the _audio speed as well"
 msgstr "同时更改音频速度(_A)"
 
-#: src/resample.c:1846
+#: src/resample.c:1810
 msgid ""
 "\n"
 "Speeding up the clip will cause missing frames in some multitrack layouts.\n"
 "Are you sure you wish to change the speed ?\n"
 msgstr ""
 
-#: src/resample.c:1863
+#: src/resample.c:1829
 msgid ""
 "\n"
 "Speeding up the clip will cause missing audio in some multitrack layouts.\n"
 "Are you sure you wish to change the speed ?\n"
 msgstr ""
 
-#: src/resample.c:1878
+#: src/resample.c:1847
 msgid ""
 "\n"
 "Changing the speed will cause frames to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/resample.c:1892
+#: src/resample.c:1863
 msgid ""
 "\n"
 "Changing the speed will cause audio to shift in some multitrack layouts.\n"
 "Are you sure you wish to continue ?\n"
 msgstr ""
 
-#: src/resample.c:1938
+#: src/resample.c:1911
 msgid "Speed Change"
 msgstr "更改速度"
 
-#: src/resample.c:1947
+#: src/resample.c:1920
 #, c-format
 msgid "Changed playback speed to %.3f frames per second and audio to %d Hz.\n"
 msgstr "已将播放速度更改为 %.3f 帧每秒， 音频更改为 %d Hz。\n"
 
-#: src/resample.c:1950
+#: src/resample.c:1922
 #, c-format
 msgid "Changed playback speed to %.3f frames per second.\n"
 msgstr "已将播放速度更改为 %.3f 帧每秒。\n"
 
-#: src/resample.c:2035
+#: src/resample.c:2006
 msgid "Resampling video"
 msgstr "正在重采样视频"
 
-#: src/resample.c:2042 src/resample.c:2160 src/resample.c:2182
+#: src/resample.c:2012 src/resample.c:2127 src/resample.c:2148
 msgid "Resampling clipboard video"
 msgstr "正在重采样剪贴板视频"
 
-#: src/resample.c:2047
+#: src/resample.c:2016
 msgid "Reordering frames"
 msgstr ""
 
-#: src/resample.c:2056
+#: src/resample.c:2025
 msgid ""
 "\n"
 "\n"
 "LiVES was unable to reorder the frames."
 msgstr ""
 
-#: src/resample.c:2104
+#: src/resample.c:2071
 msgid "Deordering frames"
 msgstr ""
 
-#: src/resample.c:2199
+#: src/resample.c:2165
 msgid "resampling error..."
 msgstr "重采样错误..."
 
-#: src/rte_window.c:85 src/rte_window.c:1708
+#: src/rte_window.c:124 src/rte_window.c:1709
 #, c-format
 msgid "Type: %s"
 msgstr "类型：%s"
 
-#: src/rte_window.c:112
+#: src/rte_window.c:150
 msgid ""
 "\n"
 "\n"
@@ -8127,7 +8140,7 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:426
+#: src/rte_window.c:460
 msgid ""
 "\n"
 "\n"
@@ -8135,19 +8148,19 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:432
+#: src/rte_window.c:466
 #, c-format
 msgid "Saving keymap to %s\n"
 msgstr ""
 
-#: src/rte_window.c:439
+#: src/rte_window.c:471
 #, c-format
 msgid ""
 "\n"
 "Updating keymap file %s..."
 msgstr ""
 
-#: src/rte_window.c:446
+#: src/rte_window.c:477
 #, c-format
 msgid ""
 "\n"
@@ -8157,12 +8170,12 @@
 "Error was %s\n"
 msgstr ""
 
-#: src/rte_window.c:526
+#: src/rte_window.c:556
 #, c-format
 msgid "Saving real time effect defaults to %s..."
 msgstr ""
 
-#: src/rte_window.c:535
+#: src/rte_window.c:563
 #, c-format
 msgid ""
 "\n"
@@ -8172,22 +8185,22 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/rte_window.c:632
+#: src/rte_window.c:657
 #, c-format
 msgid "Loading real time effect defaults from %s..."
 msgstr "正在从 %s 中加载实时特效默认设置..."
 
-#: src/rte_window.c:681
+#: src/rte_window.c:701
 #, c-format
 msgid "Loading generator default sizes from %s..."
 msgstr ""
 
-#: src/rte_window.c:1306
+#: src/rte_window.c:1319
 #, c-format
 msgid "Loading default keymap from %s..."
 msgstr ""
 
-#: src/rte_window.c:1329
+#: src/rte_window.c:1339
 #, c-format
 msgid ""
 "\n"
@@ -8197,48 +8210,48 @@
 "Error code %d\n"
 msgstr ""
 
-#: src/rte_window.c:1403
+#: src/rte_window.c:1412
 #, c-format
 msgid "Invalid line %d in %s\n"
 msgstr ""
 
-#: src/rte_window.c:1483
+#: src/rte_window.c:1490
 #, c-format
 msgid "Invalid key %d in %s\n"
 msgstr ""
 
-#: src/rte_window.c:1498
+#: src/rte_window.c:1505
 #, c-format
 msgid "Invalid effect %s in %s\n"
 msgstr ""
 
-#: src/rte_window.c:1517
+#: src/rte_window.c:1524
 #, c-format
 msgid "Unknown effect %s in %s\n"
 msgstr ""
 
-#: src/rte_window.c:1535
+#: src/rte_window.c:1542
 #, c-format
 msgid ""
 "This version of LiVES cannot mix generators/non-generators on the same key "
 "(%d) !\n"
 msgstr ""
 
-#: src/rte_window.c:1547
+#: src/rte_window.c:1554
 #, c-format
 msgid "Too many effects bound to key %d.\n"
 msgstr ""
 
-#: src/rte_window.c:1587
+#: src/rte_window.c:1593
 msgid "update required.\n"
 msgstr "需要更新。\n"
 
-#: src/rte_window.c:1603
+#: src/rte_window.c:1607
 #, c-format
 msgid "Loading data connection map from %s..."
 msgstr ""
 
-#: src/rte_window.c:1612
+#: src/rte_window.c:1614
 msgid ""
 "\n"
 "\n"
@@ -8250,41 +8263,41 @@
 "一些特效无法找到。\n"
 "\n"
 
-#: src/rte_window.c:1691
+#: src/rte_window.c:1692
 #, c-format
 msgid "LiVES: Information for %s"
 msgstr "LiVES：%s 信息"
 
-#: src/rte_window.c:1704
+#: src/rte_window.c:1705
 #, c-format
 msgid "Effect name: %s"
 msgstr "特效名称：%s"
 
-#: src/rte_window.c:1712
+#: src/rte_window.c:1713
 #, c-format
 msgid "Plugin name: %s"
 msgstr "插件名称：%s"
 
-#: src/rte_window.c:1716
+#: src/rte_window.c:1717
 #, c-format
 msgid "Author: %s"
 msgstr "作者：%s"
 
-#: src/rte_window.c:1721
+#: src/rte_window.c:1722
 #, c-format
 msgid "and: %s"
 msgstr ""
 
-#: src/rte_window.c:1726
+#: src/rte_window.c:1727
 #, c-format
 msgid "Version: %d"
 msgstr "版本：%d"
 
-#: src/rte_window.c:1734
+#: src/rte_window.c:1735
 msgid "Description: "
 msgstr "描述： "
 
-#: src/rte_window.c:1960
+#: src/rte_window.c:1963
 msgid ""
 "\n"
 "\n"
@@ -8293,69 +8306,69 @@
 "\n"
 msgstr ""
 
-#: src/rte_window.c:2024
+#: src/rte_window.c:2027
 #, c-format
 msgid "LiVES could not locate the effect %s.\n"
 msgstr "LiVES 无法找到特效 %s。\n"
 
-#: src/rte_window.c:2225
+#: src/rte_window.c:2216
 msgid "LiVES: Real time effect mapping"
 msgstr ""
 
-#: src/rte_window.c:2257
+#: src/rte_window.c:2248
 #, c-format
 msgid "Ctrl-%d"
 msgstr ""
 
-#: src/rte_window.c:2264
+#: src/rte_window.c:2255
 msgid "Key active"
 msgstr ""
 
-#: src/rte_window.c:2279
+#: src/rte_window.c:2271
 msgid "Key grab"
 msgstr ""
 
-#: src/rte_window.c:2280
+#: src/rte_window.c:2272
 msgid "Grab keyboard for this effect key"
 msgstr ""
 
-#: src/rte_window.c:2290
+#: src/rte_window.c:2283
 msgid "_Clear all effects"
 msgstr "清除所有特效(_C)"
 
-#: src/rte_window.c:2304
+#: src/rte_window.c:2297
 msgid "Mode active"
 msgstr ""
 
-#: src/rte_window.c:2314 src/multitrack.c:8568
+#: src/rte_window.c:2307 src/multitrack.c:8762
 msgid "Info"
 msgstr "信息"
 
-#: src/rte_window.c:2315
+#: src/rte_window.c:2308
 msgid "Set Parameters"
 msgstr "设置参数"
 
-#: src/rte_window.c:2316
+#: src/rte_window.c:2309
 msgid "Set Connections"
 msgstr ""
 
-#: src/rte_window.c:2317
+#: src/rte_window.c:2310
 msgid "Clear"
 msgstr "清除"
 
-#: src/rte_window.c:2326
+#: src/rte_window.c:2319
 msgid "Effect name:"
 msgstr "特效名称："
 
-#: src/rte_window.c:2391
+#: src/rte_window.c:2384
 msgid "_Save as default keymap"
 msgstr ""
 
-#: src/rte_window.c:2396
+#: src/rte_window.c:2389
 msgid "_Load default keymap"
 msgstr ""
 
-#: src/rte_window.c:2840
+#: src/rte_window.c:2833
 #, c-format
 msgid ""
 "Unable to create default keymap file: %s\n"
@@ -8371,9 +8384,8 @@
 msgstr "无法打开输入视频流\n"
 
 #: src/lives-yuv4mpeg.c:205
-#, fuzzy
 msgid "Unable to read the stream header\n"
-msgstr "无法读取输入视频流\n"
+msgstr ""
 
 #: src/lives-yuv4mpeg.c:221
 msgid "got header\n"
@@ -8414,7 +8426,7 @@
 msgid "none\n"
 msgstr "无\n"
 
-#: src/lives-yuv4mpeg.c:494
+#: src/lives-yuv4mpeg.c:493
 #, c-format
 msgid ""
 "Unable to set display framerate to %.3f fps.\n"
@@ -8423,79 +8435,79 @@
 "无法将显示帧率设为 %.3f 帧每秒。\n"
 "\n"
 
-#: src/lives-yuv4mpeg.c:503
+#: src/lives-yuv4mpeg.c:502
 #, c-format
 msgid "Unable to open yuv4mpeg out stream %s\n"
 msgstr "无法打开 yuv4mpeg 输出流 %s\n"
 
-#: src/lives-yuv4mpeg.c:628
+#: src/lives-yuv4mpeg.c:626
 #, c-format
 msgid "TV card %d"
 msgstr "电视卡 %d"
 
-#: src/lives-yuv4mpeg.c:713
+#: src/lives-yuv4mpeg.c:710
 #, c-format
 msgid "Opened TV card %d (%s)"
 msgstr "已打开电视卡 %d(%s)"
 
-#: src/lives-yuv4mpeg.c:760
+#: src/lives-yuv4mpeg.c:757
 #, c-format
 msgid "Firewire card %d"
 msgstr "火线卡 %d"
 
-#: src/lives-yuv4mpeg.c:796
+#: src/lives-yuv4mpeg.c:793
 #, c-format
 msgid "Opened firewire card %d"
 msgstr "已打开火线卡 %d"
 
-#: src/multitrack.c:666
+#: src/multitrack.c:736
 msgid "Auto backup"
 msgstr "自动备份"
 
-#: src/multitrack.c:868
+#: src/multitrack.c:935
 msgid "Backing audio"
 msgstr ""
 
-#: src/multitrack.c:1435
+#: src/multitrack.c:1515
 #, c-format
 msgid "%s : parameters for %s"
 msgstr ""
 
-#: src/multitrack.c:1809 src/multitrack.c:3483
+#: src/multitrack.c:1881 src/multitrack.c:3635
 #, c-format
 msgid "Current track: %s (layer %d)\n"
 msgstr "当前轨道：%s(第 %d 层)\n"
 
-#: src/multitrack.c:1813 src/multitrack.c:3484
+#: src/multitrack.c:1885 src/multitrack.c:3637
 msgid "Current track: Backing audio\n"
 msgstr ""
 
-#: src/multitrack.c:1814
+#: src/multitrack.c:1886
 #, c-format
 msgid "Current track: Layer %d audio\n"
 msgstr "当前轨道：第 %d 层音频\n"
 
-#: src/multitrack.c:1817
+#: src/multitrack.c:1889
 #, c-format
 msgid "%.2f sec.\n"
 msgstr "%.2f 秒\n"
 
-#: src/multitrack.c:1822 src/multitrack.c:3490
+#: src/multitrack.c:1894 src/multitrack.c:3643
 #, c-format
 msgid "Source: %s"
 msgstr "源：%s"
 
-#: src/multitrack.c:1825 src/multitrack.c:3492
+#: src/multitrack.c:1897 src/multitrack.c:3645
 msgid "Right click for context menu.\n"
 msgstr "右击打开环境菜单。\n"
 
-#: src/multitrack.c:1827
+#: src/multitrack.c:1899
 msgid ""
 "Double click on a block\n"
 "to select it."
 msgstr ""
 
-#: src/multitrack.c:3312
+#: src/multitrack.c:3452
 msgid ""
 "\n"
 "\n"
@@ -8504,7 +8516,7 @@
 "right or double clicking on it.\n"
 msgstr ""
 
-#: src/multitrack.c:3315
+#: src/multitrack.c:3455
 msgid ""
 "\n"
 "\n"
@@ -8512,7 +8524,7 @@
 "Select an effect in FX stack first to view its parameters.\n"
 msgstr ""
 
-#: src/multitrack.c:3318
+#: src/multitrack.c:3458
 msgid ""
 "\n"
 "\n"
@@ -8522,7 +8534,7 @@
 "\n"
 "未载入剪辑。\n"
 
-#: src/multitrack.c:3321
+#: src/multitrack.c:3462
 msgid ""
 "You must select two video tracks\n"
 "and a time region\n"
@@ -8532,7 +8544,7 @@
 "before inserting clips into the timeline."
 msgstr ""
 
-#: src/multitrack.c:3324
+#: src/multitrack.c:3465
 msgid ""
 "\n"
 "\n"
@@ -8541,12 +8553,12 @@
 "to apply compositors.\n"
 msgstr ""
 
-#: src/multitrack.c:3487
+#: src/multitrack.c:3640
 #, c-format
 msgid "%.2f sec. to %.2f sec.\n"
 msgstr "%.2f 秒到 %.2f 秒\n"
 
-#: src/multitrack.c:3493
+#: src/multitrack.c:3646
 msgid ""
 "Single click on timeline\n"
 "to select a frame.\n"
@@ -8554,12 +8566,12 @@
 "单击时间线\n"
 "来选择某一帧。\n"
 
-#: src/multitrack.c:3711 src/multitrack.c:6790
+#: src/multitrack.c:3858 src/multitrack.c:6972
 #, c-format
 msgid "%s [unstable]"
 msgstr ""
 
-#: src/multitrack.c:3822
+#: src/multitrack.c:3973
 msgid ""
 "You can click and drag\n"
 "below the timeline"
@@ -8567,191 +8579,188 @@
 "您可以点击拖动\n"
 "时间线下方"
 
-#: src/multitrack.c:3823
+#: src/multitrack.c:3974
 msgid "to select a time region.\n"
 msgstr "以选择一个时间区段。\n"
 
-#: src/multitrack.c:3985
+#: src/multitrack.c:4137
 msgid "LiVES: Selected clip"
 msgstr "LiVES：已选剪辑"
 
-#: src/multitrack.c:3993
+#: src/multitrack.c:4145
 msgid "_Adjust start and end points"
 msgstr "调整起点和终点(_A)"
 
-#: src/multitrack.c:4002
+#: src/multitrack.c:4154
 msgid "_Edit/encode in clip editor"
 msgstr "在剪辑编辑器中进行编辑/编码(_E)"
 
-#: src/multitrack.c:4009
+#: src/multitrack.c:4161
 msgid "_Show clip information"
 msgstr "显示剪辑信息(_S)"
 
-#: src/multitrack.c:4016
+#: src/multitrack.c:4168
 msgid "_Close this clip"
 msgstr "关闭此剪辑(_C)"
 
-#: src/multitrack.c:4236
+#: src/multitrack.c:4388
 msgid "Audio mixer (ctrl-m)"
 msgstr "混音器(ctrl-m)"
 
-#: src/multitrack.c:4336
+#: src/multitrack.c:4488
 msgid "Single click on timeline"
 msgstr "点击时间线"
 
-#: src/multitrack.c:4337
+#: src/multitrack.c:4489
 msgid "to select a frame."
 msgstr "来选择一帧。"
 
-#: src/multitrack.c:4338
+#: src/multitrack.c:4490
 msgid "Double click or right click on timeline"
 msgstr ""
 
-#: src/multitrack.c:4339
+#: src/multitrack.c:4491
 msgid "to select a block."
 msgstr "来选择块。"
 
-#: src/multitrack.c:4340
+#: src/multitrack.c:4492
 msgid "Clips can be dragged"
 msgstr "剪辑可以被拖放"
 
-#: src/multitrack.c:4341
+#: src/multitrack.c:4493
 msgid "onto the timeline."
 msgstr "到时间线上。"
 
-#: src/multitrack.c:4343
+#: src/multitrack.c:4495
 msgid "Mouse mode is: Move"
 msgstr "鼠标模式为：移动"
 
-#: src/multitrack.c:4344
+#: src/multitrack.c:4496
 msgid "clips can be moved around."
 msgstr "剪辑可以四处移动。"
 
-#: src/multitrack.c:4349
+#: src/multitrack.c:4500
 msgid "Mouse mode is: Select."
 msgstr "鼠标模式为：选择。"
 
-#: src/multitrack.c:4350
+#: src/multitrack.c:4501
 msgid "Drag with mouse on timeline"
 msgstr "用鼠标拖动时间线"
 
-#: src/multitrack.c:4351
+#: src/multitrack.c:4502
 msgid "to select tracks and time."
 msgstr "来选择轨道和时间。"
 
-#: src/multitrack.c:4362
+#: src/multitrack.c:4509
 msgid "_Insert mode: Normal"
 msgstr "插入模式：正常(_I)"
 
-#: src/multitrack.c:4378
+#: src/multitrack.c:4537
 msgid "_Mouse mode: Move"
 msgstr "鼠标模式：移动(_M)"
 
-#: src/multitrack.c:4382
+#: src/multitrack.c:4540
 msgid "_Mouse mode: Select"
 msgstr "鼠标模式：选择(_M)"
 
-#: src/multitrack.c:4405 src/multitrack.c:7925
-#, fuzzy
+#: src/multitrack.c:4563 src/multitrack.c:8104
 msgid "Gravity: Normal"
-msgstr "重力：正常(_G)"
+msgstr ""
 
-#: src/multitrack.c:4409
-#, fuzzy
+#: src/multitrack.c:4565
 msgid "Gravity: Left"
-msgstr "重力：左(_G)"
+msgstr ""
 
-#: src/multitrack.c:4414
-#, fuzzy
+#: src/multitrack.c:4569
 msgid "Gravity: Right"
-msgstr "重力：右(_G)"
+msgstr ""
 
-#: src/multitrack.c:4416
+#: src/multitrack.c:4570
 msgid "Close _last gap(s) in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:4419
+#: src/multitrack.c:4572
 msgid "Close _first gap(s) in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:4458
+#: src/multitrack.c:4627
 msgid "Close gaps"
 msgstr "关闭缺口"
 
-#: src/multitrack.c:4460
+#: src/multitrack.c:4629
 msgid "Move block"
 msgstr ""
 
-#: src/multitrack.c:4462
+#: src/multitrack.c:4631
 msgid "Move audio block"
 msgstr ""
 
-#: src/multitrack.c:4464
+#: src/multitrack.c:4633
 msgid "Delete block"
 msgstr "删除区块"
 
-#: src/multitrack.c:4466
+#: src/multitrack.c:4635
 msgid "Delete audio block"
 msgstr ""
 
-#: src/multitrack.c:4468
+#: src/multitrack.c:4637
 msgid "Split tracks"
 msgstr ""
 
-#: src/multitrack.c:4470
+#: src/multitrack.c:4639
 msgid "Split block"
 msgstr ""
 
-#: src/multitrack.c:4473
+#: src/multitrack.c:4642
 #, c-format
 msgid "Apply %s"
 msgstr "应用 %s"
 
-#: src/multitrack.c:4478
+#: src/multitrack.c:4647
 #, c-format
 msgid "Delete %s"
 msgstr "删除 %s"
 
-#: src/multitrack.c:4482
+#: src/multitrack.c:4651
 msgid "Insert block"
 msgstr ""
 
-#: src/multitrack.c:4484
+#: src/multitrack.c:4653
 msgid "Insert gap"
 msgstr ""
 
-#: src/multitrack.c:4486
+#: src/multitrack.c:4655
 msgid "Insert audio block"
 msgstr ""
 
-#: src/multitrack.c:4488
+#: src/multitrack.c:4657
 msgid "Effect order change"
 msgstr "更改特效顺序"
 
-#: src/multitrack.c:4898
+#: src/multitrack.c:5064
 msgid "unsigned "
 msgstr "无符号 "
 
-#: src/multitrack.c:4899
+#: src/multitrack.c:5065
 msgid "signed "
 msgstr "有符号 "
 
-#: src/multitrack.c:4904
+#: src/multitrack.c:5071
 #, c-format
 msgid ""
 "Multitrack values set to %.3f fps, frame size %d x %d, audio channels %d, "
 "audio rate %d, audio sample size %d, %s.\n"
 msgstr ""
 
-#: src/multitrack.c:4938
+#: src/multitrack.c:5104
 msgid "invalid event list. Failed.\n"
 msgstr "无效的事件列表。失败。\n"
 
-#: src/multitrack.c:4944
+#: src/multitrack.c:5110
 msgid "event list has invalid fps. Failed.\n"
 msgstr "事件列表中有无效的帧率。失败。\n"
 
-#: src/multitrack.c:4953
+#: src/multitrack.c:5122
 #, c-format
 msgid ""
 "\n"
@@ -8761,7 +8770,7 @@
 "then load in the new set from the File menu.\n"
 msgstr ""
 
-#: src/multitrack.c:4993
+#: src/multitrack.c:5163
 #, c-format
 msgid ""
 "\n"
@@ -8772,439 +8781,431 @@
 "此布局中的声道数 (%d) 对 LiVES 无效。\n"
 "无法加载。\n"
 
-#: src/multitrack.c:5329 src/multitrack.c:5338 src/multitrack.c:21133
+#: src/multitrack.c:5452
 msgid "Layout was wiped.\n"
 msgstr "布局已擦除。\n"
 
-#: src/multitrack.c:5374
+#: src/multitrack.c:5547
 #, c-format
 msgid "LiVES-%s: Multitrack %dx%d : %d bpp %.3f fps"
 msgstr ""
 
-#: src/multitrack.c:5617
+#: src/multitrack.c:5793
 msgid "In/out"
 msgstr "输入/输出"
 
-#: src/multitrack.c:5619
+#: src/multitrack.c:5795
 msgid "FX stack"
 msgstr ""
 
-#: src/multitrack.c:5627 src/omc-learn.c:673
+#: src/multitrack.c:5803 src/omc-learn.c:659
 msgid "Params."
 msgstr "参数"
 
-#: src/multitrack.c:5978
+#: src/multitrack.c:6157
 msgid "_Open..."
 msgstr "打开(_O)..."
 
-#: src/multitrack.c:5996
+#: src/multitrack.c:6175
 msgid "O_pen File Selection..."
 msgstr "_打开文件选择..."
 
-#: src/multitrack.c:6040
+#: src/multitrack.c:6219
 msgid "Import Selection from _dvd/vcd..."
 msgstr ""
 
-#: src/multitrack.c:6050
+#: src/multitrack.c:6229
 msgid "Import Selection from _dvd"
 msgstr ""
 
-#: src/multitrack.c:6060
+#: src/multitrack.c:6239
 msgid "Import Selection from _vcd"
 msgstr ""
 
-#: src/multitrack.c:6076
+#: src/multitrack.c:6255
 msgid "_Import from Device"
 msgstr "_从设备进口"
 
-#: src/multitrack.c:6103
+#: src/multitrack.c:6282
 msgid "_Close the selected clip"
 msgstr "关闭选择的剪辑(_C)"
 
-#: src/multitrack.c:6198
+#: src/multitrack.c:6377
 msgid "_Save layout as..."
 msgstr "布局保存为(_S)..."
 
-#: src/multitrack.c:6206
+#: src/multitrack.c:6385
 msgid "_Load layout..."
 msgstr "加载布局(_L)..."
 
-#: src/multitrack.c:6210
+#: src/multitrack.c:6389
 msgid "_Wipe/Delete layout..."
 msgstr "擦除/删除布局(_W)..."
 
-#: src/multitrack.c:6236
+#: src/multitrack.c:6415
 msgid "_Ignore width, height and audio values from loaded layouts"
 msgstr "忽略已加载布局中的宽度、高度和音频值(_I)"
 
-#: src/multitrack.c:6240
+#: src/multitrack.c:6419
 msgid "Auto load _subtitles with clips"
 msgstr ""
 
-#: src/multitrack.c:6322
+#: src/multitrack.c:6501
 msgid "_CLIP EDITOR"
 msgstr "剪辑编辑器(_C)"
 
-#: src/multitrack.c:6334
+#: src/multitrack.c:6513
 msgid "_Adjust selected clip start/end points"
 msgstr "调整所选剪辑的始点/终点(_A)"
 
-#: src/multitrack.c:6343
+#: src/multitrack.c:6522
 msgid "_Insert selected clip"
 msgstr "插入选择的剪辑(_I)"
 
-#: src/multitrack.c:6355
+#: src/multitrack.c:6534
 msgid "_Insert selected clip audio"
 msgstr "插入选择的剪辑音频(_I)"
 
-#: src/multitrack.c:6364
+#: src/multitrack.c:6543
 msgid "_Delete selected block"
 msgstr ""
 
-#: src/multitrack.c:6373
+#: src/multitrack.c:6555
 msgid "_Jump to previous block boundary"
 msgstr ""
 
-#: src/multitrack.c:6382
+#: src/multitrack.c:6564
 msgid "_Jump to next block boundary"
 msgstr ""
 
-#: src/multitrack.c:6395
+#: src/multitrack.c:6577
 msgid "Clear _marks from timeline"
 msgstr "清除时间线上的标记(_M)"
 
-#: src/multitrack.c:6403
+#: src/multitrack.c:6585
 msgid "Ignore selection limits when inserting"
 msgstr "在插入时忽略选区限制"
 
-#: src/multitrack.c:6420 src/multitrack.c:16719
+#: src/multitrack.c:6602 src/multitrack.c:17009
 msgid "_Play from Timeline Position"
 msgstr "从时间线位置开始播放(_P)"
 
-#: src/multitrack.c:6434
+#: src/multitrack.c:6616
 msgid "Pla_y selected time only"
 msgstr "只播放选择的时间段(_Y)"
 
-#: src/multitrack.c:6518
+#: src/multitrack.c:6700
 msgid "_Move effects with blocks"
 msgstr ""
 
-#: src/multitrack.c:6531
+#: src/multitrack.c:6713
 msgid "Select _autotransition effect..."
 msgstr "选择自动过渡特效(_A)..."
 
-#: src/multitrack.c:6542
+#: src/multitrack.c:6724
 msgid "Crossfade audio with autotransition"
 msgstr ""
 
-#: src/multitrack.c:6550
+#: src/multitrack.c:6732
 msgid "View/_Edit selected effect"
 msgstr "查看/编辑选择的特效(_E)"
 
-#: src/multitrack.c:6554
+#: src/multitrack.c:6736
 msgid "_Delete selected effect"
 msgstr "删除选择的效果(_D)"
 
-#: src/multitrack.c:6562
+#: src/multitrack.c:6744
 msgid "Apply effect to _block..."
 msgstr ""
 
-#: src/multitrack.c:6619
+#: src/multitrack.c:6801
 msgid "Apply effect to _region..."
 msgstr ""
 
-#: src/multitrack.c:6885
+#: src/multitrack.c:7061
 msgid "_Tracks"
 msgstr "轨道(_T)"
 
-#: src/multitrack.c:6896
+#: src/multitrack.c:7072
 msgid "Rename current track"
 msgstr ""
 
-#: src/multitrack.c:6904
+#: src/multitrack.c:7080
 msgid "Make _Backing Audio current track"
 msgstr ""
 
-#: src/multitrack.c:6915
+#: src/multitrack.c:7091
 msgid "Add Video Track at _Rear"
 msgstr ""
 
-#: src/multitrack.c:6923
+#: src/multitrack.c:7099
 msgid "Add Video Track at _Front"
 msgstr ""
 
-#: src/multitrack.c:6936
+#: src/multitrack.c:7112
 msgid "_Split current track at cursor"
 msgstr "从光标处分割当前轨道(_S)"
 
-#: src/multitrack.c:6948
+#: src/multitrack.c:7124
 msgid "_Split selected video tracks"
 msgstr "分割所选的视频轨道(_S)"
 
-#: src/multitrack.c:6961
+#: src/multitrack.c:7137
 msgid "Insert gap in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:6969
+#: src/multitrack.c:7145
 msgid "Insert gap in current track/selected time"
 msgstr ""
 
-#: src/multitrack.c:6981
+#: src/multitrack.c:7157
 msgid "Close all _gaps in selected tracks/time"
 msgstr ""
 
-#: src/multitrack.c:7007
+#: src/multitrack.c:7183
 msgid "Se_lection"
 msgstr "选区(_L)"
 
-#: src/multitrack.c:7018
+#: src/multitrack.c:7194
 msgid "_Select Current Track"
 msgstr "选择当前轨道(_S)"
 
-#: src/multitrack.c:7025
+#: src/multitrack.c:7201
 msgid "Select _all video tracks"
 msgstr "选择所有视频轨道(_A)"
 
-#: src/multitrack.c:7032
+#: src/multitrack.c:7208
 msgid "Select _no video tracks"
 msgstr "取消选择所有视频轨道(_N)"
 
-#: src/multitrack.c:7039
+#: src/multitrack.c:7215
 msgid "Select all _time"
 msgstr "选择所有时间(_T)"
 
-#: src/multitrack.c:7050
+#: src/multitrack.c:7226
 msgid "Select from _zero time"
 msgstr "从时间开头开始选择(_Z)"
 
-#: src/multitrack.c:7057
+#: src/multitrack.c:7233
 msgid "Select to _end time"
 msgstr "选择到时间末尾(_E)"
 
-#: src/multitrack.c:7064
+#: src/multitrack.c:7240
 msgid "_Copy..."
 msgstr "复制(_C)..."
 
-#: src/multitrack.c:7075
+#: src/multitrack.c:7251
 msgid "_Timecode to region start"
 msgstr ""
 
-#: src/multitrack.c:7082
+#: src/multitrack.c:7258
 msgid "_Timecode to region end"
 msgstr ""
 
-#: src/multitrack.c:7089
+#: src/multitrack.c:7265
 msgid "_Region start to timecode"
 msgstr ""
 
-#: src/multitrack.c:7096
+#: src/multitrack.c:7272
 msgid "_Region end to timecode"
 msgstr ""
 
-#: src/multitrack.c:7110
+#: src/multitrack.c:7286
 msgid "Select/deselect block at current track/time"
 msgstr ""
 
-#: src/multitrack.c:7135
+#: src/multitrack.c:7311
 msgid "_Change width, height and audio values..."
 msgstr "更改宽度、高度和音频值(_C)..."
 
-#: src/multitrack.c:7194
+#: src/multitrack.c:7370
 msgid "_Render"
 msgstr "渲染(_R)"
 
-#: src/multitrack.c:7205
+#: src/multitrack.c:7381
 msgid "_Render all to new clip"
 msgstr "渲染所有到新剪辑(_R)"
 
-#: src/multitrack.c:7220
+#: src/multitrack.c:7396
 msgid "Render _video"
 msgstr "渲染视频(_V)"
 
-#: src/multitrack.c:7225
+#: src/multitrack.c:7401
 msgid "Render _audio"
 msgstr "渲染音频(_A)"
 
-#: src/multitrack.c:7235
+#: src/multitrack.c:7411
 msgid "_Normalise rendered audio"
 msgstr ""
 
-#: src/multitrack.c:7242
+#: src/multitrack.c:7418
 msgid "_Pre-render audio"
 msgstr "预渲染音频(_P)"
 
-#: src/multitrack.c:7251
+#: src/multitrack.c:7427
 msgid "_View"
 msgstr "视图(_V)"
 
-#: src/multitrack.c:7270
+#: src/multitrack.c:7446
 msgid "Block _In/out points"
 msgstr ""
 
-#: src/multitrack.c:7279
+#: src/multitrack.c:7455
 msgid "_Effects at current"
 msgstr "当前特效(_E)"
 
-#: src/multitrack.c:7297
+#: src/multitrack.c:7473
 msgid "Audio parameters"
 msgstr "音频参数"
 
-#: src/multitrack.c:7308
+#: src/multitrack.c:7484
 msgid "Show backing _audio track"
 msgstr ""
 
-#: src/multitrack.c:7312
+#: src/multitrack.c:7488
 msgid "Compact view"
 msgstr "紧凑视图"
 
-#: src/multitrack.c:7320
+#: src/multitrack.c:7496
 msgid "Maximum tracks to display..."
 msgstr "显示的最大轨道数目..."
 
-#: src/multitrack.c:7327
+#: src/multitrack.c:7503
 msgid "Scroll to follow playback"
 msgstr ""
 
-#: src/multitrack.c:7331
+#: src/multitrack.c:7507
 msgid "_Center on cursor"
 msgstr "沿光标居中(_C)"
 
-#: src/multitrack.c:7338
+#: src/multitrack.c:7514
 msgid "_Zoom in"
 msgstr "拉近(_Z)"
 
-#: src/multitrack.c:7349
+#: src/multitrack.c:7525
 msgid "_Zoom out"
 msgstr "推远(_Z)"
 
-#: src/multitrack.c:7361
+#: src/multitrack.c:7537
 msgid "Multitrack _details"
 msgstr "多轨道细节(_D)"
 
-#: src/multitrack.c:7374
+#: src/multitrack.c:7550
 msgid "_Event Window"
 msgstr "事件窗口(_E)"
 
-#: src/multitrack.c:7378
+#: src/multitrack.c:7554
 msgid "_Event Window (selected time only)"
 msgstr "事件窗口(只针对选择的时间)(_E)"
 
-#: src/multitrack.c:7382
+#: src/multitrack.c:7558
 msgid "_Show FRAME events"
 msgstr "显示帧事件(_S)"
 
-#: src/multitrack.c:7399
+#: src/multitrack.c:7575
 msgid "_Show multitrack keys"
 msgstr "显示多轨道键(_S)"
 
-#: src/multitrack.c:7468
+#: src/multitrack.c:7644
 msgid "Mouse mode: _Move"
 msgstr "鼠标模式：移动(_M)"
 
-#: src/multitrack.c:7476
+#: src/multitrack.c:7652
 msgid "Mouse mode: _Select"
 msgstr "鼠标模式：(_S)"
 
-#: src/multitrack.c:7505
+#: src/multitrack.c:7681
 msgid "Insert mode: _Normal"
 msgstr "插入模式：正常(_N)"
 
-#: src/multitrack.c:7733
+#: src/multitrack.c:7909
 msgid "Insert with _audio"
 msgstr "和音频一同插入(_A)"
 
-#: src/multitrack.c:7734
+#: src/multitrack.c:7910
 msgid ""
 "Select whether video clips are inserted and moved with their audio or not"
 msgstr "选择是否将视频剪辑和所带的音频一起插入或移动"
 
-#: src/multitrack.c:7829
+#: src/multitrack.c:8007
 msgid "Select _overlap"
 msgstr "选择重叠(_O)"
 
-#: src/multitrack.c:7830
+#: src/multitrack.c:8008
 msgid ""
 "Select whether timeline selection snaps to overlap between selected tracks "
 "or not"
 msgstr "选择时间线选区是否捕获到所选轨道的重叠处"
 
-#: src/multitrack.c:7894 src/multitrack.c:14198
+#: src/multitrack.c:8073 src/multitrack.c:14422
 msgid "Expanded View (d)"
 msgstr "扩展视图(d)"
 
-#: src/multitrack.c:7897 src/multitrack.c:14205
+#: src/multitrack.c:8076 src/multitrack.c:14428
 msgid "Compact View (d)"
 msgstr "紧凑视图(d)"
 
-#: src/multitrack.c:7939
+#: src/multitrack.c:8118
 msgid "Gravity: _Normal"
 msgstr "重力：正常(_N)"
 
-#: src/multitrack.c:7952
+#: src/multitrack.c:8131
 msgid "Gravity: _Left"
 msgstr "重力：左(_L)"
 
-#: src/multitrack.c:7967
+#: src/multitrack.c:8146
 msgid "Gravity: _Right"
 msgstr "重力：右(_R)"
 
-#: src/multitrack.c:8297
+#: src/multitrack.c:8496
 msgid "_Apply"
 msgstr "应用(_A)"
 
-#: src/multitrack.c:8319
+#: src/multitrack.c:8518
 msgid "Time"
 msgstr "时间"
 
-#: src/multitrack.c:8333
+#: src/multitrack.c:8532
 msgid "_Del. node"
 msgstr ""
 
-#: src/multitrack.c:8341
+#: src/multitrack.c:8540
 msgid "_Next node"
 msgstr ""
 
-#: src/multitrack.c:8349
+#: src/multitrack.c:8548
 msgid "_Prev node"
 msgstr ""
 
-#: src/multitrack.c:8373
+#: src/multitrack.c:8574
 msgid "_Reverse playback  "
 msgstr ""
 
-#: src/multitrack.c:8395
+#: src/multitrack.c:8596
 msgid "_Velocity  "
 msgstr "速率(_V)  "
 
-#: src/multitrack.c:8464
+#: src/multitrack.c:8664
 msgid "Anchor _start"
 msgstr ""
 
-#: src/multitrack.c:8465
+#: src/multitrack.c:8665
 msgid "Anchor the start point to the timeline"
 msgstr ""
 
-#: src/multitrack.c:8481
-msgid "Start frame"
-msgstr "起始帧"
-
-#: src/multitrack.c:8533
+#: src/multitrack.c:8728
 msgid "Anchor _end"
 msgstr ""
 
-#: src/multitrack.c:8534
+#: src/multitrack.c:8729
 msgid "Anchor the end point to the timeline"
 msgstr ""
 
-#: src/multitrack.c:8546
-msgid "End frame"
-msgstr "结尾帧"
-
-#: src/multitrack.c:8739
+#: src/multitrack.c:8929
 msgid "Scroll"
 msgstr "滚动"
 
-#: src/multitrack.c:9316
+#: src/multitrack.c:9502
 msgid ""
 "\n"
 "==============================\n"
@@ -9214,91 +9215,91 @@
 "==============================\n"
 "已切换到剪辑编辑方式\n"
 
-#: src/multitrack.c:9502
+#: src/multitrack.c:9708
 msgid "Timeline (seconds)"
 msgstr "时间线(秒)"
 
-#: src/multitrack.c:9984
+#: src/multitrack.c:10202
 msgid " Backing audio"
 msgstr ""
 
-#: src/multitrack.c:9987
+#: src/multitrack.c:10204
 #, c-format
 msgid " Layer %d audio"
 msgstr " 层 %d 音频"
 
-#: src/multitrack.c:9995
+#: src/multitrack.c:10212
 msgid "Show/hide audio details"
 msgstr "显示/隐藏音频细节"
 
-#: src/multitrack.c:10010 src/multitrack.c:10232
+#: src/multitrack.c:10227 src/multitrack.c:10452
 #, c-format
 msgid "Layer %d audio"
 msgstr "层 %d 的音频"
 
-#: src/multitrack.c:10144 src/multitrack.c:10261
+#: src/multitrack.c:10353 src/multitrack.c:10481
 #, c-format
 msgid "%s (layer %d)"
 msgstr "%s (层 %d)"
 
-#: src/multitrack.c:10184
+#: src/multitrack.c:10403
 msgid "Select track"
 msgstr "选择轨道"
 
-#: src/multitrack.c:10188
+#: src/multitrack.c:10407
 msgid "Show/hide audio"
 msgstr "显示/隐藏音频"
 
-#: src/multitrack.c:10194
+#: src/multitrack.c:10413
 #, c-format
 msgid "Video %d"
 msgstr "视频 %d"
 
-#: src/multitrack.c:10233
+#: src/multitrack.c:10453
 #, c-format
 msgid " %s"
 msgstr " %s"
 
-#: src/multitrack.c:10346
+#: src/multitrack.c:10574
 msgid "LiVES: Selected effect"
 msgstr "LiVES：已选特效"
 
-#: src/multitrack.c:10358
+#: src/multitrack.c:10586
 msgid "_View/Edit this effect"
 msgstr "查看/编辑此特效(_V)"
 
-#: src/multitrack.c:10361
+#: src/multitrack.c:10588
 msgid "_View this effect"
 msgstr "查看此特效(_V)"
 
-#: src/multitrack.c:10369
+#: src/multitrack.c:10596
 msgid "_Delete this effect"
 msgstr "删除此特效(_D)"
 
-#: src/multitrack.c:10422
+#: src/multitrack.c:10648
 msgid "Cannot insert after this effect"
 msgstr "无法在此特效后插入"
 
-#: src/multitrack.c:10451
+#: src/multitrack.c:10677
 msgid "This effect cannot be moved"
 msgstr "此特效无法移除"
 
-#: src/multitrack.c:10499
+#: src/multitrack.c:10724
 #, c-format
 msgid "  %d to %d selected  "
 msgstr "  已选择 %d 到 %d  "
 
-#: src/multitrack.c:10502 src/multitrack.c:10746
+#: src/multitrack.c:10727 src/multitrack.c:10968
 #, c-format
 msgid "%.2f sec."
 msgstr "%.2f 秒"
 
-#: src/multitrack.c:10717
+#: src/multitrack.c:10940
 #, c-format
 msgid "%d frames"
 msgstr "%d 帧"
 
-#: src/multitrack.c:11070
+#: src/multitrack.c:11299
 msgid ""
 "\n"
 "==============================\n"
@@ -9308,70 +9309,70 @@
 "==============================\n"
 "已切换到多轨道模式\n"
 
-#: src/multitrack.c:12691
+#: src/multitrack.c:12939
 msgid "Drag the time slider to where you"
 msgstr "将时间滑块拖到您"
 
-#: src/multitrack.c:12692
+#: src/multitrack.c:12940
 msgid "want to set effect parameters"
 msgstr "想要设置特效参数的地方"
 
-#: src/multitrack.c:12693
+#: src/multitrack.c:12941
 msgid "Set parameters, then click \"Apply\"\n"
 msgstr "设置参数，然后点击“应用”\n"
 
-#: src/multitrack.c:12694
+#: src/multitrack.c:12942
 msgid ""
 "NODES are points where parameters\n"
 "have been set.\n"
 "Nodes can be deleted."
 msgstr ""
 
-#: src/multitrack.c:12697
+#: src/multitrack.c:12944
 msgid "Effect has no parameters.\n"
 msgstr "特效没有参数。\n"
 
-#: src/multitrack.c:12788
+#: src/multitrack.c:13033
 #, c-format
 msgid "%s output"
 msgstr "%s 输出"
 
-#: src/multitrack.c:12794 src/multitrack.c:12804
+#: src/multitrack.c:13038 src/multitrack.c:13046
 #, c-format
 msgid "layer %d"
 msgstr "层 %d"
 
-#: src/multitrack.c:12796 src/multitrack.c:12806
+#: src/multitrack.c:13039 src/multitrack.c:13047
 msgid "audio track"
 msgstr "音轨"
 
-#: src/multitrack.c:12797
+#: src/multitrack.c:13040
 #, c-format
 msgid "%s to %s"
 msgstr "%s 到 %s"
 
-#: src/multitrack.c:12807
+#: src/multitrack.c:13048
 #, c-format
 msgid "%s from %s"
 msgstr ""
 
-#: src/multitrack.c:12860
+#: src/multitrack.c:13099
 msgid "_Prev filter map"
 msgstr ""
 
-#: src/multitrack.c:12871
+#: src/multitrack.c:13110
 msgid "Insert _before"
 msgstr "插入前面(_B)"
 
-#: src/multitrack.c:12881
+#: src/multitrack.c:13120
 msgid "Insert _after"
 msgstr "插入后面(_A)"
 
-#: src/multitrack.c:12896
+#: src/multitrack.c:13134
 msgid "_Next filter map"
 msgstr ""
 
-#: src/multitrack.c:12911
+#: src/multitrack.c:13148
 msgid ""
 "\n"
 "\n"
@@ -9383,154 +9384,154 @@
 "当前轨道、当前时刻\n"
 "无特效。\n"
 
-#: src/multitrack.c:12929
+#: src/multitrack.c:13166
 msgid ""
 "Drag a compositor anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:12936
+#: src/multitrack.c:13173
 msgid ""
 "Drag a transition anywhere\n"
 "on the timeline\n"
 "to apply it to the selected region."
 msgstr ""
 
-#: src/multitrack.c:12944
+#: src/multitrack.c:13181
 msgid ""
 "Effects can be dragged\n"
 "onto blocks on the timeline."
 msgstr ""
 
-#: src/multitrack.c:13166
+#: src/multitrack.c:13406
 msgid "LiVES: Selected block/frame"
 msgstr ""
 
-#: src/multitrack.c:13173
+#: src/multitrack.c:13413
 msgid "_Select this block"
 msgstr ""
 
-#: src/multitrack.c:13183
+#: src/multitrack.c:13423
 msgid "_Split block here"
 msgstr ""
 
-#: src/multitrack.c:13191
+#: src/multitrack.c:13431
 msgid "List _effects here"
 msgstr "在此列出效果(_E)"
 
-#: src/multitrack.c:13200 src/multitrack.c:13277
+#: src/multitrack.c:13440 src/multitrack.c:13518
 #, c-format
 msgid "_Adjust %s"
 msgstr "调整 %s(_A)"
 
-#: src/multitrack.c:13215
+#: src/multitrack.c:13455
 msgid "_Delete this block"
 msgstr ""
 
-#: src/multitrack.c:13258
+#: src/multitrack.c:13500
 msgid "_Insert here"
 msgstr "在此插入(_I)"
 
-#: src/multitrack.c:13264
+#: src/multitrack.c:13505
 msgid "_Insert audio here"
 msgstr "在此插入音频(_I)"
 
-#: src/multitrack.c:14801
+#: src/multitrack.c:15017
 #, c-format
 msgid "Inserted gap in selected tracks from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:14835
+#: src/multitrack.c:15048
 #, c-format
 msgid "Inserted gap in track %s from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15036
+#: src/multitrack.c:15244
 #, c-format
 msgid "Undid %s\n"
 msgstr ""
 
-#: src/multitrack.c:15235
+#: src/multitrack.c:15445
 #, c-format
 msgid "Redid %s\n"
 msgstr ""
 
-#: src/multitrack.c:15268
+#: src/multitrack.c:15475
 msgid ""
 "\n"
 " (variable)"
 msgstr ""
 
-#: src/multitrack.c:15502 src/multitrack.c:15614 src/multitrack.c:18736
-#: src/multitrack.c:18748
+#: src/multitrack.c:15710 src/multitrack.c:15823 src/multitrack.c:19077
+#: src/multitrack.c:19089
 #, c-format
 msgid "track %s"
 msgstr "轨道 %s"
 
-#: src/multitrack.c:15507 src/multitrack.c:15619 src/multitrack.c:18741
+#: src/multitrack.c:15715 src/multitrack.c:15828 src/multitrack.c:19082
 #, c-format
 msgid "tracks %s and %s"
 msgstr "轨道 %s 和 %s"
 
-#: src/multitrack.c:15513 src/multitrack.c:15625 src/multitrack.c:18751
+#: src/multitrack.c:15721 src/multitrack.c:15834 src/multitrack.c:19091
 msgid "selected tracks"
 msgstr "已选择的轨道"
 
-#: src/multitrack.c:15516
+#: src/multitrack.c:15726
 #, c-format
 msgid "Added %s %s to %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15550
+#: src/multitrack.c:15760
 #, c-format
 msgid "Added effect %s to track %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15631
+#: src/multitrack.c:15845
 #, c-format
 msgid "Deleted %s %s from %s from %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:15935
+#: src/multitrack.c:16143
 #, c-format
 msgid "rendered %d frames to new clip.\n"
 msgstr ""
 
-#: src/multitrack.c:16025
+#: src/multitrack.c:16230
 msgid "Cleaning up..."
 msgstr "正在清理..."
 
-#: src/multitrack.c:16712
+#: src/multitrack.c:17003
 msgid "_Pause"
 msgstr "暂停(_P)"
 
-#: src/multitrack.c:16713
+#: src/multitrack.c:17004
 msgid "Pause (p)"
 msgstr "暂停(p)"
 
-#: src/multitrack.c:16856
+#: src/multitrack.c:17151
 msgid "Press 'm' during playback"
 msgstr "在播放过程中按“m”键"
 
-#: src/multitrack.c:16857
+#: src/multitrack.c:17152
 msgid "to make a mark on the timeline"
 msgstr "要在时间线上做标记"
 
-#: src/multitrack.c:17154
+#: src/multitrack.c:17498
 #, c-format
 msgid ""
 "Inserted audio %.4f to %.4f from clip %s into backing audio from time %.4f "
 "to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:17414
+#: src/multitrack.c:17759
 #, c-format
 msgid ""
 "Inserted frames %d to %d from clip %s into track %s from time %.4f to %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:17998
+#: src/multitrack.c:18332
 #, c-format
 msgid ""
 "Time region %.3f to %.3f\n"
@@ -9539,7 +9540,7 @@
 "时间区段 %.3f 到 %.3f\n"
 "已选择。\n"
 
-#: src/multitrack.c:18002
+#: src/multitrack.c:18336
 msgid ""
 "select one or more tracks\n"
 "to create a region.\n"
@@ -9547,12 +9548,12 @@
 "选择一条或多条轨道\n"
 "来创建一个区段。\n"
 
-#: src/multitrack.c:18004
+#: src/multitrack.c:18337
 #, c-format
 msgid "%d video tracks selected.\n"
 msgstr "已选择了 %d 条视频轨道。\n"
 
-#: src/multitrack.c:18006
+#: src/multitrack.c:18339
 msgid ""
 "Double click on timeline\n"
 "to deselect time region."
@@ -9560,7 +9561,7 @@
 "双击时间线来\n"
 "取消时间区段选择。"
 
-#: src/multitrack.c:18013
+#: src/multitrack.c:18346
 msgid ""
 "Single click on an effect\n"
 "to select it."
@@ -9568,7 +9569,7 @@
 "单击某个效果来\n"
 "选中它。"
 
-#: src/multitrack.c:18014
+#: src/multitrack.c:18347
 msgid ""
 "Double click on an effect\n"
 "to edit it."
@@ -9576,7 +9577,7 @@
 "双击某个效果\n"
 "进行编辑。"
 
-#: src/multitrack.c:18015
+#: src/multitrack.c:18348
 msgid ""
 "Right click on an effect\n"
 "for context menu.\n"
@@ -9584,13 +9585,13 @@
 "右击某个效果来\n"
 "打开环境菜单。\n"
 
-#: src/multitrack.c:18017
+#: src/multitrack.c:18350
 msgid ""
 "Effect order can be changed at\n"
 "FILTER MAPS"
 msgstr ""
 
-#: src/multitrack.c:18024
+#: src/multitrack.c:18357
 msgid ""
 "You can select an effect,\n"
 "then use the INSERT BEFORE"
@@ -9598,15 +9599,15 @@
 "您可以选择一个特效，\n"
 "然后使用 插入前面"
 
-#: src/multitrack.c:18025
+#: src/multitrack.c:18358
 msgid "or INSERT AFTER buttons to move it."
 msgstr "或 插入后面 按钮来移动它。"
 
-#: src/multitrack.c:18307 src/multitrack.c:18320
+#: src/multitrack.c:18639 src/multitrack.c:18652
 msgid "Click on another effect,"
 msgstr "点击另一个效果，"
 
-#: src/multitrack.c:18308 src/multitrack.c:18321
+#: src/multitrack.c:18640 src/multitrack.c:18653
 msgid ""
 "and the selected one\n"
 "will be inserted"
@@ -9614,51 +9615,50 @@
 "和所选的这个\n"
 "将被插入"
 
-#: src/multitrack.c:18309
+#: src/multitrack.c:18641
 msgid "after it.\n"
 msgstr "在它之后。\n"
 
-#: src/multitrack.c:18322
+#: src/multitrack.c:18654
 msgid "before it.\n"
 msgstr "在它之前。\n"
 
-#: src/multitrack.c:18551
+#: src/multitrack.c:18889
 #, c-format
 msgid "Removed parameter values for effect %s at time %.4f\n"
 msgstr "已移除效果 %s 的参数值，于时间 %.4f\n"
 
-#: src/multitrack.c:18759
+#: src/multitrack.c:19100
 #, c-format
 msgid "Set parameter values for %s %s on %s at time %.4f\n"
 msgstr ""
 
-#: src/multitrack.c:19251 src/multitrack.c:20873
+#: src/multitrack.c:19630 src/multitrack.c:21195
 msgid "_Autoreload each time"
 msgstr "每次都自动重载(_A)"
 
-#: src/multitrack.c:19323
-#, fuzzy
+#: src/multitrack.c:19702
 msgid "Saving layout"
-msgstr "_保存布局"
+msgstr ""
 
-#: src/multitrack.c:19345
+#: src/multitrack.c:19725
 #, c-format
 msgid "Saved layout to %s\n"
 msgstr "将布局保存到 %s\n"
 
-#: src/multitrack.c:20783
+#: src/multitrack.c:21125
 msgid "clips and frames"
 msgstr "剪辑和帧"
 
-#: src/multitrack.c:20787
+#: src/multitrack.c:21128
 msgid "clips"
 msgstr "剪辑"
 
-#: src/multitrack.c:20790
+#: src/multitrack.c:21130
 msgid "frames"
 msgstr "画面"
 
-#: src/multitrack.c:20800
+#: src/multitrack.c:21140
 msgid ""
 "\n"
 "Auto reload layout.\n"
@@ -9666,7 +9666,7 @@
 "\n"
 "自动重载布局。\n"
 
-#: src/multitrack.c:20803
+#: src/multitrack.c:21143
 #, c-format
 msgid ""
 "%s\n"
@@ -9677,11 +9677,11 @@
 "有些 %s 在布局 %s 中找不到\n"
 "因此不能正确加载。\n"
 
-#: src/multitrack.c:20920
+#: src/multitrack.c:21284
 msgid "auto backup"
 msgstr "自动备份"
 
-#: src/multitrack.c:20923
+#: src/multitrack.c:21287
 #, c-format
 msgid ""
 "\n"
@@ -9690,92 +9690,89 @@
 "\n"
 "无法加载布局文件 %s\n"
 
-#: src/multitrack.c:20944
+#: src/multitrack.c:21308
 #, c-format
 msgid "Loading layout from %s..."
 msgstr "正在从 %s 加载布局..."
 
-#: src/multitrack.c:20978
+#: src/multitrack.c:21338
 #, c-format
 msgid "Got %d events...processing..."
 msgstr "收到 %d 个事件...处理中..."
 
-#: src/multitrack.c:20991
+#: src/multitrack.c:21349
 msgid "Checking and rebuilding event list"
 msgstr "正在检测和重新构建事件列表"
 
-#: src/multitrack.c:21017
+#: src/multitrack.c:21374
 #, c-format
 msgid "%d errors detected.\n"
 msgstr "检测到 %d 项错误。\n"
 
-#: src/multitrack.c:21068
+#: src/multitrack.c:21422
 #, c-format
 msgid "Multitrack fps set to %.3f\n"
 msgstr ""
 
-#: src/multitrack.c:21225
-#, fuzzy
+#: src/multitrack.c:21576
 msgid ""
 "The current layout has changes which have not been saved.\n"
 "Are you sure you wish to wipe it ?\n"
 msgstr ""
-"当前的布局尚未保存。\n"
-"你打算保存吗？\n"
 
-#: src/multitrack.c:22047
+#: src/multitrack.c:22385
 msgid "LiVES: Multitrack audio mixer"
 msgstr "LiVES：多轨音频混音器"
 
-#: src/multitrack.c:22077
+#: src/multitrack.c:22414
 msgid "_Reset values"
 msgstr "重设值(_R)"
 
-#: src/multitrack.c:22081
+#: src/multitrack.c:22418
 msgid "_Close mixer"
 msgstr "关闭混音器(_C)"
 
-#: src/multitrack.c:22130
+#: src/multitrack.c:22466
 msgid ""
 "_Invert backing audio\n"
 "and layer volumes"
 msgstr ""
 
-#: src/multitrack.c:22132
+#: src/multitrack.c:22468
 msgid "Adjust backing and layer audio values so that they sum to 1.0"
 msgstr ""
 
-#: src/multitrack.c:22175
+#: src/multitrack.c:22510
 msgid "_Gang layer audio"
 msgstr ""
 
-#: src/multitrack.c:22177
+#: src/multitrack.c:22512
 msgid "Adjust all layer audio values to the same value"
 msgstr "将所有层的音频值调整为相同值"
 
-#: src/jack.c:104
+#: src/jack.c:102
 msgid "JACK server started\n"
 msgstr "JACK 服务器已启动\n"
 
-#: src/jack.c:1284 src/jack.c:1353
+#: src/jack.c:1265 src/jack.c:1334
 msgid "Unable to connect to JACK server\n"
 msgstr "无法连接 JACK 服务器\n"
 
-#: src/jack.c:1512
+#: src/jack.c:1491
 msgid "Started jack audio subsystem.\n"
 msgstr "已启动 jack 音频子系统。\n"
 
-#: src/jack.c:1623
+#: src/jack.c:1600
 msgid "Started jack audio reader.\n"
 msgstr "已启动 jack 音频读取器。\n"
 
-#: src/jack.c:1838
+#: src/jack.c:1815
 msgid ""
 "\n"
 "Connection to jack audio was reset.\n"
 msgstr ""
 
-#: src/pulse.c:87
+#: src/pulse.c:88
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -9783,7 +9780,7 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:92
+#: src/pulse.c:94
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -9791,7 +9788,7 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:96
+#: src/pulse.c:99
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
@@ -9799,335 +9796,335 @@
 "You can change this in Preferences/Playback.\n"
 msgstr ""
 
-#: src/pulse.c:101
+#: src/pulse.c:104
 msgid ""
 "\n"
 "Unable to connect to pulse audio server.\n"
 msgstr ""
 
-#: src/pulse.c:107
+#: src/pulse.c:109
 msgid "LiVES will exit and you can choose another audio player.\n"
 msgstr ""
 
-#: src/pulse.c:1352
+#: src/pulse.c:1335
 msgid ""
 "\n"
 "Connection to pulse audio was reset.\n"
 msgstr ""
 
-#: src/colourspace.c:1100
+#: src/colourspace.c:1092
 msgid "unclamped"
 msgstr ""
 
-#: src/colourspace.c:1101
+#: src/colourspace.c:1093
 msgid "clamped"
 msgstr ""
 
-#: src/omc-learn.c:195
+#: src/omc-learn.c:191
 #, c-format
 msgid "Responding to joystick events from %s\n"
 msgstr "正在响应来自 %s 的游戏杆事件\n"
 
-#: src/omc-learn.c:289
+#: src/omc-learn.c:279
 msgid "Creating ALSA seq port..."
 msgstr ""
 
-#: src/omc-learn.c:325
+#: src/omc-learn.c:313
 #, c-format
 msgid "Responding to MIDI events from %s\n"
 msgstr "正在响应来自 %s 的 MIDI 事件\n"
 
-#: src/omc-learn.c:568
+#: src/omc-learn.c:554
 msgid "data"
 msgstr "数据"
 
-#: src/omc-learn.c:571
+#: src/omc-learn.c:557
 msgid "velocity"
 msgstr "速度"
 
-#: src/omc-learn.c:572
+#: src/omc-learn.c:558
 msgid "note"
 msgstr "笔记"
 
-#: src/omc-learn.c:574 src/omc-learn.c:736 src/omc-learn.c:1105
-#: src/omc-learn.c:1591 src/omc-learn.c:1640
+#: src/omc-learn.c:560 src/omc-learn.c:724 src/omc-learn.c:1092
+#: src/omc-learn.c:1581 src/omc-learn.c:1630
 msgid "value"
 msgstr "值"
 
-#: src/omc-learn.c:576
+#: src/omc-learn.c:562
 msgid "state"
 msgstr "状态"
 
-#: src/omc-learn.c:688
+#: src/omc-learn.c:674
 msgid "variable"
 msgstr "变量"
 
-#: src/omc-learn.c:1001
+#: src/omc-learn.c:989
 msgid "Vars."
 msgstr "变量"
 
-#: src/omc-learn.c:1054
+#: src/omc-learn.c:1041
 #, c-format
 msgid "MIDI ch %d note on"
 msgstr ""
 
-#: src/omc-learn.c:1058
+#: src/omc-learn.c:1045
 #, c-format
 msgid "MIDI ch %d note off"
 msgstr ""
 
-#: src/omc-learn.c:1062
+#: src/omc-learn.c:1049
 #, c-format
 msgid "MIDI ch %d controller %d"
 msgstr ""
 
-#: src/omc-learn.c:1066
+#: src/omc-learn.c:1053
 #, c-format
 msgid "MIDI ch %d pitch bend"
 msgstr ""
 
-#: src/omc-learn.c:1070
+#: src/omc-learn.c:1057
 #, c-format
 msgid "MIDI ch %d pgm change"
 msgstr ""
 
-#: src/omc-learn.c:1073
+#: src/omc-learn.c:1060
 #, c-format
 msgid "Joystick button %d"
 msgstr ""
 
-#: src/omc-learn.c:1076
+#: src/omc-learn.c:1063
 #, c-format
 msgid "Joystick axis %d"
 msgstr ""
 
-#: src/omc-learn.c:1113
+#: src/omc-learn.c:1100
 msgid "x"
 msgstr "水平"
 
-#: src/omc-learn.c:1122
+#: src/omc-learn.c:1109
 msgid "range"
 msgstr "范围"
 
-#: src/omc-learn.c:1143
+#: src/omc-learn.c:1130
 msgid "+ offset1"
 msgstr ""
 
-#: src/omc-learn.c:1161
+#: src/omc-learn.c:1150
 msgid "* scale"
 msgstr ""
 
-#: src/omc-learn.c:1179
+#: src/omc-learn.c:1170
 msgid "+ offset2"
 msgstr ""
 
-#: src/omc-learn.c:1280
+#: src/omc-learn.c:1270
 msgid ""
 "\n"
 "Click OK to delete all entries\n"
 msgstr ""
 
-#: src/omc-learn.c:1318
+#: src/omc-learn.c:1308
 msgid "LiVES: OMC learner"
 msgstr ""
 
-#: src/omc-learn.c:1334
+#: src/omc-learn.c:1324
 msgid "Clear _unmatched"
 msgstr ""
 
-#: src/omc-learn.c:1345
+#: src/omc-learn.c:1335
 msgid "_Delete all"
 msgstr "全部删除(_D)"
 
-#: src/omc-learn.c:1411
+#: src/omc-learn.c:1401
 msgid "Start video playback"
 msgstr "开始播放视频"
 
-#: src/omc-learn.c:1414
+#: src/omc-learn.c:1404
 msgid "Stop video playback"
 msgstr "停止播放视频"
 
-#: src/omc-learn.c:1418
+#: src/omc-learn.c:1408
 msgid "Clip select <clipnum>"
 msgstr ""
 
-#: src/omc-learn.c:1419
+#: src/omc-learn.c:1409
 msgid "Switch foreground clip to the nth valid clip"
 msgstr ""
 
-#: src/omc-learn.c:1423
+#: src/omc-learn.c:1413
 msgid "Play forwards"
 msgstr ""
 
-#: src/omc-learn.c:1424
+#: src/omc-learn.c:1414
 msgid "Play video in a forwards direction"
 msgstr ""
 
-#: src/omc-learn.c:1427
+#: src/omc-learn.c:1417
 msgid "Play backwards"
 msgstr ""
 
-#: src/omc-learn.c:1428
+#: src/omc-learn.c:1418
 msgid "Play video in a backwards direction"
 msgstr ""
 
-#: src/omc-learn.c:1431
+#: src/omc-learn.c:1421
 msgid "Reverse playback direction"
 msgstr ""
 
-#: src/omc-learn.c:1432
+#: src/omc-learn.c:1422
 msgid "Reverse direction of video playback"
 msgstr ""
 
-#: src/omc-learn.c:1435
+#: src/omc-learn.c:1425
 msgid "Play video faster"
 msgstr ""
 
-#: src/omc-learn.c:1436
+#: src/omc-learn.c:1426
 msgid "Play video at a slightly faster rate"
 msgstr ""
 
-#: src/omc-learn.c:1439
+#: src/omc-learn.c:1429
 msgid "Play video slower"
 msgstr ""
 
-#: src/omc-learn.c:1440
+#: src/omc-learn.c:1430
 msgid "Play video at a slightly slower rate"
 msgstr ""
 
-#: src/omc-learn.c:1443
+#: src/omc-learn.c:1433
 msgid "Toggle video freeze"
 msgstr ""
 
-#: src/omc-learn.c:1444
+#: src/omc-learn.c:1434
 msgid "Freeze video, or if already frozen, unfreeze it"
 msgstr ""
 
-#: src/omc-learn.c:1447
+#: src/omc-learn.c:1437
 msgid "Set video framerate to <fps>"
 msgstr ""
 
-#: src/omc-learn.c:1448
+#: src/omc-learn.c:1438
 msgid "Set framerate of foreground clip to <float fps>"
 msgstr ""
 
-#: src/omc-learn.c:1452
+#: src/omc-learn.c:1442
 msgid "Start recording"
 msgstr "开始录制"
 
-#: src/omc-learn.c:1455
+#: src/omc-learn.c:1445
 msgid "Stop recording"
 msgstr "停止录制"
 
-#: src/omc-learn.c:1458
+#: src/omc-learn.c:1448
 msgid "Toggle recording state"
 msgstr ""
 
-#: src/omc-learn.c:1461
+#: src/omc-learn.c:1451
 msgid "Swap foreground and background clips"
 msgstr ""
 
-#: src/omc-learn.c:1463
+#: src/omc-learn.c:1453
 msgid "Reset effect keys"
 msgstr ""
 
-#: src/omc-learn.c:1464
+#: src/omc-learn.c:1454
 msgid "Switch all effects off."
 msgstr "关闭所有效果。"
 
-#: src/omc-learn.c:1467
+#: src/omc-learn.c:1457
 msgid "Enable effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1471
+#: src/omc-learn.c:1461
 msgid "Disable effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1475
+#: src/omc-learn.c:1465
 msgid "Toggle effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1479
+#: src/omc-learn.c:1469
 msgid "Set parameter value <key> <pnum> = <value>"
 msgstr ""
 
-#: src/omc-learn.c:1480
+#: src/omc-learn.c:1470
 msgid "Set <value> of pth (numerical) parameter for effect key <key>."
 msgstr ""
 
-#: src/omc-learn.c:1484
+#: src/omc-learn.c:1474
 msgid "Switch foreground to next clip"
 msgstr ""
 
-#: src/omc-learn.c:1487
+#: src/omc-learn.c:1477
 msgid "Switch foreground to previous clip"
 msgstr ""
 
-#: src/omc-learn.c:1490
+#: src/omc-learn.c:1480
 msgid "Set video framerate to ratio <fps_ratio>"
 msgstr ""
 
-#: src/omc-learn.c:1491
+#: src/omc-learn.c:1481
 msgid "Set framerate ratio of foreground clip to <float fps_ratio>"
 msgstr ""
 
-#: src/omc-learn.c:1495
+#: src/omc-learn.c:1485
 msgid "Retrigger clip <clipnum>"
 msgstr ""
 
-#: src/omc-learn.c:1496
+#: src/omc-learn.c:1486
 msgid ""
 "Switch foreground clip to the nth valid clip, and reset the frame number"
 msgstr ""
 
-#: src/omc-learn.c:1500
+#: src/omc-learn.c:1490
 msgid "Cycle to next mode for effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1504
+#: src/omc-learn.c:1494
 msgid "Cycle to previous mode for effect key <key>"
 msgstr ""
 
-#: src/omc-learn.c:1508
+#: src/omc-learn.c:1498
 msgid "Set playback plugin parameter value <pnum> = <value>"
 msgstr ""
 
-#: src/omc-learn.c:1509
+#: src/omc-learn.c:1499
 msgid "Set <value> of pth parameter for the playback plugin."
 msgstr ""
 
 #. TRANSLATORS: short form of "clip number"
-#: src/omc-learn.c:1536 src/omc-learn.c:1607
+#: src/omc-learn.c:1526 src/omc-learn.c:1597
 msgid "clipnum"
 msgstr "剪辑号"
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1545
+#: src/omc-learn.c:1535
 msgid "fps"
 msgstr "帧/秒"
 
 #. TRANSLATORS: as in keyboard key
-#: src/omc-learn.c:1553 src/omc-learn.c:1560 src/omc-learn.c:1567
-#: src/omc-learn.c:1575 src/omc-learn.c:1615 src/omc-learn.c:1623
+#: src/omc-learn.c:1543 src/omc-learn.c:1550 src/omc-learn.c:1557
+#: src/omc-learn.c:1565 src/omc-learn.c:1605 src/omc-learn.c:1613
 msgid "key"
 msgstr "密钥"
 
 #. TRANSLATORS: short form of "parameter number"
-#: src/omc-learn.c:1583 src/omc-learn.c:1632
+#: src/omc-learn.c:1573 src/omc-learn.c:1622
 msgid "pnum"
 msgstr "帧号"
 
 #. TRANSLATORS: short form of "frames per second"
-#: src/omc-learn.c:1599
+#: src/omc-learn.c:1589
 msgid "fps_ratio"
 msgstr "帧率(_R)"
 
-#: src/omc-learn.c:2443
+#: src/omc-learn.c:2417
 #, c-format
 msgid "Saving device mapping to file %s..."
 msgstr "正在将设备映射保存为文件 %s..."
 
-#: src/omc-learn.c:2527
+#: src/omc-learn.c:2498
 #, c-format
 msgid ""
 "\n"
@@ -10140,7 +10137,7 @@
 "解析文件出错\n"
 "%s\n"
 
-#: src/omc-learn.c:2534
+#: src/omc-learn.c:2505
 #, c-format
 msgid ""
 "\n"
@@ -10153,12 +10150,12 @@
 "文件中的版本无效\n"
 "%s\n"
 
-#: src/omc-learn.c:2571
+#: src/omc-learn.c:2541
 #, c-format
 msgid "Loading device mapping from file %s..."
 msgstr "正从文件 %s 加载设备映射..."
 
-#: src/omc-learn.c:2576
+#: src/omc-learn.c:2544
 #, c-format
 msgid ""
 "\n"
@@ -10173,114 +10170,79 @@
 "%s\n"
 "错误代码为 %d\n"
 
-#: src/videodev.c:547
+#: src/videodev.c:539
 #, c-format
 msgid "Unable to open device %s\n"
 msgstr "无法打开设备 %s\n"
 
-#: src/videodev.c:564
+#: src/videodev.c:554
 #, c-format
 msgid "Opened device %s\n"
 msgstr "已打开设备 %s\n"
 
+#, fuzzy
 #~ msgid "180 _degrees             "
-#~ msgstr "180 度(_D)             "
-
-#~ msgid "90 degrees _Anticlockwise"
-#~ msgstr "90 度逆时针(_A)"
-
-#~ msgid "90 degrees _Clockwise    "
-#~ msgstr "90 度顺时针(_C)    "
-
-#~ msgid "Add _Border"
-#~ msgstr "添加边框(_B)"
-
-#~ msgid "Add noise"
-#~ msgstr "添加噪声"
+#~ msgstr "新主题：           "
 
+#, fuzzy
 #~ msgid "Adjust contrast"
-#~ msgstr "调整对比度"
+#~ msgstr "调整 %s(_A)"
 
+#, fuzzy
 #~ msgid "Adjusting contrast of"
-#~ msgstr "正在调整对比度"
-
-#~ msgid "Adjusting noise on"
-#~ msgstr "正在调整噪声"
-
-#~ msgid "B/W Threshold"
-#~ msgstr "黑白二值化"
-
-#~ msgid "B/W thresholding"
-#~ msgstr "黑/白二值化中"
+#~ msgstr "调整 %s(_A)"
 
+#, fuzzy
 #~ msgid "Blank _Colour"
-#~ msgstr "空白色(_C)"
+#~ msgstr "显示帧计数器(_H)"
 
+#, fuzzy
 #~ msgid "Blank frames"
-#~ msgstr "空白帧"
+#~ msgstr "剪辑和帧"
 
+#, fuzzy
 #~ msgid "Blanking"
-#~ msgstr "擦除中"
+#~ msgstr "备份"
 
 #, fuzzy
 #~ msgid "Block _height"
-#~ msgstr "帧高(_H)"
+#~ msgstr "高度(_H)"
 
 #, fuzzy
 #~ msgid "Block _width"
-#~ msgstr "帧高(_H)"
-
-#~ msgid "Blur"
-#~ msgstr "模糊"
-
-#~ msgid "Bluring"
-#~ msgstr "模糊中"
+#~ msgstr "高度(_H)"
 
+#, fuzzy
 #~ msgid "Border _Colour"
-#~ msgstr "边框色(_C)"
+#~ msgstr "显示帧计数器(_H)"
 
+#, fuzzy
 #~ msgid "Brightness _end"
-#~ msgstr "亮度终点(_E)"
+#~ msgstr "_忽略的变化"
 
+#, fuzzy
 #~ msgid "Brightness _start"
-#~ msgstr "亮度起点(_S)"
+#~ msgstr "_忽略的变化"
 
+#, fuzzy
 #~ msgid "Brightness change"
-#~ msgstr "更改亮度"
+#~ msgstr "_忽略的变化"
 
+#, fuzzy
 #~ msgid "Brightness end"
-#~ msgstr "亮度终点"
+#~ msgstr "_忽略的变化"
 
+#, fuzzy
 #~ msgid "Brightness start"
-#~ msgstr "亮度起点"
-
-#~ msgid "Centre _X"
-#~ msgstr "中心 _X"
-
-#~ msgid "Centre _Y"
-#~ msgstr "中心 _Y"
-
-#~ msgid "Changing brightness of"
-#~ msgstr "更改亮度"
-
-#~ msgid "Changing gamma of"
-#~ msgstr "更改伽马值"
-
-#~ msgid "Changing hue of"
-#~ msgstr "更改色调"
-
-#~ msgid "Changing saturation of"
-#~ msgstr "更改饱和度"
-
-#~ msgid "Charcoal"
-#~ msgstr "碳笔"
+#~ msgstr "_忽略的变化"
 
+#, fuzzy
 #~ msgid "Checkerboard"
-#~ msgstr "跳棋盘"
+#~ msgstr "正在录音"
 
 #, fuzzy
 #~ msgid "Checkerboarding"
-#~ msgstr "跳棋盘"
+#~ msgstr "正在录音"
 
 #, fuzzy
 #~ msgid "Clipboard _over selection"
@@ -10290,80 +10252,29 @@
 #~ msgid "Clipboard _under selection"
 #~ msgstr "插入到选区后（_A）"
 
-#~ msgid "Colorize"
-#~ msgstr "加彩色"
-
 #, fuzzy
 #~ msgid "Colorizing"
-#~ msgstr "加彩色"
-
-#~ msgid "Colour cycle"
-#~ msgstr "色彩循环"
-
-#~ msgid "Colour cycling"
-#~ msgstr "色彩循环中"
-
-#~ msgid "Colour filter"
-#~ msgstr "色彩过滤"
-
-#~ msgid "Colour filtering"
-#~ msgstr "色彩过滤中"
-
-#~ msgid "Colour replace"
-#~ msgstr "色彩替换"
-
-#~ msgid "Cycle _Step"
-#~ msgstr "循环步进(_S)"
-
-#~ msgid "Deinterlace"
-#~ msgstr "反交错"
-
-#~ msgid "Deinterlacing"
-#~ msgstr "反交错"
-
-#~ msgid "Despeckle"
-#~ msgstr "去斑"
-
-#, fuzzy
-#~ msgid "Despeckling"
-#~ msgstr "去斑"
-
-#~ msgid "Dream"
-#~ msgstr "梦幻特效"
+#~ msgstr "正在调整尺寸"
 
 #, fuzzy
-#~ msgid "Dreamifying"
-#~ msgstr "梦幻特效"
-
-#~ msgid "E_nd %"
-#~ msgstr "结束(_N) %"
-
-#~ msgid "Edge detect"
-#~ msgstr "边缘检测"
-
-#~ msgid "Edge detecting"
-#~ msgstr "边缘检测中"
-
-#~ msgid "Emboss"
-#~ msgstr "凸起"
+#~ msgid "Cycle _Step"
+#~ msgstr "起始(_S)"
 
 #, fuzzy
-#~ msgid "Embossing"
-#~ msgstr "凸起"
-
 #~ msgid "Enhance"
-#~ msgstr "增强"
+#~ msgstr "取消"
 
+#, fuzzy
 #~ msgid "Enhancing"
-#~ msgstr "增强中"
+#~ msgstr "取消"
 
 #, fuzzy
 #~ msgid "Fade _colour"
-#~ msgstr "帧色(_C)"
+#~ msgstr "淡出音频"
 
 #, fuzzy
 #~ msgid "Fade _end"
-#~ msgstr "色调终点(_E)"
+#~ msgstr "淡入音频"
 
 #, fuzzy
 #~ msgid "Fade _in"
@@ -10373,37 +10284,37 @@
 #~ msgid "Fade _out"
 #~ msgstr "淡出音频"
 
+#, fuzzy
 #~ msgid "Fade"
-#~ msgstr "淡入淡出"
+#~ msgstr "淡入音频"
 
 #, fuzzy
 #~ msgid "Fading video"
 #~ msgstr "正在重采样视频"
 
+#, fuzzy
 #~ msgid "Fading"
-#~ msgstr "淡入淡出"
+#~ msgstr "正在重采样视频"
 
+#, fuzzy
 #~ msgid "Fina_l frame"
-#~ msgstr "终止帧(_L)"
+#~ msgstr "结尾帧"
 
 #, fuzzy
 #~ msgid "Flash _colour"
-#~ msgstr "填充色(_F)"
-
-#~ msgid "Flip vertically"
-#~ msgstr "垂直翻转"
-
-#~ msgid "Flop horizontally"
-#~ msgstr "水平翻转"
+#~ msgstr "淡出音频"
 
+#, fuzzy
 #~ msgid "Frame Calculator"
-#~ msgstr "帧计算器"
+#~ msgstr "显示帧计数器(_H)"
 
+#, fuzzy
 #~ msgid "Frame _Colour"
-#~ msgstr "帧色(_C)"
+#~ msgstr "显示帧计数器(_H)"
 
+#, fuzzy
 #~ msgid "Frame _height"
-#~ msgstr "帧高(_H)"
+#~ msgstr "帧尺寸"
 
 #, fuzzy
 #~ msgid "Frame _in frame position of clipboard..."
@@ -10413,124 +10324,85 @@
 #~ msgid "Frame _in frame position of top frame..."
 #~ msgstr "正在将%d 到 %d%s 帧拷贝到剪贴板……"
 
+#, fuzzy
 #~ msgid "Frame _width"
-#~ msgstr "帧宽(_W)"
+#~ msgstr "帧尺寸"
 
+#, fuzzy
 #~ msgid "Frames _per second (FPS)"
-#~ msgstr "帧每秒(F_PS)"
-
-#~ msgid "Gamma _end"
-#~ msgstr "伽马值终点(_E)"
+#~ msgstr "帧每秒(_F) "
 
+#, fuzzy
 #~ msgid "Gamma _start"
-#~ msgstr "伽马值起点(_S)"
+#~ msgstr "起始(_S)"
 
+#, fuzzy
 #~ msgid "Gamma change"
-#~ msgstr "更改伽马"
+#~ msgstr "_忽略的变化"
 
+#, fuzzy
 #~ msgid "Generate blank frames"
-#~ msgstr "生成空白帧"
+#~ msgstr "删除多余的帧"
 
+#, fuzzy
 #~ msgid "Generate clip from image"
-#~ msgstr "由图像生成剪辑"
+#~ msgstr "结算帧图像"
 
 #, fuzzy
 #~ msgid "Generate coloured frames"
-#~ msgstr "正在生成标题帧"
+#~ msgstr "删除多余的帧"
 
+#, fuzzy
 #~ msgid "Generate title frames"
-#~ msgstr "正在生成标题帧"
+#~ msgstr "删除多余的帧"
 
+#, fuzzy
 #~ msgid "Generating blank frames"
-#~ msgstr "正在生成空白帧"
+#~ msgstr "删除多余的帧"
 
+#, fuzzy
 #~ msgid "Generating clip from image"
-#~ msgstr "正在由图像生成剪辑"
+#~ msgstr "结算帧图像"
 
 #, fuzzy
 #~ msgid "Generating coloured frames"
-#~ msgstr "正在生成标题帧"
+#~ msgstr "删除多余的帧"
 
+#, fuzzy
 #~ msgid "Generating title frames"
-#~ msgstr "正在生成标题帧"
-
-#~ msgid "Horizontal flopping"
-#~ msgstr "水平翻转"
-
-#~ msgid "Horizontal shifting"
-#~ msgstr "平移"
-
-#~ msgid "Hue _end"
-#~ msgstr "色调终点(_E)"
+#~ msgstr "删除多余的帧"
 
+#, fuzzy
 #~ msgid "Hue _start"
-#~ msgstr "色调起点(_S)"
+#~ msgstr "起始(_S)"
 
+#, fuzzy
 #~ msgid "Hue change"
-#~ msgstr "更改色调"
-
-#~ msgid "Hue end"
-#~ msgstr "色调终点"
-
-#~ msgid "Hue start"
-#~ msgstr "色调起点"
-
-#~ msgid "Image overlay"
-#~ msgstr "图像重叠"
-
-#~ msgid "Keep _Centered"
-#~ msgstr "保持居中(_C)"
-
-#~ msgid "Keep image aspect _ratio"
-#~ msgstr "保持图像宽高比例(_R)"
-
-#~ msgid "L_eft"
-#~ msgstr "左(_E)"
-
-#~ msgid "Making monochrome"
-#~ msgstr "变黑白"
+#~ msgstr "_忽略的变化"
 
 #, fuzzy
-#~ msgid "Modulate (BSH)"
-#~ msgstr "旋转"
+#~ msgid "Hue start"
+#~ msgstr "起始(_S)"
 
 #, fuzzy
 #~ msgid "Modulating"
-#~ msgstr "旋转"
-
-#~ msgid "Monochrome"
-#~ msgstr "单色"
+#~ msgstr "粘贴"
 
+#, fuzzy
 #~ msgid "Negate"
-#~ msgstr "放弃"
+#~ msgstr "粘贴"
 
 #, fuzzy
 #~ msgid "Negating"
-#~ msgstr "放弃"
-
-#~ msgid "Noise type"
-#~ msgstr "噪声类型"
-
-#~ msgid "Noisify"
-#~ msgstr "加噪声"
-
-#~ msgid "Normalize"
-#~ msgstr "正常化"
+#~ msgstr "粘贴"
 
+#, fuzzy
 #~ msgid "Normalizing"
-#~ msgstr "标准化"
+#~ msgstr "正在调整尺寸"
 
+#, fuzzy
 #~ msgid "Number of _frames"
-#~ msgstr "帧数(_F)"
-
-#~ msgid "Overlaying an image onto video"
-#~ msgstr "将一张图像重叠到视频上"
-
-#~ msgid "Overlaying text on"
-#~ msgstr "将文本重叠到"
-
-#~ msgid "Photo/still"
-#~ msgstr "照片/静止"
+#~ msgstr "插入次数（_N）"
 
 #, fuzzy
 #~ msgid "Pixilate"
@@ -10540,86 +10412,61 @@
 #~ msgid "Pixilating"
 #~ msgstr "粘贴"
 
+#, fuzzy
 #~ msgid "Posterize"
-#~ msgstr "色调分离"
+#~ msgstr "正在调整尺寸"
 
 #, fuzzy
 #~ msgid "Posterizing"
-#~ msgstr "色调分离"
-
-#, fuzzy
-#~ msgid "Random zoom"
-#~ msgstr "随机缩放"
-
-#, fuzzy
-#~ msgid "Random zooming"
-#~ msgstr "随机缩放"
-
-#~ msgid "Reduce noise"
-#~ msgstr "降噪"
+#~ msgstr "正在调整尺寸"
 
 #, fuzzy
 #~ msgid "Replacing colours in"
 #~ msgstr "音频重采样剪贴板"
 
+#, fuzzy
 #~ msgid "Resize All Frames"
-#~ msgstr "重设所有帧的尺寸"
+#~ msgstr "调整所有帧的尺寸(_R)"
 
+#, fuzzy
 #~ msgid "Rotate Clip"
-#~ msgstr "旋转剪辑"
+#~ msgstr "粘贴"
 
+#, fuzzy
 #~ msgid "Rotating"
-#~ msgstr "旋转"
+#~ msgstr "粘贴"
 
 #, fuzzy
 #~ msgid "S_tart %"
 #~ msgstr "起始(_S)"
 
+#, fuzzy
 #~ msgid "Saturation _end"
-#~ msgstr "饱和度终点(_E)"
+#~ msgstr "启动时运行 OMC"
 
+#, fuzzy
 #~ msgid "Saturation _start"
-#~ msgstr "饱和度起点(_S)"
+#~ msgstr "启动时运行 OMC"
 
+#, fuzzy
 #~ msgid "Saturation change"
-#~ msgstr "更改饱和度"
+#~ msgstr "启动时运行 OMC"
 
+#, fuzzy
 #~ msgid "Saturation end"
-#~ msgstr "饱和度终点"
+#~ msgstr "启动时运行 OMC"
 
+#, fuzzy
 #~ msgid "Saturation start"
-#~ msgstr "饱和度起点"
-
-#~ msgid "Sepia"
-#~ msgstr "棕黑色"
-
-#~ msgid "Shift horizontally"
-#~ msgstr "平移"
-
-#~ msgid "Shift vertically"
-#~ msgstr "竖移"
-
-#~ msgid "Shrink/Expand"
-#~ msgstr "收缩/扩展"
-
-#~ msgid "Shrinking/Expanding"
-#~ msgstr "收缩/扩展中"
+#~ msgstr "启动时运行 OMC"
 
+#, fuzzy
 #~ msgid "Skip forward"
-#~ msgstr "快进"
-
-#~ msgid "Solarize"
-#~ msgstr "曝光过度化"
+#~ msgstr "已跳过"
 
 #, fuzzy
 #~ msgid "Solarizing"
-#~ msgstr "曝光过度化"
-
-#~ msgid "Spin"
-#~ msgstr "旋转"
-
-#~ msgid "Spinning"
-#~ msgstr "正在旋转"
+#~ msgstr "正在调整尺寸"
 
 #, fuzzy
 #~ msgid "Splice"
@@ -10629,210 +10476,113 @@
 #~ msgid "Splicing"
 #~ msgstr "分隔器"
 
+#, fuzzy
 #~ msgid "Spread"
-#~ msgstr "展开"
+#~ msgstr "停止录制"
 
+#, fuzzy
 #~ msgid "Spreading"
-#~ msgstr "扩散"
+#~ msgstr "停止录制"
 
 #, fuzzy
 #~ msgid "Step _Value"
-#~ msgstr "起始值(_S)"
+#~ msgstr "起始帧"
 
 #, fuzzy
 #~ msgid "Step per _Frame"
 #~ msgstr "起始帧"
 
+#, fuzzy
 #~ msgid "Swirl _start"
-#~ msgstr "漩涡起点(_S)"
-
-#~ msgid "Swirl s_tep"
-#~ msgstr "漩涡步进(_T)"
-
-#~ msgid "Swirl"
-#~ msgstr "漩涡"
+#~ msgstr "起始(_S)"
 
 #, fuzzy
-#~ msgid "Swirling"
-#~ msgstr "漩涡"
-
-#~ msgid "Text Overlay"
-#~ msgstr "文本重叠"
-
-#~ msgid "Thres_hold"
-#~ msgstr "阈值(_H)"
-
-#~ msgid "Trim frames/Add border"
-#~ msgstr "裁剪帧/添加边框"
-
-#~ msgid "Trimming"
-#~ msgstr "正在剪切"
-
 #~ msgid "Tunnel"
-#~ msgstr "隧道"
+#~ msgstr "正在取消"
 
 #, fuzzy
 #~ msgid "Tunneling"
-#~ msgstr "隧道"
-
-#~ msgid "Use _Natural Size"
-#~ msgstr "使用自身尺寸(_N)"
-
-#~ msgid "Use _Natural image size"
-#~ msgstr "使用图像自身尺寸(_N)"
-
-#~ msgid "Vertical flipping"
-#~ msgstr "水平翻转"
-
-#~ msgid "Vertical shifting"
-#~ msgstr "竖直移动"
-
-#~ msgid "Wave"
-#~ msgstr "波浪线"
-
-#~ msgid "Waving"
-#~ msgstr "波"
+#~ msgstr "正在取消"
 
+#, fuzzy
 #~ msgid "_Background Colour"
-#~ msgstr "背景色(_B)"
+#~ msgstr "空白背景(_B)"
 
+#, fuzzy
 #~ msgid "_Background colour"
-#~ msgstr "背景色(_B)"
-
-#~ msgid "_Black and white camera"
-#~ msgstr "黑白相机(_B)"
-
-#~ msgid "_Black is transparent"
-#~ msgstr "黑色作为透明(_B)"
-
-#~ msgid "_Bottom"
-#~ msgstr "底部(_B)"
-
-#~ msgid "_Calculate"
-#~ msgstr "计算(_C)"
+#~ msgstr "空白背景(_B)"
 
+#, fuzzy
 #~ msgid "_Cycle Start"
-#~ msgstr "循环起点(_C)"
-
-#~ msgid "_Decrease Contrast"
-#~ msgstr "减少对比度(_D)"
+#~ msgstr "起始(_S)"
 
+#, fuzzy
 #~ msgid "_End Colour"
-#~ msgstr "结束色(_E)"
-
-#~ msgid "_End Size X:"
-#~ msgstr "结束 X 尺寸(_E)："
-
-#~ msgid "_End Size Y:"
-#~ msgstr "结束 Y 尺寸(_E)："
+#~ msgstr "空白背景(_B)"
 
 #, fuzzy
 #~ msgid "_End amount"
-#~ msgstr "结束色(_E)"
-
-#~ msgid "_Fade level"
-#~ msgstr "淡入淡出级别(_F)"
+#~ msgstr "结尾帧"
 
 #, fuzzy
 #~ msgid "_Fade start"
-#~ msgstr "色调起点"
+#~ msgstr "起始(_S)"
 
+#, fuzzy
 #~ msgid "_Fill colour"
-#~ msgstr "填充色(_F)"
+#~ msgstr "淡出音频"
 
+#, fuzzy
 #~ msgid "_First frame"
-#~ msgstr "首帧(_F)"
+#~ msgstr "首帧"
 
 #, fuzzy
-#~ msgid "_Flash for"
-#~ msgstr "填充色(_F)"
-
-#~ msgid "_Font"
-#~ msgstr "字体(_F)"
-
 #~ msgid "_Frames per second"
-#~ msgstr "帧每秒(_F)"
-
-#~ msgid "_Frames"
-#~ msgstr "帧(_F)"
+#~ msgstr "帧每秒(_F) "
 
 #, fuzzy
-#~ msgid "_Hold for"
-#~ msgstr "填充色(_F)"
+#~ msgid "_Frames"
+#~ msgstr "帧"
 
 #, fuzzy
-#~ msgid "_Horizontal segments"
-#~ msgstr "平移"
-
 #~ msgid "_Image File"
-#~ msgstr "图像文件(_I)"
+#~ msgstr "文件(_F)"
 
+#, fuzzy
 #~ msgid "_Image"
-#~ msgstr "图像(_I)"
-
-#~ msgid "_Increase Contrast"
-#~ msgstr "增加对比度(_I)"
-
-#~ msgid "_Init Size X:"
-#~ msgstr "初始 X 尺寸(_I)："
-
-#~ msgid "_Init Size Y:"
-#~ msgstr "初始 Y 尺寸(_I)："
+#~ msgstr "文件(_F)"
 
 #, fuzzy
 #~ msgid "_Link start and end colours"
 #~ msgstr "调整起点和终点(_A)"
 
-#~ msgid "_Middle"
-#~ msgstr "中间(_M)"
-
 #, fuzzy
-#~ msgid "_Midtone"
-#~ msgstr "中间(_M)"
-
 #~ msgid "_Negate"
-#~ msgstr "反转(_N)"
+#~ msgstr "粘贴"
 
+#, fuzzy
 #~ msgid "_Number of frames"
-#~ msgstr "帧数(_N)"
-
-#~ msgid "_Offset X"
-#~ msgstr "X 偏移(_O)"
-
-#~ msgid "_Offset Y"
-#~ msgstr "Y 偏移(_O)"
-
-#~ msgid "_Other Center"
-#~ msgstr "其他中心(_O)"
-
-#~ msgid "_Other"
-#~ msgstr "其他(_O)"
-
-#~ msgid "_Point size"
-#~ msgstr "点尺寸(_P)"
+#~ msgstr "插入次数（_N）"
 
 #, fuzzy
-#~ msgid "_Radius end"
-#~ msgstr "半径(_R)"
+#~ msgid "_Point size"
+#~ msgstr "指针(_P)"
 
 #, fuzzy
 #~ msgid "_Radius start"
-#~ msgstr "半径(_R)"
-
-#~ msgid "_Radius"
-#~ msgstr "半径(_R)"
+#~ msgstr "起始(_S)"
 
+#, fuzzy
 #~ msgid "_Random colour each frame"
-#~ msgstr "随机设置每帧的颜色(_R)"
-
-#~ msgid "_Randomness"
-#~ msgstr "随机(_R)"
+#~ msgstr "删除多余的帧"
 
+#, fuzzy
 #~ msgid "_Right"
-#~ msgstr "右侧(_R)"
+#~ msgstr "高度(_H)"
 
+#, fuzzy
 #~ msgid "_Rotate Selection by"
-#~ msgstr "旋转选区(_R)"
+#~ msgstr "_切的选择"
 
 #, fuzzy
 #~ msgid "_Sigma end"
@@ -10840,190 +10590,99 @@
 
 #, fuzzy
 #~ msgid "_Sigma start"
-#~ msgstr "伽马值起点(_S)"
+#~ msgstr "起始(_S)"
 
 #, fuzzy
 #~ msgid "_Skip ahead"
 #~ msgstr "已跳过"
 
+#, fuzzy
 #~ msgid "_Skip"
-#~ msgstr "跳过(_S)"
+#~ msgstr "已跳过"
 
+#, fuzzy
 #~ msgid "_Source Colour"
-#~ msgstr "源色(_S)"
+#~ msgstr "起始(_S)"
 
 #, fuzzy
 #~ msgid "_Splice"
 #~ msgstr "分隔器"
 
+#, fuzzy
 #~ msgid "_Start Colour"
-#~ msgstr "起始色(_S)"
+#~ msgstr "起始(_S)"
 
+#, fuzzy
 #~ msgid "_Start Value"
-#~ msgstr "起始值(_S)"
+#~ msgstr "起始帧"
 
 #, fuzzy
 #~ msgid "_Start amount"
-#~ msgstr "起始值(_S)"
+#~ msgstr "起始帧"
 
 #, fuzzy
 #~ msgid "_Stroke colour"
-#~ msgstr "起始色(_S)"
+#~ msgstr "起始(_S)"
 
+#, fuzzy
 #~ msgid "_Target Colour"
-#~ msgstr "目标颜色(_T)"
-
-#~ msgid "_Text"
-#~ msgstr "文本(_T)"
+#~ msgstr "起始(_S)"
 
+#, fuzzy
 #~ msgid "_Time (seconds)"
-#~ msgstr "时间(秒)(_T)"
+#~ msgstr "时间线(秒)"
 
 #, fuzzy
 #~ msgid "_Top left is clipboard"
 #~ msgstr "正在拷贝到剪贴板……"
 
 #, fuzzy
-#~ msgid "_Vertical segments"
-#~ msgstr "竖直移动"
-
-#, fuzzy
-#~ msgid "_Wavemax"
-#~ msgstr "波浪线"
-
-#~ msgid "_White is transparent"
-#~ msgstr "白色作为透明(_W)"
-
-#~ msgid "_Wrap Around"
-#~ msgstr "回到文档头部继续搜索(_W)"
-
-#~ msgid "_X Center"
-#~ msgstr "_X 中心"
-
-#~ msgid "_X End"
-#~ msgstr "_X 终点"
-
 #~ msgid "_X Start"
-#~ msgstr "_X 起点"
-
-#~ msgid "_X offset"
-#~ msgstr "_X 偏移"
-
-#~ msgid "_Y Center"
-#~ msgstr "_Y 中心"
-
-#~ msgid "_Y End"
-#~ msgstr "_Y 终点"
+#~ msgstr "起始(_S)"
 
+#, fuzzy
 #~ msgid "_Y Start"
-#~ msgstr "_Y 起点"
-
-#~ msgid "_Y offset"
-#~ msgstr "_Y 偏移"
-
-#~ msgid "_degrees"
-#~ msgstr "度(_D)"
+#~ msgstr "起始(_S)"
 
+#, fuzzy
 #~ msgid "blank_frames"
-#~ msgstr "空帧(_F)"
-
-#~ msgid "blur"
-#~ msgstr "模糊"
-
-#~ msgid "brightness_change"
-#~ msgstr "更改亮度(_C)"
+#~ msgstr "画面"
 
 #, fuzzy
-#~ msgid "charcoal"
-#~ msgstr "碳笔"
+#~ msgid "brightness_change"
+#~ msgstr "_忽略的变化"
 
 #, fuzzy
-#~ msgid "colorize"
-#~ msgstr "加彩色"
-
-#~ msgid "colour_filter"
-#~ msgstr "色彩过滤(_F)"
-
-#~ msgid "colour_replace"
-#~ msgstr "色彩替换(_R)"
-
 #~ msgid "contrast"
-#~ msgstr "对比度"
-
-#~ msgid "cycle"
-#~ msgstr "转换"
-
-#~ msgid "deinterlace"
-#~ msgstr "反交错"
+#~ msgstr "调整 %s(_A)"
 
 #, fuzzy
-#~ msgid "despeckle"
-#~ msgstr "去斑"
-
-#~ msgid "dream"
-#~ msgstr "梦幻"
-
-#~ msgid "edge_detect"
-#~ msgstr "边缘检测(_D)"
-
-#~ msgid "emboss"
-#~ msgstr "浮雕"
-
 #~ msgid "enhance"
-#~ msgstr "增强"
+#~ msgstr "取消"
 
+#, fuzzy
 #~ msgid "every"
-#~ msgstr "每隔"
+#~ msgstr "从不(_N)"
 
 #, fuzzy
 #~ msgid "fade_in_out"
 #~ msgstr "淡出音频"
 
-#~ msgid "frame_calculator"
-#~ msgstr "帧计算器(_C)"
-
-#~ msgid "gamma_change"
-#~ msgstr "更改伽马值(_C)"
-
 #, fuzzy
 #~ msgid "gen_blank_frames"
-#~ msgstr "空帧(_F)"
+#~ msgstr "画面"
 
 #, fuzzy
 #~ msgid "gen_clip_from_image"
-#~ msgstr "由图像生成剪辑"
+#~ msgstr "结算帧图像"
 
 #, fuzzy
 #~ msgid "gen_coloured_frames"
-#~ msgstr "色彩替换(_R)"
-
-#~ msgid "hue_change"
-#~ msgstr "更改饱和度(_C)"
-
-#~ msgid "image_overlay"
-#~ msgstr "图像重叠(_O)"
-
-#, fuzzy
-#~ msgid "modulate"
-#~ msgstr "旋转"
-
-#~ msgid "monochrome"
-#~ msgstr "黑白"
-
-#~ msgid "negate"
-#~ msgstr "负片"
-
-#, fuzzy
-#~ msgid "noisify"
-#~ msgstr "加噪声"
+#~ msgstr "删除多余的帧"
 
 #, fuzzy
-#~ msgid "normalize"
-#~ msgstr "正常化"
-
-#, fuzzy
-#~ msgid "photo_still"
-#~ msgstr "照片/静止"
+#~ msgid "hue_change"
+#~ msgstr "_忽略的变化"
 
 #, fuzzy
 #~ msgid "pixilate"
@@ -11031,48 +10690,23 @@
 
 #, fuzzy
 #~ msgid "posterize"
-#~ msgstr "色调分离"
-
-#~ msgid "randomzoom"
-#~ msgstr "随机缩放"
+#~ msgstr "正在调整尺寸"
 
+#, fuzzy
 #~ msgid "resize"
 #~ msgstr "更改大小"
 
+#, fuzzy
 #~ msgid "rotate"
-#~ msgstr "旋转"
+#~ msgstr "状态"
 
+#, fuzzy
 #~ msgid "saturation_change"
-#~ msgstr "更改饱和度(_C)"
-
-#~ msgid "sepia"
-#~ msgstr "红褐色"
-
-#~ msgid "shift_horizontal"
-#~ msgstr "平移(_H)"
-
-#~ msgid "shift_vertical"
-#~ msgstr "竖移(_V)"
-
-#~ msgid "shrink_expand"
-#~ msgstr "缩放(_E)"
-
-#~ msgid "skip_forwards"
-#~ msgstr "快进(_F)"
+#~ msgstr "启动时运行 OMC"
 
 #, fuzzy
-#~ msgid "solarize"
-#~ msgstr "曝光过度化"
-
-#~ msgid "spin"
-#~ msgstr "旋转"
-
 #~ msgid "spread"
-#~ msgstr "速度"
-
-#, fuzzy
-#~ msgid "swirl"
-#~ msgstr "漩涡"
+#~ msgstr "停止录制"
 
 #, fuzzy
 #~ msgid "transition_bwthresh"
@@ -11080,7 +10714,7 @@
 
 #, fuzzy
 #~ msgid "transition_checkerboard"
-#~ msgstr "跳棋盘"
+#~ msgstr "过渡"
 
 #, fuzzy
 #~ msgid "transition_fade2"
@@ -11094,75 +10728,39 @@
 #~ msgid "trim_frames"
 #~ msgstr "画面"
 
+#, fuzzy
 #~ msgid "tunnel"
-#~ msgstr "隧道"
-
-#~ msgid "wave"
-#~ msgstr "波形"
+#~ msgstr "正在取消"
 
+#, fuzzy
 #~ msgid "Unable to open output file !"
-#~ msgstr "无法打开输出文件！"
+#~ msgstr ""
+#~ "\n"
+#~ "无法加载布局文件 %s\n"
 
+#, fuzzy
 #~ msgid "LiVES could not write to $nfile."
-#~ msgstr "LiVES 无法写入 $nfile。"
-
-#~ msgid "Unable to locate the program $rfx_builder_multi"
-#~ msgstr "无法找到 $rfx_builder_multi 程序"
-
-#~ msgid "This does not appear to be a valid video or image file"
-#~ msgstr "这似乎不是有效的视频或图像文件"
+#~ msgstr "LiVES 无法找到特效 %s。\n"
 
+#, fuzzy
 #~ msgid "LiVES was unable to open it."
-#~ msgstr "LiVES 无法打开它。"
-
-#~ msgid "Check the terminal window for more details."
-#~ msgstr "查看详细信息终端窗口。"
+#~ msgstr ""
+#~ "LiVES 无法捕获此图片\n"
+#~ "\n"
 
+#, fuzzy
 #~ msgid "Error creating new backup."
-#~ msgstr "创建新备份出错。"
-
-#~ msgid "This does not appear to be a valid backup file"
-#~ msgstr "这似乎不是有效的备份文件"
+#~ msgstr "加载光盘音轨出错\n"
 
+#, fuzzy
 #~ msgid "LiVES was not able to open the file"
-#~ msgstr "LiVES 无法打开该文件"
-
-#~ msgid "$file"
-#~ msgstr "$file"
-
-#~ msgid "LiVES audio error."
-#~ msgstr "LiVES 音频错误。"
-
-#~ msgid "cdda2wav is required for this function."
-#~ msgstr "这个功能需要 cdda2wav。"
-
-#~ msgid "Please install it first."
-#~ msgstr "请先安装它。"
-
-#~ msgid "You must set the CD device first in Preferences."
-#~ msgstr "您必须先在偏好设置中设置光盘设备。"
-
-#~ msgid "$plugin_name failed:"
-#~ msgstr "$plugin_name 失败："
-
-#~ msgid "$error"
-#~ msgstr "$error"
+#~ msgstr ""
+#~ "LiVES 无法捕获此图片\n"
+#~ "\n"
 
 #, fuzzy
-#~ msgid "_Open"
-#~ msgstr "打开(_O)..."
-
-#~ msgid "                                                            "
-#~ msgstr "                                                            "
-
-#~ msgid "warning"
-#~ msgstr "警告"
-
-#~ msgid "LiVES: recover layout ?"
-#~ msgstr "LiVES: 恢复布局？"
-
-#~ msgid "Couldn't find pixmap file: %s"
-#~ msgstr "无法找到像素图文件：%s"
+#~ msgid "LiVES audio error."
+#~ msgstr "LiVES: - 插入"
 
-#~ msgid "No Description"
-#~ msgstr "无说明"
+#~ msgid "Pause"
+#~ msgstr "暂停"

LiVES-2.2.8.tar.bz2/smogrify -> LiVES-2.4.1.tar.bz2/smogrify Changed

@@ -10,7 +10,8 @@
 
 $rfx_builder_multi="build-lives-rfx-plugin-multi";
 
-$umask=0177; # ->        -rw-------
+$umask=0177;
+# ->        -rw-------
 
 $GUI_NAME="LiVES";
 
@@ -22,7 +23,7 @@
 # Do not change these except for testing !
 
 $background=1;
-$version="2.2.8";
+$version="2.4.1";
 #$dyneversion="LIVES-20091209";
 
 ###################################################################
@@ -36,11 +37,11 @@
 if ($^O eq "MSWin32") {
 #TODO - get this from the registry when needed
 #only if we installed perl ourselves
-    $installdir="C:\\Program Files\\LiVES";
+$installdir="C:\\Program Files\\LiVES";
 
-    push @INC,"$installdir\\lib";
+push @INC,"$installdir\\lib";
 
-    use File::Path qw(make_path);
+use File::Path qw(make_path);
 
 #TODO - get this from the registry when needed
     $login = getlogin;
@@ -59,9 +60,8 @@
     $smog_composite_command="composite.exe -quiet";
     $smog_convert_command="mgkvert.exe -quiet";
 
-}
-else {
-    $home=$ENV{"HOME"};
+} else {
+    $home=$ENV {"HOME"};
     $rc_filename=".lives";
     $lives_home_dir="$home/.lives-dir";
 
@@ -84,1002 +84,987 @@
 if (defined($ARGV[0])) {
     $command=$ARGV[0];
 
-    unless ($command eq "version") {
-	my $rcfile="$home/$rc_filename";
-	if (-f $rcfile) {
-	    $tmpdir=&rc_get("session_tempdir");
-
-	    if ($tmpdir eq ""||$command eq "report") {
-		$tmpdir=&rc_get("tempdir");
-		$priority=1;
-		&rc_set("session_tempdir","$tmpdir");
-		$priority=0;
-	    }
+    unless($command eq "version") {
+        my $rcfile="$home/$rc_filename";
+        if (-f $rcfile) {
+            $tmpdir=&rc_get("session_tempdir");
+
+            if ($tmpdir eq ""||$command eq "report") {
+                $tmpdir=&rc_get("tempdir");
+                $priority=1;
+                &rc_set("session_tempdir","$tmpdir");
+                $priority=0;
+            }
 
             if (! -d $tmpdir) {
-		unless ($command eq "report" || $command eq "set_pref") {
-		    &mktmpdir;
-		}
+                unless($command eq "report" || $command eq "set_pref") {
+                    &mktmpdir;
+                }
 
-	    }
+            }
 
-	}
+        }
     }
 
     if (!caller||$command eq "save"||$command eq "plugin_clear") {
-	if (defined $DEBUG_SM_CMDS) { 
-	    print STDERR "command is $command\n";
-	}
-
-	if ($command eq "save" && $ARGV[1] eq "get_rfx") {
-	    $background=0;
-	}
+        if (defined $DEBUG_SM_CMDS) {
+            print STDERR "command is $command\n";
+        }
+
+        if ($command eq "save" && $ARGV[1] eq "get_rfx") {
+            $background=0;
+        }
 
 
 ## blocking calls
-	if ($command eq "get_pid_for_handle") {
-	    $handle=$ARGV[1];
-	    $curtmpdir="$tmpdir/$handle";
-
-	    if ($^O eq "MSWin32") {
-		$pidfile="$curtmpdir/pid";
-	    }
-	    else {
-		$pidfile="$curtmpdir/.pid";
-	    }
-
-	    if (defined(open IN,"< $pidfile")) {
-		read IN,$target_pid,8;
-		close IN;
-		
-		if ($target_pid eq NULL) {
-		    print " ";
-		    exit 1;
-		}
-	    }
-	    print $target_pid;
-	    exit 0;
-	}
-
-
-    if ($command eq "stopsubsub"||$command eq "stopsubsubs"||$command eq "stop_audio") {
-	$handle=$ARGV[1];
-	$curtmpdir="$tmpdir/$handle";
-	my $sig="KILL";
-	if ($command eq "stop_audio") {
-	    $pidfile="$curtmpdir/.pidpb";
-	}
-	else {
-	    $pidfile="$curtmpdir/.pid";
-	    if (defined($ARGV[2])) {
-		$sig=$ARGV[2];
-	    }
-	}
-	$statusfile="$curtmpdir/.status";
-
-	unless (-d "$curtmpdir") {
-	    exit 2;
-	}
-
-	if (defined(open IN,"< $pidfile")) {
-	    read IN,$target_pid,8;
-	    close IN;
-
-	    if ($target_pid eq NULL) {
-		exit 1;
-	    }
-
-	    # make sure pidfile has same group and owner, otherwise exit
-	    @stat=stat($pidfile);
-	    if (!($uid==$stat[4]&&$gid==$stat[5])) {
-		die "Smogrify: Unable to stop process $target_pid.\n";
-	    }
-	    elsif ($command eq "stopsubsub"||$command eq "stop_audio") {
-		# kill all subprocesses of target_pid, and target_pid
-		&kill_child_pids($target_pid,$sig);
-	    }
-	    elsif ($command eq "stopsubsubs") {
-		# kill all subprocesses of target_pid, but not target_pid
-		smog_system("pgrep -P $target_pid > \"$tmpdir/.pids.$target_pid\" 2>/dev/null");
-		if (-s "$tmpdir/.pids.$target_pid"&&defined(open IN,"$tmpdir/.pids.$target_pid")) {
-		    while (<IN>) {
-			$pid=$_;
-			chomp($pid);
-			&kill_child_pids($pid,$sig);
-		    }
-		    close IN;
-		}
-		unlink "$tmpdir/.pids.$target_pid";
-	    }
-	    
-	    
-	    
-	    else {
-		print "Attempting to stop process ".$target_pid." with $command\n";
-		if ($sig eq "KILL") {
-		    smog_system("kill -$sig $target_pid >/dev/null 2>&1");
-		}
-		else {
-		    smog_system("pkill -$sig -P $target_pid");# must not ! >/dev/null 2>&1");
-		}
-	    }
-
-	    if ($sig eq "KILL" && $command ne "stop_audio") {
-		&sig_killed;
-	    }
-	    exit 0;
-	}
-	exit 1;
-    }
-
-
-
-    if ($command eq "new") {
-	# $key can normally be set to getpid()
-
-	$key=$ARGV[1];
-
-	# write mini-info file
-
-	if ($^O eq "MSWin32") {
-	    $infofile="$tmpdir/info.$key";
-	}
-	else {
-	    $infofile="$tmpdir/.info.$key";
-	}
-	do {
-	    $handle=int(rand 1000000000)+65536;
-	    $curtmpdir="$tmpdir/$handle";
-	} while (-d $curtmpdir);
-	
-	umask 0;
-	unless (mkdir $curtmpdir,0777) {
-	    sig_system_error("Creating directory \"$curtmpdir\"",0);
-	    exit 1;
-	}
-	umask $umask;
-	
-	if (!defined(open OUT,"> $infofile")) {
-	    sig_write_error("$infofile",0);
-	    exit 1;
-	}
-	
-	print OUT $handle;
-	close OUT;
-	exit 0;
-    }
-	
-
-    if ($command eq "get_tempdir") {
-	# TODO - take dirname as second param
-	if (defined($ARGV[1])) {
-	    $id=$ARGV[1];
-
-	    if ($^O ne "MSWin32") {
-		open OUT,"> /tmp/.smogrify.$id" or exit 1;
-	    }
-	    else {
-		open OUT,"> C:\\smogrify.$id" or exit 1;
-	    }
-	    print OUT "$tmpdir";
-	    close OUT;
-	}
-	else {print $tmpdir};
-	exit 0;
-    }
-
-	if ($command eq "get_version_hash") {
-	    $com=$ARGV[1];
-	    $sep=$ARGV[2];
-	    $piece=$ARGV[3];
-	    $res=smog_system_direct("$com");
-	    chomp($res);
-
-	    $ver=(split (/$sep/,$res))[$piece];
-
-	    print &version_hash($ver);
-	    exit 0;
-	}
-
-    if ($command eq "report") {
-
-	$gui_bootstrap_file="";
-	if (defined($ARGV[1])) {
-	    $gui_bootstrap_file=$ARGV[1];
-	}
-
-	if (! -d "$lives_home_dir") {
-	    # this can fail here, but succeed later
-	    if ($^O ne "MSWin32") {
-		smog_system("/bin/mkdir -p -m 777 \"$lives_home_dir\"");
-	    }
-	    else {
-		make_path("$lives_home_dir");
-	    }
-	}
-
-	$startup_phase=0;
-
-	$video_open_command="\"".&get_mplayer_location."\"";
-
-	$audio_player="sox";
-	$audio_play_command=&rc_get_default("sox_command");
-	    
-	$convert_version_hash=&get_convert_version_hash;
-	
-	if ($audio_play_command eq "") {
-	    $audio_player="mplayer";
-	    $audio_play_command=&rc_get_default("mplayer_audio_command");
-	}
-	
-	# get $tmpdir from .rc file, if no .rc file, create it
-	if (! -s "$home/$rc_filename") {
-	    # set comment at start of file
-	    &rc_set("","");
-	    $startup_phase=-1;
-	    &rc_set("startup_phase",-1);
-	}
-	else {
-	    $startup_phase=&rc_get("startup_phase");
-	    if ($startup_phase eq "" || $startup_phase eq "100") {
-		$startup_phase=0;
-		&rc_delete("startup_phase");
-	    }
-	}
-
-	$default_keymap="default.keymap";
-
-	&rc_set_if_not_set("version","$version");
-	&rc_set_if_not_set("tempdir","$default_tmpdir");
-
-	if (defined($dyneversion)) {
-	    &rc_set_if_not_set("lib_dir","/opt/$dyneversion/lib/");
-	    &rc_set_if_not_set("prefix_dir","/opt/$dyneversion/");
-	}
-
-	&rc_set_if_not_set("video_open_command","$video_open_command");
-	&rc_set_if_not_set("audio_play_command","$audio_play_command");
-	&rc_set_if_not_set("audio_player",$audio_player);
-	&rc_set_if_not_set("midisynch","false");
-	&rc_set_if_not_set("pb_quality",2);
-	&rc_set_if_not_set("insert_resample","true");
-	&rc_set_if_not_set("open_compression_percent",15);
-	&rc_set_if_not_set("conserve_space","false");
-	&rc_set_if_not_set("antialias","true");
-	# resize action when opening images - can be either: "bound" or "none"
-	&rc_set_if_not_set("image_resize_action","none");
-	&rc_set_if_not_set("encoder",$encoder);
-	&rc_set_if_not_set("output_type","mjpeg");
-	&rc_set_if_not_set("audio_effect","none");
-	&rc_set_if_not_set("default_image_format","png");
-	&rc_set_if_not_set("default_fps",25);
-	&rc_set_if_not_set("save_directories","false");
-	&rc_set_if_not_set("stop_screensaver","true");
-	&rc_set_if_not_set("open_maximised","true");
-	&rc_set_if_not_set("filesel_maximised","true");
-	&rc_set_if_not_set("show_recent_files","true");
-	&rc_set_if_not_set("ce_maxspect","true");
-	&rc_set_if_not_set("lives_warning_mask",797696); # bits 19,18,13,11 and 10
-	&rc_set_if_not_set("dl_bandwidth_K",512);
-	&rc_set_if_not_set("show_player_stats","false");
-	&rc_set_if_not_set("show_toolbar","true");
-	&rc_set_if_not_set("encoder_acodec",1); # default of PCM
-	&rc_set_if_not_set("record_opts",-1);
-
-	&rc_set_if_not_set("gui_theme","crayons");
-	&rc_set_if_not_set("jack_opts",0); # start aserver on startup
-	&rc_set_if_not_set("audio_opts",3);
-	&rc_set_if_not_set("rte_keys_virtual",9);
-
-	&rc_set_if_not_set("instant_open","true");
-	&rc_set_if_not_set("auto_deinterlace","true");
-	&rc_set_if_not_set("auto_trim_pad_audio","true");
-	&rc_set_if_not_set("auto_cut_borders","false");
-
-	&rc_set_if_not_set("mt_undo_buf",32);
-	&rc_set_if_not_set("mt_enter_prompt","true");
-	&rc_set_if_not_set("render_prompt","true");
-	&rc_set_if_not_set("mt_exit_render","true");
-	&rc_set_if_not_set("mt_def_width",640);
-	&rc_set_if_not_set("mt_def_height",480);
-	&rc_set_if_not_set("mt_def_achans",2);
-	&rc_set_if_not_set("mt_def_signed_endian",2*!&get_endian);
-	&rc_set_if_not_set("mt_backaudio","1");
-	&rc_set_if_not_set("mt_pertrack_audio","true");
-	&rc_set_if_not_set("mt_auto_back",120);
-
-	&rc_set_if_not_set("ar_clipset","");
-	&rc_set_if_not_set("ar_layout","");
-	
-	&rc_set_if_not_set("rec_desktop_audio","false");
-	&rc_set_if_not_set("osc_start","false");
-	&rc_set_if_not_set("osc_port",49999);
-
-	&rc_set_if_not_set("concat_images","true");
-	&rc_set_if_not_set("mouse_scroll_clips","true");
-
-	&rc_set_if_not_set("omc_dev_opts",3);
-
-	&rc_set_if_not_set("rec_stop_gb",10);
-
-	&rc_set_if_not_set("def_autotrans","chroma blend");
-	&rc_set_if_not_set("audio_src",0); #internal
-
-	&rc_set_if_not_set("ce_thumb_mode","true");
-
-	$tmpdir=&rc_get("tempdir");
-	&write_bootstrap_file;
-	&mktmpdir;
-	
-	$convert_old_version=&rc_get("convert_version");
-	unless ($convert_old_version eq $convert_version) {
-	    &rc_set("convert_version",$convert_version);
-	}
-	&version_check_and_upgrade;
-
-	unless ($gui_bootstrap_file eq "") {
-	    open OUT,"> $gui_bootstrap_file" or exit 4;
-	    print OUT "$version|$tmpdir|$startup_phase|$msg|$msg2";
-	    close OUT;
-	}
-
-	#make sure we can write to tempir
-	open OUT,"> $tmpdir/testfile" or exit 5;
-	close OUT;
-	unlink "$tmpdir/testfile";
-
-	exit 0;
-    }
-
-	if ($command eq "set_clip_value") {
-	    $prefs_file=$ARGV[1];
-	    shift(@ARGV);
-	    $command="set_pref";
-	}
-
-
-    if ($command eq "set_pref") {
-	$key=$ARGV[1];
-	$value=$ARGV[2];
-
-	&rc_set("$key","$value");
-	exit 0;
-    }
-	
-    if ($command eq "set_pref_if_not_set") {
-	$key=$ARGV[1];
-	$value=$value=$ARGV[2];
-	&rc_set_if_not_set("$key","$value");
-	exit 0;
-    }
-	
-
-
-	if ($command eq "get_clip_value") {
-	    $command="get_pref";
-	    $prefs_file=$ARGV[4];
-	}
-
-
-	if ($command eq "print_pref") {
-	    $command="get_pref";
-	    $ARGV[2]="-";
-	}
-
-    if ($command eq "get_pref") {
-	$key=$ARGV[1];
-	if (defined($ARGV[2])) {
-	    $first=$ARGV[2];
-	}
-	else {
-	    $first=$uid;
-	}
-	if (defined($ARGV[3])) {
-	    $second=$ARGV[3];
-	}
-	else {
-	    $second=$gid;
-	}
-	$value=&rc_get($key,$home);
-
-	if ($first eq "-"&&!defined($ARGV[3])) {
-	    print $value;
-	    exit 0;
-	}
-	if ($^O eq "MSWin32") {
-	    open OUT,"> $tmpdir/smogval.$first.$second" or exit 1;
-	}
-	else {
-	    open OUT,"> $tmpdir/.smogval.$first.$second" or exit 1;
-	}
-	print OUT $value;
-	close OUT;
-	exit 0;
-    }
-
-    if ($command eq "get_pref_default") {
-	$key=$ARGV[1];
-	if (defined($ARGV[2])) {
-	    $first=$ARGV[2];
-	}
-	else {
-	    $first=$uid;
-	}
-	if (defined($ARGV[3])) {
-	    $second=$ARGV[3];
-	}
-	else {
-	    $second=$gid;
-	}
-	$value=&rc_get_default($key);
-
-	if ($value eq "") {
-	    $value="NULL";
-	}
-
-	if ($^O eq "MSWin32") {
-	    open OUT,"> $tmpdir/smogval.$first.$second" or exit 1;
-	}
-	else {
-	    open OUT,"> $tmpdir/.smogval.$first.$second" or exit 1;
-	}
-	print OUT $value;
-	close OUT;
-	exit 0;
-    }
-
-    if ($command eq "delete_pref") {
-	$key=$ARGV[1];
-	&rc_delete($key);
-    }
-
-    if ($command eq "get_location") {
-	$exe=$ARGV[1];
-	if (defined($ARGV[2])) {
-	    $first=$ARGV[2];
-	}
-	else {
-	    $first=$uid;
-	}
-	if (defined($ARGV[3])) {
-	    $second=$ARGV[3];
-	}
-	else {
-	    $second=$gid;
-	}
-	$value=&location($exe);
-
-	if ($^O eq "MSWin32") {
-	    open OUT,"> $tmpdir/smogval.$first.$second" or exit 1;
-	}
-	else {
-	    open OUT,"> $tmpdir/.smogval.$first.$second" or exit 1;
-	}
-
-	print OUT $value;
-	close OUT;
-	exit 0;
-    }
-
-
-    if ($command eq "pause") {
-	if ($^O eq "MSWin32") {
-	    $smres=smog_system("touch.exe \"$tmpdir\\$ARGV[1]\\pause\"");
-	    if ($smres) {
-		sig_write_error("$tmpdir\\$ARGV[1]\\pause"); 
-		exit 1;
-	    }
-	}
-	else {
-	    $smres=smog_system("touch \"$tmpdir/$ARGV[1]/pause\"");
-	    if ($smres) {
-		sig_write_error("$tmpdir/$ARGV[1]/pause"); 
-		exit 1;
-	    }
-	}
-	if ($^O eq "MSWin32") {
-	    #smog_system("chmod.exe 600 \"$tmpdir\\$ARGV[1]\\pause\"");
-	}
-	else {
-	    smog_system("/bin/chmod 600 \"$tmpdir/$ARGV[1]/pause\"");
-	}
-	exit 0;
-    }
-
-
-    if ($command eq "resume") {
-	unlink "$tmpdir/$ARGV[1]/pause";
-	exit 0;
-    }
-
-
-	if ($command eq "clear_tmp_files") {
-	    $handle=$ARGV[1];
-	    #clear old backups (e.g. when saving a set)
-	    $curtmpdir="$tmpdir/$handle";
-	    &clean_old;
-	    &sig_complete;
-	    exit 0;
-	}
-
-	if ($command eq "clear_pre_files") {
-	    $handle=$ARGV[1];
-	    #clear old backups (e.g. when saving a set)
-	    $curtmpdir="$tmpdir/$handle";
-	    smog_chdir("$curtmpdir");
-	    unlink glob "*.pre";
-	    &sig_complete;
-	    exit 0;
-	}
-
-
-    if ($command eq "undo_audio") {
-	$handle=$ARGV[1];
-	$curtmpdir="$tmpdir/$handle";
-	if ($^O eq "MSWin32") {
-	    $statusfile="$curtmpdir/status";
-	}
-	else {
-	    $statusfile="$curtmpdir/.status";
-	}
-
-	&undo_audio; # will abort on failure
-	&sig_complete;
-	exit 0;
-    }
-
-    if ($command eq "backup_audio") {
-	$handle=$ARGV[1];
-	$curtmpdir="$tmpdir/$handle";
-	if ($^O eq "MSWin32") {
-	    $statusfile="$curtmpdir/status";
-	}
-	else {
-	    $statusfile="$curtmpdir/.status";
-	}
-	smog_chdir("$curtmpdir");
-	&backup_audio;
-	if ($panic) {
-	    exit 1;
-	}
-	&sig_complete;
-	exit 0;
-    }
-
-
-    if ($command eq "save_frame") {
-	my $hsize=-1;
-	my $vsize=-1;
-
-	$handle=$ARGV[1];
-	$curtmpdir="$tmpdir/$handle";
-	$frame=$ARGV[2];
-	$name=&mkname($frame);
-	$nfile=$ARGV[3];
-	if (defined $ARGV[4]) {
-	    $hsize=$ARGV[4];
-	}
-	if (defined $ARGV[5]) {
-	    $vsize=$ARGV[5];
-	}
-
-	if ($^O eq "MSWin32") {
-	    $statusfile="$curtmpdir/status";
-	}
-	else {
-	    $statusfile="$curtmpdir/.status";
-	}
-
-	# check the file is writable
-	unless (&is_writeable($nfile)) {
-	    &sig_error("Unable to open output file !","$GUI_NAME could not write to $nfile.");
-	}
-
-	$img_ext=&get_img_ext($curtmpdir,$frame);
-	$img_prefix=&get_img_prefix($img_ext);
-
-	umask 0111;
-
-	if ($hsize==-1||$vsize==-1) {
-	    $com="$smog_convert_command $img_prefix\"$curtmpdir/$name$img_ext\" \"$nfile\" >$nulfile 2>&1";
-	}
-	else {
-	    if ($antialias eq "false") {
-		$com="$smog_convert_command +antialias $img_prefix\"$curtmpdir/$name$img_ext\" -scale $hsize"."!x"."$vsize! \"$nfile\" > $nulfile 2>&1";
-	    }
-	    else {
-		$com="$smog_convert_command -antialias $img_prefix\"$curtmpdir/$name$img_ext\" -resize $hsize"."!x"."$vsize! \"$nfile\" > $nulfile 2>&1";
-	    }
-	}
-
-	$smerr=smog_system($com);
-	if ($smerr) {
-	    sig_system_error("$com",$smerr);
-	    exit 1;
-	};
-
-	exit 0;
-    }
-
-
-    if ($command eq "restore_details") {
-	$handle=$ARGV[1];
-	$nfile=$ARGV[2];
-	$leave_headers=$ARGV[3];
-
-	$curtmpdir="$tmpdir/$handle";
-
-	if ($^O eq "MSWin32") {
-	    $statusfile="$curtmpdir/status";
-	}
-	else {
-	    $statusfile="$curtmpdir/.status";
-	}
-
-	smog_chdir("$curtmpdir");
-	$fsize= -s "$nfile";
-	$afsize = -s "audio";
-	unlink glob "*.tar";
-	unlink glob "event.*";
-	unlink "extended";
-
-	$img_type="jpg";
-
-	unless (-f "header.lives") {
-	    
-	    if (defined(open IN,"< header2")) {
-		read IN,$val,4;
-		
-		# unfortunately...old clips used whatever endian the machine used
-		$endian=&get_endian;
-		$frames=&getint($val);
-		read IN,$title,256;
-		read IN,$author,256;
-		read IN,$comment,256;
-	    }
-	    
-	    $title=~ tr/\x00//d;
-	    $author=~ tr/\x00//d;
-	    $comment=~ tr/\x00//d;
-	    
-	    # very old backups didn't have a header2
-	    if (! -f "header2") {
-		unless ($nfile eq "") {
-		    unlink glob "event.*";
-		    $img_ext=&get_img_ext($curtmpdir);
-		    $img_prefix=&get_img_prefix($img_ext);
-		    $frames=&count_frames;
-		}
-	    }
-
-	    # leave headers for restoring VJ sets
-	    if ($leave_headers==1) {
-		$fsize=0;
-	    }
-	    else {
-		unlink <header header2>;
-	    }
-	}
-	else {
-	    unlink <header header2>;
-	}
-
-	$name=&mkname(1);
-
-	if (-f "$name.png") {
-	    $img_type="png";
-	}
-
-	&sig_complete($fsize,$afsize,$img_type,$frames,"$title","$author","$comment");
-	exit 0;
-    }
-
-    if ($command eq "list_plugins") {
-
-	# prefix_dir pref should be set first
-	# plugins are returned in sort() order
-	my $allow_nonex=$ARGV[1];
-	my $allow_subdirs=$ARGV[2];
-	my $plugindir=$ARGV[3];
-	my $ext=$ARGV[4];
-
-	my $string="";
-
-	if ($ext =~ /^-/) {
-	    $strip_ext=1;
-	    $ext=substr($ext,1,length($ext));
-	}
-
-	if (-d $plugindir) {
-	    smog_chdir("$plugindir");
-	    opendir DIR,$plugindir;
-	    my @files=readdir(DIR);
-	    closedir DIR;
-	    @files = sort (@files);
-
-	    foreach my $plugname (@files) {
-		unless ($plugname =~ /^\./) {
-		    if ((-f $plugname && (-x $plugname||$allow_nonex))||($allow_subdirs==1&& -d $plugname)) {
-			unless($allow_nonex) {
-			    next if ! -x "$plugindir/$plugname";
-			}
-			unless ($plugname eq "") {
-			    if ($ext eq ""|| $plugname =~ /$ext$/) {
-				if ($strip_ext==1) {
-				    $plugname=(split(/\./,$plugname))[0];
-				}
-				$string.="$plugname|";
-			    }
-			}
-		    }
-		}
-	    }
-	}
-	else {
-	    print "\n";
-	    exit 1;
-	}
-	print "$string\n";
-	exit 0;
-    }
-
-
-	if ($command eq "build_rfx_plugins") {
-	    if ($^O ne "MSWin32") {
-		if (&location($rfx_builder_multi) eq "") {
-		    &sig_error("Unable to locate the program $rfx_builder_multi");
-		    exit 1;
-		}
-	    }
+        if ($command eq "get_pid_for_handle") {
+            $handle=$ARGV[1];
+            $curtmpdir="$tmpdir/$handle";
+
+            if ($^O eq "MSWin32") {
+                $pidfile="$curtmpdir/pid";
+            } else {
+                $pidfile="$curtmpdir/.pid";
+            }
+
+            if (defined(open IN,"< $pidfile")) {
+                read IN,$target_pid,8;
+                close IN;
+
+                if ($target_pid eq NULL) {
+                    print " ";
+                    exit 1;
+                }
+            }
+            print $target_pid;
+            exit 0;
+        }
+
+
+        if ($command eq "stopsubsub"||$command eq "stopsubsubs"||$command eq "stop_audio") {
+            $handle=$ARGV[1];
+            $curtmpdir="$tmpdir/$handle";
+            my $sig="KILL";
+            if ($command eq "stop_audio") {
+                $pidfile="$curtmpdir/.pidpb";
+            } else {
+                $pidfile="$curtmpdir/.pid";
+                if (defined($ARGV[2])) {
+                    $sig=$ARGV[2];
+                }
+            }
+            $statusfile="$curtmpdir/.status";
+
+            unless(-d "$curtmpdir") {
+                exit 2;
+            }
+
+            if (defined(open IN,"< $pidfile")) {
+                read IN,$target_pid,8;
+                close IN;
+
+                if ($target_pid eq NULL) {
+                    exit 1;
+                }
+
+# make sure pidfile has same group and owner, otherwise exit
+                @stat=stat($pidfile);
+                if (!($uid==$stat[4]&&$gid==$stat[5])) {
+                    die "Smogrify: Unable to stop process $target_pid.\n";
+                }
+                elsif($command eq "stopsubsub"||$command eq "stop_audio") {
+# kill all subprocesses of target_pid, and target_pid
+                    &kill_child_pids($target_pid,$sig);
+                }
+                elsif($command eq "stopsubsubs") {
+# kill all subprocesses of target_pid, but not target_pid
+                    smog_system("pgrep -P $target_pid > \"$tmpdir/.pids.$target_pid\" 2>/dev/null");
+                    if (-s "$tmpdir/.pids.$target_pid"&&defined(open IN,"$tmpdir/.pids.$target_pid")) {
+                        while (<IN>) {
+                            $pid=$_;
+                            chomp($pid);
+                            &kill_child_pids($pid,$sig);
+                        }
+                        close IN;
+                    }
+                    unlink "$tmpdir/.pids.$target_pid";
+                }
+
+
+
+                else {
+                    print "Attempting to stop process ".$target_pid." with $command\n";
+                    if ($sig eq "KILL") {
+                        smog_system("kill -$sig $target_pid >/dev/null 2>&1");
+                    } else {
+                        smog_system("pkill -$sig -P $target_pid");
+# must not ! >/dev/null 2>&1");
+                    }
+                }
+
+                if ($sig eq "KILL" && $command ne "stop_audio") {
+                    &sig_killed;
+                }
+                exit 0;
+            }
+            exit 1;
+        }
+
+
+
+        if ($command eq "new") {
+# $key can normally be set to getpid()
+
+            $key=$ARGV[1];
+
+# write mini-info file
+
+            if ($^O eq "MSWin32") {
+                $infofile="$tmpdir/info.$key";
+            }
+            else {
+                $infofile="$tmpdir/.info.$key";
+            }
+            do {
+                $handle=int(rand 1000000000)+65536;
+                $curtmpdir="$tmpdir/$handle";
+            } while (-d $curtmpdir);
+
+            umask 0;
+            unless (mkdir $curtmpdir,0777) {
+                sig_system_error("Creating directory \"$curtmpdir\"",0);
+                exit 1;
+            }
+            umask $umask;
+
+            if (!defined(open OUT,"> $infofile")) {
+                sig_write_error("$infofile",0);
+                exit 1;
+            }
+
+            print OUT $handle;
+            close OUT;
+            exit 0;
+        }
+
+
+        if ($command eq "get_tempdir") {
+# TODO - take dirname as second param
+            if (defined($ARGV[1])) {
+                $id=$ARGV[1];
+
+                if ($^O ne "MSWin32") {
+                    open OUT,"> /tmp/.smogrify.$id" or exit 1;
+                } else {
+                    open OUT,"> C:\\smogrify.$id" or exit 1;
+                }
+                print OUT "$tmpdir";
+                close OUT;
+            } else {
+                print $tmpdir
+            };
+            exit 0;
+        }
+
+        if ($command eq "get_version_hash") {
+            $com=$ARGV[1];
+            $sep=$ARGV[2];
+            $piece=$ARGV[3];
+            $res=smog_system_direct("$com");
+            chomp($res);
+
+            $ver=(split(/$sep/,$res))[$piece];
+
+            print &version_hash($ver);
+            exit 0;
+        }
+
+        if ($command eq "report") {
+
+            $gui_bootstrap_file="";
+            if (defined($ARGV[1])) {
+                $gui_bootstrap_file=$ARGV[1];
+            }
+
+            if (! -d "$lives_home_dir") {
+# this can fail here, but succeed later
+                if ($^O ne "MSWin32") {
+                    smog_system("/bin/mkdir -p -m 777 \"$lives_home_dir\"");
+                } else {
+                    make_path("$lives_home_dir");
+                }
+            }
+
+            $startup_phase=0;
+
+            $video_open_command="\"".&get_mplayer_location."\"";
+
+            $audio_player="sox";
+            $audio_play_command=&rc_get_default("sox_command");
+
+            $convert_version_hash=&get_convert_version_hash;
+
+            if ($audio_play_command eq "") {
+                $audio_player="mplayer";
+                $audio_play_command=&rc_get_default("mplayer_audio_command");
+            }
+
+# get $tmpdir from .rc file, if no .rc file, create it
+            if (! -s "$home/$rc_filename") {
+# set comment at start of file
+                &rc_set("","");
+                $startup_phase=-1;
+                &rc_set("startup_phase",-1);
+            } else {
+                $startup_phase=&rc_get("startup_phase");
+                if ($startup_phase eq "" || $startup_phase eq "100") {
+                    $startup_phase=0;
+                    &rc_delete("startup_phase");
+                }
+            }
+
+            $default_keymap="default.keymap";
+
+            &rc_set_if_not_set("version","$version");
+            &rc_set_if_not_set("tempdir","$default_tmpdir");
+
+            if (defined($dyneversion)) {
+                &rc_set_if_not_set("lib_dir","/opt/$dyneversion/lib/");
+                &rc_set_if_not_set("prefix_dir","/opt/$dyneversion/");
+            }
+
+            &rc_set_if_not_set("video_open_command","$video_open_command");
+            &rc_set_if_not_set("audio_play_command","$audio_play_command");
+            &rc_set_if_not_set("audio_player",$audio_player);
+            &rc_set_if_not_set("midisynch","false");
+            &rc_set_if_not_set("pb_quality",2);
+            &rc_set_if_not_set("insert_resample","true");
+            &rc_set_if_not_set("open_compression_percent",15);
+            &rc_set_if_not_set("conserve_space","false");
+            &rc_set_if_not_set("antialias","true");
+# resize action when opening images - can be either: "bound" or "none"
+            &rc_set_if_not_set("image_resize_action","none");
+            &rc_set_if_not_set("encoder",$encoder);
+            &rc_set_if_not_set("output_type","mjpeg");
+            &rc_set_if_not_set("audio_effect","none");
+            &rc_set_if_not_set("default_image_format","png");
+            &rc_set_if_not_set("default_fps",25);
+            &rc_set_if_not_set("save_directories","false");
+            &rc_set_if_not_set("stop_screensaver","true");
+            &rc_set_if_not_set("open_maximised","true");
+            &rc_set_if_not_set("filesel_maximised","true");
+            &rc_set_if_not_set("show_recent_files","true");
+            &rc_set_if_not_set("ce_maxspect","true");
+            &rc_set_if_not_set("lives_warning_mask",797696);
+# bits 19,18,13,11 and 10
+            &rc_set_if_not_set("dl_bandwidth_K",512);
+            &rc_set_if_not_set("show_player_stats","false");
+            &rc_set_if_not_set("show_toolbar","true");
+            &rc_set_if_not_set("encoder_acodec",1);
+# default of PCM
+            &rc_set_if_not_set("record_opts",-1);
+
+            &rc_set_if_not_set("gui_theme","crayons");
+            &rc_set_if_not_set("jack_opts",0);
+# start aserver on startup
+            &rc_set_if_not_set("audio_opts",3);
+            &rc_set_if_not_set("rte_keys_virtual",9);
+
+            &rc_set_if_not_set("instant_open","true");
+            &rc_set_if_not_set("auto_deinterlace","true");
+            &rc_set_if_not_set("auto_trim_pad_audio","true");
+            &rc_set_if_not_set("auto_cut_borders","false");
+
+            &rc_set_if_not_set("mt_undo_buf",32);
+            &rc_set_if_not_set("mt_enter_prompt","true");
+            &rc_set_if_not_set("render_prompt","true");
+            &rc_set_if_not_set("mt_exit_render","true");
+            &rc_set_if_not_set("mt_def_width",640);
+            &rc_set_if_not_set("mt_def_height",480);
+            &rc_set_if_not_set("mt_def_achans",2);
+            &rc_set_if_not_set("mt_def_signed_endian",2*!&get_endian);
+            &rc_set_if_not_set("mt_backaudio","1");
+            &rc_set_if_not_set("mt_pertrack_audio","true");
+            &rc_set_if_not_set("mt_auto_back",120);
+
+            &rc_set_if_not_set("ar_clipset","");
+            &rc_set_if_not_set("ar_layout","");
+
+            &rc_set_if_not_set("rec_desktop_audio","false");
+            &rc_set_if_not_set("osc_start","false");
+            &rc_set_if_not_set("osc_port",49999);
+
+            &rc_set_if_not_set("concat_images","true");
+            &rc_set_if_not_set("mouse_scroll_clips","true");
+
+            &rc_set_if_not_set("omc_dev_opts",3);
+
+            &rc_set_if_not_set("rec_stop_gb",10);
+
+            &rc_set_if_not_set("def_autotrans","chroma blend");
+            &rc_set_if_not_set("audio_src",0);
+#internal
+
+            &rc_set_if_not_set("ce_thumb_mode","true");
+
+            $tmpdir=&rc_get("tempdir");
+            &write_bootstrap_file;
+            &mktmpdir;
+
+            $convert_old_version=&rc_get("convert_version");
+            unless($convert_old_version eq $convert_version) {
+                &rc_set("convert_version",$convert_version);
+            }
+            &version_check_and_upgrade;
+
+            unless($gui_bootstrap_file eq "") {
+                open OUT,"> $gui_bootstrap_file" or exit 4;
+                print OUT "$version|$tmpdir|$startup_phase|$msg|$msg2";
+                close OUT;
+            }
+
+#make sure we can write to tempir
+            open OUT,"> $tmpdir/testfile" or exit 5;
+            close OUT;
+            unlink "$tmpdir/testfile";
+
+            exit 0;
+        }
+
+        if ($command eq "set_clip_value") {
+            $prefs_file=$ARGV[1];
+            shift(@ARGV);
+            $command="set_pref";
+        }
+
+
+        if ($command eq "set_pref") {
+            $key=$ARGV[1];
+            $value=$ARGV[2];
+
+            &rc_set("$key","$value");
+            exit 0;
+        }
+
+        if ($command eq "set_pref_if_not_set") {
+            $key=$ARGV[1];
+            $value=$value=$ARGV[2];
+            &rc_set_if_not_set("$key","$value");
+            exit 0;
+        }
+
+
+
+        if ($command eq "get_clip_value") {
+            $command="get_pref";
+            $prefs_file=$ARGV[4];
+        }
+
+
+        if ($command eq "print_pref") {
+            $command="get_pref";
+            $ARGV[2]="-";
+        }
+
+        if ($command eq "get_pref") {
+            $key=$ARGV[1];
+            if (defined($ARGV[2])) {
+                $first=$ARGV[2];
+            } else {
+                $first=$uid;
+            }
+            if (defined($ARGV[3])) {
+                $second=$ARGV[3];
+            } else {
+                $second=$gid;
+            }
+            $value=&rc_get($key,$home);
+
+            if ($first eq "-"&&!defined($ARGV[3])) {
+                print $value;
+                exit 0;
+            }
+            if ($^O eq "MSWin32") {
+                open OUT,"> $tmpdir/smogval.$first.$second" or exit 1;
+            } else {
+                open OUT,"> $tmpdir/.smogval.$first.$second" or exit 1;
+            }
+            print OUT $value;
+            close OUT;
+            exit 0;
+        }
+
+        if ($command eq "get_pref_default") {
+            $key=$ARGV[1];
+            if (defined($ARGV[2])) {
+                $first=$ARGV[2];
+            } else {
+                $first=$uid;
+            }
+            if (defined($ARGV[3])) {
+                $second=$ARGV[3];
+            } else {
+                $second=$gid;
+            }
+            $value=&rc_get_default($key);
+
+            if ($value eq "") {
+                $value="NULL";
+            }
+
+            if ($^O eq "MSWin32") {
+                open OUT,"> $tmpdir/smogval.$first.$second" or exit 1;
+            } else {
+                open OUT,"> $tmpdir/.smogval.$first.$second" or exit 1;
+            }
+            print OUT $value;
+            close OUT;
+            exit 0;
+        }
+
+        if ($command eq "delete_pref") {
+            $key=$ARGV[1];
+            &rc_delete($key);
+        }
+
+        if ($command eq "get_location") {
+            $exe=$ARGV[1];
+            if (defined($ARGV[2])) {
+                $first=$ARGV[2];
+            } else {
+                $first=$uid;
+            }
+            if (defined($ARGV[3])) {
+                $second=$ARGV[3];
+            } else {
+                $second=$gid;
+            }
+            $value=&location($exe);
+
+            if ($^O eq "MSWin32") {
+                open OUT,"> $tmpdir/smogval.$first.$second" or exit 1;
+            } else {
+                open OUT,"> $tmpdir/.smogval.$first.$second" or exit 1;
+            }
+
+            print OUT $value;
+            close OUT;
+            exit 0;
+        }
+
+
+        if ($command eq "pause") {
+            if ($^O eq "MSWin32") {
+                $smres=smog_system("touch.exe \"$tmpdir\\$ARGV[1]\\pause\"");
+                if ($smres) {
+                    sig_write_error("$tmpdir\\$ARGV[1]\\pause");
+                    exit 1;
+                }
+            } else {
+                $smres=smog_system("touch \"$tmpdir/$ARGV[1]/pause\"");
+                if ($smres) {
+                    sig_write_error("$tmpdir/$ARGV[1]/pause");
+                    exit 1;
+                }
+            }
+            if ($^O eq "MSWin32") {
+#smog_system("chmod.exe 600 \"$tmpdir\\$ARGV[1]\\pause\"");
+            } else {
+                smog_system("/bin/chmod 600 \"$tmpdir/$ARGV[1]/pause\"");
+            }
+            exit 0;
+        }
+
+
+        if ($command eq "resume") {
+            unlink "$tmpdir/$ARGV[1]/pause";
+            exit 0;
+        }
+
+
+        if ($command eq "clear_tmp_files") {
+            $handle=$ARGV[1];
+#clear old backups (e.g. when saving a set)
+            $curtmpdir="$tmpdir/$handle";
+            &clean_old;
+            &sig_complete;
+            exit 0;
+        }
+
+        if ($command eq "clear_pre_files") {
+            $handle=$ARGV[1];
+#clear old backups (e.g. when saving a set)
+            $curtmpdir="$tmpdir/$handle";
+            smog_chdir("$curtmpdir");
+            unlink glob "*.pre";
+            &sig_complete;
+            exit 0;
+        }
+
+
+        if ($command eq "undo_audio") {
+            $handle=$ARGV[1];
+            $curtmpdir="$tmpdir/$handle";
+            if ($^O eq "MSWin32") {
+                $statusfile="$curtmpdir/status";
+            } else {
+                $statusfile="$curtmpdir/.status";
+            }
+
+            &undo_audio;
+# will abort on failure
+            &sig_complete;
+            exit 0;
+        }
+
+        if ($command eq "backup_audio") {
+            $handle=$ARGV[1];
+            $curtmpdir="$tmpdir/$handle";
+            if ($^O eq "MSWin32") {
+                $statusfile="$curtmpdir/status";
+            } else {
+                $statusfile="$curtmpdir/.status";
+            }
+            smog_chdir("$curtmpdir");
+            &backup_audio;
+            if ($panic) {
+                exit 1;
+            }
+            &sig_complete;
+            exit 0;
+        }
+
+
+        if ($command eq "save_frame") {
+            my $hsize=-1;
+            my $vsize=-1;
+
+            $handle=$ARGV[1];
+            $curtmpdir="$tmpdir/$handle";
+            $frame=$ARGV[2];
+            $name=&mkname($frame);
+            $nfile=$ARGV[3];
+            if (defined $ARGV[4]) {
+                $hsize=$ARGV[4];
+            }
+            if (defined $ARGV[5]) {
+                $vsize=$ARGV[5];
+            }
+
+            if ($^O eq "MSWin32") {
+                $statusfile="$curtmpdir/status";
+            } else {
+                $statusfile="$curtmpdir/.status";
+            }
+
+# check the file is writable
+            unless(&is_writeable($nfile)) {
+                &sig_error("Unable to open output file !","$GUI_NAME could not write to $nfile.");
+            }
+
+            $img_ext=&get_img_ext($curtmpdir,$frame);
+            $img_prefix=&get_img_prefix($img_ext);
+
+            umask 0111;
+
+            if ($hsize==-1||$vsize==-1) {
+                $com="$smog_convert_command $img_prefix\"$curtmpdir/$name$img_ext\" \"$nfile\" >$nulfile 2>&1";
+            } else {
+                if ($antialias eq "false") {
+                    $com="$smog_convert_command +antialias $img_prefix\"$curtmpdir/$name$img_ext\" -scale $hsize"."!x"."$vsize! \"$nfile\" > $nulfile 2>&1";
+                } else {
+                    $com="$smog_convert_command -antialias $img_prefix\"$curtmpdir/$name$img_ext\" -resize $hsize"."!x"."$vsize! \"$nfile\" > $nulfile 2>&1";
+                }
+            }
+
+            $smerr=smog_system($com);
+            if ($smerr) {
+                sig_system_error("$com",$smerr);
+                exit 1;
+            };
+
+            exit 0;
+        }
+
+
+        if ($command eq "restore_details") {
+            $handle=$ARGV[1];
+            $nfile=$ARGV[2];
+            $leave_headers=$ARGV[3];
+
+            $curtmpdir="$tmpdir/$handle";
+
+            if ($^O eq "MSWin32") {
+                $statusfile="$curtmpdir/status";
+            } else {
+                $statusfile="$curtmpdir/.status";
+            }
+
+            smog_chdir("$curtmpdir");
+            $fsize= -s "$nfile";
+            $afsize = -s "audio";
+            unlink glob "*.tar";
+            unlink glob "event.*";
+            unlink "extended";
+
+            $img_type="jpg";
+
+            unless(-f "header.lives") {
+
+                if (defined(open IN,"< header2")) {
+                    read IN,$val,4;
+
+# unfortunately...old clips used whatever endian the machine used
+                    $endian=&get_endian;
+                    $frames=&getint($val);
+                    read IN,$title,256;
+                    read IN,$author,256;
+                    read IN,$comment,256;
+                }
+
+                $title=~ tr/\x00//d;
+                       $author=~ tr/\x00//d;
+                               $comment=~ tr/\x00//d;
+
+# very old backups didn't have a header2
+                if (! -f "header2") {
+                    unless ($nfile eq "") {
+                        unlink glob "event.*";
+                        $img_ext=&get_img_ext($curtmpdir);
+                        $img_prefix=&get_img_prefix($img_ext);
+                        $frames=&count_frames;
+                    }
+                }
+
+# leave headers for restoring VJ sets
+                if ($leave_headers==1) {
+                    $fsize=0;
+                }
+                else {
+                    unlink <header header2>;
+                }
+            }
+            else {
+                unlink <header header2>;
+            }
+
+            $name=&mkname(1);
+
+            if (-f "$name.png") {
+                $img_type="png";
+            }
+
+            &sig_complete($fsize,$afsize,$img_type,$frames,"$title","$author","$comment");
+            exit 0;
+        }
+
+        if ($command eq "list_plugins") {
+
+# prefix_dir pref should be set first
+# plugins are returned in sort() order
+            my $allow_nonex=$ARGV[1];
+            my $allow_subdirs=$ARGV[2];
+            my $plugindir=$ARGV[3];
+            my $ext=$ARGV[4];
+
+            my $string="";
+
+            if ($ext =~ /^-/) {
+                $strip_ext=1;
+                $ext=substr($ext,1,length($ext));
+            }
+
+            if (-d $plugindir) {
+                smog_chdir("$plugindir");
+                opendir DIR,$plugindir;
+                my @files=readdir(DIR);
+                closedir DIR;
+                @files = sort (@files);
+
+                foreach my $plugname (@files) {
+                    unless ($plugname =~ /^\./) {
+                        if ((-f $plugname && (-x $plugname||$allow_nonex))||($allow_subdirs==1&& -d $plugname)) {
+                            unless($allow_nonex) {
+                                next if ! -x "$plugindir/$plugname";
+                        }
+                        unless ($plugname eq "") {
+                                if ($ext eq ""|| $plugname =~ /$ext$/) {
+                                    if ($strip_ext==1) {
+                                        $plugname=(split(/\./,$plugname))[0];
+                                    }
+                                    $string.="$plugname|";
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+            else {
+                print "\n";
+                exit 1;
+            }
+            print "$string\n";
+            exit 0;
+        }
 
-	    $type=$ARGV[1];
+
+        if ($command eq "build_rfx_plugins") {
+            if ($^O ne "MSWin32") {
+                if (&location($rfx_builder_multi) eq "") {
+                    &sig_error("Unable to locate the program $rfx_builder_multi");
+                    exit 1;
+                }
+            }
+
+            $type=$ARGV[1];
             $script_dir=$ARGV[2];
             $exec_dir=$ARGV[3];
-	    if ($^O ne "MSWin32") {
-		smog_system("$rfx_builder_multi \"$type\" \"$script_dir\" \"$exec_dir\"");
-	    }
-	    else {
-		smog_system("perl \"$installdir\\$rfx_builder_multi\" \"$type\" \"$script_dir\" \"$exec_dir\"");
-	    }
-	    exit 0;
-	}
-
-
-
-	if ($command eq "make_thumb") {
-	    $handle=$ARGV[1];
-	    $curtmpdir="$tmpdir/$handle";
-	    if ($^O eq "MSWin32") {
-		$statusfile="$curtmpdir/status";
-	    }
-	    else {
-		$statusfile="$curtmpdir/.status";
-	    }
-	    $dwidth=$ARGV[2];
-	    $dheight=$ARGV[3];
-	    $img_ext=".".$ARGV[4];
-	    $img_prefix=&get_img_prefix($img_ext);
-	    $file=$ARGV[5];
-
-	    if (! -d "$curtmpdir") {
-		mkdir ("$curtmpdir",0700);
-	    }
-
-	    $antialias=&rc_get("antialias");
-
-	    $imresact="bound";
-	    &get_image_size("$file");
-	    if ($panic) {
-		exit 1;
-	    }
-	    if (!($vsize*$hsize)||$hsize==-1) {
-		&sig_complete(0,0);
-		exit 0;
-	    }
-
-	    smog_chdir("$curtmpdir");
-
-	    $name=&mkname(1);
-	    
-	    if ($antialias eq "false") {
-		smog_system("$smog_convert_command +antialias \"$file\" -scale $hsize"."!x"."$vsize! $img_prefix\"$curtmpdir/$name$img_ext\" > $nulfile 2>&1");
-	    }
-	    else {
-		smog_system("$smog_convert_command -antialias \"$file\" -resize $hsize"."!x"."$vsize! $img_prefix\"$curtmpdir/$name$img_ext\" > $nulfile 2>&1");
-	    }
-	    &sig_complete($hsize,$vsize);
-	    exit 0;
-	}
-
-
-	if ($command eq "version"&&!caller) {
-	    print "smogrify $version\n";
-	    exit 0;
-	}
-
-
-	if ($command eq "plugin_clear") {
-	    # this is a special function which does general cleanup
-	    # and then does the "clear" command in the plugin
-	    # non-perl plugins have to implement this command themselves
-	    #
-	    $handle=$ARGV[1];
-	    $curtmpdir="$tmpdir/$handle";
-	    if ($^O eq "MSWin32") {
-		$statusfile="$curtmpdir/status";
-	    }
-	    else {
-		$statusfile="$curtmpdir/.status";
-	    }
-	    smog_chdir("$curtmpdir");
-	    $start=$ARGV[2];
-	    $end=$ARGV[3];
-	    $plugdir=$ARGV[4];
-	    $type=$ARGV[5];
-	    $rest=$ARGV[6];
-	    $plugin="";
-
-
-	    unless ($rest eq "") {
-		$plugin="$plugdir$type/$rest";
-	    }
-
-	    if ($type eq "encoders" || $type eq "effects/rendered/") {
-		$img_ext=&get_img_ext($curtmpdir,$start);
-		$img_prefix=&get_img_prefix($img_ext);
-		if ($type eq "encoders") {
-		    if (-f "audio.origbak") {
-			unlink "audio";
-			smog_rename( "audio.origbak","audio");
-		    }
-		    $areq=&get_form_request($plugin);
-		    if ($areq&1||$areq&2) {
-			unlink <audiodump.wav audioclip>;
-		    }
-		    if ($areq&4) {
-			if ($^O ne "MSWin32") {
-			    # TODO **** !!!!!
-			    &clear_symlinks;
-			}
-		    }
-		}
-	    }
-
-	    #need this again - something resets us
-	    smog_chdir("$curtmpdir");
-
-	    if ($^O eq "MSWin32") {
-		# filter by file ext
-		my $ext=&get_ext("$plugin");
-		if ($ext eq ".py") {
-		    $cmd="python";
-		}
-		else {
-		    $cmd="perl";
-		}
-		$com="$cmd \"$plugin\" clear $start $end $img_ext";
-	    }
-	    else {
-		$com="\"$plugin\" clear $start $end $img_ext";
-	    }
-
-	    $smerr=smog_system($com);
-	    if ($smerr) {
-		sig_system_error("Command failed: $com",$smerr); 
-		exit 1;
-	    }
-	    &sig_complete;
-	    exit 0;
-	}
+            if ($^O ne "MSWin32") {
+                smog_system("$rfx_builder_multi \"$type\" \"$script_dir\" \"$exec_dir\"");
+            }
+            else {
+                smog_system("perl \"$installdir\\$rfx_builder_multi\" \"$type\" \"$script_dir\" \"$exec_dir\"");
+            }
+            exit 0;
+        }
+
 
 
+        if ($command eq "make_thumb") {
+            $handle=$ARGV[1];
+            $curtmpdir="$tmpdir/$handle";
+            if ($^O eq "MSWin32") {
+                $statusfile="$curtmpdir/status";
+            }
+            else {
+                $statusfile="$curtmpdir/.status";
+            }
+            $dwidth=$ARGV[2];
+            $dheight=$ARGV[3];
+            $img_ext=".".$ARGV[4];
+            $img_prefix=&get_img_prefix($img_ext);
+            $file=$ARGV[5];
+
+            if (! -d "$curtmpdir") {
+                mkdir ("$curtmpdir",0700);
+            }
+
+            $antialias=&rc_get("antialias");
+
+            $imresact="bound";
+            &get_image_size("$file");
+            if ($panic) {
+                exit 1;
+            }
+            if (!($vsize*$hsize)||$hsize==-1) {
+                &sig_complete(0,0);
+                exit 0;
+            }
+
+            smog_chdir("$curtmpdir");
+
+            $name=&mkname(1);
+
+            if ($antialias eq "false") {
+                smog_system("$smog_convert_command +antialias \"$file\" -scale $hsize"."!x"."$vsize! $img_prefix\"$curtmpdir/$name$img_ext\" > $nulfile 2>&1");
+            }
+            else {
+                smog_system("$smog_convert_command -antialias \"$file\" -resize $hsize"."!x"."$vsize! $img_prefix\"$curtmpdir/$name$img_ext\" > $nulfile 2>&1");
+            }
+            &sig_complete($hsize,$vsize);
+            exit 0;
+        }
+
+
+        if ($command eq "version"&&!caller) {
+            print "smogrify $version\n";
+            exit 0;
+        }
+
+
+        if ($command eq "plugin_clear") {
+# this is a special function which does general cleanup
+# and then does the "clear" command in the plugin
+# non-perl plugins have to implement this command themselves
+#
+            $handle=$ARGV[1];
+            $curtmpdir="$tmpdir/$handle";
+            if ($^O eq "MSWin32") {
+                $statusfile="$curtmpdir/status";
+            }
+            else {
+                $statusfile="$curtmpdir/.status";
+            }
+            smog_chdir("$curtmpdir");
+            $start=$ARGV[2];
+            $end=$ARGV[3];
+            $plugdir=$ARGV[4];
+            $type=$ARGV[5];
+            $rest=$ARGV[6];
+            $plugin="";
 
-	if ($command eq "check_for_lock") {
+
+            unless ($rest eq "") {
+                $plugin="$plugdir$type/$rest";
+            }
+
+            if ($type eq "encoders" || $type eq "effects/rendered/") {
+                $img_ext=&get_img_ext($curtmpdir,$start);
+                $img_prefix=&get_img_prefix($img_ext);
+                if ($type eq "encoders") {
+                    if (-f "audio.origbak") {
+                        unlink "audio";
+                        smog_rename( "audio.origbak","audio");
+                    }
+                    $areq=&get_form_request($plugin);
+                    if ($areq&1||$areq&2) {
+                        unlink <audiodump.wav audioclip>;
+                    }
+                    if ($areq&4) {
+                        if ($^O ne "MSWin32") {
+# TODO **** !!!!!
+                            &clear_symlinks;
+                        }
+                    }
+                }
+            }
+
+#need this again - something resets us
+            smog_chdir("$curtmpdir");
+
+            if ($^O eq "MSWin32") {
+# filter by file ext
+                my $ext=&get_ext("$plugin");
+                if ($ext eq ".py") {
+                    $cmd="python";
+                }
+                else {
+                    $cmd="perl";
+                }
+                $com="$cmd \"$plugin\" clear $start $end $img_ext";
+            }
+            else {
+                $com="\"$plugin\" clear $start $end $img_ext";
+            }
+
+            $smerr=smog_system($com);
+            if ($smerr) {
+                sig_system_error("Command failed: $com",$smerr);
+                exit 1;
+            }
+            &sig_complete;
+            exit 0;
+        }
+
+
+
+        if ($command eq "check_for_lock") {
 #TODO - mingw
 
-	    # check if there is a lock file for a set, and if so is it in use
-	    my $setname=$ARGV[1];
-	    my $exename=$ARGV[2];
-	    my $pid=$ARGV[3];
+# check if there is a lock file for a set, and if so is it in use
+            my $setname=$ARGV[1];
+            my $exename=$ARGV[2];
+            my $pid=$ARGV[3];
 
             opendir DIR,"$tmpdir/$setname";
 
-	    while (my $file=readdir(DIR)) {
-		if ($file=~/^lock\.(.*)/) {
-		    #found a lockfile
-		    my $proc=$1;
-		    unless ($proc eq $pid) {
-			my $exe=smog_system_direct("/bin/readlink -n /proc/$proc/exe");  #allowed to fail
-			my $short_exe=&my_basename($exe);
-
-			if ($short_exe eq $exename) {
-			    # and it's in use
-			    closedir DIR;
-			    print $proc."\n";
-			    exit 0;
-			}
-			unlink "$tmpdir/$setname/$file";
-		    }
-		}
-	    }
+            while (my $file=readdir(DIR)) {
+                if ($file=~/^lock\.(.*)/) {
+#found a lockfile
+                    my $proc=$1;
+                    unless ($proc eq $pid) {
+                        my $exe=smog_system_direct("/bin/readlink -n /proc/$proc/exe");  #allowed to fail
+                        my $short_exe=&my_basename($exe);
+
+                        if ($short_exe eq $exename) {
+# and it's in use
+                            closedir DIR;
+                            print $proc."\n";
+                            exit 0;
+                        }
+                        unlink "$tmpdir/$setname/$file";
+                    }
+                }
+            }
             closedir DIR;
-	    exit 0;
-	}
+            exit 0;
+        }
 
 
 
 
 #TODO - mingw
-	if ($command eq "get_recovery_file") {
-	    #find first non-in-use recovery file for given uid, gid and filepart
-	    my $uid=$ARGV[1];
-	    my $gid=$ARGV[2];
-	    my $exename=$ARGV[3];
-	    my $filepart=$ARGV[4];
+        if ($command eq "get_recovery_file") {
+#find first non-in-use recovery file for given uid, gid and filepart
+            my $uid=$ARGV[1];
+            my $gid=$ARGV[2];
+            my $exename=$ARGV[3];
+            my $filepart=$ARGV[4];
             opendir DIR,"$tmpdir";
 
-	    while (my $file=readdir(DIR)) {
-		if ($file=~/^$filepart\.$uid\.$gid\.(.*)/) {
-		    if (-z $file) {
-			unlink "$file";
-		    }
-		    else {
-			my $exe=smog_system_direct("/bin/readlink -n /proc/$1/exe");  #allowed to fail
-			my $short_exe=&my_basename($exe);
-			
-			unless ($short_exe eq $exename) {
-			    $output=(split /\./,$file)[-1];
-			    print $output;
-			    closedir DIR;
-			    exit 0;
-			}
-		    }
-		}
-	    }
-	    print 0;
+            while (my $file=readdir(DIR)) {
+                if ($file=~/^$filepart\.$uid\.$gid\.(.*)/) {
+                    if (-z $file) {
+                        unlink "$file";
+                    } else {
+                        my $exe=smog_system_direct("/bin/readlink -n /proc/$1/exe");
+#allowed to fail
+                        my $short_exe=&my_basename($exe);
+
+                        unless($short_exe eq $exename) {
+                            $output=(split /\./,$file)[-1];
+                            print $output;
+                            closedir DIR;
+                            exit 0;
+                        }
+                    }
+                }
+            }
+            print 0;
             closedir DIR;
-	    exit 0;
-	}
+            exit 0;
+        }
 
 #TODO - mingw
-	if ($command eq "clean_recovery_files") {
-	    #remove non-in-use recovery/layout files for given uid, gid
-	    my $uid=$ARGV[1];
-	    my $gid=$ARGV[2];
-	    my $exename=$ARGV[3];
+        if ($command eq "clean_recovery_files") {
+#remove non-in-use recovery/layout files for given uid, gid
+            my $uid=$ARGV[1];
+            my $gid=$ARGV[2];
+            my $exename=$ARGV[3];
             opendir DIR,"$tmpdir";
 
-	    smog_chdir("$tmpdir");
+            smog_chdir("$tmpdir");
 
-	    while (my $file=readdir(DIR)) {
-		if ($file=~/^recovery\.$uid\.$gid\.(.*)/ || $file=~/^layout\.$uid\.$gid\.(.*)/ || $file=~/^layout_numbering\.$uid\.$gid\.(.*)/) {
-		    my $exe=smog_system_direct("/bin/readlink -n /proc/$1/exe"); #allowed to fail
-		    my $short_exe=&my_basename($exe);
-		    unless ($short_exe eq $exename) {
-			unlink "$file";
-		    }
-		}
-	    }
+            while (my $file=readdir(DIR)) {
+                if ($file=~/^recovery\.$uid\.$gid\.(.*)/ || $file=~/^layout\.$uid\.$gid\.(.*)/ || $file=~/^layout_numbering\.$uid\.$gid\.(.*)/) {
+                    my $exe=smog_system_direct("/bin/readlink -n /proc/$1/exe");
+#allowed to fail
+                    my $short_exe=&my_basename($exe);
+                    unless($short_exe eq $exename) {
+                        unlink "$file";
+                    }
+                }
+            }
             closedir DIR;
-	    exit 0;
-	}
+            exit 0;
+        }
 
 
         if ($command eq "get_next_in_set") {
-            # this is a special function for lives-exe. It will look for
-            # clips on the disk that have the marker file "set.$name"
-	    # only used now for pre 0.9.6 versions
+# this is a special function for lives-exe. It will look for
+# clips on the disk that have the marker file "set.$name"
+# only used now for pre 0.9.6 versions
 
             $last=$ARGV[1];
             $setname=$ARGV[2];
             $pid=$ARGV[3];
 
             opendir DIR,"$tmpdir";
-	    @allfiles=readdir(DIR);
+            @allfiles=readdir(DIR);
             closedir DIR;
 
-            foreach my $subdir (@allfiles) {
-		if (-f "$tmpdir/$subdir/set.$setname") {
+            foreach my $subdir(@allfiles) {
+                if (-f "$tmpdir/$subdir/set.$setname") {
                     if ($last eq "none") {
                         $found=$subdir;
                         last;
@@ -1088,18 +1073,17 @@
                         $last="none";
                     }
                 }
-	    }
+            }
 
-	    if ($found eq "") {
+            if ($found eq "") {
                 $found="none";
             }
 
-	    if ($^O eq "MSWin32") {
-		$infofile="$tmpdir/info.$pid";
-	    }
-	    else {
-		$infofile="$tmpdir/.info.$pid";
-	    }
+            if ($^O eq "MSWin32") {
+                $infofile="$tmpdir/info.$pid";
+            } else {
+                $infofile="$tmpdir/.info.$pid";
+            }
             smog_system_sync();
 
             if (-d $tmpdir) {
@@ -1111,3006 +1095,2981 @@
         }
 
 
-	if ($command eq "cleanup"||$command eq "weed") {
-	    smog_chdir("$tmpdir");
-	    print "Cleaning up temporary space for $GUI_NAME.\n";
-	    if ($command eq "cleanup") {
-		if ($^O ne "MSWin32") {
-		    unlink "/tmp/.smogval*";  # TODO *** !!!!!!!!!!
-		}
-		unlink glob "* .* *.*";  # will not remove directories
-	    }
-	    else {
-		$new_temp=$ARGV[1];
-		unless ($new_temp eq "") {
-		    # here is where we create a new temp directory
-		    unless (-d $new_temp||(mkdir $new_temp,0777)) {
-			print "Smogrify: Unable to create new directory $new_temp!\n";
-			exit 1;
-		    }
-		    print "Smogrify: moving sets from $tmpdir to $new_temp\n";
-		}
-		else {
-		    print "Smogrify: Leaving sets intact.\n";
-		}
-		&weed(0);
-	    }
-	    exit 0;
-	}
-	
-	if (substr($command,0,7) eq "fxinit_") {
-	    # call onchange_init
-	    $command=substr($command,7);
-	    $handle=$ARGV[1];
+        if ($command eq "cleanup"||$command eq "weed") {
+            smog_chdir("$tmpdir");
+            print "Cleaning up temporary space for $GUI_NAME.\n";
+            if ($command eq "cleanup") {
+                if ($^O ne "MSWin32") {
+                    unlink "/tmp/.smogval*";
+# TODO *** !!!!!!!!!!
+                }
+                unlink glob "* .* *.*";
+# will not remove directories
+            } else {
+                $new_temp=$ARGV[1];
+                unless($new_temp eq "") {
+# here is where we create a new temp directory
+                    unless(-d $new_temp||(mkdir $new_temp,0777)) {
+                        print "Smogrify: Unable to create new directory $new_temp!\n";
+                        exit 1;
+                    }
+                    print "Smogrify: moving sets from $tmpdir to $new_temp\n";
+                }
+                else {
+                    print "Smogrify: Leaving sets intact.\n";
+                }
+                &weed(0);
+            }
+            exit 0;
+        }
+
+        if (substr($command,0,7) eq "fxinit_") {
+# call onchange_init
+            $command=substr($command,7);
+            $handle=$ARGV[1];
 
-	    $dir=$ARGV[2];
+            $dir=$ARGV[2];
 
             $width=$ARGV[3];
             $height=$ARGV[4];
 
-	    $plugin_name="$dir/$command";
-	    shift; shift; shift; shift;
+            $plugin_name="$dir/$command";
+            shift;
+            shift;
+            shift;
+            shift;
 
-	    $curtmpdir="$tmpdir/$handle";
+            $curtmpdir="$tmpdir/$handle";
 
-	    $ARGV[0]="onchange_init";
-	    require("$plugin_name");
-	    exit 0;
-	}
+            $ARGV[0]="onchange_init";
+            require("$plugin_name");
+            exit 0;
+        }
 
 
 
-	if ($command eq "count_frames") {
-	    $img_ext=".".$ARGV[2];
-	    print &count_frames;
-	    exit 0;
-	}
+        if ($command eq "count_frames") {
+            $img_ext=".".$ARGV[2];
+            print &count_frames;
+            exit 0;
+        }
 
 
-	if ($command eq "get_proj_set") {
-	    my $proj_file=$ARGV[1];
-	    my $out=smog_system_direct("tar --exclude=*/* -tzf $proj_file");
-	    unless ($out=~/\/$/) {
-		exit 1;
-	    }
-	    chomp $out;
-	    chop $out;
-	    print $out;
+        if ($command eq "get_proj_set") {
+            my $proj_file=$ARGV[1];
+            my $out=smog_system_direct("tar --exclude=*/* -tzf $proj_file");
+            unless($out=~/\/$/) {
+                exit 1;
+            }
+            chomp $out;
+            chop $out;
+            print $out;
 
-	    exit 0;
-	}
+            exit 0;
+        }
 
         if ($command eq "mv_pre") {
-	    $handle=$ARGV[1];
-	    $curtmpdir="$tmpdir/$handle";
-	    if ($^O eq "MSWin32") {
-		$statusfile="$curtmpdir/status";
-	    }
-	    else {
-		$statusfile="$curtmpdir/.status";
-	    }
-	    unlink "$curtmpdir/pause";
-	    $start=$ARGV[2];
-	    $end=$ARGV[3];
-	    $img_ext=".".$ARGV[4];
-	    &mv_pre;
-	    if ($panic) {
-		exit 1;
-	    }
-	    &sig_complete;
-	    exit 0;
-	}
+            $handle=$ARGV[1];
+            $curtmpdir="$tmpdir/$handle";
+            if ($^O eq "MSWin32") {
+                $statusfile="$curtmpdir/status";
+            } else {
+                $statusfile="$curtmpdir/.status";
+            }
+            unlink "$curtmpdir/pause";
+            $start=$ARGV[2];
+            $end=$ARGV[3];
+            $img_ext=".".$ARGV[4];
+            &mv_pre;
+            if ($panic) {
+                exit 1;
+            }
+            &sig_complete;
+            exit 0;
+        }
+
 
 
+        if ($command eq "clear_symlinks") {
+            $handle=$ARGV[1];
+            &clear_symlinks;
+            exit 0;
+        }
 
-	if ($command eq "clear_symlinks") {
-	    $handle=$ARGV[1];
-	    &clear_symlinks;
-	    exit 0;
-	}
 
 
-    
-####################################################################    
-    if ($^O ne "MSWin32") {
-	# run the rest in background
-	if ($background==1) {
-	    if (fork()) {
-		exit 0;
-	    }
-	}
-    }
 ####################################################################
-    umask $umask;
+        if ($^O ne "MSWin32") {
+# run the rest in background
+            if ($background==1) {
+                if (fork()) {
+                    exit 0;
+                }
+            }
+        }
+####################################################################
+        umask $umask;
+
+        if (!caller&&(!defined($ARGV[1]) || $ARGV[1] eq "")) {
+            &usage;
+            exit 1;
+        }
+
+        $handle=$ARGV[1];
+
+        $curtmpdir="$tmpdir/$handle";
+
+        if ($^O eq "MSWin32") {
+            $statusfile=$curtmpdir."/status";
+        } else {
+            $statusfile=$curtmpdir."/.status";
+        }
+
+        if ($command eq "play"||$command eq "play_opening_preview") {
+            if ($^O eq "MSWin32") {
+                $pidfile=$curtmpdir."/pidpb";
+            } else {
+                $pidfile=$curtmpdir."/.pidpb";
+            }
+        } else {
+            if ($^O eq "MSWin32") {
+                $pidfile=$curtmpdir."/pid";
+            } else {
+                $pidfile=$curtmpdir."/.pid";
+            }
+        }
+
+        if ($command eq "play_opening_preview") {
+# play_opening_preview is exactly like play
+# except our audio filename is different
+            $opening_preview=1;
+            $command="play";
+        }
+
+
+        unless($command eq "keep"||$command eq "close") {
+# tell the world our pid
+            &sig_pid;
+        }
+
+
+        if ($command eq "play") {
+            $endian=&get_endian;
+
+            $fps=$ARGV[2];
+            if ($fps==0) {
+                $fps=&rc_get("default_fps");
+            }
+
+            $start=$ARGV[3];
+            $end=$ARGV[4];
+
+
+            $loop=0;
+            if ($ARGV[5]!=0) {
+                $loop=$ARGV[5];
+            }
+
+
+            if (!defined $ARGV[6]||$ARGV[6]==0) {
+                $arate=44100;
+            } else {
+                $arate=$ARGV[6];
+            }
+            if (!defined $ARGV[7]||$ARGV[7]==0) {
+                $achans=2;
+            } else {
+                $achans=$ARGV[7];
+            }
+
+            if (!defined $ARGV[8]||$ARGV[8]==0) {
+                $asamps=2;
+                $stype="w";
+            } else {
+                $asamps=$ARGV[8];
+                if ($asamps>7) {
+                    $asamps/=8;
+                }
+            }
+            if (!defined $ARGV[9]) {
+                $signed=1;
+            } else {
+                $signed=$ARGV[9];
+            }
+
+            if (!defined $ARGV[10]) {
+                $aendian=$endian;
+            } else {
+                $aendian=$ARGV[10];
+            }
+
+            if (defined($opening_preview)) {
+                $aformat=".raw";
+                $audiofile="$curtmpdir/audiodump.pcm";
+            } else {
+                $aformat=".raw";
+                $audiofile="$curtmpdir/audio";
+            }
+
+
+            $audio_player=&rc_get("audio_player");
+
+            if (-f $audiofile && $arate) {
+
+                $audio_start=($start-1)/$fps;
+                $audio_end=$end/$fps;
+
+                $mute="";
+                if ($arate<0) {
+                    $mute=" -ao null  ";
+                    $arate=-$arate;
+                    if ($audio_player eq "sox") {
+                        $mute=" -v 0 ";
+                    }
+                }
+
+                $audio_play_command=&rc_get("audio_play_command");
+
+                if ($audio_player eq "sox") {
+                    $audio_effect=&rc_get("audio_effect");
+                    $trimcom=" trim $audio_start";
+
+                    if (($audio_end>$audio_start)&&$end>0) {
+                        $trimcom .= " ".($audio_end-$audio_start);
+                    } else {
+                        $trimcom .=" 10000000";
+                    }
+
+                    if ($signed==1) {
+                        $signed="s";
+                    } else {
+                        $signed="u";
+                    }
+
+                    if ($aendian==$endian) {
+                        $aendian="";
+                    } else {
+                        $aendian="-x";
+                    }
+
+                    if ($audio_effect eq "flanger1") {
+                        $audio_effect="flanger 0.6 0.87 3.0 0.9 0.5 -s";
+                    }
+                    elsif($audio_effect eq "echo1") {
+                        $audio_effect="echo 0.8 0.9 1000.0 0.3";
+                    }
+                    elsif($audio_effect eq "chorus1") {
+                        $audio_effect="chorus 0.6 0.9 50.0 0.4 0.25 2.0 -t 60.0  0.32  0.4 1.3 -s";
+                    }
+                    elsif($audio_effect eq "reverb1") {
+                        $audio_effect="reverb 1.0 600.0 180.0 200.0";
+                    }
+                    elsif($audio_effect eq "phaser1") {
+                        $audio_effect="phaser 0.89 0.85 1.0 0.24 2.0 -t";
+                    }
+                    else {
+                        $audio_effect="";
+                    }
+                    $sox_version=&get_sox_version;
+
+                    if ($sox_version<13000000) {
+                        if ($asamps==1) {
+                            $stype="b";
+                        }
+                        elsif($asamps==2) {
+                            $stype="w";
+                        }
+                        $aformat=".".$signed.$stype;
+                        $syscom2="$audio_play_command $mute -c $achans -r $arate -$signed $aendian -t $aformat -$stype $audiofile $trimcom $audio_effect";
+                    } else {
+                        $syscom2="$audio_play_command $mute -c $achans -r $arate -$signed $aendian -t $aformat -$asamps $audiofile $trimcom $audio_effect";
+                    }
+                } else {
+# mplayer seemingly has no easy way of playing unsigned or wrong endian
+                    $syscom2="$audio_play_command -demuxer rawaudio -rawaudio rate=$arate :channels=$achans:samplesize=$asamps $mute $audiofile -ss ".
+                             ($audio_start-1);
+                }
+            }
+
+            $showed_err=0;
+
+            do {
+                if (! -d "$curtmpdir" || -f "$curtmpdir/.stoploop" || -f "$curtmpdir/stoploop" || ! -f $audiofile) {
+                    $loop=0;
+                } else {
+                    $syscom3=$syscom2.">$nulfile 2>&1";
+                    $retval=smog_system("$syscom3");
+                    if ($retval>255) {
+                        unless($showed_err) {
+                            print STDERR "Error playing audio !\n";
+                            print STDERR "Failed command was: $syscom2\n";
+                            smog_system("$syscom2");
+                            $showed_err=1;
+                        }
+                    }
+                }
+            } while ($loop);
+            &sig_complete_audio;
+
+            unlink "$curtmpdir/.stoploop";
+            unlink "$curtmpdir/stoploop";
+
+            exit 0;
+        }
+
+
+        if ($command eq "open_test") {
+            $command="open";
+            $opentest=1;
+        }
+
+
+        if ($command eq "open") {
+
+            unlink "$curtmpdir/pause";
+
+            $file=$ARGV[2];
+            $ss="";
+
+            $withsound=$ARGV[3];
+
+            if (defined($ARGV[4])) {
+                $img_ext=".".$ARGV[4];
+            }
 
-    if (!caller&&(!defined($ARGV[1]) || $ARGV[1] eq "")) {
-	&usage;
-	exit 1;
+            if (defined($ARGV[5]) && $ARGV[5] > 0) {
+                $ss=" -ss $ARGV[5] ";
+            }
+            $frames="";
+            if (defined($ARGV[6]) && $ARGV[6] > 0) {
+                $ARGV[6]++;
+# cf below, we remove 1st frame
+                $frames=" -frames $ARGV[6] ";
+            }
+            $extra_params=$ARGV[7];
+            $band="";
+            if ($extra_params eq "nobandwidth") {
+                $extra_params="";
+            } else {
+                if ($extra_params eq "sendbandwidth") {
+                    $bandwidth=&rc_get("dl_bandwidth_K");
+                    if ($bandwidth eq "") {
+                        $bandwidth=64;
+                    }
+                    $band="-bandwidth $bandwidth"."000";
+                    $extra_params="";
+                }
+            }
+            $compression=&rc_get("open_compression_percent");
+            if ($compression eq "") {
+                $compression=15;
+            }
+
+            smog_chdir("$curtmpdir");
+
+# let get_file_info set this
+#$mplay_command=&rc_get("video_open_command");
+
+# process video
+
+# 3 other files we will use
+            $curtmpfile="tempresult";
+            $audio_out="audio";
+            $audio_in="audiodump.pcm";
+
+            if ($img_ext eq ".png") {
+                $compression=int($compression/10.001)
+            } else {
+                $quality=int(100-$compression);
+            }
+
+            $xframes=$frames;
+
+            my $wavhead=":nowaveheader";
+
+if ($file=~/:\/\//) {
+                      $is_remote=2;
+#$wavhead=""; # need wav header, as user will probably finish by
+# quitting, thus we won't send full info
+        }
+    &get_file_info;
+
+    if ($panic) {
+            unlink "$pidfile";
+            exit 1;
+        }
+
+        $aformnew="";
+        if ($asamps==32) {
+# cannot handle this yet, need to resample to s16
+            if ($endian==1) {
+                $aformnew="-format s16le";
+            }
+            else {
+                $aformnew="-format s16be";
+            }
+            $asamps=16;
+        }
+#TODO - mingw
+        $threads=smog_system_direct("/bin/grep processor /proc/cpuinfo | wc -l");
+        $threads=int($threads);
+        if ($threads==0) {
+            $threads=1;
+        }
+
+        if ($type eq "jpeg" || $type eq "png") {
+            $count=$frames;
+        }
+        else {
+            $frames=$xframes;
+
+            if ($achans eq "" || $achans eq "0") {
+                $channs="";
+            }
+            else {
+                $channs="-channels $achans";
+            }
+
+            if ($withsound eq "0") {
+#video only
+                if ($img_ext eq ".jpg") {
+                    $syscom=$mplay_command . " -quiet $band -osdlevel 0 -vo jpeg:quality=$quality -lavdopts o=threads=$threads -fps 100000 $ss $frames -noframedrop -ao null \"$file\" $extra_params <$nulfile";
+                }
+                else {
+                    $syscom=$mplay_command . " -quiet $band -osdlevel 0 -vo png:z=$compression:alpha -lavdopts o=threads=$threads -fps 100000 $ss $frames -noframedrop -ao null \"$file\" $extra_params <$nulfile";
+                }
+            }
+            elsif ($withsound eq "1") {
+#video and audio 
+                if ($img_ext eq ".jpg") {
+                    $syscom=$mplay_command . " -quiet $band -osdlevel 0 -vo jpeg:quality=$quality $ss -lavdopts o=threads=$threads -noframedrop $frames -ao pcm:fast$wavhead $channs $aformnew -mc 0  \"$file\" $extra_params <$nulfile";
+                }
+                else {
+                    $syscom=$mplay_command . " -quiet $band -osdlevel 0 -vo png:z=$compression:alpha $ss -lavdopts o=threads=$threads -noframedrop $frames -ao pcm:fast$wavhead $channs $aformnew -mc 0  \"$file\" $extra_params <$nulfile";
+                }
+            }
+            else {
+#audio only 
+                if ($ss eq "" && $frames eq "") {
+                    $syscom=$mplay_command . " -quiet $band -vo null -vc null -ao pcm:fast$wavhead $aformnew $channs -mc 0 \"$file\" $extra_params <$nulfile";
+                }
+                else {
+                    $syscom=$mplay_command . " -quiet $band -vo null $ss $frames -ao pcm:fast$wavhead $aformnew $channs -mc 0 \"$file\" $extra_params <$nulfile";
+                }
+            }
+            if (defined($DEBUG_OPEN)) {
+                print STDERR "open command for $handle is: $syscom\n";
+            }
+
+            $syscom2=$syscom." >\"$curtmpfile\" 2>$nulfile";
+
+            unless ($opentest==1) {
+                &sig_progress(0);
+            }
+
+            smog_system("$syscom2"); # this may well fail...we just have to use what we get back
+
+            if (!-f $curtmpfile) {
+                unlink $pidfile;
+                exit 1;
+            }
+
+            @info=split /  /, smog_system_direct("grep VIDEO: \"$curtmpfile\" 2>$nulfile");
+            @info2=split / /, smog_system_direct("grep AUDIO: \"$curtmpfile\" 2>$nulfile");
+
+            unlink "$curtmpfile";
+#$type=$info[1];
+
+            $size=$info[2];
+            $hsize=(split /x/,$size)[0];
+            $vsize=(split /x/,$size)[1];
+            $bpp=$info[3];
+            chomp($bpp);
+
+            $fps=(split / /,$info[4])[0];
+
+            $arate=$info2[1];
+            $achans=$info2[3];
+
+            if (! -d $curtmpdir) {
+#curtmpdir can be removed by cancel
+                exit 1;
+            }
+
+            if ($withsound eq "-1") {
+                $count=0;
+            }
+            else {
+# double check number of frames
+                $count=&count_frames;
+            }
+        }
+
+# if the last frame has zero size, delete it
+        if ($count>0) {
+
+            $name=&mkname($count);
+            while ($count > 0 && -f "$name$img_ext" && -z "$name$img_ext") {
+                unlink "$name$img_ext";
+                $name=&mkname(--$count);
+            }
+            if ($count==0) {
+                if ($img_ext==".png") {
+                    &sig_error("Your version of mplayer/ffmpeg may be broken","See http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2071"," ","You can work around this by switching to jpeg output in Preferences/Decoding.");
+                }
+            }
+
+# double check image size
+            $name=&mkname(1);
+            $imresact="none";
+            &get_image_size("$name$img_ext");
+            if ($panic||$hsize==-1) {
+                unlink $pidfile;
+                &sig_error;
+            }
+        }
+
+        if (-f $audio_in) {
+            smog_rename( "$audio_in","$audio_out");
+            $af_size = -s $audio_out;
+        }
+
+        if ($img_ext eq ".png" || $type eq "png") {
+            $bpp=32;
+        }
+
+        unless (0||$withsound ne "-1" || $achans==0) {
+# try as best we can to sync sound and video for a selection
+            $audio_out=&clip_audio(0.3,1000000.);
+            if (!$panic) {
+                smog_rename( "$audio_out","audio");
+            }
+            $audio_out="audio";
+        }
+
+
+        if ($count==0||$type eq "jpeg"||$type eq "png"||$type eq "Audio") {
+# we could have audio or images
+            if (-f $audio_out) {
+# just in case...
+                $type="Audio";
+            }
+            if (! -d $curtmpdir) {
+#curtmpdir can be removed by cancel
+                exit 1;
+            }
+
+            if ($af_size>0||$count>0) {
+                &sig_complete($handle,$count,$type,$hsize,$vsize,$bpp,$fps,$f_size,$arate,$achans,$asamps,$signed,$endian,$af_size,$title,$author,$comment);
+                exit 0;
+            }
+# should have audio then
+            if (!($type eq "Audio")) {
+                if (!defined($DEBUG_OPEN)&&$withsound>=0) {
+                    print STDERR "\nFailed to open file - I tried:\n\n $syscom\n";
+                    print STDERR "\nMaybe you are missing a library in mplayer (or it is not a valid media file) ?\n";
+                }
+                if ($^O eq "MSWin32") {
+                    &sig_error("This does not appear to be a valid video or image file","$GUI_NAME was unable to open it."," ");
+                }
+                else {
+                    &sig_error("This does not appear to be a valid video or image file","$GUI_NAME was unable to open it.","","Check the terminal window for more details.");
+                }
+            }
+        }
+
+# mplayer seems to sometimes output one extra frame for jpg
+        if (defined($MPLAYER_EXTRA_OPEN_FRAME_BUG)&&($count==$xframes+1)&&(($frames eq "")||(!($frames eq "") && ($count<$ARGV[4])||($ARGV[3]==0)))) {
+            $name=&mkname($count);
+            unlink "$name$img_ext";
+            $count--;
+        }
+
+        unless ($frames eq "") {
+            $tfps=$fps;
+            if ($fps<1) {
+                $tfps=1;
+            }
+            if ($ARGV[3]>=(1/$tfps)) {
+# if we opened a selection, mplayer wrongly outputs frame 1, 
+# so we usually need to delete it
+
+#TODO ** - check if this is still the case
+
+                for ($i=2;$i<=$count;$i++) {
+                    $from=&mkname($i);
+                    $to=&mkname($i-1);
+                    smog_rename( "$from$img_ext", "$to$img_ext");
+                }
+                $count--;
+            }
+        }
+
+        $af_size= -s $audio_out;
+        if (-d $curtmpdir) {
+            &sig_complete($handle,$count,$type,$hsize,$vsize,$bpp,$fps,$f_size,$arate,$achans,$asamps,$signed,$endian,$af_size,$title,$author,$comment);
+        }
+        exit 0;
     }
 
-    $handle=$ARGV[1];
+    if ($command eq "get_details") {
+
+        $handle=$ARGV[1];
+        $curtmpdir="$tmpdir/$handle";
 
-    $curtmpdir="$tmpdir/$handle";
 
-    if ($^O eq "MSWin32") {
-	$statusfile=$curtmpdir."/status";
+#attempt to get file details
+        $file=$ARGV[2];
+        $only_first=1;
+
+        $img_ext=".".$ARGV[3];
+
+        if (defined($ARGV[4])) {
+            $is_remote=$ARGV[4];
+        }
+        if (defined($ARGV[5])) {
+            $is_audio=$ARGV[5];
+        }
+        &get_file_info;
+        if ($panic) {
+            unlink "$pidfile";
+            exit 1;
+        }
+
+        if ($asamps==32) {
+# cant handle this yet, so we will resample on open
+            $asamps=16;
+        }
+
+        smog_chdir("$curtmpdir");
+
+        &sig_complete($handle,$count,$type,$hsize,$vsize,$bpp,$fps,$f_size,$arate,$achans,$asamps,$signed,$endian,$af_size,$title,$author,$comment);
+
+        exit 0;
     }
-    else {
-	$statusfile=$curtmpdir."/.status";
+
+
+
+    if ($command eq "open_tv_card") {
+        $chanstr=$ARGV[2];
+        $devstr=$ARGV[3];
+        $fifofile=$ARGV[4];
+
+        $inputstr=$sizestr=$fpsstr=$driverstr=$outfmt="";
+
+        if (defined($ARGV[5])) {
+            $inputstr=":input=$ARGV[5]";
+        }
+        if (defined($ARGV[6])&&defined($ARGV[7])) {
+            if ($ARGV[6]>0&&$ARGV[7]>0) {
+                $sizestr=":width=$ARGV[6]:height=$ARGV[7]";
+            }
+        }
+
+        if (defined($ARGV[8])) {
+            if ($ARGV[8]>0.) {
+                $fpsstr=":fps=$ARGV[8]";
+            }
+        }
+
+        if (defined($ARGV[9])) {
+            if ($ARGV[9] ne "autodetect") {
+                $driverstr=":driver=$ARGV[9]";
+            }
+        }
+
+        if (defined($ARGV[10])) {
+            if ($ARGV[10] ne "autodetect") {
+                $outfmt=":outfmt=$ARGV[10]";
+            }
+        }
+
+        my $mp=&get_mplayer_location;
+        $com="$mp -really-quiet tv://$chanstr -tv device=$devstr$inputstr$driverstr$sizestr$outfmt$fpsstr -vo yuv4mpeg:file=$fifofile >$nulfile 2>&1 <$nulfile";
+        $smerr=smog_system($com);
+        if ($smerr) {
+            sig_system_error("$com",$smerr);
+            unlink "$pidfile";
+            exit 1;
+        }
+        exit 0;
     }
 
-    if ($command eq "play"||$command eq "play_opening_preview") {
-	if ($^O eq "MSWin32") {
-	    $pidfile=$curtmpdir."/pidpb";
-	}
-	else {
-	    $pidfile=$curtmpdir."/.pidpb";
-	}
+
+
+    if ($command eq "open_fw_card") {
+        $cardno=$ARGV[2];
+        $cache=$ARGV[3];
+        $fifofile=$ARGV[4];
+        my $mp=&get_mplayer_location;
+        $com="dvgrab -s 0 -noavc -card $cardno -o - 2>$nulfile | $mp - -really-quiet -demuxer lavf -vo yuv4mpeg:file=$fifofile >$nulfile 2>&1";
+        $smerr=smog_system("$com");
+        if ($smerr) {
+            sig_system_error("$com",$smerr);
+            unlink "$pidfile";
+            exit 1;
+        }
+        exit 0;
     }
-    else {
-	if ($^O eq "MSWin32") {
-	    $pidfile=$curtmpdir."/pid";
-	}
-	else {
-	    $pidfile=$curtmpdir."/.pid";
-	}
-    }
-
-    if ($command eq "play_opening_preview") {
-	# play_opening_preview is exactly like play
-	# except our audio filename is different
-	$opening_preview=1;
-	$command="play";
-    }
-
-
-	unless ($command eq "keep"||$command eq "close") {
-	    # tell the world our pid
-	    &sig_pid;
-	}
-
-
-    if ($command eq "play") {
-	$endian=&get_endian;
-
-	$fps=$ARGV[2];
-	if ($fps==0) {
-	    $fps=&rc_get("default_fps");
-	}
-
-	$start=$ARGV[3];
-	$end=$ARGV[4];
-
-
-	$loop=0;
-	if ($ARGV[5]!=0) {
-	    $loop=$ARGV[5];
-	}
-
-
-	if (!defined $ARGV[6]||$ARGV[6]==0) {
-	    $arate=44100;
-	}
-	else {
-	    $arate=$ARGV[6];
-	}
-	if (!defined $ARGV[7]||$ARGV[7]==0) {
-	    $achans=2;
-	}
-	else {
-	    $achans=$ARGV[7];
-	}
-
-	if (!defined $ARGV[8]||$ARGV[8]==0) {
-	    $asamps=2;
-	    $stype="w";
-	}
-	else {
-	    $asamps=$ARGV[8];
-	    if ($asamps>7) {
-		$asamps/=8;
-	    }
-	}
-	if (!defined $ARGV[9]) {
-	    $signed=1;
-	}
-	else {
-	    $signed=$ARGV[9];
-	}
-
-	if (!defined $ARGV[10]) {
-	    $aendian=$endian;
-	}
-	else {
-	    $aendian=$ARGV[10];
-	}
-
-	if (defined($opening_preview)) {
-	    $aformat=".raw";
-	    $audiofile="$curtmpdir/audiodump.pcm";
-	}
-	else {
-	    $aformat=".raw";
-	    $audiofile="$curtmpdir/audio";
-	}
-
-
-	$audio_player=&rc_get("audio_player");
-
-	if (-f $audiofile && $arate) {
-
-	    $audio_start=($start-1)/$fps;
-	    $audio_end=$end/$fps;
-
-	    $mute="";
-	    if ($arate<0) {
-		$mute=" -ao null  ";
-		$arate=-$arate;
-		if ($audio_player eq "sox") {
-		    $mute=" -v 0 ";
-		}
-	    }
-	    
-	    $audio_play_command=&rc_get("audio_play_command");
-
-	    if ($audio_player eq "sox") {
-		$audio_effect=&rc_get("audio_effect");
-		$trimcom=" trim $audio_start";
-
-		if (($audio_end>$audio_start)&&$end>0) {
-		    $trimcom .= " ".($audio_end-$audio_start);
-		}
-		else {
-		    $trimcom .=" 10000000";
-		}
-
-		if ($signed==1) {
-		    $signed="s";
-		}
-		else {
-		    $signed="u";
-		}
-
-		if ($aendian==$endian) {
-		    $aendian="";
-		}
-		else {
-		    $aendian="-x";
-		}
-		
-		if ($audio_effect eq "flanger1") {
-		    $audio_effect="flanger 0.6 0.87 3.0 0.9 0.5 -s";
-		}
-		elsif ($audio_effect eq "echo1") {
-		    $audio_effect="echo 0.8 0.9 1000.0 0.3";
-		}
-		elsif ($audio_effect eq "chorus1") {
-		    $audio_effect="chorus 0.6 0.9 50.0 0.4 0.25 2.0 -t 60.0  0.32  0.4 1.3 -s";
-		}
-		elsif ($audio_effect eq "reverb1") {
-		    $audio_effect="reverb 1.0 600.0 180.0 200.0";
-		}
-		elsif ($audio_effect eq "phaser1") {
-		    $audio_effect="phaser 0.89 0.85 1.0 0.24 2.0 -t";
-		}
-		else {
-		    $audio_effect="";
-		}
-		$sox_version=&get_sox_version;
-
-		if ($sox_version<13000000) {
-		    if ($asamps==1) {
-			$stype="b";
-		    }
-		    elsif ($asamps==2) {
-			$stype="w";
-		    }
-		    $aformat=".".$signed.$stype;
-		    $syscom2="$audio_play_command $mute -c $achans -r $arate -$signed $aendian -t $aformat -$stype $audiofile $trimcom $audio_effect";
-		}
-		else {
-		    $syscom2="$audio_play_command $mute -c $achans -r $arate -$signed $aendian -t $aformat -$asamps $audiofile $trimcom $audio_effect";
-		}
-	    } else {
-		# mplayer seemingly has no easy way of playing unsigned or wrong endian
-		$syscom2="$audio_play_command -demuxer rawaudio -rawaudio rate=$arate :channels=$achans:samplesize=$asamps $mute $audiofile -ss ".($audio_start-1);
-	    }
-	}
-	
-	$showed_err=0;
-
-	do {
-	    if (! -d "$curtmpdir" || -f "$curtmpdir/.stoploop" || -f "$curtmpdir/stoploop" || ! -f $audiofile) {
-		$loop=0;
-	    }
-	    else {
-		$syscom3=$syscom2.">$nulfile 2>&1";
-		$retval=smog_system("$syscom3");
-		if ($retval>255) {
-		    unless ($showed_err) {
-			print STDERR "Error playing audio !\n";
-			print STDERR "Failed command was: $syscom2\n";
-			smog_system("$syscom2");
-			$showed_err=1;
-		    }
-		}
-	    }
-	} while ($loop);
-	&sig_complete_audio;
-
-	unlink "$curtmpdir/.stoploop";
-	unlink "$curtmpdir/stoploop";
-
-	exit 0;
-    }
-
-
-	if ($command eq "open_test") {
-	    $command="open";
-	    $opentest=1;
-	}
-
-
-	if ($command eq "open") {
-
-	unlink "$curtmpdir/pause";
-
-	$file=$ARGV[2];
-	$ss="";
-
-	$withsound=$ARGV[3];
-
-	if (defined($ARGV[4])) {
-	    $img_ext=".".$ARGV[4];
-	}
-		
-	if (defined($ARGV[5]) && $ARGV[5] > 0) {
-	    $ss=" -ss $ARGV[5] ";
-	}
-	$frames="";
-	if (defined($ARGV[6]) && $ARGV[6] > 0 ) {
-	    $ARGV[6]++;  # cf below, we remove 1st frame
-	    $frames=" -frames $ARGV[6] ";
-	}
-	$extra_params=$ARGV[7];
-	$band="";
-	if ($extra_params eq "nobandwidth") {
-	    $extra_params="";
-	}
-	else {
-	    if ($extra_params eq "sendbandwidth") {
-		$bandwidth=&rc_get("dl_bandwidth_K");
-		if ($bandwidth eq "") {
-		    $bandwidth=64;
-		}
-		$band="-bandwidth $bandwidth"."000";
-		$extra_params="";
-	    }
-	}
-	$compression=&rc_get("open_compression_percent");
-	if ($compression eq "") {
-	    $compression=15;
-	}
-
-	smog_chdir("$curtmpdir");
-
-	# let get_file_info set this
-	#$mplay_command=&rc_get("video_open_command");
-
-	# process video
-
-	# 3 other files we will use
-	$curtmpfile="tempresult";
-	$audio_out="audio";
-	$audio_in="audiodump.pcm";
-
-	if ($img_ext eq ".png") {
-	    $compression=int($compression/10.001)
-	}
-	else {
-	    $quality=int(100-$compression);
-	}
-
-	$xframes=$frames;
-
-	my $wavhead=":nowaveheader";
-
-	if ($file=~/:\/\//) {
-	    $is_remote=2;
-	    #$wavhead=""; # need wav header, as user will probably finish by
-	                 # quitting, thus we won't send full info
-	}
-	&get_file_info;
-
-	if ($panic) {
-	    unlink "$pidfile"; 
-	    exit 1;
-	}
-
-	$aformnew="";
-	if ($asamps==32) {
-	    # cannot handle this yet, need to resample to s16
-	    if ($endian==1) {
-		$aformnew="-format s16le";
-	    }
-	    else {
-		$aformnew="-format s16be";
-	    }
-	    $asamps=16;
-	}
-#TODO - mingw
-	$threads=smog_system_direct("/bin/grep processor /proc/cpuinfo | wc -l");
-	$threads=int($threads);
-	if ($threads==0) {
-	    $threads=1;
-	}
-
-	if ($type eq "jpeg" || $type eq "png") {
-	    $count=$frames;
-	}
-	else {
-	    $frames=$xframes;
-
-	    if ($achans eq "" || $achans eq "0") {
-		$channs="";
-	    }
-	    else {
-		$channs="-channels $achans";
-	    }
-	    
-	    if ($withsound eq "0") {
-             #video only
-		if ($img_ext eq ".jpg") {
-		    $syscom=$mplay_command . " -quiet $band -osdlevel 0 -vo jpeg:quality=$quality -lavdopts o=threads=$threads -fps 100000 $ss $frames -noframedrop -ao null \"$file\" $extra_params <$nulfile";
-		}
-		else {
-		    $syscom=$mplay_command . " -quiet $band -osdlevel 0 -vo png:z=$compression:alpha -lavdopts o=threads=$threads -fps 100000 $ss $frames -noframedrop -ao null \"$file\" $extra_params <$nulfile";
-		}
-	    }
-	    elsif ($withsound eq "1") {
-             #video and audio 
-		if ($img_ext eq ".jpg") {
-		    $syscom=$mplay_command . " -quiet $band -osdlevel 0 -vo jpeg:quality=$quality $ss -lavdopts o=threads=$threads -noframedrop $frames -ao pcm:fast$wavhead $channs $aformnew -mc 0  \"$file\" $extra_params <$nulfile";
-		}
-		else {
-		    $syscom=$mplay_command . " -quiet $band -osdlevel 0 -vo png:z=$compression:alpha $ss -lavdopts o=threads=$threads -noframedrop $frames -ao pcm:fast$wavhead $channs $aformnew -mc 0  \"$file\" $extra_params <$nulfile";
-		}
+
+
+
+
+
+
+    if ($command eq "close") {
+        if (defined(open IN,"< $pidfile")) {
+            close IN;
+# cancel any processing
+            if ($^O ne "MSWin32") {
+                smog_system("smogrify stopsubsub \"$handle\"");
+            }
+        }
+        if (chdir("$curtmpdir")) {
+            unlink glob "* .* *.*";
+            smog_chdir("$tmpdir");
+            rmdir $curtmpdir;
+        }
+        exit 0;
+    }
+
+
+    if ($command eq "ext_save") {
+        shift(@ARGV);
+        $curtmpdir="$tmpdir/$handle";
+        $execname=$ARGV[1];
+        shift(@ARGV);
+
+        smog_chdir("$curtmpdir");
+
+        $com="\"$execname\" encode @ARGV";
+        $smerr=smog_system($com);
+        if ($smerr) {
+            sig_system_error("$com",$smerr);
+            unlink "$pidfile";
+            exit 1;
+        }
+        &sig_complete;
+        exit 0;
+
+    }
+
+
+
+    if ($command eq "save") {
+        my $cmd="";
+
+        $get_rfx=0;
+
+        if ($handle eq "get_rfx") {
+            $get_rfx=1;
+            shift(@ARGV);
+            $handle=$ARGV[1];
+
+            $curtmpdir="$tmpdir/$handle";
+            if ($^O eq "MSWin32") {
+                $statusfile="$curtmpdir/status";
+                $pidfile=$curtmpdir."/pid";
             }
             else {
-             #audio only 
-		if ($ss eq "" && $frames eq "") {
-		    $syscom=$mplay_command . " -quiet $band -vo null -vc null -ao pcm:fast$wavhead $aformnew $channs -mc 0 \"$file\" $extra_params <$nulfile";
-		}
-		else {
-		    $syscom=$mplay_command . " -quiet $band -vo null $ss $frames -ao pcm:fast$wavhead $aformnew $channs -mc 0 \"$file\" $extra_params <$nulfile";
-		}
-	    }
-	    if (defined($DEBUG_OPEN)) {
-		print STDERR "open command for $handle is: $syscom\n";
-	    }
-	    
-	    $syscom2=$syscom." >\"$curtmpfile\" 2>$nulfile";
-
-	    unless ($opentest==1) {
-		&sig_progress(0);
-	    }
+                $statusfile="$curtmpdir/.status";
+                $pidfile=$curtmpdir."/.pid";
+            }
 
-	    smog_system("$syscom2"); # this may well fail...we just have to use what we get back
-	    
-            if (!-f $curtmpfile) {
-		unlink $pidfile;
-		exit 1;
+        }
+
+        unlink "$curtmpdir/pause";
+        smog_chdir("$curtmpdir");
+
+        $plugin=$ARGV[2];
+
+        $fps=$ARGV[3];
+        $nfile=$ARGV[4];
+
+# check the file is writable
+        unless ($nfile eq ""||&is_writeable($nfile)) {
+            &sig_error("Unable to open output file !","$GUI_NAME could not write to $nfile.");
+        }
+
+        $start=$ARGV[5];
+        $is_linked=0;
+
+#create symlinks in /tmp (for dynebolic)
+        $linksdir="/tmp/lives-symlinks/$handle/";
+
+        if ($start==-1) {
+# special value which tells us we are dealing with symlinks
+            $start=1;
+            $is_linked=1;
+        }
+
+        $end=$ARGV[6];
+        $arate=$ARGV[7];
+        $achans=$ARGV[8];
+        $asamps=$ARGV[9];
+        if (defined($ARGV[10])) {
+            $ssigned=$ARGV[10]&1; #CAREFUL - this is reversed in LiVES (there unsigned==1, signed==0)
+            $aendian=$ARGV[10]&2; # value of 2 means bigendian
+            $aendian=!$aendian; #endian is revesed here (0 means bigend)
+        }
+
+        else {
+            $ssigned=1;
+            if ($asamps==8) {
+                $ssigned=0;
+            }
+            $aendian=&get_endian;
+        }
+        if ($ssigned==1) {
+            $asigned="-s";
+        }
+        else {
+            $asigned="-u";
+        }
+
+        if (defined($ARGV[11])) {
+            $aud_start=$ARGV[11];
+        }
+        else {
+            $aud_start=($start-1.)/($fps*1.);
+        }
+        if (defined($ARGV[12])) {
+            $aud_end=$ARGV[12];
+        }
+        else {
+            $aud_end=($end*1.)/($fps*1.);
+        }
+
+        $img_ext=&get_img_ext($curtmpdir,$start);
+
+# get image size ($hsize x $vsize)
+        $imresact="none";
+        my $firstframe=&mkname($start);
+
+        &get_image_size("$firstframe$img_ext");
+
+        if ($panic||$hsize==-1) {
+            unlink $pidfile;
+            exit 1;
+        }
+        $otype=&rc_get("output_type");
+
+        $encoder=&rc_get("encoder");
+
+        $DEBUG_ENCODERS=1;
+
+        $audiofile="";
+
+
+        if ($get_rfx==0) {
+
+            unlink "audiodump.wav";
+
+            $areq=&get_form_request($plugin);
+
+#prepare audio stream if requested
+            if (-f "$curtmpdir/audio" && $arate>0) {
+
+                $origaudio=$audiofile=$audio_in="$curtmpdir/audio";
+                if ($areq&1||$aud_start!=0.) {
+
+# encode sound up to the next nearest second
+# seems to be the norm...
+                    $aud_length=($aud_end-$aud_start);
+                    $aud_length=int($aud_length+1.0);
+                    $aud_end=$aud_start+$aud_length;
+
+# clip the (raw) audio
+
+                    $audiofile=$audio_in=&clip_audio($aud_start,$aud_end);
+                    if ($panic) {
+                        unlink "$pidfile";
+                        exit 1;
+                    }
+
+#pad to end with silence
+                    $desired_length=$aud_length*$arate*$achans*$asamps/8;
+                    &append_silence(0,$desired_length,$asamps,$achans,$ssigned,$aendian,$audiofile);
+                    if ($panic) {
+                        unlink "$pidfile";
+                        exit 1;
+                    }
+
+                    if ($aud_start!=0.&&!($areq&1)) {
+                        if (&rc_get("conserve_space") eq "true") {
+                            unlink "$origaudio";
+                        }
+                        else {
+                            smog_rename( "$origaudio","$origaudio.origbak");
+                        }
+                        smog_rename( "$curtmpdir/$audiofile","$origaudio");
+                        $audio_file=$audio_in=$origaudio;
+                    }
+                }
+                if ($areq&2) {
+# convert raw audio to wav
+                    $audio_out=$curtmpdir . "/audiodump.wav";
+                    &convert_audio_to_wav;
+                    if ($panic) {
+                        unlink "$pidfile";
+                        exit 1;
+                    }
+                    unlink "$audio_in";
+                    $audiofile=$audio_out;
+                }
+            }
+
+            if ($areq&4) {
+
+                if ($start>1) {
+# move the selection down so that frames start at 1
+# note, LiVES never uses this any more, 
+# instead it first calls link_frames, and possibly sets $start to -1
+# (see above)
+
+                    if (-d $linksdir) {
+                        smog_system("/bin/rm -rf \"$linksdir\"");
+                    }
+
+                    $com="/bin/mkdir -p \"$linksdir\"";
+                    $smerr=smog_system($com);
+                    if ($smerr) {
+                        sig_system_error("Creating directory \"$linksdir\"",$smerr);
+                        unlink "$pidfile";
+                        exit 1;
+                    };
+
+
+                    smog_system ("/bin/chmod -R 777 \"$linksdir\"");
+
+                    if ($^O ne "MSWin32") {
+                        $fstype=&get_fs_type($curtmpdir);
+                    }
+
+# need to make hard links, as some encoders complain about symbolic links
+
+
+                    for ($i=1;$i<=($end-$start+1);$i++) {
+                        $name=&mkname($i);
+                        $from=&mkname($i+$start-1);
+                        if (-f "$curtmpdir$from$img_ext") {
+                            if ($^O eq "MSWin32") {
+                                $smerr=smog_system ("cp.exe \"$curtmpdir/$from$img_ext\" \"$linksdir$name$img_ext\"");
+                                if ($smerr) {
+                                    sig_system_error("Copying \"$curtmpdir/$from$img_ext\" to \"$linksdir$name$img_ext\"",$smerr);
+                                    unlink "$pidfile";
+                                    exit 1;
+                                }
+                            }
+                            else {
+                                if ($fstype eq "vfat" || $fstype eq "fat32" || $fstype eq "msdos") {
+                                    $smerr=smog_system ("/bin/cp -f \"$curtmpdir/$from$img_ext\" \"$linksdir$name$img_ext\"");
+                                    if ($smerr) {
+                                        sig_system_error("Copying \"$curtmpdir/$from$img_ext\" from \"$linksdir$name$img_ext\"",$smerr);
+                                        unlink "$pidfile";
+                                        exit 1;
+                                    }
+                                }
+                                else {
+                                    $smerr=smog_system ("/bin/ln \"$curtmpdir/$from$img_ext\" \"$linksdir$name$img_ext\"");
+                                    if ($smerr) {
+                                        sig_system_error("Symlinking \"$curtmpdir/$from$img_ext\" from \"$linksdir$name$img_ext\"",$smerr);
+                                        unlink "$pidfile";
+                                        exit 1;
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    if (-f $audiofile) {
+                        my $xaudiofile=(split(/\//,$audiofile))[-1];
+                        if (! -f "$linksdir$xaudiofile") {
+                        if ($^O eq "MSWin32") {
+                                $smerr=smog_system ("cp.exe \"$curtmpdir/$audiofile\" \"$linksdir$xaudiofile\"");
+                                if ($smerr) {
+                                    sig_system_error("Copying \"$curtmpdir/$audiofile\" to \"$linksdir$xaudiofile\"",$smerr);
+                                    unlink "$pidfile";
+                                    exit 1;
+                                }
+                            }
+                            else {
+                                if ($fstype eq "vfat" || $fstype eq "fat32" || $fstype eq "msdos") {
+                                    $smerr=smog_system("/bin/cp -f \"$curtmpdir/$audiofile\" \"$linksdir$xaudiofile\"");
+                                    if ($smerr) {
+                                        sig_system_error("Copying \"$curtmpdir/$audiofile\" from \"$linksdir$xaudiofile\"",$smerr);
+                                        unlink "$pidfile";
+                                        exit 1;
+                                    }
+                                }
+                                else {
+                                    $smerr=smog_system("/bin/ln \"$curtmpdir/$audiofile\" \"$linksdir$xaudiofile\"");
+                                    if ($smerr) {
+                                        sig_system_error("Symlinking \"$curtmpdir/$audiofile\" from \"$linksdir$xaudiofile\"",$smerr);
+                                        unlink "$pidfile";
+                                        exit 1;
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    $is_linked=1;
+                }
+            }
+
+            if ($is_linked==1) {
+                smog_chdir("$linksdir");
             }
 
-	    @info=split /  /, smog_system_direct("grep VIDEO: \"$curtmpfile\" 2>$nulfile");
-	    @info2=split / /, smog_system_direct("grep AUDIO: \"$curtmpfile\" 2>$nulfile");
-	    
-	    unlink "$curtmpfile";
-	    #$type=$info[1];
-	    
-	    $size=$info[2];
-	    $hsize=(split /x/,$size)[0];
-	    $vsize=(split /x/,$size)[1];
-	    $bpp=$info[3];
-	    chomp($bpp);
-	    
-	    $fps=(split / /,$info[4])[0];
-	    
-	    $arate=$info2[1];
-	    $achans=$info2[3];
-
-	    if (! -d $curtmpdir) {
-		#curtmpdir can be removed by cancel
-		exit 1;
-	    }
-	    
-	    if ($withsound eq "-1") {
-		$count=0;
-	    }
-	    else {
-		# double check number of frames
-		$count=&count_frames;
-	    }
-	}
-
-	# if the last frame has zero size, delete it
-	if ($count>0) {
-
-	    $name=&mkname($count);
-	    while ($count > 0 && -f "$name$img_ext" && -z "$name$img_ext") {
-		unlink "$name$img_ext";
-		$name=&mkname(--$count);
-	    }
-	    if ($count==0) {
-		if ($img_ext==".png") {
-		    &sig_error("Your version of mplayer/ffmpeg may be broken","See http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2071"," ","You can work around this by switching to jpeg output in Preferences/Decoding.");
-		}
-	    }
-
-	    # double check image size
-	    $name=&mkname(1);
-	    $imresact="none";
-	    &get_image_size("$name$img_ext");
-	    if ($panic||$hsize==-1) {
-		unlink $pidfile;
-		&sig_error;
-	    }
-	}
-
-	if (-f $audio_in) {
-	    smog_rename( "$audio_in","$audio_out");
-            $af_size = -s $audio_out; 
-	}
-
-	if ($img_ext eq ".png" || $type eq "png") {
-	    $bpp=32;
-	}
-
-	unless (0||$withsound ne "-1" || $achans==0) {
-	    # try as best we can to sync sound and video for a selection
-	    $audio_out=&clip_audio(0.3,1000000.);
-	    if (!$panic) {
-		smog_rename( "$audio_out","audio");
-	    }
-	    $audio_out="audio";
-	}
-
-
-	if ($count==0||$type eq "jpeg"||$type eq "png"||$type eq "Audio") {
-	    # we could have audio or images
-	    if (-f $audio_out) {
-		# just in case...
-		$type="Audio";
-	    }
-	    if (! -d $curtmpdir) {
-		#curtmpdir can be removed by cancel
-		exit 1;
-	    }
-
-	    if ($af_size>0||$count>0) {
-		&sig_complete($handle,$count,$type,$hsize,$vsize,$bpp,$fps,$f_size,$arate,$achans,$asamps,$signed,$endian,$af_size,$title,$author,$comment);
-		exit 0;
-	    }
-	    # should have audio then
-	    if (!($type eq "Audio")) {
-		if (!defined($DEBUG_OPEN)&&$withsound>=0) {
-		    print STDERR "\nFailed to open file - I tried:\n\n $syscom\n";
-		    print STDERR "\nMaybe you are missing a library in mplayer (or it is not a valid media file) ?\n";
-		}
-		if ($^O eq "MSWin32") {
-		    &sig_error("This does not appear to be a valid video or image file","$GUI_NAME was unable to open it."," ");
-		}
-		else {
-		    &sig_error("This does not appear to be a valid video or image file","$GUI_NAME was unable to open it.","","Check the terminal window for more details.");
-		}
-	    }
-	}
-
-	# mplayer seems to sometimes output one extra frame for jpg
-	if (defined($MPLAYER_EXTRA_OPEN_FRAME_BUG)&&($count==$xframes+1)&&(($frames eq "")||(!($frames eq "") && ($count<$ARGV[4])||($ARGV[3]==0)))) {
-	    $name=&mkname($count);
-	    unlink "$name$img_ext";
-	    $count--;
-	}
-
-	unless ($frames eq "") {
-	    $tfps=$fps;
-	    if ($fps<1) {
-		$tfps=1;
-	    }
-	    if ($ARGV[3]>=(1/$tfps)) {
-		# if we opened a selection, mplayer wrongly outputs frame 1, 
-		# so we usually need to delete it
-
-		#TODO ** - check if this is still the case
-
-		for ($i=2;$i<=$count;$i++) {
-		    $from=&mkname($i);
-		    $to=&mkname($i-1);
-		    smog_rename( "$from$img_ext", "$to$img_ext");
-		}
-		$count--;
-	    }
-	}
-
-	$af_size= -s $audio_out;
-	if (-d $curtmpdir) {
-	    &sig_complete($handle,$count,$type,$hsize,$vsize,$bpp,$fps,$f_size,$arate,$achans,$asamps,$signed,$endian,$af_size,$title,$author,$comment);
-	}
-	exit 0;
+        }
+
+
+        unless ($plugin eq "") {
+            $atype=&rc_get("encoder_acodec");
+            $fields="$fps \"$nfile\" $start $end $img_ext $otype $atype $hsize $vsize";
+            $fields.=" $DEBUG_ENCODERS";
+            $fields.=" $arate $achans $asamps $ssigned";
+
+            if ($plugin =~ /multi_encoder$/) {
+                $extra_opts="-v";
+            }
+
+            if ($^O eq "MSWin32") {
+# adjust depending on file ext
+                my $ext=&get_ext("$plugin");
+                if ($ext eq ".py") {
+                    $cmd="python";
+                }
+                else {
+                    $cmd="perl";
+                }
+                if ($get_rfx==0) {
+                    $fields.=@ARGV[13..$#ARGV];
+                    $com="$cmd \"$plugin\" $extra_opts encode $fields";
+
+                }
+                else {
+                    $com="$cmd \"$plugin\" get_rfx $fields";
+                }
+            }
+            else {
+                if ($get_rfx==0) {
+                    $fields.=@ARGV[13..$#ARGV];
+                    $com="\"$plugin\" $extra_opts encode $fields";
+                }
+                else {
+                    $com="\"$plugin\" get_rfx $fields";
+                }
+            }
+
+            $smerr=smog_system("$com");
+
+            &sig_complete;
+            exit 0;
+        }
+
+        if (-f ".comment") {
+            open IN,"< .comment";
+            read IN,$string,1040;
+            close IN;
+            unlink ".comment";
+        }
+        @tmp=split(/\|\|\%/,$string);
+
+        $title=$tmp[0];
+        $author=$tmp[1];
+        $comment=$tmp[2];
+        chomp($comment);
+
+        if ($get_rfx==0) {
+            $command="encode";
+        }
+        else {
+            $command="get_rfx";
+        }
+
+        return 1;
+    exit 0; # just in case
+        }
+
+
+    if ($command eq "link_frames") {
+        unlink "$curtmpdir/pause";
+        smog_chdir("$curtmpdir");
+
+        $start=$ARGV[2];
+        $end=$ARGV[3];
+
+        $astart=$ARGV[4];
+        $aend=$ARGV[5];
+
+        $arate=$ARGV[6];
+        $achans=$ARGV[7];
+        $asamps=$ARGV[8];
+        $asigned=$ARGV[9];
+        $aendian=$ARGV[10];
+
+        $from_handle=$ARGV[11];
+
+        my $i;
+        my $audiofile="audio";
+
+        if ($from_handle eq "") {
+#create symlinks in /tmp for dynebolic
+            $linksdir="/tmp/lives-symlinks/$handle/";
+
+            if (-d $linksdir) {
+                if ($^O eq "MSWin32") {
+                    smog_system("DEL /q \"$linksdir\"");
+                    smog_system("RMDIR \"$linksdir\"");
+                }
+                else {
+                    smog_system("/bin/rm -rf \"$linksdir\"");
+                }
+            }
+
+            if ($^O eq "MSWin32") {
+                $com="mkdir.exe -p \"$linksdir\"";
+            }
+            else {
+                $com="/bin/mkdir /p \"$linksdir\"";
+            }
+            $smerr=smog_system($com);
+            if ($smerr) {
+                sig_system_error("Creating directory \"$linksdir\"",$smerr);
+                unlink "$pidfile";
+                exit 1;
+            }
+
+            if ($^O eq "MSWin32") {
+                smog_system ("chmod.exe -R 777 \"$linksdir\"");
+            }
+            else {
+                smog_system ("/bin/chmod -R 777 \"$linksdir\"");
+            }
+        }
+        else {
+            $linksdir=$curtmpdir;
+            $handle=$from_handle;
+            $curtmpdir="$tmpdir/$handle/";
+        }
+
+
+# copy a slice of the audio file into our links dir
+# this allows us to resample it
+# and also aligns the start of audio with new frame 1
+
+        unless ($aend==0.) {
+
+            my $ocurtmpdir=$curtmpdir;
+            my $ofrom_handle=$from_handle;
+            my $ostart=$start;
+            my $oend=$end;
+
+            $start=$astart;
+            $end=$aend;
+            $where=0.;
+            $from_handle=$handle;
+            $curtmpdir=$linksdir;
+
+            &insert_audio($asamps,$achans,$asigned,$aendian,0);
+            if ($panic) {
+                unlink "$pidfile";
+                exit 1;
+            }
+
+            $curtmpdir=$ocurtmpdir;
+            $from_handle=$ofrom_handle;
+            $start=$ostart;
+            $end=$oend;
+
+        }
+
+        $img_ext=&get_img_ext($curtmpdir,$start);
+
+        if ($^O ne "MSWin32") {
+            $fstype=&get_fs_type($curtmpdir);
+        }
+
+        for ($i=1;$i<=($end-$start+1);$i++) {
+            $name=&mkname($i);
+            $from=&mkname($i+$start-1);
+            if (-f "$curtmpdir/$from$img_ext") {
+                if ($^O eq "MSWin32") {
+                    $smerr=smog_system ("cp.exe \"$curtmpdir/$from$img_ext\" \"$linksdir/$name$img_ext\"");
+                    if ($smerr) {
+                        sig_system_error("Copying \"$curtmpdir/$from$img_ext\" to \"$linksdir/$name$img_ext\"",$smerr);
+                        unlink "$pidfile";
+                        exit 1;
+                    }
+                }
+                else {
+                    if ($fstype eq "vfat" || $fstype eq "fat32" || $fstype eq "msdos") {
+                        $smerr=smog_system ("/bin/cp -f \"$curtmpdir/$from$img_ext\" \"$linksdir/$name$img_ext\"");
+                        if ($smerr) {
+                            sig_system_error("Copying \"$curtmpdir/$from$img_ext\" to \"$linksdir/$name$img_ext\"",$smerr);
+                            unlink "$pidfile";
+                            exit 1;
+                        }
+                    }
+                    else {
+                        $smerr=smog_system ("/bin/ln \"$curtmpdir/$from$img_ext\" \"$linksdir/$name$img_ext\"");
+                        if ($smerr) {
+                            sig_system_error("Linking \"$curtmpdir/$from$img_ext\" to \"$linksdir/$name$img_ext\"",$smerr);
+                            unlink "$pidfile";
+                            exit 1;
+                        }
+                    }
+                }
+
+            }
+            &sig_progress($i);
+        }
+
+        unless ($from_handle eq "") {
+            $curtmpdir=$linksdir;
+        }
+
+        &sig_complete;
+        exit 0;
     }
 
-    if ($command eq "get_details") {
 
-	$handle=$ARGV[1];
-	$curtmpdir="$tmpdir/$handle";
+    if ($command eq "resize_all") {
+        unlink "$curtmpdir/pause";
+        smog_chdir("$curtmpdir");
+        $end=$ARGV[2];
+
+        my $iwidth=$ARGV[3];
+        my $iheight=$ARGV[4];
+
+        $img_ext=".".$ARGV[5];
+        $img_prefix=&get_img_prefix($img_ext);
+
+        $resize_ext=".mgk";
+
+        my $letterbox=0;
+
+        if (defined($ARGV[6]) && $ARGV[6]>0) {
+# letterboxen - next values are image-in-frame size
+            $letterbox=1;
+            $owidth=$iwidth;
+            $oheight=$iheight;
+            $iwidth=$ARGV[6];
+            $iheight=$ARGV[7];
+            $in_ext=$resize_ext;
+            $out_ext=$img_ext;
+        }
+
+        &clean_old;
+
+        if ($letterbox) {
+# make a background frame
+            if (!defined($bgcolour)) {
+                $bgcolour="#000000";
+            }
+
+            $com="$smog_convert_command -size $owidth!x$oheight! xc:$bgcolour blank.jpg >$nulfile 2>&1";
+            $smerr=smog_system($com);
+            if ($smerr) {
+                sig_system_error("$com",$smerr);
+                unlink "blank.jpg";
+                unlink "$pidfile";
+                exit 1;
+            }
+        }
+
+
+
+        for ($i=1;$i<=$end;$i++) {
+            $name=&mkname($i);
+
+            smog_copy("$name$img_ext","$name.bak");
+            if ($panic) {
+                if ($letterbox) {
+                    try_to_recover($start,$i-1);
+                    unlink "blank.jpg";
+                }
+                if ($DEBUG_SMOGRIFY) {
+                    print STDERR "smogrify debug - rename failed ($!): \"$curtmpdir/$name$img_ext\",\"$curtmpdir/$name.bak\"\n";
+                }
+                sig_system_error("Renaming \"$curtmpdir/$name$img_ext\" to \"$curtmpdir/$name.bak\"");
+
+                unlink "$pidfile";
+                exit 1;
+            }
+
+
+            if ($iwidth>0 && $iheight>0) {
+                &resize_frame($name,$iwidth,$iheight);
+            }
 
+            if ($panic) {
+                if ($letterbox) {
+                    try_to_recover($start,$i);
+                    unlink "blank.jpg";
+                }
+                unlink "$pidfile";
+                exit 1;
+            }
 
-	#attempt to get file details
-	$file=$ARGV[2];
-	$only_first=1;
-
-	$img_ext=".".$ARGV[3];
-
-	if (defined($ARGV[4])) {
-	    $is_remote=$ARGV[4];
-	}
-	if (defined($ARGV[5])) {
-	    $is_audio=$ARGV[5];
-	}
-	&get_file_info;
-	if ($panic) {
-	    unlink "$pidfile"; 
-	    exit 1;
-	}
-
-	if ($asamps==32) {
-	    # cant handle this yet, so we will resample on open
-	    $asamps=16;
-	}
-
-	smog_chdir("$curtmpdir");
-
-	&sig_complete($handle,$count,$type,$hsize,$vsize,$bpp,$fps,$f_size,$arate,$achans,$asamps,$signed,$endian,$af_size,$title,$author,$comment);
-
-	exit 0;
-    }
-
-
-
-        if ($command eq "open_tv_card") {
-	    $chanstr=$ARGV[2];
-	    $devstr=$ARGV[3];
-	    $fifofile=$ARGV[4];
-
-	    $inputstr=$sizestr=$fpsstr=$driverstr=$outfmt="";
-
-	    if (defined($ARGV[5])) {
-		$inputstr=":input=$ARGV[5]";
-	    }
-	    if (defined($ARGV[6])&&defined($ARGV[7])) {
-		if ($ARGV[6]>0&&$ARGV[7]>0) {
-		    $sizestr=":width=$ARGV[6]:height=$ARGV[7]";
-		}
-	    }
-
-	    if (defined($ARGV[8])) {
-		if ($ARGV[8]>0.) {
-		    $fpsstr=":fps=$ARGV[8]";
-		}
-	    }
-
-	    if (defined($ARGV[9])) {
-		if ($ARGV[9] ne "autodetect") {
-		    $driverstr=":driver=$ARGV[9]";
-		}
-	    }
-
-	    if (defined($ARGV[10])) {
-		if ($ARGV[10] ne "autodetect") {
-		    $outfmt=":outfmt=$ARGV[10]";
-		}
-	    }
-
-	    my $mp=&get_mplayer_location;
-	    $com="$mp -really-quiet tv://$chanstr -tv device=$devstr$inputstr$driverstr$sizestr$outfmt$fpsstr -vo yuv4mpeg:file=$fifofile >$nulfile 2>&1 <$nulfile";
-	    $smerr=smog_system($com);
-	    if ($smerr) {
-		sig_system_error("$com",$smerr);
-		unlink "$pidfile"; 
-		exit 1;
-	    }
-	    exit 0;
-	}
-
-
-
-        if ($command eq "open_fw_card") {
-	    $cardno=$ARGV[2];
-	    $cache=$ARGV[3];
-	    $fifofile=$ARGV[4];
-	    my $mp=&get_mplayer_location;
-	    $com="dvgrab -s 0 -noavc -card $cardno -o - 2>$nulfile | $mp - -really-quiet -demuxer lavf -vo yuv4mpeg:file=$fifofile >$nulfile 2>&1";
-	    $smerr=smog_system("$com");
-	    if ($smerr) {
-		sig_system_error("$com",$smerr);
-		unlink "$pidfile"; 
-		exit 1;
-	    }
-	    exit 0;
-	}
-
-
-
-
-
-
-	if ($command eq "close") {
-	    if (defined(open IN,"< $pidfile")) {
-		close IN;
-		# cancel any processing
-		if ($^O ne "MSWin32") {
-		    smog_system("smogrify stopsubsub \"$handle\"");
-		}
-	    }
-	    if (chdir("$curtmpdir")) {
-		unlink glob "* .* *.*";
-		smog_chdir("$tmpdir");
-		rmdir $curtmpdir;
-	    }
-	    exit 0;
-	}
-    
-
-	if ($command eq "ext_save") {
-	    shift(@ARGV);
-	    $curtmpdir="$tmpdir/$handle";
-	    $execname=$ARGV[1];
-	    shift(@ARGV);
-
-	    smog_chdir("$curtmpdir");
-
-	    $com="\"$execname\" encode @ARGV";
-	    $smerr=smog_system($com);
-	    if ($smerr) {
-		sig_system_error("$com",$smerr);
-		unlink "$pidfile"; 
-		exit 1;
-	    }
-	    &sig_complete;
-	    exit 0;
-
-	}
-
-
-	
-	if ($command eq "save") {
-	    my $cmd="";
-
-	    $get_rfx=0;
-
-	    if ($handle eq "get_rfx") {
-		$get_rfx=1;
-		shift(@ARGV);
-		$handle=$ARGV[1];
-
-		$curtmpdir="$tmpdir/$handle";
-		if ($^O eq "MSWin32") {
-		    $statusfile="$curtmpdir/status";
-		    $pidfile=$curtmpdir."/pid";
-		}
-		else {
-		    $statusfile="$curtmpdir/.status";
-		    $pidfile=$curtmpdir."/.pid";
-		}
-
-	    }
-
-	    unlink "$curtmpdir/pause";
-	    smog_chdir("$curtmpdir");
-
-	    $plugin=$ARGV[2];
-
-	    $fps=$ARGV[3];
-	    $nfile=$ARGV[4];
-
-	    # check the file is writable
-	    unless ($nfile eq ""||&is_writeable($nfile)) {
-		&sig_error("Unable to open output file !","$GUI_NAME could not write to $nfile.");
-	    }
-
-	    $start=$ARGV[5];
-	    $is_linked=0;
-
-	    #create symlinks in /tmp (for dynebolic)
-	    $linksdir="/tmp/lives-symlinks/$handle/";
-
-	    if ($start==-1) {
-		# special value which tells us we are dealing with symlinks
-		$start=1;
-		$is_linked=1;
-	    }
-
-	    $end=$ARGV[6];
-	    $arate=$ARGV[7];
-	    $achans=$ARGV[8];
-	    $asamps=$ARGV[9];
-	    if (defined($ARGV[10])) {
-		$ssigned=$ARGV[10]&1; #CAREFUL - this is reversed in LiVES (there unsigned==1, signed==0)
-		$aendian=$ARGV[10]&2; # value of 2 means bigendian
-		$aendian=!$aendian; #endian is revesed here (0 means bigend)
-	    }
-	    
-	    else {
-		$ssigned=1;
-		if ($asamps==8) {
-		    $ssigned=0;
-		}
-		$aendian=&get_endian;
-	    }
-	    if ($ssigned==1) {
-		$asigned="-s";
-	    }
-	    else {
-		$asigned="-u";
-	    }
-	    
-	    if (defined($ARGV[11])) {
-		$aud_start=$ARGV[11];
-	    }
-	    else {
-		$aud_start=($start-1.)/($fps*1.);
-	    }
-	    if (defined($ARGV[12])) {
-		$aud_end=$ARGV[12];
-	    }
-	    else {
-		$aud_end=($end*1.)/($fps*1.);
-	    }
-
-	    $img_ext=&get_img_ext($curtmpdir,$start);
-
-	    # get image size ($hsize x $vsize)
-	    $imresact="none";
-	    my $firstframe=&mkname($start);
-
-	    &get_image_size("$firstframe$img_ext");
-
-	    if ($panic||$hsize==-1) {
-		unlink $pidfile;
-		exit 1;
-	    }
-	    $otype=&rc_get("output_type");
-
-	    $encoder=&rc_get("encoder");
-
-	    $DEBUG_ENCODERS=1;
-
-	    $audiofile="";
-
-
-	    if ($get_rfx==0) {
-
-		unlink "audiodump.wav";
-
-		$areq=&get_form_request($plugin);
-
-		#prepare audio stream if requested
-		if (-f "$curtmpdir/audio" && $arate>0) {
-
-		    $origaudio=$audiofile=$audio_in="$curtmpdir/audio";
-		    if ($areq&1||$aud_start!=0.) {
-
-			# encode sound up to the next nearest second
-			# seems to be the norm...
-			$aud_length=($aud_end-$aud_start);
-			$aud_length=int($aud_length+1.0);
-			$aud_end=$aud_start+$aud_length;
-			
-			# clip the (raw) audio
-
-			$audiofile=$audio_in=&clip_audio($aud_start,$aud_end);
-			if ($panic) {
-			    unlink "$pidfile"; 
-			    exit 1;
-			}
-
-			#pad to end with silence
-			$desired_length=$aud_length*$arate*$achans*$asamps/8;
-			&append_silence(0,$desired_length,$asamps,$achans,$ssigned,$aendian,$audiofile);
-			if ($panic) {
-			    unlink "$pidfile"; 
-			    exit 1;
-			}
-
-			if ($aud_start!=0.&&!($areq&1)) {
-			    if (&rc_get("conserve_space") eq "true") {
-				unlink "$origaudio";
-			    }
-			    else {
-				smog_rename( "$origaudio","$origaudio.origbak");
-			    }
-			    smog_rename( "$curtmpdir/$audiofile","$origaudio");
-			    $audio_file=$audio_in=$origaudio;
-			}
-		    }
-		    if ($areq&2) { 
-			# convert raw audio to wav
-			$audio_out=$curtmpdir . "/audiodump.wav";
-			&convert_audio_to_wav;
-			if ($panic) {
-			    unlink "$pidfile"; 
-			    exit 1;
-			}
-			unlink "$audio_in";
-			$audiofile=$audio_out;
-		    }
-		}
-
-		if ($areq&4) {
-	
-		    if ($start>1) {
-			# move the selection down so that frames start at 1
-			# note, LiVES never uses this any more, 
-			# instead it first calls link_frames, and possibly sets $start to -1
-			# (see above)
-
-			if (-d $linksdir) {
-			    smog_system("/bin/rm -rf \"$linksdir\"");
-			}
-		    
-			$com="/bin/mkdir -p \"$linksdir\"";
-			$smerr=smog_system($com);
-			if ($smerr) {
-			    sig_system_error("Creating directory \"$linksdir\"",$smerr);
-			    unlink "$pidfile"; 
-			    exit 1;
-			};
-
-
-			smog_system ("/bin/chmod -R 777 \"$linksdir\"");
-
-			if ($^O ne "MSWin32") {
-			    $fstype=&get_fs_type($curtmpdir);
-			}
-
-			# need to make hard links, as some encoders complain about symbolic links
-
-
-			for ($i=1;$i<=($end-$start+1);$i++) {
-			    $name=&mkname($i);
-			    $from=&mkname($i+$start-1);
-			    if (-f "$curtmpdir$from$img_ext") {
-				if ($^O eq "MSWin32") {
-				    $smerr=smog_system ("cp.exe \"$curtmpdir/$from$img_ext\" \"$linksdir$name$img_ext\"");
-				    if ($smerr) {
-					sig_system_error("Copying \"$curtmpdir/$from$img_ext\" to \"$linksdir$name$img_ext\"",$smerr);
-					unlink "$pidfile"; 
-					exit 1;
-				    }
-				}
-				else {
-				    if ($fstype eq "vfat" || $fstype eq "fat32" || $fstype eq "msdos") {
-					$smerr=smog_system ("/bin/cp -f \"$curtmpdir/$from$img_ext\" \"$linksdir$name$img_ext\"");
-					if ($smerr) {
-					    sig_system_error("Copying \"$curtmpdir/$from$img_ext\" from \"$linksdir$name$img_ext\"",$smerr);
-					    unlink "$pidfile"; 
-					    exit 1;
-					}
-				    }
-				    else {
-					$smerr=smog_system ("/bin/ln \"$curtmpdir/$from$img_ext\" \"$linksdir$name$img_ext\"");
-					if ($smerr) {
-					    sig_system_error("Symlinking \"$curtmpdir/$from$img_ext\" from \"$linksdir$name$img_ext\"",$smerr);
-					    unlink "$pidfile"; 
-					    exit 1;
-					}
-				    }
-				}
-			    }
-			}
-			if (-f $audiofile) {
-			    my $xaudiofile=(split(/\//,$audiofile))[-1];
-			    if (! -f "$linksdir$xaudiofile") {
-				if ($^O eq "MSWin32") {
-				    $smerr=smog_system ("cp.exe \"$curtmpdir/$audiofile\" \"$linksdir$xaudiofile\"");
-				    if ($smerr) {
-					sig_system_error("Copying \"$curtmpdir/$audiofile\" to \"$linksdir$xaudiofile\"",$smerr);
-					unlink "$pidfile"; 
-					exit 1;
-				    }
-				}
-				else {
-				    if ($fstype eq "vfat" || $fstype eq "fat32" || $fstype eq "msdos") {
-					$smerr=smog_system("/bin/cp -f \"$curtmpdir/$audiofile\" \"$linksdir$xaudiofile\"");
-					if ($smerr) {
-					    sig_system_error("Copying \"$curtmpdir/$audiofile\" from \"$linksdir$xaudiofile\"",$smerr);
-					    unlink "$pidfile"; 
-					    exit 1;
-					}
-				    }
-				    else {
-					$smerr=smog_system("/bin/ln \"$curtmpdir/$audiofile\" \"$linksdir$xaudiofile\"");
-					if ($smerr) {
-					    sig_system_error("Symlinking \"$curtmpdir/$audiofile\" from \"$linksdir$xaudiofile\"",$smerr);
-					    unlink "$pidfile"; 
-					    exit 1;
-					}
-				    }
-				}
-			    }
-			}
-			$is_linked=1;
-		    }
-		}
-		
-		if ($is_linked==1) {
-		    smog_chdir("$linksdir");
-		}
-
-	    }
-
-
-	    unless ($plugin eq "") {
-		$atype=&rc_get("encoder_acodec");
-		$fields="$fps \"$nfile\" $start $end $img_ext $otype $atype $hsize $vsize";
-		$fields.=" $DEBUG_ENCODERS";
-		$fields.=" $arate $achans $asamps $ssigned";
-
-		if ($plugin =~ /multi_encoder$/) {
-		    $extra_opts="-v";
-		}
-
-		if ($^O eq "MSWin32") {
-		    # adjust depending on file ext
-		    my $ext=&get_ext("$plugin");
-		    if ($ext eq ".py") {
-			$cmd="python";
-		    }
-		    else {
-			$cmd="perl";
-		    }
-		    if ($get_rfx==0) {
-			$fields.=@ARGV[13..$#ARGV];
-			$com="$cmd \"$plugin\" $extra_opts encode $fields";
-
-		    }
-		    else {
-			$com="$cmd \"$plugin\" get_rfx $fields";
-		    }
-		}
-		else {
-		    if ($get_rfx==0) {
-			$fields.=@ARGV[13..$#ARGV];
-			$com="\"$plugin\" $extra_opts encode $fields";
-		    }
-		    else {
-			$com="\"$plugin\" get_rfx $fields";
-		    }
-		}
-
-		$smerr=smog_system("$com");
-
-		&sig_complete;
-		exit 0;
-	    }
-
-	    if (-f ".comment") {
-		open IN,"< .comment";
-		read IN,$string,1040;
-		close IN;
-		unlink ".comment";
-	    }
-	    @tmp=split(/\|\|\%/,$string);
-
-	    $title=$tmp[0];
-	    $author=$tmp[1];
-	    $comment=$tmp[2];
-	    chomp($comment);
-
-	    if ($get_rfx==0) {
-		$command="encode";
-	    }
-	    else {
-		$command="get_rfx";
-	    }
-
-	    return 1;
-	    exit 0; # just in case
-	}
-
-
-	if ($command eq "link_frames") {
-	    unlink "$curtmpdir/pause";
-	    smog_chdir("$curtmpdir");
-
-	    $start=$ARGV[2];
-	    $end=$ARGV[3];
-	
-	    $astart=$ARGV[4];
-	    $aend=$ARGV[5];
-
-	    $arate=$ARGV[6];
-	    $achans=$ARGV[7];
-	    $asamps=$ARGV[8];
-	    $asigned=$ARGV[9];
-	    $aendian=$ARGV[10];
-
-	    $from_handle=$ARGV[11];
-
-	    my $i;
-	    my $audiofile="audio";
-
-	    if ($from_handle eq "") {
-		#create symlinks in /tmp for dynebolic
-		$linksdir="/tmp/lives-symlinks/$handle/";
-
-		if (-d $linksdir) {
-		    if ($^O eq "MSWin32") {
-			smog_system("DEL /q \"$linksdir\"");
-			smog_system("RMDIR \"$linksdir\"");
-		    }
-		    else {
-			smog_system("/bin/rm -rf \"$linksdir\"");
-		    }
-		}
-
-		if ($^O eq "MSWin32") {
-		    $com="mkdir.exe -p \"$linksdir\"";
-		}
-		else {
-		    $com="/bin/mkdir /p \"$linksdir\"";
-		}
-		$smerr=smog_system($com);
-		if ($smerr) {
-		    sig_system_error("Creating directory \"$linksdir\"",$smerr); 
-		    unlink "$pidfile"; 
-		    exit 1;
-		}
-		
-		if ($^O eq "MSWin32") {
-		    smog_system ("chmod.exe -R 777 \"$linksdir\"");
-		}
-		else {
-		    smog_system ("/bin/chmod -R 777 \"$linksdir\"");
-		}
-	    }
-	    else {
-		$linksdir=$curtmpdir;
-		$handle=$from_handle;
-		$curtmpdir="$tmpdir/$handle/";
-	    }
-
-	
-	# copy a slice of the audio file into our links dir
-	# this allows us to resample it
-	# and also aligns the start of audio with new frame 1
-
-	unless ($aend==0.) {
-
-	    my $ocurtmpdir=$curtmpdir;
-	    my $ofrom_handle=$from_handle;
-	    my $ostart=$start;
-	    my $oend=$end;
-
-	    $start=$astart;
-	    $end=$aend;
-	    $where=0.;
-	    $from_handle=$handle;
-	    $curtmpdir=$linksdir;
-
-	    &insert_audio($asamps,$achans,$asigned,$aendian,0);
-	    if ($panic) {
-		unlink "$pidfile"; 
-		exit 1;
-	    }
-
-	    $curtmpdir=$ocurtmpdir;
-	    $from_handle=$ofrom_handle;
-	    $start=$ostart;
-	    $end=$oend;
-
-	  }
-
-	    $img_ext=&get_img_ext($curtmpdir,$start);
-
-	    if ($^O ne "MSWin32") {
-		$fstype=&get_fs_type($curtmpdir);
-	    }
-
-	    for ($i=1;$i<=($end-$start+1);$i++) {
-		$name=&mkname($i);
-		$from=&mkname($i+$start-1);
-		if (-f "$curtmpdir/$from$img_ext") {
-		    if ($^O eq "MSWin32") {
-			$smerr=smog_system ("cp.exe \"$curtmpdir/$from$img_ext\" \"$linksdir/$name$img_ext\"");
-			if ($smerr) {
-			    sig_system_error("Copying \"$curtmpdir/$from$img_ext\" to \"$linksdir/$name$img_ext\"",$smerr);
-			    unlink "$pidfile"; 
-			    exit 1;
-			}
-		    }
-		    else {
-			if ($fstype eq "vfat" || $fstype eq "fat32" || $fstype eq "msdos") {
-			    $smerr=smog_system ("/bin/cp -f \"$curtmpdir/$from$img_ext\" \"$linksdir/$name$img_ext\"");
-			    if ($smerr) {
-				sig_system_error("Copying \"$curtmpdir/$from$img_ext\" to \"$linksdir/$name$img_ext\"",$smerr);
-				unlink "$pidfile"; 
-				exit 1;
-			    }
-			}
-			else {
-			    $smerr=smog_system ("/bin/ln \"$curtmpdir/$from$img_ext\" \"$linksdir/$name$img_ext\"");
-			    if ($smerr) {
-				sig_system_error("Linking \"$curtmpdir/$from$img_ext\" to \"$linksdir/$name$img_ext\"",$smerr);
-				unlink "$pidfile"; 
-				exit 1;
-			    }
-			}
-		    }
-	
-		}
-		&sig_progress($i);
-	    }
-
- 	    unless ($from_handle eq "") {
-		$curtmpdir=$linksdir;
-	    }
-
-	    &sig_complete;
-	    exit 0;
-    }
-
-
-	if ($command eq "resize_all") {
-	    unlink "$curtmpdir/pause";
-	    smog_chdir("$curtmpdir");
-	    $end=$ARGV[2];
-
-	    my $iwidth=$ARGV[3];
-	    my $iheight=$ARGV[4];
-
-	    $img_ext=".".$ARGV[5];
-	    $img_prefix=&get_img_prefix($img_ext);
-
-	    $resize_ext=".mgk";
-
-	    my $letterbox=0;
-
-	    if (defined($ARGV[6]) && $ARGV[6]>0) {
-		# letterboxen - next values are image-in-frame size
-		$letterbox=1;
-		$owidth=$iwidth;
-		$oheight=$iheight;
-		$iwidth=$ARGV[6];
-		$iheight=$ARGV[7];
-		$in_ext=$resize_ext;
-		$out_ext=$img_ext;
-	    }
-
-	    &clean_old;
-
-	    if ($letterbox) {
-		# make a background frame
-		if (!defined($bgcolour)) {
-		    $bgcolour="#000000";
-		}
-		
-		$com="$smog_convert_command -size $owidth!x$oheight! xc:$bgcolour blank.jpg >$nulfile 2>&1";
-		$smerr=smog_system($com);
-		if ($smerr) {
-		    sig_system_error("$com",$smerr);
-		    unlink "blank.jpg";
-		    unlink "$pidfile"; 
-		    exit 1;
-		}
-	    }
-
-
-
-	    for ($i=1;$i<=$end;$i++) {
-		$name=&mkname($i);
-		
-		smog_copy("$name$img_ext","$name.bak");
-		if ($panic) {
-		    if ($letterbox) {
-			try_to_recover($start,$i-1);
-			unlink "blank.jpg";
-		    }
-		    if ($DEBUG_SMOGRIFY) {
-			print STDERR "smogrify debug - rename failed ($!): \"$curtmpdir/$name$img_ext\",\"$curtmpdir/$name.bak\"\n";
-		    }
-		    sig_system_error("Renaming \"$curtmpdir/$name$img_ext\" to \"$curtmpdir/$name.bak\"");
-
-		    unlink "$pidfile"; 
-		    exit 1;
-		}
-
-
-		if ($iwidth>0 && $iheight>0) {
-		    &resize_frame($name,$iwidth,$iheight);
-		}
-
-		if ($panic) {
-		    if ($letterbox) {
-			try_to_recover($start,$i);
-			unlink "blank.jpg";
-		    }
-		    unlink "$pidfile"; 
-		    exit 1;
-		}
-
-		if ($letterbox) {
-		    &letterbox_frame($name,abs($iwidth),abs($iheight),$owidth,$oheight);
-		}
-
-		if ($panic) {
-		    if ($letterbox) {
-			try_to_recover($start,$i);
-			unlink "blank.jpg";
-		    }
-		    unlink "$pidfile"; 
-		    exit 1;
-		}
-
-		&sig_progress($i);
-	    }
-
-
-	    $start=1;
-
-	    unless ($letterbox) {
-		&mv_mgk;
-		if ($panic) {
-		    unlink "$pidfile"; 
-		    exit 1;
-		}
-	    }
-	    else {
-		unlink "blank.jpg";
-	    }
-
-	    &sig_complete;
-	    exit 0;
-	}
+            if ($letterbox) {
+                &letterbox_frame($name,abs($iwidth),abs($iheight),$owidth,$oheight);
+            }
+
+            if ($panic) {
+                if ($letterbox) {
+                    try_to_recover($start,$i);
+                    unlink "blank.jpg";
+                }
+                unlink "$pidfile";
+                exit 1;
+            }
+
+            &sig_progress($i);
+        }
+
+
+        $start=1;
+
+        unless ($letterbox) {
+            &mv_mgk;
+            if ($panic) {
+                unlink "$pidfile";
+                exit 1;
+            }
+        }
+        else {
+            unlink "blank.jpg";
+        }
+
+        &sig_complete;
+        exit 0;
+    }
 
     if ($command eq "backup") {
-	$withaudio=$ARGV[2];
-	$start=$ARGV[3];
-	$end=$ARGV[4];
-
-	if ($withaudio==0) {
-	    $audio="";
-	}
-	else {
-	    $audio="audio";
-	}
-
-	$nfile=$ARGV[5];
-
-	unlink "$curtmpdir/pause";
-	smog_chdir("$curtmpdir");
-
-	# check the file is writable
-	unless (&is_writeable($nfile)) {
-	    &sig_error("Unable to open output file !","$GUI_NAME could not write to $nfile.");
-	}
-
-	unlink glob "*.tar";
-	$com="tar --ignore-failed-read -cf header.tar \"$audio\" header* extended* event.* subs.* file* 2>$nulfile";
-	smog_system ($com);
-	if ($smerr) {
-	    sig_system_error("$com",$smerr);
-	    unlink "$pidfile"; 
-	    exit 1;
-	}
-
-	&sig_progress(0);
-	
-	$com="tar -cf temp.tar header.tar 2>.tar_err";
-	$smerr=smog_system ($com);
-	if ($smerr) {
-	    sig_system_error("$com",$smerr);
-	    unlink "$pidfile"; 
-	    exit 1;
-	}
-	
-	$com="tar --exclude=*.bak --exclude=*.tar --exclude=./.* --exclude=*.mgk --exclude=*.tmp --exclude=audioclip* -rf temp.tar * 2>>.tar_err";
-	$smerr=smog_system ($com);
-	if ($smerr) {
-	    sig_system_error("$com",$smerr);
-	    unlink "$pidfile"; 
-	    exit 1;
-	}
-	
-	if ($^O eq "MSWin32") {
-	    $com="gzip.exe -S .lv1 temp.tar";
-	}
-	else {
-	    $com="gzip -S .lv1 temp.tar";
-	}
-
-	$smerr=smog_system ($com);
-	if ($smerr) {
-	    sig_system_error("$com",$smerr);
-	    unlink "$pidfile"; 
-	    exit 1;
-	}
-	
-	unlink "temp.tar";
-	
-	smog_rename("temp.tar.lv1","$nfile");
-	
-	unlink <header.tar 0*.tar>;
-	if (-f ".tar_err") {
-	    open IN,"< .tar_err";
-	    read IN,$tarerr,255;
-	    close IN;
-	    unless ($tarerr eq "") {
-		&sig_error("Error creating new backup.",$tarerr);
-		unlink glob "*.tar .tar_err";
-		unlink "$pidfile";
-		exit 1;
-	    }
-	}
-	$size=-s "$nfile";
-	&sig_complete($size);
-	exit 0;
+        $withaudio=$ARGV[2];
+        $start=$ARGV[3];
+        $end=$ARGV[4];
+
+        if ($withaudio==0) {
+            $audio="";
+        }
+        else {
+            $audio="audio";
+        }
+
+        $nfile=$ARGV[5];
+
+        unlink "$curtmpdir/pause";
+        smog_chdir("$curtmpdir");
+
+# check the file is writable
+        unless (&is_writeable($nfile)) {
+            &sig_error("Unable to open output file !","$GUI_NAME could not write to $nfile.");
+        }
+
+        unlink glob "*.tar";
+        $com="tar --ignore-failed-read -cf header.tar \"$audio\" header* extended* event.* subs.* file* 2>$nulfile";
+        smog_system ($com);
+        if ($smerr) {
+            sig_system_error("$com",$smerr);
+            unlink "$pidfile";
+            exit 1;
+        }
+
+        &sig_progress(0);
+
+        $com="tar -cf temp.tar header.tar 2>.tar_err";
+        $smerr=smog_system ($com);
+        if ($smerr) {
+            sig_system_error("$com",$smerr);
+            unlink "$pidfile";
+            exit 1;
+        }
+
+        $com="tar --exclude=*.bak --exclude=*.tar --exclude=./.* --exclude=*.mgk --exclude=*.tmp --exclude=audioclip* -rf temp.tar * 2>>.tar_err";
+        $smerr=smog_system ($com);
+        if ($smerr) {
+            sig_system_error("$com",$smerr);
+            unlink "$pidfile";
+            exit 1;
+        }
+
+        if ($^O eq "MSWin32") {
+            $com="gzip.exe -S .lv1 temp.tar";
+        }
+        else {
+            $com="gzip -S .lv1 temp.tar";
+        }
+
+        $smerr=smog_system ($com);
+        if ($smerr) {
+            sig_system_error("$com",$smerr);
+            unlink "$pidfile";
+            exit 1;
+        }
+
+        unlink "temp.tar";
+
+        smog_rename("temp.tar.lv1","$nfile");
+
+        unlink <header.tar 0*.tar>;
+        if (-f ".tar_err") {
+            open IN,"< .tar_err";
+            read IN,$tarerr,255;
+            close IN;
+            unless ($tarerr eq "") {
+                &sig_error("Error creating new backup.",$tarerr);
+                unlink glob "*.tar .tar_err";
+                unlink "$pidfile";
+                exit 1;
+            }
+        }
+        $size=-s "$nfile";
+        &sig_complete($size);
+        exit 0;
     }
 
 
     if ($command eq "restore") {
-	$nfile=$ARGV[2];
+        $nfile=$ARGV[2];
 
-	smog_chdir("$curtmpdir");
-	
-	if ($^O ne "MSWin32") {
-	    $com="tar -zxf \"$nfile\" 2>$nulfile";
-	    smog_system ($com);
-
-	    if ($smerr) {
-		sig_system_error("$com",$smerr);
-		unlink "$pidfile"; 
-		exit 1;
-	    }
-	}
-	else {
-	    smog_copy("$nfile","$curtmpdir\\temp.gz");
-	    if ($panic) {
-		unlink "$pidfile"; 
-		exit 1;
-	    }
-	    $com="gzip.exe -d temp.gz";
-	    smog_system ($com);
-	    if ($smerr) {
-		sig_system_error("$com",$smerr);
-		unlink "$pidfile"; 
-		exit 1;
-	    }
-	    $com="tar.exe -xf temp";
-	    smog_system ($com);
-	    if ($smerr) {
-		sig_system_error("$com",$smerr);
-		unlink "$pidfile"; 
-		exit 1;
-	    }
-	    unlink "temp";
-	}
-
-	unless (-f "header.tar"||-f "header"||-f "header.lives") {
-	    &sig_error("This does not appear to be a valid backup file","$GUI_NAME was unable to open it.");
-	}
-
-	opendir DIR,$curtmpdir;
-	while ($file=readdir(DIR)) {
-	    if ($file =~ /.tar$/) {
-		smog_system("tar -xf $file 2>$nulfile");
-		unlink "$file";
-	    }
-	}
-	close DIR;
+        smog_chdir("$curtmpdir");
 
-	&sig_complete;
-	exit 0;
+        if ($^O ne "MSWin32") {
+            $com="tar -zxf \"$nfile\" 2>$nulfile";
+            smog_system ($com);
+
+            if ($smerr) {
+                sig_system_error("$com",$smerr);
+                unlink "$pidfile";
+                exit 1;
+            }
+        }
+        else {
+            smog_copy("$nfile","$curtmpdir\\temp.gz");
+            if ($panic) {
+                unlink "$pidfile";
+                exit 1;
+            }
+            $com="gzip.exe -d temp.gz";
+            smog_system ($com);
+            if ($smerr) {
+                sig_system_error("$com",$smerr);
+                unlink "$pidfile";
+                exit 1;
+            }
+            $com="tar.exe -xf temp";
+            smog_system ($com);
+            if ($smerr) {
+                sig_system_error("$com",$smerr);
+                unlink "$pidfile";
+                exit 1;
+            }
+            unlink "temp";
+        }
+
+        unless (-f "header.tar"||-f "header"||-f "header.lives") {
+            &sig_error("This does not appear to be a valid backup file","$GUI_NAME was unable to open it.");
+        }
+
+        opendir DIR,$curtmpdir;
+        while ($file=readdir(DIR)) {
+            if ($file =~ /.tar$/) {
+                smog_system("tar -xf $file 2>$nulfile");
+                unlink "$file";
+            }
+        }
+        close DIR;
+
+        &sig_complete;
+        exit 0;
     }
 
 
 
     if ($command eq "reorder") {
-	unlink "$curtmpdir/pause";
+        unlink "$curtmpdir/pause";
+
+        $img_ext=".".$ARGV[2];
+        $img_prefix=&get_img_prefix($img_ext);
+
+        if (!defined($ARGV[3])) {
+            $endian=&get_endian;
+        }
+        else {
+            $endian=$ARGV[3];
+        }
+        if (defined $ARGV[4]) {
+            $newwidth=$ARGV[4];
+        }
+        if (defined $ARGV[5]) {
+            $newheight=$ARGV[5];
+        }
+        if (defined $ARGV[6]) {
+            if ($ARGV[6]==1) {
+                $leave_bak=1;
+            }
+        }
+        if (defined $ARGV[7]) {
+            $old_end=$ARGV[7];
+        }
+
+        $letterbox=0;
+
+        if (defined $ARGV[8] && $ARGV[8]!=0) {
+#letterbox size
+            $letterbox=1;
+            $owidth=$newwidth;
+            $oheight=$newheight;
+
+            $newwidth=$ARGV[8];
+            $newheight=$ARGV[9];
+            $in_ext=".mgk";
+            $out_ext=$img_ext;
+        }
+
+        $newframe=-1;
+        $event_file="$curtmpdir/event.frames";
+        $resize_ext=".tmp";
+        smog_chdir("$curtmpdir");
+
+        unless ($leave_bak==1) {
+            &clean_old;
+        }
+
+        if (defined(open IN,"< $event_file")) {
+            $fcount=1;
+            read IN,$val,4;
+            $pstart=&getint($val);
+            $count=$pstart;
+
+
+            if ($letterbox&&!$leave_bak) {
+# make a background frame
+                if (!defined($bgcolour)) {
+                    $bgcolour="#000000";
+                }
+
+                $com="$smog_convert_command -size $owidth!x$oheight! xc:$bgcolour blank.jpg >$nulfile 2>&1";
+                $smerr=smog_system($com);
+                if ($smerr) {
+                    sig_system_error("$com",$smerr);
+                    unlink "$pidfile";
+                    exit 1;
+                }
+            }
+
+
+
+            while ($newframe!=0) {
+                read IN,$val,4;
+                $newframe=&getint($val);
+                if ($newframe>0) {
+                    $from=&mkname($newframe);
+                    if (-f "$curtmpdir/$from$img_ext") {
+                        $to=&mkname($count);
+
+                        if ($newwidth > 0 && $newheight > 0) {
+                            &resize_frame($from,$newwidth,$newheight);
+                            if ($panic) {
+                                if ($letterbox) {
+                                    try_to_recover($start,$i-1);
+                                    unlink "blank.jpg";
+                                }
+                                unlink "$pidfile";
+                                exit 1;
+                            }
+
+                            $smerr=rename "$curtmpdir/$from$resize_ext","$curtmpdir/$to.mgk";
+                            if (!$smerr) {
+                                if ($letterbox) {
+                                    try_to_recover($start,$i);
+                                    unlink "blank.jpg";
+                                }
+                                sig_system_error("Renaming \"$curtmpdir/$from$resize_ext\" to \"$curtmpdir/$to.mgk\"",$!);
+                                unlink "$pidfile";
+                                exit 1;
+                            }
+                        }
+                        else {
+                            unless (($from eq $to) || $letterbox) {
+                                smog_copy("$curtmpdir/$from$img_ext", "$curtmpdir/$to.mgk");
+                                if ($panic) {
+                                    unlink "$pidfile";
+                                    exit 1;
+                                }
+                            }
+                        }
+
+#now resized are in .mgk
+                        if ($letterbox) {
+                            if ($leave_bak) {
+#letterboxing was done with resize
+                                unless ($from eq $to) {
+                                    smog_copy("$curtmpdir/$from$img_ext", "$curtmpdir/$to$img_ext.2");
+                                    if ($panic) {
+                                        try_to_recover($start,$i);
+                                        unlink "$pidfile";
+                                        exit 1;
+                                    }
+                                    smog_copy("$curtmpdir/$from.mgk", "$curtmpdir/$to.mgk.2");
+                                    if ($panic) {
+                                        try_to_recover($start,$i);
+                                        unlink "$pidfile";
+                                        exit 1;
+                                    }
+                                }
+                            }
+                            else {
+                                smog_copy("$curtmpdir/$to$img_ext", "$curtmpdir/$to.bak");
+                                if ($panic) {
+                                    try_to_recover($start,$i-1);
+                                    unlink "$pidfile";
+                                    unlink "blank.jpg";
+                                    exit 1;
+                                }
+# make $to.mgk $to.img_ext
+                                &letterbox_frame($to,abs($newwidth),abs($newheight),$owidth,$oheight);
+
+                                if ($panic) {
+                                    try_to_recover($start,$i-1);
+                                    unlink "$pidfile";
+                                    unlink "blank.jpg";
+                                    exit 1;
+                                }
+
+#lb are in .img
+                            }
+
+                        }
+
+                    }
+                    $count++;
+                }
+                &sig_progress($fcount++);
+            }
+            close IN;
 
-	$img_ext=".".$ARGV[2];
-	$img_prefix=&get_img_prefix($img_ext);
+            if ($letterbox&&!$leave_bak) {
+                unlink "blank.jpg";
+            }
+
+        }
+
+        else {
+            &sig_error;
+        }
+
+        $start=$pstart;
+        $new_count=--$count;
+        $end=$count;
+
+        unless ($letterbox) {
+# mv mgk -> $img_ext
+            &mv_mgk;
+            if ($panic) {
+                unlink "$pidfile";
+                exit 1;
+            }
+        }
+
+        if ($letterbox&&$leave_bak) {
+
+# because of potential ovewrite we made .mgk2 (resized/no letterbox) and $img_ext.2 (resized)
+# now copy these
+            unless (!defined($pidfile)||$pidfile eq "") {
+# don't want to get killed in this stage...
+                unlink "$pidfile";
+            }
+            if ($smerr) {
+                sig_system_error("$com",$smerr);
+                unlink "$pidfile";
+                exit 1;
+            }
+            for ($i=$start; $i<=$end; $i++) {
+                $name=&mkname($i);
+                if (-f "$curtmpdir/$name.mgk.2") {
+                    if (-f "$curtmpdir/$name$img_ext.2") {
+                        unlink "$curtmpdir/$name$img_ext";
+                        $smerr=rename "$curtmpdir/$name$img_ext.2","$curtmpdir/$name$img_ext";
+                        if (!$smerr) {
+                            if ($letterbox) {
+                                try_to_recover($start,$end);
+                            }
+                            sig_system_error("Renaming \"$curtmpdir/$name$img_ext.2\" to \"$curtmpdir/$name$img_ext\"",$!);
+                            unlink "$pidfile";
+                            exit 1;
+                        }
 
-	if (!defined($ARGV[3])) {
-	    $endian=&get_endian;
-	}
-	else {
-	    $endian=$ARGV[3];
-	}
-	if (defined $ARGV[4]) {
-	    $newwidth=$ARGV[4];
-	}
-	if (defined $ARGV[5]) {
-	    $newheight=$ARGV[5];
-	}
-	if (defined $ARGV[6]) {
-	    if ($ARGV[6]==1) {
-		$leave_bak=1;
-	    }
-	}
-	if (defined $ARGV[7]) {
-	    $old_end=$ARGV[7];
-	}
-
-	$letterbox=0;
-
-	if (defined $ARGV[8] && $ARGV[8]!=0) {
-	    #letterbox size
-	    $letterbox=1;
-	    $owidth=$newwidth;
-	    $oheight=$newheight;
-
-	    $newwidth=$ARGV[8];
-	    $newheight=$ARGV[9];
-	    $in_ext=".mgk";
-	    $out_ext=$img_ext;
-	}
-
-	$newframe=-1;
-	$event_file="$curtmpdir/event.frames";
-	$resize_ext=".tmp";
-	smog_chdir("$curtmpdir");
-
-	unless ($leave_bak==1) {
-	    &clean_old;
-	}
-
-	if (defined(open IN,"< $event_file")) {
-	    $fcount=1;
-	    read IN,$val,4;
-	    $pstart=&getint($val);
-	    $count=$pstart;
-	    
-
-	    if ($letterbox&&!$leave_bak) {
-		# make a background frame
-		if (!defined($bgcolour)) {
-		    $bgcolour="#000000";
-		}
-		
-		$com="$smog_convert_command -size $owidth!x$oheight! xc:$bgcolour blank.jpg >$nulfile 2>&1";
-		$smerr=smog_system($com);
-		if ($smerr) {
-		    sig_system_error("$com",$smerr);
-		    unlink "$pidfile"; 
-		    exit 1;
-		}
-	    }
-
-
-
-	    while ($newframe!=0) {
-		read IN,$val,4;
-		$newframe=&getint($val);
-		if ($newframe>0) {
-		    $from=&mkname($newframe);
-		    if (-f "$curtmpdir/$from$img_ext") {
-			$to=&mkname($count);
-
-			if ($newwidth > 0 && $newheight > 0) {
-			    &resize_frame($from,$newwidth,$newheight);
-			    if ($panic) {
-				if ($letterbox) {
-				    try_to_recover($start,$i-1);
-				    unlink "blank.jpg";
-				}
-				unlink "$pidfile"; 
-				exit 1;
-			    }
-
-			    $smerr=rename "$curtmpdir/$from$resize_ext","$curtmpdir/$to.mgk";
-			    if (!$smerr) {
-				if ($letterbox) {
-				    try_to_recover($start,$i);
-				    unlink "blank.jpg";
-				}
-				sig_system_error("Renaming \"$curtmpdir/$from$resize_ext\" to \"$curtmpdir/$to.mgk\"",$!);
-				unlink "$pidfile"; 
-				exit 1;
-			    }
-			}
-			else {
-			    unless (($from eq $to) || $letterbox) {
-				smog_copy("$curtmpdir/$from$img_ext", "$curtmpdir/$to.mgk");
-				if ($panic) {
-				    unlink "$pidfile"; 
-				    exit 1;
-				}
-			    }
-			}
-
-                        #now resized are in .mgk
-			if ($letterbox) {
-			    if ($leave_bak) {
-				#letterboxing was done with resize
-				unless ($from eq $to) {
-				    smog_copy("$curtmpdir/$from$img_ext", "$curtmpdir/$to$img_ext.2");
-				    if ($panic) {
-					try_to_recover($start,$i);
-					unlink "$pidfile"; 
-					exit 1;
-				    }
-				    smog_copy("$curtmpdir/$from.mgk", "$curtmpdir/$to.mgk.2");
-				    if ($panic) {
-					try_to_recover($start,$i);
-					unlink "$pidfile"; 
-					exit 1;
-				    }
-				}
-			    }
-			    else {
-				smog_copy("$curtmpdir/$to$img_ext", "$curtmpdir/$to.bak");
-				if ($panic) {
-				    try_to_recover($start,$i-1);
-				    unlink "$pidfile";
-				    unlink "blank.jpg";
-				    exit 1;
-				}
-				# make $to.mgk $to.img_ext
-				&letterbox_frame($to,abs($newwidth),abs($newheight),$owidth,$oheight);
-				
-				if ($panic) {
-				    try_to_recover($start,$i-1);
-				    unlink "$pidfile"; 
-				    unlink "blank.jpg";
-				    exit 1;
-				}
-
-                                #lb are in .img
-			    }
-
-			}
-
-		    }
-		    $count++;
-		}
-		&sig_progress($fcount++);
-	    }
-	    close IN;
-
-	    if ($letterbox&&!$leave_bak) {
-		unlink "blank.jpg";
-	    }
-
-	}
-	
-	else {
-	    &sig_error;
-	}
-
-	$start=$pstart;
-	$new_count=--$count;
-	$end=$count;
-
-	unless ($letterbox) {
-	    # mv mgk -> $img_ext
-	    &mv_mgk;
-	    if ($panic) {
-		unlink "$pidfile"; 
-		exit 1;
-	    }
-	}
-
-	if ($letterbox&&$leave_bak) {
-
-	    # because of potential ovewrite we made .mgk2 (resized/no letterbox) and $img_ext.2 (resized)
-	    # now copy these
-	    unless (!defined($pidfile)||$pidfile eq "") {
-		# don't want to get killed in this stage...
-		unlink "$pidfile";
-	    }
-	    if ($smerr) {
-		sig_system_error("$com",$smerr);
-		unlink "$pidfile"; 
-		exit 1;
-	    }
-	    for ($i=$start;$i<=$end;$i++) {
-		$name=&mkname($i);
-		if (-f "$curtmpdir/$name.mgk.2") {
-		    if (-f "$curtmpdir/$name$img_ext.2") {
-			unlink "$curtmpdir/$name$img_ext";
-			$smerr=rename "$curtmpdir/$name$img_ext.2","$curtmpdir/$name$img_ext";
-			if (!$smerr) {
-			    if ($letterbox) {
-				try_to_recover($start,$end);
-			    }
-			    sig_system_error("Renaming \"$curtmpdir/$name$img_ext.2\" to \"$curtmpdir/$name$img_ext\"",$!);
-			    unlink "$pidfile"; 
-			    exit 1;
-			}
-
-		    }
-		    unlink "$curtmpdir/$name.mgk";
-		    $smerr=rename "$curtmpdir/$name.mgk.2","$curtmpdir/$name.mgk";
-		    
-		    if (!$smerr) {
-			if ($letterbox) {
-			    try_to_recover($start,$end);
-			}
-			sig_system_error("Renaming \"$curtmpdir/$name.mgk.2\" to \"$curtmpdir/$name.mgk\"",$!);
-			unlink "$pidfile"; 
-			exit 1;
-		    }
-		}
-	    }
-	}
-
-	if ($end<$old_end) {
-	    # remove excess frames
-	    for ($i=$end+1;$i<=$old_end;$i++) {
-		$name=&mkname($i);
-		if (-f "$curtmpdir/$name$img_ext") {
-		    unlink "$curtmpdir/$name.bak";
-		    smog_rename( "$curtmpdir/$name$img_ext","$curtmpdir/$name.bak");
-		}
-	    }
-	    &sig_progress($i);
-	}
+                    }
+                    unlink "$curtmpdir/$name.mgk";
+                    $smerr=rename "$curtmpdir/$name.mgk.2","$curtmpdir/$name.mgk";
+
+                    if (!$smerr) {
+                        if ($letterbox) {
+                            try_to_recover($start,$end);
+                        }
+                        sig_system_error("Renaming \"$curtmpdir/$name.mgk.2\" to \"$curtmpdir/$name.mgk\"",$!);
+                        unlink "$pidfile";
+                        exit 1;
+                    }
+                }
+            }
+        }
 
-	&sig_complete($new_count);
-	exit 0;
+        if ($end<$old_end) {
+# remove excess frames
+            for ($i=$end+1; $i<=$old_end; $i++) {
+                $name=&mkname($i);
+                if (-f "$curtmpdir/$name$img_ext") {
+                    unlink "$curtmpdir/$name.bak";
+                    smog_rename("$curtmpdir/$name$img_ext","$curtmpdir/$name.bak");
+                }
+            }
+            &sig_progress($i);
+        }
+
+        &sig_complete($new_count);
+        exit 0;
     }
 
 
 
     if ($command eq "deorder") {
-	$start=$ARGV[2];
-	$end=$ARGV[3];
-	$frames=$ARGV[4];
-	$img_ext=".".$ARGV[5];
-	if (defined $ARGV[6]) {
-	    $leave_bak=$ARGV[6];
-	}
-	else {
-	    $leave_bak=0;
-	}
-
-	smog_chdir("$curtmpdir");
-
-	$oend=$end;
-
-	if ($end>$frames) {
-	    $end=$frames;
-	}
-
-	&undo(!$leave_bak);  # will abort on failure
-
-	if ($frames<$oend) {
-	    # frames were upsampled
-	    for ($i=$frames+1;$i<=$oend;$i++) {
-		$name=&mkname($i);
-		if (!$leave_bak) {
-		    unlink "$curtmpdir/$name$img_ext";
-		}
-		else {
-		    smog_rename( "$curtmpdir/$name$img_ext","$curtmpdir/$name.mgk");
-		}
-	    }
-	}
-	else {
-	    # frames were downsampled
-	    for ($i=$end+1;$i<=$frames;$i++) {
-		$name=&mkname($i);
-		if (!$leave_bak) {
-		    if (-f  "$curtmpdir/$name.bak" ) {
-			smog_rename( "$curtmpdir/$name.bak","$curtmpdir/$name$img_ext");
-		    }
-		}
-		else {
-		    smog_rename( "$curtmpdir/$name$img_ext","$curtmpdir/$name.mgk");
-		}
-	    }
-	}
-
-	if (!$leave_bak) {
-	    #remove .mgk files from undo
-	    &clean_old;
-	}
+        $start=$ARGV[2];
+        $end=$ARGV[3];
+        $frames=$ARGV[4];
+        $img_ext=".".$ARGV[5];
+        if (defined $ARGV[6]) {
+            $leave_bak=$ARGV[6];
+        } else {
+            $leave_bak=0;
+        }
+
+        smog_chdir("$curtmpdir");
 
-	&sig_complete;
-	exit 0;
+        $oend=$end;
+
+        if ($end>$frames) {
+            $end=$frames;
+        }
+
+        &undo(!$leave_bak);
+# will abort on failure
+
+        if ($frames<$oend) {
+# frames were upsampled
+            for ($i=$frames+1; $i<=$oend; $i++) {
+                $name=&mkname($i);
+                if (!$leave_bak) {
+                    unlink "$curtmpdir/$name$img_ext";
+                } else {
+                    smog_rename("$curtmpdir/$name$img_ext","$curtmpdir/$name.mgk");
+                }
+            }
+        } else {
+# frames were downsampled
+            for ($i=$end+1; $i<=$frames; $i++) {
+                $name=&mkname($i);
+                if (!$leave_bak) {
+                    if (-f  "$curtmpdir/$name.bak") {
+                        smog_rename("$curtmpdir/$name.bak","$curtmpdir/$name$img_ext");
+                    }
+                } else {
+                    smog_rename("$curtmpdir/$name$img_ext","$curtmpdir/$name.mgk");
+                }
+            }
+        }
+
+        if (!$leave_bak) {
+#remove .mgk files from undo
+            &clean_old;
+        }
+
+        &sig_complete;
+        exit 0;
     }
 
 
     if ($command eq "cut") {
-	unlink "$curtmpdir/pause";
-	&clean_old;
+        unlink "$curtmpdir/pause";
+        &clean_old;
 
-	$start=$ARGV[2];
-	$end=$ARGV[3];
-	$cut_audio=$ARGV[4];
-	$frames=$ARGV[5];
-	$img_ext=".".$ARGV[6];
-	&cut($start,$end);
-
-	if ($cut_audio) {
-	    $fps=$ARGV[7];
-	    $arate=$ARGV[8];
-	    $achans=$ARGV[9];
-	    $asamps=$ARGV[10];
-	    if ($arate*$asamps*$achans) {
-		$start=($start-1)/$fps;
-		$end=$end/$fps;
-		&cut_audio;
-		if ($panic) {
-		    unlink "$pidfile"; 
-		    exit 1;
-		}
-	    }
-	}
-	&sig_complete;
-	exit 0;
+        $start=$ARGV[2];
+        $end=$ARGV[3];
+        $cut_audio=$ARGV[4];
+        $frames=$ARGV[5];
+        $img_ext=".".$ARGV[6];
+        &cut($start,$end);
+
+        if ($cut_audio) {
+            $fps=$ARGV[7];
+            $arate=$ARGV[8];
+            $achans=$ARGV[9];
+            $asamps=$ARGV[10];
+            if ($arate*$asamps*$achans) {
+                $start=($start-1)/$fps;
+                $end=$end/$fps;
+                &cut_audio;
+                if ($panic) {
+                    unlink "$pidfile";
+                    exit 1;
+                }
+            }
+        }
+        &sig_complete;
+        exit 0;
     }
 
 
-	if ($command eq "delete_all") {
-	    $frames=$ARGV[2];
-	    if (! -d $curtmpdir) {
-		&sig_complete;
-		exit 1;
-	    }
-	    smog_chdir("$curtmpdir");
-	    unlink glob "* *.* .*";
-	    if ($GUI_NAME eq "LiVES") {
-		# LiVES needs this to stop the progress dialog from flickering 
-		sleep(1);
-	    }
-	    &sig_complete;
-	    exit 0;
-	}
+    if ($command eq "delete_all") {
+        $frames=$ARGV[2];
+        if (! -d $curtmpdir) {
+            &sig_complete;
+            exit 1;
+        }
+        smog_chdir("$curtmpdir");
+        unlink glob "* *.* .*";
+        if ($GUI_NAME eq "LiVES") {
+# LiVES needs this to stop the progress dialog from flickering
+            sleep(1);
+        }
+        &sig_complete;
+        exit 0;
+    }
 
 
 
     if ($command eq "reverse") {
-	unlink "$curtmpdir/pause";
-	$start=$ARGV[2];
-	$end=$ARGV[3];
-	$img_ext=".".$ARGV[4];
-	&reverse;
-	&sig_complete;
-	exit 0;
+        unlink "$curtmpdir/pause";
+        $start=$ARGV[2];
+        $end=$ARGV[3];
+        $img_ext=".".$ARGV[4];
+        &reverse;
+        &sig_complete;
+        exit 0;
     }
 
 
     if ($command eq "undo") {
-	unlink "$curtmpdir/pause";
+        unlink "$curtmpdir/pause";
 
-	$start=$ARGV[2];
-	$end=$ARGV[3];
-	$img_ext=".".$ARGV[4];
-	&undo;  # will abort on failure
-	&sig_complete;
-	exit 0;
+        $start=$ARGV[2];
+        $end=$ARGV[3];
+        $img_ext=".".$ARGV[4];
+        &undo;
+# will abort on failure
+        &sig_complete;
+        exit 0;
     }
 
 
     if ($command eq "redo") {
-	unlink "$curtmpdir/pause";
+        unlink "$curtmpdir/pause";
 
-	$start=$ARGV[2];
-	$end=$ARGV[3];
-	$img_ext=".".$ARGV[4];
-
-	&mv_mgk(1);
-	if ($panic) {
-	    unlink "$pidfile"; 
-	    exit 1;
-	}
-	&sig_complete;
-	exit 0;
+        $start=$ARGV[2];
+        $end=$ARGV[3];
+        $img_ext=".".$ARGV[4];
+
+        &mv_mgk(1);
+        if ($panic) {
+            unlink "$pidfile";
+            exit 1;
+        }
+        &sig_complete;
+        exit 0;
     }
 
 
     if ($command eq "fs_preview") {
-	$win=$ARGV[2];
-	$hsize=$ARGV[3];
-	$vsize=$ARGV[4];
-	$start_time=$ARGV[5];
-	$preview_frames=$ARGV[6];
-	$file=$ARGV[7];
-	$extra_params=$ARGV[8];
-	$mplayer_command=&get_mplayer_location;
-
-	if ($^O ne "MSWin32") {
-	    smog_system("\"$mplayer_command\" -quiet -x $hsize -y $vsize -wid $win -vo x11 -zoom -ss $start_time -frames $preview_frames \"$file\" $extra_params >$nulfile 2>&1 <$nulfile");
-	}
-	else {
-	    smog_system("\"$mplayer_command\" -quiet -x $hsize -y $vsize -wid $win -vo direct3d -zoom -ss $start_time -frames $preview_frames \"$file\" $extra_params >$nulfile 2>&1 <$nulfile");
-	}
-	&sig_complete;
-	exit 0;
-    }
-
-        if ($command eq "mv_mgk") {
-	    unlink "$curtmpdir/pause";
-	    $start=$ARGV[2];
-	    $end=$ARGV[3];
-	    $img_ext=".".$ARGV[4];
-	    if (defined($ARGV[5])) {
-		$leave_bak=$ARGV[5];
-	    }
-
-	    &mv_mgk;
-	    if ($panic) {
-		unlink "$pidfile"; 
-		exit 1;
-	    }
-	    &sig_complete;
-	    exit 0;
-	}
+        $win=$ARGV[2];
+        $hsize=$ARGV[3];
+        $vsize=$ARGV[4];
+        $start_time=$ARGV[5];
+        $preview_frames=$ARGV[6];
+        $file=$ARGV[7];
+        $extra_params=$ARGV[8];
+        $mplayer_command=&get_mplayer_location;
+
+        if ($^O ne "MSWin32") {
+            smog_system("\"$mplayer_command\" -quiet -x $hsize -y $vsize -wid $win -vo x11 -zoom -ss $start_time -frames $preview_frames \"$file\" $extra_params >$nulfile 2>&1 <$nulfile");
+        } else {
+            smog_system("\"$mplayer_command\" -quiet -x $hsize -y $vsize -wid $win -vo direct3d -zoom -ss $start_time -frames $preview_frames \"$file\" $extra_params >$nulfile 2>&1 <$nulfile");
+        }
+        &sig_complete;
+        exit 0;
+    }
+
+    if ($command eq "mv_mgk") {
+        unlink "$curtmpdir/pause";
+        $start=$ARGV[2];
+        $end=$ARGV[3];
+        $img_ext=".".$ARGV[4];
+        if (defined($ARGV[5])) {
+            $leave_bak=$ARGV[5];
+        }
+
+        &mv_mgk;
+        if ($panic) {
+            unlink "$pidfile";
+            exit 1;
+        }
+        &sig_complete;
+        exit 0;
+    }
 
 
 
     if ($command eq "export_audio") {
-	$audio_start=$ARGV[2];
-	$audio_end=$ARGV[3];
-	$arate=$ARGV[4];
-	$achans=$ARGV[5];
-	$asamps=$ARGV[6];
-	$asigned=$ARGV[7];
-	$nrate=$ARGV[8];
-	$nfile=$ARGV[9];
-
-	# check the file is writable
-	unless (&is_writeable($nfile)) {
-	    &sig_error("Unable to open output file !","$GUI_NAME could not write to $nfile.");
-	}
-	if ($asigned==1) {
-	    $asigned="-s";
-	}
-	else {
-	    $asigned="-u";
-	}
-
-	if ($audio_end>0.) {
-	    $audio_in=&clip_audio($audio_start,$audio_end);
-	    if ($panic) {
-		unlink "$pidfile"; 
-		exit 1;
-	    }
-	}
-	else {
-	    $audio_in="$curtmpdir/audio";
-	}
-
-	# convert raw audio to wav
-	$audio_out=$curtmpdir . "/audiodump.wav";
-
-	&convert_audio_to_wav;
-	if ($panic) {
-	    unlink "$pidfile"; 
-	    exit 1;
-	}
-	if ($audio_end>0.) {
-	    unlink "$audio_in";
-	}
-  
-	smog_rename("$audio_out","$nfile");
-	if ($^O eq "MSWin32") {
-	    smog_system("chmod.exe 644 \"$nfile\" >$nulfile 2>&1");
-	}
-	else {
-	    smog_system("/bin/chmod 644 \"$nfile\" >$nulfile 2>&1");
-	}
+        $audio_start=$ARGV[2];
+        $audio_end=$ARGV[3];
+        $arate=$ARGV[4];
+        $achans=$ARGV[5];
+        $asamps=$ARGV[6];
+        $asigned=$ARGV[7];
+        $nrate=$ARGV[8];
+        $nfile=$ARGV[9];
+
+# check the file is writable
+        unless(&is_writeable($nfile)) {
+            &sig_error("Unable to open output file !","$GUI_NAME could not write to $nfile.");
+        }
+        if ($asigned==1) {
+            $asigned="-s";
+        } else {
+            $asigned="-u";
+        }
+
+        if ($audio_end>0.) {
+            $audio_in=&clip_audio($audio_start,$audio_end);
+            if ($panic) {
+                unlink "$pidfile";
+                exit 1;
+            }
+        } else {
+            $audio_in="$curtmpdir/audio";
+        }
+
+# convert raw audio to wav
+        $audio_out=$curtmpdir . "/audiodump.wav";
+
+        &convert_audio_to_wav;
+        if ($panic) {
+            unlink "$pidfile";
+            exit 1;
+        }
+        if ($audio_end>0.) {
+            unlink "$audio_in";
+        }
+
+        smog_rename("$audio_out","$nfile");
+        if ($^O eq "MSWin32") {
+            smog_system("chmod.exe 644 \"$nfile\" >$nulfile 2>&1");
+        } else {
+            smog_system("/bin/chmod 644 \"$nfile\" >$nulfile 2>&1");
+        }
 
-	&sig_complete;
-	exit 0;
+        &sig_complete;
+        exit 0;
     }
 
 
 
     if ($command eq "append_audio") {
-	# here we end up with (raw) 'audiodump', which will be renamed to 'audio' in commit_audio
-	$endian=&get_endian;
+# here we end up with (raw) 'audiodump', which will be renamed to 'audio' in commit_audio
+        $endian=&get_endian;
+
+        $type=$ARGV[2];
+        $nrate=$ARGV[3];
+        $nchans=$ARGV[4];
+        $nsamps=$ARGV[5];
+        $nsigned=$ARGV[6];
+        $nendian=$ARGV[7];
+        $file=$ARGV[8];
+        $audio_in="audiodump.wav";
+
+        smog_chdir("$curtmpdir");
+
+        $audiofile="audio";
+
+        if ($type eq "mp3") {
+            &mp3_open;
+        }
+        elsif($type eq "ogg") {
+            &ogg_open;
+        }
+        elsif($type eq "wav") {
+            &wav_open;
+        }
+        else {
+            &othera_open;
+        }
+
+        if ($panic) {
+            unlink "$pidfile";
+            exit 1;
+        }
+
+        smog_system_sync();
+
+        unless(-f $audio_in) {
+            &sig_error("$GUI_NAME was not able to open the file","$file");
+        }
+
+        $audio_out="audio.new";
+        &convert_audio_to_raw;
+        if ($panic) {
+            unlink "$pidfile";
+            exit 1;
+        }
+        unlink "$audio_in";
+
+        $audio_bak="audio.bak";
+
+
+# resample $audio_out (if required)
+        unless($arate==$nrate&&$achans==$nchans&&$asamps==$nsamps&&$nsigned==$signed&&$nendian==$endian) {
+            $audio_in=$audio_out;
+#audio.new
+            $audio_out=$audio_bak;
+#audio.bak
+            &resample_audio;
+# audio.new -> audio.bak
+            if ($panic) {
+                unlink "$pidfile";
+                exit 1;
+            }
 
-	$type=$ARGV[2];
-	$nrate=$ARGV[3];
-	$nchans=$ARGV[4];
-	$nsamps=$ARGV[5];
-	$nsigned=$ARGV[6];
-	$nendian=$ARGV[7];
-	$file=$ARGV[8];
-	$audio_in="audiodump.wav";
-
-	smog_chdir("$curtmpdir");
-
-	$audiofile="audio";
-
-	if ($type eq "mp3") {
-	    &mp3_open;
-	}
-	elsif ($type eq "ogg") {
-	    &ogg_open;
-	}
-	elsif ($type eq "wav") {
-	    &wav_open;
-	}
-	else {
-	    &othera_open;
-	}
-
-	if ($panic) {
-	    unlink "$pidfile"; 
-	    exit 1;
-	}
-
-	smog_system_sync();
-
-	unless (-f $audio_in) {
-	    &sig_error("$GUI_NAME was not able to open the file","$file");
-	}
-	
-	$audio_out="audio.new";
-	&convert_audio_to_raw;
-	if ($panic) {
-	    unlink "$pidfile"; 
-	    exit 1;
-	}
-	unlink "$audio_in";
-
-	$audio_bak="audio.bak";
-
-
-	# resample $audio_out (if required)
-	unless ($arate==$nrate&&$achans==$nchans&&$asamps==$nsamps&&$nsigned==$signed&&$nendian==$endian) {
-	    $audio_in=$audio_out; #audio.new
-	    $audio_out=$audio_bak; #audio.bak
-	    &resample_audio; # audio.new -> audio.bak
-	    if ($panic) {
-		unlink "$pidfile"; 
-		exit 1;
-	    }
-
-	    unlink "$audio_in"; #audio.new
-	    smog_rename( "$audio_out","$audio_in");  #audio.bak -> audio.new
-	    $audio_out=$audio_in; #audio.new
-	}
-
-	unless (&rc_get("conserve_space") eq "true") {
-	    smog_rename("$audio_out","keep_$audio_out");
-	    &backup_audio;
-	    if ($panic) {
-		unlink "keep_$audio_out";
-		unlink "$pidfile"; 
-		exit 1;
-	    }
-	    smog_rename("keep_$audio_out","$audio_out");
-	}
-
-	# cat audio audio.new -> audiodump
-	if ($^O eq "MSWin32") {
-	    $smerr=smog_system("cat.exe \"$curtmpdir/audio\" \"$audio_out\" > \"$curtmpdir/audiodump\"");
-	}
-	else {
-	    $smerr=smog_system("/bin/cat \"$curtmpdir/audio\" \"$audio_out\" > \"$curtmpdir/audiodump\"");
-	}
-
-	if ($smerr) {
-	    sig_system_error("Creating \"$curtmpdir\audiodump\"",$smerr);
-	    unlink "$pidfile"; 
-	    exit 1;
-	}
-
-	unlink "$audio_out"; #audio.new
-	$fsize=-s "$curtmpdir/audiodump";
-	&sig_complete($fsize);
-	exit 0;
+            unlink "$audio_in";
+#audio.new
+            smog_rename("$audio_out","$audio_in");
+#audio.bak -> audio.new
+            $audio_out=$audio_in;
+#audio.new
+        }
+
+        unless(&rc_get("conserve_space") eq "true") {
+            smog_rename("$audio_out","keep_$audio_out");
+            &backup_audio;
+            if ($panic) {
+                unlink "keep_$audio_out";
+                unlink "$pidfile";
+                exit 1;
+            }
+            smog_rename("keep_$audio_out","$audio_out");
+        }
+
+# cat audio audio.new -> audiodump
+        if ($^O eq "MSWin32") {
+            $smerr=smog_system("cat.exe \"$curtmpdir/audio\" \"$audio_out\" > \"$curtmpdir/audiodump\"");
+        } else {
+            $smerr=smog_system("/bin/cat \"$curtmpdir/audio\" \"$audio_out\" > \"$curtmpdir/audiodump\"");
+        }
+
+        if ($smerr) {
+            sig_system_error("Creating \"$curtmpdir\audiodump\"",$smerr);
+            unlink "$pidfile";
+            exit 1;
+        }
+
+        unlink "$audio_out";
+#audio.new
+        $fsize=-s "$curtmpdir/audiodump";
+        &sig_complete($fsize);
+        exit 0;
     }
 
 
 
     if ($command eq "trim_audio") {
-	$audio_start=$ARGV[2];
-	$audio_end=$ARGV[3];
+        $audio_start=$ARGV[2];
+        $audio_end=$ARGV[3];
+
+        $arate=$ARGV[4];
+        $achans=$ARGV[5];
+        $asamps=$ARGV[6];
+        $asigned=$ARGV[7];
+        $aendian=$ARGV[8];
+
+        smog_chdir("$curtmpdir");
+
+        unless(&rc_get("conserve_space") eq "true") {
+            &backup_audio;
+#audio -> audio.bak
+            if ($panic) {
+                unlink "$pidfile";
+                exit 1;
+            }
+        }
+
+#trim audio to selection
+
+# $audio_from is the new clip ("audioclip")
+        $audio_from=&clip_audio($audio_start,$audio_end);
+        if ($panic) {
+            unlink "$pidfile";
+            exit 1;
+        }
+
+        $align=$achans*$asamps/8;
+        $acsize=-s $audio_from;
+        $acsize/=$align*$arate;
+
+        unlink "$audio_in";
+# audio_in is "audio"
+
+        $where=$audio_start;
+        $end=$audio_end-$audio_start;
+        $start=0;
+
+        if ($end>$acsize) {
+#the part we cliṕped may have been *shorter* than the selection
+# need to check for this now, as we are more careful with reads and writes
+            $end=$acsize;
+        }
+
+# insert_audio will insert silence at start, and should recreate "audio" from "audioclip" ($audio_from)
 
-	$arate=$ARGV[4];
-	$achans=$ARGV[5];
-	$asamps=$ARGV[6];
-	$asigned=$ARGV[7];
-	$aendian=$ARGV[8];
-
-	smog_chdir("$curtmpdir");
-
-	unless (&rc_get("conserve_space") eq "true") {
-	    &backup_audio; #audio -> audio.bak
-	    if ($panic) {
-		unlink "$pidfile"; 
-		exit 1;
-	    }
-	}
-
-	#trim audio to selection
-	
-	# $audio_from is the new clip ("audioclip")
-	$audio_from=&clip_audio($audio_start,$audio_end);
-	if ($panic) {
-	    unlink "$pidfile"; 
-	    exit 1;
-	}
-	
-	$align=$achans*$asamps/8;
-	$acsize=-s $audio_from;
-	$acsize/=$align*$arate;
-
-	unlink "$audio_in"; # audio_in is "audio"
-	
-	$where=$audio_start;
-	$end=$audio_end-$audio_start;
-	$start=0;
-	
-	if ($end>$acsize) {
-	    #the part we cliṕped may have been *shorter* than the selection
-	    # need to check for this now, as we are more careful with reads and writes
-	    $end=$acsize;
-	}
-
-	# insert_audio will insert silence at start, and should recreate "audio" from "audioclip" ($audio_from)
-
-	&insert_audio($asamps,$achans,$asigned,$aendian,1);
-	if ($panic) {
-	    unlink "$pidfile"; 
-	    exit 1;
-	    $panic=0;
-	}
-
-	#append silence to pad to end
-	
-	&append_silence(0,&align($audio_end*$arate*$align),$asamps,$achans,$asigned,$aendian);
-	if ($panic) {
-	    unlink "$pidfile"; 
-	    exit 1;
-	    $panic=0;
-	}
+        &insert_audio($asamps,$achans,$asigned,$aendian,1);
+        if ($panic) {
+            unlink "$pidfile";
+            exit 1;
+            $panic=0;
+        }
+
+#append silence to pad to end
+
+        &append_silence(0,&align($audio_end*$arate*$align),$asamps,$achans,$asigned,$aendian);
+        if ($panic) {
+            unlink "$pidfile";
+            exit 1;
+            $panic=0;
+        }
 
-	&sig_complete;
-	exit 0;
+        &sig_complete;
+        exit 0;
     }
 
 
     if ($command eq "delete_audio") {
-	$start=$ARGV[2];
-	$end=$ARGV[3];
-	$arate=$ARGV[4];
-	$achans=$ARGV[5];
-	$asamps=$ARGV[6];
-
-	&cut_audio;
-	if ($panic) {
-	    unlink "$pidfile"; 
-	    exit 1;
-	}
+        $start=$ARGV[2];
+        $end=$ARGV[3];
+        $arate=$ARGV[4];
+        $achans=$ARGV[5];
+        $asamps=$ARGV[6];
+
+        &cut_audio;
+        if ($panic) {
+            unlink "$pidfile";
+            exit 1;
+        }
 
-	&sig_complete;
-	exit 0;
+        &sig_complete;
+        exit 0;
     }
 
     if ($command eq "resample_audio") {
-	$arate=$ARGV[2];
-	$achans=$ARGV[3];
-	$asamps=$ARGV[4];
-	$asigned=$ARGV[5];
-	$aendian=$ARGV[6];
-
-
-	$nrate=$ARGV[7];
-	$nchans=$ARGV[8];
-	$nsamps=$ARGV[9];
-	$nsigned=$ARGV[10];
-	$nendian=$ARGV[11];
-	$audio_in="$curtmpdir/audio.bak";
-	$audio_out="$curtmpdir/audio";
-
-	if (defined($ARGV[12])) {
-	    $stretch=$ARGV[12];
-	    $audio_in="$curtmpdir/audio.orig";
-	}
-
-	unlink "$audio_in";
-	smog_rename( "$audio_out","$audio_in"); # aborts on failuer
-
-	smog_system_sync();
-
-	&resample_audio;
-	if ($panic) {
-	    unlink "$pidfile"; 
-	    exit 1;
-	}
-
-	if (&rc_get("conserve_space") eq "true" && (-s $audio_out)) {
-	    unlink "$audio_in";
-	}
+        $arate=$ARGV[2];
+        $achans=$ARGV[3];
+        $asamps=$ARGV[4];
+        $asigned=$ARGV[5];
+        $aendian=$ARGV[6];
+
+
+        $nrate=$ARGV[7];
+        $nchans=$ARGV[8];
+        $nsamps=$ARGV[9];
+        $nsigned=$ARGV[10];
+        $nendian=$ARGV[11];
+        $audio_in="$curtmpdir/audio.bak";
+        $audio_out="$curtmpdir/audio";
+
+        if (defined($ARGV[12])) {
+            $stretch=$ARGV[12];
+            $audio_in="$curtmpdir/audio.orig";
+        }
 
-	&sig_complete;
-	exit 0;
+        unlink "$audio_in";
+        smog_rename("$audio_out","$audio_in");
+# aborts on failuer
+
+        smog_system_sync();
+
+        &resample_audio;
+        if ($panic) {
+            unlink "$pidfile";
+            exit 1;
+        }
+
+        if (&rc_get("conserve_space") eq "true" && (-s $audio_out)) {
+            unlink "$audio_in";
+        }
+
+        &sig_complete;
+        exit 0;
     }
 
 
 
     if ($command eq "get_window_id") {
-	smog_system("xwininfo > \"$curtmpdir/tmpinfo\"");
+        smog_system("xwininfo > \"$curtmpdir/tmpinfo\"");
+
+        smog_system("grep \"Window id:\" \"$curtmpdir/tmpinfo\" > \"$curtmpdir/tmpinfo2\"");
+        if (defined(open IN,"< $curtmpdir/tmpinfo2")) {
+            read IN,$win_id,128;
+            close IN;
+        }
+        @wid=split(/ /,$win_id);
+        $win_id=hex($wid[3]);
+        chomp($win_id);
+
+        smog_system("grep \"Width:\" \"$curtmpdir/tmpinfo\" > \"$curtmpdir/tmpinfo2\"");
+        if (defined(open IN,"< $curtmpdir/tmpinfo2")) {
+            read IN,$width,128;
+            close IN;
+        }
+        @widths=split(/Width: /,$width);
+        $width=$widths[1];
+        chomp($width);
+
+        smog_system("grep \"Height:\" \"$curtmpdir/tmpinfo\" > \"$curtmpdir/tmpinfo2\"");
+        if (defined(open IN,"< $curtmpdir/tmpinfo2")) {
+            read IN,$height,128;
+            close IN;
+        }
+@heights=split(/Height: /,$height);
+        $height=$heights[1];
+        chomp($height);
+
+        smog_system("grep \"Depth:\" \"$curtmpdir/tmpinfo\" > \"$curtmpdir/tmpinfo2\"");
+        if (defined(open IN,"< $curtmpdir/tmpinfo2")) {
+            read IN,$bpp,128;
+            close IN;
+        }
+@bpps=split(/Depth: /,$bpp);
+        $bpp=$bpps[1];
+        chomp($bpp);
 
-	smog_system("grep \"Window id:\" \"$curtmpdir/tmpinfo\" > \"$curtmpdir/tmpinfo2\"");
-	if (defined(open IN,"< $curtmpdir/tmpinfo2")) {
-	    read IN,$win_id,128;
-	    close IN;
-	}
-	@wid=split(/ /,$win_id);
-	$win_id=hex($wid[3]);
-	chomp($win_id);
-
-	smog_system("grep \"Width:\" \"$curtmpdir/tmpinfo\" > \"$curtmpdir/tmpinfo2\"");
-	if (defined(open IN,"< $curtmpdir/tmpinfo2")) {
-	    read IN,$width,128;
-	    close IN;
-	}
-	@widths=split(/Width: /,$width);
-	$width=$widths[1];
-	chomp($width);
-
-	smog_system("grep \"Height:\" \"$curtmpdir/tmpinfo\" > \"$curtmpdir/tmpinfo2\"");
-	if (defined(open IN,"< $curtmpdir/tmpinfo2")) {
-	    read IN,$height,128;
-	    close IN;
-	}
-	@heights=split(/Height: /,$height);
-	$height=$heights[1];
-	chomp($height);
-
-	smog_system("grep \"Depth:\" \"$curtmpdir/tmpinfo\" > \"$curtmpdir/tmpinfo2\"");
-	if (defined(open IN,"< $curtmpdir/tmpinfo2")) {
-	    read IN,$bpp,128;
-	    close IN;
-	}
-	@bpps=split(/Depth: /,$bpp);
-	$bpp=$bpps[1];
-	chomp($bpp);
-
-
-	smog_system("grep \"Visual:\" \"$curtmpdir/tmpinfo\" > \"$curtmpdir/tmpinfo2\"");
-	if (defined(open IN,"< $curtmpdir/tmpinfo2")) {
-	    read IN,$visual,128;
-	    close IN;
-	}
-	@visuals=split(/Visual: /,$visual);
-	$visual=$visuals[1];
-	chomp($visual);
 
-	unlink "$curtmpdir/tmpinfo";
-	unlink "$curtmpdir/tmpinfo2";
+        smog_system("grep \"Visual:\" \"$curtmpdir/tmpinfo\" > \"$curtmpdir/tmpinfo2\"");
+        if (defined(open IN,"< $curtmpdir/tmpinfo2")) {
+            read IN,$visual,128;
+            close IN;
+        }
+@visuals=split(/Visual: /,$visual);
+        $visual=$visuals[1];
+        chomp($visual);
+
+        unlink "$curtmpdir/tmpinfo";
+        unlink "$curtmpdir/tmpinfo2";
 
-	&sig_complete($win_id,$width,$height,$bpp,$visual);
-	exit 0;
+        &sig_complete($win_id,$width,$height,$bpp,$visual);
+        exit 0;
     }
 
 
     if ($command eq "fill_and_redo_frames") {
-	# remove any gaps in the play images
-	unlink "$curtmpdir/pause";
-	$end=$ARGV[2];
-	$width=$ARGV[3];
-	$height=$ARGV[4];
-	$img_ext=".".$ARGV[5];
-	$img_prefix=&get_img_prefix($img_ext);
-	$has_audio=0;
-	$fps=$ARGV[6];
-	$arate=$ARGV[7];
-	$achans=$ARGV[8];
-	$asamps=$ARGV[9];
-	$asigned=$ARGV[10];
-	$aendian=$ARGV[11];
-
-	if ($achans>0) {
-	    $has_audio=1;
-	}
-
-	&fill_and_redo_frames;
-	
-	if ($panic) {
-	    unlink $pidfile;
-	    exit 1;
-	}
-
-	if ($has_audio) {
-	    $aud_end=($end/$fps)*$achans*$arate*($asamps/8);
-	    $audio_in="$curtmpdir/audio";
-	    $audsize=-s $audio_in;
-	    if ($audsize > $aud_end) {
-		$audio_out=&clip_audio(0.,$end/$fps);
-		if ($panic) {
-		    unlink "$pidfile"; 
-		    exit 1;
-		}
-		unlink "$audio_in";
-		smog_rename( "$audio_out","$audio_in");
-	    }
-	    elsif ($audsize<$aud_end) {
-		$audio_out="$curtmpdir/audio.bak";
-		smog_rename( "$audio_in","$audio_out");
-		&append_silence(0,$aud_end-$audsize,$asamps,$achans,$asigned,$aendian,$audio_in);
-		if ($panic) {
-		    unlink "$pidfile"; 
-		    exit 1;
-		}
-		if ($^O eq "MSWin32") {
-		    smog_system("cat.exe \"$audio_out\">>\"$audio_in\"");
-		}
-		else {
-		    smog_system("/bin/cat \"$audio_out\">>\"$audio_in\"");
-		}
-		unlink "$audio_out";
-	    }
-	}
+# remove any gaps in the play images
+        unlink "$curtmpdir/pause";
+        $end=$ARGV[2];
+        $width=$ARGV[3];
+        $height=$ARGV[4];
+        $img_ext=".".$ARGV[5];
+        $img_prefix=&get_img_prefix($img_ext);
+        $has_audio=0;
+        $fps=$ARGV[6];
+        $arate=$ARGV[7];
+        $achans=$ARGV[8];
+        $asamps=$ARGV[9];
+        $asigned=$ARGV[10];
+        $aendian=$ARGV[11];
+
+        if ($achans>0) {
+            $has_audio=1;
+        }
+
+        &fill_and_redo_frames;
 
-	&sig_complete;
-	exit 0;
+        if ($panic) {
+            unlink $pidfile;
+            exit 1;
+        }
+
+        if ($has_audio) {
+            $aud_end=($end/$fps)*$achans*$arate*($asamps/8);
+            $audio_in="$curtmpdir/audio";
+            $audsize=-s $audio_in;
+            if ($audsize > $aud_end) {
+                $audio_out=&clip_audio(0.,$end/$fps);
+                if ($panic) {
+                    unlink "$pidfile";
+                    exit 1;
+                }
+                unlink "$audio_in";
+                smog_rename("$audio_out","$audio_in");
+            }
+            elsif($audsize<$aud_end) {
+                $audio_out="$curtmpdir/audio.bak";
+                smog_rename("$audio_in","$audio_out");
+                &append_silence(0,$aud_end-$audsize,$asamps,$achans,$asigned,$aendian,$audio_in);
+                if ($panic) {
+                    unlink "$pidfile";
+                    exit 1;
+                }
+                if ($^O eq "MSWin32") {
+                    smog_system("cat.exe \"$audio_out\">>\"$audio_in\"");
+                } else {
+                    smog_system("/bin/cat \"$audio_out\">>\"$audio_in\"");
+                }
+                unlink "$audio_out";
+            }
+        }
+
+        &sig_complete;
+        exit 0;
     }
 
 
     if ($command eq "commit_audio") {
-	# commit the audio file in either audiodump or audiodump.wav as new audio file
-	smog_chdir("$curtmpdir");
-	$audio_out="audio";
-	$audio_bak="audio.bak";
-
-	my $gotit=0;
-
-	$file=$audio_in="audiodump.wav";
-
-	my $f_size=-s $audio_in;
-	if ($f_size>0) {
-	    # wav format
-	    unless (&rc_get("conserve_space") eq "true") {
-		if (-f $audio_out) {
-		    $smres=smog_rename( "$audio_out","$audio_bak");
-		}
-		else {
-		    if ($^O eq "MSWin32") {
-			$smres=smog_system("touch.exe \"$audio_bak\"");
-		    }
-		    else {
-			$smres=smog_system("touch \"$audio_bak\"");
-		    }
-		    if ($smres) {
-			sig_write_error("$audio_bak"); 
-			unlink "$pidfile"; 
-			exit 1;
-		    }
-		}
-	    }
-	    $is_audio=TRUE;
-	    &get_file_info;
-	    if ($panic) {
-		unlink "$pidfile"; 
-		exit 1;
-	    }
-	    &convert_audio_to_raw;
-	    if ($panic) {
-		unlink "$pidfile"; 
-		exit 1;
-	    }
-	}
-	else {
-	    $audio_in="audiodump";
-	    if (! -f $audio_in) {
-		$audio_in="audiodump.pcm";
-	    }
-	    else {
-		$gotit=1;
-	    }
-	    if ($gotit || -f $audio_in) {
-		# raw format
-		unless (&rc_get("conserve_space") eq "true") {
-		    if (-f $audio_out) {
-			$smres=smog_rename( "$audio_out","$audio_bak"); #aborts on failure
-		    }
-		    else {
-			if ($^O eq "MSWin32") {
-			    $smres=smog_system("touch.exe \"$audio_bak\"");
-			}
-			else {
-			    $smres=smog_system("touch \"$audio_bak\"");
-			}
-			if ($smres) {
-			    sig_write_error("$audio_bak"); 
-			    unlink "$pidfile"; 
-			    exit 1;
-			}
-		    }
-		}
-		smog_rename( "$audio_in","$audio_out");
-		# dummy values, the GUI should know these
-		$arate=$achans=$asamps=0;
-		$signed=$endian=1;
-	    }
-	    else {
-		&sig_error("$GUI_NAME audio error.");
-	    }
-	}
-	unlink glob "audiodump.*";
-
-	$f_size=-s $audio_out;
-	&sig_complete($arate,$achans,$asamps,$signed,$endian,$f_size);
-	exit 0;
+# commit the audio file in either audiodump or audiodump.wav as new audio file
+        smog_chdir("$curtmpdir");
+        $audio_out="audio";
+        $audio_bak="audio.bak";
+
+        my $gotit=0;
+
+        $file=$audio_in="audiodump.wav";
+
+        my $f_size=-s $audio_in;
+        if ($f_size>0) {
+# wav format
+            unless(&rc_get("conserve_space") eq "true") {
+                if (-f $audio_out) {
+                    $smres=smog_rename("$audio_out","$audio_bak");
+                } else {
+                    if ($^O eq "MSWin32") {
+                        $smres=smog_system("touch.exe \"$audio_bak\"");
+                    } else {
+                        $smres=smog_system("touch \"$audio_bak\"");
+                    }
+                    if ($smres) {
+                        sig_write_error("$audio_bak");
+                        unlink "$pidfile";
+                        exit 1;
+                    }
+                }
+            }
+            $is_audio=TRUE;
+            &get_file_info;
+            if ($panic) {
+                unlink "$pidfile";
+                exit 1;
+            }
+            &convert_audio_to_raw;
+            if ($panic) {
+                unlink "$pidfile";
+                exit 1;
+            }
+        } else {
+            $audio_in="audiodump";
+            if (! -f $audio_in) {
+                $audio_in="audiodump.pcm";
+            } else {
+                $gotit=1;
+            }
+            if ($gotit || -f $audio_in) {
+# raw format
+                unless(&rc_get("conserve_space") eq "true") {
+                    if (-f $audio_out) {
+                        $smres=smog_rename("$audio_out","$audio_bak");
+#aborts on failure
+                    } else {
+                        if ($^O eq "MSWin32") {
+                            $smres=smog_system("touch.exe \"$audio_bak\"");
+                        } else {
+                            $smres=smog_system("touch \"$audio_bak\"");
+                        }
+                        if ($smres) {
+                            sig_write_error("$audio_bak");
+                            unlink "$pidfile";
+                            exit 1;
+                        }
+                    }
+                }
+                smog_rename("$audio_in","$audio_out");
+# dummy values, the GUI should know these
+                $arate=$achans=$asamps=0;
+                $signed=$endian=1;
+            } else {
+                &sig_error("$GUI_NAME audio error.");
+            }
+        }
+        unlink glob "audiodump.*";
+
+        $f_size=-s $audio_out;
+        &sig_complete($arate,$achans,$asamps,$signed,$endian,$f_size);
+        exit 0;
     }
 
     if ($command eq "cancel_audio") {
-	# remove the audio file in audiodump/audiodump.wav
-	# plus any audio.new files (e.g. from append audio)
+# remove the audio file in audiodump/audiodump.wav
+# plus any audio.new files (e.g. from append audio)
 
-	smog_chdir("$curtmpdir");
-	unlink glob "audiodump* audio.new";
+        smog_chdir("$curtmpdir");
+        unlink glob "audiodump* audio.new";
 
-	&sig_complete;
-	exit 0;
+        &sig_complete;
+        exit 0;
     }
 
 
     if ($command eq "download_clip") {
-	my $url=$ARGV[2];
-	my $dfile=$ARGV[3];
+        my $url=$ARGV[2];
+        my $dfile=$ARGV[3];
 
-	if ($url =~ /youtube/ || $url =~ /youtu\.be/) {
-	    # youtube-dl
+        if ($url =~ /youtube/ || $url =~ /youtu\.be/) {
+# youtube-dl
 
-	    if (-f $dfile) {
-		unlink "$dfile";
-	    }
+            if (-f $dfile) {
+                unlink "$dfile";
+            }
 
-	    if (-f $dfile) {
-		&sig_error;
-		exit 2;
-	    }
+            if (-f $dfile) {
+                &sig_error;
+                exit 2;
+            }
 
-	    $com="youtube-dl -o \"$dfile\" -f 43 -q --no-part \"$url\"";
+            $com="youtube-dl -o \"$dfile\" -f 43 -q --no-part \"$url\"";
 
-	    &sig_progress(1);
+            &sig_progress(1);
 
-	    $res=smog_system("$com");
+            $res=smog_system("$com");
 
-	    if ($res || !(-f $dfile) || -z $dfile) {
+            if ($res || !(-f $dfile) || -z $dfile) {
 
-		if (-f $dfile) {
-		    unlink "$dfile";
-		}
+                if (-f $dfile) {
+                    unlink "$dfile";
+                }
 
-		sig_system_error("$com",$res);
-		unlink "$pidfile";
-		exit 1;
-	    }
-	}
+                sig_system_error("$com",$res);
+                unlink "$pidfile";
+                exit 1;
+            }
+        }
 
-	&sig_complete;
-	exit 0;
+        &sig_complete;
+        exit 0;
     }
 
 
 
     if ($command eq "cdopen") {
 
-	$cdda2wav_command=&location("cdda2wav");
-	if ($cdda2wav_command eq "") {
-	    &sig_error("cdda2wav is required for this function.","Please install it first.");
-	}
-
-	$cdplay_device=&rc_get("cdplay_device");
-	if ($cdplay_device eq "") {
-	    &sig_error("You must set the CD device first in Preferences.");
-	}
-
-	$track=$ARGV[2];
-
-	$audiofile=$curtmpdir."/audiodump.wav";
-	if (-f $audiofile) {
-	    unlink "$audiofile";
-	}
-
-	$com="\"$cdda2wav_command\" -q -x -D \"$cdplay_device\" -t $track \"$audiofile\"| >$nulfile 2>&1";
-	$smerr=smog_system($com);
-	if ($smerr) {
-	    sig_system_error("$com",$smerr);
-	    unlink "$pidfile"; 
-	    exit 1;
-	}
-	$f_size=-s $audiofile;
-	# the '-x' option will force these
-	$arate=44100;
-	$achans=2;
-	$asamps=16;
-	$aendian=&get_endian;
-	$asigned=1;
-	if ($asamps==8) {
-	    $asigned=0;
-	}
-	&sig_complete($arate,$achans,$asamps,$asigned,$aendian,$f_size);
-	exit 0;
+        $cdda2wav_command=&location("cdda2wav");
+        if ($cdda2wav_command eq "") {
+            &sig_error("cdda2wav is required for this function.","Please install it first.");
+        }
+
+        $cdplay_device=&rc_get("cdplay_device");
+        if ($cdplay_device eq "") {
+            &sig_error("You must set the CD device first in Preferences.");
+        }
+
+        $track=$ARGV[2];
+
+        $audiofile=$curtmpdir."/audiodump.wav";
+        if (-f $audiofile) {
+            unlink "$audiofile";
+        }
+
+        $com="\"$cdda2wav_command\" -q -x -D \"$cdplay_device\" -t $track \"$audiofile\"| >$nulfile 2>&1";
+        $smerr=smog_system($com);
+        if ($smerr) {
+            sig_system_error("$com",$smerr);
+            unlink "$pidfile";
+            exit 1;
+        }
+        $f_size=-s $audiofile;
+# the '-x' option will force these
+        $arate=44100;
+        $achans=2;
+        $asamps=16;
+        $aendian=&get_endian;
+        $asigned=1;
+        if ($asamps==8) {
+            $asigned=0;
+        }
+        &sig_complete($arate,$achans,$asamps,$asigned,$aendian,$f_size);
+        exit 0;
     }
 
 
     if ($command eq "audioopen") {
-	# TODO - allow front end to specify rate/channels, etc.
+# TODO - allow front end to specify rate/channels, etc.
 
-	$file=$ARGV[2];
+        $file=$ARGV[2];
 
-	smog_chdir("$curtmpdir");
+        smog_chdir("$curtmpdir");
 
-	$audio_in="audiodump.wav";
+        $audio_in="audiodump.wav";
 
-	$ext=&get_ext("$file");
-	if ($ext eq ".mp3") {
-	    &mp3_open;
-	}
-	elsif ($ext eq ".ogg") {
-	    &ogg_open;
-	}
-	elsif ($ext eq ".wav") {
-	    &wav_open;
-	}
-	else {
-	    &othera_open;
-	}
-
-
-	if ($panic) {
-	    unlink "$pidfile"; 
-	    exit 1;
-	}
+        $ext=&get_ext("$file");
+        if ($ext eq ".mp3") {
+            &mp3_open;
+        }
+        elsif($ext eq ".ogg") {
+            &ogg_open;
+        }
+        elsif($ext eq ".wav") {
+            &wav_open;
+        }
+        else {
+            &othera_open;
+        }
+
+
+        if ($panic) {
+            unlink "$pidfile";
+            exit 1;
+        }
 
-	&sig_complete($arate,$achans,$asamps,$asigned,$aendian,$f_size);
-	exit 0;
+        &sig_complete($arate,$achans,$asamps,$asigned,$aendian,$f_size);
+        exit 0;
     }
 
     if ($command eq "insert") {
-	# with_audio: 0, no audio, 1 video and audio, 2 ONLY audio
-	# for 0 and 1, start, end, where are in frames; for 2, start,end,where are in seconds
-	# with -ve arate means insert silence [with_audio should be 1 or 2]
-	# with -ve times means undo cut/delete [source is same clip dir]
-
-	# with -ve end means "allow missing frames" (used for copying to clipboard)
-
-	unlink "$curtmpdir/pause";
-	$img_ext=".".$ARGV[2];
-	$img_prefix=&get_img_prefix($img_ext);
-	$where=$ARGV[3];
-	$start=$ARGV[4];
-	$end=$ARGV[5];
-	$from_handle=$ARGV[6];
-	$with_audio=$ARGV[7];
-	$num_frames=$ARGV[8];
-
-	$width=$ARGV[9];
-	$height=$ARGV[10];
-	$times=1;
-	$undo_cut=0;
+# with_audio: 0, no audio, 1 video and audio, 2 ONLY audio
+# for 0 and 1, start, end, where are in frames; for 2, start,end,where are in seconds
+# with -ve arate means insert silence [with_audio should be 1 or 2]
+# with -ve times means undo cut/delete [source is same clip dir]
+
+# with -ve end means "allow missing frames" (used for copying to clipboard)
+
+        unlink "$curtmpdir/pause";
+        $img_ext=".".$ARGV[2];
+        $img_prefix=&get_img_prefix($img_ext);
+        $where=$ARGV[3];
+        $start=$ARGV[4];
+        $end=$ARGV[5];
+        $from_handle=$ARGV[6];
+        $with_audio=$ARGV[7];
+        $num_frames=$ARGV[8];
+
+        $width=$ARGV[9];
+        $height=$ARGV[10];
+        $times=1;
+        $undo_cut=0;
 
         $new_frames=$num_frames;
 
-	smog_chdir("$curtmpdir");
+        smog_chdir("$curtmpdir");
+
+        $allow_missing=0;
+        if ($end<0) {
+# insert (copy) from (virtual) clip into clipboard
+            $allow_missing=1;
+            $end=-$end;
+        }
+
+        if (defined($ARGV[17])) {
+            $times=$ARGV[17];
+            if ($times<0) {
+# this indicates undoing a previous cut
+                $times=-$times;
+                $undo_cut=1;
+                $new_frames=$num_frames+$end-$start+1;
+            } else {
+                if ($start>=0) {
+                    &clean_old;
+                } else {
+# $start < 0 tells us to leave backups alone
+                    $start=-$start;
+                }
+                $antialias=&rc_get("antialias");
+            }
+        }
+
+        if ($with_audio<2) {
+            if (!$undo_cut) {
+                if (!$allow_missing) {
+                    $img_ext2=&get_img_ext("$tmpdir/$from_handle",$start);
+                    $img_prefix2=&get_img_prefix($img_ext2);
+                } else {
+                    $img_ext2=$img_ext;
+                    $img_prefix2=$img_prefix;
+                }
+            }
+
+            &insert;
+            if ($panic) {
+                unlink "$pidfile";
+                exit 1;
+            }
+        }
+
+        if ($with_audio) {
+            $fps=$ARGV[11];
+            $arate=$ARGV[12];
+            $achans=$ARGV[13];
+            $asamps=$ARGV[14];
+            $asigned=$ARGV[15];
+            $aendian=$ARGV[16];
+
+            if ($arate*$achans*$asamps!=0) {
+                if (!$undo_cut) {
+                    if ($with_audio<2) {
+                        $end/=$fps;
+                        $start=($start-1.)/$fps;
+                        $where/=$fps;
+                    }
+                    if (! -f "audio") {
+                        unlink "audio.bak";
+                    } else {
+                        smog_copy("audio","audio.bak");
+                    }
+                    if ($panic) {
+                        unlink "$pidfile";
+                        exit 1;
+                    }
+                    smog_system_sync();
+                } else {
+                    $end=-s "$curtmpdir/audio.bak";
+                    $end/=$arate*$achans*$asamps/8;
+                    $start=0.;
+                    if ($with_audio<2) {
+                        $where/=$fps;
+                    }
+                }
+                &insert_audio($asamps,$achans,$asigned,$aendian,$undo_cut);
+                if (&rc_get("conserve_space") eq "true") {
+                    unlink "audio.bak";
+                }
+                if ($panic) {
+                    unlink "$pidfile";
+                    exit 1;
+                }
+            }
+        }
 
-	$allow_missing=0;
-	if ($end<0) {
-	    # insert (copy) from (virtual) clip into clipboard
-	    $allow_missing=1;
-	    $end=-$end;
-	}
-
-	if (defined ($ARGV[17])) {
-	    $times=$ARGV[17];
-	    if ($times<0) {
-		# this indicates undoing a previous cut
-		$times=-$times;
-		$undo_cut=1;
-		$new_frames=$num_frames+$end-$start+1;
-	    }
-	    else {
-		if ($start>=0) {
-		    &clean_old;
-		}
-		else {
-		    # $start < 0 tells us to leave backups alone
-		    $start=-$start;
-		}
-		$antialias=&rc_get("antialias");
-	    }
-	}
-
-	if ($with_audio<2) {
-	    if (!$undo_cut) {
-		if (!$allow_missing) {
-		    $img_ext2=&get_img_ext("$tmpdir/$from_handle",$start);
-		    $img_prefix2=&get_img_prefix($img_ext2);
-		}
-		else {
-		    $img_ext2=$img_ext;
-		    $img_prefix2=$img_prefix;
-		}
-	    }
-
-	    &insert;
-	    if ($panic) {
-		unlink "$pidfile"; 
-		exit 1;
-	    }
-	}
-
-	if ($with_audio) {
-	    $fps=$ARGV[11];
-	    $arate=$ARGV[12];
-	    $achans=$ARGV[13];
-	    $asamps=$ARGV[14];
-	    $asigned=$ARGV[15];
-	    $aendian=$ARGV[16];
-
-	    if ($arate*$achans*$asamps!=0) {
-		if (!$undo_cut) {
-		    if ($with_audio<2) {
-			$end/=$fps;
-			$start=($start-1.)/$fps;
-			$where/=$fps;
-		    }
-		    if (! -f "audio") {
-			unlink "audio.bak";
-		    }
-		    else {
-			smog_copy("audio","audio.bak");
-		    }
-		    if ($panic) {
-			unlink "$pidfile"; 
-			exit 1;
-		    }
-		    smog_system_sync();
-		}
-		else {
-		    $end=-s "$curtmpdir/audio.bak";
-		    $end/=$arate*$achans*$asamps/8;
-		    $start=0.;
-		    if ($with_audio<2) {
-			$where/=$fps;
-		    }
-		}
-		&insert_audio($asamps,$achans,$asigned,$aendian,$undo_cut);
-		if (&rc_get("conserve_space") eq "true") {
-		    unlink "audio.bak";
-		}
-		if ($panic) {
-		    unlink "$pidfile"; 
-		    exit 1;
-		}
-	    }
-	}
-
-	if ($undo_cut) {
-	    &clean_old;
-	}
-
-	&sig_complete;
-	exit 0;
-    }
-
-	if ($command eq "undo_insert") {
-	    #clean up after an interrupted insert
-	    $start=$ARGV[2];
-	    $end=$ARGV[3];
-	    $frames=$ARGV[4];
-	    $img_ext=".".$ARGV[5];
-
-	    # move extra frames back to end
-	    smog_system_sync();
-	    &undo_insert;
-
-	    $end=$frames;
-	    &undo(1);  # will abort on failure
-	    &undo_audio;  # will abort on failure
-	    &sig_complete;
-	    exit 0;
-	}
-
-
-    # effects
-
-	if (substr($command,0,10) eq "pfxrender_") {
-	    #fx preview
-	    $fx_prev=1;
-	    $command=substr($command,1);
-	    $out_ext=".pre";
-	}
-
-	if (substr($command,0,9) eq "fxrender_") {
-
-	    smog_chdir("$curtmpdir");
-	    unlink "$curtmpdir/pause";
-	    $command=substr($command,9);
-	    $status=$ARGV[2];
-	    $start=$ARGV[3];
-	    $end=$ARGV[4];
-	    $nwidth=$width=$ARGV[5];
-	    $nheight=$height=$ARGV[6];
-
-	    $img_ext=".".$ARGV[7];
-	    $img_prefix=&get_img_prefix($img_ext);
-	    splice(@ARGV,7,1);
-	    
-
-	    $convert_command=$smog_convert_command;
-	    $composite_command=$smog_composite_command;
-
-	    # call render plugins in plugins/effects/rendered/$command
-
-	    unless (defined($fx_prev)) {
-		$out_ext=".mgk";
-		$out_prefix=$img_prefix;
-		&clean_old;
-	    }
-	    if ($status==0) {
-		$plugin_name="$command";
-	    }
-	    elsif ($status==1) {
-		$plugin_dir="$lives_home_dir/plugins/effects/rendered/custom";
-		$plugin_name="$plugin_dir/$command";
-	    }
-	    else {
-		$plugin_dir="$lives_home_dir/plugins/effects/rendered/test";
-		$plugin_name="$plugin_dir/$command";
-	    }
-	    if ($^O eq "MSWin32") {
-		# adjust depending on file ext
-		my $ext=&get_ext("$plugin_name");
-		if ($ext eq ".py") {
-		    $cmd="python";
-		}
-		else {
-		    $cmd="perl";
-		}
-		$smcom="$cmd \"$plugin_name\" get_description";
-	    }
-	    else {
-		$smcom="\"$plugin_name\" get_description";
-	    }
-	    $fx_desc=smog_system_direct($smcom);
-	    if ($?) {
-		sig_system_error($smcom,$?);
-		unlink $pidfile;
-		exit 1;
-	    }
-	    $num_in_channels=(split(/\|/,$fx_desc))[3];
-	    
-	    if ($num_in_channels==0) {
-		# generators get the out_extension
-		$out_ext=$img_ext;
-		$out_prefix=&get_img_prefix($img_ext);
-	    }
-
-	    if ($num_in_channels==2) {
-		# transitions get some extra params
-		$img_ext2=".".$ARGV[8];
-		$img_prefix2=&get_img_prefix($img_ext2);
-		splice(@ARGV,7,1);
-		$start2=$ARGV[9];
-		$clipboard=$ARGV[10];
-	    }
-
-	    $fps=0;
-
-	    if ($^O eq "MSWin32") {
-		# adjust depending on file ext
-		my $ext=&get_ext("$plugin_name");
-		if ($ext eq ".py") {
-		    $cmd="python";
-		}
-		else {
-		    $cmd="perl";
-		}
-		$fx_caps=smog_system_direct("$cmd \"$plugin_name\" get_capabilities");
-	    }
-	    else {
-		$fx_caps=smog_system_direct("\"$plugin_name\" get_capabilities");
-	    }
-	    if ($?) {
-		sig_system_error($smcom,$?);
-		unlink $pidfile;
-		exit 1;
-	    }
-	    if ($fx_caps&0x8000) {
-		# is autogenerated
-		# we are so nice :-), we set: 
-		# $handle,$curtmpdir,$img_ext,$start,$end,$width,$height
-		# and for transitions $where, $chandle
-		# remove fxrender $handle $status start end width height (start2 clipboard)
-		shift; shift; shift; shift; shift; shift;
-		if ($num_in_channels==2) {
-		    shift; shift;
-		}
-
-		if ($^O eq "MSWin32") {
-		    push @INC,"$plugin_dir";
-		}
-
-		$ARGV[0]="process";
-		if ($status>1) {
-		    $error="";
-		    if ($^O eq "MSWin32") {
-			unless (eval "require (\"$command\")") {
-			    $error=$@;
-			}
-		    }
-		    else {
-			unless (eval "require (\"$plugin_name\")") {
-			    $error=$@;
-			}
-		    }
-		    unless ($error eq "") {
-			&sig_error("$plugin_name failed:","$error");
-		    }
-		}
-		else {
-		    if ($^O eq "MSWin32") {
-			require("$command");
-		    }
-		    else {
-			require("$plugin_name");
-		    }
-		}
-		if ($num_in_channels>0) {
-		    unless (defined($fx_prev)) {
-			&mv_mgk;
-			if ($panic) {
-			    unlink "$pidfile"; 
-			    exit 1;
-			}
-		    }
-		}
-		else {
-		    $frames=&count_frames;
-		}
-		&sig_complete($nwidth,$nheight,$fps,$frames);
-		exit 0;
-	    }
-	    else {
-		# other (non-perl) language
-		shift; shift; shift; #remove "fxrender_.." and $handle $status
-		my ($res_file)="$curtmpdir/.rfx_result";
-
-		my $err;
-
-		#img_ext is also in ARGV, but never mind
-
-		if ($num_in_channels==2) {
-		    if ($^O eq "MSWin32") {
-			# adjust depending on file ext
-			my $ext=&get_ext("$plugin_name");
-			if ($ext eq ".py") {
-			    $cmd="python";
-			}
-			else {
-			    $cmd="perl";
-			}
-			$err=smog_system("$cmd \"$plugin_name\" process \"$curtmpdir\" $img_ext $img_ext2 $out_ext @ARGV > \"$res_file\"");
-		    }
-		    else {
-			$err=smog_system("\"$plugin_name\" process \"$curtmpdir\" $img_ext $img_ext2 $out_ext @ARGV > \"$res_file\"");
-		    }
-		}
-		elsif ($num_in_channels==1) {
-		    if ($^O eq "MSWin32") {
-			# adjust depending on file ext
-			my $ext=&get_ext("$plugin_name");
-			if ($ext eq ".py") {
-			    $cmd="python";
-			}
-			else {
-			    $cmd="perl";
-			}
-			$err=smog_system("$cmd \"$plugin_name\" process \"$curtmpdir\" $img_ext $out_ext @ARGV > \"$res_file\"");
-		    }
-		    else {
-			$err=smog_system("\"$plugin_name\" process \"$curtmpdir\" $img_ext $out_ext @ARGV > \"$res_file\"");
-		    }
-		}
-		else {
-		    if ($^O eq "MSWin32") {
-			# adjust depending on file ext
-			my $ext=&get_ext("$plugin_name");
-			if ($ext eq ".py") {
-			    $cmd="python";
-			}
-			else {
-			    $cmd="perl";
-			}
-			$err=smog_system("$cmd \"$plugin_name\" process \"$curtmpdir\" $out_ext @ARGV > \"$res_file\"");
-		    }
-		    else {
-			$err=smog_system("\"$plugin_name\" process \"$curtmpdir\" $out_ext @ARGV > \"$res_file\"");
-		    }
-		}
-		if (!$err) {
-		    if (defined(open IN,"< $res_file")) {
-			read IN,$size,128;
-			($nwidth,$nheight)=split(" ",$size);
-			close IN;
-			unlink "$res_file";
-		    }
-		}
-		else {
-		    my (@err)="";
-		    if (defined(open IN,"< $res_file")) {
-			read IN,$errt,512;
-			@err=split("\n",$errt);
-			close IN;
-			unlink "$res_file";
-		    }
-		    &sig_error(@err);
-		    exit 1;
-		}
-		unless (defined($fx_prev)) {
-		    &mv_mgk;
-		    if ($panic) {
-			unlink "$pidfile"; 
-			exit 1;
-		    }
-		}
-		&sig_complete($nwidth,$nheight);
-		exit 0;
-	    }
-	}
-
-
-	if ($command eq "import_project") {
-	    $proj_file=$ARGV[2];
-	    smog_chdir("$tmpdir");
-	    umask 0;
-	    $com="tar --no-same-owner -xzf \"$proj_file\"";
-	    $smerr=smog_system($com);
-	    if ($smerr) {
-		sig_system_error("$com",$smerr);
-		unlink "$pidfile"; 
-		exit 1;
-	    }
-	    &sig_complete;
-	    exit 0;
-	}
-
-	if ($command eq "export_project") {
-	    my $set=$ARGV[2];
-	    my $proj_file=$ARGV[3];
-	    smog_chdir("$tmpdir");
-	    $com="tar --exclude=*.bak --exclude=.pid* --exclude .status* --exclude=lock.* --exclude=*.mgk --exclude=*.tmp --exclude=audioclip* -czf \"$proj_file\" $set";
-	    $smerr=smog_system($com);
-	    if ($smerr) {
-		sig_system_error("$com",$smerr);
-		unlink "$pidfile"; 
-		exit 1;
-	    };
-
-
-	    &sig_complete;
-	    exit 0;
-	}
-
-	if ($command eq "bg_weed") {
-	    my $opts=$ARGV[2];
-	    my $bytes_cleaned=&weed($opts);
-	    &sig_complete($bytes_cleaned);
-	    exit 0;
-	}
-
-	if (!caller) {
-	    print STDERR "smogrify: unrecognised command $command\n";
-	    unlink "$pidfile";
-	    exit 1;
-	}
+        if ($undo_cut) {
+            &clean_old;
+        }
+
+        &sig_complete;
+        exit 0;
     }
-    return 1;
-    exit 99; # just in case
+
+    if ($command eq "undo_insert") {
+#clean up after an interrupted insert
+        $start=$ARGV[2];
+        $end=$ARGV[3];
+        $frames=$ARGV[4];
+        $img_ext=".".$ARGV[5];
+
+# move extra frames back to end
+        smog_system_sync();
+        &undo_insert;
+
+        $end=$frames;
+        &undo(1);
+# will abort on failure
+        &undo_audio;
+# will abort on failure
+        &sig_complete;
+        exit 0;
+    }
+
+
+# effects
+
+    if (substr($command,0,10) eq "pfxrender_") {
+#fx preview
+        $fx_prev=1;
+        $command=substr($command,1);
+        $out_ext=".pre";
+    }
+
+    if (substr($command,0,9) eq "fxrender_") {
+
+        smog_chdir("$curtmpdir");
+        unlink "$curtmpdir/pause";
+        $command=substr($command,9);
+        $status=$ARGV[2];
+        $start=$ARGV[3];
+        $end=$ARGV[4];
+        $nwidth=$width=$ARGV[5];
+        $nheight=$height=$ARGV[6];
+
+        $img_ext=".".$ARGV[7];
+        $img_prefix=&get_img_prefix($img_ext);
+        splice(@ARGV,7,1);
+
+
+        $convert_command=$smog_convert_command;
+        $composite_command=$smog_composite_command;
+
+# call render plugins in plugins/effects/rendered/$command
+
+        unless(defined($fx_prev)) {
+            $out_ext=".mgk";
+            $out_prefix=$img_prefix;
+            &clean_old;
+        }
+        if ($status==0) {
+            $plugin_name="$command";
+        }
+        elsif($status==1) {
+            $plugin_dir="$lives_home_dir/plugins/effects/rendered/custom";
+            $plugin_name="$plugin_dir/$command";
+        }
+        else {
+            $plugin_dir="$lives_home_dir/plugins/effects/rendered/test";
+            $plugin_name="$plugin_dir/$command";
+        }
+        if ($^O eq "MSWin32") {
+# adjust depending on file ext
+            my $ext=&get_ext("$plugin_name");
+            if ($ext eq ".py") {
+                $cmd="python";
+            } else {
+                $cmd="perl";
+            }
+            $smcom="$cmd \"$plugin_name\" get_description";
+        } else {
+            $smcom="\"$plugin_name\" get_description";
+        }
+        $fx_desc=smog_system_direct($smcom);
+        if ($?) {
+            sig_system_error($smcom,$?);
+            unlink $pidfile;
+            exit 1;
+        }
+        $num_in_channels=(split(/\|/,$fx_desc))[3];
+
+        if ($num_in_channels==0) {
+# generators get the out_extension
+            $out_ext=$img_ext;
+            $out_prefix=&get_img_prefix($img_ext);
+        }
+
+        if ($num_in_channels==2) {
+# transitions get some extra params
+            $img_ext2=".".$ARGV[8];
+            $img_prefix2=&get_img_prefix($img_ext2);
+            splice(@ARGV,7,1);
+            $start2=$ARGV[9];
+            $clipboard=$ARGV[10];
+        }
+
+        $fps=0;
+
+        if ($^O eq "MSWin32") {
+# adjust depending on file ext
+            my $ext=&get_ext("$plugin_name");
+            if ($ext eq ".py") {
+                $cmd="python";
+            } else {
+                $cmd="perl";
+            }
+            $fx_caps=smog_system_direct("$cmd \"$plugin_name\" get_capabilities");
+        } else {
+            $fx_caps=smog_system_direct("\"$plugin_name\" get_capabilities");
+        }
+        if ($?) {
+            sig_system_error($smcom,$?);
+            unlink $pidfile;
+            exit 1;
+        }
+        if ($fx_caps&0x8000) {
+# is autogenerated
+# we are so nice :-), we set:
+# $handle,$curtmpdir,$img_ext,$start,$end,$width,$height
+# and for transitions $where, $chandle
+# remove fxrender $handle $status start end width height (start2 clipboard)
+            shift;
+            shift;
+            shift;
+            shift;
+            shift;
+            shift;
+            if ($num_in_channels==2) {
+                shift;
+                shift;
+            }
+
+            if ($^O eq "MSWin32") {
+                push @INC,"$plugin_dir";
+            }
+
+            $ARGV[0]="process";
+            if ($status>1) {
+                $error="";
+                if ($^O eq "MSWin32") {
+                    unless(eval "require (\"$command\")") {
+                        $error=$@;
+                    }
+                } else {
+                    unless(eval "require (\"$plugin_name\")") {
+                        $error=$@;
+                    }
+                }
+                unless($error eq "") {
+                    &sig_error("$plugin_name failed:","$error");
+                }
+            } else {
+                if ($^O eq "MSWin32") {
+                    require("$command");
+                } else {
+                    require("$plugin_name");
+                }
+            }
+            if ($num_in_channels>0) {
+                unless(defined($fx_prev)) {
+                    &mv_mgk;
+                    if ($panic) {
+                        unlink "$pidfile";
+                        exit 1;
+                    }
+                }
+            } else {
+                $frames=&count_frames;
+            }
+            &sig_complete($nwidth,$nheight,$fps,$frames);
+            exit 0;
+        } else {
+# other (non-perl) language
+            shift;
+            shift;
+            shift;
+#remove "fxrender_.." and $handle $status
+            my($res_file)="$curtmpdir/.rfx_result";
+
+            my $err;
+
+#img_ext is also in ARGV, but never mind
+
+            if ($num_in_channels==2) {
+                if ($^O eq "MSWin32") {
+# adjust depending on file ext
+                    my $ext=&get_ext("$plugin_name");
+                    if ($ext eq ".py") {
+                        $cmd="python";
+                    } else {
+                        $cmd="perl";
+                    }
+                    $err=smog_system("$cmd \"$plugin_name\" process \"$curtmpdir\" $img_ext $img_ext2 $out_ext @ARGV > \"$res_file\"");
+                } else {
+                    $err=smog_system("\"$plugin_name\" process \"$curtmpdir\" $img_ext $img_ext2 $out_ext @ARGV > \"$res_file\"");
+                }
+            }
+            elsif($num_in_channels==1) {
+                if ($^O eq "MSWin32") {
+# adjust depending on file ext
+                    my $ext=&get_ext("$plugin_name");
+                    if ($ext eq ".py") {
+                        $cmd="python";
+                    } else {
+                        $cmd="perl";
+                    }
+                    $err=smog_system("$cmd \"$plugin_name\" process \"$curtmpdir\" $img_ext $out_ext @ARGV > \"$res_file\"");
+                } else {
+                    $err=smog_system("\"$plugin_name\" process \"$curtmpdir\" $img_ext $out_ext @ARGV > \"$res_file\"");
+                }
+            }
+            else {
+                if ($^O eq "MSWin32") {
+# adjust depending on file ext
+                    my $ext=&get_ext("$plugin_name");
+                    if ($ext eq ".py") {
+                        $cmd="python";
+                    } else {
+                        $cmd="perl";
+                    }
+                    $err=smog_system("$cmd \"$plugin_name\" process \"$curtmpdir\" $out_ext @ARGV > \"$res_file\"");
+                } else {
+                    $err=smog_system("\"$plugin_name\" process \"$curtmpdir\" $out_ext @ARGV > \"$res_file\"");
+                }
+            }
+            if (!$err) {
+                if (defined(open IN,"< $res_file")) {
+                    read IN,$size,128;
+                    ($nwidth,$nheight)=split(" ",$size);
+                    close IN;
+                    unlink "$res_file";
+                }
+            } else {
+                my(@err)="";
+                if (defined(open IN,"< $res_file")) {
+                    read IN,$errt,512;
+                    @err=split("\n",$errt);
+                    close IN;
+                    unlink "$res_file";
+                }
+                &sig_error(@err);
+                exit 1;
+            }
+            unless(defined($fx_prev)) {
+                &mv_mgk;
+                if ($panic) {
+                    unlink "$pidfile";
+                    exit 1;
+                }
+            }
+            &sig_complete($nwidth,$nheight);
+            exit 0;
+        }
+    }
+
+
+    if ($command eq "import_project") {
+        $proj_file=$ARGV[2];
+        smog_chdir("$tmpdir");
+        umask 0;
+        $com="tar --no-same-owner -xzf \"$proj_file\"";
+        $smerr=smog_system($com);
+        if ($smerr) {
+            sig_system_error("$com",$smerr);
+            unlink "$pidfile";
+            exit 1;
+        }
+        &sig_complete;
+        exit 0;
+    }
+
+    if ($command eq "export_project") {
+        my $set=$ARGV[2];
+        my $proj_file=$ARGV[3];
+        smog_chdir("$tmpdir");
+        $com="tar --exclude=*.bak --exclude=.pid* --exclude .status* --exclude=lock.* --exclude=*.mgk --exclude=*.tmp --exclude=audioclip* -czf \"$proj_file\" $set";
+        $smerr=smog_system($com);
+        if ($smerr) {
+            sig_system_error("$com",$smerr);
+            unlink "$pidfile";
+            exit 1;
+        };
+
+
+        &sig_complete;
+        exit 0;
+    }
+
+    if ($command eq "bg_weed") {
+        my $opts=$ARGV[2];
+        my $bytes_cleaned=&weed($opts);
+        &sig_complete($bytes_cleaned);
+        exit 0;
+    }
+
+    if (!caller) {
+        print STDERR "smogrify: unrecognised command $command\n";
+        unlink "$pidfile";
+        exit 1;
+    }
+}
+return 1;
+exit 99;
+# just in case
 }
 
 
@@ -4119,7 +4078,7 @@
 
 
 ######################################################
-    
+
 #subroutines
 
 
@@ -4129,25 +4088,25 @@
 }
 
 sub mkname {
-    my ($num)=shift;
+    my($num)=shift;
     $ret=sprintf("%08d",$num);
     $ret;
 }
 
 sub check_for_pause {
     if (-f "$curtmpdir/pause") {
-	smog_system_sync();
+        smog_system_sync();
     }
     while (-f "$curtmpdir/pause") {
-	sleep 1;
+        sleep 1;
     }
 }
 
 
 sub check_for_stop {
     if (defined(open IN,"< $curtmpdir/.status.fileop")) {
-	close IN;
-	return 1;
+        close IN;
+        return 1;
     }
     return 0;
 }
@@ -4155,58 +4114,59 @@
 
 
 sub kill_child_pids {
-    my ($target_pid,$sig)=@_;
+    my($target_pid,$sig)=@_;
     my $pid;
     smog_system("pgrep -P $target_pid > \"$tmpdir/.pids.$target_pid\" 2>/dev/null");
 
     if ($sig eq "KILL") {
-	smog_system("kill -$sig $target_pid >/dev/null 2>&1");
-    }
-    else {
-	smog_system("pkill -$sig -P $target_pid");# must not ! >/dev/null 2>&1");
+        smog_system("kill -$sig $target_pid >/dev/null 2>&1");
+    } else {
+        smog_system("pkill -$sig -P $target_pid");
+# must not ! >/dev/null 2>&1");
     }
 
     if (-s "$tmpdir/.pids.$target_pid"&&defined(open IN,"$tmpdir/.pids.$target_pid")) {
-	while (<IN>) {
-	    $pid=$_;
-	    chomp($pid);
-	    &kill_child_pids($pid,$sig);
-	}
-	close IN;
+        while (<IN>) {
+            $pid=$_;
+            chomp($pid);
+            &kill_child_pids($pid,$sig);
+        }
+        close IN;
     }
 
     unlink "$tmpdir/.pids.$target_pid";
 }
 
 sub is_writeable {
-    # see if is writable or creatable
-    # but do not actually create the file
+# see if is writable or creatable
+# but do not actually create the file
     my $file=shift;
     if (! -s $nfile) {
-	unlink "$nfile";
+        unlink "$nfile";
     }
     $exists=(-f "$nfile");
     if (!$exists) {
-	umask 0;
-	if ($^O eq "MSWin32") {
-	    $ret=smog_system("touch.exe \"$nfile\"");
-	}
-	else {
-	    $ret=smog_system("touch \"$nfile\"");
-	}
-	if ($ret) {return !$ret;}
-	if ($^O eq "MSWin32") {
-	    smog_system("chmod.exe o+w \"$nfile\"");
-	}
-	else {
-	    smog_system("/bin/chmod o+w \"$nfile\"");
-	}
-	umask $umask;
+        umask 0;
+        if ($^O eq "MSWin32") {
+            $ret=smog_system("touch.exe \"$nfile\"");
+        }
+        else {
+            $ret=smog_system("touch \"$nfile\"");
+        }
+        if ($ret) {
+            return !$ret;
+        }
+        if ($^O eq "MSWin32") {
+            smog_system("chmod.exe o+w \"$nfile\"");
+        } else {
+            smog_system("/bin/chmod o+w \"$nfile\"");
+        }
+        umask $umask;
     }
     smog_system_sync();
     $ret=(-w "$nfile");
     if (!$exists) {
-	unlink "$nfile";
+        unlink "$nfile";
     }
     return $ret;
 }
@@ -4218,29 +4178,29 @@
     my $imgno=shift;
 
     if ($imgno eq "") {
-	$imgno=1;
+        $imgno=1;
     }
 
     my $tfile=&mkname($imgno);
 
     if (-f "$ckdir/$tfile.png") {
-	return ".png";
+        return ".png";
     }
 
     unless(-f "$ckdir/$tfile.jpg") {
-	print STDERR "Warning ! command $command needs to set image type !! Please report this as a bug.\n";
-	print STDERR "details: $ckdir/$tfile.jpg not found\n";
+        print STDERR "Warning ! command $command needs to set image type !! Please report this as a bug.\n";
+        print STDERR "details: $ckdir/$tfile.jpg not found\n";
     }
 
     return ".jpg";
 }
-    
+
 
 sub get_img_prefix {
     my $imgext=shift;
 
     if ($imgext eq ".png") {
-	return "PNG32:";
+        return "PNG32:";
     }
 
     return "";
@@ -4250,19 +4210,19 @@
 
 
 sub try_to_recover {
-    #something failed badly during processing
-    # attempt to recover clip from backup images
+#something failed badly during processing
+# attempt to recover clip from backup images
 
-    my ($smstart,$smend)=@_;
+    my($smstart,$smend)=@_;
     if ($DEBUG_SMOGRIFY) {
-	print STDERR "Beginning clip recovery process for $curtmpdir\n";
+        print STDERR "Beginning clip recovery process for $curtmpdir\n";
     }
-    for ($i=$smstart;$i<=$smend;$i++) {
-	$name&mkname($i);
-	smog_rename("$name.bak","$name$img_ext");
+    for ($i=$smstart; $i<=$smend; $i++) {
+        $name &mkname($i);
+        smog_rename("$name.bak","$name$img_ext");
     }
     if ($DEBUG_SMOGRIFY) {
-	print STDERR "Clip recovery process succeeded for $curtmpdir\n";
+        print STDERR "Clip recovery process succeeded for $curtmpdir\n";
     }
 }
 
@@ -4273,54 +4233,54 @@
 
 
 sub mv_mgk {
-    # pass in first param as 1 to show progress of frames
-    # new files are .mgk files, back up old files to .bak
+# pass in first param as 1 to show progress of frames
+# new files are .mgk files, back up old files to .bak
 
-    my ($option)=shift;
-    my ($i,$name);
+    my($option)=shift;
+    my($i,$name);
 
-    unless (!defined($pidfile)||$pidfile eq "") {
-	# don't want to get killed in this stage...
-	unlink "$pidfile";
+    unless(!defined($pidfile)||$pidfile eq "") {
+# don't want to get killed in this stage...
+        unlink "$pidfile";
     }
 
 
     for ($i=$start;$i<=$end;$i++) {
-	$name=&mkname($i);
-	if (-f "$curtmpdir/$name.mgk") {
-	    if (-f "$curtmpdir/$name$img_ext") {
-		if ($leave_bak==1&&-f "$curtmpdir/$name.bak") {
-		    unlink "$curtmpdir/$name$img_ext";
-		}
-		else {
-		    $smres=rename "$curtmpdir/$name$img_ext","$curtmpdir/$name.bak";
-		    if (!$smres) {
-			try_to_recover($start,$i-1);
-			if ($DEBUG_SMOGRIFY) {
-			    print STDERR "smogrify debug - rename failed ($!): \"$curtmpdir/$name$img_ext\",\"$curtmpdir/$name.bak\"\n";
-			}
-			sig_system_error("Renaming \"$curtmpdir/$name$img_ext\" to \"$curtmpdir/$name.bak\"");
-			unlink $pidfile;
-			exit 1;
-		    }
-		}
-	    }
-	    $smerr=rename( "$curtmpdir/$name.mgk","$curtmpdir/$name$img_ext");
-	    if (!$smerr) {
-		try_to_recover($start,$i);
-		if ($DEBUG_SMOGRIFY) {
-		    print STDERR "smogrify debug - rename failed ($!): \"$curtmpdir/$name.mgk\",\"$curtmpdir/$name$img_ext\"\n";
-		}
-		sig_system_error("Renaming \"$curtmpdir/$name.mgk\" to \"$curtmpdir/$name$img_ext\"");
-		unlink $pidfile;
-		exit 1;
-	    }
-	}
-	if ($option==1) {
-	    &sig_progress($i);
-	}
+        $name=&mkname($i);
+        if (-f "$curtmpdir/$name.mgk") {
+            if (-f "$curtmpdir/$name$img_ext") {
+                if ($leave_bak==1&&-f "$curtmpdir/$name.bak") {
+                    unlink "$curtmpdir/$name$img_ext";
+                }
+                else {
+                    $smres=rename "$curtmpdir/$name$img_ext","$curtmpdir/$name.bak";
+                    if (!$smres) {
+                        try_to_recover($start,$i-1);
+                        if ($DEBUG_SMOGRIFY) {
+                            print STDERR "smogrify debug - rename failed ($!): \"$curtmpdir/$name$img_ext\",\"$curtmpdir/$name.bak\"\n";
+                        }
+                        sig_system_error("Renaming \"$curtmpdir/$name$img_ext\" to \"$curtmpdir/$name.bak\"");
+                        unlink $pidfile;
+                        exit 1;
+                    }
+                }
+            }
+            $smerr=rename( "$curtmpdir/$name.mgk","$curtmpdir/$name$img_ext");
+            if (!$smerr) {
+                try_to_recover($start,$i);
+                if ($DEBUG_SMOGRIFY) {
+                    print STDERR "smogrify debug - rename failed ($!): \"$curtmpdir/$name.mgk\",\"$curtmpdir/$name$img_ext\"\n";
+                }
+                sig_system_error("Renaming \"$curtmpdir/$name.mgk\" to \"$curtmpdir/$name$img_ext\"");
+                unlink $pidfile;
+                exit 1;
+            }
+        }
+        if ($option==1) {
+            &sig_progress($i);
+        }
     }
-    
+
     &sig_pid();
     smog_system_sync();
 }
@@ -4328,44 +4288,44 @@
 
 
 sub mv_pre {
-    # new files are .pre files, back up old files to .bak
+# new files are .pre files, back up old files to .bak
     my ($i,$name);
 
     unless (!defined($pidfile)||$pidfile eq "") {
-	# don't want to get killed in this stage...
-	unlink "$pidfile";
+# don't want to get killed in this stage...
+        unlink "$pidfile";
     }
 
     smog_chdir("$curtmpdir");
     unlink glob "*.mgk";
 
-    for ($i=$start;$i<=$end;$i++) {
-	$name=&mkname($i);
-	if (-f "$curtmpdir/$name.pre") {
-	    if (-f "$curtmpdir/$name$img_ext") {
-		unlink "$curtmpdir/$name.bak";
-		$smerr=rename( "$curtmpdir/$name$img_ext","$curtmpdir/$name.bak");
-		if (!$smerr) {
-		    try_to_recover($start,$i-1);
-		    if ($DEBUG_SMOGRIFY) {
-			print STDERR "smogrify debug - rename failed ($!): \"$curtmpdir/$name$img_ext\",\"$curtmpdir/$name.bak\"\n";
-		    }
-		    sig_system_error("Renaming \"$curtmpdir/$name$img_ext\" to \"$curtmpdir/$name.bak\"");
-		    unlink "$pidfile";
-		    exit 1;
-		}
-	    }
-	    $smerr=rename "$curtmpdir/$name.pre","$curtmpdir/$name$img_ext";
-	    if (!$smerr) {
-		try_to_recover($start,$i);
-		if ($DEBUG_SMOGRIFY) {
-		    print STDERR "smogrify debug - rename failed ($!): \"$curtmpdir/$name.pre\",\"$curtmpdir/$name$img_ext\"\n";
-		}
-		sig_system_error("Renaming \"$curtmpdir/$name.pre\" to \"$curtmpdir/$name$img_ext\"");
-		unlink "$pidfile";
-		exit 1;
-	    }
-	}
+    for ($i=$start; $i<=$end; $i++) {
+        $name=&mkname($i);
+        if (-f "$curtmpdir/$name.pre") {
+            if (-f "$curtmpdir/$name$img_ext") {
+                unlink "$curtmpdir/$name.bak";
+                $smerr=rename("$curtmpdir/$name$img_ext","$curtmpdir/$name.bak");
+                if (!$smerr) {
+                    try_to_recover($start,$i-1);
+                    if ($DEBUG_SMOGRIFY) {
+                        print STDERR "smogrify debug - rename failed ($!): \"$curtmpdir/$name$img_ext\",\"$curtmpdir/$name.bak\"\n";
+                    }
+                    sig_system_error("Renaming \"$curtmpdir/$name$img_ext\" to \"$curtmpdir/$name.bak\"");
+                    unlink "$pidfile";
+                    exit 1;
+                }
+            }
+            $smerr=rename "$curtmpdir/$name.pre","$curtmpdir/$name$img_ext";
+            if (!$smerr) {
+                try_to_recover($start,$i);
+                if ($DEBUG_SMOGRIFY) {
+                    print STDERR "smogrify debug - rename failed ($!): \"$curtmpdir/$name.pre\",\"$curtmpdir/$name$img_ext\"\n";
+                }
+                sig_system_error("Renaming \"$curtmpdir/$name.pre\" to \"$curtmpdir/$name$img_ext\"");
+                unlink "$pidfile";
+                exit 1;
+            }
+        }
     }
     &sig_pid();
     smog_system_sync();
@@ -4373,73 +4333,73 @@
 
 
 sub undo {
-    # recover .bak files; if param==0 or undefined, move current files to .mgk files
-    my ($param)=shift;
+# recover .bak files; if param==0 or undefined, move current files to .mgk files
+    my($param)=shift;
     if ($param eq "") {
-	$param=0;
+        $param=0;
     }
 
-    my ($i,$name);
-    for ($i=$start;$i<=$end;$i++) {
-	$name=&mkname($i);
-	if (-f "$curtmpdir/$name.bak") {
-	    if ($param==0) {
-		smog_rename( "$curtmpdir/$name$img_ext","$curtmpdir/$name.mgk");
-	    }
-	    smog_rename( "$curtmpdir/$name.bak","$curtmpdir/$name$img_ext");
-	}
-	&sig_progress($i);
+    my($i,$name);
+    for ($i=$start; $i<=$end; $i++) {
+        $name=&mkname($i);
+        if (-f "$curtmpdir/$name.bak") {
+            if ($param==0) {
+                smog_rename("$curtmpdir/$name$img_ext","$curtmpdir/$name.mgk");
+            }
+            smog_rename("$curtmpdir/$name.bak","$curtmpdir/$name$img_ext");
+        }
+        &sig_progress($i);
     }
 }
 
 
 sub undo_audio {
     if (-f "$curtmpdir/audio.orig") {
-	unlink "$curtmpdir/audio";
-	smog_rename( "$curtmpdir/audio.orig","$curtmpdir/audio");
-	unlink "$curtmpdir/audio.bak";
-    }
-    else {
-	unlink "$curtmpdir/audio.new";
-	if (-f "$curtmpdir/audio") {
-	    smog_rename( "$curtmpdir/audio","$curtmpdir/audio.new");
-	}
-	if (-f "$curtmpdir/audio.bak") {
-	    smog_rename( "$curtmpdir/audio.bak","$curtmpdir/audio");
-	}
-	if (-f "$curtmpdir/audio.new") {
-	    smog_rename( "$curtmpdir/audio.new","$curtmpdir/audio.bak");
-	}
+        unlink "$curtmpdir/audio";
+        smog_rename("$curtmpdir/audio.orig","$curtmpdir/audio");
+        unlink "$curtmpdir/audio.bak";
+    } else {
+        unlink "$curtmpdir/audio.new";
+        if (-f "$curtmpdir/audio") {
+            smog_rename("$curtmpdir/audio","$curtmpdir/audio.new");
+        }
+        if (-f "$curtmpdir/audio.bak") {
+            smog_rename("$curtmpdir/audio.bak","$curtmpdir/audio");
+        }
+        if (-f "$curtmpdir/audio.new") {
+            smog_rename("$curtmpdir/audio.new","$curtmpdir/audio.bak");
+        }
     }
 }
 
 
 sub backup_audio {
     &clean_old;
-    smog_copy("$curtmpdir/audio", "$curtmpdir/audio.bak"); # may set $panic
+    smog_copy("$curtmpdir/audio", "$curtmpdir/audio.bak");
+# may set $panic
 }
 
 sub cut {
-    my ($start,$end)=@_;
-    my ($i,$name);
+    my($start,$end)=@_;
+    my($i,$name);
     smog_chdir("$curtmpdir");
     $frames_cut=$end-$start+1;
 
-    for ($i=$start;$i<=$end;$i++) {
-	$name=&mkname($i);
-	if (-f "$name$img_ext") {
-	    smog_rename( "$name$img_ext","$name.bak");
-	}
-	&sig_progress($i);
+    for ($i=$start; $i<=$end; $i++) {
+        $name=&mkname($i);
+        if (-f "$name$img_ext") {
+            smog_rename("$name$img_ext","$name.bak");
+        }
+        &sig_progress($i);
     }
 
-    for ($i=$end+1;$i<=$frames;$i++) {
-	$from=&mkname($i);
-	$to=&mkname($i-$frames_cut);
-	if (-f "$curtmpdir/$from$img_ext") {
-	    smog_rename( "$curtmpdir/$from$img_ext","$curtmpdir/$to$img_ext");
-	}
-	&sig_progress($i);
+    for ($i=$end+1; $i<=$frames; $i++) {
+        $from=&mkname($i);
+        $to=&mkname($i-$frames_cut);
+        if (-f "$curtmpdir/$from$img_ext") {
+            smog_rename("$curtmpdir/$from$img_ext","$curtmpdir/$to$img_ext");
+        }
+        &sig_progress($i);
     }
 }
 
@@ -4447,31 +4407,29 @@
 
 
 sub reverse {
-    for ($i=$start;$i<int(($start+$end)/2+.5);$i++) {
-	$from=&mkname($i);
-	$to=&mkname($end-$i+1);
-	$hasfrom=-f "$curtmpdir/$from$img_ext";
-	$hasto=-f "$curtmpdir/$to$img_ext";
-	if ($hasfrom) {
-	    if ($hasto) {
-		smog_rename( "$curtmpdir/$from$img_ext","$curtmpdir/$from.revtemp");
-		smog_rename( "$curtmpdir/$to$img_ext","$curtmpdir/$from$img_ext");
-	    }
-	    &sig_progress($start+($i-$start)*2);
-	    if ($hasto) {
-		smog_rename( "$curtmpdir/$from.revtemp","$curtmpdir/$to$img_ext");
-	    }
-	    else {
-		smog_rename( "$curtmpdir/$from$img_ext","$curtmpdir/$to$img_ext");
-	    }
-	}
-	else {
-	    &sig_progress($start+($i-$start)*2);
-	    if ($hasto) {
-		smog_rename( "$curtmpdir/$to$img_ext","$curtmpdir/$from$img_ext");
-	    }
-	}
-	&sig_progress($start+($i-$start)*2+1);
+    for ($i=$start; $i<int(($start+$end)/2+.5); $i++) {
+        $from=&mkname($i);
+        $to=&mkname($end-$i+1);
+        $hasfrom=-f "$curtmpdir/$from$img_ext";
+        $hasto=-f "$curtmpdir/$to$img_ext";
+        if ($hasfrom) {
+            if ($hasto) {
+                smog_rename("$curtmpdir/$from$img_ext","$curtmpdir/$from.revtemp");
+                smog_rename("$curtmpdir/$to$img_ext","$curtmpdir/$from$img_ext");
+            }
+            &sig_progress($start+($i-$start)*2);
+            if ($hasto) {
+                smog_rename("$curtmpdir/$from.revtemp","$curtmpdir/$to$img_ext");
+            } else {
+                smog_rename("$curtmpdir/$from$img_ext","$curtmpdir/$to$img_ext");
+            }
+        } else {
+            &sig_progress($start+($i-$start)*2);
+            if ($hasto) {
+                smog_rename("$curtmpdir/$to$img_ext","$curtmpdir/$from$img_ext");
+            }
+        }
+        &sig_progress($start+($i-$start)*2+1);
     }
 }
 
@@ -4480,14 +4438,14 @@
 sub undo_insert {
     $frames_inserted=$end-$start+1;
 
-    for ($i=$frames+$frames_inserted;$i>$frames;$i--) {
-	# move any shifted frames back
-	$name=&mkname($i);
-	$to=&mkname($i-$frames_inserted);
-	if (-f "$curtmpdir/$name$img_ext") {
-	    unlink "$curtmpdir/$to$img_ext";
-	    smog_rename( "$curtmpdir/$name$img_ext","$curtmpdir/$to$img_ext");
-	}
+    for ($i=$frames+$frames_inserted; $i>$frames; $i--) {
+# move any shifted frames back
+        $name=&mkname($i);
+        $to=&mkname($i-$frames_inserted);
+        if (-f "$curtmpdir/$name$img_ext") {
+            unlink "$curtmpdir/$to$img_ext";
+            smog_rename("$curtmpdir/$name$img_ext","$curtmpdir/$to$img_ext");
+        }
     }
 }
 
@@ -4503,14 +4461,14 @@
 
 
 sub smog_system {
-    my ($smcommand)=@_;
+    my($smcommand)=@_;
     my $smcomret;
 
     $smcomret=system($smcommand);
 
     if ($smcomret && $DEBUG_SMOGRIFY) {
-	print STDERR "smogrify debug: $smcommand\n";
-	print STDERR "smogrify debug - command failed: result was $smcomret\n";
+        print STDERR "smogrify debug: $smcommand\n";
+        print STDERR "smogrify debug - command failed: result was $smcomret\n";
     }
 
     $smcomret;
@@ -4519,15 +4477,15 @@
 
 
 sub smog_system_direct {
-    my ($smcommand)=@_;
+    my($smcommand)=@_;
     my $smcomret;
 
     $smcomret=`$smcommand`;
 
     if ($DEBUG_SMOGRIFY && $? != 0) {
-	print STDERR "smogrify debug: command was $smcommand\n";
-	print STDERR "smogrify debug: result was $smcomret\n";
-	print STDERR "smogrify debug: error was $?\n";
+        print STDERR "smogrify debug: command was $smcommand\n";
+        print STDERR "smogrify debug: result was $smcomret\n";
+        print STDERR "smogrify debug: error was $?\n";
     }
 
     $smcomret;
@@ -4536,271 +4494,265 @@
 
 
 sub smog_rename {
-    # CAUTION: return value of 0 is error here
+# CAUTION: return value of 0 is error here
 
-   my ($smfrom,$smto)=@_;
-   my $smcomret=rename "$smfrom","$smto";
+    my($smfrom,$smto)=@_;
+    my $smcomret=rename "$smfrom","$smto";
 
-   if ($smcomret==0) {
-       if ($DEBUG_SMOGRIFY) {
-	   print STDERR "smogrify debug - rename failed ($!): $smfrom $smto\n";
-       }
-       sig_system_error("Renaming \"$smfrom\" to \"$smto\"",$!);
-       unlink "$pidfile";
-       exit 1;
-   }
+    if ($smcomret==0) {
+        if ($DEBUG_SMOGRIFY) {
+            print STDERR "smogrify debug - rename failed ($!): $smfrom $smto\n";
+        }
+        sig_system_error("Renaming \"$smfrom\" to \"$smto\"",$!);
+        unlink "$pidfile";
+        exit 1;
+    }
 
-   $smcomret;
+    $smcomret;
 
 }
 
 
 
 sub smog_copy {
-   my ($smfrom,$smto)=@_;
-   my $smcomret;
+    my($smfrom,$smto)=@_;
+    my $smcomret;
 
-   if ($^O eq "MSWin32") {
-       $smcomret=system("cp.exe -f \"$smfrom\" \"$smto\"");
-       
-   }
-   else {
-       $smcomret=system("/bin/cp -f \"$smfrom\" \"$smto\"");
-   }
-
-   if ($smcomret!=0 && -f $smfrom) {
-       if ($DEBUG_SMOGRIFY) {
-	   print STDERR "smogrify debug - copy failed ($!): $smfrom $smto\n";
-       }
-       $panic=sig_system_error("Copying $smcomret \"$smfrom\" to \"$smto\"",$!);
-   }
+    if ($^O eq "MSWin32") {
+        $smcomret=system("cp.exe -f \"$smfrom\" \"$smto\"");
 
-   $smcomret;
+    } else {
+        $smcomret=system("/bin/cp -f \"$smfrom\" \"$smto\"");
+    }
+
+    if ($smcomret!=0 && -f $smfrom) {
+        if ($DEBUG_SMOGRIFY) {
+            print STDERR "smogrify debug - copy failed ($!): $smfrom $smto\n";
+        }
+        $panic=sig_system_error("Copying $smcomret \"$smfrom\" to \"$smto\"",$!);
+    }
+
+    $smcomret;
 
 }
 
 
 sub smog_chdir {
-    # CAUTION: return value of 0 is error here
+# CAUTION: return value of 0 is error here
 
-    my ($smdir)=shift;
+    my($smdir)=shift;
 
     $smcomret=chdir "$smdir";
 
     if (!$smcomret) {
-	if ($DEBUG_SMOGRIFY) {
-	    print STDERR "smogrify debug - chdir failed ($!): $smdir\n";
-	}
-
-	sig_system_error("Changing to directory \"$smdir\"",$!);
-	unlink "$pidfile";
-	exit 1;
+        if ($DEBUG_SMOGRIFY) {
+            print STDERR "smogrify debug - chdir failed ($!): $smdir\n";
+        }
+
+        sig_system_error("Changing to directory \"$smdir\"",$!);
+        unlink "$pidfile";
+        exit 1;
     }
 }
 
 sub insert {
-    my ($from,$to,$frames_to_move);
+    my($from,$to,$frames_to_move);
     $times_inserted=0;
     $factor=1;
 
-    my ($nend)=$end;
-    my ($nstart)=$start;
-    my ($nwhere)=$where;
-    my ($nfromdir)=$fromdir;
+    my($nend)=$end;
+    my($nstart)=$start;
+    my($nwhere)=$where;
+    my($nfromdir)=$fromdir;
 
     my $quick_copy=-1;
 
     if (!defined($times)) {
-	$times=1;
+        $times=1;
     }
     if (!defined($undo_cut)) {
-	$undo_cut=0;
+        $undo_cut=0;
     }
 
     if (!defined($img_prefix2)) {
-	$img_prefix2=&get_img_prefix($img_ext2);
+        $img_prefix2=&get_img_prefix($img_ext2);
     }
     if (!defined($img_prefix)) {
-	$img_prefix=&get_img_prefix($img_ext);
+        $img_prefix=&get_img_prefix($img_ext);
     }
 
     $fromdir="$tmpdir/$from_handle";
-    $frames_to_move=($nend-$nstart+1)*$times;
+    $frames_to_move=($nend-$nstart+1) *$times;
 
-    # make space for new frames
-    for ($i=$num_frames;$i>$nwhere;$i--) {
-	$from=&mkname($i);
-	$to=&mkname($i+$frames_to_move);
-	if ($i<=($new_frames-$frames_to_move)&&!$undo_cut&&-f "$curtmpdir/$from$img_ext") {
-	    # this frame will get overwritten, so back it up
-	    smog_copy("$curtmpdir/$from$img_ext", "$curtmpdir/$from.bak");
-	    return if $panic;
-	}
-	if (-f "$curtmpdir/$from$img_ext") {
-	    smog_rename( "$curtmpdir/$from$img_ext","$curtmpdir/$to$img_ext");
-	}
-	&sig_progress($new_frames-$i);
+# make space for new frames
+    for ($i=$num_frames; $i>$nwhere; $i--) {
+        $from=&mkname($i);
+        $to=&mkname($i+$frames_to_move);
+        if ($i<=($new_frames-$frames_to_move)&&!$undo_cut&&-f "$curtmpdir/$from$img_ext") {
+# this frame will get overwritten, so back it up
+            smog_copy("$curtmpdir/$from$img_ext", "$curtmpdir/$from.bak");
+            return if $panic;
+    }
+    if (-f "$curtmpdir/$from$img_ext") {
+            smog_rename("$curtmpdir/$from$img_ext","$curtmpdir/$to$img_ext");
+        }
+        &sig_progress($new_frames-$i);
     }
 
     $resize_ext=$img_ext;
 
     if (!defined($antialias)) {
-	$antialias="false";
+        $antialias="false";
     }
 
 
-    #move from $from_handle
+#move from $from_handle
     $j=$start;
     while ($times_inserted<$times) {
-	for ($i=$nstart;$i<=$nend;$i++) {
-	    $from=&mkname($i);
-	    $to=&mkname($nwhere+$i-$nstart+1);
-
-	    if ($undo_cut==1) {
-		if (-f "$fromdir/$from.bak") {
-		    smog_rename( "$fromdir/$from.bak","$curtmpdir/$to$img_ext");
-		    return if $panic;
-		}
-	    }
-	    else {
-		if (! -f "$fromdir/$from$img_ext2") {
-		    next if ($allow_missing);
-		    while (! -f "$fromdir/$from$img_ext2") {
-			print STDERR "waiting on image $fromdir/$from$img_ext2\n";
-			sleep 1;
-			smog_system_sync();
-		    }
-		}
-		if ($quick_copy==-1) {
-		    $quick_copy=0;
-		    if ($img_ext eq $img_ext2) {
-			if ($height*$width==0) {
-			    $quick_copy=1;
-			}
-			else {
-			    $imresact="none";
-			    &get_image_size("$fromdir/$from$img_ext2");
-			    return if $panic;
-
-			    if ($hsize==$width&&$vsize==$height) {
-				$quick_copy=1;
-			    }
-			}
-		    }
-		}
-
-		if ($quick_copy==1) {
-		    smog_copy("$fromdir/$from$img_ext2","$curtmpdir/$to$img_ext");
-		    return if $panic;
-		}
-		else {
-		    if ($antialias eq "false") {
-			$com="$smog_convert_command +antialias -size $width"."x$height $img_prefix2\"$fromdir/$from$img_ext2\" -scale $width!x$height! $img_prefix\"$curtmpdir/$to$img_ext\" >$nulfile 2>&1";
-			$smerr=smog_system($com);
-			if ($smerr) {
-			    sig_system_error("$com",$smerr);
-			    $panic=1;
-			    return;
-			}
-		    }
-		    else {
-			$com="$smog_convert_command -antialias -size $width"."x$height $img_prefix2\"$fromdir/$from$img_ext2\" -scale $width!x$height! $img_prefix\"$curtmpdir/$to$img_ext\" >$nulfile 2>&1";
-			$smerr=smog_system($com);
-			if ($smerr) {
-			    sig_system_error("$com",$smerr);
-			    $panic=1;
-			    return;
-			}
-		    }
-		}
-		
-	    }
-	    
-	    &sig_progress(int($new_frames-$where+$j++-$start+1));
-	}
-
-	$times_inserted+=$factor;
-	$inserted=$nend-$nstart+1;
-
-	if ($times_inserted==2) {
-	    $nend=$nwhere;
-	    $nstart=$nwhere-$inserted+1;
-	    $fromdir=$curtmpdir;
-	}
-	$nwhere+=$inserted;
-
-	if ($times_inserted>1) {
-	    $nend+=$inserted;
-	    $factor*=2;
-	}
-	while ($times>$times_inserted&&$factor>$times-$times_inserted) {
-	    $nstart+=($nend-$nstart+1)/2;
-	    $factor/=2;
-	}
+        for ($i=$nstart; $i<=$nend; $i++) {
+            $from=&mkname($i);
+            $to=&mkname($nwhere+$i-$nstart+1);
+
+            if ($undo_cut==1) {
+                if (-f "$fromdir/$from.bak") {
+                    smog_rename("$fromdir/$from.bak","$curtmpdir/$to$img_ext");
+                    return if $panic;
+            }
+        } else {
+            if (! -f "$fromdir/$from$img_ext2") {
+                    next if ($allow_missing);
+                    while (! -f "$fromdir/$from$img_ext2") {
+                        print STDERR "waiting on image $fromdir/$from$img_ext2\n";
+                        sleep 1;
+                        smog_system_sync();
+                    }
+                }
+                if ($quick_copy==-1) {
+                    $quick_copy=0;
+                    if ($img_ext eq $img_ext2) {
+                        if ($height*$width==0) {
+                            $quick_copy=1;
+                        } else {
+                            $imresact="none";
+                            &get_image_size("$fromdir/$from$img_ext2");
+                            return if $panic;
+
+                        if ($hsize==$width&&$vsize==$height) {
+                                $quick_copy=1;
+                            }
+                        }
+                    }
+                }
+
+                if ($quick_copy==1) {
+                    smog_copy("$fromdir/$from$img_ext2","$curtmpdir/$to$img_ext");
+                    return if $panic;
+            } else {
+                if ($antialias eq "false") {
+                        $com="$smog_convert_command +antialias -size $width"."x$height $img_prefix2\"$fromdir/$from$img_ext2\" -scale $width!x$height! $img_prefix\"$curtmpdir/$to$img_ext\" >$nulfile 2>&1";
+                        $smerr=smog_system($com);
+                        if ($smerr) {
+                            sig_system_error("$com",$smerr);
+                            $panic=1;
+                            return;
+                        }
+                    } else {
+                        $com="$smog_convert_command -antialias -size $width"."x$height $img_prefix2\"$fromdir/$from$img_ext2\" -scale $width!x$height! $img_prefix\"$curtmpdir/$to$img_ext\" >$nulfile 2>&1";
+                        $smerr=smog_system($com);
+                        if ($smerr) {
+                            sig_system_error("$com",$smerr);
+                            $panic=1;
+                            return;
+                        }
+                    }
+                }
+
+            }
+
+            &sig_progress(int($new_frames-$where+$j++-$start+1));
+        }
+
+        $times_inserted+=$factor;
+        $inserted=$nend-$nstart+1;
+
+        if ($times_inserted==2) {
+            $nend=$nwhere;
+            $nstart=$nwhere-$inserted+1;
+            $fromdir=$curtmpdir;
+        }
+        $nwhere+=$inserted;
+
+        if ($times_inserted>1) {
+            $nend+=$inserted;
+            $factor*=2;
+        }
+        while ($times>$times_inserted&&$factor>$times-$times_inserted) {
+            $nstart+=($nend-$nstart+1)/2;
+            $factor/=2;
+        }
     }
 }
 
 
 
 sub resize_frame {
-    my ($name,$width,$height)=@_;
+    my($name,$width,$height)=@_;
 
     if (!defined($input_ext)) {
-	$input_ext=$img_ext;
+        $input_ext=$img_ext;
     }
     if (!defined($antialias)) {
-	$antialias="false";
+        $antialias="false";
     }
 
     if (!defined($input_prefix)) {
-	$input_prefix=&get_img_prefix($input_ext);
+        $input_prefix=&get_img_prefix($input_ext);
     }
     if (!defined($resize_prefix)) {
-	$resize_prefix=&get_img_prefix($resize_ext);
+        $resize_prefix=&get_img_prefix($resize_ext);
     }
 
-    # TODO ****  !!! provide alternate if imagemagick is not available
+# TODO ****  !!! provide alternate if imagemagick is not available
 
     if ($antialias eq "false") {
-	$com="$smog_convert_command +antialias -size $width"."x$height $input_prefix\"$name$input_ext\" -scale $width!x$height! $resize_prefix\"$name$resize_ext\" >$nulfile 2>&1";
-    }
-    else {
-	$com="$smog_convert_command -size $width"."x$height $input_prefix\"$name$input_ext\" -resize $width!x$height! $resize_prefix\"$name$resize_ext\" >$nulfile 2>&1";
+        $com="$smog_convert_command +antialias -size $width"."x$height $input_prefix\"$name$input_ext\" -scale $width!x$height! $resize_prefix\"$name$resize_ext\" >$nulfile 2>&1";
+    } else {
+        $com="$smog_convert_command -size $width"."x$height $input_prefix\"$name$input_ext\" -resize $width!x$height! $resize_prefix\"$name$resize_ext\" >$nulfile 2>&1";
     }
     $smerr=smog_system($com);
     if ($smerr) {
-	sig_system_error("$com",$smerr);
-	$panic=1;
+        sig_system_error("$com",$smerr);
+        $panic=1;
     }
 }
 
 
 
 sub letterbox_frame {
-    my ($name,$iwidth,$iheight,$owidth,$oheight)=@_;
+    my($name,$iwidth,$iheight,$owidth,$oheight)=@_;
 
 # frame is at size $iwidth x $iheight (if known, or 0)
 # from name is $name$input_ext, to name is $name$output_ext
 # center overlay frame in black rect size $owidth x $oheight
 
-    # TODO ****  !!! provide alternate if imagemagick is not available
+# TODO ****  !!! provide alternate if imagemagick is not available
 
     my $from="$name$in_ext";
     my $to="$name$out_ext";
 
-    # overlay frame
+# overlay frame
     $xstart=int(($owidth-$iwidth)/2);
     $ystart=int(($oheight-$iheight)/2);
-    
-    #must unlink first in case $to is a symlink (when saving selection)
+
+#must unlink first in case $to is a symlink (when saving selection)
     unlink "$to";
 
     $com="$smog_composite_command -compose plus -dissolve 100 -geometry $iwidth!x$iheight!+$xstart!+$ystart! \"$from\" blank.jpg \"$to\" >$nulfile 2>&1";
     $smerr=smog_system($com);
     if ($smerr) {
-	sig_system_error("$com",$smerr);
-	$panic=1; 
-	return;
+        sig_system_error("$com",$smerr);
+        $panic=1;
+        return;
     }
 
 }
@@ -4808,71 +4760,70 @@
 
 
 sub zoom_frame {
-    my ($name,$centre_x,$centre_y,$width,$height,$rscale)=@_;
-    # zoom into a frame
+    my($name,$centre_x,$centre_y,$width,$height,$rscale)=@_;
+# zoom into a frame
+
+# first we will crop the frame to just slightly larger than
+# our target, then we will resize, then do an exact crop
 
-    # first we will crop the frame to just slightly larger than
-    # our target, then we will resize, then do an exact crop
-    
-    # TODO - if we expand an edge a lot, our final crop needs
-    # adjusting
+# TODO - if we expand an edge a lot, our final crop needs
+# adjusting
 
     if (!defined($antialias)) {
-	$antialias="false";
+        $antialias="false";
     }
     if (!defined($input_ext)) {
-	$input_ext=$img_ext;
+        $input_ext=$img_ext;
     }
-    
+
     if (!defined($input_prefix)) {
-	$input_prefix=&get_img_prefix($input_ext);
+        $input_prefix=&get_img_prefix($input_ext);
     }
     if (!defined($resize_prefix)) {
-	$resize_prefix=&get_img_prefix($resize_ext);
+        $resize_prefix=&get_img_prefix($resize_ext);
     }
 
-    my ($left)=int($centre_x-($width/(2.*$rscale)))-1;
-    my ($top)=int($centre_y-($height/(2.*$rscale)))-1;
-    my ($right)=int($centre_x+($width/(2.*$rscale)))+1;
-    my ($bottom)=int($centre_y+($height/(2.*$rscale)))+1;
-    
+    my($left)=int($centre_x-($width/(2.*$rscale)))-1;
+    my($top)=int($centre_y-($height/(2.*$rscale)))-1;
+    my($right)=int($centre_x+($width/(2.*$rscale)))+1;
+    my($bottom)=int($centre_y+($height/(2.*$rscale)))+1;
+
     if ($left<0) {
-	$right-=$left;
-	$left=0;
+        $right-=$left;
+        $left=0;
     }
     if ($top<0) {
-	$bottom-=$top;
-	$top=0;
+        $bottom-=$top;
+        $top=0;
     }
     if ($right>=$width) {
-	$left-=$right-$width+1;
-	if($left<0) {
-	    $left=0;
-	}
-	$right=$width-1;
+        $left-=$right-$width+1;
+        if ($left<0) {
+            $left=0;
+        }
+        $right=$width-1;
     }
     if ($bottom>=$height) {
-	$top-=$bottom-$height+1;
-	if($top<0) {
-	    $top=0;
-	}
-	$bottom=$height-1;
-    }
-    my ($nwidth)=$right-$left+1;
-    my ($nheight)=$bottom-$top+1;
-    
-    if ($antialias eq "false") {
-	$com="$smog_convert_command -antialias -size $width"."x$height $input_prefix\"$name$input_ext\" -crop $nwidth!x$nheight!+$left!+$top! -resize $width!x$height! $resize_prefix\"$name$resize_ext\" >$nulfile 2>&1";
+        $top-=$bottom-$height+1;
+        if ($top<0) {
+            $top=0;
+        }
+        $bottom=$height-1;
     }
-    else {
-	$com="$smog_convert_command +antialias -size $width"."x$height $input_prefix\"$name$input_ext\" -crop $nwidth!x$nheight!+$left!+$top! -resize $width!x$height! $resize_prefix\"$name$resize_ext\" >$nulfile 2>&1";
+    my($nwidth)=$right-$left+1;
+    my($nheight)=$bottom-$top+1;
+
+    if ($antialias eq "false") {
+        $com="$smog_convert_command -antialias -size $width"."x$height $input_prefix\"$name$input_ext\" -crop $nwidth!x$nheight!+$left!+$top! -resize $width!x$height! $resize_prefix\"$name$resize_ext\" >$nulfile 2>&1";
+    } else {
+        $com="$smog_convert_command +antialias -size $width"."x$height $input_prefix\"$name$input_ext\" -crop $nwidth!x$nheight!+$left!+$top! -resize $width!x$height! $resize_prefix\"$name$resize_ext\" >$nulfile 2>&1";
     }
 
     $smerror=smog_system($com);
-    
+
     if ($smerror) {
-	sig_system_error("$com",$smerror);
-	$panic=1;
+        sig_system_error("$com",$smerror);
+        $panic=1;
     }
 
 }
@@ -4880,32 +4831,31 @@
 
 
 sub trim_frame {
-    my ($name,$width,$height,$x,$y,$nwidth,$nheight)=@_;
+    my($name,$width,$height,$x,$y,$nwidth,$nheight)=@_;
 
     if (!defined($input_ext)) {
-	$input_ext=$img_ext;
+        $input_ext=$img_ext;
     }
     if (!defined($input_prefix)) {
-	$input_prefix=&get_img_prefix($input_ext);
+        $input_prefix=&get_img_prefix($input_ext);
     }
     if (!defined($resize_prefix)) {
-	$resize_prefix=&get_img_prefix($resize_ext);
+        $resize_prefix=&get_img_prefix($resize_ext);
     }
     if (!defined($antialias)) {
-	$antialias="false";
+        $antialias="false";
     }
     if ($antialias eq "false") {
-	$com="$smog_convert_command +antialias -size $width"."x$height $input_prefix\"$name$input_ext\" -crop $nwidth!x$nheight!+$x+$y $resize_prefix\"$name$resize_ext\" >$nulfile 2>&1";
-    }
-    else {
-	$com="$smog_convert_command -antialias -size $width"."x$height $input_prefix\"$name$input_ext\" -crop $nwidth!x$nheight!+$x+$y $resize_prefix\"$name$resize_ext\" >$nulfile 2>&1";
+        $com="$smog_convert_command +antialias -size $width"."x$height $input_prefix\"$name$input_ext\" -crop $nwidth!x$nheight!+$x+$y $resize_prefix\"$name$resize_ext\" >$nulfile 2>&1";
+    } else {
+        $com="$smog_convert_command -antialias -size $width"."x$height $input_prefix\"$name$input_ext\" -crop $nwidth!x$nheight!+$x+$y $resize_prefix\"$name$resize_ext\" >$nulfile 2>&1";
     }
 
     $smerror=smog_system($com);
-    
+
     if ($smerror) {
-	sig_system_error("$com",$smerror);
-	$panic=1;
+        sig_system_error("$com",$smerror);
+        $panic=1;
     }
 
 
@@ -4913,10 +4863,10 @@
 
 
 sub trim_center {
-    my ($name,$width,$height)=@_;
+    my($name,$width,$height)=@_;
 
     if (!defined($input_ext)) {
-	$input_ext=$img_ext;
+        $input_ext=$img_ext;
     }
 
     $imresact="none";
@@ -4924,62 +4874,62 @@
     return if ($panic||$hsize==-1);
 
     if (!defined($input_prefix)) {
-	$input_prefix=&get_img_prefix($input_ext);
+        $input_prefix=&get_img_prefix($input_ext);
     }
 
     if (!defined($resize_prefix)) {
-	$resize_prefix=&get_img_prefix($resize_ext);
+        $resize_prefix=&get_img_prefix($resize_ext);
     }
 
-    unless ($hsize>=$width&&$vsize>=$height) {
-	#composite over a large enough frame
-	$size=$hsize;
-	if ($vsize>$size) {
-	    $size=$vsize;
-	}
-
-	$xstart=int(($size-$hsize)/2);
-	$ystart=int(($size-$vsize)/2);
-
-	# make a background frame
-	if (!defined($bgcolour)) {
-	    $bgcolour="#000000";
-	}
-
-	$com="$smog_convert_command -size $size!x$size! xc:$bgcolour $input_prefix"."blank$input_ext >$nulfile 2>&1";
-
-	$smerror=smog_system($com);
-	
-	if ($smerror) {
-	    sig_system_error("$com",$smerror);
-	    $panic=1;
-	    return;
-	}
-
-	$com="$smog_composite_command -compose plus -dissolve 100 -geometry $hsize!x$vsize!+$xstart!+$ystart! $input_prefix\"$name$input_ext\" $input_prefix"."blank$input_ext $input_prefix\"$name$input_ext\" >$nulfile 2>&1";
-
-	$smerror=smog_system($com);
-	
-	if ($smerror) {
-	    sig_system_error("$com",$smerror);
-	    $panic=1;
-	    return;
-	}
+    unless($hsize>=$width&&$vsize>=$height) {
+#composite over a large enough frame
+        $size=$hsize;
+        if ($vsize>$size) {
+            $size=$vsize;
+        }
+
+        $xstart=int(($size-$hsize)/2);
+        $ystart=int(($size-$vsize)/2);
 
-	$hsize=$vsize=$size;
+# make a background frame
+        if (!defined($bgcolour)) {
+            $bgcolour="#000000";
+        }
+
+        $com="$smog_convert_command -size $size!x$size! xc:$bgcolour $input_prefix"."blank$input_ext >$nulfile 2>&1";
+
+        $smerror=smog_system($com);
+
+        if ($smerror) {
+            sig_system_error("$com",$smerror);
+            $panic=1;
+            return;
+        }
+
+        $com="$smog_composite_command -compose plus -dissolve 100 -geometry $hsize!x$vsize!+$xstart!+$ystart! $input_prefix\"$name$input_ext\" $input_prefix"."blank$input_ext $input_prefix\"$name$input_ext\" >$nulfile 2>&1";
+
+        $smerror=smog_system($com);
+
+        if ($smerror) {
+            sig_system_error("$com",$smerror);
+            $panic=1;
+            return;
+        }
+
+        $hsize=$vsize=$size;
     }
 
     $x=int(($hsize-$width)/2);
     $y=int(($vsize-$height)/2);
 
     $com="$smog_convert_command $input_prefix\"$name$input_ext\" -crop $width" . "!x" . $height . "!+" . $x . "+" . $y . " $resize_prefix\"$name$resize_ext\" >$nulfile 2>&1";
-    
+
     $smerror=smog_system($com);
-    
+
     if ($smerror) {
-	sig_system_error("$com",$smerror);
-	$panic=1;
-	return;
+        sig_system_error("$com",$smerror);
+        $panic=1;
+        return;
     }
 
 }
@@ -4989,35 +4939,31 @@
 sub get_formats {
 
     if (!defined($sox_version)) {
-	$sox_version=&get_sox_version;
+        $sox_version=&get_sox_version;
     }
 
-    if ($asamps==8){
-	$format=16;
-	$signed=0;
-	if ($sox_version < 14004001) {
-	    $xsigned="-u";
-	}
-	else {
-	    $xsigned="-e unsigned-integer";
-	}
-    }
-    else {
-	$signed=1;
-	if ($sox_version < 14004001) {
-	    $xsigned="-s";
-	}
-	else {
-	    $xsigned="-e signed-integer";
-	}
-	if ($endian==1) {
-	    # little
-	    $format=128;
-	}
-	else {
-	    # big
-	    $format=256;
-	}
+    if ($asamps==8) {
+        $format=16;
+        $signed=0;
+        if ($sox_version < 14004001) {
+            $xsigned="-u";
+        } else {
+            $xsigned="-e unsigned-integer";
+        }
+    } else {
+        $signed=1;
+        if ($sox_version < 14004001) {
+            $xsigned="-s";
+        } else {
+            $xsigned="-e signed-integer";
+        }
+        if ($endian==1) {
+# little
+            $format=128;
+        } else {
+# big
+            $format=256;
+        }
     }
 }
 
@@ -5026,8 +4972,10 @@
 
 sub get_file_info {
     $count=0;
-    $bpp=24;  # default if none is found
-    $fps=0; # let the front-end handle this if we can't get it ;-)
+    $bpp=24;
+# default if none is found
+    $fps=0;
+# let the front-end handle this if we can't get it ;-)
     $type="Unknown";
     $hsize=0;
     $vsize=0;
@@ -5040,340 +4988,340 @@
     $endian="";
 
     if ($^O ne "MSWin32") {
-	# try to force language to English
-	$mplay_command="LANGUAGE=en LANG=en ";
+# try to force language to English
+        $mplay_command="LANGUAGE=en LANG=en ";
     }
 
     $mplay_command.=&rc_get("video_open_command");
     $file_ident="file_info";
 
     if ($mplay_command eq "") {
-	$mplay_command="\"".&get_mplayer_location."\"";
+        $mplay_command="\"".&get_mplayer_location."\"";
     }
 
     if ($mplay_command eq "") {
-	$panic=1;
-	return;
+        $panic=1;
+        return;
     }
 
     $id_vid_form="";
 
     if ($is_audio) {
-	$type="Audio";
+        $type="Audio";
     }
 
     smog_chdir("$curtmpdir");
 
-    # if mplayer supports the -identify command, use that
-    # the format changed for 1.0pre1 so now we use -vo null -ao null -frames 0
+# if mplayer supports the -identify command, use that
+# the format changed for 1.0pre1 so now we use -vo null -ao null -frames 0
 
     unless ($mplay_command eq "") {
-	if (defined($is_remote)&&($is_remote>0)) {
-	    # remote files might be streams, so we need to cache a bit before we can identify them
-	    $com="$mplay_command -identify -vo null -ao null -frames 0 -cache 32 \"$file\" > $file_ident 2>$nulfile <$nulfile";
-	    
-	}
-	else {
-	    $com="$mplay_command -identify -vo null -ao null -frames 0 \"$file\" > $file_ident 2>$nulfile <$nulfile";
-	}
-
-	$smerr=smog_system($com);
-
-	if ($smerr) {
-	    sig_system_error("$com",$smerr);
-	    $panic=1;
-	    return;
-	}
-
-
-
-	
-	if (-f $file_ident) {
-
-	    $length=smog_system_direct("grep ID_LENGTH \"$file_ident\" 2>$nulfile");
-	    $length=(split("=",(split("\n",$length))[0]))[1];
-	    chomp($length);
-
-	    if ($length eq "0" &&!(defined($is_remote)&&($is_remote>0))) {
-		$com="$mplay_command -demuxer lavf -identify -vo null -ao null -frames 0 \"$file\" > $file_ident 2>$nulfile <$nulfile";
-
-		$smerr=smog_system($com);
-		
-		if ($smerr) {
-		    sig_system_error("$com",$smerr);
-		    $panic=1;
-		    return;
-		}
-
-
-
-	    }
-
-	}
-
-
-	if (-f $file_ident) {
-	$id_vid_form=smog_system_direct("grep ID_VIDEO_CODEC \"$file_ident\" 2>$nulfile");
-        $id_vid_form=(split("=",(split("\n",$id_vid_form))[0]))[1];
-        chomp($id_vid_form);
-
-	if ($id_vid_form eq "") {
-	    $id_vid_form=smog_system_direct("grep ID_VIDEO_FORMAT \"$file_ident\" 2>$nulfile");
-	    $id_vid_form=(split("=",(split("\n",$id_vid_form))[0]))[1];
-	    chomp($id_vid_form);
-	}
-
-	if ($id_vid_form eq "") {
-	    $id_vid_form=smog_system_direct("grep VIDEO: \"$file_ident\" 2>$nulfile");
-	    $id_vid_form=(split("  ",(split("\n",$id_vid_form))[0]))[1];
-	    chomp($id_vid_form);
-	}
-	if (! -f $file_ident) {return;};
-
-	$id_aud_form=smog_system_direct("grep ID_AUDIO_FORMAT \"$file_ident\" 2>$nulfile");
-	$id_aud_form=(split("=",(split("\n",$id_aud_form))[0]))[1];
-	chomp($id_aud_form);
-
-	if ($id_aud_form eq "") {
-	    $id_aud_form=smog_system_direct("grep AUDIO: \"$file_ident\" 2>$nulfile");
-	    $id_aud_form=(split("  ",(split("\n",$id_aud_form))[0]))[1];
-	    chomp($id_aud_form);
-	}
-
-	if (! -f $file_ident) {return;};
-
-	if ($id_vid_form eq "") {
-	    if (!($id_aud_form eq "")) {
-		$id_vid_form="Audio";
-	    }
-	}
-
-	unless ($id_vid_form eq "") {
-	    # this could probably be done better using regexp...
-	    $type=$id_vid_form;
-	    if (! -f $file_ident) {return;};
-	    $asamps=smog_system_direct("grep AUDIO: \"$file_ident\" 2>$nulfile");
-	    $asamps=(split(" ",$asamps))[5];
-	    chomp($asamps);
-
-	    if ($asamps =~ /^f/) {
-		$asamps=32;
-		$signed=1;
-	    }
-	    elsif ($asamps =~ /^s/) {
-		$asamps=substr($asamps,1,-1);
-		$signed=1;
-	    }
-	    elsif ($asamps =~ /^u/) {
-		$asamps=substr($asamps,1,-1);
-		$signed=0;
-	    }
-
-	    $audend=substr($asamps,-2,2);
-
-	    if ($audend eq "le") {
-		# le
-		$endian=1; 
-	    }
-	    elsif ($audend eq "be") {
-		$endian=0;
-	    }
-
-	    if (! -f $file_ident) {return;};
-	    $bpp=smog_system_direct("grep VIDEO: \"$file_ident\" 2>$nulfile");
-	    $bpp=(split("bpp",(split("  ",$bpp))[3]))[0];
-	    chomp($bpp);
-
-	    if (! -f $file_ident) {return;};
-	    if ($bpp eq "") {
-		$bpp=smog_system_direct("grep \"Image size:\" \"$file_ident\" 2>$nulfile");
-		@tmp=split(" ",$bpp);
-		$bpp=substr($tmp[5],1,2);
-	    }
-
-	    if (! -f $file_ident) {return;};
-	    $hsize=smog_system_direct("grep ID_VIDEO_WIDTH \"$file_ident\" 2>$nulfile");
-	    $hsize=(split("=",(split("\n",$hsize))[0]))[1];
-	    chomp($hsize);
-	    
-	    if (! -f $file_ident) {return;};
-	    $vsize=smog_system_direct("grep ID_VIDEO_HEIGHT \"$file_ident\" 2>$nulfile");
-	    $vsize=(split("=",(split("\n",$vsize))[0]))[1];
-	    chomp($vsize);
-	    
-	    if (! -f $file_ident) {return;};
-	    $fps=smog_system_direct("grep ID_VIDEO_FPS \"$file_ident\" 2>$nulfile");
-	    $fps=(split("=",(split("\n",$fps))[0]))[1];
-	    chomp($fps);
-
-	    if (! -f $file_ident) {return;};
-	    $arate=smog_system_direct("grep ID_AUDIO_RATE \"$file_ident\" 2>$nulfile");
-	    my @results=split("\n",$arate);
-	    foreach my $val (@results) {
-		$arate=(split("=",$val))[1];
-		chomp($arate);
-		last if $arate>0;
-	    }
-	    if (! -f $file_ident) {return;};
-	    if ($arate==0) {
-		$arate=smog_system_direct("grep Samplerate \"$file_ident\" 2>$nulfile");
-		$arate=(split(": ",(split("\n",$arate))[0]))[1];
-		chomp($arate);
-	    }
-
-	    
-	    if (! -f $file_ident) {return;};
-	    $achans=smog_system_direct("grep ID_AUDIO_NCH \"$file_ident\" 2>$nulfile");
-	    chomp($achans);
-	    $achans=(split("\n",$achans))[-1];
-	    $achans=(split("=",(split("\n",$achans))[0]))[1];
-
-	    if (! -f $file_ident) {return;};
-	    $abitrate=smog_system_direct("grep ID_AUDIO_BITRATE \"$file_ident\" 2>$nulfile");
-	    chomp($abitrate);
-	    $abitrate=(split("\n",$abitrate))[-1];
-	    $abitrate=(split("=",(split("\n",$abitrate))[0]))[1];
-
-
-	    unless ($id_aud_form eq "" || $achans>0) {
-		# need to look deeper for $achans
-		$adets=smog_system_direct("grep AO: \"$file_ident\" 2>$nulfile");
-
-		$adets=(split("AO: ",$adets))[1];
-		chomp($adets);
-
-		$arate=(split(" ",$adets))[1];
-		if ($arate eq "[oss]") {
-		    $arate=(split(" ",$adets))[2];
-		    $achans=(split(" ",$adets))[3];
-
-		}
-		else {
-		    $achans=(split(" ",$adets))[2];
-		}
-		chomp($arate);
-		chomp($achans);
-
-		$arate=$arate*1;
-		$achans=$achans*1;
-	    }
-
-	    # grep may fail with error 256
-
-	    if (! -f $file_ident) {return;};
-	    $comment=smog_system_direct("grep Comments: \"$file_ident\" 2>$nulfile");
-	    @tmp=split(" ",$comment);
-	    shift(@tmp);
-	    $comment=join(" ",@tmp);
-	    chomp($comment);
-
-	    if (! -f $file_ident) {return;};
-	    $title=smog_system_direct("grep Title: \"$file_ident\" 2>$nulfile");
-	    @tmp=split(" ",$title);
-	    shift(@tmp);
-	    $title=join(" ",@tmp);
-	    chomp($title);
-
-	    if (! -f $file_ident) {return;};
-	    $title=smog_system_direct("grep Author: \"$file_ident\" 2>$nulfile");
-	    @tmp=split(" ",$author);
-	    shift(@tmp);
-	    $author=join(" ",@tmp);
-	    chomp($author);
-
-	    if (! -f $file_ident) {return;};
-	    $count=smog_system_direct("grep \"frames  total\" \"$file_ident\" 2>$nulfile");
-	    @tmp=split(" ",$count);
-	    $count=$tmp[2];
-	    chomp($count);
-
-            if ($count eq "") {
-                $count=int($fps*$length+.5);
-            }
-            if ($count eq "") {
-                $count=1000000; #take a guess...
-            }
-	}
-	if ($asamps==0&&$arate*$achans>0) {
-	    $asamps=$abitrate/$arate/$achans;
-	}
-	unlink "$file_ident";
-    }
+        if (defined($is_remote)&&($is_remote>0)) {
+# remote files might be streams, so we need to cache a bit before we can identify them
+            $com="$mplay_command -identify -vo null -ao null -frames 0 -cache 32 \"$file\" > $file_ident 2>$nulfile <$nulfile";
 
-}
+        }
+        else {
+            $com="$mplay_command -identify -vo null -ao null -frames 0 \"$file\" > $file_ident 2>$nulfile <$nulfile";
+        }
+
+        $smerr=smog_system($com);
+
+        if ($smerr) {
+            sig_system_error("$com",$smerr);
+            $panic=1;
+            return;
+        }
+
+
+
+
+        if (-f $file_ident) {
+
+            $length=smog_system_direct("grep ID_LENGTH \"$file_ident\" 2>$nulfile");
+            $length=(split("=",(split("\n",$length))[0]))[1];
+            chomp($length);
+
+            if ($length eq "0" &&!(defined($is_remote)&&($is_remote>0))) {
+                $com="$mplay_command -demuxer lavf -identify -vo null -ao null -frames 0 \"$file\" > $file_ident 2>$nulfile <$nulfile";
+
+                $smerr=smog_system($com);
+
+                if ($smerr) {
+                    sig_system_error("$com",$smerr);
+                    $panic=1;
+                    return;
+                }
+
+
+
+            }
+
+        }
+
+
+        if (-f $file_ident) {
+            $id_vid_form=smog_system_direct("grep ID_VIDEO_CODEC \"$file_ident\" 2>$nulfile");
+            $id_vid_form=(split("=",(split("\n",$id_vid_form))[0]))[1];
+            chomp($id_vid_form);
+
+            if ($id_vid_form eq "") {
+                $id_vid_form=smog_system_direct("grep ID_VIDEO_FORMAT \"$file_ident\" 2>$nulfile");
+                $id_vid_form=(split("=",(split("\n",$id_vid_form))[0]))[1];
+                chomp($id_vid_form);
+            }
+
+            if ($id_vid_form eq "") {
+                $id_vid_form=smog_system_direct("grep VIDEO: \"$file_ident\" 2>$nulfile");
+                $id_vid_form=(split("  ",(split("\n",$id_vid_form))[0]))[1];
+                chomp($id_vid_form);
+            }
+            if (! -f $file_ident) {return;};
+
+            $id_aud_form=smog_system_direct("grep ID_AUDIO_FORMAT \"$file_ident\" 2>$nulfile");
+            $id_aud_form=(split("=",(split("\n",$id_aud_form))[0]))[1];
+            chomp($id_aud_form);
+
+            if ($id_aud_form eq "") {
+                $id_aud_form=smog_system_direct("grep AUDIO: \"$file_ident\" 2>$nulfile");
+                $id_aud_form=(split("  ",(split("\n",$id_aud_form))[0]))[1];
+                chomp($id_aud_form);
+            }
+
+            if (! -f $file_ident) {return;};
+
+            if ($id_vid_form eq "") {
+                if (!($id_aud_form eq "")) {
+                    $id_vid_form="Audio";
+                }
+            }
+
+            unless ($id_vid_form eq "") {
+# this could probably be done better using regexp...
+                $type=$id_vid_form;
+                if (! -f $file_ident) {return;};
+                $asamps=smog_system_direct("grep AUDIO: \"$file_ident\" 2>$nulfile");
+                $asamps=(split(" ",$asamps))[5];
+                chomp($asamps);
+
+                if ($asamps =~ /^f/) {
+                    $asamps=32;
+                    $signed=1;
+                }
+                elsif ($asamps =~ /^s/) {
+                    $asamps=substr($asamps,1,-1);
+                    $signed=1;
+                }
+                elsif ($asamps =~ /^u/) {
+                    $asamps=substr($asamps,1,-1);
+                    $signed=0;
+                }
+
+                $audend=substr($asamps,-2,2);
+
+                if ($audend eq "le") {
+# le
+                    $endian=1;
+                }
+                elsif ($audend eq "be") {
+                    $endian=0;
+                }
+
+                if (! -f $file_ident) {return;};
+                $bpp=smog_system_direct("grep VIDEO: \"$file_ident\" 2>$nulfile");
+                $bpp=(split("bpp",(split("  ",$bpp))[3]))[0];
+                chomp($bpp);
+
+                if (! -f $file_ident) {return;};
+                if ($bpp eq "") {
+                    $bpp=smog_system_direct("grep \"Image size:\" \"$file_ident\" 2>$nulfile");
+                    @tmp=split(" ",$bpp);
+                    $bpp=substr($tmp[5],1,2);
+                }
+
+                if (! -f $file_ident) {return;};
+                $hsize=smog_system_direct("grep ID_VIDEO_WIDTH \"$file_ident\" 2>$nulfile");
+                $hsize=(split("=",(split("\n",$hsize))[0]))[1];
+                chomp($hsize);
+
+                if (! -f $file_ident) {return;};
+                $vsize=smog_system_direct("grep ID_VIDEO_HEIGHT \"$file_ident\" 2>$nulfile");
+                $vsize=(split("=",(split("\n",$vsize))[0]))[1];
+                chomp($vsize);
+
+                if (! -f $file_ident) {return;};
+                $fps=smog_system_direct("grep ID_VIDEO_FPS \"$file_ident\" 2>$nulfile");
+                $fps=(split("=",(split("\n",$fps))[0]))[1];
+                chomp($fps);
+
+                if (! -f $file_ident) {return;};
+                $arate=smog_system_direct("grep ID_AUDIO_RATE \"$file_ident\" 2>$nulfile");
+                my @results=split("\n",$arate);
+                foreach my $val (@results) {
+                    $arate=(split("=",$val))[1];
+                    chomp($arate);
+                    last if $arate>0;
+            }
+            if (! -f $file_ident) {return;};
+                if ($arate==0) {
+                    $arate=smog_system_direct("grep Samplerate \"$file_ident\" 2>$nulfile");
+                    $arate=(split(": ",(split("\n",$arate))[0]))[1];
+                    chomp($arate);
+                }
+
+
+                if (! -f $file_ident) {return;};
+                $achans=smog_system_direct("grep ID_AUDIO_NCH \"$file_ident\" 2>$nulfile");
+                chomp($achans);
+                $achans=(split("\n",$achans))[-1];
+                $achans=(split("=",(split("\n",$achans))[0]))[1];
+
+                if (! -f $file_ident) {return;};
+                $abitrate=smog_system_direct("grep ID_AUDIO_BITRATE \"$file_ident\" 2>$nulfile");
+                chomp($abitrate);
+                $abitrate=(split("\n",$abitrate))[-1];
+                $abitrate=(split("=",(split("\n",$abitrate))[0]))[1];
+
+
+                unless ($id_aud_form eq "" || $achans>0) {
+# need to look deeper for $achans
+                    $adets=smog_system_direct("grep AO: \"$file_ident\" 2>$nulfile");
+
+                    $adets=(split("AO: ",$adets))[1];
+                    chomp($adets);
+
+                    $arate=(split(" ",$adets))[1];
+                    if ($arate eq "[oss]") {
+                        $arate=(split(" ",$adets))[2];
+                        $achans=(split(" ",$adets))[3];
+
+                    }
+                    else {
+                        $achans=(split(" ",$adets))[2];
+                    }
+                    chomp($arate);
+                    chomp($achans);
+
+                    $arate=$arate*1;
+                    $achans=$achans*1;
+                }
+
+# grep may fail with error 256
+
+                if (! -f $file_ident) {return;};
+                $comment=smog_system_direct("grep Comments: \"$file_ident\" 2>$nulfile");
+                @tmp=split(" ",$comment);
+                shift(@tmp);
+                $comment=join(" ",@tmp);
+                chomp($comment);
+
+                if (! -f $file_ident) {return;};
+                $title=smog_system_direct("grep Title: \"$file_ident\" 2>$nulfile");
+                @tmp=split(" ",$title);
+                shift(@tmp);
+                $title=join(" ",@tmp);
+                chomp($title);
+
+                if (! -f $file_ident) {return;};
+                $title=smog_system_direct("grep Author: \"$file_ident\" 2>$nulfile");
+                @tmp=split(" ",$author);
+                shift(@tmp);
+                $author=join(" ",@tmp);
+                chomp($author);
+
+                if (! -f $file_ident) {return;};
+                $count=smog_system_direct("grep \"frames  total\" \"$file_ident\" 2>$nulfile");
+                @tmp=split(" ",$count);
+                $count=$tmp[2];
+                chomp($count);
+
+                if ($count eq "") {
+                    $count=int($fps*$length+.5);
+                }
+                if ($count eq "") {
+                    $count=1000000; #take a guess...
+                }
+            }
+            if ($asamps==0&&$arate*$achans>0) {
+                $asamps=$abitrate/$arate/$achans;
+            }
+            unlink "$file_ident";
+        }
+
+    }
 
 
     if (($hsize*$vsize==0||$count eq "")&&!$is_audio) {
-	# test even if mplayer thinks it is audio (at least some png files are misread)
-	$name=&mkname(1);
-	unless (-f "$curtmpdir/$name") {
-	    # see if it is image(s)
-	    &open_images(1);
-	    if ($hsize==-1) {
-		$hsize=$vsize=0;
-	    }
-	    opendir DIR,$curtmpdir;
-	    while ($file2=readdir(DIR)) {
-		if ($file2 =~ /$img_ext$/) {
-		    $count++;
-		    $imresact="none";
-		    if ($only_first) {
-			unlink glob "$curtmpdir/*$img_ext";
-			last;
-		    }
-		    else {
-			$f_size+=-s $file2;
-		    }
-		}
-		else {
-		    unless ($file2 eq $audio_in) {
-			unlink "$file2";
-		    }
-		}
-	    }
-	    closedir DIR;
-
-	    if ($count) {
-		# got image(s)
-		$frames=$count;
-		# got image(s)
-		if ($img_ext eq ".jpg") {
-		    $type="jpeg";
-		}
-		else {
-		    $type="png";
-		}
-		
-		$count=0;
-		$name=&mkname(1);
-	    }
-	}
+# test even if mplayer thinks it is audio (at least some png files are misread)
+        $name=&mkname(1);
+        unless (-f "$curtmpdir/$name") {
+# see if it is image(s)
+            &open_images(1);
+            if ($hsize==-1) {
+                $hsize=$vsize=0;
+            }
+            opendir DIR,$curtmpdir;
+            while ($file2=readdir(DIR)) {
+                if ($file2 =~ /$img_ext$/) {
+                    $count++;
+                    $imresact="none";
+                    if ($only_first) {
+                        unlink glob "$curtmpdir/*$img_ext";
+                        last;
+                    }
+                    else {
+                        $f_size+=-s $file2;
+                    }
+                }
+                else {
+                    unless ($file2 eq $audio_in) {
+                        unlink "$file2";
+                    }
+                }
+            }
+            closedir DIR;
+
+            if ($count) {
+# got image(s)
+                $frames=$count;
+# got image(s)
+                if ($img_ext eq ".jpg") {
+                    $type="jpeg";
+                }
+                else {
+                    $type="png";
+                }
+
+                $count=0;
+                $name=&mkname(1);
+            }
+        }
     }
 
     if ($signed==-1) {
-	if ($asamps==8) {
-	    $signed=0;
-	}
-	else {
-	    $signed=1;
-	}
+        if ($asamps==8) {
+            $signed=0;
+        }
+        else {
+            $signed=1;
+        }
     }
 
     if ($endian eq "") {
-	$endian=&get_endian; # assume audio endian matches machine endian
+        $endian=&get_endian; # assume audio endian matches machine endian
     }
 
-    # get file size
+# get file size
     if ($f_size==0) {
-	$f_size= -s $file;
+        $f_size= -s $file;
     }
 
     if ($asamps<5&&$asamps>0) {
-	$asamps=16;
+        $asamps=16;
     }
-    
+
     if ($type=~ m/^\[/) {
-	$type=substr($type,1,-1);
+    $type=substr($type,1,-1);
     }
 
 }
@@ -5383,7 +5331,7 @@
 
 
 sub convert_audio_to_raw {
-    #convert .wav to raw pcm using sox or mplayer
+#convert .wav to raw pcm using sox or mplayer
 
     my $smcom;
 
@@ -5392,19 +5340,19 @@
     my $ap=&rc_get("audio_player");
 
     if (!($ap eq "mplayer")&&!($ap eq "mplayer2")) {
-	$smcom="sox -t .wav \"$audio_in\" -t .raw $xsigned \"$audio_out\" > $nulfile 2>&1";
+        $smcom="sox -t .wav \"$audio_in\" -t .raw $xsigned \"$audio_out\" > $nulfile 2>&1";
     }
     else {
-	$format=&get_mplayer_format;
-	$smcom=&rc_get("video_open_command") . " -quiet \"$audio_in\" -ao pcm:nowaveheader:file=\"$audio_out\" $format >$nulfile 2>&1";
+        $format=&get_mplayer_format;
+        $smcom=&rc_get("video_open_command") . " -quiet \"$audio_in\" -ao pcm:nowaveheader:file=\"$audio_out\" $format >$nulfile 2>&1";
     }
 
     my $smerr=smog_system($smcom);
 
     if ($smerr) {
-	sig_system_error("$smcom",$smerr);
-	$panic=1;
-	return;
+        sig_system_error("$smcom",$smerr);
+        $panic=1;
+        return;
     }
 
     smog_system_sync();
@@ -5413,89 +5361,89 @@
 
 
 sub convert_audio_to_wav {
-    #convert raw to .wav
+#convert raw to .wav
 
-    #WARNING - $asamps and $nasamps are in bits
+#WARNING - $asamps and $nasamps are in bits
     my ($aasamps)=$asamps/8;
     my $smcom;
 
     smog_chdir("$curtmpdir");
     if (&location("sox") eq "") {
-	$format=&get_mplayer_format;
-	$smcom=&rc_get("video_open_command") . " -quiet -ao pcm -demuxer rawaudio -rawaudio rate=$arate:channels=$achans:samplesize=$aasamps -ao pcm:waveheader $format -vo null \"$audio_in\" >$nulfile 2>&1 <$nulfile";
+        $format=&get_mplayer_format;
+        $smcom=&rc_get("video_open_command") . " -quiet -ao pcm -demuxer rawaudio -rawaudio rate=$arate:channels=$achans:samplesize=$aasamps -ao pcm:waveheader $format -vo null \"$audio_in\" >$nulfile 2>&1 <$nulfile";
     }
     else {
-	if (!defined($sox_version)) {
-	    $sox_version=&get_sox_version;
-	}
-
-	if ($sox_version<13000000) {
-	    $nodither="";
-	    if ($asamps==8) {
-		$sasamps="b";
-	    }
-	    else {
-		$sasamps="w";
-	    }
-	}
-	else {
-	    $nodither="-D";
-	    $sasamps=$aasamps;
-	}
-
-	if (!defined($nrate)) {
-	    $nrate=$arate;
-	}
-
-	if (!defined($nchans)) {
-	    $nchans=$achans;
-	}
-
-	if (!defined($nasamps)) {
-	    $nasamps=$sasamps;
-	}
-
-	if (!defined($asigned)) {
-	    if ($sox_version < 14004001) {
-		if ($sasamps==8) {
-		    $asigned="-u";
-		}
-		else {
-		    $asigned="-s";
-		}
-	    }
-	    else {
-		if ($sasamps==8) {
-		    $asigned="-e unsigned-integer";
-		}
-		else {
-		    $asigned="-e signed-integer";
-		}
-	    }
-	}
-
-	if (!defined($nsigned)) {
-	    if ($nasamps==8) {
-		if ($sox_version < 14004001) {
-		    $nsigned="-u";
-		}
-		else {
-		    $nsigned="-e unsigned-integer";
-		}
-	    }
-	    else {
-		$nsigned=$asigned;
-	    }
-	}
+        if (!defined($sox_version)) {
+            $sox_version=&get_sox_version;
+        }
+
+        if ($sox_version<13000000) {
+            $nodither="";
+            if ($asamps==8) {
+                $sasamps="b";
+            }
+            else {
+                $sasamps="w";
+            }
+        }
+        else {
+            $nodither="-D";
+            $sasamps=$aasamps;
+        }
+
+        if (!defined($nrate)) {
+            $nrate=$arate;
+        }
+
+        if (!defined($nchans)) {
+            $nchans=$achans;
+        }
+
+        if (!defined($nasamps)) {
+            $nasamps=$sasamps;
+        }
+
+        if (!defined($asigned)) {
+            if ($sox_version < 14004001) {
+                if ($sasamps==8) {
+                    $asigned="-u";
+                }
+                else {
+                    $asigned="-s";
+                }
+            }
+            else {
+                if ($sasamps==8) {
+                    $asigned="-e unsigned-integer";
+                }
+                else {
+                    $asigned="-e signed-integer";
+                }
+            }
+        }
 
-	$smcom="sox $nodither -t .raw -r $arate $asigned -$sasamps -c $achans \"$audio_in\" -t .wav -r $nrate -c $nchans $nsigned -$nasamps \"$curtmpdir/audiodump.wav\" >$nulfile 2>&1";
+        if (!defined($nsigned)) {
+            if ($nasamps==8) {
+                if ($sox_version < 14004001) {
+                    $nsigned="-u";
+                }
+                else {
+                    $nsigned="-e unsigned-integer";
+                }
+            }
+            else {
+                $nsigned=$asigned;
+            }
+        }
+
+        $smcom="sox $nodither -t .raw -r $arate $asigned -$sasamps -c $achans \"$audio_in\" -t .wav -r $nrate -c $nchans $nsigned -$nasamps \"$curtmpdir/audiodump.wav\" >$nulfile 2>&1";
     }
 
     my $smerr=smog_system("$smcom");
     if ($smerr) {
-	sig_system_error("$smcom",$smerr);
-	$panic=1;
-	return;
+        sig_system_error("$smcom",$smerr);
+        $panic=1;
+        return;
     }
 
     smog_system_sync();
@@ -5510,7 +5458,7 @@
     my $smres;
 
     if ($achans==0) {
-	return;
+        return;
     }
 
     $audio_in=$curtmpdir."/audio";
@@ -5518,21 +5466,21 @@
 
     unlink "$audio_out";
     if ($^O eq "MSWin32") {
-	$smres=smog_system("touch.exe \"$audio_out\"");
+        $smres=smog_system("touch.exe \"$audio_out\"");
     }
     else {
-	$smres=smog_system("touch \"$audio_out\"");
+        $smres=smog_system("touch \"$audio_out\"");
     }
     if ($smres) {
-	$panic=sig_write_error("$audio_out"); 
-	return;
+        $panic=sig_write_error("$audio_out");
+        return;
     }
 
     if ($^O eq "MSWin32") {
-	#smog_system("chmod.exe 600 \"$audio_out\"");
+#smog_system("chmod.exe 600 \"$audio_out\"");
     }
     else {
-	smog_system("/bin/chmod 600 \"$audio_out\"");
+        smog_system("/bin/chmod 600 \"$audio_out\"");
     }
 
     $align=$achans*$asamps/8;
@@ -5543,25 +5491,25 @@
     my ($fsize)= (-s $audio_in);
 
     if ($epos>$fsize) {
-	$epos=$fsize;
+        $epos=$fsize;
     }
     if ($spos>$epos) {
-	$spos=$epos;
+        $spos=$epos;
     }
 
     my ($size)=($epos-$spos);
     if ($size>$fsize) {
-	$size=$fsize;
+        $size=$fsize;
     }
 
     if ($size>0) {
-	unlink "$audio_out";
+        unlink "$audio_out";
 
-	$fdd_in=$audio_in;
-	$fdd_out=$audio_out;
+        $fdd_in=$audio_in;
+        $fdd_out=$audio_out;
 
-	&fast_dd($size,$spos,0);
-	return if ($panic);
+        &fast_dd($size,$spos,0);
+        return if ($panic);
     }
 
     smog_system_sync();
@@ -5570,92 +5518,92 @@
 
 
 sub resample_audio {
-    #WARNING - $asamps and $nasamps are in bits
+#WARNING - $asamps and $nasamps are in bits
 
     $endian=&get_endian;
 
     if (!defined($sox_version)) {
-	$sox_version=&get_sox_version;
+        $sox_version=&get_sox_version;
     }
-    
+
     if ($sox_version<13000000) {
-	if ($asamps==8) {
-	    $osamps="b";
-	}
-	else {
-	    $osamps="w";
-	}
-	
-	
-	if ($nsamps==8) {
-	    $nsamps="b";
-	}
-	else {
-	    $nsamps="w";
-	}
-	$nodither="";
+        if ($asamps==8) {
+            $osamps="b";
+        }
+        else {
+            $osamps="w";
+        }
+
+
+        if ($nsamps==8) {
+            $nsamps="b";
+        }
+        else {
+            $nsamps="w";
+        }
+        $nodither="";
     }
     else {
-	$osamps=$asamps/8;
-	$nsamps/=8;
-	$nodither="-D";
+        $osamps=$asamps/8;
+        $nsamps/=8;
+        $nodither="-D";
     }
-    
+
     if ($sox_version < 14000000) {
-	if ($asigned==1) {
-	    $osigned="s";
-	}
-	else {
-	    $osigned="u";
-	}
-    
-	if ($nsigned==1) {
-	    $nsigned="s";
-	}
-	else {
-	    $nsigned="u";
-	}
+        if ($asigned==1) {
+            $osigned="s";
+        }
+        else {
+            $osigned="u";
+        }
+
+        if ($nsigned==1) {
+            $nsigned="s";
+        }
+        else {
+            $nsigned="u";
+        }
     }
     else {
-	if ($asigned==1) {
-	    $osigned="-e signed-integer";
-	}
-	else {
-	    $osigned="-e unsigned-integer";
-	}
-    
-	if ($nsigned==1) {
-	    $nsigned="-e signed-integer";
-	}
-	else {
-	    $nsigned="-e unsigned-integer";
-	}
+        if ($asigned==1) {
+            $osigned="-e signed-integer";
+        }
+        else {
+            $osigned="-e unsigned-integer";
+        }
+
+        if ($nsigned==1) {
+            $nsigned="-e signed-integer";
+        }
+        else {
+            $nsigned="-e unsigned-integer";
+        }
     }
 
     if ($aendian==$endian) {
-	$oendian="";
+        $oendian="";
     }
     else {
-	$oendian="-x";
+        $oendian="-x";
     }
-    
+
     if ($nendian==$endian) {
-	$nendian="";
+        $nendian="";
     }
     else {
-	$nendian="-x";
+        $nendian="-x";
     }
-    
+
     if (defined($stretch)) {
-	$com="sox $nodither -t .raw -r $arate -c $achans -$osigned -$osamps $oendian \"$audio_in\" -t .raw -r $nrate -c $nchans -$nsigned $nendian -$nsamps \"$audio_out\" stretch $stretch>$nulfile 2>&1";
+        $com="sox $nodither -t .raw -r $arate -c $achans -$osigned -$osamps $oendian \"$audio_in\" -t .raw -r $nrate -c $nchans -$nsigned $nendian -$nsamps \"$audio_out\" stretch $stretch>$nulfile 2>&1";
     }
     else {
-	$com="sox $nodither -t .raw -r $arate -c $achans -$osigned -$osamps $oendian \"$audio_in\" -t .raw -r $nrate -c $nchans -$nsigned $nendian -$nsamps \"$audio_out\">$nulfile 2>&1";
+        $com="sox $nodither -t .raw -r $arate -c $achans -$osigned -$osamps $oendian \"$audio_in\" -t .raw -r $nrate -c $nchans -$nsigned $nendian -$nsamps \"$audio_out\">$nulfile 2>&1";
     }
     $smerr=smog_system($com);
     if ($smerr) {
-	sig_system_error("$com",$smerr);
-	$panic=1;
+        sig_system_error("$com",$smerr);
+        $panic=1;
     }
 }
 
@@ -5665,15 +5613,15 @@
     my $ext=(split(/\./,$fname))[-1];
 
     if ($ext=~/(.*)\"$/) {
-	$ext=$1;
-    }
+    $ext=$1;
+}
 
     return ".".$ext;
 }
 
 
 
-sub insert_audio {
+    sub insert_audio {
 #what we are going to do:
 # 1) copy the end of the audio (after insertion) to a new file [$where to $to_end]
 # 2) insert silence up to $where (if necessary)
@@ -5687,191 +5635,191 @@
 # $from_handle - handle of from file
 # $to_end - size of to file
 
-    #if $arate<0, we will insert silence from $where to $where+$start-$end
+#if $arate<0, we will insert silence from $where to $where+$start-$end
 
     my ($xxsamps,$xxchans,$xxsigned,$xxendian,$needstemp)=@_;
 
     if ($achans==0) {
-	return;
-    }
+    return;
+}
 
     if (!defined($times)) {
-	$times=1;
-    }
+    $times=1;
+}
 
     my ($audio_from)=$audio_from;
 
     my ($audio_to)="$curtmpdir/audio";
     if (defined($from_handle)) {
-	if ($undo_cut) {
-	    $audio_from="$tmpdir/$from_handle/audio.bak";
-	}
-	else {
-	    $audio_from="$tmpdir/$from_handle/audio";
-	}
-    }
+    if ($undo_cut) {
+    $audio_from="$tmpdir/$from_handle/audio.bak";
+}
+    else {
+    $audio_from="$tmpdir/$from_handle/audio";
+}
+}
     my ($audio_temp)="$curtmpdir/audio.temp";
 
     unlink "$audio_temp";
     if ($^O eq "MSWin32") {
-	$smres=smog_system("touch.exe \"$audio_temp\"");
-    }
-    else {
-	$smres=smog_system("touch \"$audio_temp\"");
-    }
-    
-    if ($smres) {
-	$panic=sig_write_error("$audio_temp");
-	return;
-    }
+    $smres=smog_system("touch.exe \"$audio_temp\"");
+}
+else {
+    $smres=smog_system("touch \"$audio_temp\"");
+}
 
-    if ($^O eq "MSWin32") {
-	#smog_system("chmod.exe 600 \"$audio_temp\"");
-    }
-    else {
-	smog_system("/bin/chmod 600 \"$audio_temp\"");
-    }
+if ($smres) {
+$panic=sig_write_error("$audio_temp");
+    return;
+}
 
-    $silence=0;
-    if ($arate<0) {
-	$silence=1;
-	$arate=-$arate;
-    }
+if ($^O eq "MSWin32") {
+#smog_system("chmod.exe 600 \"$audio_temp\"");
+}
+else {
+smog_system("/bin/chmod 600 \"$audio_temp\"");
+}
 
-    $align=$achans*$asamps/8;
+$silence=0;
+if ($arate<0) {
+$silence=1;
+$arate=-$arate;
+}
+
+$align=$achans*$asamps/8;
+
+my $ospos=$spos=&align($arate*$align*$start);
+my $oepos=$epos=&align($arate*$align*$end);
+my $owpos=$wpos=&align($arate*$align*$where);
 
-    my $ospos=$spos=&align($arate*$align*$start);
-    my $oepos=$epos=&align($arate*$align*$end);
-    my $owpos=$wpos=&align($arate*$align*$where);
 
+# step 1 - copy end to temp
+if ($needstemp) {
+my $to_end=-s $audio_to;
+my $size=$to_end-$wpos;
+if ($size>0) {
+        $fdd_in=$audio_to;
+        $fdd_out=$audio_temp;
 
-    # step 1 - copy end to temp
-    if ($needstemp) {
-	my $to_end=-s $audio_to;
-	my $size=$to_end-$wpos;
-	if ($size>0) {
-	    $fdd_in=$audio_to;
-	    $fdd_out=$audio_temp;
-	    
-	    &fast_dd($size,$wpos,0);
-	    return if ($panic);
-	}
+        &fast_dd($size,$wpos,0);
+        return if ($panic);
     }
+}
 
-    $audio_file=$audio_to;
+$audio_file=$audio_to;
 
 
-    # step 2 - pad with silence to insertion point (if necessary)
-    &append_silence(0,$wpos,$xxsamps,$xxchans,$xxsigned,$xxendian);
-    return if $panic;
+# step 2 - pad with silence to insertion point (if necessary)
+&append_silence(0,$wpos,$xxsamps,$xxchans,$xxsigned,$xxendian);
+return if $panic;
 
 
 ####################################################
-    # step 3 - insert new section (possibly multiple times)
+# step 3 - insert new section (possibly multiple times)
 
-    my ($nepos)=$epos;
-    my ($nspos)=$spos;
-    my ($nwpos)=$wpos;
+my ($nepos)=$epos;
+my ($nspos)=$spos;
+my ($nwpos)=$wpos;
 
-    $times_inserted=0;
-    $factor=1;
-    $silence_remembered=0;
+$times_inserted=0;
+$factor=1;
+$silence_remembered=0;
 
-    my ($xaudio_from)=$audio_from;
+my ($xaudio_from)=$audio_from;
 
-    while ($times_inserted<$times) {
-	$size=$nepos-$nspos;
-	if ($size>0) {
-	    if ($silence) {
-		$fsize=-s $audio_to;
-		$fsize=&align($fsize-$nwpos); #becomes offset
-		&append_silence($fsize,$nwpos+$size,$xxsamps,$xxchans,$xxsigned,$xxendian);
-		return if $panic;
-	    }
-	    else {
-		$fdd_in=$xaudio_from;
-		$fdd_out=$audio_to;
-		$afsize=-s $fdd_in;
-		if ($size+$nspos>$afsize) {
-		    $size=$afsize-$nspos;
-		}
-		&fast_dd($size,$nspos,$nwpos);
-		return if ($panic);
-	    }
-	}
-
-	$times_inserted+=$factor;
-	# step 4, pad with silence if necessary
-	if (! $silence && (-s $audio_temp||$times_inserted<$times)) {
-	    $inserted=$oepos-$nspos;
-	    &append_silence(0,$nwpos+$inserted,$xxsamps,$xxchans,$xxsigned,$xxendian);
-	    return if ($panic);
-	    unless ($silence_remembered>0) {
-		$silence_remembered=$oepos-$nepos;
-	    }
-	}
-	else {
-	    $inserted=$nepos-$nspos;
-	}
-
-	if ($times_inserted==2) {
-	    $oepos=$nepos=$nwpos;
-	    $nspos=$nwpos-$inserted;
-	    $xaudio_from=$audio_to;
-	}
-
-	$nwpos+=$inserted;
-
-	if ($times_inserted>1) {
-	    $nepos+=$inserted;
-	    $oepos+=$inserted;
-	    $factor*=2;
-	}
-	while ($times>$times_inserted&&$factor>$times-$times_inserted) {
-	    $nspos+=($oepos-$nspos)/2;
-	    $factor/=2;
-	}
-
-	if ($factor+$times_inserted==$times) {
-	    # this will be our last insertion...
-	    if (-s $audio_temp==0) {
-		$nepos-=$silence_remembered;
-	    }
-	}
+while ($times_inserted<$times) {
+    $size=$nepos-$nspos;
+    if ($size>0) {
+            if ($silence) {
+                $fsize=-s $audio_to;
+                $fsize=&align($fsize-$nwpos); #becomes offset
+                &append_silence($fsize,$nwpos+$size,$xxsamps,$xxchans,$xxsigned,$xxendian);
+                return if $panic;
+        }
+        else {
+            $fdd_in=$xaudio_from;
+            $fdd_out=$audio_to;
+            $afsize=-s $fdd_in;
+            if ($size+$nspos>$afsize) {
+                    $size=$afsize-$nspos;
+                }
+                &fast_dd($size,$nspos,$nwpos);
+                return if ($panic);
+            }
+        }
+
+        $times_inserted+=$factor;
+# step 4, pad with silence if necessary
+        if (! $silence && (-s $audio_temp||$times_inserted<$times)) {
+            $inserted=$oepos-$nspos;
+            &append_silence(0,$nwpos+$inserted,$xxsamps,$xxchans,$xxsigned,$xxendian);
+            return if ($panic);
+            unless ($silence_remembered>0) {
+                $silence_remembered=$oepos-$nepos;
+            }
+        }
+        else {
+            $inserted=$nepos-$nspos;
+        }
+
+        if ($times_inserted==2) {
+            $oepos=$nepos=$nwpos;
+            $nspos=$nwpos-$inserted;
+            $xaudio_from=$audio_to;
+        }
+
+        $nwpos+=$inserted;
+
+        if ($times_inserted>1) {
+            $nepos+=$inserted;
+            $oepos+=$inserted;
+            $factor*=2;
+        }
+        while ($times>$times_inserted&&$factor>$times-$times_inserted) {
+            $nspos+=($oepos-$nspos)/2;
+            $factor/=2;
+        }
+
+        if ($factor+$times_inserted==$times) {
+# this will be our last insertion...
+            if (-s $audio_temp==0) {
+                $nepos-=$silence_remembered;
+            }
+        }
 
     }
 
 
 ####################################################
 
-    #step 5 - copy end back after insertion
-    if ($needstemp) {
-	$size=&align(-s $audio_temp);
-	if ($size>0) {
-	    $fdd_in=$audio_temp;
-	    $fdd_out=$audio_to;
-	    
-	    &fast_dd($size,0,$nwpos);
-	    return if ($panic);
-	}
-	
-	unlink "$audio_temp";
+#step 5 - copy end back after insertion
+if ($needstemp) {
+$size=&align(-s $audio_temp);
+    if ($size>0) {
+        $fdd_in=$audio_temp;
+        $fdd_out=$audio_to;
+
+        &fast_dd($size,0,$nwpos);
+        return if ($panic);
     }
-    else {
-	# copy from audio.bak to output
-	my ($audio_bak)="$curtmpdir/audio.bak";
-	$size=-s $audio_bak;
-	$size=&align($size-$owpos);
-	if ($size>0) {
-	    $fdd_in=$audio_bak;
-	    $fdd_out=$audio_to;
-
-	    &fast_dd($size,$owpos,$nwpos);
-	    return if ($panic);
-	}
+
+    unlink "$audio_temp";
+}
+else {
+# copy from audio.bak to output
+    my ($audio_bak)="$curtmpdir/audio.bak";
+    $size=-s $audio_bak;
+    $size=&align($size-$owpos);
+    if ($size>0) {
+        $fdd_in=$audio_bak;
+        $fdd_out=$audio_to;
+
+        &fast_dd($size,$owpos,$nwpos);
+        return if ($panic);
     }
+}
 
-    smog_system_sync();
+smog_system_sync();
 
 }
 
@@ -5879,14 +5827,14 @@
 
 sub cut_audio {
 #what we are going to do:
-    #1) copy up to $start to a new file
-    #2) back up the section to be deleted
-    #3) append the section after $end to the new file
-    #4) copy the new file to the original
-    #$start, $end are in seconds
+#1) copy up to $start to a new file
+#2) back up the section to be deleted
+#3) append the section after $end to the new file
+#4) copy the new file to the original
+#$start, $end are in seconds
 
     if ($achans==0) {
-	return;
+        return;
     }
 
     my ($audio_in)="$curtmpdir/audio";
@@ -5897,85 +5845,85 @@
     unlink "$audio_bak";
 
     if ($end==0.) {
-	#delete all audio
-	smog_rename("$audio_in","$audio_bak");
+#delete all audio
+        smog_rename("$audio_in","$audio_bak");
     }
     else {
-	if ($^O eq "MSWin32") {
-	    $smres=smog_system("touch.exe \"$audio_temp\"");
-	}
-	else {
-	    $smres=smog_system("touch \"$audio_temp\"");
-	}
-	if ($smres) {
-	    $panic=sig_write_error("$audio_temp"); 
-	    return;
-	}
-	if ($^O eq "MSWin32") {
-	    #smog_system("chmod.exe 600 \"$audio_temp\"");
-	}
-	else {
-	    smog_system("/bin/chmod 600 \"$audio_temp\"");
-	}
-	
-	$align=$achans*$asamps/8;
-	
-	# step 1
-	$spos=&align($arate*$align*$start);
-	$epos=&align($arate*$align*$end);
-	
-	my ($fsize)=&align(-s $audio_in);
-	
-	if ($epos>$fsize) {
-	    $epos=$fsize;
-	}
-	if ($spos>$epos) {
-	    $spos=$epos;
-	}
-	
-	$seekstart=$spos;
-	my ($size)=$spos;
-	
-	if ($size>0) {
-	    $fdd_in=$audio_in;
-	    $fdd_out=$audio_temp;
-
-	    &fast_dd($size,0,0);
-	    return if $panic;
-	}
-	
-	#step 2
-	$size=($epos-$spos);
-	
-	if ($size>0) {
-	    $fdd_in=$audio_in;
-	    $fdd_out=$audio_bak;
-
-	    &fast_dd($size,$spos,0);
-	    return if $panic;
-	}
-	
-	
-	#step 3
-	$spos=$epos;
-	$epos=$fsize;
-	$size=($epos-$spos);
-	
-	if ($size>0) {
-	    $fdd_in=$audio_in;
-	    $fdd_out=$audio_temp;
-
-	    &fast_dd($size,$spos,$seekstart);
-	    return if $panic;
-	}
-	
-	# step 4
-	unlink "$audio_in";
-	smog_rename( "$audio_temp", "$audio_in");
+        if ($^O eq "MSWin32") {
+            $smres=smog_system("touch.exe \"$audio_temp\"");
+        }
+        else {
+            $smres=smog_system("touch \"$audio_temp\"");
+        }
+        if ($smres) {
+            $panic=sig_write_error("$audio_temp");
+            return;
+        }
+        if ($^O eq "MSWin32") {
+#smog_system("chmod.exe 600 \"$audio_temp\"");
+        }
+        else {
+            smog_system("/bin/chmod 600 \"$audio_temp\"");
+        }
+
+        $align=$achans*$asamps/8;
+
+# step 1
+        $spos=&align($arate*$align*$start);
+        $epos=&align($arate*$align*$end);
+
+        my ($fsize)=&align(-s $audio_in);
+
+        if ($epos>$fsize) {
+            $epos=$fsize;
+        }
+        if ($spos>$epos) {
+            $spos=$epos;
+        }
+
+        $seekstart=$spos;
+        my ($size)=$spos;
+
+        if ($size>0) {
+            $fdd_in=$audio_in;
+            $fdd_out=$audio_temp;
+
+            &fast_dd($size,0,0);
+            return if $panic;
+    }
+
+#step 2
+    $size=($epos-$spos);
+
+        if ($size>0) {
+            $fdd_in=$audio_in;
+            $fdd_out=$audio_bak;
+
+            &fast_dd($size,$spos,0);
+            return if $panic;
+    }
+
+
+#step 3
+    $spos=$epos;
+    $epos=$fsize;
+    $size=($epos-$spos);
+
+        if ($size>0) {
+            $fdd_in=$audio_in;
+            $fdd_out=$audio_temp;
+
+            &fast_dd($size,$spos,$seekstart);
+            return if $panic;
+    }
+
+# step 4
+    unlink "$audio_in";
+    smog_rename( "$audio_temp", "$audio_in");
     }
 
     if (-z $audio_in) {
-	unlink "$audio_in";
+        unlink "$audio_in";
     }
 
     smog_system_sync();
@@ -5984,171 +5932,163 @@
 
 sub align {
     my ($guess)=shift;
-    # align our audio cuts so we don't end halfway through a sample/channel
+# align our audio cuts so we don't end halfway through a sample/channel
     if (!defined($align)) {
-	$align=$achans*$asamps/8;
+        $align=$achans*$asamps/8;
     }
-    $guess=int($guess/$align+.5)*$align;
+    $guess=int($guess/$align+.5) *$align;
     return $guess;
 }
 
 
 sub append_silence {
-    #pad from end - $offset of $audio_file to byte $end-1 with zeros
-    my ($offset,$end,$asamps,$achans,$asigned,$aendian,$audio_file)=@_;
+#pad from end - $offset of $audio_file to byte $end-1 with zeros
+    my($offset,$end,$asamps,$achans,$asigned,$aendian,$audio_file)=@_;
     if ($audio_file eq "") {
-	$audio_file="$curtmpdir/audio";
+        $audio_file="$curtmpdir/audio";
     }
 
-    unless (-f $audio_file) {
-	if ($^O eq "MSWin32") {
-	    $smres=smog_system("touch.exe \"$audio_file\"");
-	}
-	else {
-	    $smres=smog_system("touch \"$audio_file\"");
-	}
-	if ($smres) {
-	    $panic=sig_write_error("$audio_file"); 
-	    return;
-	}
-	if ($^O eq "MSWin32") {
-	    #smog_system("chmod.exe 600 \"$audio_file\"");
-	}
-	else {
-	    smog_system("/bin/chmod 600 \"$audio_file\"");
-	}
+    unless(-f $audio_file) {
+        if ($^O eq "MSWin32") {
+            $smres=smog_system("touch.exe \"$audio_file\"");
+        } else {
+            $smres=smog_system("touch \"$audio_file\"");
+        }
+        if ($smres) {
+            $panic=sig_write_error("$audio_file");
+            return;
+        }
+        if ($^O eq "MSWin32") {
+#smog_system("chmod.exe 600 \"$audio_file\"");
+        } else {
+            smog_system("/bin/chmod 600 \"$audio_file\"");
+        }
     }
 
     my $gsize= -s $audio_file;
-    my $fsize=&align($gsize-$offset); #insert at $fsize-$offset
-    my $size=&align($end-$fsize); #insert to $end
+    my $fsize=&align($gsize-$offset);
+#insert at $fsize-$offset
+    my $size=&align($end-$fsize);
+#insert to $end
 
     if ($size>0) {
-	if ($asigned==1) {
-	    $fdd_out=$audio_file;
-	    if ($^O eq "MSWin32") {
-		$smres=smog_system("touch.exe \"$audio_file\"");
-		if ($smres) {
-		    $panic=sig_write_error("$audio_file"); 
-		    return;
-		}
-		open AUD,"+<","$audio_file" or $panic=sig_write_error("$audio_file");
-		return if $panic;
-		seek AUD,$gsize-$offset,SEEK_SET or $panic=sig_write_error("$audio_file");
-		return if $panic;
-		for ($i=0;$i<$size;$i++) {
-		    print AUD chr(0) or $panic=sig_write_error("$audio_file");
-		    return if $panic;
-		}
-	    }
-	    else {
-		$fdd_in="/dev/zero";
-		&fast_dd($size,0,$fsize);
-	    }
-	    return if $panic;
-	}
-	else {
-	    if ($^O eq "MSWin32") {
-		$smres=smog_system("touch.exe \"$audio_file\"");
-	    }
-	    else {
-		$smres=smog_system("touch \"$audio_file\"");
-	    }
-	    if ($smres) {
-		$panic=sig_write_error("$audio_file"); 
-		return;
-	    }
-	    open AUD,"+<","$audio_file" or $panic=sig_write_error("$audio_file");
-	    return if $panic;
-	    seek AUD,$gsize-$offset,SEEK_SET or $panic=sig_write_error("$audio_file");
-	    return if $panic;
-	    if ($asamps==8) {
-		for ($i=0;$i<$size;$i++) {
-		    print AUD chr(128) or $panic=sig_write_error("$audio_file");
-		    return if $panic;
-		}
-	    }
-	    else {
-		if ($aendian) {
-		    for ($i=0;$i<$size;$i+=2*$achans) {
-			for ($j=0;$j<$achans;$j++) {
-			    print AUD chr(0) or $panic=sig_write_error("$audio_file");
-			    return if $panic;
-			    print AUD chr(128) or $panic=sig_write_error("$audio_file");
-			    return if $panic;
-			}
-		    }
-		}
-		else {
-		    for ($i=0;$i<$size;$i+=2*$achans) {
-			for ($j=0;$j<$achans;$j++) {
-			    print AUD chr(128) or $panic=sig_write_error("$audio_file");
-			    return if $panic;
-			    print AUD chr(0) or $panic=sig_write_error("$audio_file");
-			    return if $panic;
-			}
-		    }
-		}
-	    }
-	    close AUD;
-	}
+        if ($asigned==1) {
+            $fdd_out=$audio_file;
+            if ($^O eq "MSWin32") {
+                $smres=smog_system("touch.exe \"$audio_file\"");
+                if ($smres) {
+                    $panic=sig_write_error("$audio_file");
+                    return;
+                }
+                open AUD,"+<","$audio_file" or $panic=sig_write_error("$audio_file");
+                return if $panic;
+            seek AUD,$gsize-$offset,SEEK_SET or $panic=sig_write_error("$audio_file");
+                return if $panic;
+            for ($i=0; $i<$size; $i++) {
+                    print AUD chr(0) or $panic=sig_write_error("$audio_file");
+                    return if $panic;
+            }
+        } else {
+            $fdd_in="/dev/zero";
+            &fast_dd($size,0,$fsize);
+            }
+            return if $panic;
+    } else {
+        if ($^O eq "MSWin32") {
+                $smres=smog_system("touch.exe \"$audio_file\"");
+            } else {
+                $smres=smog_system("touch \"$audio_file\"");
+            }
+            if ($smres) {
+                $panic=sig_write_error("$audio_file");
+                return;
+            }
+            open AUD,"+<","$audio_file" or $panic=sig_write_error("$audio_file");
+            return if $panic;
+        seek AUD,$gsize-$offset,SEEK_SET or $panic=sig_write_error("$audio_file");
+            return if $panic;
+        if ($asamps==8) {
+                for ($i=0; $i<$size; $i++) {
+                    print AUD chr(128) or $panic=sig_write_error("$audio_file");
+                    return if $panic;
+            }
+        } else {
+            if ($aendian) {
+                    for ($i=0; $i<$size; $i+=2*$achans) {
+                        for ($j=0; $j<$achans; $j++) {
+                            print AUD chr(0) or $panic=sig_write_error("$audio_file");
+                            return if $panic;
+                        print AUD chr(128) or $panic=sig_write_error("$audio_file");
+                            return if $panic;
+                    }
+                }
+            } else {
+                for ($i=0; $i<$size; $i+=2*$achans) {
+                        for ($j=0; $j<$achans; $j++) {
+                            print AUD chr(128) or $panic=sig_write_error("$audio_file");
+                            return if $panic;
+                        print AUD chr(0) or $panic=sig_write_error("$audio_file");
+                            return if $panic;
+                    }
+                }
+            }
+        }
+        close AUD;
     }
 }
+}
 
 
 
 
 sub open_images {
-    # set $file before calling this function
-    # set $only_first to 1 to just open the first image in a directory
-    # set $height $width to force a particular size, otherwise $height=$width=0 to open all to the first image size
-    # if first image size cannot be obtained $dwidth and $dheight are used
+# set $file before calling this function
+# set $only_first to 1 to just open the first image in a directory
+# set $height $width to force a particular size, otherwise $height=$width=0 to open all to the first image size
+# if first image size cannot be obtained $dwidth and $dheight are used
 
-    my ($i)=shift;
+my($i)=shift;
     my $orig=$i;
 
     if (-d $file) {
-	# is a directory
+# is a directory
 
-	$dir=$file;
-	opendir DIR,$dir;
-	my @files=readdir(DIR);
-	closedir DIR;
-
-	unless ($only_first) {
-	    # open in numeric order
-	    @files = sort {byfile($a,$b)} (@files);
-	    if (!defined($antialias)) {
-		$antialias=&rc_get("antialias");
-	    }
-	}
-
-	foreach (@files) {
-	    $file="$dir/$_";
-	    unless ($_ =~ /^\./||(! -f $file)||(-z $file)) {
-		$nframes=&open_single_image($i);
-		return if $panic;
-		if (-s "$curtmpdir/$name$img_ext") {
-		    if ($only_first) {
-			$i++;
-			last;
-		    }
-		    else {
-			$i+=$nframes;
-		    }
-		}
-		else {
-		    unlink "$curtmpdir/$name$img_ext";
-		}
-	    }
-	}
-    }
-    else {
-	&open_single_image($i);
-	return if $panic;
-	unless (-s "$curtmpdir/$name$img_ext") {
-	    unlink "$curtmpdir/$name$img_ext";
-	}
+        $dir=$file;
+        opendir DIR,$dir;
+        my @files=readdir(DIR);
+        closedir DIR;
+
+        unless($only_first) {
+# open in numeric order
+            @files = sort {byfile($a,$b)}(@files);
+            if (!defined($antialias)) {
+                $antialias=&rc_get("antialias");
+            }
+        }
+
+        foreach(@files) {
+            $file="$dir/$_";
+            unless($_ =~ /^\./||(! -f $file)||(-z $file)) {
+                $nframes=&open_single_image($i);
+                return if $panic;
+            if (-s "$curtmpdir/$name$img_ext") {
+                    if ($only_first) {
+                        $i++;
+                        last;
+                    } else {
+                        $i+=$nframes;
+                    }
+                } else {
+                    unlink "$curtmpdir/$name$img_ext";
+                }
+            }
+        }
+    } else {
+        &open_single_image($i);
+        return if $panic;
+    unless(-s "$curtmpdir/$name$img_ext") {
+            unlink "$curtmpdir/$name$img_ext";
+        }
     }
     return $i-$orig;
 }
@@ -6156,24 +6096,24 @@
 
 
 sub byfile {
-    # sort files in numerical-alpha order
+# sort files in numerical-alpha order
 
-    #thanks to dominus !
+#thanks to dominus !
     my @a = split /(\d+)/, $a;
     my @b = split /(\d+)/, $b;
     my $M = @a > @b ? @a : @b;
     my $res = 0;
     for (my $i = 0; $i < $M; $i++) {
-	return -1 if ! defined $a[$i];
-	return 1 if  ! defined $b[$i];
-	if ($a[$i] =~ /\d/) {
-	    $res = $a[$i] <=> $b[$i];
-	} else {
-	    $res = $a[$i] cmp $b[$i];
-	}
-	last if $res;
-    }
-    $res;
+        return -1 if ! defined $a[$i];
+        return 1 if  ! defined $b[$i];
+        if ($a[$i] =~ /\d/) {
+            $res = $a[$i] <=> $b[$i];
+        } else {
+            $res = $a[$i] cmp $b[$i];
+        }
+        last if $res;
+}
+$res;
 }
 
 
@@ -6181,188 +6121,187 @@
 
 
 sub open_single_image {
-    # set $hsize and $vsize to force the image size, set to 0 to autoresize
-    #identify hangs if the file extension is ".avi" or ".mp4" or ".mpg"
+# set $hsize and $vsize to force the image size, set to 0 to autoresize
+#identify hangs if the file extension is ".avi" or ".mp4" or ".mpg"
 
 
-    my $i=shift;
-    my $j;
+my $i=shift;
+my $j;
 
-    $name=&mkname($i);
+$name=&mkname($i);
     my $nframes=0;
 
-    if ($file =~ /:\/\//) {
-	return 0;
-    }
+if ($file =~ /:\/\//) {
+    return 0;
+}
 
-    if (!defined($file_ext)) {
-	$file_ext=&get_ext("$file");
-    }
+if (!defined($file_ext)) {
+    $file_ext=&get_ext("$file");
+}
 
-    if ($file_ext eq ".avi"||$file_ext eq ".mp4"||$file_ext eq ".mpg"||$file_ext eq ".ogg"||$file_ext eq ".mov"||$file_ext eq ".ogv"||$file_ext eq ".webm"||$file_ext eq ".mkv"||$file_ext eq ".asf"||$file_ext eq ".wmv"||$file_ext eq ".flv"||$file_ext eq ".mng"||$file_ext eq ".dv"||$file_ext eq ".mp3" || $file_ext eq ".mpeg") {
-	# need to set $name before we return
-	return 0;
-    }
+if ($file_ext eq ".avi"||$file_ext eq ".mp4"||$file_ext eq ".mpg"||$file_ext eq ".ogg"||$file_ext eq ".mov"||$file_ext eq ".ogv"||
+        $file_ext eq ".webm"||$file_ext eq ".mkv"||$file_ext eq ".asf"||$file_ext eq ".wmv"||$file_ext eq ".flv"||$file_ext eq ".mng"||
+        $file_ext eq ".dv"||$file_ext eq ".mp3" || $file_ext eq ".mpeg") {
+# need to set $name before we return
+return 0;
+}
 
-    if ($hsize*$vsize==0) {
-	&get_image_size($file);
-	return 0 if ($panic||$hsize==-1);
-    }
+if ($hsize*$vsize==0) {
+&get_image_size($file);
+    return 0 if ($panic||$hsize==-1);
+}
 
-    if ($hsize*$vsize==0) {
-	return 0;
-    }
+if ($hsize*$vsize==0) {
+return 0;
+}
 
-    smog_system_sync();
+smog_system_sync();
 
-    if ($antialias eq "false") {
-	$com="$smog_convert_command +antialias \"$file\" -scale $hsize"."!x"."$vsize! $img_prefix\"$curtmpdir/$name$img_ext\" > $nulfile 2>&1";
-    }
-    else {
-	$com="$smog_convert_command \"$file\" -resize $hsize"."!x"."$vsize! $img_prefix\"$curtmpdir/$name$img_ext\" >$nulfile 2>&1";
-    }
+if ($antialias eq "false") {
+$com="$smog_convert_command +antialias \"$file\" -scale $hsize"."!x"."$vsize! $img_prefix\"$curtmpdir/$name$img_ext\" > $nulfile 2>&1";
+} else {
+$com="$smog_convert_command \"$file\" -resize $hsize"."!x"."$vsize! $img_prefix\"$curtmpdir/$name$img_ext\" >$nulfile 2>&1";
+}
 
 
-    $smerr=smog_system($com);
+$smerr=smog_system($com);
 
-    if ($smerr) {
-	sig_system_error("$com",$smerr);
-	$panic=1;
-	return 0;
-    }
+if ($smerr) {
+sig_system_error("$com",$smerr);
+    $panic=1;
+    return 0;
+}
 
 
-    #convert gives multiple frames for e.g. animated gif
-    $found=1;
-    for ($j=0;$found==1;$j++) {
-	if (-f "$curtmpdir/$name-$j$img_ext") {
-	    $newname=&mkname($i+$j);
-	    smog_rename( "$curtmpdir/$name-$j$img_ext","$curtmpdir/$newname$img_ext");
-	    $nframes++;
+#convert gives multiple frames for e.g. animated gif
+$found=1;
+for ($j=0; $found==1; $j++) {
+if (-f "$curtmpdir/$name-$j$img_ext") {
+        $newname=&mkname($i+$j);
+        smog_rename("$curtmpdir/$name-$j$img_ext","$curtmpdir/$newname$img_ext");
+        $nframes++;
 
-	}
-	else {
-	    $found=0;
-	}
+    } else {
+        $found=0;
     }
+}
 
-    if ($hsize*$vsize==0) {
-	&get_image_size("$curtmpdir/$name$img_ext");
-    }
+if ($hsize*$vsize==0) {
+&get_image_size("$curtmpdir/$name$img_ext");
+}
 
-    if ($hsize*$vsize>0&&$nframes==0) {
-	$nframes=1;
-    }
+if ($hsize*$vsize>0&&$nframes==0) {
+$nframes=1;
+}
 
-    return $nframes;
+return $nframes;
 
 }
 
 
 
 sub get_image_size {
-    # returns $hsize,$vsize and $bpp for $1
-    my ($file)=shift;
-    my ($i);
+# returns $hsize,$vsize and $bpp for $1
+my($file)=shift;
+    my($i);
 
-    #identify hangs if the file extension is ".avi" or ".mp4"...maybe more...
-    my ($file_ext)=&get_ext("$file");
+#identify hangs if the file extension is ".avi" or ".mp4"...maybe more...
+    my($file_ext)=&get_ext("$file");
 
     if ($file_ext eq ".avi"||$file_ext eq ".mp4"||$file_ext eq ".mpg"||$file_ext eq ".mpeg") {
-	$height=$width=$bpp=0;
-	return;
+        $height=$width=$bpp=0;
+        return;
     }
 
-    $bpp=8; # default for images
-    if (!defined($imresact)) {
-	$imresact=&rc_get("image_resize_action");
-    }
-
-    # imresact can be: default - resize all images to default; bound - use as max size but keep aspect (e.g. for thumbnails); or none: return actual size
-
-    my ($id_cmd)=&location("identify");
-
-    unless ($id_cmd eq "") {
-	$com="\"$id_cmd\" \"$file\" 2>$nulfile";
-	@info=split / /, smog_system_direct($com);
-
-	if ($?) {
-	    # probably not an image then
-	    $hsize=$vsize=$bpp=-1;
-	    return;
-	}
-
-	my ($file2)=$file;
-	$space_count=($file2 =~ tr/ //);
-	for ($i=0;$i<$space_count;$i++) {
-	    shift(@info);
-	}
-	$bppstr=$info[4];
-	@bpp=split /-/,$bppstr;
-	$bpp=$bpp[0];
-	@sizestr=split /\+/,$info[2];
-	@size=split /x/,$sizestr[0];
-
-	$hsize=$size[0];
-	$vsize=$size[1];
-	
-
-	if ($imresact eq "bound") {
-	    if ($hsize>$dwidth) {
-		$shrink=$hsize/$dwidth;
-		$hsize/=$shrink;
-		$vsize/=$shrink;
-	    }
-	    if ($vsize>$dheight) {
-		$shrink=$vsize/$dheight;
-		$hsize/=$shrink;
-		$vsize/=$shrink;
-	    }
-	    $hsize=int($hsize);
-	    $vsize=int($vsize);
-	}
-	elsif ($imresact eq "default") {
-	    $hsize=$vsize="";
-	}
+$bpp=8; # default for images
+        if (!defined($imresact)) {
+                $imresact=&rc_get("image_resize_action");
+            }
+
+# imresact can be: default - resize all images to default; bound - use as max size but keep aspect (e.g. for thumbnails); or none: return actual size
+
+    my($id_cmd)=&location("identify");
+
+    unless($id_cmd eq "") {
+        $com="\"$id_cmd\" \"$file\" 2>$nulfile";
+        @info=split / /, smog_system_direct($com);
+
+        if ($?) {
+# probably not an image then
+            $hsize=$vsize=$bpp=-1;
+            return;
+        }
+
+        my($file2)=$file;
+        $space_count=($file2 =~ tr/ //);
+        for ($i=0; $i<$space_count; $i++) {
+        shift(@info);
+        }
+        $bppstr=$info[4];
+                @bpp=split /-/,$bppstr;
+                $bpp=$bpp[0];
+                @sizestr=split /\+/,$info[2];
+                @size=split /x/,$sizestr[0];
+
+                $hsize=$size[0];
+                $vsize=$size[1];
+
+
+        if ($imresact eq "bound") {
+        if ($hsize>$dwidth) {
+                $shrink=$hsize/$dwidth;
+                $hsize/=$shrink;
+                $vsize/=$shrink;
+            }
+            if ($vsize>$dheight) {
+                $shrink=$vsize/$dheight;
+                $hsize/=$shrink;
+                $vsize/=$shrink;
+            }
+            $hsize=int($hsize);
+            $vsize=int($vsize);
+        }
+        elsif($imresact eq "default") {
+            $hsize=$vsize="";
+        }
     }
     if (!defined($hsize)||$hsize eq "") {
-	$hsize=$dwidth;
+        $hsize=$dwidth;
     }
     if (!defined($vsize)||$vsize eq "") {
-	$vsize=$dheight;
+        $vsize=$dheight;
     }
 }
 
 
 
 sub fill_and_redo_frames {
-    # resample and fill gaps in frames
+# resample and fill gaps in frames
 
     my $next=0;
 
     smog_chdir("$curtmpdir");
 
 
-    for ($i=1;$i<=$end;$i++) {
-	$name=&mkname($i);
+    for ($i=1; $i<=$end; $i++) {
+        $name=&mkname($i);
+
+        if ($next<$i&&$next>-1) {
+            $last=$next;
+            $next=&get_next_frame;
+            return if $panic;
+    }
+    if ($last>0&&($i-$last)<($next-$i)) {
+            $fromname=&mkname($last);
+        } else {
+            $fromname=&mkname($next);
+        }
 
-	if ($next<$i&&$next>-1) {
-	    $last=$next;
-	    $next=&get_next_frame;
-	    return if $panic;
-	}
-	if ($last>0&&($i-$last)<($next-$i)) {
-	    $fromname=&mkname($last);
-	}
-	else {
-	    $fromname=&mkname($next);
-	}
-
-	unless ($fromname eq $name) {
-	    smog_copy("$curtmpdir/$fromname$img_ext","$curtmpdir/$name$img_ext");
-	    return if $panic;
-	}
-	&sig_progress($i);
+        unless($fromname eq $name) {
+            smog_copy("$curtmpdir/$fromname$img_ext","$curtmpdir/$name$img_ext");
+            return if $panic;
+    }
+    &sig_progress($i);
     }
 
 }
@@ -6373,30 +6312,30 @@
     my $xname;
     $imresact="none";
 
-    for ($j=$i;$j<=$end;$j++) {
-	$xname=&mkname($j);
-	if (-f "$xname$img_ext") {
-	    # found next frame, resize it
-	    &get_image_size("$xname$img_ext");
-	    return if ($panic||$hsize==-1);
-
-	    if ($hsize<$width||$vsize<$height) {
-		$com="$smog_convert_command -resize $width" . "!x" . $height . "!+0+0 $img_prefix_prefix\"$xname$img_ext\" $img_prefix\"$xname.mgk\" >$nulfile 2>&1";
-	    }
-	    else {
-		$com="$smog_convert_command -crop $width" . "!x" . $height . "! $img_prefix\"$xname$img_ext\" $img_prefix\"$xname.mgk\" >$nulfile 2>&1";
-	    }
-	    $smerr=smog_system($com);
-	    if ($smerr) {
-		sig_system_error("$com",$smerr);
-		$panic=1;
-		return;
-	    }
-	    smog_rename( "$xname.mgk","$xname$img_ext");
-	    return $j;
-	}
+    for ($j=$i; $j<=$end; $j++) {
+        $xname=&mkname($j);
+        if (-f "$xname$img_ext") {
+# found next frame, resize it
+            &get_image_size("$xname$img_ext");
+            return if ($panic||$hsize==-1);
+
+            if ($hsize<$width||$vsize<$height) {
+                $com="$smog_convert_command -resize $width" . "!x" . $height .
+                "!+0+0 $img_prefix_prefix\"$xname$img_ext\" $img_prefix\"$xname.mgk\" >$nulfile 2>&1";
+            } else {
+                $com="$smog_convert_command -crop $width" . "!x" . $height . "! $img_prefix\"$xname$img_ext\" $img_prefix\"$xname.mgk\" >$nulfile 2>&1";
+            }
+            $smerr=smog_system($com);
+            if ($smerr) {
+                sig_system_error("$com",$smerr);
+                $panic=1;
+                return;
+            }
+            smog_rename("$xname.mgk","$xname$img_ext");
+            return $j;
+        }
     }
-    # no next frame found
+# no next frame found
     return -1;
 }
 
@@ -6405,24 +6344,24 @@
 
 sub mp3_open {
     if (-f $audio_in) {
-	unlink "$audio_in";
+        unlink "$audio_in";
     }
     $f_size=0;
 
-    # prefer mpg321 if it's available
+# prefer mpg321 if it's available
     unless (&location("mpg321") eq "") {
-	smog_system("mpg321 -w \"$audio_in\" --rate 44100 --stereo \"$file\" >$nulfile 2>&1");
-	$f_size=-s $audio_in;
+        smog_system("mpg321 -w \"$audio_in\" --rate 44100 --stereo \"$file\" >$nulfile 2>&1");
+        $f_size=-s $audio_in;
     }
     if ($f_size==0) {
-	unless (&location("mpg123") eq "") {
-	    smog_system("mpg123 -w \"$audio_in\" --rate 44100 --stereo \"$file\" >$nulfile 2>&1");
-	    $f_size=-s $audio_in;
-	}
+        unless (&location("mpg123") eq "") {
+            smog_system("mpg123 -w \"$audio_in\" --rate 44100 --stereo \"$file\" >$nulfile 2>&1");
+            $f_size=-s $audio_in;
+        }
     }
     if ($f_size==0) {
-	&othera_open;
-	return;
+        &othera_open;
+        return;
     }
 
     $file=$audio_in;
@@ -6431,25 +6370,25 @@
     &get_file_info;
     return if $panic;
 
-    $asigned=$signed;
-    $aendian=$endian;
+$asigned=$signed;
+$aendian=$endian;
 
-    if ($arate==0&&$achans==0&&$asamps==0) {
-	# TODO - find way to read these
-	# have to assume these for now
-	$arate=44100;
-	$achans=2;
-	$asamps=16;
-
-	$asigned=1;
-	if ($asamps==8) {
-	    $asigned=0;
-	}
-	$aendian=&get_endian;
+if ($arate==0&&$achans==0&&$asamps==0) {
+# TODO - find way to read these
+# have to assume these for now
+        $arate=44100;
+        $achans=2;
+        $asamps=16;
+
+        $asigned=1;
+        if ($asamps==8) {
+            $asigned=0;
+        }
+        $aendian=&get_endian;
     }
 
     if ($f_size==0) {
-	$f_size= -s $audio_in;
+        $f_size= -s $audio_in;
     }
 
 }
@@ -6459,17 +6398,17 @@
     $f_size=0;
 
     if (-f $audio_in) {
-	unlink "$audio_in";
+        unlink "$audio_in";
     }
-    
+
     unless (&location("ogg123") eq "") {
-	smog_system("ogg123 -d wav -f \"$audio_in\" \"$file\" >$nulfile 2>&1");
-	$f_size= -s $audio_in;
+        smog_system("ogg123 -d wav -f \"$audio_in\" \"$file\" >$nulfile 2>&1");
+        $f_size= -s $audio_in;
     }
 
     if ($f_size==0) {
-	&othera_open;
-	return;
+        &othera_open;
+        return;
     }
 
 
@@ -6479,27 +6418,27 @@
     &get_file_info;
     return if $panic;
 
-    $asigned=$signed;
-    $aendian=$endian;
+$asigned=$signed;
+$aendian=$endian;
 
-    if ($arate==0&&$achans==0&&$asamps==0) {
-	# TODO - find way to read these
-	# have to assume these for now
-	$arate=44100;
-	$achans=2;
-	$asamps=16;
-
-	$asigned=1;
-	if ($asamps==8) {
-	    $asigned=0;
-	}
-	$aendian=&get_endian;
+if ($arate==0&&$achans==0&&$asamps==0) {
+# TODO - find way to read these
+# have to assume these for now
+        $arate=44100;
+        $achans=2;
+        $asamps=16;
+
+        $asigned=1;
+        if ($asamps==8) {
+            $asigned=0;
+        }
+        $aendian=&get_endian;
     }
 
     if ($f_size==0) {
-	$f_size= -s $audio_in;
+        $f_size= -s $audio_in;
     }
-    
+
 }
 
 
@@ -6507,37 +6446,37 @@
     $curtmpfile=$curtmpdir . "/.temp";
 
     if (-f $audio_in) {
-	unlink "$audio_in";
+        unlink "$audio_in";
     }
-    
+
     smog_copy("$file","$audio_in");
     return if $panic;
 
-    $file=$audio_in;
-    $is_audio=1;
+$file=$audio_in;
+$is_audio=1;
 
-    &get_file_info;
-    return if $panic;
+&get_file_info;
+return if $panic;
 
-    $asigned=$signed;
-    $aendian=$endian;
+$asigned=$signed;
+$aendian=$endian;
 
-    if ($arate==0&&$achans==0&&$asamps==0) {
-	# TODO - find way to read these
-	# have to assume these for now
-	$arate=44100;
-	$achans=2;
-	$asamps=16;
-
-	$asigned=1;
-	if ($asamps==8) {
-	    $asigned=0;
-	}
-	$aendian=&get_endian;
+if ($arate==0&&$achans==0&&$asamps==0) {
+# TODO - find way to read these
+# have to assume these for now
+        $arate=44100;
+        $achans=2;
+        $asamps=16;
+
+        $asigned=1;
+        if ($asamps==8) {
+            $asigned=0;
+        }
+        $aendian=&get_endian;
     }
 
     if ($f_size==0) {
-	$f_size= -s $audio_in;
+        $f_size= -s $audio_in;
     }
 }
 
@@ -6556,9 +6495,9 @@
     $smerr=smog_system($com);
 
     if ($smerr) {
-	sig_system_error("$com",$smerr);
-	$panic=1;
-	return;
+        sig_system_error("$com",$smerr);
+        $panic=1;
+        return;
     }
 
 
@@ -6568,25 +6507,25 @@
     &get_file_info;
     return if $panic;
 
-    $asigned=$signed;
-    $aendian=$endian;
+$asigned=$signed;
+$aendian=$endian;
 
-    if ($arate==0&&$achans==0&&$asamps==0) {
-	# TODO - find way to read these
-	# have to assume these for now
-	$arate=44100;
-	$achans=2;
-	$asamps=16;
-
-	$asigned=1;
-	if ($asamps==8) {
-	    $asigned=0;
-	}
-	$aendian=&get_endian;
+if ($arate==0&&$achans==0&&$asamps==0) {
+# TODO - find way to read these
+# have to assume these for now
+        $arate=44100;
+        $achans=2;
+        $asamps=16;
+
+        $asigned=1;
+        if ($asamps==8) {
+            $asigned=0;
+        }
+        $aendian=&get_endian;
     }
 
     if ($f_size==0) {
-	$f_size= -s $audio_in;
+        $f_size= -s $audio_in;
     }
 
 }
@@ -6602,13 +6541,13 @@
 
     if($RealMonth < 10)
     {
-	$RealMonth = "0" . $RealMonth; # add a leading zero to one-digit months
+        $RealMonth = "0" . $RealMonth; # add a leading zero to one-digit months
     }
     if($Day < 10)
     {
-	$Day = "0" . $Day; # add a leading zero to one-digit days
+        $Day = "0" . $Day; # add a leading zero to one-digit days
     }
-    
+
     $Fixed_Year = $Year + 1900;
 
     return $Fixed_Year."-".$RealMonth."-".$Day;
@@ -6618,25 +6557,25 @@
 
 
 sub getint {
-    # get an int from a file in $endian format
+# get an int from a file in $endian format
     my ($string)=shift;
     my (@val)=unpack("CCCC",$string); #unpack $string to 4 chars in @val array
 
-    # TODO - this needs checking !
+# TODO - this needs checking !
 
     if (!defined($endian)||$endian==1) {
-	#little endian
-	return ((($val[3]*256+$val[2])*256+$val[1])*256)+$val[0];
+#little endian
+        return ((($val[3]*256+$val[2])*256+$val[1])*256)+$val[0];
     }
     else {
-	return ((($val[0]*256+$val[1])*256+$val[2])*256)+$val[3];
+        return ((($val[0]*256+$val[1])*256+$val[2])*256)+$val[3];
     }
 }
 
 
 sub get_endian {
-    # 0 == big-endian
-    # 1 == little-endian
+# 0 == big-endian
+# 1 == little-endian
     return unpack("h*", pack("s", 1)) =~ /^1/;
 }
 
@@ -6644,41 +6583,41 @@
 
 sub get_mplayer_format {
     if (!defined($nrate)) {
-	$nrate=$arate;
+        $nrate=$arate;
     }
     if (!defined($nchans)) {
-	$nchans=$achans;
+        $nchans=$achans;
     }
     if (!defined($nasamps)) {
-	$nasamps=$asamps;
+        $nasamps=$asamps;
     }
     if (!defined($asigned)) {
-	$asigned=$signed;
+        $asigned=$signed;
     }
     if (!defined($aendian)) {
-	$aendian=$endian;
+        $aendian=$endian;
     }
     if (!defined($nsigned)) {
-	$nsigned=$asigned;
+        $nsigned=$asigned;
     }
     if (!defined($nendian)) {
-	$nendian=$aendian;
+        $nendian=$aendian;
     }
 
     if ($nasamps==8) {
-	if ($nsigned==0) {
-	    return "-format u8";
-	}
-	return "-format s8";
+        if ($nsigned==0) {
+            return "-format u8";
+        }
+        return "-format s8";
     }
     if ($nsigned==0) {
-	if ($nendian==0) {
-	    return "-format u16be";
-	}
-	return "-format u16le";
+        if ($nendian==0) {
+            return "-format u16be";
+        }
+        return "-format u16le";
     }
     if ($nendian==0) {
-	return "-format s16be";
+        return "-format s16be";
     }
     return "-format s16le";
 }
@@ -6687,7 +6626,7 @@
 
 
 sub clean_old {
-    # clear away any old backup files, etc.
+# clear away any old backup files, etc.
     return if (! -d "$tmpdir/$handle");
     smog_chdir("$tmpdir/$handle");
     unlink glob "*.mgk *.bak *.pre *.tmp pause audio.* audiodump* audioclip";
@@ -6701,16 +6640,16 @@
     return if (! -d "$curtmpdir");
     my($status)="completed";
     foreach (@_) {
-	$status.="|".$_;
+        $status.="|".$_;
     }
 
     smog_system_sync();
 
     if (-d $curtmpdir) {
-	open OUT,">","$statusfile";
-	print OUT "$status";
-	close OUT;
-	unlink "$pidfile";
+        open OUT,">","$statusfile";
+        print OUT "$status";
+        close OUT;
+        unlink "$pidfile";
     }
 }
 
@@ -6732,36 +6671,36 @@
     return if (! -d "$curtmpdir");
     my($status)="audio_ended|";
     foreach (@_) {
-	$status.="|".$_;
+        $status.="|".$_;
     }
-    
+
     open OUT,"> $statusfile.play";
-    # autoflush output
+# autoflush output
     select((select(OUT), $| = 1)[0]);
     print OUT $status;
     close OUT;
 
     unless ($opening_preview==1) {
-	unlink "$pidfile";
+        unlink "$pidfile";
     }
 }
 
 
 sub sig_error {
-    # WARNING: error strings MUST NOT contain newlines, instead you can pass up to 4 lines of text as params
+# WARNING: error strings MUST NOT contain newlines, instead you can pass up to 4 lines of text as params
 
-    # write to backend -> frontend $statusfile
+# write to backend -> frontend $statusfile
 
     return if (! -d $curtmpdir);
 
     my($status)="error";
     my ($count)=0;
     foreach (@_) {
-	$status.="|".$_;
-	$count++;
+        $status.="|".$_;
+        $count++;
     }
     if ($count<4) {
-	$status.="|||ERROR|";
+        $status.="|||ERROR|";
     }
 
     open OUT,"> $statusfile";
@@ -6776,11 +6715,11 @@
 
 
 sub sig_write_error {
-    # got an error writing to a file. pass in filename as 1st param
+# got an error writing to a file. pass in filename as 1st param
 
-    # write to backend -> frontend $statusfile
+# write to backend -> frontend $statusfile
 
-    # in params: 1 - filename, 2 - optional additional info (1 line)
+# in params: 1 - filename, 2 - optional additional info (1 line)
 
     return 1 if (! -d $curtmpdir);
 
@@ -6788,7 +6727,7 @@
     my ($smstatus)="error|write|$smfile";
 
     if ($smaddinfo ne "") {
-	$smstatus.="|$smaddinfo";
+        $smstatus.="|$smaddinfo";
     }
 
     open OUT,"> $statusfile";
@@ -6799,20 +6738,20 @@
 
 
 sub sig_read_error {
-    # got an error reading from a file. pass in filename as 1st param
+# got an error reading from a file. pass in filename as 1st param
 
-    # write to backend -> frontend $statusfile
+# write to backend -> frontend $statusfile
 
-    # in params: 1 - filename, 2 - optional additional info (1 line)
+# in params: 1 - filename, 2 - optional additional info (1 line)
 
     return 1 if (! -d $curtmpdir);
     my ($smfile,$smaddinfo)=@_;
     my ($smstatus)="error|read|$smfile";
 
     if ($smaddinfo ne "") {
-	$smstatus.="|$smaddinfo";
+        $smstatus.="|$smaddinfo";
     }
-    
+
     open OUT,"> $statusfile";
     print OUT $smstatus;
     close OUT;
@@ -6821,17 +6760,17 @@
 
 
 sub sig_system_error {
-    # got an error running a system command. pass in command as 1st param
-    # error code is second param
-    # use only for commands that really really must never fail
+# got an error running a system command. pass in command as 1st param
+# error code is second param
+# use only for commands that really really must never fail
 
-    # preference is to use read/write errors as this is clearer to the user what failed
+# preference is to use read/write errors as this is clearer to the user what failed
 
-    # write to backend -> frontend $statusfile
+# write to backend -> frontend $statusfile
 
-    #
-    # in params: 1 - command which failed or description of command, 2 - error value returned, 
-    # 3 - optional additional info (1 line)
+#
+# in params: 1 - command which failed or description of command, 2 - error value returned, 
+# 3 - optional additional info (1 line)
 
     return 1 if (! -d $curtmpdir);
 
@@ -6839,7 +6778,7 @@
     my ($smstatus)="error|system|$smcom|$smerrno";
 
     if ($smaddinfo ne "") {
-	$smstatus.="|$smaddinfo";
+        $smstatus.="|$smaddinfo";
     }
 
     open OUT,"> $statusfile";
@@ -6867,12 +6806,12 @@
 # write to backend -> frontend $statusfile
     my $status="";
     foreach (@_) {
-	if ($status eq "") {
-	    $status=$_;
-	}
-	else {
-	    $status.="|".$_;
-	}
+        if ($status eq "") {
+            $status=$_;
+        }
+        else {
+            $status.="|".$_;
+        }
     }
     &check_for_pause;
     open OUT,"> $statusfile";
@@ -6889,11 +6828,11 @@
 
 
 sub location {
-    # return the location of an executable
+# return the location of an executable
     my ($command)=shift;
 
     if ($^O eq "MSWin32") {
-	return "$command.exe";
+        return "$command.exe";
     }
 
     my ($location)=smog_system_direct("which \"$command\" 2>$nulfile");
@@ -6906,7 +6845,7 @@
 sub get_mplayer_location {
     $mpc=&location("mplayer");
     if ($mpc eq "") {
-	$mpc=&location("mplayer2");
+        $mpc=&location("mplayer2");
     }
     return $mpc;
 }
@@ -6927,117 +6866,117 @@
 
 
 sub rc_set {
-    # set/modify/delete a value in the .rc file
+# set/modify/delete a value in the .rc file
     my ($key,$value)=@_;
 
     my ($rcfile)=$home."/".$rc_filename;
 
     if (defined($prefs_file)) {
-	$rcfile=$prefs_file;
+        $rcfile=$prefs_file;
     }
 
     if (!defined(open OUT,"> $rcfile.new") && -e $rcfile) {
-	exit 3;
+        exit 3;
     }
 
     if (substr($value,-1,1) eq "\"" && substr($value,0,1) ne "\"") {
-	$value=substr($value,0,length($value)-1);
+        $value=substr($value,0,length($value)-1);
     }
 
-    # autoflush output
+# autoflush output
     select((select(OUT), $| = 1)[0]);
 
     if (! defined ($delpref)) {
-	$delpref=0;
+        $delpref=0;
     }
 
     if ($key eq "") {
-	$date=&get_current_date;
-	print OUT "# This file is autogenerated by $GUI_NAME on $date\n";
-	print OUT "# You are strongly advised to change the values only through the GUI.\n";
+        $date=&get_current_date;
+        print OUT "# This file is autogenerated by $GUI_NAME on $date\n";
+        print OUT "# You are strongly advised to change the values only through the GUI.\n";
     }
 
-    #replace <$key> to </$key> with our new value
+#replace <$key> to </$key> with our new value
     else {
-	if (!defined(open IN,"$rcfile") && -e $rcfile) {
-	    exit 2;
-	}
-	my $string="";
-	my $current="";
-	my $part=0;
-	my $found=0;
-	while (<IN>) {
-	    my $laststring=$current;
-	    $current=$_;
-	    if ($delpref!=1) {
-		$string=$current;
-
-		if ($string=~/^#.*/) {
-		    #ignore comments
-		    print OUT $string;
-		    next;
-		}
-	    }
-	    else {
-		$string=$laststring;
-		next if ($laststring eq "");
-	    }
-
-	    if ($priority==2) {
-		print OUT "\n<$key>\n$value\n</$key>\n";
-		$found=1;
-		$priority=1;
-	    }
-	    if ($found==0||$part==1) {
-		if ($part==1||$current=~ /^(<$key>)/) {
-		    if ($skip_if_exist==1) {
-			close IN;
-			close OUT;
-			unlink "$rcfile.new";
-			$skip_if_exist=0;
-			return;
-		    }
-		    if ($part==0) {
-			$part=1;
-			if ($delpref==0) {
-			    #update existing value
-			    print OUT "<$key>\n$value\n</$key>\n";
-			}
-			else {
-			    #delete
-			    #$date=&get_current_date;
-			    #print OUT "# $key deleted by $GUI_NAME $date\n";
-			    if ($string ne "\n") {
-				print OUT $string;
-			    }
-			    $delpref=2;
-			}
-			$found=1;
-		    }
-		    if ($current=~ /(<\/$key>)$/) {
-			$part=0;
-		    }
-		}
-		elsif ($part==0) {
-		    print OUT $string;
-		}
-	    }
-	    else {
-		print OUT $string;
-	    }
-	}
-	if ($found==0&&$delpref==0) {
-	    if ($priority==1) {
-		$priority=2;
-		&rc_set("$key","$value");
-	    }
-	    else {
-		print OUT "\n<$key>\n$value\n</$key>\n";
-	    }
-	}
-	if ($delpref==1) {
-	    print OUT $current;
-	}
+        if (!defined(open IN,"$rcfile") && -e $rcfile) {
+            exit 2;
+        }
+        my $string="";
+        my $current="";
+        my $part=0;
+        my $found=0;
+        while (<IN>) {
+            my $laststring=$current;
+            $current=$_;
+            if ($delpref!=1) {
+                $string=$current;
+
+                if ($string=~/^#.*/) {
+#ignore comments
+                    print OUT $string;
+                    next;
+                }
+            }
+            else {
+                $string=$laststring;
+                next if ($laststring eq "");
+            }
+
+            if ($priority==2) {
+                print OUT "\n<$key>\n$value\n</$key>\n";
+                $found=1;
+                $priority=1;
+            }
+            if ($found==0||$part==1) {
+                if ($part==1||$current=~ /^(<$key>)/) {
+                    if ($skip_if_exist==1) {
+                        close IN;
+                        close OUT;
+                        unlink "$rcfile.new";
+                        $skip_if_exist=0;
+                        return;
+                    }
+                    if ($part==0) {
+                        $part=1;
+                        if ($delpref==0) {
+#update existing value
+                            print OUT "<$key>\n$value\n</$key>\n";
+                        }
+                        else {
+#delete
+#$date=&get_current_date;
+#print OUT "# $key deleted by $GUI_NAME $date\n";
+                            if ($string ne "\n") {
+                                print OUT $string;
+                            }
+                            $delpref=2;
+                        }
+                        $found=1;
+                    }
+                    if ($current=~ /(<\/$key>)$/) {
+                        $part=0;
+                    }
+                }
+                elsif ($part==0) {
+                    print OUT $string;
+                }
+            }
+            else {
+                print OUT $string;
+            }
+        }
+        if ($found==0&&$delpref==0) {
+            if ($priority==1) {
+                $priority=2;
+                &rc_set("$key","$value");
+            }
+            else {
+                print OUT "\n<$key>\n$value\n</$key>\n";
+            }
+        }
+        if ($delpref==1) {
+            print OUT $current;
+        }
     }
     close IN;
     close OUT;
@@ -7047,40 +6986,40 @@
 
 
 sub rc_get {
-    # return a value from our .rc file
+# return a value from our .rc file
     my ($key)=shift;
     my $rcfile="$home/$rc_filename";
     my $string="";
 
     if (defined($prefs_file)) {
-	$rcfile=$prefs_file;
+        $rcfile=$prefs_file;
     }
 
     unless (defined(open IN,"$rcfile")) {
-	print STDERR "Smogrify: Unable to read value $key from rc file, $rcfile\n";
-	exit 2;
+        print STDERR "Smogrify: Unable to read value $key from rc file, $rcfile\n";
+        exit 2;
     }
     $part=0;
     while (<IN>) {
-	if ($part==1&&$_=~ /(<\/$key>)$/) {
-	    close IN;
-	    return $string;
-	}
-	if ($part==1||$_=~ /^(<$key>)/) {
-	    if ($part==1) {
-		$_=~ s/\n//g;
-		if ($string eq "") {
-		    $string=$_;
-		}
-		else {
-		    $string.="\n".$_;
-		}
-	    }
-	    else {
-		$part=1;
-		$string=$2;
-	    }
-	}
+        if ($part==1&&$_=~ /(<\/$key>)$/) {
+            close IN;
+            return $string;
+        }
+        if ($part==1||$_=~ /^(<$key>)/) {
+            if ($part==1) {
+                $_=~ s/\n//g;
+                if ($string eq "") {
+                    $string=$_;
+                }
+                else {
+                    $string.="\n".$_;
+                }
+            }
+            else {
+                $part=1;
+                $string=$2;
+            }
+        }
     }
     close IN;
     return $string;
@@ -7089,8 +7028,8 @@
 
 
 sub fast_dd {
-    # copy size bytes from $fdd_in to $fdd_out - skip $skip bytes in input and $seek bytes in output
-    # no truncation is done
+# copy size bytes from $fdd_in to $fdd_out - skip $skip bytes in input and $seek bytes in output
+# no truncation is done
     my ($size,$skip,$seek)=@_;
     my ($smres);
 
@@ -7106,95 +7045,95 @@
     my $sizecheck = -s $fdd_in;
 
     if ($fdd_in ne "/dev/zero" && $size + $skip > $sizecheck) {
-	if ($DEBUG_SMOGRIFY) {
-	    print STDERR "smogrify debug - fast_dd was asked to read $size bytes at offset $skip from a $sizecheck byte file\n$fdd_in\n";
-	}
-	$size=$sizecheck-$skip;
-	if ($skip>=$sizecheck) {
-	    return;
-	}
+        if ($DEBUG_SMOGRIFY) {
+            print STDERR "smogrify debug - fast_dd was asked to read $size bytes at offset $skip from a $sizecheck byte file\n$fdd_in\n";
+        }
+        $size=$sizecheck-$skip;
+        if ($skip>=$sizecheck) {
+            return;
+        }
     }
 
     if (! open FFIN,"<","$fdd_in") {
-	if (-f "$fdd_in") {
-	    $panic=sig_read_error("$fdd_in");
-	}
-	return;
+        if (-f "$fdd_in") {
+            $panic=sig_read_error("$fdd_in");
+        }
+        return;
     }
 
     seek FFIN,$skip,SEEK_START or $panic=sig_read_error("$fdd_in");
     return if $panic;
 
-    if ($^O eq "MSWin32") {
-	$smres=smog_system("touch.exe $fdd_out");
+if ($^O eq "MSWin32") {
+        $smres=smog_system("touch.exe $fdd_out");
     }
     else {
-	$smres=smog_system("touch $fdd_out");
+        $smres=smog_system("touch $fdd_out");
     }
     if ($smres) {
-	$panic=sig_write_error("$fdd_out"); 
-	return;
+        $panic=sig_write_error("$fdd_out");
+        return;
     }
-    
+
     open FFOUT,"+<","$fdd_out" or $panic=sig_write_error("$fdd_out");
     return if $panic;
-    seek FFOUT,$seek,SEEK_START or $panic=sig_write_error("$fdd_out");
+seek FFOUT,$seek,SEEK_START or $panic=sig_write_error("$fdd_out");
     return if $panic;
 
-    for ($i=0;$i<$fblocks;$i++) {
-	read FFIN,$data,$bs or $panic=sig_read_error("$fdd_in");
-	return if $panic;
-	print FFOUT $data or $panic=sig_write_error("$fdd_out");
-	return if $panic;
-    }
-
-    while ($rbytes>0) {
-	$bs/=2;
-	if ($rbytes>=$bs) {
-	    read FFIN,$data,$bs or $panic=sig_read_error("$fdd_in");
-	    return if $panic;
-	    print FFOUT $data or $panic=sig_write_error("$fdd_out");
-	    return if $panic;
-	    $rbytes-=$bs;
-	}
+for ($i=0;$i<$fblocks;$i++) {
+        read FFIN,$data,$bs or $panic=sig_read_error("$fdd_in");
+        return if $panic;
+    print FFOUT $data or $panic=sig_write_error("$fdd_out");
+        return if $panic;
+}
+
+while ($rbytes>0) {
+        $bs/=2;
+        if ($rbytes>=$bs) {
+            read FFIN,$data,$bs or $panic=sig_read_error("$fdd_in");
+            return if $panic;
+        print FFOUT $data or $panic=sig_write_error("$fdd_out");
+            return if $panic;
+        $rbytes-=$bs;
     }
+}
 
-    close FFOUT;
-    close FFIN;
+close FFOUT;
+close FFIN;
 }
 
 
 sub count_frames {
-    #count number of frames using a binary search
+#count number of frames using a binary search
 
-    my $count=0,$gap=1;
-    if (!defined $handle) {
-	$handle=$ARGV[1];
-	$curtmpdir="$tmpdir/$handle";
+my $count=0,$gap=1;
+if (!defined $handle) {
+        $handle=$ARGV[1];
+        $curtmpdir="$tmpdir/$handle";
     }
 
     $name=&mkname(1);
 
     unless (-f "$curtmpdir/$name$img_ext") {
-	return 0;
+        return 0;
     }
 
     while (1) {
-	$name=&mkname($count+$gap);
-	if (-f "$curtmpdir/$name$img_ext") {
-	    $count+=$gap;
-	    $gap*=2;
-	}
-	else {
-	    if ($gap==1) {
-		last;
-	    }
-	    $gap/=2;
-	}
+        $name=&mkname($count+$gap);
+        if (-f "$curtmpdir/$name$img_ext") {
+            $count+=$gap;
+            $gap*=2;
+        }
+        else {
+            if ($gap==1) {
+                last;
+            }
+            $gap/=2;
+        }
     }
     return $count;
 }
-    
+
 
 
 sub my_basename {
@@ -7206,10 +7145,10 @@
 
 
 sub write_bootstrap_file {
-    #write our bootstrap file and make our tmpdir
+#write our bootstrap file and make our tmpdir
     unlink "$gui_bootstrap_file";
     unless (defined(open OUT,"> $gui_bootstrap_file")) {
-	exit 4;
+        exit 4;
     }
     close OUT;
 }
@@ -7217,30 +7156,30 @@
 
 sub mktmpdir {
     unless (-d $tmpdir) {
-	# create working directory
-	umask 0;
-	unless (mkdir $tmpdir,0777) {
-	    unless ($gui_bootstrap_file eq "") {
-		open OUT,"> $gui_bootstrap_file" or exit 4;
-		print OUT "$version#$tmpdir#$msg#$msg2";
-		close OUT;
-	    }
-	    exit 5;
-	}
-	umask $umask;
+# create working directory
+        umask 0;
+        unless (mkdir $tmpdir,0777) {
+            unless ($gui_bootstrap_file eq "") {
+                open OUT,"> $gui_bootstrap_file" or exit 4;
+                print OUT "$version#$tmpdir#$msg#$msg2";
+                close OUT;
+            }
+            exit 5;
+        }
+        umask $umask;
     }
 }
 
 
 sub fndset {
-    # check if a directory is in a set (old style)
-    # but useful for frontend marking the currently opened clips, so we do not prune them by accident
+# check if a directory is in a set (old style)
+# but useful for frontend marking the currently opened clips, so we do not prune them by accident
 
     if ($^O eq "MSWin32") {
-	/^set/ or return;
+        /^set/ or return;
     }
     else {
-	/^set\./ or return;
+        /^set\./ or return;
     }
 
     $in_set=1;
@@ -7256,23 +7195,23 @@
 
 # get default values
 sub rc_get_default {
-    # return a value from our .rc file
+# return a value from our .rc file
     my ($key)=shift;
     my ($ret)="";
 
     if ($key eq "mplayer_play_video_command") {
-	$ret="\"".&get_mplayer_location."\"";
-	if (!($ret eq "")) {
-	    $ret.=" -double";
-	}
+        $ret="\"".&get_mplayer_location."\"";
+        if (!($ret eq "")) {
+            $ret.=" -double";
+        }
     }
 
     elsif ($key eq "sox_command") {
-	$ret="\"".&location("play")."\"";
+        $ret="\"".&location("play")."\"";
     }
 
     elsif ($key eq "mplayer_audio_command") {
-	$ret="\"".&get_mplayer_location."\"";
+        $ret="\"".&get_mplayer_location."\"";
     }
 
     $ret;
@@ -7289,14 +7228,14 @@
     my $maxlen = 0;
 
     foreach (@res) {
-	@pieces = split /\s+/, $_;
-	$mp=$pieces[6];
-	$mplen=length($mp);
-	$fstype=$pieces[1];
-	if ($dir =~ /$mp/ && $mplen > $maxlen) {
-	    $maxlen = $mplen;
-	    $xfstype = $fstype;
-	}
+        @pieces = split /\s+/, $_;
+        $mp=$pieces[6];
+        $mplen=length($mp);
+        $fstype=$pieces[1];
+        if ($dir =~ /$mp/ && $mplen > $maxlen) {
+            $maxlen = $mplen;
+            $xfstype = $fstype;
+        }
     }
     $xfstype;
 }
@@ -7304,9 +7243,9 @@
 
 
 sub version_check_and_upgrade {
-    # various things that should happen on update
+# various things that should happen on update
 
-    # mainly for very very old versions
+# mainly for very very old versions
 
 
     my $old_version=&rc_get("version");
@@ -7315,101 +7254,101 @@
 
     $msg="";
 
-    # throw a warning if using png and convert_version < 6.0.0
+# throw a warning if using png and convert_version < 6.0.0
     if (&rc_get("default_image_format") eq "png" && $convert_version_hash<6000 && $convert_version_hash>0) {
-	$msg="You are advised to upgrade to at least version 6.0 of Image Magick if using png files";
+        $msg="You are advised to upgrade to at least version 6.0 of Image Magick if using png files";
     }
 
     if ($version_hash>0) {
 
-	if ($new_version_hash>$version_hash) {
-	    $msg="!updmsg";
-	}
-
-	if ($version_hash<8005) {
-	    # not used now
-	    &rc_delete("frontend");
-	    &rc_delete("mog_auto_bak");
-	    &rc_delete("plugin_dir");
-	}
-	if ($version_hash<9001) {
-	    # convert_version is used instead now
-	    &rc_delete("mogrify_version");
-
-	    &rc_delete("effects_command");
-
-	    # hey, now we use our own keyboard poller
-	    # things are getting groovy !
-	    &rc_delete("no_fast_keys");
-
-	    # changed to "open_compression_percent"
-	    &rc_delete("open_quality");
-
-	    &rc_delete("kbd_rpt_state");
-	    &rc_delete("kbd_rpt_delay");
-	    &rc_delete("kbd_rpt_rate");
-
-	    #encoder_command not used any more
-	    &rc_delete("encoder_command");
-
-	    #encoder_acodec used instead
-	    &rc_delete("audio_encode_quality");
-
-	    #encoder plugin names changed
-	    $msg="Make sure you delete all the old encoder plugins and install the new ones.";
-	    $msg2="Then change your encoder from Preferences / Encoders";
-	}
-	if ($version_hash<9006) {
-	    &rc_delete("video_player");
-	    &rc_delete("video_play_command");
-	    &rc_delete("PAL/NTSC");
-	}
-	if ($version_hash<9006) {
-	    &rc_delete("osc_opts");
-	}
-	if ($version_hash<1001005) {
-	    &rc_delete("debug_encoders");
-	}
-	if ($version_hash<1002000) {
-	    my $wmask=&rc_get("lives_warning_mask");
-	    $wmask|=8192;
-	    &rc_set("lives_warning_mask",$wmask);
-	}
-	if ($version_hash<1003011) {
-	    &rc_set("osc_port",49999);
-	    $msg="Default OSC port has been changed to 49999.";
-	}
-	if ($version_hash==2002005 && &rc_get("video_open_command") eq "") {
-	    $video_open_command="\"".&get_mplayer_location."\"";
-	    &rc_set("video_open_command","$video_open_command");
-	}
-	unless ($old_version eq $version) {
-	    $current_keymap=smog_system_direct("grep \"keymap file version 4\" \"$lives_home_dir/$default_keymap\" 2>$nulfile");
-	    if ($current_keymap eq "") {
-		unlink "$lives_home_dir/$default_keymap";
-	    }
-	    unless (&location("build-lives-plugin-multi") eq "") {
-		smog_system("build-lives-plugin-multi custom");
-		smog_system("build-lives-plugin-multi test");
-	    }
-	}
+        if ($new_version_hash>$version_hash) {
+            $msg="!updmsg";
+        }
+
+        if ($version_hash<8005) {
+# not used now
+            &rc_delete("frontend");
+            &rc_delete("mog_auto_bak");
+            &rc_delete("plugin_dir");
+        }
+        if ($version_hash<9001) {
+# convert_version is used instead now
+            &rc_delete("mogrify_version");
+
+            &rc_delete("effects_command");
+
+# hey, now we use our own keyboard poller
+# things are getting groovy !
+            &rc_delete("no_fast_keys");
+
+# changed to "open_compression_percent"
+            &rc_delete("open_quality");
+
+            &rc_delete("kbd_rpt_state");
+            &rc_delete("kbd_rpt_delay");
+            &rc_delete("kbd_rpt_rate");
+
+#encoder_command not used any more
+            &rc_delete("encoder_command");
+
+#encoder_acodec used instead
+            &rc_delete("audio_encode_quality");
+
+#encoder plugin names changed
+            $msg="Make sure you delete all the old encoder plugins and install the new ones.";
+            $msg2="Then change your encoder from Preferences / Encoders";
+        }
+        if ($version_hash<9006) {
+            &rc_delete("video_player");
+            &rc_delete("video_play_command");
+            &rc_delete("PAL/NTSC");
+        }
+        if ($version_hash<9006) {
+            &rc_delete("osc_opts");
+        }
+        if ($version_hash<1001005) {
+            &rc_delete("debug_encoders");
+        }
+        if ($version_hash<1002000) {
+            my $wmask=&rc_get("lives_warning_mask");
+            $wmask|=8192;
+            &rc_set("lives_warning_mask",$wmask);
+        }
+        if ($version_hash<1003011) {
+            &rc_set("osc_port",49999);
+            $msg="Default OSC port has been changed to 49999.";
+        }
+        if ($version_hash==2002005 && &rc_get("video_open_command") eq "") {
+            $video_open_command="\"".&get_mplayer_location."\"";
+            &rc_set("video_open_command","$video_open_command");
+        }
+        unless ($old_version eq $version) {
+            $current_keymap=smog_system_direct("grep \"keymap file version 4\" \"$lives_home_dir/$default_keymap\" 2>$nulfile");
+            if ($current_keymap eq "") {
+                unlink "$lives_home_dir/$default_keymap";
+            }
+            unless (&location("build-lives-plugin-multi") eq "") {
+                smog_system("build-lives-plugin-multi custom");
+                smog_system("build-lives-plugin-multi test");
+            }
+        }
     }
 
 
-    # bless this version
+# bless this version
     &rc_set("version","$version");
 }
 
 
 sub version_hash {
-    # turn a version like
-    # a.b.c into an integer
-    # a * 1,000,000 plus b * 1,000 plus c
-    # eg. 1.4.6 becomes 10004006
+# turn a version like
+# a.b.c into an integer
+# a * 1,000,000 plus b * 1,000 plus c
+# eg. 1.4.6 becomes 10004006
 
     my ($string)=shift;
     if ($string eq "") {
-	return 0;
+        return 0;
     }
     my ($ver_major,$ver_minor,$ver_micro)=split (/[.]/, $string,3);
     my $version_hash=($ver_major*1000+$ver_minor)*1000+$ver_micro;
@@ -7418,7 +7357,7 @@
 
 
 sub RGB24_to_string {
-    # convert input like 255,255,255 to #FFFFFF
+# convert input like 255,255,255 to #FFFFFF
 
     my ($red,$green,$blue)=@_;
     sprintf("\"#%02X%02X%02XFF\"",int($red),int($green),int($blue));
@@ -7426,35 +7365,35 @@
 
 
 sub get_form_request {
-    # get format request from a (encoder) plugin
-    # part of the encoding process
+# get format request from a (encoder) plugin
+# part of the encoding process
     my ($plugin)=shift;
     if ($plugin eq "") {
-	return &get_format_request;
+        return &get_format_request;
     }
     else {
-	
-	if ($^O eq "MSWin32") {
-	    # filter by file ext
-	    my $ext=&get_ext("$plugin");
-	    if ($ext eq ".py") {
-		$cmd="python";
-	    }
-	    else {
-		$cmd="perl";
-	    }
-	    return smog_system_direct("$cmd \"$plugin\" get_format_request");
-	}
-	return smog_system_direct("\"$plugin\" get_format_request");
+
+        if ($^O eq "MSWin32") {
+# filter by file ext
+            my $ext=&get_ext("$plugin");
+            if ($ext eq ".py") {
+                $cmd="python";
+            }
+            else {
+                $cmd="perl";
+            }
+            return smog_system_direct("$cmd \"$plugin\" get_format_request");
+        }
+        return smog_system_direct("\"$plugin\" get_format_request");
     }
 }
 
 
 sub get_convert_version_hash {
-    # turn a version like
-    # a.b.c into an integer
-    # a * 1,000,000 plus b * 1,000 plus c
-    # eg. 1.4.6 becomes 10004006
+# turn a version like
+# a.b.c into an integer
+# a * 1,000,000 plus b * 1,000 plus c
+# eg. 1.4.6 becomes 10004006
 
     my $real_convert_command=(split(" ",$smog_convert_command))[0];
     my $convert_version=smog_system_direct("$real_convert_command | grep -i version");
@@ -7464,134 +7403,134 @@
 
 
 sub weed {
-    # here is where we clear up diskspace
+# here is where we clear up diskspace
 
     my $opts=shift;
 
-    # opts: - if unset bit 0 (1)    delete clips not in any set and not marked as "in-use" (protected with set.* file)
-    #         if unset bit 1 (2)    prune (clean up) any non "in-use" clips (remove backup files etc.) (prot. w. noprune)
-    #	      if set   bit 2 (4)    remove any sets (directories) with layouts but no clips (subdirectories)
-    #         if unset bit 3 (8)    remove marker files
-    #         if unset bit 4 (16)   remove misc. files
-    #        
+# opts: - if unset bit 0 (1)    delete clips not in any set and not marked as "in-use" (protected with set.* file)
+#         if unset bit 1 (2)    prune (clean up) any non "in-use" clips (remove backup files etc.) (prot. w. noprune)
+#	      if set   bit 2 (4)    remove any sets (directories) with layouts but no clips (subdirectories)
+#         if unset bit 3 (8)    remove marker files
+#         if unset bit 4 (16)   remove misc. files
+#        
 
-    #
+#
 
     my $file;
     smog_chdir("$tmpdir");
 
-    # get starting disk space
+# get starting disk space
     my $start_total=(split / /, (smog_system_direct("du -sb 2>$nulfile")))[0];
 
     use File::Find;
     opendir DIR,$tmpdir;
     while ($file=readdir(DIR)) {
-	unless ($file =~ /^\./) {
+        unless ($file =~ /^\./) {
 
-	    if (-d "$tmpdir/$file") {
-                # remove a set unlesss it has clips OR (layouts AND NOT (opts & 0x04))
-		if (&is_non_empty_dir("$tmpdir/$file/clips") || (&is_non_empty_dir("$tmpdir/$file/layouts") && !($opts & 0x04))) {
-		    # new style sets, check clips and optionally layouts
-		    unless (!defined($new_temp)||$new_temp eq "") {
-                    # we are to move this set
+            if (-d "$tmpdir/$file") {
+# remove a set unlesss it has clips OR (layouts AND NOT (opts & 0x04))
+                if (&is_non_empty_dir("$tmpdir/$file/clips") || (&is_non_empty_dir("$tmpdir/$file/layouts") && !($opts & 0x04))) {
+# new style sets, check clips and optionally layouts
+                    unless (!defined($new_temp)||$new_temp eq "") {
+# we are to move this set
                         if (-d "$new_temp/$file") {
                             smog_rename( "$new_temp/$file","$new_temp/$file.bak");
                         }
                         unless ($opts & 0x02) {
-			  unless (-f "$tmpdir/$file/noprune") {
-			    smog_chdir("$tmpdir/$file");
-			    &prune;
-			    smog_chdir("$tmpdir");
-			  }
-                         }
-			smog_rename( "$tmpdir/$file","$new_temp/$file");
-		    }
-		}
-		else {
-
-
-                    # dir is of no interest
-		    $in_set=0;
-		    find (\&fndset,"$tmpdir/$file/");
-		    if (!$in_set && !($opts & 0x01)) {
-    	                if ($^O eq "MSWin32") {
-	                  if (chdir("$tmpdir/$file")) {
-		            unlink glob "* *.* .*";
-		            smog_chdir("$tmpdir");
-		            rmdir "$tmpdir/$file";
-	                  }
-
-	                }
-	                else {
-                           smog_system("/bin/rm -rf \"$tmpdir/$file\"");
-	                }
-		    }
-		    else {
-                       unless ($opts & 0x02) {
-			unless (-f "$tmpdir/$file/noprune") {
-			    smog_chdir("$tmpdir/$file");
-			    &prune;
-			    smog_chdir("$tmpdir");
-			}
-                      }
-		     unless (!defined($new_temp)||$new_temp eq "") {
-                # tempdir was changed, so we move all sets (subdirs) from old tempdir to new 
-                # [TODO - check for set name collision !]
-                       if (-d "$tmpdir/$file") {
-                          if (-d "$new_temp/$file") {
-                               smog_rename( "$new_temp/$file","$new_temp/$file.bak");
-                          }
-			 smog_rename( "$tmpdir/$file","$new_temp/$file");
-		      }
-                    }
-                  }
-		}
-              unless ($opts & 0x08) {
-                unlink "$tmpdir/$file/set.";
-                unlink "$tmpdir/$file/noprune";
-              }
-	    }
-	    else {
-                # move crash recovery files
-		unless (!defined($new_temp)||$new_temp eq "") {
-		    if ($file =~ /^recovery/ || $file =~ /^layout/) {
-			smog_rename( "$tmpdir/$file","$new_temp/$file");
-		    }
-		}
-	    }
-	}
+                            unless (-f "$tmpdir/$file/noprune") {
+                                smog_chdir("$tmpdir/$file");
+                                &prune;
+                                smog_chdir("$tmpdir");
+                            }
+                        }
+                        smog_rename( "$tmpdir/$file","$new_temp/$file");
+                    }
+                }
+                else {
+
+
+# dir is of no interest
+                    $in_set=0;
+                    find (\&fndset,"$tmpdir/$file/");
+                    if (!$in_set && !($opts & 0x01)) {
+                        if ($^O eq "MSWin32") {
+                            if (chdir("$tmpdir/$file")) {
+                                unlink glob "* *.* .*";
+                                smog_chdir("$tmpdir");
+                                rmdir "$tmpdir/$file";
+                            }
+
+                        }
+                        else {
+                            smog_system("/bin/rm -rf \"$tmpdir/$file\"");
+                        }
+                    }
+                    else {
+                        unless ($opts & 0x02) {
+                            unless (-f "$tmpdir/$file/noprune") {
+                                smog_chdir("$tmpdir/$file");
+                                &prune;
+                                smog_chdir("$tmpdir");
+                            }
+                        }
+                        unless (!defined($new_temp)||$new_temp eq "") {
+# tempdir was changed, so we move all sets (subdirs) from old tempdir to new 
+# [TODO - check for set name collision !]
+                            if (-d "$tmpdir/$file") {
+                                if (-d "$new_temp/$file") {
+                                    smog_rename( "$new_temp/$file","$new_temp/$file.bak");
+                                }
+                                smog_rename( "$tmpdir/$file","$new_temp/$file");
+                            }
+                        }
+                    }
+                }
+                unless ($opts & 0x08) {
+                    unlink "$tmpdir/$file/set.";
+                    unlink "$tmpdir/$file/noprune";
+                }
+            }
+            else {
+# move crash recovery files
+                unless (!defined($new_temp)||$new_temp eq "") {
+                    if ($file =~ /^recovery/ || $file =~ /^layout/) {
+                        smog_rename( "$tmpdir/$file","$new_temp/$file");
+                    }
+                }
+            }
+        }
     }
 
     closedir DIR;
 
     unless ($opts & 0x10) {
-      # clean up a few extra remnants
-      smog_chdir("$tmpdir");
-      unlink glob ".* rfx.* smogplugin.*";
-      if ($^O ne "MSWin32") {
-	  unlink glob "/tmp/.smogval* /tmp/lives-symlinks";
-      }
-      unless (!defined($new_temp)||$new_temp eq "") {
-	  unlink glob "firew.* encoder_log_* stream.*";
-      }
+# clean up a few extra remnants
+        smog_chdir("$tmpdir");
+        unlink glob ".* rfx.* smogplugin.*";
+        if ($^O ne "MSWin32") {
+            unlink glob "/tmp/.smogval* /tmp/lives-symlinks";
+        }
+        unless (!defined($new_temp)||$new_temp eq "") {
+            unlink glob "firew.* encoder_log_* stream.*";
+        }
     }
 
-    # total disk space at end
+# total disk space at end
     my $end_total=(split / /, (smog_system_direct("du -sb")))[0];
 
-    # return disk space gained (in bytes)
+# return disk space gained (in bytes)
     return $start_total-$end_total;
 }
 
 
 sub get_sox_version {
-    #try to get version of sox
+#try to get version of sox
 
-    # parse a line like "sox: SoX v14.3.2"
-    # which would return 14.3.2
-    # (take third word and strip leading v)
+# parse a line like "sox: SoX v14.3.2"
+# which would return 14.3.2
+# (take third word and strip leading v)
 
-    # final value would be 140003002
+# final value would be 140003002
 
     my $soxv=smog_system_direct("sox -h 2>&1 | grep -i sox:");
 
@@ -7599,14 +7538,14 @@
     my $soxvv=$soxvvz[0];
 
     if (substr($soxvv,0,1) eq "v") {
-	$soxvv=substr($soxvv,1,length($soxvv));
+        $soxvv=substr($soxvv,1,length($soxvv));
     }
     if ($soxvv eq "") {
-	# version 12.x.x or lower
-	$soxvv=0;
+# version 12.x.x or lower
+        $soxvv=0;
     }
     else {
-	$soxvv = $soxvv * 1000000 + $soxvvz[1] * 1000 + $soxvvz[2];
+        $soxvv = $soxvv * 1000000 + $soxvvz[1] * 1000 + $soxvvz[2];
     }
 
     return $soxvv;
@@ -7614,8 +7553,8 @@
 
 
 sub prune {
-    # clean up old backup images etc in $tmpdir/$file
-    # part of the diskspace recovery process
+# clean up old backup images etc in $tmpdir/$file
+# part of the diskspace recovery process
 
     $old_handle=$handle;
     $handle=$file;
@@ -7627,51 +7566,51 @@
 
 
 sub clear_symlinks {
-    # clear symlinks directory - called after encoding a selection (part of a clip which gets symlinked)
+# clear symlinks directory - called after encoding a selection (part of a clip which gets symlinked)
 
-    # this is for "safe" symlinks
-    # we say that symlinks may be created only within /tmp/lives-symlinks on whatever system
+# this is for "safe" symlinks
+# we say that symlinks may be created only within /tmp/lives-symlinks on whatever system
 
-    # this allows e.g dynebolic to use non-Linux disk as working directory
+# this allows e.g dynebolic to use non-Linux disk as working directory
 
 
     my $linksdir="lives-symlinks/$handle/";
-    
+
     smog_chdir("/tmp");
-    
+
     if (-d $linksdir) {
-	# remove directory + contents
-	if ($^O eq "MSWin32") {
-	    smog_system("DEL /q \"$linksdir\"");
-	    smog_system("RMDIR \"$linksdir\"");
-	}
-	else {
-	    smog_system("/bin/rm -rf \"$linksdir\"");
-	}
+# remove directory + contents
+        if ($^O eq "MSWin32") {
+            smog_system("DEL /q \"$linksdir\"");
+            smog_system("RMDIR \"$linksdir\"");
+        }
+        else {
+            smog_system("/bin/rm -rf \"$linksdir\"");
+        }
     }
-    
-    #create dir so next step works
+
+#create dir so next step works
     if ($^O eq "MSWin32") {
-	smog_system("mkdir.exe /p \"$linksdir\"");
+        smog_system("mkdir.exe /p \"$linksdir\"");
     }
     else {
-	make_path("$linksdir");
+        make_path("$linksdir");
     }
 
-    # remove dir + any empty parents
+# remove dir + any empty parents
     if ($^O eq "MSWin32") {
-	smog_system("rmdir.exe /p \"$linksdir\" 2>$nulfile");
+        smog_system("rmdir.exe /p \"$linksdir\" 2>$nulfile");
     }
     else {
-	smog_system("/bin/rmdir -p \"$linksdir\" 2>$nulfile");
+        smog_system("/bin/rmdir -p \"$linksdir\" 2>$nulfile");
     }
 }
 
 
 sub is_non_empty_dir {
-    #return 1 if "the parameter" is the name of a directory containing at least one non-dotted file
+#return 1 if "the parameter" is the name of a directory containing at least one non-dotted file
 
-    #uses opendir and readdir
+#uses opendir and readdir
 
 
     my $dirname=shift;
@@ -7679,12 +7618,12 @@
 
     opendir TDIR,$dirname;
     while ($xfile=readdir(TDIR)) {
-	unless ($xfile =~ /^\./) {
-	    closedir TDIR;
-	    return 1;
-	}
+        unless ($xfile =~ /^\./) {
+            closedir TDIR;
+            return 1;
+        }
     }
-    
+
     closedir TDIR;
     return 0;
 }

LiVES-2.2.8.tar.bz2/src/Makefile.am -> LiVES-2.4.1.tar.bz2/src/Makefile.am Changed

@@ -63,7 +63,7 @@
 
 if ENABLE_OSC
 osc_SOURCES=osc.c osc.h omc-learn.c omc-learn.h osc_notify.h
-osc_LDADD=-L$(top_builddir)/libOSC/ -lOSC -L$(top_builddir)/libOSC/client/ -lOSC_client -lm
+osc_LDADD=$(top_builddir)/libOSC/.libs/libOSC.a $(top_builddir)/libOSC/client/.libs/libOSC_client.a -lm
 osc_CFLAGS = -DENABLE_OSC=1
 endif
 
@@ -104,7 +104,6 @@
 endif
 
 
-
 if DISABLE_GLSLICE
 if HAVE_SYSTEM_WEED
 libweed_LDADD = @WEED_LIBS@ @WEED_UTILS_LIBS@
@@ -122,6 +121,7 @@
 endif
 
 
+
 if HAVE_SYSTEM_WEED_COMPAT
 libweed_compat_CFLAGS = -DHAVE_SYSTEM_WEED_COMPAT=1
 endif
@@ -154,6 +154,7 @@
 endif
 
 
+
 lives_exe_SOURCES = \
 	widget-helper.c widget-helper.h \
 	widget-helper-gtk.h widget-helper-qt.h \
@@ -199,7 +200,6 @@
 	$(giw_SOURCES)
 
 
-
 lives_exe_LDFLAGS = $(gtk_LIBFLAGS) -shared $(oil_LIBFLAGS)
 
 lives_exe_LDADD = @X11_LIBS@ @MJPEGTOOLS_LIBS@ $(osc_LDADD) $(jack_LDADD) $(ldvgrab_LDADD) \
@@ -207,7 +207,6 @@
 	 $(giw_LDADD) $(v4l1_LDADD) \
 	@UNICAP_LIBS@
 
-#-D__STDC_CONSTANT_MACROS
 
 AM_CFLAGS = -Wstrict-aliasing=0 $(yuv4mpeg_CFLAGS) $(ldvgrab_CFLAGS) $(dvgrab_CFLAGS) \
 	$(oil_CFLAGS) \
@@ -215,7 +214,6 @@
 	$(jack_CFLAGS) $(pulse_CFLAGS) $(giw_CFLAGS) $(unicap_CFLAGS) $(libweed_CFLAGS) $(libweed_compat_CFLAGS) \
 	-DLIVES_LIBDIR=\""$(libdir)"\" $(gtk_def)
 
-AM_CXXFLAGS = -D__STDC_CONSTANT_MACROS
 
 if HAVE_AVFORMAT
 if HAVE_AVCODEC
@@ -227,7 +225,57 @@
 
 if ENABLE_PROFILING
 AM_CFLAGS += -pg
-AM_CXXFLAGS += -pg
 endif
 
+AM_CXXFLAGS = $(AM_CFLAGS)
+
+
+if BUILD_LIBLIVES
+
+liblives_libs = liblives.la
+lib_LTLIBRARIES = $(liblives_libs)
+
+liblives_la_SOURCES = $(lives_exe_SOURCES) liblives.cpp liblives.hpp lbindings.c lbindings.h 
+
+liblives_la_CFLAGS = -fvisibility=hidden
+if IS_DARWIN
+liblives_la_LIBFLAGS = -dynamiclib -module
+liblives_la_CFLAGS += -fno-common
+else
+liblives_la_LIBFLAGS = -fPIC -DPIC -module
+liblives_la_CFLAGS += -shared -fPIC -DPIC
+endif
+
+
+liblivesdir = $(libdir)
+
+extra_LDFLAGS = @X11_LIBS@ @MJPEGTOOLS_LIBS@ \
+        $(jack_LDADD) $(ldvgrab_LDADD) \
+	$(alsa_LDADD) $(pulse_LDADD) $(png_LDADD) $(swscale_LDADD) $(pthread_LDADD) \
+	$(giw_LDADD) $(v4l1_LDADD) @UNICAP_LIBS@ $(gtk_LIBFLAGS) $(oil_LIBFLAGS)
+
+
+if HAVE_SYSTEM_WEED
+libweed_scripting_LDADD = -lweed_slice_scripting -lweed-utils_scripting
+libweed_scripting_CFLAGS = @WEED_CFLAGS@ -DHAVE_SYSTEM_WEED=1 -D_WEED_VISIBLE_FUNCTIONS_
+else
+libweed_scripting_LDADD = $(abs_top_srcdir)/libweed/libweed_slice_scripting.la $(abs_top_srcdir)/libweed/libweed-utils_scripting.la
+libweed_scripting_CFLAGS = -D_WEED_VISIBLE_FUNCTIONS_
+endif
+
+liblives_la_LDFLAGS =  $(extra_LDFLAGS)  $(libweed_scripting_LDADD) $(osc_LDADD)
+
+liblives_la_CFLAGS += $(AM_CFLAGS) $(libweed_scripting_CFLAGS) -Wno-unused-function -DIS_LIBLIVES
+
+
+install-exec-local:
+	$(MKDIR_P) "$(DESTDIR)$(includedir)/liblives/"
+	cp -f "$(srcdir)/liblives.hpp" "$(DESTDIR)$(includedir)/liblives/"
+
+uninstall-local:
+	rm -rf "$(includedir)/liblives"
+
+endif
+
+

LiVES-2.2.8.tar.bz2/src/Makefile.in -> LiVES-2.4.1.tar.bz2/src/Makefile.in Changed

@@ -14,6 +14,7 @@
 
 @SET_MAKE@
 
+
 VPATH = @srcdir@
 am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)'
 am__make_running_with_option = \
@@ -83,7 +84,8 @@
 @ENABLE_JACK_TRANSPORT_TRUE@@ENABLE_JACK_TRUE@am__append_1 = -DENABLE_JACK_TRANSPORT
 @HAVE_AVCODEC_TRUE@@HAVE_AVFORMAT_TRUE@@HAVE_AVUTIL_TRUE@am__append_2 = -DHAVE_WEBM=1
 @ENABLE_PROFILING_TRUE@am__append_3 = -pg
-@ENABLE_PROFILING_TRUE@am__append_4 = -pg
+@BUILD_LIBLIVES_TRUE@@IS_DARWIN_TRUE@am__append_4 = -fno-common
+@BUILD_LIBLIVES_TRUE@@IS_DARWIN_FALSE@am__append_5 = -shared -fPIC -DPIC
 subdir = src
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(top_srcdir)/mkinstalldirs $(top_srcdir)/depcomp
@@ -113,7 +115,99 @@
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_CLEAN_FILES =
 CONFIG_CLEAN_VPATH_FILES =
-am__installdirs = "$(DESTDIR)$(bindir)"
+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__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)"
+LTLIBRARIES = $(lib_LTLIBRARIES)
+liblives_la_LIBADD =
+am__liblives_la_SOURCES_DIST = widget-helper.c widget-helper.h \
+	widget-helper-gtk.h widget-helper-qt.h main.c support.c \
+	support.h effects.c plugins.c plugins.h effects-weed.c \
+	effects-weed.h effects-data.c effects-data.h framedraw.c \
+	framedraw.h interface.c interface.h paramspecial.c \
+	paramspecial.h paramwindow.c paramwindow.h rfx-builder.c \
+	rfx-builder.h lives-yuv4mpeg.c lives-yuv4mpeg.h preferences.c \
+	preferences.h rte_window.c rte_window.h gui.c ce_thumbs.c \
+	ce_thumbs.h htmsocket.c htmsocket.h merge.c merge.h dialogs.c \
+	saveplay.c audio.c audio.h events.c events.h resample.c \
+	resample.h osc.c osc.h omc-learn.c omc-learn.h osc_notify.h \
+	callbacks.c callbacks.h colourspace.c colourspace.h keyboard.c \
+	keyboard.h utils.c main.h mainwindow.h effects.h multitrack.h \
+	multitrack.c stream.h stream.c cvirtual.c cvirtual.h startup.c \
+	startup.h pangotext.c pangotext.h videodev.c videodev.h jack.c \
+	jack.h pulse.c pulse.h ldvgrab.c ldvgrab.h ldvcallbacks.c \
+	ldvcallbacks.h ldvinterface.c ldvinterface.h giw/giwknob.c \
+	giw/giwknob.h giw/giwvslider.c giw/giwvslider.h giw/giwled.c \
+	giw/giwled.h giw/giwtimeline.c giw/giwtimeline.h liblives.cpp \
+	liblives.hpp lbindings.c lbindings.h
+@HAVE_MJPEGTOOLS_TRUE@am__objects_1 = liblives_la-lives-yuv4mpeg.lo
+@ENABLE_OSC_TRUE@am__objects_2 = liblives_la-osc.lo \
+@ENABLE_OSC_TRUE@	liblives_la-omc-learn.lo
+@HAVE_UNICAP_TRUE@am__objects_3 = liblives_la-videodev.lo
+@ENABLE_JACK_TRUE@am__objects_4 = liblives_la-jack.lo
+@HAVE_PULSE_AUDIO_TRUE@am__objects_5 = liblives_la-pulse.lo
+@ENABLE_LDVGRAB_TRUE@am__objects_6 = liblives_la-ldvgrab.lo \
+@ENABLE_LDVGRAB_TRUE@	liblives_la-ldvcallbacks.lo \
+@ENABLE_LDVGRAB_TRUE@	liblives_la-ldvinterface.lo
+am__dirstamp = $(am__leading_dot)dirstamp
+@ENABLE_GIW_TRUE@am__objects_7 = giw/liblives_la-giwknob.lo \
+@ENABLE_GIW_TRUE@	giw/liblives_la-giwvslider.lo \
+@ENABLE_GIW_TRUE@	giw/liblives_la-giwled.lo \
+@ENABLE_GIW_TRUE@	giw/liblives_la-giwtimeline.lo
+am__objects_8 = liblives_la-widget-helper.lo liblives_la-main.lo \
+	liblives_la-support.lo liblives_la-effects.lo \
+	liblives_la-plugins.lo liblives_la-effects-weed.lo \
+	liblives_la-effects-data.lo liblives_la-framedraw.lo \
+	liblives_la-interface.lo liblives_la-paramspecial.lo \
+	liblives_la-paramwindow.lo liblives_la-rfx-builder.lo \
+	$(am__objects_1) liblives_la-preferences.lo \
+	liblives_la-rte_window.lo liblives_la-gui.lo \
+	liblives_la-ce_thumbs.lo liblives_la-htmsocket.lo \
+	liblives_la-merge.lo liblives_la-dialogs.lo \
+	liblives_la-saveplay.lo liblives_la-audio.lo \
+	liblives_la-events.lo liblives_la-resample.lo $(am__objects_2) \
+	liblives_la-callbacks.lo liblives_la-colourspace.lo \
+	liblives_la-keyboard.lo liblives_la-utils.lo \
+	liblives_la-multitrack.lo liblives_la-stream.lo \
+	liblives_la-cvirtual.lo liblives_la-startup.lo \
+	liblives_la-pangotext.lo $(am__objects_3) $(am__objects_4) \
+	$(am__objects_5) $(am__objects_6) $(am__objects_7)
+@BUILD_LIBLIVES_TRUE@am_liblives_la_OBJECTS = $(am__objects_8) \
+@BUILD_LIBLIVES_TRUE@	liblives.lo liblives_la-lbindings.lo
+liblives_la_OBJECTS = $(am_liblives_la_OBJECTS)
+AM_V_lt = $(am__v_lt_@AM_V@)
+am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+am__v_lt_0 = --silent
+am__v_lt_1 = 
+liblives_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(liblives_la_LDFLAGS) $(LDFLAGS) -o $@
+@BUILD_LIBLIVES_TRUE@am_liblives_la_rpath = -rpath $(libdir)
 PROGRAMS = $(bin_PROGRAMS)
 am__lives_exe_SOURCES_DIST = widget-helper.c widget-helper.h \
 	widget-helper-gtk.h widget-helper-qt.h main.c support.c \
@@ -134,47 +228,45 @@
 	ldvcallbacks.h ldvinterface.c ldvinterface.h giw/giwknob.c \
 	giw/giwknob.h giw/giwvslider.c giw/giwvslider.h giw/giwled.c \
 	giw/giwled.h giw/giwtimeline.c giw/giwtimeline.h
-@HAVE_MJPEGTOOLS_TRUE@am__objects_1 = lives-yuv4mpeg.$(OBJEXT)
-@ENABLE_OSC_TRUE@am__objects_2 = osc.$(OBJEXT) omc-learn.$(OBJEXT)
-@HAVE_UNICAP_TRUE@am__objects_3 = videodev.$(OBJEXT)
-@ENABLE_JACK_TRUE@am__objects_4 = jack.$(OBJEXT)
-@HAVE_PULSE_AUDIO_TRUE@am__objects_5 = pulse.$(OBJEXT)
-@ENABLE_LDVGRAB_TRUE@am__objects_6 = ldvgrab.$(OBJEXT) \
+@HAVE_MJPEGTOOLS_TRUE@am__objects_9 = lives-yuv4mpeg.$(OBJEXT)
+@ENABLE_OSC_TRUE@am__objects_10 = osc.$(OBJEXT) omc-learn.$(OBJEXT)
+@HAVE_UNICAP_TRUE@am__objects_11 = videodev.$(OBJEXT)
+@ENABLE_JACK_TRUE@am__objects_12 = jack.$(OBJEXT)
+@HAVE_PULSE_AUDIO_TRUE@am__objects_13 = pulse.$(OBJEXT)
+@ENABLE_LDVGRAB_TRUE@am__objects_14 = ldvgrab.$(OBJEXT) \
 @ENABLE_LDVGRAB_TRUE@	ldvcallbacks.$(OBJEXT) \
 @ENABLE_LDVGRAB_TRUE@	ldvinterface.$(OBJEXT)
-am__dirstamp = $(am__leading_dot)dirstamp
-@ENABLE_GIW_TRUE@am__objects_7 = giw/giwknob.$(OBJEXT) \
+@ENABLE_GIW_TRUE@am__objects_15 = giw/giwknob.$(OBJEXT) \
 @ENABLE_GIW_TRUE@	giw/giwvslider.$(OBJEXT) giw/giwled.$(OBJEXT) \
 @ENABLE_GIW_TRUE@	giw/giwtimeline.$(OBJEXT)
 am_lives_exe_OBJECTS = widget-helper.$(OBJEXT) main.$(OBJEXT) \
 	support.$(OBJEXT) effects.$(OBJEXT) plugins.$(OBJEXT) \
 	effects-weed.$(OBJEXT) effects-data.$(OBJEXT) \
 	framedraw.$(OBJEXT) interface.$(OBJEXT) paramspecial.$(OBJEXT) \
-	paramwindow.$(OBJEXT) rfx-builder.$(OBJEXT) $(am__objects_1) \
+	paramwindow.$(OBJEXT) rfx-builder.$(OBJEXT) $(am__objects_9) \
 	preferences.$(OBJEXT) rte_window.$(OBJEXT) gui.$(OBJEXT) \
 	ce_thumbs.$(OBJEXT) htmsocket.$(OBJEXT) merge.$(OBJEXT) \
 	dialogs.$(OBJEXT) saveplay.$(OBJEXT) audio.$(OBJEXT) \
-	events.$(OBJEXT) resample.$(OBJEXT) $(am__objects_2) \
+	events.$(OBJEXT) resample.$(OBJEXT) $(am__objects_10) \
 	callbacks.$(OBJEXT) colourspace.$(OBJEXT) keyboard.$(OBJEXT) \
 	utils.$(OBJEXT) multitrack.$(OBJEXT) stream.$(OBJEXT) \
 	cvirtual.$(OBJEXT) startup.$(OBJEXT) pangotext.$(OBJEXT) \
-	$(am__objects_3) $(am__objects_4) $(am__objects_5) \
-	$(am__objects_6) $(am__objects_7)
+	$(am__objects_11) $(am__objects_12) $(am__objects_13) \
+	$(am__objects_14) $(am__objects_15)
 lives_exe_OBJECTS = $(am_lives_exe_OBJECTS)
-am__DEPENDENCIES_1 =
-@DISABLE_GLSLICE_FALSE@@HAVE_SYSTEM_WEED_FALSE@am__DEPENDENCIES_2 = $(abs_top_srcdir)/libweed/libweed_slice.la \
+@ENABLE_OSC_TRUE@am__DEPENDENCIES_1 =  \
+@ENABLE_OSC_TRUE@	$(top_builddir)/libOSC/.libs/libOSC.a \
+@ENABLE_OSC_TRUE@	$(top_builddir)/libOSC/client/.libs/libOSC_client.a
+am__DEPENDENCIES_2 =
+@DISABLE_GLSLICE_FALSE@@HAVE_SYSTEM_WEED_FALSE@am__DEPENDENCIES_3 = $(abs_top_srcdir)/libweed/libweed_slice.la \
 @DISABLE_GLSLICE_FALSE@@HAVE_SYSTEM_WEED_FALSE@	$(abs_top_srcdir)/libweed/libweed-utils.la
-@DISABLE_GLSLICE_TRUE@@HAVE_SYSTEM_WEED_FALSE@am__DEPENDENCIES_2 = $(abs_top_srcdir)/libweed/libweed.la \
+@DISABLE_GLSLICE_TRUE@@HAVE_SYSTEM_WEED_FALSE@am__DEPENDENCIES_3 = $(abs_top_srcdir)/libweed/libweed.la \
 @DISABLE_GLSLICE_TRUE@@HAVE_SYSTEM_WEED_FALSE@	$(abs_top_srcdir)/libweed/libweed-utils.la
-lives_exe_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \
-	$(am__DEPENDENCIES_1)
-AM_V_lt = $(am__v_lt_@AM_V@)
-am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
-am__v_lt_0 = --silent
-am__v_lt_1 = 
+lives_exe_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \
+	$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_2) \
+	$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_2) \
+	$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
+	$(am__DEPENDENCIES_2)
 lives_exe_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
 	$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(lives_exe_LDFLAGS) $(LDFLAGS) -o $@
@@ -212,8 +304,27 @@
 am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
 am__v_CCLD_0 = @echo "  CCLD    " $@;
 am__v_CCLD_1 = 
-SOURCES = $(lives_exe_SOURCES)
-DIST_SOURCES = $(am__lives_exe_SOURCES_DIST)
+CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+LTCXXCOMPILE = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_CXXFLAGS) $(CXXFLAGS)
+AM_V_CXX = $(am__v_CXX_@AM_V@)
+am__v_CXX_ = $(am__v_CXX_@AM_DEFAULT_V@)
+am__v_CXX_0 = @echo "  CXX     " $@;
+am__v_CXX_1 = 
+CXXLD = $(CXX)
+CXXLINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) \
+	$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
+	$(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+AM_V_CXXLD = $(am__v_CXXLD_@AM_V@)
+am__v_CXXLD_ = $(am__v_CXXLD_@AM_DEFAULT_V@)
+am__v_CXXLD_0 = @echo "  CXXLD   " $@;
+am__v_CXXLD_1 = 
+SOURCES = $(liblives_la_SOURCES) $(lives_exe_SOURCES)
+DIST_SOURCES = $(am__liblives_la_SOURCES_DIST) \
+	$(am__lives_exe_SOURCES_DIST)
 am__can_run_installinfo = \
   case $$AM_UPDATE_INFO_DIR in \
     n|no|NO) false;; \
@@ -527,7 +638,7 @@
 @HAVE_UNICAP_TRUE@unicap_SOURCES = videodev.c videodev.h
 @HAVE_UNICAP_TRUE@unicap_CFLAGS = -DHAVE_UNICAP=1
 @ENABLE_OSC_TRUE@osc_SOURCES = osc.c osc.h omc-learn.c omc-learn.h osc_notify.h
-@ENABLE_OSC_TRUE@osc_LDADD = -L$(top_builddir)/libOSC/ -lOSC -L$(top_builddir)/libOSC/client/ -lOSC_client -lm
+@ENABLE_OSC_TRUE@osc_LDADD = $(top_builddir)/libOSC/.libs/libOSC.a $(top_builddir)/libOSC/client/.libs/libOSC_client.a -lm
 @ENABLE_OSC_TRUE@osc_CFLAGS = -DENABLE_OSC=1
 @ENABLE_LDVGRAB_TRUE@ldvgrab_SOURCES = ldvgrab.c ldvgrab.h ldvcallbacks.c ldvcallbacks.h ldvinterface.c ldvinterface.h
 @ENABLE_LDVGRAB_TRUE@ldvgrab_CFLAGS = -DHAVE_LDVGRAB=1 -I libavc1394/avc1394.h -I libraw1394/raw1394.h -I libraw1394/rom1394.h
@@ -607,8 +718,6 @@
 	 $(giw_LDADD) $(v4l1_LDADD) \
 	@UNICAP_LIBS@
 
-
-#-D__STDC_CONSTANT_MACROS
 AM_CFLAGS = -Wstrict-aliasing=0 $(yuv4mpeg_CFLAGS) $(ldvgrab_CFLAGS) \
 	$(dvgrab_CFLAGS) $(oil_CFLAGS) $(darwin_CFLAGS) $(irix_CFLAGS) \
 	$(linux_CFLAGS) $(solaris_CFLAGS) $(osc_CFLAGS) \
@@ -617,11 +726,31 @@
 	$(libweed_CFLAGS) $(libweed_compat_CFLAGS) \
 	-DLIVES_LIBDIR=\""$(libdir)"\" $(gtk_def) $(am__append_2) \
 	$(am__append_3)
-AM_CXXFLAGS = -D__STDC_CONSTANT_MACROS $(am__append_4)
+AM_CXXFLAGS = $(AM_CFLAGS)
+@BUILD_LIBLIVES_TRUE@liblives_libs = liblives.la
+@BUILD_LIBLIVES_TRUE@lib_LTLIBRARIES = $(liblives_libs)
+@BUILD_LIBLIVES_TRUE@liblives_la_SOURCES = $(lives_exe_SOURCES) liblives.cpp liblives.hpp lbindings.c lbindings.h 
+@BUILD_LIBLIVES_TRUE@liblives_la_CFLAGS = -fvisibility=hidden \
+@BUILD_LIBLIVES_TRUE@	$(am__append_4) $(am__append_5) \
+@BUILD_LIBLIVES_TRUE@	$(AM_CFLAGS) $(libweed_scripting_CFLAGS) \
+@BUILD_LIBLIVES_TRUE@	-Wno-unused-function -DIS_LIBLIVES
+@BUILD_LIBLIVES_TRUE@@IS_DARWIN_FALSE@liblives_la_LIBFLAGS = -fPIC -DPIC -module
+@BUILD_LIBLIVES_TRUE@@IS_DARWIN_TRUE@liblives_la_LIBFLAGS = -dynamiclib -module
+@BUILD_LIBLIVES_TRUE@liblivesdir = $(libdir)
+@BUILD_LIBLIVES_TRUE@extra_LDFLAGS = @X11_LIBS@ @MJPEGTOOLS_LIBS@ \
+@BUILD_LIBLIVES_TRUE@        $(jack_LDADD) $(ldvgrab_LDADD) \
+@BUILD_LIBLIVES_TRUE@	$(alsa_LDADD) $(pulse_LDADD) $(png_LDADD) $(swscale_LDADD) $(pthread_LDADD) \
+@BUILD_LIBLIVES_TRUE@	$(giw_LDADD) $(v4l1_LDADD) @UNICAP_LIBS@ $(gtk_LIBFLAGS) $(oil_LIBFLAGS)
+
+@BUILD_LIBLIVES_TRUE@@HAVE_SYSTEM_WEED_FALSE@libweed_scripting_LDADD = $(abs_top_srcdir)/libweed/libweed_slice_scripting.la $(abs_top_srcdir)/libweed/libweed-utils_scripting.la
+@BUILD_LIBLIVES_TRUE@@HAVE_SYSTEM_WEED_TRUE@libweed_scripting_LDADD = -lweed_slice_scripting -lweed-utils_scripting
+@BUILD_LIBLIVES_TRUE@@HAVE_SYSTEM_WEED_FALSE@libweed_scripting_CFLAGS = -D_WEED_VISIBLE_FUNCTIONS_
+@BUILD_LIBLIVES_TRUE@@HAVE_SYSTEM_WEED_TRUE@libweed_scripting_CFLAGS = @WEED_CFLAGS@ -DHAVE_SYSTEM_WEED=1 -D_WEED_VISIBLE_FUNCTIONS_
+@BUILD_LIBLIVES_TRUE@liblives_la_LDFLAGS = $(extra_LDFLAGS)  $(libweed_scripting_LDADD) $(osc_LDADD)
 all: all-am
 
 .SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
+.SUFFIXES: .c .cpp .lo .o .obj
 $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
 	  case '$(am__configure_deps)' in \
@@ -652,6 +781,58 @@
 $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
 	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
 $(am__aclocal_m4_deps):
+
+install-libLTLIBRARIES: $(lib_LTLIBRARIES)
+	@$(NORMAL_INSTALL)
+	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+	list2=; for p in $$list; do \
+	  if test -f $$p; then \
+	    list2="$$list2 $$p"; \
+	  else :; fi; \
+	done; \
+	test -z "$$list2" || { \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
+	}
+
+uninstall-libLTLIBRARIES:
+	@$(NORMAL_UNINSTALL)
+	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
+	for p in $$list; do \
+	  $(am__strip_dir) \
+	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$f'"; \
+	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$f"; \
+	done
+
+clean-libLTLIBRARIES:
+	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+	@list='$(lib_LTLIBRARIES)'; \
+	locs=`for p in $$list; do echo $$p; done | \
+	      sed 's|^[^/]*$$|.|; s|/[^/]*$$||; s|$$|/so_locations|' | \
+	      sort -u`; \
+	test -z "$$locs" || { \
+	  echo rm -f $${locs}; \
+	  rm -f $${locs}; \
+	}
+giw/$(am__dirstamp):
+	@$(MKDIR_P) giw
+	@: > giw/$(am__dirstamp)
+giw/$(DEPDIR)/$(am__dirstamp):
+	@$(MKDIR_P) giw/$(DEPDIR)
+	@: > giw/$(DEPDIR)/$(am__dirstamp)
+giw/liblives_la-giwknob.lo: giw/$(am__dirstamp) \
+	giw/$(DEPDIR)/$(am__dirstamp)
+giw/liblives_la-giwvslider.lo: giw/$(am__dirstamp) \
+	giw/$(DEPDIR)/$(am__dirstamp)
+giw/liblives_la-giwled.lo: giw/$(am__dirstamp) \
+	giw/$(DEPDIR)/$(am__dirstamp)
+giw/liblives_la-giwtimeline.lo: giw/$(am__dirstamp) \
+	giw/$(DEPDIR)/$(am__dirstamp)
+
+liblives.la: $(liblives_la_OBJECTS) $(liblives_la_DEPENDENCIES) $(EXTRA_liblives_la_DEPENDENCIES) 
+	$(AM_V_CXXLD)$(liblives_la_LINK) $(am_liblives_la_rpath) $(liblives_la_OBJECTS) $(liblives_la_LIBADD) $(LIBS)
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
@@ -701,12 +882,6 @@
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
-giw/$(am__dirstamp):
-	@$(MKDIR_P) giw
-	@: > giw/$(am__dirstamp)
-giw/$(DEPDIR)/$(am__dirstamp):
-	@$(MKDIR_P) giw/$(DEPDIR)
-	@: > giw/$(DEPDIR)/$(am__dirstamp)
 giw/giwknob.$(OBJEXT): giw/$(am__dirstamp) \
 	giw/$(DEPDIR)/$(am__dirstamp)
 giw/giwvslider.$(OBJEXT): giw/$(am__dirstamp) \
@@ -723,6 +898,7 @@
 mostlyclean-compile:
 	-rm -f *.$(OBJEXT)
 	-rm -f giw/*.$(OBJEXT)
+	-rm -f giw/*.lo
 
 distclean-compile:
 	-rm -f *.tab.c
@@ -746,6 +922,49 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ldvcallbacks.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ldvgrab.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ldvinterface.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblives.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblives_la-audio.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblives_la-callbacks.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblives_la-ce_thumbs.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblives_la-colourspace.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblives_la-cvirtual.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblives_la-dialogs.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblives_la-effects-data.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblives_la-effects-weed.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblives_la-effects.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblives_la-events.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblives_la-framedraw.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblives_la-gui.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblives_la-htmsocket.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblives_la-interface.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblives_la-jack.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblives_la-keyboard.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblives_la-lbindings.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblives_la-ldvcallbacks.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblives_la-ldvgrab.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblives_la-ldvinterface.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblives_la-lives-yuv4mpeg.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblives_la-main.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblives_la-merge.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblives_la-multitrack.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblives_la-omc-learn.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblives_la-osc.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblives_la-pangotext.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblives_la-paramspecial.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblives_la-paramwindow.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblives_la-plugins.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblives_la-preferences.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblives_la-pulse.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblives_la-resample.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblives_la-rfx-builder.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblives_la-rte_window.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblives_la-saveplay.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblives_la-startup.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblives_la-stream.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblives_la-support.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblives_la-utils.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblives_la-videodev.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/liblives_la-widget-helper.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/lives-yuv4mpeg.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/merge.Po@am__quote@
@@ -772,6 +991,10 @@
 @AMDEP_TRUE@@am__include@ @am__quote@giw/$(DEPDIR)/giwled.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@giw/$(DEPDIR)/giwtimeline.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@giw/$(DEPDIR)/giwvslider.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@giw/$(DEPDIR)/liblives_la-giwknob.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@giw/$(DEPDIR)/liblives_la-giwled.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@giw/$(DEPDIR)/liblives_la-giwtimeline.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@giw/$(DEPDIR)/liblives_la-giwvslider.Plo@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@	$(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
@@ -797,11 +1020,358 @@
 @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
 
+liblives_la-widget-helper.lo: widget-helper.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblives_la_CFLAGS) $(CFLAGS) -MT liblives_la-widget-helper.lo -MD -MP -MF $(DEPDIR)/liblives_la-widget-helper.Tpo -c -o liblives_la-widget-helper.lo `test -f 'widget-helper.c' || echo '$(srcdir)/'`widget-helper.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/liblives_la-widget-helper.Tpo $(DEPDIR)/liblives_la-widget-helper.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='widget-helper.c' object='liblives_la-widget-helper.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblives_la_CFLAGS) $(CFLAGS) -c -o liblives_la-widget-helper.lo `test -f 'widget-helper.c' || echo '$(srcdir)/'`widget-helper.c
+
+liblives_la-main.lo: main.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblives_la_CFLAGS) $(CFLAGS) -MT liblives_la-main.lo -MD -MP -MF $(DEPDIR)/liblives_la-main.Tpo -c -o liblives_la-main.lo `test -f 'main.c' || echo '$(srcdir)/'`main.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/liblives_la-main.Tpo $(DEPDIR)/liblives_la-main.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='main.c' object='liblives_la-main.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblives_la_CFLAGS) $(CFLAGS) -c -o liblives_la-main.lo `test -f 'main.c' || echo '$(srcdir)/'`main.c
+
+liblives_la-support.lo: support.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblives_la_CFLAGS) $(CFLAGS) -MT liblives_la-support.lo -MD -MP -MF $(DEPDIR)/liblives_la-support.Tpo -c -o liblives_la-support.lo `test -f 'support.c' || echo '$(srcdir)/'`support.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/liblives_la-support.Tpo $(DEPDIR)/liblives_la-support.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='support.c' object='liblives_la-support.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblives_la_CFLAGS) $(CFLAGS) -c -o liblives_la-support.lo `test -f 'support.c' || echo '$(srcdir)/'`support.c
+
+liblives_la-effects.lo: effects.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblives_la_CFLAGS) $(CFLAGS) -MT liblives_la-effects.lo -MD -MP -MF $(DEPDIR)/liblives_la-effects.Tpo -c -o liblives_la-effects.lo `test -f 'effects.c' || echo '$(srcdir)/'`effects.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/liblives_la-effects.Tpo $(DEPDIR)/liblives_la-effects.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='effects.c' object='liblives_la-effects.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblives_la_CFLAGS) $(CFLAGS) -c -o liblives_la-effects.lo `test -f 'effects.c' || echo '$(srcdir)/'`effects.c
+
+liblives_la-plugins.lo: plugins.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblives_la_CFLAGS) $(CFLAGS) -MT liblives_la-plugins.lo -MD -MP -MF $(DEPDIR)/liblives_la-plugins.Tpo -c -o liblives_la-plugins.lo `test -f 'plugins.c' || echo '$(srcdir)/'`plugins.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/liblives_la-plugins.Tpo $(DEPDIR)/liblives_la-plugins.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='plugins.c' object='liblives_la-plugins.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblives_la_CFLAGS) $(CFLAGS) -c -o liblives_la-plugins.lo `test -f 'plugins.c' || echo '$(srcdir)/'`plugins.c
+
+liblives_la-effects-weed.lo: effects-weed.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblives_la_CFLAGS) $(CFLAGS) -MT liblives_la-effects-weed.lo -MD -MP -MF $(DEPDIR)/liblives_la-effects-weed.Tpo -c -o liblives_la-effects-weed.lo `test -f 'effects-weed.c' || echo '$(srcdir)/'`effects-weed.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/liblives_la-effects-weed.Tpo $(DEPDIR)/liblives_la-effects-weed.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='effects-weed.c' object='liblives_la-effects-weed.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblives_la_CFLAGS) $(CFLAGS) -c -o liblives_la-effects-weed.lo `test -f 'effects-weed.c' || echo '$(srcdir)/'`effects-weed.c
+
+liblives_la-effects-data.lo: effects-data.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblives_la_CFLAGS) $(CFLAGS) -MT liblives_la-effects-data.lo -MD -MP -MF $(DEPDIR)/liblives_la-effects-data.Tpo -c -o liblives_la-effects-data.lo `test -f 'effects-data.c' || echo '$(srcdir)/'`effects-data.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/liblives_la-effects-data.Tpo $(DEPDIR)/liblives_la-effects-data.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='effects-data.c' object='liblives_la-effects-data.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblives_la_CFLAGS) $(CFLAGS) -c -o liblives_la-effects-data.lo `test -f 'effects-data.c' || echo '$(srcdir)/'`effects-data.c
+
+liblives_la-framedraw.lo: framedraw.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblives_la_CFLAGS) $(CFLAGS) -MT liblives_la-framedraw.lo -MD -MP -MF $(DEPDIR)/liblives_la-framedraw.Tpo -c -o liblives_la-framedraw.lo `test -f 'framedraw.c' || echo '$(srcdir)/'`framedraw.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/liblives_la-framedraw.Tpo $(DEPDIR)/liblives_la-framedraw.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='framedraw.c' object='liblives_la-framedraw.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblives_la_CFLAGS) $(CFLAGS) -c -o liblives_la-framedraw.lo `test -f 'framedraw.c' || echo '$(srcdir)/'`framedraw.c
+
+liblives_la-interface.lo: interface.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblives_la_CFLAGS) $(CFLAGS) -MT liblives_la-interface.lo -MD -MP -MF $(DEPDIR)/liblives_la-interface.Tpo -c -o liblives_la-interface.lo `test -f 'interface.c' || echo '$(srcdir)/'`interface.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/liblives_la-interface.Tpo $(DEPDIR)/liblives_la-interface.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='interface.c' object='liblives_la-interface.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblives_la_CFLAGS) $(CFLAGS) -c -o liblives_la-interface.lo `test -f 'interface.c' || echo '$(srcdir)/'`interface.c
+
+liblives_la-paramspecial.lo: paramspecial.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblives_la_CFLAGS) $(CFLAGS) -MT liblives_la-paramspecial.lo -MD -MP -MF $(DEPDIR)/liblives_la-paramspecial.Tpo -c -o liblives_la-paramspecial.lo `test -f 'paramspecial.c' || echo '$(srcdir)/'`paramspecial.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/liblives_la-paramspecial.Tpo $(DEPDIR)/liblives_la-paramspecial.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='paramspecial.c' object='liblives_la-paramspecial.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblives_la_CFLAGS) $(CFLAGS) -c -o liblives_la-paramspecial.lo `test -f 'paramspecial.c' || echo '$(srcdir)/'`paramspecial.c
+
+liblives_la-paramwindow.lo: paramwindow.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblives_la_CFLAGS) $(CFLAGS) -MT liblives_la-paramwindow.lo -MD -MP -MF $(DEPDIR)/liblives_la-paramwindow.Tpo -c -o liblives_la-paramwindow.lo `test -f 'paramwindow.c' || echo '$(srcdir)/'`paramwindow.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/liblives_la-paramwindow.Tpo $(DEPDIR)/liblives_la-paramwindow.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='paramwindow.c' object='liblives_la-paramwindow.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblives_la_CFLAGS) $(CFLAGS) -c -o liblives_la-paramwindow.lo `test -f 'paramwindow.c' || echo '$(srcdir)/'`paramwindow.c
+
+liblives_la-rfx-builder.lo: rfx-builder.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblives_la_CFLAGS) $(CFLAGS) -MT liblives_la-rfx-builder.lo -MD -MP -MF $(DEPDIR)/liblives_la-rfx-builder.Tpo -c -o liblives_la-rfx-builder.lo `test -f 'rfx-builder.c' || echo '$(srcdir)/'`rfx-builder.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/liblives_la-rfx-builder.Tpo $(DEPDIR)/liblives_la-rfx-builder.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='rfx-builder.c' object='liblives_la-rfx-builder.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblives_la_CFLAGS) $(CFLAGS) -c -o liblives_la-rfx-builder.lo `test -f 'rfx-builder.c' || echo '$(srcdir)/'`rfx-builder.c
+
+liblives_la-lives-yuv4mpeg.lo: lives-yuv4mpeg.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblives_la_CFLAGS) $(CFLAGS) -MT liblives_la-lives-yuv4mpeg.lo -MD -MP -MF $(DEPDIR)/liblives_la-lives-yuv4mpeg.Tpo -c -o liblives_la-lives-yuv4mpeg.lo `test -f 'lives-yuv4mpeg.c' || echo '$(srcdir)/'`lives-yuv4mpeg.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/liblives_la-lives-yuv4mpeg.Tpo $(DEPDIR)/liblives_la-lives-yuv4mpeg.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='lives-yuv4mpeg.c' object='liblives_la-lives-yuv4mpeg.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblives_la_CFLAGS) $(CFLAGS) -c -o liblives_la-lives-yuv4mpeg.lo `test -f 'lives-yuv4mpeg.c' || echo '$(srcdir)/'`lives-yuv4mpeg.c
+
+liblives_la-preferences.lo: preferences.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblives_la_CFLAGS) $(CFLAGS) -MT liblives_la-preferences.lo -MD -MP -MF $(DEPDIR)/liblives_la-preferences.Tpo -c -o liblives_la-preferences.lo `test -f 'preferences.c' || echo '$(srcdir)/'`preferences.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/liblives_la-preferences.Tpo $(DEPDIR)/liblives_la-preferences.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='preferences.c' object='liblives_la-preferences.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblives_la_CFLAGS) $(CFLAGS) -c -o liblives_la-preferences.lo `test -f 'preferences.c' || echo '$(srcdir)/'`preferences.c
+
+liblives_la-rte_window.lo: rte_window.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblives_la_CFLAGS) $(CFLAGS) -MT liblives_la-rte_window.lo -MD -MP -MF $(DEPDIR)/liblives_la-rte_window.Tpo -c -o liblives_la-rte_window.lo `test -f 'rte_window.c' || echo '$(srcdir)/'`rte_window.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/liblives_la-rte_window.Tpo $(DEPDIR)/liblives_la-rte_window.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='rte_window.c' object='liblives_la-rte_window.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblives_la_CFLAGS) $(CFLAGS) -c -o liblives_la-rte_window.lo `test -f 'rte_window.c' || echo '$(srcdir)/'`rte_window.c
+
+liblives_la-gui.lo: gui.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblives_la_CFLAGS) $(CFLAGS) -MT liblives_la-gui.lo -MD -MP -MF $(DEPDIR)/liblives_la-gui.Tpo -c -o liblives_la-gui.lo `test -f 'gui.c' || echo '$(srcdir)/'`gui.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/liblives_la-gui.Tpo $(DEPDIR)/liblives_la-gui.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='gui.c' object='liblives_la-gui.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblives_la_CFLAGS) $(CFLAGS) -c -o liblives_la-gui.lo `test -f 'gui.c' || echo '$(srcdir)/'`gui.c
+
+liblives_la-ce_thumbs.lo: ce_thumbs.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblives_la_CFLAGS) $(CFLAGS) -MT liblives_la-ce_thumbs.lo -MD -MP -MF $(DEPDIR)/liblives_la-ce_thumbs.Tpo -c -o liblives_la-ce_thumbs.lo `test -f 'ce_thumbs.c' || echo '$(srcdir)/'`ce_thumbs.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/liblives_la-ce_thumbs.Tpo $(DEPDIR)/liblives_la-ce_thumbs.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ce_thumbs.c' object='liblives_la-ce_thumbs.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblives_la_CFLAGS) $(CFLAGS) -c -o liblives_la-ce_thumbs.lo `test -f 'ce_thumbs.c' || echo '$(srcdir)/'`ce_thumbs.c
+
+liblives_la-htmsocket.lo: htmsocket.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblives_la_CFLAGS) $(CFLAGS) -MT liblives_la-htmsocket.lo -MD -MP -MF $(DEPDIR)/liblives_la-htmsocket.Tpo -c -o liblives_la-htmsocket.lo `test -f 'htmsocket.c' || echo '$(srcdir)/'`htmsocket.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/liblives_la-htmsocket.Tpo $(DEPDIR)/liblives_la-htmsocket.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='htmsocket.c' object='liblives_la-htmsocket.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblives_la_CFLAGS) $(CFLAGS) -c -o liblives_la-htmsocket.lo `test -f 'htmsocket.c' || echo '$(srcdir)/'`htmsocket.c
+
+liblives_la-merge.lo: merge.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblives_la_CFLAGS) $(CFLAGS) -MT liblives_la-merge.lo -MD -MP -MF $(DEPDIR)/liblives_la-merge.Tpo -c -o liblives_la-merge.lo `test -f 'merge.c' || echo '$(srcdir)/'`merge.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/liblives_la-merge.Tpo $(DEPDIR)/liblives_la-merge.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='merge.c' object='liblives_la-merge.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblives_la_CFLAGS) $(CFLAGS) -c -o liblives_la-merge.lo `test -f 'merge.c' || echo '$(srcdir)/'`merge.c
+
+liblives_la-dialogs.lo: dialogs.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblives_la_CFLAGS) $(CFLAGS) -MT liblives_la-dialogs.lo -MD -MP -MF $(DEPDIR)/liblives_la-dialogs.Tpo -c -o liblives_la-dialogs.lo `test -f 'dialogs.c' || echo '$(srcdir)/'`dialogs.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/liblives_la-dialogs.Tpo $(DEPDIR)/liblives_la-dialogs.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='dialogs.c' object='liblives_la-dialogs.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblives_la_CFLAGS) $(CFLAGS) -c -o liblives_la-dialogs.lo `test -f 'dialogs.c' || echo '$(srcdir)/'`dialogs.c
+
+liblives_la-saveplay.lo: saveplay.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblives_la_CFLAGS) $(CFLAGS) -MT liblives_la-saveplay.lo -MD -MP -MF $(DEPDIR)/liblives_la-saveplay.Tpo -c -o liblives_la-saveplay.lo `test -f 'saveplay.c' || echo '$(srcdir)/'`saveplay.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/liblives_la-saveplay.Tpo $(DEPDIR)/liblives_la-saveplay.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='saveplay.c' object='liblives_la-saveplay.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblives_la_CFLAGS) $(CFLAGS) -c -o liblives_la-saveplay.lo `test -f 'saveplay.c' || echo '$(srcdir)/'`saveplay.c
+
+liblives_la-audio.lo: audio.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblives_la_CFLAGS) $(CFLAGS) -MT liblives_la-audio.lo -MD -MP -MF $(DEPDIR)/liblives_la-audio.Tpo -c -o liblives_la-audio.lo `test -f 'audio.c' || echo '$(srcdir)/'`audio.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/liblives_la-audio.Tpo $(DEPDIR)/liblives_la-audio.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='audio.c' object='liblives_la-audio.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblives_la_CFLAGS) $(CFLAGS) -c -o liblives_la-audio.lo `test -f 'audio.c' || echo '$(srcdir)/'`audio.c
+
+liblives_la-events.lo: events.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblives_la_CFLAGS) $(CFLAGS) -MT liblives_la-events.lo -MD -MP -MF $(DEPDIR)/liblives_la-events.Tpo -c -o liblives_la-events.lo `test -f 'events.c' || echo '$(srcdir)/'`events.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/liblives_la-events.Tpo $(DEPDIR)/liblives_la-events.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='events.c' object='liblives_la-events.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblives_la_CFLAGS) $(CFLAGS) -c -o liblives_la-events.lo `test -f 'events.c' || echo '$(srcdir)/'`events.c
+
+liblives_la-resample.lo: resample.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblives_la_CFLAGS) $(CFLAGS) -MT liblives_la-resample.lo -MD -MP -MF $(DEPDIR)/liblives_la-resample.Tpo -c -o liblives_la-resample.lo `test -f 'resample.c' || echo '$(srcdir)/'`resample.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/liblives_la-resample.Tpo $(DEPDIR)/liblives_la-resample.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='resample.c' object='liblives_la-resample.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblives_la_CFLAGS) $(CFLAGS) -c -o liblives_la-resample.lo `test -f 'resample.c' || echo '$(srcdir)/'`resample.c
+
+liblives_la-osc.lo: osc.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblives_la_CFLAGS) $(CFLAGS) -MT liblives_la-osc.lo -MD -MP -MF $(DEPDIR)/liblives_la-osc.Tpo -c -o liblives_la-osc.lo `test -f 'osc.c' || echo '$(srcdir)/'`osc.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/liblives_la-osc.Tpo $(DEPDIR)/liblives_la-osc.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='osc.c' object='liblives_la-osc.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblives_la_CFLAGS) $(CFLAGS) -c -o liblives_la-osc.lo `test -f 'osc.c' || echo '$(srcdir)/'`osc.c
+
+liblives_la-omc-learn.lo: omc-learn.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblives_la_CFLAGS) $(CFLAGS) -MT liblives_la-omc-learn.lo -MD -MP -MF $(DEPDIR)/liblives_la-omc-learn.Tpo -c -o liblives_la-omc-learn.lo `test -f 'omc-learn.c' || echo '$(srcdir)/'`omc-learn.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/liblives_la-omc-learn.Tpo $(DEPDIR)/liblives_la-omc-learn.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='omc-learn.c' object='liblives_la-omc-learn.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblives_la_CFLAGS) $(CFLAGS) -c -o liblives_la-omc-learn.lo `test -f 'omc-learn.c' || echo '$(srcdir)/'`omc-learn.c
+
+liblives_la-callbacks.lo: callbacks.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblives_la_CFLAGS) $(CFLAGS) -MT liblives_la-callbacks.lo -MD -MP -MF $(DEPDIR)/liblives_la-callbacks.Tpo -c -o liblives_la-callbacks.lo `test -f 'callbacks.c' || echo '$(srcdir)/'`callbacks.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/liblives_la-callbacks.Tpo $(DEPDIR)/liblives_la-callbacks.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='callbacks.c' object='liblives_la-callbacks.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblives_la_CFLAGS) $(CFLAGS) -c -o liblives_la-callbacks.lo `test -f 'callbacks.c' || echo '$(srcdir)/'`callbacks.c
+
+liblives_la-colourspace.lo: colourspace.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblives_la_CFLAGS) $(CFLAGS) -MT liblives_la-colourspace.lo -MD -MP -MF $(DEPDIR)/liblives_la-colourspace.Tpo -c -o liblives_la-colourspace.lo `test -f 'colourspace.c' || echo '$(srcdir)/'`colourspace.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/liblives_la-colourspace.Tpo $(DEPDIR)/liblives_la-colourspace.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='colourspace.c' object='liblives_la-colourspace.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblives_la_CFLAGS) $(CFLAGS) -c -o liblives_la-colourspace.lo `test -f 'colourspace.c' || echo '$(srcdir)/'`colourspace.c
+
+liblives_la-keyboard.lo: keyboard.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblives_la_CFLAGS) $(CFLAGS) -MT liblives_la-keyboard.lo -MD -MP -MF $(DEPDIR)/liblives_la-keyboard.Tpo -c -o liblives_la-keyboard.lo `test -f 'keyboard.c' || echo '$(srcdir)/'`keyboard.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/liblives_la-keyboard.Tpo $(DEPDIR)/liblives_la-keyboard.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='keyboard.c' object='liblives_la-keyboard.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblives_la_CFLAGS) $(CFLAGS) -c -o liblives_la-keyboard.lo `test -f 'keyboard.c' || echo '$(srcdir)/'`keyboard.c
+
+liblives_la-utils.lo: utils.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblives_la_CFLAGS) $(CFLAGS) -MT liblives_la-utils.lo -MD -MP -MF $(DEPDIR)/liblives_la-utils.Tpo -c -o liblives_la-utils.lo `test -f 'utils.c' || echo '$(srcdir)/'`utils.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/liblives_la-utils.Tpo $(DEPDIR)/liblives_la-utils.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='utils.c' object='liblives_la-utils.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblives_la_CFLAGS) $(CFLAGS) -c -o liblives_la-utils.lo `test -f 'utils.c' || echo '$(srcdir)/'`utils.c
+
+liblives_la-multitrack.lo: multitrack.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblives_la_CFLAGS) $(CFLAGS) -MT liblives_la-multitrack.lo -MD -MP -MF $(DEPDIR)/liblives_la-multitrack.Tpo -c -o liblives_la-multitrack.lo `test -f 'multitrack.c' || echo '$(srcdir)/'`multitrack.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/liblives_la-multitrack.Tpo $(DEPDIR)/liblives_la-multitrack.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='multitrack.c' object='liblives_la-multitrack.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblives_la_CFLAGS) $(CFLAGS) -c -o liblives_la-multitrack.lo `test -f 'multitrack.c' || echo '$(srcdir)/'`multitrack.c
+
+liblives_la-stream.lo: stream.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblives_la_CFLAGS) $(CFLAGS) -MT liblives_la-stream.lo -MD -MP -MF $(DEPDIR)/liblives_la-stream.Tpo -c -o liblives_la-stream.lo `test -f 'stream.c' || echo '$(srcdir)/'`stream.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/liblives_la-stream.Tpo $(DEPDIR)/liblives_la-stream.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='stream.c' object='liblives_la-stream.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblives_la_CFLAGS) $(CFLAGS) -c -o liblives_la-stream.lo `test -f 'stream.c' || echo '$(srcdir)/'`stream.c
+
+liblives_la-cvirtual.lo: cvirtual.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblives_la_CFLAGS) $(CFLAGS) -MT liblives_la-cvirtual.lo -MD -MP -MF $(DEPDIR)/liblives_la-cvirtual.Tpo -c -o liblives_la-cvirtual.lo `test -f 'cvirtual.c' || echo '$(srcdir)/'`cvirtual.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/liblives_la-cvirtual.Tpo $(DEPDIR)/liblives_la-cvirtual.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='cvirtual.c' object='liblives_la-cvirtual.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblives_la_CFLAGS) $(CFLAGS) -c -o liblives_la-cvirtual.lo `test -f 'cvirtual.c' || echo '$(srcdir)/'`cvirtual.c
+
+liblives_la-startup.lo: startup.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblives_la_CFLAGS) $(CFLAGS) -MT liblives_la-startup.lo -MD -MP -MF $(DEPDIR)/liblives_la-startup.Tpo -c -o liblives_la-startup.lo `test -f 'startup.c' || echo '$(srcdir)/'`startup.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/liblives_la-startup.Tpo $(DEPDIR)/liblives_la-startup.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='startup.c' object='liblives_la-startup.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblives_la_CFLAGS) $(CFLAGS) -c -o liblives_la-startup.lo `test -f 'startup.c' || echo '$(srcdir)/'`startup.c
+
+liblives_la-pangotext.lo: pangotext.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblives_la_CFLAGS) $(CFLAGS) -MT liblives_la-pangotext.lo -MD -MP -MF $(DEPDIR)/liblives_la-pangotext.Tpo -c -o liblives_la-pangotext.lo `test -f 'pangotext.c' || echo '$(srcdir)/'`pangotext.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/liblives_la-pangotext.Tpo $(DEPDIR)/liblives_la-pangotext.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='pangotext.c' object='liblives_la-pangotext.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblives_la_CFLAGS) $(CFLAGS) -c -o liblives_la-pangotext.lo `test -f 'pangotext.c' || echo '$(srcdir)/'`pangotext.c
+
+liblives_la-videodev.lo: videodev.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblives_la_CFLAGS) $(CFLAGS) -MT liblives_la-videodev.lo -MD -MP -MF $(DEPDIR)/liblives_la-videodev.Tpo -c -o liblives_la-videodev.lo `test -f 'videodev.c' || echo '$(srcdir)/'`videodev.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/liblives_la-videodev.Tpo $(DEPDIR)/liblives_la-videodev.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='videodev.c' object='liblives_la-videodev.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblives_la_CFLAGS) $(CFLAGS) -c -o liblives_la-videodev.lo `test -f 'videodev.c' || echo '$(srcdir)/'`videodev.c
+
+liblives_la-jack.lo: jack.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblives_la_CFLAGS) $(CFLAGS) -MT liblives_la-jack.lo -MD -MP -MF $(DEPDIR)/liblives_la-jack.Tpo -c -o liblives_la-jack.lo `test -f 'jack.c' || echo '$(srcdir)/'`jack.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/liblives_la-jack.Tpo $(DEPDIR)/liblives_la-jack.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='jack.c' object='liblives_la-jack.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblives_la_CFLAGS) $(CFLAGS) -c -o liblives_la-jack.lo `test -f 'jack.c' || echo '$(srcdir)/'`jack.c
+
+liblives_la-pulse.lo: pulse.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblives_la_CFLAGS) $(CFLAGS) -MT liblives_la-pulse.lo -MD -MP -MF $(DEPDIR)/liblives_la-pulse.Tpo -c -o liblives_la-pulse.lo `test -f 'pulse.c' || echo '$(srcdir)/'`pulse.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/liblives_la-pulse.Tpo $(DEPDIR)/liblives_la-pulse.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='pulse.c' object='liblives_la-pulse.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblives_la_CFLAGS) $(CFLAGS) -c -o liblives_la-pulse.lo `test -f 'pulse.c' || echo '$(srcdir)/'`pulse.c
+
+liblives_la-ldvgrab.lo: ldvgrab.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblives_la_CFLAGS) $(CFLAGS) -MT liblives_la-ldvgrab.lo -MD -MP -MF $(DEPDIR)/liblives_la-ldvgrab.Tpo -c -o liblives_la-ldvgrab.lo `test -f 'ldvgrab.c' || echo '$(srcdir)/'`ldvgrab.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/liblives_la-ldvgrab.Tpo $(DEPDIR)/liblives_la-ldvgrab.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ldvgrab.c' object='liblives_la-ldvgrab.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblives_la_CFLAGS) $(CFLAGS) -c -o liblives_la-ldvgrab.lo `test -f 'ldvgrab.c' || echo '$(srcdir)/'`ldvgrab.c
+
+liblives_la-ldvcallbacks.lo: ldvcallbacks.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblives_la_CFLAGS) $(CFLAGS) -MT liblives_la-ldvcallbacks.lo -MD -MP -MF $(DEPDIR)/liblives_la-ldvcallbacks.Tpo -c -o liblives_la-ldvcallbacks.lo `test -f 'ldvcallbacks.c' || echo '$(srcdir)/'`ldvcallbacks.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/liblives_la-ldvcallbacks.Tpo $(DEPDIR)/liblives_la-ldvcallbacks.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ldvcallbacks.c' object='liblives_la-ldvcallbacks.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblives_la_CFLAGS) $(CFLAGS) -c -o liblives_la-ldvcallbacks.lo `test -f 'ldvcallbacks.c' || echo '$(srcdir)/'`ldvcallbacks.c
+
+liblives_la-ldvinterface.lo: ldvinterface.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblives_la_CFLAGS) $(CFLAGS) -MT liblives_la-ldvinterface.lo -MD -MP -MF $(DEPDIR)/liblives_la-ldvinterface.Tpo -c -o liblives_la-ldvinterface.lo `test -f 'ldvinterface.c' || echo '$(srcdir)/'`ldvinterface.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/liblives_la-ldvinterface.Tpo $(DEPDIR)/liblives_la-ldvinterface.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='ldvinterface.c' object='liblives_la-ldvinterface.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblives_la_CFLAGS) $(CFLAGS) -c -o liblives_la-ldvinterface.lo `test -f 'ldvinterface.c' || echo '$(srcdir)/'`ldvinterface.c
+
+giw/liblives_la-giwknob.lo: giw/giwknob.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblives_la_CFLAGS) $(CFLAGS) -MT giw/liblives_la-giwknob.lo -MD -MP -MF giw/$(DEPDIR)/liblives_la-giwknob.Tpo -c -o giw/liblives_la-giwknob.lo `test -f 'giw/giwknob.c' || echo '$(srcdir)/'`giw/giwknob.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) giw/$(DEPDIR)/liblives_la-giwknob.Tpo giw/$(DEPDIR)/liblives_la-giwknob.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='giw/giwknob.c' object='giw/liblives_la-giwknob.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblives_la_CFLAGS) $(CFLAGS) -c -o giw/liblives_la-giwknob.lo `test -f 'giw/giwknob.c' || echo '$(srcdir)/'`giw/giwknob.c
+
+giw/liblives_la-giwvslider.lo: giw/giwvslider.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblives_la_CFLAGS) $(CFLAGS) -MT giw/liblives_la-giwvslider.lo -MD -MP -MF giw/$(DEPDIR)/liblives_la-giwvslider.Tpo -c -o giw/liblives_la-giwvslider.lo `test -f 'giw/giwvslider.c' || echo '$(srcdir)/'`giw/giwvslider.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) giw/$(DEPDIR)/liblives_la-giwvslider.Tpo giw/$(DEPDIR)/liblives_la-giwvslider.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='giw/giwvslider.c' object='giw/liblives_la-giwvslider.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblives_la_CFLAGS) $(CFLAGS) -c -o giw/liblives_la-giwvslider.lo `test -f 'giw/giwvslider.c' || echo '$(srcdir)/'`giw/giwvslider.c
+
+giw/liblives_la-giwled.lo: giw/giwled.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblives_la_CFLAGS) $(CFLAGS) -MT giw/liblives_la-giwled.lo -MD -MP -MF giw/$(DEPDIR)/liblives_la-giwled.Tpo -c -o giw/liblives_la-giwled.lo `test -f 'giw/giwled.c' || echo '$(srcdir)/'`giw/giwled.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) giw/$(DEPDIR)/liblives_la-giwled.Tpo giw/$(DEPDIR)/liblives_la-giwled.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='giw/giwled.c' object='giw/liblives_la-giwled.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblives_la_CFLAGS) $(CFLAGS) -c -o giw/liblives_la-giwled.lo `test -f 'giw/giwled.c' || echo '$(srcdir)/'`giw/giwled.c
+
+giw/liblives_la-giwtimeline.lo: giw/giwtimeline.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblives_la_CFLAGS) $(CFLAGS) -MT giw/liblives_la-giwtimeline.lo -MD -MP -MF giw/$(DEPDIR)/liblives_la-giwtimeline.Tpo -c -o giw/liblives_la-giwtimeline.lo `test -f 'giw/giwtimeline.c' || echo '$(srcdir)/'`giw/giwtimeline.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) giw/$(DEPDIR)/liblives_la-giwtimeline.Tpo giw/$(DEPDIR)/liblives_la-giwtimeline.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='giw/giwtimeline.c' object='giw/liblives_la-giwtimeline.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblives_la_CFLAGS) $(CFLAGS) -c -o giw/liblives_la-giwtimeline.lo `test -f 'giw/giwtimeline.c' || echo '$(srcdir)/'`giw/giwtimeline.c
+
+liblives_la-lbindings.lo: lbindings.c
+@am__fastdepCC_TRUE@	$(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblives_la_CFLAGS) $(CFLAGS) -MT liblives_la-lbindings.lo -MD -MP -MF $(DEPDIR)/liblives_la-lbindings.Tpo -c -o liblives_la-lbindings.lo `test -f 'lbindings.c' || echo '$(srcdir)/'`lbindings.c
+@am__fastdepCC_TRUE@	$(AM_V_at)$(am__mv) $(DEPDIR)/liblives_la-lbindings.Tpo $(DEPDIR)/liblives_la-lbindings.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(AM_V_CC)source='lbindings.c' object='liblives_la-lbindings.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@	$(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(liblives_la_CFLAGS) $(CFLAGS) -c -o liblives_la-lbindings.lo `test -f 'lbindings.c' || echo '$(srcdir)/'`lbindings.c
+
+.cpp.o:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ $<
+
+.cpp.obj:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
+@am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
+@am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
+
+.cpp.lo:
+@am__fastdepCXX_TRUE@	$(AM_V_CXX)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
+@am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
+@am__fastdepCXX_TRUE@	$(am__mv) $$depbase.Tpo $$depbase.Plo
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	$(AM_V_CXX)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(AM_V_CXX@am__nodep@)$(LTCXXCOMPILE) -c -o $@ $<
+
 mostlyclean-libtool:
 	-rm -f *.lo
 
 clean-libtool:
 	-rm -rf .libs _libs
+	-rm -rf giw/.libs giw/_libs
 
 ID: $(am__tagged_files)
 	$(am__define_uniq_tagged_files); mkid -fID $$unique
@@ -887,9 +1457,11 @@
 	done
 check-am: all-am
 check: check-am
-all-am: Makefile $(PROGRAMS)
+all-am: Makefile $(LTLIBRARIES) $(PROGRAMS)
+install-binPROGRAMS: install-libLTLIBRARIES
+
 installdirs:
-	for dir in "$(DESTDIR)$(bindir)"; do \
+	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
@@ -924,9 +1496,12 @@
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
+@BUILD_LIBLIVES_FALSE@install-exec-local:
+@BUILD_LIBLIVES_FALSE@uninstall-local:
 clean: clean-am
 
-clean-am: clean-binPROGRAMS clean-generic clean-libtool mostlyclean-am
+clean-am: clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
+	clean-libtool mostlyclean-am
 
 distclean: distclean-am
 	-rm -rf ./$(DEPDIR) giw/$(DEPDIR)
@@ -952,7 +1527,8 @@
 
 install-dvi-am:
 
-install-exec-am: install-binPROGRAMS
+install-exec-am: install-binPROGRAMS install-exec-local \
+	install-libLTLIBRARIES
 
 install-html: install-html-am
 
@@ -992,24 +1568,35 @@
 
 ps-am:
 
-uninstall-am: uninstall-binPROGRAMS
+uninstall-am: uninstall-binPROGRAMS uninstall-libLTLIBRARIES \
+	uninstall-local
 
 .MAKE: install-am install-strip
 
 .PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
-	clean-binPROGRAMS clean-generic clean-libtool cscopelist-am \
-	ctags ctags-am distclean distclean-compile distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-binPROGRAMS \
-	install-data install-data-am install-dvi install-dvi-am \
-	install-exec install-exec-am install-html install-html-am \
-	install-info install-info-am install-man install-pdf \
-	install-pdf-am install-ps install-ps-am install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
+	clean-binPROGRAMS clean-generic clean-libLTLIBRARIES \
+	clean-libtool cscopelist-am ctags ctags-am distclean \
+	distclean-compile distclean-generic distclean-libtool \
+	distclean-tags distdir dvi dvi-am html html-am info info-am \
+	install install-am install-binPROGRAMS install-data \
+	install-data-am install-dvi install-dvi-am install-exec \
+	install-exec-am install-exec-local install-html \
+	install-html-am install-info install-info-am \
+	install-libLTLIBRARIES install-man install-pdf install-pdf-am \
+	install-ps install-ps-am install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags tags-am uninstall uninstall-am uninstall-binPROGRAMS
+	tags tags-am uninstall uninstall-am uninstall-binPROGRAMS \
+	uninstall-libLTLIBRARIES uninstall-local
+
+
+@BUILD_LIBLIVES_TRUE@install-exec-local:
+@BUILD_LIBLIVES_TRUE@	$(MKDIR_P) "$(DESTDIR)$(includedir)/liblives/"
+@BUILD_LIBLIVES_TRUE@	cp -f "$(srcdir)/liblives.hpp" "$(DESTDIR)$(includedir)/liblives/"
 
+@BUILD_LIBLIVES_TRUE@uninstall-local:
+@BUILD_LIBLIVES_TRUE@	rm -rf "$(includedir)/liblives"
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.

LiVES-2.2.8.tar.bz2/src/audio.c -> LiVES-2.4.1.tar.bz2/src/audio.c Changed

@@ -29,13 +29,13 @@
 
 // keep first 16 audio_in filesysten handles open - multitrack only
 #define NSTOREDFDS 16
-static gchar *storedfnames[NSTOREDFDS];
+static char *storedfnames[NSTOREDFDS];
 static int storedfds[NSTOREDFDS];
 static boolean storedfdsset=FALSE;
 
 static void audio_reset_stored_fnames(void) {
   int i;
-  for (i=0;i<NSTOREDFDS;i++) {
+  for (i=0; i<NSTOREDFDS; i++) {
     storedfnames[i]=NULL;
     storedfds[i]=-1;
   }
@@ -46,14 +46,14 @@
 
 void audio_free_fnames(void) {
   // cleanup stored filehandles after playback/fade/render
-  
+
   int i;
 
   if (!storedfdsset) return;
 
-  for (i=0;i<NSTOREDFDS;i++) {
+  for (i=0; i<NSTOREDFDS; i++) {
     if (storedfnames!=NULL) {
-      g_free(storedfnames[i]);
+      lives_free(storedfnames[i]);
       storedfnames[i]=NULL;
       if (storedfds[i]>-1) close(storedfds[i]);
       storedfds[i]=-1;
@@ -62,7 +62,7 @@
 }
 
 
-void append_to_audio_bufferf(lives_audio_buf_t *abuf, float *src, uint64_t nsamples, int channum) { 
+void append_to_audio_bufferf(lives_audio_buf_t *abuf, float *src, uint64_t nsamples, int channum) {
   // append float audio to the audio frame buffer
   size_t nsampsize;
 
@@ -75,20 +75,20 @@
   channum++;
   if (channum>abuf->out_achans) {
     register int i;
-    abuf->bufferf=(float **)g_realloc(abuf->bufferf,channum*sizeof(float *));
-    for (i=abuf->out_achans;i<channum;i++) {
+    abuf->bufferf=(float **)lives_realloc(abuf->bufferf,channum*sizeof(float *));
+    for (i=abuf->out_achans; i<channum; i++) {
       abuf->bufferf[i]=NULL;
     }
     abuf->out_achans=channum;
   }
   channum--;
-  abuf->bufferf[channum]=(float *)g_realloc(abuf->bufferf[channum],nsampsize);
+  abuf->bufferf[channum]=(float *)lives_realloc(abuf->bufferf[channum],nsampsize);
   lives_memcpy(&abuf->bufferf[channum][abuf->samples_filled],src,nsamples*sizeof(float));
 }
 
 
 
-void append_to_audio_buffer16(lives_audio_buf_t *abuf, void *src, uint64_t nsamples, int channum) { 
+void append_to_audio_buffer16(lives_audio_buf_t *abuf, void *src, uint64_t nsamples, int channum) {
   // append 16 bit audio to the audio frame buffer
   size_t nsampsize;
 
@@ -100,14 +100,14 @@
   channum++;
   if (abuf->buffer16==NULL||channum>abuf->out_achans) {
     register int i;
-    abuf->buffer16=(int16_t **)g_realloc(abuf->buffer16,channum*sizeof(int16_t *));
-    for (i=abuf->out_achans;i<channum;i++) {
+    abuf->buffer16=(int16_t **)lives_realloc(abuf->buffer16,channum*sizeof(int16_t *));
+    for (i=abuf->out_achans; i<channum; i++) {
       abuf->buffer16[i]=NULL;
     }
     abuf->out_achans=channum;
   }
   channum--;
-  abuf->buffer16[channum]=(int16_t *)g_realloc(abuf->buffer16[channum],nsampsize);
+  abuf->buffer16[channum]=(int16_t *)lives_realloc(abuf->buffer16[channum],nsampsize);
   lives_memcpy(&abuf->buffer16[channum][abuf->samples_filled],src,nsamples*2);
 #ifdef DEBUG_AFB
   g_print("append16 to afb\n");
@@ -120,7 +120,7 @@
   // function should be called when the first video generator with audio input is enabled
 
   lives_audio_buf_t *abuf;
-  abuf=mainw->audio_frame_buffer=(lives_audio_buf_t *)g_malloc0(sizeof(lives_audio_buf_t));
+  abuf=mainw->audio_frame_buffer=(lives_audio_buf_t *)lives_malloc0(sizeof(lives_audio_buf_t));
 
   abuf->samples_filled=0;
   abuf->swap_endian=FALSE;
@@ -156,28 +156,28 @@
   register int i;
   if (abuf!=NULL) {
     if (abuf->bufferf!=NULL) {
-      for (i=0;i<abuf->out_achans;i++) g_free(abuf->bufferf[i]);
-      g_free(abuf->bufferf);
+      for (i=0; i<abuf->out_achans; i++) lives_free(abuf->bufferf[i]);
+      lives_free(abuf->bufferf);
       abuf->bufferf=NULL;
     }
     if (abuf->buffer32!=NULL) {
-      for (i=0;i<abuf->out_achans;i++) g_free(abuf->buffer32[i]);
-      g_free(abuf->buffer32);
+      for (i=0; i<abuf->out_achans; i++) lives_free(abuf->buffer32[i]);
+      lives_free(abuf->buffer32);
       abuf->buffer32=NULL;
     }
     if (abuf->buffer24!=NULL) {
-      for (i=0;i<abuf->out_achans;i++) g_free(abuf->buffer24[i]);
-      g_free(abuf->buffer24);
+      for (i=0; i<abuf->out_achans; i++) lives_free(abuf->buffer24[i]);
+      lives_free(abuf->buffer24);
       abuf->buffer24=NULL;
     }
     if (abuf->buffer16!=NULL) {
-      for (i=0;i<abuf->out_achans;i++) g_free(abuf->buffer16[i]);
-      g_free(abuf->buffer16);
+      for (i=0; i<abuf->out_achans; i++) lives_free(abuf->buffer16[i]);
+      lives_free(abuf->buffer16);
       abuf->buffer16=NULL;
     }
     if (abuf->buffer8!=NULL) {
-      for (i=0;i<abuf->out_achans;i++) g_free(abuf->buffer8[i]);
-      g_free(abuf->buffer8);
+      for (i=0; i<abuf->out_achans; i++) lives_free(abuf->buffer8[i]);
+      lives_free(abuf->buffer8);
       abuf->buffer8=NULL;
     }
 
@@ -191,14 +191,14 @@
 
 
 
-LIVES_INLINE void sample_silence_dS (float *dst, uint64_t nsamples) {
+LIVES_INLINE void sample_silence_dS(float *dst, uint64_t nsamples) {
   // send silence to the jack player
   memset(dst,0,nsamples*sizeof(float));
 }
 
 
 void sample_move_d8_d16(short *dst, uint8_t *src,
-			uint64_t nsamples, size_t tbytes, float scale, int nDstChannels, int nSrcChannels, int swap_sign) {
+                        uint64_t nsamples, size_t tbytes, float scale, int nDstChannels, int nSrcChannels, int swap_sign) {
   // convert 8 bit audio to 16 bit audio
 
   register int nSrcCount, nDstCount;
@@ -211,26 +211,26 @@
   // take care of rounding errors
   src_end=src+tbytes-nSrcChannels;
 
-  if(!nSrcChannels) return;
+  if (!nSrcChannels) return;
 
   if (scale<0.f) {
     src_offset_f=((float)(nsamples)*(-scale)-1.f);
     src_offset_i=(int)src_offset_f*nSrcChannels;
   }
 
-  while(nsamples--) {
+  while (nsamples--) {
     nSrcCount = nSrcChannels;
     nDstCount = nDstChannels;
     ccount=0;
 
     /* loop until all of our destination channels are filled */
-    while(nDstCount) {
+    while (nDstCount) {
       nSrcCount--;
       nDstCount--;
 
       ptr=src+ccount+src_offset_i;
       ptr=ptr>src?(ptr<(src_end+ccount)?ptr:(src_end+ccount)):src;
-      
+
       if (!swap_sign) *(dst++) = *(ptr)<<8;
       else if (swap_sign==SWAP_U_TO_S) *(dst++)=((short)(*(ptr))-128)<<8;
       else *((unsigned short *)(dst++))=((short)(*(ptr))+128)<<8;
@@ -238,12 +238,12 @@
 
       /* if we ran out of source channels but not destination channels */
       /* then start the src channels back where we were */
-      if(!nSrcCount && nDstCount) {
-	ccount=0;
-	nSrcCount = nSrcChannels;
+      if (!nSrcCount && nDstCount) {
+        ccount=0;
+        nSrcCount = nSrcChannels;
       }
     }
-    
+
     /* advance the the position */
     src_offset_i=(int)(src_offset_f+=scale)*nSrcChannels;
   }
@@ -253,7 +253,7 @@
 
 /* convert from any number of source channels to any number of destination channels - both interleaved */
 void sample_move_d16_d16(int16_t *dst, int16_t *src,
-			 uint64_t nsamples, size_t tbytes, float scale, int nDstChannels, int nSrcChannels, int swap_endian, int swap_sign) {
+                         uint64_t nsamples, size_t tbytes, float scale, int nDstChannels, int nSrcChannels, int swap_endian, int swap_sign) {
   register int nSrcCount, nDstCount;
   register float src_offset_f=0.f;
   register int src_offset_i=0;
@@ -261,7 +261,7 @@
   int16_t *ptr;
   int16_t *src_end;
 
-  if(!nSrcChannels) return;
+  if (!nSrcChannels) return;
 
   if (scale<0.f) {
     src_offset_f=((float)(nsamples)*(-scale)-1.f);
@@ -281,44 +281,41 @@
 
       lives_memcpy(dst,ptr,nSrcChannels*2);
       dst+=nDstCount;
-    } 
-    else {
+    } else {
       ccount=0;
 
       /* loop until all of our destination channels are filled */
       while (nDstCount) {
-	nSrcCount--;
-	nDstCount--;
-	
-	ptr=src+ccount+src_offset_i;
-	ptr=ptr>src?(ptr<(src_end+ccount)?ptr:(src_end+ccount)):src;
-
-	/* copy the data over */
-	if (!swap_endian) {
-	  if (!swap_sign) *(dst++) = *ptr;
-	  else if (swap_sign==SWAP_S_TO_U) *((uint16_t *)dst++) = (uint16_t)(*ptr+SAMPLE_MAX_16BITI);
-	  else *(dst++)=*ptr-SAMPLE_MAX_16BITI;
-	}
-	else if (swap_endian==SWAP_X_TO_L) {
-	  if (!swap_sign) *(dst++)=(((*ptr)&0x00FF)<<8)+((*ptr)>>8);
-	  else if (swap_sign==SWAP_S_TO_U) *((uint16_t *)dst++)=(uint16_t)(((*ptr&0x00FF)<<8)+(*ptr>>8)+SAMPLE_MAX_16BITI);
-	  else *(dst++)=((*ptr&0x00FF)<<8)+(*ptr>>8)-SAMPLE_MAX_16BITI;
-	}
-	else {
-	  if (!swap_sign) *(dst++)=(((*ptr)&0x00FF)<<8)+((*ptr)>>8);
-	  else if (swap_sign==SWAP_S_TO_U) *((uint16_t *)dst++)=(uint16_t)(((((uint16_t)(*ptr+SAMPLE_MAX_16BITI))&0x00FF)<<8)+
-									   (((uint16_t)(*ptr+SAMPLE_MAX_16BITI))>>8));
-	  else *(dst++)=((((int16_t)(*ptr-SAMPLE_MAX_16BITI))&0x00FF)<<8)+(((int16_t)(*ptr-SAMPLE_MAX_16BITI))>>8);
-	}
-
-	ccount++;
-	
-	/* if we ran out of source channels but not destination channels */
-	/* then start the src channels back where we were */
-	if(!nSrcCount && nDstCount) {
-	  ccount=0;
-	  nSrcCount = nSrcChannels;
-	}
+        nSrcCount--;
+        nDstCount--;
+
+        ptr=src+ccount+src_offset_i;
+        ptr=ptr>src?(ptr<(src_end+ccount)?ptr:(src_end+ccount)):src;
+
+        /* copy the data over */
+        if (!swap_endian) {
+          if (!swap_sign) *(dst++) = *ptr;
+          else if (swap_sign==SWAP_S_TO_U) *((uint16_t *)dst++) = (uint16_t)(*ptr+SAMPLE_MAX_16BITI);
+          else *(dst++)=*ptr-SAMPLE_MAX_16BITI;
+        } else if (swap_endian==SWAP_X_TO_L) {
+          if (!swap_sign) *(dst++)=(((*ptr)&0x00FF)<<8)+((*ptr)>>8);
+          else if (swap_sign==SWAP_S_TO_U) *((uint16_t *)dst++)=(uint16_t)(((*ptr&0x00FF)<<8)+(*ptr>>8)+SAMPLE_MAX_16BITI);
+          else *(dst++)=((*ptr&0x00FF)<<8)+(*ptr>>8)-SAMPLE_MAX_16BITI;
+        } else {
+          if (!swap_sign) *(dst++)=(((*ptr)&0x00FF)<<8)+((*ptr)>>8);
+          else if (swap_sign==SWAP_S_TO_U) *((uint16_t *)dst++)=(uint16_t)(((((uint16_t)(*ptr+SAMPLE_MAX_16BITI))&0x00FF)<<8)+
+                (((uint16_t)(*ptr+SAMPLE_MAX_16BITI))>>8));
+          else *(dst++)=((((int16_t)(*ptr-SAMPLE_MAX_16BITI))&0x00FF)<<8)+(((int16_t)(*ptr-SAMPLE_MAX_16BITI))>>8);
+        }
+
+        ccount++;
+
+        /* if we ran out of source channels but not destination channels */
+        /* then start the src channels back where we were */
+        if (!nSrcCount && nDstCount) {
+          ccount=0;
+          nSrcCount = nSrcChannels;
+        }
       }
     }
     /* advance the the position */
@@ -329,7 +326,7 @@
 
 /* convert from any number of source channels to any number of destination channels - 8 bit output */
 void sample_move_d16_d8(uint8_t *dst, short *src,
-			uint64_t nsamples, size_t tbytes, float scale, int nDstChannels, int nSrcChannels, int swap_sign) {
+                        uint64_t nsamples, size_t tbytes, float scale, int nDstChannels, int nSrcChannels, int swap_sign) {
   register int nSrcCount, nDstCount;
   register float src_offset_f=0.f;
   register int src_offset_i=0;
@@ -337,7 +334,7 @@
   short *ptr;
   short *src_end;
 
-  if(!nSrcChannels) return;
+  if (!nSrcChannels) return;
 
   if (scale<0.f) {
     src_offset_f=((float)(nsamples)*(-scale)-1.f);
@@ -351,12 +348,12 @@
     nDstCount = nDstChannels;
 
     ccount=0;
-    
+
     /* loop until all of our destination channels are filled */
-    while(nDstCount) {
+    while (nDstCount) {
       nSrcCount--;
       nDstCount--;
-      
+
       ptr=src+ccount+src_offset_i;
       ptr=ptr>src?(ptr<(src_end+ccount)?ptr:src_end+ccount):src;
 
@@ -368,12 +365,12 @@
 
       /* if we ran out of source channels but not destination channels */
       /* then start the src channels back where we were */
-      if(!nSrcCount && nDstCount) {
-	ccount=0;
-	nSrcCount = nSrcChannels;
+      if (!nSrcCount && nDstCount) {
+        ccount=0;
+        nSrcCount = nSrcChannels;
       }
     }
-    
+
     /* advance the the position */
     src_offset_i=(int)(src_offset_f+=scale)*nSrcChannels;
   }
@@ -381,7 +378,7 @@
 
 
 
-void sample_move_d16_float (float *dst, short *src, uint64_t nsamples, uint64_t src_skip, int is_unsigned, boolean rev_endian, float vol) {
+void sample_move_d16_float(float *dst, short *src, uint64_t nsamples, uint64_t src_skip, int is_unsigned, boolean rev_endian, float vol) {
   // convert 16 bit audio to float audio
 
   register float svolp,svoln;
@@ -415,24 +412,22 @@
       memcpy(&srcx,src+1,2);
       srcxs=(srcx[0]<<8) + srcx[1];
       srcp=&srcxs;
-    }
-    else srcp=src;
+    } else srcp=src;
 
     if (!is_unsigned) {
 #ifdef ENABLE_OIL
       oil_scaleconv_f32_s16(&val,srcp,1,&y,val>0?&xp:&xn);
 #else
-      if ((val = (float)((float)(*srcp) / (*srcp>0?svolp:svoln) ))>1.0f) val=1.0f;
+      if ((val = (float)((float)(*srcp) / (*srcp>0?svolp:svoln)))>1.0f) val=1.0f;
       else if (val<-1.0f) val=-1.0f;
 #endif
-    }
-    else {
+    } else {
 #ifdef ENABLE_OIL
       oil_scaleconv_f32_u16(&val,(unsigned short *)srcp,1,&y,&xa);
       val-=vol;
 #else
       valss=(unsigned short)*srcp-SAMPLE_MAX_16BITI;
-      if ((val = (float)((float)(valss) / (valss>0?svolp:svoln) ))>1.0f) val=1.0f;
+      if ((val = (float)((float)(valss) / (valss>0?svolp:svoln)))>1.0f) val=1.0f;
       else if (val<-1.0f) val=-1.0f;
 #endif
     }
@@ -445,13 +440,13 @@
 
 
 
-void sample_move_float_float (float *dst, float *src, uint64_t nsamples, float scale, int dst_skip) {
+void sample_move_float_float(float *dst, float *src, uint64_t nsamples, float scale, int dst_skip) {
   // copy one channel of float to a buffer, applying the scale (scale 2.0 to double the rate, etc)
   size_t offs=0;
   float offs_f=0.;
   register int i;
 
-  for (i=0;i<nsamples;i++) {
+  for (i=0; i<nsamples; i++) {
     *dst=src[offs];
     dst+=dst_skip;
     offs=(size_t)(offs_f+=scale);
@@ -460,8 +455,8 @@
 
 
 
-int64_t sample_move_float_int(void *holding_buff, float **float_buffer, int nsamps, float scale, int chans, int asamps, 
-			      int usigned, boolean little_endian, boolean interleaved, float vol) {
+int64_t sample_move_float_int(void *holding_buff, float **float_buffer, int nsamps, float scale, int chans, int asamps,
+                              int usigned, boolean little_endian, boolean interleaved, float vol) {
   // convert float samples back to int
   // interleaved is for the float buffer; output int is always interleaved
   int64_t frames_out=0l;
@@ -479,7 +474,7 @@
 
   while ((nsamps-coffs)>0) {
     frames_out++;
-    for (i=0;i<chans;i++) {
+    for (i=0; i<chans; i++) {
       valf=*(float_buffer[i]+(interleaved?(coffs*chans):coffs));
       valf*=vol;
       val=(short)(valf*(valf>0.?SAMPLE_MAX_16BIT_P:SAMPLE_MAX_16BIT_N));
@@ -487,23 +482,20 @@
       if (usigned) valu=(val+SAMPLE_MAX_16BITI);
 
       if (asamps==16) {
-	if (!little_endian) {
-	  if (usigned) *(hbuffu+offs)=valu;
-	  else *(hbuffs+offs)=val;
-	}
-	else {
-	  if (usigned) {
-	    *(hbuffc+offs)=valu&0x00FF;
-	    *(hbuffc+(++offs))=(valu&0xFF00)>>8;
-	  }
-	  else {
-	    *(hbuffc+offs)=val&0x00FF;
-	    *(hbuffc+(++offs))=(val&0xFF00)>>8;
-	  }
-	}
-      }
-      else {
-	*(hbuffc+offs)=(unsigned char)((float)val/256.);
+        if (!little_endian) {
+          if (usigned) *(hbuffu+offs)=valu;
+          else *(hbuffs+offs)=val;
+        } else {
+          if (usigned) {
+            *(hbuffc+offs)=valu&0x00FF;
+            *(hbuffc+(++offs))=(valu&0xFF00)>>8;
+          } else {
+            *(hbuffc+offs)=val&0x00FF;
+            *(hbuffc+(++offs))=(val&0xFF00)>>8;
+          }
+        }
+      } else {
+        *(hbuffc+offs)=(unsigned char)((float)val/256.);
       }
       offs++;
     }
@@ -517,7 +509,7 @@
 
 // play from memory buffer
 
-int64_t sample_move_abuf_float (float **obuf, int nchans, int nsamps, int out_arate, float vol) {
+int64_t sample_move_abuf_float(float **obuf, int nchans, int nsamps, int out_arate, float vol) {
 
   int samples_out=0;
 
@@ -562,32 +554,32 @@
     src_offset_i=0;
     src_offset_f=0.;
 
-    for (i=0;i<nsamps;i++) {
+    for (i=0; i<nsamps; i++) {
       // process each sample
 
       if ((curval=ioffs+src_offset_i)>=abuf->samples_filled) {
-	// current buffer is consumed
-	break;
+        // current buffer is consumed
+        break;
       }
       xchan=0;
-      for (j=0;j<nchans;j++) {
-	// copy channel by channel (de-interleave)
-	pthread_mutex_lock(&mainw->abuf_mutex);
-	if (mainw->jackd->read_abuf<0) {
-	  pthread_mutex_unlock(&mainw->abuf_mutex);
-	  return samples_out;
-	}
-	if (xchan>=abuf->out_achans) xchan=0; 
-	obuf[j][offs+i]=abuf->bufferf[xchan][curval]*vol;
-	pthread_mutex_unlock(&mainw->abuf_mutex);
-	xchan++;
+      for (j=0; j<nchans; j++) {
+        // copy channel by channel (de-interleave)
+        pthread_mutex_lock(&mainw->abuf_mutex);
+        if (mainw->jackd->read_abuf<0) {
+          pthread_mutex_unlock(&mainw->abuf_mutex);
+          return samples_out;
+        }
+        if (xchan>=abuf->out_achans) xchan=0;
+        obuf[j][offs+i]=abuf->bufferf[xchan][curval]*vol;
+        pthread_mutex_unlock(&mainw->abuf_mutex);
+        xchan++;
       }
       // resample on the fly
       src_offset_i=(int)(src_offset_f+=scale);
       samps++;
       samples_out++;
     }
-    
+
     abuf->start_sample=ioffs+src_offset_i;
     nsamps-=samps;
     offs+=samps;
@@ -599,9 +591,9 @@
       // request main thread to fill another buffer
       mainw->abufs_to_fill++;
       if (mainw->jackd->read_abuf<0) {
-	// playback ended while we were processing
-	pthread_mutex_unlock(&mainw->abuf_mutex);
-	return samples_out;
+        // playback ended while we were processing
+        pthread_mutex_unlock(&mainw->abuf_mutex);
+        return samples_out;
       }
 
       mainw->jackd->read_abuf++;
@@ -609,7 +601,7 @@
       if (mainw->jackd->read_abuf>=prefs->num_rtaudiobufs) mainw->jackd->read_abuf=0;
 
       abuf=mainw->jackd->abufs[mainw->jackd->read_abuf];
-      
+
       pthread_mutex_unlock(&mainw->abuf_mutex);
     }
 
@@ -622,7 +614,7 @@
 
 
 
-int64_t sample_move_abuf_int16 (short *obuf, int nchans, int nsamps, int out_arate) {
+int64_t sample_move_abuf_int16(short *obuf, int nchans, int nsamps, int out_arate) {
 
   int samples_out=0;
 
@@ -668,30 +660,30 @@
     src_offset_f=0.;
     nsampsx=nsamps*nchans;
 
-    for (i=0;i<nsampsx;i+=nchans) {
+    for (i=0; i<nsampsx; i+=nchans) {
       // process each sample
 
       if ((curval=ioffs+src_offset_i)>=abuf->samples_filled) {
-	// current buffer is drained
-	break;
+        // current buffer is drained
+        break;
       }
       xchan=0;
       curval*=abuf->out_achans;
-      for (j=0;j<nchans;j++) {
-	pthread_mutex_lock(&mainw->abuf_mutex);
-	if (mainw->pulsed->read_abuf<0) {
-	  pthread_mutex_unlock(&mainw->abuf_mutex);
-	  return samps;
-	}
-	if (xchan>=abuf->out_achans) xchan=0;
-	obuf[(offs++)]=abuf->buffer16[0][curval+xchan];
-	pthread_mutex_unlock(&mainw->abuf_mutex);
-	xchan++;
+      for (j=0; j<nchans; j++) {
+        pthread_mutex_lock(&mainw->abuf_mutex);
+        if (mainw->pulsed->read_abuf<0) {
+          pthread_mutex_unlock(&mainw->abuf_mutex);
+          return samps;
+        }
+        if (xchan>=abuf->out_achans) xchan=0;
+        obuf[(offs++)]=abuf->buffer16[0][curval+xchan];
+        pthread_mutex_unlock(&mainw->abuf_mutex);
+        xchan++;
       }
       src_offset_i=(int)(src_offset_f+=scale);
       samps++;
     }
-    
+
     abuf->start_sample=ioffs+src_offset_i;
     nsamps-=samps;
     samples_out+=samps;
@@ -704,9 +696,9 @@
       mainw->abufs_to_fill++;
 
       if (mainw->pulsed->read_abuf<0) {
-	// playback ended while we were processing
-	pthread_mutex_unlock(&mainw->abuf_mutex);
-	return samples_out;
+        // playback ended while we were processing
+        pthread_mutex_unlock(&mainw->abuf_mutex);
+        return samples_out;
       }
 
       mainw->pulsed->read_abuf++;
@@ -714,7 +706,7 @@
       if (mainw->pulsed->read_abuf>=prefs->num_rtaudiobufs) mainw->pulsed->read_abuf=0;
 
       abuf=mainw->pulsed->abufs[mainw->pulsed->read_abuf];
-      
+
       pthread_mutex_unlock(&mainw->abuf_mutex);
     }
 
@@ -737,7 +729,7 @@
   register size_t offs=abuf->samples_filled;
   register int i;
 
-  for (i=0;i<chans;i++) {
+  for (i=0; i<chans; i++) {
     lives_memcpy(&(abuf->bufferf[i][offs]),float_buffer[i],nsamps*sizeof(float));
   }
   return (size_t)nsamps;
@@ -748,16 +740,16 @@
   // deinterleave a float buffer
   register int i,j;
 
-  float *tmpfbuffer=(float *)g_try_malloc(nsamps*nchans*sizeof(float));
+  float *tmpfbuffer=(float *)lives_try_malloc(nsamps*nchans*sizeof(float));
   if (tmpfbuffer==NULL) return FALSE;
-  
-  for (i=0;i<nsamps;i++) {
-    for (j=0;j<nchans;j++) {
+
+  for (i=0; i<nsamps; i++) {
+    for (j=0; j<nchans; j++) {
       tmpfbuffer[nsamps*j+i]=fbuffer[i*nchans+j];
     }
   }
   lives_memcpy(fbuffer,tmpfbuffer,nsamps*nchans*sizeof(float));
-  g_free(tmpfbuffer);
+  lives_free(tmpfbuffer);
   return TRUE;
 }
 
@@ -766,16 +758,16 @@
   // deinterleave a float buffer
   register int i,j;
 
-  float *tmpfbuffer=(float *)g_try_malloc(nsamps*nchans*sizeof(float));
+  float *tmpfbuffer=(float *)lives_try_malloc(nsamps*nchans*sizeof(float));
   if (tmpfbuffer==NULL) return FALSE;
-  
-  for (i=0;i<nsamps;i++) {
-    for (j=0;j<nchans;j++) {
+
+  for (i=0; i<nsamps; i++) {
+    for (j=0; j<nchans; j++) {
       tmpfbuffer[i*nchans+j]=fbuffer[j*nsamps+i];
     }
   }
   lives_memcpy(fbuffer,tmpfbuffer,nsamps*nchans*sizeof(float));
-  g_free(tmpfbuffer);
+  lives_free(tmpfbuffer);
   return TRUE;
 }
 
@@ -791,7 +783,7 @@
   register float valf;
 
   while (frames_out<nsamps) {
-    for (i=0;i<chans;i++) {
+    for (i=0; i<chans; i++) {
       valf=float_buffer[i][frames_out];
       abuf->buffer16[0][offs+i]=(short)(valf*(valf>0.?SAMPLE_MAX_16BIT_P:SAMPLE_MAX_16BIT_N));
     }
@@ -821,33 +813,31 @@
 #endif
   if (sbytes>0) {
     lseek64(out_fd,oins_size,SEEK_SET);
-    if (!aunsigned) zero_buff=(uint8_t *)g_malloc0(SILENCE_BLOCK_SIZE);
+    if (!aunsigned) zero_buff=(uint8_t *)lives_malloc0(SILENCE_BLOCK_SIZE);
     else {
-      zero_buff=(uint8_t *)g_malloc(SILENCE_BLOCK_SIZE);
+      zero_buff=(uint8_t *)lives_malloc(SILENCE_BLOCK_SIZE);
       if (asamps==1) memset(zero_buff,0x80,SILENCE_BLOCK_SIZE);
       else {
-	for (i=0;i<SILENCE_BLOCK_SIZE;i+=2) {
-	  if (big_endian) {
-	    memset(zero_buff+i,0x80,1);
-	    memset(zero_buff+i+1,0x00,1);
-	  }
-	  else {
-	    memset(zero_buff+i,0x00,1);
-	    memset(zero_buff+i+1,0x80,1);
-	  }
-	}
+        for (i=0; i<SILENCE_BLOCK_SIZE; i+=2) {
+          if (big_endian) {
+            memset(zero_buff+i,0x80,1);
+            memset(zero_buff+i+1,0x00,1);
+          } else {
+            memset(zero_buff+i,0x00,1);
+            memset(zero_buff+i+1,0x80,1);
+          }
+        }
       }
     }
 
-    for (i=0;i<sbytes;i+=SILENCE_BLOCK_SIZE) {
+    for (i=0; i<sbytes; i+=SILENCE_BLOCK_SIZE) {
       if (sbytes-i<SILENCE_BLOCK_SIZE) sblocksize=sbytes-i;
       mainw->write_failed=FALSE;
-      lives_write (out_fd,zero_buff,sblocksize,TRUE);
+      lives_write(out_fd,zero_buff,sblocksize,TRUE);
       if (mainw->write_failed) retval=FALSE;
     }
-    g_free(zero_buff);
-  }
-  else if (sbytes<=0) {
+    lives_free(zero_buff);
+  } else if (sbytes<=0) {
     lseek64(out_fd,oins_size+sbytes,SEEK_SET);
   }
   return retval;
@@ -868,29 +858,27 @@
 
 
   while (event!=NULL && get_event_timecode(event)<=tc) {
-    hint=get_event_hint (event);
+    hint=get_event_hint(event);
     ctc=get_event_timecode(event);
 
     switch (hint) {
-      
-    case WEED_EVENT_HINT_FILTER_INIT:
-      {
-	weed_plant_t *deinit_event=(weed_plant_t *)weed_get_voidptr_value (event,"deinit_event",&error);
-	if (get_event_timecode(deinit_event)<tc) break;
-	process_events(event,TRUE,ctc);
-      }
-      break;
-    case WEED_EVENT_HINT_FILTER_DEINIT:
-      {
-	weed_plant_t *init_event=(weed_plant_t *)weed_get_voidptr_value (event,"init_event",&error);
-	if (weed_plant_has_leaf(init_event,"host_tag")) {
-	  process_events(event,TRUE,ctc);
-	}
+
+    case WEED_EVENT_HINT_FILTER_INIT: {
+      weed_plant_t *deinit_event=(weed_plant_t *)weed_get_voidptr_value(event,"deinit_event",&error);
+      if (get_event_timecode(deinit_event)<tc) break;
+      process_events(event,TRUE,ctc);
+    }
+    break;
+    case WEED_EVENT_HINT_FILTER_DEINIT: {
+      weed_plant_t *init_event=(weed_plant_t *)weed_get_voidptr_value(event,"init_event",&error);
+      if (weed_plant_has_leaf(init_event,"host_tag")) {
+        process_events(event,TRUE,ctc);
       }
-      break;
+    }
+    break;
     case WEED_EVENT_HINT_FILTER_MAP:
 #ifdef DEBUG_EVENTS
-      g_print ("got new audio effect map\n");
+      g_print("got new audio effect map\n");
 #endif
       mainw->afilter_map=event;
       break;
@@ -906,9 +894,9 @@
 
 
 
-int64_t render_audio_segment(int nfiles, int *from_files, int to_file, double *avels, double *fromtime, 
-			     weed_timecode_t tc_start, weed_timecode_t tc_end, double *chvol, double opvol_start, 
-			     double opvol_end, lives_audio_buf_t *obuf) {
+int64_t render_audio_segment(int nfiles, int *from_files, int to_file, double *avels, double *fromtime,
+                             weed_timecode_t tc_start, weed_timecode_t tc_end, double *chvol, double opvol_start,
+                             double opvol_end, lives_audio_buf_t *obuf) {
   // called during multitrack rendering to create the actual audio file
   // (or in-memory buffer for preview playback in multitrack)
 
@@ -966,7 +954,7 @@
   boolean in_reverse_endian[nfiles],out_reverse_endian=FALSE;
 
   off64_t seekstart[nfiles];
-  gchar *infilename,*outfilename;
+  char *infilename,*outfilename;
 
   weed_timecode_t tc=tc_start;
 
@@ -1013,16 +1001,16 @@
 
   if (to_file>-1) {
     // prepare outfile stuff
-    outfilename=g_build_filename(prefs->tmpdir,outfile->handle,"audio",NULL);
+    outfilename=lives_build_filename(prefs->tmpdir,outfile->handle,"audio",NULL);
 #ifdef DEBUG_ARENDER
     g_print("writing to %s\n",outfilename);
 #endif
     out_fd=open(outfilename,O_WRONLY|O_CREAT|O_SYNC,S_IRUSR|S_IWUSR);
-    g_free(outfilename);
-    
+    lives_free(outfilename);
+
     if (out_fd<0) {
-      if (mainw->write_failed_file!=NULL) g_free(mainw->write_failed_file);
-      mainw->write_failed_file=g_strdup(outfilename);
+      if (mainw->write_failed_file!=NULL) lives_free(mainw->write_failed_file);
+      mainw->write_failed_file=lives_strdup(outfilename);
       mainw->write_failed=TRUE;
       return 0l;
     }
@@ -1037,15 +1025,14 @@
     ins_size=((int64_t)(ins_pt/out_achans/out_asamps+.5))*out_achans*out_asamps;
 
     if ((!out_bendian&&(capable->byte_order==LIVES_BIG_ENDIAN))||
-	(out_bendian&&(capable->byte_order==LIVES_LITTLE_ENDIAN))) 
+        (out_bendian&&(capable->byte_order==LIVES_LITTLE_ENDIAN)))
       out_reverse_endian=TRUE;
     else out_reverse_endian=FALSE;
-    
+
     // fill to ins_pt with zeros
     pad_with_silence(out_fd,cur_size,ins_size,out_asamps,out_unsigned,out_bendian);
 
-  }
-  else {
+  } else {
 
     if (mainw->event_list!=NULL) cfile->aseek_pos=fromtime[0];
 
@@ -1060,7 +1047,7 @@
   g_print("here %d %lld %lld %d\n",nfiles,tc_start,tc_end,to_file);
 #endif
 
-  for (track=0;track<nfiles;track++) {
+  for (track=0; track<nfiles; track++) {
     // prepare infile stuff
     lives_clip_t *infile;
 
@@ -1074,7 +1061,7 @@
     }
 
     is_silent[track]=FALSE;
-    
+
     infile=mainw->files[from_files[track]];
 
     in_asamps[track]=infile->asampsize/8;
@@ -1083,51 +1070,50 @@
     in_unsigned[track]=infile->signed_endian&AFORM_UNSIGNED;
     in_bendian=infile->signed_endian&AFORM_BIG_ENDIAN;
 
-    if (G_UNLIKELY(in_achans[track]==0)) is_silent[track]=TRUE;
+    if (LIVES_UNLIKELY(in_achans[track]==0)) is_silent[track]=TRUE;
     else {
       if ((!in_bendian&&(capable->byte_order==LIVES_BIG_ENDIAN))||
-	  (in_bendian&&(capable->byte_order==LIVES_LITTLE_ENDIAN))) 
-	in_reverse_endian[track]=TRUE;
+          (in_bendian&&(capable->byte_order==LIVES_LITTLE_ENDIAN)))
+        in_reverse_endian[track]=TRUE;
       else in_reverse_endian[track]=FALSE;
-      
+
       seekstart[track]=(off64_t)(fromtime[track]*in_arate[track])*in_achans[track]*in_asamps[track];
       seekstart[track]=((off64_t)(seekstart[track]/in_achans[track]/(in_asamps[track])))*in_achans[track]*in_asamps[track];
-      
+
       zavel=avels[track]*(double)in_arate[track]/(double)out_arate*in_asamps[track]*in_achans[track]/sizeof(float);
       if (ABS(zavel)>zavel_max) zavel_max=ABS(zavel);
-      
-      infilename=g_build_filename(prefs->tmpdir,infile->handle,"audio",NULL);
+
+      infilename=lives_build_filename(prefs->tmpdir,infile->handle,"audio",NULL);
 
 
       // try to speed up access by keeping some files open
       if (track<NSTOREDFDS&&storedfnames[track]!=NULL&&!strcmp(infilename,storedfnames[track])) {
-	in_fd[track]=storedfds[track];
-      }
-      else {
-	if (track<NSTOREDFDS&&storedfds[track]>-1) close(storedfds[track]);
-	in_fd[track]=open(infilename,O_RDONLY);
-	if (in_fd[track]<0) {
-	  if (mainw->read_failed_file!=NULL) g_free(mainw->read_failed_file);
-	  mainw->read_failed_file=g_strdup(infilename);
-	  mainw->read_failed=TRUE;
-	}
+        in_fd[track]=storedfds[track];
+      } else {
+        if (track<NSTOREDFDS&&storedfds[track]>-1) close(storedfds[track]);
+        in_fd[track]=open(infilename,O_RDONLY);
+        if (in_fd[track]<0) {
+          if (mainw->read_failed_file!=NULL) lives_free(mainw->read_failed_file);
+          mainw->read_failed_file=lives_strdup(infilename);
+          mainw->read_failed=TRUE;
+        }
 
 #ifdef IS_MINGW
-	setmode(in_fd[track], O_BINARY);
+        setmode(in_fd[track], O_BINARY);
 #endif
-	if (track<NSTOREDFDS) {
-	  storedfds[track]=in_fd[track];
-	  storedfnames[track]=g_strdup(infilename);
-	}
+        if (track<NSTOREDFDS) {
+          storedfds[track]=in_fd[track];
+          storedfnames[track]=lives_strdup(infilename);
+        }
       }
 
       if (in_fd[track]>-1) lseek64(in_fd[track],seekstart[track],SEEK_SET);
-      
-      g_free(infilename);
+
+      lives_free(infilename);
     }
   }
 
-  for (track=0;track<nfiles;track++) {
+  for (track=0; track<nfiles; track++) {
     if (!is_silent[track]) {
       first_nonsilent=track;
       break;
@@ -1144,22 +1130,20 @@
       ins_size=((int64_t)(ins_pt/out_achans/out_asamps)+.5)*out_achans*out_asamps;
       pad_with_silence(out_fd,oins_size,ins_size,out_asamps,out_unsigned,out_bendian);
       //sync();
-      close (out_fd);
-    }
-    else {
-      for (i=0;i<out_achans;i++) {
-	for (j=obuf->samples_filled;j<obuf->samples_filled+tsamples;j++) {
-	  if (prefs->audio_player==AUD_PLAYER_JACK) {
-	    obuf->bufferf[i][j]=0.;
-	  }
-	  else {
-	    if (!out_unsigned) obuf->buffer16[0][j*out_achans+i]=0;
-	    else {
-	      if (out_bendian) obuf->buffer16[0][j*out_achans+i]=0x8000;
-	      else obuf->buffer16[0][j*out_achans+i]=0x80;
-	    }
-	  }
-	}
+      close(out_fd);
+    } else {
+      for (i=0; i<out_achans; i++) {
+        for (j=obuf->samples_filled; j<obuf->samples_filled+tsamples; j++) {
+          if (prefs->audio_player==AUD_PLAYER_JACK) {
+            obuf->bufferf[i][j]=0.;
+          } else {
+            if (!out_unsigned) obuf->buffer16[0][j*out_achans+i]=0;
+            else {
+              if (out_bendian) obuf->buffer16[0][j*out_achans+i]=0x8000;
+              else obuf->buffer16[0][j*out_achans+i]=0x80;
+            }
+          }
+        }
       }
       obuf->samples_filled+=tsamples;
     }
@@ -1173,7 +1157,7 @@
 
   max_aud_mem=MAX_AUDIO_MEM/(1.5+zavel_max); // allow for size of holding_buff and in_buff
 
-  max_aud_mem=(max_aud_mem>>7)<<7; // round to a multiple of 128 
+  max_aud_mem=(max_aud_mem>>7)<<7; // round to a multiple of 128
 
   max_aud_mem=max_aud_mem/out_achans/nfiles; // max mem per channel/track
 
@@ -1191,13 +1175,13 @@
 
   xsamples=zsamples+(tsamples-(max_segments*zsamples)); // e.g 10 + 30 - 3 * 10 == 10
 
-  holding_buff=(short *)g_malloc(xsamples*sizeof(short)*out_achans);
-  
-  for (i=0;i<out_achans*nfiles;i++) {
-    float_buffer[i]=(float *)g_malloc(xsamples*sizeof(float));
+  holding_buff=(short *)lives_malloc(xsamples*sizeof(short)*out_achans);
+
+  for (i=0; i<out_achans*nfiles; i++) {
+    float_buffer[i]=(float *)lives_malloc(xsamples*sizeof(float));
   }
 
-  finish_buff=g_malloc(tsamples*out_achans*out_asamps);
+  finish_buff=lives_malloc(tsamples*out_achans*out_asamps);
 
 #ifdef DEBUG_ARENDER
   g_print("  rendering %ld samples\n",tsamples);
@@ -1206,25 +1190,25 @@
   while (tsamples>0) {
     tsamples-=xsamples;
 
-    for (track=0;track<nfiles;track++) {
+    for (track=0; track<nfiles; track++) {
       if (is_silent[track]) {
-	// zero float_buff
-	for(c=0;c<out_achans;c++) {
-	  for (x=0;x<xsamples;x++) {
-	    float_buffer[track*out_achans+c][x]=0.;
-	  }
-	}
-	continue;
+        // zero float_buff
+        for (c=0; c<out_achans; c++) {
+          for (x=0; x<xsamples; x++) {
+            float_buffer[track*out_achans+c][x]=0.;
+          }
+        }
+        continue;
       }
 
       // calculate tbytes for xsamples
 
       zavel=avels[track]*(double)in_arate[track]/(double)out_arate;
 
-      tbytes=(int)((double)xsamples*ABS(zavel)+((double)fastrand()/(double)G_MAXUINT32))*
-	in_asamps[track]*in_achans[track];
+      tbytes=(int)((double)xsamples*ABS(zavel)+((double)fastrand()/(double)LIVES_MAXUINT32))*
+             in_asamps[track]*in_achans[track];
 
-      in_buff=(uint8_t *)g_malloc(tbytes);
+      in_buff=(uint8_t *)lives_malloc(tbytes);
 
       if (zavel<0. && in_fd[track]>-1) lseek64(in_fd[track],seekstart[track]-tbytes,SEEK_SET);
 
@@ -1235,36 +1219,35 @@
       if (bytes_read<0) bytes_read=0;
 
       if (from_files[track]==mainw->ascrap_file) {
-	// be forgiving with the ascrap file
-	if (mainw->read_failed) mainw->read_failed=FALSE;
+        // be forgiving with the ascrap file
+        if (mainw->read_failed) mainw->read_failed=FALSE;
       }
 
       if (zavel<0.) seekstart[track]-=bytes_read;
 
       if (bytes_read<tbytes&&bytes_read>=0) {
-	if (zavel>0) memset(in_buff+bytes_read,0,tbytes-bytes_read);
-	else {
-	  memmove(in_buff+tbytes-bytes_read,in_buff,bytes_read);
-	  memset(in_buff,0,tbytes-bytes_read);
-	}
+        if (zavel>0) memset(in_buff+bytes_read,0,tbytes-bytes_read);
+        else {
+          memmove(in_buff+tbytes-bytes_read,in_buff,bytes_read);
+          memset(in_buff,0,tbytes-bytes_read);
+        }
       }
 
       nframes=(tbytes/(in_asamps[track])/in_achans[track]/ABS(zavel)+.001);
 
       // convert to float
       if (in_asamps[track]==1) {
-	sample_move_d8_d16 (holding_buff,(uint8_t *)in_buff,nframes,tbytes,zavel,out_achans,in_achans[track],0);
-      }
-      else {
-	sample_move_d16_d16(holding_buff,(short*)in_buff,nframes,tbytes,zavel,out_achans,
-			    in_achans[track],in_reverse_endian[track]?SWAP_X_TO_L:0,0);
+        sample_move_d8_d16(holding_buff,(uint8_t *)in_buff,nframes,tbytes,zavel,out_achans,in_achans[track],0);
+      } else {
+        sample_move_d16_d16(holding_buff,(short *)in_buff,nframes,tbytes,zavel,out_achans,
+                            in_achans[track],in_reverse_endian[track]?SWAP_X_TO_L:0,0);
       }
 
-      g_free(in_buff);
+      lives_free(in_buff);
 
-      for(c=0;c<out_achans;c++) {
-	sample_move_d16_float(float_buffer[c+track*out_achans],holding_buff+c,nframes,
-			      out_achans,in_unsigned[track],FALSE,chvol[track]);
+      for (c=0; c<out_achans; c++) {
+        sample_move_d16_float(float_buffer[c+track*out_achans],holding_buff+c,nframes,
+                              out_achans,in_unsigned[track],FALSE,chvol[track]);
       }
     }
 
@@ -1272,64 +1255,64 @@
     shortcut=NULL;
     blocksize=render_block_size;
 
-    for (i=0;i<xsamples;i+=render_block_size) {
+    for (i=0; i<xsamples; i+=render_block_size) {
       if (i+render_block_size>xsamples) blocksize=xsamples-i;
 
-      for (track=0;track<nfiles;track++) {
-	for (c=0;c<out_achans;c++) {
-	  //g_print("xvals %.4f\n",*(float_buffer[track*out_achans+c]+i));
-	  chunk_float_buffer[track*out_achans+c]=float_buffer[track*out_achans+c]+i;
-	}
+      for (track=0; track<nfiles; track++) {
+        for (c=0; c<out_achans; c++) {
+          //g_print("xvals %.4f\n",*(float_buffer[track*out_achans+c]+i));
+          chunk_float_buffer[track*out_achans+c]=float_buffer[track*out_achans+c]+i;
+        }
       }
 
       if (mainw->event_list!=NULL&&mainw->filter_map!=NULL&&!(mainw->multitrack==NULL&&from_files[0]==mainw->ascrap_file)) {
-	// we need to apply all audio effects with output here.
-	// even in clipedit mode (for preview/rendering with an event list)
-	// also, we will need to keep updating the mainw->filter_map from mainw->event_list, as filters may switched on and off during the block
+        // we need to apply all audio effects with output here.
+        // even in clipedit mode (for preview/rendering with an event list)
+        // also, we will need to keep updating the mainw->filter_map from mainw->event_list, as filters may switched on and off during the block
 
-	int nbtracks=0;
+        int nbtracks=0;
 
-	// apply audio filter(s)
-	if (mainw->multitrack!=NULL) {
-	  // we work out the "visibility" of each track at tc
-	  vis=get_track_visibility_at_tc(mainw->multitrack->event_list,nfiles,
-					 mainw->multitrack->opts.back_audio_tracks,tc,&shortcut,
-					 mainw->multitrack->opts.audio_bleedthru);
+        // apply audio filter(s)
+        if (mainw->multitrack!=NULL) {
+          // we work out the "visibility" of each track at tc
+          vis=get_track_visibility_at_tc(mainw->multitrack->event_list,nfiles,
+                                         mainw->multitrack->opts.back_audio_tracks,tc,&shortcut,
+                                         mainw->multitrack->opts.audio_bleedthru);
 
-	  // first track is ascrap_file - flag that no effects should be applied to it, except for the audio mixer
-	  if (mainw->ascrap_file>-1&&from_files[0]==mainw->ascrap_file) vis[0]=-vis[0];
+          // first track is ascrap_file - flag that no effects should be applied to it, except for the audio mixer
+          if (mainw->ascrap_file>-1&&from_files[0]==mainw->ascrap_file) vis[0]=-vis[0];
 
-	  nbtracks=mainw->multitrack->opts.back_audio_tracks;
-	}
-	
-	// process events up to current tc:
-	// filter inits and deinits, and filter maps
+          nbtracks=mainw->multitrack->opts.back_audio_tracks;
+        }
 
-	audio_process_events_to(tc);
+        // process events up to current tc:
+        // filter inits and deinits, and filter maps
 
-	// locate the master volume parameter, and multiply all values by vis[track]
-	weed_apply_audio_effects(mainw->afilter_map,chunk_float_buffer,nbtracks,
-				 out_achans,blocksize,out_arate,tc,vis);
-	
-	if (vis!=NULL) g_free(vis);
+        audio_process_events_to(tc);
+
+        // locate the master volume parameter, and multiply all values by vis[track]
+        weed_apply_audio_effects(mainw->afilter_map,chunk_float_buffer,nbtracks,
+                                 out_achans,blocksize,out_arate,tc,vis);
+
+        if (vis!=NULL) lives_free(vis);
 
       }
 
       if (mainw->multitrack==NULL&&opvol_end!=opvol_start) {
-	time+=(double)frames_out/(double)out_arate;
-	opvol=opvol_start+(opvol_end-opvol_start)*(time/(double)((tc_end-tc_start)/U_SEC));
+        time+=(double)frames_out/(double)out_arate;
+        opvol=opvol_start+(opvol_end-opvol_start)*(time/(double)((tc_end-tc_start)/U_SEC));
       }
 
       if (to_file>-1&&mainw->multitrack==NULL&&opvol_start!=opvol_end) {
-	// output to file
-	// convert back to int; use out_scale of 1., since we did our resampling in sample_move_*_d16
-	frames_out=sample_move_float_int((void *)finish_buff,chunk_float_buffer,blocksize,1.,out_achans,
-					 out_asamps*8,out_unsigned,out_reverse_endian,FALSE,opvol);
-	lives_write (out_fd,finish_buff,frames_out*out_asamps*out_achans,TRUE);
-	tot_frames+=frames_out;
-	
+        // output to file
+        // convert back to int; use out_scale of 1., since we did our resampling in sample_move_*_d16
+        frames_out=sample_move_float_int((void *)finish_buff,chunk_float_buffer,blocksize,1.,out_achans,
+                                         out_asamps*8,out_unsigned,out_reverse_endian,FALSE,opvol);
+        lives_write(out_fd,finish_buff,frames_out*out_asamps*out_achans,TRUE);
+        tot_frames+=frames_out;
+
 #ifdef DEBUG_ARENDER
-	g_print(".");
+        g_print(".");
 #endif
       }
       tc+=(double)blocksize/(double)out_arate*U_SEC;
@@ -1339,20 +1322,18 @@
       // output to file
       // convert back to int; use out_scale of 1., since we did our resampling in sample_move_*_d16
       frames_out=sample_move_float_int((void *)finish_buff,float_buffer,xsamples,1.,out_achans,
-				       out_asamps*8,out_unsigned,out_reverse_endian,FALSE,opvol);
-      lives_write (out_fd,finish_buff,frames_out*out_asamps*out_achans,TRUE);
+                                       out_asamps*8,out_unsigned,out_reverse_endian,FALSE,opvol);
+      lives_write(out_fd,finish_buff,frames_out*out_asamps*out_achans,TRUE);
 #ifdef DEBUG_ARENDER
       g_print(".");
 #endif
       tot_frames+=frames_out;
-    }
-    else {
+    } else {
       // output to memory buffer
       if (prefs->audio_player==AUD_PLAYER_JACK) {
-	frames_out=chunk_to_float_abuf(obuf,float_buffer,xsamples);
-      }
-      else {
-	frames_out=chunk_to_int16_abuf(obuf,float_buffer,xsamples);
+        frames_out=chunk_to_float_abuf(obuf,float_buffer,xsamples);
+      } else {
+        frames_out=chunk_to_int16_abuf(obuf,float_buffer,xsamples);
       }
       obuf->samples_filled+=frames_out;
       tot_frames+=frames_out;
@@ -1364,26 +1345,26 @@
 
 
   if (xsamples>0) {
-    for (i=0;i<out_achans*nfiles;i++) {
-      if (float_buffer[i]!=NULL) g_free(float_buffer[i]);
+    for (i=0; i<out_achans*nfiles; i++) {
+      if (float_buffer[i]!=NULL) lives_free(float_buffer[i]);
     }
   }
 
-  if (finish_buff!=NULL) g_free(finish_buff);
-  if (holding_buff!=NULL) g_free(holding_buff);
-  
+  if (finish_buff!=NULL) lives_free(finish_buff);
+  if (holding_buff!=NULL) lives_free(holding_buff);
+
   // close files
-  for (track=0;track<nfiles;track++) {
+  for (track=0; track<nfiles; track++) {
     if (!is_silent[track]) {
-      if (track>=NSTOREDFDS && in_fd[track]>-1) close (in_fd[track]);
+      if (track>=NSTOREDFDS && in_fd[track]>-1) close(in_fd[track]);
     }
   }
-    
+
   if (to_file>-1) {
 #ifdef DEBUG_ARENDER
     g_print("fs is %ld\n",get_file_size(out_fd));
 #endif
-    close (out_fd);
+    close(out_fd);
   }
 
   return tot_frames;
@@ -1397,12 +1378,12 @@
   render_audio_segment(1,&fileno,fileno,&vel,&startt,startt*U_SECL,endt*U_SECL,&vol,startv,endv,NULL);
 
   if (mainw->write_failed) {
-    gchar *outfilename=g_build_filename(prefs->tmpdir,mainw->files[fileno]->handle,"audio",NULL);
+    char *outfilename=lives_build_filename(prefs->tmpdir,mainw->files[fileno]->handle,"audio",NULL);
     do_write_failed_error_s(outfilename,NULL);
   }
-  
+
   if (mainw->read_failed) {
-    gchar *infilename=g_build_filename(prefs->tmpdir,mainw->files[fileno]->handle,"audio",NULL);
+    char *infilename=lives_build_filename(prefs->tmpdir,mainw->files[fileno]->handle,"audio",NULL);
     do_read_failed_error_s(infilename,NULL);
   }
 
@@ -1426,7 +1407,7 @@
     mainw->jackd_read->frames_written=0;
 
     mainw->jackd_read->reverse_endian=FALSE;
-      
+
     // start jack "recording"
     jack_open_device_read(mainw->jackd_read);
     jack_read_driver_activate(mainw->jackd_read,FALSE);
@@ -1435,27 +1416,26 @@
   }
 
   outfile=mainw->files[fileno];
-  
+
   if (mainw->aud_rec_fd==-1) {
-    gchar *outfilename=g_build_filename(prefs->tmpdir,outfile->handle,"audio",NULL);
+    char *outfilename=lives_build_filename(prefs->tmpdir,outfile->handle,"audio",NULL);
     do {
       retval=0;
       mainw->aud_rec_fd=open(outfilename,O_WRONLY|O_CREAT|O_APPEND,S_IRUSR|S_IWUSR);
       if (mainw->aud_rec_fd<0) {
-	retval=do_write_failed_error_s_with_retry(outfilename,g_strerror(errno),NULL);
-	if (retval==LIVES_CANCEL) {
-	  g_free(outfilename);
-	  return;
-	}
+        retval=do_write_failed_error_s_with_retry(outfilename,lives_strerror(errno),NULL);
+        if (retval==LIVES_RESPONSE_CANCEL) {
+          lives_free(outfilename);
+          return;
+        }
       }
-    } while (retval==LIVES_RETRY);
-    g_free(outfilename);
+    } while (retval==LIVES_RESPONSE_RETRY);
+    lives_free(outfilename);
   }
 
   if (rec_type==RECA_GENERATED) {
     mainw->jackd->playing_file=fileno;
-  }
-  else {
+  } else {
     if (!jackd_read_started) mainw->jackd_read=jack_get_driver(0,FALSE);
     mainw->jackd_read->playing_file=fileno;
     mainw->jackd_read->frames_written=0;
@@ -1470,36 +1450,35 @@
     int asigned;
     int aendian;
     uint64_t fsize=get_file_size(mainw->aud_rec_fd);
-    
+
     if (rec_type==RECA_EXTERNAL) {
       mainw->jackd_read->reverse_endian=FALSE;
-      
+
       // start jack recording
 
       if (!jackd_read_started) {
-	jack_open_device_read(mainw->jackd_read);
-	jack_read_driver_activate(mainw->jackd_read,FALSE);
+        jack_open_device_read(mainw->jackd_read);
+        jack_read_driver_activate(mainw->jackd_read,FALSE);
       }
 
       outfile->arate=outfile->arps=mainw->jackd_read->sample_in_rate;
       outfile->achans=mainw->jackd_read->num_input_channels;
-      
+
       outfile->asampsize=16;
       outfile->signed_endian=get_signed_endian(TRUE,TRUE);
-      
+
       asigned=!(outfile->signed_endian&AFORM_UNSIGNED);
       aendian=!(outfile->signed_endian&AFORM_BIG_ENDIAN);
-      
+
       mainw->jackd_read->frames_written=fsize/(outfile->achans*(outfile->asampsize>>3));
-    }
-    else {
+    } else {
       mainw->jackd->reverse_endian=FALSE;
       outfile->arate=outfile->arps=mainw->jackd->sample_out_rate;
       outfile->achans=mainw->jackd->num_output_channels;
-      
+
       outfile->asampsize=16;
       outfile->signed_endian=get_signed_endian(TRUE,TRUE);
-      
+
       asigned=!(outfile->signed_endian&AFORM_UNSIGNED);
       aendian=!(outfile->signed_endian&AFORM_BIG_ENDIAN);
     }
@@ -1511,16 +1490,15 @@
     save_clip_value(fileno,CLIP_DETAILS_AENDIAN,&aendian);
     save_clip_value(fileno,CLIP_DETAILS_ASIGNED,&asigned);
 
-  }
-  else {
+  } else {
 
     int out_bendian=outfile->signed_endian&AFORM_BIG_ENDIAN;
 
     if ((!out_bendian&&(capable->byte_order==LIVES_BIG_ENDIAN))||
-	(out_bendian&&(capable->byte_order==LIVES_LITTLE_ENDIAN))) 
+        (out_bendian&&(capable->byte_order==LIVES_LITTLE_ENDIAN)))
       mainw->jackd_read->reverse_endian=TRUE;
     else mainw->jackd_read->reverse_endian=FALSE;
-    
+
     // start jack recording
     jack_open_device_read(mainw->jackd_read);
     jack_read_driver_activate(mainw->jackd_read,TRUE);
@@ -1537,8 +1515,7 @@
   mainw->suppress_dprint=TRUE;
   if (rec_type==RECA_NEW_CLIP) {
     do_auto_dialog(_("Recording audio"),1);
-  }
-  else {
+  } else {
     int current_file=mainw->current_file;
     mainw->current_file=old_file;
     on_playsel_activate(NULL,NULL);
@@ -1556,8 +1533,7 @@
     // stop recording
     if (mainw->jackd_read!=NULL) jack_close_device(mainw->jackd_read);
     mainw->jackd_read=NULL;
-  }
-  else mainw->jackd_read->in_use=FALSE;
+  } else mainw->jackd_read->in_use=FALSE;
 
 
   if (close_fd&&mainw->aud_rec_fd!=-1) {
@@ -1595,25 +1571,24 @@
   outfile=mainw->files[fileno];
 
   if (mainw->aud_rec_fd==-1) {
-    gchar *outfilename=g_build_filename(prefs->tmpdir,outfile->handle,"audio",NULL);
+    char *outfilename=lives_build_filename(prefs->tmpdir,outfile->handle,"audio",NULL);
     do {
       retval=0;
       mainw->aud_rec_fd=open(outfilename,O_WRONLY|O_CREAT|O_APPEND,S_IRUSR|S_IWUSR);
       if (mainw->aud_rec_fd<0) {
-	retval=do_write_failed_error_s_with_retry(outfilename,g_strerror(errno),NULL);
-	if (retval==LIVES_CANCEL) {
-	  g_free(outfilename);
-	  return;
-	}
+        retval=do_write_failed_error_s_with_retry(outfilename,lives_strerror(errno),NULL);
+        if (retval==LIVES_RESPONSE_CANCEL) {
+          lives_free(outfilename);
+          return;
+        }
       }
-    } while (retval==LIVES_RETRY);
-    g_free(outfilename);
+    } while (retval==LIVES_RESPONSE_RETRY);
+    lives_free(outfilename);
   }
 
   if (rec_type==RECA_GENERATED) {
     mainw->pulsed->playing_file=fileno;
-  }
-  else {
+  } else {
     mainw->pulsed_read=pulse_get_driver(FALSE);
     mainw->pulsed_read->playing_file=fileno;
     mainw->pulsed_read->frames_written=0;
@@ -1630,28 +1605,27 @@
 
     if (rec_type==RECA_EXTERNAL) {
       mainw->pulsed_read->reverse_endian=FALSE;
-      
+
       pulse_driver_activate(mainw->pulsed_read);
-      
+
       outfile->arate=outfile->arps=mainw->pulsed_read->out_arate;
       outfile->achans=mainw->pulsed_read->out_achans;
       outfile->asampsize=mainw->pulsed_read->out_asamps;
       outfile->signed_endian=get_signed_endian(mainw->pulsed_read->out_signed!=AFORM_UNSIGNED,
-					       mainw->pulsed_read->out_endian!=AFORM_BIG_ENDIAN);
-      
+                             mainw->pulsed_read->out_endian!=AFORM_BIG_ENDIAN);
+
       asigned=!(outfile->signed_endian&AFORM_UNSIGNED);
       aendian=!(outfile->signed_endian&AFORM_BIG_ENDIAN);
-      
+
       mainw->pulsed_read->frames_written=fsize/(outfile->achans*(outfile->asampsize>>3));
-    }
-    else {
+    } else {
       mainw->pulsed->reverse_endian=FALSE;
       outfile->arate=outfile->arps=mainw->pulsed->out_arate;
       outfile->achans=mainw->pulsed->out_achans;
       outfile->asampsize=mainw->pulsed->out_asamps;
       outfile->signed_endian=get_signed_endian(mainw->pulsed->out_signed!=AFORM_UNSIGNED,
-					       mainw->pulsed->out_endian!=AFORM_BIG_ENDIAN);
-      
+                             mainw->pulsed->out_endian!=AFORM_BIG_ENDIAN);
+
       asigned=!(outfile->signed_endian&AFORM_UNSIGNED);
       aendian=!(outfile->signed_endian&AFORM_BIG_ENDIAN);
     }
@@ -1663,12 +1637,11 @@
     save_clip_value(fileno,CLIP_DETAILS_AENDIAN,&aendian);
     save_clip_value(fileno,CLIP_DETAILS_ASIGNED,&asigned);
 
-  }
-  else {
+  } else {
     int out_bendian=outfile->signed_endian&AFORM_BIG_ENDIAN;
-    
+
     if ((!out_bendian&&(capable->byte_order==LIVES_BIG_ENDIAN))||
-	(out_bendian&&(capable->byte_order==LIVES_LITTLE_ENDIAN))) 
+        (out_bendian&&(capable->byte_order==LIVES_LITTLE_ENDIAN)))
       mainw->pulsed_read->reverse_endian=TRUE;
     else mainw->pulsed_read->reverse_endian=FALSE;
 
@@ -1743,26 +1716,25 @@
   // increase the element size of the audstate array (ostate)
   // from nostate elements to nstate elements
 
-  lives_audio_track_state_t *audstate=(lives_audio_track_state_t *)g_malloc(nstate*sizeof(lives_audio_track_state_t));
+  lives_audio_track_state_t *audstate=(lives_audio_track_state_t *)lives_malloc(nstate*sizeof(lives_audio_track_state_t));
   int i;
 
-  for (i=0;i<nstate;i++) {
+  for (i=0; i<nstate; i++) {
     if (i<nostate) {
       audstate[i].afile=ostate[i].afile;
       audstate[i].seek=ostate[i].seek;
       audstate[i].vel=ostate[i].vel;
-    }
-    else {
+    } else {
       audstate[i].afile=0;
       audstate[i].seek=audstate[i].vel=0.;
     }
   }
 
-  if (ostate!=NULL) g_free(ostate);
+  if (ostate!=NULL) lives_free(ostate);
 
   return audstate;
 }
-	
+
 
 
 
@@ -1778,19 +1750,19 @@
   double *aseeks=weed_get_double_array(event,"audio_seeks",&error);
   int naudstate=0;
   lives_audio_track_state_t *atstate=NULL;
-  
+
   register int i;
 
   int btoffs=mainw->multitrack!=NULL?mainw->multitrack->opts.back_audio_tracks:1;
 
 
-  for (i=0;i<num_aclips;i+=2) {
+  for (i=0; i<num_aclips; i+=2) {
     if (aclips[i+1]>0) { // else ignore
       atrack=aclips[i];
       if (atrack+btoffs>=naudstate-1) {
-	atstate=resize_audstate(atstate,naudstate,atrack+btoffs+2);
-	naudstate=atrack+btoffs+1;
-	atstate[naudstate].afile=-1;
+        atstate=resize_audstate(atstate,naudstate,atrack+btoffs+2);
+        naudstate=atrack+btoffs+1;
+        atstate[naudstate].afile=-1;
       }
       atstate[atrack+btoffs].afile=aclips[i+1];
       atstate[atrack+btoffs].seek=aseeks[i];
@@ -1798,8 +1770,8 @@
     }
   }
 
-  weed_free(aclips);
-  weed_free(aseeks);
+  lives_free(aclips);
+  lives_free(aseeks);
 
   return atstate;
 }
@@ -1807,10 +1779,10 @@
 
 
 
-lives_audio_track_state_t *get_audio_and_effects_state_at(weed_plant_t *event_list, weed_plant_t *st_event, 
-							  boolean get_audstate, boolean exact) {
+lives_audio_track_state_t *get_audio_and_effects_state_at(weed_plant_t *event_list, weed_plant_t *st_event,
+    boolean get_audstate, boolean exact) {
 
-  // if exact is set, we must rewind back to first active stateful effect, 
+  // if exact is set, we must rewind back to first active stateful effect,
   // and play forwards from there (not yet implemented - TODO)
 
   weed_plant_t *nevent=get_first_event(event_list),*event;
@@ -1836,44 +1808,42 @@
     event=nevent;
     if (WEED_EVENT_IS_FILTER_MAP(event)) {
       mainw->afilter_map=mainw->filter_map=event;
-    }
-    else if (WEED_EVENT_IS_FILTER_INIT(event)) {
+    } else if (WEED_EVENT_IS_FILTER_INIT(event)) {
       deinit_event=(weed_plant_t *)weed_get_voidptr_value(event,"deinit_event",&error);
       if (get_event_timecode(deinit_event)>=fill_tc) {
-	// this effect should be activated
-	process_events(event,FALSE,get_event_timecode(event));
-	process_events(event,TRUE,get_event_timecode(event));
+        // this effect should be activated
+        process_events(event,FALSE,get_event_timecode(event));
+        process_events(event,TRUE,get_event_timecode(event));
       }
-    }
-    else if (get_audstate&&weed_plant_has_leaf(event,"audio_clips")) {
+    } else if (get_audstate&&WEED_EVENT_IS_AUDIO_FRAME(event)) {
 
       atstate=aframe_to_atstate(event);
 
       if (audstate==NULL) audstate=atstate;
       else {
-	// have an existing audio state, update with current
-	for (nfiles=0;audstate[nfiles].afile!=-1;nfiles++);
-
-	for (i=0;i<nfiles;i++) {
-	  // increase seek values up to current frame
-	  audstate[i].seek+=audstate[i].vel*(get_event_timecode(event)-last_tc)/U_SEC;
-	}
-
-	for (nnfiles=0;atstate[nnfiles].afile!=-1;nnfiles++);
-
-	if (nnfiles>nfiles) {
-	  audstate=resize_audstate(audstate,nfiles,nnfiles+1);
-	  audstate[nnfiles].afile=-1;
-	}
-
-	for (i=0;i<nnfiles;i++) {
-	  if (atstate[i].afile>0) {
-	    audstate[i].afile=atstate[i].afile;
-	    audstate[i].seek=atstate[i].seek;
-	    audstate[i].vel=atstate[i].vel;
-	  }
-	}                                                             
-	g_free(atstate);
+        // have an existing audio state, update with current
+        for (nfiles=0; audstate[nfiles].afile!=-1; nfiles++);
+
+        for (i=0; i<nfiles; i++) {
+          // increase seek values up to current frame
+          audstate[i].seek+=audstate[i].vel*(get_event_timecode(event)-last_tc)/U_SEC;
+        }
+
+        for (nnfiles=0; atstate[nnfiles].afile!=-1; nnfiles++);
+
+        if (nnfiles>nfiles) {
+          audstate=resize_audstate(audstate,nfiles,nnfiles+1);
+          audstate[nnfiles].afile=-1;
+        }
+
+        for (i=0; i<nnfiles; i++) {
+          if (atstate[i].afile>0) {
+            audstate[i].afile=atstate[i].afile;
+            audstate[i].seek=atstate[i].seek;
+            audstate[i].vel=atstate[i].vel;
+          }
+        }
+        lives_free(atstate);
       }
 
       last_tc=get_event_timecode(event);
@@ -1882,9 +1852,9 @@
   } while (event!=st_event);
 
   if (audstate!=NULL) {
-    for (nfiles=0;audstate[nfiles].afile!=-1;nfiles++);
+    for (nfiles=0; audstate[nfiles].afile!=-1; nfiles++);
 
-    for (i=0;i<nfiles;i++) {
+    for (i=0; i<nfiles; i++) {
       // increase seek values
       audstate[i].seek+=audstate[i].vel*(fill_tc-last_tc)/U_SEC;
     }
@@ -1905,7 +1875,7 @@
 
   // otherwise, we continue from where we left off the last time
 
-  
+
   // all we really do here is set from_files,aseeks and avels arrays and call render_audio_segment
 
   lives_audio_track_state_t *atstate=NULL;
@@ -1931,19 +1901,19 @@
     event=st_event;
     last_tc=get_event_timecode(event);
 
-    if (from_files!=NULL) g_free(from_files);
-    if (avels!=NULL) g_free(avels);
-    if (aseeks!=NULL) g_free(aseeks);
+    if (from_files!=NULL) lives_free(from_files);
+    if (avels!=NULL) lives_free(avels);
+    if (aseeks!=NULL) lives_free(aseeks);
 
     if (mainw->multitrack!=NULL) nfiles=weed_leaf_num_elements(mainw->multitrack->avol_init_event,"in_tracks");
 
     else nfiles=1;
 
-    from_files=(int *)g_malloc(nfiles*sizint);
-    avels=(double *)g_malloc(nfiles*sizdbl);
-    aseeks=(double *)g_malloc(nfiles*sizdbl);
+    from_files=(int *)lives_malloc(nfiles*sizint);
+    avels=(double *)lives_malloc(nfiles*sizdbl);
+    aseeks=(double *)lives_malloc(nfiles*sizdbl);
 
-    for (i=0;i<nfiles;i++) {
+    for (i=0; i<nfiles; i++) {
       from_files[i]=0;
       avels[i]=aseeks[i]=0.;
     }
@@ -1951,56 +1921,54 @@
     // TODO - actually what we should do here is get the audio state for
     // the *last* frame in the buffer and then adjust the seeks back to the
     // beginning of the buffer, in case an audio track starts during the
-    // buffering period. The current way is fine for a preview, but when we 
+    // buffering period. The current way is fine for a preview, but when we
     // implement rendering of *partial* event lists we will need to do this
 
-    // a negative seek value would mean that we need to pad silence at the 
+    // a negative seek value would mean that we need to pad silence at the
     // start of the track buffer
 
 
-    if (event!=get_first_event(event_list)) 
+    if (event!=get_first_event(event_list))
       atstate=get_audio_and_effects_state_at(event_list,event,TRUE,exact);
 
     // process audio updates at this frame
     else atstate=aframe_to_atstate(event);
-    
+
     mainw->audio_event=event;
 
     if (atstate!=NULL) {
-      
-      for (nnfiles=0;atstate[nnfiles].afile!=-1;nnfiles++);
-      
-      for (i=0;i<nnfiles;i++) {
-	if (atstate[i].afile>0) {
-	  from_files[i]=atstate[i].afile;
-	  avels[i]=atstate[i].vel;
-	  aseeks[i]=atstate[i].seek;
-	}
+
+      for (nnfiles=0; atstate[nnfiles].afile!=-1; nnfiles++);
+
+      for (i=0; i<nnfiles; i++) {
+        if (atstate[i].afile>0) {
+          from_files[i]=atstate[i].afile;
+          avels[i]=atstate[i].vel;
+          aseeks[i]=atstate[i].seek;
+        }
       }
-      
-      g_free(atstate);
+
+      lives_free(atstate);
     }
-  }
-  else {
+  } else {
     is_cont=TRUE;
   }
 
   if (mainw->multitrack!=NULL) {
     // get channel volumes from the mixer
-    for (i=0;i<nfiles;i++) {
+    for (i=0; i<nfiles; i++) {
       if (mainw->multitrack!=NULL&&mainw->multitrack->audio_vols!=NULL) {
-	chvols[i]=(double)GPOINTER_TO_INT(g_list_nth_data(mainw->multitrack->audio_vols,i))/1000000.;
+        chvols[i]=(double)LIVES_POINTER_TO_INT(lives_list_nth_data(mainw->multitrack->audio_vols,i))/1000000.;
       }
     }
-  }
-  else chvols[0]=1.;
+  } else chvols[0]=1.;
 
   fill_tc=last_tc+(double)(abuf->samp_space)/(double)abuf->arate*U_SEC;
 
   // continue until either we have a full buffer, or we reach next audio frame
   while (event!=NULL&&get_event_timecode(event)<=fill_tc) {
     if (!is_cont) event=get_next_frame_event(event);
-    if (event!=NULL&&weed_plant_has_leaf(event,"audio_clips")) {
+    if (WEED_EVENT_IS_AUDIO_FRAME(event)) {
       // got next audio frame
       weed_timecode_t tc=get_event_timecode(event);
       if (tc>=fill_tc) break;
@@ -2008,18 +1976,18 @@
       tc+=(U_SEC/cfile->fps*!is_blank_frame(event,FALSE));
 
       mainw->read_failed=FALSE;
-      if (mainw->read_failed_file!=NULL) g_free(mainw->read_failed_file);
+      if (mainw->read_failed_file!=NULL) lives_free(mainw->read_failed_file);
       mainw->read_failed_file=NULL;
 
       render_audio_segment(nfiles, from_files, -1, avels, aseeks, last_tc, tc, chvols, 1., 1., abuf);
 
       if (mainw->read_failed) {
-	do_read_failed_error_s(mainw->read_failed_file,NULL);
+        do_read_failed_error_s(mainw->read_failed_file,NULL);
       }
 
-      for (i=0;i<nfiles;i++) {
-	// increase seek values
-	aseeks[i]+=avels[i]*(tc-last_tc)/U_SEC;
+      for (i=0; i<nfiles; i++) {
+        // increase seek values
+        aseeks[i]+=avels[i]*(tc-last_tc)/U_SEC;
       }
 
       last_tc=tc;
@@ -2028,30 +1996,30 @@
       atstate=aframe_to_atstate(event);
 
       if (atstate!=NULL) {
-	for (nnfiles=0;atstate[nnfiles].afile!=-1;nnfiles++);
-
-	for (i=0;i<nnfiles;i++) {
-	  if (atstate[i].afile>0) {
-	    from_files[i]=atstate[i].afile;
-	    avels[i]=atstate[i].vel;
-	    aseeks[i]=atstate[i].seek;
-	  }
-	}
-	g_free(atstate);
+        for (nnfiles=0; atstate[nnfiles].afile!=-1; nnfiles++);
+
+        for (i=0; i<nnfiles; i++) {
+          if (atstate[i].afile>0) {
+            from_files[i]=atstate[i].afile;
+            avels[i]=atstate[i].vel;
+            aseeks[i]=atstate[i].seek;
+          }
+        }
+        lives_free(atstate);
       }
     }
     is_cont=FALSE;
   }
-  
+
   if (last_tc<fill_tc) {
     // flush the rest of the audio
 
     mainw->read_failed=FALSE;
-    if (mainw->read_failed_file!=NULL) g_free(mainw->read_failed_file);
+    if (mainw->read_failed_file!=NULL) lives_free(mainw->read_failed_file);
     mainw->read_failed_file=NULL;
 
     render_audio_segment(nfiles, from_files, -1, avels, aseeks, last_tc, fill_tc, chvols, 1., 1., abuf);
-    for (i=0;i<nfiles;i++) {
+    for (i=0; i<nfiles; i++) {
       // increase seek values
       aseeks[i]+=avels[i]*(fill_tc-last_tc)/U_SEC;
     }
@@ -2077,43 +2045,43 @@
 
 
 
-void init_jack_audio_buffers (int achans, int arate, boolean exact) {
+void init_jack_audio_buffers(int achans, int arate, boolean exact) {
 #ifdef ENABLE_JACK
 
   int i,chan;
 
-  mainw->jackd->abufs=(lives_audio_buf_t **)g_malloc(prefs->num_rtaudiobufs*sizeof(lives_audio_buf_t *));
-  
-  for (i=0;i<prefs->num_rtaudiobufs;i++) {
-    mainw->jackd->abufs[i]=(lives_audio_buf_t *)g_malloc(sizeof(lives_audio_buf_t));
-    
+  mainw->jackd->abufs=(lives_audio_buf_t **)lives_malloc(prefs->num_rtaudiobufs*sizeof(lives_audio_buf_t *));
+
+  for (i=0; i<prefs->num_rtaudiobufs; i++) {
+    mainw->jackd->abufs[i]=(lives_audio_buf_t *)lives_malloc(sizeof(lives_audio_buf_t));
+
     mainw->jackd->abufs[i]->out_achans=achans;
     mainw->jackd->abufs[i]->arate=arate;
     mainw->jackd->abufs[i]->samp_space=XSAMPLES/prefs->num_rtaudiobufs;
-    mainw->jackd->abufs[i]->bufferf=(float **)g_malloc(achans*sizeof(float *));
-    for (chan=0;chan<achans;chan++) {
-      mainw->jackd->abufs[i]->bufferf[chan]=(float *)g_malloc(XSAMPLES/prefs->num_rtaudiobufs*sizeof(float));
+    mainw->jackd->abufs[i]->bufferf=(float **)lives_malloc(achans*sizeof(float *));
+    for (chan=0; chan<achans; chan++) {
+      mainw->jackd->abufs[i]->bufferf[chan]=(float *)lives_malloc(XSAMPLES/prefs->num_rtaudiobufs*sizeof(float));
     }
   }
 #endif
 }
 
 
-void init_pulse_audio_buffers (int achans, int arate, boolean exact) {
+void init_pulse_audio_buffers(int achans, int arate, boolean exact) {
 #ifdef HAVE_PULSE_AUDIO
 
   int i;
 
-  mainw->pulsed->abufs=(lives_audio_buf_t **)g_malloc(prefs->num_rtaudiobufs*sizeof(lives_audio_buf_t *));
-  
-  for (i=0;i<prefs->num_rtaudiobufs;i++) {
-    mainw->pulsed->abufs[i]=(lives_audio_buf_t *)g_malloc(sizeof(lives_audio_buf_t));
-    
+  mainw->pulsed->abufs=(lives_audio_buf_t **)lives_malloc(prefs->num_rtaudiobufs*sizeof(lives_audio_buf_t *));
+
+  for (i=0; i<prefs->num_rtaudiobufs; i++) {
+    mainw->pulsed->abufs[i]=(lives_audio_buf_t *)lives_malloc(sizeof(lives_audio_buf_t));
+
     mainw->pulsed->abufs[i]->out_achans=achans;
     mainw->pulsed->abufs[i]->arate=arate;
     mainw->pulsed->abufs[i]->samp_space=XSAMPLES/prefs->num_rtaudiobufs;  // samp_space here is in stereo samples
-    mainw->pulsed->abufs[i]->buffer16=(short **)g_malloc(sizeof(short *));
-    mainw->pulsed->abufs[i]->buffer16[0]=(short *)g_malloc(XSAMPLES/prefs->num_rtaudiobufs*achans*sizeof(short));
+    mainw->pulsed->abufs[i]->buffer16=(short **)lives_malloc(sizeof(short *));
+    mainw->pulsed->abufs[i]->buffer16[0]=(short *)lives_malloc(XSAMPLES/prefs->num_rtaudiobufs*achans*sizeof(short));
   }
 #endif
 }
@@ -2129,16 +2097,16 @@
 
   if (mainw->jackd->abufs==NULL) return;
 
-  for (i=0;i<prefs->num_rtaudiobufs;i++) {
+  for (i=0; i<prefs->num_rtaudiobufs; i++) {
     if (mainw->jackd->abufs[i]!=NULL) {
-      for (chan=0;chan<mainw->jackd->abufs[i]->out_achans;chan++) {
-	g_free(mainw->jackd->abufs[i]->bufferf[chan]);
+      for (chan=0; chan<mainw->jackd->abufs[i]->out_achans; chan++) {
+        lives_free(mainw->jackd->abufs[i]->bufferf[chan]);
       }
-      g_free(mainw->jackd->abufs[i]->bufferf);
-      g_free(mainw->jackd->abufs[i]);
+      lives_free(mainw->jackd->abufs[i]->bufferf);
+      lives_free(mainw->jackd->abufs[i]);
     }
   }
-  g_free(mainw->jackd->abufs);
+  lives_free(mainw->jackd->abufs);
 #endif
 }
 
@@ -2152,14 +2120,14 @@
 
   if (mainw->pulsed->abufs==NULL) return;
 
-  for (i=0;i<prefs->num_rtaudiobufs;i++) {
+  for (i=0; i<prefs->num_rtaudiobufs; i++) {
     if (mainw->pulsed->abufs[i]!=NULL) {
-      g_free(mainw->pulsed->abufs[i]->buffer16[0]);
-      g_free(mainw->pulsed->abufs[i]->buffer16);
-      g_free(mainw->pulsed->abufs[i]);
+      lives_free(mainw->pulsed->abufs[i]->buffer16[0]);
+      lives_free(mainw->pulsed->abufs[i]->buffer16);
+      lives_free(mainw->pulsed->abufs[i]);
     }
   }
-  g_free(mainw->pulsed->abufs);
+  lives_free(mainw->pulsed->abufs);
 #endif
 }
 
@@ -2190,13 +2158,13 @@
     if (!mainw->is_rendering) {
 
       if (mainw->jackd->playing_file!=-1&&!jack_audio_seek_frame(mainw->jackd,frameno)) {
-	if (jack_try_reconnect()) jack_audio_seek_frame(mainw->jackd,frameno);
+        if (jack_try_reconnect()) jack_audio_seek_frame(mainw->jackd,frameno);
       }
 
       if (mainw->agen_key==0&&!mainw->agen_needs_reinit&&!has_audio_filters(AF_TYPE_NONA)) {
-	mainw->rec_aclip=mainw->current_file;
-	mainw->rec_avel=cfile->pb_fps/cfile->fps;
-	mainw->rec_aseek=(double)mainw->jackd->seek_pos/(double)(cfile->arate*cfile->achans*cfile->asampsize/8);
+        mainw->rec_aclip=mainw->current_file;
+        mainw->rec_avel=cfile->pb_fps/cfile->fps;
+        mainw->rec_aseek=(double)mainw->jackd->seek_pos/(double)(cfile->arate*cfile->achans*cfile->asampsize/8);
       }
     }
 
@@ -2208,12 +2176,12 @@
   if (prefs->audio_player==AUD_PLAYER_PULSE&&mainw->pulsed!=NULL) {
     if (!mainw->is_rendering) {
       if (mainw->pulsed->playing_file!=-1&&!pulse_audio_seek_frame(mainw->pulsed,frameno)) {
-	if (pulse_try_reconnect()) pulse_audio_seek_frame(mainw->pulsed,frameno);
+        if (pulse_try_reconnect()) pulse_audio_seek_frame(mainw->pulsed,frameno);
       }
       if (mainw->agen_key==0&&!mainw->agen_needs_reinit&&!has_audio_filters(AF_TYPE_NONA)) {
-	mainw->rec_aclip=mainw->current_file;
-	mainw->rec_avel=cfile->pb_fps/cfile->fps;
-	mainw->rec_aseek=(double)mainw->pulsed->seek_pos/(double)(cfile->arate*cfile->achans*cfile->asampsize/8);
+        mainw->rec_aclip=mainw->current_file;
+        mainw->rec_avel=cfile->pb_fps/cfile->fps;
+        mainw->rec_aseek=(double)mainw->pulsed->seek_pos/(double)(cfile->arate*cfile->achans*cfile->asampsize/8);
       }
     }
     return TRUE;
@@ -2243,7 +2211,7 @@
     // wait for request from client
     while (cbuffer->is_ready&&!cbuffer->die) {
       sched_yield();
-      g_usleep(prefs->sleep_time);
+      lives_usleep(prefs->sleep_time);
     }
 
     if (cbuffer->die) {
@@ -2252,7 +2220,7 @@
     }
 
     // read from file and process data
-    //g_printerr("got buffer request !\n");
+    //lives_printerr("got buffer request !\n");
 
     if (cbuffer->operation!=LIVES_READ_OPERATION) {
       cbuffer->is_ready=TRUE;
@@ -2265,21 +2233,21 @@
 
     if (cbuffer->out_asamps!=cbuffer->_casamps) {
       if (cbuffer->bufferf!=NULL) {
-	// free float channels
-	for (i=0;i<(cbuffer->_cout_interleaf?1:cbuffer->_cachans);i++) {
-	  free(cbuffer->bufferf[i]);
-	}
-	free (cbuffer->bufferf);
-	cbuffer->bufferf=NULL;
+        // free float channels
+        for (i=0; i<(cbuffer->_cout_interleaf?1:cbuffer->_cachans); i++) {
+          free(cbuffer->bufferf[i]);
+        }
+        free(cbuffer->bufferf);
+        cbuffer->bufferf=NULL;
       }
 
       if (cbuffer->buffer16!=NULL) {
-	// free 16bit channels
-	for (i=0;i<(cbuffer->_cout_interleaf?1:cbuffer->_cachans);i++) {
-	  free(cbuffer->buffer16[i]);
-	}
-	free (cbuffer->buffer16);
-	cbuffer->buffer16=NULL;
+        // free 16bit channels
+        for (i=0; i<(cbuffer->_cout_interleaf?1:cbuffer->_cachans); i++) {
+          free(cbuffer->buffer16[i]);
+        }
+        free(cbuffer->buffer16);
+        cbuffer->buffer16=NULL;
       }
 
       cbuffer->_cachans=0;
@@ -2298,45 +2266,45 @@
     case 16:
       // we need 16 bit buffer(s) only
       if (cbuffer->bufferf!=NULL) {
-	// free float channels
-	for (i=0;i<(cbuffer->_cout_interleaf?1:cbuffer->_cachans);i++) {
-	  free(cbuffer->bufferf[i]);
-	}
-	free (cbuffer->bufferf);
-	cbuffer->bufferf=NULL;
+        // free float channels
+        for (i=0; i<(cbuffer->_cout_interleaf?1:cbuffer->_cachans); i++) {
+          free(cbuffer->bufferf[i]);
+        }
+        free(cbuffer->bufferf);
+        cbuffer->bufferf=NULL;
       }
 
-      if ( (cbuffer->out_interleaf?1:cbuffer->out_achans) != (cbuffer->_cout_interleaf?1:cbuffer->_cachans) 
-	   || (cbuffer->samp_space/(cbuffer->out_interleaf?1:cbuffer->out_achans) != 
-	       (cbuffer->_csamp_space/(cbuffer->_cout_interleaf?1:cbuffer->_cachans) ) ) ) {
-	// channels or samp_space changed
-
-	if ( (cbuffer->out_interleaf?1:cbuffer->out_achans) > (cbuffer->_cout_interleaf?1:cbuffer->_cachans) ) {
-	  // ouput channels increased
-	  cbuffer->buffer16 = (short **) 
-	    g_realloc(cbuffer->buffer16,(cbuffer->out_interleaf?1:cbuffer->out_achans)*sizeof(short *));
-	  for (i=(cbuffer->_cout_interleaf?1:cbuffer->_cachans);i<(cbuffer->out_interleaf?1:cbuffer->out_achans);i++) {
-	    cbuffer->buffer16[i]=NULL;
-	  }
-	}
-
-	for (i=0;i<(cbuffer->out_interleaf?1:cbuffer->out_achans);i++) {
-	  // realloc existing channels and add new ones
-	  cbuffer->buffer16[i]=(short *)g_realloc(cbuffer->buffer16[i], cbuffer->samp_space*sizeof(short)*
-						  (cbuffer->out_interleaf?cbuffer->out_achans:1));
-	}
-
-	// free any excess channels
-
-	for (i=(cbuffer->out_interleaf?1:cbuffer->out_achans);i<(cbuffer->_cout_interleaf?1:cbuffer->_cachans);i++) {
-	  free(cbuffer->buffer16[i]);
-	}
-
-	if ( (cbuffer->out_interleaf?1:cbuffer->out_achans) < (cbuffer->_cout_interleaf?1:cbuffer->_cachans) ) {
-	  // output channels decreased
-	  cbuffer->buffer16 = (short **)
-	    g_realloc(cbuffer->buffer16,(cbuffer->out_interleaf?1:cbuffer->out_achans)*sizeof(short *));
-	}
+      if ((cbuffer->out_interleaf?1:cbuffer->out_achans) != (cbuffer->_cout_interleaf?1:cbuffer->_cachans)
+          || (cbuffer->samp_space/(cbuffer->out_interleaf?1:cbuffer->out_achans) !=
+              (cbuffer->_csamp_space/(cbuffer->_cout_interleaf?1:cbuffer->_cachans)))) {
+        // channels or samp_space changed
+
+        if ((cbuffer->out_interleaf?1:cbuffer->out_achans) > (cbuffer->_cout_interleaf?1:cbuffer->_cachans)) {
+          // ouput channels increased
+          cbuffer->buffer16 = (short **)
+                              lives_realloc(cbuffer->buffer16,(cbuffer->out_interleaf?1:cbuffer->out_achans)*sizeof(short *));
+          for (i=(cbuffer->_cout_interleaf?1:cbuffer->_cachans); i<(cbuffer->out_interleaf?1:cbuffer->out_achans); i++) {
+            cbuffer->buffer16[i]=NULL;
+          }
+        }
+
+        for (i=0; i<(cbuffer->out_interleaf?1:cbuffer->out_achans); i++) {
+          // realloc existing channels and add new ones
+          cbuffer->buffer16[i]=(short *)lives_realloc(cbuffer->buffer16[i], cbuffer->samp_space*sizeof(short)*
+                               (cbuffer->out_interleaf?cbuffer->out_achans:1));
+        }
+
+        // free any excess channels
+
+        for (i=(cbuffer->out_interleaf?1:cbuffer->out_achans); i<(cbuffer->_cout_interleaf?1:cbuffer->_cachans); i++) {
+          free(cbuffer->buffer16[i]);
+        }
+
+        if ((cbuffer->out_interleaf?1:cbuffer->out_achans) < (cbuffer->_cout_interleaf?1:cbuffer->_cachans)) {
+          // output channels decreased
+          cbuffer->buffer16 = (short **)
+                              lives_realloc(cbuffer->buffer16,(cbuffer->out_interleaf?1:cbuffer->out_achans)*sizeof(short *));
+        }
       }
 
       break;
@@ -2345,81 +2313,81 @@
 
       // 16 bit buffers follow in out_achans but in_interleaf...
 
-      if ( (cbuffer->in_interleaf?1:cbuffer->out_achans) != (cbuffer->_cin_interleaf?1:cbuffer->_cachans) 
-	   || (cbuffer->samp_space/(cbuffer->in_interleaf?1:cbuffer->out_achans) != 
-	       (cbuffer->_csamp_space/(cbuffer->_cin_interleaf?1:cbuffer->_cachans) ) ) ) {
-	// channels or samp_space changed
-
-	if ( (cbuffer->in_interleaf?1:cbuffer->out_achans) > (cbuffer->_cin_interleaf?1:cbuffer->_cachans) ) {
-	  // ouput channels increased
-	  cbuffer->buffer16 = (short **) 
-	    g_realloc(cbuffer->buffer16,(cbuffer->in_interleaf?1:cbuffer->out_achans)*sizeof(short *));
-	  for (i=(cbuffer->_cin_interleaf?1:cbuffer->_cachans);i<(cbuffer->in_interleaf?1:cbuffer->out_achans);i++) {
-	    cbuffer->buffer16[i]=NULL;
-	  }
-	}
-
-	for (i=0;i<(cbuffer->in_interleaf?1:cbuffer->out_achans);i++) {
-	  // realloc existing channels and add new ones
-	  cbuffer->buffer16[i]=(short *)g_realloc(cbuffer->buffer16[i], cbuffer->samp_space*sizeof(short)*
-						  (cbuffer->in_interleaf?cbuffer->out_achans:1));
-	}
-
-	// free any excess channels
-
-	for (i=(cbuffer->in_interleaf?1:cbuffer->out_achans);i<(cbuffer->_cin_interleaf?1:cbuffer->_cachans);i++) {
-	  free(cbuffer->buffer16[i]);
-	}
-
-
-	if ((cbuffer->in_interleaf?1:cbuffer->out_achans)<(cbuffer->_cin_interleaf?1:cbuffer->_cachans)) {
-	  // output channels decreased
-	  cbuffer->buffer16 = (short **)
-	    g_realloc(cbuffer->buffer16,(cbuffer->in_interleaf?1:cbuffer->out_achans)*sizeof(short *));
-	}
+      if ((cbuffer->in_interleaf?1:cbuffer->out_achans) != (cbuffer->_cin_interleaf?1:cbuffer->_cachans)
+          || (cbuffer->samp_space/(cbuffer->in_interleaf?1:cbuffer->out_achans) !=
+              (cbuffer->_csamp_space/(cbuffer->_cin_interleaf?1:cbuffer->_cachans)))) {
+        // channels or samp_space changed
+
+        if ((cbuffer->in_interleaf?1:cbuffer->out_achans) > (cbuffer->_cin_interleaf?1:cbuffer->_cachans)) {
+          // ouput channels increased
+          cbuffer->buffer16 = (short **)
+                              lives_realloc(cbuffer->buffer16,(cbuffer->in_interleaf?1:cbuffer->out_achans)*sizeof(short *));
+          for (i=(cbuffer->_cin_interleaf?1:cbuffer->_cachans); i<(cbuffer->in_interleaf?1:cbuffer->out_achans); i++) {
+            cbuffer->buffer16[i]=NULL;
+          }
+        }
+
+        for (i=0; i<(cbuffer->in_interleaf?1:cbuffer->out_achans); i++) {
+          // realloc existing channels and add new ones
+          cbuffer->buffer16[i]=(short *)lives_realloc(cbuffer->buffer16[i], cbuffer->samp_space*sizeof(short)*
+                               (cbuffer->in_interleaf?cbuffer->out_achans:1));
+        }
+
+        // free any excess channels
+
+        for (i=(cbuffer->in_interleaf?1:cbuffer->out_achans); i<(cbuffer->_cin_interleaf?1:cbuffer->_cachans); i++) {
+          free(cbuffer->buffer16[i]);
+        }
+
+
+        if ((cbuffer->in_interleaf?1:cbuffer->out_achans)<(cbuffer->_cin_interleaf?1:cbuffer->_cachans)) {
+          // output channels decreased
+          cbuffer->buffer16 = (short **)
+                              lives_realloc(cbuffer->buffer16,(cbuffer->in_interleaf?1:cbuffer->out_achans)*sizeof(short *));
+        }
       }
 
 
 
-      if ( (cbuffer->out_interleaf?1:cbuffer->out_achans) != (cbuffer->_cout_interleaf?1:cbuffer->_cachans) 
-	   || (cbuffer->samp_space/(cbuffer->out_interleaf?1:cbuffer->out_achans) != 
-	       (cbuffer->_csamp_space/(cbuffer->_cout_interleaf?1:cbuffer->_cachans) ) ) ) {
-	// channels or samp_space changed
+      if ((cbuffer->out_interleaf?1:cbuffer->out_achans) != (cbuffer->_cout_interleaf?1:cbuffer->_cachans)
+          || (cbuffer->samp_space/(cbuffer->out_interleaf?1:cbuffer->out_achans) !=
+              (cbuffer->_csamp_space/(cbuffer->_cout_interleaf?1:cbuffer->_cachans)))) {
+        // channels or samp_space changed
 
-	if ( (cbuffer->out_interleaf?1:cbuffer->out_achans) > (cbuffer->_cout_interleaf?1:cbuffer->_cachans) ) {
-	  // ouput channels increased
-	  cbuffer->bufferf = (float **)
-	    g_realloc(cbuffer->bufferf,(cbuffer->out_interleaf?1:cbuffer->out_achans)*sizeof(float *));
-	  for (i=(cbuffer->_cout_interleaf?1:cbuffer->_cachans);i<(cbuffer->out_interleaf?1:cbuffer->out_achans);i++) {
-	    cbuffer->bufferf[i]=NULL;
-	  }
-	}
+        if ((cbuffer->out_interleaf?1:cbuffer->out_achans) > (cbuffer->_cout_interleaf?1:cbuffer->_cachans)) {
+          // ouput channels increased
+          cbuffer->bufferf = (float **)
+                             lives_realloc(cbuffer->bufferf,(cbuffer->out_interleaf?1:cbuffer->out_achans)*sizeof(float *));
+          for (i=(cbuffer->_cout_interleaf?1:cbuffer->_cachans); i<(cbuffer->out_interleaf?1:cbuffer->out_achans); i++) {
+            cbuffer->bufferf[i]=NULL;
+          }
+        }
 
-	for (i=0;i<(cbuffer->out_interleaf?1:cbuffer->out_achans);i++) {
-	  // realloc existing channels and add new ones
-	  cbuffer->bufferf[i]=(float *)g_realloc(cbuffer->bufferf[i], cbuffer->samp_space*sizeof(float)*
-						 (cbuffer->out_interleaf?cbuffer->out_achans:1));
-	}
+        for (i=0; i<(cbuffer->out_interleaf?1:cbuffer->out_achans); i++) {
+          // realloc existing channels and add new ones
+          cbuffer->bufferf[i]=(float *)lives_realloc(cbuffer->bufferf[i], cbuffer->samp_space*sizeof(float)*
+                              (cbuffer->out_interleaf?cbuffer->out_achans:1));
+        }
 
-	// free any excess channels
+        // free any excess channels
 
-	for (i=(cbuffer->out_interleaf?1:cbuffer->out_achans);i<(cbuffer->_cout_interleaf?1:cbuffer->_cachans);i++) {
-	  free(cbuffer->bufferf[i]);
-	}
+        for (i=(cbuffer->out_interleaf?1:cbuffer->out_achans); i<(cbuffer->_cout_interleaf?1:cbuffer->_cachans); i++) {
+          free(cbuffer->bufferf[i]);
+        }
 
 
-	if ( (cbuffer->out_interleaf?1:cbuffer->out_achans) > (cbuffer->_cout_interleaf?1:cbuffer->_cachans) ) {
-	  // output channels decreased
-	  cbuffer->bufferf = (float **)
-	    g_realloc(cbuffer->bufferf,(cbuffer->out_interleaf?1:cbuffer->out_achans)*sizeof(float *));
-	}
+        if ((cbuffer->out_interleaf?1:cbuffer->out_achans) > (cbuffer->_cout_interleaf?1:cbuffer->_cachans)) {
+          // output channels decreased
+          cbuffer->bufferf = (float **)
+                             lives_realloc(cbuffer->bufferf,(cbuffer->out_interleaf?1:cbuffer->out_achans)*sizeof(float *));
+        }
       }
 
       break;
     default:
       break;
     }
-	  
+
     // update _cinterleaf, etc.
     cbuffer->_cin_interleaf=cbuffer->in_interleaf;
     cbuffer->_cout_interleaf=cbuffer->out_interleaf;
@@ -2434,24 +2402,24 @@
 
       if (cbuffer->_fd!=-1) close(cbuffer->_fd);
 
-      if (afile->opening) 
-	filename=g_strdup_printf("%s/%s/audiodump.pcm",prefs->tmpdir,mainw->files[cbuffer->fileno]->handle);
-      else filename=g_strdup_printf("%s/%s/audio",prefs->tmpdir,mainw->files[cbuffer->fileno]->handle);
+      if (afile->opening)
+        filename=lives_strdup_printf("%s/%s/audiodump.pcm",prefs->tmpdir,mainw->files[cbuffer->fileno]->handle);
+      else filename=lives_strdup_printf("%s/%s/audio",prefs->tmpdir,mainw->files[cbuffer->fileno]->handle);
 
       cbuffer->_fd=open(filename,O_RDONLY);
       if (cbuffer->_fd==-1) {
-	g_printerr("audio cache thread: error opening %s\n",filename);
-	cbuffer->in_achans=0;
-	cbuffer->fileno=-1;  ///< let client handle this
-	cbuffer->is_ready=TRUE;
-	continue;
+        lives_printerr("audio cache thread: error opening %s\n",filename);
+        cbuffer->in_achans=0;
+        cbuffer->fileno=-1;  ///< let client handle this
+        cbuffer->is_ready=TRUE;
+        continue;
       }
 
 #ifdef IS_MINGW
       setmode(cbuffer->_fd, O_BINARY);
 #endif
 
-      g_free(filename);
+      lives_free(filename);
     }
 
     if (cbuffer->fileno!=cbuffer->_cfileno||cbuffer->seek!=cbuffer->_cseek) {
@@ -2463,13 +2431,13 @@
     // prepare file read buffer
 
     if (cbuffer->bytesize!=cbuffer->_cbytesize) {
-      cbuffer->_filebuffer=(uint8_t *)g_realloc(cbuffer->_filebuffer,cbuffer->bytesize);
+      cbuffer->_filebuffer=(uint8_t *)lives_realloc(cbuffer->_filebuffer,cbuffer->bytesize);
 
       if (cbuffer->_filebuffer==NULL) {
-	cbuffer->_cbytesize=cbuffer->bytesize=0;
-	cbuffer->in_achans=0;
-	cbuffer->is_ready=TRUE;
-	continue;
+        cbuffer->_cbytesize=cbuffer->bytesize=0;
+        cbuffer->in_achans=0;
+        cbuffer->is_ready=TRUE;
+        continue;
       }
 
     }
@@ -2485,7 +2453,7 @@
       cbuffer->is_ready=TRUE;
       continue;
     }
-    
+
     if (cbuffer->_cbytesize<cbuffer->bytesize) {
       cbuffer->eof=TRUE;
       cbuffer->_csamp_space=(int64_t)((double)cbuffer->samp_space/(double)cbuffer->bytesize*(double)cbuffer->_cbytesize);
@@ -2499,21 +2467,21 @@
 
 
     // convert from 8 bit to 16 bit and mono to stereo if necessary
-    // resample as we go 
-    if(cbuffer->in_asamps==8) {
+    // resample as we go
+    if (cbuffer->in_asamps==8) {
 
       // TODO - error on non-interleaved
-      sample_move_d8_d16 (cbuffer->buffer16[0],(uint8_t *)cbuffer->_filebuffer, cbuffer->samp_space, cbuffer->bytesize, 
-			  cbuffer->shrink_factor, cbuffer->out_achans, cbuffer->in_achans, 0);
+      sample_move_d8_d16(cbuffer->buffer16[0],(uint8_t *)cbuffer->_filebuffer, cbuffer->samp_space, cbuffer->bytesize,
+                         cbuffer->shrink_factor, cbuffer->out_achans, cbuffer->in_achans, 0);
     }
-    // 16 bit input samples 
-    // resample as we go 
+    // 16 bit input samples
+    // resample as we go
     else {
-      sample_move_d16_d16(cbuffer->buffer16[0], (short*)cbuffer->_filebuffer, cbuffer->samp_space, cbuffer->bytesize, 
-			  cbuffer->shrink_factor, cbuffer->out_achans, cbuffer->in_achans, 
-			  cbuffer->swap_endian?SWAP_X_TO_L:0, 0);
+      sample_move_d16_d16(cbuffer->buffer16[0], (short *)cbuffer->_filebuffer, cbuffer->samp_space, cbuffer->bytesize,
+                          cbuffer->shrink_factor, cbuffer->out_achans, cbuffer->in_achans,
+                          cbuffer->swap_endian?SWAP_X_TO_L:0, 0);
     }
-	
+
 
     // if our out_asamps is 16, we are done
 
@@ -2525,9 +2493,9 @@
 
 
 
-lives_audio_buf_t *audio_cache_init (void) {
+lives_audio_buf_t *audio_cache_init(void) {
 
-  cache_buffer=(lives_audio_buf_t *)g_malloc0(sizeof(lives_audio_buf_t));
+  cache_buffer=(lives_audio_buf_t *)lives_malloc0(sizeof(lives_audio_buf_t));
   cache_buffer->is_ready=FALSE;
   cache_buffer->in_achans=0;
 
@@ -2561,7 +2529,7 @@
 
 
 
-void audio_cache_end (void) {
+void audio_cache_end(void) {
   // TODO - check why we are using free() here
 
   int i;
@@ -2571,8 +2539,8 @@
   pthread_join(athread,NULL);
 
   // free all buffers
-  
-  for (i=0;i<(cache_buffer->_cin_interleaf?1:cache_buffer->_cachans);i++) {
+
+  for (i=0; i<(cache_buffer->_cin_interleaf?1:cache_buffer->_cachans); i++) {
     if (cache_buffer->buffer8!=NULL&&cache_buffer->buffer8[i]!=NULL) free(cache_buffer->buffer8[i]);
     if (cache_buffer->buffer16!=NULL&&cache_buffer->buffer16[i]!=NULL) free(cache_buffer->buffer16[i]);
     if (cache_buffer->buffer24!=NULL&&cache_buffer->buffer24[i]!=NULL) free(cache_buffer->buffer24[i]);
@@ -2625,7 +2593,7 @@
   if (mainw->agen_needs_reinit) return FALSE; // wait for other thread to reinit us
   tc=(double)mainw->agen_samps_count/(double)arate*U_SEC; // we take our timing from the number of samples read
 
- getaud1:
+getaud1:
 
   aint=WEED_FALSE;
   xnchans=nchans;
@@ -2634,33 +2602,33 @@
 
   if (channel!=NULL) {
     ctmpl=weed_get_plantptr_value(channel,"template",&error);
-    
+
     if (weed_plant_has_leaf(ctmpl,"audio_rate")&&weed_get_int_value(ctmpl,"audio_rate",&error)!=arate) {
       // TODO - resample if audio rate is wrong
       return FALSE;
     }
-    
+
     if (weed_plant_has_leaf(ctmpl,"audio_interleaf")) aint=weed_get_boolean_value(ctmpl,"audio_interleaf",&error);
     if (weed_plant_has_leaf(ctmpl,"audio_channels")) xnchans=weed_get_int_value(ctmpl,"audio_channels",&error);
-    
+
     // stop video thread from possibly interpolating/deiniting
     if (pthread_mutex_trylock(&mainw->interp_mutex)) return FALSE;
-    
-    
+
+
     // make sure values match, else we need to reinit the plugin
     if (xnchans!=weed_get_int_value(channel,"audio_channels",&error)||
-	arate!=weed_get_int_value(channel,"audio_rate",&error)||
-	weed_get_boolean_value(channel,"audio_interleaf",&error)!=aint) {
+        arate!=weed_get_int_value(channel,"audio_rate",&error)||
+        weed_get_boolean_value(channel,"audio_interleaf",&error)!=aint) {
       // reinit plugin
       mainw->agen_needs_reinit=TRUE;
     }
-    
+
     weed_set_int_value(channel,"audio_channels",xnchans);
     weed_set_int_value(channel,"audio_rate",arate);
     weed_set_boolean_value(channel,"audio_interleaf",aint);
     weed_set_int_value(channel,"audio_data_length",nsamps);
     weed_set_voidptr_value(channel,"audio_data",fbuffer);
-    
+
     weed_set_double_value(inst,"fps",cfile->pb_fps);
 
     if (mainw->agen_needs_reinit) {
@@ -2679,12 +2647,12 @@
     if (!pthread_mutex_trylock(&mainw->data_mutex[mainw->agen_key-1])) {
       mainw->agen_needs_reinit=pconx_chain_data(mainw->agen_key-1,rte_key_getmode(mainw->agen_key));
       filter_mutex_unlock(mainw->agen_key-1);
-      
+
       if (mainw->agen_needs_reinit) {
-	// allow main thread to complete the reinit so we do not delay; just return silence
-	memset(fbuffer,0,nsamps*nchans*sizeof(float));
-	pthread_mutex_unlock(&mainw->interp_mutex);
-	return FALSE;
+        // allow main thread to complete the reinit so we do not delay; just return silence
+        memset(fbuffer,0,nsamps*nchans*sizeof(float));
+        pthread_mutex_unlock(&mainw->interp_mutex);
+        return FALSE;
       }
     }
   }
@@ -2706,7 +2674,7 @@
 
   if (xnchans==1&&nchans==2) {
     // if we got mono but we wanted stereo, copy to right channel
-    weed_memcpy(&fbuffer[nsamps],fbuffer,nsamps*sizeof(float));
+    lives_memcpy(&fbuffer[nsamps],fbuffer,nsamps*sizeof(float));
   }
 
   if (weed_plant_has_leaf(inst,"host_next_instance")) {
@@ -2746,22 +2714,22 @@
 weed_timecode_t aud_tc;
 
 boolean apply_rte_audio_init(void) {
-  gchar *com;
+  char *com;
 
   if (!prefs->conserve_space) {
     mainw->error=FALSE;
-    com=g_strdup_printf("%s backup_audio %s",prefs->backend_sync,cfile->handle);
+    com=lives_strdup_printf("%s backup_audio %s",prefs->backend_sync,cfile->handle);
     lives_system(com,FALSE);
-    g_free(com);
-    
+    lives_free(com);
+
     if (mainw->error) {
       d_print_failed();
       return FALSE;
     }
   }
 
-audio_pos=(double)((cfile->start-1)*cfile->arate*cfile->achans*cfile->asampsize/8)/cfile->fps;
-  audio_file=g_build_filename(prefs->tmpdir,cfile->handle,"audio",NULL);
+  audio_pos=(double)((cfile->start-1)*cfile->arate*cfile->achans*cfile->asampsize/8)/cfile->fps;
+  audio_file=lives_build_filename(prefs->tmpdir,cfile->handle,"audio",NULL);
 
   audio_fd=open(audio_file,O_RDWR|O_CREAT,DEF_FILE_PERMS);
 
@@ -2773,9 +2741,9 @@
 
   if (audio_pos>cfile->afilesize) {
     off64_t audio_end_pos=(double)((cfile->start-1)*cfile->arate*cfile->achans*cfile->asampsize/8)/cfile->fps;
-    pad_with_silence(audio_fd, audio_pos, audio_end_pos, cfile->asampsize, cfile->signed_endian&AFORM_UNSIGNED, cfile->signed_endian&AFORM_BIG_ENDIAN);
-  }
-  else lseek64(audio_fd,audio_pos,SEEK_SET);
+    pad_with_silence(audio_fd, audio_pos, audio_end_pos, cfile->asampsize, cfile->signed_endian&AFORM_UNSIGNED,
+                     cfile->signed_endian&AFORM_BIG_ENDIAN);
+  } else lseek64(audio_fd,audio_pos,SEEK_SET);
 
   aud_tc=0;
 
@@ -2786,7 +2754,7 @@
 void apply_rte_audio_end(boolean del) {
   close(audio_fd);
   if (del) unlink(audio_file);
-  g_free(audio_file);
+  lives_free(audio_file);
 }
 
 
@@ -2817,73 +2785,71 @@
 
   onframes=nframes;
 
-  in_buff=(uint8_t *)g_try_malloc(tbytes);
+  in_buff=(uint8_t *)lives_try_malloc(tbytes);
   if (in_buff==NULL) return FALSE;
 
   if (cfile->asampsize==8) {
-    shortbuf=(short *)g_try_malloc(tbytes);
+    shortbuf=(short *)lives_try_malloc(tbytes);
     if (shortbuf==NULL) {
-      g_free(in_buff);
+      lives_free(in_buff);
       return FALSE;
     }
   }
 
-  fltbuf=(float **)g_malloc(cfile->achans*sizeof(float *));
+  fltbuf=(float **)lives_malloc(cfile->achans*sizeof(float *));
 
 
   if (mainw->agen_key==0) {
     mainw->read_failed=FALSE;
 
     tbytes=lives_read(audio_fd,in_buff,tbytes,FALSE);
-      
+
     if (mainw->read_failed) {
       do_read_failed_error_s(audio_file,NULL);
-      if (mainw->read_failed_file!=NULL) g_free(mainw->read_failed_file);
+      if (mainw->read_failed_file!=NULL) lives_free(mainw->read_failed_file);
       mainw->read_failed_file=NULL;
-      g_free(fltbuf);
-      g_free(in_buff);
-      if (shortbuf!=NULL) g_free(shortbuf);
+      lives_free(fltbuf);
+      lives_free(in_buff);
+      if (shortbuf!=NULL) lives_free(shortbuf);
       return FALSE;
     }
 
 
     if (cfile->asampsize==8) {
-      sample_move_d8_d16 (shortbuf, in_buff, nframes, tbytes, 
-			  1.0, cfile->achans, cfile->achans, 0);
-    }
-    else shortbuf=(short *)in_buff;
+      sample_move_d8_d16(shortbuf, in_buff, nframes, tbytes,
+                         1.0, cfile->achans, cfile->achans, 0);
+    } else shortbuf=(short *)in_buff;
 
     nframes=tbytes/cfile->achans/(cfile->asampsize/8);
 
     // convert to float
 
-    for (i=0;i<cfile->achans;i++) {
+    for (i=0; i<cfile->achans; i++) {
       // convert s16 to non-interleaved float
-      fltbuf[i]=(float *)g_try_malloc(nframes*sizeof(float));
+      fltbuf[i]=(float *)lives_try_malloc(nframes*sizeof(float));
       if (fltbuf[i]==NULL) {
-	for (--i;i>=0;i--) {
-	  g_free(fltbuf[i]);
-	}
-	g_free(fltbuf);
-	if (shortbuf!=(short *)in_buff) g_free(shortbuf);
-	g_free(in_buff);
-	return FALSE;
+        for (--i; i>=0; i--) {
+          lives_free(fltbuf[i]);
+        }
+        lives_free(fltbuf);
+        if (shortbuf!=(short *)in_buff) lives_free(shortbuf);
+        lives_free(in_buff);
+        return FALSE;
       }
       memset(fltbuf[i],0,nframes*sizeof(float));
       if (nframes>0) sample_move_d16_float(fltbuf[i],shortbuf+i,nframes,cfile->achans,(cfile->signed_endian&AFORM_UNSIGNED),rev_endian,1.0);
     }
-    
-  }
-  else {
-    fltbufni=(float *)g_try_malloc(nframes*cfile->achans*sizeof(float));
+
+  } else {
+    fltbufni=(float *)lives_try_malloc(nframes*cfile->achans*sizeof(float));
     if (fltbufni==NULL) {
-      g_free(fltbuf);
-      if (shortbuf!=(short *)in_buff) g_free(shortbuf);
-      g_free(in_buff);
+      lives_free(fltbuf);
+      if (shortbuf!=(short *)in_buff) lives_free(shortbuf);
+      lives_free(in_buff);
       return FALSE;
     }
     get_audio_from_plugin(fltbufni, cfile->achans, cfile->arate, nframes);
-    for (i=0;i<cfile->achans;i++) {
+    for (i=0; i<cfile->achans; i++) {
       fltbuf[i]=fltbufni+i*nframes;
     }
   }
@@ -2893,7 +2859,7 @@
 
   aud_tc+=(double)onframes/(double)cfile->arate*U_SEC;
   // apply any audio effects with in_channels
-    
+
   weed_apply_audio_effects_rt(fltbuf,cfile->achans,onframes,cfile->arate,aud_tc,FALSE);
 
   if (!(has_audio_filters(AF_TYPE_NONA)||mainw->agen_key!=0)) {
@@ -2901,34 +2867,32 @@
     audio_pos+=tbytes;
 
     if (fltbufni==NULL) {
-      for (i=0;i<cfile->achans;i++) {
-	g_free(fltbuf[i]);
+      for (i=0; i<cfile->achans; i++) {
+        lives_free(fltbuf[i]);
       }
-    }
-    else g_free(fltbufni);
-    
-    g_free(fltbuf);
-  
-    if (shortbuf!=(short *)in_buff) g_free(shortbuf);
-    g_free(in_buff);
+    } else lives_free(fltbufni);
+
+    lives_free(fltbuf);
+
+    if (shortbuf!=(short *)in_buff) lives_free(shortbuf);
+    lives_free(in_buff);
 
     return TRUE;
   }
-    
+
   // convert float audio back to int
   sample_move_float_int(in_buff,fltbuf,onframes,1.0,cfile->achans,cfile->asampsize,(cfile->signed_endian&AFORM_UNSIGNED),
-			!(cfile->signed_endian&AFORM_BIG_ENDIAN),FALSE,1.0);
-  
+                        !(cfile->signed_endian&AFORM_BIG_ENDIAN),FALSE,1.0);
+
   if (fltbufni==NULL) {
-    for (i=0;i<cfile->achans;i++) {
-      g_free(fltbuf[i]);
+    for (i=0; i<cfile->achans; i++) {
+      lives_free(fltbuf[i]);
     }
-  }
-  else g_free(fltbufni);
-  
-  g_free(fltbuf);
-  
-  
+  } else lives_free(fltbufni);
+
+  lives_free(fltbuf);
+
+
   // save to file
   mainw->write_failed=FALSE;
   lseek64(audio_fd,audio_pos,SEEK_SET);
@@ -2936,8 +2900,8 @@
   lives_write(audio_fd,in_buff,tbytes,FALSE);
   audio_pos+=tbytes;
 
-  if (shortbuf!=(short *)in_buff) g_free(shortbuf);
-  g_free(in_buff);
+  if (shortbuf!=(short *)in_buff) lives_free(shortbuf);
+  lives_free(in_buff);
 
   if (mainw->write_failed) {
     do_write_failed_error_s(audio_file,NULL);
@@ -3004,11 +2968,11 @@
       int swap=0;
       if (!abuf->s8_signed) swap=SWAP_U_TO_S;
       abuf->s16_signed=TRUE;
-      abuf->buffer16=(int16_t **)g_malloc(abuf->out_achans*sizeof(int16_t *));
-      for (i=0;i<abuf->out_achans;i++) {
-	abuf->bufferf[i]=(float *)g_malloc(abuf->samples_filled*2);
-	sample_move_d8_d16 (abuf->buffer16[i],abuf->buffer8[i], abuf->samples_filled, abuf->samples_filled*2, 
-			    1.0, abuf->out_achans, abuf->out_achans, swap);
+      abuf->buffer16=(int16_t **)lives_malloc(abuf->out_achans*sizeof(int16_t *));
+      for (i=0; i<abuf->out_achans; i++) {
+        abuf->bufferf[i]=(float *)lives_malloc(abuf->samples_filled*2);
+        sample_move_d8_d16(abuf->buffer16[i],abuf->buffer8[i], abuf->samples_filled, abuf->samples_filled*2,
+                           1.0, abuf->out_achans, abuf->out_achans, swap);
 
       }
     }
@@ -3016,17 +2980,16 @@
 
     // try convert S16 -> float
     if (abuf->buffer16!=NULL) {
-      abuf->bufferf=(float **)g_malloc(abuf->out_achans*sizeof(float *));
-      for (i=0;i<abuf->out_achans;i++) {
-	abuf->bufferf[i]=(float *)g_malloc(abuf->samples_filled*sizeof(float));
-	if (!abuf->in_interleaf) {
-	  sample_move_d16_float(abuf->bufferf[i],abuf->buffer16[i],abuf->samples_filled,1,
-				(abuf->s16_signed?AFORM_SIGNED:AFORM_UNSIGNED),abuf->swap_endian,1.0);
-	}
-	else {
-	  sample_move_d16_float(abuf->bufferf[i],&abuf->buffer16[0][i],abuf->samples_filled,abuf->out_achans,
-				(abuf->s16_signed?AFORM_SIGNED:AFORM_UNSIGNED),abuf->swap_endian,1.0);
-	}
+      abuf->bufferf=(float **)lives_malloc(abuf->out_achans*sizeof(float *));
+      for (i=0; i<abuf->out_achans; i++) {
+        abuf->bufferf[i]=(float *)lives_malloc(abuf->samples_filled*sizeof(float));
+        if (!abuf->in_interleaf) {
+          sample_move_d16_float(abuf->bufferf[i],abuf->buffer16[i],abuf->samples_filled,1,
+                                (abuf->s16_signed?AFORM_SIGNED:AFORM_UNSIGNED),abuf->swap_endian,1.0);
+        } else {
+          sample_move_d16_float(abuf->bufferf[i],&abuf->buffer16[0][i],abuf->samples_filled,abuf->out_achans,
+                                (abuf->s16_signed?AFORM_SIGNED:AFORM_UNSIGNED),abuf->swap_endian,1.0);
+        }
       }
       abuf->out_interleaf=FALSE;
     }
@@ -3047,7 +3010,7 @@
   scale=(float)trate/(float)abuf->arate;
 
   // malloc audio_data
-  dst=g_malloc(alen*tchans*sizeof(float));
+  dst=lives_malloc(alen*tchans*sizeof(float));
 
   // set channel values
   weed_set_voidptr_value(achan,"audio_data",dst);
@@ -3057,23 +3020,21 @@
   weed_set_int_value(achan,"audio_rate",trate);
 
   // copy data from abuf->bufferf[] to "audio_data"
-  for (i=0;i<tchans;i++) {
+  for (i=0; i<tchans; i++) {
     src=abuf->bufferf[i%abuf->out_achans]+offs;
     if (!tinter) {
       if ((int)abuf->arate==trate) {
-	lives_memcpy(dst,src,alen*sizeof(float));
-      }
-      else {
-	// needs resample
-	sample_move_float_float((float *)dst,(float *)src,alen,scale,1);
+        lives_memcpy(dst,src,alen*sizeof(float));
+      } else {
+        // needs resample
+        sample_move_float_float((float *)dst,(float *)src,alen,scale,1);
       }
       dst+=alen*sizeof(float);
-    }
-    else {
+    } else {
       // interleaved
-      for (i=0;i<tchans;i++) {
-	sample_move_float_float((float *)dst,(float *)src,alen,scale,tchans);
-	dst+=sizeof(float);
+      for (i=0; i<tchans; i++) {
+        sample_move_float_float((float *)dst,(float *)src,alen,scale,tchans);
+        dst+=sizeof(float);
       }
     }
   }
@@ -3089,15 +3050,15 @@
 lives_pgid_t astream_pgid=0;
 
 boolean start_audio_stream(void) {
-  const gchar *playername="audiostreamer.pl";
-  gchar *astream_name=NULL;
-  gchar *astream_name_out=NULL;
+  const char *playername="audiostreamer.pl";
+  char *astream_name=NULL;
+  char *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",capable->mainpid);
-  gchar *astname_out=g_strdup_printf("livesaudio-%d.stream",capable->mainpid);
-  gchar *astreamer,*com;
+  char *astname=lives_strdup_printf("livesaudio-%d.pcm",capable->mainpid);
+  char *astname_out=lives_strdup_printf("livesaudio-%d.stream",capable->mainpid);
+  char *astreamer,*com;
 
   int arate=0;
   int afd;
@@ -3105,14 +3066,14 @@
 
   boolean timeout=FALSE;
 
-  astream_name=g_build_filename(prefs->tmpdir,astname,NULL);
+  astream_name=lives_build_filename(prefs->tmpdir,astname,NULL);
 
   mkfifo(astream_name,S_IRUSR|S_IWUSR);
 
-  astream_name_out=g_build_filename(prefs->tmpdir,astname_out,NULL);
+  astream_name_out=lives_build_filename(prefs->tmpdir,astname_out,NULL);
 
-  g_free(astname);
-  g_free(astname_out);
+  lives_free(astname);
+  lives_free(astname_out);
 
   if (prefs->audio_player==AUD_PLAYER_PULSE) {
 #ifdef HAVE_PULSE_AUDIO
@@ -3125,13 +3086,13 @@
 #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);
-  g_free(astreamer);
+  astreamer=lives_build_filename(prefs->lib_dir,PLUGIN_EXEC_DIR,PLUGIN_AUDIO_STREAM,playername,NULL);
+  com=lives_strdup_printf("%s play %d \"%s\" \"%s\" %d",astreamer,mainw->vpp->audio_codec,astream_name,astream_name_out,arate);
+  lives_free(astreamer);
 
   astream_pgid=lives_fork(com);
 
@@ -3141,7 +3102,7 @@
     // wait for other thread to create stream (or timeout)
     afd=open(astream_name,O_WRONLY|O_SYNC);
     if (afd!=-1) break;
-    g_usleep(prefs->sleep_time);
+    lives_usleep(prefs->sleep_time);
   } while (!(timeout=lives_alarm_get(alarm_handle)));
 
   lives_alarm_clear(alarm_handle);
@@ -3166,8 +3127,8 @@
   setmode(afd, O_BINARY);
 #endif
 
-  g_free(astream_name);
-  g_free(astream_name_out);
+  lives_free(astream_name);
+  lives_free(astream_name_out);
 
   return TRUE;
 }
@@ -3177,18 +3138,18 @@
 void stop_audio_stream(void) {
   if (astream_pgid>0) {
     // if we were streaming audio, kill it
-    const gchar *playername="audiostreamer.pl";
-    gchar *astname=g_strdup_printf("livesaudio-%d.pcm",capable->mainpid);
-    gchar *astname_out=g_strdup_printf("livesaudio-%d.stream",capable->mainpid);
-    gchar *astreamer=g_build_filename(prefs->lib_dir,PLUGIN_EXEC_DIR,PLUGIN_AUDIO_STREAM,playername,NULL);
+    const char *playername="audiostreamer.pl";
+    char *astname=lives_strdup_printf("livesaudio-%d.pcm",capable->mainpid);
+    char *astname_out=lives_strdup_printf("livesaudio-%d.stream",capable->mainpid);
+    char *astreamer=lives_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);
+    char *astream_name=lives_build_filename(prefs->tmpdir,astname,NULL);
+    char *astream_name_out=lives_build_filename(prefs->tmpdir,astname_out,NULL);
 
-    gchar *com;
+    char *com;
 
-    g_free(astname);
-    g_free(astname_out);
+    lives_free(astname);
+    lives_free(astname_out);
 
     if (prefs->audio_player==AUD_PLAYER_PULSE) {
 #ifdef HAVE_PULSE_AUDIO
@@ -3205,14 +3166,14 @@
 
     lives_killpg(astream_pgid,LIVES_SIGKILL);
     unlink(astream_name);
-    g_free(astream_name);
+    lives_free(astream_name);
 
     // astreamer should remove cooked stream
-    com=g_strdup_printf("\"%s\" cleanup %d \"%s\"",astreamer,mainw->vpp->audio_codec,astream_name_out);
+    com=lives_strdup_printf("\"%s\" cleanup %d \"%s\"",astreamer,mainw->vpp->audio_codec,astream_name_out);
     lives_system(com,FALSE);
-    g_free(astreamer);
-    g_free(com);
-    g_free(astream_name_out);
+    lives_free(astreamer);
+    lives_free(com);
+    lives_free(astream_name_out);
 
   }
 
@@ -3221,16 +3182,16 @@
 
 void clear_audio_stream(void) {
   // remove raw and cooked streams
-  gchar *astname=g_strdup_printf("livesaudio-%d.pcm",capable->mainpid);
-  gchar *astream_name=g_build_filename(prefs->tmpdir,astname,NULL);
-  gchar *astname_out=g_strdup_printf("livesaudio-%d.stream",capable->mainpid);
-  gchar *astream_name_out=g_build_filename(prefs->tmpdir,astname_out,NULL);
+  char *astname=lives_strdup_printf("livesaudio-%d.pcm",capable->mainpid);
+  char *astream_name=lives_build_filename(prefs->tmpdir,astname,NULL);
+  char *astname_out=lives_strdup_printf("livesaudio-%d.stream",capable->mainpid);
+  char *astream_name_out=lives_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_free(astname);
+  lives_free(astream_name);
+  lives_free(astname_out);
+  lives_free(astream_name_out);
 }

LiVES-2.2.8.tar.bz2/src/audio.h -> LiVES-2.4.1.tar.bz2/src/audio.h Changed

@@ -58,7 +58,7 @@
 /* message passing structure */
 typedef struct _aserver_message_t {
   volatile int command;
-  volatile gchar *data;
+  volatile char *data;
   volatile struct _aserver_message_t *next;
 } aserver_message_t;
 
@@ -81,9 +81,9 @@
   int fileno; // [readonly by server]
 
   // readonly by server:
-  
+
   // use one or other
-  off_t seek; 
+  off_t seek;
   weed_timecode_t start_tc;
 
   double arate;
@@ -103,7 +103,7 @@
 
   size_t samp_space; ///< buffer space in samples (* by sizeof(type) to get bytesize) [if interleaf, also * by chans]
 
-  
+
   // in or out buffers
   uint8_t **buffer8; ///< sample data in 8 bit format (or NULL)
   short   **buffer16; ///< sample data in 16 bit format (or NULL)
@@ -115,8 +115,8 @@
   boolean s16_signed;
   boolean s24_signed;
   boolean s32_signed;
-  
-  // ring buffer 
+
+  // ring buffer
   size_t samples_filled; ///< number of samples filled (readonly client)
   size_t start_sample; ///< used for reading (readonly server)
 
@@ -124,7 +124,7 @@
   // private fields (used by server)
   uint8_t *_filebuffer; ///< raw data to/from file - can be cast to int16_t
   ssize_t _cbytesize; ///< current _filebuffer bytesize; if this changes we need to realloc _filebuffer
-  size_t _csamp_space; ///< current sample buffer size in single channel samples  
+  size_t _csamp_space; ///< current sample buffer size in single channel samples
   int _fd; ///< file descriptor
   int _cfileno; ///< current fileno
   int _cseek;  ///< current seek pos
@@ -148,31 +148,33 @@
 
 
 
-void sample_silence_dS (float *dst, uint64_t nsamples);
+void sample_silence_dS(float *dst, uint64_t nsamples);
 
-void sample_move_d8_d16(short *dst, guchar *src,
-			uint64_t nsamples, size_t tbytes, float scale, int nDstChannels, int nSrcChannels, int swap_sign);
+void sample_move_d8_d16(short *dst, uint8_t *src,
+                        uint64_t nsamples, size_t tbytes, float scale, int nDstChannels, int nSrcChannels, int swap_sign);
 
 void sample_move_d16_d16(short *dst, short *src,
-			 uint64_t nsamples, size_t tbytes, float scale, int nDstChannels, int nSrcChannels, int swap_endian, int swap_sign);
+                         uint64_t nsamples, size_t tbytes, float scale, int nDstChannels, int nSrcChannels, int swap_endian, int swap_sign);
 
 void sample_move_d16_d8(uint8_t *dst, short *src,
-			uint64_t nsamples, size_t tbytes, float scale, int nDstChannels, int nSrcChannels, int swap_sign);
+                        uint64_t nsamples, size_t tbytes, float scale, int nDstChannels, int nSrcChannels, int swap_sign);
 
-void sample_move_d16_float (float *dst, short *src, uint64_t nsamples, uint64_t src_skip, int is_unsigned, boolean rev_endian, float vol);
+void sample_move_d16_float(float *dst, short *src, uint64_t nsamples, uint64_t src_skip, int is_unsigned, boolean rev_endian, float vol);
 
-int64_t sample_move_float_int(void *holding_buff, float **float_buffer, int nsamps, float scale, int chans, int asamps, int usigned, boolean swap_endian, boolean float_interleaved, float vol); ///< returns frames output
+int64_t sample_move_float_int(void *holding_buff, float **float_buffer, int nsamps, float scale, int chans, int asamps, int usigned,
+                              boolean swap_endian, boolean float_interleaved, float vol); ///< returns frames output
 
-int64_t sample_move_abuf_float (float **obuf, int nchans, int nsamps, int out_arate, float vol);
+int64_t sample_move_abuf_float(float **obuf, int nchans, int nsamps, int out_arate, float vol);
 
-int64_t sample_move_abuf_int16 (short *obuf, int nchans, int nsamps, int out_arate);
+int64_t sample_move_abuf_int16(short *obuf, int nchans, int nsamps, int out_arate);
 
-void sample_move_float_float (float *dst, float *src, uint64_t nsamples, float scale, int dst_skip);
+void sample_move_float_float(float *dst, float *src, uint64_t nsamples, float scale, int dst_skip);
 
 boolean float_deinterleave(float *fbuffer, int nsamps, int nchans);
 boolean float_interleave(float *fbuffer, int nsamps, int nchans);
 
-int64_t render_audio_segment(int nfiles, int *from_files, int to_file, double *avels, double *fromtime, weed_timecode_t tc_start, weed_timecode_t tc_end, double *chvol, double opvol_start, double opvol_end, lives_audio_buf_t *obuf);
+int64_t render_audio_segment(int nfiles, int *from_files, int to_file, double *avels, double *fromtime, weed_timecode_t tc_start,
+                             weed_timecode_t tc_end, double *chvol, double opvol_start, double opvol_end, lives_audio_buf_t *obuf);
 
 void aud_fade(int fileno, double startt, double endt, double startv, double endv); ///< fade in/fade out
 
@@ -200,21 +202,22 @@
 boolean resync_audio(int frameno);
 
 
-lives_audio_track_state_t *get_audio_and_effects_state_at(weed_plant_t *event_list, weed_plant_t *st_event, boolean get_audstate, boolean exact);
+lives_audio_track_state_t *get_audio_and_effects_state_at(weed_plant_t *event_list, weed_plant_t *st_event, boolean get_audstate,
+    boolean exact);
 
 boolean get_audio_from_plugin(float *fbuffer, int nchans, int arate, int nsamps);
 void reinit_audio_gen(void);
 
-void init_jack_audio_buffers (int achans, int arate, boolean exact);
+void init_jack_audio_buffers(int achans, int arate, boolean exact);
 void free_jack_audio_buffers(void);
 
-void init_pulse_audio_buffers (int achans, int arate, boolean exact);
+void init_pulse_audio_buffers(int achans, int arate, boolean exact);
 void free_pulse_audio_buffers(void);
 
 void audio_free_fnames(void);
 
-lives_audio_buf_t *audio_cache_init (void);
-void audio_cache_end (void);
+lives_audio_buf_t *audio_cache_init(void);
+void audio_cache_end(void);
 lives_audio_buf_t *audio_cache_get_buffer(void);
 
 boolean apply_rte_audio_init(void);

LiVES-2.2.8.tar.bz2/src/callbacks.c -> LiVES-2.4.1.tar.bz2/src/callbacks.c Changed

@@ -18,7 +18,6 @@
 #include <sys/stat.h>
 #include <dlfcn.h>
 
-#include "support.h"
 #include "main.h"
 #include "callbacks.h"
 #include "interface.h"
@@ -39,35 +38,49 @@
 #include "videodev.h"
 #endif
 
-static gchar file_name[PATH_MAX];
+static char file_name[PATH_MAX];
 
-boolean on_LiVES_delete_event (LiVESWidget *widget, GdkEvent *event, gpointer user_data) {
+void lives_notify(int msgnumber,const char *msgstring) {
+#ifdef IS_LIBLIVES
+  binding_cb(msgnumber, msgstring, mainw->id);
+#endif
+#ifdef ENABLE_OSC
+  lives_osc_notify(msgnumber,msgstring);
+#endif
+}
+
+LIVES_INLINE const char *get_set_name() {
+  return mainw->set_name;
+}
+
+boolean on_LiVES_delete_event(LiVESWidget *widget, LiVESXEventDelete *event, livespointer user_data) {
+  if (!mainw->interactive) return TRUE;
   on_quit_activate(NULL,NULL);
   return TRUE;
 }
 
 
-void lives_exit (void) {
-  gchar *cwd;
+void lives_exit(int signum) {
+  char *cwd,*tmp;
 
   register int i;
 
   if (!mainw->only_close) mainw->is_exiting=TRUE;
 
   if (mainw->is_ready) {
-    gchar *com;
+    char *com;
 
     lives_close_all_file_buffers();
 
     if (mainw->multitrack!=NULL&&mainw->multitrack->idlefunc>0) {
-      //g_source_remove(mainw->multitrack->idlefunc);
+      //lives_source_remove(mainw->multitrack->idlefunc);
       mainw->multitrack->idlefunc=0;
     }
 
     threaded_dialog_spin();
 
     if (mainw->toy_type!=LIVES_TOY_NONE) {
-      on_toy_activate(NULL, GINT_TO_POINTER(LIVES_TOY_NONE));
+      on_toy_activate(NULL, LIVES_INT_TO_POINTER(LIVES_TOY_NONE));
     }
 
     if (mainw->stored_event_list!=NULL||mainw->sl_undo_mem!=NULL) {
@@ -75,33 +88,32 @@
     }
 
     if (mainw->multitrack!=NULL&&!mainw->only_close) {
-       if (mainw->multitrack->undo_mem!=NULL) g_free(mainw->multitrack->undo_mem);
-       mainw->multitrack->undo_mem=NULL;
+      if (mainw->multitrack->undo_mem!=NULL) lives_free(mainw->multitrack->undo_mem);
+      mainw->multitrack->undo_mem=NULL;
     }
 
     if (mainw->playing_file>-1) {
       mainw->ext_keyboard=FALSE;
       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;
+        if (mainw->vpp->exit_screen!=NULL)(*mainw->vpp->exit_screen)(mainw->ptr_x,mainw->ptr_y);
+        stop_audio_stream();
+        mainw->stream_ticks=-1;
       }
-      
+
       // tell non-realtime audio players (sox or mplayer) to stop
-      if (prefs->audio_player!=AUD_PLAYER_JACK&&prefs->audio_player!=AUD_PLAYER_PULSE&&mainw->aud_file_to_kill>-1&&
-	  mainw->files[mainw->aud_file_to_kill]!=NULL) {
-	gchar *lsname=g_build_filename(prefs->tmpdir,mainw->files[mainw->aud_file_to_kill]->handle,NULL);
+      if (!is_realtime_aplayer(prefs->audio_player)&&mainw->aud_file_to_kill>-1&&mainw->files[mainw->aud_file_to_kill]!=NULL) {
+        char *lsname=lives_build_filename(prefs->tmpdir,mainw->files[mainw->aud_file_to_kill]->handle,NULL);
 #ifndef IS_MINGW
-	com=g_strdup_printf ("/bin/touch \"%s\" 2>/dev/null",lsname);
+        com=lives_strdup_printf("%s \"%s\" 2>/dev/null",capable->touch_cmd,lsname);
 #else
-	com=g_strdup_printf ("touch.exe \"%s\" 2>NUL",lsname);
+        com=lives_strdup_printf("touch.exe \"%s\" 2>NUL",lsname);
 #endif
-	g_free(lsname);
-	lives_system(com,TRUE);
-	g_free (com);
-	com=g_strdup_printf("%s stop_audio \"%s\"",prefs->backend,mainw->files[mainw->aud_file_to_kill]->handle);
-	lives_system(com,TRUE);
-	g_free(com);
+        lives_free(lsname);
+        lives_system(com,TRUE);
+        lives_free(com);
+        com=lives_strdup_printf("%s stop_audio \"%s\"",prefs->backend,mainw->files[mainw->aud_file_to_kill]->handle);
+        lives_system(com,TRUE);
+        lives_free(com);
       }
     }
 
@@ -109,28 +121,28 @@
     if (mainw->current_file>-1) {
       if (cfile->handle!=NULL&&(cfile->clip_type==CLIP_TYPE_DISK||cfile->clip_type==CLIP_TYPE_FILE)) {
 #ifndef IS_MINGW
-	com=g_strdup_printf("%s stopsubsub \"%s\" 2>/dev/null",prefs->backend_sync,cfile->handle);
-	lives_system(com,TRUE);
+        com=lives_strdup_printf("%s stopsubsub \"%s\" 2>/dev/null",prefs->backend_sync,cfile->handle);
+        lives_system(com,TRUE);
 #else
-	// get pid from backend
-	FILE *rfile;
-	ssize_t rlen;
-	char val[16];
-	int pid;
-	com=g_strdup_printf("%s get_pid_for_handle \"%s\"",prefs->backend_sync,cfile->handle);
-	rfile=popen(com,"r");
-	rlen=fread(val,1,16,rfile);
-	pclose(rfile);
-	memset(val+rlen,0,1);
-	pid=atoi(val);
-	
-	lives_win32_kill_subprocesses(pid,TRUE);
+        // get pid from backend
+        FILE *rfile;
+        ssize_t rlen;
+        char val[16];
+        int pid;
+        com=lives_strdup_printf("%s get_pid_for_handle \"%s\"",prefs->backend_sync,cfile->handle);
+        rfile=popen(com,"r");
+        rlen=fread(val,1,16,rfile);
+        pclose(rfile);
+        memset(val+rlen,0,1);
+        pid=atoi(val);
+
+        lives_win32_kill_subprocesses(pid,TRUE);
 #endif
-	g_free(com);
+        lives_free(com);
 
       }
     }
-    
+
     // prevent crash in "threaded" dialog
     mainw->current_file=-1;
 
@@ -146,10 +158,10 @@
       pthread_mutex_lock(&mainw->abuf_mutex);
       lives_jack_end();
       if (mainw->jackd!=NULL) {
-	jack_close_device(mainw->jackd);
+        jack_close_device(mainw->jackd);
       }
       if (mainw->jackd_read!=NULL) {
-	jack_close_device(mainw->jackd_read);
+        jack_close_device(mainw->jackd_read);
       }
       pthread_mutex_unlock(&mainw->abuf_mutex);
 #endif
@@ -157,10 +169,10 @@
 
     if (mainw->vpp!=NULL&&!mainw->only_close) {
       if (!mainw->leave_recovery) {
-	if (mainw->write_vpp_file) {
-	  gchar *vpp_file=g_build_filename(capable->home_dir,LIVES_CONFIG_DIR,"vpp_defaults",NULL);
-	  save_vpp_defaults(mainw->vpp,vpp_file);
-	}
+        if (mainw->write_vpp_file) {
+          char *vpp_file=lives_build_filename(capable->home_dir,LIVES_CONFIG_DIR,"vpp_defaults",NULL);
+          save_vpp_defaults(mainw->vpp,vpp_file);
+        }
       }
       close_vid_playback_plugin(mainw->vpp);
     }
@@ -178,210 +190,204 @@
       // create the new directory, and then move any sets over
       end_threaded_dialog();
       if (do_move_tmpdir_dialog()) {
-	do_do_not_close_d();
-	lives_widget_context_update();
+        do_do_not_close_d();
+        lives_widget_context_update();
 
-	// TODO *** - check for namespace collisions between sets in old dir and sets in new dir
+        // TODO *** - check for namespace collisions between sets in old dir and sets in new dir
 
 
-	// use backend to move the sets
-	com=g_strdup_printf("%s weed \"%s\" &",prefs->backend_sync,future_prefs->tmpdir);
-	lives_system (com,FALSE);
-	g_free (com);
+        // use backend to move the sets
+        com=lives_strdup_printf("%s weed \"%s\" &",prefs->backend_sync,future_prefs->tmpdir);
+        lives_system(com,FALSE);
+        lives_free(com);
       }
-      g_snprintf(prefs->tmpdir,PATH_MAX,"%s",future_prefs->tmpdir);
-    }
-    else if (!mainw->only_close) g_snprintf(future_prefs->tmpdir,256,"NULL");
+      lives_snprintf(prefs->tmpdir,PATH_MAX,"%s",future_prefs->tmpdir);
+    } else if (!mainw->only_close) lives_snprintf(future_prefs->tmpdir,256,"NULL");
 
     if (mainw->leave_files&&!mainw->fatal) {
-      gchar *msg;
-      msg=g_strdup_printf(_("Saving as set %s..."),mainw->set_name);
-      d_print(msg);
-      g_free(msg);
+      d_print(_("Saving as set %s..."),mainw->set_name);
     }
 
-    cwd=g_get_current_dir();
+    cwd=lives_get_current_dir();
 
-    for (i=1;i<=MAX_FILES;i++) {
+    for (i=1; i<=MAX_FILES; i++) {
       if (mainw->files[i]!=NULL) {
-	mainw->current_file=i;
-	threaded_dialog_spin();
-	if (cfile->event_list_back!=NULL) event_list_free (cfile->event_list_back);
-	if (cfile->event_list!=NULL) event_list_free (cfile->event_list);
-
-	cfile->event_list=cfile->event_list_back=NULL;
-
-	if (cfile->layout_map!=NULL) {
-	  g_list_free_strings(cfile->layout_map);
-	  g_list_free(cfile->layout_map);
-	}
-
-	if (cfile->laudio_drawable!=NULL) {
-	  lives_painter_surface_destroy(cfile->laudio_drawable);
-	}
-
-	if (cfile->raudio_drawable!=NULL) {
-	  lives_painter_surface_destroy(cfile->raudio_drawable);
-	}
-
-
-	if ((mainw->files[i]->clip_type==CLIP_TYPE_FILE||mainw->files[i]->clip_type==CLIP_TYPE_DISK)&&mainw->files[i]->ext_src!=NULL) {
-	  // must do this before we move it
-	  gchar *ppath=g_build_filename(prefs->tmpdir,cfile->handle,NULL);
-	  lives_chdir(ppath,FALSE);
-	  g_free(ppath);
-	  threaded_dialog_spin();
-	  close_decoder_plugin((lives_decoder_t *)mainw->files[i]->ext_src);
-	  mainw->files[i]->ext_src=NULL;
-	  threaded_dialog_spin();
-	}
-	
-	if (mainw->files[i]->frame_index!=NULL) {
-	  g_free(mainw->files[i]->frame_index);
-	  mainw->files[i]->frame_index=NULL;
-	}
+        mainw->current_file=i;
+        threaded_dialog_spin();
+        if (cfile->event_list_back!=NULL) event_list_free(cfile->event_list_back);
+        if (cfile->event_list!=NULL) event_list_free(cfile->event_list);
+
+        cfile->event_list=cfile->event_list_back=NULL;
+
+        if (cfile->layout_map!=NULL) {
+          lives_list_free_strings(cfile->layout_map);
+          lives_list_free(cfile->layout_map);
+        }
+
+        if (cfile->laudio_drawable!=NULL) {
+          lives_painter_surface_destroy(cfile->laudio_drawable);
+        }
+
+        if (cfile->raudio_drawable!=NULL) {
+          lives_painter_surface_destroy(cfile->raudio_drawable);
+        }
+
+
+        if ((mainw->files[i]->clip_type==CLIP_TYPE_FILE||mainw->files[i]->clip_type==CLIP_TYPE_DISK)&&mainw->files[i]->ext_src!=NULL) {
+          // must do this before we move it
+          char *ppath=lives_build_filename(prefs->tmpdir,cfile->handle,NULL);
+          lives_chdir(ppath,FALSE);
+          lives_free(ppath);
+          threaded_dialog_spin();
+          close_decoder_plugin((lives_decoder_t *)mainw->files[i]->ext_src);
+          mainw->files[i]->ext_src=NULL;
+          threaded_dialog_spin();
+        }
+
+        if (mainw->files[i]->frame_index!=NULL) {
+          lives_free(mainw->files[i]->frame_index);
+          mainw->files[i]->frame_index=NULL;
+        }
 
-	cfile->layout_map=NULL;
+        cfile->layout_map=NULL;
 
       }
     }
 
     lives_chdir(cwd,FALSE);
-    g_free(cwd);
+    lives_free(cwd);
 
-    for (i=0;i<=MAX_FILES;i++) {
+    for (i=0; i<=MAX_FILES; i++) {
       if (mainw->files[i]!=NULL) {
-	if ((!mainw->leave_files&&!prefs->crash_recovery&&strlen(mainw->set_name)==0)||
-	    (!mainw->only_close&&(i==0||(mainw->files[i]->clip_type!=CLIP_TYPE_DISK&&
-					 mainw->files[i]->clip_type!=CLIP_TYPE_FILE)))||
-	    (i==mainw->scrap_file&&!mainw->leave_recovery)||
-	    (i==mainw->ascrap_file&&!mainw->leave_recovery)||
-	    (mainw->multitrack!=NULL&&i==mainw->multitrack->render_file)) {
-	  // close all open clips, except for ones we want to retain
+        if ((!mainw->leave_files&&!prefs->crash_recovery&&strlen(mainw->set_name)==0)||
+            (!mainw->only_close&&(i==0||(mainw->files[i]->clip_type!=CLIP_TYPE_DISK&&
+                                         mainw->files[i]->clip_type!=CLIP_TYPE_FILE)))||
+            (i==mainw->scrap_file&&!mainw->leave_recovery)||
+            (i==mainw->ascrap_file&&!mainw->leave_recovery)||
+            (mainw->multitrack!=NULL&&i==mainw->multitrack->render_file)) {
+          // close all open clips, except for ones we want to retain
 
 #ifdef IS_MINGW
-	  FILE *rfile;
-	  ssize_t rlen;
-	  char val[16];
-	  int pid;
+          FILE *rfile;
+          ssize_t rlen;
+          char val[16];
+          int pid;
 #endif
 
 #ifdef HAVE_YUV4MPEG
-	  if (mainw->files[i]->clip_type==CLIP_TYPE_YUV4MPEG) {
-	    lives_yuv_stream_stop_read((lives_yuv4m_t *)mainw->files[i]->ext_src);
-	    g_free (mainw->files[i]->ext_src);
-	  }
+          if (mainw->files[i]->clip_type==CLIP_TYPE_YUV4MPEG) {
+            lives_yuv_stream_stop_read((lives_yuv4m_t *)mainw->files[i]->ext_src);
+            lives_free(mainw->files[i]->ext_src);
+          }
 #endif
 #ifdef HAVE_UNICAP
-	  if (mainw->files[i]->clip_type==CLIP_TYPE_VIDEODEV) {
-	    lives_vdev_free((lives_vdev_t *)mainw->files[i]->ext_src);
-	    g_free (mainw->files[i]->ext_src);
-	  }
+          if (mainw->files[i]->clip_type==CLIP_TYPE_VIDEODEV) {
+            lives_vdev_free((lives_vdev_t *)mainw->files[i]->ext_src);
+            lives_free(mainw->files[i]->ext_src);
+          }
 #endif
-	  threaded_dialog_spin();
+          threaded_dialog_spin();
 #ifdef IS_MINGW
-	  // kill any active processes: for other OSes the backend does this
-	  // get pid from backend
-	  com=g_strdup_printf("%s get_pid_for_handle \"%s\"",prefs->backend_sync,cfile->handle);
-	  rfile=popen(com,"r");
-	  rlen=fread(val,1,16,rfile);
-	  pclose(rfile);
-	  memset(val+rlen,0,1);
-	  pid=atoi(val);
-	  
-	  lives_win32_kill_subprocesses(pid,TRUE);
-#endif
-	  com=g_strdup_printf("%s close \"%s\"",prefs->backend,mainw->files[i]->handle);
-	  lives_system(com,FALSE);
-	  g_free(com);
-	  threaded_dialog_spin();
-	}
-	else {
-	  threaded_dialog_spin();
-	  // or just clean them up
-	  com=g_strdup_printf("%s clear_tmp_files \"%s\"",prefs->backend_sync,mainw->files[i]->handle);
-	  lives_system(com,FALSE);
-	  threaded_dialog_spin();
-	  g_free(com);
-	  if (mainw->files[i]->frame_index!=NULL) {
-	    save_frame_index(i);
-	  }
-	  lives_freep((void**)&mainw->files[i]->op_dir);
-	  if (!mainw->only_close) {
-	    if ((mainw->files[i]->clip_type==CLIP_TYPE_FILE||mainw->files[i]->clip_type==CLIP_TYPE_DISK)&&mainw->files[i]->ext_src!=NULL) {
-	      gchar *ppath=g_build_filename(prefs->tmpdir,mainw->files[i]->handle,NULL);
-	      cwd=g_get_current_dir();
-	      lives_chdir(ppath,FALSE);
-	      g_free(ppath);
-	      close_decoder_plugin((lives_decoder_t *)mainw->files[i]->ext_src);
-	      mainw->files[i]->ext_src=NULL;
-	      
-	      lives_chdir(cwd,FALSE);
-	      g_free(cwd);
-	    }
-	  }
-	}
+          // kill any active processes: for other OSes the backend does this
+          // get pid from backend
+          com=lives_strdup_printf("%s get_pid_for_handle \"%s\"",prefs->backend_sync,cfile->handle);
+          rfile=popen(com,"r");
+          rlen=fread(val,1,16,rfile);
+          pclose(rfile);
+          memset(val+rlen,0,1);
+          pid=atoi(val);
+
+          lives_win32_kill_subprocesses(pid,TRUE);
+#endif
+          com=lives_strdup_printf("%s close \"%s\"",prefs->backend,mainw->files[i]->handle);
+          lives_system(com,FALSE);
+          lives_free(com);
+          threaded_dialog_spin();
+        } else {
+          threaded_dialog_spin();
+          // or just clean them up
+          com=lives_strdup_printf("%s clear_tmp_files \"%s\"",prefs->backend_sync,mainw->files[i]->handle);
+          lives_system(com,FALSE);
+          threaded_dialog_spin();
+          lives_free(com);
+          if (mainw->files[i]->frame_index!=NULL) {
+            save_frame_index(i);
+          }
+          lives_freep((void **)&mainw->files[i]->op_dir);
+          if (!mainw->only_close) {
+            if ((mainw->files[i]->clip_type==CLIP_TYPE_FILE||mainw->files[i]->clip_type==CLIP_TYPE_DISK)&&mainw->files[i]->ext_src!=NULL) {
+              char *ppath=lives_build_filename(prefs->tmpdir,mainw->files[i]->handle,NULL);
+              cwd=lives_get_current_dir();
+              lives_chdir(ppath,FALSE);
+              lives_free(ppath);
+              close_decoder_plugin((lives_decoder_t *)mainw->files[i]->ext_src);
+              mainw->files[i]->ext_src=NULL;
+
+              lives_chdir(cwd,FALSE);
+              lives_free(cwd);
+            }
+          }
+        }
       }
     }
 
     if (!mainw->leave_files&&strlen(mainw->set_name)&&!mainw->leave_recovery) {
-      gchar *set_layout_dir=g_build_filename(prefs->tmpdir,mainw->set_name,"layouts",NULL);
-      if (!g_file_test(set_layout_dir,G_FILE_TEST_IS_DIR)) {
-	gchar *sdname=g_build_filename(prefs->tmpdir,mainw->set_name,NULL);
+      char *set_layout_dir=lives_build_filename(prefs->tmpdir,mainw->set_name,"layouts",NULL);
+      if (!lives_file_test(set_layout_dir,LIVES_FILE_TEST_IS_DIR)) {
+        char *sdname=lives_build_filename(prefs->tmpdir,mainw->set_name,NULL);
 
-	// note, we do not use the flag -f
+        // note, we do not use the flag -f
 #ifndef IS_MINGW
-	com=g_strdup_printf("/bin/rm -r \"%s/\" 2>/dev/null",sdname);
+        com=lives_strdup_printf("%s -r \"%s/\" 2>/dev/null",capable->rm_cmd,sdname);
 #else
-	com=g_strdup_printf("rm.exe -r \"%s/\" 2>NUL",sdname);
+        com=lives_strdup_printf("rm.exe -r \"%s/\" 2>NUL",sdname);
 #endif
-	g_free(sdname);
-	lives_system(com,TRUE);
-	threaded_dialog_spin();
-	g_free(com);
-      }
-      else {
-	gchar *dname=g_build_filename(prefs->tmpdir,mainw->set_name,"clips",NULL);
+        lives_free(sdname);
+        lives_system(com,TRUE);
+        threaded_dialog_spin();
+        lives_free(com);
+      } else {
+        char *dname=lives_build_filename(prefs->tmpdir,mainw->set_name,"clips",NULL);
 #ifndef IS_MINGW
-	com=g_strdup_printf("/bin/rm -r \"%s\" 2>/dev/null",dname);
+        com=lives_strdup_printf("%s -r \"%s\" 2>/dev/null",capable->rm_cmd,dname);
 #else
-	com=g_strdup_printf("rm.exe -r \"%s\" 2>NUL",dname);
+        com=lives_strdup_printf("rm.exe -r \"%s\" 2>NUL",dname);
 #endif
-	g_free(dname);
-	lives_system(com,TRUE);
-	threaded_dialog_spin();
-	g_free(com);
-	dname=g_build_filename(prefs->tmpdir,mainw->set_name,"order",NULL);
+        lives_free(dname);
+        lives_system(com,TRUE);
+        threaded_dialog_spin();
+        lives_free(com);
+        dname=lives_build_filename(prefs->tmpdir,mainw->set_name,"order",NULL);
 #ifndef IS_MINGW
-	com=g_strdup_printf("/bin/rm \"%s\" 2>/dev/null",dname);
+        com=lives_strdup_printf("%s \"%s\" 2>/dev/null",capable->rm_cmd,dname);
 #else
-	com=g_strdup_printf("rm.exe \"%s\" 2>NUL",dname);
+        com=lives_strdup_printf("rm.exe \"%s\" 2>NUL",dname);
 #endif
-	g_free(dname);
-	lives_system(com,TRUE);
-	threaded_dialog_spin();
-	g_free(com);
+        lives_free(dname);
+        lives_system(com,TRUE);
+        threaded_dialog_spin();
+        lives_free(com);
       }
-      g_free(set_layout_dir);
+      lives_free(set_layout_dir);
     }
 
     if (strlen(mainw->set_name)) {
-      gchar *set_lock_file=g_strdup_printf("%s/%s/lock.%d",prefs->tmpdir,mainw->set_name,capable->mainpid);
+      char *set_lock_file=lives_strdup_printf("%s/%s/lock.%d",prefs->tmpdir,mainw->set_name,capable->mainpid);
       unlink(set_lock_file);
-      g_free(set_lock_file);
+      lives_free(set_lock_file);
       threaded_dialog_spin();
     }
-    
+
     if (mainw->only_close) {
       mainw->suppress_dprint=TRUE;
-      for (i=1;i<=MAX_FILES;i++) {
-	if (mainw->files[i]!=NULL&&(mainw->files[i]->clip_type==CLIP_TYPE_DISK||
-				    mainw->files[i]->clip_type==CLIP_TYPE_FILE)&&(mainw->multitrack==NULL||
-										  i!=mainw->multitrack->render_file)) {
-	  mainw->current_file=i;
-	  close_current_file(0);
-	  threaded_dialog_spin();
-	}
+      for (i=1; i<=MAX_FILES; i++) {
+        if (mainw->files[i]!=NULL&&(mainw->files[i]->clip_type==CLIP_TYPE_DISK||
+                                    mainw->files[i]->clip_type==CLIP_TYPE_FILE)&&(mainw->multitrack==NULL||
+                                        i!=mainw->multitrack->render_file)) {
+          mainw->current_file=i;
+          close_current_file(0);
+          threaded_dialog_spin();
+        }
       }
       mainw->suppress_dprint=FALSE;
       if (mainw->multitrack==NULL) resize(1);
@@ -398,11 +404,11 @@
       end_threaded_dialog();
 
       if (mainw->multitrack!=NULL) {
-	mainw->current_file=mainw->multitrack->render_file;
-	mainw->multitrack->file_selected=-1;
-	polymorph(mainw->multitrack,POLY_NONE);
-	polymorph(mainw->multitrack,POLY_CLIPS);
-	mt_sensitise(mainw->multitrack);
+        mainw->current_file=mainw->multitrack->render_file;
+        mainw->multitrack->file_selected=-1;
+        polymorph(mainw->multitrack,POLY_NONE);
+        polymorph(mainw->multitrack,POLY_CLIPS);
+        mt_sensitise(mainw->multitrack);
       }
 
       return;
@@ -412,7 +418,7 @@
 
     // stop valgrind from complaining
 #ifdef VALG_COMPLAIN
-    if (mainw->preview_image!=NULL && LIVES_IS_IMAGE(mainw->preview_image)) 
+    if (mainw->preview_image!=NULL && LIVES_IS_IMAGE(mainw->preview_image))
       lives_image_set_from_pixbuf(LIVES_IMAGE(mainw->preview_image), NULL);
 
     if (mainw->start_image!=NULL) lives_image_set_from_pixbuf(LIVES_IMAGE(mainw->start_image), NULL);
@@ -432,17 +438,17 @@
   }
 
   if (mainw->current_layouts_map!=NULL) {
-    g_list_free_strings(mainw->current_layouts_map);
-    g_list_free(mainw->current_layouts_map);
+    lives_list_free_strings(mainw->current_layouts_map);
+    lives_list_free(mainw->current_layouts_map);
     mainw->current_layouts_map=NULL;
   }
 
   if (capable->smog_version_correct&&!mainw->startup_error) {
     if (capable->has_encoder_plugins) {
-      GList *dummy_list=plugin_request("encoders",prefs->encoder.name,"finalise");
+      LiVESList *dummy_list=plugin_request("encoders",prefs->encoder.name,"finalise");
       if (dummy_list!=NULL) {
-	g_list_free_strings(dummy_list);
-	g_list_free(dummy_list);
+        lives_list_free_strings(dummy_list);
+        lives_list_free(dummy_list);
       }
     }
 
@@ -475,16 +481,16 @@
     }
   }
 
-  if (prefs->fxdefsfile!=NULL) g_free(prefs->fxdefsfile);
-  if (prefs->fxsizesfile!=NULL) g_free(prefs->fxsizesfile);
+  if (prefs->fxdefsfile!=NULL) lives_free(prefs->fxdefsfile);
+  if (prefs->fxsizesfile!=NULL) lives_free(prefs->fxsizesfile);
 
-  if (prefs->wm!=NULL) g_free(prefs->wm);
+  if (prefs->wm!=NULL) lives_free(prefs->wm);
 
-  if (mainw->recovery_file!=NULL) g_free(mainw->recovery_file);
+  if (mainw->recovery_file!=NULL) lives_free(mainw->recovery_file);
 
-  for (i=0;i<NUM_LIVES_STRING_CONSTANTS;i++) if (mainw->string_constants[i]!=NULL) g_free(mainw->string_constants[i]);
+  for (i=0; i<NUM_LIVES_STRING_CONSTANTS; i++) if (mainw->string_constants[i]!=NULL) lives_free(mainw->string_constants[i]);
 
-  for (i=0;i<mainw->n_screen_areas;i++) g_free(mainw->screen_areas[i].name);
+  for (i=0; i<mainw->n_screen_areas; i++) lives_free(mainw->screen_areas[i].name);
 
   if (mainw->video_drawable!=NULL) {
     lives_painter_surface_destroy(mainw->video_drawable);
@@ -498,110 +504,114 @@
     lives_painter_surface_destroy(mainw->raudio_drawable);
   }
 
-  if (mainw->foreign_visual!=NULL) g_free(mainw->foreign_visual);
-  if (mainw->read_failed_file!=NULL) g_free(mainw->read_failed_file);
-  if (mainw->write_failed_file!=NULL) g_free(mainw->write_failed_file);
-  if (mainw->bad_aud_file!=NULL) g_free(mainw->bad_aud_file);
+  if (mainw->foreign_visual!=NULL) lives_free(mainw->foreign_visual);
+  if (mainw->read_failed_file!=NULL) lives_free(mainw->read_failed_file);
+  if (mainw->write_failed_file!=NULL) lives_free(mainw->write_failed_file);
+  if (mainw->bad_aud_file!=NULL) lives_free(mainw->bad_aud_file);
 
   unload_decoder_plugins();
 
-  if (mainw->multitrack!=NULL) g_free(mainw->multitrack);
+  if (mainw->multitrack!=NULL) lives_free(mainw->multitrack);
   mainw->multitrack=NULL;
   mainw->is_ready=FALSE;
 
-  if (mainw->mgeom!=NULL) g_free(mainw->mgeom);
+  if (mainw->mgeom!=NULL) lives_free(mainw->mgeom);
 
   if (prefs->disabled_decoders!=NULL) {
-    g_list_free_strings(prefs->disabled_decoders);
-    g_list_free(prefs->disabled_decoders);
+    lives_list_free_strings(prefs->disabled_decoders);
+    lives_list_free(prefs->disabled_decoders);
   }
 
-  if (mainw->fonts_array!=NULL) g_strfreev(mainw->fonts_array);
+  if (mainw->fonts_array!=NULL) lives_strfreev(mainw->fonts_array);
 #ifdef USE_SWSCALE
   sws_free_context();
 #endif
 
 #ifdef ENABLE_NLS
-  if (trString!=NULL) g_free(trString);
+  if (trString!=NULL) lives_free(trString);
 #endif
 
+  tmp=lives_strdup_printf("%d",signum);
+  lives_notify(LIVES_OSC_NOTIFY_QUIT,tmp);
+  lives_free(tmp);
+
   exit(0);
 }
 
 
 
 
-void on_filesel_button_clicked (LiVESButton *button, gpointer user_data) {
+void on_filesel_button_clicked(LiVESButton *button, livespointer user_data) {
   LiVESWidget *tentry=LIVES_WIDGET(user_data);
 
   boolean is_dir=TRUE;
 
-  gchar *dirname;
-  gchar *fname;
-  gchar *tmp;
+  char *dirname;
+  char *fname;
+  char *tmp;
 
-  gchar *def_dir=NULL;
+  char *def_dir=NULL;
 
   if (button!=NULL) {
-    def_dir=(gchar *)g_object_get_data(G_OBJECT(button),"def_dir");
-    is_dir=LIVES_POINTER_TO_INT(g_object_get_data(G_OBJECT(button),"is_dir"));
+    def_dir=(char *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(button),"def_dir");
+    is_dir=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(button),"is_dir"));
   }
 
   if (LIVES_IS_TEXT_VIEW(tentry)) fname=lives_text_view_get_text(LIVES_TEXT_VIEW(tentry));
-  else fname=g_strdup(lives_entry_get_text(LIVES_ENTRY(tentry)));
+  else fname=lives_strdup(lives_entry_get_text(LIVES_ENTRY(tentry)));
 
   if (!strlen(fname)) {
-    g_free(fname);
+    lives_free(fname);
     fname=def_dir;
   }
 
   lives_widget_context_update();
 
   dirname=choose_file(fname,NULL,NULL,
-		      is_dir?LIVES_FILE_CHOOSER_ACTION_SELECT_FOLDER:
-		      (fname==def_dir&&!strcmp(def_dir,LIVES_DEVICE_DIR))?LIVES_FILE_CHOOSER_ACTION_SELECT_DEVICE:
-		      LIVES_FILE_CHOOSER_ACTION_OPEN,
-		      NULL,NULL);
+                      is_dir?LIVES_FILE_CHOOSER_ACTION_SELECT_FOLDER:
+                      (fname==def_dir&&!strcmp(def_dir,LIVES_DEVICE_DIR))?LIVES_FILE_CHOOSER_ACTION_SELECT_DEVICE:
+                      LIVES_FILE_CHOOSER_ACTION_OPEN,
+                      NULL,NULL);
 
-  if (fname!=NULL&&fname!=def_dir) g_free(fname);
+  if (fname!=NULL&&fname!=def_dir) lives_free(fname);
 
   if (dirname==NULL) return;
 
-  g_snprintf(file_name,PATH_MAX,"%s",dirname);
-  g_free(dirname);
+  lives_snprintf(file_name,PATH_MAX,"%s",dirname);
+  lives_free(dirname);
 
   if (button!=NULL) {
-    if (LIVES_IS_ENTRY(tentry)) lives_entry_set_text(LIVES_ENTRY(tentry),(tmp=g_filename_to_utf8(file_name,-1,NULL,NULL,NULL)));
-    else lives_text_view_set_text (LIVES_TEXT_VIEW(tentry), (tmp=g_filename_to_utf8(file_name,-1,NULL,NULL,NULL)), -1);
-    g_free(tmp);
+    if (LIVES_IS_ENTRY(tentry)) lives_entry_set_text(LIVES_ENTRY(tentry),(tmp=lives_filename_to_utf8(file_name,-1,NULL,NULL,NULL)));
+    else lives_text_view_set_text(LIVES_TEXT_VIEW(tentry), (tmp=lives_filename_to_utf8(file_name,-1,NULL,NULL,NULL)), -1);
+    lives_free(tmp);
   }
 
   // force update to be recognized
-  if (g_object_get_data(G_OBJECT(tentry),"rfx")!=NULL) 
-    after_param_text_changed(tentry,(lives_rfx_t *)g_object_get_data(G_OBJECT(tentry),"rfx"));
+  if (lives_widget_object_get_data(LIVES_WIDGET_OBJECT(tentry),"rfx")!=NULL)
+    after_param_text_changed(tentry,(lives_rfx_t *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(tentry),"rfx"));
 }
 
 
 
-void on_filesel_complex_clicked (LiVESButton *button, LiVESEntry *entry) {
+void on_filesel_complex_clicked(LiVESButton *button, LiVESEntry *entry) {
   // append /livestmp
   size_t chklen=strlen(LIVES_TMP_NAME);
 
-  on_filesel_button_clicked (NULL,entry);
+  on_filesel_button_clicked(NULL,entry);
 
   // TODO - dirsep
 #ifndef IS_MINGW
   if (strcmp(file_name+strlen(file_name)-1,"/")) {
-    g_strappend(file_name,PATH_MAX,"/");
+    lives_strappend(file_name,PATH_MAX,"/");
   }
-  if (strlen (file_name)<chklen+2||strncmp (file_name+strlen (file_name)-chklen-2,"/"LIVES_TMP_NAME"/",chklen-2)) 
-    g_strappend (file_name,PATH_MAX,LIVES_TMP_NAME"/");
+  if (strlen(file_name)<chklen+2||strncmp(file_name+strlen(file_name)-chklen-2,"/"LIVES_TMP_NAME"/",chklen-2))
+    lives_strappend(file_name,PATH_MAX,LIVES_TMP_NAME"/");
 #else
   if (strcmp(file_name+strlen(file_name)-1,"\\")) {
-    g_strappend(file_name,PATH_MAX,"\\");
+    lives_strappend(file_name,PATH_MAX,"\\");
   }
-  if (strlen (file_name)<chklen-2||strncmp (file_name+strlen (file_name)-chklen-2,"\\"LIVES_TMP_NAME"\\",chklen-2)) 
-    g_strappend (file_name,PATH_MAX,LIVES_TMP_NAME"\\");
+  if (strlen(file_name)<chklen-2||strncmp(file_name+strlen(file_name)-chklen-2,"\\"LIVES_TMP_NAME"\\",chklen-2))
+    lives_strappend(file_name,PATH_MAX,LIVES_TMP_NAME"\\");
 #endif
 
   lives_entry_set_text(entry,file_name);
@@ -610,50 +620,61 @@
 
 
 
-void on_open_sel_activate (LiVESMenuItem *menuitem, gpointer user_data) {
+void on_open_sel_activate(LiVESMenuItem *menuitem, livespointer user_data) {
   // OPEN A FILE
+  LiVESWidget *chooser;
+  char *fname, *tmp;
+  int resp;
 
   if (mainw->multitrack!=NULL) {
     if (mainw->multitrack->idlefunc>0) {
-      g_source_remove(mainw->multitrack->idlefunc);
+      lives_source_remove(mainw->multitrack->idlefunc);
       mainw->multitrack->idlefunc=0;
     }
     mt_desensitise(mainw->multitrack);
     lives_widget_set_sensitive(mainw->multitrack->playall,TRUE);
-    lives_widget_set_sensitive (mainw->m_playbutton, TRUE);
+    lives_widget_set_sensitive(mainw->m_playbutton, TRUE);
   }
 
-  choose_file_with_preview(strlen(mainw->vid_load_dir)?mainw->vid_load_dir:NULL,NULL,1);
-}
+  chooser=choose_file_with_preview(strlen(mainw->vid_load_dir)?mainw->vid_load_dir:NULL,NULL,LIVES_FILE_SELECTION_VIDEO_AUDIO);
+  resp=lives_dialog_run(LIVES_DIALOG(chooser));
 
+  end_fs_preview();
+  mainw->fs_playarea=NULL;
 
+  if (resp!=LIVES_RESPONSE_ACCEPT) {
+    on_filechooser_cancel_clicked(chooser);
+    return;
+  }
 
-void on_ok_filesel_open_clicked (LiVESFileChooser *chooser, gpointer user_data) {
-  gchar *fname=lives_file_chooser_get_filename (chooser);
-  gchar *tmp;
+  fname=lives_file_chooser_get_filename(LIVES_FILE_CHOOSER(chooser));
 
-  if (fname==NULL) return;
+  if (fname==NULL) {
+    if (mainw->multitrack!=NULL) {
+      mt_sensitise(mainw->multitrack);
+      mainw->multitrack->idlefunc=mt_idle_add(mainw->multitrack);
+    }
+    return;
+  }
 
-  g_snprintf(file_name,PATH_MAX,"%s",(tmp=g_filename_to_utf8(fname,-1,NULL,NULL,NULL)));
-  g_free(tmp); g_free(fname);
+  lives_snprintf(file_name,PATH_MAX,"%s",(tmp=lives_filename_to_utf8(fname,-1,NULL,NULL,NULL)));
+  lives_free(tmp);
+  lives_free(fname);
 
-  end_fs_preview();
   lives_widget_destroy(LIVES_WIDGET(chooser));
 
-  g_snprintf(mainw->vid_load_dir,PATH_MAX,"%s",file_name);
+  lives_snprintf(mainw->vid_load_dir,PATH_MAX,"%s",file_name);
   get_dirname(mainw->vid_load_dir);
 
   if (mainw->multitrack==NULL) lives_widget_queue_draw(mainw->LiVES);
   else lives_widget_queue_draw(mainw->multitrack->window);
   lives_widget_context_update();
-  
-  mainw->fs_playarea=NULL;
-  
+
   if (prefs->save_directories) {
-    set_pref ("vid_load_dir",(tmp=g_filename_from_utf8(mainw->vid_load_dir,-1,NULL,NULL,NULL)));
-    g_free(tmp);
+    set_pref("vid_load_dir",(tmp=lives_filename_from_utf8(mainw->vid_load_dir,-1,NULL,NULL,NULL)));
+    lives_free(tmp);
   }
-  
+
   mainw->cancelled=CANCEL_NONE;
 
   open_sel_range_activate();
@@ -661,36 +682,36 @@
 
 
 
-void on_open_vcd_activate (LiVESMenuItem *menuitem, gpointer user_data) {
+void on_open_vcd_activate(LiVESMenuItem *menuitem, livespointer user_data) {
   LiVESWidget *vcdtrack_dialog;
-  
+
   if (mainw->multitrack!=NULL) {
     if (mainw->multitrack->idlefunc>0) {
-      g_source_remove(mainw->multitrack->idlefunc);
+      lives_source_remove(mainw->multitrack->idlefunc);
       mainw->multitrack->idlefunc=0;
     }
     mt_desensitise(mainw->multitrack);
     lives_widget_set_sensitive(mainw->multitrack->playall,TRUE);
-    lives_widget_set_sensitive (mainw->m_playbutton, TRUE);
+    lives_widget_set_sensitive(mainw->m_playbutton, TRUE);
   }
 
   mainw->fx1_val=1;
   mainw->fx2_val=1;
   mainw->fx3_val=128;
-  vcdtrack_dialog = create_cdtrack_dialog (GPOINTER_TO_INT (user_data),NULL);
-  lives_widget_show (vcdtrack_dialog);
+  vcdtrack_dialog = create_cdtrack_dialog(LIVES_POINTER_TO_INT(user_data),NULL);
+  lives_widget_show(vcdtrack_dialog);
 }
 
 
-void on_open_loc_activate (LiVESMenuItem *menuitem, gpointer user_data) {
+void on_open_loc_activate(LiVESMenuItem *menuitem, livespointer user_data) {
   if (mainw->multitrack!=NULL) {
     if (mainw->multitrack->idlefunc>0) {
-      g_source_remove(mainw->multitrack->idlefunc);
+      lives_source_remove(mainw->multitrack->idlefunc);
       mainw->multitrack->idlefunc=0;
     }
     mt_desensitise(mainw->multitrack);
     lives_widget_set_sensitive(mainw->multitrack->playall,TRUE);
-    lives_widget_set_sensitive (mainw->m_playbutton, TRUE);
+    lives_widget_set_sensitive(mainw->m_playbutton, TRUE);
   }
 
   locw=create_location_dialog(1);
@@ -699,15 +720,15 @@
 }
 
 
-void on_open_utube_activate (LiVESMenuItem *menuitem, gpointer user_data) {
+void on_open_utube_activate(LiVESMenuItem *menuitem, livespointer user_data) {
   if (mainw->multitrack!=NULL) {
     if (mainw->multitrack->idlefunc>0) {
-      g_source_remove(mainw->multitrack->idlefunc);
+      lives_source_remove(mainw->multitrack->idlefunc);
       mainw->multitrack->idlefunc=0;
     }
     mt_desensitise(mainw->multitrack);
     lives_widget_set_sensitive(mainw->multitrack->playall,TRUE);
-    lives_widget_set_sensitive (mainw->m_playbutton, TRUE);
+    lives_widget_set_sensitive(mainw->m_playbutton, TRUE);
   }
 
   locw=create_location_dialog(2);
@@ -717,21 +738,21 @@
 
 
 
-void on_autoreload_toggled (LiVESToggleButton *togglebutton, gpointer user_data) {
+void on_autoreload_toggled(LiVESToggleButton *togglebutton, livespointer user_data) {
+  // type==0, autoreload layout
   // type==1, autoreload clipset
-  // type==2, autoreload layout
+  // type==2, autoreload layout (from choose layout name and ...)
 
   int type=LIVES_POINTER_TO_INT(user_data);
   if (type==0) {
-    _entryw *cdsw=(_entryw *)g_object_get_data(G_OBJECT(togglebutton),"cdsw");
+    _entryw *cdsw=(_entryw *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(togglebutton),"cdsw");
     prefs->ar_layout=!prefs->ar_layout;
     if (cdsw->warn_checkbutton!=NULL) {
       if (prefs->ar_layout) {
-	lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(cdsw->warn_checkbutton),FALSE);
-	lives_widget_set_sensitive(cdsw->warn_checkbutton,FALSE);
-      }
-      else {
-	lives_widget_set_sensitive(cdsw->warn_checkbutton,TRUE);
+        lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(cdsw->warn_checkbutton),FALSE);
+        lives_widget_set_sensitive(cdsw->warn_checkbutton,FALSE);
+      } else {
+        lives_widget_set_sensitive(cdsw->warn_checkbutton,TRUE);
       }
     }
   }
@@ -740,7 +761,7 @@
 }
 
 
-void on_recent_activate (LiVESMenuItem *menuitem, gpointer user_data) {
+void on_recent_activate(LiVESMenuItem *menuitem, livespointer user_data) {
   char file[PATH_MAX];
   double start=0.;
   int end=0,pno;
@@ -750,7 +771,7 @@
 
   if (mainw->multitrack!=NULL) {
     if (mainw->multitrack->idlefunc>0) {
-      g_source_remove(mainw->multitrack->idlefunc);
+      lives_source_remove(mainw->multitrack->idlefunc);
       mainw->multitrack->idlefunc=0;
     }
     mt_desensitise(mainw->multitrack);
@@ -759,26 +780,26 @@
 
   lives_widget_context_update(); // hide menu popdown
 
-  pref=g_strdup_printf("recent%d",pno);
+  pref=lives_strdup_printf("recent%d",pno);
 
   get_pref(pref,file,PATH_MAX);
 
-  g_free(pref);
+  lives_free(pref);
 
   if (get_token_count(file,'\n')>1) {
-    gchar **array=g_strsplit(file,"\n",2);
-    g_snprintf(file,PATH_MAX,"%s",array[0]);
-    if (mainw->file_open_params!=NULL) g_free (mainw->file_open_params);
-    mainw->file_open_params=g_strdup(array[1]);
-    g_strfreev (array);
+    char **array=lives_strsplit(file,"\n",2);
+    lives_snprintf(file,PATH_MAX,"%s",array[0]);
+    if (mainw->file_open_params!=NULL) lives_free(mainw->file_open_params);
+    mainw->file_open_params=lives_strdup(array[1]);
+    lives_strfreev(array);
   }
 
-  if (get_token_count (file,'|')>2) {
-    gchar **array=g_strsplit(file,"|",3);
-    g_snprintf (file,PATH_MAX,"%s",array[0]);
-    start=g_strtod (array[1],NULL);
-    end=atoi (array[2]);
-    g_strfreev (array);
+  if (get_token_count(file,'|')>2) {
+    char **array=lives_strsplit(file,"|",3);
+    lives_snprintf(file,PATH_MAX,"%s",array[0]);
+    start=lives_strtod(array[1],NULL);
+    end=atoi(array[2]);
+    lives_strfreev(array);
   }
   deduce_file(file,start,end);
 
@@ -793,18 +814,17 @@
 
 
 
-void on_location_select (LiVESButton *button, gpointer user_data) {
-  g_snprintf(file_name,PATH_MAX,"%s",lives_entry_get_text(LIVES_ENTRY(locw->entry)));
+void on_location_select(LiVESButton *button, livespointer user_data) {
+  lives_snprintf(file_name,PATH_MAX,"%s",lives_entry_get_text(LIVES_ENTRY(locw->entry)));
   lives_widget_destroy(locw->dialog);
   lives_widget_context_update();
-  g_free(locw);
+  lives_free(locw);
 
   mainw->opening_loc=TRUE;
-  if (mainw->file_open_params!=NULL) g_free (mainw->file_open_params);
+  if (mainw->file_open_params!=NULL) lives_free(mainw->file_open_params);
   if (prefs->no_bandwidth) {
-    mainw->file_open_params=g_strdup ("nobandwidth");
-  }
-  else mainw->file_open_params=g_strdup ("sendbandwidth");
+    mainw->file_open_params=lives_strdup("nobandwidth");
+  } else mainw->file_open_params=lives_strdup("sendbandwidth");
   mainw->img_concat_clip=-1;
   open_file(file_name);
 
@@ -820,53 +840,50 @@
 
 
 
-void on_utube_select (LiVESButton *button, gpointer user_data) {
-  gchar *fname=ensure_extension(lives_entry_get_text(LIVES_ENTRY(locw->name_entry)),".webm");
-  gchar *url;
-  gchar *dirname;
-  gchar *dfile;
-  gchar *com;
-  gchar *msg;
+void on_utube_select(LiVESButton *button, livespointer user_data) {
+  char *fname=ensure_extension(lives_entry_get_text(LIVES_ENTRY(locw->name_entry)),".webm");
+  char *url;
+  char *dirname;
+  char *dfile;
+  char *com;
   int current_file=mainw->current_file;
 
   if (!strlen(fname)) {
     do_blocking_error_dialog(_("Please enter the name of the file to save the clip as.\n"));
-    g_free(fname);
+    lives_free(fname);
     return;
   }
 
-  url=g_strdup(lives_entry_get_text(LIVES_ENTRY(locw->entry)));
+  url=lives_strdup(lives_entry_get_text(LIVES_ENTRY(locw->entry)));
 
   if (!strlen(url)) {
     do_blocking_error_dialog(_("Please enter a valid URL for the download.\n"));
-    g_free(fname);
-    g_free(url);
+    lives_free(fname);
+    lives_free(url);
     return;
   }
 
-  dirname=g_strdup(lives_entry_get_text(LIVES_ENTRY(locw->dir_entry)));
+  dirname=lives_strdup(lives_entry_get_text(LIVES_ENTRY(locw->dir_entry)));
   ensure_isdir(dirname);
-  g_snprintf(mainw->vid_dl_dir,PATH_MAX,"%s",dirname);
+  lives_snprintf(mainw->vid_dl_dir,PATH_MAX,"%s",dirname);
 
   lives_widget_destroy(locw->dialog);
   lives_widget_context_update();
-  g_free(locw);
+  lives_free(locw);
 
-  dfile=g_build_filename(dirname,fname,NULL);
+  dfile=lives_build_filename(dirname,fname,NULL);
 
   if (!check_file(dfile,TRUE)) {
-    g_free(dirname);
-    g_free(fname);
-    g_free(url);
-    g_free(dfile);
+    lives_free(dirname);
+    lives_free(fname);
+    lives_free(url);
+    lives_free(dfile);
     return;
   }
 
   mainw->error=FALSE;
 
-  msg=g_strdup_printf(_("Downloading %s to %s..."),url,dfile);
-  d_print(msg);
-  g_free(msg);
+  d_print(_("Downloading %s to %s..."),url,dfile);
 
   if (current_file==-1) {
     if (!get_temp_handle(mainw->first_free_file,TRUE)) {
@@ -879,16 +896,16 @@
 
   unlink(cfile->info_file);
 
-  com=g_strdup_printf("%s download_clip \"%s\" \"%s\" \"%s\"",prefs->backend,cfile->handle,url,dfile);
+  com=lives_strdup_printf("%s download_clip \"%s\" \"%s\" \"%s\"",prefs->backend,cfile->handle,url,dfile);
   mainw->com_failed=FALSE;
   lives_system(com,FALSE);
-  g_free(com);
+  lives_free(com);
 
   if (mainw->com_failed) {
     d_print_failed();
     return;
   }
-  
+
   cfile->nopreview=TRUE;
   cfile->keep_without_preview=TRUE;
   cfile->no_proc_sys_errors=TRUE;  ///< do not show processing error dialogs, we will show our own msg
@@ -897,76 +914,76 @@
     cfile->nopreview=FALSE;
     cfile->no_proc_sys_errors=FALSE;
     cfile->keep_without_preview=FALSE;
-    
+
     if (mainw->cancelled==CANCEL_KEEP&&!mainw->error) {
       mainw->cancelled=CANCEL_NONE;
-    }
-    else {
+    } else {
       if (current_file==-1) {
 #ifdef IS_MINGW
-	// kill any active processes: for other OSes the backend does this
-      // get pid from backend
-      FILE *rfile;
-      ssize_t rlen;
-      char val[16];
-      int pid;
-      com=g_strdup_printf("%s get_pid_for_handle \"%s\"",prefs->backend_sync,cfile->handle);
-      rfile=popen(com,"r");
-      rlen=fread(val,1,16,rfile);
-      pclose(rfile);
-      memset(val+rlen,0,1);
-      pid=atoi(val);
-      
-      lives_win32_kill_subprocesses(pid,TRUE);
-#endif
-      // we made a temp file so close it
-      com=g_strdup_printf("%s close \"%s\"",prefs->backend,cfile->handle);
-      lives_system(com,TRUE);
-      g_free(com);
-      g_free(cfile);
-      cfile=NULL;
-      mainw->current_file=-1;
-    }
-      
-    if (mainw->error) {
-      d_print_failed();
-      do_blocking_error_dialog(_("\nLiVES was unable to download the clip.\nPlease check the clip URL and make sure you have \nthe latest youtube-dl installed.\n"));
-      mainw->error=FALSE;
-    }
-    
-    unlink(dfile);
+        // kill any active processes: for other OSes the backend does this
+        // get pid from backend
+        FILE *rfile;
+        ssize_t rlen;
+        char val[16];
+        int pid;
+        com=lives_strdup_printf("%s get_pid_for_handle \"%s\"",prefs->backend_sync,cfile->handle);
+        rfile=popen(com,"r");
+        rlen=fread(val,1,16,rfile);
+        pclose(rfile);
+        memset(val+rlen,0,1);
+        pid=atoi(val);
+
+        lives_win32_kill_subprocesses(pid,TRUE);
+#endif
+        // we made a temp file so close it
+        com=lives_strdup_printf("%s close \"%s\"",prefs->backend,cfile->handle);
+        lives_system(com,TRUE);
+        lives_free(com);
+        lives_free(cfile);
+        cfile=NULL;
+        mainw->current_file=-1;
+      }
 
-    g_free(dirname);
-    g_free(fname);
-    g_free(url);
-    g_free(dfile);
+      if (mainw->error) {
+        d_print_failed();
+        do_blocking_error_dialog(
+          _("\nLiVES was unable to download the clip.\nPlease check the clip URL and make sure you have \nthe latest youtube-dl installed.\n"));
+        mainw->error=FALSE;
+      }
 
-    sensitize();
-    mainw->no_switch_dprint=FALSE;
-    return;
+      unlink(dfile);
+
+      lives_free(dirname);
+      lives_free(fname);
+      lives_free(url);
+      lives_free(dfile);
+
+      sensitize();
+      mainw->no_switch_dprint=FALSE;
+      return;
     }
   }
-  
+
   cfile->nopreview=FALSE;
   cfile->no_proc_sys_errors=FALSE;
   cfile->keep_without_preview=FALSE;
 
   if (current_file==-1) {
-    com=g_strdup_printf("%s close \"%s\"",prefs->backend,cfile->handle);
+    com=lives_strdup_printf("%s close \"%s\"",prefs->backend,cfile->handle);
     lives_system(com,TRUE);
-    g_free(com);
-    g_free(cfile);
+    lives_free(com);
+    lives_free(cfile);
     cfile=NULL;
     mainw->current_file=-1;
   }
 
-  g_free(dirname);
-  g_free(fname);
-  g_free(url);
+  lives_free(dirname);
+  lives_free(fname);
+  lives_free(url);
 
   mainw->no_switch_dprint=FALSE;
   open_file(dfile);
-  g_free(dfile);
+  lives_free(dfile);
 
   if (mainw->multitrack!=NULL) {
     polymorph(mainw->multitrack,POLY_NONE);
@@ -988,9 +1005,9 @@
 
 
 
-void on_stop_clicked (LiVESMenuItem *menuitem, gpointer user_data) {
-// 'enough' button for open, open location, and record audio
-  gchar *com;
+void on_stop_clicked(LiVESMenuItem *menuitem, livespointer user_data) {
+  // 'enough' button for open, open location, and record audio
+  char *com;
 
 #ifdef IS_MINGW
   FILE *rfile;
@@ -1013,20 +1030,20 @@
 #endif
 
 #ifndef IS_MINGW
-  com=g_strdup_printf("%s stopsubsubs \"%s\" 2>/dev/null",prefs->backend_sync,cfile->handle);
+  com=lives_strdup_printf("%s stopsubsubs \"%s\" 2>/dev/null",prefs->backend_sync,cfile->handle);
   lives_system(com,TRUE);
 #else
   // get pid from backend
-  com=g_strdup_printf("%s get_pid_for_handle \"%s\"",prefs->backend_sync,cfile->handle);
+  com=lives_strdup_printf("%s get_pid_for_handle \"%s\"",prefs->backend_sync,cfile->handle);
   rfile=popen(com,"r");
   rlen=fread(val,1,16,rfile);
   pclose(rfile);
   memset(val+rlen,0,1);
   pid=atoi(val);
-  
+
   lives_win32_kill_subprocesses(pid,FALSE);
 #endif
-  g_free(com);
+  lives_free(com);
 
   if (mainw->current_file>-1&&cfile!=NULL&&cfile->proc_ptr!=NULL) {
     lives_widget_set_sensitive(cfile->proc_ptr->stop_button, FALSE);
@@ -1039,28 +1056,28 @@
   // resume to allow return
   if (mainw->effects_paused) {
 #ifndef IS_MINGW
-    com=g_strdup_printf("%s stopsubsub \"%s\" SIGCONT 2>/dev/null",prefs->backend_sync,cfile->handle);
+    com=lives_strdup_printf("%s stopsubsub \"%s\" SIGCONT 2>/dev/null",prefs->backend_sync,cfile->handle);
     lives_system(com,TRUE);
 #else
     FILE *rfile;
     ssize_t rlen;
     char val[16];
-    
+
     // get pid from backend
-    com=g_strdup_printf("%s get_pid_for_handle \"%s\"",prefs->backend_sync,cfile->handle);
+    com=lives_strdup_printf("%s get_pid_for_handle \"%s\"",prefs->backend_sync,cfile->handle);
     rfile=popen(com,"r");
     rlen=fread(val,1,16,rfile);
     pclose(rfile);
     memset(val+rlen,0,1);
     pid=atoi(val);
-    
+
     lives_win32_suspend_resume_process(pid,FALSE);
 #endif
-    g_free(com);
-    
-    com=g_strdup_printf("%s resume \"%s\"",prefs->backend_sync,cfile->handle);
+    lives_free(com);
+
+    com=lives_strdup_printf("%s resume \"%s\"",prefs->backend_sync,cfile->handle);
     lives_system(com,FALSE);
-    g_free(com);
+    lives_free(com);
   }
 
 
@@ -1069,10 +1086,10 @@
 
 
 
-void on_save_as_activate (LiVESMenuItem *menuitem, gpointer user_data) {
+void on_save_as_activate(LiVESMenuItem *menuitem, livespointer user_data) {
 
   if (cfile->frames==0) {
-    on_export_audio_activate (NULL,NULL);
+    on_export_audio_activate(NULL,NULL);
     return;
   }
 
@@ -1080,19 +1097,19 @@
 }
 
 
-void on_save_selection_activate (LiVESMenuItem *menuitem, gpointer user_data) {
+void on_save_selection_activate(LiVESMenuItem *menuitem, livespointer user_data) {
   save_file(mainw->current_file,cfile->start,cfile->end,NULL);
 }
 
 
-void on_close_activate (LiVESMenuItem *menuitem, gpointer user_data) {
-  gchar *warn,*extra;
-  gchar title[256];
+void on_close_activate(LiVESMenuItem *menuitem, livespointer user_data) {
+  char *warn,*extra;
+  char title[256];
   boolean lmap_errors=FALSE,acurrent=FALSE,only_current=FALSE;
 
   if (mainw->multitrack!=NULL) {
     if (mainw->multitrack->idlefunc>0) {
-      g_source_remove(mainw->multitrack->idlefunc);
+      lives_source_remove(mainw->multitrack->idlefunc);
       mainw->multitrack->idlefunc=0;
     }
     mt_desensitise(mainw->multitrack);
@@ -1106,60 +1123,60 @@
     acurrent=used_in_current_layout(mainw->multitrack,mainw->current_file);
     if (acurrent) {
       if (mainw->xlays==NULL) only_current=TRUE;
-      mainw->xlays=g_list_append_unique(mainw->xlays,mainw->string_constants[LIVES_STRING_CONSTANT_CL]);
+      mainw->xlays=lives_list_append_unique(mainw->xlays,mainw->string_constants[LIVES_STRING_CONSTANT_CL]);
     }
 
     if (mainw->xlays!=NULL) {
       get_menu_text(cfile->menuentry,title);
-      if (strlen(title)>128) g_snprintf(title,32,"%s",(_("This file")));
-      if (acurrent) extra=g_strdup(_(",\n - including the current layout - "));
-      else extra=g_strdup("");
-      if (!only_current) warn=g_strdup_printf(_ ("\n%s\nis used in some multitrack layouts%s.\n\nReally close it ?"),
-					      title,extra);
-      else warn=g_strdup_printf(_ ("\n%s\nis used in the current layout.\n\nReally close it ?"),title);
-      g_free(extra);
+      if (strlen(title)>128) lives_snprintf(title,32,"%s",(_("This file")));
+      if (acurrent) extra=lives_strdup(_(",\n - including the current layout - "));
+      else extra=lives_strdup("");
+      if (!only_current) warn=lives_strdup_printf(_("\n%s\nis used in some multitrack layouts%s.\n\nReally close it ?"),
+                                title,extra);
+      else warn=lives_strdup_printf(_("\n%s\nis used in the current layout.\n\nReally close it ?"),title);
+      lives_free(extra);
       if (!do_warning_dialog(warn)) {
-	g_free(warn);
-	if (mainw->xlays!=NULL) {
-	  g_list_free_strings(mainw->xlays);
-	  g_list_free(mainw->xlays);
-	  mainw->xlays=NULL;
-	}
-
-	if (mainw->multitrack!=NULL) {
-	  mainw->current_file=mainw->multitrack->render_file;
-	  mt_sensitise(mainw->multitrack);
-	  mainw->multitrack->idlefunc=mt_idle_add(mainw->multitrack);
-	}
-	return;
+        lives_free(warn);
+        if (mainw->xlays!=NULL) {
+          lives_list_free_strings(mainw->xlays);
+          lives_list_free(mainw->xlays);
+          mainw->xlays=NULL;
+        }
+
+        if (mainw->multitrack!=NULL) {
+          mainw->current_file=mainw->multitrack->render_file;
+          mt_sensitise(mainw->multitrack);
+          mainw->multitrack->idlefunc=mt_idle_add(mainw->multitrack);
+        }
+        return;
       }
-      g_free(warn);
+      lives_free(warn);
       add_lmap_error(LMAP_ERROR_CLOSE_FILE,cfile->name,cfile->layout_map,0,1,0.,acurrent);
       lmap_errors=TRUE;
       if (mainw->xlays!=NULL) {
-	g_list_free_strings(mainw->xlays);
-	g_list_free(mainw->xlays);
-	mainw->xlays=NULL;
+        lives_list_free_strings(mainw->xlays);
+        lives_list_free(mainw->xlays);
+        mainw->xlays=NULL;
       }
     }
   }
   if (!lmap_errors) {
     if (cfile->changed) {
       get_menu_text(cfile->menuentry,title);
-      if (strlen(title)>128) g_snprintf(title,32,"%s",(_("This file")));
-      warn=g_strdup(_ ("Changes made to this clip have not been saved or backed up.\n\nReally close it ?"));
+      if (strlen(title)>128) lives_snprintf(title,32,"%s",(_("This file")));
+      warn=lives_strdup(_("Changes made to this clip have not been saved or backed up.\n\nReally close it ?"));
       if (!do_warning_dialog(warn)) {
-	g_free(warn);
+        lives_free(warn);
 
-	if (mainw->multitrack!=NULL) {
-	  mainw->current_file=mainw->multitrack->render_file;
-	  mt_sensitise(mainw->multitrack);
-	  mainw->multitrack->idlefunc=mt_idle_add(mainw->multitrack);
-	}
+        if (mainw->multitrack!=NULL) {
+          mainw->current_file=mainw->multitrack->render_file;
+          mt_sensitise(mainw->multitrack);
+          mainw->multitrack->idlefunc=mt_idle_add(mainw->multitrack);
+        }
 
-	return;
+        return;
       }
-      g_free(warn);
+      lives_free(warn);
     }
   }
 
@@ -1184,12 +1201,12 @@
   if (lmap_errors&&!only_current&&mainw->cliplist!=NULL) popup_lmap_errors(NULL,NULL);
 
   if (mainw->cliplist==NULL&&strlen(mainw->set_name)>0) {
-    gchar *lfiles;
-    gchar *ofile;
-    gchar *sdir;
-    gchar *cdir;
-    gchar *laydir;
-    gchar *com;
+    char *lfiles;
+    char *ofile;
+    char *sdir;
+    char *cdir;
+    char *laydir;
+    char *com;
 
     boolean has_layout_map=FALSE;
     int i;
@@ -1204,85 +1221,85 @@
 
     if (has_layout_map) {
       if (prompt_remove_layout_files()) {
-	// delete layout files
-	for (i=1;i<MAX_FILES;i++) {
-	  if (!(mainw->files[i]==NULL)) {
-	    if (mainw->was_set&&mainw->files[i]->layout_map!=NULL) {
-	      remove_layout_files(mainw->files[i]->layout_map);
-	    }
-	  }
-	}
+        // delete layout files
+        for (i=1; i<MAX_FILES; i++) {
+          if (!(mainw->files[i]==NULL)) {
+            if (mainw->was_set&&mainw->files[i]->layout_map!=NULL) {
+              remove_layout_files(mainw->files[i]->layout_map);
+            }
+          }
+        }
 
-	// delete layout directory
-	laydir=g_build_filename(prefs->tmpdir,mainw->set_name,"layouts",NULL);
+        // delete layout directory
+        laydir=lives_build_filename(prefs->tmpdir,mainw->set_name,"layouts",NULL);
 #ifndef IS_MINGW
-	com=g_strdup_printf("/bin/rm -r \"%s/\" 2>/dev/null &",laydir);
+        com=lives_strdup_printf("%s -r \"%s/\" 2>/dev/null &",capable->rm_cmd,laydir);
 #else
-	com=g_strdup_printf("START /MIN /b rm.exe -r \"%s/\" 2>NUL",laydir);
+        com=lives_strdup_printf("START /MIN /b rm.exe -r \"%s/\" 2>NUL",laydir);
 #endif
-	lives_system(com,TRUE);
-	g_free(com);
-	g_free(laydir);
+        lives_system(com,TRUE);
+        lives_free(com);
+        lives_free(laydir);
       }
       recover_layout_cancelled(FALSE);
     }
 
-    cdir=g_build_filename(prefs->tmpdir,mainw->set_name,"clips",NULL);
+    cdir=lives_build_filename(prefs->tmpdir,mainw->set_name,"clips",NULL);
 
 
 #ifndef IS_MINGW
-    com=g_strdup_printf("/bin/rmdir \"%s\" 2>/dev/null",cdir);
+    com=lives_strdup_printf("%s \"%s\" 2>/dev/null",capable->rmdir_cmd,cdir);
 #else
-    com=g_strdup_printf("rmdir.exe \"%s\"",cdir);
+    com=lives_strdup_printf("rmdir.exe \"%s\"",cdir);
 #endif
     do {
       // keep trying until backend has deleted the clip
       mainw->com_failed=FALSE;
       lives_system(com,TRUE);
-      if (g_file_test(cdir,G_FILE_TEST_IS_DIR)) {
-	lives_widget_context_update();
-	g_usleep(prefs->sleep_time);
+      if (lives_file_test(cdir,LIVES_FILE_TEST_IS_DIR)) {
+        lives_widget_context_update();
+        lives_usleep(prefs->sleep_time);
       }
-    } while (g_file_test(cdir,G_FILE_TEST_IS_DIR));
+    } while (lives_file_test(cdir,LIVES_FILE_TEST_IS_DIR));
 
     mainw->com_failed=FALSE;
 
-    g_free(com);
-    g_free(cdir);
+    lives_free(com);
+    lives_free(cdir);
 
-    lfiles=g_build_filename(prefs->tmpdir,mainw->set_name,"lock",NULL);
+    lfiles=lives_build_filename(prefs->tmpdir,mainw->set_name,"lock",NULL);
 #ifndef IS_MINGW
-    com=g_strdup_printf("/bin/rm \"%s\"* 2>/dev/null",lfiles);
+    com=lives_strdup_printf("%s \"%s\"* 2>/dev/null",capable->rm_cmd,lfiles);
 #else
-    com=g_strdup_printf("DEL \"%s*\" 2>NUL",lfiles);
+    com=lives_strdup_printf("DEL \"%s*\" 2>NUL",lfiles);
 #endif
     lives_system(com,TRUE);
-    g_free(com);
-    g_free(lfiles);
+    lives_free(com);
+    lives_free(lfiles);
 
-    ofile=g_build_filename(prefs->tmpdir,mainw->set_name,"order",NULL);
+    ofile=lives_build_filename(prefs->tmpdir,mainw->set_name,"order",NULL);
 #ifndef IS_MINGW
-    com=g_strdup_printf("/bin/rm \"%s\" 2>/dev/null",ofile);
+    com=lives_strdup_printf("%s \"%s\" 2>/dev/null",capable->rm_cmd,ofile);
 #else
-    com=g_strdup_printf("rm.exe \"%s\" 2>NUL",ofile);
+    com=lives_strdup_printf("rm.exe \"%s\" 2>NUL",ofile);
 #endif
     lives_system(com,TRUE);
-    g_free(com);
-    g_free(ofile);
+    lives_free(com);
+    lives_free(ofile);
 
 
     lives_sync();
 
 
-    sdir=g_build_filename(prefs->tmpdir,mainw->set_name,NULL);
+    sdir=lives_build_filename(prefs->tmpdir,mainw->set_name,NULL);
 #ifndef IS_MINGW
-    com=g_strdup_printf("/bin/rmdir \"%s/\" 2>/dev/null",sdir);
+    com=lives_strdup_printf("%s \"%s/\" 2>/dev/null",capable->rmdir_cmd,sdir);
 #else
-    com=g_strdup_printf("rmdir.exe \"%s/\" 2>NUL",sdir);
+    com=lives_strdup_printf("rmdir.exe \"%s/\" 2>NUL",sdir);
 #endif
     lives_system(com,TRUE);
-    g_free(com);
-    g_free(sdir);
+    lives_free(com);
+    lives_free(sdir);
 
     if (prefs->ar_clipset&&!strcmp(prefs->ar_clipset_name,mainw->set_name)) {
       prefs->ar_clipset=FALSE;
@@ -1301,31 +1318,28 @@
 }
 
 
-void
-on_import_proj_activate                      (LiVESMenuItem     *menuitem,
-					      gpointer         user_data)
-{
-  gchar *com;
-  gchar *filt[]={"*.lv2",NULL};
-  gchar *proj_file=choose_file(NULL,NULL,filt,LIVES_FILE_CHOOSER_ACTION_OPEN,NULL,NULL);
-  gchar *info_file;
-  gchar *new_set;
+void on_import_proj_activate(LiVESMenuItem *menuitem, livespointer user_data) {
+  char *com;
+  char *filt[]= {"*.lv2",NULL};
+  char *proj_file=choose_file(NULL,NULL,filt,LIVES_FILE_CHOOSER_ACTION_OPEN,NULL,NULL);
+  char *info_file;
+  char *new_set;
   int info_fd;
   ssize_t bytes;
-  gchar *set_dir;
-  gchar *msg;
+  char *set_dir;
+  char *msg;
 
   if (proj_file==NULL) return;
-  info_file=g_strdup_printf("%s/.impname.%d",prefs->tmpdir,capable->mainpid);
+  info_file=lives_strdup_printf("%s/.impname.%d",prefs->tmpdir,capable->mainpid);
   unlink(info_file);
   mainw->com_failed=FALSE;
-  com=g_strdup_printf("%s get_proj_set \"%s\">\"%s\"",prefs->backend_sync,proj_file,info_file);
+  com=lives_strdup_printf("%s get_proj_set \"%s\">\"%s\"",prefs->backend_sync,proj_file,info_file);
   lives_system(com,FALSE);
-  g_free(com);
+  lives_free(com);
 
   if (mainw->com_failed) {
-    g_free(info_file);
-    g_free(proj_file);
+    lives_free(info_file);
+    lives_free(proj_file);
     return;
   }
 
@@ -1334,49 +1348,48 @@
   if (info_fd>=0&&((bytes=read(info_fd,mainw->msg,256))>0)) {
     close(info_fd);
     memset(mainw->msg+bytes,0,1);
-  }
-  else {
+  } else {
     if (info_fd>=0) close(info_fd);
     unlink(info_file);
-    g_free(info_file);
-    g_free(proj_file);
+    lives_free(info_file);
+    lives_free(proj_file);
     do_error_dialog(_("\nInvalid project file.\n"));
     return;
   }
 
   unlink(info_file);
-  g_free(info_file);
+  lives_free(info_file);
 
   if (!is_legal_set_name(mainw->msg,TRUE)) return;
 
-  new_set=g_strdup(mainw->msg);
-  set_dir=g_build_filename(prefs->tmpdir,new_set,NULL);
+  new_set=lives_strdup(mainw->msg);
+  set_dir=lives_build_filename(prefs->tmpdir,new_set,NULL);
 
-  if (g_file_test(set_dir,G_FILE_TEST_IS_DIR)) {
-    msg=g_strdup_printf(_("\nA set called %s already exists.\nIn order to import this project, you must rename or delete the existing set.\nYou can do this by File|Reload Set, and giving the set name\n%s\nthen File|Close/Save all Clips and provide a new set name or discard it.\nOnce you have done this, you will be able to import the new project.\n"),new_set,new_set);
+  if (lives_file_test(set_dir,LIVES_FILE_TEST_IS_DIR)) {
+    msg=lives_strdup_printf(
+          _("\nA set called %s already exists.\nIn order to import this project, you must rename or delete the existing set.\nYou can do this by File|Reload Set, and giving the set name\n%s\nthen File|Close/Save all Clips and provide a new set name or discard it.\nOnce you have done this, you will be able to import the new project.\n"),
+          new_set,new_set);
     do_blocking_error_dialog(msg);
-    g_free(msg);
-    g_free(proj_file);
-    g_free(set_dir);
+    lives_free(msg);
+    lives_free(proj_file);
+    lives_free(set_dir);
     return;
   }
 
-  g_free(set_dir);
+  lives_free(set_dir);
 
-  msg=g_strdup_printf(_("Importing the project %s as set %s..."),proj_file,new_set);
-  d_print(msg);
-  g_free(msg);
+  d_print(_("Importing the project %s as set %s..."),proj_file,new_set);
 
   if (!get_temp_handle(mainw->first_free_file,TRUE)) {
     d_print_failed();
     return;
   }
 
-  com=g_strdup_printf("%s import_project \"%s\" \"%s\"",prefs->backend,cfile->handle,proj_file);
+  com=lives_strdup_printf("%s import_project \"%s\" \"%s\"",prefs->backend,cfile->handle,proj_file);
   mainw->com_failed=FALSE;
   lives_system(com,FALSE);
-  g_free(com);
-  g_free(proj_file);
+  lives_free(com);
+  lives_free(proj_file);
 
   if (mainw->com_failed) {
     d_print_failed();
@@ -1385,60 +1398,56 @@
 
   do_progress_dialog(TRUE,FALSE,_("Importing project"));
 
-  com=g_strdup_printf("%s close \"%s\"",prefs->backend,cfile->handle);
+  com=lives_strdup_printf("%s close \"%s\"",prefs->backend,cfile->handle);
   lives_system(com,TRUE);
-  g_free(com);
-  g_free(cfile);
+  lives_free(com);
+  lives_free(cfile);
   cfile=NULL;
   if (mainw->first_free_file==-1||mainw->first_free_file>mainw->current_file) mainw->first_free_file=mainw->current_file;
   mainw->current_file=-1;
   sensitize();
 
   if (mainw->error) {
-    g_free(new_set);
+    lives_free(new_set);
     d_print_failed();
     return;
   }
 
   d_print_done();
 
-  g_snprintf(mainw->set_name,128,"%s",new_set);
-  on_load_set_ok(NULL,GINT_TO_POINTER(FALSE));
-  g_free(new_set);
+  reload_set(new_set);
+  lives_free(new_set);
 }
 
 
 
-void
-on_export_proj_activate                      (LiVESMenuItem     *menuitem,
-					      gpointer         user_data)
-{
-  gchar *filt[]={"*.lv2",NULL};
-  gchar *def_file;
-  gchar *proj_file;
-  gchar *msg;
-  gchar *com,*tmp;
+void on_export_proj_activate(LiVESMenuItem *menuitem, livespointer user_data) {
+  char *filt[]= {"*.lv2",NULL};
+  char *def_file;
+  char *proj_file;
+  char *com,*tmp;
 
   if (strlen(mainw->set_name)==0) {
     int response;
-    gchar new_set_name[128];
+    char new_set_name[128];
     do {
       // prompt for a set name, advise user to save set
       renamew=create_rename_dialog(5);
       lives_widget_show(renamew->dialog);
       response=lives_dialog_run(LIVES_DIALOG(renamew->dialog));
       if (response==LIVES_RESPONSE_CANCEL) {
-	lives_widget_destroy(renamew->dialog);
-	g_free(renamew);
-	mainw->cancelled=CANCEL_USER;
-	return;
+        lives_widget_destroy(renamew->dialog);
+        lives_free(renamew);
+        mainw->cancelled=CANCEL_USER;
+        return;
       }
-      g_snprintf(new_set_name,128,"%s",lives_entry_get_text (LIVES_ENTRY (renamew->entry)));
+      lives_snprintf(new_set_name,128,"%s",(tmp=U82F(lives_entry_get_text(LIVES_ENTRY(renamew->entry)))));
       lives_widget_destroy(renamew->dialog);
-      g_free(renamew);
+      lives_free(renamew);
+      lives_free(tmp);
       lives_widget_context_update();
     } while (!is_legal_set_name(new_set_name,FALSE));
-    g_snprintf(mainw->set_name,128,"%s",new_set_name);
+    lives_snprintf(mainw->set_name,128,"%s",new_set_name);
   }
 
   if (mainw->stored_event_list!=NULL&&mainw->stored_event_list_changed) {
@@ -1455,44 +1464,42 @@
     if (mainw->multitrack!=NULL&&!mainw->multitrack->changed) recover_layout_cancelled(FALSE);
   }
 
-  def_file=g_strdup_printf("%s.lv2",mainw->set_name);
+  def_file=lives_strdup_printf("%s.lv2",mainw->set_name);
   proj_file=choose_file(NULL,def_file,filt,LIVES_FILE_CHOOSER_ACTION_SAVE,NULL,NULL);
-  g_free(def_file);
+  lives_free(def_file);
 
   if (proj_file==NULL) return;
 
-  unlink((tmp=g_filename_from_utf8(proj_file,-1,NULL,NULL,NULL)));
-  g_free(tmp);
+  unlink((tmp=lives_filename_from_utf8(proj_file,-1,NULL,NULL,NULL)));
+  lives_free(tmp);
 
   if (!check_file(proj_file,FALSE)) {
-    g_free(proj_file);
+    lives_free(proj_file);
     return;
   }
 
-  msg=g_strdup_printf(_("Exporting project %s..."),proj_file);
-  d_print(msg);
-  g_free(msg);
+  d_print(_("Exporting project %s..."),proj_file);
 
-  com=g_strdup_printf("%s export_project \"%s\" \"%s\" \"%s\"",prefs->backend,cfile->handle,mainw->set_name,proj_file);
+  com=lives_strdup_printf("%s export_project \"%s\" \"%s\" \"%s\"",prefs->backend,cfile->handle,mainw->set_name,proj_file);
   mainw->com_failed=FALSE;
   lives_system(com,FALSE);
-  g_free(com);
+  lives_free(com);
 
   if (mainw->com_failed) {
-    g_free(proj_file);
+    lives_free(proj_file);
     d_print_failed();
     return;
   }
 
-  cfile->op_dir=g_filename_from_utf8((tmp=get_dir(proj_file)),-1,NULL,NULL,NULL);
-  g_free(tmp);
+  cfile->op_dir=lives_filename_from_utf8((tmp=get_dir(proj_file)),-1,NULL,NULL,NULL);
+  lives_free(tmp);
 
   do_progress_dialog(TRUE,FALSE,_("Exporting project"));
 
   if (mainw->error) d_print_failed();
   else d_print_done();
 
-  g_free(proj_file);
+  lives_free(proj_file);
 }
 
 
@@ -1500,34 +1507,34 @@
 
 
 
-void on_backup_activate (LiVESMenuItem *menuitem, gpointer user_data) {
-  gchar *filt[]={"*.lv1",NULL};
-  gchar *file_name = choose_file (strlen(mainw->proj_save_dir)?mainw->proj_save_dir:NULL,NULL,filt,
-				  LIVES_FILE_CHOOSER_ACTION_SAVE,_ ("Backup as .lv1 file"),NULL);
+void on_backup_activate(LiVESMenuItem *menuitem, livespointer user_data) {
+  char *filt[]= {"*.lv1",NULL};
+  char *file_name = choose_file(strlen(mainw->proj_save_dir)?mainw->proj_save_dir:NULL,NULL,filt,
+                                LIVES_FILE_CHOOSER_ACTION_SAVE,_("Backup as .lv1 file"),NULL);
 
   if (file_name==NULL) return;
 
   backup_file(mainw->current_file,1,cfile->frames,file_name);
 
-  g_snprintf(mainw->proj_save_dir,PATH_MAX,"%s",file_name);
-  get_dirname (mainw->proj_save_dir);
-  g_free(file_name);
+  lives_snprintf(mainw->proj_save_dir,PATH_MAX,"%s",file_name);
+  get_dirname(mainw->proj_save_dir);
+  lives_free(file_name);
 }
 
 
 
-void on_restore_activate (LiVESMenuItem *menuitem, gpointer user_data) {
-  gchar *filt[]={"*.lv1",NULL};
-  gchar *file_name = choose_file (strlen(mainw->proj_load_dir)?mainw->proj_load_dir:NULL,NULL,filt,
-				  LIVES_FILE_CHOOSER_ACTION_OPEN,_ ("Restore .lv1 file"),NULL);
+void on_restore_activate(LiVESMenuItem *menuitem, livespointer user_data) {
+  char *filt[]= {"*.lv1",NULL};
+  char *file_name = choose_file(strlen(mainw->proj_load_dir)?mainw->proj_load_dir:NULL,NULL,filt,
+                                LIVES_FILE_CHOOSER_ACTION_OPEN,_("Restore .lv1 file"),NULL);
 
   if (file_name==NULL) return;
 
   restore_file(file_name);
 
-  g_snprintf(mainw->proj_load_dir,PATH_MAX,"%s",file_name);
-  get_dirname (mainw->proj_load_dir);
-  g_free(file_name);
+  lives_snprintf(mainw->proj_load_dir,PATH_MAX,"%s",file_name);
+  get_dirname(mainw->proj_load_dir);
+  lives_free(file_name);
 }
 
 
@@ -1541,21 +1548,21 @@
 
   if (mainw->current_file>-1&&cfile->achans>0) {
     delete_audio_tracks(mainw->multitrack,mainw->multitrack->audio_draws,FALSE);
-    if (mainw->multitrack->audio_vols!=NULL) g_list_free(mainw->multitrack->audio_vols);
+    if (mainw->multitrack->audio_vols!=NULL) lives_list_free(mainw->multitrack->audio_vols);
   }
-  
+
   if (mainw->multitrack->video_draws!=NULL) {
-    for (i=0;i<mainw->multitrack->num_video_tracks;i++) {
+    for (i=0; i<mainw->multitrack->num_video_tracks; i++) {
       delete_video_track(mainw->multitrack,i,FALSE);
     }
-    g_list_free (mainw->multitrack->video_draws);
+    lives_list_free(mainw->multitrack->video_draws);
   }
-  
+
   lives_object_unref(mainw->multitrack->clip_scroll);
   lives_object_unref(mainw->multitrack->in_out_box);
-  
-  g_list_free(mainw->multitrack->tl_marks);
-  
+
+  lives_list_free(mainw->multitrack->tl_marks);
+
   if (mainw->multitrack->event_list!=NULL) event_list_free(mainw->multitrack->event_list);
   mainw->multitrack->event_list=NULL;
 
@@ -1569,15 +1576,15 @@
 
 
 
-void on_quit_activate (LiVESMenuItem *menuitem, gpointer user_data) {
-  gchar *com,*esave_dir,*msg;
+void on_quit_activate(LiVESMenuItem *menuitem, livespointer user_data) {
+  char *com,*esave_dir,*msg,*tmp;
 
   boolean has_layout_map=FALSE;
   boolean had_clips=FALSE,legal_set_name;
 
   register int i;
 
-  if (user_data!=NULL&&GPOINTER_TO_INT(user_data)==1) mainw->only_close=TRUE;
+  if (user_data!=NULL&&LIVES_POINTER_TO_INT(user_data)==1) mainw->only_close=TRUE;
   else mainw->only_close=FALSE;
 
   // stop if playing
@@ -1588,7 +1595,7 @@
 
   if (mainw->multitrack!=NULL) {
     if (mainw->multitrack->idlefunc>0) {
-      g_source_remove(mainw->multitrack->idlefunc);
+      lives_source_remove(mainw->multitrack->idlefunc);
       mainw->multitrack->idlefunc=0;
     }
     mt_desensitise(mainw->multitrack);
@@ -1597,22 +1604,21 @@
   if (mainw->multitrack!=NULL&&mainw->multitrack->event_list!=NULL) {
     if (mainw->only_close) {
       if (!check_for_layout_del(mainw->multitrack,FALSE)) {
-	if (mainw->multitrack!=NULL) {
-	  mt_sensitise(mainw->multitrack);
-	  mainw->multitrack->idlefunc=mt_idle_add(mainw->multitrack);
-	}
-	return;
+        if (mainw->multitrack!=NULL) {
+          mt_sensitise(mainw->multitrack);
+          mainw->multitrack->idlefunc=mt_idle_add(mainw->multitrack);
+        }
+        return;
       }
     }
   }
 
   if (mainw->stored_event_list!=NULL&&mainw->stored_event_list_changed) {
     if (!check_for_layout_del(NULL,FALSE)) return;
-  }
-  else if (mainw->stored_layout_undos!=NULL) {
+  } else if (mainw->stored_layout_undos!=NULL) {
     stored_event_list_free_undos();
   }
-  
+
   // do not popup layout errors if the set name changes
   if (!mainw->only_close) mainw->is_exiting=TRUE;
 
@@ -1620,7 +1626,7 @@
   if (mainw->ascrap_file>-1) close_ascrap_file();
 
   if (mainw->clips_available>0) {
-    gchar *set_name;
+    char *set_name;
     _entryw *cdsw=create_cds_dialog(1);
     int resp;
     had_clips=TRUE;
@@ -1628,62 +1634,63 @@
       legal_set_name=TRUE;
       lives_widget_show(cdsw->dialog);
       resp=lives_dialog_run(LIVES_DIALOG(cdsw->dialog));
-      if (resp==0) {
-	lives_widget_destroy(cdsw->dialog);
-	g_free(cdsw);
-	if (mainw->multitrack!=NULL) {
-	  mt_sensitise(mainw->multitrack);
-	  mainw->multitrack->idlefunc=mt_idle_add(mainw->multitrack);
-	}
-	return;
+      if (resp==LIVES_RESPONSE_CANCEL) {
+        lives_widget_destroy(cdsw->dialog);
+        lives_free(cdsw);
+        if (mainw->multitrack!=NULL) {
+          mt_sensitise(mainw->multitrack);
+          mainw->multitrack->idlefunc=mt_idle_add(mainw->multitrack);
+        }
+        return;
       }
       if (resp==2) {
-	// save set
-	if ((legal_set_name=is_legal_set_name((set_name=g_strdup(lives_entry_get_text(LIVES_ENTRY(cdsw->entry)))),TRUE))) {
-	  lives_widget_destroy(cdsw->dialog);
-	  g_free(cdsw);
-
-	  if (prefs->ar_clipset) set_pref("ar_clipset",set_name);
-	  else set_pref("ar_clipset","");
-	  mainw->no_exit=FALSE;
-	  mainw->leave_recovery=FALSE;
-	  on_save_set_activate(NULL,set_name);
-
-	  if (mainw->multitrack!=NULL) {
-	    mt_sensitise(mainw->multitrack);
-	    mainw->multitrack->idlefunc=mt_idle_add(mainw->multitrack);
-	  }
-	  g_free(set_name);
-	  return;
-	}
-	legal_set_name=FALSE;
-	lives_widget_hide(cdsw->dialog);
-	g_free(set_name);
+        // save set
+        if ((legal_set_name=is_legal_set_name((set_name=U82F(lives_entry_get_text(LIVES_ENTRY(cdsw->entry)))),TRUE))) {
+          lives_widget_destroy(cdsw->dialog);
+          lives_free(cdsw);
+
+          if (prefs->ar_clipset) set_pref("ar_clipset",set_name);
+          else set_pref("ar_clipset","");
+          mainw->no_exit=FALSE;
+          mainw->leave_recovery=FALSE;
+          on_save_set_activate(NULL,(tmp=U82F(set_name)));
+          lives_free(tmp);
+
+          if (mainw->multitrack!=NULL) {
+            mt_sensitise(mainw->multitrack);
+            mainw->multitrack->idlefunc=mt_idle_add(mainw->multitrack);
+          }
+          lives_free(set_name);
+          return;
+        }
+        legal_set_name=FALSE;
+        lives_widget_hide(cdsw->dialog);
+        lives_free(set_name);
       }
       if (mainw->was_set&&legal_set_name) {
-	if (!do_warning_dialog(_("\n\nSet will be deleted from the disk.\nAre you sure ?\n"))) {
-	  resp=2;
-	}
+        if (!do_warning_dialog(_("\n\nSet will be deleted from the disk.\nAre you sure ?\n"))) {
+          resp=2;
+        }
       }
     } while (resp==2);
 
     // discard clipset
 
     lives_widget_destroy(cdsw->dialog);
-    g_free(cdsw);
+    lives_free(cdsw);
 
     set_pref("ar_clipset","");
     prefs->ar_clipset=FALSE;
-  
+
     if (mainw->multitrack!=NULL) {
       event_list_free_undos(mainw->multitrack);
-      
+
       if (mainw->multitrack->event_list!=NULL) {
-	event_list_free(mainw->multitrack->event_list);
-	mainw->multitrack->event_list=NULL;
+        event_list_free(mainw->multitrack->event_list);
+        mainw->multitrack->event_list=NULL;
       }
     }
-  
+
     // check for layout maps
     if (mainw->current_layouts_map!=NULL) {
       has_layout_map=TRUE;
@@ -1691,24 +1698,24 @@
 
     if (has_layout_map) {
       if (prompt_remove_layout_files()) {
-	// delete layout files
-	for (i=1;i<MAX_FILES;i++) {
-	  if (!(mainw->files[i]==NULL)) {
-	    if (mainw->was_set&&mainw->files[i]->layout_map!=NULL) {
-	      remove_layout_files(mainw->files[i]->layout_map);
-	    }
-	  }
-	}
-	// delete layout directory
-	esave_dir=g_build_filename(prefs->tmpdir,mainw->set_name,"layouts",NULL);
+        // delete layout files
+        for (i=1; i<MAX_FILES; i++) {
+          if (!(mainw->files[i]==NULL)) {
+            if (mainw->was_set&&mainw->files[i]->layout_map!=NULL) {
+              remove_layout_files(mainw->files[i]->layout_map);
+            }
+          }
+        }
+        // delete layout directory
+        esave_dir=lives_build_filename(prefs->tmpdir,mainw->set_name,"layouts",NULL);
 #ifndef IS_MINGW
-	com=g_strdup_printf("/bin/rm -r \"%s/\" 2>/dev/null &",esave_dir);
+        com=lives_strdup_printf("%s -r \"%s/\" 2>/dev/null &",capable->rm_cmd,esave_dir);
 #else
-	com=g_strdup_printf("START /MIN /b rm.exe -r \"%s/\" 2>NUL",esave_dir);
+        com=lives_strdup_printf("START /MIN /b rm.exe -r \"%s/\" 2>NUL",esave_dir);
 #endif
-	lives_system(com,TRUE);
-	g_free(com);
-	g_free(esave_dir);
+        lives_system(com,TRUE);
+        lives_free(com);
+        lives_free(esave_dir);
       }
     }
   }
@@ -1722,23 +1729,21 @@
 
   if (had_clips) {
     if (strlen(mainw->set_name))
-      msg=g_strdup_printf(_("Deleting set %s..."),mainw->set_name);
+      msg=lives_strdup_printf(_("Deleting set %s..."),mainw->set_name);
     else
-      msg=g_strdup_printf(_("Deleting set..."),mainw->set_name);
+      msg=lives_strdup_printf(_("Deleting set..."),mainw->set_name);
     d_print(msg);
-    g_free(msg);
+    lives_free(msg);
 
     do_threaded_dialog(_("Deleting set"),FALSE);
   }
 
   prefs->crash_recovery=FALSE;
-  lives_exit();
+  lives_exit(0);
   prefs->crash_recovery=TRUE;
 
   if (strlen(mainw->set_name)>0) {
-    msg=g_strdup_printf(_("Set %s was permanently deleted from the disk.\n"),mainw->set_name);
-    d_print(msg);
-    g_free(msg);
+    d_print(_("Set %s was permanently deleted from the disk.\n"),mainw->set_name);
     memset(mainw->set_name,0,1);
   }
 
@@ -1748,9 +1753,9 @@
 
 
 // TODO - split into undo.c
-void on_undo_activate (LiVESMenuItem *menuitem, gpointer user_data) {
-  gchar *com;
-  gchar msg[256];
+void on_undo_activate(LiVESMenuItem *menuitem, livespointer user_data) {
+  char *com;
+  char msg[256];
 
   boolean bad_header=FALSE;
   boolean retvalb;
@@ -1761,8 +1766,8 @@
   int switch_file=current_file;
   int asigned,aendian;
 
-  lives_widget_set_sensitive (mainw->undo, FALSE);
-  lives_widget_set_sensitive (mainw->redo, TRUE);
+  lives_widget_set_sensitive(mainw->undo, FALSE);
+  lives_widget_set_sensitive(mainw->redo, TRUE);
   cfile->undoable=FALSE;
   cfile->redoable=TRUE;
   lives_widget_hide(mainw->undo);
@@ -1773,10 +1778,10 @@
   d_print("");
 
   if (menuitem!=NULL) {
-    get_menu_text (mainw->undo,msg);
+    get_menu_text(mainw->undo,msg);
     mainw->no_switch_dprint=TRUE;
     d_print(msg);
-    d_print ("...");
+    d_print("...");
     mainw->no_switch_dprint=FALSE;
   }
 
@@ -1804,35 +1809,34 @@
 
     if (cfile->undo_action==UNDO_DELETE_AUDIO) {
       if (cfile->undo1_dbl==cfile->undo2_dbl&&cfile->undo1_dbl==0.) {
-	// undo delete_all_audio
-	reset_achans=cfile->undo_achans;
-	com=g_strdup_printf("%s undo_audio \"%s\"",prefs->backend_sync,cfile->handle);
+        // undo delete_all_audio
+        reset_achans=cfile->undo_achans;
+        com=lives_strdup_printf("%s undo_audio \"%s\"",prefs->backend_sync,cfile->handle);
       }
       // undo delete selected audio
       // (set with with_audio==2 [audio only],therfore start,end,where are in secs.; times==-1)
-      else com=g_strdup_printf("%s insert \"%s\" \"%s\" %.8f 0. %.8f \"%s\" 2 0 0 0 0 %d %d %d %d %d -1",
-			       prefs->backend,
-			       cfile->handle,get_image_ext_for_type(cfile->img_type),cfile->undo1_dbl,
-			       cfile->undo2_dbl-cfile->undo1_dbl, cfile->handle, cfile->arps, cfile->achans, 
-			       cfile->asampsize,!(cfile->signed_endian&AFORM_UNSIGNED),
-			       !(cfile->signed_endian&AFORM_BIG_ENDIAN));
-    }
-    else {
+      else com=lives_strdup_printf("%s insert \"%s\" \"%s\" %.8f 0. %.8f \"%s\" 2 0 0 0 0 %d %d %d %d %d -1",
+                                     prefs->backend,
+                                     cfile->handle,get_image_ext_for_type(cfile->img_type),cfile->undo1_dbl,
+                                     cfile->undo2_dbl-cfile->undo1_dbl, cfile->handle, cfile->arps, cfile->achans,
+                                     cfile->asampsize,!(cfile->signed_endian&AFORM_UNSIGNED),
+                                     !(cfile->signed_endian&AFORM_BIG_ENDIAN));
+    } else {
       // undo cut or delete (times to insert is -1)
       // start,end, where are in frames
       cfile->undo1_boolean&=mainw->ccpd_with_sound;
-      com=g_strdup_printf("%s insert \"%s\" \"%s\" %d %d %d \"%s\" %d %d 0 0 %.3f %d %d %d %d %d -1",
-			  prefs->backend,cfile->handle,
-			  get_image_ext_for_type(cfile->img_type),cfile->undo_start-1,cfile->undo_start,
-			  cfile->undo_end,cfile->handle, cfile->undo1_boolean, cfile->frames, cfile->fps, 
-			  cfile->arps, cfile->achans, cfile->asampsize, !(cfile->signed_endian&AFORM_UNSIGNED),
-			  !(cfile->signed_endian&AFORM_BIG_ENDIAN));
+      com=lives_strdup_printf("%s insert \"%s\" \"%s\" %d %d %d \"%s\" %d %d 0 0 %.3f %d %d %d %d %d -1",
+                              prefs->backend,cfile->handle,
+                              get_image_ext_for_type(cfile->img_type),cfile->undo_start-1,cfile->undo_start,
+                              cfile->undo_end,cfile->handle, cfile->undo1_boolean, cfile->frames, cfile->fps,
+                              cfile->arps, cfile->achans, cfile->asampsize, !(cfile->signed_endian&AFORM_UNSIGNED),
+                              !(cfile->signed_endian&AFORM_BIG_ENDIAN));
 
     }
 
     mainw->com_failed=FALSE;
     lives_system(com,FALSE);
-    g_free(com);
+    lives_free(com);
 
     if (mainw->com_failed) return;
 
@@ -1849,25 +1853,25 @@
     if (cfile->undo_action!=UNDO_DELETE_AUDIO) {
       cfile->insert_start=cfile->undo_start;
       cfile->insert_end=cfile->undo_end;
-      
+
       if (cfile->start>=cfile->undo_start) {
-	cfile->start+=cfile->undo_end-cfile->undo_start+1;
+        cfile->start+=cfile->undo_end-cfile->undo_start+1;
       }
       if (cfile->end>=cfile->undo_start) {
-	cfile->end+=cfile->undo_end-cfile->undo_start+1;
+        cfile->end+=cfile->undo_end-cfile->undo_start+1;
       }
-      
+
       cfile->frames+=cfile->undo_end-cfile->undo_start+1;
       if (cfile->frames>0) {
-	if (cfile->start==0) {
-	  cfile->start=1;
-	}
-	if (cfile->end==0) {
-	  cfile->end=cfile->frames;
-	}
+        if (cfile->start==0) {
+          cfile->start=1;
+        }
+        if (cfile->end==0) {
+          cfile->end=cfile->frames;
+        }
       }
       if (cfile->frame_index_back!=NULL) {
-	restore_frame_index_back(mainw->current_file);
+        restore_frame_index_back(mainw->current_file);
       }
       save_clip_value(mainw->current_file,CLIP_DETAILS_FRAMES,&cfile->frames);
       if (mainw->com_failed||mainw->write_failed) bad_header=TRUE;
@@ -1890,7 +1894,7 @@
       if (mainw->com_failed||mainw->write_failed) bad_header=TRUE;
     }
 
-    reget_afilesize (mainw->current_file);
+    reget_afilesize(mainw->current_file);
     get_play_times();
 
     if (bad_header) do_header_write_error(mainw->current_file);
@@ -1900,48 +1904,48 @@
 
   if (cfile->undo_action==UNDO_RESIZABLE||cfile->undo_action==UNDO_RENDER||cfile->undo_action==UNDO_EFFECT||
       cfile->undo_action==UNDO_MERGE||(cfile->undo_action==UNDO_ATOMIC_RESAMPLE_RESIZE&&
-				       (cfile->frames!=cfile->old_frames||cfile->hsize!=cfile->ohsize||
-					cfile->vsize!=cfile->ovsize||cfile->fps!=cfile->undo1_dbl))) {
-    gchar *audfile;
+                                       (cfile->frames!=cfile->old_frames||cfile->hsize!=cfile->ohsize||
+                                        cfile->vsize!=cfile->ovsize||cfile->fps!=cfile->undo1_dbl))) {
+    char *audfile;
 
-    com=g_strdup_printf("%s undo \"%s\" %d %d \"%s\"",prefs->backend,cfile->handle,cfile->undo_start,cfile->undo_end,
-			get_image_ext_for_type(cfile->img_type));
+    com=lives_strdup_printf("%s undo \"%s\" %d %d \"%s\"",prefs->backend,cfile->handle,cfile->undo_start,cfile->undo_end,
+                            get_image_ext_for_type(cfile->img_type));
     unlink(cfile->info_file);
     mainw->com_failed=FALSE;
     lives_system(com,FALSE);
-    g_free(com);
+    lives_free(com);
 
     if (mainw->com_failed) return;
-    
+
     mainw->com_failed=FALSE;
     mainw->cancelled=CANCEL_NONE;
     mainw->error=FALSE;
-    
+
     // show a progress dialog, not cancellable
     cfile->progress_start=cfile->undo_start;
     cfile->progress_end=cfile->undo_end;
-    do_progress_dialog(TRUE,FALSE,_ ("Undoing"));
+    do_progress_dialog(TRUE,FALSE,_("Undoing"));
 
     if (cfile->undo_action!=UNDO_ATOMIC_RESAMPLE_RESIZE) {
-      audfile=g_strdup_printf("%s/%s/audio.bak",prefs->tmpdir,cfile->handle);
-      if (g_file_test (audfile, G_FILE_TEST_EXISTS)) {
-	// restore overwritten audio
-	com=g_strdup_printf("%s undo_audio \"%s\"",prefs->backend_sync,cfile->handle);
-	mainw->com_failed=FALSE;
-	unlink (cfile->info_file);
-	lives_system(com,FALSE);
-	g_free(com);
-	if (mainw->com_failed) return;
-
-	retvalb=do_auto_dialog(_("Restoring audio..."),0);
-	if (!retvalb) {
-	  d_print_failed();
-	  //cfile->may_be_damaged=TRUE;
-	  return;
-	}
-	reget_afilesize(mainw->current_file);
+      audfile=lives_strdup_printf("%s/%s/audio.bak",prefs->tmpdir,cfile->handle);
+      if (lives_file_test(audfile, LIVES_FILE_TEST_EXISTS)) {
+        // restore overwritten audio
+        com=lives_strdup_printf("%s undo_audio \"%s\"",prefs->backend_sync,cfile->handle);
+        mainw->com_failed=FALSE;
+        unlink(cfile->info_file);
+        lives_system(com,FALSE);
+        lives_free(com);
+        if (mainw->com_failed) return;
+
+        retvalb=do_auto_dialog(_("Restoring audio..."),0);
+        if (!retvalb) {
+          d_print_failed();
+          //cfile->may_be_damaged=TRUE;
+          return;
+        }
+        reget_afilesize(mainw->current_file);
       }
-      g_free(audfile);
+      lives_free(audfile);
     }
 
     if (cfile->frame_index_back!=NULL) {
@@ -1949,27 +1953,26 @@
       cfile->clip_type=CLIP_TYPE_FILE;
       cfile->frame_index=cfile->frame_index_back;
       if (cfile->undo_action==UNDO_RENDER) {
-	do_threaded_dialog(_("Clearing frame images"),FALSE);
-	clean_images_from_virtual(cfile,cfile->undo_end);
-	save_frame_index(mainw->current_file);
-	cfile->frame_index_back=NULL;
-	end_threaded_dialog();
-      }
-      else {
-	save_frame_index(mainw->current_file);
-	cfile->frame_index_back=tmpindex;
+        do_threaded_dialog(_("Clearing frame images"),FALSE);
+        clean_images_from_virtual(cfile,cfile->undo_end);
+        save_frame_index(mainw->current_file);
+        cfile->frame_index_back=NULL;
+        end_threaded_dialog();
+      } else {
+        save_frame_index(mainw->current_file);
+        cfile->frame_index_back=tmpindex;
       }
     }
   }
 
   if (cfile->undo_action==UNDO_ATOMIC_RESAMPLE_RESIZE&&(cfile->frames!=cfile->old_frames||
-							cfile->hsize!=cfile->ohsize||cfile->vsize!=cfile->ovsize)) {
+      cfile->hsize!=cfile->ohsize||cfile->vsize!=cfile->ovsize)) {
 
     if (cfile->frames>cfile->old_frames) {
-      com=g_strdup_printf("%s cut \"%s\" %d %d %d %d \"%s\" %.3f %d %d %d",
-			  prefs->backend,cfile->handle,cfile->old_frames+1, 
-			  cfile->frames, FALSE, cfile->frames, get_image_ext_for_type(cfile->img_type), 
-			  cfile->fps, cfile->arate, cfile->achans, cfile->asampsize);
+      com=lives_strdup_printf("%s cut \"%s\" %d %d %d %d \"%s\" %.3f %d %d %d",
+                              prefs->backend,cfile->handle,cfile->old_frames+1,
+                              cfile->frames, FALSE, cfile->frames, get_image_ext_for_type(cfile->img_type),
+                              cfile->fps, cfile->arate, cfile->achans, cfile->asampsize);
 
       cfile->progress_start=cfile->old_frames+1;
       cfile->progress_end=cfile->frames;
@@ -1977,15 +1980,15 @@
       unlink(cfile->info_file);
       mainw->com_failed=FALSE;
       lives_system(com,FALSE);
-      g_free(com);
+      lives_free(com);
 
       if (mainw->com_failed) return;
 
       // show a progress dialog, not cancellable
-      do_progress_dialog(TRUE,FALSE,_ ("Deleting excess frames"));
-      
+      do_progress_dialog(TRUE,FALSE,_("Deleting excess frames"));
+
       if (cfile->clip_type==CLIP_TYPE_FILE) {
-	delete_frames_from_virtual (mainw->current_file, cfile->old_frames+1, cfile->frames);
+        delete_frames_from_virtual(mainw->current_file, cfile->old_frames+1, cfile->frames);
       }
     }
 
@@ -2020,38 +2023,38 @@
     boolean ccpd_with_sound=mainw->ccpd_with_sound;
     if (!(cfile->undo_action==UNDO_MERGE&&cfile->insert_start==cfile->undo_start&&cfile->insert_end==cfile->undo_end)) {
       if (cfile->undo_action==UNDO_MERGE) {
-	if (cfile->insert_start==cfile->undo_start) {
-	  cfile->insert_start=cfile->undo_end+1;
-	}
-	if (cfile->insert_end==cfile->undo_end) {
-	  cfile->insert_end=cfile->undo_start-1;
-	}
+        if (cfile->insert_start==cfile->undo_start) {
+          cfile->insert_start=cfile->undo_end+1;
+        }
+        if (cfile->insert_end==cfile->undo_end) {
+          cfile->insert_end=cfile->undo_start-1;
+        }
       }
       cfile->start=cfile->insert_start;
       cfile->end=cfile->insert_end;
 
       if (cfile->undo_action==UNDO_INSERT_WITH_AUDIO) mainw->ccpd_with_sound=TRUE;
       else mainw->ccpd_with_sound=FALSE;
-      on_delete_activate (NULL,NULL);
+      on_delete_activate(NULL,NULL);
 
       cfile->start=ostart;
       if (ostart>=cfile->insert_start) {
-	cfile->start-=cfile->insert_end-cfile->insert_start+1;
-	if (cfile->start<cfile->insert_start-1) {
-	  cfile->start=cfile->insert_start-1;
-	}
+        cfile->start-=cfile->insert_end-cfile->insert_start+1;
+        if (cfile->start<cfile->insert_start-1) {
+          cfile->start=cfile->insert_start-1;
+        }
       }
       cfile->end=oend;
       if (oend>=cfile->insert_start) {
-	cfile->end-=cfile->insert_end-cfile->insert_start+1;
-	if (cfile->end<cfile->insert_start-1) {
-	  cfile->end=cfile->insert_start-1;
-	}
+        cfile->end-=cfile->insert_end-cfile->insert_start+1;
+        if (cfile->end<cfile->insert_start-1) {
+          cfile->end=cfile->insert_start-1;
+        }
       }
       // TODO - use lives_clip_start macro
       if (cfile->start<1) cfile->start=cfile->frames>0?1:0;
       if (cfile->end<1) cfile->end=cfile->frames>0?1:0;
-      
+
       cfile->insert_start=cfile->insert_end=0;
     }
     mainw->ccpd_with_sound=ccpd_with_sound;
@@ -2067,17 +2070,17 @@
     mainw->fx4_val=cfile->signed_endian;
     mainw->fx5_val=cfile->arps;
   }
-  
+
   if (cfile->undo_action==UNDO_AUDIO_RESAMPLE||cfile->undo_action==UNDO_REC_AUDIO||cfile->undo_action==UNDO_FADE_AUDIO||
       cfile->undo_action==UNDO_TRIM_AUDIO||cfile->undo_action==UNDO_APPEND_AUDIO||
       (cfile->undo_action==UNDO_ATOMIC_RESAMPLE_RESIZE&&cfile->arate!=cfile->undo1_int)) {
     unlink(cfile->info_file);
-    com=g_strdup_printf("%s undo_audio \"%s\"",prefs->backend_sync,cfile->handle);
+    com=lives_strdup_printf("%s undo_audio \"%s\"",prefs->backend_sync,cfile->handle);
     mainw->com_failed=FALSE;
     mainw->cancelled=CANCEL_NONE;
     mainw->error=FALSE;
-    lives_system (com,FALSE);
-    g_free (com);
+    lives_system(com,FALSE);
+    lives_free(com);
 
     if (mainw->com_failed) {
       d_print_failed();
@@ -2091,7 +2094,7 @@
   }
 
   if ((cfile->undo_action==UNDO_AUDIO_RESAMPLE)||(cfile->undo_action==UNDO_ATOMIC_RESAMPLE_RESIZE&&
-						  cfile->arate!=cfile->undo1_int)) {
+      cfile->arate!=cfile->undo1_int)) {
 
     cfile->arate+=cfile->undo1_int;
     cfile->undo1_int=cfile->arate-cfile->undo1_int;
@@ -2131,13 +2134,13 @@
 
     if (bad_header) do_header_write_error(mainw->current_file);
   }
-    
+
   if (cfile->undo_action==UNDO_NEW_AUDIO) {
     unlink(cfile->info_file);
-    com=g_strdup_printf("%s undo_audio \"%s\"",prefs->backend_sync,cfile->handle);
+    com=lives_strdup_printf("%s undo_audio \"%s\"",prefs->backend_sync,cfile->handle);
     mainw->com_failed=FALSE;
     lives_system(com,FALSE);
-    g_free(com);
+    lives_free(com);
 
     if (mainw->com_failed) return;
 
@@ -2154,12 +2157,12 @@
     cfile->arps=cfile->undo_arps;
     cfile->asampsize=cfile->undo_asampsize;
     cfile->signed_endian=cfile->undo_signed_endian;
-    
+
     reget_afilesize(mainw->current_file);
-    
+
     asigned=!(cfile->signed_endian&AFORM_UNSIGNED);
     aendian=cfile->signed_endian&AFORM_BIG_ENDIAN;
-    
+
     save_clip_value(mainw->current_file,CLIP_DETAILS_ARATE,&cfile->arps);
     if (mainw->com_failed||mainw->write_failed) bad_header=TRUE;
     save_clip_value(mainw->current_file,CLIP_DETAILS_PB_ARATE,&cfile->arate);
@@ -2172,7 +2175,7 @@
     if (mainw->com_failed||mainw->write_failed) bad_header=TRUE;
     save_clip_value(mainw->current_file,CLIP_DETAILS_ASIGNED,&asigned);
     if (mainw->com_failed||mainw->write_failed) bad_header=TRUE;
-    
+
     if (bad_header) do_header_write_error(mainw->current_file);
   }
 
@@ -2208,8 +2211,8 @@
 
   if (cfile->undo_action==UNDO_RESAMPLE) {
     cfile->start=(int)((cfile->start-1)/cfile->fps*cfile->undo1_dbl+1.);
-    if ((cfile->end=(int) (cfile->end/cfile->fps*cfile->undo1_dbl+.49999))<1) cfile->end=1;
-    cfile->fps+=cfile->undo1_dbl; 
+    if ((cfile->end=(int)(cfile->end/cfile->fps*cfile->undo1_dbl+.49999))<1) cfile->end=1;
+    cfile->fps+=cfile->undo1_dbl;
     cfile->undo1_dbl=cfile->fps-cfile->undo1_dbl;
     cfile->fps-=cfile->undo1_dbl;
 
@@ -2226,14 +2229,13 @@
     if (bad_header) do_header_write_error(mainw->current_file);
 
     if (mainw->current_file>0) {
-      com=g_strdup_printf(_ ("Length of video is now %d frames at %.3f frames per second.\n"),cfile->frames,cfile->fps);
-    }
-    else {
+      com=lives_strdup_printf(_("Length of video is now %d frames at %.3f frames per second.\n"),cfile->frames,cfile->fps);
+    } else {
       mainw->no_switch_dprint=TRUE;
-      com=g_strdup_printf(_ ("Clipboard was resampled to %d frames.\n"),cfile->frames);
+      com=lives_strdup_printf(_("Clipboard was resampled to %d frames.\n"),cfile->frames);
     }
     d_print(com);
-    g_free(com);
+    lives_free(com);
     mainw->no_switch_dprint=FALSE;
   }
 
@@ -2259,13 +2261,13 @@
     if (bad_header) do_header_write_error(mainw->current_file);
 
   }
-  
+
   if (current_file>0) {
     switch_to_file((mainw->current_file=switch_file),current_file);
   }
 
   if (cfile->undo_action==UNDO_RENDER) {
-    if (mainw->event_list!=NULL) event_list_free (mainw->event_list);
+    if (mainw->event_list!=NULL) event_list_free(mainw->event_list);
     mainw->event_list=cfile->event_list_back;
     cfile->event_list_back=NULL;
     deal_with_render_choice(FALSE);
@@ -2274,9 +2276,9 @@
 
 }
 
-void on_redo_activate (LiVESMenuItem *menuitem, gpointer user_data) {
-  gchar msg[256];
-  gchar *com;
+void on_redo_activate(LiVESMenuItem *menuitem, livespointer user_data) {
+  char msg[256];
+  char *com;
 
   int ostart=cfile->start;
   int oend=cfile->end;
@@ -2294,15 +2296,15 @@
   d_print("");
 
   if (menuitem!=NULL) {
-    get_menu_text (mainw->redo,msg);
+    get_menu_text(mainw->redo,msg);
     mainw->no_switch_dprint=TRUE;
     d_print(msg);
-    d_print ("...");
+    d_print("...");
     mainw->no_switch_dprint=FALSE;
   }
 
   if (cfile->undo_action==UNDO_INSERT_SILENCE) {
-    on_ins_silence_activate (NULL,NULL);
+    on_ins_silence_activate(NULL,NULL);
     mainw->osc_block=FALSE;
     mainw->no_switch_dprint=TRUE;
     d_print_done();
@@ -2311,18 +2313,18 @@
     return;
   }
   if (cfile->undo_action==UNDO_CHANGE_SPEED) {
-    on_change_speed_ok_clicked (NULL,NULL);
+    on_change_speed_ok_clicked(NULL,NULL);
     mainw->osc_block=FALSE;
     d_print_done();
     return;
   }
   if (cfile->undo_action==UNDO_RESAMPLE) {
-    on_resample_vid_ok (NULL,NULL);
+    on_resample_vid_ok(NULL,NULL);
     mainw->osc_block=FALSE;
     return;
   }
   if (cfile->undo_action==UNDO_AUDIO_RESAMPLE) {
-    on_resaudio_ok_clicked (NULL,NULL);
+    on_resaudio_ok_clicked(NULL,NULL);
     mainw->osc_block=FALSE;
     d_print_done();
     return;
@@ -2351,18 +2353,18 @@
     cfile->end=oend;
     if (mainw->current_file==current_file) {
       if (cfile->start>=cfile->undo_start) {
-	cfile->start-=cfile->undo_end-cfile->undo_start+1;
-	if (cfile->start<cfile->undo_start-1) {
-	  cfile->start=cfile->undo_start-1;
-	}
+        cfile->start-=cfile->undo_end-cfile->undo_start+1;
+        if (cfile->start<cfile->undo_start-1) {
+          cfile->start=cfile->undo_start-1;
+        }
       }
       if (cfile->end>=cfile->undo_start) {
-	cfile->end-=cfile->undo_end-cfile->undo_start+1;
-	if (cfile->end<cfile->undo_start-1) {
-	  cfile->end=cfile->undo_start-1;
-	}
+        cfile->end-=cfile->undo_end-cfile->undo_start+1;
+        if (cfile->end<cfile->undo_start-1) {
+          cfile->end=cfile->undo_start-1;
+        }
       }
-      switch_to_file (mainw->current_file,mainw->current_file);
+      switch_to_file(mainw->current_file,mainw->current_file);
     }
     mainw->osc_block=FALSE;
     return;
@@ -2379,11 +2381,11 @@
 
   if (cfile->undo_action==UNDO_REC_AUDIO||cfile->undo_action==UNDO_FADE_AUDIO||cfile->undo_action==UNDO_TRIM_AUDIO||
       cfile->undo_action==UNDO_APPEND_AUDIO) {
-    com=g_strdup_printf("%s undo_audio \"%s\"",prefs->backend_sync,cfile->handle);
+    com=lives_strdup_printf("%s undo_audio \"%s\"",prefs->backend_sync,cfile->handle);
     unlink(cfile->info_file);
     mainw->com_failed=FALSE;
     lives_system(com,FALSE);
-    g_free(com);
+    lives_free(com);
 
     if (mainw->com_failed) {
       d_print_failed();
@@ -2391,7 +2393,7 @@
     }
 
     // show a progress dialog, not cancellable
-    do_progress_dialog(TRUE,FALSE,_ ("Redoing"));
+    do_progress_dialog(TRUE,FALSE,_("Redoing"));
 
     if (mainw->error) {
       d_print_failed();
@@ -2399,17 +2401,17 @@
     }
 
     d_print_done();
-    switch_to_file (mainw->current_file,mainw->current_file);
+    switch_to_file(mainw->current_file,mainw->current_file);
     mainw->osc_block=FALSE;
     return;
   }
 
-  com=g_strdup_printf("%s redo \"%s\" %d %d \"%s\"",prefs->backend,cfile->handle,cfile->undo_start,cfile->undo_end,
-		      get_image_ext_for_type(cfile->img_type));
+  com=lives_strdup_printf("%s redo \"%s\" %d %d \"%s\"",prefs->backend,cfile->handle,cfile->undo_start,cfile->undo_end,
+                          get_image_ext_for_type(cfile->img_type));
   unlink(cfile->info_file);
   mainw->com_failed=FALSE;
   lives_system(com,FALSE);
-  g_free(com);
+  lives_free(com);
 
   if (mainw->com_failed) {
     d_print_failed();
@@ -2420,7 +2422,7 @@
   cfile->progress_end=cfile->undo_end;
 
   // show a progress dialog, not cancellable
-  do_progress_dialog(TRUE,FALSE,_ ("Redoing"));
+  do_progress_dialog(TRUE,FALSE,_("Redoing"));
 
   if (mainw->error) {
     d_print_failed();
@@ -2442,9 +2444,8 @@
     cfile->hsize+=cfile->ohsize;
     cfile->ohsize=cfile->hsize-cfile->ohsize;
     cfile->hsize-=cfile->ohsize;
-    switch_to_file ((mainw->current_file=0),current_file);
-  }
-  else {
+    switch_to_file((mainw->current_file=0),current_file);
+  } else {
     if (cfile->start>=cfile->undo_start) load_start_image(cfile->start);
     if (cfile->end<=cfile->undo_end) load_end_image(cfile->end);
   }
@@ -2457,11 +2458,8 @@
 
 //////////////////////////////////////////////////
 
-void on_copy_activate (LiVESMenuItem *menuitem, gpointer user_data) {
+void on_copy_activate(LiVESMenuItem *menuitem, livespointer user_data) {
   gchar *com;
-  gchar *text=g_strdup_printf(_ ("Copying frames %d to %d%s to the clipboard..."),cfile->start,cfile->end,
-			      mainw->ccpd_with_sound&&cfile->achans>0?" (with sound)":"");
-
 
   int current_file=mainw->current_file;
   int start,end;
@@ -2469,8 +2467,11 @@
   desensitize();
 
   d_print(""); // force switchtext
-  d_print(text);
-  g_free(text);
+
+  if (mainw->ccpd_with_sound&&cfile->achans>0)
+    d_print(_("Copying frames %d to %d (with sound) to the clipboard..."),cfile->start,cfile->end);
+  else
+    d_print(lives_strdup_printf(_("Copying frames %d to %d to the clipboard..."),cfile->start,cfile->end));
 
   init_clipboard();
 
@@ -2498,17 +2499,17 @@
 
   clipboard->img_type=cfile->img_type;
 
-  com=g_strdup_printf("%s insert \"%s\" \"%s\" 0 %d %d \"%s\" %d 0 0 0 %.3f %d %d %d %d %d",prefs->backend,
-		      clipboard->handle, get_image_ext_for_type(clipboard->img_type),
-		      start, end, cfile->handle, mainw->ccpd_with_sound, cfile->fps, cfile->arate, 
-		      cfile->achans, cfile->asampsize, !(cfile->signed_endian&AFORM_UNSIGNED),
-		      !(cfile->signed_endian&AFORM_BIG_ENDIAN));
+  com=lives_strdup_printf("%s insert \"%s\" \"%s\" 0 %d %d \"%s\" %d 0 0 0 %.3f %d %d %d %d %d",prefs->backend,
+                          clipboard->handle, get_image_ext_for_type(clipboard->img_type),
+                          start, end, cfile->handle, mainw->ccpd_with_sound, cfile->fps, cfile->arate,
+                          cfile->achans, cfile->asampsize, !(cfile->signed_endian&AFORM_UNSIGNED),
+                          !(cfile->signed_endian&AFORM_BIG_ENDIAN));
 
   if (clipboard->clip_type==CLIP_TYPE_FILE) end=-end;
 
   mainw->com_failed=FALSE;
   lives_system(com,FALSE);
-  g_free(com);
+  lives_free(com);
 
   if (mainw->com_failed) {
     d_print_failed();
@@ -2522,7 +2523,7 @@
 
   // stop the 'preview' and 'pause' buttons from appearing
   cfile->nopreview=TRUE;
-  if (!do_progress_dialog(TRUE,TRUE,_ ("Copying to the clipboard"))) {
+  if (!do_progress_dialog(TRUE,TRUE,_("Copying to the clipboard"))) {
 #ifdef IS_MINGW
     // kill any active processes: for other OSes the backend does this
     // get pid from backend
@@ -2530,21 +2531,21 @@
     ssize_t rlen;
     char val[16];
     int pid;
-    com=g_strdup_printf("%s get_pid_for_handle \"%s\"",prefs->backend_sync,cfile->handle);
+    com=lives_strdup_printf("%s get_pid_for_handle \"%s\"",prefs->backend_sync,cfile->handle);
     rfile=popen(com,"r");
     rlen=fread(val,1,16,rfile);
     pclose(rfile);
     memset(val+rlen,0,1);
     pid=atoi(val);
-    
+
     lives_win32_kill_subprocesses(pid,TRUE);
 #endif
 
     // close clipboard, it is invalid
 
-    com=g_strdup_printf ("%s close \"%s\"",prefs->backend,clipboard->handle);
-    lives_system (com,FALSE);
-    g_free (com);
+    com=lives_strdup_printf("%s close \"%s\"",prefs->backend,clipboard->handle);
+    lives_system(com,FALSE);
+    lives_free(com);
     clipboard=NULL;
     mainw->current_file=current_file;
     sensitize();
@@ -2563,7 +2564,7 @@
   clipboard->undo1_dbl=clipboard->fps=cfile->fps;
   clipboard->ratio_fps=cfile->ratio_fps;
   clipboard->is_loaded=TRUE;
-  g_snprintf(clipboard->type,40,"Frames");
+  lives_snprintf(clipboard->type,40,"Frames");
 
   clipboard->asampsize=clipboard->arate=clipboard->achans=0;
   clipboard->afilesize=0l;
@@ -2575,13 +2576,13 @@
     clipboard->arate=cfile->arate;
     clipboard->arps=cfile->arps;
     clipboard->signed_endian=cfile->signed_endian;
-    reget_afilesize (0);
+    reget_afilesize(0);
   }
 
   clipboard->start=1;
   clipboard->end=clipboard->frames;
 
-  get_total_time (clipboard);
+  get_total_time(clipboard);
 
   sensitize();
   d_print_done();
@@ -2589,7 +2590,7 @@
 }
 
 
-void on_cut_activate (LiVESMenuItem *menuitem, gpointer user_data) {
+void on_cut_activate(LiVESMenuItem *menuitem, livespointer user_data) {
   int current_file=mainw->current_file;
   on_copy_activate(menuitem, user_data);
   if (mainw->cancelled) {
@@ -2597,21 +2598,20 @@
   }
   on_delete_activate(menuitem, user_data);
   if (mainw->current_file==current_file) {
-    set_undoable (_("Cut"),TRUE);
+    set_undoable(_("Cut"),TRUE);
     cfile->undo_action=UNDO_CUT;
   }
 }
 
 
-void on_paste_as_new_activate (LiVESMenuItem *menuitem, gpointer user_data) {
-  gchar *com;
-  gchar *msg;
+void on_paste_as_new_activate(LiVESMenuItem *menuitem, livespointer user_data) {
+  char *com;
   int old_file=mainw->current_file,current_file;
 
   if (clipboard==NULL) return;
 
   mainw->current_file=mainw->first_free_file;
-  
+
   if (!get_new_handle(mainw->current_file,NULL)) {
     mainw->current_file=old_file;
     return;
@@ -2651,21 +2651,19 @@
   }
 
   mainw->no_switch_dprint=TRUE;
-  msg=g_strdup_printf (_ ("Pasting %d frames to new clip %s..."),cfile->frames,cfile->name);
-  d_print (msg);
-  g_free (msg);
+  d_print(_("Pasting %d frames to new clip %s..."),cfile->frames,cfile->name);
   mainw->no_switch_dprint=FALSE;
 
-  com=g_strdup_printf("%s insert \"%s\" \"%s\" 0 1 %d \"%s\" %d 0 0 0 %.3f %d %d %d %d %d",
-		      prefs->backend,cfile->handle, 
-		      get_image_ext_for_type(cfile->img_type),clipboard->frames, clipboard->handle, 
-		      mainw->ccpd_with_sound, clipboard->fps, clipboard->arate, clipboard->achans, 
-		      clipboard->asampsize, !(cfile->signed_endian&AFORM_UNSIGNED), 
-		      !(cfile->signed_endian&AFORM_BIG_ENDIAN));
-  
+  com=lives_strdup_printf("%s insert \"%s\" \"%s\" 0 1 %d \"%s\" %d 0 0 0 %.3f %d %d %d %d %d",
+                          prefs->backend,cfile->handle,
+                          get_image_ext_for_type(cfile->img_type),clipboard->frames, clipboard->handle,
+                          mainw->ccpd_with_sound, clipboard->fps, clipboard->arate, clipboard->achans,
+                          clipboard->asampsize, !(cfile->signed_endian&AFORM_UNSIGNED),
+                          !(cfile->signed_endian&AFORM_BIG_ENDIAN));
+
   mainw->com_failed=FALSE;
   lives_system(com,FALSE);
-  g_free(com);
+  lives_free(com);
 
   if (mainw->com_failed) {
     d_print_failed();
@@ -2675,7 +2673,7 @@
   cfile->nopreview=TRUE;
 
   // show a progress dialog, not cancellable
-  if (!do_progress_dialog(TRUE,TRUE,_ ("Pasting"))) {
+  if (!do_progress_dialog(TRUE,TRUE,_("Pasting"))) {
 
     if (mainw->error) d_print_failed();
 
@@ -2709,16 +2707,14 @@
   mainw->last_dprint_file=old_file;
   d_print(""); // force switchtext
 
-#ifdef ENABLE_OSC
-    lives_osc_notify(LIVES_OSC_NOTIFY_CLIP_OPENED,"");
-#endif
+  lives_notify(LIVES_OSC_NOTIFY_CLIP_OPENED,"");
 }
 
 
-void on_insert_pre_activate (LiVESMenuItem *menuitem, gpointer user_data) {
-  insertw = create_insert_dialog ();
+void on_insert_pre_activate(LiVESMenuItem *menuitem, livespointer user_data) {
+  insertw = create_insert_dialog();
 
-  lives_widget_show (insertw->insert_dialog);
+  lives_widget_show(insertw->insert_dialog);
   mainw->fx1_bool=FALSE;
   mainw->fx1_val=1;
 
@@ -2727,11 +2723,11 @@
 
 
 
-void on_insert_activate (LiVESButton *button, gpointer user_data) {
+void on_insert_activate(LiVESButton *button, livespointer user_data) {
   double times_to_insert=mainw->fx1_val;
   double audio_stretch;
 
-  gchar *msg,*com;
+  char *com;
 
   boolean with_sound=mainw->fx2_bool;
   boolean has_lmap_error=FALSE;
@@ -2772,14 +2768,15 @@
 
   // don't ask smogrify to resize if frames are the same size and type
   if (all_virtual||(((cfile->hsize==clipboard->hsize && cfile->vsize==clipboard->vsize)||orig_frames==0)&&
-		    (cfile->img_type==clipboard->img_type))) hsize=vsize=0;
+                    (cfile->img_type==clipboard->img_type))) hsize=vsize=0;
   else {
     if (!capable->has_convert) {
-      do_error_dialog(_ ("This operation requires resizing or converting of frames.\nPlease install 'convert' from the Image-magick package, and then restart LiVES.\n"));
+      do_error_dialog(
+        _("This operation requires resizing or converting of frames.\nPlease install 'convert' from the Image-magick package, and then restart LiVES.\n"));
       mainw->error=TRUE;
       if (button!=NULL) {
-	lives_widget_destroy(insertw->insert_dialog);
-	g_free(insertw);
+        lives_widget_destroy(insertw->insert_dialog);
+        lives_free(insertw);
       }
       return;
     }
@@ -2792,11 +2789,12 @@
   }
 
   if (times_to_insert<0.&&(mainw->fx1_bool)) {
-    do_error_dialog(_ ("\n\nVideo is longer than audio.\nTry selecting all frames, and then using \nthe 'Trim Audio' function from the Audio menu."));
+    do_error_dialog(
+      _("\n\nVideo is longer than audio.\nTry selecting all frames, and then using \nthe 'Trim Audio' function from the Audio menu."));
     mainw->error=TRUE;
     if (button!=NULL) {
       lives_widget_destroy(insertw->insert_dialog);
-      g_free(insertw);
+      lives_free(insertw);
     }
     return;
   }
@@ -2810,16 +2808,16 @@
     clipboard_endian=!(clipboard->signed_endian&AFORM_BIG_ENDIAN);
 
     if ((cfile->achans*cfile->arps*cfile->asampsize>0)&&(cfile->achans!=clipboard->achans||
-							 (cfile->arps!=clipboard->arps&&clipboard->achans>0)||
-							 cfile->asampsize!=clipboard->asampsize||
-							 cfile_signed!=clipboard_signed||cfile_endian!=clipboard_endian||
-							 cfile->arate!=clipboard->arate)) {
+        (cfile->arps!=clipboard->arps&&clipboard->achans>0)||
+        cfile->asampsize!=clipboard->asampsize||
+        cfile_signed!=clipboard_signed||cfile_endian!=clipboard_endian||
+        cfile->arate!=clipboard->arate)) {
       if (!(capable->has_sox_sox)) {
-	if (cfile->arps!=clipboard->arps) {
-	  do_error_dialog(_ ("LiVES cannot insert because the audio rates do not match.\nPlease install 'sox', and try again."));
-	  mainw->error=TRUE;
-	  return;
-	}
+        if (cfile->arps!=clipboard->arps) {
+          do_error_dialog(_("LiVES cannot insert because the audio rates do not match.\nPlease install 'sox', and try again."));
+          mainw->error=TRUE;
+          return;
+        }
       }
     }
   }
@@ -2829,92 +2827,88 @@
     int insert_start;
     if (mainw->insert_after) {
       insert_start=cfile->end+1;
-    }
-    else {
+    } else {
       insert_start=cfile->start;
     }
     if ((mainw->xlays=layout_frame_is_affected(mainw->current_file,insert_start))!=NULL) {
       if (!do_warning_dialog
-	  (_("\nInsertion will cause frames to shift in some multitrack layouts.\nAre you sure you wish to continue ?\n"))) {
-	if (button!=NULL) {
-	  lives_widget_destroy(insertw->insert_dialog);
-	  g_free(insertw);
-	}
-	mainw->error=TRUE;
-	g_list_free_strings(mainw->xlays);
-	g_list_free(mainw->xlays);
-	mainw->xlays=NULL;
-	return;
-      }
-      add_lmap_error(LMAP_ERROR_SHIFT_FRAMES,cfile->name,(gpointer)cfile->layout_map,mainw->current_file,
-		     insert_start,0.,count_resampled_frames(cfile->stored_layout_frame,cfile->stored_layout_fps,
-							    cfile->fps)>=insert_start);
+          (_("\nInsertion will cause frames to shift in some multitrack layouts.\nAre you sure you wish to continue ?\n"))) {
+        if (button!=NULL) {
+          lives_widget_destroy(insertw->insert_dialog);
+          lives_free(insertw);
+        }
+        mainw->error=TRUE;
+        lives_list_free_strings(mainw->xlays);
+        lives_list_free(mainw->xlays);
+        mainw->xlays=NULL;
+        return;
+      }
+      add_lmap_error(LMAP_ERROR_SHIFT_FRAMES,cfile->name,(livespointer)cfile->layout_map,mainw->current_file,
+                     insert_start,0.,count_resampled_frames(cfile->stored_layout_frame,cfile->stored_layout_fps,
+                         cfile->fps)>=insert_start);
       has_lmap_error=TRUE;
       mainw->error=TRUE;
-      g_list_free_strings(mainw->xlays);
-      g_list_free(mainw->xlays);
+      lives_list_free_strings(mainw->xlays);
+      lives_list_free(mainw->xlays);
       mainw->xlays=NULL;
-    }
-    else {
+    } else {
       if (!(prefs->warning_mask&WARN_MASK_LAYOUT_ALTER_FRAMES)&&(mainw->xlays=
-								 layout_frame_is_affected(mainw->current_file,1))!=NULL) {
-	if (!do_layout_alter_frames_warning()) {
-	  g_list_free_strings(mainw->xlays);
-	  g_list_free(mainw->xlays);
-	  mainw->xlays=NULL;
-	  return;
-	}
-	add_lmap_error(LMAP_ERROR_ALTER_FRAMES,cfile->name,(gpointer)cfile->layout_map,mainw->current_file,0,0.,
-		       cfile->stored_layout_frame>0);
-	g_list_free_strings(mainw->xlays);
-	g_list_free(mainw->xlays);
-	mainw->xlays=NULL;
-	has_lmap_error=TRUE;
+            layout_frame_is_affected(mainw->current_file,1))!=NULL) {
+        if (!do_layout_alter_frames_warning()) {
+          lives_list_free_strings(mainw->xlays);
+          lives_list_free(mainw->xlays);
+          mainw->xlays=NULL;
+          return;
+        }
+        add_lmap_error(LMAP_ERROR_ALTER_FRAMES,cfile->name,(livespointer)cfile->layout_map,mainw->current_file,0,0.,
+                       cfile->stored_layout_frame>0);
+        lives_list_free_strings(mainw->xlays);
+        lives_list_free(mainw->xlays);
+        mainw->xlays=NULL;
+        has_lmap_error=TRUE;
       }
     }
   }
 
   if (with_sound&&(!(prefs->warning_mask&WARN_MASK_LAYOUT_SHIFT_AUDIO)||
-		   (!prefs->warning_mask&&WARN_MASK_LAYOUT_ALTER_AUDIO))) {
+                   (!prefs->warning_mask&&WARN_MASK_LAYOUT_ALTER_AUDIO))) {
     int insert_start;
     if (mainw->insert_after) {
       insert_start=cfile->end+1;
-    }
-    else {
+    } else {
       insert_start=cfile->start;
     }
     if ((mainw->xlays=layout_audio_is_affected(mainw->current_file,(insert_start-1.)/cfile->fps))!=NULL) {
       if (!do_warning_dialog
-	  (_("\nInsertion will cause audio to shift in some multitrack layouts.\nAre you sure you wish to continue ?\n"))) {
-	if (button!=NULL) {
-	  lives_widget_destroy(insertw->insert_dialog);
-	  g_free(insertw);
-	}
-	mainw->error=TRUE;
-	g_list_free_strings(mainw->xlays);
-	g_list_free(mainw->xlays);
-	mainw->xlays=NULL;
-	return;
+          (_("\nInsertion will cause audio to shift in some multitrack layouts.\nAre you sure you wish to continue ?\n"))) {
+        if (button!=NULL) {
+          lives_widget_destroy(insertw->insert_dialog);
+          lives_free(insertw);
+        }
+        mainw->error=TRUE;
+        lives_list_free_strings(mainw->xlays);
+        lives_list_free(mainw->xlays);
+        mainw->xlays=NULL;
+        return;
       }
-      add_lmap_error(LMAP_ERROR_SHIFT_AUDIO,cfile->name,(gpointer)cfile->layout_map,mainw->current_file,0,
-		     (insert_start-1.)/cfile->fps,(insert_start-1.)/cfile->fps<cfile->stored_layout_audio);
+      add_lmap_error(LMAP_ERROR_SHIFT_AUDIO,cfile->name,(livespointer)cfile->layout_map,mainw->current_file,0,
+                     (insert_start-1.)/cfile->fps,(insert_start-1.)/cfile->fps<cfile->stored_layout_audio);
       has_lmap_error=TRUE;
-    }
-    else {
+    } else {
       if (!(prefs->warning_mask&WARN_MASK_LAYOUT_ALTER_AUDIO)&&
-	  (mainw->xlays=layout_audio_is_affected(mainw->current_file,0.))!=NULL) {
-	if (!do_layout_alter_audio_warning()) {
-	  g_list_free_strings(mainw->xlays);
-	  g_list_free(mainw->xlays);
-	  mainw->xlays=NULL;
-	  return;
-	}
-	add_lmap_error(LMAP_ERROR_ALTER_AUDIO,cfile->name,(gpointer)cfile->layout_map,mainw->current_file,0,0.,
-		       cfile->stored_layout_audio>0.);
-	has_lmap_error=TRUE;
-	g_list_free_strings(mainw->xlays);
-	g_list_free(mainw->xlays);
-	mainw->xlays=NULL;
+          (mainw->xlays=layout_audio_is_affected(mainw->current_file,0.))!=NULL) {
+        if (!do_layout_alter_audio_warning()) {
+          lives_list_free_strings(mainw->xlays);
+          lives_list_free(mainw->xlays);
+          mainw->xlays=NULL;
+          return;
+        }
+        add_lmap_error(LMAP_ERROR_ALTER_AUDIO,cfile->name,(livespointer)cfile->layout_map,mainw->current_file,0,0.,
+                       cfile->stored_layout_audio>0.);
+        has_lmap_error=TRUE;
+        lives_list_free_strings(mainw->xlays);
+        lives_list_free(mainw->xlays);
+        mainw->xlays=NULL;
       }
     }
   }
@@ -2922,18 +2916,17 @@
   if (button!=NULL) {
     lives_widget_destroy(insertw->insert_dialog);
     lives_widget_context_update();
-    g_free(insertw);
+    lives_free(insertw);
     if ((cfile->fps!=clipboard->fps&&orig_frames>0)||(cfile->arps!=clipboard->arps&&clipboard->achans>0&&with_sound)) {
       if (!do_clipboard_fps_warning()) {
-	mainw->error=TRUE;
-	return;
+        mainw->error=TRUE;
+        return;
       }
     }
     if (prefs->ins_resample&&clipboard->fps!=cfile->fps&&orig_frames!=0) {
       cb_end=count_resampled_frames(clipboard->frames,clipboard->fps,cfile->fps);
     }
-  }
-  else {
+  } else {
     // called from on_merge_activate()
     cb_start=mainw->fx1_start;
     cb_end=mainw->fx2_start;
@@ -2941,123 +2934,125 @@
     // we will use leave_backup as this will leave our
     // merge backup in place
     leave_backup=-1;
-   }
+  }
 
   if (mainw->insert_after) {
     cfile->insert_start=cfile->end+1;
-  }
-  else {
+  } else {
     cfile->insert_start=cfile->start;
   }
-  
+
   cfile->insert_end=cfile->insert_start-1;
 
   if (mainw->insert_after) where=cfile->end;
 
   // at least we should try to convert the audio to match...
-  // if with_sound is TRUE, and clipboard has no audio, we will insert silence (unless target 
+  // if with_sound is TRUE, and clipboard has no audio, we will insert silence (unless target
   // also has no audio
   if (with_sound) {
 
     if (clipboard->achans==0) {
       if (cfile->achans>0) insert_silence=TRUE;
       with_sound=FALSE;
-    }
-    else {
+    } else {
       if ((cfile->achans*cfile->arps*cfile->asampsize>0)
-	  &&clipboard->achans>0&&(cfile->achans!=clipboard->achans||
-				  cfile->arps!=clipboard->arps||
-				  cfile->asampsize!=clipboard->asampsize||
-				  cfile_signed!=clipboard_signed||
-				  cfile_endian!=clipboard_endian||cfile->arate!=clipboard->arate)) {
-
-	cb_audio_change=TRUE;
-
-	if (clipboard->arps!=clipboard->arps||cfile->arate!=clipboard->arate) {
-	  // pb rate != real rate - stretch to pb rate and resample
-	  if ((audio_stretch=(double)clipboard->arps/(double)clipboard->arate*
-	       (double)cfile->arate/(double)cfile->arps)!=1.) {
-	    unlink (clipboard->info_file);
-	    com=g_strdup_printf ("%s resample_audio \"%s\" %d %d %d %d %d %d %d %d %d %d %.4f",
-				 prefs->backend,
-				 clipboard->handle,clipboard->arps,clipboard->achans,clipboard->asampsize,
-				 clipboard_signed,clipboard_endian,cfile->arps,clipboard->achans,
-				 clipboard->asampsize,clipboard_signed,clipboard_endian,audio_stretch);
-	    mainw->com_failed=FALSE;
-	    lives_system (com,FALSE);
-	    g_free (com);
-
-	    if (mainw->com_failed) {
-	      return;
-	    }
-
-	    mainw->current_file=0;
-	    mainw->error=FALSE;
-	    do_progress_dialog (TRUE,FALSE,_ ("Resampling clipboard audio"));
-	    mainw->current_file=current_file;
-	    if (mainw->error) {
-	      d_print_failed();
-	      return;
-	    }
-
-	    // not really, but we pretend...
-	    clipboard->arps=cfile->arps;
-	  }
-	}
-
-	if (clipboard->achans>0&&(cfile->achans!=clipboard->achans||cfile->arps!=clipboard->arps||
-				  cfile->asampsize!=clipboard->asampsize||cfile_signed!=clipboard_signed||
-				  cfile_endian!=clipboard_endian)) {
-	  unlink (clipboard->info_file);
-	  com=g_strdup_printf ("%s resample_audio \"%s\" %d %d %d %d %d %d %d %d %d %d",
-			       prefs->backend,clipboard->handle,
-			       clipboard->arps,clipboard->achans,clipboard->asampsize,clipboard_signed,
-			       clipboard_endian,cfile->arps,cfile->achans,cfile->asampsize,cfile_signed,cfile_endian);
-	  mainw->com_failed=FALSE;
-	  lives_system (com,FALSE);
-	  g_free (com);
-
-	  if (mainw->com_failed) {
-	    return;
-	  }
-
-	  mainw->current_file=0;
-	  do_progress_dialog (TRUE,FALSE,_ ("Resampling clipboard audio"));
-	  mainw->current_file=current_file;
-
-	  if (mainw->error) {
-	    d_print_failed();
-	    return;
-	  }
-
-	}
-      
-	if (clipboard->achans>0&&clipboard->afilesize==0l) {
-	  if (prefs->conserve_space) {
-	    // oops...
-	    clipboard->achans=clipboard->arate=clipboard->asampsize=0;
-	    with_sound=FALSE;
-	    do_error_dialog 
-	      (_ ("\n\nLiVES was unable to resample the clipboard audio. \nClipboard audio has been erased.\n"));
-	  }
-	  else {
-	    unlink (clipboard->info_file);
-	    mainw->current_file=0;
-	    com=g_strdup_printf ("%s undo_audio \"%s\"",prefs->backend_sync,clipboard->handle);
-	    lives_system (com,FALSE);
-	    g_free (com);
-	    mainw->current_file=current_file;
-	  
-	    clipboard->arps=ocarps;
-	    reget_afilesize(0);
-	  
-	    if (!do_yesno_dialog 
-		(_("\n\nLiVES was unable to resample the clipboard audio.\nDo you wish to continue with the insert \nusing unchanged audio ?\n"))) {
-	      mainw->error=TRUE;
-	      return;
-	    }}}}}}
+          &&clipboard->achans>0&&(cfile->achans!=clipboard->achans||
+                                  cfile->arps!=clipboard->arps||
+                                  cfile->asampsize!=clipboard->asampsize||
+                                  cfile_signed!=clipboard_signed||
+                                  cfile_endian!=clipboard_endian||cfile->arate!=clipboard->arate)) {
+
+        cb_audio_change=TRUE;
+
+        if (clipboard->arps!=clipboard->arps||cfile->arate!=clipboard->arate) {
+          // pb rate != real rate - stretch to pb rate and resample
+          if ((audio_stretch=(double)clipboard->arps/(double)clipboard->arate*
+                             (double)cfile->arate/(double)cfile->arps)!=1.) {
+            unlink(clipboard->info_file);
+            com=lives_strdup_printf("%s resample_audio \"%s\" %d %d %d %d %d %d %d %d %d %d %.4f",
+                                    prefs->backend,
+                                    clipboard->handle,clipboard->arps,clipboard->achans,clipboard->asampsize,
+                                    clipboard_signed,clipboard_endian,cfile->arps,clipboard->achans,
+                                    clipboard->asampsize,clipboard_signed,clipboard_endian,audio_stretch);
+            mainw->com_failed=FALSE;
+            lives_system(com,FALSE);
+            lives_free(com);
+
+            if (mainw->com_failed) {
+              return;
+            }
+
+            mainw->current_file=0;
+            mainw->error=FALSE;
+            do_progress_dialog(TRUE,FALSE,_("Resampling clipboard audio"));
+            mainw->current_file=current_file;
+            if (mainw->error) {
+              d_print_failed();
+              return;
+            }
+
+            // not really, but we pretend...
+            clipboard->arps=cfile->arps;
+          }
+        }
+
+        if (clipboard->achans>0&&(cfile->achans!=clipboard->achans||cfile->arps!=clipboard->arps||
+                                  cfile->asampsize!=clipboard->asampsize||cfile_signed!=clipboard_signed||
+                                  cfile_endian!=clipboard_endian)) {
+          unlink(clipboard->info_file);
+          com=lives_strdup_printf("%s resample_audio \"%s\" %d %d %d %d %d %d %d %d %d %d",
+                                  prefs->backend,clipboard->handle,
+                                  clipboard->arps,clipboard->achans,clipboard->asampsize,clipboard_signed,
+                                  clipboard_endian,cfile->arps,cfile->achans,cfile->asampsize,cfile_signed,cfile_endian);
+          mainw->com_failed=FALSE;
+          lives_system(com,FALSE);
+          lives_free(com);
+
+          if (mainw->com_failed) {
+            return;
+          }
+
+          mainw->current_file=0;
+          do_progress_dialog(TRUE,FALSE,_("Resampling clipboard audio"));
+          mainw->current_file=current_file;
+
+          if (mainw->error) {
+            d_print_failed();
+            return;
+          }
+
+        }
+
+        if (clipboard->achans>0&&clipboard->afilesize==0l) {
+          if (prefs->conserve_space) {
+            // oops...
+            clipboard->achans=clipboard->arate=clipboard->asampsize=0;
+            with_sound=FALSE;
+            do_error_dialog
+            (_("\n\nLiVES was unable to resample the clipboard audio. \nClipboard audio has been erased.\n"));
+          } else {
+            unlink(clipboard->info_file);
+            mainw->current_file=0;
+            com=lives_strdup_printf("%s undo_audio \"%s\"",prefs->backend_sync,clipboard->handle);
+            lives_system(com,FALSE);
+            lives_free(com);
+            mainw->current_file=current_file;
+
+            clipboard->arps=ocarps;
+            reget_afilesize(0);
+
+            if (!do_yesno_dialog
+                (_("\n\nLiVES was unable to resample the clipboard audio.\nDo you wish to continue with the insert \nusing unchanged audio ?\n"))) {
+              mainw->error=TRUE;
+              return;
+            }
+          }
+        }
+      }
+    }
+  }
+
 
-  
   if (!virtual_ins && clipboard->frame_index!=NULL) {
     int current_file=mainw->current_file;
     boolean retb;
@@ -3134,32 +3129,30 @@
   if (virtual_ins) end=-end;
 
   if (!mainw->insert_after&&remainder_frames>0) {
-    msg=g_strdup_printf(_ ("Inserting %d%s frames from the clipboard..."),remainder_frames,
-			times_to_insert>1.?" remainder":"");
-    d_print(msg);
-    g_free(msg);
+    d_print(_("Inserting %d%s frames from the clipboard..."),remainder_frames,
+            times_to_insert>1.?" remainder":"");
 
-    com=g_strdup_printf("%s insert \"%s\" \"%s\" %d %d %d \"%s\" %d %d %d %d %.3f %d %d %d %d %d",
-			prefs->backend,cfile->handle, 
-			get_image_ext_for_type(cfile->img_type), where, clipboard->frames-remainder_frames+1, 
-			end, clipboard->handle, with_sound, cfile->frames, hsize, vsize, cfile->fps, 
-			cfile->arate, cfile->achans, cfile->asampsize, !(cfile->signed_endian&AFORM_UNSIGNED), 
-			!(cfile->signed_endian&AFORM_BIG_ENDIAN));
+    com=lives_strdup_printf("%s insert \"%s\" \"%s\" %d %d %d \"%s\" %d %d %d %d %.3f %d %d %d %d %d",
+                            prefs->backend,cfile->handle,
+                            get_image_ext_for_type(cfile->img_type), where, clipboard->frames-remainder_frames+1,
+                            end, clipboard->handle, with_sound, cfile->frames, hsize, vsize, cfile->fps,
+                            cfile->arate, cfile->achans, cfile->asampsize, !(cfile->signed_endian&AFORM_UNSIGNED),
+                            !(cfile->signed_endian&AFORM_BIG_ENDIAN));
 
     unlink(cfile->info_file);
     mainw->com_failed=FALSE;
     lives_system(com,FALSE);
-    g_free(com);
+    lives_free(com);
 
     if (mainw->com_failed) {
       d_print_failed();
       return;
     }
-    
+
     cfile->progress_start=1;
     cfile->progress_end=remainder_frames;
 
-    do_progress_dialog(TRUE,FALSE,_ ("Inserting"));
+    do_progress_dialog(TRUE,FALSE,_("Inserting"));
 
     if (mainw->error) {
       d_print_failed();
@@ -3181,41 +3174,36 @@
     }
 
     if (with_sound) {
-      reget_afilesize (mainw->current_file);
+      reget_afilesize(mainw->current_file);
     }
     get_play_times();
     d_print_done();
-  } 
-  
+  }
+
 
   // inserts of whole clipboard
   if ((int)times_to_insert>1) {
-    msg=g_strdup_printf(_ ("Inserting %d times from the clipboard%s..."),(int)times_to_insert,with_sound?
-			" (with sound)":"");
     d_print("");
-    d_print(msg);
-    g_free(msg);
-  }
-  else if ((int)times_to_insert>0) {
-    msg=g_strdup_printf(_ ("Inserting %d frames from the clipboard%s..."),cb_end-cb_start+1,with_sound?
-			" (with sound)":"");
+    d_print(_("Inserting %d times from the clipboard%s..."),(int)times_to_insert,with_sound?
+            " (with sound)":"");
+  } else if ((int)times_to_insert>0) {
     d_print("");
-    d_print(msg);
-    g_free(msg);
+    d_print(_("Inserting %d frames from the clipboard%s..."),cb_end-cb_start+1,with_sound?
+            " (with sound)":"");
   }
-  
+
   if (virtual_ins) cb_end=-cb_end;
 
   // for an insert after a merge we set our start posn. -ve
   // this should indicate to the back end to leave our
   // backup frames alone
 
-  com=g_strdup_printf("%s insert \"%s\" \"%s\" %d %d %d \"%s\" %d %d %d %d %.3f %d %d %d %d %d %d",
-		      prefs->backend,cfile->handle, 
-		      get_image_ext_for_type(cfile->img_type), where, cb_start*leave_backup, cb_end, 
-		      clipboard->handle, with_sound, cfile->frames, hsize, vsize, cfile->fps, cfile->arate, 
-		      cfile->achans, cfile->asampsize, !(cfile->signed_endian&AFORM_UNSIGNED), 
-		      !(cfile->signed_endian&AFORM_BIG_ENDIAN), (int)times_to_insert);
+  com=lives_strdup_printf("%s insert \"%s\" \"%s\" %d %d %d \"%s\" %d %d %d %d %.3f %d %d %d %d %d %d",
+                          prefs->backend,cfile->handle,
+                          get_image_ext_for_type(cfile->img_type), where, cb_start*leave_backup, cb_end,
+                          clipboard->handle, with_sound, cfile->frames, hsize, vsize, cfile->fps, cfile->arate,
+                          cfile->achans, cfile->asampsize, !(cfile->signed_endian&AFORM_UNSIGNED),
+                          !(cfile->signed_endian&AFORM_BIG_ENDIAN), (int)times_to_insert);
 
   if (virtual_ins) cb_end=-cb_end;
 
@@ -3224,7 +3212,7 @@
   mainw->com_failed=FALSE;
   unlink(cfile->info_file);
   lives_system(com,FALSE);
-  g_free (com);
+  lives_free(com);
 
   if (mainw->com_failed) {
     d_print_failed();
@@ -3233,7 +3221,7 @@
 
   // show a progress dialog
   cfile->nopreview=TRUE;
-  if (!do_progress_dialog(TRUE,TRUE,_ ("Inserting"))) {
+  if (!do_progress_dialog(TRUE,TRUE,_("Inserting"))) {
     // cancelled
 
     cfile->nopreview=FALSE;
@@ -3244,12 +3232,12 @@
     }
 
     // clean up moved/inserted frames
-    com=g_strdup_printf ("%s undo_insert \"%s\" %d %d %d \"%s\"",
-			 prefs->backend,cfile->handle,where+1,
-			 where+(cb_end-cb_start+1)*(int)times_to_insert,cfile->frames,
-			 get_image_ext_for_type(cfile->img_type));
-    lives_system (com,FALSE);
-    g_free(com);
+    com=lives_strdup_printf("%s undo_insert \"%s\" %d %d %d \"%s\"",
+                            prefs->backend,cfile->handle,where+1,
+                            where+(cb_end-cb_start+1)*(int)times_to_insert,cfile->frames,
+                            get_image_ext_for_type(cfile->img_type));
+    lives_system(com,FALSE);
+    lives_free(com);
 
     cfile->start=start;
     cfile->end=end;
@@ -3257,17 +3245,17 @@
     if (with_sound) {
       // desample clipboard audio
       if (cb_audio_change&&!prefs->conserve_space) {
-	unlink (clipboard->info_file);
-	com=g_strdup_printf ("%s undo_audio \"%s\"",prefs->backend_sync,clipboard->handle);
-	mainw->current_file=0;
-	lives_system (com,FALSE);
-	g_free (com);
-	mainw->current_file=current_file;
-	clipboard->arps=ocarps;
-	reget_afilesize(0);
+        unlink(clipboard->info_file);
+        com=lives_strdup_printf("%s undo_audio \"%s\"",prefs->backend_sync,clipboard->handle);
+        mainw->current_file=0;
+        lives_system(com,FALSE);
+        lives_free(com);
+        mainw->current_file=current_file;
+        clipboard->arps=ocarps;
+        reget_afilesize(0);
       }
     }
-  
+
     if (cb_video_change) {
       // desample clipboard video
       mainw->current_file=0;
@@ -3276,16 +3264,16 @@
       mainw->no_switch_dprint=FALSE;
       mainw->current_file=current_file;
     }
-    
-    switch_to_file (0,current_file);
-    set_undoable (NULL,FALSE);
+
+    switch_to_file(0,current_file);
+    set_undoable(NULL,FALSE);
     mainw->cancelled=CANCEL_USER;
     return;
   }
 
   mainw->cancelled=CANCEL_NONE;
   cfile->nopreview=FALSE;
-  
+
   if (cfile->clip_type==CLIP_TYPE_FILE||virtual_ins) {
     insert_images_in_virtual(mainw->current_file,where,(cb_end-cb_start+1)*(int)times_to_insert,clipboard->frame_index,cb_start*leave_backup);
   }
@@ -3308,20 +3296,18 @@
   // last remainder frames
 
   if (mainw->insert_after&&remainder_frames>0) {
-    msg=g_strdup_printf(_ ("Inserting %d%s frames from the clipboard..."),remainder_frames,
-			times_to_insert>1.?" remainder":"");
-    d_print(msg);
-    g_free(msg);
+    d_print(_("Inserting %d%s frames from the clipboard..."),remainder_frames,
+            times_to_insert>1.?" remainder":"");
 
     if (virtual_ins) remainder_frames=-remainder_frames;
 
-    com=g_strdup_printf("%s insert \"%s\" \"%s\" %d %d %d \"%s\" %d %d %d %d %3f %d %d %d %d %d",
-			prefs->backend,cfile->handle, 
-			get_image_ext_for_type(cfile->img_type), where, 1, remainder_frames, clipboard->handle, 
-			with_sound, cfile->frames, hsize, vsize, cfile->fps, cfile->arate, cfile->achans, 
-			cfile->asampsize, !(cfile->signed_endian&AFORM_UNSIGNED), 
-			!(cfile->signed_endian&AFORM_BIG_ENDIAN ));
-    
+    com=lives_strdup_printf("%s insert \"%s\" \"%s\" %d %d %d \"%s\" %d %d %d %d %3f %d %d %d %d %d",
+                            prefs->backend,cfile->handle,
+                            get_image_ext_for_type(cfile->img_type), where, 1, remainder_frames, clipboard->handle,
+                            with_sound, cfile->frames, hsize, vsize, cfile->fps, cfile->arate, cfile->achans,
+                            cfile->asampsize, !(cfile->signed_endian&AFORM_UNSIGNED),
+                            !(cfile->signed_endian&AFORM_BIG_ENDIAN));
+
     unlink(cfile->info_file);
     mainw->com_failed=FALSE;
     lives_system(com,FALSE);
@@ -3336,7 +3322,7 @@
     cfile->progress_start=1;
     cfile->progress_end=remainder_frames;
 
-    do_progress_dialog(TRUE,FALSE,_ ("Inserting"));
+    do_progress_dialog(TRUE,FALSE,_("Inserting"));
 
     if (mainw->error) {
       d_print_failed();
@@ -3349,7 +3335,7 @@
 
     cfile->frames+=remainder_frames;
     cfile->insert_end+=remainder_frames;
-    g_free(com);
+    lives_free(com);
 
     if (!mainw->insert_after) {
       cfile->start+=remainder_frames;
@@ -3358,8 +3344,8 @@
     get_play_times();
 
     d_print_done();
-  } 
-  
+  }
+
 
   // if we had deferred audio, we insert silence in selection
   if (insert_silence) {
@@ -3384,7 +3370,7 @@
   if (cfile->end==0) cfile->end=cfile->frames;
 
   if (cfile->frames>0&&orig_frames==0) {
-    g_snprintf (cfile->type,40,"Frames");
+    lives_snprintf(cfile->type,40,"Frames");
     cfile->orig_file_name=FALSE;
     cfile->hsize=clipboard->hsize;
     cfile->vsize=clipboard->vsize;
@@ -3415,9 +3401,9 @@
   lives_spin_button_set_value(LIVES_SPIN_BUTTON(mainw->spinbutton_start),cfile->start);
   lives_signal_handler_unblock(mainw->spinbutton_start,mainw->spin_start_func);
 
-  set_undoable (_("Insert"),TRUE);
+  set_undoable(_("Insert"),TRUE);
   cfile->undo1_boolean=with_sound;
-  lives_widget_set_sensitive (mainw->select_new, TRUE);
+  lives_widget_set_sensitive(mainw->select_new, TRUE);
 
   // mark new file size as 'Unknown'
   cfile->f_size=0l;
@@ -3426,17 +3412,16 @@
   if (with_sound) {
     cfile->undo_action=UNDO_INSERT_WITH_AUDIO;
     if (cb_audio_change&&!prefs->conserve_space&&clipboard->achans>0) {
-      unlink (clipboard->info_file);
+      unlink(clipboard->info_file);
       mainw->current_file=0;
-      com=g_strdup_printf ("%s undo_audio \"%s\"",prefs->backend_sync,clipboard->handle);
-      lives_system (com,FALSE);
-      g_free (com);
+      com=lives_strdup_printf("%s undo_audio \"%s\"",prefs->backend_sync,clipboard->handle);
+      lives_system(com,FALSE);
+      lives_free(com);
       mainw->current_file=current_file;
       clipboard->arps=ocarps;
       reget_afilesize(0);
     }
-  }
-  else cfile->undo_action=UNDO_INSERT;
+  } else cfile->undo_action=UNDO_INSERT;
 
   if (cb_video_change) {
     mainw->current_file=0;
@@ -3465,8 +3450,8 @@
 
 
 
-void on_delete_activate (LiVESMenuItem *menuitem, gpointer user_data) {
-  gchar *com;
+void on_delete_activate(LiVESMenuItem *menuitem, livespointer user_data) {
+  char *com;
 
   boolean has_lmap_error=FALSE;
   boolean bad_header=FALSE;
@@ -3480,120 +3465,120 @@
 
   if (cfile->start<=1 && cfile->end==cfile->frames) {
     if (!mainw->osc_auto&&menuitem!=LIVES_MENU_ITEM(mainw->cut) && (cfile->achans==0||
-								    ((double)frames_cut/cfile->fps>=cfile->laudio_time && 
-								     mainw->ccpd_with_sound))) {
+        ((double)frames_cut/cfile->fps>=cfile->laudio_time &&
+         mainw->ccpd_with_sound))) {
       if (do_warning_dialog
-	  (_("\nDeleting all frames will close this file.\nAre you sure ?"))) close_current_file(0);
+          (_("\nDeleting all frames will close this file.\nAre you sure ?"))) close_current_file(0);
       return;
     }
   }
-  
+
   if (menuitem!=NULL) {
     if (!(prefs->warning_mask&WARN_MASK_LAYOUT_DELETE_FRAMES)) {
       if ((mainw->xlays=layout_frame_is_affected(mainw->current_file,cfile->end-frames_cut))!=NULL) {
-	if (!do_warning_dialog
-	    (_("\nDeletion will cause missing frames in some multitrack layouts.\nAre you sure you wish to continue ?\n"))) {
-	  g_list_free_strings(mainw->xlays);
-	  g_list_free(mainw->xlays);
-	  mainw->xlays=NULL;
-	  return;
-	}
-	add_lmap_error(LMAP_ERROR_DELETE_FRAMES,cfile->name,(gpointer)cfile->layout_map,mainw->current_file,
-		       cfile->end-frames_cut,0.,count_resampled_frames(cfile->stored_layout_frame,
-								       cfile->stored_layout_fps,cfile->fps)>=
-		       (cfile->end-frames_cut));
-	has_lmap_error=TRUE;
-	g_list_free_strings(mainw->xlays);
-	g_list_free(mainw->xlays);
-	mainw->xlays=NULL;
+        if (!do_warning_dialog
+            (_("\nDeletion will cause missing frames in some multitrack layouts.\nAre you sure you wish to continue ?\n"))) {
+          lives_list_free_strings(mainw->xlays);
+          lives_list_free(mainw->xlays);
+          mainw->xlays=NULL;
+          return;
+        }
+        add_lmap_error(LMAP_ERROR_DELETE_FRAMES,cfile->name,(livespointer)cfile->layout_map,mainw->current_file,
+                       cfile->end-frames_cut,0.,count_resampled_frames(cfile->stored_layout_frame,
+                           cfile->stored_layout_fps,cfile->fps)>=
+                       (cfile->end-frames_cut));
+        has_lmap_error=TRUE;
+        lives_list_free_strings(mainw->xlays);
+        lives_list_free(mainw->xlays);
+        mainw->xlays=NULL;
       }
     }
-    
+
     if (mainw->ccpd_with_sound&&!(prefs->warning_mask&WARN_MASK_LAYOUT_DELETE_AUDIO)) {
       if ((mainw->xlays=layout_audio_is_affected(mainw->current_file,(cfile->end-frames_cut)/cfile->fps))!=NULL) {
-	if (!do_warning_dialog
-	    (_("\nDeletion will cause missing audio in some multitrack layouts.\nAre you sure you wish to continue ?\n"))) {
-	  g_list_free_strings(mainw->xlays);
-	  g_list_free(mainw->xlays);
-	  mainw->xlays=NULL;
-	  return;
-	}
-	add_lmap_error(LMAP_ERROR_DELETE_AUDIO,cfile->name,(gpointer)cfile->layout_map,mainw->current_file,0,
-		       (cfile->end-frames_cut-1.)/cfile->fps,(cfile->end-frames_cut-1.)/
-		       cfile->fps<cfile->stored_layout_audio);
-	has_lmap_error=TRUE;
-	g_list_free_strings(mainw->xlays);
-	g_list_free(mainw->xlays);
-	mainw->xlays=NULL;
+        if (!do_warning_dialog
+            (_("\nDeletion will cause missing audio in some multitrack layouts.\nAre you sure you wish to continue ?\n"))) {
+          lives_list_free_strings(mainw->xlays);
+          lives_list_free(mainw->xlays);
+          mainw->xlays=NULL;
+          return;
+        }
+        add_lmap_error(LMAP_ERROR_DELETE_AUDIO,cfile->name,(livespointer)cfile->layout_map,mainw->current_file,0,
+                       (cfile->end-frames_cut-1.)/cfile->fps,(cfile->end-frames_cut-1.)/
+                       cfile->fps<cfile->stored_layout_audio);
+        has_lmap_error=TRUE;
+        lives_list_free_strings(mainw->xlays);
+        lives_list_free(mainw->xlays);
+        mainw->xlays=NULL;
       }
     }
-    
+
     if (!has_lmap_error&&!(prefs->warning_mask&WARN_MASK_LAYOUT_SHIFT_FRAMES)) {
       if ((mainw->xlays=layout_frame_is_affected(mainw->current_file,cfile->start))!=NULL) {
-	if (!do_warning_dialog
-	    (_("\nDeletion will cause frames to shift in some multitrack layouts.\nAre you sure you wish to continue ?\n"))) {
-	  g_list_free_strings(mainw->xlays);
-	  g_list_free(mainw->xlays);
-	  mainw->xlays=NULL;
-	  return;
-	}
-	add_lmap_error(LMAP_ERROR_SHIFT_FRAMES,cfile->name,(gpointer)cfile->layout_map,mainw->current_file,
-		       cfile->start,0.,cfile->start<=count_resampled_frames(cfile->stored_layout_frame,
-									    cfile->stored_layout_fps,cfile->fps));
-	has_lmap_error=TRUE;
-	g_list_free_strings(mainw->xlays);
-	g_list_free(mainw->xlays);
-	mainw->xlays=NULL;
+        if (!do_warning_dialog
+            (_("\nDeletion will cause frames to shift in some multitrack layouts.\nAre you sure you wish to continue ?\n"))) {
+          lives_list_free_strings(mainw->xlays);
+          lives_list_free(mainw->xlays);
+          mainw->xlays=NULL;
+          return;
+        }
+        add_lmap_error(LMAP_ERROR_SHIFT_FRAMES,cfile->name,(livespointer)cfile->layout_map,mainw->current_file,
+                       cfile->start,0.,cfile->start<=count_resampled_frames(cfile->stored_layout_frame,
+                           cfile->stored_layout_fps,cfile->fps));
+        has_lmap_error=TRUE;
+        lives_list_free_strings(mainw->xlays);
+        lives_list_free(mainw->xlays);
+        mainw->xlays=NULL;
       }
     }
-    
+
     if (mainw->ccpd_with_sound&&!has_lmap_error&&!(prefs->warning_mask&WARN_MASK_LAYOUT_SHIFT_AUDIO)) {
       if ((mainw->xlays=layout_audio_is_affected(mainw->current_file,(cfile->start-1.)/cfile->fps))!=NULL) {
-	if (!do_warning_dialog
-	    (_("\nDeletion will cause audio to shift in some multitrack layouts.\nAre you sure you wish to continue ?\n"))) {
-	  g_list_free_strings(mainw->xlays);
-	  g_list_free(mainw->xlays);
-	  mainw->xlays=NULL;
-	  return;
-	}
-	add_lmap_error(LMAP_ERROR_SHIFT_AUDIO,cfile->name,(gpointer)cfile->layout_map,mainw->current_file,0,
-		       (cfile->start-1.)/cfile->fps,(cfile->start-1.)/cfile->fps<=cfile->stored_layout_audio);
-	has_lmap_error=TRUE;
-	g_list_free_strings(mainw->xlays);
-	g_list_free(mainw->xlays);
-	mainw->xlays=NULL;
+        if (!do_warning_dialog
+            (_("\nDeletion will cause audio to shift in some multitrack layouts.\nAre you sure you wish to continue ?\n"))) {
+          lives_list_free_strings(mainw->xlays);
+          lives_list_free(mainw->xlays);
+          mainw->xlays=NULL;
+          return;
+        }
+        add_lmap_error(LMAP_ERROR_SHIFT_AUDIO,cfile->name,(livespointer)cfile->layout_map,mainw->current_file,0,
+                       (cfile->start-1.)/cfile->fps,(cfile->start-1.)/cfile->fps<=cfile->stored_layout_audio);
+        has_lmap_error=TRUE;
+        lives_list_free_strings(mainw->xlays);
+        lives_list_free(mainw->xlays);
+        mainw->xlays=NULL;
       }
     }
-    
+
     if (!has_lmap_error&&!(prefs->warning_mask&WARN_MASK_LAYOUT_ALTER_FRAMES)&&
-	(mainw->xlays=layout_frame_is_affected(mainw->current_file,1))!=NULL) {
+        (mainw->xlays=layout_frame_is_affected(mainw->current_file,1))!=NULL) {
       if (!do_layout_alter_frames_warning()) {
-	g_list_free_strings(mainw->xlays);
-	g_list_free(mainw->xlays);
-	mainw->xlays=NULL;
-	return;
+        lives_list_free_strings(mainw->xlays);
+        lives_list_free(mainw->xlays);
+        mainw->xlays=NULL;
+        return;
       }
-      add_lmap_error(LMAP_ERROR_ALTER_FRAMES,cfile->name,(gpointer)cfile->layout_map,mainw->current_file,0,0.,
-		     cfile->stored_layout_frame>0);
+      add_lmap_error(LMAP_ERROR_ALTER_FRAMES,cfile->name,(livespointer)cfile->layout_map,mainw->current_file,0,0.,
+                     cfile->stored_layout_frame>0);
       has_lmap_error=TRUE;
-      g_list_free_strings(mainw->xlays);
-      g_list_free(mainw->xlays);
+      lives_list_free_strings(mainw->xlays);
+      lives_list_free(mainw->xlays);
       mainw->xlays=NULL;
     }
 
     if (mainw->ccpd_with_sound&&!has_lmap_error&&!(prefs->warning_mask&WARN_MASK_LAYOUT_ALTER_AUDIO)&&
-	(mainw->xlays=layout_audio_is_affected(mainw->current_file,0.))!=NULL) {
+        (mainw->xlays=layout_audio_is_affected(mainw->current_file,0.))!=NULL) {
       if (!do_layout_alter_audio_warning()) {
-	g_list_free_strings(mainw->xlays);
-	g_list_free(mainw->xlays);
-	mainw->xlays=NULL;
-	return;
+        lives_list_free_strings(mainw->xlays);
+        lives_list_free(mainw->xlays);
+        mainw->xlays=NULL;
+        return;
       }
-      add_lmap_error(LMAP_ERROR_ALTER_AUDIO,cfile->name,(gpointer)cfile->layout_map,mainw->current_file,0,0.,
-		     cfile->stored_layout_audio>0.);
+      add_lmap_error(LMAP_ERROR_ALTER_AUDIO,cfile->name,(livespointer)cfile->layout_map,mainw->current_file,0,0.,
+                     cfile->stored_layout_audio>0.);
       has_lmap_error=TRUE;
-      g_list_free_strings(mainw->xlays);
-      g_list_free(mainw->xlays);
+      lives_list_free_strings(mainw->xlays);
+      lives_list_free(mainw->xlays);
       mainw->xlays=NULL;
     }
   }
@@ -3608,21 +3593,19 @@
   cfile->undo1_boolean=mainw->ccpd_with_sound;
 
   if (menuitem!=NULL||mainw->osc_auto) {
-    com=g_strdup_printf(_ ("Deleting frames %d to %d%s..."),cfile->start,cfile->end,
-			mainw->ccpd_with_sound&&cfile->achans>0?" (with sound)":"");
     d_print(""); // force switchtext
-    d_print(com);
-    g_free(com);
+    d_print(_("Deleting frames %d to %d%s..."),cfile->start,cfile->end,
+            mainw->ccpd_with_sound&&cfile->achans>0?" (with sound)":"");
   }
 
-  com=g_strdup_printf("%s cut \"%s\" %d %d %d %d \"%s\" %.3f %d %d %d",
-		      prefs->backend,cfile->handle,cfile->start,cfile->end, 
-		      mainw->ccpd_with_sound, cfile->frames, get_image_ext_for_type(cfile->img_type), 
-		      cfile->fps, cfile->arate, cfile->achans, cfile->asampsize);
+  com=lives_strdup_printf("%s cut \"%s\" %d %d %d %d \"%s\" %.3f %d %d %d",
+                          prefs->backend,cfile->handle,cfile->start,cfile->end,
+                          mainw->ccpd_with_sound, cfile->frames, get_image_ext_for_type(cfile->img_type),
+                          cfile->fps, cfile->arate, cfile->achans, cfile->asampsize);
   unlink(cfile->info_file);
   mainw->com_failed=FALSE;
   lives_system(com,FALSE);
-  g_free(com);
+  lives_free(com);
 
   if (mainw->com_failed) {
     d_print_failed();
@@ -3633,10 +3616,10 @@
   cfile->progress_end=cfile->frames;
 
   // show a progress dialog, not cancellable
-  do_progress_dialog(TRUE,FALSE,_ ("Deleting"));
+  do_progress_dialog(TRUE,FALSE,_("Deleting"));
 
   if (cfile->clip_type==CLIP_TYPE_FILE) {
-    delete_frames_from_virtual (mainw->current_file, cfile->start, cfile->end);
+    delete_frames_from_virtual(mainw->current_file, cfile->start, cfile->end);
   }
 
   cfile->frames-=frames_cut;
@@ -3656,7 +3639,7 @@
       close_current_file(0);
       return;
     }
-    g_snprintf (cfile->type,40,"Audio");
+    lives_snprintf(cfile->type,40,"Audio");
     cfile->hsize=cfile->vsize=0;
     save_clip_value(mainw->current_file,CLIP_DETAILS_WIDTH,&cfile->hsize);
     if (mainw->com_failed||mainw->write_failed) bad_header=TRUE;
@@ -3679,8 +3662,7 @@
 
   if (!mainw->selwidth_locked) {
     cfile->end=start;
-  }
-  else {
+  } else {
     cfile->end=end;
     if (cfile->end>cfile->frames) {
       cfile->end=cfile->frames;
@@ -3705,7 +3687,7 @@
 
   load_start_image(cfile->start);
   load_end_image(cfile->end);
-  
+
   get_play_times();
 
   if (bad_header) do_header_write_error(mainw->current_file);
@@ -3714,7 +3696,7 @@
   cfile->f_size=0l;
   cfile->changed=TRUE;
 
-  set_undoable (_("Delete"),TRUE);
+  set_undoable(_("Delete"),TRUE);
   cfile->undo_action=UNDO_DELETE;
   d_print_done();
 
@@ -3728,14 +3710,11 @@
 
 
 
-void
-on_select_all_activate                (LiVESMenuItem     *menuitem,
-				       gpointer         user_data)
-{
+void on_select_all_activate(LiVESMenuItem *menuitem, livespointer user_data) {
   if (mainw->current_file==-1) return;
 
   if (mainw->selwidth_locked) {
-    if (menuitem!=NULL) do_error_dialog(_ ("\n\nSelection is locked.\n"));
+    if (menuitem!=NULL) do_error_dialog(_("\n\nSelection is locked.\n"));
     return;
   }
 
@@ -3753,17 +3732,15 @@
 
 
 void
-on_select_start_only_activate                (LiVESMenuItem     *menuitem,
-					      gpointer         user_data)
-{
+on_select_start_only_activate(LiVESMenuItem     *menuitem,
+                              livespointer         user_data) {
   if (mainw->current_file==-1) return;
   lives_spin_button_set_value(LIVES_SPIN_BUTTON(mainw->spinbutton_end),cfile->start);
 }
 
 void
-on_select_end_only_activate                (LiVESMenuItem     *menuitem,
-					    gpointer         user_data)
-{
+on_select_end_only_activate(LiVESMenuItem     *menuitem,
+                            livespointer         user_data) {
   if (mainw->current_file==-1) return;
   lives_spin_button_set_value(LIVES_SPIN_BUTTON(mainw->spinbutton_start),cfile->end);
 }
@@ -3771,14 +3748,12 @@
 
 
 void
-on_select_invert_activate                (LiVESMenuItem     *menuitem,
-					  gpointer         user_data)
-{
+on_select_invert_activate(LiVESMenuItem     *menuitem,
+                          livespointer         user_data) {
   if (cfile->start==1) {
     lives_spin_button_set_value(LIVES_SPIN_BUTTON(mainw->spinbutton_start),cfile->end+1);
     lives_spin_button_set_value(LIVES_SPIN_BUTTON(mainw->spinbutton_end),cfile->frames);
-  }
-  else {
+  } else {
     lives_spin_button_set_value(LIVES_SPIN_BUTTON(mainw->spinbutton_end),cfile->start-1);
     lives_spin_button_set_value(LIVES_SPIN_BUTTON(mainw->spinbutton_start),1);
   }
@@ -3790,9 +3765,8 @@
 }
 
 void
-on_select_last_activate                (LiVESMenuItem     *menuitem,
-                                        gpointer         user_data)
-{
+on_select_last_activate(LiVESMenuItem     *menuitem,
+                        livespointer         user_data) {
   if (cfile->undo_start > cfile->frames) cfile->undo_start=cfile->frames;
   if (cfile->undo_end > cfile->frames) cfile->undo_end=cfile->frames;
 
@@ -3810,9 +3784,8 @@
 
 
 void
-on_select_new_activate                (LiVESMenuItem     *menuitem,
-                                        gpointer         user_data)
-{
+on_select_new_activate(LiVESMenuItem     *menuitem,
+                       livespointer         user_data) {
   if (cfile->insert_start > cfile->frames) cfile->insert_start=cfile->frames;
   if (cfile->insert_end > cfile->frames) cfile->insert_end=cfile->frames;
 
@@ -3829,9 +3802,8 @@
 }
 
 void
-on_select_to_end_activate                (LiVESMenuItem     *menuitem,
-					  gpointer         user_data)
-{
+on_select_to_end_activate(LiVESMenuItem     *menuitem,
+                          livespointer         user_data) {
   lives_spin_button_set_value(LIVES_SPIN_BUTTON(mainw->spinbutton_end),cfile->frames);
   cfile->end=cfile->frames;
   get_play_times();
@@ -3839,9 +3811,8 @@
 }
 
 void
-on_select_from_start_activate                (LiVESMenuItem     *menuitem,
-					      gpointer         user_data)
-{
+on_select_from_start_activate(LiVESMenuItem     *menuitem,
+                              livespointer         user_data) {
   lives_spin_button_set_value(LIVES_SPIN_BUTTON(mainw->spinbutton_start),1);
   cfile->start=cfile->frames>0?1:0;
   get_play_times();
@@ -3849,43 +3820,39 @@
 }
 
 void
-on_lock_selwidth_activate                (LiVESMenuItem     *menuitem,
-					  gpointer         user_data)
-{
+on_lock_selwidth_activate(LiVESMenuItem     *menuitem,
+                          livespointer         user_data) {
   mainw->selwidth_locked=!mainw->selwidth_locked;
   lives_widget_set_sensitive(mainw->select_submenu,!mainw->selwidth_locked);
 }
 
 
-void
-on_menubar_activate_menuitem                    (LiVESMenuItem     *menuitem,
-						 gpointer         user_data) {
-  gtk_menu_item_activate(menuitem);
+void on_menubar_activate_menuitem(LiVESMenuItem *menuitem, livespointer user_data) {
+  lives_menu_item_activate(menuitem);
   //gtk_menu_shell_set_take_focus(GTK_MENU_SHELL(mainw->menubar),TRUE);
 }
 
 
-void on_playall_activate (LiVESMenuItem *menuitem, gpointer user_data) {
+void on_playall_activate(LiVESMenuItem *menuitem, livespointer user_data) {
   if (mainw->current_file<=0) return;
 
   if (mainw->multitrack!=NULL) {
     if (mainw->playing_file==-1) {
       if (!mainw->multitrack->playing_sel) multitrack_playall(mainw->multitrack);
       else multitrack_play_sel(NULL,mainw->multitrack);
-    }
-    else on_pause_clicked();
+    } else on_pause_clicked();
     return;
   }
 
   if (mainw->playing_file==-1) {
     if (cfile->proc_ptr!=NULL&&menuitem!=NULL) {
-      on_preview_clicked (LIVES_BUTTON (cfile->proc_ptr->preview_button),NULL);
+      on_preview_clicked(LIVES_BUTTON(cfile->proc_ptr->preview_button),NULL);
       return;
     }
 
     if (!mainw->osc_auto) {
       mainw->play_start=calc_frame_from_time(mainw->current_file,
-					     cfile->pointer_time);
+                                             cfile->pointer_time);
       mainw->play_end=cfile->frames;
     }
 
@@ -3893,7 +3860,7 @@
     unlink(cfile->info_file);
 
     play_file();
-    lives_ruler_set_value(LIVES_RULER (mainw->hruler),cfile->pointer_time);
+    lives_ruler_set_value(LIVES_RULER(mainw->hruler),cfile->pointer_time);
     get_play_times();
     mainw->noswitch=FALSE;
   }
@@ -3901,16 +3868,16 @@
 }
 
 
-void on_playsel_activate (LiVESMenuItem *menuitem, gpointer user_data) {
+void on_playsel_activate(LiVESMenuItem *menuitem, livespointer user_data) {
   // play part of a clip (in clip editor)
 
   if (mainw->current_file<=0) return;
 
   if (cfile->proc_ptr!=NULL&&menuitem!=NULL) {
-    on_preview_clicked (LIVES_BUTTON (cfile->proc_ptr->preview_button),NULL);
+    on_preview_clicked(LIVES_BUTTON(cfile->proc_ptr->preview_button),NULL);
     return;
   }
-  
+
   if (!mainw->is_rendering) {
     mainw->play_start=cfile->start;
     mainw->play_end=cfile->end;
@@ -3929,8 +3896,8 @@
   play_file();
 
   mainw->playing_sel=FALSE;
-  lives_ruler_set_value(LIVES_RULER (mainw->hruler),cfile->pointer_time);
-  lives_widget_queue_draw (mainw->hruler);
+  lives_ruler_set_value(LIVES_RULER(mainw->hruler),cfile->pointer_time);
+  lives_widget_queue_draw(mainw->hruler);
 
   // in case we are rendering and previewing, in case we now have audio
   if (mainw->preview&&mainw->is_rendering&&mainw->is_processing) reget_afilesize(mainw->current_file);
@@ -3940,16 +3907,16 @@
 }
 
 
-void on_playclip_activate (LiVESMenuItem *menuitem, gpointer user_data) {
+void on_playclip_activate(LiVESMenuItem *menuitem, livespointer user_data) {
   // play the clipboard
   int current_file=mainw->current_file;
   boolean oloop=mainw->loop;
   boolean oloop_cont=mainw->loop_cont;
 
   // switch to the clipboard
-  switch_to_file (current_file,0);
-  lives_widget_set_sensitive (mainw->loop_video, FALSE);
-  lives_widget_set_sensitive (mainw->loop_continue, FALSE);
+  switch_to_file(current_file,0);
+  lives_widget_set_sensitive(mainw->loop_video, FALSE);
+  lives_widget_set_sensitive(mainw->loop_continue, FALSE);
   mainw->loop=mainw->loop_cont=FALSE;
 
   mainw->play_start=1;
@@ -3964,8 +3931,7 @@
 
   if (current_file>-1) {
     switch_to_file(0,current_file);
-  }
-  else {
+  } else {
     mainw->current_file=current_file;
     close_current_file(0);
   }
@@ -3975,7 +3941,7 @@
 
 
 
-void on_record_perf_activate (LiVESMenuItem *menuitem, gpointer user_data) {
+void on_record_perf_activate(LiVESMenuItem *menuitem, livespointer user_data) {
   // real time recording
 
   if (mainw->multitrack!=NULL) return;
@@ -3991,82 +3957,80 @@
       toggle_record();
 
       if ((prefs->rec_opts&REC_AUDIO)&&(mainw->agen_key!=0||mainw->agen_needs_reinit||prefs->audio_src==AUDIO_SRC_EXT)&&
-	  ((prefs->audio_player==AUD_PLAYER_JACK) ||
-	   (prefs->audio_player==AUD_PLAYER_PULSE))) {
+          ((prefs->audio_player==AUD_PLAYER_JACK) ||
+           (prefs->audio_player==AUD_PLAYER_PULSE))) {
+
+        if (mainw->ascrap_file==-1) open_ascrap_file();
+        if (mainw->ascrap_file!=-1) {
+          mainw->rec_samples=-1; // record unlimited
+
+          mainw->rec_aclip=mainw->ascrap_file;
+          mainw->rec_avel=1.;
 
-	if (mainw->ascrap_file==-1) open_ascrap_file();
-	if (mainw->ascrap_file!=-1) {
-	  mainw->rec_samples=-1; // record unlimited
-	  
-	  mainw->rec_aclip=mainw->ascrap_file;
-	  mainw->rec_avel=1.;
-	  
 #ifdef ENABLE_JACK
-	if (prefs->audio_player==AUD_PLAYER_JACK) {
-	  if (mainw->agen_key==0&&!mainw->agen_needs_reinit) {
-	    jack_rec_audio_to_clip(mainw->ascrap_file, -1, RECA_EXTERNAL);
-	    mainw->jackd_read->in_use=TRUE;
-	  }
-	  else {
-	    if (mainw->jackd!=NULL) {
-	      jack_rec_audio_to_clip(mainw->ascrap_file, -1, RECA_GENERATED);
-	      mainw->jackd_read->in_use=TRUE;
-	    }
-	  }
-	}
+          if (prefs->audio_player==AUD_PLAYER_JACK) {
+            if (mainw->agen_key==0&&!mainw->agen_needs_reinit) {
+              jack_rec_audio_to_clip(mainw->ascrap_file, -1, RECA_EXTERNAL);
+              mainw->jackd_read->in_use=TRUE;
+            } else {
+              if (mainw->jackd!=NULL) {
+                jack_rec_audio_to_clip(mainw->ascrap_file, -1, RECA_GENERATED);
+                mainw->jackd_read->in_use=TRUE;
+              }
+            }
+          }
 
 #endif
 #ifdef HAVE_PULSE_AUDIO
-	if (prefs->audio_player==AUD_PLAYER_PULSE) {
-	  if (mainw->agen_key==0&&!mainw->agen_needs_reinit) {
-	    pulse_rec_audio_to_clip(mainw->ascrap_file, -1, RECA_EXTERNAL);
-	    mainw->pulsed_read->in_use=TRUE;
-	  }
-	  else {
-	    if (mainw->pulsed!=NULL) {
-	      pulse_rec_audio_to_clip(mainw->ascrap_file, -1, RECA_GENERATED);
-	      mainw->pulsed_read->in_use=TRUE;
-	    }
-	  }
-	}
+          if (prefs->audio_player==AUD_PLAYER_PULSE) {
+            if (mainw->agen_key==0&&!mainw->agen_needs_reinit) {
+              pulse_rec_audio_to_clip(mainw->ascrap_file, -1, RECA_EXTERNAL);
+              mainw->pulsed_read->in_use=TRUE;
+            } else {
+              if (mainw->pulsed!=NULL) {
+                pulse_rec_audio_to_clip(mainw->ascrap_file, -1, RECA_GENERATED);
+                mainw->pulsed_read->in_use=TRUE;
+              }
+            }
+          }
 #endif
-	}
-	return;
+        }
+        return;
       }
 
 
       if (prefs->rec_opts&REC_AUDIO) {
-	// recording INTERNAL audio
+        // recording INTERNAL audio
 #ifdef ENABLE_JACK
-	if (prefs->audio_player==AUD_PLAYER_JACK&&mainw->jackd!=NULL) {
-	  jack_get_rec_avals(mainw->jackd);
-	}
+        if (prefs->audio_player==AUD_PLAYER_JACK&&mainw->jackd!=NULL) {
+          jack_get_rec_avals(mainw->jackd);
+        }
 #endif
 #ifdef HAVE_PULSE_AUDIO
-	if (prefs->audio_player==AUD_PLAYER_PULSE&&mainw->pulsed!=NULL) {
-	  pulse_get_rec_avals(mainw->pulsed);
-	}
-#endif	
+        if (prefs->audio_player==AUD_PLAYER_PULSE&&mainw->pulsed!=NULL) {
+          pulse_get_rec_avals(mainw->pulsed);
+        }
+#endif
       }
       return;
     }
 
     // end record during playback
-      
+
     if (mainw->event_list!=NULL) {
       // switch audio off at previous frame event
       pthread_mutex_lock(&mainw->event_list_mutex);
 
 #ifdef RT_AUDIO
-      if ((prefs->audio_player==AUD_PLAYER_JACK||prefs->audio_player==AUD_PLAYER_PULSE)&&(prefs->rec_opts&REC_AUDIO)) {
-	weed_plant_t *last_frame=get_last_frame_event(mainw->event_list);
-	insert_audio_event_at(mainw->event_list, last_frame, -1, mainw->rec_aclip, 0., 0.);
+      if (is_realtime_aplayer(prefs->audio_player)&&(prefs->rec_opts&REC_AUDIO)) {
+        weed_plant_t *last_frame=get_last_frame_event(mainw->event_list);
+        insert_audio_event_at(mainw->event_list, last_frame, -1, mainw->rec_aclip, 0., 0.);
       }
 #endif
 
       if (prefs->rec_opts&REC_EFFECTS) {
-	// add deinit events for all active effects
-	add_filter_deinit_events(mainw->event_list);
+        // add deinit events for all active effects
+        add_filter_deinit_events(mainw->event_list);
       }
 
       // write a RECORD_END marker
@@ -4084,18 +4048,17 @@
 
 
   // out of playback
- 
+
   // record performance
   if (!mainw->record) {
 
     // TODO - change message depending on rec_opts
-    d_print(_ ("Ready to record. Use 'control' and cursor keys during playback to record your performance.\n(To cancel, press 'r' or click on Play|Record Performance again before you play.)\n"));
+    d_print(_("Ready to record. Use 'control' and cursor keys during playback to record your performance.\n(To cancel, press 'r' or click on Play|Record Performance again before you play.)\n"));
     mainw->record=TRUE;
     toggle_record();
     get_play_times();
-  }
-  else {
-    d_print (_("Record cancelled.\n"));
+  } else {
+    d_print(_("Record cancelled.\n"));
     enable_record();
     mainw->record=FALSE;
   }
@@ -4103,12 +4066,12 @@
 
 
 
-boolean record_toggle_callback (LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, 
-				 gpointer user_data) {
+boolean record_toggle_callback(LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod,
+                               livespointer user_data) {
   // from osc
-  boolean start=(boolean)GPOINTER_TO_INT(user_data);
+  boolean start=(boolean)LIVES_POINTER_TO_INT(user_data);
 
-  if ((start&&(!mainw->record||mainw->record_paused))||(!start&&(mainw->record&&!mainw->record_paused))) 
+  if ((start&&(!mainw->record||mainw->record_paused))||(!start&&(mainw->record&&!mainw->record_paused)))
     on_record_perf_activate(NULL,NULL);
 
   return TRUE;
@@ -4119,31 +4082,28 @@
 
 
 
-void
-on_rewind_activate                    (LiVESMenuItem     *menuitem,
-				       gpointer         user_data)
-{
+void on_rewind_activate(LiVESMenuItem *menuitem, livespointer user_data) {
   if (mainw->multitrack!=NULL) {
-    mt_tl_move(mainw->multitrack,-lives_ruler_get_value(LIVES_RULER (mainw->multitrack->timeline)));
+    mt_tl_move(mainw->multitrack,0.);
     return;
   }
 
-  cfile->pointer_time=lives_ruler_set_value(LIVES_RULER (mainw->hruler),0.);
-  lives_widget_queue_draw (mainw->hruler);
-  lives_widget_set_sensitive (mainw->rewind, FALSE);
-  lives_widget_set_sensitive (mainw->m_rewindbutton, FALSE);
-  lives_widget_set_sensitive (mainw->trim_to_pstart, FALSE);
+  cfile->pointer_time=lives_ruler_set_value(LIVES_RULER(mainw->hruler),0.);
+  lives_widget_queue_draw(mainw->hruler);
+  lives_widget_set_sensitive(mainw->rewind, FALSE);
+  lives_widget_set_sensitive(mainw->m_rewindbutton, FALSE);
+  lives_widget_set_sensitive(mainw->trim_to_pstart, FALSE);
   get_play_times();
 }
 
 
-void on_stop_activate (LiVESMenuItem *menuitem, gpointer user_data) {
+void on_stop_activate(LiVESMenuItem *menuitem, livespointer user_data) {
   if (mainw->multitrack!=NULL&&mainw->multitrack->is_paused&&mainw->playing_file==-1) {
     mainw->multitrack->is_paused=FALSE;
     mainw->multitrack->playing_sel=FALSE;
-    mt_tl_move(mainw->multitrack,mainw->multitrack->ptr_time-lives_ruler_get_value(LIVES_RULER (mainw->multitrack->timeline)));
-    lives_widget_set_sensitive (mainw->stop, FALSE);
-    lives_widget_set_sensitive (mainw->m_stopbutton, FALSE);
+    mt_tl_move(mainw->multitrack,mainw->multitrack->ptr_time);
+    lives_widget_set_sensitive(mainw->stop, FALSE);
+    lives_widget_set_sensitive(mainw->m_stopbutton, FALSE);
     return;
   }
   mainw->cancelled=CANCEL_USER;
@@ -4154,7 +4114,7 @@
 
 
 
-boolean on_stop_activate_by_del (LiVESWidget *widget, GdkEvent *event, gpointer user_data) {
+boolean on_stop_activate_by_del(LiVESWidget *widget, LiVESXEventDelete *event, livespointer user_data) {
   // called if the user closes the separate play window
   if (mainw->playing_file>-1) {
     mainw->cancelled=CANCEL_USER;
@@ -4176,26 +4136,26 @@
 }
 
 
-void on_encoder_entry_changed (LiVESCombo *combo, gpointer ptr) {
-  GList *encoder_capabilities=NULL;
-  GList *ofmt_all=NULL;
-  GList *ofmt=NULL;
-
-  gchar *new_encoder_name = lives_combo_get_active_text(combo);
-  gchar *msg;
-  gchar **array;
+void on_encoder_entry_changed(LiVESCombo *combo, livespointer ptr) {
+  LiVESList *encoder_capabilities=NULL;
+  LiVESList *ofmt_all=NULL;
+  LiVESList *ofmt=NULL;
+
+  char *new_encoder_name = lives_combo_get_active_text(combo);
+  char *msg;
+  char **array;
   int i;
   render_details *rdet=(render_details *)ptr;
-  GList *dummy_list;
+  LiVESList *dummy_list;
 
-  if (!strlen (new_encoder_name)) {
-    g_free(new_encoder_name);
+  if (!strlen(new_encoder_name)) {
+    lives_free(new_encoder_name);
     return;
   }
 
-  if (!strcmp(new_encoder_name,mainw->string_constants[LIVES_STRING_CONSTANT_ANY])) { 
-    GList *ofmt = NULL;
-    ofmt = g_list_append(ofmt,g_strdup(mainw->string_constants[LIVES_STRING_CONSTANT_ANY]));
+  if (!strcmp(new_encoder_name,mainw->string_constants[LIVES_STRING_CONSTANT_ANY])) {
+    LiVESList *ofmt = NULL;
+    ofmt = lives_list_append(ofmt,lives_strdup(mainw->string_constants[LIVES_STRING_CONSTANT_ANY]));
 
     lives_signal_handler_block(rdet->encoder_combo, rdet->encoder_name_fn);
     // ---
@@ -4204,24 +4164,24 @@
     lives_signal_handler_unblock(rdet->encoder_combo, rdet->encoder_name_fn);
 
     lives_combo_populate(LIVES_COMBO(rdet->ofmt_combo), ofmt);
-    lives_signal_handler_block (rdet->ofmt_combo, rdet->encoder_ofmt_fn);
+    lives_signal_handler_block(rdet->ofmt_combo, rdet->encoder_ofmt_fn);
     lives_combo_set_active_string(LIVES_COMBO(rdet->ofmt_combo),mainw->string_constants[LIVES_STRING_CONSTANT_ANY]);
-    lives_signal_handler_unblock (rdet->ofmt_combo, rdet->encoder_ofmt_fn);
+    lives_signal_handler_unblock(rdet->ofmt_combo, rdet->encoder_ofmt_fn);
 
-    g_list_free(ofmt);
+    lives_list_free(ofmt);
     if (prefs->acodec_list!=NULL) {
-      g_list_free_strings (prefs->acodec_list);
-      g_list_free (prefs->acodec_list);
+      lives_list_free_strings(prefs->acodec_list);
+      lives_list_free(prefs->acodec_list);
       prefs->acodec_list=NULL;
     }
-    prefs->acodec_list = g_list_append(prefs->acodec_list, g_strdup(mainw->string_constants[LIVES_STRING_CONSTANT_ANY]));
+    prefs->acodec_list = lives_list_append(prefs->acodec_list, lives_strdup(mainw->string_constants[LIVES_STRING_CONSTANT_ANY]));
 
     lives_combo_populate(LIVES_COMBO(rdet->acodec_combo), prefs->acodec_list);
 
     lives_combo_set_active_string(LIVES_COMBO(rdet->acodec_combo),mainw->string_constants[LIVES_STRING_CONSTANT_ANY]);
 
-    g_free(new_encoder_name);
-  
+    lives_free(new_encoder_name);
+
     rdet->enc_changed=FALSE;
 
     return;
@@ -4229,21 +4189,20 @@
 
   // finalise old plugin
   plugin_request(PLUGIN_ENCODERS,prefs->encoder.name,"finalise");
-  
+
   clear_mainw_msg();
   // initialise new plugin
   if ((dummy_list = plugin_request(PLUGIN_ENCODERS, new_encoder_name, "init")) == NULL) {
-    if (strlen (mainw->msg)) {
-      msg = g_strdup_printf (_ ("\n\nThe '%s' plugin reports:\n%s\n"), new_encoder_name, mainw->msg);
-    }
-    else {
-      msg = g_strdup_printf 
-	(_("\n\nUnable to find the 'init' method in the %s plugin.\nThe plugin may be broken or not installed correctly."),
-	 new_encoder_name);
+    if (strlen(mainw->msg)) {
+      msg = lives_strdup_printf(_("\n\nThe '%s' plugin reports:\n%s\n"), new_encoder_name, mainw->msg);
+    } else {
+      msg = lives_strdup_printf
+            (_("\n\nUnable to find the 'init' method in the %s plugin.\nThe plugin may be broken or not installed correctly."),
+             new_encoder_name);
     }
-    g_free(new_encoder_name);
+    lives_free(new_encoder_name);
 
-    if (mainw->is_ready){
+    if (mainw->is_ready) {
       LiVESWindow *twindow=LIVES_WINDOW(mainw->LiVES);
       if (prefsw!=NULL) twindow=LIVES_WINDOW(prefsw->prefs_dialog);
       else if (mainw->multitrack!=NULL) twindow=LIVES_WINDOW(mainw->multitrack->window);
@@ -4251,7 +4210,7 @@
       do_error_dialog_with_check_transient(msg,TRUE,0,twindow);
     }
 
-    g_free (msg);
+    lives_free(msg);
 
     if (prefsw != NULL) {
       lives_signal_handler_block(prefsw->encoder_combo, prefsw->encoder_name_fn);
@@ -4271,19 +4230,19 @@
 
     dummy_list = plugin_request(PLUGIN_ENCODERS, prefs->encoder.name, "init");
     if (dummy_list != NULL) {
-      g_list_free_strings(dummy_list);
-      g_list_free(dummy_list);
+      lives_list_free_strings(dummy_list);
+      lives_list_free(dummy_list);
     }
     return;
   }
-  g_list_free_strings(dummy_list);
-  g_list_free(dummy_list);
+  lives_list_free_strings(dummy_list);
+  lives_list_free(dummy_list);
 
-  g_snprintf(future_prefs->encoder.name,51,"%s",new_encoder_name);
-  g_free(new_encoder_name);
+  lives_snprintf(future_prefs->encoder.name,51,"%s",new_encoder_name);
+  lives_free(new_encoder_name);
 
   if ((encoder_capabilities=plugin_request(PLUGIN_ENCODERS,future_prefs->encoder.name,"get_capabilities"))==NULL) {
- 
+
     do_plugin_encoder_error(future_prefs->encoder.name);
 
     if (prefsw!=NULL) {
@@ -4295,28 +4254,28 @@
     }
 
     if (rdet!=NULL) {
-      lives_signal_handler_block (rdet->encoder_combo, rdet->encoder_name_fn);
+      lives_signal_handler_block(rdet->encoder_combo, rdet->encoder_name_fn);
       // ---
       lives_combo_set_active_string(LIVES_COMBO(rdet->encoder_combo), rdet->encoder_name);
       // ---
-      lives_signal_handler_unblock (rdet->encoder_combo, rdet->encoder_name_fn);
+      lives_signal_handler_unblock(rdet->encoder_combo, rdet->encoder_name_fn);
     }
 
     plugin_request(PLUGIN_ENCODERS, prefs->encoder.name, "init");
-    g_snprintf(future_prefs->encoder.name,51,"%s",prefs->encoder.name);
+    lives_snprintf(future_prefs->encoder.name,51,"%s",prefs->encoder.name);
     return;
   }
-  prefs->encoder.capabilities = atoi((gchar *)g_list_nth_data(encoder_capabilities,0));
-  g_list_free_strings (encoder_capabilities);
-  g_list_free (encoder_capabilities);
+  prefs->encoder.capabilities = atoi((char *)lives_list_nth_data(encoder_capabilities,0));
+  lives_list_free_strings(encoder_capabilities);
+  lives_list_free(encoder_capabilities);
 
   // fill list with new formats
   if ((ofmt_all = plugin_request_by_line(PLUGIN_ENCODERS,future_prefs->encoder.name,"get_formats"))!=NULL) {
-    for (i=0;i<g_list_length(ofmt_all);i++) {
-      if (get_token_count ((gchar *)g_list_nth_data (ofmt_all,i),'|')>2) {
-	array=g_strsplit ((gchar *)g_list_nth_data (ofmt_all,i),"|",-1);
-	ofmt=g_list_append(ofmt,g_strdup (array[1]));
-	g_strfreev (array);
+    for (i=0; i<lives_list_length(ofmt_all); i++) {
+      if (get_token_count((char *)lives_list_nth_data(ofmt_all,i),'|')>2) {
+        array=lives_strsplit((char *)lives_list_nth_data(ofmt_all,i),"|",-1);
+        ofmt=lives_list_append(ofmt,lives_strdup(array[1]));
+        lives_strfreev(array);
       }
     }
 
@@ -4331,71 +4290,67 @@
 
     if (rdet!=NULL) {
       // we have to block here, otherwise on_ofmt_changed gets called for every added entry !
-      lives_signal_handler_block (rdet->ofmt_combo, rdet->encoder_ofmt_fn);
+      lives_signal_handler_block(rdet->ofmt_combo, rdet->encoder_ofmt_fn);
 
       lives_combo_populate(LIVES_COMBO(rdet->ofmt_combo), ofmt);
 
       lives_signal_handler_unblock(rdet->ofmt_combo, rdet->encoder_ofmt_fn);
     }
-    
-    g_list_free(ofmt);
+
+    lives_list_free(ofmt);
 
     // set default (first) output type
-    array=g_strsplit ((gchar *)g_list_nth_data (ofmt_all,0),"|",-1);
+    array=lives_strsplit((char *)lives_list_nth_data(ofmt_all,0),"|",-1);
 
     if (rdet!=NULL) {
       lives_combo_set_active_string(LIVES_COMBO(rdet->ofmt_combo), array[1]);
 
       if (prefsw==NULL&&strcmp(prefs->encoder.name,future_prefs->encoder.name)) {
-	g_snprintf(prefs->encoder.name,51,"%s",future_prefs->encoder.name);
-	set_pref("encoder",prefs->encoder.name);
-	g_snprintf(prefs->encoder.of_restrict,1024,"%s",future_prefs->encoder.of_restrict);
-	prefs->encoder.of_allowed_acodecs=future_prefs->encoder.of_allowed_acodecs;
+        lives_snprintf(prefs->encoder.name,51,"%s",future_prefs->encoder.name);
+        set_pref("encoder",prefs->encoder.name);
+        lives_snprintf(prefs->encoder.of_restrict,1024,"%s",future_prefs->encoder.of_restrict);
+        prefs->encoder.of_allowed_acodecs=future_prefs->encoder.of_allowed_acodecs;
       }
       rdet->enc_changed=TRUE;
-      rdet->encoder_name=g_strdup(prefs->encoder.name);
+      rdet->encoder_name=lives_strdup(prefs->encoder.name);
       lives_widget_set_sensitive(rdet->okbutton,TRUE);
     }
 
     if (prefsw!=NULL) {
       lives_combo_set_active_string(LIVES_COMBO(prefsw->ofmt_combo), array[1]);
     }
-    on_encoder_ofmt_changed (NULL, rdet);
-    g_strfreev (array);
+    on_encoder_ofmt_changed(NULL, rdet);
+    lives_strfreev(array);
     if (ofmt_all!=NULL) {
-      g_list_free_strings(ofmt_all);
-      g_list_free(ofmt_all);
+      lives_list_free_strings(ofmt_all);
+      lives_list_free(ofmt_all);
     }
   }
 }
 
 
 void
-on_insertwsound_toggled                (LiVESToggleButton *togglebutton,
-                                        gpointer         user_data)
-{
+on_insertwsound_toggled(LiVESToggleButton *togglebutton,
+                        livespointer         user_data) {
   if (lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(togglebutton))) {
-    lives_widget_set_sensitive (insertw->fit_checkbutton,FALSE);
-  }
-  else {
-    lives_widget_set_sensitive (insertw->fit_checkbutton,cfile->achans>0);
+    lives_widget_set_sensitive(insertw->fit_checkbutton,FALSE);
+  } else {
+    lives_widget_set_sensitive(insertw->fit_checkbutton,cfile->achans>0);
   }
   mainw->fx2_bool=!mainw->fx2_bool;
 }
 
 
-void 
-on_insfitaudio_toggled                (LiVESToggleButton *togglebutton,
-                                        gpointer         user_data)
-{
+void
+on_insfitaudio_toggled(LiVESToggleButton *togglebutton,
+                       livespointer         user_data) {
   mainw->fx1_bool=!mainw->fx1_bool;
 
   if (lives_toggle_button_get_active(togglebutton)) {
     lives_widget_set_sensitive(insertw->with_sound,FALSE);
     lives_widget_set_sensitive(insertw->without_sound,FALSE);
     lives_widget_set_sensitive(insertw->spinbutton_times,FALSE);
-  }
-  else {
+  } else {
     lives_widget_set_sensitive(insertw->with_sound,clipboard->achans>0);
     lives_widget_set_sensitive(insertw->without_sound,clipboard->achans>0);
     lives_widget_set_sensitive(insertw->spinbutton_times,TRUE);
@@ -4405,7 +4360,7 @@
 
 
 
-boolean dirchange_callback (LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, gpointer user_data) {
+boolean dirchange_callback(LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, livespointer user_data) {
   if (mainw->playing_file==-1) return TRUE;
 
   // change play direction
@@ -4419,22 +4374,25 @@
   lives_signal_handler_unblock(mainw->spinbutton_pb_fps,mainw->pb_fps_func);
 
   // make sure this is called, sometimes we switch clips too soon...
-  changed_fps_during_pb (LIVES_SPIN_BUTTON(mainw->spinbutton_pb_fps), NULL);
+  changed_fps_during_pb(LIVES_SPIN_BUTTON(mainw->spinbutton_pb_fps), NULL);
 
   return TRUE;
 }
 
 
-boolean fps_reset_callback (LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, gpointer user_data) {
+boolean fps_reset_callback(LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, livespointer user_data) {
   // reset playback fps (cfile->pb_fps) to normal fps (cfile->fps)
   // also resync the audio
 
-
   if (mainw->playing_file==-1) return TRUE;
 
+  if (prefs->audio_opts&AUDIO_OPTS_FOLLOW_FPS) {
+    resync_audio(cfile->frameno);
+  }
+
   // change play direction
   if (cfile->play_paused) {
-    if (cfile->freeze_fps<0.) cfile->freeze_fps=-cfile->fps; 
+    if (cfile->freeze_fps<0.) cfile->freeze_fps=-cfile->fps;
     else cfile->freeze_fps=cfile->fps;
     return TRUE;
   }
@@ -4445,17 +4403,13 @@
   lives_signal_handler_unblock(mainw->spinbutton_pb_fps,mainw->pb_fps_func);
 
   // make sure this is called, sometimes we switch clips too soon...
-  changed_fps_during_pb (LIVES_SPIN_BUTTON(mainw->spinbutton_pb_fps), NULL);
-
-  if (prefs->audio_opts&AUDIO_OPTS_FOLLOW_FPS) {
-    resync_audio(cfile->frameno);
-  }
+  changed_fps_during_pb(LIVES_SPIN_BUTTON(mainw->spinbutton_pb_fps), NULL);
 
   return TRUE;
 }
 
-boolean prevclip_callback (LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, gpointer user_data) {
-  GList *list_index;
+boolean prevclip_callback(LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, livespointer user_data) {
+  LiVESList *list_index;
   int i=0;
   int num_tried=0,num_clips;
   int type=0;
@@ -4463,28 +4417,29 @@
   // prev clip
   // type = 0 : if the effect is a transition, this will change the background clip
   // type = 1 fg only
-  // type = 2 bg only 
+  // type = 2 bg only
+
+  if (!mainw->interactive) return TRUE;
 
   if (mainw->current_file<1||mainw->preview||(mainw->is_processing&&cfile->is_loaded)||mainw->cliplist==NULL) return TRUE;
 
-  if (user_data!=NULL) type=GPOINTER_TO_INT(user_data);
+  if (user_data!=NULL) type=LIVES_POINTER_TO_INT(user_data);
 
-  num_clips=g_list_length(mainw->cliplist);
+  num_clips=lives_list_length(mainw->cliplist);
 
   if (type==2||(mainw->active_sa_clips==SCREEN_AREA_BACKGROUND&&mainw->playing_file>0&&type!=1)) {
-    list_index=g_list_find (mainw->cliplist, GINT_TO_POINTER (mainw->blend_file));
-  }
-  else {
-    list_index=g_list_find (mainw->cliplist, GINT_TO_POINTER (mainw->current_file));
+    list_index=lives_list_find(mainw->cliplist, LIVES_INT_TO_POINTER(mainw->blend_file));
+  } else {
+    list_index=lives_list_find(mainw->cliplist, LIVES_INT_TO_POINTER(mainw->current_file));
   }
   do {
     if (num_tried++==num_clips) return TRUE; // we might have only audio clips, and then we will block here
-    if ((list_index=g_list_previous(list_index))==NULL) list_index=g_list_last (mainw->cliplist);
-    i=LIVES_POINTER_TO_INT (list_index->data);
+    if (list_index==NULL||((list_index=list_index->prev)==NULL)) list_index=lives_list_last(mainw->cliplist);
+    i=LIVES_POINTER_TO_INT(list_index->data);
   } while ((mainw->files[i]==NULL||mainw->files[i]->opening||mainw->files[i]->restoring||i==mainw->scrap_file||
-	    i==mainw->ascrap_file||(!mainw->files[i]->frames&&mainw->playing_file>-1))&&
-	   i!=((type==2||(mainw->playing_file>0&&mainw->active_sa_clips==SCREEN_AREA_BACKGROUND&&type!=1))?
-	       mainw->blend_file:mainw->current_file));
+            i==mainw->ascrap_file||(!mainw->files[i]->frames&&mainw->playing_file>-1))&&
+           i!=((type==2||(mainw->playing_file>0&&mainw->active_sa_clips==SCREEN_AREA_BACKGROUND&&type!=1))?
+               mainw->blend_file:mainw->current_file));
 
   switch_clip(type,i);
 
@@ -4492,44 +4447,45 @@
 }
 
 
-boolean nextclip_callback (LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, gpointer user_data) {
-  GList *list_index;
+boolean nextclip_callback(LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, livespointer user_data) {
+  LiVESList *list_index;
   int i;
   int num_tried=0,num_clips;
 
   int type=0;
 
+  if (!mainw->interactive) return TRUE;
+
   // next clip
   // if the effect is a transition, this will change the background clip
   if (mainw->current_file<1||mainw->preview||(mainw->is_processing&&cfile->is_loaded)||mainw->cliplist==NULL) return TRUE;
 
-  if (user_data!=NULL) type=GPOINTER_TO_INT(user_data);
+  if (user_data!=NULL) type=LIVES_POINTER_TO_INT(user_data);
 
   if (type==2||(mainw->active_sa_clips==SCREEN_AREA_BACKGROUND&&mainw->playing_file>0&&type!=1)) {
-    list_index=g_list_find (mainw->cliplist, GINT_TO_POINTER (mainw->blend_file));
-  }
-  else {
-    list_index=g_list_find (mainw->cliplist, GINT_TO_POINTER (mainw->current_file));
+    list_index=lives_list_find(mainw->cliplist, LIVES_INT_TO_POINTER(mainw->blend_file));
+  } else {
+    list_index=lives_list_find(mainw->cliplist, LIVES_INT_TO_POINTER(mainw->current_file));
   }
 
-  num_clips=g_list_length(mainw->cliplist);
+  num_clips=lives_list_length(mainw->cliplist);
 
   do {
     if (num_tried++==num_clips) return TRUE; // we might have only audio clips, and then we will block here
-    if ((list_index=g_list_next(list_index))==NULL) list_index=g_list_first (mainw->cliplist);
-    i=LIVES_POINTER_TO_INT (list_index->data);
+    if (list_index==NULL||((list_index=list_index->next)==NULL)) list_index=mainw->cliplist;
+    i=LIVES_POINTER_TO_INT(list_index->data);
   } while ((mainw->files[i]==NULL||mainw->files[i]->opening||mainw->files[i]->restoring||i==mainw->scrap_file||
-	    i==mainw->ascrap_file||(!mainw->files[i]->frames&&mainw->playing_file>-1))&&
-	   i!=((type==2||(mainw->playing_file>0&&mainw->active_sa_clips==SCREEN_AREA_BACKGROUND&&type!=1))?
-	       mainw->blend_file:mainw->current_file));
-  
+            i==mainw->ascrap_file||(!mainw->files[i]->frames&&mainw->playing_file>-1))&&
+           i!=((type==2||(mainw->playing_file>0&&mainw->active_sa_clips==SCREEN_AREA_BACKGROUND&&type!=1))?
+               mainw->blend_file:mainw->current_file));
+
   switch_clip(type,i);
 
   return TRUE;
 }
 
 
-void on_save_set_activate (LiVESMenuItem *menuitem, gpointer user_data) {
+boolean on_save_set_activate(LiVESMenuItem *menuitem, livespointer user_data) {
 
   // here is where we save clipsets
 
@@ -4537,23 +4493,25 @@
 
   // also handles migration and merging of sets
 
+  // new_set_name can be passed in userdata, it should be in filename encoding
 
   // TODO - caller to do end_threaded_dialog()
 
-  GList *cliplist;
+  LiVESList *cliplist;
 
-  gchar *old_set=g_strdup(mainw->set_name);
-  gchar *layout_map_file,*layout_map_dir,*new_clips_dir,*current_clips_dir;
-  gchar *com,*tmp;
-  gchar new_handle[256];
-  gchar *text;
-  gchar *new_dir;
-  gchar *cwd;
-  gchar *ordfile;
-  gchar *ord_entry;
-  gchar new_set_name[128];
-  gchar *msg,*extra;
-  gchar *dfile,*osetn,*nsetn;
+  char new_handle[256];
+  char new_set_name[128];
+
+  char *old_set=lives_strdup(mainw->set_name);
+  char *layout_map_file,*layout_map_dir,*new_clips_dir,*current_clips_dir;
+  char *com,*tmp;
+  char *text;
+  char *new_dir;
+  char *cwd;
+  char *ordfile;
+  char *ord_entry;
+  char *msg,*extra;
+  char *dfile,*osetn,*nsetn;
 
   boolean is_append=FALSE; // we will overwrite the target layout.map file
   boolean response;
@@ -4564,23 +4522,27 @@
 
   register int i;
 
+  if (mainw->cliplist == NULL) return FALSE;
+
   // warn the user what will happen
-  if (!mainw->no_exit&&!mainw->only_close) extra=g_strdup(", and LiVES will exit");
-  else extra=g_strdup("");
+  if (!mainw->no_exit&&!mainw->only_close) extra=lives_strdup(", and LiVES will exit");
+  else extra=lives_strdup("");
 
-  msg=g_strdup_printf(_("Saving the set will cause copies of all loaded clips to remain on the disk%s.\n\nPlease press 'Cancel' if that is not what you want.\n"),extra);
-  g_free(extra);
+  msg=lives_strdup_printf(
+        _("Saving the set will cause copies of all loaded clips to remain on the disk%s.\n\nPlease press 'Cancel' if that is not what you want.\n"),
+        extra);
+  lives_free(extra);
 
-  if (menuitem!=NULL&&!do_warning_dialog_with_check (msg,WARN_MASK_SAVE_SET)) {
-    g_free(msg);
-    return;
+  if (menuitem!=NULL&&!do_warning_dialog_with_check(msg,WARN_MASK_SAVE_SET)) {
+    lives_free(msg);
+    return FALSE;
   }
-  g_free(msg);
+  lives_free(msg);
 
 
   if (mainw->stored_event_list!=NULL&&mainw->stored_event_list_changed) {
     // if we have a current layout, give the user the chance to change their mind
-    if (!check_for_layout_del(NULL,FALSE)) return;
+    if (!check_for_layout_del(NULL,FALSE)) return FALSE;
   }
 
 
@@ -4593,22 +4555,21 @@
       lives_widget_show(renamew->dialog);
       response=lives_dialog_run(LIVES_DIALOG(renamew->dialog));
       if (response==LIVES_RESPONSE_CANCEL) {
-	lives_widget_destroy(renamew->dialog);
-	g_free(renamew);
-	return;
+        lives_widget_destroy(renamew->dialog);
+        lives_free(renamew);
+        return FALSE;
       }
-      g_snprintf(new_set_name,128,"%s",lives_entry_get_text (LIVES_ENTRY (renamew->entry)));
+      lives_snprintf(new_set_name,128,"%s",(tmp=U82F(lives_entry_get_text(LIVES_ENTRY(renamew->entry)))));
       lives_widget_destroy(renamew->dialog);
-      g_free(renamew);
+      lives_free(renamew);
       lives_widget_context_update();
     } while (!is_legal_set_name(new_set_name,TRUE));
-  }
-  else g_snprintf(new_set_name,128,"%s",(gchar *)user_data);
+  } else lives_snprintf(new_set_name,128,"%s",(char *)user_data);
 
-  lives_widget_queue_draw (mainw->LiVES);
+  lives_widget_queue_draw(mainw->LiVES);
   lives_widget_context_update();
 
-  g_snprintf(mainw->set_name,128,"%s",new_set_name);
+  lives_snprintf(mainw->set_name,128,"%s",new_set_name);
 
   if (strcmp(mainw->set_name,old_set)) {
     // THE USER CHANGED the set name
@@ -4618,92 +4579,93 @@
 
     // and possibly merge with another set
 
-    new_clips_dir=g_build_filename(prefs->tmpdir,mainw->set_name,"clips",NULL);
+    new_clips_dir=lives_build_filename(prefs->tmpdir,mainw->set_name,"clips",NULL);
     // check if target clips dir exists, ask if user wants to append files
-    if (g_file_test(new_clips_dir,G_FILE_TEST_IS_DIR)) {
-      g_free(new_clips_dir);
-      if (!do_set_duplicate_warning(mainw->set_name)) {
-	g_snprintf(mainw->set_name,128,"%s",old_set);
-	return;
-      }
+    if (lives_file_test(new_clips_dir,LIVES_FILE_TEST_IS_DIR)) {
+      lives_free(new_clips_dir);
+      if (mainw->osc_auto==0) {
+        if (!do_set_duplicate_warning(mainw->set_name)) {
+          lives_snprintf(mainw->set_name,128,"%s",old_set);
+          return FALSE;
+        }
+      } else if (mainw->osc_auto==1) return FALSE;
+
       is_append=TRUE;
-    }
-    else {
-      g_free(new_clips_dir);
-      layout_map_file=g_build_filename(prefs->tmpdir,mainw->set_name,"layouts","layout.map",NULL);
+    } else {
+      lives_free(new_clips_dir);
+      layout_map_file=lives_build_filename(prefs->tmpdir,mainw->set_name,"layouts","layout.map",NULL);
       // if target has layouts dir but no clips, it means we have old layouts !
-      if (g_file_test(layout_map_file,G_FILE_TEST_EXISTS)) {
-	if (do_set_rename_old_layouts_warning(mainw->set_name)) {
-	  // user answered "yes" - delete
-	  // clear _old_ layout maps
-	  gchar *dfile=g_build_filename(prefs->tmpdir,mainw->set_name,"layouts",NULL);
+      if (lives_file_test(layout_map_file,LIVES_FILE_TEST_EXISTS)) {
+        if (do_set_rename_old_layouts_warning(mainw->set_name)) {
+          // user answered "yes" - delete
+          // clear _old_layout maps
+          char *dfile=lives_build_filename(prefs->tmpdir,mainw->set_name,"layouts",NULL);
 #ifndef IS_MINGW
-	  com=g_strdup_printf("/bin/rm -r \"%s/\" 2>/dev/null",dfile);
+          com=lives_strdup_printf("%s -r \"%s/\" 2>/dev/null",capable->rm_cmd,dfile);
 #else
-	  com=g_strdup_printf("rm.exe -r \"%s/\" 2>NUL",dfile);
+          com=lives_strdup_printf("rm.exe -r \"%s/\" 2>NUL",dfile);
 #endif
-	  g_free(dfile);
-	  lives_system(com,TRUE);
-	  g_free(com);
-	}
+          lives_free(dfile);
+          lives_system(com,TRUE);
+          lives_free(com);
+        }
       }
-      g_free(layout_map_file);
+      lives_free(layout_map_file);
     }
   }
-  
-  text=g_strdup_printf(_("Saving set %s"),mainw->set_name);
+
+  text=lives_strdup_printf(_("Saving set %s"),mainw->set_name);
   do_threaded_dialog(text,FALSE);
-  g_free(text);
+  lives_free(text);
 
   /////////////////////////////////////////////////////////////
 
   mainw->com_failed=FALSE;
 
-  current_clips_dir=g_build_filename(prefs->tmpdir,old_set,"clips/",NULL);
-  if (strlen(old_set)&&strcmp(mainw->set_name,old_set)&&g_file_test(current_clips_dir,G_FILE_TEST_IS_DIR)) {
+  current_clips_dir=lives_build_filename(prefs->tmpdir,old_set,"clips/",NULL);
+  if (strlen(old_set)&&strcmp(mainw->set_name,old_set)&&lives_file_test(current_clips_dir,LIVES_FILE_TEST_IS_DIR)) {
     // set name was changed for an existing set
 
     if (!is_append) {
       // create new dir, in case it doesn't already exist
-      dfile=g_build_filename(prefs->tmpdir,mainw->set_name,"clips",NULL);
-      if (g_mkdir_with_parents(dfile,S_IRWXU)==-1) {
-	if (!check_dir_access(dfile)) {
-	  // abort if we cannot create the new subdir
-	  LIVES_ERROR("Could not create directory");
-	  LIVES_ERROR(dfile);
-	  d_print_file_error_failed();
-	  g_snprintf(mainw->set_name,128,"%s",old_set);
-	  g_free(dfile);
-	  end_threaded_dialog();
-	  return;
-	}
+      dfile=lives_build_filename(prefs->tmpdir,mainw->set_name,"clips",NULL);
+      if (lives_mkdir_with_parents(dfile,S_IRWXU)==-1) {
+        if (!check_dir_access(dfile)) {
+          // abort if we cannot create the new subdir
+          LIVES_ERROR("Could not create directory");
+          LIVES_ERROR(dfile);
+          d_print_file_error_failed();
+          lives_snprintf(mainw->set_name,128,"%s",old_set);
+          lives_free(dfile);
+          end_threaded_dialog();
+          return FALSE;
+        }
       }
-      g_free(dfile);
+      lives_free(dfile);
     }
-  }
-  else {
+  } else {
     // saving as same name (or as new set)
 
-    dfile=g_build_filename(prefs->tmpdir,mainw->set_name,"clips",NULL);
-    if (g_mkdir_with_parents(dfile,S_IRWXU)==-1) {
+    dfile=lives_build_filename(prefs->tmpdir,mainw->set_name,"clips",NULL);
+    if (lives_mkdir_with_parents(dfile,S_IRWXU)==-1) {
       if (!check_dir_access(dfile)) {
-	// abort if we cannot create the new subdir
-	LIVES_ERROR("Could not create directory");
-	LIVES_ERROR(dfile);
-	d_print_file_error_failed();
-	g_snprintf(mainw->set_name,128,"%s",old_set);
-	g_free(dfile);
-	end_threaded_dialog();
-	return;
+        // abort if we cannot create the new subdir
+        LIVES_ERROR("Could not create directory");
+        LIVES_ERROR(dfile);
+        d_print_file_error_failed();
+        lives_snprintf(mainw->set_name,128,"%s",old_set);
+        lives_free(dfile);
+        end_threaded_dialog();
+        return FALSE;
       }
     }
-    g_free(dfile);
+    lives_free(dfile);
   }
-  g_free(current_clips_dir);
+  lives_free(current_clips_dir);
 
-  ordfile=g_build_filename(prefs->tmpdir,mainw->set_name,"order",NULL);
+  ordfile=lives_build_filename(prefs->tmpdir,mainw->set_name,"order",NULL);
 
-  cwd=g_get_current_dir();
+  cwd=lives_get_current_dir();
 
   do {
     // create the orderfile which lists all the clips in order
@@ -4712,11 +4674,11 @@
     else ord_fd=open(ordfile,O_CREAT|O_WRONLY|O_APPEND,DEF_FILE_PERMS);
 
     if (ord_fd<0) {
-      retval=do_write_failed_error_s_with_retry(ordfile,g_strerror(errno),NULL);
-      if (retval==LIVES_CANCEL) {
-	end_threaded_dialog();
-	g_free(ordfile);
-	return;
+      retval=do_write_failed_error_s_with_retry(ordfile,lives_strerror(errno),NULL);
+      if (retval==LIVES_RESPONSE_CANCEL) {
+        end_threaded_dialog();
+        lives_free(ordfile);
+        return FALSE;
       }
     }
 
@@ -4725,97 +4687,96 @@
       cliplist=mainw->cliplist;
 
       while (cliplist!=NULL) {
-	if (mainw->write_failed) break;
-	threaded_dialog_spin();
-	lives_widget_context_update();
-
-	// TODO - dirsep
-
-	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) {
-	    g_snprintf(new_handle,256,"%s/clips%s",mainw->set_name,tmp);
-	  }
-	  else {
-	    g_snprintf(new_handle,256,"%s/clips/%s",mainw->set_name,mainw->files[i]->handle);
-	  }
-	  if (strcmp(new_handle,mainw->files[i]->handle)) {
-	    new_dir=g_build_filename(prefs->tmpdir,new_handle,NULL);
-	    if (g_file_test(new_dir,G_FILE_TEST_IS_DIR)) {
-	      // get a new unique handle
-	      get_temp_handle(i,FALSE);
-	      g_snprintf(new_handle,256,"%s/clips/%s",mainw->set_name,mainw->files[i]->handle);
-	    }
-	    g_free(new_dir);
-	
-	    // move the files
+        if (mainw->write_failed) break;
+        threaded_dialog_spin();
+        lives_widget_context_update();
+
+        // TODO - dirsep
+
+        i=LIVES_POINTER_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) {
+            lives_snprintf(new_handle,256,"%s/clips%s",mainw->set_name,tmp);
+          } else {
+            lives_snprintf(new_handle,256,"%s/clips/%s",mainw->set_name,mainw->files[i]->handle);
+          }
+          if (strcmp(new_handle,mainw->files[i]->handle)) {
+            new_dir=lives_build_filename(prefs->tmpdir,new_handle,NULL);
+            if (lives_file_test(new_dir,LIVES_FILE_TEST_IS_DIR)) {
+              // get a new unique handle
+              get_temp_handle(i,FALSE);
+              lives_snprintf(new_handle,256,"%s/clips/%s",mainw->set_name,mainw->files[i]->handle);
+            }
+            lives_free(new_dir);
+
+            // move the files
 
 
-	    mainw->com_failed=FALSE;
+            mainw->com_failed=FALSE;
 #ifndef IS_MINGW
-	    com=g_strdup_printf("/bin/mv \"%s/%s\" \"%s/%s\"",
-				prefs->tmpdir,mainw->files[i]->handle,prefs->tmpdir,new_handle);
+            com=lives_strdup_printf("%s \"%s/%s\" \"%s/%s\"",capable->mv_cmd,
+                                    prefs->tmpdir,mainw->files[i]->handle,prefs->tmpdir,new_handle);
 #else
-	    com=g_strdup_printf("mv.exe \"%s\\%s\" \"%s\\%s\"",
-				prefs->tmpdir,mainw->files[i]->handle,prefs->tmpdir,new_handle);
+            com=lives_strdup_printf("mv.exe \"%s\\%s\" \"%s\\%s\"",
+                                    prefs->tmpdir,mainw->files[i]->handle,prefs->tmpdir,new_handle);
 #endif
-	    lives_system(com,FALSE);
-	    g_free(com);
-	
-	    if (mainw->com_failed) {
-	      end_threaded_dialog();
-	      g_free(ordfile);
-	      return;
-	    }
-
-	    got_new_handle=TRUE;
-	
-	    g_snprintf(mainw->files[i]->handle,256,"%s",new_handle);
+            lives_system(com,FALSE);
+            lives_free(com);
+
+            if (mainw->com_failed) {
+              end_threaded_dialog();
+              lives_free(ordfile);
+              return FALSE;
+            }
+
+            got_new_handle=TRUE;
+
+            lives_snprintf(mainw->files[i]->handle,256,"%s",new_handle);
 #ifndef IS_MINGW
-	    dfile=g_build_filename(prefs->tmpdir,mainw->files[i]->handle,".status",NULL);
+            dfile=lives_build_filename(prefs->tmpdir,mainw->files[i]->handle,".status",NULL);
 #else
-	    dfile=g_build_filename(prefs->tmpdir,mainw->files[i]->handle,"status",NULL);
+            dfile=lives_build_filename(prefs->tmpdir,mainw->files[i]->handle,"status",NULL);
 #endif
-	    g_snprintf(mainw->files[i]->info_file,PATH_MAX,"%s",dfile);
-	    g_free(dfile);
-	  }
-      
-	  ord_entry=g_strdup_printf("%s\n",mainw->files[i]->handle);
-	  lives_write(ord_fd,ord_entry,strlen(ord_entry),FALSE);
-	  g_free(ord_entry);
+            lives_snprintf(mainw->files[i]->info_file,PATH_MAX,"%s",dfile);
+            lives_free(dfile);
+          }
 
-	}
+          ord_entry=lives_strdup_printf("%s\n",mainw->files[i]->handle);
+          lives_write(ord_fd,ord_entry,strlen(ord_entry),FALSE);
+          lives_free(ord_entry);
 
-	cliplist=cliplist->next;
+        }
+
+        cliplist=cliplist->next;
       }
 
       if (mainw->write_failed) {
-	retval=do_write_failed_error_s_with_retry(ordfile,NULL,NULL);
+        retval=do_write_failed_error_s_with_retry(ordfile,NULL,NULL);
       }
 
     }
 
-  } while (retval==LIVES_RETRY);
-  
-  close (ord_fd);
-  g_free(ordfile);
+  } while (retval==LIVES_RESPONSE_RETRY);
+
+  close(ord_fd);
+  lives_free(ordfile);
 
   lives_chdir(cwd,FALSE);
-  g_free(cwd);
+  lives_free(cwd);
 
-  if (retval==LIVES_CANCEL) {
+  if (retval==LIVES_RESPONSE_CANCEL) {
     end_threaded_dialog();
-    return;
+    return FALSE;
   }
 
   if (got_new_handle&&!strlen(old_set)) migrate_layouts(NULL,mainw->set_name);
 
   if (strlen(old_set)&&strcmp(old_set,mainw->set_name)) {
-    layout_map_dir=g_build_filename(prefs->tmpdir,old_set,"layouts",G_DIR_SEPARATOR_S,NULL);
-    layout_map_file=g_build_filename(layout_map_dir,"layout.map",NULL);
+    layout_map_dir=lives_build_filename(prefs->tmpdir,old_set,"layouts",LIVES_DIR_SEPARATOR_S,NULL);
+    layout_map_file=lives_build_filename(layout_map_dir,"layout.map",NULL);
     // update details for layouts - needs_set, current_layout_map and affected_layout_map
-    if (g_file_test(layout_map_file,G_FILE_TEST_EXISTS)) {
+    if (lives_file_test(layout_map_file,LIVES_FILE_TEST_EXISTS)) {
       migrate_layouts(old_set,mainw->set_name);
       // save updated layout.map (with new handles), we will move it below
 
@@ -4823,70 +4784,70 @@
 
       got_new_handle=FALSE;
     }
-    g_free(layout_map_file);
-    g_free(layout_map_dir);
+    lives_free(layout_map_file);
+    lives_free(layout_map_dir);
 
     if (is_append) {
-      osetn=g_build_filename(prefs->tmpdir,old_set,"layouts","layout.map",NULL);
-      nsetn=g_build_filename(prefs->tmpdir,mainw->set_name,"layouts","layout.map",NULL);
+      osetn=lives_build_filename(prefs->tmpdir,old_set,"layouts","layout.map",NULL);
+      nsetn=lives_build_filename(prefs->tmpdir,mainw->set_name,"layouts","layout.map",NULL);
 
       //append current layout.map to target one
 #ifndef IS_MINGW
-      com=g_strdup_printf("/bin/cat \"%s\" >> \"%s\" 2>/dev/null",osetn,nsetn);
+      com=lives_strdup_printf("%s \"%s\" >> \"%s\" 2>/dev/null",capable->cat_cmd,osetn,nsetn);
 #else
-      com=g_strdup_printf("cat.exe \"%s\" >> \"%s\" 2>NUL",osetn,nsetn);
+      com=lives_strdup_printf("cat.exe \"%s\" >> \"%s\" 2>NUL",osetn,nsetn);
 #endif
       lives_system(com,TRUE);
-      g_free(com);
+      lives_free(com);
 #ifndef IS_MINGW
-      com=g_strdup_printf("/bin/rm \"%s\" 2>/dev/null",osetn);
+      com=lives_strdup_printf("%s \"%s\" 2>/dev/null",capable->rm_cmd,osetn);
 #else
-      com=g_strdup_printf("rm.exe \"%s\" 2>NUL",osetn);
+      com=lives_strdup_printf("rm.exe \"%s\" 2>NUL",osetn);
 #endif
       lives_system(com,TRUE);
-      g_free(com);
-      g_free(osetn);
-      g_free(nsetn);
-    }
-    
-    osetn=g_build_filename(prefs->tmpdir,old_set,"layouts",NULL);
-    nsetn=g_build_filename(prefs->tmpdir,mainw->set_name,NULL);
+      lives_free(com);
+      lives_free(osetn);
+      lives_free(nsetn);
+    }
+
+    osetn=lives_build_filename(prefs->tmpdir,old_set,"layouts",NULL);
+    nsetn=lives_build_filename(prefs->tmpdir,mainw->set_name,NULL);
 
     // move any layouts from old set to new (including layout.map)
 #ifndef IS_MINGW
-    com=g_strdup_printf("/bin/cp -a \"%s\" \"%s/\" 2>/dev/null",osetn,nsetn);
+    com=lives_strdup_printf("%s -a \"%s\" \"%s/\" 2>/dev/null",capable->cp_cmd,osetn,nsetn);
 #else
-    com=g_strdup_printf("cp.exe -a \"%s\" \"%s/\" 2>NUL",osetn,nsetn);
+    com=lives_strdup_printf("cp.exe -a \"%s\" \"%s/\" 2>NUL",osetn,nsetn);
 #endif
     lives_system(com,TRUE);
-    g_free(com);
+    lives_free(com);
 
-    g_free(osetn);
-    g_free(nsetn);
+    lives_free(osetn);
+    lives_free(nsetn);
 
-    osetn=g_build_filename(prefs->tmpdir,old_set,NULL);
+    osetn=lives_build_filename(prefs->tmpdir,old_set,NULL);
 
     // remove old set dir
 #ifndef IS_MINGW
-    com=g_strdup_printf("/bin/rm -r \"%s\" 2>/dev/null",osetn);
+    com=lives_strdup_printf("%s -r \"%s\" 2>/dev/null",capable->rm_cmd,osetn);
 #else
-    com=g_strdup_printf("rm.exe -r \"%s\" 2>NUL",osetn);
+    com=lives_strdup_printf("rm.exe -r \"%s\" 2>NUL",osetn);
 #endif
     lives_system(com,TRUE);
-    g_free(com);
-    g_free(osetn);
+    lives_free(com);
+    lives_free(osetn);
   }
 
 
   if (!mainw->was_set&&!strcmp(old_set,mainw->set_name)) {
     // set name was set by export or save layout, now we need to update our layout map
-    layout_map_dir=g_build_filename(prefs->tmpdir,old_set,"layouts",G_DIR_SEPARATOR_S,NULL);
-    layout_map_file=g_build_filename(layout_map_dir,"layout.map",NULL);
-    if (g_file_test(layout_map_file,G_FILE_TEST_EXISTS)) save_layout_map(NULL,NULL,NULL,layout_map_dir);
+    layout_map_dir=lives_build_filename(prefs->tmpdir,old_set,"layouts",LIVES_DIR_SEPARATOR_S,NULL);
+    layout_map_file=lives_build_filename(layout_map_dir,"layout.map",NULL);
+    if (lives_file_test(layout_map_file,LIVES_FILE_TEST_EXISTS)) save_layout_map(NULL,NULL,NULL,layout_map_dir);
     mainw->was_set=TRUE;
     got_new_handle=FALSE;
-    g_free(layout_map_dir);
-    g_free(layout_map_file);
+    lives_free(layout_map_dir);
+    lives_free(layout_map_file);
     if (mainw->multitrack!=NULL&&!mainw->multitrack->changed) recover_layout_cancelled(FALSE);
   }
 
@@ -4897,287 +4858,282 @@
     popup_lmap_errors(NULL,NULL);
   }
 
-#ifdef ENABLE_OSC
-  lives_osc_notify(LIVES_OSC_NOTIFY_CLIPSET_SAVED,old_set);
-#endif
+  lives_notify(LIVES_OSC_NOTIFY_CLIPSET_SAVED,old_set);
 
-  g_free (old_set);
+  lives_free(old_set);
   if (!mainw->no_exit) {
     mainw->leave_files=TRUE;
     if (mainw->multitrack!=NULL&&!mainw->only_close) mt_memory_free();
     else if (mainw->multitrack!=NULL) wipe_layout(mainw->multitrack);
-    lives_exit();
-  }
-  else end_threaded_dialog();
+    lives_exit(0);
+  } else end_threaded_dialog();
 
-  lives_widget_set_sensitive (mainw->vj_load_set, TRUE);
+  lives_widget_set_sensitive(mainw->vj_load_set, TRUE);
+  return TRUE;
 }
 
 
-void on_load_set_activate (LiVESMenuItem *menuitem, gpointer user_data) {
+char *on_load_set_activate(LiVESMenuItem *menuitem, livespointer user_data) {
   // get set name (use a modified rename window)
+  char *set_name=NULL;
+  int resp;
 
   if (mainw->multitrack!=NULL) {
     if (mainw->multitrack->idlefunc>0) {
-      g_source_remove(mainw->multitrack->idlefunc);
+      lives_source_remove(mainw->multitrack->idlefunc);
       mainw->multitrack->idlefunc=0;
     }
     mt_desensitise(mainw->multitrack);
   }
 
   renamew=create_rename_dialog(3);
-  lives_widget_show(renamew->dialog);
-}
 
+  resp=lives_dialog_run(LIVES_DIALOG(renamew->dialog));
 
+  if (resp==LIVES_RESPONSE_OK) {
+    set_name=U82F(lives_entry_get_text(LIVES_ENTRY(renamew->entry)));
+  }
 
-boolean on_load_set_ok (LiVESButton *button, gpointer user_data) {
-  // this is the main clip set loader
+  // need to clean up renamew
+  lives_widget_destroy(renamew->dialog);
+  lives_widget_context_update();
+  lives_free(renamew);
+  renamew=NULL;
 
+  if (resp==LIVES_RESPONSE_OK) {
+    if (!is_legal_set_name(set_name,TRUE)) {
+      lives_free(set_name);
+      set_name=NULL;
+    } else {
+      if (user_data==NULL) {
+        reload_set(set_name);
+        lives_free(set_name);
+        return NULL;
+      }
+    }
+  }
 
-  // CLIP SET LOADER
+  return set_name;
+}
 
 
-  // (user_data TRUE skips threaded dialog and allows use of
-  // return value FALSE to indicate error)
+boolean reload_set(const char *set_name) {
+  // this is the main clip set loader
+
+  // CLIP SET LOADER
+
+  // setname should be in filesystem encoding
 
   FILE *orderfile;
 
-  gchar *msg;
-  gchar *com;
-  gchar *ordfile;
-  gchar *subfname;
-  gchar vid_open_dir[PATH_MAX];
-  gchar set_name[128];
-  gchar *cwd;
+  char *msg;
+  char *com;
+  char *ordfile;
+  char *subfname;
+  char vid_open_dir[PATH_MAX];
+  char *cwd;
 
   boolean added_recovery=FALSE;
-  boolean skip_threaded_dialog=(boolean)GPOINTER_TO_INT(user_data);
   boolean needs_update=FALSE;
+  boolean keep_threaded_dialog=FALSE;
 
   int last_file=-1,new_file=-1;
   int current_file=mainw->current_file;
   int clipnum=0;
 
+  memset(mainw->set_name,0,1);
 
-  threaded_dialog_spin();
-
-
-  // renamew is create_rename_dialog(3);
-
-
-  if (!strlen(mainw->set_name)) {
-    // get new set name from user
-
-    g_snprintf(set_name,128,"%s",lives_entry_get_text(LIVES_ENTRY(renamew->entry)));
-
-    // ensure name is valid
-    if (!is_legal_set_name(set_name,TRUE)) return !skip_threaded_dialog;
-
-    // set_name length is max 128
-    g_snprintf(mainw->set_name,128,"%s",set_name);
-
-
-    // need to clean up renamew
-    lives_widget_destroy(renamew->dialog);
-    g_free(renamew);
-    renamew=NULL;
-  }
-  else {
-    // here if we already have a set_name
-
-    // check if set is locked
-    if (!check_for_lock_file(mainw->set_name,0)) {
-      memset(mainw->set_name,0,1);
-      d_print_failed();
-      threaded_dialog_spin();
-      if (mainw->multitrack!=NULL) {
-	mainw->current_file=mainw->multitrack->render_file;
-	mt_sensitise(mainw->multitrack);
-	mainw->multitrack->idlefunc=mt_idle_add(mainw->multitrack);
-      }
-      return !skip_threaded_dialog;
+  // check if set is locked
+  if (!check_for_lock_file(set_name,0)) {
+    d_print_failed();
+    if (mainw->multitrack!=NULL) {
+      mainw->current_file=mainw->multitrack->render_file;
+      mt_sensitise(mainw->multitrack);
+      mainw->multitrack->idlefunc=mt_idle_add(mainw->multitrack);
     }
+    return FALSE;
   }
 
-  g_snprintf (mainw->msg,256,"none");
+  lives_snprintf(mainw->msg,256,"none");
 
-  msg=g_strdup_printf(_("Loading clips from set %s"),mainw->set_name);
-  if (!skip_threaded_dialog&&prefs->show_gui) {
+  // check if we already have a threaded dialog running (i.e. we are called from startup)
+  if (mainw->threaded_dialog) keep_threaded_dialog=TRUE;
+
+  if (prefs->show_gui && !keep_threaded_dialog) {
+    char *tmp;
+    msg=lives_strdup_printf(_("Loading clips from set %s"),(tmp=F2U8(set_name)));
     do_threaded_dialog(msg,FALSE);
+    lives_free(msg);
+    lives_free(tmp);
   }
-  g_free(msg);
 
-  ordfile=g_build_filename(prefs->tmpdir,mainw->set_name,"order",NULL);
+  ordfile=lives_build_filename(prefs->tmpdir,set_name,"order",NULL);
   orderfile=fopen(ordfile,"r"); // no we can't assert this, because older sets did not have this file
-  g_free(ordfile);
+  lives_free(ordfile);
 
   mainw->suppress_dprint=TRUE;
   mainw->read_failed=FALSE;
 
-  g_snprintf(vid_open_dir,PATH_MAX,"%s",mainw->vid_load_dir);
-
-  cwd=g_get_current_dir();
+  lives_snprintf(vid_open_dir,PATH_MAX,"%s",mainw->vid_load_dir);
 
+  cwd=lives_get_current_dir();
 
   while (1) {
-    if (!skip_threaded_dialog&&prefs->show_gui) {
+    if (prefs->show_gui) {
       threaded_dialog_spin();
     }
+
     if (mainw->cached_list!=NULL) {
-      g_list_free_strings(mainw->cached_list);
-      g_list_free(mainw->cached_list);
+      lives_list_free_strings(mainw->cached_list);
+      lives_list_free(mainw->cached_list);
       mainw->cached_list=NULL;
     }
 
     if (orderfile==NULL) {
       // old style (pre 0.9.6)
-      com=g_strdup_printf ("%s get_next_in_set \"%s\" \"%s\" %d",prefs->backend_sync,mainw->msg,
-			   mainw->set_name,capable->mainpid);
-      lives_system (com,FALSE);
-      g_free (com);
-
-      if (strlen (mainw->msg)>0&&(strncmp (mainw->msg,"none",4))) {
-
-	if ((new_file=mainw->first_free_file)==-1) {
-	  recover_layout_map(MAX_FILES);
-
-	  if (!skip_threaded_dialog) end_threaded_dialog();
-	  mainw->suppress_dprint=FALSE;
-	  too_many_files();
-	  if (mainw->multitrack!=NULL) {
-	    mainw->current_file=mainw->multitrack->render_file;
-	    polymorph(mainw->multitrack,POLY_NONE);
-	    polymorph(mainw->multitrack,POLY_CLIPS);
-	    mt_sensitise(mainw->multitrack);
-	    mainw->multitrack->idlefunc=mt_idle_add(mainw->multitrack);
-	  }
-	  g_free(cwd);
-	  return !skip_threaded_dialog;
-	}
-	mainw->current_file=new_file;
-	get_handle_from_info_file(new_file);
+      com=lives_strdup_printf("%s get_next_in_set \"%s\" \"%s\" %d",prefs->backend_sync,mainw->msg,
+                              set_name,capable->mainpid);
+      lives_system(com,FALSE);
+      lives_free(com);
+
+      if (strlen(mainw->msg)>0&&(strncmp(mainw->msg,"none",4))) {
+
+        if ((new_file=mainw->first_free_file)==-1) {
+          recover_layout_map(MAX_FILES);
+
+          if (!keep_threaded_dialog) end_threaded_dialog();
+
+          mainw->suppress_dprint=FALSE;
+          too_many_files();
+          if (mainw->multitrack!=NULL) {
+            mainw->current_file=mainw->multitrack->render_file;
+            polymorph(mainw->multitrack,POLY_NONE);
+            polymorph(mainw->multitrack,POLY_CLIPS);
+            mt_sensitise(mainw->multitrack);
+            mainw->multitrack->idlefunc=mt_idle_add(mainw->multitrack);
+          }
+          lives_free(cwd);
+          return FALSE;
+        }
+        mainw->current_file=new_file;
+        get_handle_from_info_file(new_file);
       }
-    }
-    else {
+    } else {
       if (lives_fgets(mainw->msg,512,orderfile)==NULL) clear_mainw_msg();
       else memset(mainw->msg+strlen(mainw->msg)-strlen("\n"),0,1);
     }
 
 
-    if (strlen (mainw->msg)==0||(!strncmp (mainw->msg,"none",4))) {
+    if (strlen(mainw->msg)==0||(!strncmp(mainw->msg,"none",4))) {
       mainw->suppress_dprint=FALSE;
-      if (!skip_threaded_dialog) end_threaded_dialog();
-      if (orderfile!=NULL) fclose (orderfile);
+
+      if (!keep_threaded_dialog) end_threaded_dialog();
+
+      if (orderfile!=NULL) fclose(orderfile);
 
       mainw->current_file=current_file;
 
       if (last_file>0) {
-	threaded_dialog_spin();
-	switch_to_file (current_file,last_file);
-	threaded_dialog_spin();
+        threaded_dialog_spin();
+        switch_to_file(current_file,last_file);
+        threaded_dialog_spin();
       }
 
-
       if (clipnum==0) {
-	do_set_noclips_error(mainw->set_name);
-	memset (mainw->set_name,0,1);
-      }
-      else {
-	reset_clipmenu();
-	lives_widget_set_sensitive (mainw->vj_load_set, FALSE);
+        do_set_noclips_error(set_name);
+      } else {
+        char *tmp;
+        reset_clipmenu();
+        lives_widget_set_sensitive(mainw->vj_load_set, FALSE);
 
-	
-	recover_layout_map(MAX_FILES);
+        recover_layout_map(MAX_FILES);
 
-	msg=g_strdup_printf (_ ("%d clips and %d layouts were recovered from set (%s).\n"),
-			     clipnum,g_list_length(mainw->current_layouts_map),mainw->set_name);
-	d_print (msg);
-	g_free (msg);
+        d_print(_("%d clips and %d layouts were recovered from set (%s).\n"),
+                clipnum,lives_list_length(mainw->current_layouts_map),(tmp=F2U8(set_name)));
+        lives_free(tmp);
 
-#ifdef ENABLE_OSC
-	lives_osc_notify(LIVES_OSC_NOTIFY_CLIPSET_OPENED,mainw->set_name);
-#endif
+        lives_snprintf(mainw->set_name,128,"%s",set_name);
+
+        lives_notify(LIVES_OSC_NOTIFY_CLIPSET_OPENED,mainw->set_name);
 
       }
-    
+
       threaded_dialog_spin();
       if (mainw->multitrack==NULL) {
-	if (mainw->is_ready) {
-	  if (clipnum>0&&mainw->current_file>0) {
-	    load_start_image (cfile->start);
-	    load_end_image (cfile->end);
-	  }
-	  lives_widget_context_update();
-	}
+        if (mainw->is_ready) {
+          if (clipnum>0&&mainw->current_file>0) {
+            load_start_image(cfile->start);
+            load_end_image(cfile->end);
+          }
+          lives_widget_context_update();
+        }
+      } else {
+        mainw->current_file=mainw->multitrack->render_file;
+        polymorph(mainw->multitrack,POLY_NONE);
+        polymorph(mainw->multitrack,POLY_CLIPS);
+        mt_sensitise(mainw->multitrack);
+        mainw->multitrack->idlefunc=mt_idle_add(mainw->multitrack);
       }
-      else {
-	mainw->current_file=mainw->multitrack->render_file;
-	polymorph(mainw->multitrack,POLY_NONE);
-	polymorph(mainw->multitrack,POLY_CLIPS);
-	mt_sensitise(mainw->multitrack);
-	mainw->multitrack->idlefunc=mt_idle_add(mainw->multitrack);
-      }
-      threaded_dialog_spin();
 
-      if (!skip_threaded_dialog) end_threaded_dialog();
-      g_free(cwd);
+      if (!keep_threaded_dialog) end_threaded_dialog();
+      lives_free(cwd);
       return TRUE;
     }
 
     mainw->was_set=TRUE;
 
     if (prefs->crash_recovery&&!added_recovery) {
-      gchar *recovery_entry=g_build_filename(mainw->set_name,"*",NULL);
-      threaded_dialog_spin();
+      char *recovery_entry=lives_build_filename(set_name,"*",NULL);
       add_to_recovery_file(recovery_entry);
-      g_free(recovery_entry);
+      lives_free(recovery_entry);
       added_recovery=TRUE;
     }
 
     if (orderfile!=NULL) {
       // newer style (0.9.6+)
-      gchar *clipdir=g_build_filename(prefs->tmpdir,mainw->msg,NULL);
-      if (!g_file_test(clipdir,G_FILE_TEST_IS_DIR)) {
-	g_free(clipdir);
-	continue;
+      char *clipdir=lives_build_filename(prefs->tmpdir,mainw->msg,NULL);
+      if (!lives_file_test(clipdir,LIVES_FILE_TEST_IS_DIR)) {
+        lives_free(clipdir);
+        continue;
       }
-      g_free(clipdir);
+      lives_free(clipdir);
       threaded_dialog_spin();
       if ((new_file=mainw->first_free_file)==-1) {
-	mainw->suppress_dprint=FALSE;
+        mainw->suppress_dprint=FALSE;
 
-	if (!skip_threaded_dialog) end_threaded_dialog();
+        if (!keep_threaded_dialog) end_threaded_dialog();
 
-	too_many_files();
+        too_many_files();
 
-	if (mainw->multitrack!=NULL) {
-	  mainw->current_file=mainw->multitrack->render_file;
-	  polymorph(mainw->multitrack,POLY_NONE);
-	  polymorph(mainw->multitrack,POLY_CLIPS);
-	  mt_sensitise(mainw->multitrack);
-	  mainw->multitrack->idlefunc=mt_idle_add(mainw->multitrack);
-	}
-
-	recover_layout_map(MAX_FILES);
-	g_free(cwd);
-	return !skip_threaded_dialog;
+        if (mainw->multitrack!=NULL) {
+          mainw->current_file=mainw->multitrack->render_file;
+          polymorph(mainw->multitrack,POLY_NONE);
+          polymorph(mainw->multitrack,POLY_CLIPS);
+          mt_sensitise(mainw->multitrack);
+          mainw->multitrack->idlefunc=mt_idle_add(mainw->multitrack);
+        }
+
+        recover_layout_map(MAX_FILES);
+        lives_free(cwd);
+        return FALSE;
       }
       mainw->current_file=new_file;
-      cfile=(lives_clip_t *)(g_malloc(sizeof(lives_clip_t)));
-      g_snprintf(cfile->handle,256,"%s",mainw->msg);
+      cfile=(lives_clip_t *)(lives_malloc(sizeof(lives_clip_t)));
+      cfile->cb_src=-1;
+      lives_snprintf(cfile->handle,256,"%s",mainw->msg);
       cfile->clip_type=CLIP_TYPE_DISK; // the default
 
       // lock the set
 #ifndef IS_MINGW
-      com=g_strdup_printf("/bin/touch \"%s/%s/lock.%d\"",prefs->tmpdir,mainw->set_name,capable->mainpid);
+      com=lives_strdup_printf("%s \"%s/%s/lock.%d\"",capable->touch_cmd,prefs->tmpdir,set_name,capable->mainpid);
 #else
-      com=g_strdup_printf("touch.exe \"%s\\%s\\lock.%d\"",prefs->tmpdir,mainw->set_name,capable->mainpid);
+      com=lives_strdup_printf("touch.exe \"%s\\%s\\lock.%d\"",prefs->tmpdir,set_name,capable->mainpid);
 #endif
+
       lives_system(com,FALSE);
-      g_free(com);
+      lives_free(com);
     }
-  
+
     //create a new cfile and fill in the details
     create_cfile();
     threaded_dialog_spin();
@@ -5185,30 +5141,29 @@
     // get file details
     read_headers(".");
     threaded_dialog_spin();
-    
+
     // if the clip has a frame_index file, then it is CLIP_TYPE_FILE
     // and we must load the frame_index and locate a suitable decoder plugin
 
     if (load_frame_index(mainw->current_file)) {
       // CLIP_TYPE_FILE
       if (!reload_clip(mainw->current_file)) continue;
-    }
-    else {
+    } else {
       // CLIP_TYPE_DISK
       if (!check_frame_count(mainw->current_file)) {
-	get_frame_count(mainw->current_file);
-	needs_update=TRUE;
+        get_frame_count(mainw->current_file);
+        needs_update=TRUE;
       }
       if (cfile->frames>0&&(cfile->hsize*cfile->vsize==0)) {
-	get_frames_sizes(mainw->current_file,1);
-	if (cfile->hsize*cfile->vsize>0) needs_update=TRUE;
+        get_frames_sizes(mainw->current_file,1);
+        if (cfile->hsize*cfile->vsize>0) needs_update=TRUE;
       }
     }
 
     last_file=new_file;
 
     // read the playback fps, play frame, and name
-    open_set_file (mainw->set_name,++clipnum);
+    open_set_file(set_name,++clipnum);
     threaded_dialog_spin();
 
     if (needs_update) {
@@ -5217,30 +5172,29 @@
     }
 
     if (mainw->cached_list!=NULL) {
-      g_list_free_strings(mainw->cached_list);
-      g_list_free(mainw->cached_list);
+      lives_list_free_strings(mainw->cached_list);
+      lives_list_free(mainw->cached_list);
       mainw->cached_list=NULL;
     }
 
     if (prefs->autoload_subs) {
-      subfname=g_build_filename(prefs->tmpdir,cfile->handle,"subs.srt",NULL);
-      if (g_file_test(subfname,G_FILE_TEST_EXISTS)) {
-	subtitles_init(cfile,subfname,SUBTITLE_TYPE_SRT);
-      }
-      else {
-	g_free(subfname);
-	subfname=g_build_filename(prefs->tmpdir,cfile->handle,"subs.sub",NULL);
-	if (g_file_test(subfname,G_FILE_TEST_EXISTS)) {
-	  subtitles_init(cfile,subfname,SUBTITLE_TYPE_SUB);
-	}
+      subfname=lives_build_filename(prefs->tmpdir,cfile->handle,"subs.srt",NULL);
+      if (lives_file_test(subfname,LIVES_FILE_TEST_EXISTS)) {
+        subtitles_init(cfile,subfname,SUBTITLE_TYPE_SRT);
+      } else {
+        lives_free(subfname);
+        subfname=lives_build_filename(prefs->tmpdir,cfile->handle,"subs.sub",NULL);
+        if (lives_file_test(subfname,LIVES_FILE_TEST_EXISTS)) {
+          subtitles_init(cfile,subfname,SUBTITLE_TYPE_SUB);
+        }
       }
-      g_free(subfname);
+      lives_free(subfname);
       threaded_dialog_spin();
     }
 
-    get_total_time (cfile);
+    get_total_time(cfile);
     if (cfile->achans) cfile->aseek_pos=(int64_t)((double)(cfile->frameno-1.)/
-					       cfile->fps*cfile->arate*cfile->achans*cfile->asampsize/8);
+                                          cfile->fps*cfile->arate*cfile->achans*cfile->asampsize/8);
 
     // add to clip menu
     threaded_dialog_spin();
@@ -5250,9 +5204,18 @@
     cfile->end=cfile->frames;
     cfile->is_loaded=TRUE;
     cfile->changed=TRUE;
-    unlink (cfile->info_file);
+    unlink(cfile->info_file);
     set_main_title(cfile->name,0);
 
+    if (mainw->multitrack==NULL) {
+      if (mainw->current_file>0) {
+        resize(1);
+        load_start_image(cfile->start);
+        load_end_image(cfile->end);
+        lives_widget_context_update();
+      }
+    }
+
     if (mainw->multitrack!=NULL&&mainw->multitrack->is_ready) {
       mainw->current_file=mainw->multitrack->render_file;
       mt_init_clips(mainw->multitrack,new_file,TRUE);
@@ -5260,41 +5223,24 @@
       mt_clip_select(mainw->multitrack,TRUE);
     }
 
-#ifdef ENABLE_OSC
-    lives_osc_notify(LIVES_OSC_NOTIFY_CLIP_OPENED,"");
-#endif
+    lives_notify(LIVES_OSC_NOTIFY_CLIP_OPENED,"");
   }
-  
-  threaded_dialog_spin();
-  reset_clipmenu();
-  threaded_dialog_spin();
 
-  if (mainw->multitrack!=NULL&&mainw->multitrack->is_ready) {
-    mainw->current_file=mainw->multitrack->render_file;
-    polymorph(mainw->multitrack,POLY_NONE);
-    polymorph(mainw->multitrack,POLY_CLIPS);
-    mt_sensitise(mainw->multitrack);
-    mainw->multitrack->idlefunc=mt_idle_add(mainw->multitrack);
-  }
-
-  recover_layout_map(MAX_FILES);
-
-  mainw->suppress_dprint=FALSE;
-  g_free(cwd);
+  // should never reach here
   return TRUE;
 }
 
 
 
-void on_cleardisk_activate (LiVESWidget *widget, gpointer user_data) {
+void on_cleardisk_activate(LiVESWidget *widget, livespointer user_data) {
   // recover disk space
 
   int64_t bytes=0,fspace;
   int64_t ds_warn_level=mainw->next_ds_warn_level;
 
-  gchar *markerfile;
-  gchar **array;
-  gchar *com;
+  char *markerfile;
+  char **array;
+  char *com;
 
   int current_file=mainw->current_file;
   int marker_fd;
@@ -5309,12 +5255,13 @@
   mainw->tried_ds_recover=TRUE; ///< indicates we tried ds recovery already
 
   mainw->add_clear_ds_adv=TRUE; ///< auto reset by do_warning_dialog()
-  if (!do_warning_dialog (_ ("LiVES will attempt to recover some disk space.\nYou should ONLY run this if you have no other copies of LiVES running on this machine.\nClick OK to proceed.\n"))) {
+  if (!do_warning_dialog(
+        _("LiVES will attempt to recover some disk space.\nYou should ONLY run this if you have no other copies of LiVES running on this machine.\nClick OK to proceed.\n"))) {
     mainw->next_ds_warn_level=ds_warn_level;;
     return;
   }
 
-  d_print(_ ("Cleaning up disk space..."));
+  d_print(_("Cleaning up disk space..."));
 
   // get a temporary clip for receiving data from backend
   if (!get_temp_handle(mainw->first_free_file,TRUE)) {
@@ -5327,42 +5274,42 @@
 
   if (mainw->multitrack!=NULL) {
     if (mainw->multitrack->idlefunc>0) {
-      g_source_remove(mainw->multitrack->idlefunc);
+      lives_source_remove(mainw->multitrack->idlefunc);
       mainw->multitrack->idlefunc=0;
     }
     mt_desensitise(mainw->multitrack);
   }
 
 
-  for (i=0;i<MAX_FILES;i++) {
+  for (i=0; i<MAX_FILES; i++) {
     // mark all free-floating files (directories) which we do not want to remove
     // we do error checking here
 
     if ((i==mainw->current_file)||(mainw->files[i]!=NULL&&(mainw->files[i]->clip_type==CLIP_TYPE_DISK||
-							   mainw->files[i]->clip_type==CLIP_TYPE_FILE))) {
-      markerfile=g_build_filename(prefs->tmpdir,mainw->files[i]->handle,"set.",NULL);
+                                   mainw->files[i]->clip_type==CLIP_TYPE_FILE))) {
+      markerfile=lives_build_filename(prefs->tmpdir,mainw->files[i]->handle,"set.",NULL);
 
       do {
-	retval=0;
-	marker_fd=creat(markerfile,S_IRUSR|S_IWUSR);
-	if (marker_fd<0) {
-	  retval=do_write_failed_error_s_with_retry(markerfile,g_strerror(errno),NULL);
-	}
-      } while (retval==LIVES_RETRY);
+        retval=0;
+        marker_fd=creat(markerfile,S_IRUSR|S_IWUSR);
+        if (marker_fd<0) {
+          retval=do_write_failed_error_s_with_retry(markerfile,lives_strerror(errno),NULL);
+        }
+      } while (retval==LIVES_RESPONSE_RETRY);
 
       close(marker_fd);
-      g_free(markerfile);
+      lives_free(markerfile);
       if (mainw->files[i]->undo_action!=UNDO_NONE) {
-	markerfile=g_build_filename(prefs->tmpdir,mainw->files[i]->handle,"noprune",NULL);
-	do {
-	  retval=0;
-	  marker_fd=creat(markerfile,S_IRUSR|S_IWUSR);
-	  if (marker_fd<0) {
-	    retval=do_write_failed_error_s_with_retry(markerfile,g_strerror(errno),NULL);
-	  }
-	} while (retval==LIVES_RETRY);
-	close(marker_fd);
-	g_free(markerfile);
+        markerfile=lives_build_filename(prefs->tmpdir,mainw->files[i]->handle,"noprune",NULL);
+        do {
+          retval=0;
+          marker_fd=creat(markerfile,S_IRUSR|S_IWUSR);
+          if (marker_fd<0) {
+            retval=do_write_failed_error_s_with_retry(markerfile,lives_strerror(errno),NULL);
+          }
+        } while (retval==LIVES_RESPONSE_RETRY);
+        close(marker_fd);
+        lives_free(markerfile);
       }
     }
   }
@@ -5374,46 +5321,46 @@
   // call "smogrify bg_weed" to do the actual cleanup
   // its parameters are the handle of a temp file, and opts mask
 
-  if (retval!=LIVES_CANCEL) {
+  if (retval!=LIVES_RESPONSE_CANCEL) {
     mainw->com_failed=FALSE;
     unlink(cfile->info_file);
-    com=g_strdup_printf("%s bg_weed \"%s\" %d",prefs->backend,cfile->handle,prefs->clear_disk_opts);
+    com=lives_strdup_printf("%s bg_weed \"%s\" %d",prefs->backend,cfile->handle,prefs->clear_disk_opts);
     lives_system(com,FALSE);
-    g_free(com);
-    
+    lives_free(com);
+
     if (!mainw->com_failed) {
 
       // show a progress dialog, not cancellable
       do_progress_dialog(TRUE,FALSE,_("Recovering disk space"));
-      
-      array=g_strsplit(mainw->msg,"|",2);
+
+      array=lives_strsplit(mainw->msg,"|",2);
       bytes=strtol(array[1],NULL,10);
       if (bytes<0) bytes=0;
-      g_strfreev(array);
-      
+      lives_strfreev(array);
+
     }
   }
 
 
   // close the temporary clip
-  com=g_strdup_printf("%s close \"%s\"",prefs->backend,cfile->handle);
+  com=lives_strdup_printf("%s close \"%s\"",prefs->backend,cfile->handle);
   lives_system(com,FALSE);
-  g_free(com);
-  g_free(cfile);
+  lives_free(com);
+  lives_free(cfile);
   cfile=NULL;
-  if (mainw->first_free_file==-1||mainw->first_free_file>mainw->current_file) 
+  if (mainw->first_free_file==-1||mainw->first_free_file>mainw->current_file)
     mainw->first_free_file=mainw->current_file;
 
   // remove the protective markers
-  for (i=0;i<MAX_FILES;i++) {
+  for (i=0; i<MAX_FILES; i++) {
     if (mainw->files[i]!=NULL&&mainw->files[i]->clip_type==CLIP_TYPE_DISK) {
-      markerfile=g_build_filename(prefs->tmpdir,mainw->files[i]->handle,"set.",NULL);
-      unlink (markerfile);
-      g_free(markerfile);
+      markerfile=lives_build_filename(prefs->tmpdir,mainw->files[i]->handle,"set.",NULL);
+      unlink(markerfile);
+      lives_free(markerfile);
       if (mainw->files[i]->undo_action!=UNDO_NONE) {
-	markerfile=g_build_filename(prefs->tmpdir,mainw->files[i]->handle,"noprune",NULL);
-	unlink (markerfile);
-	g_free(markerfile);
+        markerfile=lives_build_filename(prefs->tmpdir,mainw->files[i]->handle,"noprune",NULL);
+        unlink(markerfile);
+        lives_free(markerfile);
       }
     }
   }
@@ -5434,20 +5381,19 @@
 
   if (bytes<0) bytes=0;
 
-  if (retval!=LIVES_CANCEL&&!mainw->com_failed) {
+  if (retval!=LIVES_RESPONSE_CANCEL&&!mainw->com_failed) {
     d_print_done();
-    do_info_dialog(g_strdup_printf(_("%s of disk space was recovered.\n"), 
-				   lives_format_storage_space_string((uint64_t)bytes)));
+    do_info_dialog(lives_strdup_printf(_("%s of disk space was recovered.\n"),
+                                       lives_format_storage_space_string((uint64_t)bytes)));
     if (user_data!=NULL) lives_widget_set_sensitive(lives_widget_get_toplevel(LIVES_WIDGET(user_data)),FALSE);
-  }
-  else d_print_failed();
+  } else d_print_failed();
 
   mainw->next_ds_warn_level=ds_warn_level;;
 
 }
 
 
-void on_cleardisk_advanced_clicked (LiVESWidget *widget, gpointer user_data) {
+void on_cleardisk_advanced_clicked(LiVESWidget *widget, livespointer user_data) {
   // make cleardisk adv window
 
   // show various options and OK/Cancel button
@@ -5460,19 +5406,19 @@
     lives_widget_show_all(dialog);
     response=lives_dialog_run(LIVES_DIALOG(dialog));
     lives_widget_destroy(dialog);
-    if (response==LIVES_RETRY) prefs->clear_disk_opts=0;
-  } while (response==LIVES_RETRY);
+    if (response==LIVES_RESPONSE_RETRY) prefs->clear_disk_opts=0;
+  } while (response==LIVES_RESPONSE_RETRY);
 
   set_int_pref("clear_disk_opts",prefs->clear_disk_opts);
 }
 
 
-void on_show_keys_activate (LiVESMenuItem *menuitem, gpointer user_data) {
+void on_show_keys_activate(LiVESMenuItem *menuitem, livespointer user_data) {
   do_keys_window();
 }
 
 
-void on_vj_reset_activate (LiVESMenuItem *menuitem, gpointer user_data) {
+void on_vj_reset_activate(LiVESMenuItem *menuitem, livespointer user_data) {
   boolean bad_header=FALSE;
 
   register int i;
@@ -5481,7 +5427,7 @@
 
   do_threaded_dialog(_("Resetting frame rates and frame values..."),FALSE);
 
-  for (i=1;i<MAX_FILES;i++) {
+  for (i=1; i<MAX_FILES; i++) {
     if (mainw->files[i]!=NULL&&i!=mainw->playing_file) {
       mainw->files[i]->pb_fps=mainw->files[i]->fps;
       mainw->files[i]->frameno=1;
@@ -5503,127 +5449,122 @@
 }
 
 
-void on_show_messages_activate (LiVESMenuItem *menuitem, gpointer user_data) {
+void on_show_messages_activate(LiVESMenuItem *menuitem, livespointer user_data) {
   do_messages_window();
 }
 
 
-void on_show_file_info_activate (LiVESMenuItem *menuitem, gpointer user_data) {
+void on_show_file_info_activate(LiVESMenuItem *menuitem, livespointer user_data) {
   char buff[512];
   lives_clipinfo_t *filew;
 
-  gchar *sigs,*ends,*tmp;
-  
+  char *sigs,*ends,*tmp;
+
   if (mainw->current_file==-1) return;
 
-  filew = create_clip_info_window (cfile->achans,FALSE);
-  
+  filew = create_clip_info_window(cfile->achans,FALSE);
+
   if (cfile->frames>0) {
     // type
-    g_snprintf(buff,512,_("\nExternal: %s\nInternal: %s (%d bpp) / %s\n"),cfile->type,
-	       (tmp=g_strdup((cfile->clip_type==CLIP_TYPE_YUV4MPEG||
-			      cfile->clip_type==CLIP_TYPE_VIDEODEV)?(_("buffered")):
-			     (cfile->img_type==IMG_TYPE_JPEG?"jpeg":"png"))),cfile->bpp,"pcm");
-    g_free(tmp);
-    lives_text_view_set_text (LIVES_TEXT_VIEW (filew->textview24),buff, -1);
+    lives_snprintf(buff,512,_("\nExternal: %s\nInternal: %s (%d bpp) / %s\n"),cfile->type,
+                   (tmp=lives_strdup((cfile->clip_type==CLIP_TYPE_YUV4MPEG||
+                                      cfile->clip_type==CLIP_TYPE_VIDEODEV)?(_("buffered")):
+                                     (cfile->img_type==IMG_TYPE_JPEG?"jpeg":"png"))),cfile->bpp,"pcm");
+    lives_free(tmp);
+    lives_text_view_set_text(LIVES_TEXT_VIEW(filew->textview24),buff, -1);
     // fps
-    g_snprintf(buff,512,"\n  %.3f%s",cfile->fps,cfile->ratio_fps?"...":"");
+    lives_snprintf(buff,512,"\n  %.3f%s",cfile->fps,cfile->ratio_fps?"...":"");
 
-    lives_text_view_set_text (LIVES_TEXT_VIEW (filew->textview25),buff, -1);
+    lives_text_view_set_text(LIVES_TEXT_VIEW(filew->textview25),buff, -1);
     // image size
-    g_snprintf(buff,512,"\n  %dx%d",cfile->hsize,cfile->vsize);
-    lives_text_view_set_text (LIVES_TEXT_VIEW (filew->textview26),buff, -1);
+    lives_snprintf(buff,512,"\n  %dx%d",cfile->hsize,cfile->vsize);
+    lives_text_view_set_text(LIVES_TEXT_VIEW(filew->textview26),buff, -1);
     // frames
     if ((cfile->opening&&!cfile->opening_audio&&cfile->frames==0)||cfile->frames==123456789) {
-      g_snprintf(buff,512,"%s",_ ("\n  Opening..."));
-    }
-    else {
-      g_snprintf(buff,512,"\n  %d",cfile->frames);
+      lives_snprintf(buff,512,"%s",_("\n  Opening..."));
+    } else {
+      lives_snprintf(buff,512,"\n  %d",cfile->frames);
 
       if (cfile->frame_index!=NULL) {
-	int fvirt=count_virtual_frames(cfile->frame_index,1,cfile->frames);
-	gchar *tmp=g_strdup_printf(_("\n(%d virtual)"),fvirt);
-	g_strappend(buff,512,tmp);
-	g_free(tmp);
-	tmp=g_strdup_printf(_("\n(%d decoded)"),cfile->frames-fvirt);
-	g_strappend(buff,512,tmp);
-	g_free(tmp);
+        int fvirt=count_virtual_frames(cfile->frame_index,1,cfile->frames);
+        char *tmp=lives_strdup_printf(_("\n(%d virtual)"),fvirt);
+        lives_strappend(buff,512,tmp);
+        lives_free(tmp);
+        tmp=lives_strdup_printf(_("\n(%d decoded)"),cfile->frames-fvirt);
+        lives_strappend(buff,512,tmp);
+        lives_free(tmp);
       }
 
     }
-    lives_text_view_set_text (LIVES_TEXT_VIEW (filew->textview27),buff, -1);
+    lives_text_view_set_text(LIVES_TEXT_VIEW(filew->textview27),buff, -1);
     // video time
     if ((cfile->opening&&!cfile->opening_audio&&cfile->frames==0)||cfile->frames==123456789) {
-      g_snprintf(buff,512,"%s",_ ("\n  Opening..."));
-    }
-    else {
-      g_snprintf(buff,512,_("\n  %.2f sec."),cfile->video_time);
+      lives_snprintf(buff,512,"%s",_("\n  Opening..."));
+    } else {
+      lives_snprintf(buff,512,_("\n  %.2f sec."),cfile->video_time);
     }
-    lives_text_view_set_text (LIVES_TEXT_VIEW (filew->textview28),buff, -1);
+    lives_text_view_set_text(LIVES_TEXT_VIEW(filew->textview28),buff, -1);
     // file size
     if (cfile->f_size>=0l) {
-      gchar *file_ds=lives_format_storage_space_string((uint64_t)cfile->f_size);
-      g_snprintf(buff,512,"\n  %s",file_ds);
-      g_free(file_ds);
-    }
-    else g_snprintf(buff,512,"%s",_ ("\n  Unknown"));
-    lives_text_view_set_text (LIVES_TEXT_VIEW (filew->textview29),buff, -1);
+      char *file_ds=lives_format_storage_space_string((uint64_t)cfile->f_size);
+      lives_snprintf(buff,512,"\n  %s",file_ds);
+      lives_free(file_ds);
+    } else lives_snprintf(buff,512,"%s",_("\n  Unknown"));
+    lives_text_view_set_text(LIVES_TEXT_VIEW(filew->textview29),buff, -1);
   }
 
   if (cfile->achans>0) {
     if (cfile->opening) {
-      g_snprintf(buff,512,"%s",_ ("\n  Opening..."));
-    }
-    else {
-      g_snprintf(buff,512,_("\n  %.2f sec."),cfile->laudio_time);
+      lives_snprintf(buff,512,"%s",_("\n  Opening..."));
+    } else {
+      lives_snprintf(buff,512,_("\n  %.2f sec."),cfile->laudio_time);
     }
-    lives_text_view_set_text (LIVES_TEXT_VIEW (filew->textview_ltime),buff, -1);
+    lives_text_view_set_text(LIVES_TEXT_VIEW(filew->textview_ltime),buff, -1);
 
-    if (cfile->signed_endian&AFORM_UNSIGNED) sigs=g_strdup(_("unsigned"));
-    else sigs=g_strdup(_("signed"));
+    if (cfile->signed_endian&AFORM_UNSIGNED) sigs=lives_strdup(_("unsigned"));
+    else sigs=lives_strdup(_("signed"));
 
-    if (cfile->signed_endian&AFORM_BIG_ENDIAN) ends=g_strdup(_("big-endian"));
-    else ends=g_strdup(_("little-endian"));
+    if (cfile->signed_endian&AFORM_BIG_ENDIAN) ends=lives_strdup(_("big-endian"));
+    else ends=lives_strdup(_("little-endian"));
 
-    g_snprintf(buff,512,_("  %d Hz %d bit\n%s %s"),cfile->arate,cfile->asampsize,sigs,ends);
-    lives_text_view_set_text (LIVES_TEXT_VIEW (filew->textview_lrate),buff, -1);
+    lives_snprintf(buff,512,_("  %d Hz %d bit\n%s %s"),cfile->arate,cfile->asampsize,sigs,ends);
+    lives_text_view_set_text(LIVES_TEXT_VIEW(filew->textview_lrate),buff, -1);
 
-    g_free(sigs);
-    g_free(ends);
+    lives_free(sigs);
+    lives_free(ends);
   }
-  
+
   if (cfile->achans>1) {
-    if (cfile->signed_endian&AFORM_UNSIGNED) sigs=g_strdup(_("unsigned"));
-    else sigs=g_strdup(_("signed"));
+    if (cfile->signed_endian&AFORM_UNSIGNED) sigs=lives_strdup(_("unsigned"));
+    else sigs=lives_strdup(_("signed"));
 
-    if (cfile->signed_endian&AFORM_BIG_ENDIAN) ends=g_strdup(_("big-endian"));
-    else ends=g_strdup(_("little-endian"));
+    if (cfile->signed_endian&AFORM_BIG_ENDIAN) ends=lives_strdup(_("big-endian"));
+    else ends=lives_strdup(_("little-endian"));
 
-    g_snprintf(buff,512,_("  %d Hz %d bit\n%s %s"),cfile->arate,cfile->asampsize,sigs,ends);
-    lives_text_view_set_text (LIVES_TEXT_VIEW (filew->textview_rrate),buff, -1);
+    lives_snprintf(buff,512,_("  %d Hz %d bit\n%s %s"),cfile->arate,cfile->asampsize,sigs,ends);
+    lives_text_view_set_text(LIVES_TEXT_VIEW(filew->textview_rrate),buff, -1);
+
+    lives_free(sigs);
+    lives_free(ends);
 
-    g_free(sigs);
-    g_free(ends);
-    
     if (cfile->opening) {
-      g_snprintf(buff,512,"%s",_ ("\n  Opening..."));
-    }
-    else {
-      g_snprintf(buff,512,_("\n  %.2f sec."),cfile->raudio_time);
+      lives_snprintf(buff,512,"%s",_("\n  Opening..."));
+    } else {
+      lives_snprintf(buff,512,_("\n  %.2f sec."),cfile->raudio_time);
     }
-    lives_text_view_set_text (LIVES_TEXT_VIEW (filew->textview_rtime),buff, -1);
+    lives_text_view_set_text(LIVES_TEXT_VIEW(filew->textview_rtime),buff, -1);
   }
 
 }
 
 
-void on_show_file_comments_activate (LiVESMenuItem *menuitem, gpointer user_data) {
+void on_show_file_comments_activate(LiVESMenuItem *menuitem, livespointer user_data) {
   do_comments_dialog(NULL,NULL);
 }
 
 
 
-void on_show_clipboard_info_activate (LiVESMenuItem *menuitem, gpointer user_data) {
+void on_show_clipboard_info_activate(LiVESMenuItem *menuitem, livespointer user_data) {
   int current_file=mainw->current_file;
   mainw->current_file=0;
   on_show_file_info_activate(menuitem,user_data);
@@ -5637,7 +5578,7 @@
   // prev clip
   // type = 0 : if the effect is a transition, this will change the background clip
   // type = 1 fg only
-  // type = 2 bg only 
+  // type = 2 bg only
 
   if (mainw->current_file<1||mainw->multitrack!=NULL||mainw->preview||mainw->internal_messaging||
       (mainw->is_processing&&cfile->is_loaded)||mainw->cliplist==NULL) return;
@@ -5646,13 +5587,13 @@
     // switch bg clip
     if (newclip!=mainw->blend_file) {
       if (mainw->blend_file!=-1&&mainw->files[mainw->blend_file]->clip_type==CLIP_TYPE_GENERATOR&&
-	  mainw->blend_file!=mainw->current_file) {
-	mainw->osc_block=TRUE;
-	if (rte_window!=NULL) rtew_set_keych(rte_bg_gen_key(),FALSE);
-	if (mainw->ce_thumbs) ce_thumbs_set_keych(rte_bg_gen_key(),FALSE);
-	mainw->new_blend_file=newclip;
-	weed_generator_end ((weed_plant_t *)mainw->files[mainw->blend_file]->ext_src);
-	mainw->osc_block=FALSE;
+          mainw->blend_file!=mainw->current_file) {
+        mainw->osc_block=TRUE;
+        if (rte_window!=NULL) rtew_set_keych(rte_bg_gen_key(),FALSE);
+        if (mainw->ce_thumbs) ce_thumbs_set_keych(rte_bg_gen_key(),FALSE);
+        mainw->new_blend_file=newclip;
+        weed_generator_end((weed_plant_t *)mainw->files[mainw->blend_file]->ext_src);
+        mainw->osc_block=FALSE;
       }
       mainw->blend_file=newclip;
       mainw->whentostop=NEVER_STOP;
@@ -5660,7 +5601,7 @@
     }
     return;
   }
-  
+
   // switch fg clip
 
   if (newclip==mainw->current_file) return;
@@ -5669,26 +5610,26 @@
   if (mainw->playing_file>-1) {
     mainw->pre_src_file=newclip;
     mainw->new_clip=newclip;
-  }
-  else {
-    switch_to_file (mainw->current_file,newclip);
+  } else {
+    switch_to_file(mainw->current_file,newclip);
   }
 }
 
 
-void switch_clip_activate (LiVESMenuItem *menuitem, gpointer user_data) {
+void switch_clip_activate(LiVESMenuItem *menuitem, livespointer user_data) {
   // switch clips from the clips menu
 
   register int i;
   if (mainw->current_file<1||mainw->preview||(mainw->is_processing&&cfile->is_loaded)||mainw->cliplist==NULL) return;
 
-  for (i=1;i<MAX_FILES;i++) {
+  for (i=1; i<MAX_FILES; i++) {
     if (!(mainw->files[i]==NULL)) {
-      if (LIVES_MENU_ITEM(menuitem)==LIVES_MENU_ITEM(mainw->files[i]->menuentry)&&lives_check_menu_item_get_active(LIVES_CHECK_MENU_ITEM(mainw->files[i]->menuentry))) {
-	if (!(i==mainw->current_file)) {
-	  switch_clip(0,i);
-	}
-	return;
+      if (LIVES_MENU_ITEM(menuitem)==LIVES_MENU_ITEM(mainw->files[i]->menuentry)&&
+          lives_check_menu_item_get_active(LIVES_CHECK_MENU_ITEM(mainw->files[i]->menuentry))) {
+        if (!(i==mainw->current_file)) {
+          switch_clip(0,i);
+        }
+        return;
       }
     }
   }
@@ -5697,125 +5638,181 @@
 
 
 void
-on_about_activate                     (LiVESMenuItem     *menuitem,
-                                        gpointer         user_data)
-{
+on_about_activate(LiVESMenuItem     *menuitem,
+                  livespointer         user_data) {
 
 #ifdef GUI_GTK
 #if GTK_CHECK_VERSION(2,14,0)
-  gchar *license = g_strdup(_(
-        "This program is free software; you can redistribute it and/or modify\n"
-        "it under the terms of the GNU General Public License as published by\n"
-        "the Free Software Foundation; either version 3 of the License, or\n"
-        "(at your option) any later version.\n"
-        "\n"
-        "This program is distributed in the hope that it will be useful,\n"
-        "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-        "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-        "GNU General Public License for more details.\n"
-        "\n"
-        "You should have received a copy of the GNU General Public License\n"
-        "along with this program; if not, write to the Free Software\n"
-        "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA.\n"));
+  char *license = lives_strdup(_(
+                                 "This program is free software; you can redistribute it and/or modify\n"
+                                 "it under the terms of the GNU General Public License as published by\n"
+                                 "the Free Software Foundation; either version 3 of the License, or\n"
+                                 "(at your option) any later version.\n"
+                                 "\n"
+                                 "This program is distributed in the hope that it will be useful,\n"
+                                 "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+                                 "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+                                 "GNU General Public License for more details.\n"
+                                 "\n"
+                                 "You should have received a copy of the GNU General Public License\n"
+                                 "along with this program; if not, write to the Free Software\n"
+                                 "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA.\n"));
 
-  gchar *comments= g_strdup(_("A video editor and VJ program."));
-  gchar *title= g_strdup(_("About LiVES"));
+  char *comments= lives_strdup(_("A video editor and VJ program."));
+  char *title= lives_strdup(_("About LiVES"));
 
-  gchar *translator_credits = g_strdup(_("translator_credits"));
+  char *translator_credits = lives_strdup(_("translator_credits"));
 
 #if GTK_CHECK_VERSION(3,0,0)
-  gchar *authors[2]={"salsaman@gmail.com",NULL};
+  char *authors[2]= {"salsaman@gmail.com",NULL};
 #else
-  gtk_about_dialog_set_url_hook (activate_url, NULL, NULL);
-  gtk_about_dialog_set_email_hook (activate_url, NULL, NULL);
+  gtk_about_dialog_set_url_hook(activate_url, NULL, NULL);
+  gtk_about_dialog_set_email_hook(activate_url, NULL, NULL);
 #endif
 
-  gtk_show_about_dialog (LIVES_WINDOW(mainw->LiVES),
-			 "logo", NULL,
-			 "name", "LiVES",
-			 "version", LiVES_VERSION,
-			 "comments",comments,
-			 "copyright", "(C) 2002-2015 salsaman <salsaman@gmail.com> and others",
-			 "website", "http://lives.sourceforge.net",
-			 "license", license,
-			 "title", title,
-			 "translator_credits", translator_credits,
+  gtk_show_about_dialog(LIVES_WINDOW(mainw->LiVES),
+                        "logo", NULL,
+                        "name", "LiVES",
+                        "version", LiVES_VERSION,
+                        "comments",comments,
+                        "copyright", "(C) 2002-2015 salsaman <salsaman@gmail.com> and others",
+                        "website", "http://lives.sourceforge.net",
+                        "license", license,
+                        "title", title,
+                        "translator_credits", translator_credits,
 #if GTK_CHECK_VERSION(3,0,0)
-			 "authors", authors,
-			 "license-type", GTK_LICENSE_GPL_3_0,
+                        "authors", authors,
+                        "license-type", GTK_LICENSE_GPL_3_0,
 #endif
-			 NULL);
+                        NULL);
 
-  g_free(translator_credits);
-  g_free(comments);
-  g_free(title);
-  g_free(license);
+  lives_free(translator_credits);
+  lives_free(comments);
+  lives_free(title);
+  lives_free(license);
   return;
 #endif
 #endif
 
-  gchar *mesg;
-  mesg=g_strdup_printf(_ ("LiVES Version %s\n(c) G. Finch (salsaman) %s\n\nReleased under the GPL 3 or later (http://www.gnu.org/licenses/gpl.txt)\nLiVES is distributed WITHOUT WARRANTY\n\nContact the author at:\nsalsaman@gmail.com\nHomepage: http://lives.sourceforge.net"),LiVES_VERSION,"2002-2015");
+  char *mesg;
+  mesg=lives_strdup_printf(
+         _("LiVES Version %s\n(c) G. Finch (salsaman) %s\n\nReleased under the GPL 3 or later (http://www.gnu.org/licenses/gpl.txt)\nLiVES is distributed WITHOUT WARRANTY\n\nContact the author at:\nsalsaman@gmail.com\nHomepage: http://lives.sourceforge.net"),
+         LiVES_VERSION,"2002-2015");
   do_error_dialog(mesg);
-  g_free(mesg);
-  
+  lives_free(mesg);
+
 }
 
 
 
 void
-show_manual_activate                     (LiVESMenuItem     *menuitem,
-					  gpointer         user_data)
-{
+show_manual_activate(LiVESMenuItem     *menuitem,
+                     livespointer         user_data) {
   show_manual_section(NULL,NULL);
 }
 
 
 
 void
-email_author_activate                     (LiVESMenuItem     *menuitem,
-					  gpointer         user_data)
-{
+email_author_activate(LiVESMenuItem     *menuitem,
+                      livespointer         user_data) {
   activate_url_inner(LIVES_AUTHOR_EMAIL);
 }
 
 
 void
-report_bug_activate                     (LiVESMenuItem     *menuitem,
-					  gpointer         user_data)
-{
+report_bug_activate(LiVESMenuItem     *menuitem,
+                    livespointer         user_data) {
   activate_url_inner(LIVES_BUG_URL);
 }
 
 
 void
-suggest_feature_activate                     (LiVESMenuItem     *menuitem,
-					      gpointer         user_data)
-{
+suggest_feature_activate(LiVESMenuItem     *menuitem,
+                         livespointer         user_data) {
   activate_url_inner(LIVES_FEATURE_URL);
 }
 
 
 void
-help_translate_activate                     (LiVESMenuItem     *menuitem,
-					      gpointer         user_data)
-{
+help_translate_activate(LiVESMenuItem     *menuitem,
+                        livespointer         user_data) {
   activate_url_inner(LIVES_TRANSLATE_URL);
 }
 
 
 
 void
-donate_activate                     (LiVESMenuItem     *menuitem,
-				     gpointer         user_data)
-{
-  const gchar *link=g_strdup_printf("%s%s",LIVES_DONATE_URL,user_data==NULL?"":(gchar *)user_data);
+donate_activate(LiVESMenuItem     *menuitem,
+                livespointer         user_data) {
+  const char *link=lives_strdup_printf("%s%s",LIVES_DONATE_URL,user_data==NULL?"":(char *)user_data);
   activate_url_inner(link);
 }
 
 
 
-void on_fs_preview_clicked (LiVESWidget *widget, gpointer user_data) {
+
+
+#if GTK_CHECK_VERSION(3,0,0)
+boolean expose_fsplayarea_event(LiVESWidget *widget, lives_painter_t *cr, livespointer user_data) {
+  //LiVESXEventExpose *event=NULL;
+#else
+boolean expose_fsplayarea_event(LiVESWidget *widget, LiVESXEventExpose *event) {
+  lives_painter_t *cr=NULL;
+#endif
+
+  boolean dest_cr=FALSE;
+
+  LiVESPixbuf *pixbuf=(LiVESPixbuf *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(widget), "pixbuf");
+
+  int fwidth, fheight, owidth, oheight, width, height;
+  int offs_x,offs_y;
+
+  if (cr==NULL) {
+    cr=lives_painter_create_from_widget(widget);
+    dest_cr=TRUE;
+  }
+
+  fwidth=lives_widget_get_allocation_width(widget);
+  fheight=lives_widget_get_allocation_height(widget);
+
+  owidth=width=lives_pixbuf_get_width(pixbuf);
+  oheight=height=lives_pixbuf_get_height(pixbuf);
+
+  calc_maxspect(fwidth,fheight,&width,&height);
+
+  width=(width>>1)<<1;
+  height=(height>>1)<<1;
+
+  if (width>owidth && height>oheight) {
+    width=owidth;
+    height=oheight;
+  }
+
+  lives_painter_set_source_rgb(cr,0.,0.,0.);
+  lives_painter_rectangle(cr,0.,0.,fwidth,fheight);
+
+  lives_painter_fill(cr);
+  lives_painter_paint(cr);
+
+  offs_x=(fwidth-width)/2;
+  offs_y=(fheight-height)/2;
+
+  lives_painter_set_source_pixbuf(cr, pixbuf, offs_x, offs_y);
+  lives_painter_fill(cr);
+  lives_painter_paint(cr);
+
+  if (dest_cr) lives_painter_destroy(cr);
+
+  return TRUE;
+}
+
+
+
+
+
+
+void on_fs_preview_clicked(LiVESWidget *widget, livespointer user_data) {
   // file selector preview
   double start_time=0.;
 
@@ -5825,50 +5822,48 @@
 
   lives_painter_t *cr;
 
-  LiVESPixbuf *blank;
-
-  gchar **array;
+  char **array;
 
   int preview_frames=1000000000;
-  int preview_type=GPOINTER_TO_INT (user_data);
+  int preview_type=LIVES_POINTER_TO_INT(user_data);
 
   int height=0,width=0;
   int fwidth,fheight,owidth,oheight;
 
-  int offs_x,offs_y;
   pid_t pid=capable->mainpid;
   int alarm_handle;
   int retval;
   boolean timeout;
 
-  gchar *info_file,*thm_dir;
-  gchar *file_open_params=NULL;
-  gchar *tmp,*tmp2;
-  gchar *com;
-  gchar *dfile;
+  char *info_file,*thm_dir;
+  char *file_open_params=NULL;
+  char *tmp,*tmp2;
+  char *com;
+  char *dfile;
+
+  end_fs_preview();
 
   if (mainw->in_fs_preview) {
-    end_fs_preview();
 
 #ifndef IS_MINGW
-    com=g_strdup_printf ("%s stopsubsub thm%d 2>/dev/null",prefs->backend_sync,pid);
-    lives_system (com,TRUE);
+    com=lives_strdup_printf("%s stopsubsub thm%d 2>/dev/null",prefs->backend_sync,pid);
+    lives_system(com,TRUE);
 #else
     // get pid from backend
     FILE *rfile;
     ssize_t rlen;
     char val[16];
     int xpid;
-    com=g_strdup_printf("%s get_pid_for_handle thm%d",prefs->backend_sync,pid);
+    com=lives_strdup_printf("%s get_pid_for_handle thm%d",prefs->backend_sync,pid);
     rfile=popen(com,"r");
     rlen=fread(val,1,16,rfile);
     pclose(rfile);
     memset(val+rlen,0,1);
     xpid=atoi(val);
-    if (xpid!=0) 
+    if (xpid!=0)
       lives_win32_kill_subprocesses(xpid,TRUE);
 #endif
-    g_free (com);
+    lives_free(com);
 
     lives_widget_context_update();
   }
@@ -5877,209 +5872,172 @@
     // open selection
     start_time=mainw->fx1_val;
     preview_frames=(int)mainw->fx2_val;
-  }
-  else {
+  } else {
     // open file
-    g_snprintf(file_name,PATH_MAX,"%s",
-	       (tmp=g_filename_to_utf8((tmp2=lives_file_chooser_get_filename (LIVES_FILE_CHOOSER(lives_widget_get_toplevel(widget)))),
-				       -1,NULL,NULL,NULL)));
-    g_free(tmp); g_free(tmp2);
-    
+    lives_snprintf(file_name,PATH_MAX,"%s",
+                   (tmp=lives_filename_to_utf8((tmp2=lives_file_chooser_get_filename(LIVES_FILE_CHOOSER(lives_widget_get_toplevel(widget)))),
+                        -1,NULL,NULL,NULL)));
+    lives_free(tmp);
+    lives_free(tmp2);
+
   }
 
 
 #ifndef IS_MINGW
-  info_file=g_strdup_printf ("%s/thm%d/.status",prefs->tmpdir,capable->mainpid);
+  info_file=lives_strdup_printf("%s/thm%d/.status",prefs->tmpdir,capable->mainpid);
 #else
-  info_file=g_strdup_printf ("%s/thm%d/status",prefs->tmpdir,capable->mainpid);
+  info_file=lives_strdup_printf("%s/thm%d/status",prefs->tmpdir,capable->mainpid);
 #endif
-  unlink (info_file);
+  unlink(info_file);
 
   if (preview_type==1) {
 
     preview_frames=1000000000;
 
     clear_mainw_msg();
-    
+
     if (capable->has_identify) {
       mainw->error=FALSE;
 
       // make thumb from any image file
-      com=g_strdup_printf("%s make_thumb thm%d %d %d \"%s\" \"%s\"",prefs->backend_sync,pid,DEFAULT_FRAME_HSIZE,
-			  DEFAULT_FRAME_VSIZE,prefs->image_ext,(tmp=g_filename_from_utf8(file_name,-1,NULL,NULL,NULL)));
-      g_free(tmp);
+      com=lives_strdup_printf("%s make_thumb thm%d %d %d \"%s\" \"%s\"",prefs->backend_sync,pid,DEFAULT_FRAME_HSIZE,
+                              DEFAULT_FRAME_VSIZE,prefs->image_ext,(tmp=lives_filename_from_utf8(file_name,-1,NULL,NULL,NULL)));
+      lives_free(tmp);
       lives_system(com,FALSE);
-      g_free(com);
-      
+      lives_free(com);
+
 #define LIVES_FILE_READ_TIMEOUT  (10 * U_SEC) // 5 sec timeout
-      
+
       do {
-	retval=0;
-	timeout=FALSE;
-	alarm_handle=lives_alarm_set(LIVES_FILE_READ_TIMEOUT);
-	
-	while (!((ifile=fopen (info_file,"r")) || (timeout=lives_alarm_get(alarm_handle)))) {
-	  lives_widget_context_update();
-	  g_usleep (prefs->sleep_time);
-	}
-	
-	lives_alarm_clear(alarm_handle);
-	
-	if (!timeout) {
-	  mainw->read_failed=FALSE;
-	  lives_fgets(mainw->msg,512,ifile);
-	  fclose (ifile);
-	}
-	
-	if (timeout || mainw->read_failed) {
-	  retval=do_read_failed_error_s_with_retry(info_file,NULL,NULL);
-	}
-	
-      } while (retval==LIVES_RETRY);
-      
-      if (retval==LIVES_CANCEL) {
-	mainw->read_failed=FALSE;
-	return;
+        retval=0;
+        timeout=FALSE;
+        alarm_handle=lives_alarm_set(LIVES_FILE_READ_TIMEOUT);
+
+        while (!((ifile=fopen(info_file,"r")) || (timeout=lives_alarm_get(alarm_handle)))) {
+          lives_widget_context_update();
+          lives_usleep(prefs->sleep_time);
+        }
+
+        lives_alarm_clear(alarm_handle);
+
+        if (!timeout) {
+          mainw->read_failed=FALSE;
+          lives_fgets(mainw->msg,512,ifile);
+          fclose(ifile);
+        }
+
+        if (timeout || mainw->read_failed) {
+          retval=do_read_failed_error_s_with_retry(info_file,NULL,NULL);
+        }
+
+      } while (retval==LIVES_RESPONSE_RETRY);
+
+      if (retval==LIVES_RESPONSE_CANCEL) {
+        mainw->read_failed=FALSE;
+        return;
       }
-      
+
       if (!mainw->error) {
-	array=g_strsplit(mainw->msg,"|",3);
-	width=atoi(array[1]);
-	height=atoi(array[2]);
-	g_strfreev(array);
-      }
-      else height=width=0;
+        array=lives_strsplit(mainw->msg,"|",3);
+        width=atoi(array[1]);
+        height=atoi(array[2]);
+        lives_strfreev(array);
+      } else height=width=0;
       mainw->error=FALSE;
-    }
-    else {
+    } else {
       height=width=0;
     }
 
     if (height*width) {
       // draw image
-      GError *error=NULL;
-      gchar *thumb=g_strdup_printf("%s/thm%d/%08d.%s",prefs->tmpdir,pid,1,prefs->image_ext);
-      LiVESPixbuf *pixbuf=lives_pixbuf_new_from_file((tmp=g_filename_from_utf8(thumb,-1,NULL,NULL,NULL)),&error);
-      g_free(tmp);
+      LiVESError *error=NULL;
+      char *thumb=lives_strdup_printf("%s/thm%d/%08d.%s",prefs->tmpdir,pid,1,prefs->image_ext);
+      LiVESPixbuf *pixbuf=lives_pixbuf_new_from_file((tmp=lives_filename_from_utf8(thumb,-1,NULL,NULL,NULL)),&error);
+      lives_free(thumb);
+      lives_free(tmp);
 
       if (error==NULL) {
-	fwidth=lives_widget_get_allocation_width(mainw->fs_playalign)-20;
-	fheight=lives_widget_get_allocation_height(mainw->fs_playalign)-20;
-
-	owidth=width=lives_pixbuf_get_width(pixbuf);
-	oheight=height=lives_pixbuf_get_height(pixbuf);
-
-	calc_maxspect(fwidth,fheight,
-		      &width,&height);
-	
-	width=(width>>1)<<1;
-	height=(height>>1)<<1;
-
-	if (width>owidth && height>oheight) {
-	  width=owidth;
-	  height=oheight;
-	}
-
-	lives_alignment_set(LIVES_ALIGNMENT(mainw->fs_playalign),0.5,
-			  0.5,1.,1.);
-
-	lives_widget_context_update();
-
-	blank=lives_pixbuf_new_blank(fwidth+20,fheight+20,WEED_PALETTE_RGB24);
-
-	cr = lives_painter_create_from_widget (mainw->fs_playarea);
-	lives_painter_set_source_pixbuf (cr, blank, 0, 0);
-	lives_painter_paint (cr);
-	lives_painter_destroy (cr);
-	lives_object_unref(blank);
-
-	lives_widget_context_update();
-	
-
-	offs_x=(fwidth-width)/2;
-	offs_y=(fheight-height)/2;
-
-	cr = lives_painter_create_from_widget (mainw->fs_playarea);
-	lives_painter_set_source_pixbuf (cr, pixbuf, offs_x, offs_y);
-	lives_painter_paint (cr);
-	lives_painter_destroy (cr);
-      }	
-      else {
-	g_error_free(error);
-      }
-      if (pixbuf!=NULL) {
-	lives_object_unref(pixbuf);
+        lives_widget_object_set_data(LIVES_WIDGET_OBJECT(mainw->fs_playarea),"pixbuf",pixbuf);
+#if GTK_CHECK_VERSION(3,0,0)
+        expose_fsplayarea_event(mainw->fs_playarea,NULL,NULL);
+#else
+        expose_fsplayarea_event(mainw->fs_playarea,NULL);
+#endif
+        lives_signal_connect(LIVES_GUI_OBJECT(mainw->fs_playarea), LIVES_WIDGET_EXPOSE_EVENT,
+                             LIVES_GUI_CALLBACK(expose_fsplayarea_event),
+                             NULL);
+      } else {
+        lives_error_free(error);
       }
-      g_free(thumb);
+
     }
-    g_free(info_file);
+    lives_free(info_file);
 
-    thm_dir=g_strdup_printf ("%s/thm%d",prefs->tmpdir,capable->mainpid);
+    thm_dir=lives_strdup_printf("%s/thm%d",prefs->tmpdir,capable->mainpid);
 #ifndef IS_MINGW
-    com=g_strdup_printf("/bin/rm -rf \"%s\"",thm_dir);
+    com=lives_strdup_printf("%s -rf \"%s\"",capable->rm_cmd,thm_dir);
 #else
-    com=g_strdup_printf("DEL /q \"%s\"",thm_dir);
+    com=lives_strdup_printf("DEL /q \"%s\"",thm_dir);
     lives_system(com,TRUE);
-    g_free(com);
-    com=g_strdup_printf("RMDIR \"%s\"",thm_dir);
+    lives_free(com);
+    com=lives_strdup_printf("RMDIR \"%s\"",thm_dir);
 #endif
     lives_system(com,TRUE);
-    g_free(com);
-    g_free(thm_dir);
-  } 
+    lives_free(com);
+    lives_free(thm_dir);
+  }
 
 
   if (!(height*width)) {
     // media preview
     if (!capable->has_mplayer&&!capable->has_mplayer2) {
-      gchar *msg;
+      char *msg;
       if (capable->has_identify) {
-	msg=g_strdup(_ ("\n\nYou need to install mplayer or mplayer2 to be able to preview this file.\n"));
-      }
-      else {
-	msg=g_strdup(_ ("\n\nYou need to install mplayer, mplayer2 or imageMagick to be able to preview this file.\n"));
+        msg=lives_strdup(_("\n\nYou need to install mplayer or mplayer2 to be able to preview this file.\n"));
+      } else {
+        msg=lives_strdup(_("\n\nYou need to install mplayer, mplayer2 or imageMagick to be able to preview this file.\n"));
       }
       do_blocking_error_dialog(msg);
-      g_free(msg);
+      lives_free(msg);
       return;
     }
 
 #ifndef IS_MINGW
-    dfile=g_strdup_printf("%s/fsp%d/",prefs->tmpdir,capable->mainpid);
+    dfile=lives_strdup_printf("%s/fsp%d/",prefs->tmpdir,capable->mainpid);
 #else
-    dfile=g_strdup_printf("%s\\fsp%d\\",prefs->tmpdir,capable->mainpid);
+    dfile=lives_strdup_printf("%s\\fsp%d\\",prefs->tmpdir,capable->mainpid);
 #endif
 
-    g_mkdir_with_parents(dfile,S_IRWXU);
+    lives_mkdir_with_parents(dfile,S_IRWXU);
 
 #ifndef IS_MINGW
-    info_file=g_strdup_printf ("%s.status",dfile);
+    info_file=lives_strdup_printf("%s.status",dfile);
 #else
-    info_file=g_strdup_printf ("%sstatus",dfile);
+    info_file=lives_strdup_printf("%sstatus",dfile);
 #endif
 
-    g_free(dfile);
+    lives_free(dfile);
 
 
-    lives_widget_set_bg_color (mainw->fs_playarea, LIVES_WIDGET_STATE_NORMAL, &palette->black);
-    lives_widget_set_bg_color (mainw->fs_playframe, LIVES_WIDGET_STATE_NORMAL, &palette->black);
-    lives_widget_set_bg_color (mainw->fs_playalign, LIVES_WIDGET_STATE_NORMAL, &palette->black);
+    lives_widget_set_bg_color(mainw->fs_playarea, LIVES_WIDGET_STATE_NORMAL, &palette->black);
+    lives_widget_set_bg_color(mainw->fs_playframe, LIVES_WIDGET_STATE_NORMAL, &palette->black);
+    lives_widget_set_bg_color(mainw->fs_playalign, LIVES_WIDGET_STATE_NORMAL, &palette->black);
 
     mainw->in_fs_preview=TRUE;
 
     // get width and height of clip
-    com=g_strdup_printf("%s get_details fsp%d \"%s\" \"%s\" %d %d",prefs->backend,capable->mainpid,
-			(tmp=g_filename_from_utf8(file_name,-1,NULL,NULL,NULL)),
-			prefs->image_ext,FALSE,FALSE);
+    com=lives_strdup_printf("%s get_details fsp%d \"%s\" \"%s\" %d %d",prefs->backend,capable->mainpid,
+                            (tmp=lives_filename_from_utf8(file_name,-1,NULL,NULL,NULL)),
+                            prefs->image_ext,FALSE,FALSE);
 
 
     mainw->com_failed=FALSE;
     lives_system(com,FALSE);
-    g_free(com);
-    
+    lives_free(com);
+
     if (mainw->com_failed) {
       end_fs_preview();
-      g_free(info_file);
+      lives_free(info_file);
       return;
     }
 
@@ -6088,45 +6046,44 @@
       retval=0;
       timeout=FALSE;
       clear_mainw_msg();
-      
+
 #define LIVES_LONGER_TIMEOUT  (10 * U_SEC) // 10 second timeout
 
       alarm_handle=lives_alarm_set(LIVES_LONGER_TIMEOUT);
-    
+
       while (!((ifile=fopen(info_file,"r")) || (timeout=lives_alarm_get(alarm_handle)))
-	     &&mainw->in_fs_preview) {
-	lives_widget_context_update();
-	threaded_dialog_spin();
-	g_usleep(prefs->sleep_time);
+             &&mainw->in_fs_preview) {
+        lives_widget_context_update();
+        threaded_dialog_spin();
+        lives_usleep(prefs->sleep_time);
       }
-      
+
       lives_alarm_clear(alarm_handle);
-    
+
       if (!mainw->in_fs_preview) {
-	// user cancelled
-	end_fs_preview();
-	g_free(info_file);
-	return;
+        // user cancelled
+        end_fs_preview();
+        lives_free(info_file);
+        return;
       }
 
       if (!timeout) {
-	mainw->read_failed=FALSE;
-	lives_fgets(mainw->msg,512,ifile);
-	fclose(ifile);
+        mainw->read_failed=FALSE;
+        lives_fgets(mainw->msg,512,ifile);
+        fclose(ifile);
       }
 
       if (timeout||mainw->read_failed) {
-	retval=do_read_failed_error_s_with_retry(info_file,NULL,NULL);
+        retval=do_read_failed_error_s_with_retry(info_file,NULL,NULL);
       }
-    } while (retval==LIVES_RETRY);
-    
+    } while (retval==LIVES_RESPONSE_RETRY);
+
     if (mainw->msg!=NULL&&get_token_count(mainw->msg,'|')>6) {
-      array=g_strsplit(mainw->msg,"|",-1);
+      array=lives_strsplit(mainw->msg,"|",-1);
       width=atoi(array[4]);
       height=atoi(array[5]);
-      g_strfreev(array);
-    }
-    else {
+      lives_strfreev(array);
+    } else {
       width=DEFAULT_FRAME_HSIZE;
       height=DEFAULT_FRAME_VSIZE;
     }
@@ -6137,97 +6094,95 @@
 
       owidth=width;
       oheight=height;
-      
+
       // -20 since border width was set to 10 pixels
       fwidth=lives_widget_get_allocation_width(mainw->fs_playalign)-20;
       fheight=lives_widget_get_allocation_height(mainw->fs_playalign)-20;
-      
+
       calc_maxspect(fwidth,fheight,
-		    &width,&height);
-      
+                    &width,&height);
+
       width=(width>>1)<<1;
       height=(height>>1)<<1;
-      
+
       if (width>owidth && height>oheight) {
-	width=owidth;
-	height=oheight;
+        width=owidth;
+        height=oheight;
       }
-      
+
       lives_alignment_set(LIVES_ALIGNMENT(mainw->fs_playalign),0.5,
-			0.5,0.,
-			(float)height/(float)fheight);
-      
-      
+                          0.5,0.,
+                          (float)height/(float)fheight);
+
+
       lives_widget_context_update();
-      
-      blank=lives_pixbuf_new_blank(fwidth+20,fheight+20,WEED_PALETTE_RGB24);
-      
-      cr = lives_painter_create_from_widget (mainw->fs_playarea);
-      lives_painter_set_source_pixbuf (cr, blank, 0, 0);
-      lives_painter_paint (cr);
-      lives_painter_destroy (cr);
-      lives_object_unref(blank);
-      
+
+      cr = lives_painter_create_from_widget(mainw->fs_playarea);
+
+      lives_painter_set_source_rgb(cr,0.,0.,0.);
+      lives_painter_rectangle(cr,0,0,fwidth+20,fheight+20);
+
+      lives_painter_fill(cr);
+      lives_painter_paint(cr);
+      lives_painter_destroy(cr);
+
       lives_widget_context_update();
     }
 
     if (prefs->audio_player==AUD_PLAYER_JACK) {
-      file_open_params=g_strdup_printf("%s %s -ao jack",mainw->file_open_params!=NULL?
-				       mainw->file_open_params:"",get_deinterlace_string());
-    }
-    else if (prefs->audio_player==AUD_PLAYER_PULSE) {
-      file_open_params=g_strdup_printf("%s %s -ao pulse",mainw->file_open_params!=NULL?
-				       mainw->file_open_params:"",get_deinterlace_string());
-    }
-    else {
-      file_open_params=g_strdup_printf("%s %s -ao null",mainw->file_open_params!=NULL?
-				       mainw->file_open_params:"",get_deinterlace_string());
+      file_open_params=lives_strdup_printf("%s %s -ao jack",mainw->file_open_params!=NULL?
+                                           mainw->file_open_params:"",get_deinterlace_string());
+    } else if (prefs->audio_player==AUD_PLAYER_PULSE) {
+      file_open_params=lives_strdup_printf("%s %s -ao pulse",mainw->file_open_params!=NULL?
+                                           mainw->file_open_params:"",get_deinterlace_string());
+    } else {
+      file_open_params=lives_strdup_printf("%s %s -ao null",mainw->file_open_params!=NULL?
+                                           mainw->file_open_params:"",get_deinterlace_string());
     }
 
 
     if (preview_type==1||preview_type==3) {
       xwin=lives_widget_get_xwinid(mainw->fs_playarea,"Unsupported display type for preview.");
       if (xwin==-1) {
-	end_fs_preview();
-	g_free(info_file);
-	return;
+        end_fs_preview();
+        lives_free(info_file);
+        return;
       }
     }
 
 
 
     if (file_open_params!=NULL) {
-      com=g_strdup_printf("%s fs_preview fsp%d %"PRIu64" %d %d %.2f %d \"%s\" \"%s\"",prefs->backend,capable->mainpid,
-			  xwin, width, height, start_time, preview_frames,
-			  (tmp=g_filename_from_utf8(file_name,-1,NULL,NULL,NULL)),file_open_params);
+      com=lives_strdup_printf("%s fs_preview fsp%d %"PRIu64" %d %d %.2f %d \"%s\" \"%s\"",prefs->backend,capable->mainpid,
+                              xwin, width, height, start_time, preview_frames,
+                              (tmp=lives_filename_from_utf8(file_name,-1,NULL,NULL,NULL)),file_open_params);
 
+    } else {
+      com=lives_strdup_printf("%s fs_preview fsp%d %"PRIu64" %d %d %.2f %d \"%s\"",prefs->backend,capable->mainpid,
+                              xwin, width, height, start_time, preview_frames,
+                              (tmp=lives_filename_from_utf8(file_name,-1,NULL,NULL,NULL)));
     }
-    else {
-      com=g_strdup_printf("%s fs_preview fsp%d %"PRIu64" %d %d %.2f %d \"%s\"",prefs->backend,capable->mainpid,
-			  xwin, width, height, start_time, preview_frames,
-			  (tmp=g_filename_from_utf8(file_name,-1,NULL,NULL,NULL)));
-    }
-    
-    g_free(tmp);
+
+    lives_free(tmp);
 
     if (preview_type!=2) lives_widget_set_app_paintable(mainw->fs_playarea,TRUE);
-    
+
     mainw->com_failed=FALSE;
 
     lives_system(com,FALSE);
-    g_free(com);
-    
+    lives_free(com);
+
     if (mainw->com_failed) {
       end_fs_preview();
-      g_free(info_file);
+      lives_free(info_file);
       return;
     }
 
     // loop here until preview has finished, or the user cancels
 
-    while ((!(ifile=fopen (info_file,"r")))&&mainw->in_fs_preview) {
+    while ((!(ifile=fopen(info_file,"r")))&&mainw->in_fs_preview) {
       lives_widget_context_update();
-      g_usleep (prefs->sleep_time);
+      lives_usleep(prefs->sleep_time);
     }
 
     if (ifile!=NULL) {
@@ -6235,78 +6190,88 @@
     }
 
     end_fs_preview();
-    g_free(info_file);
+    lives_free(info_file);
   }
-  if (file_open_params!=NULL) g_free(file_open_params);
+  if (file_open_params!=NULL) lives_free(file_open_params);
 }
 
 
 
 
-void on_open_activate (LiVESMenuItem *menuitem, gpointer user_data) {
-  // OPEN A FILE
+void on_open_activate(LiVESMenuItem *menuitem, livespointer user_data) {
+  // OPEN A FILE (single or multiple)
+  LiVESWidget *chooser;
+  int resp;
 
   if (mainw->multitrack!=NULL) {
     if (mainw->multitrack->idlefunc>0) {
-      g_source_remove(mainw->multitrack->idlefunc);
+      lives_source_remove(mainw->multitrack->idlefunc);
       mainw->multitrack->idlefunc=0;
     }
     mt_desensitise(mainw->multitrack);
     lives_widget_set_sensitive(mainw->multitrack->playall,TRUE);
-    lives_widget_set_sensitive (mainw->m_playbutton, TRUE);
+    lives_widget_set_sensitive(mainw->m_playbutton, TRUE);
   }
 
-  choose_file_with_preview(strlen(mainw->vid_load_dir)?mainw->vid_load_dir:NULL,NULL,3);
+  chooser=choose_file_with_preview(strlen(mainw->vid_load_dir)?mainw->vid_load_dir:NULL,NULL,LIVES_FILE_SELECTION_VIDEO_AUDIO_MULTI);
+
+  resp=lives_dialog_run(LIVES_DIALOG(chooser));
+
+  end_fs_preview();
+  mainw->fs_playarea=NULL;
+
+
+  if (resp==LIVES_RESPONSE_ACCEPT) on_ok_file_open_clicked(LIVES_FILE_CHOOSER(chooser),NULL);
+  else on_filechooser_cancel_clicked(chooser);
 }
 
 
 
 
-void on_ok_file_open_clicked(LiVESFileChooser *chooser, GSList *fnames) {
-  GSList *ofnames;
-  gchar *tmp;
+void on_ok_file_open_clicked(LiVESFileChooser *chooser, LiVESSList *fnames) {
+  // this is also called from drag target
+
+  LiVESSList *ofnames;
+  char *tmp;
 
   if (chooser!=NULL) {
-    fnames=lives_file_chooser_get_filenames (chooser);
+    fnames=lives_file_chooser_get_filenames(chooser);
 
-    end_fs_preview();
     lives_widget_destroy(LIVES_WIDGET(chooser));
 
     if (fnames==NULL) return;
 
     if (fnames->data==NULL) {
-      g_list_free_strings((GList *)fnames);
-      g_slist_free(fnames);
+      lives_list_free_strings((LiVESList *)fnames);
+      lives_slist_free(fnames);
       return;
     }
 
-    g_snprintf(mainw->vid_load_dir,PATH_MAX,"%s",(gchar *)fnames->data);
+    lives_snprintf(mainw->vid_load_dir,PATH_MAX,"%s",(char *)fnames->data);
     get_dirname(mainw->vid_load_dir);
 
     if (mainw->multitrack==NULL) lives_widget_queue_draw(mainw->LiVES);
     else lives_widget_queue_draw(mainw->multitrack->window);
     lives_widget_context_update();
-    
-    mainw->fs_playarea=NULL;
-    
+
     if (prefs->save_directories) {
-      set_pref ("vid_load_dir",(tmp=g_filename_from_utf8(mainw->vid_load_dir,-1,NULL,NULL,NULL)));
-      g_free(tmp);
+      set_pref("vid_load_dir",(tmp=lives_filename_from_utf8(mainw->vid_load_dir,-1,NULL,NULL,NULL)));
+      lives_free(tmp);
     }
-    
+
     mainw->cancelled=CANCEL_NONE;
   }
 
   ofnames=fnames;
 
   while (fnames!=NULL&&mainw->cancelled==CANCEL_NONE) {
-    g_snprintf(file_name,PATH_MAX,"%s",(gchar *)fnames->data);
-    g_free(fnames->data);
+    lives_snprintf(file_name,PATH_MAX,"%s",(char *)fnames->data);
+    lives_free((livespointer)fnames->data);
     open_file(file_name);
     fnames=fnames->next;
   }
 
-  g_slist_free(ofnames);
+  lives_slist_free(ofnames);
 
   mainw->opening_multi=FALSE;
   mainw->img_concat_clip=-1;
@@ -6322,16 +6287,18 @@
 
 
 
+#ifdef GUI_GTK
+// TODO
 // files dragged onto target from outside - try to open them
-void drag_from_outside(LiVESWidget *widget, GdkDragContext *dcon, int x, int y, 
-		       GtkSelectionData *data, guint info, guint time, gpointer user_data) {
+void drag_from_outside(LiVESWidget *widget, GdkDragContext *dcon, int x, int y,
+                       GtkSelectionData *data, uint32_t info, uint32_t time, livespointer user_data) {
   GSList *fnames=NULL;
 #if GTK_CHECK_VERSION(3,0,0)
-  gchar *filelist=(gchar *)gtk_selection_data_get_data(data);
+  char *filelist=(char *)gtk_selection_data_get_data(data);
 #else
-  gchar *filelist=(gchar *)data->data;
+  char *filelist=(char *)data->data;
 #endif
-  gchar *nfilelist,**array;
+  char *nfilelist,**array;
   int nfiles,i;
 
   if (filelist==NULL) {
@@ -6344,8 +6311,7 @@
       gtk_drag_finish(dcon,FALSE,FALSE,time);
       return;
     }
-  }
-  else {
+  } else {
     if (!lives_widget_is_sensitive(mainw->open)) {
       gtk_drag_finish(dcon,FALSE,FALSE,time);
       return;
@@ -6355,31 +6321,32 @@
   nfilelist=subst(filelist,"file://","");
 
   nfiles=get_token_count(nfilelist,'\n');
-  array=g_strsplit(nfilelist,"\n",nfiles);
-  g_free(nfilelist);
+  array=lives_strsplit(nfilelist,"\n",nfiles);
+  lives_free(nfilelist);
 
-  for (i=0;i<nfiles;i++) {
-    fnames=g_slist_append(fnames,array[i]);
+  for (i=0; i<nfiles; i++) {
+    fnames=lives_slist_append(fnames,array[i]);
   }
 
   on_ok_file_open_clicked(NULL,fnames);
 
   // fn will free array elements and fnames
 
-  g_free(array);
+  lives_free(array);
 
   gtk_drag_finish(dcon,TRUE,FALSE,time);
 }
+#endif
 
 
 
-
-void on_opensel_range_ok_clicked (LiVESButton *button, gpointer user_data) {
+void on_opensel_range_ok_clicked(LiVESButton *button, livespointer user_data) {
   // open file selection
   end_fs_preview();
   lives_general_button_clicked(button,NULL);
 
   mainw->fs_playarea=NULL;
+
   mainw->img_concat_clip=-1;
   open_file_sel(file_name,mainw->fx1_val,(int)mainw->fx2_val);
 
@@ -6395,7 +6362,7 @@
 void open_sel_range_activate(void) {
   // open selection range dialog
 
-  LiVESWidget *opensel_dialog = create_opensel_dialog ();
+  LiVESWidget *opensel_dialog = create_opensel_dialog();
   lives_widget_show(opensel_dialog);
   mainw->fx1_val=0.;
   mainw->fx2_val=1000;
@@ -6403,327 +6370,41 @@
 }
 
 
-void on_open_new_audio_clicked (LiVESFileChooser *chooser, gpointer user_data) {
-  // open audio file
-  gchar *a_type;
-  gchar *com,*mesg,*tmp;
-  gchar **array;
-
-  int oundo_start;
-  int oundo_end;
-  int israw=1;
-  int asigned,aendian;
-
-  boolean has_lmap_error=FALSE;
-  boolean bad_header=FALSE;
-  boolean preparse=FALSE;
-
-  if (!(prefs->warning_mask&WARN_MASK_LAYOUT_DELETE_AUDIO)) {
-    if ((mainw->xlays=layout_audio_is_affected(mainw->current_file,0.))!=NULL) {
-      if (!do_warning_dialog(_("\nLoading new audio may cause missing audio in some multitrack layouts.\nAre you sure you wish to continue ?\n."))) {
-	g_list_free_strings(mainw->xlays);
-	g_list_free(mainw->xlays);
-	mainw->xlays=NULL;
-	return;
-      }
-      add_lmap_error(LMAP_ERROR_DELETE_AUDIO,cfile->name,(gpointer)cfile->layout_map,mainw->current_file,0,0.,
-		     cfile->stored_layout_frame>0.);
-      has_lmap_error=TRUE;
-      g_list_free_strings(mainw->xlays);
-      g_list_free(mainw->xlays);
-      mainw->xlays=NULL;
-    }
-  }
-
-  if (!has_lmap_error&&!(prefs->warning_mask&WARN_MASK_LAYOUT_ALTER_AUDIO)&&
-      (mainw->xlays=layout_audio_is_affected(mainw->current_file,0.))) {
-    if (!do_layout_alter_audio_warning()) {
-      g_list_free_strings(mainw->xlays);
-      g_list_free(mainw->xlays);
-      mainw->xlays=NULL;
-      return;
-    }
-    add_lmap_error(LMAP_ERROR_ALTER_AUDIO,cfile->name,(gpointer)cfile->layout_map,mainw->current_file,0,0.,
-		   cfile->stored_layout_audio>0.);
-    has_lmap_error=TRUE;
-    g_list_free_strings(mainw->xlays);
-    g_list_free(mainw->xlays);
-    mainw->xlays=NULL;
-  }
-
-  mainw->noswitch=TRUE;
-
-  cfile->undo_arate=cfile->arate;
-  cfile->undo_achans=cfile->achans;
-  cfile->undo_asampsize=cfile->asampsize;
-  cfile->undo_signed_endian=cfile->signed_endian;
-  cfile->undo_arps=cfile->arps;
-
-  oundo_start=cfile->undo_start;
-  oundo_end=cfile->undo_end;
-
-  if (user_data==NULL) {
-    gchar *filename=lives_file_chooser_get_filename(chooser);
-    g_snprintf(file_name,PATH_MAX,"%s",(tmp=g_filename_to_utf8(filename,-1,NULL,NULL,NULL)));
-    g_free(filename);
-    g_free(tmp);
-  }
-  else g_snprintf(file_name,PATH_MAX,"%s",(char *)user_data);
-
-  g_snprintf(mainw->audio_dir,PATH_MAX,"%s",file_name);
-  get_dirname(mainw->audio_dir);
-  end_fs_preview();
-  lives_widget_destroy(LIVES_WIDGET(chooser));
-  lives_widget_context_update();
-  mainw->fs_playarea=NULL;
-
-  a_type=file_name+strlen(file_name)-3;
-
-  if (!g_ascii_strncasecmp(a_type,".it",3)||
-      !g_ascii_strncasecmp(a_type,"mp3",3)||
-      !g_ascii_strncasecmp(a_type,"ogg",3)||
-      !g_ascii_strncasecmp(a_type,"wav",3)||
-      !g_ascii_strncasecmp(a_type,"mod",3)||
-      !g_ascii_strncasecmp(a_type,".xm",3)) {
-    com=g_strdup_printf("%s audioopen \"%s\" \"%s\"",prefs->backend,cfile->handle,
-			(tmp=g_filename_from_utf8(file_name,-1,NULL,NULL,NULL)));
-    g_free(tmp);
-  }
-  else {
-    do_audio_import_error();
-    mainw->noswitch=FALSE;
-    return;
-  }
-
-  if (!g_ascii_strncasecmp(a_type,"wav",3)) israw=0;
-
-  if (capable->has_mplayer||capable->has_mplayer2) {
-    if (read_file_details (file_name,TRUE)) {
-      array=g_strsplit(mainw->msg,"|",15);
-      cfile->arate=atoi(array[9]);
-      cfile->achans=atoi(array[10]);
-      cfile->asampsize=atoi(array[11]);
-      cfile->signed_endian=get_signed_endian(atoi (array[12]), atoi (array[13]));
-      g_strfreev(array);
-      preparse=TRUE;
-    }
-  }
-
-  if (!preparse) {
-    // TODO !!! - need some way to identify audio without invoking mplayer
-    cfile->arate=cfile->arps=DEFAULT_AUDIO_RATE;
-    cfile->achans=DEFAULT_AUDIO_CHANS;
-    cfile->asampsize=DEFAULT_AUDIO_SAMPS;
-    cfile->signed_endian=mainw->endian;
-  }
-
-  if (cfile->undo_arate>0) cfile->arps=cfile->undo_arps/cfile->undo_arate*cfile->arate;
-  else cfile->arps=cfile->arate;
-
-  mesg=g_strdup_printf(_ ("Opening audio %s, type %s..."),file_name,a_type);
-  d_print(""); // force switchtext
-  d_print(mesg);
-  g_free(mesg);
-
-  unlink(cfile->info_file);
-  mainw->com_failed=FALSE;
-  lives_system(com,FALSE);
-  g_free(com);
-
-  if (mainw->com_failed) {
-    cfile->arate=cfile->undo_arate;
-    cfile->achans=cfile->undo_achans;
-    cfile->asampsize=cfile->undo_asampsize;
-    cfile->signed_endian=cfile->undo_signed_endian;
-    cfile->arps=cfile->undo_arps;
-    cfile->undo_start=oundo_start;
-    cfile->undo_end=oundo_end;
-    sensitize();
-    reget_afilesize(mainw->current_file);
-    get_play_times();
-    mainw->noswitch=FALSE;
-    return;
-  }
-
-  cfile->opening=cfile->opening_audio=cfile->opening_only_audio=TRUE;
-
-  cfile->undo_start=1;
-  cfile->undo_end=cfile->frames;
-  
-  // show audio [opening...] in main window
-  get_play_times();
-
-  if (!(do_progress_dialog(TRUE,TRUE,_ ("Opening audio")))) {
-    lives_widget_queue_draw(mainw->LiVES);
-    lives_widget_context_update();
-    mainw->cancelled=CANCEL_NONE;
-    mainw->error=FALSE;
-    mainw->com_failed=FALSE;
-    unlink (cfile->info_file);
-    com=g_strdup_printf("%s cancel_audio \"%s\"",prefs->backend,cfile->handle);
-    lives_system(com,FALSE);
-    do_auto_dialog(_("Cancelling"),0);
-    g_free(com);
-    cfile->opening_audio=cfile->opening=cfile->opening_only_audio=FALSE;
-    cfile->arate=cfile->undo_arate;
-    cfile->achans=cfile->undo_achans;
-    cfile->asampsize=cfile->undo_asampsize;
-    cfile->signed_endian=cfile->undo_signed_endian;
-    cfile->arps=cfile->undo_arps;
-    cfile->undo_start=oundo_start;
-    cfile->undo_end=oundo_end;
-    sensitize();
-    reget_afilesize(mainw->current_file);
-    get_play_times();
-    mainw->noswitch=FALSE;
-    if (mainw->error) d_print_failed();
-    return;
-  }
-
-  cfile->opening_audio=cfile->opening=cfile->opening_only_audio=FALSE;
-
-  lives_widget_queue_draw(mainw->LiVES);
-  lives_widget_context_update();
-
-  cfile->afilesize=0;
-  if (get_token_count(mainw->msg,'|')>6) {
-    array=g_strsplit(mainw->msg,"|",7);
-    cfile->arate=atoi(array[1]);
-    cfile->achans=atoi(array[2]);
-    cfile->asampsize=atoi(array[3]);
-    cfile->signed_endian=get_signed_endian(atoi (array[4]), atoi (array[5]));
-    cfile->afilesize=strtol(array[6],NULL,10);
-    g_strfreev(array);
-  }
-
-  if (cfile->afilesize==0) {
-    d_print_failed();
-      
-    mainw->cancelled=CANCEL_NONE;
-    mainw->error=FALSE;
-    unlink (cfile->info_file);
-
-    com=g_strdup_printf("%s cancel_audio \"%s\"",prefs->backend,cfile->handle);
-
-    mainw->com_failed=FALSE;
-    lives_system(com,FALSE);
-    g_free(com);
-
-    if (!mainw->com_failed) do_auto_dialog(_("Cancelling"),0);
-
-    cfile->arate=cfile->undo_arate;
-    cfile->achans=cfile->undo_achans;
-    cfile->asampsize=cfile->undo_asampsize;
-    cfile->signed_endian=cfile->undo_signed_endian;
-    cfile->arps=cfile->undo_arps;
-    cfile->undo_start=oundo_start;
-    cfile->undo_end=oundo_end;
-    sensitize();
-    reget_afilesize(mainw->current_file);
-    get_play_times();
-    mainw->noswitch=FALSE;
-    return;
-  }
-
-  cfile->changed=TRUE;
-  d_print_done();
-
-  mesg=g_strdup_printf(P_("New audio: %d Hz %d channel %d bps\n","New audio: %d Hz %d channels %d bps\n",cfile->achans),
-		       cfile->arate,cfile->achans,cfile->asampsize);
-  d_print(mesg);
-  g_free(mesg);
-
-  mainw->com_failed=FALSE;
-  mainw->cancelled=CANCEL_NONE;
-  mainw->error=FALSE;
-  unlink (cfile->info_file);
-
-  com=g_strdup_printf("%s commit_audio \"%s\" %d",prefs->backend,cfile->handle,israw);
-  lives_system(com,FALSE);
-  g_free(com);
-
-  if (mainw->com_failed) {
-    cfile->arate=cfile->undo_arate;
-    cfile->achans=cfile->undo_achans;
-    cfile->asampsize=cfile->undo_asampsize;
-    cfile->signed_endian=cfile->undo_signed_endian;
-    cfile->arps=cfile->undo_arps;
-    cfile->undo_start=oundo_start;
-    cfile->undo_end=oundo_end;
-    sensitize();
-    reget_afilesize(mainw->current_file);
-    get_play_times();
-    mainw->noswitch=FALSE;
-    return;
-  }
-
-  if (!do_auto_dialog(_("Committing audio"),0)) {
-    //cfile->may_be_damaged=TRUE;
-    d_print_failed();
-    return;
-  }
-
-
-  if (prefs->save_directories) {
-    set_pref ("audio_dir",mainw->audio_dir);
-  }
-  if (!prefs->conserve_space) {
-    cfile->undo_action=UNDO_NEW_AUDIO;
-    set_undoable (_("New Audio"),TRUE);
-  }
-
-  asigned=!(cfile->signed_endian&AFORM_UNSIGNED);
-  aendian=cfile->signed_endian&AFORM_BIG_ENDIAN;
-
-  save_clip_value(mainw->current_file,CLIP_DETAILS_ARATE,&cfile->arps);
-  if (mainw->com_failed||mainw->write_failed) bad_header=TRUE;
-  save_clip_value(mainw->current_file,CLIP_DETAILS_PB_ARATE,&cfile->arate);
-  if (mainw->com_failed||mainw->write_failed) bad_header=TRUE;
-  save_clip_value(mainw->current_file,CLIP_DETAILS_ACHANS,&cfile->achans);
-  if (mainw->com_failed||mainw->write_failed) bad_header=TRUE;
-  save_clip_value(mainw->current_file,CLIP_DETAILS_ASAMPS,&cfile->asampsize);
-  if (mainw->com_failed||mainw->write_failed) bad_header=TRUE;
-  save_clip_value(mainw->current_file,CLIP_DETAILS_AENDIAN,&aendian);
-  if (mainw->com_failed||mainw->write_failed) bad_header=TRUE;
-  save_clip_value(mainw->current_file,CLIP_DETAILS_ASIGNED,&asigned);
-  if (mainw->com_failed||mainw->write_failed) bad_header=TRUE;
-
-  if (bad_header) do_header_write_error(mainw->current_file);
-
-  switch_to_file (mainw->current_file,mainw->current_file);
-
-  mainw->noswitch=FALSE;
-}
 
 
 void end_fs_preview(void) {
-  // clean up if we were playing a preview - should be called from all callbacks 
+  // clean up if we were playing a preview - should be called from all callbacks
   // where there is a possibility of fs preview still playing
-  gchar *com;
+  char *com;
+
+  LiVESPixbuf *pixbuf=(LiVESPixbuf *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(mainw->fs_playarea), "pixbuf");
+
+  if (pixbuf!=NULL) lives_object_unref(pixbuf);
+  lives_widget_object_set_data(LIVES_WIDGET_OBJECT(mainw->fs_playarea),"pixbuf",NULL);
 
   if (mainw->in_fs_preview) {
 #ifndef IS_MINGW
-    com=g_strdup_printf ("%s stopsubsub fsp%d 2>/dev/null",prefs->backend_sync,capable->mainpid);
-    lives_system (com,TRUE);
+    com=lives_strdup_printf("%s stopsubsub fsp%d 2>/dev/null",prefs->backend_sync,capable->mainpid);
+    lives_system(com,TRUE);
 #else
     // get pid from backend
     FILE *rfile;
     ssize_t rlen;
     char val[16];
     int pid;
-    com=g_strdup_printf("%s get_pid_for_handle fsp%d",prefs->backend_sync,capable->mainpid);
+    com=lives_strdup_printf("%s get_pid_for_handle fsp%d",prefs->backend_sync,capable->mainpid);
     rfile=popen(com,"r");
     rlen=fread(val,1,16,rfile);
     pclose(rfile);
     memset(val+rlen,0,1);
     pid=atoi(val);
-    
+
     lives_win32_kill_subprocesses(pid,TRUE);
 #endif
-    g_free (com);
-    com=g_strdup_printf ("%s close fsp%d",prefs->backend,capable->mainpid);
-    lives_system (com,TRUE);
-    g_free (com);
+    lives_free(com);
+    com=lives_strdup_printf("%s close fsp%d",prefs->backend,capable->mainpid);
+    lives_system(com,TRUE);
+    lives_free(com);
 
     mainw->in_fs_preview=FALSE;
 
@@ -6734,12 +6415,12 @@
 }
 
 
-void on_save_textview_clicked (LiVESButton *button, gpointer user_data) {
+void on_save_textview_clicked(LiVESButton *button, livespointer user_data) {
   LiVESTextView *textview=(LiVESTextView *)user_data;
-  gchar *filt[]={"*.txt",NULL};
+  char *filt[]= {"*.txt",NULL};
   int fd;
-  gchar *btext;
-  gchar *save_file;
+  char *btext;
+  char *save_file;
 
   lives_widget_hide(lives_widget_get_toplevel(LIVES_WIDGET(button)));
   lives_widget_context_update();
@@ -6757,68 +6438,53 @@
   if ((fd=creat(save_file,S_IRUSR|S_IWUSR))==-1) {
 #endif
     lives_widget_show(lives_widget_get_toplevel(LIVES_WIDGET(button)));
-    do_write_failed_error_s(save_file,g_strerror(errno));
-    g_free(save_file);
+    do_write_failed_error_s(save_file,lives_strerror(errno));
+    lives_free(save_file);
     return;
   }
 
   btext=lives_text_view_get_text(textview);
-  
+
   lives_general_button_clicked(button,NULL);
 
   mainw->write_failed=FALSE;
   lives_write(fd,btext,strlen(btext),FALSE);
-  g_free(btext);
-  
-  close (fd);
+  lives_free(btext);
+
+  close(fd);
 
   if (mainw->write_failed) {
-    do_write_failed_error_s(save_file,g_strerror(errno));
-  }
-  else {
-    gchar *msg=g_strdup_printf(_("Text was saved as\n%s\n"),save_file);
+    do_write_failed_error_s(save_file,lives_strerror(errno));
+  } else {
+    char *msg=lives_strdup_printf(_("Text was saved as\n%s\n"),save_file);
     do_blocking_error_dialog(msg);
-    g_free(msg);
+    lives_free(msg);
   }
 
-  g_free(save_file);
+  lives_free(save_file);
 
 }
 
 
 
 
-void on_cancel_button1_clicked (LiVESWidget *widget, gpointer user_data) {
-  // generic cancel callback
-
-  end_fs_preview();
-
-  if (LIVES_IS_BUTTON(widget)) 
-    lives_general_button_clicked(LIVES_BUTTON(widget),user_data);
-  else {
-    lives_widget_destroy(widget);
-    if (user_data!=NULL) g_free(user_data);
-  }
+void on_filechooser_cancel_clicked(LiVESWidget *widget) {
 
+  lives_widget_destroy(widget);
   mainw->fs_playarea=NULL;
- 
+
   if (mainw->multitrack!=NULL) {
     mt_sensitise(mainw->multitrack);
     mainw->multitrack->idlefunc=mt_idle_add(mainw->multitrack);
-  }
-  else {
-    if (mainw->current_file>0) {
-      if (!cfile->opening) {
-	get_play_times();
-      }
-    }
+  } else if (mainw->current_file>0 && !cfile->opening) {
+    get_play_times();
   }
 }
 
 
 
 
-void on_cancel_opensel_clicked (LiVESButton  *button, gpointer user_data) {
+void on_cancel_opensel_clicked(LiVESButton  *button, livespointer user_data) {
   end_fs_preview();
   lives_general_button_clicked(button,NULL);
   mainw->fs_playarea=NULL;
@@ -6832,9 +6498,9 @@
 
 
 
-void on_cancel_keep_button_clicked (LiVESButton *button, gpointer user_data) {
+void on_cancel_keep_button_clicked(LiVESButton *button, livespointer user_data) {
   // Cancel/Keep from progress dialog
-  gchar *com=NULL;
+  char *com=NULL;
   uint32_t keep_frames=0;
   FILE *infofile;
 
@@ -6853,22 +6519,21 @@
   }
   lives_widget_context_update();
 
-  if ((!mainw->effects_paused||cfile->nokeep)&&(!mainw->is_rendering||
-						(mainw->multitrack!=NULL&&(!mainw->multitrack->is_rendering||
-									   !mainw->preview)))) {
+  if ((!mainw->effects_paused||cfile->nokeep)&&(mainw->multitrack==NULL||
+      (mainw->multitrack!=NULL&&(!mainw->multitrack->is_rendering||
+                                 !mainw->preview)))) {
     // Cancel
     if (mainw->cancel_type==CANCEL_SOFT) {
       // cancel in record audio
       mainw->cancelled=CANCEL_USER;
       d_print_cancelled();
       return;
-    }
-    else if (mainw->cancel_type==CANCEL_KILL) {
+    } else if (mainw->cancel_type==CANCEL_KILL) {
       // kill processes and subprocesses working on cfile
 #ifndef IS_MINGW
-      com=g_strdup_printf("%s stopsubsub \"%s\" 2>/dev/null",prefs->backend_sync,cfile->handle);
+      com=lives_strdup_printf("%s stopsubsub \"%s\" 2>/dev/null",prefs->backend_sync,cfile->handle);
 #else
-      com=g_strdup_printf("%s get_pid_for_handle \"%s\"",prefs->backend_sync,cfile->handle);
+      com=lives_strdup_printf("%s get_pid_for_handle \"%s\"",prefs->backend_sync,cfile->handle);
 #endif
     }
 
@@ -6879,31 +6544,31 @@
       // kill off the background process
       if (com!=NULL) {
 #ifndef IS_MINGW
-	lives_system(com,TRUE);
+        lives_system(com,TRUE);
 #else
-	// get pid from backend
-	FILE *rfile;
-	ssize_t rlen;
-	char val[16];
-	int pid;
-	
-	rfile=popen(com,"r");
-	rlen=fread(val,1,16,rfile);
-	pclose(rfile);
-	memset(val+rlen,0,1);
-	g_free(com);
-	com=NULL;
-	pid=atoi(val);
-	
-	lives_win32_kill_subprocesses(pid,TRUE);
+        // get pid from backend
+        FILE *rfile;
+        ssize_t rlen;
+        char val[16];
+        int pid;
+
+        rfile=popen(com,"r");
+        rlen=fread(val,1,16,rfile);
+        pclose(rfile);
+        memset(val+rlen,0,1);
+        lives_free(com);
+        com=NULL;
+        pid=atoi(val);
+
+        lives_win32_kill_subprocesses(pid,TRUE);
 #endif
       }
 
       // resume for next time
       if (mainw->effects_paused) {
-	if (com!=NULL) g_free(com);
-	com=g_strdup_printf("%s resume \"%s\"",prefs->backend_sync,cfile->handle);
-	lives_system(com,FALSE);
+        if (com!=NULL) lives_free(com);
+        com=lives_strdup_printf("%s resume \"%s\"",prefs->backend_sync,cfile->handle);
+        lives_system(com,FALSE);
       }
 
     }
@@ -6913,29 +6578,25 @@
     if (mainw->is_rendering) {
       cfile->frames=0;
       d_print_cancelled();
-    }
-    else {
+    } else {
       // see if there was a message from backend
 
       if (mainw->cancel_type!=CANCEL_SOFT) {
-	if ((infofile=fopen(cfile->info_file,"r"))>0) {
-	  mainw->read_failed=FALSE;
-	  lives_fgets(mainw->msg,512,infofile);
-	  fclose(infofile);
-	}
-	
-	if (strncmp (mainw->msg,"completed",9)) {
-	  d_print_cancelled();
-	}
-	else {
-	  // processing finished before we could cancel
-	  mainw->cancelled=CANCEL_NONE;
-	}
-      }
-      else d_print_cancelled();
+        if ((infofile=fopen(cfile->info_file,"r"))>0) {
+          mainw->read_failed=FALSE;
+          lives_fgets(mainw->msg,512,infofile);
+          fclose(infofile);
+        }
+
+        if (strncmp(mainw->msg,"completed",9)) {
+          d_print_cancelled();
+        } else {
+          // processing finished before we could cancel
+          mainw->cancelled=CANCEL_NONE;
+        }
+      } else d_print_cancelled();
     }
-  }
-  else {
+  } else {
     // Keep
     if (mainw->cancel_type==CANCEL_SOFT) {
       mainw->cancelled=CANCEL_KEEP;
@@ -6943,127 +6604,122 @@
     }
     if (!mainw->is_rendering) {
       keep_frames=cfile->proc_ptr->frames_done-cfile->progress_start+cfile->start-1+mainw->internal_messaging*2;
-      if (mainw->internal_messaging && atoi(mainw->msg)>cfile->proc_ptr->frames_done) 
-	keep_frames=atoi(mainw->msg)-cfile->progress_start+cfile->start-1+2;
-    }
-    else keep_frames=cfile->frames+1;
+      if (mainw->internal_messaging && atoi(mainw->msg)>cfile->proc_ptr->frames_done)
+        keep_frames=atoi(mainw->msg)-cfile->progress_start+cfile->start-1+2;
+    } else keep_frames=cfile->frames+1;
     if (keep_frames>mainw->internal_messaging) {
-      gchar *msg=g_strdup_printf(_ ("%d frames are enough !\n"),keep_frames-cfile->start);
-      d_print(msg);
-      g_free(msg);
+      d_print(P_("%d frame is enough !\n","%d frames are enough !\n",keep_frames-cfile->start),
+              keep_frames-cfile->start);
 
       lives_set_cursor_style(LIVES_CURSOR_BUSY,NULL);
       if (!mainw->internal_messaging) {
 #ifndef IS_MINGW
-	com=g_strdup_printf("%s stopsubsub \"%s\" 2>/dev/null",prefs->backend_sync,cfile->handle);
-	lives_system(com,TRUE);
+        com=lives_strdup_printf("%s stopsubsub \"%s\" 2>/dev/null",prefs->backend_sync,cfile->handle);
+        lives_system(com,TRUE);
 #else
-	// get pid from backend
-	FILE *rfile;
-	ssize_t rlen;
-	char val[16];
-	int pid;
-	com=g_strdup_printf("%s get_pid_for_handle \"%s\"",prefs->backend_sync,cfile->handle);
-	rfile=popen(com,"r");
-	rlen=fread(val,1,16,rfile);
-	pclose(rfile);
-	memset(val+rlen,0,1);
-	pid=atoi(val);
-	
-	lives_win32_kill_subprocesses(pid,TRUE);
-#endif
-	g_free(com);
-
-	com=g_strdup_printf("%s resume \"%s\"",prefs->backend_sync,cfile->handle);
-	lives_system(com,FALSE);
-	g_free(com);
-	if (!mainw->keep_pre) com=g_strdup_printf("%s mv_mgk \"%s\" %d %d \"%s\"",prefs->backend,cfile->handle,
-						  cfile->start,keep_frames-1,get_image_ext_for_type(cfile->img_type));
-	else {
-	  com=g_strdup_printf("%s mv_pre \"%s\" %d %d \"%s\" &",prefs->backend_sync,cfile->handle,
-			      cfile->start,keep_frames-1,get_image_ext_for_type(cfile->img_type));
-	  mainw->keep_pre=FALSE;
-	}
-      }
-      else {
-	mainw->internal_messaging=FALSE;
-	if (!mainw->keep_pre) com=g_strdup_printf ("%s mv_mgk \"%s\" %d %d \"%s\"",prefs->backend,cfile->handle,
-						   cfile->start,keep_frames-1,get_image_ext_for_type(cfile->img_type));
-	else {
-	  com=g_strdup_printf("%s mv_pre \"%s\" %d %d \"%s\" &",prefs->backend_sync,cfile->handle,
-			      cfile->start,keep_frames-1,get_image_ext_for_type(cfile->img_type));
-	  mainw->keep_pre=FALSE;
-	}
+        // get pid from backend
+        FILE *rfile;
+        ssize_t rlen;
+        char val[16];
+        int pid;
+        com=lives_strdup_printf("%s get_pid_for_handle \"%s\"",prefs->backend_sync,cfile->handle);
+        rfile=popen(com,"r");
+        rlen=fread(val,1,16,rfile);
+        pclose(rfile);
+        memset(val+rlen,0,1);
+        pid=atoi(val);
+
+        lives_win32_kill_subprocesses(pid,TRUE);
+#endif
+        lives_free(com);
+
+        com=lives_strdup_printf("%s resume \"%s\"",prefs->backend_sync,cfile->handle);
+        lives_system(com,FALSE);
+        lives_free(com);
+        if (!mainw->keep_pre) com=lives_strdup_printf("%s mv_mgk \"%s\" %d %d \"%s\"",prefs->backend,cfile->handle,
+                                    cfile->start,keep_frames-1,get_image_ext_for_type(cfile->img_type));
+        else {
+          com=lives_strdup_printf("%s mv_pre \"%s\" %d %d \"%s\" &",prefs->backend_sync,cfile->handle,
+                                  cfile->start,keep_frames-1,get_image_ext_for_type(cfile->img_type));
+          mainw->keep_pre=FALSE;
+        }
+      } else {
+        mainw->internal_messaging=FALSE;
+        if (!mainw->keep_pre) com=lives_strdup_printf("%s mv_mgk \"%s\" %d %d \"%s\"",prefs->backend,cfile->handle,
+                                    cfile->start,keep_frames-1,get_image_ext_for_type(cfile->img_type));
+        else {
+          com=lives_strdup_printf("%s mv_pre \"%s\" %d %d \"%s\" &",prefs->backend_sync,cfile->handle,
+                                  cfile->start,keep_frames-1,get_image_ext_for_type(cfile->img_type));
+          mainw->keep_pre=FALSE;
+        }
       }
       if (!mainw->is_rendering||mainw->multitrack!=NULL) {
-	unlink(cfile->info_file);
-	lives_system(com,FALSE);
-	cfile->undo_end=keep_frames-1;
-      }
-      else mainw->cancelled=CANCEL_KEEP;
+        unlink(cfile->info_file);
+        lives_system(com,FALSE);
+        cfile->undo_end=keep_frames-1;
+      } else mainw->cancelled=CANCEL_KEEP;
       lives_set_cursor_style(LIVES_CURSOR_NORMAL,NULL);
-    }
-    else {
+    } else {
       // no frames there, nothing to keep
       d_print_cancelled();
 
 #ifndef IS_MINGW
-      com=g_strdup_printf("%s stopsubsub \"%s\" 2>/dev/null",prefs->backend_sync,cfile->handle);
+      com=lives_strdup_printf("%s stopsubsub \"%s\" 2>/dev/null",prefs->backend_sync,cfile->handle);
 #else
-      com=g_strdup_printf("%s get_pid_for_handle \"%s\"",prefs->backend_sync,cfile->handle);
+      com=lives_strdup_printf("%s get_pid_for_handle \"%s\"",prefs->backend_sync,cfile->handle);
 #endif
       if (!mainw->internal_messaging&&!mainw->is_rendering) {
 
 #ifndef IS_MINGW
-	lives_system(com,TRUE);
+        lives_system(com,TRUE);
 #else
-	// get pid from backend
-	FILE *rfile;
-	ssize_t rlen;
-	char val[16];
-	int pid;
-	rfile=popen(com,"r");
-	rlen=fread(val,1,16,rfile);
-	pclose(rfile);
-	memset(val+rlen,0,1);
-	pid=atoi(val);
-	
-	lives_win32_kill_subprocesses(pid,TRUE);
-#endif
-	g_free(com);
-	
-	com=g_strdup_printf("%s resume \"%s\"",prefs->backend_sync,cfile->handle);
-	lives_system(com,FALSE);
+        // get pid from backend
+        FILE *rfile;
+        ssize_t rlen;
+        char val[16];
+        int pid;
+        rfile=popen(com,"r");
+        rlen=fread(val,1,16,rfile);
+        pclose(rfile);
+        memset(val+rlen,0,1);
+        pid=atoi(val);
+
+        lives_win32_kill_subprocesses(pid,TRUE);
+#endif
+        lives_free(com);
+
+        com=lives_strdup_printf("%s resume \"%s\"",prefs->backend_sync,cfile->handle);
+        lives_system(com,FALSE);
       }
       mainw->cancelled=CANCEL_USER;
     }
   }
 
-  if (com!=NULL) g_free(com);
+  if (com!=NULL) lives_free(com);
 }
 
 
 
 
-void on_details_button_clicked (void) {
+void on_details_button_clicked(void) {
   text_window *textwindow;
   textwindow=create_text_window(_("LiVES: - Encoder debug output"),lives_text_view_get_text(mainw->optextview),NULL);
   lives_widget_show_all(textwindow->dialog);
 }
 
 
-void on_full_screen_pressed (LiVESButton *button,
-			     gpointer user_data) {
+void on_full_screen_pressed(LiVESButton *button,
+                            livespointer user_data) {
   // toolbar button (full screen)
   lives_check_menu_item_set_active(LIVES_CHECK_MENU_ITEM(mainw->full_screen),!mainw->fs);
 }
 
 
-void on_full_screen_activate (LiVESMenuItem *menuitem, gpointer user_data) {
-  gchar buff[PATH_MAX];
+void on_full_screen_activate(LiVESMenuItem *menuitem, livespointer user_data) {
+  char buff[PATH_MAX];
   LiVESWidget *fs_img;
-  gchar *fnamex;
-  gchar *title,*xtrabit;
+  char *fnamex;
+  char *title,*xtrabit;
 
   if (mainw->current_file>-1&&!cfile->frames&&mainw->multitrack==NULL) return;
 
@@ -7073,203 +6729,196 @@
 
   if (mainw->current_file==-1) return;
 
-  fnamex=g_build_filename(prefs->prefix_dir,ICON_DIR,"fullscreen.png",NULL);
-  g_snprintf (buff,PATH_MAX,"%s",fnamex);
-  g_free(fnamex);
+  fnamex=lives_build_filename(prefs->prefix_dir,ICON_DIR,"fullscreen.png",NULL);
+  lives_snprintf(buff,PATH_MAX,"%s",fnamex);
+  lives_free(fnamex);
 
-  fs_img=lives_image_new_from_file (buff);
+  fs_img=lives_image_new_from_file(buff);
   lives_widget_show(fs_img);
   if (!mainw->fs) {
-    if (g_file_test(buff,G_FILE_TEST_EXISTS)) {
+    if (lives_file_test(buff,LIVES_FILE_TEST_EXISTS)) {
       LiVESPixbuf *pixbuf=lives_image_get_pixbuf(LIVES_IMAGE(fs_img));
       lives_pixbuf_saturate_and_pixelate(pixbuf,pixbuf,0.2,FALSE);
     }
     lives_widget_set_tooltip_text(mainw->t_fullscreen,_("Fullscreen playback (f)"));
-  }
-  else lives_widget_set_tooltip_text(mainw->t_fullscreen,_("Fullscreen playback off (f)"));
+  } else lives_widget_set_tooltip_text(mainw->t_fullscreen,_("Fullscreen playback off (f)"));
 
   lives_tool_button_set_icon_widget(LIVES_TOOL_BUTTON(mainw->t_fullscreen),fs_img);
 
-  if (mainw->playing_file>-1){
+  if (mainw->playing_file>-1) {
     if (mainw->fs) {
       // switch TO full screen during pb
       if (mainw->multitrack==NULL&&(!mainw->sep_win||prefs->play_monitor==prefs->gui_monitor)&&
-	  !(mainw->vpp!=NULL&&!(mainw->vpp->capabilities&VPP_LOCAL_DISPLAY)&&mainw->sep_win)) {
-	if (!mainw->faded) {
-	  fade_background();
-	}
-      
-	fullscreen_internal();
-	lives_widget_hide(mainw->framebar);
+          !(mainw->vpp!=NULL&&!(mainw->vpp->capabilities&VPP_LOCAL_DISPLAY)&&mainw->sep_win)) {
+        if (!mainw->faded) {
+          fade_background();
+        }
+
+        fullscreen_internal();
+        lives_widget_hide(mainw->framebar);
       }
-    
+
       if (mainw->sep_win) {
-	if (prefs->sepwin_type==SEPWIN_TYPE_STICKY) {
-	  resize_play_window();
-	}
-	else {
-	  kill_play_window();
-	  make_play_window();
-	  if (mainw->play_window!=NULL) {
-	    hide_cursor(lives_widget_get_xwindow(mainw->play_window));
-	    lives_widget_set_app_paintable(mainw->play_window,TRUE);
-	  }
-	}
-	if (cfile->frames==1||cfile->play_paused) {
-	  lives_widget_context_update();
-	}
-      }
-
-      if (mainw->ext_playback&&mainw->vpp->fheight>-1&&mainw->vpp->fwidth>-1) {	  
-	// fixed o/p size for stream
-	if (!(mainw->vpp->fwidth*mainw->vpp->fheight)) {
-	  mainw->vpp->fwidth=cfile->hsize;
-	  mainw->vpp->fheight=cfile->vsize;
-	}
-	mainw->pwidth=mainw->vpp->fwidth;
-	mainw->pheight=mainw->vpp->fheight;
+        if (prefs->sepwin_type==SEPWIN_TYPE_STICKY) {
+          resize_play_window();
+        } else {
+          kill_play_window();
+          make_play_window();
+          if (mainw->play_window!=NULL) {
+            hide_cursor(lives_widget_get_xwindow(mainw->play_window));
+            lives_widget_set_app_paintable(mainw->play_window,TRUE);
+          }
+        }
+        if (cfile->frames==1||cfile->play_paused) {
+          lives_widget_context_update();
+        }
+      }
+
+      if (mainw->ext_playback&&mainw->vpp->fheight>-1&&mainw->vpp->fwidth>-1) {
+        // fixed o/p size for stream
+        if (!(mainw->vpp->fwidth*mainw->vpp->fheight)) {
+          mainw->vpp->fwidth=cfile->hsize;
+          mainw->vpp->fheight=cfile->vsize;
+        }
+        mainw->pwidth=mainw->vpp->fwidth;
+        mainw->pheight=mainw->vpp->fheight;
       }
       if ((cfile->frames==1||cfile->play_paused)&&!mainw->noswitch&&(cfile->clip_type==CLIP_TYPE_DISK||
-								     cfile->clip_type==CLIP_TYPE_FILE)) {
-	weed_plant_t *frame_layer=mainw->frame_layer;
-	mainw->frame_layer=NULL;
-	load_frame_image (cfile->frameno);
-	mainw->frame_layer=frame_layer;
+          cfile->clip_type==CLIP_TYPE_FILE)) {
+        weed_plant_t *frame_layer=mainw->frame_layer;
+        mainw->frame_layer=NULL;
+        load_frame_image(cfile->frameno);
+        mainw->frame_layer=frame_layer;
       }
     } else {
       if (mainw->multitrack==NULL) {
-	// switch FROM fullscreen during pb
-	lives_widget_show(mainw->frame1);
-	lives_widget_show(mainw->frame2);
-	lives_widget_show(mainw->eventbox3);
-	lives_widget_show(mainw->eventbox4);
-	
-	if (prefs->show_framecount) {
-	  lives_widget_show(mainw->framebar);
-	}
-	
-	lives_container_set_border_width (LIVES_CONTAINER (mainw->playframe), widget_opts.border_width);
-	
-	lives_widget_set_sensitive(mainw->fade,TRUE);
-	lives_widget_set_sensitive(mainw->dsize,TRUE);
-	
-	lives_widget_show(mainw->t_bckground);
-	lives_widget_show(mainw->t_double);
-
-	resize(1);
-	if (mainw->multitrack==NULL) {
-	  if (cfile->is_loaded) {
-	    load_start_image (cfile->start);
-	    load_end_image (cfile->end);
-	  }
-	  else {
-	    load_start_image (0);
-	    load_end_image (0);
-	  }
-	}
+        // switch FROM fullscreen during pb
+        lives_widget_show(mainw->frame1);
+        lives_widget_show(mainw->frame2);
+        lives_widget_show(mainw->eventbox3);
+        lives_widget_show(mainw->eventbox4);
+
+        if (prefs->show_framecount) {
+          lives_widget_show(mainw->framebar);
+        }
+
+        lives_container_set_border_width(LIVES_CONTAINER(mainw->playframe), widget_opts.border_width);
+
+        lives_widget_set_sensitive(mainw->fade,TRUE);
+        lives_widget_set_sensitive(mainw->dsize,TRUE);
+
+        lives_widget_show(mainw->t_bckground);
+        lives_widget_show(mainw->t_double);
+
+        resize(1);
+        if (mainw->multitrack==NULL) {
+          if (cfile->is_loaded) {
+            load_start_image(cfile->start);
+            load_end_image(cfile->end);
+          } else {
+            load_start_image(0);
+            load_end_image(0);
+          }
+        }
       }
 
       if (mainw->sep_win) {
-	// separate window
+        // separate window
 
-	// multi monitors don't like this it seems, breaks the window
-	lives_window_unfullscreen(LIVES_WINDOW(mainw->play_window));
+        // multi monitors don't like this it seems, breaks the window
+        lives_window_unfullscreen(LIVES_WINDOW(mainw->play_window));
 
-	if (!mainw->faded) {
-	  unfade_background();
-	}
-
-	if (mainw->ext_playback) {
-	  vid_playback_plugin_exit();
-	}
-
-	resize_play_window();
-
-	if (mainw->sepwin_scale!=100.) xtrabit=g_strdup_printf(_(" (%d %% scale)"),(int)mainw->sepwin_scale);
-	else xtrabit=g_strdup("");
-	title=g_strdup_printf(_("LiVES: - Play Window%s"),xtrabit);
-	if (mainw->play_window!=NULL)
-	  lives_window_set_title (LIVES_WINDOW (mainw->play_window), title);
-	g_free(title);
-	g_free(xtrabit);
-
-	if (mainw->opwx>-1) {
-	  //opwx and opwy were stored when we first switched to full screen
-	  lives_window_move (LIVES_WINDOW (mainw->play_window), mainw->opwx, mainw->opwy);
-	  mainw->opwx=-1;
-	  mainw->opwy=-1;
-	}
-	else {
-	  // non-sticky
-	  kill_play_window();
-	  make_play_window();
-	  if (mainw->play_window!=NULL) {
-	    hide_cursor(lives_widget_get_xwindow(mainw->play_window));
-	    lives_widget_set_app_paintable(mainw->play_window,TRUE);
-	  }
-	}
-	if (mainw->multitrack==NULL&&(cfile->frames==1||cfile->play_paused)) {
-	  lives_widget_context_update();
-	  if (mainw->play_window!=NULL&&!mainw->noswitch&&(cfile->clip_type==CLIP_TYPE_DISK||
-							   cfile->clip_type==CLIP_TYPE_FILE)) {
-	    weed_plant_t *frame_layer=mainw->frame_layer;
-	    mainw->frame_layer=NULL;
-	    load_frame_image (cfile->frameno);
-	    mainw->frame_layer=frame_layer;
-	  }
-	}
-      }
-      else {
-	if (mainw->multitrack==NULL) {
-	  // in-frame window
-	  lives_widget_context_update();
-	  
-	  mainw->pwidth=lives_widget_get_allocation_width(mainw->playframe)-H_RESIZE_ADJUST;
-	  mainw->pheight=lives_widget_get_allocation_height(mainw->playframe)-V_RESIZE_ADJUST;
-	  
-	  // double size
-	  if (mainw->double_size) {
-	    resize(2);
-	    mainw->pheight*=2;
-	    mainw->pheight++;
-	    mainw->pwidth*=2;
-	    mainw->pwidth+=2;
-	  }
-	}
-	if (!mainw->faded) {
-	  unfade_background();
-	}
-	else {
-	  lives_frame_set_label(LIVES_FRAME(mainw->playframe), "");
-	}
+        if (!mainw->faded) {
+          unfade_background();
+        }
+
+        if (mainw->ext_playback) {
+          vid_playback_plugin_exit();
+        }
+
+        resize_play_window();
+
+        if (mainw->sepwin_scale!=100.) xtrabit=lives_strdup_printf(_(" (%d %% scale)"),(int)mainw->sepwin_scale);
+        else xtrabit=lives_strdup("");
+        title=lives_strdup_printf(_("LiVES: - Play Window%s"),xtrabit);
+        if (mainw->play_window!=NULL)
+          lives_window_set_title(LIVES_WINDOW(mainw->play_window), title);
+        lives_free(title);
+        lives_free(xtrabit);
+
+        if (mainw->opwx>-1) {
+          //opwx and opwy were stored when we first switched to full screen
+          lives_window_move(LIVES_WINDOW(mainw->play_window), mainw->opwx, mainw->opwy);
+          mainw->opwx=-1;
+          mainw->opwy=-1;
+        } else {
+          // non-sticky
+          kill_play_window();
+          make_play_window();
+          if (mainw->play_window!=NULL) {
+            hide_cursor(lives_widget_get_xwindow(mainw->play_window));
+            lives_widget_set_app_paintable(mainw->play_window,TRUE);
+          }
+        }
+        if (mainw->multitrack==NULL&&(cfile->frames==1||cfile->play_paused)) {
+          lives_widget_context_update();
+          if (mainw->play_window!=NULL&&!mainw->noswitch&&(cfile->clip_type==CLIP_TYPE_DISK||
+              cfile->clip_type==CLIP_TYPE_FILE)) {
+            weed_plant_t *frame_layer=mainw->frame_layer;
+            mainw->frame_layer=NULL;
+            load_frame_image(cfile->frameno);
+            mainw->frame_layer=frame_layer;
+          }
+        }
+      } else {
+        if (mainw->multitrack==NULL) {
+          // in-frame window
+          lives_widget_context_update();
+
+          mainw->pwidth=lives_widget_get_allocation_width(mainw->playframe)-H_RESIZE_ADJUST;
+          mainw->pheight=lives_widget_get_allocation_height(mainw->playframe)-V_RESIZE_ADJUST;
+
+          // double size
+          if (mainw->double_size) {
+            resize(2);
+            mainw->pheight*=2;
+            mainw->pheight++;
+            mainw->pwidth*=2;
+            mainw->pwidth+=2;
+          }
+        }
+        if (!mainw->faded) {
+          unfade_background();
+        } else {
+          lives_frame_set_label(LIVES_FRAME(mainw->playframe), "");
+        }
       }
       if ((cfile->frames==1||cfile->play_paused)&&!mainw->noswitch&&mainw->multitrack==NULL&&
-	  (cfile->clip_type==CLIP_TYPE_DISK||cfile->clip_type==CLIP_TYPE_FILE)) {
-	weed_plant_t *frame_layer=mainw->frame_layer;
-	mainw->frame_layer=NULL;
-	load_frame_image (cfile->frameno);
-	mainw->frame_layer=frame_layer;
+          (cfile->clip_type==CLIP_TYPE_DISK||cfile->clip_type==CLIP_TYPE_FILE)) {
+        weed_plant_t *frame_layer=mainw->frame_layer;
+        mainw->frame_layer=NULL;
+        load_frame_image(cfile->frameno);
+        mainw->frame_layer=frame_layer;
       }
     }
-  }
-  else {
+  } else {
     if (mainw->multitrack==NULL) {
       if (mainw->playing_file==-1) {
-	if (mainw->fs) {
-	  lives_widget_set_sensitive(mainw->fade,FALSE);
-	  lives_widget_set_sensitive(mainw->dsize,FALSE);
-	} else {
-	  lives_widget_set_sensitive(mainw->fade,TRUE);
-	  lives_widget_set_sensitive(mainw->dsize,TRUE);
-	}
+        if (mainw->fs) {
+          lives_widget_set_sensitive(mainw->fade,FALSE);
+          lives_widget_set_sensitive(mainw->dsize,FALSE);
+        } else {
+          lives_widget_set_sensitive(mainw->fade,TRUE);
+          lives_widget_set_sensitive(mainw->dsize,TRUE);
+        }
       }
     }
   }
 }
 
 
-void on_double_size_pressed (LiVESButton *button,
-			     gpointer user_data) {
+void on_double_size_pressed(LiVESButton *button,
+                            livespointer user_data) {
   // toolbar button (separate window)
   lives_check_menu_item_set_active(LIVES_CHECK_MENU_ITEM(mainw->dsize),!mainw->double_size);
 }
@@ -7277,12 +6926,11 @@
 
 
 void
-on_double_size_activate               (LiVESMenuItem     *menuitem,
-				       gpointer         user_data)
-{
-  gchar buff[PATH_MAX];
+on_double_size_activate(LiVESMenuItem     *menuitem,
+                        livespointer         user_data) {
+  char buff[PATH_MAX];
   LiVESWidget *sngl_img;
-  gchar *fnamex;
+  char *fnamex;
 
   if (mainw->multitrack!=NULL||(mainw->current_file>-1&&cfile->frames==0&&user_data==NULL)) return;
 
@@ -7295,25 +6943,24 @@
   if (user_data!=NULL) {
     // change the blank window icons
     if (!mainw->double_size) {
-      fnamex=g_build_filename(prefs->prefix_dir,ICON_DIR,"zoom-in.png",NULL);
-      g_snprintf (buff,PATH_MAX,"%s",fnamex);
-      g_free(fnamex);
-      sngl_img=lives_image_new_from_file (buff);
+      fnamex=lives_build_filename(prefs->prefix_dir,ICON_DIR,"zoom-in.png",NULL);
+      lives_snprintf(buff,PATH_MAX,"%s",fnamex);
+      lives_free(fnamex);
+      sngl_img=lives_image_new_from_file(buff);
       lives_widget_set_tooltip_text(mainw->t_double,_("Double size (d)"));
-    }
-    else {
-      fnamex=g_build_filename(prefs->prefix_dir,ICON_DIR,"zoom-out.png",NULL);
-      g_snprintf (buff,PATH_MAX,"%s",fnamex);
-      g_free(fnamex);
-      sngl_img=lives_image_new_from_file (buff);
+    } else {
+      fnamex=lives_build_filename(prefs->prefix_dir,ICON_DIR,"zoom-out.png",NULL);
+      lives_snprintf(buff,PATH_MAX,"%s",fnamex);
+      lives_free(fnamex);
+      sngl_img=lives_image_new_from_file(buff);
       lives_widget_set_tooltip_text(mainw->t_double,_("Single size (d)"));
     }
-    
-    if (g_file_test(buff,G_FILE_TEST_EXISTS)) {
+
+    if (lives_file_test(buff,LIVES_FILE_TEST_EXISTS)) {
       LiVESPixbuf *pixbuf=lives_image_get_pixbuf(LIVES_IMAGE(sngl_img));
       if (pixbuf!=NULL) lives_pixbuf_saturate_and_pixelate(pixbuf,pixbuf,0.2,FALSE);
     }
-    
+
     lives_widget_show(sngl_img);
     lives_tool_button_set_icon_widget(LIVES_TOOL_BUTTON(mainw->t_double),sngl_img);
   }
@@ -7330,95 +6977,93 @@
 
     if (mainw->sep_win) {
       if (prefs->sepwin_type==SEPWIN_TYPE_STICKY) {
-	gchar *title,*xtrabit;
-	resize_play_window();
+        char *title,*xtrabit;
+        resize_play_window();
 
-	if (mainw->sepwin_scale!=100.) xtrabit=g_strdup_printf(_(" (%d %% scale)"),(int)mainw->sepwin_scale);
-	else xtrabit=g_strdup("");
-	title=g_strdup_printf(_("LiVES: - Play Window%s"),xtrabit);
-	if (mainw->play_window!=NULL)
-	  lives_window_set_title (LIVES_WINDOW (mainw->play_window), title);
-	g_free(title);
-	g_free(xtrabit);
-      }
-      else {
-	if (mainw->play_window!=NULL) {
-	  kill_play_window();
-	}
-	make_play_window();
-	if (mainw->play_window!=NULL) {
-	  hide_cursor(lives_widget_get_xwindow(mainw->play_window));
-	  lives_widget_set_app_paintable(mainw->play_window,TRUE);
-	}
+        if (mainw->sepwin_scale!=100.) xtrabit=lives_strdup_printf(_(" (%d %% scale)"),(int)mainw->sepwin_scale);
+        else xtrabit=lives_strdup("");
+        title=lives_strdup_printf(_("LiVES: - Play Window%s"),xtrabit);
+        if (mainw->play_window!=NULL)
+          lives_window_set_title(LIVES_WINDOW(mainw->play_window), title);
+        lives_free(title);
+        lives_free(xtrabit);
+      } else {
+        if (mainw->play_window!=NULL) {
+          kill_play_window();
+        }
+        make_play_window();
+        if (mainw->play_window!=NULL) {
+          hide_cursor(lives_widget_get_xwindow(mainw->play_window));
+          lives_widget_set_app_paintable(mainw->play_window,TRUE);
+        }
       }
       if (cfile->frames==1||cfile->play_paused) {
-	lives_widget_context_update();
-	if (!(mainw->play_window==NULL)&&!mainw->noswitch&&(cfile->clip_type==CLIP_TYPE_DISK||
-							    cfile->clip_type==CLIP_TYPE_FILE)) {
-	  weed_plant_t *frame_layer=mainw->frame_layer;
-	  mainw->frame_layer=NULL;
-	  load_frame_image (cfile->frameno);
-	  mainw->frame_layer=frame_layer;
-	}
+        lives_widget_context_update();
+        if (!(mainw->play_window==NULL)&&!mainw->noswitch&&(cfile->clip_type==CLIP_TYPE_DISK||
+            cfile->clip_type==CLIP_TYPE_FILE)) {
+          weed_plant_t *frame_layer=mainw->frame_layer;
+          mainw->frame_layer=NULL;
+          load_frame_image(cfile->frameno);
+          mainw->frame_layer=frame_layer;
+        }
       }
-    }
-    else {
+    } else {
       // in-frame
       if (mainw->double_size) {
-	if (!mainw->sep_win) {
-	  if (!mainw->faded) {
-	    if (palette->style&STYLE_1) {
-	      lives_widget_hide(mainw->sep_image);
-	    }
-	    lives_widget_hide(mainw->scrolledwindow);
-	  }
-	  resize(2);
-	}
-	if (!prefs->ce_maxspect) {
-	  mainw->pheight*=2;
-	  mainw->pheight++;
-	  mainw->pwidth*=2;
-	  mainw->pwidth+=2;
-	}
+        if (!mainw->sep_win) {
+          if (!mainw->faded) {
+            if (palette->style&STYLE_1) {
+              lives_widget_hide(mainw->sep_image);
+            }
+            lives_widget_hide(mainw->scrolledwindow);
+          }
+          resize(2);
+        }
+        if (!prefs->ce_maxspect) {
+          mainw->pheight*=2;
+          mainw->pheight++;
+          mainw->pwidth*=2;
+          mainw->pwidth+=2;
+        }
+      } else {
+        resize(1);
+        if (!prefs->ce_maxspect) {
+          mainw->pheight--;
+          mainw->pheight/=2;
+          mainw->pwidth-=2;
+          mainw->pwidth/=2;
+        }
+        if (!mainw->faded) {
+          if (palette->style&STYLE_1) {
+            lives_widget_show(mainw->sep_image);
+          }
+          lives_widget_show(mainw->scrolledwindow);
+        }
       }
-      else {
-	resize(1);
-	if (!prefs->ce_maxspect) {
-	  mainw->pheight--;
-	  mainw->pheight/=2;
-	  mainw->pwidth-=2;
-	  mainw->pwidth/=2;
-	}
-	if (!mainw->faded) {
-	  if (palette->style&STYLE_1) {
-	    lives_widget_show(mainw->sep_image);
-	  }
-	  lives_widget_show(mainw->scrolledwindow);
-	}}}
+    }
   }
 }
 
 
 
-void on_sepwin_pressed (LiVESButton *button, gpointer user_data) {
+void on_sepwin_pressed(LiVESButton *button, livespointer user_data) {
   if (mainw->go_away) return;
 
   // toolbar button (separate window)
   if (mainw->multitrack!=NULL) {
     lives_check_menu_item_set_active(LIVES_CHECK_MENU_ITEM(mainw->multitrack->sepwin),!mainw->sep_win);
     lives_check_menu_item_set_active(LIVES_CHECK_MENU_ITEM(mainw->sepwin),mainw->sep_win);
-  }
-  else lives_check_menu_item_set_active(LIVES_CHECK_MENU_ITEM(mainw->sepwin),!mainw->sep_win);
+  } else lives_check_menu_item_set_active(LIVES_CHECK_MENU_ITEM(mainw->sepwin),!mainw->sep_win);
 }
 
 
 
-void on_sepwin_activate (LiVESMenuItem *menuitem, gpointer user_data) {
+void on_sepwin_activate(LiVESMenuItem *menuitem, livespointer user_data) {
   LiVESWidget *sep_img;
   LiVESWidget *sep_img2;
 
-  gchar buff[PATH_MAX];
-  gchar *fnamex;
+  char buff[PATH_MAX];
+  char *fnamex;
 
   if (mainw->go_away) return;
 
@@ -7431,19 +7076,18 @@
     mt_show_current_frame(mainw->multitrack, FALSE);
   }
 
-  fnamex=g_build_filename(prefs->prefix_dir,ICON_DIR,"sepwin.png",NULL);
-  g_snprintf (buff,PATH_MAX,"%s",fnamex);
-  g_free(fnamex);
+  fnamex=lives_build_filename(prefs->prefix_dir,ICON_DIR,"sepwin.png",NULL);
+  lives_snprintf(buff,PATH_MAX,"%s",fnamex);
+  lives_free(fnamex);
 
-  sep_img=lives_image_new_from_file (buff);
-  sep_img2=lives_image_new_from_file (buff);
+  sep_img=lives_image_new_from_file(buff);
+  sep_img2=lives_image_new_from_file(buff);
 
   if (mainw->sep_win) {
     lives_widget_set_tooltip_text(mainw->m_sepwinbutton,_("Hide the play window (s)"));
     lives_widget_set_tooltip_text(mainw->t_sepwin,_("Hide the play window (s)"));
-  }
-  else {
-    if (g_file_test(buff,G_FILE_TEST_EXISTS)) {
+  } else {
+    if (lives_file_test(buff,LIVES_FILE_TEST_EXISTS)) {
       LiVESPixbuf *pixbuf=lives_image_get_pixbuf(LIVES_IMAGE(sep_img));
       if (pixbuf!=NULL) lives_pixbuf_saturate_and_pixelate(pixbuf,pixbuf,0.2,FALSE);
       pixbuf=lives_image_get_pixbuf(LIVES_IMAGE(sep_img2));
@@ -7461,184 +7105,160 @@
   if (prefs->sepwin_type==SEPWIN_TYPE_STICKY&&mainw->playing_file==-1) {
     if (mainw->sep_win) {
       make_play_window();
-    }
-    else {
+    } else {
       kill_play_window();
     }
     if (mainw->multitrack!=NULL&&mainw->playing_file==-1) {
       activate_mt_preview(mainw->multitrack); // show frame preview
     }
-  }
-  else {
+  } else {
     if (mainw->playing_file>-1) {
       if (mainw->sep_win) {
-	// switch to separate window during pb
-	if (mainw->multitrack==NULL) {
-
-	  if (prefs->show_framecount&&((!mainw->preview&&(cfile->frames>0||mainw->foreign))||cfile->opening)) {
-	    lives_widget_show(mainw->framebar);
-	  }
-	  if ((!mainw->faded&&mainw->fs&&((prefs->play_monitor!=prefs->gui_monitor&&prefs->play_monitor>0)))||
-					 (mainw->fs&&mainw->vpp!=NULL&&
-					  !(mainw->vpp->capabilities&VPP_LOCAL_DISPLAY))) {
-	    lives_container_set_border_width (LIVES_CONTAINER (mainw->playframe), widget_opts.border_width);
-	    unfade_background();
-	    lives_widget_show(mainw->frame1);
-	    lives_widget_show(mainw->frame2);
-	    lives_widget_show(mainw->eventbox3);
-	    lives_widget_show(mainw->eventbox4);
-	    if (cfile->is_loaded) {
-	      load_start_image (cfile->start);
-	      load_end_image (cfile->end);
-	    }
-	    else {
-	      load_start_image (0);
-	      load_end_image (0);
-	    }
-	  }
-	  if (mainw->fs&&!mainw->faded) {
-	    resize(1);
-	  }
-	  else {
-	    if (mainw->faded) {
-	      lives_widget_hide(mainw->playframe);
-	    }
-	    if (mainw->double_size&&mainw->multitrack==NULL) {
-	      resize(1);
-	      if (!mainw->faded) {
-		if (palette->style&STYLE_1) {
-		  lives_widget_show(mainw->sep_image);
-		}
-		lives_widget_show(mainw->scrolledwindow);
-	      }
-	    }
-	  }
-	}
-
-	make_play_window();
-
-	mainw->pw_scroll_func=lives_signal_connect (LIVES_GUI_OBJECT (mainw->play_window), LIVES_WIDGET_SCROLL_EVENT,
-						LIVES_GUI_CALLBACK (on_mouse_scroll),
-						NULL);
-
-
-	if (mainw->ext_playback&&mainw->vpp->fheight>-1&&mainw->vpp->fwidth>-1) {	  
-	  // fixed o/p size for stream
-	  if (!(mainw->vpp->fwidth*mainw->vpp->fheight)) {
-	    mainw->vpp->fwidth=cfile->hsize;
-	    mainw->vpp->fheight=cfile->vsize;
-	  }
-	  mainw->pwidth=mainw->vpp->fwidth;
-	  mainw->pheight=mainw->vpp->fheight;
-
-	  if (!(mainw->vpp->capabilities&VPP_LOCAL_DISPLAY)) {
-	    lives_window_set_title (LIVES_WINDOW (mainw->play_window),_("LiVES: - Streaming"));
-	    unfade_background();
-	  }
-
-	  resize(1);
-	  resize_play_window();
-	}
-	
-	if (mainw->play_window!=NULL&&LIVES_IS_XWINDOW(lives_widget_get_xwindow(mainw->play_window))) {
-	  hide_cursor(lives_widget_get_xwindow(mainw->play_window));
-	  lives_widget_set_app_paintable(mainw->play_window,TRUE);
-	}
-	if (cfile->frames==1||cfile->play_paused) {
-	  lives_widget_context_update();
-	  if (mainw->play_window!=NULL&&LIVES_IS_XWINDOW(lives_widget_get_xwindow(mainw->play_window))&&
-	      !mainw->noswitch&&mainw->multitrack==NULL&&(cfile->clip_type==CLIP_TYPE_DISK||
-							  cfile->clip_type==CLIP_TYPE_FILE)) {
-	    weed_plant_t *frame_layer=mainw->frame_layer;
-	    mainw->frame_layer=NULL;
-	    load_frame_image (cfile->frameno);
-	    mainw->frame_layer=frame_layer;
-	  }
-	}
+        // switch to separate window during pb
+        if (mainw->multitrack==NULL) {
 
-      }
-      else {
-	// switch from separate window during playback
-	if (cfile->frames>0&&mainw->multitrack==NULL) {
-	  lives_widget_show(mainw->playframe);
-	}
-	if (!mainw->fs&&mainw->multitrack==NULL) {
-	  if (!mainw->double_size) {
-	    resize(1);
-	  }
-	  else {
-	    if (palette->style&STYLE_1) {
-	      lives_widget_hide(mainw->sep_image);
-	    }
-	    lives_widget_hide(mainw->scrolledwindow);
-	    resize(2);
-	  }
-	  
-	  lives_widget_queue_draw (mainw->playframe);
-	  lives_widget_context_update();
-	  mainw->pwidth=lives_widget_get_allocation_width(mainw->playframe)-H_RESIZE_ADJUST;
-	  mainw->pheight=lives_widget_get_allocation_height(mainw->playframe)-V_RESIZE_ADJUST;
-	}
-	else {
-	  if (mainw->ext_playback) {
-	    vid_playback_plugin_exit();
-	  }
-	  if (mainw->multitrack==NULL) {
-	    lives_widget_show(mainw->playframe);
-	    lives_widget_hide(mainw->framebar);
-	    if (!mainw->faded) fade_background();
-	    fullscreen_internal();
-	    lives_widget_context_update();
-	  }
-	}
-	if (mainw->multitrack!=NULL) {
-	  mainw->must_resize=TRUE;
-	  mainw->pwidth=mainw->multitrack->play_width;
-	  mainw->pheight=mainw->multitrack->play_height;
-	}
-	kill_play_window();
-	if (mainw->multitrack==NULL) add_to_playframe();
-
-	hide_cursor(lives_widget_get_xwindow(mainw->playarea));
-	if (mainw->multitrack==NULL&&(cfile->frames==1||cfile->play_paused)&&
-	    !mainw->noswitch&&(cfile->clip_type==CLIP_TYPE_DISK||
-			       cfile->clip_type==CLIP_TYPE_FILE)) {
-	  weed_plant_t *frame_layer=mainw->frame_layer;
-	  mainw->frame_layer=NULL;
-	  load_frame_image (cfile->frameno);
-	  mainw->frame_layer=frame_layer;
-	}
+          if (prefs->show_framecount&&((!mainw->preview&&(cfile->frames>0||mainw->foreign))||cfile->opening)) {
+            lives_widget_show(mainw->framebar);
+          }
+          if ((!mainw->faded&&mainw->fs&&((prefs->play_monitor!=prefs->gui_monitor&&prefs->play_monitor>0)))||
+              (mainw->fs&&mainw->vpp!=NULL&&
+               !(mainw->vpp->capabilities&VPP_LOCAL_DISPLAY))) {
+            lives_container_set_border_width(LIVES_CONTAINER(mainw->playframe), widget_opts.border_width);
+            unfade_background();
+            lives_widget_show(mainw->frame1);
+            lives_widget_show(mainw->frame2);
+            lives_widget_show(mainw->eventbox3);
+            lives_widget_show(mainw->eventbox4);
+            if (cfile->is_loaded) {
+              load_start_image(cfile->start);
+              load_end_image(cfile->end);
+            } else {
+              load_start_image(0);
+              load_end_image(0);
+            }
+          }
+          if (mainw->fs&&!mainw->faded) {
+            resize(1);
+          } else {
+            if (mainw->faded) {
+              lives_widget_hide(mainw->playframe);
+            }
+            if (mainw->double_size&&mainw->multitrack==NULL) {
+              resize(1);
+              if (!mainw->faded) {
+                if (palette->style&STYLE_1) {
+                  lives_widget_show(mainw->sep_image);
+                }
+                lives_widget_show(mainw->scrolledwindow);
+              }
+            }
+          }
+        }
+
+        make_play_window();
+
+        mainw->pw_scroll_func=lives_signal_connect(LIVES_GUI_OBJECT(mainw->play_window), LIVES_WIDGET_SCROLL_EVENT,
+                              LIVES_GUI_CALLBACK(on_mouse_scroll),
+                              NULL);
+
+
+        if (mainw->ext_playback&&mainw->vpp->fheight>-1&&mainw->vpp->fwidth>-1) {
+          // fixed o/p size for stream
+          if (!(mainw->vpp->fwidth*mainw->vpp->fheight)) {
+            mainw->vpp->fwidth=cfile->hsize;
+            mainw->vpp->fheight=cfile->vsize;
+          }
+          mainw->pwidth=mainw->vpp->fwidth;
+          mainw->pheight=mainw->vpp->fheight;
+
+          if (!(mainw->vpp->capabilities&VPP_LOCAL_DISPLAY)) {
+            lives_window_set_title(LIVES_WINDOW(mainw->play_window),_("LiVES: - Streaming"));
+            unfade_background();
+          }
+
+          resize(1);
+          resize_play_window();
+        }
+
+        if (mainw->play_window!=NULL&&LIVES_IS_XWINDOW(lives_widget_get_xwindow(mainw->play_window))) {
+          hide_cursor(lives_widget_get_xwindow(mainw->play_window));
+          lives_widget_set_app_paintable(mainw->play_window,TRUE);
+        }
+        if (cfile->frames==1||cfile->play_paused) {
+          lives_widget_context_update();
+          if (mainw->play_window!=NULL&&LIVES_IS_XWINDOW(lives_widget_get_xwindow(mainw->play_window))&&
+              !mainw->noswitch&&mainw->multitrack==NULL&&(cfile->clip_type==CLIP_TYPE_DISK||
+                  cfile->clip_type==CLIP_TYPE_FILE)) {
+            weed_plant_t *frame_layer=mainw->frame_layer;
+            mainw->frame_layer=NULL;
+            load_frame_image(cfile->frameno);
+            mainw->frame_layer=frame_layer;
+          }
+        }
+
+      } else {
+        // switch from separate window during playback
+        if (cfile->frames>0&&mainw->multitrack==NULL) {
+          lives_widget_show(mainw->playframe);
+        }
+        if (!mainw->fs&&mainw->multitrack==NULL) {
+          if (!mainw->double_size) {
+            resize(1);
+          } else {
+            if (palette->style&STYLE_1) {
+              lives_widget_hide(mainw->sep_image);
+            }
+            lives_widget_hide(mainw->scrolledwindow);
+            resize(2);
+          }
+
+          lives_widget_queue_draw(mainw->playframe);
+          lives_widget_context_update();
+          mainw->pwidth=lives_widget_get_allocation_width(mainw->playframe)-H_RESIZE_ADJUST;
+          mainw->pheight=lives_widget_get_allocation_height(mainw->playframe)-V_RESIZE_ADJUST;
+        } else {
+          if (mainw->ext_playback) {
+            vid_playback_plugin_exit();
+          }
+          if (mainw->multitrack==NULL) {
+            lives_widget_show(mainw->playframe);
+            lives_widget_hide(mainw->framebar);
+            if (!mainw->faded) fade_background();
+            fullscreen_internal();
+            lives_widget_context_update();
+          }
+        }
+        if (mainw->multitrack!=NULL) {
+          mainw->must_resize=TRUE;
+          mainw->pwidth=mainw->multitrack->play_width;
+          mainw->pheight=mainw->multitrack->play_height;
+        }
+        kill_play_window();
+        if (mainw->multitrack==NULL) add_to_playframe();
+
+        hide_cursor(lives_widget_get_xwindow(mainw->playarea));
+        if (mainw->multitrack==NULL&&(cfile->frames==1||cfile->play_paused)&&
+            !mainw->noswitch&&(cfile->clip_type==CLIP_TYPE_DISK||
+                               cfile->clip_type==CLIP_TYPE_FILE)) {
+          weed_plant_t *frame_layer=mainw->frame_layer;
+          mainw->frame_layer=NULL;
+          load_frame_image(cfile->frameno);
+          mainw->frame_layer=frame_layer;
+        }
       }
     }
   }
-  /*  if (mainw->multitrack!=NULL) {
-    mainw->multitrack->redraw_block=FALSE;
-    if (mainw->sep_win&&prefs->play_monitor!=prefs->gui_monitor&&prefs->play_monitor!=0) {
-      lives_widget_hide(mainw->multitrack->play_box);
-      lives_widget_hide(lives_widget_get_parent(mainw->multitrack->play_box));
-      lives_widget_hide(lives_widget_get_parent(lives_widget_get_parent(mainw->multitrack->play_box)));
-    }
-    else {
-      lives_widget_show(mainw->multitrack->play_box);
-      lives_widget_show(lives_widget_get_parent(mainw->multitrack->play_box));
-      lives_widget_show(lives_widget_get_parent(lives_widget_get_parent(mainw->multitrack->play_box)));
-      if (mainw->playing_file>-1) mt_show_current_frame(mainw->multitrack, FALSE);
-    }
-
-
-    }*/
 }
 
 
-void on_showfct_activate (LiVESMenuItem *menuitem, gpointer user_data) {
+void on_showfct_activate(LiVESMenuItem *menuitem, livespointer user_data) {
   prefs->show_framecount=!prefs->show_framecount;
   if (mainw->playing_file>-1) {
     if (!mainw->fs||(prefs->play_monitor!=prefs->gui_monitor&&mainw->play_window!=NULL)) {
       if (prefs->show_framecount) {
-	lives_widget_show (mainw->framebar);
-      }
-      else {
-	lives_widget_hide (mainw->framebar);
+        lives_widget_show(mainw->framebar);
+      } else {
+        lives_widget_hide(mainw->framebar);
       }
     }
   }
@@ -7646,48 +7266,45 @@
 
 
 
-void on_sticky_activate (LiVESMenuItem *menuitem, gpointer user_data) {
+void on_sticky_activate(LiVESMenuItem *menuitem, livespointer user_data) {
   // type is SEPWIN_TYPE_STICKY (shown even when not playing)
   // or SEPWIN_TYPE_NON_STICKY (shown only when playing)
-  
-  gchar *title,*xtrabit;
+
+  char *title,*xtrabit;
 
   if (prefs->sepwin_type==SEPWIN_TYPE_NON_STICKY) {
     prefs->sepwin_type=SEPWIN_TYPE_STICKY;
     if (mainw->sep_win) {
       if (mainw->playing_file==-1) {
-	make_play_window();
+        make_play_window();
       }
-    }
-    else {
+    } else {
       if (!(mainw->play_window==NULL)) {
-	if (mainw->sepwin_scale!=100.) xtrabit=g_strdup_printf(_(" (%d %% scale)"),(int)mainw->sepwin_scale);
-	else xtrabit=g_strdup("");
-	title=g_strdup_printf(_("LiVES: - Play Window%s"),xtrabit);
-	lives_window_set_title (LIVES_WINDOW (mainw->play_window), title);
-	g_free(title);
-	g_free(xtrabit);
+        if (mainw->sepwin_scale!=100.) xtrabit=lives_strdup_printf(_(" (%d %% scale)"),(int)mainw->sepwin_scale);
+        else xtrabit=lives_strdup("");
+        title=lives_strdup_printf(_("LiVES: - Play Window%s"),xtrabit);
+        lives_window_set_title(LIVES_WINDOW(mainw->play_window), title);
+        lives_free(title);
+        lives_free(xtrabit);
       }
     }
-  }
-  else {
+  } else {
     if (prefs->sepwin_type==SEPWIN_TYPE_STICKY) {
       prefs->sepwin_type=SEPWIN_TYPE_NON_STICKY;
       if (mainw->sep_win) {
-	if (mainw->playing_file==-1) {
-	  kill_play_window();
-	}
-	else {
-	  if (mainw->sepwin_scale!=100.) xtrabit=g_strdup_printf(_(" (%d %% scale)"),(int)mainw->sepwin_scale);
-	  else xtrabit=g_strdup("");
-	  title=g_strdup_printf("%s%s",lives_window_get_title(LIVES_WINDOW
-							    (mainw->multitrack==NULL?mainw->LiVES:
-							     mainw->multitrack->window)),xtrabit);
-	  if (mainw->play_window!=NULL)
-	    lives_window_set_title(LIVES_WINDOW(mainw->play_window),title);
-	  g_free(title);
-	  g_free(xtrabit);
-	}
+        if (mainw->playing_file==-1) {
+          kill_play_window();
+        } else {
+          if (mainw->sepwin_scale!=100.) xtrabit=lives_strdup_printf(_(" (%d %% scale)"),(int)mainw->sepwin_scale);
+          else xtrabit=lives_strdup("");
+          title=lives_strdup_printf("%s%s",lives_window_get_title(LIVES_WINDOW
+                                    ((mainw->multitrack==NULL?mainw->LiVES:
+                                      mainw->multitrack->window))),xtrabit);
+          if (mainw->play_window!=NULL)
+            lives_window_set_title(LIVES_WINDOW(mainw->play_window),title);
+          lives_free(title);
+          lives_free(xtrabit);
+        }
       }
     }
   }
@@ -7695,9 +7312,8 @@
 
 
 
-void on_fade_pressed (LiVESButton *button,
-		      gpointer user_data) 
-{
+void on_fade_pressed(LiVESButton *button,
+                     livespointer user_data) {
   // toolbar button (unblank background)
   if (mainw->fs&&(mainw->play_window==NULL||prefs->play_monitor==prefs->gui_monitor)) return;
   lives_check_menu_item_set_active(LIVES_CHECK_MENU_ITEM(mainw->fade),!mainw->faded);
@@ -7706,9 +7322,8 @@
 
 
 void
-on_fade_activate               (LiVESMenuItem     *menuitem,
-				gpointer         user_data)
-{
+on_fade_activate(LiVESMenuItem     *menuitem,
+                 livespointer         user_data) {
   mainw->faded=!mainw->faded;
   if (mainw->playing_file>-1&&(!mainw->fs||(prefs->play_monitor!=prefs->gui_monitor&&mainw->play_window!=NULL))) {
     if (mainw->faded) fade_background();
@@ -7719,7 +7334,7 @@
 
 
 
-void on_showsubs_toggled(LiVESObject *obj, gpointer user_data) {
+void on_showsubs_toggled(LiVESObject *obj, livespointer user_data) {
   prefs->show_subtitles=!prefs->show_subtitles;
   if (mainw->current_file>0&&mainw->multitrack==NULL) {
     if (mainw->play_window!=NULL) {
@@ -7732,53 +7347,47 @@
 
 
 
-void on_boolean_toggled(LiVESObject *obj, gpointer user_data) {
+void on_boolean_toggled(LiVESObject *obj, livespointer user_data) {
   boolean *ppref=(boolean *)user_data;
   *ppref=!*ppref;
 }
 
 
-void
-on_loop_video_activate                (LiVESMenuItem     *menuitem,
-				       gpointer         user_data)
-{
+void on_loop_video_activate(LiVESMenuItem *menuitem, livespointer user_data) {
   if (mainw->current_file==0) return;
   mainw->loop=!mainw->loop;
-  lives_widget_set_sensitive (mainw->playclip, mainw->playing_file==-1&&clipboard!=NULL);
+  lives_widget_set_sensitive(mainw->playclip, mainw->playing_file==-1&&clipboard!=NULL);
   if (mainw->current_file>-1) find_when_to_stop();
 }
 
-void
-on_loop_button_activate                (LiVESMenuItem     *menuitem,
-					gpointer         user_data)
-{
+
+void on_loop_button_activate(LiVESMenuItem *menuitem, livespointer user_data) {
   if (mainw->multitrack!=NULL) {
-    lives_signal_handler_block (mainw->multitrack->loop_continue, mainw->multitrack->loop_cont_func);
+    lives_signal_handler_block(mainw->multitrack->loop_continue, mainw->multitrack->loop_cont_func);
     lives_check_menu_item_set_active(LIVES_CHECK_MENU_ITEM(mainw->multitrack->loop_continue),!mainw->loop_cont);
-    lives_signal_handler_unblock (mainw->multitrack->loop_continue, mainw->multitrack->loop_cont_func);
+    lives_signal_handler_unblock(mainw->multitrack->loop_continue, mainw->multitrack->loop_cont_func);
   }
   lives_check_menu_item_set_active(LIVES_CHECK_MENU_ITEM(mainw->loop_continue), !mainw->loop_cont);
 }
 
 
-void on_loop_cont_activate (LiVESMenuItem *menuitem, gpointer user_data) {
-  gchar buff[PATH_MAX];
+void on_loop_cont_activate(LiVESMenuItem *menuitem, livespointer user_data) {
+  char buff[PATH_MAX];
   LiVESWidget *loop_img;
-  gchar *fnamex;
+  char *fnamex;
 
   mainw->loop_cont=!mainw->loop_cont;
 
-  fnamex=g_build_filename(prefs->prefix_dir,ICON_DIR,"loop.png",NULL);
-  g_snprintf (buff,PATH_MAX,"%s",fnamex);
-  g_free(fnamex);
+  fnamex=lives_build_filename(prefs->prefix_dir,ICON_DIR,"loop.png",NULL);
+  lives_snprintf(buff,PATH_MAX,"%s",fnamex);
+  lives_free(fnamex);
 
-  loop_img=lives_image_new_from_file (buff);
+  loop_img=lives_image_new_from_file(buff);
 
   if (mainw->loop_cont) {
     lives_widget_set_tooltip_text(mainw->m_loopbutton,_("Switch continuous looping off (o)"));
-  }
-  else {
-    if (g_file_test(buff,G_FILE_TEST_EXISTS)) {
+  } else {
+    if (lives_file_test(buff,LIVES_FILE_TEST_EXISTS)) {
       LiVESPixbuf *pixbuf=lives_image_get_pixbuf(LIVES_IMAGE(loop_img));
       if (pixbuf!=NULL) lives_pixbuf_saturate_and_pixelate(pixbuf,pixbuf,0.2,FALSE);
     }
@@ -7788,7 +7397,7 @@
   lives_widget_show(loop_img);
   lives_tool_button_set_icon_widget(LIVES_TOOL_BUTTON(mainw->m_loopbutton),loop_img);
 
-  lives_widget_set_sensitive (mainw->playclip, !(clipboard==NULL));
+  lives_widget_set_sensitive(mainw->playclip, !(clipboard==NULL));
   if (mainw->current_file>-1) find_when_to_stop();
   else mainw->whentostop=NEVER_STOP;
 
@@ -7797,8 +7406,7 @@
     if (mainw->jackd!=NULL&&(mainw->loop_cont||mainw->whentostop==NEVER_STOP)) {
       if (mainw->ping_pong&&prefs->audio_opts&AUDIO_OPTS_FOLLOW_FPS) mainw->jackd->loop=AUDIO_LOOP_PINGPONG;
       else mainw->jackd->loop=AUDIO_LOOP_FORWARD;
-    }
-    else if (mainw->jackd!=NULL) mainw->jackd->loop=AUDIO_LOOP_NONE;
+    } else if (mainw->jackd!=NULL) mainw->jackd->loop=AUDIO_LOOP_NONE;
   }
 #endif
 #ifdef HAVE_PULSE_AUDIO
@@ -7806,15 +7414,14 @@
     if (mainw->pulsed!=NULL&&(mainw->loop_cont||mainw->whentostop==NEVER_STOP)) {
       if (mainw->ping_pong&&prefs->audio_opts&AUDIO_OPTS_FOLLOW_FPS) mainw->pulsed->loop=AUDIO_LOOP_PINGPONG;
       else mainw->pulsed->loop=AUDIO_LOOP_FORWARD;
-    }
-    else if (mainw->pulsed!=NULL) mainw->pulsed->loop=AUDIO_LOOP_NONE;
+    } else if (mainw->pulsed!=NULL) mainw->pulsed->loop=AUDIO_LOOP_NONE;
   }
 #endif
 
 }
 
 
-void on_ping_pong_activate (LiVESMenuItem *menuitem, gpointer user_data) {
+void on_ping_pong_activate(LiVESMenuItem *menuitem, livespointer user_data) {
   mainw->ping_pong=!mainw->ping_pong;
 #ifdef ENABLE_JACK
   if (prefs->audio_player==AUD_PLAYER_JACK&&mainw->jackd!=NULL&&mainw->jackd->loop!=AUDIO_LOOP_NONE) {
@@ -7831,62 +7438,61 @@
 }
 
 
-void on_volume_slider_value_changed (LiVESScaleButton *sbutton, gpointer user_data) {
-  gchar *ttip;
+void on_volume_slider_value_changed(LiVESScaleButton *sbutton, livespointer user_data) {
+  char *ttip;
   mainw->volume=lives_scale_button_get_value(sbutton);
-  ttip=g_strdup_printf(_("Audio volume (%.2f)"),mainw->volume);
+  ttip=lives_strdup_printf(_("Audio volume (%.2f)"),mainw->volume);
   lives_widget_set_tooltip_text(mainw->vol_toolitem,_(ttip));
-  g_free(ttip);
+  lives_free(ttip);
 }
 
 
 
-void on_mute_button_activate (LiVESMenuItem *menuitem, gpointer user_data) {
+void on_mute_button_activate(LiVESMenuItem *menuitem, livespointer user_data) {
   if (mainw->multitrack!=NULL) {
-    lives_signal_handler_block (mainw->multitrack->mute_audio, mainw->multitrack->mute_audio_func);
+    lives_signal_handler_block(mainw->multitrack->mute_audio, mainw->multitrack->mute_audio_func);
     lives_check_menu_item_set_active(LIVES_CHECK_MENU_ITEM(mainw->multitrack->mute_audio),!mainw->mute);
-    lives_signal_handler_unblock (mainw->multitrack->mute_audio, mainw->multitrack->mute_audio_func);
+    lives_signal_handler_unblock(mainw->multitrack->mute_audio, mainw->multitrack->mute_audio_func);
   }
   lives_check_menu_item_set_active(LIVES_CHECK_MENU_ITEM(mainw->mute_audio), !mainw->mute);
 }
 
 
-boolean mute_audio_callback (LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, gpointer user_data) {
+boolean mute_audio_callback(LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, livespointer user_data) {
   lives_check_menu_item_set_active(LIVES_CHECK_MENU_ITEM(mainw->mute_audio), !mainw->mute);
   return TRUE;
 }
 
 
-void on_mute_activate (LiVESMenuItem *menuitem, gpointer user_data) {
-  gchar buff[PATH_MAX];
+void on_mute_activate(LiVESMenuItem *menuitem, livespointer user_data) {
+  char buff[PATH_MAX];
   LiVESWidget *mute_img;
   LiVESWidget *mute_img2=NULL;
-  gchar *fnamex;
+  char *fnamex;
 
   mainw->mute=!mainw->mute;
 
   // change the mute icon
-  fnamex=g_build_filename(prefs->prefix_dir,ICON_DIR,"volume_mute.png",NULL);
-  g_snprintf (buff,PATH_MAX,"%s",fnamex);
-  g_free(fnamex);
+  fnamex=lives_build_filename(prefs->prefix_dir,ICON_DIR,"volume_mute.png",NULL);
+  lives_snprintf(buff,PATH_MAX,"%s",fnamex);
+  lives_free(fnamex);
 
-  mute_img=lives_image_new_from_file (buff);
-  if (mainw->preview_box!=NULL) mute_img2=lives_image_new_from_file (buff);
+  mute_img=lives_image_new_from_file(buff);
+  if (mainw->preview_box!=NULL) mute_img2=lives_image_new_from_file(buff);
   if (mainw->mute) {
     lives_widget_set_tooltip_text(mainw->m_mutebutton,_("Unmute the audio (z)"));
-    if (mainw->preview_box!=NULL) lives_widget_set_tooltip_text( mainw->p_mutebutton,_("Unmute the audio (z)"));
-  }
-  else {
-    if (g_file_test(buff,G_FILE_TEST_EXISTS)) {
+    if (mainw->preview_box!=NULL) lives_widget_set_tooltip_text(mainw->p_mutebutton,_("Unmute the audio (z)"));
+  } else {
+    if (lives_file_test(buff,LIVES_FILE_TEST_EXISTS)) {
       LiVESPixbuf *pixbuf=lives_image_get_pixbuf(LIVES_IMAGE(mute_img));
       if (pixbuf!=NULL) lives_pixbuf_saturate_and_pixelate(pixbuf,pixbuf,0.2,FALSE);
       if (mainw->preview_box!=NULL) {
-	pixbuf=lives_image_get_pixbuf(LIVES_IMAGE(mute_img2));
-	if (pixbuf!=NULL) lives_pixbuf_saturate_and_pixelate(pixbuf,pixbuf,0.2,FALSE);
+        pixbuf=lives_image_get_pixbuf(LIVES_IMAGE(mute_img2));
+        if (pixbuf!=NULL) lives_pixbuf_saturate_and_pixelate(pixbuf,pixbuf,0.2,FALSE);
       }
     }
     lives_widget_set_tooltip_text(mainw->m_mutebutton,_("Mute the audio (z)"));
-    if (mainw->preview_box!=NULL) lives_widget_set_tooltip_text( mainw->p_mutebutton,_("Mute the audio (z)"));
+    if (mainw->preview_box!=NULL) lives_widget_set_tooltip_text(mainw->p_mutebutton,_("Mute the audio (z)"));
   }
 
   lives_widget_show(mute_img);
@@ -7904,7 +7510,7 @@
     mainw->jackd->mute=mainw->mute;
     if (mainw->jackd->playing_file==mainw->current_file&&cfile->achans>0&&!mainw->is_rendering) {
       if (!jack_audio_seek_bytes(mainw->jackd,mainw->jackd->seek_pos)) {
-	if (jack_try_reconnect()) jack_audio_seek_bytes(mainw->jackd,mainw->jackd->seek_pos);
+        if (jack_try_reconnect()) jack_audio_seek_bytes(mainw->jackd,mainw->jackd->seek_pos);
       }
       mainw->jackd->in_use=TRUE;
     }
@@ -7915,7 +7521,7 @@
     mainw->pulsed->mute=mainw->mute;
     if (mainw->pulsed->playing_file==mainw->current_file&&cfile->achans>0&&!mainw->is_rendering) {
       if (!pulse_audio_seek_bytes(mainw->pulsed, mainw->pulsed->seek_pos)) {
-	if (pulse_try_reconnect()) pulse_audio_seek_bytes(mainw->pulsed,mainw->pulsed->seek_pos);
+        if (pulse_try_reconnect()) pulse_audio_seek_bytes(mainw->pulsed,mainw->pulsed->seek_pos);
       }
       mainw->pulsed->in_use=TRUE;
     }
@@ -7924,9 +7530,9 @@
 }
 
 
-void on_spin_value_changed (LiVESSpinButton *spinbutton, gpointer user_data) {
+void on_spin_value_changed(LiVESSpinButton *spinbutton, livespointer user_data) {
   // TODO - use array
-  switch (GPOINTER_TO_INT (user_data)) {
+  switch (LIVES_POINTER_TO_INT(user_data)) {
   case 1 :
     mainw->fx1_val=lives_spin_button_get_value(LIVES_SPIN_BUTTON(spinbutton));
     break;
@@ -7944,12 +7550,11 @@
 
 
 void
-on_spin_start_value_changed           (LiVESSpinButton   *spinbutton,
-				       gpointer         user_data)
-{
+on_spin_start_value_changed(LiVESSpinButton   *spinbutton,
+                            livespointer         user_data) {
   // generic
   // TODO - use array
-  switch (GPOINTER_TO_INT (user_data)) {
+  switch (LIVES_POINTER_TO_INT(user_data)) {
   case 1 :
     mainw->fx1_start=lives_spin_button_get_value_as_int(LIVES_SPIN_BUTTON(spinbutton));
     break;
@@ -7964,13 +7569,14 @@
     break;
   }
 }
+
+
 void
-on_spin_step_value_changed           (LiVESSpinButton   *spinbutton,
-				     gpointer         user_data)
-{
+on_spin_step_value_changed(LiVESSpinButton   *spinbutton,
+                           livespointer         user_data) {
   // generic
   // TODO - use array
-  switch (GPOINTER_TO_INT (user_data)) {
+  switch (LIVES_POINTER_TO_INT(user_data)) {
   case 1 :
     mainw->fx1_step=lives_spin_button_get_value_as_int(LIVES_SPIN_BUTTON(spinbutton));
     break;
@@ -7987,12 +7593,11 @@
 }
 
 void
-on_spin_end_value_changed           (LiVESSpinButton   *spinbutton,
-				     gpointer         user_data)
-{
+on_spin_end_value_changed(LiVESSpinButton   *spinbutton,
+                          livespointer         user_data) {
   // generic
   // TODO - use array
-  switch (GPOINTER_TO_INT (user_data)) {
+  switch (LIVES_POINTER_TO_INT(user_data)) {
   case 1 :
     mainw->fx1_end=lives_spin_button_get_value_as_int(LIVES_SPIN_BUTTON(spinbutton));
     break;
@@ -8010,9 +7615,9 @@
 
 
 
-void on_rev_clipboard_activate (LiVESMenuItem *menuitem, gpointer user_data) {
+void on_rev_clipboard_activate(LiVESMenuItem *menuitem, livespointer user_data) {
   // reverse the clipboard
-  gchar *com;
+  char *com;
   int current_file=mainw->current_file;
   mainw->current_file=0;
 
@@ -8026,30 +7631,30 @@
       do_threaded_dialog(_("Pulling frames from clipboard"),TRUE);
       retb=virtual_to_images(mainw->current_file,1,cfile->frames,TRUE,NULL);
       end_threaded_dialog();
-      
+
       if (mainw->cancelled!=CANCEL_NONE||!retb) {
-	sensitize();
-	mainw->cancelled=CANCEL_USER;
-	return;
+        sensitize();
+        mainw->cancelled=CANCEL_USER;
+        return;
       }
     }
   }
 
-  d_print(_ ("Reversing clipboard..."));
-  com=g_strdup_printf("%s reverse \"%s\" %d %d \"%s\"",prefs->backend,clipboard->handle,1,clipboard->frames,
-		      get_image_ext_for_type(cfile->img_type));
+  d_print(_("Reversing clipboard..."));
+  com=lives_strdup_printf("%s reverse \"%s\" %d %d \"%s\"",prefs->backend,clipboard->handle,1,clipboard->frames,
+                          get_image_ext_for_type(cfile->img_type));
 
   unlink(cfile->info_file);
   mainw->com_failed=FALSE;
   lives_system(com,FALSE);
-  g_free(com);
+  lives_free(com);
 
   if (!mainw->com_failed) {
     cfile->progress_start=1;
     cfile->progress_end=cfile->frames;
 
     // show a progress dialog, not cancellable
-    do_progress_dialog(TRUE,FALSE,_ ("Reversing clipboard"));
+    do_progress_dialog(TRUE,FALSE,_("Reversing clipboard"));
   }
 
   if (mainw->com_failed||mainw->error) d_print_failed();
@@ -8067,55 +7672,52 @@
 
 
 
-void on_load_subs_activate (LiVESMenuItem *menuitem, gpointer user_data) {
-  gchar *subfile;
-  gchar *filt[]={"*.srt","*.sub",NULL};
-  gchar filename[512];
-  gchar *subfname,*isubfname,*com,*tmp;
+void on_load_subs_activate(LiVESMenuItem *menuitem, livespointer user_data) {
+  char *subfile;
+  char *filt[]= {"*.srt","*.sub",NULL};
+  char filename[512];
+  char *subfname,*isubfname,*com;
   lives_subtitle_type_t subtype=SUBTITLE_TYPE_NONE;
-  gchar *lfile_name;
-  gchar *ttl;
+  char *lfile_name;
+  char *ttl;
 
   if (cfile->subt!=NULL) if (!do_existing_subs_warning()) return;
 
   // try to repaint the screen, as it may take a few seconds to get a directory listing
   lives_widget_context_update();
 
-  ttl=g_strdup (_("LiVES: Load subtitles from..."));
+  ttl=lives_strdup(_("LiVES: Load subtitles from..."));
 
   if (strlen(mainw->vid_load_dir)) {
     subfile=choose_file(mainw->vid_load_dir,NULL,filt,LIVES_FILE_CHOOSER_ACTION_OPEN,ttl,NULL);
-  }
-  else subfile=choose_file(NULL,NULL,filt,LIVES_FILE_CHOOSER_ACTION_OPEN,ttl,NULL);
-  g_free(ttl);
+  } else subfile=choose_file(NULL,NULL,filt,LIVES_FILE_CHOOSER_ACTION_OPEN,ttl,NULL);
+  lives_free(ttl);
 
   if (subfile==NULL) return; // cancelled
 
-  g_snprintf(filename,512,"%s",subfile);
-  g_free(subfile);
+  lives_snprintf(filename,512,"%s",subfile);
+  lives_free(subfile);
 
   get_filename(filename,FALSE); // strip extension
-  isubfname=g_strdup_printf("%s.srt",filename);
-  lfile_name=g_filename_from_utf8(isubfname,-1,NULL,NULL,NULL);
+  isubfname=lives_strdup_printf("%s.srt",filename);
+  lfile_name=lives_filename_from_utf8(isubfname,-1,NULL,NULL,NULL);
 
-  if (g_file_test(lfile_name,G_FILE_TEST_EXISTS)) {
-    subfname=g_build_filename(prefs->tmpdir,cfile->handle,"subs.srt",NULL);
+  if (lives_file_test(lfile_name,LIVES_FILE_TEST_EXISTS)) {
+    subfname=lives_build_filename(prefs->tmpdir,cfile->handle,"subs.srt",NULL);
     subtype=SUBTITLE_TYPE_SRT;
-  }
-  else {
-    g_free(isubfname);
-    g_free(lfile_name);
-    isubfname=g_strdup_printf("%s.sub",filename);
-    lfile_name=g_filename_from_utf8(isubfname,-1,NULL,NULL,NULL);
+  } else {
+    lives_free(isubfname);
+    lives_free(lfile_name);
+    isubfname=lives_strdup_printf("%s.sub",filename);
+    lfile_name=lives_filename_from_utf8(isubfname,-1,NULL,NULL,NULL);
 
-    if (g_file_test(isubfname,G_FILE_TEST_EXISTS)) {
-      subfname=g_build_filename(prefs->tmpdir,cfile->handle,"subs.sub",NULL);
+    if (lives_file_test(isubfname,LIVES_FILE_TEST_EXISTS)) {
+      subfname=lives_build_filename(prefs->tmpdir,cfile->handle,"subs.sub",NULL);
       subtype=SUBTITLE_TYPE_SUB;
-    }
-    else {
-      g_free(isubfname);
+    } else {
+      lives_free(isubfname);
       do_invalid_subs_error();
-      g_free(lfile_name);
+      lives_free(lfile_name);
       return;
     }
   }
@@ -8128,51 +7730,50 @@
 
   mainw->com_failed=FALSE;
 #ifndef IS_MINGW
-  com=g_strdup_printf("/bin/cp \"%s\" \"%s\"",lfile_name,subfname);
+  com=lives_strdup_printf("%s \"%s\" \"%s\"",capable->cp_cmd,lfile_name,subfname);
 #else
-  com=g_strdup_printf("cp.exe \"%s\" \"%s\"",lfile_name,subfname);
+  com=lives_strdup_printf("cp.exe \"%s\" \"%s\"",lfile_name,subfname);
 #endif
   lives_system(com,FALSE);
-  g_free(com);
+  lives_free(com);
 
   if (mainw->com_failed) {
-    g_free(subfname);
-    g_free(isubfname);
-    g_free(lfile_name);
+    lives_free(subfname);
+    lives_free(isubfname);
+    lives_free(lfile_name);
     return;
   }
 
   subtitles_init(cfile,subfname,subtype);
-  g_free(subfname);
+  lives_free(subfname);
 
   // force update
   switch_to_file(0,mainw->current_file);
-  
-  tmp=g_strdup_printf(_("Loaded subtitle file: %s\n"),isubfname);
-  d_print(tmp);
-  g_free(tmp);
-  g_free(isubfname);
-  g_free(lfile_name);
+
+  d_print(_("Loaded subtitle file: %s\n"),isubfname);
+
+  lives_free(isubfname);
+  lives_free(lfile_name);
 }
 
 
 
 
 
-void on_save_subs_activate (LiVESMenuItem *menuitem, gpointer user_data) {
-  gchar *subfile;
-  gchar xfname[512];
-  gchar xfname2[512];
+void on_save_subs_activate(LiVESMenuItem *menuitem, livespointer user_data) {
+  char *subfile;
+  char xfname[512];
+  char xfname2[512];
 
   LiVESEntry *entry=(LiVESEntry *)user_data;
 
   // try to repaint the screen, as it may take a few seconds to get a directory listing
   lives_widget_context_update();
 
-  g_snprintf(xfname,512,"%s",mainw->subt_save_file);
+  lives_snprintf(xfname,512,"%s",mainw->subt_save_file);
   get_dirname(xfname);
 
-  g_snprintf(xfname2,512,"%s",mainw->subt_save_file);
+  lives_snprintf(xfname2,512,"%s",mainw->subt_save_file);
   get_basename(xfname2);
 
   subfile=choose_file(xfname,xfname2,NULL,LIVES_FILE_CHOOSER_ACTION_SAVE,NULL,NULL);
@@ -8182,13 +7783,13 @@
   if (check_file(subfile,FALSE))
     lives_entry_set_text(entry,subfile);
 
-  g_free(subfile);
+  lives_free(subfile);
 }
 
 
 
-void on_erase_subs_activate (LiVESMenuItem *menuitem, gpointer user_data) {
-  gchar *sfname;
+void on_erase_subs_activate(LiVESMenuItem *menuitem, livespointer user_data) {
+  char *sfname;
 
   if (cfile->subt==NULL) return;
 
@@ -8197,11 +7798,11 @@
 
   switch (cfile->subt->type) {
   case SUBTITLE_TYPE_SRT:
-    sfname=g_build_filename(prefs->tmpdir,cfile->handle,"subs.srt",NULL);
+    sfname=lives_build_filename(prefs->tmpdir,cfile->handle,"subs.srt",NULL);
     break;
 
   case SUBTITLE_TYPE_SUB:
-    sfname=g_build_filename(prefs->tmpdir,cfile->handle,"subs.sub",NULL);
+    sfname=lives_build_filename(prefs->tmpdir,cfile->handle,"subs.sub",NULL);
     break;
 
   default:
@@ -8211,7 +7812,7 @@
   subtitles_free(cfile);
 
   unlink(sfname);
-  g_free(sfname);
+  lives_free(sfname);
 
   if (menuitem!=NULL) {
     // force update
@@ -8225,56 +7826,397 @@
 
 
 
-void on_load_audio_activate (LiVESMenuItem *menuitem, gpointer user_data) {
+void on_load_audio_activate(LiVESMenuItem *menuitem, livespointer user_data) {
+  LiVESWidget *chooser;
+  int resp;
+
   if (mainw->multitrack!=NULL) {
     if (mainw->multitrack->idlefunc>0) {
-      g_source_remove(mainw->multitrack->idlefunc);
+      lives_source_remove(mainw->multitrack->idlefunc);
       mainw->multitrack->idlefunc=0;
     }
     mt_desensitise(mainw->multitrack);
     lives_widget_set_sensitive(mainw->multitrack->playall,TRUE);
-    lives_widget_set_sensitive (mainw->m_playbutton, TRUE);
+    lives_widget_set_sensitive(mainw->m_playbutton, TRUE);
   }
 
-  choose_file_with_preview(strlen(mainw->audio_dir)?mainw->audio_dir:NULL,_ ("LiVES: - Select Audio File"),2);
+  chooser=choose_file_with_preview(strlen(mainw->audio_dir)?mainw->audio_dir:NULL,_("LiVES: - Select Audio File"),
+                                   LIVES_FILE_SELECTION_AUDIO_ONLY);
+
+  resp=lives_dialog_run(LIVES_DIALOG(chooser));
+
+  end_fs_preview();
+  mainw->fs_playarea=NULL;
+
+  if (resp!=LIVES_RESPONSE_ACCEPT) on_filechooser_cancel_clicked(chooser);
+  else on_open_new_audio_clicked(LIVES_FILE_CHOOSER(chooser),NULL);
+
 }
 
 
+
+void on_open_new_audio_clicked(LiVESFileChooser *chooser, livespointer user_data) {
+  // open audio file
+  // also called from osc.c
+
+  char *a_type;
+  char *com,*tmp;
+  char **array;
+
+  int oundo_start;
+  int oundo_end;
+  int israw=1;
+  int asigned,aendian;
+
+  boolean has_lmap_error=FALSE;
+  boolean bad_header=FALSE;
+  boolean preparse=FALSE;
+
+  if (!(prefs->warning_mask&WARN_MASK_LAYOUT_DELETE_AUDIO)) {
+    if ((mainw->xlays=layout_audio_is_affected(mainw->current_file,0.))!=NULL) {
+      if (!do_warning_dialog(
+            _("\nLoading new audio may cause missing audio in some multitrack layouts.\nAre you sure you wish to continue ?\n."))) {
+        lives_list_free_strings(mainw->xlays);
+        lives_list_free(mainw->xlays);
+        mainw->xlays=NULL;
+        if (mainw->multitrack!=NULL) {
+          mt_sensitise(mainw->multitrack);
+          mainw->multitrack->idlefunc=mt_idle_add(mainw->multitrack);
+        }
+        return;
+      }
+      add_lmap_error(LMAP_ERROR_DELETE_AUDIO,cfile->name,(livespointer)cfile->layout_map,mainw->current_file,0,0.,
+                     cfile->stored_layout_frame>0.);
+      has_lmap_error=TRUE;
+      lives_list_free_strings(mainw->xlays);
+      lives_list_free(mainw->xlays);
+      mainw->xlays=NULL;
+    }
+  }
+
+  if (!has_lmap_error&&!(prefs->warning_mask&WARN_MASK_LAYOUT_ALTER_AUDIO)&&
+      (mainw->xlays=layout_audio_is_affected(mainw->current_file,0.))) {
+    if (!do_layout_alter_audio_warning()) {
+      lives_list_free_strings(mainw->xlays);
+      lives_list_free(mainw->xlays);
+      mainw->xlays=NULL;
+      if (mainw->multitrack!=NULL) {
+        mt_sensitise(mainw->multitrack);
+        mainw->multitrack->idlefunc=mt_idle_add(mainw->multitrack);
+      }
+      return;
+    }
+    add_lmap_error(LMAP_ERROR_ALTER_AUDIO,cfile->name,(livespointer)cfile->layout_map,mainw->current_file,0,0.,
+                   cfile->stored_layout_audio>0.);
+    has_lmap_error=TRUE;
+    lives_list_free_strings(mainw->xlays);
+    lives_list_free(mainw->xlays);
+    mainw->xlays=NULL;
+  }
+
+  mainw->noswitch=TRUE;
+
+  cfile->undo_arate=cfile->arate;
+  cfile->undo_achans=cfile->achans;
+  cfile->undo_asampsize=cfile->asampsize;
+  cfile->undo_signed_endian=cfile->signed_endian;
+  cfile->undo_arps=cfile->arps;
+
+  oundo_start=cfile->undo_start;
+  oundo_end=cfile->undo_end;
+
+  if (user_data==NULL) {
+    char *filename=lives_file_chooser_get_filename(chooser);
+    lives_snprintf(file_name,PATH_MAX,"%s",(tmp=lives_filename_to_utf8(filename,-1,NULL,NULL,NULL)));
+    lives_free(filename);
+    lives_free(tmp);
+  } else lives_snprintf(file_name,PATH_MAX,"%s",(char *)user_data);
+
+  lives_snprintf(mainw->audio_dir,PATH_MAX,"%s",file_name);
+  get_dirname(mainw->audio_dir);
+  end_fs_preview();
+  lives_widget_destroy(LIVES_WIDGET(chooser));
+  lives_widget_context_update();
+  mainw->fs_playarea=NULL;
+
+  a_type=file_name+strlen(file_name)-3;
+
+  if (!lives_ascii_strncasecmp(a_type,".it",3)||
+      !lives_ascii_strncasecmp(a_type,"mp3",3)||
+      !lives_ascii_strncasecmp(a_type,"ogg",3)||
+      !lives_ascii_strncasecmp(a_type,"wav",3)||
+      !lives_ascii_strncasecmp(a_type,"mod",3)||
+      !lives_ascii_strncasecmp(a_type,".xm",3)) {
+    com=lives_strdup_printf("%s audioopen \"%s\" \"%s\"",prefs->backend,cfile->handle,
+                            (tmp=lives_filename_from_utf8(file_name,-1,NULL,NULL,NULL)));
+    lives_free(tmp);
+  } else {
+    do_audio_import_error();
+    mainw->noswitch=FALSE;
+    if (mainw->multitrack!=NULL) {
+      mt_sensitise(mainw->multitrack);
+      mainw->multitrack->idlefunc=mt_idle_add(mainw->multitrack);
+    }
+    return;
+  }
+
+  if (!lives_ascii_strncasecmp(a_type,"wav",3)) israw=0;
+
+  if (capable->has_mplayer||capable->has_mplayer2) {
+    if (read_file_details(file_name,TRUE)) {
+      array=lives_strsplit(mainw->msg,"|",15);
+      cfile->arate=atoi(array[9]);
+      cfile->achans=atoi(array[10]);
+      cfile->asampsize=atoi(array[11]);
+      cfile->signed_endian=get_signed_endian(atoi(array[12]), atoi(array[13]));
+      lives_strfreev(array);
+      preparse=TRUE;
+    }
+  }
+
+  if (!preparse) {
+    // TODO !!! - need some way to identify audio without invoking mplayer
+    cfile->arate=cfile->arps=DEFAULT_AUDIO_RATE;
+    cfile->achans=DEFAULT_AUDIO_CHANS;
+    cfile->asampsize=DEFAULT_AUDIO_SAMPS;
+    cfile->signed_endian=mainw->endian;
+  }
+
+  if (cfile->undo_arate>0) cfile->arps=cfile->undo_arps/cfile->undo_arate*cfile->arate;
+  else cfile->arps=cfile->arate;
+
+  d_print(""); // force switchtext
+  d_print(_("Opening audio %s, type %s..."),file_name,a_type);
+
+  unlink(cfile->info_file);
+  mainw->com_failed=FALSE;
+  lives_system(com,FALSE);
+  lives_free(com);
+
+  if (mainw->com_failed) {
+    cfile->arate=cfile->undo_arate;
+    cfile->achans=cfile->undo_achans;
+    cfile->asampsize=cfile->undo_asampsize;
+    cfile->signed_endian=cfile->undo_signed_endian;
+    cfile->arps=cfile->undo_arps;
+    cfile->undo_start=oundo_start;
+    cfile->undo_end=oundo_end;
+    sensitize();
+    if (mainw->multitrack!=NULL) {
+      mt_sensitise(mainw->multitrack);
+      mainw->multitrack->idlefunc=mt_idle_add(mainw->multitrack);
+    }
+    reget_afilesize(mainw->current_file);
+    get_play_times();
+    mainw->noswitch=FALSE;
+    return;
+  }
+
+  cfile->opening=cfile->opening_audio=cfile->opening_only_audio=TRUE;
+
+  cfile->undo_start=1;
+  cfile->undo_end=cfile->frames;
+
+  // show audio [opening...] in main window
+  get_play_times();
+
+  if (!(do_progress_dialog(TRUE,TRUE,_("Opening audio")))) {
+    lives_widget_queue_draw(mainw->LiVES);
+    lives_widget_context_update();
+    mainw->cancelled=CANCEL_NONE;
+    mainw->error=FALSE;
+    mainw->com_failed=FALSE;
+    unlink(cfile->info_file);
+    com=lives_strdup_printf("%s cancel_audio \"%s\"",prefs->backend,cfile->handle);
+    lives_system(com,FALSE);
+    do_auto_dialog(_("Cancelling"),0);
+    lives_free(com);
+    cfile->opening_audio=cfile->opening=cfile->opening_only_audio=FALSE;
+    cfile->arate=cfile->undo_arate;
+    cfile->achans=cfile->undo_achans;
+    cfile->asampsize=cfile->undo_asampsize;
+    cfile->signed_endian=cfile->undo_signed_endian;
+    cfile->arps=cfile->undo_arps;
+    cfile->undo_start=oundo_start;
+    cfile->undo_end=oundo_end;
+    sensitize();
+    if (mainw->multitrack!=NULL) {
+      mt_sensitise(mainw->multitrack);
+      mainw->multitrack->idlefunc=mt_idle_add(mainw->multitrack);
+    }
+    reget_afilesize(mainw->current_file);
+    get_play_times();
+    mainw->noswitch=FALSE;
+    if (mainw->error) d_print_failed();
+    return;
+  }
+
+  cfile->opening_audio=cfile->opening=cfile->opening_only_audio=FALSE;
+
+  lives_widget_queue_draw(mainw->LiVES);
+  lives_widget_context_update();
+
+  cfile->afilesize=0;
+  if (get_token_count(mainw->msg,'|')>6) {
+    array=lives_strsplit(mainw->msg,"|",7);
+    cfile->arate=atoi(array[1]);
+    cfile->achans=atoi(array[2]);
+    cfile->asampsize=atoi(array[3]);
+    cfile->signed_endian=get_signed_endian(atoi(array[4]), atoi(array[5]));
+    cfile->afilesize=strtol(array[6],NULL,10);
+    lives_strfreev(array);
+  }
+
+  if (cfile->afilesize==0) {
+    d_print_failed();
+
+    mainw->cancelled=CANCEL_NONE;
+    mainw->error=FALSE;
+    unlink(cfile->info_file);
+
+    com=lives_strdup_printf("%s cancel_audio \"%s\"",prefs->backend,cfile->handle);
+
+    mainw->com_failed=FALSE;
+    lives_system(com,FALSE);
+    lives_free(com);
+
+    if (!mainw->com_failed) do_auto_dialog(_("Cancelling"),0);
+
+    cfile->arate=cfile->undo_arate;
+    cfile->achans=cfile->undo_achans;
+    cfile->asampsize=cfile->undo_asampsize;
+    cfile->signed_endian=cfile->undo_signed_endian;
+    cfile->arps=cfile->undo_arps;
+    cfile->undo_start=oundo_start;
+    cfile->undo_end=oundo_end;
+    sensitize();
+    if (mainw->multitrack!=NULL) {
+      mt_sensitise(mainw->multitrack);
+      mainw->multitrack->idlefunc=mt_idle_add(mainw->multitrack);
+    }
+    reget_afilesize(mainw->current_file);
+    get_play_times();
+    mainw->noswitch=FALSE;
+    return;
+  }
+
+  cfile->changed=TRUE;
+  d_print_done();
+
+  d_print(P_("New audio: %d Hz %d channel %d bps\n","New audio: %d Hz %d channels %d bps\n",cfile->achans),
+          cfile->arate,cfile->achans,cfile->asampsize);
+
+  mainw->com_failed=FALSE;
+  mainw->cancelled=CANCEL_NONE;
+  mainw->error=FALSE;
+  unlink(cfile->info_file);
+
+  com=lives_strdup_printf("%s commit_audio \"%s\" %d",prefs->backend,cfile->handle,israw);
+  lives_system(com,FALSE);
+  lives_free(com);
+
+  if (mainw->com_failed) {
+    cfile->arate=cfile->undo_arate;
+    cfile->achans=cfile->undo_achans;
+    cfile->asampsize=cfile->undo_asampsize;
+    cfile->signed_endian=cfile->undo_signed_endian;
+    cfile->arps=cfile->undo_arps;
+    cfile->undo_start=oundo_start;
+    cfile->undo_end=oundo_end;
+    sensitize();
+    if (mainw->multitrack!=NULL) {
+      mt_sensitise(mainw->multitrack);
+      mainw->multitrack->idlefunc=mt_idle_add(mainw->multitrack);
+    }
+    reget_afilesize(mainw->current_file);
+    get_play_times();
+    mainw->noswitch=FALSE;
+    return;
+  }
+
+  if (!do_auto_dialog(_("Committing audio"),0)) {
+    //cfile->may_be_damaged=TRUE;
+    d_print_failed();
+    if (mainw->multitrack!=NULL) {
+      mt_sensitise(mainw->multitrack);
+      mainw->multitrack->idlefunc=mt_idle_add(mainw->multitrack);
+    }
+    return;
+  }
+
+
+  if (prefs->save_directories) {
+    set_pref("audio_dir",mainw->audio_dir);
+  }
+  if (!prefs->conserve_space) {
+    cfile->undo_action=UNDO_NEW_AUDIO;
+    set_undoable(_("New Audio"),TRUE);
+  }
+
+  asigned=!(cfile->signed_endian&AFORM_UNSIGNED);
+  aendian=cfile->signed_endian&AFORM_BIG_ENDIAN;
+
+  save_clip_value(mainw->current_file,CLIP_DETAILS_ARATE,&cfile->arps);
+  if (mainw->com_failed||mainw->write_failed) bad_header=TRUE;
+  save_clip_value(mainw->current_file,CLIP_DETAILS_PB_ARATE,&cfile->arate);
+  if (mainw->com_failed||mainw->write_failed) bad_header=TRUE;
+  save_clip_value(mainw->current_file,CLIP_DETAILS_ACHANS,&cfile->achans);
+  if (mainw->com_failed||mainw->write_failed) bad_header=TRUE;
+  save_clip_value(mainw->current_file,CLIP_DETAILS_ASAMPS,&cfile->asampsize);
+  if (mainw->com_failed||mainw->write_failed) bad_header=TRUE;
+  save_clip_value(mainw->current_file,CLIP_DETAILS_AENDIAN,&aendian);
+  if (mainw->com_failed||mainw->write_failed) bad_header=TRUE;
+  save_clip_value(mainw->current_file,CLIP_DETAILS_ASIGNED,&asigned);
+  if (mainw->com_failed||mainw->write_failed) bad_header=TRUE;
+
+  if (bad_header) do_header_write_error(mainw->current_file);
+
+  switch_to_file(mainw->current_file,mainw->current_file);
+
+  mainw->noswitch=FALSE;
+
+  if (mainw->multitrack!=NULL) {
+    mt_sensitise(mainw->multitrack);
+    mainw->multitrack->idlefunc=mt_idle_add(mainw->multitrack);
+  }
+
+}
+
+
+
+
 void
-on_load_cdtrack_activate                (LiVESMenuItem     *menuitem,
-					 gpointer         user_data)
-{
+on_load_cdtrack_activate(LiVESMenuItem     *menuitem,
+                         livespointer         user_data) {
   LiVESWidget *cdtrack_dialog;
-  
+
   if (!strlen(prefs->cdplay_device)) {
-    do_error_dialog(_ ("Please set your CD play device in Tools | Preferences | Misc\n"));
+    do_error_dialog(_("Please set your CD play device in Tools | Preferences | Misc\n"));
     return;
   }
 
-  cdtrack_dialog = create_cdtrack_dialog (0,NULL);
-  lives_widget_show (cdtrack_dialog);
+  cdtrack_dialog = create_cdtrack_dialog(0,NULL);
+  lives_widget_show(cdtrack_dialog);
   mainw->fx1_val=1;
 
 }
 
 
 void
-on_eject_cd_activate                (LiVESMenuItem     *menuitem,
-				     gpointer         user_data)
-{
-  gchar *com=g_strdup_printf("eject \"%s\"",prefs->cdplay_device);
+on_eject_cd_activate(LiVESMenuItem     *menuitem,
+                     livespointer         user_data) {
+  char *com=lives_strdup_printf("eject \"%s\"",prefs->cdplay_device);
   lives_widget_context_update();
   lives_system(com,TRUE);
-  g_free(com);
+  lives_free(com);
 }
 
 
-void 
-on_load_cdtrack_ok_clicked                (LiVESButton     *button,
-					   gpointer         user_data)
-{
-  gchar *com,*mesg;
-  gchar **array;
+void
+on_load_cdtrack_ok_clicked(LiVESButton     *button,
+                           livespointer         user_data) {
+  char *com;
+  char **array;
   boolean was_new=FALSE;
   int new_file=mainw->first_free_file;
   int asigned,endian;
@@ -8286,57 +8228,55 @@
   if (mainw->current_file>-1) {
     if (!(prefs->warning_mask&WARN_MASK_LAYOUT_DELETE_AUDIO)) {
       if ((mainw->xlays=layout_audio_is_affected(mainw->current_file,0.))!=NULL) {
-	if (!do_warning_dialog(_("\nLoading new audio may cause missing audio in some multitrack layouts.\nAre you sure you wish to continue ?\n."))) {
-	  g_list_free_strings(mainw->xlays);
-	  g_list_free(mainw->xlays);
-	  mainw->xlays=NULL;
-	  return;
-	}
-	add_lmap_error(LMAP_ERROR_DELETE_AUDIO,cfile->name,(gpointer)cfile->layout_map,mainw->current_file,0,0.,
-		       cfile->stored_layout_audio>0.);
-	has_lmap_error=TRUE;
-	g_list_free_strings(mainw->xlays);
-	g_list_free(mainw->xlays);
-	mainw->xlays=NULL;
+        if (!do_warning_dialog(
+              _("\nLoading new audio may cause missing audio in some multitrack layouts.\nAre you sure you wish to continue ?\n."))) {
+          lives_list_free_strings(mainw->xlays);
+          lives_list_free(mainw->xlays);
+          mainw->xlays=NULL;
+          return;
+        }
+        add_lmap_error(LMAP_ERROR_DELETE_AUDIO,cfile->name,(livespointer)cfile->layout_map,mainw->current_file,0,0.,
+                       cfile->stored_layout_audio>0.);
+        has_lmap_error=TRUE;
+        lives_list_free_strings(mainw->xlays);
+        lives_list_free(mainw->xlays);
+        mainw->xlays=NULL;
       }
     }
-    
+
     if (!has_lmap_error&&!(prefs->warning_mask&WARN_MASK_LAYOUT_ALTER_AUDIO)&&
-	(mainw->xlays=layout_audio_is_affected(mainw->current_file,0.))!=NULL) {
+        (mainw->xlays=layout_audio_is_affected(mainw->current_file,0.))!=NULL) {
       if (!do_layout_alter_audio_warning()) {
-	g_list_free_strings(mainw->xlays);
-	g_list_free(mainw->xlays);
-	mainw->xlays=NULL;
-	return;
+        lives_list_free_strings(mainw->xlays);
+        lives_list_free(mainw->xlays);
+        mainw->xlays=NULL;
+        return;
       }
-      add_lmap_error(LMAP_ERROR_ALTER_AUDIO,cfile->name,(gpointer)cfile->layout_map,mainw->current_file,0,0.,
-		     cfile->stored_layout_audio>0.);
+      add_lmap_error(LMAP_ERROR_ALTER_AUDIO,cfile->name,(livespointer)cfile->layout_map,mainw->current_file,0,0.,
+                     cfile->stored_layout_audio>0.);
       has_lmap_error=TRUE;
-      g_list_free_strings(mainw->xlays);
-      g_list_free(mainw->xlays);
+      lives_list_free_strings(mainw->xlays);
+      lives_list_free(mainw->xlays);
       mainw->xlays=NULL;
     }
   }
 
-  mesg=g_strdup_printf(_ ("Opening CD track %d from %s..."),(int)mainw->fx1_val,prefs->cdplay_device);
-  d_print(mesg);
-  g_free(mesg);
+  d_print(_("Opening CD track %d from %s..."),(int)mainw->fx1_val,prefs->cdplay_device);
 
   if (mainw->current_file==-1) {
-    if (!get_new_handle(new_file,g_strdup_printf (_ ("CD track %d"),(int)mainw->fx1_val))) {
+    if (!get_new_handle(new_file,lives_strdup_printf(_("CD track %d"),(int)mainw->fx1_val))) {
       return;
     }
 
     mainw->current_file=new_file;
-    g_snprintf(cfile->type,40,"CD track %d on %s",(int)mainw->fx1_val,prefs->cdplay_device);
+    lives_snprintf(cfile->type,40,"CD track %d on %s",(int)mainw->fx1_val,prefs->cdplay_device);
     get_play_times();
     add_to_clipmenu();
     was_new=TRUE;
     cfile->opening=cfile->opening_audio=cfile->opening_only_audio=TRUE;
     cfile->hsize=DEFAULT_FRAME_HSIZE;
     cfile->vsize=DEFAULT_FRAME_VSIZE;
-  }
-  else {
+  } else {
     mainw->noswitch=TRUE;
 
     cfile->undo_arate=cfile->arate;
@@ -8346,12 +8286,12 @@
     cfile->undo_arps=cfile->arps;
   }
 
-  com=g_strdup_printf("%s cdopen \"%s\" %d",prefs->backend,cfile->handle,(int)mainw->fx1_val);
+  com=lives_strdup_printf("%s cdopen \"%s\" %d",prefs->backend,cfile->handle,(int)mainw->fx1_val);
 
   unlink(cfile->info_file);
   mainw->com_failed=FALSE;
   lives_system(com,FALSE);
-  g_free(com);
+  lives_free(com);
 
   if (mainw->com_failed) {
     cfile->arate=cfile->undo_arate;
@@ -8359,7 +8299,7 @@
     cfile->asampsize=cfile->undo_asampsize;
     cfile->signed_endian=cfile->undo_signed_endian;
     cfile->arps=cfile->undo_arps;
-    
+
     sensitize();
     reget_afilesize(mainw->current_file);
     get_play_times();
@@ -8370,7 +8310,7 @@
   }
 
 
-  if (!(do_progress_dialog(TRUE,TRUE,_ ("Opening CD track...")))) {
+  if (!(do_progress_dialog(TRUE,TRUE,_("Opening CD track...")))) {
     lives_widget_queue_draw(mainw->LiVES);
     lives_widget_context_update();
 
@@ -8378,11 +8318,11 @@
       mainw->com_failed=FALSE;
       mainw->cancelled=CANCEL_NONE;
       mainw->error=FALSE;
-      unlink (cfile->info_file);
+      unlink(cfile->info_file);
 
-      com=g_strdup_printf("%s cancel_audio \"%s\"",prefs->backend,cfile->handle);
+      com=lives_strdup_printf("%s cancel_audio \"%s\"",prefs->backend,cfile->handle);
       lives_system(com,FALSE);
-      g_free(com);
+      lives_free(com);
 
       if (!mainw->com_failed) do_auto_dialog(_("Cancelling"),0);
 
@@ -8391,7 +8331,7 @@
       cfile->asampsize=cfile->undo_asampsize;
       cfile->signed_endian=cfile->undo_signed_endian;
       cfile->arps=cfile->undo_arps;
-      
+
       sensitize();
       reget_afilesize(mainw->current_file);
       get_play_times();
@@ -8412,19 +8352,19 @@
   lives_widget_context_update();
 
   if (mainw->error) {
-    d_print(_ ("Error loading CD track\n"));
+    d_print(_("Error loading CD track\n"));
 
     lives_widget_queue_draw(mainw->LiVES);
     lives_widget_context_update();
 
     if (!was_new) {
-      com=g_strdup_printf("%s cancel_audio \"%s\"",prefs->backend,cfile->handle);
+      com=lives_strdup_printf("%s cancel_audio \"%s\"",prefs->backend,cfile->handle);
       mainw->cancelled=CANCEL_NONE;
       mainw->error=FALSE;
-      unlink (cfile->info_file);
+      unlink(cfile->info_file);
       mainw->com_failed=FALSE;
       lives_system(com,FALSE);
-      g_free(com);
+      lives_free(com);
 
       if (!mainw->com_failed) do_auto_dialog(_("Cancelling"),0);
 
@@ -8433,7 +8373,7 @@
       cfile->asampsize=cfile->undo_asampsize;
       cfile->signed_endian=cfile->undo_signed_endian;
       cfile->arps=cfile->undo_arps;
-      
+
       sensitize();
       reget_afilesize(mainw->current_file);
       get_play_times();
@@ -8444,12 +8384,12 @@
     return;
   }
 
-  array=g_strsplit(mainw->msg,"|",5);
+  array=lives_strsplit(mainw->msg,"|",5);
   cfile->arate=atoi(array[1]);
   cfile->achans=atoi(array[2]);
   cfile->asampsize=atoi(array[3]);
   cfile->afilesize=strtol(array[4],NULL,10);
-  g_strfreev(array);
+  lives_strfreev(array);
 
   if (!was_new&&cfile->undo_arate>0) cfile->arps=cfile->undo_arps/cfile->undo_arate*cfile->arate;
   else cfile->arps=cfile->arate;
@@ -8458,16 +8398,16 @@
   endian=cfile->signed_endian&AFORM_BIG_ENDIAN;
 
   if (cfile->afilesize==0l) {
-    d_print(_ ("Error loading CD track\n"));
-  
+    d_print(_("Error loading CD track\n"));
+
     if (!was_new) {
-      com=g_strdup_printf("%s cancel_audio \"%s\"",prefs->backend,cfile->handle);
+      com=lives_strdup_printf("%s cancel_audio \"%s\"",prefs->backend,cfile->handle);
       mainw->com_failed=FALSE;
       mainw->cancelled=CANCEL_NONE;
       mainw->error=FALSE;
-      unlink (cfile->info_file);
+      unlink(cfile->info_file);
       lives_system(com,FALSE);
-      g_free(com);
+      lives_free(com);
 
       if (!mainw->com_failed) do_auto_dialog(_("Cancelling"),0);
 
@@ -8490,11 +8430,11 @@
   mainw->cancelled=CANCEL_NONE;
   mainw->error=FALSE;
   mainw->com_failed=FALSE;
-  unlink (cfile->info_file);
+  unlink(cfile->info_file);
 
-  com=g_strdup_printf("%s commit_audio \"%s\"",prefs->backend,cfile->handle);
+  com=lives_strdup_printf("%s commit_audio \"%s\"",prefs->backend,cfile->handle);
   lives_system(com, FALSE);
-  g_free(com);
+  lives_free(com);
 
   if (mainw->com_failed) {
     d_print_failed();
@@ -8503,9 +8443,9 @@
     cfile->arps=cfile->undo_arps;
     cfile->asampsize=cfile->undo_asampsize;
     cfile->signed_endian=cfile->undo_signed_endian;
-    
+
     reget_afilesize(mainw->current_file);
-    
+
     mainw->noswitch=FALSE;
     if (was_new) close_current_file(0);
     return;
@@ -8535,44 +8475,38 @@
   get_play_times();
   cfile->changed=TRUE;
   d_print_done();
-  mesg=g_strdup_printf(P_("New audio: %d Hz %d channel %d bps\n","New audio: %d Hz %d channels %d bps\n",cfile->achans),
-		       cfile->arate,cfile->achans,cfile->asampsize);
-  d_print(mesg);
-  g_free(mesg);
-  
+  d_print(P_("New audio: %d Hz %d channel %d bps\n","New audio: %d Hz %d channels %d bps\n",cfile->achans),
+          cfile->arate,cfile->achans,cfile->asampsize);
+
   if (!was_new) {
     if (!prefs->conserve_space) {
       cfile->undo_action=UNDO_NEW_AUDIO;
-      set_undoable (_("New Audio"),TRUE);
+      set_undoable(_("New Audio"),TRUE);
     }
   }
 
   lives_widget_set_sensitive(mainw->loop_video,TRUE);
   mainw->noswitch=FALSE;
 
-#ifdef ENABLE_OSC
-    lives_osc_notify(LIVES_OSC_NOTIFY_CLIP_OPENED,"");
-#endif
+  lives_notify(LIVES_OSC_NOTIFY_CLIP_OPENED,"");
 
 }
 
-void on_load_vcd_ok_clicked (LiVESButton *button, gpointer         user_data)
-{
+void on_load_vcd_ok_clicked(LiVESButton *button, livespointer         user_data) {
   lives_general_button_clicked(button,NULL);
-  if (GPOINTER_TO_INT (user_data)==1) {
-    g_snprintf (file_name,PATH_MAX,"dvd://%d",(int)mainw->fx1_val);
-    if (mainw->file_open_params!=NULL) g_free(mainw->file_open_params);
-    mainw->file_open_params=g_strdup_printf ("-chapter %d -aid %d",(int)mainw->fx2_val,(int)mainw->fx3_val);
-  }
-  else {
-    g_snprintf (file_name,PATH_MAX,"vcd://%d",(int)mainw->fx1_val);
+  if (LIVES_POINTER_TO_INT(user_data)==1) {
+    lives_snprintf(file_name,PATH_MAX,"dvd://%d",(int)mainw->fx1_val);
+    if (mainw->file_open_params!=NULL) lives_free(mainw->file_open_params);
+    mainw->file_open_params=lives_strdup_printf("-chapter %d -aid %d",(int)mainw->fx2_val,(int)mainw->fx3_val);
+  } else {
+    lives_snprintf(file_name,PATH_MAX,"vcd://%d",(int)mainw->fx1_val);
   }
   open_sel_range_activate();
 }
 
 
 
-void popup_lmap_errors(LiVESMenuItem *menuitem, gpointer user_data) {
+void popup_lmap_errors(LiVESMenuItem *menuitem, livespointer user_data) {
   // popup layout map errors dialog
   LiVESWidget *dialog_action_area,*vbox;
   LiVESWidget *button;
@@ -8584,81 +8518,73 @@
   textwindow=create_text_window(_("layout errors"),NULL,mainw->layout_textbuffer);
   widget_opts.expand=LIVES_EXPAND_DEFAULT;
 
-  dialog_action_area = lives_dialog_get_action_area(LIVES_DIALOG (textwindow->dialog));
+  dialog_action_area = lives_dialog_get_action_area(LIVES_DIALOG(textwindow->dialog));
 
-  lives_button_box_set_layout (LIVES_BUTTON_BOX (dialog_action_area), LIVES_BUTTONBOX_SPREAD);
+  lives_button_box_set_layout(LIVES_BUTTON_BOX(dialog_action_area), LIVES_BUTTONBOX_SPREAD);
 
   vbox = lives_dialog_get_content_area(LIVES_DIALOG(textwindow->dialog));
 
   add_warn_check(LIVES_BOX(vbox),WARN_MASK_LAYOUT_POPUP);
 
-  button = lives_button_new_with_mnemonic (_("Close _Window"));
+  button = lives_button_new_with_mnemonic(_("Close _Window"));
 
-  lives_dialog_add_action_widget (LIVES_DIALOG (textwindow->dialog), button, LIVES_RESPONSE_OK);
+  lives_dialog_add_action_widget(LIVES_DIALOG(textwindow->dialog), button, LIVES_RESPONSE_OK);
 
-  lives_signal_connect (LIVES_GUI_OBJECT (button), LIVES_WIDGET_CLICKED_EVENT,
-		    LIVES_GUI_CALLBACK (lives_general_button_clicked),
-		    textwindow);
+  lives_signal_connect(LIVES_GUI_OBJECT(button), LIVES_WIDGET_CLICKED_SIGNAL,
+                       LIVES_GUI_CALLBACK(lives_general_button_clicked),
+                       textwindow);
 
-  lives_container_set_border_width (LIVES_CONTAINER (button), widget_opts.border_width);
-  lives_widget_set_can_focus_and_default (button);
+  lives_container_set_border_width(LIVES_CONTAINER(button), widget_opts.border_width);
+  lives_widget_set_can_focus_and_default(button);
 
-  textwindow->clear_button = lives_button_new_with_mnemonic (_("Clear _Errors"));
+  textwindow->clear_button = lives_button_new_with_mnemonic(_("Clear _Errors"));
 
-  lives_dialog_add_action_widget (LIVES_DIALOG (textwindow->dialog), textwindow->clear_button, LIVES_RESPONSE_CANCEL);
+  lives_dialog_add_action_widget(LIVES_DIALOG(textwindow->dialog), textwindow->clear_button, LIVES_RESPONSE_CANCEL);
 
-  lives_signal_connect (LIVES_GUI_OBJECT (textwindow->clear_button), LIVES_WIDGET_CLICKED_EVENT,
-		    LIVES_GUI_CALLBACK (on_lerrors_clear_clicked),
-		    GINT_TO_POINTER(FALSE));
+  lives_signal_connect(LIVES_GUI_OBJECT(textwindow->clear_button), LIVES_WIDGET_CLICKED_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_lerrors_clear_clicked),
+                       LIVES_INT_TO_POINTER(FALSE));
 
-  lives_container_set_border_width (LIVES_CONTAINER (textwindow->clear_button), widget_opts.border_width);
-  lives_widget_set_can_focus_and_default (textwindow->clear_button);
+  lives_container_set_border_width(LIVES_CONTAINER(textwindow->clear_button), widget_opts.border_width);
+  lives_widget_set_can_focus_and_default(textwindow->clear_button);
 
-  textwindow->delete_button = lives_button_new_with_mnemonic (_("_Delete affected layouts"));
+  textwindow->delete_button = lives_button_new_with_mnemonic(_("_Delete affected layouts"));
 
-  lives_dialog_add_action_widget (LIVES_DIALOG (textwindow->dialog), textwindow->delete_button, LIVES_RESPONSE_CANCEL);
+  lives_dialog_add_action_widget(LIVES_DIALOG(textwindow->dialog), textwindow->delete_button, LIVES_RESPONSE_CANCEL);
 
-  lives_container_set_border_width (LIVES_CONTAINER (textwindow->delete_button), widget_opts.border_width);
-  lives_widget_set_can_focus_and_default (textwindow->delete_button);
+  lives_container_set_border_width(LIVES_CONTAINER(textwindow->delete_button), widget_opts.border_width);
+  lives_widget_set_can_focus_and_default(textwindow->delete_button);
 
-  lives_signal_connect (LIVES_GUI_OBJECT (textwindow->delete_button), LIVES_WIDGET_CLICKED_EVENT,
-		    LIVES_GUI_CALLBACK (on_lerrors_delete_clicked),
-		    NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(textwindow->delete_button), LIVES_WIDGET_CLICKED_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_lerrors_delete_clicked),
+                       NULL);
 
   lives_widget_show_all(textwindow->dialog);
-  
+
 }
 
 
 
-void
-on_rename_activate                    (LiVESMenuItem     *menuitem,
-				       gpointer         user_data)
-{
+void on_rename_activate(LiVESMenuItem *menuitem, livespointer user_data) {
   renamew=create_rename_dialog(1);
   lives_widget_show(renamew->dialog);
-
 }
 
 
-void
-on_rename_set_name                   (LiVESButton       *button,
-				      gpointer         user_data)
-{
-  gchar title[256];
+void on_rename_set_name(LiVESButton *button, livespointer user_data) {
+  char title[256];
   boolean bad_header=FALSE;
 
   if (user_data==NULL) {
-    g_snprintf(title,256,"%s",lives_entry_get_text(LIVES_ENTRY(renamew->entry)));
+    lives_snprintf(title,256,"%s",lives_entry_get_text(LIVES_ENTRY(renamew->entry)));
     lives_widget_destroy(renamew->dialog);
-    g_free(renamew);
-  }
-  else g_snprintf(title,256,"%s",(gchar *)user_data);
+    lives_free(renamew);
+  } else lives_snprintf(title,256,"%s",(char *)user_data);
 
   if (!(strlen(title))) return;
 
   set_menu_text(cfile->menuentry,title,FALSE);
-  g_snprintf (cfile->name,256,"%s",title);
+  lives_snprintf(cfile->name,256,"%s",title);
 
   if (user_data==NULL) {
     set_main_title(title,0);
@@ -8672,68 +8598,68 @@
 }
 
 
-void on_toy_activate  (LiVESMenuItem *menuitem, gpointer user_data) {
+void on_toy_activate(LiVESMenuItem *menuitem, livespointer user_data) {
 #ifdef ENABLE_OSC
 #ifndef IS_MINGW
-  gchar string[PATH_MAX];
+  char string[PATH_MAX];
 #endif
-  gchar *com;
+  char *com;
 #endif
 
-  if (menuitem!=NULL&&mainw->toy_type==GPOINTER_TO_INT(user_data)) {
+  if (menuitem!=NULL&&mainw->toy_type==LIVES_POINTER_TO_INT(user_data)) {
     // switch is off
-    user_data=GINT_TO_POINTER(LIVES_TOY_NONE);
+    user_data=LIVES_INT_TO_POINTER(LIVES_TOY_NONE);
   }
 
   switch (mainw->toy_type) {
     // old status
   case LIVES_TOY_AUTOLIVES:
-    lives_signal_handler_block (mainw->toy_autolives, mainw->toy_func_autolives);
+    lives_signal_handler_block(mainw->toy_autolives, mainw->toy_func_autolives);
     lives_check_menu_item_set_active(LIVES_CHECK_MENU_ITEM(mainw->toy_autolives),FALSE);
-    lives_signal_handler_unblock (mainw->toy_autolives, mainw->toy_func_autolives);
+    lives_signal_handler_unblock(mainw->toy_autolives, mainw->toy_func_autolives);
 
     if (mainw->toy_alives_pgid>1) {
       lives_killpg(mainw->toy_alives_pgid,LIVES_SIGHUP);
     }
 
     // switch off rte so as not to cause alarm
-    if (mainw->autolives_reset_fx) 
-      rte_on_off_callback(NULL,NULL,0,(LiVESXModifierType)0,GINT_TO_POINTER(0));
+    if (mainw->autolives_reset_fx)
+      rte_on_off_callback(NULL,NULL,0,(LiVESXModifierType)0,LIVES_INT_TO_POINTER(0));
     mainw->autolives_reset_fx=FALSE;
     break;
 
   case LIVES_TOY_MAD_FRAMES:
-    lives_signal_handler_block (mainw->toy_random_frames, mainw->toy_func_random_frames);
+    lives_signal_handler_block(mainw->toy_random_frames, mainw->toy_func_random_frames);
     lives_check_menu_item_set_active(LIVES_CHECK_MENU_ITEM(mainw->toy_random_frames),FALSE);
-    lives_signal_handler_unblock (mainw->toy_random_frames, mainw->toy_func_random_frames);
+    lives_signal_handler_unblock(mainw->toy_random_frames, mainw->toy_func_random_frames);
     if (mainw->playing_file>-1) {
       if (mainw->faded) {
-	lives_widget_hide(mainw->start_image);
-	lives_widget_hide(mainw->end_image);
+        lives_widget_hide(mainw->start_image);
+        lives_widget_hide(mainw->end_image);
       }
-      load_start_image (cfile->start);
-      load_end_image (cfile->end);
+      load_start_image(cfile->start);
+      load_end_image(cfile->end);
     }
     break;
   case LIVES_TOY_TV:
-    lives_signal_handler_block (mainw->toy_tv, mainw->toy_func_lives_tv);
+    lives_signal_handler_block(mainw->toy_tv, mainw->toy_func_lives_tv);
     lives_check_menu_item_set_active(LIVES_CHECK_MENU_ITEM(mainw->toy_tv),FALSE);
-    lives_signal_handler_unblock (mainw->toy_tv, mainw->toy_func_lives_tv);
+    lives_signal_handler_unblock(mainw->toy_tv, mainw->toy_func_lives_tv);
     break;
   default:
-    lives_signal_handler_block (mainw->toy_none, mainw->toy_func_none);
+    lives_signal_handler_block(mainw->toy_none, mainw->toy_func_none);
     lives_check_menu_item_set_active(LIVES_CHECK_MENU_ITEM(mainw->toy_none),FALSE);
-    lives_signal_handler_unblock (mainw->toy_none, mainw->toy_func_none);
+    lives_signal_handler_unblock(mainw->toy_none, mainw->toy_func_none);
     break;
   }
 
-  mainw->toy_type=(lives_toy_t)GPOINTER_TO_INT(user_data);
+  mainw->toy_type=(lives_toy_t)LIVES_POINTER_TO_INT(user_data);
 
   switch (mainw->toy_type) {
   case LIVES_TOY_NONE:
-    lives_signal_handler_block (mainw->toy_none, mainw->toy_func_none);
+    lives_signal_handler_block(mainw->toy_none, mainw->toy_func_none);
     lives_check_menu_item_set_active(LIVES_CHECK_MENU_ITEM(mainw->toy_none),TRUE);
-    lives_signal_handler_unblock (mainw->toy_none, mainw->toy_func_none);
+    lives_signal_handler_unblock(mainw->toy_none, mainw->toy_func_none);
     return;
 #ifdef ENABLE_OSC
   case LIVES_TOY_AUTOLIVES:
@@ -8744,16 +8670,16 @@
     }
 
     if ((mainw->current_file>-1&&cfile!=NULL&&(
-					       cfile->event_list!=NULL || 
-					       cfile->opening
-					       )) ||
-	mainw->multitrack!=NULL || 
-	mainw->is_processing ||
-	mainw->preview
-	) {
+           cfile->event_list!=NULL ||
+           cfile->opening
+         )) ||
+        mainw->multitrack!=NULL ||
+        mainw->is_processing ||
+        mainw->preview
+       ) {
       // ignore if doing something more important
-    
-      on_toy_activate(NULL, GINT_TO_POINTER(LIVES_TOY_NONE));
+
+      on_toy_activate(NULL, LIVES_INT_TO_POINTER(LIVES_TOY_NONE));
       return;
     }
 
@@ -8763,9 +8689,9 @@
       get_location("autolives.pl",string,PATH_MAX);
       if (strlen(string)) capable->has_autolives=TRUE;
       else {
-	do_no_autolives_error();
-	on_toy_activate(NULL, GINT_TO_POINTER(LIVES_TOY_NONE));
-	return;
+        do_no_autolives_error();
+        on_toy_activate(NULL, LIVES_INT_TO_POINTER(LIVES_TOY_NONE));
+        return;
       }
     }
 #endif
@@ -8773,16 +8699,16 @@
     // chek if osc is started; if not ask permission
     if (!prefs->osc_udp_started) {
       if (!lives_ask_permission(LIVES_PERM_OSC_PORTS)) {
-	// permission not given
-	on_toy_activate(NULL, GINT_TO_POINTER(LIVES_TOY_NONE));
-	return;
+        // permission not given
+        on_toy_activate(NULL, LIVES_INT_TO_POINTER(LIVES_TOY_NONE));
+        return;
       }
 
       // try: start up osc
       prefs->osc_udp_started=lives_osc_init(prefs->osc_udp_port);
       if (!prefs->osc_udp_started) {
-	on_toy_activate(NULL, GINT_TO_POINTER(LIVES_TOY_NONE));
-	return;
+        on_toy_activate(NULL, LIVES_INT_TO_POINTER(LIVES_TOY_NONE));
+        return;
       }
     }
 
@@ -8792,15 +8718,15 @@
     }
 
 #ifndef IS_MINGW
-    com=g_strdup_printf("autolives.pl localhost %d %d >/dev/null 2>&1",prefs->osc_udp_port,prefs->osc_udp_port-1);
+    com=lives_strdup_printf("autolives.pl localhost %d %d >/dev/null 2>&1",prefs->osc_udp_port,prefs->osc_udp_port-1);
 #else
-    com=g_strdup_printf("START /MIN /B perl \"%s\\bin\\autolives.pl\" localhost %d %d >NUL 2>&1",
-			prefs->prefix_dir,prefs->osc_udp_port,prefs->osc_udp_port-1);
+    com=lives_strdup_printf("START /MIN /B perl \"%s\\bin\\autolives.pl\" localhost %d %d >NUL 2>&1",
+                            prefs->prefix_dir,prefs->osc_udp_port,prefs->osc_udp_port-1);
 #endif
 
     mainw->toy_alives_pgid=lives_fork(com);
 
-    g_free(com);
+    lives_free(com);
 
     break;
 #endif
@@ -8808,16 +8734,15 @@
     break;
   case LIVES_TOY_TV:
     // load in the lives TV clip
-    deduce_file (LIVES_TV_CHANNEL1,0.,0);
+    deduce_file(LIVES_TV_CHANNEL1,0.,0);
 
     // if we choose to discard it, discard it....otherwise keep it
     if (prefs->discard_tv) {
       close_current_file(0);
-    }
-    else {
+    } else {
       // keep it
       int current_file=mainw->current_file;
-      gchar *com=g_strdup_printf("%s commit_audio \"%s\"",prefs->backend,cfile->handle);
+      char *com=lives_strdup_printf("%s commit_audio \"%s\"",prefs->backend,cfile->handle);
       cfile->start=1;
       get_frame_count(mainw->current_file);
       cfile->end=cfile->frames;
@@ -8842,9 +8767,8 @@
 
 
 void
-on_preview_spinbutton_changed          (LiVESSpinButton   *spinbutton,
-					gpointer         user_data)
-{
+on_preview_spinbutton_changed(LiVESSpinButton   *spinbutton,
+                              livespointer         user_data) {
   // update the play window preview
   int preview_frame=lives_spin_button_get_value_as_int(spinbutton);
   if ((preview_frame)==mainw->preview_frame) return;
@@ -8853,26 +8777,22 @@
 }
 
 void
-on_prv_link_toggled                (LiVESToggleButton *togglebutton,
-				    gpointer         user_data)
-{
+on_prv_link_toggled(LiVESToggleButton *togglebutton,
+                    livespointer         user_data) {
   if (!lives_toggle_button_get_active(togglebutton)) return;
-  mainw->prv_link=GPOINTER_TO_INT(user_data);
+  mainw->prv_link=LIVES_POINTER_TO_INT(user_data);
   if (mainw->is_processing&&(mainw->prv_link==PRV_START||mainw->prv_link==PRV_END)) {
     // block spinbutton in play window
     lives_widget_set_sensitive(mainw->preview_spinbutton,FALSE);
-  }
-  else {
+  } else {
     lives_widget_set_sensitive(mainw->preview_spinbutton,TRUE);
   }
   load_preview_image(FALSE);
-  lives_widget_grab_focus (mainw->preview_spinbutton);
+  lives_widget_grab_focus(mainw->preview_spinbutton);
 }
 
-void
-on_spinbutton_start_value_changed          (LiVESSpinButton   *spinbutton,
-					    gpointer         user_data)
-{
+
+void on_spinbutton_start_value_changed(LiVESSpinButton *spinbutton, livespointer user_data) {
   int start,ostart=cfile->start;
 
   if (mainw->playing_file==-1&&mainw->current_file==0) return;
@@ -8884,11 +8804,10 @@
     cfile->end+=cfile->start-ostart;
     if (cfile->end>cfile->frames) {
       lives_spin_button_set_value(LIVES_SPIN_BUTTON(mainw->spinbutton_start),cfile->start-cfile->end+cfile->frames);
-    }
-    else {
+    } else {
       mainw->selwidth_locked=FALSE;
       lives_spin_button_set_value(LIVES_SPIN_BUTTON(mainw->spinbutton_end),cfile->end);
-      load_end_image (cfile->end);
+      load_end_image(cfile->end);
       mainw->selwidth_locked=TRUE;
     }
   }
@@ -8896,8 +8815,7 @@
   else {
     if ((cfile->start==1||cfile->end==cfile->frames)&&!(cfile->start==1&&cfile->end==cfile->frames)) {
       lives_widget_set_sensitive(mainw->select_invert,TRUE);
-    }
-    else {
+    } else {
       lives_widget_set_sensitive(mainw->select_invert,FALSE);
     }
   }
@@ -8918,10 +8836,7 @@
 
 
 
-void
-on_spinbutton_end_value_changed          (LiVESSpinButton   *spinbutton,
-					  gpointer         user_data)
-{
+void on_spinbutton_end_value_changed(LiVESSpinButton *spinbutton, livespointer user_data) {
   int end,oend=cfile->end;
 
   if (mainw->playing_file==-1&&mainw->current_file==0) return;
@@ -8934,11 +8849,10 @@
     cfile->start+=cfile->end-oend;
     if (cfile->start<1) {
       lives_spin_button_set_value(LIVES_SPIN_BUTTON(mainw->spinbutton_end),cfile->end-cfile->start+1);
-    }
-    else {
+    } else {
       mainw->selwidth_locked=FALSE;
       lives_spin_button_set_value(LIVES_SPIN_BUTTON(mainw->spinbutton_start),cfile->start);
-      load_start_image (cfile->start);
+      load_start_image(cfile->start);
       mainw->selwidth_locked=TRUE;
     }
   }
@@ -8946,8 +8860,7 @@
   else {
     if ((cfile->start==1||cfile->end==cfile->frames)&&!(cfile->start==1&&cfile->end==cfile->frames)) {
       lives_widget_set_sensitive(mainw->select_invert,TRUE);
-    }
-    else {
+    } else {
       lives_widget_set_sensitive(mainw->select_invert,FALSE);
     }
   }
@@ -8973,11 +8886,11 @@
 // for the timer bars
 
 #if GTK_CHECK_VERSION(3,0,0)
-boolean expose_vid_event (LiVESWidget *widget, lives_painter_t *cr, gpointer user_data) {
-  GdkEventExpose *event=NULL;
+boolean expose_vid_event(LiVESWidget *widget, lives_painter_t *cr, livespointer user_data) {
+  LiVESXEventExpose *event=NULL;
   boolean dest_cr=FALSE;
 #else
-boolean expose_vid_event (LiVESWidget *widget, GdkEventExpose *event) {
+boolean expose_vid_event(LiVESWidget *widget, LiVESXEventExpose *event) {
   lives_painter_t *cr=lives_painter_create_from_widget(mainw->video_draw);
   boolean dest_cr=TRUE;
 #endif
@@ -8991,7 +8904,7 @@
 
   if (!prefs->show_gui||mainw->multitrack!=NULL||
       (mainw->fs&&(prefs->play_monitor==prefs->gui_monitor||
-		   prefs->play_monitor==0)&&mainw->playing_file>-1&&
+                   prefs->play_monitor==0)&&mainw->playing_file>-1&&
        !(mainw->ext_playback&&!(mainw->vpp->capabilities&VPP_LOCAL_DISPLAY)))||
       mainw->foreign) {
     return FALSE;
@@ -9004,8 +8917,7 @@
     ey=event->area.y;
     ew=event->area.width;
     eh=event->area.height;
-  }
-  else {
+  } else {
     ex=ey=0;
     ew=lives_widget_get_allocation_width(mainw->video_draw);
     eh=lives_widget_get_allocation_height(mainw->video_draw);
@@ -9016,7 +8928,7 @@
   if (mainw->video_drawable!=NULL) {
     // check if a resize happened
 
-    width = lives_painter_image_surface_get_width (mainw->video_drawable);
+    width = lives_painter_image_surface_get_width(mainw->video_drawable);
 
     if (width!=lives_widget_get_allocation_width(mainw->LiVES)) {
       lives_painter_surface_destroy(mainw->video_drawable);
@@ -9026,9 +8938,9 @@
 
   if (mainw->video_drawable==NULL) {
     mainw->video_drawable = lives_painter_surface_create_from_widget(mainw->video_draw,
-								       LIVES_PAINTER_CONTENT_COLOR,
-								       lives_widget_get_allocation_width(mainw->video_draw),
-								       lives_widget_get_allocation_height(mainw->video_draw));
+                            LIVES_PAINTER_CONTENT_COLOR,
+                            lives_widget_get_allocation_width(mainw->video_draw),
+                            lives_widget_get_allocation_height(mainw->video_draw));
     block_expose();
     get_play_times();
     unblock_expose();
@@ -9041,20 +8953,20 @@
 
     lives_painter_set_source_to_bg(cr2,mainw->video_draw);
     lives_painter_rectangle(cr2,0,0,
-		    lives_widget_get_allocation_width(mainw->video_draw),
-		    lives_widget_get_allocation_height(mainw->video_draw));
+                            lives_widget_get_allocation_width(mainw->video_draw),
+                            lives_widget_get_allocation_height(mainw->video_draw));
     lives_painter_fill(cr2);
     lives_painter_destroy(cr2);
   }
 
-  lives_painter_set_source_surface (cr, mainw->video_drawable,0.,0.);
-  lives_painter_rectangle (cr,ex,ey,ew,eh);
-  lives_painter_paint(cr);
+  lives_painter_set_source_surface(cr, mainw->video_drawable,0.,0.);
+  lives_painter_rectangle(cr,ex,ey,ew,eh);
+  lives_painter_fill(cr);
 
   if (dest_cr) lives_painter_destroy(cr);
 
   return TRUE;
-  
+
 }
 
 
@@ -9065,7 +8977,7 @@
   if (mainw->laudio_drawable!=NULL) {
     // check if a resize happened
 
-    width = lives_painter_image_surface_get_width (mainw->laudio_drawable);
+    width = lives_painter_image_surface_get_width(mainw->laudio_drawable);
 
     if (width!=lives_widget_get_allocation_width(mainw->LiVES)) {
       lives_painter_surface_destroy(mainw->laudio_drawable);
@@ -9075,9 +8987,9 @@
 
   if (mainw->laudio_drawable==NULL) {
     mainw->laudio_drawable = lives_painter_surface_create_from_widget(mainw->laudio_draw,
-							       LIVES_PAINTER_CONTENT_COLOR,
-							       lives_widget_get_allocation_width(mainw->laudio_draw),
-							       lives_widget_get_allocation_height(mainw->laudio_draw));
+                             LIVES_PAINTER_CONTENT_COLOR,
+                             lives_widget_get_allocation_width(mainw->laudio_draw),
+                             lives_widget_get_allocation_height(mainw->laudio_draw));
 
     block_expose();
     get_play_times();
@@ -9093,15 +9005,15 @@
     lives_painter_t *cr2=lives_painter_create(mainw->laudio_drawable);
     lives_painter_set_source_to_bg(cr2,mainw->laudio_draw);
     lives_painter_rectangle(cr2,0,0,
-		    lives_widget_get_allocation_width(mainw->laudio_draw),
-		    lives_widget_get_allocation_height(mainw->laudio_draw));
+                            lives_widget_get_allocation_width(mainw->laudio_draw),
+                            lives_widget_get_allocation_height(mainw->laudio_draw));
     lives_painter_fill(cr2);
     lives_painter_destroy(cr2);
   }
 
-  lives_painter_set_source_surface (cr, mainw->laudio_drawable,0.,0.);
-  lives_painter_rectangle (cr,ex,ey,ew,eh);
-  lives_painter_paint(cr);
+  lives_painter_set_source_surface(cr, mainw->laudio_drawable,0.,0.);
+  lives_painter_rectangle(cr,ex,ey,ew,eh);
+  lives_painter_fill(cr);
 
 }
 
@@ -9115,7 +9027,7 @@
   if (mainw->raudio_drawable!=NULL) {
     // check if a resize happened
 
-    width = lives_painter_image_surface_get_width (mainw->raudio_drawable);
+    width = lives_painter_image_surface_get_width(mainw->raudio_drawable);
 
     if (width!=lives_widget_get_allocation_width(mainw->LiVES)) {
       lives_painter_surface_destroy(mainw->raudio_drawable);
@@ -9125,9 +9037,9 @@
 
   if (mainw->raudio_drawable==NULL) {
     mainw->raudio_drawable = lives_painter_surface_create_from_widget(mainw->raudio_draw,
-							       LIVES_PAINTER_CONTENT_COLOR,
-							       lives_widget_get_allocation_width(mainw->raudio_draw),
-							       lives_widget_get_allocation_height(mainw->raudio_draw));
+                             LIVES_PAINTER_CONTENT_COLOR,
+                             lives_widget_get_allocation_width(mainw->raudio_draw),
+                             lives_widget_get_allocation_height(mainw->raudio_draw));
 
 
     block_expose();
@@ -9135,23 +9047,23 @@
     unblock_expose();
   }
 
-  // TODO - *** 
+  // TODO - ***
   if (mainw->current_file==-1) {
     lives_painter_t *cr2=lives_painter_create(mainw->raudio_drawable);
     lives_painter_set_source_to_bg(cr2,mainw->raudio_draw);
 
     lives_painter_rectangle(cr2,0,0,
-		    lives_widget_get_allocation_width(mainw->raudio_draw),
-		    lives_widget_get_allocation_height(mainw->raudio_draw));
+                            lives_widget_get_allocation_width(mainw->raudio_draw),
+                            lives_widget_get_allocation_height(mainw->raudio_draw));
     lives_painter_fill(cr2);
     lives_painter_destroy(cr2);
 
   }
 
 
-  lives_painter_set_source_surface (cr, mainw->raudio_drawable, 0., 0.);
-  lives_painter_rectangle (cr,ex,ey,ew,eh);
-  lives_painter_paint(cr);
+  lives_painter_set_source_surface(cr, mainw->raudio_drawable, 0., 0.);
+  lives_painter_rectangle(cr,ex,ey,ew,eh);
+  lives_painter_fill(cr);
 
   if (1||mainw->current_file==-1) mainw->blank_raudio_drawable=mainw->raudio_drawable;
   else cfile->raudio_drawable=mainw->raudio_drawable;
@@ -9163,11 +9075,11 @@
 
 
 #if GTK_CHECK_VERSION(3,0,0)
-boolean expose_laud_event (LiVESWidget *widget, lives_painter_t *cr, gpointer user_data) {
-  GdkEventExpose *event=NULL;
+boolean expose_laud_event(LiVESWidget *widget, lives_painter_t *cr, livespointer user_data) {
+  LiVESXEventExpose *event=NULL;
   boolean need_cr=TRUE;
 #else
-boolean expose_laud_event (LiVESWidget *widget, GdkEventExpose *event) {
+boolean expose_laud_event(LiVESWidget *widget, LiVESXEventExpose *event) {
   lives_painter_t *cr;
   boolean need_cr=TRUE;
 #endif
@@ -9179,7 +9091,7 @@
 
   if (!prefs->show_gui||mainw->multitrack!=NULL||
       (mainw->fs&&(prefs->play_monitor==prefs->gui_monitor||
-		   prefs->play_monitor==0)&&mainw->playing_file>-1&&
+                   prefs->play_monitor==0)&&mainw->playing_file>-1&&
        !(mainw->ext_playback&&!(mainw->vpp->capabilities&VPP_LOCAL_DISPLAY)))||
       mainw->foreign) {
     return FALSE;
@@ -9192,8 +9104,7 @@
     ey=event->area.y;
     ew=event->area.width;
     eh=event->area.height;
-  }
-  else {
+  } else {
     ex=ey=0;
     ew=lives_widget_get_allocation_width(mainw->laudio_draw);
     eh=lives_widget_get_allocation_height(mainw->laudio_draw);
@@ -9206,17 +9117,17 @@
   if (need_cr) lives_painter_destroy(cr);
 
   return TRUE;
-  
+
 }
 
 
 
 #if GTK_CHECK_VERSION(3,0,0)
-boolean expose_raud_event (LiVESWidget *widget, lives_painter_t *cr, gpointer user_data) {
-  GdkEventExpose *event=NULL;
+boolean expose_raud_event(LiVESWidget *widget, lives_painter_t *cr, livespointer user_data) {
+  LiVESXEventExpose *event=NULL;
   boolean need_cr=FALSE;
 #else
-boolean expose_raud_event (LiVESWidget *widget, GdkEventExpose *event) {
+boolean expose_raud_event(LiVESWidget *widget, LiVESXEventExpose *event) {
   lives_painter_t *cr;
   boolean need_cr=TRUE;
 #endif
@@ -9228,7 +9139,7 @@
 
   if (!prefs->show_gui||mainw->multitrack!=NULL||
       (mainw->fs&&(prefs->play_monitor==prefs->gui_monitor||
-		   prefs->play_monitor==0)&&mainw->playing_file>-1&&
+                   prefs->play_monitor==0)&&mainw->playing_file>-1&&
        !(mainw->ext_playback&&!(mainw->vpp->capabilities&VPP_LOCAL_DISPLAY)))||
       mainw->foreign) {
     return FALSE;
@@ -9241,8 +9152,7 @@
     ey=event->area.y;
     ew=event->area.width;
     eh=event->area.height;
-  }
-  else {
+  } else {
     ex=ey=0;
     ew=lives_widget_get_allocation_width(mainw->raudio_draw);
     eh=lives_widget_get_allocation_height(mainw->raudio_draw);
@@ -9255,12 +9165,12 @@
   if (need_cr) lives_painter_destroy(cr);
 
   return TRUE;
-  
+
 }
 
 
 
-boolean config_event (LiVESWidget *widget, GdkEventConfigure *event, gpointer user_data) {
+boolean config_event(LiVESWidget *widget, LiVESXEventConfigure *event, livespointer user_data) {
   int scr_width=mainw->mgeom[prefs->gui_monitor>0?prefs->gui_monitor-1:0].width;
   int scr_height=mainw->mgeom[prefs->gui_monitor>0?prefs->gui_monitor-1:0].height;
 
@@ -9284,12 +9194,12 @@
 
 #ifdef ENABLE_JACK
       if (mainw->jackd!=NULL) {
-	jack_driver_activate(mainw->jackd);
+        jack_driver_activate(mainw->jackd);
       }
 #endif
 #ifdef HAVE_PULSE_AUDIO
       if (mainw->pulsed!=NULL) {
-	pulse_driver_activate(mainw->pulsed);
+        pulse_driver_activate(mainw->pulsed);
       }
 #endif
     }
@@ -9306,8 +9216,8 @@
 
 
 
-void on_effects_paused (LiVESButton *button, gpointer user_data) {
-  gchar *com=NULL;
+void on_effects_paused(LiVESButton *button, livespointer user_data) {
+  char *com=NULL;
   int64_t xticks;
 #ifdef IS_MINGW
   int pid;
@@ -9319,7 +9229,7 @@
 
     if (!mainw->effects_paused) {
 #ifndef IS_MINGW
-      com=g_strdup_printf("%s stopsubsub \"%s\" SIGTSTP 2>/dev/null",prefs->backend_sync,cfile->handle);
+      com=lives_strdup_printf("%s stopsubsub \"%s\" SIGTSTP 2>/dev/null",prefs->backend_sync,cfile->handle);
       lives_system(com,TRUE);
 #else
       FILE *rfile;
@@ -9327,7 +9237,7 @@
       char val[16];
 
       // get pid from backend
-      com=g_strdup_printf("%s get_pid_for_handle \"%s\"",prefs->backend_sync,cfile->handle);
+      com=lives_strdup_printf("%s get_pid_for_handle \"%s\"",prefs->backend_sync,cfile->handle);
       rfile=popen(com,"r");
       rlen=fread(val,1,16,rfile);
       pclose(rfile);
@@ -9336,19 +9246,19 @@
 
       lives_win32_suspend_resume_process(pid,TRUE);
 #endif
-      g_free(com);
+      lives_free(com);
       com=NULL;
 
       if (!cfile->opening) {
-	lives_button_set_label(LIVES_BUTTON(button),_ ("Resume"));
-	lives_label_set_text(LIVES_LABEL(cfile->proc_ptr->label2),_ ("\nPaused\n(click Resume to continue processing)"));
-	d_print(_ ("paused..."));
+        lives_button_set_label(LIVES_BUTTON(button),_("Resume"));
+        lives_label_set_text(LIVES_LABEL(cfile->proc_ptr->label2),_("\nPaused\n(click Resume to continue processing)"));
+        d_print(_("paused..."));
       }
     }
 
     else {
 #ifndef IS_MINGW
-      com=g_strdup_printf("%s stopsubsub \"%s\" SIGCONT 2>/dev/null",prefs->backend_sync,cfile->handle);
+      com=lives_strdup_printf("%s stopsubsub \"%s\" SIGCONT 2>/dev/null",prefs->backend_sync,cfile->handle);
       lives_system(com,TRUE);
 #else
       FILE *rfile;
@@ -9356,7 +9266,7 @@
       char val[16];
 
       // get pid from backend
-      com=g_strdup_printf("%s get_pid_for_handle \"%s\"",prefs->backend_sync,cfile->handle);
+      com=lives_strdup_printf("%s get_pid_for_handle \"%s\"",prefs->backend_sync,cfile->handle);
       rfile=popen(com,"r");
       rlen=fread(val,1,16,rfile);
       pclose(rfile);
@@ -9365,13 +9275,13 @@
 
       lives_win32_suspend_resume_process(pid,FALSE);
 #endif
-      g_free(com);
+      lives_free(com);
       com=NULL;
 
       if (!cfile->opening) {
-	lives_button_set_label(LIVES_BUTTON(button),_ ("Pause"));
-	lives_label_set_text(LIVES_LABEL(cfile->proc_ptr->label2),_ ("\nPlease Wait"));
-	d_print(_ ("resumed..."));
+        lives_button_set_label(LIVES_BUTTON(button),_("Paus_e"));
+        lives_label_set_text(LIVES_LABEL(cfile->proc_ptr->label2),_("\nPlease Wait"));
+        d_print(_("resumed..."));
       }
     }
   }
@@ -9380,70 +9290,83 @@
     // pause during effects processing or opening
     gettimeofday(&tv, NULL);
     xticks=U_SECL*(tv.tv_sec-mainw->origsecs)+tv.tv_usec*U_SEC_RATIO-mainw->origusecs*U_SEC_RATIO;
-    
+
     if (!mainw->effects_paused) {
       mainw->timeout_ticks-=xticks;
-      com=g_strdup_printf("%s pause \"%s\"",prefs->backend_sync,cfile->handle);
+      com=lives_strdup_printf("%s pause \"%s\"",prefs->backend_sync,cfile->handle);
       if (!mainw->preview) {
-	lives_button_set_label(LIVES_BUTTON(button),_ ("Resume"));
-	if (!cfile->nokeep) {
-	  gchar *tmp,*ltext;
-
-	  if (!cfile->opening) {
-	    ltext=g_strdup(_("Keep"));
-	  }
-	  else {
-	    ltext=g_strdup(_("Enough"));
-	  }
-	  lives_button_set_label(LIVES_BUTTON(cfile->proc_ptr->cancel_button),ltext);
-	  lives_label_set_text(LIVES_LABEL(cfile->proc_ptr->label2),
-			       (tmp=g_strdup_printf(
-						    _ ("\nPaused\n(click %s to keep what you have and stop)\n(click Resume to continue processing)"),
-						    ltext)));
-	  g_free(tmp);
-	  g_free(ltext);
-	}
-	d_print(_ ("paused..."));
+        lives_button_set_label(LIVES_BUTTON(button),_("Resume"));
+        if (!cfile->nokeep) {
+          char *tmp,*ltext;
+
+          if (!cfile->opening) {
+            ltext=lives_strdup(_("Keep"));
+          } else {
+            ltext=lives_strdup(_("Enough"));
+          }
+          lives_button_set_label(LIVES_BUTTON(cfile->proc_ptr->cancel_button),ltext);
+          lives_label_set_text(LIVES_LABEL(cfile->proc_ptr->label2),
+                               (tmp=lives_strdup_printf
+                                    (_("\nPaused\n(click %s to keep what you have and stop)\n(click Resume to continue processing)"),
+                                     ltext)));
+          lives_free(tmp);
+          lives_free(ltext);
+        }
+        d_print(_("paused..."));
       }
-#ifdef RT_AUDIO
-      if ((mainw->jackd!=NULL&&mainw->jackd_read!=NULL&&mainw->jackd_read->in_use)
-	  ||(mainw->pulsed!=NULL&&mainw->pulsed_read!=NULL&&mainw->pulsed_read->in_use)) 
-	lives_widget_hide(cfile->proc_ptr->stop_button);
+#ifdef ENABLE_JACK
+      if (mainw->jackd!=NULL&&mainw->jackd_read!=NULL&&mainw->jackd_read->in_use)
+        lives_widget_hide(cfile->proc_ptr->stop_button);
 #endif
-    } else {
+#ifdef HAVE_PULSE_AUDIO
+      if (mainw->pulsed!=NULL&&mainw->pulsed_read!=NULL&&mainw->pulsed_read->in_use)
+        lives_widget_hide(cfile->proc_ptr->stop_button);
+#endif
+      } else {
       mainw->timeout_ticks+=xticks;
-      com=g_strdup_printf("%s resume \"%s\"",prefs->backend_sync,cfile->handle);
+      com=lives_strdup_printf("%s resume \"%s\"",prefs->backend_sync,cfile->handle);
       if (!mainw->preview) {
-	if (cfile->opening) lives_button_set_label(LIVES_BUTTON(button),_ ("Pause/_Enough"));
-	else lives_button_set_label(LIVES_BUTTON(button),_ ("Pause"));
-	lives_button_set_label(LIVES_BUTTON(cfile->proc_ptr->cancel_button), _("Cancel"));
-	lives_label_set_text(LIVES_LABEL(cfile->proc_ptr->label2),_ ("\nPlease Wait"));
-	d_print(_ ("resumed..."));
+        if (cfile->opening||!cfile->nokeep) lives_button_set_label(LIVES_BUTTON(button),_("Pause/_Enough"));
+        else lives_button_set_label(LIVES_BUTTON(button),_("Paus_e"));
+        lives_button_set_label(LIVES_BUTTON(cfile->proc_ptr->cancel_button), _("Cancel"));
+        lives_label_set_text(LIVES_LABEL(cfile->proc_ptr->label2),_("\nPlease Wait"));
+        d_print(_("resumed..."));
       }
-#ifdef RT_AUDIO
-      if ((mainw->jackd!=NULL&&mainw->jackd_read!=NULL&&mainw->jackd_read->in_use)
-	  ||(mainw->pulsed!=NULL&&mainw->pulsed_read!=NULL&&mainw->pulsed_read->in_use)) 
-	lives_widget_show(cfile->proc_ptr->stop_button);
+#ifdef ENABLE_JACK
+      if (mainw->jackd!=NULL&&mainw->jackd_read!=NULL&&mainw->jackd_read->in_use)
+        lives_widget_show(cfile->proc_ptr->stop_button);
+#endif
+#ifdef HAVE_PULSE_AUDIO
+      if (mainw->pulsed!=NULL&&mainw->pulsed_read!=NULL&&mainw->pulsed_read->in_use)
+        lives_widget_show(cfile->proc_ptr->stop_button);
 #endif
     }
 
     if (!cfile->opening&&!mainw->internal_messaging
-#ifdef RT_AUDIO
-	&&!((mainw->jackd!=NULL&&mainw->jackd_read!=NULL&&mainw->jackd_read->in_use)
-	    ||(mainw->pulsed!=NULL&&mainw->pulsed_read!=NULL&&mainw->pulsed->in_use))
+        && !(
+#ifdef ENABLE_JACK
+	     (mainw->jackd!=NULL&&mainw->jackd_read!=NULL&&mainw->jackd_read->in_use)
+#else
+	     0
+#endif
+	     ||
+#ifdef HAVE_PULSE_AUDIO
+	     (mainw->pulsed!=NULL&&mainw->pulsed_read!=NULL&&mainw->pulsed->in_use)
+#else
+	     0
 #endif
-	) {
+	     )) {
       lives_system(com,FALSE);
     }
   }
-  if (com!=NULL) g_free(com);
+  if (com!=NULL) lives_free(com);
   mainw->effects_paused=!mainw->effects_paused;
 
 }
 
 
 
-void on_preview_clicked (LiVESButton *button, gpointer user_data) {
+void on_preview_clicked(LiVESButton *button, livespointer user_data) {
   // play an effect/tool preview
   // IMPORTANT: cfile->undo_start and cfile->undo_end determine which frames
   // should be played
@@ -9493,22 +9416,22 @@
   if (mainw->playing_file==-1) {
     if (cfile->opening) {
       // set vid player to int, and audio player to sox
-      
+
       /*      if (prefs->audio_player==AUD_PLAYER_MPLAYER) {
-	switch_aud_to_sox(FALSE);
-	}*/
+      switch_aud_to_sox(FALSE);
+      }*/
       if (!cfile->opening_only_audio) {
-	mainw->toy_type=LIVES_TOY_NONE;
-	lives_widget_set_sensitive(mainw->toys,FALSE);
+        mainw->toy_type=LIVES_TOY_NONE;
+        lives_widget_set_sensitive(mainw->toys,FALSE);
       }
-      if (mainw->multitrack==NULL&&prefs->show_gui) lives_widget_show (mainw->LiVES);
+      if (mainw->multitrack==NULL&&prefs->show_gui) lives_widget_show(mainw->LiVES);
 
       if (mainw->multitrack==NULL&&!cfile->is_loaded) {
-	if (mainw->play_window!=NULL) {
-	  cfile->is_loaded=TRUE;
-	  resize_play_window();
-	  cfile->is_loaded=FALSE;
-	}
+        if (mainw->play_window!=NULL) {
+          cfile->is_loaded=TRUE;
+          resize_play_window();
+          cfile->is_loaded=FALSE;
+        }
       }
     }
 
@@ -9517,41 +9440,38 @@
     if (mainw->multitrack!=NULL) {
       mt_prepare_for_playback(mainw->multitrack);
       if (cfile->opening) {
-	lives_widget_set_sensitive(mainw->multitrack->playall,FALSE);
-	lives_widget_set_sensitive (mainw->m_playbutton, FALSE);
+        lives_widget_set_sensitive(mainw->multitrack->playall,FALSE);
+        lives_widget_set_sensitive(mainw->m_playbutton, FALSE);
       }
     }
 
     if (user_data!=NULL) {
       // called from multitrack
       if (mainw->play_window!=NULL) {
-	resize_play_window();
+        resize_play_window();
       }
       if (mainw->multitrack!=NULL&&mainw->multitrack->is_rendering) {
-	mainw->play_start=1;
-	mainw->play_end=cfile->frames;
+        mainw->play_start=1;
+        mainw->play_end=cfile->frames;
+      } else {
+        mainw->play_start=1;
+        mainw->play_end=INT_MAX;
       }
-      else {
-	mainw->play_start=1;
-	mainw->play_end=INT_MAX;
-      }
-    }
-    else {
+    } else {
       if (!mainw->is_processing&&!mainw->is_rendering) {
-	mainw->play_start=cfile->start=cfile->undo_start;
-	mainw->play_end=cfile->end=cfile->undo_end;
-      }
-      else {
-	mainw->play_start=calc_frame_from_time (mainw->current_file,event_list_get_start_secs (cfile->event_list));
-	mainw->play_end=INT_MAX;
+        mainw->play_start=cfile->start=cfile->undo_start;
+        mainw->play_end=cfile->end=cfile->undo_end;
+      } else {
+        mainw->play_start=calc_frame_from_time(mainw->current_file,event_list_get_start_secs(cfile->event_list));
+        mainw->play_end=INT_MAX;
       }
     }
 
     // stop effects processing (if preferred)
     if (prefs->pause_effect_during_preview) {
       if (!(mainw->effects_paused)) {
-	on_effects_paused(LIVES_BUTTON(cfile->proc_ptr->pause_button),NULL);
-	resume_after=TRUE;
+        on_effects_paused(LIVES_BUTTON(cfile->proc_ptr->pause_button),NULL);
+        resume_after=TRUE;
       }
     }
 
@@ -9561,22 +9481,22 @@
       lives_widget_set_sensitive(cfile->proc_ptr->cancel_button,FALSE);
     }
     if (!cfile->opening) {
-      lives_widget_set_sensitive (mainw->showfct,FALSE);
+      lives_widget_set_sensitive(mainw->showfct,FALSE);
     }
 
     desensitize();
-   
+
     if (cfile->opening||cfile->opening_only_audio) {
-      lives_widget_hide (cfile->proc_ptr->processing);
+      lives_widget_hide(cfile->proc_ptr->processing);
       if (mainw->multitrack==NULL&&!cfile->opening_audio) {
-	load_start_image (0);
-	load_end_image (0);
+        load_start_image(0);
+        load_end_image(0);
       }
-      resize (1);
+      resize(1);
     }
 
     if (ointernal_messaging) {
-      lives_system ("sync;sync;sync",TRUE);
+      lives_system("sync;sync;sync",TRUE);
     }
     current_file=mainw->current_file;
     resize(1);
@@ -9586,15 +9506,14 @@
 
     if (current_file!=mainw->current_file) {
       if (cfile->proc_ptr!=NULL) {
-	mainw->files[current_file]->proc_ptr=cfile->proc_ptr;
-	cfile->proc_ptr=NULL;
+        mainw->files[current_file]->proc_ptr=cfile->proc_ptr;
+        cfile->proc_ptr=NULL;
       }
       if (mainw->is_rendering) {
-	mainw->files[current_file]->next_event=cfile->next_event;
-	cfile->next_event=NULL;
-	mainw->current_file=current_file;
-      }
-      else switch_to_file ((mainw->current_file=0),current_file);
+        mainw->files[current_file]->next_event=cfile->next_event;
+        cfile->next_event=NULL;
+        mainw->current_file=current_file;
+      } else switch_to_file((mainw->current_file=0),current_file);
     }
 
     // restart effects processing (if necessary)
@@ -9616,11 +9535,11 @@
 
     mainw->toy_type=(lives_toy_t)toy_type;
     lives_widget_set_sensitive(mainw->toys,TRUE);
-    
+
     if (cfile->proc_ptr!=NULL) {
       // proc_ptr can be NULL if we finished loading with a bg generator running
-      lives_widget_show (cfile->proc_ptr->processing);
-      lives_button_set_label(LIVES_BUTTON(button),_ ("Preview"));
+      lives_widget_show(cfile->proc_ptr->processing);
+      lives_button_set_label(LIVES_BUTTON(button),_("Preview"));
       lives_widget_set_sensitive(cfile->proc_ptr->pause_button,TRUE);
       lives_widget_set_sensitive(cfile->proc_ptr->cancel_button,TRUE);
     }
@@ -9629,24 +9548,23 @@
     procw_desensitize();
 
     if (!cfile->opening) {
-      lives_widget_set_sensitive (mainw->showfct,TRUE);
-    }
-    else {
+      lives_widget_set_sensitive(mainw->showfct,TRUE);
+    } else {
       /*      for (i=1;i<MAX_FILES;i++) {
-	if (mainw->files[i]!=NULL) {
-	  if (mainw->files[i]->menuentry!=NULL) {
-	    lives_widget_set_sensitive (mainw->files[i]->menuentry, TRUE);
-	    }}}*/
+      if (mainw->files[i]!=NULL) {
+      if (mainw->files[i]->menuentry!=NULL) {
+      lives_widget_set_sensitive (mainw->files[i]->menuentry, TRUE);
+      }}}*/
       if (mainw->play_window!=NULL) {
-	resize_play_window();
+        resize_play_window();
       }
     }
   }
-    
-  if (mainw->preview_box!=NULL) lives_widget_set_tooltip_text( mainw->p_playbutton, _("Preview"));
-  lives_widget_set_tooltip_text( mainw->m_playbutton,_("Preview"));
 
-  // redraw our bars for the clip 
+  if (mainw->preview_box!=NULL) lives_widget_set_tooltip_text(mainw->p_playbutton, _("Preview"));
+  lives_widget_set_tooltip_text(mainw->m_playbutton,_("Preview"));
+
+  // redraw our bars for the clip
   if (!mainw->merge) {
     get_play_times();
   }
@@ -9656,14 +9574,14 @@
     // switch realtime fx back on
     mainw->rte=old_rte;
   }
-  
+
   if (mainw->play_window!=NULL&&mainw->fs) {
     // this prevents a hang when the separate window is visible
     // it may be the first time we have shown it
     block_expose();
     lives_widget_context_update();
     unblock_expose();
-    lives_widget_queue_draw (mainw->LiVES);
+    lives_widget_queue_draw(mainw->LiVES);
   }
   gettimeofday(&tv, NULL);
   xticks=U_SECL*(tv.tv_sec-mainw->origsecs)+tv.tv_usec*U_SEC_RATIO-mainw->origusecs*U_SEC_RATIO;
@@ -9684,7 +9602,7 @@
 }
 
 
-void changed_fps_during_pb (LiVESSpinButton   *spinbutton, gpointer user_data) {
+void changed_fps_during_pb(LiVESSpinButton   *spinbutton, livespointer user_data) {
   double new_fps=(double)((int)(lives_spin_button_get_value(LIVES_SPIN_BUTTON(spinbutton))*1000)/1000.);
 
   if ((!cfile->play_paused&&cfile->pb_fps==new_fps)||(cfile->play_paused&&new_fps==0.)) {
@@ -9699,26 +9617,26 @@
   if (prefs->audio_opts&AUDIO_OPTS_FOLLOW_FPS) {
 #ifdef ENABLE_JACK
     if (prefs->audio_player==AUD_PLAYER_JACK&&mainw->jackd!=NULL&&mainw->jackd->playing_file==mainw->current_file&&
-	!(mainw->record&&!mainw->record_paused&&prefs->audio_src==AUDIO_SRC_EXT)) {
-      
+        !(mainw->record&&!mainw->record_paused&&prefs->audio_src==AUDIO_SRC_EXT)) {
+
       mainw->jackd->sample_in_rate=cfile->arate*cfile->pb_fps/cfile->fps;
       if (mainw->agen_key==0&&!mainw->agen_needs_reinit&&!has_audio_filters(AF_TYPE_NONA)) {
-	mainw->rec_aclip=mainw->current_file;
-	mainw->rec_avel=cfile->pb_fps/cfile->fps;
-	mainw->rec_aseek=(double)mainw->jackd->seek_pos/(double)(cfile->arate*cfile->achans*cfile->asampsize/8);
+        mainw->rec_aclip=mainw->current_file;
+        mainw->rec_avel=cfile->pb_fps/cfile->fps;
+        mainw->rec_aseek=(double)mainw->jackd->seek_pos/(double)(cfile->arate*cfile->achans*cfile->asampsize/8);
       }
     }
 #endif
 
 #ifdef HAVE_PULSE_AUDIO
     if (prefs->audio_player==AUD_PLAYER_PULSE&&mainw->pulsed!=NULL&&mainw->pulsed->playing_file==mainw->current_file&&
-      !(mainw->record&&!mainw->record_paused&&prefs->audio_src==AUDIO_SRC_EXT)) {
+        !(mainw->record&&!mainw->record_paused&&prefs->audio_src==AUDIO_SRC_EXT)) {
 
       mainw->pulsed->in_arate=cfile->arate*cfile->pb_fps/cfile->fps;
       if (mainw->agen_key==0&&!mainw->agen_needs_reinit&&!has_audio_filters(AF_TYPE_NONA)) {
-	mainw->rec_aclip=mainw->current_file;
-	mainw->rec_avel=cfile->pb_fps/cfile->fps;
-	mainw->rec_aseek=(double)mainw->pulsed->seek_pos/(double)(cfile->arate*cfile->achans*cfile->asampsize/8);
+        mainw->rec_aclip=mainw->current_file;
+        mainw->rec_avel=cfile->pb_fps/cfile->fps;
+        mainw->rec_aseek=(double)mainw->pulsed->seek_pos/(double)(cfile->arate*cfile->achans*cfile->asampsize/8);
       }
     }
 #endif
@@ -9738,10 +9656,12 @@
 }
 
 
-boolean on_mouse_scroll (LiVESWidget *widget, LiVESXEventScroll *event, gpointer user_data) {
+boolean on_mouse_scroll(LiVESWidget *widget, LiVESXEventScroll *event, livespointer user_data) {
   LiVESXModifierType kstate;
   uint32_t type=1;
 
+  if (!mainw->interactive) return FALSE;
+
   if (!prefs->mouse_scroll_clips||mainw->noswitch) return FALSE;
 
   if (mainw->multitrack!=NULL) {
@@ -9750,53 +9670,51 @@
     return FALSE;
   }
 
-  kstate=event->state;
+  kstate=(LiVESXModifierType)event->state;
 
   if (kstate==LIVES_SHIFT_MASK) type=2; // bg
   else if (kstate==LIVES_CONTROL_MASK) type=0; // fg or bg
 
-  if (event->direction==LIVES_SCROLL_UP) prevclip_callback(NULL,NULL,0,(LiVESXModifierType)0,GINT_TO_POINTER(type));
-  else if (event->direction==LIVES_SCROLL_DOWN) nextclip_callback(NULL,NULL,0,(LiVESXModifierType)0,GINT_TO_POINTER(type));
+  if (event->direction==LIVES_SCROLL_UP) prevclip_callback(NULL,NULL,0,(LiVESXModifierType)0,LIVES_INT_TO_POINTER(type));
+  else if (event->direction==LIVES_SCROLL_DOWN) nextclip_callback(NULL,NULL,0,(LiVESXModifierType)0,LIVES_INT_TO_POINTER(type));
   return FALSE;
 }
 
 
 
 // next few functions are for the timer bars
-boolean
-on_mouse_sel_update           (LiVESWidget       *widget,
-			       LiVESXEventMotion  *event,
-			       gpointer         user_data)
-{
+boolean on_mouse_sel_update(LiVESWidget *widget, LiVESXEventMotion *event, livespointer user_data) {
+
+  if (!mainw->interactive) return FALSE;
+
   if (mainw->current_file>-1&&mainw->sel_start>0) {
     int x,sel_current;
 
-    lives_widget_get_pointer((LiVESXDevice *)mainw->mgeom[prefs->gui_monitor>0?prefs->gui_monitor-1:0].mouse_device, 
-			     mainw->LiVES, &x, NULL);
+    lives_widget_get_pointer((LiVESXDevice *)mainw->mgeom[prefs->gui_monitor>0?prefs->gui_monitor-1:0].mouse_device,
+                             mainw->LiVES, &x, NULL);
 
-    if (mainw->sel_move==SEL_MOVE_AUTO) 
+    if (mainw->sel_move==SEL_MOVE_AUTO)
       sel_current=calc_frame_from_time3(mainw->current_file,
-					(double)x/(double)lives_widget_get_allocation_width(mainw->vidbar)*cfile->total_time);
+                                        (double)x/(double)lives_widget_get_allocation_width(mainw->vidbar)*cfile->total_time);
     else
       sel_current=calc_frame_from_time(mainw->current_file,
-				       (double)x/(double)lives_widget_get_allocation_width(mainw->vidbar)*cfile->total_time);
+                                       (double)x/(double)lives_widget_get_allocation_width(mainw->vidbar)*cfile->total_time);
 
 
     if (mainw->sel_move==SEL_MOVE_SINGLE) {
       sel_current=calc_frame_from_time3(mainw->current_file,
-					(double)x/(double)lives_widget_get_allocation_width(mainw->vidbar)*cfile->total_time);
+                                        (double)x/(double)lives_widget_get_allocation_width(mainw->vidbar)*cfile->total_time);
       lives_spin_button_set_value(LIVES_SPIN_BUTTON(mainw->spinbutton_start),sel_current);
       lives_spin_button_set_value(LIVES_SPIN_BUTTON(mainw->spinbutton_end),sel_current);
     }
 
     if (mainw->sel_move==SEL_MOVE_START||(mainw->sel_move==SEL_MOVE_AUTO&&sel_current<mainw->sel_start)) {
       sel_current=calc_frame_from_time(mainw->current_file,
-				       (double)x/(double)lives_widget_get_allocation_width(mainw->vidbar)*cfile->total_time);
+                                       (double)x/(double)lives_widget_get_allocation_width(mainw->vidbar)*cfile->total_time);
       lives_spin_button_set_value(LIVES_SPIN_BUTTON(mainw->spinbutton_start),sel_current);
-    }
-    else if (mainw->sel_move==SEL_MOVE_END||(mainw->sel_move==SEL_MOVE_AUTO&&sel_current>mainw->sel_start)) {
+    } else if (mainw->sel_move==SEL_MOVE_END||(mainw->sel_move==SEL_MOVE_AUTO&&sel_current>mainw->sel_start)) {
       sel_current=calc_frame_from_time2(mainw->current_file,
-					(double)x/(double)lives_widget_get_allocation_width(mainw->vidbar)*cfile->total_time);
+                                        (double)x/(double)lives_widget_get_allocation_width(mainw->vidbar)*cfile->total_time);
       lives_spin_button_set_value(LIVES_SPIN_BUTTON(mainw->spinbutton_end),sel_current-1);
     }
   }
@@ -9804,205 +9722,200 @@
 }
 
 
-boolean
-on_mouse_sel_reset           (LiVESWidget       *widget,
-			      LiVESXEventButton  *event,
-			      gpointer         user_data)
-{
+boolean on_mouse_sel_reset(LiVESWidget *widget, LiVESXEventButton *event, livespointer user_data) {
+
+  if (!mainw->interactive) return FALSE;
+
   if (mainw->current_file<=0) return FALSE;
   mainw->sel_start=0;
   if (!mainw->mouse_blocked) {
-    lives_signal_handler_block (mainw->eventbox2,mainw->mouse_fn1);
+    lives_signal_handler_block(mainw->eventbox2,mainw->mouse_fn1);
     mainw->mouse_blocked=TRUE;
   }
   return FALSE;
 }
 
 
-boolean
-on_mouse_sel_start           (LiVESWidget       *widget,
-			      LiVESXEventButton  *event,
-			      gpointer         user_data)
-{
+boolean on_mouse_sel_start(LiVESWidget *widget, LiVESXEventButton *event, livespointer user_data) {
   int x;
+
+  if (!mainw->interactive) return FALSE;
+
   if (mainw->current_file<=0) return FALSE;
 
-  lives_widget_get_pointer((LiVESXDevice *)mainw->mgeom[prefs->gui_monitor>0?prefs->gui_monitor-1:0].mouse_device, 
-			   mainw->LiVES, &x, NULL);
+  lives_widget_get_pointer((LiVESXDevice *)mainw->mgeom[prefs->gui_monitor>0?prefs->gui_monitor-1:0].mouse_device,
+                           mainw->LiVES, &x, NULL);
 
   mainw->sel_start=calc_frame_from_time(mainw->current_file,
-					(double)x/(double)lives_widget_get_allocation_width(mainw->vidbar)*cfile->total_time);
+                                        (double)x/(double)lives_widget_get_allocation_width(mainw->vidbar)*cfile->total_time);
+
 
-  
   if (event->button==3&&!mainw->selwidth_locked) {
     mainw->sel_start=calc_frame_from_time3(mainw->current_file,
-					   (double)x/(double)lives_widget_get_allocation_width(mainw->vidbar)*cfile->total_time);
+                                           (double)x/(double)lives_widget_get_allocation_width(mainw->vidbar)*cfile->total_time);
     lives_spin_button_set_value(LIVES_SPIN_BUTTON(mainw->spinbutton_start),mainw->sel_start);
     lives_spin_button_set_value(LIVES_SPIN_BUTTON(mainw->spinbutton_end),mainw->sel_start);
     mainw->sel_move=SEL_MOVE_AUTO;
   }
-  
+
   else {
     if (event->button==2&&!mainw->selwidth_locked) {
       mainw->sel_start=calc_frame_from_time3(mainw->current_file,
-					     (double)x/(double)lives_widget_get_allocation_width(mainw->vidbar)*cfile->total_time);
+                                             (double)x/(double)lives_widget_get_allocation_width(mainw->vidbar)*cfile->total_time);
       lives_spin_button_set_value(LIVES_SPIN_BUTTON(mainw->spinbutton_start),mainw->sel_start);
       lives_spin_button_set_value(LIVES_SPIN_BUTTON(mainw->spinbutton_end),(int)mainw->sel_start);
       mainw->sel_move=SEL_MOVE_SINGLE;
     }
-    
+
     else {
       if (!mainw->selwidth_locked) {
-	if ((mainw->sel_start<cfile->end&&((mainw->sel_start-cfile->start)<=(cfile->end-mainw->sel_start)))||
-	    mainw->sel_start<cfile->start) {
-	  lives_spin_button_set_value(LIVES_SPIN_BUTTON(mainw->spinbutton_start),mainw->sel_start);
-	  mainw->sel_move=SEL_MOVE_START;
-	}
-	else {
-	  mainw->sel_start=calc_frame_from_time2(mainw->current_file,
-						 (double)x/(double)lives_widget_get_allocation_width(mainw->vidbar)*cfile->total_time);
-	  lives_spin_button_set_value(LIVES_SPIN_BUTTON(mainw->spinbutton_end),mainw->sel_start-1);
-	  mainw->sel_move=SEL_MOVE_END;
-	}
+        if ((mainw->sel_start<cfile->end&&((mainw->sel_start-cfile->start)<=(cfile->end-mainw->sel_start)))||
+            mainw->sel_start<cfile->start) {
+          lives_spin_button_set_value(LIVES_SPIN_BUTTON(mainw->spinbutton_start),mainw->sel_start);
+          mainw->sel_move=SEL_MOVE_START;
+        } else {
+          mainw->sel_start=calc_frame_from_time2(mainw->current_file,
+                                                 (double)x/(double)lives_widget_get_allocation_width(mainw->vidbar)*cfile->total_time);
+          lives_spin_button_set_value(LIVES_SPIN_BUTTON(mainw->spinbutton_end),mainw->sel_start-1);
+          mainw->sel_move=SEL_MOVE_END;
+        }
+      } else {
+        // locked selection
+        if (mainw->sel_start>cfile->end) {
+          // past end
+          if (cfile->end+cfile->end-cfile->start+1<=cfile->frames) {
+            lives_spin_button_set_value(LIVES_SPIN_BUTTON(mainw->spinbutton_end),cfile->end+cfile->end-cfile->start+1);
+            mainw->sel_move=SEL_MOVE_START;
+          }
+        } else {
+          if (mainw->sel_start>=cfile->start) {
+            if (mainw->sel_start>cfile->start+(cfile->end-cfile->start+1)/2) {
+              // nearer to end
+              lives_spin_button_set_value(LIVES_SPIN_BUTTON(mainw->spinbutton_end),mainw->sel_start);
+              mainw->sel_move=SEL_MOVE_END;
+            } else {
+              // nearer to start
+              lives_spin_button_set_value(LIVES_SPIN_BUTTON(mainw->spinbutton_start),mainw->sel_start);
+              mainw->sel_move=SEL_MOVE_START;
+            }
+          } else {
+            // before start
+            if (cfile->start-cfile->end+cfile->start-1>=1) {
+              lives_spin_button_set_value(LIVES_SPIN_BUTTON(mainw->spinbutton_end),cfile->start-1);
+              mainw->sel_move=SEL_MOVE_END;
+            }
+          }
+        }
       }
-      else {
-	// locked selection
-	if (mainw->sel_start>cfile->end) {
-	  // past end
-	  if (cfile->end+cfile->end-cfile->start+1<=cfile->frames) {
-	    lives_spin_button_set_value(LIVES_SPIN_BUTTON(mainw->spinbutton_end),cfile->end+cfile->end-cfile->start+1);
-	    mainw->sel_move=SEL_MOVE_START;
-	  }
-	}
-	else {
-	  if (mainw->sel_start>=cfile->start) {
-	    if (mainw->sel_start>cfile->start+(cfile->end-cfile->start+1)/2) {
-	      // nearer to end
-	      lives_spin_button_set_value(LIVES_SPIN_BUTTON(mainw->spinbutton_end),mainw->sel_start);
-	      mainw->sel_move=SEL_MOVE_END;
-	    }
-	    else {
-	      // nearer to start
-	      lives_spin_button_set_value(LIVES_SPIN_BUTTON(mainw->spinbutton_start),mainw->sel_start);
-	      mainw->sel_move=SEL_MOVE_START;
-	    }
-	  }
-	  else {
-	    // before start
-	    if (cfile->start-cfile->end+cfile->start-1>=1) {
-	      lives_spin_button_set_value(LIVES_SPIN_BUTTON(mainw->spinbutton_end),cfile->start-1);
-	      mainw->sel_move=SEL_MOVE_END;
-	    }
-	  }}}}}
+    }
+  }
   if (mainw->mouse_blocked) {// stops a warning if the user clicks around a lot...
-    lives_signal_handler_unblock (mainw->eventbox2,mainw->mouse_fn1);
+    lives_signal_handler_unblock(mainw->eventbox2,mainw->mouse_fn1);
     mainw->mouse_blocked=FALSE;
   }
   return FALSE;
 }
 
 
-boolean on_hrule_enter (LiVESWidget *widget, GdkEventCrossing *event, gpointer user_data) {
+boolean on_hrule_enter(LiVESWidget *widget, LiVESXEventCrossing *event, livespointer user_data) {
+  if (!mainw->interactive) return FALSE;
+
   if (mainw->cursor_style!=LIVES_CURSOR_NORMAL) return FALSE;
   lives_set_cursor_style(LIVES_CURSOR_CENTER_PTR,widget);
   return FALSE;
 }
 
 
-boolean
-on_hrule_update           (LiVESWidget       *widget,
-			   LiVESXEventMotion  *event,
-			   gpointer         user_data) {
+boolean on_hrule_update(LiVESWidget *widget, LiVESXEventMotion *event, livespointer user_data) {
   int x;
+
+  if (!mainw->interactive) return FALSE;
+
   if (mainw->current_file<=0) return FALSE;
 
-  lives_widget_get_pointer((LiVESXDevice *)mainw->mgeom[prefs->gui_monitor>0?prefs->gui_monitor-1:0].mouse_device, 
-			   mainw->LiVES, &x, NULL);
+  lives_widget_get_pointer((LiVESXDevice *)mainw->mgeom[prefs->gui_monitor>0?prefs->gui_monitor-1:0].mouse_device,
+                           mainw->LiVES, &x, NULL);
   if (x<0) x=0;
 
   // figure out where ptr should be even when > cfile->frames
-  
-  if ((lives_ruler_set_value(LIVES_RULER (mainw->hruler),(cfile->pointer_time=
-       calc_time_from_frame(mainw->current_file,calc_frame_from_time
-			    (mainw->current_file,(double)x/lives_widget_get_allocation_width(mainw->vidbar)*cfile->total_time)))))<=0.) 
-    lives_ruler_set_value(LIVES_RULER (mainw->hruler),(cfile->pointer_time=(double)x/
-						       lives_widget_get_allocation_width(mainw->vidbar)*cfile->total_time));
-  lives_widget_queue_draw (mainw->hruler);
+
+  if ((lives_ruler_set_value(LIVES_RULER(mainw->hruler),(cfile->pointer_time=
+                               calc_time_from_frame(mainw->current_file,calc_frame_from_time
+                                   (mainw->current_file,(double)x/lives_widget_get_allocation_width(mainw->vidbar)*cfile->total_time)))))<=0.)
+    lives_ruler_set_value(LIVES_RULER(mainw->hruler),(cfile->pointer_time=(double)x/
+                          lives_widget_get_allocation_width(mainw->vidbar)*cfile->total_time));
+  lives_widget_queue_draw(mainw->hruler);
   get_play_times();
   return FALSE;
 }
 
 
-boolean
-on_hrule_reset           (LiVESWidget       *widget,
-			  LiVESXEventButton  *event,
-			  gpointer         user_data)
-{
+boolean on_hrule_reset(LiVESWidget *widget, LiVESXEventButton  *event, livespointer user_data) {
   //button release
   int x;
+
+  if (!mainw->interactive) return FALSE;
+
   if (mainw->current_file<=0) return FALSE;
 
-  lives_widget_get_pointer((LiVESXDevice *)mainw->mgeom[prefs->gui_monitor>0?prefs->gui_monitor-1:0].mouse_device, 
-			   mainw->LiVES, &x, NULL);
+  lives_widget_get_pointer((LiVESXDevice *)mainw->mgeom[prefs->gui_monitor>0?prefs->gui_monitor-1:0].mouse_device,
+                           mainw->LiVES, &x, NULL);
   if (x<0) x=0;
-  if ((lives_ruler_set_value(LIVES_RULER (mainw->hruler),(cfile->pointer_time=
-       calc_time_from_frame(mainw->current_file,
-			    calc_frame_from_time(mainw->current_file,(double)x/
-						 lives_widget_get_allocation_width(mainw->vidbar)*cfile->total_time)))))<=0.) 
-    lives_ruler_set_value(LIVES_RULER (mainw->hruler),(cfile->pointer_time=(double)x/
-						       lives_widget_get_allocation_width(mainw->vidbar)*cfile->total_time));
+  if ((lives_ruler_set_value(LIVES_RULER(mainw->hruler),(cfile->pointer_time=
+                               calc_time_from_frame(mainw->current_file,
+                                   calc_frame_from_time(mainw->current_file,(double)x/
+                                       lives_widget_get_allocation_width(mainw->vidbar)*cfile->total_time)))))<=0.)
+    lives_ruler_set_value(LIVES_RULER(mainw->hruler),(cfile->pointer_time=(double)x/
+                          lives_widget_get_allocation_width(mainw->vidbar)*cfile->total_time));
 
   if (!mainw->hrule_blocked) {
-    lives_signal_handler_block (mainw->eventbox5,mainw->hrule_func);
+    lives_signal_handler_block(mainw->eventbox5,mainw->hrule_func);
     mainw->hrule_blocked=TRUE;
   }
   if (cfile->pointer_time>0.) {
-    lives_widget_set_sensitive (mainw->rewind, TRUE);
-    lives_widget_set_sensitive (mainw->trim_to_pstart, (cfile->achans*cfile->frames>0));
-    lives_widget_set_sensitive (mainw->m_rewindbutton, TRUE);
+    lives_widget_set_sensitive(mainw->rewind, TRUE);
+    lives_widget_set_sensitive(mainw->trim_to_pstart, (cfile->achans*cfile->frames>0));
+    lives_widget_set_sensitive(mainw->m_rewindbutton, TRUE);
     if (mainw->preview_box!=NULL) {
-      lives_widget_set_sensitive (mainw->p_rewindbutton, TRUE);
+      lives_widget_set_sensitive(mainw->p_rewindbutton, TRUE);
     }
-  }
-  else {
-    lives_widget_set_sensitive (mainw->rewind, FALSE);
-    lives_widget_set_sensitive (mainw->trim_to_pstart, FALSE);
-    lives_widget_set_sensitive (mainw->m_rewindbutton, FALSE);
+  } else {
+    lives_widget_set_sensitive(mainw->rewind, FALSE);
+    lives_widget_set_sensitive(mainw->trim_to_pstart, FALSE);
+    lives_widget_set_sensitive(mainw->m_rewindbutton, FALSE);
     if (mainw->preview_box!=NULL) {
-      lives_widget_set_sensitive (mainw->p_rewindbutton, FALSE);
+      lives_widget_set_sensitive(mainw->p_rewindbutton, FALSE);
     }
   }
-  lives_widget_queue_draw (mainw->hruler);
+  lives_widget_queue_draw(mainw->hruler);
   get_play_times();
   return FALSE;
 }
 
 
-boolean
-on_hrule_set           (LiVESWidget       *widget,
-			LiVESXEventButton  *event,
-			gpointer         user_data)
-{
+boolean on_hrule_set(LiVESWidget *widget, LiVESXEventButton *event, livespointer user_data) {
   // button press
   int x;
   int frame;
 
+  if (!mainw->interactive) return FALSE;
+
   if (mainw->current_file<=0) return FALSE;
 
-  lives_widget_get_pointer((LiVESXDevice *)mainw->mgeom[prefs->gui_monitor>0?prefs->gui_monitor-1:0].mouse_device, 
-			   mainw->LiVES, &x, NULL);
+  lives_widget_get_pointer((LiVESXDevice *)mainw->mgeom[prefs->gui_monitor>0?prefs->gui_monitor-1:0].mouse_device,
+                           mainw->LiVES, &x, NULL);
   if (x<0) x=0;
 
   frame=calc_frame_from_time(mainw->current_file,(double)x/lives_widget_get_allocation_width(mainw->vidbar)*cfile->total_time);
 
-  if ((lives_ruler_set_value(LIVES_RULER (mainw->hruler),(cfile->pointer_time=
-							  calc_time_from_frame(mainw->current_file,frame))))<=0.)
-    lives_ruler_set_value(LIVES_RULER (mainw->hruler),(cfile->pointer_time=(double)x/
-						       lives_widget_get_allocation_width(mainw->vidbar)*cfile->total_time));
-  lives_widget_queue_draw (mainw->hruler);
+  if ((lives_ruler_set_value(LIVES_RULER(mainw->hruler),(cfile->pointer_time=
+                               calc_time_from_frame(mainw->current_file,frame))))<=0.)
+    lives_ruler_set_value(LIVES_RULER(mainw->hruler),(cfile->pointer_time=(double)x/
+                          lives_widget_get_allocation_width(mainw->vidbar)*cfile->total_time));
+  lives_widget_queue_draw(mainw->hruler);
   get_play_times();
   if (mainw->hrule_blocked) {
-    lives_signal_handler_unblock (mainw->eventbox5,mainw->hrule_func);
+    lives_signal_handler_unblock(mainw->eventbox5,mainw->hrule_func);
     mainw->hrule_blocked=FALSE;
   }
 
@@ -10016,13 +9929,15 @@
 
 
 
-boolean frame_context (LiVESWidget *widget, LiVESXEventButton *event, gpointer which) {
+boolean frame_context(LiVESWidget *widget, LiVESXEventButton *event, livespointer which) {
   //popup a context menu when we right click on a frame
   int frame=0;
 
   LiVESWidget *save_frame_as;
   LiVESWidget *menu;
 
+  if (!mainw->interactive) return FALSE;
+
   // check if a file is loaded
   if (mainw->current_file<=0) return FALSE;
 
@@ -10033,7 +9948,7 @@
   if (event->button!=3) return FALSE;
 
   if (mainw->multitrack==NULL) {
-    switch (GPOINTER_TO_INT (which)) {
+    switch (LIVES_POINTER_TO_INT(which)) {
     case 1:
       // start frame
       frame=cfile->start;
@@ -10048,9 +9963,9 @@
       break;
     }
   }
-  
+
   menu=lives_menu_new();
-  lives_menu_set_title (LIVES_MENU(menu),_("LiVES: Selected frame"));
+  lives_menu_set_title(LIVES_MENU(menu),_("LiVES: Selected frame"));
 
   if (palette->style&STYLE_1) {
     lives_widget_set_bg_color(menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
@@ -10058,26 +9973,26 @@
   }
 
   if (cfile->frames>0||mainw->multitrack!=NULL) {
-    save_frame_as = lives_menu_item_new_with_mnemonic (_("_Save frame as..."));
-    lives_signal_connect (LIVES_GUI_OBJECT (save_frame_as), LIVES_WIDGET_ACTIVATE_EVENT,
-		      LIVES_GUI_CALLBACK (save_frame),
-		      GINT_TO_POINTER(frame));
-    
+    save_frame_as = lives_menu_item_new_with_mnemonic(_("_Save frame as..."));
+    lives_signal_connect(LIVES_GUI_OBJECT(save_frame_as), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                         LIVES_GUI_CALLBACK(save_frame),
+                         LIVES_INT_TO_POINTER(frame));
+
 
     if (capable->has_convert&&capable->has_composite)
-      lives_container_add (LIVES_CONTAINER (menu), save_frame_as);
+      lives_container_add(LIVES_CONTAINER(menu), save_frame_as);
 
   }
 
-  lives_widget_show_all (menu);
-  lives_menu_popup (LIVES_MENU(menu), event);
+  lives_widget_show_all(menu);
+  lives_menu_popup(LIVES_MENU(menu), event);
 
   return FALSE;
 }
 
 
 
-void on_slower_pressed (LiVESButton *button, gpointer user_data) {
+void on_slower_pressed(LiVESButton *button, livespointer user_data) {
   double change=1.,new_fps;
 
   int type=0;
@@ -10085,7 +10000,7 @@
   lives_clip_t *sfile=cfile;
 
   if (user_data!=NULL) {
-    type=GPOINTER_TO_INT(user_data);
+    type=LIVES_POINTER_TO_INT(user_data);
     if (type==2) sfile=mainw->files[mainw->blend_file];
     change=0.1;
   }
@@ -10111,26 +10026,25 @@
     new_fps=sfile->pb_fps-change;
     if (sfile==cfile) lives_spin_button_set_value(LIVES_SPIN_BUTTON(mainw->spinbutton_pb_fps),new_fps);
     else sfile->pb_fps=new_fps;
-  }
-  else {
+  } else {
     if (sfile->pb_fps>change) sfile->pb_fps=change;
     if (sfile==cfile) lives_spin_button_set_value(LIVES_SPIN_BUTTON(mainw->spinbutton_pb_fps),(sfile->pb_fps-change));
     else sfile->pb_fps-=change;
   }
 
-  
+
 
 }
 
 
-void on_faster_pressed (LiVESButton *button, gpointer user_data) {
+void on_faster_pressed(LiVESButton *button, livespointer user_data) {
   double change=1.;
   int type=0;
 
   lives_clip_t *sfile=cfile;
 
   if (user_data!=NULL) {
-    type=GPOINTER_TO_INT(user_data);
+    type=LIVES_POINTER_TO_INT(user_data);
     if (type==2) sfile=mainw->files[mainw->blend_file];
     change=0.1;
   }
@@ -10158,8 +10072,7 @@
     if (sfile->pb_fps>FPS_MAX-change) sfile->pb_fps=FPS_MAX-change;
     if (sfile==cfile) lives_spin_button_set_value(LIVES_SPIN_BUTTON(mainw->spinbutton_pb_fps),(sfile->pb_fps+change));
     else sfile->pb_fps=sfile->pb_fps+change;
-  }
-  else {
+  } else {
     if (sfile->pb_fps==-FPS_MAX) return;
     if (sfile->pb_fps<-FPS_MAX-change) sfile->pb_fps=-FPS_MAX-change;
     if (sfile==cfile) lives_spin_button_set_value(LIVES_SPIN_BUTTON(mainw->spinbutton_pb_fps),(sfile->pb_fps+change));
@@ -10172,7 +10085,7 @@
 
 //TODO - make pref
 #define CHANGE_SPEED (cfile->pb_fps*(double)KEY_RPT_INTERVAL/100.)
-void on_back_pressed (LiVESButton *button, gpointer user_data) {
+void on_back_pressed(LiVESButton *button, livespointer user_data) {
   if (mainw->playing_file==-1||mainw->internal_messaging||(mainw->is_processing&&cfile->is_loaded)) return;
   if (mainw->record&&!(prefs->rec_opts&REC_FRAMES)) return;
   if (cfile->next_event!=NULL) return;
@@ -10182,7 +10095,7 @@
 
 }
 
-void on_forward_pressed (LiVESButton *button, gpointer user_data) {
+void on_forward_pressed(LiVESButton *button, livespointer user_data) {
   if (mainw->playing_file==-1||mainw->internal_messaging||(mainw->is_processing&&cfile->is_loaded)) return;
   if (mainw->record&&!(prefs->rec_opts&REC_FRAMES)) return;
   if (cfile->next_event!=NULL) return;
@@ -10193,7 +10106,7 @@
 }
 
 
-boolean freeze_callback (LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, gpointer user_data) {
+boolean freeze_callback(LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, livespointer user_data) {
   if (mainw->playing_file==-1||(mainw->is_processing&&cfile->is_loaded)) return TRUE;
   if (mainw->record&&!(prefs->rec_opts&REC_FRAMES)) return TRUE;
 
@@ -10204,8 +10117,7 @@
     if (cfile->pb_fps!=0.) mainw->period=U_SEC/cfile->pb_fps;
     else mainw->period=INT_MAX;
     cfile->play_paused=FALSE;
-  }
-  else {
+  } else {
     cfile->freeze_fps=cfile->pb_fps;
     cfile->play_paused=TRUE;
     cfile->pb_fps=0.;
@@ -10213,7 +10125,7 @@
     if (!mainw->noswitch&&(cfile->clip_type==CLIP_TYPE_DISK||cfile->clip_type==CLIP_TYPE_FILE)) {
       weed_plant_t *frame_layer=mainw->frame_layer;
       mainw->frame_layer=NULL;
-      load_frame_image (cfile->frameno);
+      load_frame_image(cfile->frameno);
       mainw->frame_layer=frame_layer;
     }
   }
@@ -10221,12 +10133,12 @@
   if (group!=NULL) {
     lives_spin_button_set_value(LIVES_SPIN_BUTTON(mainw->spinbutton_pb_fps),cfile->pb_fps);
   }
-  
+
 #ifdef ENABLE_JACK
   if (mainw->jackd!=NULL&&prefs->audio_player==AUD_PLAYER_JACK&&(prefs->jack_opts&JACK_OPTS_NOPLAY_WHEN_PAUSED||
-								 prefs->audio_opts&AUDIO_OPTS_FOLLOW_FPS)) {
+      prefs->audio_opts&AUDIO_OPTS_FOLLOW_FPS)) {
     if (!cfile->play_paused&&prefs->audio_player==AUD_PLAYER_JACK&&(prefs->audio_opts&AUDIO_OPTS_FOLLOW_FPS)&&
-	mainw->jackd!=NULL&&mainw->jackd->playing_file==mainw->current_file) {
+        mainw->jackd!=NULL&&mainw->jackd->playing_file==mainw->current_file) {
       mainw->jackd->sample_in_rate=cfile->arate*cfile->pb_fps/cfile->fps;
     }
     mainw->jackd->is_paused=cfile->play_paused;
@@ -10242,21 +10154,20 @@
     mainw->pulsed->is_paused=cfile->play_paused;
   }
 #endif
-  
+
   return TRUE;
 }
 
 
-boolean nervous_callback (LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, gpointer clip_number) {
+boolean nervous_callback(LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, livespointer clip_number) {
   if (mainw->multitrack!=NULL) return FALSE;
   mainw->nervous=!mainw->nervous;
   return TRUE;
 }
 
 
-boolean show_sync_callback (LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, gpointer clip_number) {
+boolean show_sync_callback(LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, livespointer clip_number) {
   double avsync;
-  gchar *msg;
 
   int last_dprint_file;
 
@@ -10267,7 +10178,7 @@
   if (prefs->audio_player==AUD_PLAYER_JACK) {
 #ifdef ENABLE_JACK
     if (mainw->jackd!=NULL&&mainw->jackd->in_use) avsync=(double)mainw->jackd->seek_pos/
-						    cfile->arate/cfile->achans/cfile->asampsize*8;
+          cfile->arate/cfile->achans/cfile->asampsize*8;
     else return FALSE;
 #else
     return FALSE;
@@ -10277,37 +10188,36 @@
   if (prefs->audio_player==AUD_PLAYER_PULSE) {
 #ifdef HAVE_PULSE_AUDIO
     if (mainw->pulsed!=NULL&&mainw->pulsed->in_use) avsync=(double)mainw->pulsed->seek_pos/
-						      cfile->arate/cfile->achans/cfile->asampsize*8;
+          cfile->arate/cfile->achans/cfile->asampsize*8;
     else return FALSE;
 #else
     return FALSE;
 #endif
-  }
-  else return FALSE;
+  } else return FALSE;
 
   avsync-=(mainw->actual_frame-1.)/cfile->fps;
 
-  msg=g_strdup_printf(_("Audio is ahead of video by %.4f secs. at frame %d, with fps %.4f\n"),
-		      avsync,mainw->actual_frame,cfile->pb_fps);
   last_dprint_file=mainw->last_dprint_file;
   mainw->no_switch_dprint=TRUE;
-  d_print(msg);
+  d_print(_("Audio is ahead of video by %.4f secs. at frame %d, with fps %.4f\n"),
+          avsync,mainw->actual_frame,cfile->pb_fps);
   mainw->no_switch_dprint=FALSE;
   mainw->last_dprint_file=last_dprint_file;
-  g_free(msg);
   return TRUE;
 }
 
 
 
-boolean storeclip_callback (LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, gpointer clip_number) {
+boolean storeclip_callback(LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, livespointer clip_number) {
   // ctrl-fn key will store a clip for higher switching
-  int clip=GPOINTER_TO_INT (clip_number)-1;
+  int clip=LIVES_POINTER_TO_INT(clip_number)-1;
   register int i;
 
+  if (!mainw->interactive) return TRUE;
+
   if (clip>=FN_KEYS-1) {
     // last fn key will clear all
-    for (i=0;i<FN_KEYS-1;i++) {
+    for (i=0; i<FN_KEYS-1; i++) {
       mainw->clipstore[i]=0;
     }
     return TRUE;
@@ -10315,8 +10225,7 @@
 
   if (mainw->clipstore[clip]<1||mainw->files[mainw->clipstore[clip]]==NULL) {
     mainw->clipstore[clip]=mainw->current_file;
-  }
-  else {
+  } else {
     switch_clip(0,mainw->clipstore[clip]);
   }
   return TRUE;
@@ -10324,8 +10233,8 @@
 
 
 
-void on_toolbar_hide (LiVESButton *button, gpointer user_data) {
-  lives_widget_hide (mainw->tb_hbox);
+void on_toolbar_hide(LiVESButton *button, livespointer user_data) {
+  lives_widget_hide(mainw->tb_hbox);
   fullscreen_internal();
   future_prefs->show_tool=FALSE;
 }
@@ -10334,11 +10243,10 @@
 
 
 
-void on_capture_activate (LiVESMenuItem *menuitem, gpointer user_data) {
+void on_capture_activate(LiVESMenuItem *menuitem, livespointer user_data) {
   int curr_file=mainw->current_file;
-  gchar *msg;
-  gchar *com;
-  gchar **array;
+  char *com;
+  char **array;
   int response;
   double rec_end_time=-1.;
 
@@ -10361,23 +10269,22 @@
 
   if (mainw->multitrack!=NULL) {
     if (mainw->multitrack->idlefunc>0) {
-      g_source_remove(mainw->multitrack->idlefunc);
+      lives_source_remove(mainw->multitrack->idlefunc);
       mainw->multitrack->idlefunc=0;
     }
     mt_desensitise(mainw->multitrack);
   }
 
   if (prefs->rec_desktop_audio&&((prefs->audio_player==AUD_PLAYER_JACK&&capable->has_jackd)||
-				 (prefs->audio_player==AUD_PLAYER_PULSE&&capable->has_pulse_audio))) {
+                                 (prefs->audio_player==AUD_PLAYER_PULSE&&capable->has_pulse_audio))) {
     resaudw=create_resaudw(8,NULL,NULL);
-  }
-  else {
+  } else {
     resaudw=create_resaudw(9,NULL,NULL);
   }
-  response=lives_dialog_run (LIVES_DIALOG (resaudw->dialog));
-  
+  response=lives_dialog_run(LIVES_DIALOG(resaudw->dialog));
+
   if (response!=LIVES_RESPONSE_OK) {
-    lives_widget_destroy (resaudw->dialog);
+    lives_widget_destroy(resaudw->dialog);
 
     if (mainw->multitrack!=NULL) {
       mt_sensitise(mainw->multitrack);
@@ -10386,21 +10293,20 @@
 
     return;
   }
-  
+
   if (prefs->rec_desktop_audio&&((prefs->audio_player==AUD_PLAYER_JACK&&capable->has_jackd)||
-				 (prefs->audio_player==AUD_PLAYER_PULSE&&capable->has_pulse_audio))) {
-    mainw->rec_arate=(int)atoi (lives_entry_get_text(LIVES_ENTRY(resaudw->entry_arate)));
-    mainw->rec_achans=(int)atoi (lives_entry_get_text(LIVES_ENTRY(resaudw->entry_achans)));
-    mainw->rec_asamps=(int)atoi (lives_entry_get_text(LIVES_ENTRY(resaudw->entry_asamps)));
-  
+                                 (prefs->audio_player==AUD_PLAYER_PULSE&&capable->has_pulse_audio))) {
+    mainw->rec_arate=(int)atoi(lives_entry_get_text(LIVES_ENTRY(resaudw->entry_arate)));
+    mainw->rec_achans=(int)atoi(lives_entry_get_text(LIVES_ENTRY(resaudw->entry_achans)));
+    mainw->rec_asamps=(int)atoi(lives_entry_get_text(LIVES_ENTRY(resaudw->entry_asamps)));
+
     if (lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(resaudw->rb_unsigned))) {
       mainw->rec_signed_endian=AFORM_UNSIGNED;
     }
     if (lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(resaudw->rb_bigend))) {
       mainw->rec_signed_endian|=AFORM_BIG_ENDIAN;
     }
-  }
-  else {
+  } else {
     mainw->rec_arate=mainw->rec_achans=mainw->rec_asamps=mainw->rec_signed_endian=0;
   }
 
@@ -10408,23 +10314,22 @@
 
   if (!lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(resaudw->unlim_radiobutton))) {
     rec_end_time=(lives_spin_button_get_value(LIVES_SPIN_BUTTON(resaudw->hour_spinbutton))*60.
-		  +lives_spin_button_get_value(LIVES_SPIN_BUTTON(resaudw->minute_spinbutton)))*60.
-      +lives_spin_button_get_value(LIVES_SPIN_BUTTON(resaudw->second_spinbutton));
+                  +lives_spin_button_get_value(LIVES_SPIN_BUTTON(resaudw->minute_spinbutton)))*60.
+                 +lives_spin_button_get_value(LIVES_SPIN_BUTTON(resaudw->second_spinbutton));
     mainw->rec_vid_frames=(rec_end_time*mainw->rec_fps+.5);
-  }
-  else mainw->rec_vid_frames=-1;
+  } else mainw->rec_vid_frames=-1;
 
-  lives_widget_destroy (resaudw->dialog);
+  lives_widget_destroy(resaudw->dialog);
   lives_widget_context_update();
-  if (resaudw!=NULL) g_free(resaudw);
+  if (resaudw!=NULL) lives_free(resaudw);
   resaudw=NULL;
-  
+
   if (prefs->rec_desktop_audio&&mainw->rec_arate<=0&&((prefs->audio_player==AUD_PLAYER_JACK&&capable->has_jackd)||
-						      (prefs->audio_player==AUD_PLAYER_PULSE&&capable->has_pulse_audio))) {
+      (prefs->audio_player==AUD_PLAYER_PULSE&&capable->has_pulse_audio))) {
     do_audrate_error_dialog();
     return;
   }
-  
+
   if (rec_end_time==0.) {
     do_error_dialog(_("\nRecord time must be greater than 0.\n"));
     if (mainw->multitrack!=NULL) {
@@ -10437,19 +10342,20 @@
   if (mainw->multitrack==NULL) lives_widget_hide(mainw->LiVES);
   else lives_widget_hide(mainw->multitrack->window);
 
-  if (!(do_warning_dialog(_ ("Capture an External Window:\n\nClick on 'OK', then click on any window to capture it\nClick 'Cancel' to cancel\n\n")))) {
+  if (!(do_warning_dialog(
+          _("Capture an External Window:\n\nClick on 'OK', then click on any window to capture it\nClick 'Cancel' to cancel\n\n")))) {
     if (prefs->show_gui) {
       if (mainw->multitrack==NULL) lives_widget_show(mainw->LiVES);
       else lives_widget_show(mainw->multitrack->window);
     }
-    d_print (_ ("External window was released.\n"));
+    d_print(_("External window was released.\n"));
     if (mainw->multitrack!=NULL) {
       mt_sensitise(mainw->multitrack);
       mainw->multitrack->idlefunc=mt_idle_add(mainw->multitrack);
     }
     return;
   }
-  
+
   // an example of using 'get_temp_handle()' ////////
   if (!get_temp_handle(mainw->first_free_file,TRUE)) {
     if (prefs->show_gui) lives_widget_show(mainw->LiVES);
@@ -10461,10 +10367,10 @@
     return;
   }
 
-  com=g_strdup_printf("%s get_window_id \"%s\"",prefs->backend,cfile->handle);
+  com=lives_strdup_printf("%s get_window_id \"%s\"",prefs->backend,cfile->handle);
   mainw->com_failed=FALSE;
   lives_system(com,FALSE);
-  g_free(com);
+  lives_free(com);
 
   if (mainw->com_failed) {
     if (prefs->show_gui) lives_widget_show(mainw->LiVES);
@@ -10476,7 +10382,7 @@
     return;
   }
 
-  do_progress_dialog(TRUE,FALSE,_ ("Click on a Window to Capture it\nPress 'q' to stop recording"));
+  do_progress_dialog(TRUE,FALSE,_("Click on a Window to Capture it\nPress 'q' to stop recording"));
 
   if (get_token_count(mainw->msg,'|')<6) {
     if (prefs->show_gui) lives_widget_show(mainw->LiVES);
@@ -10488,8 +10394,8 @@
     return;
   }
 
-  array=g_strsplit(mainw->msg,"|",-1);
-#if GTK_CHECK_VERSION(3,0,0)
+  array=lives_strsplit(mainw->msg,"|",-1);
+#if GTK_CHECK_VERSION(3,0,0) || defined GUI_QT
   mainw->foreign_id=(Window)atoi(array[1]);
 #else
   mainw->foreign_id=(GdkNativeWindow)atoi(array[1]);
@@ -10497,29 +10403,27 @@
   mainw->foreign_width=atoi(array[2]);
   mainw->foreign_height=atoi(array[3]);
   mainw->foreign_bpp=atoi(array[4]);
-  mainw->foreign_visual=g_strdup(array[5]);
-  g_strfreev(array);
+  mainw->foreign_visual=lives_strdup(array[5]);
+  lives_strfreev(array);
 
-  com=g_strdup_printf("%s close \"%s\"",prefs->backend,cfile->handle);
+  com=lives_strdup_printf("%s close \"%s\"",prefs->backend,cfile->handle);
   lives_system(com,TRUE);
-  g_free(com);
-  g_free(cfile);
+  lives_free(com);
+  lives_free(cfile);
   cfile=NULL;
   if (mainw->first_free_file==-1||mainw->first_free_file>mainw->current_file) mainw->first_free_file=mainw->current_file;
 
   mainw->current_file=curr_file;
   ////////////////////////////////////////
 
-  msg=g_strdup_printf(_ ("\nExternal window captured. Width=%d, height=%d, bpp=%d. *Do not resize*\n\nStop or 'q' to finish.\n(Default of %.3f frames per second will be used.)\n"),
-		      mainw->foreign_width,mainw->foreign_height,mainw->foreign_bpp,mainw->rec_fps);
-  d_print(msg);
-  g_free (msg);
+  d_print(_("\nExternal window captured. Width=%d, height=%d, bpp=%d. *Do not resize*\n\nStop or 'q' to finish.\n(Default of %.3f frames per second will be used.)\n"),
+          mainw->foreign_width,mainw->foreign_height,mainw->foreign_bpp,mainw->rec_fps);
 
   // start another copy of LiVES and wait for it to return values
-  com=g_strdup_printf("%s -capture %d %u %d %d %s %d %d %.4f %d %d %d %d \"%s\"",capable->myname_full,capable->mainpid,
-		      (unsigned int)mainw->foreign_id,mainw->foreign_width,mainw->foreign_height,prefs->image_ext,
-		      mainw->foreign_bpp,mainw->rec_vid_frames,mainw->rec_fps,mainw->rec_arate,
-		      mainw->rec_asamps,mainw->rec_achans,mainw->rec_signed_endian,mainw->foreign_visual);
+  com=lives_strdup_printf("%s -capture %d %u %d %d %s %d %d %.4f %d %d %d %d \"%s\"",capable->myname_full,capable->mainpid,
+                          (unsigned int)mainw->foreign_id,mainw->foreign_width,mainw->foreign_height,prefs->image_ext,
+                          mainw->foreign_bpp,mainw->rec_vid_frames,mainw->rec_fps,mainw->rec_arate,
+                          mainw->rec_asamps,mainw->rec_achans,mainw->rec_signed_endian,mainw->foreign_visual);
 
   // force the dialog to disappear
   lives_widget_context_update();
@@ -10536,7 +10440,7 @@
   mainw->noswitch=FALSE;
 
   if (!after_foreign_play()&&mainw->cancelled==CANCEL_NONE) {
-    do_error_dialog(_ ("LiVES was unable to capture this window. Sorry.\n"));
+    do_error_dialog(_("LiVES was unable to capture this window. Sorry.\n"));
     sensitize();
   }
 
@@ -10552,10 +10456,10 @@
 
 void on_capture2_activate(void) {
   // this is in the second copy of lives, we are now going to grab frames from the X window
-  gchar *capfilename=g_strdup_printf(".capture.%d",mainw->foreign_key);
-  gchar *capfile=g_build_filename(prefs->tmpdir,capfilename,NULL);
+  char *capfilename=lives_strdup_printf(".capture.%d",mainw->foreign_key);
+  char *capfile=lives_build_filename(prefs->tmpdir,capfilename,NULL);
 
-  gchar buf[32];
+  char buf[32];
 
   boolean retval;
   int capture_fd;
@@ -10564,9 +10468,9 @@
 
   retval=prepare_to_play_foreign();
 
-  if (mainw->foreign_visual!=NULL) g_free(mainw->foreign_visual);
+  if (mainw->foreign_visual!=NULL) lives_free(mainw->foreign_visual);
 
-  if (!retval) exit (2);
+  if (!retval) exit(2);
 
   mainw->record_foreign=TRUE;  // for now...
 
@@ -10575,22 +10479,22 @@
   // pass the handle and frames back to the caller
   capture_fd=creat(capfile,S_IRUSR|S_IWUSR);
   if (capture_fd<0) {
-    g_free(capfile);
+    lives_free(capfile);
     exit(1);
   }
 
-  for (i=1;i<MAX_FILES;i++) {
+  for (i=1; i<MAX_FILES; i++) {
     if (mainw->files[i]==NULL) break;
     lives_write(capture_fd,mainw->files[i]->handle,strlen(mainw->files[i]->handle),TRUE);
     lives_write(capture_fd,"|",1,TRUE);
-    g_snprintf (buf,32,"%d",cfile->frames);
-    lives_write(capture_fd,buf,strlen (buf),TRUE);
+    lives_snprintf(buf,32,"%d",cfile->frames);
+    lives_write(capture_fd,buf,strlen(buf),TRUE);
     lives_write(capture_fd,"|",1,TRUE);
   }
 
   close(capture_fd);
-  g_free(capfilename);
-  g_free(capfile);
+  lives_free(capfilename);
+  lives_free(capfile);
   exit(0);
 
 }
@@ -10599,75 +10503,76 @@
 
 
 // TODO - move all encoder related stuff from here and plugins.c into encoders.c
-void on_encoder_ofmt_changed (LiVESCombo *combo, gpointer user_data) {
+void on_encoder_ofmt_changed(LiVESCombo *combo, livespointer user_data) {
   // change encoder format in the encoder plugin
-  gchar **array;
-  GList *ofmt_all=NULL;
-  int i, counter;
-  gchar *new_fmt;
-
   render_details *rdet = (render_details *)user_data;
 
-  if (rdet == NULL){
-      new_fmt = lives_combo_get_active_text(LIVES_COMBO(prefsw->ofmt_combo));
-  }
-  else{
-      new_fmt = lives_combo_get_active_text(LIVES_COMBO(rdet->ofmt_combo));
+  LiVESList *ofmt_all=NULL;
+
+  char **array;
+  char *new_fmt;
+
+  int counter;
+  register int i;
+
+  if (rdet == NULL) {
+    new_fmt = lives_combo_get_active_text(LIVES_COMBO(prefsw->ofmt_combo));
+  } else {
+    new_fmt = lives_combo_get_active_text(LIVES_COMBO(rdet->ofmt_combo));
   }
 
-  if ( !strlen( new_fmt ) || !strcmp( new_fmt, mainw->string_constants[LIVES_STRING_CONSTANT_ANY] ) ){
-    g_free(new_fmt);
+  if (!strlen(new_fmt) || !strcmp(new_fmt, mainw->string_constants[LIVES_STRING_CONSTANT_ANY])) {
+    lives_free(new_fmt);
     return;
   }
 
   if ((ofmt_all=plugin_request_by_line(PLUGIN_ENCODERS,future_prefs->encoder.name,"get_formats"))!=NULL) {
     // get details for the current format
     counter = 0;
-    for (i=0;i<g_list_length(ofmt_all);i++) {
-      if (get_token_count ((gchar *)g_list_nth_data (ofmt_all,i),'|')>2) {
-	array=g_strsplit ((gchar *)g_list_nth_data (ofmt_all,i),"|",-1);
-
-	if (!strcmp(array[1],new_fmt)) {
-	  if (prefsw!=NULL) {
-	    lives_signal_handler_block(prefsw->ofmt_combo, prefsw->encoder_ofmt_fn);
+    for (i=0; i<lives_list_length(ofmt_all); i++) {
+      if (get_token_count((char *)lives_list_nth_data(ofmt_all,i),'|')>2) {
+        array=lives_strsplit((char *)lives_list_nth_data(ofmt_all,i),"|",-1);
+
+        if (!strcmp(array[1],new_fmt)) {
+          if (prefsw!=NULL) {
+            lives_signal_handler_block(prefsw->ofmt_combo, prefsw->encoder_ofmt_fn);
             lives_combo_set_active_index(LIVES_COMBO(prefsw->ofmt_combo), counter);
-	    lives_signal_handler_unblock(prefsw->ofmt_combo, prefsw->encoder_ofmt_fn);
-	  }
-	  if (rdet!=NULL) {
-	    lives_signal_handler_block(rdet->ofmt_combo, rdet->encoder_ofmt_fn);
+            lives_signal_handler_unblock(prefsw->ofmt_combo, prefsw->encoder_ofmt_fn);
+          }
+          if (rdet!=NULL) {
+            lives_signal_handler_block(rdet->ofmt_combo, rdet->encoder_ofmt_fn);
             lives_combo_set_active_index(LIVES_COMBO(rdet->ofmt_combo), counter);
-	    lives_signal_handler_unblock(rdet->ofmt_combo, rdet->encoder_ofmt_fn);
-	  }
-	  g_snprintf(future_prefs->encoder.of_name,51,"%s",array[0]);
-	  g_snprintf(future_prefs->encoder.of_desc,128,"%s",array[1]);
-	  
-	  future_prefs->encoder.of_allowed_acodecs=atoi(array[2]);
-	  g_strfreev (array);
-	  break;
-	}
-	g_strfreev (array);
-	counter++;
+            lives_signal_handler_unblock(rdet->ofmt_combo, rdet->encoder_ofmt_fn);
+          }
+          lives_snprintf(future_prefs->encoder.of_name,51,"%s",array[0]);
+          lives_snprintf(future_prefs->encoder.of_desc,128,"%s",array[1]);
+
+          future_prefs->encoder.of_allowed_acodecs=atoi(array[2]);
+          lives_strfreev(array);
+          break;
+        }
+        lives_strfreev(array);
+        counter++;
       }
     }
     if (ofmt_all!=NULL) {
-      g_list_free_strings (ofmt_all);
-      g_list_free (ofmt_all);
+      lives_list_free_strings(ofmt_all);
+      lives_list_free(ofmt_all);
     }
-    g_free(new_fmt);
-    
+    lives_free(new_fmt);
+
     if (rdet!=NULL&&prefsw==NULL) {
       if (strcmp(prefs->encoder.of_name,future_prefs->encoder.of_name)) {
-	rdet->enc_changed=TRUE;
-	g_snprintf(prefs->encoder.of_name,51,"%s",future_prefs->encoder.of_name);
-	g_snprintf(prefs->encoder.of_desc,128,"%s",future_prefs->encoder.of_desc);
-	g_snprintf(prefs->encoder.of_restrict,1024,"%s",future_prefs->encoder.of_restrict);
-	prefs->encoder.of_allowed_acodecs=future_prefs->encoder.of_allowed_acodecs;
-	set_pref("output_type",prefs->encoder.of_name);
+        rdet->enc_changed=TRUE;
+        lives_snprintf(prefs->encoder.of_name,51,"%s",future_prefs->encoder.of_name);
+        lives_snprintf(prefs->encoder.of_desc,128,"%s",future_prefs->encoder.of_desc);
+        lives_snprintf(prefs->encoder.of_restrict,1024,"%s",future_prefs->encoder.of_restrict);
+        prefs->encoder.of_allowed_acodecs=future_prefs->encoder.of_allowed_acodecs;
+        set_pref("output_type",prefs->encoder.of_name);
       }
     }
     set_acodec_list_from_allowed(prefsw,rdet);
-  }
-  else {
+  } else {
     do_plugin_encoder_error(future_prefs->encoder.name);
   }
 }
@@ -10680,196 +10585,218 @@
 
 // TODO - move all this to audio.c
 
-void on_export_audio_activate (LiVESMenuItem *menuitem, gpointer user_data) {
+void on_export_audio_activate(LiVESMenuItem *menuitem, livespointer user_data) {
+
+  char *filt[]= {"*.wav",NULL};
+  char *filename,*file_name;
+  char *com,*tmp;
 
-  gchar *com,*tmp;
-  int nrate=cfile->arps;
   double start,end;
-  int asigned=!(cfile->signed_endian&AFORM_UNSIGNED);
 
-  gchar *filt[]={"*.wav",NULL};
-  gchar *filename,*file_name;
+  int nrate=cfile->arps;
+  int asigned=!(cfile->signed_endian&AFORM_UNSIGNED);
 
-  if (cfile->end>0&&!GPOINTER_TO_INT (user_data)) {
-    filename = choose_file (strlen(mainw->audio_dir)?mainw->audio_dir:NULL,NULL,
-			    filt,LIVES_FILE_CHOOSER_ACTION_SAVE,_ ("Export Selected Audio as..."),NULL);
-  }
-  else {
-    filename = choose_file (strlen(mainw->audio_dir)?mainw->audio_dir:NULL,NULL,
-			    filt,LIVES_FILE_CHOOSER_ACTION_SAVE,_ ("Export Audio as..."),NULL);
+  if (cfile->end>0&&!LIVES_POINTER_TO_INT(user_data)) {
+    filename = choose_file(strlen(mainw->audio_dir)?mainw->audio_dir:NULL,NULL,
+                           filt,LIVES_FILE_CHOOSER_ACTION_SAVE,_("Export Selected Audio as..."),NULL);
+  } else {
+    filename = choose_file(strlen(mainw->audio_dir)?mainw->audio_dir:NULL,NULL,
+                           filt,LIVES_FILE_CHOOSER_ACTION_SAVE,_("Export Audio as..."),NULL);
   }
 
   if (filename==NULL) return;
   file_name=ensure_extension(filename,".wav");
-  g_free (filename);
-  
+  lives_free(filename);
+
   if (!check_file(file_name,FALSE)) {
-    g_free(file_name);
+    lives_free(file_name);
     return;
   }
 
   // warn if arps!=arate
-  if ((prefs->audio_player==AUD_PLAYER_SOX||prefs->audio_player==AUD_PLAYER_JACK||
-       prefs->audio_player==AUD_PLAYER_PULSE)&&cfile->arate!=cfile->arps) {
-    if (do_warning_dialog(_ ("\n\nThe audio playback speed has been altered for this clip.\nClick 'OK' to export at the new speed, or 'Cancel' to export at the original rate.\n"))) {
+  if ((prefs->audio_player==AUD_PLAYER_SOX||is_realtime_aplayer(prefs->audio_player))&&cfile->arate!=cfile->arps) {
+    if (do_warning_dialog(
+          _("\n\nThe audio playback speed has been altered for this clip.\nClick 'OK' to export at the new speed, or 'Cancel' to export at the original rate.\n"))) {
       nrate=cfile->arate;
     }
   }
-  
-  if (cfile->start*cfile->end>0&&!GPOINTER_TO_INT (user_data)) {
-    g_snprintf (mainw->msg,256,_ ("Exporting audio frames %d to %d as %s..."),cfile->start,cfile->end,file_name);
-    start=calc_time_from_frame (mainw->current_file,cfile->start);
-    end=calc_time_from_frame (mainw->current_file,cfile->end);
-  }
-  else {
-    g_snprintf (mainw->msg,256,_ ("Exporting audio as %s..."),file_name);
+
+  if (cfile->start*cfile->end>0&&!LIVES_POINTER_TO_INT(user_data)) {
+    lives_snprintf(mainw->msg,256,_("Exporting audio frames %d to %d as %s..."),cfile->start,cfile->end,file_name);
+    start=calc_time_from_frame(mainw->current_file,cfile->start);
+    end=calc_time_from_frame(mainw->current_file,cfile->end);
+  } else {
+    lives_snprintf(mainw->msg,256,_("Exporting audio as %s..."),file_name);
     start=0.;
     end=0.;
   }
 
-  d_print (mainw->msg);
-  
-  com=g_strdup_printf ("%s export_audio \"%s\" %.8f %.8f %d %d %d %d %d \"%s\"",prefs->backend,cfile->handle,
-		       start,end,cfile->arps,cfile->achans,cfile->asampsize,asigned,nrate,
-		       (tmp=g_filename_from_utf8 (file_name,-1,NULL,NULL,NULL)));
-  g_free(tmp);
- 
-  unlink (cfile->info_file);
+  d_print(mainw->msg);
+
+  com=lives_strdup_printf("%s export_audio \"%s\" %.8f %.8f %d %d %d %d %d \"%s\"",prefs->backend,cfile->handle,
+                          start,end,cfile->arps,cfile->achans,cfile->asampsize,asigned,nrate,
+                          (tmp=lives_filename_from_utf8(file_name,-1,NULL,NULL,NULL)));
+  lives_free(tmp);
+
+  unlink(cfile->info_file);
   mainw->com_failed=FALSE;
-  lives_system (com,FALSE);
-  g_free (com);
+  lives_system(com,FALSE);
+  lives_free(com);
 
   if (mainw->com_failed) {
-    g_free(file_name);
+    lives_free(file_name);
     d_print_failed();
     return;
   }
 
-  cfile->op_dir=g_filename_from_utf8((tmp=get_dir(file_name)),-1,NULL,NULL,NULL);
-  g_free(tmp);
+  cfile->op_dir=lives_filename_from_utf8((tmp=get_dir(file_name)),-1,NULL,NULL,NULL);
+  lives_free(tmp);
 
-  do_progress_dialog (TRUE, FALSE, _("Exporting audio"));
+  do_progress_dialog(TRUE, FALSE, _("Exporting audio"));
 
   if (mainw->error) {
     d_print_failed();
-    do_error_dialog (mainw->msg);
-  }
-  else {
+    do_error_dialog(mainw->msg);
+  } else {
     d_print_done();
-    g_snprintf (mainw->audio_dir,PATH_MAX,"%s",file_name);
-    get_dirname (mainw->audio_dir);
+    lives_snprintf(mainw->audio_dir,PATH_MAX,"%s",file_name);
+    get_dirname(mainw->audio_dir);
   }
-  g_free(file_name);
+  lives_free(file_name);
 }
 
 
-void on_append_audio_activate (LiVESMenuItem *menuitem, gpointer user_data) {
+void on_append_audio_activate(LiVESMenuItem *menuitem, livespointer user_data) {
+  LiVESWidget *chooser;
+
+  char *com,*tmp,*tmp2;
+  char *a_type;
+
+  int asigned=!(cfile->signed_endian&AFORM_UNSIGNED);
+  int aendian=!(cfile->signed_endian&AFORM_BIG_ENDIAN);
+
+  int resp;
+
   if (!(prefs->warning_mask&WARN_MASK_LAYOUT_ALTER_AUDIO)&&
       (mainw->xlays=layout_audio_is_affected(mainw->current_file,0.))!=NULL) {
     if (!do_layout_alter_audio_warning()) {
-      g_list_free_strings(mainw->xlays);
-      g_list_free(mainw->xlays);
+      lives_list_free_strings(mainw->xlays);
+      lives_list_free(mainw->xlays);
       mainw->xlays=NULL;
       return;
     }
-    add_lmap_error(LMAP_ERROR_ALTER_AUDIO,cfile->name,(gpointer)cfile->layout_map,mainw->current_file,0,0.,
-		   cfile->stored_layout_audio>0.);
-    g_list_free_strings(mainw->xlays);
-    g_list_free(mainw->xlays);
+    add_lmap_error(LMAP_ERROR_ALTER_AUDIO,cfile->name,(livespointer)cfile->layout_map,mainw->current_file,0,0.,
+                   cfile->stored_layout_audio>0.);
+    lives_list_free_strings(mainw->xlays);
+    lives_list_free(mainw->xlays);
     mainw->xlays=NULL;
   }
 
-  choose_file_with_preview(strlen(mainw->audio_dir)?mainw->audio_dir:NULL,_ ("LiVES: - Append Audio File"),5);
-
-}
-
-
-
+  chooser=choose_file_with_preview(strlen(mainw->audio_dir)?mainw->audio_dir:NULL,_("LiVES: - Append Audio File"),
+                                   LIVES_FILE_SELECTION_AUDIO_ONLY);
 
-void on_ok_append_audio_clicked (LiVESFileChooser *chooser, gpointer user_data) {
+  resp=lives_dialog_run(LIVES_DIALOG(chooser));
 
-  gchar *com,*tmp,*tmp2;
-  gchar *a_type;
+  end_fs_preview();
+  mainw->fs_playarea=NULL;
 
-  int asigned=!(cfile->signed_endian&AFORM_UNSIGNED);
-  int aendian=!(cfile->signed_endian&AFORM_BIG_ENDIAN);
+  if (resp!=LIVES_RESPONSE_ACCEPT) {
+    on_filechooser_cancel_clicked(chooser);
+    return;
+  }
 
-  g_snprintf(file_name,PATH_MAX,"%s",(tmp=g_filename_to_utf8((tmp2=lives_file_chooser_get_filename(chooser)),
-							     -1,NULL,NULL,NULL)));
-  g_free(tmp); g_free(tmp2);
+  lives_snprintf(file_name,PATH_MAX,"%s",(tmp=lives_filename_to_utf8((tmp2=lives_file_chooser_get_filename(LIVES_FILE_CHOOSER(chooser))),
+                                          -1,NULL,NULL,NULL)));
+  lives_free(tmp);
+  lives_free(tmp2);
 
-  end_fs_preview();
   lives_widget_destroy(LIVES_WIDGET(chooser));
 
   lives_widget_queue_draw(mainw->LiVES);
   lives_widget_context_update();
-  
+
   a_type=file_name+strlen(file_name)-3;
 
-  g_snprintf(mainw->audio_dir,PATH_MAX,"%s",file_name);
+  lives_snprintf(mainw->audio_dir,PATH_MAX,"%s",file_name);
   get_dirname(mainw->audio_dir);
 
-  if (!g_ascii_strncasecmp(a_type,".it",2)||!g_ascii_strncasecmp(a_type,"mp3",3)||!g_ascii_strncasecmp(a_type,"ogg",3)||
-      !g_ascii_strncasecmp(a_type,"wav",3)||!g_ascii_strncasecmp(a_type,"mod",3)||!g_ascii_strncasecmp(a_type,"xm",2)) {
-    com=g_strdup_printf ("%s append_audio \"%s\" \"%s\" %d %d %d %d %d \"%s\"",prefs->backend,cfile->handle,
-			 a_type,cfile->arate,
-			 cfile->achans,cfile->asampsize,asigned,aendian,
-			 (tmp=g_filename_from_utf8 (file_name,-1,NULL,NULL,NULL)));
-    g_free(tmp);
-  }
-  else {
+  if (!lives_ascii_strncasecmp(a_type,".it",2)||!lives_ascii_strncasecmp(a_type,"mp3",3)||!lives_ascii_strncasecmp(a_type,"ogg",3)||
+      !lives_ascii_strncasecmp(a_type,"wav",3)||!lives_ascii_strncasecmp(a_type,"mod",3)||!lives_ascii_strncasecmp(a_type,"xm",2)) {
+    com=lives_strdup_printf("%s append_audio \"%s\" \"%s\" %d %d %d %d %d \"%s\"",prefs->backend,cfile->handle,
+                            a_type,cfile->arate,
+                            cfile->achans,cfile->asampsize,asigned,aendian,
+                            (tmp=lives_filename_from_utf8(file_name,-1,NULL,NULL,NULL)));
+    lives_free(tmp);
+  } else {
     do_audio_import_error();
+    if (mainw->multitrack!=NULL) {
+      mt_sensitise(mainw->multitrack);
+      mainw->multitrack->idlefunc=mt_idle_add(mainw->multitrack);
+    }
     return;
   }
 
-  g_snprintf (mainw->msg,256,_ ("Appending audio file %s..."),file_name);
+  lives_snprintf(mainw->msg,256,_("Appending audio file %s..."),file_name);
   d_print(""); // force switchtext
-  d_print (mainw->msg);
- 
-  unlink (cfile->info_file);
+  d_print(mainw->msg);
+
+  unlink(cfile->info_file);
   mainw->com_failed=FALSE;
-  lives_system (com,FALSE);
-  g_free (com);
+  lives_system(com,FALSE);
+  lives_free(com);
 
-  if (mainw->com_failed) return;
+  if (mainw->com_failed) {
+    if (mainw->multitrack!=NULL) {
+      mt_sensitise(mainw->multitrack);
+      mainw->multitrack->idlefunc=mt_idle_add(mainw->multitrack);
+    }
+    return;
+  }
 
-  if (!do_progress_dialog (TRUE, TRUE,_ ("Appending audio"))) {
+  if (!do_progress_dialog(TRUE, TRUE,_("Appending audio"))) {
     lives_widget_queue_draw(mainw->LiVES);
     lives_widget_context_update();
     mainw->cancelled=CANCEL_NONE;
     mainw->error=FALSE;
     mainw->com_failed=FALSE;
-    unlink (cfile->info_file);
-    com=g_strdup_printf ("%s cancel_audio \"%s\"",prefs->backend,cfile->handle);
-    lives_system (com,FALSE);
+    unlink(cfile->info_file);
+    com=lives_strdup_printf("%s cancel_audio \"%s\"",prefs->backend,cfile->handle);
+    lives_system(com,FALSE);
     if (!mainw->com_failed) {
       do_auto_dialog(_("Cancelling"),0);
       check_backend_return(cfile);
     }
-    g_free (com);
+    lives_free(com);
     reget_afilesize(mainw->current_file);
     get_play_times();
     if (mainw->error) d_print_failed();
+    if (mainw->multitrack!=NULL) {
+      mt_sensitise(mainw->multitrack);
+      mainw->multitrack->idlefunc=mt_idle_add(mainw->multitrack);
+    }
     return;
   }
 
   if (mainw->error) {
     d_print_failed();
-    do_error_dialog (mainw->msg);
-  }
-  else {
+    do_error_dialog(mainw->msg);
+  } else {
     lives_widget_queue_draw(mainw->LiVES);
     lives_widget_context_update();
-    com=g_strdup_printf ("%s commit_audio \"%s\"",prefs->backend,cfile->handle);
+    com=lives_strdup_printf("%s commit_audio \"%s\"",prefs->backend,cfile->handle);
     mainw->com_failed=FALSE;
     mainw->cancelled=CANCEL_NONE;
     mainw->error=FALSE;
-    unlink (cfile->info_file);
-    lives_system (com,FALSE);
-    g_free (com);
+    unlink(cfile->info_file);
+    lives_system(com,FALSE);
+    lives_free(com);
 
     if (mainw->com_failed) {
       d_print_failed();
+      if (mainw->multitrack!=NULL) {
+        mt_sensitise(mainw->multitrack);
+        mainw->multitrack->idlefunc=mt_idle_add(mainw->multitrack);
+      }
       return;
     }
 
@@ -10877,11 +10804,10 @@
     check_backend_return(cfile);
     if (mainw->error) {
       d_print_failed();
-      if (mainw->cancelled!=CANCEL_ERROR) do_error_dialog (mainw->msg);
-    }
-    else {
-      get_dirname (file_name);
-      g_snprintf (mainw->audio_dir,PATH_MAX,"%s",file_name);
+      if (mainw->cancelled!=CANCEL_ERROR) do_error_dialog(mainw->msg);
+    } else {
+      get_dirname(file_name);
+      lives_snprintf(mainw->audio_dir,PATH_MAX,"%s",file_name);
       reget_afilesize(mainw->current_file);
       cfile->changed=TRUE;
       get_play_times();
@@ -10889,27 +10815,32 @@
     }
   }
   cfile->undo_action=UNDO_APPEND_AUDIO;
-  set_undoable (_("Append Audio"),!prefs->conserve_space);
+  set_undoable(_("Append Audio"),!prefs->conserve_space);
+
+  if (mainw->multitrack!=NULL) {
+    mt_sensitise(mainw->multitrack);
+    mainw->multitrack->idlefunc=mt_idle_add(mainw->multitrack);
+  }
 }
 
 
 
-void on_trim_audio_activate (LiVESMenuItem *menuitem, gpointer user_data) {
+void on_trim_audio_activate(LiVESMenuItem *menuitem, livespointer user_data) {
   // type 0 == trim selected
   // type 1 == trim to play pointer
 
-  gchar *com,*msg;
-
-  int type=GPOINTER_TO_INT (user_data);
+  char *com,*msg;
 
   double start,end;
+
   boolean has_lmap_error=FALSE;
 
+  int type=LIVES_POINTER_TO_INT(user_data);
+
   if (type==0) {
-    start=calc_time_from_frame (mainw->current_file,cfile->start);
-    end=calc_time_from_frame (mainw->current_file,cfile->end+1);
-  }
-  else {
+    start=calc_time_from_frame(mainw->current_file,cfile->start);
+    end=calc_time_from_frame(mainw->current_file,cfile->end+1);
+  } else {
     start=0.;
     end=cfile->pointer_time;
   }
@@ -10917,17 +10848,17 @@
   if (!(prefs->warning_mask&WARN_MASK_LAYOUT_DELETE_AUDIO)) {
     if (end<cfile->laudio_time&&(mainw->xlays=layout_audio_is_affected(mainw->current_file,end))!=NULL) {
       if (!do_warning_dialog
-	  (_("\nDeletion will cause missing audio in some multitrack layouts.\nAre you sure you wish to continue ?\n"))) {
-	g_list_free_strings(mainw->xlays);
-	g_list_free(mainw->xlays);
-	mainw->xlays=NULL;
-	return;
+          (_("\nDeletion will cause missing audio in some multitrack layouts.\nAre you sure you wish to continue ?\n"))) {
+        lives_list_free_strings(mainw->xlays);
+        lives_list_free(mainw->xlays);
+        mainw->xlays=NULL;
+        return;
       }
-      add_lmap_error(LMAP_ERROR_DELETE_AUDIO,cfile->name,(gpointer)cfile->layout_map,mainw->current_file,0,end,
-		     cfile->stored_layout_audio>end);
+      add_lmap_error(LMAP_ERROR_DELETE_AUDIO,cfile->name,(livespointer)cfile->layout_map,mainw->current_file,0,end,
+                     cfile->stored_layout_audio>end);
       has_lmap_error=TRUE;
-      g_list_free_strings(mainw->xlays);
-      g_list_free(mainw->xlays);
+      lives_list_free_strings(mainw->xlays);
+      lives_list_free(mainw->xlays);
       mainw->xlays=NULL;
     }
   }
@@ -10935,35 +10866,35 @@
   if (!has_lmap_error&&!(prefs->warning_mask&WARN_MASK_LAYOUT_ALTER_AUDIO)&&
       (mainw->xlays=layout_audio_is_affected(mainw->current_file,0.))!=NULL) {
     if (!do_layout_alter_audio_warning()) {
-      g_list_free_strings(mainw->xlays);
-      g_list_free(mainw->xlays);
+      lives_list_free_strings(mainw->xlays);
+      lives_list_free(mainw->xlays);
       mainw->xlays=NULL;
       return;
     }
-    add_lmap_error(LMAP_ERROR_ALTER_AUDIO,cfile->name,(gpointer)cfile->layout_map,mainw->current_file,0,0.,
-		   cfile->stored_layout_audio>0.);
+    add_lmap_error(LMAP_ERROR_ALTER_AUDIO,cfile->name,(livespointer)cfile->layout_map,mainw->current_file,0,0.,
+                   cfile->stored_layout_audio>0.);
     has_lmap_error=TRUE;
-    g_list_free_strings(mainw->xlays);
-    g_list_free(mainw->xlays);
+    lives_list_free_strings(mainw->xlays);
+    lives_list_free(mainw->xlays);
     mainw->xlays=NULL;
   }
 
   if (end>cfile->laudio_time&&end>cfile->raudio_time)
-    msg=g_strdup_printf(_ ("Padding audio to %.2f seconds..."),end);
+    msg=lives_strdup_printf(_("Padding audio to %.2f seconds..."),end);
   else
-    msg=g_strdup_printf(_ ("Trimming audio from %.2f to %.2f seconds..."),start,end);
+    msg=lives_strdup_printf(_("Trimming audio from %.2f to %.2f seconds..."),start,end);
 
   d_print(msg);
-  g_free(msg);
+  lives_free(msg);
 
-  com=g_strdup_printf("%s trim_audio \"%s\" %.8f %.8f %d %d %d %d %d",prefs->backend, cfile->handle, 
-		      start, end, cfile->arate, 
-		      cfile->achans, cfile->asampsize, !(cfile->signed_endian&AFORM_UNSIGNED),
-		      !(cfile->signed_endian&AFORM_BIG_ENDIAN));
-  unlink (cfile->info_file);
+  com=lives_strdup_printf("%s trim_audio \"%s\" %.8f %.8f %d %d %d %d %d",prefs->backend, cfile->handle,
+                          start, end, cfile->arate,
+                          cfile->achans, cfile->asampsize, !(cfile->signed_endian&AFORM_UNSIGNED),
+                          !(cfile->signed_endian&AFORM_BIG_ENDIAN));
+  unlink(cfile->info_file);
   mainw->com_failed=FALSE;
-  lives_system (com,FALSE);
-  g_free(com);
+  lives_system(com,FALSE);
+  lives_free(com);
 
   if (mainw->com_failed) {
     d_print_failed();
@@ -10978,7 +10909,7 @@
   }
 
   if (!prefs->conserve_space) {
-    set_undoable (_("Trim/Pad Audio"),!prefs->conserve_space);
+    set_undoable(_("Trim/Pad Audio"),!prefs->conserve_space);
     cfile->undo_action=UNDO_TRIM_AUDIO;
   }
 
@@ -10997,12 +10928,12 @@
 
 
 
-void on_fade_audio_activate (LiVESMenuItem *menuitem, gpointer user_data) {
+void on_fade_audio_activate(LiVESMenuItem *menuitem, livespointer user_data) {
   // type == 0 fade in
   // type == 1 fade out
 
   double startt,endt,startv,endv,time=0.;
-  gchar *msg,*msg2,*utxt,*com;
+  char *msg,*msg2,*utxt,*com;
 
   boolean has_lmap_error=FALSE;
   int alarm_handle;
@@ -11011,19 +10942,18 @@
   aud_dialog_t *aud_d=NULL;
 
   if (menuitem!=NULL) {
-    cfile->undo1_int=type=GPOINTER_TO_INT(user_data);
+    cfile->undo1_int=type=LIVES_POINTER_TO_INT(user_data);
     aud_d=create_audfade_dialog(type);
     if (lives_dialog_run(LIVES_DIALOG(aud_d->dialog))==LIVES_RESPONSE_CANCEL) {
       lives_widget_destroy(aud_d->dialog);
-      g_free(aud_d);
+      lives_free(aud_d);
       return;
     }
-    
+
     time=lives_spin_button_get_value(LIVES_SPIN_BUTTON(aud_d->time_spin));
-    
+
     lives_widget_destroy(aud_d->dialog);
-  }
-  else {
+  } else {
     type=cfile->undo1_int;
   }
 
@@ -11031,63 +10961,59 @@
     if (menuitem==NULL) {
       endt=cfile->undo1_dbl;
       startt=cfile->undo2_dbl;
-    }
-    else {
+    } else {
       if (type==0) {
-	cfile->undo2_dbl=startt=0.;
-	cfile->undo1_dbl=endt=time;
-      }
-      else {
-	cfile->undo1_dbl=endt=cfile->laudio_time;
-	cfile->undo2_dbl=startt=cfile->laudio_time-time;
+        cfile->undo2_dbl=startt=0.;
+        cfile->undo1_dbl=endt=time;
+      } else {
+        cfile->undo1_dbl=endt=cfile->laudio_time;
+        cfile->undo2_dbl=startt=cfile->laudio_time-time;
       }
     }
-  }
-  else {
+  } else {
     cfile->undo2_dbl=startt=((double)cfile->start-1.)/cfile->fps;
     cfile->undo1_dbl=endt=(double)cfile->end/cfile->fps;
   }
-  
- 
+
+
   if (type==0) {
     startv=0.;
     endv=1.;
-    msg2=g_strdup(_("Fading audio in"));
-    utxt=g_strdup(_("Fade audio in"));
-  }
-  else {
+    msg2=lives_strdup(_("Fading audio in"));
+    utxt=lives_strdup(_("Fade audio in"));
+  } else {
     startv=1.;
     endv=0.;
-    msg2=g_strdup(_("Fading audio out"));
-    utxt=g_strdup(_("Fade audio out"));
+    msg2=lives_strdup(_("Fading audio out"));
+    utxt=lives_strdup(_("Fade audio out"));
   }
 
   if (menuitem!=NULL) {
     if (!(prefs->warning_mask&WARN_MASK_LAYOUT_ALTER_AUDIO)&&
-	(mainw->xlays=layout_audio_is_affected(mainw->current_file,0.))!=NULL) {
+        (mainw->xlays=layout_audio_is_affected(mainw->current_file,0.))!=NULL) {
       if (!do_layout_alter_audio_warning()) {
-	g_free(msg2);
-	g_free(utxt);
-	g_list_free_strings(mainw->xlays);
-	g_list_free(mainw->xlays);
-	mainw->xlays=NULL;
-	return;
+        lives_free(msg2);
+        lives_free(utxt);
+        lives_list_free_strings(mainw->xlays);
+        lives_list_free(mainw->xlays);
+        mainw->xlays=NULL;
+        return;
       }
-      add_lmap_error(LMAP_ERROR_ALTER_AUDIO,cfile->name,(gpointer)cfile->layout_map,mainw->current_file,0,0.,
-		     cfile->stored_layout_audio>0.);
+      add_lmap_error(LMAP_ERROR_ALTER_AUDIO,cfile->name,(livespointer)cfile->layout_map,mainw->current_file,0,0.,
+                     cfile->stored_layout_audio>0.);
       has_lmap_error=TRUE;
-      g_list_free_strings(mainw->xlays);
-      g_list_free(mainw->xlays);
+      lives_list_free_strings(mainw->xlays);
+      lives_list_free(mainw->xlays);
       mainw->xlays=NULL;
     }
 
-    if (!aud_d->is_sel) 
-      msg=g_strdup_printf(_("%s over %.1f seconds..."),msg2,time); 
-    else 
-      msg=g_strdup_printf(_("%s from time %.2f seconds to %.2f seconds..."),msg2,startt,endt); 
+    if (!aud_d->is_sel)
+      msg=lives_strdup_printf(_("%s over %.1f seconds..."),msg2,time);
+    else
+      msg=lives_strdup_printf(_("%s from time %.2f seconds to %.2f seconds..."),msg2,startt,endt);
     d_print(msg);
-    g_free(msg);
-    g_free(msg2);
+    lives_free(msg);
+    lives_free(msg2);
   }
 
   desensitize();
@@ -11100,9 +11026,9 @@
 
   if (!prefs->conserve_space) {
     mainw->error=FALSE;
-    com=g_strdup_printf("%s backup_audio \"%s\"",prefs->backend_sync,cfile->handle);
+    com=lives_strdup_printf("%s backup_audio \"%s\"",prefs->backend_sync,cfile->handle);
     lives_system(com,FALSE);
-    g_free(com);
+    lives_free(com);
 
     if (mainw->error) {
       lives_alarm_clear(alarm_handle);
@@ -11116,7 +11042,7 @@
   audio_free_fnames();
 
   while (!lives_alarm_get(alarm_handle)) {
-    g_usleep(prefs->sleep_time);
+    lives_usleep(prefs->sleep_time);
   }
 
   lives_alarm_clear(alarm_handle);
@@ -11127,14 +11053,14 @@
   cfile->changed=TRUE;
 
   if (!prefs->conserve_space) {
-    set_undoable (utxt,TRUE);
+    set_undoable(utxt,TRUE);
     cfile->undo_action=UNDO_FADE_AUDIO;
   }
-  g_free(utxt);
+  lives_free(utxt);
   sensitize();
 
   if (has_lmap_error) popup_lmap_errors(NULL,NULL);
-  if (aud_d!=NULL) g_free(aud_d);
+  if (aud_d!=NULL) lives_free(aud_d);
 
 }
 
@@ -11142,9 +11068,9 @@
 
 
 
-boolean on_del_audio_activate (LiVESMenuItem *menuitem, gpointer user_data) {
+boolean on_del_audio_activate(LiVESMenuItem *menuitem, livespointer user_data) {
   double start,end;
-  gchar *com,*msg=NULL;
+  char *com,*msg=NULL;
   boolean has_lmap_error=FALSE;
   boolean bad_header=FALSE;
 
@@ -11152,108 +11078,106 @@
     // undo/redo
     start=cfile->undo1_dbl;
     end=cfile->undo2_dbl;
-  }
-  else {
-    if (GPOINTER_TO_INT(user_data)) {
+  } else {
+    if (LIVES_POINTER_TO_INT(user_data)) {
 
       if (!(prefs->warning_mask&WARN_MASK_LAYOUT_DELETE_AUDIO)) {
-	if ((mainw->xlays=layout_audio_is_affected(mainw->current_file,0.))!=NULL) {
-	  if (!do_warning_dialog
-	      (_("\nDeletion will cause missing audio in some multitrack layouts.\nAre you sure you wish to continue ?\n"))) {
-	    g_list_free_strings(mainw->xlays);
-	    g_list_free(mainw->xlays);
-	    mainw->xlays=NULL;
-	    return FALSE;
-	  }
-	  add_lmap_error(LMAP_ERROR_DELETE_AUDIO,cfile->name,(gpointer)cfile->layout_map,mainw->current_file,0,0.,
-			 cfile->stored_layout_audio>0.);
-	  has_lmap_error=TRUE;
-	  g_list_free_strings(mainw->xlays);
-	  g_list_free(mainw->xlays);
-	  mainw->xlays=NULL;
-	}
+        if ((mainw->xlays=layout_audio_is_affected(mainw->current_file,0.))!=NULL) {
+          if (!do_warning_dialog
+              (_("\nDeletion will cause missing audio in some multitrack layouts.\nAre you sure you wish to continue ?\n"))) {
+            lives_list_free_strings(mainw->xlays);
+            lives_list_free(mainw->xlays);
+            mainw->xlays=NULL;
+            return FALSE;
+          }
+          add_lmap_error(LMAP_ERROR_DELETE_AUDIO,cfile->name,(livespointer)cfile->layout_map,mainw->current_file,0,0.,
+                         cfile->stored_layout_audio>0.);
+          has_lmap_error=TRUE;
+          lives_list_free_strings(mainw->xlays);
+          lives_list_free(mainw->xlays);
+          mainw->xlays=NULL;
+        }
       }
-      
+
       if (!has_lmap_error&&!(prefs->warning_mask&WARN_MASK_LAYOUT_ALTER_AUDIO)&&
-	  (mainw->xlays=layout_audio_is_affected(mainw->current_file,0.))!=NULL) {
-	if (!do_layout_alter_audio_warning()) {
-	  g_list_free_strings(mainw->xlays);
-	  g_list_free(mainw->xlays);
-	  mainw->xlays=NULL;
-	  return FALSE;
-	}
-	add_lmap_error(LMAP_ERROR_ALTER_AUDIO,cfile->name,(gpointer)cfile->layout_map,mainw->current_file,0,0.,
-		       cfile->stored_layout_audio>0.);
-	has_lmap_error=TRUE;
-	g_list_free_strings(mainw->xlays);
-	g_list_free(mainw->xlays);
-	mainw->xlays=NULL;
+          (mainw->xlays=layout_audio_is_affected(mainw->current_file,0.))!=NULL) {
+        if (!do_layout_alter_audio_warning()) {
+          lives_list_free_strings(mainw->xlays);
+          lives_list_free(mainw->xlays);
+          mainw->xlays=NULL;
+          return FALSE;
+        }
+        add_lmap_error(LMAP_ERROR_ALTER_AUDIO,cfile->name,(livespointer)cfile->layout_map,mainw->current_file,0,0.,
+                       cfile->stored_layout_audio>0.);
+        has_lmap_error=TRUE;
+        lives_list_free_strings(mainw->xlays);
+        lives_list_free(mainw->xlays);
+        mainw->xlays=NULL;
       }
 
       if (!cfile->frames) {
-	if (do_warning_dialog(_ ("\nDeleting all audio will close this file.\nAre you sure ?"))) close_current_file(0);
-	return FALSE;
+        if (do_warning_dialog(_("\nDeleting all audio will close this file.\nAre you sure ?"))) close_current_file(0);
+        return FALSE;
       }
-      msg=g_strdup(_ ("Deleting all audio..."));
+      msg=lives_strdup(_("Deleting all audio..."));
       start=end=0.;
-    }
-    else {
-      start=calc_time_from_frame (mainw->current_file,cfile->start);
-      end=calc_time_from_frame (mainw->current_file,cfile->end+1);
-      msg=g_strdup_printf(_ ("Deleting audio from %.2f to %.2f seconds..."),start,end);
+    } else {
+      start=calc_time_from_frame(mainw->current_file,cfile->start);
+      end=calc_time_from_frame(mainw->current_file,cfile->end+1);
+      msg=lives_strdup_printf(_("Deleting audio from %.2f to %.2f seconds..."),start,end);
       start*=(double)cfile->arate/(double)cfile->arps;
       end*=(double)cfile->arate/(double)cfile->arps;
 
       if (!(prefs->warning_mask&WARN_MASK_LAYOUT_SHIFT_AUDIO)) {
-	if ((mainw->xlays=layout_audio_is_affected(mainw->current_file,end))!=NULL) {
-	  if (!do_warning_dialog
-	      (_("\nDeletion will cause audio to shift in some multitrack layouts.\nAre you sure you wish to continue ?\n"))) {
-	    g_list_free_strings(mainw->xlays);
-	    g_list_free(mainw->xlays);
-	    mainw->xlays=NULL;
-	    return FALSE;
-	  }
-	  add_lmap_error(LMAP_ERROR_SHIFT_AUDIO,cfile->name,(gpointer)cfile->layout_map,mainw->current_file,0,start,
-			 cfile->stored_layout_audio>end);
-	  has_lmap_error=TRUE;
-	  g_list_free_strings(mainw->xlays);
-	  g_list_free(mainw->xlays);
-	  mainw->xlays=NULL;
-	}
+        if ((mainw->xlays=layout_audio_is_affected(mainw->current_file,end))!=NULL) {
+          if (!do_warning_dialog
+              (_("\nDeletion will cause audio to shift in some multitrack layouts.\nAre you sure you wish to continue ?\n"))) {
+            lives_list_free_strings(mainw->xlays);
+            lives_list_free(mainw->xlays);
+            mainw->xlays=NULL;
+            return FALSE;
+          }
+          add_lmap_error(LMAP_ERROR_SHIFT_AUDIO,cfile->name,(livespointer)cfile->layout_map,mainw->current_file,0,start,
+                         cfile->stored_layout_audio>end);
+          has_lmap_error=TRUE;
+          lives_list_free_strings(mainw->xlays);
+          lives_list_free(mainw->xlays);
+          mainw->xlays=NULL;
+        }
       }
 
       if (!has_lmap_error&&!(prefs->warning_mask&WARN_MASK_LAYOUT_DELETE_AUDIO)) {
-	if ((mainw->xlays=layout_audio_is_affected(mainw->current_file,start))!=NULL) {
-	  if (!do_warning_dialog
-	      (_("\nDeletion will cause missing audio in some multitrack layouts.\nAre you sure you wish to continue ?\n"))) {
-	    g_list_free_strings(mainw->xlays);
-	    g_list_free(mainw->xlays);
-	    mainw->xlays=NULL;
-	    return FALSE;
-	  }
-	  add_lmap_error(LMAP_ERROR_DELETE_AUDIO,cfile->name,(gpointer)cfile->layout_map,mainw->current_file,0,start,
-			 cfile->stored_layout_audio>start);
-	  has_lmap_error=TRUE;
-	  g_list_free_strings(mainw->xlays);
-	  g_list_free(mainw->xlays);
-	  mainw->xlays=NULL;
-	}
+        if ((mainw->xlays=layout_audio_is_affected(mainw->current_file,start))!=NULL) {
+          if (!do_warning_dialog
+              (_("\nDeletion will cause missing audio in some multitrack layouts.\nAre you sure you wish to continue ?\n"))) {
+            lives_list_free_strings(mainw->xlays);
+            lives_list_free(mainw->xlays);
+            mainw->xlays=NULL;
+            return FALSE;
+          }
+          add_lmap_error(LMAP_ERROR_DELETE_AUDIO,cfile->name,(livespointer)cfile->layout_map,mainw->current_file,0,start,
+                         cfile->stored_layout_audio>start);
+          has_lmap_error=TRUE;
+          lives_list_free_strings(mainw->xlays);
+          lives_list_free(mainw->xlays);
+          mainw->xlays=NULL;
+        }
       }
-      
+
       if (!has_lmap_error&&!(prefs->warning_mask&WARN_MASK_LAYOUT_ALTER_AUDIO)&&
-	  (mainw->xlays=layout_audio_is_affected(mainw->current_file,0.))!=NULL) {
-	if (!do_layout_alter_audio_warning()) {
-	  g_list_free_strings(mainw->xlays);
-	  g_list_free(mainw->xlays);
-	  mainw->xlays=NULL;
-	  return FALSE;
-	}
-	add_lmap_error(LMAP_ERROR_ALTER_AUDIO,cfile->name,(gpointer)cfile->layout_map,mainw->current_file,0,0.,
-		       cfile->stored_layout_audio>0.);
-	has_lmap_error=TRUE;
-	g_list_free_strings(mainw->xlays);
-	g_list_free(mainw->xlays);
-	mainw->xlays=NULL;
+          (mainw->xlays=layout_audio_is_affected(mainw->current_file,0.))!=NULL) {
+        if (!do_layout_alter_audio_warning()) {
+          lives_list_free_strings(mainw->xlays);
+          lives_list_free(mainw->xlays);
+          mainw->xlays=NULL;
+          return FALSE;
+        }
+        add_lmap_error(LMAP_ERROR_ALTER_AUDIO,cfile->name,(livespointer)cfile->layout_map,mainw->current_file,0,0.,
+                       cfile->stored_layout_audio>0.);
+        has_lmap_error=TRUE;
+        lives_list_free_strings(mainw->xlays);
+        lives_list_free(mainw->xlays);
+        mainw->xlays=NULL;
       }
 
     }
@@ -11271,30 +11195,30 @@
   if (msg!=NULL) {
     d_print("");
     d_print(msg);
-    g_free(msg);
+    lives_free(msg);
   }
 
-  com=g_strdup_printf("%s delete_audio \"%s\" %.8f %.8f %d %d %d", prefs->backend, 
-		      cfile->handle, start, end, cfile->arps, 
-		      cfile->achans, cfile->asampsize);
-  unlink (cfile->info_file);
+  com=lives_strdup_printf("%s delete_audio \"%s\" %.8f %.8f %d %d %d", prefs->backend,
+                          cfile->handle, start, end, cfile->arps,
+                          cfile->achans, cfile->asampsize);
+  unlink(cfile->info_file);
   mainw->com_failed=FALSE;
-  lives_system (com,FALSE);
-  g_free(com);
+  lives_system(com,FALSE);
+  lives_free(com);
 
   if (mainw->com_failed) {
     if (menuitem!=NULL) d_print_failed();
     return FALSE;
   }
 
-  do_progress_dialog(TRUE, FALSE, _ ("Deleting Audio"));
+  do_progress_dialog(TRUE, FALSE, _("Deleting Audio"));
 
   if (mainw->error) {
     if (menuitem!=NULL) d_print_failed();
     return FALSE;
   }
 
-  set_undoable (_("Delete Audio"),TRUE);
+  set_undoable(_("Delete Audio"),TRUE);
   cfile->undo_action=UNDO_DELETE_AUDIO;
 
   reget_afilesize(mainw->current_file);
@@ -11307,7 +11231,7 @@
     else cfile->achans=1;
     save_clip_value(mainw->current_file,CLIP_DETAILS_ACHANS,&cfile->achans);
     if (mainw->com_failed||mainw->write_failed) bad_header=TRUE;
-    
+
     if (bad_header) do_header_write_error(mainw->current_file);
   }
 
@@ -11325,17 +11249,13 @@
 }
 
 
-void
-on_rb_audrec_time_toggled                (LiVESToggleButton *togglebutton,
-					  gpointer         user_data)
-{
-  _resaudw *resaudw=(_resaudw *)user_data;  
+void on_rb_audrec_time_toggled(LiVESToggleButton *togglebutton, livespointer user_data) {
+  _resaudw *resaudw=(_resaudw *)user_data;
   if (lives_toggle_button_get_active(togglebutton)) {
     lives_widget_set_sensitive(resaudw->hour_spinbutton,TRUE);
     lives_widget_set_sensitive(resaudw->minute_spinbutton,TRUE);
     lives_widget_set_sensitive(resaudw->second_spinbutton,TRUE);
-  }
-  else {
+  } else {
     lives_widget_set_sensitive(resaudw->hour_spinbutton,FALSE);
     lives_widget_set_sensitive(resaudw->minute_spinbutton,FALSE);
     lives_widget_set_sensitive(resaudw->second_spinbutton,FALSE);
@@ -11343,11 +11263,9 @@
 }
 
 
-void
-on_recaudclip_activate (LiVESMenuItem     *menuitem,
-			gpointer         user_data) {
+void on_recaudclip_activate(LiVESMenuItem *menuitem, livespointer user_data) {
 
-  if (prefs->audio_player!=AUD_PLAYER_JACK&&prefs->audio_player!=AUD_PLAYER_PULSE) {
+  if (!is_realtime_aplayer(prefs->audio_player)) {
     do_nojack_rec_error();
     return;
   }
@@ -11358,16 +11276,16 @@
   mainw->fx4_val=mainw->endian;
   mainw->rec_end_time=-1.;
   resaudw=create_resaudw(5,NULL,NULL);
-  lives_widget_show (resaudw->dialog);
+  lives_widget_show(resaudw->dialog);
 }
 
+
 static boolean has_lmap_error_recsel;
 
-void
-on_recaudsel_activate (LiVESMenuItem     *menuitem,
-			gpointer         user_data) {
 
-  if (prefs->audio_player!=AUD_PLAYER_JACK&&prefs->audio_player!=AUD_PLAYER_PULSE) {
+void on_recaudsel_activate(LiVESMenuItem *menuitem, livespointer user_data) {
+
+  if (!is_realtime_aplayer(prefs->audio_player)) {
     do_nojack_rec_error();
     return;
   }
@@ -11377,16 +11295,16 @@
       (mainw->xlays=layout_audio_is_affected(mainw->current_file,0.))!=NULL) {
     if (!do_layout_alter_audio_warning()) {
       has_lmap_error_recsel=FALSE;
-      g_list_free_strings(mainw->xlays);
-      g_list_free(mainw->xlays);
+      lives_list_free_strings(mainw->xlays);
+      lives_list_free(mainw->xlays);
       mainw->xlays=NULL;
       return;
     }
-    add_lmap_error(LMAP_ERROR_ALTER_AUDIO,cfile->name,(gpointer)cfile->layout_map,mainw->current_file,0,0.,
-		   cfile->stored_layout_audio>0.);
+    add_lmap_error(LMAP_ERROR_ALTER_AUDIO,cfile->name,(livespointer)cfile->layout_map,mainw->current_file,0,0.,
+                   cfile->stored_layout_audio>0.);
     has_lmap_error_recsel=TRUE;
-    g_list_free_strings(mainw->xlays);
-    g_list_free(mainw->xlays);
+    lives_list_free_strings(mainw->xlays);
+    lives_list_free(mainw->xlays);
     mainw->xlays=NULL;
   }
 
@@ -11398,20 +11316,19 @@
     mainw->fx3_val=cfile->asampsize;
     mainw->fx4_val=cfile->signed_endian;
     resaudw=create_resaudw(7,NULL,NULL);
-  }
-  else {
+  } else {
     mainw->fx1_val=DEFAULT_AUDIO_RATE;
     mainw->fx2_val=DEFAULT_AUDIO_CHANS;
     mainw->fx3_val=DEFAULT_AUDIO_SAMPS;
     mainw->fx4_val=mainw->endian;
     resaudw=create_resaudw(6,NULL,NULL);
   }
-  lives_widget_show (resaudw->dialog);
+  lives_widget_show(resaudw->dialog);
 }
 
 
 
-void on_recaudclip_ok_clicked (LiVESButton *button, gpointer user_data) {
+void on_recaudclip_ok_clicked(LiVESButton *button, livespointer user_data) {
 #ifdef RT_AUDIO
   weed_timecode_t ins_pt;
   double aud_start,aud_end,vel=1.,vol=1.;
@@ -11422,7 +11339,7 @@
   int oachans=0,oarate=0,oarps=0,ose=0,oasamps=0;
   boolean backr=FALSE;
 
-  gchar *com;
+  char *com;
 
 
   // type == 0 - new clip
@@ -11438,18 +11355,17 @@
 
   cfile->is_loaded=TRUE;
 
-  cfile->arps=cfile->arate=(int)atoi (lives_entry_get_text(LIVES_ENTRY(resaudw->entry_arate)));
-  cfile->achans=(int)atoi (lives_entry_get_text(LIVES_ENTRY(resaudw->entry_achans)));
-  cfile->asampsize=(int)atoi (lives_entry_get_text(LIVES_ENTRY(resaudw->entry_asamps)));
+  cfile->arps=cfile->arate=(int)atoi(lives_entry_get_text(LIVES_ENTRY(resaudw->entry_arate)));
+  cfile->achans=(int)atoi(lives_entry_get_text(LIVES_ENTRY(resaudw->entry_achans)));
+  cfile->asampsize=(int)atoi(lives_entry_get_text(LIVES_ENTRY(resaudw->entry_asamps)));
 
   if (lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(resaudw->unlim_radiobutton))) {
     mainw->rec_end_time=-1.;
     mainw->rec_samples=-1;
-  }
-  else {
+  } else {
     mainw->rec_end_time=(lives_spin_button_get_value(LIVES_SPIN_BUTTON(resaudw->hour_spinbutton))*60.
-			 +lives_spin_button_get_value(LIVES_SPIN_BUTTON(resaudw->minute_spinbutton)))*60.
-      +lives_spin_button_get_value(LIVES_SPIN_BUTTON(resaudw->second_spinbutton));
+                         +lives_spin_button_get_value(LIVES_SPIN_BUTTON(resaudw->minute_spinbutton)))*60.
+                        +lives_spin_button_get_value(LIVES_SPIN_BUTTON(resaudw->second_spinbutton));
     mainw->rec_samples=mainw->rec_end_time*cfile->arate;
   }
 
@@ -11463,9 +11379,9 @@
   mainw->is_processing=TRUE;
 
   cfile->signed_endian=get_signed_endian(asigned,aendian);
-  lives_widget_destroy (resaudw->dialog);
+  lives_widget_destroy(resaudw->dialog);
   lives_widget_context_update();
-  if (resaudw!=NULL) g_free(resaudw);
+  if (resaudw!=NULL) lives_free(resaudw);
   resaudw=NULL;
 
   if (cfile->arate<=0) {
@@ -11485,12 +11401,10 @@
   asigned=!asigned;
 
   if (type==0) {
-    g_snprintf(cfile->type,40,"Audio");
+    lives_snprintf(cfile->type,40,"Audio");
     add_to_clipmenu();
 
-#ifdef ENABLE_OSC
-    lives_osc_notify(LIVES_OSC_NOTIFY_CLIP_OPENED,"");
-#endif
+    lives_notify(LIVES_OSC_NOTIFY_CLIP_OPENED,"");
 
   }
 
@@ -11511,7 +11425,7 @@
 
   mainw->suppress_dprint=TRUE;
   mainw->no_switch_dprint=TRUE;
-  
+
 #ifdef ENABLE_JACK
   if (prefs->audio_player==AUD_PLAYER_JACK) {
     jack_rec_audio_to_clip(mainw->current_file,old_file,type==0?RECA_NEW_CLIP:RECA_EXISTING);
@@ -11552,7 +11466,7 @@
 
   mainw->cancelled=CANCEL_NONE;
   lives_widget_context_update();
-  
+
   if (type==1) {
     // set these again in case reget_afilesize() reset them
     cfile->arate=cfile->arps=mainw->files[old_file]->arate;
@@ -11569,27 +11483,27 @@
 
     if (!prefs->conserve_space) {
       mainw->error=FALSE;
-      com=g_strdup_printf("%s backup_audio \"%s\"",prefs->backend_sync,mainw->files[old_file]->handle);
+      com=lives_strdup_printf("%s backup_audio \"%s\"",prefs->backend_sync,mainw->files[old_file]->handle);
       lives_system(com,FALSE);
-      g_free(com);
+      lives_free(com);
 
       if (mainw->error) {
-	end_threaded_dialog();
-	d_print_failed();
-	return;
+        end_threaded_dialog();
+        d_print_failed();
+        return;
       }
 
     }
 
 
     mainw->read_failed=mainw->write_failed=FALSE;
-    if (mainw->read_failed_file!=NULL) g_free(mainw->read_failed_file);
+    if (mainw->read_failed_file!=NULL) lives_free(mainw->read_failed_file);
     mainw->read_failed_file=NULL;
 
 
     // copy audio from old clip to current
     render_audio_segment(1,&(mainw->current_file),old_file,&vel,&aud_start,ins_pt,
-			 ins_pt+(weed_timecode_t)((aud_end-aud_start)*U_SEC),&vol,vol,vol,NULL);
+                         ins_pt+(weed_timecode_t)((aud_end-aud_start)*U_SEC),&vol,vol,vol,NULL);
 
     end_threaded_dialog();
     close_current_file(old_file);
@@ -11597,27 +11511,27 @@
     if (mainw->write_failed) {
       // on failure
       int outfile=(mainw->multitrack!=NULL?mainw->multitrack->render_file:mainw->current_file);
-      gchar *outfilename=g_build_filename(prefs->tmpdir,mainw->files[outfile]->handle,"audio",NULL);
+      char *outfilename=lives_build_filename(prefs->tmpdir,mainw->files[outfile]->handle,"audio",NULL);
       do_write_failed_error_s(outfilename,NULL);
-      
+
       if (!prefs->conserve_space&&type==1) {
-	// try to recover backup
-	com=g_strdup_printf("%s undo_audio \"%s\"",prefs->backend_sync,mainw->files[old_file]->handle);
-	lives_system(com,FALSE);
-	g_free(com);
-	backr=TRUE;
+        // try to recover backup
+        com=lives_strdup_printf("%s undo_audio \"%s\"",prefs->backend_sync,mainw->files[old_file]->handle);
+        lives_system(com,FALSE);
+        lives_free(com);
+        backr=TRUE;
       }
     }
 
     if (mainw->read_failed) {
       do_read_failed_error_s(mainw->read_failed_file,NULL);
-      if (mainw->read_failed_file!=NULL) g_free(mainw->read_failed_file);
+      if (mainw->read_failed_file!=NULL) lives_free(mainw->read_failed_file);
       mainw->read_failed_file=NULL;
       if (!prefs->conserve_space&&type==1&&!backr) {
-	// try to recover backup
-	com=g_strdup_printf("%s undo_audio \"%s\"",prefs->backend_sync,mainw->files[old_file]->handle);
-	lives_system(com,FALSE);
-	g_free(com);
+        // try to recover backup
+        com=lives_strdup_printf("%s undo_audio \"%s\"",prefs->backend_sync,mainw->files[old_file]->handle);
+        lives_system(com,FALSE);
+        lives_free(com);
       }
     }
 
@@ -11633,7 +11547,7 @@
   if (type==0) switch_to_file((mainw->current_file=0),new_file);
   else {
     if (!prefs->conserve_space) {
-      set_undoable (_("Record new audio"),TRUE);
+      set_undoable(_("Record new audio"),TRUE);
       cfile->undo_action=UNDO_REC_AUDIO;
     }
   }
@@ -11651,9 +11565,9 @@
 }
 
 
-boolean on_ins_silence_activate (LiVESMenuItem *menuitem, gpointer user_data) {
+boolean on_ins_silence_activate(LiVESMenuItem *menuitem, livespointer user_data) {
   double start=0,end=0;
-  gchar *com,*msg;
+  char *com;
   boolean has_lmap_error=FALSE;
   boolean has_new_audio=FALSE;
 
@@ -11684,48 +11598,46 @@
 
 
   if (menuitem!=NULL) {
-    start=calc_time_from_frame (mainw->current_file,cfile->start);
-    end=calc_time_from_frame (mainw->current_file,cfile->end+1);
+    start=calc_time_from_frame(mainw->current_file,cfile->start);
+    end=calc_time_from_frame(mainw->current_file,cfile->end+1);
 
     if (!(prefs->warning_mask&WARN_MASK_LAYOUT_SHIFT_AUDIO)) {
       if ((mainw->xlays=layout_audio_is_affected(mainw->current_file,start))!=NULL) {
-	if (!do_warning_dialog(_("\nInsertion will cause audio to shift in some multitrack layouts.\nAre you sure you wish to continue ?\n"))) {
-	  g_list_free_strings(mainw->xlays);
-	  g_list_free(mainw->xlays);
-	  mainw->xlays=NULL;
-	  if (has_new_audio) cfile->achans=cfile->arate=cfile->asampsize=cfile->arps=0;
-	  return FALSE;
-	}
-	add_lmap_error(LMAP_ERROR_SHIFT_AUDIO,cfile->name,(gpointer)cfile->layout_map,mainw->current_file,0,start,
-		       cfile->stored_layout_audio>start);
-	has_lmap_error=TRUE;
-	g_list_free_strings(mainw->xlays);
-	g_list_free(mainw->xlays);
-	mainw->xlays=NULL;
+        if (!do_warning_dialog(_("\nInsertion will cause audio to shift in some multitrack layouts.\nAre you sure you wish to continue ?\n"))) {
+          lives_list_free_strings(mainw->xlays);
+          lives_list_free(mainw->xlays);
+          mainw->xlays=NULL;
+          if (has_new_audio) cfile->achans=cfile->arate=cfile->asampsize=cfile->arps=0;
+          return FALSE;
+        }
+        add_lmap_error(LMAP_ERROR_SHIFT_AUDIO,cfile->name,(livespointer)cfile->layout_map,mainw->current_file,0,start,
+                       cfile->stored_layout_audio>start);
+        has_lmap_error=TRUE;
+        lives_list_free_strings(mainw->xlays);
+        lives_list_free(mainw->xlays);
+        mainw->xlays=NULL;
       }
     }
-    
+
     if (!has_lmap_error&&!(prefs->warning_mask&WARN_MASK_LAYOUT_ALTER_AUDIO)
-	&&(mainw->xlays=layout_audio_is_affected(mainw->current_file,0.))!=NULL) {
+        &&(mainw->xlays=layout_audio_is_affected(mainw->current_file,0.))!=NULL) {
       if (!do_layout_alter_audio_warning()) {
-	g_list_free_strings(mainw->xlays);
-	g_list_free(mainw->xlays);
-	mainw->xlays=NULL;
-	if (has_new_audio) cfile->achans=cfile->arate=cfile->asampsize=cfile->arps=0;
-	return FALSE;
+        lives_list_free_strings(mainw->xlays);
+        lives_list_free(mainw->xlays);
+        mainw->xlays=NULL;
+        if (has_new_audio) cfile->achans=cfile->arate=cfile->asampsize=cfile->arps=0;
+        return FALSE;
       }
-      add_lmap_error(LMAP_ERROR_ALTER_AUDIO,cfile->name,(gpointer)cfile->layout_map,mainw->current_file,0,start,
-		     cfile->stored_layout_audio>0.);
+      add_lmap_error(LMAP_ERROR_ALTER_AUDIO,cfile->name,(livespointer)cfile->layout_map,mainw->current_file,0,start,
+                     cfile->stored_layout_audio>0.);
       has_lmap_error=TRUE;
-      g_list_free_strings(mainw->xlays);
-      g_list_free(mainw->xlays);
+      lives_list_free_strings(mainw->xlays);
+      lives_list_free(mainw->xlays);
       mainw->xlays=NULL;
     }
 
-    msg=g_strdup_printf(_ ("Inserting silence from %.2f to %.2f seconds..."),start,end);
     d_print(""); // force switchtext
-    d_print(msg);
-    g_free(msg);
+    d_print(_("Inserting silence from %.2f to %.2f seconds..."),start,end);
   }
 
   cfile->undo1_dbl=start;
@@ -11734,16 +11646,16 @@
   end*=(double)cfile->arate/(double)cfile->arps;
 
   // with_sound is 2 (audio only), therfore start, end, where, are in seconds. rate is -ve to indicate silence
-  com=g_strdup_printf("%s insert \"%s\" \"%s\" %.8f 0. %.8f \"%s\" 2 0 0 0 0 %d %d %d %d %d", 
-		      prefs->backend, cfile->handle, 
-		      get_image_ext_for_type(cfile->img_type), start, end-start, cfile->handle, -cfile->arps, 
-		      cfile->achans, cfile->asampsize, !(cfile->signed_endian&AFORM_UNSIGNED), 
-		      !(cfile->signed_endian&AFORM_BIG_ENDIAN));
+  com=lives_strdup_printf("%s insert \"%s\" \"%s\" %.8f 0. %.8f \"%s\" 2 0 0 0 0 %d %d %d %d %d",
+                          prefs->backend, cfile->handle,
+                          get_image_ext_for_type(cfile->img_type), start, end-start, cfile->handle, -cfile->arps,
+                          cfile->achans, cfile->asampsize, !(cfile->signed_endian&AFORM_UNSIGNED),
+                          !(cfile->signed_endian&AFORM_BIG_ENDIAN));
 
-  unlink (cfile->info_file);
+  unlink(cfile->info_file);
   mainw->com_failed=FALSE;
-  lives_system (com,FALSE);
-  g_free(com);
+  lives_system(com,FALSE);
+  lives_free(com);
 
   if (mainw->com_failed) {
     d_print_failed();
@@ -11761,7 +11673,7 @@
 
 
 
-  set_undoable (_("Insert Silence"),TRUE);
+  set_undoable(_("Insert Silence"),TRUE);
   cfile->undo_action=UNDO_INSERT_SILENCE;
 
   reget_afilesize(mainw->current_file);
@@ -11786,13 +11698,13 @@
 
 
 
-void on_ins_silence_details_clicked (LiVESButton *button, gpointer user_data) {
+void on_ins_silence_details_clicked(LiVESButton *button, livespointer user_data) {
   int asigned=1,aendian=1;
   boolean bad_header=FALSE;
-  
-  cfile->arps=cfile->arate=(int)atoi (lives_entry_get_text(LIVES_ENTRY(resaudw->entry_arate)));
-  cfile->achans=(int)atoi (lives_entry_get_text(LIVES_ENTRY(resaudw->entry_achans)));
-  cfile->asampsize=(int)atoi (lives_entry_get_text(LIVES_ENTRY(resaudw->entry_asamps)));
+
+  cfile->arps=cfile->arate=(int)atoi(lives_entry_get_text(LIVES_ENTRY(resaudw->entry_arate)));
+  cfile->achans=(int)atoi(lives_entry_get_text(LIVES_ENTRY(resaudw->entry_achans)));
+  cfile->asampsize=(int)atoi(lives_entry_get_text(LIVES_ENTRY(resaudw->entry_asamps)));
   if (lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(resaudw->rb_unsigned))) {
     asigned=0;
   }
@@ -11800,9 +11712,9 @@
     aendian=0;
   }
   cfile->signed_endian=get_signed_endian(asigned,aendian);
-  lives_widget_destroy (resaudw->dialog);
+  lives_widget_destroy(resaudw->dialog);
   lives_widget_context_update();
-  if (resaudw!=NULL) g_free(resaudw);
+  if (resaudw!=NULL) lives_free(resaudw);
   resaudw=NULL;
   if (cfile->arate<=0) {
     do_audrate_error_dialog();
@@ -11824,12 +11736,12 @@
 }
 
 
-void on_lerrors_clear_clicked (LiVESButton *button, gpointer user_data) {
-  boolean close=GPOINTER_TO_INT(user_data);
+void on_lerrors_clear_clicked(LiVESButton *button, livespointer user_data) {
+  boolean close=LIVES_POINTER_TO_INT(user_data);
 
   if (mainw->multitrack!=NULL) {
     if (mainw->multitrack->idlefunc>0) {
-      g_source_remove(mainw->multitrack->idlefunc);
+      lives_source_remove(mainw->multitrack->idlefunc);
       mainw->multitrack->idlefunc=0;
     }
     mt_desensitise(mainw->multitrack);
@@ -11851,20 +11763,20 @@
 }
 
 
-void on_lerrors_delete_clicked (LiVESButton *button, gpointer user_data) {
-  int num_maps=g_list_length(mainw->affected_layouts_map);
-  gchar *msg=g_strdup_printf(P_("\nDelete %d layout...are you sure ?\n","\nDelete %d layouts...are you sure ?\n",num_maps),num_maps);
+void on_lerrors_delete_clicked(LiVESButton *button, livespointer user_data) {
+  int num_maps=lives_list_length(mainw->affected_layouts_map);
+  char *msg=lives_strdup_printf(P_("\nDelete %d layout...are you sure ?\n","\nDelete %d layouts...are you sure ?\n",num_maps),num_maps);
 
   if (mainw->multitrack!=NULL) {
     if (mainw->multitrack->idlefunc>0) {
-      g_source_remove(mainw->multitrack->idlefunc);
+      lives_source_remove(mainw->multitrack->idlefunc);
       mainw->multitrack->idlefunc=0;
     }
     mt_desensitise(mainw->multitrack);
   }
-  
+
   if (!do_warning_dialog(msg)) {
-    g_free(msg);
+    lives_free(msg);
     if (mainw->multitrack!=NULL) {
       mt_sensitise(mainw->multitrack);
       mainw->multitrack->idlefunc=mt_idle_add(mainw->multitrack);
@@ -11872,9 +11784,9 @@
     return;
   }
 
-  g_free(msg);
+  lives_free(msg);
   remove_layout_files(mainw->affected_layouts_map);
-  on_lerrors_clear_clicked(button,GINT_TO_POINTER(TRUE));
+  on_lerrors_clear_clicked(button,LIVES_INT_TO_POINTER(TRUE));
 }

LiVES-2.2.8.tar.bz2/src/callbacks.h -> LiVES-2.4.1.tar.bz2/src/callbacks.h Changed

@@ -8,656 +8,654 @@
 #define HAS_LIVES_CALLBACKS_H
 
 boolean
-on_LiVES_delete_event                  (LiVESWidget       *widget,
-                                        LiVESXEvent        *event,
-                                        gpointer         user_data);
+on_LiVES_delete_event(LiVESWidget       *widget,
+                      LiVESXEvent        *event,
+                      livespointer         user_data);
 
 void
-on_open_activate                      (LiVESMenuItem     *menuitem,
-				       gpointer         user_data);
+on_open_activate(LiVESMenuItem     *menuitem,
+                 livespointer         user_data);
 
 void
-on_open_sel_activate                      (LiVESMenuItem     *menuitem,
-					   gpointer         user_data);
+on_open_sel_activate(LiVESMenuItem     *menuitem,
+                     livespointer         user_data);
 
 void
-on_open_loc_activate                      (LiVESMenuItem     *menuitem,
-					   gpointer         user_data);
+on_open_loc_activate(LiVESMenuItem     *menuitem,
+                     livespointer         user_data);
 
 void
-on_open_utube_activate                      (LiVESMenuItem     *menuitem,
-					     gpointer         user_data);
+on_open_utube_activate(LiVESMenuItem     *menuitem,
+                       livespointer         user_data);
 
 void
-on_stop_clicked                         (LiVESMenuItem     *menuitem,
-                                         gpointer         user_data);
+on_stop_clicked(LiVESMenuItem     *menuitem,
+                livespointer         user_data);
 
 void
-on_save_selection_activate            (LiVESMenuItem     *menuitem,
-				       gpointer         user_data);
+on_save_selection_activate(LiVESMenuItem     *menuitem,
+                           livespointer         user_data);
 
 void
-on_save_as_activate            (LiVESMenuItem     *menuitem,
-				gpointer         user_data);
+on_save_as_activate(LiVESMenuItem     *menuitem,
+                    livespointer         user_data);
 
 void
-on_show_clipboard_info_activate            (LiVESMenuItem     *menuitem,
-					    gpointer         user_data);
+on_show_clipboard_info_activate(LiVESMenuItem     *menuitem,
+                                livespointer         user_data);
 
 void
-on_close_activate            (LiVESMenuItem     *menuitem,
-			      gpointer         user_data);
+on_close_activate(LiVESMenuItem     *menuitem,
+                  livespointer         user_data);
 
 void
-on_import_proj_activate            (LiVESMenuItem     *menuitem,
-				    gpointer         user_data);
+on_import_proj_activate(LiVESMenuItem     *menuitem,
+                        livespointer         user_data);
 
 void
-on_export_proj_activate            (LiVESMenuItem     *menuitem,
-				    gpointer         user_data);
+on_export_proj_activate(LiVESMenuItem     *menuitem,
+                        livespointer         user_data);
 
 void
-on_quit_activate                      (LiVESMenuItem     *menuitem,
-                                        gpointer         user_data);
+on_quit_activate(LiVESMenuItem     *menuitem,
+                 livespointer         user_data);
 
 void
-on_undo_activate                      (LiVESMenuItem     *menuitem,
-                                        gpointer         user_data);
+on_undo_activate(LiVESMenuItem     *menuitem,
+                 livespointer         user_data);
 
 void
-on_redo_activate                      (LiVESMenuItem     *menuitem,
-                                        gpointer         user_data);
+on_redo_activate(LiVESMenuItem     *menuitem,
+                 livespointer         user_data);
 
 void
-on_paste_as_new_activate                       (LiVESMenuItem     *menuitem,
-						gpointer         user_data);
+on_paste_as_new_activate(LiVESMenuItem     *menuitem,
+                         livespointer         user_data);
 
 void
-on_copy_activate                      (LiVESMenuItem     *menuitem,
-                                        gpointer         user_data);
+on_copy_activate(LiVESMenuItem     *menuitem,
+                 livespointer         user_data);
 
 void
-on_cut_activate                       (LiVESMenuItem     *menuitem,
-                                        gpointer         user_data);
+on_cut_activate(LiVESMenuItem     *menuitem,
+                livespointer         user_data);
 
 void
-on_insert_pre_activate                    (LiVESMenuItem     *menuitem,
-					   gpointer         user_data);
+on_insert_pre_activate(LiVESMenuItem     *menuitem,
+                       livespointer         user_data);
 
 void
-on_insert_activate                    (LiVESButton     *button,
-                                        gpointer         user_data);
+on_insert_activate(LiVESButton     *button,
+                   livespointer         user_data);
 
 void
-on_merge_activate                     (LiVESMenuItem     *menuitem,
-				       gpointer         user_data);
+on_merge_activate(LiVESMenuItem     *menuitem,
+                  livespointer         user_data);
 
 void
-on_delete_activate                    (LiVESMenuItem     *menuitem,
-                                        gpointer         user_data);
+on_delete_activate(LiVESMenuItem     *menuitem,
+                   livespointer         user_data);
 
 void
-on_select_all_activate                (LiVESMenuItem     *menuitem,
-				       gpointer         user_data);
+on_select_all_activate(LiVESMenuItem     *menuitem,
+                       livespointer         user_data);
 
 void
-on_select_new_activate                (LiVESMenuItem     *menuitem,
-				       gpointer         user_data);
+on_select_new_activate(LiVESMenuItem     *menuitem,
+                       livespointer         user_data);
 
 void
-on_select_last_activate                (LiVESMenuItem     *menuitem,
-				       gpointer         user_data);
+on_select_last_activate(LiVESMenuItem     *menuitem,
+                        livespointer         user_data);
 
 void
-on_select_to_end_activate                (LiVESMenuItem     *menuitem,
-					  gpointer         user_data);
+on_select_to_end_activate(LiVESMenuItem     *menuitem,
+                          livespointer         user_data);
 
 void
-on_select_from_start_activate                (LiVESMenuItem     *menuitem,
-					      gpointer         user_data);
+on_select_from_start_activate(LiVESMenuItem     *menuitem,
+                              livespointer         user_data);
 
 void
-on_lock_selwidth_activate                (LiVESMenuItem     *menuitem,
-					  gpointer         user_data);
+on_lock_selwidth_activate(LiVESMenuItem     *menuitem,
+                          livespointer         user_data);
 
 void
-on_playall_activate                    (LiVESMenuItem     *menuitem,
-                                        gpointer         user_data);
+on_playall_activate(LiVESMenuItem     *menuitem,
+                    livespointer         user_data);
 
 void
-on_playsel_activate                      (LiVESMenuItem     *menuitem,
-                                        gpointer         user_data);
+on_playsel_activate(LiVESMenuItem     *menuitem,
+                    livespointer         user_data);
 
 void
-on_playclip_activate                      (LiVESMenuItem     *menuitem,
-                                        gpointer         user_data);
+on_playclip_activate(LiVESMenuItem     *menuitem,
+                     livespointer         user_data);
 
 void
-on_stop_activate                      (LiVESMenuItem     *menuitem,
-                                        gpointer         user_data);
+on_stop_activate(LiVESMenuItem     *menuitem,
+                 livespointer         user_data);
 
 void
-on_rev_clipboard_activate              (LiVESMenuItem     *menuitem,
-                                        gpointer         user_data);
+on_rev_clipboard_activate(LiVESMenuItem     *menuitem,
+                          livespointer         user_data);
 
-void on_encoder_entry_changed (LiVESCombo *, gpointer ptr);
+void on_encoder_entry_changed(LiVESCombo *, livespointer ptr);
 
-void on_vid_playback_plugin_changed (LiVESEntry *vpp_entry, gpointer user_data);
+void on_vid_playback_plugin_changed(LiVESEntry *vpp_entry, livespointer user_data);
 
 
 void
-on_prefs_apply_clicked                   (LiVESButton       *button,
-					  gpointer         user_data);
+on_prefs_apply_clicked(LiVESButton       *button,
+                       livespointer         user_data);
 
 void
-on_show_file_info_activate            (LiVESMenuItem     *menuitem,
-                                        gpointer         user_data);
+on_show_file_info_activate(LiVESMenuItem     *menuitem,
+                           livespointer         user_data);
 
 void
-switch_clip_activate                    (LiVESMenuItem     *menuitem,
-                                        gpointer         user_data);
+switch_clip_activate(LiVESMenuItem     *menuitem,
+                     livespointer         user_data);
 
 void
-on_about_activate                     (LiVESMenuItem     *menuitem,
-                                        gpointer         user_data);
+on_about_activate(LiVESMenuItem     *menuitem,
+                  livespointer         user_data);
 
 void
-show_manual_activate                     (LiVESMenuItem     *menuitem,
-                                        gpointer         user_data);
+show_manual_activate(LiVESMenuItem     *menuitem,
+                     livespointer         user_data);
 
 void
-email_author_activate                     (LiVESMenuItem     *menuitem,
-					   gpointer         user_data);
+email_author_activate(LiVESMenuItem     *menuitem,
+                      livespointer         user_data);
 
 void
-donate_activate                     (LiVESMenuItem     *menuitem,
-					   gpointer         user_data);
+donate_activate(LiVESMenuItem     *menuitem,
+                livespointer         user_data);
 
 void
-report_bug_activate                     (LiVESMenuItem     *menuitem,
-					   gpointer         user_data);
+report_bug_activate(LiVESMenuItem     *menuitem,
+                    livespointer         user_data);
 
 void
-suggest_feature_activate                     (LiVESMenuItem     *menuitem,
-					      gpointer         user_data);
+suggest_feature_activate(LiVESMenuItem     *menuitem,
+                         livespointer         user_data);
 
 void
-help_translate_activate                     (LiVESMenuItem     *menuitem,
-					   gpointer         user_data);
+help_translate_activate(LiVESMenuItem     *menuitem,
+                        livespointer         user_data);
 
 void
-on_ok_button1_clicked                  (LiVESButton       *button,
-                                        gpointer         user_data);
+on_ok_button1_clicked(LiVESButton       *button,
+                      livespointer         user_data);
 
 
-void on_ok_file_open_clicked(LiVESFileChooser *, GSList *fnames);
+void on_ok_file_open_clicked(LiVESFileChooser *, LiVESSList *fnames);
 
-void on_ok_filesel_open_clicked (LiVESFileChooser *, gpointer);
 
-void open_sel_range_activate (void);
+void open_sel_range_activate(void);
 
 
 
 void
-on_location_select                   (LiVESButton       *button,
-				      gpointer         user_data);
+on_location_select(LiVESButton       *button,
+                   livespointer         user_data);
 
 void
-on_utube_select                   (LiVESButton       *button,
-				   gpointer         user_data);
+on_utube_select(LiVESButton       *button,
+                livespointer         user_data);
 
 void
-on_autoreload_toggled                (LiVESToggleButton *togglebutton,
-				 gpointer         user_data);
+on_autoreload_toggled(LiVESToggleButton *togglebutton,
+                      livespointer         user_data);
 
 void
-on_opensel_range_ok_clicked                  (LiVESButton       *button,
-					      gpointer         user_data);
+on_opensel_range_ok_clicked(LiVESButton       *button,
+                            livespointer         user_data);
 
 
-void on_open_sel_ok_button_clicked (LiVESButton *, gpointer user_data);
+void on_open_sel_ok_button_clicked(LiVESButton *, livespointer user_data);
 
-void on_save_textview_clicked (LiVESButton *, gpointer);
+void on_save_textview_clicked(LiVESButton *, livespointer);
 
-void on_cancel_button1_clicked (LiVESWidget *, gpointer data_to_free);
 
+void on_filechooser_cancel_clicked(LiVESWidget *);
 
-void
-on_full_screen_pressed (LiVESButton *button,
-			gpointer user_data);
+
+void on_full_screen_pressed(LiVESButton *button, livespointer user_data);
 
 void
-on_full_screen_activate               (LiVESMenuItem     *menuitem,
-				       gpointer         user_data);
+on_full_screen_activate(LiVESMenuItem     *menuitem,
+                        livespointer         user_data);
 
 void
-on_double_size_pressed (LiVESButton *button,
-			gpointer user_data);
+on_double_size_pressed(LiVESButton *button,
+                       livespointer user_data);
 void
-on_double_size_activate               (LiVESMenuItem     *menuitem,
-				       gpointer         user_data);
+on_double_size_activate(LiVESMenuItem     *menuitem,
+                        livespointer         user_data);
 
 void
-on_sepwin_pressed (LiVESButton *button,
-		   gpointer user_data);
+on_sepwin_pressed(LiVESButton *button,
+                  livespointer user_data);
 
 void
-on_sepwin_activate               (LiVESMenuItem     *menuitem,
-				  gpointer         user_data);
+on_sepwin_activate(LiVESMenuItem     *menuitem,
+                   livespointer         user_data);
 
 void
-on_fade_pressed (LiVESButton *button,
-		 gpointer user_data);
+on_fade_pressed(LiVESButton *button,
+                livespointer user_data);
 
 void
-on_fade_activate               (LiVESMenuItem     *menuitem,
-				gpointer         user_data);
+on_fade_activate(LiVESMenuItem     *menuitem,
+                 livespointer         user_data);
 
 
 
 void
-on_loop_video_activate                (LiVESMenuItem     *menuitem,
-                                        gpointer         user_data);
+on_loop_video_activate(LiVESMenuItem     *menuitem,
+                       livespointer         user_data);
 
 void
-on_mute_button_activate                (LiVESMenuItem     *menuitem,
-					gpointer         user_data);
+on_mute_button_activate(LiVESMenuItem     *menuitem,
+                        livespointer         user_data);
 
 void
-on_mute_activate                (LiVESMenuItem     *menuitem,
-				 gpointer         user_data);
+on_mute_activate(LiVESMenuItem     *menuitem,
+                 livespointer         user_data);
 
 
 
 void
-on_resize_activate                    (LiVESMenuItem     *menuitem,
-                                        gpointer         user_data);
+on_resize_activate(LiVESMenuItem     *menuitem,
+                   livespointer         user_data);
 
 void
-on_rename_activate                    (LiVESMenuItem     *menuitem,
-				       gpointer         user_data);
+on_rename_activate(LiVESMenuItem     *menuitem,
+                   livespointer         user_data);
 
 void
-on_rename_set_name                   (LiVESButton       *button,
-				      gpointer         user_data);
+on_rename_set_name(LiVESButton       *button,
+                   livespointer         user_data);
 
 void
-on_spinbutton_start_value_changed          (LiVESSpinButton   *spinbutton,
-					    gpointer         user_data);
+on_spinbutton_start_value_changed(LiVESSpinButton   *spinbutton,
+                                  livespointer         user_data);
 
 void
-on_spinbutton_end_value_changed          (LiVESSpinButton   *spinbutton,
-					  gpointer         user_data);
+on_spinbutton_end_value_changed(LiVESSpinButton   *spinbutton,
+                                livespointer         user_data);
 
-void on_open_new_audio_clicked (LiVESFileChooser *, gpointer opt_filename);
+void on_open_new_audio_clicked(LiVESFileChooser *, livespointer opt_filename);
 
-void on_load_audio_activate (LiVESMenuItem *, gpointer);
+void on_load_audio_activate(LiVESMenuItem *, livespointer);
 
-void on_load_subs_activate (LiVESMenuItem *, gpointer);
+void on_load_subs_activate(LiVESMenuItem *, livespointer);
 
-void on_save_subs_activate (LiVESMenuItem *, gpointer entry_widget);
+void on_save_subs_activate(LiVESMenuItem *, livespointer entry_widget);
 
-void on_erase_subs_activate (LiVESMenuItem *, gpointer);
+void on_erase_subs_activate(LiVESMenuItem *, livespointer);
 
 
-void 
-on_insfitaudio_toggled                (LiVESToggleButton *togglebutton,
-				       gpointer         user_data);
+void
+on_insfitaudio_toggled(LiVESToggleButton *togglebutton,
+                       livespointer         user_data);
 
 void
-on_resize_hsize_value_changed           (LiVESSpinButton   *spinbutton,
-                                        gpointer         user_data);
+on_resize_hsize_value_changed(LiVESSpinButton   *spinbutton,
+                              livespointer         user_data);
 
 void
-on_resize_vsize_value_changed           (LiVESSpinButton   *spinbutton,
-                                        gpointer         user_data);
+on_resize_vsize_value_changed(LiVESSpinButton   *spinbutton,
+                              livespointer         user_data);
 
 void
-on_resize_ok_clicked                   (LiVESButton       *button,
-                                        gpointer         user_data);
+on_resize_ok_clicked(LiVESButton       *button,
+                     livespointer         user_data);
 
 
 void
-on_spin_value_changed           (LiVESSpinButton   *spinbutton,
-				  gpointer         user_data);
+on_spin_value_changed(LiVESSpinButton   *spinbutton,
+                      livespointer         user_data);
 
 void
-on_spin_start_value_changed           (LiVESSpinButton   *spinbutton,
-					gpointer         user_data);
+on_spin_start_value_changed(LiVESSpinButton   *spinbutton,
+                            livespointer         user_data);
 
 void
-on_spin_step_value_changed           (LiVESSpinButton   *spinbutton,
-				       gpointer         user_data);
+on_spin_step_value_changed(LiVESSpinButton   *spinbutton,
+                           livespointer         user_data);
 
 void
-on_spin_end_value_changed           (LiVESSpinButton   *spinbutton,
-				       gpointer         user_data);
+on_spin_end_value_changed(LiVESSpinButton   *spinbutton,
+                          livespointer         user_data);
 
 
 #if GTK_CHECK_VERSION(3,0,0)
-boolean expose_vid_event (LiVESWidget *, lives_painter_t *cr, gpointer user_data);
+boolean expose_vid_event(LiVESWidget *, lives_painter_t *cr, livespointer user_data);
 #else
-boolean expose_vid_event (LiVESWidget *, GdkEventExpose *event);
+boolean expose_vid_event(LiVESWidget *, LiVESXEventExpose *event);
 #endif
 
 #if GTK_CHECK_VERSION(3,0,0)
-boolean expose_laud_event (LiVESWidget *, lives_painter_t *cr, gpointer user_data);
+boolean expose_laud_event(LiVESWidget *, lives_painter_t *cr, livespointer user_data);
 #else
-boolean expose_laud_event (LiVESWidget *, GdkEventExpose *event);
+boolean expose_laud_event(LiVESWidget *, LiVESXEventExpose *event);
 #endif
 
 #if GTK_CHECK_VERSION(3,0,0)
-boolean expose_raud_event (LiVESWidget *, lives_painter_t *cr, gpointer user_data);
+boolean expose_raud_event(LiVESWidget *, lives_painter_t *cr, livespointer user_data);
 #else
-boolean expose_raud_event (LiVESWidget *, GdkEventExpose *event);
+boolean expose_raud_event(LiVESWidget *, LiVESXEventExpose *event);
 #endif
 
 
 
 void
-on_preview_clicked                     (LiVESButton       *button,
-					gpointer         user_data);
+on_preview_clicked(LiVESButton       *button,
+                   livespointer         user_data);
 
 void
-on_recent_activate                      (LiVESMenuItem     *menuitem,
-					 gpointer         user_data);
+on_recent_activate(LiVESMenuItem     *menuitem,
+                   livespointer         user_data);
 
-boolean config_event (LiVESWidget *, GdkEventConfigure *, gpointer);
+boolean config_event(LiVESWidget *, LiVESXEventConfigure *, livespointer);
 
 void
-changed_fps_during_pb           (LiVESSpinButton   *spinbutton,
-				 gpointer         user_data);
+changed_fps_during_pb(LiVESSpinButton   *spinbutton,
+                      livespointer         user_data);
 
 boolean
-on_mouse_scroll           (LiVESWidget       *widget,
-			   GdkEventScroll  *event,
-			   gpointer         user_data);
+on_mouse_scroll(LiVESWidget       *widget,
+                LiVESXEventScroll  *event,
+                livespointer         user_data);
 
 boolean
-on_mouse_sel_update           (LiVESWidget       *widget,
-			       LiVESXEventMotion  *event,
-			       gpointer         user_data);
+on_mouse_sel_update(LiVESWidget       *widget,
+                    LiVESXEventMotion  *event,
+                    livespointer         user_data);
 
 boolean
-on_mouse_sel_reset           (LiVESWidget       *widget,
-			      LiVESXEventButton  *event,
-			      gpointer         user_data);
+on_mouse_sel_reset(LiVESWidget       *widget,
+                   LiVESXEventButton  *event,
+                   livespointer         user_data);
 
 boolean
-on_mouse_sel_start           (LiVESWidget       *widget,
-			      LiVESXEventButton  *event,
-			      gpointer         user_data);
+on_mouse_sel_start(LiVESWidget       *widget,
+                   LiVESXEventButton  *event,
+                   livespointer         user_data);
 
 void
-on_load_cdtrack_activate                (LiVESMenuItem     *menuitem,
-					 gpointer         user_data);
+on_load_cdtrack_activate(LiVESMenuItem     *menuitem,
+                         livespointer         user_data);
 
-void on_load_cdtrack_ok_clicked                (LiVESButton     *button,
-						gpointer         user_data);
+void on_load_cdtrack_ok_clicked(LiVESButton     *button,
+                                livespointer         user_data);
 
 void
-on_eject_cd_activate                (LiVESMenuItem     *menuitem,
-				     gpointer         user_data);
+on_eject_cd_activate(LiVESMenuItem     *menuitem,
+                     livespointer         user_data);
 
 
 void
-on_slower_pressed (LiVESButton *button,
-		   gpointer user_data);
+on_slower_pressed(LiVESButton *button,
+                  livespointer user_data);
 
 void
-on_faster_pressed (LiVESButton *button,
-		   gpointer user_data);
+on_faster_pressed(LiVESButton *button,
+                  livespointer user_data);
 
 void
-on_back_pressed (LiVESButton *button,
-		   gpointer user_data);
+on_back_pressed(LiVESButton *button,
+                livespointer user_data);
 
 void
-on_forward_pressed (LiVESButton *button,
-		   gpointer user_data);
+on_forward_pressed(LiVESButton *button,
+                   livespointer user_data);
 
-void on_capture_activate (LiVESMenuItem *, gpointer user_data);
+void on_capture_activate(LiVESMenuItem *, livespointer user_data);
 
 void on_capture2_activate(void);
 
 
 void
-on_select_invert_activate                (LiVESMenuItem     *menuitem,
-					  gpointer         user_data);
+on_select_invert_activate(LiVESMenuItem     *menuitem,
+                          livespointer         user_data);
 
 void
-on_warn_mask_toggled        (LiVESToggleButton *togglebutton,
-			     gpointer         user_data);
+on_warn_mask_toggled(LiVESToggleButton *togglebutton,
+                     livespointer         user_data);
 
 boolean
-frame_context           (LiVESWidget       *widget,
-			  LiVESXEventButton  *event,
-			  gpointer         which);
+frame_context(LiVESWidget       *widget,
+              LiVESXEventButton  *event,
+              livespointer         which);
 
-void on_fs_preview_clicked (LiVESWidget *widget, gpointer user_data);
+void on_fs_preview_clicked(LiVESWidget *widget, livespointer user_data);
 
 
 void
-on_restore_activate                      (LiVESMenuItem     *menuitem,
-				       gpointer         user_data);
+on_restore_activate(LiVESMenuItem     *menuitem,
+                    livespointer         user_data);
 
 void
-on_backup_activate                      (LiVESMenuItem     *menuitem,
-					 gpointer         user_data);
+on_backup_activate(LiVESMenuItem     *menuitem,
+                   livespointer         user_data);
 
 
 void
-on_record_perf_activate                      (LiVESMenuItem     *menuitem,
-					      gpointer         user_data);
+on_record_perf_activate(LiVESMenuItem     *menuitem,
+                        livespointer         user_data);
 
-boolean record_toggle_callback (LiVESAccelGroup *, LiVESObject *, uint32_t keyval, LiVESXModifierType mod, gpointer);
+boolean record_toggle_callback(LiVESAccelGroup *, LiVESObject *, uint32_t keyval, LiVESXModifierType mod, livespointer);
 
 
-boolean fps_reset_callback (LiVESAccelGroup *, LiVESObject *, uint32_t keyval, LiVESXModifierType mod, gpointer);
+boolean fps_reset_callback(LiVESAccelGroup *, LiVESObject *, uint32_t keyval, LiVESXModifierType mod, livespointer);
 
 
-boolean mute_audio_callback (LiVESAccelGroup *, LiVESObject *, uint32_t keyval, LiVESXModifierType mod, gpointer);
+boolean mute_audio_callback(LiVESAccelGroup *, LiVESObject *, uint32_t keyval, LiVESXModifierType mod, livespointer);
 
 
 
 boolean
-on_stop_activate_by_del                  (LiVESWidget       *widget,
-					  LiVESXEvent        *event,
-					  gpointer         user_data);
+on_stop_activate_by_del(LiVESWidget       *widget,
+                        LiVESXEvent        *event,
+                        livespointer         user_data);
 
 void on_pause_clicked(void);
 
 
 void
-on_select_start_only_activate                (LiVESMenuItem     *menuitem,
-					      gpointer         user_data);
+on_select_start_only_activate(LiVESMenuItem     *menuitem,
+                              livespointer         user_data);
 
 void
-on_select_end_only_activate                (LiVESMenuItem     *menuitem,
-					    gpointer         user_data);
+on_select_end_only_activate(LiVESMenuItem     *menuitem,
+                            livespointer         user_data);
 
 void
-on_filesel_complex_clicked                      (LiVESButton *button,
-						LiVESEntry *entry);
+on_filesel_complex_clicked(LiVESButton *button,
+                           LiVESEntry *entry);
 
 void
-on_filesel_complex_ok_clicked                      (LiVESButton *button,
-						   LiVESEntry *entry);
+on_filesel_complex_ok_clicked(LiVESButton *button,
+                              LiVESEntry *entry);
 
-void on_encoder_ofmt_changed (LiVESCombo *combo, gpointer user_data);
+void on_encoder_ofmt_changed(LiVESCombo *combo, livespointer user_data);
 
 void
-on_ok_export_audio_clicked                      (LiVESButton *button,
-						 gpointer user_data);
+on_ok_export_audio_clicked(LiVESButton *button,
+                           livespointer user_data);
 
-void on_append_audio_activate (LiVESMenuItem *, gpointer user_data);
+void on_append_audio_activate(LiVESMenuItem *, livespointer user_data);
 
 void
-on_menubar_activate_menuitem                    (LiVESMenuItem     *menuitem,
-						 gpointer         user_data);
+on_menubar_activate_menuitem(LiVESMenuItem     *menuitem,
+                             livespointer         user_data);
 
 void
-on_rb_audrec_time_toggled                (LiVESToggleButton *togglebutton,
-					  gpointer         user_data);
+on_rb_audrec_time_toggled(LiVESToggleButton *togglebutton,
+                          livespointer         user_data);
 
 void
-on_recaudclip_activate (LiVESMenuItem     *menuitem,
-			gpointer         user_data);
+on_recaudclip_activate(LiVESMenuItem     *menuitem,
+                       livespointer         user_data);
 
 void
-on_recaudsel_activate (LiVESMenuItem     *menuitem,
-		       gpointer         user_data);
+on_recaudsel_activate(LiVESMenuItem     *menuitem,
+                      livespointer         user_data);
 
 
 void
-on_recaudclip_ok_clicked                      (LiVESButton *button,
-					       gpointer user_data);
+on_recaudclip_ok_clicked(LiVESButton *button,
+                         livespointer user_data);
 #if GTK_CHECK_VERSION(2,14,0)
-void on_volume_slider_value_changed (LiVESScaleButton *, gpointer);
+void on_volume_slider_value_changed(LiVESScaleButton *, livespointer);
 #else
-void on_volume_slider_value_changed (LiVESRange *, gpointer);
+void on_volume_slider_value_changed(LiVESRange *, livespointer);
 #endif
 
-void on_fade_audio_activate (LiVESMenuItem *, gpointer user_data);
+void on_fade_audio_activate(LiVESMenuItem *, livespointer user_data);
 
-void on_ok_append_audio_clicked (LiVESFileChooser *, gpointer);
 
 void
-on_resample_video_activate (LiVESMenuItem     *menuitem,
-			    gpointer         user_data);
+on_resample_video_activate(LiVESMenuItem     *menuitem,
+                           livespointer         user_data);
 
 void
-on_resample_vid_ok                  (LiVESButton       *button,
-				  LiVESEntry         *entry);
+on_resample_vid_ok(LiVESButton       *button,
+                   LiVESEntry         *entry);
 
-void on_trim_audio_activate (LiVESMenuItem *, gpointer user_data);
+void on_trim_audio_activate(LiVESMenuItem *, livespointer user_data);
 
 void
-on_resample_audio_activate (LiVESMenuItem     *menuitem,
-			    gpointer         user_data);
+on_resample_audio_activate(LiVESMenuItem     *menuitem,
+                           livespointer         user_data);
 
 
-void 
-on_export_audio_activate (LiVESMenuItem *menuitem, 
-			  gpointer user_data);
+void
+on_export_audio_activate(LiVESMenuItem *menuitem,
+                         livespointer user_data);
 
 
 void
-on_resaudio_ok_clicked                      (LiVESButton *button,
-					     LiVESEntry *entry);
+on_resaudio_ok_clicked(LiVESButton *button,
+                       LiVESEntry *entry);
 
 void
-on_cancel_opensel_clicked              (LiVESButton       *button,
-					 gpointer         user_data);
+on_cancel_opensel_clicked(LiVESButton       *button,
+                          livespointer         user_data);
 
-void 
+void
 end_fs_preview(void);
 
 
 void
-on_sticky_activate               (LiVESMenuItem     *menuitem,
-				  gpointer         user_data);
+on_sticky_activate(LiVESMenuItem     *menuitem,
+                   livespointer         user_data);
 
-void on_resaudw_asamps_changed (LiVESWidget *, gpointer);
+void on_resaudw_asamps_changed(LiVESWidget *, livespointer);
 
 
-void 
-on_insertwsound_toggled                (LiVESToggleButton *togglebutton,
-					gpointer         user_data);
+void
+on_insertwsound_toggled(LiVESToggleButton *togglebutton,
+                        livespointer         user_data);
 
 void
-on_showfct_activate               (LiVESMenuItem     *menuitem,
-				   gpointer         user_data);
+on_showfct_activate(LiVESMenuItem     *menuitem,
+                    livespointer         user_data);
 
-void on_boolean_toggled(LiVESObject *, gpointer user_data);
+void on_boolean_toggled(LiVESObject *, livespointer user_data);
 
 
-void on_showsubs_toggled(LiVESObject *, gpointer);
+void on_showsubs_toggled(LiVESObject *, livespointer);
 
 void
-on_show_messages_activate            (LiVESMenuItem     *menuitem,
-				      gpointer         user_data);
+on_show_messages_activate(LiVESMenuItem     *menuitem,
+                          livespointer         user_data);
 
-boolean on_hrule_enter (LiVESWidget *, GdkEventCrossing *, gpointer);
+boolean on_hrule_enter(LiVESWidget *, LiVESXEventCrossing *, livespointer);
 
 boolean
-on_hrule_update           (LiVESWidget       *widget,
-			   LiVESXEventMotion  *event,
-			   gpointer         user_data);
+on_hrule_update(LiVESWidget       *widget,
+                LiVESXEventMotion  *event,
+                livespointer         user_data);
 boolean
-on_hrule_reset           (LiVESWidget       *widget,
-			  LiVESXEventButton  *event,
-			  gpointer         user_data);
+on_hrule_reset(LiVESWidget       *widget,
+               LiVESXEventButton  *event,
+               livespointer         user_data);
 
 boolean
-on_hrule_set           (LiVESWidget       *widget,
-			  LiVESXEventButton  *event,
-			  gpointer         user_data);
+on_hrule_set(LiVESWidget       *widget,
+             LiVESXEventButton  *event,
+             livespointer         user_data);
 
 void
-on_rewind_activate                    (LiVESMenuItem     *menuitem,
-				       gpointer         user_data);
+on_rewind_activate(LiVESMenuItem     *menuitem,
+                   livespointer         user_data);
 void
-on_loop_button_activate                (LiVESMenuItem     *menuitem,
-					     gpointer         user_data);
+on_loop_button_activate(LiVESMenuItem     *menuitem,
+                        livespointer         user_data);
 
 void
-on_loop_cont_activate                (LiVESMenuItem     *menuitem,
-				      gpointer         user_data);
+on_loop_cont_activate(LiVESMenuItem     *menuitem,
+                      livespointer         user_data);
 
-void on_show_file_comments_activate (LiVESMenuItem *menuitem, gpointer user_data);
+void on_show_file_comments_activate(LiVESMenuItem *menuitem, livespointer user_data);
 
-void on_toolbar_hide (LiVESButton *button, gpointer user_data);
+void on_toolbar_hide(LiVESButton *button, livespointer user_data);
 
-void on_toy_activate (LiVESMenuItem *new_toy, gpointer old_toy_p);
+void on_toy_activate(LiVESMenuItem *new_toy, livespointer old_toy_p);
 
-void on_preview_spinbutton_changed (LiVESSpinButton   *spinbutton, gpointer user_data);
+void on_preview_spinbutton_changed(LiVESSpinButton   *spinbutton, livespointer user_data);
 
-boolean prevclip_callback (LiVESAccelGroup *, LiVESObject *, uint32_t, LiVESXModifierType, gpointer );
+boolean prevclip_callback(LiVESAccelGroup *, LiVESObject *, uint32_t, LiVESXModifierType, livespointer);
 
-boolean nextclip_callback (LiVESAccelGroup *, LiVESObject *, uint32_t, LiVESXModifierType, gpointer );
+boolean nextclip_callback(LiVESAccelGroup *, LiVESObject *, uint32_t, LiVESXModifierType, livespointer);
 
-boolean freeze_callback (LiVESAccelGroup *, LiVESObject *, uint32_t, LiVESXModifierType, gpointer );
+boolean freeze_callback(LiVESAccelGroup *, LiVESObject *, uint32_t, LiVESXModifierType, livespointer);
 
-boolean storeclip_callback (LiVESAccelGroup *, LiVESObject *, uint32_t, LiVESXModifierType, gpointer );
+boolean storeclip_callback(LiVESAccelGroup *, LiVESObject *, uint32_t, LiVESXModifierType, livespointer);
 
-boolean nervous_callback (LiVESAccelGroup *, LiVESObject *, uint32_t, LiVESXModifierType, gpointer );
+boolean nervous_callback(LiVESAccelGroup *, LiVESObject *, uint32_t, LiVESXModifierType, livespointer);
 
-boolean show_sync_callback (LiVESAccelGroup *, LiVESObject *, uint32_t, LiVESXModifierType, gpointer clip_number);
+boolean show_sync_callback(LiVESAccelGroup *, LiVESObject *, uint32_t, LiVESXModifierType, livespointer clip_number);
 
-void on_save_set_activate (LiVESMenuItem *, gpointer );
+boolean on_save_set_activate(LiVESMenuItem *, livespointer);
 
-void on_save_set_ok (void);
+void on_save_set_ok(void);
 
-void on_load_set_activate (LiVESMenuItem *, gpointer );
+char *on_load_set_activate(LiVESMenuItem *, livespointer);
 
-boolean on_load_set_ok (LiVESButton *, gpointer skip_threaded_dialog);
+boolean reload_set(const char *set_name);
 
-void on_open_vcd_activate (LiVESMenuItem *, gpointer int_type);
+void on_open_vcd_activate(LiVESMenuItem *, livespointer int_type);
 
-void on_load_vcd_ok_clicked (LiVESButton *, gpointer user_data);
+void on_load_vcd_ok_clicked(LiVESButton *, livespointer user_data);
 
-void on_ping_pong_activate (LiVESMenuItem *, gpointer);
+void on_ping_pong_activate(LiVESMenuItem *, livespointer);
 
-void on_show_keys_activate (LiVESMenuItem *, gpointer);
+void on_show_keys_activate(LiVESMenuItem *, livespointer);
 
-void on_vj_reset_activate (LiVESMenuItem *, gpointer);
+void on_vj_reset_activate(LiVESMenuItem *, livespointer);
 
-void on_prv_link_toggled (LiVESToggleButton *, gpointer);
+void on_prv_link_toggled(LiVESToggleButton *, livespointer);
 
-boolean on_del_audio_activate (LiVESMenuItem *, gpointer);
+boolean on_del_audio_activate(LiVESMenuItem *, livespointer);
 
-boolean on_ins_silence_activate (LiVESMenuItem *, gpointer);
+boolean on_ins_silence_activate(LiVESMenuItem *, livespointer);
 
-void on_ins_silence_details_clicked (LiVESButton *, gpointer);
+void on_ins_silence_details_clicked(LiVESButton *, livespointer);
 
-void on_lerrors_close_clicked (LiVESButton *, gpointer);
-void on_lerrors_clear_clicked (LiVESButton *, gpointer);
-void on_lerrors_delete_clicked (LiVESButton *, gpointer);
-
-void drag_from_outside(LiVESWidget *, GdkDragContext *, int x, int y, 
-		       GtkSelectionData *, guint info, guint time, gpointer user_data);
+void on_lerrors_close_clicked(LiVESButton *, livespointer);
+void on_lerrors_clear_clicked(LiVESButton *, livespointer);
+void on_lerrors_delete_clicked(LiVESButton *, livespointer);
 
+#ifdef GUI_GTK
+void drag_from_outside(LiVESWidget *, GdkDragContext *, int x, int y,
+                       GtkSelectionData *, uint32_t info, uint32_t time, livespointer user_data);
 
+#endif
 
 #endif

LiVES-2.2.8.tar.bz2/src/ce_thumbs.c -> LiVES-2.4.1.tar.bz2/src/ce_thumbs.c Changed

@@ -13,7 +13,6 @@
 // TODO - user defined screen mapping areas
 
 
-#include "support.h"
 #include "main.h"
 #include "effects-weed.h"
 #include "effects.h"
@@ -29,10 +28,10 @@
 static LiVESWidget **clip_boxes;
 static LiVESWidget *param_hbox;
 static LiVESWidget *top_hbox;
-static gulong *ch_fns;
-static gulong *combo_fns;
-static gulong *rb_clip_fns;
-static gulong *rb_fx_fns;
+static ulong *ch_fns;
+static ulong *combo_fns;
+static ulong *rb_clip_fns;
+static ulong *rb_fx_fns;
 
 static int rte_keys_virtual;
 static int n_screen_areas;
@@ -44,16 +43,36 @@
 static void ce_thumbs_remove_param_box(int key);
 
 
+void ce_thumbs_set_interactive(boolean interactive) {
+  register int i;
+
+  if (!interactive) {
+    for (i=0; i<rte_keys_virtual; i++) {
+      lives_widget_set_sensitive(fxcombos[i],FALSE);
+      lives_widget_set_sensitive(key_checks[i],FALSE);
+    }
+  } else {
+    for (i=0; i<rte_keys_virtual; i++) {
+      lives_widget_set_sensitive(fxcombos[i],TRUE);
+      if (rte_key_getmaxmode(i+1)>0) {
+        lives_widget_set_sensitive(key_checks[i],TRUE);
+      }
+    }
+  }
+
+}
+
 #if LIVES_HAS_GRID_WIDGET
-static boolean switch_clip_cb (LiVESWidget *eventbox, LiVESXEventButton *event, gpointer user_data) {
-  int i=GPOINTER_TO_INT(user_data);
+static boolean switch_clip_cb(LiVESWidget *eventbox, LiVESXEventButton *event, livespointer user_data) {
+  int i=LIVES_POINTER_TO_INT(user_data);
   if (mainw->playing_file==-1) return FALSE;
-  switch_clip (0,i);
+  if (!mainw->interactive) return FALSE;
+  switch_clip(0,i);
   return FALSE;
 }
 
-static void ce_thumbs_fx_changed (LiVESCombo *combo, gpointer user_data) {
-  // callback after user switches fx via combo 
+static void ce_thumbs_fx_changed(LiVESCombo *combo, livespointer user_data) {
+  // callback after user switches fx via combo
   int key=LIVES_POINTER_TO_INT(user_data);
   int mode,cmode;
 
@@ -62,7 +81,7 @@
 
   if (cmode==mode) return;
 
-  lives_widget_grab_focus (combo_entries[key]);
+  lives_widget_grab_focus(combo_entries[key]);
 
   rte_key_setmode(key+1,mode);
 }
@@ -72,49 +91,50 @@
 void ce_thumbs_set_key_check_state(void) {
   // set (delayed) keycheck state
   register int i;
-  for (i=0;i<prefs->rte_keys_virtual;i++) {
+  for (i=0; i<prefs->rte_keys_virtual; i++) {
     lives_signal_handler_block(key_checks[i],ch_fns[i]);
-    lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(key_checks[i]),GPOINTER_TO_INT(g_object_get_data(G_OBJECT(key_checks[i]),"active")));
+    lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(key_checks[i]),
+                                   LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(key_checks[i]),"active")));
     if (!lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(key_checks[i]))&&pscrolls[i]!=NULL) ce_thumbs_remove_param_box(i);
     lives_signal_handler_unblock(key_checks[i],ch_fns[i]);
   }
 }
 
 
-void ce_thumbs_set_keych (int key, boolean on) {
+void ce_thumbs_set_keych(int key, boolean on) {
   // set key check from other source
   if (key>=rte_keys_virtual) return;
   lives_signal_handler_block(key_checks[key],ch_fns[key]);
   if (!pthread_mutex_trylock(&mainw->gtk_mutex)) {
-    lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON(key_checks[key]),on);
+    lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(key_checks[key]),on);
     if (!on&&pscrolls[key]!=NULL) ce_thumbs_remove_param_box(key);
     pthread_mutex_unlock(&mainw->gtk_mutex);
   }
   lives_signal_handler_unblock(key_checks[key],ch_fns[key]);
-  g_object_set_data(G_OBJECT(key_checks[key]),"active",GINT_TO_POINTER(on));
+  lives_widget_object_set_data(LIVES_WIDGET_OBJECT(key_checks[key]),"active",LIVES_INT_TO_POINTER(on));
 }
 
 
-void ce_thumbs_set_mode_combo (int key, int mode) {
+void ce_thumbs_set_mode_combo(int key, int mode) {
   // set combo from other source : need to add params after
   if (key>=rte_keys_virtual) return;
   if (mode<0) return;
   lives_signal_handler_block(fxcombos[key],combo_fns[key]);
-  lives_combo_set_active_index (LIVES_COMBO (fxcombos[key]),mode);
+  lives_combo_set_active_index(LIVES_COMBO(fxcombos[key]),mode);
   ce_thumbs_remove_param_box(key);
   lives_signal_handler_unblock(fxcombos[key],combo_fns[key]);
 }
 
 
-static void pin_toggled (LiVESToggleButton *t, livespointer pkey) {
+static void pin_toggled(LiVESToggleButton *t, livespointer pkey) {
   int key=LIVES_POINTER_TO_INT(pkey);
-  boolean state=LIVES_POINTER_TO_INT(g_object_get_data(G_OBJECT(pscrolls[key]),"pinned"));
-  g_object_set_data (G_OBJECT (pscrolls[key]),"pinned",LIVES_INT_TO_POINTER (!state));
+  boolean state=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(pscrolls[key]),"pinned"));
+  lives_widget_object_set_data(LIVES_WIDGET_OBJECT(pscrolls[key]),"pinned",LIVES_INT_TO_POINTER(!state));
 }
 
 #if LIVES_HAS_GRID_WIDGET
 
-static void clip_area_toggled (LiVESToggleButton *t, livespointer parea) {
+static void clip_area_toggled(LiVESToggleButton *t, livespointer parea) {
   int area=LIVES_POINTER_TO_INT(parea);
   if (lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(rb_clip_areas[area]))) {
     mainw->active_sa_clips=area;
@@ -143,8 +163,8 @@
 
   LiVESPixbuf *thumbnail;
 
-  GList *cliplist=mainw->cliplist;
-  GList *fxlist=NULL;
+  LiVESList *cliplist=mainw->cliplist;
+  LiVESList *fxlist=NULL;
 
   GSList *rb_fx_areas_group=NULL;
   GSList *rb_clip_areas_group=NULL;
@@ -162,181 +182,182 @@
 
   rte_keys_virtual=prefs->rte_keys_virtual;
   n_screen_areas=mainw->n_screen_areas;
-  n_clip_boxes=g_list_length(mainw->cliplist)+SPARE_CLIP_BOXES;
+  n_clip_boxes=lives_list_length(mainw->cliplist)+SPARE_CLIP_BOXES;
 
   next_screen_area=SCREEN_AREA_NONE;
 
-  lives_grid_set_row_spacing (LIVES_GRID(tgrid),0);
-  lives_grid_set_column_spacing (LIVES_GRID(tgrid),0);
+  lives_grid_set_row_spacing(LIVES_GRID(tgrid),0);
+  lives_grid_set_column_spacing(LIVES_GRID(tgrid),0);
 
   //lives_container_set_border_width (LIVES_CONTAINER (tgrid), width);
 
   // dual monitor mode, the gui monitor can show clip thumbnails
 
-  top_hbox=lives_hbox_new (FALSE, 0);
+  top_hbox=lives_hbox_new(FALSE, 0);
   lives_widget_show(top_hbox);
-  lives_box_pack_start (LIVES_BOX (mainw->vbox1), top_hbox, TRUE, TRUE, 0);
+  lives_box_pack_start(LIVES_BOX(mainw->vbox1), top_hbox, TRUE, TRUE, 0);
 
-  if (palette->style&STYLE_1) lives_widget_set_bg_color (top_hbox, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+  if (palette->style&STYLE_1) lives_widget_set_bg_color(top_hbox, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
 
   // fx area
-  vbox=lives_vbox_new (FALSE, widget_opts.packing_height);
-  
+  vbox=lives_vbox_new(FALSE, widget_opts.packing_height);
+
   tscroll=lives_standard_scrolled_window_new(width,height,vbox);
-  lives_box_pack_start (LIVES_BOX (top_hbox), tscroll, FALSE, TRUE, 0);
-  lives_scrolled_window_set_policy (LIVES_SCROLLED_WINDOW (tscroll), LIVES_POLICY_NEVER, LIVES_POLICY_AUTOMATIC);
+  lives_box_pack_start(LIVES_BOX(top_hbox), tscroll, FALSE, TRUE, 0);
+  lives_scrolled_window_set_policy(LIVES_SCROLLED_WINDOW(tscroll), LIVES_POLICY_NEVER, LIVES_POLICY_AUTOMATIC);
   lives_widget_set_hexpand(tscroll,FALSE);
 
-  fxcombos=(LiVESWidget **)g_malloc((rte_keys_virtual)*modes*sizeof(LiVESWidget *));
-  pscrolls=(LiVESWidget **)g_malloc((rte_keys_virtual)*modes*sizeof(LiVESWidget *));
-  combo_entries=(LiVESWidget **)g_malloc((rte_keys_virtual)*modes*sizeof(LiVESWidget *));
-  key_checks=(LiVESWidget **)g_malloc((rte_keys_virtual)*modes*sizeof(LiVESWidget *));
+  fxcombos=(LiVESWidget **)lives_malloc((rte_keys_virtual)*modes*sizeof(LiVESWidget *));
+  pscrolls=(LiVESWidget **)lives_malloc((rte_keys_virtual)*modes*sizeof(LiVESWidget *));
+  combo_entries=(LiVESWidget **)lives_malloc((rte_keys_virtual)*modes*sizeof(LiVESWidget *));
+  key_checks=(LiVESWidget **)lives_malloc((rte_keys_virtual)*modes*sizeof(LiVESWidget *));
 
-  rb_fx_areas=(LiVESWidget **)g_malloc((n_screen_areas)*modes*sizeof(LiVESWidget *));
-  rb_clip_areas=(LiVESWidget **)g_malloc((n_screen_areas)*modes*sizeof(LiVESWidget *));
+  rb_fx_areas=(LiVESWidget **)lives_malloc((n_screen_areas)*modes*sizeof(LiVESWidget *));
+  rb_clip_areas=(LiVESWidget **)lives_malloc((n_screen_areas)*modes*sizeof(LiVESWidget *));
 
-  clip_boxes=(LiVESWidget **)g_malloc((n_clip_boxes)*modes*sizeof(LiVESWidget *));
+  clip_boxes=(LiVESWidget **)lives_malloc((n_clip_boxes)*modes*sizeof(LiVESWidget *));
 
-  ch_fns=(gulong *)g_malloc((rte_keys_virtual)*sizeof(gulong));
-  combo_fns=(gulong *)g_malloc((rte_keys_virtual)*sizeof(gulong));
-  rb_clip_fns=(gulong *)g_malloc((n_screen_areas)*sizeof(gulong));
-  rb_fx_fns=(gulong *)g_malloc((n_screen_areas)*sizeof(gulong));
+  ch_fns=(ulong *)lives_malloc((rte_keys_virtual)*sizeof(ulong));
+  combo_fns=(ulong *)lives_malloc((rte_keys_virtual)*sizeof(ulong));
+  rb_clip_fns=(ulong *)lives_malloc((n_screen_areas)*sizeof(ulong));
+  rb_fx_fns=(ulong *)lives_malloc((n_screen_areas)*sizeof(ulong));
 
-  for (i=0;i<n_clip_boxes;i++) {
+  for (i=0; i<n_clip_boxes; i++) {
     clip_boxes[i]=NULL;
   }
 
-  for (i=0;i<rte_keys_virtual;i++) {
+  for (i=0; i<rte_keys_virtual; i++) {
 
     pscrolls[i]=NULL;
 
     fxlist=NULL;
 
-    for (j=0;j<=rte_key_getmaxmode(i+1);j++) {
-      fxlist=g_list_append(fxlist,rte_keymode_get_filter_name(i+1,j));
+    for (j=0; j<=rte_key_getmaxmode(i+1); j++) {
+      fxlist=lives_list_append(fxlist,rte_keymode_get_filter_name(i+1,j));
     }
 
-    hbox = lives_hbox_new (FALSE, 0);
-    lives_box_pack_start (LIVES_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
+    hbox = lives_hbox_new(FALSE, 0);
+    lives_box_pack_start(LIVES_BOX(vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
 
-    tmp=g_strdup_printf(_("Mapped to ctrl-%d"),i+1);
+    tmp=lives_strdup_printf(_("Mapped to ctrl-%d"),i+1);
     key_checks[i]=lives_standard_check_button_new(NULL,FALSE,LIVES_BOX(hbox),tmp);
-    g_free(tmp);
+    lives_free(tmp);
 
     lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(key_checks[i]),mainw->rte&(GU641<<i));
-    g_object_set_data(G_OBJECT(key_checks[i]),"active",GINT_TO_POINTER(lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(key_checks[i]))));
+    lives_widget_object_set_data(LIVES_WIDGET_OBJECT(key_checks[i]),"active",
+                                 LIVES_INT_TO_POINTER(lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(key_checks[i]))));
 
-    ch_fns[i]=lives_signal_connect_after (LIVES_GUI_OBJECT (key_checks[i]), LIVES_WIDGET_TOGGLED_EVENT,
-				      LIVES_GUI_CALLBACK (rte_on_off_callback_hook),GINT_TO_POINTER (i+1));
+    ch_fns[i]=lives_signal_connect_after(LIVES_GUI_OBJECT(key_checks[i]), LIVES_WIDGET_TOGGLED_SIGNAL,
+                                         LIVES_GUI_CALLBACK(rte_on_off_callback_hook),LIVES_INT_TO_POINTER(i+1));
 
 
     fxcombos[i]=lives_standard_combo_new(NULL,FALSE,fxlist,LIVES_BOX(hbox),NULL);
 
     if (fxlist!=NULL) {
-      g_list_free_strings(fxlist);
-      g_list_free(fxlist);
-      lives_combo_set_active_index (LIVES_COMBO (fxcombos[i]),rte_key_getmode(i+1));
-    }
-    else {
+      lives_list_free_strings(fxlist);
+      lives_list_free(fxlist);
+      lives_combo_set_active_index(LIVES_COMBO(fxcombos[i]),rte_key_getmode(i+1));
+    } else {
       lives_widget_set_sensitive(key_checks[i],FALSE);
     }
 
     combo_entries[i] = lives_combo_get_entry(LIVES_COMBO(fxcombos[i]));
- 
-    lives_entry_set_editable (LIVES_ENTRY (combo_entries[i]), FALSE);
-      
-    combo_fns[i]=lives_signal_connect(LIVES_GUI_OBJECT (fxcombos[i]), LIVES_WIDGET_CHANGED_EVENT,
-				  LIVES_GUI_CALLBACK (ce_thumbs_fx_changed),GINT_TO_POINTER(i));
+
+    lives_entry_set_editable(LIVES_ENTRY(combo_entries[i]), FALSE);
+
+    combo_fns[i]=lives_signal_connect(LIVES_GUI_OBJECT(fxcombos[i]), LIVES_WIDGET_CHANGED_SIGNAL,
+                                      LIVES_GUI_CALLBACK(ce_thumbs_fx_changed),LIVES_INT_TO_POINTER(i));
 
   }
 
   add_vsep_to_box(LIVES_BOX(top_hbox));
 
   // rhs vbox
-  vbox2=lives_vbox_new (FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (top_hbox), vbox2, TRUE, TRUE, 0);
+  vbox2=lives_vbox_new(FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(top_hbox), vbox2, TRUE, TRUE, 0);
 
   // rhs top hbox
-  hbox2=lives_hbox_new (FALSE, widget_opts.packing_width);
-  lives_box_pack_start (LIVES_BOX (vbox2), hbox2, TRUE, TRUE, 0);
+  hbox2=lives_hbox_new(FALSE, widget_opts.packing_width);
+  lives_box_pack_start(LIVES_BOX(vbox2), hbox2, TRUE, TRUE, 0);
 
   // vbox for arrows and areas
-  vbox3=lives_vbox_new (FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (hbox2), vbox3, FALSE, TRUE, 0);
+  vbox3=lives_vbox_new(FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(hbox2), vbox3, FALSE, TRUE, 0);
 
   // add arrows
-  hbox = lives_hbox_new (FALSE, 0);
+  hbox = lives_hbox_new(FALSE, 0);
   lives_widget_set_hexpand(hbox,FALSE);
 
 
-  lives_box_pack_start (LIVES_BOX (vbox3), hbox, FALSE, TRUE, 0);
-  arrow=lives_arrow_new (LIVES_ARROW_LEFT, LIVES_SHADOW_NONE);
-  lives_box_pack_start(LIVES_BOX (hbox), arrow, FALSE, TRUE, 0);
+  lives_box_pack_start(LIVES_BOX(vbox3), hbox, FALSE, TRUE, 0);
+  arrow=lives_arrow_new(LIVES_ARROW_LEFT, LIVES_SHADOW_NONE);
+  lives_box_pack_start(LIVES_BOX(hbox), arrow, FALSE, TRUE, 0);
 
   label=lives_standard_label_new(_("Effects"));
-  lives_box_pack_start(LIVES_BOX (hbox), label, FALSE, TRUE, 0);
+  lives_box_pack_start(LIVES_BOX(hbox), label, FALSE, TRUE, 0);
   add_fill_to_box(LIVES_BOX(hbox));
   label=lives_standard_label_new(_("Clips"));
-  lives_box_pack_start(LIVES_BOX (hbox), label, FALSE, TRUE, 0);
+  lives_box_pack_start(LIVES_BOX(hbox), label, FALSE, TRUE, 0);
 
-  arrow=lives_arrow_new (LIVES_ARROW_RIGHT, LIVES_SHADOW_NONE);
-  lives_box_pack_start(LIVES_BOX (hbox), arrow, FALSE, TRUE, 0);
+  arrow=lives_arrow_new(LIVES_ARROW_RIGHT, LIVES_SHADOW_NONE);
+  lives_box_pack_start(LIVES_BOX(hbox), arrow, FALSE, TRUE, 0);
 
 
 
 
   // screen areas
-  vbox=lives_vbox_new (FALSE, widget_opts.packing_height);
+  vbox=lives_vbox_new(FALSE, widget_opts.packing_height);
   tscroll=lives_standard_scrolled_window_new(width,height,vbox);
 
-  lives_box_pack_start (LIVES_BOX (vbox3), tscroll, FALSE, TRUE, 0);
-  lives_scrolled_window_set_policy (LIVES_SCROLLED_WINDOW (tscroll), LIVES_POLICY_NEVER, LIVES_POLICY_AUTOMATIC);
+  lives_box_pack_start(LIVES_BOX(vbox3), tscroll, FALSE, TRUE, 0);
+  lives_scrolled_window_set_policy(LIVES_SCROLLED_WINDOW(tscroll), LIVES_POLICY_NEVER, LIVES_POLICY_AUTOMATIC);
   lives_widget_set_hexpand(tscroll,FALSE);
 
 
-  for (i=0;i<n_screen_areas;i++) {
-    hbox = lives_hbox_new (FALSE, 0);
-    lives_box_pack_start (LIVES_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
+  for (i=0; i<n_screen_areas; i++) {
+    hbox = lives_hbox_new(FALSE, 0);
+    lives_box_pack_start(LIVES_BOX(vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
 
     // radiobuttons for fx
     rb_fx_areas[i]=lives_standard_radio_button_new("",FALSE,rb_fx_areas_group,LIVES_BOX(hbox),
-						   (tmp=g_strdup_printf(_("Show / apply effects to %s\n"),
-								 mainw->screen_areas[i].name)));
-    rb_fx_areas_group = lives_radio_button_get_group (LIVES_RADIO_BUTTON (rb_fx_areas[i]));
-    g_free(tmp);
+                   (tmp=lives_strdup_printf(_("Show / apply effects to %s\n"),
+                                            mainw->screen_areas[i].name)));
+    rb_fx_areas_group = lives_radio_button_get_group(LIVES_RADIO_BUTTON(rb_fx_areas[i]));
+    lives_free(tmp);
 
     if (i!=SCREEN_AREA_FOREGROUND) lives_widget_set_sensitive(rb_fx_areas[i],FALSE);
 
     label=lives_standard_label_new(mainw->screen_areas[i].name);
-    lives_box_pack_start (LIVES_BOX (hbox), label, FALSE, TRUE, 0);
+    lives_box_pack_start(LIVES_BOX(hbox), label, FALSE, TRUE, 0);
 
     // radiobuttons for fx
     rb_clip_areas[i]=lives_standard_radio_button_new("",FALSE,rb_clip_areas_group,LIVES_BOX(hbox),
-						     (tmp=g_strdup_printf(_("Select clip for %s\n"),
-									  mainw->screen_areas[i].name)));
-    rb_clip_areas_group = lives_radio_button_get_group (LIVES_RADIO_BUTTON (rb_clip_areas[i]));
-    g_free(tmp);
+                     (tmp=lives_strdup_printf(_("Select clip for %s\n"),
+                          mainw->screen_areas[i].name)));
+    rb_clip_areas_group = lives_radio_button_get_group(LIVES_RADIO_BUTTON(rb_clip_areas[i]));
+    lives_free(tmp);
 
-    rb_clip_fns[i]=lives_signal_connect (LIVES_GUI_OBJECT (rb_clip_areas[i]), LIVES_WIDGET_TOGGLED_EVENT, LIVES_GUI_CALLBACK (clip_area_toggled), LIVES_INT_TO_POINTER(i));
+    rb_clip_fns[i]=lives_signal_connect(LIVES_GUI_OBJECT(rb_clip_areas[i]), LIVES_WIDGET_TOGGLED_SIGNAL, LIVES_GUI_CALLBACK(clip_area_toggled),
+                                        LIVES_INT_TO_POINTER(i));
 
   }
 
   add_vsep_to_box(LIVES_BOX(hbox2));
 
   cscroll=lives_standard_scrolled_window_new(width,height,tgrid);
-  lives_scrolled_window_set_policy (LIVES_SCROLLED_WINDOW (cscroll), LIVES_POLICY_NEVER, LIVES_POLICY_AUTOMATIC);
-  lives_box_pack_start (LIVES_BOX (hbox2), cscroll, TRUE, TRUE, 0);
+  lives_scrolled_window_set_policy(LIVES_SCROLLED_WINDOW(cscroll), LIVES_POLICY_NEVER, LIVES_POLICY_AUTOMATIC);
+  lives_box_pack_start(LIVES_BOX(hbox2), cscroll, TRUE, TRUE, 0);
 
   ////
   add_hsep_to_box(LIVES_BOX(vbox2));
 
   // insert a scrolled window for param boxes
-  param_hbox = lives_hbox_new (FALSE, 0);
+  param_hbox = lives_hbox_new(FALSE, 0);
 
   tscroll=lives_standard_scrolled_window_new(width,height,param_hbox);
-  lives_scrolled_window_set_policy (LIVES_SCROLLED_WINDOW (tscroll), LIVES_POLICY_AUTOMATIC, LIVES_POLICY_NEVER);
+  lives_scrolled_window_set_policy(LIVES_SCROLLED_WINDOW(tscroll), LIVES_POLICY_AUTOMATIC, LIVES_POLICY_NEVER);
 
-  lives_box_pack_start (LIVES_BOX (vbox2), tscroll, TRUE, TRUE, 0);
+  lives_box_pack_start(LIVES_BOX(vbox2), tscroll, TRUE, TRUE, 0);
 
   lives_widget_hide(mainw->eventbox);
   lives_widget_hide(mainw->message_box);
@@ -352,11 +373,11 @@
   while (cliplist!=NULL) {
     count++;
 
-    i=GPOINTER_TO_INT(cliplist->data);
+    i=LIVES_POINTER_TO_INT(cliplist->data);
     if (i==mainw->scrap_file||i==mainw->ascrap_file||
-	(mainw->files[i]->clip_type!=CLIP_TYPE_DISK&&mainw->files[i]->clip_type!=CLIP_TYPE_FILE&&
-	 mainw->files[i]->clip_type!=CLIP_TYPE_YUV4MPEG&&mainw->files[i]->clip_type!=CLIP_TYPE_VIDEODEV)||
-	mainw->files[i]->frames==0) {
+        (mainw->files[i]->clip_type!=CLIP_TYPE_DISK&&mainw->files[i]->clip_type!=CLIP_TYPE_FILE&&
+         mainw->files[i]->clip_type!=CLIP_TYPE_YUV4MPEG&&mainw->files[i]->clip_type!=CLIP_TYPE_VIDEODEV)||
+        mainw->files[i]->frames==0) {
       cliplist=cliplist->next;
       continue;
     }
@@ -365,28 +386,28 @@
     thumbnail=make_thumb(NULL,i,width,height,mainw->files[i]->start,TRUE);
 
     clip_boxes[count]=lives_event_box_new();
-    g_object_set_data (G_OBJECT (clip_boxes[count]),"clipno",LIVES_INT_TO_POINTER (i));
-    lives_widget_set_size_request (clip_boxes[count], width*1.5, height*1.5);
+    lives_widget_object_set_data(LIVES_WIDGET_OBJECT(clip_boxes[count]),"clipno",LIVES_INT_TO_POINTER(i));
+    lives_widget_set_size_request(clip_boxes[count], width*1.5, height*1.5);
 
     if (palette->style&STYLE_1) {
-      lives_widget_set_bg_color (clip_boxes[count], LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
-      lives_widget_set_bg_color (clip_boxes[count], LIVES_WIDGET_STATE_PRELIGHT, &palette->menu_and_bars);
+      lives_widget_set_bg_color(clip_boxes[count], LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+      lives_widget_set_bg_color(clip_boxes[count], LIVES_WIDGET_STATE_PRELIGHT, &palette->menu_and_bars);
     }
 
-    lives_widget_add_events (clip_boxes[count], LIVES_BUTTON_PRESS_MASK);
+    lives_widget_add_events(clip_boxes[count], LIVES_BUTTON_PRESS_MASK);
 
     align=lives_alignment_new(.5,.5,0.,0.);
 
     thumb_image=lives_image_new();
     lives_image_set_from_pixbuf(LIVES_IMAGE(thumb_image),thumbnail);
     if (thumbnail!=NULL) lives_object_unref(thumbnail);
-    lives_container_add (LIVES_CONTAINER (clip_boxes[count]), align);
+    lives_container_add(LIVES_CONTAINER(clip_boxes[count]), align);
 
     if (rcount>0) {
       if (rcount==cpw-1) rcount=0;
       else {
-	lives_grid_attach_next_to(LIVES_GRID(tgrid),clip_boxes[count],sibl,LIVES_POS_RIGHT,1,1);
-	sibl=clip_boxes[count];
+        lives_grid_attach_next_to(LIVES_GRID(tgrid),clip_boxes[count],sibl,LIVES_POS_RIGHT,1,1);
+        sibl=clip_boxes[count];
       }
     }
 
@@ -395,27 +416,27 @@
       sibl=usibl=clip_boxes[count];
     }
 
-    g_snprintf (filename,PATH_MAX,"%s",(tmp=g_path_get_basename(mainw->files[i]->name)));
-    g_free(tmp);
+    lives_snprintf(filename,PATH_MAX,"%s",(tmp=lives_path_get_basename(mainw->files[i]->name)));
+    lives_free(tmp);
     get_basename(filename);
     lives_widget_set_tooltip_text(clip_boxes[count], filename);
 
     //if (palette->style&STYLE_3) lives_widget_set_fg_color (label, LIVES_WIDGET_STATE_PRELIGHT, &palette->info_text);
     //if (palette->style&STYLE_4) lives_widget_set_fg_color (label, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
 
-    lives_container_add (LIVES_CONTAINER (align), thumb_image);
-      
+    lives_container_add(LIVES_CONTAINER(align), thumb_image);
+
     rcount++;
-      
-    lives_signal_connect (LIVES_GUI_OBJECT (clip_boxes[count]), "button_press_event",
-		      LIVES_GUI_CALLBACK (switch_clip_cb),
-		      GINT_TO_POINTER(i));
-      
+
+    lives_signal_connect(LIVES_GUI_OBJECT(clip_boxes[count]), LIVES_WIDGET_BUTTON_PRESS_EVENT,
+                         LIVES_GUI_CALLBACK(switch_clip_cb),
+                         LIVES_INT_TO_POINTER(i));
+
     cliplist=cliplist->next;
   }
 
   if (prefs->open_maximised) {
-    lives_window_maximize (LIVES_WINDOW(mainw->LiVES));
+    lives_window_maximize(LIVES_WINDOW(mainw->LiVES));
   }
 
   lives_widget_show_all(top_hbox);
@@ -435,16 +456,16 @@
   lives_widget_destroy(top_hbox);
   lives_widget_show(mainw->eventbox);
   lives_widget_show(mainw->message_box);
-  g_free(fxcombos);
-  g_free(pscrolls);
-  g_free(combo_entries);
-  g_free(key_checks);
-  g_free(rb_fx_areas);
-  g_free(rb_clip_areas);
-  g_free(clip_boxes);
-  g_free(ch_fns);
-  g_free(rb_clip_fns);
-  g_free(rb_fx_fns);
+  lives_free(fxcombos);
+  lives_free(pscrolls);
+  lives_free(combo_entries);
+  lives_free(key_checks);
+  lives_free(rb_fx_areas);
+  lives_free(rb_clip_areas);
+  lives_free(clip_boxes);
+  lives_free(ch_fns);
+  lives_free(rb_clip_fns);
+  lives_free(rb_fx_fns);
 }
 
 
@@ -487,24 +508,24 @@
   // here we just check if we have any params to display
   if (!make_param_box(NULL,rfx)) {
     rfx_free(rfx);
-    g_free(rfx);
+    lives_free(rfx);
     return;
   }
 
 
-  vbox = lives_vbox_new (FALSE, 0);
+  vbox = lives_vbox_new(FALSE, 0);
 
   pscrolls[key]=lives_standard_scrolled_window_new(-1,-1,vbox);
-  lives_scrolled_window_set_policy (LIVES_SCROLLED_WINDOW (pscrolls[key]), LIVES_POLICY_NEVER, LIVES_POLICY_AUTOMATIC);
+  lives_scrolled_window_set_policy(LIVES_SCROLLED_WINDOW(pscrolls[key]), LIVES_POLICY_NEVER, LIVES_POLICY_AUTOMATIC);
   lives_widget_set_hexpand(pscrolls[key],FALSE);
 
-  lives_box_pack_start (LIVES_BOX (param_hbox), pscrolls[key], TRUE, TRUE, 0);
+  lives_box_pack_start(LIVES_BOX(param_hbox), pscrolls[key], TRUE, TRUE, 0);
 
   fname=weed_instance_get_filter_name(inst,TRUE);
   label=lives_standard_label_new(fname);
-  g_free(fname);
+  lives_free(fname);
 
-  hbox = lives_hbox_new (FALSE, 0);
+  hbox = lives_hbox_new(FALSE, 0);
   lives_box_pack_start(LIVES_BOX(vbox),hbox,FALSE,FALSE,widget_opts.packing_height);
 
   add_fill_to_box(LIVES_BOX(hbox));
@@ -512,11 +533,13 @@
   add_fill_to_box(LIVES_BOX(hbox));
 
   /* TRANSLATORS - "pin" as in "pinned to window" */
-  pin_check=lives_standard_check_button_new((tmp=g_strdup(_("_Pin"))),TRUE,LIVES_BOX(hbox),(tmp2=g_strdup(_("Pin the parameter box to the window"))));
-  g_free(tmp); g_free(tmp2);
+  pin_check=lives_standard_check_button_new((tmp=lives_strdup(_("_Pin"))),TRUE,LIVES_BOX(hbox),
+            (tmp2=lives_strdup(_("Pin the parameter box to the window"))));
+  lives_free(tmp);
+  lives_free(tmp2);
 
-  lives_signal_connect_after (LIVES_GUI_OBJECT (pin_check), LIVES_WIDGET_TOGGLED_EVENT,
-			  LIVES_GUI_CALLBACK (pin_toggled),LIVES_INT_TO_POINTER (key));
+  lives_signal_connect_after(LIVES_GUI_OBJECT(pin_check), LIVES_WIDGET_TOGGLED_SIGNAL,
+                             LIVES_GUI_CALLBACK(pin_toggled),LIVES_INT_TO_POINTER(key));
 
 
   on_fx_pre_activate(rfx,1,vbox);
@@ -524,9 +547,9 @@
   // record the key so we know whose parameters to record later
   weed_set_int_value((weed_plant_t *)rfx->source,"host_key",key);
 
-  g_object_set_data (G_OBJECT (pscrolls[key]),"pinned",LIVES_INT_TO_POINTER (FALSE));
-  g_object_set_data (G_OBJECT (pscrolls[key]),"update",LIVES_INT_TO_POINTER (FALSE));
-  g_object_set_data (G_OBJECT (pscrolls[key]),"rfx",rfx);
+  lives_widget_object_set_data(LIVES_WIDGET_OBJECT(pscrolls[key]),"pinned",LIVES_INT_TO_POINTER(FALSE));
+  lives_widget_object_set_data(LIVES_WIDGET_OBJECT(pscrolls[key]),"update",LIVES_INT_TO_POINTER(FALSE));
+  lives_widget_object_set_data(LIVES_WIDGET_OBJECT(pscrolls[key]),"rfx",rfx);
   lives_widget_show_all(param_hbox);
   pthread_mutex_unlock(&mainw->gtk_mutex);
 }
@@ -537,7 +560,7 @@
   lives_rfx_t *rfx;
   if (key>=rte_keys_virtual) return;
   if (pscrolls[key]==NULL) return;
-  rfx=(lives_rfx_t *)g_object_get_data(G_OBJECT(pscrolls[key]),"rfx");
+  rfx=(lives_rfx_t *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(pscrolls[key]),"rfx");
   on_paramwindow_cancel_clicked(NULL,rfx); // free rfx and unref the inst (must be done before destroying the pscrolls[key]
   lives_widget_destroy(pscrolls[key]);
   pscrolls[key]=NULL;
@@ -548,10 +571,10 @@
 static void ce_thumbs_remove_param_boxes(boolean remove_pinned) {
   // remove all param boxes, (except any which are "pinned")
   register int i;
-  for (i=0;i<rte_keys_virtual;i++) {
+  for (i=0; i<rte_keys_virtual; i++) {
     if (pscrolls[i]!=NULL) {
-      if (remove_pinned||!LIVES_POINTER_TO_INT(g_object_get_data(G_OBJECT(pscrolls[i]),"pinned"))) 
-	ce_thumbs_remove_param_box(i);
+      if (remove_pinned||!LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(pscrolls[i]),"pinned")))
+        ce_thumbs_remove_param_box(i);
     }
   }
 }
@@ -561,7 +584,7 @@
 void ce_thumbs_register_rfx_change(int key, int mode) {
   // register a param box to be updated visually, from an asynchronous source - either from a A->V data connection or from osc
   if (key>=rte_keys_virtual||pscrolls[key]==NULL) return;
-  g_object_set_data (G_OBJECT (pscrolls[key]),"update",LIVES_INT_TO_POINTER (TRUE));
+  lives_widget_object_set_data(LIVES_WIDGET_OBJECT(pscrolls[key]),"update",LIVES_INT_TO_POINTER(TRUE));
 }
 
 
@@ -570,25 +593,25 @@
   lives_rfx_t *rfx;
   register int i;
 
-  for (i=0;i<rte_keys_virtual;i++) {
+  for (i=0; i<rte_keys_virtual; i++) {
     if (pscrolls[i]!=NULL) {
-      if (LIVES_POINTER_TO_INT(g_object_get_data(G_OBJECT(pscrolls[i]),"update"))) { 
-	g_object_set_data (G_OBJECT (pscrolls[i]),"update",LIVES_INT_TO_POINTER (FALSE));
-	rfx=(lives_rfx_t *)g_object_get_data(G_OBJECT(pscrolls[i]),"rfx");
-	update_visual_params(rfx,FALSE);
+      if (LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(pscrolls[i]),"update"))) {
+        lives_widget_object_set_data(LIVES_WIDGET_OBJECT(pscrolls[i]),"update",LIVES_INT_TO_POINTER(FALSE));
+        rfx=(lives_rfx_t *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(pscrolls[i]),"rfx");
+        update_visual_params(rfx,FALSE);
       }
     }
   }
 }
 
 
-void ce_thumbs_update_params (int key, int i, GList *list) {
+void ce_thumbs_update_params(int key, int i, LiVESList *list) {
   // called only from weed_set_blend_factor() and from setting param in rte_window
   lives_rfx_t *rfx;
   if (key>=rte_keys_virtual) return;
 
   if (pscrolls[key]!=NULL) {
-    rfx=(lives_rfx_t *)g_object_get_data(G_OBJECT(pscrolls[key]),"rfx");
+    rfx=(lives_rfx_t *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(pscrolls[key]),"rfx");
     mainw->block_param_updates=TRUE;
     set_param_from_list(list,&rfx->params[key],0,TRUE,TRUE);
     mainw->block_param_updates=FALSE;
@@ -596,13 +619,13 @@
 }
 
 
-void ce_thumbs_update_visual_params (int key) {
+void ce_thumbs_update_visual_params(int key) {
   // param change in rte_window - set params box here
   lives_rfx_t *rfx;
   if (key>=rte_keys_virtual) return;
 
   if (pscrolls[key]!=NULL) {
-    rfx=(lives_rfx_t *)g_object_get_data(G_OBJECT(pscrolls[key]),"rfx");
+    rfx=(lives_rfx_t *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(pscrolls[key]),"rfx");
     update_visual_params(rfx,FALSE);
   }
 }
@@ -611,8 +634,8 @@
 void ce_thumbs_check_for_rte(lives_rfx_t *rfx, lives_rfx_t *rte_rfx, int key) {
   // param change in ce_thumbs, update rte_window
   register int i;
-  for (i=0;i<rte_keys_virtual;i++) {
-    if (pscrolls[i]!=NULL&&i==key&&rfx==(lives_rfx_t *)g_object_get_data(G_OBJECT(pscrolls[key]),"rfx")) {
+  for (i=0; i<rte_keys_virtual; i++) {
+    if (pscrolls[i]!=NULL&&i==key&&rfx==(lives_rfx_t *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(pscrolls[key]),"rfx")) {
       update_visual_params(rte_rfx,FALSE);
       break;
     }
@@ -623,24 +646,23 @@
 void ce_thumbs_reset_combo(int key) {
   // called from rte_window when the mapping is changed
 
-  GList *fxlist=NULL;
+  LiVESList *fxlist=NULL;
   int mode;
   register int j;
 
   if (key>=rte_keys_virtual) return;
-  for (j=0;j<=rte_key_getmaxmode(key+1);j++) {
-    fxlist=g_list_append(fxlist,rte_keymode_get_filter_name(key+1,j));
+  for (j=0; j<=rte_key_getmaxmode(key+1); j++) {
+    fxlist=lives_list_append(fxlist,rte_keymode_get_filter_name(key+1,j));
   }
   lives_combo_populate(LIVES_COMBO(fxcombos[key]),fxlist);
   if (fxlist!=NULL) {
     lives_widget_set_sensitive(key_checks[key],TRUE);
-    g_list_free_strings(fxlist);
-    g_list_free(fxlist);
+    lives_list_free_strings(fxlist);
+    lives_list_free(fxlist);
     mode=rte_key_getmode(key+1);
     ce_thumbs_set_mode_combo(key,mode);
     if (rte_keymode_get_instance(key+1,mode)!=NULL) ce_thumbs_add_param_box(key,TRUE);
-  }
-  else {
+  } else {
     lives_widget_set_sensitive(key_checks[key],FALSE);
     lives_combo_set_active_string(LIVES_COMBO(fxcombos[key]),"");
   }
@@ -651,7 +673,7 @@
 void ce_thumbs_reset_combos(void) {
   // called from rte_window when the mapping is cleared
   register int i;
-  for (i=0;i<rte_keys_virtual;i++) {
+  for (i=0; i<rte_keys_virtual; i++) {
     ce_thumbs_reset_combo(i);
   }
 }
@@ -659,9 +681,9 @@
 
 void ce_thumbs_set_clip_area(void) {
   register int i;
-  for (i=0;i<n_screen_areas;i++) lives_signal_handler_block(rb_clip_areas[i],rb_clip_fns[i]);
-  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (rb_clip_areas[mainw->active_sa_clips]), TRUE);
-  for (i=0;i<n_screen_areas;i++) lives_signal_handler_unblock(rb_clip_areas[i],rb_clip_fns[i]);
+  for (i=0; i<n_screen_areas; i++) lives_signal_handler_block(rb_clip_areas[i],rb_clip_fns[i]);
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(rb_clip_areas[mainw->active_sa_clips]), TRUE);
+  for (i=0; i<n_screen_areas; i++) lives_signal_handler_unblock(rb_clip_areas[i],rb_clip_fns[i]);
   ce_thumbs_highlight_current_clip();
 }
 
@@ -669,7 +691,7 @@
 void ce_thumbs_set_fx_area(int area) {
   //register int i;
   //for (i=0;i<n_screen_areas;i++) lives_signal_handler_block(rb_fx_areas[i],rb_fx_fns[i]);
-  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (rb_fx_areas[area]), TRUE);
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(rb_fx_areas[area]), TRUE);
   //for (i=0;i<n_screen_areas;i++) lives_signal_handler_unblock(rb_fx_areas[i],rb_fx_fns[i]);
   mainw->active_sa_fx=area;
 }
@@ -686,24 +708,24 @@
   int clipno;
   register int i;
 
-  for (i=0;i<n_clip_boxes;i++) {
+  for (i=0; i<n_clip_boxes; i++) {
     if (clip_boxes[i]==NULL) break;
     if (!match) {
-      clipno=LIVES_POINTER_TO_INT(g_object_get_data(G_OBJECT(clip_boxes[i]),"clipno"));
+      clipno=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(clip_boxes[i]),"clipno"));
       switch (mainw->active_sa_clips) {
       case SCREEN_AREA_FOREGROUND:
-	if (clipno==mainw->current_file) match=TRUE;
-	break;
+        if (clipno==mainw->current_file) match=TRUE;
+        break;
       case SCREEN_AREA_BACKGROUND:
-	if (clipno==mainw->blend_file) match=TRUE;
-	if (mainw->blend_file==-1&&clipno==mainw->current_file) match=TRUE;
-	break;
+        if (clipno==mainw->blend_file) match=TRUE;
+        if (mainw->blend_file==-1&&clipno==mainw->current_file) match=TRUE;
+        break;
       default:
-	break;
+        break;
       }
       if (match) {
-	lives_widget_set_state(clip_boxes[i],LIVES_WIDGET_STATE_PRELIGHT);
-	continue;
+        lives_widget_set_state(clip_boxes[i],LIVES_WIDGET_STATE_PRELIGHT);
+        continue;
       }
     }
     lives_widget_set_state(clip_boxes[i],LIVES_WIDGET_STATE_NORMAL);

LiVES-2.2.8.tar.bz2/src/ce_thumbs.h -> LiVES-2.4.1.tar.bz2/src/ce_thumbs.h Changed

LiVES-2.2.8.tar.bz2/src/colourspace.c -> LiVES-2.4.1.tar.bz2/src/colourspace.c Changed

@@ -32,9 +32,6 @@
 
 #include <math.h>
 
-#include "support.h"
-#include "main.h"
-
 #ifdef USE_SWSCALE
 
 #include <libswscale/swscale.h>
@@ -68,6 +65,8 @@
 
 #endif // USE_SWSCALE
 
+#include "main.h"
+
 #include "cvirtual.h"
 
 #ifdef USE_SWSCALE
@@ -97,30 +96,28 @@
 
 static boolean unal_inited=FALSE;
 
-LIVES_INLINE G_GNUC_CONST int get_rowstride_value (int rowstride) {
+LIVES_INLINE G_GNUC_CONST int get_rowstride_value(int rowstride) {
   // from gdk-pixbuf.c
   /* Always align rows to 32-bit boundaries */
   return (rowstride + 3) & ~3;
 }
 
 
-LIVES_INLINE G_GNUC_CONST int get_last_rowstride_value (int width, int nchans) {
+LIVES_INLINE G_GNUC_CONST int get_last_rowstride_value(int width, int nchans) {
 #ifdef GUI_GTK
   // from gdk pixbuf docs
   return width*(((nchans<<3)+7)>>3);
 #else
-  return get_rowstride_value();
+  return width * nchans;
 #endif
+
 }
 
-static void
-lives_free_buffer (uint8_t *pixels, gpointer data)
-{
-  g_free (pixels);
+static void lives_free_buffer(uint8_t *pixels, livespointer data) {
+  lives_free(pixels);
 }
 
-LIVES_INLINE G_GNUC_CONST uint8_t CLAMP0255(int32_t a)
-{
+LIVES_INLINE G_GNUC_CONST uint8_t CLAMP0255(int32_t a) {
   return a>255?255:(a<0)?0:a;
 }
 
@@ -282,7 +279,7 @@
   register int i;
   double inv_gamma = (1./gamma);
   gamma_lut[0] = 0;
-  for (i=1; i<256; ++i) gamma_lut[i] = CLAMP0255( myround(255.0 * pow( (double)i / 255.0, inv_gamma ) ) );
+  for (i=1; i<256; ++i) gamma_lut[i] = CLAMP0255(myround(255.0 * pow((double)i / 255.0, inv_gamma)));
   current_gamma=gamma;
 }
 
@@ -305,52 +302,52 @@
 
 
   for (i = 0; i < 256; i++) {
-    Y_Rc[i] = myround(0.299 * (double)i 
-		      * 219./255. * (1<<FP_BITS));   // Kr 
-    Y_Gc[i] = myround(0.587 * (double)i 
-		      * 219./255. * (1<<FP_BITS));   // Kb
-    Y_Bc[i] = myround((0.114 * (double)i 
-		       // here we add the 16 which goes into all components
-		       * 219./255. + 16.) * (1<<FP_BITS));
-
-    Cb_Bc[i] = myround(-0.168736 * (double)i 
-		       * 224./255. * (1<<FP_BITS));
-    Cb_Gc[i] = myround(-0.331264 * (double)i 
-		       * 224./255. * (1<<FP_BITS));
-    Cb_Rc[i] = myround((0.500 * (double)i 
-			* 224./255. + 128.) * (1<<FP_BITS));
-    
-    Cr_Bc[i] = myround(0.500 * (double)i 
-		       * 224./255. * (1<<FP_BITS));
-    Cr_Gc[i] = myround(-0.418688 * (double)i 
-		       * 224./255. * (1<<FP_BITS));
-    Cr_Rc[i] = myround((-0.081312 * (double)i 
-			* 224./255. + 128.) * (1<<FP_BITS));
+    Y_Rc[i] = myround(0.299 * (double)i
+                      * 219./255. * (1<<FP_BITS));   // Kr
+    Y_Gc[i] = myround(0.587 * (double)i
+                      * 219./255. * (1<<FP_BITS));   // Kb
+    Y_Bc[i] = myround((0.114 * (double)i
+                       // here we add the 16 which goes into all components
+                       * 219./255. + 16.) * (1<<FP_BITS));
+
+    Cb_Bc[i] = myround(-0.168736 * (double)i
+                       * 224./255. * (1<<FP_BITS));
+    Cb_Gc[i] = myround(-0.331264 * (double)i
+                       * 224./255. * (1<<FP_BITS));
+    Cb_Rc[i] = myround((0.500 * (double)i
+                        * 224./255. + 128.) * (1<<FP_BITS));
+
+    Cr_Bc[i] = myround(0.500 * (double)i
+                       * 224./255. * (1<<FP_BITS));
+    Cr_Gc[i] = myround(-0.418688 * (double)i
+                       * 224./255. * (1<<FP_BITS));
+    Cr_Rc[i] = myround((-0.081312 * (double)i
+                        * 224./255. + 128.) * (1<<FP_BITS));
   }
 
 
   for (i = 0; i < 256; i++) {
     Y_Ru[i] = myround(0.299 * (double)i
-		      * (1<<FP_BITS));
-    Y_Gu[i] = myround(0.587 * (double)i 
-		      * (1<<FP_BITS));
-    Y_Bu[i] = myround(0.114 * (double)i 
+                      * (1<<FP_BITS));
+    Y_Gu[i] = myround(0.587 * (double)i
+                      * (1<<FP_BITS));
+    Y_Bu[i] = myround(0.114 * (double)i
                       * (1<<FP_BITS));
 
-    
-    Cb_Bu[i] = myround(-0.168736 * (double)i 
-		       * (1<<FP_BITS));
-    Cb_Gu[i] = myround(-0.331264 * (double)i 
-		       * (1<<FP_BITS));
+
+    Cb_Bu[i] = myround(-0.168736 * (double)i
+                       * (1<<FP_BITS));
+    Cb_Gu[i] = myround(-0.331264 * (double)i
+                       * (1<<FP_BITS));
     Cb_Ru[i] = myround((0.500 * (double)i
-			+ 128.) * (1<<FP_BITS));
+                        + 128.) * (1<<FP_BITS));
 
     Cr_Bu[i] = myround(0.500 * (double)i
-		       * (1<<FP_BITS));
-    Cr_Gu[i] = myround(-0.418688 * (double)i 
-		       * (1<<FP_BITS));
-    Cr_Ru[i] = myround((-0.081312 * (double)i 
-			+ 128.) * (1<<FP_BITS));
+                       * (1<<FP_BITS));
+    Cr_Gu[i] = myround(-0.418688 * (double)i
+                       * (1<<FP_BITS));
+    Cr_Ru[i] = myround((-0.081312 * (double)i
+                        + 128.) * (1<<FP_BITS));
   }
 
 
@@ -365,51 +362,51 @@
 
 
   for (i = 0; i < 256; i++) {
-    HY_Rc[i] = myround(0.183 * (double)i 
-		       * (1<<FP_BITS));   // Kr 
-    HY_Gc[i] = myround(0.614 * (double)i 
-		       * (1<<FP_BITS));   // Kb
-    HY_Bc[i] = myround((0.062 * (double)i 
-			// here we add the 16 which goes into all components
-		        + 16.) * (1<<FP_BITS));
-
-    HCb_Bc[i] = myround(-0.101 * (double)i 
-		        * (1<<FP_BITS));
-    HCb_Gc[i] = myround(-0.339 * (double)i 
-			* (1<<FP_BITS));
-    HCb_Rc[i] = myround((0.439 * (double)i 
-			 + 128.) * (1<<FP_BITS));
-    
-    HCr_Bc[i] = myround(0.439 * (double)i 
-			* (1<<FP_BITS));
-    HCr_Gc[i] = myround(-0.399 * (double)i 
-			* (1<<FP_BITS));
-    HCr_Rc[i] = myround((-0.040 * (double)i 
-			 + 128.) * (1<<FP_BITS));
+    HY_Rc[i] = myround(0.183 * (double)i
+                       * (1<<FP_BITS));   // Kr
+    HY_Gc[i] = myround(0.614 * (double)i
+                       * (1<<FP_BITS));   // Kb
+    HY_Bc[i] = myround((0.062 * (double)i
+                        // here we add the 16 which goes into all components
+                        + 16.) * (1<<FP_BITS));
+
+    HCb_Bc[i] = myround(-0.101 * (double)i
+                        * (1<<FP_BITS));
+    HCb_Gc[i] = myround(-0.339 * (double)i
+                        * (1<<FP_BITS));
+    HCb_Rc[i] = myround((0.439 * (double)i
+                         + 128.) * (1<<FP_BITS));
+
+    HCr_Bc[i] = myround(0.439 * (double)i
+                        * (1<<FP_BITS));
+    HCr_Gc[i] = myround(-0.399 * (double)i
+                        * (1<<FP_BITS));
+    HCr_Rc[i] = myround((-0.040 * (double)i
+                         + 128.) * (1<<FP_BITS));
   }
 
 
   for (i = 0; i < 256; i++) {
-    HY_Ru[i] = myround(0.213 * (double)i 
-		       * (1<<FP_BITS));   // Kr 
-    HY_Gu[i] = myround(0.715 * (double)i 
-		       * (1<<FP_BITS));   // Kb
-    HY_Bu[i] = myround(0.0722 * (double)i 
-		       * (1<<FP_BITS));
-
-    HCb_Bu[i] = myround(-0.115 * (double)i 
-		        * (1<<FP_BITS));
-    HCb_Gu[i] = myround(-0.4542 * (double)i 
-			* (1<<FP_BITS));
-    HCb_Ru[i] = myround((0.5 * (double)i 
-			 + 128.) * (1<<FP_BITS));
-    
-    HCr_Bu[i] = myround(0.5 * (double)i 
-			* (1<<FP_BITS));
-    HCr_Gu[i] = myround(-0.4542 * (double)i 
-			* (1<<FP_BITS));
-    HCr_Ru[i] = myround((-0.4554 * (double)i 
-			 + 128.) * (1<<FP_BITS));
+    HY_Ru[i] = myround(0.213 * (double)i
+                       * (1<<FP_BITS));   // Kr
+    HY_Gu[i] = myround(0.715 * (double)i
+                       * (1<<FP_BITS));   // Kb
+    HY_Bu[i] = myround(0.0722 * (double)i
+                       * (1<<FP_BITS));
+
+    HCb_Bu[i] = myround(-0.115 * (double)i
+                        * (1<<FP_BITS));
+    HCb_Gu[i] = myround(-0.4542 * (double)i
+                        * (1<<FP_BITS));
+    HCb_Ru[i] = myround((0.5 * (double)i
+                         + 128.) * (1<<FP_BITS));
+
+    HCr_Bu[i] = myround(0.5 * (double)i
+                        * (1<<FP_BITS));
+    HCr_Gu[i] = myround(-0.4542 * (double)i
+                        * (1<<FP_BITS));
+    HCr_Ru[i] = myround((-0.4554 * (double)i
+                         + 128.) * (1<<FP_BITS));
 
   }
 
@@ -435,8 +432,8 @@
   for (i = 235; i < 256; i++) {
     RGB_Yc[i] = myround(235./219.*255. * (1<<FP_BITS));
   }
-  
-  /* clip Cb/Cr values below 16 */	 
+
+  /* clip Cb/Cr values below 16 */
   for (i = 0; i < 17; i++) {
     R_Crc[i] = 0;
     G_Crc[i] = 0;
@@ -449,7 +446,7 @@
     G_Cbc[i] = myround(-0.344136 * ((((double)i-16.)/224.*255.)-128.) * (1<<FP_BITS));
     B_Cbc[i] = myround(1.772 * ((((double)i-16.)/224.*255.)-128.) * (1<<FP_BITS)); // 2*(1-Kb)
   }
-  /* clip Cb/Cr values above 240 */	 
+  /* clip Cb/Cr values above 240 */
   for (i = 240; i < 256; i++) {
     R_Crc[i] = myround(1.402 * 127. * (1<<FP_BITS)); // 2*(1-Kr)
     G_Crc[i] = myround(-0.714136 * 127.  * (1<<FP_BITS));
@@ -466,7 +463,7 @@
 
   for (i = 0; i <= 255; i++) {
     R_Cru[i] = myround(1.402 * ((double)(i)-128.)) * (1<<FP_BITS); // 2*(1-Kr)
-    G_Cru[i] = myround(-0.714136 * ((double)(i)-128.)) * (1<<FP_BITS); // 
+    G_Cru[i] = myround(-0.714136 * ((double)(i)-128.)) * (1<<FP_BITS); //
     G_Cbu[i] = myround(-0.344136 * ((double)(i)-128.)) * (1<<FP_BITS);
     B_Cbu[i] = myround(1.772 * ((double)(i)-128.)) * (1<<FP_BITS); // 2*(1-Kb)
   }
@@ -488,8 +485,8 @@
   for (i = 235; i < 256; i++) {
     HRGB_Yc[i] = myround(235. * 1.164 * (1<<FP_BITS));
   }
-  
-  /* clip Cb/Cr values below 16 */	 
+
+  /* clip Cb/Cr values below 16 */
   for (i = 0; i < 17; i++) {
     HR_Crc[i] = 0;
     HG_Crc[i] = 0;
@@ -502,7 +499,7 @@
     HG_Cbc[i] = myround(-0.213 * (((double)i-16.)-128.) * (1<<FP_BITS));
     HB_Cbc[i] = myround(2.112 * (((double)i-16.)-128.) * (1<<FP_BITS)); // 2*(1-Kb)
   }
-  /* clip Cb/Cr values above 240 */	 
+  /* clip Cb/Cr values above 240 */
   for (i = 240; i < 256; i++) {
     HR_Crc[i] = myround(1.793 * 127. * (1<<FP_BITS)); // 2*(1-Kr)
     HG_Crc[i] = myround(-0.533 * 127.  * (1<<FP_BITS));
@@ -519,7 +516,7 @@
 
   for (i = 0; i <= 255; i++) {
     HR_Cru[i] = myround(1.57503 * ((double)(i)-128.)) * (1<<FP_BITS); // 2*(1-Kr)
-    HG_Cru[i] = myround(-0.468204 * ((double)(i)-128.)) * (1<<FP_BITS); // 
+    HG_Cru[i] = myround(-0.468204 * ((double)(i)-128.)) * (1<<FP_BITS); //
     HG_Cbu[i] = myround(-0.186375 * ((double)(i)-128.)) * (1<<FP_BITS);
     HB_Cbu[i] = myround(1.85524 * ((double)(i)-128.)) * (1<<FP_BITS); // 2*(1-Kb)
   }
@@ -529,32 +526,32 @@
 
 
 
-static void init_YUV_to_YUV_tables (void) {
+static void init_YUV_to_YUV_tables(void) {
   register int i;
 
   // init clamped -> unclamped, same subspace
-  for (i=0;i<17;i++) {
+  for (i=0; i<17; i++) {
     Yclamped_to_Yunclamped[i]=0;
   }
-  for (i=17;i<235;i++) {
+  for (i=17; i<235; i++) {
     Yclamped_to_Yunclamped[i]=myround((i-16.)*255./219.);
   }
-  for (i=235;i<256;i++) {
+  for (i=235; i<256; i++) {
     Yclamped_to_Yunclamped[i]=255;
   }
 
-  for (i=0;i<17;i++) {
+  for (i=0; i<17; i++) {
     UVclamped_to_UVunclamped[i]=0;
   }
-  for (i=17;i<240;i++) {
+  for (i=17; i<240; i++) {
     UVclamped_to_UVunclamped[i]=myround((i-16.)*255./224.);
   }
-  for (i=240;i<256;i++) {
+  for (i=240; i<256; i++) {
     UVclamped_to_UVunclamped[i]=255;
   }
 
 
-  for (i=0;i<256;i++) {
+  for (i=0; i<256; i++) {
     Yunclamped_to_Yclamped[i]=myround((i/255.)*219.+16.);
     UVunclamped_to_UVclamped[i]=myround((i/255.)*224.+16.);
   }
@@ -566,8 +563,8 @@
 static void init_average(void) {
   short a,b,c;
   int x,y;
-  for (x=0;x<256;x++) {
-    for (y=0;y<256;y++) {
+  for (x=0; x<256; x++) {
+    for (y=0; y<256; y++) {
       a=(short)(x-128);
       b=(short)(y-128);
       if ((c=(a+b-((a*b)>>8)+128))>240) c=240;
@@ -586,12 +583,12 @@
   // premult to postmult and vice-versa
 
   register int i,j;
-  
-  for (i=0;i<256;i++) { //alpha val
-    for (j=0;j<256;j++) { // val to be converted
+
+  for (i=0; i<256; i++) { //alpha val
+    for (j=0; j<256; j++) { // val to be converted
       unal[i][j]=(float)j*255./(float)i;
       al[i][j]=(float)j*(float)i/255.;
-      
+
       // clamped versions
       unalcy[i][j]=((j-16.)*255./219.)*255./(float)i;
       alcy[i][j]=((j-16.)*255./219.)*(float)i/255.;
@@ -619,37 +616,36 @@
       Y_R=Y_Rc;
       Y_G=Y_Gc;
       Y_B=Y_Bc;
-      
+
       Cb_R=Cb_Rc;
       Cb_G=Cb_Gc;
       Cb_B=Cb_Bc;
-      
+
       Cr_R=Cr_Rc;
       Cr_G=Cr_Gc;
       Cr_B=Cr_Bc;
-      
+
       RGB_Y=RGB_Yc;
-      
+
       R_Cr=R_Crc;
       G_Cr=G_Crc;
       G_Cb=G_Cbc;
       B_Cb=B_Cbc;
-    }
-    else {
+    } else {
       Y_R=Y_Ru;
       Y_G=Y_Gu;
       Y_B=Y_Bu;
-      
+
       Cb_R=Cb_Ru;
       Cb_G=Cb_Gu;
       Cb_B=Cb_Bu;
-      
+
       Cr_R=Cr_Ru;
       Cr_G=Cr_Gu;
       Cr_B=Cr_Bu;
-      
+
       RGB_Y=RGB_Yu;
-      
+
       R_Cr=R_Cru;
       G_Cr=G_Cru;
       G_Cb=G_Cbu;
@@ -661,55 +657,53 @@
       Y_R=HY_Rc;
       Y_G=HY_Gc;
       Y_B=HY_Bc;
-      
+
       Cb_R=HCb_Rc;
       Cb_G=HCb_Gc;
       Cb_B=HCb_Bc;
-      
+
       Cr_R=HCr_Rc;
       Cr_G=HCr_Gc;
       Cr_B=HCr_Bc;
-      
+
       RGB_Y=HRGB_Yc;
-      
+
       R_Cr=HR_Crc;
       G_Cr=HG_Crc;
       G_Cb=HG_Cbc;
       B_Cb=HB_Cbc;
-    }
-    else {
+    } else {
       Y_R=HY_Ru;
       Y_G=HY_Gu;
       Y_B=HY_Bu;
-      
+
       Cb_R=HCb_Ru;
       Cb_G=HCb_Gu;
       Cb_B=HCb_Bu;
-      
+
       Cr_R=HCr_Ru;
       Cr_G=HCr_Gu;
       Cr_B=HCr_Bu;
-      
+
       RGB_Y=HRGB_Yu;
-      
+
       R_Cr=HR_Cru;
       G_Cr=HG_Cru;
       G_Cb=HG_Cbu;
       B_Cb=HB_Cbu;
     }
- 
+
     break;
   }
 
   if (!avg_inited) init_average();
-  
+
   if (clamping==WEED_YUV_CLAMPING_CLAMPED) {
     min_Y=min_UV=16;
     max_Y=235;
     max_UV=240;
     cavg=(uint8_t *)cavgc;
-  }
-  else {
+  } else {
     min_Y=min_UV=0;
     max_Y=max_UV=255;
     cavg=(uint8_t *)cavgu;
@@ -731,14 +725,13 @@
     case WEED_YUV_SUBSPACE_YCBCR:
     case WEED_YUV_SUBSPACE_YUV:
       if (iclamping==WEED_YUV_CLAMPING_CLAMPED) {
-	//Y'CbCr clamped -> Y'CbCr unclamped
-	Y_to_Y=Yclamped_to_Yunclamped;
-	U_to_U=V_to_V=UVclamped_to_UVunclamped;
-      }
-      else {
-	//Y'CbCr unclamped -> Y'CbCr clamped
-	Y_to_Y=Yunclamped_to_Yclamped;
-	U_to_U=V_to_V=UVunclamped_to_UVclamped;
+        //Y'CbCr clamped -> Y'CbCr unclamped
+        Y_to_Y=Yclamped_to_Yunclamped;
+        U_to_U=V_to_V=UVclamped_to_UVunclamped;
+      } else {
+        //Y'CbCr unclamped -> Y'CbCr clamped
+        Y_to_Y=Yunclamped_to_Yclamped;
+        U_to_U=V_to_V=UVunclamped_to_UVclamped;
       }
       break;
       // TODO - other subspaces
@@ -751,14 +744,13 @@
     case WEED_YUV_SUBSPACE_BT709:
     case WEED_YUV_SUBSPACE_YUV:
       if (iclamping==WEED_YUV_CLAMPING_CLAMPED) {
-	//BT.709 clamped -> BT.709 unclamped
-	Y_to_Y=Yclamped_to_Yunclamped;
-	U_to_U=V_to_V=UVclamped_to_UVunclamped;
-      }
-      else {
-	//BT.709 unclamped -> BT.709 clamped
-	Y_to_Y=Yunclamped_to_Yclamped;
-	U_to_U=V_to_V=UVunclamped_to_UVclamped;
+        //BT.709 clamped -> BT.709 unclamped
+        Y_to_Y=Yclamped_to_Yunclamped;
+        U_to_U=V_to_V=UVclamped_to_UVunclamped;
+      } else {
+        //BT.709 unclamped -> BT.709 clamped
+        Y_to_Y=Yunclamped_to_Yclamped;
+        U_to_U=V_to_V=UVunclamped_to_UVclamped;
       }
       break;
       // TODO - other subspaces
@@ -776,13 +768,13 @@
 //////////////////////////
 // pixel conversions
 
-static LIVES_INLINE uint8_t avg_chroma (size_t x, size_t y) {
+static LIVES_INLINE uint8_t avg_chroma(size_t x, size_t y) {
   // cavg == cavgc for clamped, cavgu for unclamped
   return *(cavg+(x<<8)+y);
 }
 
 
-static LIVES_INLINE void rgb2yuv (uint8_t r0, uint8_t g0, uint8_t b0, uint8_t *y, uint8_t *u, uint8_t *v) {
+static LIVES_INLINE void rgb2yuv(uint8_t r0, uint8_t g0, uint8_t b0, uint8_t *y, uint8_t *u, uint8_t *v) {
   register short a;
   if ((a=((Y_R[r0]+Y_G[g0]+Y_B[b0])>>FP_BITS))>max_Y) a=max_Y;
   *y=a<min_Y?min_Y:a;
@@ -792,7 +784,7 @@
   *v=a<min_UV?min_UV:a;
 }
 
-static LIVES_INLINE void rgb2uyvy (uint8_t r0, uint8_t g0, uint8_t b0, uint8_t r1, uint8_t g1, uint8_t b1, uyvy_macropixel *uyvy) {
+static LIVES_INLINE void rgb2uyvy(uint8_t r0, uint8_t g0, uint8_t b0, uint8_t r1, uint8_t g1, uint8_t b1, uyvy_macropixel *uyvy) {
   register short a;
   if ((a=((Y_R[r0]+Y_G[g0]+Y_B[b0])>>FP_BITS))>max_Y) a=max_Y;
   uyvy->y0=a<min_Y?min_Y:a;
@@ -800,14 +792,14 @@
   uyvy->y1=a<min_Y?min_Y:a;
 
   uyvy->u0=avg_chroma((Cr_R[r0]+Cr_G[g0]+Cr_B[b0])>>FP_BITS,
-		      (Cr_R[r1]+Cr_G[g1]+Cr_B[b1])>>FP_BITS);
+                      (Cr_R[r1]+Cr_G[g1]+Cr_B[b1])>>FP_BITS);
 
   uyvy->v0=avg_chroma((Cb_R[r0]+Cb_G[g0]+Cb_B[b0])>>FP_BITS,
-		      (Cb_R[r1]+Cb_G[g1]+Cb_B[b1])>>FP_BITS);
+                      (Cb_R[r1]+Cb_G[g1]+Cb_B[b1])>>FP_BITS);
 
 }
 
-static LIVES_INLINE void rgb2yuyv (uint8_t r0, uint8_t g0, uint8_t b0, uint8_t r1, uint8_t g1, uint8_t b1, yuyv_macropixel *yuyv) {
+static LIVES_INLINE void rgb2yuyv(uint8_t r0, uint8_t g0, uint8_t b0, uint8_t r1, uint8_t g1, uint8_t b1, yuyv_macropixel *yuyv) {
   register short a;
   if ((a=((Y_R[r0]+Y_G[g0]+Y_B[b0])>>FP_BITS))>max_Y) a=max_Y;
   yuyv->y0=a<min_Y?min_Y:a;
@@ -815,16 +807,16 @@
   yuyv->y1=a<min_Y?min_Y:a;
 
   yuyv->u0=avg_chroma((Cr_R[r0]+Cr_G[g0]+Cr_B[b0])>>FP_BITS,
-		      (Cr_R[r1]+Cr_G[g1]+Cr_B[b1])>>FP_BITS);
+                      (Cr_R[r1]+Cr_G[g1]+Cr_B[b1])>>FP_BITS);
 
   yuyv->v0=avg_chroma((Cb_R[r0]+Cb_G[g0]+Cb_B[b0])>>FP_BITS,
-		      (Cb_R[r1]+Cb_G[g1]+Cb_B[b1])>>FP_BITS);
+                      (Cb_R[r1]+Cb_G[g1]+Cb_B[b1])>>FP_BITS);
 
 
 }
 
-static LIVES_INLINE void rgb2_411 (uint8_t r0, uint8_t g0, uint8_t b0, uint8_t r1, uint8_t g1, uint8_t b1, 
-			     uint8_t r2, uint8_t g2, uint8_t b2, uint8_t r3, uint8_t g3, uint8_t b3, yuv411_macropixel *yuv) {
+static LIVES_INLINE void rgb2_411(uint8_t r0, uint8_t g0, uint8_t b0, uint8_t r1, uint8_t g1, uint8_t b1,
+                                  uint8_t r2, uint8_t g2, uint8_t b2, uint8_t r3, uint8_t g3, uint8_t b3, yuv411_macropixel *yuv) {
   register int a;
   if ((a=((Y_R[r0]+Y_G[g0]+Y_B[b0])>>FP_BITS))>max_Y) a=max_Y;
   yuv->y0=a<min_Y?min_Y:a;
@@ -836,75 +828,75 @@
   yuv->y3=a<min_Y?min_Y:a;
 
   if ((a=((((Cb_R[r0]+Cb_G[g0]+Cb_B[b0])>>FP_BITS)+((Cb_R[r1]+Cb_G[g1]+Cb_B[b1])>>FP_BITS)+
-	   ((Cb_R[r2]+Cb_G[g2]+Cb_B[b2])>>FP_BITS)+((Cb_R[r3]+Cb_G[g3]+Cb_B[b3])>>FP_BITS))>>2))>max_UV) a=max_UV;
+           ((Cb_R[r2]+Cb_G[g2]+Cb_B[b2])>>FP_BITS)+((Cb_R[r3]+Cb_G[g3]+Cb_B[b3])>>FP_BITS))>>2))>max_UV) a=max_UV;
   yuv->v2=a<min_UV?min_UV:a;
   if ((a=((((Cr_R[r0]+Cr_G[g0]+Cr_B[b0])>>FP_BITS)+((Cr_R[r1]+Cr_G[g1]+Cr_B[b1])>>FP_BITS)+
-	   ((Cr_R[r2]+Cr_G[g2]+Cr_B[b2])>>FP_BITS)+((Cr_R[r3]+Cr_G[g3]+Cr_B[b3])>>FP_BITS))>>2))>max_UV) a=max_UV;
+           ((Cr_R[r2]+Cr_G[g2]+Cr_B[b2])>>FP_BITS)+((Cr_R[r3]+Cr_G[g3]+Cr_B[b3])>>FP_BITS))>>2))>max_UV) a=max_UV;
   yuv->u2=a<min_UV?min_UV:a;
 }
 
-static LIVES_INLINE void yuv2rgb (uint8_t y, uint8_t u, uint8_t v, uint8_t *r, uint8_t *g, uint8_t *b) {
+static LIVES_INLINE void yuv2rgb(uint8_t y, uint8_t u, uint8_t v, uint8_t *r, uint8_t *g, uint8_t *b) {
   *r = CLAMP0255((RGB_Y[y] + R_Cr[v]) >> FP_BITS);
   *g = CLAMP0255((RGB_Y[y] + G_Cb[u]+ G_Cr[v]) >> FP_BITS);
   *b = CLAMP0255((RGB_Y[y] + B_Cb[u]) >> FP_BITS);
 }
 
-static LIVES_INLINE void uyvy2rgb (uyvy_macropixel *uyvy, uint8_t *r0, uint8_t *g0, uint8_t *b0, 
-			     uint8_t *r1, uint8_t *g1, uint8_t *b1) {
+static LIVES_INLINE void uyvy2rgb(uyvy_macropixel *uyvy, uint8_t *r0, uint8_t *g0, uint8_t *b0,
+                                  uint8_t *r1, uint8_t *g1, uint8_t *b1) {
   yuv2rgb(uyvy->y0,uyvy->u0,uyvy->v0,r0,g0,b0);
   yuv2rgb(uyvy->y1,uyvy->u0,uyvy->v0,r1,g1,b1);
-  //if (uyvy->y0>240||uyvy->u0>240||uyvy->v0>240||uyvy->y1>240) g_printerr("got unclamped !\n");
+  //if (uyvy->y0>240||uyvy->u0>240||uyvy->v0>240||uyvy->y1>240) lives_printerr("got unclamped !\n");
 }
 
 
-static LIVES_INLINE void yuyv2rgb (yuyv_macropixel *yuyv, uint8_t *r0, uint8_t *g0, uint8_t *b0, 
-			     uint8_t *r1, uint8_t *g1, uint8_t *b1) {
+static LIVES_INLINE void yuyv2rgb(yuyv_macropixel *yuyv, uint8_t *r0, uint8_t *g0, uint8_t *b0,
+                                  uint8_t *r1, uint8_t *g1, uint8_t *b1) {
   yuv2rgb(yuyv->y0,yuyv->u0,yuyv->v0,r0,g0,b0);
   yuv2rgb(yuyv->y1,yuyv->u0,yuyv->v0,r1,g1,b1);
 }
 
 
-static LIVES_INLINE void yuv888_2_rgb (uint8_t *yuv, uint8_t *rgb, boolean add_alpha) {
+static LIVES_INLINE void yuv888_2_rgb(uint8_t *yuv, uint8_t *rgb, boolean add_alpha) {
   yuv2rgb(yuv[0],yuv[1],yuv[2],&(rgb[0]),&(rgb[1]),&(rgb[2]));
   if (add_alpha) rgb[3]=255;
 }
 
 
-static LIVES_INLINE void yuva8888_2_rgba (uint8_t *yuva, uint8_t *rgba, boolean del_alpha) {
+static LIVES_INLINE void yuva8888_2_rgba(uint8_t *yuva, uint8_t *rgba, boolean del_alpha) {
   yuv2rgb(yuva[0],yuva[1],yuva[2],&(rgba[0]),&(rgba[1]),&(rgba[2]));
   if (!del_alpha) rgba[3]=yuva[3];
 }
 
-static LIVES_INLINE void yuv888_2_bgr (uint8_t *yuv, uint8_t *bgr, boolean add_alpha) {
+static LIVES_INLINE void yuv888_2_bgr(uint8_t *yuv, uint8_t *bgr, boolean add_alpha) {
   yuv2rgb(yuv[0],yuv[1],yuv[2],&(bgr[2]),&(bgr[1]),&(bgr[0]));
   if (add_alpha) bgr[3]=255;
 }
 
 
-static LIVES_INLINE void yuva8888_2_bgra (uint8_t *yuva, uint8_t *bgra, boolean del_alpha) {
+static LIVES_INLINE void yuva8888_2_bgra(uint8_t *yuva, uint8_t *bgra, boolean del_alpha) {
   yuv2rgb(yuva[0],yuva[1],yuva[2],&(bgra[2]),&(bgra[1]),&(bgra[0]));
   if (!del_alpha) bgra[3]=yuva[3];
 }
 
-static LIVES_INLINE void yuv888_2_argb (uint8_t *yuv, uint8_t *argb) {
+static LIVES_INLINE void yuv888_2_argb(uint8_t *yuv, uint8_t *argb) {
   argb[0]=255;
   yuv2rgb(yuv[0],yuv[1],yuv[2],&(argb[1]),&(argb[2]),&(argb[3]));
 }
 
 
-static LIVES_INLINE void yuva8888_2_argb (uint8_t *yuva, uint8_t *argb) {
+static LIVES_INLINE void yuva8888_2_argb(uint8_t *yuva, uint8_t *argb) {
   argb[0]=yuva[3];
   yuv2rgb(yuva[0],yuva[1],yuva[2],&(argb[1]),&(argb[2]),&(argb[3]));
 }
 
-static LIVES_INLINE void uyvy_2_yuv422 (uyvy_macropixel *uyvy, uint8_t *y0, uint8_t *u0, uint8_t *v0, uint8_t *y1) {
+static LIVES_INLINE void uyvy_2_yuv422(uyvy_macropixel *uyvy, uint8_t *y0, uint8_t *u0, uint8_t *v0, uint8_t *y1) {
   *u0=uyvy->u0;
   *y0=uyvy->y0;
   *v0=uyvy->v0;
   *y1=uyvy->y1;
 }
 
-static LIVES_INLINE void yuyv_2_yuv422 (yuyv_macropixel *yuyv, uint8_t *y0, uint8_t *u0, uint8_t *v0, uint8_t *y1) {
+static LIVES_INLINE void yuyv_2_yuv422(yuyv_macropixel *yuyv, uint8_t *y0, uint8_t *u0, uint8_t *v0, uint8_t *y1) {
   *y0=yuyv->y0;
   *u0=yuyv->u0;
   *y1=yuyv->y1;
@@ -948,7 +940,7 @@
       pal==WEED_PALETTE_YUV422P||pal==WEED_PALETTE_YUV444P||pal==WEED_PALETTE_YUVA4444P) return 8;
   if (pal==WEED_PALETTE_RGB24||pal==WEED_PALETTE_BGR24) return 24;
   if (pal==WEED_PALETTE_RGBA32||pal==WEED_PALETTE_BGRA32||pal==WEED_PALETTE_ARGB32||
-      pal==WEED_PALETTE_UYVY8888||pal==WEED_PALETTE_YUYV8888||pal==WEED_PALETTE_YUV888||pal==WEED_PALETTE_YUVA8888) 
+      pal==WEED_PALETTE_UYVY8888||pal==WEED_PALETTE_YUYV8888||pal==WEED_PALETTE_YUV888||pal==WEED_PALETTE_YUVA8888)
     return 32;
   if (pal==WEED_PALETTE_YUV411) return 48;
   if (pal==WEED_PALETTE_AFLOAT) return sizeof(float);
@@ -971,12 +963,12 @@
 
 LIVES_INLINE boolean weed_palette_has_alpha_channel(int pal) {
   return (pal==WEED_PALETTE_RGBA32||pal==WEED_PALETTE_BGRA32||pal==WEED_PALETTE_ARGB32||
-	  pal==WEED_PALETTE_YUVA4444P||pal==WEED_PALETTE_YUVA8888||pal==WEED_PALETTE_RGBAFLOAT||
-	  weed_palette_is_alpha_palette(pal))?TRUE:FALSE;
+          pal==WEED_PALETTE_YUVA4444P||pal==WEED_PALETTE_YUVA8888||pal==WEED_PALETTE_RGBAFLOAT||
+          weed_palette_is_alpha_palette(pal))?TRUE:FALSE;
 }
 
 LIVES_INLINE double weed_palette_get_plane_ratio_horizontal(int pal, int plane) {
-  // return ratio of plane[n] width/plane[0] width; 
+  // return ratio of plane[n] width/plane[0] width;
   if (plane==0) return 1.0;
   if (plane==1||plane==2) {
     if (pal==WEED_PALETTE_YUV444P||pal==WEED_PALETTE_YUVA4444P) return 1.0;
@@ -1012,7 +1004,7 @@
 
   if (weed_palette_is_rgb_palette(p1)&&weed_palette_is_rgb_palette(p2)) return FALSE;
 
-  switch(p2) {
+  switch (p2) {
   case WEED_PALETTE_YUVA8888:
     if (p1!=WEED_PALETTE_YUVA8888&&p1!=WEED_PALETTE_YUVA4444P) return TRUE;
     break;
@@ -1020,11 +1012,11 @@
     if (p1!=WEED_PALETTE_YUVA8888&&p1!=WEED_PALETTE_YUVA4444P) return TRUE;
     break;
   case WEED_PALETTE_YUV888:
-    if (p1!=WEED_PALETTE_YUVA8888&&p1!=WEED_PALETTE_YUVA4444P&&p1!=WEED_PALETTE_YUV444P&&p1!=WEED_PALETTE_YUVA4444P) 
+    if (p1!=WEED_PALETTE_YUVA8888&&p1!=WEED_PALETTE_YUVA4444P&&p1!=WEED_PALETTE_YUV444P&&p1!=WEED_PALETTE_YUVA4444P)
       return TRUE;
     break;
   case WEED_PALETTE_YUV444P:
-    if (p1!=WEED_PALETTE_YUVA8888&&p1!=WEED_PALETTE_YUVA4444P&&p1!=WEED_PALETTE_YUV444P&&p1!=WEED_PALETTE_YUVA4444P) 
+    if (p1!=WEED_PALETTE_YUVA8888&&p1!=WEED_PALETTE_YUVA4444P&&p1!=WEED_PALETTE_YUV444P&&p1!=WEED_PALETTE_YUVA4444P)
       return TRUE;
     break;
 
@@ -1032,7 +1024,7 @@
   case WEED_PALETTE_UYVY8888:
   case WEED_PALETTE_YUYV8888:
     if (p1!=WEED_PALETTE_YUVA8888&&p1!=WEED_PALETTE_YUVA4444P&&p1!=WEED_PALETTE_YUV444P&&
-	p1!=WEED_PALETTE_YUVA4444P&&p1!=WEED_PALETTE_YUV422P&&p1!=WEED_PALETTE_UYVY8888&&p1!=WEED_PALETTE_YUYV8888) 
+        p1!=WEED_PALETTE_YUVA4444P&&p1!=WEED_PALETTE_YUV422P&&p1!=WEED_PALETTE_UYVY8888&&p1!=WEED_PALETTE_YUYV8888)
       return TRUE;
     break;
 
@@ -1111,14 +1103,14 @@
 }
 
 
-gchar *weed_palette_get_name_full(int pal, int clamped, int subspace) {
-  const gchar *pname=weed_palette_get_name(pal);
+char *weed_palette_get_name_full(int pal, int clamped, int subspace) {
+  const char *pname=weed_palette_get_name(pal);
 
-  if (!weed_palette_is_yuv_palette(pal)) return g_strdup(pname);
+  if (!weed_palette_is_yuv_palette(pal)) return lives_strdup(pname);
   else {
-    const gchar *clamp=weed_yuv_clamping_get_name(clamped);
-    const gchar *sspace=weed_yuv_subspace_get_name(subspace);
-    return g_strdup_printf("%s:%s (%s)",pname,sspace,clamp);
+    const char *clamp=weed_yuv_clamping_get_name(clamped);
+    const char *sspace=weed_yuv_subspace_get_name(subspace);
+    return lives_strdup_printf("%s:%s (%s)",pname,sspace,clamp);
   }
 }
 
@@ -1128,7 +1120,7 @@
 /////////////////////////////////////////////////////////
 // just as an example: 1.0 == RGB(A), 0.5 == compressed to 50%, etc
 
-double weed_palette_get_compression_ratio (int pal) {
+double weed_palette_get_compression_ratio(int pal) {
   double tbits=0.;
 
   int nplanes=weed_palette_get_numplanes(pal);
@@ -1138,7 +1130,7 @@
 
   if (!weed_palette_is_valid_palette(pal)) return 0.;
   if (weed_palette_is_alpha_palette(pal)) return 0.; // invalid for alpha palettes
-  for (i=0;i<nplanes;i++) {
+  for (i=0; i<nplanes; i++) {
     pbits=weed_palette_get_bits_per_macropixel(pal)/weed_palette_get_pixels_per_macropixel(pal);
     tbits+=pbits*weed_palette_get_plane_ratio_vertical(pal,i)*weed_palette_get_plane_ratio_horizontal(pal,i);
   }
@@ -1163,10 +1155,10 @@
 
   width*=psize;
 
-  for (j=0;j<height;j++) {
-    for (i=offs;i<width;i+=psize) {
+  for (j=0; j<height; j++) {
+    for (i=offs; i<width; i+=psize) {
       if (pdata[i]>BLACK_THRESH||pdata[i+1]>BLACK_THRESH||pdata[i+2]>BLACK_THRESH) {
-	return FALSE;
+        return FALSE;
       }
     }
     pdata+=rstride;
@@ -1174,7 +1166,7 @@
 
   return TRUE;
 }
-  
+
 
 void pixel_data_planar_from_membuf(void **pixel_data, void *data, size_t size, int palette) {
   // convert contiguous memory block planes to planar data
@@ -1211,55 +1203,55 @@
 ///////////////////////////////////////////////////////////
 // frame conversions
 
-static void convert_yuv888_to_rgb_frame(uint8_t *src, int hsize, int vsize, int irowstride, 
-					int orowstride, uint8_t *dest, boolean add_alpha, 
-					boolean clamped, int thread_id) {
+static void convert_yuv888_to_rgb_frame(uint8_t *src, int hsize, int vsize, int irowstride,
+                                        int orowstride, uint8_t *dest, boolean add_alpha,
+                                        boolean clamped, int thread_id) {
   register int x,y,i;
   size_t offs=3;
-  
-  if (G_UNLIKELY(!conv_YR_inited)) init_YUV_to_RGB_tables();
+
+  if (LIVES_UNLIKELY(!conv_YR_inited)) init_YUV_to_RGB_tables();
 
   if (thread_id==-1&&prefs->nfx_threads>1) {
     uint8_t *end=src+vsize*irowstride;
     int nthreads=0;
     int dheight;
     boolean useme=FALSE;
-    lives_cc_params *ccparams=(lives_cc_params *)g_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
+    lives_cc_params *ccparams=(lives_cc_params *)lives_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
 
     dheight=CEIL((double)vsize/(double)prefs->nfx_threads,4);
-    for (i=0;i<prefs->nfx_threads;i++) {
+    for (i=0; i<prefs->nfx_threads; i++) {
       if ((src+dheight*i*irowstride)<end) {
 
-	ccparams[i].src=src+dheight*i*irowstride;
-	ccparams[i].hsize=hsize;
-	ccparams[i].dest=dest+dheight*i*orowstride;
-
-	if (dheight*(i+1)>(vsize-4)) {
-	  dheight=vsize-(dheight*i);
-	  useme=TRUE;
-	}
-	if (dheight<4) break;
-
-	ccparams[i].vsize=dheight;
-
-	ccparams[i].irowstrides[0]=irowstride;
-	ccparams[i].orowstrides[0]=orowstride;
-	ccparams[i].out_alpha=add_alpha;
-	ccparams[i].in_clamped=clamped;
-	ccparams[i].thread_id=i;
-	
-	if (useme) convert_yuv888_to_rgb_frame_thread(&ccparams[i]);
-	else {
-	  pthread_create(&cthreads[i],NULL,convert_yuv888_to_rgb_frame_thread,&ccparams[i]);
-	  nthreads++;
-	}
+        ccparams[i].src=src+dheight*i*irowstride;
+        ccparams[i].hsize=hsize;
+        ccparams[i].dest=dest+dheight*i*orowstride;
+
+        if (dheight*(i+1)>(vsize-4)) {
+          dheight=vsize-(dheight*i);
+          useme=TRUE;
+        }
+        if (dheight<4) break;
+
+        ccparams[i].vsize=dheight;
+
+        ccparams[i].irowstrides[0]=irowstride;
+        ccparams[i].orowstrides[0]=orowstride;
+        ccparams[i].out_alpha=add_alpha;
+        ccparams[i].in_clamped=clamped;
+        ccparams[i].thread_id=i;
+
+        if (useme) convert_yuv888_to_rgb_frame_thread(&ccparams[i]);
+        else {
+          pthread_create(&cthreads[i],NULL,convert_yuv888_to_rgb_frame_thread,&ccparams[i]);
+          nthreads++;
+        }
       }
     }
 
-    for (i=0;i<nthreads;i++) {
+    for (i=0; i<nthreads; i++) {
       pthread_join(cthreads[i],NULL);
     }
-    g_free(ccparams);
+    lives_free(ccparams);
     return;
   }
 
@@ -1269,8 +1261,8 @@
   orowstride-=offs*hsize;
   irowstride-=hsize*3;
 
-  for (y=0;y<vsize;y++) {
-    for (x=0;x<hsize;x++) {
+  for (y=0; y<vsize; y++) {
+    for (x=0; x<hsize; x++) {
       yuv888_2_rgb(src,dest,add_alpha);
       src+=3;
       dest+=offs;
@@ -1284,8 +1276,8 @@
 void *convert_yuv888_to_rgb_frame_thread(void *data) {
   lives_cc_params *ccparams=(lives_cc_params *)data;
   convert_yuv888_to_rgb_frame((uint8_t *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->irowstrides[0],
-			      ccparams->orowstrides[0],(uint8_t *)ccparams->dest,ccparams->out_alpha,
-			      ccparams->in_clamped,ccparams->thread_id);
+                              ccparams->orowstrides[0],(uint8_t *)ccparams->dest,ccparams->out_alpha,
+                              ccparams->in_clamped,ccparams->thread_id);
   return NULL;
 }
 
@@ -1293,56 +1285,56 @@
 
 
 
-static void convert_yuva8888_to_rgba_frame(uint8_t *src, int hsize, int vsize, int irowstride, 
-					   int orowstride, uint8_t *dest, boolean del_alpha, boolean clamped,
-					   int thread_id) {
+static void convert_yuva8888_to_rgba_frame(uint8_t *src, int hsize, int vsize, int irowstride,
+    int orowstride, uint8_t *dest, boolean del_alpha, boolean clamped,
+    int thread_id) {
   register int x,y,i;
 
   size_t offs=4;
-  
-  if (G_UNLIKELY(!conv_YR_inited)) init_YUV_to_RGB_tables();
+
+  if (LIVES_UNLIKELY(!conv_YR_inited)) init_YUV_to_RGB_tables();
 
   if (thread_id==-1&&prefs->nfx_threads>1) {
     uint8_t *end=src+vsize*irowstride;
     int nthreads=0;
     int dheight;
     boolean useme=FALSE;
-    lives_cc_params *ccparams=(lives_cc_params *)g_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
+    lives_cc_params *ccparams=(lives_cc_params *)lives_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
 
     dheight=CEIL((double)vsize/(double)prefs->nfx_threads,4);
-    for (i=0;i<prefs->nfx_threads;i++) {
+    for (i=0; i<prefs->nfx_threads; i++) {
       if ((src+dheight*i*irowstride)<end) {
 
-	ccparams[i].src=src+dheight*i*irowstride;
-	ccparams[i].hsize=hsize;
-	ccparams[i].dest=dest+dheight*i*orowstride;
-
-	if (dheight*(i+1)>(vsize-4)) {
-	  dheight=vsize-(dheight*i);
-	  useme=TRUE;
-	}
-	if (dheight<4) break;
-
-	ccparams[i].vsize=dheight;
-
-	ccparams[i].irowstrides[0]=irowstride;
-	ccparams[i].orowstrides[0]=orowstride;
-	ccparams[i].out_alpha=!del_alpha;
-	ccparams[i].in_clamped=clamped;
-	ccparams[i].thread_id=i;
-	
-	if (useme) convert_yuva8888_to_rgba_frame_thread(&ccparams[i]);
-	else {
-	  pthread_create(&cthreads[i],NULL,convert_yuva8888_to_rgba_frame_thread,&ccparams[i]);
-	  nthreads++;
-	}
+        ccparams[i].src=src+dheight*i*irowstride;
+        ccparams[i].hsize=hsize;
+        ccparams[i].dest=dest+dheight*i*orowstride;
+
+        if (dheight*(i+1)>(vsize-4)) {
+          dheight=vsize-(dheight*i);
+          useme=TRUE;
+        }
+        if (dheight<4) break;
+
+        ccparams[i].vsize=dheight;
+
+        ccparams[i].irowstrides[0]=irowstride;
+        ccparams[i].orowstrides[0]=orowstride;
+        ccparams[i].out_alpha=!del_alpha;
+        ccparams[i].in_clamped=clamped;
+        ccparams[i].thread_id=i;
+
+        if (useme) convert_yuva8888_to_rgba_frame_thread(&ccparams[i]);
+        else {
+          pthread_create(&cthreads[i],NULL,convert_yuva8888_to_rgba_frame_thread,&ccparams[i]);
+          nthreads++;
+        }
       }
     }
 
-    for (i=0;i<nthreads;i++) {
+    for (i=0; i<nthreads; i++) {
       pthread_join(cthreads[i],NULL);
     }
-    g_free(ccparams);
+    lives_free(ccparams);
     return;
   }
 
@@ -1352,8 +1344,8 @@
   orowstride-=offs*hsize;
   irowstride-=hsize*4;
 
-  for (y=0;y<vsize;y++) {
-    for (x=0;x<hsize;x++) {
+  for (y=0; y<vsize; y++) {
+    for (x=0; x<hsize; x++) {
       yuva8888_2_rgba(src,dest,del_alpha);
       src+=4;
       dest+=offs;
@@ -1367,8 +1359,8 @@
 void *convert_yuva8888_to_rgba_frame_thread(void *data) {
   lives_cc_params *ccparams=(lives_cc_params *)data;
   convert_yuva8888_to_rgba_frame((uint8_t *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->irowstrides[0],
-				 ccparams->orowstrides[0],(uint8_t *)ccparams->dest,!ccparams->out_alpha,
-				 ccparams->in_clamped,ccparams->thread_id);
+                                 ccparams->orowstrides[0],(uint8_t *)ccparams->dest,!ccparams->out_alpha,
+                                 ccparams->in_clamped,ccparams->thread_id);
   return NULL;
 }
 
@@ -1376,55 +1368,55 @@
 
 
 
-static void convert_yuv888_to_bgr_frame(uint8_t *src, int hsize, int vsize, int irowstride, 
-					int orowstride, uint8_t *dest, boolean add_alpha, boolean clamped,
-					int thread_id) {
+static void convert_yuv888_to_bgr_frame(uint8_t *src, int hsize, int vsize, int irowstride,
+                                        int orowstride, uint8_t *dest, boolean add_alpha, boolean clamped,
+                                        int thread_id) {
   register int x,y,i;
   size_t offs=3;
-  
-  if (G_UNLIKELY(!conv_YR_inited)) init_YUV_to_RGB_tables();
+
+  if (LIVES_UNLIKELY(!conv_YR_inited)) init_YUV_to_RGB_tables();
 
   if (thread_id==-1&&prefs->nfx_threads>1) {
     uint8_t *end=src+vsize*irowstride;
     int nthreads=0;
     int dheight;
     boolean useme=FALSE;
-    lives_cc_params *ccparams=(lives_cc_params *)g_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
+    lives_cc_params *ccparams=(lives_cc_params *)lives_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
 
     dheight=CEIL((double)vsize/(double)prefs->nfx_threads,4);
-    for (i=0;i<prefs->nfx_threads;i++) {
+    for (i=0; i<prefs->nfx_threads; i++) {
       if ((src+dheight*i*irowstride)<end) {
 
-	ccparams[i].src=src+dheight*i*irowstride;
-	ccparams[i].hsize=hsize;
-	ccparams[i].dest=dest+dheight*i*orowstride;
-
-	if (dheight*(i+1)>(vsize-4)) {
-	  dheight=vsize-(dheight*i);
-	  useme=TRUE;
-	}
-	if (dheight<4) break;
-
-	ccparams[i].vsize=dheight;
-
-	ccparams[i].irowstrides[0]=irowstride;
-	ccparams[i].orowstrides[0]=orowstride;
-	ccparams[i].out_alpha=add_alpha;
-	ccparams[i].in_clamped=clamped;
-	ccparams[i].thread_id=i;
-	
-	if (useme) convert_yuv888_to_bgr_frame_thread(&ccparams[i]);
-	else {
-	  pthread_create(&cthreads[i],NULL,convert_yuv888_to_bgr_frame_thread,&ccparams[i]);
-	  nthreads++;
-	}
+        ccparams[i].src=src+dheight*i*irowstride;
+        ccparams[i].hsize=hsize;
+        ccparams[i].dest=dest+dheight*i*orowstride;
+
+        if (dheight*(i+1)>(vsize-4)) {
+          dheight=vsize-(dheight*i);
+          useme=TRUE;
+        }
+        if (dheight<4) break;
+
+        ccparams[i].vsize=dheight;
+
+        ccparams[i].irowstrides[0]=irowstride;
+        ccparams[i].orowstrides[0]=orowstride;
+        ccparams[i].out_alpha=add_alpha;
+        ccparams[i].in_clamped=clamped;
+        ccparams[i].thread_id=i;
+
+        if (useme) convert_yuv888_to_bgr_frame_thread(&ccparams[i]);
+        else {
+          pthread_create(&cthreads[i],NULL,convert_yuv888_to_bgr_frame_thread,&ccparams[i]);
+          nthreads++;
+        }
       }
     }
 
-    for (i=0;i<nthreads;i++) {
+    for (i=0; i<nthreads; i++) {
       pthread_join(cthreads[i],NULL);
     }
-    g_free(ccparams);
+    lives_free(ccparams);
     return;
   }
 
@@ -1434,8 +1426,8 @@
   orowstride-=offs*hsize;
   irowstride-=hsize*3;
 
-  for (y=0;y<vsize;y++) {
-    for (x=0;x<hsize;x++) {
+  for (y=0; y<vsize; y++) {
+    for (x=0; x<hsize; x++) {
       yuv888_2_bgr(src,dest,add_alpha);
       src+=3;
       dest+=offs;
@@ -1451,64 +1443,64 @@
 void *convert_yuv888_to_bgr_frame_thread(void *data) {
   lives_cc_params *ccparams=(lives_cc_params *)data;
   convert_yuv888_to_bgr_frame((uint8_t *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->irowstrides[0],
-			      ccparams->orowstrides[0],(uint8_t *)ccparams->dest,ccparams->out_alpha,
-			      ccparams->in_clamped,ccparams->thread_id);
+                              ccparams->orowstrides[0],(uint8_t *)ccparams->dest,ccparams->out_alpha,
+                              ccparams->in_clamped,ccparams->thread_id);
   return NULL;
 }
 
 
 
 
-static void convert_yuva8888_to_bgra_frame(uint8_t *src, int hsize, int vsize, int irowstride, 
-					   int orowstride, uint8_t *dest, boolean del_alpha, boolean clamped,
-					   int thread_id) {
+static void convert_yuva8888_to_bgra_frame(uint8_t *src, int hsize, int vsize, int irowstride,
+    int orowstride, uint8_t *dest, boolean del_alpha, boolean clamped,
+    int thread_id) {
   register int x,y,i;
 
   size_t offs=4;
-  
-  if (G_UNLIKELY(!conv_YR_inited)) init_YUV_to_RGB_tables();
+
+  if (LIVES_UNLIKELY(!conv_YR_inited)) init_YUV_to_RGB_tables();
 
   if (thread_id==-1&&prefs->nfx_threads>1) {
     uint8_t *end=src+vsize*irowstride;
     int nthreads=0;
     int dheight;
     boolean useme=FALSE;
-    lives_cc_params *ccparams=(lives_cc_params *)g_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
+    lives_cc_params *ccparams=(lives_cc_params *)lives_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
 
     dheight=CEIL((double)vsize/(double)prefs->nfx_threads,4);
-    for (i=0;i<prefs->nfx_threads;i++) {
+    for (i=0; i<prefs->nfx_threads; i++) {
       if ((src+dheight*i*irowstride)<end) {
 
-	ccparams[i].src=src+dheight*i*irowstride;
-	ccparams[i].hsize=hsize;
-	ccparams[i].dest=dest+dheight*i*orowstride;
-
-	if (dheight*(i+1)>(vsize-4)) {
-	  dheight=vsize-(dheight*i);
-	  useme=TRUE;
-	}
-	if (dheight<4) break;
-
-	ccparams[i].vsize=dheight;
-
-	ccparams[i].irowstrides[0]=irowstride;
-	ccparams[i].orowstrides[0]=orowstride;
-	ccparams[i].out_alpha=!del_alpha;
-	ccparams[i].in_clamped=clamped;
-	ccparams[i].thread_id=i;
-	
-	if (useme) convert_yuva8888_to_bgra_frame_thread(&ccparams[i]);
-	else {
-	  pthread_create(&cthreads[i],NULL,convert_yuva8888_to_bgra_frame_thread,&ccparams[i]);
-	  nthreads++;
-	}
+        ccparams[i].src=src+dheight*i*irowstride;
+        ccparams[i].hsize=hsize;
+        ccparams[i].dest=dest+dheight*i*orowstride;
+
+        if (dheight*(i+1)>(vsize-4)) {
+          dheight=vsize-(dheight*i);
+          useme=TRUE;
+        }
+        if (dheight<4) break;
+
+        ccparams[i].vsize=dheight;
+
+        ccparams[i].irowstrides[0]=irowstride;
+        ccparams[i].orowstrides[0]=orowstride;
+        ccparams[i].out_alpha=!del_alpha;
+        ccparams[i].in_clamped=clamped;
+        ccparams[i].thread_id=i;
+
+        if (useme) convert_yuva8888_to_bgra_frame_thread(&ccparams[i]);
+        else {
+          pthread_create(&cthreads[i],NULL,convert_yuva8888_to_bgra_frame_thread,&ccparams[i]);
+          nthreads++;
+        }
       }
     }
 
-    for (i=0;i<nthreads;i++) {
+    for (i=0; i<nthreads; i++) {
       pthread_join(cthreads[i],NULL);
     }
-    g_free(ccparams);
+    lives_free(ccparams);
     return;
   }
 
@@ -1518,8 +1510,8 @@
   orowstride-=offs*hsize;
   irowstride-=4*hsize;
 
-  for (y=0;y<vsize;y++) {
-    for (x=0;x<hsize;x++) {
+  for (y=0; y<vsize; y++) {
+    for (x=0; x<hsize; x++) {
       yuva8888_2_bgra(src,dest,del_alpha);
       src+=4;
       dest+=offs;
@@ -1534,61 +1526,61 @@
 void *convert_yuva8888_to_bgra_frame_thread(void *data) {
   lives_cc_params *ccparams=(lives_cc_params *)data;
   convert_yuva8888_to_bgra_frame((uint8_t *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->irowstrides[0],
-				 ccparams->orowstrides[0],(uint8_t *)ccparams->dest,!ccparams->out_alpha,
-				 ccparams->in_clamped,ccparams->thread_id);
+                                 ccparams->orowstrides[0],(uint8_t *)ccparams->dest,!ccparams->out_alpha,
+                                 ccparams->in_clamped,ccparams->thread_id);
   return NULL;
 }
 
 
 
-static void convert_yuv888_to_argb_frame(uint8_t *src, int hsize, int vsize, int irowstride, 
-					 int orowstride, uint8_t *dest, 
-					 boolean clamped, int thread_id) {
+static void convert_yuv888_to_argb_frame(uint8_t *src, int hsize, int vsize, int irowstride,
+    int orowstride, uint8_t *dest,
+    boolean clamped, int thread_id) {
   register int x,y,i;
   size_t offs=4;
-  
-  if (G_UNLIKELY(!conv_YR_inited)) init_YUV_to_RGB_tables();
+
+  if (LIVES_UNLIKELY(!conv_YR_inited)) init_YUV_to_RGB_tables();
 
   if (thread_id==-1&&prefs->nfx_threads>1) {
     uint8_t *end=src+vsize*irowstride;
     int nthreads=0;
     int dheight;
     boolean useme=FALSE;
-    lives_cc_params *ccparams=(lives_cc_params *)g_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
+    lives_cc_params *ccparams=(lives_cc_params *)lives_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
 
     dheight=CEIL((double)vsize/(double)prefs->nfx_threads,4);
-    for (i=0;i<prefs->nfx_threads;i++) {
+    for (i=0; i<prefs->nfx_threads; i++) {
       if ((src+dheight*i*irowstride)<end) {
 
-	ccparams[i].src=src+dheight*i*irowstride;
-	ccparams[i].hsize=hsize;
-	ccparams[i].dest=dest+dheight*i*orowstride;
-
-	if (dheight*(i+1)>(vsize-4)) {
-	  dheight=vsize-(dheight*i);
-	  useme=TRUE;
-	}
-	if (dheight<4) break;
-
-	ccparams[i].vsize=dheight;
-
-	ccparams[i].irowstrides[0]=irowstride;
-	ccparams[i].orowstrides[0]=orowstride;
-	ccparams[i].in_clamped=clamped;
-	ccparams[i].thread_id=i;
-	
-	if (useme) convert_yuv888_to_argb_frame_thread(&ccparams[i]);
-	else {
-	  pthread_create(&cthreads[i],NULL,convert_yuv888_to_argb_frame_thread,&ccparams[i]);
-	  nthreads++;
-	}
+        ccparams[i].src=src+dheight*i*irowstride;
+        ccparams[i].hsize=hsize;
+        ccparams[i].dest=dest+dheight*i*orowstride;
+
+        if (dheight*(i+1)>(vsize-4)) {
+          dheight=vsize-(dheight*i);
+          useme=TRUE;
+        }
+        if (dheight<4) break;
+
+        ccparams[i].vsize=dheight;
+
+        ccparams[i].irowstrides[0]=irowstride;
+        ccparams[i].orowstrides[0]=orowstride;
+        ccparams[i].in_clamped=clamped;
+        ccparams[i].thread_id=i;
+
+        if (useme) convert_yuv888_to_argb_frame_thread(&ccparams[i]);
+        else {
+          pthread_create(&cthreads[i],NULL,convert_yuv888_to_argb_frame_thread,&ccparams[i]);
+          nthreads++;
+        }
       }
     }
 
-    for (i=0;i<nthreads;i++) {
+    for (i=0; i<nthreads; i++) {
       pthread_join(cthreads[i],NULL);
     }
-    g_free(ccparams);
+    lives_free(ccparams);
     return;
   }
 
@@ -1597,8 +1589,8 @@
   orowstride-=offs*hsize;
   irowstride-=hsize*3;
 
-  for (y=0;y<vsize;y++) {
-    for (x=0;x<hsize;x++) {
+  for (y=0; y<vsize; y++) {
+    for (x=0; x<hsize; x++) {
       yuv888_2_argb(src,dest);
       src+=3;
       dest+=4;
@@ -1612,8 +1604,8 @@
 void *convert_yuv888_to_argb_frame_thread(void *data) {
   lives_cc_params *ccparams=(lives_cc_params *)data;
   convert_yuv888_to_argb_frame((uint8_t *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->irowstrides[0],
-			       ccparams->orowstrides[0],(uint8_t *)ccparams->dest,
-			       ccparams->in_clamped,ccparams->thread_id);
+                               ccparams->orowstrides[0],(uint8_t *)ccparams->dest,
+                               ccparams->in_clamped,ccparams->thread_id);
   return NULL;
 }
 
@@ -1621,55 +1613,55 @@
 
 
 
-static void convert_yuva8888_to_argb_frame(uint8_t *src, int hsize, int vsize, int irowstride, 
-					   int orowstride, uint8_t *dest, boolean clamped,
-					   int thread_id) {
+static void convert_yuva8888_to_argb_frame(uint8_t *src, int hsize, int vsize, int irowstride,
+    int orowstride, uint8_t *dest, boolean clamped,
+    int thread_id) {
   register int x,y,i;
 
   size_t offs=4;
-  
-  if (G_UNLIKELY(!conv_YR_inited)) init_YUV_to_RGB_tables();
+
+  if (LIVES_UNLIKELY(!conv_YR_inited)) init_YUV_to_RGB_tables();
 
   if (thread_id==-1&&prefs->nfx_threads>1) {
     uint8_t *end=src+vsize*irowstride;
     int nthreads=0;
     int dheight;
     boolean useme=FALSE;
-    lives_cc_params *ccparams=(lives_cc_params *)g_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
+    lives_cc_params *ccparams=(lives_cc_params *)lives_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
 
     dheight=CEIL((double)vsize/(double)prefs->nfx_threads,4);
-    for (i=0;i<prefs->nfx_threads;i++) {
+    for (i=0; i<prefs->nfx_threads; i++) {
       if ((src+dheight*i*irowstride)<end) {
 
-	ccparams[i].src=src+dheight*i*irowstride;
-	ccparams[i].hsize=hsize;
-	ccparams[i].dest=dest+dheight*i*orowstride;
-
-	if (dheight*(i+1)>(vsize-4)) {
-	  dheight=vsize-(dheight*i);
-	  useme=TRUE;
-	}
-	if (dheight<4) break;
-
-	ccparams[i].vsize=dheight;
-
-	ccparams[i].irowstrides[0]=irowstride;
-	ccparams[i].orowstrides[0]=orowstride;
-	ccparams[i].in_clamped=clamped;
-	ccparams[i].thread_id=i;
-	
-	if (useme) convert_yuva8888_to_rgba_frame_thread(&ccparams[i]);
-	else {
-	  pthread_create(&cthreads[i],NULL,convert_yuva8888_to_rgba_frame_thread,&ccparams[i]);
-	  nthreads++;
-	}
+        ccparams[i].src=src+dheight*i*irowstride;
+        ccparams[i].hsize=hsize;
+        ccparams[i].dest=dest+dheight*i*orowstride;
+
+        if (dheight*(i+1)>(vsize-4)) {
+          dheight=vsize-(dheight*i);
+          useme=TRUE;
+        }
+        if (dheight<4) break;
+
+        ccparams[i].vsize=dheight;
+
+        ccparams[i].irowstrides[0]=irowstride;
+        ccparams[i].orowstrides[0]=orowstride;
+        ccparams[i].in_clamped=clamped;
+        ccparams[i].thread_id=i;
+
+        if (useme) convert_yuva8888_to_rgba_frame_thread(&ccparams[i]);
+        else {
+          pthread_create(&cthreads[i],NULL,convert_yuva8888_to_rgba_frame_thread,&ccparams[i]);
+          nthreads++;
+        }
       }
     }
 
-    for (i=0;i<nthreads;i++) {
+    for (i=0; i<nthreads; i++) {
       pthread_join(cthreads[i],NULL);
     }
-    g_free(ccparams);
+    lives_free(ccparams);
     return;
   }
 
@@ -1678,8 +1670,8 @@
   orowstride-=offs*hsize;
   irowstride-=hsize*4;
 
-  for (y=0;y<vsize;y++) {
-    for (x=0;x<hsize;x++) {
+  for (y=0; y<vsize; y++) {
+    for (x=0; x<hsize; x++) {
       yuva8888_2_argb(src,dest);
       src+=4;
       dest+=4;
@@ -1693,16 +1685,16 @@
 void *convert_yuva8888_to_argb_frame_thread(void *data) {
   lives_cc_params *ccparams=(lives_cc_params *)data;
   convert_yuva8888_to_argb_frame((uint8_t *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->irowstrides[0],
-				 ccparams->orowstrides[0],(uint8_t *)ccparams->dest,
-				 ccparams->in_clamped,ccparams->thread_id);
+                                 ccparams->orowstrides[0],(uint8_t *)ccparams->dest,
+                                 ccparams->in_clamped,ccparams->thread_id);
   return NULL;
 }
 
 
 
-static void convert_yuv420p_to_rgb_frame(uint8_t **src, int width, int height, int orowstride, 
-					 uint8_t *dest, boolean add_alpha, boolean is_422, int sample_type, 
-					 boolean clamped) {
+static void convert_yuv420p_to_rgb_frame(uint8_t **src, int width, int height, int orowstride,
+    uint8_t *dest, boolean add_alpha, boolean is_422, int sample_type,
+    boolean clamped) {
   register int i,j;
   uint8_t *s_y=src[0],*s_u=src[1],*s_v=src[2];
   boolean chroma=FALSE;
@@ -1715,11 +1707,11 @@
   widthx=width*opsize;
   opsize2=opsize*2;
 
-  if (G_UNLIKELY(!conv_YR_inited)) init_YUV_to_RGB_tables();
+  if (LIVES_UNLIKELY(!conv_YR_inited)) init_YUV_to_RGB_tables();
 
   set_conversion_arrays(clamped?WEED_YUV_CLAMPING_CLAMPED:WEED_YUV_CLAMPING_UNCLAMPED,WEED_YUV_SUBSPACE_YCBCR);
 
-  for (i=0;i<height;i++) {
+  for (i=0; i<height; i++) {
     y=*(s_y++);
     u=s_u[0];
     v=s_v[0];
@@ -1734,7 +1726,7 @@
     yuv2rgb(y,u,v,&dest[0],&dest[1],&dest[2]);
     dest-=opsize;
 
-    for (j=opsize2;j<widthx;j+=opsize2) {
+    for (j=opsize2; j<widthx; j+=opsize2) {
       // process two pixels at a time, and we average the first colour pixel with the last from the previous 2
       // we know we can do this because Y must be even width
 
@@ -1745,7 +1737,7 @@
       v=s_v[(j/opsize)/2];
 
       yuv2rgb(y,u,v,&dest[j],&dest[j+1],&dest[j+2]);
-      
+
       dest[j-opsize]=cavgrgb[dest[j-opsize]][dest[j]];
       dest[j-opsize+1]=cavgrgb[dest[j-opsize+1]][dest[j+1]];
       dest[j-opsize+2]=cavgrgb[dest[j-opsize+2]][dest[j+2]];
@@ -1756,21 +1748,21 @@
       if (add_alpha) dest[j+3]=dest[j+7]=255;
 
       if (!is_422&&!chroma&&i>0) {
-	// pass 2
-	// average two src rows
-	dest[j-widthx]=cavgrgb[dest[j-widthx]][dest[j]];
-	dest[j+1-widthx]=cavgrgb[dest[j+1-widthx]][dest[j+1]];
-	dest[j+2-widthx]=cavgrgb[dest[j+2-widthx]][dest[j+2]];
-	dest[j-opsize-widthx]=cavgrgb[dest[j-opsize-widthx]][dest[j-opsize]];
-	dest[j-opsize+1-widthx]=cavgrgb[dest[j-opsize+1-widthx]][dest[j-opsize+1]];
-	dest[j-opsize+2-widthx]=cavgrgb[dest[j-opsize+2-widthx]][dest[j-opsize+2]];
+        // pass 2
+        // average two src rows
+        dest[j-widthx]=cavgrgb[dest[j-widthx]][dest[j]];
+        dest[j+1-widthx]=cavgrgb[dest[j+1-widthx]][dest[j+1]];
+        dest[j+2-widthx]=cavgrgb[dest[j+2-widthx]][dest[j+2]];
+        dest[j-opsize-widthx]=cavgrgb[dest[j-opsize-widthx]][dest[j-opsize]];
+        dest[j-opsize+1-widthx]=cavgrgb[dest[j-opsize+1-widthx]][dest[j-opsize+1]];
+        dest[j-opsize+2-widthx]=cavgrgb[dest[j-opsize+2-widthx]][dest[j-opsize+2]];
       }
     }
     if (!is_422&&chroma) {
       if (i>0) {
-	dest[j-opsize-widthx]=cavgrgb[dest[j-opsize-widthx]][dest[j-opsize]];
-	dest[j-opsize+1-widthx]=cavgrgb[dest[j-opsize+1-widthx]][dest[j-opsize+1]];
-	dest[j-opsize+2-widthx]=cavgrgb[dest[j-opsize+2-widthx]][dest[j-opsize+2]];
+        dest[j-opsize-widthx]=cavgrgb[dest[j-opsize-widthx]][dest[j-opsize]];
+        dest[j-opsize+1-widthx]=cavgrgb[dest[j-opsize+1-widthx]][dest[j-opsize+1]];
+        dest[j-opsize+2-widthx]=cavgrgb[dest[j-opsize+2-widthx]][dest[j-opsize+2]];
       }
       s_u+=hwidth;
       s_v+=hwidth;
@@ -1782,9 +1774,9 @@
 }
 
 
-static void convert_yuv420p_to_bgr_frame(uint8_t **src, int width, int height, int orowstride, 
-					 uint8_t *dest, boolean add_alpha, boolean is_422, int sample_type, 
-					 boolean clamped) {
+static void convert_yuv420p_to_bgr_frame(uint8_t **src, int width, int height, int orowstride,
+    uint8_t *dest, boolean add_alpha, boolean is_422, int sample_type,
+    boolean clamped) {
   // TODO - handle dvpal in sampling type
   register int i,j;
   uint8_t *s_y=src[0],*s_u=src[1],*s_v=src[2];
@@ -1798,11 +1790,11 @@
   widthx=width*opsize;
   opsize2=opsize*2;
 
-  if (G_UNLIKELY(!conv_YR_inited)) init_YUV_to_RGB_tables();
+  if (LIVES_UNLIKELY(!conv_YR_inited)) init_YUV_to_RGB_tables();
 
   set_conversion_arrays(clamped?WEED_YUV_CLAMPING_CLAMPED:WEED_YUV_CLAMPING_UNCLAMPED,WEED_YUV_SUBSPACE_YCBCR);
 
-  for (i=0;i<height;i++) {
+  for (i=0; i<height; i++) {
     y=*(s_y++);
     u=s_u[0];
     v=s_v[0];
@@ -1817,7 +1809,7 @@
     yuv2rgb(y,u,v,&dest[2],&dest[1],&dest[0]);
     dest-=opsize;
 
-    for (j=opsize2;j<widthx;j+=opsize2) {
+    for (j=opsize2; j<widthx; j+=opsize2) {
       // process two pixels at a time, and we average the first colour pixel with the last from the previous 2
       // we know we can do this because Y must be even width
 
@@ -1828,7 +1820,7 @@
       v=s_v[(j/opsize)/2];
 
       yuv2rgb(y,u,v,&dest[j+2],&dest[j+1],&dest[j]);
-      
+
       dest[j-opsize]=cavgrgb[dest[j-opsize]][dest[j]];
       dest[j-opsize+1]=cavgrgb[dest[j-opsize+1]][dest[j+1]];
       dest[j-opsize+2]=cavgrgb[dest[j-opsize+2]][dest[j+2]];
@@ -1839,22 +1831,22 @@
       if (add_alpha) dest[j+3]=dest[j+7]=255;
 
       if (!is_422&&!chroma&&i>0) {
-	// pass 2
-	// average two src rows
-	dest[j-widthx]=cavgrgb[dest[j-widthx]][dest[j]];
-	dest[j+1-widthx]=cavgrgb[dest[j+1-widthx]][dest[j+1]];
-	dest[j+2-widthx]=cavgrgb[dest[j+2-widthx]][dest[j+2]];
-	dest[j-opsize-widthx]=cavgrgb[dest[j-opsize-widthx]][dest[j-opsize]];
-	dest[j-opsize+1-widthx]=cavgrgb[dest[j-opsize+1-widthx]][dest[j-opsize+1]];
-	dest[j-opsize+2-widthx]=cavgrgb[dest[j-opsize+2-widthx]][dest[j-opsize+2]];
+        // pass 2
+        // average two src rows
+        dest[j-widthx]=cavgrgb[dest[j-widthx]][dest[j]];
+        dest[j+1-widthx]=cavgrgb[dest[j+1-widthx]][dest[j+1]];
+        dest[j+2-widthx]=cavgrgb[dest[j+2-widthx]][dest[j+2]];
+        dest[j-opsize-widthx]=cavgrgb[dest[j-opsize-widthx]][dest[j-opsize]];
+        dest[j-opsize+1-widthx]=cavgrgb[dest[j-opsize+1-widthx]][dest[j-opsize+1]];
+        dest[j-opsize+2-widthx]=cavgrgb[dest[j-opsize+2-widthx]][dest[j-opsize+2]];
       }
     }
     if (!is_422&&chroma) {
       if (i>0) {
-	// TODO
-	dest[j-opsize-widthx]=cavgrgb[dest[j-opsize-widthx]][dest[j-opsize]];
-	dest[j-opsize+1-widthx]=cavgrgb[dest[j-opsize+1-widthx]][dest[j-opsize+1]];
-	dest[j-opsize+2-widthx]=cavgrgb[dest[j-opsize+2-widthx]][dest[j-opsize+2]];
+        // TODO
+        dest[j-opsize-widthx]=cavgrgb[dest[j-opsize-widthx]][dest[j-opsize]];
+        dest[j-opsize+1-widthx]=cavgrgb[dest[j-opsize+1-widthx]][dest[j-opsize+1]];
+        dest[j-opsize+2-widthx]=cavgrgb[dest[j-opsize+2-widthx]][dest[j-opsize+2]];
       }
       s_u+=hwidth;
       s_v+=hwidth;
@@ -1865,9 +1857,9 @@
 }
 
 
-static void convert_yuv420p_to_argb_frame(uint8_t **src, int width, int height, int orowstride, 
-					  uint8_t *dest, boolean is_422, int sample_type, 
-					  boolean clamped) {
+static void convert_yuv420p_to_argb_frame(uint8_t **src, int width, int height, int orowstride,
+    uint8_t *dest, boolean is_422, int sample_type,
+    boolean clamped) {
   // TODO - handle dvpal in sampling type
   register int i,j;
   uint8_t *s_y=src[0],*s_u=src[1],*s_v=src[2];
@@ -1879,11 +1871,11 @@
   widthx=width*opsize;
   opsize2=opsize*2;
 
-  if (G_UNLIKELY(!conv_YR_inited)) init_YUV_to_RGB_tables();
+  if (LIVES_UNLIKELY(!conv_YR_inited)) init_YUV_to_RGB_tables();
 
   set_conversion_arrays(clamped?WEED_YUV_CLAMPING_CLAMPED:WEED_YUV_CLAMPING_UNCLAMPED,WEED_YUV_SUBSPACE_YCBCR);
 
-  for (i=0;i<height;i++) {
+  for (i=0; i<height; i++) {
     y=*(s_y++);
     u=s_u[0];
     v=s_v[0];
@@ -1898,7 +1890,7 @@
     yuv2rgb(y,u,v,&dest[0],&dest[1],&dest[2]);
     dest-=opsize;
 
-    for (j=opsize2;j<widthx;j+=opsize2) {
+    for (j=opsize2; j<widthx; j+=opsize2) {
       // process two pixels at a time, and we average the first colour pixel with the last from the previous 2
       // we know we can do this because Y must be even width
 
@@ -1909,7 +1901,7 @@
       v=s_v[(j/opsize)/2];
 
       yuv2rgb(y,u,v,&dest[j+1],&dest[j+2],&dest[j+3]);
-      
+
       dest[j-opsize+1]=cavgrgb[dest[j-opsize+1]][dest[j+1]];
       dest[j-opsize+2]=cavgrgb[dest[j-opsize+2]][dest[j+2]];
       dest[j-opsize+3]=cavgrgb[dest[j-opsize+3]][dest[j+3]];
@@ -1920,22 +1912,22 @@
       dest[j]=dest[j+4]=255;
 
       if (!is_422&&!chroma&&i>0) {
-	// pass 2
-	// average two src rows
-	dest[j+1-widthx]=cavgrgb[dest[j+1-widthx]][dest[j+1]];
-	dest[j+2-widthx]=cavgrgb[dest[j+2-widthx]][dest[j+2]];
-	dest[j+3-widthx]=cavgrgb[dest[j+3-widthx]][dest[j+3]];
-	dest[j-opsize+1-widthx]=cavgrgb[dest[j-opsize+1-widthx]][dest[j-opsize+1]];
-	dest[j-opsize+2-widthx]=cavgrgb[dest[j-opsize+2-widthx]][dest[j-opsize+2]];
-	dest[j-opsize+3-widthx]=cavgrgb[dest[j-opsize+3-widthx]][dest[j-opsize+3]];
+        // pass 2
+        // average two src rows
+        dest[j+1-widthx]=cavgrgb[dest[j+1-widthx]][dest[j+1]];
+        dest[j+2-widthx]=cavgrgb[dest[j+2-widthx]][dest[j+2]];
+        dest[j+3-widthx]=cavgrgb[dest[j+3-widthx]][dest[j+3]];
+        dest[j-opsize+1-widthx]=cavgrgb[dest[j-opsize+1-widthx]][dest[j-opsize+1]];
+        dest[j-opsize+2-widthx]=cavgrgb[dest[j-opsize+2-widthx]][dest[j-opsize+2]];
+        dest[j-opsize+3-widthx]=cavgrgb[dest[j-opsize+3-widthx]][dest[j-opsize+3]];
       }
     }
     if (!is_422&&chroma) {
       if (i>0) {
-	// TODO
-	dest[j-opsize+1-widthx]=cavgrgb[dest[j-opsize+1-widthx]][dest[j-opsize+1]];
-	dest[j-opsize+2-widthx]=cavgrgb[dest[j-opsize+2-widthx]][dest[j-opsize+2]];
-	dest[j-opsize+3-widthx]=cavgrgb[dest[j-opsize+3-widthx]][dest[j-opsize+3]];
+        // TODO
+        dest[j-opsize+1-widthx]=cavgrgb[dest[j-opsize+1-widthx]][dest[j-opsize+1]];
+        dest[j-opsize+2-widthx]=cavgrgb[dest[j-opsize+2-widthx]][dest[j-opsize+2]];
+        dest[j-opsize+3-widthx]=cavgrgb[dest[j-opsize+3-widthx]][dest[j-opsize+3]];
       }
       s_u+=hwidth;
       s_v+=hwidth;
@@ -1946,8 +1938,8 @@
 }
 
 
-static void convert_rgb_to_uyvy_frame(uint8_t *rgbdata, int hsize, int vsize, int rowstride, 
-			       uyvy_macropixel *u, boolean has_alpha, boolean clamped, int thread_id) {
+static void convert_rgb_to_uyvy_frame(uint8_t *rgbdata, int hsize, int vsize, int rowstride,
+                                      uyvy_macropixel *u, boolean has_alpha, boolean clamped, int thread_id) {
   // for odd sized widths, cut the rightmost pixel
   int hs3,ipsize=3,ipsize2;
   uint8_t *end;
@@ -1955,7 +1947,7 @@
 
   int x=3,y=4,z=5;
 
-  if (G_UNLIKELY(!conv_RY_inited)) init_RGB_to_YUV_tables();
+  if (LIVES_UNLIKELY(!conv_RY_inited)) init_RGB_to_YUV_tables();
 
   end=rgbdata+(rowstride*vsize)-5;
 
@@ -1963,42 +1955,42 @@
     int nthreads=0;
     int dheight;
     boolean useme=FALSE;
-    lives_cc_params *ccparams=(lives_cc_params *)g_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
+    lives_cc_params *ccparams=(lives_cc_params *)lives_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
 
     dheight=CEIL((double)vsize/(double)prefs->nfx_threads,4);
-    for (i=0;i<prefs->nfx_threads;i++) {
+    for (i=0; i<prefs->nfx_threads; i++) {
       if ((rgbdata+dheight*i*rowstride)<end) {
 
-	ccparams[i].src=rgbdata+dheight*i*rowstride;
-	ccparams[i].hsize=hsize;
-	ccparams[i].dest=u+dheight*i*(hsize>>1);
+        ccparams[i].src=rgbdata+dheight*i*rowstride;
+        ccparams[i].hsize=hsize;
+        ccparams[i].dest=u+dheight*i*(hsize>>1);
+
+        if (dheight*(i+1)>(vsize-4)) {
+          dheight=vsize-(dheight*i);
+          useme=TRUE;
+        }
 
-	if (dheight*(i+1)>(vsize-4)) {
-	  dheight=vsize-(dheight*i);
-	  useme=TRUE;
-	}
+        if (dheight<4) break;
 
-	if (dheight<4) break;
+        ccparams[i].vsize=dheight;
 
-	ccparams[i].vsize=dheight;
+        ccparams[i].irowstrides[0]=rowstride;
+        ccparams[i].in_alpha=has_alpha;
+        ccparams[i].out_clamped=clamped;
+        ccparams[i].thread_id=i;
 
-	ccparams[i].irowstrides[0]=rowstride;
-	ccparams[i].in_alpha=has_alpha;
-	ccparams[i].out_clamped=clamped;
-	ccparams[i].thread_id=i;
-	
-	if (useme) convert_rgb_to_uyvy_frame_thread(&ccparams[i]);
-	else {
-	  pthread_create(&cthreads[i],NULL,convert_rgb_to_uyvy_frame_thread,&ccparams[i]);
-	  nthreads++;
-	}
+        if (useme) convert_rgb_to_uyvy_frame_thread(&ccparams[i]);
+        else {
+          pthread_create(&cthreads[i],NULL,convert_rgb_to_uyvy_frame_thread,&ccparams[i]);
+          nthreads++;
+        }
       }
     }
 
-    for (i=0;i<nthreads;i++) {
+    for (i=0; i<nthreads; i++) {
       pthread_join(cthreads[i],NULL);
     }
-    g_free(ccparams);
+    lives_free(ccparams);
     return;
   }
 
@@ -2015,10 +2007,10 @@
   ipsize2=ipsize*2;
   hs3=((hsize>>1)*ipsize2)-(ipsize2-1);
 
-  for (;rgbdata<end;rgbdata+=rowstride) {
-    for (i=0;i<hs3;i+=ipsize2) {
+  for (; rgbdata<end; rgbdata+=rowstride) {
+    for (i=0; i<hs3; i+=ipsize2) {
       // convert 6 RGBRGB bytes to 4 UYVY bytes
-      rgb2uyvy (rgbdata[i],rgbdata[i+1],rgbdata[i+2],rgbdata[i+x],rgbdata[i+y],rgbdata[i+z],u++);
+      rgb2uyvy(rgbdata[i],rgbdata[i+1],rgbdata[i+2],rgbdata[i+x],rgbdata[i+y],rgbdata[i+z],u++);
     }
   }
 }
@@ -2027,13 +2019,13 @@
 void *convert_rgb_to_uyvy_frame_thread(void *data) {
   lives_cc_params *ccparams=(lives_cc_params *)data;
   convert_rgb_to_uyvy_frame((uint8_t *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->irowstrides[0],
-			    (uyvy_macropixel *)ccparams->dest,ccparams->in_alpha,ccparams->out_clamped,ccparams->thread_id);
+                            (uyvy_macropixel *)ccparams->dest,ccparams->in_alpha,ccparams->out_clamped,ccparams->thread_id);
   return NULL;
 }
 
 
-static void convert_rgb_to_yuyv_frame(uint8_t *rgbdata, int hsize, int vsize, int rowstride, 
-				      yuyv_macropixel *u, boolean has_alpha, boolean clamped, int thread_id) {
+static void convert_rgb_to_yuyv_frame(uint8_t *rgbdata, int hsize, int vsize, int rowstride,
+                                      yuyv_macropixel *u, boolean has_alpha, boolean clamped, int thread_id) {
   // for odd sized widths, cut the rightmost pixel
   int hs3,ipsize=3,ipsize2;
   uint8_t *end=rgbdata+(rowstride*vsize)-5;
@@ -2041,47 +2033,47 @@
 
   int x=3,y=4,z=5;
 
-  if (G_UNLIKELY(!conv_RY_inited)) init_RGB_to_YUV_tables();
+  if (LIVES_UNLIKELY(!conv_RY_inited)) init_RGB_to_YUV_tables();
 
   if (thread_id==-1&&prefs->nfx_threads>1) {
     int nthreads=0;
     int dheight;
     boolean useme=FALSE;
-    lives_cc_params *ccparams=(lives_cc_params *)g_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
+    lives_cc_params *ccparams=(lives_cc_params *)lives_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
 
     dheight=CEIL((double)vsize/(double)prefs->nfx_threads,4);
-    for (i=0;i<prefs->nfx_threads;i++) {
+    for (i=0; i<prefs->nfx_threads; i++) {
       if ((rgbdata+dheight*i*rowstride)<end) {
 
-	ccparams[i].src=rgbdata+dheight*i*rowstride;
-	ccparams[i].hsize=hsize;
-	ccparams[i].dest=u+dheight*i*(hsize>>1);
-
-	if (dheight*(i+1)>(vsize-4)) {
-	  dheight=vsize-(dheight*i);
-	  useme=TRUE;
-	}
-	if (dheight<4) break;
-
-	ccparams[i].vsize=dheight;
-
-	ccparams[i].irowstrides[0]=rowstride;
-	ccparams[i].in_alpha=has_alpha;
-	ccparams[i].out_clamped=clamped;
-	ccparams[i].thread_id=i;
-	
-	if (useme) convert_rgb_to_yuyv_frame_thread(&ccparams[i]);
-	else {
-	  pthread_create(&cthreads[i],NULL,convert_rgb_to_yuyv_frame_thread,&ccparams[i]);
-	  nthreads++;
-	}
+        ccparams[i].src=rgbdata+dheight*i*rowstride;
+        ccparams[i].hsize=hsize;
+        ccparams[i].dest=u+dheight*i*(hsize>>1);
+
+        if (dheight*(i+1)>(vsize-4)) {
+          dheight=vsize-(dheight*i);
+          useme=TRUE;
+        }
+        if (dheight<4) break;
+
+        ccparams[i].vsize=dheight;
+
+        ccparams[i].irowstrides[0]=rowstride;
+        ccparams[i].in_alpha=has_alpha;
+        ccparams[i].out_clamped=clamped;
+        ccparams[i].thread_id=i;
+
+        if (useme) convert_rgb_to_yuyv_frame_thread(&ccparams[i]);
+        else {
+          pthread_create(&cthreads[i],NULL,convert_rgb_to_yuyv_frame_thread,&ccparams[i]);
+          nthreads++;
+        }
       }
     }
 
-    for (i=0;i<prefs->nfx_threads;i++) {
+    for (i=0; i<prefs->nfx_threads; i++) {
       pthread_join(cthreads[i],NULL);
     }
-    g_free(ccparams);
+    lives_free(ccparams);
     return;
   }
 
@@ -2097,10 +2089,10 @@
   ipsize2=ipsize*2;
   hs3=((hsize>>1)*ipsize2)-(ipsize2-1);
 
-  for (;rgbdata<end;rgbdata+=rowstride) {
-    for (i=0;i<hs3;i+=ipsize2) {
+  for (; rgbdata<end; rgbdata+=rowstride) {
+    for (i=0; i<hs3; i+=ipsize2) {
       // convert 6 RGBRGB bytes to 4 YUYV bytes
-      rgb2yuyv (rgbdata[i],rgbdata[i+1],rgbdata[i+2],rgbdata[i+x],rgbdata[i+y],rgbdata[i+z],u++);
+      rgb2yuyv(rgbdata[i],rgbdata[i+1],rgbdata[i+2],rgbdata[i+x],rgbdata[i+y],rgbdata[i+z],u++);
     }
   }
 }
@@ -2109,13 +2101,13 @@
 void *convert_rgb_to_yuyv_frame_thread(void *data) {
   lives_cc_params *ccparams=(lives_cc_params *)data;
   convert_rgb_to_yuyv_frame((uint8_t *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->irowstrides[0],
-			    (yuyv_macropixel *)ccparams->dest,ccparams->in_alpha,ccparams->out_clamped,ccparams->thread_id);
+                            (yuyv_macropixel *)ccparams->dest,ccparams->in_alpha,ccparams->out_clamped,ccparams->thread_id);
   return NULL;
 }
 
 
-static void convert_bgr_to_uyvy_frame(uint8_t *rgbdata, int hsize, int vsize, int rowstride, 
-				      uyvy_macropixel *u, boolean has_alpha, boolean clamped, int thread_id) {
+static void convert_bgr_to_uyvy_frame(uint8_t *rgbdata, int hsize, int vsize, int rowstride,
+                                      uyvy_macropixel *u, boolean has_alpha, boolean clamped, int thread_id) {
   // for odd sized widths, cut the rightmost pixel
   int hs3,ipsize=3,ipsize2;
   uint8_t *end=rgbdata+(rowstride*vsize)-5;
@@ -2123,47 +2115,47 @@
 
   int x=3,y=4,z=5;
 
-  if (G_UNLIKELY(!conv_RY_inited)) init_RGB_to_YUV_tables();
+  if (LIVES_UNLIKELY(!conv_RY_inited)) init_RGB_to_YUV_tables();
 
   if (thread_id==-1&&prefs->nfx_threads>1) {
     int nthreads=0;
     boolean useme=FALSE;
     int dheight;
-    lives_cc_params *ccparams=(lives_cc_params *)g_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
+    lives_cc_params *ccparams=(lives_cc_params *)lives_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
 
     dheight=CEIL((double)vsize/(double)prefs->nfx_threads,4);
-    for (i=0;i<prefs->nfx_threads;i++) {
+    for (i=0; i<prefs->nfx_threads; i++) {
       if ((rgbdata+dheight*i*rowstride)<end) {
 
-	ccparams[i].src=rgbdata+dheight*i*rowstride;
-	ccparams[i].hsize=hsize;
-	ccparams[i].dest=u+dheight*i*(hsize>>1);
-
-	if (dheight*(i+1)>(vsize-4)) {
-	  dheight=vsize-(dheight*i);
-	  useme=TRUE;
-	}
-	if (dheight<4) break;
-
-	ccparams[i].vsize=dheight;
-
-	ccparams[i].irowstrides[0]=rowstride;
-	ccparams[i].in_alpha=has_alpha;
-	ccparams[i].out_clamped=clamped;
-	ccparams[i].thread_id=i;
-	
-	if (useme) convert_bgr_to_uyvy_frame_thread(&ccparams[i]);
-	else {
-	  pthread_create(&cthreads[i],NULL,convert_bgr_to_uyvy_frame_thread,&ccparams[i]);
-	  nthreads++;
-	}
+        ccparams[i].src=rgbdata+dheight*i*rowstride;
+        ccparams[i].hsize=hsize;
+        ccparams[i].dest=u+dheight*i*(hsize>>1);
+
+        if (dheight*(i+1)>(vsize-4)) {
+          dheight=vsize-(dheight*i);
+          useme=TRUE;
+        }
+        if (dheight<4) break;
+
+        ccparams[i].vsize=dheight;
+
+        ccparams[i].irowstrides[0]=rowstride;
+        ccparams[i].in_alpha=has_alpha;
+        ccparams[i].out_clamped=clamped;
+        ccparams[i].thread_id=i;
+
+        if (useme) convert_bgr_to_uyvy_frame_thread(&ccparams[i]);
+        else {
+          pthread_create(&cthreads[i],NULL,convert_bgr_to_uyvy_frame_thread,&ccparams[i]);
+          nthreads++;
+        }
       }
     }
 
-    for (i=0;i<nthreads;i++) {
+    for (i=0; i<nthreads; i++) {
       pthread_join(cthreads[i],NULL);
     }
-    g_free(ccparams);
+    lives_free(ccparams);
     return;
   }
 
@@ -2179,10 +2171,10 @@
   ipsize2=ipsize*2;
   hs3=((hsize>>1)*ipsize2)-(ipsize2-1);
 
-  for (;rgbdata<end;rgbdata+=rowstride) {
-    for (i=0;i<hs3;i+=ipsize2) {
+  for (; rgbdata<end; rgbdata+=rowstride) {
+    for (i=0; i<hs3; i+=ipsize2) {
       // convert 6 RGBRGB bytes to 4 UYVY bytes
-      rgb2uyvy (rgbdata[i+2],rgbdata[i+1],rgbdata[i],rgbdata[i+z],rgbdata[i+y],rgbdata[i+x],u++);
+      rgb2uyvy(rgbdata[i+2],rgbdata[i+1],rgbdata[i],rgbdata[i+z],rgbdata[i+y],rgbdata[i+x],u++);
     }
   }
 }
@@ -2191,7 +2183,7 @@
 void *convert_bgr_to_uyvy_frame_thread(void *data) {
   lives_cc_params *ccparams=(lives_cc_params *)data;
   convert_bgr_to_uyvy_frame((uint8_t *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->irowstrides[0],
-			    (uyvy_macropixel *)ccparams->dest,ccparams->in_alpha,ccparams->out_clamped,ccparams->thread_id);
+                            (uyvy_macropixel *)ccparams->dest,ccparams->in_alpha,ccparams->out_clamped,ccparams->thread_id);
   return NULL;
 }
 
@@ -2199,8 +2191,8 @@
 
 
 
-static void convert_bgr_to_yuyv_frame(uint8_t *rgbdata, int hsize, int vsize, int rowstride, 
-				      yuyv_macropixel *u, boolean has_alpha, boolean clamped, int thread_id) {
+static void convert_bgr_to_yuyv_frame(uint8_t *rgbdata, int hsize, int vsize, int rowstride,
+                                      yuyv_macropixel *u, boolean has_alpha, boolean clamped, int thread_id) {
   // for odd sized widths, cut the rightmost pixel
   int hs3,ipsize=3,ipsize2;
 
@@ -2209,47 +2201,47 @@
 
   int x=3,y=4,z=5;
 
-  if (G_UNLIKELY(!conv_RY_inited)) init_RGB_to_YUV_tables();
+  if (LIVES_UNLIKELY(!conv_RY_inited)) init_RGB_to_YUV_tables();
 
   if (thread_id==-1&&prefs->nfx_threads>1) {
     int nthreads=0;
     boolean useme=FALSE;
     int dheight;
-    lives_cc_params *ccparams=(lives_cc_params *)g_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
+    lives_cc_params *ccparams=(lives_cc_params *)lives_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
 
     dheight=CEIL((double)vsize/(double)prefs->nfx_threads,4);
-    for (i=0;i<prefs->nfx_threads;i++) {
+    for (i=0; i<prefs->nfx_threads; i++) {
       if ((rgbdata+dheight*i*rowstride)<end) {
 
-	ccparams[i].src=rgbdata+dheight*i*rowstride;
-	ccparams[i].hsize=hsize;
-	ccparams[i].dest=u+dheight*i*(hsize>>1);
-
-	if (dheight*(i+1)>(vsize-4)) {
-	  dheight=vsize-(dheight*i);
-	  useme=TRUE;
-	}
-	if (dheight<4) break;
-
-	ccparams[i].vsize=dheight;
-
-	ccparams[i].irowstrides[0]=rowstride;
-	ccparams[i].in_alpha=has_alpha;
-	ccparams[i].out_clamped=clamped;
-	ccparams[i].thread_id=i;
-	
-	if (useme) convert_bgr_to_yuyv_frame_thread(&ccparams[i]);
-	else {
-	  pthread_create(&cthreads[i],NULL,convert_bgr_to_yuyv_frame_thread,&ccparams[i]);
-	  nthreads++;
-	}
+        ccparams[i].src=rgbdata+dheight*i*rowstride;
+        ccparams[i].hsize=hsize;
+        ccparams[i].dest=u+dheight*i*(hsize>>1);
+
+        if (dheight*(i+1)>(vsize-4)) {
+          dheight=vsize-(dheight*i);
+          useme=TRUE;
+        }
+        if (dheight<4) break;
+
+        ccparams[i].vsize=dheight;
+
+        ccparams[i].irowstrides[0]=rowstride;
+        ccparams[i].in_alpha=has_alpha;
+        ccparams[i].out_clamped=clamped;
+        ccparams[i].thread_id=i;
+
+        if (useme) convert_bgr_to_yuyv_frame_thread(&ccparams[i]);
+        else {
+          pthread_create(&cthreads[i],NULL,convert_bgr_to_yuyv_frame_thread,&ccparams[i]);
+          nthreads++;
+        }
       }
     }
 
-    for (i=0;i<nthreads;i++) {
+    for (i=0; i<nthreads; i++) {
       pthread_join(cthreads[i],NULL);
     }
-    g_free(ccparams);
+    lives_free(ccparams);
     return;
   }
 
@@ -2265,10 +2257,10 @@
   ipsize2=ipsize*2;
   hs3=((hsize>>1)*ipsize2)-(ipsize2-1);
 
-  for (;rgbdata<end;rgbdata+=rowstride) {
-    for (i=0;i<hs3;i+=ipsize2) {
+  for (; rgbdata<end; rgbdata+=rowstride) {
+    for (i=0; i<hs3; i+=ipsize2) {
       // convert 6 RGBRGB bytes to 4 UYVY bytes
-      rgb2yuyv (rgbdata[i+2],rgbdata[i+1],rgbdata[i],rgbdata[i+z],rgbdata[i+y],rgbdata[i+x],u++);
+      rgb2yuyv(rgbdata[i+2],rgbdata[i+1],rgbdata[i],rgbdata[i+z],rgbdata[i+y],rgbdata[i+x],u++);
     }
   }
 }
@@ -2277,21 +2269,21 @@
 void *convert_bgr_to_yuyv_frame_thread(void *data) {
   lives_cc_params *ccparams=(lives_cc_params *)data;
   convert_bgr_to_yuyv_frame((uint8_t *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->irowstrides[0],
-			    (yuyv_macropixel *)ccparams->dest,ccparams->in_alpha,ccparams->out_clamped,ccparams->thread_id);
+                            (yuyv_macropixel *)ccparams->dest,ccparams->in_alpha,ccparams->out_clamped,ccparams->thread_id);
   return NULL;
 }
 
 
 
 
-static void convert_argb_to_uyvy_frame(uint8_t *rgbdata, int hsize, int vsize, int rowstride, 
-				       uyvy_macropixel *u, boolean clamped, int thread_id) {
+static void convert_argb_to_uyvy_frame(uint8_t *rgbdata, int hsize, int vsize, int rowstride,
+                                       uyvy_macropixel *u, boolean clamped, int thread_id) {
   // for odd sized widths, cut the rightmost pixel
   int hs3,ipsize=4,ipsize2;
   uint8_t *end;
   register int i;
 
-  if (G_UNLIKELY(!conv_RY_inited)) init_RGB_to_YUV_tables();
+  if (LIVES_UNLIKELY(!conv_RY_inited)) init_RGB_to_YUV_tables();
 
   end=rgbdata+(rowstride*vsize)-5;
 
@@ -2299,41 +2291,41 @@
     int nthreads=0;
     int dheight;
     boolean useme=FALSE;
-    lives_cc_params *ccparams=(lives_cc_params *)g_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
+    lives_cc_params *ccparams=(lives_cc_params *)lives_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
 
     dheight=CEIL((double)vsize/(double)prefs->nfx_threads,4);
-    for (i=0;i<prefs->nfx_threads;i++) {
+    for (i=0; i<prefs->nfx_threads; i++) {
       if ((rgbdata+dheight*i*rowstride)<end) {
 
-	ccparams[i].src=rgbdata+dheight*i*rowstride;
-	ccparams[i].hsize=hsize;
-	ccparams[i].dest=u+dheight*i*(hsize>>1);
+        ccparams[i].src=rgbdata+dheight*i*rowstride;
+        ccparams[i].hsize=hsize;
+        ccparams[i].dest=u+dheight*i*(hsize>>1);
+
+        if (dheight*(i+1)>(vsize-4)) {
+          dheight=vsize-(dheight*i);
+          useme=TRUE;
+        }
 
-	if (dheight*(i+1)>(vsize-4)) {
-	  dheight=vsize-(dheight*i);
-	  useme=TRUE;
-	}
+        if (dheight<4) break;
 
-	if (dheight<4) break;
+        ccparams[i].vsize=dheight;
 
-	ccparams[i].vsize=dheight;
+        ccparams[i].irowstrides[0]=rowstride;
+        ccparams[i].out_clamped=clamped;
+        ccparams[i].thread_id=i;
 
-	ccparams[i].irowstrides[0]=rowstride;
-	ccparams[i].out_clamped=clamped;
-	ccparams[i].thread_id=i;
-	
-	if (useme) convert_argb_to_uyvy_frame_thread(&ccparams[i]);
-	else {
-	  pthread_create(&cthreads[i],NULL,convert_argb_to_uyvy_frame_thread,&ccparams[i]);
-	  nthreads++;
-	}
+        if (useme) convert_argb_to_uyvy_frame_thread(&ccparams[i]);
+        else {
+          pthread_create(&cthreads[i],NULL,convert_argb_to_uyvy_frame_thread,&ccparams[i]);
+          nthreads++;
+        }
       }
     }
 
-    for (i=0;i<nthreads;i++) {
+    for (i=0; i<nthreads; i++) {
       pthread_join(cthreads[i],NULL);
     }
-    g_free(ccparams);
+    lives_free(ccparams);
     return;
   }
 
@@ -2343,10 +2335,10 @@
   ipsize2=ipsize*2;
   hs3=((hsize>>1)*ipsize2)-(ipsize2-1);
 
-  for (;rgbdata<end;rgbdata+=rowstride) {
-    for (i=0;i<hs3;i+=ipsize2) {
+  for (; rgbdata<end; rgbdata+=rowstride) {
+    for (i=0; i<hs3; i+=ipsize2) {
       // convert 6 RGBRGB bytes to 4 UYVY bytes
-      rgb2uyvy (rgbdata[i+1],rgbdata[i+2],rgbdata[i+3],rgbdata[i+5],rgbdata[i+6],rgbdata[i+7],u++);
+      rgb2uyvy(rgbdata[i+1],rgbdata[i+2],rgbdata[i+3],rgbdata[i+5],rgbdata[i+6],rgbdata[i+7],u++);
     }
   }
 }
@@ -2355,21 +2347,21 @@
 void *convert_argb_to_uyvy_frame_thread(void *data) {
   lives_cc_params *ccparams=(lives_cc_params *)data;
   convert_argb_to_uyvy_frame((uint8_t *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->irowstrides[0],
-			    (uyvy_macropixel *)ccparams->dest,ccparams->out_clamped,ccparams->thread_id);
+                             (uyvy_macropixel *)ccparams->dest,ccparams->out_clamped,ccparams->thread_id);
   return NULL;
 }
 
 
 
 
-static void convert_argb_to_yuyv_frame(uint8_t *rgbdata, int hsize, int vsize, int rowstride, 
-				       yuyv_macropixel *u, boolean clamped, int thread_id) {
+static void convert_argb_to_yuyv_frame(uint8_t *rgbdata, int hsize, int vsize, int rowstride,
+                                       yuyv_macropixel *u, boolean clamped, int thread_id) {
   // for odd sized widths, cut the rightmost pixel
   int hs3,ipsize=4,ipsize2;
   uint8_t *end;
   register int i;
 
-  if (G_UNLIKELY(!conv_RY_inited)) init_RGB_to_YUV_tables();
+  if (LIVES_UNLIKELY(!conv_RY_inited)) init_RGB_to_YUV_tables();
 
   end=rgbdata+(rowstride*vsize)-5;
 
@@ -2377,41 +2369,41 @@
     int nthreads=0;
     int dheight;
     boolean useme=FALSE;
-    lives_cc_params *ccparams=(lives_cc_params *)g_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
+    lives_cc_params *ccparams=(lives_cc_params *)lives_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
 
     dheight=CEIL((double)vsize/(double)prefs->nfx_threads,4);
-    for (i=0;i<prefs->nfx_threads;i++) {
+    for (i=0; i<prefs->nfx_threads; i++) {
       if ((rgbdata+dheight*i*rowstride)<end) {
 
-	ccparams[i].src=rgbdata+dheight*i*rowstride;
-	ccparams[i].hsize=hsize;
-	ccparams[i].dest=u+dheight*i*(hsize>>1);
+        ccparams[i].src=rgbdata+dheight*i*rowstride;
+        ccparams[i].hsize=hsize;
+        ccparams[i].dest=u+dheight*i*(hsize>>1);
 
-	if (dheight*(i+1)>(vsize-4)) {
-	  dheight=vsize-(dheight*i);
-	  useme=TRUE;
-	}
+        if (dheight*(i+1)>(vsize-4)) {
+          dheight=vsize-(dheight*i);
+          useme=TRUE;
+        }
 
-	if (dheight<4) break;
+        if (dheight<4) break;
 
-	ccparams[i].vsize=dheight;
+        ccparams[i].vsize=dheight;
 
-	ccparams[i].irowstrides[0]=rowstride;
-	ccparams[i].out_clamped=clamped;
-	ccparams[i].thread_id=i;
-	
-	if (useme) convert_argb_to_yuyv_frame_thread(&ccparams[i]);
-	else {
-	  pthread_create(&cthreads[i],NULL,convert_argb_to_yuyv_frame_thread,&ccparams[i]);
-	  nthreads++;
-	}
+        ccparams[i].irowstrides[0]=rowstride;
+        ccparams[i].out_clamped=clamped;
+        ccparams[i].thread_id=i;
+
+        if (useme) convert_argb_to_yuyv_frame_thread(&ccparams[i]);
+        else {
+          pthread_create(&cthreads[i],NULL,convert_argb_to_yuyv_frame_thread,&ccparams[i]);
+          nthreads++;
+        }
       }
     }
 
-    for (i=0;i<nthreads;i++) {
+    for (i=0; i<nthreads; i++) {
       pthread_join(cthreads[i],NULL);
     }
-    g_free(ccparams);
+    lives_free(ccparams);
     return;
   }
 
@@ -2421,10 +2413,10 @@
   ipsize2=ipsize*2;
   hs3=((hsize>>1)*ipsize2)-(ipsize2-1);
 
-  for (;rgbdata<end;rgbdata+=rowstride) {
-    for (i=0;i<hs3;i+=ipsize2) {
+  for (; rgbdata<end; rgbdata+=rowstride) {
+    for (i=0; i<hs3; i+=ipsize2) {
       // convert 6 RGBRGB bytes to 4 UYVY bytes
-      rgb2yuyv (rgbdata[i+1],rgbdata[i+2],rgbdata[i+3],rgbdata[i+5],rgbdata[i+6],rgbdata[i+7],u++);
+      rgb2yuyv(rgbdata[i+1],rgbdata[i+2],rgbdata[i+3],rgbdata[i+5],rgbdata[i+6],rgbdata[i+7],u++);
     }
   }
 }
@@ -2433,7 +2425,7 @@
 void *convert_argb_to_yuyv_frame_thread(void *data) {
   lives_cc_params *ccparams=(lives_cc_params *)data;
   convert_argb_to_yuyv_frame((uint8_t *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->irowstrides[0],
-			    (yuyv_macropixel *)ccparams->dest,ccparams->out_clamped,ccparams->thread_id);
+                             (yuyv_macropixel *)ccparams->dest,ccparams->out_clamped,ccparams->thread_id);
   return NULL;
 }
 
@@ -2441,57 +2433,57 @@
 
 
 
-static void convert_rgb_to_yuv_frame(uint8_t *rgbdata, int hsize, int vsize, int rowstride, 
-				     uint8_t *u, boolean in_has_alpha, boolean out_has_alpha, 
-				     boolean clamped, int thread_id) {
+static void convert_rgb_to_yuv_frame(uint8_t *rgbdata, int hsize, int vsize, int rowstride,
+                                     uint8_t *u, boolean in_has_alpha, boolean out_has_alpha,
+                                     boolean clamped, int thread_id) {
   int ipsize=3,opsize=3;
   int iwidth;
   uint8_t *end=rgbdata+(rowstride*vsize);
   register int i;
   uint8_t in_alpha=255;
 
-  if (G_UNLIKELY(!conv_RY_inited)) init_RGB_to_YUV_tables();
+  if (LIVES_UNLIKELY(!conv_RY_inited)) init_RGB_to_YUV_tables();
 
   if (thread_id==-1&&prefs->nfx_threads>1) {
     int nthreads=0;
     int dheight;
     boolean useme=FALSE;
-    lives_cc_params *ccparams=(lives_cc_params *)g_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
+    lives_cc_params *ccparams=(lives_cc_params *)lives_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
 
     dheight=CEIL((double)vsize/(double)prefs->nfx_threads,4);
-    for (i=0;i<prefs->nfx_threads;i++) {
+    for (i=0; i<prefs->nfx_threads; i++) {
       if ((rgbdata+dheight*i*rowstride)<end) {
 
-	ccparams[i].src=rgbdata+dheight*i*rowstride;
-	ccparams[i].hsize=hsize;
-	ccparams[i].dest=u+dheight*i*hsize*opsize;
-
-	if (dheight*(i+1)>(vsize-4)) {
-	  dheight=vsize-(dheight*i);
-	  useme=TRUE;
-	}
-	if (dheight<4) break;
-
-	ccparams[i].vsize=dheight;
-
-	ccparams[i].irowstrides[0]=rowstride;
-	ccparams[i].in_alpha=in_has_alpha;
-	ccparams[i].out_alpha=out_has_alpha;
-	ccparams[i].out_clamped=clamped;
-	ccparams[i].thread_id=i;
-	
-	if (useme) convert_rgb_to_yuv_frame_thread(&ccparams[i]);
-	else {
-	  pthread_create(&cthreads[i],NULL,convert_rgb_to_yuv_frame_thread,&ccparams[i]);
-	  nthreads++;
-	}
+        ccparams[i].src=rgbdata+dheight*i*rowstride;
+        ccparams[i].hsize=hsize;
+        ccparams[i].dest=u+dheight*i*hsize*opsize;
+
+        if (dheight*(i+1)>(vsize-4)) {
+          dheight=vsize-(dheight*i);
+          useme=TRUE;
+        }
+        if (dheight<4) break;
+
+        ccparams[i].vsize=dheight;
+
+        ccparams[i].irowstrides[0]=rowstride;
+        ccparams[i].in_alpha=in_has_alpha;
+        ccparams[i].out_alpha=out_has_alpha;
+        ccparams[i].out_clamped=clamped;
+        ccparams[i].thread_id=i;
+
+        if (useme) convert_rgb_to_yuv_frame_thread(&ccparams[i]);
+        else {
+          pthread_create(&cthreads[i],NULL,convert_rgb_to_yuv_frame_thread,&ccparams[i]);
+          nthreads++;
+        }
       }
     }
 
-    for (i=0;i<nthreads;i++) {
+    for (i=0; i<nthreads; i++) {
       pthread_join(cthreads[i],NULL);
     }
-    g_free(ccparams);
+    lives_free(ccparams);
     return;
   }
 
@@ -2504,11 +2496,11 @@
   hsize=(hsize>>1)<<1;
   iwidth=hsize*ipsize;
 
-  for (;rgbdata<end;rgbdata+=rowstride) {
-    for (i=0;i<iwidth;i+=ipsize) {
+  for (; rgbdata<end; rgbdata+=rowstride) {
+    for (i=0; i<iwidth; i+=ipsize) {
       if (in_has_alpha) in_alpha=rgbdata[i+3];
       if (out_has_alpha) u[3]=in_alpha;
-      rgb2yuv (rgbdata[i],rgbdata[i+1],rgbdata[i+2],&(u[0]),&(u[1]),&(u[2]));
+      rgb2yuv(rgbdata[i],rgbdata[i+1],rgbdata[i+2],&(u[0]),&(u[1]),&(u[2]));
       u+=opsize;
     }
   }
@@ -2517,14 +2509,14 @@
 void *convert_rgb_to_yuv_frame_thread(void *data) {
   lives_cc_params *ccparams=(lives_cc_params *)data;
   convert_rgb_to_yuv_frame((uint8_t *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->irowstrides[0],
-			   (uint8_t *)ccparams->dest,ccparams->in_alpha,ccparams->out_alpha,ccparams->out_clamped,ccparams->thread_id);
+                           (uint8_t *)ccparams->dest,ccparams->in_alpha,ccparams->out_alpha,ccparams->out_clamped,ccparams->thread_id);
   return NULL;
 }
 
 
-static void convert_rgb_to_yuvp_frame(uint8_t *rgbdata, int hsize, int vsize, int rowstride, 
-				      uint8_t **yuvp, boolean in_has_alpha, boolean out_has_alpha, boolean clamped,
-				      int thread_id) {
+static void convert_rgb_to_yuvp_frame(uint8_t *rgbdata, int hsize, int vsize, int rowstride,
+                                      uint8_t **yuvp, boolean in_has_alpha, boolean out_has_alpha, boolean clamped,
+                                      int thread_id) {
   int ipsize=3;
   int iwidth;
   uint8_t *end=rgbdata+(rowstride*vsize);
@@ -2533,7 +2525,7 @@
 
   uint8_t *y,*u,*v;
 
-  if (G_UNLIKELY(!conv_RY_inited)) init_RGB_to_YUV_tables();
+  if (LIVES_UNLIKELY(!conv_RY_inited)) init_RGB_to_YUV_tables();
 
   y=yuvp[0];
   u=yuvp[1];
@@ -2544,46 +2536,46 @@
     int nthreads=0;
     int dheight;
     boolean useme=FALSE;
-    lives_cc_params *ccparams=(lives_cc_params *)g_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
+    lives_cc_params *ccparams=(lives_cc_params *)lives_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
 
     dheight=CEIL((double)vsize/(double)prefs->nfx_threads,4);
-    for (i=0;i<prefs->nfx_threads;i++) {
+    for (i=0; i<prefs->nfx_threads; i++) {
       if ((rgbdata+dheight*i*rowstride)<end) {
 
-	ccparams[i].src=rgbdata+dheight*i*rowstride;
-	ccparams[i].hsize=hsize;
+        ccparams[i].src=rgbdata+dheight*i*rowstride;
+        ccparams[i].hsize=hsize;
+
+        ccparams[i].destp[0]=y+dheight*i*hsize;
+        ccparams[i].destp[1]=u+dheight*i*hsize;
+        ccparams[i].destp[2]=v+dheight*i*hsize;
+        if (out_has_alpha) ccparams[i].destp[3]=a+dheight*i*hsize;
+
+        if (dheight*(i+1)>(vsize-4)) {
+          dheight=vsize-(dheight*i);
+          useme=TRUE;
+        }
+        if (dheight<4) break;
 
-	ccparams[i].destp[0]=y+dheight*i*hsize;
-	ccparams[i].destp[1]=u+dheight*i*hsize;
-	ccparams[i].destp[2]=v+dheight*i*hsize;
-	if (out_has_alpha) ccparams[i].destp[3]=a+dheight*i*hsize;
-
-	if (dheight*(i+1)>(vsize-4)) {
-	  dheight=vsize-(dheight*i);
-	  useme=TRUE;
-	}
-	if (dheight<4) break;
-
-	ccparams[i].vsize=dheight;
-
-	ccparams[i].irowstrides[0]=rowstride;
-	ccparams[i].in_alpha=in_has_alpha;
-	ccparams[i].out_alpha=out_has_alpha;
-	ccparams[i].out_clamped=clamped;
-	ccparams[i].thread_id=i;
-	
-	if (useme) convert_rgb_to_yuvp_frame_thread(&ccparams[i]);
-	else {
-	  pthread_create(&cthreads[i],NULL,convert_rgb_to_yuvp_frame_thread,&ccparams[i]);
-	  nthreads++;
-	}
+        ccparams[i].vsize=dheight;
+
+        ccparams[i].irowstrides[0]=rowstride;
+        ccparams[i].in_alpha=in_has_alpha;
+        ccparams[i].out_alpha=out_has_alpha;
+        ccparams[i].out_clamped=clamped;
+        ccparams[i].thread_id=i;
+
+        if (useme) convert_rgb_to_yuvp_frame_thread(&ccparams[i]);
+        else {
+          pthread_create(&cthreads[i],NULL,convert_rgb_to_yuvp_frame_thread,&ccparams[i]);
+          nthreads++;
+        }
       }
     }
 
-    for (i=0;i<nthreads;i++) {
+    for (i=0; i<nthreads; i++) {
       pthread_join(cthreads[i],NULL);
     }
-    g_free(ccparams);
+    lives_free(ccparams);
     return;
   }
 
@@ -2594,11 +2586,11 @@
   hsize=(hsize>>1)<<1;
   iwidth=hsize*ipsize;
 
-  for (;rgbdata<end;rgbdata+=rowstride) {
-    for (i=0;i<iwidth;i+=ipsize) {
+  for (; rgbdata<end; rgbdata+=rowstride) {
+    for (i=0; i<iwidth; i+=ipsize) {
       if (in_has_alpha) in_alpha=rgbdata[i+3];
       if (out_has_alpha) *(a++)=in_alpha;
-      rgb2yuv (rgbdata[i],rgbdata[i+1],rgbdata[i+2],y,u,v);
+      rgb2yuv(rgbdata[i],rgbdata[i+1],rgbdata[i+2],y,u,v);
       y++;
       u++;
       v++;
@@ -2610,64 +2602,64 @@
 void *convert_rgb_to_yuvp_frame_thread(void *data) {
   lives_cc_params *ccparams=(lives_cc_params *)data;
   convert_rgb_to_yuvp_frame((uint8_t *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->irowstrides[0],
-			    (uint8_t **)ccparams->destp,ccparams->in_alpha,ccparams->out_alpha,ccparams->out_clamped,
-			    ccparams->thread_id);
+                            (uint8_t **)ccparams->destp,ccparams->in_alpha,ccparams->out_alpha,ccparams->out_clamped,
+                            ccparams->thread_id);
   return NULL;
 }
 
 
 
-static void convert_bgr_to_yuv_frame(uint8_t *rgbdata, int hsize, int vsize, int rowstride, 
-				     uint8_t *u, boolean in_has_alpha, boolean out_has_alpha, 
-				     boolean clamped, int thread_id) {
+static void convert_bgr_to_yuv_frame(uint8_t *rgbdata, int hsize, int vsize, int rowstride,
+                                     uint8_t *u, boolean in_has_alpha, boolean out_has_alpha,
+                                     boolean clamped, int thread_id) {
   int ipsize=3,opsize=3;
   int iwidth;
   uint8_t *end=rgbdata+(rowstride*vsize);
   register int i;
   uint8_t in_alpha=255;
 
-  if (G_UNLIKELY(!conv_RY_inited)) init_RGB_to_YUV_tables();
+  if (LIVES_UNLIKELY(!conv_RY_inited)) init_RGB_to_YUV_tables();
 
   if (thread_id==-1&&prefs->nfx_threads>1) {
     int nthreads=0;
     int dheight;
     boolean useme=FALSE;
-    lives_cc_params *ccparams=(lives_cc_params *)g_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
+    lives_cc_params *ccparams=(lives_cc_params *)lives_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
 
     dheight=CEIL((double)vsize/(double)prefs->nfx_threads,4);
-    for (i=0;i<prefs->nfx_threads;i++) {
+    for (i=0; i<prefs->nfx_threads; i++) {
       if ((rgbdata+dheight*i*rowstride)<end) {
 
-	ccparams[i].src=rgbdata+dheight*i*rowstride;
-	ccparams[i].hsize=hsize;
-	ccparams[i].dest=u+dheight*i*hsize*opsize;
-
-	if (dheight*(i+1)>(vsize-4)) {
-	  dheight=vsize-(dheight*i);
-	  useme=TRUE;
-	}
-	if (dheight<4) break;
-
-	ccparams[i].vsize=dheight;
-
-	ccparams[i].irowstrides[0]=rowstride;
-	ccparams[i].in_alpha=in_has_alpha;
-	ccparams[i].out_alpha=out_has_alpha;
-	ccparams[i].out_clamped=clamped;
-	ccparams[i].thread_id=i;
-	
-	if (useme) convert_bgr_to_yuv_frame_thread(&ccparams[i]);
-	else {
-	  pthread_create(&cthreads[i],NULL,convert_bgr_to_yuv_frame_thread,&ccparams[i]);
-	  nthreads++;
-	}
+        ccparams[i].src=rgbdata+dheight*i*rowstride;
+        ccparams[i].hsize=hsize;
+        ccparams[i].dest=u+dheight*i*hsize*opsize;
+
+        if (dheight*(i+1)>(vsize-4)) {
+          dheight=vsize-(dheight*i);
+          useme=TRUE;
+        }
+        if (dheight<4) break;
+
+        ccparams[i].vsize=dheight;
+
+        ccparams[i].irowstrides[0]=rowstride;
+        ccparams[i].in_alpha=in_has_alpha;
+        ccparams[i].out_alpha=out_has_alpha;
+        ccparams[i].out_clamped=clamped;
+        ccparams[i].thread_id=i;
+
+        if (useme) convert_bgr_to_yuv_frame_thread(&ccparams[i]);
+        else {
+          pthread_create(&cthreads[i],NULL,convert_bgr_to_yuv_frame_thread,&ccparams[i]);
+          nthreads++;
+        }
       }
     }
 
-    for (i=0;i<nthreads;i++) {
+    for (i=0; i<nthreads; i++) {
       pthread_join(cthreads[i],NULL);
     }
-    g_free(ccparams);
+    lives_free(ccparams);
     return;
   }
 
@@ -2680,11 +2672,11 @@
   hsize=(hsize>>1)<<1;
   iwidth=hsize*ipsize;
 
-  for (;rgbdata<end;rgbdata+=rowstride) {
-    for (i=0;i<iwidth;i+=ipsize) {
+  for (; rgbdata<end; rgbdata+=rowstride) {
+    for (i=0; i<iwidth; i+=ipsize) {
       if (in_has_alpha) in_alpha=rgbdata[i+3];
       if (out_has_alpha) u[3]=in_alpha;
-      rgb2yuv (rgbdata[i+2],rgbdata[i+1],rgbdata[i],&(u[0]),&(u[1]),&(u[2]));
+      rgb2yuv(rgbdata[i+2],rgbdata[i+1],rgbdata[i],&(u[0]),&(u[1]),&(u[2]));
       u+=opsize;
     }
   }
@@ -2693,15 +2685,15 @@
 void *convert_bgr_to_yuv_frame_thread(void *data) {
   lives_cc_params *ccparams=(lives_cc_params *)data;
   convert_bgr_to_yuv_frame((uint8_t *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->irowstrides[0],
-			   (uint8_t *)ccparams->dest,ccparams->in_alpha,ccparams->out_alpha,ccparams->out_clamped,ccparams->thread_id);
+                           (uint8_t *)ccparams->dest,ccparams->in_alpha,ccparams->out_alpha,ccparams->out_clamped,ccparams->thread_id);
   return NULL;
 }
 
 
 
-static void convert_bgr_to_yuvp_frame(uint8_t *rgbdata, int hsize, int vsize, int rowstride, 
-				      uint8_t **yuvp, boolean in_has_alpha, boolean out_has_alpha, boolean clamped,
-				      int thread_id) {
+static void convert_bgr_to_yuvp_frame(uint8_t *rgbdata, int hsize, int vsize, int rowstride,
+                                      uint8_t **yuvp, boolean in_has_alpha, boolean out_has_alpha, boolean clamped,
+                                      int thread_id) {
 
   // TESTED !
 
@@ -2713,7 +2705,7 @@
 
   uint8_t *y,*u,*v;
 
-  if (G_UNLIKELY(!conv_RY_inited)) init_RGB_to_YUV_tables();
+  if (LIVES_UNLIKELY(!conv_RY_inited)) init_RGB_to_YUV_tables();
 
   y=yuvp[0];
   u=yuvp[1];
@@ -2724,46 +2716,46 @@
     int nthreads=0;
     int dheight;
     boolean useme=FALSE;
-    lives_cc_params *ccparams=(lives_cc_params *)g_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
+    lives_cc_params *ccparams=(lives_cc_params *)lives_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
 
     dheight=CEIL((double)vsize/(double)prefs->nfx_threads,4);
-    for (i=0;i<prefs->nfx_threads;i++) {
+    for (i=0; i<prefs->nfx_threads; i++) {
       if ((rgbdata+dheight*i*rowstride)<end) {
 
-	ccparams[i].src=rgbdata+dheight*i*rowstride;
-	ccparams[i].hsize=hsize;
+        ccparams[i].src=rgbdata+dheight*i*rowstride;
+        ccparams[i].hsize=hsize;
+
+        ccparams[i].destp[0]=y+dheight*i*hsize;
+        ccparams[i].destp[1]=u+dheight*i*hsize;
+        ccparams[i].destp[2]=v+dheight*i*hsize;
+        if (out_has_alpha) ccparams[i].destp[3]=a+dheight*i*hsize;
+
+        if (dheight*(i+1)>(vsize-4)) {
+          dheight=vsize-(dheight*i);
+          useme=TRUE;
+        }
+        if (dheight<4) break;
+
+        ccparams[i].vsize=dheight;
 
-	ccparams[i].destp[0]=y+dheight*i*hsize;
-	ccparams[i].destp[1]=u+dheight*i*hsize;
-	ccparams[i].destp[2]=v+dheight*i*hsize;
-	if (out_has_alpha) ccparams[i].destp[3]=a+dheight*i*hsize;
-
-	if (dheight*(i+1)>(vsize-4)) {
-	  dheight=vsize-(dheight*i);
-	  useme=TRUE;
-	}
-	if (dheight<4) break;
-
-	ccparams[i].vsize=dheight;
-
-	ccparams[i].irowstrides[0]=rowstride;
-	ccparams[i].in_alpha=in_has_alpha;
-	ccparams[i].out_alpha=out_has_alpha;
-	ccparams[i].out_clamped=clamped;
-	ccparams[i].thread_id=i;
-	
-	if (useme) convert_bgr_to_yuvp_frame_thread(&ccparams[i]);
-	else {
-	  pthread_create(&cthreads[i],NULL,convert_bgr_to_yuvp_frame_thread,&ccparams[i]);
-	  nthreads++;
-	}
+        ccparams[i].irowstrides[0]=rowstride;
+        ccparams[i].in_alpha=in_has_alpha;
+        ccparams[i].out_alpha=out_has_alpha;
+        ccparams[i].out_clamped=clamped;
+        ccparams[i].thread_id=i;
+
+        if (useme) convert_bgr_to_yuvp_frame_thread(&ccparams[i]);
+        else {
+          pthread_create(&cthreads[i],NULL,convert_bgr_to_yuvp_frame_thread,&ccparams[i]);
+          nthreads++;
+        }
       }
     }
 
-    for (i=0;i<nthreads;i++) {
+    for (i=0; i<nthreads; i++) {
       pthread_join(cthreads[i],NULL);
     }
-    g_free(ccparams);
+    lives_free(ccparams);
     return;
   }
 
@@ -2774,11 +2766,11 @@
   hsize=(hsize>>1)<<1;
   iwidth=hsize*ipsize;
 
-  for (;rgbdata<end;rgbdata+=rowstride) {
-    for (i=0;i<iwidth;i+=ipsize) {
+  for (; rgbdata<end; rgbdata+=rowstride) {
+    for (i=0; i<iwidth; i+=ipsize) {
       if (in_has_alpha) in_alpha=rgbdata[i+3];
       if (out_has_alpha) *(a++)=in_alpha;
-      rgb2yuv (rgbdata[i+2],rgbdata[i+1],rgbdata[i],&(y[0]),&(u[0]),&(v[0]));
+      rgb2yuv(rgbdata[i+2],rgbdata[i+1],rgbdata[i],&(y[0]),&(u[0]),&(v[0]));
       y++;
       u++;
       v++;
@@ -2790,64 +2782,64 @@
 void *convert_bgr_to_yuvp_frame_thread(void *data) {
   lives_cc_params *ccparams=(lives_cc_params *)data;
   convert_bgr_to_yuvp_frame((uint8_t *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->irowstrides[0],
-			    (uint8_t **)ccparams->destp,ccparams->in_alpha,ccparams->out_alpha,ccparams->out_clamped,
-			    ccparams->thread_id);
+                            (uint8_t **)ccparams->destp,ccparams->in_alpha,ccparams->out_alpha,ccparams->out_clamped,
+                            ccparams->thread_id);
   return NULL;
 }
 
 
 
 
-static void convert_argb_to_yuv_frame(uint8_t *rgbdata, int hsize, int vsize, int rowstride, 
-				      uint8_t *u, boolean out_has_alpha, 
-				      boolean clamped, int thread_id) {
+static void convert_argb_to_yuv_frame(uint8_t *rgbdata, int hsize, int vsize, int rowstride,
+                                      uint8_t *u, boolean out_has_alpha,
+                                      boolean clamped, int thread_id) {
   int ipsize=4,opsize=3;
   int iwidth;
   uint8_t *end=rgbdata+(rowstride*vsize);
   register int i;
 
-  if (G_UNLIKELY(!conv_RY_inited)) init_RGB_to_YUV_tables();
+  if (LIVES_UNLIKELY(!conv_RY_inited)) init_RGB_to_YUV_tables();
 
   if (thread_id==-1&&prefs->nfx_threads>1) {
     int nthreads=0;
     int dheight;
     boolean useme=FALSE;
-    lives_cc_params *ccparams=(lives_cc_params *)g_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
+    lives_cc_params *ccparams=(lives_cc_params *)lives_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
 
     dheight=CEIL((double)vsize/(double)prefs->nfx_threads,4);
-    for (i=0;i<prefs->nfx_threads;i++) {
+    for (i=0; i<prefs->nfx_threads; i++) {
       if ((rgbdata+dheight*i*rowstride)<end) {
 
-	ccparams[i].src=rgbdata+dheight*i*rowstride;
-	ccparams[i].hsize=hsize;
+        ccparams[i].src=rgbdata+dheight*i*rowstride;
+        ccparams[i].hsize=hsize;
+
+        ccparams[i].dest=u+dheight*i*hsize*opsize;
 
-	ccparams[i].dest=u+dheight*i*hsize*opsize;
+        if (dheight*(i+1)>(vsize-4)) {
+          dheight=vsize-(dheight*i);
+          useme=TRUE;
+        }
+        if (dheight<4) break;
 
-	if (dheight*(i+1)>(vsize-4)) {
-	  dheight=vsize-(dheight*i);
-	  useme=TRUE;
-	}
-	if (dheight<4) break;
+        ccparams[i].vsize=dheight;
 
-	ccparams[i].vsize=dheight;
+        ccparams[i].irowstrides[0]=rowstride;
+        ccparams[i].out_alpha=out_has_alpha;
+        ccparams[i].out_clamped=clamped;
+        ccparams[i].thread_id=i;
 
-	ccparams[i].irowstrides[0]=rowstride;
-	ccparams[i].out_alpha=out_has_alpha;
-	ccparams[i].out_clamped=clamped;
-	ccparams[i].thread_id=i;
-	
-	if (useme) convert_rgb_to_yuv_frame_thread(&ccparams[i]);
-	else {
-	  pthread_create(&cthreads[i],NULL,convert_rgb_to_yuv_frame_thread,&ccparams[i]);
-	  nthreads++;
-	}
+        if (useme) convert_rgb_to_yuv_frame_thread(&ccparams[i]);
+        else {
+          pthread_create(&cthreads[i],NULL,convert_rgb_to_yuv_frame_thread,&ccparams[i]);
+          nthreads++;
+        }
       }
     }
 
-    for (i=0;i<nthreads;i++) {
+    for (i=0; i<nthreads; i++) {
       pthread_join(cthreads[i],NULL);
     }
-    g_free(ccparams);
+    lives_free(ccparams);
     return;
   }
 
@@ -2858,10 +2850,10 @@
   hsize=(hsize>>1)<<1;
   iwidth=hsize*ipsize;
 
-  for (;rgbdata<end;rgbdata+=rowstride) {
-    for (i=0;i<iwidth;i+=ipsize) {
+  for (; rgbdata<end; rgbdata+=rowstride) {
+    for (i=0; i<iwidth; i+=ipsize) {
       if (out_has_alpha) u[3]=rgbdata[i];
-      rgb2yuv (rgbdata[i+1],rgbdata[i+2],rgbdata[i+3],&(u[0]),&(u[1]),&(u[2]));
+      rgb2yuv(rgbdata[i+1],rgbdata[i+2],rgbdata[i+3],&(u[0]),&(u[1]),&(u[2]));
       u+=opsize;
     }
   }
@@ -2870,14 +2862,14 @@
 void *convert_argb_to_yuv_frame_thread(void *data) {
   lives_cc_params *ccparams=(lives_cc_params *)data;
   convert_argb_to_yuv_frame((uint8_t *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->irowstrides[0],
-			   (uint8_t *)ccparams->dest,ccparams->out_alpha,ccparams->out_clamped,ccparams->thread_id);
+                            (uint8_t *)ccparams->dest,ccparams->out_alpha,ccparams->out_clamped,ccparams->thread_id);
   return NULL;
 }
 
 
-static void convert_argb_to_yuvp_frame(uint8_t *rgbdata, int hsize, int vsize, int rowstride, 
-				       uint8_t **yuvp, boolean out_has_alpha, boolean clamped,
-				       int thread_id) {
+static void convert_argb_to_yuvp_frame(uint8_t *rgbdata, int hsize, int vsize, int rowstride,
+                                       uint8_t **yuvp, boolean out_has_alpha, boolean clamped,
+                                       int thread_id) {
   int ipsize=4;
   int iwidth;
   uint8_t *end=rgbdata+(rowstride*vsize);
@@ -2885,7 +2877,7 @@
   uint8_t *a=NULL;
   uint8_t *y,*u,*v;
 
-  if (G_UNLIKELY(!conv_RY_inited)) init_RGB_to_YUV_tables();
+  if (LIVES_UNLIKELY(!conv_RY_inited)) init_RGB_to_YUV_tables();
 
   y=yuvp[0];
   u=yuvp[1];
@@ -2896,45 +2888,45 @@
     int nthreads=0;
     int dheight;
     boolean useme=FALSE;
-    lives_cc_params *ccparams=(lives_cc_params *)g_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
+    lives_cc_params *ccparams=(lives_cc_params *)lives_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
 
     dheight=CEIL((double)vsize/(double)prefs->nfx_threads,4);
-    for (i=0;i<prefs->nfx_threads;i++) {
+    for (i=0; i<prefs->nfx_threads; i++) {
       if ((rgbdata+dheight*i*rowstride)<end) {
 
-	ccparams[i].src=rgbdata+dheight*i*rowstride;
-	ccparams[i].hsize=hsize;
+        ccparams[i].src=rgbdata+dheight*i*rowstride;
+        ccparams[i].hsize=hsize;
+
+        ccparams[i].destp[0]=y+dheight*i*hsize;
+        ccparams[i].destp[1]=u+dheight*i*hsize;
+        ccparams[i].destp[2]=v+dheight*i*hsize;
+        if (out_has_alpha) ccparams[i].destp[3]=a+dheight*i*hsize;
+
+        if (dheight*(i+1)>(vsize-4)) {
+          dheight=vsize-(dheight*i);
+          useme=TRUE;
+        }
+        if (dheight<4) break;
 
-	ccparams[i].destp[0]=y+dheight*i*hsize;
-	ccparams[i].destp[1]=u+dheight*i*hsize;
-	ccparams[i].destp[2]=v+dheight*i*hsize;
-	if (out_has_alpha) ccparams[i].destp[3]=a+dheight*i*hsize;
-
-	if (dheight*(i+1)>(vsize-4)) {
-	  dheight=vsize-(dheight*i);
-	  useme=TRUE;
-	}
-	if (dheight<4) break;
-
-	ccparams[i].vsize=dheight;
-
-	ccparams[i].irowstrides[0]=rowstride;
-	ccparams[i].out_alpha=out_has_alpha;
-	ccparams[i].out_clamped=clamped;
-	ccparams[i].thread_id=i;
-	
-	if (useme) convert_argb_to_yuvp_frame_thread(&ccparams[i]);
-	else {
-	  pthread_create(&cthreads[i],NULL,convert_argb_to_yuvp_frame_thread,&ccparams[i]);
-	  nthreads++;
-	}
+        ccparams[i].vsize=dheight;
+
+        ccparams[i].irowstrides[0]=rowstride;
+        ccparams[i].out_alpha=out_has_alpha;
+        ccparams[i].out_clamped=clamped;
+        ccparams[i].thread_id=i;
+
+        if (useme) convert_argb_to_yuvp_frame_thread(&ccparams[i]);
+        else {
+          pthread_create(&cthreads[i],NULL,convert_argb_to_yuvp_frame_thread,&ccparams[i]);
+          nthreads++;
+        }
       }
     }
 
-    for (i=0;i<nthreads;i++) {
+    for (i=0; i<nthreads; i++) {
       pthread_join(cthreads[i],NULL);
     }
-    g_free(ccparams);
+    lives_free(ccparams);
     return;
   }
 
@@ -2945,10 +2937,10 @@
   hsize=(hsize>>1)<<1;
   iwidth=hsize*ipsize;
 
-  for (;rgbdata<end;rgbdata+=rowstride) {
-    for (i=0;i<iwidth;i+=ipsize) {
+  for (; rgbdata<end; rgbdata+=rowstride) {
+    for (i=0; i<iwidth; i+=ipsize) {
       if (out_has_alpha) *(a++)=rgbdata[i];
-      rgb2yuv (rgbdata[i+1],rgbdata[i+2],rgbdata[i+3],y,u,v);
+      rgb2yuv(rgbdata[i+1],rgbdata[i+2],rgbdata[i+3],y,u,v);
       y++;
       u++;
       v++;
@@ -2960,8 +2952,8 @@
 void *convert_argb_to_yuvp_frame_thread(void *data) {
   lives_cc_params *ccparams=(lives_cc_params *)data;
   convert_argb_to_yuvp_frame((uint8_t *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->irowstrides[0],
-			     (uint8_t **)ccparams->destp,ccparams->out_alpha,ccparams->out_clamped,
-			     ccparams->thread_id);
+                             (uint8_t **)ccparams->destp,ccparams->out_alpha,ccparams->out_clamped,
+                             ccparams->thread_id);
   return NULL;
 }
 
@@ -2970,8 +2962,8 @@
 
 
 
-static void convert_rgb_to_yuv420_frame(uint8_t *rgbdata, int hsize, int vsize, int rowstride, 
-				 uint8_t **dest, boolean is_422, boolean has_alpha, int samtype, boolean clamped) {
+static void convert_rgb_to_yuv420_frame(uint8_t *rgbdata, int hsize, int vsize, int rowstride,
+                                        uint8_t **dest, boolean is_422, boolean has_alpha, int samtype, boolean clamped) {
   // for odd sized widths, cut the rightmost pixel
   // TODO - handle different out sampling types
   int hs3;
@@ -2984,7 +2976,7 @@
   int ipsize=3,ipsize2;
   size_t hhsize;
 
-  if (G_UNLIKELY(!conv_RY_inited)) init_RGB_to_YUV_tables();
+  if (LIVES_UNLIKELY(!conv_RY_inited)) init_RGB_to_YUV_tables();
 
   set_conversion_arrays(clamped?WEED_YUV_CLAMPING_CLAMPED:WEED_YUV_CLAMPING_UNCLAMPED,WEED_YUV_SUBSPACE_YCBCR);
 
@@ -3002,14 +2994,14 @@
   ipsize2=ipsize*2;
   hs3=(hsize*ipsize)-(ipsize2-1);
 
-  for (i=0;i<vsize;i++) {
-    for (j=0;j<hs3;j+=ipsize2) {
+  for (i=0; i<vsize; i++) {
+    for (j=0; j<hs3; j+=ipsize2) {
       // mpeg style, Cb and Cr are co-located
       // convert 6 RGBRGB bytes to 4 UYVY bytes
 
       // TODO: for mpeg use rgb2yuv and write alternate u and v
 
-      rgb2uyvy (rgbdata[j],rgbdata[j+1],rgbdata[j+2],rgbdata[j+ipsize],rgbdata[j+ipsize+1],rgbdata[j+ipsize+2],&u);
+      rgb2uyvy(rgbdata[j],rgbdata[j+1],rgbdata[j+2],rgbdata[j+ipsize],rgbdata[j+ipsize+1],rgbdata[j+ipsize+2],&u);
 
       *(y++)=u.y0;
       *(y++)=u.y1;
@@ -3017,16 +3009,16 @@
       *(Cr++)=u.v0;
 
       if (!is_422&&chroma_row&&i>0) {
-	// average two rows
-	Cb[-1-hhsize]=avg_chroma(Cb[-1],Cb[-1-hhsize]);
-	Cr[-1-hhsize]=avg_chroma(Cr[-1],Cr[-1-hhsize]);
+        // average two rows
+        Cb[-1-hhsize]=avg_chroma(Cb[-1],Cb[-1-hhsize]);
+        Cr[-1-hhsize]=avg_chroma(Cr[-1],Cr[-1-hhsize]);
       }
 
     }
     if (!is_422) {
       if (chroma_row) {
-	Cb-=hhsize;
-	Cr-=hhsize;
+        Cb-=hhsize;
+        Cr-=hhsize;
       }
       chroma_row=!chroma_row;
     }
@@ -3036,8 +3028,8 @@
 
 
 
-static void convert_argb_to_yuv420_frame(uint8_t *rgbdata, int hsize, int vsize, int rowstride, 
-				  uint8_t **dest, boolean is_422, int samtype, boolean clamped) {
+static void convert_argb_to_yuv420_frame(uint8_t *rgbdata, int hsize, int vsize, int rowstride,
+    uint8_t **dest, boolean is_422, int samtype, boolean clamped) {
   // for odd sized widths, cut the rightmost pixel
   // TODO - handle different out sampling types
   int hs3;
@@ -3050,7 +3042,7 @@
   int ipsize=4,ipsize2;
   size_t hhsize;
 
-  if (G_UNLIKELY(!conv_RY_inited)) init_RGB_to_YUV_tables();
+  if (LIVES_UNLIKELY(!conv_RY_inited)) init_RGB_to_YUV_tables();
 
   set_conversion_arrays(clamped?WEED_YUV_CLAMPING_CLAMPED:WEED_YUV_CLAMPING_UNCLAMPED,WEED_YUV_SUBSPACE_YCBCR);
 
@@ -3066,14 +3058,14 @@
   ipsize2=ipsize*2;
   hs3=(hsize*ipsize)-(ipsize2-1);
 
-  for (i=0;i<vsize;i++) {
-    for (j=0;j<hs3;j+=ipsize2) {
+  for (i=0; i<vsize; i++) {
+    for (j=0; j<hs3; j+=ipsize2) {
       // mpeg style, Cb and Cr are co-located
       // convert 6 RGBRGB bytes to 4 UYVY bytes
 
       // TODO: for mpeg use rgb2yuv and write alternate u and v
 
-      rgb2uyvy (rgbdata[j+1],rgbdata[j+2],rgbdata[j+3],rgbdata[j+1+ipsize],rgbdata[j+2+ipsize+1],rgbdata[j+3+ipsize+2],&u);
+      rgb2uyvy(rgbdata[j+1],rgbdata[j+2],rgbdata[j+3],rgbdata[j+1+ipsize],rgbdata[j+2+ipsize+1],rgbdata[j+3+ipsize+2],&u);
 
       *(y++)=u.y0;
       *(y++)=u.y1;
@@ -3081,16 +3073,16 @@
       *(Cr++)=u.v0;
 
       if (!is_422&&chroma_row&&i>0) {
-	// average two rows
-	Cb[-1-hhsize]=avg_chroma(Cb[-1],Cb[-1-hhsize]);
-	Cr[-1-hhsize]=avg_chroma(Cr[-1],Cr[-1-hhsize]);
+        // average two rows
+        Cb[-1-hhsize]=avg_chroma(Cb[-1],Cb[-1-hhsize]);
+        Cr[-1-hhsize]=avg_chroma(Cr[-1],Cr[-1-hhsize]);
       }
 
     }
     if (!is_422) {
       if (chroma_row) {
-	Cb-=hhsize;
-	Cr-=hhsize;
+        Cb-=hhsize;
+        Cr-=hhsize;
       }
       chroma_row=!chroma_row;
     }
@@ -3100,8 +3092,8 @@
 
 
 
-static void convert_bgr_to_yuv420_frame(uint8_t *rgbdata, int hsize, int vsize, int rowstride, 
-					uint8_t **dest, boolean is_422, boolean has_alpha, int samtype, boolean clamped) {
+static void convert_bgr_to_yuv420_frame(uint8_t *rgbdata, int hsize, int vsize, int rowstride,
+                                        uint8_t **dest, boolean is_422, boolean has_alpha, int samtype, boolean clamped) {
   // for odd sized widths, cut the rightmost pixel
   // TODO - handle different out sampling types
   int hs3;
@@ -3113,7 +3105,7 @@
   int ipsize=3,ipsize2;
   size_t hhsize;
 
-  if (G_UNLIKELY(!conv_RY_inited)) init_RGB_to_YUV_tables();
+  if (LIVES_UNLIKELY(!conv_RY_inited)) init_RGB_to_YUV_tables();
 
   set_conversion_arrays(clamped?WEED_YUV_CLAMPING_CLAMPED:WEED_YUV_CLAMPING_UNCLAMPED,WEED_YUV_SUBSPACE_YCBCR);
 
@@ -3130,10 +3122,10 @@
   ipsize2=ipsize*2;
   hhsize=hsize>>1;
   hs3=(hsize*ipsize)-(ipsize2-1);
-  for (i=0;i<vsize;i++) {
-    for (j=0;j<hs3;j+=ipsize2) {
+  for (i=0; i<vsize; i++) {
+    for (j=0; j<hs3; j+=ipsize2) {
       // convert 6 RGBRGB bytes to 4 UYVY bytes
-      rgb2uyvy (rgbdata[j+2],rgbdata[j+1],rgbdata[j],rgbdata[j+ipsize+2],rgbdata[j+ipsize+1],rgbdata[j+ipsize],&u);
+      rgb2uyvy(rgbdata[j+2],rgbdata[j+1],rgbdata[j],rgbdata[j+ipsize+2],rgbdata[j+ipsize+1],rgbdata[j+ipsize],&u);
 
       *(y++)=u.y0;
       *(y++)=u.y1;
@@ -3141,15 +3133,15 @@
       *(Cr++)=u.v0;
 
       if (!is_422&&chroma_row&&i>0) {
-	// average two rows
-	Cb[-1-hhsize]=avg_chroma(Cb[-1],Cb[-1-hhsize]);
-	Cr[-1-hhsize]=avg_chroma(Cr[-1],Cr[-1-hhsize]);
+        // average two rows
+        Cb[-1-hhsize]=avg_chroma(Cb[-1],Cb[-1-hhsize]);
+        Cr[-1-hhsize]=avg_chroma(Cr[-1],Cr[-1-hhsize]);
       }
     }
     if (!is_422) {
       if (chroma_row) {
-	Cb-=hhsize;
-	Cr-=hhsize;
+        Cb-=hhsize;
+        Cr-=hhsize;
       }
       chroma_row=!chroma_row;
     }
@@ -3191,8 +3183,8 @@
 }
 
 
-static void convert_rgb_to_yuv411_frame(uint8_t *rgbdata, int hsize, int vsize, int rowstride, 
-					yuv411_macropixel *u, boolean has_alpha, boolean clamped) {
+static void convert_rgb_to_yuv411_frame(uint8_t *rgbdata, int hsize, int vsize, int rowstride,
+                                        yuv411_macropixel *u, boolean has_alpha, boolean clamped) {
   // for odd sized widths, cut the rightmost one, two or three pixels. Widths should be divisible by 4.
   // TODO - handle different out sampling types
   int hs3=(int)(hsize>>2)*12,ipstep=12;
@@ -3202,7 +3194,7 @@
 
   int x=3,y=4,z=5,a=6,b=7,c=8,d=9,e=10,f=11;
 
-  if (G_UNLIKELY(!conv_RY_inited)) init_RGB_to_YUV_tables();
+  if (LIVES_UNLIKELY(!conv_RY_inited)) init_RGB_to_YUV_tables();
 
   set_conversion_arrays(clamped?WEED_YUV_CLAMPING_CLAMPED:WEED_YUV_CLAMPING_UNCLAMPED,WEED_YUV_SUBSPACE_YCBCR);
 
@@ -3222,17 +3214,18 @@
   end=rgbdata+(rowstride*vsize)+1-ipstep;
   hs3-=(ipstep-1);
 
-  for (;rgbdata<end;rgbdata+=rowstride) {
-    for (i=0;i<hs3;i+=ipstep) {
+  for (; rgbdata<end; rgbdata+=rowstride) {
+    for (i=0; i<hs3; i+=ipstep) {
       // convert 12 RGBRGBRGBRGB bytes to 6 UYYVYY bytes
-      rgb2_411 (rgbdata[i],rgbdata[i+1],rgbdata[i+2],rgbdata[i+x],rgbdata[i+y],rgbdata[i+z],rgbdata[i+a],rgbdata[i+b],rgbdata[i+c],rgbdata[i+d],rgbdata[i+e],rgbdata[i+f],u++);
+      rgb2_411(rgbdata[i],rgbdata[i+1],rgbdata[i+2],rgbdata[i+x],rgbdata[i+y],rgbdata[i+z],rgbdata[i+a],rgbdata[i+b],rgbdata[i+c],rgbdata[i+d],
+               rgbdata[i+e],rgbdata[i+f],u++);
     }
   }
 }
 
 
-static void convert_bgr_to_yuv411_frame(uint8_t *rgbdata, int hsize, int vsize, int rowstride, 
-					yuv411_macropixel *u, boolean has_alpha, boolean clamped) {
+static void convert_bgr_to_yuv411_frame(uint8_t *rgbdata, int hsize, int vsize, int rowstride,
+                                        yuv411_macropixel *u, boolean has_alpha, boolean clamped) {
   // for odd sized widths, cut the rightmost one, two or three pixels
   // TODO - handle different out sampling types
   int hs3=(int)(hsize>>2)*12,ipstep=12;
@@ -3242,7 +3235,7 @@
 
   int x=3,y=4,z=5,a=6,b=7,c=8,d=9,e=10,f=11;
 
-  if (G_UNLIKELY(!conv_RY_inited)) init_RGB_to_YUV_tables();
+  if (LIVES_UNLIKELY(!conv_RY_inited)) init_RGB_to_YUV_tables();
 
   set_conversion_arrays(clamped?WEED_YUV_CLAMPING_CLAMPED:WEED_YUV_CLAMPING_UNCLAMPED,WEED_YUV_SUBSPACE_YCBCR);
 
@@ -3262,17 +3255,18 @@
   end=rgbdata+(rowstride*vsize)+1-ipstep;
   hs3-=(ipstep-1);
 
-  for (;rgbdata<end;rgbdata+=rowstride) {
-    for (i=0;i<hs3;i+=ipstep) {
+  for (; rgbdata<end; rgbdata+=rowstride) {
+    for (i=0; i<hs3; i+=ipstep) {
       // convert 12 RGBRGBRGBRGB bytes to 6 UYYVYY bytes
-      rgb2_411 (rgbdata[i+2],rgbdata[i+1],rgbdata[i],rgbdata[i+z],rgbdata[i+y],rgbdata[i+x],rgbdata[i+c],rgbdata[i+b],rgbdata[i+a],rgbdata[i+f],rgbdata[i+e],rgbdata[i+d],u++);
+      rgb2_411(rgbdata[i+2],rgbdata[i+1],rgbdata[i],rgbdata[i+z],rgbdata[i+y],rgbdata[i+x],rgbdata[i+c],rgbdata[i+b],rgbdata[i+a],rgbdata[i+f],
+               rgbdata[i+e],rgbdata[i+d],u++);
     }
   }
 }
 
 
-static void convert_argb_to_yuv411_frame(uint8_t *rgbdata, int hsize, int vsize, int rowstride, 
-					yuv411_macropixel *u, boolean clamped) {
+static void convert_argb_to_yuv411_frame(uint8_t *rgbdata, int hsize, int vsize, int rowstride,
+    yuv411_macropixel *u, boolean clamped) {
   // for odd sized widths, cut the rightmost one, two or three pixels. Widths should be divisible by 4.
   // TODO - handle different out sampling types
   int hs3=(int)(hsize>>2)*12,ipstep=12;
@@ -3280,7 +3274,7 @@
   uint8_t *end;
   register int i;
 
-  if (G_UNLIKELY(!conv_RY_inited)) init_RGB_to_YUV_tables();
+  if (LIVES_UNLIKELY(!conv_RY_inited)) init_RGB_to_YUV_tables();
 
   set_conversion_arrays(clamped?WEED_YUV_CLAMPING_CLAMPED:WEED_YUV_CLAMPING_UNCLAMPED,WEED_YUV_SUBSPACE_YCBCR);
 
@@ -3290,61 +3284,62 @@
   end=rgbdata+(rowstride*vsize)+1-ipstep;
   hs3-=(ipstep-1);
 
-  for (;rgbdata<end;rgbdata+=rowstride) {
-    for (i=0;i<hs3;i+=ipstep) {
+  for (; rgbdata<end; rgbdata+=rowstride) {
+    for (i=0; i<hs3; i+=ipstep) {
       // convert 12 RGBRGBRGBRGB bytes to 6 UYYVYY bytes
-      rgb2_411 (rgbdata[i+1],rgbdata[i+2],rgbdata[i+3],rgbdata[i+5],rgbdata[i+6],rgbdata[i+7],rgbdata[i+9],rgbdata[i+10],rgbdata[i+11],rgbdata[i+13],rgbdata[i+14],rgbdata[i+15],u++);
+      rgb2_411(rgbdata[i+1],rgbdata[i+2],rgbdata[i+3],rgbdata[i+5],rgbdata[i+6],rgbdata[i+7],rgbdata[i+9],rgbdata[i+10],rgbdata[i+11],
+               rgbdata[i+13],rgbdata[i+14],rgbdata[i+15],u++);
     }
   }
 }
 
-static void convert_uyvy_to_rgb_frame(uyvy_macropixel *src, int width, int height, int orowstride, 
-				      uint8_t *dest, boolean add_alpha, boolean clamped, int thread_id) {
+static void convert_uyvy_to_rgb_frame(uyvy_macropixel *src, int width, int height, int orowstride,
+                                      uint8_t *dest, boolean add_alpha, boolean clamped, int thread_id) {
   register int i,j;
   int psize=6;
   int a=3,b=4,c=5;
 
-  if (G_UNLIKELY(!conv_YR_inited)) init_YUV_to_RGB_tables();
+  if (LIVES_UNLIKELY(!conv_YR_inited)) init_YUV_to_RGB_tables();
 
   if (thread_id==-1&&prefs->nfx_threads>1) {
     int nthreads=0;
     int dheight;
     boolean useme=FALSE;
-    lives_cc_params *ccparams=(lives_cc_params *)g_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
+    lives_cc_params *ccparams=(lives_cc_params *)lives_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
 
     dheight=CEIL((double)height/(double)prefs->nfx_threads,4);
-    for (i=0;i<prefs->nfx_threads;i++) {
+    for (i=0; i<prefs->nfx_threads; i++) {
       if ((dheight*i)<height) {
 
-	ccparams[i].src=src+dheight*i*width;
-	ccparams[i].hsize=width;
-	ccparams[i].dest=dest+dheight*i*orowstride;
-
-	if (dheight*(i+1)>(height-4)) {
-	  dheight=height-(dheight*i);
-	  useme=TRUE;
-	}
-	if (dheight<4) break;
-
-	ccparams[i].vsize=dheight;
-
-	ccparams[i].orowstrides[0]=orowstride;
-	ccparams[i].out_alpha=add_alpha;
-	ccparams[i].in_clamped=clamped;
-	ccparams[i].thread_id=i;
-	
-	if (useme) convert_uyvy_to_rgb_frame_thread(&ccparams[i]);
-	else {
-	  pthread_create(&cthreads[i],NULL,convert_uyvy_to_rgb_frame_thread,&ccparams[i]);
-	  nthreads++;
-	}
+        ccparams[i].src=src+dheight*i*width;
+        ccparams[i].hsize=width;
+        ccparams[i].dest=dest+dheight*i*orowstride;
+
+        if (dheight*(i+1)>(height-4)) {
+          dheight=height-(dheight*i);
+          useme=TRUE;
+        }
+        if (dheight<4) break;
+
+        ccparams[i].vsize=dheight;
+
+        ccparams[i].orowstrides[0]=orowstride;
+        ccparams[i].out_alpha=add_alpha;
+        ccparams[i].in_clamped=clamped;
+        ccparams[i].thread_id=i;
+
+        if (useme) convert_uyvy_to_rgb_frame_thread(&ccparams[i]);
+        else {
+          pthread_create(&cthreads[i],NULL,convert_uyvy_to_rgb_frame_thread,&ccparams[i]);
+          nthreads++;
+        }
       }
     }
 
-    for (i=0;i<nthreads;i++) {
+    for (i=0; i<nthreads; i++) {
       pthread_join(cthreads[i],NULL);
     }
-    g_free(ccparams);
+    lives_free(ccparams);
     return;
   }
 
@@ -3358,8 +3353,8 @@
   }
 
   orowstride-=width*psize;
-  for (i=0;i<height;i++) {
-    for (j=0;j<width;j++) {
+  for (i=0; i<height; i++) {
+    for (j=0; j<width; j++) {
       uyvy2rgb(src,&dest[0],&dest[1],&dest[2],&dest[a],&dest[b],&dest[c]);
       if (add_alpha) dest[3]=dest[7]=255;
       dest+=psize;
@@ -3373,59 +3368,59 @@
 void *convert_uyvy_to_rgb_frame_thread(void *data) {
   lives_cc_params *ccparams=(lives_cc_params *)data;
   convert_uyvy_to_rgb_frame((uyvy_macropixel *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->orowstrides[0],
-			    (uint8_t *)ccparams->dest,ccparams->out_alpha,ccparams->in_clamped,ccparams->thread_id);
+                            (uint8_t *)ccparams->dest,ccparams->out_alpha,ccparams->in_clamped,ccparams->thread_id);
   return NULL;
 }
 
 
-static void convert_uyvy_to_bgr_frame(uyvy_macropixel *src, int width, int height, int orowstride, 
-				      uint8_t *dest, boolean add_alpha, boolean clamped, int thread_id) {
+static void convert_uyvy_to_bgr_frame(uyvy_macropixel *src, int width, int height, int orowstride,
+                                      uint8_t *dest, boolean add_alpha, boolean clamped, int thread_id) {
   register int i,j;
   int psize=6;
 
   int a=3,b=4,c=5;
 
-  if (G_UNLIKELY(!conv_YR_inited)) init_YUV_to_RGB_tables();
+  if (LIVES_UNLIKELY(!conv_YR_inited)) init_YUV_to_RGB_tables();
 
   if (thread_id==-1&&prefs->nfx_threads>1) {
     int nthreads=0;
     int dheight;
     boolean useme=FALSE;
-    lives_cc_params *ccparams=(lives_cc_params *)g_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
+    lives_cc_params *ccparams=(lives_cc_params *)lives_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
 
     dheight=CEIL((double)height/(double)prefs->nfx_threads,4);
-    for (i=0;i<prefs->nfx_threads;i++) {
+    for (i=0; i<prefs->nfx_threads; i++) {
       if ((dheight*i)<height) {
 
-	ccparams[i].src=src+dheight*i*width;
-	ccparams[i].hsize=width;
-	ccparams[i].dest=dest+dheight*i*orowstride;
-
-	if (dheight*(i+1)>(height-4)) {
-	  dheight=height-(dheight*i);
-	  useme=TRUE;
-	}
-	if (dheight<4) break;
-
-	ccparams[i].vsize=dheight;
-
-	ccparams[i].orowstrides[0]=orowstride;
-	ccparams[i].out_alpha=add_alpha;
-	ccparams[i].in_clamped=clamped;
-	ccparams[i].thread_id=i;
-	
-	if (useme) convert_uyvy_to_bgr_frame_thread(&ccparams[i]);
-	else {
-	  pthread_create(&cthreads[i],NULL,convert_uyvy_to_bgr_frame_thread,&ccparams[i]);
-	  nthreads++;
-	}
+        ccparams[i].src=src+dheight*i*width;
+        ccparams[i].hsize=width;
+        ccparams[i].dest=dest+dheight*i*orowstride;
+
+        if (dheight*(i+1)>(height-4)) {
+          dheight=height-(dheight*i);
+          useme=TRUE;
+        }
+        if (dheight<4) break;
+
+        ccparams[i].vsize=dheight;
+
+        ccparams[i].orowstrides[0]=orowstride;
+        ccparams[i].out_alpha=add_alpha;
+        ccparams[i].in_clamped=clamped;
+        ccparams[i].thread_id=i;
+
+        if (useme) convert_uyvy_to_bgr_frame_thread(&ccparams[i]);
+        else {
+          pthread_create(&cthreads[i],NULL,convert_uyvy_to_bgr_frame_thread,&ccparams[i]);
+          nthreads++;
+        }
       }
     }
 
-    for (i=0;i<nthreads;i++) {
+    for (i=0; i<nthreads; i++) {
       pthread_join(cthreads[i],NULL);
     }
-    g_free(ccparams);
+    lives_free(ccparams);
     return;
   }
 
@@ -3440,8 +3435,8 @@
   }
 
   orowstride-=width*psize;
-  for (i=0;i<height;i++) {
-    for (j=0;j<width;j++) {
+  for (i=0; i<height; i++) {
+    for (j=0; j<width; j++) {
       uyvy2rgb(src,&dest[2],&dest[1],&dest[0],&dest[c],&dest[b],&dest[a]);
       if (add_alpha) dest[3]=dest[7]=255;
       dest+=psize;
@@ -3455,56 +3450,56 @@
 void *convert_uyvy_to_bgr_frame_thread(void *data) {
   lives_cc_params *ccparams=(lives_cc_params *)data;
   convert_uyvy_to_bgr_frame((uyvy_macropixel *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->orowstrides[0],
-			    (uint8_t *)ccparams->dest,ccparams->out_alpha,ccparams->in_clamped,ccparams->thread_id);
+                            (uint8_t *)ccparams->dest,ccparams->out_alpha,ccparams->in_clamped,ccparams->thread_id);
   return NULL;
 }
 
 
-static void convert_uyvy_to_argb_frame(uyvy_macropixel *src, int width, int height, int orowstride, 
-				       uint8_t *dest, boolean clamped, int thread_id) {
+static void convert_uyvy_to_argb_frame(uyvy_macropixel *src, int width, int height, int orowstride,
+                                       uint8_t *dest, boolean clamped, int thread_id) {
   register int i,j;
   int psize=8;
 
-  if (G_UNLIKELY(!conv_YR_inited)) init_YUV_to_RGB_tables();
+  if (LIVES_UNLIKELY(!conv_YR_inited)) init_YUV_to_RGB_tables();
 
   if (thread_id==-1&&prefs->nfx_threads>1) {
     int nthreads=0;
     int dheight;
     boolean useme=FALSE;
-    lives_cc_params *ccparams=(lives_cc_params *)g_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
+    lives_cc_params *ccparams=(lives_cc_params *)lives_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
 
     dheight=CEIL((double)height/(double)prefs->nfx_threads,4);
-    for (i=0;i<prefs->nfx_threads;i++) {
+    for (i=0; i<prefs->nfx_threads; i++) {
       if ((dheight*i)<height) {
 
-	ccparams[i].src=src+dheight*i*width;
-	ccparams[i].hsize=width;
-	ccparams[i].dest=dest+dheight*i*orowstride;
-
-	if (dheight*(i+1)>(height-4)) {
-	  dheight=height-(dheight*i);
-	  useme=TRUE;
-	}
-	if (dheight<4) break;
-
-	ccparams[i].vsize=dheight;
-
-	ccparams[i].orowstrides[0]=orowstride;
-	ccparams[i].in_clamped=clamped;
-	ccparams[i].thread_id=i;
-	
-	if (useme) convert_uyvy_to_argb_frame_thread(&ccparams[i]);
-	else {
-	  pthread_create(&cthreads[i],NULL,convert_uyvy_to_argb_frame_thread,&ccparams[i]);
-	  nthreads++;
-	}
+        ccparams[i].src=src+dheight*i*width;
+        ccparams[i].hsize=width;
+        ccparams[i].dest=dest+dheight*i*orowstride;
+
+        if (dheight*(i+1)>(height-4)) {
+          dheight=height-(dheight*i);
+          useme=TRUE;
+        }
+        if (dheight<4) break;
+
+        ccparams[i].vsize=dheight;
+
+        ccparams[i].orowstrides[0]=orowstride;
+        ccparams[i].in_clamped=clamped;
+        ccparams[i].thread_id=i;
+
+        if (useme) convert_uyvy_to_argb_frame_thread(&ccparams[i]);
+        else {
+          pthread_create(&cthreads[i],NULL,convert_uyvy_to_argb_frame_thread,&ccparams[i]);
+          nthreads++;
+        }
       }
     }
 
-    for (i=0;i<nthreads;i++) {
+    for (i=0; i<nthreads; i++) {
       pthread_join(cthreads[i],NULL);
     }
-    g_free(ccparams);
+    lives_free(ccparams);
     return;
   }
 
@@ -3512,8 +3507,8 @@
 
 
   orowstride-=width*psize;
-  for (i=0;i<height;i++) {
-    for (j=0;j<width;j++) {
+  for (i=0; i<height; i++) {
+    for (j=0; j<width; j++) {
       uyvy2rgb(src,&dest[1],&dest[2],&dest[3],&dest[5],&dest[6],&dest[7]);
       dest[0]=dest[4]=255;
       dest+=psize;
@@ -3527,57 +3522,57 @@
 void *convert_uyvy_to_argb_frame_thread(void *data) {
   lives_cc_params *ccparams=(lives_cc_params *)data;
   convert_uyvy_to_argb_frame((uyvy_macropixel *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->orowstrides[0],
-			     (uint8_t *)ccparams->dest,ccparams->in_clamped,ccparams->thread_id);
+                             (uint8_t *)ccparams->dest,ccparams->in_clamped,ccparams->thread_id);
   return NULL;
 }
 
 
-static void convert_yuyv_to_rgb_frame(yuyv_macropixel *src, int width, int height, int orowstride, 
-				      uint8_t *dest, boolean add_alpha, boolean clamped, int thread_id) {
+static void convert_yuyv_to_rgb_frame(yuyv_macropixel *src, int width, int height, int orowstride,
+                                      uint8_t *dest, boolean add_alpha, boolean clamped, int thread_id) {
   register int i,j;
   int psize=6;
   int a=3,b=4,c=5;
 
-  if (G_UNLIKELY(!conv_YR_inited)) init_YUV_to_RGB_tables();
+  if (LIVES_UNLIKELY(!conv_YR_inited)) init_YUV_to_RGB_tables();
 
   if (thread_id==-1&&prefs->nfx_threads>1) {
     int nthreads=0;
     int dheight;
     boolean useme=FALSE;
-    lives_cc_params *ccparams=(lives_cc_params *)g_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
+    lives_cc_params *ccparams=(lives_cc_params *)lives_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
 
     dheight=CEIL((double)height/(double)prefs->nfx_threads,4);
-    for (i=0;i<prefs->nfx_threads;i++) {
+    for (i=0; i<prefs->nfx_threads; i++) {
       if ((dheight*i)<height) {
 
-	ccparams[i].src=src+dheight*i*width;
-	ccparams[i].hsize=width;
-	ccparams[i].dest=dest+dheight*i*orowstride;
-
-	if (dheight*(i+1)>(height-4)) {
-	  dheight=height-(dheight*i);
-	  useme=TRUE;
-	}
-	if (dheight<4) break;
-
-	ccparams[i].vsize=dheight;
-	ccparams[i].orowstrides[0]=orowstride;
-	ccparams[i].out_alpha=add_alpha;
-	ccparams[i].in_clamped=clamped;
-	ccparams[i].thread_id=i;
-	
-	if (useme) convert_yuyv_to_rgb_frame_thread(&ccparams[i]);
-	else {
-	  pthread_create(&cthreads[i],NULL,convert_yuyv_to_rgb_frame_thread,&ccparams[i]);
-	  nthreads++;
-	}
+        ccparams[i].src=src+dheight*i*width;
+        ccparams[i].hsize=width;
+        ccparams[i].dest=dest+dheight*i*orowstride;
+
+        if (dheight*(i+1)>(height-4)) {
+          dheight=height-(dheight*i);
+          useme=TRUE;
+        }
+        if (dheight<4) break;
+
+        ccparams[i].vsize=dheight;
+        ccparams[i].orowstrides[0]=orowstride;
+        ccparams[i].out_alpha=add_alpha;
+        ccparams[i].in_clamped=clamped;
+        ccparams[i].thread_id=i;
+
+        if (useme) convert_yuyv_to_rgb_frame_thread(&ccparams[i]);
+        else {
+          pthread_create(&cthreads[i],NULL,convert_yuyv_to_rgb_frame_thread,&ccparams[i]);
+          nthreads++;
+        }
       }
     }
 
-    for (i=0;i<nthreads;i++) {
+    for (i=0; i<nthreads; i++) {
       pthread_join(cthreads[i],NULL);
     }
-    g_free(ccparams);
+    lives_free(ccparams);
     return;
   }
 
@@ -3591,8 +3586,8 @@
   }
 
   orowstride-=width*psize;
-  for (i=0;i<height;i++) {
-    for (j=0;j<width;j++) {
+  for (i=0; i<height; i++) {
+    for (j=0; j<width; j++) {
       yuyv2rgb(src,&dest[0],&dest[1],&dest[2],&dest[a],&dest[b],&dest[c]);
       if (add_alpha) dest[3]=dest[7]=255;
       dest+=psize;
@@ -3606,59 +3601,59 @@
 void *convert_yuyv_to_rgb_frame_thread(void *data) {
   lives_cc_params *ccparams=(lives_cc_params *)data;
   convert_yuyv_to_rgb_frame((yuyv_macropixel *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->orowstrides[0],
-			    (uint8_t *)ccparams->dest,ccparams->out_alpha,ccparams->in_clamped,ccparams->thread_id);
+                            (uint8_t *)ccparams->dest,ccparams->out_alpha,ccparams->in_clamped,ccparams->thread_id);
   return NULL;
 }
 
 
-static void convert_yuyv_to_bgr_frame(yuyv_macropixel *src, int width, int height, int orowstride, 
-				      uint8_t *dest, boolean add_alpha, boolean clamped, int thread_id) {
+static void convert_yuyv_to_bgr_frame(yuyv_macropixel *src, int width, int height, int orowstride,
+                                      uint8_t *dest, boolean add_alpha, boolean clamped, int thread_id) {
   register int x;
   int size=width*height,psize=6;
   int a=3,b=4,c=5;
   register int i;
 
-  if (G_UNLIKELY(!conv_YR_inited)) init_YUV_to_RGB_tables();
+  if (LIVES_UNLIKELY(!conv_YR_inited)) init_YUV_to_RGB_tables();
 
   if (thread_id==-1&&prefs->nfx_threads>1) {
     int nthreads=0;
     int dheight;
     boolean useme=FALSE;
-    lives_cc_params *ccparams=(lives_cc_params *)g_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
+    lives_cc_params *ccparams=(lives_cc_params *)lives_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
 
     dheight=CEIL((double)height/(double)prefs->nfx_threads,4);
-    for (i=0;i<prefs->nfx_threads;i++) {
+    for (i=0; i<prefs->nfx_threads; i++) {
       if ((dheight*i)<height) {
 
-	ccparams[i].src=src+dheight*i*width;
-	ccparams[i].hsize=width;
-	ccparams[i].dest=dest+dheight*i*orowstride;
-
-	if (dheight*(i+1)>(height-4)) {
-	  dheight=height-(dheight*i);
-	  useme=TRUE;
-	}
-	if (dheight<4) break;
-
-	ccparams[i].vsize=dheight;
-
-	ccparams[i].orowstrides[0]=orowstride;
-	ccparams[i].out_alpha=add_alpha;
-	ccparams[i].in_clamped=clamped;
-	ccparams[i].thread_id=i;
-	
-	if (useme) convert_yuyv_to_bgr_frame_thread(&ccparams[i]);
-	else {
-	  pthread_create(&cthreads[i],NULL,convert_yuyv_to_bgr_frame_thread,&ccparams[i]);
-	  nthreads++;
-	}
+        ccparams[i].src=src+dheight*i*width;
+        ccparams[i].hsize=width;
+        ccparams[i].dest=dest+dheight*i*orowstride;
+
+        if (dheight*(i+1)>(height-4)) {
+          dheight=height-(dheight*i);
+          useme=TRUE;
+        }
+        if (dheight<4) break;
+
+        ccparams[i].vsize=dheight;
+
+        ccparams[i].orowstrides[0]=orowstride;
+        ccparams[i].out_alpha=add_alpha;
+        ccparams[i].in_clamped=clamped;
+        ccparams[i].thread_id=i;
+
+        if (useme) convert_yuyv_to_bgr_frame_thread(&ccparams[i]);
+        else {
+          pthread_create(&cthreads[i],NULL,convert_yuyv_to_bgr_frame_thread,&ccparams[i]);
+          nthreads++;
+        }
       }
     }
 
-    for (i=0;i<nthreads;i++) {
+    for (i=0; i<nthreads; i++) {
       pthread_join(cthreads[i],NULL);
     }
-    g_free(ccparams);
+    lives_free(ccparams);
     return;
   }
 
@@ -3671,7 +3666,7 @@
     c=7;
   }
 
-  for (x=0;x<size;x++) {
+  for (x=0; x<size; x++) {
     yuyv2rgb(src,&dest[2],&dest[1],&dest[0],&dest[c],&dest[b],&dest[a]);
     if (add_alpha) dest[3]=dest[7]=255;
     dest+=psize;
@@ -3683,56 +3678,56 @@
 void *convert_yuyv_to_bgr_frame_thread(void *data) {
   lives_cc_params *ccparams=(lives_cc_params *)data;
   convert_yuyv_to_bgr_frame((yuyv_macropixel *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->orowstrides[0],
-			    (uint8_t *)ccparams->dest,ccparams->out_alpha,ccparams->in_clamped,ccparams->thread_id);
+                            (uint8_t *)ccparams->dest,ccparams->out_alpha,ccparams->in_clamped,ccparams->thread_id);
   return NULL;
 }
 
 
-static void convert_yuyv_to_argb_frame(yuyv_macropixel *src, int width, int height, int orowstride, 
-				       uint8_t *dest, boolean clamped, int thread_id) {
+static void convert_yuyv_to_argb_frame(yuyv_macropixel *src, int width, int height, int orowstride,
+                                       uint8_t *dest, boolean clamped, int thread_id) {
   register int i,j;
   int psize=8;
 
-  if (G_UNLIKELY(!conv_YR_inited)) init_YUV_to_RGB_tables();
+  if (LIVES_UNLIKELY(!conv_YR_inited)) init_YUV_to_RGB_tables();
 
   if (thread_id==-1&&prefs->nfx_threads>1) {
     int nthreads=0;
     int dheight;
     boolean useme=FALSE;
-    lives_cc_params *ccparams=(lives_cc_params *)g_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
+    lives_cc_params *ccparams=(lives_cc_params *)lives_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
 
     dheight=CEIL((double)height/(double)prefs->nfx_threads,4);
-    for (i=0;i<prefs->nfx_threads;i++) {
+    for (i=0; i<prefs->nfx_threads; i++) {
       if ((dheight*i)<height) {
 
-	ccparams[i].src=src+dheight*i*width;
-	ccparams[i].hsize=width;
-	ccparams[i].dest=dest+dheight*i*orowstride;
-
-	if (dheight*(i+1)>(height-4)) {
-	  dheight=height-(dheight*i);
-	  useme=TRUE;
-	}
-	if (dheight<4) break;
-
-	ccparams[i].vsize=dheight;
-
-	ccparams[i].orowstrides[0]=orowstride;
-	ccparams[i].in_clamped=clamped;
-	ccparams[i].thread_id=i;
-	
-	if (useme) convert_yuyv_to_argb_frame_thread(&ccparams[i]);
-	else {
-	  pthread_create(&cthreads[i],NULL,convert_yuyv_to_argb_frame_thread,&ccparams[i]);
-	  nthreads++;
-	}
+        ccparams[i].src=src+dheight*i*width;
+        ccparams[i].hsize=width;
+        ccparams[i].dest=dest+dheight*i*orowstride;
+
+        if (dheight*(i+1)>(height-4)) {
+          dheight=height-(dheight*i);
+          useme=TRUE;
+        }
+        if (dheight<4) break;
+
+        ccparams[i].vsize=dheight;
+
+        ccparams[i].orowstrides[0]=orowstride;
+        ccparams[i].in_clamped=clamped;
+        ccparams[i].thread_id=i;
+
+        if (useme) convert_yuyv_to_argb_frame_thread(&ccparams[i]);
+        else {
+          pthread_create(&cthreads[i],NULL,convert_yuyv_to_argb_frame_thread,&ccparams[i]);
+          nthreads++;
+        }
       }
     }
 
-    for (i=0;i<nthreads;i++) {
+    for (i=0; i<nthreads; i++) {
       pthread_join(cthreads[i],NULL);
     }
-    g_free(ccparams);
+    lives_free(ccparams);
     return;
   }
 
@@ -3740,8 +3735,8 @@
 
 
   orowstride-=width*psize;
-  for (i=0;i<height;i++) {
-    for (j=0;j<width;j++) {
+  for (i=0; i<height; i++) {
+    for (j=0; j<width; j++) {
       yuyv2rgb(src,&dest[1],&dest[2],&dest[3],&dest[5],&dest[6],&dest[7]);
       dest[0]=dest[4]=255;
       dest+=psize;
@@ -3755,7 +3750,7 @@
 void *convert_yuyv_to_argb_frame_thread(void *data) {
   lives_cc_params *ccparams=(lives_cc_params *)data;
   convert_yuyv_to_argb_frame((yuyv_macropixel *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->orowstrides[0],
-			     (uint8_t *)ccparams->dest,ccparams->in_clamped,ccparams->thread_id);
+                             (uint8_t *)ccparams->dest,ccparams->in_clamped,ccparams->thread_id);
   return NULL;
 }
 
@@ -3774,17 +3769,17 @@
   v=src[2];
 
   end=y+width*height;
-  
+
   while (y<end) {
-    for (j=0;j<hwidth;j++) {
+    for (j=0; j<hwidth; j++) {
       dest->u0=u[0];
       dest->y0=y[0];
       dest->v0=v[0];
       dest->y1=y[1];
-      
+
       if (chroma&&i>0) {
-	dest[-hwidth].u0=avg_chroma(dest[-hwidth].u0,u[0]);
-	dest[-hwidth].v0=avg_chroma(dest[-hwidth].v0,v[0]);
+        dest[-hwidth].u0=avg_chroma(dest[-hwidth].u0,u[0]);
+        dest[-hwidth].v0=avg_chroma(dest[-hwidth].v0,v[0]);
       }
 
       dest++;
@@ -3818,17 +3813,17 @@
   end=y+width*height;
 
   while (y<end) {
-    for (j=0;j<hwidth;j++) {
+    for (j=0; j<hwidth; j++) {
       dest->y0=y[0];
       dest->u0=u[0];
       dest->y1=y[1];
       dest->v0=v[0];
 
       if (chroma&&i>0) {
-	dest[-hwidth].u0=avg_chroma(dest[-hwidth].u0,u[0]);
-	dest[-hwidth].v0=avg_chroma(dest[-hwidth].v0,v[0]);
+        dest[-hwidth].u0=avg_chroma(dest[-hwidth].u0,u[0]);
+        dest[-hwidth].v0=avg_chroma(dest[-hwidth].v0,v[0]);
       }
-      
+
       dest++;
       y+=2;
       u++;
@@ -3844,8 +3839,8 @@
 }
 
 
-static void convert_yuv_planar_to_rgb_frame(uint8_t **src, int width, int height, int orowstride, uint8_t *dest, 
-					    boolean in_alpha, boolean out_alpha, boolean clamped, int thread_id) {
+static void convert_yuv_planar_to_rgb_frame(uint8_t **src, int width, int height, int orowstride, uint8_t *dest,
+    boolean in_alpha, boolean out_alpha, boolean clamped, int thread_id) {
   uint8_t *y=src[0];
   uint8_t *u=src[1];
   uint8_t *v=src[2];
@@ -3856,7 +3851,7 @@
   size_t opstep=3,rowstride;
   register int i,j;
 
-  if (G_UNLIKELY(!conv_YR_inited)) init_YUV_to_RGB_tables();
+  if (LIVES_UNLIKELY(!conv_YR_inited)) init_YUV_to_RGB_tables();
 
   if (in_alpha) a=src[3];
 
@@ -3864,47 +3859,47 @@
     int nthreads=0;
     int dheight;
     boolean useme=FALSE;
-    lives_cc_params *ccparams=(lives_cc_params *)g_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
+    lives_cc_params *ccparams=(lives_cc_params *)lives_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
 
     dheight=CEIL((double)height/(double)prefs->nfx_threads,4);
-    for (i=0;i<prefs->nfx_threads;i++) {
+    for (i=0; i<prefs->nfx_threads; i++) {
       if ((y+dheight*i*width)<end) {
 
-	ccparams[i].hsize=width;
+        ccparams[i].hsize=width;
+
+        ccparams[i].srcp[0]=y+dheight*i*width;
+        ccparams[i].srcp[1]=u+dheight*i*width;
+        ccparams[i].srcp[2]=v+dheight*i*width;
+        if (in_alpha) ccparams[i].srcp[3]=a+dheight*i*width;
+
+        ccparams[i].dest=dest+dheight*i*orowstride;
+
+        if (dheight*(i+1)>(height-4)) {
+          dheight=height-(dheight*i);
+          useme=TRUE;
+        }
+        if (dheight<4) break;
+
+        ccparams[i].vsize=dheight;
+
+        ccparams[i].orowstrides[0]=orowstride;
+        ccparams[i].in_alpha=in_alpha;
+        ccparams[i].out_alpha=out_alpha;
+        ccparams[i].out_clamped=clamped;
+        ccparams[i].thread_id=i;
 
-	ccparams[i].srcp[0]=y+dheight*i*width;
-	ccparams[i].srcp[1]=u+dheight*i*width;
-	ccparams[i].srcp[2]=v+dheight*i*width;
-	if (in_alpha) ccparams[i].srcp[3]=a+dheight*i*width;
-
-	ccparams[i].dest=dest+dheight*i*orowstride;
-
-	if (dheight*(i+1)>(height-4)) {
-	  dheight=height-(dheight*i);
-	  useme=TRUE;
-	}
-	if (dheight<4) break;
-
-	ccparams[i].vsize=dheight;
-
-	ccparams[i].orowstrides[0]=orowstride;
-	ccparams[i].in_alpha=in_alpha;
-	ccparams[i].out_alpha=out_alpha;
-	ccparams[i].out_clamped=clamped;
-	ccparams[i].thread_id=i;
-	
-	if (useme) convert_yuv_planar_to_rgb_frame_thread(&ccparams[i]);
-	else {
-	  pthread_create(&cthreads[i],NULL,convert_yuv_planar_to_rgb_frame_thread,&ccparams[i]);
-	  nthreads++;
-	}
+        if (useme) convert_yuv_planar_to_rgb_frame_thread(&ccparams[i]);
+        else {
+          pthread_create(&cthreads[i],NULL,convert_yuv_planar_to_rgb_frame_thread,&ccparams[i]);
+          nthreads++;
+        }
       }
     }
 
-    for (i=0;i<nthreads;i++) {
+    for (i=0; i<nthreads; i++) {
       pthread_join(cthreads[i],NULL);
     }
-    g_free(ccparams);
+    lives_free(ccparams);
     return;
   }
 
@@ -3914,14 +3909,13 @@
 
   rowstride=orowstride-width*opstep;
 
-  for (i=0;i<height;i++) {
-    for (j=0;j<width;j++) {
+  for (i=0; i<height; i++) {
+    for (j=0; j<width; j++) {
       yuv2rgb(*(y++),*(u++),*(v++),&dest[0],&dest[1],&dest[2]);
       if (out_alpha) {
-	if (in_alpha) {
-	  dest[3]=*(a++);
-	}
-	else dest[3]=255;
+        if (in_alpha) {
+          dest[3]=*(a++);
+        } else dest[3]=255;
       }
       dest+=opstep;
     }
@@ -3932,14 +3926,14 @@
 void *convert_yuv_planar_to_rgb_frame_thread(void *data) {
   lives_cc_params *ccparams=(lives_cc_params *)data;
   convert_yuv_planar_to_rgb_frame((uint8_t **)ccparams->srcp,ccparams->hsize,ccparams->vsize,ccparams->orowstrides[0],
-				  (uint8_t *)ccparams->dest,ccparams->in_alpha,ccparams->out_alpha,
-				  ccparams->in_clamped,ccparams->thread_id);
+                                  (uint8_t *)ccparams->dest,ccparams->in_alpha,ccparams->out_alpha,
+                                  ccparams->in_clamped,ccparams->thread_id);
   return NULL;
 }
 
 
-static void convert_yuv_planar_to_bgr_frame(uint8_t **src, int width, int height, int orowstride, uint8_t *dest, 
-					    boolean in_alpha, boolean out_alpha, boolean clamped, int thread_id) {
+static void convert_yuv_planar_to_bgr_frame(uint8_t **src, int width, int height, int orowstride, uint8_t *dest,
+    boolean in_alpha, boolean out_alpha, boolean clamped, int thread_id) {
   uint8_t *y=src[0];
   uint8_t *u=src[1];
   uint8_t *v=src[2];
@@ -3950,7 +3944,7 @@
   size_t opstep=4,rowstride;
   register int i,j;
 
-  if (G_UNLIKELY(!conv_YR_inited)) init_YUV_to_RGB_tables();
+  if (LIVES_UNLIKELY(!conv_YR_inited)) init_YUV_to_RGB_tables();
 
   if (in_alpha) a=src[3];
 
@@ -3958,47 +3952,47 @@
     int nthreads=0;
     int dheight;
     boolean useme=FALSE;
-    lives_cc_params *ccparams=(lives_cc_params *)g_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
+    lives_cc_params *ccparams=(lives_cc_params *)lives_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
 
     dheight=CEIL((double)height/(double)prefs->nfx_threads,4);
-    for (i=0;i<prefs->nfx_threads;i++) {
+    for (i=0; i<prefs->nfx_threads; i++) {
       if ((y+dheight*i*width)<end) {
 
-	ccparams[i].hsize=width;
+        ccparams[i].hsize=width;
 
-	ccparams[i].srcp[0]=y+dheight*i*width;
-	ccparams[i].srcp[1]=u+dheight*i*width;
-	ccparams[i].srcp[2]=v+dheight*i*width;
-	if (in_alpha) ccparams[i].srcp[3]=a+dheight*i*width;
-
-	ccparams[i].dest=dest+dheight*i*orowstride;
-
-	if (dheight*(i+1)>(height-4)) {
-	  dheight=height-(dheight*i);
-	  useme=TRUE;
-	}
-	if (dheight<4) break;
-
-	ccparams[i].vsize=dheight;
-
-	ccparams[i].orowstrides[0]=orowstride;
-	ccparams[i].in_alpha=in_alpha;
-	ccparams[i].out_alpha=out_alpha;
-	ccparams[i].out_clamped=clamped;
-	ccparams[i].thread_id=i;
-	
-	if (useme) convert_yuv_planar_to_bgr_frame_thread(&ccparams[i]);
-	else {
-	  pthread_create(&cthreads[i],NULL,convert_yuv_planar_to_bgr_frame_thread,&ccparams[i]);
-	  nthreads++;
-	}
+        ccparams[i].srcp[0]=y+dheight*i*width;
+        ccparams[i].srcp[1]=u+dheight*i*width;
+        ccparams[i].srcp[2]=v+dheight*i*width;
+        if (in_alpha) ccparams[i].srcp[3]=a+dheight*i*width;
+
+        ccparams[i].dest=dest+dheight*i*orowstride;
+
+        if (dheight*(i+1)>(height-4)) {
+          dheight=height-(dheight*i);
+          useme=TRUE;
+        }
+        if (dheight<4) break;
+
+        ccparams[i].vsize=dheight;
+
+        ccparams[i].orowstrides[0]=orowstride;
+        ccparams[i].in_alpha=in_alpha;
+        ccparams[i].out_alpha=out_alpha;
+        ccparams[i].out_clamped=clamped;
+        ccparams[i].thread_id=i;
+
+        if (useme) convert_yuv_planar_to_bgr_frame_thread(&ccparams[i]);
+        else {
+          pthread_create(&cthreads[i],NULL,convert_yuv_planar_to_bgr_frame_thread,&ccparams[i]);
+          nthreads++;
+        }
       }
     }
 
-    for (i=0;i<nthreads;i++) {
+    for (i=0; i<nthreads; i++) {
       pthread_join(cthreads[i],NULL);
     }
-    g_free(ccparams);
+    lives_free(ccparams);
     return;
   }
 
@@ -4006,14 +4000,13 @@
 
   rowstride=orowstride-width*opstep;
 
-  for (i=0;i<height;i++) {
-    for (j=0;j<width;j++) {
+  for (i=0; i<height; i++) {
+    for (j=0; j<width; j++) {
       yuv2rgb(*(y++),*(u++),*(v++),&dest[2],&dest[1],&dest[0]);
       if (out_alpha) {
-	if (in_alpha) {
-	  dest[3]=*(a++);
-	}
-	else dest[3]=255;
+        if (in_alpha) {
+          dest[3]=*(a++);
+        } else dest[3]=255;
       }
       dest+=opstep;
     }
@@ -4025,15 +4018,15 @@
 void *convert_yuv_planar_to_bgr_frame_thread(void *data) {
   lives_cc_params *ccparams=(lives_cc_params *)data;
   convert_yuv_planar_to_bgr_frame((uint8_t **)ccparams->srcp,ccparams->hsize,ccparams->vsize,ccparams->orowstrides[0],
-				  (uint8_t *)ccparams->dest,ccparams->in_alpha,ccparams->out_alpha,
-				  ccparams->in_clamped,ccparams->thread_id);
+                                  (uint8_t *)ccparams->dest,ccparams->in_alpha,ccparams->out_alpha,
+                                  ccparams->in_clamped,ccparams->thread_id);
   return NULL;
 }
 
 
 
-static void convert_yuv_planar_to_argb_frame(uint8_t **src, int width, int height, int orowstride, uint8_t *dest, 
-					     boolean in_alpha, boolean clamped, int thread_id) {
+static void convert_yuv_planar_to_argb_frame(uint8_t **src, int width, int height, int orowstride, uint8_t *dest,
+    boolean in_alpha, boolean clamped, int thread_id) {
   uint8_t *y=src[0];
   uint8_t *u=src[1];
   uint8_t *v=src[2];
@@ -4044,7 +4037,7 @@
   size_t opstep=4,rowstride;
   register int i,j;
 
-  if (G_UNLIKELY(!conv_YR_inited)) init_YUV_to_RGB_tables();
+  if (LIVES_UNLIKELY(!conv_YR_inited)) init_YUV_to_RGB_tables();
 
   if (in_alpha) a=src[3];
 
@@ -4052,58 +4045,57 @@
     int nthreads=0;
     int dheight;
     boolean useme=FALSE;
-    lives_cc_params *ccparams=(lives_cc_params *)g_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
+    lives_cc_params *ccparams=(lives_cc_params *)lives_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
 
     dheight=CEIL((double)height/(double)prefs->nfx_threads,4);
-    for (i=0;i<prefs->nfx_threads;i++) {
+    for (i=0; i<prefs->nfx_threads; i++) {
       if ((y+dheight*i*width)<end) {
 
-	ccparams[i].hsize=width;
+        ccparams[i].hsize=width;
+
+        ccparams[i].srcp[0]=y+dheight*i*width;
+        ccparams[i].srcp[1]=u+dheight*i*width;
+        ccparams[i].srcp[2]=v+dheight*i*width;
+        if (in_alpha) ccparams[i].srcp[3]=a+dheight*i*width;
 
-	ccparams[i].srcp[0]=y+dheight*i*width;
-	ccparams[i].srcp[1]=u+dheight*i*width;
-	ccparams[i].srcp[2]=v+dheight*i*width;
-	if (in_alpha) ccparams[i].srcp[3]=a+dheight*i*width;
+        ccparams[i].dest=dest+dheight*i*orowstride;
 
-	ccparams[i].dest=dest+dheight*i*orowstride;
+        if (dheight*(i+1)>(height-4)) {
+          dheight=height-(dheight*i);
+          useme=TRUE;
+        }
+        if (dheight<4) break;
 
-	if (dheight*(i+1)>(height-4)) {
-	  dheight=height-(dheight*i);
-	  useme=TRUE;
-	}
-	if (dheight<4) break;
+        ccparams[i].vsize=dheight;
 
-	ccparams[i].vsize=dheight;
+        ccparams[i].orowstrides[0]=orowstride;
+        ccparams[i].in_alpha=in_alpha;
+        ccparams[i].out_clamped=clamped;
+        ccparams[i].thread_id=i;
 
-	ccparams[i].orowstrides[0]=orowstride;
-	ccparams[i].in_alpha=in_alpha;
-	ccparams[i].out_clamped=clamped;
-	ccparams[i].thread_id=i;
-	
-	if (useme) convert_yuv_planar_to_argb_frame_thread(&ccparams[i]);
-	else {
-	  pthread_create(&cthreads[i],NULL,convert_yuv_planar_to_argb_frame_thread,&ccparams[i]);
-	  nthreads++;
-	}
+        if (useme) convert_yuv_planar_to_argb_frame_thread(&ccparams[i]);
+        else {
+          pthread_create(&cthreads[i],NULL,convert_yuv_planar_to_argb_frame_thread,&ccparams[i]);
+          nthreads++;
+        }
       }
     }
 
-    for (i=0;i<nthreads;i++) {
+    for (i=0; i<nthreads; i++) {
       pthread_join(cthreads[i],NULL);
     }
-    g_free(ccparams);
+    lives_free(ccparams);
     return;
   }
 
   rowstride=orowstride-width*opstep;
 
-  for (i=0;i<height;i++) {
-    for (j=0;j<width;j++) {
+  for (i=0; i<height; i++) {
+    for (j=0; j<width; j++) {
       yuv2rgb(*(y++),*(u++),*(v++),&dest[1],&dest[2],&dest[3]);
       if (in_alpha) {
-	dest[0]=*(a++);
-      }
-      else dest[0]=255;
+        dest[0]=*(a++);
+      } else dest[0]=255;
       dest+=opstep;
     }
     dest+=rowstride;
@@ -4114,7 +4106,7 @@
 void *convert_yuv_planar_to_argb_frame_thread(void *data) {
   lives_cc_params *ccparams=(lives_cc_params *)data;
   convert_yuv_planar_to_argb_frame((uint8_t **)ccparams->srcp,ccparams->hsize,ccparams->vsize,ccparams->orowstrides[0],
-				   (uint8_t *)ccparams->dest,ccparams->in_alpha,ccparams->in_clamped,ccparams->thread_id);
+                                   (uint8_t *)ccparams->dest,ccparams->in_alpha,ccparams->in_clamped,ccparams->thread_id);
   return NULL;
 }
 
@@ -4131,7 +4123,7 @@
 
   set_conversion_arrays(clamped?WEED_YUV_CLAMPING_CLAMPED:WEED_YUV_CLAMPING_UNCLAMPED,WEED_YUV_SUBSPACE_YCBCR);
 
-  for (x=0;x<size;x++) {
+  for (x=0; x<size; x++) {
     // subsample two u pixels
     uyvy->u0=avg_chroma(u[0],u[1]);
     u+=2;
@@ -4155,7 +4147,7 @@
 
   set_conversion_arrays(clamped?WEED_YUV_CLAMPING_CLAMPED:WEED_YUV_CLAMPING_UNCLAMPED,WEED_YUV_SUBSPACE_YCBCR);
 
-  for (x=0;x<hsize;x++) {
+  for (x=0; x<hsize; x++) {
     yuyv->y0=*(y++);
     yuyv->u0=avg_chroma(u[0],u[1]);
     u+=2;
@@ -4167,8 +4159,8 @@
 }
 
 
-static void convert_combineplanes_frame(uint8_t **src, int width, int height, uint8_t *dest, boolean in_alpha, 
-					boolean out_alpha) {
+static void convert_combineplanes_frame(uint8_t **src, int width, int height, uint8_t *dest, boolean in_alpha,
+                                        boolean out_alpha) {
   // turn 3 or 4 planes into packed pixels, src and dest can have alpha
 
   // e.g yuv444(4)p to yuv888(8)
@@ -4184,7 +4176,7 @@
 
   if (in_alpha) a=src[3];
 
-  for (x=0;x<size;x++) {
+  for (x=0; x<size; x++) {
     *(dest++)=*(y++);
     *(dest++)=*(u++);
     *(dest++)=*(v++);
@@ -4243,23 +4235,22 @@
   d_u=dest[1];
   d_v=dest[2];
 
-  for (i=0;i<height;i++) {
-    for (j=0;j<hwidth;j++) {
+  for (i=0; i<height; i++) {
+    for (j=0; j<hwidth; j++) {
 
       if (!chroma) {
-	// pass 1, copy row
-	// average two dest pixels
-	d_u[j]=avg_chroma(s_u[j*2],s_u[j*2+1]);
-	d_v[j]=avg_chroma(s_v[j*2],s_v[j*2+1]);
-      }
-      else {
-	// pass 2
-	// average two dest pixels
-	x_u=avg_chroma(s_u[j*2],s_u[j*2+1]);
-	x_v=avg_chroma(s_v[j*2],s_v[j*2+1]);
-	// average two dest rows
-	d_u[j]=avg_chroma(d_u[j],x_u);
-	d_v[j]=avg_chroma(d_v[j],x_v);
+        // pass 1, copy row
+        // average two dest pixels
+        d_u[j]=avg_chroma(s_u[j*2],s_u[j*2+1]);
+        d_v[j]=avg_chroma(s_v[j*2],s_v[j*2+1]);
+      } else {
+        // pass 2
+        // average two dest pixels
+        x_u=avg_chroma(s_u[j*2],s_u[j*2+1]);
+        x_v=avg_chroma(s_v[j*2],s_v[j*2+1]);
+        // average two dest rows
+        d_u[j]=avg_chroma(d_u[j],x_u);
+        d_v[j]=avg_chroma(d_v[j],x_v);
       }
     }
     if (chroma) {
@@ -4288,8 +4279,8 @@
 
   set_conversion_arrays(clamped?WEED_YUV_CLAMPING_CLAMPED:WEED_YUV_CLAMPING_UNCLAMPED,WEED_YUV_SUBSPACE_YCBCR);
 
-  for (i=0;i<height;i++) {
-    for (j=0;j<widtha;j+=4) {
+  for (i=0; i<height; i++) {
+    for (j=0; j<widtha; j+=4) {
       // average four dest pixels
       yuv->u2=avg_chroma(s_u[0],s_u[1]);
       x_u=avg_chroma(s_u[2],s_u[3]);
@@ -4325,7 +4316,7 @@
   uint8_t *u=dest[1];
   uint8_t *v=dest[2];
 
-  for (x=0;x<size;x++) {
+  for (x=0; x<size; x++) {
     *(u++)=uyvy->u0;
     *(u++)=uyvy->u0;
     *(y++)=uyvy->y0;
@@ -4349,7 +4340,7 @@
   uint8_t *u=dest[1];
   uint8_t *v=dest[2];
 
-  for (x=0;x<size;x++) {
+  for (x=0; x<size; x++) {
     *(y++)=yuyv->y0;
     *(u++)=yuyv->u0;
     *(u++)=yuyv->u0;
@@ -4370,7 +4361,7 @@
   // double chroma horizontally, no subsampling
   // no subsampling : TODO
 
-  for (x=0;x<size;x++) {
+  for (x=0; x<size; x++) {
     *(yuv++)=uyvy->y0;
     *(yuv++)=uyvy->u0;
     *(yuv++)=uyvy->v0;
@@ -4390,7 +4381,7 @@
 
   // no subsampling : TODO
 
-  for (x=0;x<size;x++) {
+  for (x=0; x<size; x++) {
     *(yuv++)=yuyv->y0;
     *(yuv++)=yuyv->u0;
     *(yuv++)=yuyv->v0;
@@ -4422,17 +4413,17 @@
   set_conversion_arrays(clamped?WEED_YUV_CLAMPING_CLAMPED:WEED_YUV_CLAMPING_UNCLAMPED,WEED_YUV_SUBSPACE_YCBCR);
 
   while (y<end) {
-    for (j=0;j<width;j++) {
+    for (j=0; j<width; j++) {
       if (chroma) *(u++)=uyvy->u0;
       else {
-	*u=avg_chroma(*u,uyvy->u0);
-	u++;
+        *u=avg_chroma(*u,uyvy->u0);
+        u++;
       }
       *(y++)=uyvy->y0;
       if (chroma) *(v++)=uyvy->v0;
       else {
-	*v=avg_chroma(*v,uyvy->v0);
-	v++;
+        *v=avg_chroma(*v,uyvy->v0);
+        v++;
       }
       *(y++)=uyvy->y1;
       uyvy++;
@@ -4464,18 +4455,18 @@
   set_conversion_arrays(clamped?WEED_YUV_CLAMPING_CLAMPED:WEED_YUV_CLAMPING_UNCLAMPED,WEED_YUV_SUBSPACE_YCBCR);
 
   while (y<end) {
-    for (j=0;j<width;j++) {
+    for (j=0; j<width; j++) {
       *(y++)=yuyv->y0;
       if (chroma) *(u++)=yuyv->u0;
       else {
-	*u=avg_chroma(*u,yuyv->u0);
-	u++;
+        *u=avg_chroma(*u,yuyv->u0);
+        u++;
       }
       *(y++)=yuyv->y1;
       if (chroma) *(v++)=yuyv->v0;
       else {
-	*v=avg_chroma(*v,yuyv->v0);
-	v++;
+        *v=avg_chroma(*v,yuyv->v0);
+        v++;
       }
       yuyv++;
     }
@@ -4488,20 +4479,20 @@
 }
 
 
-static void convert_uyvy_to_yuv411_frame(uyvy_macropixel *uyvy, int width, int height, yuv411_macropixel *yuv, 
-					 boolean clamped) {
+static void convert_uyvy_to_yuv411_frame(uyvy_macropixel *uyvy, int width, int height, yuv411_macropixel *yuv,
+    boolean clamped) {
   // subsample chroma horizontally
 
   uyvy_macropixel *end=uyvy+width*height;
   register int x;
-  
+
   int widtha=(width<<1)>>1;
   size_t cbytes=width-widtha;
 
   set_conversion_arrays(clamped?WEED_YUV_CLAMPING_CLAMPED:WEED_YUV_CLAMPING_UNCLAMPED,WEED_YUV_SUBSPACE_YCBCR);
 
-  for (;uyvy<end;uyvy+=cbytes) {
-    for (x=0;x<widtha;x+=2) {
+  for (; uyvy<end; uyvy+=cbytes) {
+    for (x=0; x<widtha; x+=2) {
       yuv->u2=avg_chroma(uyvy[0].u0,uyvy[1].u0);
 
       yuv->y0=uyvy[0].y0;
@@ -4511,7 +4502,7 @@
 
       yuv->y2=uyvy[1].y0;
       yuv->y3=uyvy[1].y1;
-      
+
       uyvy+=2;
       yuv++;
     }
@@ -4519,22 +4510,22 @@
 }
 
 
-static void convert_yuyv_to_yuv411_frame(yuyv_macropixel *yuyv, int width, int height, yuv411_macropixel *yuv, 
-					 boolean clamped) {
+static void convert_yuyv_to_yuv411_frame(yuyv_macropixel *yuyv, int width, int height, yuv411_macropixel *yuv,
+    boolean clamped) {
   // subsample chroma horizontally
 
   // TODO - handle different sampling types
 
   yuyv_macropixel *end=yuyv+width*height;
   register int x;
-  
+
   int widtha=(width<<1)>>1;
   size_t cybtes=width-widtha;
 
   set_conversion_arrays(clamped?WEED_YUV_CLAMPING_CLAMPED:WEED_YUV_CLAMPING_UNCLAMPED,WEED_YUV_SUBSPACE_YCBCR);
 
-  for (;yuyv<end;yuyv+=cybtes) {
-    for (x=0;x<widtha;x+=2) {
+  for (; yuyv<end; yuyv+=cybtes) {
+    for (x=0; x<widtha; x+=2) {
       yuv->u2=avg_chroma(yuyv[0].u0,yuyv[1].u0);
 
       yuv->y0=yuyv[0].y0;
@@ -4544,18 +4535,18 @@
 
       yuv->y2=yuyv[1].y0;
       yuv->y3=yuyv[1].y1;
-      
+
       yuyv+=2;
       yuv++;
     }
   }
 }
 
-static void convert_yuv888_to_yuv420_frame(uint8_t *yuv8, int width, int height, int irowstride, 
-					   uint8_t **yuv4, boolean src_alpha, boolean clamped) {
+static void convert_yuv888_to_yuv420_frame(uint8_t *yuv8, int width, int height, int irowstride,
+    uint8_t **yuv4, boolean src_alpha, boolean clamped) {
   // subsample vertically and horizontally
 
-  // 
+  //
 
   // yuv888(8) packed to 420p
 
@@ -4586,20 +4577,19 @@
   widthx=width*ipsize;
 
   while (d_y<end) {
-    for (j=0;j<widthx;j+=ipsize2) {
+    for (j=0; j<widthx; j+=ipsize2) {
       *(d_y++)=yuv8[j];
       *(d_y++)=yuv8[j+ipsize];
       if (chroma) {
-	*(d_u++)=avg_chroma(yuv8[j+1],yuv8[j+1+ipsize]);
-	*(d_v++)=avg_chroma(yuv8[j+2],yuv8[j+2+ipsize]);
-      }
-      else {
-	x_u=avg_chroma(yuv8[j+1],yuv8[j+1+ipsize]);
-	*d_u=avg_chroma(*d_u,x_u);
-	d_u++;
-	x_v=avg_chroma(yuv8[j+2],yuv8[j+2+ipsize]);
-	*d_v=avg_chroma(*d_v,x_v);
-	d_v++;
+        *(d_u++)=avg_chroma(yuv8[j+1],yuv8[j+1+ipsize]);
+        *(d_v++)=avg_chroma(yuv8[j+2],yuv8[j+2+ipsize]);
+      } else {
+        x_u=avg_chroma(yuv8[j+1],yuv8[j+1+ipsize]);
+        *d_u=avg_chroma(*d_u,x_u);
+        d_u++;
+        x_v=avg_chroma(yuv8[j+2],yuv8[j+2+ipsize]);
+        *d_v=avg_chroma(*d_v,x_v);
+        d_v++;
       }
     }
     if (chroma) {
@@ -4621,7 +4611,7 @@
 
   register int x;
 
-  for (x=0;x<size;x++) {
+  for (x=0; x<size; x++) {
     uyvy_2_yuv422(uyvy,y,u,v,y+1);
     y+=2;
     u++;
@@ -4638,7 +4628,7 @@
 
   register int x;
 
-  for (x=0;x<size;x++) {
+  for (x=0; x<size; x++) {
     yuyv_2_yuv422(yuyv,y,u,v,y+1);
     y+=2;
     u++;
@@ -4647,8 +4637,8 @@
 }
 
 
-static void convert_yuv888_to_yuv422_frame(uint8_t *yuv8, int width, int height, int irowstride, 
-					   uint8_t **yuv4, boolean has_alpha, boolean clamped) {
+static void convert_yuv888_to_yuv422_frame(uint8_t *yuv8, int width, int height, int irowstride,
+    uint8_t **yuv4, boolean has_alpha, boolean clamped) {
 
   // 888(8) packed to 422p
 
@@ -4672,24 +4662,23 @@
   ipsize=(3+offs)<<1;
 
   if ((irowstride<<1)==width*ipsize) {
-    for (x=0;x<size;x+=2) {
+    for (x=0; x<size; x+=2) {
       *(y++)=yuv8[0];
       *(y++)=yuv8[3+offs];
       *(u++)=avg_chroma(yuv8[1],yuv8[4+offs]);
       *(v++)=avg_chroma(yuv8[2],yuv8[5+offs]);
       yuv8+=ipsize;
     }
-  }
-  else {
+  } else {
     width>>=1;
     irowstride-=width*ipsize;
-    for (i=0;i<height;i++) {
-      for (j=0;j<width;j++) {
-	*(y++)=yuv8[0];
-	*(y++)=yuv8[3+offs];
-	*(u++)=avg_chroma(yuv8[1],yuv8[4+offs]);
-	*(v++)=avg_chroma(yuv8[2],yuv8[5+offs]);
-	yuv8+=ipsize;
+    for (i=0; i<height; i++) {
+      for (j=0; j<width; j++) {
+        *(y++)=yuv8[0];
+        *(y++)=yuv8[3+offs];
+        *(u++)=avg_chroma(yuv8[1],yuv8[4+offs]);
+        *(v++)=avg_chroma(yuv8[2],yuv8[5+offs]);
+        yuv8+=ipsize;
       }
       yuv8+=irowstride;
     }
@@ -4698,8 +4687,8 @@
 }
 
 
-static void convert_yuv888_to_uyvy_frame(uint8_t *yuv, int width, int height, int irowstride, 
-					 uyvy_macropixel *uyvy, boolean has_alpha, boolean clamped) {
+static void convert_yuv888_to_uyvy_frame(uint8_t *yuv, int width, int height, int irowstride,
+    uyvy_macropixel *uyvy, boolean has_alpha, boolean clamped) {
   int size=width*height;
 
   register int x,i,j;
@@ -4714,7 +4703,7 @@
   ipsize=(3+offs)<<1;
 
   if ((irowstride<<1) == width*ipsize) {
-    for (x=0;x<size;x+=2) {
+    for (x=0; x<size; x+=2) {
       uyvy->u0=avg_chroma(yuv[1],yuv[4+offs]);
       uyvy->y0=yuv[0];
       uyvy->v0=avg_chroma(yuv[2],yuv[5+offs]);
@@ -4722,18 +4711,17 @@
       yuv+=ipsize;
       uyvy++;
     }
-  }
-  else {
+  } else {
     width>>=1;
     irowstride-=width*ipsize;
-    for (i=0;i<height;i++) {
-      for (j=0;j<width;j++) {
-	uyvy->u0=avg_chroma(yuv[1],yuv[4+offs]);
-	uyvy->y0=yuv[0];
-	uyvy->v0=avg_chroma(yuv[2],yuv[5+offs]);
-	uyvy->y1=yuv[3+offs];
-	yuv+=ipsize;
-	uyvy++;
+    for (i=0; i<height; i++) {
+      for (j=0; j<width; j++) {
+        uyvy->u0=avg_chroma(yuv[1],yuv[4+offs]);
+        uyvy->y0=yuv[0];
+        uyvy->v0=avg_chroma(yuv[2],yuv[5+offs]);
+        uyvy->y1=yuv[3+offs];
+        yuv+=ipsize;
+        uyvy++;
       }
       yuv+=irowstride;
     }
@@ -4743,8 +4731,8 @@
 }
 
 
-static void convert_yuv888_to_yuyv_frame(uint8_t *yuv, int width, int height, int irowstride, 
-					 yuyv_macropixel *yuyv, boolean has_alpha, boolean clamped) {
+static void convert_yuv888_to_yuyv_frame(uint8_t *yuv, int width, int height, int irowstride,
+    yuyv_macropixel *yuyv, boolean has_alpha, boolean clamped) {
   int size=width*height;
 
   register int x,i,j;
@@ -4759,7 +4747,7 @@
   ipsize=(3+offs)<<1;
 
   if (irowstride<<1 == width*ipsize) {
-    for (x=0;x<size;x+=2) {
+    for (x=0; x<size; x+=2) {
       yuyv->y0=yuv[0];
       yuyv->u0=avg_chroma(yuv[1],yuv[4+offs]);
       yuyv->y1=yuv[3+offs];
@@ -4767,26 +4755,25 @@
       yuv+=ipsize;
       yuyv++;
     }
-  }
-  else {
+  } else {
     width>>=1;
     irowstride-=width*ipsize;
-    for (i=0;i<height;i++) {
-      for (j=0;j<width;j++) {
-	yuyv->y0=yuv[0];
-	yuyv->u0=avg_chroma(yuv[1],yuv[4+offs]);
-	yuyv->y1=yuv[3+offs];
-	yuyv->v0=avg_chroma(yuv[2],yuv[5+offs]);
-	yuv+=ipsize;
-	yuyv++;
+    for (i=0; i<height; i++) {
+      for (j=0; j<width; j++) {
+        yuyv->y0=yuv[0];
+        yuyv->u0=avg_chroma(yuv[1],yuv[4+offs]);
+        yuyv->y1=yuv[3+offs];
+        yuyv->v0=avg_chroma(yuv[2],yuv[5+offs]);
+        yuv+=ipsize;
+        yuyv++;
       }
       yuv+=irowstride;
     }
   }
-} 
-    
-static void convert_yuv888_to_yuv411_frame(uint8_t *yuv8, int width, int height, int irowstride, 
-					   yuv411_macropixel *yuv411, boolean has_alpha) {
+}
+
+static void convert_yuv888_to_yuv411_frame(uint8_t *yuv8, int width, int height, int irowstride,
+    yuv411_macropixel *yuv411, boolean has_alpha) {
   // yuv 888(8) packed to yuv411. Chroma pixels are averaged.
 
   // TODO - handle different sampling types
@@ -4801,15 +4788,15 @@
 
   irowstride-=widtha*ipsize;
 
-  for (;yuv8<end;yuv8+=cbytes) {
-    for (x=0;x<widtha;x+=4) { // process 4 input pixels for one output macropixel
+  for (; yuv8<end; yuv8+=cbytes) {
+    for (x=0; x<widtha; x+=4) { // process 4 input pixels for one output macropixel
       yuv411->u2=(yuv8[1]+yuv8[ipsize+1]+yuv8[2*ipsize+1]+yuv8[3*ipsize+1])>>2;
       yuv411->y0=yuv8[0];
       yuv411->y1=yuv8[ipsize];
       yuv411->v2=(yuv8[2]+yuv8[ipsize+2]+yuv8[2*ipsize+2]+yuv8[3*ipsize+2])>>2;
       yuv411->y2=yuv8[ipsize*2];
       yuv411->y3=yuv8[ipsize*3];
-      
+
       yuv411++;
       yuv8+=ipsize*4;
     }
@@ -4818,8 +4805,8 @@
 }
 
 
-static void convert_yuv411_to_rgb_frame(yuv411_macropixel *yuv411, int width, int height, int orowstride, 
-					uint8_t *dest, boolean add_alpha, boolean clamped) {
+static void convert_yuv411_to_rgb_frame(yuv411_macropixel *yuv411, int width, int height, int orowstride,
+                                        uint8_t *dest, boolean add_alpha, boolean clamped) {
   uyvy_macropixel uyvy;
   int m=3,n=4,o=5;
   uint8_t u,v,h_u,h_v,q_u,q_v,y0,y1;
@@ -4827,7 +4814,7 @@
   yuv411_macropixel *end=yuv411+width*height;
   size_t psize=3,psize2;
 
-  if (G_UNLIKELY(!conv_YR_inited)) init_YUV_to_RGB_tables();
+  if (LIVES_UNLIKELY(!conv_YR_inited)) init_YUV_to_RGB_tables();
 
   set_conversion_arrays(clamped?WEED_YUV_CLAMPING_CLAMPED:WEED_YUV_CLAMPING_UNCLAMPED,WEED_YUV_SUBSPACE_YCBCR);
 
@@ -4852,7 +4839,7 @@
     uyvy2rgb(&uyvy,&dest[0],&(dest[1]),&dest[2],&dest[m],&dest[n],&dest[o]);
     dest+=psize2;
 
-    for (j=1;j<width;j++) {
+    for (j=1; j<width; j++) {
       // convert 6 yuv411 bytes to 4 rgb(a) pixels
 
       // average first 2 RGB pixels of this block and last 2 RGB pixels of previous block
@@ -4885,10 +4872,10 @@
       dest+=psize2;
 
       // set first 2 RGB pixels of this block
-   
+
       y0=yuv411[j].y0;
       y1=yuv411[j].y1;
-      
+
       // avg to get 3/4, 1/2
 
       q_u=avg_chroma(h_u,yuv411[j].u2);
@@ -4926,8 +4913,8 @@
 }
 
 
-static void convert_yuv411_to_bgr_frame(yuv411_macropixel *yuv411, int width, int height, int orowstride, 
-					uint8_t *dest, boolean add_alpha, boolean clamped) {
+static void convert_yuv411_to_bgr_frame(yuv411_macropixel *yuv411, int width, int height, int orowstride,
+                                        uint8_t *dest, boolean add_alpha, boolean clamped) {
   uyvy_macropixel uyvy;
   int m=3,n=4,o=5;
   uint8_t u,v,h_u,h_v,q_u,q_v,y0,y1;
@@ -4935,7 +4922,7 @@
   yuv411_macropixel *end=yuv411+width*height;
   size_t psize=3,psize2;
 
-  if (G_UNLIKELY(!conv_YR_inited)) init_YUV_to_RGB_tables();
+  if (LIVES_UNLIKELY(!conv_YR_inited)) init_YUV_to_RGB_tables();
 
   set_conversion_arrays(clamped?WEED_YUV_CLAMPING_CLAMPED:WEED_YUV_CLAMPING_UNCLAMPED,WEED_YUV_SUBSPACE_YCBCR);
 
@@ -4961,7 +4948,7 @@
     uyvy2rgb(&uyvy,&dest[0],&(dest[1]),&dest[2],&dest[o],&dest[n],&dest[m]);
     dest+=psize2;
 
-    for (j=1;j<width;j++) {
+    for (j=1; j<width; j++) {
       // convert 6 yuv411 bytes to 4 rgb(a) pixels
 
       // average first 2 RGB pixels of this block and last 2 RGB pixels of previous block
@@ -4994,10 +4981,10 @@
       dest+=psize2;
 
       // set first 2 RGB pixels of this block
-   
+
       y0=yuv411[j].y0;
       y1=yuv411[j].y1;
-      
+
       // avg to get 3/4, 1/2
 
       q_u=avg_chroma(h_u,yuv411[j].u2);
@@ -5035,15 +5022,15 @@
 }
 
 
-static void convert_yuv411_to_argb_frame(yuv411_macropixel *yuv411, int width, int height, int orowstride, 
-					 uint8_t *dest, boolean clamped) {
+static void convert_yuv411_to_argb_frame(yuv411_macropixel *yuv411, int width, int height, int orowstride,
+    uint8_t *dest, boolean clamped) {
   uyvy_macropixel uyvy;
   uint8_t u,v,h_u,h_v,q_u,q_v,y0,y1;
   register int j;
   yuv411_macropixel *end=yuv411+width*height;
   size_t psize=4,psize2;
 
-  if (G_UNLIKELY(!conv_YR_inited)) init_YUV_to_RGB_tables();
+  if (LIVES_UNLIKELY(!conv_YR_inited)) init_YUV_to_RGB_tables();
 
   set_conversion_arrays(clamped?WEED_YUV_CLAMPING_CLAMPED:WEED_YUV_CLAMPING_UNCLAMPED,WEED_YUV_SUBSPACE_YCBCR);
 
@@ -5061,7 +5048,7 @@
     uyvy2rgb(&uyvy,&dest[1],&(dest[2]),&dest[3],&dest[5],&dest[6],&dest[7]);
     dest+=psize2;
 
-    for (j=1;j<width;j++) {
+    for (j=1; j<width; j++) {
       // convert 6 yuv411 bytes to 4 argb pixels
 
       // average first 2 ARGB pixels of this block and last 2 ARGB pixels of previous block
@@ -5094,10 +5081,10 @@
       dest+=psize2;
 
       // set first 2 ARGB pixels of this block
-   
+
       y0=yuv411[j].y0;
       y1=yuv411[j].y1;
-      
+
       // avg to get 3/4, 1/2
 
       q_u=avg_chroma(h_u,yuv411[j].u2);
@@ -5135,8 +5122,8 @@
 }
 
 
-static void convert_yuv411_to_yuv888_frame(yuv411_macropixel *yuv411, int width, int height, 
-					   uint8_t *dest, boolean add_alpha, boolean clamped) {
+static void convert_yuv411_to_yuv888_frame(yuv411_macropixel *yuv411, int width, int height,
+    uint8_t *dest, boolean add_alpha, boolean clamped) {
   size_t psize=3;
   register int j;
   yuv411_macropixel *end=yuv411+width*height;
@@ -5161,7 +5148,7 @@
     dest[2]=yuv411[0].v2;
     dest+=psize;
 
-    for (j=1;j<width;j++) {
+    for (j=1; j<width; j++) {
       // convert 6 yuv411 bytes to 4 rgb(a) pixels
 
       // average first 2 RGB pixels of this block and last 2 RGB pixels of previous block
@@ -5202,10 +5189,10 @@
       dest+=psize;
 
       // set first 2 RGB pixels of this block
-   
+
       y0=yuv411[j].y0;
       y1=yuv411[j].y1;
-      
+
       // avg to get 3/4, 1/2
 
       q_u=avg_chroma(h_u,yuv411[j].u2);
@@ -5254,8 +5241,8 @@
 }
 
 
-static void convert_yuv411_to_yuvp_frame(yuv411_macropixel *yuv411, int width, int height, uint8_t **dest, 
-					 boolean add_alpha, boolean clamped) {
+static void convert_yuv411_to_yuvp_frame(yuv411_macropixel *yuv411, int width, int height, uint8_t **dest,
+    boolean add_alpha, boolean clamped) {
   register int j;
   yuv411_macropixel *end=yuv411+width*height;
   uint8_t u,v,h_u,h_v,q_u,q_v,y0;
@@ -5279,7 +5266,7 @@
     *(d_v++)=yuv411[0].v2;
     if (add_alpha) *(d_a++)=255;
 
-    for (j=1;j<width;j++) {
+    for (j=1; j<width; j++) {
       // convert 6 yuv411 bytes to 4 rgb(a) pixels
 
       // average first 2 RGB pixels of this block and last 2 RGB pixels of previous block
@@ -5315,9 +5302,9 @@
       if (add_alpha) *(d_a++)=255;
 
       // set first 2 RGB pixels of this block
-   
+
       y0=yuv411[j].y0;
-      
+
       // avg to get 3/4, 1/2
 
       q_u=avg_chroma(h_u,yuv411[j].u2);
@@ -5359,8 +5346,8 @@
 }
 
 
-static void convert_yuv411_to_uyvy_frame(yuv411_macropixel *yuv411, int width, int height, 
-					 uyvy_macropixel *uyvy, boolean clamped) {
+static void convert_yuv411_to_uyvy_frame(yuv411_macropixel *yuv411, int width, int height,
+    uyvy_macropixel *uyvy, boolean clamped) {
   register int j;
   yuv411_macropixel *end=yuv411+width*height;
   uint8_t u,v,h_u,h_v,y0;
@@ -5376,7 +5363,7 @@
 
     uyvy++;
 
-    for (j=1;j<width;j++) {
+    for (j=1; j<width; j++) {
       // convert 6 yuv411 bytes to 2 uyvy macro pixels
 
       // average first 2 RGB pixels of this block and last 2 RGB pixels of previous block
@@ -5406,9 +5393,9 @@
       v=avg_chroma(h_v,yuv411[j].v2);
 
       // set first uyvy macropixel of this block
-   
+
       y0=yuv411[j].y0;
-      
+
       uyvy->u0=u;
       uyvy->y0=y0;
       uyvy->v0=v;
@@ -5430,8 +5417,8 @@
 }
 
 
-static void convert_yuv411_to_yuyv_frame(yuv411_macropixel *yuv411, int width, int height, yuyv_macropixel *yuyv, 
-					 boolean clamped) {
+static void convert_yuv411_to_yuyv_frame(yuv411_macropixel *yuv411, int width, int height, yuyv_macropixel *yuyv,
+    boolean clamped) {
   register int j;
   yuv411_macropixel *end=yuv411+width*height;
   uint8_t u,v,h_u,h_v,y0;
@@ -5447,7 +5434,7 @@
 
     yuyv++;
 
-    for (j=1;j<width;j++) {
+    for (j=1; j<width; j++) {
       // convert 6 yuv411 bytes to 2 yuyv macro pixels
 
       // average first 2 RGB pixels of this block and last 2 RGB pixels of previous block
@@ -5477,9 +5464,9 @@
       v=avg_chroma(h_v,yuv411[j].v2);
 
       // set first yuyv macropixel of this block
-   
+
       y0=yuv411[j].y0;
-      
+
       yuyv->y0=y0;
       yuyv->u0=u;
       yuyv->y1=y0;
@@ -5501,8 +5488,8 @@
 }
 
 
-static void convert_yuv411_to_yuv422_frame(yuv411_macropixel *yuv411, int width, int height, uint8_t **dest, 
-					   boolean clamped) {
+static void convert_yuv411_to_yuv422_frame(yuv411_macropixel *yuv411, int width, int height, uint8_t **dest,
+    boolean clamped) {
   register int j;
   yuv411_macropixel *end=yuv411+width*height;
   uint8_t h_u,h_v;
@@ -5520,7 +5507,7 @@
     *(d_u++)=yuv411->u2;
     *(d_v++)=yuv411->v2;
 
-    for (j=1;j<width;j++) {
+    for (j=1; j<width; j++) {
       // convert 6 yuv411 bytes to 2 yuyv macro pixels
 
       // average first 2 RGB pixels of this block and last 2 RGB pixels of previous block
@@ -5559,8 +5546,8 @@
 }
 
 
-static void convert_yuv411_to_yuv420_frame(yuv411_macropixel *yuv411, int width, int height, uint8_t **dest, 
-					   boolean is_yvu, boolean clamped) {
+static void convert_yuv411_to_yuv420_frame(yuv411_macropixel *yuv411, int width, int height, uint8_t **dest,
+    boolean is_yvu, boolean clamped) {
   register int j;
   yuv411_macropixel *end=yuv411+width*height;
   uint8_t h_u,h_v,u,v;
@@ -5576,8 +5563,7 @@
   if (!is_yvu) {
     d_u=dest[1];
     d_v=dest[2];
-  }
-  else {
+  } else {
     d_u=dest[2];
     d_v=dest[1];
   }
@@ -5595,13 +5581,12 @@
     if (!chroma) {
       *(d_u++)=u;
       *(d_v++)=v;
-    }
-    else {
+    } else {
       *d_u=avg_chroma(*d_u,u);
       *d_v=avg_chroma(*d_v,v);
     }
 
-    for (j=1;j<width;j++) {
+    for (j=1; j<width; j++) {
       // convert 6 yuv411 bytes to 2 yuyv macro pixels
 
       // average first 2 RGB pixels of this block and last 2 RGB pixels of previous block
@@ -5620,12 +5605,11 @@
       v=avg_chroma(h_v,yuv411[j-1].v2);
 
       if (!chroma) {
-	*(d_u++)=u;
-	*(d_v++)=v;
-      }
-      else {
-	*d_u=avg_chroma(*d_u,u);
-	*d_v=avg_chroma(*d_v,v);
+        *(d_u++)=u;
+        *(d_v++)=v;
+      } else {
+        *d_u=avg_chroma(*d_u,u);
+        *d_v=avg_chroma(*d_v,v);
       }
 
       // average first pixel to get 3/4
@@ -5637,12 +5621,11 @@
       v=avg_chroma(h_v,yuv411[j].v2);
 
       if (!chroma) {
-	*(d_u++)=u;
-	*(d_v++)=v;
-      }
-      else {
-	*d_u=avg_chroma(*d_u,u);
-	*d_v=avg_chroma(*d_v,v);
+        *(d_u++)=u;
+        *(d_v++)=v;
+      } else {
+        *d_u=avg_chroma(*d_u,u);
+        *d_v=avg_chroma(*d_v,v);
       }
 
     }
@@ -5661,8 +5644,7 @@
       d_u-=width2;
       d_v-=width2;
 
-    }
-    else {
+    } else {
       *d_u=avg_chroma(*d_u,u);
       *d_v=avg_chroma(*d_v,v);
     }
@@ -5674,8 +5656,8 @@
 }
 
 
-static void convert_yuv420_to_yuv411_frame(uint8_t **src, int hsize, int vsize, yuv411_macropixel *dest, 
-					   boolean is_422, boolean clamped) {
+static void convert_yuv420_to_yuv411_frame(uint8_t **src, int hsize, int vsize, yuv411_macropixel *dest,
+    boolean is_422, boolean clamped) {
   // TODO -handle various sampling types
 
   register int i=0,j;
@@ -5686,7 +5668,7 @@
 
   // TODO - handle different in sampling types
   set_conversion_arrays(clamped?WEED_YUV_CLAMPING_CLAMPED:WEED_YUV_CLAMPING_UNCLAMPED,WEED_YUV_SUBSPACE_YCBCR);
-  
+
   y=src[0];
   u=src[1];
   v=src[2];
@@ -5697,17 +5679,17 @@
   qwidth=hwidth>>1;
 
   while (y<end) {
-    for (j=0;j<qwidth;j++) {
+    for (j=0; j<qwidth; j++) {
       dest->u2=avg_chroma(u[0],u[1]);
       dest->y0=y[0];
       dest->y1=y[1];
       dest->v2=avg_chroma(v[0],v[1]);
       dest->y2=y[2];
       dest->y3=y[3];
-      
+
       if (!is_422&&chroma&&i>0) {
-	dest[-qwidth].u2=avg_chroma(dest[-qwidth].u2,dest->u2);
-	dest[-qwidth].v2=avg_chroma(dest[-qwidth].v2,dest->v2);
+        dest[-qwidth].u2=avg_chroma(dest[-qwidth].u2,dest->u2);
+        dest[-qwidth].v2=avg_chroma(dest[-qwidth].v2,dest->v2);
       }
       dest++;
       y+=4;
@@ -5725,8 +5707,8 @@
 
 
 
-static void convert_splitplanes_frame(uint8_t *src, int width, int height, int irowstride, 
-				      uint8_t **dest, boolean src_alpha, boolean dest_alpha) {
+static void convert_splitplanes_frame(uint8_t *src, int width, int height, int irowstride,
+                                      uint8_t **dest, boolean src_alpha, boolean dest_alpha) {
 
   // convert 888(8) packed to 444(4)P planar
   size_t size=width*height;
@@ -5744,30 +5726,29 @@
   if (src_alpha) ipsize=4;
   if (irowstride==ipsize*width) {
 
-    for (end=src+size*ipsize;src<end;) {
+    for (end=src+size*ipsize; src<end;) {
       *(y++)=*(src++);
       *(u++)=*(src++);
       *(v++)=*(src++);
       if (dest_alpha) {
-	if (src_alpha) *(a++)=*(src++);
-	else *(a++)=255;
+        if (src_alpha) *(a++)=*(src++);
+        else *(a++)=255;
       }
     }
-  }
-  else {
+  } else {
     width*=ipsize;
     irowstride-=width;
-    for (i=0;i<height;i++) {
-      for (j=0;j<width;j+=ipsize) {
-	*(y++)=*(src++);
-	*(u++)=*(src++);
-	*(v++)=*(src++);
-	if (dest_alpha) {
-	  if (src_alpha) *(a++)=*(src++);
-	  else *(a++)=255;
-	}
+    for (i=0; i<height; i++) {
+      for (j=0; j<width; j+=ipsize) {
+        *(y++)=*(src++);
+        *(u++)=*(src++);
+        *(v++)=*(src++);
+        if (dest_alpha) {
+          if (src_alpha) *(a++)=*(src++);
+          else *(a++)=255;
+        }
       }
-      
+
       src+=irowstride;
     }
   }
@@ -5779,8 +5760,8 @@
 /////////////////////////////////////////////////////////////////
 // RGB palette conversions
 
-static void convert_swap3_frame (uint8_t *src, int width, int height, int irowstride, int orowstride, 
-				 uint8_t *dest, int thread_id) {
+static void convert_swap3_frame(uint8_t *src, int width, int height, int irowstride, int orowstride,
+                                uint8_t *dest, int thread_id) {
   // swap 3 byte palette
   uint8_t *end=src+height*irowstride;
   register int i;
@@ -5789,40 +5770,40 @@
     int nthreads=0;
     int dheight;
     boolean useme=FALSE;
-    lives_cc_params *ccparams=(lives_cc_params *)g_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
+    lives_cc_params *ccparams=(lives_cc_params *)lives_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
 
     dheight=CEIL((double)height/(double)prefs->nfx_threads,4);
-    for (i=0;i<prefs->nfx_threads;i++) {
+    for (i=0; i<prefs->nfx_threads; i++) {
       if ((src+dheight*i*irowstride)<end) {
 
-	ccparams[i].src=src+dheight*i*irowstride;
-	ccparams[i].hsize=width;
-	ccparams[i].dest=dest+dheight*i*orowstride;
-
-	if (dheight*(i+1)>(height-4)) {
-	  dheight=height-(dheight*i);
-	  useme=TRUE;
-	}
-	if (dheight<4) break;
-
-	ccparams[i].vsize=dheight;
-
-	ccparams[i].irowstrides[0]=irowstride;
-	ccparams[i].orowstrides[0]=orowstride;
-	ccparams[i].thread_id=i;
-	
-	if (useme) convert_swap3_frame_thread(&ccparams[i]);
-	else {
-	  pthread_create(&cthreads[i],NULL,convert_swap3_frame_thread,&ccparams[i]);
-	  nthreads++;
-	}
+        ccparams[i].src=src+dheight*i*irowstride;
+        ccparams[i].hsize=width;
+        ccparams[i].dest=dest+dheight*i*orowstride;
+
+        if (dheight*(i+1)>(height-4)) {
+          dheight=height-(dheight*i);
+          useme=TRUE;
+        }
+        if (dheight<4) break;
+
+        ccparams[i].vsize=dheight;
+
+        ccparams[i].irowstrides[0]=irowstride;
+        ccparams[i].orowstrides[0]=orowstride;
+        ccparams[i].thread_id=i;
+
+        if (useme) convert_swap3_frame_thread(&ccparams[i]);
+        else {
+          pthread_create(&cthreads[i],NULL,convert_swap3_frame_thread,&ccparams[i]);
+          nthreads++;
+        }
       }
     }
 
-    for (i=0;i<nthreads;i++) {
+    for (i=0; i<nthreads; i++) {
       pthread_join(cthreads[i],NULL);
     }
-    g_free(ccparams);
+    lives_free(ccparams);
     return;
   }
 
@@ -5831,21 +5812,20 @@
 #ifdef ENABLE_OIL
     oil_rgb2bgr(dest,src,width*height);
 #else
-    for (;src<end;src+=3) {
+    for (; src<end; src+=3) {
       *(dest++)=src[2]; // red
       *(dest++)=src[1]; // green
       *(dest++)=src[0]; // blue
     }
 #endif
-  }
-  else {
+  } else {
     int width3=width*3;
     orowstride-=width3;
-    for (;src<end;src+=irowstride) {
-      for (i=0;i<width3;i+=3) {
-	*(dest++)=src[i+2]; // red
-	*(dest++)=src[i+1]; // green
-	*(dest++)=src[i]; // blue
+    for (; src<end; src+=irowstride) {
+      for (i=0; i<width3; i+=3) {
+        *(dest++)=src[i+2]; // red
+        *(dest++)=src[i+1]; // green
+        *(dest++)=src[i]; // blue
       }
       dest+=orowstride;
     }
@@ -5856,14 +5836,14 @@
 void *convert_swap3_frame_thread(void *data) {
   lives_cc_params *ccparams=(lives_cc_params *)data;
   convert_swap3_frame((uint8_t *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->irowstrides[0],
-		      ccparams->orowstrides[0],(uint8_t *)ccparams->dest,ccparams->thread_id);
+                      ccparams->orowstrides[0],(uint8_t *)ccparams->dest,ccparams->thread_id);
   return NULL;
 }
 
 
 
-static void convert_swap4_frame (uint8_t *src, int width, int height, int irowstride, int orowstride, 
-				 uint8_t *dest, int thread_id) {
+static void convert_swap4_frame(uint8_t *src, int width, int height, int irowstride, int orowstride,
+                                uint8_t *dest, int thread_id) {
   // swap 4 byte palette
   uint8_t *end=src+height*irowstride;
   register int i;
@@ -5872,59 +5852,58 @@
     int nthreads=0;
     int dheight;
     boolean useme=FALSE;
-    lives_cc_params *ccparams=(lives_cc_params *)g_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
+    lives_cc_params *ccparams=(lives_cc_params *)lives_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
 
     dheight=CEIL((double)height/(double)prefs->nfx_threads,4);
-    for (i=0;i<prefs->nfx_threads;i++) {
+    for (i=0; i<prefs->nfx_threads; i++) {
       if ((src+dheight*i*irowstride)<end) {
 
-	ccparams[i].src=src+dheight*i*irowstride;
-	ccparams[i].hsize=width;
-	ccparams[i].dest=dest+dheight*i*orowstride;
+        ccparams[i].src=src+dheight*i*irowstride;
+        ccparams[i].hsize=width;
+        ccparams[i].dest=dest+dheight*i*orowstride;
 
-	if ((height-dheight*i)<dheight) dheight=height-(dheight*i);
-	if (dheight<4) break;
+        if ((height-dheight*i)<dheight) dheight=height-(dheight*i);
+        if (dheight<4) break;
 
-	ccparams[i].vsize=dheight;
+        ccparams[i].vsize=dheight;
 
-	ccparams[i].irowstrides[0]=irowstride;
-	ccparams[i].orowstrides[0]=orowstride;
-	ccparams[i].thread_id=i;
-	
-	if (useme) convert_swap4_frame_thread(&ccparams[i]);
-	else {
-	  pthread_create(&cthreads[i],NULL,convert_swap4_frame_thread,&ccparams[i]);
-	  nthreads++;
-	}
+        ccparams[i].irowstrides[0]=irowstride;
+        ccparams[i].orowstrides[0]=orowstride;
+        ccparams[i].thread_id=i;
+
+        if (useme) convert_swap4_frame_thread(&ccparams[i]);
+        else {
+          pthread_create(&cthreads[i],NULL,convert_swap4_frame_thread,&ccparams[i]);
+          nthreads++;
+        }
       }
     }
 
-    for (i=0;i<nthreads;i++) {
+    for (i=0; i<nthreads; i++) {
       pthread_join(cthreads[i],NULL);
     }
-    g_free(ccparams);
+    lives_free(ccparams);
     return;
   }
 
 
   if ((irowstride==width*4)&&(orowstride==irowstride)) {
     // quick version
-    for (;src<end;src+=4) {
+    for (; src<end; src+=4) {
       *(dest++)=src[3]; // alpha
       *(dest++)=src[2]; // red
       *(dest++)=src[1]; // green
       *(dest++)=src[0]; // blue
     }
-  }
-  else {
+  } else {
     int width4=width*4;
     orowstride-=width4;
-    for (;src<end;src+=irowstride) {
-      for (i=0;i<width4;i+=4) {
-	*(dest++)=src[i+3]; // alpha
-	*(dest++)=src[i+2]; // red
-	*(dest++)=src[i+1]; // green
-	*(dest++)=src[i]; // blue
+    for (; src<end; src+=irowstride) {
+      for (i=0; i<width4; i+=4) {
+        *(dest++)=src[i+3]; // alpha
+        *(dest++)=src[i+2]; // red
+        *(dest++)=src[i+1]; // green
+        *(dest++)=src[i]; // blue
       }
       dest+=orowstride;
     }
@@ -5935,13 +5914,13 @@
 void *convert_swap4_frame_thread(void *data) {
   lives_cc_params *ccparams=(lives_cc_params *)data;
   convert_swap4_frame((uint8_t *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->irowstrides[0],
-		      ccparams->orowstrides[0],(uint8_t *)ccparams->dest,ccparams->thread_id);
+                      ccparams->orowstrides[0],(uint8_t *)ccparams->dest,ccparams->thread_id);
   return NULL;
 }
 
 
-static void convert_swap3addpost_frame(uint8_t *src, int width, int height, int irowstride, int orowstride, 
-				       uint8_t *dest, int thread_id) {
+static void convert_swap3addpost_frame(uint8_t *src, int width, int height, int irowstride, int orowstride,
+                                       uint8_t *dest, int thread_id) {
   // swap 3 bytes, add post alpha
   uint8_t *end=src+height*irowstride;
   register int i;
@@ -5950,61 +5929,60 @@
     int nthreads=0;
     int dheight;
     boolean useme=FALSE;
-    lives_cc_params *ccparams=(lives_cc_params *)g_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
+    lives_cc_params *ccparams=(lives_cc_params *)lives_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
 
     dheight=CEIL((double)height/(double)prefs->nfx_threads,4);
-    for (i=0;i<prefs->nfx_threads;i++) {
+    for (i=0; i<prefs->nfx_threads; i++) {
       if ((src+dheight*i*irowstride)<end) {
 
-	ccparams[i].src=src+dheight*i*irowstride;
-	ccparams[i].hsize=width;
-	ccparams[i].dest=dest+dheight*i*orowstride;
-
-	if (dheight*(i+1)>(height-4)) {
-	  dheight=height-(dheight*i);
-	  useme=TRUE;
-	}
-	if (dheight<4) break;
-
-	ccparams[i].vsize=dheight;
-
-	ccparams[i].irowstrides[0]=irowstride;
-	ccparams[i].orowstrides[0]=orowstride;
-	ccparams[i].thread_id=i;
-	
-	if (useme) convert_swap3addpost_frame_thread(&ccparams[i]);
-	else {
-	  pthread_create(&cthreads[i],NULL,convert_swap3addpost_frame_thread,&ccparams[i]);
-	  nthreads++;
-	}
+        ccparams[i].src=src+dheight*i*irowstride;
+        ccparams[i].hsize=width;
+        ccparams[i].dest=dest+dheight*i*orowstride;
+
+        if (dheight*(i+1)>(height-4)) {
+          dheight=height-(dheight*i);
+          useme=TRUE;
+        }
+        if (dheight<4) break;
+
+        ccparams[i].vsize=dheight;
+
+        ccparams[i].irowstrides[0]=irowstride;
+        ccparams[i].orowstrides[0]=orowstride;
+        ccparams[i].thread_id=i;
+
+        if (useme) convert_swap3addpost_frame_thread(&ccparams[i]);
+        else {
+          pthread_create(&cthreads[i],NULL,convert_swap3addpost_frame_thread,&ccparams[i]);
+          nthreads++;
+        }
       }
     }
 
-    for (i=0;i<nthreads;i++) {
+    for (i=0; i<nthreads; i++) {
       pthread_join(cthreads[i],NULL);
     }
-    g_free(ccparams);
+    lives_free(ccparams);
     return;
   }
 
   if ((irowstride==width*3)&&(orowstride==width*4)) {
     // quick version
-    for (;src<end;src+=3) {
+    for (; src<end; src+=3) {
       *(dest++)=src[2]; // red
       *(dest++)=src[1]; // green
       *(dest++)=src[0]; // blue
       *(dest++)=255; // alpha
     }
-  }
-  else {
+  } else {
     int width3=width*3;
     orowstride-=width*4;
-    for (;src<end;src+=irowstride) {
-      for (i=0;i<width3;i+=3) {
-	*(dest++)=src[i+2]; // red
-	*(dest++)=src[i+1]; // green
-	*(dest++)=src[i]; // blue
-	*(dest++)=255; // alpha
+    for (; src<end; src+=irowstride) {
+      for (i=0; i<width3; i+=3) {
+        *(dest++)=src[i+2]; // red
+        *(dest++)=src[i+1]; // green
+        *(dest++)=src[i]; // blue
+        *(dest++)=255; // alpha
       }
       dest+=orowstride;
     }
@@ -6016,14 +5994,14 @@
 void *convert_swap3addpost_frame_thread(void *data) {
   lives_cc_params *ccparams=(lives_cc_params *)data;
   convert_swap3addpost_frame((uint8_t *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->irowstrides[0],
-			     ccparams->orowstrides[0],(uint8_t *)ccparams->dest,ccparams->thread_id);
+                             ccparams->orowstrides[0],(uint8_t *)ccparams->dest,ccparams->thread_id);
   return NULL;
 }
 
 
 
-static void convert_swap3addpre_frame(uint8_t *src, int width, int height, int irowstride, int orowstride, 
-				      uint8_t *dest, int thread_id) {
+static void convert_swap3addpre_frame(uint8_t *src, int width, int height, int irowstride, int orowstride,
+                                      uint8_t *dest, int thread_id) {
   // swap 3 bytes, add pre alpha
   uint8_t *end=src+height*irowstride;
   register int i;
@@ -6032,61 +6010,60 @@
     int nthreads=0;
     int dheight;
     boolean useme=FALSE;
-    lives_cc_params *ccparams=(lives_cc_params *)g_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
+    lives_cc_params *ccparams=(lives_cc_params *)lives_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
 
     dheight=CEIL((double)height/(double)prefs->nfx_threads,4);
-    for (i=0;i<prefs->nfx_threads;i++) {
+    for (i=0; i<prefs->nfx_threads; i++) {
       if ((src+dheight*i*irowstride)<end) {
 
-	ccparams[i].src=src+dheight*i*irowstride;
-	ccparams[i].hsize=width;
-	ccparams[i].dest=dest+dheight*i*orowstride;
-
-	if (dheight*(i+1)>(height-4)) {
-	  dheight=height-(dheight*i);
-	  useme=TRUE;
-	}
-	if (dheight<4) break;
-
-	ccparams[i].vsize=dheight;
-
-	ccparams[i].irowstrides[0]=irowstride;
-	ccparams[i].orowstrides[0]=orowstride;
-	ccparams[i].thread_id=i;
-	
-	if (useme) convert_swap3addpre_frame_thread(&ccparams[i]);
-	else {
-	  pthread_create(&cthreads[i],NULL,convert_swap3addpre_frame_thread,&ccparams[i]);
-	  nthreads++;
-	}
+        ccparams[i].src=src+dheight*i*irowstride;
+        ccparams[i].hsize=width;
+        ccparams[i].dest=dest+dheight*i*orowstride;
+
+        if (dheight*(i+1)>(height-4)) {
+          dheight=height-(dheight*i);
+          useme=TRUE;
+        }
+        if (dheight<4) break;
+
+        ccparams[i].vsize=dheight;
+
+        ccparams[i].irowstrides[0]=irowstride;
+        ccparams[i].orowstrides[0]=orowstride;
+        ccparams[i].thread_id=i;
+
+        if (useme) convert_swap3addpre_frame_thread(&ccparams[i]);
+        else {
+          pthread_create(&cthreads[i],NULL,convert_swap3addpre_frame_thread,&ccparams[i]);
+          nthreads++;
+        }
       }
     }
 
-    for (i=0;i<nthreads;i++) {
+    for (i=0; i<nthreads; i++) {
       pthread_join(cthreads[i],NULL);
     }
-    g_free(ccparams);
+    lives_free(ccparams);
     return;
   }
 
   if ((irowstride==width*3)&&(orowstride==width*4)) {
     // quick version
-    for (;src<end;src+=3) {
+    for (; src<end; src+=3) {
       *(dest++)=255; // alpha
       *(dest++)=src[2]; // red
       *(dest++)=src[1]; // green
       *(dest++)=src[0]; // blue
     }
-  }
-  else {
+  } else {
     int width3=width*3;
     orowstride-=width*4;
-    for (;src<end;src+=irowstride) {
-      for (i=0;i<width3;i+=3) {
-	*(dest++)=255; // alpha
-	*(dest++)=src[i+2]; // red
-	*(dest++)=src[i+1]; // green
-	*(dest++)=src[i]; // blue
+    for (; src<end; src+=irowstride) {
+      for (i=0; i<width3; i+=3) {
+        *(dest++)=255; // alpha
+        *(dest++)=src[i+2]; // red
+        *(dest++)=src[i+1]; // green
+        *(dest++)=src[i]; // blue
       }
       dest+=orowstride;
     }
@@ -6097,13 +6074,13 @@
 void *convert_swap3addpre_frame_thread(void *data) {
   lives_cc_params *ccparams=(lives_cc_params *)data;
   convert_swap3addpre_frame((uint8_t *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->irowstrides[0],
-			    ccparams->orowstrides[0],(uint8_t *)ccparams->dest,ccparams->thread_id);
+                            ccparams->orowstrides[0],(uint8_t *)ccparams->dest,ccparams->thread_id);
   return NULL;
 }
 
 
-static void convert_swap3postalpha_frame(uint8_t *src, int width, int height, int irowstride, int orowstride, 
-					 uint8_t *dest, int thread_id) {
+static void convert_swap3postalpha_frame(uint8_t *src, int width, int height, int irowstride, int orowstride,
+    uint8_t *dest, int thread_id) {
   // swap 3 bytes, leave alpha
   uint8_t *end=src+height*irowstride;
   register int i;
@@ -6112,62 +6089,61 @@
     int nthreads=0;
     int dheight;
     boolean useme=FALSE;
-    lives_cc_params *ccparams=(lives_cc_params *)g_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
+    lives_cc_params *ccparams=(lives_cc_params *)lives_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
 
     dheight=CEIL((double)height/(double)prefs->nfx_threads,4);
-    for (i=0;i<prefs->nfx_threads;i++) {
+    for (i=0; i<prefs->nfx_threads; i++) {
       if ((src+dheight*i*irowstride)<end) {
 
-	ccparams[i].src=src+dheight*i*irowstride;
-	ccparams[i].hsize=width;
-	ccparams[i].dest=dest+dheight*i*orowstride;
-
-	if (dheight*(i+1)>(height-4)) {
-	  dheight=height-(dheight*i);
-	  useme=TRUE;
-	}
-	if (dheight<4) break;
-
-	ccparams[i].vsize=dheight;
-
-	ccparams[i].irowstrides[0]=irowstride;
-	ccparams[i].orowstrides[0]=orowstride;
-	ccparams[i].thread_id=i;
-	
-	if (useme) convert_swap3postalpha_frame_thread(&ccparams[i]);
-	else {
-	  pthread_create(&cthreads[i],NULL,convert_swap3postalpha_frame_thread,&ccparams[i]);
-	  nthreads++;
-	}
+        ccparams[i].src=src+dheight*i*irowstride;
+        ccparams[i].hsize=width;
+        ccparams[i].dest=dest+dheight*i*orowstride;
+
+        if (dheight*(i+1)>(height-4)) {
+          dheight=height-(dheight*i);
+          useme=TRUE;
+        }
+        if (dheight<4) break;
+
+        ccparams[i].vsize=dheight;
+
+        ccparams[i].irowstrides[0]=irowstride;
+        ccparams[i].orowstrides[0]=orowstride;
+        ccparams[i].thread_id=i;
+
+        if (useme) convert_swap3postalpha_frame_thread(&ccparams[i]);
+        else {
+          pthread_create(&cthreads[i],NULL,convert_swap3postalpha_frame_thread,&ccparams[i]);
+          nthreads++;
+        }
       }
     }
 
-    for (i=0;i<nthreads;i++) {
+    for (i=0; i<nthreads; i++) {
       pthread_join(cthreads[i],NULL);
     }
-    g_free(ccparams);
+    lives_free(ccparams);
     return;
   }
 
 
   if ((irowstride==width*4)&&(orowstride==irowstride)) {
     // quick version
-    for (;src<end;src+=4) {
+    for (; src<end; src+=4) {
       *(dest++)=src[2]; // red
       *(dest++)=src[1]; // green
       *(dest++)=src[0]; // blue
       *(dest++)=src[3]; // alpha
     }
-  }
-  else {
+  } else {
     int width4=width*4;
     orowstride-=width4;
-    for (;src<end;src+=irowstride) {
-      for (i=0;i<width4;i+=4) {
-	*(dest++)=src[i+2]; // red
-	*(dest++)=src[i+1]; // green
-	*(dest++)=src[i]; // blue
-	*(dest++)=src[i+3]; // alpha
+    for (; src<end; src+=irowstride) {
+      for (i=0; i<width4; i+=4) {
+        *(dest++)=src[i+2]; // red
+        *(dest++)=src[i+1]; // green
+        *(dest++)=src[i]; // blue
+        *(dest++)=src[i+3]; // alpha
       }
       dest+=orowstride;
     }
@@ -6178,13 +6154,13 @@
 void *convert_swap3postalpha_frame_thread(void *data) {
   lives_cc_params *ccparams=(lives_cc_params *)data;
   convert_swap3postalpha_frame((uint8_t *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->irowstrides[0],
-			       ccparams->orowstrides[0],(uint8_t *)ccparams->dest,ccparams->thread_id);
+                               ccparams->orowstrides[0],(uint8_t *)ccparams->dest,ccparams->thread_id);
   return NULL;
 }
 
 
-static void convert_addpost_frame(uint8_t *src, int width, int height, int irowstride, int orowstride, 
-				  uint8_t *dest, int thread_id) {
+static void convert_addpost_frame(uint8_t *src, int width, int height, int irowstride, int orowstride,
+                                  uint8_t *dest, int thread_id) {
   // add post alpha
   uint8_t *end=src+height*irowstride;
   register int i;
@@ -6193,40 +6169,40 @@
     int nthreads=0;
     int dheight;
     boolean useme=FALSE;
-    lives_cc_params *ccparams=(lives_cc_params *)g_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
+    lives_cc_params *ccparams=(lives_cc_params *)lives_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
 
     dheight=CEIL((double)height/(double)prefs->nfx_threads,4);
-    for (i=0;i<prefs->nfx_threads;i++) {
+    for (i=0; i<prefs->nfx_threads; i++) {
       if ((src+dheight*i*irowstride)<end) {
 
-	ccparams[i].src=src+dheight*i*irowstride;
-	ccparams[i].hsize=width;
-	ccparams[i].dest=dest+dheight*i*orowstride;
-
-	if (dheight*(i+1)>(height-4)) {
-	  dheight=height-(dheight*i);
-	  useme=TRUE;
-	}
-	if (dheight<4) break;
-
-	ccparams[i].vsize=dheight;
-
-	ccparams[i].irowstrides[0]=irowstride;
-	ccparams[i].orowstrides[0]=orowstride;
-	ccparams[i].thread_id=i;
-	
-	if (useme) convert_addpost_frame_thread(&ccparams[i]);
-	else {
-	  pthread_create(&cthreads[i],NULL,convert_addpost_frame_thread,&ccparams[i]);
-	  nthreads++;
-	}
+        ccparams[i].src=src+dheight*i*irowstride;
+        ccparams[i].hsize=width;
+        ccparams[i].dest=dest+dheight*i*orowstride;
+
+        if (dheight*(i+1)>(height-4)) {
+          dheight=height-(dheight*i);
+          useme=TRUE;
+        }
+        if (dheight<4) break;
+
+        ccparams[i].vsize=dheight;
+
+        ccparams[i].irowstrides[0]=irowstride;
+        ccparams[i].orowstrides[0]=orowstride;
+        ccparams[i].thread_id=i;
+
+        if (useme) convert_addpost_frame_thread(&ccparams[i]);
+        else {
+          pthread_create(&cthreads[i],NULL,convert_addpost_frame_thread,&ccparams[i]);
+          nthreads++;
+        }
       }
     }
 
-    for (i=0;i<nthreads;i++) {
+    for (i=0; i<nthreads; i++) {
       pthread_join(cthreads[i],NULL);
     }
-    g_free(ccparams);
+    lives_free(ccparams);
     return;
   }
 
@@ -6235,23 +6211,22 @@
 #ifdef ENABLE_OIL
     oil_rgb2rgba(dest,src,width*height);
 #else
-    for (;src<end;src+=3) {
+    for (; src<end; src+=3) {
       *(dest++)=src[0]; // r
       *(dest++)=src[1]; // g
       *(dest++)=src[2]; // b
       *(dest++)=255; // alpha
     }
 #endif
-  }
-  else {
+  } else {
     int width3=width*3;
     orowstride-=width*4;
-    for (;src<end;src+=irowstride) {
-      for (i=0;i<width3;i+=3) {
-	*(dest++)=src[i]; // r
-	*(dest++)=src[i+1]; // g
-	*(dest++)=src[i+2]; // b
-	*(dest++)=255; // alpha
+    for (; src<end; src+=irowstride) {
+      for (i=0; i<width3; i+=3) {
+        *(dest++)=src[i]; // r
+        *(dest++)=src[i+1]; // g
+        *(dest++)=src[i+2]; // b
+        *(dest++)=255; // alpha
       }
       dest+=orowstride;
     }
@@ -6263,13 +6238,13 @@
 void *convert_addpost_frame_thread(void *data) {
   lives_cc_params *ccparams=(lives_cc_params *)data;
   convert_addpost_frame((uint8_t *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->irowstrides[0],
-			ccparams->orowstrides[0],(uint8_t *)ccparams->dest,ccparams->thread_id);
+                        ccparams->orowstrides[0],(uint8_t *)ccparams->dest,ccparams->thread_id);
   return NULL;
 }
 
 
-static void convert_addpre_frame(uint8_t *src, int width, int height, int irowstride, int orowstride, 
-				 uint8_t *dest, int thread_id) {
+static void convert_addpre_frame(uint8_t *src, int width, int height, int irowstride, int orowstride,
+                                 uint8_t *dest, int thread_id) {
   // add pre alpha
   uint8_t *end=src+height*irowstride;
   register int i;
@@ -6278,62 +6253,61 @@
     int nthreads=0;
     int dheight;
     boolean useme=FALSE;
-    lives_cc_params *ccparams=(lives_cc_params *)g_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
+    lives_cc_params *ccparams=(lives_cc_params *)lives_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
 
     dheight=CEIL((double)height/(double)prefs->nfx_threads,4);
-    for (i=0;i<prefs->nfx_threads;i++) {
+    for (i=0; i<prefs->nfx_threads; i++) {
       if ((src+dheight*i*irowstride)<end) {
 
-	ccparams[i].src=src+dheight*i*irowstride;
-	ccparams[i].hsize=width;
-	ccparams[i].dest=dest+dheight*i*orowstride;
-
-	if (dheight*(i+1)>(height-4)) {
-	  dheight=height-(dheight*i);
-	  useme=TRUE;
-	}
-	if (dheight<4) break;
-
-	ccparams[i].vsize=dheight;
-
-	ccparams[i].irowstrides[0]=irowstride;
-	ccparams[i].orowstrides[0]=orowstride;
-	ccparams[i].thread_id=i;
-	
-	if (useme) convert_addpre_frame_thread(&ccparams[i]);
-	else {
-	  pthread_create(&cthreads[i],NULL,convert_addpre_frame_thread,&ccparams[i]);
-	  nthreads++;
-	}
+        ccparams[i].src=src+dheight*i*irowstride;
+        ccparams[i].hsize=width;
+        ccparams[i].dest=dest+dheight*i*orowstride;
+
+        if (dheight*(i+1)>(height-4)) {
+          dheight=height-(dheight*i);
+          useme=TRUE;
+        }
+        if (dheight<4) break;
+
+        ccparams[i].vsize=dheight;
+
+        ccparams[i].irowstrides[0]=irowstride;
+        ccparams[i].orowstrides[0]=orowstride;
+        ccparams[i].thread_id=i;
+
+        if (useme) convert_addpre_frame_thread(&ccparams[i]);
+        else {
+          pthread_create(&cthreads[i],NULL,convert_addpre_frame_thread,&ccparams[i]);
+          nthreads++;
+        }
       }
     }
 
-    for (i=0;i<nthreads;i++) {
+    for (i=0; i<nthreads; i++) {
       pthread_join(cthreads[i],NULL);
     }
-    g_free(ccparams);
+    lives_free(ccparams);
     return;
   }
 
 
   if ((irowstride==width*3)&&(orowstride==width*4)) {
     // quick version
-    for (;src<end;src+=3) {
+    for (; src<end; src+=3) {
       *(dest++)=255; // alpha
       *(dest++)=src[0]; // r
       *(dest++)=src[1]; // g
       *(dest++)=src[2]; // b
     }
-  }
-  else {
+  } else {
     int width3=width*3;
     orowstride-=width*4;
-    for (;src<end;src+=irowstride) {
-      for (i=0;i<width3;i+=3) {
-	*(dest++)=255; // alpha
-	*(dest++)=src[i]; // r
-	*(dest++)=src[i+1]; // g
-	*(dest++)=src[i+2]; // b
+    for (; src<end; src+=irowstride) {
+      for (i=0; i<width3; i+=3) {
+        *(dest++)=255; // alpha
+        *(dest++)=src[i]; // r
+        *(dest++)=src[i+1]; // g
+        *(dest++)=src[i+2]; // b
       }
       dest+=orowstride;
     }
@@ -6344,12 +6318,12 @@
 void *convert_addpre_frame_thread(void *data) {
   lives_cc_params *ccparams=(lives_cc_params *)data;
   convert_addpre_frame((uint8_t *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->irowstrides[0],
-		       ccparams->orowstrides[0],(uint8_t *)ccparams->dest,ccparams->thread_id);
+                       ccparams->orowstrides[0],(uint8_t *)ccparams->dest,ccparams->thread_id);
   return NULL;
 }
 
-static void convert_swap3delpost_frame(uint8_t *src,int width,int height, int irowstride, int orowstride, 
-				       uint8_t *dest, int thread_id) {
+static void convert_swap3delpost_frame(uint8_t *src,int width,int height, int irowstride, int orowstride,
+                                       uint8_t *dest, int thread_id) {
   // swap 3 bytes, delete post alpha
   uint8_t *end=src+height*irowstride;
   register int i;
@@ -6358,59 +6332,58 @@
     int nthreads=0;
     int dheight;
     boolean useme=FALSE;
-    lives_cc_params *ccparams=(lives_cc_params *)g_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
+    lives_cc_params *ccparams=(lives_cc_params *)lives_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
 
     dheight=CEIL((double)height/(double)prefs->nfx_threads,4);
-    for (i=0;i<prefs->nfx_threads;i++) {
+    for (i=0; i<prefs->nfx_threads; i++) {
       if ((src+dheight*i*irowstride)<end) {
 
-	ccparams[i].src=src+dheight*i*irowstride;
-	ccparams[i].hsize=width;
-	ccparams[i].dest=dest+dheight*i*orowstride;
-
-	if (dheight*(i+1)>(height-4)) {
-	  dheight=height-(dheight*i);
-	  useme=TRUE;
-	}
-	if (dheight<4) break;
-
-	ccparams[i].vsize=dheight;
-
-	ccparams[i].irowstrides[0]=irowstride;
-	ccparams[i].orowstrides[0]=orowstride;
-	ccparams[i].thread_id=i;
-	
-	if (useme) convert_swap3delpost_frame_thread(&ccparams[i]);
-	else {
-	  pthread_create(&cthreads[i],NULL,convert_swap3delpost_frame_thread,&ccparams[i]);
-	  nthreads++;
-	}
+        ccparams[i].src=src+dheight*i*irowstride;
+        ccparams[i].hsize=width;
+        ccparams[i].dest=dest+dheight*i*orowstride;
+
+        if (dheight*(i+1)>(height-4)) {
+          dheight=height-(dheight*i);
+          useme=TRUE;
+        }
+        if (dheight<4) break;
+
+        ccparams[i].vsize=dheight;
+
+        ccparams[i].irowstrides[0]=irowstride;
+        ccparams[i].orowstrides[0]=orowstride;
+        ccparams[i].thread_id=i;
+
+        if (useme) convert_swap3delpost_frame_thread(&ccparams[i]);
+        else {
+          pthread_create(&cthreads[i],NULL,convert_swap3delpost_frame_thread,&ccparams[i]);
+          nthreads++;
+        }
       }
     }
 
-    for (i=0;i<nthreads;i++) {
+    for (i=0; i<nthreads; i++) {
       pthread_join(cthreads[i],NULL);
     }
-    g_free(ccparams);
+    lives_free(ccparams);
     return;
   }
 
   if ((irowstride==width*4)&&(orowstride==width*3)) {
     // quick version
-    for (;src<end;src+=4) {
+    for (; src<end; src+=4) {
       *(dest++)=src[2]; // red
       *(dest++)=src[1]; // green
       *(dest++)=src[0]; // blue
     }
-  }
-  else {
+  } else {
     int width4=width*4;
     orowstride-=width*3;
-    for (;src<end;src+=irowstride) {
-      for (i=0;i<width4;i+=4) {
-	*(dest++)=src[i+2]; // red
-	*(dest++)=src[i+1]; // green
-	*(dest++)=src[i]; // blue
+    for (; src<end; src+=irowstride) {
+      for (i=0; i<width4; i+=4) {
+        *(dest++)=src[i+2]; // red
+        *(dest++)=src[i+1]; // green
+        *(dest++)=src[i]; // blue
       }
       dest+=orowstride;
     }
@@ -6421,13 +6394,13 @@
 void *convert_swap3delpost_frame_thread(void *data) {
   lives_cc_params *ccparams=(lives_cc_params *)data;
   convert_swap3delpost_frame((uint8_t *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->irowstrides[0],
-			     ccparams->orowstrides[0],(uint8_t *)ccparams->dest,ccparams->thread_id);
+                             ccparams->orowstrides[0],(uint8_t *)ccparams->dest,ccparams->thread_id);
   return NULL;
 }
 
 
-static void convert_delpost_frame(uint8_t *src,int width,int height, int irowstride, int orowstride, 
-				  uint8_t *dest, int thread_id) {
+static void convert_delpost_frame(uint8_t *src,int width,int height, int irowstride, int orowstride,
+                                  uint8_t *dest, int thread_id) {
   // delete post alpha
   uint8_t *end=src+height*irowstride;
   register int i;
@@ -6436,58 +6409,57 @@
     int nthreads=0;
     int dheight;
     boolean useme=FALSE;
-    lives_cc_params *ccparams=(lives_cc_params *)g_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
+    lives_cc_params *ccparams=(lives_cc_params *)lives_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
 
     dheight=CEIL((double)height/(double)prefs->nfx_threads,4);
-    for (i=0;i<prefs->nfx_threads;i++) {
+    for (i=0; i<prefs->nfx_threads; i++) {
       if ((src+dheight*i*irowstride)<end) {
 
-	ccparams[i].src=src+dheight*i*irowstride;
-	ccparams[i].hsize=width;
-	ccparams[i].dest=dest+dheight*i*orowstride;
-
-	if (dheight*(i+1)>(height-4)) {
-	  dheight=height-(dheight*i);
-	  useme=TRUE;
-	}
-	if (dheight<4) break;
-
-	ccparams[i].vsize=dheight;
-
-	ccparams[i].irowstrides[0]=irowstride;
-	ccparams[i].orowstrides[0]=orowstride;
-	ccparams[i].thread_id=i;
-	
-	if (useme) convert_delpost_frame_thread(&ccparams[i]);
-	else {
-	  pthread_create(&cthreads[i],NULL,convert_delpost_frame_thread,&ccparams[i]);
-	  nthreads++;
-	}
+        ccparams[i].src=src+dheight*i*irowstride;
+        ccparams[i].hsize=width;
+        ccparams[i].dest=dest+dheight*i*orowstride;
+
+        if (dheight*(i+1)>(height-4)) {
+          dheight=height-(dheight*i);
+          useme=TRUE;
+        }
+        if (dheight<4) break;
+
+        ccparams[i].vsize=dheight;
+
+        ccparams[i].irowstrides[0]=irowstride;
+        ccparams[i].orowstrides[0]=orowstride;
+        ccparams[i].thread_id=i;
+
+        if (useme) convert_delpost_frame_thread(&ccparams[i]);
+        else {
+          pthread_create(&cthreads[i],NULL,convert_delpost_frame_thread,&ccparams[i]);
+          nthreads++;
+        }
       }
     }
 
-    for (i=0;i<nthreads;i++) {
+    for (i=0; i<nthreads; i++) {
       pthread_join(cthreads[i],NULL);
     }
-    g_free(ccparams);
+    lives_free(ccparams);
     return;
   }
 
 
   if ((irowstride==width*4)&&(orowstride==width*3)) {
     // quick version
-    for (;src<end;src+=4) {
-      weed_memcpy(dest,src,3);
+    for (; src<end; src+=4) {
+      lives_memcpy(dest,src,3);
       dest+=3;
     }
-  }
-  else {
+  } else {
     int width4=width*4;
     orowstride-=width*3;
-    for (;src<end;src+=irowstride) {
-      for (i=0;i<width4;i+=4) {
-	weed_memcpy(dest,&src[i],3);
-	dest+=3;
+    for (; src<end; src+=irowstride) {
+      for (i=0; i<width4; i+=4) {
+        lives_memcpy(dest,&src[i],3);
+        dest+=3;
       }
       dest+=orowstride;
     }
@@ -6498,14 +6470,14 @@
 void *convert_delpost_frame_thread(void *data) {
   lives_cc_params *ccparams=(lives_cc_params *)data;
   convert_delpost_frame((uint8_t *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->irowstrides[0],
-			ccparams->orowstrides[0],(uint8_t *)ccparams->dest,ccparams->thread_id);
+                        ccparams->orowstrides[0],(uint8_t *)ccparams->dest,ccparams->thread_id);
   return NULL;
 }
 
 
 
-static void convert_delpre_frame(uint8_t *src,int width,int height, int irowstride, int orowstride, 
-				 uint8_t *dest, int thread_id) {
+static void convert_delpre_frame(uint8_t *src,int width,int height, int irowstride, int orowstride,
+                                 uint8_t *dest, int thread_id) {
   // delete pre alpha
   uint8_t *end=src+height*irowstride;
   register int i;
@@ -6514,40 +6486,40 @@
     int nthreads=0;
     int dheight;
     boolean useme=FALSE;
-    lives_cc_params *ccparams=(lives_cc_params *)g_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
+    lives_cc_params *ccparams=(lives_cc_params *)lives_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
 
     dheight=CEIL((double)height/(double)prefs->nfx_threads,4);
-    for (i=0;i<prefs->nfx_threads;i++) {
+    for (i=0; i<prefs->nfx_threads; i++) {
       if ((src+dheight*i*irowstride)<end) {
 
-	ccparams[i].src=src+dheight*i*irowstride;
-	ccparams[i].hsize=width;
-	ccparams[i].dest=dest+dheight*i*orowstride;
-
-	if (dheight*(i+1)>(height-4)) {
-	  dheight=height-(dheight*i);
-	  useme=TRUE;
-	}
-	if (dheight<4) break;
-
-	ccparams[i].vsize=dheight;
-
-	ccparams[i].irowstrides[0]=irowstride;
-	ccparams[i].orowstrides[0]=orowstride;
-	ccparams[i].thread_id=i;
-	
-	if (useme) convert_delpre_frame_thread(&ccparams[i]);
-	else {
-	  pthread_create(&cthreads[i],NULL,convert_delpre_frame_thread,&ccparams[i]);
-	  nthreads++;
-	}
+        ccparams[i].src=src+dheight*i*irowstride;
+        ccparams[i].hsize=width;
+        ccparams[i].dest=dest+dheight*i*orowstride;
+
+        if (dheight*(i+1)>(height-4)) {
+          dheight=height-(dheight*i);
+          useme=TRUE;
+        }
+        if (dheight<4) break;
+
+        ccparams[i].vsize=dheight;
+
+        ccparams[i].irowstrides[0]=irowstride;
+        ccparams[i].orowstrides[0]=orowstride;
+        ccparams[i].thread_id=i;
+
+        if (useme) convert_delpre_frame_thread(&ccparams[i]);
+        else {
+          pthread_create(&cthreads[i],NULL,convert_delpre_frame_thread,&ccparams[i]);
+          nthreads++;
+        }
       }
     }
 
-    for (i=0;i<nthreads;i++) {
+    for (i=0; i<nthreads; i++) {
       pthread_join(cthreads[i],NULL);
     }
-    g_free(ccparams);
+    lives_free(ccparams);
     return;
   }
 
@@ -6555,18 +6527,17 @@
 
   if ((irowstride==width*4)&&(orowstride==width*3)) {
     // quick version
-    for (;src<end;src+=4) {
-      weed_memcpy(dest,src,3);
+    for (; src<end; src+=4) {
+      lives_memcpy(dest,src,3);
       dest+=3;
     }
-  }
-  else {
+  } else {
     int width4=width*4;
     orowstride-=width*3;
-    for (;src<end;src+=irowstride) {
-      for (i=0;i<width4;i+=4) {
-	weed_memcpy(dest,&src[i],3);
-	dest+=3;
+    for (; src<end; src+=irowstride) {
+      for (i=0; i<width4; i+=4) {
+        lives_memcpy(dest,&src[i],3);
+        dest+=3;
       }
       dest+=orowstride;
     }
@@ -6578,13 +6549,13 @@
 void *convert_delpre_frame_thread(void *data) {
   lives_cc_params *ccparams=(lives_cc_params *)data;
   convert_delpre_frame((uint8_t *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->irowstrides[0],
-		       ccparams->orowstrides[0],(uint8_t *)ccparams->dest,ccparams->thread_id);
+                       ccparams->orowstrides[0],(uint8_t *)ccparams->dest,ccparams->thread_id);
   return NULL;
 }
 
 
-static void convert_swap3delpre_frame(uint8_t *src, int width, int height, int irowstride, int orowstride, 
-				      uint8_t *dest, int thread_id) {
+static void convert_swap3delpre_frame(uint8_t *src, int width, int height, int irowstride, int orowstride,
+                                      uint8_t *dest, int thread_id) {
   // delete pre alpha, swap last 3
   uint8_t *end=src+height*irowstride;
   register int i;
@@ -6593,59 +6564,58 @@
     int nthreads=0;
     int dheight;
     boolean useme=FALSE;
-    lives_cc_params *ccparams=(lives_cc_params *)g_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
+    lives_cc_params *ccparams=(lives_cc_params *)lives_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
 
     dheight=CEIL((double)height/(double)prefs->nfx_threads,4);
-    for (i=0;i<prefs->nfx_threads;i++) {
+    for (i=0; i<prefs->nfx_threads; i++) {
       if ((src+dheight*i*irowstride)<end) {
 
-	ccparams[i].src=src+dheight*i*irowstride;
-	ccparams[i].hsize=width;
-	ccparams[i].dest=dest+dheight*i*orowstride;
-
-	if (dheight*(i+1)>(height-4)) {
-	  dheight=height-(dheight*i);
-	  useme=TRUE;
-	}
-	if (dheight<4) break;
-
-	ccparams[i].vsize=dheight;
-
-	ccparams[i].irowstrides[0]=irowstride;
-	ccparams[i].orowstrides[0]=orowstride;
-	ccparams[i].thread_id=i;
-	
-	if (useme) convert_swap3delpre_frame_thread(&ccparams[i]);
-	else {
-	  pthread_create(&cthreads[i],NULL,convert_swap3delpre_frame_thread,&ccparams[i]);
-	  nthreads++;
-	}
+        ccparams[i].src=src+dheight*i*irowstride;
+        ccparams[i].hsize=width;
+        ccparams[i].dest=dest+dheight*i*orowstride;
+
+        if (dheight*(i+1)>(height-4)) {
+          dheight=height-(dheight*i);
+          useme=TRUE;
+        }
+        if (dheight<4) break;
+
+        ccparams[i].vsize=dheight;
+
+        ccparams[i].irowstrides[0]=irowstride;
+        ccparams[i].orowstrides[0]=orowstride;
+        ccparams[i].thread_id=i;
+
+        if (useme) convert_swap3delpre_frame_thread(&ccparams[i]);
+        else {
+          pthread_create(&cthreads[i],NULL,convert_swap3delpre_frame_thread,&ccparams[i]);
+          nthreads++;
+        }
       }
     }
 
-    for (i=0;i<nthreads;i++) {
+    for (i=0; i<nthreads; i++) {
       pthread_join(cthreads[i],NULL);
     }
-    g_free(ccparams);
+    lives_free(ccparams);
     return;
   }
 
   if ((irowstride==width*4)&&(orowstride==width*3)) {
     // quick version
-    for (;src<end;src+=4) {
+    for (; src<end; src+=4) {
       *(dest++)=src[3]; // red
       *(dest++)=src[2]; // green
       *(dest++)=src[1]; // blue
     }
-  }
-  else {
+  } else {
     int width4=width*4;
     orowstride-=width*3;
-    for (;src<end;src+=irowstride) {
-      for (i=0;i<width4;i+=4) {
-	*(dest++)=src[i+3]; // red
-	*(dest++)=src[i+2]; // green
-	*(dest++)=src[i+1]; // blue
+    for (; src<end; src+=irowstride) {
+      for (i=0; i<width4; i+=4) {
+        *(dest++)=src[i+3]; // red
+        *(dest++)=src[i+2]; // green
+        *(dest++)=src[i+1]; // blue
       }
       dest+=orowstride;
     }
@@ -6656,14 +6626,14 @@
 void *convert_swap3delpre_frame_thread(void *data) {
   lives_cc_params *ccparams=(lives_cc_params *)data;
   convert_swap3delpre_frame((uint8_t *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->irowstrides[0],
-			    ccparams->orowstrides[0],(uint8_t *)ccparams->dest,ccparams->thread_id);
+                            ccparams->orowstrides[0],(uint8_t *)ccparams->dest,ccparams->thread_id);
   return NULL;
 }
 
 
 
-static void convert_swapprepost_frame (uint8_t *src, int width, int height, int irowstride, int orowstride, 
-				       uint8_t *dest, boolean alpha_first, int thread_id) {
+static void convert_swapprepost_frame(uint8_t *src, int width, int height, int irowstride, int orowstride,
+                                      uint8_t *dest, boolean alpha_first, int thread_id) {
   // swap first and last bytes in a 4 byte palette
   uint8_t *end=src+height*irowstride;
   register int i;
@@ -6672,84 +6642,81 @@
     int nthreads=0;
     int dheight;
     boolean useme=FALSE;
-    lives_cc_params *ccparams=(lives_cc_params *)g_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
+    lives_cc_params *ccparams=(lives_cc_params *)lives_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
 
     dheight=CEIL((double)height/(double)prefs->nfx_threads,4);
-    for (i=0;i<prefs->nfx_threads;i++) {
+    for (i=0; i<prefs->nfx_threads; i++) {
       if ((src+dheight*i*irowstride)<end) {
 
-	ccparams[i].src=src+dheight*i*irowstride;
-	ccparams[i].hsize=width;
-	ccparams[i].dest=dest+dheight*i*orowstride;
+        ccparams[i].src=src+dheight*i*irowstride;
+        ccparams[i].hsize=width;
+        ccparams[i].dest=dest+dheight*i*orowstride;
+
+        if (dheight*(i+1)>(height-4)) {
+          dheight=height-(dheight*i);
+          useme=TRUE;
+        }
+        if (dheight<4) break;
 
-	if (dheight*(i+1)>(height-4)) {
-	  dheight=height-(dheight*i);
-	  useme=TRUE;
-	}
-	if (dheight<4) break;
+        ccparams[i].vsize=dheight;
 
-	ccparams[i].vsize=dheight;
+        ccparams[i].irowstrides[0]=irowstride;
+        ccparams[i].orowstrides[0]=orowstride;
 
-	ccparams[i].irowstrides[0]=irowstride;
-	ccparams[i].orowstrides[0]=orowstride;
+        ccparams[i].alpha_first=alpha_first;
 
-	ccparams[i].alpha_first=alpha_first;
+        ccparams[i].thread_id=i;
 
-	ccparams[i].thread_id=i;
-	
-	if (useme) convert_swapprepost_frame_thread(&ccparams[i]);
-	else {
-	  pthread_create(&cthreads[i],NULL,convert_swapprepost_frame_thread,&ccparams[i]);
-	  nthreads++;
-	}
+        if (useme) convert_swapprepost_frame_thread(&ccparams[i]);
+        else {
+          pthread_create(&cthreads[i],NULL,convert_swapprepost_frame_thread,&ccparams[i]);
+          nthreads++;
+        }
       }
     }
 
-    for (i=0;i<nthreads;i++) {
+    for (i=0; i<nthreads; i++) {
       pthread_join(cthreads[i],NULL);
     }
-    g_free(ccparams);
+    lives_free(ccparams);
     return;
   }
 
   if ((irowstride==width*4)&&(orowstride==irowstride)) {
     // quick version
     if (alpha_first) {
-      for (;src<end;src+=4) {
-	*(dest++)=src[1];
-	*(dest++)=src[2];
-	*(dest++)=src[3];
-	*(dest++)=src[0];
+      for (; src<end; src+=4) {
+        *(dest++)=src[1];
+        *(dest++)=src[2];
+        *(dest++)=src[3];
+        *(dest++)=src[0];
       }
-    }
-    else {
-      for (;src<end;src+=4) {
-	*(dest++)=src[3];
-	*(dest++)=src[0];
-	*(dest++)=src[1];
-	*(dest++)=src[2];
+    } else {
+      for (; src<end; src+=4) {
+        *(dest++)=src[3];
+        *(dest++)=src[0];
+        *(dest++)=src[1];
+        *(dest++)=src[2];
       }
     }
-  }
-  else {
+  } else {
     int width4=width*4;
     orowstride-=width4;
-    for (;src<end;src+=irowstride) {
+    for (; src<end; src+=irowstride) {
       if (alpha_first) {
-	for (i=0;i<width4;i+=4) {
-	  *(dest++)=src[i+1];
-	  *(dest++)=src[i+2];
-	  *(dest++)=src[i+3];
-	  *(dest++)=src[i];
-	}
-      }
-      else {
-	for (i=0;i<width4;i+=4) {
-	  *(dest++)=src[i+3];
-	  *(dest++)=src[i];
-	  *(dest++)=src[i+1];
-	  *(dest++)=src[i+2];
-	}
+        for (i=0; i<width4; i+=4) {
+          *(dest++)=src[i+1];
+          *(dest++)=src[i+2];
+          *(dest++)=src[i+3];
+          *(dest++)=src[i];
+        }
+      } else {
+        for (i=0; i<width4; i+=4) {
+          *(dest++)=src[i+3];
+          *(dest++)=src[i];
+          *(dest++)=src[i+1];
+          *(dest++)=src[i+2];
+        }
       }
       dest+=orowstride;
     }
@@ -6760,7 +6727,7 @@
 void *convert_swapprepost_frame_thread(void *data) {
   lives_cc_params *ccparams=(lives_cc_params *)data;
   convert_swapprepost_frame((uint8_t *)ccparams->src,ccparams->hsize,ccparams->vsize,ccparams->irowstrides[0],
-			    ccparams->orowstrides[0],(uint8_t *)ccparams->dest,ccparams->alpha_first,ccparams->thread_id);
+                            ccparams->orowstrides[0],(uint8_t *)ccparams->dest,ccparams->alpha_first,ccparams->thread_id);
   return NULL;
 }
 
@@ -6776,44 +6743,44 @@
     int nthreads=0;
     int dheight;
     boolean useme=FALSE;
-    lives_cc_params *ccparams=(lives_cc_params *)g_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
+    lives_cc_params *ccparams=(lives_cc_params *)lives_malloc(prefs->nfx_threads*sizeof(lives_cc_params));
 
     dheight=CEIL((double)height/(double)prefs->nfx_threads,4);
-    for (i=0;i<prefs->nfx_threads;i++) {
+    for (i=0; i<prefs->nfx_threads; i++) {
       if ((src+dheight*i*width4)<end) {
 
-	ccparams[i].src=src+dheight*i*width4;
-	ccparams[i].hsize=width;
-	ccparams[i].dest=dest+dheight*i*width4;
+        ccparams[i].src=src+dheight*i*width4;
+        ccparams[i].hsize=width;
+        ccparams[i].dest=dest+dheight*i*width4;
+
+        if (dheight*(i+1)>(height-4)) {
+          dheight=height-(dheight*i);
+          useme=TRUE;
+        }
+        if (dheight<4) break;
 
-	if (dheight*(i+1)>(height-4)) {
-	  dheight=height-(dheight*i);
-	  useme=TRUE;
-	}
-	if (dheight<4) break;
+        ccparams[i].vsize=dheight;
 
-	ccparams[i].vsize=dheight;
+        ccparams[i].thread_id=i;
 
-	ccparams[i].thread_id=i;
-	
-	if (useme) convert_swab_frame_thread(&ccparams[i]);
-	else {
-	  pthread_create(&cthreads[i],NULL,convert_swab_frame_thread,&ccparams[i]);
-	  nthreads++;
-	}
+        if (useme) convert_swab_frame_thread(&ccparams[i]);
+        else {
+          pthread_create(&cthreads[i],NULL,convert_swab_frame_thread,&ccparams[i]);
+          nthreads++;
+        }
       }
     }
 
-    for (i=0;i<nthreads;i++) {
+    for (i=0; i<nthreads; i++) {
       pthread_join(cthreads[i],NULL);
     }
-    g_free(ccparams);
+    lives_free(ccparams);
     return;
   }
 
 
-  for (;src<end;src+=width4) {
-    for (i=0;i<width4;i+=4) {
+  for (; src<end; src+=width4) {
+    for (i=0; i<width4; i+=4) {
       swab(&src[i],&dest[i],4);
     }
     dest+=width4;
@@ -6824,14 +6791,14 @@
 void *convert_swab_frame_thread(void *data) {
   lives_cc_params *ccparams=(lives_cc_params *)data;
   convert_swab_frame((uint8_t *)ccparams->src,ccparams->hsize,ccparams->vsize,
-		     (uint8_t *)ccparams->dest,ccparams->thread_id);
+                     (uint8_t *)ccparams->dest,ccparams->thread_id);
   return NULL;
 }
 
 
 static void convert_halve_chroma(uint8_t **src, int width, int height, uint8_t **dest, boolean clamped) {
   // width and height here are width and height of src *chroma* planes, in bytes
-  
+
   // halve the chroma samples vertically, with sub-sampling, e.g. 422p to 420p
 
   // TODO : handle different sampling methods in and out
@@ -6842,19 +6809,18 @@
 
   set_conversion_arrays(clamped?WEED_YUV_CLAMPING_CLAMPED:WEED_YUV_CLAMPING_UNCLAMPED,WEED_YUV_SUBSPACE_YCBCR);
 
-  for (i=0;i<height;i++) {
-    for (j=0;j<width;j++) {
+  for (i=0; i<height; i++) {
+    for (j=0; j<width; j++) {
 
       if (!chroma) {
-	// pass 1, copy row
-	lives_memcpy(d_u,s_u,width);
-	lives_memcpy(d_v,s_v,width);
-      }
-      else {
-	// pass 2
-	// average two dest rows
-	d_u[j]=avg_chroma(d_u[j],s_u[j]);
-	d_v[j]=avg_chroma(d_v[j],s_v[j]);
+        // pass 1, copy row
+        lives_memcpy(d_u,s_u,width);
+        lives_memcpy(d_v,s_v,width);
+      } else {
+        // pass 2
+        // average two dest rows
+        d_u[j]=avg_chroma(d_u[j],s_u[j]);
+        d_v[j]=avg_chroma(d_v[j],s_v[j]);
       }
     }
     if (chroma) {
@@ -6870,7 +6836,7 @@
 
 static void convert_double_chroma(uint8_t **src, int width, int height, uint8_t **dest, boolean clamped) {
   // width and height here are width and height of src *chroma* planes, in bytes
-  
+
   // double two chroma planes vertically, with interpolation: eg: 420p to 422p
 
   // TODO - handle different sampling methods in and out
@@ -6882,17 +6848,17 @@
 
   set_conversion_arrays(clamped?WEED_YUV_CLAMPING_CLAMPED:WEED_YUV_CLAMPING_UNCLAMPED,WEED_YUV_SUBSPACE_YCBCR);
 
-  for (i=0;i<height2;i++) {
-    for (j=0;j<width;j++) {
+  for (i=0; i<height2; i++) {
+    for (j=0; j<width; j++) {
 
       lives_memcpy(d_u,s_u,width);
       lives_memcpy(d_v,s_v,width);
 
       if (!chroma&&i>0) {
-	// pass 2
-	// average two src rows
-	d_u[j-width]=avg_chroma(d_u[j-width],s_u[j]);
-	d_v[j-width]=avg_chroma(d_v[j-width],s_v[j]);
+        // pass 2
+        // average two src rows
+        d_u[j-width]=avg_chroma(d_u[j-width],s_u[j]);
+        d_v[j-width]=avg_chroma(d_v[j-width],s_v[j]);
       }
     }
     if (chroma) {
@@ -6908,7 +6874,7 @@
 
 static void convert_quad_chroma(uint8_t **src, int width, int height, uint8_t **dest, boolean add_alpha, boolean clamped) {
   // width and height here are width and height of dest chroma planes, in bytes
-  
+
   // double the chroma samples vertically and horizontally, with interpolation, eg. 420p to 444p
 
   // output to planes
@@ -6933,10 +6899,10 @@
 
   // for this algorithm, we assume chroma samples are aligned like mpeg
 
-  for (i=0;i<height2;i++) {
+  for (i=0; i<height2; i++) {
     d_u[0]=d_u[1]=s_u[0];
     d_v[0]=d_v[1]=s_v[0];
-    for (j=2;j<width2;j+=2) {
+    for (j=2; j<width2; j+=2) {
       d_u[j+1]=d_u[j]=s_u[(j>>1)];
       d_v[j+1]=d_v[j]=s_v[(j>>1)];
 
@@ -6944,13 +6910,13 @@
       d_v[j-1]=avg_chroma(d_v[j-1],d_v[j]);
 
       if (!chroma&&i>0) {
-	// pass 2
-	// average two src rows (e.g 2 with 1, 4 with 3, ... etc) for odd dst rows
-	// thus dst row 1 becomes average of src chroma rows 0 and 1, etc.)
-	d_u[j-width2]=avg_chroma(d_u[j-width2],d_u[j]);
-	d_v[j-width2]=avg_chroma(d_v[j-width2],d_v[j]);
-	d_u[j-1-width2]=avg_chroma(d_u[j-1-width2],d_u[j-1]);
-	d_v[j-1-width2]=avg_chroma(d_v[j-1-width2],d_v[j-1]);
+        // pass 2
+        // average two src rows (e.g 2 with 1, 4 with 3, ... etc) for odd dst rows
+        // thus dst row 1 becomes average of src chroma rows 0 and 1, etc.)
+        d_u[j-width2]=avg_chroma(d_u[j-width2],d_u[j]);
+        d_v[j-width2]=avg_chroma(d_v[j-width2],d_v[j]);
+        d_u[j-1-width2]=avg_chroma(d_u[j-1-width2],d_u[j-1]);
+        d_v[j-1-width2]=avg_chroma(d_v[j-1-width2],d_v[j-1]);
       }
 
     }
@@ -6972,8 +6938,8 @@
 }
 
 
-static void convert_quad_chroma_packed(uint8_t **src, int width, int height, uint8_t *dest, boolean add_alpha, 
-				       boolean clamped) {
+static void convert_quad_chroma_packed(uint8_t **src, int width, int height, uint8_t *dest, boolean add_alpha,
+                                       boolean clamped) {
   // width and height here are width and height of dest chroma planes, in bytes
   // stretch (double) the chroma samples vertically and horizontally, with interpolation
 
@@ -6999,7 +6965,7 @@
   widthx=width*opsize;
   opsize2=opsize*2;
 
-  for (i=0;i<height;i++) {
+  for (i=0; i<height; i++) {
     dest[0]=*(s_y++);
     dest[1]=dest[opsize+1]=s_u[0];
     dest[2]=dest[opsize+2]=s_v[0];
@@ -7008,7 +6974,7 @@
 
     //count=10;
 
-    for (j=opsize2;j<widthx;j+=opsize2) {
+    for (j=opsize2; j<widthx; j+=opsize2) {
       // process two pixels at a time, and we average the first colour pixel with the last from the previous 2
       // we know we can do this because Y must be even width
 
@@ -7019,16 +6985,16 @@
       if (add_alpha) dest[j+3]=dest[j+7]=255;
       dest[j+1]=dest[j+opsize+1]=s_u[(j/opsize)/2];
       dest[j+2]=dest[j+opsize+2]=s_v[(j/opsize)/2];
-      
+
       dest[j-opsize+1]=avg_chroma(dest[j-opsize+1],dest[j+1]);
       dest[j-opsize+2]=avg_chroma(dest[j-opsize+2],dest[j+2]);
       if (!chroma&&i>0) {
-	// pass 2
-	// average two src rows
-	dest[j+1-widthx]=avg_chroma(dest[j+1-widthx],dest[j+1]);
-	dest[j+2-widthx]=avg_chroma(dest[j+2-widthx],dest[j+2]);
-	dest[j-opsize+1-widthx]=avg_chroma(dest[j-opsize+1-widthx],dest[j-opsize+1]);
-	dest[j-opsize+2-widthx]=avg_chroma(dest[j-opsize+2-widthx],dest[j-opsize+2]);
+        // pass 2
+        // average two src rows
+        dest[j+1-widthx]=avg_chroma(dest[j+1-widthx],dest[j+1]);
+        dest[j+2-widthx]=avg_chroma(dest[j+2-widthx],dest[j+2]);
+        dest[j-opsize+1-widthx]=avg_chroma(dest[j-opsize+1-widthx],dest[j-opsize+1]);
+        dest[j-opsize+2-widthx]=avg_chroma(dest[j-opsize+2-widthx],dest[j-opsize+2]);
       }
 
     }
@@ -7045,8 +7011,8 @@
   }
 }
 
-static void convert_double_chroma_packed(uint8_t **src, int width, int height, uint8_t *dest, boolean add_alpha, 
-					 boolean clamped) {
+static void convert_double_chroma_packed(uint8_t **src, int width, int height, uint8_t *dest, boolean add_alpha,
+    boolean clamped) {
   // width and height here are width and height of dest chroma planes, in bytes
   // double the chroma samples horizontally, with interpolation
 
@@ -7068,15 +7034,15 @@
   widthx=width*opsize;
   opsize2=opsize*2;
 
-  for (i=0;i<height;i++) {
+  for (i=0; i<height; i++) {
     dest[0]=*(s_y++);
     dest[1]=dest[opsize+1]=s_u[0];
     dest[2]=dest[opsize+2]=s_v[0];
     if (add_alpha) dest[3]=dest[opsize+3]=255;
     dest[opsize]=*(s_y++);
-    for (j=opsize2;j<widthx;j+=opsize2) {
+    for (j=opsize2; j<widthx; j+=opsize2) {
       // dvntsc style - chroma is aligned with luma
-      
+
       // process two pixels at a time, and we average the first colour pixel with the last from the previous 2
       // we know we can do this because Y must be even width
       dest[j]=*(s_y++);
@@ -7121,33 +7087,32 @@
     // the last value is repeated once
 
     width--;
-    for (k=1;k<3;k++) {
+    for (k=1; k<3; k++) {
       dst=pixel_data[k];
-      for (j=0;j<height;j++) {
-	for (i=0;i<width;i++) dst[i]=avg_chroma(dst[i],dst[i+1]);
-	dst[i]=dst[i-1];
-	dst+=width+1;
+      for (j=0; j<height; j++) {
+        for (i=0; i<width; i++) dst[i]=avg_chroma(dst[i],dst[i+1]);
+        dst[i]=dst[i-1];
+        dst+=width+1;
       }
     }
     weed_set_int_value(layer,"YUV_sampling",WEED_YUV_SAMPLING_JPEG);
-  }
-  else if (sampling==WEED_YUV_SAMPLING_JPEG) {
-    for (k=1;k<3;k++) {
+  } else if (sampling==WEED_YUV_SAMPLING_JPEG) {
+    for (k=1; k<3; k++) {
       dst=pixel_data[k];
-      for (j=0;j<height;j++) {
-	for (i=width-1;i>0;i--) dst[i]=avg_chroma(dst[i],dst[i-1]);
-	dst[0]=dst[1];
-	dst+=width;
+      for (j=0; j<height; j++) {
+        for (i=width-1; i>0; i--) dst[i]=avg_chroma(dst[i],dst[i-1]);
+        dst[0]=dst[1];
+        dst+=width;
       }
-    }  
+    }
     weed_set_int_value(layer,"YUV_sampling",WEED_YUV_SAMPLING_MPEG);
   }
-  weed_free(pixel_data);
+  lives_free(pixel_data);
 }
 
 
 
-static void switch_yuv_clamping_and_subspace (weed_plant_t *layer, int oclamping, int osubspace) {
+static void switch_yuv_clamping_and_subspace(weed_plant_t *layer, int oclamping, int osubspace) {
   // currently subspace conversions are not performed - TODO
   // we assume subspace Y'CbCr
   int error;
@@ -7308,7 +7273,7 @@
     break;
   }
   weed_set_int_value(layer,"YUV_clamping",oclamping);
-  weed_free(pixel_data);
+  lives_free(pixel_data);
 
 }
 
@@ -7338,8 +7303,8 @@
   uint8_t *memblock;
   uint8_t **pd_array;
 
-  unsigned char black[6]={0,0,0,255,255,255};
-  float blackf[4]={0.,0.,0.,1.};
+  unsigned char black[6]= {0,0,0,255,255,255};
+  float blackf[4]= {0.,0.,0.,1.};
 
   unsigned char *ptr;
 
@@ -7348,7 +7313,7 @@
   register int i,j;
 
   weed_set_voidptr_value(layer,"pixel_data", NULL);
-  if (weed_plant_has_leaf(layer,"host_pixel_data_contiguous")) 
+  if (weed_plant_has_leaf(layer,"host_pixel_data_contiguous"))
     weed_leaf_delete(layer,"host_pixel_data_contiguous");
 
   if (black_fill) {
@@ -7382,18 +7347,17 @@
     if (!black_fill) {
       pixel_data=(uint8_t *)lives_calloc(framesize>>4,16);
       if (pixel_data==NULL) return;
-    }
-    else {
+    } else {
       black[0]=y_black;
       black[1]=black[2]=128;
-      pixel_data=(uint8_t *)g_try_malloc(framesize);
+      pixel_data=(uint8_t *)lives_try_malloc(framesize);
       if (pixel_data==NULL) return;
       ptr=pixel_data;
-      for (i=0;i<height;i++) {
-	for (j=0;j<width;j++) {
-	  lives_memcpy(ptr,black,3);
-	  ptr+=3;
-	}
+      for (i=0; i<height; i++) {
+        for (j=0; j<width; j++) {
+          lives_memcpy(ptr,black,3);
+          ptr+=3;
+        }
       }
     }
     weed_set_int_value(layer,"rowstrides",rowstride);
@@ -7405,18 +7369,17 @@
     if (!black_fill) {
       pixel_data=(uint8_t *)lives_calloc(framesize>>4,16);
       if (pixel_data==NULL) return;
-    }
-    else {
+    } else {
       black[1]=black[3]=y_black;
       black[0]=black[2]=128;
-      pixel_data=(uint8_t *)g_try_malloc(framesize);
+      pixel_data=(uint8_t *)lives_try_malloc(framesize);
       if (pixel_data==NULL) return;
       ptr=pixel_data;
-      for (i=0;i<height;i++) {
-	for (j=0;j<width;j++) {
-	  lives_memcpy(ptr,black,4);
-	  ptr+=4;
-	}
+      for (i=0; i<height; i++) {
+        for (j=0; j<width; j++) {
+          lives_memcpy(ptr,black,4);
+          ptr+=4;
+        }
       }
     }
     rowstride=width*4;
@@ -7429,18 +7392,17 @@
     if (!black_fill) {
       pixel_data=(uint8_t *)lives_calloc(framesize>>4,16);
       if (pixel_data==NULL) return;
-    }
-    else {
+    } else {
       black[0]=black[2]=y_black;
       black[1]=black[3]=128;
-      pixel_data=(uint8_t *)g_try_malloc(framesize);
+      pixel_data=(uint8_t *)lives_try_malloc(framesize);
       if (pixel_data==NULL) return;
       ptr=pixel_data;
-      for (i=0;i<height;i++) {
-	for (j=0;j<width;j++) {
-	  lives_memcpy(ptr,black,4);
-	  ptr+=4;
-	}
+      for (i=0; i<height; i++) {
+        for (j=0; j<width; j++) {
+          lives_memcpy(ptr,black,4);
+          ptr+=4;
+        }
       }
     }
     rowstride=width*4;
@@ -7458,16 +7420,15 @@
     if (!black_fill) {
       pixel_data=(uint8_t *)lives_calloc(framesize>>4,16);
       if (pixel_data==NULL) return;
-    }
-    else {
-      pixel_data=(uint8_t *)g_try_malloc(framesize);
+    } else {
+      pixel_data=(uint8_t *)lives_try_malloc(framesize);
       if (pixel_data==NULL) return;
       ptr=pixel_data;
-      for (i=0;i<height;i++) {
-	for (j=0;j<width;j++) {
-	  lives_memcpy(ptr,black,4);
-	  ptr+=4;
-	}
+      for (i=0; i<height; i++) {
+        for (j=0; j<width; j++) {
+          lives_memcpy(ptr,black,4);
+          ptr+=4;
+        }
       }
     }
     weed_set_int_value(layer,"rowstrides",rowstride);
@@ -7484,16 +7445,15 @@
     if (!black_fill) {
       pixel_data=(uint8_t *)lives_calloc(framesize>>4,16);
       if (pixel_data==NULL) return;
-    }
-    else {
-      pixel_data=(uint8_t *)g_try_malloc(framesize);
+    } else {
+      pixel_data=(uint8_t *)lives_try_malloc(framesize);
       if (pixel_data==NULL) return;
       ptr=pixel_data;
-      for (i=0;i<height;i++) {
-	for (j=0;j<width;j++) {
-	  lives_memcpy(ptr,black,4);
-	  ptr+=4;
-	}
+      for (i=0; i<height; i++) {
+        for (j=0; j<width; j++) {
+          lives_memcpy(ptr,black,4);
+          ptr+=4;
+        }
       }
     }
     weed_set_int_value(layer,"rowstrides",rowstride);
@@ -7510,18 +7470,17 @@
     if (!black_fill) {
       pixel_data=(uint8_t *)lives_calloc(framesize>>4,16);
       if (pixel_data==NULL) return;
-    }
-    else {
+    } else {
       black[0]=255;
       black[3]=0;
-      pixel_data=(uint8_t *)g_try_malloc(framesize);
+      pixel_data=(uint8_t *)lives_try_malloc(framesize);
       if (pixel_data==NULL) return;
       ptr=pixel_data;
-      for (i=0;i<height;i++) {
-	for (j=0;j<width;j++) {
-	  lives_memcpy(ptr,black,4);
-	  ptr+=4;
-	}
+      for (i=0; i<height; i++) {
+        for (j=0; j<width; j++) {
+          lives_memcpy(ptr,black,4);
+          ptr+=4;
+        }
       }
     }
     weed_set_int_value(layer,"rowstrides",rowstride);
@@ -7538,18 +7497,17 @@
     if (!black_fill) {
       pixel_data=(uint8_t *)lives_calloc(framesize>>4,16);
       if (pixel_data==NULL) return;
-    }
-    else {
+    } else {
       black[0]=y_black;
       black[1]=black[2]=128;
-      pixel_data=(uint8_t *)g_try_malloc(framesize);
+      pixel_data=(uint8_t *)lives_try_malloc(framesize);
       if (pixel_data==NULL) return;
       ptr=pixel_data;
-      for (i=0;i<height;i++) {
-	for (j=0;j<width;j++) {
-	  lives_memcpy(ptr,black,4);
-	  ptr+=4;
-	}
+      for (i=0; i<height; i++) {
+        for (j=0; j<width; j++) {
+          lives_memcpy(ptr,black,4);
+          ptr+=4;
+        }
       }
     }
     weed_set_int_value(layer,"rowstrides",rowstride);
@@ -7562,12 +7520,12 @@
     weed_set_int_value(layer,"width",width);
     height=(height>>1)<<1;
     weed_set_int_value(layer,"height",height);
-    rowstrides=(int *)g_malloc(sizint*3);
+    rowstrides=(int *)lives_malloc(sizint*3);
     rowstrides[0]=width;
     rowstrides[1]=rowstrides[2]=(width>>1);
     weed_set_int_array(layer,"rowstrides",3,rowstrides);
-    g_free(rowstrides);
-    pd_array=(uint8_t **)g_malloc(3*sizeof(uint8_t *));
+    lives_free(rowstrides);
+    pd_array=(uint8_t **)lives_malloc(3*sizeof(uint8_t *));
 
     framesize=CEIL(width*height,32);
 
@@ -7575,131 +7533,128 @@
     if (!may_contig) {
       weed_leaf_delete(layer,"host_pixel_data_contiguous");
       if (!black_fill) {
-	pd_array[0]=(uint8_t *)lives_calloc(framesize>>4,16);
-	if (pd_array[0]==NULL) {
-	  g_free(pd_array);
-	  return;
-	}
-	pd_array[1]=(uint8_t *)lives_calloc(framesize>>4,4);
-	if (pd_array[1]==NULL) {
-	  g_free(pd_array[0]);
-	  g_free(pd_array);
-	  return;
-	}
-	pd_array[2]=(uint8_t *)lives_calloc((framesize>>4)+8,4);
-	if (pd_array[2]==NULL) {
-	  g_free(pd_array[1]);
-	  g_free(pd_array[0]);
-	  g_free(pd_array);
-	  return;
-	}
-      }
-      else {
-	pd_array[0]=(uint8_t *)g_try_malloc(framesize);
-	if (pd_array[0]==NULL) {
-	  g_free(pd_array);
-	  return;
-	}
-	memset(pd_array[0],y_black,width*height);
-	pd_array[1]=(uint8_t *)g_try_malloc(framesize>>2);
-	if (pd_array[1]==NULL) {
-	  g_free(pd_array[0]);
-	  g_free(pd_array);
-	  return;
-	}
-	memset(pd_array[1],128,width*height/4);
-	pd_array[2]=(uint8_t *)g_try_malloc((framesize>>2)+64);
-	if (pd_array[2]==NULL) {
-	  g_free(pd_array[1]);
-	  g_free(pd_array[0]);
-	  g_free(pd_array);
-	  return;
-	}
-	memset(pd_array[2],128,width*height/4);
+        pd_array[0]=(uint8_t *)lives_calloc(framesize>>4,16);
+        if (pd_array[0]==NULL) {
+          lives_free(pd_array);
+          return;
+        }
+        pd_array[1]=(uint8_t *)lives_calloc(framesize>>4,4);
+        if (pd_array[1]==NULL) {
+          lives_free(pd_array[0]);
+          lives_free(pd_array);
+          return;
+        }
+        pd_array[2]=(uint8_t *)lives_calloc((framesize>>4)+8,4);
+        if (pd_array[2]==NULL) {
+          lives_free(pd_array[1]);
+          lives_free(pd_array[0]);
+          lives_free(pd_array);
+          return;
+        }
+      } else {
+        pd_array[0]=(uint8_t *)lives_try_malloc(framesize);
+        if (pd_array[0]==NULL) {
+          lives_free(pd_array);
+          return;
+        }
+        memset(pd_array[0],y_black,width*height);
+        pd_array[1]=(uint8_t *)lives_try_malloc(framesize>>2);
+        if (pd_array[1]==NULL) {
+          lives_free(pd_array[0]);
+          lives_free(pd_array);
+          return;
+        }
+        memset(pd_array[1],128,width*height/4);
+        pd_array[2]=(uint8_t *)lives_try_malloc((framesize>>2)+64);
+        if (pd_array[2]==NULL) {
+          lives_free(pd_array[1]);
+          lives_free(pd_array[0]);
+          lives_free(pd_array);
+          return;
+        }
+        memset(pd_array[2],128,width*height/4);
       }
 
     } else {
       weed_set_boolean_value(layer,"host_pixel_data_contiguous",WEED_TRUE);
 
       if (!black_fill) {
-	memblock=(uint8_t *)lives_calloc(((framesize*3)>>3)+8,4);
-	if (memblock==NULL) return;
-	pd_array[0]=(uint8_t *)memblock;
-	pd_array[1]=(uint8_t *)(memblock+framesize);
-	pd_array[2]=(uint8_t *)(memblock+((framesize*5)>>2));
-      }
-      else {
-	memblock=(uint8_t *)g_try_malloc(framesize*3/2);
-	if (memblock==NULL) return;
-	pd_array[0]=(uint8_t *)memblock;
-	memset(pd_array[0],y_black,width*height);
-	pd_array[1]=(uint8_t *)(memblock+framesize);
-	memset(pd_array[1],128,width*height/2);
-	pd_array[2]=(uint8_t *)(memblock+((framesize*5)>>2));
+        memblock=(uint8_t *)lives_calloc(((framesize*3)>>3)+8,4);
+        if (memblock==NULL) return;
+        pd_array[0]=(uint8_t *)memblock;
+        pd_array[1]=(uint8_t *)(memblock+framesize);
+        pd_array[2]=(uint8_t *)(memblock+((framesize*5)>>2));
+      } else {
+        memblock=(uint8_t *)lives_try_malloc(framesize*3/2);
+        if (memblock==NULL) return;
+        pd_array[0]=(uint8_t *)memblock;
+        memset(pd_array[0],y_black,width*height);
+        pd_array[1]=(uint8_t *)(memblock+framesize);
+        memset(pd_array[1],128,width*height/2);
+        pd_array[2]=(uint8_t *)(memblock+((framesize*5)>>2));
       }
 
     }
 
     weed_set_voidptr_array(layer,"pixel_data",3,(void **)pd_array);
-    weed_free(pd_array);
+    lives_free(pd_array);
     break;
 
   case WEED_PALETTE_YUV422P:
     width=(width>>1)<<1;
     weed_set_int_value(layer,"width",width);
-    rowstrides=(int *)g_malloc(sizint*3);
+    rowstrides=(int *)lives_malloc(sizint*3);
     rowstrides[0]=width;
     rowstrides[1]=rowstrides[2]=width>>1;
     weed_set_int_array(layer,"rowstrides",3,rowstrides);
-    g_free(rowstrides);
-    pd_array=(uint8_t **)g_malloc(3*sizeof(uint8_t *));
+    lives_free(rowstrides);
+    pd_array=(uint8_t **)lives_malloc(3*sizeof(uint8_t *));
     framesize=CEIL(width*height,32);
 
     if (!may_contig) {
       weed_leaf_delete(layer,"host_pixel_data_contiguous");
 
       if (!black_fill) {
-	pd_array[0]=(uint8_t *)lives_calloc(framesize>>4,16);
-	if (pd_array[0]==NULL) {
-	  g_free(pd_array);
-	  return;
-	}
-	pd_array[1]=(uint8_t *)lives_calloc(framesize>>3,4);
-	if (pd_array[1]==NULL) {
-	  g_free(pd_array[0]);
-	  g_free(pd_array);
-	  return;
-	}
-	pd_array[2]=(uint8_t *)lives_calloc((framesize>>3)+8,4);
-	if (pd_array[2]==NULL) {
-	  g_free(pd_array[1]);
-	  g_free(pd_array[0]);
-	  g_free(pd_array);
-	  return;
-	}
-      }
-      else {
-	pd_array[0]=(uint8_t *)g_try_malloc(framesize);
-	if (pd_array[0]==NULL) {
-	  g_free(pd_array);
-	  return;
-	}
-	memset(pd_array[0],y_black,width*height);
-	pd_array[1]=(uint8_t *)g_try_malloc(framesize>>1);
-	if (pd_array[1]==NULL) {
-	  g_free(pd_array[0]);
-	  g_free(pd_array);
-	  return;
-	}
-	memset(pd_array[1],128,width*height/2);
-	pd_array[2]=(uint8_t *)g_try_malloc((framesize>>1)+64);
-	if (pd_array[2]==NULL) {
-	  g_free(pd_array[1]);
-	  g_free(pd_array[0]);
-	  g_free(pd_array);
-	  return;
-	}
-	memset(pd_array[2],128,width*height/2);
+        pd_array[0]=(uint8_t *)lives_calloc(framesize>>4,16);
+        if (pd_array[0]==NULL) {
+          lives_free(pd_array);
+          return;
+        }
+        pd_array[1]=(uint8_t *)lives_calloc(framesize>>3,4);
+        if (pd_array[1]==NULL) {
+          lives_free(pd_array[0]);
+          lives_free(pd_array);
+          return;
+        }
+        pd_array[2]=(uint8_t *)lives_calloc((framesize>>3)+8,4);
+        if (pd_array[2]==NULL) {
+          lives_free(pd_array[1]);
+          lives_free(pd_array[0]);
+          lives_free(pd_array);
+          return;
+        }
+      } else {
+        pd_array[0]=(uint8_t *)lives_try_malloc(framesize);
+        if (pd_array[0]==NULL) {
+          lives_free(pd_array);
+          return;
+        }
+        memset(pd_array[0],y_black,width*height);
+        pd_array[1]=(uint8_t *)lives_try_malloc(framesize>>1);
+        if (pd_array[1]==NULL) {
+          lives_free(pd_array[0]);
+          lives_free(pd_array);
+          return;
+        }
+        memset(pd_array[1],128,width*height/2);
+        pd_array[2]=(uint8_t *)lives_try_malloc((framesize>>1)+64);
+        if (pd_array[2]==NULL) {
+          lives_free(pd_array[1]);
+          lives_free(pd_array[0]);
+          lives_free(pd_array);
+          return;
+        }
+        memset(pd_array[2],128,width*height/2);
       }
 
 
@@ -7707,210 +7662,205 @@
       weed_set_boolean_value(layer,"host_pixel_data_contiguous",WEED_TRUE);
 
       if (!black_fill) {
-	memblock=(uint8_t *)lives_calloc((framesize>>1)+8,4);
-	if (memblock==NULL) return;
-	pd_array[0]=(uint8_t *)memblock;
-	pd_array[1]=(uint8_t *)(memblock+framesize);
-	pd_array[2]=(uint8_t *)(memblock+((3*framesize)>>1));
-      }
-      else {
-	memblock=(uint8_t *)g_try_malloc((framesize*2)+64);
-	if (memblock==NULL) return;
-	pd_array[0]=(uint8_t *)memblock;
-	pd_array[1]=(uint8_t *)(memblock+framesize);
-	pd_array[2]=(uint8_t *)(memblock+((3*framesize)>>1));
-	memset(pd_array[0],y_black,width*height);
-	memset(pd_array[1],128,width*height);
+        memblock=(uint8_t *)lives_calloc((framesize>>1)+8,4);
+        if (memblock==NULL) return;
+        pd_array[0]=(uint8_t *)memblock;
+        pd_array[1]=(uint8_t *)(memblock+framesize);
+        pd_array[2]=(uint8_t *)(memblock+((3*framesize)>>1));
+      } else {
+        memblock=(uint8_t *)lives_try_malloc((framesize*2)+64);
+        if (memblock==NULL) return;
+        pd_array[0]=(uint8_t *)memblock;
+        pd_array[1]=(uint8_t *)(memblock+framesize);
+        pd_array[2]=(uint8_t *)(memblock+((3*framesize)>>1));
+        memset(pd_array[0],y_black,width*height);
+        memset(pd_array[1],128,width*height);
       }
 
     }
     weed_set_voidptr_array(layer,"pixel_data",3,(void **)pd_array);
-    weed_free(pd_array);
+    lives_free(pd_array);
     break;
 
 
   case WEED_PALETTE_YUV444P:
-    rowstrides=(int *)g_malloc(sizint*3);
+    rowstrides=(int *)lives_malloc(sizint*3);
     rowstrides[0]=rowstrides[1]=rowstrides[2]=width;
     weed_set_int_array(layer,"rowstrides",3,rowstrides);
-    g_free(rowstrides);
-    pd_array=(uint8_t **)g_malloc(3*sizeof(uint8_t *));
+    lives_free(rowstrides);
+    pd_array=(uint8_t **)lives_malloc(3*sizeof(uint8_t *));
     framesize=CEIL(width*height,32);
 
     if (!may_contig) {
       weed_leaf_delete(layer,"host_pixel_data_contiguous");
 
       if (!black_fill) {
-	pd_array[0]=(uint8_t *)lives_calloc(framesize>>4,16);
-	if (pd_array[0]==NULL) {
-	  g_free(pd_array);
-	  return;
-	}
-	pd_array[1]=(uint8_t *)lives_calloc(framesize>>4,16);
-	if (pd_array[1]==NULL) {
-	  g_free(pd_array[0]);
-	  g_free(pd_array);
-	  return;
-	}
-	pd_array[2]=(uint8_t *)lives_calloc((framesize>>4)+4,16);
-	if (pd_array[2]==NULL) {
-	  g_free(pd_array[1]);
-	  g_free(pd_array[0]);
-	  g_free(pd_array);
-	  return;
-	}
-      }
-      else {
-	pd_array[0]=(uint8_t *)g_try_malloc(framesize);
-	if (pd_array[0]==NULL) {
-	  g_free(pd_array);
-	  return;
-	}
-	memset(pd_array[0],y_black,width*height);
-	pd_array[1]=(uint8_t *)g_try_malloc(framesize);
-	if (pd_array[1]==NULL) {
-	  g_free(pd_array[0]);
-	  g_free(pd_array);
-	  return;
-	}
-	memset(pd_array[1],128,width*height);
-	pd_array[2]=(uint8_t *)g_try_malloc(framesize+64);
-	if (pd_array[2]==NULL) {
-	  g_free(pd_array[1]);
-	  g_free(pd_array[0]);
-	  g_free(pd_array);
-	  return;
-	}
-	memset(pd_array[2],128,width*height);
+        pd_array[0]=(uint8_t *)lives_calloc(framesize>>4,16);
+        if (pd_array[0]==NULL) {
+          lives_free(pd_array);
+          return;
+        }
+        pd_array[1]=(uint8_t *)lives_calloc(framesize>>4,16);
+        if (pd_array[1]==NULL) {
+          lives_free(pd_array[0]);
+          lives_free(pd_array);
+          return;
+        }
+        pd_array[2]=(uint8_t *)lives_calloc((framesize>>4)+4,16);
+        if (pd_array[2]==NULL) {
+          lives_free(pd_array[1]);
+          lives_free(pd_array[0]);
+          lives_free(pd_array);
+          return;
+        }
+      } else {
+        pd_array[0]=(uint8_t *)lives_try_malloc(framesize);
+        if (pd_array[0]==NULL) {
+          lives_free(pd_array);
+          return;
+        }
+        memset(pd_array[0],y_black,width*height);
+        pd_array[1]=(uint8_t *)lives_try_malloc(framesize);
+        if (pd_array[1]==NULL) {
+          lives_free(pd_array[0]);
+          lives_free(pd_array);
+          return;
+        }
+        memset(pd_array[1],128,width*height);
+        pd_array[2]=(uint8_t *)lives_try_malloc(framesize+64);
+        if (pd_array[2]==NULL) {
+          lives_free(pd_array[1]);
+          lives_free(pd_array[0]);
+          lives_free(pd_array);
+          return;
+        }
+        memset(pd_array[2],128,width*height);
       }
 
 
     } else {
       weed_set_boolean_value(layer,"host_pixel_data_contiguous",WEED_TRUE);
       if (!black_fill) {
-	memblock=(uint8_t *)lives_calloc(((framesize*3)>>4)+4,16);
-	if (memblock==NULL) return;
-	pd_array[0]=memblock;
-	pd_array[1]=memblock+framesize;
-	pd_array[2]=memblock+framesize*2;
-
-      }
-      else {
-	memblock=(uint8_t *)g_try_malloc(framesize*3+64);
-	if (memblock==NULL) return;
-	pd_array[0]=memblock;
-	memset(pd_array[0],y_black,width*height);
-	pd_array[1]=memblock+framesize;
-	pd_array[2]=memblock+framesize*2;
-	memset(pd_array[1],128,width*height*2);
+        memblock=(uint8_t *)lives_calloc(((framesize*3)>>4)+4,16);
+        if (memblock==NULL) return;
+        pd_array[0]=memblock;
+        pd_array[1]=memblock+framesize;
+        pd_array[2]=memblock+framesize*2;
+
+      } else {
+        memblock=(uint8_t *)lives_try_malloc(framesize*3+64);
+        if (memblock==NULL) return;
+        pd_array[0]=memblock;
+        memset(pd_array[0],y_black,width*height);
+        pd_array[1]=memblock+framesize;
+        pd_array[2]=memblock+framesize*2;
+        memset(pd_array[1],128,width*height*2);
       }
     }
     weed_set_voidptr_array(layer,"pixel_data",3,(void **)pd_array);
-    weed_free(pd_array);
+    lives_free(pd_array);
     break;
 
 
   case WEED_PALETTE_YUVA4444P:
-    rowstrides=(int *)g_malloc(sizint*4);
+    rowstrides=(int *)lives_malloc(sizint*4);
     rowstrides[0]=rowstrides[1]=rowstrides[2]=rowstrides[3]=width;
     weed_set_int_array(layer,"rowstrides",4,rowstrides);
-    g_free(rowstrides);
-    pd_array=(uint8_t **)g_malloc(4*sizeof(uint8_t *));
+    lives_free(rowstrides);
+    pd_array=(uint8_t **)lives_malloc(4*sizeof(uint8_t *));
     framesize=CEIL(width*height,32);
 
     if (!may_contig) {
       weed_leaf_delete(layer,"host_pixel_data_contiguous");
 
       if (!black_fill) {
-	pd_array[0]=(uint8_t *)lives_calloc(framesize>>4,16);
-	if (pd_array[0]==NULL) {
-	  g_free(pd_array);
-	  return;
-	}
-	pd_array[1]=(uint8_t *)lives_calloc(framesize>>4,16);
-	if (pd_array[1]==NULL) {
-	  g_free(pd_array[0]);
-	  g_free(pd_array);
-	  return;
-	}
-	pd_array[2]=(uint8_t *)lives_calloc(framesize>>4,16);
-	if (pd_array[2]==NULL) {
-	  g_free(pd_array[1]);
-	  g_free(pd_array[0]);
-	  g_free(pd_array);
-	  return;
-	}
-	pd_array[3]=(uint8_t *)lives_calloc((framesize>>4)+4,16);
-	if (pd_array[3]==NULL) {
-	  g_free(pd_array[2]);
-	  g_free(pd_array[1]);
-	  g_free(pd_array[0]);
-	  g_free(pd_array);
-	  return;
-	}
-      }
-      else {
-	pd_array[0]=(uint8_t *)g_try_malloc(framesize);
-	if (pd_array[0]==NULL) {
-	  g_free(pd_array);
-	  return;
-	}
-	memset(pd_array[0],y_black,width*height);
-	pd_array[1]=(uint8_t *)g_try_malloc(framesize);
-	if (pd_array[1]==NULL) {
-	  g_free(pd_array[0]);
-	  g_free(pd_array);
-	  return;
-	}
-	memset(pd_array[1],128,width*height);
-	pd_array[2]=(uint8_t *)g_try_malloc(framesize);
-	if (pd_array[2]==NULL) {
-	  g_free(pd_array[1]);
-	  g_free(pd_array[0]);
-	  g_free(pd_array);
-	  return;
-	}
-	memset(pd_array[2],128,width*height);
-	pd_array[3]=(uint8_t *)g_try_malloc(framesize+64);
-	if (pd_array[3]==NULL) {
-	  g_free(pd_array[2]);
-	  g_free(pd_array[1]);
-	  g_free(pd_array[0]);
-	  g_free(pd_array);
-	  return;
-	}
-	memset(pd_array[3],255,width*height);
+        pd_array[0]=(uint8_t *)lives_calloc(framesize>>4,16);
+        if (pd_array[0]==NULL) {
+          lives_free(pd_array);
+          return;
+        }
+        pd_array[1]=(uint8_t *)lives_calloc(framesize>>4,16);
+        if (pd_array[1]==NULL) {
+          lives_free(pd_array[0]);
+          lives_free(pd_array);
+          return;
+        }
+        pd_array[2]=(uint8_t *)lives_calloc(framesize>>4,16);
+        if (pd_array[2]==NULL) {
+          lives_free(pd_array[1]);
+          lives_free(pd_array[0]);
+          lives_free(pd_array);
+          return;
+        }
+        pd_array[3]=(uint8_t *)lives_calloc((framesize>>4)+4,16);
+        if (pd_array[3]==NULL) {
+          lives_free(pd_array[2]);
+          lives_free(pd_array[1]);
+          lives_free(pd_array[0]);
+          lives_free(pd_array);
+          return;
+        }
+      } else {
+        pd_array[0]=(uint8_t *)lives_try_malloc(framesize);
+        if (pd_array[0]==NULL) {
+          lives_free(pd_array);
+          return;
+        }
+        memset(pd_array[0],y_black,width*height);
+        pd_array[1]=(uint8_t *)lives_try_malloc(framesize);
+        if (pd_array[1]==NULL) {
+          lives_free(pd_array[0]);
+          lives_free(pd_array);
+          return;
+        }
+        memset(pd_array[1],128,width*height);
+        pd_array[2]=(uint8_t *)lives_try_malloc(framesize);
+        if (pd_array[2]==NULL) {
+          lives_free(pd_array[1]);
+          lives_free(pd_array[0]);
+          lives_free(pd_array);
+          return;
+        }
+        memset(pd_array[2],128,width*height);
+        pd_array[3]=(uint8_t *)lives_try_malloc(framesize+64);
+        if (pd_array[3]==NULL) {
+          lives_free(pd_array[2]);
+          lives_free(pd_array[1]);
+          lives_free(pd_array[0]);
+          lives_free(pd_array);
+          return;
+        }
+        memset(pd_array[3],255,width*height);
       }
 
 
     } else {
       weed_set_boolean_value(layer,"host_pixel_data_contiguous",WEED_TRUE);
-    
+
       if (!black_fill) {
-	memblock=(uint8_t *)lives_calloc(framesize+16,4);
-	if (memblock==NULL) return;
-	pd_array[0]=memblock;
-	pd_array[1]=memblock+framesize;
-	pd_array[2]=memblock+framesize*2;
-	pd_array[3]=memblock+framesize*3;
-      }
-      else {
-	memblock=(uint8_t *)g_try_malloc(framesize*4+64);
-	if (memblock==NULL) return;
-	pd_array[0]=memblock;
-	memset(pd_array[0],y_black,width*height);
-	pd_array[1]=memblock+framesize;
-	pd_array[2]=memblock+framesize*2;
+        memblock=(uint8_t *)lives_calloc(framesize+16,4);
+        if (memblock==NULL) return;
+        pd_array[0]=memblock;
+        pd_array[1]=memblock+framesize;
+        pd_array[2]=memblock+framesize*2;
+        pd_array[3]=memblock+framesize*3;
+      } else {
+        memblock=(uint8_t *)lives_try_malloc(framesize*4+64);
+        if (memblock==NULL) return;
+        pd_array[0]=memblock;
+        memset(pd_array[0],y_black,width*height);
+        pd_array[1]=memblock+framesize;
+        pd_array[2]=memblock+framesize*2;
 
-	memset(pd_array[1],128,width*height*2);
+        memset(pd_array[1],128,width*height*2);
 
-	pd_array[3]=memblock+framesize*3;
+        pd_array[3]=memblock+framesize*3;
 
-	memset(pd_array[3],255,width*height);
+        memset(pd_array[3],255,width*height);
       }
     }
     weed_set_voidptr_array(layer,"pixel_data",4,(void **)pd_array);
-    weed_free(pd_array);
+    lives_free(pd_array);
     break;
 
 
@@ -7924,11 +7874,11 @@
       pixel_data=(uint8_t *)lives_calloc(width*height*3+32,2);
       if (pixel_data==NULL) return;
       ptr=pixel_data;
-      for (i=0;i<height;i++) {
-	for (j=0;j<width;j++) {
-	  lives_memcpy(ptr,black,6);
-	  ptr+=6;
-	}
+      for (i=0; i<height; i++) {
+        for (j=0; j<width; j++) {
+          lives_memcpy(ptr,black,6);
+          ptr+=6;
+        }
       }
     }
     if (pixel_data==NULL) return;
@@ -7949,14 +7899,14 @@
     if (!black_fill) pixel_data=(uint8_t *)lives_calloc(width*height*4+(64/sizeof(float)),sizeof(float));
     else {
       size_t sizf=4*sizeof(float);
-      pixel_data=(uint8_t *)g_try_malloc(width*height*sizf+64);
+      pixel_data=(uint8_t *)lives_try_malloc(width*height*sizf+64);
       if (pixel_data==NULL) return;
       ptr=pixel_data;
-      for (i=0;i<height;i++) {
-	for (j=0;j<width;j++) {
-	  lives_memcpy(ptr,blackf,sizf);
-	  ptr+=sizf;
-	}
+      for (i=0; i<height; i++) {
+        for (j=0; j<width; j++) {
+          lives_memcpy(ptr,blackf,sizf);
+          ptr+=sizf;
+        }
       }
     }
     if (pixel_data==NULL) return;
@@ -7969,15 +7919,15 @@
     if (!black_fill) pixel_data=(uint8_t *)lives_calloc(width*height+(64/sizeof(float)),sizeof(float));
     else {
       size_t sizf=sizeof(float);
-      pixel_data=(uint8_t *)g_try_malloc(width*height*sizf+64);
+      pixel_data=(uint8_t *)lives_try_malloc(width*height*sizf+64);
       if (pixel_data==NULL) return;
       ptr=pixel_data;
       blackf[0]=1.;
-      for (i=0;i<height;i++) {
-	for (j=0;j<width;j++) {
-	  lives_memcpy(ptr,blackf,sizf);
-	  ptr+=sizf;
-	}
+      for (i=0; i<height; i++) {
+        for (j=0; j<width; j++) {
+          lives_memcpy(ptr,blackf,sizf);
+          ptr+=sizf;
+        }
       }
     }
     if (pixel_data==NULL) return;
@@ -7990,7 +7940,7 @@
     framesize=CEIL(width*height,32)+64;
     if (!black_fill) pixel_data=(uint8_t *)lives_calloc(framesize,1);
     else {
-      pixel_data=(uint8_t *)g_try_malloc(framesize);
+      pixel_data=(uint8_t *)lives_try_malloc(framesize);
       if (pixel_data==NULL) return;
       memset(pixel_data,255,width*height);
     }
@@ -8004,7 +7954,7 @@
     framesize=CEIL(rowstride*height,32)+64;
     if (!black_fill) pixel_data=(uint8_t *)lives_calloc(framesize,1);
     else {
-      pixel_data=(uint8_t *)g_try_malloc(framesize);
+      pixel_data=(uint8_t *)lives_try_malloc(framesize);
       if (pixel_data==NULL) return;
       memset(pixel_data,255,rowstride*height);
     }
@@ -8014,7 +7964,7 @@
     break;
 
   default:
-    g_printerr("Warning: asked to create empty pixel_data for palette %d !\n",palette);
+    lives_printerr("Warning: asked to create empty pixel_data for palette %d !\n",palette);
   }
 }
 
@@ -8045,7 +7995,7 @@
 
   if (!unal_inited) init_unal();
 
-  if (weed_plant_has_leaf(layer,"YUV_clamping")) 
+  if (weed_plant_has_leaf(layer,"YUV_clamping"))
     clamped=(weed_get_int_value(layer,"YUV_clamping",&error)==WEED_YUV_CLAMPING_CLAMPED);
   else clamped=TRUE;
 
@@ -8075,58 +8025,55 @@
 
     if (!clamped) {
       if (un) {
-	for (i=0;i<height;i++) {
-	  for (j=0;j<width;j++) {
-	    alpha=ptrp[3][j];
-	    for (p=0;p<3;p++) {
-	      ptrp[p][j]=unal[alpha][ptrp[p][j]];
-	    }
-	  }
-	  for (p=0;p<4;p++) {
-	    ptrp[p]+=rows[p];
-	  }
-	}
+        for (i=0; i<height; i++) {
+          for (j=0; j<width; j++) {
+            alpha=ptrp[3][j];
+            for (p=0; p<3; p++) {
+              ptrp[p][j]=unal[alpha][ptrp[p][j]];
+            }
+          }
+          for (p=0; p<4; p++) {
+            ptrp[p]+=rows[p];
+          }
+        }
+      } else {
+        for (i=0; i<height; i++) {
+          for (j=0; j<width; j++) {
+            alpha=ptrp[3][j];
+            for (p=0; p<3; p++) {
+              ptrp[p][j]=al[alpha][ptrp[p][j]];
+            }
+          }
+          for (p=0; p<4; p++) {
+            ptrp[p]+=rows[p];
+          }
+        }
       }
-      else {
-	for (i=0;i<height;i++) {
-	  for (j=0;j<width;j++) {
-	    alpha=ptrp[3][j];
-	    for (p=0;p<3;p++) {
-	      ptrp[p][j]=al[alpha][ptrp[p][j]];
-	    }
-	  }
-	  for (p=0;p<4;p++) {
-	    ptrp[p]+=rows[p];
-	  }
-	}
-      }
-    }
-    else {
+    } else {
       if (un) {
-	for (i=0;i<height;i++) {
-	  for (j=0;j<width;j++) {
-	    alpha=ptrp[3][j];
-	    ptrp[0][j]=unalcy[alpha][ptrp[0][j]];
-	    ptrp[1][j]=unalcuv[alpha][ptrp[0][j]];
-	    ptrp[2][j]=unalcuv[alpha][ptrp[0][j]];
-	  }
-	  for (p=0;p<4;p++) {
-	    ptrp[p]+=rows[p];
-	  }
-	}
-      }
-      else {
-	for (i=0;i<height;i++) {
-	  for (j=0;j<width;j++) {
-	    alpha=ptrp[3][j];
-	    ptrp[0][j]=alcy[alpha][ptrp[0][j]];
-	    ptrp[1][j]=alcuv[alpha][ptrp[0][j]];
-	    ptrp[2][j]=alcuv[alpha][ptrp[0][j]];
-	  }
-	  for (p=0;p<4;p++) {
-	    ptrp[p]+=rows[p];
-	  }
-	}
+        for (i=0; i<height; i++) {
+          for (j=0; j<width; j++) {
+            alpha=ptrp[3][j];
+            ptrp[0][j]=unalcy[alpha][ptrp[0][j]];
+            ptrp[1][j]=unalcuv[alpha][ptrp[0][j]];
+            ptrp[2][j]=unalcuv[alpha][ptrp[0][j]];
+          }
+          for (p=0; p<4; p++) {
+            ptrp[p]+=rows[p];
+          }
+        }
+      } else {
+        for (i=0; i<height; i++) {
+          for (j=0; j<width; j++) {
+            alpha=ptrp[3][j];
+            ptrp[0][j]=alcy[alpha][ptrp[0][j]];
+            ptrp[1][j]=alcuv[alpha][ptrp[0][j]];
+            ptrp[2][j]=alcuv[alpha][ptrp[0][j]];
+          }
+          for (p=0; p<4; p++) {
+            ptrp[p]+=rows[p];
+          }
+        }
       }
     }
     return;
@@ -8138,50 +8085,47 @@
 
   if (!clamped) {
     if (un) {
-      for (i=0;i<height;i++) {
-	for (j=0;j<widthx;j+=psize) {
-	  alpha=ptr[j+aoffs];
-	  for (p=coffs;p<psizel;p++) {
-	    ptr[j+p]=unal[alpha][ptr[j+p]];
-	  }
-	}
-	ptr+=rowstride;
+      for (i=0; i<height; i++) {
+        for (j=0; j<widthx; j+=psize) {
+          alpha=ptr[j+aoffs];
+          for (p=coffs; p<psizel; p++) {
+            ptr[j+p]=unal[alpha][ptr[j+p]];
+          }
+        }
+        ptr+=rowstride;
       }
-    }
-    else {
-      for (i=0;i<height;i++) {
-	for (j=0;j<widthx;j+=psize) {
-	  alpha=ptr[j+aoffs];
-	  for (p=coffs;p<psizel;p++) {
-	    ptr[j+p]=al[alpha][ptr[j+p]];
-	  }
-	}
-	ptr+=rowstride;
+    } else {
+      for (i=0; i<height; i++) {
+        for (j=0; j<widthx; j+=psize) {
+          alpha=ptr[j+aoffs];
+          for (p=coffs; p<psizel; p++) {
+            ptr[j+p]=al[alpha][ptr[j+p]];
+          }
+        }
+        ptr+=rowstride;
       }
     }
-  }
-  else {
+  } else {
     // unclamped YUVA8888 (packed)
     if (un) {
-      for (i=0;i<height;i++) {
-	for (j=0;j<widthx;j+=psize) {
-	  alpha=ptr[j+3];
-	  ptr[j]=unalcy[alpha][ptr[j]];
-	  ptr[j+1]=unalcuv[alpha][ptr[j]];
-	  ptr[j+2]=unalcuv[alpha][ptr[j]];
-	}
-	ptr+=rowstride;
+      for (i=0; i<height; i++) {
+        for (j=0; j<widthx; j+=psize) {
+          alpha=ptr[j+3];
+          ptr[j]=unalcy[alpha][ptr[j]];
+          ptr[j+1]=unalcuv[alpha][ptr[j]];
+          ptr[j+2]=unalcuv[alpha][ptr[j]];
+        }
+        ptr+=rowstride;
       }
-    }
-    else {
-      for (i=0;i<height;i++) {
-	for (j=0;j<widthx;j+=psize) {
-	  alpha=ptr[j+3];
-	  ptr[j]=alcy[alpha][ptr[j]];
-	  ptr[j+1]=alcuv[alpha][ptr[j]];
-	  ptr[j+2]=alcuv[alpha][ptr[j]];
-	}
-	ptr+=rowstride;
+    } else {
+      for (i=0; i<height; i++) {
+        for (j=0; j<widthx; j+=psize) {
+          alpha=ptr[j+3];
+          ptr[j]=alcy[alpha][ptr[j]];
+          ptr[j+1]=alcuv[alpha][ptr[j]];
+          ptr[j+2]=alcuv[alpha][ptr[j]];
+        }
+        ptr+=rowstride;
       }
     }
   }
@@ -8243,7 +8187,7 @@
   if (weed_plant_has_leaf(layer,"YUV_sampling")) isamtype=weed_get_int_value(layer,"YUV_sampling",&error);
   else isamtype=WEED_YUV_SAMPLING_DEFAULT;
 
-  if (weed_plant_has_leaf(layer,"YUV_clamping")) 
+  if (weed_plant_has_leaf(layer,"YUV_clamping"))
     iclamped=(weed_get_int_value(layer,"YUV_clamping",&error)==WEED_YUV_CLAMPING_CLAMPED);
   else iclamped=TRUE;
 
@@ -8252,29 +8196,27 @@
 
   //#define DEBUG_PCONV
 #ifdef DEBUG_PCONV
-  gchar *tmp2,*tmp3;
+  char *tmp2,*tmp3;
   g_print("converting palette %s(%s - %d) to %s(%s - %d)\n",weed_palette_get_name(inpl),
-	  (tmp2=g_strdup(weed_yuv_clamping_get_name(!iclamped))),!iclamped,weed_palette_get_name(outpl),
-	  (tmp3=g_strdup(weed_yuv_clamping_get_name(!oclamping))),!oclamping);
-  g_free(tmp2);
-  g_free(tmp3);
+          (tmp2=lives_strdup(weed_yuv_clamping_get_name(!iclamped))),!iclamped,weed_palette_get_name(outpl),
+          (tmp3=lives_strdup(weed_yuv_clamping_get_name(!oclamping))),!oclamping);
+  lives_free(tmp2);
+  lives_free(tmp3);
 #endif
 
   if (weed_palette_is_yuv_palette(inpl)&&weed_palette_is_yuv_palette(outpl)&&(iclamped!=oclamping||isubspace!=osubspace)) {
     if (isubspace==osubspace) {
 #ifdef DEBUG_PCONV
-      g_printerr("converting clamping %d to %d\n",!iclamped,!oclamping);
+      lives_printerr("converting clamping %d to %d\n",!iclamped,!oclamping);
 #endif
       switch_yuv_clamping_and_subspace(layer,oclamping?WEED_YUV_CLAMPING_CLAMPED:WEED_YUV_CLAMPING_UNCLAMPED,osubspace);
       iclamped=oclamping;
-    }
-    else {
+    } else {
       // convert first to RGB(A)
       if (weed_palette_has_alpha_channel(inpl)) {
-	convert_layer_palette_full(layer, WEED_PALETTE_RGBA32, WEED_YUV_SAMPLING_DEFAULT, FALSE, WEED_YUV_SUBSPACE_YUV);
-      }
-      else {
-	convert_layer_palette_full(layer, WEED_PALETTE_RGB24, WEED_YUV_SAMPLING_DEFAULT, FALSE, WEED_YUV_SUBSPACE_YUV);
+        convert_layer_palette_full(layer, WEED_PALETTE_RGBA32, WEED_YUV_SAMPLING_DEFAULT, FALSE, WEED_YUV_SUBSPACE_YUV);
+      } else {
+        convert_layer_palette_full(layer, WEED_PALETTE_RGB24, WEED_YUV_SAMPLING_DEFAULT, FALSE, WEED_YUV_SUBSPACE_YUV);
       }
       inpl=weed_get_int_value(layer,"current_palette",&error);
       isubspace=osubspace;
@@ -8285,23 +8227,22 @@
 #endif
     }
   }
-    
-  
+
+
   if (inpl==outpl) {
 #ifdef DEBUG_PCONV
-    g_printerr("not converting palette\n");
+    lives_printerr("not converting palette\n");
 #endif
     if (!weed_palette_is_yuv_palette(inpl)||(isamtype==osamtype&&
-					     (isubspace==osubspace||(osubspace!=WEED_YUV_SUBSPACE_BT709)))) return TRUE;
+        (isubspace==osubspace||(osubspace!=WEED_YUV_SUBSPACE_BT709)))) return TRUE;
     if (inpl==WEED_PALETTE_YUV420P&&((isamtype==WEED_YUV_SAMPLING_JPEG&&osamtype==WEED_YUV_SAMPLING_MPEG)||
-				     (isamtype==WEED_YUV_SAMPLING_MPEG&&osamtype==WEED_YUV_SAMPLING_JPEG))) { 
+                                     (isamtype==WEED_YUV_SAMPLING_MPEG&&osamtype==WEED_YUV_SAMPLING_JPEG))) {
       switch_yuv_sampling(layer);
-    }
-    else {
-      gchar *tmp2=g_strdup_printf("Switch sampling types (%d %d) or subspace(%d %d): (%d) conversion not yet written !\n",
-				  isamtype,osamtype,isubspace,osubspace,inpl);
+    } else {
+      char *tmp2=lives_strdup_printf("Switch sampling types (%d %d) or subspace(%d %d): (%d) conversion not yet written !\n",
+                                     isamtype,osamtype,isubspace,osubspace,inpl);
       LIVES_DEBUG(tmp2);
-      g_free(tmp2);
+      lives_free(tmp2);
       return TRUE;
     }
   }
@@ -8310,13 +8251,12 @@
     flags=weed_get_int_value(layer,"flags",&error);
 
   if (prefs->alpha_post) {
-    if ((flags&WEED_CHANNEL_ALPHA_PREMULT) && 
-	(weed_palette_has_alpha_channel(inpl)&&!(weed_palette_has_alpha_channel(outpl)))) {
+    if ((flags&WEED_CHANNEL_ALPHA_PREMULT) &&
+        (weed_palette_has_alpha_channel(inpl)&&!(weed_palette_has_alpha_channel(outpl)))) {
       // if we have pre-multiplied alpha, remove it when removing alpha channel
       alpha_unpremult(layer,TRUE);
     }
-  }
-  else {
+  } else {
     if (!weed_palette_has_alpha_channel(inpl)&&weed_palette_has_alpha_channel(outpl)) {
       flags|=WEED_CHANNEL_ALPHA_PREMULT;
       weed_set_int_value(layer,"flags",flags);
@@ -8329,7 +8269,7 @@
     else weed_set_int_value(layer,"flags",flags);
   }
 
-  if (weed_plant_has_leaf(layer,"host_pixel_data_contiguous") && 
+  if (weed_plant_has_leaf(layer,"host_pixel_data_contiguous") &&
       weed_get_boolean_value(layer,"host_pixel_data_contiguous",&error)==WEED_TRUE)
     contig=TRUE;
 
@@ -8400,8 +8340,8 @@
       create_empty_pixel_data(layer,FALSE,TRUE);
       gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
       convert_bgr_to_yuv420_frame(gusrc,width,height,irowstride,gudest_array,TRUE,
-				  FALSE,WEED_YUV_SAMPLING_DEFAULT,oclamping);
-      weed_free(gudest_array);
+                                  FALSE,WEED_YUV_SAMPLING_DEFAULT,oclamping);
+      lives_free(gudest_array);
       weed_set_int_value(layer,"YUV_sampling",WEED_YUV_SAMPLING_DEFAULT);
       break;
     case WEED_PALETTE_YVU420P:
@@ -8410,7 +8350,7 @@
       create_empty_pixel_data(layer,FALSE,TRUE);
       gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
       convert_bgr_to_yuv420_frame(gusrc,width,height,irowstride,gudest_array,FALSE,FALSE,osamtype,oclamping);
-      weed_free(gudest_array);
+      lives_free(gudest_array);
       weed_set_int_value(layer,"YUV_sampling",WEED_YUV_SAMPLING_DEFAULT);
       //weed_set_int_value(layer,"YUV_sampling",osamtype);
       break;
@@ -8419,14 +8359,14 @@
       create_empty_pixel_data(layer,FALSE,TRUE);
       gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
       convert_bgr_to_yuvp_frame(gusrc,width,height,irowstride,gudest_array,FALSE,FALSE,oclamping,-USE_THREADS);
-      weed_free(gudest_array);
+      lives_free(gudest_array);
       break;
     case WEED_PALETTE_YUVA4444P:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
       gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
       convert_bgr_to_yuvp_frame(gusrc,width,height,irowstride,gudest_array,FALSE,TRUE,oclamping,-USE_THREADS);
-      weed_free(gudest_array);
+      lives_free(gudest_array);
       break;
     case WEED_PALETTE_YUV411:
       weed_set_int_value(layer,"current_palette",outpl);
@@ -8436,8 +8376,8 @@
       convert_bgr_to_yuv411_frame(gusrc,width,height,irowstride,(yuv411_macropixel *)gudest,FALSE,oclamping);
       break;
     default:
-      g_printerr("Invalid palette conversion: %s to %s not written yet !!\n",weed_palette_get_name(inpl),
-		 weed_palette_get_name(outpl));
+      lives_printerr("Invalid palette conversion: %s to %s not written yet !!\n",weed_palette_get_name(inpl),
+                     weed_palette_get_name(outpl));
       return FALSE;
     }
     break;
@@ -8504,7 +8444,7 @@
       create_empty_pixel_data(layer,FALSE,TRUE);
       gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
       convert_rgb_to_yuv420_frame(gusrc,width,height,irowstride,gudest_array,TRUE,TRUE,WEED_YUV_SAMPLING_DEFAULT,oclamping);
-      weed_free(gudest_array);
+      lives_free(gudest_array);
       weed_set_int_value(layer,"YUV_sampling",WEED_YUV_SAMPLING_DEFAULT);
       break;
     case WEED_PALETTE_YUV420P:
@@ -8513,7 +8453,7 @@
       create_empty_pixel_data(layer,FALSE,TRUE);
       gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
       convert_rgb_to_yuv420_frame(gusrc,width,height,irowstride,gudest_array,FALSE,TRUE,osamtype,oclamping);
-      weed_free(gudest_array);
+      lives_free(gudest_array);
       weed_set_int_value(layer,"YUV_sampling",WEED_YUV_SAMPLING_DEFAULT);
       //weed_set_int_value(layer,"YUV_sampling",osamtype);
       break;
@@ -8522,14 +8462,14 @@
       create_empty_pixel_data(layer,FALSE,TRUE);
       gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
       convert_rgb_to_yuvp_frame(gusrc,width,height,irowstride,gudest_array,TRUE,FALSE,oclamping,-USE_THREADS);
-      weed_free(gudest_array);
+      lives_free(gudest_array);
       break;
     case WEED_PALETTE_YUVA4444P:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
       gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
       convert_rgb_to_yuvp_frame(gusrc,width,height,irowstride,gudest_array,TRUE,TRUE,oclamping,-USE_THREADS);
-      weed_free(gudest_array);
+      lives_free(gudest_array);
       break;
     case WEED_PALETTE_YUV411:
       weed_set_int_value(layer,"current_palette",outpl);
@@ -8539,8 +8479,8 @@
       convert_rgb_to_yuv411_frame(gusrc,width,height,irowstride,(yuv411_macropixel *)gudest,TRUE,oclamping);
       break;
     default:
-      g_printerr("Invalid palette conversion: %s to %s not written yet !!\n",weed_palette_get_name(inpl),
-		 weed_palette_get_name(outpl));
+      lives_printerr("Invalid palette conversion: %s to %s not written yet !!\n",weed_palette_get_name(inpl),
+                     weed_palette_get_name(outpl));
       return FALSE;
     }
     break;
@@ -8607,7 +8547,7 @@
       create_empty_pixel_data(layer,FALSE,TRUE);
       gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
       convert_rgb_to_yuv420_frame(gusrc,width,height,irowstride,gudest_array,TRUE,FALSE,osamtype,oclamping);
-      weed_free(gudest_array);
+      lives_free(gudest_array);
       break;
     case WEED_PALETTE_YUV420P:
     case WEED_PALETTE_YVU420P:
@@ -8615,8 +8555,8 @@
       create_empty_pixel_data(layer,FALSE,TRUE);
       gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
       convert_rgb_to_yuv420_frame(gusrc,width,height,irowstride,gudest_array,FALSE,
-				  FALSE,WEED_YUV_SAMPLING_DEFAULT,oclamping);
-      weed_free(gudest_array);
+                                  FALSE,WEED_YUV_SAMPLING_DEFAULT,oclamping);
+      lives_free(gudest_array);
       weed_set_int_value(layer,"YUV_sampling",WEED_YUV_SAMPLING_DEFAULT);
       //weed_set_int_value(layer,"YUV_sampling",osamtype);
       break;
@@ -8625,14 +8565,14 @@
       create_empty_pixel_data(layer,FALSE,TRUE);
       gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
       convert_rgb_to_yuvp_frame(gusrc,width,height,irowstride,gudest_array,FALSE,FALSE,oclamping,-USE_THREADS);
-      weed_free(gudest_array);
+      lives_free(gudest_array);
       break;
     case WEED_PALETTE_YUVA4444P:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
       gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
       convert_rgb_to_yuvp_frame(gusrc,width,height,irowstride,gudest_array,FALSE,TRUE,oclamping,-USE_THREADS);
-      weed_free(gudest_array);
+      lives_free(gudest_array);
       break;
     case WEED_PALETTE_YUV411:
       weed_set_int_value(layer,"current_palette",outpl);
@@ -8642,8 +8582,8 @@
       convert_rgb_to_yuv411_frame(gusrc,width,height,irowstride,(yuv411_macropixel *)gudest,FALSE,oclamping);
       break;
     default:
-      g_printerr("Invalid palette conversion: %s to %s not written yet !!\n",weed_palette_get_name(inpl),
-		 weed_palette_get_name(outpl));
+      lives_printerr("Invalid palette conversion: %s to %s not written yet !!\n",weed_palette_get_name(inpl),
+                     weed_palette_get_name(outpl));
       return FALSE;
     }
     break;
@@ -8710,8 +8650,8 @@
       create_empty_pixel_data(layer,FALSE,TRUE);
       gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
       convert_bgr_to_yuv420_frame(gusrc,width,height,irowstride,gudest_array,TRUE,TRUE,
-				  WEED_YUV_SAMPLING_DEFAULT,oclamping);
-      weed_free(gudest_array);
+                                  WEED_YUV_SAMPLING_DEFAULT,oclamping);
+      lives_free(gudest_array);
       weed_set_int_value(layer,"YUV_sampling",WEED_YUV_SAMPLING_DEFAULT);
       break;
     case WEED_PALETTE_YVU420P:
@@ -8720,7 +8660,7 @@
       create_empty_pixel_data(layer,FALSE,TRUE);
       gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
       convert_bgr_to_yuv420_frame(gusrc,width,height,irowstride,gudest_array,FALSE,TRUE,osamtype,oclamping);
-      weed_free(gudest_array);
+      lives_free(gudest_array);
       weed_set_int_value(layer,"YUV_sampling",WEED_YUV_SAMPLING_DEFAULT);
       //weed_set_int_value(layer,"YUV_sampling",osamtype);
       break;
@@ -8729,14 +8669,14 @@
       create_empty_pixel_data(layer,FALSE,TRUE);
       gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
       convert_bgr_to_yuvp_frame(gusrc,width,height,irowstride,gudest_array,TRUE,FALSE,oclamping,-USE_THREADS);
-      weed_free(gudest_array);
+      lives_free(gudest_array);
       break;
     case WEED_PALETTE_YUVA4444P:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
       gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
       convert_bgr_to_yuvp_frame(gusrc,width,height,irowstride,gudest_array,TRUE,TRUE,oclamping,-USE_THREADS);
-      weed_free(gudest_array);
+      lives_free(gudest_array);
       break;
     case WEED_PALETTE_YUV411:
       weed_set_int_value(layer,"current_palette",outpl);
@@ -8746,8 +8686,8 @@
       convert_bgr_to_yuv411_frame(gusrc,width,height,irowstride,(yuv411_macropixel *)gudest,TRUE,oclamping);
       break;
     default:
-      g_printerr("Invalid palette conversion: %s to %s not written yet !!\n",weed_palette_get_name(inpl),
-		 weed_palette_get_name(outpl));
+      lives_printerr("Invalid palette conversion: %s to %s not written yet !!\n",weed_palette_get_name(inpl),
+                     weed_palette_get_name(outpl));
       return FALSE;
     }
     break;
@@ -8814,21 +8754,21 @@
       create_empty_pixel_data(layer,FALSE,TRUE);
       gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
       convert_argb_to_yuvp_frame(gusrc,width,height,irowstride,gudest_array,FALSE,oclamping,-USE_THREADS);
-      weed_free(gudest_array);
+      lives_free(gudest_array);
       break;
     case WEED_PALETTE_YUVA4444P:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
       gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
       convert_argb_to_yuvp_frame(gusrc,width,height,irowstride,gudest_array,TRUE,oclamping,-USE_THREADS);
-      weed_free(gudest_array);
+      lives_free(gudest_array);
       break;
     case WEED_PALETTE_YUV422P:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
       gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
       convert_argb_to_yuv420_frame(gusrc,width,height,irowstride,gudest_array,TRUE,WEED_YUV_SAMPLING_DEFAULT,oclamping);
-      weed_free(gudest_array);
+      lives_free(gudest_array);
       weed_set_int_value(layer,"YUV_sampling",WEED_YUV_SAMPLING_DEFAULT);
       break;
     case WEED_PALETTE_YUV420P:
@@ -8837,7 +8777,7 @@
       create_empty_pixel_data(layer,FALSE,TRUE);
       gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
       convert_argb_to_yuv420_frame(gusrc,width,height,irowstride,gudest_array,FALSE,osamtype,oclamping);
-      weed_free(gudest_array);
+      lives_free(gudest_array);
       weed_set_int_value(layer,"YUV_sampling",WEED_YUV_SAMPLING_DEFAULT);
       //weed_set_int_value(layer,"YUV_sampling",osamtype);
       break;
@@ -8849,8 +8789,8 @@
       convert_argb_to_yuv411_frame(gusrc,width,height,irowstride,(yuv411_macropixel *)gudest,oclamping);
       break;
     default:
-      g_printerr("Invalid palette conversion: %s to %s not written yet !!\n",weed_palette_get_name(inpl),
-		 weed_palette_get_name(outpl));
+      lives_printerr("Invalid palette conversion: %s to %s not written yet !!\n",weed_palette_get_name(inpl),
+                     weed_palette_get_name(outpl));
       return FALSE;
     }
     break;
@@ -8861,12 +8801,12 @@
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
       gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
-      g_free(gudest_array[0]);
+      lives_free(gudest_array[0]);
       gudest_array[0]=gusrc_array[0];
       weed_set_voidptr_array(layer,"pixel_data",3,(void **)gudest_array);
       convert_halve_chroma(gusrc_array,width,height,gudest_array,iclamped);
       gusrc_array[0]=NULL;
-      weed_free(gudest_array);
+      lives_free(gudest_array);
       break;
     case WEED_PALETTE_RGB24:
       weed_set_int_value(layer,"current_palette",outpl);
@@ -8934,7 +8874,7 @@
       create_empty_pixel_data(layer,FALSE,TRUE);
       gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
       convert_yuvp_to_yuvap_frame(gusrc_array,width,height,gudest_array);
-      weed_free(gudest_array);
+      lives_free(gudest_array);
       break;
     case WEED_PALETTE_YUV420P:
     case WEED_PALETTE_YVU420P:
@@ -8942,7 +8882,7 @@
       create_empty_pixel_data(layer,FALSE,TRUE);
       gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
       convert_yuvp_to_yuv420_frame(gusrc_array,width,height,gudest_array,iclamped);
-      weed_free(gudest_array);
+      lives_free(gudest_array);
       weed_set_int_value(layer,"YUV_sampling",WEED_YUV_SAMPLING_DEFAULT);
       //weed_set_int_value(layer,"YUV_sampling",osamtype);
       break;
@@ -8954,18 +8894,18 @@
       convert_yuvp_to_yuv411_frame(gusrc_array,width,height,(yuv411_macropixel *)gudest,iclamped);
       break;
     default:
-      g_printerr("Invalid palette conversion: %s to %s not written yet !!\n",weed_palette_get_name(inpl),
-		 weed_palette_get_name(outpl));
-      if (gusrc_array!=NULL) weed_free(gusrc_array);
+      lives_printerr("Invalid palette conversion: %s to %s not written yet !!\n",weed_palette_get_name(inpl),
+                     weed_palette_get_name(outpl));
+      if (gusrc_array!=NULL) lives_free(gusrc_array);
       return FALSE;
     }
     if (gusrc_array!=NULL) {
-      if (gusrc_array[0]!=NULL) g_free(gusrc_array[0]);
+      if (gusrc_array[0]!=NULL) lives_free(gusrc_array[0]);
       if (!contig) {
-	g_free(gusrc_array[1]);
-	g_free(gusrc_array[2]);
+        lives_free(gusrc_array[1]);
+        lives_free(gusrc_array[2]);
       }
-      weed_free(gusrc_array);
+      lives_free(gusrc_array);
     }
     break;
   case WEED_PALETTE_YUVA4444P:
@@ -8975,12 +8915,12 @@
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
       gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
-      g_free(gudest_array[0]);
+      lives_free(gudest_array[0]);
       gudest_array[0]=gusrc_array[0];
       weed_set_voidptr_array(layer,"pixel_data",3,(void **)gudest_array);
       convert_halve_chroma(gusrc_array,width,height,gudest_array,iclamped);
       gusrc_array[0]=NULL;
-      weed_free(gudest_array);
+      lives_free(gudest_array);
       break;
     case WEED_PALETTE_RGB24:
       weed_set_int_value(layer,"current_palette",outpl);
@@ -9048,7 +8988,7 @@
       create_empty_pixel_data(layer,FALSE,TRUE);
       gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
       convert_yuvap_to_yuvp_frame(gusrc_array,width,height,gudest_array);
-      weed_free(gudest_array);
+      lives_free(gudest_array);
       break;
     case WEED_PALETTE_YUV420P:
     case WEED_PALETTE_YVU420P:
@@ -9056,7 +8996,7 @@
       create_empty_pixel_data(layer,FALSE,TRUE);
       gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
       convert_yuvp_to_yuv420_frame(gusrc_array,width,height,gudest_array,iclamped);
-      weed_free(gudest_array);
+      lives_free(gudest_array);
       weed_set_int_value(layer,"YUV_sampling",WEED_YUV_SAMPLING_DEFAULT);
       //weed_set_int_value(layer,"YUV_sampling",osamtype);
       break;
@@ -9068,19 +9008,19 @@
       convert_yuvp_to_yuv411_frame(gusrc_array,width,height,(yuv411_macropixel *)gudest,iclamped);
       break;
     default:
-      g_printerr("Invalid palette conversion: %s to %s not written yet !!\n",weed_palette_get_name(inpl),
-		 weed_palette_get_name(outpl));
-      if (gusrc_array!=NULL) weed_free(gusrc_array);
+      lives_printerr("Invalid palette conversion: %s to %s not written yet !!\n",weed_palette_get_name(inpl),
+                     weed_palette_get_name(outpl));
+      if (gusrc_array!=NULL) lives_free(gusrc_array);
       return FALSE;
     }
     if (gusrc_array!=NULL) {
-      if (gusrc_array[0]!=NULL) g_free(gusrc_array[0]);
+      if (gusrc_array[0]!=NULL) lives_free(gusrc_array[0]);
       if (!contig) {
-	g_free(gusrc_array[1]);
-	g_free(gusrc_array[2]);
-	g_free(gusrc_array[3]);
+        lives_free(gusrc_array[1]);
+        lives_free(gusrc_array[2]);
+        lives_free(gusrc_array[3]);
       }
-      weed_free(gusrc_array);
+      lives_free(gusrc_array);
     }
     break;
   case WEED_PALETTE_UYVY8888:
@@ -9098,7 +9038,7 @@
       create_empty_pixel_data(layer,FALSE,TRUE);
       gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
       convert_uyvy_to_yuv422_frame((uyvy_macropixel *)gusrc,width,height,gudest_array);
-      weed_free(gudest_array);
+      lives_free(gudest_array);
       break;
     case WEED_PALETTE_RGB24:
       weed_set_int_value(layer,"current_palette",outpl);
@@ -9146,7 +9086,7 @@
       create_empty_pixel_data(layer,FALSE,TRUE);
       gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
       convert_uyvy_to_yuvp_frame((uyvy_macropixel *)gusrc,width,height,gudest_array,FALSE);
-      weed_free(gudest_array);
+      lives_free(gudest_array);
       break;
     case WEED_PALETTE_YUVA4444P:
       weed_set_int_value(layer,"current_palette",outpl);
@@ -9154,7 +9094,7 @@
       create_empty_pixel_data(layer,FALSE,TRUE);
       gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
       convert_uyvy_to_yuvp_frame((uyvy_macropixel *)gusrc,width,height,gudest_array,TRUE);
-      weed_free(gudest_array);
+      lives_free(gudest_array);
       break;
     case WEED_PALETTE_YUV888:
       weed_set_int_value(layer,"current_palette",outpl);
@@ -9177,7 +9117,7 @@
       create_empty_pixel_data(layer,FALSE,TRUE);
       gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
       convert_uyvy_to_yuv420_frame((uyvy_macropixel *)gusrc,width,height,gudest_array,iclamped);
-      weed_free(gudest_array);
+      lives_free(gudest_array);
       weed_set_int_value(layer,"YUV_sampling",WEED_YUV_SAMPLING_DEFAULT);
       //weed_set_int_value(layer,"YUV_sampling",osamtype);
       break;
@@ -9189,8 +9129,8 @@
       convert_uyvy_to_yuv411_frame((uyvy_macropixel *)gusrc,width,height,(yuv411_macropixel *)gudest,iclamped);
       break;
     default:
-      g_printerr("Invalid palette conversion: %s to %s not written yet !!\n",weed_palette_get_name(inpl),
-		 weed_palette_get_name(outpl));
+      lives_printerr("Invalid palette conversion: %s to %s not written yet !!\n",weed_palette_get_name(inpl),
+                     weed_palette_get_name(outpl));
       return FALSE;
     }
     break;
@@ -9209,7 +9149,7 @@
       create_empty_pixel_data(layer,FALSE,TRUE);
       gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
       convert_yuyv_to_yuv422_frame((yuyv_macropixel *)gusrc,width,height,gudest_array);
-      weed_free(gudest_array);
+      lives_free(gudest_array);
       break;
     case WEED_PALETTE_RGB24:
       weed_set_int_value(layer,"current_palette",outpl);
@@ -9257,7 +9197,7 @@
       create_empty_pixel_data(layer,FALSE,TRUE);
       gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
       convert_yuyv_to_yuvp_frame((yuyv_macropixel *)gusrc,width,height,gudest_array,FALSE);
-      weed_free(gudest_array);
+      lives_free(gudest_array);
       break;
     case WEED_PALETTE_YUVA4444P:
       weed_set_int_value(layer,"current_palette",outpl);
@@ -9265,7 +9205,7 @@
       create_empty_pixel_data(layer,FALSE,TRUE);
       gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
       convert_yuyv_to_yuvp_frame((yuyv_macropixel *)gusrc,width,height,gudest_array,TRUE);
-      weed_free(gudest_array);
+      lives_free(gudest_array);
       break;
     case WEED_PALETTE_YUV888:
       weed_set_int_value(layer,"current_palette",outpl);
@@ -9288,7 +9228,7 @@
       create_empty_pixel_data(layer,FALSE,TRUE);
       gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
       convert_yuyv_to_yuv420_frame((yuyv_macropixel *)gusrc,width,height,gudest_array,iclamped);
-      weed_free(gudest_array);
+      lives_free(gudest_array);
       weed_set_int_value(layer,"YUV_sampling",WEED_YUV_SAMPLING_DEFAULT);
       //weed_set_int_value(layer,"YUV_sampling",osamtype);
       break;
@@ -9300,8 +9240,8 @@
       convert_yuyv_to_yuv411_frame((yuyv_macropixel *)gusrc,width,height,(yuv411_macropixel *)gudest,iclamped);
       break;
     default:
-      g_printerr("Invalid palette conversion: %s to %s not written yet !!\n",weed_palette_get_name(inpl),
-		 weed_palette_get_name(outpl));
+      lives_printerr("Invalid palette conversion: %s to %s not written yet !!\n",weed_palette_get_name(inpl),
+                     weed_palette_get_name(outpl));
       return FALSE;
     }
     break;
@@ -9321,14 +9261,14 @@
       create_empty_pixel_data(layer,FALSE,TRUE);
       gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
       convert_splitplanes_frame(gusrc,width,height,irowstride,gudest_array,FALSE,FALSE);
-      weed_free(gudest_array);
+      lives_free(gudest_array);
       break;
     case WEED_PALETTE_YUVA4444P:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
       gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
       convert_splitplanes_frame(gusrc,width,height,irowstride,gudest_array,FALSE,TRUE);
-      weed_free(gudest_array);
+      lives_free(gudest_array);
       break;
     case WEED_PALETTE_RGB24:
       weed_set_int_value(layer,"current_palette",outpl);
@@ -9372,7 +9312,7 @@
       create_empty_pixel_data(layer,FALSE,TRUE);
       gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
       convert_yuv888_to_yuv420_frame(gusrc,width,height,irowstride,gudest_array,FALSE,iclamped);
-      weed_free(gudest_array);
+      lives_free(gudest_array);
       weed_set_int_value(layer,"YUV_sampling",WEED_YUV_SAMPLING_DEFAULT);
       //weed_set_int_value(layer,"YUV_sampling",osamtype);
       break;
@@ -9381,7 +9321,7 @@
       create_empty_pixel_data(layer,FALSE,TRUE);
       gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
       convert_yuv888_to_yuv422_frame(gusrc,width,height,irowstride,gudest_array,FALSE,iclamped);
-      weed_free(gudest_array);
+      lives_free(gudest_array);
       break;
     case WEED_PALETTE_UYVY8888:
       weed_set_int_value(layer,"current_palette",outpl);
@@ -9405,8 +9345,8 @@
       convert_yuv888_to_yuv411_frame(gusrc,width,height,irowstride,(yuv411_macropixel *)gudest,FALSE);
       break;
     default:
-      g_printerr("Invalid palette conversion: %s to %s not written yet !!\n",weed_palette_get_name(inpl),
-		 weed_palette_get_name(outpl));
+      lives_printerr("Invalid palette conversion: %s to %s not written yet !!\n",weed_palette_get_name(inpl),
+                     weed_palette_get_name(outpl));
       return FALSE;
     }
     break;
@@ -9425,14 +9365,14 @@
       create_empty_pixel_data(layer,FALSE,TRUE);
       gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
       convert_splitplanes_frame(gusrc,width,height,irowstride,gudest_array,TRUE,TRUE);
-      weed_free(gudest_array);
+      lives_free(gudest_array);
       break;
     case WEED_PALETTE_YUV444P:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,TRUE);
       gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
       convert_splitplanes_frame(gusrc,width,height,irowstride,gudest_array,TRUE,FALSE);
-      weed_free(gudest_array);
+      lives_free(gudest_array);
       break;
     case WEED_PALETTE_RGB24:
       weed_set_int_value(layer,"current_palette",outpl);
@@ -9475,7 +9415,7 @@
       create_empty_pixel_data(layer,FALSE,TRUE);
       gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
       convert_yuv888_to_yuv420_frame(gusrc,width,height,irowstride,gudest_array,TRUE,iclamped);
-      weed_free(gudest_array);
+      lives_free(gudest_array);
       weed_set_int_value(layer,"YUV_sampling",WEED_YUV_SAMPLING_DEFAULT);
       //weed_set_int_value(layer,"YUV_sampling",osamtype);
       break;
@@ -9484,7 +9424,7 @@
       create_empty_pixel_data(layer,FALSE,TRUE);
       gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
       convert_yuv888_to_yuv422_frame(gusrc,width,height,irowstride,gudest_array,TRUE,iclamped);
-      weed_free(gudest_array);
+      lives_free(gudest_array);
       break;
     case WEED_PALETTE_UYVY8888:
       weed_set_int_value(layer,"current_palette",outpl);
@@ -9508,8 +9448,8 @@
       convert_yuv888_to_yuv411_frame(gusrc,width,height,irowstride,(yuv411_macropixel *)gudest,TRUE);
       break;
     default:
-      g_printerr("Invalid palette conversion: %s to %s not written yet !!\n",weed_palette_get_name(inpl),
-		 weed_palette_get_name(outpl));
+      lives_printerr("Invalid palette conversion: %s to %s not written yet !!\n",weed_palette_get_name(inpl),
+                     weed_palette_get_name(outpl));
       return FALSE;
     }
     break;
@@ -9520,7 +9460,7 @@
     gusrc_array[1]=gusrc_array[2];
     gusrc_array[2]=tmp;
     weed_set_voidptr_array(layer,"pixel_data",3,(void **)gusrc_array);
-    weed_free(gusrc_array);
+    lives_free(gusrc_array);
   case WEED_PALETTE_YUV420P:
     gusrc_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
     switch (outpl) {
@@ -9577,42 +9517,42 @@
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,FALSE);
       gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
-      g_free(gudest_array[0]);
+      lives_free(gudest_array[0]);
       gudest_array[0]=gusrc_array[0];
       weed_set_voidptr_array(layer,"pixel_data",3,(void **)gudest_array);
       convert_double_chroma(gusrc_array,width>>1,height>>1,gudest_array,iclamped);
       gusrc_array[0]=NULL;
-      weed_free(gudest_array);
+      lives_free(gudest_array);
       break;
     case WEED_PALETTE_YUV444P:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,FALSE);
       gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
-      g_free(gudest_array[0]);
+      lives_free(gudest_array[0]);
       gudest_array[0]=gusrc_array[0];
       weed_set_voidptr_array(layer,"pixel_data",3,(void **)gudest_array);
       convert_quad_chroma(gusrc_array,width,height,gudest_array,FALSE,iclamped);
       gusrc_array[0]=NULL;
-      g_free(gudest_array);
+      lives_free(gudest_array);
       break;
     case WEED_PALETTE_YUVA4444P:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,FALSE);
       gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
-      g_free(gudest_array[0]);
+      lives_free(gudest_array[0]);
       gudest_array[0]=gusrc_array[0];
       weed_set_voidptr_array(layer,"pixel_data",4,(void **)gudest_array);
       convert_quad_chroma(gusrc_array,width,height,gudest_array,TRUE,iclamped);
       gusrc_array[0]=NULL;
-      weed_free(gudest_array);
+      lives_free(gudest_array);
       break;
     case WEED_PALETTE_YVU420P:
       if (inpl==WEED_PALETTE_YUV420P) {
-	tmp=gusrc_array[1];
-	gusrc_array[1]=gusrc_array[2];
-	gusrc_array[2]=tmp;
-	weed_set_voidptr_array(layer,"pixel_data",3,(void **)gusrc_array);
-	weed_free(gusrc_array);
+        tmp=gusrc_array[1];
+        gusrc_array[1]=gusrc_array[2];
+        gusrc_array[2]=tmp;
+        weed_set_voidptr_array(layer,"pixel_data",3,(void **)gusrc_array);
+        lives_free(gusrc_array);
       }
       // fall through
     case WEED_PALETTE_YUV420P:
@@ -9639,18 +9579,18 @@
       convert_yuv420_to_yuv411_frame(gusrc_array,width,height,(yuv411_macropixel *)gudest,FALSE,iclamped);
       break;
     default:
-      g_printerr("Invalid palette conversion: %s to %s not written yet !!\n",weed_palette_get_name(inpl),
-		 weed_palette_get_name(outpl));
-      if (gusrc_array!=NULL) weed_free(gusrc_array);
+      lives_printerr("Invalid palette conversion: %s to %s not written yet !!\n",weed_palette_get_name(inpl),
+                     weed_palette_get_name(outpl));
+      if (gusrc_array!=NULL) lives_free(gusrc_array);
       return FALSE;
     }
     if (gusrc_array!=NULL) {
-      if (gusrc_array[0]!=NULL) g_free(gusrc_array[0]);
+      if (gusrc_array[0]!=NULL) lives_free(gusrc_array[0]);
       if (!contig) {
-	g_free(gusrc_array[1]);
-	g_free(gusrc_array[2]);
+        lives_free(gusrc_array[1]);
+        lives_free(gusrc_array[2]);
       }
-      weed_free(gusrc_array);
+      lives_free(gusrc_array);
 
     }
     break;
@@ -9711,11 +9651,11 @@
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,FALSE);
       gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
-      g_free(gudest_array[0]);
+      lives_free(gudest_array[0]);
       gudest_array[0]=gusrc_array[0];
       weed_set_voidptr_array(layer,"pixel_data",3,(void **)gudest_array);
       convert_halve_chroma(gusrc_array,width>>1,height>>1,gudest_array,iclamped);
-      weed_free(gudest_array);
+      lives_free(gudest_array);
       gusrc_array[0]=NULL;
       weed_set_int_value(layer,"YUV_sampling",isamtype);
       break;
@@ -9723,24 +9663,24 @@
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,FALSE);
       gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
-      g_free(gudest_array[0]);
+      lives_free(gudest_array[0]);
       gudest_array[0]=gusrc_array[0];
       weed_set_voidptr_array(layer,"pixel_data",3,(void **)gudest_array);
       convert_double_chroma(gusrc_array,width>>1,height>>1,gudest_array,iclamped);
       gusrc_array[0]=NULL;
-      weed_free(gudest_array);
+      lives_free(gudest_array);
       break;
     case WEED_PALETTE_YUVA4444P:
       weed_set_int_value(layer,"current_palette",outpl);
       create_empty_pixel_data(layer,FALSE,FALSE);
       gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
-      g_free(gudest_array[0]);
+      lives_free(gudest_array[0]);
       gudest_array[0]=gusrc_array[0];
       weed_set_voidptr_array(layer,"pixel_data",4,(void **)gudest_array);
       convert_double_chroma(gusrc_array,width>>1,height>>1,gudest_array,iclamped);
       memset(gudest_array[3],255,width*height);
       gusrc_array[0]=NULL;
-      weed_free(gudest_array);
+      lives_free(gudest_array);
       break;
     case WEED_PALETTE_YUV888:
       weed_set_int_value(layer,"current_palette",outpl);
@@ -9762,18 +9702,18 @@
       convert_yuv420_to_yuv411_frame(gusrc_array,width,height,(yuv411_macropixel *)gudest,TRUE,iclamped);
       break;
     default:
-      g_printerr("Invalid palette conversion: %s to %s not written yet !!\n",weed_palette_get_name(inpl),
-		 weed_palette_get_name(outpl));
-      if (gusrc_array!=NULL) weed_free(gusrc_array);
+      lives_printerr("Invalid palette conversion: %s to %s not written yet !!\n",weed_palette_get_name(inpl),
+                     weed_palette_get_name(outpl));
+      if (gusrc_array!=NULL) lives_free(gusrc_array);
       return FALSE;
     }
     if (gusrc_array!=NULL) {
-      if (gusrc_array[0]!=NULL) g_free(gusrc_array[0]);
+      if (gusrc_array[0]!=NULL) lives_free(gusrc_array[0]);
       if (!contig) {
-	g_free(gusrc_array[1]);
-	g_free(gusrc_array[2]);
+        lives_free(gusrc_array[1]);
+        lives_free(gusrc_array[2]);
       }
-      weed_free(gusrc_array);
+      lives_free(gusrc_array);
     }
     break;
   case WEED_PALETTE_YUV411:
@@ -9839,7 +9779,7 @@
       create_empty_pixel_data(layer,FALSE,TRUE);
       gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
       convert_yuv411_to_yuvp_frame((yuv411_macropixel *)gusrc,width,height,gudest_array,FALSE,iclamped);
-      weed_free(gudest_array);
+      lives_free(gudest_array);
       break;
     case WEED_PALETTE_YUVA4444P:
       weed_set_int_value(layer,"current_palette",outpl);
@@ -9847,7 +9787,7 @@
       create_empty_pixel_data(layer,FALSE,TRUE);
       gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
       convert_yuv411_to_yuvp_frame((yuv411_macropixel *)gusrc,width,height,gudest_array,TRUE,iclamped);
-      weed_free(gudest_array);
+      lives_free(gudest_array);
       break;
     case WEED_PALETTE_UYVY8888:
       weed_set_int_value(layer,"current_palette",outpl);
@@ -9869,7 +9809,7 @@
       create_empty_pixel_data(layer,FALSE,TRUE);
       gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
       convert_yuv411_to_yuv422_frame((yuv411_macropixel *)gusrc,width,height,gudest_array,iclamped);
-      weed_free(gudest_array);
+      lives_free(gudest_array);
       break;
     case WEED_PALETTE_YUV420P:
       weed_set_int_value(layer,"current_palette",outpl);
@@ -9877,7 +9817,7 @@
       create_empty_pixel_data(layer,FALSE,TRUE);
       gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
       convert_yuv411_to_yuv420_frame((yuv411_macropixel *)gusrc,width,height,gudest_array,FALSE,iclamped);
-      weed_free(gudest_array);
+      lives_free(gudest_array);
       break;
     case WEED_PALETTE_YVU420P:
       weed_set_int_value(layer,"current_palette",outpl);
@@ -9885,28 +9825,27 @@
       create_empty_pixel_data(layer,FALSE,TRUE);
       gudest_array=(uint8_t **)weed_get_voidptr_array(layer,"pixel_data",&error);
       convert_yuv411_to_yuv420_frame((yuv411_macropixel *)gusrc,width,height,gudest_array,TRUE,iclamped);
-      weed_free(gudest_array);
+      lives_free(gudest_array);
       break;
     default:
-      g_printerr("Invalid palette conversion: %s to %s not written yet !!\n",weed_palette_get_name(inpl),
-		 weed_palette_get_name(outpl));
+      lives_printerr("Invalid palette conversion: %s to %s not written yet !!\n",weed_palette_get_name(inpl),
+                     weed_palette_get_name(outpl));
       return FALSE;
     }
     break;
   default:
-    g_printerr("Invalid palette conversion: %s to %s not written yet !!\n",weed_palette_get_name(inpl),
-	       weed_palette_get_name(outpl));
+    lives_printerr("Invalid palette conversion: %s to %s not written yet !!\n",weed_palette_get_name(inpl),
+                   weed_palette_get_name(outpl));
     return FALSE;
   }
-  if (gusrc!=NULL) g_free(gusrc);
+  if (gusrc!=NULL) lives_free(gusrc);
 
 
   if (weed_palette_is_rgb_palette(outpl)) {
     weed_leaf_delete(layer,"YUV_clamping");
     weed_leaf_delete(layer,"YUV_subspace");
     weed_leaf_delete(layer,"YUV_sampling");
-  }
-  else {
+  } else {
     weed_set_int_value(layer,"YUV_clamping",oclamping?WEED_YUV_CLAMPING_CLAMPED:WEED_YUV_CLAMPING_UNCLAMPED);
     if (weed_palette_is_rgb_palette(inpl)) {
       // TODO - bt709
@@ -9927,15 +9866,15 @@
     pd_array[1]=pd_array[2];
     pd_array[2]=tmp;
     weed_set_voidptr_array(layer,"pixel_data",3,(void **)pd_array);
-    weed_free(pd_array);
+    lives_free(pd_array);
   }
   return TRUE;
 }
 
 
-boolean convert_layer_palette (weed_plant_t *layer, int outpl, int op_clamping) {
+boolean convert_layer_palette(weed_plant_t *layer, int outpl, int op_clamping) {
   return convert_layer_palette_full(layer,outpl,WEED_YUV_SAMPLING_DEFAULT,
-				    op_clamping==WEED_YUV_CLAMPING_CLAMPED,WEED_YUV_SUBSPACE_YCBCR);
+                                    op_clamping==WEED_YUV_CLAMPING_CLAMPED,WEED_YUV_SUBSPACE_YCBCR);
 }
 
 /////////////////////////////////////////////////////////////////////////////////////
@@ -9950,24 +9889,24 @@
   switch (palette) {
   case WEED_PALETTE_RGB24:
   case WEED_PALETTE_BGR24:
-    pixbuf=lives_pixbuf_new (FALSE, width, height);
+    pixbuf=lives_pixbuf_new(FALSE, width, height);
     rowstride=lives_pixbuf_get_rowstride(pixbuf);
-    pixels=lives_pixbuf_get_pixels (pixbuf);
+    pixels=lives_pixbuf_get_pixels(pixbuf);
     size=rowstride*(height-1)+get_last_rowstride_value(width,3);
     memset(pixels,0,size);
     break;
   case WEED_PALETTE_RGBA32:
   case WEED_PALETTE_BGRA32:
-    pixbuf=lives_pixbuf_new (TRUE, width, height);
+    pixbuf=lives_pixbuf_new(TRUE, width, height);
     rowstride=lives_pixbuf_get_rowstride(pixbuf);
-    pixels=lives_pixbuf_get_pixels (pixbuf);
+    pixels=lives_pixbuf_get_pixels(pixbuf);
     size=rowstride*(height-1)+get_last_rowstride_value(width,4);
     memset(pixels,0,size);
     break;
   case WEED_PALETTE_ARGB32:
-    pixbuf=lives_pixbuf_new (TRUE, width, height);
+    pixbuf=lives_pixbuf_new(TRUE, width, height);
     rowstride=lives_pixbuf_get_rowstride(pixbuf);
-    pixels=lives_pixbuf_get_pixels (pixbuf);
+    pixels=lives_pixbuf_get_pixels(pixbuf);
     size=rowstride*(height-1)+get_last_rowstride_value(width,4);
     memset(pixels,0,size);
     break;
@@ -9979,20 +9918,20 @@
 
 
 
-static LIVES_INLINE LiVESPixbuf *lives_pixbuf_cheat(boolean has_alpha, 
-						    int width, int height, uint8_t *buf) {
+static LIVES_INLINE LiVESPixbuf *lives_pixbuf_cheat(boolean has_alpha,
+    int width, int height, uint8_t *buf) {
   // we can cheat if our buffer is correctly sized
   LiVESPixbuf *pixbuf;
   int channels=has_alpha?4:3;
   int rowstride=get_rowstride_value(width*channels);
-  pixbuf=lives_pixbuf_new_from_data (buf, has_alpha, width, height, rowstride, 
-				     lives_free_buffer, NULL);
+  pixbuf=lives_pixbuf_new_from_data(buf, has_alpha, width, height, rowstride,
+                                    (LiVESPixbufDestroyNotify)lives_free_buffer, NULL);
   threaded_dialog_spin();
   return pixbuf;
 }
 
 
-LiVESPixbuf *layer_to_pixbuf (weed_plant_t *layer) {
+LiVESPixbuf *layer_to_pixbuf(weed_plant_t *layer) {
   // create a weed layer from a pixbuf
   // layer "pixel_data" is then either shared with with the pixbuf pixels, or set to NULL
 
@@ -10021,11 +9960,13 @@
     case WEED_PALETTE_RGB24:
     case WEED_PALETTE_BGR24:
     case WEED_PALETTE_YUV888:
+#ifndef GUI_QT
       if (irowstride==get_rowstride_value(width*3)) {
-	pixbuf=lives_pixbuf_cheat(FALSE, width, height, pixel_data);
-	cheat=TRUE;
-      }
-      else pixbuf=lives_pixbuf_new (FALSE, width, height);
+        pixbuf=lives_pixbuf_cheat(FALSE, width, height, pixel_data);
+        cheat=TRUE;
+      } else
+#endif
+        pixbuf=lives_pixbuf_new(FALSE, width, height);
       n_channels=3;
       break;
     case WEED_PALETTE_RGBA32:
@@ -10038,21 +9979,22 @@
 #endif
 #endif
     case WEED_PALETTE_YUVA8888:
+#ifndef GUI_QT
       if (irowstride==get_rowstride_value(width*4)) {
-	pixbuf=lives_pixbuf_cheat(TRUE, width, height, pixel_data);
-	cheat=TRUE;
-      }
-      else pixbuf=lives_pixbuf_new (TRUE, width, height);
+        pixbuf=lives_pixbuf_cheat(TRUE, width, height, pixel_data);
+        cheat=TRUE;
+      } else
+#endif
+        pixbuf=lives_pixbuf_new(TRUE, width, height);
       n_channels=4;
       break;
     default:
       if (weed_palette_has_alpha_channel(palette)) {
-	if (!convert_layer_palette(layer,WEED_PALETTE_RGBA32,0)) return NULL;
-	palette=WEED_PALETTE_RGBA32;
-      }
-      else {
-	if (!convert_layer_palette(layer,WEED_PALETTE_RGB24,0)) return NULL;
-	palette=WEED_PALETTE_RGB24;
+        if (!convert_layer_palette(layer,WEED_PALETTE_RGBA32,0)) return NULL;
+        palette=WEED_PALETTE_RGBA32;
+      } else {
+        if (!convert_layer_palette(layer,WEED_PALETTE_RGB24,0)) return NULL;
+        palette=WEED_PALETTE_RGB24;
       }
       done=FALSE;
     }
@@ -10060,25 +10002,30 @@
 
   if (!cheat) {
     boolean done=FALSE;
-    pixels=lives_pixbuf_get_pixels (pixbuf);
+    pixels=lives_pixbuf_get_pixels(pixbuf);
     orowstride=lives_pixbuf_get_rowstride(pixbuf);
 
     if (irowstride>orowstride) rowstride=orowstride;
     else rowstride=irowstride;
     end=pixels+orowstride*height;
 
-    for (;pixels<end&&!done;pixels+=orowstride) {
+    for (; pixels<end&&!done; pixels+=orowstride) {
       if (pixels+orowstride>=end) {
-	orowstride=rowstride=get_last_rowstride_value(width,n_channels);
-	done=TRUE;
+        orowstride=rowstride=get_last_rowstride_value(width,n_channels);
+        done=TRUE;
       }
       lives_memcpy(pixels,pixel_data,rowstride);
-      if (rowstride<orowstride) memset (pixels+rowstride,0,orowstride-rowstride);
+      if (rowstride<orowstride) memset(pixels+rowstride,0,orowstride-rowstride);
       pixel_data+=irowstride;
     }
-    g_free(orig_pixel_data);
+    if (!weed_plant_has_leaf(layer,"host_orig_pdata") || weed_get_boolean_value(layer,"host_orig_pdata",&error)==WEED_FALSE) {
+      // host_orig_pdata is set if this is an alpha channel we "stole" from another layer
+      lives_free(orig_pixel_data);
+    }
     pixel_data=NULL;
-    weed_set_voidptr_value(layer,"pixel_data",pixel_data);
+
+    // indicates that the pixel data was copied, not shared
+    weed_set_voidptr_value(layer,"pixel_data",NULL);
   }
 
 #ifdef TEST_GAMMA
@@ -10094,13 +10041,13 @@
   end=pixels+height*orowstride;
   done=FALSE;
 
-  for (;pixels<end&&!done;pixels+=orowstride) {
+  for (; pixels<end&&!done; pixels+=orowstride) {
     if (pixels+orowstride>=end) {
       orowstride=get_last_rowstride_value(width,n_channels);
       done=TRUE;
     }
-    for (j=0;j<width*3;j+=3) {
-      for (k=0;k<3;k++) pixels[j+k]=gamma_lut[pixels[j+k]];
+    for (j=0; j<width*3; j+=3) {
+      for (k=0; k<3; k++) pixels[j+k]=gamma_lut[pixels[j+k]];
     }
   }
 #endif
@@ -10142,8 +10089,8 @@
 #endif
 
   register int i,j;
-  for (i=0;i<height;i++) {
-    for (j=offs;j<row;j+=4) {
+  for (i=0; i<height; i++) {
+    for (j=offs; j<row; j+=4) {
       pdata[j]=255;
     }
     pdata+=row;
@@ -10173,7 +10120,7 @@
 
   pixel_data=weed_get_voidptr_array(layer,"pixel_data",&error);
 
-  for (i=0;i<nplanes;i++) {
+  for (i=0; i<nplanes; i++) {
     cxrow=crow*weed_palette_get_plane_ratio_horizontal(pal,i);
     xheight=height*weed_palette_get_plane_ratio_vertical(pal,i);
     framesize+=CEIL(cxrow*xheight,32);
@@ -10184,27 +10131,27 @@
   }
 
   if (!needs_change) {
-    weed_free(pixel_data);
-    weed_free(rowstrides);
+    lives_free(pixel_data);
+    lives_free(rowstrides);
     return;
   }
 
-  npixel_data=g_try_malloc(framesize);
+  npixel_data=lives_try_malloc(framesize);
   if (npixel_data==NULL) {
-    weed_free(pixel_data);
-    weed_free(rowstrides);
+    lives_free(pixel_data);
+    lives_free(rowstrides);
     return;
   }
 
-  new_pixel_data=(void **)g_malloc(nplanes*sizeof(void *));
+  new_pixel_data=(void **)lives_malloc(nplanes*sizeof(void *));
 
-  for (i=0;i<nplanes;i++) {
+  for (i=0; i<nplanes; i++) {
     cxrow=crow*weed_palette_get_plane_ratio_horizontal(pal,i);
     xheight=height*weed_palette_get_plane_ratio_vertical(pal,i);
 
     new_pixel_data[i]=npixel_data;
 
-    for (j=0;j<xheight;j++) {
+    for (j=0; j<xheight; j++) {
       lives_memcpy(new_pixel_data[i]+j*cxrow,pixel_data[i]+j*rowstrides[i],cxrow);
     }
 
@@ -10217,49 +10164,49 @@
 
   weed_layer_pixel_data_free(layer);
 
-  if (nplanes>1) 
+  if (nplanes>1)
     weed_set_boolean_value(layer,"host_pixel_data_contiguous",WEED_TRUE);
 
   weed_set_voidptr_array(layer,"pixel_data",nplanes,new_pixel_data);
   weed_set_int_array(layer,"rowstrides",nplanes,rowstrides);
-  weed_free(pixel_data);
-  weed_free(new_pixel_data);
-  weed_free(rowstrides);
+  lives_free(pixel_data);
+  lives_free(new_pixel_data);
+  lives_free(rowstrides);
 }
 
 
 #ifdef USE_SWSCALE
 
 static struct SwsContext *swscale_find_context(int iwidth, int iheight,
-					       int width, int height,
-					       enum PixelFormat ipixfmt, enum PixelFormat opixfmt, int flags) {
+    int width, int height,
+    enum PixelFormat ipixfmt, enum PixelFormat opixfmt, int flags) {
   register int i;
   struct _swscale_ctx tmpctx;
 
   if (!swscale_ctx_list_inited) {
-    for (i=0;i<N_SWS_CTX;i++) {
+    for (i=0; i<N_SWS_CTX; i++) {
       memset(&swscale_ctx[i],0,sizeof(struct _swscale_ctx));
       swscale_ctx_list_inited=TRUE;
     }
   }
 
-  for (i=0;i<N_SWS_CTX;i++) {
+  for (i=0; i<N_SWS_CTX; i++) {
     if (swscale_ctx[i].ctx==NULL) return NULL;
 
     if (swscale_ctx[i].iwidth==iwidth &&
-	swscale_ctx[i].iheight==iheight &&
-	swscale_ctx[i].width==width &&
-	swscale_ctx[i].height==height &&
-	swscale_ctx[i].ipixfmt==ipixfmt &&
-	swscale_ctx[i].opixfmt==opixfmt &&
-	swscale_ctx[i].flags==flags) {
+        swscale_ctx[i].iheight==iheight &&
+        swscale_ctx[i].width==width &&
+        swscale_ctx[i].height==height &&
+        swscale_ctx[i].ipixfmt==ipixfmt &&
+        swscale_ctx[i].opixfmt==opixfmt &&
+        swscale_ctx[i].flags==flags) {
       // move to front
       if (i>0) {
-	lives_memcpy(&tmpctx,&swscale_ctx[i],sizeof(struct _swscale_ctx));
-	for (;i>0;i--) {
-	  lives_memcpy(&swscale_ctx[i],&swscale_ctx[i-1],sizeof(struct _swscale_ctx));
-	} 
-	lives_memcpy(&swscale_ctx[0],&tmpctx,sizeof(struct _swscale_ctx));
+        lives_memcpy(&tmpctx,&swscale_ctx[i],sizeof(struct _swscale_ctx));
+        for (; i>0; i--) {
+          lives_memcpy(&swscale_ctx[i],&swscale_ctx[i-1],sizeof(struct _swscale_ctx));
+        }
+        lives_memcpy(&swscale_ctx[0],&tmpctx,sizeof(struct _swscale_ctx));
       }
       return swscale_ctx[0].ctx;
     }
@@ -10270,19 +10217,19 @@
 }
 
 
-static void swscale_add_context(int iwidth, int iheight, int width, int height, enum PixelFormat ipixfmt, enum PixelFormat opixfmt, 
-				int flags, struct SwsContext *ctx) {
+static void swscale_add_context(int iwidth, int iheight, int width, int height, enum PixelFormat ipixfmt, enum PixelFormat opixfmt,
+                                int flags, struct SwsContext *ctx) {
   // add at head of list
   register int i;
 
-  for (i=N_SWS_CTX-1;i>0;i--) {
+  for (i=N_SWS_CTX-1; i>0; i--) {
     // make space by shifting up
     if (swscale_ctx[i-1].ctx==NULL) continue;
 
     // free last in list
-    if (i==N_SWS_CTX-1) 
+    if (i==N_SWS_CTX-1)
       sws_freeContext(swscale_ctx[i].ctx);
-    
+
     // shift up
     lives_memcpy(&swscale_ctx[i],&swscale_ctx[i-1],sizeof(struct _swscale_ctx));
   }
@@ -10303,17 +10250,17 @@
   register int i;
   if (!swscale_ctx_list_inited) return;
 
-  for (i=0;i<N_SWS_CTX;i++) {
+  for (i=0; i<N_SWS_CTX; i++) {
     if (swscale_ctx[i].ctx!=NULL) sws_freeContext(swscale_ctx[i].ctx);
   }
 }
 
 #endif
 
-boolean resize_layer (weed_plant_t *layer, int width, int height, LiVESInterpType interp, int opal_hint, int oclamp_hint) {
+boolean resize_layer(weed_plant_t *layer, int width, int height, LiVESInterpType interp, int opal_hint, int oclamp_hint) {
   // resize a layer; width is in macropixels
 
-  // TODO ** - see if there is a resize plugin candidate/delegate which supports this palette : 
+  // TODO ** - see if there is a resize plugin candidate/delegate which supports this palette :
   // this allows e.g libabl or a hardware rescaler
 
   // opal_hint and oclamp_hint may be set to hint the desired output palette and clamping
@@ -10330,6 +10277,7 @@
   LiVESPixbuf *new_pixbuf=NULL;
 
   boolean keep_in_pixel_data=FALSE;
+  boolean is_contiguous=FALSE;
   boolean retval=TRUE;
 
   int error;
@@ -10344,9 +10292,9 @@
   if (iwidth==width&&iheight==height) return TRUE; // no resize needed
 
   if (width<=0||height<=0) {
-    char *msg=g_strdup_printf("unable to scale layer to %d x %d for palette %d\n",width,height,palette);
+    char *msg=lives_strdup_printf("unable to scale layer to %d x %d for palette %d\n",width,height,palette);
     LIVES_DEBUG(msg);
-    g_free(msg);
+    lives_free(msg);
     return FALSE;
   }
 
@@ -10358,24 +10306,21 @@
       iwidth*=weed_palette_get_pixels_per_macropixel(palette); // orig width is in macropixels
       width*=weed_palette_get_pixels_per_macropixel(palette); // desired width is in macropixels
       if (opal_hint==WEED_PALETTE_END||weed_palette_is_yuv_palette(opal_hint)) {
-	// we should always convert to unclamped values before resizing
-	int oclamping=WEED_YUV_CLAMPING_UNCLAMPED;
-	
-	if (weed_palette_has_alpha_channel(palette)) {
-	  convert_layer_palette(layer,WEED_PALETTE_YUVA8888,oclamping);
-	}
-	else {
-	  convert_layer_palette(layer,WEED_PALETTE_YUV888,oclamping);
-	}
-	iclamped=oclamping;
-      }
-      else {
-	if (weed_palette_has_alpha_channel(palette)) {
-	  convert_layer_palette(layer,WEED_PALETTE_RGBA32,0);
-	}
-	else {
-	  convert_layer_palette(layer,WEED_PALETTE_RGB24,0);
-	}
+        // we should always convert to unclamped values before resizing
+        int oclamping=WEED_YUV_CLAMPING_UNCLAMPED;
+
+        if (weed_palette_has_alpha_channel(palette)) {
+          convert_layer_palette(layer,WEED_PALETTE_YUVA8888,oclamping);
+        } else {
+          convert_layer_palette(layer,WEED_PALETTE_YUV888,oclamping);
+        }
+        iclamped=oclamping;
+      } else {
+        if (weed_palette_has_alpha_channel(palette)) {
+          convert_layer_palette(layer,WEED_PALETTE_RGBA32,0);
+        } else {
+          convert_layer_palette(layer,WEED_PALETTE_RGB24,0);
+        }
       }
       palette=weed_get_int_value(layer,"current_palette",&error);
     }
@@ -10393,10 +10338,14 @@
 #endif
 
   if (weed_plant_has_leaf(layer,"host_orig_pdata")&&weed_get_boolean_value(layer,"host_orig_pdata",&error)==WEED_TRUE) {
+    // host_orig_pdata is set if this is an alpha channel we "stole" from another layer
     keep_in_pixel_data=TRUE;
-    weed_leaf_delete(layer,"host_orig_pdata");
   }
 
+  if (weed_plant_has_leaf(layer,"host_pixel_data_contiguous") &&
+      weed_get_boolean_value(layer,"host_pixel_data_contiguous",&error)==WEED_TRUE)
+    is_contiguous=TRUE;
+
   // if we cannot scale YUV888 (unclamped) or YUVA8888 (unclamped) directly, pretend they are RGB24 and RGBA32
   if (palette==WEED_PALETTE_YUV888&&iclamped==WEED_YUV_CLAMPING_UNCLAMPED
       &&!weed_palette_is_resizable(palette, iclamped, TRUE)) opal_hint=palette=WEED_PALETTE_RGB24;
@@ -10413,101 +10362,106 @@
 #ifdef USE_SWSCALE
   if (iwidth>1&&iheight>1&&weed_palette_is_resizable(palette, iclamped, TRUE)&&
       weed_palette_is_resizable(opal_hint, oclamp_hint, FALSE)) {
-      struct SwsContext *swscale;
+    struct SwsContext *swscale;
 
-      enum PixelFormat ipixfmt,opixfmt;
+    enum PixelFormat ipixfmt,opixfmt;
 
-      void **pd_array;
-      void **in_pixel_data,**out_pixel_data;
+    void **pd_array;
+    void **in_pixel_data,**out_pixel_data;
 
-      boolean store_ctx=FALSE;
+    boolean store_ctx=FALSE;
 
-      int *irowstrides,*orowstrides;
-      int *ir_array,*or_array;
+    int *irowstrides,*orowstrides;
+    int *ir_array,*or_array;
 
-      int flags;
+    int flags;
 
-      register int i;
+    register int i;
 
-      av_log_set_level(AV_LOG_FATAL);
+    av_log_set_level(AV_LOG_FATAL);
 
-      mainw->rowstride_alignment_hint=16;
+    mainw->rowstride_alignment_hint=16;
 
-      if (interp==LIVES_INTERP_BEST) flags=SWS_BICUBIC;
-      if (interp==LIVES_INTERP_NORMAL) flags=SWS_BILINEAR;
-      if (interp==LIVES_INTERP_FAST) flags=SWS_FAST_BILINEAR;
+    if (interp==LIVES_INTERP_BEST) flags=SWS_BICUBIC;
+    if (interp==LIVES_INTERP_NORMAL) flags=SWS_BILINEAR;
+    if (interp==LIVES_INTERP_FAST) flags=SWS_FAST_BILINEAR;
 
-      ipixfmt=weed_palette_to_avi_pix_fmt(palette,&iclamped);
-      opixfmt=weed_palette_to_avi_pix_fmt(opal_hint,&oclamp_hint);
+    ipixfmt=weed_palette_to_avi_pix_fmt(palette,&iclamped);
+    opixfmt=weed_palette_to_avi_pix_fmt(opal_hint,&oclamp_hint);
 
-      in_pixel_data=(void **)g_malloc0(4*sizeof(void *));
-      irowstrides=(int *)g_malloc0(4*sizint);
+    in_pixel_data=(void **)lives_malloc0(4*sizeof(void *));
+    irowstrides=(int *)lives_malloc0(4*sizint);
 
-      pd_array=weed_get_voidptr_array(layer,"pixel_data",&error);
-      ir_array=weed_get_int_array(layer,"rowstrides",&error);
+    pd_array=weed_get_voidptr_array(layer,"pixel_data",&error);
+    ir_array=weed_get_int_array(layer,"rowstrides",&error);
 
-      for (i=0;i<weed_palette_get_numplanes(palette);i++) {
-	in_pixel_data[i]=pd_array[i];
-	irowstrides[i]=ir_array[i];
-      }
+    for (i=0; i<weed_palette_get_numplanes(palette); i++) {
+      in_pixel_data[i]=pd_array[i];
+      irowstrides[i]=ir_array[i];
+    }
 
-      weed_free(pd_array); weed_free(ir_array);
+    lives_free(pd_array);
+    lives_free(ir_array);
 
-      if (palette!=opal_hint) {
-	width*=weed_palette_get_pixels_per_macropixel(palette); // desired width is in macropixels
-	width/=weed_palette_get_pixels_per_macropixel(opal_hint); // desired width is in macropixels
-	weed_set_int_value(layer,"current_palette",opal_hint);
-      }
+    if (palette!=opal_hint) {
+      width*=weed_palette_get_pixels_per_macropixel(palette); // desired width is in macropixels
+      width/=weed_palette_get_pixels_per_macropixel(opal_hint); // desired width is in macropixels
+      weed_set_int_value(layer,"current_palette",opal_hint);
+    }
 
-      if (weed_palette_is_yuv_palette(opal_hint)) 
-	weed_set_int_value(layer,"YUV_clamping",oclamp_hint);
+    if (weed_palette_is_yuv_palette(opal_hint))
+      weed_set_int_value(layer,"YUV_clamping",oclamp_hint);
 
-      weed_set_int_value(layer,"width",width);
-      weed_set_int_value(layer,"height",height);
- 
-      create_empty_pixel_data(layer,FALSE,TRUE);
+    weed_set_int_value(layer,"width",width);
+    weed_set_int_value(layer,"height",height);
 
-      out_pixel_data=(void **)g_malloc0(4*sizeof(void *));
-      orowstrides=(int *)g_malloc0(4*sizint);
+    create_empty_pixel_data(layer,FALSE,TRUE);
 
-      pd_array=weed_get_voidptr_array(layer,"pixel_data",&error);
-      or_array=weed_get_int_array(layer,"rowstrides",&error);
+    out_pixel_data=(void **)lives_malloc0(4*sizeof(void *));
+    orowstrides=(int *)lives_malloc0(4*sizint);
 
-      for (i=0;i<weed_palette_get_numplanes(opal_hint);i++) {
-	out_pixel_data[i]=pd_array[i];
-	orowstrides[i]=or_array[i];
-      }
+    pd_array=weed_get_voidptr_array(layer,"pixel_data",&error);
+    or_array=weed_get_int_array(layer,"rowstrides",&error);
 
-      weed_free(pd_array); weed_free(or_array);
+    for (i=0; i<weed_palette_get_numplanes(opal_hint); i++) {
+      out_pixel_data[i]=pd_array[i];
+      orowstrides[i]=or_array[i];
+    }
 
-      width*=weed_palette_get_pixels_per_macropixel(opal_hint);
+    lives_free(pd_array);
+    lives_free(or_array);
 
-      iwidth*=weed_palette_get_pixels_per_macropixel(palette); // input width is in macropixels
+    width*=weed_palette_get_pixels_per_macropixel(opal_hint);
 
-      if ((swscale=swscale_find_context(iwidth,iheight,width,height,ipixfmt,opixfmt,flags))==NULL) {
-	swscale = sws_getContext(iwidth, iheight, ipixfmt, width, height, opixfmt, flags, NULL, NULL, NULL );
-	store_ctx=TRUE;
-      }
+    iwidth*=weed_palette_get_pixels_per_macropixel(palette); // input width is in macropixels
 
-      if (swscale==NULL) {
-	LIVES_DEBUG("swscale is NULL !!");
-      }
-      else {
-	sws_scale(swscale, (const uint8_t * const*)in_pixel_data, irowstrides, 0, iheight, 
-		  (uint8_t * const *)out_pixel_data, orowstrides);
-	if (store_ctx) swscale_add_context(iwidth,iheight,width,height,ipixfmt,opixfmt,flags,swscale);
-      }
+    if ((swscale=swscale_find_context(iwidth,iheight,width,height,ipixfmt,opixfmt,flags))==NULL) {
+      swscale = sws_getContext(iwidth, iheight, ipixfmt, width, height, opixfmt, flags, NULL, NULL, NULL);
+      store_ctx=TRUE;
+    }
 
-      if (!keep_in_pixel_data) g_free(*in_pixel_data);
+    if (swscale==NULL) {
+      LIVES_DEBUG("swscale is NULL !!");
+    } else {
+      sws_scale(swscale, (const uint8_t * const *)in_pixel_data, irowstrides, 0, iheight,
+                (uint8_t * const *)out_pixel_data, orowstrides);
+      if (store_ctx) swscale_add_context(iwidth,iheight,width,height,ipixfmt,opixfmt,flags,swscale);
+    }
 
-      g_free(in_pixel_data);
-      g_free(out_pixel_data);
+    if (!keep_in_pixel_data) {
+      for (i=0; i<weed_palette_get_numplanes(palette); i++) {
+        lives_free(in_pixel_data[i]);
+        if (is_contiguous) break;
+      }
+    } else weed_leaf_delete(layer,"host_orig_pdata");
 
-      g_free(orowstrides);
-      g_free(irowstrides);
+    lives_free(out_pixel_data);
 
-      return TRUE;
-    }
+    lives_free(orowstrides);
+    lives_free(irowstrides);
+
+    return TRUE;
+  }
 #endif
 
   switch (palette) {
@@ -10520,7 +10474,9 @@
   case WEED_PALETTE_YUV888:
   case WEED_PALETTE_YUVA8888:
 
+    // create a new pixbuf
     pixbuf=layer_to_pixbuf(layer);
+
     threaded_dialog_spin();
     new_pixbuf=lives_pixbuf_scale_simple(pixbuf,width,height,interp);
     threaded_dialog_spin();
@@ -10530,50 +10486,58 @@
       weed_set_int_value(layer,"rowstrides",lives_pixbuf_get_rowstride(new_pixbuf));
     }
 
-    if (keep_in_pixel_data) {
-     // TODO - for QImage, cast to parent class and use parent destructor
-      mainw->do_not_free=(gpointer)lives_pixbuf_get_pixels_readonly(pixbuf);
-      mainw->free_fn=lives_free_with_check;
+    // might be threaded here so we need a mutex to stop other thread resetting free_fn
+    pthread_mutex_lock(&mainw->free_fn_mutex);
+
+    if (weed_get_voidptr_value(layer,"pixel_data",&error)!=NULL && keep_in_pixel_data) {
+      // we created a shared layer/pixbuf, and we need to preserve the data
+      mainw->do_not_free=(livespointer)lives_pixbuf_get_pixels_readonly(pixbuf);
+      mainw->free_fn=_lives_free_with_check;
     }
+
     lives_object_unref(pixbuf);
     mainw->do_not_free=NULL;
-    mainw->free_fn=lives_free_normal;
+    mainw->free_fn=_lives_free_normal;
+
+    pthread_mutex_unlock(&mainw->free_fn_mutex);
 
     break;
   default:
-    g_printerr("Warning: resizing unknown palette %d\n",palette);
+    lives_printerr("Warning: resizing unknown palette %d\n",palette);
     break_me();
     retval=FALSE;
   }
 
   if (new_pixbuf==NULL||(width!=weed_get_int_value(layer,"width",&error)||
-			 height!=weed_get_int_value(layer,"height",&error)))  {
-    g_printerr("unable to scale layer to %d x %d for palette %d\n",width,height,palette);
+                         height!=weed_get_int_value(layer,"height",&error)))  {
+    lives_printerr("unable to scale layer to %d x %d for palette %d\n",width,height,palette);
     retval=FALSE;
-  }
-  else {
+  } else {
     if (weed_plant_has_leaf(layer,"host_orig_pdata"))
       weed_leaf_delete(layer,"host_orig_pdata");
   }
 
+  // might be threaded here so we need a mutex to stop other thread resetting free_fn
+  pthread_mutex_lock(&mainw->free_fn_mutex);
 
   if (new_pixbuf!=NULL) {
     if (pixbuf_to_layer(layer,new_pixbuf)) {
       // TODO - for QImage, cast to parent class and use parent destructor
-      mainw->do_not_free=(gpointer)lives_pixbuf_get_pixels_readonly(new_pixbuf);
-      mainw->free_fn=lives_free_with_check;
+      mainw->do_not_free=(livespointer)lives_pixbuf_get_pixels_readonly(new_pixbuf);
+      mainw->free_fn=_lives_free_with_check;
     }
     lives_object_unref(new_pixbuf);
     mainw->do_not_free=NULL;
-    mainw->free_fn=lives_free_normal;
+    mainw->free_fn=_lives_free_normal;
   }
 
+  pthread_mutex_unlock(&mainw->free_fn_mutex);
 
   return retval;
 }
 
 
-void letterbox_layer (weed_plant_t *layer, int width, int height, int nwidth, int nheight) {
+void letterbox_layer(weed_plant_t *layer, int width, int height, int nwidth, int nheight) {
   // stretch or shrink layer to width/height, then overlay it in a black rectangle size nwidth/nheight
   // width, nwidth should be in macropixels
 
@@ -10625,11 +10589,11 @@
     nplanes=1;
 
   if (nwidth<width||nheight<height) {
-    for (i=0;i<nplanes;i++) free(new_pixel_data[i]);
-    weed_free(new_pixel_data);
+    for (i=0; i<nplanes; i++) free(new_pixel_data[i]);
+    lives_free(new_pixel_data);
     weed_set_voidptr_array(layer,"pixel_data",nplanes,pixel_data);
-    weed_free(pixel_data);
-    weed_free(irowstrides);
+    lives_free(pixel_data);
+    lives_free(irowstrides);
     weed_set_int_value(layer,"width",width);
     weed_set_int_value(layer,"height",height);
     return;
@@ -10647,7 +10611,7 @@
     width*=3;
     dst=(uint8_t *)(new_pixel_data[0]+offs_y*rowstrides[0]+offs_x*3);
     src=(uint8_t *)pixel_data[0];
-    for (i=0;i<height;i++) {
+    for (i=0; i<height; i++) {
       lives_memcpy(dst,src,width);
       dst+=rowstrides[0];
       src+=irowstrides[0];
@@ -10663,7 +10627,7 @@
     width*=4;
     dst=(uint8_t *)(new_pixel_data[0]+offs_y*rowstrides[0]+offs_x*4);
     src=(uint8_t *)pixel_data[0];
-    for (i=0;i<height;i++) {
+    for (i=0; i<height; i++) {
       lives_memcpy(dst,src,width);
       dst+=rowstrides[0];
       src+=irowstrides[0];
@@ -10674,7 +10638,7 @@
     width*=6;
     dst=(uint8_t *)(new_pixel_data[0]+offs_y*rowstrides[0]+offs_x*6);
     src=(uint8_t *)pixel_data[0];
-    for (i=0;i<height;i++) {
+    for (i=0; i<height; i++) {
       lives_memcpy(dst,src,width);
       dst+=rowstrides[0];
       src+=irowstrides[0];
@@ -10684,21 +10648,21 @@
   case WEED_PALETTE_YUV444P:
     dst=(uint8_t *)(new_pixel_data[0]+offs_y*rowstrides[0]+offs_x);
     src=(uint8_t *)pixel_data[0];
-    for (i=0;i<height;i++) {
+    for (i=0; i<height; i++) {
       lives_memcpy(dst,src,width);
       dst+=rowstrides[0];
       src+=irowstrides[0];
     }
     dst=(uint8_t *)(new_pixel_data[1]+offs_y*rowstrides[1]+offs_x);
     src=(uint8_t *)pixel_data[1];
-    for (i=0;i<height;i++) {
+    for (i=0; i<height; i++) {
       lives_memcpy(dst,src,width);
       dst+=rowstrides[1];
       src+=irowstrides[1];
     }
     dst=(uint8_t *)(new_pixel_data[2]+offs_y*rowstrides[2]+offs_x);
     src=(uint8_t *)pixel_data[2];
-    for (i=0;i<height;i++) {
+    for (i=0; i<height; i++) {
       lives_memcpy(dst,src,width);
       dst+=rowstrides[2];
       src+=irowstrides[2];
@@ -10708,28 +10672,28 @@
   case WEED_PALETTE_YUVA4444P:
     dst=(uint8_t *)(new_pixel_data[0]+offs_y*rowstrides[0]+offs_x);
     src=(uint8_t *)pixel_data[0];
-    for (i=0;i<height;i++) {
+    for (i=0; i<height; i++) {
       lives_memcpy(dst,src,width);
       dst+=rowstrides[0];
       src+=irowstrides[0];
     }
     dst=(uint8_t *)(new_pixel_data[1]+offs_y*rowstrides[1]+offs_x);
     src=(uint8_t *)pixel_data[1];
-    for (i=0;i<height;i++) {
+    for (i=0; i<height; i++) {
       lives_memcpy(dst,src,width);
       dst+=rowstrides[1];
       src+=irowstrides[1];
     }
     dst=(uint8_t *)(new_pixel_data[2]+offs_y*rowstrides[2]+offs_x);
     src=(uint8_t *)pixel_data[2];
-    for (i=0;i<height;i++) {
+    for (i=0; i<height; i++) {
       lives_memcpy(dst,src,width);
       dst+=rowstrides[2];
       src+=irowstrides[2];
     }
     dst=(uint8_t *)(new_pixel_data[3]+offs_y*rowstrides[3]+offs_x);
     src=(uint8_t *)pixel_data[3];
-    for (i=0;i<height;i++) {
+    for (i=0; i<height; i++) {
       lives_memcpy(dst,src,width);
       dst+=rowstrides[3];
       src+=irowstrides[3];
@@ -10740,7 +10704,7 @@
     width*=4;
     dst=(uint8_t *)(new_pixel_data[0]+offs_y*rowstrides[0]+offs_x);
     src=(uint8_t *)pixel_data[0];
-    for (i=0;i<height;i++) {
+    for (i=0; i<height; i++) {
       lives_memcpy(dst,src,width);
       dst+=rowstrides[0];
       src+=irowstrides[0];
@@ -10749,14 +10713,14 @@
     offs_x>>=1;
     dst=(uint8_t *)(new_pixel_data[1]+offs_y*rowstrides[1]+offs_x);
     src=(uint8_t *)pixel_data[1];
-    for (i=0;i<height;i++) {
+    for (i=0; i<height; i++) {
       lives_memcpy(dst,src,width);
       dst+=rowstrides[1];
       src+=irowstrides[1];
     }
     dst=(uint8_t *)(new_pixel_data[2]+offs_y*rowstrides[2]+offs_x);
     src=(uint8_t *)pixel_data[2];
-    for (i=0;i<height;i++) {
+    for (i=0; i<height; i++) {
       lives_memcpy(dst,src,width);
       dst+=rowstrides[2];
       src+=irowstrides[2];
@@ -10767,7 +10731,7 @@
   case WEED_PALETTE_YVU420P:
     dst=(uint8_t *)(new_pixel_data[0]+offs_y*rowstrides[0]+offs_x);
     src=(uint8_t *)pixel_data[0];
-    for (i=0;i<height;i++) {
+    for (i=0; i<height; i++) {
       lives_memcpy(dst,src,width);
       dst+=rowstrides[0];
       src+=irowstrides[0];
@@ -10778,14 +10742,14 @@
     offs_y>>=1;
     dst=(uint8_t *)(new_pixel_data[1]+offs_y*rowstrides[1]+offs_x);
     src=(uint8_t *)pixel_data[1];
-    for (i=0;i<height;i++) {
+    for (i=0; i<height; i++) {
       lives_memcpy(dst,src,width);
       dst+=rowstrides[1];
       src+=irowstrides[1];
     }
     dst=(uint8_t *)(new_pixel_data[2]+offs_y*rowstrides[2]+offs_x);
     src=(uint8_t *)pixel_data[2];
-    for (i=0;i<height;i++) {
+    for (i=0; i<height; i++) {
       lives_memcpy(dst,src,width);
       dst+=rowstrides[2];
       src+=irowstrides[2];
@@ -10796,7 +10760,7 @@
     width*=3*sizeof(float);
     dst=(uint8_t *)(new_pixel_data[0]+offs_y*rowstrides[0]+offs_x*3*sizeof(float));
     src=(uint8_t *)pixel_data[0];
-    for (i=0;i<height;i++) {
+    for (i=0; i<height; i++) {
       lives_memcpy(dst,src,width);
       dst+=rowstrides[0];
       src+=irowstrides[0];
@@ -10807,7 +10771,7 @@
     width*=4*sizeof(float);
     dst=(uint8_t *)(new_pixel_data[0]+offs_y*rowstrides[0]+offs_x*4*sizeof(float));
     src=(uint8_t *)pixel_data[0];
-    for (i=0;i<height;i++) {
+    for (i=0; i<height; i++) {
       lives_memcpy(dst,src,width);
       dst+=rowstrides[0];
       src+=irowstrides[0];
@@ -10818,7 +10782,7 @@
     width*=sizeof(float);
     dst=(uint8_t *)(new_pixel_data[0]+offs_y*rowstrides[0]+offs_x*sizeof(float));
     src=(uint8_t *)pixel_data[0];
-    for (i=0;i<height;i++) {
+    for (i=0; i<height; i++) {
       lives_memcpy(dst,src,width);
       dst+=rowstrides[0];
       src+=irowstrides[0];
@@ -10828,7 +10792,7 @@
   case WEED_PALETTE_A8:
     dst=(uint8_t *)(new_pixel_data[0]+offs_y*rowstrides[0]+offs_x);
     src=(uint8_t *)pixel_data[0];
-    for (i=0;i<height;i++) {
+    for (i=0; i<height; i++) {
       lives_memcpy(dst,src,width);
       dst+=rowstrides[0];
       src+=irowstrides[0];
@@ -10840,7 +10804,7 @@
     width>>=3;
     dst=(uint8_t *)(new_pixel_data[0]+offs_y*rowstrides[0]+(offs_x>>3));
     src=(uint8_t *)pixel_data[0];
-    for (i=0;i<height;i++) {
+    for (i=0; i<height; i++) {
       lives_memcpy(dst,src,width);
       dst+=rowstrides[0];
       src+=irowstrides[0];
@@ -10848,12 +10812,12 @@
     break;
   }
 
-  for (i=0;i<nplanes;i++) if (pixel_data[i]!=NULL) g_free(pixel_data[i]);
+  for (i=0; i<nplanes; i++) if (pixel_data[i]!=NULL) lives_free(pixel_data[i]);
 
-  weed_free(pixel_data);
-  weed_free(new_pixel_data);
-  weed_free(irowstrides);
-  weed_free(rowstrides);
+  lives_free(pixel_data);
+  lives_free(new_pixel_data);
+  lives_free(irowstrides);
+  lives_free(rowstrides);
 
 }
 
@@ -10861,8 +10825,8 @@
 boolean pixbuf_to_layer(weed_plant_t *layer, LiVESPixbuf *pixbuf) {
   // turn a (Gdk)Pixbuf into a Weed layer
 
-  // a "layer" is CHANNEL type plant which is not created from a plugin CHANNEL_TEMPLATE. 
-  // When we pass this to a plugin, we need to adjust it depending 
+  // a "layer" is CHANNEL type plant which is not created from a plugin CHANNEL_TEMPLATE.
+  // When we pass this to a plugin, we need to adjust it depending
   // on the plugin's CHANNEL_TEMPLATE to which we will assign it
 
   // e.g.: memory may need aligning afterwards for particular plugins which set channel template flags:
@@ -10874,15 +10838,23 @@
 
   /* code example:
 
+  boolean needs_unlock=FALSE;
+
   if (pixbuf!=NULL) {
     if (pixbuf_to_layer(layer,pixbuf)) {
-      mainw->do_not_free=(gpointer)lives_pixbuf_get_pixels_readonly(pixbuf);
-      mainw->free_fn=lives_free_with_check;
+      mainw->do_not_free=(livespointer)lives_pixbuf_get_pixels_readonly(pixbuf);
+      pthread_mutex_lock(&mainw->free_fn_mutex);
+      needs_unlock=TRUE;
+      mainw->free_fn=_lives_free_with_check;
     }
     lives_object_unref(pixbuf);
     mainw->do_not_free=NULL;
-    mainw->free_fn=lives_free_normal;
+    mainw->free_fn=_lives_free_normal;
+    if (needs_unlock) pthread_mutex_unlock(&mainw->free_fn_mutex);
+
   }
+
+
   */
 
   int rowstride;
@@ -10920,21 +10892,22 @@
 #ifdef GUI_QT
     // TODO - need to check this, it may be endian dependent
     if (nchannels==4) {
-      int flags=0;
+      int flags=0,error;
       weed_set_int_value(layer,"current_palette",WEED_PALETTE_ARGB32);
       if (weed_plant_has_leaf(layer,"flags")) flags=weed_get_int_value(layer,"flags",&error);
       flags|=WEED_CHANNEL_ALPHA_PREMULT;
       weed_set_int_value(layer,"flags",flags);
-    }
-    else weed_set_int_value(layer,"current_palette",WEED_PALETTE_RGB24);
+    } else weed_set_int_value(layer,"current_palette",WEED_PALETTE_RGB24);
 #endif
   }
 
+#ifndef GUI_QT
   if (rowstride==get_last_rowstride_value(width,nchannels)) {
     in_pixel_data=(void *)lives_pixbuf_get_pixels(pixbuf);
     weed_set_voidptr_value(layer,"pixel_data",in_pixel_data);
     return TRUE;
   }
+#endif
 
   framesize=CEIL(rowstride*height,32);
 
@@ -10995,16 +10968,13 @@
   if (pal==WEED_PALETTE_A8) {
     cform=LIVES_PAINTER_FORMAT_A8;
     widthx=width;
-  }
-  else if (pal==WEED_PALETTE_A1) {
+  } else if (pal==WEED_PALETTE_A1) {
     cform=LIVES_PAINTER_FORMAT_A1;
     widthx=width>>3;
-  }
-  else {
+  } else {
     if (capable->byte_order==LIVES_BIG_ENDIAN) {
       convert_layer_palette(layer,WEED_PALETTE_ARGB32,0);
-    }
-    else {
+    } else {
       convert_layer_palette(layer,WEED_PALETTE_BGRA32,0);
     }
     cform=LIVES_PAINTER_FORMAT_ARGB32;
@@ -11021,17 +10991,16 @@
 
   if (irowstride==orowstride) {
     pixel_data=src;
-  }
-  else {
-    dst=pixel_data=(uint8_t *)g_try_malloc(height*orowstride);
+  } else {
+    dst=pixel_data=(uint8_t *)lives_try_malloc(height*orowstride);
     if (pixel_data==NULL) return NULL;
-    for (i=0;i<height;i++) {
+    for (i=0; i<height; i++) {
       lives_memcpy(dst,src,widthx);
       memset(dst+widthx,0,widthx-orowstride);
       dst+=orowstride;
       src+=irowstride;
     }
-    g_free(orig_pixel_data);
+    lives_free(orig_pixel_data);
     weed_set_voidptr_value(layer,"pixel_data",pixel_data);
     weed_set_int_value(layer,"rowstrides",orowstride);
   }
@@ -11048,9 +11017,9 @@
   }
 
   surf=lives_painter_image_surface_create_for_data(pixel_data,
-					   cform, 
-					   width, height,
-					   orowstride);
+       cform,
+       width, height,
+       orowstride);
 
   if (surf==NULL) return NULL;
 
@@ -11075,20 +11044,20 @@
   lives_painter_format_t  cform;
 
   // flush to ensure all writing to the image was done
-  lives_painter_surface_flush (surface);
+  lives_painter_surface_flush(surface);
 
-  src = lives_painter_image_surface_get_data (surface);
-  width = lives_painter_image_surface_get_width (surface);
-  height = lives_painter_image_surface_get_height (surface);
-  rowstride = lives_painter_image_surface_get_stride (surface);
+  src = lives_painter_image_surface_get_data(surface);
+  width = lives_painter_image_surface_get_width(surface);
+  height = lives_painter_image_surface_get_height(surface);
+  rowstride = lives_painter_image_surface_get_stride(surface);
 
   if (weed_plant_has_leaf(layer,"pixel_data")) {
     int error;
     pixel_data=weed_get_voidptr_value(layer,"pixel_data",&error);
-    if (pixel_data!=NULL&&pixel_data!=src) g_free(pixel_data);
+    if (pixel_data!=NULL&&pixel_data!=src) lives_free(pixel_data);
   }
 
-  pixel_data=g_try_malloc(CEIL(height*rowstride,32));
+  pixel_data=lives_try_malloc(CEIL(height*rowstride,32));
 
   weed_set_voidptr_value(layer,"pixel_data",pixel_data);
 
@@ -11100,26 +11069,24 @@
   weed_set_int_value(layer,"width",width);
   weed_set_int_value(layer,"height",height);
 
-  cform = lives_painter_image_surface_get_format (surface);
+  cform = lives_painter_image_surface_get_format(surface);
 
   switch (cform) {
   case LIVES_PAINTER_FORMAT_ARGB32:
     if (capable->byte_order==LIVES_BIG_ENDIAN) {
       weed_set_int_value(layer,"current_palette",WEED_PALETTE_ARGB32);
-    }
-    else {
+    } else {
       weed_set_int_value(layer,"current_palette",WEED_PALETTE_BGRA32);
     }
-    
+
     if (prefs->alpha_post) {
       // un-premultiply the alpha
       alpha_unpremult(layer,TRUE);
-    }
-    else {
+    } else {
       int flags=0,error;
       if (weed_plant_has_leaf(layer,"flags"))
-	flags=weed_get_int_value(layer,"flags",&error);
-      
+        flags=weed_get_int_value(layer,"flags",&error);
+
       flags|=WEED_CHANNEL_ALPHA_PREMULT;
       weed_set_int_value(layer,"flags",flags);
     }
@@ -11156,7 +11123,7 @@
 }
 
 
-weed_plant_t *weed_layer_copy (weed_plant_t *dlayer, weed_plant_t *slayer) {
+weed_plant_t *weed_layer_copy(weed_plant_t *dlayer, weed_plant_t *slayer) {
   // copy source slayer to dest dlayer
   // for a newly created layer, this is a deep copy, since the pixel_data array is also copied
 
@@ -11179,8 +11146,7 @@
   if (dlayer==NULL) {
     layer=weed_plant_new(WEED_PLANT_CHANNEL);
     deep=TRUE;
-  }
-  else layer=dlayer;
+  } else layer=dlayer;
 
   // now copy relevant leaves
   flags=weed_get_int_value(slayer,"flags",&error);
@@ -11196,17 +11162,17 @@
   weed_set_voidptr_value(layer,"pixel_data",NULL);
 
   if (deep) {
-    pd_array=(void **)g_malloc(pd_elements*sizeof(void *));
+    pd_array=(void **)lives_malloc(pd_elements*sizeof(void *));
 
-    for (i=0;i<pd_elements;i++) {
+    for (i=0; i<pd_elements; i++) {
       size=(size_t)((double)height*weed_palette_get_plane_ratio_vertical(palette,i)*(double)rowstrides[i]);
       totsize+=CEIL(size,32);
     }
-    
-    npixel_data=g_try_malloc(totsize);
+
+    npixel_data=lives_try_malloc(totsize);
     if (npixel_data==NULL) return layer;
-    
-    for (i=0;i<pd_elements;i++) {
+
+    for (i=0; i<pd_elements; i++) {
       size=(size_t)((double)height*weed_palette_get_plane_ratio_vertical(palette,i)*(double)rowstrides[i]);
       pd_array[i]=npixel_data;
       lives_memcpy(pd_array[i],pixel_data[i],size);
@@ -11214,10 +11180,9 @@
     }
     if (pd_elements>1)
       weed_set_boolean_value(layer,"host_pixel_data_contiguous",WEED_TRUE);
-    else if (weed_plant_has_leaf(layer,"host_pixel_data_contiguous")) 
+    else if (weed_plant_has_leaf(layer,"host_pixel_data_contiguous"))
       weed_leaf_delete(layer,"host_pixel_data_contiguous");
-  }
-  else pd_array=pixel_data;
+  } else pd_array=pixel_data;
 
   weed_set_voidptr_array(layer,"pixel_data",pd_elements,pd_array);
   weed_set_int_value(layer,"flags",flags);
@@ -11226,19 +11191,19 @@
   weed_set_int_value(layer,"current_palette",palette);
   weed_set_int_array(layer,"rowstrides",pd_elements,rowstrides);
 
-  if (weed_plant_has_leaf(slayer,"YUV_clamping")) 
+  if (weed_plant_has_leaf(slayer,"YUV_clamping"))
     weed_set_int_value(layer,"YUV_clamping",weed_get_int_value(slayer,"YUV_clamping",&error));
-  if (weed_plant_has_leaf(slayer,"YUV_subspace")) 
+  if (weed_plant_has_leaf(slayer,"YUV_subspace"))
     weed_set_int_value(layer,"YUV_subspace",weed_get_int_value(slayer,"YUV_subspace",&error));
-  if (weed_plant_has_leaf(slayer,"YUV_sampling")) 
+  if (weed_plant_has_leaf(slayer,"YUV_sampling"))
     weed_set_int_value(layer,"YUV_sampling",weed_get_int_value(slayer,"YUV_sampling",&error));
 
-  if (weed_plant_has_leaf(slayer,"pixel_aspect_ratio")) 
+  if (weed_plant_has_leaf(slayer,"pixel_aspect_ratio"))
     weed_set_double_value(layer,"pixel_aspect_ratio",weed_get_int_value(slayer,"pixel_aspect_ratio",&error));
 
-  if (pd_array!=pixel_data) g_free(pd_array);
-  weed_free(pixel_data);
-  weed_free(rowstrides);
+  if (pd_array!=pixel_data) lives_free(pd_array);
+  lives_free(pixel_data);
+  lives_free(rowstrides);
 
   return layer;
 }
@@ -11255,35 +11220,35 @@
 
   if (layer==NULL) return;
 
-  if (weed_plant_has_leaf(layer,"host_orig_pdata")&&weed_get_boolean_value(layer,"host_orig_pdata",&error)==WEED_TRUE) 
+  if (weed_plant_has_leaf(layer,"host_orig_pdata")&&weed_get_boolean_value(layer,"host_orig_pdata",&error)==WEED_TRUE)
     return;
 
   if (weed_plant_has_leaf(layer,"pixel_data")) {
     pd_elements=weed_leaf_num_elements(layer,"pixel_data");
     if (weed_plant_has_leaf(layer,"host_pixel_data_contiguous")&&
-	weed_get_boolean_value(layer,"host_pixel_data_contiguous",&error)==WEED_TRUE) pd_elements=1;
+        weed_get_boolean_value(layer,"host_pixel_data_contiguous",&error)==WEED_TRUE) pd_elements=1;
     if (pd_elements>0) {
       pixel_data=weed_get_voidptr_array(layer,"pixel_data",&error);
       if (pixel_data!=NULL) {
 
-	if (weed_plant_has_leaf(layer,"host_pixel_data_contiguous")) {
-	    if (weed_get_boolean_value(layer,"host_pixel_data_contiguous",&error)==WEED_TRUE)
-	      pd_elements=1;
-	    weed_leaf_delete(layer,"host_pixel_data_contiguous");
-	  }
+        if (weed_plant_has_leaf(layer,"host_pixel_data_contiguous")) {
+          if (weed_get_boolean_value(layer,"host_pixel_data_contiguous",&error)==WEED_TRUE)
+            pd_elements=1;
+          weed_leaf_delete(layer,"host_pixel_data_contiguous");
+        }
 
-	  for (i=0;i<pd_elements;i++) {
-	    if (pixel_data[i]!=NULL) g_free(pixel_data[i]);
-	  }
+        for (i=0; i<pd_elements; i++) {
+          if (pixel_data[i]!=NULL) lives_free(pixel_data[i]);
+        }
 
-	  weed_free(pixel_data);
-	  weed_set_voidptr_value(layer,"pixel_data",NULL);
+        lives_free(pixel_data);
+        weed_set_voidptr_value(layer,"pixel_data",NULL);
       }
     }
   }
 }
 
-void weed_layer_free (weed_plant_t *layer) {
+void weed_layer_free(weed_plant_t *layer) {
 
   if (layer==NULL) return;
   weed_layer_pixel_data_free(layer);
@@ -11307,7 +11272,7 @@
 
   lives_clip_t *sfile=mainw->files[sfileno];
   LiVESPixbuf *blankp;
-  GError *error=NULL;
+  LiVESError *error=NULL;
   char oname[PATH_MAX];
   char nname[PATH_MAX];
   char *com;
@@ -11316,33 +11281,33 @@
 
   blankp=lives_pixbuf_new_blank(sfile->hsize,sfile->vsize,WEED_PALETTE_RGB24);
 
-  for (i=1;i<=sfile->frames;i++) {
-    g_snprintf(oname,PATH_MAX,"%s/%s/%08d.%s",prefs->tmpdir,sfile->handle,i,get_image_ext_for_type(sfile->img_type));
-    if (g_file_test(oname,G_FILE_TEST_EXISTS)) {
-      g_snprintf(nname,PATH_MAX,"%s/%s/%08d.%s",prefs->tmpdir,sfile->handle,i+nframes,get_image_ext_for_type(sfile->img_type));
+  for (i=1; i<=sfile->frames; i++) {
+    lives_snprintf(oname,PATH_MAX,"%s/%s/%08d.%s",prefs->tmpdir,sfile->handle,i,get_image_ext_for_type(sfile->img_type));
+    if (lives_file_test(oname,LIVES_FILE_TEST_EXISTS)) {
+      lives_snprintf(nname,PATH_MAX,"%s/%s/%08d.%s",prefs->tmpdir,sfile->handle,i+nframes,get_image_ext_for_type(sfile->img_type));
       mainw->com_failed=FALSE;
 #ifndef IS_MINGW
-      com=g_strdup_printf("/bin/mv \"%s\" \"%s\"",
-			  oname,nname);
+      com=lives_strdup_printf("%s \"%s\" \"%s\"",capable->mv_cmd,
+                              oname,nname);
 #else
-      com=g_strdup_printf("mv.exe \"%s\" \"%s\"",
-			  oname,nname);
+      com=lives_strdup_printf("mv.exe \"%s\" \"%s\"",
+                              oname,nname);
 
 #endif
       lives_system(com,FALSE);
-      g_free(com);
-      
+      lives_free(com);
+
       if (mainw->com_failed) {
-	return;
+        return;
       }
     }
   }
 
-  for (i=after;i<after+nframes;i++) {
-    g_snprintf(oname,PATH_MAX,"%s/%s/%08d.%s",prefs->tmpdir,sfile->handle,i+1,get_image_ext_for_type(sfile->img_type));
-    lives_pixbuf_save (blankp, oname, sfile->img_type, 100-prefs->ocp, TRUE, &error);
+  for (i=after; i<after+nframes; i++) {
+    lives_snprintf(oname,PATH_MAX,"%s/%s/%08d.%s",prefs->tmpdir,sfile->handle,i+1,get_image_ext_for_type(sfile->img_type));
+    lives_pixbuf_save(blankp, oname, sfile->img_type, 100-prefs->ocp, TRUE, &error);
     if (error!=NULL) {
-      g_error_free(error);
+      lives_error_free(error);
       break;
     }
   }

LiVES-2.2.8.tar.bz2/src/colourspace.h -> LiVES-2.4.1.tar.bz2/src/colourspace.h Changed

@@ -120,18 +120,18 @@
 boolean convert_layer_palette_with_sampling(weed_plant_t *layer, int outpl, int out_sampling);
 boolean convert_layer_palette_full(weed_plant_t *layer, int outpl, int osamtype, boolean oclamping, int osubspace);
 //boolean apply_gamma (weed_plant_t *ilayer, weed_plant_t *olayer, double gamma); ///< not used
-boolean resize_layer (weed_plant_t *layer, int width, int height, LiVESInterpType interp, int opal_hint, int oclamp_hint);
-void letterbox_layer (weed_plant_t *layer, int width, int height, int nwidth, int nheight);
+boolean resize_layer(weed_plant_t *layer, int width, int height, LiVESInterpType interp, int opal_hint, int oclamp_hint);
+void letterbox_layer(weed_plant_t *layer, int width, int height, int nwidth, int nheight);
 void compact_rowstrides(weed_plant_t *layer);
 void weed_layer_pixel_data_free(weed_plant_t *layer);
 void create_empty_pixel_data(weed_plant_t *layer, boolean black_fill, boolean may_contig);
 void insert_blank_frames(int sfileno, int nframes, int after);
 void pixel_data_planar_from_membuf(void **pixel_data, void *data, size_t size, int palette);
-LiVESPixbuf *layer_to_pixbuf (weed_plant_t *layer);
+LiVESPixbuf *layer_to_pixbuf(weed_plant_t *layer);
 boolean pixbuf_to_layer(weed_plant_t *layer, LiVESPixbuf *) WARN_UNUSED;
 
-weed_plant_t *weed_layer_copy (weed_plant_t *dlayer, weed_plant_t *slayer);
-void weed_layer_free (weed_plant_t *layer);
+weed_plant_t *weed_layer_copy(weed_plant_t *dlayer, weed_plant_t *slayer);
+void weed_layer_free(weed_plant_t *layer);
 weed_plant_t *weed_layer_new(int width, int height, int *rowstrides, int current_palette);
 int weed_layer_get_palette(weed_plant_t *layer);
 
@@ -155,7 +155,7 @@
 double weed_palette_get_plane_ratio_vertical(int pal, int plane);
 boolean weed_palette_is_lower_quality(int p1, int p2);  ///< return TRUE if p1 is lower quality than p2
 boolean weed_palette_is_resizable(int pal, int clamped, boolean in_out);
-double weed_palette_get_compression_ratio (int pal);
+double weed_palette_get_compression_ratio(int pal);
 
 int get_weed_palette_for_lives_painter(void);

LiVES-2.2.8.tar.bz2/src/cvirtual.c -> LiVES-2.4.1.tar.bz2/src/cvirtual.c Changed

@@ -19,10 +19,10 @@
 
 
 /** count virtual frames between start and end (inclusive) */
-LIVES_INLINE int count_virtual_frames(int *findex, int start, int end) {
+int count_virtual_frames(int *findex, int start, int end) {
   register int i;
   int count=0;
-  for (i=start-1;i<end;i++) if (findex[i]!=-1) count++;
+  for (i=start-1; i<end; i++) if (findex[i]!=-1) count++;
   return count;
 }
 
@@ -32,10 +32,10 @@
   lives_clip_t *sfile=mainw->files[fileno];
   if (sfile==NULL||sfile->frame_index!=NULL) return;
 
-  sfile->frame_index=(int *)g_malloc(nframes*sizint);
+  sfile->frame_index=(int *)lives_malloc(nframes*sizint);
 
   if (init) {
-    for (i=0;i<sfile->frames;i++) {
+    for (i=0; i<sfile->frames; i++) {
       sfile->frame_index[i]=i+start_offset;
     }
   }
@@ -46,45 +46,44 @@
 boolean save_frame_index(int fileno) {
   int fd,i;
   int retval;
-  gchar *fname;
+  char *fname;
   lives_clip_t *sfile=mainw->files[fileno];
 
   if (fileno==0) return TRUE;
 
   if (sfile==NULL||sfile->frame_index==NULL) return FALSE;
 
-  fname=g_build_filename(prefs->tmpdir,sfile->handle,"file_index",NULL);
+  fname=lives_build_filename(prefs->tmpdir,sfile->handle,"file_index",NULL);
 
   do {
     retval=0;
     fd=lives_creat_buffered(fname,DEF_FILE_PERMS);
     if (fd<0) {
-      retval=do_write_failed_error_s_with_retry(fname,g_strerror(errno),NULL);
-    }
-    else {
+      retval=do_write_failed_error_s_with_retry(fname,lives_strerror(errno),NULL);
+    } else {
 
 #ifdef IS_MINGW
-  setmode(fd, O_BINARY);
+      setmode(fd, O_BINARY);
 #endif
 
       mainw->write_failed=FALSE;
-      for (i=0;i<sfile->frames;i++) {
-	lives_write_le_buffered(fd,&sfile->frame_index[i],4,TRUE);
-	if (mainw->write_failed) break;
+      for (i=0; i<sfile->frames; i++) {
+        lives_write_le_buffered(fd,&sfile->frame_index[i],4,TRUE);
+        if (mainw->write_failed) break;
       }
-      
+
       lives_close_buffered(fd);
 
       if (mainw->write_failed) {
-	retval=do_write_failed_error_s_with_retry(fname,NULL,NULL);
+        retval=do_write_failed_error_s_with_retry(fname,NULL,NULL);
       }
     }
-  } while (retval==LIVES_RETRY);
+  } while (retval==LIVES_RESPONSE_RETRY);
+
+  lives_free(fname);
 
-  g_free(fname);
+  if (retval==LIVES_RESPONSE_CANCEL) return FALSE;
 
-  if (retval==LIVES_CANCEL) return FALSE;
-  
   return TRUE;
 }
 
@@ -94,18 +93,18 @@
 boolean load_frame_index(int fileno) {
   int fd,i;
   int retval;
-  gchar *fname;
+  char *fname;
   lives_clip_t *sfile=mainw->files[fileno];
 
   if (sfile==NULL||sfile->frame_index!=NULL) return FALSE;
 
-  if (sfile->frame_index!=NULL) g_free(sfile->frame_index);
+  if (sfile->frame_index!=NULL) lives_free(sfile->frame_index);
   sfile->frame_index=NULL;
 
-  fname=g_build_filename(prefs->tmpdir,sfile->handle,"file_index",NULL);
+  fname=lives_build_filename(prefs->tmpdir,sfile->handle,"file_index",NULL);
 
-  if (!g_file_test(fname,G_FILE_TEST_EXISTS)) {
-    g_free(fname);
+  if (!lives_file_test(fname,LIVES_FILE_TEST_EXISTS)) {
+    lives_free(fname);
     return FALSE;
   }
 
@@ -116,36 +115,35 @@
     fd=lives_open_buffered_rdonly(fname);
 
     if (fd<0) {
-      retval=do_read_failed_error_s_with_retry(fname,g_strerror(errno),NULL);
-      if (retval==LIVES_CANCEL) {
-	g_free(fname);
-	return FALSE;
+      retval=do_read_failed_error_s_with_retry(fname,lives_strerror(errno),NULL);
+      if (retval==LIVES_RESPONSE_CANCEL) {
+        lives_free(fname);
+        return FALSE;
       }
-    }
-    else {
+    } else {
 
 #ifdef IS_MINGW
-  setmode(fd, O_BINARY);
+      setmode(fd, O_BINARY);
 #endif
       create_frame_index(fileno,FALSE,0,sfile->frames);
 
       mainw->read_failed=FALSE;
-      for (i=0;i<sfile->frames;i++) {
-	lives_read_le_buffered(fd,&sfile->frame_index[i],4,FALSE);
-	if (mainw->read_failed) break;
+      for (i=0; i<sfile->frames; i++) {
+        lives_read_le_buffered(fd,&sfile->frame_index[i],4,FALSE);
+        if (mainw->read_failed) break;
       }
 
       lives_close_buffered(fd);
 
       if (mainw->read_failed) {
-	mainw->read_failed=FALSE;
-	retval=do_read_failed_error_s_with_retry(fname,NULL,NULL);
+        mainw->read_failed=FALSE;
+        retval=do_read_failed_error_s_with_retry(fname,NULL,NULL);
       }
 
     }
-  } while (retval==LIVES_RETRY);
+  } while (retval==LIVES_RESPONSE_RETRY);
 
-  g_free(fname);
+  lives_free(fname);
 
   return TRUE;
 }
@@ -155,38 +153,38 @@
   // physically delete the frame_index for a clip
   // only done once all
 
-  gchar *idxfile;
-  gchar *com;
+  char *idxfile;
+  char *com;
 
   register int i;
 
   // cannot call check_if_non_virtual() else we end up recursing
 
   if (sfile->frame_index!=NULL) {
-    for (i=1;i<=sfile->frames;i++) {
+    for (i=1; i<=sfile->frames; i++) {
       if (sfile->frame_index[i-1]!=-1) {
-	LIVES_ERROR("deleting frame_index with virtual frames in it !");
-	return;
+        LIVES_ERROR("deleting frame_index with virtual frames in it !");
+        return;
       }
     }
   }
 
   if (sfile!=clipboard) {
-    idxfile=g_build_filename(prefs->tmpdir,sfile->handle,"file_index",NULL);
-  
+    idxfile=lives_build_filename(prefs->tmpdir,sfile->handle,"file_index",NULL);
+
 #ifndef IS_MINGW
-    com=g_strdup_printf("/bin/rm -f \"%s\"",idxfile);
+    com=lives_strdup_printf("%s -f \"%s\"",capable->rm_cmd,idxfile);
 #else
-    com=g_strdup_printf("rm.exe -f \"%s\"",idxfile);
+    com=lives_strdup_printf("rm.exe -f \"%s\"",idxfile);
 #endif
 
     lives_system(com,FALSE);
-    g_free(com);
+    lives_free(com);
 
-    g_free(idxfile);
+    lives_free(idxfile);
   }
 
-  if (sfile->frame_index!=NULL) g_free(sfile->frame_index);
+  if (sfile->frame_index!=NULL) lives_free(sfile->frame_index);
   sfile->frame_index=NULL;
 }
 
@@ -212,13 +210,13 @@
 
 
   // check the image type
-  for (i=0;i<sfile->frames;i++) {
+  for (i=0; i<sfile->frames; i++) {
     if (sfile->frame_index[i]==-1) {
       // this is a non-virtual frame
-      gchar *frame=g_strdup_printf("%s/%s/%08d.png",prefs->tmpdir,sfile->handle,i+1);
-      if (g_file_test(frame,G_FILE_TEST_EXISTS)) empirical_img_type=IMG_TYPE_PNG;
+      char *frame=lives_strdup_printf("%s/%s/%08d.png",prefs->tmpdir,sfile->handle,i+1);
+      if (lives_file_test(frame,LIVES_FILE_TEST_EXISTS)) empirical_img_type=IMG_TYPE_PNG;
       else empirical_img_type=IMG_TYPE_JPEG;
-      g_free(frame);
+      lives_free(frame);
       first_real_frame=i+1;
       break;
     }
@@ -230,15 +228,13 @@
     if (first_real_frame>0) {
       sfile->img_type=empirical_img_type;
       get_frames_sizes(fileno,first_real_frame);
-    }
-    else {
+    } else {
       if (!prefs->auto_nobord) {
-	sfile->hsize=cdata->frame_width*weed_palette_get_pixels_per_macropixel(cdata->current_palette);
-	sfile->vsize=cdata->frame_height;
-      }
-      else {
-	sfile->hsize=cdata->width*weed_palette_get_pixels_per_macropixel(cdata->current_palette);
-	sfile->vsize=cdata->height;
+        sfile->hsize=cdata->frame_width*weed_palette_get_pixels_per_macropixel(cdata->current_palette);
+        sfile->vsize=cdata->frame_height;
+      } else {
+        sfile->hsize=cdata->width*weed_palette_get_pixels_per_macropixel(cdata->current_palette);
+        sfile->vsize=cdata->height;
       }
     }
     goto mismatch;
@@ -247,11 +243,11 @@
   if (sfile->fps!=cdata->fps) goto mismatch;
 
   if (sfile->img_type!=empirical_img_type) sfile->img_type=empirical_img_type;
-  
+
   // and all else are equal
   return TRUE;
 
- mismatch:
+mismatch:
   // something mismatched - trust the disk version
   ((lives_clip_data_t *)cdata)->fps=sfile->pb_fps=sfile->fps;
 
@@ -273,7 +269,7 @@
   if (sfile->clip_type!=CLIP_TYPE_FILE) return TRUE;
 
   if (sfile->frame_index!=NULL) {
-    for (i=start;i<=end;i++) {
+    for (i=start; i<=end; i++) {
       if (sfile->frame_index[i-1]!=-1) return FALSE;
     }
   }
@@ -316,7 +312,7 @@
   register int i;
   lives_clip_t *sfile=mainw->files[sfileno];
   LiVESPixbuf *pixbuf=NULL;
-  GError *error=NULL;
+  LiVESError *error=NULL;
   char *oname;
   int retval;
 
@@ -324,42 +320,42 @@
 
   if (sframe<1) sframe=1;
 
-  for (i=sframe;i<=eframe;i++) {
+  for (i=sframe; i<=eframe; i++) {
     if (i>sfile->frames) break;
 
     if (sfile->frame_index[i-1]>=0) {
       oname=NULL;
 
       if (update_progress) {
-	threaded_dialog_spin();
-	lives_widget_context_update();
+        threaded_dialog_spin();
+        lives_widget_context_update();
       }
 
       if (pbr!=NULL&&pixbuf!=NULL) lives_object_unref(pixbuf);
 
       pixbuf=pull_lives_pixbuf_at_size(sfileno,i,get_image_ext_for_type(sfile->img_type),
-				       q_gint64((i-1.)/sfile->fps,sfile->fps),sfile->hsize,sfile->vsize,LIVES_INTERP_BEST);
-      
-      oname=g_strdup_printf("%s/%s/%08d.%s",prefs->tmpdir,sfile->handle,i,get_image_ext_for_type(sfile->img_type));
+                                       q_gint64((i-1.)/sfile->fps,sfile->fps),sfile->hsize,sfile->vsize,LIVES_INTERP_BEST);
+
+      oname=lives_strdup_printf("%s/%s/%08d.%s",prefs->tmpdir,sfile->handle,i,get_image_ext_for_type(sfile->img_type));
 
       do {
-	retval=0;
-	lives_pixbuf_save (pixbuf, oname, sfile->img_type, 100-prefs->ocp, TRUE, &error);
-	if (error!=NULL&&pbr==NULL) {
-	  retval=do_write_failed_error_s_with_retry(oname,error->message,NULL);
-	  g_error_free(error);
-	  error=NULL;
-	}
-      } while (retval==LIVES_RETRY);
+        retval=0;
+        lives_pixbuf_save(pixbuf, oname, sfile->img_type, 100-prefs->ocp, TRUE, &error);
+        if (error!=NULL&&pbr==NULL) {
+          retval=do_write_failed_error_s_with_retry(oname,error->message,NULL);
+          lives_error_free(error);
+          error=NULL;
+        }
+      } while (retval==LIVES_RESPONSE_RETRY);
 
-      if (oname!=NULL) g_free(oname);
+      if (oname!=NULL) lives_free(oname);
 
       if (pbr==NULL) {
-	if (pixbuf!=NULL) lives_object_unref(pixbuf);
-	pixbuf=NULL;
+        if (pixbuf!=NULL) lives_object_unref(pixbuf);
+        pixbuf=NULL;
       }
 
-      if (retval==LIVES_CANCEL) return FALSE;
+      if (retval==LIVES_RESPONSE_CANCEL) return FALSE;
 
 
       // another thread may have called check_if_non_virtual - TODO : use a mutex
@@ -367,16 +363,16 @@
       sfile->frame_index[i-1]=-1;
 
       if (update_progress) {
-	// sig_progress...
-	g_snprintf (mainw->msg,256,"%d",progress++);
-	threaded_dialog_spin();
-	lives_widget_context_update();
+        // sig_progress...
+        lives_snprintf(mainw->msg,256,"%d",progress++);
+        threaded_dialog_spin();
+        lives_widget_context_update();
       }
 
       if (mainw->cancelled!=CANCEL_NONE) {
-	if (!check_if_non_virtual(sfileno,1,sfile->frames)) save_frame_index(sfileno);
-	if (pbr!=NULL) *pbr=pixbuf;
-	return TRUE;
+        if (!check_if_non_virtual(sfileno,1,sfile->frames)) save_frame_index(sfileno);
+        if (pbr!=NULL) *pbr=pixbuf;
+        return TRUE;
       }
     }
   }
@@ -391,7 +387,7 @@
 
 
 
-void insert_images_in_virtual (int sfileno, int where, int frames, int *frame_index, int start) {
+void insert_images_in_virtual(int sfileno, int where, int frames, int *frame_index, int start) {
   // insert physical (frames) images (or virtual possibly) into sfile at position where [0 = before first frame]
   // this is the virtual (book-keeping) part
 
@@ -404,24 +400,24 @@
 
   register int i,j=start-1;
 
-  if (sfile->frame_index_back!=NULL) g_free(sfile->frame_index_back);
+  if (sfile->frame_index_back!=NULL) lives_free(sfile->frame_index_back);
 
   sfile->frame_index_back=sfile->frame_index;
   sfile->frame_index=NULL;
 
   create_frame_index(sfileno,FALSE,0,nframes+frames);
 
-  for (i=0;i<where;i++) {
+  for (i=0; i<where; i++) {
     sfile->frame_index[i]=sfile->frame_index_back[i];
   }
 
-  for (i=where;i<where+frames;i++) {
+  for (i=where; i<where+frames; i++) {
     if (frame_index!=NULL&&frame_index[j]!=-1) sfile->frame_index[i]=frame_index[j];
     else sfile->frame_index[i]=-1;
     if (++j>=clipboard->frames) j=0;
   }
 
-  for (i=where+frames;i<nframes+frames;i++) {
+  for (i=where+frames; i<nframes+frames; i++) {
     sfile->frame_index[i]=sfile->frame_index_back[i-frames];
   }
 
@@ -433,7 +429,7 @@
 
 
 
-void delete_frames_from_virtual (int sfileno, int start, int end) {
+void delete_frames_from_virtual(int sfileno, int start, int end) {
   // delete (frames) images from sfile at position start to end
   // this is the virtual (book-keeping) part
 
@@ -445,7 +441,7 @@
   lives_clip_t *sfile=mainw->files[sfileno];
   int nframes=sfile->frames,frames=end-start+1;
 
-  if (sfile->frame_index_back!=NULL) g_free(sfile->frame_index_back);
+  if (sfile->frame_index_back!=NULL) lives_free(sfile->frame_index_back);
 
   sfile->frame_index_back=sfile->frame_index;
   sfile->frame_index=NULL;
@@ -457,11 +453,11 @@
 
   create_frame_index(sfileno,FALSE,0,nframes-frames);
 
-  for (i=0;i<start-1;i++) {
+  for (i=0; i<start-1; i++) {
     sfile->frame_index[i]=sfile->frame_index_back[i];
   }
 
-  for (i=end;i<nframes;i++) {
+  for (i=end; i<nframes; i++) {
     sfile->frame_index[i-frames]=sfile->frame_index_back[i];
   }
   save_frame_index(sfileno);
@@ -476,7 +472,7 @@
 
   if (sfile==NULL||sfile->frame_index==NULL) return;
 
-  for (i=0;i<sfile->frames>>1;i++) {
+  for (i=0; i<sfile->frames>>1; i++) {
     bck=sfile->frame_index[i];
     sfile->frame_index[i]=sfile->frame_index[sfile->frames-1-i];
     sfile->frame_index[sfile->frames-1-i]=bck;
@@ -485,7 +481,7 @@
 
 
 
-void restore_frame_index_back (int sfileno) {
+void restore_frame_index_back(int sfileno) {
   // undo an operation
   // this is the virtual (book-keeping) part
 
@@ -495,7 +491,7 @@
 
   lives_clip_t *sfile=mainw->files[sfileno];
 
-  if (sfile->frame_index!=NULL) g_free(sfile->frame_index);
+  if (sfile->frame_index!=NULL) lives_free(sfile->frame_index);
 
   sfile->frame_index=sfile->frame_index_back;
   sfile->frame_index_back=NULL;
@@ -503,8 +499,7 @@
   if (sfile->frame_index!=NULL) {
     sfile->clip_type=CLIP_TYPE_FILE;
     save_frame_index(sfileno);
-  }
-  else {
+  } else {
     del_frame_index(sfile);
     sfile->clip_type=CLIP_TYPE_DISK;
   }
@@ -513,7 +508,7 @@
 
 
 
-void clean_images_from_virtual (lives_clip_t *sfile, int oldframes) {
+void clean_images_from_virtual(lives_clip_t *sfile, int oldframes) {
   // remove images on disk where the frame_index points to a frame in
   // the original clip
 
@@ -527,25 +522,25 @@
   // should be threadsafe
 
   register int i;
-  gchar *iname=NULL,*com;
+  char *iname=NULL,*com;
 
   if (sfile==NULL||sfile->frame_index==NULL) return;
 
-  for (i=0;i<oldframes;i++) {
+  for (i=0; i<oldframes; i++) {
     threaded_dialog_spin();
     lives_widget_context_update();
     threaded_dialog_spin();
 
     if ((i<sfile->frames&&sfile->frame_index[i]!=-1)||i>=sfile->frames) {
-      iname=g_strdup_printf("%s/%s/%08d.%s",prefs->tmpdir,sfile->handle,i,get_image_ext_for_type(sfile->img_type));
+      iname=lives_strdup_printf("%s/%s/%08d.%s",prefs->tmpdir,sfile->handle,i,get_image_ext_for_type(sfile->img_type));
 
 #ifndef IS_MINGW
-      com=g_strdup_printf("/bin/rm -f \"%s\"",iname);
+      com=lives_strdup_printf("%s -f \"%s\"",capable->rm_cmd,iname);
 #else
-      com=g_strdup_printf("rm.exe -f \"%s\"",iname);
+      com=lives_strdup_printf("rm.exe -f \"%s\"",iname);
 #endif
       lives_system(com,FALSE);
-      g_free(com);
+      lives_free(com);
     }
   }
 }
@@ -558,10 +553,10 @@
 
   // start at frame offset
 
-  int *findexc=(int *)g_malloc(sizint*nframes);
+  int *findexc=(int *)lives_malloc(sizint*nframes);
   register int i;
 
-  for (i=0;i<nframes;i++) findexc[i]=findex[i+offset];
+  for (i=0; i<nframes; i++) findexc[i]=findex[i+offset];
 
   return findexc;
 }

LiVES-2.2.8.tar.bz2/src/cvirtual.h -> LiVES-2.4.1.tar.bz2/src/cvirtual.h Changed

@@ -17,15 +17,15 @@
 boolean check_clip_integrity(int fileno, const lives_clip_data_t *cdata);
 
 boolean virtual_to_images(int sfileno, int sframe, int eframe, boolean update_progress, LiVESPixbuf **pbr) WARN_UNUSED;
-void delete_frames_from_virtual (int sfileno, int start, int end);
-void insert_images_in_virtual (int sfileno, int where, int frames, int *frame_index, int start);
+void delete_frames_from_virtual(int sfileno, int start, int end);
+void insert_images_in_virtual(int sfileno, int where, int frames, int *frame_index, int start);
 void del_frame_index(lives_clip_t *sfile);
 void reverse_frame_index(int sfileno);
-void clean_images_from_virtual (lives_clip_t *sfile, int oldframes);
+void clean_images_from_virtual(lives_clip_t *sfile, int oldframes);
 int *frame_index_copy(int *findex, int nframes, int offset);
 boolean check_if_non_virtual(int fileno, int start, int end);
 
-void restore_frame_index_back (int sfileno);
+void restore_frame_index_back(int sfileno);
 
 boolean is_virtual_frame(int sfileno, int frame);

LiVES-2.2.8.tar.bz2/src/dialogs.c -> LiVES-2.4.1.tar.bz2/src/dialogs.c Changed

@@ -19,7 +19,7 @@
 #include "paramwindow.h"
 #include "ce_thumbs.h"
 
-extern void reset_frame_and_clip_index (void);
+extern void reset_frame_and_clip_index(void);
 
 
 // processing
@@ -44,20 +44,19 @@
 
 static volatile boolean dlg_thread_ready=FALSE;
 
-void on_warn_mask_toggled (LiVESToggleButton *togglebutton, gpointer user_data) {
+void on_warn_mask_toggled(LiVESToggleButton *togglebutton, livespointer user_data) {
   LiVESWidget *tbutton;
 
-  if (lives_toggle_button_get_active(togglebutton)) prefs->warning_mask|=GPOINTER_TO_INT(user_data);
-  else prefs->warning_mask^=GPOINTER_TO_INT(user_data);
+  if (lives_toggle_button_get_active(togglebutton)) prefs->warning_mask|=LIVES_POINTER_TO_INT(user_data);
+  else prefs->warning_mask^=LIVES_POINTER_TO_INT(user_data);
   set_int_pref("lives_warning_mask",prefs->warning_mask);
 
-  if ((tbutton=(LiVESWidget *)g_object_get_data(G_OBJECT(togglebutton),"auto"))!=NULL) {
+  if ((tbutton=(LiVESWidget *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(togglebutton),"auto"))!=NULL) {
     // this is for the cds window - disable autoreload if we are not gonna show this window
     if (lives_toggle_button_get_active(togglebutton)) {
       lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(tbutton),FALSE);
       lives_widget_set_sensitive(tbutton,FALSE);
-    }
-    else {
+    } else {
       lives_widget_set_sensitive(tbutton,TRUE);
     }
   }
@@ -72,11 +71,11 @@
   LiVESWidget *expander=lives_expander_new_with_mnemonic(_("Show affected _layouts"));
   LiVESWidget *textview=lives_text_view_new();
   LiVESWidget *label;
-  GList *xlist=mainw->xlays;
-  LiVESTextBuffer *textbuffer = lives_text_view_get_buffer (LIVES_TEXT_VIEW (textview));
-  
-  lives_text_view_set_editable (LIVES_TEXT_VIEW (textview), FALSE);
-  lives_container_add (LIVES_CONTAINER (expander), textview);
+  LiVESList *xlist=mainw->xlays;
+  LiVESTextBuffer *textbuffer = lives_text_view_get_buffer(LIVES_TEXT_VIEW(textview));
+
+  lives_text_view_set_editable(LIVES_TEXT_VIEW(textview), FALSE);
+  lives_container_add(LIVES_CONTAINER(expander), textview);
 
   if (palette->style&STYLE_1) {
     label=lives_expander_get_label_widget(LIVES_EXPANDER(expander));
@@ -90,14 +89,14 @@
   }
 
   lives_text_buffer_insert_at_cursor(textbuffer,"\n",strlen("\n"));
-  
+
   while (xlist!=NULL) {
-    lives_text_buffer_insert_at_cursor(textbuffer,(const gchar *)xlist->data,strlen((char *)xlist->data));
+    lives_text_buffer_insert_at_cursor(textbuffer,(const char *)xlist->data,strlen((char *)xlist->data));
     lives_text_buffer_insert_at_cursor(textbuffer,"\n",strlen("\n"));
     xlist=xlist->next;
   }
 
-  lives_box_pack_start (box, expander, FALSE, FALSE, widget_opts.packing_height);
+  lives_box_pack_start(box, expander, FALSE, FALSE, widget_opts.packing_height);
   lives_widget_show_all(expander);
 }
 
@@ -106,34 +105,34 @@
 
 
 
-void add_warn_check (LiVESBox *box, int warn_mask_number) {
+void add_warn_check(LiVESBox *box, int warn_mask_number) {
   LiVESWidget *checkbutton;
-  LiVESWidget *hbox=lives_hbox_new (FALSE, 0);
+  LiVESWidget *hbox=lives_hbox_new(FALSE, 0);
 
-  checkbutton=lives_standard_check_button_new (
-					       _("Do _not show this warning any more\n(can be turned back on from Preferences/Warnings)"),
-					       TRUE,LIVES_BOX(box),NULL);
+  checkbutton=lives_standard_check_button_new(
+                _("Do _not show this warning any more\n(can be turned back on from Preferences/Warnings)"),
+                TRUE,LIVES_BOX(box),NULL);
 
   lives_widget_show_all(hbox);
- 
-  lives_signal_connect (LIVES_GUI_OBJECT (checkbutton), LIVES_WIDGET_TOGGLED_EVENT,
-		    LIVES_GUI_CALLBACK (on_warn_mask_toggled),
-                      GINT_TO_POINTER(warn_mask_number));
+
+  lives_signal_connect(LIVES_GUI_OBJECT(checkbutton), LIVES_WIDGET_TOGGLED_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_warn_mask_toggled),
+                       LIVES_INT_TO_POINTER(warn_mask_number));
 }
 
 
-static void add_clear_ds_button(LiVESDialog* dialog) {
-  LiVESWidget *button = lives_button_new_from_stock (LIVES_STOCK_CLEAR);
+static void add_clear_ds_button(LiVESDialog *dialog) {
+  LiVESWidget *button = lives_button_new_from_stock(LIVES_STOCK_CLEAR);
 
   lives_button_set_label(LIVES_BUTTON(button),_("_Recover disk space"));
   if (mainw->tried_ds_recover) lives_widget_set_sensitive(button,FALSE);
 
-  lives_signal_connect (LIVES_GUI_OBJECT (button), LIVES_WIDGET_CLICKED_EVENT,
-		    LIVES_GUI_CALLBACK (on_cleardisk_activate),
-		    (gpointer)button);
+  lives_signal_connect(LIVES_GUI_OBJECT(button), LIVES_WIDGET_CLICKED_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_cleardisk_activate),
+                       (livespointer)button);
 
   lives_widget_show(button);
-  lives_dialog_add_action_widget (dialog, button, LIVES_RETRY);
+  lives_dialog_add_action_widget(dialog, button, LIVES_RESPONSE_RETRY);
 
 }
 
@@ -141,16 +140,16 @@
 static void add_clear_ds_adv(LiVESBox *box) {
   // add a button which opens up  Recover/Repair widget
   LiVESWidget *button = lives_button_new_with_mnemonic(_(" _Advanced Settings >>"));
-  LiVESWidget *hbox = lives_hbox_new (FALSE, 0);
+  LiVESWidget *hbox = lives_hbox_new(FALSE, 0);
 
-  lives_box_pack_start (LIVES_BOX(hbox), button, FALSE, FALSE, widget_opts.packing_width*2);
-  lives_box_pack_start (box, hbox, FALSE, FALSE, widget_opts.packing_height);
+  lives_box_pack_start(LIVES_BOX(hbox), button, FALSE, FALSE, widget_opts.packing_width*2);
+  lives_box_pack_start(box, hbox, FALSE, FALSE, widget_opts.packing_height);
 
   lives_widget_show_all(hbox);
 
-  lives_signal_connect (LIVES_GUI_OBJECT (button), LIVES_WIDGET_CLICKED_EVENT,
-		    LIVES_GUI_CALLBACK (on_cleardisk_advanced_clicked),
-		    NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(button), LIVES_WIDGET_CLICKED_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_cleardisk_advanced_clicked),
+                       NULL);
 
 }
 
@@ -159,66 +158,103 @@
 
 
 //Warning or yes/no dialog
-static LiVESWidget* create_warn_dialog (int warn_mask_number, LiVESWindow *transient, const gchar *text, lives_dialog_t diat) {
+
+// the type of message box here is with 2 or more buttons (e.g. OK/CANCEL, YES/NO, ABORT/CANCEL/RETRY)
+// if a single OK button is needed, use create_info_error_dialog() in inteface.c instead
+
+LiVESWidget *create_message_dialog(lives_dialog_t diat, const char *text, LiVESWindow *transient,
+                                   int warn_mask_number, boolean is_blocking) {
   LiVESWidget *dialog;
   LiVESWidget *dialog_vbox;
   LiVESWidget *dialog_action_area;
-  LiVESWidget *warning_label;
-  LiVESWidget *warning_cancelbutton=NULL;
-  LiVESWidget *warning_okbutton=NULL;
+  LiVESWidget *label;
+  LiVESWidget *cancelbutton=NULL;
+  LiVESWidget *okbutton=NULL;
   LiVESWidget *abortbutton=NULL;
 
-  LiVESAccelGroup *accel_group=LIVES_ACCEL_GROUP(lives_accel_group_new ());
+  LiVESAccelGroup *accel_group=LIVES_ACCEL_GROUP(lives_accel_group_new());
 
-  gchar *textx;
+  char *textx,*form_text,*pad;
 
   switch (diat) {
   case LIVES_DIALOG_WARN:
-    dialog = gtk_message_dialog_new (transient,(GtkDialogFlags)0,GTK_MESSAGE_WARNING,GTK_BUTTONS_NONE,NULL);
+    dialog = lives_message_dialog_new(NULL,(LiVESDialogFlags)0,
+                                      LIVES_MESSAGE_WARNING,LIVES_BUTTONS_NONE,NULL);
+    lives_window_set_title(LIVES_WINDOW(dialog), _("LiVES: - Warning !"));
+    okbutton = lives_button_new_from_stock(LIVES_STOCK_OK);
+    lives_dialog_add_action_widget(LIVES_DIALOG(dialog), okbutton, LIVES_RESPONSE_OK);
+    lives_signal_connect(LIVES_GUI_OBJECT(okbutton), LIVES_WIDGET_CLICKED_SIGNAL,
+                         LIVES_GUI_CALLBACK(lives_general_button_clicked),
+                         NULL);
+
+    break;
+  case LIVES_DIALOG_ERROR:
+    dialog = lives_message_dialog_new(NULL,(LiVESDialogFlags)0,
+                                      LIVES_MESSAGE_ERROR,LIVES_BUTTONS_NONE,NULL);
+    lives_window_set_title(LIVES_WINDOW(dialog), _("LiVES: - Error !"));
+    okbutton = lives_button_new_from_stock(LIVES_STOCK_OK);
+    lives_dialog_add_action_widget(LIVES_DIALOG(dialog), okbutton, LIVES_RESPONSE_OK);
+    lives_signal_connect(LIVES_GUI_OBJECT(okbutton), LIVES_WIDGET_CLICKED_SIGNAL,
+                         LIVES_GUI_CALLBACK(lives_general_button_clicked),
+                         NULL);
+    break;
+  case LIVES_DIALOG_INFO:
+    dialog = lives_message_dialog_new(NULL,(LiVESDialogFlags)0,
+                                      LIVES_MESSAGE_INFO,LIVES_BUTTONS_NONE,NULL);
+    lives_window_set_title(LIVES_WINDOW(dialog), _("LiVES: - Information"));
+    okbutton = lives_button_new_from_stock(LIVES_STOCK_OK);
+    lives_dialog_add_action_widget(LIVES_DIALOG(dialog), okbutton, LIVES_RESPONSE_OK);
+    lives_signal_connect(LIVES_GUI_OBJECT(okbutton), LIVES_WIDGET_CLICKED_SIGNAL,
+                         LIVES_GUI_CALLBACK(lives_general_button_clicked),
+                         NULL);
+    break;
+
+
+  case LIVES_DIALOG_WARN_WITH_CANCEL:
+    dialog = lives_message_dialog_new(transient,(LiVESDialogFlags)0,LIVES_MESSAGE_WARNING,LIVES_BUTTONS_NONE,NULL);
 
     if (mainw->add_clear_ds_button) {
       mainw->add_clear_ds_button=FALSE;
       add_clear_ds_button(LIVES_DIALOG(dialog));
     }
 
-    lives_window_set_title (LIVES_WINDOW (dialog), _("LiVES: - Warning !"));
-    widget_opts.justify=LIVES_JUSTIFY_CENTER;
-    widget_opts.justify=LIVES_JUSTIFY_DEFAULT;
-    warning_cancelbutton = lives_button_new_from_stock (LIVES_STOCK_LABEL_CANCEL);
-    lives_dialog_add_action_widget (LIVES_DIALOG (dialog), warning_cancelbutton, LIVES_RESPONSE_CANCEL);
-    warning_okbutton = lives_button_new_from_stock (LIVES_STOCK_LABEL_OK);
-    lives_dialog_add_action_widget (LIVES_DIALOG (dialog), warning_okbutton, LIVES_RESPONSE_OK);
+    lives_window_set_title(LIVES_WINDOW(dialog), _("LiVES: - Warning !"));
+    cancelbutton = lives_button_new_from_stock(LIVES_STOCK_LABEL_CANCEL);
+    lives_dialog_add_action_widget(LIVES_DIALOG(dialog), cancelbutton, LIVES_RESPONSE_CANCEL);
+    okbutton = lives_button_new_from_stock(LIVES_STOCK_LABEL_OK);
+    lives_dialog_add_action_widget(LIVES_DIALOG(dialog), okbutton, LIVES_RESPONSE_OK);
     break;
+
   case LIVES_DIALOG_YESNO:
-    dialog = gtk_message_dialog_new (transient,(GtkDialogFlags)0,GTK_MESSAGE_QUESTION,GTK_BUTTONS_NONE,NULL);
-    lives_window_set_title (LIVES_WINDOW (dialog), _("LiVES: - Question"));
-    widget_opts.justify=LIVES_JUSTIFY_CENTER;
-    widget_opts.justify=LIVES_JUSTIFY_DEFAULT;
-    warning_cancelbutton = lives_button_new_from_stock (LIVES_STOCK_NO);
-    lives_dialog_add_action_widget (LIVES_DIALOG (dialog), warning_cancelbutton, LIVES_NO);
-    warning_okbutton = lives_button_new_from_stock (LIVES_STOCK_YES);
-    lives_dialog_add_action_widget (LIVES_DIALOG (dialog), warning_okbutton, LIVES_YES);
+    dialog = lives_message_dialog_new(transient,(LiVESDialogFlags)0,LIVES_MESSAGE_QUESTION,LIVES_BUTTONS_NONE,NULL);
+    lives_window_set_title(LIVES_WINDOW(dialog), _("LiVES: - Question"));
+    cancelbutton = lives_button_new_from_stock(LIVES_STOCK_NO);
+    lives_dialog_add_action_widget(LIVES_DIALOG(dialog), cancelbutton, LIVES_RESPONSE_NO);
+    okbutton = lives_button_new_from_stock(LIVES_STOCK_YES);
+    lives_dialog_add_action_widget(LIVES_DIALOG(dialog), okbutton, LIVES_RESPONSE_YES);
     break;
+
   case LIVES_DIALOG_ABORT_CANCEL_RETRY:
-    dialog = gtk_message_dialog_new (transient,(GtkDialogFlags)0,GTK_MESSAGE_ERROR,GTK_BUTTONS_NONE,NULL);
-    lives_window_set_title (LIVES_WINDOW (dialog), _("LiVES: - File Error"));
-    widget_opts.justify=LIVES_JUSTIFY_CENTER;
-    widget_opts.justify=LIVES_JUSTIFY_DEFAULT;
-    abortbutton = lives_button_new_from_stock (LIVES_STOCK_QUIT);
+    dialog = lives_message_dialog_new(transient,(LiVESDialogFlags)0,LIVES_MESSAGE_ERROR,LIVES_BUTTONS_NONE,NULL);
+    lives_window_set_title(LIVES_WINDOW(dialog), _("LiVES: - File Error"));
+    abortbutton = lives_button_new_from_stock(LIVES_STOCK_QUIT);
     lives_button_set_label(LIVES_BUTTON(abortbutton),_("_Abort"));
-    lives_dialog_add_action_widget (LIVES_DIALOG (dialog), abortbutton, LIVES_ABORT);
-    warning_cancelbutton = lives_button_new_from_stock (LIVES_STOCK_CANCEL);
-    lives_dialog_add_action_widget (LIVES_DIALOG (dialog), warning_cancelbutton, LIVES_CANCEL);
-    warning_okbutton = lives_button_new_from_stock (LIVES_STOCK_REFRESH);
-    lives_button_set_label(LIVES_BUTTON(warning_okbutton),_("_Retry"));
-    lives_dialog_add_action_widget (LIVES_DIALOG (dialog), warning_okbutton, LIVES_RETRY);
+    lives_dialog_add_action_widget(LIVES_DIALOG(dialog), abortbutton, LIVES_RESPONSE_ABORT);
+    cancelbutton = lives_button_new_from_stock(LIVES_STOCK_CANCEL);
+    lives_dialog_add_action_widget(LIVES_DIALOG(dialog), cancelbutton, LIVES_RESPONSE_CANCEL);
+    okbutton = lives_button_new_from_stock(LIVES_STOCK_REFRESH);
+    lives_button_set_label(LIVES_BUTTON(okbutton),_("_Retry"));
+    lives_dialog_add_action_widget(LIVES_DIALOG(dialog), okbutton, LIVES_RESPONSE_RETRY);
     break;
+
   default:
     return NULL;
     break;
   }
 
-  lives_window_add_accel_group (LIVES_WINDOW (dialog), accel_group);
+  lives_window_set_default_size(LIVES_WINDOW(dialog), MIN_MSGBOX_WIDTH, -1);
+
+  lives_window_add_accel_group(LIVES_WINDOW(dialog), accel_group);
 
   if (widget_opts.apply_theme&&(palette->style&STYLE_1)) {
     lives_dialog_set_has_separator(LIVES_DIALOG(dialog),FALSE);
@@ -226,19 +262,32 @@
   }
 
   lives_window_set_deletable(LIVES_WINDOW(dialog), FALSE);
-  lives_window_set_resizable (LIVES_WINDOW (dialog), FALSE);
+  lives_window_set_resizable(LIVES_WINDOW(dialog), FALSE);
 
-  lives_container_set_border_width (LIVES_CONTAINER (dialog), widget_opts.border_width*2);
+  lives_container_set_border_width(LIVES_CONTAINER(dialog), widget_opts.border_width*2);
 
   textx=insert_newlines(text,MAX_MSG_WIDTH_CHARS);
-  warning_label=lives_standard_label_new(textx);
 
-  g_free(textx);
+  pad=lives_strdup("");
+  if (strlen(textx) < MIN_MSG_WIDTH_CHARS) {
+    lives_free(pad);
+    pad=lives_strndup("                                  ",(MIN_MSG_WIDTH_CHARS-strlen(textx))/2);
+  }
+  form_text=lives_strdup_printf("\n%s%s%s\n",pad,textx,pad);
+
+  widget_opts.justify=LIVES_JUSTIFY_CENTER;
+  label=lives_standard_label_new(form_text);
+  widget_opts.justify=LIVES_JUSTIFY_DEFAULT;
+
+  lives_free(form_text);
+  lives_free(textx);
+  lives_free(pad);
 
   dialog_vbox = lives_dialog_get_content_area(LIVES_DIALOG(dialog));
+  lives_container_set_border_width(LIVES_CONTAINER(dialog_vbox), widget_opts.border_width*2);
 
-  lives_box_pack_start (LIVES_BOX (dialog_vbox), warning_label, TRUE, TRUE, 0);
-  lives_label_set_selectable (LIVES_LABEL (warning_label), TRUE);
+  lives_box_pack_start(LIVES_BOX(dialog_vbox), label, TRUE, TRUE, 0);
+  lives_label_set_selectable(LIVES_LABEL(label), TRUE);
 
   if (mainw->add_clear_ds_adv) {
     mainw->add_clear_ds_adv=FALSE;
@@ -253,44 +302,57 @@
     add_xlays_widget(LIVES_BOX(dialog_vbox));
   }
 
-  dialog_action_area = lives_dialog_get_action_area(LIVES_DIALOG (dialog));
+  if (mainw->iochan!=NULL) {
+    LiVESWidget *details_button = lives_button_new_with_mnemonic(_("Show _Details"));
+    lives_dialog_add_action_widget(LIVES_DIALOG(dialog), details_button, LIVES_RESPONSE_SHOW_DETAILS);
+
+    lives_signal_connect(LIVES_GUI_OBJECT(details_button), LIVES_WIDGET_CLICKED_SIGNAL,
+                         LIVES_GUI_CALLBACK(lives_general_button_clicked),
+                         NULL);
+  }
 
-  lives_button_box_set_layout (LIVES_BUTTON_BOX (dialog_action_area), LIVES_BUTTONBOX_END);
+  dialog_action_area = lives_dialog_get_action_area(LIVES_DIALOG(dialog));
 
-  lives_widget_set_can_focus_and_default (warning_cancelbutton);
+  lives_button_box_set_layout(LIVES_BUTTON_BOX(dialog_action_area), LIVES_BUTTONBOX_END);
 
-  lives_widget_add_accelerator (warning_cancelbutton, LIVES_WIDGET_CLICKED_EVENT, accel_group,
-			      LIVES_KEY_Escape, (LiVESXModifierType)0, (LiVESAccelFlags)0);
+  if (cancelbutton != NULL) {
+    lives_widget_set_can_focus(cancelbutton,TRUE);
+    lives_widget_add_accelerator(cancelbutton, LIVES_WIDGET_CLICKED_SIGNAL, accel_group,
+                                 LIVES_KEY_Escape, (LiVESXModifierType)0, (LiVESAccelFlags)0);
+  }
 
-  lives_widget_add_accelerator (warning_okbutton, LIVES_WIDGET_CLICKED_EVENT, accel_group,
-			      LIVES_KEY_Return, (LiVESXModifierType)0, (LiVESAccelFlags)0);
+  lives_widget_add_accelerator(okbutton, LIVES_WIDGET_CLICKED_SIGNAL, accel_group,
+                               LIVES_KEY_Return, (LiVESXModifierType)0, (LiVESAccelFlags)0);
 
-  lives_widget_set_can_focus_and_default (warning_okbutton);
-  lives_widget_grab_default (warning_okbutton);
+  if (mainw->iochan==NULL) {
+    lives_widget_set_can_focus_and_default(okbutton);
+    lives_widget_grab_default(okbutton);
+    lives_widget_grab_focus(okbutton);
+  }
 
   lives_widget_show_all(dialog);
 
   lives_window_center(LIVES_WINDOW(dialog));
 
-  lives_window_set_modal (LIVES_WINDOW (dialog), TRUE);
+  if (is_blocking)
+    lives_window_set_modal(LIVES_WINDOW(dialog), TRUE);
 
   if (prefs->present) {
-    lives_window_present (LIVES_WINDOW (dialog));
-    lives_xwindow_raise (lives_widget_get_xwindow(dialog));
+    lives_window_present(LIVES_WINDOW(dialog));
+    lives_xwindow_raise(lives_widget_get_xwindow(dialog));
   }
 
-
   return dialog;
 }
 
 
 
-boolean do_warning_dialog(const gchar *text) {
+boolean do_warning_dialog(const char *text) {
   return do_warning_dialog_with_check(text, 0);
 }
 
 
-boolean do_warning_dialog_with_check (const gchar *text, int warn_mask_number) {
+boolean do_warning_dialog_with_check(const char *text, int warn_mask_number) {
   if (!prefs->show_gui) {
     return do_warning_dialog_with_check_transient(text,warn_mask_number,NULL);
   } else {
@@ -302,7 +364,7 @@
 }
 
 
-boolean do_yesno_dialog_with_check (const gchar *text, int warn_mask_number) {
+boolean do_yesno_dialog_with_check(const char *text, int warn_mask_number) {
   if (!prefs->show_gui) {
     return do_yesno_dialog_with_check_transient(text,warn_mask_number,NULL);
   } else {
@@ -315,64 +377,62 @@
 
 
 
-boolean do_warning_dialog_with_check_transient(const gchar *text, int warn_mask_number, LiVESWindow *transient) {
+boolean do_warning_dialog_with_check_transient(const char *text, int warn_mask_number, LiVESWindow *transient) {
   // show OK/CANCEL, returns FALSE if cancelled
   LiVESWidget *warning;
   int response=1;
-  gchar *mytext;
+  char *mytext;
 
   if (prefs->warning_mask&warn_mask_number) {
     return TRUE;
   }
 
-  mytext=g_strdup(text); // must copy this because of translation issues
+  mytext=lives_strdup(text); // must copy this because of translation issues
 
   do {
-    warning=create_warn_dialog(warn_mask_number,transient,mytext,LIVES_DIALOG_WARN);
-    lives_widget_show(warning);
-    response=lives_dialog_run (LIVES_DIALOG (warning));
-    lives_widget_destroy (warning);
-  } while (response==LIVES_RETRY);
+    warning=create_message_dialog(LIVES_DIALOG_WARN_WITH_CANCEL,mytext,transient,warn_mask_number,TRUE);
+    response=lives_dialog_run(LIVES_DIALOG(warning));
+    lives_widget_destroy(warning);
+  } while (response==LIVES_RESPONSE_RETRY);
 
   lives_widget_context_update();
-  if (mytext!=NULL) g_free(mytext);
+  if (mytext!=NULL) lives_free(mytext);
 
   return (response==LIVES_RESPONSE_OK);
 }
 
 
 
-boolean do_yesno_dialog_with_check_transient(const gchar *text, int warn_mask_number, LiVESWindow *transient) {
+boolean do_yesno_dialog_with_check_transient(const char *text, int warn_mask_number, LiVESWindow *transient) {
   // show YES/NO, returns TRUE for YES
   LiVESWidget *warning;
   int response=1;
-  gchar *mytext;
+  char *mytext;
 
   if (prefs->warning_mask&warn_mask_number) {
     return TRUE;
   }
 
-  mytext=g_strdup(text); // must copy this because of translation issues
+  mytext=lives_strdup(text); // must copy this because of translation issues
 
   do {
-    warning=create_warn_dialog(warn_mask_number,transient,mytext,LIVES_DIALOG_YESNO);
-    lives_widget_show(warning);
-    response=lives_dialog_run (LIVES_DIALOG (warning));
-    lives_widget_destroy (warning);
-  } while (response==LIVES_RETRY);
+    warning=create_message_dialog(LIVES_DIALOG_YESNO,mytext,transient,warn_mask_number,TRUE);
+    response=lives_dialog_run(LIVES_DIALOG(warning));
+    lives_widget_destroy(warning);
+  } while (response==LIVES_RESPONSE_RETRY);
 
   lives_widget_context_update();
-  if (mytext!=NULL) g_free(mytext);
+  if (mytext!=NULL) lives_free(mytext);
 
-  return (response==LIVES_YES);
+  return (response==LIVES_RESPONSE_YES);
 }
 
 
-boolean do_yesno_dialog(const gchar *text) {
+boolean do_yesno_dialog(const char *text) {
   // show Yes/No, returns TRUE if Yes
   LiVESWidget *warning;
   int response;
-  gchar *mytext;
+  char *mytext;
   LiVESWindow *transient=NULL;
 
   if (prefs->show_gui) {
@@ -380,23 +440,23 @@
     else if (mainw->multitrack!=NULL&&mainw->multitrack->is_ready) transient=LIVES_WINDOW(mainw->multitrack->window);
   }
 
-  mytext=g_strdup(text); // translation issues
-  warning=create_warn_dialog(0,transient,mytext,LIVES_DIALOG_YESNO);
-  if (mytext!=NULL) g_free(mytext);
+  mytext=lives_strdup(text); // translation issues
+  warning=create_message_dialog(LIVES_DIALOG_YESNO,mytext,transient,0,TRUE);
+  if (mytext!=NULL) lives_free(mytext);
 
-  response=lives_dialog_run (LIVES_DIALOG (warning));
-  lives_widget_destroy (warning);
+  response=lives_dialog_run(LIVES_DIALOG(warning));
+  lives_widget_destroy(warning);
 
   lives_widget_context_update();
-  return (response==LIVES_YES);
+  return (response==LIVES_RESPONSE_YES);
 }
 
 
 
-// returns LIVES_CANCEL or LIVES_RETRY
-int do_abort_cancel_retry_dialog(const gchar *text, LiVESWindow *transient) {
+// returns LIVES_RESPONSE_CANCEL or LIVES_RESPONSE_RETRY
+int do_abort_cancel_retry_dialog(const char *text, LiVESWindow *transient) {
   int response;
-  gchar *mytext;
+  char *mytext;
   LiVESWidget *warning;
 
   if (!prefs->show_gui) {
@@ -408,50 +468,50 @@
     }
   }
 
-  mytext=g_strdup(text); // translation issues
+  mytext=lives_strdup(text); // translation issues
 
   do {
-    warning=create_warn_dialog(0,transient,mytext,LIVES_DIALOG_ABORT_CANCEL_RETRY);
+    warning=create_message_dialog(LIVES_DIALOG_ABORT_CANCEL_RETRY,mytext,transient,0,TRUE);
 
-    response=lives_dialog_run (LIVES_DIALOG (warning));
-    lives_widget_destroy (warning);
+    response=lives_dialog_run(LIVES_DIALOG(warning));
+    lives_widget_destroy(warning);
 
     lives_widget_context_update();
 
-    if (response==LIVES_ABORT) {
+    if (response==LIVES_RESPONSE_ABORT) {
       if (do_abort_check()) {
-	if (mainw->current_file>-1) {
-	  if (cfile->handle!=NULL) {
-	    gchar *com;
-	    // stop any processing processing
+        if (mainw->current_file>-1) {
+          if (cfile->handle!=NULL) {
+            char *com;
+            // stop any processing processing
 #ifndef IS_MINGW
-	    com=g_strdup_printf("%s stopsubsub \"%s\" 2>/dev/null",prefs->backend_sync,cfile->handle);
-	    lives_system(com,TRUE);
+            com=lives_strdup_printf("%s stopsubsub \"%s\" 2>/dev/null",prefs->backend_sync,cfile->handle);
+            lives_system(com,TRUE);
 #else
-	    // get pid from backend
-	    FILE *rfile;
-	    ssize_t rlen;
-	    char val[16];
-	    int pid;
-	    com=g_strdup_printf("%s get_pid_for_handle \"%s\"",prefs->backend_sync,cfile->handle);
-	    rfile=popen(com,"r");
-	    rlen=fread(val,1,16,rfile);
-	    pclose(rfile);
-	    memset(val+rlen,0,1);
-	    pid=atoi(val);
-	    
-	    lives_win32_kill_subprocesses(pid,TRUE);
-#endif
-	    g_free(com);
-	  }
-	}
-	exit(1);
+            // get pid from backend
+            FILE *rfile;
+            ssize_t rlen;
+            char val[16];
+            int pid;
+            com=lives_strdup_printf("%s get_pid_for_handle \"%s\"",prefs->backend_sync,cfile->handle);
+            rfile=popen(com,"r");
+            rlen=fread(val,1,16,rfile);
+            pclose(rfile);
+            memset(val+rlen,0,1);
+            pid=atoi(val);
+
+            lives_win32_kill_subprocesses(pid,TRUE);
+#endif
+            lives_free(com);
+          }
+        }
+        exit(1);
       }
     }
 
-  } while (response==LIVES_ABORT);
+  } while (response==LIVES_RESPONSE_ABORT);
 
-  if (mytext!=NULL) g_free(mytext);
+  if (mytext!=NULL) lives_free(mytext);
   return response;
 }
 
@@ -459,7 +519,7 @@
 
 
 
-int do_error_dialog(const gchar *text) {
+int do_error_dialog(const char *text) {
   int ret;
 
   // show error box
@@ -467,7 +527,7 @@
     ret=do_error_dialog_with_check_transient(text,FALSE,0,NULL);
   } else {
     if (prefsw!=NULL&&prefsw->prefs_dialog!=NULL) ret=do_error_dialog_with_check_transient(text,FALSE,0,
-											   LIVES_WINDOW(prefsw->prefs_dialog));
+          LIVES_WINDOW(prefsw->prefs_dialog));
     else {
       if (mainw->multitrack==NULL) ret=do_error_dialog_with_check_transient(text,FALSE,0,LIVES_WINDOW(mainw->LiVES));
       else ret=do_error_dialog_with_check_transient(text,FALSE,0,LIVES_WINDOW(mainw->multitrack->window));
@@ -477,7 +537,7 @@
 }
 
 
-int do_info_dialog(const gchar *text) {
+int do_info_dialog(const char *text) {
   // show info box
   int ret;
 
@@ -485,7 +545,7 @@
     ret=do_info_dialog_with_transient(text,FALSE,NULL);
   } else {
     if (prefsw!=NULL&&prefsw->prefs_dialog!=NULL) ret=do_info_dialog_with_transient(text,FALSE,
-										    LIVES_WINDOW(prefsw->prefs_dialog));
+          LIVES_WINDOW(prefsw->prefs_dialog));
     else {
       if (mainw->multitrack==NULL) ret=do_info_dialog_with_transient(text,FALSE,LIVES_WINDOW(mainw->LiVES));
       else ret=do_info_dialog_with_transient(text,FALSE,LIVES_WINDOW(mainw->multitrack->window));
@@ -495,7 +555,7 @@
 }
 
 
-int do_error_dialog_with_check(const gchar *text, int warn_mask_number) {
+int do_error_dialog_with_check(const char *text, int warn_mask_number) {
   // show warning box
   int ret;
 
@@ -509,7 +569,7 @@
 }
 
 
-int do_blocking_error_dialog(const gchar *text) {
+int do_blocking_error_dialog(const char *text) {
   // show error box - blocks until OK is pressed
   int ret;
 
@@ -523,7 +583,7 @@
 }
 
 
-int do_blocking_info_dialog(const gchar *text) {
+int do_blocking_info_dialog(const char *text) {
   // show info box - blocks until OK is pressed
   int ret;
 
@@ -538,22 +598,21 @@
 
 
 
-int do_error_dialog_with_check_transient(const gchar *text, boolean is_blocking, int warn_mask_number, LiVESWindow *transient) {
+int do_error_dialog_with_check_transient(const char *text, boolean is_blocking, int warn_mask_number, LiVESWindow *transient) {
   // show error box
 
   LiVESWidget *err_box;
-  gchar *mytext;
+  char *mytext;
 
   int ret=LIVES_RESPONSE_NONE;
 
   if (prefs->warning_mask&warn_mask_number) return ret;
-  mytext=g_strdup(text);
-  err_box=create_info_error_dialog(mytext,is_blocking,warn_mask_number,warn_mask_number==0?LIVES_INFO_TYPE_ERROR:LIVES_INFO_TYPE_WARNING);
-  if (mytext!=NULL) g_free(mytext);
-  if (transient!=NULL) lives_window_set_transient_for(LIVES_WINDOW(err_box),transient);
+  mytext=lives_strdup(text);
+  err_box=create_info_error_dialog(warn_mask_number==0?LIVES_DIALOG_ERROR:LIVES_DIALOG_WARN,mytext,transient,warn_mask_number,is_blocking);
+  if (mytext!=NULL) lives_free(mytext);
 
   if (is_blocking) {
-    ret=lives_dialog_run(LIVES_DIALOG (err_box));
+    ret=lives_dialog_run(LIVES_DIALOG(err_box));
     if (mainw!=NULL&&mainw->is_ready&&transient!=NULL) {
       lives_widget_queue_draw(LIVES_WIDGET(transient));
     }
@@ -564,72 +623,75 @@
 
 
 
-int do_info_dialog_with_transient(const gchar *text, boolean is_blocking, LiVESWindow *transient) {
+int do_info_dialog_with_transient(const char *text, boolean is_blocking, LiVESWindow *transient) {
   // info box
 
   LiVESWidget *info_box;
-  gchar *mytext;
+  char *mytext;
 
   int ret=LIVES_RESPONSE_NONE;
 
-  mytext=g_strdup(text);
-  info_box=create_info_error_dialog(mytext,is_blocking,0,LIVES_INFO_TYPE_INFO);
-  if (mytext!=NULL) g_free(mytext);
-  if (transient!=NULL) lives_window_set_transient_for(LIVES_WINDOW(info_box),transient);
+  mytext=lives_strdup(text);
+  info_box=create_info_error_dialog(LIVES_DIALOG_INFO,mytext,transient,0,is_blocking);
+  if (mytext!=NULL) lives_free(mytext);
 
   if (is_blocking) {
-    ret=lives_dialog_run(LIVES_DIALOG (info_box));
+    ret=lives_dialog_run(LIVES_DIALOG(info_box));
     if (mainw!=NULL&&mainw->is_ready&&transient!=NULL) {
       lives_widget_queue_draw(LIVES_WIDGET(transient));
     }
   }
+
   return ret;
 }
 
 
 
-gchar *ds_critical_msg(const gchar *dir, uint64_t dsval) {
-  gchar *msg;
-  gchar *msgx;
-  gchar *tmp;
-  gchar *dscr=lives_format_storage_space_string(prefs->ds_crit_level); ///< crit level
-  gchar *dscu=lives_format_storage_space_string(dsval); ///< current level
-  msg=g_strdup_printf(_("FREE SPACE IN THE PARTITION CONTAINING\n%s\nHAS FALLEN BELOW THE CRITICAL LEVEL OF %s\nCURRENT FREE SPACE IS %s\n\n(Disk warning levels can be configured in Preferences.)"),
-		      (tmp=g_filename_to_utf8(dir,-1,NULL,NULL,NULL)),dscr,dscu);
+char *ds_critical_msg(const char *dir, uint64_t dsval) {
+  char *msg;
+  char *msgx;
+  char *tmp;
+  char *dscr=lives_format_storage_space_string(prefs->ds_crit_level); ///< crit level
+  char *dscu=lives_format_storage_space_string(dsval); ///< current level
+  msg=lives_strdup_printf(
+        _("FREE SPACE IN THE PARTITION CONTAINING\n%s\nHAS FALLEN BELOW THE CRITICAL LEVEL OF %s\nCURRENT FREE SPACE IS %s\n\n(Disk warning levels can be configured in Preferences.)"),
+        (tmp=lives_filename_to_utf8(dir,-1,NULL,NULL,NULL)),dscr,dscu);
   msgx=insert_newlines(msg,MAX_MSG_WIDTH_CHARS);
-  g_free(msg);
-  g_free(tmp);
-  g_free(dscr);
-  g_free(dscu);
+  lives_free(msg);
+  lives_free(tmp);
+  lives_free(dscr);
+  lives_free(dscu);
   return msgx;
 }
 
 
-gchar *ds_warning_msg(const gchar *dir, uint64_t dsval, uint64_t cwarn, uint64_t nwarn) {
-  gchar *msg;
-  gchar *msgx;
-  gchar *tmp;
-  gchar *dscw=lives_format_storage_space_string(cwarn); ///< warn level
-  gchar *dscu=lives_format_storage_space_string(dsval); ///< current level
-  gchar *dscn=lives_format_storage_space_string(nwarn); ///< next warn level
-  msg=g_strdup_printf(_("Free space in the partition containing\n%s\nhas fallen below the warning level of %s\nCurrent free space is %s\n\n(Next warning will be shown at %s. Disk warning levels can be configured in Preferences.)"),
-		      (tmp=g_filename_to_utf8(dir,-1,NULL,NULL,NULL)),dscw,dscu,dscn);
+char *ds_warning_msg(const char *dir, uint64_t dsval, uint64_t cwarn, uint64_t nwarn) {
+  char *msg;
+  char *msgx;
+  char *tmp;
+  char *dscw=lives_format_storage_space_string(cwarn); ///< warn level
+  char *dscu=lives_format_storage_space_string(dsval); ///< current level
+  char *dscn=lives_format_storage_space_string(nwarn); ///< next warn level
+  msg=lives_strdup_printf(
+        _("Free space in the partition containing\n%s\nhas fallen below the warning level of %s\nCurrent free space is %s\n\n(Next warning will be shown at %s. Disk warning levels can be configured in Preferences.)"),
+        (tmp=lives_filename_to_utf8(dir,-1,NULL,NULL,NULL)),dscw,dscu,dscn);
   msgx=insert_newlines(msg,MAX_MSG_WIDTH_CHARS);
-  g_free(msg);
-  g_free(dscw);
-  g_free(dscu);
-  g_free(dscn);
+  lives_free(msg);
+  lives_free(dscw);
+  lives_free(dscu);
+  lives_free(dscn);
   return msgx;
 }
 
 
 void do_aud_during_play_error(void) {
   do_error_dialog_with_check_transient(_("Audio players cannot be switched during playback."),
-				       TRUE,0,LIVES_WINDOW(prefsw->prefs_dialog));
-}  
+                                       TRUE,0,LIVES_WINDOW(prefsw->prefs_dialog));
+}
 
-void do_memory_error_dialog (void) {
-  do_error_dialog (_ ("\n\nLiVES was unable to perform this operation due to unsufficient memory.\nPlease try closing some other applications first.\n"));
+void do_memory_error_dialog(void) {
+  do_error_dialog(
+    _("\n\nLiVES was unable to perform this operation due to unsufficient memory.\nPlease try closing some other applications first.\n"));
 }
 
 
@@ -639,59 +701,59 @@
 
   int i;
   int pxstart=1;
-  gchar **array;
-  gchar *addinfo;
+  char **array;
+  char *addinfo;
   int numtok;
 
   if (mainw->cancelled) return; // if the user/system cancelled we can expect errors !
 
-  numtok=get_token_count (mainw->msg,'|');
-  
-  array=g_strsplit(mainw->msg,"|",numtok);
-  
+  numtok=get_token_count(mainw->msg,'|');
+
+  array=lives_strsplit(mainw->msg,"|",numtok);
+
   if (numtok>2 && !strcmp(array[1],"read")) {
     // got read error from backend
     if (numtok>3&&strlen(array[3])) addinfo=array[3];
     else addinfo=NULL;
-    if (mainw->current_file==-1 || cfile==NULL || !cfile->no_proc_read_errors) 
+    if (mainw->current_file==-1 || cfile==NULL || !cfile->no_proc_read_errors)
       do_read_failed_error_s(array[2],addinfo);
     pxstart=3;
     mainw->read_failed=TRUE;
-    mainw->read_failed_file=g_strdup(array[2]);
+    mainw->read_failed_file=lives_strdup(array[2]);
     mainw->cancelled=CANCEL_ERROR;
   }
-  
+
   else if (numtok>2 && !strcmp(array[1],"write")) {
     // got write error from backend
     if (numtok>3&&strlen(array[3])) addinfo=array[3];
     else addinfo=NULL;
-    if (mainw->current_file==-1 || cfile==NULL || !cfile->no_proc_write_errors) 
+    if (mainw->current_file==-1 || cfile==NULL || !cfile->no_proc_write_errors)
       do_write_failed_error_s(array[2],addinfo);
     pxstart=3;
     mainw->write_failed=TRUE;
-    mainw->write_failed_file=g_strdup(array[2]);
+    mainw->write_failed_file=lives_strdup(array[2]);
     mainw->cancelled=CANCEL_ERROR;
   }
-  
-  
+
+
   else if (numtok>3 && !strcmp(array[1],"system")) {
     // got (sub) system error from backend
     if (numtok>4&&strlen(array[4])) addinfo=array[4];
     else addinfo=NULL;
-    if (mainw->current_file==-1 || cfile==NULL || !cfile->no_proc_sys_errors) 
+    if (mainw->current_file==-1 || cfile==NULL || !cfile->no_proc_sys_errors)
       do_system_failed_error(array[2],atoi(array[3]),addinfo);
     pxstart=3;
     mainw->cancelled=CANCEL_ERROR;
   }
-  
+
   // for other types of errors...more info....
   // set mainw->error but not mainw->cancelled
-  g_snprintf(mainw->msg,512,"\n\n");
-  for (i=pxstart;i<numtok;i++) {
-    g_strappend(mainw->msg,512,_(array[i]));
-    g_strappend(mainw->msg,512,"\n");
+  lives_snprintf(mainw->msg,512,"\n\n");
+  for (i=pxstart; i<numtok; i++) {
+    lives_strappend(mainw->msg,512,_(array[i]));
+    lives_strappend(mainw->msg,512,"\n");
   }
-  g_strfreev(array);
+  lives_strfreev(array);
 
   mainw->error=TRUE;
 
@@ -716,25 +778,31 @@
   return TRUE;
 }
 
-void pump_io_chan(GIOChannel *iochan) {
+void pump_io_chan(LiVESIOChannel *iochan) {
   // pump data from stdout to textbuffer
-  GError *gerr=NULL;
-  gchar *str_return=NULL;
-  gsize retlen;
+  char *str_return=NULL;
+  size_t retlen=0;
   LiVESTextBuffer *optextbuf=lives_text_view_get_buffer(mainw->optextview);
 
-  if (!iochan->is_readable) return;
+#ifdef GUI_GTK
+  LiVESError *gerr=NULL;
 
+  if (!iochan->is_readable) return;
   g_io_channel_read_to_end(iochan,&str_return,&retlen,&gerr);
+  if (gerr!=NULL) lives_error_free(gerr);
+#endif
 
-  if (gerr!=NULL) g_error_free(gerr);
-
+#ifdef GUI_QT
+  QByteArray qba = iochan->readAll();
+  str_return = strdup(qba.constData());
+  retlen = strlen(str_return);
+#endif
   if (retlen>0) {
     lives_text_buffer_insert_at_end(optextbuf,str_return);
-    lives_text_view_scroll_onscreen(LIVES_TEXT_VIEW (mainw->optextview));
+    lives_text_view_scroll_onscreen(LIVES_TEXT_VIEW(mainw->optextview));
   }
 
-  if (str_return!=NULL) g_free(str_return);
+  if (str_return!=NULL) lives_free(str_return);
 
 }
 
@@ -748,8 +816,8 @@
 
   lives_storage_status_t ds;
 
-  gchar *msg,*tmp;
-  gchar *pausstr=g_strdup(_("Processing has been paused."));
+  char *msg,*tmp;
+  char *pausstr=lives_strdup(_("Processing has been paused."));
 
   do {
     ds=get_storage_status(prefs->tmpdir,mainw->next_ds_warn_level,&dsval);
@@ -759,52 +827,51 @@
       if (mainw->next_ds_warn_level>(dsval>>1)) mainw->next_ds_warn_level=dsval>>1;
       if (mainw->next_ds_warn_level<prefs->ds_crit_level) mainw->next_ds_warn_level=prefs->ds_crit_level;
       if (is_processing&&sfile!=NULL&&sfile->proc_ptr!=NULL&&!mainw->effects_paused&&
-	  lives_widget_is_visible(sfile->proc_ptr->pause_button)) {
-	on_effects_paused(LIVES_BUTTON(sfile->proc_ptr->pause_button),NULL);
-	did_pause=TRUE;
+          lives_widget_is_visible(sfile->proc_ptr->pause_button)) {
+        on_effects_paused(LIVES_BUTTON(sfile->proc_ptr->pause_button),NULL);
+        did_pause=TRUE;
       }
 
       tmp=ds_warning_msg(prefs->tmpdir,dsval,curr_ds_warn,mainw->next_ds_warn_level);
       if (!did_pause)
-	msg=g_strdup_printf("\n%s\n",tmp);
-      else 
-	msg=g_strdup_printf("\n%s\n%s\n",tmp,pausstr);
-      g_free(tmp);
+        msg=lives_strdup_printf("\n%s\n",tmp);
+      else
+        msg=lives_strdup_printf("\n%s\n%s\n",tmp,pausstr);
+      lives_free(tmp);
       mainw->add_clear_ds_button=TRUE; // gets reset by do_warning_dialog()
       if (!do_warning_dialog(msg)) {
-	g_free(msg);
-	g_free(pausstr);
-	mainw->cancelled=CANCEL_USER;
-	if (is_processing) {
-	  sfile->nokeep=TRUE;
-	  on_cancel_keep_button_clicked(NULL,NULL); // press the cancel button
-	}
-	return FALSE;
+        lives_free(msg);
+        lives_free(pausstr);
+        mainw->cancelled=CANCEL_USER;
+        if (is_processing) {
+          sfile->nokeep=TRUE;
+          on_cancel_keep_button_clicked(NULL,NULL); // press the cancel button
+        }
+        return FALSE;
       }
-      g_free(msg);
-    }
-    else if (ds==LIVES_STORAGE_STATUS_CRITICAL) {
+      lives_free(msg);
+    } else if (ds==LIVES_STORAGE_STATUS_CRITICAL) {
       if (is_processing&&sfile!=NULL&&sfile->proc_ptr!=NULL&&!mainw->effects_paused&&
-	  lives_widget_is_visible(sfile->proc_ptr->pause_button)) {
-	on_effects_paused(LIVES_BUTTON(sfile->proc_ptr->pause_button),NULL);
-	did_pause=TRUE;
+          lives_widget_is_visible(sfile->proc_ptr->pause_button)) {
+        on_effects_paused(LIVES_BUTTON(sfile->proc_ptr->pause_button),NULL);
+        did_pause=TRUE;
       }
       tmp=ds_critical_msg(prefs->tmpdir,dsval);
       if (!did_pause)
-	msg=g_strdup_printf("\n%s\n",tmp);
-      else 
-	msg=g_strdup_printf("\n%s\n%s\n",tmp,pausstr);
-      g_free(tmp);
-        retval=do_abort_cancel_retry_dialog(msg,NULL);
-      g_free(msg);
-      if (retval==LIVES_CANCEL) {
-	if (is_processing) {
-	  sfile->nokeep=TRUE;
-	  on_cancel_keep_button_clicked(NULL,NULL); // press the cancel button
-	}
-	mainw->cancelled=CANCEL_ERROR;
-	g_free(pausstr);
-	return FALSE;
+        msg=lives_strdup_printf("\n%s\n",tmp);
+      else
+        msg=lives_strdup_printf("\n%s\n%s\n",tmp,pausstr);
+      lives_free(tmp);
+      retval=do_abort_cancel_retry_dialog(msg,NULL);
+      lives_free(msg);
+      if (retval==LIVES_RESPONSE_CANCEL) {
+        if (is_processing) {
+          sfile->nokeep=TRUE;
+          on_cancel_keep_button_clicked(NULL,NULL); // press the cancel button
+        }
+        mainw->cancelled=CANCEL_ERROR;
+        lives_free(pausstr);
+        return FALSE;
       }
     }
   } while (ds==LIVES_STORAGE_STATUS_CRITICAL);
@@ -814,59 +881,58 @@
     do {
       ds=get_storage_status(sfile->op_dir,sfile->op_ds_warn_level,&dsval);
       if (ds==LIVES_STORAGE_STATUS_WARNING) {
-	uint64_t curr_ds_warn=sfile->op_ds_warn_level;
-	sfile->op_ds_warn_level>>=1;
-	if (sfile->op_ds_warn_level>(dsval>>1)) sfile->op_ds_warn_level=dsval>>1;
-	if (sfile->op_ds_warn_level<prefs->ds_crit_level) sfile->op_ds_warn_level=prefs->ds_crit_level;
-	if (is_processing&&sfile!=NULL&&sfile->proc_ptr!=NULL&&!mainw->effects_paused&&
-	    lives_widget_is_visible(sfile->proc_ptr->pause_button)) {
-	  on_effects_paused(LIVES_BUTTON(sfile->proc_ptr->pause_button),NULL);
-	  did_pause=TRUE;
-	}
-	tmp=ds_warning_msg(sfile->op_dir,dsval,curr_ds_warn,sfile->op_ds_warn_level);
-	if (!did_pause)
-	  msg=g_strdup_printf("\n%s\n",tmp);
-	else 
-	  msg=g_strdup_printf("\n%s\n%s\n",tmp,pausstr);
-	g_free(tmp);
-	mainw->add_clear_ds_button=TRUE; // gets reset by do_warning_dialog()
-	if (!do_warning_dialog(msg)) {
-	  g_free(msg);
-	  g_free(pausstr);
-	  lives_freep((void**)&sfile->op_dir);
-	  if (is_processing) {
-	    sfile->nokeep=TRUE;
-	    on_cancel_keep_button_clicked(NULL,NULL); // press the cancel button
-	  }
-	  mainw->cancelled=CANCEL_USER;
-	  return FALSE;
-	}
-	g_free(msg);
-      }
-      else if (ds==LIVES_STORAGE_STATUS_CRITICAL) {
-	if (is_processing&&sfile!=NULL&&sfile->proc_ptr!=NULL&&!mainw->effects_paused&&
-	    lives_widget_is_visible(sfile->proc_ptr->pause_button)) {
-	  on_effects_paused(LIVES_BUTTON(sfile->proc_ptr->pause_button),NULL);
-	  did_pause=TRUE;
-	}
-	tmp=ds_critical_msg(sfile->op_dir,dsval);
-	if (!did_pause)
-	  msg=g_strdup_printf("\n%s\n",tmp);
-	else 
-	  msg=g_strdup_printf("\n%s\n%s\n",tmp,pausstr);
-	g_free(tmp);
-	retval=do_abort_cancel_retry_dialog(msg,NULL);
-	g_free(msg);
-	if (retval==LIVES_CANCEL) {
-	  if (is_processing) {
-	    sfile->nokeep=TRUE;
-	    on_cancel_keep_button_clicked(NULL,NULL); // press the cancel button
-	  }
-	  mainw->cancelled=CANCEL_ERROR;
-	  if (sfile!=NULL) lives_freep((void**)&sfile->op_dir);
-	  g_free(pausstr);
-	  return FALSE;
-	}
+        uint64_t curr_ds_warn=sfile->op_ds_warn_level;
+        sfile->op_ds_warn_level>>=1;
+        if (sfile->op_ds_warn_level>(dsval>>1)) sfile->op_ds_warn_level=dsval>>1;
+        if (sfile->op_ds_warn_level<prefs->ds_crit_level) sfile->op_ds_warn_level=prefs->ds_crit_level;
+        if (is_processing&&sfile!=NULL&&sfile->proc_ptr!=NULL&&!mainw->effects_paused&&
+            lives_widget_is_visible(sfile->proc_ptr->pause_button)) {
+          on_effects_paused(LIVES_BUTTON(sfile->proc_ptr->pause_button),NULL);
+          did_pause=TRUE;
+        }
+        tmp=ds_warning_msg(sfile->op_dir,dsval,curr_ds_warn,sfile->op_ds_warn_level);
+        if (!did_pause)
+          msg=lives_strdup_printf("\n%s\n",tmp);
+        else
+          msg=lives_strdup_printf("\n%s\n%s\n",tmp,pausstr);
+        lives_free(tmp);
+        mainw->add_clear_ds_button=TRUE; // gets reset by do_warning_dialog()
+        if (!do_warning_dialog(msg)) {
+          lives_free(msg);
+          lives_free(pausstr);
+          lives_freep((void **)&sfile->op_dir);
+          if (is_processing) {
+            sfile->nokeep=TRUE;
+            on_cancel_keep_button_clicked(NULL,NULL); // press the cancel button
+          }
+          mainw->cancelled=CANCEL_USER;
+          return FALSE;
+        }
+        lives_free(msg);
+      } else if (ds==LIVES_STORAGE_STATUS_CRITICAL) {
+        if (is_processing&&sfile!=NULL&&sfile->proc_ptr!=NULL&&!mainw->effects_paused&&
+            lives_widget_is_visible(sfile->proc_ptr->pause_button)) {
+          on_effects_paused(LIVES_BUTTON(sfile->proc_ptr->pause_button),NULL);
+          did_pause=TRUE;
+        }
+        tmp=ds_critical_msg(sfile->op_dir,dsval);
+        if (!did_pause)
+          msg=lives_strdup_printf("\n%s\n",tmp);
+        else
+          msg=lives_strdup_printf("\n%s\n%s\n",tmp,pausstr);
+        lives_free(tmp);
+        retval=do_abort_cancel_retry_dialog(msg,NULL);
+        lives_free(msg);
+        if (retval==LIVES_RESPONSE_CANCEL) {
+          if (is_processing) {
+            sfile->nokeep=TRUE;
+            on_cancel_keep_button_clicked(NULL,NULL); // press the cancel button
+          }
+          mainw->cancelled=CANCEL_ERROR;
+          if (sfile!=NULL) lives_freep((void **)&sfile->op_dir);
+          lives_free(pausstr);
+          return FALSE;
+        }
       }
     } while (ds==LIVES_STORAGE_STATUS_CRITICAL);
   }
@@ -875,7 +941,7 @@
     on_effects_paused(LIVES_BUTTON(sfile->proc_ptr->pause_button),NULL);
   }
 
-  g_free(pausstr);
+  lives_free(pausstr);
 
   return TRUE;
 }
@@ -888,31 +954,30 @@
     // statistics
     gettimeofday(&tv, NULL);
     mainw->fps_measure/=(double)(U_SECL*(tv.tv_sec-mainw->origsecs)+tv.tv_usec*U_SEC_RATIO-mainw->origusecs*
-				  U_SEC_RATIO-mainw->offsetticks)/U_SEC;
+                                 U_SEC_RATIO-mainw->offsetticks)/U_SEC;
   }
   if (visible) {
-    if (mainw->preview_box!=NULL&&!mainw->preview) lives_widget_set_tooltip_text( mainw->p_playbutton,_ ("Play all"));
+    if (mainw->preview_box!=NULL&&!mainw->preview) lives_widget_set_tooltip_text(mainw->p_playbutton,_("Play all"));
     if (accelerators_swapped) {
-      if (!mainw->preview) lives_widget_set_tooltip_text( mainw->m_playbutton,_ ("Play all"));
-      lives_widget_remove_accelerator (cfile->proc_ptr->preview_button, mainw->accel_group, LIVES_KEY_p, (LiVESXModifierType)0);
-      lives_widget_add_accelerator (mainw->playall, LIVES_WIDGET_ACTIVATE_EVENT, mainw->accel_group, LIVES_KEY_p, (LiVESXModifierType)0, 
-				  LIVES_ACCEL_VISIBLE);
+      if (!mainw->preview) lives_widget_set_tooltip_text(mainw->m_playbutton,_("Play all"));
+      lives_widget_remove_accelerator(cfile->proc_ptr->preview_button, mainw->accel_group, LIVES_KEY_p, (LiVESXModifierType)0);
+      lives_widget_add_accelerator(mainw->playall, LIVES_WIDGET_ACTIVATE_SIGNAL, mainw->accel_group, LIVES_KEY_p, (LiVESXModifierType)0,
+                                   LIVES_ACCEL_VISIBLE);
     }
     if (cfile->proc_ptr!=NULL) {
       lives_widget_destroy(LIVES_WIDGET(cfile->proc_ptr->processing));
-      g_free(cfile->proc_ptr);
+      lives_free(cfile->proc_ptr);
       cfile->proc_ptr=NULL;
     }
     mainw->is_processing=FALSE;
     if (!(cfile->menuentry==NULL)) {
       sensitize();
     }
-  }
-  else {
+  } else {
     mainw->is_processing=TRUE;
   }
   if (mainw->current_file>-1&&cfile->clip_type==CLIP_TYPE_DISK&&((mainw->cancelled!=CANCEL_NO_MORE_PREVIEW&&
-								  mainw->cancelled!=CANCEL_USER)||!cfile->opening)) {
+      mainw->cancelled!=CANCEL_USER)||!cfile->opening)) {
     unlink(cfile->info_file);
   }
 }
@@ -922,7 +987,7 @@
 
 static void disp_fraction(int done, int start, int end, double timesofar, xprocess *proc) {
   // display fraction done and estimated time remaining
-  gchar *prog_label;
+  char *prog_label;
   double est_time;
   double fraction_done=(done-start)/(end-start+1.);
 
@@ -934,9 +999,10 @@
   if (done>disp_frames_done) lives_progress_bar_set_fraction(LIVES_PROGRESS_BAR(proc->progressbar),fraction_done);
 
   est_time=timesofar/fraction_done-timesofar;
-  prog_label=g_strdup_printf(_("\n%s%d%% done. Time remaining: %u sec%s\n"),stretch,(int)(fraction_done*100.),(uint32_t)(est_time+.5),stretch);
+  prog_label=lives_strdup_printf(_("\n%s%d%% done. Time remaining: %u sec%s\n"),stretch,(int)(fraction_done*100.),(uint32_t)(est_time+.5),
+                                 stretch);
   if (LIVES_IS_LABEL(proc->label3)) lives_label_set_text(LIVES_LABEL(proc->label3),prog_label);
-  g_free(prog_label);
+  lives_free(prog_label);
 
   disp_frames_done=done;
 
@@ -953,17 +1019,16 @@
 
   if (progress_count++>=PROG_LOOP_VAL) {
     if (frames_done<=sfile->progress_end&&sfile->progress_end>0&&!mainw->effects_paused&&
-	frames_done>0) {
-      
+        frames_done>0) {
+
       gettimeofday(&tv, NULL);
       mainw->currticks=U_SECL*(tv.tv_sec-mainw->origsecs)+tv.tv_usec*U_SEC_RATIO-mainw->origusecs*U_SEC_RATIO;
       timesofar=(mainw->currticks-mainw->timeout_ticks)/U_SEC;
 
       disp_fraction(frames_done,sfile->progress_start,sfile->progress_end,
-		    timesofar,sfile->proc_ptr);
+                    timesofar,sfile->proc_ptr);
       progress_count=0;
-    }
-    else {
+    } else {
       lives_progress_bar_pulse(LIVES_PROGRESS_BAR(sfile->proc_ptr->progressbar));
       progress_count=0;
     }
@@ -974,7 +1039,7 @@
 
 
 
-boolean process_one (boolean visible) {
+boolean process_one(boolean visible) {
   uint64_t new_ticks;
   uint64_t current_ticks;
   uint64_t sc_ticks=0;
@@ -993,7 +1058,7 @@
 
   if (!visible) {
     // INTERNAL PLAYER
-    if (G_UNLIKELY(mainw->new_clip!=-1)) {
+    if (LIVES_UNLIKELY(mainw->new_clip!=-1)) {
       do_quick_switch(mainw->new_clip);
       mainw->new_clip=-1;
     }
@@ -1005,7 +1070,7 @@
     // -  else if we have a fixed output framerate (e.g. we are streaming) we take our time from
     //         the system clock
     //  in these cases we adjust our audio rate slightly to keep in synch with video
-    // - otherwise, we take the time from soundcard by counting samples played (the normal case),   
+    // - otherwise, we take the time from soundcard by counting samples played (the normal case),
     //   and we synch video with that; however, the soundcard time only updates when samples are played -
     //   so, between updates we interpolate with the system clock and then adjust when we get a new value
     //   from the card
@@ -1015,47 +1080,47 @@
 
 #ifdef ENABLE_JACK_TRANSPORT
     if (mainw->jack_can_stop&&(prefs->jack_opts&JACK_OPTS_TIMEBASE_CLIENT)&&
-	(prefs->jack_opts&JACK_OPTS_TRANSPORT_CLIENT)&&!(mainw->record&&!(prefs->rec_opts&REC_FRAMES))) {
+        (prefs->jack_opts&JACK_OPTS_TRANSPORT_CLIENT)&&!(mainw->record&&!(prefs->rec_opts&REC_FRAMES))) {
       // calculate the time from jack transport
       mainw->currticks=jack_transport_get_time()*U_SEC;
       time_source=LIVES_TIME_SOURCE_EXTERNAL;
     }
 #endif
 
-    
+
     if (!mainw->ext_playback||(mainw->vpp->capabilities&VPP_LOCAL_DISPLAY)) {
-    // get time from soundcard
+      // get time from soundcard
 
 
 #ifdef ENABLE_JACK
       if (!prefs->force_system_clock&&
-	  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))) {
-	  last_sc_ticks=sc_ticks;
-	  if (mainw->jackd_read!=NULL&&mainw->aud_rec_fd!=-1&&mainw->agen_key==0) 
-	    sc_ticks=lives_jack_get_time(mainw->jackd_read,TRUE);
-	  else sc_ticks=lives_jack_get_time(mainw->jackd,TRUE);
-	  time_source=LIVES_TIME_SOURCE_SOUNDCARD;
-	}
+          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))) {
+          last_sc_ticks=sc_ticks;
+          if (mainw->jackd_read!=NULL&&mainw->aud_rec_fd!=-1&&mainw->agen_key==0)
+            sc_ticks=lives_jack_get_time(mainw->jackd_read,TRUE);
+          else sc_ticks=lives_jack_get_time(mainw->jackd,TRUE);
+          time_source=LIVES_TIME_SOURCE_SOUNDCARD;
+        }
       }
 #endif
 
 #ifdef HAVE_PULSE_AUDIO
       if (!prefs->force_system_clock&&
-	  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))) {
-	  last_sc_ticks=sc_ticks;
-	  if (mainw->pulsed_read!=NULL&&mainw->aud_rec_fd!=-1&&mainw->agen_key==0&&!mainw->agen_needs_reinit) 
-	    sc_ticks=lives_pulse_get_time(mainw->pulsed_read,TRUE);
-	  else sc_ticks=lives_pulse_get_time(mainw->pulsed,TRUE);
+          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))) {
+          last_sc_ticks=sc_ticks;
+          if (mainw->pulsed_read!=NULL&&mainw->aud_rec_fd!=-1&&mainw->agen_key==0&&!mainw->agen_needs_reinit)
+            sc_ticks=lives_pulse_get_time(mainw->pulsed_read,TRUE);
+          else sc_ticks=lives_pulse_get_time(mainw->pulsed,TRUE);
 
-	  time_source=LIVES_TIME_SOURCE_SOUNDCARD;
-	}
+          time_source=LIVES_TIME_SOURCE_SOUNDCARD;
+        }
       }
 #endif
     }
@@ -1069,40 +1134,37 @@
 
       if (sc_ticks!=last_sc_ticks) {
 
-	// calculate ratio soundcard rate:sys clock rate
-	sc_ratio=(double)sc_ticks/(double)current_ticks;
-	if (sc_ratio==0.) sc_ratio=1.;
-
-	mainw->currticks+=(current_ticks-prev_ticks)*sc_ratio;
-
-	// we got updated time from the soundcard
-	if (sc_ticks>=mainw->currticks) {
-	  // timecard ahead of clock, so we resync with soundcard
-	  mainw->currticks=sc_ticks;
-	  consume_ticks=0;
-	}
-	else {
-	  // soundcard time was before our interpolated time, so we will not update the clock
-	  // but we will consume the extra ticks first
-	  consume_ticks=mainw->currticks-sc_ticks;
-	}
-      }
-      else {
-	// no update from soundcard
-	if (consume_ticks>0) {
-	  // we were ahead of the soundcard at the last update, so wait for it to catch up
-	  // (estimated)
-	  consume_ticks-=(current_ticks-prev_ticks)*sc_ratio;
-	  if (consume_ticks<0) {
-	    // card should have caught up, so we start advancing the clock again
-	    mainw->currticks+=consume_ticks;
-	    consume_ticks=0;
-	  }
-	}
-	else {
-	  // should be caught up now, so we keep advancing the system clock
-	  mainw->currticks+=(current_ticks-prev_ticks)*sc_ratio;
-	}
+        // calculate ratio soundcard rate:sys clock rate
+        sc_ratio=(double)sc_ticks/(double)current_ticks;
+        if (sc_ratio==0.) sc_ratio=1.;
+
+        mainw->currticks+=(current_ticks-prev_ticks)*sc_ratio;
+
+        // we got updated time from the soundcard
+        if (sc_ticks>=mainw->currticks) {
+          // timecard ahead of clock, so we resync with soundcard
+          mainw->currticks=sc_ticks;
+          consume_ticks=0;
+        } else {
+          // soundcard time was before our interpolated time, so we will not update the clock
+          // but we will consume the extra ticks first
+          consume_ticks=mainw->currticks-sc_ticks;
+        }
+      } else {
+        // no update from soundcard
+        if (consume_ticks>0) {
+          // we were ahead of the soundcard at the last update, so wait for it to catch up
+          // (estimated)
+          consume_ticks-=(current_ticks-prev_ticks)*sc_ratio;
+          if (consume_ticks<0) {
+            // card should have caught up, so we start advancing the clock again
+            mainw->currticks+=consume_ticks;
+            consume_ticks=0;
+          }
+        } else {
+          // should be caught up now, so we keep advancing the system clock
+          mainw->currticks+=(current_ticks-prev_ticks)*sc_ratio;
+        }
       }
       prev_ticks=current_ticks;
     }
@@ -1111,7 +1173,7 @@
       // get time from system clock
       gettimeofday(&tv, NULL);
       mainw->currticks=U_SECL*(tv.tv_sec-mainw->origsecs)+tv.tv_usec*U_SEC_RATIO-mainw->origusecs*U_SEC_RATIO;
-      if (G_UNLIKELY(mainw->currticks<prev_ticks)) mainw->currticks=prev_ticks;
+      if (LIVES_UNLIKELY(mainw->currticks<prev_ticks)) mainw->currticks=prev_ticks;
       time_source=LIVES_TIME_SOURCE_SYSTEM;
       prev_ticks=mainw->currticks;
     }
@@ -1120,93 +1182,88 @@
     if (time_source!=LIVES_TIME_SOURCE_SOUNDCARD) {
 #ifdef ENABLE_JACK
       if (prefs->audio_player==AUD_PLAYER_JACK&&mainw->jackd!=NULL&&
-	  cfile->achans>0&&(!mainw->is_rendering||(mainw->multitrack!=NULL&&!mainw->multitrack->is_rendering))&&
-	  (mainw->currticks-mainw->offsetticks)>U_SECL*10&&(audio_ticks=lives_jack_get_time(mainw->jackd,TRUE))>
-	  mainw->offsetticks) {
-	if ((audio_stretch=(double)(audio_ticks-mainw->offsetticks)/(double)(mainw->currticks-mainw->offsetticks))<2.) {
-	  // if audio_stretch is > 1. it means that audio is playing too fast
-	  // < 1. it is playing too slow
-
-	  // if too fast we increase the apparent sample rate so that it gets downsampled more
-	  // if too slow we decrease the apparent sample rate so that it gets upsampled more
-
-	  if (mainw->multitrack==NULL) {
-	    if (prefs->audio_opts&AUDIO_OPTS_FOLLOW_FPS) {
-	      if (!cfile->play_paused) mainw->jackd->sample_in_rate=cfile->arate*cfile->pb_fps/cfile->fps*audio_stretch;
-	      else mainw->jackd->sample_in_rate=cfile->arate*cfile->freeze_fps/cfile->fps*audio_stretch;
-	    }
-	    else mainw->jackd->sample_in_rate=cfile->arate*audio_stretch;
-	  }
-	  else {
-	    mainw->jackd->abufs[mainw->jackd->read_abuf]->arate=cfile->arate*audio_stretch;
-	  }
-	}
+          cfile->achans>0&&(!mainw->is_rendering||(mainw->multitrack!=NULL&&!mainw->multitrack->is_rendering))&&
+          (mainw->currticks-mainw->offsetticks)>U_SECL*10&&(audio_ticks=lives_jack_get_time(mainw->jackd,TRUE))>
+          mainw->offsetticks) {
+        if ((audio_stretch=(double)(audio_ticks-mainw->offsetticks)/(double)(mainw->currticks-mainw->offsetticks))<2.) {
+          // if audio_stretch is > 1. it means that audio is playing too fast
+          // < 1. it is playing too slow
+
+          // if too fast we increase the apparent sample rate so that it gets downsampled more
+          // if too slow we decrease the apparent sample rate so that it gets upsampled more
+
+          if (mainw->multitrack==NULL) {
+            if (prefs->audio_opts&AUDIO_OPTS_FOLLOW_FPS) {
+              if (!cfile->play_paused) mainw->jackd->sample_in_rate=cfile->arate*cfile->pb_fps/cfile->fps*audio_stretch;
+              else mainw->jackd->sample_in_rate=cfile->arate*cfile->freeze_fps/cfile->fps*audio_stretch;
+            } else mainw->jackd->sample_in_rate=cfile->arate*audio_stretch;
+          } else {
+            mainw->jackd->abufs[mainw->jackd->read_abuf]->arate=cfile->arate*audio_stretch;
+          }
+        }
       }
 #endif
 
 
 #ifdef HAVE_PULSE_AUDIO
       if (prefs->audio_player==AUD_PLAYER_PULSE&&mainw->pulsed!=NULL&&
-	  cfile->achans>0&&(!mainw->is_rendering||(mainw->multitrack!=NULL&&!mainw->multitrack->is_rendering))&&
-	  (mainw->currticks-mainw->offsetticks)>U_SECL*10&&(audio_ticks=lives_pulse_get_time(mainw->pulsed,TRUE))>
-	  mainw->offsetticks) {
-	// fps is synched to external source, so we adjust the audio rate to fit
-	if ((audio_stretch=(double)(audio_ticks-mainw->offsetticks)/(double)(mainw->currticks-mainw->offsetticks))<2.) {
-	  // if audio_stretch is > 1. it means that audio is playing too fast
-	  // < 1. it is playing too slow
-
-	  // if too fast we increase the apparent sample rate so that it gets downsampled more
-	  // if too slow we decrease the apparent sample rate so that it gets upsampled more
-
-	  if (mainw->multitrack==NULL) {
-	    if (prefs->audio_opts&AUDIO_OPTS_FOLLOW_FPS) {
-	      if (!cfile->play_paused) mainw->pulsed->in_arate=cfile->arate*cfile->pb_fps/cfile->fps*audio_stretch;
-	      else mainw->pulsed->in_arate=cfile->arate*cfile->freeze_fps/cfile->fps*audio_stretch;
-	    } 
-	    else mainw->pulsed->in_arate=cfile->arate*audio_stretch;
-	  }
-	  else {
-	    mainw->pulsed->abufs[mainw->pulsed->read_abuf]->arate=cfile->arate*audio_stretch;
-	  }
-	}
+          cfile->achans>0&&(!mainw->is_rendering||(mainw->multitrack!=NULL&&!mainw->multitrack->is_rendering))&&
+          (mainw->currticks-mainw->offsetticks)>U_SECL*10&&(audio_ticks=lives_pulse_get_time(mainw->pulsed,TRUE))>
+          mainw->offsetticks) {
+        // fps is synched to external source, so we adjust the audio rate to fit
+        if ((audio_stretch=(double)(audio_ticks-mainw->offsetticks)/(double)(mainw->currticks-mainw->offsetticks))<2.) {
+          // if audio_stretch is > 1. it means that audio is playing too fast
+          // < 1. it is playing too slow
+
+          // if too fast we increase the apparent sample rate so that it gets downsampled more
+          // if too slow we decrease the apparent sample rate so that it gets upsampled more
+
+          if (mainw->multitrack==NULL) {
+            if (prefs->audio_opts&AUDIO_OPTS_FOLLOW_FPS) {
+              if (!cfile->play_paused) mainw->pulsed->in_arate=cfile->arate*cfile->pb_fps/cfile->fps*audio_stretch;
+              else mainw->pulsed->in_arate=cfile->arate*cfile->freeze_fps/cfile->fps*audio_stretch;
+            } else mainw->pulsed->in_arate=cfile->arate*audio_stretch;
+          } else {
+            mainw->pulsed->abufs[mainw->pulsed->read_abuf]->arate=cfile->arate*audio_stretch;
+          }
+        }
       }
 #endif
     }
 
-    if (G_UNLIKELY(cfile->proc_ptr==NULL&&cfile->next_event!=NULL)) {
+    if (LIVES_UNLIKELY(cfile->proc_ptr==NULL&&cfile->next_event!=NULL)) {
       // playing an event_list
 
 
       if (mainw->scratch!=SCRATCH_NONE&&mainw->multitrack!=NULL) {
 #ifdef ENABLE_JACK_TRANSPORT
-	// handle transport jump
-	weed_timecode_t transtc=q_gint64(jack_transport_get_time()*U_SEC,cfile->fps);
-	mainw->multitrack->pb_start_event=get_frame_event_at(mainw->multitrack->event_list,transtc,NULL,TRUE);
-	if (mainw->cancelled==CANCEL_NONE) mainw->cancelled=CANCEL_EVENT_LIST_END;
-#endif
-      }
-      else if (mainw->currticks>=event_start) {
-	// see if we are playing a selection and reached the end
-	if (mainw->multitrack!=NULL&&mainw->multitrack->playing_sel&&get_event_timecode(cfile->next_event)/U_SEC>=
-	    mainw->multitrack->region_end) mainw->cancelled=CANCEL_EVENT_LIST_END;
-	else {
-	  cfile->next_event=process_events (cfile->next_event,FALSE,mainw->currticks);
-	
-	  // see if we need to fill an audio buffer
+        // handle transport jump
+        weed_timecode_t transtc=q_gint64(jack_transport_get_time()*U_SEC,cfile->fps);
+        mainw->multitrack->pb_start_event=get_frame_event_at(mainw->multitrack->event_list,transtc,NULL,TRUE);
+        if (mainw->cancelled==CANCEL_NONE) mainw->cancelled=CANCEL_EVENT_LIST_END;
+#endif
+      } else if (mainw->currticks>=event_start) {
+        // see if we are playing a selection and reached the end
+        if (mainw->multitrack!=NULL&&mainw->multitrack->playing_sel&&get_event_timecode(cfile->next_event)/U_SEC>=
+            mainw->multitrack->region_end) mainw->cancelled=CANCEL_EVENT_LIST_END;
+        else {
+          cfile->next_event=process_events(cfile->next_event,FALSE,mainw->currticks);
+
+          // see if we need to fill an audio buffer
 #ifdef ENABLE_JACK
-	  if (prefs->audio_player==AUD_PLAYER_JACK&&mainw->jackd!=NULL&&mainw->abufs_to_fill>0) {
-	    mainw->jackd->abufs[mainw->write_abuf]->samples_filled=0;
-	    fill_abuffer_from(mainw->jackd->abufs[mainw->write_abuf],mainw->event_list,NULL,FALSE);
-	  }
+          if (prefs->audio_player==AUD_PLAYER_JACK&&mainw->jackd!=NULL&&mainw->abufs_to_fill>0) {
+            mainw->jackd->abufs[mainw->write_abuf]->samples_filled=0;
+            fill_abuffer_from(mainw->jackd->abufs[mainw->write_abuf],mainw->event_list,NULL,FALSE);
+          }
 #endif
 #ifdef HAVE_PULSE_AUDIO
-	  if (prefs->audio_player==AUD_PLAYER_PULSE&&mainw->pulsed!=NULL&&mainw->abufs_to_fill>0) {
-	    mainw->pulsed->abufs[mainw->write_abuf]->samples_filled=0;
-	    fill_abuffer_from(mainw->pulsed->abufs[mainw->write_abuf],mainw->event_list,NULL,FALSE);
-	  }
-	  
+          if (prefs->audio_player==AUD_PLAYER_PULSE&&mainw->pulsed!=NULL&&mainw->abufs_to_fill>0) {
+            mainw->pulsed->abufs[mainw->write_abuf]->samples_filled=0;
+            fill_abuffer_from(mainw->pulsed->abufs[mainw->write_abuf],mainw->event_list,NULL,FALSE);
+          }
+
 #endif
-	}
+        }
       }
 
       lives_widget_context_update(); // animate GUI, allow kb timer to run
@@ -1224,78 +1281,78 @@
     show_frame=FALSE;
 
     cfile->frameno=calc_new_playback_position(mainw->current_file,mainw->startticks,&new_ticks);
-    
+
     if (new_ticks!=mainw->startticks) {
       show_frame=TRUE;
       mainw->startticks=new_ticks;
     }
 
     // play next frame
-    if (G_LIKELY(mainw->cancelled==CANCEL_NONE)) {
+    if (LIVES_LIKELY(mainw->cancelled==CANCEL_NONE)) {
 
-      // calculate the audio 'frame' for no-realtime audio players
+      // calculate the audio 'frame' for non-realtime audio players
       // for realtime players, we did this in calc_new_playback_position()
-      if (prefs->audio_player==AUD_PLAYER_SOX||prefs->audio_player==AUD_PLAYER_MPLAYER||prefs->audio_player==AUD_PLAYER_MPLAYER2) {
-	mainw->aframeno=(int64_t)(mainw->currticks-mainw->firstticks)*cfile->fps/U_SEC+audio_start;
-	if (G_UNLIKELY(mainw->loop_cont&&(mainw->aframeno>(mainw->audio_end?mainw->audio_end:
-							   cfile->laudio_time*cfile->fps)))) {
-	  mainw->firstticks=mainw->startticks-mainw->deltaticks;
-	}
+      if (!is_realtime_aplayer(prefs->audio_player)) {
+        mainw->aframeno=(int64_t)(mainw->currticks-mainw->firstticks)*cfile->fps/U_SEC+audio_start;
+        if (LIVES_UNLIKELY(mainw->loop_cont&&(mainw->aframeno>(mainw->audio_end?mainw->audio_end:
+                                              cfile->laudio_time*cfile->fps)))) {
+          mainw->firstticks=mainw->startticks-mainw->deltaticks;
+        }
       }
 
 
       if ((mainw->fixed_fpsd<=0.&&show_frame&&(mainw->vpp==NULL||
-					       mainw->vpp->fixed_fpsd<=0.||!mainw->ext_playback))||
-	  (mainw->fixed_fpsd>0.&&(mainw->currticks-mainw->last_display_ticks)/U_SEC>=1./mainw->fixed_fpsd)||
-	  (mainw->vpp!=NULL&&mainw->vpp->fixed_fpsd>0.&&mainw->ext_playback&&
-	   (mainw->currticks-mainw->last_display_ticks)/U_SEC>=1./mainw->vpp->fixed_fpsd)||force_show) {
-	// time to show a new frame
+           mainw->vpp->fixed_fpsd<=0.||!mainw->ext_playback))||
+          (mainw->fixed_fpsd>0.&&(mainw->currticks-mainw->last_display_ticks)/U_SEC>=1./mainw->fixed_fpsd)||
+          (mainw->vpp!=NULL&&mainw->vpp->fixed_fpsd>0.&&mainw->ext_playback&&
+           (mainw->currticks-mainw->last_display_ticks)/U_SEC>=1./mainw->vpp->fixed_fpsd)||force_show) {
+        // time to show a new frame
 
 #ifdef ENABLE_JACK
-	// note the audio seek position
-	if (prefs->audio_player==AUD_PLAYER_JACK&&mainw->jackd!=NULL) {
-	  cfile->aseek_pos=mainw->jackd->seek_pos;
-	}
+        // note the audio seek position
+        if (prefs->audio_player==AUD_PLAYER_JACK&&mainw->jackd!=NULL) {
+          cfile->aseek_pos=mainw->jackd->seek_pos;
+        }
 #endif
 #ifdef HAVE_PULSE_AUDIO
-	// note the audio seek position
-	if (prefs->audio_player==AUD_PLAYER_PULSE&&mainw->pulsed!=NULL) {
-	  cfile->aseek_pos=mainw->pulsed->seek_pos;
-	}
-#endif
-
-	// load and display the new frame
-	load_frame_image(cfile->frameno);
-	if (1||mainw->last_display_ticks==0) mainw->last_display_ticks=mainw->currticks;
-	else {
-	  if (mainw->vpp!=NULL&&mainw->ext_playback&&mainw->vpp->fixed_fpsd>0.) 
-	    mainw->last_display_ticks+=U_SEC/mainw->vpp->fixed_fpsd;
-	  else if (mainw->fixed_fpsd>0.) 
-	    mainw->last_display_ticks+=U_SEC/mainw->fixed_fpsd;
-	  else mainw->last_display_ticks=mainw->currticks;
-	}
-	force_show=FALSE;
+        // note the audio seek position
+        if (prefs->audio_player==AUD_PLAYER_PULSE&&mainw->pulsed!=NULL) {
+          cfile->aseek_pos=mainw->pulsed->seek_pos;
+        }
+#endif
+
+        // load and display the new frame
+        load_frame_image(cfile->frameno);
+        if (1||mainw->last_display_ticks==0) mainw->last_display_ticks=mainw->currticks;
+        else {
+          if (mainw->vpp!=NULL&&mainw->ext_playback&&mainw->vpp->fixed_fpsd>0.)
+            mainw->last_display_ticks+=U_SEC/mainw->vpp->fixed_fpsd;
+          else if (mainw->fixed_fpsd>0.)
+            mainw->last_display_ticks+=U_SEC/mainw->fixed_fpsd;
+          else mainw->last_display_ticks=mainw->currticks;
+        }
+        force_show=FALSE;
       }
 
 
 #ifdef ENABLE_JACK
       // request for another audio buffer - used only during mt render preview
       if (prefs->audio_player==AUD_PLAYER_JACK&&mainw->jackd!=NULL&&mainw->abufs_to_fill>0) {
-	fill_abuffer_from(mainw->jackd->abufs[mainw->write_abuf],mainw->event_list,NULL,FALSE);
+        fill_abuffer_from(mainw->jackd->abufs[mainw->write_abuf],mainw->event_list,NULL,FALSE);
       }
 #endif
 #ifdef HAVE_PULSE_AUDIO
       // request for another audio buffer - used only during mt render preview
       if (prefs->audio_player==AUD_PLAYER_PULSE&&mainw->pulsed!=NULL&&mainw->abufs_to_fill>0) {
-	fill_abuffer_from(mainw->pulsed->abufs[mainw->write_abuf],mainw->event_list,NULL,FALSE);
+        fill_abuffer_from(mainw->pulsed->abufs[mainw->write_abuf],mainw->event_list,NULL,FALSE);
       }
 #endif
 
     }
     // paused
-    if (G_UNLIKELY(cfile->play_paused)) {
+    if (LIVES_UNLIKELY(cfile->play_paused)) {
       mainw->startticks=mainw->currticks+mainw->deltaticks;
-      if (mainw->ext_playback&&mainw->vpp->send_keycodes!=NULL) (*mainw->vpp->send_keycodes)(pl_key_function);
+      if (mainw->ext_playback&&mainw->vpp->send_keycodes!=NULL)(*mainw->vpp->send_keycodes)(pl_key_function);
     }
   }
 
@@ -1304,62 +1361,60 @@
     // fixes a problem with opening preview with bg generator
     if (cfile->proc_ptr==NULL) {
       if (mainw->cancelled==CANCEL_NONE) mainw->cancelled=CANCEL_NO_PROPOGATE;
-    }
-    else {
+    } else {
       double fraction_done,timesofar;
-      gchar *prog_label;
+      char *prog_label;
 
-      if (GTK_IS_SPIN_BUTTON(mainw->framedraw_spinbutton)) 
-	lives_spin_button_set_range(LIVES_SPIN_BUTTON(mainw->framedraw_spinbutton),1,cfile->proc_ptr->frames_done);
+      if (LIVES_IS_SPIN_BUTTON(mainw->framedraw_spinbutton))
+        lives_spin_button_set_range(LIVES_SPIN_BUTTON(mainw->framedraw_spinbutton),1,cfile->proc_ptr->frames_done);
       // set the progress bar %
 
       if (cfile->opening&&cfile->clip_type==CLIP_TYPE_DISK&&!cfile->opening_only_audio&&
-	  (cfile->hsize>0||cfile->vsize>0||cfile->frames>0)&&(!mainw->effects_paused||!shown_paused_frames)) {
-	uint32_t apxl;
-	gettimeofday(&tv, NULL);
-	mainw->currticks=U_SECL*(tv.tv_sec-mainw->origsecs)+tv.tv_usec*U_SEC_RATIO-mainw->origusecs*U_SEC_RATIO;
-	if ((mainw->currticks-last_open_check_ticks)>OPEN_CHECK_TICKS*
-	    ((apxl=get_approx_ln((uint32_t)mainw->opening_frames))<200?apxl:200)||
-	    (mainw->effects_paused&&!shown_paused_frames)) {
-	  count_opening_frames();
-	  last_open_check_ticks=mainw->currticks;
-	  if (mainw->opening_frames>1) {
-	    if (cfile->frames>0&&cfile->frames!=123456789) {
-	      fraction_done=(double)(mainw->opening_frames-1)/(double)cfile->frames;
-	      if (fraction_done>1.) fraction_done=1.;
-	      if (!mainw->effects_paused) {
-		timesofar=(mainw->currticks-mainw->timeout_ticks)/U_SEC;
-		est_time=timesofar/fraction_done-timesofar;
-	      }
-	      lives_progress_bar_set_fraction(LIVES_PROGRESS_BAR(cfile->proc_ptr->progressbar),fraction_done);
-	      if (est_time!=-1.) prog_label=g_strdup_printf(_("\n%d/%d frames opened. Time remaining %u sec.\n"),
-							    mainw->opening_frames-1,cfile->frames,(uint32_t)(est_time+.5));
-	      else prog_label=g_strdup_printf(_("\n%d/%d frames opened.\n"),mainw->opening_frames-1,cfile->frames);
-	    }
-	    else {
-	      lives_progress_bar_pulse(LIVES_PROGRESS_BAR(cfile->proc_ptr->progressbar));
-	      prog_label=g_strdup_printf(_("\n%d frames opened.\n"),mainw->opening_frames-1);
-	    }
-	    lives_label_set_text(LIVES_LABEL(cfile->proc_ptr->label3),prog_label);
-	    g_free(prog_label);
-	  }
-	}
-	shown_paused_frames=mainw->effects_paused;
+          (cfile->hsize>0||cfile->vsize>0||cfile->frames>0)&&(!mainw->effects_paused||!shown_paused_frames)) {
+        uint32_t apxl;
+        gettimeofday(&tv, NULL);
+        mainw->currticks=U_SECL*(tv.tv_sec-mainw->origsecs)+tv.tv_usec*U_SEC_RATIO-mainw->origusecs*U_SEC_RATIO;
+        if ((mainw->currticks-last_open_check_ticks)>OPEN_CHECK_TICKS*
+            ((apxl=get_approx_ln((uint32_t)mainw->opening_frames))<200?apxl:200)||
+            (mainw->effects_paused&&!shown_paused_frames)) {
+          count_opening_frames();
+          last_open_check_ticks=mainw->currticks;
+          if (mainw->opening_frames>1) {
+            if (cfile->frames>0&&cfile->frames!=123456789) {
+              fraction_done=(double)(mainw->opening_frames-1)/(double)cfile->frames;
+              if (fraction_done>1.) fraction_done=1.;
+              if (!mainw->effects_paused) {
+                timesofar=(mainw->currticks-mainw->timeout_ticks)/U_SEC;
+                est_time=timesofar/fraction_done-timesofar;
+              }
+              lives_progress_bar_set_fraction(LIVES_PROGRESS_BAR(cfile->proc_ptr->progressbar),fraction_done);
+              if (est_time!=-1.) prog_label=lives_strdup_printf(_("\n%d/%d frames opened. Time remaining %u sec.\n"),
+                                              mainw->opening_frames-1,cfile->frames,(uint32_t)(est_time+.5));
+              else prog_label=lives_strdup_printf(_("\n%d/%d frames opened.\n"),mainw->opening_frames-1,cfile->frames);
+            } else {
+              lives_progress_bar_pulse(LIVES_PROGRESS_BAR(cfile->proc_ptr->progressbar));
+              prog_label=lives_strdup_printf(_("\n%d frames opened.\n"),mainw->opening_frames-1);
+            }
+            lives_label_set_text(LIVES_LABEL(cfile->proc_ptr->label3),prog_label);
+            lives_free(prog_label);
+          }
+        }
+        shown_paused_frames=mainw->effects_paused;
       }
 
       else {
-	if (visible&&cfile->proc_ptr->frames_done>=cfile->progress_start) {
-	  if (progress_count==0) check_storage_space(cfile, TRUE);
-	  // display progress fraction or pulse bar
-	  progbar_pulse_or_fraction(cfile,cfile->proc_ptr->frames_done);
-	}
+        if (visible&&cfile->proc_ptr->frames_done>=cfile->progress_start) {
+          if (progress_count==0) check_storage_space(cfile, TRUE);
+          // display progress fraction or pulse bar
+          progbar_pulse_or_fraction(cfile,cfile->proc_ptr->frames_done);
+        }
       }
     }
 
     frames_done=cfile->proc_ptr->frames_done;
 
     if (cfile->clip_type==CLIP_TYPE_FILE&&cfile->fx_frame_pump>0&&
-	(cfile->progress_start+frames_done+FX_FRAME_PUMP_VAL>cfile->fx_frame_pump)) {
+        (cfile->progress_start+frames_done+FX_FRAME_PUMP_VAL>cfile->fx_frame_pump)) {
       int vend=cfile->fx_frame_pump;
       boolean retb=virtual_to_images(mainw->current_file,vend,vend,FALSE,NULL);
       if (retb) cfile->fx_frame_pump=vend+1;
@@ -1369,7 +1424,7 @@
 
   }
 
-  if (G_LIKELY(mainw->cancelled==CANCEL_NONE)) {
+  if (LIVES_LIKELY(mainw->cancelled==CANCEL_NONE)) {
 
     if ((xrfx=(lives_rfx_t *)mainw->vrfx_update)!=NULL&&fx_dialog[1]!=NULL) {
       // the audio thread wants to update the parameter window
@@ -1382,7 +1437,7 @@
 
     lives_widget_context_update();  // animate GUI, allow kb timer to run
 
-    if (G_UNLIKELY(mainw->cancelled!=CANCEL_NONE)) {
+    if (LIVES_UNLIKELY(mainw->cancelled!=CANCEL_NONE)) {
       cancel_process(visible);
       return FALSE;
     }
@@ -1394,7 +1449,7 @@
 }
 
 
-boolean do_progress_dialog(boolean visible, boolean cancellable, const gchar *text) {
+boolean do_progress_dialog(boolean visible, boolean cancellable, const char *text) {
   // monitor progress, return FALSE if the operation was cancelled
 
   // this is the outer loop for playback and all kinds of processing
@@ -1404,14 +1459,14 @@
 
 
   FILE *infofile=NULL;
-  gchar *mytext=NULL;
+  char *mytext=NULL;
 
   int frames_done;
 
   boolean got_err=FALSE;
-  
+
   // translation issues
-  if (visible&&text!=NULL) mytext=g_strdup(text);
+  if (visible&&text!=NULL) mytext=lives_strdup(text);
 
   if (visible) {
     // check we have sufficient storage space
@@ -1451,7 +1506,7 @@
     mainw->fps_measure=0.;
   }
 
-  mainw->cancelled=CANCEL_NONE;   
+  mainw->cancelled=CANCEL_NONE;
   mainw->error=FALSE;
   clear_mainw_msg();
   if (!mainw->preview||cfile->opening) mainw->timeout_ticks=0;
@@ -1462,18 +1517,24 @@
     procw_desensitize();
     lives_set_cursor_style(LIVES_CURSOR_BUSY,NULL);
 
-    cfile->proc_ptr=create_processing (mytext);
-    if (mytext!=NULL) g_free(mytext);
+    cfile->proc_ptr=create_processing(mytext);
+    if (mytext!=NULL) lives_free(mytext);
 
     lives_progress_bar_set_pulse_step(LIVES_PROGRESS_BAR(cfile->proc_ptr->progressbar),.01);
     if (mainw->show_procd) lives_widget_show(cfile->proc_ptr->processing);
-    
+
     cfile->proc_ptr->frames_done=0;
-    
+
     if (cancellable) {
-      lives_widget_show (cfile->proc_ptr->cancel_button);
+      lives_widget_show(cfile->proc_ptr->cancel_button);
     }
 
+    if (!mainw->interactive) {
+      lives_widget_set_sensitive(cfile->proc_ptr->cancel_button,FALSE);
+      lives_widget_set_sensitive(cfile->proc_ptr->stop_button,FALSE);
+      lives_widget_set_sensitive(cfile->proc_ptr->pause_button,FALSE);
+      lives_widget_set_sensitive(cfile->proc_ptr->preview_button,FALSE);
+    }
 
     // if we have virtual frames make sure the first FX_FRAME_PUMP_VAL are decoded for the backend
     // as we are processing we will continue to decode 1 frame in time with the backend
@@ -1487,35 +1548,35 @@
 
     // default FX_FRAME_PUMP_VAL is 200
 
-    // (encoding and copying have their own mechanism which realises all frames in the selection first) 
+    // (encoding and copying have their own mechanism which realises all frames in the selection first)
 
     if (cfile->clip_type==CLIP_TYPE_FILE&&cfile->fx_frame_pump>0) {
       int vend=cfile->fx_frame_pump+FX_FRAME_PUMP_VAL;
       if (vend>cfile->progress_end) vend=cfile->progress_end;
       if (vend>=cfile->fx_frame_pump) {
-	register int i;
-	for (i=cfile->fx_frame_pump;i<=vend;i++) {
-	  boolean retb=virtual_to_images(mainw->current_file,i,i,FALSE,NULL);
-	  if (mainw->cancelled||!retb) {
-	    cancel_process(TRUE);
-	    lives_set_cursor_style(LIVES_CURSOR_NORMAL,NULL);
-	    if (mainw->current_file>-1&&cfile!=NULL) lives_freep((void**)&cfile->op_dir);
-	    return FALSE;
-	  }
-	  lives_widget_context_update();
-	}
-	cfile->fx_frame_pump+=FX_FRAME_PUMP_VAL>>1;
+        register int i;
+        for (i=cfile->fx_frame_pump; i<=vend; i++) {
+          boolean retb=virtual_to_images(mainw->current_file,i,i,FALSE,NULL);
+          if (mainw->cancelled||!retb) {
+            cancel_process(TRUE);
+            lives_set_cursor_style(LIVES_CURSOR_NORMAL,NULL);
+            if (mainw->current_file>-1&&cfile!=NULL) lives_freep((void **)&cfile->op_dir);
+            return FALSE;
+          }
+          lives_widget_context_update();
+        }
+        cfile->fx_frame_pump+=FX_FRAME_PUMP_VAL>>1;
       }
     }
 
 
     if (cfile->opening&&(capable->has_sox_play||(prefs->audio_player==AUD_PLAYER_JACK&&mainw->jackd!=NULL)||
-			 (prefs->audio_player==AUD_PLAYER_PULSE&&mainw->pulsed!=NULL))&&mainw->playing_file==-1) {
-      if (mainw->preview_box!=NULL) lives_widget_set_tooltip_text( mainw->p_playbutton,_ ("Preview"));
-      lives_widget_set_tooltip_text( mainw->m_playbutton,_ ("Preview"));
-      lives_widget_remove_accelerator (mainw->playall, mainw->accel_group, LIVES_KEY_p, (LiVESXModifierType)0);
-      lives_widget_add_accelerator (cfile->proc_ptr->preview_button, LIVES_WIDGET_CLICKED_EVENT, mainw->accel_group, LIVES_KEY_p,
-				  (LiVESXModifierType)0, (LiVESAccelFlags)0);
+                         (prefs->audio_player==AUD_PLAYER_PULSE&&mainw->pulsed!=NULL))&&mainw->playing_file==-1) {
+      if (mainw->preview_box!=NULL) lives_widget_set_tooltip_text(mainw->p_playbutton,_("Preview"));
+      lives_widget_set_tooltip_text(mainw->m_playbutton,_("Preview"));
+      lives_widget_remove_accelerator(mainw->playall, mainw->accel_group, LIVES_KEY_p, (LiVESXModifierType)0);
+      lives_widget_add_accelerator(cfile->proc_ptr->preview_button, LIVES_WIDGET_CLICKED_SIGNAL, mainw->accel_group, LIVES_KEY_p,
+                                   (LiVESXModifierType)0, (LiVESAccelFlags)0);
       accelerators_swapped=TRUE;
     }
 
@@ -1524,7 +1585,7 @@
   if (cfile->next_event!=NULL) event_start=get_event_timecode(cfile->next_event);
 
 
-  // mainw->origsecs, mainw->origusecs is our base for quantising 
+  // mainw->origsecs, mainw->origusecs is our base for quantising
   // (and is constant for each playback session)
 
   // firstticks is to do with the audio "frame" for sox, mplayer
@@ -1550,7 +1611,7 @@
 
 #ifdef ENABLE_JACK_TRANSPORT
     if (mainw->jack_can_stop&&mainw->multitrack==NULL&&(prefs->jack_opts&JACK_OPTS_TRANSPORT_CLIENT)&&
-	!(mainw->record&&!(prefs->rec_opts&REC_FRAMES)&&cfile->next_event==NULL)) {
+        !(mainw->record&&!(prefs->rec_opts&REC_FRAMES)&&cfile->next_event==NULL)) {
       // calculate the start position from jack transport
 
       uint64_t ntc=jack_transport_get_time()*U_SEC;
@@ -1558,12 +1619,12 @@
       mainw->noframedrop=FALSE;
       cfile->last_frameno=1;
       if (prefs->jack_opts&JACK_OPTS_TIMEBASE_START) {
-	mainw->play_start=calc_new_playback_position(mainw->current_file,0,&ntc);
+        mainw->play_start=calc_new_playback_position(mainw->current_file,0,&ntc);
       }
       mainw->noframedrop=noframedrop;
       if (prefs->jack_opts&JACK_OPTS_TIMEBASE_CLIENT) {
-	// timebase client - follows jack transport position
-	mainw->startticks=ntc;
+        // timebase client - follows jack transport position
+        mainw->startticks=ntc;
       }
       mainw->currticks=ntc;
     }
@@ -1582,7 +1643,7 @@
     // WARNING: origticks could be negative
 
     int64_t origticks=mainw->origsecs*U_SEC+mainw->origusecs*U_SEC_RATIO-
-      (mainw->offsetticks=get_event_timecode(mainw->multitrack->pb_start_event));
+                      (mainw->offsetticks=get_event_timecode(mainw->multitrack->pb_start_event));
     mainw->origsecs=origticks/U_SEC;
     mainw->origusecs=((int64_t)(origticks/U_SEC_RATIO)-mainw->origsecs*1000000.);
   }
@@ -1590,7 +1651,7 @@
 
   // set initial audio seek position for current file
   if (cfile->achans) cfile->aseek_pos=(int64_t)((double)(mainw->play_start-1.)/
-					     cfile->fps*cfile->arate*cfile->achans*(cfile->asampsize/8));
+                                        cfile->fps*cfile->arate*cfile->achans*(cfile->asampsize/8));
 
 
   // MUST do re-seek after setting origsecs in order to set our clock properly
@@ -1614,9 +1675,9 @@
     }
   }
   if (prefs->audio_player==AUD_PLAYER_JACK&&((mainw->jackd!=NULL&&mainw->multitrack!=NULL&&
-					      !mainw->multitrack->is_rendering&&cfile->achans>0)||
-					     ((prefs->audio_src==AUDIO_SRC_EXT&&mainw->jackd_read!=NULL)||
-					      mainw->agen_key!=0))) {
+      !mainw->multitrack->is_rendering&&cfile->achans>0)||
+      ((prefs->audio_src==AUDIO_SRC_EXT&&mainw->jackd_read!=NULL)||
+       mainw->agen_key!=0))) {
     // have to set this here as we don't do a seek in multitrack, or when playing external audio, or from an audio gen
     mainw->jackd->audio_ticks=mainw->offsetticks;
     mainw->jackd->frames_written=0;
@@ -1645,18 +1706,18 @@
     }
   }
   if (prefs->audio_player==AUD_PLAYER_PULSE&&((mainw->pulsed!=NULL&&mainw->multitrack!=NULL&&
-					       !mainw->multitrack->is_rendering&&cfile->achans>0)||
-					      ((prefs->audio_src==AUDIO_SRC_EXT&&mainw->pulsed_read!=NULL)||
-					       mainw->agen_key!=0))) {
+      !mainw->multitrack->is_rendering&&cfile->achans>0)||
+      ((prefs->audio_src==AUDIO_SRC_EXT&&mainw->pulsed_read!=NULL)||
+       mainw->agen_key!=0))) {
     mainw->pulsed->audio_ticks=mainw->offsetticks;
     mainw->pulsed->frames_written=0;
     mainw->pulsed->usec_start=0;
   }
 #endif
 
-  if (mainw->iochan!=NULL) lives_widget_show (cfile->proc_ptr->pause_button);
+  if (mainw->iochan!=NULL) lives_widget_show(cfile->proc_ptr->pause_button);
+
 
-  
   // tell jack transport we are ready to play
   mainw->video_seek_ready=TRUE;
 
@@ -1667,46 +1728,43 @@
   // from the mainw->progress_fn function
   while (1) {
     while (!mainw->internal_messaging&&(((!visible&&(mainw->whentostop!=STOP_ON_AUD_END||
-						    prefs->audio_player==AUD_PLAYER_JACK||
-						     prefs->audio_player==AUD_PLAYER_PULSE)))||
-					!g_file_test(cfile->info_file,G_FILE_TEST_EXISTS))) {
+                                          is_realtime_aplayer(prefs->audio_player))))||
+                                        !lives_file_test(cfile->info_file,LIVES_FILE_TEST_EXISTS))) {
 
 
       // just pulse the progress bar, or play video
       // returns FALSE if playback ended
       if (!process_one(visible)) {
-	lives_set_cursor_style(LIVES_CURSOR_NORMAL,NULL);
-	if (mainw->current_file>-1&&cfile!=NULL) lives_freep((void**)&cfile->op_dir);
-	return FALSE;
+        lives_set_cursor_style(LIVES_CURSOR_NORMAL,NULL);
+        if (mainw->current_file>-1&&cfile!=NULL) lives_freep((void **)&cfile->op_dir);
+        return FALSE;
       }
 
-      if (G_UNLIKELY(mainw->agen_needs_reinit)) {
-	// we are generating audio from a plugin and it needs reinit - we do it in this thread so as not to hold up the player thread
-	reinit_audio_gen();
+      if (LIVES_UNLIKELY(mainw->agen_needs_reinit)) {
+        // we are generating audio from a plugin and it needs reinit - we do it in this thread so as not to hold up the player thread
+        reinit_audio_gen();
       }
 
       // normal playback, wth realtime audio player
-      if (!visible&&(mainw->whentostop!=STOP_ON_AUD_END||
-		     prefs->audio_player==AUD_PLAYER_JACK||
-		     prefs->audio_player==AUD_PLAYER_PULSE)) continue;
+      if (!visible&&(mainw->whentostop!=STOP_ON_AUD_END||is_realtime_aplayer(prefs->audio_player))) continue;
 
       if (mainw->iochan!=NULL&&progress_count==0) {
-	// pump data from stdout to textbuffer
-	// this is for encoder output
-	pump_io_chan(mainw->iochan);
+        // pump data from stdout to textbuffer
+        // this is for encoder output
+        pump_io_chan(mainw->iochan);
       }
 
-      if (visible&&!mainw->internal_messaging) g_usleep(prefs->sleep_time);
+      if (visible&&!mainw->internal_messaging) lives_usleep(prefs->sleep_time);
 
     }
 
     if (!mainw->internal_messaging) {
       // background processing (e.g. rendered effects)
       if ((infofile=fopen(cfile->info_file,"r"))) {
-	// OK, now we might have some frames
-	mainw->read_failed=FALSE;
-	lives_fgets(mainw->msg,512,infofile);
-	fclose(infofile);
+        // OK, now we might have some frames
+        mainw->read_failed=FALSE;
+        lives_fgets(mainw->msg,512,infofile);
+        fclose(infofile);
       }
     }
     // else call realtime effect pass
@@ -1714,16 +1772,16 @@
       mainw->render_error=(*mainw->progress_fn)(FALSE);
 
       if (mainw->render_error>=LIVES_RENDER_ERROR) {
-	if (mainw->current_file>-1&&cfile!=NULL) lives_freep((void**)&cfile->op_dir);
-	got_err=TRUE;
-	goto finish;
+        if (mainw->current_file>-1&&cfile!=NULL) lives_freep((void **)&cfile->op_dir);
+        got_err=TRUE;
+        goto finish;
       }
 
       // display progress fraction or pulse bar
       if (mainw->msg!=NULL&&strlen(mainw->msg)>0&&(frames_done=atoi(mainw->msg))>0)
-	cfile->proc_ptr->frames_done=atoi(mainw->msg);
+        cfile->proc_ptr->frames_done=atoi(mainw->msg);
       else
-	cfile->proc_ptr->frames_done=0;
+        cfile->proc_ptr->frames_done=0;
       if (progress_count==0) check_storage_space(cfile, TRUE);
       progbar_pulse_or_fraction(cfile,cfile->proc_ptr->frames_done);
     }
@@ -1736,101 +1794,99 @@
     // we got a message from the backend...
 
     if (visible&&(!accelerators_swapped||cfile->opening)&&cancellable&&(!cfile->nopreview||cfile->keep_without_preview)) {
-      if (!cfile->nopreview&&!(cfile->opening&&mainw->multitrack!=NULL)) 
-	lives_widget_show (cfile->proc_ptr->preview_button);
-      if (cfile->opening_loc) lives_widget_show (cfile->proc_ptr->stop_button);
-      else lives_widget_show (cfile->proc_ptr->pause_button);
+      if (!cfile->nopreview&&!(cfile->opening&&mainw->multitrack!=NULL))
+        lives_widget_show(cfile->proc_ptr->preview_button);
+      if (cfile->opening_loc) lives_widget_show(cfile->proc_ptr->stop_button);
+      else lives_widget_show(cfile->proc_ptr->pause_button);
 
       if (!cfile->opening&&!cfile->nopreview) {
-	lives_widget_grab_default (cfile->proc_ptr->preview_button);
-	if (mainw->preview_box!=NULL) lives_widget_set_tooltip_text( mainw->p_playbutton,_ ("Preview"));
-	lives_widget_set_tooltip_text( mainw->m_playbutton,_ ("Preview"));
-	lives_widget_remove_accelerator (mainw->playall, mainw->accel_group, LIVES_KEY_p, (LiVESXModifierType)0);
-	lives_widget_add_accelerator (cfile->proc_ptr->preview_button, LIVES_WIDGET_CLICKED_EVENT, mainw->accel_group, LIVES_KEY_p,
-				    (LiVESXModifierType)0, (LiVESAccelFlags)0);
-	accelerators_swapped=TRUE;
+        lives_widget_grab_default(cfile->proc_ptr->preview_button);
+        if (mainw->preview_box!=NULL) lives_widget_set_tooltip_text(mainw->p_playbutton,_("Preview"));
+        lives_widget_set_tooltip_text(mainw->m_playbutton,_("Preview"));
+        lives_widget_remove_accelerator(mainw->playall, mainw->accel_group, LIVES_KEY_p, (LiVESXModifierType)0);
+        lives_widget_add_accelerator(cfile->proc_ptr->preview_button, LIVES_WIDGET_CLICKED_SIGNAL, mainw->accel_group, LIVES_KEY_p,
+                                     (LiVESXModifierType)0, (LiVESAccelFlags)0);
+        accelerators_swapped=TRUE;
       }
     }
 
     if (strncmp(mainw->msg,"completed",8)&&strncmp(mainw->msg,"error",5)&&
-	strncmp(mainw->msg,"killed",6)&&(visible||
-					 ((strncmp(mainw->msg,"video_ended",11)||mainw->whentostop!=STOP_ON_VID_END)
-					  &&(strncmp(mainw->msg,"audio_ended",11)||mainw->preview||
-					     mainw->whentostop!=STOP_ON_AUD_END)))) {
+        strncmp(mainw->msg,"killed",6)&&(visible||
+                                         ((strncmp(mainw->msg,"video_ended",11)||mainw->whentostop!=STOP_ON_VID_END)
+                                          &&(strncmp(mainw->msg,"audio_ended",11)||mainw->preview||
+                                              mainw->whentostop!=STOP_ON_AUD_END)))) {
       // processing not yet completed...
       if (visible) {
-	// last frame processed ->> will go from cfile->start to cfile->end
-	int numtok=get_token_count (mainw->msg,'|');
-	// get progress count from backend
-	if (numtok>1) {
-	  gchar **array=g_strsplit(mainw->msg,"|",numtok);
-	  cfile->proc_ptr->frames_done=atoi(array[0]);
-	  if (numtok==2&&strlen(array[1])>0) cfile->progress_end=atoi(array[1]);
-	  else if (numtok==5&&strlen(array[4])>0) {
-	    // rendered generators
-	    cfile->start=cfile->undo_start=1;
-	    cfile->frames=cfile->end=cfile->undo_end=atoi(array[0]);
-	    cfile->hsize=atoi(array[1]);
-	    cfile->vsize=atoi(array[2]);
-	    cfile->fps=cfile->pb_fps=strtod(array[3],NULL);
-	    if (cfile->fps==0.) cfile->fps=cfile->pb_fps=prefs->default_fps;
-	    cfile->progress_end=atoi(array[4]);
-	  }
-	  g_strfreev(array);
-	}
-	else cfile->proc_ptr->frames_done=atoi(mainw->msg);
+        // last frame processed ->> will go from cfile->start to cfile->end
+        int numtok=get_token_count(mainw->msg,'|');
+        // get progress count from backend
+        if (numtok>1) {
+          char **array=lives_strsplit(mainw->msg,"|",numtok);
+          cfile->proc_ptr->frames_done=atoi(array[0]);
+          if (numtok==2&&strlen(array[1])>0) cfile->progress_end=atoi(array[1]);
+          else if (numtok==5&&strlen(array[4])>0) {
+            // rendered generators
+            cfile->start=cfile->undo_start=1;
+            cfile->frames=cfile->end=cfile->undo_end=atoi(array[0]);
+            cfile->hsize=atoi(array[1]);
+            cfile->vsize=atoi(array[2]);
+            cfile->fps=cfile->pb_fps=strtod(array[3],NULL);
+            if (cfile->fps==0.) cfile->fps=cfile->pb_fps=prefs->default_fps;
+            cfile->progress_end=atoi(array[4]);
+          }
+          lives_strfreev(array);
+        } else cfile->proc_ptr->frames_done=atoi(mainw->msg);
       }
 
       // do a processing pass
       if (!process_one(visible)) {
-	lives_set_cursor_style(LIVES_CURSOR_NORMAL,NULL);
-	if (mainw->current_file>-1&&cfile!=NULL) lives_freep((void**)&cfile->op_dir);
-	return FALSE;
+        lives_set_cursor_style(LIVES_CURSOR_NORMAL,NULL);
+        if (mainw->current_file>-1&&cfile!=NULL) lives_freep((void **)&cfile->op_dir);
+        return FALSE;
       }
 
-      if (G_UNLIKELY(mainw->agen_needs_reinit)) {
-	// we are generating audio from a plugin and it needs reinit - we do it in this thread so as not to hold up the player thread
-	reinit_audio_gen();
+      if (LIVES_UNLIKELY(mainw->agen_needs_reinit)) {
+        // we are generating audio from a plugin and it needs reinit - we do it in this thread so as not to hold up the player thread
+        reinit_audio_gen();
       }
 
       if (mainw->iochan!=NULL&&progress_count==0) {
-	// pump data from stdout to textbuffer
-	pump_io_chan(mainw->iochan);
+        // pump data from stdout to textbuffer
+        pump_io_chan(mainw->iochan);
       }
-      g_usleep(prefs->sleep_time);
-    }
-    else break;
+      lives_usleep(prefs->sleep_time);
+    } else break;
   }
 
 #ifdef DEBUG
-  g_print ("exit pt 3 %s\n",mainw->msg);
+  g_print("exit pt 3 %s\n",mainw->msg);
 #endif
 
- finish:
+finish:
 
   //play/operation ended
   if (visible) {
     if (cfile->clip_type==CLIP_TYPE_DISK&&(mainw->cancelled!=CANCEL_NO_MORE_PREVIEW||!cfile->opening)) {
       unlink(cfile->info_file);
     }
-    if (mainw->preview_box!=NULL&&!mainw->preview) lives_widget_set_tooltip_text( mainw->p_playbutton,
-									 _("Play all"));
+    if (mainw->preview_box!=NULL&&!mainw->preview) lives_widget_set_tooltip_text(mainw->p_playbutton,
+          _("Play all"));
     if (accelerators_swapped) {
-      if (!mainw->preview) lives_widget_set_tooltip_text( mainw->m_playbutton,_ ("Play all"));
-      lives_widget_remove_accelerator (cfile->proc_ptr->preview_button, mainw->accel_group, LIVES_KEY_p, (LiVESXModifierType)0);
-      lives_widget_add_accelerator (mainw->playall, LIVES_WIDGET_ACTIVATE_EVENT, mainw->accel_group, LIVES_KEY_p, (LiVESXModifierType)0,
-				  LIVES_ACCEL_VISIBLE);
+      if (!mainw->preview) lives_widget_set_tooltip_text(mainw->m_playbutton,_("Play all"));
+      lives_widget_remove_accelerator(cfile->proc_ptr->preview_button, mainw->accel_group, LIVES_KEY_p, (LiVESXModifierType)0);
+      lives_widget_add_accelerator(mainw->playall, LIVES_WIDGET_ACTIVATE_SIGNAL, mainw->accel_group, LIVES_KEY_p, (LiVESXModifierType)0,
+                                   LIVES_ACCEL_VISIBLE);
       accelerators_swapped=FALSE;
     }
     if (cfile->proc_ptr!=NULL) {
-      const gchar *btext=NULL;
-      if (mainw->iochan!=NULL) btext=lives_text_view_get_text(mainw->optextview); 
+      const char *btext=NULL;
+      if (mainw->iochan!=NULL) btext=lives_text_view_get_text(mainw->optextview);
       if (cfile->proc_ptr->processing!=NULL) lives_widget_destroy(cfile->proc_ptr->processing);
-      g_free(cfile->proc_ptr);
+      lives_free(cfile->proc_ptr);
       cfile->proc_ptr=NULL;
       if (btext!=NULL) {
-	lives_text_view_set_text(mainw->optextview,btext,-1);
-	g_free((gchar *)btext);
+        lives_text_view_set_text(mainw->optextview,btext,-1);
+        lives_free((char *)btext);
       }
     }
     mainw->is_processing=FALSE;
@@ -1839,27 +1895,25 @@
       // should manually call sensitize() after operation
       sensitize();
     }
-  }
-  else {
+  } else {
     if (prefs->show_player_stats) {
       if (mainw->fps_measure>0.) {
-	gettimeofday(&tv, NULL);
-	mainw->fps_measure/=(double)(U_SECL*(tv.tv_sec-mainw->origsecs)+tv.tv_usec*U_SEC_RATIO-
-				      mainw->origusecs*U_SEC_RATIO-mainw->offsetticks)/U_SEC;
+        gettimeofday(&tv, NULL);
+        mainw->fps_measure/=(double)(U_SECL*(tv.tv_sec-mainw->origsecs)+tv.tv_usec*U_SEC_RATIO-
+                                     mainw->origusecs*U_SEC_RATIO-mainw->offsetticks)/U_SEC;
       }
     }
     mainw->is_processing=TRUE;
   }
 
   lives_set_cursor_style(LIVES_CURSOR_NORMAL,NULL);
-  if (mainw->current_file>-1&&cfile!=NULL) lives_freep((void**)&cfile->op_dir);
+  if (mainw->current_file>-1&&cfile!=NULL) lives_freep((void **)&cfile->op_dir);
 
   // get error message (if any)
   if (!strncmp(mainw->msg,"error",5)) {
     handle_backend_errors();
     if (mainw->cancelled) return FALSE;
-  }
-  else {
+  } else {
     if (!check_storage_space((mainw->current_file>-1)?cfile:NULL,FALSE)) return FALSE;
   }
 
@@ -1873,7 +1927,7 @@
 
 #define MIN_FLASH_TIME 100000000
 
-boolean do_auto_dialog (const gchar *text, int type) {
+boolean do_auto_dialog(const char *text, int type) {
   // type 0 = normal auto_dialog
   // type 1 = countdown dialog for audio recording
   // type 2 = normal with cancel
@@ -1884,8 +1938,8 @@
 
   xprocess *proc_ptr;
 
-  gchar *label_text;
-  gchar *mytext=g_strdup(text);
+  char *label_text;
+  char *mytext=lives_strdup(text);
 
   int time_rem,last_time_rem=10000000;
   int alarm_handle=0;
@@ -1893,20 +1947,20 @@
 
   mainw->error=FALSE;
 
-  proc_ptr=create_processing (mytext);
-  if (mytext!=NULL) g_free(mytext);
-  lives_widget_hide (proc_ptr->stop_button);
-  lives_window_set_modal (LIVES_WINDOW (proc_ptr->processing), TRUE);
-     
+  proc_ptr=create_processing(mytext);
+  if (mytext!=NULL) lives_free(mytext);
+  lives_widget_hide(proc_ptr->stop_button);
+  lives_window_set_modal(LIVES_WINDOW(proc_ptr->processing), TRUE);
+
   if (type==2) {
-    lives_widget_show (proc_ptr->cancel_button);
-    lives_widget_hide (proc_ptr->pause_button);
+    lives_widget_show(proc_ptr->cancel_button);
+    lives_widget_hide(proc_ptr->pause_button);
     mainw->cancel_type=CANCEL_SOFT;
   }
 
   lives_progress_bar_set_pulse_step(LIVES_PROGRESS_BAR(proc_ptr->progressbar),.01);
   lives_widget_show(proc_ptr->processing);
-  
+
   lives_set_cursor_style(LIVES_CURSOR_BUSY,NULL);
   lives_set_cursor_style(LIVES_CURSOR_BUSY,proc_ptr->processing);
   lives_widget_context_update();
@@ -1914,8 +1968,7 @@
   if (type==0||type==2) {
     clear_mainw_msg();
     alarm_handle=lives_alarm_set(MIN_FLASH_TIME); // don't want to flash too fast...
-  }
-  else if (type==1) {
+  } else if (type==1) {
     lives_widget_show(proc_ptr->stop_button);
     lives_widget_show(proc_ptr->cancel_button);
 #ifdef HAVE_PULSE_AUDIO
@@ -1923,28 +1976,28 @@
 #endif
     if (mainw->rec_samples!=0) {
       lives_widget_context_update();
-      g_usleep(prefs->sleep_time);
+      lives_usleep(prefs->sleep_time);
     }
   }
 
   while ((type==0||((type==1||type==2)&&mainw->cancelled==CANCEL_NONE))
-	 &&((type==1||((type==0||type==2)&&!(infofile=fopen(cfile->info_file,"r")))))) {
+         &&((type==1||((type==0||type==2)&&!(infofile=fopen(cfile->info_file,"r")))))) {
     lives_progress_bar_pulse(LIVES_PROGRESS_BAR(proc_ptr->progressbar));
     lives_widget_context_update();
-    g_usleep(prefs->sleep_time);
+    lives_usleep(prefs->sleep_time);
     if (type==1&&mainw->rec_end_time!=-1.) {
       gettimeofday(&tv, NULL);
       time=tv.tv_sec*1000000.+tv.tv_usec; // time in microseconds
       time_rem=(int)((double)(end_time-time)/1000000.+.5);
       if (time_rem>=0&&time_rem<last_time_rem) {
-	label_text=g_strdup_printf(_("\nTime remaining: %d sec"),time_rem);
-	lives_label_set_text(LIVES_LABEL(proc_ptr->label2),label_text);
-	g_free(label_text);
-	last_time_rem=time_rem;
+        label_text=lives_strdup_printf(_("\nTime remaining: %d sec"),time_rem);
+        lives_label_set_text(LIVES_LABEL(proc_ptr->label2),label_text);
+        lives_free(label_text);
+        last_time_rem=time_rem;
       }
     }
   }
-  
+
 
   if (type==0||type==2) {
     mainw->read_failed=FALSE;
@@ -1955,14 +2008,14 @@
     while (!lives_alarm_get(alarm_handle)) {
       lives_progress_bar_pulse(LIVES_PROGRESS_BAR(proc_ptr->progressbar));
       lives_widget_context_update();
-      g_usleep(prefs->sleep_time);
+      lives_usleep(prefs->sleep_time);
     }
     lives_alarm_clear(alarm_handle);
   }
 
   if (proc_ptr!=NULL) {
     lives_widget_destroy(proc_ptr->processing);
-    g_free(proc_ptr);
+    lives_free(proc_ptr);
   }
 
   if (type==2) mainw->cancel_type=CANCEL_KILL;
@@ -1973,8 +2026,7 @@
   if (type!=1 && !strncmp(mainw->msg,"error",5)) {
     handle_backend_errors();
     if (mainw->cancelled) return FALSE;
-  }
-  else {
+  } else {
     if (mainw->current_file>-1&&cfile!=NULL)
       if (!check_storage_space((mainw->current_file>-1)?cfile:NULL,FALSE)) return FALSE;
   }
@@ -1985,38 +2037,42 @@
 
 
 void too_many_files(void) {
-  gchar *warn=g_strdup_printf(_ ("\nSorry, LiVES can only open %d files at once.\nPlease close a file and then try again."),MAX_FILES);
+  char *warn=lives_strdup_printf(_("\nSorry, LiVES can only open %d files at once.\nPlease close a file and then try again."),MAX_FILES);
   do_error_dialog(warn);
-  g_free(warn);
+  lives_free(warn);
 }
 
-void tempdir_warning (void) {
-  gchar *tmp,*com=g_strdup_printf(_ ("LiVES was unable to write to its temporary directory.\n\nThe current temporary directory is:\n\n%s\n\nPlease make sure you can write to this directory."),
-				  (tmp=g_filename_to_utf8(prefs->tmpdir,-1,NULL,NULL,NULL)));
-  g_free(tmp);
+void tempdir_warning(void) {
+  char *tmp,*com=lives_strdup_printf(
+                   _("LiVES was unable to write to its temporary directory.\n\nThe current temporary directory is:\n\n%s\n\nPlease make sure you can write to this directory."),
+                   (tmp=lives_filename_to_utf8(prefs->tmpdir,-1,NULL,NULL,NULL)));
+  lives_free(tmp);
   if (mainw!=NULL&&mainw->is_ready) {
     do_error_dialog(com);
   }
-  g_free(com);
+  lives_free(com);
 }
 
 
 void do_no_mplayer_sox_error(void) {
-  do_blocking_error_dialog(_ ("\nLiVES currently requires either 'mplayer', 'mplayer2', or 'sox' to function. Please install one or other of these, and try again.\n"));
+  do_blocking_error_dialog(
+    _("\nLiVES currently requires either 'mplayer', 'mplayer2', or 'sox' to function. Please install one or other of these, and try again.\n"));
 }
 
 
 void do_audio_warning(void) {
-  do_error_dialog (_ ("Audio was not loaded; please install mplayer or mplayer2 if you expected audio for this clip.\n"));
+  do_error_dialog(_("Audio was not loaded; please install mplayer or mplayer2 if you expected audio for this clip.\n"));
 }
 
 void do_encoder_sox_error(void) {
-  do_error_dialog (_ ("Audio resampling is required for this format.\nPlease install 'sox'\nOr switch to another encoder format in Tools | Preferences | Encoding\n"));
+  do_error_dialog(
+    _("Audio resampling is required for this format.\nPlease install 'sox'\nOr switch to another encoder format in Tools | Preferences | Encoding\n"));
 }
 
 
-void do_encoder_acodec_error (void) {
-  do_error_dialog (_ ("\n\nThis encoder/format cannot use the requested audio codec.\nPlease set the audio codec in Tools|Preferences|Encoding\n"));
+void do_encoder_acodec_error(void) {
+  do_error_dialog(
+    _("\n\nThis encoder/format cannot use the requested audio codec.\nPlease set the audio codec in Tools|Preferences|Encoding\n"));
 }
 
 
@@ -2032,19 +2088,19 @@
 
 
 
-boolean rdet_suggest_values (int width, int height, double fps, int fps_num, int fps_denom, int arate, int asigned, 
-			     boolean swap_endian, boolean anr, boolean ignore_fps) {
+boolean rdet_suggest_values(int width, int height, double fps, int fps_num, int fps_denom, int arate, int asigned,
+                            boolean swap_endian, boolean anr, boolean ignore_fps) {
   LiVESWidget *prep_dialog;
 
-  gchar *msg1=g_strdup_printf (_ ("\n\nDue to restrictions in the %s format\n"),prefs->encoder.of_desc);
-  gchar *msg2=g_strdup ("");
-  gchar *msg3=g_strdup ("");
-  gchar *msg4=g_strdup ("");
-  gchar *msg5=g_strdup ("");
-  gchar *msg6=g_strdup ("");
-  gchar *msg7=g_strdup ("");
-  gchar *msg8=g_strdup ("");
-  gchar *msg_a;
+  char *msg1=lives_strdup_printf(_("\n\nDue to restrictions in the %s format\n"),prefs->encoder.of_desc);
+  char *msg2=lives_strdup("");
+  char *msg3=lives_strdup("");
+  char *msg4=lives_strdup("");
+  char *msg5=lives_strdup("");
+  char *msg6=lives_strdup("");
+  char *msg7=lives_strdup("");
+  char *msg8=lives_strdup("");
+  char *msg_a;
 
   boolean ochange=FALSE;
   boolean ret;
@@ -2055,93 +2111,89 @@
       (fps>0.&&fps!=rdet->fps)||(fps_denom>0&&(fps_num*1.)/(fps_denom*1.)!=rdet->fps)||
       (!anr&&(rdet->width!=width||rdet->height!=height)&&height*width>0)||
       (arate!=rdet->arate&&arate>0)) {
-    g_free (msg2);
-    msg2=g_strdup (_ ("LiVES recommends the following settings:\n\n"));
+    lives_free(msg2);
+    msg2=lives_strdup(_("LiVES recommends the following settings:\n\n"));
     if (swap_endian||(asigned==1&&rdet->aendian==AFORM_UNSIGNED)||(asigned==2&&rdet->aendian==AFORM_SIGNED)
-	||(arate>0&&arate!=rdet->arate)) {
-      gchar *sstring;
-      gchar *estring;
-
-      if (asigned==1&&rdet->aendian==AFORM_UNSIGNED) sstring=g_strdup(_(", signed"));
-      else if (asigned==2&&rdet->aendian==AFORM_SIGNED) sstring=g_strdup(_(", unsigned"));
-      else sstring=g_strdup("");
+        ||(arate>0&&arate!=rdet->arate)) {
+      char *sstring;
+      char *estring;
+
+      if (asigned==1&&rdet->aendian==AFORM_UNSIGNED) sstring=lives_strdup(_(", signed"));
+      else if (asigned==2&&rdet->aendian==AFORM_SIGNED) sstring=lives_strdup(_(", unsigned"));
+      else sstring=lives_strdup("");
 
       if (swap_endian) {
-	if (mainw->endian!=AFORM_BIG_ENDIAN) estring=g_strdup(_(", little-endian"));
-	else estring=g_strdup(_(", big-endian"));
-      }
-      else estring=g_strdup("");
+        if (mainw->endian!=AFORM_BIG_ENDIAN) estring=lives_strdup(_(", little-endian"));
+        else estring=lives_strdup(_(", big-endian"));
+      } else estring=lives_strdup("");
 
       ochange=TRUE;
-      g_free (msg3);
-      msg3=g_strdup_printf (_ ("Use an audio rate of %d Hz%s%s\n"),arate,sstring,estring);
-      g_free(sstring);
-      g_free(estring);
+      lives_free(msg3);
+      msg3=lives_strdup_printf(_("Use an audio rate of %d Hz%s%s\n"),arate,sstring,estring);
+      lives_free(sstring);
+      lives_free(estring);
     }
     if (!ignore_fps) {
       ochange=TRUE;
       if (fps>0&&fps!=rdet->fps) {
-	g_free (msg4);
-	msg4=g_strdup_printf (_ ("Set video rate to %.3f frames per second\n"),fps);
-      }
-      else if (fps_denom>0&&(fps_num*1.)/(fps_denom*1.)!=rdet->fps) {
-	g_free (msg4);
-	msg4=g_strdup_printf (_ ("Set video rate to %d:%d frames per second\n"),fps_num,fps_denom);
+        lives_free(msg4);
+        msg4=lives_strdup_printf(_("Set video rate to %.3f frames per second\n"),fps);
+      } else if (fps_denom>0&&(fps_num*1.)/(fps_denom*1.)!=rdet->fps) {
+        lives_free(msg4);
+        msg4=lives_strdup_printf(_("Set video rate to %d:%d frames per second\n"),fps_num,fps_denom);
       }
     }
     if (!anr&&((rdet->width!=width||rdet->height!=height)&&height*width>0)) {
-      g_free (msg5);
-      msg5=g_strdup_printf (_ ("Set video size to %d x %d pixels\n"),width,height);
+      lives_free(msg5);
+      msg5=lives_strdup_printf(_("Set video size to %d x %d pixels\n"),width,height);
       mainw->fx1_bool=TRUE;
     }
   }
   if (anr||arate<0) {
     if (arate<1||((rdet->width!=width||rdet->height!=height)&&height*width>0)) {
-      g_free (msg6);
+      lives_free(msg6);
       if (!ochange) anr=FALSE;
-      msg6=g_strdup (_ ("\nYou may wish to:\n"));
+      msg6=lives_strdup(_("\nYou may wish to:\n"));
       if ((rdet->width!=width||rdet->height!=height)&&height*width>0) {
-	g_free (msg7);
-	msg7=g_strdup_printf(_ ("resize video to %d x %d pixels\n"),width,height);
-      }
-      else anr=FALSE;
+        lives_free(msg7);
+        msg7=lives_strdup_printf(_("resize video to %d x %d pixels\n"),width,height);
+      } else anr=FALSE;
       if (arate<1) {
-	g_free (msg8);
-	msg8=g_strdup(_("disable audio, since the target encoder cannot encode audio\n"));
+        lives_free(msg8);
+        msg8=lives_strdup(_("disable audio, since the target encoder cannot encode audio\n"));
       }
-    }
-    else anr=FALSE;
+    } else anr=FALSE;
   }
-  msg_a=g_strconcat (msg1,msg2,msg3,msg4,msg5,msg6,msg7,msg8,NULL);
-  g_free (msg1);
-  g_free (msg2);
-  g_free (msg3);
-  g_free (msg4);
-  g_free (msg5);
-  g_free (msg6);
-  g_free (msg7);
-  g_free (msg8);
+  msg_a=lives_strconcat(msg1,msg2,msg3,msg4,msg5,msg6,msg7,msg8,NULL);
+  lives_free(msg1);
+  lives_free(msg2);
+  lives_free(msg3);
+  lives_free(msg4);
+  lives_free(msg5);
+  lives_free(msg6);
+  lives_free(msg7);
+  lives_free(msg8);
   prep_dialog=create_encoder_prep_dialog(msg_a,NULL,anr);
-  g_free (msg_a);
-  ret=(lives_dialog_run(LIVES_DIALOG (prep_dialog))==LIVES_RESPONSE_OK);
-  lives_widget_destroy (prep_dialog);
+  lives_free(msg_a);
+  ret=(lives_dialog_run(LIVES_DIALOG(prep_dialog))==LIVES_RESPONSE_OK);
+  lives_widget_destroy(prep_dialog);
   return ret;
 }
 
 
 
-boolean do_encoder_restrict_dialog (int width, int height, double fps, int fps_num, int fps_denom, int arate, int asigned, 
-				    boolean swap_endian, boolean anr, boolean save_all) {
+boolean do_encoder_restrict_dialog(int width, int height, double fps, int fps_num, int fps_denom, int arate, int asigned,
+                                   boolean swap_endian, boolean anr, boolean save_all) {
   LiVESWidget *prep_dialog;
 
-  gchar *msg1=g_strdup_printf (_ ("\n\nDue to restrictions in the %s format\n"),prefs->encoder.of_desc);
-  gchar *msg2=g_strdup ("");
-  gchar *msg3=g_strdup ("");
-  gchar *msg4=g_strdup ("");
-  gchar *msg5=g_strdup ("");
-  gchar *msg6=g_strdup ("");
-  gchar *msg7=g_strdup ("");
-  gchar *msg_a,*msg_b=NULL;
+  char *msg1=lives_strdup_printf(_("\n\nDue to restrictions in the %s format\n"),prefs->encoder.of_desc);
+  char *msg2=lives_strdup("");
+  char *msg3=lives_strdup("");
+  char *msg4=lives_strdup("");
+  char *msg5=lives_strdup("");
+  char *msg6=lives_strdup("");
+  char *msg7=lives_strdup("");
+  char *msg_a,*msg_b=NULL;
 
   double cfps;
 
@@ -2154,8 +2206,7 @@
     chsize=rdet->width;
     cvsize=rdet->height;
     cfps=rdet->fps;
-  }
-  else {
+  } else {
     carate=cfile->arate;
     chsize=cfile->hsize;
     cvsize=cfile->vsize;
@@ -2165,100 +2216,101 @@
 
   if (swap_endian||asigned!=0||(arate>0&&arate!=carate)||(fps>0.&&fps!=cfps)||
       (fps_denom>0&&(fps_num*1.)/(fps_denom*1.)!=cfps)||(!anr&&
-							 (chsize!=width||cvsize!=height)&&height*width>0)) {
-    g_free (msg2);
-    msg2=g_strdup (_ ("LiVES must:\n"));
+          (chsize!=width||cvsize!=height)&&height*width>0)) {
+    lives_free(msg2);
+    msg2=lives_strdup(_("LiVES must:\n"));
     if (swap_endian||asigned!=0||(arate>0&&arate!=carate)) {
-      gchar *sstring;
-      gchar *estring;
-      if (asigned==1) sstring=g_strdup(_(", signed"));
-      else if (asigned==2) sstring=g_strdup(_(", unsigned"));
-      else sstring=g_strdup("");
+      char *sstring;
+      char *estring;
+      if (asigned==1) sstring=lives_strdup(_(", signed"));
+      else if (asigned==2) sstring=lives_strdup(_(", unsigned"));
+      else sstring=lives_strdup("");
 
       if (swap_endian) {
-	if (cfile->signed_endian&AFORM_BIG_ENDIAN) estring=g_strdup(_(", little-endian"));
-	else estring=g_strdup(_(", big-endian"));
-      }
-      else estring=g_strdup("");
-
-      g_free (msg3);
-      msg3=g_strdup_printf (_ ("resample audio to %d Hz%s%s\n"),arate,sstring,estring);
-      g_free(sstring);
-      g_free(estring);
+        if (cfile->signed_endian&AFORM_BIG_ENDIAN) estring=lives_strdup(_(", little-endian"));
+        else estring=lives_strdup(_(", big-endian"));
+      } else estring=lives_strdup("");
+
+      lives_free(msg3);
+      msg3=lives_strdup_printf(_("resample audio to %d Hz%s%s\n"),arate,sstring,estring);
+      lives_free(sstring);
+      lives_free(estring);
 
     }
     if (fps>0&&fps!=cfps) {
-      g_free (msg4);
-      msg4=g_strdup_printf (_ ("resample video to %.3f frames per second\n"),fps);
-    }
-    else if (fps_denom>0&&(fps_num*1.)/(fps_denom*1.)!=cfps) {
-      g_free (msg4);
-      msg4=g_strdup_printf (_ ("resample video to %d:%d frames per second\n"),fps_num,fps_denom);
+      lives_free(msg4);
+      msg4=lives_strdup_printf(_("resample video to %.3f frames per second\n"),fps);
+    } else if (fps_denom>0&&(fps_num*1.)/(fps_denom*1.)!=cfps) {
+      lives_free(msg4);
+      msg4=lives_strdup_printf(_("resample video to %d:%d frames per second\n"),fps_num,fps_denom);
     }
     if (!anr&&((chsize!=width||cvsize!=height)&&height*width>0)) {
-      g_free (msg5);
-      msg5=g_strdup_printf (_ ("resize video to %d x %d pixels\n"),width,height);
+      lives_free(msg5);
+      msg5=lives_strdup_printf(_("resize video to %d x %d pixels\n"),width,height);
       mainw->fx1_bool=TRUE;
     }
   }
   if (anr) {
     if ((chsize!=width||cvsize!=height)&&height*width>0) {
-      g_free (msg6);
-      g_free (msg7);
-      msg6=g_strdup(_ ("\nYou may wish to:\n"));
-      msg7=g_strdup_printf (_ ("Set video size to %d x %d pixels\n"),width,height);
-    }
-    else anr=FALSE;
+      lives_free(msg6);
+      lives_free(msg7);
+      msg6=lives_strdup(_("\nYou may wish to:\n"));
+      msg7=lives_strdup_printf(_("Set video size to %d x %d pixels\n"),width,height);
+    } else anr=FALSE;
   }
-  msg_a=g_strconcat (msg1,msg2,msg3,msg4,msg5,msg6,msg7,NULL);
+  msg_a=lives_strconcat(msg1,msg2,msg3,msg4,msg5,msg6,msg7,NULL);
   if (save_all) {
-    msg_b=g_strdup (_ ("\nYou will be able to undo these changes afterwards.\n\nClick `OK` to proceed, `Cancel` to abort.\n\n"));
-  }
-  else {
-    msg_b=g_strdup (_ ("\nChanges applied to the selection will not be permanent.\n\n"));
+    msg_b=lives_strdup(_("\nYou will be able to undo these changes afterwards.\n\nClick `OK` to proceed, `Cancel` to abort.\n\n"));
+  } else {
+    msg_b=lives_strdup(_("\nChanges applied to the selection will not be permanent.\n\n"));
   }
-  g_free (msg1);
-  g_free (msg2);
-  g_free (msg3);
-  g_free (msg4);
-  g_free (msg5);
-  g_free (msg6);
-  g_free (msg7);
+  lives_free(msg1);
+  lives_free(msg2);
+  lives_free(msg3);
+  lives_free(msg4);
+  lives_free(msg5);
+  lives_free(msg6);
+  lives_free(msg7);
   prep_dialog=create_encoder_prep_dialog(msg_a,msg_b,anr);
-  g_free (msg_a);
-  if (msg_b!=NULL) g_free (msg_b);
-  ret=(lives_dialog_run(LIVES_DIALOG (prep_dialog))==LIVES_RESPONSE_OK);
-  lives_widget_destroy (prep_dialog);
+  lives_free(msg_a);
+  if (msg_b!=NULL) lives_free(msg_b);
+  ret=(lives_dialog_run(LIVES_DIALOG(prep_dialog))==LIVES_RESPONSE_OK);
+  lives_widget_destroy(prep_dialog);
   return ret;
 }
 
 
 void perf_mem_warning(void) {
-  do_error_dialog(_ ("\n\nLiVES was unable to record a performance. There is currently insufficient memory available.\nTry recording for just a selection of the file."));
+  do_error_dialog(
+    _("\n\nLiVES was unable to record a performance. There is currently insufficient memory available.\nTry recording for just a selection of the file."));
 }
 
 boolean do_clipboard_fps_warning(void) {
   if (prefs->warning_mask&WARN_MASK_FPS) {
     return TRUE;
   }
-  return do_warning_dialog_with_check(_ ("The playback speed (fps), or the audio rate\n of the clipboard does not match\nthe playback speed or audio rate of the clip you are inserting into.\n\nThe insertion will be adjusted to fit into the clip.\n\nPlease press Cancel to abort the insert, or OK to continue."),WARN_MASK_FPS);
+  return do_warning_dialog_with_check(
+           _("The playback speed (fps), or the audio rate\n of the clipboard does not match\nthe playback speed or audio rate of the clip you are inserting into.\n\nThe insertion will be adjusted to fit into the clip.\n\nPlease press Cancel to abort the insert, or OK to continue."),
+           WARN_MASK_FPS);
 }
 
 boolean do_yuv4m_open_warning(void) {
-  gchar *msg;
+  char *msg;
   boolean resp;
   if (prefs->warning_mask&WARN_MASK_OPEN_YUV4M) {
     return TRUE;
   }
-  msg=g_strdup_printf(_ ("When opening a yuvmpeg stream, you should first create a fifo file in:\n\n%sstream.yuv\n\n and then write yuv4mpeg frames to it.\nLiVES will pause briefly until frames are received.\nYou should only click OK if you understand what you are doing, otherwise, click Cancel."),prefs->tmpdir);
+  msg=lives_strdup_printf(
+        _("When opening a yuvmpeg stream, you should first create a fifo file in:\n\n%sstream.yuv\n\n and then write yuv4mpeg frames to it.\nLiVES will pause briefly until frames are received.\nYou should only click OK if you understand what you are doing, otherwise, click Cancel."),
+        prefs->tmpdir);
   resp=do_warning_dialog_with_check(msg,WARN_MASK_OPEN_YUV4M);
-  g_free(msg);
+  lives_free(msg);
   return resp;
 }
 
 
 
-boolean do_comments_dialog (lives_clip_t *sfile, gchar *filename) {
+boolean do_comments_dialog(lives_clip_t *sfile, char *filename) {
   boolean response;
   boolean ok=FALSE;
   boolean encoding=FALSE;
@@ -2270,99 +2322,106 @@
 
   while (!ok) {
     ok=TRUE;
-    if ((response=(lives_dialog_run(LIVES_DIALOG (commentsw->comments_dialog))==LIVES_RESPONSE_OK))) {
-      g_snprintf (sfile->title,256,"%s",lives_entry_get_text (LIVES_ENTRY (commentsw->title_entry)));
-      g_snprintf (sfile->author,256,"%s",lives_entry_get_text (LIVES_ENTRY (commentsw->author_entry)));
-      g_snprintf (sfile->comment,256,"%s",lives_entry_get_text (LIVES_ENTRY (commentsw->comment_entry)));
-      
+    if ((response=(lives_dialog_run(LIVES_DIALOG(commentsw->comments_dialog))==LIVES_RESPONSE_OK))) {
+      lives_snprintf(sfile->title,256,"%s",lives_entry_get_text(LIVES_ENTRY(commentsw->title_entry)));
+      lives_snprintf(sfile->author,256,"%s",lives_entry_get_text(LIVES_ENTRY(commentsw->author_entry)));
+      lives_snprintf(sfile->comment,256,"%s",lives_entry_get_text(LIVES_ENTRY(commentsw->comment_entry)));
+
       if (encoding&&sfile->subt!=NULL&&lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(commentsw->subt_checkbutton))) {
-	gchar *ext=get_extension(lives_entry_get_text(LIVES_ENTRY(commentsw->subt_entry)));
-	if (strcmp(ext,"sub")&&strcmp(ext,"srt")) {
-	  if (!do_sub_type_warning(ext,sfile->subt->type==SUBTITLE_TYPE_SRT?"srt":"sub")) {
-	    lives_entry_set_text(LIVES_ENTRY(commentsw->subt_entry),mainw->subt_save_file);
-	    ok=FALSE;
-	    continue;
-	  }
-	}
-	if (mainw->subt_save_file!=NULL) g_free(mainw->subt_save_file);
-	mainw->subt_save_file=g_strdup(lives_entry_get_text(LIVES_ENTRY(commentsw->subt_entry)));
-      }
-      else {
-	if (mainw->subt_save_file!=NULL) g_free(mainw->subt_save_file);
-	mainw->subt_save_file=NULL;
+        char *ext=get_extension(lives_entry_get_text(LIVES_ENTRY(commentsw->subt_entry)));
+        if (strcmp(ext,"sub")&&strcmp(ext,"srt")) {
+          if (!do_sub_type_warning(ext,sfile->subt->type==SUBTITLE_TYPE_SRT?"srt":"sub")) {
+            lives_entry_set_text(LIVES_ENTRY(commentsw->subt_entry),mainw->subt_save_file);
+            ok=FALSE;
+            continue;
+          }
+        }
+        if (mainw->subt_save_file!=NULL) lives_free(mainw->subt_save_file);
+        mainw->subt_save_file=lives_strdup(lives_entry_get_text(LIVES_ENTRY(commentsw->subt_entry)));
+      } else {
+        if (mainw->subt_save_file!=NULL) lives_free(mainw->subt_save_file);
+        mainw->subt_save_file=NULL;
       }
     }
   }
 
-  lives_widget_destroy (commentsw->comments_dialog);
-  g_free (commentsw);
-  
+  lives_widget_destroy(commentsw->comments_dialog);
+  lives_free(commentsw);
+
   return response;
 }
 
 
-void do_keys_window (void) {
-  gchar *tmp=g_strdup(_ ("Show Keys"));
-  do_text_window (tmp,_ ("You can use the following keys during playback to control LiVES:-\n\nRecordable keys (press 'r' before playback to make a recording)\n-----------------------\nctrl-left                     skip back\nctrl-right                   skip forwards\nctrl-up                      faster/increase effect\nctrl-down                 slower/decrease effect\nctrl-enter                    reset frame rate\nctrl-space                reverse direction\nctrl-backspace         freeze frame\nn                             nervous\nctrl-page up            previous clip\nctrl-page down        next clip\n\nctrl-1                       toggle real-time effect 1\nctrl-2                       toggle real-time effect 2\n                                          ...etc...\nctrl-0                       real-time effects off\n\nk           grab keyboard for last activated effect\nm         switch effect mode (when effect has keyboard grab)\nx                     swap background/foreground\nf1                           store/switch to clip mnemonic 1\nf2                           store/switch to clip mnemonic 2\n                                          ...etc...\nf12                          clear function keys\n\n\n Other playback keys\n-----------------------------\np                             play all\ny                             play selection\nq                             stop\nf                               fullscreen\ns                              separate window\nd                             double size\ng                             ping pong loops\n"));
-  g_free(tmp);
+void do_keys_window(void) {
+  char *tmp=lives_strdup(_("Show Keys"));
+  do_text_window(tmp,
+                 _("You can use the following keys during playback to control LiVES:-\n\nRecordable keys (press 'r' before playback to make a recording)\n-----------------------\nctrl-left                     skip back\nctrl-right                   skip forwards\nctrl-up                      faster/increase effect\nctrl-down                 slower/decrease effect\nctrl-enter                    reset frame rate\nctrl-space                reverse direction\nctrl-backspace         freeze frame\nn                             nervous\nctrl-page up            previous clip\nctrl-page down        next clip\n\nctrl-1                       toggle real-time effect 1\nctrl-2                       toggle real-time effect 2\n                                          ...etc...\nctrl-0                       real-time effects off\n\nk           grab keyboard for last activated effect\nm         switch effect mode (when effect has keyboard grab)\nx                     swap background/foreground\nf1                           store/switch to clip mnemonic 1\nf2                           store/switch to clip mnemonic 2\n                                          ...etc...\nf12                          clear function keys\n\n\n Other playback keys\n-----------------------------\np                             play all\ny                             play selection\nq                             stop\nf                               fullscreen\ns                              separate window\nd                             double size\ng                             ping pong loops\n"));
+  lives_free(tmp);
 }
 
 
 
-void do_mt_keys_window (void) {
-  gchar *tmp=g_strdup(_ ("Multitrack Keys"));
-  do_text_window (tmp,_ ("You can use the following keys to control the multitrack window:-\n\nctrl-left-arrow              move timeline cursor left 1 second\nctrl-right-arrow            move timeline cursor right 1 second\nshift-left-arrow            move timeline cursor left 1 frame\nshift-right-arrow          move timeline cursor right 1 frame\nctrl-up-arrow               move current track up\nctrl-down-arrow           move current track down\nctrl-page-up                select previous clip\nctrl-page-down            select next clip\nctrl-space                    select/deselect current track\nctrl-plus                       zoom in\nctrl-minus                    zoom out\nm                                 make a mark on the timeline (during playback)\nw                                 rewind to play start.\n\nFor other keys, see the menus.\n"));
-  g_free(tmp);
+void do_mt_keys_window(void) {
+  char *tmp=lives_strdup(_("Multitrack Keys"));
+  do_text_window(tmp,
+                 _("You can use the following keys to control the multitrack window:-\n\nctrl-left-arrow              move timeline cursor left 1 second\nctrl-right-arrow            move timeline cursor right 1 second\nshift-left-arrow            move timeline cursor left 1 frame\nshift-right-arrow          move timeline cursor right 1 frame\nctrl-up-arrow               move current track up\nctrl-down-arrow           move current track down\nctrl-page-up                select previous clip\nctrl-page-down            select next clip\nctrl-space                    select/deselect current track\nctrl-plus                       zoom in\nctrl-minus                    zoom out\nm                                 make a mark on the timeline (during playback)\nw                                 rewind to play start.\n\nFor other keys, see the menus.\n"));
+  lives_free(tmp);
 }
 
 
 
-void do_messages_window (void) {
-  gchar *text=lives_text_view_get_text(LIVES_TEXT_VIEW(mainw->textview1));
-  do_text_window (_ ("Message History"),text);
-  g_free(text);
+void do_messages_window(void) {
+  char *text=lives_text_view_get_text(LIVES_TEXT_VIEW(mainw->textview1));
+  do_text_window(_("Message History"),text);
+  lives_free(text);
 }
 
 
-void do_text_window (const gchar *title, const gchar *text) {
-  create_text_window (title,text,NULL);
+void do_text_window(const char *title, const char *text) {
+  create_text_window(title,text,NULL);
 }
 
 
 
-void do_upgrade_error_dialog (void) {
-  gchar *tmp;
-  gchar *msg=g_strdup_printf (_("After upgrading/installing, you may need to adjust the <prefix_dir> setting in your %s file"),(tmp=g_filename_to_utf8(capable->rcfile,-1,NULL,NULL,NULL)));
-  startup_message_info (msg);
-  g_free(msg);
-  g_free(tmp);
+void do_upgrade_error_dialog(void) {
+  char *tmp;
+  char *msg=lives_strdup_printf(_("After upgrading/installing, you may need to adjust the <prefix_dir> setting in your %s file"),
+                                (tmp=lives_filename_to_utf8(capable->rcfile,-1,NULL,NULL,NULL)));
+  startup_message_info(msg);
+  lives_free(msg);
+  lives_free(tmp);
 }
 
 
 void do_rendered_fx_dialog(void) {
-  gchar *tmp;
-  gchar *msg=g_strdup_printf(_("\n\nLiVES could not find any rendered effect plugins.\nPlease make sure you have them installed in\n%s%s%s\nor change the value of <lib_dir> in %s\n"),prefs->lib_dir,PLUGIN_EXEC_DIR,PLUGIN_RENDERED_EFFECTS_BUILTIN,(tmp=g_filename_to_utf8(capable->rcfile,-1,NULL,NULL,NULL)));
+  char *tmp;
+  char *msg=lives_strdup_printf(
+              _("\n\nLiVES could not find any rendered effect plugins.\nPlease make sure you have them installed in\n%s%s%s\nor change the value of <lib_dir> in %s\n"),
+              prefs->lib_dir,PLUGIN_EXEC_DIR,PLUGIN_RENDERED_EFFECTS_BUILTIN,(tmp=lives_filename_to_utf8(capable->rcfile,-1,NULL,NULL,NULL)));
   do_error_dialog_with_check(msg,WARN_MASK_RENDERED_FX);
-  g_free(msg);
-  g_free(tmp);
+  lives_free(msg);
+  lives_free(tmp);
 }
 
 
 void do_audio_import_error(void) {
-  do_error_dialog(_ ("Sorry, unknown audio type.\n\n (Filenames must end in .mp3, .ogg, .wav, .mod, .xm or .it)"));
-  d_print(_ ("failed (unknown type)\n"));
+  do_error_dialog(_("Sorry, unknown audio type.\n\n (Filenames must end in .mp3, .ogg, .wav, .mod, .xm or .it)"));
+  d_print(_("failed (unknown type)\n"));
 }
 
 
 boolean prompt_remove_layout_files(void) {
-  return (do_yesno_dialog(_("\nDo you wish to remove the layout files associated with this set ?\n(They will not be usable without the set).\n")));
+  return (do_yesno_dialog(
+            _("\nDo you wish to remove the layout files associated with this set ?\n(They will not be usable without the set).\n")));
 }
 
 
-boolean do_set_duplicate_warning (const gchar *new_set) {
-  gchar *msg=g_strdup_printf(_("\nA set entitled %s already exists.\nClick OK to add the current clips and layouts to the existing set.\nClick Cancel to pick a new name.\n"),new_set);
+boolean do_set_duplicate_warning(const char *new_set) {
+  char *msg=lives_strdup_printf(
+              _("\nA set entitled %s already exists.\nClick OK to add the current clips and layouts to the existing set.\nClick Cancel to pick a new name.\n"),
+              new_set);
   boolean retcode=do_warning_dialog_with_check(msg,WARN_MASK_DUPLICATE_SET);
-  g_free(msg);
+  lives_free(msg);
   return retcode;
 }
 
@@ -2374,26 +2433,31 @@
   return do_warning_dialog(_("\nAudio from this clip is used in some multitrack layouts.\nAre you sure you wish to continue ?\n."));
 }
 
-boolean do_original_lost_warning(const gchar *fname) {
-  gchar *msg=g_strdup_printf(_("\nThe original file\n%s\ncould not be found.\nIf this file has been moved, click 'OK' to browse to the new location.\nOtherwise click Cancel to skip loading this file.\n"),fname);
+boolean do_original_lost_warning(const char *fname) {
+  char *msg=lives_strdup_printf(
+              _("\nThe original file\n%s\ncould not be found.\nIf this file has been moved, click 'OK' to browse to the new location.\nOtherwise click Cancel to skip loading this file.\n"),
+              fname);
   boolean retcode=do_warning_dialog(msg);
-  g_free(msg);
+  lives_free(msg);
   return retcode;
 }
 
-void do_no_decoder_error(const gchar *fname) {
-  gchar *msg=g_strdup_printf(_("\n\nLiVES could not find a required decoder plugin for the clip\n%s\nThe clip could not be loaded.\n"),fname);
-    do_error_dialog(msg);
-    g_free(msg);
+void do_no_decoder_error(const char *fname) {
+  char *msg=lives_strdup_printf(_("\n\nLiVES could not find a required decoder plugin for the clip\n%s\nThe clip could not be loaded.\n"),
+                                fname);
+  do_error_dialog(msg);
+  lives_free(msg);
 }
 
 
 static void do_extra_jack_warning(void) {
-  do_blocking_error_dialog(_("\nDear user, the jack developers decided to remove the -Z option from jackd.\nPlease check your ~/.jackdrc file and remove this option if present.\nAlternately, select a different audio player in Preferences.\n"));
+  do_blocking_error_dialog(
+    _("\nDear user, the jack developers decided to remove the -Z option from jackd.\nPlease check your ~/.jackdrc file and remove this option if present.\nAlternately, select a different audio player in Preferences.\n"));
 }
 
 void do_jack_noopen_warn(void) {
-  do_blocking_error_dialog(_("\nUnable to start up jack. Please ensure that alsa is set up correctly on your machine\nand also that the soundcard is not in use by another program\nAutomatic jack startup will be disabled now.\n"));
+  do_blocking_error_dialog(
+    _("\nUnable to start up jack. Please ensure that alsa is set up correctly on your machine\nand also that the soundcard is not in use by another program\nAutomatic jack startup will be disabled now.\n"));
   if (prefs->startup_phase!=2) do_extra_jack_warning();
 }
 
@@ -2404,13 +2468,13 @@
 
 void do_jack_noopen_warn4(void) {
 #ifdef HAVE_PULSE_AUDIO
-  const gchar *otherbit="\"lives -aplayer pulse\"";
+  const char *otherbit="\"lives -aplayer pulse\"";
 #else
-  const gchar *otherbit="\"lives -aplayer sox\"";
+  const char *otherbit="\"lives -aplayer sox\"";
 #endif
-  gchar *msg=g_strdup_printf(_("\nAlternatively, try to start lives with either:\n\n\"lives -jackopts 16\", or\n\n%s\n"),otherbit);
+  char *msg=lives_strdup_printf(_("\nAlternatively, try to start lives with either:\n\n\"lives -jackopts 16\", or\n\n%s\n"),otherbit);
   do_blocking_info_dialog(msg);
-  g_free(msg);
+  lives_free(msg);
 }
 
 
@@ -2420,20 +2484,24 @@
 
 
 void do_mt_backup_space_error(lives_mt *mt, int memreq_mb) {
-  gchar *msg=g_strdup_printf(_("\n\nLiVES needs more backup space for this layout.\nYou can increase the value in Preferences/Multitrack.\nIt is recommended to increase it to at least %d MB"),memreq_mb);
-    do_error_dialog_with_check_transient(msg,TRUE,WARN_MASK_MT_BACKUP_SPACE,LIVES_WINDOW(mt->window));
-    g_free(msg);
+  char *msg=lives_strdup_printf(
+              _("\n\nLiVES needs more backup space for this layout.\nYou can increase the value in Preferences/Multitrack.\nIt is recommended to increase it to at least %d MB"),
+              memreq_mb);
+  do_error_dialog_with_check_transient(msg,TRUE,WARN_MASK_MT_BACKUP_SPACE,LIVES_WINDOW(mt->window));
+  lives_free(msg);
 }
 
-boolean do_set_rename_old_layouts_warning(const gchar *new_set) {
-  gchar *msg=g_strdup_printf(_("\nSome old layouts for the set %s already exist.\nIt is recommended that you delete them.\nDo you wish to delete them ?\n"),new_set);
+boolean do_set_rename_old_layouts_warning(const char *new_set) {
+  char *msg=lives_strdup_printf(
+              _("\nSome old layouts for the set %s already exist.\nIt is recommended that you delete them.\nDo you wish to delete them ?\n"),new_set);
   boolean retcode=do_yesno_dialog(msg);
-  g_free(msg);
+  lives_free(msg);
   return retcode;
 }
 
 void do_mt_undo_mem_error(void) {
-  do_error_dialog(_("\nLiVES was unable to reserve enough memory for multitrack undo.\nEither close some other applications, or reduce the undo memory\nusing Preferences/Multitrack/Undo Memory\n"));
+  do_error_dialog(
+    _("\nLiVES was unable to reserve enough memory for multitrack undo.\nEither close some other applications, or reduce the undo memory\nusing Preferences/Multitrack/Undo Memory\n"));
 }
 
 void do_mt_undo_buf_error(void) {
@@ -2441,23 +2509,25 @@
 }
 
 void do_mt_set_mem_error(boolean has_mt, boolean trans) {
-  gchar *msg1=(_("\nLiVES was unable to reserve enough memory for the multitrack undo buffer.\n"));
-  gchar *msg2;
-  gchar *msg3=(_("or enter a smaller value.\n"));
-  gchar *msg;
+  char *msg1=(_("\nLiVES was unable to reserve enough memory for the multitrack undo buffer.\n"));
+  char *msg2;
+  char *msg3=(_("or enter a smaller value.\n"));
+  char *msg;
   if (has_mt) msg2=(_("Try again from the clip editor, try closing some other applications\n"));
   else msg2=(_("Try closing some other applications\n"));
 
-  msg=g_strdup_printf("%s%s%s",msg1,msg2,msg3);
+  msg=lives_strdup_printf("%s%s%s",msg1,msg2,msg3);
 
   if (!trans) do_blocking_error_dialog(msg);
   else do_error_dialog_with_check_transient(msg,TRUE,0,LIVES_WINDOW(prefsw->prefs_dialog));
-  g_free(msg);
+  lives_free(msg);
 }
 
 
 void do_mt_audchan_error(int warn_mask) {
-  do_error_dialog_with_check_transient(_("Multitrack is set to 0 audio channels, but this layout has audio.\nYou should adjust the audio settings from the Tools menu.\n"),warn_mask,FALSE,NULL);
+  do_error_dialog_with_check_transient(
+    _("Multitrack is set to 0 audio channels, but this layout has audio.\nYou should adjust the audio settings from the Tools menu.\n"),
+    warn_mask,FALSE,NULL);
 }
 
 void do_mt_no_audchan_error(void) {
@@ -2465,21 +2535,24 @@
 }
 
 void do_mt_no_jack_error(int warn_mask) {
-  do_error_dialog_with_check(_("Multitrack audio preview is only available with the\n\"jack\" or \"pulse audio\" audio player.\nYou can set this in Tools|Preferences|Playback."),warn_mask);
+  do_error_dialog_with_check(
+    _("Multitrack audio preview is only available with the\n\"jack\" or \"pulse audio\" audio player.\nYou can set this in Tools|Preferences|Playback."),
+    warn_mask);
 }
 
 boolean do_mt_rect_prompt(void) {
-  return do_yesno_dialog(_("Errors were detected in the layout (which may be due to transferring from another system, or from an older version of LiVES).\nShould I try to repair the disk copy of the layout ?\n"));
+  return do_yesno_dialog(
+           _("Errors were detected in the layout (which may be due to transferring from another system, or from an older version of LiVES).\nShould I try to repair the disk copy of the layout ?\n"));
 }
 
 void do_bad_layout_error(void) {
   do_error_dialog(_("LiVES was unable to load the layout.\nSorry.\n"));
-}  
+}
 
 
 
 void do_audrate_error_dialog(void) {
-  do_error_dialog(_ ("\n\nAudio rate must be greater than 0.\n"));
+  do_error_dialog(_("\n\nAudio rate must be greater than 0.\n"));
 }
 
 boolean do_event_list_warning(void) {
@@ -2488,117 +2561,123 @@
 
 
 void do_dvgrab_error(void) {
-  do_error_dialog(_ ("\n\nYou must install 'dvgrab' to use this function.\n"));
+  do_error_dialog(_("\n\nYou must install 'dvgrab' to use this function.\n"));
 }
 
 
 void do_nojack_rec_error(void) {
- do_error_dialog(_ ("\n\nAudio recording can only be done using either\nthe \"jack\" or the \"pulse audio\" audio player.\nYou may need to select one of these in Tools/Preferences/Playback.\n"));
+  do_error_dialog(
+    _("\n\nAudio recording can only be done using either\nthe \"jack\" or the \"pulse audio\" audio player.\nYou may need to select one of these in Tools/Preferences/Playback.\n"));
 }
 
-void do_vpp_palette_error (void) {
-  do_error_dialog_with_check_transient(_("Video playback plugin failed to initialise palette !\n"),TRUE,0,prefsw!=NULL?LIVES_WINDOW(prefsw->prefs_dialog):LIVES_WINDOW(mainw->LiVES));
+void do_vpp_palette_error(void) {
+  do_error_dialog_with_check_transient(_("Video playback plugin failed to initialise palette !\n"),TRUE,0,
+                                       prefsw!=NULL?LIVES_WINDOW(prefsw->prefs_dialog):LIVES_WINDOW(mainw->LiVES));
 }
 
-void do_decoder_palette_error (void) {
+void do_decoder_palette_error(void) {
   do_blocking_error_dialog(_("Decoder plugin failed to initialise palette !\n"));
 }
 
 
-void do_vpp_fps_error (void) {
-  do_error_dialog_with_check_transient(_("Unable to set framerate of video plugin\n"),TRUE,0,prefsw!=NULL?LIVES_WINDOW(prefsw->prefs_dialog):LIVES_WINDOW(mainw->LiVES));
+void do_vpp_fps_error(void) {
+  do_error_dialog_with_check_transient(_("Unable to set framerate of video plugin\n"),TRUE,0,
+                                       prefsw!=NULL?LIVES_WINDOW(prefsw->prefs_dialog):LIVES_WINDOW(mainw->LiVES));
 }
 
 
-void do_after_crash_warning (void) {
-  do_error_dialog_with_check(_("After a crash, it is advisable to clean up the disk with\nFile|Clean up disk space\n"),WARN_MASK_CLEAN_AFTER_CRASH);
+void do_after_crash_warning(void) {
+  do_error_dialog_with_check(_("After a crash, it is advisable to clean up the disk with\nFile|Clean up disk space\n"),
+                             WARN_MASK_CLEAN_AFTER_CRASH);
 }
 
 
 
-static void on_dth_cancel_clicked (LiVESButton *button, gpointer user_data) {
-  if (GPOINTER_TO_INT(user_data)==1) mainw->cancelled=CANCEL_KEEP;
+static void on_dth_cancel_clicked(LiVESButton *button, livespointer user_data) {
+  if (LIVES_POINTER_TO_INT(user_data)==1) mainw->cancelled=CANCEL_KEEP;
   else mainw->cancelled=CANCEL_USER;
 }
 
 
-void do_rmem_max_error (int size) {
-  gchar *msg=g_strdup_printf((_("Stream frame size is too large for your network buffers.\nYou should do the following as root:\n\necho %d > /proc/sys/net/core/rmem_max\n")),size);
+void do_rmem_max_error(int size) {
+  char *msg=lives_strdup_printf((
+                                  _("Stream frame size is too large for your network buffers.\nYou should do the following as root:\n\necho %d > /proc/sys/net/core/rmem_max\n")),
+                                size);
   do_error_dialog(msg);
-  g_free(msg);
+  lives_free(msg);
 }
 
 static xprocess *procw=NULL;
 
 
-static void create_threaded_dialog(gchar *text, boolean has_cancel) {
+static void create_threaded_dialog(char *text, boolean has_cancel) {
 
   LiVESWidget *dialog_vbox;
   LiVESWidget *vbox;
-  gchar tmp_label[256];
- 
-  procw=(xprocess*)(g_malloc(sizeof(xprocess)));
+  char tmp_label[256];
 
-  procw->processing = lives_standard_dialog_new (_("LiVES: - Processing..."),FALSE);
+  procw=(xprocess *)(lives_calloc(1,sizeof(xprocess)));
 
-  lives_window_add_accel_group (LIVES_WINDOW (procw->processing), mainw->accel_group);
+  procw->processing = lives_standard_dialog_new(_("LiVES: - Processing..."),FALSE,-1,-1);
+
+  lives_window_add_accel_group(LIVES_WINDOW(procw->processing), mainw->accel_group);
 
   if (mainw->multitrack==NULL) lives_window_set_transient_for(LIVES_WINDOW(procw->processing),LIVES_WINDOW(mainw->LiVES));
   else lives_window_set_transient_for(LIVES_WINDOW(procw->processing),LIVES_WINDOW(mainw->multitrack->window));
 
   dialog_vbox = lives_dialog_get_content_area(LIVES_DIALOG(procw->processing));
 
-  lives_widget_show (dialog_vbox);
+  lives_widget_show(dialog_vbox);
 
-  vbox = lives_vbox_new (FALSE, 0);
-  lives_widget_show (vbox);
-  lives_box_pack_start (LIVES_BOX (dialog_vbox), vbox, TRUE, TRUE, 0);
+  vbox = lives_vbox_new(FALSE, 0);
+  lives_widget_show(vbox);
+  lives_box_pack_start(LIVES_BOX(dialog_vbox), vbox, TRUE, TRUE, 0);
 
-  g_snprintf(tmp_label,256,"%s...\n",text);
-  procw->label = lives_standard_label_new (tmp_label);
-  lives_box_pack_start (LIVES_BOX (vbox), procw->label, FALSE, FALSE, 0);
+  lives_snprintf(tmp_label,256,"%s...\n",text);
+  procw->label = lives_standard_label_new(tmp_label);
+  lives_box_pack_start(LIVES_BOX(vbox), procw->label, FALSE, FALSE, 0);
 
-  procw->progressbar = lives_progress_bar_new ();
+  procw->progressbar = lives_progress_bar_new();
   lives_progress_bar_set_pulse_step(LIVES_PROGRESS_BAR(procw->progressbar),.01);
-  lives_box_pack_start (LIVES_BOX (vbox), procw->progressbar, FALSE, FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(vbox), procw->progressbar, FALSE, FALSE, 0);
 
   if (widget_opts.apply_theme&&(palette->style&STYLE_1)) {
     lives_widget_set_fg_color(procw->progressbar, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
   }
 
   widget_opts.justify=LIVES_JUSTIFY_CENTER;
-  procw->label2 = lives_standard_label_new (_("\nPlease Wait"));
+  procw->label2 = lives_standard_label_new(_("\nPlease Wait"));
   widget_opts.justify=LIVES_JUSTIFY_DEFAULT;
-  lives_box_pack_start (LIVES_BOX (vbox), procw->label2, FALSE, FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(vbox), procw->label2, FALSE, FALSE, 0);
 
   widget_opts.justify=LIVES_JUSTIFY_CENTER;
-  procw->label3 = lives_standard_label_new (PROCW_STRETCHER);
+  procw->label3 = lives_standard_label_new(PROCW_STRETCHER);
   widget_opts.justify=LIVES_JUSTIFY_DEFAULT;
-  lives_box_pack_start (LIVES_BOX (vbox), procw->label3, FALSE, FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(vbox), procw->label3, FALSE, FALSE, 0);
 
   if (has_cancel) {
-    LiVESWidget *cancelbutton = lives_button_new_from_stock (LIVES_STOCK_CANCEL);
-    lives_widget_show (cancelbutton);
+    LiVESWidget *cancelbutton = lives_button_new_from_stock(LIVES_STOCK_CANCEL);
+    lives_widget_show(cancelbutton);
 
     if (mainw->current_file>-1&&cfile!=NULL&&cfile->opening_only_audio) {
-      LiVESWidget *enoughbutton = lives_button_new_with_mnemonic (_ ("_Enough"));
-      lives_widget_show (enoughbutton);
-      lives_dialog_add_action_widget (LIVES_DIALOG (procw->processing), enoughbutton, LIVES_RESPONSE_CANCEL);
-      lives_widget_set_can_focus_and_default (enoughbutton);
-
-      lives_signal_connect (LIVES_GUI_OBJECT (enoughbutton), LIVES_WIDGET_CLICKED_EVENT,
-			LIVES_GUI_CALLBACK (on_dth_cancel_clicked),
-			GINT_TO_POINTER(1));
-      
+      LiVESWidget *enoughbutton = lives_button_new_with_mnemonic(_("_Enough"));
+      lives_widget_show(enoughbutton);
+      lives_dialog_add_action_widget(LIVES_DIALOG(procw->processing), enoughbutton, LIVES_RESPONSE_CANCEL);
+      lives_widget_set_can_focus_and_default(enoughbutton);
+
+      lives_signal_connect(LIVES_GUI_OBJECT(enoughbutton), LIVES_WIDGET_CLICKED_SIGNAL,
+                           LIVES_GUI_CALLBACK(on_dth_cancel_clicked),
+                           LIVES_INT_TO_POINTER(1));
+
       mainw->cancel_type=CANCEL_SOFT;
     }
 
-    lives_dialog_add_action_widget (LIVES_DIALOG (procw->processing), cancelbutton, LIVES_RESPONSE_CANCEL);
-    lives_widget_set_can_focus_and_default (cancelbutton);
+    lives_dialog_add_action_widget(LIVES_DIALOG(procw->processing), cancelbutton, LIVES_RESPONSE_CANCEL);
+    lives_widget_set_can_focus_and_default(cancelbutton);
 
-    lives_signal_connect (LIVES_GUI_OBJECT (cancelbutton), LIVES_WIDGET_CLICKED_EVENT,
-                      LIVES_GUI_CALLBACK (on_dth_cancel_clicked),
-                      GINT_TO_POINTER(0));
+    lives_signal_connect(LIVES_GUI_OBJECT(cancelbutton), LIVES_WIDGET_CLICKED_SIGNAL,
+                         LIVES_GUI_CALLBACK(on_dth_cancel_clicked),
+                         LIVES_INT_TO_POINTER(0));
 
     mainw->cancel_type=CANCEL_SOFT;
   }
@@ -2606,13 +2685,15 @@
   lives_widget_show_all(procw->processing);
 
   lives_set_cursor_style(LIVES_CURSOR_BUSY,procw->processing);
+
+  procw->is_ready=TRUE;
 }
 
 
 static double sttime;
 
 
-void threaded_dialog_spin (void) {
+void threaded_dialog_spin(void) {
   double timesofar;
   int progress;
 
@@ -2621,41 +2702,44 @@
     return;
   }
 
-  if (procw==NULL) return;
+  if (procw==NULL||!procw->is_ready) return;
 
   if (mainw->current_file<0||cfile==NULL||cfile->progress_start==0||cfile->progress_end==0||
       strlen(mainw->msg)==0||(progress=atoi(mainw->msg))==0) {
     // pulse the progress bar
-    lives_progress_bar_pulse(LIVES_PROGRESS_BAR(procw->progressbar));
-  }
-  else {
+    if (LIVES_IS_PROGRESS_BAR(procw->progressbar)) lives_progress_bar_pulse(LIVES_PROGRESS_BAR(procw->progressbar));
+  } else {
     // show fraction
     gettimeofday(&tv, NULL);
     timesofar=(double)(tv.tv_sec*1000000+tv.tv_usec-sttime)*U_SEC_RATIO/U_SEC;
     disp_fraction(progress,cfile->progress_start,cfile->progress_end,timesofar,procw);
   }
 
-  lives_widget_queue_draw(procw->processing);
+  if (LIVES_IS_WIDGET(procw->processing)) lives_widget_queue_draw(procw->processing);
   lives_widget_context_update();
 
 }
 
 
 
-void *splash_prog (void) {
+void *splash_prog(void) {
   lives_progress_bar_pulse(LIVES_PROGRESS_BAR(mainw->splash_progress));
   return NULL;
 }
 
 
- 
-void do_threaded_dialog(gchar *trans_text, boolean has_cancel) {
+
+void do_threaded_dialog(char *trans_text, boolean has_cancel) {
   // calling this causes a threaded progress dialog to appear
   // until end_threaded_dialog() is called
   //
-  // WARNING: if trans_text is a translated string, it will be autoamtically freed by translations inside this function
+  // WARNING: if trans_text is a translated string, it will be automatically freed by translations inside this function
+
+  char *copy_text;
+
+  if (mainw->threaded_dialog) return;
 
-  gchar *copy_text=g_strdup(trans_text);
+  copy_text=lives_strdup(trans_text);
 
   lives_set_cursor_style(LIVES_CURSOR_BUSY,NULL);
 
@@ -2666,7 +2750,7 @@
   clear_mainw_msg();
 
   create_threaded_dialog(copy_text, has_cancel);
-  g_free(copy_text);
+  lives_free(copy_text);
 
   lives_widget_context_update();
 }
@@ -2679,19 +2763,22 @@
   }
   if (mainw->splash_window==NULL) {
     lives_set_cursor_style(LIVES_CURSOR_NORMAL,NULL);
-    if (mainw->multitrack==NULL) { 
+    if (mainw->multitrack==NULL) {
       if (mainw->is_ready) lives_widget_queue_draw(mainw->LiVES);
-    }
-    else lives_widget_queue_draw(mainw->multitrack->window);
+    } else lives_widget_queue_draw(mainw->multitrack->window);
+  } else {
+    lives_set_cursor_style(LIVES_CURSOR_NORMAL,mainw->splash_window);
+    mainw->splash_window=NULL; // need to do this before calling lives_widget_context_update()
   }
-  else lives_set_cursor_style(LIVES_CURSOR_NORMAL,mainw->splash_window);
   if (procw!=NULL) {
-    g_free(procw);
+    lives_free(procw);
     procw=NULL;
   }
   mainw->cancel_type=CANCEL_KILL;
   mainw->threaded_dialog=FALSE;
-  lives_widget_context_update();
+
+  if (mainw->is_ready) 
+    lives_widget_context_update();
 }
 
 
@@ -2704,24 +2791,19 @@
 }
 
 
-void 
-response_ok (LiVESButton *button, gpointer user_data) {
-  gtk_dialog_response (LIVES_DIALOG (lives_widget_get_toplevel(LIVES_WIDGET(button))), LIVES_RESPONSE_OK);
+void response_ok(LiVESButton *button, livespointer user_data) {
+  lives_dialog_response(LIVES_DIALOG(lives_widget_get_toplevel(LIVES_WIDGET(button))), LIVES_RESPONSE_OK);
 }
 
 
 LIVES_INLINE void d_print_cancelled(void) {
   d_print(_("cancelled.\n"));
-#ifdef ENABLE_OSC
-      lives_osc_notify(LIVES_OSC_NOTIFY_CANCELLED,"");
-#endif
+  lives_notify(LIVES_OSC_NOTIFY_CANCELLED,"");
 }
 
 LIVES_INLINE void d_print_failed(void) {
   d_print(_("failed.\n"));
-#ifdef ENABLE_OSC
-      lives_osc_notify(LIVES_OSC_NOTIFY_FAILED,"");
-#endif
+  lives_notify(LIVES_OSC_NOTIFY_FAILED,"");
 }
 
 LIVES_INLINE void d_print_done(void) {
@@ -2734,13 +2816,13 @@
 
 
 void do_system_failed_error(const char *com, int retval, const char *addinfo) {
-  gchar *msg,*tmp,*emsg,*msgx;
-  gchar *bit;
-  gchar *retstr=g_strdup_printf("%d",retval>>8);
-  gchar *bit2=(retval>255)?g_strdup(""):g_strdup_printf("[%s]",g_strerror(retval));
-  gchar *addbit;
-  gchar *dsmsg1=g_strdup("");
-  gchar *dsmsg2=g_strdup("");
+  char *msg,*tmp,*emsg,*msgx;
+  char *bit;
+  char *retstr=lives_strdup_printf("%d",retval>>8);
+  char *bit2=(retval>255)?lives_strdup(""):lives_strdup_printf("[%s]",lives_strerror(retval));
+  char *addbit;
+  char *dsmsg1=lives_strdup("");
+  char *dsmsg2=lives_strdup("");
 
   uint64_t dsval1,dsval2;
 
@@ -2749,155 +2831,154 @@
   if (mainw->current_file>-1&&cfile!=NULL&&cfile->op_dir!=NULL) {
     ds2=get_storage_status(cfile->op_dir,prefs->ds_crit_level,&dsval2);
     if (ds2==LIVES_STORAGE_STATUS_CRITICAL) {
-      g_free(dsmsg2);
+      lives_free(dsmsg2);
       tmp=ds_critical_msg(cfile->op_dir,dsval2);
-      dsmsg2=g_strdup_printf("%s\n",tmp);
-      g_free(tmp);
+      dsmsg2=lives_strdup_printf("%s\n",tmp);
+      lives_free(tmp);
     }
   }
 
   if (ds1==LIVES_STORAGE_STATUS_CRITICAL) {
-    g_free(dsmsg1);
+    lives_free(dsmsg1);
     tmp=ds_critical_msg(prefs->tmpdir,dsval1);
-    dsmsg1=g_strdup_printf("%s\n",tmp);
-    g_free(tmp);
+    dsmsg1=lives_strdup_printf("%s\n",tmp);
+    lives_free(tmp);
   }
 
-  if (addinfo!=NULL) addbit=g_strdup_printf(_("Additional info: %s\n"),addinfo);
-  else addbit=g_strdup("");
+  if (addinfo!=NULL) addbit=lives_strdup_printf(_("Additional info: %s\n"),addinfo);
+  else addbit=lives_strdup("");
 
-  if (retval>0) bit=g_strdup_printf(_("The error value was %d%s\n"),retval,bit2);
-    else bit=g_strdup("");
+  if (retval>0) bit=lives_strdup_printf(_("The error value was %d%s\n"),retval,bit2);
+  else bit=lives_strdup("");
 
-  msg=g_strdup_printf(_("\nLiVES failed doing the following:\n%s\nPlease check your system for errors.\n%s%s%s"),
-		      com,bit,addbit,dsmsg1,dsmsg2);
+  msg=lives_strdup_printf(_("\nLiVES failed doing the following:\n%s\nPlease check your system for errors.\n%s%s%s"),
+                          com,bit,addbit,dsmsg1,dsmsg2);
 
-  emsg=g_strdup_printf("Command failed doing\n%s\n%s%s",com,bit,addbit);
+  emsg=lives_strdup_printf("Command failed doing\n%s\n%s%s",com,bit,addbit);
   LIVES_ERROR(emsg);
-  g_free(emsg);
+  lives_free(emsg);
 
   msgx=insert_newlines(msg,MAX_MSG_WIDTH_CHARS);
   do_error_dialog(msgx);
-  g_free(msgx);
-  g_free(msg);
-  g_free(dsmsg1);
-  g_free(dsmsg2);
-  g_free(bit);
-  g_free(bit2);
-  g_free(addbit);
-  g_free(retstr);
+  lives_free(msgx);
+  lives_free(msg);
+  lives_free(dsmsg1);
+  lives_free(dsmsg2);
+  lives_free(bit);
+  lives_free(bit2);
+  lives_free(addbit);
+  lives_free(retstr);
 }
 
 
 void do_write_failed_error_s(const char *s, const char *addinfo) {
-  gchar *msg,*emsg;
-  gchar *addbit,*tmp;
-  gchar *dsmsg=g_strdup("");
+  char *msg,*emsg;
+  char *addbit,*tmp;
+  char *dsmsg=lives_strdup("");
 
-  gchar dirname[PATH_MAX];
-  gchar *sutf=g_filename_to_utf8(s,-1,NULL,NULL,NULL);
+  char dirname[PATH_MAX];
+  char *sutf=lives_filename_to_utf8(s,-1,NULL,NULL,NULL);
 
   uint64_t dsval;
 
   lives_storage_status_t ds;
 
-  g_snprintf(dirname,PATH_MAX,"%s",s);
+  lives_snprintf(dirname,PATH_MAX,"%s",s);
   get_dirname(dirname);
   ds=get_storage_status(dirname,prefs->ds_crit_level,&dsval);
 
   if (ds==LIVES_STORAGE_STATUS_CRITICAL) {
-    g_free(dsmsg);
+    lives_free(dsmsg);
     tmp=ds_critical_msg(dirname,dsval);
-    dsmsg=g_strdup_printf("%s\n",tmp);
-    g_free(tmp);
+    dsmsg=lives_strdup_printf("%s\n",tmp);
+    lives_free(tmp);
   }
 
-  if (addinfo!=NULL) addbit=g_strdup_printf(_("Additional info: %s\n"),addinfo);
-  else addbit=g_strdup("");
+  if (addinfo!=NULL) addbit=lives_strdup_printf(_("Additional info: %s\n"),addinfo);
+  else addbit=lives_strdup("");
 
-  msg=g_strdup_printf(_("\nLiVES was unable to write to the file\n%s\nPlease check for possible error causes.\n%s"),
-		      sutf,addbit,dsmsg);
-  emsg=g_strdup_printf("Unable to write to file\n%s\n%s",s,addbit);
+  msg=lives_strdup_printf(_("\nLiVES was unable to write to the file\n%s\nPlease check for possible error causes.\n%s"),
+                          sutf,addbit,dsmsg);
+  emsg=lives_strdup_printf("Unable to write to file\n%s\n%s",s,addbit);
 
-  g_free(sutf);
+  lives_free(sutf);
 
   LIVES_ERROR(emsg);
-  g_free(emsg);
+  lives_free(emsg);
 
   do_blocking_error_dialog(msg);
-  g_free(addbit);
-  g_free(dsmsg);
-  g_free(msg);
+  lives_free(addbit);
+  lives_free(dsmsg);
+  lives_free(msg);
 }
 
 
 void do_read_failed_error_s(const char *s, const char *addinfo) {
-  gchar *msg,*emsg;
-  gchar *addbit;
-  gchar *sutf=g_filename_to_utf8(s,-1,NULL,NULL,NULL);
-
-  if (addinfo!=NULL) addbit=g_strdup_printf(_("Additional info: %s\n"),addinfo);
-  else addbit=g_strdup("");
-
-  msg=g_strdup_printf(_("\nLiVES was unable to read from the file\n%s\nPlease check for possible error causes.\n%s"),
-		      sutf,addbit);
-  emsg=g_strdup_printf("Unable to read from the file\n%s\n%s",s,addbit);
+  char *msg,*emsg;
+  char *addbit;
+  char *sutf=lives_filename_to_utf8(s,-1,NULL,NULL,NULL);
+
+  if (addinfo!=NULL) addbit=lives_strdup_printf(_("Additional info: %s\n"),addinfo);
+  else addbit=lives_strdup("");
+
+  msg=lives_strdup_printf(_("\nLiVES was unable to read from the file\n%s\nPlease check for possible error causes.\n%s"),
+                          sutf,addbit);
+  emsg=lives_strdup_printf("Unable to read from the file\n%s\n%s",s,addbit);
 
   LIVES_ERROR(emsg);
-  g_free(emsg);
-  g_free(sutf);
+  lives_free(emsg);
+  lives_free(sutf);
 
   do_blocking_error_dialog(msg);
-  g_free(msg);
-  g_free(addbit);
+  lives_free(msg);
+  lives_free(addbit);
 }
 
 
 
-int do_write_failed_error_s_with_retry(const gchar *fname, const gchar *errtext, LiVESWindow *transient) {
+int do_write_failed_error_s_with_retry(const char *fname, const char *errtext, LiVESWindow *transient) {
   // err can be errno from open/fopen etc.
 
-  // return same as do_abort_cancel_retry_dialog() - LIVES_CANCEL or LIVES_RETRY (both non-zero)
+  // return same as do_abort_cancel_retry_dialog() - LIVES_RESPONSE_CANCEL or LIVES_RESPONSE_RETRY (both non-zero)
 
   int ret;
-  gchar *msg,*emsg,*tmp;
-  gchar *sutf=g_filename_to_utf8(fname,-1,NULL,NULL,NULL);
-  gchar *dsmsg=g_strdup("");
+  char *msg,*emsg,*tmp;
+  char *sutf=lives_filename_to_utf8(fname,-1,NULL,NULL,NULL);
+  char *dsmsg=lives_strdup("");
 
-  gchar dirname[PATH_MAX];
+  char dirname[PATH_MAX];
 
   uint64_t dsval;
 
   lives_storage_status_t ds;
 
-  g_snprintf(dirname,PATH_MAX,"%s",fname);
+  lives_snprintf(dirname,PATH_MAX,"%s",fname);
   get_dirname(dirname);
   ds=get_storage_status(dirname,prefs->ds_crit_level,&dsval);
 
   if (ds==LIVES_STORAGE_STATUS_CRITICAL) {
-    g_free(dsmsg);
+    lives_free(dsmsg);
     tmp=ds_critical_msg(dirname,dsval);
-    dsmsg=g_strdup_printf("%s\n",tmp);
-    g_free(tmp);
+    dsmsg=lives_strdup_printf("%s\n",tmp);
+    lives_free(tmp);
   }
 
   if (errtext==NULL) {
-    emsg=g_strdup_printf("Unable to write to file %s",fname);
-    msg=g_strdup_printf(_("\nLiVES was unable to write to the file\n%s\nPlease check for possible error causes.\n"),sutf);
-  }
-  else {
-    emsg=g_strdup_printf("Unable to write to file %s, error was %s",fname,errtext);
-    msg=g_strdup_printf(_("\nLiVES was unable to write to the file\n%s\nThe error was\n%s.\n"),sutf,errtext);
+    emsg=lives_strdup_printf("Unable to write to file %s",fname);
+    msg=lives_strdup_printf(_("\nLiVES was unable to write to the file\n%s\nPlease check for possible error causes.\n"),sutf);
+  } else {
+    emsg=lives_strdup_printf("Unable to write to file %s, error was %s",fname,errtext);
+    msg=lives_strdup_printf(_("\nLiVES was unable to write to the file\n%s\nThe error was\n%s.\n"),sutf,errtext);
   }
-  
+
   LIVES_ERROR(emsg);
-  g_free(emsg);
+  lives_free(emsg);
 
   ret=do_abort_cancel_retry_dialog(msg,transient);
 
-  g_free(dsmsg);
-  g_free(msg);
-  g_free(sutf);
+  lives_free(dsmsg);
+  lives_free(msg);
+  lives_free(sutf);
 
   mainw->write_failed=FALSE; // reset this
 
@@ -2907,31 +2988,30 @@
 
 
 
-int do_read_failed_error_s_with_retry(const gchar *fname, const gchar *errtext, LiVESWindow *transient) {
+int do_read_failed_error_s_with_retry(const char *fname, const char *errtext, LiVESWindow *transient) {
   // err can be errno from open/fopen etc.
 
-  // return same as do_abort_cancel_retry_dialog() - LIVES_CANCEL or LIVES_RETRY (both non-zero)
+  // return same as do_abort_cancel_retry_dialog() - LIVES_RESPONSE_CANCEL or LIVES_RESPONSE_RETRY (both non-zero)
 
   int ret;
-  gchar *msg,*emsg;
-  gchar *sutf=g_filename_to_utf8(fname,-1,NULL,NULL,NULL);
+  char *msg,*emsg;
+  char *sutf=lives_filename_to_utf8(fname,-1,NULL,NULL,NULL);
 
   if (errtext==NULL) {
-    emsg=g_strdup_printf("Unable to read from file %s",fname);
-    msg=g_strdup_printf(_("\nLiVES was unable to read from the file\n%s\nPlease check for possible error causes.\n"),sutf);
-  }
-  else {
-    emsg=g_strdup_printf("Unable to read from file %s, error was %s",fname,errtext);
-    msg=g_strdup_printf(_("\nLiVES was unable to read from the file\n%s\nThe error was\n%s.\n"),sutf,errtext);
+    emsg=lives_strdup_printf("Unable to read from file %s",fname);
+    msg=lives_strdup_printf(_("\nLiVES was unable to read from the file\n%s\nPlease check for possible error causes.\n"),sutf);
+  } else {
+    emsg=lives_strdup_printf("Unable to read from file %s, error was %s",fname,errtext);
+    msg=lives_strdup_printf(_("\nLiVES was unable to read from the file\n%s\nThe error was\n%s.\n"),sutf,errtext);
   }
-  
+
   LIVES_ERROR(emsg);
-  g_free(emsg);
+  lives_free(emsg);
 
   ret=do_abort_cancel_retry_dialog(msg,transient);
 
-  g_free(msg);
-  g_free(sutf);
+  lives_free(msg);
+  lives_free(sutf);
 
   mainw->read_failed=FALSE; // reset this
 
@@ -2942,14 +3022,14 @@
 
 int do_header_read_error_with_retry(int clip) {
   int ret;
-  gchar *hname;
+  char *hname;
   if (mainw->files[clip]==NULL) return 0;
 
-  hname=g_build_filename(prefs->tmpdir,mainw->files[clip]->handle,"header.lives",NULL);
+  hname=lives_build_filename(prefs->tmpdir,mainw->files[clip]->handle,"header.lives",NULL);
 
   ret=do_read_failed_error_s_with_retry(hname,NULL,NULL);
 
-  g_free(hname);
+  lives_free(hname);
   return ret;
 }
 
@@ -2958,15 +3038,15 @@
 boolean do_header_write_error(int clip) {
   // returns TRUE if we manage to clear the error
 
-  gchar *hname;
+  char *hname;
   int retval;
 
   if (mainw->files[clip]==NULL) return TRUE;
 
-  hname=g_build_filename(prefs->tmpdir,mainw->files[clip]->handle,"header.lives",NULL);
+  hname=lives_build_filename(prefs->tmpdir,mainw->files[clip]->handle,"header.lives",NULL);
   retval=do_write_failed_error_s_with_retry(hname,NULL,NULL);
-  if (retval==LIVES_RETRY && save_clip_values(clip)) retval=0; // on retry try to save all values
-  g_free(hname);
+  if (retval==LIVES_RESPONSE_RETRY && save_clip_values(clip)) retval=0; // on retry try to save all values
+  lives_free(hname);
 
   return (!retval);
 }
@@ -2975,65 +3055,67 @@
 
 int do_header_missing_detail_error(int clip, lives_clip_details_t detail) {
   int ret;
-  gchar *hname,*key,*msg;
+  char *hname,*key,*msg;
   if (mainw->files[clip]==NULL) return 0;
 
-  hname=g_build_filename(prefs->tmpdir,mainw->files[clip]->handle,"header.lives",NULL);
+  hname=lives_build_filename(prefs->tmpdir,mainw->files[clip]->handle,"header.lives",NULL);
 
   key=clip_detail_to_string(detail,NULL);
 
   if (key==NULL) {
-    msg=g_strdup_printf("Invalid detail %d requested from file %s",detail,hname);
+    msg=lives_strdup_printf("Invalid detail %d requested from file %s",detail,hname);
     LIVES_ERROR(msg);
-    g_free(msg);
-    g_free(hname);
+    lives_free(msg);
+    lives_free(hname);
     return 0;
   }
 
-  msg=g_strdup_printf(_("Value for \"%s\" could not be read."),key);
+  msg=lives_strdup_printf(_("Value for \"%s\" could not be read."),key);
   ret=do_read_failed_error_s_with_retry(hname,msg,NULL);
 
-  g_free(msg);
-  g_free(key);
-  g_free(hname);
+  lives_free(msg);
+  lives_free(key);
+  lives_free(hname);
   return ret;
 }
 
 
 
 void do_chdir_failed_error(const char *dir) {
-  gchar *msg;
-  gchar *dutf;
-  gchar *emsg=g_strdup_printf("Failed directory change to\n%s",dir);
+  char *msg;
+  char *dutf;
+  char *emsg=lives_strdup_printf("Failed directory change to\n%s",dir);
   LIVES_ERROR(emsg);
-  g_free(emsg);
-  dutf=g_filename_to_utf8(dir,-1,NULL,NULL,NULL);
-  msg=g_strdup_printf(_("\nLiVES failed to change directory to\n%s\nPlease check your system for errors.\n"),dutf);
+  lives_free(emsg);
+  dutf=lives_filename_to_utf8(dir,-1,NULL,NULL,NULL);
+  msg=lives_strdup_printf(_("\nLiVES failed to change directory to\n%s\nPlease check your system for errors.\n"),dutf);
   do_error_dialog(msg);
-  g_free(msg);
-  g_free(dutf);
+  lives_free(msg);
+  lives_free(dutf);
 }
 
 
 
-void do_file_perm_error(const gchar *file_name) {
-  gchar *msg=g_strdup_printf(_("\nLiVES was unable to write to the file:\n%s\nPlease check the file permissions and try again."),file_name);
+void do_file_perm_error(const char *file_name) {
+  char *msg=lives_strdup_printf(_("\nLiVES was unable to write to the file:\n%s\nPlease check the file permissions and try again."),
+                                file_name);
   do_blocking_error_dialog(msg);
-  g_free(msg);
+  lives_free(msg);
 }
 
 
-void do_dir_perm_error(const gchar *dir_name) {
-  gchar *msg=g_strdup_printf(_("\nLiVES was unable to either create or write to the directory:\n%s\nPlease check the directory permissions and try again."),dir_name);
+void do_dir_perm_error(const char *dir_name) {
+  char *msg=lives_strdup_printf(
+              _("\nLiVES was unable to either create or write to the directory:\n%s\nPlease check the directory permissions and try again."),dir_name);
   do_blocking_error_dialog(msg);
-  g_free(msg);
+  lives_free(msg);
 }
 
 
-void do_dir_perm_access_error(const gchar *dir_name) {
-  gchar *msg=g_strdup_printf(_("\nLiVES was unable to read from the directory:\n%s\n"),dir_name);
+void do_dir_perm_access_error(const char *dir_name) {
+  char *msg=lives_strdup_printf(_("\nLiVES was unable to read from the directory:\n%s\n"),dir_name);
   do_blocking_error_dialog(msg);
-  g_free(msg);
+  lives_free(msg);
 }
 
 
@@ -3044,11 +3126,12 @@
 
 
 void do_encoder_img_ftm_error(render_details *rdet) {
-  gchar *msg=g_strdup_printf(_("\nThe %s cannot encode clips with image type %s.\nPlease select another encoder from the list.\n"),prefs->encoder.name,get_image_ext_for_type(cfile->img_type));
+  char *msg=lives_strdup_printf(_("\nThe %s cannot encode clips with image type %s.\nPlease select another encoder from the list.\n"),
+                                prefs->encoder.name,get_image_ext_for_type(cfile->img_type));
 
   do_error_dialog_with_check_transient(msg,TRUE,0,LIVES_WINDOW(rdet->dialog));
 
-  g_free(msg);
+  lives_free(msg);
 }
 
 
@@ -3057,10 +3140,12 @@
 }
 
 
-void do_dev_busy_error(const gchar *devstr) {
-  gchar *msg=g_strdup_printf(_("\nThe device %s is in use or unavailable.\n- Check the device permissions\n- Check if this device is in use by another program.\n- Check if the device actually exists.\n"),devstr);
+void do_dev_busy_error(const char *devstr) {
+  char *msg=lives_strdup_printf(
+              _("\nThe device %s is in use or unavailable.\n- Check the device permissions\n- Check if this device is in use by another program.\n- Check if the device actually exists.\n"),
+              devstr);
   do_blocking_error_dialog(msg);
-  g_free(msg);
+  lives_free(msg);
 }
 
 
@@ -3077,11 +3162,13 @@
 }
 
 
-boolean do_sub_type_warning(const gchar *ext, const gchar *type_ext) {
+boolean do_sub_type_warning(const char *ext, const char *type_ext) {
   boolean ret;
-  gchar *msg=g_strdup_printf(_("\nLiVES does not recognise the subtitle file type \"%s\".\nClick Cancel to set another file name\nor OK to continue and save as type \"%s\"\n"),ext,type_ext);
+  char *msg=lives_strdup_printf(
+              _("\nLiVES does not recognise the subtitle file type \"%s\".\nClick Cancel to set another file name\nor OK to continue and save as type \"%s\"\n"),
+              ext,type_ext);
   ret=do_warning_dialog(msg);
-  g_free(msg);
+  lives_free(msg);
   return ret;
 }
 
@@ -3089,10 +3176,12 @@
   return do_yesno_dialog(_("\nDo you wish to move the current clip sets to the new directory ?\n(If unsure, click Yes)\n"));
 }
 
-void do_set_locked_warning (const gchar *setname) {
-  gchar *msg=g_strdup_printf(_("\nWarning - the set %s\nis in use by another copy of LiVES.\nYou are strongly advised to close the other copy before clicking OK to continue\n."),setname);
+void do_set_locked_warning(const char *setname) {
+  char *msg=lives_strdup_printf(
+              _("\nWarning - the set %s\nis in use by another copy of LiVES.\nYou are strongly advised to close the other copy before clicking OK to continue\n."),
+              setname);
   do_warning_dialog(msg);
-  g_free(msg);
+  lives_free(msg);
 }
 
 void do_no_in_vdevs_error(void) {
@@ -3103,45 +3192,34 @@
   do_error_dialog(_("\nAll video input devices are already in use.\n"));
 }
 
-void do_do_not_close_d (void) {
-  gchar *msg=g_strdup(_("\n\nCLEANING AND COPYING FILES. THIS MAY TAKE SOME TIME.\nDO NOT SHUT DOWN OR CLOSE LIVES !\n"));
-  LiVESWidget *err_box=create_info_error_dialog(msg,FALSE,0,LIVES_INFO_TYPE_WARNING);
-  LiVESWindow *transient=NULL;
-
-  g_free(msg);
-
-  if (prefs->show_gui) {
-    if (mainw->multitrack==NULL&&mainw->is_ready) transient=LIVES_WINDOW(mainw->LiVES);
-    else if (mainw->multitrack!=NULL&&mainw->multitrack->is_ready) transient=LIVES_WINDOW(mainw->multitrack->window);
-  }
-
-  if (transient!=NULL) lives_window_set_transient_for(LIVES_WINDOW(err_box),transient);
-  lives_widget_show(err_box);
-
-  lives_window_present (LIVES_WINDOW (err_box));
-  lives_xwindow_raise (lives_widget_get_xwindow(err_box));
+void do_do_not_close_d(void) {
+  char *msg=lives_strdup(_("\n\nCLEANING AND COPYING FILES. THIS MAY TAKE SOME TIME.\nDO NOT SHUT DOWN OR CLOSE LIVES !\n"));
+  create_info_error_dialog(LIVES_DIALOG_WARN,msg,NULL,0,FALSE);
+  lives_free(msg);
 }
 
 
 void do_set_noclips_error(const char *setname) {
-  gchar *msg=g_strdup_printf (_ ("No clips were recovered for set (%s).\nPlease check the spelling of the set name and try again.\n"),setname);
-  d_print (msg);
-  g_free (msg);
+  char *msg=lives_strdup_printf(_("No clips were recovered for set (%s).\nPlease check the spelling of the set name and try again.\n"),
+                                setname);
+  d_print(msg);
+  lives_free(msg);
 }
 
 
-gchar * get_upd_msg(void) {
+char *get_upd_msg(void) {
   LIVES_DEBUG("upd msg !");
   // TRANSLATORS: make sure the menu text matches what is in gui.c
-  gchar *msg=g_strdup_printf(_("\nWelcome to LiVES version %s\n\nAfter upgrading, you are *strongly* advised to run:\n\nFile -> Clean up Diskspace\n"),LiVES_VERSION);
+  char *msg=lives_strdup_printf(
+              _("\nWelcome to LiVES version %s\n\nAfter upgrading, you are *strongly* advised to run:\n\nFile -> Clean up Diskspace\n"),LiVES_VERSION);
   return msg;
 }
 
 
-gchar * get_new_install_msg(void) {
+char *get_new_install_msg(void) {
   LIVES_DEBUG("upd msg !");
   // TRANSLATORS: make sure the menu text matches what is in gui.c
-  gchar *msg=g_strdup_printf(_("\n\nWelcome to LiVES version %s !\n\n"),LiVES_VERSION);
+  char *msg=lives_strdup_printf(_("\n\nWelcome to LiVES version %s !\n\n"),LiVES_VERSION);
   return msg;
 }
 
@@ -3165,16 +3243,18 @@
 
 
 boolean ask_permission_dialog(int what) {
-  gchar *msg;
+  char *msg;
   boolean ret;
 
   if (!prefs->show_gui) return FALSE;
 
   switch (what) {
   case LIVES_PERM_OSC_PORTS:
-    msg=g_strdup_printf(_("\nLiVES would like to open a local network connection (UDP port %d),\nto let other applications connect to it.\nDo you wish to allow this (for this session only) ?\n"),prefs->osc_udp_port);
+    msg=lives_strdup_printf(
+          _("\nLiVES would like to open a local network connection (UDP port %d),\nto let other applications connect to it.\nDo you wish to allow this (for this session only) ?\n"),
+          prefs->osc_udp_port);
     ret=do_yesno_dialog(msg);
-    g_free(msg);
+    lives_free(msg);
     return ret;
   default:
     break;

LiVES-2.2.8.tar.bz2/src/effects-data.c -> LiVES-2.4.1.tar.bz2/src/effects-data.c Changed

@@ -10,6 +10,7 @@
 
 //#define DEBUG_PCONX
 
+
 #if HAVE_SYSTEM_WEED
 #include <weed/weed.h>
 #include <weed/weed-host.h>
@@ -38,21 +39,21 @@
 static void ctable_row_add_standard_widgets(lives_conx_w *, int idx);
 static void ctable_row_add_variable_widgets(lives_conx_w *, int idx, int row, int cidx);
 
-static void padd_clicked(LiVESWidget *button, gpointer user_data);
-static void cadd_clicked(LiVESWidget *button, gpointer user_data);
+static void padd_clicked(LiVESWidget *button, livespointer user_data);
+static void cadd_clicked(LiVESWidget *button, livespointer user_data);
 
-static void dfxp_changed(LiVESWidget *, gpointer conxwp);
+static void dfxp_changed(LiVESWidget *, livespointer conxwp);
 
 static weed_plant_t *active_dummy=NULL;
 
 static LiVESTreeModel *pmodel;
 static LiVESTreeModel *cmodel;
 
-static gchar *lctext;
+static char *lctext;
 
 static void switch_fx_state(int okey, int hotkey) {
   // switch effect state when a connection to ACTIVATE is present
-  uint32_t last_grabable_effect=mainw->last_grabable_effect;
+  uint32_t last_grabbable_effect=mainw->last_grabbable_effect;
   // use -hotkey to indicate auto
 
   filter_mutex_unlock(hotkey-1);
@@ -60,13 +61,13 @@
 
   rte_on_off_callback_hook(NULL,LIVES_INT_TO_POINTER(-hotkey));
 
-  mainw->last_grabable_effect=last_grabable_effect;
+  mainw->last_grabbable_effect=last_grabbable_effect;
 
 }
 
 void override_if_active_input(int hotkey) {
   // if we have a connection from oparam -1 to iparam -1 for key/mode then set autoscale to TRUE
-  // this allows user override of LIVES_WIDGET_CLICKED_EVENT when connected from another filter's "activated"
+  // this allows user override of LIVES_WIDGET_CLICKED_SIGNAL when connected from another filter's "activated"
 
   lives_pconnect_t *pconx=mainw->pconx;
 
@@ -80,17 +81,17 @@
   while (pconx!=NULL) {
     totcons=0;
     j=0;
-    for (i=0;i<pconx->nparams;i++) {
+    for (i=0; i<pconx->nparams; i++) {
       totcons+=pconx->nconns[i];
-      for (;j<totcons;j++) {
-	if (pconx->ikey[j]==hotkey && pconx->imode[j]==imode && pconx->ipnum[j]==FX_DATA_PARAM_ACTIVE) {
-	  // out param is "ACTIVATED"
-	  if (pconx->params[i]==FX_DATA_PARAM_ACTIVE) {
-	    // abuse "autoscale" for this
-	    pconx->autoscale[i]=TRUE;
-	  }
-	  return;
-	}
+      for (; j<totcons; j++) {
+        if (pconx->ikey[j]==hotkey && pconx->imode[j]==imode && pconx->ipnum[j]==FX_DATA_PARAM_ACTIVE) {
+          // out param is "ACTIVATED"
+          if (pconx->params[i]==FX_DATA_PARAM_ACTIVE) {
+            // abuse "autoscale" for this
+            pconx->autoscale[i]=TRUE;
+          }
+          return;
+        }
       }
     }
     pconx=pconx->next;
@@ -114,19 +115,19 @@
     if (pconx->okey==hotkey&&pconx->omode==omode) {
       totcons=0;
       j=0;
-      for (i=0;i<pconx->nparams;i++) {
-	totcons+=pconx->nconns[i];
+      for (i=0; i<pconx->nparams; i++) {
+        totcons+=pconx->nconns[i];
 
-	if (pconx->params[i]==FX_DATA_PARAM_ACTIVE) {
-	  for (;j<totcons;j++) {
-	    if (pconx->ipnum[j]==FX_DATA_PARAM_ACTIVE) {
-	      // abuse "autoscale" for this
-	      pconx->autoscale[i]=FALSE;
-	    }
-	  }
-	}
+        if (pconx->params[i]==FX_DATA_PARAM_ACTIVE) {
+          for (; j<totcons; j++) {
+            if (pconx->ipnum[j]==FX_DATA_PARAM_ACTIVE) {
+              // abuse "autoscale" for this
+              pconx->autoscale[i]=FALSE;
+            }
+          }
+        }
 
-	else j+=pconx->nconns[i];
+        else j+=pconx->nconns[i];
       }
     }
     pconx=pconx->next;
@@ -139,28 +140,28 @@
 
   register int i;
 
-  for (i=0;i<FX_KEYS_MAX_VIRTUAL;i++) pthread_mutex_lock(&mainw->data_mutex[i]);
+  for (i=0; i<FX_KEYS_MAX_VIRTUAL; i++) pthread_mutex_lock(&mainw->data_mutex[i]);
 
   while (pconx!=NULL) {
     pconx_next=pconx->next;
-    g_free(pconx->params);
-    g_free(pconx->nconns);
-    g_free(pconx->ikey);
-    g_free(pconx->imode);
-    g_free(pconx->ipnum);
-    g_free(pconx->autoscale);
-    g_free(pconx);
+    lives_free(pconx->params);
+    lives_free(pconx->nconns);
+    lives_free(pconx->ikey);
+    lives_free(pconx->imode);
+    lives_free(pconx->ipnum);
+    lives_free(pconx->autoscale);
+    lives_free(pconx);
     pconx=pconx_next;
   }
   mainw->pconx=NULL;
 
-  for (i=0;i<FX_KEYS_MAX_VIRTUAL;i++) pthread_mutex_unlock(&mainw->data_mutex[i]);
+  for (i=0; i<FX_KEYS_MAX_VIRTUAL; i++) pthread_mutex_unlock(&mainw->data_mutex[i]);
 
 }
 
 
-static lives_pconnect_t *pconx_new (int okey, int omode) {
-  lives_pconnect_t *pconx=(lives_pconnect_t *)g_malloc0(sizeof(struct _lives_pconnect_t));
+static lives_pconnect_t *pconx_new(int okey, int omode) {
+  lives_pconnect_t *pconx=(lives_pconnect_t *)lives_malloc0(sizeof(struct _lives_pconnect_t));
   pconx->next=NULL;
   pconx->okey=okey;
   pconx->omode=omode;
@@ -184,29 +185,30 @@
 
     dpconx->nparams=spconx->nparams;
 
-    dpconx->nconns=(int *)g_malloc(dpconx->nparams*sizint);
-    dpconx->params=(int *)g_malloc(dpconx->nparams*sizint);
+    dpconx->nconns=(int *)lives_malloc(dpconx->nparams*sizint);
+    dpconx->params=(int *)lives_malloc(dpconx->nparams*sizint);
 
-    dpconx->ikey=dpconx->imode=dpconx->ipnum=dpconx->autoscale=NULL;
+    dpconx->ikey=dpconx->imode=dpconx->ipnum=NULL;
+    dpconx->autoscale=NULL;
 
     j=0;
 
-    for (i=0;i<dpconx->nparams;i++) {
+    for (i=0; i<dpconx->nparams; i++) {
       dpconx->params[i]=spconx->params[i];
       dpconx->nconns[i]=spconx->nconns[i];
       totcons+=dpconx->nconns[i];
 
-      dpconx->ikey=(int *)g_realloc(dpconx->ikey,totcons*sizint);
-      dpconx->imode=(int *)g_realloc(dpconx->imode,totcons*sizint);
-      dpconx->ipnum=(int *)g_realloc(dpconx->ipnum,totcons*sizint);
-      dpconx->autoscale=(int *)g_realloc(dpconx->autoscale,totcons*sizint);
+      dpconx->ikey=(int *)lives_realloc(dpconx->ikey,totcons*sizint);
+      dpconx->imode=(int *)lives_realloc(dpconx->imode,totcons*sizint);
+      dpconx->ipnum=(int *)lives_realloc(dpconx->ipnum,totcons*sizint);
+      dpconx->autoscale=(boolean *)lives_realloc(dpconx->autoscale,totcons*sizint);
 
       while (j<totcons) {
-	dpconx->ikey[j]=spconx->ikey[j];
-	dpconx->imode[j]=spconx->imode[j];
-	dpconx->ipnum[j]=spconx->ipnum[j];
-	dpconx->autoscale[j]=spconx->autoscale[j];
-	j++;
+        dpconx->ikey[j]=spconx->ikey[j];
+        dpconx->imode[j]=spconx->imode[j];
+        dpconx->ipnum[j]=spconx->ipnum[j];
+        dpconx->autoscale[j]=spconx->autoscale[j];
+        j++;
       }
     }
 
@@ -219,8 +221,8 @@
 
 
 
-gchar *pconx_list(int okey, int omode, int opnum) {
-  gchar *st1=g_strdup(""),*st2;
+char *pconx_list(int okey, int omode, int opnum) {
+  char *st1=lives_strdup(""),*st2;
   lives_pconnect_t *pconx=mainw->pconx;
 
   int totcons=0;
@@ -229,17 +231,17 @@
 
   while (pconx!=NULL) {
     if (pconx->okey==okey&&pconx->omode==omode) {
-      for (i=0;i<pconx->nparams;i++) {
-	if (pconx->params[i]==opnum) {
-	  for (j=totcons;j<totcons+pconx->nconns[i];j++) {
-	    if (strlen(st1)==0) st2=g_strdup_printf("%d %d %d %d",pconx->ikey[j]+1,pconx->imode[j]+1,pconx->ipnum[j],pconx->autoscale[j]);
-	    st2=g_strdup_printf("%s %d %d %d %d",st1,pconx->ikey[j]+1,pconx->imode[j]+1,pconx->ipnum[j],pconx->autoscale[j]);
-	    g_free(st1);
-	    st1=st2;
-	  }
-	  return st1;
-	}
-	totcons+=pconx->nconns[i];
+      for (i=0; i<pconx->nparams; i++) {
+        if (pconx->params[i]==opnum) {
+          for (j=totcons; j<totcons+pconx->nconns[i]; j++) {
+            if (strlen(st1)==0) st2=lives_strdup_printf("%d %d %d %d",pconx->ikey[j]+1,pconx->imode[j]+1,pconx->ipnum[j],pconx->autoscale[j]);
+            st2=lives_strdup_printf("%s %d %d %d %d",st1,pconx->ikey[j]+1,pconx->imode[j]+1,pconx->ipnum[j],pconx->autoscale[j]);
+            lives_free(st1);
+            st1=st2;
+          }
+          return st1;
+        }
+        totcons+=pconx->nconns[i];
       }
       return st1;
     }
@@ -259,99 +261,97 @@
 
   int totcons=0,maxcons=0;
 
-  for (i=0;i<FX_KEYS_MAX_VIRTUAL;i++) pthread_mutex_lock(&mainw->data_mutex[i]);
+  for (i=0; i<FX_KEYS_MAX_VIRTUAL; i++) pthread_mutex_lock(&mainw->data_mutex[i]);
 
   while (pconx!=NULL) {
     pconx_next=pconx->next;
     if (okey==FX_DATA_WILDCARD||(pconx->okey==okey&&pconx->omode==omode)) {
       if (ikey==FX_DATA_WILDCARD) {
-	//g_print("rem all cons from %d %d to any param\n",okey,omode); 
+        //g_print("rem all cons from %d %d to any param\n",okey,omode);
 
-	// delete entire node
-	g_free(pconx->params);
-	g_free(pconx->nconns);
-	g_free(pconx->ikey);
-	g_free(pconx->imode);
-	g_free(pconx->ipnum);
-	g_free(pconx->autoscale);
-	g_free(pconx);
-	if (mainw->pconx==pconx) mainw->pconx=pconx_next;
-	else pconx_prev->next=pconx_next;
-	for (i=0;i<FX_KEYS_MAX_VIRTUAL;i++) pthread_mutex_unlock(&mainw->data_mutex[i]);
-	return;
+        // delete entire node
+        lives_free(pconx->params);
+        lives_free(pconx->nconns);
+        lives_free(pconx->ikey);
+        lives_free(pconx->imode);
+        lives_free(pconx->ipnum);
+        lives_free(pconx->autoscale);
+        lives_free(pconx);
+        if (mainw->pconx==pconx) mainw->pconx=pconx_next;
+        else pconx_prev->next=pconx_next;
+        for (i=0; i<FX_KEYS_MAX_VIRTUAL; i++) pthread_mutex_unlock(&mainw->data_mutex[i]);
+        return;
       }
 
       maxcons=0;
       totcons=0;
       j=0;
 
-      for (i=0;i<pconx->nparams;i++) {
-	maxcons+=pconx->nconns[i];
+      for (i=0; i<pconx->nparams; i++) {
+        maxcons+=pconx->nconns[i];
       }
 
-      for (i=0;pconx!=NULL&&i<pconx->nparams;i++) {
-	totcons+=pconx->nconns[i];
+      for (i=0; pconx!=NULL&&i<pconx->nparams; i++) {
+        totcons+=pconx->nconns[i];
 
-	if (okey!=FX_DATA_WILDCARD&&pconx->params[i]!=opnum) {
-	  j=totcons;
-	  continue;
-	}
-
-	for (;j<totcons;j++) {
-
-	  if (pconx->ikey[j]==ikey && pconx->imode[j]==imode && (ipnum==FX_DATA_WILDCARD||pconx->ipnum[j]==ipnum)) {
-	    maxcons--;
-	    for (k=j;k<maxcons;k++) {
-	      pconx->ikey[k]=pconx->ikey[k+1];
-	      pconx->imode[k]=pconx->imode[k+1];
-	      pconx->ipnum[k]=pconx->ipnum[k+1];
-	      pconx->autoscale[k]=pconx->autoscale[k+1];
-	    }
-
-	    pconx->ikey=(int *)g_realloc(pconx->ikey,maxcons*sizint);
-	    pconx->imode=(int *)g_realloc(pconx->imode,maxcons*sizint);
-	    pconx->ipnum=(int *)g_realloc(pconx->ipnum,maxcons*sizint);
-	    pconx->autoscale=(int *)g_realloc(pconx->autoscale,maxcons*sizint);
-
-	    pconx->nconns[i]--;
-
-	    if (pconx->nconns[i]==0) {
-	      pconx->nparams--;
-	      for (k=i;k<pconx->nparams;k++) {
-		pconx->params[k]=pconx->params[k+1];
-		pconx->nconns[k]=pconx->nconns[k+1];
-	      }
-
-	      if (pconx->nparams==0) {
-		// delete entire node
-		g_free(pconx->params);
-		g_free(pconx->nconns);
-		g_free(pconx->ikey);
-		g_free(pconx->imode);
-		g_free(pconx->ipnum);
-		g_free(pconx->autoscale);
-		g_free(pconx);
-		if (mainw->pconx==pconx) {
-		  mainw->pconx=pconx_next;
-		  pconx=NULL;
-		}
-		else {
-		  pconx=pconx_prev;
-		  pconx->next=pconx_next;
-		}
-	      }
-	      else {
-		pconx->nconns=(int *)g_realloc(pconx->nconns,pconx->nparams*sizint);
-	      }
-	    }
-	  }
-	}
+        if (okey!=FX_DATA_WILDCARD&&pconx->params[i]!=opnum) {
+          j=totcons;
+          continue;
+        }
+
+        for (; j<totcons; j++) {
+
+          if (pconx->ikey[j]==ikey && pconx->imode[j]==imode && (ipnum==FX_DATA_WILDCARD||pconx->ipnum[j]==ipnum)) {
+            maxcons--;
+            for (k=j; k<maxcons; k++) {
+              pconx->ikey[k]=pconx->ikey[k+1];
+              pconx->imode[k]=pconx->imode[k+1];
+              pconx->ipnum[k]=pconx->ipnum[k+1];
+              pconx->autoscale[k]=pconx->autoscale[k+1];
+            }
+
+            pconx->ikey=(int *)lives_realloc(pconx->ikey,maxcons*sizint);
+            pconx->imode=(int *)lives_realloc(pconx->imode,maxcons*sizint);
+            pconx->ipnum=(int *)lives_realloc(pconx->ipnum,maxcons*sizint);
+            pconx->autoscale=(boolean *)lives_realloc(pconx->autoscale,maxcons*sizint);
+
+            pconx->nconns[i]--;
+
+            if (pconx->nconns[i]==0) {
+              pconx->nparams--;
+              for (k=i; k<pconx->nparams; k++) {
+                pconx->params[k]=pconx->params[k+1];
+                pconx->nconns[k]=pconx->nconns[k+1];
+              }
+
+              if (pconx->nparams==0) {
+                // delete entire node
+                lives_free(pconx->params);
+                lives_free(pconx->nconns);
+                lives_free(pconx->ikey);
+                lives_free(pconx->imode);
+                lives_free(pconx->ipnum);
+                lives_free(pconx->autoscale);
+                lives_free(pconx);
+                if (mainw->pconx==pconx) {
+                  mainw->pconx=pconx_next;
+                  pconx=NULL;
+                } else {
+                  pconx=pconx_prev;
+                  pconx->next=pconx_next;
+                }
+              } else {
+                pconx->nconns=(int *)lives_realloc(pconx->nconns,pconx->nparams*sizint);
+              }
+            }
+          }
+        }
       }
     }
     pconx_prev=pconx;
     pconx=pconx_next;
   }
-  for (i=0;i<FX_KEYS_MAX_VIRTUAL;i++) pthread_mutex_unlock(&mainw->data_mutex[i]);
+  for (i=0; i<FX_KEYS_MAX_VIRTUAL; i++) pthread_mutex_unlock(&mainw->data_mutex[i]);
 }
 
 
@@ -366,12 +366,12 @@
     }
     j=0;
     totcons=0;
-    for (i=0;i<pconx->nparams;i++) {
+    for (i=0; i<pconx->nparams; i++) {
       totcons+=pconx->nconns[i];
-      for (;j<totcons;j++) {
-	if (pconx->ikey[j]==key && pconx->imode[j]==omode) {
-	  pconx->imode[j]=nmode;
-	}
+      for (; j<totcons; j++) {
+        if (pconx->ikey[j]==key && pconx->imode[j]==omode) {
+          pconx->imode[j]=nmode;
+        }
       }
     }
     pconx=pconx->next;
@@ -394,7 +394,7 @@
 }
 
 
-static lives_pconnect_t *pconx_find (int okey, int omode) {
+static lives_pconnect_t *pconx_find(int okey, int omode) {
   //
   lives_pconnect_t *pconx=mainw->pconx;
   while (pconx!=NULL) {
@@ -416,7 +416,7 @@
 
   if (pnum!=FX_DATA_WILDCARD) return conxwp->dispp[pnum+EXTRA_PARAMS_OUT];
 
-  for (j=0;j<conxwp->num_params;j++) {
+  for (j=0; j<conxwp->num_params; j++) {
     totcons+=conxwp->dispp[j];
   }
 
@@ -431,122 +431,121 @@
 
   if (pconx==NULL) return 0;
 
-  for (j=0;j<pconx->nparams;j++) {
+  for (j=0; j<pconx->nparams; j++) {
     if (pnum!=FX_DATA_WILDCARD) {
       if (pconx->params[j]==pnum) return pconx->nconns[j];
-    }
-    else totcons+=pconx->nconns[j];
+    } else totcons+=pconx->nconns[j];
   }
   return totcons;
 }
 
 
 
-static void pconx_add_connection_private(lives_pconnect_t *pconx, int okey, int omode, int opnum, int ikey, int imode, int ipnum, boolean autoscale) {
+static void pconx_add_connection_private(lives_pconnect_t *pconx, int okey, int omode, int opnum, int ikey, int imode, int ipnum,
+    boolean autoscale) {
   int posn=0,totcons=0;
   register int i,j;
 
   // delete any existing connection to the input param
   pconx_delete(FX_DATA_WILDCARD,0,0,ikey,imode,ipnum);
 
-  for (i=0;i<FX_KEYS_MAX_VIRTUAL;i++) pthread_mutex_lock(&mainw->data_mutex[i]);
+  for (i=0; i<FX_KEYS_MAX_VIRTUAL; i++) pthread_mutex_lock(&mainw->data_mutex[i]);
 
   if (pconx==NULL) {
     // add whole new node
     pconx=pconx_new(okey,omode);
     pconx_append(pconx);
-  }
-  else {
+  } else {
     // see if already in params
-    
-    for (i=0;i<pconx->nparams;i++) {
-      
+
+    for (i=0; i<pconx->nparams; i++) {
+
       if (pconx->params[i]==opnum) {
-	// located !
-	// add connection to existing
+        // located !
+        // add connection to existing
 
-	for (j=0;j<pconx->nparams;j++) {
-	  if (j<i) {
-	    // calc posn
-	    posn+=pconx->nconns[j];
-	  }
-	  totcons+=pconx->nconns[j];
-	}
-
-	// if already there, do not add again, just update autoscale
-	for (j=posn;j<posn+pconx->nconns[i];j++) {
-	  if (pconx->ikey[j]==ikey&&pconx->imode[j]==imode&&pconx->ipnum[j]==ipnum) {
-	    pconx->autoscale[j]=autoscale;
-	    for (i=0;i<FX_KEYS_MAX_VIRTUAL;i++) pthread_mutex_unlock(&mainw->data_mutex[i]);
-	    return;
-	  }
-
-	  // add in order key/mode/chan
-	  if (pconx->ikey[j]>ikey||(pconx->ikey[j]==ikey&&pconx->imode[j]>imode)||
-	      (pconx->ikey[j]==ikey&&pconx->imode[j]==imode&&pconx->ipnum[j]>ipnum)) break;
-
-	}
-
-	// increment nconns for this param
-	pconx->nconns[i]++;
-
-	totcons++;
-
-	posn=j;
-
-	// make space for new
-	pconx->ikey=(int *)g_realloc(pconx->ikey,totcons*sizint);
-	pconx->imode=(int *)g_realloc(pconx->imode,totcons*sizint);
-	pconx->ipnum=(int *)g_realloc(pconx->ipnum,totcons*sizint);
-	pconx->autoscale=(int *)g_realloc(pconx->autoscale,totcons*sizint);
-
-	// move up 1
-	for (j=totcons-1;j>posn;j--) {
-	  pconx->ikey[j]=pconx->ikey[j-1];
-	  pconx->imode[j]=pconx->imode[j-1];
-	  pconx->ipnum[j]=pconx->ipnum[j-1];
-	  pconx->autoscale[j]=pconx->autoscale[j-1];
-	}
-
-	// insert at posn
-	pconx->ikey[posn]=ikey;
-	pconx->imode[posn]=imode;
-	pconx->ipnum[posn]=ipnum;
-	pconx->autoscale[posn]=autoscale;
+        for (j=0; j<pconx->nparams; j++) {
+          if (j<i) {
+            // calc posn
+            posn+=pconx->nconns[j];
+          }
+          totcons+=pconx->nconns[j];
+        }
+
+        // if already there, do not add again, just update autoscale
+        for (j=posn; j<posn+pconx->nconns[i]; j++) {
+          if (pconx->ikey[j]==ikey&&pconx->imode[j]==imode&&pconx->ipnum[j]==ipnum) {
+            pconx->autoscale[j]=autoscale;
+            for (i=0; i<FX_KEYS_MAX_VIRTUAL; i++) pthread_mutex_unlock(&mainw->data_mutex[i]);
+            return;
+          }
+
+          // add in order key/mode/chan
+          if (pconx->ikey[j]>ikey||(pconx->ikey[j]==ikey&&pconx->imode[j]>imode)||
+              (pconx->ikey[j]==ikey&&pconx->imode[j]==imode&&pconx->ipnum[j]>ipnum)) break;
+
+        }
 
-	for (i=0;i<FX_KEYS_MAX_VIRTUAL;i++) pthread_mutex_unlock(&mainw->data_mutex[i]);
+        // increment nconns for this param
+        pconx->nconns[i]++;
 
-	return;
+        totcons++;
+
+        posn=j;
+
+        // make space for new
+        pconx->ikey=(int *)lives_realloc(pconx->ikey,totcons*sizint);
+        pconx->imode=(int *)lives_realloc(pconx->imode,totcons*sizint);
+        pconx->ipnum=(int *)lives_realloc(pconx->ipnum,totcons*sizint);
+        pconx->autoscale=(boolean *)lives_realloc(pconx->autoscale,totcons*sizint);
+
+        // move up 1
+        for (j=totcons-1; j>posn; j--) {
+          pconx->ikey[j]=pconx->ikey[j-1];
+          pconx->imode[j]=pconx->imode[j-1];
+          pconx->ipnum[j]=pconx->ipnum[j-1];
+          pconx->autoscale[j]=pconx->autoscale[j-1];
+        }
+
+        // insert at posn
+        pconx->ikey[posn]=ikey;
+        pconx->imode[posn]=imode;
+        pconx->ipnum[posn]=ipnum;
+        pconx->autoscale[posn]=autoscale;
+
+        for (i=0; i<FX_KEYS_MAX_VIRTUAL; i++) pthread_mutex_unlock(&mainw->data_mutex[i]);
+
+        return;
       }
-      
+
     }
 
     // so, we have data for key/mode but this is a new param to be mapped
-    
-    for (i=0;i<pconx->nparams;i++) {
+
+    for (i=0; i<pconx->nparams; i++) {
       totcons+=pconx->nconns[i];
     }
 
     totcons++;
-    
+
     pconx->nparams++;
     posn=pconx->nparams;
-    
+
     // make space for new
-    pconx->nconns=(int *)g_realloc(pconx->nconns,posn*sizint);
-    pconx->params=(int *)g_realloc(pconx->params,posn*sizint);
+    pconx->nconns=(int *)lives_realloc(pconx->nconns,posn*sizint);
+    pconx->params=(int *)lives_realloc(pconx->params,posn*sizint);
+
+    pconx->ikey=(int *)lives_realloc(pconx->ikey,totcons*sizint);
+    pconx->imode=(int *)lives_realloc(pconx->imode,totcons*sizint);
+    pconx->ipnum=(int *)lives_realloc(pconx->ipnum,totcons*sizint);
+    pconx->autoscale=(boolean *)lives_realloc(pconx->autoscale,totcons*sizint);
 
-    pconx->ikey=(int *)g_realloc(pconx->ikey,totcons*sizint);
-    pconx->imode=(int *)g_realloc(pconx->imode,totcons*sizint);
-    pconx->ipnum=(int *)g_realloc(pconx->ipnum,totcons*sizint);
-    pconx->autoscale=(int *)g_realloc(pconx->autoscale,totcons*sizint);
-    
     pconx->params[posn-1]=opnum;
 
     pconx->nconns[posn-1]=1;
-    
+
     posn=totcons-1;
-    
+
     // insert at posn
     pconx->ikey[posn]=ikey;
     pconx->imode[posn]=imode;
@@ -557,7 +556,7 @@
     g_print("added another pconx from %d %d %d to %d %d %d\n",okey,omode,opnum,ikey,imode,ipnum);
 #endif
 
-    for (i=0;i<FX_KEYS_MAX_VIRTUAL;i++) pthread_mutex_unlock(&mainw->data_mutex[i]);
+    for (i=0; i<FX_KEYS_MAX_VIRTUAL; i++) pthread_mutex_unlock(&mainw->data_mutex[i]);
 
     return;
 
@@ -568,29 +567,29 @@
   totcons=pconx_get_nconns(pconx,FX_DATA_WILDCARD)+1;
   pconx->nparams++;
 
-  pconx->nconns=(int *)g_realloc(pconx->params,pconx->nparams*sizint);
+  pconx->nconns=(int *)lives_realloc(pconx->params,pconx->nparams*sizint);
   pconx->nconns[pconx->nparams-1]=1;
 
-  pconx->params=(int *)g_realloc(pconx->params,pconx->nparams*sizint);
+  pconx->params=(int *)lives_realloc(pconx->params,pconx->nparams*sizint);
   pconx->params[pconx->nparams-1]=opnum;
 
-  pconx->ikey=(int *)g_realloc(pconx->ikey,totcons*sizint);
+  pconx->ikey=(int *)lives_realloc(pconx->ikey,totcons*sizint);
   pconx->ikey[totcons-1]=ikey;
 
-  pconx->imode=(int *)g_realloc(pconx->imode,totcons*sizint);
+  pconx->imode=(int *)lives_realloc(pconx->imode,totcons*sizint);
   pconx->imode[totcons-1]=imode;
 
-  pconx->ipnum=(int *)g_realloc(pconx->ipnum,totcons*sizint);
+  pconx->ipnum=(int *)lives_realloc(pconx->ipnum,totcons*sizint);
   pconx->ipnum[totcons-1]=ipnum;
 
-  pconx->autoscale=(int *)g_realloc(pconx->autoscale,totcons*sizint);
+  pconx->autoscale=(boolean *)lives_realloc(pconx->autoscale,totcons*sizint);
   pconx->autoscale[totcons-1]=autoscale;
 
 #ifdef DEBUG_PCONX
   g_print("added new pconx from %d %d %d to %d %d %d (%d)\n",okey,omode,opnum,ikey,imode,ipnum,autoscale);
 #endif
 
-  for (i=0;i<FX_KEYS_MAX_VIRTUAL;i++) pthread_mutex_unlock(&mainw->data_mutex[i]);
+  for (i=0; i<FX_KEYS_MAX_VIRTUAL; i++) pthread_mutex_unlock(&mainw->data_mutex[i]);
 
 }
 
@@ -601,7 +600,8 @@
 }
 
 
-static weed_plant_t *pconx_get_out_param(boolean use_filt, int ikey, int imode, int ipnum, int *okey, int *omode, int *opnum, int *autoscale) {
+static weed_plant_t *pconx_get_out_param(boolean use_filt, int ikey, int imode, int ipnum, int *okey, int *omode, int *opnum,
+    int *autoscale) {
   // walk all pconx and find one which has ikey/imode/ipnum as destination
   // then all we need do is copy the "value" leaf
 
@@ -617,63 +617,59 @@
   while (pconx!=NULL) {
     if (!use_filt) {
       if (mainw->is_rendering) {
-	inst=get_new_inst_for_keymode(pconx->okey,pconx->omode);
-      }
-      else {
-	inst=rte_keymode_get_instance(pconx->okey+1,pconx->omode);
+        inst=get_new_inst_for_keymode(pconx->okey,pconx->omode);
+      } else {
+        inst=rte_keymode_get_instance(pconx->okey+1,pconx->omode);
       }
       if (inst!=NULL) filter=weed_instance_get_filter(inst,TRUE); // inst could be NULL if we connected to "Activated"
       else filter=NULL;
-    }
-    else {
+    } else {
       filter=rte_keymode_get_filter(pconx->okey+1,pconx->omode);
       if (filter==NULL) {
-	pconx=pconx->next;
-	continue;
+        pconx=pconx->next;
+        continue;
       }
     }
     totcons=0;
     j=0;
-    for (i=0;i<pconx->nparams;i++) {
+    for (i=0; i<pconx->nparams; i++) {
       totcons+=pconx->nconns[i];
-      for (;j<totcons;j++) {
-	if (pconx->ikey[j]==ikey && pconx->imode[j]==imode && pconx->ipnum[j]==ipnum) {
-	  weed_plant_t *param=NULL;
-
-	  // out param is "ACTIVATED"
-	  if (pconx->params[i]==FX_DATA_PARAM_ACTIVE) {
-	    pthread_mutex_lock(&mainw->fxd_active_mutex);
-	    if (active_dummy!=NULL&&!WEED_PLANT_IS_PARAMETER(active_dummy)) {
-	      weed_plant_free(active_dummy);
-	      active_dummy=NULL;
-	    }
-	    if (active_dummy==NULL) {
-	      active_dummy=weed_plant_new(WEED_PLANT_PARAMETER);
-	      weed_set_plantptr_value(active_dummy,"template",NULL);
-	    }
-	    if (!use_filt) weed_set_boolean_value(active_dummy,"value",inst!=NULL);
-	    param=active_dummy;
-	    pthread_mutex_unlock(&mainw->fxd_active_mutex);
-	  }
-	  else {
-
-	    if (use_filt) {
-	      weed_plant_t **outparams=weed_get_plantptr_array(filter,"out_parameter_templates",&error);
-	      if (pconx->params[i]<weed_leaf_num_elements(filter,"out_parameter_templates")) {
-		param=outparams[pconx->params[i]];
-	      }
-	      weed_free(outparams);
-	    }
-	    else {
-	      if (inst==NULL) continue;
-	      param=weed_inst_out_param(inst,pconx->params[i]);
-	    }
-	  }
-	  if (okey!=NULL) *okey=pconx->okey;
-	  if (omode!=NULL) *omode=pconx->omode;
-	  if (opnum!=NULL) *opnum=pconx->params[i];
-	  if (autoscale!=NULL) *autoscale=pconx->autoscale[j];
-	  return param;
+      for (; j<totcons; j++) {
+        if (pconx->ikey[j]==ikey && pconx->imode[j]==imode && pconx->ipnum[j]==ipnum) {
+          weed_plant_t *param=NULL;
+
+          // out param is "ACTIVATED"
+          if (pconx->params[i]==FX_DATA_PARAM_ACTIVE) {
+            pthread_mutex_lock(&mainw->fxd_active_mutex);
+            if (active_dummy!=NULL&&!WEED_PLANT_IS_PARAMETER(active_dummy)) {
+              weed_plant_free(active_dummy);
+              active_dummy=NULL;
+            }
+            if (active_dummy==NULL) {
+              active_dummy=weed_plant_new(WEED_PLANT_PARAMETER);
+              weed_set_plantptr_value(active_dummy,"template",NULL);
+            }
+            if (!use_filt) weed_set_boolean_value(active_dummy,"value",inst!=NULL);
+            param=active_dummy;
+            pthread_mutex_unlock(&mainw->fxd_active_mutex);
+          } else {
+
+            if (use_filt) {
+              weed_plant_t **outparams=weed_get_plantptr_array(filter,"out_parameter_templates",&error);
+              if (pconx->params[i]<weed_leaf_num_elements(filter,"out_parameter_templates")) {
+                param=outparams[pconx->params[i]];
+              }
+              lives_free(outparams);
+            } else {
+              if (inst==NULL) continue;
+              param=weed_inst_out_param(inst,pconx->params[i]);
+            }
+          }
+          if (okey!=NULL) *okey=pconx->okey;
+          if (omode!=NULL) *omode=pconx->omode;
+          if (opnum!=NULL) *opnum=pconx->params[i];
+          if (autoscale!=NULL) *autoscale=pconx->autoscale[j];
+          return param;
         }
       }
     }
@@ -715,8 +711,7 @@
     dptmpl=weed_get_plantptr_value(dparam,"template",&error);
     dtype=weed_leaf_seed_type(dparam,"value");
     ndvals=weed_leaf_num_elements(dparam,"value");
-  }
-  else {
+  } else {
     dptmpl=dparam;
     dtype=weed_leaf_seed_type(dparam,"default");
     ndvals=weed_leaf_num_elements(dparam,"default");
@@ -725,8 +720,7 @@
   if (WEED_PLANT_IS_PARAMETER(sparam)) {
     stype=weed_leaf_seed_type(sparam,"value");
     nsvals=weed_leaf_num_elements(sparam,"value");
-  }
-  else {
+  } else {
     stype=weed_leaf_seed_type(sparam,"default");
     nsvals=weed_leaf_num_elements(sparam,"default");
   }
@@ -734,7 +728,7 @@
   if (dptmpl!=NULL) {
     dhint=weed_get_int_value(dptmpl,"hint",&error);
     dflags=weed_get_int_value(dptmpl,"flags",&error);
-    
+
     if (dhint==WEED_HINT_COLOR) {
       int cspace=weed_get_int_value(dptmpl,"colorspace",&error);
       if (cspace==WEED_COLORSPACE_RGB&&(nsvals%3!=0)) return FALSE;
@@ -800,13 +794,12 @@
   if (!params_compatible(sparam,dparam)) return FALSE;
 
   if (ndvals>nsvals) ndvals=nsvals;
- 
+
   if (autoscale) {
     if (weed_plant_has_leaf(sptmpl,"min")&&weed_plant_has_leaf(sptmpl,"max")) {
       nsmin=weed_leaf_num_elements(sptmpl,"min");
       nsmax=weed_leaf_num_elements(sptmpl,"max");
-    }
-    else if (dparam!=active_dummy||sparam!=active_dummy) autoscale=FALSE;
+    } else if (dparam!=active_dummy||sparam!=active_dummy) autoscale=FALSE;
   }
 
   if (dptmpl!=NULL&&weed_plant_has_leaf(dptmpl,"max")) {
@@ -818,155 +811,150 @@
   switch (stype) {
   case WEED_SEED_STRING:
     switch (dtype) {
-    case WEED_SEED_STRING:
-      {
-	char **valsS=weed_get_string_array(sparam,"value",&error);
-	char **valss=weed_get_string_array(dparam,"value",&error);
-
-	if (ndvals>ondvals) valss=(char **)g_realloc(valss,ndvals*sizeof(char *));
-
-	for (i=0;i<ndvals;i++) {
-	  if (i>=ondvals||strcmp(valss[i],valsS[i])) {
-	    retval=TRUE;
-	    if (i<ondvals) weed_free(valss[i]);
-	    valss[i]=valsS[i];
-	  }
-	  else weed_free(valsS[i]);
-	}
-	if (!retval) {
-	  for (i=0;i<ndvals;i++) weed_free(valss[i]);
-	  weed_free(valss);
-	  weed_free(valsS);
-	  return FALSE;
-	}
-
-	weed_set_string_array(dparam,"value",ndvals,valss);
-
-	for (i=0;i<ndvals;i++) weed_free(valss[i]);
-	weed_free(valss);
-	weed_free(valsS);
+    case WEED_SEED_STRING: {
+      char **valsS=weed_get_string_array(sparam,"value",&error);
+      char **valss=weed_get_string_array(dparam,"value",&error);
+
+      if (ndvals>ondvals) valss=(char **)lives_realloc(valss,ndvals*sizeof(char *));
+
+      for (i=0; i<ndvals; i++) {
+        if (i>=ondvals||strcmp(valss[i],valsS[i])) {
+          retval=TRUE;
+          if (i<ondvals) lives_free(valss[i]);
+          valss[i]=valsS[i];
+        } else lives_free(valsS[i]);
       }
-      return TRUE;
+      if (!retval) {
+        for (i=0; i<ndvals; i++) lives_free(valss[i]);
+        lives_free(valss);
+        lives_free(valsS);
+        return FALSE;
+      }
+
+      weed_set_string_array(dparam,"value",ndvals,valss);
+
+      for (i=0; i<ndvals; i++) lives_free(valss[i]);
+      lives_free(valss);
+      lives_free(valsS);
+    }
+    return TRUE;
     default:
       return retval;
     }
   case WEED_SEED_DOUBLE:
     switch (dtype) {
-    case WEED_SEED_DOUBLE:
-      {
-	double *valsD=weed_get_double_array(sparam,"value",&error);
-	double *valsd=weed_get_double_array(dparam,"value",&error);
-	
-	double *maxd=weed_get_double_array(dptmpl,"max",&error);
-	double *mind=weed_get_double_array(dptmpl,"min",&error);
-
-	double *mins=NULL,*maxs=NULL;
-
-	if (autoscale) {
-	  mins=weed_get_double_array(sptmpl,"min",&error);
-	  maxs=weed_get_double_array(sptmpl,"max",&error);
-	}
-
-	if (ndvals>ondvals) valsd=(double *)g_realloc(valsd,ndvals*sizeof(double));
-
-	for (i=0;i<ndvals;i++) {
-	  if (autoscale) {
-	    ratio=(valsD[i]-mins[sminct])/(maxs[smaxct]-mins[sminct]);
-	    valsD[i]=mind[minct]+(maxd[maxct]-mind[minct])*ratio;
-	    if (++smaxct==nsmax) smaxct=0;
-	    if (++sminct==nsmin) sminct=0;
-
-	    if (valsD[i]>maxd[maxct]) valsD[i]=maxd[maxct];
-	    if (valsD[i]<mind[minct]) valsD[i]=mind[minct];
-	  }
-
-	  if (i>=ondvals||valsd[i]!=valsD[i]) {
-	    retval=TRUE;
-	    valsd[i]=valsD[i];
-	  }
-	  if (++maxct==nmax) maxct=0;
-	  if (++minct==nmin) minct=0;
-	}
-
-	if (mins!=NULL) {
-	  weed_free(mins);
-	  weed_free(maxs);
-	}
-
-	if (retval) {
-
-	  if (inst!=NULL&&mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
-	    // if we are recording, add this change to our event_list
-	    rec_param_change(inst,pnum);
-	    copyto=set_copy_to(inst,pnum,FALSE);
-	    if (copyto!=-1) rec_param_change(inst,copyto);
-	  }
-
-	  weed_set_double_array(dparam,"value",ndvals,valsd);
-	}
-	weed_free(maxd);
-	weed_free(mind);
-	weed_free(valsD);
-	weed_free(valsd);
+    case WEED_SEED_DOUBLE: {
+      double *valsD=weed_get_double_array(sparam,"value",&error);
+      double *valsd=weed_get_double_array(dparam,"value",&error);
+
+      double *maxd=weed_get_double_array(dptmpl,"max",&error);
+      double *mind=weed_get_double_array(dptmpl,"min",&error);
+
+      double *mins=NULL,*maxs=NULL;
+
+      if (autoscale) {
+        mins=weed_get_double_array(sptmpl,"min",&error);
+        maxs=weed_get_double_array(sptmpl,"max",&error);
       }
-      return retval;
 
-    case WEED_SEED_STRING:
-      {
-	char *opstring,*tmp,*bit;
-	double *valsd=weed_get_double_array(sparam,"value",&error);
-	char **valss,*vals;
-
-	if (ndvals==1) {
-	  opstring=g_strdup("");
-	  vals=weed_get_string_value(dparam,"value",&error);
-	  for (i=0;i<nsvals;i++) {
-	    bit=g_strdup_printf("%.4f",valsd[i]);
-	    if (strlen(opstring)==0)
-	      tmp=g_strconcat (opstring,bit,NULL);
-	    else 
-	      tmp=g_strconcat (opstring," ",bit,NULL);
-	    g_free(bit);
-	    g_free(opstring);
-	    opstring=tmp;
-	  }
-	  if (strcmp(vals,opstring)) {
-	    weed_set_string_value(dparam,"value",opstring);
-	    retval=TRUE;
-	  }
-	  weed_free(vals);
-	  weed_free(valsd);
-	  g_free(opstring);
-	  return retval;
-	}
-
-	valss=weed_get_string_array(dparam,"value",&error);
-
-	if (ndvals>ondvals) valss=(char **)g_realloc(valsd,ndvals*sizeof(char *));
-
-	for (i=0;i<ndvals;i++) {
-	  bit=g_strdup_printf("%.4f",valsd[i]);
-	  if (i>=ondvals||strcmp(valss[i],bit)) {
-	    retval=TRUE;
-	    if (i<ondvals) weed_free(valss[i]);
-	    valss[i]=bit;
-	  }
-	  else g_free(bit);
-	}
-	if (!retval) {
-	  for (i=0;i<ndvals;i++) weed_free(valss[i]);
-	  weed_free(valss);
-	  weed_free(valsd);
-	  return FALSE;
-	}
-
-	weed_set_string_array(dparam,"value",ndvals,valss);
-
-	for (i=0;i<ndvals;i++) weed_free(valss[i]);
-	weed_free(valss);
-	weed_free(valsd);
+      if (ndvals>ondvals) valsd=(double *)lives_realloc(valsd,ndvals*sizeof(double));
+
+      for (i=0; i<ndvals; i++) {
+        if (autoscale) {
+          ratio=(valsD[i]-mins[sminct])/(maxs[smaxct]-mins[sminct]);
+          valsD[i]=mind[minct]+(maxd[maxct]-mind[minct])*ratio;
+          if (++smaxct==nsmax) smaxct=0;
+          if (++sminct==nsmin) sminct=0;
+
+          if (valsD[i]>maxd[maxct]) valsD[i]=maxd[maxct];
+          if (valsD[i]<mind[minct]) valsD[i]=mind[minct];
+        }
+
+        if (i>=ondvals||valsd[i]!=valsD[i]) {
+          retval=TRUE;
+          valsd[i]=valsD[i];
+        }
+        if (++maxct==nmax) maxct=0;
+        if (++minct==nmin) minct=0;
       }
-      return TRUE;
+
+      if (mins!=NULL) {
+        lives_free(mins);
+        lives_free(maxs);
+      }
+
+      if (retval) {
+
+        if (inst!=NULL&&mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
+          // if we are recording, add this change to our event_list
+          rec_param_change(inst,pnum);
+          copyto=set_copy_to(inst,pnum,FALSE);
+          if (copyto!=-1) rec_param_change(inst,copyto);
+        }
+
+        weed_set_double_array(dparam,"value",ndvals,valsd);
+      }
+      lives_free(maxd);
+      lives_free(mind);
+      lives_free(valsD);
+      lives_free(valsd);
+    }
+    return retval;
+
+    case WEED_SEED_STRING: {
+      char *opstring,*tmp,*bit;
+      double *valsd=weed_get_double_array(sparam,"value",&error);
+      char **valss,*vals;
+
+      if (ndvals==1) {
+        opstring=lives_strdup("");
+        vals=weed_get_string_value(dparam,"value",&error);
+        for (i=0; i<nsvals; i++) {
+          bit=lives_strdup_printf("%.4f",valsd[i]);
+          if (strlen(opstring)==0)
+            tmp=lives_strconcat(opstring,bit,NULL);
+          else
+            tmp=lives_strconcat(opstring," ",bit,NULL);
+          lives_free(bit);
+          lives_free(opstring);
+          opstring=tmp;
+        }
+        if (strcmp(vals,opstring)) {
+          weed_set_string_value(dparam,"value",opstring);
+          retval=TRUE;
+        }
+        lives_free(vals);
+        lives_free(valsd);
+        lives_free(opstring);
+        return retval;
+      }
+
+      valss=weed_get_string_array(dparam,"value",&error);
+
+      if (ndvals>ondvals) valss=(char **)lives_realloc(valsd,ndvals*sizeof(char *));
+
+      for (i=0; i<ndvals; i++) {
+        bit=lives_strdup_printf("%.4f",valsd[i]);
+        if (i>=ondvals||strcmp(valss[i],bit)) {
+          retval=TRUE;
+          if (i<ondvals) lives_free(valss[i]);
+          valss[i]=bit;
+        } else lives_free(bit);
+      }
+      if (!retval) {
+        for (i=0; i<ndvals; i++) lives_free(valss[i]);
+        lives_free(valss);
+        lives_free(valsd);
+        return FALSE;
+      }
+
+      weed_set_string_array(dparam,"value",ndvals,valss);
+
+      for (i=0; i<ndvals; i++) lives_free(valss[i]);
+      lives_free(valss);
+      lives_free(valsd);
+    }
+    return TRUE;
     default:
       break;
     }
@@ -975,380 +963,367 @@
 
   case WEED_SEED_INT:
     switch (dtype) {
-    case WEED_SEED_STRING:
-      {
-	char *opstring,*tmp,*bit;
-	int *valsi=weed_get_int_array(sparam,"value",&error);
-
-	char **valss,*vals;
-
-	if (ndvals==1) {
-	  opstring=g_strdup("");
-	  vals=weed_get_string_value(dparam,"value",&error);
-	  for (i=0;i<nsvals;i++) {
-	    bit=g_strdup_printf("%d",valsi[i]);
-	    if (strlen(opstring)==0)
-	      tmp=g_strconcat (opstring,bit,NULL);
-	    else 
-	      tmp=g_strconcat (opstring," ",bit,NULL);
-	    g_free(bit);
-	    g_free(opstring);
-	    opstring=tmp;
-	  }
-	  if (strcmp(vals,opstring)) {
-	    weed_set_string_value(dparam,"value",opstring);
-	    retval=TRUE;
-	  }
-	  weed_free(vals);
-	  weed_free(valsi);
-	  g_free(opstring);
-	  return retval;
-	}
-
-	valss=weed_get_string_array(dparam,"value",&error);
-
-	if (ndvals>ondvals) valss=(char **)g_realloc(valss,ndvals*sizeof(char *));
-
-	for (i=0;i<ndvals;i++) {
-	  bit=g_strdup_printf("%d",valsi[i]);
-	  if (i>=ondvals||strcmp(valss[i],bit)) {
-	    retval=TRUE;
-	    if (i<ondvals) weed_free(valss[i]);
-	    valss[i]=bit;
-	  }
-	  else g_free(bit);
-	}
-	if (!retval) {
-	  for (i=0;i<ndvals;i++) weed_free(valss[i]);
-	  weed_free(valss);
-	  weed_free(valsi);
-	  return FALSE;
-	}
-
-	weed_set_string_array(dparam,"value",ndvals,valss);
-
-	for (i=0;i<ndvals;i++) weed_free(valss[i]);
-	weed_free(valss);
-	weed_free(valsi);
+    case WEED_SEED_STRING: {
+      char *opstring,*tmp,*bit;
+      int *valsi=weed_get_int_array(sparam,"value",&error);
+
+      char **valss,*vals;
+
+      if (ndvals==1) {
+        opstring=lives_strdup("");
+        vals=weed_get_string_value(dparam,"value",&error);
+        for (i=0; i<nsvals; i++) {
+          bit=lives_strdup_printf("%d",valsi[i]);
+          if (strlen(opstring)==0)
+            tmp=lives_strconcat(opstring,bit,NULL);
+          else
+            tmp=lives_strconcat(opstring," ",bit,NULL);
+          lives_free(bit);
+          lives_free(opstring);
+          opstring=tmp;
+        }
+        if (strcmp(vals,opstring)) {
+          weed_set_string_value(dparam,"value",opstring);
+          retval=TRUE;
+        }
+        lives_free(vals);
+        lives_free(valsi);
+        lives_free(opstring);
+        return retval;
       }
-      return retval;
-    case WEED_SEED_DOUBLE:
-      {
-	int *valsi=weed_get_int_array(sparam,"value",&error);
-	double * valsd=weed_get_double_array(dparam,"value",&error);
-	
-	double *maxd=weed_get_double_array(dptmpl,"max",&error);
-	double *mind=weed_get_double_array(dptmpl,"min",&error);
-	double vald;
-
-	int *mins=NULL,*maxs=NULL;
-
-	if (autoscale) {
-	  mins=weed_get_int_array(sptmpl,"min",&error);
-	  maxs=weed_get_int_array(sptmpl,"max",&error);
-	}
-
-	if (ndvals>ondvals) valsd=(double *)g_realloc(valsd,ndvals*sizeof(double));
-
-	for (i=0;i<ndvals;i++) {
-	  if (autoscale) {
-	    ratio=(double)(valsi[i]-mins[sminct])/(double)(maxs[smaxct]-mins[sminct]);
-	    vald=mind[minct]+(maxd[maxct]-mind[minct])*ratio;
-	    if (++smaxct==nsmax) smaxct=0;
-	    if (++sminct==nsmin) sminct=0;
-
-	    if (vald>maxd[maxct]) vald=maxd[maxct];
-	    if (vald<mind[minct]) vald=mind[minct];
-	  }
-	  else vald=(double)valsi[i];
-
-	  if (i>=ondvals||valsd[i]!=vald) {
-	    retval=TRUE;
-	    valsd[i]=vald;
-	  }
-	  if (++maxct==nmax) maxct=0;
-	  if (++minct==nmin) minct=0;
-	}
-
-	if (mins!=NULL) {
-	  weed_free(mins);
-	  weed_free(maxs);
-	}
-
-	if (retval) {
-
-	  if (inst!=NULL&&mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
-	    // if we are recording, add this change to our event_list
-	    rec_param_change(inst,pnum);
-	    copyto=set_copy_to(inst,pnum,FALSE);
-	    if (copyto!=-1) rec_param_change(inst,copyto);
-	  }
-
-	  weed_set_double_array(dparam,"value",ndvals,valsd);
-	}
-	weed_free(maxd);
-	weed_free(mind);
-	weed_free(valsi);
-	weed_free(valsd);
+
+      valss=weed_get_string_array(dparam,"value",&error);
+
+      if (ndvals>ondvals) valss=(char **)lives_realloc(valss,ndvals*sizeof(char *));
+
+      for (i=0; i<ndvals; i++) {
+        bit=lives_strdup_printf("%d",valsi[i]);
+        if (i>=ondvals||strcmp(valss[i],bit)) {
+          retval=TRUE;
+          if (i<ondvals) lives_free(valss[i]);
+          valss[i]=bit;
+        } else lives_free(bit);
       }
-      return retval;
+      if (!retval) {
+        for (i=0; i<ndvals; i++) lives_free(valss[i]);
+        lives_free(valss);
+        lives_free(valsi);
+        return FALSE;
+      }
+
+      weed_set_string_array(dparam,"value",ndvals,valss);
+
+      for (i=0; i<ndvals; i++) lives_free(valss[i]);
+      lives_free(valss);
+      lives_free(valsi);
+    }
+    return retval;
+    case WEED_SEED_DOUBLE: {
+      int *valsi=weed_get_int_array(sparam,"value",&error);
+      double *valsd=weed_get_double_array(dparam,"value",&error);
+
+      double *maxd=weed_get_double_array(dptmpl,"max",&error);
+      double *mind=weed_get_double_array(dptmpl,"min",&error);
+      double vald;
 
-    case WEED_SEED_INT:
-      {
-	int *valsI=weed_get_int_array(sparam,"value",&error);
-	int *valsi=weed_get_int_array(dparam,"value",&error);
-	
-	int *maxi=weed_get_int_array(dptmpl,"max",&error);
-	int *mini=weed_get_int_array(dptmpl,"min",&error);
-
-	int *mins=NULL,*maxs=NULL;
-
-	if (autoscale) {
-	  mins=weed_get_int_array(sptmpl,"min",&error);
-	  maxs=weed_get_int_array(sptmpl,"max",&error);
-	}
-
-	if (ndvals>ondvals) valsi=(int *)g_realloc(valsi,ndvals*sizeof(int));
-
-	for (i=0;i<ndvals;i++) {
-	  if (autoscale) {
-	    ratio=(double)(valsI[i]-mins[sminct])/(double)(maxs[smaxct]-mins[sminct]);
-	    valsI[i]=myround(mini[minct]+(double)(maxi[maxct]-mini[minct])*ratio);
-	    if (++smaxct==nsmax) smaxct=0;
-	    if (++sminct==nsmin) sminct=0;
-
-	    if (valsI[i]>maxi[maxct]) valsI[i]=maxi[maxct];
-	    if (valsI[i]<mini[minct]) valsI[i]=mini[minct];
-	  }
-
-	  if (i>=ondvals||valsi[i]!=valsI[i]) {
-	    retval=TRUE;
-	    valsi[i]=valsI[i];
-	  }
-	  if (++maxct==nmax) maxct=0;
-	  if (++minct==nmin) minct=0;
-	}
-
-	if (mins!=NULL) {
-	  weed_free(mins);
-	  weed_free(maxs);
-	}
-
-	if (retval) {
-
-	  if (mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
-	    // if we are recording, add this change to our event_list
-	    rec_param_change(inst,pnum);
-	    copyto=set_copy_to(inst,pnum,FALSE);
-	    if (copyto!=-1) rec_param_change(inst,copyto);
-	  }
-
-	  weed_set_int_array(dparam,"value",ndvals,valsi);
-	}
-	weed_free(maxi);
-	weed_free(mini);
-	weed_free(valsI);
-	weed_free(valsi);
+      int *mins=NULL,*maxs=NULL;
+
+      if (autoscale) {
+        mins=weed_get_int_array(sptmpl,"min",&error);
+        maxs=weed_get_int_array(sptmpl,"max",&error);
       }
-      return retval;
+
+      if (ndvals>ondvals) valsd=(double *)lives_realloc(valsd,ndvals*sizeof(double));
+
+      for (i=0; i<ndvals; i++) {
+        if (autoscale) {
+          ratio=(double)(valsi[i]-mins[sminct])/(double)(maxs[smaxct]-mins[sminct]);
+          vald=mind[minct]+(maxd[maxct]-mind[minct])*ratio;
+          if (++smaxct==nsmax) smaxct=0;
+          if (++sminct==nsmin) sminct=0;
+
+          if (vald>maxd[maxct]) vald=maxd[maxct];
+          if (vald<mind[minct]) vald=mind[minct];
+        } else vald=(double)valsi[i];
+
+        if (i>=ondvals||valsd[i]!=vald) {
+          retval=TRUE;
+          valsd[i]=vald;
+        }
+        if (++maxct==nmax) maxct=0;
+        if (++minct==nmin) minct=0;
+      }
+
+      if (mins!=NULL) {
+        lives_free(mins);
+        lives_free(maxs);
+      }
+
+      if (retval) {
+
+        if (inst!=NULL&&mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
+          // if we are recording, add this change to our event_list
+          rec_param_change(inst,pnum);
+          copyto=set_copy_to(inst,pnum,FALSE);
+          if (copyto!=-1) rec_param_change(inst,copyto);
+        }
+
+        weed_set_double_array(dparam,"value",ndvals,valsd);
+      }
+      lives_free(maxd);
+      lives_free(mind);
+      lives_free(valsi);
+      lives_free(valsd);
+    }
+    return retval;
+
+    case WEED_SEED_INT: {
+      int *valsI=weed_get_int_array(sparam,"value",&error);
+      int *valsi=weed_get_int_array(dparam,"value",&error);
+
+      int *maxi=weed_get_int_array(dptmpl,"max",&error);
+      int *mini=weed_get_int_array(dptmpl,"min",&error);
+
+      int *mins=NULL,*maxs=NULL;
+
+      if (autoscale) {
+        mins=weed_get_int_array(sptmpl,"min",&error);
+        maxs=weed_get_int_array(sptmpl,"max",&error);
+      }
+
+      if (ndvals>ondvals) valsi=(int *)lives_realloc(valsi,ndvals*sizeof(int));
+
+      for (i=0; i<ndvals; i++) {
+        if (autoscale) {
+          ratio=(double)(valsI[i]-mins[sminct])/(double)(maxs[smaxct]-mins[sminct]);
+          valsI[i]=myround(mini[minct]+(double)(maxi[maxct]-mini[minct])*ratio);
+          if (++smaxct==nsmax) smaxct=0;
+          if (++sminct==nsmin) sminct=0;
+
+          if (valsI[i]>maxi[maxct]) valsI[i]=maxi[maxct];
+          if (valsI[i]<mini[minct]) valsI[i]=mini[minct];
+        }
+
+        if (i>=ondvals||valsi[i]!=valsI[i]) {
+          retval=TRUE;
+          valsi[i]=valsI[i];
+        }
+        if (++maxct==nmax) maxct=0;
+        if (++minct==nmin) minct=0;
+      }
+
+      if (mins!=NULL) {
+        lives_free(mins);
+        lives_free(maxs);
+      }
+
+      if (retval) {
+
+        if (mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
+          // if we are recording, add this change to our event_list
+          rec_param_change(inst,pnum);
+          copyto=set_copy_to(inst,pnum,FALSE);
+          if (copyto!=-1) rec_param_change(inst,copyto);
+        }
+
+        weed_set_int_array(dparam,"value",ndvals,valsi);
+      }
+      lives_free(maxi);
+      lives_free(mini);
+      lives_free(valsI);
+      lives_free(valsi);
+    }
+    return retval;
 
     }
     break;
 
-  case WEED_SEED_BOOLEAN:
-    {
-      int *valsb=weed_get_boolean_array(sparam,"value",&error);
-      if (dparam==active_dummy&&!autoscale) {
-	// ACTIVATE
-	int key;
-	pthread_mutex_lock(&mainw->fxd_active_mutex);
-	key=weed_get_int_value(dparam,"host_key",&error);
-	pthread_mutex_unlock(&mainw->fxd_active_mutex);
-	if ((valsb[0]==WEED_TRUE&&!(mainw->rte&(GU641<<(key))))||
-	    (valsb[0]==WEED_FALSE&&(mainw->rte&(GU641<<(key))))) {
-	  switch_fx_state(okey,key+1);
-	}
-	weed_free(valsb);
-	return retval;
-      }
-
-      switch (dtype) {
-      case WEED_SEED_STRING:
-	{
-	  char *opstring,*tmp,*bit;
-
-	  char **valss,*vals;
-
-	  if (ndvals==1) {
-	    opstring=g_strdup("");
-	    vals=weed_get_string_value(dparam,"value",&error);
-	    for (i=0;i<nsvals;i++) {
-	      bit=g_strdup_printf("%d",valsb[i]);
-	      if (strlen(opstring)==0)
-		tmp=g_strconcat (opstring,bit,NULL);
-	      else 
-		tmp=g_strconcat (opstring," ",bit,NULL);
-	      g_free(bit);
-	      g_free(opstring);
-	      opstring=tmp;
-	    }
-	    if (strcmp(vals,opstring)) {
-	      weed_set_string_value(dparam,"value",opstring);
-	      retval=TRUE;
-	    }
-	    weed_free(vals);
-	    weed_free(valsb);
-	    g_free(opstring);
-	    return retval;
-	  }
-
-	  valss=weed_get_string_array(dparam,"value",&error);
-	  if (ndvals>ondvals) valss=(char **)g_realloc(valss,ndvals*sizeof(char *));
-
-	  for (i=0;i<ndvals;i++) {
-	    bit=g_strdup_printf("%d",valsb[i]);
-	    if (i>=ondvals||strcmp(valss[i],bit)) {
-	      retval=TRUE;
-	      if (i<ondvals) weed_free(valss[i]);
-	      valss[i]=bit;
-	    }
-	    else g_free(bit);
-	  }
-	  if (!retval) {
-	    for (i=0;i<ndvals;i++) weed_free(valss[i]);
-	    weed_free(valss);
-	    weed_free(valsb);
-	    return FALSE;
-	  }
-
-	  weed_set_string_array(dparam,"value",ndvals,valss);
-
-	  for (i=0;i<ndvals;i++) weed_free(valss[i]);
-	  weed_free(valss);
-	  weed_free(valsb);
-	}
-	return retval;
-      case WEED_SEED_DOUBLE:
-	{
-	  double * valsd=weed_get_double_array(dparam,"value",&error);
-	
-	  double *maxd=weed_get_double_array(dptmpl,"max",&error);
-	  double *mind=weed_get_double_array(dptmpl,"min",&error);
-	  double vald;
-
-	  if (ndvals>ondvals) valsd=(double *)g_realloc(valsd,ndvals*sizeof(double));
-
-	  for (i=0;i<ndvals;i++) {
-	    if (autoscale) {
-	      if (valsb[i]==WEED_TRUE) vald=maxd[maxct];
-	      else vald=mind[minct];
-	    }
-	    else {
-	      vald=(double)valsb[i];
-	      if (vald>maxd[maxct]) vald=maxd[maxct];
-	      if (vald<mind[minct]) vald=mind[minct];
-	    }
-	    if (i>=ondvals||valsd[i]!=vald) {
-	      retval=TRUE;
-	      valsd[i]=vald;
-	    }
-	    if (++maxct==nmax) maxct=0;
-	    if (++minct==nmin) minct=0;
-	  }
-	  if (retval) {
-
-	    if (inst!=NULL&&mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
-	      // if we are recording, add this change to our event_list
-	      rec_param_change(inst,pnum);
-	      copyto=set_copy_to(inst,pnum,FALSE);
-	      if (copyto!=-1) rec_param_change(inst,copyto);
-	    }
-
-	    weed_set_double_array(dparam,"value",ndvals,valsd);
-	  }
-	  weed_free(maxd);
-	  weed_free(mind);
-	  weed_free(valsb);
-	  weed_free(valsd);
-	}
-	return retval;
-      case WEED_SEED_INT:
-	{
-	  int *valsi=weed_get_int_array(dparam,"value",&error);
-
-	  int *maxi=weed_get_int_array(dptmpl,"max",&error);
-	  int *mini=weed_get_int_array(dptmpl,"min",&error);
-	
-	  if (ndvals>ondvals) valsi=(int *)g_realloc(valsi,ndvals*sizeof(int));
-
-	  for (i=0;i<ndvals;i++) {
-	    if (autoscale) {
-	      if (valsb[i]==WEED_TRUE) valsb[i]=maxi[maxct];
-	      else valsb[i]=mini[minct];
-	    }
-	    else {
-	      if (valsb[i]>maxi[maxct]) valsb[i]=maxi[maxct];
-	      if (valsb[i]<mini[minct]) valsb[i]=mini[maxct];
-	    }
-	    if (i>=ondvals||valsi[i]!=valsb[i]) {
-	      retval=TRUE;
-	      valsi[i]=valsb[i];
-	    }
-	    if (++maxct==nmax) maxct=0;
-	    if (++minct==nmin) minct=0;
-	  }
-	  if (retval) {
-
-	    if (inst!=NULL&&mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
-	      // if we are recording, add this change to our event_list
-	      rec_param_change(inst,pnum);
-	      copyto=set_copy_to(inst,pnum,FALSE);
-	      if (copyto!=-1) rec_param_change(inst,copyto);
-	    }
-
-	    weed_set_int_array(dparam,"value",ndvals,valsi);
-	  }
-	  weed_free(maxi);
-	  weed_free(mini);
-	  weed_free(valsi);
-	  weed_free(valsb);
-	}
-	return retval;
-
-      case WEED_SEED_BOOLEAN:
-	{
-	  int *valsB=weed_get_boolean_array(dparam,"value",&error);
-
-	  if (ndvals>ondvals) valsB=(int *)g_realloc(valsB,ndvals*sizeof(int));
-
-	  for (i=0;i<ndvals;i++) {
-	    if (i>=ondvals||valsB[i]!=valsb[i]) {
-	      retval=TRUE;
-	      valsB[i]=valsb[i];
-	    }
-	  }
-	  if (retval) {
-
-	    if (inst!=NULL&&mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
-	      // if we are recording, add this change to our event_list
-	      rec_param_change(inst,pnum);
-	      copyto=set_copy_to(inst,pnum,FALSE);	
-	      if (copyto!=-1) rec_param_change(inst,copyto);
-	    }
-
-	    weed_set_boolean_array(dparam,"value",ndvals,valsB);
-	  }
-	  weed_free(valsb);
-	  weed_free(valsB);
-	}
-	return retval;
-      default:
-	weed_free(valsb);
-	break;
+  case WEED_SEED_BOOLEAN: {
+    int *valsb=weed_get_boolean_array(sparam,"value",&error);
+    if (dparam==active_dummy&&!autoscale) {
+      // ACTIVATE
+      int key;
+      pthread_mutex_lock(&mainw->fxd_active_mutex);
+      key=weed_get_int_value(dparam,"host_key",&error);
+      pthread_mutex_unlock(&mainw->fxd_active_mutex);
+      if ((valsb[0]==WEED_TRUE&&!(mainw->rte&(GU641<<(key))))||
+          (valsb[0]==WEED_FALSE&&(mainw->rte&(GU641<<(key))))) {
+        switch_fx_state(okey,key+1);
+      }
+      lives_free(valsb);
+      return retval;
+    }
+
+    switch (dtype) {
+    case WEED_SEED_STRING: {
+      char *opstring,*tmp,*bit;
+
+      char **valss,*vals;
+
+      if (ndvals==1) {
+        opstring=lives_strdup("");
+        vals=weed_get_string_value(dparam,"value",&error);
+        for (i=0; i<nsvals; i++) {
+          bit=lives_strdup_printf("%d",valsb[i]);
+          if (strlen(opstring)==0)
+            tmp=lives_strconcat(opstring,bit,NULL);
+          else
+            tmp=lives_strconcat(opstring," ",bit,NULL);
+          lives_free(bit);
+          lives_free(opstring);
+          opstring=tmp;
+        }
+        if (strcmp(vals,opstring)) {
+          weed_set_string_value(dparam,"value",opstring);
+          retval=TRUE;
+        }
+        lives_free(vals);
+        lives_free(valsb);
+        lives_free(opstring);
+        return retval;
+      }
+
+      valss=weed_get_string_array(dparam,"value",&error);
+      if (ndvals>ondvals) valss=(char **)lives_realloc(valss,ndvals*sizeof(char *));
+
+      for (i=0; i<ndvals; i++) {
+        bit=lives_strdup_printf("%d",valsb[i]);
+        if (i>=ondvals||strcmp(valss[i],bit)) {
+          retval=TRUE;
+          if (i<ondvals) lives_free(valss[i]);
+          valss[i]=bit;
+        } else lives_free(bit);
+      }
+      if (!retval) {
+        for (i=0; i<ndvals; i++) lives_free(valss[i]);
+        lives_free(valss);
+        lives_free(valsb);
+        return FALSE;
+      }
+
+      weed_set_string_array(dparam,"value",ndvals,valss);
+
+      for (i=0; i<ndvals; i++) lives_free(valss[i]);
+      lives_free(valss);
+      lives_free(valsb);
+    }
+    return retval;
+    case WEED_SEED_DOUBLE: {
+      double *valsd=weed_get_double_array(dparam,"value",&error);
+
+      double *maxd=weed_get_double_array(dptmpl,"max",&error);
+      double *mind=weed_get_double_array(dptmpl,"min",&error);
+      double vald;
+
+      if (ndvals>ondvals) valsd=(double *)lives_realloc(valsd,ndvals*sizeof(double));
+
+      for (i=0; i<ndvals; i++) {
+        if (autoscale) {
+          if (valsb[i]==WEED_TRUE) vald=maxd[maxct];
+          else vald=mind[minct];
+        } else {
+          vald=(double)valsb[i];
+          if (vald>maxd[maxct]) vald=maxd[maxct];
+          if (vald<mind[minct]) vald=mind[minct];
+        }
+        if (i>=ondvals||valsd[i]!=vald) {
+          retval=TRUE;
+          valsd[i]=vald;
+        }
+        if (++maxct==nmax) maxct=0;
+        if (++minct==nmin) minct=0;
+      }
+      if (retval) {
+
+        if (inst!=NULL&&mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
+          // if we are recording, add this change to our event_list
+          rec_param_change(inst,pnum);
+          copyto=set_copy_to(inst,pnum,FALSE);
+          if (copyto!=-1) rec_param_change(inst,copyto);
+        }
+
+        weed_set_double_array(dparam,"value",ndvals,valsd);
+      }
+      lives_free(maxd);
+      lives_free(mind);
+      lives_free(valsb);
+      lives_free(valsd);
+    }
+    return retval;
+    case WEED_SEED_INT: {
+      int *valsi=weed_get_int_array(dparam,"value",&error);
+
+      int *maxi=weed_get_int_array(dptmpl,"max",&error);
+      int *mini=weed_get_int_array(dptmpl,"min",&error);
+
+      if (ndvals>ondvals) valsi=(int *)lives_realloc(valsi,ndvals*sizeof(int));
+
+      for (i=0; i<ndvals; i++) {
+        if (autoscale) {
+          if (valsb[i]==WEED_TRUE) valsb[i]=maxi[maxct];
+          else valsb[i]=mini[minct];
+        } else {
+          if (valsb[i]>maxi[maxct]) valsb[i]=maxi[maxct];
+          if (valsb[i]<mini[minct]) valsb[i]=mini[maxct];
+        }
+        if (i>=ondvals||valsi[i]!=valsb[i]) {
+          retval=TRUE;
+          valsi[i]=valsb[i];
+        }
+        if (++maxct==nmax) maxct=0;
+        if (++minct==nmin) minct=0;
+      }
+      if (retval) {
+
+        if (inst!=NULL&&mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
+          // if we are recording, add this change to our event_list
+          rec_param_change(inst,pnum);
+          copyto=set_copy_to(inst,pnum,FALSE);
+          if (copyto!=-1) rec_param_change(inst,copyto);
+        }
+
+        weed_set_int_array(dparam,"value",ndvals,valsi);
+      }
+      lives_free(maxi);
+      lives_free(mini);
+      lives_free(valsi);
+      lives_free(valsb);
+    }
+    return retval;
+
+    case WEED_SEED_BOOLEAN: {
+      int *valsB=weed_get_boolean_array(dparam,"value",&error);
+
+      if (ndvals>ondvals) valsB=(int *)lives_realloc(valsB,ndvals*sizeof(int));
+
+      for (i=0; i<ndvals; i++) {
+        if (i>=ondvals||valsB[i]!=valsb[i]) {
+          retval=TRUE;
+          valsB[i]=valsb[i];
+        }
       }
+      if (retval) {
 
+        if (inst!=NULL&&mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
+          // if we are recording, add this change to our event_list
+          rec_param_change(inst,pnum);
+          copyto=set_copy_to(inst,pnum,FALSE);
+          if (copyto!=-1) rec_param_change(inst,copyto);
+        }
+
+        weed_set_boolean_array(dparam,"value",ndvals,valsB);
+      }
+      lives_free(valsb);
+      lives_free(valsB);
+    }
+    return retval;
+    default:
+      lives_free(valsb);
       break;
     }
+
+    break;
+  }
   default:
     break;
   }
@@ -1379,93 +1354,89 @@
   if (key>-1) {
     if (mainw->is_rendering) {
       if ((inst=get_new_inst_for_keymode(key,mode))==NULL) {
-	return FALSE; ///< dest effect is not found
+        return FALSE; ///< dest effect is not found
       }
-    }
-    else {
+    } else {
       inst=rte_keymode_get_instance(key+1,mode);
     }
-    
+
     if (inst!=NULL) {
       if (weed_plant_has_leaf(inst,"in_parameters")) nparams=weed_leaf_num_elements(inst,"in_parameters");
-    }
-    else if (rte_keymode_get_filter_idx(key+1,mode)==-1) return FALSE;
-  }
-  else if (key==FX_DATA_KEY_PLAYBACK_PLUGIN) {
+    } else if (rte_keymode_get_filter_idx(key+1,mode)==-1) return FALSE;
+  } else if (key==FX_DATA_KEY_PLAYBACK_PLUGIN) {
     // playback plugin
     if (mainw->vpp==NULL) return FALSE;
     nparams=mainw->vpp->num_play_params;
   }
 
 
-    if (key==FX_DATA_KEY_PLAYBACK_PLUGIN) inparams=mainw->vpp->play_params;
-    else inparams=weed_get_plantptr_array(inst,"in_parameters",&error);
+  if (key==FX_DATA_KEY_PLAYBACK_PLUGIN) inparams=mainw->vpp->play_params;
+  else inparams=weed_get_plantptr_array(inst,"in_parameters",&error);
 
-    for (i=-EXTRA_PARAMS_IN;i<nparams;i++) {
+  for (i=-EXTRA_PARAMS_IN; i<nparams; i++) {
 
-      if ((oparam=pconx_get_out_param(FALSE,key,mode,i,&okey,NULL,NULL,&autoscale))!=NULL) {
-	//#define DEBUG_PCONX
+    if ((oparam=pconx_get_out_param(FALSE,key,mode,i,&okey,NULL,NULL,&autoscale))!=NULL) {
+      //#define DEBUG_PCONX
 #ifdef DEBUG_PCONX
-	g_print("got pconx to %d %d %d\n",key,mode,i);
+      g_print("got pconx to %d %d %d\n",key,mode,i);
 #endif
-	if (i==FX_DATA_PARAM_ACTIVE) {
-	  pthread_mutex_lock(&mainw->fxd_active_mutex);
-	  if (active_dummy!=NULL&&!WEED_PLANT_IS_PARAMETER(active_dummy)) {
-	    weed_plant_free(active_dummy);
-	    active_dummy=NULL;
-	  }
-	  if (active_dummy==NULL) {
-	    active_dummy=weed_plant_new(WEED_PLANT_PARAMETER);
-	    weed_set_plantptr_value(active_dummy,"template",NULL);
-	    weed_set_boolean_value(active_dummy,"value",WEED_TRUE);
-	  }
-	  weed_set_int_value(active_dummy,"host_key",key);
-	  inparam=active_dummy;
-	  pthread_mutex_unlock(&mainw->fxd_active_mutex);
-	}
-	else inparam=inparams[i];
-
-	filter_mutex_lock(key);
-	filter_mutex_lock(okey);
-
-	changed=pconx_convert_value_data(inst,i,key==FX_DATA_KEY_PLAYBACK_PLUGIN?(weed_plant_t *)pp_get_param(mainw->vpp->play_params,i)
-					 :inparam,okey,oparam,autoscale);
-
-	filter_mutex_unlock(key);
-	filter_mutex_unlock(okey);
-
-	if (changed&&inst!=NULL&&key>-1) {
-	  // only store value if it changed; for int, double or colour, store old value too
-
-	  copyto=set_copy_to(inst,i,TRUE);
-	  if (mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
-	    // if we are recording, add this change to our event_list
-	    rec_param_change(inst,i);
-	    if (copyto!=-1) rec_param_change(inst,copyto);
-	  }
-
-	  pflags=weed_get_int_value(inparams[i],"flags",&error);
-	  if (pflags&WEED_PARAMETER_REINIT_ON_VALUE_CHANGE) reinit_inst=TRUE;
-	  if (copyto!=-1) {
-	    pflags=weed_get_int_value(inparams[copyto],"flags",&error);
-	    if (pflags&WEED_PARAMETER_REINIT_ON_VALUE_CHANGE) reinit_inst=TRUE;
-	  }
-
-	  if (fx_dialog[1]!=NULL&&!reinit_inst) {
-	    lives_rfx_t *rfx=(lives_rfx_t *)g_object_get_data(G_OBJECT(fx_dialog[1]),"rfx");
-	    if (!rfx->is_template) {
-	      int keyw=GPOINTER_TO_INT (g_object_get_data (G_OBJECT (fx_dialog[1]),"key"));
-	      int modew=GPOINTER_TO_INT (g_object_get_data (G_OBJECT (fx_dialog[1]),"mode"));
-	      if (keyw==key&&modew==mode)
-		// ask the main thread to update the param window
-		mainw->vrfx_update=rfx;
-	    }
-	  }
-	  if (mainw->ce_thumbs) ce_thumbs_register_rfx_change(key,mode);
-	}
+      if (i==FX_DATA_PARAM_ACTIVE) {
+        pthread_mutex_lock(&mainw->fxd_active_mutex);
+        if (active_dummy!=NULL&&!WEED_PLANT_IS_PARAMETER(active_dummy)) {
+          weed_plant_free(active_dummy);
+          active_dummy=NULL;
+        }
+        if (active_dummy==NULL) {
+          active_dummy=weed_plant_new(WEED_PLANT_PARAMETER);
+          weed_set_plantptr_value(active_dummy,"template",NULL);
+          weed_set_boolean_value(active_dummy,"value",WEED_TRUE);
+        }
+        weed_set_int_value(active_dummy,"host_key",key);
+        inparam=active_dummy;
+        pthread_mutex_unlock(&mainw->fxd_active_mutex);
+      } else inparam=inparams[i];
+
+      filter_mutex_lock(key);
+      filter_mutex_lock(okey);
+
+      changed=pconx_convert_value_data(inst,i,key==FX_DATA_KEY_PLAYBACK_PLUGIN?(weed_plant_t *)pp_get_param(mainw->vpp->play_params,i)
+                                       :inparam,okey,oparam,autoscale);
+
+      filter_mutex_unlock(key);
+      filter_mutex_unlock(okey);
+
+      if (changed&&inst!=NULL&&key>-1) {
+        // only store value if it changed; for int, double or colour, store old value too
+
+        copyto=set_copy_to(inst,i,TRUE);
+        if (mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
+          // if we are recording, add this change to our event_list
+          rec_param_change(inst,i);
+          if (copyto!=-1) rec_param_change(inst,copyto);
+        }
+
+        pflags=weed_get_int_value(inparams[i],"flags",&error);
+        if (pflags&WEED_PARAMETER_REINIT_ON_VALUE_CHANGE) reinit_inst=TRUE;
+        if (copyto!=-1) {
+          pflags=weed_get_int_value(inparams[copyto],"flags",&error);
+          if (pflags&WEED_PARAMETER_REINIT_ON_VALUE_CHANGE) reinit_inst=TRUE;
+        }
+
+        if (fx_dialog[1]!=NULL&&!reinit_inst) {
+          lives_rfx_t *rfx=(lives_rfx_t *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(fx_dialog[1]),"rfx");
+          if (!rfx->is_template) {
+            int keyw=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(fx_dialog[1]),"key"));
+            int modew=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(fx_dialog[1]),"mode"));
+            if (keyw==key&&modew==mode)
+              // ask the main thread to update the param window
+              mainw->vrfx_update=rfx;
+          }
+        }
+        if (mainw->ce_thumbs) ce_thumbs_register_rfx_change(key,mode);
       }
     }
-    if (key!=FX_DATA_KEY_PLAYBACK_PLUGIN&&inparams!=NULL) weed_free(inparams);
+  }
+  if (key!=FX_DATA_KEY_PLAYBACK_PLUGIN&&inparams!=NULL) lives_free(inparams);
 
   return reinit_inst;
 }
@@ -1486,27 +1457,27 @@
 
   in_params=weed_get_plantptr_array(inst,"in_parameters",&error);
 
-  for (i=0;i<nparams;i++) {
+  for (i=0; i<nparams; i++) {
     if (weed_plant_has_leaf(in_params[i],"host_internal_connection")) {
       autoscale=FALSE;
       if (weed_plant_has_leaf(in_params[i],"host_internal_connection_autoscale")&&
-	  weed_get_boolean_value(in_params[i],"host_internal_connection_autoscale",&error)==WEED_TRUE) autoscale=TRUE;
+          weed_get_boolean_value(in_params[i],"host_internal_connection_autoscale",&error)==WEED_TRUE) autoscale=TRUE;
       if (pconx_convert_value_data(inst,i,in_params[i],-1,weed_get_plantptr_value(in_params[i],"host_internal_connection",&error),autoscale)) {
 
-	copyto=set_copy_to(inst,i,TRUE);
+        copyto=set_copy_to(inst,i,TRUE);
 
-	pflags=weed_get_int_value(in_params[i],"flags",&error);
-	if (pflags&WEED_PARAMETER_REINIT_ON_VALUE_CHANGE) reinit_inst=TRUE;
-	if (copyto!=-1) {
-	  pflags=weed_get_int_value(in_params[copyto],"flags",&error);
-	  if (pflags&WEED_PARAMETER_REINIT_ON_VALUE_CHANGE) reinit_inst=TRUE;
-	}
+        pflags=weed_get_int_value(in_params[i],"flags",&error);
+        if (pflags&WEED_PARAMETER_REINIT_ON_VALUE_CHANGE) reinit_inst=TRUE;
+        if (copyto!=-1) {
+          pflags=weed_get_int_value(in_params[copyto],"flags",&error);
+          if (pflags&WEED_PARAMETER_REINIT_ON_VALUE_CHANGE) reinit_inst=TRUE;
+        }
       }
 
     }
   }
 
-  weed_free(in_params);
+  lives_free(in_params);
   return reinit_inst;
 }
 
@@ -1519,21 +1490,21 @@
   while (cconx!=NULL) {
     cconx_next=cconx->next;
     if (cconx->nchans>0) {
-      g_free(cconx->chans);
-      g_free(cconx->nconns);
-      g_free(cconx->ikey);
-      g_free(cconx->imode);
-      g_free(cconx->icnum);
+      lives_free(cconx->chans);
+      lives_free(cconx->nconns);
+      lives_free(cconx->ikey);
+      lives_free(cconx->imode);
+      lives_free(cconx->icnum);
     }
-    g_free(cconx);
+    lives_free(cconx);
     cconx=cconx_next;
   }
   mainw->cconx=NULL;
 }
 
 
-static lives_cconnect_t *cconx_new (int okey, int omode) {
-  lives_cconnect_t *cconx=(lives_cconnect_t *)g_malloc0(sizeof(struct _lives_cconnect_t));
+static lives_cconnect_t *cconx_new(int okey, int omode) {
+  lives_cconnect_t *cconx=(lives_cconnect_t *)lives_malloc0(sizeof(struct _lives_cconnect_t));
   cconx->next=NULL;
   cconx->okey=okey;
   cconx->omode=omode;
@@ -1557,28 +1528,28 @@
     else last_dcconx->next=dcconx;
 
     dcconx->nchans=scconx->nchans;
-    
-    dcconx->nconns=(int *)g_malloc(dcconx->nchans*sizint);
-    dcconx->chans=(int *)g_malloc(dcconx->nchans*sizint);
+
+    dcconx->nconns=(int *)lives_malloc(dcconx->nchans*sizint);
+    dcconx->chans=(int *)lives_malloc(dcconx->nchans*sizint);
 
     dcconx->ikey=dcconx->imode=dcconx->icnum=NULL;
 
     j=0;
 
-    for (i=0;i<dcconx->nchans;i++) {
+    for (i=0; i<dcconx->nchans; i++) {
       dcconx->chans[i]=scconx->chans[i];
       dcconx->nconns[i]=scconx->nconns[i];
       totcons+=dcconx->nconns[i];
 
-      dcconx->ikey=(int *)g_realloc(dcconx->ikey,totcons*sizint);
-      dcconx->imode=(int *)g_realloc(dcconx->imode,totcons*sizint);
-      dcconx->icnum=(int *)g_realloc(dcconx->icnum,totcons*sizint);
+      dcconx->ikey=(int *)lives_realloc(dcconx->ikey,totcons*sizint);
+      dcconx->imode=(int *)lives_realloc(dcconx->imode,totcons*sizint);
+      dcconx->icnum=(int *)lives_realloc(dcconx->icnum,totcons*sizint);
 
       while (j<totcons) {
-	dcconx->ikey[j]=scconx->ikey[j];
-	dcconx->imode[j]=scconx->imode[j];
-	dcconx->icnum[j]=scconx->icnum[j];
-	j++;
+        dcconx->ikey[j]=scconx->ikey[j];
+        dcconx->imode[j]=scconx->imode[j];
+        dcconx->icnum[j]=scconx->icnum[j];
+        j++;
       }
     }
 
@@ -1590,8 +1561,8 @@
 }
 
 
-gchar *cconx_list(int okey, int omode, int ocnum) {
-  gchar *st1=g_strdup(""),*st2;
+char *cconx_list(int okey, int omode, int ocnum) {
+  char *st1=lives_strdup(""),*st2;
   lives_cconnect_t *cconx=mainw->cconx;
 
   int totcons=0;
@@ -1600,17 +1571,17 @@
 
   while (cconx!=NULL) {
     if (cconx->okey==okey&&cconx->omode==omode) {
-      for (i=0;i<cconx->nchans;i++) {
-	if (cconx->chans[i]==ocnum) {
-	  for (j=totcons;j<totcons+cconx->nconns[i];j++) {
-	    if (strlen(st1)==0) st2=g_strdup_printf("%d %d %d",cconx->ikey[j]+1,cconx->imode[j]+1,cconx->icnum[j]);
-	    st2=g_strdup_printf("%s %d %d %d",st1,cconx->ikey[j]+1,cconx->imode[j]+1,cconx->icnum[j]);
-	    g_free(st1);
-	    st1=st2;
-	  }
-	  return st1;
-	}
-	totcons+=cconx->nconns[i];
+      for (i=0; i<cconx->nchans; i++) {
+        if (cconx->chans[i]==ocnum) {
+          for (j=totcons; j<totcons+cconx->nconns[i]; j++) {
+            if (strlen(st1)==0) st2=lives_strdup_printf("%d %d %d",cconx->ikey[j]+1,cconx->imode[j]+1,cconx->icnum[j]);
+            st2=lives_strdup_printf("%s %d %d %d",st1,cconx->ikey[j]+1,cconx->imode[j]+1,cconx->icnum[j]);
+            lives_free(st1);
+            st1=st2;
+          }
+          return st1;
+        }
+        totcons+=cconx->nconns[i];
       }
       return st1;
     }
@@ -1631,79 +1602,77 @@
     cconx_next=cconx->next;
     if (okey==FX_DATA_WILDCARD||(cconx->okey==okey&&cconx->omode==omode)) {
       if (ikey==FX_DATA_WILDCARD) {
-	// delete entire node
-	g_free(cconx->chans);
-	g_free(cconx->nconns);
-	g_free(cconx->ikey);
-	g_free(cconx->imode);
-	g_free(cconx->icnum);
-	g_free(cconx);
-	if (mainw->cconx==cconx) mainw->cconx=cconx_next;
-	else cconx_prev->next=cconx_next;
-	return;
+        // delete entire node
+        lives_free(cconx->chans);
+        lives_free(cconx->nconns);
+        lives_free(cconx->ikey);
+        lives_free(cconx->imode);
+        lives_free(cconx->icnum);
+        lives_free(cconx);
+        if (mainw->cconx==cconx) mainw->cconx=cconx_next;
+        else cconx_prev->next=cconx_next;
+        return;
       }
 
       maxcons=0;
       totcons=0;
       j=0;
 
-      for (i=0;i<cconx->nchans;i++) {
-	maxcons+=cconx->nconns[i];
+      for (i=0; i<cconx->nchans; i++) {
+        maxcons+=cconx->nconns[i];
       }
 
-      for (i=0;cconx!=NULL&&i<cconx->nchans;i++) {
-	totcons+=cconx->nconns[i];
+      for (i=0; cconx!=NULL&&i<cconx->nchans; i++) {
+        totcons+=cconx->nconns[i];
+
+        if (okey!=FX_DATA_WILDCARD&&cconx->chans[i]!=ocnum) {
+          j=totcons;
+          continue;
+        }
 
-	if (okey!=FX_DATA_WILDCARD&&cconx->chans[i]!=ocnum) {
-	  j=totcons;
-	  continue;
-	}
-
-	for (;j<totcons;j++) {
-	  if (cconx->ikey[j]==ikey && cconx->imode[j]==imode && (icnum==FX_DATA_WILDCARD||cconx->icnum[j]==icnum)) {
-	    maxcons--;
-	    for (k=j;k<maxcons;k++) {
-	      cconx->ikey[k]=cconx->ikey[k+1];
-	      cconx->imode[k]=cconx->imode[k+1];
-	      cconx->icnum[k]=cconx->icnum[k+1];
-	    }
-
-	    cconx->ikey=(int *)g_realloc(cconx->ikey,maxcons*sizint);
-	    cconx->imode=(int *)g_realloc(cconx->imode,maxcons*sizint);
-	    cconx->icnum=(int *)g_realloc(cconx->icnum,maxcons*sizint);
-
-	    cconx->nconns[i]--;
-
-	    if (cconx->nconns[i]==0) {
-	      cconx->nchans--;
-	      for (k=i;k<cconx->nchans;k++) {
-		cconx->chans[k]=cconx->chans[k+1];
-		cconx->nconns[k]=cconx->nconns[k+1];
-	      }
-
-	      if (cconx->nchans==0) {
-		// delete entire node
-		g_free(cconx->chans);
-		g_free(cconx->nconns);
-		g_free(cconx->ikey);
-		g_free(cconx->imode);
-		g_free(cconx->icnum);
-		g_free(cconx);
-		if (mainw->cconx==cconx) {
-		  mainw->cconx=cconx_next;
-		  cconx=NULL;
-		}
-		else {
-		  cconx=cconx_prev;
-		  cconx->next=cconx_next;
-		}
-	      }
-	      else {
-		cconx->nconns=(int *)g_realloc(cconx->nconns,cconx->nchans*sizint);
-	      }
-	    }
-	  }
-	}
+        for (; j<totcons; j++) {
+          if (cconx->ikey[j]==ikey && cconx->imode[j]==imode && (icnum==FX_DATA_WILDCARD||cconx->icnum[j]==icnum)) {
+            maxcons--;
+            for (k=j; k<maxcons; k++) {
+              cconx->ikey[k]=cconx->ikey[k+1];
+              cconx->imode[k]=cconx->imode[k+1];
+              cconx->icnum[k]=cconx->icnum[k+1];
+            }
+
+            cconx->ikey=(int *)lives_realloc(cconx->ikey,maxcons*sizint);
+            cconx->imode=(int *)lives_realloc(cconx->imode,maxcons*sizint);
+            cconx->icnum=(int *)lives_realloc(cconx->icnum,maxcons*sizint);
+
+            cconx->nconns[i]--;
+
+            if (cconx->nconns[i]==0) {
+              cconx->nchans--;
+              for (k=i; k<cconx->nchans; k++) {
+                cconx->chans[k]=cconx->chans[k+1];
+                cconx->nconns[k]=cconx->nconns[k+1];
+              }
+
+              if (cconx->nchans==0) {
+                // delete entire node
+                lives_free(cconx->chans);
+                lives_free(cconx->nconns);
+                lives_free(cconx->ikey);
+                lives_free(cconx->imode);
+                lives_free(cconx->icnum);
+                lives_free(cconx);
+                if (mainw->cconx==cconx) {
+                  mainw->cconx=cconx_next;
+                  cconx=NULL;
+                } else {
+                  cconx=cconx_prev;
+                  cconx->next=cconx_next;
+                }
+              } else {
+                cconx->nconns=(int *)lives_realloc(cconx->nconns,cconx->nchans*sizint);
+              }
+            }
+          }
+        }
       }
     }
     cconx_prev=cconx;
@@ -1723,12 +1692,12 @@
     }
     j=0;
     totcons=0;
-    for (i=0;i<cconx->nchans;i++) {
+    for (i=0; i<cconx->nchans; i++) {
       totcons+=cconx->nconns[i];
-      for (;j<totcons;j++) {
-	if (cconx->ikey[j]==key && cconx->imode[j]==omode) {
-	  cconx->imode[j]=nmode;
-	}
+      for (; j<totcons; j++) {
+        if (cconx->ikey[j]==key && cconx->imode[j]==omode) {
+          cconx->imode[j]=nmode;
+        }
       }
     }
     cconx=cconx->next;
@@ -1751,7 +1720,7 @@
 }
 
 
-static lives_cconnect_t *cconx_find (int okey, int omode) {
+static lives_cconnect_t *cconx_find(int okey, int omode) {
   lives_cconnect_t *cconx=mainw->cconx;
   while (cconx!=NULL) {
     if (cconx->okey==okey&&cconx->omode==omode) {
@@ -1772,7 +1741,7 @@
 
   if (cnum!=FX_DATA_WILDCARD) return conxwp->dispc[cnum];
 
-  for (j=0;j<conxwp->num_alpha;j++) {
+  for (j=0; j<conxwp->num_alpha; j++) {
     totcons+=conxwp->dispc[j];
   }
 
@@ -1789,11 +1758,10 @@
 
   if (cconx==NULL) return 0;
 
-  for (j=0;j<cconx->nchans;j++) {
+  for (j=0; j<cconx->nchans; j++) {
     if (cnum!=FX_DATA_WILDCARD) {
       if (cconx->chans[j]==cnum) return cconx->nconns[j];
-    }
-    else totcons+=cconx->nconns[j];
+    } else totcons+=cconx->nconns[j];
   }
   return totcons;
 }
@@ -1811,86 +1779,85 @@
     // add whole new node
     cconx=cconx_new(okey,omode);
     cconx_append(cconx);
-  }
-  else {
+  } else {
     // see if already in chans
-    
-    for (i=0;i<cconx->nchans;i++) {
- 
+
+    for (i=0; i<cconx->nchans; i++) {
+
       if (cconx->chans[i]==ocnum) {
-	// add connection to existing
+        // add connection to existing
+
+        for (j=0; j<cconx->nchans; j++) {
+          if (j<i) {
+            // calc posn
+            posn+=cconx->nconns[j];
+          }
+          totcons+=cconx->nconns[j];
+        }
 
-	for (j=0;j<cconx->nchans;j++) {
-	  if (j<i) {
-	    // calc posn
-	    posn+=cconx->nconns[j];
-	  }
-	  totcons+=cconx->nconns[j];
-	}
-
-	// if already there, do not add again
-	for (j=posn;j<posn+cconx->nconns[i];j++) {
-	  if (cconx->ikey[j]==ikey&&cconx->imode[j]==imode&&cconx->icnum[j]==icnum) {
-	    return;
-	  }
-
-	  // add in order key/mode/chan
-	  if (cconx->ikey[j]>ikey||(cconx->ikey[j]==ikey&&cconx->imode[j]>imode)||
-	      (cconx->ikey[j]==ikey&&cconx->imode[j]==imode&&cconx->icnum[j]>icnum)) break;
-	      
-	}
-
-	posn=j; // we will insert here
-	cconx->nconns[i]++;
-	totcons++;
-
-	// make space for new
-	cconx->ikey=(int *)g_realloc(cconx->ikey,totcons*sizint);
-	cconx->imode=(int *)g_realloc(cconx->imode,totcons*sizint);
-	cconx->icnum=(int *)g_realloc(cconx->icnum,totcons*sizint);
-
-	// move up 1
-	for (j=totcons-1;j>posn;j--) {
-	  cconx->ikey[j]=cconx->ikey[j-1];
-	  cconx->imode[j]=cconx->imode[j-1];
-	  cconx->icnum[j]=cconx->icnum[j-1];
-	}
-
-	// insert at posn
-	cconx->ikey[posn]=ikey;
-	cconx->imode[posn]=imode;
-	cconx->icnum[posn]=icnum;
+        // if already there, do not add again
+        for (j=posn; j<posn+cconx->nconns[i]; j++) {
+          if (cconx->ikey[j]==ikey&&cconx->imode[j]==imode&&cconx->icnum[j]==icnum) {
+            return;
+          }
+
+          // add in order key/mode/chan
+          if (cconx->ikey[j]>ikey||(cconx->ikey[j]==ikey&&cconx->imode[j]>imode)||
+              (cconx->ikey[j]==ikey&&cconx->imode[j]==imode&&cconx->icnum[j]>icnum)) break;
+
+        }
+
+        posn=j; // we will insert here
+        cconx->nconns[i]++;
+        totcons++;
+
+        // make space for new
+        cconx->ikey=(int *)lives_realloc(cconx->ikey,totcons*sizint);
+        cconx->imode=(int *)lives_realloc(cconx->imode,totcons*sizint);
+        cconx->icnum=(int *)lives_realloc(cconx->icnum,totcons*sizint);
+
+        // move up 1
+        for (j=totcons-1; j>posn; j--) {
+          cconx->ikey[j]=cconx->ikey[j-1];
+          cconx->imode[j]=cconx->imode[j-1];
+          cconx->icnum[j]=cconx->icnum[j-1];
+        }
 
-	return;
+        // insert at posn
+        cconx->ikey[posn]=ikey;
+        cconx->imode[posn]=imode;
+        cconx->icnum[posn]=icnum;
+
+        return;
       }
-      
+
     }
 
     // so, we have data for key/mode but this is a new channel to be mapped
 
-    for (i=0;i<cconx->nchans;i++) {
+    for (i=0; i<cconx->nchans; i++) {
       totcons+=cconx->nconns[i];
     }
-    
+
     totcons++;
-    
+
     cconx->nchans++;
     posn=cconx->nchans;
-    
+
     // make space for new
-    cconx->nconns=(int *)g_realloc(cconx->nconns,posn*sizint);
-    cconx->chans=(int *)g_realloc(cconx->chans,posn*sizint);
+    cconx->nconns=(int *)lives_realloc(cconx->nconns,posn*sizint);
+    cconx->chans=(int *)lives_realloc(cconx->chans,posn*sizint);
+
+    cconx->ikey=(int *)lives_realloc(cconx->ikey,totcons*sizint);
+    cconx->imode=(int *)lives_realloc(cconx->imode,totcons*sizint);
+    cconx->icnum=(int *)lives_realloc(cconx->icnum,totcons*sizint);
 
-    cconx->ikey=(int *)g_realloc(cconx->ikey,totcons*sizint);
-    cconx->imode=(int *)g_realloc(cconx->imode,totcons*sizint);
-    cconx->icnum=(int *)g_realloc(cconx->icnum,totcons*sizint);
-    
     cconx->chans[posn-1]=ocnum;
 
     cconx->nconns[posn-1]=1;
-    
+
     posn=totcons-1;
-    
+
     // insert at posn
     cconx->ikey[posn]=ikey;
     cconx->imode[posn]=imode;
@@ -1908,19 +1875,19 @@
   totcons=cconx_get_nconns(cconx,FX_DATA_WILDCARD)+1;
   cconx->nchans++;
 
-  cconx->nconns=(int *)g_realloc(cconx->chans,cconx->nchans*sizint);
+  cconx->nconns=(int *)lives_realloc(cconx->chans,cconx->nchans*sizint);
   cconx->nconns[cconx->nchans-1]=1;
 
-  cconx->chans=(int *)g_realloc(cconx->chans,cconx->nchans*sizint);
+  cconx->chans=(int *)lives_realloc(cconx->chans,cconx->nchans*sizint);
   cconx->chans[cconx->nchans-1]=ocnum;
 
-  cconx->ikey=(int *)g_realloc(cconx->ikey,totcons*sizint);
+  cconx->ikey=(int *)lives_realloc(cconx->ikey,totcons*sizint);
   cconx->ikey[totcons-1]=ikey;
 
-  cconx->imode=(int *)g_realloc(cconx->imode,totcons*sizint);
+  cconx->imode=(int *)lives_realloc(cconx->imode,totcons*sizint);
   cconx->imode[totcons-1]=imode;
 
-  cconx->icnum=(int *)g_realloc(cconx->icnum,totcons*sizint);
+  cconx->icnum=(int *)lives_realloc(cconx->icnum,totcons*sizint);
   cconx->icnum[totcons-1]=icnum;
 
 #ifdef DEBUG_PCONX
@@ -1950,23 +1917,21 @@
   while (cconx!=NULL) {
     if (!use_filt) {
       if (mainw->is_rendering) {
-	inst=get_new_inst_for_keymode(cconx->okey,cconx->omode);
-      }
-      else {
-	inst=rte_keymode_get_instance(cconx->okey+1,cconx->omode);
+        inst=get_new_inst_for_keymode(cconx->okey,cconx->omode);
+      } else {
+        inst=rte_keymode_get_instance(cconx->okey+1,cconx->omode);
       }
       if (inst==NULL) {
-	cconx=cconx->next;
-	continue;
+        cconx=cconx->next;
+        continue;
       }
 
       filter=weed_instance_get_filter(inst,TRUE);
-    }
-    else {
+    } else {
       filter=rte_keymode_get_filter(cconx->okey+1,cconx->omode);
       if (filter==NULL) {
-	cconx=cconx->next;
-	continue;
+        cconx=cconx->next;
+        continue;
       }
     }
     if (!weed_plant_has_leaf(filter,"out_channel_templates")) {
@@ -1975,31 +1940,30 @@
     }
     totcons=0;
     j=0;
-    for (i=0;i<cconx->nchans;i++) {
+    for (i=0; i<cconx->nchans; i++) {
       totcons+=cconx->nconns[i];
-      for (;j<totcons;j++) {
-	if (cconx->ikey[j]==ikey && cconx->imode[j]==imode && cconx->icnum[j]==icnum) {
-	  weed_plant_t **outchans;
-	  weed_plant_t *channel=NULL;
-	  if (use_filt) {
-	    outchans=weed_get_plantptr_array(filter,"out_channel_templates",&error);
-	    if (cconx->chans[i]<weed_leaf_num_elements(filter,"out_channel_templates")) {
-	      channel=outchans[cconx->chans[i]];
-	    }
-	  }
-	  else {
-	    while (weed_plant_has_leaf(inst,"host_next_instance")) inst=weed_get_plantptr_value(inst,"host_next_instance",&error);
-	    outchans=weed_get_plantptr_array(inst,"out_channels",&error);
-	    if (cconx->chans[i]<weed_leaf_num_elements(inst,"out_channels")) {
-	      channel=outchans[cconx->chans[i]];
-	    }
-	  }
-	  weed_free(outchans);
-	  if (okey!=NULL) *okey=cconx->okey;
-	  if (omode!=NULL) *omode=cconx->omode;
-	  if (ocnum!=NULL) *ocnum=cconx->chans[i];
-	  return channel;
-	}
+      for (; j<totcons; j++) {
+        if (cconx->ikey[j]==ikey && cconx->imode[j]==imode && cconx->icnum[j]==icnum) {
+          weed_plant_t **outchans;
+          weed_plant_t *channel=NULL;
+          if (use_filt) {
+            outchans=weed_get_plantptr_array(filter,"out_channel_templates",&error);
+            if (cconx->chans[i]<weed_leaf_num_elements(filter,"out_channel_templates")) {
+              channel=outchans[cconx->chans[i]];
+            }
+          } else {
+            while (weed_plant_has_leaf(inst,"host_next_instance")) inst=weed_get_plantptr_value(inst,"host_next_instance",&error);
+            outchans=weed_get_plantptr_array(inst,"out_channels",&error);
+            if (cconx->chans[i]<weed_leaf_num_elements(inst,"out_channels")) {
+              channel=outchans[cconx->chans[i]];
+            }
+          }
+          lives_free(outchans);
+          if (okey!=NULL) *okey=cconx->okey;
+          if (omode!=NULL) *omode=cconx->omode;
+          if (ocnum!=NULL) *ocnum=cconx->chans[i];
+          return channel;
+        }
       }
     }
     cconx=cconx->next;
@@ -2049,7 +2013,7 @@
     return FALSE;
   }
 
-  /// check first if we can set the in-channel palette to match 
+  /// check first if we can set the in-channel palette to match
   if (ipal==opal) pal_ok=TRUE;
   else {
     /// see if dest chan supports the source chan palette
@@ -2059,13 +2023,13 @@
     else pal_ok=FALSE; ///<no
     oflags=weed_get_int_value(dtmpl,"flags",&error);
     if (ipal!=opal&&(oflags&WEED_CHANNEL_REINIT_ON_PALETTE_CHANGE)) needs_reinit=TRUE;
-    weed_free(palettes);
+    lives_free(palettes);
   }
 
   dpdata=(uint8_t *)weed_get_voidptr_value(dchan,"pixel_data",&error);
 
   if (dpdata!=NULL) {
-    g_free(dpdata);
+    lives_free(dpdata);
     dpdata=NULL;
   }
 
@@ -2076,22 +2040,21 @@
   if (pal_ok) {
     weed_set_voidptr_value(dchan,"pixel_data",(void *)spdata);
     weed_set_int_value(dchan,"rowstrides",irow);
-    
+
     /// caller - do not free in dchan
     weed_set_boolean_value(dchan,"host_orig_pdata",WEED_TRUE);
     return FALSE;
   }
   create_empty_pixel_data(dchan,FALSE,TRUE);
   dpdata=(uint8_t *)weed_get_voidptr_value(dchan,"pixel_data",&error);
-  
+
   orow=weed_get_int_value(dchan,"rowstrides",&error);
 
   if (irow==orow) {
     memcpy((void *)dpdata,(void *)spdata,irow*iheight);
-  }
-  else {
+  } else {
     int ipwidth = iwidth * weed_palette_get_bits_per_macropixel(ipal) / 8;
-    for (i=0;i<iheight;i++) {
+    for (i=0; i<iheight; i++) {
       memcpy((void *)dpdata,(void *)spdata,ipwidth);
       spdata+=irow;
       dpdata+=orow;
@@ -2121,27 +2084,26 @@
   if (key>-1) {
     if (mainw->is_rendering) {
       if ((inst=get_new_inst_for_keymode(key,mode))==NULL) {
-	return FALSE; ///< dest effect is not found
+        return FALSE; ///< dest effect is not found
       }
-    }
-    else {
+    } else {
       if ((inst=rte_keymode_get_instance(key+1,mode))==NULL) {
-	return FALSE; ///< dest effect is not enabled
+        return FALSE; ///< dest effect is not enabled
       }
     }
-  }
-  else if (key==FX_DATA_KEY_PLAYBACK_PLUGIN) {
+  } else if (key==FX_DATA_KEY_PLAYBACK_PLUGIN) {
     if (mainw->vpp==NULL||mainw->vpp->num_alpha_chans==0) return FALSE;
   }
 
-  while ((ichan=(key==FX_DATA_KEY_PLAYBACK_PLUGIN?(weed_plant_t *)pp_get_chan(mainw->vpp->play_params,i):get_enabled_channel(inst,i,TRUE)))!=NULL) {
+  while ((ichan=(key==FX_DATA_KEY_PLAYBACK_PLUGIN?(weed_plant_t *)pp_get_chan(mainw->vpp->play_params,i):get_enabled_channel(inst,i,
+                 TRUE)))!=NULL) {
     if ((ochan=cconx_get_out_alpha(FALSE,key,mode,i++,NULL,NULL,NULL))!=NULL) {
       if (cconx_convert_pixel_data(ichan,ochan)) needs_reinit=TRUE;
     }
   }
   return needs_reinit;
 }
- 
+
 
 
 
@@ -2161,8 +2123,8 @@
 
 boolean feeds_to_video_filters(int okey, int omode) {
   weed_plant_t *filter;
-  gchar **array;
-  gchar *chlist;
+  char **array;
+  char *chlist;
   int nparams,niparams;
   int ikey,imode;
 
@@ -2172,39 +2134,39 @@
 
   nparams=num_out_params(filter);
 
-  for (i=0;i<nparams;i++) {
+  for (i=0; i<nparams; i++) {
     chlist=pconx_list(okey,omode,i);
     niparams=get_token_count(chlist,' ')/4;
-    array=g_strsplit(chlist," ",-1);
-    for (j=0;j<niparams;j+=4) {
+    array=lives_strsplit(chlist," ",-1);
+    for (j=0; j<niparams; j+=4) {
       ikey=atoi(array[j]);
       imode=atoi(array[j+1]);
       if (imode!=rte_key_getmode(ikey+1)) continue;
       filter=rte_keymode_get_filter(ikey+1,imode);
       if (has_video_chans_in(filter,TRUE)||has_video_chans_out(filter,TRUE)) {
-	g_strfreev(array);
-	g_free(chlist);
-	return TRUE;
+        lives_strfreev(array);
+        lives_free(chlist);
+        return TRUE;
       }
     }
-    g_strfreev(array);
-    g_free(chlist);
+    lives_strfreev(array);
+    lives_free(chlist);
   }
 
-  for (i=0;i<nparams;i++) {
+  for (i=0; i<nparams; i++) {
     chlist=cconx_list(okey,omode,i);
     niparams=get_token_count(chlist,' ')/3;
-    array=g_strsplit(chlist," ",-1);
-    for (j=0;j<niparams;j+=3) {
+    array=lives_strsplit(chlist," ",-1);
+    for (j=0; j<niparams; j+=3) {
       ikey=atoi(array[j]);
       imode=atoi(array[j+1]);
       if (imode!=rte_key_getmode(ikey+1)) continue;
-      g_strfreev(array);
-      g_free(chlist);
+      lives_strfreev(array);
+      lives_free(chlist);
       return TRUE;
     }
-    g_strfreev(array);
-    g_free(chlist);
+    lives_strfreev(array);
+    lives_free(chlist);
   }
 
   return FALSE;
@@ -2214,8 +2176,8 @@
 
 boolean feeds_to_audio_filters(int okey, int omode) {
   weed_plant_t *filter;
-  gchar **array;
-  gchar *chlist;
+  char **array;
+  char *chlist;
   int nparams,niparams;
   int ikey,imode;
 
@@ -2225,42 +2187,42 @@
 
   nparams=num_out_params(filter);
 
-  for (i=0;i<nparams;i++) {
+  for (i=0; i<nparams; i++) {
     chlist=pconx_list(okey,omode,i);
     niparams=get_token_count(chlist,' ')/4;
-    array=g_strsplit(chlist," ",-1);
-    for (j=0;j<niparams;j+=4) {
+    array=lives_strsplit(chlist," ",-1);
+    for (j=0; j<niparams; j+=4) {
       ikey=atoi(array[j]);
       imode=atoi(array[j+1]);
       if (imode!=rte_key_getmode(ikey+1)) continue;
       filter=rte_keymode_get_filter(ikey+1,imode);
       if (has_audio_chans_in(filter,TRUE)||has_audio_chans_out(filter,TRUE)) {
-	g_strfreev(array);
-	g_free(chlist);
-	return TRUE;
+        lives_strfreev(array);
+        lives_free(chlist);
+        return TRUE;
       }
     }
-    g_strfreev(array);
-    g_free(chlist);
+    lives_strfreev(array);
+    lives_free(chlist);
   }
 
-  for (i=0;i<nparams;i++) {
+  for (i=0; i<nparams; i++) {
     chlist=cconx_list(okey,omode,i);
     niparams=get_token_count(chlist,' ')/3;
-    array=g_strsplit(chlist," ",-1);
-    for (j=0;j<niparams;j+=3) {
+    array=lives_strsplit(chlist," ",-1);
+    for (j=0; j<niparams; j+=3) {
       ikey=atoi(array[j]);
       imode=atoi(array[j+1]);
       if (imode!=rte_key_getmode(ikey+1)) continue;
       filter=rte_keymode_get_filter(ikey+1,imode);
       if (has_audio_chans_in(filter,TRUE)||has_audio_chans_out(filter,TRUE)) {
-	g_strfreev(array);
-	g_free(chlist);
-	return TRUE;
+        lives_strfreev(array);
+        lives_free(chlist);
+        return TRUE;
       }
     }
-    g_strfreev(array);
-    g_free(chlist);
+    lives_strfreev(array);
+    lives_free(chlist);
   }
 
   return FALSE;
@@ -2285,7 +2247,7 @@
 
 
 
-static void disconbutton_clicked(LiVESButton *button, gpointer user_data) {
+static void disconbutton_clicked(LiVESButton *button, livespointer user_data) {
   // disconnect all channels/params
   lives_conx_w *conxwp=(lives_conx_w *)user_data;
 
@@ -2297,24 +2259,24 @@
   totparams=pconx_get_numcons(conxwp,FX_DATA_WILDCARD);
   totchans=cconx_get_numcons(conxwp,FX_DATA_WILDCARD);
 
-  for (i=0;i<totchans;i++) {
-    lives_combo_set_active_index (LIVES_COMBO(conxwp->cfxcombo[i]),0);
+  for (i=0; i<totchans; i++) {
+    lives_combo_set_active_index(LIVES_COMBO(conxwp->cfxcombo[i]),0);
 
     if (i==0) lives_widget_set_sensitive(conxwp->del_button[i],FALSE);
     else {
-      cidx=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(conxwp->ccombo[i]),"cidx"));
-      cidx_last=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(conxwp->ccombo[i-1]),"cidx"));
+      cidx=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(conxwp->ccombo[i]),"cidx"));
+      cidx_last=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(conxwp->ccombo[i-1]),"cidx"));
       lives_widget_set_sensitive(conxwp->del_button[i],cidx==cidx_last);
     }
   }
 
-  for (i=0;i<totparams;i++) {
-    lives_combo_set_active_index (LIVES_COMBO(conxwp->pfxcombo[i]),0);
+  for (i=0; i<totparams; i++) {
+    lives_combo_set_active_index(LIVES_COMBO(conxwp->pfxcombo[i]),0);
 
     if (i==0) lives_widget_set_sensitive(conxwp->del_button[i+totchans],FALSE);
     else {
-      pidx=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(conxwp->pcombo[i]),"pidx"));
-      pidx_last=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(conxwp->pcombo[i-1]),"pidx"));
+      pidx=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(conxwp->pcombo[i]),"pidx"));
+      pidx_last=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(conxwp->pcombo[i-1]),"pidx"));
       lives_widget_set_sensitive(conxwp->del_button[i+totchans],pidx==pidx_last);
     }
   }
@@ -2322,7 +2284,7 @@
 }
 
 
-static void apbutton_clicked(LiVESButton *button, gpointer user_data) {
+static void apbutton_clicked(LiVESButton *button, livespointer user_data) {
   // autoconnect each param with a compatible one in the target
   lives_conx_w *conxwp=(lives_conx_w *)user_data;
 
@@ -2375,11 +2337,10 @@
     // first out not connected, we will add this back in
     ours-=pconx_get_numcons(conxwp,0);
     k=0;
-  }
-  else stparam++;
+  } else stparam++;
 
   // set all pcombo with params
-  for (i=stparam;i<niparams;i++) {
+  for (i=stparam; i<niparams; i++) {
 
     param=iparams[i];
 
@@ -2390,7 +2351,7 @@
     oparam=oparams[k];
 
     if (!params_compatible(oparam,param)) continue;
-    
+
     addn=pconx_get_numcons(conxwp,k);
 
     ours+=addn;
@@ -2399,7 +2360,7 @@
 
     if (conxwp->ikeys[ours+totchans]!=0) {
       // add another if needed
-      padd_clicked(conxwp->add_button[ours+totchans],(gpointer)conxwp);
+      padd_clicked(conxwp->add_button[ours+totchans],(livespointer)conxwp);
       ours++;
     }
 
@@ -2416,13 +2377,13 @@
 
   lives_tree_path_free(tpath);
 
-  weed_free(iparams);
-  weed_free(oparams);
+  lives_free(iparams);
+  lives_free(oparams);
 
 }
 
 
-static void acbutton_clicked(LiVESButton *button, gpointer user_data) {
+static void acbutton_clicked(LiVESButton *button, livespointer user_data) {
   // autoconnect each channel with a compatible one in the target
   lives_conx_w *conxwp=(lives_conx_w *)user_data;
 
@@ -2474,11 +2435,10 @@
     // first out not connected, we will add this back in
     ours-=cconx_get_numcons(conxwp,0);
     k=0;
-  }
-  else {
+  } else {
     stchan++;
 
-    for (i=0;i<nichans;i++) {
+    for (i=0; i<nichans; i++) {
       j++;
       chan=ichans[i];
       if (!has_alpha_palette(chan)) continue;
@@ -2488,7 +2448,7 @@
   }
 
   // set all ccombo with chans
-  for (i=stchan;i<nichans;i++) {
+  for (i=stchan; i<nichans; i++) {
 
     chan=ichans[i];
 
@@ -2511,7 +2471,7 @@
 
     if (conxwp->ikeys[ours]!=0) {
       // add another if needed
-      cadd_clicked(conxwp->add_button[ours],(gpointer)conxwp);
+      cadd_clicked(conxwp->add_button[ours],(livespointer)conxwp);
       ours++;
     }
 
@@ -2528,12 +2488,12 @@
 
   lives_tree_path_free(tpath);
 
-  weed_free(ichans);
-  weed_free(ochans);
+  lives_free(ichans);
+  lives_free(ochans);
 }
 
 
-static void padd_clicked(LiVESWidget *button, gpointer user_data) {
+static void padd_clicked(LiVESWidget *button, livespointer user_data) {
   // add another param row below the add button
   lives_conx_w *conxwp=(lives_conx_w *)user_data;
 
@@ -2547,39 +2507,39 @@
 #endif
 
   register int i;
-  
+
 
   totparams=pconx_get_numcons(conxwp,FX_DATA_WILDCARD);
   totchans=cconx_get_numcons(conxwp,FX_DATA_WILDCARD);
 
-  for (i=0;i<totparams;i++) {
+  for (i=0; i<totparams; i++) {
     if (conxwp->add_button[i+totchans]==button) {
       ours=i;
       break;
     }
   }
 
-  pidx=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(conxwp->pcombo[ours]),"pidx"));
+  pidx=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(conxwp->pcombo[ours]),"pidx"));
 
   totparams++;
 
-  conxwp->pclabel=(LiVESWidget **)g_realloc(conxwp->pclabel,(totchans+totparams)*sizeof(LiVESWidget *));
+  conxwp->pclabel=(LiVESWidget **)lives_realloc(conxwp->pclabel,(totchans+totparams)*sizeof(LiVESWidget *));
 
-  conxwp->add_button=(LiVESWidget **)g_realloc(conxwp->add_button,(totchans+totparams)*sizeof(LiVESWidget *));
-  conxwp->del_button=(LiVESWidget **)g_realloc(conxwp->del_button,(totchans+totparams)*sizeof(LiVESWidget *));
-  conxwp->clabel=(LiVESWidget **)g_realloc(conxwp->clabel,(totchans+totparams)*sizeof(LiVESWidget *));
+  conxwp->add_button=(LiVESWidget **)lives_realloc(conxwp->add_button,(totchans+totparams)*sizeof(LiVESWidget *));
+  conxwp->del_button=(LiVESWidget **)lives_realloc(conxwp->del_button,(totchans+totparams)*sizeof(LiVESWidget *));
+  conxwp->clabel=(LiVESWidget **)lives_realloc(conxwp->clabel,(totchans+totparams)*sizeof(LiVESWidget *));
 
-  conxwp->ikeys=(int *)g_realloc(conxwp->ikeys,(totchans+totparams)*sizint);
-  conxwp->imodes=(int *)g_realloc(conxwp->imodes,(totchans+totparams)*sizint);
-  conxwp->idx=(int *)g_realloc(conxwp->idx,(totchans+totparams)*sizint);
+  conxwp->ikeys=(int *)lives_realloc(conxwp->ikeys,(totchans+totparams)*sizint);
+  conxwp->imodes=(int *)lives_realloc(conxwp->imodes,(totchans+totparams)*sizint);
+  conxwp->idx=(int *)lives_realloc(conxwp->idx,(totchans+totparams)*sizint);
 
-  conxwp->pfxcombo=(LiVESWidget **)g_realloc(conxwp->pfxcombo,totparams*sizeof(LiVESWidget *));
-  conxwp->pcombo=(LiVESWidget **)g_realloc(conxwp->pcombo,totparams*sizeof(LiVESWidget *));
+  conxwp->pfxcombo=(LiVESWidget **)lives_realloc(conxwp->pfxcombo,totparams*sizeof(LiVESWidget *));
+  conxwp->pcombo=(LiVESWidget **)lives_realloc(conxwp->pcombo,totparams*sizeof(LiVESWidget *));
 
-  conxwp->dpp_func=(gulong *)g_realloc(conxwp->dpp_func,totparams*sizeof(gulong));
-  conxwp->acheck_func=(gulong *)g_realloc(conxwp->acheck_func,totparams*sizeof(gulong));
+  conxwp->dpp_func=(ulong *)lives_realloc(conxwp->dpp_func,totparams*sizeof(ulong));
+  conxwp->acheck_func=(ulong *)lives_realloc(conxwp->acheck_func,totparams*sizeof(ulong));
 
-  conxwp->acheck=(LiVESWidget **)g_realloc(conxwp->acheck,totparams*sizeof(LiVESWidget *));
+  conxwp->acheck=(LiVESWidget **)lives_realloc(conxwp->acheck,totparams*sizeof(LiVESWidget *));
 
   conxwp->trowsp++;
 
@@ -2589,12 +2549,12 @@
 
   // add parent widgets to new row
 
-  for (i=0;i<5;i++) {
-    hbox[i]=lives_hbox_new (FALSE, 0);
+  for (i=0; i<5; i++) {
+    hbox[i]=lives_hbox_new(FALSE, 0);
 
-    lives_table_attach (LIVES_TABLE (conxwp->tablep), hbox[i], i, i+1, conxwp->trowsp-1, conxwp->trowsp,
-			(LiVESAttachOptions) (LIVES_FILL|LIVES_EXPAND),
-			(LiVESAttachOptions) (0), 0, 0);
+    lives_table_attach(LIVES_TABLE(conxwp->tablep), hbox[i], i, i+1, conxwp->trowsp-1, conxwp->trowsp,
+                       (LiVESAttachOptions)(LIVES_FILL|LIVES_EXPAND),
+                       (LiVESAttachOptions)(0), 0, 0);
 
 
   }
@@ -2609,7 +2569,7 @@
 #endif
 
   // subtract 1 from trowsp because of title row
-  for (i=conxwp->trowsp-3;i>ours;i--) {
+  for (i=conxwp->trowsp-3; i>ours; i--) {
 #if !LIVES_TABLE_IS_GRID
 
     // reparent widgets from row i to row i+1
@@ -2663,7 +2623,7 @@
 
 
 
-static void pdel_clicked(LiVESWidget *button, gpointer user_data) {
+static void pdel_clicked(LiVESWidget *button, livespointer user_data) {
   //  remove the param row at the del button
   lives_conx_w *conxwp=(lives_conx_w *)user_data;
 
@@ -2685,16 +2645,16 @@
   totparams=pconx_get_numcons(conxwp,FX_DATA_WILDCARD);
   totchans=cconx_get_numcons(conxwp,FX_DATA_WILDCARD);
 
-  for (i=0;i<totparams;i++) {
+  for (i=0; i<totparams; i++) {
     if (conxwp->del_button[i+totchans]==button) {
       ours=i;
       break;
     }
   }
 
-  pidx=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(conxwp->pcombo[ours]),"pidx"));
+  pidx=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(conxwp->pcombo[ours]),"pidx"));
 
-  lives_combo_set_active_index (LIVES_COMBO(conxwp->pfxcombo[ours]),0);
+  lives_combo_set_active_index(LIVES_COMBO(conxwp->pfxcombo[ours]),0);
 
   if (conxwp->dispp[pidx+EXTRA_PARAMS_OUT]==1) {
     // last one, dont delete, just clear
@@ -2720,31 +2680,29 @@
   lives_widget_destroy(conxwp->pcombo[ours]);
   lives_widget_destroy(comhbox);
 #endif
-  
+
   conxwp->trowsp--;
 
   // subtract 1 from trowsp because of title row
-  for (i=ours;i<conxwp->trowsp-1;i++) {
+  for (i=ours; i<conxwp->trowsp-1; i++) {
 #if !LIVES_TABLE_IS_GRID
 
     // reparent widgets from row i to row i+1
 
     hboxb[0]=lives_widget_get_parent(conxwp->pclabel[totchans+i+1]);
-    
+
     if (i==ours) {
-      pidx_next=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(conxwp->pcombo[i+1]),"pidx"));
+      pidx_next=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(conxwp->pcombo[i+1]),"pidx"));
       if (pidx_next!=pidx) {
-	// secondary param
-	lives_widget_destroy(conxwp->pclabel[totchans+i]);
-	lives_widget_reparent(conxwp->pclabel[totchans+i+1],hbox[0]);
-	conxwp->pclabel[totchans+i]=conxwp->pclabel[totchans+i+1];
-      }
-      else {
-	// primary param
-	lives_widget_destroy(conxwp->pclabel[totchans+i+1]);
+        // secondary param
+        lives_widget_destroy(conxwp->pclabel[totchans+i]);
+        lives_widget_reparent(conxwp->pclabel[totchans+i+1],hbox[0]);
+        conxwp->pclabel[totchans+i]=conxwp->pclabel[totchans+i+1];
+      } else {
+        // primary param
+        lives_widget_destroy(conxwp->pclabel[totchans+i+1]);
       }
-    }
-    else {
+    } else {
       lives_widget_reparent(conxwp->pclabel[totchans+i+1],hbox[0]);
       conxwp->pclabel[totchans+i]=conxwp->pclabel[totchans+i+1];
     }
@@ -2763,9 +2721,9 @@
 
     if (conxwp->acheck[i]!=NULL) {
       if (hbox[3]==NULL) {
-	achbox=lives_widget_get_parent(conxwp->acheck[i]);
-	hbox[3]=lives_widget_get_parent(achbox);
-	lives_widget_destroy(achbox);
+        achbox=lives_widget_get_parent(conxwp->acheck[i]);
+        hbox[3]=lives_widget_get_parent(achbox);
+        lives_widget_destroy(achbox);
       }
       achbox=lives_widget_get_parent(conxwp->acheck[i+1]);
       hboxb[3]=lives_widget_get_parent(achbox);
@@ -2774,7 +2732,7 @@
     }
 
     lives_widget_set_sensitive(conxwp->del_button[totchans+i],
-			       lives_widget_get_sensitive(conxwp->del_button[totchans+i+1]));
+                               lives_widget_get_sensitive(conxwp->del_button[totchans+i+1]));
 
 #else
     conxwp->add_button[i]=conxwp->add_button[i+1];
@@ -2818,30 +2776,30 @@
 #endif
 
 
-  conxwp->pclabel=(LiVESWidget **)g_realloc(conxwp->pclabel,(totchans+totparams)*sizeof(LiVESWidget *));
+  conxwp->pclabel=(LiVESWidget **)lives_realloc(conxwp->pclabel,(totchans+totparams)*sizeof(LiVESWidget *));
 
-  conxwp->add_button=(LiVESWidget **)g_realloc(conxwp->add_button,(totchans+totparams)*sizeof(LiVESWidget *));
-  conxwp->del_button=(LiVESWidget **)g_realloc(conxwp->del_button,(totchans+totparams)*sizeof(LiVESWidget *));
-  conxwp->clabel=(LiVESWidget **)g_realloc(conxwp->clabel,(totchans+totparams)*sizeof(LiVESWidget *));
+  conxwp->add_button=(LiVESWidget **)lives_realloc(conxwp->add_button,(totchans+totparams)*sizeof(LiVESWidget *));
+  conxwp->del_button=(LiVESWidget **)lives_realloc(conxwp->del_button,(totchans+totparams)*sizeof(LiVESWidget *));
+  conxwp->clabel=(LiVESWidget **)lives_realloc(conxwp->clabel,(totchans+totparams)*sizeof(LiVESWidget *));
 
-  conxwp->ikeys=(int *)g_realloc(conxwp->ikeys,(totchans+totparams)*sizint);
-  conxwp->imodes=(int *)g_realloc(conxwp->imodes,(totchans+totparams)*sizint);
-  conxwp->idx=(int *)g_realloc(conxwp->idx,(totchans+totparams)*sizint);
+  conxwp->ikeys=(int *)lives_realloc(conxwp->ikeys,(totchans+totparams)*sizint);
+  conxwp->imodes=(int *)lives_realloc(conxwp->imodes,(totchans+totparams)*sizint);
+  conxwp->idx=(int *)lives_realloc(conxwp->idx,(totchans+totparams)*sizint);
 
-  conxwp->pfxcombo=(LiVESWidget **)g_realloc(conxwp->pfxcombo,totparams*sizeof(LiVESWidget *));
-  conxwp->pcombo=(LiVESWidget **)g_realloc(conxwp->pcombo,totparams*sizeof(LiVESWidget *));
+  conxwp->pfxcombo=(LiVESWidget **)lives_realloc(conxwp->pfxcombo,totparams*sizeof(LiVESWidget *));
+  conxwp->pcombo=(LiVESWidget **)lives_realloc(conxwp->pcombo,totparams*sizeof(LiVESWidget *));
 
-  conxwp->dpp_func=(gulong *)g_realloc(conxwp->dpp_func,totparams*sizeof(gulong));
-  conxwp->acheck_func=(gulong *)g_realloc(conxwp->acheck_func,totparams*sizeof(gulong));
+  conxwp->dpp_func=(ulong *)lives_realloc(conxwp->dpp_func,totparams*sizeof(ulong));
+  conxwp->acheck_func=(ulong *)lives_realloc(conxwp->acheck_func,totparams*sizeof(ulong));
 
-  conxwp->acheck=(LiVESWidget **)g_realloc(conxwp->acheck,totparams*sizeof(LiVESWidget *));
+  conxwp->acheck=(LiVESWidget **)lives_realloc(conxwp->acheck,totparams*sizeof(LiVESWidget *));
 
 }
 
 
 
 
-static void cadd_clicked(LiVESWidget *button, gpointer user_data) {
+static void cadd_clicked(LiVESWidget *button, livespointer user_data) {
   // add another channel row below the add button
   lives_conx_w *conxwp=(lives_conx_w *)user_data;
 
@@ -2859,33 +2817,33 @@
   totparams=pconx_get_numcons(conxwp,FX_DATA_WILDCARD);
   totchans=cconx_get_numcons(conxwp,FX_DATA_WILDCARD);
 
-  for (i=0;i<totchans;i++) {
+  for (i=0; i<totchans; i++) {
     if (conxwp->add_button[i]==button) {
       ours=i;
       break;
     }
   }
 
-  cidx=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(conxwp->cfxcombo[ours]),"cidx"));
+  cidx=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(conxwp->cfxcombo[ours]),"cidx"));
 
   conxwp->dispc[cidx]++;
 
   totchans++;
 
-  conxwp->pclabel=(LiVESWidget **)g_realloc(conxwp->pclabel,(totchans+totparams)*sizeof(LiVESWidget *));
+  conxwp->pclabel=(LiVESWidget **)lives_realloc(conxwp->pclabel,(totchans+totparams)*sizeof(LiVESWidget *));
 
-  conxwp->add_button=(LiVESWidget **)g_realloc(conxwp->add_button,(totchans+totparams)*sizeof(LiVESWidget *));
-  conxwp->del_button=(LiVESWidget **)g_realloc(conxwp->del_button,(totchans+totparams)*sizeof(LiVESWidget *));
-  conxwp->clabel=(LiVESWidget **)g_realloc(conxwp->clabel,(totchans+totparams)*sizeof(LiVESWidget *));
+  conxwp->add_button=(LiVESWidget **)lives_realloc(conxwp->add_button,(totchans+totparams)*sizeof(LiVESWidget *));
+  conxwp->del_button=(LiVESWidget **)lives_realloc(conxwp->del_button,(totchans+totparams)*sizeof(LiVESWidget *));
+  conxwp->clabel=(LiVESWidget **)lives_realloc(conxwp->clabel,(totchans+totparams)*sizeof(LiVESWidget *));
 
-  conxwp->ikeys=(int *)g_realloc(conxwp->ikeys,(totchans+totparams)*sizint);
-  conxwp->imodes=(int *)g_realloc(conxwp->imodes,(totchans+totparams)*sizint);
-  conxwp->idx=(int *)g_realloc(conxwp->idx,(totchans+totparams)*sizint);
+  conxwp->ikeys=(int *)lives_realloc(conxwp->ikeys,(totchans+totparams)*sizint);
+  conxwp->imodes=(int *)lives_realloc(conxwp->imodes,(totchans+totparams)*sizint);
+  conxwp->idx=(int *)lives_realloc(conxwp->idx,(totchans+totparams)*sizint);
 
-  conxwp->cfxcombo=(LiVESWidget **)g_realloc(conxwp->cfxcombo,totchans*sizeof(LiVESWidget *));
-  conxwp->ccombo=(LiVESWidget **)g_realloc(conxwp->ccombo,totchans*sizeof(LiVESWidget *));
+  conxwp->cfxcombo=(LiVESWidget **)lives_realloc(conxwp->cfxcombo,totchans*sizeof(LiVESWidget *));
+  conxwp->ccombo=(LiVESWidget **)lives_realloc(conxwp->ccombo,totchans*sizeof(LiVESWidget *));
 
-  conxwp->dpc_func=(gulong *)g_realloc(conxwp->dpc_func,totchans*sizeof(gulong));
+  conxwp->dpc_func=(ulong *)lives_realloc(conxwp->dpc_func,totchans*sizeof(ulong));
 
   conxwp->trowsc++;
 
@@ -2895,12 +2853,12 @@
 
   // add parent widgets to new row
 
-  for (i=0;i<4;i++) {
-    hbox[i]=lives_hbox_new (FALSE, 0);
+  for (i=0; i<4; i++) {
+    hbox[i]=lives_hbox_new(FALSE, 0);
 
-    lives_table_attach (LIVES_TABLE (conxwp->tablec), hbox[i], i, i+1, conxwp->trowsc-1, conxwp->trowsc,
-			(LiVESAttachOptions) (LIVES_FILL|LIVES_EXPAND),
-			(LiVESAttachOptions) (0), 0, 0);
+    lives_table_attach(LIVES_TABLE(conxwp->tablec), hbox[i], i, i+1, conxwp->trowsc-1, conxwp->trowsc,
+                       (LiVESAttachOptions)(LIVES_FILL|LIVES_EXPAND),
+                       (LiVESAttachOptions)(0), 0, 0);
 
 
   }
@@ -2915,7 +2873,7 @@
 #endif
 
   // subtract 1 from trowsp because of title row
-  for (i=conxwp->trowsc-3;i>ours;i--) {
+  for (i=conxwp->trowsc-3; i>ours; i--) {
 #if !LIVES_TABLE_IS_GRID
 
     // reparent widgets from row i to row i+1
@@ -2961,7 +2919,7 @@
 
 
 
-static void cdel_clicked(LiVESWidget *button, gpointer user_data) {
+static void cdel_clicked(LiVESWidget *button, livespointer user_data) {
   //  remove the channel  row at the del button
   lives_conx_w *conxwp=(lives_conx_w *)user_data;
 
@@ -2979,16 +2937,16 @@
   totparams=pconx_get_numcons(conxwp,FX_DATA_WILDCARD);
   totchans=cconx_get_numcons(conxwp,FX_DATA_WILDCARD);
 
-  for (i=0;i<totchans;i++) {
+  for (i=0; i<totchans; i++) {
     if (conxwp->del_button[i]==button) {
       ours=i;
       break;
     }
   }
 
-  cidx=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(conxwp->ccombo[ours]),"cidx"));
+  cidx=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(conxwp->ccombo[ours]),"cidx"));
 
-  lives_combo_set_active_index (LIVES_COMBO(conxwp->cfxcombo[ours]),0);
+  lives_combo_set_active_index(LIVES_COMBO(conxwp->cfxcombo[ours]),0);
 
   if (conxwp->dispc[cidx]==1) {
     // last one, dont delete, just clear
@@ -3014,31 +2972,29 @@
   lives_widget_destroy(conxwp->ccombo[ours]);
   lives_widget_destroy(comhbox);
 #endif
-  
+
   conxwp->trowsc--;
 
   // subtract 1 from trowsc because of title row
-  for (i=ours;i<conxwp->trowsc-1;i++) {
+  for (i=ours; i<conxwp->trowsc-1; i++) {
 #if !LIVES_TABLE_IS_GRID
 
     // reparent widgets from row i to row i+1
 
     hboxb[0]=lives_widget_get_parent(conxwp->pclabel[i+1]);
-    
+
     if (i==ours) {
-      cidx_next=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(conxwp->ccombo[i+1]),"cidx"));
+      cidx_next=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(conxwp->ccombo[i+1]),"cidx"));
       if (cidx_next!=cidx) {
-	// secondary chan
-	lives_widget_destroy(conxwp->pclabel[i]);
-	lives_widget_reparent(conxwp->pclabel[i+1],hbox[0]);
-	conxwp->pclabel[i]=conxwp->pclabel[i+1];
-      }
-      else {
-	// primary chan
-	lives_widget_destroy(conxwp->pclabel[i+1]);
+        // secondary chan
+        lives_widget_destroy(conxwp->pclabel[i]);
+        lives_widget_reparent(conxwp->pclabel[i+1],hbox[0]);
+        conxwp->pclabel[i]=conxwp->pclabel[i+1];
+      } else {
+        // primary chan
+        lives_widget_destroy(conxwp->pclabel[i+1]);
       }
-    }
-    else {
+    } else {
       lives_widget_reparent(conxwp->pclabel[i+1],hbox[0]);
       conxwp->pclabel[i]=conxwp->pclabel[i+1];
     }
@@ -3056,7 +3012,7 @@
     hbox[2]=hboxb[2];
 
     lives_widget_set_sensitive(conxwp->del_button[i],
-			       lives_widget_get_sensitive(conxwp->del_button[i+1]));
+                               lives_widget_get_sensitive(conxwp->del_button[i+1]));
 
 #else
     conxwp->add_button[i]=conxwp->add_button[i+1];
@@ -3096,20 +3052,20 @@
 #endif
 
 
-  conxwp->pclabel=(LiVESWidget **)g_realloc(conxwp->pclabel,(totchans+totparams)*sizeof(LiVESWidget *));
+  conxwp->pclabel=(LiVESWidget **)lives_realloc(conxwp->pclabel,(totchans+totparams)*sizeof(LiVESWidget *));
 
-  conxwp->add_button=(LiVESWidget **)g_realloc(conxwp->add_button,(totchans+totparams)*sizeof(LiVESWidget *));
-  conxwp->del_button=(LiVESWidget **)g_realloc(conxwp->del_button,(totchans+totparams)*sizeof(LiVESWidget *));
-  conxwp->clabel=(LiVESWidget **)g_realloc(conxwp->clabel,(totchans+totparams)*sizeof(LiVESWidget *));
+  conxwp->add_button=(LiVESWidget **)lives_realloc(conxwp->add_button,(totchans+totparams)*sizeof(LiVESWidget *));
+  conxwp->del_button=(LiVESWidget **)lives_realloc(conxwp->del_button,(totchans+totparams)*sizeof(LiVESWidget *));
+  conxwp->clabel=(LiVESWidget **)lives_realloc(conxwp->clabel,(totchans+totparams)*sizeof(LiVESWidget *));
 
-  conxwp->ikeys=(int *)g_realloc(conxwp->ikeys,(totchans+totparams)*sizint);
-  conxwp->imodes=(int *)g_realloc(conxwp->imodes,(totchans+totparams)*sizint);
-  conxwp->idx=(int *)g_realloc(conxwp->idx,(totchans+totparams)*sizint);
+  conxwp->ikeys=(int *)lives_realloc(conxwp->ikeys,(totchans+totparams)*sizint);
+  conxwp->imodes=(int *)lives_realloc(conxwp->imodes,(totchans+totparams)*sizint);
+  conxwp->idx=(int *)lives_realloc(conxwp->idx,(totchans+totparams)*sizint);
 
-  conxwp->cfxcombo=(LiVESWidget **)g_realloc(conxwp->cfxcombo,totchans*sizeof(LiVESWidget *));
-  conxwp->ccombo=(LiVESWidget **)g_realloc(conxwp->ccombo,totchans*sizeof(LiVESWidget *));
+  conxwp->cfxcombo=(LiVESWidget **)lives_realloc(conxwp->cfxcombo,totchans*sizeof(LiVESWidget *));
+  conxwp->ccombo=(LiVESWidget **)lives_realloc(conxwp->ccombo,totchans*sizeof(LiVESWidget *));
 
-  conxwp->dpc_func=(gulong *)g_realloc(conxwp->dpc_func,totchans*sizeof(gulong));
+  conxwp->dpc_func=(ulong *)lives_realloc(conxwp->dpc_func,totchans*sizeof(ulong));
 
 
 }
@@ -3117,7 +3073,7 @@
 
 
 
-static void dfxc_changed(LiVESWidget *combo, gpointer user_data) {
+static void dfxc_changed(LiVESWidget *combo, livespointer user_data) {
   lives_conx_w *conxwp=(lives_conx_w *)user_data;
 
   LiVESTreeIter iter;
@@ -3126,9 +3082,9 @@
   weed_plant_t **ichans;
   weed_plant_t *filter,*chan;
 
-  GList *clist=NULL;
+  LiVESList *clist=NULL;
 
-  gchar *channame;
+  char *channame;
 
   int fidx,cidx,key,mode;
   int nichans,nchans;
@@ -3145,19 +3101,19 @@
 
   nchans=cconx_get_numcons(conxwp,FX_DATA_WILDCARD);
 
-  for (i=0;i<nchans;i++) {
+  for (i=0; i<nchans; i++) {
     if (conxwp->cfxcombo[i]==combo) {
       ours=i;
       break;
     }
   }
 
-  cidx=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(combo),"cidx"));
+  cidx=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(combo),"cidx"));
 
   if (fidx==-1) {
-    lives_combo_set_active_index (LIVES_COMBO(combo),0);
+    lives_combo_set_active_index(LIVES_COMBO(combo),0);
     lives_combo_populate(LIVES_COMBO(conxwp->ccombo[ours]),NULL);
-    lives_combo_set_active_string (LIVES_COMBO(conxwp->ccombo[ours]),"");
+    lives_combo_set_active_string(LIVES_COMBO(conxwp->ccombo[ours]),"");
     if (cconx_get_nconns(conxwp->cconx,0)==0&&cidx==0) lives_widget_set_sensitive(conxwp->acbutton,FALSE);
     lives_widget_set_sensitive(conxwp->ccombo[ours],FALSE);
     return;
@@ -3170,32 +3126,32 @@
   nichans=weed_leaf_num_elements(filter,"in_channel_templates");
 
   // populate all ccombo with channels
-  for (i=0;i<nichans;i++) {
+  for (i=0; i<nichans; i++) {
     chan=ichans[j++];
 
     if (!has_alpha_palette(chan)) continue;
 
     channame=weed_get_string_value(chan,"name",&error);
-    clist=g_list_append(clist,channame);
+    clist=lives_list_append(clist,channame);
   }
 
-  weed_free(ichans);
+  lives_free(ichans);
 
   lives_combo_populate(LIVES_COMBO(conxwp->ccombo[ours]),clist);
-  lives_combo_set_active_string (LIVES_COMBO(conxwp->ccombo[ours]),"");
-  
+  lives_combo_set_active_string(LIVES_COMBO(conxwp->ccombo[ours]),"");
+
   if (cidx==0) lives_widget_set_sensitive(conxwp->acbutton,TRUE);
   lives_widget_set_sensitive(conxwp->ccombo[ours],TRUE);
 
-  g_list_free_strings(clist);
-  g_list_free(clist);
+  lives_list_free_strings(clist);
+  lives_list_free(clist);
 
 
 }
 
 
 
-static void dfxp_changed(LiVESWidget *combo, gpointer user_data) {
+static void dfxp_changed(LiVESWidget *combo, livespointer user_data) {
   // filter was changed
 
   lives_conx_w *conxwp=(lives_conx_w *)user_data;
@@ -3206,12 +3162,12 @@
   weed_plant_t **iparams=NULL;
   weed_plant_t *filter,*param;
 
-  GList *plist=NULL;
+  LiVESList *plist=NULL;
 
-  gchar *paramname;
+  char *paramname;
 
-  gchar *ptype,*range;
-  gchar *array_type,*text;
+  char *ptype,*range;
+  char *array_type,*text;
 
   int defelems,pflags,stype;
 
@@ -3228,7 +3184,7 @@
 
   nparams=pconx_get_numcons(conxwp,FX_DATA_WILDCARD);
 
-  for (i=0;i<nparams;i++) {
+  for (i=0; i<nparams; i++) {
     if (conxwp->pfxcombo[i]==combo) {
       ours=i;
       break;
@@ -3240,7 +3196,7 @@
   lives_tree_model_get(model,&iter,KEYVAL_COLUMN,&key,MODEVAL_COLUMN,&mode,-1);
   fidx=rte_keymode_get_filter_idx(key,mode);
 
-  pidx=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(combo),"pidx"));
+  pidx=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(combo),"pidx"));
 
   if (fidx==-1) {
     LiVESWidget *acheck=conxwp->acheck[ours];
@@ -3251,10 +3207,10 @@
       lives_signal_handler_unblock(acheck,conxwp->acheck_func[ours]);
     }
 
-    lives_combo_set_active_index (LIVES_COMBO(combo),0);
+    lives_combo_set_active_index(LIVES_COMBO(combo),0);
 
     lives_combo_populate(LIVES_COMBO(conxwp->pcombo[ours]),NULL);
-    lives_combo_set_active_string (LIVES_COMBO(conxwp->pcombo[ours]),"");
+    lives_combo_set_active_string(LIVES_COMBO(conxwp->pcombo[ours]),"");
 
     if (pconx_get_nconns(conxwp->pconx,0)==0&&pidx==0) lives_widget_set_sensitive(conxwp->apbutton,FALSE);
 
@@ -3272,12 +3228,11 @@
   }
 
   // populate pcombo with all in params
-  for (i=-EXTRA_PARAMS_IN;i<niparams;i++) {
+  for (i=-EXTRA_PARAMS_IN; i<niparams; i++) {
     if (i==FX_DATA_PARAM_ACTIVE) {
       ptype=weed_seed_type_to_text(WEED_SEED_BOOLEAN);
-      text=g_strdup_printf(_("ACTIVATE (%s)"),ptype);
-    }
-    else {
+      text=lives_strdup_printf(_("ACTIVATE (%s)"),ptype);
+    } else {
       param=iparams[j++];
 
       if (weed_plant_has_leaf(param,"host_internal_connection")) continue;
@@ -3290,48 +3245,47 @@
 
       pflags=weed_get_int_value(param,"flags",&error);
 
-      if (pflags&WEED_PARAMETER_VARIABLE_ELEMENTS) array_type=g_strdup("[]");
-      else if ((defelems=weed_leaf_num_elements(param,"default"))>1) array_type=g_strdup_printf("[%d]",defelems);
-      else array_type=g_strdup("");
-    
+      if (pflags&WEED_PARAMETER_VARIABLE_ELEMENTS) array_type=lives_strdup("[]");
+      else if ((defelems=weed_leaf_num_elements(param,"default"))>1) array_type=lives_strdup_printf("[%d]",defelems);
+      else array_type=lives_strdup("");
+
       if (weed_plant_has_leaf(param,"max")&&weed_plant_has_leaf(param,"min")) {
-	if (stype==WEED_SEED_INT) {
-	  range=g_strdup_printf("Range: %d to %d",weed_get_int_value(param,"min",&error),weed_get_int_value(param,"max",&error));
-	}
-	else if (stype==WEED_SEED_DOUBLE) {
-	  range=g_strdup_printf("Range: %f to %f",weed_get_double_value(param,"min",&error),weed_get_double_value(param,"max",&error));
-	}
-	else range=g_strdup("");
-      }
-      else range=g_strdup("");
+        if (stype==WEED_SEED_INT) {
+          range=lives_strdup_printf("Range: %d to %d",weed_get_int_value(param,"min",&error),weed_get_int_value(param,"max",&error));
+        } else if (stype==WEED_SEED_DOUBLE) {
+          range=lives_strdup_printf("Range: %f to %f",weed_get_double_value(param,"min",&error),weed_get_double_value(param,"max",&error));
+        } else range=lives_strdup("");
+      } else range=lives_strdup("");
 
-      text=g_strdup_printf("%s (%s%s) %s",paramname,ptype,array_type,range);
-      weed_free(paramname);
-      g_free(array_type); g_free(range);
+      text=lives_strdup_printf("%s (%s%s) %s",paramname,ptype,array_type,range);
+      lives_free(paramname);
+      lives_free(array_type);
+      lives_free(range);
     }
-    g_free(ptype);
-    plist=g_list_append(plist,text);
+    lives_free(ptype);
+    plist=lives_list_append(plist,text);
 
   }
 
-  if (iparams!=NULL) weed_free(iparams);
+  if (iparams!=NULL) lives_free(iparams);
 
   lives_combo_populate(LIVES_COMBO(conxwp->pcombo[ours]),plist);
-  lives_combo_set_active_string (LIVES_COMBO(conxwp->pcombo[ours]),"");
+  lives_combo_set_active_string(LIVES_COMBO(conxwp->pcombo[ours]),"");
 
   if (pidx==0) lives_widget_set_sensitive(conxwp->apbutton,TRUE);
 
   lives_widget_set_sensitive(conxwp->pcombo[ours],TRUE);
 
-  g_list_free_strings(plist);
-  g_list_free(plist);
+  lives_list_free_strings(plist);
+  lives_list_free(plist);
 
 
 }
 
 
-int pconx_check_connection(weed_plant_t *ofilter, int opnum, int ikey, int imode, int ipnum, boolean setup, weed_plant_t **iparam_ret, int *idx_ret,
-			   int *okey, int *omode, int *oopnum) {
+int pconx_check_connection(weed_plant_t *ofilter, int opnum, int ikey, int imode, int ipnum, boolean setup, weed_plant_t **iparam_ret,
+                           int *idx_ret,
+                           int *okey, int *omode, int *oopnum) {
   weed_plant_t **oparams=NULL,**iparams;
   weed_plant_t *oparam,*iparam=NULL;
 
@@ -3342,9 +3296,8 @@
   if (opnum>=0) {
     oparams=weed_get_plantptr_array(ofilter,"out_parameter_templates",&error);
     oparam=oparams[opnum];
-    weed_free(oparams);
-  } 
-  else {
+    lives_free(oparams);
+  } else {
     // invent an "ACTIVATED" param
     pthread_mutex_lock(&mainw->fxd_active_mutex);
     if (active_dummy!=NULL&&WEED_PLANT_IS_PARAMETER(active_dummy)) {
@@ -3373,8 +3326,7 @@
     idx=ipnum;
     iparam=active_dummy;
     pthread_mutex_unlock(&mainw->fxd_active_mutex);
-  }
-  else {
+  } else {
     // find the receiving filter/instance
     int fidx=rte_keymode_get_filter_idx(ikey,imode);
     weed_plant_t *filter=get_weed_filter(fidx);
@@ -3382,7 +3334,7 @@
     iparams=weed_get_plantptr_array(filter,"in_parameter_templates",&error);
     niparams=weed_leaf_num_elements(filter,"in_parameter_templates");
 
-    for (i=0;i<niparams;i++) {
+    for (i=0; i<niparams; i++) {
       iparam=iparams[i];
       if (weed_plant_has_leaf(iparam,"host_internal_connection")) continue;
       if (weed_plant_has_leaf(iparam,"group")&&weed_get_int_value(iparam,"group",&error)!=0) continue;
@@ -3390,7 +3342,7 @@
       j++;
     }
     idx=i;
-    weed_free(iparams);
+    lives_free(iparams);
   }
 
   if (iparam_ret!=NULL) *iparam_ret=iparam;
@@ -3412,7 +3364,7 @@
 
 
 
-static void dpp_changed(LiVESWidget *combo, gpointer user_data) {
+static void dpp_changed(LiVESWidget *combo, livespointer user_data) {
   // receiver param was set
 
   // 1) check if compatible
@@ -3421,7 +3373,7 @@
 
   // 3) set text to just param name
   weed_plant_t *iparam;
- 
+
   lives_conx_w *conxwp=(lives_conx_w *)user_data;
 
   LiVESWidget *acheck=NULL;
@@ -3431,10 +3383,10 @@
 
   LiVESTreeIter iter;
 
-  gchar *paramname;
+  char *paramname;
 
   boolean hasone=FALSE;
-  boolean setup=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(combo),"setup"));
+  boolean setup=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(combo),"setup"));
 
   int nparams,nchans;
   int okey,omode,opnum;
@@ -3448,34 +3400,35 @@
   nparams=pconx_get_numcons(conxwp,FX_DATA_WILDCARD);
   nchans=cconx_get_numcons(conxwp,FX_DATA_WILDCARD);
 
-  for (i=0;i<nparams;i++) {
+  for (i=0; i<nparams; i++) {
     if (conxwp->pcombo[i]==combo) {
       ours=i;
       break;
     }
   }
 
-  pidx=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(combo),"pidx"));
+  pidx=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(combo),"pidx"));
 
   if (idx==-1) {
     if (setup) return;
-    for (i=0;i<nchans;i++) if (lives_combo_get_active(LIVES_COMBO(conxwp->ccombo[i]))>-1) {
-	hasone=TRUE;
-	break;
-      }
-    if (!hasone) for (i=0;i<nparams;i++) if (GPOINTER_TO_INT(g_object_get_data(G_OBJECT(conxwp->pcombo[i]),"idx"))>-1) {
-	  hasone=TRUE;
-	  break;
-	}
+    for (i=0; i<nchans; i++) if (lives_combo_get_active(LIVES_COMBO(conxwp->ccombo[i]))>-1) {
+        hasone=TRUE;
+        break;
+      }
+    if (!hasone) for (i=0; i<nparams;
+                        i++) if (LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(conxwp->pcombo[i]),"idx"))>-1) {
+          hasone=TRUE;
+          break;
+        }
 
     if (!hasone) lives_widget_set_sensitive(conxwp->disconbutton,FALSE);
 
     if (conxwp->ikeys[nchans+ours]!=0) {
 
       pconx_delete(conxwp->okey,conxwp->omode,pidx,
-		   conxwp->ikeys[nchans+ours]-1,
-		   conxwp->imodes[nchans+ours],
-		   conxwp->idx[nchans+ours]);
+                   conxwp->ikeys[nchans+ours]-1,
+                   conxwp->imodes[nchans+ours],
+                   conxwp->idx[nchans+ours]);
 
       conxwp->pconx=pconx_find(conxwp->okey,conxwp->omode);
 
@@ -3486,7 +3439,7 @@
 
     lives_widget_set_sensitive(conxwp->del_button[nchans+ours], FALSE);
 
-    g_object_set_data(G_OBJECT(combo),"idx",GINT_TO_POINTER(idx));
+    lives_widget_object_set_data(LIVES_WIDGET_OBJECT(combo),"idx",LIVES_INT_TO_POINTER(idx));
 
     return;
   }
@@ -3509,13 +3462,13 @@
 
   if (ret==-1) {
     do_param_connected_error(conxwp,okey,omode,opnum);
-    lives_combo_set_active_string (LIVES_COMBO(combo),"");
+    lives_combo_set_active_string(LIVES_COMBO(combo),"");
     return;
   }
 
   if (ret==-2) {
     do_param_incompatible_error(conxwp);
-    lives_combo_set_active_string (LIVES_COMBO(combo),"");
+    lives_combo_set_active_string(LIVES_COMBO(combo),"");
     return;
   }
 
@@ -3524,35 +3477,35 @@
 
   idx+=EXTRA_PARAMS_IN;
 
-  g_object_set_data(G_OBJECT(combo),"idx",GINT_TO_POINTER(idx));
+  lives_widget_object_set_data(LIVES_WIDGET_OBJECT(combo),"idx",LIVES_INT_TO_POINTER(idx));
 
   acheck=conxwp->acheck[ours];
 
   if (acheck!=NULL) {
-    boolean hasrange=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(acheck),"available"));
+    boolean hasrange=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(acheck),"available"));
 
     lives_signal_handler_block(acheck,conxwp->acheck_func[ours]);
     lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(acheck),FALSE);
     lives_signal_handler_unblock(acheck,conxwp->acheck_func[ours]);
-    
+
     if (hasrange) {
       lives_widget_set_sensitive(acheck,TRUE);
       if (lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(conxwp->allcheckc))) {
-	lives_signal_handler_block(acheck,conxwp->acheck_func[ours]);
-	lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(acheck),TRUE);
-	lives_signal_handler_unblock(acheck,conxwp->acheck_func[ours]);
+        lives_signal_handler_block(acheck,conxwp->acheck_func[ours]);
+        lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(acheck),TRUE);
+        lives_signal_handler_unblock(acheck,conxwp->acheck_func[ours]);
       }
     }
   }
 
-  if (iparam==active_dummy) paramname=g_strdup(_("ACTIVATE"));
+  if (iparam==active_dummy) paramname=lives_strdup(_("ACTIVATE"));
   else paramname=weed_get_string_value(iparam,"name",&error);
 
   lives_signal_handler_block(combo,conxwp->dpp_func[ours]);
-  lives_combo_set_active_string (LIVES_COMBO(combo),paramname);
+  lives_combo_set_active_string(LIVES_COMBO(combo),paramname);
   lives_signal_handler_unblock(combo,conxwp->dpp_func[ours]);
 
-  weed_free(paramname);
+  lives_free(paramname);
 
 
   lives_widget_set_sensitive(conxwp->del_button[nchans+ours], TRUE);
@@ -3561,14 +3514,14 @@
 
 
   if (conxwp->ikeys[nchans+ours]!=0) pconx_delete(conxwp->okey,conxwp->omode,pidx,
-						  conxwp->ikeys[nchans+ours]-1,
-						  conxwp->imodes[nchans+ours],
-						  conxwp->idx[nchans+ours]);
+        conxwp->ikeys[nchans+ours]-1,
+        conxwp->imodes[nchans+ours],
+        conxwp->idx[nchans+ours]);
 
   conxwp->pconx=pconx_find(conxwp->okey,conxwp->omode);
 
   pconx_add_connection_private(conxwp->pconx,conxwp->okey,conxwp->omode,pidx,key-1,mode,j,acheck!=NULL?
-			       lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(acheck)):FALSE);
+                               lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(acheck)):FALSE);
 
   conxwp->pconx=pconx_find(conxwp->okey,conxwp->omode);
 
@@ -3583,7 +3536,7 @@
 
 
 int cconx_check_connection(int ikey, int imode, int icnum, boolean setup, weed_plant_t **ichan_ret, int *idx_ret,
-			   int *okey, int *omode, int *ocnum) {
+                           int *okey, int *omode, int *ocnum) {
   weed_plant_t **ichans;
   weed_plant_t *filter,*ichan=NULL;
 
@@ -3599,15 +3552,15 @@
   nichans=weed_leaf_num_elements(filter,"in_channel_templates");
 
   // find actual in channel number from list of alpha channels
-  for (i=0;i<nichans;i++) {
+  for (i=0; i<nichans; i++) {
     ichan=ichans[i];
     if (!has_alpha_palette(ichan)) continue;
     if (j==icnum) break;
     j++;
   }
 
-  weed_free(ichans);
-  
+  lives_free(ichans);
+
   idx=i;
 
   if (ichan_ret!=NULL) *ichan_ret=ichan;
@@ -3626,7 +3579,7 @@
 
 
 
-static void dpc_changed(LiVESWidget *combo, gpointer user_data) {
+static void dpc_changed(LiVESWidget *combo, livespointer user_data) {
   lives_conx_w *conxwp=(lives_conx_w *)user_data;
 
   weed_plant_t *ichan;
@@ -3637,10 +3590,10 @@
 
   LiVESWidget *fxcombo;
 
-  gchar *channame;
+  char *channame;
 
   boolean hasone=FALSE;
-  boolean setup=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(combo),"setup"));
+  boolean setup=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(combo),"setup"));
 
   int nchans,nparams;
 
@@ -3654,32 +3607,33 @@
   nchans=cconx_get_numcons(conxwp,FX_DATA_WILDCARD);
   nparams=pconx_get_numcons(conxwp,FX_DATA_WILDCARD);
 
-  for (i=0;i<nchans;i++) {
+  for (i=0; i<nchans; i++) {
     if (conxwp->ccombo[i]==combo) {
       ours=i;
       break;
     }
   }
 
-  cidx=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(combo),"cidx"));
+  cidx=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(combo),"cidx"));
 
   if (idx==-1) {
 
-    for (i=0;i<nchans;i++) if (lives_combo_get_active(LIVES_COMBO(conxwp->ccombo[i]))>-1) {
-	hasone=TRUE;
-	break;
-      }
-    if (!hasone) for (i=0;i<nparams;i++) if (GPOINTER_TO_INT(g_object_get_data(G_OBJECT(conxwp->pcombo[i]),"idx"))>-1) {
-	  hasone=TRUE;
-	  break;
-	}
+    for (i=0; i<nchans; i++) if (lives_combo_get_active(LIVES_COMBO(conxwp->ccombo[i]))>-1) {
+        hasone=TRUE;
+        break;
+      }
+    if (!hasone) for (i=0; i<nparams;
+                        i++) if (LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(conxwp->pcombo[i]),"idx"))>-1) {
+          hasone=TRUE;
+          break;
+        }
 
     if (!hasone) lives_widget_set_sensitive(conxwp->disconbutton,FALSE);
 
     if (conxwp->ikeys[ours]!=0) cconx_delete(conxwp->okey,conxwp->omode,cidx,
-					     conxwp->ikeys[ours]-1,
-					     conxwp->imodes[ours],
-					     conxwp->idx[ours]);
+          conxwp->ikeys[ours]-1,
+          conxwp->imodes[ours],
+          conxwp->idx[ours]);
     conxwp->cconx=cconx_find(conxwp->okey,conxwp->omode);
 
     conxwp->ikeys[ours]=0;
@@ -3705,27 +3659,27 @@
   if (ret==-1) {
     // dest chan already has a connection
     do_chan_connected_error(conxwp,okey,omode,ocnum);
-    lives_combo_set_active_string (LIVES_COMBO(combo),"");
+    lives_combo_set_active_string(LIVES_COMBO(combo),"");
     return;
   }
 
   lives_signal_handler_block(combo,conxwp->dpc_func[ours]);
   channame=weed_get_string_value(ichan,"name",&error);
-  lives_combo_set_active_string (LIVES_COMBO(combo),channame);
+  lives_combo_set_active_string(LIVES_COMBO(combo),channame);
   lives_signal_handler_unblock(combo,conxwp->dpc_func[ours]);
 
-  weed_free(channame);
+  lives_free(channame);
 
-  g_object_set_data(G_OBJECT(combo),"idx",GINT_TO_POINTER(idx));
+  lives_widget_object_set_data(LIVES_WIDGET_OBJECT(combo),"idx",LIVES_INT_TO_POINTER(idx));
 
   lives_widget_set_sensitive(conxwp->del_button[ours], TRUE);
 
   if (setup) return;
 
   if (conxwp->ikeys[ours]!=0) cconx_delete(conxwp->okey,conxwp->omode,cidx,
-					   conxwp->ikeys[ours]-1,
-					   conxwp->imodes[ours],
-					   conxwp->idx[ours]);
+        conxwp->ikeys[ours]-1,
+        conxwp->imodes[ours],
+        conxwp->idx[ours]);
 
   conxwp->cconx=cconx_find(conxwp->okey,conxwp->omode);
 
@@ -3742,7 +3696,7 @@
 
 
 
-static void on_allcheck_toggled(LiVESToggleButton *button, gpointer user_data) {
+static void on_allcheck_toggled(LiVESToggleButton *button, livespointer user_data) {
   lives_conx_w *conxwp=(lives_conx_w *)user_data;
 
   boolean on=lives_toggle_button_get_active(button);
@@ -3750,14 +3704,14 @@
   int nparams=pconx_get_numcons(conxwp,FX_DATA_WILDCARD);
   register int i;
 
-  for (i=EXTRA_PARAMS_OUT;i<nparams;i++) {
+  for (i=EXTRA_PARAMS_OUT; i<nparams; i++) {
     if (lives_widget_is_sensitive(conxwp->acheck[i])) lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(conxwp->acheck[i]),on);
   }
 
 }
 
 
-static void on_acheck_toggled(LiVESToggleButton *acheck, gpointer user_data) {
+static void on_acheck_toggled(LiVESToggleButton *acheck, livespointer user_data) {
   lives_conx_w *conxwp=(lives_conx_w *)user_data;
 
   weed_plant_t **iparams;
@@ -3781,14 +3735,14 @@
   nparams=pconx_get_numcons(conxwp,FX_DATA_WILDCARD);
   nchans=cconx_get_numcons(conxwp,FX_DATA_WILDCARD);
 
-  for (i=nx;i<nparams;i++) {
+  for (i=nx; i<nparams; i++) {
     if (conxwp->acheck[i]==(LiVESWidget *)acheck) {
       ours=i;
       break;
     }
   }
 
-  idx=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(conxwp->pcombo[ours]),"idx"));
+  idx=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(conxwp->pcombo[ours]),"idx"));
 
   fxcombo=conxwp->pfxcombo[ours];
 
@@ -3808,7 +3762,7 @@
     iparams=weed_get_plantptr_array(filter,"in_parameter_templates",&error);
     niparams=weed_leaf_num_elements(filter,"in_parameter_templates");
 
-    for (i=0;i<niparams;i++) {
+    for (i=0; i<niparams; i++) {
       param=iparams[j];
       if (weed_plant_has_leaf(param,"host_internal_connection")) continue;
       if (j==idx) break;
@@ -3817,12 +3771,11 @@
 
     j=i;
 
-    weed_free(iparams);
+    lives_free(iparams);
 
-  }
-  else j=idx-EXTRA_PARAMS_IN;
+  } else j=idx-EXTRA_PARAMS_IN;
 
-  pidx=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(acheck),"pidx"));
+  pidx=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(acheck),"pidx"));
 
   if (conxwp->ikeys[nchans+ours]!=0) {
     pconx_delete(conxwp->okey,conxwp->omode,pidx,key-1,mode,j);
@@ -3838,14 +3791,14 @@
 }
 
 
-static LiVESTreeModel *inparam_fx_model (boolean is_chans, int key) {
+static LiVESTreeModel *inparam_fx_model(boolean is_chans, int key) {
   LiVESTreeStore *tstore;
 
   LiVESTreeIter iter1,iter2;
 
   weed_plant_t *filter;
 
-  gchar *fxname,*keystr,*text;
+  char *fxname,*keystr,*text;
 
   boolean key_added;
 
@@ -3857,54 +3810,55 @@
 
   register int i,j;
 
-  tstore=lives_tree_store_new (NUM_COLUMNS, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INT, G_TYPE_INT);
+  tstore=lives_tree_store_new(NUM_COLUMNS, LIVES_COL_TYPE_STRING, LIVES_COL_TYPE_STRING, LIVES_COL_TYPE_INT, LIVES_COL_TYPE_INT);
 
-  lives_tree_store_append (tstore, &iter1, NULL);  /* Acquire an iterator */
+  lives_tree_store_append(tstore, &iter1, NULL);   /* Acquire an iterator */
   lives_tree_store_set(tstore,&iter1,
-		     KEY_COLUMN,mainw->string_constants[LIVES_STRING_CONSTANT_NONE],
-		     NAME_COLUMN,mainw->string_constants[LIVES_STRING_CONSTANT_NONE],
-		     KEYVAL_COLUMN,0,
-		     MODEVAL_COLUMN,0,
-		     -1);
+                       KEY_COLUMN,mainw->string_constants[LIVES_STRING_CONSTANT_NONE],
+                       NAME_COLUMN,mainw->string_constants[LIVES_STRING_CONSTANT_NONE],
+                       KEYVAL_COLUMN,0,
+                       MODEVAL_COLUMN,0,
+                       -1);
 
 
   // go through all keys
-  for (i=1;i<=FX_KEYS_MAX_VIRTUAL;i++) {
+  for (i=1; i<=FX_KEYS_MAX_VIRTUAL; i++) {
     if (i==key+1) continue;
 
     key_added=FALSE;
-    keystr=g_strdup_printf(_("Key slot %d"),i);
+    keystr=lives_strdup_printf(_("Key slot %d"),i);
 
-    for (j=0;j<nmodes;j++) {
+    for (j=0; j<nmodes; j++) {
 
       if ((idx=rte_keymode_get_filter_idx(i,j))==-1) continue;
 
       filter=get_weed_filter(idx);
 
-      if (is_chans) 
-	if (num_alpha_channels(filter,FALSE)==0) continue;
-	
+      if (is_chans)
+        if (num_alpha_channels(filter,FALSE)==0) continue;
+
       fxname=weed_get_string_value(filter,"name",&error);
-      text=g_strdup_printf("(%d,%d) %s",i,j+1,fxname);
+      text=lives_strdup_printf("(%d,%d) %s",i,j+1,fxname);
 
       if (!key_added) {
-	// add key
-	lives_tree_store_append (tstore, &iter1, NULL);  /* Acquire an iterator */
-	lives_tree_store_set(tstore,&iter1,KEY_COLUMN,keystr,NAME_COLUMN,keystr,KEYVAL_COLUMN,0,MODEVAL_COLUMN,0,-1);
-	key_added=TRUE;
+        // add key
+        lives_tree_store_append(tstore, &iter1, NULL);   /* Acquire an iterator */
+        lives_tree_store_set(tstore,&iter1,KEY_COLUMN,keystr,NAME_COLUMN,keystr,KEYVAL_COLUMN,0,MODEVAL_COLUMN,0,-1);
+        key_added=TRUE;
       }
-      lives_tree_store_append (tstore, &iter2, &iter1);
+      lives_tree_store_append(tstore, &iter2, &iter1);
       lives_tree_store_set(tstore,&iter2,KEY_COLUMN,text,NAME_COLUMN,text,KEYVAL_COLUMN,i,MODEVAL_COLUMN,j,-1);
 
-      weed_free(fxname); weed_free(text);
+      lives_free(fxname);
+      lives_free(text);
     }
 
-    g_free(keystr);
+    lives_free(keystr);
 
   }
 
   return (LiVESTreeModel *)tstore;
- }
+}
 
 
 static void ptable_row_add_variable_widgets(lives_conx_w *conxwp, int idx, int row, int pidx) {
@@ -3919,92 +3873,91 @@
 
   totchans=cconx_get_numcons(conxwp,FX_DATA_WILDCARD);
 
-  hbox=lives_hbox_new (FALSE, 0);
+  hbox=lives_hbox_new(FALSE, 0);
 
-  lives_table_attach (LIVES_TABLE (conxwp->tablep), hbox, 0, 1, row, row+1,
-		      (LiVESAttachOptions) (LIVES_FILL|LIVES_EXPAND),
-		      (LiVESAttachOptions) (0), 0, 0);
+  lives_table_attach(LIVES_TABLE(conxwp->tablep), hbox, 0, 1, row, row+1,
+                     (LiVESAttachOptions)(LIVES_FILL|LIVES_EXPAND),
+                     (LiVESAttachOptions)(0), 0, 0);
 
   conxwp->pclabel[idx+totchans]=lives_standard_label_new(NULL);
-  lives_box_pack_start (LIVES_BOX (hbox), conxwp->pclabel[idx+totchans], FALSE, FALSE, widget_opts.packing_width);
+  lives_box_pack_start(LIVES_BOX(hbox), conxwp->pclabel[idx+totchans], FALSE, FALSE, widget_opts.packing_width);
 
 
-  hbox=lives_hbox_new (FALSE, 0);
+  hbox=lives_hbox_new(FALSE, 0);
 
   conxwp->pfxcombo[idx] = lives_combo_new_with_model(pmodel);
 
   lives_combo_set_entry_text_column(LIVES_COMBO(conxwp->pfxcombo[idx]),NAME_COLUMN);
-  lives_box_pack_start (LIVES_BOX (hbox), conxwp->pfxcombo[idx], FALSE, FALSE, 0);
-     
-  lives_table_attach (LIVES_TABLE (conxwp->tablep), hbox, 2, 3, row, row+1,
-		      (LiVESAttachOptions) (LIVES_FILL|LIVES_EXPAND),
-		      (LiVESAttachOptions) (0), 0, 0);
+  lives_box_pack_start(LIVES_BOX(hbox), conxwp->pfxcombo[idx], FALSE, FALSE, 0);
+
+  lives_table_attach(LIVES_TABLE(conxwp->tablep), hbox, 2, 3, row, row+1,
+                     (LiVESAttachOptions)(LIVES_FILL|LIVES_EXPAND),
+                     (LiVESAttachOptions)(0), 0, 0);
 
   fx_entry = lives_combo_get_entry(LIVES_COMBO(conxwp->pfxcombo[idx]));
-  lives_entry_set_text (LIVES_ENTRY (fx_entry),mainw->string_constants[LIVES_STRING_CONSTANT_NONE]);
-  lives_entry_set_editable (LIVES_ENTRY (fx_entry), FALSE);
+  lives_entry_set_text(LIVES_ENTRY(fx_entry),mainw->string_constants[LIVES_STRING_CONSTANT_NONE]);
+  lives_entry_set_editable(LIVES_ENTRY(fx_entry), FALSE);
 
-  hbox=lives_hbox_new (FALSE, 0);
+  hbox=lives_hbox_new(FALSE, 0);
 
-  hbox2=lives_hbox_new (FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (hbox), hbox2, FALSE, FALSE, 0);
+  hbox2=lives_hbox_new(FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(hbox), hbox2, FALSE, FALSE, 0);
 
   conxwp->pcombo[idx]=lives_standard_combo_new("",FALSE,NULL,LIVES_BOX(hbox2),NULL);
-  g_object_set_data(G_OBJECT(conxwp->pcombo[idx]),"idx",GINT_TO_POINTER(-1));
+  lives_widget_object_set_data(LIVES_WIDGET_OBJECT(conxwp->pcombo[idx]),"idx",LIVES_INT_TO_POINTER(-1));
   lives_widget_set_sensitive(conxwp->pcombo[idx],FALSE);
 
 
-  lives_table_attach (LIVES_TABLE (conxwp->tablep), hbox, 3, 4, row, row+1,
-		      (LiVESAttachOptions) (LIVES_FILL|LIVES_EXPAND),
-		      (LiVESAttachOptions) (0), 0, 0);
+  lives_table_attach(LIVES_TABLE(conxwp->tablep), hbox, 3, 4, row, row+1,
+                     (LiVESAttachOptions)(LIVES_FILL|LIVES_EXPAND),
+                     (LiVESAttachOptions)(0), 0, 0);
 
 
-  lives_signal_connect(LIVES_GUI_OBJECT (conxwp->pfxcombo[idx]), LIVES_WIDGET_CHANGED_EVENT,
-		   LIVES_GUI_CALLBACK (dfxp_changed),(gpointer)conxwp);
+  lives_signal_connect(LIVES_GUI_OBJECT(conxwp->pfxcombo[idx]), LIVES_WIDGET_CHANGED_SIGNAL,
+                       LIVES_GUI_CALLBACK(dfxp_changed),(livespointer)conxwp);
 
 
-  conxwp->dpp_func[idx]=lives_signal_connect(LIVES_GUI_OBJECT (conxwp->pcombo[idx]), LIVES_WIDGET_CHANGED_EVENT,
-					 LIVES_GUI_CALLBACK (dpp_changed),(gpointer)conxwp);
+  conxwp->dpp_func[idx]=lives_signal_connect(LIVES_GUI_OBJECT(conxwp->pcombo[idx]), LIVES_WIDGET_CHANGED_SIGNAL,
+                        LIVES_GUI_CALLBACK(dpp_changed),(livespointer)conxwp);
 
 
-  g_object_set_data(G_OBJECT(conxwp->pcombo[idx]),"pidx",GINT_TO_POINTER(pidx));
-  
+  lives_widget_object_set_data(LIVES_WIDGET_OBJECT(conxwp->pcombo[idx]),"pidx",LIVES_INT_TO_POINTER(pidx));
+
   if (pidx<0) {
     conxwp->acheck[idx]=NULL;
-  }
-  else {
+  } else {
     if (weed_plant_has_leaf(conxwp->filter,"out_parameter_templates")) {
       oparams=weed_get_plantptr_array(conxwp->filter,"out_parameter_templates",&error);
 
       param=oparams[pidx];
       stype=weed_leaf_seed_type(param,"default");
 
-      if (weed_plant_has_leaf(param,"max")&&weed_plant_has_leaf(param,"min")&&(stype==WEED_SEED_INT||stype==WEED_SEED_DOUBLE)) 
-	hasrange=TRUE;
+      if (weed_plant_has_leaf(param,"max")&&weed_plant_has_leaf(param,"min")&&(stype==WEED_SEED_INT||stype==WEED_SEED_DOUBLE))
+        hasrange=TRUE;
 
-      weed_free(oparams);
+      lives_free(oparams);
 
     }
 
-    hbox=lives_hbox_new (FALSE, 0);
+    hbox=lives_hbox_new(FALSE, 0);
 
-    lives_table_attach (LIVES_TABLE (conxwp->tablep), hbox, 4, 5, row, row+1,
-			(LiVESAttachOptions) (LIVES_FILL|LIVES_EXPAND),
-			(LiVESAttachOptions) (0), 0, 0);
+    lives_table_attach(LIVES_TABLE(conxwp->tablep), hbox, 4, 5, row, row+1,
+                       (LiVESAttachOptions)(LIVES_FILL|LIVES_EXPAND),
+                       (LiVESAttachOptions)(0), 0, 0);
 
-    hbox2=lives_hbox_new (FALSE, 0);
-    lives_box_pack_start (LIVES_BOX (hbox), hbox2, FALSE, FALSE, 0);
+    hbox2=lives_hbox_new(FALSE, 0);
+    lives_box_pack_start(LIVES_BOX(hbox), hbox2, FALSE, FALSE, 0);
 
     conxwp->acheck[idx]=lives_standard_check_button_new(_("Autoscale"),FALSE,LIVES_BOX(hbox2),NULL);
 
     lives_widget_set_sensitive(conxwp->acheck[idx],FALSE);
-    g_object_set_data(G_OBJECT(conxwp->acheck[idx]),"available",GINT_TO_POINTER(hasrange));
+    lives_widget_object_set_data(LIVES_WIDGET_OBJECT(conxwp->acheck[idx]),"available",LIVES_INT_TO_POINTER(hasrange));
 
-    conxwp->acheck_func[idx]=lives_signal_connect_after (LIVES_GUI_OBJECT (conxwp->acheck[idx]), LIVES_WIDGET_TOGGLED_EVENT,
-						     LIVES_GUI_CALLBACK (on_acheck_toggled),
-						     (gpointer)conxwp);
+    conxwp->acheck_func[idx]=lives_signal_connect_after(LIVES_GUI_OBJECT(conxwp->acheck[idx]), LIVES_WIDGET_TOGGLED_SIGNAL,
+                             LIVES_GUI_CALLBACK(on_acheck_toggled),
+                             (livespointer)conxwp);
 
-    g_object_set_data(G_OBJECT(conxwp->acheck[idx]),"pidx",GINT_TO_POINTER(pidx));
+    lives_widget_object_set_data(LIVES_WIDGET_OBJECT(conxwp->acheck[idx]),"pidx",LIVES_INT_TO_POINTER(pidx));
   }
 
 }
@@ -4015,56 +3968,56 @@
   LiVESWidget *hbox,*hbox2;
   LiVESWidget *fx_entry;
 
-  hbox=lives_hbox_new (FALSE, 0);
+  hbox=lives_hbox_new(FALSE, 0);
 
-  lives_table_attach (LIVES_TABLE (conxwp->tablec), hbox, 0, 1, row, row+1,
-		      (LiVESAttachOptions) (LIVES_FILL|LIVES_EXPAND),
-		      (LiVESAttachOptions) (0), 0, 0);
+  lives_table_attach(LIVES_TABLE(conxwp->tablec), hbox, 0, 1, row, row+1,
+                     (LiVESAttachOptions)(LIVES_FILL|LIVES_EXPAND),
+                     (LiVESAttachOptions)(0), 0, 0);
 
   conxwp->pclabel[idx]=lives_standard_label_new(NULL);
-  lives_box_pack_start (LIVES_BOX (hbox), conxwp->pclabel[idx], FALSE, FALSE, widget_opts.packing_width);
+  lives_box_pack_start(LIVES_BOX(hbox), conxwp->pclabel[idx], FALSE, FALSE, widget_opts.packing_width);
 
 
-  hbox=lives_hbox_new (FALSE, 0);
+  hbox=lives_hbox_new(FALSE, 0);
 
   conxwp->cfxcombo[idx] = lives_combo_new_with_model(cmodel);
 
   lives_combo_set_entry_text_column(LIVES_COMBO(conxwp->cfxcombo[idx]),NAME_COLUMN);
-  lives_box_pack_start (LIVES_BOX (hbox), conxwp->cfxcombo[idx], FALSE, FALSE, 0);
-     
-  lives_table_attach (LIVES_TABLE (conxwp->tablec), hbox, 2, 3, row, row+1,
-		      (LiVESAttachOptions) (LIVES_FILL|LIVES_EXPAND),
-		      (LiVESAttachOptions) (0), 0, 0);
+  lives_box_pack_start(LIVES_BOX(hbox), conxwp->cfxcombo[idx], FALSE, FALSE, 0);
+
+  lives_table_attach(LIVES_TABLE(conxwp->tablec), hbox, 2, 3, row, row+1,
+                     (LiVESAttachOptions)(LIVES_FILL|LIVES_EXPAND),
+                     (LiVESAttachOptions)(0), 0, 0);
 
   fx_entry = lives_combo_get_entry(LIVES_COMBO(conxwp->cfxcombo[idx]));
-  lives_entry_set_text (LIVES_ENTRY (fx_entry),mainw->string_constants[LIVES_STRING_CONSTANT_NONE]);
-  lives_entry_set_editable (LIVES_ENTRY (fx_entry), FALSE);
+  lives_entry_set_text(LIVES_ENTRY(fx_entry),mainw->string_constants[LIVES_STRING_CONSTANT_NONE]);
+  lives_entry_set_editable(LIVES_ENTRY(fx_entry), FALSE);
 
-  hbox=lives_hbox_new (FALSE, 0);
+  hbox=lives_hbox_new(FALSE, 0);
 
-  hbox2=lives_hbox_new (FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (hbox), hbox2, FALSE, FALSE, 0);
+  hbox2=lives_hbox_new(FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(hbox), hbox2, FALSE, FALSE, 0);
 
   conxwp->ccombo[idx]=lives_standard_combo_new("",FALSE,NULL,LIVES_BOX(hbox2),NULL);
-  g_object_set_data(G_OBJECT(conxwp->ccombo[idx]),"idx",GINT_TO_POINTER(-1));
+  lives_widget_object_set_data(LIVES_WIDGET_OBJECT(conxwp->ccombo[idx]),"idx",LIVES_INT_TO_POINTER(-1));
   lives_widget_set_sensitive(conxwp->ccombo[idx],FALSE);
 
 
-  lives_table_attach (LIVES_TABLE (conxwp->tablec), hbox, 3, 4, row, row+1,
-		      (LiVESAttachOptions) (LIVES_FILL|LIVES_EXPAND),
-		      (LiVESAttachOptions) (0), 0, 0);
+  lives_table_attach(LIVES_TABLE(conxwp->tablec), hbox, 3, 4, row, row+1,
+                     (LiVESAttachOptions)(LIVES_FILL|LIVES_EXPAND),
+                     (LiVESAttachOptions)(0), 0, 0);
+
 
+  lives_signal_connect(LIVES_GUI_OBJECT(conxwp->cfxcombo[idx]), LIVES_WIDGET_CHANGED_SIGNAL,
+                       LIVES_GUI_CALLBACK(dfxc_changed),(livespointer)conxwp);
 
-  lives_signal_connect(LIVES_GUI_OBJECT (conxwp->cfxcombo[idx]), LIVES_WIDGET_CHANGED_EVENT,
-		   LIVES_GUI_CALLBACK (dfxc_changed),(gpointer)conxwp);
 
+  conxwp->dpc_func[idx]=lives_signal_connect(LIVES_GUI_OBJECT(conxwp->ccombo[idx]), LIVES_WIDGET_CHANGED_SIGNAL,
+                        LIVES_GUI_CALLBACK(dpc_changed),(livespointer)conxwp);
 
-  conxwp->dpc_func[idx]=lives_signal_connect(LIVES_GUI_OBJECT (conxwp->ccombo[idx]), LIVES_WIDGET_CHANGED_EVENT,
-					 LIVES_GUI_CALLBACK (dpc_changed),(gpointer)conxwp);
 
+  lives_widget_object_set_data(LIVES_WIDGET_OBJECT(conxwp->ccombo[idx]),"cidx",LIVES_INT_TO_POINTER(cidx));
 
-  g_object_set_data(G_OBJECT(conxwp->ccombo[idx]),"cidx",GINT_TO_POINTER(cidx));
-  
 
 
 }
@@ -4074,44 +4027,44 @@
 static void ptable_row_add_standard_widgets(lives_conx_w *conxwp, int idx) {
   LiVESWidget *hbox;
 
-  hbox=lives_hbox_new (FALSE, 0);
+  hbox=lives_hbox_new(FALSE, 0);
 
-  lives_table_attach (LIVES_TABLE (conxwp->tablep), hbox, 1, 2, conxwp->trowsp-1, conxwp->trowsp,
-		      (LiVESAttachOptions) (LIVES_FILL|LIVES_EXPAND),
-		      (LiVESAttachOptions) (0), 0, 0);
+  lives_table_attach(LIVES_TABLE(conxwp->tablep), hbox, 1, 2, conxwp->trowsp-1, conxwp->trowsp,
+                     (LiVESAttachOptions)(LIVES_FILL|LIVES_EXPAND),
+                     (LiVESAttachOptions)(0), 0, 0);
 
 
   conxwp->clabel[idx]=lives_standard_label_new(lctext);
-  lives_box_pack_start (LIVES_BOX (hbox), conxwp->clabel[idx], FALSE, FALSE, widget_opts.packing_width);
+  lives_box_pack_start(LIVES_BOX(hbox), conxwp->clabel[idx], FALSE, FALSE, widget_opts.packing_width);
 
 
   conxwp->add_button[idx]=lives_button_new_from_stock(LIVES_STOCK_ADD);
   lives_widget_set_tooltip_text(conxwp->add_button[idx],_("Add another connection for this output parameter"));
-      
 
-  lives_table_attach (LIVES_TABLE (conxwp->tablep), conxwp->add_button[idx], 6, 7, conxwp->trowsp-1, conxwp->trowsp,
-		      (LiVESAttachOptions) (0),
-		      (LiVESAttachOptions) (0), 0, 0);
-  
-  lives_signal_connect (LIVES_GUI_OBJECT (conxwp->add_button[idx]), LIVES_WIDGET_CLICKED_EVENT,
-		    LIVES_GUI_CALLBACK (padd_clicked),
-		    (gpointer)conxwp);
+
+  lives_table_attach(LIVES_TABLE(conxwp->tablep), conxwp->add_button[idx], 6, 7, conxwp->trowsp-1, conxwp->trowsp,
+                     (LiVESAttachOptions)(0),
+                     (LiVESAttachOptions)(0), 0, 0);
+
+  lives_signal_connect(LIVES_GUI_OBJECT(conxwp->add_button[idx]), LIVES_WIDGET_CLICKED_SIGNAL,
+                       LIVES_GUI_CALLBACK(padd_clicked),
+                       (livespointer)conxwp);
 
 
   conxwp->del_button[idx]=lives_button_new_from_stock(LIVES_STOCK_REMOVE);
   lives_widget_set_tooltip_text(conxwp->del_button[idx],_("Delete this connection"));
 
-  hbox=lives_hbox_new (FALSE, 0);
+  hbox=lives_hbox_new(FALSE, 0);
 
-  lives_box_pack_start (LIVES_BOX (hbox), conxwp->del_button[idx], FALSE, FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(hbox), conxwp->del_button[idx], FALSE, FALSE, 0);
 
-  lives_table_attach (LIVES_TABLE (conxwp->tablep), hbox, 5, 6, conxwp->trowsp-1, conxwp->trowsp,
-		      (LiVESAttachOptions) (0),
-		      (LiVESAttachOptions) (0), 0, 0);
+  lives_table_attach(LIVES_TABLE(conxwp->tablep), hbox, 5, 6, conxwp->trowsp-1, conxwp->trowsp,
+                     (LiVESAttachOptions)(0),
+                     (LiVESAttachOptions)(0), 0, 0);
 
-  lives_signal_connect (LIVES_GUI_OBJECT (conxwp->del_button[idx]), LIVES_WIDGET_CLICKED_EVENT,
-		    LIVES_GUI_CALLBACK (pdel_clicked),
-		    (gpointer)conxwp);
+  lives_signal_connect(LIVES_GUI_OBJECT(conxwp->del_button[idx]), LIVES_WIDGET_CLICKED_SIGNAL,
+                       LIVES_GUI_CALLBACK(pdel_clicked),
+                       (livespointer)conxwp);
 
   lives_widget_set_sensitive(conxwp->del_button[idx], FALSE);
 
@@ -4123,44 +4076,44 @@
 static void ctable_row_add_standard_widgets(lives_conx_w *conxwp, int idx) {
   LiVESWidget *hbox;
 
-  hbox=lives_hbox_new (FALSE, 0);
+  hbox=lives_hbox_new(FALSE, 0);
 
-  lives_table_attach (LIVES_TABLE (conxwp->tablec), hbox, 1, 2, conxwp->trowsc-1, conxwp->trowsc,
-		      (LiVESAttachOptions) (LIVES_FILL|LIVES_EXPAND),
-		      (LiVESAttachOptions) (0), 0, 0);
+  lives_table_attach(LIVES_TABLE(conxwp->tablec), hbox, 1, 2, conxwp->trowsc-1, conxwp->trowsc,
+                     (LiVESAttachOptions)(LIVES_FILL|LIVES_EXPAND),
+                     (LiVESAttachOptions)(0), 0, 0);
 
 
   conxwp->clabel[idx]=lives_standard_label_new(lctext);
-  lives_box_pack_start (LIVES_BOX (hbox), conxwp->clabel[idx], FALSE, FALSE, widget_opts.packing_width);
+  lives_box_pack_start(LIVES_BOX(hbox), conxwp->clabel[idx], FALSE, FALSE, widget_opts.packing_width);
 
 
   conxwp->add_button[idx]=lives_button_new_from_stock(LIVES_STOCK_ADD);
   lives_widget_set_tooltip_text(conxwp->add_button[idx],_("Add another connection for this output channel"));
-      
 
-  lives_table_attach (LIVES_TABLE (conxwp->tablec), conxwp->add_button[idx], 5, 6, conxwp->trowsc-1, conxwp->trowsc,
-		      (LiVESAttachOptions) (0),
-		      (LiVESAttachOptions) (0), 0, 0);
-  
-  lives_signal_connect (LIVES_GUI_OBJECT (conxwp->add_button[idx]), LIVES_WIDGET_CLICKED_EVENT,
-		    LIVES_GUI_CALLBACK (cadd_clicked),
-		    (gpointer)conxwp);
+
+  lives_table_attach(LIVES_TABLE(conxwp->tablec), conxwp->add_button[idx], 5, 6, conxwp->trowsc-1, conxwp->trowsc,
+                     (LiVESAttachOptions)(0),
+                     (LiVESAttachOptions)(0), 0, 0);
+
+  lives_signal_connect(LIVES_GUI_OBJECT(conxwp->add_button[idx]), LIVES_WIDGET_CLICKED_SIGNAL,
+                       LIVES_GUI_CALLBACK(cadd_clicked),
+                       (livespointer)conxwp);
 
 
   conxwp->del_button[idx]=lives_button_new_from_stock(LIVES_STOCK_REMOVE);
   lives_widget_set_tooltip_text(conxwp->del_button[idx],_("Delete this connection"));
 
-  hbox=lives_hbox_new (FALSE, 0);
+  hbox=lives_hbox_new(FALSE, 0);
 
-  lives_box_pack_start (LIVES_BOX (hbox), conxwp->del_button[idx], FALSE, FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(hbox), conxwp->del_button[idx], FALSE, FALSE, 0);
 
-  lives_table_attach (LIVES_TABLE (conxwp->tablec), hbox, 4, 5, conxwp->trowsc-1, conxwp->trowsc,
-		      (LiVESAttachOptions) (0),
-		      (LiVESAttachOptions) (0), 0, 0);
+  lives_table_attach(LIVES_TABLE(conxwp->tablec), hbox, 4, 5, conxwp->trowsc-1, conxwp->trowsc,
+                     (LiVESAttachOptions)(0),
+                     (LiVESAttachOptions)(0), 0, 0);
 
-  lives_signal_connect (LIVES_GUI_OBJECT (conxwp->del_button[idx]), LIVES_WIDGET_CLICKED_EVENT,
-		    LIVES_GUI_CALLBACK (cdel_clicked),
-		    (gpointer)conxwp);
+  lives_signal_connect(LIVES_GUI_OBJECT(conxwp->del_button[idx]), LIVES_WIDGET_CLICKED_SIGNAL,
+                       LIVES_GUI_CALLBACK(cdel_clicked),
+                       (livespointer)conxwp);
 
   lives_widget_set_sensitive(conxwp->del_button[idx], FALSE);
 
@@ -4177,9 +4130,9 @@
   LiVESWidget *hbox;
   LiVESWidget *scrolledwindow;
 
-  gchar *channame,*pname,*fname;
-  gchar *ptype,*range;
-  gchar *array_type,*text,*tmp;
+  char *channame,*pname,*fname;
+  char *ptype,*range;
+  char *array_type,*text,*tmp;
 
   boolean isfirst;
 
@@ -4191,13 +4144,13 @@
 
   register int i,j=0,x=0;
 
-  for (i=0;i<conxwp->num_alpha;i++) {
+  for (i=0; i<conxwp->num_alpha; i++) {
     nconns=cconx_get_nconns(conxwp->cconx,i);
     if (nconns==0) nconns=1;
     conxwp->dispc[i]=nconns;
   }
 
-  for (i=-EXTRA_PARAMS_OUT;i<conxwp->num_params-EXTRA_PARAMS_OUT;i++) {
+  for (i=-EXTRA_PARAMS_OUT; i<conxwp->num_params-EXTRA_PARAMS_OUT; i++) {
     nconns=pconx_get_nconns(conxwp->pconx,i);
     if (nconns==0) nconns=1;
     conxwp->dispp[i+EXTRA_PARAMS_OUT]=nconns;
@@ -4206,25 +4159,25 @@
   totchans=cconx_get_numcons(conxwp,FX_DATA_WILDCARD);
   totparams=pconx_get_numcons(conxwp,FX_DATA_WILDCARD);
 
-  conxwp->add_button=(LiVESWidget **)g_malloc((totchans+totparams)*sizeof(LiVESWidget *));
-  conxwp->del_button=(LiVESWidget **)g_malloc((totchans+totparams)*sizeof(LiVESWidget *));
-  conxwp->clabel=(LiVESWidget **)g_malloc((totchans+totparams)*sizeof(LiVESWidget *));
-  conxwp->pclabel=(LiVESWidget **)g_malloc((totchans+totparams)*sizeof(LiVESWidget *));
+  conxwp->add_button=(LiVESWidget **)lives_malloc((totchans+totparams)*sizeof(LiVESWidget *));
+  conxwp->del_button=(LiVESWidget **)lives_malloc((totchans+totparams)*sizeof(LiVESWidget *));
+  conxwp->clabel=(LiVESWidget **)lives_malloc((totchans+totparams)*sizeof(LiVESWidget *));
+  conxwp->pclabel=(LiVESWidget **)lives_malloc((totchans+totparams)*sizeof(LiVESWidget *));
 
   conxwp->cfxcombo=conxwp->ccombo=conxwp->pcombo=conxwp->pfxcombo=conxwp->acheck=NULL;
   conxwp->dpp_func=conxwp->dpc_func=conxwp->acheck_func=NULL;
 
-  conxwp->ikeys=(int *)g_malloc((totchans+totparams)*sizint);
-  conxwp->imodes=(int *)g_malloc((totchans+totparams)*sizint);
-  conxwp->idx=(int *)g_malloc((totchans+totparams)*sizint);
+  conxwp->ikeys=(int *)lives_malloc((totchans+totparams)*sizint);
+  conxwp->imodes=(int *)lives_malloc((totchans+totparams)*sizint);
+  conxwp->idx=(int *)lives_malloc((totchans+totparams)*sizint);
 
-  for (i=0;i<totchans+totparams;i++) conxwp->ikeys[i]=conxwp->imodes[i]=conxwp->idx[i]=0;
+  for (i=0; i<totchans+totparams; i++) conxwp->ikeys[i]=conxwp->imodes[i]=conxwp->idx[i]=0;
 
-  lctext=g_strdup(_("Connected to -->"));
+  lctext=lives_strdup(_("Connected to -->"));
 
-  top_vbox=lives_vbox_new (FALSE, 0);
+  top_vbox=lives_vbox_new(FALSE, 0);
 
-  scrolledwindow = lives_standard_scrolled_window_new (-1,-1,top_vbox);
+  scrolledwindow = lives_standard_scrolled_window_new(-1,-1,top_vbox);
 
   conxwp->trowsc=conxwp->trowsp=0;
 
@@ -4234,30 +4187,30 @@
 
     weed_plant_t **ochans=weed_get_plantptr_array(conxwp->filter,"out_channel_templates",&error);
 
-    conxwp->dpc_func=(gulong *)g_malloc(totchans*sizeof(gulong));
+    conxwp->dpc_func=(ulong *)lives_malloc(totchans*sizeof(ulong));
 
-    conxwp->cfxcombo=(LiVESWidget **)g_malloc(totchans*sizeof(LiVESWidget *));
+    conxwp->cfxcombo=(LiVESWidget **)lives_malloc(totchans*sizeof(LiVESWidget *));
 
-    conxwp->ccombo=(LiVESWidget **)g_malloc(totchans*sizeof(LiVESWidget *));
+    conxwp->ccombo=(LiVESWidget **)lives_malloc(totchans*sizeof(LiVESWidget *));
 
-    label=lives_standard_label_new((tmp=g_strdup_printf(_("%s - Alpha Channel Connections"),fname)));
-    lives_box_pack_start (LIVES_BOX (top_vbox), label, FALSE, FALSE, widget_opts.packing_height);
+    label=lives_standard_label_new((tmp=lives_strdup_printf(_("%s - Alpha Channel Connections"),fname)));
+    lives_box_pack_start(LIVES_BOX(top_vbox), label, FALSE, FALSE, widget_opts.packing_height);
 
     conxwp->tablec=lives_table_new(0,6,FALSE);
     lives_table_set_row_spacings(LIVES_TABLE(conxwp->tablec),widget_opts.packing_height);
     lives_table_set_col_spacings(LIVES_TABLE(conxwp->tablec),widget_opts.packing_width);
-    lives_box_pack_start (LIVES_BOX (top_vbox), conxwp->tablec, FALSE, FALSE, widget_opts.packing_height);
+    lives_box_pack_start(LIVES_BOX(top_vbox), conxwp->tablec, FALSE, FALSE, widget_opts.packing_height);
 
     conxwp->trowsc=1;
 
     cmodel=inparam_fx_model(TRUE,conxwp->okey);
 
-    for (i=0;i<conxwp->num_alpha;i++) {
+    for (i=0; i<conxwp->num_alpha; i++) {
       chan=ochans[j++];
 
       if (!has_alpha_palette(chan)) {
-	i--;
-	continue;
+        i--;
+        continue;
       }
 
       lives_table_resize(LIVES_TABLE(conxwp->tablec),++conxwp->trowsc,6);
@@ -4268,32 +4221,32 @@
 
       do {
 
-	ctable_row_add_variable_widgets(conxwp,x,conxwp->trowsc-1,i);
+        ctable_row_add_variable_widgets(conxwp,x,conxwp->trowsc-1,i);
 
-	ctable_row_add_standard_widgets(conxwp,x);
+        ctable_row_add_standard_widgets(conxwp,x);
 
-	if (isfirst) {
-	  channame=weed_get_string_value(chan,"name",&error);
-	  lives_label_set_text(LIVES_LABEL(conxwp->pclabel[x]),channame);
-	  weed_free(channame);
-	  isfirst=FALSE;
-	}
-
-	x++;
-
-	if (nconns>1) {
-	  conxwp->trowsc++;
-	}
+        if (isfirst) {
+          channame=weed_get_string_value(chan,"name",&error);
+          lives_label_set_text(LIVES_LABEL(conxwp->pclabel[x]),channame);
+          lives_free(channame);
+          isfirst=FALSE;
+        }
+
+        x++;
+
+        if (nconns>1) {
+          conxwp->trowsc++;
+        }
 
       } while (--nconns>0);
     }
 
-    weed_free(ochans);
+    lives_free(ochans);
 
   }
 
   if (conxwp->num_alpha>0&&conxwp->num_params>0) {
-    add_hsep_to_box (LIVES_BOX (top_vbox));
+    add_hsep_to_box(LIVES_BOX(top_vbox));
   }
 
 
@@ -4302,45 +4255,45 @@
 
     pmodel=inparam_fx_model(FALSE,conxwp->okey);
 
-    if (weed_plant_has_leaf(conxwp->filter,"out_parameter_templates")) 
+    if (weed_plant_has_leaf(conxwp->filter,"out_parameter_templates"))
       oparams=weed_get_plantptr_array(conxwp->filter,"out_parameter_templates",&error);
 
-    conxwp->pfxcombo=(LiVESWidget **)g_malloc(totparams*sizeof(LiVESWidget *));
-    conxwp->pcombo=(LiVESWidget **)g_malloc(totparams*sizeof(LiVESWidget *));
+    conxwp->pfxcombo=(LiVESWidget **)lives_malloc(totparams*sizeof(LiVESWidget *));
+    conxwp->pcombo=(LiVESWidget **)lives_malloc(totparams*sizeof(LiVESWidget *));
 
-    conxwp->dpp_func=(gulong *)g_malloc(totparams*sizeof(gulong));
-    conxwp->acheck_func=(gulong *)g_malloc(totparams*sizeof(gulong));
+    conxwp->dpp_func=(ulong *)lives_malloc(totparams*sizeof(ulong));
+    conxwp->acheck_func=(ulong *)lives_malloc(totparams*sizeof(ulong));
 
-    conxwp->acheck=(LiVESWidget **)g_malloc(totparams*sizeof(LiVESWidget *));
+    conxwp->acheck=(LiVESWidget **)lives_malloc(totparams*sizeof(LiVESWidget *));
 
-    label=lives_standard_label_new((tmp=g_strdup_printf(_("%s - Parameter Data Connections"),fname)));
-    g_free(tmp);
+    label=lives_standard_label_new((tmp=lives_strdup_printf(_("%s - Parameter Data Connections"),fname)));
+    lives_free(tmp);
 
-    lives_box_pack_start (LIVES_BOX (top_vbox), label, FALSE, FALSE, widget_opts.packing_height);
+    lives_box_pack_start(LIVES_BOX(top_vbox), label, FALSE, FALSE, widget_opts.packing_height);
 
 
     conxwp->tablep=lives_table_new(1,7,FALSE);
     lives_table_set_row_spacings(LIVES_TABLE(conxwp->tablep),widget_opts.packing_height);
     lives_table_set_col_spacings(LIVES_TABLE(conxwp->tablep),widget_opts.packing_width);
-    lives_box_pack_start (LIVES_BOX (top_vbox), conxwp->tablep, FALSE, FALSE, widget_opts.packing_height);
+    lives_box_pack_start(LIVES_BOX(top_vbox), conxwp->tablep, FALSE, FALSE, widget_opts.packing_height);
 
     conxwp->trowsp=1;
     x=0;
 
-    hbox=lives_hbox_new (FALSE, 0);
+    hbox=lives_hbox_new(FALSE, 0);
 
-    lives_table_attach (LIVES_TABLE (conxwp->tablep), hbox, 4, 5, 0, 1,
-			(LiVESAttachOptions) (LIVES_FILL|LIVES_EXPAND),
-			(LiVESAttachOptions) (0), 0, 0);
+    lives_table_attach(LIVES_TABLE(conxwp->tablep), hbox, 4, 5, 0, 1,
+                       (LiVESAttachOptions)(LIVES_FILL|LIVES_EXPAND),
+                       (LiVESAttachOptions)(0), 0, 0);
 
     conxwp->allcheckc=lives_standard_check_button_new(_("Autoscale All"),FALSE,LIVES_BOX(hbox),NULL);
     conxwp->allcheck_label=widget_opts.last_label;
 
     lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(conxwp->allcheckc),TRUE);
 
-    lives_signal_connect_after (LIVES_GUI_OBJECT (conxwp->allcheckc), LIVES_WIDGET_TOGGLED_EVENT,
-			    LIVES_GUI_CALLBACK (on_allcheck_toggled),
-			    (gpointer)conxwp);
+    lives_signal_connect_after(LIVES_GUI_OBJECT(conxwp->allcheckc), LIVES_WIDGET_TOGGLED_SIGNAL,
+                               LIVES_GUI_CALLBACK(on_allcheck_toggled),
+                               (livespointer)conxwp);
 
 
     if (EXTRA_PARAMS_OUT>0) {
@@ -4352,31 +4305,33 @@
       isfirst=TRUE;
 
       do {
-	ptable_row_add_variable_widgets(conxwp,x,conxwp->trowsp-1,-EXTRA_PARAMS_OUT);
+        ptable_row_add_variable_widgets(conxwp,x,conxwp->trowsp-1,-EXTRA_PARAMS_OUT);
 
-	ptable_row_add_standard_widgets(conxwp,x+totchans);
+        ptable_row_add_standard_widgets(conxwp,x+totchans);
 
-	if (isfirst) {
-	  /* TRANSLATORS - as in "Effect ACTIVATED" */
-	  pname=g_strdup(_("ACTIVATED"));
-	  ptype=weed_seed_type_to_text(WEED_SEED_BOOLEAN);
+        if (isfirst) {
+          /* TRANSLATORS - as in "Effect ACTIVATED" */
+          pname=lives_strdup(_("ACTIVATED"));
+          ptype=weed_seed_type_to_text(WEED_SEED_BOOLEAN);
+
+          text=lives_strdup_printf("%s (%s)",pname,ptype);
+          lives_label_set_text(LIVES_LABEL(conxwp->pclabel[x+totchans]),text);
+          lives_free(text);
+          lives_free(pname);
+          lives_free(ptype);
 
-	  text=g_strdup_printf("%s (%s)",pname,ptype);
-	  lives_label_set_text(LIVES_LABEL(conxwp->pclabel[x+totchans]),text);
-	  g_free(text); g_free(pname); g_free(ptype);
-
-	  isfirst=FALSE;
-	}
+          isfirst=FALSE;
+        }
 
-	x++;
+        x++;
 
-	if (nconns>1) {
-	  conxwp->trowsp++;
-	}
+        if (nconns>1) {
+          conxwp->trowsp++;
+        }
       } while (--nconns>0);
     }
 
-    for (i=0;i<conxwp->num_params-EXTRA_PARAMS_OUT;i++) {
+    for (i=0; i<conxwp->num_params-EXTRA_PARAMS_OUT; i++) {
 
       lives_table_resize(LIVES_TABLE(conxwp->tablep),++conxwp->trowsp,7);
 
@@ -4385,84 +4340,83 @@
       isfirst=TRUE;
 
       do {
-	ptable_row_add_variable_widgets(conxwp,x,conxwp->trowsp-1,i);
+        ptable_row_add_variable_widgets(conxwp,x,conxwp->trowsp-1,i);
+
+        ptable_row_add_standard_widgets(conxwp,x+totchans);
+
+        if (isfirst) {
+
+          param=oparams[i];
+
+          pname=weed_get_string_value(param,"name",&error);
+
+          ptype=weed_seed_type_to_text((stype=weed_leaf_seed_type(param,"default")));
 
-	ptable_row_add_standard_widgets(conxwp,x+totchans);
+          pflags=weed_get_int_value(param,"flags",&error);
 
-	if (isfirst) {
+          if (pflags&WEED_PARAMETER_VARIABLE_ELEMENTS) array_type=lives_strdup("[]");
+          else if ((defelems=weed_leaf_num_elements(param,"default"))>1) array_type=lives_strdup_printf("[%d]",defelems);
+          else array_type=lives_strdup("");
 
-	  param=oparams[i];
+          if (weed_plant_has_leaf(param,"max")&&weed_plant_has_leaf(param,"min")) {
+            if (stype==WEED_SEED_INT) {
+              range=lives_strdup_printf("Range: %d to %d",weed_get_int_value(param,"min",&error),weed_get_int_value(param,"max",&error));
+            } else if (stype==WEED_SEED_DOUBLE) {
+              range=lives_strdup_printf("Range: %f to %f",weed_get_double_value(param,"min",&error),weed_get_double_value(param,"max",&error));
+            } else range=lives_strdup("");
+          } else range=lives_strdup("");
 
-	  pname=weed_get_string_value(param,"name",&error);
-
-	  ptype=weed_seed_type_to_text((stype=weed_leaf_seed_type(param,"default")));
-
-	  pflags=weed_get_int_value(param,"flags",&error);
-
-	  if (pflags&WEED_PARAMETER_VARIABLE_ELEMENTS) array_type=g_strdup("[]");
-	  else if ((defelems=weed_leaf_num_elements(param,"default"))>1) array_type=g_strdup_printf("[%d]",defelems);
-	  else array_type=g_strdup("");
-
-	  if (weed_plant_has_leaf(param,"max")&&weed_plant_has_leaf(param,"min")) {
-	    if (stype==WEED_SEED_INT) {
-	      range=g_strdup_printf("Range: %d to %d",weed_get_int_value(param,"min",&error),weed_get_int_value(param,"max",&error));
-	    }
-	    else if (stype==WEED_SEED_DOUBLE) {
-	      range=g_strdup_printf("Range: %f to %f",weed_get_double_value(param,"min",&error),weed_get_double_value(param,"max",&error));
-	    }
-	    else range=g_strdup("");
-	  }
-	  else range=g_strdup("");
-	
-	  text=g_strdup_printf("%s (%s%s) %s",pname,ptype,array_type,range);
-	  lives_label_set_text(LIVES_LABEL(conxwp->pclabel[x+totchans]),text);
-	  g_free(text); g_free(pname); g_free(ptype);
-
-	  isfirst=FALSE;
-	}
-
-	x++;
-      
-	if (nconns>1) {
-	  conxwp->trowsp++;
-	}
+          text=lives_strdup_printf("%s (%s%s) %s",pname,ptype,array_type,range);
+          lives_label_set_text(LIVES_LABEL(conxwp->pclabel[x+totchans]),text);
+          lives_free(text);
+          lives_free(pname);
+          lives_free(ptype);
+
+          isfirst=FALSE;
+        }
+
+        x++;
+
+        if (nconns>1) {
+          conxwp->trowsp++;
+        }
       } while (--nconns>0);
     }
 
-    weed_free(oparams);
+    lives_free(oparams);
 
   }
 
-  weed_free(fname);
+  lives_free(fname);
 
   return scrolledwindow;
 }
 
 
-static void conxw_cancel_clicked(LiVESWidget *button, gpointer user_data) {
+static void conxw_cancel_clicked(LiVESWidget *button, livespointer user_data) {
   lives_conx_w *conxwp=(lives_conx_w *)user_data;
 
-  if (conxwp->pclabel!=NULL) g_free(conxwp->pclabel);
-  if (conxwp->clabel!=NULL) g_free(conxwp->clabel);
-  if (conxwp->cfxcombo!=NULL) g_free(conxwp->cfxcombo);
-  if (conxwp->ccombo!=NULL) g_free(conxwp->ccombo);
-  if (conxwp->pfxcombo!=NULL) g_free(conxwp->pfxcombo);
-  if (conxwp->pcombo!=NULL) g_free(conxwp->pcombo);
-  if (conxwp->acheck!=NULL) g_free(conxwp->acheck);
-  if (conxwp->add_button!=NULL) g_free(conxwp->add_button);
-  if (conxwp->del_button!=NULL) g_free(conxwp->del_button);
-  if (conxwp->dpp_func!=NULL) g_free(conxwp->dpp_func);
-  if (conxwp->dpc_func!=NULL) g_free(conxwp->dpc_func);
-  if (conxwp->acheck_func!=NULL) g_free(conxwp->acheck_func);
-
-  if (conxwp->dispp!=NULL) g_free(conxwp->dispp);
-  if (conxwp->dispc!=NULL) g_free(conxwp->dispc);
-
-  g_free(conxwp->ikeys);
-  g_free(conxwp->imodes);
-  g_free(conxwp->idx);
+  if (conxwp->pclabel!=NULL) lives_free(conxwp->pclabel);
+  if (conxwp->clabel!=NULL) lives_free(conxwp->clabel);
+  if (conxwp->cfxcombo!=NULL) lives_free(conxwp->cfxcombo);
+  if (conxwp->ccombo!=NULL) lives_free(conxwp->ccombo);
+  if (conxwp->pfxcombo!=NULL) lives_free(conxwp->pfxcombo);
+  if (conxwp->pcombo!=NULL) lives_free(conxwp->pcombo);
+  if (conxwp->acheck!=NULL) lives_free(conxwp->acheck);
+  if (conxwp->add_button!=NULL) lives_free(conxwp->add_button);
+  if (conxwp->del_button!=NULL) lives_free(conxwp->del_button);
+  if (conxwp->dpp_func!=NULL) lives_free(conxwp->dpp_func);
+  if (conxwp->dpc_func!=NULL) lives_free(conxwp->dpc_func);
+  if (conxwp->acheck_func!=NULL) lives_free(conxwp->acheck_func);
+
+  if (conxwp->dispp!=NULL) lives_free(conxwp->dispp);
+  if (conxwp->dispc!=NULL) lives_free(conxwp->dispc);
+
+  lives_free(conxwp->ikeys);
+  lives_free(conxwp->imodes);
+  lives_free(conxwp->idx);
 
-  g_free(lctext);
+  lives_free(lctext);
 
   pconx_delete_all();
   cconx_delete_all();
@@ -4478,7 +4432,7 @@
 
 
 
-static void conxw_ok_clicked(LiVESWidget *button, gpointer user_data) {
+static void conxw_ok_clicked(LiVESWidget *button, livespointer user_data) {
   lives_cconnect_t *cconx_bak=mainw->cconx;
   lives_pconnect_t *pconx_bak=mainw->pconx;
 
@@ -4507,14 +4461,14 @@
   do {
     if (lives_tree_model_iter_children(model,&iter,&piter)) {
       do {
-	lives_tree_model_get(model,&iter,KEYVAL_COLUMN,&key,MODEVAL_COLUMN,&mode,-1);
-	if (key==xkey+1&&mode==xmode) goto iter_found;
+        lives_tree_model_get(model,&iter,KEYVAL_COLUMN,&key,MODEVAL_COLUMN,&mode,-1);
+        if (key==xkey+1&&mode==xmode) goto iter_found;
       } while (lives_tree_model_iter_next(model,&iter));
     }
   } while (lives_tree_model_iter_next(model,&piter));
 
 
- iter_found:
+iter_found:
   lives_combo_set_active_iter(combo,&iter);
 
 }
@@ -4549,22 +4503,22 @@
 
   ochans=weed_get_plantptr_array(ofilter,"out_channel_templates",&error);
 
-  for (i=0;i<cconx->nchans;i++) {
+  for (i=0; i<cconx->nchans; i++) {
     // find the row
     l=0;
 
     // total out channel connections (display order) up to here
-    for (k=0;k<i;k++) {
+    for (k=0; k<i; k++) {
       chan=ochans[j++];
       if (!has_alpha_palette(chan)) {
-	k--;
-	continue;
+        k--;
+        continue;
       }
       l+=cconx_get_numcons(conxwp,k);
     }
 
     cidx=cconx->chans[i];
-    for (j=posn;j<posn+cconx->nconns[i];j++) {
+    for (j=posn; j<posn+cconx->nconns[i]; j++) {
       ikey=cconx->ikey[j];
       imode=cconx->imode[j];
 
@@ -4581,31 +4535,31 @@
       filter=rte_keymode_get_filter(ikey+1,imode);
       ichans=weed_get_plantptr_array(filter,"in_channel_templates",&error);
       nichans=weed_leaf_num_elements(filter,"in_channel_templates");
-	
+
       cidx=0;
 
       // find combo list index for ichan
-      for (k=0;k<nichans;k++) {
-	chan=ichans[k];
-	if (!has_alpha_palette(chan)) continue;
-	if (k==icnum) break;
-	cidx++;
+      for (k=0; k<nichans; k++) {
+        chan=ichans[k];
+        if (!has_alpha_palette(chan)) continue;
+        if (k==icnum) break;
+        cidx++;
       }
-	      
-      weed_free(ichans);
 
-      g_object_set_data(G_OBJECT(ccombo),"setup",GINT_TO_POINTER(TRUE));
+      lives_free(ichans);
+
+      lives_widget_object_set_data(LIVES_WIDGET_OBJECT(ccombo),"setup",LIVES_INT_TO_POINTER(TRUE));
 
       lives_signal_handler_block(ccombo,conxwp->dpc_func[l]);
-      g_object_set_data(G_OBJECT(ccombo),"idx",GINT_TO_POINTER(cidx));
+      lives_widget_object_set_data(LIVES_WIDGET_OBJECT(ccombo),"idx",LIVES_INT_TO_POINTER(cidx));
       lives_combo_set_active_index(LIVES_COMBO(ccombo),cidx);
       lives_signal_handler_unblock(ccombo,conxwp->dpc_func[l]);
-	      
+
       conxwp->ikeys[l]=ikey+1;
       conxwp->imodes[l]=imode;
       conxwp->idx[l]=icnum;
 
-      g_object_set_data(G_OBJECT(ccombo),"setup",GINT_TO_POINTER(FALSE));
+      lives_widget_object_set_data(LIVES_WIDGET_OBJECT(ccombo),"setup",LIVES_INT_TO_POINTER(FALSE));
       lives_widget_set_sensitive(conxwp->disconbutton,TRUE);
       lives_widget_set_sensitive(ccombo,TRUE);
 
@@ -4615,10 +4569,10 @@
     posn+=cconx->nconns[i];
   }
 
-  weed_free(ochans);
+  lives_free(ochans);
 
 
- show_ex_params:
+show_ex_params:
 
 
   if (pconx==NULL) goto show_ex_done;
@@ -4626,18 +4580,18 @@
 
   posn=0;
 
-  for (i=0;i<pconx->nparams;i++) {
+  for (i=0; i<pconx->nparams; i++) {
     pidx=pconx->params[i];
 
     // find the row
     l=0;
 
     // total out param connections (display order) up to here
-    for (k=-EXTRA_PARAMS_OUT;k<pidx;k++) {
+    for (k=-EXTRA_PARAMS_OUT; k<pidx; k++) {
       l+=pconx_get_numcons(conxwp,k);
     }
 
-    for (j=posn;j<posn+pconx->nconns[i];j++) {
+    for (j=posn; j<posn+pconx->nconns[i]; j++) {
       ikey=pconx->ikey[j];
       imode=pconx->imode[j];
 
@@ -4653,60 +4607,59 @@
 
       if (acheck!=NULL) {
 
-	lives_widget_set_sensitive(acheck,TRUE);
-	
-	lives_signal_handler_block(acheck,conxwp->acheck_func[l]);
-	lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(acheck),pconx->autoscale[j]);
-	lives_signal_handler_unblock(acheck,conxwp->acheck_func[l]);
+        lives_widget_set_sensitive(acheck,TRUE);
+
+        lives_signal_handler_block(acheck,conxwp->acheck_func[l]);
+        lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(acheck),pconx->autoscale[j]);
+        lives_signal_handler_unblock(acheck,conxwp->acheck_func[l]);
 
       }
 
       ipnum=pconx->ipnum[j];
-  
+
       if (ipnum==FX_DATA_PARAM_ACTIVE) {
-	pidx=FX_DATA_PARAM_ACTIVE;
-      }
-      else {
-	filter=rte_keymode_get_filter(ikey+1,imode);
-	iparams=weed_get_plantptr_array(filter,"in_parameter_templates",&error);
-	niparams=weed_leaf_num_elements(filter,"in_parameter_templates");
-	  
-	pidx=0;
-	  
-	// find combo list index for iparam
-	for (k=0;k<niparams;k++) {
-	  param=iparams[k];
-	  if (weed_plant_has_leaf(param,"host_internal_connection")) continue;
-	  if (k==ipnum) break;
-	  pidx++;
-	}
-	      
-	weed_free(iparams);
+        pidx=FX_DATA_PARAM_ACTIVE;
+      } else {
+        filter=rte_keymode_get_filter(ikey+1,imode);
+        iparams=weed_get_plantptr_array(filter,"in_parameter_templates",&error);
+        niparams=weed_leaf_num_elements(filter,"in_parameter_templates");
+
+        pidx=0;
+
+        // find combo list index for iparam
+        for (k=0; k<niparams; k++) {
+          param=iparams[k];
+          if (weed_plant_has_leaf(param,"host_internal_connection")) continue;
+          if (k==ipnum) break;
+          pidx++;
+        }
+
+        lives_free(iparams);
       }
 
-      g_object_set_data(G_OBJECT(pcombo),"setup",GINT_TO_POINTER(TRUE));
+      lives_widget_object_set_data(LIVES_WIDGET_OBJECT(pcombo),"setup",LIVES_INT_TO_POINTER(TRUE));
 
       conxwp->ikeys[totchans+l]=ikey+1;
       conxwp->imodes[totchans+l]=imode;
       conxwp->idx[totchans+l]=ipnum;
 
       //lives_signal_handler_block(pcombo,conxwp->dpp_func[pidx]);
-      g_object_set_data(G_OBJECT(pcombo),"idx",GINT_TO_POINTER(pidx+EXTRA_PARAMS_IN));
+      lives_widget_object_set_data(LIVES_WIDGET_OBJECT(pcombo),"idx",LIVES_INT_TO_POINTER(pidx+EXTRA_PARAMS_IN));
       lives_combo_set_active_index(LIVES_COMBO(pcombo),pidx+EXTRA_PARAMS_IN);
       //lives_signal_handler_unblock(pcombo,conxwp->dpp_func[pidx]);
 
-      g_object_set_data(G_OBJECT(pcombo),"setup",GINT_TO_POINTER(FALSE));
+      lives_widget_object_set_data(LIVES_WIDGET_OBJECT(pcombo),"setup",LIVES_INT_TO_POINTER(FALSE));
 
       lives_widget_set_sensitive(conxwp->disconbutton,TRUE);
       lives_widget_set_sensitive(pcombo,TRUE);
 
       l++;
     }
-      
+
     posn+=pconx->nconns[i];
   }
 
- show_ex_done:
+show_ex_done:
 
   return FALSE;
 }
@@ -4754,16 +4707,15 @@
 
   conxw.num_params+=EXTRA_PARAMS_OUT;
 
-  if (conxw.num_params>0) 
-    conxw.dispp=(int *)g_malloc(conxw.num_params*sizint);
+  if (conxw.num_params>0)
+    conxw.dispp=(int *)lives_malloc(conxw.num_params*sizint);
 
   conxw.ntabs=0;
 
   if (prefs->gui_monitor==0) {
     scr_width=mainw->scr_width;
     scr_height=mainw->scr_height;
-  }
-  else {
+  } else {
     scr_width=mainw->mgeom[prefs->gui_monitor-1].width;
     scr_height=mainw->mgeom[prefs->gui_monitor-1].height;
   }
@@ -4771,46 +4723,45 @@
   winsize_h=scr_width-200;
   winsize_v=scr_height-200;
 
-  conxw.conx_dialog=lives_standard_dialog_new(_("LiVES: - Parameter and Alpha Channel Connections"),FALSE);
-  lives_widget_set_size_request (conxw.conx_dialog, winsize_h, winsize_v);
+  conxw.conx_dialog=lives_standard_dialog_new(_("LiVES: - Parameter and Alpha Channel Connections"),FALSE,winsize_h,winsize_v);
 
-  accel_group = LIVES_ACCEL_GROUP(lives_accel_group_new ());
-  lives_window_add_accel_group (LIVES_WINDOW (conxw.conx_dialog), accel_group);
+  accel_group = LIVES_ACCEL_GROUP(lives_accel_group_new());
+  lives_window_add_accel_group(LIVES_WINDOW(conxw.conx_dialog), accel_group);
 
   abox = lives_dialog_get_action_area(LIVES_DIALOG(conxw.conx_dialog));
 
   if (conxw.num_alpha>0) {
-    conxw.dispc=(int *)g_malloc(conxw.num_alpha*sizint);
+    conxw.dispc=(int *)lives_malloc(conxw.num_alpha*sizint);
 
-    conxw.acbutton = lives_button_new_with_mnemonic (_("Auto Connect Channels"));
-    lives_box_pack_start (LIVES_BOX (abox), conxw.acbutton, FALSE, FALSE, widget_opts.packing_width);
+    conxw.acbutton = lives_button_new_with_mnemonic(_("Auto Connect Channels"));
+    lives_box_pack_start(LIVES_BOX(abox), conxw.acbutton, FALSE, FALSE, widget_opts.packing_width);
     lives_widget_set_sensitive(conxw.acbutton,FALSE);
 
-    lives_signal_connect (LIVES_GUI_OBJECT (conxw.acbutton), LIVES_WIDGET_CLICKED_EVENT,
-		      LIVES_GUI_CALLBACK (acbutton_clicked),
-		      (gpointer)&conxw);
+    lives_signal_connect(LIVES_GUI_OBJECT(conxw.acbutton), LIVES_WIDGET_CLICKED_SIGNAL,
+                         LIVES_GUI_CALLBACK(acbutton_clicked),
+                         (livespointer)&conxw);
 
 
   }
 
   if (conxw.num_params>EXTRA_PARAMS_OUT) {
-    conxw.apbutton = lives_button_new_with_mnemonic (_("Auto Connect Parameters"));
-    lives_box_pack_start (LIVES_BOX (abox), conxw.apbutton, FALSE, FALSE, widget_opts.packing_width);
+    conxw.apbutton = lives_button_new_with_mnemonic(_("Auto Connect Parameters"));
+    lives_box_pack_start(LIVES_BOX(abox), conxw.apbutton, FALSE, FALSE, widget_opts.packing_width);
     lives_widget_set_sensitive(conxw.apbutton,FALSE);
 
-    lives_signal_connect (LIVES_GUI_OBJECT (conxw.apbutton), LIVES_WIDGET_CLICKED_EVENT,
-		      LIVES_GUI_CALLBACK (apbutton_clicked),
-		      (gpointer)&conxw);
+    lives_signal_connect(LIVES_GUI_OBJECT(conxw.apbutton), LIVES_WIDGET_CLICKED_SIGNAL,
+                         LIVES_GUI_CALLBACK(apbutton_clicked),
+                         (livespointer)&conxw);
 
   }
 
-  conxw.disconbutton = lives_button_new_with_mnemonic (_("Disconnect All"));
-  lives_box_pack_start (LIVES_BOX (abox), conxw.disconbutton, FALSE, FALSE, widget_opts.packing_width);
+  conxw.disconbutton = lives_button_new_with_mnemonic(_("Disconnect All"));
+  lives_box_pack_start(LIVES_BOX(abox), conxw.disconbutton, FALSE, FALSE, widget_opts.packing_width);
   lives_widget_set_sensitive(conxw.disconbutton,FALSE);
 
-  lives_signal_connect (LIVES_GUI_OBJECT (conxw.disconbutton), LIVES_WIDGET_CLICKED_EVENT,
-		    LIVES_GUI_CALLBACK (disconbutton_clicked),
-		    (gpointer)&conxw);
+  lives_signal_connect(LIVES_GUI_OBJECT(conxw.disconbutton), LIVES_WIDGET_CLICKED_SIGNAL,
+                       LIVES_GUI_CALLBACK(disconbutton_clicked),
+                       (livespointer)&conxw);
 
   if (conxw.num_alpha>0||conxw.num_params>0) add_fill_to_box(LIVES_BOX(abox));
 
@@ -4820,7 +4771,7 @@
   show_existing(&conxw);
 
 
-  lives_box_pack_start (LIVES_BOX (cbox), scrolledwindow, TRUE, TRUE, 0);
+  lives_box_pack_start(LIVES_BOX(cbox), scrolledwindow, TRUE, TRUE, 0);
 
   if (conxw.num_params>EXTRA_PARAMS_OUT) {
     if (pconx_get_nconns(conxw.pconx,0)>0) lives_widget_set_sensitive(conxw.apbutton,TRUE);
@@ -4829,30 +4780,30 @@
     if (cconx_get_nconns(conxw.cconx,0)>0) lives_widget_set_sensitive(conxw.acbutton,TRUE);
   }
 
-  cancelbutton = lives_button_new_from_stock (LIVES_STOCK_CANCEL);
-  lives_dialog_add_action_widget (LIVES_DIALOG (conxw.conx_dialog), cancelbutton, LIVES_RESPONSE_CANCEL);
+  cancelbutton = lives_button_new_from_stock(LIVES_STOCK_CANCEL);
+  lives_dialog_add_action_widget(LIVES_DIALOG(conxw.conx_dialog), cancelbutton, LIVES_RESPONSE_CANCEL);
 
-  okbutton = lives_button_new_from_stock (LIVES_STOCK_OK);
-  lives_dialog_add_action_widget (LIVES_DIALOG (conxw.conx_dialog), okbutton, LIVES_RESPONSE_OK);
+  okbutton = lives_button_new_from_stock(LIVES_STOCK_OK);
+  lives_dialog_add_action_widget(LIVES_DIALOG(conxw.conx_dialog), okbutton, LIVES_RESPONSE_OK);
 
-  lives_widget_set_can_focus_and_default (okbutton);
+  lives_widget_set_can_focus_and_default(okbutton);
   lives_widget_grab_default(okbutton);
 
-  lives_widget_add_accelerator (cancelbutton, LIVES_WIDGET_CLICKED_EVENT, accel_group,
-				LIVES_KEY_Escape,  (LiVESXModifierType)0, (LiVESAccelFlags)0);
+  lives_widget_add_accelerator(cancelbutton, LIVES_WIDGET_CLICKED_SIGNAL, accel_group,
+                               LIVES_KEY_Escape, (LiVESXModifierType)0, (LiVESAccelFlags)0);
 
 
-  lives_signal_connect (LIVES_GUI_OBJECT (cancelbutton), LIVES_WIDGET_CLICKED_EVENT,
-		    LIVES_GUI_CALLBACK (conxw_cancel_clicked),
-		    (gpointer)&conxw);
+  lives_signal_connect(LIVES_GUI_OBJECT(cancelbutton), LIVES_WIDGET_CLICKED_SIGNAL,
+                       LIVES_GUI_CALLBACK(conxw_cancel_clicked),
+                       (livespointer)&conxw);
 
 
-  lives_signal_connect (LIVES_GUI_OBJECT (okbutton), LIVES_WIDGET_CLICKED_EVENT,
-		    LIVES_GUI_CALLBACK (conxw_ok_clicked),
-		    (gpointer)&conxw);
+  lives_signal_connect(LIVES_GUI_OBJECT(okbutton), LIVES_WIDGET_CLICKED_SIGNAL,
+                       LIVES_GUI_CALLBACK(conxw_ok_clicked),
+                       (livespointer)&conxw);
 
 
-  lives_widget_show_all (conxw.conx_dialog);
+  lives_widget_show_all(conxw.conx_dialog);
 
   if (conxw.num_params==EXTRA_PARAMS_OUT&&EXTRA_PARAMS_OUT>0) {
     lives_widget_hide(conxw.allcheckc);
@@ -4863,22 +4814,23 @@
 }
 
 
-static void do_chan_connected_error( lives_conx_w *conxwp, int key, int mode, int cnum) {
+static void do_chan_connected_error(lives_conx_w *conxwp, int key, int mode, int cnum) {
   weed_plant_t *filter,*ctmpl,**ochans;
   char *msg,*cname;
   int error;
   filter=rte_keymode_get_filter(key+1,mode);
   ochans=weed_get_plantptr_array(filter,"out_channel_templates",&error);
   ctmpl=ochans[cnum];
-  weed_free(ochans);
+  lives_free(ochans);
   cname=weed_get_string_value(ctmpl,"name",&error);
-  msg=g_strdup_printf(_("Input channel is already connected from (%d,%d) %s"),key+1,mode+1,cname);
+  msg=lives_strdup_printf(_("Input channel is already connected from (%d,%d) %s"),key+1,mode+1,cname);
   do_error_dialog_with_check_transient(msg,TRUE,0,LIVES_WINDOW(conxwp->conx_dialog));
-  g_free(msg); weed_free(cname);
+  lives_free(msg);
+  lives_free(cname);
 }
 
 
-static void do_param_connected_error( lives_conx_w *conxwp, int key, int mode, int pnum) {
+static void do_param_connected_error(lives_conx_w *conxwp, int key, int mode, int pnum) {
   weed_plant_t *filter,*ptmpl;
   char *msg,*pname;
   int error;
@@ -4886,15 +4838,15 @@
   if (pnum>=0) {
     ptmpl=weed_filter_out_paramtmpl(filter,pnum);
     pname=weed_get_string_value(ptmpl,"name",&error);
-  }
-  else pname=g_strdup(_("ACTIVATED"));
-  msg=g_strdup_printf(_("Input parameter is already connected from (%d,%d) %s"),key+1,mode+1,pname);
+  } else pname=lives_strdup(_("ACTIVATED"));
+  msg=lives_strdup_printf(_("Input parameter is already connected from (%d,%d) %s"),key+1,mode+1,pname);
   do_error_dialog_with_check_transient(msg,TRUE,0,LIVES_WINDOW(conxwp->conx_dialog));
-  g_free(msg); weed_free(pname);
+  lives_free(msg);
+  lives_free(pname);
 }
 
 
-static void do_param_incompatible_error( lives_conx_w *conxwp) {
+static void do_param_incompatible_error(lives_conx_w *conxwp) {
 
   do_error_dialog_with_check_transient(_("Input and output parameters are not compatible"),TRUE,0,LIVES_WINDOW(conxwp->conx_dialog));

LiVES-2.2.8.tar.bz2/src/effects-data.h -> LiVES-2.4.1.tar.bz2/src/effects-data.h Changed

@@ -44,7 +44,7 @@
   boolean *autoscale;
 
   lives_pconnect_t *next;
-  
+
 };
 
 
@@ -62,7 +62,7 @@
 boolean pconx_chain_data(int key, int mode);
 
 // return list of in keys/modes/params/autoscale
-gchar *pconx_list(int okey, int omode, int opnum);
+char *pconx_list(int okey, int omode, int opnum);
 
 // special version for compound fx internal connections
 boolean pconx_chain_data_internal(weed_plant_t *inst);
@@ -100,7 +100,7 @@
   int *icnum;
 
   lives_cconnect_t *next;
-  
+
 };
 
 
@@ -118,7 +118,7 @@
 boolean cconx_chain_data(int key, int mode);
 
 // return list of in chaannels/modes/params
-gchar *cconx_list(int okey, int omode, int ocnum);
+char *cconx_list(int okey, int omode, int ocnum);
 
 boolean cconx_chain_data_internal(weed_plant_t *ichan);
 
@@ -174,9 +174,9 @@
   int *imodes;
   int *idx;
 
-  gulong *dpc_func;
-  gulong *dpp_func;
-  gulong *acheck_func;
+  ulong *dpc_func;
+  ulong *dpp_func;
+  ulong *acheck_func;
 
 } lives_conx_w;
 
@@ -185,10 +185,12 @@
 
 LiVESWidget *make_datacon_window(int key, int mode);
 
-int pconx_check_connection(weed_plant_t *ofilter, int opnum, int ikey, int imode, int ipnum, boolean setup, weed_plant_t **iparam_ret, int *idx_ret,
-			   int *okey, int *omode, int *oopnum);
+int pconx_check_connection(weed_plant_t *ofilter, int opnum, int ikey, int imode, int ipnum, boolean setup, weed_plant_t **iparam_ret,
+                           int *idx_ret,
+                           int *okey, int *omode, int *oopnum);
 
-int cconx_check_connection(int ikey, int imode, int icnum, boolean setup, weed_plant_t **ichan_ret, int *idx_ret, int *okey, int *omode, int *ocnum);
+int cconx_check_connection(int ikey, int imode, int icnum, boolean setup, weed_plant_t **ichan_ret, int *idx_ret, int *okey, int *omode,
+                           int *ocnum);

LiVES-2.2.8.tar.bz2/src/effects-weed.c -> LiVES-2.4.1.tar.bz2/src/effects-weed.c Changed

@@ -21,7 +21,6 @@
 #include "../libweed/weed-host.h"
 #endif
 
-
 #ifdef __cplusplus
 #ifdef HAVE_OPENCV
 #include "opencv2/core/core.hpp"
@@ -43,6 +42,7 @@
 
 ////////////////////////////////////////////////////////////////////////
 
+
 struct _procvals {
   weed_plant_t *inst;
   weed_timecode_t tc;
@@ -54,7 +54,7 @@
 #define OIL_MEMCPY_MAX_BYTES 1024 // this can be tuned to provide optimal performance
 
 #ifdef ENABLE_OIL
-void *lives_memcpy  (void *dest, const void *src, size_t n) {
+livespointer lives_memcpy(livespointer dest, livesconstpointer src, size_t n) {
 #ifndef __cplusplus
   if (n>=32&&n<=OIL_MEMCPY_MAX_BYTES) {
     oil_memcpy((uint8_t *)dest,(const uint8_t *)src,n);
@@ -64,10 +64,12 @@
   return memcpy(dest,src,n);
 }
 #else
-void *lives_memcpy  (void *dest, const void *src, size_t n) {return memcpy(dest,src,n);}
+livespointer lives_memcpy(livespointer dest, livesconstpointer src, size_t n) {
+  return memcpy(dest,src,n);
+}
 #endif
 
-G_GNUC_MALLOC void * lives_malloc(size_t size) {
+G_GNUC_MALLOC livespointer _lives_malloc(size_t size) {
 #ifdef __cplusplus
 #ifdef HAVE_OPENCV
   return fastMalloc(size);
@@ -76,7 +78,25 @@
   return malloc(size);
 }
 
-void lives_free_normal(void *ptr) {
+
+livespointer  _lives_realloc(livespointer ptr, size_t new_size) {
+#ifdef __cplusplus
+#ifdef HAVE_OPENCV
+  livespointer nptr = _lives_malloc(new_size);
+  if (nptr) {
+    if (ptr) {
+      lives_memcpy(nptr,ptr,new_size);
+      _lives_free_normal(ptr);
+    }
+  }
+  return nptr;
+#endif
+#endif
+  return realloc(ptr,new_size);
+}
+
+
+void _lives_free_normal(livespointer ptr) {
 #ifdef __cplusplus
 #ifdef HAVE_OPENCV
   fastFree(ptr);
@@ -99,68 +119,68 @@
 }
 
 // special de-allocators which avoid free()ing mainw->do_not_free...this is necessary to "hack" into gdk-pixbuf
-// do not use this directly in code (use g_free() or weed_free() as appropriate)
-void lives_free_with_check(gpointer ptr) {
+// do not use this directly in code (use lives_free())
+void _lives_free_with_check(livespointer ptr) {
   if (ptr==mainw->do_not_free) return;
-  lives_free_normal(ptr);
+  _lives_free_normal(ptr);
 }
 
-void lives_free(gpointer ptr) {
+void _lives_free(livespointer ptr) {
   (*mainw->free_fn)(ptr);
 }
 
-void *lives_memset(void *s, int c, size_t n) {
+livespointer lives_memset(livespointer s, int c, size_t n) {
   return memset(s,c,n);
 }
 
-void *lives_calloc(size_t nmemb, size_t size) {
-  #ifdef GUI_GTK
-  #if GTK_CHECK_VERSION(2,24,0)
-  return g_try_malloc0_n(nmemb,size);
-  #endif
-  #endif
+#ifdef GUI_GTK
+livespointer lives_calloc(size_t nmemb, size_t size) {
+#if GTK_CHECK_VERSION(2,24,0)
+  return lives_try_malloc0_n(nmemb,size);
+#endif
   return calloc(nmemb,size);
 }
+#endif
 
 
 ////////////////////////////////////////////////////////////////////////////
 
-void weed_add_plant_flags (weed_plant_t *plant, int flags) {
+void weed_add_plant_flags(weed_plant_t *plant, int flags) {
   char **leaves=weed_plant_list_leaves(plant);
   int i,currflags;
 
-  for (i=0;leaves[i]!=NULL;i++) {
+  for (i=0; leaves[i]!=NULL; i++) {
     currflags=flags;
     if (flags&WEED_LEAF_READONLY_PLUGIN&&(!strncmp(leaves[i],"plugin_",7))) currflags^=WEED_LEAF_READONLY_PLUGIN;
     weed_leaf_set_flags(plant,leaves[i],weed_leaf_get_flags(plant,leaves[i])|currflags);
-    weed_free(leaves[i]);
+    lives_free(leaves[i]);
   }
-  weed_free(leaves);
+  lives_free(leaves);
 }
 
 
-static void weed_clear_plant_flags (weed_plant_t *plant, int flags) {
+static void weed_clear_plant_flags(weed_plant_t *plant, int flags) {
   char **leaves=weed_plant_list_leaves(plant);
   int i;
 
-  for (i=0;leaves[i]!=NULL;i++) {
+  for (i=0; leaves[i]!=NULL; i++) {
     weed_leaf_set_flags(plant,leaves[i],(weed_leaf_get_flags(plant,leaves[i])|flags)^flags);
-    weed_free(leaves[i]);
+    lives_free(leaves[i]);
   }
-  weed_free(leaves);
+  lives_free(leaves);
 }
 
 
-static int match_highest_version (int *hostv, int hostn, int *plugv, int plugn) {
+static int match_highest_version(int *hostv, int hostn, int *plugv, int plugn) {
   int hmatch=0;
   int i,j;
 
-  for (i=0;i<plugn;i++) {
-    for (j=0;j<hostn;j++) {
+  for (i=0; i<plugn; i++) {
+    for (j=0; j<hostn; j++) {
       if (hostv[j]>plugv[i]) break;
       if (hostv[j]==plugv[i]&&plugv[i]>hmatch) {
-	hmatch=plugv[i];
-	break;
+        hmatch=plugv[i];
+        break;
       }
     }
   }
@@ -184,9 +204,10 @@
 weed_memset_f weedmemset;
 
 
-weed_plant_t *weed_bootstrap_func (weed_default_getter_f *value, int num_versions, int *plugin_versions) {
-  int host_api_versions_supported[]={131}; // must be ordered in ascending order
+weed_plant_t *weed_bootstrap_func(weed_default_getter_f *value, int num_versions, int *plugin_versions) {
+  int host_api_versions_supported[]= {131}; // must be ordered in ascending order
   int host_api_version;
+
   weed_plant_t *host_info=weed_plant_new(WEED_PLANT_HOST_INFO);
 
   // these functions are defined in weed-host.h and set in weed_init()
@@ -220,7 +241,7 @@
     weed_set_int_value(host_info,"api_version",host_api_version);
 
     // here we set (void *)&fn_ptr
-    weed_set_voidptr_value(host_info,"weed_leaf_get_func",(void *)&wlg);
+    weed_set_voidptr_value(host_info,"weed_leaf_get_func",&wlg);
     weed_set_voidptr_value(host_info,"weed_leaf_set_func",&wlsp);
     weed_set_voidptr_value(host_info,"weed_plant_new_func",&wpn);
     weed_set_voidptr_value(host_info,"weed_plant_list_leaves_func",&wpll);
@@ -232,7 +253,7 @@
     weed_set_voidptr_value(host_info,"weed_free_func",&weedfree);
     weed_set_voidptr_value(host_info,"weed_memset_func",&weedmemset);
     weed_set_voidptr_value(host_info,"weed_memcpy_func",&weedmemcpy);
-    
+
     weed_add_plant_flags(host_info,WEED_LEAF_READONLY_PLUGIN);
     break;
   default:
@@ -269,13 +290,13 @@
   npals=weed_leaf_num_elements(ctmpl,"palette_list");
 
   plist=weed_get_int_array(ctmpl,"palette_list",&error);
-  for (i=0;i<npals;i++) {
+  for (i=0; i<npals; i++) {
     if (!weed_palette_is_alpha_palette(plist[i])) {
-      weed_free(plist);
+      lives_free(plist);
       return TRUE;
     }
   }
-  weed_free(plist);
+  lives_free(plist);
   return FALSE;
 }
 
@@ -291,25 +312,26 @@
   npals=weed_leaf_num_elements(ctmpl,"palette_list");
 
   plist=weed_get_int_array(ctmpl,"palette_list",&error);
-  for (i=0;i<npals;i++) {
+  for (i=0; i<npals; i++) {
     if (weed_palette_is_alpha_palette(plist[i])) {
-      weed_free(plist);
+      lives_free(plist);
       return TRUE;
     }
   }
-  weed_free(plist);
+  lives_free(plist);
   return FALSE;
 }
 
 
 weed_plant_t *weed_instance_get_filter(weed_plant_t *inst, boolean get_compound_parent) {
   int error;
-  if (get_compound_parent&&(weed_plant_has_leaf(inst,"host_compound_class"))) return weed_get_plantptr_value(inst,"host_compound_class",&error);
+  if (get_compound_parent&&
+      (weed_plant_has_leaf(inst,"host_compound_class"))) return weed_get_plantptr_value(inst,"host_compound_class",&error);
   return weed_get_plantptr_value(inst,"filter_class",&error);
 }
 
 
-lives_fx_cat_t weed_filter_categorise (weed_plant_t *pl, int in_channels, int out_channels) {
+lives_fx_cat_t weed_filter_categorise(weed_plant_t *pl, int in_channels, int out_channels) {
   weed_plant_t *filt=pl;
   int filter_flags,error;
   boolean has_out_params=FALSE;
@@ -328,15 +350,15 @@
     int nouts=weed_leaf_num_elements(filt,"out_channel_templates");
     if (nouts>0) {
       weed_plant_t **ctmpls=weed_get_plantptr_array(filt,"out_channel_templates",&error);
-      for (i=0;i<nouts;i++) {
-	if (weed_plant_has_leaf(ctmpls[i],"optional")&&
-	    weed_get_boolean_value(ctmpls[i],"optional",&error)==WEED_TRUE) continue; ///< ignore optional channels
-	if (has_non_alpha_palette(ctmpls[i])) {
-	  all_out_alpha=FALSE;
-	  break;
-	}
+      for (i=0; i<nouts; i++) {
+        if (weed_plant_has_leaf(ctmpls[i],"optional")&&
+            weed_get_boolean_value(ctmpls[i],"optional",&error)==WEED_TRUE) continue; ///< ignore optional channels
+        if (has_non_alpha_palette(ctmpls[i])) {
+          all_out_alpha=FALSE;
+          break;
+        }
       }
-      weed_free(ctmpls);
+      lives_free(ctmpls);
     }
   }
 
@@ -345,24 +367,22 @@
     int nins=weed_leaf_num_elements(filt,"in_channel_templates");
     if (nins>0) {
       weed_plant_t **ctmpls=weed_get_plantptr_array(filt,"in_channel_templates",&error);
-      for (i=0;i<nins;i++) {
-	if (weed_plant_has_leaf(ctmpls[i],"optional")&&
-	    weed_get_boolean_value(ctmpls[i],"optional",&error)==WEED_TRUE) continue; ///< ignore optional channels
-	has_mandatory_in=TRUE;
-	if (has_non_alpha_palette(ctmpls[i])) {
-	  all_in_alpha=FALSE;
-	}
-	else has_in_alpha=TRUE;
+      for (i=0; i<nins; i++) {
+        if (weed_plant_has_leaf(ctmpls[i],"optional")&&
+            weed_get_boolean_value(ctmpls[i],"optional",&error)==WEED_TRUE) continue; ///< ignore optional channels
+        has_mandatory_in=TRUE;
+        if (has_non_alpha_palette(ctmpls[i])) {
+          all_in_alpha=FALSE;
+        } else has_in_alpha=TRUE;
       }
       if (!has_mandatory_in) {
-	for (i=0;i<nins;i++) {
-	  if (has_non_alpha_palette(ctmpls[i])) {
-	    all_in_alpha=FALSE;
-	  }
-	  else has_in_alpha=TRUE;
-	}
+        for (i=0; i<nins; i++) {
+          if (has_non_alpha_palette(ctmpls[i])) {
+            all_in_alpha=FALSE;
+          } else has_in_alpha=TRUE;
+        }
       }
-      weed_free(ctmpls);
+      lives_free(ctmpls);
     }
   }
 
@@ -395,7 +415,7 @@
 }
 
 
-lives_fx_cat_t weed_filter_subcategorise (weed_plant_t *pl, lives_fx_cat_t category, boolean count_opt) {
+lives_fx_cat_t weed_filter_subcategorise(weed_plant_t *pl, lives_fx_cat_t category, boolean count_opt) {
   weed_plant_t *filt=pl;
   boolean has_video_chansi;
 
@@ -426,14 +446,20 @@
 }
 
 
-gchar* weed_seed_type_to_text(int seed_type) {
+char *weed_seed_type_to_text(int seed_type) {
   switch (seed_type) {
-  case WEED_SEED_INT: return g_strdup(_("integer"));
-  case WEED_SEED_INT64: return g_strdup(_("int64"));
-  case WEED_SEED_BOOLEAN: return g_strdup(_("boolean"));
-  case WEED_SEED_DOUBLE: return g_strdup(_("double"));
-  case WEED_SEED_STRING: return g_strdup(_("string"));
-  default: return g_strdup(_("pointer"));
+  case WEED_SEED_INT:
+    return lives_strdup(_("integer"));
+  case WEED_SEED_INT64:
+    return lives_strdup(_("int64"));
+  case WEED_SEED_BOOLEAN:
+    return lives_strdup(_("boolean"));
+  case WEED_SEED_DOUBLE:
+    return lives_strdup(_("double"));
+  case WEED_SEED_STRING:
+    return lives_strdup(_("string"));
+  default:
+    return lives_strdup(_("pointer"));
   }
 }
 
@@ -452,22 +478,21 @@
     nchans=weed_leaf_num_elements(filter,"out_channel_templates");
     if (nchans==0) return FALSE;
     ctmpls=weed_get_plantptr_array(filter,"out_channel_templates",&error);
-    for (i=0;i<nchans;i++) {
+    for (i=0; i<nchans; i++) {
       if (has_non_alpha_palette(ctmpls[i])) continue;
       count++;
     }
-  }
-  else {
+  } else {
     if (!weed_plant_has_leaf(filter,"in_channel_templates")) return FALSE;
     nchans=weed_leaf_num_elements(filter,"in_channel_templates");
     if (nchans==0) return FALSE;
     ctmpls=weed_get_plantptr_array(filter,"in_channel_templates",&error);
-    for (i=0;i<nchans;i++) {
+    for (i=0; i<nchans; i++) {
       if (has_non_alpha_palette(ctmpls[i])) continue;
       count++;
     }
   }
-  weed_free(ctmpls);
+  lives_free(ctmpls);
   return count;
 
 }
@@ -486,7 +511,7 @@
 static int fg_generator_mode;
 static int bg_generator_mode;
 
-// generators to start on playback, because of a problem in libvisual 
+// generators to start on playback, because of a problem in libvisual
 // - we must start generators after starting audio
 static int bg_gen_to_start;
 static int fg_gen_to_start;
@@ -510,11 +535,11 @@
 static int num_weed_filters; ///< count of how many filters we have loaded
 static int num_weed_dupes; ///< number of duplicate filters (with multiple versions)
 
-static gchar **hashnames;
-static gchar **dupe_hashnames;
+static char **hashnames;
+static char **dupe_hashnames;
 
 // per key/mode parameter defaults
-weed_plant_t ***key_defaults[FX_KEYS_MAX_VIRTUAL];
+weed_plant_t ** *key_defaults[FX_KEYS_MAX_VIRTUAL];
 
 /////////////////// LiVES event system /////////////////
 
@@ -527,12 +552,12 @@
 
 
 void backup_weed_instances(void) {
-  // this is called during multitrack rendering. 
+  // this is called during multitrack rendering.
   // We are rendering, but we want to display the current frame in the preview window
   // thus we backup our rendering instances, apply the current frame instances, and then restore the rendering instances
   register int i;
 
-  for (i=FX_KEYS_MAX_VIRTUAL;i<FX_KEYS_MAX;i++) {
+  for (i=FX_KEYS_MAX_VIRTUAL; i<FX_KEYS_MAX; i++) {
     key_to_instance_copy[i][0]=key_to_instance[i][0];
     key_to_instance[i][0]=NULL;
   }
@@ -542,7 +567,7 @@
 void restore_weed_instances(void) {
   register int i;
 
-  for (i=FX_KEYS_MAX_VIRTUAL;i<FX_KEYS_MAX;i++) {
+  for (i=FX_KEYS_MAX_VIRTUAL; i<FX_KEYS_MAX; i++) {
     key_to_instance[i][0]=key_to_instance_copy[i][0];
   }
 }
@@ -555,12 +580,12 @@
 }
 
 
-static gchar *weed_filter_get_type(weed_plant_t *filter, boolean getsub, boolean format) {
-  // return value should be g_free'd after use
-  gchar *tmp1,*tmp2,*ret;
+static char *weed_filter_get_type(weed_plant_t *filter, boolean getsub, boolean format) {
+  // return value should be lives_free'd after use
+  char *tmp1,*tmp2,*ret;
   lives_fx_cat_t cat=weed_filter_categorise(filter,
-					    enabled_in_channels(filter,TRUE),
-					    enabled_out_channels(filter,TRUE));
+                     enabled_in_channels(filter,TRUE),
+                     enabled_out_channels(filter,TRUE));
 
   lives_fx_cat_t sub=weed_filter_subcategorise(filter,cat,FALSE);
 
@@ -570,20 +595,20 @@
   tmp1=lives_fx_cat_to_text(cat,FALSE);
   tmp2=lives_fx_cat_to_text(sub,FALSE);
 
-  if (format) ret=g_strdup_printf("%s (%s)",tmp1,tmp2);
+  if (format) ret=lives_strdup_printf("%s (%s)",tmp1,tmp2);
   else {
-    if (cat==LIVES_FX_CAT_TRANSITION) ret=g_strdup_printf("%s - %s",tmp1,tmp2);
-      else ret=g_strdup_printf("%s",tmp2);
+    if (cat==LIVES_FX_CAT_TRANSITION) ret=lives_strdup_printf("%s - %s",tmp1,tmp2);
+    else ret=lives_strdup_printf("%s",tmp2);
   }
 
-  g_free(tmp1);
-  g_free(tmp2);
+  lives_free(tmp1);
+  lives_free(tmp2);
 
   return ret;
 
 }
 
-void update_host_info (weed_plant_t *inst) {
+void update_host_info(weed_plant_t *inst) {
   // set "host_audio_plugin" in the host_info
   int error;
   weed_plant_t *filter,*pinfo,*hinfo;
@@ -612,7 +637,7 @@
 }
 
 
-static weed_plant_t *get_enabled_channel_inner (weed_plant_t *inst, int which, boolean is_in, boolean audio_only) {
+static weed_plant_t *get_enabled_channel_inner(weed_plant_t *inst, int which, boolean is_in, boolean audio_only) {
   // plant is a filter_instance
   // "which" starts at 0
   weed_plant_t **channels;
@@ -628,8 +653,7 @@
     if (!weed_plant_has_leaf(inst,"in_channels")) return NULL;
     channels=weed_get_plantptr_array(inst,"in_channels",&error);
     nchans=weed_leaf_num_elements(inst,"in_channels");
-  }
-  else {
+  } else {
     if (!weed_plant_has_leaf(inst,"out_channels")) return NULL;
     channels=weed_get_plantptr_array(inst,"out_channels",&error);
     nchans=weed_leaf_num_elements(inst,"out_channels");
@@ -641,35 +665,35 @@
     if (!weed_plant_has_leaf(channels[i],"disabled")||weed_get_boolean_value(channels[i],"disabled",&error)==WEED_FALSE) {
       if (audio_only) ctmpl=weed_get_plantptr_value(channels[i],"template",&error);
       if (!audio_only||(audio_only&&weed_plant_has_leaf(ctmpl,"is_audio")&&
-			weed_get_boolean_value(ctmpl,"is_audio",&error)==WEED_TRUE)) {
-	which--;
+                        weed_get_boolean_value(ctmpl,"is_audio",&error)==WEED_TRUE)) {
+        which--;
       }
     }
     if (which<0) break;
     if (++i>=nchans) {
-      weed_free(channels);
+      lives_free(channels);
       return NULL;
     }
   }
   retval=channels[i];
-  weed_free(channels);
+  lives_free(channels);
   return retval;
 }
 
 
-weed_plant_t *get_enabled_channel (weed_plant_t *inst, int which, boolean is_in) {
+weed_plant_t *get_enabled_channel(weed_plant_t *inst, int which, boolean is_in) {
   // count audio and video channels
   return get_enabled_channel_inner(inst,which,is_in,FALSE);
 }
 
 
-weed_plant_t *get_enabled_audio_channel (weed_plant_t *inst, int which, boolean is_in) {
+weed_plant_t *get_enabled_audio_channel(weed_plant_t *inst, int which, boolean is_in) {
   // count only audio channels
   return get_enabled_channel_inner(inst,which,is_in,TRUE);
 }
 
 
-weed_plant_t *get_mandatory_channel (weed_plant_t *filter, int which, boolean is_in) {
+weed_plant_t *get_mandatory_channel(weed_plant_t *filter, int which, boolean is_in) {
   // plant is a filter_class
   // "which" starts at 0
   int i=0,error;
@@ -687,7 +711,7 @@
     i++;
   }
   retval=ctmpls[i-1];
-  weed_free(ctmpls);
+  lives_free(ctmpls);
   return retval;
 }
 
@@ -723,7 +747,7 @@
 
   in_chans=weed_get_plantptr_array(inst,"in_channels",&error);
   ctmpl=weed_get_plantptr_value(in_chans[chnum],"template",&error);
-  weed_free(in_chans);
+  lives_free(in_chans);
 
   if (weed_plant_has_leaf(ctmpl,"is_audio")&&weed_get_boolean_value(ctmpl,"is_audio",&error)==WEED_TRUE) {
     return TRUE;
@@ -745,17 +769,17 @@
 
   in_chans=weed_get_plantptr_array(inst,"in_channels",&error);
 
-  for (i=0;i<nchans;i++) {
+  for (i=0; i<nchans; i++) {
     ctmpl=weed_get_plantptr_value(in_chans[i],"template",&error);
     if (weed_get_boolean_value(ctmpl,"is_audio",&error)==WEED_TRUE) {
       if (achnum--==0) {
-	achan=in_chans[i];
-	weed_free(in_chans);
-	return achan;
+        achan=in_chans[i];
+        lives_free(in_chans);
+        return achan;
       }
     }
   }
-  weed_free(in_chans);
+  lives_free(in_chans);
   return NULL;
 }
 
@@ -768,15 +792,15 @@
   if (nchans==0) return FALSE;
 
   in_ctmpls=weed_get_plantptr_array(filter,"in_channel_templates",&error);
-  for (i=0;i<nchans;i++) {
+  for (i=0; i<nchans; i++) {
     if (!count_opt&&weed_plant_has_leaf(in_ctmpls[i],"optional")&&
-	weed_get_boolean_value(in_ctmpls[i],"optional",&error)==WEED_TRUE) continue;
-    if (weed_plant_has_leaf(in_ctmpls[i],"is_audio")&&weed_get_boolean_value(in_ctmpls[i],"is_audio",&error)==WEED_TRUE) 
+        weed_get_boolean_value(in_ctmpls[i],"optional",&error)==WEED_TRUE) continue;
+    if (weed_plant_has_leaf(in_ctmpls[i],"is_audio")&&weed_get_boolean_value(in_ctmpls[i],"is_audio",&error)==WEED_TRUE)
       continue;
-    weed_free(in_ctmpls);
+    lives_free(in_ctmpls);
     return TRUE;
   }
-  weed_free(in_ctmpls);
+  lives_free(in_ctmpls);
 
   return FALSE;
 }
@@ -791,15 +815,15 @@
   if (nchans==0) return FALSE;
 
   in_ctmpls=weed_get_plantptr_array(filter,"in_channel_templates",&error);
-  for (i=0;i<nchans;i++) {
+  for (i=0; i<nchans; i++) {
     if (!count_opt&&weed_plant_has_leaf(in_ctmpls[i],"optional")&&
-	weed_get_boolean_value(in_ctmpls[i],"optional",&error)==WEED_TRUE) continue;
+        weed_get_boolean_value(in_ctmpls[i],"optional",&error)==WEED_TRUE) continue;
     if (!weed_plant_has_leaf(in_ctmpls[i],"is_audio")||
-	weed_get_boolean_value(in_ctmpls[i],"is_audio",&error)==WEED_FALSE) continue;
-    weed_free(in_ctmpls);
+        weed_get_boolean_value(in_ctmpls[i],"is_audio",&error)==WEED_FALSE) continue;
+    lives_free(in_ctmpls);
     return TRUE;
   }
-  weed_free(in_ctmpls);
+  lives_free(in_ctmpls);
 
   return FALSE;
 }
@@ -814,7 +838,7 @@
 
   out_chans=weed_get_plantptr_array(inst,"out_channels",&error);
   ctmpl=weed_get_plantptr_value(out_chans[chnum],"template",&error);
-  weed_free(out_chans);
+  lives_free(out_chans);
 
   if (weed_plant_has_leaf(ctmpl,"is_audio")&&weed_get_boolean_value(ctmpl,"is_audio",&error)==WEED_TRUE) {
     return TRUE;
@@ -831,15 +855,15 @@
   if (nchans==0) return FALSE;
 
   out_ctmpls=weed_get_plantptr_array(filter,"out_channel_templates",&error);
-  for (i=0;i<nchans;i++) {
+  for (i=0; i<nchans; i++) {
     if (!count_opt&&weed_plant_has_leaf(out_ctmpls[i],"optional")&&
-	weed_get_boolean_value(out_ctmpls[i],"optional",&error)==WEED_TRUE) continue;
+        weed_get_boolean_value(out_ctmpls[i],"optional",&error)==WEED_TRUE) continue;
     if (weed_plant_has_leaf(out_ctmpls[i],"is_audio")&&
-	weed_get_boolean_value(out_ctmpls[i],"is_audio",&error)==WEED_TRUE) continue;
-    weed_free(out_ctmpls);
+        weed_get_boolean_value(out_ctmpls[i],"is_audio",&error)==WEED_TRUE) continue;
+    lives_free(out_ctmpls);
     return TRUE;
   }
-  weed_free(out_ctmpls);
+  lives_free(out_ctmpls);
 
   return FALSE;
 }
@@ -854,15 +878,15 @@
   if (nchans==0) return FALSE;
 
   out_ctmpls=weed_get_plantptr_array(filter,"out_channel_templates",&error);
-  for (i=0;i<nchans;i++) {
+  for (i=0; i<nchans; i++) {
     if (!count_opt&&weed_plant_has_leaf(out_ctmpls[i],"optional")&&
-	weed_get_boolean_value(out_ctmpls[i],"optional",&error)==WEED_TRUE) continue;
+        weed_get_boolean_value(out_ctmpls[i],"optional",&error)==WEED_TRUE) continue;
     if (!weed_plant_has_leaf(out_ctmpls[i],"is_audio")||
-	weed_get_boolean_value(out_ctmpls[i],"is_audio",&error)==WEED_FALSE) continue;
-    weed_free(out_ctmpls);
+        weed_get_boolean_value(out_ctmpls[i],"is_audio",&error)==WEED_FALSE) continue;
+    lives_free(out_ctmpls);
     return TRUE;
   }
-  weed_free(out_ctmpls);
+  lives_free(out_ctmpls);
 
   return FALSE;
 }
@@ -898,60 +922,64 @@
 
   chans=weed_get_plantptr_array(inst,"in_channels",&error);
 
-  for (i=0;i<nchans;i++) {
+  for (i=0; i<nchans; i++) {
     if (weed_plant_has_leaf(chans[i],"disabled")&&
-	weed_get_boolean_value(chans[i],"disabled",&error)==WEED_TRUE) continue; //ignore disabled channels
+        weed_get_boolean_value(chans[i],"disabled",&error)==WEED_TRUE) continue; //ignore disabled channels
     ctmpl=weed_get_plantptr_value(chans[i],"template",&error);
     if (weed_plant_has_leaf(ctmpl,"max_repeats")&&weed_get_int_value(ctmpl,"max_repeats",&error)!=1) {
-      weed_free(chans);
+      lives_free(chans);
       return TRUE;
     }
   }
 
-  weed_free(chans);
+  lives_free(chans);
   return FALSE;
 
 }
 
 
+LIVES_INLINE boolean rte_key_is_enabled(int key) {
+  key--;
+  return (mainw->rte&(GU641<<key));
+}
 
 
-static void create_filter_map (uint64_t rteval) {
+static void create_filter_map(uint64_t rteval) {
   /** here we create an effect map which defines the order in which effects are applied to a frame stack
    * this is done during recording, the keymap is from mainw->rte which is a bitmap of effect keys
    * keys are applied here from smallest (ctrl-1) to largest (virtual key ctrl-FX_KEYS_MAX_VIRTUAL)
 
-   * this is transformed into filter_map which holds init_events 
+   * this is transformed into filter_map which holds init_events
    * these pointers are then stored in a filter_map event
 
-   * what we actually point to are the init_events for the effects. The init_events are stored when we 
+   * what we actually point to are the init_events for the effects. The init_events are stored when we
    * init an effect
 
-   * during rendering we read the filter_map event, and retrieve the new key, which is at that time 
-   * held in the 
+   * during rendering we read the filter_map event, and retrieve the new key, which is at that time
+   * held in the
    * "host_tag" property of the init_event, and we apply our effects
    * (which are then bound to virtual keys >=FX_KEYS_MAX_VIRTUAL)
 
    * [note] that we can do cool things, like mapping the same instance multiple times (though it will always
    * apply itself to the same in/out tracks
 
-   * we don't need to worry about free()ing init_events, since they will be free'd 
+   * we don't need to worry about free()ing init_events, since they will be free'd
    * when the instance is deinited
    */
 
   int count=0,i;
   weed_plant_t *inst;
 
-  for (i=0;i<FX_KEYS_MAX_VIRTUAL;i++) 
+  for (i=0; i<FX_KEYS_MAX_VIRTUAL; i++)
     if (rteval&(GU641<<i)&&(inst=key_to_instance[i][key_modes[i]])!=NULL&&
-	enabled_in_channels (inst,FALSE)>0) {
+        enabled_in_channels(inst,FALSE)>0) {
       filter_map[count++]=init_events[i];
     }
   filter_map[count]=NULL; // marks the end of the effect map
 }
 
 
-weed_plant_t *add_filter_deinit_events (weed_plant_t *event_list) {
+weed_plant_t *add_filter_deinit_events(weed_plant_t *event_list) {
   // during rendering we use the "keys" FX_KEYS_MAX_VIRTUAL -> FX_KEYS_MAX
   // here we add effect_deinit events to an event_list
   int i;
@@ -960,23 +988,23 @@
 
   if (event_list!=NULL) last_tc=get_event_timecode(get_last_event(event_list));
 
-  for (i=0;i<FX_KEYS_MAX_VIRTUAL;i++) {
+  for (i=0; i<FX_KEYS_MAX_VIRTUAL; i++) {
     if (init_events[i]!=NULL) {
-      event_list=append_filter_deinit_event (event_list,last_tc,init_events[i],pchains[i]);
+      event_list=append_filter_deinit_event(event_list,last_tc,init_events[i],pchains[i]);
       init_events[i]=NULL;
-      if (pchains[i]!=NULL) g_free(pchains[i]);
+      if (pchains[i]!=NULL) lives_free(pchains[i]);
       needs_filter_map=TRUE;
     }
   }
   // add an empty filter_map event (in case more frames are added)
   create_filter_map(mainw->rte); // we create filter_map event_t * array with ordered effects
 
-  if (needs_filter_map) event_list=append_filter_map_event (mainw->event_list,last_tc,filter_map);
+  if (needs_filter_map) event_list=append_filter_map_event(mainw->event_list,last_tc,filter_map);
   return event_list;
 }
 
 
-weed_plant_t *add_filter_init_events (weed_plant_t *event_list, weed_timecode_t tc) {
+weed_plant_t *add_filter_init_events(weed_plant_t *event_list, weed_timecode_t tc) {
   // during rendering we use the "keys" FX_KEYS_MAX_VIRTUAL -> FX_KEYS_MAX
   // here we are about to start playback, and we add init events for every effect which is switched on
   // we add the init events with a timecode of 0
@@ -984,9 +1012,9 @@
   weed_plant_t *inst;
   int fx_idx,ntracks;
 
-  for (i=0;i<FX_KEYS_MAX_VIRTUAL;i++) {
-    if ((inst=key_to_instance[i][key_modes[i]])!=NULL&&enabled_in_channels (inst,FALSE)>0) {
-      event_list=append_filter_init_event (event_list,tc,(fx_idx=key_to_fx[i][key_modes[i]]),-1,i,inst);
+  for (i=0; i<FX_KEYS_MAX_VIRTUAL; i++) {
+    if ((inst=key_to_instance[i][key_modes[i]])!=NULL&&enabled_in_channels(inst,FALSE)>0) {
+      event_list=append_filter_init_event(event_list,tc,(fx_idx=key_to_fx[i][key_modes[i]]),-1,i,inst);
       init_events[i]=get_last_event(event_list);
       ntracks=weed_leaf_num_elements(init_events[i],"in_tracks");
       pchains[i]=filter_init_add_pchanges(event_list,inst,init_events[i],ntracks,0);
@@ -994,7 +1022,7 @@
   }
   // add an empty filter_map event (in case more frames are added)
   create_filter_map(mainw->rte); // we create filter_map event_t * array with ordered effects
-  if (filter_map[0]!=NULL) event_list=append_filter_map_event (event_list,tc,filter_map);
+  if (filter_map[0]!=NULL) event_list=append_filter_map_event(event_list,tc,filter_map);
   return event_list;
 }
 
@@ -1002,11 +1030,11 @@
 // check if palette is in the palette_list
 // if not, return next best palette to use, using a heuristic method
 // num_palettes is the size of the palette list
-int check_weed_palette_list (int *palette_list, int num_palettes, int palette) {
+int check_weed_palette_list(int *palette_list, int num_palettes, int palette) {
   int i;
   int best_palette=WEED_PALETTE_END;
 
-  for (i=0;i<num_palettes;i++) {
+  for (i=0; i<num_palettes; i++) {
     if (palette_list[i]==palette) {
       // exact match - return it
       return palette;
@@ -1014,110 +1042,107 @@
     // pass 1, see if we can find same or higher quality in same colorspace
     if (weed_palette_is_alpha_palette(palette)) {
       if (palette_list[i]==WEED_PALETTE_A8) best_palette=palette_list[i];
-      if (palette_list[i]==WEED_PALETTE_A1&&(best_palette==WEED_PALETTE_AFLOAT||best_palette==WEED_PALETTE_END)) 
-	best_palette=palette_list[i];
+      if (palette_list[i]==WEED_PALETTE_A1&&(best_palette==WEED_PALETTE_AFLOAT||best_palette==WEED_PALETTE_END))
+        best_palette=palette_list[i];
       if (palette_list[i]==WEED_PALETTE_AFLOAT&&best_palette==WEED_PALETTE_END) best_palette=palette_list[i];
-    }
-    else if (weed_palette_is_rgb_palette(palette)) {
-      if (palette_list[i]==WEED_PALETTE_RGBAFLOAT&&(palette==WEED_PALETTE_RGBFLOAT||best_palette==WEED_PALETTE_END)) 
-	best_palette=palette_list[i];
+    } else if (weed_palette_is_rgb_palette(palette)) {
+      if (palette_list[i]==WEED_PALETTE_RGBAFLOAT&&(palette==WEED_PALETTE_RGBFLOAT||best_palette==WEED_PALETTE_END))
+        best_palette=palette_list[i];
       if (palette_list[i]==WEED_PALETTE_RGBFLOAT&&best_palette==WEED_PALETTE_END) best_palette=palette_list[i];
       if (palette_list[i]==WEED_PALETTE_RGBA32||
-	  palette_list[i]==WEED_PALETTE_BGRA32||palette_list[i]==WEED_PALETTE_ARGB32) {
-	if ((best_palette==WEED_PALETTE_END||
-	     best_palette==WEED_PALETTE_RGBFLOAT||best_palette==WEED_PALETTE_RGBAFLOAT)||
-	    weed_palette_has_alpha_channel(palette)) best_palette=palette_list[i];
+          palette_list[i]==WEED_PALETTE_BGRA32||palette_list[i]==WEED_PALETTE_ARGB32) {
+        if ((best_palette==WEED_PALETTE_END||
+             best_palette==WEED_PALETTE_RGBFLOAT||best_palette==WEED_PALETTE_RGBAFLOAT)||
+            weed_palette_has_alpha_channel(palette)) best_palette=palette_list[i];
       }
       if (!weed_palette_has_alpha_channel(palette)||
-	  (best_palette==WEED_PALETTE_END||best_palette==WEED_PALETTE_RGBFLOAT||best_palette==WEED_PALETTE_RGBAFLOAT)) {
-	if (palette_list[i]==WEED_PALETTE_RGB24||palette_list[i]==WEED_PALETTE_BGR24) {
-	  best_palette=palette_list[i];
-	}
+          (best_palette==WEED_PALETTE_END||best_palette==WEED_PALETTE_RGBFLOAT||best_palette==WEED_PALETTE_RGBAFLOAT)) {
+        if (palette_list[i]==WEED_PALETTE_RGB24||palette_list[i]==WEED_PALETTE_BGR24) {
+          best_palette=palette_list[i];
+        }
       }
-    }
-    else {
+    } else {
       // yuv
       if (palette==WEED_PALETTE_YUV411&&(palette_list[i]==WEED_PALETTE_YUV422P)) best_palette=palette_list[i];
       if (palette==WEED_PALETTE_YUV411&&best_palette!=WEED_PALETTE_YUV422P&&
-	  (palette_list[i]==WEED_PALETTE_YUV420P||palette_list[i]==WEED_PALETTE_YVU420P)) best_palette=palette_list[i];
+          (palette_list[i]==WEED_PALETTE_YUV420P||palette_list[i]==WEED_PALETTE_YVU420P)) best_palette=palette_list[i];
       if (palette==WEED_PALETTE_YUV420P&&palette_list[i]==WEED_PALETTE_YVU420P) best_palette=palette_list[i];
       if (palette==WEED_PALETTE_YVU420P&&palette_list[i]==WEED_PALETTE_YUV420P) best_palette=palette_list[i];
-      
+
       if (((palette==WEED_PALETTE_YUV420P&&best_palette!=WEED_PALETTE_YVU420P)||
-	   (palette==WEED_PALETTE_YVU420P&&best_palette!=WEED_PALETTE_YUV420P))&&
-	  (palette_list[i]==WEED_PALETTE_YUV422P||palette_list[i]==WEED_PALETTE_UYVY8888||
-	   palette_list[i]==WEED_PALETTE_YUYV8888)) best_palette=palette_list[i];
-      
+           (palette==WEED_PALETTE_YVU420P&&best_palette!=WEED_PALETTE_YUV420P))&&
+          (palette_list[i]==WEED_PALETTE_YUV422P||palette_list[i]==WEED_PALETTE_UYVY8888||
+           palette_list[i]==WEED_PALETTE_YUYV8888)) best_palette=palette_list[i];
+
       if ((palette==WEED_PALETTE_YUV422P||palette==WEED_PALETTE_UYVY8888||palette==WEED_PALETTE_YUYV8888)&&
-	  (palette_list[i]==WEED_PALETTE_YUV422P||palette_list[i]==WEED_PALETTE_UYVY8888||
-	   palette_list[i]==WEED_PALETTE_YUYV8888)) best_palette=palette_list[i];
-      
+          (palette_list[i]==WEED_PALETTE_YUV422P||palette_list[i]==WEED_PALETTE_UYVY8888||
+           palette_list[i]==WEED_PALETTE_YUYV8888)) best_palette=palette_list[i];
+
       if (palette_list[i]==WEED_PALETTE_YUVA8888||palette_list[i]==WEED_PALETTE_YUVA4444P) {
-	if (best_palette==WEED_PALETTE_END||weed_palette_has_alpha_channel(palette)) best_palette=palette_list[i];
+        if (best_palette==WEED_PALETTE_END||weed_palette_has_alpha_channel(palette)) best_palette=palette_list[i];
       }
       if (best_palette==WEED_PALETTE_END||((best_palette==WEED_PALETTE_YUVA8888||best_palette==WEED_PALETTE_YUVA4444P)&&
-					   !weed_palette_has_alpha_channel(palette))) {
-	if (palette_list[i]==WEED_PALETTE_YUV888||palette_list[i]==WEED_PALETTE_YUV444P) {
-	  best_palette=palette_list[i];
-	}
+                                           !weed_palette_has_alpha_channel(palette))) {
+        if (palette_list[i]==WEED_PALETTE_YUV888||palette_list[i]==WEED_PALETTE_YUV444P) {
+          best_palette=palette_list[i];
+        }
       }
     }
   }
-  
+
   // pass 2:
   // if we had to drop alpha, see if we can preserve it in the other colorspace
-  for (i=0;i<num_palettes;i++) {
+  for (i=0; i<num_palettes; i++) {
     if (weed_palette_has_alpha_channel(palette)&&
-	(best_palette==WEED_PALETTE_END||!weed_palette_has_alpha_channel(best_palette))) {
+        (best_palette==WEED_PALETTE_END||!weed_palette_has_alpha_channel(best_palette))) {
       if (weed_palette_is_rgb_palette(palette)) {
-	if (palette_list[i]==WEED_PALETTE_YUVA8888||palette_list[i]==WEED_PALETTE_YUVA4444P) best_palette=palette_list[i];
-      }
-      else {
-	if (palette_list[i]==WEED_PALETTE_RGBA32||palette_list[i]==WEED_PALETTE_BGRA32||
-	    palette_list[i]==WEED_PALETTE_ARGB32) best_palette=palette_list[i];
+        if (palette_list[i]==WEED_PALETTE_YUVA8888||palette_list[i]==WEED_PALETTE_YUVA4444P) best_palette=palette_list[i];
+      } else {
+        if (palette_list[i]==WEED_PALETTE_RGBA32||palette_list[i]==WEED_PALETTE_BGRA32||
+            palette_list[i]==WEED_PALETTE_ARGB32) best_palette=palette_list[i];
       }
     }
   }
 
   // pass 3: no alpha; switch colorspaces, try to find same or higher quality
   if (best_palette==WEED_PALETTE_END) {
-    for (i=0;i<num_palettes;i++) {
+    for (i=0; i<num_palettes; i++) {
       if ((weed_palette_is_rgb_palette(palette)||best_palette==WEED_PALETTE_END)&&
-	  (palette_list[i]==WEED_PALETTE_RGB24||palette_list[i]==WEED_PALETTE_BGR24)) {
-	best_palette=palette_list[i];
+          (palette_list[i]==WEED_PALETTE_RGB24||palette_list[i]==WEED_PALETTE_BGR24)) {
+        best_palette=palette_list[i];
       }
       if ((weed_palette_is_yuv_palette(palette)||best_palette==WEED_PALETTE_END)&&
-	  (palette_list[i]==WEED_PALETTE_YUV888||palette_list[i]==WEED_PALETTE_YUV444P)) {
-	best_palette=palette_list[i];
+          (palette_list[i]==WEED_PALETTE_YUV888||palette_list[i]==WEED_PALETTE_YUV444P)) {
+        best_palette=palette_list[i];
       }
       if (best_palette==WEED_PALETTE_END&&(palette_list[i]==WEED_PALETTE_RGBA32||
-					   palette_list[i]==WEED_PALETTE_BGRA32||palette_list[i]==WEED_PALETTE_ARGB32)) {
-	best_palette=palette_list[i];
+                                           palette_list[i]==WEED_PALETTE_BGRA32||palette_list[i]==WEED_PALETTE_ARGB32)) {
+        best_palette=palette_list[i];
       }
       if (best_palette==WEED_PALETTE_END&&
-	  (palette_list[i]==WEED_PALETTE_YUVA8888||palette_list[i]==WEED_PALETTE_YUVA4444P)) {
-	best_palette=palette_list[i];
+          (palette_list[i]==WEED_PALETTE_YUVA8888||palette_list[i]==WEED_PALETTE_YUVA4444P)) {
+        best_palette=palette_list[i];
       }
     }
   }
-  
+
   // pass 4: switch to YUV, try to find highest quality
   if (best_palette==WEED_PALETTE_END) {
-    for (i=0;i<num_palettes;i++) {
+    for (i=0; i<num_palettes; i++) {
       if (palette_list[i]==WEED_PALETTE_UYVY8888||palette_list[i]==WEED_PALETTE_YUYV8888||
-	  palette_list[i]==WEED_PALETTE_YUV422P) {
-	best_palette=palette_list[i];
+          palette_list[i]==WEED_PALETTE_YUV422P) {
+        best_palette=palette_list[i];
       }
       if ((best_palette==WEED_PALETTE_END||best_palette==WEED_PALETTE_YUV411)&&
-	  (palette_list[i]==WEED_PALETTE_YUV420P||palette_list[i]==WEED_PALETTE_YVU420P)) {
-	best_palette=palette_list[i];
+          (palette_list[i]==WEED_PALETTE_YUV420P||palette_list[i]==WEED_PALETTE_YVU420P)) {
+        best_palette=palette_list[i];
       }
       if (best_palette==WEED_PALETTE_END&&palette_list[i]==WEED_PALETTE_YUV411) best_palette=palette_list[i];
     }
   }
 
   // pass 5: tweak results to use (probably) most common colourspaces
-  for (i=0;i<num_palettes;i++) {
+  for (i=0; i<num_palettes; i++) {
     if (palette_list[i]==WEED_PALETTE_RGBA32&&(best_palette==WEED_PALETTE_BGRA32||best_palette==WEED_PALETTE_ARGB32)) {
       best_palette=palette_list[i];
     }
@@ -1133,19 +1158,19 @@
   }
 
 #ifdef DEBUG_PALETTES
-  g_printerr("Debug: best palette for %d is %d\n",palette,best_palette);
+  lives_printerr("Debug: best palette for %d is %d\n",palette,best_palette);
 #endif
-    
+
   return best_palette;
 }
 
-static void set_channel_size (weed_plant_t *channel, int width, int height, int numplanes, int *rowstrides) {
+static void set_channel_size(weed_plant_t *channel, int width, int height, int numplanes, int *rowstrides) {
   int error;
   int max;
   weed_plant_t *chantmpl=weed_get_plantptr_value(channel,"template",&error);
   // note: rowstrides is just a guess, we will set the actual value when we come to process the effect
 
-  if (weed_plant_has_leaf(chantmpl,"width")&&weed_get_int_value(chantmpl,"width",&error)!=0) 
+  if (weed_plant_has_leaf(chantmpl,"width")&&weed_get_int_value(chantmpl,"width",&error)!=0)
     width=weed_get_int_value(chantmpl,"width",&error);
   else if (weed_plant_has_leaf(chantmpl,"host_width")) width=weed_get_int_value(chantmpl,"host_width",&error);
   if (weed_plant_has_leaf(chantmpl,"hstep")) width=step_val(width,weed_get_int_value(chantmpl,"hstep",&error));
@@ -1156,7 +1181,7 @@
 
   weed_set_int_value(channel,"width",width);
 
-  if (weed_plant_has_leaf(chantmpl,"height")&&weed_get_int_value(chantmpl,"height",&error)!=0) 
+  if (weed_plant_has_leaf(chantmpl,"height")&&weed_get_int_value(chantmpl,"height",&error)!=0)
     height=weed_get_int_value(chantmpl,"height",&error);
   else if (weed_plant_has_leaf(chantmpl,"host_height")) height=weed_get_int_value(chantmpl,"host_height",&error);
   if (weed_plant_has_leaf(chantmpl,"vstep")) height=step_val(height,weed_get_int_value(chantmpl,"vstep",&error));
@@ -1167,7 +1192,7 @@
   weed_set_int_value(channel,"height",height);
 
   if (rowstrides!=NULL) weed_set_int_array(channel,"rowstrides",numplanes,rowstrides);
-  
+
 }
 
 
@@ -1176,13 +1201,13 @@
   int i;
 
   if (n1!=n2) return TRUE;
-  for (i=0;i<n1;i++) if (n1_array[i]!=n2_array[i]) return TRUE;
+  for (i=0; i<n1; i++) if (n1_array[i]!=n2_array[i]) return TRUE;
   return FALSE;
 }
 
 
-static boolean align (void **pixel_data, size_t alignment, int numplanes, int height, int *rowstrides, 
-		       int *contiguous) {
+static boolean align(void **pixel_data, size_t alignment, int numplanes, int height, int *rowstrides,
+                     int *contiguous) {
 #ifndef HAVE_POSIX_MEMALIGN
   return FALSE;
 #else
@@ -1195,14 +1220,14 @@
   void **new_pixel_data;
   size_t size,totsize=0;
 
-  for (i=0;i<numplanes;i++) {
+  for (i=0; i<numplanes; i++) {
     if (((uint64_t)(pixel_data[i]))%alignment==0) continue;
     needs_change=TRUE;
   }
 
   if (!needs_change) return TRUE;
 
-  for (i=0;i<numplanes;i++) {
+  for (i=0; i<numplanes; i++) {
     size=height*rowstrides[i];
     totsize+=CEIL(size,32);
   }
@@ -1212,52 +1237,52 @@
 
   if ((memerror=posix_memalign((void **)&npixel_data,alignment,totsize))) return FALSE;
 
-  new_pixel_data=(void **)g_malloc(numplanes*(sizeof(void *)));
+  new_pixel_data=(void **)lives_malloc(numplanes*(sizeof(void *)));
 
   // recheck
   needs_change=FALSE;
 
-  for (i=0;i<numplanes;i++) {
+  for (i=0; i<numplanes; i++) {
     if (((uint64_t)(pixel_data[i]))%alignment==0) continue;
     needs_change=TRUE;
   }
 
   if (!needs_change) {
-    for (i=0;i<numplanes;i++) {
+    for (i=0; i<numplanes; i++) {
       memcpy(npixel_data,pixel_data[i],height*rowstrides[i]);
       new_pixel_data[i]=npixel_data;
       size=height*rowstrides[i];
       npixel_data+=CEIL(size,32);
     }
 
-    for (i=0;i<numplanes;i++) {
+    for (i=0; i<numplanes; i++) {
       if (i==0||!(*contiguous))
-	g_free(pixel_data[i]);
+        lives_free(pixel_data[i]);
       pixel_data[i]=new_pixel_data[i];
     }
 
-    g_free(new_pixel_data);
+    lives_free(new_pixel_data);
     if (numplanes>1) *contiguous=TRUE;
     else *contiguous=FALSE;
     return TRUE;
   }
 
-  g_free(npixel_data);
+  lives_free(npixel_data);
 
   // non-contiguous
-  for (i=0;i<numplanes;i++) {
+  for (i=0; i<numplanes; i++) {
     if ((memerror=posix_memalign((void **)&npixel_data,alignment,height*rowstrides[i]))) return FALSE;
     memcpy(npixel_data,pixel_data[i],height*rowstrides[i]);
     new_pixel_data[i]=npixel_data;
   }
 
-  for (i=0;i<numplanes;i++) {
+  for (i=0; i<numplanes; i++) {
     if (i==0||!(*contiguous))
-      g_free(pixel_data[i]);
+      lives_free(pixel_data[i]);
     pixel_data[i]=new_pixel_data[i];
   }
-  
-  g_free(new_pixel_data);
+
+  lives_free(new_pixel_data);
   *contiguous=FALSE;
 
   return TRUE;
@@ -1275,72 +1300,72 @@
 }
 
 
-void set_param_gui_readonly (weed_plant_t *inst) {
+void set_param_gui_readonly(weed_plant_t *inst) {
   int num_params,error,i;
   weed_plant_t **params,*gui,*ptmpl;
 
   num_params=weed_leaf_num_elements(inst,"in_parameters");
   if (num_params>0) {
     params=weed_get_plantptr_array(inst,"in_parameters",&error);
-    for (i=0;i<num_params;i++) {
+    for (i=0; i<num_params; i++) {
       ptmpl=weed_get_plantptr_value(params[i],"template",&error);
       if (weed_plant_has_leaf(ptmpl,"gui")) {
-	gui=weed_get_plantptr_value(ptmpl,"gui",&error);
-	weed_add_plant_flags(gui,WEED_LEAF_READONLY_PLUGIN);
+        gui=weed_get_plantptr_value(ptmpl,"gui",&error);
+        weed_add_plant_flags(gui,WEED_LEAF_READONLY_PLUGIN);
       }
     }
-    weed_free(params);
+    lives_free(params);
   }
 
 }
 
-void set_param_gui_readwrite (weed_plant_t *inst) {
+void set_param_gui_readwrite(weed_plant_t *inst) {
   int num_params,error,i;
   weed_plant_t **params,*gui,*ptmpl;
 
   num_params=weed_leaf_num_elements(inst,"in_parameters");
   if (num_params>0) {
     params=weed_get_plantptr_array(inst,"in_parameters",&error);
-    for (i=0;i<num_params;i++) {
+    for (i=0; i<num_params; i++) {
       ptmpl=weed_get_plantptr_value(params[i],"template",&error);
       if (weed_plant_has_leaf(ptmpl,"gui")) {
-	gui=weed_get_plantptr_value(ptmpl,"gui",&error);
-	weed_clear_plant_flags(gui,WEED_LEAF_READONLY_PLUGIN);
+        gui=weed_get_plantptr_value(ptmpl,"gui",&error);
+        weed_clear_plant_flags(gui,WEED_LEAF_READONLY_PLUGIN);
       }
     }
-    weed_free(params);
+    lives_free(params);
   }
 
 }
 
 /// change directory to plugin installation dir so it can find any data files
 ///
-/// returns copy of current directory (before directory change) which should be freed after use 
-gchar *cd_to_plugin_dir(weed_plant_t *filter) {
+/// returns copy of current directory (before directory change) which should be freed after use
+char *cd_to_plugin_dir(weed_plant_t *filter) {
   char *ret;
   int error;
   weed_plant_t *plugin_info=weed_get_plantptr_value(filter,"plugin_info",&error);
   char *ppath=weed_get_string_value(plugin_info,"plugin_path",&error);
-  ret=g_get_current_dir();
+  ret=lives_get_current_dir();
   // allow this to fail -it's not that important - it just means any plugin data files wont be found
   // besides, we dont want to show warnings at 50 fps
   lives_chdir(ppath,TRUE);
-  weed_free(ppath);
+  lives_free(ppath);
   return ret;
 }
 
-lives_filter_error_t weed_reinit_effect (weed_plant_t *inst, boolean reinit_compound) {
+lives_filter_error_t weed_reinit_effect(weed_plant_t *inst, boolean reinit_compound) {
   weed_plant_t *filter;
 
   lives_filter_error_t filter_error=FILTER_NO_ERROR;
 
-  gchar *cwd;
+  char *cwd;
 
   boolean is_audio=FALSE,deinit_first=FALSE;
 
   int error,retval,key=-1;
 
- reinit:
+reinit:
 
   if (weed_plant_has_leaf(inst,"host_key")) key=weed_get_int_value(inst,"host_key",&error);
 
@@ -1370,34 +1395,33 @@
       if (is_audio) filter_mutex_unlock(key);
       set_param_gui_readonly(inst);
       if (fx_dialog[1]!=NULL) {
-	// redraw GUI if necessary
-	rfx=(lives_rfx_t *)g_object_get_data(G_OBJECT(fx_dialog[1]),"rfx");
-	if (rfx->source_type==LIVES_RFX_SOURCE_WEED&&rfx->source==inst) {
-	  int keyw=GPOINTER_TO_INT (g_object_get_data (G_OBJECT (fx_dialog[1]),"key"));
-	  int modew=GPOINTER_TO_INT (g_object_get_data (G_OBJECT (fx_dialog[1]),"mode"));
-
-	  // do updates from "gui"
-	  rfx_params_free(rfx);
-	  g_free(rfx->params);
-    
-	  rfx->params=weed_params_to_rfx(rfx->num_params,inst,FALSE);
+        // redraw GUI if necessary
+        rfx=(lives_rfx_t *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(fx_dialog[1]),"rfx");
+        if (rfx->source_type==LIVES_RFX_SOURCE_WEED&&rfx->source==inst) {
+          int keyw=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(fx_dialog[1]),"key"));
+          int modew=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(fx_dialog[1]),"mode"));
+
+          // do updates from "gui"
+          rfx_params_free(rfx);
+          lives_free(rfx->params);
+
+          rfx->params=weed_params_to_rfx(rfx->num_params,inst,FALSE);
 
-	  redraw_pwindow(keyw,modew);
-	}
+          redraw_pwindow(keyw,modew);
+        }
       }
 
       if (retval!=WEED_NO_ERROR) {
-	lives_chdir(cwd,FALSE);
-	g_free(cwd);
-	return FILTER_ERROR_COULD_NOT_REINIT;
+        lives_chdir(cwd,FALSE);
+        lives_free(cwd);
+        return FILTER_ERROR_COULD_NOT_REINIT;
       }
 
       // need to set this before calling deinit
       weed_set_boolean_value(inst,"host_inited",WEED_TRUE);
       // redraw set defs window
 
-    }
-    else if (is_audio) filter_mutex_unlock(key);
+    } else if (is_audio) filter_mutex_unlock(key);
 
     if (!deinit_first) {
       if (is_audio) filter_mutex_lock(key);
@@ -1406,10 +1430,9 @@
     }
 
     lives_chdir(cwd,FALSE);
-    g_free(cwd);
+    lives_free(cwd);
     filter_error=FILTER_INFO_REINITED;
-  }
-  else if (is_audio) filter_mutex_unlock(key);
+  } else if (is_audio) filter_mutex_unlock(key);
 
 
   if (deinit_first) weed_set_boolean_value(inst,"host_inited",WEED_TRUE);
@@ -1430,17 +1453,17 @@
   int error;
   register int i;
 
-  for (i=0;i<FX_KEYS_MAX_VIRTUAL;i++) {
+  for (i=0; i<FX_KEYS_MAX_VIRTUAL; i++) {
     if (rte_key_valid(i+1,TRUE)) {
       if (mainw->rte&(GU641<<i)) {
-	mainw->osc_block=TRUE;
-	if ((instance=key_to_instance[i][key_modes[i]])==NULL) continue;
-	last_inst=instance;
-
-	// ignore video generators
-	while (weed_plant_has_leaf(last_inst,"host_next_instance")) last_inst=weed_get_plantptr_value(last_inst,"host_next_instance",&error);
-	if (enabled_in_channels(instance,FALSE)==0&&enabled_out_channels(last_inst,FALSE)>0&&!is_pure_audio(last_inst,FALSE)) continue;
-	weed_reinit_effect(instance,TRUE);
+        mainw->osc_block=TRUE;
+        if ((instance=key_to_instance[i][key_modes[i]])==NULL) continue;
+        last_inst=instance;
+
+        // ignore video generators
+        while (weed_plant_has_leaf(last_inst,"host_next_instance")) last_inst=weed_get_plantptr_value(last_inst,"host_next_instance",&error);
+        if (enabled_in_channels(instance,FALSE)==0&&enabled_out_channels(last_inst,FALSE)>0&&!is_pure_audio(last_inst,FALSE)) continue;
+        weed_reinit_effect(instance,TRUE);
       }
     }
   }
@@ -1493,7 +1516,7 @@
   height=weed_get_int_value(out_channels[0],"height",&error);
   xminh=1;
 
-  for (i=0;i<nchannels;i++) {
+  for (i=0; i<nchannels; i++) {
     // min height for slices is 1, unless an out channel has vstep set
     // or using a compressed yuv palette
     ctmpl=weed_get_plantptr_value(out_channels[i],"template",&error);
@@ -1502,7 +1525,7 @@
     vrt=weed_palette_get_plane_ratio_vertical(pal,1);
     if (vrt!=0.&&vrt<1.) if (xminh<(int)(1./vrt)) xminh=(int)(1./vrt);
 
-    if (weed_plant_has_leaf(ctmpl,"vstep")) { 
+    if (weed_plant_has_leaf(ctmpl,"vstep")) {
       minh=weed_get_int_value(ctmpl,"vstep",&error);
       if (minh>xminh) xminh=minh;
     }
@@ -1518,43 +1541,43 @@
 
   dheight=slices_per_thread*xminh;
 
-  for (i=0;i<nchannels;i++) {
+  for (i=0; i<nchannels; i++) {
     weed_set_int_value(out_channels[i],"offset",0);
     weed_set_int_value(out_channels[i],"host_height",height);
     weed_set_int_value(out_channels[i],"height",dheight);
   }
 
-  procvals=(struct _procvals *)g_malloc(sizeof(struct _procvals)*to_use);
+  procvals=(struct _procvals *)lives_malloc(sizeof(struct _procvals)*to_use);
   if (to_use>1) {
-    xinst=(weed_plant_t **)g_malloc(sizeof(weed_plant_t *)*(to_use-1));
+    xinst=(weed_plant_t **)lives_malloc(sizeof(weed_plant_t *)*(to_use-1));
     dthreads=(pthread_t *)calloc(sizeof(pthread_t)*(to_use-1),1);
   }
 
-  for (j=1;j<to_use;j++) {
+  for (j=1; j<to_use; 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-1]=weed_plant_copy(inst);
-    xchannels=(weed_plant_t **)g_malloc(nchannels*sizeof(weed_plant_t *));
-    
-    for (i=0;i<nchannels;i++) {
+    xchannels=(weed_plant_t **)lives_malloc(nchannels*sizeof(weed_plant_t *));
+
+    for (i=0; i<nchannels; i++) {
       xchannels[i]=weed_plant_copy(out_channels[i]);
       ctmpl=weed_get_plantptr_value(out_channels[i],"template",&error);
 
       offset=dheight*j;
 
       if ((height-offset)<dheight) {
-	dheight=height-offset;
+        dheight=height-offset;
       }
-      
+
       weed_set_int_value(xchannels[i],"offset",offset);
       weed_set_int_value(xchannels[i],"height",dheight);
     }
-    
+
     weed_set_plantptr_array(xinst[j-1],"out_channels",nchannels,xchannels);
-    g_free(xchannels);
-    
+    lives_free(xchannels);
+
     procvals[j].inst=xinst[j-1];
     procvals[j].tc=tc; // use same timecode for all slices
 
@@ -1573,32 +1596,32 @@
 
   if (retval==WEED_ERROR_PLUGIN_INVALID) got_invalid=TRUE;
 
-  for (i=0;i<nchannels;i++) {
+  for (i=0; i<nchannels; i++) {
     weed_leaf_delete(out_channels[i],"offset");
     weed_set_int_value(out_channels[i],"height",weed_get_int_value(out_channels[i],"host_height",&error));
     weed_leaf_delete(out_channels[i],"host_height");
   }
-  
+
   // wait for threads to finish
-  for (j=0;j<nthreads;j++) {
+  for (j=0; j<nthreads; j++) {
     retval=WEED_NO_ERROR;
-    
+
     pthread_join(dthreads[j],NULL);
     retval=procvals[j].ret;
-    
+
     xchannels=weed_get_plantptr_array(xinst[j],"out_channels",&error);
-    for (i=0;i<nchannels;i++) {
+    for (i=0; i<nchannels; i++) {
       weed_plant_free(xchannels[i]);
     }
-    weed_free(xchannels);
+    lives_free(xchannels);
     weed_plant_free(xinst[j]);
-    
+
     if (retval==WEED_ERROR_PLUGIN_INVALID) got_invalid=TRUE;
   }
 
-  g_free(procvals);
-  if (xinst!=NULL) g_free(xinst);
-  if (dthreads!=NULL) g_free(dthreads);
+  lives_free(procvals);
+  if (xinst!=NULL) lives_free(xinst);
+  if (dthreads!=NULL) lives_free(dthreads);
 
   if (got_invalid) return FILTER_ERROR_MUST_RELOAD;
 
@@ -1607,8 +1630,8 @@
 
 
 
-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) {
+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:
   // get our in_tracks and out_tracks that map filter_instance channels to layers
 
@@ -1623,7 +1646,7 @@
 
   // if width and height are wrong, resize in the layer
 
-  // if palette is wrong, first we try to change the plugin channel palette, 
+  // if palette is wrong, first we try to change the plugin channel palette,
   // if not possible we convert palette in the layer
 
   // apply the effect, put result in output layer, set layer palette, width, height, rowstrides
@@ -1638,7 +1661,7 @@
 
   // WARNING: output layer may need resizing, and its palette may need adjusting - should be checked by the caller
 
-  // opwidth and opheight limit the maximum frame size, they can either be set to 0,0 or to max display size; 
+  // opwidth and opheight limit the maximum frame size, they can either be set to 0,0 or to max display size;
   // however if all sources are smaller than this
   // then the output will be smaller also and need resizing by the caller
 
@@ -1696,7 +1719,7 @@
 
   if ((!weed_plant_has_leaf(inst,"out_channels")||(out_channels=weed_get_plantptr_array(inst,"out_channels",&error))==NULL)
       &&(mainw->preview||mainw->is_rendering)&&(num_compound_fx(inst)==1)) {
-    if (out_channels!=NULL) weed_free(out_channels);
+    if (out_channels!=NULL) lives_free(out_channels);
     return retval;
   }
 
@@ -1719,62 +1742,61 @@
       weed_set_double_value(inst,"fps",cfile->pb_fps);
 
       // see if we can multithread
-      if ((prefs->nfx_threads=future_prefs->nfx_threads)>1 && 
-	  filter_flags&WEED_FILTER_HINT_MAY_THREAD) {
-	filter_mutex_lock(key);
-	retval=process_func_threaded(inst,out_channels,tc);
-	filter_mutex_unlock(key);
-	if (retval!=FILTER_ERROR_DONT_THREAD) did_thread=TRUE;
+      if ((prefs->nfx_threads=future_prefs->nfx_threads)>1 &&
+          filter_flags&WEED_FILTER_HINT_MAY_THREAD) {
+        filter_mutex_lock(key);
+        retval=process_func_threaded(inst,out_channels,tc);
+        filter_mutex_unlock(key);
+        if (retval!=FILTER_ERROR_DONT_THREAD) did_thread=TRUE;
       }
       if (!did_thread) {
-	// normal single threaded version
-	int ret;
-	weed_leaf_get(filter,"process_func",0,(void *)&process_func_ptr_ptr);
-	process_func=process_func_ptr_ptr[0];
-	filter_mutex_lock(key);
-	ret=(*process_func)(inst,tc);
-	filter_mutex_unlock(key);
-	if (ret==WEED_ERROR_PLUGIN_INVALID) retval=FILTER_ERROR_MUST_RELOAD;
+        // normal single threaded version
+        int ret;
+        weed_leaf_get(filter,"process_func",0,(void *)&process_func_ptr_ptr);
+        process_func=process_func_ptr_ptr[0];
+        filter_mutex_lock(key);
+        ret=(*process_func)(inst,tc);
+        filter_mutex_unlock(key);
+        if (ret==WEED_ERROR_PLUGIN_INVALID) retval=FILTER_ERROR_MUST_RELOAD;
       }
       return retval;
     }
-    if (out_channels!=NULL) weed_free(out_channels);
+    if (out_channels!=NULL) lives_free(out_channels);
     return FILTER_ERROR_NO_IN_CHANNELS;
   }
 
   if (weed_plant_has_leaf(filter,"rowstride_alignment_hint")) {
     int rowstride_alignment_hint=weed_get_int_value(filter,"rowstride_alignment_hint",&error);
     if ((rowstride_alignment_hint==16||
-	 rowstride_alignment_hint==8||
-	 rowstride_alignment_hint==4||
-	 rowstride_alignment_hint==2)
-	 &&rowstride_alignment_hint>mainw->rowstride_alignment_hint) 
+         rowstride_alignment_hint==8||
+         rowstride_alignment_hint==4||
+         rowstride_alignment_hint==2)
+        &&rowstride_alignment_hint>mainw->rowstride_alignment_hint)
       mainw->rowstride_alignment_hint=rowstride_alignment_hint;
   }
 
   if (get_enabled_channel(inst,0,TRUE)==NULL) {
     // we process generators elsewhere
-    weed_free(in_channels);
-    if (out_channels!=NULL) weed_free(out_channels);
+    lives_free(in_channels);
+    if (out_channels!=NULL) lives_free(out_channels);
     return FILTER_ERROR_NO_IN_CHANNELS;
   }
 
   if (is_pure_audio(filter,TRUE)) {
-    weed_free(in_channels);
-    if (out_channels!=NULL) weed_free(out_channels);
+    lives_free(in_channels);
+    if (out_channels!=NULL) lives_free(out_channels);
     return FILTER_ERROR_IS_AUDIO; // we process audio effects elsewhere
   }
 
   if (init_event==NULL) {
     num_in_tracks=enabled_in_channels(inst,FALSE);
-    in_tracks=(int *)weed_malloc(2*sizint);
+    in_tracks=(int *)lives_malloc(2*sizint);
     in_tracks[0]=0;
     in_tracks[1]=1;
     num_out_tracks=enabled_out_channels(inst,FALSE);
-    out_tracks=(int *)weed_malloc(sizint);
+    out_tracks=(int *)lives_malloc(sizint);
     out_tracks[0]=0;
-  }
-  else {
+  } else {
     num_in_tracks=weed_leaf_num_elements(init_event,"in_tracks");
     in_tracks=weed_get_int_array(init_event,"in_tracks",&error);
     num_out_tracks=weed_leaf_num_elements(init_event,"out_tracks");
@@ -1786,10 +1808,10 @@
   // either we temporarily disable the channel, or we can't apply the filter
   num_inc=weed_leaf_num_elements(inst,"in_channels");
 
-  for (i=0;i<num_inc;i++) {
+  for (i=0; i<num_inc; i++) {
     if (weed_palette_is_alpha_palette(weed_get_int_value(in_channels[i],"current_palette",&error))&&
-	!(weed_plant_has_leaf(in_channels[i],"disabled") && 
-	  weed_get_boolean_value(in_channels[i],"disabled",&error)==WEED_TRUE))
+        !(weed_plant_has_leaf(in_channels[i],"disabled") &&
+          weed_get_boolean_value(in_channels[i],"disabled",&error)==WEED_TRUE))
       num_in_alpha++;
   }
 
@@ -1800,25 +1822,25 @@
   if (num_in_tracks>num_inc) num_in_tracks=num_inc; // for example, compound fx
 
   if (num_inc>num_in_tracks) {
-    for (i=num_in_tracks;i<num_inc+num_in_alpha;i++) {
+    for (i=num_in_tracks; i<num_inc+num_in_alpha; i++) {
       if (!weed_palette_is_alpha_palette(weed_get_int_value(in_channels[i],"current_palette",&error))) {
-	if (!weed_plant_has_leaf(in_channels[i],"disabled")||
-	    weed_get_boolean_value(in_channels[i],"disabled",&error)==WEED_FALSE) 
-	  weed_set_boolean_value(in_channels[i],"host_temp_disabled",WEED_TRUE);
-   	else weed_set_boolean_value(in_channels[i],"host_temp_disabled",WEED_FALSE);
+        if (!weed_plant_has_leaf(in_channels[i],"disabled")||
+            weed_get_boolean_value(in_channels[i],"disabled",&error)==WEED_FALSE)
+          weed_set_boolean_value(in_channels[i],"host_temp_disabled",WEED_TRUE);
+        else weed_set_boolean_value(in_channels[i],"host_temp_disabled",WEED_FALSE);
       }
     }
   }
 
   while (layers[lcount++]!=NULL);
 
-  for (k=i=0;i<num_in_tracks;i++) {
+  for (k=i=0; i<num_in_tracks; i++) {
 
     if (in_tracks[i]<0) {
-      weed_free(in_tracks);
-      weed_free(out_tracks);
-      weed_free(in_channels);
-      if (out_channels!=NULL) weed_free(out_channels);
+      lives_free(in_tracks);
+      lives_free(out_tracks);
+      lives_free(in_channels);
+      if (out_channels!=NULL) lives_free(out_channels);
       return FILTER_ERROR_INVALID_TRACK; // probably audio
     }
 
@@ -1828,20 +1850,20 @@
     weed_set_boolean_value(channel,"host_temp_disabled",WEED_FALSE);
 
     if (in_tracks[i]>=lcount) {
-      for (j=k;j<num_in_tracks+num_in_alpha;j++) {
-	if (weed_palette_is_alpha_palette(weed_get_int_value(in_channels[j],"current_palette",&error))) continue;
-	channel=in_channels[j];
-	chantmpl=weed_get_plantptr_value(channel,"template",&error);
-	if (weed_plant_has_leaf(chantmpl,"max_repeats")||(weed_plant_has_leaf(chantmpl,"option")&&
-							  weed_get_boolean_value(chantmpl,"optional",&error)==WEED_TRUE))
-	  weed_set_boolean_value(channel,"host_temp_disabled",WEED_TRUE);
-	else {
-	  weed_free(in_tracks);
-	  weed_free(out_tracks);
-	  weed_free(in_channels);
-	  if (out_channels!=NULL) weed_free(out_channels);
-	  return FILTER_ERROR_MISSING_LAYER;
-	}
+      for (j=k; j<num_in_tracks+num_in_alpha; j++) {
+        if (weed_palette_is_alpha_palette(weed_get_int_value(in_channels[j],"current_palette",&error))) continue;
+        channel=in_channels[j];
+        chantmpl=weed_get_plantptr_value(channel,"template",&error);
+        if (weed_plant_has_leaf(chantmpl,"max_repeats")||(weed_plant_has_leaf(chantmpl,"option")&&
+            weed_get_boolean_value(chantmpl,"optional",&error)==WEED_TRUE))
+          weed_set_boolean_value(channel,"host_temp_disabled",WEED_TRUE);
+        else {
+          lives_free(in_tracks);
+          lives_free(out_tracks);
+          lives_free(in_channels);
+          if (out_channels!=NULL) lives_free(out_channels);
+          return FILTER_ERROR_MISSING_LAYER;
+        }
       }
       break;
     }
@@ -1852,20 +1874,19 @@
     if (weed_get_voidptr_value(layer,"pixel_data",&error)==NULL) {
       frame=weed_get_int_value(layer,"frame",&error);
       if (frame==0) {
-	// temp disable channels if we can
-	channel=in_channels[k];
-	chantmpl=weed_get_plantptr_value(channel,"template",&error);
-	if (weed_plant_has_leaf(chantmpl,"max_repeats")||(weed_plant_has_leaf(chantmpl,"option")&&
-							  weed_get_boolean_value(chantmpl,"optional",&error)==WEED_TRUE)) {
-	  weed_set_boolean_value(channel,"host_temp_disabled",WEED_TRUE);
-	}
-	else {
-	  weed_free(in_tracks);
-	  weed_free(out_tracks);
-	  weed_free(in_channels);
-	  if (out_channels!=NULL) weed_free(out_channels);
-	  return FILTER_ERROR_BLANK_FRAME;
-	}
+        // temp disable channels if we can
+        channel=in_channels[k];
+        chantmpl=weed_get_plantptr_value(channel,"template",&error);
+        if (weed_plant_has_leaf(chantmpl,"max_repeats")||(weed_plant_has_leaf(chantmpl,"option")&&
+            weed_get_boolean_value(chantmpl,"optional",&error)==WEED_TRUE)) {
+          weed_set_boolean_value(channel,"host_temp_disabled",WEED_TRUE);
+        } else {
+          lives_free(in_tracks);
+          lives_free(out_tracks);
+          lives_free(in_channels);
+          if (out_channels!=NULL) lives_free(out_channels);
+          return FILTER_ERROR_BLANK_FRAME;
+        }
       }
     }
     k++;
@@ -1875,53 +1896,52 @@
   // ensure all chantmpls not marked "optional" have at least one corresponding enabled channel
   // e.g. we could have disabled all channels from a template with "max_repeats" that is not "optional"
   num_ctmpl=weed_leaf_num_elements(filter,"in_channel_templates");
-  mand=(int *)g_malloc(num_ctmpl*sizint);
-  for (j=0;j<num_ctmpl;j++) mand[j]=0;
+  mand=(int *)lives_malloc(num_ctmpl*sizint);
+  for (j=0; j<num_ctmpl; j++) mand[j]=0;
   in_ctmpls=weed_get_plantptr_array(filter,"in_channel_templates",&error);
 
-  for (i=0;i<num_inc+num_in_alpha;i++) {
+  for (i=0; i<num_inc+num_in_alpha; i++) {
     if ((weed_plant_has_leaf(in_channels[i],"disabled")&&
-	 weed_get_boolean_value(in_channels[i],"disabled",&error)==WEED_TRUE)||
-	(weed_plant_has_leaf(in_channels[i],"host_temp_disabled")&&
-	 weed_get_boolean_value(in_channels[i],"host_temp_disabled",&error)==WEED_TRUE)) continue;
+         weed_get_boolean_value(in_channels[i],"disabled",&error)==WEED_TRUE)||
+        (weed_plant_has_leaf(in_channels[i],"host_temp_disabled")&&
+         weed_get_boolean_value(in_channels[i],"host_temp_disabled",&error)==WEED_TRUE)) continue;
     chantmpl=weed_get_plantptr_value(in_channels[i],"template",&error);
-    for (j=0;j<num_ctmpl;j++) {
+    for (j=0; j<num_ctmpl; j++) {
       if (chantmpl==in_ctmpls[j]) {
-	mand[j]=1;
-	break;
+        mand[j]=1;
+        break;
       }
     }
   }
 
-  for (j=0;j<num_ctmpl;j++) {
+  for (j=0; j<num_ctmpl; j++) {
     if (mand[j]==0&&(!weed_plant_has_leaf(in_ctmpls[j],"optional")||
-		     weed_get_boolean_value(in_ctmpls[j],"optional",&error)==WEED_FALSE)) {
-      weed_free(in_ctmpls);
-      weed_free(in_tracks);
-      weed_free(out_tracks);
-      weed_free(in_channels);
-      if (out_channels!=NULL) weed_free(out_channels);
-      g_free(mand);
+                     weed_get_boolean_value(in_ctmpls[j],"optional",&error)==WEED_FALSE)) {
+      lives_free(in_ctmpls);
+      lives_free(in_tracks);
+      lives_free(out_tracks);
+      lives_free(in_channels);
+      if (out_channels!=NULL) lives_free(out_channels);
+      lives_free(mand);
       return FILTER_ERROR_MISSING_LAYER;
     }
   }
 
-  weed_free(in_ctmpls);
-  g_free(mand);
+  lives_free(in_ctmpls);
+  lives_free(mand);
+
 
-  
   num_outc=weed_leaf_num_elements(inst,"out_channels");
 
-  for (i=0;i<num_outc;i++) {
+  for (i=0; i<num_outc; i++) {
     if (weed_palette_is_alpha_palette(weed_get_int_value(out_channels[i],"current_palette",&error))) {
-      if (!(weed_plant_has_leaf(out_channels[i],"disabled") && 
-	    weed_get_boolean_value(out_channels[i],"disabled",&error)==WEED_TRUE))
-	num_out_alpha++;
-    }
-    else {
+      if (!(weed_plant_has_leaf(out_channels[i],"disabled") &&
+            weed_get_boolean_value(out_channels[i],"disabled",&error)==WEED_TRUE))
+        num_out_alpha++;
+    } else {
       if ((!weed_plant_has_leaf(out_channels[i],"disabled")||weed_get_boolean_value(out_channels[i],"disabled",&error)==WEED_FALSE)&&
-	  (!weed_plant_has_leaf(out_channels[i],"disabled")||weed_get_boolean_value(out_channels[i],"disabled",&error)==WEED_FALSE)) {
-	nmandout++;
+          (!weed_plant_has_leaf(out_channels[i],"disabled")||weed_get_boolean_value(out_channels[i],"disabled",&error)==WEED_FALSE)) {
+        nmandout++;
       }
     }
   }
@@ -1933,32 +1953,32 @@
   if (nmandout>num_out_tracks) {
     // occasionally during recording we get an init_event with no "out_tracks" (probably when an audio effect inits/deinits a video effect)
     // needs more investigation
-    weed_free(in_tracks);
-    weed_free(out_tracks);
-    weed_free(in_channels);
-    if (out_channels!=NULL) weed_free(out_channels);
+    lives_free(in_tracks);
+    lives_free(out_tracks);
+    lives_free(in_channels);
+    if (out_channels!=NULL) lives_free(out_channels);
     return FILTER_ERROR_MISSING_CHANNEL;
   }
 
 
   // pull frames for tracks
 
-  for (i=0;i<num_out_tracks+num_out_alpha;i++) {
+  for (i=0; i<num_out_tracks+num_out_alpha; i++) {
     if (i>=num_outc) continue; // for compound filters, num_out_tracks may not be valid
     channel=out_channels[i];
     palette=weed_get_int_value(channel,"current_palette",&error);
     if (weed_palette_is_alpha_palette(palette)) continue;
     if (weed_plant_has_leaf(channel,"host_temp_disabled")&&
-	weed_get_boolean_value(channel,"host_temp_disabled",&error)==WEED_TRUE) continue;
+        weed_get_boolean_value(channel,"host_temp_disabled",&error)==WEED_TRUE) continue;
     all_outs_alpha=FALSE;
   }
 
 
-  for (j=i=0;i<num_in_tracks;i++) {
+  for (j=i=0; i<num_in_tracks; i++) {
     while (weed_palette_is_alpha_palette(weed_get_int_value(in_channels[j],"current_palette",&error))) j++;
 
     if (weed_plant_has_leaf(in_channels[j],"host_temp_disabled")&&
-	weed_get_boolean_value(in_channels[j],"host_temp_disabled",&error)==WEED_TRUE) {
+        weed_get_boolean_value(in_channels[j],"host_temp_disabled",&error)==WEED_TRUE) {
       j++;
       continue;
     }
@@ -1968,24 +1988,24 @@
     if (!weed_plant_has_leaf(layer,"pixel_data")||weed_get_voidptr_value(layer,"pixel_data",&error)==NULL) {
       // pull_frame will set pixel_data,width,height,current_palette and rowstrides
       if (!pull_frame(layer,get_image_ext_for_type(mainw->files[clip]->img_type),tc)) {
-	weed_free(in_tracks);
-	weed_free(out_tracks);
-	weed_free(in_channels);
-	if (out_channels!=NULL) weed_free(out_channels);
-	return FILTER_ERROR_MISSING_FRAME;
+        lives_free(in_tracks);
+        lives_free(out_tracks);
+        lives_free(in_channels);
+        if (out_channels!=NULL) lives_free(out_channels);
+        return FILTER_ERROR_MISSING_FRAME;
       }
     }
     // we apply only transitions and compositors to the scrap file
     if (clip==mainw->scrap_file&&num_in_tracks==1&&num_out_tracks==1) {
-      weed_free(in_tracks);
-      weed_free(out_tracks);
-      weed_free(in_channels);
-      if (out_channels!=NULL) weed_free(out_channels);
+      lives_free(in_tracks);
+      lives_free(out_tracks);
+      lives_free(in_channels);
+      if (out_channels!=NULL) lives_free(out_channels);
       return FILTER_ERROR_IS_SCRAP_FILE;
     }
     // use comparative widths - in RGB(A) pixels
     palette=weed_get_int_value(layer,"current_palette",&error);
-    if ((inwidth=(weed_get_int_value(layer,"width",&error)*weed_palette_get_pixels_per_macropixel(palette)))>maxinwidth) 
+    if ((inwidth=(weed_get_int_value(layer,"width",&error)*weed_palette_get_pixels_per_macropixel(palette)))>maxinwidth)
       maxinwidth=inwidth;
     if ((inheight=weed_get_int_value(layer,"height",&error))>maxinheight) maxinheight=inheight;
     j++;
@@ -1997,23 +2017,22 @@
 
   // first we resize if necessary; then we change the palette
 
-  for (k=i=0;k<num_inc+num_in_alpha;k++) {
+  for (k=i=0; k<num_inc+num_in_alpha; k++) {
 
     channel=get_enabled_channel(inst,k,TRUE);
     if (channel==NULL) break;
-    
+
     if (weed_plant_has_leaf(channel,"host_temp_disabled")&&
-	weed_get_boolean_value(channel,"host_temp_disabled",&error)==WEED_TRUE) continue;
+        weed_get_boolean_value(channel,"host_temp_disabled",&error)==WEED_TRUE) continue;
 
     chantmpl=weed_get_plantptr_value(channel,"template",&error);
-    
+
     if (def_channel==NULL) def_channel=channel;
 
     if (weed_palette_is_alpha_palette(weed_get_int_value(channel,"current_palette",&error))) {
       if (def_channel==channel) continue;
       palette=weed_get_int_value(channel,"current_palette",&error);
-    }
-    else {
+    } else {
       layer=layers[in_tracks[i]];
       palette=weed_get_int_value(layer,"current_palette",&error);
     }
@@ -2021,10 +2040,10 @@
     // values in pixels
     width=opwidth;
     height=opheight;
-    
+
     channel_flags=0;
     if (weed_plant_has_leaf(chantmpl,"flags")) channel_flags=weed_get_int_value(chantmpl,"flags",&error);
-    
+
     // (channel macropixels)
     incwidth=weed_get_int_value(channel,"width",&error);
     incheight=weed_get_int_value(channel,"height",&error);
@@ -2032,8 +2051,7 @@
     if (weed_palette_is_alpha_palette(weed_get_int_value(channel,"current_palette",&error))) {
       inwidth=weed_get_int_value(def_channel,"width",&error);
       inheight=weed_get_int_value(def_channel,"height",&error);
-    }
-    else {
+    } else {
       // (layer macropixels)
       inwidth=weed_get_int_value(layer,"width",&error);
       inheight=weed_get_int_value(layer,"height",&error);
@@ -2056,7 +2074,7 @@
     if (weed_palette_is_alpha_palette(cpalette)) continue;
 
     width=weed_get_int_value(channel,"width",&error)*weed_palette_get_pixels_per_macropixel(cpalette)/
-      weed_palette_get_pixels_per_macropixel(palette);
+          weed_palette_get_pixels_per_macropixel(palette);
     height=weed_get_int_value(channel,"height",&error);
 
     // restore channel to original size for now
@@ -2071,79 +2089,77 @@
       // layer needs resizing
 
       if (prefs->pb_quality==PB_QUALITY_HIGH||opwidth==0||opheight==0) {
-	if (!resize_layer(layer,width,height,LIVES_INTERP_BEST,cpalette,iclamping)) {
-	    weed_free(in_tracks);
-	    weed_free(out_tracks);
-	    weed_free(in_channels);
-	    if (out_channels!=NULL) weed_free(out_channels);
-	    return FILTER_ERROR_UNABLE_TO_RESIZE;
-	  }
-      }
-      else {
-	if (!resize_layer(layer,width,height,get_interp_value(prefs->pb_quality),cpalette,iclamping)) {
-	  weed_free(in_tracks);
-	  weed_free(out_tracks);
-	  weed_free(in_channels);
-	  if (out_channels!=NULL) weed_free(out_channels);
-	  return FILTER_ERROR_UNABLE_TO_RESIZE;
-	}
+        if (!resize_layer(layer,width,height,LIVES_INTERP_BEST,cpalette,iclamping)) {
+          lives_free(in_tracks);
+          lives_free(out_tracks);
+          lives_free(in_channels);
+          if (out_channels!=NULL) lives_free(out_channels);
+          return FILTER_ERROR_UNABLE_TO_RESIZE;
+        }
+      } else {
+        if (!resize_layer(layer,width,height,get_interp_value(prefs->pb_quality),cpalette,iclamping)) {
+          lives_free(in_tracks);
+          lives_free(out_tracks);
+          lives_free(in_channels);
+          if (out_channels!=NULL) lives_free(out_channels);
+          return FILTER_ERROR_UNABLE_TO_RESIZE;
+        }
       }
       // check palette again in case it changed during resize
       inpalette=weed_get_int_value(channel,"current_palette",&error);
 
       inwidth=weed_get_int_value(layer,"width",&error)*weed_palette_get_pixels_per_macropixel(inpalette)/
-      weed_palette_get_pixels_per_macropixel(palette);
+              weed_palette_get_pixels_per_macropixel(palette);
 
       inheight=weed_get_int_value(layer,"height",&error);
 
       if (0&&((inwidth!=width)||(inheight!=height))) {
-	weed_free(in_tracks);
-	weed_free(out_tracks);
-	weed_free(in_channels);
-	if (out_channels!=NULL) weed_free(out_channels);
-	return FILTER_ERROR_UNABLE_TO_RESIZE;
+        lives_free(in_tracks);
+        lives_free(out_tracks);
+        lives_free(in_channels);
+        if (out_channels!=NULL) lives_free(out_channels);
+        return FILTER_ERROR_UNABLE_TO_RESIZE;
       }
     }
-    
+
     i++;
 
-    
-    // try to match palettes with first enabled in channel: 
+
+    // try to match palettes with first enabled in channel:
     // TODO ** - we should see which palette causes the least palette conversions
-    if (i>0&&!(channel_flags&WEED_CHANNEL_PALETTE_CAN_VARY)) 
+    if (i>0&&!(channel_flags&WEED_CHANNEL_PALETTE_CAN_VARY))
       palette=weed_get_int_value(def_channel,"current_palette",&error);
-    
+
     if (palette!=inpalette) {
       // palette change needed; first try to change channel palette
       int num_palettes=weed_leaf_num_elements(chantmpl,"palette_list");
       int *palettes=weed_get_int_array(chantmpl,"palette_list",&error);
       if ((palette=check_weed_palette_list(palettes,num_palettes,palette))!=inpalette) {
-	weed_set_int_value(channel,"current_palette",palette);
-	if (channel_flags&WEED_CHANNEL_REINIT_ON_PALETTE_CHANGE) needs_reinit=TRUE;
-	weed_set_int_value(channel,"width",incwidth/
-			   weed_palette_get_pixels_per_macropixel(palette)*
-			   weed_palette_get_pixels_per_macropixel(inpalette));
-	nchr=weed_leaf_num_elements(channel,"rowstrides");
-	channel_rows=weed_get_int_array(channel,"rowstrides",&error);
-	for (j=0;j<nchr;j++) {
-	  if (weed_palette_get_plane_ratio_horizontal(inpalette,j)!=0.) 
-	    channel_rows[j]*=weed_palette_get_plane_ratio_horizontal(palette,j)/
-	      weed_palette_get_plane_ratio_horizontal(inpalette,j);
-	}
-	weed_set_int_array(channel,"rowstrides",nchr,channel_rows);
-	weed_free(channel_rows);
+        weed_set_int_value(channel,"current_palette",palette);
+        if (channel_flags&WEED_CHANNEL_REINIT_ON_PALETTE_CHANGE) needs_reinit=TRUE;
+        weed_set_int_value(channel,"width",incwidth/
+                           weed_palette_get_pixels_per_macropixel(palette)*
+                           weed_palette_get_pixels_per_macropixel(inpalette));
+        nchr=weed_leaf_num_elements(channel,"rowstrides");
+        channel_rows=weed_get_int_array(channel,"rowstrides",&error);
+        for (j=0; j<nchr; j++) {
+          if (weed_palette_get_plane_ratio_horizontal(inpalette,j)!=0.)
+            channel_rows[j]*=weed_palette_get_plane_ratio_horizontal(palette,j)/
+                             weed_palette_get_plane_ratio_horizontal(inpalette,j);
+        }
+        weed_set_int_array(channel,"rowstrides",nchr,channel_rows);
+        lives_free(channel_rows);
       }
-      weed_free(palettes);
+      lives_free(palettes);
 
       if (weed_palette_is_yuv_palette(palette)) {
-	if (!(weed_plant_has_leaf(chantmpl,"YUV_subspace"))||
-	    weed_get_int_value(chantmpl,"YUV_subspace",&error)==WEED_YUV_SUBSPACE_YUV) {
-	  // set to default for LiVES
-	  weed_set_int_value(channel,"YUV_subspace",WEED_YUV_SUBSPACE_YCBCR);
-	}
-	else {
-	  weed_set_int_value(channel,"YUV_subspace",weed_get_int_value(chantmpl,"YUV_subspace",&error));
-	}
+        if (!(weed_plant_has_leaf(chantmpl,"YUV_subspace"))||
+            weed_get_int_value(chantmpl,"YUV_subspace",&error)==WEED_YUV_SUBSPACE_YUV) {
+          // set to default for LiVES
+          weed_set_int_value(channel,"YUV_subspace",WEED_YUV_SUBSPACE_YCBCR);
+        } else {
+          weed_set_int_value(channel,"YUV_subspace",weed_get_int_value(chantmpl,"YUV_subspace",&error));
+        }
       }
     }
   }
@@ -2154,8 +2170,7 @@
     int key=weed_get_int_value(inst,"host_key",&error),mode;
     if (weed_plant_has_leaf(inst,"host_mode")) {
       mode=weed_get_int_value(inst,"host_mode",&error);
-    }
-    else mode=key_modes[key];
+    } else mode=key_modes[key];
 
     // need to do this AFTER setting in-channel size
     if (mainw->cconx!=NULL) {
@@ -2167,7 +2182,7 @@
   // make sure we have pixel_data for all mandatory in alpha channels (from alpha chains)
   // if not, if the ctmpl is optnl mark as host_temp_disabled; else return with error
 
-  for (i=0;i<num_inc+num_in_alpha;i++) {
+  for (i=0; i<num_inc+num_in_alpha; i++) {
     if (!weed_palette_is_alpha_palette(weed_get_int_value(in_channels[i],"current_palette",&error))) continue;
 
     if (weed_plant_has_leaf(in_channels[i],"host_internal_connection")) {
@@ -2177,14 +2192,14 @@
     if (weed_get_voidptr_value(in_channels[i],"pixel_data",&error)==NULL) {
       chantmpl=weed_get_plantptr_value(in_channels[i],"template",&error);
       if (weed_plant_has_leaf(chantmpl,"max_repeats")||(weed_plant_has_leaf(chantmpl,"option")&&
-							weed_get_boolean_value(chantmpl,"optional",&error)==WEED_TRUE))
-	weed_set_boolean_value(in_channels[i],"host_temp_disabled",WEED_TRUE);
+          weed_get_boolean_value(chantmpl,"optional",&error)==WEED_TRUE))
+        weed_set_boolean_value(in_channels[i],"host_temp_disabled",WEED_TRUE);
       else {
-	weed_free(in_tracks);
-	weed_free(out_tracks);
-	weed_free(in_channels);
-	if (out_channels!=NULL) weed_free(out_channels);
-	return FILTER_ERROR_MISSING_CHANNEL;
+        lives_free(in_tracks);
+        lives_free(out_tracks);
+        lives_free(in_channels);
+        if (out_channels!=NULL) lives_free(out_channels);
+        return FILTER_ERROR_MISSING_CHANNEL;
       }
     }
   }
@@ -2193,39 +2208,39 @@
   // now we do a second pass, and we change the palettes of in layers to match the channel, if necessary
 
 
-  for (j=i=0;i<num_in_tracks;i++) {
+  for (j=i=0; i<num_in_tracks; i++) {
 
 
     do {
       channel=get_enabled_channel(inst,i,TRUE);
       chantmpl=weed_get_plantptr_value(channel,"template",&error);
-      
+
       inpalette=weed_get_int_value(channel,"current_palette",&error);
-      
+
       channel_flags=0;
       if (weed_plant_has_leaf(chantmpl,"flags")) channel_flags=weed_get_int_value(chantmpl,"flags",&error);
 
       if (weed_palette_is_alpha_palette(inpalette)) {
-	if (!(channel_flags&WEED_CHANNEL_SIZE_CAN_VARY)) {
-	  width=weed_get_int_value(channel,"width",&error);
-	  height=weed_get_int_value(channel,"height",&error);
-	  if (width != opwidth || height != opheight) {
-	    if (!resize_layer(channel,opwidth,opheight,LIVES_INTERP_BEST,WEED_PALETTE_END,0)) {
-	      weed_free(in_tracks);
-	      weed_free(out_tracks);
-	      weed_free(in_channels);
-	      if (out_channels!=NULL) weed_free(out_channels);
-	      return FILTER_ERROR_UNABLE_TO_RESIZE;
-	    }
-	  }
-	}
+        if (!(channel_flags&WEED_CHANNEL_SIZE_CAN_VARY)) {
+          width=weed_get_int_value(channel,"width",&error);
+          height=weed_get_int_value(channel,"height",&error);
+          if (width != opwidth || height != opheight) {
+            if (!resize_layer(channel,opwidth,opheight,LIVES_INTERP_BEST,WEED_PALETTE_END,0)) {
+              lives_free(in_tracks);
+              lives_free(out_tracks);
+              lives_free(in_channels);
+              if (out_channels!=NULL) lives_free(out_channels);
+              return FILTER_ERROR_UNABLE_TO_RESIZE;
+            }
+          }
+        }
       }
     } while (weed_palette_is_alpha_palette(weed_get_int_value(channel,"current_palette",&error)));
 
 
     if (weed_plant_has_leaf(in_channels[i],"host_temp_disabled")&&
-	weed_get_boolean_value(in_channels[i],"host_temp_disabled",&error)==WEED_TRUE) continue;
-    
+        weed_get_boolean_value(in_channels[i],"host_temp_disabled",&error)==WEED_TRUE) continue;
+
     layer=layers[in_tracks[i]];
 
     if (weed_plant_has_leaf(layer,"YUV_clamping")) iclamping=(weed_get_int_value(layer,"YUV_clamping",&error));
@@ -2241,8 +2256,8 @@
 
     if (osampling==-1||(channel_flags&WEED_CHANNEL_PALETTE_CAN_VARY)) {
       /*   if (weed_plant_has_leaf(chantmpl,"YUV_sampling")) osampling=(weed_get_int_value(layer,"YUV_sampling",&error));
-	   else */
-      
+      else */
+
       // cant convert sampling yet
       osampling=isampling;
     }
@@ -2253,8 +2268,8 @@
 
     if (osubspace==-1||(channel_flags&WEED_CHANNEL_PALETTE_CAN_VARY)) {
       /*if (weed_plant_has_leaf(chantmpl,"YUV_subspace")) osubspace=(weed_get_int_value(chantmpl,"YUV_subspace",&error));
-	else */
- 
+      else */
+
       // cant convert subspace yet
       osubspace=isubspace;
     }
@@ -2272,43 +2287,42 @@
     if (cpalette!=inpalette||isubspace!=osubspace) {
 
       if (all_outs_alpha&&(weed_palette_is_lower_quality(inpalette,cpalette)||
-			   (weed_palette_is_rgb_palette(inpalette)&&
-			    !weed_palette_is_rgb_palette(cpalette))||
-			   (weed_palette_is_rgb_palette(cpalette)&&
-			    !weed_palette_is_rgb_palette(inpalette)))) {
-	// for an analyser (no out channels) we copy the layer if it needs lower quality
-	orig_layer=layer;
-	layer=weed_layer_copy(NULL,orig_layer);
+                           (weed_palette_is_rgb_palette(inpalette)&&
+                            !weed_palette_is_rgb_palette(cpalette))||
+                           (weed_palette_is_rgb_palette(cpalette)&&
+                            !weed_palette_is_rgb_palette(inpalette)))) {
+        // for an analyser (no out channels) we copy the layer if it needs lower quality
+        orig_layer=layer;
+        layer=weed_layer_copy(NULL,orig_layer);
       }
 
       if (!convert_layer_palette_full(layer,inpalette,
-				      osampling,oclamping,osubspace)) {
-	weed_free(in_tracks);
-	weed_free(out_tracks);
-	weed_free(in_channels);
-	if (out_channels!=NULL) weed_free(out_channels);
-	if (orig_layer!=NULL) {
-	  weed_layer_free(layer);
-	}
-	return FILTER_ERROR_INVALID_PALETTE_CONVERSION;
+                                      osampling,oclamping,osubspace)) {
+        lives_free(in_tracks);
+        lives_free(out_tracks);
+        lives_free(in_channels);
+        if (out_channels!=NULL) lives_free(out_channels);
+        if (orig_layer!=NULL) {
+          weed_layer_free(layer);
+        }
+        return FILTER_ERROR_INVALID_PALETTE_CONVERSION;
       }
     }
 
     if (weed_palette_is_yuv_palette(inpalette)) {
-      if (weed_plant_has_leaf(layer,"YUV_clamping")) 
-	oclamping=(weed_get_int_value(layer,"YUV_clamping",&error));
+      if (weed_plant_has_leaf(layer,"YUV_clamping"))
+        oclamping=(weed_get_int_value(layer,"YUV_clamping",&error));
 
-      if (weed_plant_has_leaf(layer,"YUV_sampling")) 
-	osampling=(weed_get_int_value(layer,"YUV_sampling",&error));
+      if (weed_plant_has_leaf(layer,"YUV_sampling"))
+        osampling=(weed_get_int_value(layer,"YUV_sampling",&error));
 
-      if (weed_plant_has_leaf(layer,"YUV_clamping")) 
-	osubspace=(weed_get_int_value(layer,"YUV_subspace",&error));
+      if (weed_plant_has_leaf(layer,"YUV_clamping"))
+        osubspace=(weed_get_int_value(layer,"YUV_subspace",&error));
 
       weed_set_int_value(channel,"YUV_clamping",oclamping);
       weed_set_int_value(channel,"YUV_sampling",osampling);
       weed_set_int_value(channel,"YUV_subspace",osubspace);
-    }
-    else {
+    } else {
       weed_leaf_delete(channel,"YUV_clamping");
       weed_leaf_delete(channel,"YUV_sampling");
       weed_leaf_delete(channel,"YUV_subspace");
@@ -2316,7 +2330,7 @@
 
     incwidth=weed_get_int_value(channel,"width",&error);
     incheight=weed_get_int_value(channel,"height",&error);
-    
+
     nchr=weed_leaf_num_elements(channel,"rowstrides");
     channel_rows=weed_get_int_array(channel,"rowstrides",&error);
 
@@ -2332,18 +2346,18 @@
 
     numplanes=weed_leaf_num_elements(layer,"rowstrides");
     rowstrides=weed_get_int_array(layer,"rowstrides",&error);
-    
+
     set_channel_size(channel,width,height,numplanes,rowstrides);
-    
+
     // check layer rowstrides against previous settings
 
     rowstrides_changed=rowstrides_differ(numplanes,rowstrides,nchr,channel_rows);
-    weed_free(channel_rows);
+    lives_free(channel_rows);
 
     if (((rowstrides_changed&&(channel_flags&WEED_CHANNEL_REINIT_ON_ROWSTRIDES_CHANGE))||
-	 (((incwidth!=width)||(incheight!=height))&&(channel_flags&WEED_CHANNEL_REINIT_ON_SIZE_CHANGE)))) 
+         (((incwidth!=width)||(incheight!=height))&&(channel_flags&WEED_CHANNEL_REINIT_ON_SIZE_CHANGE))))
       needs_reinit=TRUE;
-  
+
     weed_set_int64_value(channel,"timecode",tc);
     pixel_data=weed_get_voidptr_array(layer,"pixel_data",&error);
 
@@ -2351,47 +2365,47 @@
     if (weed_plant_has_leaf(chantmpl,"alignment")) {
       int alignment=weed_get_int_value(chantmpl,"alignment",&error);
       boolean contiguous=FALSE;
-      if (weed_plant_has_leaf(layer,"host_pixel_data_contiguous") && 
-	  weed_get_boolean_value(layer,"host_pixel_data_contiguous",&error)==WEED_TRUE) contiguous=TRUE;
-      align(pixel_data,alignment,numplanes,height,rowstrides,&contiguous);
+      if (weed_plant_has_leaf(layer,"host_pixel_data_contiguous") &&
+          weed_get_boolean_value(layer,"host_pixel_data_contiguous",&error)==WEED_TRUE) contiguous=TRUE;
+      align(pixel_data,alignment,numplanes,height,rowstrides,(int *)&contiguous);
       weed_set_voidptr_array(layer,"pixel_data",numplanes,pixel_data);
       if (contiguous) weed_set_boolean_value(layer,"host_pixel_data_contiguous",WEED_TRUE);
-      else if (weed_plant_has_leaf(layer,"host_pixel_data_contiguous")) 
-	weed_leaf_delete(layer,"host_pixel_data_contiguous");
+      else if (weed_plant_has_leaf(layer,"host_pixel_data_contiguous"))
+        weed_leaf_delete(layer,"host_pixel_data_contiguous");
     }
 
-    weed_free(rowstrides);
+    lives_free(rowstrides);
     weed_set_voidptr_array(channel,"pixel_data",numplanes,pixel_data);
-    weed_free(pixel_data);
-    if (weed_plant_has_leaf(layer,"host_pixel_data_contiguous")) 
+    lives_free(pixel_data);
+    if (weed_plant_has_leaf(layer,"host_pixel_data_contiguous"))
       weed_set_boolean_value(channel,"host_pixel_data_contiguous",
-			     weed_get_boolean_value(layer,"host_pixel_data_contiguous",&error));
-    else if (weed_plant_has_leaf(channel,"host_pixel_data_contiguous")) 
+                             weed_get_boolean_value(layer,"host_pixel_data_contiguous",&error));
+    else if (weed_plant_has_leaf(channel,"host_pixel_data_contiguous"))
       weed_leaf_delete(channel,"host_pixel_data_contiguous");
 
   }
 
   // we may need to disable some channels for the plugin
-  for (i=0;i<num_in_tracks+num_in_alpha;i++) {
+  for (i=0; i<num_in_tracks+num_in_alpha; i++) {
     if (weed_plant_has_leaf(in_channels[i],"host_temp_disabled")&&
-	weed_get_boolean_value(in_channels[i],"host_temp_disabled",&error)==WEED_TRUE) 
+        weed_get_boolean_value(in_channels[i],"host_temp_disabled",&error)==WEED_TRUE)
       weed_set_boolean_value(in_channels[i],"disabled",WEED_TRUE);
   }
 
   // set up our out channels
-  for (i=0;i<num_out_tracks+num_out_alpha;i++) {
+  for (i=0; i<num_out_tracks+num_out_alpha; i++) {
     channel=get_enabled_channel(inst,i,FALSE);
     if (channel==NULL) break; // compound fx
 
     palette=weed_get_int_value(channel,"current_palette",&error);
 
     if (!weed_palette_is_alpha_palette(palette)&&out_tracks[i]<0) {
-      weed_free(in_tracks);
-      weed_free(out_tracks);
-      weed_free(in_channels);
-      if (out_channels!=NULL) weed_free(out_channels);
+      lives_free(in_tracks);
+      lives_free(out_tracks);
+      lives_free(in_channels);
+      if (out_channels!=NULL) lives_free(out_channels);
       if (orig_layer!=NULL) {
-	weed_layer_free(layer);
+        weed_layer_free(layer);
       }
       return FILTER_ERROR_INVALID_TRACK; // probably audio
     }
@@ -2410,140 +2424,136 @@
     channel_rows=weed_get_int_array(channel,"rowstrides",&error);
 
     if (def_channel!=NULL&&i==0&&(weed_palette_is_alpha_palette
-				  (weed_get_int_value(channel,"current_palette",&error)&&
-				   weed_palette_is_alpha_palette
-				   (weed_get_int_value(def_channel,"current_palette",&error)
-				    ))||
-				  (in_tracks!=NULL&&out_tracks!=NULL&&in_tracks[0]==out_tracks[0]))) {
+                                  (weed_get_int_value(channel,"current_palette",&error)&&
+                                   weed_palette_is_alpha_palette
+                                   (weed_get_int_value(def_channel,"current_palette",&error)
+                                   ))||
+                                  (in_tracks!=NULL&&out_tracks!=NULL&&in_tracks[0]==out_tracks[0]))) {
 
       if (channel_flags&WEED_CHANNEL_CAN_DO_INPLACE) {
-	if (!(weed_palette_is_alpha_palette(weed_get_int_value(in_channels[i],"current_palette",&error) &&
-					    weed_plant_has_leaf(channel,"host_orig_pdata") && 
-					    weed_get_boolean_value(channel,"host_orig_pdata",&error)==WEED_TRUE))) {
-
-	  // ah, good, inplace
-	  int num_palettes=weed_leaf_num_elements(chantmpl,"palette_list");
-	  int *palettes=weed_get_int_array(chantmpl,"palette_list",&error);
-	  palette=weed_get_int_value(def_channel,"current_palette",&error);
-	  if (check_weed_palette_list(palettes,num_palettes,palette)==palette) {
-	    weed_set_int_value(channel,"current_palette",palette);
-	    if (outpalette!=palette&&(channel_flags&WEED_CHANNEL_REINIT_ON_PALETTE_CHANGE)) needs_reinit=TRUE;
-
-	    width=weed_get_int_value(def_channel,"width",&error);
-	    height=weed_get_int_value(def_channel,"height",&error);
-	    weed_set_int_value(channel,"width",width);
-	    weed_set_int_value(channel,"height",height);
-
-	    weed_set_int_value(channel,"current_palette",palette);
-	    if (weed_plant_has_leaf(def_channel,"YUV_clamping")) {
-	      oclamping=(weed_get_int_value(def_channel,"YUV_clamping",&error));
-	      weed_set_int_value(channel,"YUV_clamping",oclamping);
-	    }
-	    else weed_leaf_delete(channel,"YUV_clamping");
-	    
-	    if (weed_plant_has_leaf(def_channel,"YUV_sampling")) 
-	      weed_set_int_value(channel,"YUV_sampling",weed_get_int_value(def_channel,"YUV_sampling",&error));
-	    else weed_leaf_delete(channel,"YUV_sampling");
-	    
-	    if (weed_plant_has_leaf(def_channel,"YUV_subspace")) 
-	      weed_set_int_value(channel,"YUV_subspace",weed_get_int_value(def_channel,"YUV_subspace",&error));
-	    else weed_leaf_delete(channel,"YUV_subspace");
-	    
-	    numplanes=weed_leaf_num_elements(def_channel,"rowstrides");
-	    layer_rows=weed_get_int_array(def_channel,"rowstrides",&error);
-	    weed_set_int_array(channel,"rowstrides",numplanes,layer_rows);
-	    pixel_data=weed_get_voidptr_array(def_channel,"pixel_data",&error);
-	    weed_set_voidptr_array(channel,"pixel_data",numplanes,pixel_data);
-	    weed_free(pixel_data);
-	    weed_set_boolean_value(channel,"inplace",WEED_TRUE);
-	    inplace=TRUE;
-	    if (weed_plant_has_leaf(def_channel,"host_pixel_data_contiguous")) 
-	      weed_set_boolean_value(channel,"host_pixel_data_contiguous",
-				     weed_get_boolean_value(def_channel,"host_pixel_data_contiguous",&error));
-	    else if (weed_plant_has_leaf(channel,"host_pixel_data_contiguous")) 
-	      weed_leaf_delete(channel,"host_pixel_data_contiguous");
-
-	    if (weed_palette_is_alpha_palette(palette)) {
-	      // protect our in- channel from being freed()
-	      weed_set_boolean_value(channel,"host_orig_pdata",WEED_TRUE);
-	    }
-	  }
-	  weed_free(palettes);
-	}
+        if (!(weed_palette_is_alpha_palette(weed_get_int_value(in_channels[i],"current_palette",&error) &&
+                                            weed_plant_has_leaf(channel,"host_orig_pdata") &&
+                                            weed_get_boolean_value(channel,"host_orig_pdata",&error)==WEED_TRUE))) {
+
+          // ah, good, inplace
+          int num_palettes=weed_leaf_num_elements(chantmpl,"palette_list");
+          int *palettes=weed_get_int_array(chantmpl,"palette_list",&error);
+          palette=weed_get_int_value(def_channel,"current_palette",&error);
+          if (check_weed_palette_list(palettes,num_palettes,palette)==palette) {
+            weed_set_int_value(channel,"current_palette",palette);
+            if (outpalette!=palette&&(channel_flags&WEED_CHANNEL_REINIT_ON_PALETTE_CHANGE)) needs_reinit=TRUE;
+
+            width=weed_get_int_value(def_channel,"width",&error);
+            height=weed_get_int_value(def_channel,"height",&error);
+            weed_set_int_value(channel,"width",width);
+            weed_set_int_value(channel,"height",height);
+
+            weed_set_int_value(channel,"current_palette",palette);
+            if (weed_plant_has_leaf(def_channel,"YUV_clamping")) {
+              oclamping=(weed_get_int_value(def_channel,"YUV_clamping",&error));
+              weed_set_int_value(channel,"YUV_clamping",oclamping);
+            } else weed_leaf_delete(channel,"YUV_clamping");
+
+            if (weed_plant_has_leaf(def_channel,"YUV_sampling"))
+              weed_set_int_value(channel,"YUV_sampling",weed_get_int_value(def_channel,"YUV_sampling",&error));
+            else weed_leaf_delete(channel,"YUV_sampling");
+
+            if (weed_plant_has_leaf(def_channel,"YUV_subspace"))
+              weed_set_int_value(channel,"YUV_subspace",weed_get_int_value(def_channel,"YUV_subspace",&error));
+            else weed_leaf_delete(channel,"YUV_subspace");
+
+            numplanes=weed_leaf_num_elements(def_channel,"rowstrides");
+            layer_rows=weed_get_int_array(def_channel,"rowstrides",&error);
+            weed_set_int_array(channel,"rowstrides",numplanes,layer_rows);
+            pixel_data=weed_get_voidptr_array(def_channel,"pixel_data",&error);
+            weed_set_voidptr_array(channel,"pixel_data",numplanes,pixel_data);
+            lives_free(pixel_data);
+            weed_set_boolean_value(channel,"inplace",WEED_TRUE);
+            inplace=TRUE;
+            if (weed_plant_has_leaf(def_channel,"host_pixel_data_contiguous"))
+              weed_set_boolean_value(channel,"host_pixel_data_contiguous",
+                                     weed_get_boolean_value(def_channel,"host_pixel_data_contiguous",&error));
+            else if (weed_plant_has_leaf(channel,"host_pixel_data_contiguous"))
+              weed_leaf_delete(channel,"host_pixel_data_contiguous");
+
+            if (weed_palette_is_alpha_palette(palette)) {
+              // protect our in- channel from being freed()
+              weed_set_boolean_value(channel,"host_orig_pdata",WEED_TRUE);
+            }
+          }
+          lives_free(palettes);
+        }
       }
     }
 
     if (def_channel==NULL) def_channel=get_enabled_channel(inst,0,FALSE);
 
-    if (weed_get_boolean_value(def_channel,"host_temp_disabled",&error)==WEED_TRUE) def_disabled=TRUE; 
+    if (weed_get_boolean_value(def_channel,"host_temp_disabled",&error)==WEED_TRUE) def_disabled=TRUE;
 
     ignore_palette=FALSE;
 
     if (!inplace||def_disabled) {
 
       if (!def_disabled) {
-	// try to match palettes with first enabled in channel
-	palette=weed_get_int_value(def_channel,"current_palette",&error);
+        // try to match palettes with first enabled in channel
+        palette=weed_get_int_value(def_channel,"current_palette",&error);
+
+        if (palette!=outpalette) {
+          // palette change needed; try to change channel palette
+          int num_palettes=weed_leaf_num_elements(chantmpl,"palette_list");
+          int *palettes=weed_get_int_array(chantmpl,"palette_list",&error);
+          if (check_weed_palette_list(palettes,num_palettes,palette)==palette) {
+            weed_set_int_value(channel,"current_palette",palette);
+            if (channel_flags&WEED_CHANNEL_REINIT_ON_PALETTE_CHANGE) needs_reinit=TRUE;
+          } else {
+            if (channel_flags&WEED_CHANNEL_PALETTE_CAN_VARY) ignore_palette=TRUE;
+            else {
+              lives_free(in_tracks);
+              lives_free(out_tracks);
+              lives_free(in_channels);
+              if (out_channels!=NULL) lives_free(out_channels);
+              lives_free(channel_rows);
+              if (orig_layer!=NULL) {
+                weed_layer_free(layer);
+              }
+              return FILTER_ERROR_INVALID_PALETTE_SETTINGS; // plugin author messed up...
+            }
+          }
+          lives_free(palettes);
+        }
+
+        if (!ignore_palette) {
 
-	if (palette!=outpalette) {
-	  // palette change needed; try to change channel palette
-	  int num_palettes=weed_leaf_num_elements(chantmpl,"palette_list");
-	  int *palettes=weed_get_int_array(chantmpl,"palette_list",&error);
-	  if (check_weed_palette_list(palettes,num_palettes,palette)==palette) {
-	    weed_set_int_value(channel,"current_palette",palette);
-	    if (channel_flags&WEED_CHANNEL_REINIT_ON_PALETTE_CHANGE) needs_reinit=TRUE;
-	  }
-	  else {
-	    if (channel_flags&WEED_CHANNEL_PALETTE_CAN_VARY) ignore_palette=TRUE;
-	    else {
-	      weed_free(in_tracks);
-	      weed_free(out_tracks);
-	      weed_free(in_channels);
-	      if (out_channels!=NULL) weed_free(out_channels);
-	      weed_free(channel_rows);
-	      if (orig_layer!=NULL) {
-		weed_layer_free(layer);
-	      }
-	      return FILTER_ERROR_INVALID_PALETTE_SETTINGS; // plugin author messed up...
-	    }
-	  }
-	  weed_free(palettes);
-	}
-	
-	if (!ignore_palette) {
-
-	  if (weed_plant_has_leaf(def_channel,"YUV_clamping")) {
-	    oclamping=(weed_get_int_value(def_channel,"YUV_clamping",&error));
-	    weed_set_int_value(channel,"YUV_clamping",oclamping);
-	  }
-	  else weed_leaf_delete(channel,"YUV_clamping");
-	  
-	  if (weed_plant_has_leaf(def_channel,"YUV_sampling")) 
-	    weed_set_int_value(channel,"YUV_sampling",weed_get_int_value(def_channel,"YUV_sampling",&error));
-	  else weed_leaf_delete(channel,"YUV_sampling");
-	
-	  if (weed_plant_has_leaf(def_channel,"YUV_subspace")) 
-	    weed_set_int_value(channel,"YUV_subspace",weed_get_int_value(def_channel,"YUV_subspace",&error));
-	  else weed_leaf_delete(channel,"YUV_subspace");
-	}
+          if (weed_plant_has_leaf(def_channel,"YUV_clamping")) {
+            oclamping=(weed_get_int_value(def_channel,"YUV_clamping",&error));
+            weed_set_int_value(channel,"YUV_clamping",oclamping);
+          } else weed_leaf_delete(channel,"YUV_clamping");
+
+          if (weed_plant_has_leaf(def_channel,"YUV_sampling"))
+            weed_set_int_value(channel,"YUV_sampling",weed_get_int_value(def_channel,"YUV_sampling",&error));
+          else weed_leaf_delete(channel,"YUV_sampling");
+
+          if (weed_plant_has_leaf(def_channel,"YUV_subspace"))
+            weed_set_int_value(channel,"YUV_subspace",weed_get_int_value(def_channel,"YUV_subspace",&error));
+          else weed_leaf_delete(channel,"YUV_subspace");
+        }
       }
 
       palette=weed_get_int_value(channel,"current_palette",&error);
 
       if (weed_plant_has_leaf(channel,"host_width")) {
-	width=opwidth=weed_get_int_value(channel,"host_width",&error);
-	height=opheight=weed_get_int_value(channel,"host_height",&error);
-      }
-      else {
-	width=weed_get_int_value(def_channel,"width",&error);
-	height=weed_get_int_value(def_channel,"height",&error);
+        width=opwidth=weed_get_int_value(channel,"host_width",&error);
+        height=opheight=weed_get_int_value(channel,"host_height",&error);
+      } else {
+        width=weed_get_int_value(def_channel,"width",&error);
+        height=weed_get_int_value(def_channel,"height",&error);
       }
 
       pdata=weed_get_voidptr_value(channel,"pixel_data",&error);
 
       if (weed_palette_is_alpha_palette(palette)&&outpalette==palette&&outwidth==width&&outheight==height&&pdata!=NULL) {
-	weed_free(channel_rows);
-	continue;
+        lives_free(channel_rows);
+        continue;
       }
 
       set_channel_size(channel,opwidth/weed_palette_get_pixels_per_macropixel(palette),opheight,1,NULL);
@@ -2556,23 +2566,23 @@
       layer_rows=weed_get_int_array(channel,"rowstrides",&error);
       // align memory if necessary
       if (weed_plant_has_leaf(chantmpl,"alignment")) {
-	int alignment=weed_get_int_value(chantmpl,"alignment",&error);
-	boolean contiguous=FALSE;
-	if (weed_plant_has_leaf(channel,"host_pixel_data_contiguous") && 
-	    weed_get_boolean_value(channel,"host_pixel_data_contiguous",&error)==WEED_TRUE) contiguous=TRUE;
+        int alignment=weed_get_int_value(chantmpl,"alignment",&error);
+        boolean contiguous=FALSE;
+        if (weed_plant_has_leaf(channel,"host_pixel_data_contiguous") &&
+            weed_get_boolean_value(channel,"host_pixel_data_contiguous",&error)==WEED_TRUE) contiguous=TRUE;
 
-	pixel_data=weed_get_voidptr_array(channel,"pixel_data",&error);
+        pixel_data=weed_get_voidptr_array(channel,"pixel_data",&error);
 
-	height=weed_get_int_value(channel,"height",&error);
+        height=weed_get_int_value(channel,"height",&error);
 
-	align(pixel_data,alignment,numplanes,height,layer_rows,&contiguous);
+        align(pixel_data,alignment,numplanes,height,layer_rows,(int *)&contiguous);
 
-	weed_set_voidptr_array(channel,"pixel_data",numplanes,pixel_data);
-	weed_free(pixel_data);
+        weed_set_voidptr_array(channel,"pixel_data",numplanes,pixel_data);
+        lives_free(pixel_data);
 
-	if (contiguous) weed_set_boolean_value(channel,"host_pixel_data_contiguous",WEED_TRUE);
-	else if (weed_plant_has_leaf(channel,"host_pixel_data_contiguous")) 
-	  weed_leaf_delete(channel,"host_pixel_data_contiguous");
+        if (contiguous) weed_set_boolean_value(channel,"host_pixel_data_contiguous",WEED_TRUE);
+        else if (weed_plant_has_leaf(channel,"host_pixel_data_contiguous"))
+          weed_leaf_delete(channel,"host_pixel_data_contiguous");
       }
       weed_set_boolean_value(channel,"inplace",WEED_FALSE);
     }
@@ -2580,25 +2590,25 @@
     // check old rowstrides against current rowstrides
     rowstrides_changed=rowstrides_differ(nchr,channel_rows,numplanes,layer_rows);
 
-    weed_free(channel_rows);
-    weed_free(layer_rows);
-      
+    lives_free(channel_rows);
+    lives_free(layer_rows);
+
     width=weed_get_int_value(channel,"width",&error);
     height=weed_get_int_value(channel,"height",&error);
     if ((rowstrides_changed&&(channel_flags&WEED_CHANNEL_REINIT_ON_ROWSTRIDES_CHANGE))||
-	(((outwidth!=width)||(outheight!=height))&&(channel_flags&WEED_CHANNEL_REINIT_ON_SIZE_CHANGE))) 
+        (((outwidth!=width)||(outheight!=height))&&(channel_flags&WEED_CHANNEL_REINIT_ON_SIZE_CHANGE)))
       needs_reinit=TRUE;
 
   }
 
   if (needs_reinit) {
     if ((retval=weed_reinit_effect(inst,FALSE))==FILTER_ERROR_COULD_NOT_REINIT) {
-      weed_free(in_tracks);
-      weed_free(out_tracks);
-      weed_free(in_channels);
-      if (out_channels!=NULL) weed_free(out_channels);
+      lives_free(in_tracks);
+      lives_free(out_tracks);
+      lives_free(in_channels);
+      if (out_channels!=NULL) lives_free(out_channels);
       if (orig_layer!=NULL) {
-	weed_layer_free(layer);
+        weed_layer_free(layer);
       }
       return retval;
     }
@@ -2611,7 +2621,7 @@
   channel=get_enabled_channel(inst,0,FALSE);
 
   // see if we can multithread
-  if ((prefs->nfx_threads=future_prefs->nfx_threads)>1 && 
+  if ((prefs->nfx_threads=future_prefs->nfx_threads)>1 &&
       filter_flags&WEED_FILTER_HINT_MAY_THREAD) {
     filter_mutex_lock(key);
     retval=process_func_threaded(inst,out_channels,tc);
@@ -2628,37 +2638,37 @@
     filter_mutex_unlock(key);
     if (ret==WEED_ERROR_PLUGIN_INVALID) retval=FILTER_ERROR_MUST_RELOAD;
   }
-  
+
   if (retval==FILTER_ERROR_MUST_RELOAD) {
-    weed_free(in_tracks);
-    weed_free(out_tracks);
-    weed_free(in_channels);
-    if (out_channels!=NULL) weed_free(out_channels);
+    lives_free(in_tracks);
+    lives_free(out_tracks);
+    lives_free(in_channels);
+    if (out_channels!=NULL) lives_free(out_channels);
     if (orig_layer!=NULL) {
       weed_layer_free(layer);
     }
     return retval;
   }
 
-  for (k=0;k<num_inc+num_in_alpha;k++) {
+  for (k=0; k<num_inc+num_in_alpha; k++) {
     channel=get_enabled_channel(inst,k,TRUE);
     if (weed_palette_is_alpha_palette(weed_get_int_value(channel,"current_palette",&error))) {
       // free pdata for all alpha in channels, unless orig pdata was passed from a prior fx
 
       if (!weed_plant_has_leaf(channel,"host_orig_pdata")||
-	  weed_get_boolean_value(channel,"host_orig_pdata",&error)!=WEED_TRUE) {
-	pdata=weed_get_voidptr_value(channel,"pixel_data",&error);
-	if (pdata!=NULL) g_free(pdata);
+          weed_get_boolean_value(channel,"host_orig_pdata",&error)!=WEED_TRUE) {
+        pdata=weed_get_voidptr_value(channel,"pixel_data",&error);
+        if (pdata!=NULL) lives_free(pdata);
       }
       weed_set_voidptr_value(channel,"pixel_data",NULL);
-      if (weed_plant_has_leaf(channel,"host_orig_pdata")) 
-	weed_leaf_delete(channel,"host_orig_pdata");
+      if (weed_plant_has_leaf(channel,"host_orig_pdata"))
+        weed_leaf_delete(channel,"host_orig_pdata");
     }
   }
 
   // now we write our out channels back to layers, leaving the palettes and sizes unchanged
 
-  for (i=k=0;k<num_out_tracks+num_out_alpha;k++) {
+  for (i=k=0; k<num_out_tracks+num_out_alpha; k++) {
 
     channel=get_enabled_channel(inst,k,FALSE);
     if (channel==NULL) break; // compound fx
@@ -2679,25 +2689,25 @@
 
     rowstrides=weed_get_int_array(channel,"rowstrides",&error);
     weed_set_int_array(layer,"rowstrides",numplanes,rowstrides);
-    weed_free(rowstrides);
+    lives_free(rowstrides);
     numplanes=weed_leaf_num_elements(layer,"pixel_data");
-      
+
     pixel_data=weed_get_voidptr_array(layer,"pixel_data",&error);
     if (pixel_data!=NULL) {
-      if (weed_plant_has_leaf(layer,"host_pixel_data_contiguous") && 
-	  weed_get_boolean_value(layer,"host_pixel_data_contiguous",&error)==WEED_TRUE)
-	numplanes=1;
+      if (weed_plant_has_leaf(layer,"host_pixel_data_contiguous") &&
+          weed_get_boolean_value(layer,"host_pixel_data_contiguous",&error)==WEED_TRUE)
+        numplanes=1;
 
-      for (j=0;j<numplanes;j++) if (pixel_data[j]!=NULL) g_free(pixel_data[j]);
-      weed_free(pixel_data);
+      for (j=0; j<numplanes; j++) if (pixel_data[j]!=NULL) lives_free(pixel_data[j]);
+      lives_free(pixel_data);
     }
 
 
     numplanes=weed_leaf_num_elements(channel,"pixel_data");
     pixel_data=weed_get_voidptr_array(channel,"pixel_data",&error);
     weed_set_voidptr_array(layer,"pixel_data",numplanes,pixel_data);
-    weed_free(pixel_data);
-    
+    lives_free(pixel_data);
+
     // set this in case it was a resize plugin
     width=weed_get_int_value(channel,"width",&error);
     height=weed_get_int_value(channel,"height",&error);
@@ -2706,10 +2716,10 @@
 
     i++;
 
-    if (weed_plant_has_leaf(channel,"host_pixel_data_contiguous")) 
+    if (weed_plant_has_leaf(channel,"host_pixel_data_contiguous"))
       weed_set_boolean_value(layer,"host_pixel_data_contiguous",
-			     weed_get_boolean_value(channel,"host_pixel_data_contiguous",&error));
-    else if (weed_plant_has_leaf(layer,"host_pixel_data_contiguous")) 
+                             weed_get_boolean_value(channel,"host_pixel_data_contiguous",&error));
+    else if (weed_plant_has_leaf(layer,"host_pixel_data_contiguous"))
       weed_leaf_delete(layer,"host_pixel_data_contiguous");
 
     chantmpl=weed_get_plantptr_value(channel,"template",&error);
@@ -2717,35 +2727,34 @@
     if (weed_plant_has_leaf(chantmpl,"flags")) flags=weed_get_int_value(chantmpl,"flags",&error);
     else flags=0;
 
-    if (weed_plant_has_leaf(channel,"YUV_clamping")) { 
+    if (weed_plant_has_leaf(channel,"YUV_clamping")) {
       oclamping=(weed_get_int_value(channel,"YUV_clamping",&error));
       weed_set_int_value(layer,"YUV_clamping",oclamping);
-    }
-    else weed_leaf_delete(layer,"YUV_clamping");
-    
-    if (weed_plant_has_leaf(channel,"YUV_sampling")) 
+    } else weed_leaf_delete(layer,"YUV_clamping");
+
+    if (weed_plant_has_leaf(channel,"YUV_sampling"))
       weed_set_int_value(layer,"YUV_sampling",weed_get_int_value(channel,"YUV_sampling",&error));
     else weed_leaf_delete(layer,"YUV_sampling");
-    
-    if (weed_plant_has_leaf(channel,"YUV_subspace")) 
+
+    if (weed_plant_has_leaf(channel,"YUV_subspace"))
       weed_set_int_value(layer,"YUV_subspace",weed_get_int_value(channel,"YUV_subspace",&error));
     else weed_leaf_delete(layer,"YUV_subspace");
 
   }
 
-  for (i=0;i<num_inc+num_in_alpha;i++) {
+  for (i=0; i<num_inc+num_in_alpha; i++) {
     if (weed_plant_has_leaf(in_channels[i],"host_temp_disabled")&&
-	weed_get_boolean_value(in_channels[i],"host_temp_disabled",&error)==WEED_TRUE) {
+        weed_get_boolean_value(in_channels[i],"host_temp_disabled",&error)==WEED_TRUE) {
       weed_set_boolean_value(in_channels[i],"disabled",WEED_FALSE);
       weed_set_boolean_value(in_channels[i],"host_temp_disabled",WEED_FALSE);
     }
   }
   // done...
 
-  weed_free(in_tracks);
-  weed_free(out_tracks);
-  weed_free(in_channels);
-  if (out_channels!=NULL) weed_free(out_channels);
+  lives_free(in_tracks);
+  lives_free(out_tracks);
+  lives_free(in_channels);
+  if (out_channels!=NULL) lives_free(out_channels);
 
   if (orig_layer!=NULL) {
     weed_layer_free(layer);
@@ -2756,8 +2765,8 @@
 
 
 
-static lives_filter_error_t weed_apply_audio_instance_inner (weed_plant_t *inst, weed_plant_t *init_event, 
-							     weed_plant_t **layers, weed_timecode_t tc, int nbtracks) {
+static lives_filter_error_t weed_apply_audio_instance_inner(weed_plant_t *inst, weed_plant_t *init_event,
+    weed_plant_t **layers, weed_timecode_t tc, int nbtracks) {
   int *in_tracks,*out_tracks;
   int *mand;
 
@@ -2808,22 +2817,22 @@
       weed_set_double_value(inst,"fps",cfile->pb_fps);
 
       // see if we can multithread
-      if ((prefs->nfx_threads=future_prefs->nfx_threads)>1 && 
-	  filter_flags&WEED_FILTER_HINT_MAY_THREAD) {
-	filter_mutex_lock(key);
-	retval=process_func_threaded(inst,out_channels,tc);
-	filter_mutex_unlock(key);
-	if (retval!=FILTER_ERROR_DONT_THREAD) did_thread=TRUE;
+      if ((prefs->nfx_threads=future_prefs->nfx_threads)>1 &&
+          filter_flags&WEED_FILTER_HINT_MAY_THREAD) {
+        filter_mutex_lock(key);
+        retval=process_func_threaded(inst,out_channels,tc);
+        filter_mutex_unlock(key);
+        if (retval!=FILTER_ERROR_DONT_THREAD) did_thread=TRUE;
       }
       if (!did_thread) {
-	// normal single threaded version
-	int ret;
-	weed_leaf_get(filter,"process_func",0,(void *)&process_func_ptr_ptr);
-	process_func=process_func_ptr_ptr[0];
-	filter_mutex_lock(key);
-	ret=(*process_func)(inst,tc);
-	filter_mutex_unlock(key);
-	if (ret==WEED_ERROR_PLUGIN_INVALID) retval=FILTER_ERROR_MUST_RELOAD;
+        // normal single threaded version
+        int ret;
+        weed_leaf_get(filter,"process_func",0,(void *)&process_func_ptr_ptr);
+        process_func=process_func_ptr_ptr[0];
+        filter_mutex_lock(key);
+        ret=(*process_func)(inst,tc);
+        filter_mutex_unlock(key);
+        if (ret==WEED_ERROR_PLUGIN_INVALID) retval=FILTER_ERROR_MUST_RELOAD;
       }
       return retval;
     }
@@ -2839,14 +2848,13 @@
 
   if (init_event==NULL) {
     num_in_tracks=enabled_in_channels(inst,FALSE);
-    in_tracks=(int *)weed_malloc(2*sizint);
+    in_tracks=(int *)lives_malloc(2*sizint);
     in_tracks[0]=0;
     in_tracks[1]=1;
     num_out_tracks=1;
-    out_tracks=(int *)weed_malloc(sizint);
+    out_tracks=(int *)lives_malloc(sizint);
     out_tracks[0]=0;
-  }
-  else {
+  } else {
     num_in_tracks=weed_leaf_num_elements(init_event,"in_tracks");
     in_tracks=weed_get_int_array(init_event,"in_tracks",&error);
     num_out_tracks=weed_leaf_num_elements(init_event,"out_tracks");
@@ -2864,31 +2872,31 @@
   if (num_in_tracks>num_inc) num_in_tracks=num_inc;
 
   if (num_inc>num_in_tracks) {
-    for (i=num_in_tracks;i<num_inc;i++) {
+    for (i=num_in_tracks; i<num_inc; i++) {
       if (!weed_plant_has_leaf(in_channels[i],"disabled")||
-	  weed_get_boolean_value(in_channels[i],"disabled",&error)==WEED_FALSE) 
-	weed_set_boolean_value(in_channels[i],"host_temp_disabled",WEED_TRUE);
+          weed_get_boolean_value(in_channels[i],"disabled",&error)==WEED_FALSE)
+        weed_set_boolean_value(in_channels[i],"host_temp_disabled",WEED_TRUE);
       else weed_set_boolean_value(in_channels[i],"host_temp_disabled",WEED_FALSE);
     }
   }
 
 
-  for (i=0;i<num_in_tracks;i++) {
+  for (i=0; i<num_in_tracks; i++) {
     channel=in_channels[i];
     weed_set_boolean_value(channel,"host_temp_disabled",WEED_FALSE);
     layer=layers[i];
     if (layer==NULL) {
-      for (j=i;j<num_in_tracks;j++) {
-	channel=in_channels[j];
-	chantmpl=weed_get_plantptr_value(channel,"template",&error);
-	if (weed_plant_has_leaf(chantmpl,"max_repeats")) weed_set_boolean_value(channel,"host_temp_disabled",WEED_TRUE);
-	else {
-	  weed_free(in_tracks);
-	  weed_free(out_tracks);
-	  weed_free(in_channels);
-	  if (out_channels!=NULL) weed_free(out_channels);
-	  return FILTER_ERROR_MISSING_LAYER;
-	}
+      for (j=i; j<num_in_tracks; j++) {
+        channel=in_channels[j];
+        chantmpl=weed_get_plantptr_value(channel,"template",&error);
+        if (weed_plant_has_leaf(chantmpl,"max_repeats")) weed_set_boolean_value(channel,"host_temp_disabled",WEED_TRUE);
+        else {
+          lives_free(in_tracks);
+          lives_free(out_tracks);
+          lives_free(in_channels);
+          if (out_channels!=NULL) lives_free(out_channels);
+          return FILTER_ERROR_MISSING_LAYER;
+        }
       }
       break;
     }
@@ -2901,38 +2909,38 @@
   // ensure all chantmpls not marked "optional" have at least one corresponding enabled channel
   // e.g. we could have disabled all channels from a template with "max_repeats" that is not "optional"
   num_ctmpl=weed_leaf_num_elements(filter,"in_channel_templates");
-  mand=(int *)g_malloc(num_ctmpl*sizint);
-  for (j=0;j<num_ctmpl;j++) mand[j]=0;
+  mand=(int *)lives_malloc(num_ctmpl*sizint);
+  for (j=0; j<num_ctmpl; j++) mand[j]=0;
   in_ctmpls=weed_get_plantptr_array(filter,"in_channel_templates",&error);
-  for (i=0;i<num_inc;i++) {
+  for (i=0; i<num_inc; i++) {
     if ((weed_plant_has_leaf(in_channels[i],"disabled")&&
-	 weed_get_boolean_value(in_channels[i],"disabled",&error)==WEED_TRUE)||
-	(weed_plant_has_leaf(in_channels[i],"host_temp_disabled")&&
-	 weed_get_boolean_value(in_channels[i],"host_temp_disabled",&error)==WEED_TRUE)) continue;
+         weed_get_boolean_value(in_channels[i],"disabled",&error)==WEED_TRUE)||
+        (weed_plant_has_leaf(in_channels[i],"host_temp_disabled")&&
+         weed_get_boolean_value(in_channels[i],"host_temp_disabled",&error)==WEED_TRUE)) continue;
     chantmpl=weed_get_plantptr_value(in_channels[i],"template",&error);
-    for (j=0;j<num_ctmpl;j++) {
+    for (j=0; j<num_ctmpl; j++) {
       if (chantmpl==in_ctmpls[j]) {
-	mand[j]=1;
-	break;
+        mand[j]=1;
+        break;
       }
     }
   }
-  for (j=0;j<num_ctmpl;j++) if (mand[j]==0&&(!weed_plant_has_leaf(in_ctmpls[j],"optional")||
-					     weed_get_boolean_value(in_ctmpls[j],"optional",&error)==WEED_FALSE)) {
-      weed_free(in_ctmpls);
-      weed_free(in_tracks);
-      weed_free(out_tracks);
-      weed_free(in_channels);
-      if (out_channels!=NULL) weed_free(out_channels);
-      g_free(mand);
+  for (j=0; j<num_ctmpl; j++) if (mand[j]==0&&(!weed_plant_has_leaf(in_ctmpls[j],"optional")||
+                                    weed_get_boolean_value(in_ctmpls[j],"optional",&error)==WEED_FALSE)) {
+      lives_free(in_ctmpls);
+      lives_free(in_tracks);
+      lives_free(out_tracks);
+      lives_free(in_channels);
+      if (out_channels!=NULL) lives_free(out_channels);
+      lives_free(mand);
       return FILTER_ERROR_MISSING_LAYER;
     }
-  weed_free(in_ctmpls);
-  g_free(mand);
+  lives_free(in_ctmpls);
+  lives_free(mand);
 
-  for (i=0;i<num_in_tracks;i++) {
+  for (i=0; i<num_in_tracks; i++) {
     if (weed_plant_has_leaf(in_channels[i],"host_temp_disabled")&&
-	weed_get_boolean_value(in_channels[i],"host_temp_disabled",&error)==WEED_TRUE) continue;
+        weed_get_boolean_value(in_channels[i],"host_temp_disabled",&error)==WEED_TRUE) continue;
 
     layer=layers[i];
     channel=get_enabled_channel(inst,i,TRUE);
@@ -2950,11 +2958,11 @@
       // handle case where plugin NEEDS interleaved
       weed_set_boolean_value(layers[i],"audio_interleaf",WEED_TRUE);
       if (!float_interleave((float *)adata,nsamps,nchans)) {
-	weed_free(in_tracks);
-	weed_free(out_tracks);
-	weed_free(in_channels);
-	if (out_channels!=NULL) weed_free(out_channels);
-	return FILTER_ERROR_MEMORY_ERROR;
+        lives_free(in_tracks);
+        lives_free(out_tracks);
+        lives_free(in_channels);
+        if (out_channels!=NULL) lives_free(out_channels);
+        return FILTER_ERROR_MEMORY_ERROR;
       }
     }
 
@@ -2962,19 +2970,19 @@
   }
 
   // we may need to disable some channels for the plugin
-  for (i=0;i<num_in_tracks;i++) {
+  for (i=0; i<num_in_tracks; i++) {
     if (weed_plant_has_leaf(in_channels[i],"host_temp_disabled")&&
-	weed_get_boolean_value(in_channels[i],"host_temp_disabled",&error)==WEED_TRUE) 
+        weed_get_boolean_value(in_channels[i],"host_temp_disabled",&error)==WEED_TRUE)
       weed_set_boolean_value(in_channels[i],"disabled",WEED_TRUE);
   }
 
   // set up our out channels
-  for (i=0;i<num_out_tracks;i++) {
+  for (i=0; i<num_out_tracks; i++) {
     if (out_tracks[i]!=in_tracks[i]) {
-      weed_free(in_tracks);
-      weed_free(out_tracks);
-      weed_free(in_channels);
-      if (out_channels!=NULL) weed_free(out_channels);
+      lives_free(in_tracks);
+      lives_free(out_tracks);
+      lives_free(in_channels);
+      if (out_channels!=NULL) lives_free(out_channels);
       return FILTER_ERROR_INVALID_TRACK; // can't yet mix audio and video
     }
 
@@ -2983,21 +2991,20 @@
     weed_set_int64_value(channel,"timecode",tc);
     chantmpl=weed_get_plantptr_value(channel,"template",&error);
     channel_flags=weed_get_int_value(chantmpl,"flags",&error);
-    
+
     if (i==0&&(in_tracks[0]==out_tracks[0])&&adata0!=NULL) {
       if (channel_flags&WEED_CHANNEL_CAN_DO_INPLACE) {
-	// ah, good, inplace
-	inplace=TRUE;
+        // ah, good, inplace
+        inplace=TRUE;
       }
     }
 
     if (!inplace) {
-      float *abuf=(float *)g_malloc0(nchans*nsamps*sizeof(float));
+      float *abuf=(float *)lives_malloc0(nchans*nsamps*sizeof(float));
       weed_set_int_value(channel,"audio_data_length",nsamps);
       weed_set_voidptr_value(channel,"audio_data",abuf);
       inplace=FALSE;
-    }
-    else {
+    } else {
       weed_set_int_value(channel,"audio_data_length",nsamps);
       weed_set_voidptr_value(channel,"audio_data",adata0);
       weed_set_boolean_value(layers[i],"audio_interleaf",weed_get_boolean_value(channel,"audio_interleaf",&error));
@@ -3015,10 +3022,10 @@
   if ((*process_func)(inst,tc)==WEED_ERROR_PLUGIN_INVALID) {
     filter_mutex_unlock(key);
     pthread_mutex_unlock(&mainw->interp_mutex);
-    weed_free(in_tracks);
-    weed_free(out_tracks);
-    weed_free(in_channels);
-    if (out_channels!=NULL) weed_free(out_channels);
+    lives_free(in_tracks);
+    lives_free(out_tracks);
+    lives_free(in_channels);
+    if (out_channels!=NULL) lives_free(out_channels);
     return FILTER_ERROR_MUST_RELOAD;
   }
 
@@ -3028,7 +3035,7 @@
   // TODO - handle process errors (WEED_ERROR_PLUGIN_INVALID)
 
   // now we write our out channels back to layers
-  for (i=0;i<num_out_tracks;i++) {
+  for (i=0; i<num_out_tracks; i++) {
     if (i==0&&inplace) continue;
 
     // TODO - check this...
@@ -3037,24 +3044,24 @@
     layer=layers[i];
     if (weed_plant_has_leaf(channel,"audio_data")) {
       float *audio_data=(float *)weed_get_voidptr_value(layer,"audio_data",&error);
-      if (audio_data!=NULL) weed_free(audio_data);
+      if (audio_data!=NULL) lives_free(audio_data);
     }
     weed_set_voidptr_value(layer,"audio_data",weed_get_voidptr_value(channel,"audio_data",&error));
   }
 
-  for (i=0;i<num_inc;i++) {
+  for (i=0; i<num_inc; i++) {
     if (weed_plant_has_leaf(in_channels[i],"host_temp_disabled")&&
-	weed_get_boolean_value(in_channels[i],"host_temp_disabled",&error)==WEED_TRUE) {
+        weed_get_boolean_value(in_channels[i],"host_temp_disabled",&error)==WEED_TRUE) {
       weed_set_boolean_value(in_channels[i],"disabled",WEED_FALSE);
       weed_set_boolean_value(in_channels[i],"host_temp_disabled",WEED_FALSE);
     }
   }
   // done...
 
-  weed_free(in_tracks);
-  weed_free(out_tracks);
-  weed_free(in_channels);
-  if (out_channels!=NULL) weed_free(out_channels);
+  lives_free(in_tracks);
+  lives_free(out_tracks);
+  lives_free(in_channels);
+  if (out_channels!=NULL) lives_free(out_channels);
 
 
   return retval;
@@ -3063,8 +3070,8 @@
 
 
 
-lives_filter_error_t weed_apply_audio_instance (weed_plant_t *init_event, float **abuf, int nbtracks, int nchans, 
-						int64_t nsamps, double arate, weed_timecode_t tc, double *vis) {
+lives_filter_error_t weed_apply_audio_instance(weed_plant_t *init_event, float **abuf, int nbtracks, int nchans,
+    int64_t nsamps, double arate, weed_timecode_t tc, double *vis) {
 
   lives_filter_error_t retval=FILTER_NO_ERROR,retval2;
 
@@ -3100,24 +3107,22 @@
     // set init_event to NULL before passing it to the inner function
     init_event=NULL;
 
-    in_tracks=(int *)weed_malloc(sizint);
+    in_tracks=(int *)lives_malloc(sizint);
     in_tracks[0]=0;
 
-    out_tracks=(int *)weed_malloc(sizint);
+    out_tracks=(int *)lives_malloc(sizint);
     out_tracks[0]=0;
 
-  }
-  else {
+  } else {
 
     // when processing an event list, we pass an init_event
 
     was_init_event=TRUE;
     if (weed_plant_has_leaf(init_event,"host_tag")) {
-      gchar *keystr=weed_get_string_value(init_event,"host_tag",&error);
+      char *keystr=weed_get_string_value(init_event,"host_tag",&error);
       key=atoi(keystr);
-      weed_free(keystr);
-    }
-    else return FILTER_ERROR_INVALID_INIT_EVENT;
+      lives_free(keystr);
+    } else return FILTER_ERROR_INVALID_INIT_EVENT;
 
     ntracks=weed_leaf_num_elements(init_event,"in_tracks");
     in_tracks=weed_get_int_array(init_event,"in_tracks",&error);
@@ -3126,31 +3131,30 @@
 
     // check instance exists, and interpolate parameters
 
-    if (rte_key_valid (key+1,FALSE)) {
+    if (rte_key_valid(key+1,FALSE)) {
       if ((instance=key_to_instance[key][key_modes[key]])==NULL) {
-	weed_free(in_tracks);
-	weed_free(out_tracks);
-	return FILTER_ERROR_INVALID_INSTANCE;
+        lives_free(in_tracks);
+        lives_free(out_tracks);
+        return FILTER_ERROR_INVALID_INSTANCE;
       }
       if (mainw->pchains!=NULL&&mainw->pchains[key]!=NULL) {
-	if (!pthread_mutex_trylock(&mainw->interp_mutex)) { // try to minimise thread locking
-	  pthread_mutex_unlock(&mainw->interp_mutex);
-	  if (!interpolate_params(instance,mainw->pchains[key],tc)) {
-	    weed_free(in_tracks);
-	    weed_free(out_tracks);
-	    return FILTER_ERROR_INTERPOLATION_FAILED;
-	  }
-	}
+        if (!pthread_mutex_trylock(&mainw->interp_mutex)) { // try to minimise thread locking
+          pthread_mutex_unlock(&mainw->interp_mutex);
+          if (!interpolate_params(instance,mainw->pchains[key],tc)) {
+            lives_free(in_tracks);
+            lives_free(out_tracks);
+            return FILTER_ERROR_INTERPOLATION_FAILED;
+          }
+        }
       }
-    }
-    else {
-      weed_free(in_tracks);
-      weed_free(out_tracks);
+    } else {
+      lives_free(in_tracks);
+      lives_free(out_tracks);
       return FILTER_ERROR_INVALID_INIT_EVENT;
     }
   }
 
- audinst1:
+audinst1:
 
   if (weed_plant_has_leaf(instance,"in_channels")) channel=weed_get_plantptr_value(instance,"in_channels",&error);
   if (channel==NULL) {
@@ -3158,8 +3162,7 @@
       retval=FILTER_ERROR_NO_IN_CHANNELS; // audio generators are dealt with by the audio player
       goto audret1;
     }
-  }
-  else {
+  } else {
     in_channels=weed_get_plantptr_array(instance,"in_channels",&error);
     numinchans=weed_leaf_num_elements(instance,"in_channels");
   }
@@ -3182,7 +3185,7 @@
     }
   }
 
-  for (i=0;i<numinchans;i++) {
+  for (i=0; i<numinchans; i++) {
     if ((channel=in_channels[i])==NULL) continue;
 
     aint=WEED_FALSE; // preferred value
@@ -3190,35 +3193,35 @@
     if (weed_plant_has_leaf(ctmpl,"audio_interleaf")) {
       aint=weed_get_boolean_value(ctmpl,"audio_interleaf",&error);
       if (weed_get_boolean_value(channel,"audio_interleaf",&error)!=aint) {
-	needs_reinit=TRUE;
+        needs_reinit=TRUE;
       }
     }
     xnchans=nchans; // preferred value
     if (weed_plant_has_leaf(ctmpl,"audio_channels")) {
       xnchans=weed_get_int_value(ctmpl,"audio_channels",&error);
       if (weed_get_int_value(channel,"audio_channels",&error)!=xnchans) {
-	needs_reinit=TRUE;
+        needs_reinit=TRUE;
       }
     }
 
-  
+
     if ((weed_plant_has_leaf(ctmpl,"audio_data_length")&&nsamps!=weed_get_int_value(ctmpl,"audio_data_length",&error))||
-	(weed_plant_has_leaf(ctmpl,"audio_arate")&&arate!=weed_get_int_value(ctmpl,"audio_rate",&error))) {
-      weed_free(in_channels);
-      if (out_channels!=NULL) weed_free(out_channels);
+        (weed_plant_has_leaf(ctmpl,"audio_arate")&&arate!=weed_get_int_value(ctmpl,"audio_rate",&error))) {
+      lives_free(in_channels);
+      if (out_channels!=NULL) lives_free(out_channels);
       retval=FILTER_ERROR_TEMPLATE_MISMATCH;
       goto audret1;
     }
-    
+
     if (weed_get_int_value(channel,"audio_rate",&error)!=arate) {
       needs_reinit=TRUE;
     }
-    
+
     weed_set_int_value(channel,"audio_data_length",nsamps);
-    
+
   }
-      
-  for (i=0;i<numoutchans;i++) {
+
+  for (i=0; i<numoutchans; i++) {
     if ((channel=out_channels[i])==NULL) continue;
 
     aint=WEED_FALSE; // preferred value
@@ -3226,21 +3229,21 @@
     if (weed_plant_has_leaf(ctmpl,"audio_interleaf")) {
       aint=weed_get_boolean_value(ctmpl,"audio_interleaf",&error);
       if (weed_get_boolean_value(channel,"audio_interleaf",&error)!=aint) {
-	needs_reinit=TRUE;
+        needs_reinit=TRUE;
       }
     }
     xnchans=nchans; // preferred value
     if (weed_plant_has_leaf(ctmpl,"audio_channels")) {
       xnchans=weed_get_int_value(ctmpl,"audio_channels",&error);
       if (weed_get_int_value(channel,"audio_channels",&error)!=xnchans) {
-	needs_reinit=TRUE;
+        needs_reinit=TRUE;
       }
     }
 
     if ((weed_plant_has_leaf(ctmpl,"audio_data_length")&&nsamps!=weed_get_int_value(ctmpl,"audio_data_length",&error))||
-	(weed_plant_has_leaf(ctmpl,"audio_arate")&&arate!=weed_get_int_value(ctmpl,"audio_rate",&error))) {
-      weed_free(in_channels);
-      if (out_channels!=NULL) weed_free(out_channels);
+        (weed_plant_has_leaf(ctmpl,"audio_arate")&&arate!=weed_get_int_value(ctmpl,"audio_rate",&error))) {
+      lives_free(in_channels);
+      if (out_channels!=NULL) lives_free(out_channels);
       retval=FILTER_ERROR_TEMPLATE_MISMATCH;
       goto audret1;
     }
@@ -3248,9 +3251,9 @@
     if (weed_get_int_value(channel,"audio_rate",&error)!=arate) {
       needs_reinit=TRUE;
     }
-      
+
     weed_set_int_value(channel,"audio_data_length",nsamps);
-      
+
   }
 
 
@@ -3258,39 +3261,39 @@
     // - deinit inst
     weed_call_deinit_func(instance);
 
-    for (i=0;i<numinchans;i++) {
+    for (i=0; i<numinchans; i++) {
       if ((channel=in_channels[i])!=NULL) {
-	aint=WEED_FALSE; // preferred value
-	ctmpl=weed_get_plantptr_value(channel,"template",&error);
-	if (weed_plant_has_leaf(ctmpl,"audio_interleaf")) {
-	  aint=weed_get_boolean_value(ctmpl,"audio_interleaf",&error);
-	}
-	xnchans=nchans; // preferred value
-	if (weed_plant_has_leaf(ctmpl,"audio_channels")) {
-	  xnchans=weed_get_int_value(ctmpl,"audio_channels",&error);
-	}
-	  
-	weed_set_boolean_value(channel,"audio_interleaf",aint);
-	weed_set_int_value(channel,"audio_channels",xnchans);
-	weed_set_int_value(channel,"audio_rate",arate);
+        aint=WEED_FALSE; // preferred value
+        ctmpl=weed_get_plantptr_value(channel,"template",&error);
+        if (weed_plant_has_leaf(ctmpl,"audio_interleaf")) {
+          aint=weed_get_boolean_value(ctmpl,"audio_interleaf",&error);
+        }
+        xnchans=nchans; // preferred value
+        if (weed_plant_has_leaf(ctmpl,"audio_channels")) {
+          xnchans=weed_get_int_value(ctmpl,"audio_channels",&error);
+        }
+
+        weed_set_boolean_value(channel,"audio_interleaf",aint);
+        weed_set_int_value(channel,"audio_channels",xnchans);
+        weed_set_int_value(channel,"audio_rate",arate);
       }
     }
 
-    for (i=0;i<numoutchans;i++) {
+    for (i=0; i<numoutchans; i++) {
       if ((channel=out_channels[i])!=NULL) {
-	aint=WEED_FALSE; // preferred value
-	ctmpl=weed_get_plantptr_value(channel,"template",&error);
-	if (weed_plant_has_leaf(ctmpl,"audio_interleaf")) {
-	  aint=weed_get_boolean_value(ctmpl,"audio_interleaf",&error);
-	}
-	xnchans=nchans; // preferred value
-	if (weed_plant_has_leaf(ctmpl,"audio_channels")) {
-	  xnchans=weed_get_int_value(ctmpl,"audio_channels",&error);
-	}
-	  
-	weed_set_boolean_value(channel,"audio_interleaf",aint);
-	weed_set_int_value(channel,"audio_channels",xnchans);
-	weed_set_int_value(channel,"audio_rate",arate);
+        aint=WEED_FALSE; // preferred value
+        ctmpl=weed_get_plantptr_value(channel,"template",&error);
+        if (weed_plant_has_leaf(ctmpl,"audio_interleaf")) {
+          aint=weed_get_boolean_value(ctmpl,"audio_interleaf",&error);
+        }
+        xnchans=nchans; // preferred value
+        if (weed_plant_has_leaf(ctmpl,"audio_channels")) {
+          xnchans=weed_get_int_value(ctmpl,"audio_channels",&error);
+        }
+
+        weed_set_boolean_value(channel,"audio_interleaf",aint);
+        weed_set_int_value(channel,"audio_channels",xnchans);
+        weed_set_int_value(channel,"audio_rate",arate);
       }
     }
 
@@ -3301,21 +3304,21 @@
       weed_leaf_get(filter,"init_func",0,(void *)&init_func_ptr_ptr);
       init_func=init_func_ptr_ptr[0];
       if (init_func!=NULL) {
-	gchar *cwd=cd_to_plugin_dir(filter);
-	set_param_gui_readwrite(instance);
-	update_host_info(instance);
-	if ((*init_func)(instance)!=WEED_NO_ERROR) {
-	  key_to_instance[key][key_modes[key]]=NULL;
-	  lives_chdir(cwd,FALSE);
-	  g_free(cwd);
-	  weed_free(in_channels);
-	  if (out_channels!=NULL) weed_free(out_channels);
-	  retval=FILTER_ERROR_COULD_NOT_REINIT;
-	  goto audret1;
-	}
-	set_param_gui_readonly(instance);
-	lives_chdir(cwd,FALSE);
-	g_free(cwd);
+        char *cwd=cd_to_plugin_dir(filter);
+        set_param_gui_readwrite(instance);
+        update_host_info(instance);
+        if ((*init_func)(instance)!=WEED_NO_ERROR) {
+          key_to_instance[key][key_modes[key]]=NULL;
+          lives_chdir(cwd,FALSE);
+          lives_free(cwd);
+          lives_free(in_channels);
+          if (out_channels!=NULL) lives_free(out_channels);
+          retval=FILTER_ERROR_COULD_NOT_REINIT;
+          goto audret1;
+        }
+        set_param_gui_readonly(instance);
+        lives_chdir(cwd,FALSE);
+        lives_free(cwd);
       }
     }
     weed_set_boolean_value(instance,"host_inited",WEED_TRUE);
@@ -3324,8 +3327,8 @@
 
 
 
-  if (in_channels!=NULL) weed_free(in_channels);
-  if (out_channels!=NULL) weed_free(out_channels);
+  if (in_channels!=NULL) lives_free(in_channels);
+  if (out_channels!=NULL) lives_free(out_channels);
 
   // apply visibility mask to volume values
   if (vis!=NULL&&(flags&WEED_FILTER_IS_CONVERTER)) {
@@ -3334,35 +3337,35 @@
       weed_plant_t **in_params=weed_get_plantptr_array(instance,"in_parameters",&error);
       int nvals=weed_leaf_num_elements(in_params[vmaster],"value");
       double *fvols=weed_get_double_array(in_params[vmaster],"value",&error);
-      for (i=0;i<nvals;i++) {
-	fvols[i]=fvols[i]*vis[in_tracks[i]+nbtracks];
-	if (vis[in_tracks[i]+nbtracks]<0.) fvols[i]=-fvols[i];
+      for (i=0; i<nvals; i++) {
+        fvols[i]=fvols[i]*vis[in_tracks[i]+nbtracks];
+        if (vis[in_tracks[i]+nbtracks]<0.) fvols[i]=-fvols[i];
       }
       filter_mutex_lock(key);
       weed_set_double_array(in_params[vmaster],"value",nvals,fvols);
       filter_mutex_unlock(key);
       set_copy_to(instance,vmaster,TRUE);
-      weed_free(fvols);
-      weed_free(in_params);
+      lives_free(fvols);
+      lives_free(in_params);
     }
   }
 
   if (layers==NULL&&numinchans>0) {
-    layers=(weed_plant_t **)g_malloc((ntracks+1)*sizeof(weed_plant_t *));
+    layers=(weed_plant_t **)lives_malloc((ntracks+1)*sizeof(weed_plant_t *));
 
-    for (i=0;i<ntracks;i++) {
+    for (i=0; i<ntracks; i++) {
       // create audio layers, and copy/combine separated audio into each layer
-      
+
       layers[i]=weed_plant_new(WEED_PLANT_CHANNEL);
-      
+
       // copy audio into layer audio
-      in_abuf=(float *)g_malloc(nchans*nsf);
+      in_abuf=(float *)lives_malloc(nchans*nsf);
 
       // non-interleaved
-      for (j=0;j<nchans;j++) {
-	lives_memcpy(&in_abuf[j*nsamps],abuf[(in_tracks[i]+nbtracks)*nchans+j],nsf);
+      for (j=0; j<nchans; j++) {
+        lives_memcpy(&in_abuf[j*nsamps],abuf[(in_tracks[i]+nbtracks)*nchans+j],nsf);
       }
-      
+
       weed_set_voidptr_value(layers[i],"audio_data",(void *)in_abuf);
       weed_set_int_value(layers[i],"audio_data_length",nsamps);
       weed_set_int_value(layers[i],"audio_channels",nchans);
@@ -3388,38 +3391,38 @@
 
   if (numoutchans>0) {
     // copy processed audio
- 
+
     // inner function will set this if the plugin accepts/returns interleaved audio only
     if (weed_get_boolean_value(layers[0],"audio_interleaf",&error)==WEED_TRUE) float_deinterleave(out_abuf,nsamps,nchans);
 
     // non-interleaved
-    for (i=0;i<nchans;i++) {
+    for (i=0; i<nchans; i++) {
       lives_memcpy(abuf[(out_tracks[0]+nbtracks)*nchans+i],&out_abuf[i*nsamps],nsf);
     }
   }
 
- audret1:
+audret1:
 
   if (layers!=NULL) {
-    for (i=0;i<ntracks;i++) {
+    for (i=0; i<ntracks; i++) {
       in_abuf=(float *)weed_get_voidptr_value(layers[i],"audio_data",&error);
-      g_free(in_abuf);
+      lives_free(in_abuf);
       weed_plant_free(layers[i]);
     }
-    g_free(layers);
+    lives_free(layers);
   }
-  weed_free(in_tracks);
-  weed_free(out_tracks);
+  lives_free(in_tracks);
+  lives_free(out_tracks);
 
   return retval;
 }
 
 
-static void weed_apply_filter_map (weed_plant_t **layers, weed_plant_t *filter_map, weed_timecode_t tc, void ***pchains) {
+static void weed_apply_filter_map(weed_plant_t **layers, weed_plant_t *filter_map, weed_timecode_t tc, void ***pchains) {
   weed_plant_t *instance;
   weed_plant_t *init_event,*deinit_event;
 
-  gchar *keystr;
+  char *keystr;
 
   void **init_events;
 
@@ -3436,17 +3439,17 @@
   // clip corresponds to a LiVES file in mainw->files. "pixel_data" will initially be NULL, we will pull this as necessary
   // and the effect output is written back to the layers
 
-  // a frame number of 0 indicates a blank frame; 
-  // if an effect gets one of these it will not process (except if the channel is optional, 
-  // in which case the channel is disabled); the same is true for invalid track numbers - 
+  // a frame number of 0 indicates a blank frame;
+  // if an effect gets one of these it will not process (except if the channel is optional,
+  // in which case the channel is disabled); the same is true for invalid track numbers -
   // hence disabled channels which do not have disabled in the template are re-enabled when a frame is available
 
-  // after all processing, we generally display/output the first non-NULL layer. 
+  // after all processing, we generally display/output the first non-NULL layer.
   // If all layers are NULL we generate a blank frame
 
   // size and palettes of resulting layers may change during this
 
-  // the channel sizes are set by the filter: all channels are all set to the size of the largest input layer. 
+  // the channel sizes are set by the filter: all channels are all set to the size of the largest input layer.
   // (We attempt to do this, but some channels have fixed sizes).
 
   if (filter_map==NULL||!weed_plant_has_leaf(filter_map,"init_events")||
@@ -3454,119 +3457,119 @@
 
   if ((num_inst=weed_leaf_num_elements(filter_map,"init_events"))>0) {
     init_events=weed_get_voidptr_array(filter_map,"init_events",&error);
-    for (i=0;i<num_inst;i++) {
+    for (i=0; i<num_inst; i++) {
       init_event=(weed_plant_t *)init_events[i];
       if (mainw->playing_file==-1&&mainw->multitrack!=NULL&&mainw->multitrack->current_rfx!=NULL&&
-	  mainw->multitrack->init_event!=NULL) {
-	if (mainw->multitrack->current_rfx->source_type==LIVES_RFX_SOURCE_WEED&&
-	    mainw->multitrack->current_rfx->source!=NULL) {
-
-	  deinit_event=(weed_plant_t *)weed_get_voidptr_value(mainw->multitrack->init_event,"deinit_event",&error);
-	  if (tc>=get_event_timecode(mainw->multitrack->init_event)&&tc<=get_event_timecode(deinit_event)) {
-	    // we are previewing an effect in multitrack - use current unapplied values
-	    // and display only the currently selected filter (unless it is a "process_last" effect (like audio mixer))
-	    // TODO - if current fx 
-	    void **pchain=mt_get_pchain();
-	    instance=(weed_plant_t *)mainw->multitrack->current_rfx->source;
-
-	    if (is_pure_audio(instance,FALSE)) continue; // audio effects are applied in the audio renderer
-
-	    // interpolation can be switched of by setting mainw->no_interp
-	    if (!mainw->no_interp&&pchain!=NULL) {
-	      interpolate_params(instance,pchain,tc); // interpolate parameters for preview
-	    }
+          mainw->multitrack->init_event!=NULL) {
+        if (mainw->multitrack->current_rfx->source_type==LIVES_RFX_SOURCE_WEED&&
+            mainw->multitrack->current_rfx->source!=NULL) {
 
+          deinit_event=(weed_plant_t *)weed_get_voidptr_value(mainw->multitrack->init_event,"deinit_event",&error);
+          if (tc>=get_event_timecode(mainw->multitrack->init_event)&&tc<=get_event_timecode(deinit_event)) {
+            // we are previewing an effect in multitrack - use current unapplied values
+            // and display only the currently selected filter (unless it is a "process_last" effect (like audio mixer))
+            // TODO - if current fx
+            void **pchain=mt_get_pchain();
+            instance=(weed_plant_t *)mainw->multitrack->current_rfx->source;
 
+            if (is_pure_audio(instance,FALSE)) continue; // audio effects are applied in the audio renderer
 
+            // interpolation can be switched of by setting mainw->no_interp
+            if (!mainw->no_interp&&pchain!=NULL) {
+              interpolate_params(instance,pchain,tc); // interpolate parameters for preview
+            }
 
-	  apply_inst1:
-
-	    if (weed_plant_has_leaf(instance,"host_next_instance")) {
-	      // chain any internal data pipelines for compound fx
-	      needs_reinit=pconx_chain_data_internal(instance);
-	      if (needs_reinit) {
-		weed_reinit_effect(instance,FALSE);
-	      }
-	    }
-
-	    filter_error=weed_apply_instance (instance,mainw->multitrack->init_event,layers,0,0,tc);
-	    if (filter_error==WEED_NO_ERROR&&weed_plant_has_leaf(instance,"host_next_instance")) {
-	      // handling for compound fx
-	      instance=weed_get_plantptr_value(instance,"host_next_instance",&error);
-
-	      goto apply_inst1;
-	    }
-
-	    if (!init_event_is_process_last(mainw->multitrack->init_event)) break;
-	    continue;
-	  }
-	}
-      }
 
-      // else we are previewing or rendering from an event_list
-      if (weed_plant_has_leaf(init_event,"host_tag")) {
-	keystr=weed_get_string_value(init_event,"host_tag",&error);
-	key=atoi(keystr);
-	weed_free(keystr);
-	if (rte_key_valid (key+1,FALSE)) {
-	  if ((instance=key_to_instance[key][key_modes[key]])==NULL) continue;
 
-	  if (is_pure_audio(instance,FALSE)) continue; // audio effects are applied in the audio renderer
 
-	  if (pchains!=NULL&&pchains[key]!=NULL) {
-	    interpolate_params(instance,pchains[key],tc); // interpolate parameters during playback
-	  }
-	  
-	  /*
-	  // might be needed for multitrack ???
-	  if (mainw->pconx!=NULL) {
-	  int key=i;
-	  int mode=key_modes[i];
-	  if (weed_plant_has_leaf(instance,"host_mode")) {
-	  key=weed_get_int_value(instance,"host_key",&error);
-	  mode=weed_get_int_value(instance,"host_mode",&error);
-	  }
-	  // chain any data pipelines
-	  pconx_chain_data(key,mode);
-	  }*/
+apply_inst1:
 
-	apply_inst2:
+            if (weed_plant_has_leaf(instance,"host_next_instance")) {
+              // chain any internal data pipelines for compound fx
+              needs_reinit=pconx_chain_data_internal(instance);
+              if (needs_reinit) {
+                weed_reinit_effect(instance,FALSE);
+              }
+            }
 
-	  if (weed_plant_has_leaf(instance,"host_next_instance")) {
-	    // chain any internal data pipelines for compound fx
-	    needs_reinit=pconx_chain_data_internal(instance);
-	    if (needs_reinit) {
-	      weed_reinit_effect(instance,FALSE);
-	    }
-	  }
+            filter_error=weed_apply_instance(instance,mainw->multitrack->init_event,layers,0,0,tc);
+            if (filter_error==WEED_NO_ERROR&&weed_plant_has_leaf(instance,"host_next_instance")) {
+              // handling for compound fx
+              instance=weed_get_plantptr_value(instance,"host_next_instance",&error);
 
-	  filter_error=weed_apply_instance (instance,init_event,layers,0,0,tc);
+              goto apply_inst1;
+            }
 
-	  if (filter_error==WEED_NO_ERROR&&weed_plant_has_leaf(instance,"host_next_instance")) {
-	    // handling for compound fx
-	    instance=weed_get_plantptr_value(instance,"host_next_instance",&error);
+            if (!init_event_is_process_last(mainw->multitrack->init_event)) break;
+            continue;
+          }
+        }
+      }
 
-	    goto apply_inst2;
-	  }
+      // else we are previewing or rendering from an event_list
+      if (weed_plant_has_leaf(init_event,"host_tag")) {
+        keystr=weed_get_string_value(init_event,"host_tag",&error);
+        key=atoi(keystr);
+        lives_free(keystr);
+        if (rte_key_valid(key+1,FALSE)) {
+          if ((instance=key_to_instance[key][key_modes[key]])==NULL) continue;
+
+          if (is_pure_audio(instance,FALSE)) continue; // audio effects are applied in the audio renderer
+
+          if (pchains!=NULL&&pchains[key]!=NULL) {
+            interpolate_params(instance,pchains[key],tc); // interpolate parameters during playback
+          }
+
+          /*
+          // might be needed for multitrack ???
+          if (mainw->pconx!=NULL) {
+          int key=i;
+          int mode=key_modes[i];
+          if (weed_plant_has_leaf(instance,"host_mode")) {
+          key=weed_get_int_value(instance,"host_key",&error);
+          mode=weed_get_int_value(instance,"host_mode",&error);
+          }
+          // chain any data pipelines
+          pconx_chain_data(key,mode);
+          }*/
+
+apply_inst2:
+
+          if (weed_plant_has_leaf(instance,"host_next_instance")) {
+            // chain any internal data pipelines for compound fx
+            needs_reinit=pconx_chain_data_internal(instance);
+            if (needs_reinit) {
+              weed_reinit_effect(instance,FALSE);
+            }
+          }
+
+          filter_error=weed_apply_instance(instance,init_event,layers,0,0,tc);
+
+          if (filter_error==WEED_NO_ERROR&&weed_plant_has_leaf(instance,"host_next_instance")) {
+            // handling for compound fx
+            instance=weed_get_plantptr_value(instance,"host_next_instance",&error);
 
-	  //if (filter_error!=FILTER_NO_ERROR) g_printerr("Render error was %d\n",filter_error);
-	}
+            goto apply_inst2;
+          }
+
+          //if (filter_error!=FILTER_NO_ERROR) lives_printerr("Render error was %d\n",filter_error);
+        }
       }
     }
 
-    weed_free(init_events);
+    lives_free(init_events);
   }
 }
 
 
 
 
-weed_plant_t *weed_apply_effects (weed_plant_t **layers, weed_plant_t *filter_map, weed_timecode_t tc, 
-				  int opwidth, int opheight, void ***pchains) {
+weed_plant_t *weed_apply_effects(weed_plant_t **layers, weed_plant_t *filter_map, weed_timecode_t tc,
+                                 int opwidth, int opheight, void ***pchains) {
   // given a stack of layers, a filter map, a timecode and possibly paramater chains
   // apply the effects in the filter map, and return a single layer as the result
 
-  // if all goes wrong we return a blank 4x4 RGB24 layer (TODO - return a NULL ?) 
+  // if all goes wrong we return a blank 4x4 RGB24 layer (TODO - return a NULL ?)
 
   // returned layer can be of any width,height,palette
   // caller should free all input layers, "pixel_data" of all non-returned layers is free()d here
@@ -3584,7 +3587,7 @@
 
   if (mainw->is_rendering&&!(cfile->proc_ptr!=NULL&&mainw->preview)) {
     // rendering from multitrack
-    if (filter_map!=NULL&&layers[0]!=NULL) { 
+    if (filter_map!=NULL&&layers[0]!=NULL) {
       weed_apply_filter_map(layers, filter_map, tc, pchains);
     }
   }
@@ -3592,63 +3595,63 @@
   // free playback: we will have here only one or two layers, and no filter_map.
   // Effects are applied in key order, in tracks are 0 and 1, out track is 0
   else {
-    for (i=0;i<FX_KEYS_MAX_VIRTUAL;i++) {
+    for (i=0; i<FX_KEYS_MAX_VIRTUAL; i++) {
       if (rte_key_valid(i+1,TRUE)) {
-	if (!(mainw->rte&(GU641<<i))) {
-	  // if anything is connected to ACTIVATE, the fx may be activated
-	  pconx_chain_data(i,key_modes[i]);
-	}
-	if (mainw->rte&(GU641<<i)) {
-	  mainw->osc_block=TRUE;
-	  if ((instance=key_to_instance[i][key_modes[i]])==NULL) continue;
-	  if (mainw->pchains!=NULL&&mainw->pchains[i]!=NULL) {
-	    interpolate_params(instance,mainw->pchains[i],tc); // interpolate parameters during preview
-	  }
-
-	  filter=weed_instance_get_filter(instance,TRUE);
-
-	  // TODO *** enable this, and apply pconx to audio gens in audio.c
-	  if (!is_pure_audio(filter,TRUE)) {
-	    if (mainw->pconx!=NULL&&!(mainw->preview||mainw->is_rendering)) {
-	      // chain any data pipelines
-	      needs_reinit=pconx_chain_data(i,key_modes[i]);
-
-	      // if anything is connected to ACTIVATE, the fx may be activated
-	      if ((instance=key_to_instance[i][key_modes[i]])==NULL) continue;
-	      
-	      if (needs_reinit) {
-		weed_reinit_effect(instance,FALSE);
-	      }
-	    }
-	  }
-
-	apply_inst3:
-
-	  if (weed_plant_has_leaf(instance,"host_next_instance")) {
-	    // chain any internal data pipelines for compound fx
-	    needs_reinit=pconx_chain_data_internal(instance);
-	    if (needs_reinit) {
-	      weed_reinit_effect(instance,FALSE);
-	    }
-	  }
+        if (!(mainw->rte&(GU641<<i))) {
+          // if anything is connected to ACTIVATE, the fx may be activated
+          pconx_chain_data(i,key_modes[i]);
+        }
+        if (mainw->rte&(GU641<<i)) {
+          mainw->osc_block=TRUE;
+          if ((instance=key_to_instance[i][key_modes[i]])==NULL) continue;
+          if (mainw->pchains!=NULL&&mainw->pchains[i]!=NULL) {
+            interpolate_params(instance,mainw->pchains[i],tc); // interpolate parameters during preview
+          }
+
+          filter=weed_instance_get_filter(instance,TRUE);
+
+          // TODO *** enable this, and apply pconx to audio gens in audio.c
+          if (!is_pure_audio(filter,TRUE)) {
+            if (mainw->pconx!=NULL&&!(mainw->preview||mainw->is_rendering)) {
+              // chain any data pipelines
+              needs_reinit=pconx_chain_data(i,key_modes[i]);
+
+              // if anything is connected to ACTIVATE, the fx may be activated
+              if ((instance=key_to_instance[i][key_modes[i]])==NULL) continue;
+
+              if (needs_reinit) {
+                weed_reinit_effect(instance,FALSE);
+              }
+            }
+          }
+
+apply_inst3:
+
+          if (weed_plant_has_leaf(instance,"host_next_instance")) {
+            // chain any internal data pipelines for compound fx
+            needs_reinit=pconx_chain_data_internal(instance);
+            if (needs_reinit) {
+              weed_reinit_effect(instance,FALSE);
+            }
+          }
 
-	  filter_error=weed_apply_instance (instance,NULL,layers,opwidth,opheight,tc);
+          filter_error=weed_apply_instance(instance,NULL,layers,opwidth,opheight,tc);
 
-	  if (filter_error==FILTER_INFO_REINITED) redraw_pwindow(i,key_modes[i]); // redraw our paramwindow
-	  //#define DEBUG_RTE
+          if (filter_error==FILTER_INFO_REINITED) redraw_pwindow(i,key_modes[i]); // redraw our paramwindow
+          //#define DEBUG_RTE
 #ifdef DEBUG_RTE
-	  if (filter_error!=FILTER_NO_ERROR) g_printerr("Render error was %d\n",filter_error);
+          if (filter_error!=FILTER_NO_ERROR) lives_printerr("Render error was %d\n",filter_error);
 #endif
 
-	  if (filter_error==WEED_NO_ERROR&&weed_plant_has_leaf(instance,"host_next_instance")) {
-	    // handling for compound fx
+          if (filter_error==WEED_NO_ERROR&&weed_plant_has_leaf(instance,"host_next_instance")) {
+            // handling for compound fx
 
-	    instance=weed_get_plantptr_value(instance,"host_next_instance",&error);
+            instance=weed_get_plantptr_value(instance,"host_next_instance",&error);
 
-	    goto apply_inst3;
-	  }
+            goto apply_inst3;
+          }
 
-	}
+        }
       }
     }
   }
@@ -3661,24 +3664,23 @@
 
   // caller should free all layers, but here we will free all other pixel_data
 
-  for (i=0;layers[i]!=NULL;i++) {
+  for (i=0; layers[i]!=NULL; i++) {
 
     check_layer_ready(layers[i]);
 
     if (layers[i]==mainw->blend_layer) mainw->blend_layer=NULL;
 
     if ((weed_plant_has_leaf(layers[i],"pixel_data")&&weed_get_voidptr_value(layers[i],"pixel_data",&error)!=NULL)||
-	(weed_get_int_value(layers[i],"frame",&error)!=0&&
-	 (mainw->playing_file>-1||mainw->multitrack==NULL||mainw->multitrack->current_rfx==NULL||
-	  (mainw->multitrack->init_event==NULL||tc<get_event_timecode(mainw->multitrack->init_event)||
-	   (mainw->multitrack->init_event==mainw->multitrack->avol_init_event)||
-	   tc>get_event_timecode((weed_plant_t *)weed_get_voidptr_value
-				 (mainw->multitrack->init_event,"deinit_event",&error)))))) {
+        (weed_get_int_value(layers[i],"frame",&error)!=0&&
+         (mainw->playing_file>-1||mainw->multitrack==NULL||mainw->multitrack->current_rfx==NULL||
+          (mainw->multitrack->init_event==NULL||tc<get_event_timecode(mainw->multitrack->init_event)||
+           (mainw->multitrack->init_event==mainw->multitrack->avol_init_event)||
+           tc>get_event_timecode((weed_plant_t *)weed_get_voidptr_value
+                                 (mainw->multitrack->init_event,"deinit_event",&error)))))) {
       if (output!=-1||weed_get_int_value(layers[i],"clip",&error)==-1) {
-	if (!weed_plant_has_leaf(layers[i],"pixel_data")) continue;
-	weed_layer_pixel_data_free(layers[i]);
-      }
-      else output=i;
+        if (!weed_plant_has_leaf(layers[i],"pixel_data")) continue;
+        weed_layer_pixel_data_free(layers[i]);
+      } else output=i;
     }
   }
 
@@ -3693,32 +3695,32 @@
   clip=weed_get_int_value(layer,"clip",&error);
 
   // frame is pulled uneffected here. TODO: Try to pull at target output palette
-  if (!weed_plant_has_leaf(layer,"pixel_data")||weed_get_voidptr_value(layer,"pixel_data",&error)==NULL) 
+  if (!weed_plant_has_leaf(layer,"pixel_data")||weed_get_voidptr_value(layer,"pixel_data",&error)==NULL)
     if (!pull_frame_at_size(layer,get_image_ext_for_type(mainw->files[clip]->img_type),tc,opwidth,opheight,
-			    WEED_PALETTE_END)) {
+                            WEED_PALETTE_END)) {
       weed_set_int_value(layer,"current_palette",mainw->files[clip]->img_type==IMG_TYPE_JPEG?
-			 WEED_PALETTE_RGB24:WEED_PALETTE_RGBA32);
+                         WEED_PALETTE_RGB24:WEED_PALETTE_RGBA32);
       weed_set_int_value(layer,"width",opwidth);
       weed_set_int_value(layer,"height",opheight);
       create_empty_pixel_data(layer,TRUE,TRUE);
       LIVES_WARN("weed_apply_effects created empty pixel_data");
     }
-  
+
   return layer;
 }
 
 
 
 
-void weed_apply_audio_effects (weed_plant_t *filter_map, float **abuf, int nbtracks, int nchans, int64_t nsamps, 
-			       double arate, weed_timecode_t tc, double *vis) {
+void weed_apply_audio_effects(weed_plant_t *filter_map, float **abuf, int nbtracks, int nchans, int64_t nsamps,
+                              double arate, weed_timecode_t tc, double *vis) {
   int i,num_inst,error;
   void **init_events;
   lives_filter_error_t filter_error;
   weed_plant_t *init_event,*filter;
-  gchar *fhash;
+  char *fhash;
 
-  // this is called during rendering - we will have previously received a 
+  // this is called during rendering - we will have previously received a
   // filter_map event and now we apply this to audio (abuf)
   // abuf will be a NULL terminated array of float audio
 
@@ -3730,19 +3732,19 @@
   mainw->pchains=get_event_pchains();
   if ((num_inst=weed_leaf_num_elements(filter_map,"init_events"))>0) {
     init_events=weed_get_voidptr_array(filter_map,"init_events",&error);
-    for (i=0;i<num_inst;i++) {
+    for (i=0; i<num_inst; i++) {
       init_event=(weed_plant_t *)init_events[i];
       fhash=weed_get_string_value(init_event,"filter",&error);
       filter=get_weed_filter(weed_get_idx_for_hashname(fhash,TRUE));
-      weed_free(fhash);
+      lives_free(fhash);
       if (has_audio_chans_in(filter,FALSE)&&!has_video_chans_in(filter,FALSE)&&!has_video_chans_out(filter,FALSE)) {
-	filter_error=weed_apply_audio_instance(init_event,abuf,nbtracks,nchans,nsamps,arate,tc,vis);
-	filter_error=filter_error; // stop compiler complaining
+        filter_error=weed_apply_audio_instance(init_event,abuf,nbtracks,nchans,nsamps,arate,tc,vis);
+        filter_error=filter_error; // stop compiler complaining
       }
       // TODO *** - also run any pure data processing filters which feed into audio filters
 
     }
-    weed_free(init_events);
+    lives_free(init_events);
   }
   mainw->pchains=NULL;
 }
@@ -3765,87 +3767,87 @@
   // Effects are applied in key order
 
 
-  for (i=0;i<FX_KEYS_MAX_VIRTUAL;i++) {
+  for (i=0; i<FX_KEYS_MAX_VIRTUAL; i++) {
     if (rte_key_valid(i+1,TRUE)) {
       if (!(mainw->rte&(GU641<<i))) {
-	// if anything is connected to ACTIVATE, the fx may be activated
-	pconx_chain_data(i,key_modes[i]);
+        // if anything is connected to ACTIVATE, the fx may be activated
+        pconx_chain_data(i,key_modes[i]);
       }
       if (mainw->rte&(GU641<<i)) {
-	mainw->osc_block=TRUE;
+        mainw->osc_block=TRUE;
 
-	// filter must not be deinited until we have processed it
-	if (pthread_mutex_trylock(&mainw->data_mutex[i])) continue;
+        // filter must not be deinited until we have processed it
+        if (pthread_mutex_trylock(&mainw->data_mutex[i])) continue;
 
-	if ((instance=key_to_instance[i][key_modes[i]])==NULL) {
-	  filter_mutex_unlock(i);
-	  continue;
-	}
-	filter=weed_instance_get_filter(instance,FALSE);
-
-	if (!has_audio_chans_in(filter,FALSE)||has_video_chans_in(filter,FALSE)||has_video_chans_out(filter,FALSE)) {
-	  filter_mutex_unlock(i);
-	  continue; 
-	}
-
-	if (analysers_only&&has_audio_chans_out(filter,FALSE)) {
-	  filter_mutex_unlock(i);
-	  continue;
-	}
-
-	if (mainw->pchains!=NULL&&mainw->pchains[i]!=NULL) {
-	  interpolate_params(instance,mainw->pchains[i],tc); // interpolate parameters during preview
-	}
-
-      apply_audio_inst2:
-	
-	if (mainw->pconx!=NULL) {
-	  // chain any data pipelines
-
-	  if (!pthread_mutex_trylock(&mainw->data_mutex[i])) {
-	    needs_reinit=pconx_chain_data(i,key_modes[i]);
-
-	    // if anything is connected to ACTIVATE, the fx may be deactivated
-	    if ((instance=key_to_instance[i][key_modes[i]])==NULL) {
-	      filter_mutex_unlock(i);
-	      continue;
-	    }
-
-	    if (needs_reinit) {
-	      weed_reinit_effect(instance,FALSE);
-	    }
-
-	    filter_mutex_unlock(i);
-	  }
-	}
-
-	//weed_set_int_value(instance,"host_key",i);
-
-	if (weed_plant_has_leaf(instance,"host_next_instance")) {
-	  // chain any internal data pipelines for compound fx
-	  if (!pthread_mutex_trylock(&mainw->data_mutex[i])) {
-	    needs_reinit=pconx_chain_data_internal(instance);
-	    filter_mutex_unlock(i);
-	    if (needs_reinit) {
-	      weed_reinit_effect(instance,FALSE);
-	    }
-	  }
-	}
-
-	filter_error=weed_apply_audio_instance(instance,abuf,0,nchans,nsamps,arate,tc,NULL);
-
-	if (filter_error==WEED_NO_ERROR&&weed_plant_has_leaf(instance,"host_next_instance")) {
-	  // handling for compound fx
-	  instance=weed_get_plantptr_value(instance,"host_next_instance",&error);
+        if ((instance=key_to_instance[i][key_modes[i]])==NULL) {
+          filter_mutex_unlock(i);
+          continue;
+        }
+        filter=weed_instance_get_filter(instance,FALSE);
+
+        if (!has_audio_chans_in(filter,FALSE)||has_video_chans_in(filter,FALSE)||has_video_chans_out(filter,FALSE)) {
+          filter_mutex_unlock(i);
+          continue;
+        }
+
+        if (analysers_only&&has_audio_chans_out(filter,FALSE)) {
+          filter_mutex_unlock(i);
+          continue;
+        }
+
+        if (mainw->pchains!=NULL&&mainw->pchains[i]!=NULL) {
+          interpolate_params(instance,mainw->pchains[i],tc); // interpolate parameters during preview
+        }
+
+apply_audio_inst2:
+
+        if (mainw->pconx!=NULL) {
+          // chain any data pipelines
+
+          if (!pthread_mutex_trylock(&mainw->data_mutex[i])) {
+            needs_reinit=pconx_chain_data(i,key_modes[i]);
 
-	  goto apply_audio_inst2;
-	}
+            // if anything is connected to ACTIVATE, the fx may be deactivated
+            if ((instance=key_to_instance[i][key_modes[i]])==NULL) {
+              filter_mutex_unlock(i);
+              continue;
+            }
+
+            if (needs_reinit) {
+              weed_reinit_effect(instance,FALSE);
+            }
+
+            filter_mutex_unlock(i);
+          }
+        }
+
+        //weed_set_int_value(instance,"host_key",i);
+
+        if (weed_plant_has_leaf(instance,"host_next_instance")) {
+          // chain any internal data pipelines for compound fx
+          if (!pthread_mutex_trylock(&mainw->data_mutex[i])) {
+            needs_reinit=pconx_chain_data_internal(instance);
+            filter_mutex_unlock(i);
+            if (needs_reinit) {
+              weed_reinit_effect(instance,FALSE);
+            }
+          }
+        }
+
+        filter_error=weed_apply_audio_instance(instance,abuf,0,nchans,nsamps,arate,tc,NULL);
+
+        if (filter_error==WEED_NO_ERROR&&weed_plant_has_leaf(instance,"host_next_instance")) {
+          // handling for compound fx
+          instance=weed_get_plantptr_value(instance,"host_next_instance",&error);
+
+          goto apply_audio_inst2;
+        }
 
-	filter_mutex_unlock(i);
+        filter_mutex_unlock(i);
 
-	if (filter_error==FILTER_INFO_REINITED) redraw_pwindow(i,key_modes[i]); // redraw our paramwindow
+        if (filter_error==FILTER_INFO_REINITED) redraw_pwindow(i,key_modes[i]); // redraw our paramwindow
 #ifdef DEBUG_RTE
-	if (filter_error!=FILTER_NO_ERROR) g_printerr("Render error was %d\n",filter_error);
+        if (filter_error!=FILTER_NO_ERROR) lives_printerr("Render error was %d\n",filter_error);
 #endif
       }
     }
@@ -3864,17 +3866,17 @@
 
   if (af_type==AF_TYPE_A&&mainw->audio_frame_buffer!=NULL) return TRUE;
 
-  for (i=0;i<FX_KEYS_MAX_VIRTUAL;i++) {
+  for (i=0; i<FX_KEYS_MAX_VIRTUAL; i++) {
     if (rte_key_valid(i+1,TRUE)) {
       if (mainw->rte&(GU641<<i)) {
-	if ((instance=key_to_instance[i][key_modes[i]])==NULL) continue;
-	filter=weed_instance_get_filter(instance,FALSE);
-	if (has_audio_chans_in(filter,FALSE)&&!has_video_chans_in(filter,FALSE)&&!has_video_chans_out(filter,FALSE)) {
-	  if ((af_type==AF_TYPE_A&&has_audio_chans_out(filter,FALSE))||  // check for analysers only
-	      (af_type==AF_TYPE_NONA&&!has_audio_chans_out(filter,FALSE))) // check for non-analysers only
-	    continue;
-	  return TRUE;
-	}
+        if ((instance=key_to_instance[i][key_modes[i]])==NULL) continue;
+        filter=weed_instance_get_filter(instance,FALSE);
+        if (has_audio_chans_in(filter,FALSE)&&!has_video_chans_in(filter,FALSE)&&!has_video_chans_out(filter,FALSE)) {
+          if ((af_type==AF_TYPE_A&&has_audio_chans_out(filter,FALSE))||  // check for analysers only
+              (af_type==AF_TYPE_NONA&&!has_audio_chans_out(filter,FALSE))) // check for non-analysers only
+            continue;
+          return TRUE;
+        }
       }
     }
   }
@@ -3888,15 +3890,15 @@
 
   register int i;
 
-  for (i=0;i<FX_KEYS_MAX_VIRTUAL;i++) {
+  for (i=0; i<FX_KEYS_MAX_VIRTUAL; i++) {
     if (rte_key_valid(i+1,TRUE)) {
       if (mainw->rte&(GU641<<i)) {
-	if ((instance=key_to_instance[i][key_modes[i]])==NULL) continue;
-	filter=weed_instance_get_filter(instance,FALSE);
-	if (has_video_chans_in(filter,FALSE)) {
-	  if (analysers_only&&has_video_chans_out(filter,FALSE)) continue;
-	  return TRUE;
-	}
+        if ((instance=key_to_instance[i][key_modes[i]])==NULL) continue;
+        filter=weed_instance_get_filter(instance,FALSE);
+        if (has_video_chans_in(filter,FALSE)) {
+          if (analysers_only&&has_video_chans_out(filter,FALSE)) continue;
+          return TRUE;
+        }
       }
     }
   }
@@ -3907,7 +3909,7 @@
 /////////////////////////////////////////////////////////////////////////
 
 
-static int check_weed_plugin_info (weed_plant_t *plugin_info) {
+static int check_weed_plugin_info(weed_plant_t *plugin_info) {
   // verify the plugin_info returned from the plugin
   // TODO - print descriptive errors
   if (!weed_plant_has_leaf(plugin_info,"host_info")) return -1;
@@ -3926,16 +3928,15 @@
   int num_params,i,error;
   boolean is_template=(WEED_PLANT_IS_FILTER_CLASS(plant));
 
- nip1:
+nip1:
 
   num_params=0;
 
   if (is_template) {
     if (!weed_plant_has_leaf(plant,"in_parameter_templates")||
-	weed_get_plantptr_value(plant,"in_parameter_templates",&error)==NULL) return 0;
+        weed_get_plantptr_value(plant,"in_parameter_templates",&error)==NULL) return 0;
     num_params=weed_leaf_num_elements(plant,"in_parameter_templates");
-  }
-  else {
+  } else {
     if (!weed_plant_has_leaf(plant,"in_parameters")) goto nip1done;
     if (weed_get_plantptr_value(plant,"in_parameters",&error)==NULL) goto nip1done;
     num_params=weed_leaf_num_elements(plant,"in_parameters");
@@ -3949,16 +3950,16 @@
   if (is_template) params=weed_get_plantptr_array(plant,"in_parameter_templates",&error);
   else params=weed_get_plantptr_array(plant,"in_parameters",&error);
 
-  for (i=0;i<num_params;i++) {
+  for (i=0; i<num_params; i++) {
     if (skip_hidden&&is_hidden_param(plant,i)) continue;
     param=params[i];
     if (skip_internal&&weed_plant_has_leaf(param,"host_internal_connection")) continue;
     counted++;
   }
 
-  weed_free(params);
+  lives_free(params);
 
- nip1done:
+nip1done:
 
   if (!is_template&&skip_internal&&weed_plant_has_leaf(plant,"host_next_instance")) {
     plant=weed_get_plantptr_value(plant,"host_next_instance",&error);
@@ -3975,10 +3976,9 @@
 
   if (is_template) {
     if (!weed_plant_has_leaf(plant,"out_parameter_templates")||
-	weed_get_plantptr_value(plant,"out_parameter_templates",&error)==NULL) return 0;
+        weed_get_plantptr_value(plant,"out_parameter_templates",&error)==NULL) return 0;
     num_params=weed_leaf_num_elements(plant,"out_parameter_templates");
-  }
-  else {
+  } else {
     if (!weed_plant_has_leaf(plant,"out_parameters")) return 0;
     if (weed_get_plantptr_value(plant,"out_parameters",&error)==NULL) return 0;
     num_params=weed_leaf_num_elements(plant,"out_parameters");
@@ -3997,7 +3997,7 @@
 
 
 
-int enabled_in_channels (weed_plant_t *plant, boolean count_repeats) {
+int enabled_in_channels(weed_plant_t *plant, boolean count_repeats) {
   // count number of non-disabled in channels (video and/or audio) for a filter or instance
 
   // NOTE: for instances, we do not count optional audio channels, even if they are enabled
@@ -4014,26 +4014,24 @@
     if (!weed_plant_has_leaf(plant,"in_channel_templates")) return 0;
     num_channels=weed_leaf_num_elements(plant,"in_channel_templates");
     if (num_channels>0) channels=weed_get_plantptr_array(plant,"in_channel_templates",&error);
-  }
-  else {
+  } else {
     if (!weed_plant_has_leaf(plant,"in_channels")) return 0;
     num_channels=weed_leaf_num_elements(plant,"in_channels");
     if (num_channels>0) channels=weed_get_plantptr_array(plant,"in_channels",&error);
   }
 
-  for (i=0;i<num_channels;i++) {
+  for (i=0; i<num_channels; i++) {
     if (!is_template) {
       weed_plant_t *ctmpl=weed_get_plantptr_value(channels[i],"template",&error);
       if (weed_plant_has_leaf(ctmpl,"is_audio")&&weed_get_boolean_value(ctmpl,"is_audio",&error)==WEED_TRUE) {
-	if (weed_plant_has_leaf(ctmpl,"optional")&&weed_get_boolean_value(ctmpl,"optional",&error)==WEED_TRUE) continue;
+        if (weed_plant_has_leaf(ctmpl,"optional")&&weed_get_boolean_value(ctmpl,"optional",&error)==WEED_TRUE) continue;
       }
 
       if (!weed_plant_has_leaf(channels[i],"disabled")||
-	  weed_get_boolean_value(channels[i],"disabled",&error)!=WEED_TRUE) enabled++;
-    }
-    else {
+          weed_get_boolean_value(channels[i],"disabled",&error)!=WEED_TRUE) enabled++;
+    } else {
       if (!weed_plant_has_leaf(channels[i],"host_disabled")||
-	  weed_get_boolean_value(channels[i],"host_disabled",&error)!=WEED_TRUE) enabled++;
+          weed_get_boolean_value(channels[i],"host_disabled",&error)!=WEED_TRUE) enabled++;
     }
 
     if (count_repeats) {
@@ -4043,23 +4041,23 @@
       if (is_template) chantmpl=channels[i];
       else chantmpl=weed_get_plantptr_value(channels[i],"template",&error);
       if (weed_plant_has_leaf(channels[i],"max_repeats")) {
-	if (weed_plant_has_leaf(channels[i],"disabled")&&
-	    weed_get_boolean_value(channels[i],"disabled",&error)==WEED_TRUE&&
-	    !has_usable_palette(chantmpl)) continue; // channel was disabled because palette is unusable
-	repeats=weed_get_int_value(channels[i],"max_repeats",&error)-1;
-	if (repeats==-1) repeats=1000000;
-	enabled+=repeats;
+        if (weed_plant_has_leaf(channels[i],"disabled")&&
+            weed_get_boolean_value(channels[i],"disabled",&error)==WEED_TRUE&&
+            !has_usable_palette(chantmpl)) continue; // channel was disabled because palette is unusable
+        repeats=weed_get_int_value(channels[i],"max_repeats",&error)-1;
+        if (repeats==-1) repeats=1000000;
+        enabled+=repeats;
       }
     }
   }
 
-  if (channels!=NULL) weed_free(channels);
+  if (channels!=NULL) lives_free(channels);
 
   return enabled;
 }
 
 
-int enabled_out_channels (weed_plant_t *plant, boolean count_repeats) {
+int enabled_out_channels(weed_plant_t *plant, boolean count_repeats) {
   weed_plant_t **channels=NULL;
   int enabled=0;
   int num_channels,i,error;
@@ -4068,20 +4066,18 @@
   if (is_template) {
     num_channels=weed_leaf_num_elements(plant,"out_channel_templates");
     if (num_channels>0) channels=weed_get_plantptr_array(plant,"out_channel_templates",&error);
-  }
-  else {
+  } else {
     num_channels=weed_leaf_num_elements(plant,"out_channels");
     if (num_channels>0) channels=weed_get_plantptr_array(plant,"out_channels",&error);
   }
 
-  for (i=0;i<num_channels;i++) {
+  for (i=0; i<num_channels; i++) {
     if (!is_template) {
       if (!weed_plant_has_leaf(channels[i],"disabled")||
-	  weed_get_boolean_value(channels[i],"disabled",&error)!=WEED_TRUE) enabled++;
-    }
-    else {
+          weed_get_boolean_value(channels[i],"disabled",&error)!=WEED_TRUE) enabled++;
+    } else {
       if (!weed_plant_has_leaf(channels[i],"host_disabled")||
-	  weed_get_boolean_value(channels[i],"host_disabled",&error)!=WEED_TRUE) enabled++;
+          weed_get_boolean_value(channels[i],"host_disabled",&error)!=WEED_TRUE) enabled++;
     }
     if (count_repeats) {
       // count repeated channels
@@ -4090,17 +4086,17 @@
       if (is_template) chantmpl=channels[i];
       else chantmpl=weed_get_plantptr_value(channels[i],"template",&error);
       if (weed_plant_has_leaf(channels[i],"max_repeats")) {
-	if (weed_plant_has_leaf(channels[i],"disabled")&&
-	    weed_get_boolean_value(channels[i],"disabled",&error)==WEED_TRUE&&
-	    !has_usable_palette(chantmpl)) continue; // channel was disabled because palette is unusable
-	repeats=weed_get_int_value(channels[i],"max_repeats",&error)-1;
-	if (repeats==-1) repeats=1000000;
-	enabled+=repeats;
+        if (weed_plant_has_leaf(channels[i],"disabled")&&
+            weed_get_boolean_value(channels[i],"disabled",&error)==WEED_TRUE&&
+            !has_usable_palette(chantmpl)) continue; // channel was disabled because palette is unusable
+        repeats=weed_get_int_value(channels[i],"max_repeats",&error)-1;
+        if (repeats==-1) repeats=1000000;
+        enabled+=repeats;
       }
     }
   }
 
-  if (channels!=NULL) weed_free(channels);
+  if (channels!=NULL) lives_free(channels);
 
   return enabled;
 }
@@ -4116,7 +4112,7 @@
 
 static int check_for_lives(weed_plant_t *filter, int filter_idx) {
   // for LiVES, currently:
-  // all filters must take 0, 1 or 2 mandatory/optional inputs and provide 
+  // all filters must take 0, 1 or 2 mandatory/optional inputs and provide
   // 1 mandatory output (audio or video) or >1 optional (video only) outputs (for now)
 
   // or 1 or more mandatory alpha outputs (analysers)
@@ -4128,7 +4124,7 @@
 
   // all channels used must support a limited range of palettes (for now)
 
-  // filters can now have any number of mandatory in alphas, the effect will not be run unless the channels are filled 
+  // filters can now have any number of mandatory in alphas, the effect will not be run unless the channels are filled
   // (by chaining to output of another fx)
 
 
@@ -4166,23 +4162,23 @@
 
   if (num_elements>0) array=weed_get_plantptr_array(filter,"in_channel_templates",&error);
 
-  for (i=0;i<num_elements;i++) {
+  for (i=0; i<num_elements; i++) {
 #ifndef HAVE_POSIX_MEMALIGN
     if (weed_plant_has_leaf(array[i],"alignment")) {
-      weed_free(array);
+      lives_free(array);
       return 12;
     }
 #endif
     if (weed_plant_has_leaf(array[i],"is_audio")&&weed_get_boolean_value(array[i],"is_audio",&error)==WEED_TRUE) {
       if (weed_plant_has_leaf(array[i],"audio_channels")&&(naudins=weed_get_int_value(array[i],"audio_channels",&error))>2) {
-	// currently we only handle mono and stereo audio filters
-	weed_free(array);
-	return 7;
+        // currently we only handle mono and stereo audio filters
+        lives_free(array);
+        return 7;
       }
       is_audio=TRUE;
     }
     if (!weed_plant_has_leaf(array[i],"name")||(!weed_plant_has_leaf(array[i],"palette_list")&&!is_audio)) {
-      weed_free(array);
+      lives_free(array);
       return 6;
     }
 
@@ -4192,15 +4188,14 @@
       // is optional
       chans_in_opt_max++;
       weed_set_boolean_value(array[i],"host_disabled",WEED_TRUE);
-    }
-    else {
+    } else {
       if (has_non_alpha_palette(array[i])) {
-	if (!is_audio) chans_in_mand++;
-	else achans_in_mand++;
+        if (!is_audio) chans_in_mand++;
+        else achans_in_mand++;
       }
     }
   }
-  if (num_elements>0) weed_free(array);
+  if (num_elements>0) lives_free(array);
   if (chans_in_mand>2) return 8; // we dont handle mixers yet...
   if (achans_in_mand>0&&chans_in_mand>0) return 13; // can't yet handle effects that need both audio and video
 
@@ -4210,28 +4205,28 @@
 
   if (num_elements>0) array=weed_get_plantptr_array(filter,"out_channel_templates",&error);
 
-  for (i=0;i<num_elements;i++) {
+  for (i=0; i<num_elements; i++) {
 #ifndef HAVE_POSIX_MEMALIGN
     if (weed_plant_has_leaf(array[i],"alignment")) {
-      weed_free(array);
+      lives_free(array);
       return 12;
     }
 #endif
     if (weed_plant_has_leaf(array[i],"is_audio")&&weed_get_boolean_value(array[i],"is_audio",&error)==WEED_TRUE) {
       if (weed_plant_has_leaf(array[i],"audio_channels")&&(naudouts=weed_get_int_value(array[i],"audio_channels",&error))>2) {
-	// currently we only handle mono and stereo audio filters
-	weed_free(array);
-	return 7;
+        // currently we only handle mono and stereo audio filters
+        lives_free(array);
+        return 7;
       }
       if (naudins==1&&naudouts==2) {
-	// converting mono to stereo cannot be done like that
-	weed_free(array);
-	return 7;
+        // converting mono to stereo cannot be done like that
+        lives_free(array);
+        return 7;
       }
       is_audio=TRUE;
     }
     if (!weed_plant_has_leaf(array[i],"name")||(!weed_plant_has_leaf(array[i],"palette_list")&&!is_audio)) {
-      weed_free(array);
+      lives_free(array);
       return 9;
     }
 
@@ -4241,21 +4236,19 @@
       // is optional
       chans_out_opt_max++;
       weed_set_boolean_value(array[i],"host_disabled",WEED_TRUE);
-    }
-    else {
+    } else {
       // is mandatory
       if (!is_audio) {
-	chans_out_mand++;
-	if (has_non_alpha_palette(array[i])) all_out_alpha=FALSE;
-      }
-      else achans_out_mand++;
+        chans_out_mand++;
+        if (has_non_alpha_palette(array[i])) all_out_alpha=FALSE;
+      } else achans_out_mand++;
     }
   }
-  if (num_elements>0) weed_free(array);
+  if (num_elements>0) lives_free(array);
   if (weed_plant_has_leaf(filter,"out_parameter_templates")) has_out_params=TRUE;
 
   if ((chans_out_mand>1&&!all_out_alpha)||((chans_out_mand+chans_out_opt_max+achans_out_mand<1)
-					   &&(!has_out_params))) return 11;
+      &&(!has_out_params))) return 11;
   if (achans_out_mand>1||(achans_out_mand==1&&chans_out_mand>0)) return 14;
   if (achans_in_mand>=1&&achans_out_mand==0&&!(has_out_params)) return 15;
 
@@ -4263,7 +4256,7 @@
   if (weed_plant_has_leaf(filter,"gui")) {
     weed_plant_t *gui=weed_get_plantptr_value(filter,"gui",&error);
     weed_add_plant_flags(gui,WEED_LEAF_READONLY_PLUGIN);
-    if (weed_plant_has_leaf(gui,"hidden")&&weed_get_boolean_value(gui,"hidden",&error)==WEED_TRUE) 
+    if (weed_plant_has_leaf(gui,"hidden")&&weed_get_boolean_value(gui,"hidden",&error)==WEED_TRUE)
       hidden=TRUE;
   }
 
@@ -4271,23 +4264,22 @@
     if (is_audio) {
       weed_set_boolean_value(filter,"host_menu_hide",WEED_TRUE);
       if (enabled_in_channels(filter,TRUE)>=1000000) {
-	// this is a candidate for audio volume
-	lives_fx_candidate_t *cand=&mainw->fx_candidates[FX_CANDIDATE_AUDIO_VOL];
-	cand->list=g_list_append(cand->list,GINT_TO_POINTER(filter_idx));
-	cand->delegate=0;
+        // this is a candidate for audio volume
+        lives_fx_candidate_t *cand=&mainw->fx_candidates[FX_CANDIDATE_AUDIO_VOL];
+        cand->list=lives_list_append(cand->list,LIVES_INT_TO_POINTER(filter_idx));
+        cand->delegate=0;
       }
-    }
-    else {
+    } else {
       weed_set_boolean_value(filter,"host_menu_hide",WEED_TRUE);
       if (chans_in_mand==1&&chans_out_mand==1) {
-	weed_plant_t *fstout=get_mandatory_channel(filter,0,FALSE);
-	int ochan_flags=weed_get_int_value(fstout,"flags",&error);
-	if (ochan_flags&WEED_CHANNEL_SIZE_CAN_VARY) {
-	  // this is a candidate for resize
-	  lives_fx_candidate_t *cand=&mainw->fx_candidates[FX_CANDIDATE_RESIZER];
-	  cand->list=g_list_append(cand->list,GINT_TO_POINTER(filter_idx));
-	  cand->delegate=0;
-	}
+        weed_plant_t *fstout=get_mandatory_channel(filter,0,FALSE);
+        int ochan_flags=weed_get_int_value(fstout,"flags",&error);
+        if (ochan_flags&WEED_CHANNEL_SIZE_CAN_VARY) {
+          // this is a candidate for resize
+          lives_fx_candidate_t *cand=&mainw->fx_candidates[FX_CANDIDATE_RESIZER];
+          cand->list=lives_list_append(cand->list,LIVES_INT_TO_POINTER(filter_idx));
+          cand->delegate=0;
+        }
       }
     }
   }
@@ -4297,7 +4289,7 @@
 
 
 
-static boolean set_in_channel_palettes (weed_plant_t *filter, int num_channels) {
+static boolean set_in_channel_palettes(weed_plant_t *filter, int num_channels) {
   // set in channel palettes for filter
   // we also enable optional channels if we have to
   // in this case we fill first the mandatory channels,
@@ -4325,57 +4317,57 @@
   // our start state is with all optional channels disabled
 
   // fill mandatory channels first; these palettes may change later if we get a frame in a different palette
-  for (i=0;i<num_elements;i++) {
+  for (i=0; i<num_elements; i++) {
     if (!weed_plant_has_leaf(chantmpls[i],"is_audio")||weed_get_boolean_value(chantmpls[i],"is_audio",&error)!=WEED_TRUE) {
       int num_palettes=weed_leaf_num_elements(chantmpls[i],"palette_list");
       int *palettes=weed_get_int_array(chantmpls[i],"palette_list",&error);
-      if (check_weed_palette_list (palettes,num_palettes,WEED_PALETTE_RGB24)==WEED_PALETTE_RGB24) 
-	weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_RGB24);
-      else if (check_weed_palette_list (palettes,num_palettes,WEED_PALETTE_BGR24)==WEED_PALETTE_BGR24) 
-	weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_BGR24);
-      else if (check_weed_palette_list (palettes,num_palettes,WEED_PALETTE_RGBA32)==WEED_PALETTE_RGBA32) 
-	weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_RGBA32);
-      else if (check_weed_palette_list (palettes,num_palettes,WEED_PALETTE_BGRA32)==WEED_PALETTE_BGRA32) 
-	weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_BGRA32);
-      else if (check_weed_palette_list (palettes,num_palettes,WEED_PALETTE_ARGB32)==WEED_PALETTE_ARGB32) 
-	weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_ARGB32);
-      else if (check_weed_palette_list (palettes,num_palettes,WEED_PALETTE_YUV888)==WEED_PALETTE_YUV888) 
-	weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_YUV888);
-      else if (check_weed_palette_list (palettes,num_palettes,WEED_PALETTE_YUV444P)==WEED_PALETTE_YUV444P) 
-	weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_YUV444P);
-      else if (check_weed_palette_list (palettes,num_palettes,WEED_PALETTE_YUVA8888)==WEED_PALETTE_YUVA8888) 
-	weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_YUVA8888);
-      else if (check_weed_palette_list (palettes,num_palettes,WEED_PALETTE_YUVA4444P)==WEED_PALETTE_YUVA4444P) 
-	weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_YUVA4444P);
-      else if (check_weed_palette_list (palettes,num_palettes,WEED_PALETTE_UYVY8888)==WEED_PALETTE_UYVY8888) 
-	weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_UYVY8888);
-      else if (check_weed_palette_list (palettes,num_palettes,WEED_PALETTE_YUYV8888)==WEED_PALETTE_YUYV8888) 
-	weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_YUYV8888);
-      else if (check_weed_palette_list (palettes,num_palettes,WEED_PALETTE_YUV422P)==WEED_PALETTE_YUV422P) 
-	weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_YUV422P);
-      else if (check_weed_palette_list (palettes,num_palettes,WEED_PALETTE_YUV420P)==WEED_PALETTE_YUV420P) 
-	weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_YUV420P);
-      else if (check_weed_palette_list (palettes,num_palettes,WEED_PALETTE_YVU420P)==WEED_PALETTE_YVU420P) 
-	weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_YVU420P);
-      else if (check_weed_palette_list (palettes,num_palettes,WEED_PALETTE_YUV411)==WEED_PALETTE_YUV411) 
-	weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_YUV411);
-      else if (check_weed_palette_list (palettes,num_palettes,WEED_PALETTE_AFLOAT)==WEED_PALETTE_AFLOAT) 
-	weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_AFLOAT);
-      else if (check_weed_palette_list (palettes,num_palettes,WEED_PALETTE_A8)==WEED_PALETTE_A8) 
-	weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_A8);
-      else if (check_weed_palette_list (palettes,num_palettes,WEED_PALETTE_A1)==WEED_PALETTE_A1) 
-	weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_A1);
+      if (check_weed_palette_list(palettes,num_palettes,WEED_PALETTE_RGB24)==WEED_PALETTE_RGB24)
+        weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_RGB24);
+      else if (check_weed_palette_list(palettes,num_palettes,WEED_PALETTE_BGR24)==WEED_PALETTE_BGR24)
+        weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_BGR24);
+      else if (check_weed_palette_list(palettes,num_palettes,WEED_PALETTE_RGBA32)==WEED_PALETTE_RGBA32)
+        weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_RGBA32);
+      else if (check_weed_palette_list(palettes,num_palettes,WEED_PALETTE_BGRA32)==WEED_PALETTE_BGRA32)
+        weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_BGRA32);
+      else if (check_weed_palette_list(palettes,num_palettes,WEED_PALETTE_ARGB32)==WEED_PALETTE_ARGB32)
+        weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_ARGB32);
+      else if (check_weed_palette_list(palettes,num_palettes,WEED_PALETTE_YUV888)==WEED_PALETTE_YUV888)
+        weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_YUV888);
+      else if (check_weed_palette_list(palettes,num_palettes,WEED_PALETTE_YUV444P)==WEED_PALETTE_YUV444P)
+        weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_YUV444P);
+      else if (check_weed_palette_list(palettes,num_palettes,WEED_PALETTE_YUVA8888)==WEED_PALETTE_YUVA8888)
+        weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_YUVA8888);
+      else if (check_weed_palette_list(palettes,num_palettes,WEED_PALETTE_YUVA4444P)==WEED_PALETTE_YUVA4444P)
+        weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_YUVA4444P);
+      else if (check_weed_palette_list(palettes,num_palettes,WEED_PALETTE_UYVY8888)==WEED_PALETTE_UYVY8888)
+        weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_UYVY8888);
+      else if (check_weed_palette_list(palettes,num_palettes,WEED_PALETTE_YUYV8888)==WEED_PALETTE_YUYV8888)
+        weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_YUYV8888);
+      else if (check_weed_palette_list(palettes,num_palettes,WEED_PALETTE_YUV422P)==WEED_PALETTE_YUV422P)
+        weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_YUV422P);
+      else if (check_weed_palette_list(palettes,num_palettes,WEED_PALETTE_YUV420P)==WEED_PALETTE_YUV420P)
+        weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_YUV420P);
+      else if (check_weed_palette_list(palettes,num_palettes,WEED_PALETTE_YVU420P)==WEED_PALETTE_YVU420P)
+        weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_YVU420P);
+      else if (check_weed_palette_list(palettes,num_palettes,WEED_PALETTE_YUV411)==WEED_PALETTE_YUV411)
+        weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_YUV411);
+      else if (check_weed_palette_list(palettes,num_palettes,WEED_PALETTE_AFLOAT)==WEED_PALETTE_AFLOAT)
+        weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_AFLOAT);
+      else if (check_weed_palette_list(palettes,num_palettes,WEED_PALETTE_A8)==WEED_PALETTE_A8)
+        weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_A8);
+      else if (check_weed_palette_list(palettes,num_palettes,WEED_PALETTE_A1)==WEED_PALETTE_A1)
+        weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_A1);
       else if (!weed_plant_has_leaf(chantmpls[i],"optional")) {
-	if (chantmpls!=NULL) weed_free(chantmpls);
-	weed_free(palettes);
-	return FALSE; // mandatory channel; we don't yet handle rgb float
-      }
-      /*else if (check_weed_palette_list (palettes,num_palettes,WEED_PALETTE_RGBFLOAT)==WEED_PALETTE_RGBFLOAT) 
-	weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_RGBFLOAT);
-	else if (check_weed_palette_list (palettes,num_palettes,WEED_PALETTE_ARGBFLOAT)==WEED_PALETTE_ARGBFLOAT) 
-	weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_ARGBFLOAT);
+        if (chantmpls!=NULL) lives_free(chantmpls);
+        lives_free(palettes);
+        return FALSE; // mandatory channel; we don't yet handle rgb float
+      }
+      /*else if (check_weed_palette_list (palettes,num_palettes,WEED_PALETTE_RGBFLOAT)==WEED_PALETTE_RGBFLOAT)
+      weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_RGBFLOAT);
+      else if (check_weed_palette_list (palettes,num_palettes,WEED_PALETTE_ARGBFLOAT)==WEED_PALETTE_ARGBFLOAT)
+      weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_ARGBFLOAT);
       */
-      weed_free(palettes);
+      lives_free(palettes);
     }
 
     if (!weed_plant_has_leaf(chantmpls[i],"optional")) num_channels--; // mandatory channel
@@ -4383,43 +4375,42 @@
 
   if (num_channels>0) {
     // OK we need to use some optional channels
-    for (i=0;i<num_elements&&num_channels>0;i++) if (weed_plant_has_leaf(chantmpls[i],"optional")) {
-	weed_set_boolean_value(chantmpls[i],"host_disabled",WEED_FALSE);
-	g_print("basel 1\n");
-	num_channels--;
+    for (i=0; i<num_elements&&num_channels>0; i++) if (weed_plant_has_leaf(chantmpls[i],"optional")) {
+        weed_set_boolean_value(chantmpls[i],"host_disabled",WEED_FALSE);
+        num_channels--;
       }
   }
   if (num_channels>0) {
-    if (chantmpls!=NULL) weed_free(chantmpls);
+    if (chantmpls!=NULL) lives_free(chantmpls);
     return FALSE;
   }
 
   // now we set match channels
   if (!weed_plant_has_leaf(chantmpls[0],"is_audio")||weed_get_boolean_value(chantmpls[0],"is_audio",&error)!=WEED_TRUE) {
     def_palette=weed_get_int_value(chantmpls[0],"current_palette",&error);
-    for (i=1;i<num_elements;i++) {
+    for (i=1; i<num_elements; i++) {
       int channel_flags=weed_get_int_value(chantmpls[i],"flags",&error);
       if (!(channel_flags&WEED_CHANNEL_PALETTE_CAN_VARY)) {
-	int num_palettes=weed_leaf_num_elements(chantmpls[i],"palette_list");
-	int *palettes=weed_get_int_array(chantmpls[i],"palette_list",&error);
-	if (check_weed_palette_list(palettes,num_palettes,def_palette)==def_palette) 
-	  weed_set_int_value(chantmpls[i],"current_palette",def_palette);
-	else {
-	  if (chantmpls!=NULL) weed_free(chantmpls);
-	  weed_free(palettes);
-	  return FALSE;
-	}
-	weed_free(palettes);
+        int num_palettes=weed_leaf_num_elements(chantmpls[i],"palette_list");
+        int *palettes=weed_get_int_array(chantmpls[i],"palette_list",&error);
+        if (check_weed_palette_list(palettes,num_palettes,def_palette)==def_palette)
+          weed_set_int_value(chantmpls[i],"current_palette",def_palette);
+        else {
+          if (chantmpls!=NULL) lives_free(chantmpls);
+          lives_free(palettes);
+          return FALSE;
+        }
+        lives_free(palettes);
       }
     }
   }
-  if (chantmpls!=NULL) weed_free(chantmpls);
+  if (chantmpls!=NULL) lives_free(chantmpls);
   return TRUE;
 }
 
 
 
-static boolean set_out_channel_palettes (weed_plant_t *filter, int num_channels) {
+static boolean set_out_channel_palettes(weed_plant_t *filter, int num_channels) {
   // set in channel palettes for filter
   // we also enable optional channels if we have to
   // in this case we fill first the mandatory channels,
@@ -4440,72 +4431,72 @@
   // our start state is with all optional channels disabled
 
   // fill mandatory channels first; these palettes may change later if we get a frame in a different palette
-  for (i=0;i<num_elements;i++) {
+  for (i=0; i<num_elements; i++) {
     if (!weed_plant_has_leaf(chantmpls[i],"is_audio")||weed_get_boolean_value(chantmpls[i],"is_audio",&error)!=WEED_TRUE) {
       int num_palettes=weed_leaf_num_elements(chantmpls[i],"palette_list");
       int *palettes=weed_get_int_array(chantmpls[i],"palette_list",&error);
-      if (check_weed_palette_list (palettes,num_palettes,WEED_PALETTE_RGB24)==WEED_PALETTE_RGB24) 
-	weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_RGB24);
-      else if (check_weed_palette_list (palettes,num_palettes,WEED_PALETTE_BGR24)==WEED_PALETTE_BGR24) 
-	weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_BGR24);
-      else if (check_weed_palette_list (palettes,num_palettes,WEED_PALETTE_RGBA32)==WEED_PALETTE_RGBA32) 
-	weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_RGBA32);
-      else if (check_weed_palette_list (palettes,num_palettes,WEED_PALETTE_BGRA32)==WEED_PALETTE_BGRA32) 
-	weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_BGRA32);
-      else if (check_weed_palette_list (palettes,num_palettes,WEED_PALETTE_ARGB32)==WEED_PALETTE_ARGB32) 
-	weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_ARGB32);
-      else if (check_weed_palette_list (palettes,num_palettes,WEED_PALETTE_YUV888)==WEED_PALETTE_YUV888) 
-	weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_YUV888);
-      else if (check_weed_palette_list (palettes,num_palettes,WEED_PALETTE_YUV444P)==WEED_PALETTE_YUV444P) 
-	weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_YUV444P);
-      else if (check_weed_palette_list (palettes,num_palettes,WEED_PALETTE_YUVA8888)==WEED_PALETTE_YUVA8888) 
-	weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_YUVA8888);
-      else if (check_weed_palette_list (palettes,num_palettes,WEED_PALETTE_YUVA4444P)==WEED_PALETTE_YUVA4444P) 
-	weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_YUVA4444P);
-      else if (check_weed_palette_list (palettes,num_palettes,WEED_PALETTE_UYVY8888)==WEED_PALETTE_UYVY8888) 
-	weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_UYVY8888);
-      else if (check_weed_palette_list (palettes,num_palettes,WEED_PALETTE_YUYV8888)==WEED_PALETTE_YUYV8888) 
-	weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_YUYV8888);
-      else if (check_weed_palette_list (palettes,num_palettes,WEED_PALETTE_YUV422P)==WEED_PALETTE_YUV422P) 
-	weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_YUV422P);
-      else if (check_weed_palette_list (palettes,num_palettes,WEED_PALETTE_YUV420P)==WEED_PALETTE_YUV420P) 
-	weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_YUV420P);
-      else if (check_weed_palette_list (palettes,num_palettes,WEED_PALETTE_YVU420P)==WEED_PALETTE_YVU420P) 
-	weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_YVU420P);
-      else if (check_weed_palette_list (palettes,num_palettes,WEED_PALETTE_YUV411)==WEED_PALETTE_YUV411) 
-	weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_YUV411);
-      else if (check_weed_palette_list (palettes,num_palettes,WEED_PALETTE_AFLOAT)==WEED_PALETTE_AFLOAT) 
-	weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_AFLOAT);
-      else if (check_weed_palette_list (palettes,num_palettes,WEED_PALETTE_A8)==WEED_PALETTE_A8) 
-	weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_A8);
-      else if (check_weed_palette_list (palettes,num_palettes,WEED_PALETTE_A1)==WEED_PALETTE_A1) 
-	weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_A1);
+      if (check_weed_palette_list(palettes,num_palettes,WEED_PALETTE_RGB24)==WEED_PALETTE_RGB24)
+        weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_RGB24);
+      else if (check_weed_palette_list(palettes,num_palettes,WEED_PALETTE_BGR24)==WEED_PALETTE_BGR24)
+        weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_BGR24);
+      else if (check_weed_palette_list(palettes,num_palettes,WEED_PALETTE_RGBA32)==WEED_PALETTE_RGBA32)
+        weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_RGBA32);
+      else if (check_weed_palette_list(palettes,num_palettes,WEED_PALETTE_BGRA32)==WEED_PALETTE_BGRA32)
+        weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_BGRA32);
+      else if (check_weed_palette_list(palettes,num_palettes,WEED_PALETTE_ARGB32)==WEED_PALETTE_ARGB32)
+        weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_ARGB32);
+      else if (check_weed_palette_list(palettes,num_palettes,WEED_PALETTE_YUV888)==WEED_PALETTE_YUV888)
+        weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_YUV888);
+      else if (check_weed_palette_list(palettes,num_palettes,WEED_PALETTE_YUV444P)==WEED_PALETTE_YUV444P)
+        weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_YUV444P);
+      else if (check_weed_palette_list(palettes,num_palettes,WEED_PALETTE_YUVA8888)==WEED_PALETTE_YUVA8888)
+        weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_YUVA8888);
+      else if (check_weed_palette_list(palettes,num_palettes,WEED_PALETTE_YUVA4444P)==WEED_PALETTE_YUVA4444P)
+        weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_YUVA4444P);
+      else if (check_weed_palette_list(palettes,num_palettes,WEED_PALETTE_UYVY8888)==WEED_PALETTE_UYVY8888)
+        weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_UYVY8888);
+      else if (check_weed_palette_list(palettes,num_palettes,WEED_PALETTE_YUYV8888)==WEED_PALETTE_YUYV8888)
+        weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_YUYV8888);
+      else if (check_weed_palette_list(palettes,num_palettes,WEED_PALETTE_YUV422P)==WEED_PALETTE_YUV422P)
+        weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_YUV422P);
+      else if (check_weed_palette_list(palettes,num_palettes,WEED_PALETTE_YUV420P)==WEED_PALETTE_YUV420P)
+        weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_YUV420P);
+      else if (check_weed_palette_list(palettes,num_palettes,WEED_PALETTE_YVU420P)==WEED_PALETTE_YVU420P)
+        weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_YVU420P);
+      else if (check_weed_palette_list(palettes,num_palettes,WEED_PALETTE_YUV411)==WEED_PALETTE_YUV411)
+        weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_YUV411);
+      else if (check_weed_palette_list(palettes,num_palettes,WEED_PALETTE_AFLOAT)==WEED_PALETTE_AFLOAT)
+        weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_AFLOAT);
+      else if (check_weed_palette_list(palettes,num_palettes,WEED_PALETTE_A8)==WEED_PALETTE_A8)
+        weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_A8);
+      else if (check_weed_palette_list(palettes,num_palettes,WEED_PALETTE_A1)==WEED_PALETTE_A1)
+        weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_A1);
       else if (!weed_plant_has_leaf(chantmpls[i],"optional")) {
-	if (chantmpls!=NULL) weed_free(chantmpls);
-	weed_free(palettes);
-	return FALSE; // mandatory channel; we don't yet handle rgb float
+        if (chantmpls!=NULL) lives_free(chantmpls);
+        lives_free(palettes);
+        return FALSE; // mandatory channel; we don't yet handle rgb float
       }
 
-      /*	else if (check_weed_palette_list (palettes,num_palettes,WEED_PALETTE_RGBFLOAT)==WEED_PALETTE_RGBFLOAT) 
-		weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_RGBFLOAT);
-		else if (check_weed_palette_list (palettes,num_palettes,WEED_PALETTE_ARGBFLOAT)==WEED_PALETTE_ARGBFLOAT) 
-		weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_ARGBFLOAT);
+      /*	else if (check_weed_palette_list (palettes,num_palettes,WEED_PALETTE_RGBFLOAT)==WEED_PALETTE_RGBFLOAT)
+      weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_RGBFLOAT);
+      else if (check_weed_palette_list (palettes,num_palettes,WEED_PALETTE_ARGBFLOAT)==WEED_PALETTE_ARGBFLOAT)
+      weed_set_int_value(chantmpls[i],"current_palette",WEED_PALETTE_ARGBFLOAT);
       */
-      weed_free(palettes);
+      lives_free(palettes);
     }
     if (!weed_plant_has_leaf(chantmpls[i],"optional")) num_channels--; // mandatory channel
   }
 
   if (num_channels>0) {
     // OK we need to use some optional channels
-    for (i=0;i<num_elements&&num_channels>0;i++) if (weed_plant_has_leaf(chantmpls[i],"optional")) {
-	weed_set_boolean_value(chantmpls[i],"host_disabled",WEED_FALSE);
-	num_channels--;
+    for (i=0; i<num_elements&&num_channels>0; i++) if (weed_plant_has_leaf(chantmpls[i],"optional")) {
+        weed_set_boolean_value(chantmpls[i],"host_disabled",WEED_FALSE);
+        num_channels--;
       }
   }
 
   if (num_channels>0) {
-    if (chantmpls!=NULL) weed_free(chantmpls);
+    if (chantmpls!=NULL) lives_free(chantmpls);
     return FALSE;
   }
 
@@ -4513,43 +4504,42 @@
   if (num_in_elements) {
     in_chantmpls=weed_get_plantptr_array(filter,"in_channel_templates",&error);
     if (!weed_plant_has_leaf(in_chantmpls[0],"is_audio")||
-	weed_get_boolean_value(in_chantmpls[0],"is_audio",&error)!=WEED_TRUE) {
+        weed_get_boolean_value(in_chantmpls[0],"is_audio",&error)!=WEED_TRUE) {
       def_palette=weed_get_int_value(in_chantmpls[0],"current_palette",&error);
     }
-    weed_free(in_chantmpls);
-  }
-  else if (!weed_plant_has_leaf(chantmpls[0],"is_audio")||
-	   weed_get_boolean_value(chantmpls[0],"is_audio",&error)!=WEED_TRUE) {
+    lives_free(in_chantmpls);
+  } else if (!weed_plant_has_leaf(chantmpls[0],"is_audio")||
+             weed_get_boolean_value(chantmpls[0],"is_audio",&error)!=WEED_TRUE) {
     def_palette=weed_get_int_value(chantmpls[0],"current_palette",&error);
   }
   if (def_palette!=WEED_PALETTE_END) {
-    for (i=0;i<num_elements;i++) {
+    for (i=0; i<num_elements; i++) {
       int channel_flags=weed_get_int_value(chantmpls[i],"flags",&error);
       if (!(channel_flags&WEED_CHANNEL_PALETTE_CAN_VARY)) {
-	int num_palettes=weed_leaf_num_elements(chantmpls[i],"palette_list");
-	int *palettes=weed_get_int_array(chantmpls[i],"palette_list",&error);
-	if (check_weed_palette_list(palettes,num_palettes,def_palette)==def_palette) 
-	  weed_set_int_value(chantmpls[i],"current_palette",def_palette);
-	else {
-	  if (chantmpls!=NULL) weed_free(chantmpls);
-	  weed_free(palettes);
-	  return FALSE;
-	}
-	weed_free(palettes);
+        int num_palettes=weed_leaf_num_elements(chantmpls[i],"palette_list");
+        int *palettes=weed_get_int_array(chantmpls[i],"palette_list",&error);
+        if (check_weed_palette_list(palettes,num_palettes,def_palette)==def_palette)
+          weed_set_int_value(chantmpls[i],"current_palette",def_palette);
+        else {
+          if (chantmpls!=NULL) lives_free(chantmpls);
+          lives_free(palettes);
+          return FALSE;
+        }
+        lives_free(palettes);
       }
     }
   }
-  if (chantmpls!=NULL) weed_free(chantmpls);
+  if (chantmpls!=NULL) lives_free(chantmpls);
   return TRUE;
 }
 
 
 
 
-static void load_weed_plugin (gchar *plugin_name, gchar *plugin_path, gchar *dir) {
+static void load_weed_plugin(char *plugin_name, char *plugin_path, char *dir) {
   weed_setup_f setup_fn;
   weed_bootstrap_f bootstrap=(weed_bootstrap_f)&weed_bootstrap_func;
-  
+
   weed_plant_t *plugin_info,**filters,*filter;
 
   void *handle;
@@ -4560,13 +4550,13 @@
   int mode=-1,kmode=0;
   int phashes;
 
-  gchar **phashnames;
+  char **phashnames;
 
   char cwd[PATH_MAX];
 
   char *pwd;
 
-  gchar *filter_name;
+  char *filter_name;
 
   register int i;
 
@@ -4579,39 +4569,38 @@
   mainw->chdir_failed=FALSE;
 
   // walk list and create fx structures
-  //#define DEBUG_WEED
+  //  #define DEBUG_WEED
 #ifdef DEBUG_WEED
-  g_printerr("Checking plugin %s\n",plugin_path);
+  lives_printerr("Checking plugin %s\n",plugin_path);
 #endif
 
   if ((handle=dlopen(plugin_path,RTLD_LAZY))) {
     dlerror(); // clear existing errors
 
     if ((setup_fn=(weed_setup_f)dlsym(handle,"weed_setup"))==NULL) {
-      g_printerr(_("Error: plugin %s has no weed_setup() function.\n"),plugin_path);
-    }
-    else {
+      lives_printerr(_("Error: plugin %s has no weed_setup() function.\n"),plugin_path);
+    } else {
 
       // here we call the plugin's setup_fn, passing in our bootstrap function
-      // the plugin will call our bootstrap function to get the correct versions of the core weed functions 
+      // the plugin will call our bootstrap function to get the correct versions of the core weed functions
       // and bootstrap itself
-      
+
       // if we use the plugin, we must not free the plugin_info, since the plugin has a reference to this
-      
+
       // chdir to plugin dir, in case it needs to load data
 
       lives_chdir(dir,TRUE);
       plugin_info=(*setup_fn)(bootstrap);
       if (plugin_info==NULL||(filters_in_plugin=check_weed_plugin_info(plugin_info))<1) {
-	gchar *msg=g_strdup_printf(_("No usable filters found in plugin %s\n"),plugin_path);
-	LIVES_INFO(msg);
-	g_free(msg);
-	if (plugin_info!=NULL) weed_plant_free(plugin_info);
-	dlclose (handle);
-	lives_chdir(pwd,FALSE);
-	return;
+        char *msg=lives_strdup_printf(_("No usable filters found in plugin %s\n"),plugin_path);
+        LIVES_INFO(msg);
+        lives_free(msg);
+        if (plugin_info!=NULL) weed_plant_free(plugin_info);
+        dlclose(handle);
+        lives_chdir(pwd,FALSE);
+        return;
       }
-    
+
       weed_set_voidptr_value(plugin_info,"handle",handle);
       weed_set_string_value(plugin_info,"name",plugin_name); // for hashname
       weed_set_string_value(plugin_info,"plugin_path",dir);
@@ -4624,119 +4613,119 @@
       phashes=0;
 
       while (mode<filters_in_plugin-1) {
-	mode++;
-	filter=filters[mode];
+        mode++;
+        filter=filters[mode];
+
+        filter_name=weed_get_string_value(filter,"name",&error);
+        if (!(reason=check_for_lives(filter,idx))) {
+          boolean dup=FALSE,pdup=FALSE;
+
+          num_weed_filters++;
+          weed_filters=(weed_plant_t **)lives_realloc(weed_filters,num_weed_filters*sizeof(weed_plant_t *));
+          weed_filters[idx]=filter;
+
+          hashnames=(char **)lives_realloc(hashnames,num_weed_filters*sizeof(char *));
+          hashnames[idx]=NULL;
+          hashnames[idx]=make_weed_hashname(idx,TRUE,FALSE);
+
+          phashes++;
+          phashnames=(char **)lives_realloc(phashnames,phashes*sizeof(char *));
+          phashnames[phashes-1]=make_weed_hashname(idx,FALSE,FALSE);
+
+          for (i=0; i<idx; i++) {
+            if (i>oidx) {
+              if (!lives_utf8_strcasecmp(phashnames[phashes-1],phashnames[i-oidx-1])) {
+                //g_print("partial dupe: %s and %s\n",phashnames[phashes-1],phashnames[i-oidx-1]);
+                // found a partial match: author and/or version differ
+                // if in the same plugin, we will use the highest version no., others become dupes
+                num_weed_dupes++;
+                dupe_weed_filters=(weed_plant_t **)lives_realloc(dupe_weed_filters,num_weed_dupes*sizeof(weed_plant_t *));
+                dupe_hashnames=(char **)lives_realloc(dupe_hashnames,num_weed_dupes*sizeof(char *));
+                if (weed_get_int_value(filter,"version",&error)<
+                    weed_get_int_value(weed_filters[i],"version",&error)) {
+                  // add idx to dupe list
+                  dupe_weed_filters[num_weed_dupes-1]=filter;
+                  dupe_hashnames[num_weed_dupes-1]=hashnames[idx];
+                } else {
+                  // add i to dupe list
+                  dupe_weed_filters[num_weed_dupes-1]=weed_filters[i];
+                  dupe_hashnames[num_weed_dupes-1]=hashnames[i];
+                  weed_filters[i]=filter;
+                  hashnames[i]=hashnames[idx];
+                }
+                phashes--;
+                lives_free(phashnames[phashes]);
+                num_weed_filters--;
+                weed_filters=(weed_plant_t **)lives_realloc(weed_filters,num_weed_filters*sizeof(weed_plant_t *));
+                hashnames=(char **)lives_realloc(hashnames,num_weed_filters*sizeof(char *));
+                phashnames=(char **)lives_realloc(phashnames,phashes*sizeof(char *));
+                pdup=TRUE;
+                break;
+              }
+            }
+            if (!lives_utf8_strcasecmp(hashnames[idx],hashnames[i])) {
+              // skip dups
+              char *msg=lives_strdup_printf(_("Found duplicate plugin %s"),hashnames[idx]);
+              LIVES_INFO(msg);
+              lives_free(msg);
+              lives_free(hashnames[idx]);
+              phashes--;
+              lives_free(phashnames[phashes]);
+              num_weed_filters--;
+              weed_filters=(weed_plant_t **)lives_realloc(weed_filters,num_weed_filters*sizeof(weed_plant_t *));
+              hashnames=(char **)lives_realloc(hashnames,num_weed_filters*sizeof(char *));
+              phashnames=(char **)lives_realloc(phashnames,phashes*sizeof(char *));
+              dup=TRUE;
+              break;
+            }
+          }
+          if (dup) {
+            lives_free(filter_name);
+            continue;
+          }
+
+          // we start with all optional channels disabled (unless forced to use them)
+          set_in_channel_palettes(filter,enabled_in_channels(filters[mode],FALSE));
+          set_out_channel_palettes(filter,1);
+
+          // skip hidden/duplicate filters
+          if (!pdup&&key<FX_KEYS_PHYSICAL&&kmode<prefs->max_modes_per_key&&
+              (!weed_plant_has_leaf(filter,"host_menu_hide")||
+               (weed_get_boolean_value(filter,"host_menu_hide",&error)==WEED_FALSE))) {
+            key_to_fx[key][kmode++]=idx;
 
-	filter_name=weed_get_string_value(filter,"name",&error);
-	if (!(reason=check_for_lives(filter,idx))) {
-	  boolean dup=FALSE,pdup=FALSE;
-
-	  num_weed_filters++;
-	  weed_filters=(weed_plant_t **)g_realloc(weed_filters,num_weed_filters*sizeof(weed_plant_t *));
-	  weed_filters[idx]=filter;
-
-	  hashnames=(gchar **)g_realloc(hashnames,num_weed_filters*sizeof(gchar *));
-	  hashnames[idx]=NULL;
-	  hashnames[idx]=make_weed_hashname(idx,TRUE,FALSE);
-
-	  phashes++;
-	  phashnames=(gchar **)g_realloc(phashnames,phashes*sizeof(gchar *));
-	  phashnames[phashes-1]=make_weed_hashname(idx,FALSE,FALSE);
-
-	  for (i=0;i<idx;i++) {
-	    if (i>oidx) {
-	      if (!strcmp(phashnames[phashes-1],phashnames[i-oidx-1])) {
-		//g_print("partial dupe: %s and %s\n",phashnames[phashes-1],phashnames[i-oidx-1]);
-		// found a partial match: author and/or version differ
-		// if in the same plugin, we will use the highest version no., others become dupes
-		num_weed_dupes++;
-		dupe_weed_filters=(weed_plant_t **)g_realloc(dupe_weed_filters,num_weed_dupes*sizeof(weed_plant_t *));
-		dupe_hashnames=(gchar **)g_realloc(dupe_hashnames,num_weed_dupes*sizeof(gchar *));
-		if (weed_get_int_value(filter,"version",&error)<
-		    weed_get_int_value(weed_filters[i],"version",&error)) {
-		  // add idx to dupe list
-		  dupe_weed_filters[num_weed_dupes-1]=filter;
-		  dupe_hashnames[num_weed_dupes-1]=hashnames[idx];
-		}
-		else {
-		  // add i to dupe list
-		  dupe_weed_filters[num_weed_dupes-1]=weed_filters[i];
-		  dupe_hashnames[num_weed_dupes-1]=hashnames[i];
-		  weed_filters[i]=filter;
-		  hashnames[i]=hashnames[idx];
-		}
-		phashes--;
-		g_free(phashnames[phashes]);
-		num_weed_filters--;
-		weed_filters=(weed_plant_t **)g_realloc(weed_filters,num_weed_filters*sizeof(weed_plant_t *));
-		hashnames=(gchar **)g_realloc(hashnames,num_weed_filters*sizeof(gchar *));
-		phashnames=(gchar **)g_realloc(phashnames,phashes*sizeof(gchar *));
-		pdup=TRUE;
-		break;
-	      }
-	    }
-	    if (!strcmp(hashnames[idx],hashnames[i])) {
-	      // skip dups
-	      char *msg=g_strdup_printf(_("Found duplicate plugin %s"),hashnames[idx]);
-	      LIVES_INFO(msg);
-	      g_free(msg);
-	      g_free(hashnames[idx]);
-	      phashes--;
-	      g_free(phashnames[phashes]);
-	      num_weed_filters--;
-	      weed_filters=(weed_plant_t **)g_realloc(weed_filters,num_weed_filters*sizeof(weed_plant_t *));
-	      hashnames=(gchar **)g_realloc(hashnames,num_weed_filters*sizeof(gchar *));
-	      phashnames=(gchar **)g_realloc(phashnames,phashes*sizeof(gchar *));
-	      dup=TRUE;
-	      break;
-	    }
-	  }
-	  if (dup) {
-	    weed_free(filter_name);
-	    continue;
-	  }
-
-	  // we start with all optional channels disabled (unless forced to use them)
-	  set_in_channel_palettes (filter,enabled_in_channels(filters[mode],FALSE));
-	  set_out_channel_palettes (filter,1);
-
-	  // skip hidden/duplicate filters
-	  if (!pdup&&key<FX_KEYS_PHYSICAL&&kmode<prefs->max_modes_per_key&&
-	      (!weed_plant_has_leaf(filter,"host_menu_hide")||
-	       (weed_get_boolean_value(filter,"host_menu_hide",&error)==WEED_FALSE))) {
-	    key_to_fx[key][kmode++]=idx;
 #ifdef DEBUG_WEED
-	    if (!pdup&&key<FX_KEYS_PHYSICAL&&kmode<prefs->max_modes_per_key) 
-	      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));
-
-	  }
-	  else {
-	    d_print(g_strdup_printf("Loaded filter \"%s\" in plugin \"%s\", no key assigned\n",filter_name,plugin_name));
+            if (!pdup&&key<FX_KEYS_PHYSICAL&&kmode<prefs->max_modes_per_key)
+              d_print("Loaded filter \"%s\" in plugin \"%s\"; assigned to key ctrl-%d, mode %d.\n",
+                      filter_name,plugin_name,key+1,kmode);
+
+          } else {
+            d_print("Loaded filter \"%s\" in plugin \"%s\", no key assigned\n",filter_name,plugin_name);
 #endif
-	  }
-	  if (!pdup) idx++;
+          }
+          if (!pdup) idx++;
+
 
-	}
+
+        }
 #ifdef DEBUG_WEED
-	else g_printerr(g_strdup_printf("Unsuitable filter \"%s\" in plugin \"%s\", reason code %d\n",filter_name,plugin_name,reason));
+        else lives_printerr("Unsuitable filter \"%s\" in plugin \"%s\", reason code %d\n",filter_name,plugin_name,reason);
 #endif
-	weed_free(filter_name);
+        lives_free(filter_name);
       }
-      for (i=0;i<phashes;i++) {
-	g_free(phashnames[i]);
+      for (i=0; i<phashes; i++) {
+        lives_free(phashnames[i]);
       }
-      g_free(phashnames);
-      weed_free(filters);
+      lives_free(phashnames);
+      lives_free(filters);
     }
 
-  }
-  else g_printerr(_("Info: Unable to load plugin %s\nError was: %s\n"),plugin_path,dlerror());
+  } else lives_printerr(_("Info: Unable to load plugin %s\nError was: %s\n"),plugin_path,dlerror());
 
   if (mainw->chdir_failed) {
-    gchar *dirs=g_strdup(_("Some plugin directories"));
+    char *dirs=lives_strdup(_("Some plugin directories"));
     do_chdir_failed_error(dirs);
-    g_free(dirs);
+    lives_free(dirs);
   }
 
   lives_chdir(pwd,FALSE);
@@ -4745,10 +4734,10 @@
 }
 
 
-
 void weed_memory_init(void) {
-  weed_init(110,(weed_malloc_f)lives_malloc,(weed_free_f)lives_free,(weed_memcpy_f)lives_memcpy,
-	    (weed_memset_f)lives_memset);
+#ifndef IS_LIBLIVES
+  weed_init(110,(weed_malloc_f)_lives_malloc,(weed_free_f)_lives_free_normal,(weed_memcpy_f)lives_memcpy,(weed_memset_f)lives_memset);
+#endif
 }
 
 
@@ -4756,16 +4745,16 @@
 static void merge_dupes(void) {
   register int i;
 
-  weed_filters=(weed_plant_t **)g_realloc(weed_filters,(num_weed_filters+num_weed_dupes)*sizeof(weed_plant_t *));
-  hashnames=(gchar **)g_realloc(hashnames,(num_weed_filters+num_weed_dupes)*sizeof(gchar *));
+  weed_filters=(weed_plant_t **)lives_realloc(weed_filters,(num_weed_filters+num_weed_dupes)*sizeof(weed_plant_t *));
+  hashnames=(char **)lives_realloc(hashnames,(num_weed_filters+num_weed_dupes)*sizeof(char *));
 
-  for (i=num_weed_filters;i<num_weed_filters+num_weed_dupes;i++) {
+  for (i=num_weed_filters; i<num_weed_filters+num_weed_dupes; i++) {
     weed_filters[i]=dupe_weed_filters[i-num_weed_filters];
     hashnames[i]=dupe_hashnames[i-num_weed_filters];
   }
 
-  if (dupe_weed_filters!=NULL) g_free(dupe_weed_filters);
-  if (dupe_hashnames!=NULL) g_free(dupe_hashnames);
+  if (dupe_weed_filters!=NULL) lives_free(dupe_weed_filters);
+  if (dupe_hashnames!=NULL) lives_free(dupe_hashnames);
 
   num_weed_filters+=num_weed_dupes;
 }
@@ -4778,8 +4767,8 @@
   LiVESWidget *pkg_menu;
   LiVESWidget *pkg_submenu=NULL;
 
-  gchar *string,*filter_type,*filter_name;
-  gchar *pkg=NULL,*pkgstring;
+  char *string,*filter_type,*filter_name;
+  char *pkg=NULL,*pkgstring;
 
   int pkg_posn=0,error;
 
@@ -4787,71 +4776,70 @@
 
 
   // menu entries for vj/set defs
-  for (i=0;i<num_weed_filters-num_weed_dupes;i++) {
+  for (i=0; i<num_weed_filters-num_weed_dupes; i++) {
     filter=weed_filters[i];
-	    
+
     // skip hidden filters
     if (!weed_plant_has_leaf(filter,"host_menu_hide")||
-	(weed_get_boolean_value(filter,"host_menu_hide",&error)==WEED_FALSE)) {
+        (weed_get_boolean_value(filter,"host_menu_hide",&error)==WEED_FALSE)) {
 
       if ((!has_video_chans_in(filter,FALSE)&&has_video_chans_out(filter,FALSE))||
-	  num_in_params(filter,TRUE,TRUE)>0) {
-	filter_name=weed_get_string_value(filter,"name",&error);
-	if ((pkgstring=strstr(filter_name,": "))!=NULL) {
-	  // package effect
-	  if (pkg!=NULL&&strncmp(pkg,filter_name,strlen(pkg))) {
-	    g_free(pkg);
-	    pkg=NULL;
-	    menu=mainw->rte_defs;
-	  }
-	  if (pkg==NULL) {
-	    pkg=filter_name;
-	    filter_name=g_strdup(pkg);
-	    memset(pkgstring,0,1);
-	    /* TRANSLATORS: example " - LADSPA plugins -" */
-	    pkgstring=g_strdup_printf(_(" - %s plugins -"),pkg);
-	    // create new submenu
-	      
-	    pkg_menu=lives_menu_item_new_with_label (pkgstring);
-	    lives_container_add (LIVES_CONTAINER (mainw->rte_defs), pkg_menu);
-	    lives_menu_reorder_child(LIVES_MENU(mainw->rte_defs),pkg_menu,pkg_posn++);
-	      
-	    pkg_submenu=lives_menu_new();
-	    lives_menu_item_set_submenu (LIVES_MENU_ITEM (pkg_menu), pkg_submenu);
-	      
-	    if (palette->style&STYLE_1) {
-	      lives_widget_set_bg_color(pkg_submenu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
-	      lives_widget_set_fg_color(pkg_submenu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars_fore);
-	    }
-	      
-	    lives_widget_show (pkg_menu);
-	    lives_widget_show (pkg_submenu);
-	    g_free(pkgstring);
-	  }
-	  // add to submenu
-	  menu=pkg_submenu;
-	}
-	else {
-	  if (pkg!=NULL) g_free(pkg);
-	  pkg=NULL;
-	  menu=mainw->rte_defs;
-	}
-	  
-	filter_type=weed_filter_get_type(filter,TRUE,FALSE);
-	string=g_strdup_printf("%s (%s)",filter_name,filter_type);
-	  
-	menuitem=lives_menu_item_new_with_label (string);
-	lives_widget_show(menuitem);
-	g_free(string);
-	g_free(filter_type);
-	  
-	lives_container_add (LIVES_CONTAINER (menu), menuitem);
-	  
-	lives_signal_connect (LIVES_GUI_OBJECT (menuitem), LIVES_WIDGET_ACTIVATE_EVENT,
-			  LIVES_GUI_CALLBACK (rte_set_defs_activate),
-			  GINT_TO_POINTER(i));
-
-	weed_free(filter_name);
+          num_in_params(filter,TRUE,TRUE)>0) {
+        filter_name=weed_get_string_value(filter,"name",&error);
+        if ((pkgstring=strstr(filter_name,": "))!=NULL) {
+          // package effect
+          if (pkg!=NULL&&strncmp(pkg,filter_name,strlen(pkg))) {
+            lives_free(pkg);
+            pkg=NULL;
+            menu=mainw->rte_defs;
+          }
+          if (pkg==NULL) {
+            pkg=filter_name;
+            filter_name=lives_strdup(pkg);
+            memset(pkgstring,0,1);
+            /* TRANSLATORS: example " - LADSPA plugins -" */
+            pkgstring=lives_strdup_printf(_(" - %s plugins -"),pkg);
+            // create new submenu
+
+            pkg_menu=lives_menu_item_new_with_label(pkgstring);
+            lives_container_add(LIVES_CONTAINER(mainw->rte_defs), pkg_menu);
+            lives_menu_reorder_child(LIVES_MENU(mainw->rte_defs),pkg_menu,pkg_posn++);
+
+            pkg_submenu=lives_menu_new();
+            lives_menu_item_set_submenu(LIVES_MENU_ITEM(pkg_menu), pkg_submenu);
+
+            if (palette->style&STYLE_1) {
+              lives_widget_set_bg_color(pkg_submenu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
+              lives_widget_set_fg_color(pkg_submenu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars_fore);
+            }
+
+            lives_widget_show(pkg_menu);
+            lives_widget_show(pkg_submenu);
+            lives_free(pkgstring);
+          }
+          // add to submenu
+          menu=pkg_submenu;
+        } else {
+          if (pkg!=NULL) lives_free(pkg);
+          pkg=NULL;
+          menu=mainw->rte_defs;
+        }
+
+        filter_type=weed_filter_get_type(filter,TRUE,FALSE);
+        string=lives_strdup_printf("%s (%s)",filter_name,filter_type);
+
+        menuitem=lives_menu_item_new_with_label(string);
+        lives_widget_show(menuitem);
+        lives_free(string);
+        lives_free(filter_type);
+
+        lives_container_add(LIVES_CONTAINER(menu), menuitem);
+
+        lives_signal_connect(LIVES_GUI_OBJECT(menuitem), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                             LIVES_GUI_CALLBACK(rte_set_defs_activate),
+                             LIVES_INT_TO_POINTER(i));
+
+        lives_free(filter_name);
       }
     }
   }
@@ -4860,17 +4848,16 @@
 
 
 
-void weed_load_all (void) {
+void weed_load_all(void) {
   // get list of plugins from directory and create our fx
   int i,j,plugin_idx,subdir_idx;
 
-  GList *weed_plugin_list,*weed_plugin_sublist;
+  LiVESList *weed_plugin_list,*weed_plugin_sublist;
 
-  gchar *lives_weed_plugin_path,*weed_plugin_path,*weed_p_path;
-  gchar *subdir_path,*subdir_name,*plugin_path,*plugin_name;
+  char *lives_weed_plugin_path,*weed_plugin_path,*weed_p_path;
+  char *subdir_path,*subdir_name,*plugin_path,*plugin_name;
   int numdirs;
-  gchar **dirs;
-  gchar *msg;
+  char **dirs;
 
   int listlen;
 
@@ -4881,41 +4868,40 @@
   hashnames=dupe_hashnames=NULL;
 
   threaded_dialog_spin();
-  lives_weed_plugin_path=g_build_filename(prefs->lib_dir,PLUGIN_EXEC_DIR,PLUGIN_WEED_FX_BUILTIN,NULL);
+  lives_weed_plugin_path=lives_build_filename(prefs->lib_dir,PLUGIN_EXEC_DIR,PLUGIN_WEED_FX_BUILTIN,NULL);
 
 #ifdef DEBUG_WEED
-  g_printerr("In weed init\n");
+  lives_printerr("In weed init\n");
 #endif
 
   fg_gen_to_start=fg_generator_key=fg_generator_clip=fg_generator_mode=-1;
   bg_gen_to_start=bg_generator_key=bg_generator_mode=-1;
 
-  for (i=0;i<FX_KEYS_MAX;i++) {
-    if (i<FX_KEYS_MAX_VIRTUAL) key_to_instance[i]=(weed_plant_t **) 
-				 g_malloc(prefs->max_modes_per_key*sizeof(weed_plant_t *));
-    else key_to_instance[i]=(weed_plant_t **)g_malloc(sizeof(weed_plant_t *));
+  for (i=0; i<FX_KEYS_MAX; i++) {
+    if (i<FX_KEYS_MAX_VIRTUAL) key_to_instance[i]=(weed_plant_t **)
+          lives_malloc(prefs->max_modes_per_key*sizeof(weed_plant_t *));
+    else key_to_instance[i]=(weed_plant_t **)lives_malloc(sizeof(weed_plant_t *));
 
-    key_to_instance_copy[i]=(weed_plant_t **)g_malloc(sizeof(weed_plant_t *));
+    key_to_instance_copy[i]=(weed_plant_t **)lives_malloc(sizeof(weed_plant_t *));
 
-    if (i<FX_KEYS_MAX_VIRTUAL) key_to_fx[i]=(int *)g_malloc(prefs->max_modes_per_key*sizint);
-    else key_to_fx[i]=(int *)g_malloc(sizint);
+    if (i<FX_KEYS_MAX_VIRTUAL) key_to_fx[i]=(int *)lives_malloc(prefs->max_modes_per_key*sizint);
+    else key_to_fx[i]=(int *)lives_malloc(sizint);
 
-    if (i<FX_KEYS_MAX_VIRTUAL) 
-      key_defaults[i]=(weed_plant_t ***)g_malloc(prefs->max_modes_per_key*sizeof(weed_plant_t **));
+    if (i<FX_KEYS_MAX_VIRTUAL)
+      key_defaults[i]=(weed_plant_t ** *)lives_malloc(prefs->max_modes_per_key*sizeof(weed_plant_t **));
 
     key_modes[i]=0;  // current active mode of each key
     filter_map[i]=NULL; // maps effects in order of application for multitrack rendering
-    for (j=0;j<prefs->max_modes_per_key;j++) {
+    for (j=0; j<prefs->max_modes_per_key; j++) {
       if (i<FX_KEYS_MAX_VIRTUAL||j==0) {
-	if (i<FX_KEYS_MAX_VIRTUAL) key_defaults[i][j]=NULL;
-	key_to_instance[i][j]=NULL;
-	key_to_fx[i][j]=-1;
-      }
-      else break;
+        if (i<FX_KEYS_MAX_VIRTUAL) key_defaults[i][j]=NULL;
+        key_to_instance[i][j]=NULL;
+        key_to_fx[i][j]=-1;
+      } else break;
     }
   }
   filter_map[FX_KEYS_MAX+1]=NULL;
-  for (i=0;i<FX_KEYS_MAX_VIRTUAL;i++) {
+  for (i=0; i<FX_KEYS_MAX_VIRTUAL; i++) {
     init_events[i]=NULL;
   }
 
@@ -4924,94 +4910,93 @@
 
   threaded_dialog_spin();
   weed_p_path=getenv("WEED_PLUGIN_PATH");
-  if (weed_p_path==NULL) weed_plugin_path=g_strdup("");
-  else weed_plugin_path=g_strdup(weed_p_path);
+  if (weed_p_path==NULL) weed_plugin_path=lives_strdup("");
+  else weed_plugin_path=lives_strdup(weed_p_path);
 
   if (strstr(weed_plugin_path,lives_weed_plugin_path)==NULL) {
-    gchar *tmp=g_strconcat(strcmp(weed_plugin_path,"")?":":"",lives_weed_plugin_path,NULL);
-    g_free(weed_plugin_path);
+    char *tmp=lives_strconcat(strcmp(weed_plugin_path,"")?":":"",lives_weed_plugin_path,NULL);
+    lives_free(weed_plugin_path);
     weed_plugin_path=tmp;
     lives_setenv("WEED_PLUGIN_PATH",weed_plugin_path);
   }
-  g_free(lives_weed_plugin_path);
+  lives_free(lives_weed_plugin_path);
 
   // first we parse the weed_plugin_path
 #ifndef IS_MINGW
   numdirs=get_token_count(weed_plugin_path,':');
-  dirs=g_strsplit(weed_plugin_path,":",-1);
+  dirs=lives_strsplit(weed_plugin_path,":",-1);
 #else
   numdirs=get_token_count(weed_plugin_path,';');
-  dirs=g_strsplit(weed_plugin_path,";",-1);
+  dirs=lives_strsplit(weed_plugin_path,";",-1);
 #endif
   threaded_dialog_spin();
 
-  for (i=0;i<numdirs;i++) {
+  for (i=0; i<numdirs; i++) {
     // get list of all files
     weed_plugin_list=get_plugin_list(PLUGIN_EFFECTS_WEED,TRUE,dirs[i],NULL);
-    listlen=g_list_length(weed_plugin_list);
+    listlen=lives_list_length(weed_plugin_list);
 
     // parse twice, first we get the plugins, then 1 level of subdirs
-    for (plugin_idx=0;plugin_idx<listlen;plugin_idx++) {
+    for (plugin_idx=0; plugin_idx<listlen; plugin_idx++) {
       threaded_dialog_spin();
-      plugin_name=(gchar *)g_list_nth_data(weed_plugin_list,plugin_idx);
+      plugin_name=(char *)lives_list_nth_data(weed_plugin_list,plugin_idx);
 #ifndef IS_MINGW
       if (!strncmp(plugin_name+strlen(plugin_name)-3,".so",3))
 #else
-	if (!strncmp(plugin_name+strlen(plugin_name)-4,".dll",4))
+      if (!strncmp(plugin_name+strlen(plugin_name)-4,".dll",4))
 #endif
-	  {
-	    plugin_path=g_build_filename(dirs[i],plugin_name,NULL);
-	    load_weed_plugin(plugin_name,plugin_path,dirs[i]);
-	    g_free(plugin_name);
-	    g_free(plugin_path);
-	    weed_plugin_list=g_list_delete_link(weed_plugin_list,g_list_nth(weed_plugin_list,plugin_idx));
-	    plugin_idx--;
-	    listlen--;
-	  }
+      {
+        plugin_path=lives_build_filename(dirs[i],plugin_name,NULL);
+        load_weed_plugin(plugin_name,plugin_path,dirs[i]);
+        lives_free(plugin_name);
+        lives_free(plugin_path);
+        weed_plugin_list=lives_list_delete_link(weed_plugin_list,lives_list_nth(weed_plugin_list,plugin_idx));
+        plugin_idx--;
+        listlen--;
+      }
       threaded_dialog_spin();
 
     }
 
     // get 1 level of subdirs
-    for (subdir_idx=0;subdir_idx<listlen;subdir_idx++) {
+    for (subdir_idx=0; subdir_idx<listlen; subdir_idx++) {
       threaded_dialog_spin();
-      subdir_name=(gchar *)g_list_nth_data(weed_plugin_list,subdir_idx);
-      subdir_path=g_build_filename(dirs[i],subdir_name,NULL);
-      if (!g_file_test(subdir_path, G_FILE_TEST_IS_DIR)||!strcmp(subdir_name,"icons")||!strcmp(subdir_name,"data")) {
-	g_free(subdir_path);
-	continue;
+      subdir_name=(char *)lives_list_nth_data(weed_plugin_list,subdir_idx);
+      subdir_path=lives_build_filename(dirs[i],subdir_name,NULL);
+      if (!lives_file_test(subdir_path, LIVES_FILE_TEST_IS_DIR)||!strcmp(subdir_name,"icons")||!strcmp(subdir_name,"data")) {
+        lives_free(subdir_path);
+        continue;
       }
 #ifndef IS_MINGW
       weed_plugin_sublist=get_plugin_list(PLUGIN_EFFECTS_WEED,TRUE,subdir_path,"so");
 #else
       weed_plugin_sublist=get_plugin_list(PLUGIN_EFFECTS_WEED,TRUE,subdir_path,"dll");
-#endif      
+#endif
 
-      for (plugin_idx=0;plugin_idx<g_list_length(weed_plugin_sublist);plugin_idx++) {
-	plugin_name=(gchar *)g_list_nth_data(weed_plugin_sublist,plugin_idx);
-	plugin_path=g_build_filename(subdir_path,plugin_name,NULL);
-	load_weed_plugin(plugin_name,plugin_path,subdir_path);
-	g_free(plugin_path);
+      for (plugin_idx=0; plugin_idx<lives_list_length(weed_plugin_sublist); plugin_idx++) {
+        plugin_name=(char *)lives_list_nth_data(weed_plugin_sublist,plugin_idx);
+        plugin_path=lives_build_filename(subdir_path,plugin_name,NULL);
+        load_weed_plugin(plugin_name,plugin_path,subdir_path);
+        lives_free(plugin_path);
       }
       if (weed_plugin_sublist!=NULL) {
-	g_list_free_strings(weed_plugin_sublist);
-	g_list_free(weed_plugin_sublist);
+        lives_list_free_strings(weed_plugin_sublist);
+        lives_list_free(weed_plugin_sublist);
       }
-      g_free(subdir_path);
+      lives_free(subdir_path);
       threaded_dialog_spin();
     }
     if (weed_plugin_list!=NULL) {
-      g_list_free_strings(weed_plugin_list);
-      g_list_free(weed_plugin_list);
+      lives_list_free_strings(weed_plugin_list);
+      lives_list_free(weed_plugin_list);
     }
   }
 
-  g_strfreev(dirs);
-  g_free(weed_plugin_path);
+  lives_strfreev(dirs);
+  lives_free(weed_plugin_path);
+
+  d_print(_("Successfully loaded %d Weed filters\n"),num_weed_filters);
 
-  msg=g_strdup_printf(_ ("Successfully loaded %d Weed filters\n"),num_weed_filters);
-  d_print(msg);
-  g_free(msg);
   threaded_dialog_spin();
   load_compound_fx();
   threaded_dialog_spin();
@@ -5022,31 +5007,31 @@
 }
 
 
-static void weed_free_if_not_in_list(void *ptr, GList **freed_ptrs) {
+static void lives_free_if_not_in_list(void *ptr, LiVESList **freed_ptrs) {
   /// avoid duplicate frees when unloading fx plugins
-  GList *list=*freed_ptrs;
+  LiVESList *list=*freed_ptrs;
   while (list!=NULL) {
     if (ptr==(void *)list->data) return;
     list=list->next;
   }
-  if (freed_ptrs!=NULL) *freed_ptrs=g_list_append(*freed_ptrs,(gpointer)ptr);
-  weed_free(ptr);
+  if (freed_ptrs!=NULL) *freed_ptrs=lives_list_append(*freed_ptrs,(livespointer)ptr);
+  lives_free(ptr);
 }
 
 
-static void weed_plant_free_if_not_in_list(weed_plant_t *plant, GList **freed_ptrs) {
+static void weed_plant_free_if_not_in_list(weed_plant_t *plant, LiVESList **freed_ptrs) {
   /// avoid duplicate frees when unloading fx plugins
-  GList *list=*freed_ptrs;
+  LiVESList *list=*freed_ptrs;
   while (list!=NULL) {
     if (plant==(weed_plant_t *)list->data) return;
     list=list->next;
   }
-  if (freed_ptrs!=NULL) *freed_ptrs=g_list_append(*freed_ptrs,(gpointer)plant);
+  if (freed_ptrs!=NULL) *freed_ptrs=lives_list_append(*freed_ptrs,(livespointer)plant);
   weed_plant_free(plant);
 }
 
 
-static void weed_filter_free(weed_plant_t *filter, GList **freed_ptrs) {
+static void weed_filter_free(weed_plant_t *filter, LiVESList **freed_ptrs) {
   int nitems,error,i;
   weed_plant_t **plants,*gui;
   void *func;
@@ -5059,22 +5044,22 @@
     nitems=weed_leaf_num_elements(filter,"in_parameter_templates");
     if (nitems>0) {
       plants=weed_get_plantptr_array(filter,"in_parameter_templates",&error);
-      for (i=0;i<nitems;i++) {
-	if (weed_plant_has_leaf(plants[i],"gui")) {
-	  gui=(weed_get_plantptr_value(plants[i],"gui",&error));
-	  if (weed_plant_has_leaf(gui,"display_func")) {
-	    func=weed_get_voidptr_value(gui,"display_func",&error);
-	    if (func!=NULL) weed_free_if_not_in_list(func,freed_ptrs);
-	  }
-	  weed_plant_free_if_not_in_list(gui,freed_ptrs);
-	}
-	if (weed_plant_has_leaf(filter,"interpolate_func")) {
-	  func=weed_get_voidptr_value(filter,"interpolate_func",&error);
-	  if (func!=NULL) weed_free_if_not_in_list(func,freed_ptrs);
-	}
-	weed_plant_free_if_not_in_list(plants[i],freed_ptrs);
+      for (i=0; i<nitems; i++) {
+        if (weed_plant_has_leaf(plants[i],"gui")) {
+          gui=(weed_get_plantptr_value(plants[i],"gui",&error));
+          if (weed_plant_has_leaf(gui,"display_func")) {
+            func=weed_get_voidptr_value(gui,"display_func",&error);
+            if (func!=NULL) lives_free_if_not_in_list(func,freed_ptrs);
+          }
+          weed_plant_free_if_not_in_list(gui,freed_ptrs);
+        }
+        if (weed_plant_has_leaf(filter,"interpolate_func")) {
+          func=weed_get_voidptr_value(filter,"interpolate_func",&error);
+          if (func!=NULL) lives_free_if_not_in_list(func,freed_ptrs);
+        }
+        weed_plant_free_if_not_in_list(plants[i],freed_ptrs);
       }
-      weed_free(plants);
+      lives_free(plants);
     }
   }
 
@@ -5085,17 +5070,17 @@
 
   if (weed_plant_has_leaf(filter,"init_func")) {
     func=weed_get_voidptr_value(filter,"init_func",&error);
-    if (func!=NULL) weed_free_if_not_in_list(func,freed_ptrs);
+    if (func!=NULL) lives_free_if_not_in_list(func,freed_ptrs);
   }
-  
+
   if (weed_plant_has_leaf(filter,"deinit_func")) {
     func=weed_get_voidptr_value(filter,"deinit_func",&error);
-    if (func!=NULL) weed_free_if_not_in_list(func,freed_ptrs);
+    if (func!=NULL) lives_free_if_not_in_list(func,freed_ptrs);
   }
 
   if (weed_plant_has_leaf(filter,"process_func")) {
     func=weed_get_voidptr_value(filter,"process_func",&error);
-    if (func!=NULL) weed_free_if_not_in_list(func,freed_ptrs);
+    if (func!=NULL) lives_free_if_not_in_list(func,freed_ptrs);
   }
 
 
@@ -5104,8 +5089,8 @@
     nitems=weed_leaf_num_elements(filter,"in_channel_templates");
     if (nitems>0) {
       plants=weed_get_plantptr_array(filter,"in_channel_templates",&error);
-      for (i=0;i<nitems;i++) weed_plant_free_if_not_in_list(plants[i],freed_ptrs);
-      weed_free(plants);
+      for (i=0; i<nitems; i++) weed_plant_free_if_not_in_list(plants[i],freed_ptrs);
+      lives_free(plants);
     }
   }
 
@@ -5115,8 +5100,8 @@
     nitems=weed_leaf_num_elements(filter,"out_channel_templates");
     if (nitems>0) {
       plants=weed_get_plantptr_array(filter,"out_channel_templates",&error);
-      for (i=0;i<nitems;i++) weed_plant_free_if_not_in_list(plants[i],freed_ptrs);
-      weed_free(plants);
+      for (i=0; i<nitems; i++) weed_plant_free_if_not_in_list(plants[i],freed_ptrs);
+      lives_free(plants);
     }
   }
 
@@ -5126,11 +5111,11 @@
     if (nitems>0) {
       plants=weed_get_plantptr_array(filter,"out_parameter_templates",&error);
       threaded_dialog_spin();
-      for (i=0;i<nitems;i++) {
-	if (weed_plant_has_leaf(plants[i],"gui")) weed_plant_free(weed_get_plantptr_value(plants[i],"gui",&error));
-	weed_plant_free_if_not_in_list(plants[i],freed_ptrs);
+      for (i=0; i<nitems; i++) {
+        if (weed_plant_has_leaf(plants[i],"gui")) weed_plant_free(weed_get_plantptr_value(plants[i],"gui",&error));
+        weed_plant_free_if_not_in_list(plants[i],freed_ptrs);
       }
-      weed_free(plants);
+      lives_free(plants);
     }
   }
 
@@ -5145,13 +5130,13 @@
 
 
 
-static weed_plant_t *create_compound_filter(gchar *plugin_name, int nfilts, int *filts) {
+static weed_plant_t *create_compound_filter(char *plugin_name, int nfilts, int *filts) {
   weed_plant_t *filter=weed_plant_new(WEED_PLANT_FILTER_CLASS),*xfilter,*gui;
 
   weed_plant_t **in_params=NULL,**out_params=NULL,**params;
   weed_plant_t **in_chans,**out_chans;
 
-  gchar *tmp;
+  char *tmp;
 
   double tgfps=-1.,tfps;
 
@@ -5167,17 +5152,17 @@
   // create parameter templates - concatenate all sub filters
   count=xcount=0;
 
-  for (i=0;i<nfilts;i++) {
+  for (i=0; i<nfilts; i++) {
     xfilter=weed_filters[filts[i]];
 
     if (weed_plant_has_leaf(xfilter,"target_fps")) {
       tfps=weed_get_double_value(xfilter,"target_fps",&error);
       if (tgfps==-1.) tgfps=tfps;
       else if (tgfps!=tfps) {
-	d_print((tmp=g_strdup_printf(_("Invalid compound effect %s - has conflicting target_fps\n"),plugin_name)));
-	LIVES_ERROR(tmp);
-	g_free(tmp);
-	return NULL;
+        d_print((tmp=lives_strdup_printf(_("Invalid compound effect %s - has conflicting target_fps\n"),plugin_name)));
+        LIVES_ERROR(tmp);
+        lives_free(tmp);
+        return NULL;
       }
     }
 
@@ -5193,13 +5178,13 @@
       // TODO *** - ignore transtion params if they are connected to themselves
 
       if (tparam!=-1) {
-	if (txparam!=-1) {
-	  d_print((tmp=g_strdup_printf(_("Invalid compound effect %s - has multiple transition parameters\n"),plugin_name)));
-	  LIVES_ERROR(tmp);
-	  g_free(tmp);
-	  return NULL;
-	}
-	txparam=tparam;
+        if (txparam!=-1) {
+          d_print((tmp=lives_strdup_printf(_("Invalid compound effect %s - has multiple transition parameters\n"),plugin_name)));
+          LIVES_ERROR(tmp);
+          lives_free(tmp);
+          return NULL;
+        }
+        txparam=tparam;
       }
 
       tvolm=get_master_vol_param(xfilter,FALSE);
@@ -5207,41 +5192,39 @@
       // TODO *** - ignore master vol params if they are connected to themselves
 
       if (tvolm!=-1) {
-	if (txvolm!=-1) {
-	  d_print((tmp=g_strdup_printf(_("Invalid compound effect %s - has multiple master volume parameters\n"),plugin_name)));
-	  LIVES_ERROR(tmp);
-	  g_free(tmp);
-	  return NULL;
-	}
-	txvolm=tvolm;
+        if (txvolm!=-1) {
+          d_print((tmp=lives_strdup_printf(_("Invalid compound effect %s - has multiple master volume parameters\n"),plugin_name)));
+          LIVES_ERROR(tmp);
+          lives_free(tmp);
+          return NULL;
+        }
+        txvolm=tvolm;
       }
 
       count+=weed_leaf_num_elements(xfilter,"in_parameter_templates");
       params=weed_get_plantptr_array(xfilter,"in_parameter_templates",&error);
 
-      in_params=(weed_plant_t **)g_realloc(in_params,count*sizeof(weed_plant_t *));
+      in_params=(weed_plant_t **)lives_realloc(in_params,count*sizeof(weed_plant_t *));
       x=0;
 
-      for (j=xcount;j<count;j++) {
-	in_params[j]=weed_plant_copy(params[x]);
-	if (weed_plant_has_leaf(params[x],"gui")) {
-	  gui=weed_get_plantptr_value(params[x],"gui",&error);
-	  weed_set_plantptr_value(in_params[j],"gui",weed_plant_copy(gui));
-	}
-
-	if (x==tparam) {
-	  weed_set_boolean_value(in_params[j],"transition",WEED_TRUE);
-	}
-	else if (weed_plant_has_leaf(in_params[j],"transition")) weed_leaf_delete(in_params[j],"transition");
-
-	if (x==tvolm) {
-	  weed_set_boolean_value(in_params[j],"is_volume_master",WEED_TRUE);
-	}
-	else if (weed_plant_has_leaf(in_params[j],"is_volume_master")) weed_leaf_delete(in_params[j],"is_volume_master");
+      for (j=xcount; j<count; j++) {
+        in_params[j]=weed_plant_copy(params[x]);
+        if (weed_plant_has_leaf(params[x],"gui")) {
+          gui=weed_get_plantptr_value(params[x],"gui",&error);
+          weed_set_plantptr_value(in_params[j],"gui",weed_plant_copy(gui));
+        }
+
+        if (x==tparam) {
+          weed_set_boolean_value(in_params[j],"transition",WEED_TRUE);
+        } else if (weed_plant_has_leaf(in_params[j],"transition")) weed_leaf_delete(in_params[j],"transition");
 
-	x++;
+        if (x==tvolm) {
+          weed_set_boolean_value(in_params[j],"is_volume_master",WEED_TRUE);
+        } else if (weed_plant_has_leaf(in_params[j],"is_volume_master")) weed_leaf_delete(in_params[j],"is_volume_master");
+
+        x++;
       }
-      weed_free(params);
+      lives_free(params);
       xcount=count;
     }
   }
@@ -5250,31 +5233,31 @@
 
   if (count>0) {
     weed_set_plantptr_array(filter,"in_parameter_templates",count,in_params);
-    g_free(in_params);
+    lives_free(in_params);
   }
 
   count=xcount=0;
 
-  for (i=0;i<nfilts;i++) {
+  for (i=0; i<nfilts; i++) {
     xfilter=weed_filters[filts[i]];
     if (weed_plant_has_leaf(xfilter,"out_parameter_templates")) {
       count+=weed_leaf_num_elements(xfilter,"out_parameter_templates");
       params=weed_get_plantptr_array(xfilter,"out_parameter_templates",&error);
 
-      out_params=(weed_plant_t **)g_realloc(out_params,count*sizeof(weed_plant_t *));
+      out_params=(weed_plant_t **)lives_realloc(out_params,count*sizeof(weed_plant_t *));
       x=0;
 
-      for (j=xcount;j<count;j++) {
-	out_params[j]=params[x++];
+      for (j=xcount; j<count; j++) {
+        out_params[j]=params[x++];
       }
-      if (params!=NULL) weed_free(params);
+      if (params!=NULL) lives_free(params);
       xcount=count;
     }
   }
 
   if (count>0) {
     weed_set_plantptr_array(filter,"out_parameter_templates",count,out_params);
-    weed_free(out_params);
+    lives_free(out_params);
   }
 
   // use in channels from first filter
@@ -5284,7 +5267,7 @@
     count=weed_leaf_num_elements(xfilter,"in_channel_templates");
     in_chans=weed_get_plantptr_array(xfilter,"in_channel_templates",&error);
     weed_set_plantptr_array(filter,"in_channel_templates",count,in_chans);
-    weed_free(in_chans);
+    lives_free(in_chans);
   }
 
   // use out channels from last filter
@@ -5294,7 +5277,7 @@
     count=weed_leaf_num_elements(xfilter,"out_channel_templates");
     out_chans=weed_get_plantptr_array(xfilter,"out_channel_templates",&error);
     weed_set_plantptr_array(filter,"out_channel_templates",count,out_chans);
-    weed_free(out_chans);
+    lives_free(out_chans);
   }
 
   return filter;
@@ -5305,16 +5288,16 @@
 
 
 
-static void load_compound_plugin(gchar *plugin_name, gchar *plugin_path) {
+static void load_compound_plugin(char *plugin_name, char *plugin_path) {
   FILE *cpdfile;
 
   weed_plant_t *filter=NULL,*ptmpl,*iptmpl,*xfilter;
 
-  gchar buff[16384];
+  char buff[16384];
 
-  gchar **array,**svals;
+  char **array,**svals;
 
-  gchar *author=NULL,*tmp,*key;
+  char *author=NULL,*tmp,*key;
 
   int *filters=NULL,*ivals;
 
@@ -5335,348 +5318,356 @@
 
   register int i;
 
-  if ((cpdfile=fopen (plugin_path,"r"))) {
+  if ((cpdfile=fopen(plugin_path,"r"))) {
     while (fgets(buff,16384,cpdfile)) {
       line++;
-      g_strchomp(buff);
+      lives_strstrip(buff);
       if (!strlen(buff)) {
-	if (++stage==5) break;
-	if (stage==2) {
-	  if (nfilts<2) {
-	    d_print((tmp=g_strdup_printf(_("Invalid compound effect %s - must have >1 sub filters\n"),plugin_name)));
-	    LIVES_ERROR(tmp);
-	    g_free(tmp);
-	    ok=FALSE;
-	    break;
-	  }
-	  filter=create_compound_filter(plugin_name,nfilts,filters);
-	  if (filter==NULL) break;
-	}
-	continue;
+        if (++stage==5) break;
+        if (stage==2) {
+          if (nfilts<2) {
+            d_print((tmp=lives_strdup_printf(_("Invalid compound effect %s - must have >1 sub filters\n"),plugin_name)));
+            LIVES_ERROR(tmp);
+            lives_free(tmp);
+            ok=FALSE;
+            break;
+          }
+          filter=create_compound_filter(plugin_name,nfilts,filters);
+          if (filter==NULL) break;
+        }
+        continue;
       }
       switch (stage) {
       case 0:
-	if (line==1) author=g_strdup(buff);
-	if (line==2) version=atoi(buff);
-	break;
+        if (line==1) author=lives_strdup(buff);
+        if (line==2) version=atoi(buff);
+        break;
       case 1:
-	// add filters
-	fnum=weed_get_idx_for_hashname(buff,TRUE);
-	if (fnum==-1) {
-	  d_print((tmp=g_strdup_printf(_("Invalid effect %s found in compound effect %s, line %d\n"),buff,plugin_name,line)));
-	  LIVES_INFO(tmp);
-	  g_free(tmp);
-	  ok=FALSE;
-	  break;
-	}
-	filters=(int *)g_realloc(filters,++nfilts*sizeof(int));
-	filters[nfilts-1]=fnum;
-	break;
+        // add filters
+        fnum=weed_get_idx_for_hashname(buff,TRUE);
+        if (fnum==-1) {
+          d_print((tmp=lives_strdup_printf(_("Invalid effect %s found in compound effect %s, line %d\n"),buff,plugin_name,line)));
+          LIVES_INFO(tmp);
+          lives_free(tmp);
+          ok=FALSE;
+          break;
+        }
+        filters=(int *)lives_realloc(filters,++nfilts*sizeof(int));
+        filters[nfilts-1]=fnum;
+        break;
       case 2:
-	// override defaults: format is i|p|d0|d1|...|dn
-	// NOTE: for obvious reasons, | may not be used inside string defaults
-	ntok=get_token_count (buff,'|');
-
-	if (ntok<2) {
-	  d_print((tmp=g_strdup_printf(_("Invalid default found in compound effect %s, line %d\n"),plugin_name,line)));
-	  LIVES_ERROR(tmp);
-	  g_free(tmp);
-	  ok=FALSE;
-	  break;
-	}
-
-	array=g_strsplit(buff,"|",ntok);
-
-	xfilt=atoi(array[0]); // sub filter number
-	if (xfilt<0||xfilt>=nfilts) {
-	  d_print((tmp=g_strdup_printf(_("Invalid filter %d for defaults found in compound effect %s, line %d\n"),xfilt,plugin_name,line)));
-	  LIVES_ERROR(tmp);
-	  g_free(tmp);
-	  ok=FALSE;
-	  g_strfreev(array);
-	  break;
-	}
-	xfilter=get_weed_filter(filters[xfilt]);
-
-	nparams=num_in_params(xfilter,FALSE,FALSE);
-
-	pnum=atoi(array[1]);
-	
-	if (pnum>=nparams) {
-	  d_print((tmp=g_strdup_printf(_("Invalid param %d for defaults found in compound effect %s, line %d\n"),pnum,plugin_name,line)));
-	  LIVES_ERROR(tmp);
-	  g_free(tmp);
-	  ok=FALSE;
-	  g_strfreev(array);
-	  break;
-	}
-
-	// get pnum for compound filter
-	for (i=0;i<xfilt;i++) pnum+=num_in_params(get_weed_filter(filters[i]),FALSE,FALSE);
-
-	ptmpl=weed_filter_in_paramtmpl(filter,pnum,FALSE);
-
-	ptype=weed_leaf_seed_type(ptmpl,"default");
-	pflags=weed_get_int_value(ptmpl,"flags",&error);
-	phint=weed_get_int_value(ptmpl,"hint",&error);
-
-	if (phint==WEED_HINT_COLOR) {
-	  pcspace=weed_get_int_value(ptmpl,"colorspace",&error);
-	  qvals=3;
-	  if (pcspace==WEED_COLORSPACE_RGBA) qvals=4;
-	}
-
-	ntok-=2;
-
-	if ((ntok!=weed_leaf_num_elements(ptmpl,"default")&&!(pflags&WEED_PARAMETER_VARIABLE_ELEMENTS)) ||
-	    ntok%qvals!=0) {
-	  d_print((tmp=g_strdup_printf(_("Invalid number of values for defaults found in compound effect %s, line %d\n"),plugin_name,line)));
-	  LIVES_ERROR(tmp);
-	  g_free(tmp);
-	  ok=FALSE;
-	  g_strfreev(array);
-	  break;
-	}
-
-	// TODO - for INT and DOUBLE, check if default is within min/max bounds
-
-	switch (ptype) {
-	case WEED_SEED_INT:
-	  ivals=(int *)g_malloc(ntok*sizint);
-	  for (i=0;i<ntok;i++) {
-	    ivals[i]=atoi(array[i+2]);
-	  }
-	  weed_set_int_array(ptmpl,"default",ntok,ivals);
-	  g_free(ivals);
-	  break;
-	case WEED_SEED_DOUBLE:
-	  dvals=(double *)g_malloc(ntok*sizdbl);
-	  for (i=0;i<ntok;i++) {
-	    dvals[i]=strtod(array[i+2],NULL);
-	  }
-	  weed_set_double_array(ptmpl,"default",ntok,dvals);
-	  g_free(dvals);
-	  break;
-	case WEED_SEED_BOOLEAN:
-	  ivals=(int *)g_malloc(ntok*sizint);
-	  for (i=0;i<ntok;i++) {
-	    ivals[i]=atoi(array[i+2]);
-
-	    if (ivals[i]!=WEED_TRUE&&ivals[i]!=WEED_FALSE) {
-	      g_free(ivals);
-	      d_print((tmp=g_strdup_printf(_("Invalid non-boolean value for defaults found in compound effect %s, line %d\n"),
-					   pnum,plugin_name,line)));
-	      LIVES_ERROR(tmp);
-	      g_free(tmp);
-	      ok=FALSE;
-	      g_strfreev(array);
-	      break;
-	    }
-
-	  }
-	  weed_set_boolean_array(ptmpl,"default",ntok,ivals);
-	  g_free(ivals);
-	  break;
-	default: // string
-	  svals=(gchar **)g_malloc(ntok*sizeof(gchar *));
-	  for (i=0;i<ntok;i++) {
-	    svals[i]=g_strdup(array[i+2]);
-	  }
-	  weed_set_string_array(ptmpl,"default",ntok,svals);
-	  for (i=0;i<ntok;i++) {
-	    g_free(svals[i]);
-	  }
-	  g_free(svals);
-	  break;
-	}
-	g_strfreev(array);
-	break;
+        // override defaults: format is i|p|d0|d1|...|dn
+        // NOTE: for obvious reasons, | may not be used inside string defaults
+        ntok=get_token_count(buff,'|');
+
+        if (ntok<2) {
+          d_print((tmp=lives_strdup_printf(_("Invalid default found in compound effect %s, line %d\n"),plugin_name,line)));
+          LIVES_ERROR(tmp);
+          lives_free(tmp);
+          ok=FALSE;
+          break;
+        }
+
+        array=lives_strsplit(buff,"|",ntok);
+
+        xfilt=atoi(array[0]); // sub filter number
+        if (xfilt<0||xfilt>=nfilts) {
+          d_print((tmp=lives_strdup_printf(_("Invalid filter %d for defaults found in compound effect %s, line %d\n"),xfilt,plugin_name,line)));
+          LIVES_ERROR(tmp);
+          lives_free(tmp);
+          ok=FALSE;
+          lives_strfreev(array);
+          break;
+        }
+        xfilter=get_weed_filter(filters[xfilt]);
+
+        nparams=num_in_params(xfilter,FALSE,FALSE);
+
+        pnum=atoi(array[1]);
+
+        if (pnum>=nparams) {
+          d_print((tmp=lives_strdup_printf(_("Invalid param %d for defaults found in compound effect %s, line %d\n"),pnum,plugin_name,line)));
+          LIVES_ERROR(tmp);
+          lives_free(tmp);
+          ok=FALSE;
+          lives_strfreev(array);
+          break;
+        }
+
+        // get pnum for compound filter
+        for (i=0; i<xfilt; i++) pnum+=num_in_params(get_weed_filter(filters[i]),FALSE,FALSE);
+
+        ptmpl=weed_filter_in_paramtmpl(filter,pnum,FALSE);
+
+        ptype=weed_leaf_seed_type(ptmpl,"default");
+        pflags=weed_get_int_value(ptmpl,"flags",&error);
+        phint=weed_get_int_value(ptmpl,"hint",&error);
+
+        if (phint==WEED_HINT_COLOR) {
+          pcspace=weed_get_int_value(ptmpl,"colorspace",&error);
+          qvals=3;
+          if (pcspace==WEED_COLORSPACE_RGBA) qvals=4;
+        }
+
+        ntok-=2;
+
+        if ((ntok!=weed_leaf_num_elements(ptmpl,"default")&&!(pflags&WEED_PARAMETER_VARIABLE_ELEMENTS)) ||
+            ntok%qvals!=0) {
+          d_print((tmp=lives_strdup_printf(_("Invalid number of values for defaults found in compound effect %s, line %d\n"),plugin_name,line)));
+          LIVES_ERROR(tmp);
+          lives_free(tmp);
+          ok=FALSE;
+          lives_strfreev(array);
+          break;
+        }
+
+        // TODO - for INT and DOUBLE, check if default is within min/max bounds
+
+        switch (ptype) {
+        case WEED_SEED_INT:
+          ivals=(int *)lives_malloc(ntok*sizint);
+          for (i=0; i<ntok; i++) {
+            ivals[i]=atoi(array[i+2]);
+          }
+          weed_set_int_array(ptmpl,"default",ntok,ivals);
+          lives_free(ivals);
+          break;
+        case WEED_SEED_DOUBLE:
+          dvals=(double *)lives_malloc(ntok*sizdbl);
+          for (i=0; i<ntok; i++) {
+            dvals[i]=strtod(array[i+2],NULL);
+          }
+          weed_set_double_array(ptmpl,"default",ntok,dvals);
+          lives_free(dvals);
+          break;
+        case WEED_SEED_BOOLEAN:
+          ivals=(int *)lives_malloc(ntok*sizint);
+          for (i=0; i<ntok; i++) {
+            ivals[i]=atoi(array[i+2]);
+
+            if (ivals[i]!=WEED_TRUE&&ivals[i]!=WEED_FALSE) {
+              lives_free(ivals);
+              d_print((tmp=lives_strdup_printf(_("Invalid non-boolean value for defaults found in compound effect %s, line %d\n"),
+                                               pnum,plugin_name,line)));
+              LIVES_ERROR(tmp);
+              lives_free(tmp);
+              ok=FALSE;
+              lives_strfreev(array);
+              break;
+            }
+
+          }
+          weed_set_boolean_array(ptmpl,"default",ntok,ivals);
+          lives_free(ivals);
+          break;
+        default: // string
+          svals=(char **)lives_malloc(ntok*sizeof(char *));
+          for (i=0; i<ntok; i++) {
+            svals[i]=lives_strdup(array[i+2]);
+          }
+          weed_set_string_array(ptmpl,"default",ntok,svals);
+          for (i=0; i<ntok; i++) {
+            lives_free(svals[i]);
+          }
+          lives_free(svals);
+          break;
+        }
+        lives_strfreev(array);
+        break;
       case 3:
-	// link params: format is f0|p0|autoscale|f1|p1
+        // link params: format is f0|p0|autoscale|f1|p1
+
+        ntok=get_token_count(buff,'|');
+
+        if (ntok!=5) {
+          d_print((tmp=lives_strdup_printf(_("Invalid param link found in compound effect %s, line %d\n"),plugin_name,line)));
+          LIVES_ERROR(tmp);
+          lives_free(tmp);
+          ok=FALSE;
+          break;
+        }
 
-	ntok=get_token_count (buff,'|');
+        array=lives_strsplit(buff,"|",ntok);
 
-	if (ntok!=5) {
-	  d_print((tmp=g_strdup_printf(_("Invalid param link found in compound effect %s, line %d\n"),plugin_name,line)));
-	  LIVES_ERROR(tmp);
-	  g_free(tmp);
-	  ok=FALSE;
-	  break;
-	}
-
-	array=g_strsplit(buff,"|",ntok);
-
-	xfilt=atoi(array[0]); // sub filter number
-	if (xfilt<-1||xfilt>=nfilts) {
-	  d_print((tmp=g_strdup_printf(_("Invalid out filter %d for link params found in compound effect %s, line %d\n"),xfilt,plugin_name,line)));
-	  LIVES_ERROR(tmp);
-	  g_free(tmp);
-	  ok=FALSE;
-	  g_strfreev(array);
-	  break;
-	}
-
-	pnum=atoi(array[1]);
-
-	if (xfilt>-1) {
-	  xfilter=get_weed_filter(filters[xfilt]);
-
-	  if (weed_plant_has_leaf(xfilter,"out_parameter_templates"))
-	    nparams=weed_leaf_num_elements(xfilter,"out_parameter_templates");
-	  else nparams=0;
-
-	  if (pnum>=nparams) {
-	    d_print((tmp=g_strdup_printf(_("Invalid out param %d for link params found in compound effect %s, line %d\n"),pnum,plugin_name,line)));
-	    LIVES_ERROR(tmp);
-	    g_free(tmp);
-	    ok=FALSE;
-	    g_strfreev(array);
-	    break;
-	  }
-	}
-
-	autoscale=atoi(array[2]);
-
-	if (autoscale!=WEED_TRUE&&autoscale!=WEED_FALSE) {
-	  d_print((tmp=g_strdup_printf(_("Invalid non-boolean value for autoscale found in compound effect %s, line %d\n"),
-				       pnum,plugin_name,line)));
-	  LIVES_ERROR(tmp);
-	  g_free(tmp);
-	  ok=FALSE;
-	  g_strfreev(array);
-	  break;
-	}
-
-	xfilt2=atoi(array[3]); // sub filter number
-	if (xfilt>=nfilts) {
-	  d_print((tmp=g_strdup_printf(_("Invalid in filter %d for link params found in compound effect %s, line %d\n"),xfilt2,plugin_name,line)));
-	  LIVES_ERROR(tmp);
-	  g_free(tmp);
-	  ok=FALSE;
-	  g_strfreev(array);
-	  break;
-	}
-	xfilter=get_weed_filter(filters[xfilt2]);
-
-	nparams=num_in_params(xfilter,FALSE,FALSE);
-
-	pnum2=atoi(array[4]);
-	
-	if (pnum2>=nparams) {
-	  d_print((tmp=g_strdup_printf(_("Invalid in param %d for link params found in compound effect %s, line %d\n"),pnum2,plugin_name,line)));
-	  LIVES_ERROR(tmp);
-	  g_free(tmp);
-	  ok=FALSE;
-	  g_strfreev(array);
-	  break;
-	}
-
-	// calc xpnum2
-	xpnum2=pnum2;
-	for (i=0;i<xfilt2;i++) xpnum2+=num_in_params(get_weed_filter(filters[i]),FALSE,FALSE);
-
-	// must get paramtmpl here from filter (not xfilter)
-	iptmpl=weed_filter_in_paramtmpl(filter,xpnum2,FALSE);
+        xfilt=atoi(array[0]); // sub filter number
+        if (xfilt<-1||xfilt>=nfilts) {
+          d_print((tmp=lives_strdup_printf(_("Invalid out filter %d for link params found in compound effect %s, line %d\n"),
+                                           xfilt,plugin_name,line)));
+          LIVES_ERROR(tmp);
+          lives_free(tmp);
+          ok=FALSE;
+          lives_strfreev(array);
+          break;
+        }
+
+        pnum=atoi(array[1]);
+
+        if (xfilt>-1) {
+          xfilter=get_weed_filter(filters[xfilt]);
+
+          if (weed_plant_has_leaf(xfilter,"out_parameter_templates"))
+            nparams=weed_leaf_num_elements(xfilter,"out_parameter_templates");
+          else nparams=0;
+
+          if (pnum>=nparams) {
+            d_print((tmp=lives_strdup_printf(_("Invalid out param %d for link params found in compound effect %s, line %d\n"),
+                                             pnum,plugin_name,line)));
+            LIVES_ERROR(tmp);
+            lives_free(tmp);
+            ok=FALSE;
+            lives_strfreev(array);
+            break;
+          }
+        }
+
+        autoscale=atoi(array[2]);
+
+        if (autoscale!=WEED_TRUE&&autoscale!=WEED_FALSE) {
+          d_print((tmp=lives_strdup_printf(_("Invalid non-boolean value for autoscale found in compound effect %s, line %d\n"),
+                                           pnum,plugin_name,line)));
+          LIVES_ERROR(tmp);
+          lives_free(tmp);
+          ok=FALSE;
+          lives_strfreev(array);
+          break;
+        }
+
+        xfilt2=atoi(array[3]); // sub filter number
+        if (xfilt>=nfilts) {
+          d_print((tmp=lives_strdup_printf(_("Invalid in filter %d for link params found in compound effect %s, line %d\n"),
+                                           xfilt2,plugin_name,line)));
+          LIVES_ERROR(tmp);
+          lives_free(tmp);
+          ok=FALSE;
+          lives_strfreev(array);
+          break;
+        }
+        xfilter=get_weed_filter(filters[xfilt2]);
+
+        nparams=num_in_params(xfilter,FALSE,FALSE);
+
+        pnum2=atoi(array[4]);
+
+        if (pnum2>=nparams) {
+          d_print((tmp=lives_strdup_printf(_("Invalid in param %d for link params found in compound effect %s, line %d\n"),
+                                           pnum2,plugin_name,line)));
+          LIVES_ERROR(tmp);
+          lives_free(tmp);
+          ok=FALSE;
+          lives_strfreev(array);
+          break;
+        }
 
-	xvals[0]=xfilt;
-	xvals[1]=pnum;
+        // calc xpnum2
+        xpnum2=pnum2;
+        for (i=0; i<xfilt2; i++) xpnum2+=num_in_params(get_weed_filter(filters[i]),FALSE,FALSE);
 
-	weed_set_int_array(iptmpl,"host_internal_connection",2,xvals);
-	if (autoscale==WEED_TRUE) weed_set_boolean_value(iptmpl,"host_internal_connection_autoscale",WEED_TRUE);
+        // must get paramtmpl here from filter (not xfilter)
+        iptmpl=weed_filter_in_paramtmpl(filter,xpnum2,FALSE);
 
-	g_strfreev(array);
-	break;
+        xvals[0]=xfilt;
+        xvals[1]=pnum;
+
+        weed_set_int_array(iptmpl,"host_internal_connection",2,xvals);
+        if (autoscale==WEED_TRUE) weed_set_boolean_value(iptmpl,"host_internal_connection_autoscale",WEED_TRUE);
+
+        lives_strfreev(array);
+        break;
       case 4:
-	// link alpha channels: format is f0|c0|f1|c1
-	ntok=get_token_count (buff,'|');
+        // link alpha channels: format is f0|c0|f1|c1
+        ntok=get_token_count(buff,'|');
+
+        if (ntok!=4) {
+          d_print((tmp=lives_strdup_printf(_("Invalid channel link found in compound effect %s, line %d\n"),plugin_name,line)));
+          LIVES_ERROR(tmp);
+          lives_free(tmp);
+          ok=FALSE;
+          break;
+        }
+
+        array=lives_strsplit(buff,"|",ntok);
+
+        xfilt=atoi(array[0]); // sub filter number
+        if (xfilt<0||xfilt>=nfilts) {
+          d_print((tmp=lives_strdup_printf(_("Invalid out filter %d for link channels found in compound effect %s, line %d\n"),
+                                           xfilt,plugin_name,line)));
+          LIVES_ERROR(tmp);
+          lives_free(tmp);
+          ok=FALSE;
+          lives_strfreev(array);
+          break;
+        }
+        xfilter=get_weed_filter(filters[xfilt]);
+
+        nchans=0;
+        if (weed_plant_has_leaf(xfilter,"out_channel_templates")) {
+          nchans=weed_leaf_num_elements(xfilter,"out_channel_templates");
+          if (weed_get_plantptr_value(xfilter,"out_channel_templates",&error)==NULL) nchans=0;
+        }
+
+        cnum=atoi(array[1]);
+
+        if (cnum>=nchans) {
+          d_print((tmp=lives_strdup_printf(_("Invalid out channel %d for link params found in compound effect %s, line %d\n"),
+                                           cnum,plugin_name,line)));
+          LIVES_ERROR(tmp);
+          lives_free(tmp);
+          ok=FALSE;
+          lives_strfreev(array);
+          break;
+        }
+
+        xfilt2=atoi(array[2]); // sub filter number
+        if (xfilt2<=xfilt||xfilt>=nfilts) {
+          d_print((tmp=lives_strdup_printf(_("Invalid in filter %d for link channels found in compound effect %s, line %d\n"),
+                                           xfilt2,plugin_name,line)));
+          LIVES_ERROR(tmp);
+          lives_free(tmp);
+          ok=FALSE;
+          lives_strfreev(array);
+          break;
+        }
+        xfilter=get_weed_filter(filters[xfilt2]);
+
+        nchans=0;
+        if (weed_plant_has_leaf(xfilter,"in_channel_templates")) {
+          nchans=weed_leaf_num_elements(xfilter,"in_channel_templates");
+          if (weed_get_plantptr_value(xfilter,"in_channel_templates",&error)==NULL) nchans=0;
+        }
+
+        cnum2=atoi(array[3]);
+
+        if (cnum2>=nchans) {
+          d_print((tmp=lives_strdup_printf(_("Invalid in channel %d for link params found in compound effect %s, line %d\n"),
+                                           cnum2,plugin_name,line)));
+          LIVES_ERROR(tmp);
+          lives_free(tmp);
+          ok=FALSE;
+          lives_strfreev(array);
+          break;
+        }
 
-	if (ntok!=4) {
-	  d_print((tmp=g_strdup_printf(_("Invalid channel link found in compound effect %s, line %d\n"),plugin_name,line)));
-	  LIVES_ERROR(tmp);
-	  g_free(tmp);
-	  ok=FALSE;
-	  break;
-	}
-
-	array=g_strsplit(buff,"|",ntok);
-
-	xfilt=atoi(array[0]); // sub filter number
-	if (xfilt<0||xfilt>=nfilts) {
-	  d_print((tmp=g_strdup_printf(_("Invalid out filter %d for link channels found in compound effect %s, line %d\n"),xfilt,plugin_name,line)));
-	  LIVES_ERROR(tmp);
-	  g_free(tmp);
-	  ok=FALSE;
-	  g_strfreev(array);
-	  break;
-	}
-	xfilter=get_weed_filter(filters[xfilt]);
-
-	nchans=0;
-	if (weed_plant_has_leaf(xfilter,"out_channel_templates")) {
-	  nchans=weed_leaf_num_elements(xfilter,"out_channel_templates");
-	  if (weed_get_plantptr_value(xfilter,"out_channel_templates",&error)==NULL) nchans=0;
-	}
-
-	cnum=atoi(array[1]);
-
-	if (cnum>=nchans) {
-	  d_print((tmp=g_strdup_printf(_("Invalid out channel %d for link params found in compound effect %s, line %d\n"),cnum,plugin_name,line)));
-	  LIVES_ERROR(tmp);
-	  g_free(tmp);
-	  ok=FALSE;
-	  g_strfreev(array);
-	  break;
-	}
-
-	xfilt2=atoi(array[2]); // sub filter number
-	if (xfilt2<=xfilt||xfilt>=nfilts) {
-	  d_print((tmp=g_strdup_printf(_("Invalid in filter %d for link channels found in compound effect %s, line %d\n"),xfilt2,plugin_name,line)));
-	  LIVES_ERROR(tmp);
-	  g_free(tmp);
-	  ok=FALSE;
-	  g_strfreev(array);
-	  break;
-	}
-	xfilter=get_weed_filter(filters[xfilt2]);
-
-	nchans=0;
-	if (weed_plant_has_leaf(xfilter,"in_channel_templates")) {
-	  nchans=weed_leaf_num_elements(xfilter,"in_channel_templates");
-	  if (weed_get_plantptr_value(xfilter,"in_channel_templates",&error)==NULL) nchans=0;
-	}
-
-	cnum2=atoi(array[3]);
-	
-	if (cnum2>=nchans) {
-	  d_print((tmp=g_strdup_printf(_("Invalid in channel %d for link params found in compound effect %s, line %d\n"),cnum2,plugin_name,line)));
-	  LIVES_ERROR(tmp);
-	  g_free(tmp);
-	  ok=FALSE;
-	  g_strfreev(array);
-	  break;
-	}
-
-	xvals[0]=xfilt;
-	xvals[1]=cnum;
-	xvals[2]=xfilt2;
-	xvals[3]=cnum2;
-
-	// unlike with in_param_templates, which are copy by value, in_channel_templates are copy by ref.
-	// so we need to add some extra leaves to the compound filter to note channel connections
-	// - we will link the actual channels when we create an instance from the filter
-	key=g_strdup_printf("host_channel_connection%d",xconx++);
-	weed_set_int_array(filter,key,4,xvals);
-	g_free(key);
+        xvals[0]=xfilt;
+        xvals[1]=cnum;
+        xvals[2]=xfilt2;
+        xvals[3]=cnum2;
+
+        // unlike with in_param_templates, which are copy by value, in_channel_templates are copy by ref.
+        // so we need to add some extra leaves to the compound filter to note channel connections
+        // - we will link the actual channels when we create an instance from the filter
+        key=lives_strdup_printf("host_channel_connection%d",xconx++);
+        weed_set_int_array(filter,key,4,xvals);
+        lives_free(key);
 
-	g_strfreev(array);
-	break;
+        lives_strfreev(array);
+        break;
       default:
-	break;
+        break;
       }
       if (!ok) {
-	if (filter!=NULL) weed_filter_free(filter,NULL);
-	filter=NULL;
-	break;
+        if (filter!=NULL) weed_filter_free(filter,NULL);
+        filter=NULL;
+        break;
       }
     }
     fclose(cpdfile);
@@ -5684,25 +5675,25 @@
 
   if (filter!=NULL) {
     int idx;
-    gchar *filter_name=g_strdup_printf(_("Compound:%s"),plugin_name);
+    char *filter_name=lives_strdup_printf(_("Compound:%s"),plugin_name);
     weed_set_string_value(filter,"name",filter_name);
 
     weed_set_string_value(filter,"author",author);
-    weed_free(author);
+    lives_free(author);
     weed_set_int_value(filter,"version",version);
     idx=num_weed_filters++;
 
-    weed_filters=(weed_plant_t **)g_realloc(weed_filters,num_weed_filters*sizeof(weed_plant_t *));
+    weed_filters=(weed_plant_t **)lives_realloc(weed_filters,num_weed_filters*sizeof(weed_plant_t *));
     weed_filters[idx]=filter;
 
-    hashnames=(gchar **)g_realloc(hashnames,num_weed_filters*sizeof(gchar *));
+    hashnames=(char **)lives_realloc(hashnames,num_weed_filters*sizeof(char *));
     hashnames[idx]=NULL;
     hashnames[idx]=make_weed_hashname(idx,TRUE,FALSE);
 
-    g_free(filter_name);
+    lives_free(filter_name);
   }
 
-  if (filters!=NULL) g_free(filters);
+  if (filters!=NULL) lives_free(filters);
 
 }
 
@@ -5715,52 +5706,50 @@
 
   int plugin_idx,onum_filters=num_weed_filters;
 
-  gchar *lives_compound_plugin_path,*plugin_name,*plugin_path,*msg;
+  char *lives_compound_plugin_path,*plugin_name,*plugin_path;
 
   threaded_dialog_spin();
 
-  lives_compound_plugin_path=g_build_filename(capable->home_dir,PLUGIN_COMPOUND_EFFECTS_CUSTOM,NULL);
+  lives_compound_plugin_path=lives_build_filename(capable->home_dir,PLUGIN_COMPOUND_EFFECTS_CUSTOM,NULL);
   compound_plugin_list=get_plugin_list(PLUGIN_COMPOUND_EFFECTS_CUSTOM,TRUE,lives_compound_plugin_path,NULL);
 
-  for (plugin_idx=0;plugin_idx<g_list_length(compound_plugin_list);plugin_idx++) {
-    plugin_name=(gchar *)g_list_nth_data(compound_plugin_list,plugin_idx);
-    plugin_path=g_build_filename(lives_compound_plugin_path,plugin_name,NULL);
+  for (plugin_idx=0; plugin_idx<lives_list_length(compound_plugin_list); plugin_idx++) {
+    plugin_name=(char *)lives_list_nth_data(compound_plugin_list,plugin_idx);
+    plugin_path=lives_build_filename(lives_compound_plugin_path,plugin_name,NULL);
     load_compound_plugin(plugin_name,plugin_path);
-    g_free(plugin_path);
+    lives_free(plugin_path);
     threaded_dialog_spin();
   }
 
   if (compound_plugin_list!=NULL) {
-    g_list_free_strings(compound_plugin_list);
-    g_list_free(compound_plugin_list);
+    lives_list_free_strings(compound_plugin_list);
+    lives_list_free(compound_plugin_list);
   }
 
   threaded_dialog_spin();
-  g_free(lives_compound_plugin_path);
+  lives_free(lives_compound_plugin_path);
 
-  lives_compound_plugin_path=g_build_filename(prefs->prefix_dir,PLUGIN_COMPOUND_DIR,PLUGIN_COMPOUND_EFFECTS_BUILTIN,NULL);
+  lives_compound_plugin_path=lives_build_filename(prefs->prefix_dir,PLUGIN_COMPOUND_DIR,PLUGIN_COMPOUND_EFFECTS_BUILTIN,NULL);
   compound_plugin_list=get_plugin_list(PLUGIN_COMPOUND_EFFECTS_BUILTIN,TRUE,lives_compound_plugin_path,NULL);
-  
-  for (plugin_idx=0;plugin_idx<g_list_length(compound_plugin_list);plugin_idx++) {
-    plugin_name=(gchar *)g_list_nth_data(compound_plugin_list,plugin_idx);
-    plugin_path=g_build_filename(lives_compound_plugin_path,plugin_name,NULL);
+
+  for (plugin_idx=0; plugin_idx<lives_list_length(compound_plugin_list); plugin_idx++) {
+    plugin_name=(char *)lives_list_nth_data(compound_plugin_list,plugin_idx);
+    plugin_path=lives_build_filename(lives_compound_plugin_path,plugin_name,NULL);
     load_compound_plugin(plugin_name,plugin_path);
-    g_free(plugin_path);
+    lives_free(plugin_path);
     threaded_dialog_spin();
   }
 
   if (compound_plugin_list!=NULL) {
-    g_list_free_strings(compound_plugin_list);
-    g_list_free(compound_plugin_list);
+    lives_list_free_strings(compound_plugin_list);
+    lives_list_free(compound_plugin_list);
   }
 
   if (num_weed_filters>onum_filters) {
-    msg=g_strdup_printf(_ ("Successfully loaded %d compound filters\n"),num_weed_filters-onum_filters);
-    d_print(msg);
-    g_free(msg);
+    d_print(_("Successfully loaded %d compound filters\n"),num_weed_filters-onum_filters);
   }
 
-  g_free(lives_compound_plugin_path);
+  lives_free(lives_compound_plugin_path);
   threaded_dialog_spin();
 
 }
@@ -5776,7 +5765,7 @@
 
   weed_desetup_f desetup_fn;
 
-  GList *pinfo=NULL,*xpinfo,*freed_ptrs=NULL;
+  LiVESList *pinfo=NULL,*xpinfo,*freed_ptrs=NULL;
 
   int error;
 
@@ -5785,16 +5774,16 @@
   mainw->num_tr_applied=0;
   weed_deinit_all(TRUE);
 
-  for (i=0;i<FX_KEYS_MAX_VIRTUAL;i++) {
-    for (j=0;j<prefs->max_modes_per_key;j++) {
+  for (i=0; i<FX_KEYS_MAX_VIRTUAL; i++) {
+    for (j=0; j<prefs->max_modes_per_key; j++) {
       if (key_defaults[i][j]!=NULL) free_key_defaults(i,j);
     }
-    g_free(key_defaults[i]);
+    lives_free(key_defaults[i]);
   }
 
   mainw->chdir_failed=FALSE;
 
-  for (i=0;i<num_weed_filters;i++) {
+  for (i=0; i<num_weed_filters; i++) {
 
     filter=weed_filters[i];
 
@@ -5805,17 +5794,17 @@
 
     plugin_info=weed_get_plantptr_value(filter,"plugin_info",&error);
 
-    if (pinfo==NULL||g_list_index(pinfo,plugin_info)==-1) pinfo=g_list_append(pinfo,plugin_info);
+    if (pinfo==NULL||lives_list_index(pinfo,plugin_info)==-1) pinfo=lives_list_append(pinfo,plugin_info);
 
     handle=weed_get_voidptr_value(plugin_info,"handle",&error);
 
     if (handle!=NULL&&prefs->startup_phase==0) {
-      if ((desetup_fn=(weed_desetup_f)dlsym (handle,"weed_desetup"))!=NULL) {
-	gchar *cwd=cd_to_plugin_dir(filter);
-	// call weed_desetup()
-	(*desetup_fn)();
-	lives_chdir(cwd,FALSE);
-	g_free(cwd);
+      if ((desetup_fn=(weed_desetup_f)dlsym(handle,"weed_desetup"))!=NULL) {
+        char *cwd=cd_to_plugin_dir(filter);
+        // call weed_desetup()
+        (*desetup_fn)();
+        lives_chdir(cwd,FALSE);
+        lives_free(cwd);
       }
 
       dlclose(handle);
@@ -5826,7 +5815,7 @@
     weed_filter_free(filter,&freed_ptrs);
   }
 
-  g_list_free(freed_ptrs);
+  lives_list_free(freed_ptrs);
 
   xpinfo=pinfo;
 
@@ -5837,33 +5826,33 @@
     pinfo=pinfo->next;
   }
 
-  if (xpinfo!=NULL) g_list_free(xpinfo);
+  if (xpinfo!=NULL) lives_list_free(xpinfo);
 
-  for (i=0;i<num_weed_filters;i++) {
-    if (hashnames[i]!=NULL) g_free(hashnames[i]);
+  for (i=0; i<num_weed_filters; i++) {
+    if (hashnames[i]!=NULL) lives_free(hashnames[i]);
   }
 
-  if (hashnames!=NULL) g_free(hashnames);
-  if (weed_filters!=NULL) g_free(weed_filters);
+  if (hashnames!=NULL) lives_free(hashnames);
+  if (weed_filters!=NULL) lives_free(weed_filters);
 
-  for (i=0;i<FX_KEYS_MAX;i++) {
-    g_free(key_to_fx[i]);
-    g_free(key_to_instance[i]);
-    g_free(key_to_instance_copy[i]);
+  for (i=0; i<FX_KEYS_MAX; i++) {
+    lives_free(key_to_fx[i]);
+    lives_free(key_to_instance[i]);
+    lives_free(key_to_instance_copy[i]);
   }
 
   threaded_dialog_spin();
 
   if (mainw->chdir_failed) {
-    gchar *dirs=g_strdup(_("Some plugin directories"));
+    char *dirs=lives_strdup(_("Some plugin directories"));
     do_chdir_failed_error(dirs);
-    g_free(dirs);
+    lives_free(dirs);
   }
 
 }
 
 
-static void weed_in_channels_free (weed_plant_t *inst) {
+static void weed_in_channels_free(weed_plant_t *inst) {
   weed_plant_t **channels;
   int i,error;
   int num_channels;
@@ -5872,17 +5861,17 @@
 
   num_channels=weed_leaf_num_elements(inst,"in_channels");
   channels=weed_get_plantptr_array(inst,"in_channels",&error);
-  for (i=0;i<num_channels;i++) {
+  for (i=0; i<num_channels; i++) {
     if (channels[i]!=NULL) {
       if (weed_palette_is_alpha_palette(weed_layer_get_palette(channels[i]))) weed_layer_free(channels[i]);
       else weed_plant_free(channels[i]);
     }
   }
-  weed_free(channels);
+  lives_free(channels);
 
 }
 
-static void weed_out_channels_free (weed_plant_t *inst) {
+static void weed_out_channels_free(weed_plant_t *inst) {
   weed_plant_t **channels;
   int i,error;
   int num_channels;
@@ -5891,22 +5880,22 @@
 
   num_channels=weed_leaf_num_elements(inst,"out_channels");
   channels=weed_get_plantptr_array(inst,"out_channels",&error);
-  for (i=0;i<num_channels;i++) {
+  for (i=0; i<num_channels; i++) {
     if (channels[i]!=NULL) {
       if (weed_palette_is_alpha_palette(weed_layer_get_palette(channels[i]))) weed_layer_free(channels[i]);
       else weed_plant_free(channels[i]);
     }
   }
-  weed_free(channels);
+  lives_free(channels);
 }
 
-static void weed_channels_free (weed_plant_t *inst) {
+static void weed_channels_free(weed_plant_t *inst) {
   weed_in_channels_free(inst);
   weed_out_channels_free(inst);
 }
 
 
-static void weed_gui_free (weed_plant_t *plant) {
+static void weed_gui_free(weed_plant_t *plant) {
   weed_plant_t *gui;
   int error;
 
@@ -5919,18 +5908,18 @@
 
 void weed_in_params_free(weed_plant_t **parameters, int num_parameters) {
   register int i;
-  for (i=0;i<num_parameters;i++) {
+  for (i=0; i<num_parameters; i++) {
     if (parameters[i]!=NULL) {
       if (parameters[i]==mainw->rte_textparm) mainw->rte_textparm=NULL;
       weed_gui_free(parameters[i]);
       weed_plant_free(parameters[i]);
     }
   }
-  weed_free(parameters);
+  lives_free(parameters);
 }
 
 
-void weed_in_parameters_free (weed_plant_t *inst) {
+void weed_in_parameters_free(weed_plant_t *inst) {
   weed_plant_t **parameters;
   int error;
   int num_parameters;
@@ -5942,7 +5931,7 @@
   weed_in_params_free(parameters,num_parameters);
 }
 
-static void weed_out_parameters_free (weed_plant_t *inst) {
+static void weed_out_parameters_free(weed_plant_t *inst) {
   weed_plant_t **parameters;
   int error;
   int num_parameters;
@@ -5952,20 +5941,20 @@
 
   num_parameters=weed_leaf_num_elements(inst,"out_parameters");
   parameters=weed_get_plantptr_array(inst,"out_parameters",&error);
-  for (i=0;i<num_parameters;i++) {
+  for (i=0; i<num_parameters; i++) {
     if (parameters[i]!=NULL) {
       weed_plant_free(parameters[i]);
     }
   }
-  weed_free(parameters);
+  lives_free(parameters);
 }
 
-static void weed_parameters_free (weed_plant_t *inst) {
+static void weed_parameters_free(weed_plant_t *inst) {
   weed_in_parameters_free(inst);
   weed_out_parameters_free(inst);
 }
 
-static void weed_free_instance (weed_plant_t *inst) {
+static void lives_free_instance(weed_plant_t *inst) {
   weed_channels_free(inst);
   weed_parameters_free(inst);
   weed_plant_free(inst);
@@ -5974,7 +5963,7 @@
 void weed_instance_unref(weed_plant_t *inst) {
   int error;
   int nrefs=weed_get_int_value(inst,"host_refs",&error)-1;
-  if (nrefs==0) weed_free_instance(inst);
+  if (nrefs==0) lives_free_instance(inst);
   else weed_set_int_value(inst,"host_refs",nrefs);
 }
 
@@ -6006,7 +5995,7 @@
 }
 
 
-void weed_generator_end (weed_plant_t *inst) {
+void weed_generator_end(weed_plant_t *inst) {
   // generator has stopped for one of the following reasons:
   // efect was de-inited; clip (bg/fg) was changed; playback stopped with fg
   lives_whentostop_t wts=mainw->whentostop;
@@ -6028,13 +6017,12 @@
     mainw->cancelled=CANCEL_GENERATOR_END;
     return;
   }
-  
+
   if (rte_window!=NULL) {
     // update real time effects window if we are showing it
     if (!is_bg) {
       rtew_set_keych(fg_generator_key,FALSE);
-    }
-    else {
+    } else {
       rtew_set_keych(bg_generator_key,FALSE);
     }
   }
@@ -6043,8 +6031,7 @@
     // update ce_thumbs window if we are showing it
     if (!is_bg) {
       ce_thumbs_set_keych(fg_generator_key,FALSE);
-    }
-    else {
+    } else {
       ce_thumbs_set_keych(bg_generator_key,FALSE);
     }
   }
@@ -6054,7 +6041,7 @@
     if (mainw->afbuffer_clients==0) {
       pthread_mutex_lock(&mainw->abuf_frame_mutex);
       free_audio_frame_buffer(mainw->audio_frame_buffer);
-      g_free(mainw->audio_frame_buffer);
+      lives_free(mainw->audio_frame_buffer);
       mainw->audio_frame_buffer=NULL;
       pthread_mutex_unlock(&mainw->abuf_frame_mutex);
     }
@@ -6070,8 +6057,7 @@
     pre_src_file=mainw->pre_src_file;
     mainw->pre_src_file=mainw->current_file;
     mainw->current_file=mainw->blend_file;
-  }
-  else {
+  } else {
     if (mainw->frame_layer!=NULL) check_layer_ready(mainw->frame_layer);
     filter_mutex_lock(fg_generator_key);
     key_to_instance[fg_generator_key][fg_generator_mode]=NULL;
@@ -6105,18 +6091,15 @@
     // close generator file and switch to original file if possible
     if (cfile==NULL||cfile->clip_type!=CLIP_TYPE_GENERATOR) {
       LIVES_WARN("Close non-generator file");
-    }
-    else {
+    } else {
       close_current_file(mainw->pre_src_file);
     }
     if (mainw->ce_thumbs&&mainw->active_sa_clips==SCREEN_AREA_BACKGROUND) ce_thumbs_update_current_clip();
-  }
-  else {
+  } else {
     // close generator file and switch to original file if possible
     if (cfile==NULL||cfile->clip_type!=CLIP_TYPE_GENERATOR) {
       LIVES_WARN("Close non-generator file");
-    }
-    else {
+    } else {
       close_current_file(mainw->pre_src_file);
     }
     if (mainw->current_file==current_file) mainw->clip_switched=clip_switched;
@@ -6133,7 +6116,7 @@
 }
 
 
-static weed_plant_t **weed_channels_create (weed_plant_t *filter, boolean in) {
+static weed_plant_t **weed_channels_create(weed_plant_t *filter, boolean in) {
   weed_plant_t **channels,**chantmpls;
   int num_channels;
   int i,j,error,pal;
@@ -6146,55 +6129,54 @@
   if (in) chantmpls=weed_get_plantptr_array(filter,"in_channel_templates",&error);
   else chantmpls=weed_get_plantptr_array(filter,"out_channel_templates",&error);
 
-  for (i=0;i<num_channels;i++) {
+  for (i=0; i<num_channels; i++) {
     if (weed_plant_has_leaf(chantmpls[i],"host_repeats")) ccount+=weed_get_int_value(chantmpls[i],"host_repeats",&error);
     else ccount+=1;
   }
 
-  channels=(weed_plant_t **)g_malloc((ccount+1)*sizeof(weed_plant_t *));
+  channels=(weed_plant_t **)lives_malloc((ccount+1)*sizeof(weed_plant_t *));
 
   ccount=0;
 
-  for (i=0;i<num_channels;i++) {
+  for (i=0; i<num_channels; i++) {
     if (weed_plant_has_leaf(chantmpls[i],"host_repeats")) num_repeats=weed_get_int_value(chantmpls[i],"host_repeats",&error);
     else num_repeats=1;
-    for (j=0;j<num_repeats;j++) {
+    for (j=0; j<num_repeats; j++) {
       channels[ccount]=weed_plant_new(WEED_PLANT_CHANNEL);
       weed_set_plantptr_value(channels[ccount],"template",chantmpls[i]);
 
       weed_set_voidptr_value(channels[ccount],"pixel_data",NULL);
 
       if (weed_plant_has_leaf(chantmpls[i],"current_palette")) {
-	// audio only channels dont have a "current_palette" !
-	weed_set_int_value(channels[ccount],"current_palette",
-			   (pal=weed_get_int_value(chantmpls[i],"current_palette",&error)));
-	
-	if (weed_palette_is_yuv_palette(pal)) {
-	  if (!(weed_plant_has_leaf(chantmpls[i],"YUV_subspace"))||
-	      weed_get_int_value(chantmpls[i],"YUV_subspace",&error)==WEED_YUV_SUBSPACE_YUV) {
-	    // set to default for LiVES
-	    weed_set_int_value(channels[ccount],"YUV_subspace",WEED_YUV_SUBSPACE_YCBCR);
-	  }
-	  else {
-	    weed_set_int_value(channels[ccount],"YUV_subspace",weed_get_int_value(chantmpls[i],"YUV_subspace",&error));
-	  }
-	}
+        // audio only channels dont have a "current_palette" !
+        weed_set_int_value(channels[ccount],"current_palette",
+                           (pal=weed_get_int_value(chantmpls[i],"current_palette",&error)));
+
+        if (weed_palette_is_yuv_palette(pal)) {
+          if (!(weed_plant_has_leaf(chantmpls[i],"YUV_subspace"))||
+              weed_get_int_value(chantmpls[i],"YUV_subspace",&error)==WEED_YUV_SUBSPACE_YUV) {
+            // set to default for LiVES
+            weed_set_int_value(channels[ccount],"YUV_subspace",WEED_YUV_SUBSPACE_YCBCR);
+          } else {
+            weed_set_int_value(channels[ccount],"YUV_subspace",weed_get_int_value(chantmpls[i],"YUV_subspace",&error));
+          }
+        }
       }
 
       if (weed_plant_has_leaf(chantmpls[i],"host_disabled")) {
-	weed_set_boolean_value(channels[ccount],"disabled", weed_get_boolean_value(chantmpls[i],"host_disabled",&error));
+        weed_set_boolean_value(channels[ccount],"disabled", weed_get_boolean_value(chantmpls[i],"host_disabled",&error));
       }
       weed_add_plant_flags(channels[ccount],WEED_LEAF_READONLY_PLUGIN);
       ccount++;
     }
   }
   channels[ccount]=NULL;
-  weed_free(chantmpls);
+  lives_free(chantmpls);
   return channels;
 }
 
 
-weed_plant_t **weed_params_create (weed_plant_t *filter, boolean in) {
+weed_plant_t **weed_params_create(weed_plant_t *filter, boolean in) {
   // return set of parameters with default/host_default values
   // in==TRUE create in parameters for filter
   // in==FALSE create out parameters for filter
@@ -6210,31 +6192,29 @@
   if (in) paramtmpls=weed_get_plantptr_array(filter,"in_parameter_templates",&error);
   else paramtmpls=weed_get_plantptr_array(filter,"out_parameter_templates",&error);
 
-  params=(weed_plant_t **)g_malloc((num_params+1)*sizeof(weed_plant_t *));
+  params=(weed_plant_t **)lives_malloc((num_params+1)*sizeof(weed_plant_t *));
 
-  for (i=0;i<num_params;i++) {
+  for (i=0; i<num_params; i++) {
     params[i]=weed_plant_new(WEED_PLANT_PARAMETER);
     weed_set_plantptr_value(params[i],"template",paramtmpls[i]);
     if (in) {
       if (weed_plant_has_leaf(paramtmpls[i],"host_default")) {
-	weed_leaf_copy(params[i],"value",paramtmpls[i],"host_default");
-      }
-      else weed_leaf_copy(params[i],"value",paramtmpls[i],"default");
+        weed_leaf_copy(params[i],"value",paramtmpls[i],"host_default");
+      } else weed_leaf_copy(params[i],"value",paramtmpls[i],"default");
       weed_add_plant_flags(params[i],WEED_LEAF_READONLY_PLUGIN);
-    }
-    else {
+    } else {
       weed_leaf_copy(params[i],"value",paramtmpls[i],"default");
     }
   }
   params[num_params]=NULL;
-  weed_free(paramtmpls);
+  lives_free(paramtmpls);
 
   return params;
 }
 
 
 
-static void set_default_channel_sizes (weed_plant_t **in_channels, weed_plant_t **out_channels) {
+static void set_default_channel_sizes(weed_plant_t **in_channels, weed_plant_t **out_channels) {
   // set some reasonable default channel sizes when we first init the effect
   weed_plant_t *channel,*chantmpl;
 
@@ -6252,9 +6232,9 @@
   // ignore filters with no in/out channels (e.g. data processors)
   if ((in_channels==NULL||in_channels[0]==NULL)&&(out_channels==NULL||out_channels[0]==NULL)) return;
 
-  for (i=0;in_channels!=NULL&&in_channels[i]!=NULL&&
-	 !(weed_plant_has_leaf(in_channels[i],"disabled")&&
-	   weed_get_boolean_value(in_channels[i],"disabled",&error)==WEED_TRUE);i++) {
+  for (i=0; in_channels!=NULL&&in_channels[i]!=NULL&&
+       !(weed_plant_has_leaf(in_channels[i],"disabled")&&
+         weed_get_boolean_value(in_channels[i],"disabled",&error)==WEED_TRUE); i++) {
     channel=in_channels[i];
     chantmpl=weed_get_plantptr_value(channel,"template",&error);
     if (!weed_plant_has_leaf(chantmpl,"is_audio")||weed_get_boolean_value(chantmpl,"is_audio",&error)==WEED_FALSE) {
@@ -6265,7 +6245,7 @@
       def_rowstride=width*3;
       // try to set channel size first
       set_channel_size(channel,320,240,1,&def_rowstride);
-      
+
       // create empty data for the palette and get the actual sizes
       create_empty_pixel_data(channel,FALSE,TRUE);
       width=weed_get_int_value(channel,"width",&error);
@@ -6273,17 +6253,15 @@
       numplanes=weed_leaf_num_elements(channel,"rowstrides");
       rowstrides=weed_get_int_array(channel,"rowstrides",&error);
       set_channel_size(channel,width,height,numplanes,rowstrides);
-      weed_free(rowstrides);
+      lives_free(rowstrides);
       weed_layer_pixel_data_free(channel);
-    }
-    else {
+    } else {
       if (mainw->current_file==-1) {
-	weed_set_int_value(channel,"audio_channels",DEFAULT_AUDIO_CHANS);
-	weed_set_int_value(channel,"audio_rate",DEFAULT_AUDIO_RATE);
-      }
-      else {
-	weed_set_int_value(channel,"audio_channels",cfile->achans);
-	weed_set_int_value(channel,"audio_rate",cfile->arate);
+        weed_set_int_value(channel,"audio_channels",DEFAULT_AUDIO_CHANS);
+        weed_set_int_value(channel,"audio_rate",DEFAULT_AUDIO_RATE);
+      } else {
+        weed_set_int_value(channel,"audio_channels",cfile->achans);
+        weed_set_int_value(channel,"audio_rate",cfile->arate);
       }
       weed_set_boolean_value(channel,"audio_interleaf",WEED_FALSE);
       weed_set_int_value(channel,"audio_data_length",0);
@@ -6293,7 +6271,7 @@
     }
   }
 
-  for (i=0;out_channels!=NULL&&out_channels[i]!=NULL;i++) {
+  for (i=0; out_channels!=NULL&&out_channels[i]!=NULL; i++) {
     channel=out_channels[i];
     chantmpl=weed_get_plantptr_value(channel,"template",&error);
     if (!weed_plant_has_leaf(chantmpl,"is_audio")||weed_get_boolean_value(chantmpl,"is_audio",&error)==WEED_FALSE) {
@@ -6312,18 +6290,16 @@
       numplanes=weed_leaf_num_elements(channel,"rowstrides");
       rowstrides=weed_get_int_array(channel,"rowstrides",&error);
       set_channel_size(channel,width,height,numplanes,rowstrides);
-      weed_free(rowstrides);
+      lives_free(rowstrides);
       weed_layer_pixel_data_free(channel);
 
-    }
-    else {
+    } else {
       if (mainw->current_file==-1||!has_aud_in_chans) {
-	weed_set_int_value(channel,"audio_channels",DEFAULT_AUDIO_CHANS);
-	weed_set_int_value(channel,"audio_rate",DEFAULT_AUDIO_RATE);
-      }
-      else {
-	weed_set_int_value(channel,"audio_channels",cfile->achans);
-	weed_set_int_value(channel,"audio_rate",cfile->arate);
+        weed_set_int_value(channel,"audio_channels",DEFAULT_AUDIO_CHANS);
+        weed_set_int_value(channel,"audio_rate",DEFAULT_AUDIO_RATE);
+      } else {
+        weed_set_int_value(channel,"audio_channels",cfile->achans);
+        weed_set_int_value(channel,"audio_rate",cfile->arate);
       }
       weed_set_boolean_value(channel,"audio_interleaf",WEED_FALSE);
       weed_set_int_value(channel,"audio_data_length",0);
@@ -6333,9 +6309,9 @@
 }
 
 
-static weed_plant_t *weed_create_instance (weed_plant_t *filter, weed_plant_t **inc, weed_plant_t **outc, 
-					   weed_plant_t **inp, weed_plant_t **outp) {
-  // here we create a new filter_instance from the ingredients: 
+static weed_plant_t *weed_create_instance(weed_plant_t *filter, weed_plant_t **inc, weed_plant_t **outc,
+    weed_plant_t **inp, weed_plant_t **outp) {
+  // here we create a new filter_instance from the ingredients:
   // filter_class, in_channels, out_channels, in_parameters, out_parameters
   weed_plant_t *inst=weed_plant_new(WEED_PLANT_FILTER_INSTANCE);
 
@@ -6350,7 +6326,7 @@
   if (inp!=NULL) weed_set_plantptr_array(inst,"in_parameters",weed_flagset_array_count(inp,TRUE),inp);
   if (outp!=NULL) {
     weed_set_plantptr_array(inst,"out_parameters",(n=weed_flagset_array_count(outp,TRUE)),outp);
-    for (i=0;i<n;i++) {
+    for (i=0; i<n; i++) {
       // allow plugins to set out_param "value"
       weed_leaf_set_flags(outp[i],"value",(weed_leaf_get_flags(outp[i],"value")|flags)^flags);
     }
@@ -6380,32 +6356,31 @@
 
   if (nptmpls!=0&&weed_get_plantptr_value(filter,"in_parameter_templates",&error)!=NULL) {
     in_ptmpls=weed_get_plantptr_array(filter,"in_parameter_templates",&error);
-    for (i=0;i<nptmpls;i++) {
+    for (i=0; i<nptmpls; i++) {
       if (weed_plant_has_leaf(in_ptmpls[i],"host_internal_connection")) {
-	xvals=weed_get_int_array(in_ptmpls[i],"host_internal_connection",&error);
-	
-	iparam=weed_inst_in_param(first_inst,i,FALSE,FALSE);
-	
-	if (xvals[0]>-1) {
-	  inst=first_inst;
-	  while (--xvals[0]>=0) inst=weed_get_plantptr_value(inst,"host_next_instance",&error);
-	  
-	  outp=weed_get_plantptr_array(inst,"out_parameters",&error);
-	  oparam=outp[xvals[1]];
-	  weed_free(outp);
-	}
-	else oparam=iparam; // just hide the parameter, but don't pull a value
-	
-	weed_set_plantptr_value(iparam,"host_internal_connection",oparam);
-
-	if (weed_plant_has_leaf(in_ptmpls[i],"host_internal_connection_autoscale")&&
-	    weed_get_boolean_value(in_ptmpls[i],"host_internal_connection_autoscale",&error)==WEED_TRUE)
-	  weed_set_boolean_value(iparam,"host_internal_connection_autoscale",WEED_TRUE);
-	
-	weed_free(xvals);
+        xvals=weed_get_int_array(in_ptmpls[i],"host_internal_connection",&error);
+
+        iparam=weed_inst_in_param(first_inst,i,FALSE,FALSE);
+
+        if (xvals[0]>-1) {
+          inst=first_inst;
+          while (--xvals[0]>=0) inst=weed_get_plantptr_value(inst,"host_next_instance",&error);
+
+          outp=weed_get_plantptr_array(inst,"out_parameters",&error);
+          oparam=outp[xvals[1]];
+          lives_free(outp);
+        } else oparam=iparam; // just hide the parameter, but don't pull a value
+
+        weed_set_plantptr_value(iparam,"host_internal_connection",oparam);
+
+        if (weed_plant_has_leaf(in_ptmpls[i],"host_internal_connection_autoscale")&&
+            weed_get_boolean_value(in_ptmpls[i],"host_internal_connection_autoscale",&error)==WEED_TRUE)
+          weed_set_boolean_value(iparam,"host_internal_connection_autoscale",WEED_TRUE);
+
+        lives_free(xvals);
       }
     }
-    weed_free(in_ptmpls);
+    lives_free(in_ptmpls);
   }
 }
 
@@ -6420,7 +6395,7 @@
 
   int *filters=NULL,*xvals;
 
-  gchar *key;
+  char *key;
 
   int nfilters,ninpar=0,error;
 
@@ -6434,32 +6409,32 @@
 
   inp=weed_params_create(filter,TRUE);
 
-  for (i=0;i<nfilters;i++) {
+  for (i=0; i<nfilters; i++) {
 
     if (filters!=NULL) {
       filter=weed_filters[filters[i]];
     }
 
     // create channels from channel_templates
-    inc=weed_channels_create (filter,TRUE);
-    outc=weed_channels_create (filter,FALSE);
+    inc=weed_channels_create(filter,TRUE);
+    outc=weed_channels_create(filter,FALSE);
+
+    set_default_channel_sizes(inc,outc);  // we set the initial channel sizes to some reasonable defaults
 
-    set_default_channel_sizes (inc,outc); // we set the initial channel sizes to some reasonable defaults
-    
     // create parameters from parameter_templates
     outp=weed_params_create(filter,FALSE);
-    
+
     if (nfilters==1) xinp=inp;
     else {
       // for a compound filter, assign only the params which belong to the instance
       ninpar=num_in_params(filter,FALSE,FALSE);
       if (ninpar==0) xinp=NULL;
       else {
-	xinp=(weed_plant_t **)g_malloc((ninpar+1)*sizeof(weed_plant_t *));
-	x=0;
-	for (j=poffset;j<poffset+ninpar;j++) xinp[x++]=inp[j];
-	xinp[x]=NULL;
-	poffset+=ninpar;
+        xinp=(weed_plant_t **)lives_malloc((ninpar+1)*sizeof(weed_plant_t *));
+        x=0;
+        for (j=poffset; j<poffset+ninpar; j++) xinp[x++]=inp[j];
+        xinp[x]=NULL;
+        poffset+=ninpar;
       }
     }
 
@@ -6469,27 +6444,26 @@
 
     if (i>0) {
       weed_set_plantptr_value(last_inst,"host_next_instance",inst);
-    }
-    else first_inst=inst;
+    } else first_inst=inst;
 
     last_inst=inst;
 
-    if (inc!=NULL) weed_free(inc);
-    if (outc!=NULL) weed_free(outc);
-    if (outp!=NULL) weed_free(outp);
-    if (xinp!=inp) weed_free(xinp);
+    if (inc!=NULL) lives_free(inc);
+    if (outc!=NULL) lives_free(outc);
+    if (outp!=NULL) lives_free(outp);
+    if (xinp!=inp) lives_free(xinp);
 
-    for (j=0;j<ninpar;j++) {
+    for (j=0; j<ninpar; j++) {
       // copy param values if that was set up
       set_copy_to(inst,j,TRUE);
     }
 
   }
 
-  if (inp!=NULL) weed_free(inp);
+  if (inp!=NULL) lives_free(inp);
 
   if (filters!=NULL) {
-    weed_free(filters);
+    lives_free(filters);
 
     // for compound fx, add param and channel connections
     filter=ofilter;
@@ -6499,36 +6473,35 @@
 
     while (1) {
       // add channel connections
-      key=g_strdup_printf("host_channel_connection%d",xcnumx++);
+      key=lives_strdup_printf("host_channel_connection%d",xcnumx++);
       if (weed_plant_has_leaf(filter,key)) {
-	xvals=weed_get_int_array(filter,key,&error);
+        xvals=weed_get_int_array(filter,key,&error);
 
-	inst=first_inst;
-	while (1) {
-	  if (xvals[0]--==0) {
-	    // got the out instance
-	    outc=weed_get_plantptr_array(inst,"out_channels",&error);
-	    ochan=outc[xvals[1]];
-	    weed_free(outc);
-	  }
-	  if (xvals[2]--==0) {
-	    // got the in instance
-	    inc=weed_get_plantptr_array(inst,"in_channels",&error);
-	    weed_set_plantptr_value(inc[xvals[3]],"host_internal_connection",ochan);
-	    weed_free(inc);
-	    break;
-	  }
+        inst=first_inst;
+        while (1) {
+          if (xvals[0]--==0) {
+            // got the out instance
+            outc=weed_get_plantptr_array(inst,"out_channels",&error);
+            ochan=outc[xvals[1]];
+            lives_free(outc);
+          }
+          if (xvals[2]--==0) {
+            // got the in instance
+            inc=weed_get_plantptr_array(inst,"in_channels",&error);
+            weed_set_plantptr_value(inc[xvals[3]],"host_internal_connection",ochan);
+            lives_free(inc);
+            break;
+          }
 
-	  inst=weed_get_plantptr_value(inst,"host_next_instance",&error);
-	}
+          inst=weed_get_plantptr_value(inst,"host_next_instance",&error);
+        }
 
-	weed_free(xvals);
-	g_free(key);
+        lives_free(xvals);
+        lives_free(key);
 
-      }
-      else {
-	g_free(key);
-	break;
+      } else {
+        lives_free(key);
+        break;
       }
 
     }
@@ -6558,6 +6531,8 @@
   int error;
   int idx;
 
+  mainw->error=FALSE;
+
   if (hotkey<0) {
     is_modeswitch=TRUE;
     hotkey=-hotkey-1;
@@ -6567,9 +6542,13 @@
     fg_modeswitch=TRUE;
   }
 
-  if (hotkey>=FX_KEYS_MAX) return FALSE;
+  if (hotkey>=FX_KEYS_MAX) {
+    mainw->error=TRUE;
+    return FALSE;
+  }
 
-  if (!rte_key_valid (hotkey+1,FALSE)) {
+  if (!rte_key_valid(hotkey+1,FALSE)) {
+    mainw->error=TRUE;
     return FALSE;
   }
 
@@ -6581,31 +6560,32 @@
   // check first if it is an audio generator
 
   if ((inc_count==0||(has_audio_chans_in(weed_filters[idx],FALSE)&&
-		      !has_video_chans_in(weed_filters[idx],TRUE)))&&
+                      !has_video_chans_in(weed_filters[idx],TRUE)))&&
       has_audio_chans_out(weed_filters[idx],FALSE)&&
       !has_video_chans_out(weed_filters[idx],TRUE)) {
 
-    if (prefs->audio_player!=AUD_PLAYER_JACK&&prefs->audio_player!=AUD_PLAYER_PULSE) {
+    if (!is_realtime_aplayer(prefs->audio_player)) {
       // audio fx only with realtime players
-      gchar *fxname=weed_filter_idx_get_name(idx);
-      gchar *msg=g_strdup_printf(_("Effect %s cannot be used with this audio player.\n"),fxname);
-      d_print(msg);
+      char *fxname=weed_filter_idx_get_name(idx);
+      d_print(_("Effect %s cannot be used with this audio player.\n"),fxname);
+      lives_free(fxname);
+      mainw->error=TRUE;
       return FALSE;
     }
 
 
     if (inc_count==0) {
       if (mainw->agen_key!=0) {
-	// we had an existing audio gen running - stop that one first
-	int agen_key=mainw->agen_key-1;
-	weed_deinit_effect(agen_key);
-
-	if ((mainw->rte&(GU641<<agen_key))) {
-	  // need to do this in case starting another audio gen caused us to come here
-	  mainw->rte^=(GU641<<agen_key);
-	  if (rte_window!=NULL) rtew_set_keych(agen_key,FALSE);
-	  if (mainw->ce_thumbs) ce_thumbs_set_keych(agen_key,FALSE);
-	}
+        // we had an existing audio gen running - stop that one first
+        int agen_key=mainw->agen_key-1;
+        weed_deinit_effect(agen_key);
+
+        if ((mainw->rte&(GU641<<agen_key))) {
+          // need to do this in case starting another audio gen caused us to come here
+          mainw->rte^=(GU641<<agen_key);
+          if (rte_window!=NULL) rtew_set_keych(agen_key,FALSE);
+          if (mainw->ce_thumbs) ce_thumbs_set_keych(agen_key,FALSE);
+        }
 
       }
       is_audio_gen=TRUE;
@@ -6627,18 +6607,20 @@
 
   if (mainw->current_file>0&&cfile->clip_type==CLIP_TYPE_GENERATOR&&
       (fg_modeswitch||(inc_count==0&&outc_count>0&&mainw->num_tr_applied==0))&&!is_audio_gen) {
-    if (mainw->noswitch||mainw->is_processing||mainw->preview) return FALSE; // stopping fg gen will cause clip to switch
+    if (mainw->noswitch||mainw->is_processing||mainw->preview) {
+      mainw->error=TRUE;
+      return FALSE; // stopping fg gen will cause clip to switch
+    }
     if (mainw->playing_file>-1&&mainw->whentostop==STOP_ON_VID_END&&inc_count!=0) {
       mainw->cancelled=CANCEL_GENERATOR_END;
-    }
-    else {
+    } else {
       if (inc_count==0&&mainw->whentostop==STOP_ON_VID_END) mainw->whentostop=NEVER_STOP;
-      weed_generator_end ((weed_plant_t *)cfile->ext_src);
+      weed_generator_end((weed_plant_t *)cfile->ext_src);
       fg_generator_key=fg_generator_clip=fg_generator_mode=-1;
       if (mainw->current_file>-1&&(cfile->achans==0||cfile->frames>0)) {
-	// in case we switched to bg clip, and bg clip was gen
-	// otherwise we will get killed in generator_start
-	mainw->current_file=-1;  
+        // in case we switched to bg clip, and bg clip was gen
+        // otherwise we will get killed in generator_start
+        mainw->current_file=-1;
       }
     }
   }
@@ -6652,8 +6634,7 @@
     if (mainw->num_tr_applied==1&&!is_modeswitch) {
       mainw->blend_file=mainw->current_file;
     }
-  }
-  else if (inc_count==0&&outc_count>0&&!is_audio_gen) {
+  } else if (inc_count==0&&outc_count>0&&!is_audio_gen) {
     // aha - a generator
     if (mainw->playing_file==-1) {
       // if we are not playing, we will postpone creating the instance
@@ -6662,9 +6643,10 @@
       fg_generator_key=hotkey;
       fg_generator_mode=key_modes[hotkey];
       gen_start=TRUE;
-    }
-    else if (!fg_modeswitch&&mainw->num_tr_applied==0&&(mainw->noswitch||mainw->is_processing||mainw->preview)) 
+    } else if (!fg_modeswitch&&mainw->num_tr_applied==0&&(mainw->noswitch||mainw->is_processing||mainw->preview))  {
+      mainw->error=TRUE;
       return FALSE;
+    }
   }
 
   filter=weed_filters[idx];
@@ -6672,9 +6654,9 @@
   // TODO - unblock template channel changes
 
   // if the param window is already open, use instance from there
-  if (fx_dialog[1]!=NULL&&GPOINTER_TO_INT(g_object_get_data(G_OBJECT(fx_dialog[1]),"key"))==hotkey&&
-      GPOINTER_TO_INT(g_object_get_data(G_OBJECT(fx_dialog[1]),"mode"))==key_modes[hotkey]) {
-    lives_rfx_t *rfx=(lives_rfx_t *)g_object_get_data(G_OBJECT(fx_dialog[1]),"rfx");
+  if (fx_dialog[1]!=NULL&&LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(fx_dialog[1]),"key"))==hotkey&&
+      LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(fx_dialog[1]),"mode"))==key_modes[hotkey]) {
+    lives_rfx_t *rfx=(lives_rfx_t *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(fx_dialog[1]),"rfx");
     new_instance=(weed_plant_t *)rfx->source;
 
     weed_instance_ref(new_instance);
@@ -6686,8 +6668,7 @@
       weed_instance_ref(inst);
     }
     redraw_pwindow(hotkey,key_modes[hotkey]);
-  }
-  else {
+  } else {
     new_instance=weed_instance_from_filter(filter);
     // if it is a key effect, set key defaults
     if (hotkey<FX_KEYS_MAX_VIRTUAL&&key_defaults[hotkey][key_modes[hotkey]]!=NULL) {
@@ -6717,63 +6698,66 @@
 
     inst=new_instance;
 
-  start1:
+start1:
 
     filter=weed_instance_get_filter(inst,FALSE);
 
     if (weed_plant_has_leaf(filter,"init_func")) {
       weed_init_f *init_func_ptr_ptr;
       weed_init_f init_func;
-      gchar *cwd=cd_to_plugin_dir(filter);
+      char *cwd=cd_to_plugin_dir(filter);
       weed_leaf_get(filter,"init_func",0,(void *)&init_func_ptr_ptr);
       init_func=init_func_ptr_ptr[0];
       set_param_gui_readwrite(inst);
       if (init_func!=NULL&&(error=(*init_func)(inst))!=WEED_NO_ERROR) {
-	int weed_error;
-	gchar *filter_name,*tmp;
-	filter=weed_filters[idx];
-	filter_name=weed_get_string_value(filter,"name",&weed_error);
-	set_param_gui_readonly(inst);
-	d_print ((tmp=g_strdup_printf (_ ("Failed to start instance %s, error code %d\n"),filter_name,error)));
-	g_free(tmp);
-	weed_free(filter_name);
-	filter_mutex_lock(hotkey);
-	key_to_instance[hotkey][key_modes[hotkey]]=NULL;
-	filter_mutex_unlock(hotkey);
-
-	inst=new_instance;
-
-      deinit2:
-
-	if (weed_plant_has_leaf(inst,"host_next_instance")) next_inst=weed_get_plantptr_value(inst,"host_next_instance",&error);
-	else next_inst=NULL;
-
-	weed_call_deinit_func(inst);
-	weed_instance_unref(inst);
-
-	if (next_inst!=NULL&&weed_get_boolean_value(next_inst,"host_inited",&error)==WEED_TRUE) {
-	  // handle compound fx
-	  inst=next_inst;
-	  goto deinit2;
-	}
-
-	if (is_trans) {
-	  mainw->num_tr_applied--;
-	  if (mainw->num_tr_applied==0) {
-	    if (mainw->ce_thumbs) ce_thumbs_liberate_clip_area_register(SCREEN_AREA_FOREGROUND);
-	    if (mainw->active_sa_clips==SCREEN_AREA_BACKGROUND) {
-	      mainw->active_sa_clips=SCREEN_AREA_FOREGROUND;
-	    }
-	  }
-	}
-	lives_chdir(cwd,FALSE);
-	g_free(cwd);
-	if (is_audio_gen) mainw->agen_needs_reinit=FALSE;
-	return FALSE;
+        int weed_error;
+        char *filter_name;
+        filter=weed_filters[idx];
+        filter_name=weed_get_string_value(filter,"name",&weed_error);
+        set_param_gui_readonly(inst);
+        d_print(_("Failed to start instance %s, error code %d\n"),filter_name,error);
+        lives_free(filter_name);
+        filter_mutex_lock(hotkey);
+        key_to_instance[hotkey][key_modes[hotkey]]=NULL;
+        filter_mutex_unlock(hotkey);
+
+        inst=new_instance;
+
+deinit2:
+
+        if (weed_plant_has_leaf(inst,"host_next_instance")) next_inst=weed_get_plantptr_value(inst,"host_next_instance",&error);
+        else next_inst=NULL;
+
+        weed_call_deinit_func(inst);
+        weed_instance_unref(inst);
+
+        if (next_inst!=NULL&&weed_get_boolean_value(next_inst,"host_inited",&error)==WEED_TRUE) {
+          // handle compound fx
+          inst=next_inst;
+          goto deinit2;
+        }
+
+        if (is_trans) {
+          // TODO: - do we need this ? is_trans is always FALSE !
+          mainw->num_tr_applied--;
+          if (mainw->num_tr_applied==0) {
+            if (mainw->ce_thumbs) ce_thumbs_liberate_clip_area_register(SCREEN_AREA_FOREGROUND);
+            if (mainw->active_sa_clips==SCREEN_AREA_BACKGROUND) {
+              mainw->active_sa_clips=SCREEN_AREA_FOREGROUND;
+            }
+          }
+        }
+
+
+        lives_chdir(cwd,FALSE);
+        lives_free(cwd);
+        if (is_audio_gen) mainw->agen_needs_reinit=FALSE;
+        mainw->error=TRUE;
+        return FALSE;
       }
       set_param_gui_readonly(inst);
       lives_chdir(cwd,FALSE);
-      g_free(cwd);
+      lives_free(cwd);
     }
 
     weed_set_boolean_value(inst,"host_inited",WEED_TRUE);
@@ -6794,8 +6778,7 @@
       // transition is on, make into bg clip
       bg_generator_key=hotkey;
       bg_generator_mode=key_modes[hotkey];
-    }
-    else {
+    } else {
       // no transition, make fg (or kb was grabbed for fg generator)
       fg_generator_key=hotkey;
       fg_generator_mode=key_modes[hotkey];
@@ -6810,24 +6793,23 @@
     if (!weed_generator_start(new_instance,hotkey)) {
       // TODO - be more descriptive with error
       int weed_error;
-      gchar *filter_name=weed_get_string_value(filter,"name",&weed_error),*tmp;
-      d_print ((tmp=g_strdup_printf (_ ("Unable to start generator %s\n"),filter_name)));
-      g_free(tmp);
-      weed_free(filter_name);
+      char *filter_name=weed_get_string_value(filter,"name",&weed_error);
+      d_print(_("Unable to start generator %s\n"),filter_name);
+      lives_free(filter_name);
       if (mainw->num_tr_applied&&mainw->current_file>-1) {
-	bg_gen_to_start=bg_generator_key=bg_generator_mode=-1;
-      }
-      else {
-	fg_generator_key=fg_generator_clip=fg_generator_mode=-1;
+        bg_gen_to_start=bg_generator_key=bg_generator_mode=-1;
+      } else {
+        fg_generator_key=fg_generator_clip=fg_generator_mode=-1;
       }
       if (fg_modeswitch) mainw->num_tr_applied=num_tr_applied;
       key_to_instance[hotkey][key_modes[hotkey]]=NULL;
 
       if (mainw->playing_file==-1) {
-	int current_file=mainw->current_file;
-	switch_to_file(mainw->current_file=0,current_file);
+        int current_file=mainw->current_file;
+        switch_to_file(mainw->current_file=0,current_file);
       }
 
+      mainw->error=TRUE;
       return FALSE;
     }
 
@@ -6844,13 +6826,13 @@
     if (bg_generator_key!=-1&&!fg_modeswitch) {
       mainw->rte|=(GU641<<bg_generator_key);
       if (hotkey<prefs->rte_keys_virtual) {
-	if (rte_window!=NULL) rtew_set_keych(bg_generator_key,TRUE);
-	if (mainw->ce_thumbs) ce_thumbs_set_keych(bg_generator_key,TRUE);
+        if (rte_window!=NULL) rtew_set_keych(bg_generator_key,TRUE);
+        if (mainw->ce_thumbs) ce_thumbs_set_keych(bg_generator_key,TRUE);
       }
     }
   }
 
-      
+
   if (rte_keys==hotkey) {
     mainw->rte_keys=rte_keys;
     mainw->blend_factor=weed_get_blend_factor(rte_keys);
@@ -6863,8 +6845,8 @@
     uint64_t rteval,new_rte;
     // place this synchronous with the preceding frame
     pthread_mutex_lock(&mainw->event_list_mutex);
-    event_list=append_filter_init_event (mainw->event_list,mainw->currticks,
-					 idx,-1,hotkey,new_instance);
+    event_list=append_filter_init_event(mainw->event_list,mainw->currticks,
+                                        idx,-1,hotkey,new_instance);
     if (mainw->event_list==NULL) mainw->event_list=event_list;
     init_events[hotkey]=get_last_event(mainw->event_list);
     ntracks=weed_leaf_num_elements(init_events[hotkey],"in_tracks");
@@ -6873,7 +6855,7 @@
     new_rte=GU641<<(hotkey);
     if (!(rteval&new_rte)) rteval|=new_rte;
     create_filter_map(rteval); // we create filter_map event_t * array with ordered effects
-    mainw->event_list=append_filter_map_event (mainw->event_list,mainw->currticks,filter_map);
+    mainw->event_list=append_filter_map_event(mainw->event_list,mainw->currticks,filter_map);
     pthread_mutex_unlock(&mainw->event_list_mutex);
   }
 
@@ -6885,55 +6867,55 @@
       if (mainw->whentostop==STOP_ON_AUD_END) mainw->whentostop=STOP_ON_VID_END;
       if (prefs->audio_player==AUD_PLAYER_JACK) {
 #ifdef ENABLE_JACK
-	if (mainw->jackd_read!=NULL&&mainw->jackd_read->in_use&&
-	    (mainw->jackd_read->playing_file==-1||mainw->jackd_read->playing_file==mainw->ascrap_file)) {
-	  // if playing external audio, switch over to internal for an audio gen
-	  mainw->jackd->audio_ticks=mainw->currticks;
-	  mainw->jackd->frames_written=0;
-
-	  // close the reader
-	  jack_rec_audio_end(!(prefs->perm_audio_reader&&prefs->audio_src==AUDIO_SRC_EXT),FALSE);
-	}
-	if (mainw->jackd!=NULL&&(mainw->jackd_read==NULL||!mainw->jackd_read->in_use)) {
-
-	  // enable writer
-	  mainw->jackd->in_use=TRUE;
-	}
+        if (mainw->jackd_read!=NULL&&mainw->jackd_read->in_use&&
+            (mainw->jackd_read->playing_file==-1||mainw->jackd_read->playing_file==mainw->ascrap_file)) {
+          // if playing external audio, switch over to internal for an audio gen
+          mainw->jackd->audio_ticks=mainw->currticks;
+          mainw->jackd->frames_written=0;
+
+          // close the reader
+          jack_rec_audio_end(!(prefs->perm_audio_reader&&prefs->audio_src==AUDIO_SRC_EXT),FALSE);
+        }
+        if (mainw->jackd!=NULL&&(mainw->jackd_read==NULL||!mainw->jackd_read->in_use)) {
+
+          // enable writer
+          mainw->jackd->in_use=TRUE;
+        }
 #endif
       }
       if (prefs->audio_player==AUD_PLAYER_PULSE) {
 #ifdef HAVE_PULSE_AUDIO
-	if (mainw->pulsed_read!=NULL&&mainw->pulsed_read->in_use&&
-	    (mainw->pulsed_read->playing_file==-1||mainw->pulsed_read->playing_file==mainw->ascrap_file)) {
-	  // if playing external audio, switch over to internal for an audio gen
-	  mainw->pulsed->audio_ticks=mainw->currticks;
-	  mainw->pulsed->frames_written=0;
-	  pulse_rec_audio_end(!(prefs->perm_audio_reader&&prefs->audio_src==AUDIO_SRC_EXT),FALSE);
-	}
-	if (mainw->pulsed!=NULL&&(mainw->pulsed_read==NULL||!mainw->pulsed_read->in_use)) {
-	  mainw->pulsed->in_use=TRUE;
-	}
+        if (mainw->pulsed_read!=NULL&&mainw->pulsed_read->in_use&&
+            (mainw->pulsed_read->playing_file==-1||mainw->pulsed_read->playing_file==mainw->ascrap_file)) {
+          // if playing external audio, switch over to internal for an audio gen
+          mainw->pulsed->audio_ticks=mainw->currticks;
+          mainw->pulsed->frames_written=0;
+          pulse_rec_audio_end(!(prefs->perm_audio_reader&&prefs->audio_src==AUDIO_SRC_EXT),FALSE);
+        }
+        if (mainw->pulsed!=NULL&&(mainw->pulsed_read==NULL||!mainw->pulsed_read->in_use)) {
+          mainw->pulsed->in_use=TRUE;
+        }
 #endif
       }
 
       if (mainw->playing_file>0&&mainw->record&&!mainw->record_paused&&!prefs->audio_src==AUDIO_SRC_EXT&&(prefs->rec_opts&REC_AUDIO)) {
-	// if recording audio, open ascrap file and add audio event
-	mainw->record=FALSE;
-	on_record_perf_activate(NULL,NULL);
-	mainw->record_starting=FALSE;
-	mainw->record=TRUE;
-	if (prefs->audio_player==AUD_PLAYER_PULSE) {
+        // if recording audio, open ascrap file and add audio event
+        mainw->record=FALSE;
+        on_record_perf_activate(NULL,NULL);
+        mainw->record_starting=FALSE;
+        mainw->record=TRUE;
+        if (prefs->audio_player==AUD_PLAYER_PULSE) {
 #ifdef HAVE_PULSE_AUDIO
-	  mainw->pulsed->audio_ticks=mainw->currticks;
-	  mainw->pulsed->frames_written=0;
+          mainw->pulsed->audio_ticks=mainw->currticks;
+          mainw->pulsed->frames_written=0;
 #endif
-	}
-	if (prefs->audio_player==AUD_PLAYER_JACK) {
+        }
+        if (prefs->audio_player==AUD_PLAYER_JACK) {
 #ifdef ENABLE_JACK
-	  mainw->jackd->audio_ticks=mainw->currticks;
-	  mainw->jackd->frames_written=0;
+          mainw->jackd->audio_ticks=mainw->currticks;
+          mainw->jackd->frames_written=0;
 #endif
-	}
+        }
 
       }
 
@@ -6958,12 +6940,12 @@
     init_func=init_func_ptr_ptr[0];
     update_host_info(inst);
     if (init_func!=NULL) {
-      gchar *cwd=cd_to_plugin_dir(filter);
+      char *cwd=cd_to_plugin_dir(filter);
       set_param_gui_readwrite(inst);
       error=(*init_func)(inst);
       set_param_gui_readonly(inst);
       lives_chdir(cwd,FALSE);
-      g_free(cwd);
+      lives_free(cwd);
     }
   }
   weed_set_boolean_value(inst,"host_inited",WEED_TRUE);
@@ -6982,10 +6964,10 @@
     weed_leaf_get(filter,"deinit_func",0,(void *)&deinit_func_ptr_ptr);
     deinit_func=deinit_func_ptr_ptr[0];
     if (deinit_func!=NULL) {
-      gchar *cwd=cd_to_plugin_dir(filter);
+      char *cwd=cd_to_plugin_dir(filter);
       error=(*deinit_func)(instance);
       lives_chdir(cwd,FALSE);
-      g_free(cwd);
+      lives_free(cwd);
     }
   }
   weed_set_boolean_value(instance,"host_inited",WEED_FALSE);
@@ -7030,9 +7012,8 @@
     // is (video) generator
     if (mainw->playing_file>-1&&mainw->whentostop==STOP_ON_VID_END&&(hotkey!=bg_generator_key)) {
       mainw->cancelled=CANCEL_GENERATOR_END;
-    }
-    else {
-      weed_generator_end (instance);
+    } else {
+      weed_generator_end(instance);
     }
     return;
   }
@@ -7051,41 +7032,40 @@
     if (mainw->playing_file>0&&prefs->audio_src==AUDIO_SRC_EXT) {
       if (prefs->audio_player==AUD_PLAYER_JACK) {
 #ifdef ENABLE_JACK
-	if (mainw->jackd_read==NULL||!mainw->jackd_read->in_use) {
-	  mainw->jackd->in_use=FALSE; // deactivate writer
-	  jack_rec_audio_to_clip(-1,0,(lives_rec_audio_type_t)0); //activate reader
-	  mainw->jackd_read->frames_written+=mainw->jackd->frames_written; // ensure time continues monotonically
-	  if (mainw->record) mainw->jackd->playing_file=mainw->ascrap_file; // if recording, continue to write to 
-	}
+        if (mainw->jackd_read==NULL||!mainw->jackd_read->in_use) {
+          mainw->jackd->in_use=FALSE; // deactivate writer
+          jack_rec_audio_to_clip(-1,0,(lives_rec_audio_type_t)0); //activate reader
+          mainw->jackd_read->frames_written+=mainw->jackd->frames_written; // ensure time continues monotonically
+          if (mainw->record) mainw->jackd->playing_file=mainw->ascrap_file; // if recording, continue to write to
+        }
 #endif
       }
       if (prefs->audio_player==AUD_PLAYER_PULSE) {
 #ifdef HAVE_PULSE_AUDIO
-	if (mainw->pulsed_read==NULL||!mainw->pulsed_read->in_use) {
-	  mainw->pulsed->in_use=FALSE; // deactivate writer
-	  pulse_rec_audio_to_clip(-1,0,(lives_rec_audio_type_t)0); //activate reader
-	  mainw->pulsed_read->frames_written+=mainw->pulsed->frames_written; // ensure time continues monotonically
-	  if (mainw->record) mainw->pulsed->playing_file=mainw->ascrap_file; // if recording, continue to write to 
+        if (mainw->pulsed_read==NULL||!mainw->pulsed_read->in_use) {
+          mainw->pulsed->in_use=FALSE; // deactivate writer
+          pulse_rec_audio_to_clip(-1,0,(lives_rec_audio_type_t)0); //activate reader
+          mainw->pulsed_read->frames_written+=mainw->pulsed->frames_written; // ensure time continues monotonically
+          if (mainw->record) mainw->pulsed->playing_file=mainw->ascrap_file; // if recording, continue to write to
         }
 #endif
       }
-    }
-    else if (mainw->playing_file>0) {
+    } else if (mainw->playing_file>0) {
       // for internal, continue where we should
-      if (prefs->audio_player==AUD_PLAYER_JACK||prefs->audio_player==AUD_PLAYER_PULSE) {
-	if (prefs->audio_opts&AUDIO_OPTS_FOLLOW_CLIPS) switch_audio_clip(mainw->playing_file,TRUE);
-	else switch_audio_clip(mainw->pre_src_audio_file,TRUE);
+      if (is_realtime_aplayer(prefs->audio_player)) {
+        if (prefs->audio_opts&AUDIO_OPTS_FOLLOW_CLIPS) switch_audio_clip(mainw->playing_file,TRUE);
+        else switch_audio_clip(mainw->pre_src_audio_file,TRUE);
       }
     }
   }
- 
+
   filter_mutex_lock(hotkey);
   key_to_instance[hotkey][key_modes[hotkey]]=NULL;
   filter_mutex_unlock(hotkey);
 
-  if (mainw->whentostop==STOP_ON_VID_END&&mainw->current_file>-1&&(cfile->frames==0
-								   ||(mainw->loop&&cfile->achans>0&&!mainw->is_rendering&&(mainw->audio_end/cfile->fps)
-								      <MAX (cfile->laudio_time,cfile->raudio_time)))) mainw->whentostop=STOP_ON_AUD_END;
+  if (mainw->whentostop==STOP_ON_VID_END&&mainw->current_file>-1&&
+      (cfile->frames==0||(mainw->loop&&cfile->achans>0&&!mainw->is_rendering&&(mainw->audio_end/cfile->fps)
+                          <MAX(cfile->laudio_time,cfile->raudio_time)))) mainw->whentostop=STOP_ON_AUD_END;
 
   if (num_in_chans==2) {
     was_transition=TRUE;
@@ -7093,18 +7073,18 @@
     if (mainw->num_tr_applied==0) {
       if (mainw->ce_thumbs) ce_thumbs_liberate_clip_area_register(SCREEN_AREA_FOREGROUND);
       if (mainw->active_sa_clips==SCREEN_AREA_BACKGROUND) {
-	mainw->active_sa_clips=SCREEN_AREA_FOREGROUND;
+        mainw->active_sa_clips=SCREEN_AREA_FOREGROUND;
       }
     }
   }
 
   inst=instance;
 
- deinit3:
+deinit3:
 
   if (weed_plant_has_leaf(inst,"host_next_instance")) next_inst=weed_get_plantptr_value(inst,"host_next_instance",&error);
   else next_inst=NULL;
-  
+
   weed_call_deinit_func(inst);
   weed_instance_unref(inst);
 
@@ -7116,8 +7096,8 @@
 
 
   // if the param window is already open, show any reinits now
-  if (fx_dialog[1]!=NULL&&GPOINTER_TO_INT(g_object_get_data(G_OBJECT(fx_dialog[1]),"key"))==hotkey&&
-      GPOINTER_TO_INT(g_object_get_data(G_OBJECT(fx_dialog[1]),"mode"))==key_modes[hotkey]) {
+  if (fx_dialog[1]!=NULL&&LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(fx_dialog[1]),"key"))==hotkey&&
+      LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(fx_dialog[1]),"mode"))==key_modes[hotkey]) {
     redraw_pwindow(hotkey,key_modes[hotkey]);
   }
 
@@ -7126,9 +7106,9 @@
     if (mainw->num_tr_applied<1) {
       if (bg_gen_to_start!=-1) bg_gen_to_start=-1;
       if (mainw->blend_file!=-1&&mainw->blend_file!=mainw->current_file&&mainw->files[mainw->blend_file]!=NULL&&
-	  mainw->files[mainw->blend_file]->clip_type==CLIP_TYPE_GENERATOR) {
-	// all transitions off, so end the bg generator
-	weed_generator_end ((weed_plant_t *)mainw->files[mainw->blend_file]->ext_src);
+          mainw->files[mainw->blend_file]->clip_type==CLIP_TYPE_GENERATOR) {
+        // all transitions off, so end the bg generator
+        weed_generator_end((weed_plant_t *)mainw->files[mainw->blend_file]->ext_src);
       }
       mainw->blend_file=-1;
     }
@@ -7138,28 +7118,28 @@
     uint64_t rteval,new_rte;
     // place this synchronous with the preceding frame
     pthread_mutex_lock(&mainw->event_list_mutex);
-    mainw->event_list=append_filter_deinit_event (mainw->event_list,mainw->currticks,init_events[hotkey],pchains[hotkey]);
+    mainw->event_list=append_filter_deinit_event(mainw->event_list,mainw->currticks,init_events[hotkey],pchains[hotkey]);
     init_events[hotkey]=NULL;
-    if (pchains[hotkey]!=NULL) g_free(pchains[hotkey]);
+    if (pchains[hotkey]!=NULL) lives_free(pchains[hotkey]);
     rteval=mainw->rte;
     new_rte=GU641<<(hotkey);
     if (rteval&new_rte) rteval^=new_rte;
     create_filter_map(rteval); // we create filter_map event_t * array with ordered effects
-    mainw->event_list=append_filter_map_event (mainw->event_list,mainw->currticks,filter_map);
+    mainw->event_list=append_filter_map_event(mainw->event_list,mainw->currticks,filter_map);
     pthread_mutex_unlock(&mainw->event_list_mutex);
   }
 }
 
 
-void deinit_render_effects (void) {
+void deinit_render_effects(void) {
   // during rendering/render preview, we use the "keys" FX_KEYS_MAX_VIRTUAL -> FX_KEYS_MAX
   // here we deinit all active ones, similar to weed_deinit_all, but we use higher keys
   register int i;
 
-  for (i=FX_KEYS_MAX_VIRTUAL;i<FX_KEYS_MAX;i++) {
+  for (i=FX_KEYS_MAX_VIRTUAL; i<FX_KEYS_MAX; i++) {
     if (key_to_instance[i][0]!=NULL) {
-      weed_deinit_effect (i);
-      if (mainw->multitrack!=NULL&&mainw->multitrack->is_rendering) g_free(pchains[i]);
+      weed_deinit_effect(i);
+      if (mainw->multitrack!=NULL&&mainw->multitrack->is_rendering) lives_free(pchains[i]);
     }
   }
 }
@@ -7180,19 +7160,19 @@
   }
 
   mainw->rte_keys=-1;
-  mainw->last_grabable_effect=-1;
+  mainw->last_grabbable_effect=-1;
 
-  for (i=0;i<FX_KEYS_MAX_VIRTUAL;i++) {
+  for (i=0; i<FX_KEYS_MAX_VIRTUAL; i++) {
     if (rte_key_valid(i+1,TRUE)) {
       if (rte_window!=NULL) rtew_set_keych(i,FALSE);
       if (mainw->ce_thumbs) ce_thumbs_set_keych(i,FALSE);
     }
     if ((mainw->rte&(GU641<<i))) {
       if ((instance=key_to_instance[i][key_modes[i]])!=NULL) {
-	if (shutdown||mainw->playing_file==-1||(enabled_in_channels(instance,FALSE)>0)) {
-	  weed_deinit_effect(i);
-	  mainw->rte^=(GU641<<i);
-	}
+        if (shutdown||mainw->playing_file==-1||(enabled_in_channels(instance,FALSE)>0)) {
+          weed_deinit_effect(i);
+          mainw->rte^=(GU641<<i);
+        }
       }
     }
   }
@@ -7205,7 +7185,7 @@
 // special handling for generators (sources)
 
 
-weed_plant_t *weed_layer_new_from_generator (weed_plant_t *inst, weed_timecode_t tc) {
+weed_plant_t *weed_layer_new_from_generator(weed_plant_t *inst, weed_timecode_t tc) {
   weed_plant_t *channel,**out_channels;
   weed_plant_t *filter;
   weed_plant_t *chantmpl;
@@ -7224,14 +7204,14 @@
 
   boolean did_thread=FALSE;
 
-  gchar *cwd;
+  char *cwd;
 
   if (inst==NULL) return NULL;
 
   if ((num_channels=weed_leaf_num_elements(inst,"out_channels"))==0) return NULL;
   out_channels=weed_get_plantptr_array(inst,"out_channels",&error);
   if ((channel=get_enabled_channel(inst,0,FALSE))==NULL) {
-    weed_free(out_channels);
+    lives_free(out_channels);
     return NULL;
   }
 
@@ -7249,18 +7229,18 @@
     int height=weed_get_int_value(channel,"height",&error);
     int *rowstrides=weed_get_int_array(channel,"rowstrides",&error);
     boolean contiguous=FALSE;
-    if (weed_plant_has_leaf(channel,"host_pixel_data_contiguous") && 
-	weed_get_boolean_value(channel,"host_pixel_data_contiguous",&error)==WEED_TRUE) contiguous=TRUE;
-    align(pixel_data,alignment,numplanes,height,rowstrides,&contiguous);
+    if (weed_plant_has_leaf(channel,"host_pixel_data_contiguous") &&
+        weed_get_boolean_value(channel,"host_pixel_data_contiguous",&error)==WEED_TRUE) contiguous=TRUE;
+    align(pixel_data,alignment,numplanes,height,rowstrides,(int *)&contiguous);
     weed_set_voidptr_array(channel,"pixel_data",numplanes,pixel_data);
-    weed_free(pixel_data);
-    weed_free(rowstrides);
+    lives_free(pixel_data);
+    lives_free(rowstrides);
     if (contiguous) weed_set_boolean_value(channel,"host_pixel_data_contiguous",WEED_TRUE);
-    else if (weed_plant_has_leaf(channel,"host_pixel_data_contiguous")) 
+    else if (weed_plant_has_leaf(channel,"host_pixel_data_contiguous"))
       weed_leaf_delete(channel,"host_pixel_data_contiguous");
   }
 
-  // if we have an optional audio channel, we can push audio to it 
+  // if we have an optional audio channel, we can push audio to it
   if ((achan=get_enabled_audio_channel(inst,0,TRUE))!=NULL) {
     if (mainw->audio_frame_buffer!=NULL&&mainw->audio_frame_buffer->samples_filled>0) {
       // lock the buffer, convert audio to format requested, and copy it to the audio channel data
@@ -7268,8 +7248,7 @@
       push_audio_to_channel(achan,mainw->audio_frame_buffer);
       free_audio_frame_buffer(mainw->audio_frame_buffer); // TODO: this needs reimplementing to handle the case where we have fg and bg gens
       pthread_mutex_unlock(&mainw->abuf_frame_mutex);
-    }
-    else {
+    } else {
       // no audio has been buffered
       weed_set_int_value(achan,"audio_data_length",0);
       weed_set_voidptr_value(achan,"audio_data",NULL);
@@ -7284,7 +7263,7 @@
   if (weed_plant_has_leaf(inst,"host_key")) key=weed_get_int_value(inst,"host_key",&error);
 
   // see if we can multithread
-  if ((prefs->nfx_threads=future_prefs->nfx_threads)>1 && weed_plant_has_leaf(filter,"flags")) 
+  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) {
@@ -7302,35 +7281,36 @@
     filter_mutex_unlock(key);
   }
 
-  weed_free(out_channels);
+  lives_free(out_channels);
 
   if (achan!=NULL) {
     void *abuf=weed_get_voidptr_value(achan,"audio_data",&error);
-    if (abuf!=NULL) g_free(abuf);
+    if (abuf!=NULL) lives_free(abuf);
   }
 
   lives_chdir(cwd,FALSE);
-  g_free(cwd);
+  lives_free(cwd);
 
   chantmpl=weed_get_plantptr_value(channel,"template",&error);
 
   if (weed_plant_has_leaf(chantmpl,"flags")) flags=weed_get_int_value(chantmpl,"flags",&error);
   else flags=0;
-  
+
   if (flags&WEED_CHANNEL_OUT_ALPHA_PREMULT) weed_set_int_value(channel,"flags",WEED_CHANNEL_ALPHA_PREMULT);
 
   return channel;
 }
 
 
-boolean weed_generator_start (weed_plant_t *inst, int key) {
+boolean weed_generator_start(weed_plant_t *inst, int key) {
+  // key here is zero based
   // make an "ephemeral clip"
 
   // cf. yuv4mpeg.c
   // start "playing" but receive frames from a plugin
 
   weed_plant_t **out_channels,*channel,*filter,*achan;
-  gchar *filter_name;
+  char *filter_name;
   int error,num_channels;
   int old_file=mainw->current_file,blend_file=mainw->blend_file;
   int palette;
@@ -7346,7 +7326,7 @@
       too_many_files();
       return FALSE;
     }
-    
+
     if (mainw->current_file>-1&&cfile!=NULL&&cfile->clip_type==CLIP_TYPE_GENERATOR&&mainw->num_tr_applied==0) {
       close_current_file(0);
       old_file=-1;
@@ -7387,17 +7367,17 @@
   if (new_file!=mainw->current_file) {
     mainw->current_file=new_file;
 
-    cfile=(lives_clip_t *)(g_malloc(sizeof(lives_clip_t)));
-    g_snprintf (cfile->handle,256,"ephemeral%d",mainw->current_file);
+    cfile=(lives_clip_t *)(lives_malloc(sizeof(lives_clip_t)));
+    lives_snprintf(cfile->handle,256,"ephemeral%d",mainw->current_file);
     create_cfile();
     cfile->clip_type=CLIP_TYPE_GENERATOR;
     get_next_free_file();
-    
+
     filter_name=weed_get_string_value(filter,"name",&error);
-    g_snprintf(cfile->type,40,"generator:%s",filter_name);
-    g_snprintf(cfile->file_name,PATH_MAX,"generator: %s",filter_name);
-    g_snprintf(cfile->name,256,"generator: %s",filter_name);
-    weed_free(filter_name);
+    lives_snprintf(cfile->type,40,"generator:%s",filter_name);
+    lives_snprintf(cfile->file_name,PATH_MAX,"generator: %s",filter_name);
+    lives_snprintf(cfile->name,256,"generator: %s",filter_name);
+    lives_free(filter_name);
     cfile->achans=0;
     cfile->asampsize=0;
 
@@ -7420,10 +7400,9 @@
     // if plugin sets "target_fps" for the instance we assume there is some special reason
     // and use that
     cfile->pb_fps=cfile->fps=weed_get_double_value(inst,"target_fps",&error);
-  }
-  else {
+  } else {
     if (weed_plant_has_leaf(filter,"host_fps")) cfile->pb_fps=cfile->fps=weed_get_double_value(filter,"host_fps",&error);
-    else if (weed_plant_has_leaf(filter,"target_fps")) 
+    else if (weed_plant_has_leaf(filter,"target_fps"))
       cfile->pb_fps=cfile->fps=weed_get_double_value(filter,"target_fps",&error);
     else {
       cfile->pb_fps=cfile->fps=prefs->default_fps;
@@ -7436,11 +7415,11 @@
   }
   out_channels=weed_get_plantptr_array(inst,"out_channels",&error);
   if ((channel=get_enabled_channel(inst,0,FALSE))==NULL) {
-    weed_free(out_channels);
+    lives_free(out_channels);
     close_current_file(mainw->pre_src_file);
     return FALSE;
   }
-  weed_free(out_channels);
+  lives_free(out_channels);
 
   cfile->hsize=weed_get_int_value(channel,"width",&error);
   cfile->vsize=weed_get_int_value(channel,"height",&error);
@@ -7477,11 +7456,10 @@
       mainw->play_start=1;
       mainw->play_end=INT_MAX;
       if (is_bg) {
-	mainw->blend_file=mainw->current_file;
-	if (old_file!=-1) mainw->current_file=old_file;
+        mainw->blend_file=mainw->current_file;
+        if (old_file!=-1) mainw->current_file=old_file;
       }
-    }
-    else {
+    } else {
       mainw->blend_file=mainw->current_file;
       mainw->current_file=old_file;
       mainw->play_start=cfile->start;
@@ -7492,11 +7470,11 @@
     new_rte=GU641<<key;
     if (!(mainw->rte&new_rte)) mainw->rte|=new_rte;
 
-    mainw->last_grabable_effect=key;
+    mainw->last_grabbable_effect=key;
     if (rte_window!=NULL) rtew_set_keych(key,TRUE);
     if (mainw->ce_thumbs) {
       ce_thumbs_set_keych(key,TRUE);
-      
+
       // if effect was auto (from ACTIVATE data connection), leave all param boxes
       // otherwise, remove any which are not "pinned"
       if (!mainw->fx_is_auto) ce_thumbs_add_param_box(key,!mainw->fx_is_auto);
@@ -7510,13 +7488,12 @@
     if (mainw->play_window!=NULL) {
       lives_widget_queue_draw(mainw->play_window);
     }
-  }
-  else {
+  } else {
     // already playing
 
     if (old_file!=-1&&mainw->files[old_file]!=NULL) {
-      if (mainw->files[old_file]->clip_type==CLIP_TYPE_DISK||mainw->files[old_file]->clip_type==CLIP_TYPE_FILE) 
-	mainw->pre_src_file=old_file;
+      if (mainw->files[old_file]->clip_type==CLIP_TYPE_DISK||mainw->files[old_file]->clip_type==CLIP_TYPE_FILE)
+        mainw->pre_src_file=old_file;
       mainw->current_file=old_file;
     }
 
@@ -7524,22 +7501,32 @@
       if (mainw->current_file==-1) mainw->current_file=new_file;
 
       if (new_file!=old_file) {
-	do_quick_switch (new_file);
-	if (mainw->files[mainw->new_blend_file]!=NULL) mainw->blend_file=mainw->new_blend_file;
-	if (!is_bg&&blend_file!=-1&&mainw->files[blend_file]!=NULL) mainw->blend_file=blend_file;
-	mainw->new_blend_file=-1;
-      }    
-      else {
-	lives_widget_show(mainw->playframe);
-	resize(1);
+        do_quick_switch(new_file);
+
+        // switch audio clip
+        if (is_realtime_aplayer(prefs->audio_player)&&(prefs->audio_opts&AUDIO_OPTS_FOLLOW_CLIPS)
+            &&!mainw->is_rendering&&(mainw->preview||!(mainw->agen_key!=0||prefs->audio_src==AUDIO_SRC_EXT))) {
+          switch_audio_clip(new_file,TRUE);
+        }
+
+        if (mainw->files[mainw->new_blend_file]!=NULL) mainw->blend_file=mainw->new_blend_file;
+        if (!is_bg&&blend_file!=-1&&mainw->files[blend_file]!=NULL) mainw->blend_file=blend_file;
+        mainw->new_blend_file=-1;
+      } else {
+        lives_widget_show(mainw->playframe);
+        resize(1);
       }
       //if (old_file==-1) mainw->whentostop=STOP_ON_VID_END;
-    }
-    else {
-      if (mainw->current_file==-1) mainw->current_file=new_file;
-      else mainw->blend_file=new_file;
-      if (mainw->ce_thumbs&&(mainw->active_sa_clips==SCREEN_AREA_BACKGROUND||mainw->active_sa_clips==SCREEN_AREA_FOREGROUND)) 
-	ce_thumbs_highlight_current_clip();
+    } else {
+      if (mainw->current_file==-1) {
+        mainw->current_file=new_file;
+        if (is_realtime_aplayer(prefs->audio_player)&&(prefs->audio_opts&AUDIO_OPTS_FOLLOW_CLIPS)
+            &&!mainw->is_rendering&&(mainw->preview||!(mainw->agen_key!=0||prefs->audio_src==AUDIO_SRC_EXT))) {
+          switch_audio_clip(new_file,TRUE);
+        }
+      } else mainw->blend_file=new_file;
+      if (mainw->ce_thumbs&&(mainw->active_sa_clips==SCREEN_AREA_BACKGROUND||mainw->active_sa_clips==SCREEN_AREA_FOREGROUND))
+        ce_thumbs_highlight_current_clip();
     }
 
     if (mainw->cancelled==CANCEL_GENERATOR_END) mainw->cancelled=CANCEL_NONE;
@@ -7551,22 +7538,22 @@
 
 
 
-void weed_bg_generator_end (weed_plant_t *inst) {
+void weed_bg_generator_end(weed_plant_t *inst) {
   // when we stop with a bg generator we want it to be restarted next time
   // i.e we will need a new clip for it
   int bg_gen_key=bg_generator_key;
-  weed_generator_end (inst);
+  weed_generator_end(inst);
   bg_gen_to_start=bg_gen_key;
 }
 
 
 
-boolean weed_playback_gen_start (void) {
+boolean weed_playback_gen_start(void) {
   // init generators on pb. We have to do this after audio startup
   weed_plant_t *inst=NULL,*filter;
   weed_plant_t *next_inst=NULL;
 
-  gchar *filter_name;
+  char *filter_name;
 
   int error=WEED_NO_ERROR;
   int weed_error;
@@ -7591,82 +7578,80 @@
       inst=key_to_instance[fg_gen_to_start][key_modes[fg_gen_to_start]];
       if (inst!=NULL) {
 
-      geninit1:
+geninit1:
+
+        filter=weed_instance_get_filter(inst,FALSE);
+        if (weed_plant_has_leaf(filter,"init_func")) {
+          weed_init_f *init_func_ptr_ptr;
+          weed_init_f init_func;
+          weed_leaf_get(filter,"init_func",0,(void *)&init_func_ptr_ptr);
+          init_func=init_func_ptr_ptr[0];
+          update_host_info(inst);
+          if (init_func!=NULL) {
+            char *cwd=cd_to_plugin_dir(filter);
+            set_param_gui_readwrite(inst);
+            error=(*init_func)(inst);
+            set_param_gui_readonly(inst);
+            lives_chdir(cwd,FALSE);
+            lives_free(cwd);
+          }
+        }
+
+
+        if (error!=WEED_NO_ERROR) {
+          inst=key_to_instance[fg_gen_to_start][key_modes[fg_gen_to_start]];
+          key_to_instance[fg_gen_to_start][key_modes[fg_gen_to_start]]=NULL;
+          if (inst!=NULL) {
+            filter=weed_instance_get_filter(inst,TRUE);
+            filter_name=weed_get_string_value(filter,"name",&weed_error);
+            d_print(_("Failed to start generator %s\n"),filter_name);
+            lives_free(filter_name);
+
+deinit4:
+
+            if (weed_plant_has_leaf(inst,"host_next_instance")) next_inst=weed_get_plantptr_value(inst,"host_next_instance",&error);
+            else next_inst=NULL;
+
+            weed_call_deinit_func(inst);
+            weed_instance_unref(inst);
+
+            if (next_inst!=NULL) {
+              // handle compound fx
+              inst=next_inst;
+              if (weed_get_boolean_value(inst,"host_inited",&error)==WEED_TRUE) goto deinit4;
+            }
+
+          }
+
+          fg_gen_to_start=-1;
+          cfile->ext_src=NULL;
+          mainw->osc_block=FALSE;
+          return FALSE;
+        }
 
-	filter=weed_instance_get_filter(inst,FALSE);
-	if (weed_plant_has_leaf(filter,"init_func")) {
-	  weed_init_f *init_func_ptr_ptr;
-	  weed_init_f init_func;
-	  weed_leaf_get(filter,"init_func",0,(void *)&init_func_ptr_ptr);
-	  init_func=init_func_ptr_ptr[0];
-	  update_host_info(inst);
-	  if (init_func!=NULL) {
-	    gchar *cwd=cd_to_plugin_dir(filter);
-	    set_param_gui_readwrite(inst);
-	    error=(*init_func)(inst);
-	    set_param_gui_readonly(inst);
-	    lives_chdir(cwd,FALSE);
-	    g_free(cwd);
-	  }
-	}
-
-
-	if (error!=WEED_NO_ERROR) {
-	  inst=key_to_instance[fg_gen_to_start][key_modes[fg_gen_to_start]];
-	  key_to_instance[fg_gen_to_start][key_modes[fg_gen_to_start]]=NULL;
-	  if (inst!=NULL) {
-	    gchar *tmp;
-	    filter=weed_instance_get_filter(inst,TRUE);
-	    filter_name=weed_get_string_value(filter,"name",&weed_error);
-	    d_print ((tmp=g_strdup_printf (_ ("Failed to start generator %s\n"),filter_name)));
-	    g_free(tmp);
-	    weed_free(filter_name);
-	    
-	  deinit4:
-	    
-	    if (weed_plant_has_leaf(inst,"host_next_instance")) next_inst=weed_get_plantptr_value(inst,"host_next_instance",&error);
-	    else next_inst=NULL;
-
-	    weed_call_deinit_func(inst);
-	    weed_instance_unref(inst);
-	    
-	    if (next_inst!=NULL) {
-	      // handle compound fx
-	      inst=next_inst;
-	      if (weed_get_boolean_value(inst,"host_inited",&error)==WEED_TRUE) goto deinit4;
-	    }
-	    
-	  }
-
-	  fg_gen_to_start=-1;
-	  cfile->ext_src=NULL;
-	  mainw->osc_block=FALSE;
-	  return FALSE;
-	}
-
-	weed_set_boolean_value(inst,"host_inited",WEED_TRUE);
-
-	if (weed_plant_has_leaf(inst,"host_next_instance")) {
-	  inst=weed_get_plantptr_value(inst,"host_next_instance",&error);
-	  goto geninit1;
-	}
-
-
-	// TODO
-	if (weed_plant_has_leaf(inst,"target_fps")) {
-	  int current_file=mainw->current_file;
-	  mainw->current_file=fg_generator_clip;
-	  cfile->fps=weed_get_double_value(inst,"target_fps",&error);
-	  set_main_title(cfile->file_name,0);
-	  lives_spin_button_set_value(LIVES_SPIN_BUTTON(mainw->spinbutton_pb_fps),cfile->fps);
-	  mainw->current_file=current_file;
-	}
-
-	mainw->clip_switched=TRUE;
-	
-	cfile->ext_src=inst;
+        weed_set_boolean_value(inst,"host_inited",WEED_TRUE);
+
+        if (weed_plant_has_leaf(inst,"host_next_instance")) {
+          inst=weed_get_plantptr_value(inst,"host_next_instance",&error);
+          goto geninit1;
+        }
+
+
+        // TODO
+        if (weed_plant_has_leaf(inst,"target_fps")) {
+          int current_file=mainw->current_file;
+          mainw->current_file=fg_generator_clip;
+          cfile->fps=weed_get_double_value(inst,"target_fps",&error);
+          set_main_title(cfile->file_name,0);
+          lives_spin_button_set_value(LIVES_SPIN_BUTTON(mainw->spinbutton_pb_fps),cfile->fps);
+          mainw->current_file=current_file;
+        }
+
+        mainw->clip_switched=TRUE;
+
+        cfile->ext_src=inst;
       }
-      
+
       fg_gen_to_start=-1;
     }
   }
@@ -7678,75 +7663,72 @@
     // check is still gen
     if (enabled_in_channels(weed_filters[key_to_fx[bg_gen_to_start][key_modes[bg_gen_to_start]]],FALSE)==0) {
       if (key_to_instance[bg_gen_to_start][key_modes[bg_gen_to_start]]==NULL) {
-	// restart bg generator
-	if (!weed_init_effect(bg_gen_to_start)) return TRUE;
-	was_started=TRUE;
+        // restart bg generator
+        if (!weed_init_effect(bg_gen_to_start)) return TRUE;
+        was_started=TRUE;
       }
       inst=key_to_instance[bgs][key_modes[bgs]];
-      
+
       if (inst==NULL) {
-	// 2nd playback
-	int playing_file=mainw->playing_file;
-	mainw->playing_file=-100; //kludge to stop playing a second time
-	if (!weed_init_effect (bg_gen_to_start)) {
-	  error++;
-	}
-	mainw->playing_file=playing_file;
-	inst=key_to_instance[bg_gen_to_start][key_modes[bg_gen_to_start]];
+        // 2nd playback
+        int playing_file=mainw->playing_file;
+        mainw->playing_file=-100; //kludge to stop playing a second time
+        if (!weed_init_effect(bg_gen_to_start)) {
+          error++;
+        }
+        mainw->playing_file=playing_file;
+        inst=key_to_instance[bg_gen_to_start][key_modes[bg_gen_to_start]];
+      } else {
+        if (!was_started) {
+
+genstart2:
+
+          weed_call_init_func(inst);
+
+          // handle compound fx
+          if (weed_plant_has_leaf(inst,"host_next_instance")) {
+            inst=weed_get_plantptr_value(inst,"host_next_instance",&error);
+            goto genstart2;
+          }
+          inst=key_to_instance[bgs][key_modes[bgs]];
+        }
       }
-      else {
-	if (!was_started) {
-
-	genstart2:
-
-	  weed_call_init_func(inst);
 
-	  // handle compound fx
-	  if (weed_plant_has_leaf(inst,"host_next_instance")) {
-	    inst=weed_get_plantptr_value(inst,"host_next_instance",&error);
-	    goto genstart2;
-	  }
-	  inst=key_to_instance[bgs][key_modes[bgs]];
-	}
-      }
-      
       if (error!=WEED_NO_ERROR) {
-	if (inst!=NULL) {
-	  gchar *tmp;
-	  filter=weed_instance_get_filter(inst,TRUE);
-	  filter_name=weed_get_string_value(filter,"name",&weed_error);
-	  d_print ((tmp=g_strdup_printf (_ ("Failed to start generator %s, error %d\n"),filter_name,error)));
-	  g_free(tmp);
-	  weed_free(filter_name);
-
-	deinit5:
-
-	  if (weed_plant_has_leaf(inst,"host_next_instance")) next_inst=weed_get_plantptr_value(inst,"host_next_instance",&error);
-	  else next_inst=NULL;
-
-	  weed_call_deinit_func(inst);
-	  weed_instance_unref(inst);
-
-	  if (next_inst!=NULL) {
-	    // handle compound fx
-	    inst=next_inst;
-	    goto deinit5;
-	  }
-
-	}
-	key_to_instance[bg_gen_to_start][key_modes[bg_gen_to_start]]=NULL;
-	bg_gen_to_start=-1;
-	mainw->blend_file=-1;
-	if (mainw->rte&(GU641<<ABS(bg_gen_to_start))) mainw->rte^=(GU641<<ABS(bg_gen_to_start));
-	mainw->osc_block=FALSE;
-	return FALSE;
+        if (inst!=NULL) {
+          filter=weed_instance_get_filter(inst,TRUE);
+          filter_name=weed_get_string_value(filter,"name",&weed_error);
+          d_print(_("Failed to start generator %s, error %d\n"),filter_name,error);
+          lives_free(filter_name);
+
+deinit5:
+
+          if (weed_plant_has_leaf(inst,"host_next_instance")) next_inst=weed_get_plantptr_value(inst,"host_next_instance",&error);
+          else next_inst=NULL;
+
+          weed_call_deinit_func(inst);
+          weed_instance_unref(inst);
+
+          if (next_inst!=NULL) {
+            // handle compound fx
+            inst=next_inst;
+            goto deinit5;
+          }
+
+        }
+        key_to_instance[bg_gen_to_start][key_modes[bg_gen_to_start]]=NULL;
+        bg_gen_to_start=-1;
+        mainw->blend_file=-1;
+        if (mainw->rte&(GU641<<ABS(bg_gen_to_start))) mainw->rte^=(GU641<<ABS(bg_gen_to_start));
+        mainw->osc_block=FALSE;
+        return FALSE;
       }
       mainw->files[mainw->blend_file]->ext_src=inst;
     }
     bg_gen_to_start=-1;
   }
 
- setgui1:
+setgui1:
 
   if (inst!=NULL) set_param_gui_readonly(inst);
 
@@ -7760,7 +7742,7 @@
 
   return TRUE;
 }
- 
+
 //////////////////////////////////////////////////////////////////////////////
 // weed parameter functions
 
@@ -7777,7 +7759,7 @@
   if (WEED_PLANT_IS_FILTER_INSTANCE(plant)) filter=weed_instance_get_filter(plant,TRUE);
   else filter=plant;
 
-  if (weed_plant_has_leaf(filter,"in_parameter_templates")) 
+  if (weed_plant_has_leaf(filter,"in_parameter_templates"))
     num_params=weed_leaf_num_elements(filter,"in_parameter_templates");
 
   if (num_params==0) return TRUE;
@@ -7791,36 +7773,41 @@
 
   if (gui!=NULL&&weed_plant_has_leaf(gui,"hidden")&&
       weed_get_boolean_value(gui,"hidden",&error)==WEED_TRUE) {
-    weed_free(wtmpls);
+    lives_free(wtmpls);
     return TRUE;
   }
   if (!(flags&WEED_PARAMETER_REINIT_ON_VALUE_CHANGE)
       &&(gui==NULL||(!weed_plant_has_leaf(gui,"hidden")
-		     ||weed_get_boolean_value(gui,"hidden",&error)==WEED_FALSE))) {
+                     ||weed_get_boolean_value(gui,"hidden",&error)==WEED_FALSE))) {
     if (gui!=NULL) {
       if (weed_plant_has_leaf(gui,"copy_value_to")) {
-	int copyto=weed_get_int_value(gui,"copy_value_to",&error);
-	int flags2=0,param_hint,param_hint2;
-	weed_plant_t *wtmpl2;
-	if (copyto==i||copyto<0) copyto=-1;
-	if (copyto>-1) {
-	  visible=FALSE;
-	  wtmpl2=wtmpls[copyto];
-	  if (weed_plant_has_leaf(wtmpl2,"flags")) flags2=weed_get_int_value(wtmpl2,"flags",&error);
-	  param_hint=weed_get_int_value(wtmpl,"hint",&error);
-	  param_hint2=weed_get_int_value(wtmpl2,"hint",&error);
-	  if (param_hint==param_hint2
-	      &&((flags2&WEED_PARAMETER_VARIABLE_ELEMENTS)
-		 ||(flags&WEED_PARAMETER_ELEMENT_PER_CHANNEL&&flags2&WEED_PARAMETER_ELEMENT_PER_CHANNEL)
-		 ||weed_leaf_num_elements(wtmpl,"default")==weed_leaf_num_elements(wtmpl2,"default"))) {
-	    if (!(flags2&WEED_PARAMETER_REINIT_ON_VALUE_CHANGE)) {
-	      visible=TRUE;
-	    }}}}}}
+        int copyto=weed_get_int_value(gui,"copy_value_to",&error);
+        int flags2=0,param_hint,param_hint2;
+        weed_plant_t *wtmpl2;
+        if (copyto==i||copyto<0) copyto=-1;
+        if (copyto>-1) {
+          visible=FALSE;
+          wtmpl2=wtmpls[copyto];
+          if (weed_plant_has_leaf(wtmpl2,"flags")) flags2=weed_get_int_value(wtmpl2,"flags",&error);
+          param_hint=weed_get_int_value(wtmpl,"hint",&error);
+          param_hint2=weed_get_int_value(wtmpl2,"hint",&error);
+          if (param_hint==param_hint2
+              &&((flags2&WEED_PARAMETER_VARIABLE_ELEMENTS)
+                 ||(flags&WEED_PARAMETER_ELEMENT_PER_CHANNEL&&flags2&WEED_PARAMETER_ELEMENT_PER_CHANNEL)
+                 ||weed_leaf_num_elements(wtmpl,"default")==weed_leaf_num_elements(wtmpl2,"default"))) {
+            if (!(flags2&WEED_PARAMETER_REINIT_ON_VALUE_CHANGE)) {
+              visible=TRUE;
+            }
+          }
+        }
+      }
+    }
+  }
 
   // internally connected parameters for compound fx
   if (weed_plant_has_leaf(wtmpl,"host_internal_connection")) visible=FALSE;
 
-  weed_free(wtmpls);
+  lives_free(wtmpls);
   return !visible;
 }
 
@@ -7833,16 +7820,16 @@
 
   num_params=weed_leaf_num_elements(filter,"in_parameter_templates");
   in_ptmpls=weed_get_plantptr_array(filter,"in_parameter_templates",&error);
-  for (i=0;i<num_params;i++) {
+  for (i=0; i<num_params; i++) {
     if (skip_internal&&weed_plant_has_leaf(in_ptmpls[i],"host_internal_connection")) continue;
     if (weed_plant_has_leaf(in_ptmpls[i],"transition")&&
-	weed_get_boolean_value(in_ptmpls[i],"transition",&error)==WEED_TRUE) {
-      weed_free(in_ptmpls);
+        weed_get_boolean_value(in_ptmpls[i],"transition",&error)==WEED_TRUE) {
+      lives_free(in_ptmpls);
       return count;
     }
     count++;
   }
-  weed_free(in_ptmpls);
+  lives_free(in_ptmpls);
   return -1;
 }
 
@@ -7855,16 +7842,16 @@
 
   num_params=weed_leaf_num_elements(filter,"in_parameter_templates");
   in_ptmpls=weed_get_plantptr_array(filter,"in_parameter_templates",&error);
-  for (i=0;i<num_params;i++) {
+  for (i=0; i<num_params; i++) {
     if (skip_internal&&weed_plant_has_leaf(in_ptmpls[i],"host_internal_connection")) continue;
     if (weed_plant_has_leaf(in_ptmpls[i],"is_volume_master")&&
-	weed_get_boolean_value(in_ptmpls[i],"is_volume_master",&error)==WEED_TRUE) {
-      weed_free(in_ptmpls);
+        weed_get_boolean_value(in_ptmpls[i],"is_volume_master",&error)==WEED_TRUE) {
+      lives_free(in_ptmpls);
       return count;
     }
     count++;
   }
-  weed_free(in_ptmpls);
+  lives_free(in_ptmpls);
   return -1;
 }
 
@@ -7894,14 +7881,14 @@
 
   ptmpls=weed_get_plantptr_array(filter,"in_parameter_templates",&error);
 
-  for (i=0;i<nptmpl;i++) {
+  for (i=0; i<nptmpl; i++) {
     if (is_perchannel_multiw(ptmpls[i])) {
-      weed_free(ptmpls);
+      lives_free(ptmpls);
       return TRUE;
     }
   }
 
-  weed_free(ptmpls);
+  lives_free(ptmpls);
   return FALSE;
 }
 
@@ -7909,7 +7896,7 @@
 
 
 
-weed_plant_t *weed_inst_in_param (weed_plant_t *inst, int param_num, boolean skip_hidden, boolean skip_internal) {
+weed_plant_t *weed_inst_in_param(weed_plant_t *inst, int param_num, boolean skip_hidden, boolean skip_internal) {
   weed_plant_t **in_params;
   weed_plant_t *param;
   int error,num_params;
@@ -7922,10 +7909,10 @@
 
     if (!skip_hidden&&!skip_internal) {
       if (num_params>param_num) {
-	in_params=weed_get_plantptr_array(inst,"in_parameters",&error);
-	param=in_params[param_num];
-	weed_free(in_params);
-	return param;
+        in_params=weed_get_plantptr_array(inst,"in_parameters",&error);
+        param=in_params[param_num];
+        lives_free(in_params);
+        return param;
       }
       param_num-=num_params;
     }
@@ -7936,21 +7923,21 @@
 
       in_params=weed_get_plantptr_array(inst,"in_parameters",&error);
 
-      for (i=0;i<num_params;i++) {
-	param=in_params[i];
-	if ((!skip_hidden||!is_hidden_param(inst,i))&&(!skip_internal||!weed_plant_has_leaf(param,"host_internal_connection"))) {
-	  if (count==param_num) {
-	    weed_free(in_params);
-	    return param;
-	  }
-	  count++;
-	}
+      for (i=0; i<num_params; i++) {
+        param=in_params[i];
+        if ((!skip_hidden||!is_hidden_param(inst,i))&&(!skip_internal||!weed_plant_has_leaf(param,"host_internal_connection"))) {
+          if (count==param_num) {
+            lives_free(in_params);
+            return param;
+          }
+          count++;
+        }
       }
       param_num-=count;
-      weed_free(in_params);
+      lives_free(in_params);
     }
 
-   } while (weed_plant_has_leaf(inst,"host_next_instance")&&(inst=weed_get_plantptr_value(inst,"host_next_instance",&error))!=NULL);
+  } while (weed_plant_has_leaf(inst,"host_next_instance")&&(inst=weed_get_plantptr_value(inst,"host_next_instance",&error))!=NULL);
 
   return NULL;
 }
@@ -7959,7 +7946,7 @@
 
 
 
-weed_plant_t *weed_inst_out_param (weed_plant_t *inst, int param_num) {
+weed_plant_t *weed_inst_out_param(weed_plant_t *inst, int param_num) {
   weed_plant_t **out_params;
   weed_plant_t *param;
   int error,num_params;
@@ -7972,11 +7959,11 @@
     if (num_params>param_num) {
       out_params=weed_get_plantptr_array(inst,"out_parameters",&error);
       param=out_params[param_num];
-      weed_free(out_params);
+      lives_free(out_params);
       return param;
     }
     param_num-=num_params;
-   } while (weed_plant_has_leaf(inst,"host_next_instance")&&(inst=weed_get_plantptr_value(inst,"host_next_instance",&error))!=NULL);
+  } while (weed_plant_has_leaf(inst,"host_next_instance")&&(inst=weed_get_plantptr_value(inst,"host_next_instance",&error))!=NULL);
 
   return NULL;
 }
@@ -7984,7 +7971,7 @@
 
 
 
-weed_plant_t *weed_filter_in_paramtmpl (weed_plant_t *filter, int param_num, boolean skip_internal) {
+weed_plant_t *weed_filter_in_paramtmpl(weed_plant_t *filter, int param_num, boolean skip_internal) {
   weed_plant_t **in_params;
   weed_plant_t *ptmpl;
   int error,num_params;
@@ -7993,7 +7980,7 @@
   register int i;
 
   if (!weed_plant_has_leaf(filter,"in_parameter_templates")) return NULL; // has no in_parameters
-  
+
   num_params=weed_leaf_num_elements(filter,"in_parameter_templates");
 
   if (num_params<=param_num) return NULL; // invalid parameter number
@@ -8002,15 +7989,15 @@
 
   if (!skip_internal) {
     ptmpl=in_params[param_num];
-    weed_free(in_params);
+    lives_free(in_params);
     return ptmpl;
   }
-  
-  for (i=0;i<num_params;i++) {
+
+  for (i=0; i<num_params; i++) {
     ptmpl=in_params[i];
     if (!weed_plant_has_leaf(ptmpl,"host_internal_connection")) {
       if (count==param_num) {
-	return ptmpl;
+        return ptmpl;
       }
       count++;
     }
@@ -8021,13 +8008,13 @@
 
 
 
-weed_plant_t *weed_filter_out_paramtmpl (weed_plant_t *filter, int param_num) {
+weed_plant_t *weed_filter_out_paramtmpl(weed_plant_t *filter, int param_num) {
   weed_plant_t **out_params;
   weed_plant_t *ptmpl;
   int error,num_params;
 
   if (!weed_plant_has_leaf(filter,"out_parameter_templates")) return NULL; // has no out_parameters
-  
+
   num_params=weed_leaf_num_elements(filter,"out_parameter_templates");
 
   if (num_params<=param_num) return NULL; // invalid parameter number
@@ -8035,7 +8022,7 @@
   out_params=weed_get_plantptr_array(filter,"out_parameter_templates",&error);
 
   ptmpl=out_params[param_num];
-  weed_free(out_params);
+  lives_free(out_params);
   return ptmpl;
 }
 
@@ -8060,7 +8047,7 @@
   in_ptmpls=weed_get_plantptr_array(plant,"in_parameter_templates",&error);
   nparams=weed_leaf_num_elements(plant,"in_parameter_templates");
 
-  for (i=0;i<nparams;i++) {
+  for (i=0; i<nparams; i++) {
     gui=NULL;
     tparamtmpl=in_ptmpls[i];
     if (weed_plant_has_leaf(tparamtmpl,"gui")) gui=weed_get_plantptr_value(tparamtmpl,"gui",&error);
@@ -8073,15 +8060,15 @@
     flags=weed_get_int_value(tparamtmpl,"flags",&error);
 
     if ((hint==WEED_HINT_INTEGER||hint==WEED_HINT_FLOAT)&&flags==0&&weed_leaf_num_elements(tparamtmpl,"default")==1&&
-	!is_hidden_param(plant,i)) {
+        !is_hidden_param(plant,i)) {
       if (pnum==0) {
-	weed_free(in_ptmpls);
-	return i;
+        lives_free(in_ptmpls);
+        return i;
       }
       pnum--;
     }
   }
-  weed_free(in_ptmpls);
+  lives_free(in_ptmpls);
   return -1;
 }
 
@@ -8100,30 +8087,30 @@
   in_ptmpls=weed_get_plantptr_array(plant,"in_parameter_templates",&error);
   nparams=weed_leaf_num_elements(plant,"in_parameter_templates");
 
-  for (i=0;i<nparams;i++) {
+  for (i=0; i<nparams; i++) {
     tparamtmpl=in_ptmpls[i];
     hint=weed_get_int_value(tparamtmpl,"hint",&error);
     flags=weed_get_int_value(tparamtmpl,"flags",&error);
     if ((hint==WEED_HINT_INTEGER||hint==WEED_HINT_FLOAT)&&flags==0&&weed_leaf_num_elements(tparamtmpl,"default")==1&&
-	!is_hidden_param(plant,i)) {
+        !is_hidden_param(plant,i)) {
       count++;
     }
   }
-  weed_free(in_ptmpls);
+  lives_free(in_ptmpls);
   return count;
 }
 
 
 
-gchar *get_weed_display_string (weed_plant_t *inst, int pnum) {
+char *get_weed_display_string(weed_plant_t *inst, int pnum) {
   // TODO - for setting defaults, we will need to create params
-  gchar *disp_string;
+  char *disp_string;
   weed_plant_t *param=weed_inst_in_param(inst,pnum,FALSE,FALSE);
   weed_plant_t *ptmpl,*gui,*filter;
   int error;
   weed_display_f *display_func_ptr;
   weed_display_f display_func;
-  gchar *cwd;
+  char *cwd;
 
   if (param==NULL) return NULL;
 
@@ -8136,12 +8123,12 @@
   display_func=(weed_display_f)*display_func_ptr;
 
   weed_leaf_set_flags(gui,"display_value",(weed_leaf_get_flags(gui,"display_value")|
-					   WEED_LEAF_READONLY_PLUGIN)^WEED_LEAF_READONLY_PLUGIN);
+                      WEED_LEAF_READONLY_PLUGIN)^WEED_LEAF_READONLY_PLUGIN);
   filter=weed_instance_get_filter(inst,FALSE);
   cwd=cd_to_plugin_dir(filter);
   (*display_func)(param);
   lives_chdir(cwd,FALSE);
-  g_free(cwd);
+  lives_free(cwd);
   weed_leaf_set_flags(gui,"display_value",(weed_leaf_get_flags(gui,"display_value")|WEED_LEAF_READONLY_PLUGIN));
 
   if (!weed_plant_has_leaf(gui,"display_value")) return NULL;
@@ -8160,7 +8147,7 @@
   int copyto;
 
   weed_plant_t **in_params;
-  
+
   weed_plant_t *gui=NULL;
   weed_plant_t *in_param=weed_inst_in_param(inst,pnum,FALSE,FALSE); // use this here in case of compound fx
   weed_plant_t *paramtmpl=weed_get_plantptr_value(in_param,"template",&error);
@@ -8174,7 +8161,7 @@
     int param_hint2,flags2=0;
     int param_hint=weed_get_int_value(paramtmpl,"hint",&error);
     int nparams=weed_leaf_num_elements(inst,"in_parameters");
-    
+
     copyto=weed_get_int_value(gui,"copy_value_to",&error);
     if (copyto==pnum||copyto<0||copyto>=nparams) return -1;
 
@@ -8186,11 +8173,11 @@
     if (weed_plant_has_leaf(paramtmpl2,"flags")) flags2=weed_get_int_value(paramtmpl2,"flags",&error);
     param_hint2=weed_get_int_value(paramtmpl2,"hint",&error);
     if (param_hint==param_hint2&&((flags2&WEED_PARAMETER_VARIABLE_ELEMENTS)||
-				  weed_leaf_num_elements(paramtmpl,"default")==
-				  weed_leaf_num_elements(paramtmpl2,"default"))) {
+                                  weed_leaf_num_elements(paramtmpl,"default")==
+                                  weed_leaf_num_elements(paramtmpl2,"default"))) {
       copy_ok=TRUE;
     }
-    weed_free(in_params);
+    lives_free(in_params);
   }
 
   if (!copy_ok) return -1;
@@ -8234,7 +8221,7 @@
   // mainw->osc_block should be set to TRUE before calling this function !
   weed_plant_t *inst,*in_param,*in_param2=NULL,*paramtmpl;
 
-  GList *list=NULL;
+  LiVESList *list=NULL;
 
   weed_plant_t **in_params;
 
@@ -8264,7 +8251,7 @@
 
   in_params=weed_get_plantptr_array(inst,"in_parameters",&error);
   in_param=in_params[pnum];
-  weed_free(in_params);
+  lives_free(in_params);
 
   paramtmpl=weed_get_plantptr_value(in_param,"template",&error);
   param_hint=weed_get_int_value(paramtmpl,"hint",&error);
@@ -8280,7 +8267,7 @@
     mainw->event_list=append_param_change_event(mainw->event_list,tc,pnum,in_param,init_events[hotkey],pchains[hotkey]);
     if (copyto>-1) {
       mainw->event_list=append_param_change_event(mainw->event_list,tc,copyto,in_param2,init_events[hotkey],
-						  pchains[hotkey]);
+                        pchains[hotkey]);
     }
     pthread_mutex_unlock(&mainw->event_list_mutex);
   }
@@ -8288,8 +8275,7 @@
   if (weed_plant_has_leaf(paramtmpl,"wrap")&&weed_get_boolean_value(paramtmpl,"wrap",&error)==WEED_TRUE) {
     if (mainw->blend_factor>=256.) mainw->blend_factor-=256.;
     else if (mainw->blend_factor<=-1.) mainw->blend_factor+=256.;
-  }
-  else {
+  } else {
     if (mainw->blend_factor<0.) mainw->blend_factor=0.;
     else if (mainw->blend_factor>255.) mainw->blend_factor=255.;
   }
@@ -8302,17 +8288,17 @@
     mini=weed_get_int_value(paramtmpl,"min",&error);
     maxi=weed_get_int_value(paramtmpl,"max",&error);
 
-    weed_set_int_value (in_param,"value",(int)((double)mini+(mainw->blend_factor/KEYSCALE*(double)(maxi-mini))+.5));
+    weed_set_int_value(in_param,"value",(int)((double)mini+(mainw->blend_factor/KEYSCALE*(double)(maxi-mini))+.5));
 
-    vali=weed_get_int_value (in_param,"value",&error);
+    vali=weed_get_int_value(in_param,"value",&error);
 
-    list=g_list_append(list,g_strdup_printf("%d",vali));
-    list=g_list_append(list,g_strdup_printf("%d",mini));
-    list=g_list_append(list,g_strdup_printf("%d",maxi));
+    list=lives_list_append(list,lives_strdup_printf("%d",vali));
+    list=lives_list_append(list,lives_strdup_printf("%d",mini));
+    list=lives_list_append(list,lives_strdup_printf("%d",maxi));
     update_pwindow(hotkey,pnum,list);
     if (mainw->ce_thumbs) ce_thumbs_update_params(hotkey,pnum,list);
-    g_list_free_strings(list);
-    g_list_free(list);
+    lives_list_free_strings(list);
+    lives_list_free(list);
 
     break;
   case WEED_HINT_FLOAT:
@@ -8320,29 +8306,29 @@
     mind=weed_get_double_value(paramtmpl,"min",&error);
     maxd=weed_get_double_value(paramtmpl,"max",&error);
 
-    weed_set_double_value (in_param,"value",mind+(mainw->blend_factor/KEYSCALE*(maxd-mind)));
-    vald=weed_get_double_value (in_param,"value",&error);
+    weed_set_double_value(in_param,"value",mind+(mainw->blend_factor/KEYSCALE*(maxd-mind)));
+    vald=weed_get_double_value(in_param,"value",&error);
 
-    list=g_list_append(list,g_strdup_printf("%.4f",vald));
-    list=g_list_append(list,g_strdup_printf("%.4f",mind));
-    list=g_list_append(list,g_strdup_printf("%.4f",maxd));
+    list=lives_list_append(list,lives_strdup_printf("%.4f",vald));
+    list=lives_list_append(list,lives_strdup_printf("%.4f",mind));
+    list=lives_list_append(list,lives_strdup_printf("%.4f",maxd));
     update_pwindow(hotkey,pnum,list);
     if (mainw->ce_thumbs) ce_thumbs_update_params(hotkey,pnum,list);
-    g_list_free_strings(list);
-    g_list_free(list);
+    lives_list_free_strings(list);
+    lives_list_free(list);
 
     break;
   case WEED_HINT_SWITCH:
     vali=!!(int)mainw->blend_factor;
-    weed_set_boolean_value (in_param,"value",vali);
-    vali=weed_get_boolean_value (in_param,"value",&error);
+    weed_set_boolean_value(in_param,"value",vali);
+    vali=weed_get_boolean_value(in_param,"value",&error);
     mainw->blend_factor=(double)vali;
 
-    list=g_list_append(list,g_strdup_printf("%d",vali));
+    list=lives_list_append(list,lives_strdup_printf("%d",vali));
     update_pwindow(hotkey,pnum,list);
     if (mainw->ce_thumbs) ce_thumbs_update_params(hotkey,pnum,list);
-    g_list_free_strings(list);
-    g_list_free(list);
+    lives_list_free_strings(list);
+    lives_list_free(list);
 
     break;
   }
@@ -8356,9 +8342,9 @@
     tc=get_event_timecode(get_last_event(mainw->event_list));
     mainw->event_list=append_param_change_event(mainw->event_list,tc,pnum,in_param,init_events[hotkey],pchains[hotkey]);
     if (copyto>-1) {
- 
+
       mainw->event_list=append_param_change_event(mainw->event_list,tc,copyto,in_param2,init_events[hotkey],
-						  pchains[hotkey]);
+                        pchains[hotkey]);
     }
     pthread_mutex_unlock(&mainw->event_list_mutex);
   }
@@ -8398,21 +8384,21 @@
     vali=weed_get_int_value(in_param,"value",&error);
     mini=weed_get_int_value(paramtmpl,"min",&error);
     maxi=weed_get_int_value(paramtmpl,"max",&error);
-    weed_free(in_params);
+    lives_free(in_params);
     return (double)(vali-mini)/(double)(maxi-mini)*KEYSCALE;
   case WEED_HINT_FLOAT:
     vald=weed_get_double_value(in_param,"value",&error);
     mind=weed_get_double_value(paramtmpl,"min",&error);
     maxd=weed_get_double_value(paramtmpl,"max",&error);
-    weed_free(in_params);
+    lives_free(in_params);
     return (vald-mind)/(maxd-mind)*KEYSCALE;
   case WEED_HINT_SWITCH:
     vali=weed_get_boolean_value(in_param,"value",&error);
-    weed_free(in_params);
+    lives_free(in_params);
     return vali;
   }
 
-  weed_free(in_params);
+  lives_free(in_params);
 
   return 0;
 }
@@ -8431,11 +8417,11 @@
 
   register int i;
 
-  for (i=FX_KEYS_MAX_VIRTUAL;i<FX_KEYS_MAX;i++) {
+  for (i=FX_KEYS_MAX_VIRTUAL; i<FX_KEYS_MAX; i++) {
     if ((inst=key_to_instance[i][key_modes[i]])==NULL) continue;
     if (weed_plant_has_leaf(inst,"host_mode")) {
       if (weed_get_int_value(inst,"host_key",&error)==key && weed_get_int_value(inst,"host_mode",&error)==mode) {
-	return inst;
+        return inst;
       }
     }
   }
@@ -8456,7 +8442,7 @@
 ////////////////////////////////////////////////////////////////////////
 
 
-static LIVES_INLINE gchar *weed_instance_get_type(weed_plant_t *inst, boolean getsub) {
+static LIVES_INLINE char *weed_instance_get_type(weed_plant_t *inst, boolean getsub) {
   // return value should be free'd after use
   weed_plant_t *filter=weed_instance_get_filter(inst,TRUE);
   return weed_filter_get_type(filter,getsub,TRUE);
@@ -8465,9 +8451,9 @@
 
 
 
-gchar *rte_keymode_get_type (int key, int mode) {
+char *rte_keymode_get_type(int key, int mode) {
   // return value should be free'd after use
-  gchar *type=g_strdup ("");
+  char *type=lives_strdup("");
   weed_plant_t *filter,*inst;
   int idx;
 
@@ -8477,15 +8463,14 @@
   if ((idx=key_to_fx[key][mode])==-1) return type;
   if ((filter=weed_filters[idx])==NULL) return type;
 
-  g_free(type);
+  lives_free(type);
 
   mainw->osc_block=TRUE;
 
   if ((inst=key_to_instance[key][mode])!=NULL) {
     // return details for instance
     type=weed_instance_get_type(inst,TRUE);
-  }
-  else type=weed_filter_get_type(filter,TRUE,TRUE);
+  } else type=weed_filter_get_type(filter,TRUE,TRUE);
 
   mainw->osc_block=FALSE;
   return type;
@@ -8493,7 +8478,7 @@
 
 
 
-lives_fx_cat_t rte_keymode_get_category (int key, int mode) {
+lives_fx_cat_t rte_keymode_get_category(int key, int mode) {
   weed_plant_t *filter;
   int idx;
   lives_fx_cat_t cat;
@@ -8505,8 +8490,8 @@
   if ((filter=weed_filters[idx])==NULL) return LIVES_FX_CAT_NONE;
 
   else cat=weed_filter_categorise(filter,
-				  enabled_in_channels(filter,FALSE),
-				  enabled_out_channels(filter,FALSE));
+                                    enabled_in_channels(filter,FALSE),
+                                    enabled_out_channels(filter,FALSE));
 
   return cat;
 }
@@ -8519,7 +8504,7 @@
   // 0 based
   int i,free_key;
   free_key=next_free_key;
-  for (i=free_key+1;i<FX_KEYS_MAX;i++) {
+  for (i=free_key+1; i<FX_KEYS_MAX; i++) {
     if (key_to_fx[i][0]==-1) {
       next_free_key=i;
       break;
@@ -8530,48 +8515,49 @@
 }
 
 
-boolean weed_delete_effectkey (int key, int mode) {
+boolean weed_delete_effectkey(int key, int mode) {
   // delete the effect binding for key/mode and move higher numbered slots down
   // also moves the active mode if applicable
   // returns FALSE if there was no effect bound to key/mode
 
+  char *tmp;
+
+  boolean was_started=FALSE;
+
   int oldkeymode=key_modes[--key];
   int orig_mode=mode;
-  boolean was_started=FALSE;
   int modekey=key;
-  gchar *tmp;
-  
+
   if (key_to_fx[key][mode]==-1) return FALSE;
 
   if (key<FX_KEYS_MAX_VIRTUAL) free_key_defaults(key,mode);
 
-  for (;mode<(key<FX_KEYS_MAX_VIRTUAL?prefs->max_modes_per_key:1);mode++) {
+  for (; mode<(key<FX_KEYS_MAX_VIRTUAL?prefs->max_modes_per_key:1); mode++) {
 
     mainw->osc_block=TRUE;
     if (key>=FX_KEYS_MAX_VIRTUAL||mode==prefs->max_modes_per_key-1||key_to_fx[key][mode+1]==-1) {
       if (key_to_instance[key][mode]!=NULL) {
-	was_started=TRUE;
-	if (key_modes[key]==mode) modekey=-key-1;
-	else key_modes[key]=mode;
-	weed_deinit_effect(modekey);
-	key_modes[key]=oldkeymode;
+        was_started=TRUE;
+        if (key_modes[key]==mode) modekey=-key-1;
+        else key_modes[key]=mode;
+        weed_deinit_effect(modekey);
+        key_modes[key]=oldkeymode;
       }
 
       key_to_fx[key][mode]=-1;
 
       if (mode==orig_mode&&key_modes[key]==mode) {
-	key_modes[key]=0;
-	if (was_started) {
-	  if (key_to_fx[key][0]!=-1) weed_init_effect(modekey);
-	  else if (mainw->rte&(GU641<<key)) mainw->rte^=(GU641<<key);
-	}
+        key_modes[key]=0;
+        if (was_started) {
+          if (key_to_fx[key][0]!=-1) weed_init_effect(modekey);
+          else if (mainw->rte&(GU641<<key)) mainw->rte^=(GU641<<key);
+        }
       }
       break; // quit the loop
-    }
-    else if (key<FX_KEYS_MAX_VIRTUAL) {
+    } else if (key<FX_KEYS_MAX_VIRTUAL) {
       rte_switch_keymode(key+1,mode,(tmp=make_weed_hashname
-				     (key_to_fx[key][mode+1],TRUE,FALSE)));
-      g_free(tmp);
+                                         (key_to_fx[key][mode+1],TRUE,FALSE)));
+      lives_free(tmp);
 
       key_defaults[key][mode]=key_defaults[key][mode+1];
       key_defaults[key][mode+1]=NULL;
@@ -8595,7 +8581,7 @@
 
 /////////////////////////////////////////////////////////////////////////////
 
-boolean rte_key_valid (int key, boolean is_userkey) {
+boolean rte_key_valid(int key, boolean is_userkey) {
   key--;
 
   if (key<0||(is_userkey&&key>=FX_KEYS_MAX_VIRTUAL)||key>=FX_KEYS_MAX) return FALSE;
@@ -8603,7 +8589,7 @@
   return TRUE;
 }
 
-boolean rte_keymode_valid (int key, int mode, boolean is_userkey) {
+boolean rte_keymode_valid(int key, int mode, boolean is_userkey) {
   if (key<1||(is_userkey&&key>FX_KEYS_MAX_VIRTUAL)||key>FX_KEYS_MAX||mode<0||
       mode>=(key<FX_KEYS_MAX_VIRTUAL?prefs->max_modes_per_key:1)) return FALSE;
   if (key_to_fx[--key][mode]==-1) return FALSE;
@@ -8616,19 +8602,19 @@
   return (key_to_fx[--key][mode]);
 }
 
-int rte_key_getmode (int key) {
+int rte_key_getmode(int key) {
   if (key<1||key>FX_KEYS_MAX) return -1;
   return key_modes[--key];
 }
 
-int rte_key_getmaxmode (int key) {
+int rte_key_getmaxmode(int key) {
   register int i;
 
   if (key<1||key>FX_KEYS_MAX) return -1;
 
   key--;
 
-  for (i=0;i<(key<FX_KEYS_MAX_VIRTUAL?prefs->max_modes_per_key:1);i++) {
+  for (i=0; i<(key<FX_KEYS_MAX_VIRTUAL?prefs->max_modes_per_key:1); i++) {
     if (key_to_fx[key][i]==-1) return i-1;
   }
   return i-1;
@@ -8657,82 +8643,82 @@
 
 
 char *weed_filter_idx_get_name(int idx) {
-  // return value should be g_free'd after use
+  // return value should be lives_free'd after use
   weed_plant_t *filter;
   int error;
   char *filter_name,*retval;
 
-  if (idx==-1) return g_strdup("");
-  if ((filter=weed_filters[idx])==NULL) return g_strdup("");
+  if (idx==-1) return lives_strdup("");
+  if ((filter=weed_filters[idx])==NULL) return lives_strdup("");
   filter_name=weed_get_string_value(filter,"name",&error);
-  retval=g_strdup(filter_name); // copy so we can use g_free() instead of weed_free()
-  weed_free(filter_name);
+  retval=lives_strdup(filter_name); // copy so we can use lives_free() instead of lives_free()
+  lives_free(filter_name);
   return retval;
 }
 
 
 char *weed_instance_get_filter_name(weed_plant_t *inst, boolean get_compound_parent) {
-  // return value should be g_free'd after use
+  // return value should be lives_free'd after use
   weed_plant_t *filter;
   int error;
   char *filter_name,*retval;
 
-  if (inst==NULL) return g_strdup("");
+  if (inst==NULL) return lives_strdup("");
   filter=weed_instance_get_filter(inst,get_compound_parent);
   filter_name=weed_get_string_value(filter,"name",&error);
-  retval=g_strdup(filter_name); // copy so we can use g_free() instead of weed_free()
-  weed_free(filter_name);
+  retval=lives_strdup(filter_name); // copy so we can use lives_free() instead of lives_free()
+  lives_free(filter_name);
   return retval;
 }
 
 
-char *rte_keymode_get_filter_name (int key, int mode) {
-  // return value should be g_free'd after use
+char *rte_keymode_get_filter_name(int key, int mode) {
+  // return value should be lives_free'd after use
   key--;
-  if (!rte_keymode_valid(key+1,mode,TRUE)) return g_strdup("");
+  if (!rte_keymode_valid(key+1,mode,TRUE)) return lives_strdup("");
   return (weed_filter_idx_get_name(key_to_fx[key][mode]));
 }
 
 
-gchar *rte_keymode_get_plugin_name(int key, int mode) {
-  // return value should be g_free'd after use
+char *rte_keymode_get_plugin_name(int key, int mode) {
+  // return value should be lives_free'd after use
   weed_plant_t *filter,*plugin_info;
   char *name;
   int error;
   char *retval;
 
   key--;
-  if (!rte_keymode_valid(key+1,mode,TRUE)) return g_strdup("");
+  if (!rte_keymode_valid(key+1,mode,TRUE)) return lives_strdup("");
 
   filter=weed_filters[key_to_fx[key][mode]];
   plugin_info=weed_get_plantptr_value(filter,"plugin_info",&error);
   name=weed_get_string_value(plugin_info,"name",&error);
-  // do this so we can g_free() instead of weed_free();
-  retval=g_strdup(name);
-  weed_free(name);
+  // do this so we can lives_free() instead of lives_free();
+  retval=lives_strdup(name);
+  lives_free(name);
   return retval;
 }
 
 
 
 
-G_GNUC_PURE int rte_getmodespk (void) {
+G_GNUC_PURE int rte_getmodespk(void) {
   return prefs->max_modes_per_key;
 }
 
-G_GNUC_PURE int rte_bg_gen_key (void) {
+G_GNUC_PURE int rte_bg_gen_key(void) {
   return bg_generator_key;
 }
 
-G_GNUC_PURE int rte_fg_gen_key (void) {
+G_GNUC_PURE int rte_fg_gen_key(void) {
   return fg_generator_key;
 }
 
-G_GNUC_PURE int rte_bg_gen_mode (void) {
+G_GNUC_PURE int rte_bg_gen_mode(void) {
   return bg_generator_mode;
 }
 
-G_GNUC_PURE int rte_fg_gen_mode (void) {
+G_GNUC_PURE int rte_fg_gen_mode(void) {
   return fg_generator_mode;
 }
 
@@ -8754,30 +8740,30 @@
 
   mode=rte_key_getmode(key+1);
 
-  if ((inst=key_to_instance[key][mode])!=NULL){
+  if ((inst=key_to_instance[key][mode])!=NULL) {
     int nparms;
 
     if (!weed_plant_has_leaf(inst,"in_parameters")||
-	(nparms=weed_leaf_num_elements(inst,"in_parameters"))==0) return NULL;
+        (nparms=weed_leaf_num_elements(inst,"in_parameters"))==0) return NULL;
 
     in_params=weed_get_plantptr_array(inst,"in_parameters",&error);
-    
-    for (i=0;i<nparms;i++) {
+
+    for (i=0; i<nparms; i++) {
       ptmpl=weed_get_plantptr_value(in_params[0],"template",&error);
 
       hint=weed_get_int_value(ptmpl,"hint",&error);
 
       if (hint==WEED_HINT_TEXT) {
-	ret=in_params[i];
-	weed_set_int_value(ret,"host_idx",i);
-	weed_set_plantptr_value(ret,"host_instance",inst);
-	weed_free(in_params);
-	return ret;
+        ret=in_params[i];
+        weed_set_int_value(ret,"host_idx",i);
+        weed_set_plantptr_value(ret,"host_instance",inst);
+        lives_free(in_params);
+        return ret;
       }
 
     }
 
-    weed_free(in_params);
+    lives_free(in_params);
 
   }
 
@@ -8787,7 +8773,7 @@
 
 
 
-boolean rte_key_setmode (int key, int newmode) {
+boolean rte_key_setmode(int key, int newmode) {
   // newmode has two special values, -1 = cycle forwards, -2 = cycle backwards
 
   weed_plant_t *inst,*last_inst;
@@ -8800,8 +8786,7 @@
 
   if (key==0) {
     if ((key=mainw->rte_keys)==-1) return FALSE;
-  }
-  else key--;
+  } else key--;
 
   real_key=key;
 
@@ -8813,8 +8798,7 @@
     // cycle forwards
     if (oldmode==prefs->max_modes_per_key-1||key_to_fx[key][oldmode+1]==-1) {
       newmode=0;
-    }
-    else {
+    } else {
       newmode=key_modes[key]+1;
     }
   }
@@ -8823,8 +8807,8 @@
     // cycle backwards
     newmode=key_modes[key]-1;
     if (newmode<0) {
-      for (newmode=prefs->max_modes_per_key-1;newmode>=0;newmode--) {
-	if (key_to_fx[key][newmode]!=-1) break;
+      for (newmode=prefs->max_modes_per_key-1; newmode>=0; newmode--) {
+        if (key_to_fx[key][newmode]!=-1) break;
       }
     }
   }
@@ -8857,24 +8841,23 @@
 
     if (was_started&&(enabled_in_channels(inst,FALSE)>0||enabled_out_channels(last_inst,FALSE)==0||is_pure_audio(inst,FALSE))) {
       // not a (video or video/audio) generator
-      weed_deinit_effect (key);
-    }
-    else if (enabled_in_channels(weed_filters[key_to_fx[key][newmode]],FALSE)==0&&
-	     has_video_chans_out(weed_filters[key_to_fx[key][newmode]],TRUE)) 
+      weed_deinit_effect(key);
+    } else if (enabled_in_channels(weed_filters[key_to_fx[key][newmode]],FALSE)==0&&
+               has_video_chans_out(weed_filters[key_to_fx[key][newmode]],TRUE))
       mainw->whentostop=NEVER_STOP; // when gen->gen, dont stop pb
-    
+
     key_modes[real_key]=newmode;
 
     mainw->blend_file=blend_file;
 
     if (was_started) {
       if (!weed_init_effect(key)) {
-	// TODO - unblock template channel changes
-	mainw->whentostop=whentostop;
-	key=real_key;
-	if (mainw->rte&(GU641<<key)) mainw->rte^=(GU641<<key);
-	mainw->osc_block=FALSE;
-	return FALSE;
+        // TODO - unblock template channel changes
+        mainw->whentostop=whentostop;
+        key=real_key;
+        if (mainw->rte&(GU641<<key)) mainw->rte^=(GU641<<key);
+        mainw->osc_block=FALSE;
+        return FALSE;
       }
       if (mainw->ce_thumbs) ce_thumbs_add_param_box(real_key,TRUE);
     }
@@ -8887,7 +8870,7 @@
 }
 
 
-int weed_add_effectkey_by_idx (int key, int idx) {
+int weed_add_effectkey_by_idx(int key, int idx) {
   // we will add a filter_class at the next free slot for key, and return the slot number
   // if idx is -1 (probably meaning the filter was not found), we return -1
   // if all slots are full, we return -3
@@ -8902,16 +8885,15 @@
 
   key--;
 
-  for (i=0;i<prefs->max_modes_per_key;i++) {
+  for (i=0; i<prefs->max_modes_per_key; i++) {
     if (key_to_fx[key][i]!=-1) {
       if (enabled_in_channels(weed_filters[key_to_fx[key][i]],FALSE)==0
-	  &&has_video_chans_out(weed_filters[key_to_fx[key][i]],TRUE)) 
-	has_gen=TRUE;
+          &&has_video_chans_out(weed_filters[key_to_fx[key][i]],TRUE))
+        has_gen=TRUE;
       else has_non_gen=TRUE;
-    }
-    else {
+    } else {
       if ((enabled_in_channels(weed_filters[idx],FALSE)==0&&has_non_gen&&has_video_chans_out(weed_filters[idx],TRUE)) ||
-	  (enabled_in_channels(weed_filters[idx],FALSE)>0&&has_gen)) return -2;
+          (enabled_in_channels(weed_filters[idx],FALSE)>0&&has_gen)) return -2;
       key_to_fx[key][i]=idx;
       return i;
     }
@@ -8920,19 +8902,19 @@
 }
 
 
-int weed_add_effectkey (int key, const gchar *hashname, boolean fullname) {
+int weed_add_effectkey(int key, const char *hashname, boolean fullname) {
   // add a filter_class by hashname to an effect_key
   int idx=weed_get_idx_for_hashname(hashname,fullname);
-  return weed_add_effectkey_by_idx (key,idx);
+  return weed_add_effectkey_by_idx(key,idx);
 }
 
 
 
-int rte_switch_keymode (int key, int mode, const gchar *hashname) {
+int rte_switch_keymode(int key, int mode, const char *hashname) {
   // this is called when we switch the filter_class bound to an effect_key/mode
 
   int oldkeymode=key_modes[--key];
-  int id=weed_get_idx_for_hashname (hashname,TRUE),tid;
+  int id=weed_get_idx_for_hashname(hashname,TRUE),tid;
   boolean osc_block;
   boolean has_gen=FALSE,has_non_gen=FALSE;
 
@@ -8952,7 +8934,7 @@
   osc_block=mainw->osc_block;
   mainw->osc_block=TRUE;
 
-// must be done before switching the key_to_fx, as we need to know number of in_parameter_templates
+  // must be done before switching the key_to_fx, as we need to know number of in_parameter_templates
   if (key_defaults[key][mode]!=NULL) free_key_defaults(key,mode);
 
   if (key_to_instance[key][mode]!=NULL) {
@@ -8961,8 +8943,7 @@
     key_to_fx[key][mode]=id;
     weed_init_effect(-key-1);
     key_modes[key]=oldkeymode;
-  }
-  else key_to_fx[key][mode]=id;
+  } else key_to_fx[key][mode]=id;
 
   mainw->osc_block=osc_block;
 
@@ -8971,7 +8952,7 @@
 
 
 
-void rte_swap_fg_bg (void) {
+void rte_swap_fg_bg(void) {
   int key=fg_generator_key;
   int mode=fg_generator_mode;
 
@@ -8989,39 +8970,38 @@
 
 
 
-GList *weed_get_all_names (lives_fx_list_t list_type) {
+LiVESList *weed_get_all_names(lives_fx_list_t list_type) {
   // remember to free list after use, if non-NULL
-  GList *list=NULL;
+  LiVESList *list=NULL;
   int i,error;
   char *filter_name,*filter_type,*hashname,*string;
 
-  for (i=0;i<num_weed_filters-num_weed_dupes;i++) {
+  for (i=0; i<num_weed_filters-num_weed_dupes; i++) {
     filter_name=weed_get_string_value(weed_filters[i],"name",&error);
     switch (list_type) {
     case FX_LIST_NAME:
       // just name
-      string=g_strdup(filter_name);
-      list=g_list_append(list,(gpointer)string);
+      string=lives_strdup(filter_name);
+      list=lives_list_append(list,(livespointer)string);
       break;
     case FX_LIST_NAME_AND_TYPE:
       // name and type
       filter_type=weed_filter_get_type(weed_filters[i],TRUE,FALSE);
 
       if (weed_plant_has_leaf(weed_filters[i],"plugin_unstable")&&
-	  weed_get_boolean_value(weed_filters[i],"plugin_unstable",&error)==WEED_TRUE) {
-	string=g_strdup_printf(_("%s [unstable] (%s)"),filter_name,filter_type);
-      }
-      else string=g_strdup_printf("%s (%s)",filter_name,filter_type);
-      list=g_list_append(list,(gpointer)string);
-      g_free(filter_type);
+          weed_get_boolean_value(weed_filters[i],"plugin_unstable",&error)==WEED_TRUE) {
+        string=lives_strdup_printf(_("%s [unstable] (%s)"),filter_name,filter_type);
+      } else string=lives_strdup_printf("%s (%s)",filter_name,filter_type);
+      list=lives_list_append(list,(livespointer)string);
+      lives_free(filter_type);
       break;
     case FX_LIST_HASHNAME:
       // hashnames
       hashname=make_weed_hashname(i,TRUE,FALSE);
-      list=g_list_append(list,(gpointer)hashname);
+      list=lives_list_append(list,(livespointer)hashname);
       break;
     }
-    weed_free(filter_name);
+    lives_free(filter_name);
   }
   return list;
 }
@@ -9036,7 +9016,7 @@
 ///////////////////
 // parameter interpolation
 
-void fill_param_vals_to (weed_plant_t *param, weed_plant_t *paramtmpl, int index) {
+void fill_param_vals_to(weed_plant_t *param, weed_plant_t *paramtmpl, int index) {
   // for a multi valued parameter or pchange, we will fill "value" up to element index with "new_default"
 
   // paramtmpl must be supplied, since pchanges do not have one directly
@@ -9045,7 +9025,7 @@
   int num_vals=weed_leaf_num_elements(param,"value");
   int new_defi,*valis,*nvalis;
   double new_defd,*valds,*nvalds;
-  gchar *new_defs,**valss,**nvalss;
+  char *new_defs,**valss,**nvalss;
   int cspace;
   int *colsis,*coli;
   int vcount;
@@ -9060,60 +9040,60 @@
   case WEED_HINT_INTEGER:
     new_defi=weed_get_int_value(paramtmpl,"new_default",&error);
     valis=weed_get_int_array(param,"value",&error);
-    nvalis=(int *)g_malloc(vcount*sizint);
-    for (i=0;i<vcount;i++) {
+    nvalis=(int *)lives_malloc(vcount*sizint);
+    for (i=0; i<vcount; i++) {
       if (i<num_vals&&i<index) nvalis[i]=valis[i];
       else if (i<=num_vals&&i>index) nvalis[i]=valis[i-1];
-      else nvalis[i]=new_defi; 
+      else nvalis[i]=new_defi;
     }
     weed_set_int_array(param,"value",vcount,nvalis);
-    weed_free(valis);
-    g_free(nvalis);
+    lives_free(valis);
+    lives_free(nvalis);
     break;
   case WEED_HINT_FLOAT:
     new_defd=weed_get_double_value(paramtmpl,"new_default",&error);
     valds=weed_get_double_array(param,"value",&error);
-    nvalds=(double *)g_malloc(vcount*sizdbl);
-    for (i=0;i<vcount;i++) {
+    nvalds=(double *)lives_malloc(vcount*sizdbl);
+    for (i=0; i<vcount; i++) {
       if (i<num_vals&&i<index) nvalds[i]=valds[i];
       else if (i<=num_vals&&i>index) nvalds[i]=valds[i-1];
-      else nvalds[i]=new_defd; 
+      else nvalds[i]=new_defd;
     }
     weed_set_double_array(param,"value",vcount,nvalds);
 
-    weed_free(valds);
-    g_free(nvalds);
+    lives_free(valds);
+    lives_free(nvalds);
     break;
   case WEED_HINT_SWITCH:
     new_defi=weed_get_boolean_value(paramtmpl,"new_default",&error);
     valis=weed_get_boolean_array(param,"value",&error);
-    nvalis=(int *)g_malloc(vcount*sizint);
-    for (i=0;i<vcount;i++) {
+    nvalis=(int *)lives_malloc(vcount*sizint);
+    for (i=0; i<vcount; i++) {
       if (i<num_vals&&i<index) nvalis[i]=valis[i];
       else if (i<=num_vals&&i>index) nvalis[i]=valis[i-1];
-      else nvalis[i]=new_defi; 
+      else nvalis[i]=new_defi;
     }
     weed_set_boolean_array(param,"value",vcount,nvalis);
-    weed_free(valis);
-    g_free(nvalis);
+    lives_free(valis);
+    lives_free(nvalis);
     break;
   case WEED_HINT_TEXT:
     new_defs=weed_get_string_value(paramtmpl,"new_default",&error);
     valss=weed_get_string_array(param,"value",&error);
-    nvalss=(gchar **)g_malloc(vcount*sizeof(gchar *));
-    for (i=0;i<vcount;i++) {
+    nvalss=(char **)lives_malloc(vcount*sizeof(char *));
+    for (i=0; i<vcount; i++) {
       if (i<num_vals&&i<index) nvalss[i]=valss[i];
       else if (i<=num_vals&&i>index) nvalss[i]=valss[i-1];
-      else nvalss[i]=new_defs; 
+      else nvalss[i]=new_defs;
     }
     weed_set_string_array(param,"value",vcount,nvalss);
 
-    for (i=0;i<index;i++) {
-      weed_free(nvalss[i]);
+    for (i=0; i<index; i++) {
+      lives_free(nvalss[i]);
     }
 
-    weed_free(valss);
-    g_free(nvalss);
+    lives_free(valss);
+    lives_free(nvalss);
     break;
   case WEED_HINT_COLOR:
     cspace=weed_get_int_value(paramtmpl,"colorspace",&error);
@@ -9122,66 +9102,59 @@
       index*=3;
       vcount*=3;
       if (weed_leaf_seed_type(paramtmpl,"new_default")==WEED_SEED_INT) {
-	colsis=weed_get_int_array(param,"value",&error);
-	if (weed_leaf_num_elements(paramtmpl,"new_default")==1) {
-	  coli=(int *)weed_malloc(3*sizint);
-	  coli[0]=coli[1]=coli[2]=weed_get_int_value(paramtmpl,"new_default",&error);
-	}
-	else coli=weed_get_int_array(paramtmpl,"new_default",&error);
-	valis=weed_get_int_array(param,"value",&error);
-	nvalis=(int *)g_malloc(vcount*sizint);
-	for (i=0;i<vcount;i+=3) {
-	  if (i<num_vals&&i<index) {
-	    nvalis[i]=valis[i];
-	    nvalis[i+1]=valis[i+1];
-	    nvalis[i+2]=valis[i+2];
-	  }
-	  else if (i<=num_vals&&i>index) {
-	    nvalis[i]=valis[i-3];
-	    nvalis[i+1]=valis[i-2];
-	    nvalis[i+2]=valis[i-1];
-	  }
-	  else {
-	    nvalis[i]=coli[0]; 
-	    nvalis[i+1]=coli[1]; 
-	    nvalis[i+2]=coli[2]; 
-	  }
-	}
-	weed_set_int_array(param,"value",vcount,nvalis);
-	weed_free(valis);
-	weed_free(colsis);
-	g_free(nvalis);
-      }
-      else {
-	colsds=weed_get_double_array(param,"value",&error);
-	if (weed_leaf_num_elements(paramtmpl,"new_default")==1) {
-	  cold=(double *)weed_malloc(3*sizdbl);
-	  cold[0]=cold[1]=cold[2]=weed_get_double_value(paramtmpl,"new_default",&error);
-	}
-	else cold=weed_get_double_array(paramtmpl,"new_default",&error);
-	valds=weed_get_double_array(param,"value",&error);
-	nvalds=(double *)g_malloc(vcount*sizdbl);
-	for (i=0;i<vcount;i+=3) {
-	  if (i<num_vals&&i<index) {
-	    nvalds[i]=valds[i];
-	    nvalds[i+1]=valds[i+1];
-	    nvalds[i+2]=valds[i+2];
-	  }
-	  else if (i<=num_vals&&i>index) {
-	    nvalds[i]=valds[i-3];
-	    nvalds[i+1]=valds[i-2];
-	    nvalds[i+2]=valds[i-1];
-	  }
-	  else {
-	    nvalds[i]=cold[0]; 
-	    nvalds[i+1]=cold[1]; 
-	    nvalds[i+2]=cold[2]; 
-	  }
-	}
-	weed_set_double_array(param,"value",vcount,nvalds);
-	weed_free(valds);
-	weed_free(colsds);
-	g_free(nvalds);
+        colsis=weed_get_int_array(param,"value",&error);
+        if (weed_leaf_num_elements(paramtmpl,"new_default")==1) {
+          coli=(int *)lives_malloc(3*sizint);
+          coli[0]=coli[1]=coli[2]=weed_get_int_value(paramtmpl,"new_default",&error);
+        } else coli=weed_get_int_array(paramtmpl,"new_default",&error);
+        valis=weed_get_int_array(param,"value",&error);
+        nvalis=(int *)lives_malloc(vcount*sizint);
+        for (i=0; i<vcount; i+=3) {
+          if (i<num_vals&&i<index) {
+            nvalis[i]=valis[i];
+            nvalis[i+1]=valis[i+1];
+            nvalis[i+2]=valis[i+2];
+          } else if (i<=num_vals&&i>index) {
+            nvalis[i]=valis[i-3];
+            nvalis[i+1]=valis[i-2];
+            nvalis[i+2]=valis[i-1];
+          } else {
+            nvalis[i]=coli[0];
+            nvalis[i+1]=coli[1];
+            nvalis[i+2]=coli[2];
+          }
+        }
+        weed_set_int_array(param,"value",vcount,nvalis);
+        lives_free(valis);
+        lives_free(colsis);
+        lives_free(nvalis);
+      } else {
+        colsds=weed_get_double_array(param,"value",&error);
+        if (weed_leaf_num_elements(paramtmpl,"new_default")==1) {
+          cold=(double *)lives_malloc(3*sizdbl);
+          cold[0]=cold[1]=cold[2]=weed_get_double_value(paramtmpl,"new_default",&error);
+        } else cold=weed_get_double_array(paramtmpl,"new_default",&error);
+        valds=weed_get_double_array(param,"value",&error);
+        nvalds=(double *)lives_malloc(vcount*sizdbl);
+        for (i=0; i<vcount; i+=3) {
+          if (i<num_vals&&i<index) {
+            nvalds[i]=valds[i];
+            nvalds[i+1]=valds[i+1];
+            nvalds[i+2]=valds[i+2];
+          } else if (i<=num_vals&&i>index) {
+            nvalds[i]=valds[i-3];
+            nvalds[i+1]=valds[i-2];
+            nvalds[i+2]=valds[i-1];
+          } else {
+            nvalds[i]=cold[0];
+            nvalds[i+1]=cold[1];
+            nvalds[i+2]=cold[2];
+          }
+        }
+        weed_set_double_array(param,"value",vcount,nvalds);
+        lives_free(valds);
+        lives_free(colsds);
+        lives_free(nvalds);
       }
     }
     break;
@@ -9207,7 +9180,7 @@
     }
   }
 
-  param_array=(weed_plant_t **)g_malloc((num+1)*sizeof(weed_plant_t *));
+  param_array=(weed_plant_t **)lives_malloc((num+1)*sizeof(weed_plant_t *));
   pchange=(weed_plant_t *)pchain;
   while (pchange!=NULL) {
     param_array[i]=weed_plant_new(WEED_PLANT_PARAMETER);
@@ -9223,7 +9196,7 @@
 }
 
 
-static int get_default_element_int (weed_plant_t *param, int idx, int mpy, int add) {
+static int get_default_element_int(weed_plant_t *param, int idx, int mpy, int add) {
   int *valsi,val;
   int error;
   weed_plant_t *ptmpl=weed_get_plantptr_value(param,"template",&error);
@@ -9231,26 +9204,26 @@
   if (weed_plant_has_leaf(ptmpl,"host_default")&&weed_leaf_num_elements(ptmpl,"host_default")>idx*mpy+add) {
     valsi=weed_get_int_array(ptmpl,"host_default",&error);
     val=valsi[idx*mpy+add];
-    weed_free(valsi);
+    lives_free(valsi);
     return val;
   }
   if (weed_plant_has_leaf(ptmpl,"default")&&weed_leaf_num_elements(ptmpl,"default")>idx*mpy+add) {
     valsi=weed_get_int_array(ptmpl,"default",&error);
     val=valsi[idx*mpy+add];
-    weed_free(valsi);
+    lives_free(valsi);
     return val;
   }
   if (weed_leaf_num_elements(ptmpl,"new_default")==mpy) {
     valsi=weed_get_int_array(ptmpl,"default",&error);
     val=valsi[add];
-    weed_free(valsi);
+    lives_free(valsi);
     return val;
   }
   return weed_get_int_value(ptmpl,"new_default",&error);
 }
 
 
-static double get_default_element_double (weed_plant_t *param, int idx, int mpy, int add) {
+static double get_default_element_double(weed_plant_t *param, int idx, int mpy, int add) {
   double *valsd,val;
   int error;
   weed_plant_t *ptmpl=weed_get_plantptr_value(param,"template",&error);
@@ -9258,26 +9231,26 @@
   if (weed_plant_has_leaf(ptmpl,"host_default")&&weed_leaf_num_elements(ptmpl,"host_default")>idx*mpy+add) {
     valsd=weed_get_double_array(ptmpl,"host_default",&error);
     val=valsd[idx*mpy+add];
-    weed_free(valsd);
+    lives_free(valsd);
     return val;
   }
   if (weed_plant_has_leaf(ptmpl,"default")&&weed_leaf_num_elements(ptmpl,"default")>idx*mpy+add) {
     valsd=weed_get_double_array(ptmpl,"default",&error);
     val=valsd[idx*mpy+add];
-    weed_free(valsd);
+    lives_free(valsd);
     return val;
   }
   if (weed_leaf_num_elements(ptmpl,"new_default")==mpy) {
     valsd=weed_get_double_array(ptmpl,"default",&error);
     val=valsd[add];
-    weed_free(valsd);
+    lives_free(valsd);
     return val;
   }
   return weed_get_double_value(ptmpl,"new_default",&error);
 }
 
 
-static int get_default_element_bool (weed_plant_t *param, int idx) {
+static int get_default_element_bool(weed_plant_t *param, int idx) {
   int *valsi,val;
   int error;
   weed_plant_t *ptmpl=weed_get_plantptr_value(param,"template",&error);
@@ -9285,42 +9258,42 @@
   if (weed_plant_has_leaf(ptmpl,"host_default")&&weed_leaf_num_elements(ptmpl,"host_default")>idx) {
     valsi=weed_get_boolean_array(ptmpl,"host_default",&error);
     val=valsi[idx];
-    weed_free(valsi);
+    lives_free(valsi);
     return val;
   }
   if (weed_plant_has_leaf(ptmpl,"default")&&weed_leaf_num_elements(ptmpl,"default")>idx) {
     valsi=weed_get_boolean_array(ptmpl,"default",&error);
     val=valsi[idx];
-    weed_free(valsi);
+    lives_free(valsi);
     return val;
   }
   return weed_get_boolean_value(ptmpl,"new_default",&error);
 }
 
 
-static gchar *get_default_element_string (weed_plant_t *param, int idx) {
-  gchar **valss,*val,*val2;
+static char *get_default_element_string(weed_plant_t *param, int idx) {
+  char **valss,*val,*val2;
   int error,i;
   int numvals;
   weed_plant_t *ptmpl=weed_get_plantptr_value(param,"template",&error);
 
   if (weed_plant_has_leaf(ptmpl,"host_default")&&(numvals=weed_leaf_num_elements(ptmpl,"host_default"))>idx) {
     valss=weed_get_string_array(ptmpl,"host_default",&error);
-    val=g_strdup(valss[idx]);
-    for (i=0;i<numvals;i++) weed_free(valss[i]);
-    weed_free(valss);
+    val=lives_strdup(valss[idx]);
+    for (i=0; i<numvals; i++) lives_free(valss[i]);
+    lives_free(valss);
     return val;
   }
   if (weed_plant_has_leaf(ptmpl,"default")&&(numvals=weed_leaf_num_elements(ptmpl,"default"))>idx) {
     valss=weed_get_string_array(ptmpl,"default",&error);
-    val=g_strdup(valss[idx]);
-    for (i=0;i<numvals;i++) weed_free(valss[i]);
-    weed_free(valss);
+    val=lives_strdup(valss[idx]);
+    for (i=0; i<numvals; i++) lives_free(valss[i]);
+    lives_free(valss);
     return val;
   }
   val=weed_get_string_value(ptmpl,"new_default",&error);
-  val2=g_strdup(val);
-  weed_free(val);
+  val2=lives_strdup(val);
+  lives_free(val);
   return val2;
 }
 
@@ -9351,16 +9324,16 @@
   int k;
   int last_valueir,last_valueig,last_valueib;
   double last_valuedr,last_valuedg,last_valuedb;
-  gchar **valss,**nvalss;
+  char **valss,**nvalss;
   int num_ign=0;
 
   if (pchange==NULL) {
-    weed_free(in_params);
+    lives_free(in_params);
     return TRUE;
   }
 
   if (!weed_plant_has_leaf(param,"value")||weed_leaf_num_elements(param,"value")==0) {
-    weed_free(in_params);
+    lives_free(in_params);
     return FALSE;  // do not apply effect
   }
 
@@ -9381,7 +9354,7 @@
     weed_interpolate_f *interpolate_func_ptr;
     weed_interpolate_f interpolate_func;
     weed_plant_t *calc_param=weed_plant_new(WEED_PLANT_PARAMETER),*filter;
-    gchar *cwd;
+    char *cwd;
 
 
     // setup our calc_param (return result)
@@ -9392,20 +9365,17 @@
     if (pchange==last_pchange&&pchange==NULL) {
       param_array=void_ptrs_to_plant_array(wtmpl,pchange,0);
       more_available=FALSE;
-    }
-    else if (last_pchange==NULL) {
+    } else if (last_pchange==NULL) {
       param_array=void_ptrs_to_plant_array(wtmpl,pchange,1);
       more_available=FALSE;
-    }
-    else if (pchange==NULL) {
+    } else if (pchange==NULL) {
       param_array=void_ptrs_to_plant_array(wtmpl,last_pchange,1);
       more_available=FALSE;
-    }
-    else {
+    } else {
       param_array=void_ptrs_to_plant_array(wtmpl,last_pchange,2);
       more_available=TRUE; // maybe...
     }
-    
+
     weed_add_plant_flags(calc_param,WEED_LEAF_READONLY_PLUGIN);
     interpolate_func_ptr=(weed_interpolate_f *)weed_get_voidptr_value(wtmpl,"interpolate_func",&error);
     interpolate_func=(weed_interpolate_f)*interpolate_func_ptr;
@@ -9413,76 +9383,73 @@
     cwd=cd_to_plugin_dir(filter);
     needs_more=(*interpolate_func)(param_array,calc_param);
     lives_chdir(cwd,FALSE);
-    g_free(cwd);
+    lives_free(cwd);
 
     if (needs_more==WEED_FALSE||!more_available) {
       // got an accurate result from 2 points
       weed_leaf_copy(param,"value",calc_param,"value");
       weed_plant_free(calc_param);
-      weed_free(in_params);
-      for(i=0;param_array[i]!=NULL;i++) weed_plant_free(param_array[i]);
-      g_free(param_array);
+      lives_free(in_params);
+      for (i=0; param_array[i]!=NULL; i++) weed_plant_free(param_array[i]);
+      lives_free(param_array);
       pthread_mutex_unlock(&mainw->interp_mutex);
       return TRUE;
     }
     // try to pass more values
-    g_free(param_array);
+    lives_free(param_array);
     param_array=void_ptrs_to_plant_array(wtmpl,pchain,-1);
-    
+
     (*interpolate_func)(param_array,calc_param);
-    
+
     weed_leaf_copy(param,"value",calc_param,"value");
     weed_plant_free(calc_param);
-    weed_free(in_params);
-    for(i=0;param_array[i]!=NULL;i++) weed_plant_free(param_array[i]);
-    g_free(param_array);
+    lives_free(in_params);
+    for (i=0; param_array[i]!=NULL; i++) weed_plant_free(param_array[i]);
+    lives_free(param_array);
     pthread_mutex_unlock(&mainw->interp_mutex);
-   return TRUE;
+    return TRUE;
   }
 
   num_values=weed_leaf_num_elements(param,"value");
 
-  if ((num_pvals=weed_leaf_num_elements((weed_plant_t *)pchain,"value"))>num_values) 
+  if ((num_pvals=weed_leaf_num_elements((weed_plant_t *)pchain,"value"))>num_values)
     num_values=num_pvals; // init a multivalued param
 
-  lpc=(void **)g_malloc(num_values*sizeof(void *));
-  npc=(void **)g_malloc(num_values*sizeof(void *));
+  lpc=(void **)lives_malloc(num_values*sizeof(void *));
+  npc=(void **)lives_malloc(num_values*sizeof(void *));
 
   if (num_values==1) {
     lpc[0]=last_pchange;
     npc[0]=pchange;
-  }
-  else {
+  } else {
     pchange=(weed_plant_t *)pchain;
-    
-    for (j=0;j<num_values;j++) npc[j]=lpc[j]=NULL;
+
+    for (j=0; j<num_values; j++) npc[j]=lpc[j]=NULL;
 
     while (pchange!=NULL) {
       num_pvals=weed_leaf_num_elements(pchange,"value");
       if (num_pvals>num_values) num_pvals=num_values;
       if (weed_plant_has_leaf(pchange,"ignore")) {
-	num_ign=weed_leaf_num_elements(pchange,"ignore");
-	ign=weed_get_boolean_array(pchange,"ignore",&error);
-      }
-      else ign=NULL;
+        num_ign=weed_leaf_num_elements(pchange,"ignore");
+        ign=weed_get_boolean_array(pchange,"ignore",&error);
+      } else ign=NULL;
       if (get_event_timecode(pchange)<=tc) {
-	for (j=0;j<num_pvals;j++) if (ign==NULL||j>=num_ign||ign[j]==WEED_FALSE) lpc[j]=pchange;
-      }
-      else {
-	for (j=0;j<num_pvals;j++) {
-	  if (npc[j]==NULL&&(ign==NULL||j>=num_ign||ign[j]==WEED_FALSE)) npc[j]=pchange;
-	}
-	got_npc=0;
-	for (j=0;j<num_values;j++) {
-	  if (npc[j]!=NULL) got_npc++;
-	}
-	if (got_npc==num_values) {
-	  if (ign!=NULL) weed_free(ign);
-	  break;
-	}
+        for (j=0; j<num_pvals; j++) if (ign==NULL||j>=num_ign||ign[j]==WEED_FALSE) lpc[j]=pchange;
+      } else {
+        for (j=0; j<num_pvals; j++) {
+          if (npc[j]==NULL&&(ign==NULL||j>=num_ign||ign[j]==WEED_FALSE)) npc[j]=pchange;
+        }
+        got_npc=0;
+        for (j=0; j<num_values; j++) {
+          if (npc[j]!=NULL) got_npc++;
+        }
+        if (got_npc==num_values) {
+          if (ign!=NULL) lives_free(ign);
+          break;
+        }
       }
       pchange=(weed_plant_t *)weed_get_voidptr_value(pchange,"next_change",&error);
-      if (ign!=NULL) weed_free(ign);
+      if (ign!=NULL) lives_free(ign);
     }
   }
 
@@ -9490,7 +9457,7 @@
   hint=weed_get_int_value(wtmpl,"hint",&error);
   switch (hint) {
   case WEED_HINT_FLOAT:
-    valds=(double *)g_malloc(num_values*(sizeof(double)));
+    valds=(double *)lives_malloc(num_values*(sizeof(double)));
     break;
   case WEED_HINT_COLOR:
     cspace=weed_get_int_value(wtmpl,"colorspace",&error);
@@ -9498,242 +9465,229 @@
     case WEED_COLORSPACE_RGB:
       if (num_values%3!=0) return TRUE;
       if (weed_leaf_seed_type(wtmpl,"default")==WEED_SEED_INT) {
-	valis=(int *)g_malloc(num_values*sizint);
-      }
-      else {
-	valds=(double *)g_malloc(num_values*(sizeof(double)));
+        valis=(int *)lives_malloc(num_values*sizint);
+      } else {
+        valds=(double *)lives_malloc(num_values*(sizeof(double)));
       }
       break;
     }
     break;
   case WEED_HINT_SWITCH:
   case WEED_HINT_INTEGER:
-    valis=(int *)g_malloc(num_values*sizint);
+    valis=(int *)lives_malloc(num_values*sizint);
     break;
   }
 
 
 
-  for (j=0;j<num_values;j++) {
+  for (j=0; j<num_values; j++) {
     // must interpolate - we use linear interpolation
     if (lpc[j]==NULL&&npc[j]==NULL) continue;
     if (lpc[j]!=NULL&&npc[j]!=NULL) tc_diff=weed_get_int64_value((weed_plant_t *)npc[j],"timecode",&error)-
-				      weed_get_int64_value((weed_plant_t *)lpc[j],"timecode",&error);
+                                              weed_get_int64_value((weed_plant_t *)lpc[j],"timecode",&error);
     switch (hint) {
     case WEED_HINT_FLOAT:
       if (lpc[j]==NULL) {
-	// before first change
-	valds[j]=get_default_element_double(param,j,1,0);
-	continue;
+        // before first change
+        valds[j]=get_default_element_double(param,j,1,0);
+        continue;
       }
       if (npc[j]==NULL) {
-	// after last change
-	xnum=weed_leaf_num_elements((weed_plant_t *)lpc[j],"value");
-	if (xnum>j) {
-	  nvalds=weed_get_double_array((weed_plant_t *)lpc[j],"value",&error);
-	  valds[j]=nvalds[j];
-	  weed_free(nvalds);
-	}
-	else valds[j]=get_default_element_double(param,j,1,0);
-	continue;
+        // after last change
+        xnum=weed_leaf_num_elements((weed_plant_t *)lpc[j],"value");
+        if (xnum>j) {
+          nvalds=weed_get_double_array((weed_plant_t *)lpc[j],"value",&error);
+          valds[j]=nvalds[j];
+          lives_free(nvalds);
+        } else valds[j]=get_default_element_double(param,j,1,0);
+        continue;
       }
-          
+
       next_valuesd=weed_get_double_array((weed_plant_t *)npc[j],"value",&error);
       last_valuesd=weed_get_double_array((weed_plant_t *)lpc[j],"value",&error);
       xnum=weed_leaf_num_elements((weed_plant_t *)lpc[j],"value");
       if (xnum>j) last_valued=last_valuesd[j];
       else last_valued=get_default_element_double(param,j,1,0);
-      
+
       valds[j]=last_valued+(double)(next_valuesd[j]-last_valued)/(double)(tc_diff/U_SEC)*
-	(double)((tc-weed_get_int64_value((weed_plant_t *)lpc[j],"timecode",&error))/U_SEC);
+               (double)((tc-weed_get_int64_value((weed_plant_t *)lpc[j],"timecode",&error))/U_SEC);
 
-      weed_free(last_valuesd);
-      weed_free(next_valuesd);
+      lives_free(last_valuesd);
+      lives_free(next_valuesd);
       break;
     case WEED_HINT_COLOR:
       if (num_values!=weed_leaf_num_elements(last_pchange,"value")) break; // no interp possible
-      
+
       switch (cspace) {
       case WEED_COLORSPACE_RGB:
-	k=j*3;
-	if (weed_leaf_seed_type(wtmpl,"default")==WEED_SEED_INT) {
-	  if (lpc[j]==NULL) {
-	    // before first change
-	    valis[k]=get_default_element_int(param,j,3,0);
-	    valis[k+1]=get_default_element_int(param,j,3,1);
-	    valis[k+2]=get_default_element_int(param,j,3,2);
-	    j+=3;
-	    continue;
-	  }
-	  if (npc[j]==NULL) {
-	    // after last change
-	    xnum=weed_leaf_num_elements((weed_plant_t *)lpc[j],"value");
-	    if (xnum>k) {
-	      nvalis=weed_get_int_array((weed_plant_t *)lpc[j],"value",&error);
-	      valis[k]=nvalis[k];
-	      valis[k+1]=nvalis[k+1];
-	      valis[k+2]=nvalis[k+2];
-	      weed_free(nvalis);
-	    }
-	    else {
-	      valis[k]=get_default_element_int(param,j,3,0);
-	      valis[k+1]=get_default_element_int(param,j,3,1);
-	      valis[k+2]=get_default_element_int(param,j,3,2);
-	    }
-	    j+=3;
-	    continue;
-	  }
-	  
-	  next_valuesi=weed_get_int_array((weed_plant_t *)npc[j],"value",&error);
-	  last_valuesi=weed_get_int_array((weed_plant_t *)lpc[j],"value",&error);
-	  xnum=weed_leaf_num_elements((weed_plant_t *)lpc[j],"value");
-	  if (xnum>k) {
-	    last_valueir=last_valuesi[k];
-	    last_valueig=last_valuesi[k+1];
-	    last_valueib=last_valuesi[k+2];
-	  }
-	  else {
-	    last_valueir=get_default_element_int(param,j,3,0);
-	    last_valueig=get_default_element_int(param,j,3,1);
-	    last_valueib=get_default_element_int(param,j,3,2);
-	  }
-
-	  if (next_valuesi==NULL) continue; // can happen if we recorded a param change
-
-	  valis[k]=last_valueir+(next_valuesi[k]-last_valueir)/(tc_diff/U_SEC)*
-	    ((tc_diff2=(tc-weed_get_int64_value((weed_plant_t *)lpc[j],"timecode",&error)))/U_SEC)+.5;
-	  valis[k+1]=last_valueig+(next_valuesi[k+1]-last_valueig)/(tc_diff/U_SEC)*(tc_diff2/U_SEC)+.5;
-	  valis[k+2]=last_valueib+(next_valuesi[k+2]-last_valueib)/(tc_diff/U_SEC)*(tc_diff2/U_SEC)+.5;
-	  
-	  weed_free(last_valuesi);
-	  weed_free(next_valuesi);
-	}
-	else {
-	  if (lpc[j]==NULL) {
-	    // before first change
-	    valds[k]=get_default_element_double(param,j,3,0);
-	    valds[k+1]=get_default_element_double(param,j,3,1);
-	    valds[k+2]=get_default_element_double(param,j,3,2);
-	    j+=3;
-	    continue;
-	  }
-	  if (npc[j]==NULL) {
-	    // after last change
-	    xnum=weed_leaf_num_elements((weed_plant_t *)lpc[j],"value");
-	    if (xnum>k) {
-	      nvalds=weed_get_double_array((weed_plant_t *)lpc[j],"value",&error);
-	      valds[k]=nvalds[k];
-	      valds[k+1]=nvalds[k+1];
-	      valds[k+2]=nvalds[k+2];
-	      weed_free(nvalds);
-	    }
-	    else {
-	      valds[k]=get_default_element_double(param,j,3,0);
-	      valds[k+1]=get_default_element_double(param,j,3,1);
-	      valds[k+2]=get_default_element_double(param,j,3,2);
-	    }
-	    j+=3;
-	    continue;
-	  }
-	  
-	  next_valuesd=weed_get_double_array((weed_plant_t *)npc[j],"value",&error);
-	  last_valuesd=weed_get_double_array((weed_plant_t *)lpc[j],"value",&error);
-	  xnum=weed_leaf_num_elements((weed_plant_t *)lpc[j],"value");
-	  if (xnum>k) {
-	    last_valuedr=last_valuesd[k];
-	    last_valuedg=last_valuesd[k+1];
-	    last_valuedb=last_valuesd[k+2];
-	  }
-	  else {
-	    last_valuedr=get_default_element_double(param,j,3,0);
-	    last_valuedg=get_default_element_double(param,j,3,1);
-	    last_valuedb=get_default_element_double(param,j,3,2);
-	  }
-	  valds[k]=last_valuedr+(next_valuesd[k]-last_valuedr)/(tc_diff/U_SEC)*
-	    ((tc_diff2=(tc-weed_get_int64_value((weed_plant_t *)lpc[j],"timecode",&error)))/U_SEC);
-	  valds[k+1]=last_valuedg+(next_valuesd[k+1]-last_valuedg)/(tc_diff/U_SEC)*(tc_diff2/U_SEC)+.5;
-	  valds[k+2]=last_valuedb+(next_valuesd[k+2]-last_valuedb)/(tc_diff/U_SEC)*(tc_diff2/U_SEC)+.5;
-
-	  weed_free(last_valuesd);
-	  weed_free(next_valuesd);
-	}
-	j+=3;
-	break;
-	// TODO - other colorspaces (e.g. RGBA32)
+        k=j*3;
+        if (weed_leaf_seed_type(wtmpl,"default")==WEED_SEED_INT) {
+          if (lpc[j]==NULL) {
+            // before first change
+            valis[k]=get_default_element_int(param,j,3,0);
+            valis[k+1]=get_default_element_int(param,j,3,1);
+            valis[k+2]=get_default_element_int(param,j,3,2);
+            j+=3;
+            continue;
+          }
+          if (npc[j]==NULL) {
+            // after last change
+            xnum=weed_leaf_num_elements((weed_plant_t *)lpc[j],"value");
+            if (xnum>k) {
+              nvalis=weed_get_int_array((weed_plant_t *)lpc[j],"value",&error);
+              valis[k]=nvalis[k];
+              valis[k+1]=nvalis[k+1];
+              valis[k+2]=nvalis[k+2];
+              lives_free(nvalis);
+            } else {
+              valis[k]=get_default_element_int(param,j,3,0);
+              valis[k+1]=get_default_element_int(param,j,3,1);
+              valis[k+2]=get_default_element_int(param,j,3,2);
+            }
+            j+=3;
+            continue;
+          }
+
+          next_valuesi=weed_get_int_array((weed_plant_t *)npc[j],"value",&error);
+          last_valuesi=weed_get_int_array((weed_plant_t *)lpc[j],"value",&error);
+          xnum=weed_leaf_num_elements((weed_plant_t *)lpc[j],"value");
+          if (xnum>k) {
+            last_valueir=last_valuesi[k];
+            last_valueig=last_valuesi[k+1];
+            last_valueib=last_valuesi[k+2];
+          } else {
+            last_valueir=get_default_element_int(param,j,3,0);
+            last_valueig=get_default_element_int(param,j,3,1);
+            last_valueib=get_default_element_int(param,j,3,2);
+          }
+
+          if (next_valuesi==NULL) continue; // can happen if we recorded a param change
+
+          valis[k]=last_valueir+(next_valuesi[k]-last_valueir)/(tc_diff/U_SEC)*
+                   ((tc_diff2=(tc-weed_get_int64_value((weed_plant_t *)lpc[j],"timecode",&error)))/U_SEC)+.5;
+          valis[k+1]=last_valueig+(next_valuesi[k+1]-last_valueig)/(tc_diff/U_SEC)*(tc_diff2/U_SEC)+.5;
+          valis[k+2]=last_valueib+(next_valuesi[k+2]-last_valueib)/(tc_diff/U_SEC)*(tc_diff2/U_SEC)+.5;
+
+          lives_free(last_valuesi);
+          lives_free(next_valuesi);
+        } else {
+          if (lpc[j]==NULL) {
+            // before first change
+            valds[k]=get_default_element_double(param,j,3,0);
+            valds[k+1]=get_default_element_double(param,j,3,1);
+            valds[k+2]=get_default_element_double(param,j,3,2);
+            j+=3;
+            continue;
+          }
+          if (npc[j]==NULL) {
+            // after last change
+            xnum=weed_leaf_num_elements((weed_plant_t *)lpc[j],"value");
+            if (xnum>k) {
+              nvalds=weed_get_double_array((weed_plant_t *)lpc[j],"value",&error);
+              valds[k]=nvalds[k];
+              valds[k+1]=nvalds[k+1];
+              valds[k+2]=nvalds[k+2];
+              lives_free(nvalds);
+            } else {
+              valds[k]=get_default_element_double(param,j,3,0);
+              valds[k+1]=get_default_element_double(param,j,3,1);
+              valds[k+2]=get_default_element_double(param,j,3,2);
+            }
+            j+=3;
+            continue;
+          }
+
+          next_valuesd=weed_get_double_array((weed_plant_t *)npc[j],"value",&error);
+          last_valuesd=weed_get_double_array((weed_plant_t *)lpc[j],"value",&error);
+          xnum=weed_leaf_num_elements((weed_plant_t *)lpc[j],"value");
+          if (xnum>k) {
+            last_valuedr=last_valuesd[k];
+            last_valuedg=last_valuesd[k+1];
+            last_valuedb=last_valuesd[k+2];
+          } else {
+            last_valuedr=get_default_element_double(param,j,3,0);
+            last_valuedg=get_default_element_double(param,j,3,1);
+            last_valuedb=get_default_element_double(param,j,3,2);
+          }
+          valds[k]=last_valuedr+(next_valuesd[k]-last_valuedr)/(tc_diff/U_SEC)*
+                   ((tc_diff2=(tc-weed_get_int64_value((weed_plant_t *)lpc[j],"timecode",&error)))/U_SEC);
+          valds[k+1]=last_valuedg+(next_valuesd[k+1]-last_valuedg)/(tc_diff/U_SEC)*(tc_diff2/U_SEC)+.5;
+          valds[k+2]=last_valuedb+(next_valuesd[k+2]-last_valuedb)/(tc_diff/U_SEC)*(tc_diff2/U_SEC)+.5;
+
+          lives_free(last_valuesd);
+          lives_free(next_valuesd);
+        }
+        j+=3;
+        break;
+        // TODO - other colorspaces (e.g. RGBA32)
       } // cspace
       break; // color
     case WEED_HINT_INTEGER:
       // get gui
       if (weed_plant_has_leaf(wtmpl,"gui")) gui=weed_get_plantptr_value(wtmpl,"gui",&error);
       if (gui!=NULL&&weed_plant_has_leaf(gui,"choices")) {
-	// no interpolation
-	if (npc[j]!=NULL&&get_event_timecode((weed_plant_t *)npc[j])==tc) {
-	  nvalis=weed_get_int_array((weed_plant_t *)npc[j],"value",&error);
-	  valis[j]=nvalis[j];
-	  weed_free(nvalis);
-	  continue;
-	}
-	else {
-	  // use last_pchange value
-	  xnum=weed_leaf_num_elements((weed_plant_t *)lpc[j],"value");
-	  if (xnum>j) {
-	    nvalis=weed_get_int_array((weed_plant_t *)lpc[j],"value",&error);
-	    valis[j]=nvalis[j];
-	    weed_free(nvalis);
-	  }
-	  else valis[j]=get_default_element_int(param,j,1,0);
-	  continue;
-	}
-      }
-      else {
-	if (lpc[j]==NULL) {
-	  // before first change
-	  valis[j]=get_default_element_int(param,j,1,0);
-	  continue;
-	}
-	if (npc[j]==NULL) {
-	  // after last change
-	  xnum=weed_leaf_num_elements((weed_plant_t *)lpc[j],"value");
-	  if (xnum>j) {
-	    nvalis=weed_get_int_array((weed_plant_t *)lpc[j],"value",&error);
-	    valis[j]=nvalis[j];
-	    weed_free(nvalis);
-	  }
-	  else valis[j]=get_default_element_int(param,j,1,0);
-	  continue;
-	}
-	
-	next_valuesi=weed_get_int_array((weed_plant_t *)npc[j],"value",&error);
-	last_valuesi=weed_get_int_array((weed_plant_t *)lpc[j],"value",&error);
-	xnum=weed_leaf_num_elements((weed_plant_t *)lpc[j],"value");
-	if (xnum>j) last_valuei=last_valuesi[j];
-	else last_valuei=get_default_element_int(param,j,1,0);
-	
-	valis[j]=last_valuei+(next_valuesi[j]-last_valuei)/(tc_diff/U_SEC)*
-	  ((tc-weed_get_int64_value((weed_plant_t *)lpc[j],"timecode",&error))/U_SEC)+.5;
-
-	weed_free(last_valuesi);
-	weed_free(next_valuesi);
-	break;
+        // no interpolation
+        if (npc[j]!=NULL&&get_event_timecode((weed_plant_t *)npc[j])==tc) {
+          nvalis=weed_get_int_array((weed_plant_t *)npc[j],"value",&error);
+          valis[j]=nvalis[j];
+          lives_free(nvalis);
+          continue;
+        } else {
+          // use last_pchange value
+          xnum=weed_leaf_num_elements((weed_plant_t *)lpc[j],"value");
+          if (xnum>j) {
+            nvalis=weed_get_int_array((weed_plant_t *)lpc[j],"value",&error);
+            valis[j]=nvalis[j];
+            lives_free(nvalis);
+          } else valis[j]=get_default_element_int(param,j,1,0);
+          continue;
+        }
+      } else {
+        if (lpc[j]==NULL) {
+          // before first change
+          valis[j]=get_default_element_int(param,j,1,0);
+          continue;
+        }
+        if (npc[j]==NULL) {
+          // after last change
+          xnum=weed_leaf_num_elements((weed_plant_t *)lpc[j],"value");
+          if (xnum>j) {
+            nvalis=weed_get_int_array((weed_plant_t *)lpc[j],"value",&error);
+            valis[j]=nvalis[j];
+            lives_free(nvalis);
+          } else valis[j]=get_default_element_int(param,j,1,0);
+          continue;
+        }
+
+        next_valuesi=weed_get_int_array((weed_plant_t *)npc[j],"value",&error);
+        last_valuesi=weed_get_int_array((weed_plant_t *)lpc[j],"value",&error);
+        xnum=weed_leaf_num_elements((weed_plant_t *)lpc[j],"value");
+        if (xnum>j) last_valuei=last_valuesi[j];
+        else last_valuei=get_default_element_int(param,j,1,0);
+
+        valis[j]=last_valuei+(next_valuesi[j]-last_valuei)/(tc_diff/U_SEC)*
+                 ((tc-weed_get_int64_value((weed_plant_t *)lpc[j],"timecode",&error))/U_SEC)+.5;
+
+        lives_free(last_valuesi);
+        lives_free(next_valuesi);
+        break;
       }
     case WEED_HINT_SWITCH:
       // no interpolation
       if (npc[j]!=NULL&&get_event_timecode((weed_plant_t *)npc[j])==tc) {
-	nvalis=weed_get_boolean_array((weed_plant_t *)npc[j],"value",&error);
-	valis[j]=nvalis[j];
-	weed_free(nvalis);
-	continue;
-      }
-      else {
-	// use last_pchange value
-	xnum=weed_leaf_num_elements((weed_plant_t *)lpc[j],"value");
-	if (xnum>j) {
-	  nvalis=weed_get_boolean_array((weed_plant_t *)lpc[j],"value",&error);
-	  valis[j]=nvalis[j];
-	  weed_free(nvalis);
-	}
-	else valis[j]=get_default_element_bool(param,j);
-	continue;
+        nvalis=weed_get_boolean_array((weed_plant_t *)npc[j],"value",&error);
+        valis[j]=nvalis[j];
+        lives_free(nvalis);
+        continue;
+      } else {
+        // use last_pchange value
+        xnum=weed_leaf_num_elements((weed_plant_t *)lpc[j],"value");
+        if (xnum>j) {
+          nvalis=weed_get_boolean_array((weed_plant_t *)lpc[j],"value",&error);
+          valis[j]=nvalis[j];
+          lives_free(nvalis);
+        } else valis[j]=get_default_element_bool(param,j);
+        continue;
       }
       break;
     case WEED_HINT_TEXT:
@@ -9741,29 +9695,27 @@
       valss=weed_get_string_array(param,"value",&error);
 
       if (npc[j]!=NULL&&get_event_timecode((weed_plant_t *)npc[j])==tc) {
-	nvalss=weed_get_string_array((weed_plant_t *)npc[j],"value",&error);
-	valss[j]=g_strdup(nvalss[j]);
-	for (k=0;k<num_values;k++) weed_free(nvalss[k]);
-	weed_free(nvalss);
-	weed_set_string_array(param,"value",num_values,valss);
-	for (k=0;k<num_values;k++) weed_free(valss[k]);
-	weed_free(valss);
-	continue;
-      }
-      else {
-	// use last_pchange value
-	xnum=weed_leaf_num_elements((weed_plant_t *)lpc[j],"value");
-	if (xnum>j) {
-	  nvalss=weed_get_string_array((weed_plant_t *)lpc[j],"value",&error);
-	  valss[j]=g_strdup(nvalss[j]);
-	  for (k=0;k<xnum;k++) weed_free(nvalss[k]);
-	  weed_free(nvalss);
-	}
-	else valss[j]=get_default_element_string(param,j);
-	weed_set_string_array(param,"value",num_values,valss);
-	for (k=0;k<num_values;k++) weed_free(valss[k]);
-	weed_free(valss);
-	continue;
+        nvalss=weed_get_string_array((weed_plant_t *)npc[j],"value",&error);
+        valss[j]=lives_strdup(nvalss[j]);
+        for (k=0; k<num_values; k++) lives_free(nvalss[k]);
+        lives_free(nvalss);
+        weed_set_string_array(param,"value",num_values,valss);
+        for (k=0; k<num_values; k++) lives_free(valss[k]);
+        lives_free(valss);
+        continue;
+      } else {
+        // use last_pchange value
+        xnum=weed_leaf_num_elements((weed_plant_t *)lpc[j],"value");
+        if (xnum>j) {
+          nvalss=weed_get_string_array((weed_plant_t *)lpc[j],"value",&error);
+          valss[j]=lives_strdup(nvalss[j]);
+          for (k=0; k<xnum; k++) lives_free(nvalss[k]);
+          lives_free(nvalss);
+        } else valss[j]=get_default_element_string(param,j);
+        weed_set_string_array(param,"value",num_values,valss);
+        for (k=0; k<num_values; k++) lives_free(valss[k]);
+        lives_free(valss);
+        continue;
       }
       break;
     } // parameter hint
@@ -9773,37 +9725,36 @@
   switch (hint) {
   case WEED_HINT_FLOAT:
     weed_set_double_array(param,"value",num_values,valds);
-    g_free(valds);
+    lives_free(valds);
     break;
   case WEED_HINT_COLOR:
     switch (cspace) {
     case WEED_COLORSPACE_RGB:
       if (weed_leaf_seed_type(wtmpl,"default")==WEED_SEED_INT) {
-	weed_set_int_array(param,"value",num_values,valis);
-	g_free(valis);
-      }
-      else {
-	weed_set_double_array(param,"value",num_values,valds);
-	g_free(valds);
+        weed_set_int_array(param,"value",num_values,valis);
+        lives_free(valis);
+      } else {
+        weed_set_double_array(param,"value",num_values,valds);
+        lives_free(valds);
       }
       break;
     }
     break;
   case WEED_HINT_INTEGER:
     weed_set_int_array(param,"value",num_values,valis);
-    g_free(valis);
+    lives_free(valis);
     break;
   case WEED_HINT_SWITCH:
     weed_set_boolean_array(param,"value",num_values,valis);
-    g_free(valis);
+    lives_free(valis);
     break;
   }
 
   pthread_mutex_unlock(&mainw->interp_mutex);
 
-  g_free(npc);
-  g_free(lpc);
-  weed_free(in_params);
+  lives_free(npc);
+  lives_free(lpc);
+  lives_free(in_params);
   return TRUE;
 }
 
@@ -9825,11 +9776,11 @@
 
     if (num_params==0) continue; // no in_parameters ==> do nothing
 
-    for (i=offset;i<offset+num_params;i++) {
+    for (i=offset; i<offset+num_params; i++) {
       if (!is_hidden_param(inst,i-offset)) {
-	pchain=pchains[i];
-	if (pchain!=NULL&&WEED_PLANT_IS_EVENT((weed_plant_t *)pchain)&&WEED_EVENT_IS_PARAM_CHANGE((weed_plant_t *)pchain))
-	  if (!interpolate_param(inst,i-offset,pchain,tc)) return FALSE; // FALSE if param is not ready
+        pchain=pchains[i];
+        if (pchain!=NULL&&WEED_PLANT_IS_EVENT((weed_plant_t *)pchain)&&WEED_EVENT_IS_PARAM_CHANGE((weed_plant_t *)pchain))
+          if (!interpolate_param(inst,i-offset,pchain,tc)) return FALSE; // FALSE if param is not ready
       }
     }
 
@@ -9848,51 +9799,57 @@
 ///////////////////////////////////////////////////////////
 ////// hashnames
 
-gchar *make_weed_hashname(int filter_idx, boolean fullname, boolean use_extra_authors) {
+char *make_weed_hashname(int filter_idx, boolean fullname, boolean use_extra_authors) {
   // return value should be freed after use
 
   // make hashname from filter_idx: if use_extra_authors is set we use "extra_authors" instead of "authors"
   // (for reverse compatibility)
 
   weed_plant_t *filter,*plugin_info;
-  gchar *plugin_name,*filter_name,*filter_author,*filter_version,*hashname;
+
+  char plugin_fname[PATH_MAX];
+
+  char *plugin_name,*filter_name,*filter_author,*filter_version,*hashname,*filename;
+
   int error,version;
-  gchar plugin_fname[PATH_MAX];
 
-  if (filter_idx<0||filter_idx>=num_weed_filters) return g_strdup("");
+  if (filter_idx<0||filter_idx>=num_weed_filters) return lives_strdup("");
 
   filter=weed_filters[filter_idx];
 
-  if (hashnames[filter_idx]!=NULL&&fullname&&(!use_extra_authors||!weed_plant_has_leaf(filter,"extra_authors"))) 
-    return g_strdup(hashnames[filter_idx]);
+  if (hashnames[filter_idx]!=NULL&&fullname&&(!use_extra_authors||!weed_plant_has_leaf(filter,"extra_authors")))
+    return lives_strdup(hashnames[filter_idx]);
 
   if (weed_plant_has_leaf(filter,"plugin_info")) {
     plugin_info=weed_get_plantptr_value(filter,"plugin_info",&error);
     plugin_name=weed_get_string_value(plugin_info,"name",&error);
 
-    g_snprintf(plugin_fname,PATH_MAX,"%s",plugin_name);
-    weed_free(plugin_name);
+    lives_snprintf(plugin_fname,PATH_MAX,"%s",plugin_name);
+    lives_free(plugin_name);
     get_filename(plugin_fname,TRUE);
-  }
-  else memset(plugin_fname,0,1);
+  } else memset(plugin_fname,0,1);
 
   filter_name=weed_get_string_value(filter,"name",&error);
 
+  // should we really use utf-8 here ? (needs checking)
+  filename=F2U8(plugin_fname);
+
   if (fullname) {
+
     if (!use_extra_authors||!weed_plant_has_leaf(filter,"extra_authors"))
       filter_author=weed_get_string_value(filter,"author",&error);
-    else 
+    else
       filter_author=weed_get_string_value(filter,"extra_authors",&error);
- 
+
     version=weed_get_int_value(filter,"version",&error);
-    filter_version=g_strdup_printf("%d",version);
+    filter_version=lives_strdup_printf("%d",version);
 
-    hashname=g_strconcat(plugin_fname,filter_name,filter_author,filter_version,NULL);
-    weed_free(filter_author);
-    g_free(filter_version);
-  }
-  else hashname=g_strconcat(plugin_fname,filter_name,NULL);
-  weed_free(filter_name);
+    hashname=lives_strconcat(filename,filter_name,filter_author,filter_version,NULL);
+    lives_free(filter_author);
+    lives_free(filter_version);
+  } else hashname=lives_strconcat(filename,filter_name,NULL);
+  lives_free(filter_name);
+  lives_free(filename);
 
   //g_print("added filter %s\n",hashname);
 
@@ -9901,27 +9858,147 @@
 
 
 
-int weed_get_idx_for_hashname (const gchar *hashname, boolean fullname) {
-  int i;
-  gchar *chashname;
+int weed_get_idx_for_hashname(const char *hashname, boolean fullname) {
+  register int i;
+  char *chashname;
 
-  for (i=0;i<num_weed_filters;i++) {
+  for (i=0; i<num_weed_filters; i++) {
     chashname=make_weed_hashname(i,fullname,FALSE);
-    if (!strcmp(hashname,chashname)) {
-      g_free(chashname);
+    if (!lives_utf8_strcasecmp(hashname,chashname)) {
+      lives_free(chashname);
       return i;
     }
-    g_free(chashname);
-    chashname=make_weed_hashname(i,fullname,TRUE);
-    if (!strcmp(hashname,chashname)) {
-      g_free(chashname);
-      return i;
+    lives_free(chashname);
+    if (fullname) {
+      chashname=make_weed_hashname(i,fullname,TRUE);
+      if (!lives_utf8_strcasecmp(hashname,chashname)) {
+        lives_free(chashname);
+        return i;
+      }
+      lives_free(chashname);
     }
-    g_free(chashname);
   }
   return -1;
 }
 
+
+
+static boolean check_match(weed_plant_t *filter, const char *pkg, const char *fxname, const char *auth, int version) {
+  // perform template matching for a function, see weed_get_indices_from_template()
+
+  weed_plant_t *plugin_info;
+
+  char plugin_fname[PATH_MAX];
+  char *plugin_name,*filter_name,*filter_author;
+
+  int filter_version;
+  int error;
+
+  if (pkg != NULL && strlen(pkg)) {
+    char *filename;
+
+    if (weed_plant_has_leaf(filter,"plugin_info")) {
+      plugin_info=weed_get_plantptr_value(filter,"plugin_info",&error);
+      plugin_name=weed_get_string_value(plugin_info,"name",&error);
+
+      lives_snprintf(plugin_fname,PATH_MAX,"%s",plugin_name);
+      lives_free(plugin_name);
+      get_filename(plugin_fname,TRUE);
+    } else memset(plugin_fname,0,1);
+
+    filename=F2U8(plugin_fname);
+
+    if (lives_utf8_strcasecmp(pkg,filename)) {
+      lives_free(filename);
+      return FALSE;
+    }
+    lives_free(filename);
+  }
+
+
+  if (fxname != NULL && strlen(fxname)) {
+    filter_name=weed_get_string_value(filter,"name",&error);
+    if (lives_utf8_strcasecmp(fxname,filter_name)) {
+      lives_free(filter_name);
+      return FALSE;
+    }
+    lives_free(filter_name);
+  }
+
+  if (auth != NULL && strlen(auth)) {
+    filter_author=weed_get_string_value(filter,"author",&error);
+    if (lives_utf8_strcasecmp(auth,filter_author)) {
+      if (weed_plant_has_leaf(filter,"extra_authors")) {
+        lives_free(filter_author);
+        filter_author=weed_get_string_value(filter,"extra_authors",&error);
+        if (lives_utf8_strcasecmp(auth,filter_author)) {
+          lives_free(filter_author);
+          return FALSE;
+        }
+      } else {
+        lives_free(filter_author);
+        return FALSE;
+      }
+    }
+    lives_free(filter_author);
+  }
+
+
+  if (version>0) {
+    filter_version=weed_get_int_value(filter,"version",&error);
+    if (version!=filter_version) return FALSE;
+  }
+
+  return TRUE;
+}
+
+
+
+int *weed_get_indices_from_template(const char *pkg, const char *fxname, const char *auth, int version) {
+  // generate a list of filter indices from a given template. Char values may be NULL or "" to signify match-any.
+  // version may be 0 to signify match-any
+  // otherwise values must match those specified
+
+  // returns: a list of int indices, with the last value == -1
+  // return value should be freed after use
+
+  weed_plant_t *filter;
+  int *rvals;
+
+  int count=1,count2=0;
+
+  register int i;
+
+  // count number of return values
+  for (i=0; i<num_weed_filters; i++) {
+    filter=weed_filters[i];
+
+    if (check_match(filter,pkg,fxname,auth,version)) {
+      count++;
+    }
+  }
+
+  // allocate storage space
+  rvals=(int *)lives_malloc(count*sizint);
+  i=0;
+
+  // get return values
+  while (count2 < count-1) {
+    filter=weed_filters[i++];
+
+    if (check_match(filter,pkg,fxname,auth,version)) {
+      rvals[count2++]=i-1;
+    }
+  }
+
+  // end-of-array indicator
+  rvals[count2]=-1;
+
+  return rvals;
+}
+
+
+
 weed_plant_t *get_weed_filter(int idx) {
   if (idx>-1&&idx<num_weed_filters) return weed_filters[idx];
   return NULL;
@@ -9930,7 +10007,7 @@
 
 
 
-static void weed_leaf_serialise (int fd, weed_plant_t *plant, const char *key, boolean write_all, unsigned char **mem) {
+static void weed_leaf_serialise(int fd, weed_plant_t *plant, const char *key, boolean write_all, unsigned char **mem) {
   void *value,*valuer;
   uint32_t vlen;
   int st,ne;
@@ -9944,8 +10021,7 @@
     if (mem==NULL) {
       lives_write_le_buffered(fd,&i,4,TRUE);
       lives_write_buffered(fd,key,(size_t)i,TRUE);
-    }
-    else {
+    } else {
       lives_memcpy(*mem,&i,4);
       *mem+=4;
       lives_memcpy(*mem,key,(size_t)i);
@@ -9972,40 +10048,36 @@
 
 
   // for each element, write the data size followed by the data
-  for (j=0;j<ne;j++) {
+  for (j=0; j<ne; j++) {
     vlen=(uint32_t)weed_leaf_element_size(plant,key,j);
     if (st!=WEED_SEED_STRING) {
-      value=g_malloc((size_t)vlen);
+      value=lives_malloc((size_t)vlen);
       weed_leaf_get(plant,key,j,value);
-    }
-    else {
-      value=g_malloc((size_t)(vlen+1));
+    } else {
+      value=lives_malloc((size_t)(vlen+1));
       weed_leaf_get(plant,key,j,&value);
     }
 
     if (mem==NULL && weed_leaf_seed_type(plant,key)>=64) {
       // save voidptr as 64 bit values (**NEW**)
-      valuer=(uint64_t *)g_malloc(sizeof(uint64_t));
+      valuer=(uint64_t *)lives_malloc(sizeof(uint64_t));
       *((uint64_t *)valuer)=(uint64_t)(*((void **)value));
       vlen=sizeof(uint64_t);
-    }
-    else valuer=value;
+    } else valuer=value;
 
     if (mem==NULL) {
       lives_write_le_buffered(fd,&vlen,4,TRUE);
       if (st!=WEED_SEED_STRING) {
-	lives_write_le_buffered(fd,valuer,(size_t)vlen,TRUE);
-      }
-      else lives_write_buffered(fd,valuer,(size_t)vlen,TRUE);
-    }
-    else {
+        lives_write_le_buffered(fd,valuer,(size_t)vlen,TRUE);
+      } else lives_write_buffered(fd,valuer,(size_t)vlen,TRUE);
+    } else {
       lives_memcpy(*mem,&vlen,4);
       *mem+=4;
       lives_memcpy(*mem,value,(size_t)vlen);
       *mem+=vlen;
     }
-    g_free(value);
-    if (valuer!=value) g_free(valuer);
+    lives_free(value);
+    if (valuer!=value) lives_free(valuer);
   }
 
   // write errors will be checked for by the calling function
@@ -10021,7 +10093,7 @@
   int i=0;
   char **proplist=weed_plant_list_leaves(plant);
   char *prop;
-  for (prop=proplist[0];(prop=proplist[i])!=NULL;i++);
+  for (prop=proplist[0]; (prop=proplist[i])!=NULL; i++);
 
   if (mem==NULL) lives_write_le_buffered(fd,&i,4,TRUE); // write number of leaves
   else {
@@ -10034,19 +10106,19 @@
   weed_leaf_serialise(fd,plant,"type",TRUE,mem);
   i=0;
 
-  for (prop=proplist[0];(prop=proplist[i])!=NULL;i++) {
+  for (prop=proplist[0]; (prop=proplist[i])!=NULL; i++) {
     // write each leaf and key
     if (strcmp(prop,"type")) weed_leaf_serialise(fd,plant,prop,TRUE,mem);
-    weed_free(prop);
+    lives_free(prop);
   }
-  weed_free(proplist);
+  lives_free(proplist);
   return TRUE;
 }
 
 
 
-static int weed_leaf_deserialise(int fd, weed_plant_t *plant, const gchar *key, unsigned char **mem, 
-				  boolean check_key) {
+static int weed_leaf_deserialise(int fd, weed_plant_t *plant, const char *key, unsigned char **mem,
+                                 boolean check_key) {
   // if plant is NULL, returns type
   // "host_default" sets key; otherwise NULL
   // check_key set to TRUE - check that we read the correct key
@@ -10061,7 +10133,7 @@
 
   uint32_t len,vlen;
 
-  gchar *mykey=NULL;
+  char *mykey=NULL;
 
   int st; // seed type
   int ne; // num elems
@@ -10072,10 +10144,9 @@
   if (key==NULL || check_key) {
     if (mem==NULL) {
       if (lives_read_le_buffered(fd,&len,4,TRUE)<4) {
-	return -4;
+        return -4;
       }
-    }
-    else {
+    } else {
       lives_memcpy(&len,*mem,4);
       *mem+=4;
     }
@@ -10083,30 +10154,29 @@
     if (check_key&&len!=strlen(key)) return -9;
 
     if (len>65535) return -10;
-  
-    mykey=(gchar *)g_try_malloc((size_t)len+1);
+
+    mykey=(char *)lives_try_malloc((size_t)len+1);
     if (mykey==NULL) return -5;
 
     if (mem==NULL) {
       if (lives_read_buffered(fd,mykey,(size_t)len,TRUE)<len) {
-	g_free(mykey);
-	return -4;
+        lives_free(mykey);
+        return -4;
       }
-    }
-    else {
+    } else {
       lives_memcpy(mykey,*mem,(size_t)len);
       *mem+=len;
     }
     memset(mykey+(size_t)len,0,1);
 
     if (check_key&&strcmp(mykey,key)) {
-      g_free(mykey);
+      lives_free(mykey);
       return -1;
     }
 
     if (key==NULL) key=mykey;
     else {
-      g_free(mykey);
+      lives_free(mykey);
       mykey=NULL;
     }
   }
@@ -10114,11 +10184,10 @@
 
   if (mem==NULL) {
     if (lives_read_le_buffered(fd,&st,4,TRUE)<4) {
-      if (mykey!=NULL) g_free(mykey);
+      if (mykey!=NULL) lives_free(mykey);
       return -4;
     }
-  }
-  else {
+  } else {
     lives_memcpy(&st,*mem,4);
     *mem+=4;
   }
@@ -10138,17 +10207,16 @@
 
   if (mem==NULL) {
     if (lives_read_le_buffered(fd,&ne,4,TRUE)<4) {
-      if (mykey!=NULL) g_free(mykey);
+      if (mykey!=NULL) lives_free(mykey);
       return -4;
     }
-  }
-  else {
+  } else {
     lives_memcpy(&ne,*mem,4);
     *mem+=4;
   }
 
 
-  if (ne>0) values=(void **)g_malloc(ne*sizeof(void *));
+  if (ne>0) values=(void **)lives_malloc(ne*sizeof(void *));
   else values=NULL;
 
   if (check_key&&!strcmp(key,"type")) {
@@ -10158,44 +10226,40 @@
     }
   }
 
-  for (i=0;i<ne;i++) {
+  for (i=0; i<ne; i++) {
     if (mem==NULL) {
       bytes=lives_read_le_buffered(fd,&vlen,4,TRUE);
       if (bytes<4) {
-	for (--i;i>=0;g_free(values[i--]));
-	g_free(values);
-	if (mykey!=NULL) g_free(mykey);
-	return -4;
+        for (--i; i>=0; lives_free(values[i--]));
+        lives_free(values);
+        if (mykey!=NULL) lives_free(mykey);
+        return -4;
       }
-    }
-    else {
+    } else {
       lives_memcpy(&vlen,*mem,4);
       *mem+=4;
     }
 
     if (st==WEED_SEED_STRING) {
-      values[i]=g_malloc((size_t)vlen+1);
-    }
-    else {
+      values[i]=lives_malloc((size_t)vlen+1);
+    } else {
       if (vlen<=8) {
-	values[i]=g_malloc((size_t)vlen);
-      }
-      else return -8;
+        values[i]=lives_malloc((size_t)vlen);
+      } else return -8;
     }
 
     if (mem==NULL) {
       if (st!=WEED_SEED_STRING)
-	bytes=lives_read_le_buffered(fd,values[i],vlen,TRUE);
-      else 
-	bytes=lives_read_buffered(fd,values[i],vlen,TRUE);
+        bytes=lives_read_le_buffered(fd,values[i],vlen,TRUE);
+      else
+        bytes=lives_read_buffered(fd,values[i],vlen,TRUE);
       if (bytes<vlen) {
-	for (--i;i>=0;g_free(values[i--]));
-	g_free(values);
-	if (mykey!=NULL) g_free(mykey);
-	return -4;
+        for (--i; i>=0; lives_free(values[i--]));
+        lives_free(values);
+        if (mykey!=NULL) lives_free(mykey);
+        return -4;
       }
-    }
-    else {
+    } else {
       lives_memcpy(values[i],*mem,vlen);
       *mem+=vlen;
     }
@@ -10205,60 +10269,58 @@
   }
 
   if (plant==NULL&&!strcmp(key,"type")) {
-    type=*(int*)(values[0]);
-  }
-  else {
+    type=*(int *)(values[0]);
+  } else {
     if (values==NULL) weed_leaf_set(plant,key,st,0,NULL);
     else {
       switch (st) {
       case WEED_SEED_INT:
-	// fallthrough
+        // fallthrough
       case WEED_SEED_BOOLEAN:
-	ints=(int *)g_malloc(ne*4);
-	for (j=0;j<ne;j++) ints[j]=*(int *)values[j];
-	weed_leaf_set (plant, key, st, ne, (void *)ints);
-	g_free(ints);
-	break;
+        ints=(int *)lives_malloc(ne*4);
+        for (j=0; j<ne; j++) ints[j]=*(int *)values[j];
+        weed_leaf_set(plant, key, st, ne, (void *)ints);
+        lives_free(ints);
+        break;
       case WEED_SEED_DOUBLE:
-	dubs=(double *)g_malloc(ne*sizdbl);
-	for (j=0;j<ne;j++) dubs[j]=*(double *)values[j];
-	weed_leaf_set (plant, key, st, ne, (void *)dubs);
-	g_free(dubs);
-	break;
+        dubs=(double *)lives_malloc(ne*sizdbl);
+        for (j=0; j<ne; j++) dubs[j]=*(double *)values[j];
+        weed_leaf_set(plant, key, st, ne, (void *)dubs);
+        lives_free(dubs);
+        break;
       case WEED_SEED_INT64:
-	int64s=(int64_t *)g_malloc(ne*8);
-	for (j=0;j<ne;j++) int64s[j]=*(int64_t *)values[j];
-	weed_leaf_set (plant, key, st, ne, (void *)int64s);
-	g_free(int64s);
-	break;
+        int64s=(int64_t *)lives_malloc(ne*8);
+        for (j=0; j<ne; j++) int64s[j]=*(int64_t *)values[j];
+        weed_leaf_set(plant, key, st, ne, (void *)int64s);
+        lives_free(int64s);
+        break;
       case WEED_SEED_STRING:
-	weed_leaf_set (plant, key, st, ne, (void *)values);
-	break;
+        weed_leaf_set(plant, key, st, ne, (void *)values);
+        break;
       default:
-	if (plant!=NULL) {
-	  if (mem==NULL && prefs->force64bit) {
-	    // force pointers to uint64_t
-	    uint64_t *voids=(uint64_t *)g_malloc(ne*sizeof(uint64_t));
-	    for (j=0;j<ne;j++) voids[j]=(uint64_t)(*(void **)values[j]);
-	    weed_leaf_set (plant, key, WEED_SEED_INT64, ne, (void *)voids);
-	    g_free(voids);
-	  }
-	  else {
-	    void **voids=(void **)g_malloc(ne*sizeof(void *));
-	    for (j=0;j<ne;j++) voids[j]=*(void **)values[j];
-	    weed_leaf_set (plant, key, st, ne, (void *)voids);
-	    g_free(voids);
-	  }
-	}
+        if (plant!=NULL) {
+          if (mem==NULL && prefs->force64bit) {
+            // force pointers to uint64_t
+            uint64_t *voids=(uint64_t *)lives_malloc(ne*sizeof(uint64_t));
+            for (j=0; j<ne; j++) voids[j]=(uint64_t)(*(void **)values[j]);
+            weed_leaf_set(plant, key, WEED_SEED_INT64, ne, (void *)voids);
+            lives_free(voids);
+          } else {
+            void **voids=(void **)lives_malloc(ne*sizeof(void *));
+            for (j=0; j<ne; j++) voids[j]=*(void **)values[j];
+            weed_leaf_set(plant, key, st, ne, (void *)voids);
+            lives_free(voids);
+          }
+        }
       }
     }
   }
 
   if (values!=NULL) {
-    for (i=0;i<ne;i++) g_free(values[i]);
-    g_free(values);
+    for (i=0; i<ne; i++) lives_free(values[i]);
+    lives_free(values);
   }
-  if (mykey!=NULL) g_free(mykey);
+  if (mykey!=NULL) lives_free(mykey);
   if (plant==NULL) return type;
   return 0;
 }
@@ -10279,14 +10341,13 @@
       mainw->read_failed=FALSE; // we are allowed to EOF here
       return NULL;
     }
-  }
-  else {
+  } else {
     lives_memcpy(&numleaves,*mem,4);
     *mem+=4;
   }
 
   plant=weed_plant_new(WEED_PLANT_UNKNOWN);
-  weed_leaf_set_flags (plant,"type",0);
+  weed_leaf_set_flags(plant,"type",0);
 
   if ((err=weed_leaf_deserialise(fd,plant,"type",mem,TRUE))) {
     // check the "type" leaf first
@@ -10306,16 +10367,16 @@
     weed_plant_free(plant);
     return NULL;
   }
-  weed_leaf_set_flags (plant,"type",WEED_LEAF_READONLY_PLUGIN|WEED_LEAF_READONLY_HOST);
+  weed_leaf_set_flags(plant,"type",WEED_LEAF_READONLY_PLUGIN|WEED_LEAF_READONLY_HOST);
 
   return plant;
 }
 
 
 
-boolean write_filter_defaults (int fd, int idx) {
+boolean write_filter_defaults(int fd, int idx) {
   // return FALSE on write error
-  gchar *hashname;
+  char *hashname;
   weed_plant_t *filter=weed_filters[idx],**ptmpls;
   int num_params=weed_leaf_num_elements(filter,"in_parameter_templates");
   int i,error;
@@ -10326,7 +10387,7 @@
   if (num_params==0) return TRUE;
   ptmpls=weed_get_plantptr_array(filter,"in_parameter_templates",&error);
 
-  for (i=0;i<num_params;i++) {
+  for (i=0; i<num_params; i++) {
     if (weed_plant_has_leaf(ptmpls[i],"host_default")) {
       ntowrite++;
     }
@@ -10334,17 +10395,17 @@
 
   mainw->write_failed=FALSE;
 
-  for (i=0;i<num_params;i++) {
+  for (i=0; i<num_params; i++) {
     if (weed_plant_has_leaf(ptmpls[i],"host_default")) {
       if (!wrote_hashname) {
-	hashname=make_weed_hashname(idx,TRUE,FALSE);
-	vlen=strlen(hashname);
-	
-	lives_write_le_buffered(fd,&vlen,4,TRUE);
-	lives_write_buffered(fd,hashname,vlen,TRUE);
-	g_free(hashname);
-	wrote_hashname=TRUE;
-	lives_write_le_buffered(fd,&ntowrite,4,TRUE);
+        hashname=make_weed_hashname(idx,TRUE,FALSE);
+        vlen=strlen(hashname);
+
+        lives_write_le_buffered(fd,&vlen,4,TRUE);
+        lives_write_buffered(fd,hashname,vlen,TRUE);
+        lives_free(hashname);
+        wrote_hashname=TRUE;
+        lives_write_le_buffered(fd,&ntowrite,4,TRUE);
       }
       lives_write_le_buffered(fd,&i,4,TRUE);
       weed_leaf_serialise(fd,ptmpls[i],"host_default",FALSE,NULL);
@@ -10352,7 +10413,7 @@
   }
   if (wrote_hashname) lives_write_buffered(fd,"\n",1,TRUE);
 
-  if (ptmpls!=NULL) weed_free(ptmpls);
+  if (ptmpls!=NULL) lives_free(ptmpls);
 
   if (mainw->write_failed) {
     return FALSE;
@@ -10375,7 +10436,7 @@
 
   boolean found=FALSE;
 
-  gchar *tmp;
+  char *tmp;
 
   mainw->read_failed=FALSE;
 
@@ -10397,38 +10458,37 @@
 
     if (capable->byte_order==LIVES_BIG_ENDIAN&&prefs->bigendbug) {
       if (vleni==0&&vlenz!=0) vlen=(size_t)vlenz;
-    }
-    else {
+    } else {
       if (vlenz!=0) {
-	if (lives_lseek_buffered_rdonly(fd,-4)<0) return FALSE;
+        if (lives_lseek_buffered_rdonly(fd,-4)<0) return FALSE;
       }
     }
 
     if (vlen>65535) return FALSE;
 
-    buf=g_malloc(vlen+1);
+    buf=lives_malloc(vlen+1);
     if (lives_read_buffered(fd,buf,vlen,TRUE)<vlen) break;
 
     memset((char *)buf+vlen,0,1);
-    for (i=0;i<num_weed_filters;i++) {
-      if (!strcmp((gchar *)buf,(tmp=make_weed_hashname(i,TRUE,FALSE)))) {
-	g_free(tmp);
-	found=TRUE;
-	break;
+    for (i=0; i<num_weed_filters; i++) {
+      if (!strcmp((char *)buf,(tmp=make_weed_hashname(i,TRUE,FALSE)))) {
+        lives_free(tmp);
+        found=TRUE;
+        break;
       }
-      g_free(tmp);
+      lives_free(tmp);
     }
     if (!found) {
-      for (i=0;i<num_weed_filters;i++) {
-	if (!strcmp((gchar *)buf,(tmp=make_weed_hashname(i,TRUE,TRUE)))) {
-	  g_free(tmp);
-	  break;
-	}
-	g_free(tmp);
+      for (i=0; i<num_weed_filters; i++) {
+        if (!strcmp((char *)buf,(tmp=make_weed_hashname(i,TRUE,TRUE)))) {
+          lives_free(tmp);
+          break;
+        }
+        lives_free(tmp);
       }
     }
 
-    g_free(buf);
+    lives_free(buf);
 
     ptmpls=NULL;
 
@@ -10436,41 +10496,39 @@
       filter=weed_filters[i];
       num_params=weed_leaf_num_elements(filter,"in_parameter_templates");
       if (num_params>0) ptmpls=weed_get_plantptr_array(filter,"in_parameter_templates",&error);
-    }
-    else num_params=0;
+    } else num_params=0;
 
     if (lives_read_le_buffered(fd,&ntoread,4,TRUE)<4) {
-      if (ptmpls!=NULL) weed_free(ptmpls);
+      if (ptmpls!=NULL) lives_free(ptmpls);
       break;
     }
 
-    for (i=0;i<ntoread;i++) {
+    for (i=0; i<ntoread; i++) {
       if (lives_read_le_buffered(fd,&pnum,4,TRUE)<4) {
-	if (ptmpls!=NULL) weed_free(ptmpls);
-	break;
+        if (ptmpls!=NULL) lives_free(ptmpls);
+        break;
       }
 
       if (pnum<num_params) {
-	weed_leaf_deserialise(fd,ptmpls[pnum],"host_default",NULL,FALSE);
-      }
-      else {
-	weed_plant_t *dummyplant=weed_plant_new(WEED_PLANT_UNKNOWN);
-	weed_leaf_deserialise(fd,dummyplant,"host_default",NULL,FALSE);
-	weed_plant_free(dummyplant);
+        weed_leaf_deserialise(fd,ptmpls[pnum],"host_default",NULL,FALSE);
+      } else {
+        weed_plant_t *dummyplant=weed_plant_new(WEED_PLANT_UNKNOWN);
+        weed_leaf_deserialise(fd,dummyplant,"host_default",NULL,FALSE);
+        weed_plant_free(dummyplant);
       }
       if (mainw->read_failed) {
-	break;
+        break;
       }
     }
     if (mainw->read_failed) {
-      if (ptmpls!=NULL) weed_free(ptmpls);
+      if (ptmpls!=NULL) lives_free(ptmpls);
       break;
     }
 
-    buf=g_malloc(strlen("\n"));
+    buf=lives_malloc(strlen("\n"));
     lives_read_buffered(fd,buf,strlen("\n"),TRUE);
-    g_free(buf);
-    if (ptmpls!=NULL) weed_free(ptmpls);
+    lives_free(buf);
+    if (ptmpls!=NULL) lives_free(ptmpls);
     if (mainw->read_failed) {
       break;
     }
@@ -10484,10 +10542,10 @@
 
 
 
-boolean write_generator_sizes (int fd, int idx) {
+boolean write_generator_sizes(int fd, int idx) {
   // TODO - handle optional channels
   // return FALSE on write error
-  gchar *hashname;
+  char *hashname;
   weed_plant_t *filter,**ctmpls;
   int num_channels;
   int i,error;
@@ -10506,23 +10564,23 @@
 
   mainw->write_failed=FALSE;
 
-  for (i=0;i<num_channels;i++) {
+  for (i=0; i<num_channels; i++) {
     if (weed_plant_has_leaf(ctmpls[i],"host_width")||weed_plant_has_leaf(ctmpls[i],"host_height")||
-	(!wrote_hashname&&weed_plant_has_leaf(filter,"host_fps"))) {
+        (!wrote_hashname&&weed_plant_has_leaf(filter,"host_fps"))) {
       if (!wrote_hashname) {
-	hashname=make_weed_hashname(idx,TRUE,FALSE);
-	vlen=strlen(hashname);
-	lives_write_le_buffered(fd,&vlen,4,TRUE);
-	lives_write_buffered(fd,hashname,vlen,TRUE);
-	g_free(hashname);
-	wrote_hashname=TRUE;
-	if (weed_plant_has_leaf(filter,"host_fps")) {
-	  int j=-1;
-	  lives_write_le_buffered(fd,&j,4,TRUE);
-	  weed_leaf_serialise(fd,filter,"host_fps",FALSE,NULL);
-	}
+        hashname=make_weed_hashname(idx,TRUE,FALSE);
+        vlen=strlen(hashname);
+        lives_write_le_buffered(fd,&vlen,4,TRUE);
+        lives_write_buffered(fd,hashname,vlen,TRUE);
+        lives_free(hashname);
+        wrote_hashname=TRUE;
+        if (weed_plant_has_leaf(filter,"host_fps")) {
+          int j=-1;
+          lives_write_le_buffered(fd,&j,4,TRUE);
+          weed_leaf_serialise(fd,filter,"host_fps",FALSE,NULL);
+        }
       }
-  
+
       lives_write_le_buffered(fd,&i,4,TRUE);
       if (weed_plant_has_leaf(ctmpls[i],"host_width")) weed_leaf_serialise(fd,ctmpls[i],"host_width",FALSE,NULL);
       else weed_leaf_serialise(fd,ctmpls[i],"width",FALSE,NULL);
@@ -10546,8 +10604,8 @@
   ssize_t bytes;
   size_t vlen;
 
-  gchar *buf;
-  gchar *tmp;
+  char *buf;
+  char *tmp;
 
   boolean found=FALSE;
 
@@ -10576,12 +10634,11 @@
 
     if (capable->byte_order==LIVES_BIG_ENDIAN&&prefs->bigendbug) {
       if (vleni==0&&vlenz!=0) vlen=(size_t)vlenz;
-    }
-    else {
+    } else {
       if (vlenz!=0) {
-	if (lives_lseek_buffered_rdonly(fd,-4)<0) {
-	  return FALSE;
-	}
+        if (lives_lseek_buffered_rdonly(fd,-4)<0) {
+          return FALSE;
+        }
       }
     }
 
@@ -10589,7 +10646,7 @@
       return FALSE;
     }
 
-    buf=(gchar *)g_malloc(vlen+1);
+    buf=(char *)lives_malloc(vlen+1);
 
     bytes=lives_read_buffered(fd,buf,vlen,TRUE);
     if (bytes<vlen) {
@@ -10597,26 +10654,26 @@
     }
     memset((char *)buf+vlen,0,1);
 
-    for (i=0;i<num_weed_filters;i++) {
+    for (i=0; i<num_weed_filters; i++) {
       if (!strcmp(buf,(tmp=make_weed_hashname(i,TRUE,FALSE)))) {
-	g_free(tmp);
-	found=TRUE;
-	break;
+        lives_free(tmp);
+        found=TRUE;
+        break;
       }
-      g_free(tmp);
+      lives_free(tmp);
     }
     if (!found) {
-      for (i=0;i<num_weed_filters;i++) {
-	if (!strcmp(buf,(tmp=make_weed_hashname(i,TRUE,TRUE)))) {
-	  g_free(tmp);
-	  break;
-	}
-	g_free(tmp);
+      for (i=0; i<num_weed_filters; i++) {
+        if (!strcmp(buf,(tmp=make_weed_hashname(i,TRUE,TRUE)))) {
+          lives_free(tmp);
+          break;
+        }
+        lives_free(tmp);
       }
     }
 
 
-    g_free(buf);
+    lives_free(buf);
     ctmpls=NULL;
 
     if (i<num_weed_filters) {
@@ -10626,34 +10683,33 @@
       if (num_chans>0) ctmpls=weed_get_plantptr_array(filter,"out_channel_templates",&error);
 
       while (!ready) {
-	ready=TRUE;
-	bytes=lives_read_le_buffered(fd,&cnum,4,TRUE);
-	if (bytes<4) {
-	  break;
-	}
-	
-	if (cnum<num_chans&&cnum>=0) {
-	  weed_leaf_deserialise(fd,ctmpls[cnum],"host_width",NULL,FALSE);
-	  weed_leaf_deserialise(fd,ctmpls[cnum],"host_height",NULL,FALSE);
-	  if (weed_get_int_value(ctmpls[cnum],"host_width",&error)==0) 
-	    weed_set_int_value(ctmpls[cnum],"host_width",DEF_GEN_WIDTH);
-	  if (weed_get_int_value(ctmpls[cnum],"host_height",&error)==0) 
-	    weed_set_int_value(ctmpls[cnum],"host_height",DEF_GEN_HEIGHT);
-	}
-	else if (cnum==-1) {
-	  weed_leaf_deserialise(fd,filter,"host_fps",NULL,FALSE);
-	  ready=FALSE;
-	}
+        ready=TRUE;
+        bytes=lives_read_le_buffered(fd,&cnum,4,TRUE);
+        if (bytes<4) {
+          break;
+        }
+
+        if (cnum<num_chans&&cnum>=0) {
+          weed_leaf_deserialise(fd,ctmpls[cnum],"host_width",NULL,FALSE);
+          weed_leaf_deserialise(fd,ctmpls[cnum],"host_height",NULL,FALSE);
+          if (weed_get_int_value(ctmpls[cnum],"host_width",&error)==0)
+            weed_set_int_value(ctmpls[cnum],"host_width",DEF_GEN_WIDTH);
+          if (weed_get_int_value(ctmpls[cnum],"host_height",&error)==0)
+            weed_set_int_value(ctmpls[cnum],"host_height",DEF_GEN_HEIGHT);
+        } else if (cnum==-1) {
+          weed_leaf_deserialise(fd,filter,"host_fps",NULL,FALSE);
+          ready=FALSE;
+        }
       }
     }
-    if (ctmpls!=NULL) weed_free(ctmpls);
+    if (ctmpls!=NULL) lives_free(ctmpls);
 
     if (mainw->read_failed) {
       break;
     }
-    buf=(gchar *)g_malloc(strlen("\n"));
+    buf=(char *)lives_malloc(strlen("\n"));
     lives_read_buffered(fd,buf,strlen("\n"),TRUE);
-    g_free(buf);
+    lives_free(buf);
 
     if (mainw->read_failed) {
       break;
@@ -10668,11 +10724,11 @@
 
 void reset_frame_and_clip_index(void) {
   if (mainw->clip_index==NULL) {
-    mainw->clip_index=(int *)weed_malloc(sizint);
+    mainw->clip_index=(int *)lives_malloc(sizint);
     mainw->clip_index[0]=-1;
   }
   if (mainw->frame_index==NULL) {
-    mainw->frame_index=(int *)weed_malloc(sizint);
+    mainw->frame_index=(int *)lives_malloc(sizint);
     mainw->frame_index[0]=0;
   }
 }
@@ -10707,12 +10763,12 @@
 
   if (xnparams>maxparams) maxparams=xnparams;
 
-  key_defs=(weed_plant_t **)g_malloc(maxparams*sizeof(weed_plant_t *));
-  for (i=0;i<maxparams;i++) {
+  key_defs=(weed_plant_t **)lives_malloc(maxparams*sizeof(weed_plant_t *));
+  for (i=0; i<maxparams; i++) {
     key_defs[i]=NULL;
   }
 
-  for (i=0;i<nparams;i++) {
+  for (i=0; i<nparams; i++) {
     if (key<0||i<xnparams) {
       key_defs[i]=weed_plant_new(WEED_PLANT_PARAMETER);
     }
@@ -10720,75 +10776,75 @@
       // for future - read nvals
       bytes=lives_read_le_buffered(fd,&nvals,4,TRUE);
       if (bytes<4) {
-	goto err123;
+        goto err123;
       }
       bytes=lives_read_le_buffered(fd,&tc,8,TRUE);
       if (bytes<sizeof(weed_timecode_t)) {
-	goto err123;
+        goto err123;
       }
       // read n ints (booleans)
       bytes=lives_read_le_buffered(fd,&nigns,4,TRUE);
       if (bytes<4) {
-	goto err123;
+        goto err123;
       }
       if (nigns>0) {
-	int *igns=(int *)g_malloc(nigns*4);
-	for (j=0;j<nigns;j++) {
-	  bytes=lives_read_le_buffered(fd,&igns[j],4,TRUE);
-	  if (bytes<4) {
-	    goto err123;
-	  }
-	}
-	g_free(igns);
+        int *igns=(int *)lives_malloc(nigns*4);
+        for (j=0; j<nigns; j++) {
+          bytes=lives_read_le_buffered(fd,&igns[j],4,TRUE);
+          if (bytes<4) {
+            goto err123;
+          }
+        }
+        lives_free(igns);
       }
     }
 
     if (weed_leaf_deserialise(fd,key_defs[i],"value",NULL,FALSE)<0) goto err123;
 
     if (ver>1) {
-      for (j=0;j<nvals;j++) {
- 	// for future - read timecodes
-	weed_plant_t *plant=weed_plant_new(WEED_PLANT_PARAMETER);
-	bytes=lives_read_le_buffered(fd,&tc,8,TRUE);
-	if (bytes<8) {
-	  goto err123;
-	}
-	// read n ints (booleans)
-	bytes=lives_read_le_buffered(fd,&nigns,4,TRUE);
-	if (bytes<4) {
-	  goto err123;
-	}
-	if (nigns>0) {
-	  int *igns=(int *)g_malloc(nigns*4);
-	  for (j=0;j<nigns;j++) {
-	    bytes=lives_read_le_buffered(fd,&igns[j],4,TRUE);
-	    if (bytes<4) {
-	      goto err123;
-	    }
-	  }
-	  // discard excess values
-	  ret=weed_leaf_deserialise(fd,plant,"value",NULL,FALSE);
-	  weed_plant_free(plant);
-	  if (ret<0) goto err123;
-	}
+      for (j=0; j<nvals; j++) {
+        // for future - read timecodes
+        weed_plant_t *plant=weed_plant_new(WEED_PLANT_PARAMETER);
+        bytes=lives_read_le_buffered(fd,&tc,8,TRUE);
+        if (bytes<8) {
+          goto err123;
+        }
+        // read n ints (booleans)
+        bytes=lives_read_le_buffered(fd,&nigns,4,TRUE);
+        if (bytes<4) {
+          goto err123;
+        }
+        if (nigns>0) {
+          int *igns=(int *)lives_malloc(nigns*4);
+          for (j=0; j<nigns; j++) {
+            bytes=lives_read_le_buffered(fd,&igns[j],4,TRUE);
+            if (bytes<4) {
+              goto err123;
+            }
+          }
+          // discard excess values
+          ret=weed_leaf_deserialise(fd,plant,"value",NULL,FALSE);
+          weed_plant_free(plant);
+          if (ret<0) goto err123;
+        }
       }
     }
   }
 
   if (key>=0) key_defaults[key][mode]=key_defs;
 
- err123:
+err123:
   if (key<0) {
-    for (i=0;i<nparams;i++) {
+    for (i=0; i<nparams; i++) {
       if (key_defs[i]!=NULL) weed_plant_free(key_defs[i]);
     }
-    g_free(key_defs);
+    lives_free(key_defs);
   }
 
   if (ret<0||mainw->read_failed) {
     return FALSE;
   }
-  
+
   return TRUE;
 }
 
@@ -10817,12 +10873,12 @@
     params=weed_get_plantptr_array(inst,"in_parameters",&error);
     nparams=num_in_params(inst,FALSE,FALSE);
 
-    for (i=0;i<nparams;i++) {
+    for (i=0; i<nparams; i++) {
       if (!is_hidden_param(inst,i))
-	weed_leaf_copy(params[i],"value",defs[j],"value");
+        weed_leaf_copy(params[i],"value",defs[j],"value");
       j++;
     }
-    weed_free(params);
+    lives_free(params);
   } while (weed_plant_has_leaf(inst,"host_next_instance")&&(inst=weed_get_plantptr_value(inst,"host_next_instance",&error))!=NULL);
 
 
@@ -10839,15 +10895,15 @@
   int i,nparams=0;
 
   if ((key_defs=key_defaults[key][mode])==NULL) {
-    lives_write_le_buffered (fd,&nparams,4,TRUE);
+    lives_write_le_buffered(fd,&nparams,4,TRUE);
     return;
   }
 
   filter=weed_filters[key_to_fx[key][mode]];
   nparams=num_in_params(filter,FALSE,FALSE);
-  lives_write_le_buffered (fd,&nparams,4,TRUE);
+  lives_write_le_buffered(fd,&nparams,4,TRUE);
 
-  for (i=0;i<nparams;i++) {
+  for (i=0; i<nparams; i++) {
     if (mainw->write_failed) break;
     weed_leaf_serialise(fd,key_defs[i],"value",FALSE,NULL);
   }
@@ -10876,7 +10932,7 @@
     if (key_defs[i]!=NULL) weed_plant_free(key_defs[i]);
     i++;
   }
-  g_free(key_defaults[key][mode]);
+  lives_free(key_defaults[key][mode]);
   key_defaults[key][mode]=NULL;
 }
 
@@ -10892,24 +10948,24 @@
   if (key_defaults[key][mode]!=NULL) free_key_defaults(key,mode);
 
   nparams=num_in_params(filter,FALSE,FALSE);
- 
+
   if (nparams==0) return;
 
-  key_defs=(weed_plant_t **)g_malloc(nparams*sizeof(weed_plant_t *));
+  key_defs=(weed_plant_t **)lives_malloc(nparams*sizeof(weed_plant_t *));
 
   do {
     nparams=num_in_params(inst,FALSE,FALSE);
 
     if (nparams>0) {
       params=weed_get_plantptr_array(inst,"in_parameters",&error);
-    
+
       while (i<nparams+poffset) {
-	key_defs[i]=weed_plant_new(WEED_PLANT_PARAMETER);
-	weed_leaf_copy(key_defs[i],"value",params[i-poffset],"value");
-	i++;
+        key_defs[i]=weed_plant_new(WEED_PLANT_PARAMETER);
+        weed_leaf_copy(key_defs[i],"value",params[i-poffset],"value");
+        i++;
       }
-      
-      weed_free(params);
+
+      lives_free(params);
     }
     poffset+=nparams;
 
@@ -10923,8 +10979,8 @@
 boolean has_key_defaults(void) {
   // check if any key/mode has default parameters set
   int i,j;
-  for (i=0;i<prefs->rte_keys_virtual;i++) {
-    for (j=0;j<prefs->max_modes_per_key;j++) {
+  for (i=0; i<prefs->rte_keys_virtual; i++) {
+    for (j=0; j<prefs->max_modes_per_key; j++) {
       if (key_defaults[i][j]!=NULL) return TRUE;
     }
   }

LiVES-2.2.8.tar.bz2/src/effects-weed.h -> LiVES-2.4.1.tar.bz2/src/effects-weed.h Changed

@@ -45,18 +45,20 @@
 
 
 /// bootstrap function for weed plugins
-weed_plant_t *weed_bootstrap_func (weed_default_getter_f *value, int num_versions, int *plugin_versions);
+weed_plant_t *weed_bootstrap_func(weed_default_getter_f *value, int num_versions, int *plugin_versions);
 
 weed_plant_t *get_weed_filter(int filter_idx);
 char *weed_filter_idx_get_name(int filter_idx) WARN_UNUSED;
 char *weed_instance_get_filter_name(weed_plant_t *inst, boolean get_compound_parent) WARN_UNUSED;
-char *make_weed_hashname(int filter_idx, boolean fullname, boolean use_extra_authors) WARN_UNUSED;  ///< fullname includes author and version
-int weed_get_idx_for_hashname (const char *hashname, boolean fullname); ///< fullname includes author and version
-int enabled_in_channels (weed_plant_t *plant, boolean count_repeats);
-int enabled_out_channels (weed_plant_t *plant, boolean count_repeats);
-weed_plant_t *get_enabled_channel (weed_plant_t *inst, int which, boolean is_in); ///< for FILTER_INST
-weed_plant_t *get_enabled_audio_channel (weed_plant_t *inst, int which, boolean is_in); ///< for FILTER_INST
-weed_plant_t *get_mandatory_channel (weed_plant_t *filter, int which, boolean is_in); ///< for FILTER_CLASS
+char *make_weed_hashname(int filter_idx, boolean fullname,
+                         boolean use_extra_authors) WARN_UNUSED;  ///< fullname includes author and version
+int weed_get_idx_for_hashname(const char *hashname, boolean fullname);  ///< fullname includes author and version
+int *weed_get_indices_from_template(const char *package_name, const char *filter_name, const char *author, int version);
+int enabled_in_channels(weed_plant_t *plant, boolean count_repeats);
+int enabled_out_channels(weed_plant_t *plant, boolean count_repeats);
+weed_plant_t *get_enabled_channel(weed_plant_t *inst, int which, boolean is_in);  ///< for FILTER_INST
+weed_plant_t *get_enabled_audio_channel(weed_plant_t *inst, int which, boolean is_in);  ///< for FILTER_INST
+weed_plant_t *get_mandatory_channel(weed_plant_t *filter, int which, boolean is_in);  ///< for FILTER_CLASS
 boolean weed_filter_is_resizer(weed_plant_t *filt);
 boolean weed_instance_is_resizer(weed_plant_t *filt);
 weed_plant_t *weed_instance_get_filter(weed_plant_t *inst, boolean get_compound_parent);
@@ -64,7 +66,8 @@
 #define PLUGIN_COMPOUND_EFFECTS_BUILTIN "effects/compound/"
 #define PLUGIN_COMPOUND_EFFECTS_CUSTOM "plugins/effects/compound/"
 
-int num_compound_fx(weed_plant_t *plant); ///< return number of filters in a compound fx (1 if it is not compound) - works for filter or inst
+int num_compound_fx(weed_plant_t
+                    *plant); ///< return number of filters in a compound fx (1 if it is not compound) - works for filter or inst
 void load_compound_fx(void);
 
 boolean has_non_alpha_palette(weed_plant_t *ctmpl);
@@ -81,29 +84,29 @@
 boolean has_video_filters(boolean analysers_only);
 
 #ifdef HAS_LIVES_EFFECTS_H
-lives_fx_cat_t weed_filter_categorise (weed_plant_t *pl, int in_channels, int out_channels);
-lives_fx_cat_t weed_filter_subcategorise (weed_plant_t *pl, lives_fx_cat_t category, boolean count_opt);
+lives_fx_cat_t weed_filter_categorise(weed_plant_t *pl, int in_channels, int out_channels);
+lives_fx_cat_t weed_filter_subcategorise(weed_plant_t *pl, lives_fx_cat_t category, boolean count_opt);
 boolean has_audio_filters(lives_af_t af_type);
 #endif
 
-gchar* weed_seed_type_to_text(int seed_type);
+char *weed_seed_type_to_text(int seed_type);
 
 boolean has_usable_palette(weed_plant_t *chantmpl);
-int check_weed_palette_list (int *palette_list, int num_palettes, int palette);
+int check_weed_palette_list(int *palette_list, int num_palettes, int palette);
 
 int weed_call_init_func(weed_plant_t *instance);
 int weed_call_deinit_func(weed_plant_t *instance);
 
-gchar *cd_to_plugin_dir(weed_plant_t *filter);
+char *cd_to_plugin_dir(weed_plant_t *filter);
 boolean weed_init_effect(int hotkey); ///< hotkey starts at 1
 void weed_deinit_effect(int hotkey); ///< hotkey starts at 1
 weed_plant_t *weed_instance_from_filter(weed_plant_t *filter);
 void weed_instance_ref(weed_plant_t *inst);
 void weed_instance_unref(weed_plant_t *inst);
-void weed_in_parameters_free (weed_plant_t *inst);
+void weed_in_parameters_free(weed_plant_t *inst);
 void weed_in_params_free(weed_plant_t **parameters, int num_parameters);
 void add_param_connections(weed_plant_t *inst);
-lives_filter_error_t weed_reinit_effect (weed_plant_t *inst, boolean reinit_compound);
+lives_filter_error_t weed_reinit_effect(weed_plant_t *inst, boolean reinit_compound);
 void weed_reinit_all(void);
 
 
@@ -113,14 +116,14 @@
 
 int num_in_params(weed_plant_t *, boolean skip_hidden, boolean skip_internal);
 int num_out_params(weed_plant_t *);
-weed_plant_t *weed_inst_in_param (weed_plant_t *inst, int param_num, boolean skip_hidden, boolean skip_internal);
-weed_plant_t *weed_inst_out_param (weed_plant_t *inst, int param_num);
-weed_plant_t *weed_filter_in_paramtmpl (weed_plant_t *filter, int param_num, boolean skip_internal);
-weed_plant_t *weed_filter_out_paramtmpl (weed_plant_t *filter, int param_num);
+weed_plant_t *weed_inst_in_param(weed_plant_t *inst, int param_num, boolean skip_hidden, boolean skip_internal);
+weed_plant_t *weed_inst_out_param(weed_plant_t *inst, int param_num);
+weed_plant_t *weed_filter_in_paramtmpl(weed_plant_t *filter, int param_num, boolean skip_internal);
+weed_plant_t *weed_filter_out_paramtmpl(weed_plant_t *filter, int param_num);
 boolean is_hidden_param(weed_plant_t *, int i);
 int get_nth_simple_param(weed_plant_t *, int pnum);
 int count_simple_params(weed_plant_t *);
-weed_plant_t **weed_params_create (weed_plant_t *filter, boolean in);
+weed_plant_t **weed_params_create(weed_plant_t *filter, boolean in);
 int get_transition_param(weed_plant_t *filter, boolean skip_internal);
 int get_master_vol_param(weed_plant_t *filter, boolean skip_internal);
 boolean is_perchannel_multiw(weed_plant_t *param);
@@ -132,8 +135,8 @@
 boolean interpolate_param(weed_plant_t *inst, int i, void *pchain, weed_timecode_t tc);
 boolean interpolate_params(weed_plant_t *inst, void **pchains, weed_timecode_t tc);
 
-void filter_mutex_lock(int key);
-void filter_mutex_unlock(int key);
+void filter_mutex_lock(int key);  // 0 based key
+void filter_mutex_unlock(int key); // 0 based key
 
 boolean weed_plant_serialise(int fd, weed_plant_t *plant, unsigned char **mem);
 weed_plant_t *weed_plant_deserialise(int fd, unsigned char **mem);
@@ -147,32 +150,33 @@
 
 weed_plant_t *get_textparm();
 
-void weed_set_blend_factor(int hotkey);
-int weed_get_blend_factor(int hotkey);
+void weed_set_blend_factor(int hotkey);  // 0 based key
+int weed_get_blend_factor(int hotkey); // 0 based key
 
 void weed_memory_init(void); ///< call weed_init() with mem functions
 
-void weed_load_all (void); ///< load effects
+void weed_load_all(void);  ///< load effects
 void weed_unload_all(void); ///< unload all effects
 int get_next_free_key(void); ///< next free "key" for the multitrack system
 
 void weed_deinit_all(boolean shutdown); ///< deinit all active effects
 
-weed_plant_t *weed_apply_effects (weed_plant_t **layers, weed_plant_t *filter_map, weed_timecode_t tc, int opwidth, int opheight, void ***pchains);
-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);
-void weed_apply_audio_effects (weed_plant_t *filter_map, float **abuf, int nbtracks, int nchans, int64_t nsamps, double arate, 
-			       weed_timecode_t tc, double *vis);
+weed_plant_t *weed_apply_effects(weed_plant_t **layers, weed_plant_t *filter_map, weed_timecode_t tc, int opwidth, int opheight,
+                                 void ***pchains);
+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);
+void weed_apply_audio_effects(weed_plant_t *filter_map, float **abuf, int nbtracks, int nchans, int64_t nsamps, double arate,
+                              weed_timecode_t tc, double *vis);
 void weed_apply_audio_effects_rt(float **abuf, int nchans, int64_t nsamps, double arate, weed_timecode_t tc, boolean analysers_only);
 
-lives_filter_error_t weed_apply_audio_instance (weed_plant_t *init_event, float **abuf, int nbtracks, int nchans, int64_t nsamps, 
-						double arate, weed_timecode_t tc, double *vis);
+lives_filter_error_t weed_apply_audio_instance(weed_plant_t *init_event, float **abuf, int nbtracks, int nchans, int64_t nsamps,
+    double arate, weed_timecode_t tc, double *vis);
 
-boolean weed_generator_start (weed_plant_t *inst, int key); // key starts at 0
-weed_plant_t *weed_layer_new_from_generator (weed_plant_t *inst, weed_timecode_t tc);
-void weed_generator_end (weed_plant_t *inst);
-boolean weed_playback_gen_start (void);
-void weed_bg_generator_end (weed_plant_t *inst);
+boolean weed_generator_start(weed_plant_t *inst, int key);  // 0 based key
+weed_plant_t *weed_layer_new_from_generator(weed_plant_t *inst, weed_timecode_t tc);
+void weed_generator_end(weed_plant_t *inst);
+boolean weed_playback_gen_start(void);
+void weed_bg_generator_end(weed_plant_t *inst);
 void wge_inner(weed_plant_t *inst); ///< deinit instance(s) for generator
 
 /// for multitrack
@@ -183,43 +187,46 @@
 //////////////////////////////////////////////////////////
 // WARNING !! "key" here starts at 1, "mode" starts at 0
 
-boolean rte_key_valid (int key, boolean is_userkey); ///< returns TRUE if there is a filter bound to active mode of hotkey
-boolean rte_keymode_valid (int key, int mode, boolean is_userkey); ///< returns TRUE if a filter_class is bound to key/mode
+boolean rte_key_valid(int key, boolean is_userkey);  ///< returns TRUE if there is a filter bound to active mode of hotkey
+boolean rte_keymode_valid(int key, int mode,
+                          boolean is_userkey);  ///< returns TRUE if a filter_class is bound to key/mode, is_userkey should be
+///< set to TRUE
 int rte_keymode_get_filter_idx(int key, int mode); ///< returns filter_class index of key/mode (or -1 if no filter bound)
-gchar *rte_keymode_get_filter_name (int key, int mode) WARN_UNUSED; ///< returns name of filter_class bound to key/mode (or "")
-gchar *rte_keymode_get_plugin_name(int key, int mode) WARN_UNUSED; ///< returns name of plugin package containing filter_class (or "")
-gchar *rte_keymode_get_type (int key, int mode) WARN_UNUSED; ///< returns a string filter/instance type (or "")
+char *rte_keymode_get_filter_name(int key, int mode) WARN_UNUSED;  ///< returns name of filter_class bound to key/mode (or "")
+char *rte_keymode_get_plugin_name(int key, int mode) WARN_UNUSED; ///< returns name of plugin package containing filter_class (or "")
+char *rte_keymode_get_type(int key, int mode) WARN_UNUSED;  ///< returns a string filter/instance type (or "")
 
 #ifdef HAS_LIVES_EFFECTS_H
-lives_fx_cat_t rte_keymode_get_category (int key, int mode);
+lives_fx_cat_t rte_keymode_get_category(int key, int mode);
 #endif
 
 weed_plant_t *rte_keymode_get_instance(int key, int mode); ///< returns filter_instance bound to key/mode (or NULL)
 weed_plant_t *rte_keymode_get_filter(int key, int mode); ///< returns filter_class bound to key/mode (or NULL)
 
-boolean weed_delete_effectkey (int key, int mode); ///< unbinds a filter_class from a key/mode
-int weed_add_effectkey (int key, const gchar *hashname, boolean fullname); ///< bind a filter_class to key/mode using its hashname
+boolean weed_delete_effectkey(int key, int mode);  ///< unbinds a filter_class from a key/mode
+int weed_add_effectkey(int key, const char *hashname, boolean fullname);  ///< bind a filter_class to key/mode using its hashname
 
-int weed_add_effectkey_by_idx (int key, int idx); ///< see description
+int weed_add_effectkey_by_idx(int key, int idx);  ///< see description
 
-int rte_key_getmode (int key); ///< returns current active mode for a key (or -1)
+int rte_key_getmode(int key);  ///< returns current active mode for a key (or -1)
 int rte_key_getmaxmode(int key); ///< returns highest mode which is set
 
 weed_plant_t *get_new_inst_for_keymode(int key, int mode); ///< get new inst (during recording playback)
 
 
-boolean rte_key_setmode (int key, int newmode); ///< set mode for a given key; if key==0 then the active key is used
+boolean rte_key_setmode(int key, int newmode);  ///< set mode for a given key; if key==0 then the active key is used
 
 ///< returns -1 if the filter is not found; it will match the first name found - returns -2 if you try to switch a generator/non-generator
-int rte_switch_keymode (int key, int mode, const gchar *hashname);
+int rte_switch_keymode(int key, int mode, const char *hashname);
 
+boolean rte_key_is_enabled(int key);
 
 
 
 /////////////////////////////////////////////////////////////
 
-int rte_getmodespk (void);
-GList *weed_get_all_names (lives_fx_list_t list_type);
+int rte_getmodespk(void);
+LiVESList *weed_get_all_names(lives_fx_list_t list_type);
 int rte_get_numfilters(boolean inc_dupes);
 
 /////////////////////////////////////////////////////////
@@ -234,42 +241,42 @@
 
 
 //////////////////////////////////////////////////////
+// 0 based keys
+void rte_swap_fg_bg(void);
 
-void rte_swap_fg_bg (void);
 
+int rte_bg_gen_key(void);
+int rte_fg_gen_key(void);
 
-int rte_bg_gen_key (void);
-int rte_fg_gen_key (void);
-
-int rte_bg_gen_mode (void);
-int rte_fg_gen_mode (void);
+int rte_bg_gen_mode(void);
+int rte_fg_gen_mode(void);
 
 
 
 ////////////////////////////////////////////////////////////////////////
 
-gchar *get_weed_display_string (weed_plant_t *inst, int pnum);
-weed_plant_t *add_filter_deinit_events (weed_plant_t *event_list);
-weed_plant_t *add_filter_init_events (weed_plant_t *event_list, weed_timecode_t tc);
-void deinit_render_effects (void);
+char *get_weed_display_string(weed_plant_t *inst, int pnum);
+weed_plant_t *add_filter_deinit_events(weed_plant_t *event_list);
+weed_plant_t *add_filter_init_events(weed_plant_t *event_list, weed_timecode_t tc);
+void deinit_render_effects(void);
 
-boolean write_filter_defaults (int fd, int idx);
+boolean write_filter_defaults(int fd, int idx);
 boolean read_filter_defaults(int fd);
 
-boolean write_generator_sizes (int fd, int idx);
+boolean write_generator_sizes(int fd, int idx);
 boolean read_generator_sizes(int fd);
 
 int step_val(int val, int step);
 
-void set_param_gui_readwrite (weed_plant_t *inst);
-void set_param_gui_readonly (weed_plant_t *inst);
+void set_param_gui_readwrite(weed_plant_t *inst);
+void set_param_gui_readonly(weed_plant_t *inst);
 
-void weed_add_plant_flags (weed_plant_t *plant, int flags);
+void weed_add_plant_flags(weed_plant_t *plant, int flags);
 
-void update_host_info (weed_plant_t *inst);
+void update_host_info(weed_plant_t *inst);
 
 /// add default filler values to a parameter or pchange.
-void fill_param_vals_to (weed_plant_t *param, weed_plant_t *ptmpl, int fill_slot);
+void fill_param_vals_to(weed_plant_t *param, weed_plant_t *ptmpl, int fill_slot);
 
 
 // some general utilities

LiVES-2.2.8.tar.bz2/src/effects.c -> LiVES-2.4.1.tar.bz2/src/effects.c Changed

@@ -29,6 +29,7 @@
 #include "resample.h"
 #include "ce_thumbs.h"
 
+
 //////////// Effects ////////////////
 
 
@@ -50,91 +51,91 @@
 // generic
 
 
-gchar *lives_fx_cat_to_text(lives_fx_cat_t cat, boolean plural) {
+char *lives_fx_cat_to_text(lives_fx_cat_t cat, boolean plural) {
 
   // return value should be free'd after use
   switch (cat) {
 
     // main categories
   case LIVES_FX_CAT_VIDEO_GENERATOR:
-    if (!plural) return (g_strdup(_("generator")));
-    else return (g_strdup(_("Generators")));
+    if (!plural) return (lives_strdup(_("generator")));
+    else return (lives_strdup(_("Generators")));
   case LIVES_FX_CAT_AUDIO_GENERATOR:
-    if (!plural) return (g_strdup(_("audio generator")));
-    else return (g_strdup(_("Audio Generators")));
+    if (!plural) return (lives_strdup(_("audio generator")));
+    else return (lives_strdup(_("Audio Generators")));
   case LIVES_FX_CAT_AV_GENERATOR:
-    if (!plural) return (g_strdup(_("audio/video generator")));
-    else return (g_strdup(_("Audio/Video Generators")));
+    if (!plural) return (lives_strdup(_("audio/video generator")));
+    else return (lives_strdup(_("Audio/Video Generators")));
   case LIVES_FX_CAT_DATA_GENERATOR:
-    if (!plural) return (g_strdup(_("data generator")));
-    else return (g_strdup(_("Data Generators")));
+    if (!plural) return (lives_strdup(_("data generator")));
+    else return (lives_strdup(_("Data Generators")));
   case LIVES_FX_CAT_DATA_VISUALISER:
-    if (!plural) return (g_strdup(_("data visualiser")));
-    else return (g_strdup(_("Data Visualisers")));
+    if (!plural) return (lives_strdup(_("data visualiser")));
+    else return (lives_strdup(_("Data Visualisers")));
   case LIVES_FX_CAT_DATA_PROCESSOR:
-    if (!plural) return (g_strdup(_("data processor")));
-    else return (g_strdup(_("Data Processors")));
+    if (!plural) return (lives_strdup(_("data processor")));
+    else return (lives_strdup(_("Data Processors")));
   case LIVES_FX_CAT_DATA_SOURCE:
-    if (!plural) return (g_strdup(_("data source")));
-    else return (g_strdup(_("Data Sources")));
+    if (!plural) return (lives_strdup(_("data source")));
+    else return (lives_strdup(_("Data Sources")));
   case LIVES_FX_CAT_TRANSITION:
-    if (!plural) return (g_strdup(_("transition")));
-    else return (g_strdup(_("Transitions")));
+    if (!plural) return (lives_strdup(_("transition")));
+    else return (lives_strdup(_("Transitions")));
   case LIVES_FX_CAT_EFFECT:
-    if (!plural) return (g_strdup(_("effect")));
-    else return (g_strdup(_("Effects")));
+    if (!plural) return (lives_strdup(_("effect")));
+    else return (lives_strdup(_("Effects")));
   case LIVES_FX_CAT_UTILITY:
-    if (!plural) return (g_strdup(_("utility")));
-    else return (g_strdup(_("Utilities")));
+    if (!plural) return (lives_strdup(_("utility")));
+    else return (lives_strdup(_("Utilities")));
   case LIVES_FX_CAT_COMPOSITOR:
-    if (!plural) return (g_strdup(_("compositor")));
-    else return (g_strdup(_("Compositors")));
+    if (!plural) return (lives_strdup(_("compositor")));
+    else return (lives_strdup(_("Compositors")));
   case LIVES_FX_CAT_TAP:
-    if (!plural) return (g_strdup(_("tap")));
-    else return (g_strdup(_("Taps")));
+    if (!plural) return (lives_strdup(_("tap")));
+    else return (lives_strdup(_("Taps")));
   case LIVES_FX_CAT_SPLITTER:
-    if (!plural) return (g_strdup(_("splitter")));
-    else return (g_strdup(_("Splitters")));
+    if (!plural) return (lives_strdup(_("splitter")));
+    else return (lives_strdup(_("Splitters")));
   case LIVES_FX_CAT_CONVERTER:
-    if (!plural) return (g_strdup(_("converter")));
-    else return (g_strdup(_("Converters")));
+    if (!plural) return (lives_strdup(_("converter")));
+    else return (lives_strdup(_("Converters")));
   case LIVES_FX_CAT_ANALYSER:
-    if (!plural) return (g_strdup(_("analyser")));
-    else return (g_strdup(_("Analysers")));
+    if (!plural) return (lives_strdup(_("analyser")));
+    else return (lives_strdup(_("Analysers")));
 
 
     // subcategories
   case LIVES_FX_CAT_AV_TRANSITION:
-    if (!plural) return (g_strdup(_("audio/video")));
-    else return (g_strdup(_("Audio/Video Transitions")));
+    if (!plural) return (lives_strdup(_("audio/video")));
+    else return (lives_strdup(_("Audio/Video Transitions")));
   case LIVES_FX_CAT_VIDEO_TRANSITION:
-    if (!plural) return (g_strdup(_("video only")));
-    else return (g_strdup(_("Video only Transitions")));
+    if (!plural) return (lives_strdup(_("video only")));
+    else return (lives_strdup(_("Video only Transitions")));
   case LIVES_FX_CAT_AUDIO_TRANSITION:
-    if (!plural) return (g_strdup(_("audio only")));
-    else return (g_strdup(_("Audio only Transitions")));
+    if (!plural) return (lives_strdup(_("audio only")));
+    else return (lives_strdup(_("Audio only Transitions")));
   case LIVES_FX_CAT_AUDIO_MIXER:
-    if (!plural) return (g_strdup(_("audio")));
-    else return (g_strdup(_("Audio Mixers")));
+    if (!plural) return (lives_strdup(_("audio")));
+    else return (lives_strdup(_("Audio Mixers")));
   case LIVES_FX_CAT_AUDIO_EFFECT:
-    if (!plural) return (g_strdup(_("audio")));
-    else return (g_strdup(_("Audio Effects")));
+    if (!plural) return (lives_strdup(_("audio")));
+    else return (lives_strdup(_("Audio Effects")));
   case LIVES_FX_CAT_VIDEO_EFFECT:
-    if (!plural) return (g_strdup(_("video")));
-    else return (g_strdup(_("Video Effects")));
+    if (!plural) return (lives_strdup(_("video")));
+    else return (lives_strdup(_("Video Effects")));
   case LIVES_FX_CAT_AUDIO_VOL:
-    if (!plural) return (g_strdup(_("audio volume controller")));
-    else return (g_strdup(_("Audio Volume Controllers")));
+    if (!plural) return (lives_strdup(_("audio volume controller")));
+    else return (lives_strdup(_("Audio Volume Controllers")));
   case LIVES_FX_CAT_VIDEO_ANALYSER:
-    if (!plural) return (g_strdup(_("video analyser")));
-    else return (g_strdup(_("Video analysers")));
+    if (!plural) return (lives_strdup(_("video analyser")));
+    else return (lives_strdup(_("Video analysers")));
   case LIVES_FX_CAT_AUDIO_ANALYSER:
-    if (!plural) return (g_strdup(_("audio analyser")));
-    else return (g_strdup(_("Audio Analysers")));
+    if (!plural) return (lives_strdup(_("audio analyser")));
+    else return (lives_strdup(_("Audio Analysers")));
 
 
   default:
-    return (g_strdup(_("unknown")));
+    return (lives_strdup(_("unknown")));
   }
 }
 
@@ -150,18 +151,18 @@
 
   int oundo_start=cfile->undo_start;
   int oundo_end=cfile->undo_end;
-  gchar effectstring[128];
+  char effectstring[128];
   double old_pb_fps=cfile->pb_fps;
 
-  gchar *text;
-  gchar *fxcommand=NULL,*cmd;
+  char *text;
+  char *fxcommand=NULL,*cmd;
   int current_file=mainw->current_file;
 
   int new_file=current_file;
   int ldfile;
 
   boolean got_no_frames=FALSE;
-  gchar *tmp;
+  char *tmp;
 
   if (rfx->num_in_channels==0&&!is_preview) current_file=mainw->pre_src_file;
 
@@ -169,59 +170,55 @@
     // generators start at 1, even though they have no initial frames
     cfile->progress_start=cfile->undo_start=rfx->num_in_channels==0?1:cfile->start;
     cfile->progress_end=cfile->undo_end=cfile->end;
-  }
-  else if (rfx->num_in_channels!=2) {
+  } else if (rfx->num_in_channels!=2) {
     cfile->progress_start=cfile->undo_start=cfile->start;
     cfile->progress_end=cfile->undo_end=cfile->end;
   }
 
   if (!mainw->internal_messaging&&!mainw->keep_pre) {
-    gchar *pdefault;
-    gchar *plugin_name;
+    char *pdefault;
+    char *plugin_name;
 
-    if (rfx->status==RFX_STATUS_BUILTIN) plugin_name=g_build_filename(prefs->lib_dir,PLUGIN_EXEC_DIR,
-								      PLUGIN_RENDERED_EFFECTS_BUILTIN,rfx->name,NULL);
-    else plugin_name=g_strdup(rfx->name);
+    if (rfx->status==RFX_STATUS_BUILTIN) plugin_name=lives_build_filename(prefs->lib_dir,PLUGIN_EXEC_DIR,
+          PLUGIN_RENDERED_EFFECTS_BUILTIN,rfx->name,NULL);
+    else plugin_name=lives_strdup(rfx->name);
 
     if (rfx->num_in_channels==2) {
       // transition has a few extra bits
-      pdefault=g_strdup_printf ("%s %d %d %d %d %d %s %s %d \"%s/%s\"",cfile->handle,rfx->status,
-				cfile->progress_start,cfile->progress_end,cfile->hsize,cfile->vsize,
-				get_image_ext_for_type(cfile->img_type),get_image_ext_for_type(clipboard->img_type),
-				clipboard->start,prefs->tmpdir,clipboard->handle);
-    }
-    else {
-      pdefault=g_strdup_printf ("%s %d %d %d %d %d %s",cfile->handle,rfx->status,cfile->progress_start,
-				cfile->progress_end,cfile->hsize,cfile->vsize,get_image_ext_for_type(cfile->img_type));
+      pdefault=lives_strdup_printf("%s %d %d %d %d %d %s %s %d \"%s/%s\"",cfile->handle,rfx->status,
+                                   cfile->progress_start,cfile->progress_end,cfile->hsize,cfile->vsize,
+                                   get_image_ext_for_type(cfile->img_type),get_image_ext_for_type(clipboard->img_type),
+                                   clipboard->start,prefs->tmpdir,clipboard->handle);
+    } else {
+      pdefault=lives_strdup_printf("%s %d %d %d %d %d %s",cfile->handle,rfx->status,cfile->progress_start,
+                                   cfile->progress_end,cfile->hsize,cfile->vsize,get_image_ext_for_type(cfile->img_type));
     }
     // and append params
     if (is_preview) {
-      cmd=g_strdup("pfxrender");
+      cmd=lives_strdup("pfxrender");
       mainw->show_procd=FALSE;
-    }
-    else cmd=g_strdup("fxrender");
-    fxcommand=g_strconcat (prefs->backend," \"",cmd,"_",plugin_name,"\" ", pdefault, 
-			   (tmp=param_marshall (rfx, FALSE)), NULL);
-
-    g_free(plugin_name);
-    g_free(cmd);
-    g_free(pdefault);
-    g_free(tmp);
+    } else cmd=lives_strdup("fxrender");
+    fxcommand=lives_strconcat(prefs->backend," \"",cmd,"_",plugin_name,"\" ", pdefault,
+                              (tmp=param_marshall(rfx, FALSE)), NULL);
+
+    lives_free(plugin_name);
+    lives_free(cmd);
+    lives_free(pdefault);
+    lives_free(tmp);
   }
 
   if (!mainw->keep_pre) unlink(cfile->info_file);
 
   if (!mainw->internal_messaging&&!mainw->keep_pre) {
     if (cfile->frame_index_back!=NULL) {
-      g_free(cfile->frame_index_back);
+      lives_free(cfile->frame_index_back);
       cfile->frame_index_back=NULL;
     }
     lives_system(fxcommand,FALSE);
-    g_free (fxcommand);
-  }
-  else {
+    lives_free(fxcommand);
+  } else {
     if (mainw->num_tr_applied>0&&mainw->blend_file>0&&mainw->files[mainw->blend_file]!=NULL&&
-	mainw->files[mainw->blend_file]->clip_type!=CLIP_TYPE_GENERATOR) {
+        mainw->files[mainw->blend_file]->clip_type!=CLIP_TYPE_GENERATOR) {
       mainw->files[mainw->blend_file]->frameno=mainw->files[mainw->blend_file]->start-1;
     }
   }
@@ -235,29 +232,25 @@
   }
 
   if (rfx->props&RFX_PROPS_MAY_RESIZE) {
-    tmp=g_strdup(_ ("%s all frames..."));
-    text=g_strdup_printf(tmp,_(rfx->action_desc));
-  }
-  else {
+    tmp=lives_strdup(_("%s all frames..."));
+    text=lives_strdup_printf(tmp,_(rfx->action_desc));
+  } else {
     if (rfx->num_in_channels==2) {
-      tmp=g_strdup(_ ("%s clipboard into frames %d to %d..."));
-      text=g_strdup_printf(tmp,_(rfx->action_desc),cfile->progress_start,cfile->progress_end);
-    }
-    else {
+      tmp=lives_strdup(_("%s clipboard into frames %d to %d..."));
+      text=lives_strdup_printf(tmp,_(rfx->action_desc),cfile->progress_start,cfile->progress_end);
+    } else {
       if (rfx->num_in_channels==0) {
-	mainw->no_switch_dprint=TRUE;
-	if (mainw->gen_to_clipboard) {
-	  tmp=g_strdup(_("%s to clipboard..."));
-	  text=g_strdup_printf(tmp,_(rfx->action_desc));
-	}
-	else {
-	  tmp=g_strdup(_("%s to new clip..."));
-	  text=g_strdup_printf(tmp,_(rfx->action_desc));
-	}
-      } 
-      else {
-	tmp=g_strdup(_ ("%s frames %d to %d..."));
-	text=g_strdup_printf(tmp,_(rfx->action_desc),cfile->start,cfile->end);
+        mainw->no_switch_dprint=TRUE;
+        if (mainw->gen_to_clipboard) {
+          tmp=lives_strdup(_("%s to clipboard..."));
+          text=lives_strdup_printf(tmp,_(rfx->action_desc));
+        } else {
+          tmp=lives_strdup(_("%s to new clip..."));
+          text=lives_strdup_printf(tmp,_(rfx->action_desc));
+        }
+      } else {
+        tmp=lives_strdup(_("%s frames %d to %d..."));
+        text=lives_strdup_printf(tmp,_(rfx->action_desc),cfile->start,cfile->end);
       }
     }
   }
@@ -266,13 +259,13 @@
   ldfile=mainw->last_dprint_file;
 
   d_print(text);
-  g_free(text);
-  g_free(tmp);
+  lives_free(text);
+  lives_free(tmp);
   mainw->last_dprint_file=ldfile;
 
   cfile->redoable=cfile->undoable=FALSE;
-  lives_widget_set_sensitive (mainw->redo, FALSE);
-  lives_widget_set_sensitive (mainw->undo, FALSE);
+  lives_widget_set_sensitive(mainw->redo, FALSE);
+  lives_widget_set_sensitive(mainw->undo, FALSE);
 
   cfile->undo_action=UNDO_EFFECT;
 
@@ -287,33 +280,29 @@
   cfile->pb_fps=1000000.;
 
   if (rfx->num_in_channels==2) {
-    tmp=g_strdup(_ ("%s clipboard with selection"));
-    g_snprintf (effectstring,128,tmp,_ (rfx->action_desc));
-  }
-  else if (rfx->num_in_channels==0) {
+    tmp=lives_strdup(_("%s clipboard with selection"));
+    lives_snprintf(effectstring,128,tmp,_(rfx->action_desc));
+  } else if (rfx->num_in_channels==0) {
     if (mainw->gen_to_clipboard) {
-      tmp=g_strdup(_ ("%s to clipboard"));
-      g_snprintf (effectstring,128,tmp,_ (rfx->action_desc));
+      tmp=lives_strdup(_("%s to clipboard"));
+      lives_snprintf(effectstring,128,tmp,_(rfx->action_desc));
+    } else {
+      tmp=lives_strdup(_("%s to new clip"));
+      lives_snprintf(effectstring,128,tmp,_(rfx->action_desc));
     }
-    else {
-      tmp=g_strdup(_ ("%s to new clip"));
-      g_snprintf (effectstring,128,tmp,_ (rfx->action_desc));
-    }
-  }
-  else {
-    tmp=g_strdup(_ ("%s frames %d to %d"));
-    g_snprintf (effectstring,128,tmp,_ (rfx->action_desc),cfile->undo_start,cfile->undo_end);
+  } else {
+    tmp=lives_strdup(_("%s frames %d to %d"));
+    lives_snprintf(effectstring,128,tmp,_(rfx->action_desc),cfile->undo_start,cfile->undo_end);
   }
-  g_free(tmp);
+  lives_free(tmp);
 
   if (cfile->clip_type==CLIP_TYPE_FILE&&rfx->status!=RFX_STATUS_WEED) {
     // pull a batch of frames for the backend to start processing
     cfile->fx_frame_pump=cfile->start;
-  }
-  else cfile->fx_frame_pump=0;
+  } else cfile->fx_frame_pump=0;
 
   if (rfx->props&RFX_PROPS_MAY_RESIZE||rfx->num_in_channels==0) {
-    if (rfx->status==RFX_STATUS_WEED) { 
+    if (rfx->status==RFX_STATUS_WEED) {
       // set out_channel dimensions for resizers / generators
       int error;
       weed_plant_t *first_out=get_enabled_channel((weed_plant_t *)rfx->source,0,FALSE);
@@ -329,7 +318,7 @@
     mainw->show_procd=TRUE;
     mainw->keep_pre=FALSE;
     if (mainw->error) {
-      if (mainw->cancelled!=CANCEL_ERROR) do_error_dialog (mainw->msg);
+      if (mainw->cancelled!=CANCEL_ERROR) do_error_dialog(mainw->msg);
       d_print_failed();
       mainw->last_dprint_file=ldfile;
     }
@@ -352,8 +341,7 @@
       mainw->suppress_dprint=TRUE;
       close_current_file(current_file);
       mainw->suppress_dprint=FALSE;
-    }
-    else {
+    } else {
       mainw->current_file=current_file;
       do_rfx_cleanup(rfx);
     }
@@ -380,40 +368,39 @@
   cfile->fx_frame_pump=0;
 
   if (!mainw->gen_to_clipboard) {
-    lives_widget_set_sensitive (mainw->undo, TRUE);
+    lives_widget_set_sensitive(mainw->undo, TRUE);
     if (rfx->num_in_channels>0) cfile->undoable=TRUE;
     cfile->pb_fps=old_pb_fps;
     mainw->internal_messaging=FALSE;
-    if (rfx->num_in_channels>0) lives_widget_set_sensitive (mainw->select_last, TRUE);
-    if (rfx->num_in_channels>0) set_undoable (rfx->menu_text,TRUE);
+    if (rfx->num_in_channels>0) lives_widget_set_sensitive(mainw->select_last, TRUE);
+    if (rfx->num_in_channels>0) set_undoable(rfx->menu_text,TRUE);
   }
 
   mainw->show_procd=TRUE;
-  
+
   if (rfx->props&RFX_PROPS_MAY_RESIZE||rfx->num_in_channels==0) {
     // get new frame size
-    if (rfx->status!=RFX_STATUS_WEED) { 
-      int numtok=get_token_count (mainw->msg,'|');
-      
+    if (rfx->status!=RFX_STATUS_WEED) {
+      int numtok=get_token_count(mainw->msg,'|');
+
       if (numtok>1) {
-	gchar **array=g_strsplit(mainw->msg,"|",numtok);
-	// [0] is "completed"
-	cfile->hsize=atoi (array[1]);
-	cfile->vsize=atoi (array[2]);
-	if (rfx->num_in_channels==0) {
-	  cfile->fps=cfile->pb_fps=strtod(array[3],NULL);
-	  if (cfile->fps==0.) cfile->fps=cfile->pb_fps=prefs->default_fps;
-	  cfile->end=cfile->frames=atoi(array[4]);
-	  cfile->bpp=cfile->img_type==IMG_TYPE_JPEG?24:32;
-	}
-	g_strfreev(array);
+        char **array=lives_strsplit(mainw->msg,"|",numtok);
+        // [0] is "completed"
+        cfile->hsize=atoi(array[1]);
+        cfile->vsize=atoi(array[2]);
+        if (rfx->num_in_channels==0) {
+          cfile->fps=cfile->pb_fps=strtod(array[3],NULL);
+          if (cfile->fps==0.) cfile->fps=cfile->pb_fps=prefs->default_fps;
+          cfile->end=cfile->frames=atoi(array[4]);
+          cfile->bpp=cfile->img_type==IMG_TYPE_JPEG?24:32;
+        }
+        lives_strfreev(array);
       }
       if (rfx->num_in_channels==0) {
-	cfile->progress_start=1;
-	cfile->progress_end=cfile->frames;
+        cfile->progress_start=1;
+        cfile->progress_end=cfile->frames;
       }
-    }
-    else {
+    } else {
       int error;
       weed_plant_t *first_out=get_enabled_channel((weed_plant_t *)rfx->source,0,FALSE);
       weed_plant_t *first_ot=weed_get_plantptr_value(first_out,"template",&error);
@@ -424,13 +411,13 @@
     if (rfx->num_in_channels>0) {
       if (cfile->hsize==cfile->ohsize&&cfile->vsize==cfile->ovsize) cfile->undo_action=UNDO_EFFECT;
       else {
-	boolean bad_header=FALSE;
-	save_clip_value(mainw->current_file,CLIP_DETAILS_WIDTH,&cfile->hsize);
-	if (mainw->com_failed||mainw->write_failed) bad_header=TRUE;
-	save_clip_value(mainw->current_file,CLIP_DETAILS_HEIGHT,&cfile->vsize);
-	if (mainw->com_failed||mainw->write_failed) bad_header=TRUE;
-	cfile->undo_action=UNDO_RESIZABLE;
-	if (bad_header) do_header_write_error(mainw->current_file);
+        boolean bad_header=FALSE;
+        save_clip_value(mainw->current_file,CLIP_DETAILS_WIDTH,&cfile->hsize);
+        if (mainw->com_failed||mainw->write_failed) bad_header=TRUE;
+        save_clip_value(mainw->current_file,CLIP_DETAILS_HEIGHT,&cfile->vsize);
+        if (mainw->com_failed||mainw->write_failed) bad_header=TRUE;
+        cfile->undo_action=UNDO_RESIZABLE;
+        if (bad_header) do_header_write_error(mainw->current_file);
       }
     }
   }
@@ -440,40 +427,39 @@
 
   if (mainw->keep_pre) {
     // this comes from a preview which then turned into processing
-    gchar *com=g_strdup_printf("%s mv_pre \"%s\" %d %d \"%s\"",prefs->backend_sync, cfile->handle,cfile->progress_start,
-			       cfile->progress_end,get_image_ext_for_type(cfile->img_type));
+    char *com=lives_strdup_printf("%s mv_pre \"%s\" %d %d \"%s\"",prefs->backend_sync, cfile->handle,cfile->progress_start,
+                                  cfile->progress_end,get_image_ext_for_type(cfile->img_type));
 
     unlink(cfile->info_file);
     mainw->cancelled=CANCEL_NONE;
     lives_system(com,FALSE);
-    g_free(com);
+    lives_free(com);
     mainw->keep_pre=FALSE;
 
     check_backend_return(cfile);
 
     if (mainw->error) {
       if (!mainw->cancelled) {
-	do_info_dialog(_("\nNo frames were generated.\n"));
-	d_print_failed();
-      }
-      else if (mainw->cancelled!=CANCEL_ERROR) d_print_cancelled();
+        do_info_dialog(_("\nNo frames were generated.\n"));
+        d_print_failed();
+      } else if (mainw->cancelled!=CANCEL_ERROR) d_print_cancelled();
       else d_print_failed();
-    
+
       if (rfx->num_in_channels==0) {
-	mainw->is_generating=FALSE;
-	
-	if (mainw->current_file!=current_file) {
-	  mainw->suppress_dprint=TRUE;
-	  close_current_file(current_file);
-	  mainw->suppress_dprint=FALSE;
-	}
-	
-	mainw->current_file=current_file;
-	mainw->last_dprint_file=ldfile;
-	
-	if (mainw->multitrack!=NULL) {
-	  mainw->current_file=mainw->multitrack->render_file;
-	}
+        mainw->is_generating=FALSE;
+
+        if (mainw->current_file!=current_file) {
+          mainw->suppress_dprint=TRUE;
+          close_current_file(current_file);
+          mainw->suppress_dprint=FALSE;
+        }
+
+        mainw->current_file=current_file;
+        mainw->last_dprint_file=ldfile;
+
+        if (mainw->multitrack!=NULL) {
+          mainw->current_file=mainw->multitrack->render_file;
+        }
       }
       mainw->no_switch_dprint=FALSE;
       return FALSE;
@@ -483,51 +469,48 @@
   if (rfx->num_in_channels==0) {
     if (rfx->props&RFX_PROPS_BATCHG) {
       // batch mode generators need some extra processing
-      gchar *imgdir=g_strdup_printf("%s%s",prefs->tmpdir,cfile->handle);
+      char *imgdir=lives_strdup_printf("%s%s",prefs->tmpdir,cfile->handle);
       int img_file=mainw->current_file;
-      
+
       mainw->suppress_dprint=TRUE;
       open_file_sel(imgdir,0,0);
-      g_free(imgdir);
+      lives_free(imgdir);
       new_file=mainw->current_file;
-      
+
       if (new_file!=img_file) {
-	mainw->current_file=img_file;
-	
-	g_snprintf(mainw->files[new_file]->name,256,"%s",cfile->name);
-	g_snprintf(mainw->files[new_file]->file_name,PATH_MAX,"%s",cfile->file_name);
-	set_menu_text(mainw->files[new_file]->menuentry,cfile->name,FALSE);
-	
-	mainw->files[new_file]->fps=mainw->files[new_file]->pb_fps=cfile->fps;
-      }
-      else got_no_frames=TRUE;
-      
+        mainw->current_file=img_file;
+
+        lives_snprintf(mainw->files[new_file]->name,256,"%s",cfile->name);
+        lives_snprintf(mainw->files[new_file]->file_name,PATH_MAX,"%s",cfile->file_name);
+        set_menu_text(mainw->files[new_file]->menuentry,cfile->name,FALSE);
+
+        mainw->files[new_file]->fps=mainw->files[new_file]->pb_fps=cfile->fps;
+      } else got_no_frames=TRUE;
+
       close_current_file(current_file);
       mainw->suppress_dprint=FALSE;
-      
+
       if (!got_no_frames) mainw->current_file=new_file;
-    }
-    else {
-      gchar *tfile=g_strdup_printf("%s/%s/%08d.%s",prefs->tmpdir,cfile->handle,cfile->frames,prefs->image_ext);
+    } else {
+      char *tfile=lives_strdup_printf("%s/%s/%08d.%s",prefs->tmpdir,cfile->handle,cfile->frames,prefs->image_ext);
 
-      if (!g_file_test (tfile, G_FILE_TEST_EXISTS)) {
-	get_frame_count(mainw->current_file);
-	cfile->end=cfile->frames;
+      if (!lives_file_test(tfile, LIVES_FILE_TEST_EXISTS)) {
+        get_frame_count(mainw->current_file);
+        cfile->end=cfile->frames;
       }
-      g_free(tfile);
+      lives_free(tfile);
     }
 
     if (got_no_frames||cfile->frames==0) {
       mainw->is_generating=FALSE;
       if (!mainw->cancelled) {
-	do_info_dialog(_("\nNo frames were generated.\n"));
-	d_print_failed();
-      }
-      else d_print_cancelled();
+        do_info_dialog(_("\nNo frames were generated.\n"));
+        d_print_failed();
+      } else d_print_cancelled();
       if (!got_no_frames) {
-	mainw->suppress_dprint=TRUE;
-	close_current_file(current_file);
-	mainw->suppress_dprint=FALSE;
+        mainw->suppress_dprint=TRUE;
+        close_current_file(current_file);
+        mainw->suppress_dprint=FALSE;
       }
       mainw->last_dprint_file=ldfile;
       mainw->no_switch_dprint=FALSE;
@@ -538,46 +521,42 @@
     if (mainw->gen_to_clipboard) {
       // here we will copy all values to the clipboard, including the handle
       // then close the current file without deleting the frames
-      
+
       init_clipboard();
-      
+
       lives_memcpy(clipboard,cfile,sizeof(lives_clip_t));
       cfile->is_loaded=TRUE;
       mainw->suppress_dprint=TRUE;
       mainw->only_close=TRUE;
-      
+
       close_current_file(current_file);
-      
+
       mainw->suppress_dprint=FALSE;
       mainw->only_close=FALSE;
-      
+
       new_file=current_file;
 
       mainw->untitled_number--;
-      
-    }
-    else {
+
+    } else {
       if (!(rfx->props&RFX_PROPS_BATCHG)) {
-	// gen to new file
-	cfile->is_loaded=TRUE;
-	add_to_clipmenu();
-	if (!save_clip_values(new_file)) {
-	  close_current_file(current_file);
-	  return FALSE;
-	}
+        // gen to new file
+        cfile->is_loaded=TRUE;
+        add_to_clipmenu();
+        if (!save_clip_values(new_file)) {
+          close_current_file(current_file);
+          return FALSE;
+        }
 
-	if (prefs->crash_recovery) add_to_recovery_file(cfile->handle);
+        if (prefs->crash_recovery) add_to_recovery_file(cfile->handle);
 
-	if (mainw->multitrack!=NULL) {
-	  mt_init_clips(mainw->multitrack,mainw->current_file,TRUE);
-	  mt_clip_select(mainw->multitrack,TRUE);
-	}
+        if (mainw->multitrack!=NULL) {
+          mt_init_clips(mainw->multitrack,mainw->current_file,TRUE);
+          mt_clip_select(mainw->multitrack,TRUE);
+        }
 
       }
-      
-#ifdef ENABLE_OSC
-    lives_osc_notify(LIVES_OSC_NOTIFY_CLIP_OPENED,"");
-#endif
+      lives_notify(LIVES_OSC_NOTIFY_CLIP_OPENED,"");
     }
     mainw->is_generating=FALSE;
   }
@@ -586,10 +565,9 @@
   if (mainw->multitrack==NULL) {
     if (new_file!=-1) {
       lives_sync();
-      switch_to_file ((mainw->current_file=0),new_file);
+      switch_to_file((mainw->current_file=0),new_file);
     }
-  }
-  else {
+  } else {
     mainw->current_file=mainw->multitrack->render_file;
     mainw->pre_src_file=-1;
   }
@@ -598,7 +576,7 @@
   mainw->no_switch_dprint=FALSE;
   mainw->gen_to_clipboard=FALSE;
   mainw->last_dprint_file=ldfile;
-  
+
   return TRUE;
 }
 
@@ -607,14 +585,14 @@
 // realtime fx
 
 
-  
 
-lives_render_error_t realfx_progress (boolean reset) {
+
+lives_render_error_t realfx_progress(boolean reset) {
   static lives_render_error_t write_error;
 
-  GError *error=NULL;
+  LiVESError *error=NULL;
 
-  gchar oname[PATH_MAX];
+  char oname[PATH_MAX];
 
   LiVESPixbuf *pixbuf;
 
@@ -622,7 +600,7 @@
 
   weed_plant_t *layer;
 
-  gchar *com;
+  char *com;
 
   static int i;
 
@@ -638,7 +616,7 @@
     clear_mainw_msg();
 
     if (cfile->clip_type==CLIP_TYPE_FILE) {
-      if (cfile->frame_index_back!=NULL) g_free(cfile->frame_index_back);
+      if (cfile->frame_index_back!=NULL) lives_free(cfile->frame_index_back);
       cfile->frame_index_back=frame_index_copy(cfile->frame_index,cfile->frames,0);
     }
     write_error=LIVES_RENDER_ERROR_NONE;
@@ -648,14 +626,14 @@
   if (mainw->effects_paused) return LIVES_RENDER_EFFECTS_PAUSED;
 
   // sig_progress...
-  g_snprintf (mainw->msg,256,"%d",i);
+  lives_snprintf(mainw->msg,256,"%d",i);
   // load, effect, save frame
 
   // skip resizing virtual frames
   if (resize_instance!=NULL&&is_virtual_frame(mainw->current_file,i)) {
     if (++i>cfile->end) {
       mainw->internal_messaging=FALSE;
-      g_snprintf(mainw->msg,9,"completed");
+      lives_snprintf(mainw->msg,9,"completed");
     }
     mainw->rowstride_alignment_hint=1;
     return LIVES_RENDER_COMPLETE;
@@ -672,11 +650,11 @@
 
     if (!pull_frame(layer,get_image_ext_for_type(cfile->img_type),frameticks)) {
       // do_read_failed_error_s() cannot be used here as we dont know the filename
-      g_snprintf (mainw->msg,256,"error|missing image %d",i);
+      lives_snprintf(mainw->msg,256,"error|missing image %d",i);
       return LIVES_RENDER_WARNING_READ_FRAME;
     }
 
-    layer=on_rte_apply (layer, 0, 0, (weed_timecode_t)frameticks);
+    layer=on_rte_apply(layer, 0, 0, (weed_timecode_t)frameticks);
 
     if (!has_video_filters(TRUE)||resize_instance!=NULL) {
       layer_palette=weed_get_int_value(layer,"current_palette",&weed_error);
@@ -684,39 +662,37 @@
       if (resize_instance==NULL) resize_layer(layer,cfile->hsize,cfile->vsize,LIVES_INTERP_BEST,layer_palette,0);
 
       if (cfile->img_type==IMG_TYPE_JPEG&&layer_palette!=WEED_PALETTE_RGB24&&layer_palette!=WEED_PALETTE_RGBA32) {
-	convert_layer_palette(layer,WEED_PALETTE_RGB24,0);
-	layer_palette=WEED_PALETTE_RGB24;
+        convert_layer_palette(layer,WEED_PALETTE_RGB24,0);
+        layer_palette=WEED_PALETTE_RGB24;
+      } else if (cfile->img_type==IMG_TYPE_PNG&&layer_palette!=WEED_PALETTE_RGBA32) {
+        convert_layer_palette(layer,WEED_PALETTE_RGBA32,0);
+        layer_palette=WEED_PALETTE_RGBA32;
       }
-      else if (cfile->img_type==IMG_TYPE_PNG&&layer_palette!=WEED_PALETTE_RGBA32) {
-	convert_layer_palette(layer,WEED_PALETTE_RGBA32,0);
-	layer_palette=WEED_PALETTE_RGBA32;
-      }
-      
+
       pixbuf=layer_to_pixbuf(layer);
       weed_plant_free(layer);
-      
-      g_snprintf(oname,PATH_MAX,"%s/%s/%08d.mgk",prefs->tmpdir,cfile->handle,i);
-      
+
+      lives_snprintf(oname,PATH_MAX,"%s/%s/%08d.mgk",prefs->tmpdir,cfile->handle,i);
+
       do {
-	retval=0;
-	lives_pixbuf_save (pixbuf, oname, cfile->img_type, 100, TRUE, &error);
-
-	if (error!=NULL) {
-	  retval=do_write_failed_error_s_with_retry(oname,error->message,NULL);
-	  g_error_free(error);
-	  error=NULL;
-	  if (retval!=LIVES_RETRY) write_error=LIVES_RENDER_ERROR_WRITE_FRAME;
-	}
-      } while (retval==LIVES_RETRY);
-    
-      
-      lives_object_unref (pixbuf);
+        retval=0;
+        lives_pixbuf_save(pixbuf, oname, cfile->img_type, 100, TRUE, &error);
+
+        if (error!=NULL) {
+          retval=do_write_failed_error_s_with_retry(oname,error->message,NULL);
+          lives_error_free(error);
+          error=NULL;
+          if (retval!=LIVES_RESPONSE_RETRY) write_error=LIVES_RENDER_ERROR_WRITE_FRAME;
+        }
+      } while (retval==LIVES_RESPONSE_RETRY);
+
+
+      lives_object_unref(pixbuf);
 
       if (cfile->clip_type==CLIP_TYPE_FILE) {
-	cfile->frame_index[i-1]=-1;
+        cfile->frame_index[i-1]=-1;
       }
-    }
-    else weed_plant_free(layer);
+    } else weed_plant_free(layer);
   }
   if (apply_audio_fx) {
     if (!apply_rte_audio((double)cfile->arate/(double)cfile->fps+(double)rand()/.5/(double)(RAND_MAX))) {
@@ -728,25 +704,24 @@
     if (resize_instance!=NULL||(has_video_filters(FALSE)&&!has_video_filters(TRUE))) {
       mainw->error=FALSE;
       mainw->cancelled=CANCEL_NONE;
-      com=g_strdup_printf ("%s mv_mgk \"%s\" %d %d \"%s\"",prefs->backend,cfile->handle,cfile->start,
-			   cfile->end,get_image_ext_for_type(cfile->img_type));
-      lives_system (com,FALSE);
-      g_free (com);
+      com=lives_strdup_printf("%s mv_mgk \"%s\" %d %d \"%s\"",prefs->backend,cfile->handle,cfile->start,
+                              cfile->end,get_image_ext_for_type(cfile->img_type));
+      lives_system(com,FALSE);
+      lives_free(com);
       mainw->internal_messaging=FALSE;
-      
+
       check_backend_return(cfile);
-      
+
       if (mainw->error) write_error=LIVES_RENDER_ERROR_WRITE_FRAME;
       //cfile->may_be_damaged=TRUE;
       else {
-	if (cfile->clip_type==CLIP_TYPE_FILE) {
-	  if (!check_if_non_virtual(mainw->current_file,1,cfile->frames)) save_frame_index(mainw->current_file);
-	}
-	mainw->rowstride_alignment_hint=1;
-	return LIVES_RENDER_COMPLETE;
+        if (cfile->clip_type==CLIP_TYPE_FILE) {
+          if (!check_if_non_virtual(mainw->current_file,1,cfile->frames)) save_frame_index(mainw->current_file);
+        }
+        mainw->rowstride_alignment_hint=1;
+        return LIVES_RENDER_COMPLETE;
       }
-    }
-    else {
+    } else {
       sprintf(mainw->msg,"%s","completed");
       mainw->rowstride_alignment_hint=1;
       return LIVES_RENDER_COMPLETE;
@@ -777,8 +752,8 @@
 
       if (lives_dialog_run(LIVES_DIALOG(resaudw->dialog))!=LIVES_RESPONSE_OK) return FALSE;
       if (mainw->error) {
-	mainw->error=FALSE;
-	return FALSE;
+        mainw->error=FALSE;
+        return FALSE;
       }
       has_new_audio=TRUE;
     }
@@ -796,33 +771,32 @@
   mainw->rowstride_alignment_hint=1;
 
   mainw->progress_fn=&realfx_progress;
-  mainw->progress_fn (TRUE);
+  mainw->progress_fn(TRUE);
 
   weed_reinit_all();
 
-  retval=do_effect (rfx,FALSE);
+  retval=do_effect(rfx,FALSE);
 
   if (apply_audio_fx) {
     apply_rte_audio_end(!retval);
 
     if (retval) {
       if (!has_video_filters(FALSE)||!has_video_filters(TRUE)) cfile->undo_action=UNDO_NEW_AUDIO;
-      
+
       cfile->undo_achans=cfile->achans;
       cfile->undo_arate=cfile->arate;
       cfile->undo_arps=cfile->arps;
       cfile->undo_asampsize=cfile->asampsize;
       cfile->undo_signed_endian=cfile->signed_endian;
-      
-    }
-    else {
+
+    } else {
       if (has_new_audio) cfile->achans=cfile->asampsize=cfile->arate=cfile->arps=0;
       else {
-      	gchar *com=g_strdup_printf("%s undo_audio %s",prefs->backend_sync,cfile->handle);
-	mainw->com_failed=FALSE;
-	unlink (cfile->info_file);
-	lives_system(com,FALSE);
-	g_free(com);
+        char *com=lives_strdup_printf("%s undo_audio %s",prefs->backend_sync,cfile->handle);
+        mainw->com_failed=FALSE;
+        unlink(cfile->info_file);
+        lives_system(com,FALSE);
+        lives_free(com);
       }
     }
     reget_afilesize(mainw->current_file);
@@ -836,7 +810,7 @@
 
 
 
-void on_realfx_activate (LiVESMenuItem *menuitem, gpointer user_data) {
+void on_realfx_activate(LiVESMenuItem *menuitem, livespointer user_data) {
   int type=1;
 
   boolean has_lmap_error=FALSE;
@@ -848,35 +822,35 @@
     type=0;
 
     if (!(prefs->warning_mask&WARN_MASK_LAYOUT_ALTER_FRAMES)&&(mainw->xlays=
-							       layout_frame_is_affected(mainw->current_file,1))!=NULL) {
+          layout_frame_is_affected(mainw->current_file,1))!=NULL) {
       if (!do_layout_alter_frames_warning()) {
-	g_list_free_strings(mainw->xlays);
-	g_list_free(mainw->xlays);
-	mainw->xlays=NULL;
-	return;
+        lives_list_free_strings(mainw->xlays);
+        lives_list_free(mainw->xlays);
+        mainw->xlays=NULL;
+        return;
       }
-      add_lmap_error(LMAP_ERROR_ALTER_FRAMES,cfile->name,(gpointer)cfile->layout_map,mainw->current_file,0,0.,
-		     cfile->stored_layout_frame>0);
-      g_list_free_strings(mainw->xlays);
-      g_list_free(mainw->xlays);
+      add_lmap_error(LMAP_ERROR_ALTER_FRAMES,cfile->name,(livespointer)cfile->layout_map,mainw->current_file,0,0.,
+                     cfile->stored_layout_frame>0);
+      lives_list_free_strings(mainw->xlays);
+      lives_list_free(mainw->xlays);
       mainw->xlays=NULL;
       has_lmap_error=TRUE;
     }
 
-    
+
     if (!(prefs->warning_mask&WARN_MASK_LAYOUT_ALTER_AUDIO)&&
-	(mainw->xlays=layout_audio_is_affected(mainw->current_file,0.))!=NULL) {
+        (mainw->xlays=layout_audio_is_affected(mainw->current_file,0.))!=NULL) {
       if (!do_layout_alter_audio_warning()) {
-	g_list_free_strings(mainw->xlays);
-	g_list_free(mainw->xlays);
-	mainw->xlays=NULL;
-	return;
+        lives_list_free_strings(mainw->xlays);
+        lives_list_free(mainw->xlays);
+        mainw->xlays=NULL;
+        return;
       }
-      add_lmap_error(LMAP_ERROR_ALTER_AUDIO,cfile->name,(gpointer)cfile->layout_map,mainw->current_file,0,0.,
-		     cfile->stored_layout_audio>0.);
+      add_lmap_error(LMAP_ERROR_ALTER_AUDIO,cfile->name,(livespointer)cfile->layout_map,mainw->current_file,0,0.,
+                     cfile->stored_layout_audio>0.);
       has_lmap_error=TRUE;
-      g_list_free_strings(mainw->xlays);
-      g_list_free(mainw->xlays);
+      lives_list_free_strings(mainw->xlays);
+      lives_list_free(mainw->xlays);
       mainw->xlays=NULL;
     }
   }
@@ -892,23 +866,23 @@
 
 
 
-weed_plant_t *on_rte_apply (weed_plant_t *layer, int opwidth, int opheight, weed_timecode_t tc) {
+weed_plant_t *on_rte_apply(weed_plant_t *layer, int opwidth, int opheight, weed_timecode_t tc) {
   // realtime effects
   weed_plant_t **layers,*retlayer;
   int i;
 
   if (mainw->foreign) return NULL;
 
-  layers=(weed_plant_t **)g_malloc(3*sizeof(weed_plant_t *));
+  layers=(weed_plant_t **)lives_malloc(3*sizeof(weed_plant_t *));
 
   layers[2]=NULL;
 
   layers[0]=layer;
 
   if (mainw->blend_file>-1&&mainw->num_tr_applied>0&&(mainw->files[mainw->blend_file]==NULL||
-						      (mainw->files[mainw->blend_file]->clip_type==CLIP_TYPE_DISK&&
-						       (!mainw->files[mainw->blend_file]->frames||
-							!mainw->files[mainw->blend_file]->is_loaded)))) {
+      (mainw->files[mainw->blend_file]->clip_type==CLIP_TYPE_DISK&&
+       (!mainw->files[mainw->blend_file]->frames||
+        !mainw->files[mainw->blend_file]->is_loaded)))) {
     // invalid blend file
     mainw->blend_file=mainw->current_file;
   }
@@ -916,8 +890,7 @@
   if (mainw->num_tr_applied&&mainw->blend_file!=mainw->current_file&&
       mainw->blend_file!=-1&&mainw->files[mainw->blend_file]!=NULL&&resize_instance==NULL) {
     layers[1]=get_blend_layer(tc);
-  }
-  else layers[1]=NULL;
+  } else layers[1]=NULL;
 
   if (resize_instance!=NULL) {
     lives_filter_error_t filter_error;
@@ -929,16 +902,15 @@
     filter_error=filter_error; // stop compiler complaining
     retlayer=layers[0];
     weed_plant_free(init_event);
-  }
-  else {
+  } else {
     retlayer=weed_apply_effects(layers,mainw->filter_map,tc,opwidth,opheight,mainw->pchains);
   }
 
   // all our pixel_data will have been free'd already
-  for (i=0;layers[i]!=NULL;i++) {
+  for (i=0; layers[i]!=NULL; i++) {
     if (layers[i]!=retlayer) weed_plant_free(layers[i]);
   }
-  g_free(layers);
+  lives_free(layers);
 
   return retlayer;
 }
@@ -956,27 +928,27 @@
 
   if (mainw->fx_candidates[FX_CANDIDATE_DEINTERLACE].delegate==-1) return;
 
-  deint_idx=GPOINTER_TO_INT(g_list_nth_data(mainw->fx_candidates[FX_CANDIDATE_DEINTERLACE].list,
-					    mainw->fx_candidates[FX_CANDIDATE_DEINTERLACE].delegate));
+  deint_idx=LIVES_POINTER_TO_INT(lives_list_nth_data(mainw->fx_candidates[FX_CANDIDATE_DEINTERLACE].list,
+                                 mainw->fx_candidates[FX_CANDIDATE_DEINTERLACE].delegate));
 
   deint_filter=get_weed_filter(deint_idx);
 
   deint_instance=weed_instance_from_filter(deint_filter);
 
-  layers=(weed_plant_t **)g_malloc(2*sizeof(weed_plant_t *));
+  layers=(weed_plant_t **)lives_malloc(2*sizeof(weed_plant_t *));
 
   layers[1]=NULL;
 
   layers[0]=layer;
- 
+
   init_event=weed_plant_new(WEED_PLANT_EVENT);
   weed_set_int_value(init_event,"in_tracks",0);
   weed_set_int_value(init_event,"out_tracks",0);
- 
- deint1:
+
+deint1:
 
   weed_apply_instance(deint_instance,init_event,layers,0,0,tc);
-  
+
   if (weed_plant_has_leaf(deint_instance,"host_next_instance")) next_inst=weed_get_plantptr_value(deint_instance,"host_next_instance",&error);
   else next_inst=NULL;
 
@@ -990,7 +962,7 @@
 
   weed_plant_free(init_event);
 
-  g_free(layers);
+  lives_free(layers);
 }
 
 
@@ -1015,7 +987,7 @@
     mainw->last_blend_file=mainw->blend_file;
     blend_tc=tc;
   }
-  
+
   blend_file->last_frameno=blend_file->frameno;
 
   blend_file->frameno=calc_new_playback_position(mainw->blend_file,blend_tc,(uint64_t *)&ntc);
@@ -1039,11 +1011,13 @@
 
 
 
-boolean rte_on_off_callback (LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, gpointer user_data) {
-// this is the callback which happens when a rte is keyed
+boolean rte_on_off_callback(LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, livespointer user_data) {
+  // this is the callback which happens when a rte is keyed
   int key=LIVES_POINTER_TO_INT(user_data);
   uint64_t new_rte;
 
+  if (!mainw->interactive && group!=NULL) return TRUE;
+
   mainw->fx_is_auto=FALSE;
 
   mainw->osc_block=TRUE;
@@ -1058,8 +1032,7 @@
   if (key==EFFECT_NONE) {
     // switch up/down keys to default (fps change)
     weed_deinit_all(FALSE);
-  }
-  else {
+  } else {
 
     // the idea here is this gets set if a generator starts play, because in weed_init_effect() we will run playback
     // and then we come out of there and do not wish to set the key on
@@ -1069,32 +1042,31 @@
       // switch is ON
       // WARNING - if we start playing because a generator was started, we block here
       if (!(weed_init_effect(key-1))) {
-	// ran out of instance slots, no effect assigned, or some other error
-	pthread_mutex_lock(&mainw->event_list_mutex);
-	if (mainw->rte&new_rte) mainw->rte^=new_rte;
-	pthread_mutex_unlock(&mainw->event_list_mutex);
-	if (rte_window!=NULL) rtew_set_keych(key-1,FALSE);
-	if (mainw->ce_thumbs) ce_thumbs_set_keych(key-1,FALSE);
-	mainw->osc_block=FALSE;
-	return TRUE;
+        // ran out of instance slots, no effect assigned, or some other error
+        pthread_mutex_lock(&mainw->event_list_mutex);
+        if (mainw->rte&new_rte) mainw->rte^=new_rte;
+        pthread_mutex_unlock(&mainw->event_list_mutex);
+        if (rte_window!=NULL) rtew_set_keych(key-1,FALSE);
+        if (mainw->ce_thumbs) ce_thumbs_set_keych(key-1,FALSE);
+        mainw->osc_block=FALSE;
+        return TRUE;
       }
 
 
       if (!mainw->gen_started_play) {
-	if (!(mainw->rte&new_rte)) mainw->rte|=new_rte;
-
-	mainw->last_grabable_effect=key-1;
-	if (rte_window!=NULL) rtew_set_keych(key-1,TRUE);
-	if (mainw->ce_thumbs) {
-	  ce_thumbs_set_keych(key-1,TRUE);
-	  
-	  // if effect was auto (from ACTIVATE data connection), leave all param boxes
-	  // otherwise, remove any which are not "pinned"
-	  if (!mainw->fx_is_auto) ce_thumbs_add_param_box(key-1,!mainw->fx_is_auto);
-	}
+        if (!(mainw->rte&new_rte)) mainw->rte|=new_rte;
+
+        mainw->last_grabbable_effect=key-1;
+        if (rte_window!=NULL) rtew_set_keych(key-1,TRUE);
+        if (mainw->ce_thumbs) {
+          ce_thumbs_set_keych(key-1,TRUE);
+
+          // if effect was auto (from ACTIVATE data connection), leave all param boxes
+          // otherwise, remove any which are not "pinned"
+          if (!mainw->fx_is_auto) ce_thumbs_add_param_box(key-1,!mainw->fx_is_auto);
+        }
       }
-    }
-    else {
+    } else {
       // effect is OFF
       weed_deinit_effect(key-1);
       pthread_mutex_lock(&mainw->event_list_mutex);
@@ -1109,16 +1081,15 @@
   mainw->fx_is_auto=FALSE;
 
   if (mainw->current_file>0&&cfile->play_paused&&!mainw->noswitch) {
-    load_frame_image (cfile->frameno);
+    load_frame_image(cfile->frameno);
   }
 
   if (mainw->playing_file==-1&&mainw->current_file>0&&((has_video_filters(FALSE)&&!has_video_filters(TRUE))||
-						       (cfile->achans>0&&prefs->audio_src==AUDIO_SRC_INT&&has_audio_filters(AF_TYPE_ANY))||
-						       mainw->agen_key!=0)) {
+      (cfile->achans>0&&prefs->audio_src==AUDIO_SRC_INT&&has_audio_filters(AF_TYPE_ANY))||
+      mainw->agen_key!=0)) {
 
     lives_widget_set_sensitive(mainw->rendered_fx[0].menuitem,TRUE);
-  }
-  else lives_widget_set_sensitive(mainw->rendered_fx[0].menuitem,FALSE);
+  } else lives_widget_set_sensitive(mainw->rendered_fx[0].menuitem,FALSE);
 
   if (key>0&&!mainw->fx_is_auto) {
     // user override any ACTIVATE data connection
@@ -1133,15 +1104,15 @@
 
 
 
-boolean rte_on_off_callback_hook (LiVESToggleButton *button, gpointer user_data) {
-  rte_on_off_callback (NULL, NULL, 0, (LiVESXModifierType)0, user_data);
+boolean rte_on_off_callback_hook(LiVESToggleButton *button, livespointer user_data) {
+  rte_on_off_callback(NULL, NULL, 0, (LiVESXModifierType)0, user_data);
   return TRUE;
 }
 
 
-boolean grabkeys_callback (LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, gpointer user_data) {
-  // assign the keys to the last key-grabable effect 
-  mainw->rte_keys=mainw->last_grabable_effect;
+boolean grabkeys_callback(LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, livespointer user_data) {
+  // assign the keys to the last key-grabbable effect
+  mainw->rte_keys=mainw->last_grabbable_effect;
   mainw->osc_block=TRUE;
   if (rte_window!=NULL) {
     if (group!=NULL) rtew_set_keygr(mainw->rte_keys);
@@ -1153,7 +1124,7 @@
 
 
 
-boolean textparm_callback (LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, gpointer user_data) {
+boolean textparm_callback(LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, livespointer user_data) {
   // keyboard linked to first string parameter, until TAB is pressed
   mainw->rte_textparm=get_textparm();
   return TRUE;
@@ -1161,15 +1132,15 @@
 
 
 
-boolean grabkeys_callback_hook (LiVESToggleButton *button, gpointer user_data) {
+boolean grabkeys_callback_hook(LiVESToggleButton *button, livespointer user_data) {
   if (!lives_toggle_button_get_active(button)) return TRUE;
-  mainw->last_grabable_effect=GPOINTER_TO_INT(user_data);
-  grabkeys_callback (NULL, NULL, 0, (LiVESXModifierType)0, user_data);
+  mainw->last_grabbable_effect=LIVES_POINTER_TO_INT(user_data);
+  grabkeys_callback(NULL, NULL, 0, (LiVESXModifierType)0, user_data);
   return TRUE;
 }
 
 
-boolean rtemode_callback (LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, gpointer user_data) {
+boolean rtemode_callback(LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, livespointer user_data) {
   // "m" mode key
   if (mainw->rte_keys==-1) return TRUE;
   rte_key_setmode(0,-1);
@@ -1178,8 +1149,8 @@
 }
 
 
-boolean rtemode_callback_hook (LiVESToggleButton *button, gpointer user_data) {
-  int key_mode=GPOINTER_TO_INT(user_data);
+boolean rtemode_callback_hook(LiVESToggleButton *button, livespointer user_data) {
+  int key_mode=LIVES_POINTER_TO_INT(user_data);
   int modes=rte_getmodespk();
   int key=(int)(key_mode/modes);
   int mode=key_mode-key*modes;
@@ -1191,7 +1162,7 @@
 }
 
 
-boolean swap_fg_bg_callback (LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, gpointer user_data) {
+boolean swap_fg_bg_callback(LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, livespointer user_data) {
   int old_file=mainw->current_file;
 
   if (mainw->playing_file<1||mainw->num_tr_applied==0||mainw->noswitch||mainw->blend_file==-1||
@@ -1200,13 +1171,13 @@
     return TRUE;
   }
 
-  do_quick_switch (mainw->blend_file);
+  do_quick_switch(mainw->blend_file);
 
   mainw->blend_file=old_file;
 
   rte_swap_fg_bg();
 
-  if (mainw->ce_thumbs&&(mainw->active_sa_clips==SCREEN_AREA_BACKGROUND||mainw->active_sa_clips==SCREEN_AREA_FOREGROUND)) 
+  if (mainw->ce_thumbs&&(mainw->active_sa_clips==SCREEN_AREA_BACKGROUND||mainw->active_sa_clips==SCREEN_AREA_FOREGROUND))
     ce_thumbs_highlight_current_clip();
 
   return TRUE;

LiVES-2.2.8.tar.bz2/src/effects.h -> LiVES-2.4.1.tar.bz2/src/effects.h Changed

@@ -51,41 +51,41 @@
 } lives_af_t;
 
 
-gchar *lives_fx_cat_to_text(lives_fx_cat_t cat, boolean plural) WARN_UNUSED;
+char *lives_fx_cat_to_text(lives_fx_cat_t cat, boolean plural) WARN_UNUSED;
 
 
 #include "effects-weed.h"
 
 boolean do_effect(lives_rfx_t *rfx, boolean is_preview); ///< defined as extern in paramwindow.c
 
-void on_render_fx_activate (LiVESMenuItem *menuitem, lives_rfx_t *rfx);
+void on_render_fx_activate(LiVESMenuItem *menuitem, lives_rfx_t *rfx);
 
 ///////////////// real time effects
 
 // render
-void on_realfx_activate (LiVESMenuItem *, gpointer rfx);
+void on_realfx_activate(LiVESMenuItem *, livespointer rfx);
 boolean on_realfx_activate_inner(int type, lives_rfx_t *rfx);
 
-lives_render_error_t realfx_progress (boolean reset);
+lives_render_error_t realfx_progress(boolean reset);
 
 // key callbacks
 
-boolean textparm_callback (LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, gpointer user_data);
+boolean textparm_callback(LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, livespointer user_data);
 
-boolean grabkeys_callback (LiVESAccelGroup *, LiVESObject *, uint32_t, LiVESXModifierType, gpointer user_data); ///< for accel groups
-boolean grabkeys_callback_hook (LiVESToggleButton *button, gpointer user_data); ///< for widgets
+boolean grabkeys_callback(LiVESAccelGroup *, LiVESObject *, uint32_t, LiVESXModifierType, livespointer user_data);  ///< for accel groups
+boolean grabkeys_callback_hook(LiVESToggleButton *button, livespointer user_data);  ///< for widgets
 
-boolean rte_on_off_callback (LiVESAccelGroup *, LiVESObject *, uint32_t, LiVESXModifierType, gpointer user_data); ///< for accel groups
-boolean rte_on_off_callback_hook (LiVESToggleButton *, gpointer user_data); ///< for widgets
+boolean rte_on_off_callback(LiVESAccelGroup *, LiVESObject *, uint32_t, LiVESXModifierType, livespointer user_data);  ///< for accel groups
+boolean rte_on_off_callback_hook(LiVESToggleButton *, livespointer user_data);  ///< for widgets
 
-boolean rtemode_callback (LiVESAccelGroup *, LiVESObject *, uint32_t, LiVESXModifierType, gpointer user_data); ///< for accel groups
-boolean rtemode_callback_hook (LiVESToggleButton *, gpointer user_data); ///< for widgets
+boolean rtemode_callback(LiVESAccelGroup *, LiVESObject *, uint32_t, LiVESXModifierType, livespointer user_data);  ///< for accel groups
+boolean rtemode_callback_hook(LiVESToggleButton *, livespointer user_data);  ///< for widgets
 
-boolean swap_fg_bg_callback (LiVESAccelGroup *, LiVESObject *, uint32_t, LiVESXModifierType, gpointer user_data);
+boolean swap_fg_bg_callback(LiVESAccelGroup *, LiVESObject *, uint32_t, LiVESXModifierType, livespointer user_data);
 
 weed_plant_t *get_blend_layer(weed_timecode_t tc);
 
-weed_plant_t *on_rte_apply (weed_plant_t *main_layer, int opwidth, int opheight, weed_timecode_t tc);
+weed_plant_t *on_rte_apply(weed_plant_t *main_layer, int opwidth, int opheight, weed_timecode_t tc);
 
 
 void deinterlace_frame(weed_plant_t *layer, weed_timecode_t tc);

LiVES-2.2.8.tar.bz2/src/events.c -> LiVES-2.4.1.tar.bz2/src/events.c Changed

@@ -7,6 +7,7 @@
 
 // functions/structs for event_lists and events
 
+
 #ifdef HAVE_SYSTEM_WEED
 #include <weed/weed.h>
 #include <weed/weed-palettes.h>
@@ -28,31 +29,36 @@
 #include "audio.h"
 #include "cvirtual.h"
 
+
 //////////////////////////////////
 //#define DEBUG_EVENTS
 
 
 static int render_choice;
 
+static weed_timecode_t flush_audio_tc=0;
+
 static void **pchains[FX_KEYS_MAX]; // each pchain is an array of void *, these are parameter changes used for rendering
 ///////////////////////////////////////////////////////
 
-G_GNUC_PURE void ***get_event_pchains(void) {
+G_GNUC_PURE void ** *get_event_pchains(void) {
   return pchains;
 }
 
 
-LIVES_INLINE weed_timecode_t get_event_timecode (weed_plant_t *plant) {
+LIVES_INLINE weed_timecode_t get_event_timecode(weed_plant_t *plant) {
   weed_timecode_t tc;
   int error;
-  tc=weed_get_int64_value (plant,"timecode",&error);
+  if (plant==NULL) return (weed_timecode_t)0;
+  tc=weed_get_int64_value(plant,"timecode",&error);
   return tc;
 }
 
-LIVES_INLINE int get_event_hint (weed_plant_t *plant) {
+LIVES_INLINE int get_event_hint(weed_plant_t *plant) {
   int hint;
   int error;
-  hint=weed_get_int_value (plant,"hint",&error);
+  if (plant==NULL) return 0;
+  hint=weed_get_int_value(plant,"hint",&error);
   return hint;
 }
 
@@ -104,86 +110,89 @@
 }
 
 
-int get_audio_frame_clip (weed_plant_t *event, int layer) {
-  int numaclips,aclipnum=0;
+int get_audio_frame_clip(weed_plant_t *event, int track) {
+  int numaclips,aclipnum=-1;
   int *aclips,error,i;
-  if (get_event_hint (event)!=WEED_EVENT_HINT_FRAME) return -2;
-  numaclips=weed_leaf_num_elements (event,"audio_clips");
+  if (!WEED_EVENT_IS_AUDIO_FRAME(event)) return -2;
+  numaclips=weed_leaf_num_elements(event,"audio_clips");
   aclips=weed_get_int_array(event,"audio_clips",&error);
-  for (i=0;i<numaclips;i+=2) {
-    if (aclips[i]==layer) {
+  for (i=0; i<numaclips; i+=2) {
+    if (aclips[i]==track) {
       aclipnum=aclips[i+1];
       break;
     }
   }
-  weed_free(aclips);
+  lives_free(aclips);
   return aclipnum;
 }
 
 
-double get_audio_frame_vel (weed_plant_t *event, int layer) {
+double get_audio_frame_vel(weed_plant_t *event, int track) {
+  // vel of 0. is OFF
+  // warning - check for the clip >0 first
   int numaclips;
   int *aclips,error,i;
   double *aseeks,avel=1.;
 
-  if (get_event_hint (event)!=WEED_EVENT_HINT_FRAME) return -2;
-  numaclips=weed_leaf_num_elements (event,"audio_clips");
+  if (!WEED_EVENT_IS_AUDIO_FRAME(event)) return -2;
+  numaclips=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);
-  for (i=0;i<numaclips;i+=2) {
-    if (aclips[i]==layer) {
+  for (i=0; i<numaclips; i+=2) {
+    if (aclips[i]==track) {
       avel=aseeks[i+1];
       break;
     }
   }
-  weed_free(aclips);
-  weed_free(aseeks);
+  lives_free(aclips);
+  lives_free(aseeks);
   return avel;
 }
 
 
-double get_audio_frame_seek (weed_plant_t *event, int layer) {
+double get_audio_frame_seek(weed_plant_t *event, int track) {
+  // warning - check for the clip >0 first
   int numaclips;
   int *aclips,error,i;
   double *aseeks,aseek=0.;
 
-  if (get_event_hint (event)!=WEED_EVENT_HINT_FRAME) return -2;
-  numaclips=weed_leaf_num_elements (event,"audio_clips");
+  if (!WEED_EVENT_IS_AUDIO_FRAME(event)) return -1000000;
+  numaclips=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);
-  for (i=0;i<numaclips;i+=2) {
-    if (aclips[i]==layer) {
+  for (i=0; i<numaclips; i+=2) {
+    if (aclips[i]==track) {
       aseek=aseeks[i];
       break;
     }
   }
-  weed_free(aclips);
-  weed_free(aseeks);
+  lives_free(aclips);
+  lives_free(aseeks);
   return aseek;
 }
 
 
-int get_frame_event_clip (weed_plant_t *event, int layer) {
+int get_frame_event_clip(weed_plant_t *event, int layer) {
   int numclips,clipnum;
   int *clips,error;
-  if (get_event_hint (event)!=WEED_EVENT_HINT_FRAME) return -2;
-  numclips=weed_leaf_num_elements (event,"clips");
+  if (!WEED_EVENT_IS_FRAME(event)) return -2;
+  numclips=weed_leaf_num_elements(event,"clips");
   clips=weed_get_int_array(event,"clips",&error);
   if (numclips<=layer) return -3;
   clipnum=clips[layer];
-  weed_free(clips);
+  lives_free(clips);
   return clipnum;
 }
 
-int get_frame_event_frame (weed_plant_t *event, int layer) {
+int get_frame_event_frame(weed_plant_t *event, int layer) {
   int numframes,framenum;
   int *frames,error;
-  if (get_event_hint (event)!=WEED_EVENT_HINT_FRAME) return -2;
-  numframes=weed_leaf_num_elements (event,"frames");
+  if (!WEED_EVENT_IS_FRAME(event)) return -2;
+  numframes=weed_leaf_num_elements(event,"frames");
   frames=weed_get_int_array(event,"frames",&error);
   if (numframes<=layer) return -3;
   framenum=frames[layer];
-  weed_free(frames);
+  lives_free(frames);
   return framenum;
 }
 
@@ -218,8 +227,8 @@
   weed_set_voidptr_value(event,"next",at_event);
   weed_set_voidptr_value(event,"previous",xevent);
   weed_set_voidptr_value(at_event,"previous",event);
-  if (get_event_timecode(event)>get_event_timecode(at_event)) 
-    g_printerr("Warning ! Inserted out of order event type %d before %d\n",get_event_hint(event),get_event_hint(at_event));
+  if (get_event_timecode(event)>get_event_timecode(at_event))
+    lives_printerr("Warning ! Inserted out of order event type %d before %d\n",get_event_hint(event),get_event_hint(at_event));
   return (xevent!=NULL);
 }
 
@@ -231,8 +240,8 @@
   weed_set_voidptr_value(event,"previous",at_event);
   weed_set_voidptr_value(event,"next",xevent);
   weed_set_voidptr_value(at_event,"next",event);
-  if (get_event_timecode(event)<get_event_timecode(at_event)) 
-    g_printerr("Warning ! Inserted out of order event type %d after %d\n",get_event_hint(event),get_event_hint(at_event));
+  if (get_event_timecode(event)<get_event_timecode(at_event))
+    lives_printerr("Warning ! Inserted out of order event type %d after %d\n",get_event_hint(event),get_event_hint(at_event));
   return (xevent!=NULL);
 }
 
@@ -245,7 +254,7 @@
   delete_event(event_list,at_event);
 }
 
-weed_plant_t *get_next_frame_event (weed_plant_t *event) {
+weed_plant_t *get_next_frame_event(weed_plant_t *event) {
   weed_plant_t *next;
   if (event==NULL) return NULL;
   next=get_next_event(event);
@@ -257,7 +266,7 @@
 }
 
 
-weed_plant_t *get_prev_frame_event (weed_plant_t *event) {
+weed_plant_t *get_prev_frame_event(weed_plant_t *event) {
   weed_plant_t *prev;
   if (event==NULL) return NULL;
   prev=get_prev_event(event);
@@ -269,7 +278,31 @@
 }
 
 
-weed_plant_t *get_first_frame_event (weed_plant_t *event_list) {
+weed_plant_t *get_next_audio_frame_event(weed_plant_t *event) {
+  weed_plant_t *next;
+  if (event==NULL) return NULL;
+  next=get_next_event(event);
+  while (next!=NULL) {
+    if (WEED_EVENT_IS_AUDIO_FRAME(next)) return next;
+    next=get_next_event(next);
+  }
+  return NULL;
+}
+
+
+weed_plant_t *get_prev_audio_frame_event(weed_plant_t *event) {
+  weed_plant_t *prev;
+  if (event==NULL) return NULL;
+  prev=get_prev_event(event);
+  while (prev!=NULL) {
+    if (WEED_EVENT_IS_AUDIO_FRAME(prev)) return prev;
+    prev=get_prev_event(prev);
+  }
+  return NULL;
+}
+
+
+weed_plant_t *get_first_frame_event(weed_plant_t *event_list) {
   weed_plant_t *event;
 
   if (event_list==NULL) return NULL;
@@ -283,7 +316,7 @@
   return NULL;
 }
 
-weed_plant_t *get_last_frame_event (weed_plant_t *event_list) {
+weed_plant_t *get_last_frame_event(weed_plant_t *event_list) {
   weed_plant_t *event;
 
   if (event_list==NULL) return NULL;
@@ -298,13 +331,32 @@
 }
 
 
+weed_plant_t *get_audio_block_start(weed_plant_t *event_list, int track, weed_timecode_t tc, boolean seek_back) {
+  // find any event which starts an audio block on track at timecode tc
+  // if seek_back is true we go back in time to find a possible start
+  // otherwise just check the current frame event
+
+  weed_plant_t *event=get_frame_event_at_or_before(event_list,tc,NULL);
+  if (get_audio_frame_clip(event,track)>-1&&get_audio_frame_vel(event,track)!=0.) return event;
+  if (!seek_back) return NULL;
+
+  while ((event=get_prev_frame_event(event))!=NULL) {
+    if (get_audio_frame_clip(event,track)>-1&&get_audio_frame_vel(event,track)!=0.) return event;
+  }
+
+  return NULL;
+}
+
+
+
+
 void *find_init_event_by_id(void *init_event, weed_plant_t *event) {
   void *event_id;
   int error;
 
   while (event!=NULL) {
     if (WEED_EVENT_IS_FILTER_INIT(event)) {
-      event_id=weed_get_voidptr_value (event,"event_id",&error);
+      event_id=weed_get_voidptr_value(event,"event_id",&error);
       if (event_id==init_event) break;
     }
     event=get_prev_event(event);
@@ -313,7 +365,7 @@
 }
 
 
-void remove_frame_from_event (weed_plant_t *event_list, weed_plant_t *event, int track) {
+void remove_frame_from_event(weed_plant_t *event_list, weed_plant_t *event, int track) {
   // TODO - memcheck
   int *clips;
   int *frames;
@@ -336,28 +388,27 @@
   }
 
   // if stack is empty, we will replace with a blank frame
-  for (i=0;i<numframes&&clips[i]<1;i++);
+  for (i=0; i<numframes&&clips[i]<1; i++);
   if (i==numframes) {
-    if (event==get_last_event(event_list)&&!weed_plant_has_leaf(event,"audio_clips")) delete_event(event_list,event);
-    else event_list=insert_blank_frame_event_at (event_list,tc,&event);
-  }
-  else event_list=insert_frame_event_at (event_list,tc,numframes,clips,frames,&event);
-  weed_free(frames);
-  weed_free(clips);
+    if (event==get_last_event(event_list)&&!WEED_EVENT_IS_AUDIO_FRAME(event)) delete_event(event_list,event);
+    else event_list=insert_blank_frame_event_at(event_list,tc,&event);
+  } else event_list=insert_frame_event_at(event_list,tc,numframes,clips,frames,&event);
+  lives_free(frames);
+  lives_free(clips);
 }
 
 
 
-boolean is_blank_frame (weed_plant_t *event, boolean count_audio) {
+boolean is_blank_frame(weed_plant_t *event, boolean count_audio) {
   int clip,frame,numframes,error;
   if (!WEED_EVENT_IS_FRAME(event)) return FALSE;
-  if (count_audio&&weed_plant_has_leaf(event,"audio_clips")) {
+  if (count_audio&&WEED_EVENT_IS_AUDIO_FRAME(event)) {
     int *aclips=weed_get_int_array(event,"audio_clips",&error);
     if (aclips[1]>0) {
-      weed_free(aclips);
+      lives_free(aclips);
       return FALSE;   // has audio seek
     }
-    weed_free(aclips);
+    lives_free(aclips);
   }
   numframes=weed_leaf_num_elements(event,"clips");
   if (numframes>1) return FALSE;
@@ -369,7 +420,7 @@
 }
 
 
-void remove_end_blank_frames (weed_plant_t *event_list) {
+void remove_end_blank_frames(weed_plant_t *event_list, boolean remove_filter_inits) {
   // remove blank frames from end of event list
   weed_plant_t *event=get_last_event(event_list),*prevevent;
   while (event!=NULL) {
@@ -378,7 +429,7 @@
       event=prevevent;
       continue;
     }
-    if (WEED_EVENT_IS_FILTER_INIT(event)) remove_filter_from_event_list(event_list,event);
+    if (remove_filter_inits&&WEED_EVENT_IS_FILTER_INIT(event)) remove_filter_from_event_list(event_list,event);
     else {
       if (!is_blank_frame(event,TRUE)) break;
       delete_event(event_list,event);
@@ -393,8 +444,8 @@
   weed_timecode_t min_tc=end_tc;
   int i=0;
   if (pchange_next==NULL) return end_tc;
-  for (;pchange_next[i]!=NULL;i++) if (get_event_timecode((weed_plant_t *)pchange_next[i])<min_tc) 
-				     min_tc=get_event_timecode((weed_plant_t *)pchange_next[i]);
+  for (; pchange_next[i]!=NULL; i++) if (get_event_timecode((weed_plant_t *)pchange_next[i])<min_tc)
+      min_tc=get_event_timecode((weed_plant_t *)pchange_next[i]);
   return min_tc;
 }
 
@@ -403,8 +454,8 @@
   weed_timecode_t min_tc=start_tc;
   int i=0;
   if (pchange_prev==NULL) return start_tc;
-  for (;pchange_prev[i]!=NULL;i++) if (get_event_timecode((weed_plant_t *)pchange_prev[i])<min_tc) 
-				     min_tc=get_event_timecode((weed_plant_t *)pchange_prev[i]);
+  for (; pchange_prev[i]!=NULL; i++) if (get_event_timecode((weed_plant_t *)pchange_prev[i])<min_tc)
+      min_tc=get_event_timecode((weed_plant_t *)pchange_prev[i]);
   return min_tc;
 }
 
@@ -426,14 +477,14 @@
 
 
 
-weed_plant_t *event_copy_and_insert (weed_plant_t *in_event, weed_plant_t *event_list) {
+weed_plant_t *event_copy_and_insert(weed_plant_t *in_event, weed_plant_t *event_list) {
   // this is called during quantisation
 
   // copy an event and insert it in event_list
-  // events must be copied in time order, since filter_deinit, 
+  // events must be copied in time order, since filter_deinit,
   // filter_map and param_change events MUST refer to prior filter_init events
 
-  // when we copy a filter_init, we add a new field to the copy "event_id". 
+  // when we copy a filter_init, we add a new field to the copy "event_id".
   // This contains the value of the pointer to original event
   // we use this to locate the effect_init event in the new event_list
 
@@ -451,7 +502,7 @@
   int error;
   weed_plant_t *event_after=NULL;
   weed_plant_t *event_before=NULL;
-  gchar *filter_hash;
+  char *filter_hash;
   int idx,num_params;
   weed_plant_t *filter;
   void **in_pchanges;
@@ -470,14 +521,13 @@
     if (error==WEED_ERROR_MEMORY_ALLOCATION) return NULL;
     weed_add_plant_flags(event_list,WEED_LEAF_READONLY_PLUGIN);
     event_before=NULL;
-  }
-  else {
+  } else {
     weed_timecode_t in_tc=get_event_timecode(in_event);
     event_before=get_last_event(event_list);
     while (event_before!=NULL) {
       if (get_event_timecode(event_before)<in_tc||(get_event_timecode(event_before)==in_tc
-						   &&(!WEED_EVENT_IS_FRAME(event_before)||
-						      WEED_EVENT_IS_FILTER_DEINIT(in_event)))) break;
+          &&(!WEED_EVENT_IS_FRAME(event_before)||
+             WEED_EVENT_IS_FILTER_DEINIT(in_event)))) break;
       event_before=get_prev_event(event_before);
     }
   }
@@ -490,8 +540,7 @@
     event_after=get_first_event(event_list);
     error=weed_set_voidptr_value(event_list,"first",event);
     if (error==WEED_ERROR_MEMORY_ALLOCATION) return NULL;
-  }
-  else {
+  } else {
     event_after=get_next_event(event_before);
     error=weed_set_voidptr_value(event_before,"next",event);
     if (error==WEED_ERROR_MEMORY_ALLOCATION) return NULL;
@@ -509,60 +558,60 @@
   hint=get_event_hint(in_event);
   switch (hint) {
   case WEED_EVENT_HINT_FILTER_INIT:
-    error=weed_set_voidptr_value (event,"event_id",(void *)in_event);
+    error=weed_set_voidptr_value(event,"event_id",(void *)in_event);
     if (error==WEED_ERROR_MEMORY_ALLOCATION) return NULL;
     filter_hash=weed_get_string_value(event,"filter",&error);
     if (error==WEED_ERROR_MEMORY_ALLOCATION) return NULL;
     if ((idx=weed_get_idx_for_hashname(filter_hash,TRUE))!=-1) {
       filter=get_weed_filter(idx);
       if ((num_params=num_in_params(filter,FALSE,FALSE))>0) {
-	in_pchanges=(void **)g_try_malloc(num_params*sizeof(void *));
-	if (in_pchanges==NULL) return NULL;
-	for (i=0;i<num_params;i++) in_pchanges[i]=NULL;
-	error=weed_set_voidptr_array(event,"in_parameters",num_params,in_pchanges); // set all to NULL, we will re-fill as we go along
-	g_free(in_pchanges);
-	if (error==WEED_ERROR_MEMORY_ALLOCATION) {
-	  weed_free(filter_hash);
-	  return NULL;
-	}
+        in_pchanges=(void **)lives_try_malloc(num_params*sizeof(void *));
+        if (in_pchanges==NULL) return NULL;
+        for (i=0; i<num_params; i++) in_pchanges[i]=NULL;
+        error=weed_set_voidptr_array(event,"in_parameters",num_params,in_pchanges); // set all to NULL, we will re-fill as we go along
+        lives_free(in_pchanges);
+        if (error==WEED_ERROR_MEMORY_ALLOCATION) {
+          lives_free(filter_hash);
+          return NULL;
+        }
       }
-      weed_free(filter_hash);
+      lives_free(filter_hash);
     }
     break;
   case WEED_EVENT_HINT_FILTER_DEINIT:
-    init_event=weed_get_voidptr_value (in_event,"init_event",&error);
+    init_event=weed_get_voidptr_value(in_event,"init_event",&error);
     new_init_event=find_init_event_by_id(init_event,event);
-    error=weed_set_voidptr_value (event,"init_event",new_init_event);
+    error=weed_set_voidptr_value(event,"init_event",new_init_event);
     if (error==WEED_ERROR_MEMORY_ALLOCATION) return NULL;
-    error=weed_set_voidptr_value ((weed_plant_t *)new_init_event,"event_id",(void *)new_init_event); // useful later for event_list_rectify
+    error=weed_set_voidptr_value((weed_plant_t *)new_init_event,"event_id",(void *)new_init_event);  // useful later for event_list_rectify
     if (error==WEED_ERROR_MEMORY_ALLOCATION) return NULL;
     break;
   case WEED_EVENT_HINT_FILTER_MAP:
     // set "init_events" property
-    num_events=weed_leaf_num_elements (in_event,"init_events");
-    init_events=weed_get_voidptr_array (in_event,"init_events",&error);
+    num_events=weed_leaf_num_elements(in_event,"init_events");
+    init_events=weed_get_voidptr_array(in_event,"init_events",&error);
     if (error==WEED_ERROR_MEMORY_ALLOCATION) return NULL;
-    for (i=0;i<num_events;i++) {
+    for (i=0; i<num_events; i++) {
       init_events[i]=find_init_event_by_id(init_events[i],event);
     }
-    error=weed_set_voidptr_array (event,"init_events",num_events,init_events);
-    weed_free(init_events);
+    error=weed_set_voidptr_array(event,"init_events",num_events,init_events);
+    lives_free(init_events);
     if (error==WEED_ERROR_MEMORY_ALLOCATION) return NULL;
     break;
   case WEED_EVENT_HINT_PARAM_CHANGE:
-    init_event=weed_get_voidptr_value (in_event,"init_event",&error);
+    init_event=weed_get_voidptr_value(in_event,"init_event",&error);
     new_init_event=find_init_event_by_id(init_event,get_last_event(event_list));
-    error=weed_set_voidptr_value (event,"init_event",new_init_event);
+    error=weed_set_voidptr_value(event,"init_event",new_init_event);
     if (error==WEED_ERROR_MEMORY_ALLOCATION) return NULL;
     break;
   }
-  
+
   return event_list;
 }
 
 
 
-boolean frame_event_has_frame_for_track (weed_plant_t *event, int track) {
+boolean frame_event_has_frame_for_track(weed_plant_t *event, int track) {
   int *clips,*frames,numclips;
   int error;
 
@@ -573,19 +622,19 @@
   frames=weed_get_int_array(event,"frames",&error);
 
   if (clips[track]>0&&frames[track]>0) {
-    weed_free(clips);
-    weed_free(frames);
+    lives_free(clips);
+    lives_free(frames);
     return TRUE;
   }
-  weed_free(clips);
-  weed_free(frames);
+  lives_free(clips);
+  lives_free(frames);
   return FALSE;
 
 }
 
 
 
-weed_plant_t *get_frame_event_at (weed_plant_t *event_list, weed_timecode_t tc, weed_plant_t *shortcut, boolean exact) {
+weed_plant_t *get_frame_event_at(weed_plant_t *event_list, weed_timecode_t tc, weed_plant_t *shortcut, boolean exact) {
   // if exact is FALSE, we can get a frame event just after tc
   weed_plant_t *event,*next_event;
   weed_timecode_t xtc,next_tc=0;
@@ -618,7 +667,7 @@
 
 
 
-weed_plant_t *get_frame_event_at_or_before (weed_plant_t *event_list, weed_timecode_t tc, weed_plant_t *shortcut) {
+weed_plant_t *get_frame_event_at_or_before(weed_plant_t *event_list, weed_timecode_t tc, weed_plant_t *shortcut) {
   weed_plant_t *frame_event=get_frame_event_at(event_list,tc,shortcut,FALSE);
   if (get_event_timecode(frame_event)>tc) {
     frame_event=get_prev_frame_event(frame_event);
@@ -635,29 +684,29 @@
   weed_plant_t *init_event;
 
   while (event!=NULL) {
-    if (get_event_hint(event)==WEED_EVENT_HINT_FILTER_MAP) {
+    if (WEED_EVENT_IS_FILTER_MAP(event)) {
       if (ctrack==-1000000) return event;
       if (!weed_plant_has_leaf(event,"init_events")) {
-	event=get_next_event(event);
-	continue;
+        event=get_next_event(event);
+        continue;
       }
       init_events=weed_get_voidptr_array(event,"init_events",&error);
       if (init_events[0]==NULL) {
-	weed_free(init_events);
-	event=get_next_event(event);
-	continue;
+        lives_free(init_events);
+        event=get_next_event(event);
+        continue;
       }
       num_init_events=weed_leaf_num_elements(event,"init_events");
-      for (i=0;i<num_init_events;i++) {
-	init_event=(weed_plant_t *)init_events[i];
+      for (i=0; i<num_init_events; i++) {
+        init_event=(weed_plant_t *)init_events[i];
 
-	if (init_event_is_relevant(init_event,ctrack)) {
-	  weed_free(init_events);
-	  return event;
-	}
+        if (init_event_is_relevant(init_event,ctrack)) {
+          lives_free(init_events);
+          return event;
+        }
 
       }
-      weed_free(init_events);
+      lives_free(init_events);
     }
     event=get_next_event(event);
   }
@@ -680,25 +729,25 @@
   if (weed_plant_has_leaf(init_event,"in_tracks")) {
     in_tracks=weed_get_int_array(init_event,"in_tracks",&error);
     num_tracks=weed_leaf_num_elements(init_event,"in_tracks");
-    for (j=0;j<num_tracks;j++) {
+    for (j=0; j<num_tracks; j++) {
       if (in_tracks[j]==ctrack) {
-	weed_free(in_tracks);
-	return TRUE;
+        lives_free(in_tracks);
+        return TRUE;
       }
     }
-    weed_free(in_tracks);
+    lives_free(in_tracks);
   }
 
   if (weed_plant_has_leaf(init_event,"out_tracks")) {
     out_tracks=weed_get_int_array(init_event,"out_tracks",&error);
     num_tracks=weed_leaf_num_elements(init_event,"out_tracks");
-    for (j=0;j<num_tracks;j++) {
+    for (j=0; j<num_tracks; j++) {
       if (out_tracks[j]==ctrack) {
-	weed_free(out_tracks);
-	return TRUE;
+        lives_free(out_tracks);
+        return TRUE;
       }
     }
-    weed_free(out_tracks);
+    lives_free(out_tracks);
   }
 
   return FALSE;
@@ -710,7 +759,7 @@
 
 
 weed_plant_t *get_filter_map_before(weed_plant_t *event, int ctrack, weed_plant_t *stop_event) {
-  // get filter_map preceding event; if ctrack!=-1000000 then we ignore 
+  // get filter_map preceding event; if ctrack!=-1000000 then we ignore
   // filter maps with no in_track/out_track == ctrack
 
 
@@ -722,27 +771,27 @@
   weed_plant_t *init_event;
 
   while (event!=stop_event&&event!=NULL) {
-    if (get_event_hint(event)==WEED_EVENT_HINT_FILTER_MAP) {
+    if (WEED_EVENT_IS_FILTER_MAP(event)) {
       if (ctrack==-1000000) return event;
       if (!weed_plant_has_leaf(event,"init_events")) {
-	event=get_prev_event(event);
-	continue;
+        event=get_prev_event(event);
+        continue;
       }
       init_events=weed_get_voidptr_array(event,"init_events",&error);
       if (init_events[0]==NULL) {
-	weed_free(init_events);
-	event=get_prev_event(event);
-	continue;
+        lives_free(init_events);
+        event=get_prev_event(event);
+        continue;
       }
       num_init_events=weed_leaf_num_elements(event,"init_events");
-      for (i=0;i<num_init_events;i++) {
-	init_event=(weed_plant_t *)init_events[i];
-	if (init_event_is_relevant(init_event,ctrack)) {
-	  weed_free(init_events);
-	  return event;
-	}
+      for (i=0; i<num_init_events; i++) {
+        init_event=(weed_plant_t *)init_events[i];
+        if (init_event_is_relevant(init_event,ctrack)) {
+          lives_free(init_events);
+          return event;
+        }
       }
-      weed_free(init_events);
+      lives_free(init_events);
     }
     event=get_prev_event(event);
   }
@@ -756,76 +805,75 @@
   int error,num_init_events=0,i,j=0;
 
   while (event!=NULL) {
-    if (get_event_hint(event)==WEED_EVENT_HINT_FILTER_MAP) {
+    if (WEED_EVENT_IS_FILTER_MAP(event)) {
       if (weed_plant_has_leaf(event,"init_events")&&
-	  (init_events=weed_get_voidptr_array(event,"init_events",&error))!=NULL) {
-	num_init_events=weed_leaf_num_elements(event,"init_events");
-	if (add) new_init_events=(void **)g_malloc((num_init_events+2)*sizeof(void *));
-	else new_init_events=(void **)g_malloc((num_init_events+1)*sizeof(void *));
-
-	for (i=0;i<num_init_events;i++) if ((add||(init_event!=NULL&&(init_events[i]!=(void *)init_event)))&&
-					    init_events[0]!=NULL) {
-	  new_init_events[j++]=init_events[i];
-	  if (add&&init_events[i]==(void *)init_event) add=FALSE; // don't add twice
-	}
-
-	if (add) {
-	  gchar *fhash;
-	  weed_plant_t *filter;
-	  int k,l,tflags;
-	  // add before any "process_last" events
-	  k=j;
-	  while (k>0) {
-	    k--;
-	    if (mainw->multitrack!=NULL&&init_events[k]==mainw->multitrack->avol_init_event) {
-	      // add before the audio mixer
-	      continue;
-	    }
-	    fhash=weed_get_string_value((weed_plant_t *)init_events[k],"filter",&error);
-	    filter=get_weed_filter(weed_get_idx_for_hashname(fhash,TRUE));
-	    weed_free(fhash);
-	    if (weed_plant_has_leaf(filter,"flags")) {
-	      tflags=weed_get_int_value(filter,"flags",&error);
-	      if (tflags&WEED_FILTER_PROCESS_LAST) {
-		// add before any "process_last" filters
-		continue;
-	      }
-	    }
-	    k++;
-	    break;
-	  }
-	  // insert new event at slot k
-	  // make gap for new filter
-	  for (l=j-1;l>=k;l--) {
-	    new_init_events[l+1]=new_init_events[l];
-	  }
-	  new_init_events[k]=(void *)init_event;
-	  j++;
-	}
-
-	new_init_events[j]=NULL;
-	if (init_events!=NULL) weed_free(init_events);
-	return new_init_events;
+          (init_events=weed_get_voidptr_array(event,"init_events",&error))!=NULL) {
+        num_init_events=weed_leaf_num_elements(event,"init_events");
+        if (add) new_init_events=(void **)lives_malloc((num_init_events+2)*sizeof(void *));
+        else new_init_events=(void **)lives_malloc((num_init_events+1)*sizeof(void *));
+
+        for (i=0; i<num_init_events; i++) if ((add||(init_event!=NULL&&(init_events[i]!=(void *)init_event)))&&
+                                                init_events[0]!=NULL) {
+            new_init_events[j++]=init_events[i];
+            if (add&&init_events[i]==(void *)init_event) add=FALSE; // don't add twice
+          }
+
+        if (add) {
+          char *fhash;
+          weed_plant_t *filter;
+          int k,l,tflags;
+          // add before any "process_last" events
+          k=j;
+          while (k>0) {
+            k--;
+            if (mainw->multitrack!=NULL&&init_events[k]==mainw->multitrack->avol_init_event) {
+              // add before the audio mixer
+              continue;
+            }
+            fhash=weed_get_string_value((weed_plant_t *)init_events[k],"filter",&error);
+            filter=get_weed_filter(weed_get_idx_for_hashname(fhash,TRUE));
+            lives_free(fhash);
+            if (weed_plant_has_leaf(filter,"flags")) {
+              tflags=weed_get_int_value(filter,"flags",&error);
+              if (tflags&WEED_FILTER_PROCESS_LAST) {
+                // add before any "process_last" filters
+                continue;
+              }
+            }
+            k++;
+            break;
+          }
+          // insert new event at slot k
+          // make gap for new filter
+          for (l=j-1; l>=k; l--) {
+            new_init_events[l+1]=new_init_events[l];
+          }
+          new_init_events[k]=(void *)init_event;
+          j++;
+        }
+
+        new_init_events[j]=NULL;
+        if (init_events!=NULL) lives_free(init_events);
+        return new_init_events;
       }
-      if (init_events!=NULL) weed_free(init_events);
+      if (init_events!=NULL) lives_free(init_events);
     }
     event=get_prev_event(event);
   }
   // no previous init_events found
   if (add) {
-    new_init_events=(void **)g_malloc(2*sizeof(void *));
+    new_init_events=(void **)lives_malloc(2*sizeof(void *));
     new_init_events[0]=(void *)init_event;
     new_init_events[1]=NULL;
-  }
-  else {
-    new_init_events=(void **)g_malloc(sizeof(void *));
+  } else {
+    new_init_events=(void **)lives_malloc(sizeof(void *));
     new_init_events[0]=NULL;
   }
   return new_init_events;
 }
 
 
-void update_filter_maps (weed_plant_t *event, weed_plant_t *end_event, weed_plant_t *init_event) {
+void update_filter_maps(weed_plant_t *event, weed_plant_t *end_event, weed_plant_t *init_event) {
   // append init_event to all FILTER_MAPS between event and end_event
 
   while (event!=end_event) {
@@ -848,7 +896,7 @@
     if (at_event==NULL) break;
     if (get_event_timecode(at_event)<tc) {
       if (!insert_event_after(at_event,event)) weed_set_voidptr_value(event_list,"last",event);
-      
+
       return;
     }
   }
@@ -886,8 +934,8 @@
 
 
 
-boolean insert_filter_map_event_at(weed_plant_t *event_list, weed_plant_t *at_event, 
-				    weed_plant_t *event, boolean before_frames) {
+boolean insert_filter_map_event_at(weed_plant_t *event_list, weed_plant_t *at_event,
+                                   weed_plant_t *event, boolean before_frames) {
   // insert event as last event at same timecode as (FRAME_EVENT) at_event
   weed_timecode_t tc=get_event_timecode(at_event);
   weed_set_int64_value(event,"timecode",tc);
@@ -897,35 +945,34 @@
       at_event=get_prev_event(at_event);
       if (at_event==NULL) break;
       if (WEED_EVENT_IS_FILTER_MAP(at_event)) {
-	// found an existing FILTER_MAP, we can simply replace it
-	if (mainw->filter_map==at_event) mainw->filter_map=event;
-	replace_event(event_list,at_event,event);
-	return TRUE;
+        // found an existing FILTER_MAP, we can simply replace it
+        if (mainw->filter_map==at_event) mainw->filter_map=event;
+        replace_event(event_list,at_event,event);
+        return TRUE;
       }
       if (WEED_EVENT_IS_FILTER_INIT(at_event)||get_event_timecode(at_event)<tc) {
-      if (!insert_event_after(at_event,event)) weed_set_voidptr_value(event_list,"last",event);
-      return TRUE;
+        if (!insert_event_after(at_event,event)) weed_set_voidptr_value(event_list,"last",event);
+        return TRUE;
       }
     }
     // event is first
     at_event=get_first_event(event_list);
     insert_event_before(at_event,event);
     weed_set_voidptr_value(event_list,"first",event);
-  }
-  else {
+  } else {
     // insert after frame events
     while (at_event!=NULL) {
       at_event=get_next_event(at_event);
       if (at_event==NULL) break;
       if (WEED_EVENT_IS_FILTER_MAP(at_event)) {
-	// found an existing FILTER_MAP, we can simply replace it
-	if (mainw->filter_map==at_event) mainw->filter_map=event;
-	replace_event(event_list,at_event,event);
-	return TRUE;
+        // found an existing FILTER_MAP, we can simply replace it
+        if (mainw->filter_map==at_event) mainw->filter_map=event;
+        replace_event(event_list,at_event,event);
+        return TRUE;
       }
       if (get_event_timecode(at_event)>tc) {
-	if (!insert_event_before(at_event,event)) weed_set_voidptr_value(event_list,"first",event);
-	return TRUE;
+        if (!insert_event_before(at_event,event)) weed_set_voidptr_value(event_list,"first",event);
+        return TRUE;
       }
     }
     // event is last
@@ -968,10 +1015,10 @@
 
 
 
- 
 
-weed_plant_t *insert_frame_event_at (weed_plant_t *event_list, weed_timecode_t tc, int numframes, int *clips, 
-				     int *frames, weed_plant_t **shortcut) {
+
+weed_plant_t *insert_frame_event_at(weed_plant_t *event_list, weed_timecode_t tc, int numframes, int *clips,
+                                    int *frames, weed_plant_t **shortcut) {
   // we will insert a FRAME event at timecode tc, after any other events (except for deinit events) at timecode tc
   // if there is an existing FRAME event at tc, we replace it with the new frame
 
@@ -997,29 +1044,27 @@
   if (tc<=get_event_timecode(get_last_event(event_list))) {
     if (shortcut!=NULL&&*shortcut!=NULL) {
       event=*shortcut;
-    }
-    else event=get_first_event(event_list);
-    
+    } else event=get_first_event(event_list);
+
     if (get_event_timecode(event)>tc) {
       // step backwards until we get to a frame before where we want to add
       while (event!=NULL&&get_event_timecode(event)>tc) event=get_prev_frame_event(event);
       // event can come out NULL (add before first frame event), in which case we fall through
-    }
-    else {
+    } else {
       while (event!=NULL&&get_event_timecode(event)<tc) event=get_next_frame_event(event);
 
       // we reached the end, so we will add after last frame event
       if (event==NULL) event=get_last_frame_event(event_list);
     }
-    
+
     while (event!=NULL&&(((xtc=get_event_timecode(event))<tc)||(xtc==tc&&(!WEED_EVENT_IS_FILTER_DEINIT(event))))) {
       if (shortcut!=NULL) *shortcut=event;
       if (xtc==tc&&WEED_EVENT_IS_FRAME(event)) {
-	error=weed_set_int_array (event,"clips",numframes,clips);
-	if (error==WEED_ERROR_MEMORY_ALLOCATION) return NULL;
-	error=weed_set_int_array (event,"frames",numframes,frames);
-	if (error==WEED_ERROR_MEMORY_ALLOCATION) return NULL;
-	return event_list;
+        error=weed_set_int_array(event,"clips",numframes,clips);
+        if (error==WEED_ERROR_MEMORY_ALLOCATION) return NULL;
+        error=weed_set_int_array(event,"frames",numframes,frames);
+        if (error==WEED_ERROR_MEMORY_ALLOCATION) return NULL;
+        return event_list;
       }
       event=get_next_event(event);
     }
@@ -1028,22 +1073,21 @@
     if (event==NULL) {
       event=get_last_event(event_list);
       // event is after last event, append it
-      if ((xevent_list=append_frame_event (event_list,tc,numframes,clips,frames))==NULL) return NULL;
+      if ((xevent_list=append_frame_event(event_list,tc,numframes,clips,frames))==NULL) return NULL;
       event_list=xevent_list;
       if (shortcut!=NULL) *shortcut=get_last_event(event_list);
       return event_list;
     }
-  }
-  else {
+  } else {
     // event is after last event, append it
-    if ((xevent_list=append_frame_event (event_list,tc,numframes,clips,frames))==NULL) return NULL;
+    if ((xevent_list=append_frame_event(event_list,tc,numframes,clips,frames))==NULL) return NULL;
     event_list=xevent_list;
     if (shortcut!=NULL) *shortcut=get_last_event(event_list);
     return event_list;
   }
 
   // add frame before "event"
-  
+
   if ((new_event_list=append_frame_event(NULL,tc,numframes,clips,frames))==NULL) return NULL;
   // new_event_list is now an event_list with one frame event. We will steal its event and prepend it !
 
@@ -1076,8 +1120,8 @@
 
 
 
-void insert_audio_event_at(weed_plant_t *event_list, weed_plant_t *event, int track, int clipnum, 
-			   double seek, double vel) {
+void insert_audio_event_at(weed_plant_t *event_list, weed_plant_t *event, int track, int clipnum,
+                           double seek, double vel) {
   // insert/update audio event at (existing) frame event
   int error,i;
   int *new_aclips;
@@ -1086,104 +1130,104 @@
 
   arv=(double)(myround(vel*10000.))/10000.;
 
-  if (weed_plant_has_leaf(event,"audio_clips")) {
+  if (WEED_EVENT_IS_AUDIO_FRAME(event)) {
     int num_aclips=weed_leaf_num_elements(event,"audio_clips");
     int *aclips=weed_get_int_array(event,"audio_clips",&error);
     double *aseeks=weed_get_double_array(event,"audio_seeks",&error);
 
-    for (i=0;i<num_aclips;i+=2) {
+    for (i=0; i<num_aclips; i+=2) {
       if (aclips[i]==track) {
-	if (clipnum<=0&&num_aclips>2) {
-	  // ignore - remove track altogether
-	  int *new_aclips=(int *)g_malloc((num_aclips-2)*sizint);
-	  double *new_aseeks=(double *)g_malloc((num_aclips-2)*sizdbl);
-	  int j,k=0;
-	  for (j=0;j<num_aclips;j+=2) {
-	    if (j!=i) {
-	      new_aclips[k]=aclips[j];
-	      new_aclips[k+1]=aclips[j+1];
-	      new_aseeks[k]=aseeks[j];
-	      new_aseeks[k+1]=aseeks[j+1];
-	      k+=2;
-	    }
-	  }
-
-	  weed_set_int_array(event,"audio_clips",num_aclips-2,new_aclips);
-	  weed_set_double_array(event,"audio_seeks",num_aclips-2,new_aseeks);
-	  g_free(new_aclips);
-	  g_free(new_aseeks);
-	  weed_free(aseeks);
-	  weed_free(aclips);
-	  return;
-	}
-
-	// update existing values
-	aclips[i+1]=clipnum;
-	aseeks[i]=seek;
-	aseeks[i+1]=arv;
-
-	weed_set_int_array(event,"audio_clips",num_aclips,aclips);
-	weed_set_double_array(event,"audio_seeks",num_aclips,aseeks);
-	weed_free(aseeks);
-	weed_free(aclips);
-	return;
+        if (clipnum<=0&&num_aclips>2) {
+          // ignore - remove track altogether
+          int *new_aclips=(int *)lives_malloc((num_aclips-2)*sizint);
+          double *new_aseeks=(double *)lives_malloc((num_aclips-2)*sizdbl);
+          int j,k=0;
+          for (j=0; j<num_aclips; j+=2) {
+            if (j!=i) {
+              new_aclips[k]=aclips[j];
+              new_aclips[k+1]=aclips[j+1];
+              new_aseeks[k]=aseeks[j];
+              new_aseeks[k+1]=aseeks[j+1];
+              k+=2;
+            }
+          }
+
+          weed_set_int_array(event,"audio_clips",num_aclips-2,new_aclips);
+          weed_set_double_array(event,"audio_seeks",num_aclips-2,new_aseeks);
+          lives_free(new_aclips);
+          lives_free(new_aseeks);
+          lives_free(aseeks);
+          lives_free(aclips);
+          return;
+        }
+
+        // update existing values
+        aclips[i+1]=clipnum;
+        aseeks[i]=seek;
+        aseeks[i+1]=arv;
+
+        weed_set_int_array(event,"audio_clips",num_aclips,aclips);
+        weed_set_double_array(event,"audio_seeks",num_aclips,aseeks);
+        lives_free(aseeks);
+        lives_free(aclips);
+        return;
       }
     }
 
     if (clipnum<=0) return;
 
     // append
-    new_aclips=(int *)g_malloc((num_aclips+2)*sizint);
-    for (i=0;i<num_aclips;i++) new_aclips[i]=aclips[i];
+    new_aclips=(int *)lives_malloc((num_aclips+2)*sizint);
+    for (i=0; i<num_aclips; i++) new_aclips[i]=aclips[i];
     new_aclips[i++]=track;
     new_aclips[i]=clipnum;
 
-    new_aseeks=(double *)g_malloc((num_aclips+2)*sizdbl);
-    for (i=0;i<num_aclips;i++) new_aseeks[i]=aseeks[i];
+    new_aseeks=(double *)lives_malloc((num_aclips+2)*sizdbl);
+    for (i=0; i<num_aclips; i++) new_aseeks[i]=aseeks[i];
     new_aseeks[i++]=seek;
     new_aseeks[i++]=arv;
 
     weed_set_int_array(event,"audio_clips",i,new_aclips);
     weed_set_double_array(event,"audio_seeks",i,new_aseeks);
 
-    g_free(new_aclips);
-    g_free(new_aseeks);
+    lives_free(new_aclips);
+    lives_free(new_aseeks);
 
-    weed_free(aseeks);
-    weed_free(aclips);
+    lives_free(aseeks);
+    lives_free(aclips);
     return;
   }
   // create new values
 
-  new_aclips=(int *)g_malloc(2*sizint);
+  new_aclips=(int *)lives_malloc(2*sizint);
   new_aclips[0]=track;
   new_aclips[1]=clipnum;
 
-  new_aseeks=(double *)g_malloc(2*sizdbl);
+  new_aseeks=(double *)lives_malloc(2*sizdbl);
   new_aseeks[0]=seek;
   new_aseeks[1]=arv;
 
   weed_set_int_array(event,"audio_clips",2,new_aclips);
   weed_set_double_array(event,"audio_seeks",2,new_aseeks);
-  
-  g_free(new_aclips);
-  g_free(new_aseeks);
+
+  lives_free(new_aclips);
+  lives_free(new_aseeks);
 }
 
 
 
-void remove_audio_for_track (weed_plant_t *event, int track) {
+void remove_audio_for_track(weed_plant_t *event, int track) {
   // delete audio for a FRAME_EVENT with audio for specified track
   // if nothing left, delete the audio leaves
 
   int j=0,i,error;
-  int num_atracks=weed_leaf_num_elements (event,"audio_clips");
+  int num_atracks=weed_leaf_num_elements(event,"audio_clips");
   int *aclip_index=weed_get_int_array(event,"audio_clips",&error);
   double *aseek_index=weed_get_double_array(event,"audio_seeks",&error);
-  int *new_aclip_index=(int *)g_malloc(num_atracks*sizint);
-  double *new_aseek_index=(double *)g_malloc(num_atracks*sizdbl);
+  int *new_aclip_index=(int *)lives_malloc(num_atracks*sizint);
+  double *new_aseek_index=(double *)lives_malloc(num_atracks*sizdbl);
 
-  for (i=0;i<num_atracks;i+=2) {
+  for (i=0; i<num_atracks; i+=2) {
     if (aclip_index[i]==track) continue;
     new_aclip_index[j]=aclip_index[i];
     new_aclip_index[j+1]=aclip_index[i+1];
@@ -1194,19 +1238,18 @@
   if (j==0) {
     weed_leaf_delete(event,"audio_clips");
     weed_leaf_delete(event,"audio_seeks");
-  }
-  else {
+  } else {
     weed_set_int_array(event,"audio_clips",j,new_aclip_index);
     weed_set_double_array(event,"audio_seeks",j,new_aseek_index);
   }
-  weed_free(aclip_index);
-  weed_free(aseek_index);
-  g_free(new_aclip_index);
-  g_free(new_aseek_index);
+  lives_free(aclip_index);
+  lives_free(aseek_index);
+  lives_free(new_aclip_index);
+  lives_free(new_aseek_index);
 }
 
 
-weed_plant_t *append_marker_event (weed_plant_t *event_list, weed_timecode_t tc, int marker_type) {
+weed_plant_t *append_marker_event(weed_plant_t *event_list, weed_timecode_t tc, int marker_type) {
   weed_plant_t *event,*prev;
 
   if (event_list==NULL) {
@@ -1217,24 +1260,23 @@
     weed_add_plant_flags(event_list,WEED_LEAF_READONLY_PLUGIN);
   }
 
-  event=weed_plant_new (WEED_PLANT_EVENT);
+  event=weed_plant_new(WEED_PLANT_EVENT);
   weed_set_voidptr_value(event,"next",NULL);
 
   // TODO - error check
-  weed_set_int64_value (event,"timecode",tc);
-  weed_set_int_value (event,"hint",WEED_EVENT_HINT_MARKER);
+  weed_set_int64_value(event,"timecode",tc);
+  weed_set_int_value(event,"hint",WEED_EVENT_HINT_MARKER);
 
-  weed_set_int_value (event,"lives_type",marker_type);
+  weed_set_int_value(event,"lives_type",marker_type);
 
 #ifdef DEBUG_EVENTS
-  g_print ("adding map event %p at tc %"PRId64"\n",init_events[0],tc);
+  g_print("adding map event %p at tc %"PRId64"\n",init_events[0],tc);
 #endif
 
   if (get_first_event(event_list)==NULL) {
     weed_set_voidptr_value(event_list,"first",event);
     weed_set_voidptr_value(event,"previous",NULL);
-  }
-  else {
+  } else {
     weed_set_voidptr_value(event,"previous",get_last_event(event_list));
   }
   weed_add_plant_flags(event,WEED_LEAF_READONLY_PLUGIN);
@@ -1247,18 +1289,18 @@
 
 
 
-void insert_marker_event_at(weed_plant_t *event_list, weed_plant_t *at_event, int marker_type, gpointer data) {
+void insert_marker_event_at(weed_plant_t *event_list, weed_plant_t *at_event, int marker_type, livespointer data) {
   // insert marker event as first event at same timecode as (FRAME_EVENT) at_event
   weed_timecode_t tc=get_event_timecode(at_event);
   weed_plant_t *event=weed_plant_new(WEED_PLANT_EVENT);
   int error,i;
 
-  weed_set_int_value (event,"hint",WEED_EVENT_HINT_MARKER);
-  weed_set_int_value (event,"lives_type",marker_type);
-  weed_set_int64_value (event,"timecode",tc);
- 
+  weed_set_int_value(event,"hint",WEED_EVENT_HINT_MARKER);
+  weed_set_int_value(event,"lives_type",marker_type);
+  weed_set_int64_value(event,"timecode",tc);
+
   if (marker_type==EVENT_MARKER_BLOCK_START||marker_type==EVENT_MARKER_BLOCK_UNORDERED) {
-    weed_set_int_value(event,"tracks",GPOINTER_TO_INT(data));
+    weed_set_int_value(event,"tracks",LIVES_POINTER_TO_INT(data));
   }
   weed_add_plant_flags(event,WEED_LEAF_READONLY_PLUGIN);
 
@@ -1269,24 +1311,24 @@
     case EVENT_MARKER_BLOCK_START:
     case EVENT_MARKER_BLOCK_UNORDERED:
       if (WEED_EVENT_IS_MARKER(at_event)&&(weed_get_int_value(at_event,"lives_type",&error)==marker_type)) {
-	// add to existing event
-	int num_tracks=weed_leaf_num_elements(at_event,"tracks");
-	int *tracks=weed_get_int_array(at_event,"tracks",&error);
-	int *new_tracks=(int *)g_malloc((num_tracks+1)*sizint);
-	for (i=0;i<num_tracks;i++) {
-	  new_tracks[i]=tracks[i];
-	}
-	new_tracks[i]=GPOINTER_TO_INT(data); // add new track
-	weed_set_int_array(at_event,"tracks",num_tracks+1,new_tracks);
-	g_free(new_tracks);
-	weed_free(tracks);
-	weed_plant_free(event); // new event not used
-	return;
+        // add to existing event
+        int num_tracks=weed_leaf_num_elements(at_event,"tracks");
+        int *tracks=weed_get_int_array(at_event,"tracks",&error);
+        int *new_tracks=(int *)lives_malloc((num_tracks+1)*sizint);
+        for (i=0; i<num_tracks; i++) {
+          new_tracks[i]=tracks[i];
+        }
+        new_tracks[i]=LIVES_POINTER_TO_INT(data); // add new track
+        weed_set_int_array(at_event,"tracks",num_tracks+1,new_tracks);
+        lives_free(new_tracks);
+        lives_free(tracks);
+        weed_plant_free(event); // new event not used
+        return;
       }
       if (get_event_timecode(at_event)<tc) {
-	// create new event
-	if (!insert_event_after(at_event,event)) weed_set_voidptr_value(event_list,"last",event);
-	return;
+        // create new event
+        if (!insert_event_after(at_event,event)) weed_set_voidptr_value(event_list,"last",event);
+        return;
       }
       break;
     }
@@ -1300,7 +1342,7 @@
 }
 
 
-weed_plant_t *insert_blank_frame_event_at (weed_plant_t *event_list, weed_timecode_t tc, weed_plant_t **shortcut) {
+weed_plant_t *insert_blank_frame_event_at(weed_plant_t *event_list, weed_timecode_t tc, weed_plant_t **shortcut) {
   int clip=-1;
   int frame=0;
 
@@ -1319,16 +1361,16 @@
 
   while (event!=NULL&&get_event_timecode(event)<=deinit_tc) {
     event_next=get_next_event(event);
-   // update filter_maps
+    // update filter_maps
     if (WEED_EVENT_IS_FILTER_MAP(event)) {
       new_init_events=get_init_events_before(event,init_event,FALSE);
-      for (i=0;new_init_events[i]!=NULL;i++);
+      for (i=0; new_init_events[i]!=NULL; i++);
       if (i==0) weed_set_voidptr_value(event,"init_events",NULL);
       else weed_set_voidptr_array(event,"init_events",i,new_init_events);
-      g_free(new_init_events);
+      lives_free(new_init_events);
 
-      if ((filter_map==NULL&&i==0)||(filter_map!=NULL&&compare_filter_maps(filter_map,event,-1000000))) 
-	delete_event(event_list,event);
+      if ((filter_map==NULL&&i==0)||(filter_map!=NULL&&compare_filter_maps(filter_map,event,-1000000)))
+        delete_event(event_list,event);
       else filter_map=event;
     }
     event=event_next;
@@ -1339,14 +1381,14 @@
     void *pchain_next;
     void **pchain=weed_get_voidptr_array(init_event,"in_parameters",&error);
     int num_params=weed_leaf_num_elements(init_event,"in_parameters");
-    for (i=0;i<num_params;i++) {
+    for (i=0; i<num_params; i++) {
       while (pchain[i]!=NULL) {
-	pchain_next=weed_get_voidptr_value((weed_plant_t *)pchain[i],"next_change",&error);
-	delete_event(event_list,(weed_plant_t *)pchain[i]);
-	pchain[i]=pchain_next;
+        pchain_next=weed_get_voidptr_value((weed_plant_t *)pchain[i],"next_change",&error);
+        delete_event(event_list,(weed_plant_t *)pchain[i]);
+        pchain[i]=pchain_next;
       }
     }
-    weed_free(pchain);
+    lives_free(pchain);
   }
 
   delete_event(event_list,init_event);
@@ -1365,15 +1407,15 @@
   int num_inits;
 
   num_inits=weed_leaf_num_elements(fmap,"init_events");
-  new_init_events=(void **)g_malloc(num_inits*sizeof(void *));
-  for (i=0;i<num_inits;i++) {
+  new_init_events=(void **)lives_malloc(num_inits*sizeof(void *));
+  for (i=0; i<num_inits; i++) {
     if (init_events[i]!=event) new_init_events[j++]=init_events[i];
   }
-    
+
   if (j==0||(j==1&&(event==NULL||init_events[0]==NULL))) weed_set_voidptr_value(fmap,"init_events",NULL);
   else weed_set_voidptr_array(fmap,"init_events",j,new_init_events);
-  weed_free(init_events);
-  g_free(new_init_events);
+  lives_free(init_events);
+  lives_free(new_init_events);
 
   return (!(j==0||(j==1&&event==NULL)));
 }
@@ -1381,7 +1423,7 @@
 LIVES_INLINE boolean init_event_in_list(void **init_events, int num_inits, weed_plant_t *event) {
   int i;
   if (init_events==NULL||init_events[0]==NULL) return FALSE;
-  for (i=0;i<num_inits;i++) {
+  for (i=0; i<num_inits; i++) {
     if (init_events[i]==(void **)event) return TRUE;
   }
   return FALSE;
@@ -1394,7 +1436,7 @@
   int num_inits=weed_leaf_num_elements(fmap,"init_events");
   boolean ret=init_event_in_list(init_events,num_inits,event);
 
-  weed_free(init_events);
+  lives_free(init_events);
   return ret;
 
 }
@@ -1408,13 +1450,13 @@
   owners=weed_get_int_array(init_event,"in_tracks",&error);
   num_owners=weed_leaf_num_elements(init_event,"in_tracks");
 
-  for (i=0;i<num_owners;i++) {
+  for (i=0; i<num_owners; i++) {
     if (owners[i]==track) {
-      weed_free(owners);
+      lives_free(owners);
       return TRUE;
     }
   }
-  weed_free(owners);
+  lives_free(owners);
   return FALSE;
 }
 
@@ -1464,7 +1506,7 @@
   weed_timecode_t deinit_tc=get_event_timecode(deinit_event);
 
   weed_timecode_t pchain_tc;
-  
+
   void *pchain,*pchain_next;
 
   if (!weed_plant_has_leaf(init_event,"in_parameters")) return;
@@ -1472,7 +1514,7 @@
   num_inits=weed_leaf_num_elements(init_event,"in_parameters");
   init_events=weed_get_voidptr_array(init_event,"in_parameters",&error);
 
-  for (i=0;i<num_inits;i++) {
+  for (i=0; i<num_inits; i++) {
     pchain=init_events[i];
     while (pchain!=NULL) {
       pchain_tc=get_event_timecode((weed_plant_t *)pchain);
@@ -1482,13 +1524,13 @@
       pchain=pchain_next;
     }
   }
-  weed_free(init_events);
+  lives_free(init_events);
 }
 
 
 
-static void rescale_param_changes(weed_plant_t *event_list, weed_plant_t *init_event, weed_timecode_t new_init_tc, 
-				  weed_plant_t *deinit_event, weed_timecode_t new_deinit_tc, double fps) {
+static void rescale_param_changes(weed_plant_t *event_list, weed_plant_t *init_event, weed_timecode_t new_init_tc,
+                                  weed_plant_t *deinit_event, weed_timecode_t new_deinit_tc, double fps) {
   // rescale parameter value changes along the time axis
   // this can be called when a FILTER_INIT or FILTER_DEINIT is moved
 
@@ -1500,7 +1542,7 @@
   weed_timecode_t old_deinit_tc=get_event_timecode(deinit_event);
 
   weed_timecode_t pchain_tc,new_tc;
-  
+
   void *pchain;
   weed_plant_t *event;
 
@@ -1511,44 +1553,43 @@
 
   if (init_events==NULL) num_inits=0;
 
-  for (i=0;i<num_inits;i++) {
+  for (i=0; i<num_inits; i++) {
     pchain=init_events[i];
     while (pchain!=NULL) {
       pchain_tc=get_event_timecode((weed_plant_t *)pchain);
       new_tc=(weed_timecode_t)((double)(pchain_tc-old_init_tc)/(double)(old_deinit_tc-old_init_tc)*
-			       (double)(new_deinit_tc-new_init_tc))+new_init_tc;
+                               (double)(new_deinit_tc-new_init_tc))+new_init_tc;
       new_tc=q_gint64(new_tc,fps);
       if (new_tc==pchain_tc) {
-	if (!weed_plant_has_leaf((weed_plant_t *)pchain,"next_change")) pchain=NULL;
-	else pchain=weed_get_voidptr_value((weed_plant_t *)pchain,"next_change",&error);
-	continue;
+        if (!weed_plant_has_leaf((weed_plant_t *)pchain,"next_change")) pchain=NULL;
+        else pchain=weed_get_voidptr_value((weed_plant_t *)pchain,"next_change",&error);
+        continue;
       }
       event=(weed_plant_t *)pchain;
       if (new_tc<pchain_tc) {
-	while (event!=NULL&&get_event_timecode(event)>new_tc) event=get_prev_event(event);
+        while (event!=NULL&&get_event_timecode(event)>new_tc) event=get_prev_event(event);
+      } else {
+        while (event!=NULL&&get_event_timecode(event)<new_tc) event=get_next_event(event);
       }
-      else {
-	while (event!=NULL&&get_event_timecode(event)<new_tc) event=get_next_event(event);
-      }
-      
+
       if (event!=NULL) {
-	unlink_event(event_list,(weed_plant_t *)pchain);
-	insert_param_change_event_at(event_list,event,(weed_plant_t *)pchain);
+        unlink_event(event_list,(weed_plant_t *)pchain);
+        insert_param_change_event_at(event_list,event,(weed_plant_t *)pchain);
       }
-      
+
       if (!weed_plant_has_leaf((weed_plant_t *)pchain,"next_change")) pchain=NULL;
       else pchain=weed_get_voidptr_value((weed_plant_t *)pchain,"next_change",&error);
     }
   }
 
-  if (init_events!=NULL) weed_free(init_events);
+  if (init_events!=NULL) lives_free(init_events);
 }
 
 
 static boolean is_in_hints(weed_plant_t *event,void **hints) {
   int i;
   if (hints==NULL) return FALSE;
-  for (i=0;hints[i]!=NULL;i++) {
+  for (i=0; hints[i]!=NULL; i++) {
     if (hints[i]==event) return TRUE;
   }
   return FALSE;
@@ -1560,7 +1601,7 @@
 boolean init_event_is_process_last(weed_plant_t *event) {
   int error;
   boolean res=FALSE;
-  gchar *hashname;
+  char *hashname;
   weed_plant_t *filter;
 
   if (event==NULL) return FALSE;
@@ -1568,13 +1609,13 @@
   hashname=weed_get_string_value(event,"filter",&error);
   filter=get_weed_filter(weed_get_idx_for_hashname(hashname,TRUE));
   if (weed_plant_has_leaf(filter,"flags")) {
-      int fflags=weed_get_int_value(filter,"flags",&error);
-      if (fflags&WEED_FILTER_PROCESS_LAST) {
-	res=TRUE;
-      }
+    int fflags=weed_get_int_value(filter,"flags",&error);
+    if (fflags&WEED_FILTER_PROCESS_LAST) {
+      res=TRUE;
+    }
   }
-  
-  weed_free(hashname);
+
+  lives_free(hashname);
   return res;
 }
 
@@ -1603,15 +1644,15 @@
 
   if (num_inits==1&&(init_events==NULL||init_events[0]==NULL)) {
     weed_set_voidptr_value(fmap,"init_events",event);
-    weed_free(init_events);
+    lives_free(init_events);
     return;
   }
 
   if (init_event_is_process_last(event)) plast=TRUE;
 
-  new_init_events=(void **)g_malloc((num_inits+1)*sizeof(void *));
+  new_init_events=(void **)lives_malloc((num_inits+1)*sizeof(void *));
 
-  for (i=0;i<num_inits;i++) {
+  for (i=0; i<num_inits; i++) {
     if (init_event_is_process_last((weed_plant_t *)init_events[i])) mustadd=TRUE;
 
     if (mustadd||(!plast&&!added&&is_in_hints((weed_plant_t *)init_events[i],hints))) {
@@ -1624,8 +1665,8 @@
   if (!added) new_init_events[j++]=event;
 
   weed_set_voidptr_array(fmap,"init_events",j,new_init_events);
-  weed_free(init_events);
-  g_free(new_init_events);
+  lives_free(init_events);
+  lives_free(new_init_events);
 }
 
 
@@ -1652,10 +1693,10 @@
     while (get_event_timecode(event)<new_tc) {
       event_next=get_next_event(event);
       if (WEED_EVENT_IS_FILTER_MAP(event)) {
-	is_null_filter_map=!remove_event_from_filter_map(event,init_event);
-	if ((filter_map==NULL&&is_null_filter_map)||(filter_map!=NULL&&compare_filter_maps(filter_map,event,-1000000))) 
-	  delete_event(event_list,event);
-	else filter_map=event;
+        is_null_filter_map=!remove_event_from_filter_map(event,init_event);
+        if ((filter_map==NULL&&is_null_filter_map)||(filter_map!=NULL&&compare_filter_maps(filter_map,event,-1000000)))
+          delete_event(event_list,event);
+        else filter_map=event;
       }
       event=event_next;
     }
@@ -1666,13 +1707,12 @@
 
     init_events=get_init_events_before(event,init_event,TRUE);
     event_list=append_filter_map_event(event_list,new_tc,init_events);
-    g_free(init_events);
+    lives_free(init_events);
 
     filter_map=get_last_event(event_list);
     unlink_event(event_list,filter_map);
     insert_filter_map_event_at(event_list,event,filter_map,TRUE);
-  }
-  else {
+  } else {
     // moving left
     // see if event is switched on at start
     boolean is_on=FALSE;
@@ -1680,21 +1720,21 @@
     while (event!=deinit_event) {
       if (get_event_timecode(event)>tc) break;
       if (WEED_EVENT_IS_FILTER_MAP(event)&&filter_map_has_event(event,init_event)) {
-	if (weed_plant_has_leaf(event,"init_events")) {
-	  init_events=weed_get_voidptr_array(event,"init_events",&error);
-	  if (init_events[0]!=NULL) {
-	    num_inits=weed_leaf_num_elements(event,"init_events");
-	    event_hints=(void **)g_malloc((num_inits+1)*sizeof(void *));
-	    for (i=0;i<num_inits;i++) {
-	      if (adding) event_hints[j++]=init_events[i];
-	      if (init_events[i]==init_event) adding=TRUE;
-	    }
-	    event_hints[j]=NULL;
-	    is_on=TRUE;
-	  }
-	  weed_free(init_events);
-	}
-	break;
+        if (weed_plant_has_leaf(event,"init_events")) {
+          init_events=weed_get_voidptr_array(event,"init_events",&error);
+          if (init_events[0]!=NULL) {
+            num_inits=weed_leaf_num_elements(event,"init_events");
+            event_hints=(void **)lives_malloc((num_inits+1)*sizeof(void *));
+            for (i=0; i<num_inits; i++) {
+              if (adding) event_hints[j++]=init_events[i];
+              if (init_events[i]==init_event) adding=TRUE;
+            }
+            event_hints[j]=NULL;
+            is_on=TRUE;
+          }
+          lives_free(init_events);
+        }
+        break;
       }
       event=get_next_event(event);
     }
@@ -1709,34 +1749,33 @@
 
       // insert filter_map at new filter_init
       if (filter_map!=NULL) {
-	copy_filter_map=weed_plant_copy(filter_map);
-	add_init_event_to_filter_map(copy_filter_map,init_event,event_hints);
-	filter_map=copy_filter_map;
+        copy_filter_map=weed_plant_copy(filter_map);
+        add_init_event_to_filter_map(copy_filter_map,init_event,event_hints);
+        filter_map=copy_filter_map;
+      } else {
+        init_events=(void **)lives_malloc(2*sizeof(void *));
+        init_events[0]=init_event;
+        init_events[1]=NULL;
+        event_list=append_filter_map_event(event_list, new_tc, init_events);
+        lives_free(init_events);
+        filter_map=get_last_event(event_list);
+        unlink_event(event_list,filter_map);
       }
-      else {
-	init_events=(void **)g_malloc(2*sizeof(void *));
-	init_events[0]=init_event;
-	init_events[1]=NULL;
-	event_list=append_filter_map_event (event_list, new_tc, init_events);
-	g_free(init_events);
-	filter_map=get_last_event(event_list);
-	unlink_event(event_list,filter_map);
-      }
-      
+
       insert_filter_map_event_at(event_list,event,filter_map,TRUE);
       event=get_next_event(filter_map);
 
       // ensure filter remains on until repositioned FILTER_INIT
       while (event!=NULL&&get_event_timecode(event)<=tc) {
-	event_next=get_next_event(event);
-	if (WEED_EVENT_IS_FILTER_MAP(event)) {
-	  add_init_event_to_filter_map(filter_map,init_event,event_hints);
-	  if (compare_filter_maps(filter_map,event,-1000000)) delete_event(event_list,event);
-	  else filter_map=event;
-	}
-	event=event_next;
+        event_next=get_next_event(event);
+        if (WEED_EVENT_IS_FILTER_MAP(event)) {
+          add_init_event_to_filter_map(filter_map,init_event,event_hints);
+          if (compare_filter_maps(filter_map,event,-1000000)) delete_event(event_list,event);
+          else filter_map=event;
+        }
+        event=event_next;
       }
-      if (event_hints!=NULL) g_free(event_hints);
+      if (event_hints!=NULL) lives_free(event_hints);
     }
   }
 
@@ -1744,9 +1783,9 @@
 
 
 
-void move_filter_deinit_event(weed_plant_t *event_list, weed_timecode_t new_tc, weed_plant_t *deinit_event, 
-			      double fps, boolean rescale_pchanges) {
-  // move a filter_deinit from old pos to new pos, remove mention of it from filter maps, 
+void move_filter_deinit_event(weed_plant_t *event_list, weed_timecode_t new_tc, weed_plant_t *deinit_event,
+                              double fps, boolean rescale_pchanges) {
+  // move a filter_deinit from old pos to new pos, remove mention of it from filter maps,
   // possibly add/update filter map before frame at new_tc, remove duplicate filter_maps, update param_change events
   int error,i,j=0;
   weed_timecode_t tc=get_event_timecode(deinit_event);
@@ -1774,15 +1813,14 @@
     filter_map=get_filter_map_before(event,-1000000,NULL);
     if (filter_map!=NULL) {
       if (get_event_timecode(filter_map)!=get_event_timecode(event)) {
-	copy_filter_map=weed_plant_copy(filter_map);
-	if (!WEED_EVENT_IS_FRAME(event)) event=get_prev_frame_event(event);
-	if (event==NULL) event=get_first_event(event_list);
-	insert_filter_map_event_at(event_list,event,copy_filter_map,FALSE);
-      }
-      else copy_filter_map=filter_map;
+        copy_filter_map=weed_plant_copy(filter_map);
+        if (!WEED_EVENT_IS_FRAME(event)) event=get_prev_frame_event(event);
+        if (event==NULL) event=get_first_event(event_list);
+        insert_filter_map_event_at(event_list,event,copy_filter_map,FALSE);
+      } else copy_filter_map=filter_map;
       remove_event_from_filter_map(copy_filter_map,init_event);
-      if (filter_map!=copy_filter_map&&compare_filter_maps(filter_map,copy_filter_map,-1000000)) 
-	delete_event(event_list,copy_filter_map);
+      if (filter_map!=copy_filter_map&&compare_filter_maps(filter_map,copy_filter_map,-1000000))
+        delete_event(event_list,copy_filter_map);
       else filter_map=copy_filter_map;
     }
 
@@ -1795,19 +1833,18 @@
     while (event!=NULL&&get_event_timecode(event)<=tc) {
       event_next=get_next_event(event);
       if (WEED_EVENT_IS_FILTER_MAP(event)) {
-	// found a filter map, so remove the event from it
-	is_null_filter_map=!remove_event_from_filter_map(event,init_event);
-	if ((filter_map==NULL&&is_null_filter_map)||(filter_map!=NULL&&compare_filter_maps(filter_map,event,-1000000))) 
-	  delete_event(event_list,event);
-	else filter_map=event;
+        // found a filter map, so remove the event from it
+        is_null_filter_map=!remove_event_from_filter_map(event,init_event);
+        if ((filter_map==NULL&&is_null_filter_map)||(filter_map!=NULL&&compare_filter_maps(filter_map,event,-1000000)))
+          delete_event(event_list,event);
+        else filter_map=event;
       }
       event=event_next;
     }
     unlink_event(event_list,deinit_event);
     insert_filter_deinit_event_at(event_list,xevent,deinit_event);
     if (!rescale_pchanges) delete_param_changes_after_deinit(event_list,init_event);
-  }
-  else {
+  } else {
     // moving right
     // see if event is switched on at end
     boolean is_on=FALSE;
@@ -1820,18 +1857,18 @@
     if (filter_map!=NULL&&filter_map_has_event(filter_map,init_event)) {
       init_events=weed_get_voidptr_array(filter_map,"init_events",&error);
       num_inits=weed_leaf_num_elements(filter_map,"init_events");
-      event_hints=(void **)g_malloc((num_inits+1)*sizeof(void *));
-      for (i=0;i<num_inits;i++) {
-	if (adding) {
-	  event_hints[j++]=init_events[i];
-	}
-	if (init_events[i]==init_event) adding=TRUE;
+      event_hints=(void **)lives_malloc((num_inits+1)*sizeof(void *));
+      for (i=0; i<num_inits; i++) {
+        if (adding) {
+          event_hints[j++]=init_events[i];
+        }
+        if (init_events[i]==init_event) adding=TRUE;
       }
       event_hints[j]=NULL;
       is_on=TRUE;
-      weed_free(init_events);
+      lives_free(init_events);
     }
-    
+
     // move deinit event
     event=deinit_event;
     while (event!=NULL&&get_event_timecode(event)<new_tc) event=get_next_event(event);
@@ -1846,16 +1883,16 @@
       // ensure filter remains on until new position
       event=xevent;
       while (event!=deinit_event) {
-	if (get_event_timecode(event)==new_tc&&WEED_EVENT_IS_FRAME(event)) break;
-	event_next=get_next_event(event);
-	if (WEED_EVENT_IS_FILTER_MAP(event)) {
-	  add_init_event_to_filter_map(event,init_event,event_hints);
-	  if (compare_filter_maps(filter_map,event,-1000000)) delete_event(event_list,event);
-	  else filter_map=event;
-	}
-	event=event_next;
+        if (get_event_timecode(event)==new_tc&&WEED_EVENT_IS_FRAME(event)) break;
+        event_next=get_next_event(event);
+        if (WEED_EVENT_IS_FILTER_MAP(event)) {
+          add_init_event_to_filter_map(event,init_event,event_hints);
+          if (compare_filter_maps(filter_map,event,-1000000)) delete_event(event_list,event);
+          else filter_map=event;
+        }
+        event=event_next;
       }
-      if (event_hints!=NULL) g_free(event_hints);
+      if (event_hints!=NULL) lives_free(event_hints);
 
       // find last FILTER_MAP before deinit_event
       event=deinit_event;
@@ -1864,21 +1901,21 @@
       filter_map=get_filter_map_before(event,-1000000,NULL);
 
       if (filter_map!=NULL&&filter_map_has_event(filter_map,init_event)) {
-	// if last FILTER_MAP before deinit_event mentions init_event, remove init_event, 
-	// insert FILTER_MAP after deinit_event
-	copy_filter_map=weed_plant_copy(filter_map);
-
-	remove_event_from_filter_map(copy_filter_map,init_event);
-	insert_filter_map_event_at(event_list,deinit_event,copy_filter_map,FALSE);
-	event=get_next_event(copy_filter_map);
-	while (event!=NULL) {
-	  // remove next FILTER_MAP if it is a duplicate
-	  if (WEED_EVENT_IS_FILTER_MAP(event)) {
-	    if (compare_filter_maps(copy_filter_map,event,-1000000)) delete_event(event_list,event);
-	    break;
-	  }
-	  event=get_next_event(event);
-	}
+        // if last FILTER_MAP before deinit_event mentions init_event, remove init_event,
+        // insert FILTER_MAP after deinit_event
+        copy_filter_map=weed_plant_copy(filter_map);
+
+        remove_event_from_filter_map(copy_filter_map,init_event);
+        insert_filter_map_event_at(event_list,deinit_event,copy_filter_map,FALSE);
+        event=get_next_event(copy_filter_map);
+        while (event!=NULL) {
+          // remove next FILTER_MAP if it is a duplicate
+          if (WEED_EVENT_IS_FILTER_MAP(event)) {
+            if (compare_filter_maps(copy_filter_map,event,-1000000)) delete_event(event_list,event);
+            break;
+          }
+          event=get_next_event(event);
+        }
       }
     }
   }
@@ -1892,43 +1929,47 @@
   // move a filter_init or param_change to the right
   // this can happen for two reasons: - we are rectifying an event_list, or a block was deleted or moved
 
-  int *owners;
-  int error;
-  int num_owners=0,num_clips;
+  // if can_stay is FALSE, event is forced to move. This is used only during event list rectification.
+
   weed_timecode_t tc=get_event_timecode(event),new_tc=tc;
   weed_plant_t *xevent=event;
+
+  int *owners;
+
   boolean all_ok=FALSE;
-  int i;
-  
+
+  int error;
+  int num_owners=0,num_clips;
+
+  register int i;
+
   if (WEED_EVENT_IS_FILTER_INIT(event)) {
     if (weed_plant_has_leaf(event,"in_tracks")) num_owners=weed_leaf_num_elements(event,"in_tracks");
-  }
-  else if (!WEED_EVENT_IS_PARAM_CHANGE(event)) return TRUE;
- 
+  } else if (!WEED_EVENT_IS_PARAM_CHANGE(event)) return TRUE;
+
   if (num_owners>0) {
     owners=weed_get_int_array(event,"in_tracks",&error);
 
     while (xevent!=NULL) {
       if (WEED_EVENT_IS_FRAME(xevent)) {
-	if ((new_tc=get_event_timecode(xevent))>tc||(can_stay&&new_tc==tc)) {
-	  all_ok=TRUE;
-	  num_clips=weed_leaf_num_elements(xevent,"clips");
-	  // find timecode of next event which has valid frames at all owner tracks
-	  for (i=0;i<num_owners;i++) {
-	    if (owners[i]<0) continue; // ignore audio owners
-	    if (num_clips<=owners[i]||get_frame_event_clip(xevent,owners[i])<0||get_frame_event_frame(xevent,owners[i])<1) {
-	      all_ok=FALSE;
-	      break; // blank frame, or not enough frames
-	    }
-	  }
-	  if (all_ok) break;
-	}
+        if ((new_tc=get_event_timecode(xevent))>tc||(can_stay&&new_tc==tc)) {
+          all_ok=TRUE;
+          num_clips=weed_leaf_num_elements(xevent,"clips");
+          // find timecode of next event which has valid frames at all owner tracks
+          for (i=0; i<num_owners; i++) {
+            if (owners[i]<0) continue; // ignore audio owners
+            if (num_clips<=owners[i]||get_frame_event_clip(xevent,owners[i])<0||get_frame_event_frame(xevent,owners[i])<1) {
+              all_ok=FALSE;
+              break; // blank frame, or not enough frames
+            }
+          }
+          if (all_ok) break;
+        }
       }
       xevent=get_next_event(xevent);
     }
-    weed_free(owners);
-  }
-  else {
+    lives_free(owners);
+  } else {
     if (can_stay) return TRUE; // bound to timeline, and allowed to stay
     xevent=get_next_frame_event(event); // bound to timeline, move to next frame event
     new_tc=get_event_timecode(xevent);
@@ -1941,13 +1982,13 @@
   if (WEED_EVENT_IS_FILTER_INIT(event)) {
     weed_plant_t *deinit_event=(weed_plant_t *)weed_get_voidptr_value(event,"deinit_event",&error);
     if (xevent==NULL||get_event_timecode(deinit_event)<new_tc) {
-      // if we are moving a filter_init past its deinit event, remove it, remove deinit, remove param_change events, remove from all filter_maps, and check for duplicate filter maps
+      // if we are moving a filter_init past its deinit event, remove it, remove deinit, remove param_change events,
+      // remove from all filter_maps, and check for duplicate filter maps
       remove_filter_from_event_list(event_list,event);
       return FALSE;
     }
     move_filter_init_event(event_list,new_tc,event,fps);
-  }
-  else {
+  } else {
     // otherwise, for a param_change, just insert it at new_tc
     weed_plant_t *init_event=(weed_plant_t *)weed_get_voidptr_value(event,"init_event",&error);
     weed_plant_t *deinit_event=(weed_plant_t *)weed_get_voidptr_value(init_event,"deinit_event",&error);
@@ -1967,6 +2008,8 @@
   // move a filter_deinit to the left
   // this can happen for two reasons: - we are rectifying an event_list, or a block was deleted or moved
 
+  // if can_stay is FALSE, event is forced to move. This is used only during event list rectification.
+
   weed_timecode_t tc=get_event_timecode(event),new_tc=tc;
   weed_plant_t *xevent=event;
   weed_plant_t *init_event;
@@ -1977,6 +2020,7 @@
 
   int error;
   int num_owners=0,num_clips;
+
   register int i;
 
   if (WEED_EVENT_IS_FILTER_DEINIT(event)) init_event=(weed_plant_t *)weed_get_voidptr_value(event,"init_event",&error);
@@ -1988,25 +2032,24 @@
     owners=weed_get_int_array(init_event,"in_tracks",&error);
     while (xevent!=NULL) {
       if (WEED_EVENT_IS_FRAME(xevent)) {
-	if ((new_tc=get_event_timecode(xevent))<tc||(can_stay&&new_tc==tc)) {
-	  all_ok=TRUE;
-	  // find timecode of previous event which has valid frames at all owner tracks
-	  for (i=0;i<num_owners;i++) {
-	    if (owners[i]<0) continue; // ignore audio owners
-	    num_clips=weed_leaf_num_elements(xevent,"clips");
-	    if (num_clips<=owners[i]||get_frame_event_clip(xevent,owners[i])<0||get_frame_event_frame(xevent,owners[i])<1) {
-	      all_ok=FALSE;
-	      break; // blank frame
-	    }
-	  }
-	  if (all_ok) break;
-	}
+        if ((new_tc=get_event_timecode(xevent))<tc||(can_stay&&new_tc==tc)) {
+          all_ok=TRUE;
+          // find timecode of previous event which has valid frames at all owner tracks
+          for (i=0; i<num_owners; i++) {
+            if (owners[i]<0) continue; // ignore audio owners
+            num_clips=weed_leaf_num_elements(xevent,"clips");
+            if (num_clips<=owners[i]||get_frame_event_clip(xevent,owners[i])<0||get_frame_event_frame(xevent,owners[i])<1) {
+              all_ok=FALSE;
+              break; // blank frame
+            }
+          }
+          if (all_ok) break;
+        }
       }
       xevent=get_prev_event(xevent);
     }
-    weed_free(owners);
-  }
-  else {
+    lives_free(owners);
+  } else {
     if (can_stay) return TRUE; // bound to timeline, and allowed to stay
     while (xevent!=NULL) {
       // bound to timeline, just move to previous tc
@@ -2019,12 +2062,14 @@
   if (can_stay&&(new_tc==tc)&&all_ok) return TRUE;
 
   if (get_event_timecode(init_event)>new_tc) {
-    // if we are moving a filter_deinit past its init event, remove it, remove init, remove param_change events, remove from all filter_maps, and check for duplicate filter maps
+    // if we are moving a filter_deinit past its init event, remove it, remove init, remove param_change events,
+    // remove from all filter_maps, and check for duplicate filter maps
     remove_filter_from_event_list(event_list,init_event);
     return FALSE;
   }
 
-  // otherwise, go from old pos to new pos, remove mention of it from filter maps, possibly add/update filter map as last event at new_tc, remove duplicate filter_maps, update param_change events
+  // otherwise, go from old pos to new pos, remove mention of it from filter maps, possibly add/update filter map as last event at new_tc,
+  // remove duplicate filter_maps, update param_change events
 
   move_filter_deinit_event(event_list,new_tc,event,fps,TRUE);
 
@@ -2035,23 +2080,23 @@
 //////////////////////////////////////////////////////
 // rendering
 
-void set_render_choice (LiVESToggleButton *togglebutton, gpointer choice) {
-  if (lives_toggle_button_get_active(togglebutton)) render_choice=GPOINTER_TO_INT (choice);
+void set_render_choice(LiVESToggleButton *togglebutton, livespointer choice) {
+  if (lives_toggle_button_get_active(togglebutton)) render_choice=LIVES_POINTER_TO_INT(choice);
 }
 
-void set_render_choice_button (LiVESButton *button, gpointer choice) {
-  render_choice=GPOINTER_TO_INT (choice);
+void set_render_choice_button(LiVESButton *button, livespointer choice) {
+  render_choice=LIVES_POINTER_TO_INT(choice);
 }
 
 
-int get_render_choice (void) {
+int get_render_choice(void) {
   return render_choice;
 }
 
 
 
 
-LiVESWidget *events_rec_dialog (boolean allow_mt) {
+LiVESWidget *events_rec_dialog(boolean allow_mt) {
   LiVESWidget *e_rec_dialog;
   LiVESWidget *dialog_vbox;
   LiVESWidget *vbox;
@@ -2060,107 +2105,108 @@
   LiVESWidget *radiobutton;
   LiVESWidget *okbutton;
   LiVESWidget *cancelbutton;
-  GSList *radiobutton_group = NULL;
+  LiVESSList *radiobutton_group = NULL;
   LiVESAccelGroup *accel_group;
 
   render_choice=RENDER_CHOICE_PREVIEW;
 
-  e_rec_dialog = lives_standard_dialog_new (_("LiVES: - Events recorded"),FALSE);
+  e_rec_dialog = lives_standard_dialog_new(_("LiVES: - Events recorded"),FALSE,-1,-1);
 
   if (prefs->show_gui) lives_window_set_transient_for(LIVES_WINDOW(e_rec_dialog),LIVES_WINDOW(mainw->LiVES));
 
   dialog_vbox = lives_dialog_get_content_area(LIVES_DIALOG(e_rec_dialog));
 
-  vbox = lives_vbox_new (FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (dialog_vbox), vbox, TRUE, TRUE, 0);
+  vbox = lives_vbox_new(FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(dialog_vbox), vbox, TRUE, TRUE, 0);
 
-  label = lives_standard_label_new (_("Events were recorded. What would you like to do with them ?"));
+  label = lives_standard_label_new(_("Events were recorded. What would you like to do with them ?"));
 
-  lives_box_pack_start (LIVES_BOX (vbox), label, TRUE, TRUE, widget_opts.packing_height*2);
+  lives_box_pack_start(LIVES_BOX(vbox), label, TRUE, TRUE, widget_opts.packing_height*2);
 
-  hbox = lives_hbox_new (FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height*2);
+  hbox = lives_hbox_new(FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(vbox), hbox, FALSE, FALSE, widget_opts.packing_height*2);
 
-  radiobutton = lives_standard_radio_button_new (_ ("_Preview events"),TRUE,radiobutton_group,LIVES_BOX(hbox),NULL);
-  radiobutton_group = lives_radio_button_get_group (LIVES_RADIO_BUTTON (radiobutton));
+  radiobutton = lives_standard_radio_button_new(_("_Preview events"),TRUE,radiobutton_group,LIVES_BOX(hbox),NULL);
+  radiobutton_group = lives_radio_button_get_group(LIVES_RADIO_BUTTON(radiobutton));
 
-  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (radiobutton),TRUE);
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(radiobutton),TRUE);
 
-  lives_signal_connect (LIVES_GUI_OBJECT (radiobutton), LIVES_WIDGET_TOGGLED_EVENT,
-		    LIVES_GUI_CALLBACK (set_render_choice),
-		    GINT_TO_POINTER (RENDER_CHOICE_PREVIEW));
+  lives_signal_connect(LIVES_GUI_OBJECT(radiobutton), LIVES_WIDGET_TOGGLED_SIGNAL,
+                       LIVES_GUI_CALLBACK(set_render_choice),
+                       LIVES_INT_TO_POINTER(RENDER_CHOICE_PREVIEW));
 
   if (!mainw->clip_switched&&(cfile->clip_type==CLIP_TYPE_DISK||cfile->clip_type==CLIP_TYPE_FILE)) {
 
-    hbox = lives_hbox_new (FALSE, 0);
-    lives_box_pack_start (LIVES_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height*2);
+    hbox = lives_hbox_new(FALSE, 0);
+    lives_box_pack_start(LIVES_BOX(vbox), hbox, FALSE, FALSE, widget_opts.packing_height*2);
 
-    radiobutton = lives_standard_radio_button_new (_ ("Render events to _same clip"),TRUE,radiobutton_group,LIVES_BOX(hbox),NULL);
-    radiobutton_group = lives_radio_button_get_group (LIVES_RADIO_BUTTON (radiobutton));
+    radiobutton = lives_standard_radio_button_new(_("Render events to _same clip"),TRUE,radiobutton_group,LIVES_BOX(hbox),NULL);
+    radiobutton_group = lives_radio_button_get_group(LIVES_RADIO_BUTTON(radiobutton));
 
-    lives_signal_connect (LIVES_GUI_OBJECT (radiobutton), LIVES_WIDGET_TOGGLED_EVENT,
-                      LIVES_GUI_CALLBACK (set_render_choice),
-                      GINT_TO_POINTER (RENDER_CHOICE_SAME_CLIP));
+    lives_signal_connect(LIVES_GUI_OBJECT(radiobutton), LIVES_WIDGET_TOGGLED_SIGNAL,
+                         LIVES_GUI_CALLBACK(set_render_choice),
+                         LIVES_INT_TO_POINTER(RENDER_CHOICE_SAME_CLIP));
   }
 
 
-  hbox = lives_hbox_new (FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height*2);
+  hbox = lives_hbox_new(FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(vbox), hbox, FALSE, FALSE, widget_opts.packing_height*2);
+
+  radiobutton = lives_standard_radio_button_new(_("Render events to _new clip"),TRUE,radiobutton_group,LIVES_BOX(hbox),NULL);
+  radiobutton_group = lives_radio_button_get_group(LIVES_RADIO_BUTTON(radiobutton));
+
+  lives_signal_connect(LIVES_GUI_OBJECT(radiobutton), LIVES_WIDGET_TOGGLED_SIGNAL,
+                       LIVES_GUI_CALLBACK(set_render_choice),
+                       LIVES_INT_TO_POINTER(RENDER_CHOICE_NEW_CLIP));
 
-  radiobutton = lives_standard_radio_button_new (_ ("Render events to _new clip"),TRUE,radiobutton_group,LIVES_BOX(hbox),NULL);
-  radiobutton_group = lives_radio_button_get_group (LIVES_RADIO_BUTTON (radiobutton));
-    
-  lives_signal_connect (LIVES_GUI_OBJECT (radiobutton), LIVES_WIDGET_TOGGLED_EVENT,
-		    LIVES_GUI_CALLBACK (set_render_choice),
-		    GINT_TO_POINTER (RENDER_CHOICE_NEW_CLIP));
-  
 
 
-  hbox = lives_hbox_new (FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height*2);
+  hbox = lives_hbox_new(FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(vbox), hbox, FALSE, FALSE, widget_opts.packing_height*2);
 
-  radiobutton = lives_standard_radio_button_new (_ ("View/edit events in _multitrack window (test)"),TRUE,radiobutton_group,LIVES_BOX(hbox),NULL);
-  radiobutton_group = lives_radio_button_get_group (LIVES_RADIO_BUTTON (radiobutton));
+  radiobutton = lives_standard_radio_button_new(_("View/edit events in _multitrack window (test)"),TRUE,radiobutton_group,LIVES_BOX(hbox),
+                NULL);
+  radiobutton_group = lives_radio_button_get_group(LIVES_RADIO_BUTTON(radiobutton));
 
-  lives_signal_connect (LIVES_GUI_OBJECT (radiobutton), LIVES_WIDGET_TOGGLED_EVENT,
-		    LIVES_GUI_CALLBACK (set_render_choice),
-		    GINT_TO_POINTER (RENDER_CHOICE_MULTITRACK));
+  lives_signal_connect(LIVES_GUI_OBJECT(radiobutton), LIVES_WIDGET_TOGGLED_SIGNAL,
+                       LIVES_GUI_CALLBACK(set_render_choice),
+                       LIVES_INT_TO_POINTER(RENDER_CHOICE_MULTITRACK));
 
   if (!allow_mt) lives_widget_set_sensitive(radiobutton,FALSE);
 
 
 
-  hbox = lives_hbox_new (FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height*2);
+  hbox = lives_hbox_new(FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(vbox), hbox, FALSE, FALSE, widget_opts.packing_height*2);
 
-  radiobutton = lives_standard_radio_button_new (_ ("View/edit events in _event window"),TRUE,radiobutton_group,LIVES_BOX(hbox),NULL);
-  radiobutton_group = lives_radio_button_get_group (LIVES_RADIO_BUTTON (radiobutton));
+  radiobutton = lives_standard_radio_button_new(_("View/edit events in _event window"),TRUE,radiobutton_group,LIVES_BOX(hbox),NULL);
+  radiobutton_group = lives_radio_button_get_group(LIVES_RADIO_BUTTON(radiobutton));
 
-  lives_signal_connect (LIVES_GUI_OBJECT (radiobutton), LIVES_WIDGET_TOGGLED_EVENT,
-		    LIVES_GUI_CALLBACK (set_render_choice),
-		    GINT_TO_POINTER (RENDER_CHOICE_EVENT_LIST));
+  lives_signal_connect(LIVES_GUI_OBJECT(radiobutton), LIVES_WIDGET_TOGGLED_SIGNAL,
+                       LIVES_GUI_CALLBACK(set_render_choice),
+                       LIVES_INT_TO_POINTER(RENDER_CHOICE_EVENT_LIST));
 
-  cancelbutton = lives_button_new_from_stock (LIVES_STOCK_CANCEL);
-  lives_widget_set_can_focus (cancelbutton,TRUE);
+  cancelbutton = lives_button_new_from_stock(LIVES_STOCK_CANCEL);
+  lives_widget_set_can_focus(cancelbutton,TRUE);
 
-  lives_dialog_add_action_widget (LIVES_DIALOG (e_rec_dialog), cancelbutton, LIVES_RESPONSE_CANCEL);
+  lives_dialog_add_action_widget(LIVES_DIALOG(e_rec_dialog), cancelbutton, LIVES_RESPONSE_CANCEL);
 
-  lives_signal_connect (LIVES_GUI_OBJECT (cancelbutton), LIVES_WIDGET_CLICKED_EVENT,
-		    LIVES_GUI_CALLBACK (set_render_choice_button),
-		    GINT_TO_POINTER (RENDER_CHOICE_DISCARD));
+  lives_signal_connect(LIVES_GUI_OBJECT(cancelbutton), LIVES_WIDGET_CLICKED_SIGNAL,
+                       LIVES_GUI_CALLBACK(set_render_choice_button),
+                       LIVES_INT_TO_POINTER(RENDER_CHOICE_DISCARD));
 
-  accel_group = LIVES_ACCEL_GROUP(lives_accel_group_new ());
-  lives_widget_add_accelerator (cancelbutton, LIVES_WIDGET_CLICKED_EVENT, accel_group,
-                              LIVES_KEY_Escape, (LiVESXModifierType)0, (LiVESAccelFlags)0);
+  accel_group = LIVES_ACCEL_GROUP(lives_accel_group_new());
+  lives_widget_add_accelerator(cancelbutton, LIVES_WIDGET_CLICKED_SIGNAL, accel_group,
+                               LIVES_KEY_Escape, (LiVESXModifierType)0, (LiVESAccelFlags)0);
 
-  lives_window_add_accel_group (LIVES_WINDOW (e_rec_dialog), accel_group);
+  lives_window_add_accel_group(LIVES_WINDOW(e_rec_dialog), accel_group);
 
-  okbutton = lives_button_new_from_stock (LIVES_STOCK_OK);
-  lives_widget_show (okbutton);
-  lives_dialog_add_action_widget (LIVES_DIALOG (e_rec_dialog), okbutton, LIVES_RESPONSE_OK);
-  lives_widget_set_can_focus_and_default (okbutton);
-  lives_widget_grab_default (okbutton);
-  lives_widget_show_all (e_rec_dialog);
+  okbutton = lives_button_new_from_stock(LIVES_STOCK_OK);
+  lives_widget_show(okbutton);
+  lives_dialog_add_action_widget(LIVES_DIALOG(e_rec_dialog), okbutton, LIVES_RESPONSE_OK);
+  lives_widget_set_can_focus_and_default(okbutton);
+  lives_widget_grab_default(okbutton);
+  lives_widget_show_all(e_rec_dialog);
 
   return e_rec_dialog;
 
@@ -2168,25 +2214,25 @@
 
 
 
-static void event_list_free_events (weed_plant_t *event_list) {
+static void event_list_free_events(weed_plant_t *event_list) {
   weed_plant_t *event,*next_event;
   event=get_first_event(event_list);
 
   while (event!=NULL) {
     next_event=get_next_event(event);
     if (mainw->multitrack!=NULL&&event_list==mainw->multitrack->event_list) mt_fixup_events(mainw->multitrack,event,NULL);
-    weed_plant_free (event);
+    weed_plant_free(event);
     event=next_event;
   }
 }
 
-void event_list_free (weed_plant_t *event_list) {
+void event_list_free(weed_plant_t *event_list) {
   if (event_list==NULL) return;
   event_list_free_events(event_list);
-  weed_plant_free (event_list);
+  weed_plant_free(event_list);
 }
 
-void event_list_replace_events (weed_plant_t *event_list, weed_plant_t *new_event_list) {
+void event_list_replace_events(weed_plant_t *event_list, weed_plant_t *new_event_list) {
   if (event_list==NULL) return;
   event_list_free_events(event_list);
   weed_set_voidptr_value(event_list,"first",get_first_event(new_event_list));
@@ -2196,7 +2242,7 @@
 
 
 
-boolean event_list_to_block (weed_plant_t *event_list, int num_events) {
+boolean event_list_to_block(weed_plant_t *event_list, int num_events) {
   // translate our new event_list to older event blocks
   // by now we should have eliminated clip switches and param settings
 
@@ -2216,8 +2262,8 @@
   event=get_first_event(event_list);
 
   while (event!=NULL) {
-    if (get_event_hint(event)==WEED_EVENT_HINT_FRAME) {
-      (cfile->events[i++])->value=weed_get_int_value (event,"frames",&error);
+    if (WEED_EVENT_IS_FRAME(event)) {
+      (cfile->events[i++])->value=weed_get_int_value(event,"frames",&error);
     }
     event=get_next_event(event);
   }
@@ -2226,7 +2272,7 @@
 
 
 
-void event_list_close_gaps (weed_plant_t *event_list) {
+void event_list_close_gaps(weed_plant_t *event_list) {
   // close gap at start of event list, and between record_end and record_start markers
   weed_plant_t *event,*next_event;
   weed_timecode_t tc,tc_start,rec_end_tc=0;
@@ -2239,18 +2285,17 @@
   while (event!=NULL) {
     next_event=get_next_event(event);
 
-    tc=get_event_timecode (event)-tc_start;
-    weed_set_int64_value (event,"timecode",tc);
+    tc=get_event_timecode(event)-tc_start;
+    weed_set_int64_value(event,"timecode",tc);
 
     if (WEED_EVENT_IS_MARKER(event)) {
       marker_type=weed_get_int_value(event,"lives_type",&error);
       if (marker_type==EVENT_MARKER_RECORD_END) {
-	rec_end_tc=tc;
-	delete_event(event_list,event);
-      }
-      else if (marker_type==EVENT_MARKER_RECORD_START) {
-	tc_start+=tc-rec_end_tc;
-	delete_event(event_list,event);
+        rec_end_tc=tc;
+        delete_event(event_list,event);
+      } else if (marker_type==EVENT_MARKER_RECORD_START) {
+        tc_start+=tc-rec_end_tc;
+        delete_event(event_list,event);
       }
     }
     event=next_event;
@@ -2276,12 +2321,12 @@
 
   // add a new value to in_tracks
   num_in_tracks=weed_leaf_num_elements(event,"in_tracks")+1;
-  new_in_tracks=(int *)g_malloc(num_in_tracks*sizint);
-  for (i=0;i<num_in_tracks;i++) {
+  new_in_tracks=(int *)lives_malloc(num_in_tracks*sizint);
+  for (i=0; i<num_in_tracks; i++) {
     new_in_tracks[i]=x++;
   }
   weed_set_int_array(event,"in_tracks",num_in_tracks,new_in_tracks);
-  g_free(new_in_tracks);
+  lives_free(new_in_tracks);
 
   weed_set_int_value(event,"in_count",weed_get_int_value(event,"in_count",&error)+1);
 
@@ -2292,42 +2337,41 @@
 
   in_ptmpls=weed_get_plantptr_array(filter,"in_parameter_templates",&error);
 
-  for (i=0;i<nparams;i++) {
+  for (i=0; i<nparams; i++) {
     pchange=(weed_plant_t *)pchainx[i];
     bval=WEED_FALSE;
     while (pchange!=NULL) {
       fill_param_vals_to((weed_plant_t *)pchange,in_ptmpls[i],behind?num_in_tracks-1:1);
       if (weed_plant_has_leaf((weed_plant_t *)pchange,"ignore")) {
-	numigns=weed_leaf_num_elements((weed_plant_t *)pchange,"ignore")+1;
-	igns=weed_get_boolean_array((weed_plant_t *)pchange,"ignore",&error);
-	nigns=(int *)g_malloc(numigns*sizint);
-
-	for (j=0;j<numigns;j++) {
-	  if (behind) {
-	    if (j<numigns-1) nigns[j]=igns[j];
-	    else nigns[j]=bval;
-	  }
-	  else {
-	    if (j==0) nigns[j]=igns[j];
-	    else if (j==1) nigns[j]=bval;
-	    else nigns[j]=igns[j-1];
-	  }
-	}
-	weed_set_boolean_array((weed_plant_t *)pchange,"ignore",numigns,nigns);
-	weed_free(igns);
-	g_free(nigns);
+        numigns=weed_leaf_num_elements((weed_plant_t *)pchange,"ignore")+1;
+        igns=weed_get_boolean_array((weed_plant_t *)pchange,"ignore",&error);
+        nigns=(int *)lives_malloc(numigns*sizint);
+
+        for (j=0; j<numigns; j++) {
+          if (behind) {
+            if (j<numigns-1) nigns[j]=igns[j];
+            else nigns[j]=bval;
+          } else {
+            if (j==0) nigns[j]=igns[j];
+            else if (j==1) nigns[j]=bval;
+            else nigns[j]=igns[j-1];
+          }
+        }
+        weed_set_boolean_array((weed_plant_t *)pchange,"ignore",numigns,nigns);
+        lives_free(igns);
+        lives_free(nigns);
       }
       pchange=weed_get_voidptr_value((weed_plant_t *)pchange,"next_change",&error);
       bval=WEED_TRUE;
     }
   }
 
-  weed_free(in_ptmpls);
+  lives_free(in_ptmpls);
 }
 
 
 
-void event_list_add_track (weed_plant_t *event_list, int layer) {
+void event_list_add_track(weed_plant_t *event_list, int layer) {
   // in this function we insert a new track before existing tracks
   // TODO - memcheck
   weed_plant_t *event;
@@ -2348,53 +2392,52 @@
       clips=weed_get_int_array(event,"clips",&error);
       frames=weed_get_int_array(event,"frames",&error);
       if (numframes==1&&clips[0]==-1&&frames[0]==0) {
-	// for blank frames, we don't do anything
-	weed_free(clips);
-	weed_free(frames);
-	break;
+        // for blank frames, we don't do anything
+        lives_free(clips);
+        lives_free(frames);
+        break;
       }
 
-      newclips=(int *)g_malloc((numframes+1)*sizint);
-      newframes=(int *)g_malloc((numframes+1)*sizint);
-      
+      newclips=(int *)lives_malloc((numframes+1)*sizint);
+      newframes=(int *)lives_malloc((numframes+1)*sizint);
+
       newclips[layer]=-1;
       newframes[layer]=0;
-      for (i=0;i<numframes;i++) {
-	if (i<layer) {
-	  newclips[i]=clips[i];
-	  newframes[i]=frames[i];
-	}
-	else {
-	  newclips[i+1]=clips[i];
-	  newframes[i+1]=frames[i];
-	}
+      for (i=0; i<numframes; i++) {
+        if (i<layer) {
+          newclips[i]=clips[i];
+          newframes[i]=frames[i];
+        } else {
+          newclips[i+1]=clips[i];
+          newframes[i+1]=frames[i];
+        }
       }
       numframes++;
 
       weed_set_int_array(event,"clips",numframes,newclips);
       weed_set_int_array(event,"frames",numframes,newframes);
-      
-      g_free(newclips);
-      g_free(newframes);
-      weed_free(clips);
-      weed_free(frames);
+
+      lives_free(newclips);
+      lives_free(newframes);
+      lives_free(clips);
+      lives_free(frames);
       break;
     case WEED_EVENT_HINT_FILTER_INIT:
       if (weed_plant_has_leaf(event,"in_tracks")&&(num_in_tracks=weed_leaf_num_elements(event,"in_tracks"))>0) {
-	in_tracks=weed_get_int_array(event,"in_tracks",&error);
-	for (i=0;i<num_in_tracks;i++) {
-	  if (in_tracks[i]>=layer) in_tracks[i]++;
-	}
-	weed_set_int_array(event,"in_tracks",num_in_tracks,in_tracks);
-	weed_free(in_tracks);
+        in_tracks=weed_get_int_array(event,"in_tracks",&error);
+        for (i=0; i<num_in_tracks; i++) {
+          if (in_tracks[i]>=layer) in_tracks[i]++;
+        }
+        weed_set_int_array(event,"in_tracks",num_in_tracks,in_tracks);
+        lives_free(in_tracks);
       }
       if (weed_plant_has_leaf(event,"out_tracks")&&(num_out_tracks=weed_leaf_num_elements(event,"out_tracks"))>0) {
-	out_tracks=weed_get_int_array(event,"out_tracks",&error);
-	for (i=0;i<num_out_tracks;i++) {
-	  if (out_tracks[i]>=layer) out_tracks[i]++;
-	}
-	weed_set_int_array(event,"out_tracks",num_out_tracks,out_tracks);
-	weed_free(out_tracks);
+        out_tracks=weed_get_int_array(event,"out_tracks",&error);
+        for (i=0; i<num_out_tracks; i++) {
+          if (out_tracks[i]>=layer) out_tracks[i]++;
+        }
+        weed_set_int_array(event,"out_tracks",num_out_tracks,out_tracks);
+        lives_free(out_tracks);
       }
       break;
     }
@@ -2407,7 +2450,7 @@
   int error;
   weed_plant_t *event;
 
-  event=weed_plant_new (WEED_PLANT_EVENT);
+  event=weed_plant_new(WEED_PLANT_EVENT);
   if (event==NULL) return NULL;
   error=weed_set_voidptr_value(event,"next",NULL);
   if (error==WEED_ERROR_MEMORY_ALLOCATION) return NULL;
@@ -2418,14 +2461,14 @@
 
   ////////////////////////////////////////
 
-  error=weed_set_int64_value (event,"timecode",tc);
+  error=weed_set_int64_value(event,"timecode",tc);
   if (error==WEED_ERROR_MEMORY_ALLOCATION) return NULL;
-  error=weed_set_int_value (event,"hint",WEED_EVENT_HINT_FRAME);
+  error=weed_set_int_value(event,"hint",WEED_EVENT_HINT_FRAME);
   if (error==WEED_ERROR_MEMORY_ALLOCATION) return NULL;
 
-  error=weed_set_int_array (event,"clips",numframes,clips);
+  error=weed_set_int_array(event,"clips",numframes,clips);
   if (error==WEED_ERROR_MEMORY_ALLOCATION) return NULL;
-  error=weed_set_int_array (event,"frames",numframes,frames);
+  error=weed_set_int_array(event,"frames",numframes,frames);
   if (error==WEED_ERROR_MEMORY_ALLOCATION) return NULL;
 
   return event;
@@ -2433,7 +2476,7 @@
 
 
 
-weed_plant_t *append_frame_event (weed_plant_t *event_list, weed_timecode_t tc, int numframes, int *clips, int *frames) {
+weed_plant_t *append_frame_event(weed_plant_t *event_list, weed_timecode_t tc, int numframes, int *clips, int *frames) {
   // append a frame event to an event_list
   weed_plant_t *event,*prev;
   int error;
@@ -2460,8 +2503,7 @@
     if (error==WEED_ERROR_MEMORY_ALLOCATION) return NULL;
     error=weed_set_voidptr_value(event,"previous",NULL);
     if (error==WEED_ERROR_MEMORY_ALLOCATION) return NULL;
-  }
-  else {
+  } else {
     error=weed_set_voidptr_value(event,"previous",get_last_event(event_list));
     if (error==WEED_ERROR_MEMORY_ALLOCATION) return NULL;
   }
@@ -2479,7 +2521,7 @@
 }
 
 
-void **filter_init_add_pchanges (weed_plant_t *event_list, weed_plant_t *plant, weed_plant_t *init_event, int ntracks, int leave) {
+void **filter_init_add_pchanges(weed_plant_t *event_list, weed_plant_t *plant, weed_plant_t *init_event, int ntracks, int leave) {
   weed_plant_t **in_params=NULL,**in_ptmpls;
 
   void **pchain=NULL;
@@ -2502,19 +2544,20 @@
   }
 
   // add param_change events and set "in_params"
-  if (!weed_plant_has_leaf(filter,"in_parameter_templates")||weed_get_plantptr_value(filter,"in_parameter_templates",&error)==NULL) return NULL;
+  if (!weed_plant_has_leaf(filter,"in_parameter_templates")||
+      weed_get_plantptr_value(filter,"in_parameter_templates",&error)==NULL) return NULL;
 
   num_params=weed_leaf_num_elements(filter,"in_parameter_templates");
   in_ptmpls=weed_get_plantptr_array(filter,"in_parameter_templates",&error);
 
-  pchain=(void **)g_malloc(num_params*sizeof(void *));
+  pchain=(void **)lives_malloc(num_params*sizeof(void *));
 
   if (!is_inst) in_params=weed_params_create(filter,TRUE);
 
   if (leave>0) in_pchanges=weed_get_voidptr_array(init_event,"in_parameters",&error);
 
-  for (i=num_params-1;i>=0;i--) {
-    
+  for (i=num_params-1; i>=0; i--) {
+
     if (i<leave&&in_pchanges[i]!=NULL) {
       // maintain existing values
       pchain[i]=in_pchanges[i];
@@ -2547,11 +2590,10 @@
 
   if (!is_inst) {
     weed_in_params_free(in_params,num_params);
+  } else {
+    lives_free(in_params);
   }
-  else {
-    weed_free(in_params);
-  }
-  weed_free(in_ptmpls);
+  lives_free(in_ptmpls);
 
   weed_set_voidptr_array(init_event,"in_parameters",num_params,pchain);
 
@@ -2559,12 +2601,12 @@
 }
 
 
-weed_plant_t *append_filter_init_event (weed_plant_t *event_list, weed_timecode_t tc, int filter_idx, 
-					int num_in_tracks, int key, weed_plant_t *inst) {
+weed_plant_t *append_filter_init_event(weed_plant_t *event_list, weed_timecode_t tc, int filter_idx,
+                                       int num_in_tracks, int key, weed_plant_t *inst) {
   weed_plant_t **ctmpl;
   weed_plant_t *event,*prev,*filter,*chan;
 
-  gchar *tmp;
+  char *tmp;
 
   int e_in_channels,e_out_channels,e_ins,e_outs;
   int total_in_channels=0;
@@ -2586,84 +2628,83 @@
     weed_add_plant_flags(event_list,WEED_LEAF_READONLY_PLUGIN);
   }
 
-  event=weed_plant_new (WEED_PLANT_EVENT);
+  event=weed_plant_new(WEED_PLANT_EVENT);
   weed_set_voidptr_value(event,"next",NULL);
 
-  weed_set_int64_value (event,"timecode",tc);
-  weed_set_int_value (event,"hint",WEED_EVENT_HINT_FILTER_INIT);
-  weed_set_string_value (event,"filter",(tmp=make_weed_hashname (filter_idx,TRUE,FALSE)));
-  g_free(tmp);
+  weed_set_int64_value(event,"timecode",tc);
+  weed_set_int_value(event,"hint",WEED_EVENT_HINT_FILTER_INIT);
+  weed_set_string_value(event,"filter",(tmp=make_weed_hashname(filter_idx,TRUE,FALSE)));
+  lives_free(tmp);
 
   filter=get_weed_filter(filter_idx);
 
   // TODO *** - should use inst values here and not filter values
 
-  if (weed_plant_has_leaf(filter,"in_channel_templates")) 
+  if (weed_plant_has_leaf(filter,"in_channel_templates"))
     total_in_channels=weed_leaf_num_elements(filter,"in_channel_templates");
   if (total_in_channels>0) {
     int count[total_in_channels];
     ctmpl=weed_get_plantptr_array(filter,"in_channel_templates",&error);
-    for (i=0;i<total_in_channels;i++) {
+    for (i=0; i<total_in_channels; i++) {
       if (!weed_plant_has_leaf(ctmpl[i],"host_disabled")||weed_get_boolean_value(ctmpl[i],"host_disabled",&error)!=WEED_TRUE) {
-	count[i]=1;
-	my_in_tracks++;
-	weed_set_int_value(ctmpl[i],"host_repeats",1);
-      }
-      else count[i]=0;
+        count[i]=1;
+        my_in_tracks++;
+        weed_set_int_value(ctmpl[i],"host_repeats",1);
+      } else count[i]=0;
     }
 
     if (my_in_tracks<num_in_tracks) {
       int repeats;
       // we need to use some repeated channels
-      for (i=0;i<total_in_channels;i++) {
-	if (weed_plant_has_leaf(ctmpl[i],"max_repeats")&&(count[i]>0||has_usable_palette(ctmpl[i]))) {
-	  repeats=weed_get_int_value(ctmpl[i],"max_repeats",&error);
-	  if (repeats==0) {
-	    count[i]+=num_in_tracks-my_in_tracks;
-	    weed_set_int_value(ctmpl[i],"host_repeats",count[i]);
-	    weed_set_boolean_value(ctmpl[i],"host_disabled",WEED_FALSE);
-	    break;
-	  }
-	  count[i]+=num_in_tracks-my_in_tracks>=repeats-1?repeats-1:num_in_tracks-my_in_tracks;
-	  weed_set_int_value(ctmpl[i],"host_repeats",count[i]);
-	  weed_set_boolean_value(ctmpl[i],"host_disabled",WEED_FALSE);
-	  my_in_tracks+=count[i]-1;
-	  if (my_in_tracks==num_in_tracks) break;
-	}
+      for (i=0; i<total_in_channels; i++) {
+        if (weed_plant_has_leaf(ctmpl[i],"max_repeats")&&(count[i]>0||has_usable_palette(ctmpl[i]))) {
+          repeats=weed_get_int_value(ctmpl[i],"max_repeats",&error);
+          if (repeats==0) {
+            count[i]+=num_in_tracks-my_in_tracks;
+            weed_set_int_value(ctmpl[i],"host_repeats",count[i]);
+            weed_set_boolean_value(ctmpl[i],"host_disabled",WEED_FALSE);
+            break;
+          }
+          count[i]+=num_in_tracks-my_in_tracks>=repeats-1?repeats-1:num_in_tracks-my_in_tracks;
+          weed_set_int_value(ctmpl[i],"host_repeats",count[i]);
+          weed_set_boolean_value(ctmpl[i],"host_disabled",WEED_FALSE);
+          my_in_tracks+=count[i]-1;
+          if (my_in_tracks==num_in_tracks) break;
+        }
       }
     }
     weed_set_int_array(event,"in_count",total_in_channels,count);
-    weed_free(ctmpl);
+    lives_free(ctmpl);
   }
 
-  if (weed_plant_has_leaf(filter,"out_channel_templates")) 
+  if (weed_plant_has_leaf(filter,"out_channel_templates"))
     total_out_channels=weed_leaf_num_elements(filter,"out_channel_templates");
   if (total_out_channels>0) {
     int count[total_out_channels];
     ctmpl=weed_get_plantptr_array(filter,"out_channel_templates",&error);
-    for (i=0;i<total_out_channels;i++) {
+    for (i=0; i<total_out_channels; i++) {
       if (!weed_plant_has_leaf(ctmpl[i],"host_disabled")||weed_get_boolean_value(ctmpl[i],"host_disabled",&error)!=WEED_TRUE) count[i]=1;
       else count[i]=0;
     }
     weed_set_int_array(event,"out_count",total_out_channels,count);
-    weed_free(ctmpl);
+    lives_free(ctmpl);
   }
 
 
-  e_ins=e_in_channels=enabled_in_channels (get_weed_filter(filter_idx),FALSE);
-  e_outs=e_out_channels=enabled_out_channels (get_weed_filter(filter_idx),FALSE);
+  e_ins=e_in_channels=enabled_in_channels(get_weed_filter(filter_idx),FALSE);
+  e_outs=e_out_channels=enabled_out_channels(get_weed_filter(filter_idx),FALSE);
 
   // discount alpha_channels (in and out)
   if (inst!=NULL) {
-    for (i=0;i<e_ins;i++) {
+    for (i=0; i<e_ins; i++) {
       chan=get_enabled_channel(inst,i,TRUE);
       if (weed_palette_is_alpha_palette(weed_layer_get_palette(chan))) e_in_channels--;
     }
-    
+
     // handling for compound fx
     while (weed_plant_has_leaf(inst,"host_next_instance")) inst=weed_get_plantptr_value(inst,"host_next_instance",&error);
 
-    for (i=0;i<e_outs;i++) {
+    for (i=0; i<e_outs; i++) {
       chan=get_enabled_channel(inst,i,FALSE);
       if (weed_palette_is_alpha_palette(weed_layer_get_palette(chan))) e_out_channels--;
     }
@@ -2672,19 +2713,18 @@
   // here we map our tracks to channels
   if (e_in_channels!=0) {
     if (e_in_channels==1) {
-      weed_set_int_value (event,"in_tracks",0);
-    }
-    else {
-      int *tracks=(int *)g_malloc (2*sizint);
+      weed_set_int_value(event,"in_tracks",0);
+    } else {
+      int *tracks=(int *)lives_malloc(2*sizint);
       tracks[0]=0;
       tracks[1]=1;
-      weed_set_int_array (event,"in_tracks",2,tracks);
-      g_free (tracks);
+      weed_set_int_array(event,"in_tracks",2,tracks);
+      lives_free(tracks);
     }
   }
 
   if (e_out_channels>0) {
-    weed_set_int_value (event,"out_tracks",0);
+    weed_set_int_value(event,"out_tracks",0);
   }
 
   if (key>-1) {
@@ -2695,14 +2735,13 @@
 
   ///////////////////////////////////////////////////////////////////////////////////
 #ifdef DEBUG_EVENTS
-  g_print ("adding init event at tc %"PRId64"\n",tc);
+  g_print("adding init event at tc %"PRId64"\n",tc);
 #endif
 
   if (get_first_event(event_list)==NULL) {
     weed_set_voidptr_value(event_list,"first",event);
     weed_set_voidptr_value(event,"previous",NULL);
-  }
-  else {
+  } else {
     weed_set_voidptr_value(event,"previous",get_last_event(event_list));
   }
   weed_add_plant_flags(event,WEED_LEAF_READONLY_PLUGIN);
@@ -2714,7 +2753,7 @@
 }
 
 
-weed_plant_t *append_filter_deinit_event (weed_plant_t *event_list, weed_timecode_t tc, void *init_event, void **pchain) {
+weed_plant_t *append_filter_deinit_event(weed_plant_t *event_list, weed_timecode_t tc, void *init_event, void **pchain) {
   weed_plant_t *event,*prev;
 
   if (event_list==NULL) {
@@ -2725,30 +2764,29 @@
     weed_add_plant_flags(event_list,WEED_LEAF_READONLY_PLUGIN);
   }
 
-  event=weed_plant_new (WEED_PLANT_EVENT);
+  event=weed_plant_new(WEED_PLANT_EVENT);
   weed_set_voidptr_value(event,"next",NULL);
 
   // TODO - error check
-  weed_set_int64_value (event,"timecode",tc);
-  weed_set_int_value (event,"hint",WEED_EVENT_HINT_FILTER_DEINIT);
-  weed_set_voidptr_value (event,"init_event",init_event);
-  weed_set_voidptr_value ((weed_plant_t *)init_event,"deinit_event",event);
+  weed_set_int64_value(event,"timecode",tc);
+  weed_set_int_value(event,"hint",WEED_EVENT_HINT_FILTER_DEINIT);
+  weed_set_voidptr_value(event,"init_event",init_event);
+  weed_set_voidptr_value((weed_plant_t *)init_event,"deinit_event",event);
 
   if (pchain!=NULL) {
     int error;
-    gchar *filter_hash=weed_get_string_value((weed_plant_t *)init_event,"filter",&error);
+    char *filter_hash=weed_get_string_value((weed_plant_t *)init_event,"filter",&error);
     int idx=weed_get_idx_for_hashname(filter_hash,TRUE);
     weed_plant_t *filter=get_weed_filter(idx);
     int num_params=num_in_params(filter,FALSE,FALSE);
     weed_set_voidptr_array(event,"in_parameters",num_params,pchain);
-    weed_free(filter_hash);
+    lives_free(filter_hash);
   }
 
   if (get_first_event(event_list)==NULL) {
     weed_set_voidptr_value(event_list,"first",event);
     weed_set_voidptr_value(event,"previous",NULL);
-  }
-  else {
+  } else {
     weed_set_voidptr_value(event,"previous",get_last_event(event_list));
   }
   weed_add_plant_flags(event,WEED_LEAF_READONLY_PLUGIN);
@@ -2761,8 +2799,8 @@
 
 
 
-weed_plant_t *append_param_change_event (weed_plant_t *event_list, weed_timecode_t tc, int pnum, 
-					 weed_plant_t *param, void *init_event, void **pchain) {
+weed_plant_t *append_param_change_event(weed_plant_t *event_list, weed_timecode_t tc, int pnum,
+                                        weed_plant_t *param, void *init_event, void **pchain) {
   weed_plant_t *event,*prev,*xevent;
   weed_plant_t *last_pchange_event;
   int error;
@@ -2775,18 +2813,18 @@
     weed_add_plant_flags(event_list,WEED_LEAF_READONLY_PLUGIN);
   }
 
-  event=weed_plant_new (WEED_PLANT_EVENT);
+  event=weed_plant_new(WEED_PLANT_EVENT);
   weed_set_voidptr_value(event,"next",NULL);
 
   // TODO - error check
-  weed_set_int64_value (event,"timecode",tc);
-  weed_set_int_value (event,"hint",WEED_EVENT_HINT_PARAM_CHANGE);
-  weed_set_voidptr_value (event,"init_event",init_event);
-  weed_set_int_value (event, "index", pnum);
-  weed_leaf_copy (event,"value",param,"value");
+  weed_set_int64_value(event,"timecode",tc);
+  weed_set_int_value(event,"hint",WEED_EVENT_HINT_PARAM_CHANGE);
+  weed_set_voidptr_value(event,"init_event",init_event);
+  weed_set_int_value(event, "index", pnum);
+  weed_leaf_copy(event,"value",param,"value");
 
   last_pchange_event=(weed_plant_t *)pchain[pnum];
-  while ((xevent=(weed_plant_t *)weed_get_voidptr_value(last_pchange_event,"next_change",&error))!=NULL) 
+  while ((xevent=(weed_plant_t *)weed_get_voidptr_value(last_pchange_event,"next_change",&error))!=NULL)
     last_pchange_event=xevent;
 
   weed_set_voidptr_value(last_pchange_event,"next_change",event);
@@ -2796,8 +2834,7 @@
   if (get_first_event(event_list)==NULL) {
     weed_set_voidptr_value(event_list,"first",event);
     weed_set_voidptr_value(event,"previous",NULL);
-  }
-  else {
+  } else {
     weed_set_voidptr_value(event,"previous",get_last_event(event_list));
   }
   weed_add_plant_flags(event,WEED_LEAF_READONLY_PLUGIN);
@@ -2811,7 +2848,7 @@
 
 
 
-weed_plant_t *append_filter_map_event (weed_plant_t *event_list, weed_timecode_t tc, void **init_events) {
+weed_plant_t *append_filter_map_event(weed_plant_t *event_list, weed_timecode_t tc, void **init_events) {
   weed_plant_t *event,*prev;
   int i=0;
 
@@ -2823,27 +2860,26 @@
     weed_add_plant_flags(event_list,WEED_LEAF_READONLY_PLUGIN);
   }
 
-  event=weed_plant_new (WEED_PLANT_EVENT);
+  event=weed_plant_new(WEED_PLANT_EVENT);
   weed_set_voidptr_value(event,"next",NULL);
 
   // TODO - error check
-  weed_set_int64_value (event,"timecode",tc);
-  weed_set_int_value (event,"hint",WEED_EVENT_HINT_FILTER_MAP);
+  weed_set_int64_value(event,"timecode",tc);
+  weed_set_int_value(event,"hint",WEED_EVENT_HINT_FILTER_MAP);
 
-  if (init_events!=NULL) for (i=0;init_events[i]!=NULL;i++);
+  if (init_events!=NULL) for (i=0; init_events[i]!=NULL; i++);
 
   if (i==0) weed_set_voidptr_value(event,"init_events",NULL);
-  else weed_set_voidptr_array (event,"init_events",i,init_events);
+  else weed_set_voidptr_array(event,"init_events",i,init_events);
 
 #ifdef DEBUG_EVENTS
-  g_print ("adding map event %p at tc %"PRId64"\n",init_events[0],tc);
+  g_print("adding map event %p at tc %"PRId64"\n",init_events[0],tc);
 #endif
 
   if (get_first_event(event_list)==NULL) {
     weed_set_voidptr_value(event_list,"first",event);
     weed_set_voidptr_value(event,"previous",NULL);
-  }
-  else {
+  } else {
     weed_set_voidptr_value(event,"previous",get_last_event(event_list));
   }
   weed_add_plant_flags(event,WEED_LEAF_READONLY_PLUGIN);
@@ -2858,10 +2894,10 @@
 void get_active_track_list(int *clip_index, int num_tracks, weed_plant_t *filter_map) {
   // replace entries in mainw->clip_index with 0 if the track is not either the front track or an input to a filter
 
-  // TODO *** we should ignore any filter which does not eventually output to the front track, 
+  // TODO *** we should ignore any filter which does not eventually output to the front track,
   // this involves examining the filter map in reverse order and mapping out_tracks back to in_tracks
   // marking those which we cover
-  
+
   weed_plant_t **init_events;
   weed_plant_t *filter;
 
@@ -2875,12 +2911,11 @@
 
   register int i,j;
 
-  for (i=0;i<num_tracks;i++) {
+  for (i=0; i<num_tracks; i++) {
     if (front==-1&&clip_index[i]>0) {
       mainw->active_track_list[i]=clip_index[i];
       front=i;
-    }
-    else mainw->active_track_list[i]=0;
+    } else mainw->active_track_list[i]=0;
   }
 
   if (filter_map==NULL||!weed_plant_has_leaf(filter_map,"init_events")) return;
@@ -2889,30 +2924,30 @@
   init_events=(weed_plant_t **)weed_get_voidptr_array(filter_map,"init_events",&error);
   if (init_events==NULL) return;
 
-  for (i=0;i<ninits;i++) {
+  for (i=0; i<ninits; i++) {
     // get the filter and make sure it has video chans in
     if (!weed_plant_has_leaf(init_events[i],"in_tracks")) continue;
     filter_hash=weed_get_string_value(init_events[i],"filter",&error);
     if ((idx=weed_get_idx_for_hashname(filter_hash,TRUE))!=-1) {
       filter=get_weed_filter(idx);
       if (has_video_chans_in(filter,FALSE)) {
-	nintracks=weed_leaf_num_elements(init_events[i],"in_tracks");
-	in_tracks=weed_get_int_array(init_events[i],"in_tracks",&error);
-	for (j=0;j<nintracks;j++) {
-	  mainw->active_track_list[in_tracks[j]]=clip_index[in_tracks[j]];
-	}
-	weed_free(in_tracks);
+        nintracks=weed_leaf_num_elements(init_events[i],"in_tracks");
+        in_tracks=weed_get_int_array(init_events[i],"in_tracks",&error);
+        for (j=0; j<nintracks; j++) {
+          mainw->active_track_list[in_tracks[j]]=clip_index[in_tracks[j]];
+        }
+        lives_free(in_tracks);
       }
     }
-    weed_free(filter_hash);
+    lives_free(filter_hash);
   }
 
-  weed_free(init_events);
+  lives_free(init_events);
 
 }
 
 
-weed_plant_t *process_events (weed_plant_t *next_event, boolean process_audio, weed_timecode_t curr_tc) {
+weed_plant_t *process_events(weed_plant_t *next_event, boolean process_audio, weed_timecode_t curr_tc) {
   // here we play back (preview) with an event_list
   // we process all events, but drop frames (unless mainw->nodrop is set)
 
@@ -2949,26 +2984,26 @@
 
   if (next_event==NULL) return NULL;
 
-  tc=get_event_timecode (next_event);
+  tc=get_event_timecode(next_event);
 
   if (mainw->playing_file!=-1&&tc>curr_tc) {
     // next event is in our future
     if (mainw->multitrack!=NULL&&mainw->last_display_ticks>0) {
       if ((mainw->fixed_fpsd>0.&&(curr_tc-mainw->last_display_ticks)/U_SEC>=1./mainw->fixed_fpsd)||
-	  (mainw->vpp!=NULL&&mainw->vpp->fixed_fpsd>0.&&mainw->ext_playback&&
-	   (curr_tc-mainw->last_display_ticks)/U_SEC>=1./mainw->vpp->fixed_fpsd)) {
-	// ...but playing at fixed fps, which is faster than mt fps
-	mainw->pchains=pchains;
-	load_frame_image (cfile->last_frameno>=1?cfile->last_frameno:cfile->start);
-	if (mainw->last_display_ticks==0) mainw->last_display_ticks=curr_tc;
-	else {
-	  if (mainw->vpp!=NULL&&mainw->ext_playback&&mainw->vpp->fixed_fpsd>0.) 
-	    mainw->last_display_ticks+=U_SEC/mainw->vpp->fixed_fpsd;
-	  else if (mainw->fixed_fpsd>0.) 
-	    mainw->last_display_ticks+=U_SEC/mainw->fixed_fpsd;
-	  else mainw->last_display_ticks=curr_tc;
-	}
-	mainw->pchains=NULL;
+          (mainw->vpp!=NULL&&mainw->vpp->fixed_fpsd>0.&&mainw->ext_playback&&
+           (curr_tc-mainw->last_display_ticks)/U_SEC>=1./mainw->vpp->fixed_fpsd)) {
+        // ...but playing at fixed fps, which is faster than mt fps
+        mainw->pchains=pchains;
+        load_frame_image(cfile->last_frameno>=1?cfile->last_frameno:cfile->start);
+        if (mainw->last_display_ticks==0) mainw->last_display_ticks=curr_tc;
+        else {
+          if (mainw->vpp!=NULL&&mainw->ext_playback&&mainw->vpp->fixed_fpsd>0.)
+            mainw->last_display_ticks+=U_SEC/mainw->vpp->fixed_fpsd;
+          else if (mainw->fixed_fpsd>0.)
+            mainw->last_display_ticks+=U_SEC/mainw->fixed_fpsd;
+          else mainw->last_display_ticks=curr_tc;
+        }
+        mainw->pchains=NULL;
       }
     }
 
@@ -2979,284 +3014,277 @@
   mainw->cevent_tc=tc;
 
   return_event=get_next_event(next_event);
-  hint=get_event_hint (next_event);
+  hint=get_event_hint(next_event);
   switch (hint) {
   case WEED_EVENT_HINT_FRAME:
 
 #ifdef DEBUG_EVENTS
-    g_print ("event: frame event at tc %"PRId64" curr_tc=%"PRId64"\n",tc,curr_tc);
+    g_print("event: frame event at tc %"PRId64" curr_tc=%"PRId64"\n",tc,curr_tc);
 #endif
 
 
-  if (mainw->multitrack==NULL&&prefs->audio_player==AUD_PLAYER_JACK&&weed_plant_has_leaf(next_event,"audio_clips")) {
-    // keep track of current seek position, for animating playback pointers
-    int *aclips=weed_get_int_array(next_event,"audio_clips",&error);
-    double *aseeks=weed_get_double_array(next_event,"audio_seeks",&error);
-
-    if (aclips[1]>0) {
-      aseek_tc=aseeks[0]*U_SEC;
-      stored_avel=aseeks[1];
+    if (mainw->multitrack==NULL&&prefs->audio_player==AUD_PLAYER_JACK&&WEED_EVENT_IS_AUDIO_FRAME(next_event)) {
+      // keep track of current seek position, for animating playback pointers
+      int *aclips=weed_get_int_array(next_event,"audio_clips",&error);
+      double *aseeks=weed_get_double_array(next_event,"audio_seeks",&error);
+
+      if (aclips[1]>0) {
+        aseek_tc=aseeks[0]*U_SEC;
+        stored_avel=aseeks[1];
+      }
+
+      lives_free(aclips);
+      lives_free(aseeks);
     }
-    
-    weed_free(aclips);
-    weed_free(aseeks);
-  }
-
 
-  if ((next_frame_event=get_next_frame_event (next_event))!=NULL) {
-    next_tc=get_event_timecode (next_frame_event);
-    // drop frame if it is too far behind
-    if (mainw->playing_file>-1&&!mainw->noframedrop&&next_tc<=curr_tc) break;
-    if (!mainw->fs&&prefs->show_framecount) {
-      lives_signal_handler_block(mainw->spinbutton_pb_fps,mainw->pb_fps_func);
-      lives_spin_button_set_value(LIVES_SPIN_BUTTON(mainw->spinbutton_pb_fps),cfile->pb_fps);
-      lives_signal_handler_unblock(mainw->spinbutton_pb_fps,mainw->pb_fps_func);
-    }
-  }
 
-  mainw->num_tracks=weed_leaf_num_elements (next_event,"clips");
-    
-  if (mainw->clip_index!=NULL) weed_free(mainw->clip_index);
-  if (mainw->frame_index!=NULL) weed_free(mainw->frame_index);
-
-  mainw->clip_index=weed_get_int_array (next_event,"clips",&error);
-  mainw->frame_index=weed_get_int_array (next_event,"frames",&error);
-
-  // if we are in multitrack mode, we will just set up NULL layers and let the effects pull our frames
-  if (mainw->multitrack!=NULL) {
-    if ((mainw->fixed_fpsd<=0.&&(mainw->vpp==NULL||mainw->vpp->fixed_fpsd<=0.||!mainw->ext_playback))
-	||(mainw->fixed_fpsd>0.&&(curr_tc-mainw->last_display_ticks)/U_SEC>=1./mainw->fixed_fpsd)||
-	(mainw->vpp!=NULL&&mainw->vpp->fixed_fpsd>0.&&mainw->ext_playback&&
-	 (curr_tc-mainw->last_display_ticks)/U_SEC>=1./mainw->vpp->fixed_fpsd)) {
-      mainw->pchains=pchains;
-      load_frame_image (cfile->frameno);
-      if (mainw->last_display_ticks==0) mainw->last_display_ticks=curr_tc;
-      else {
-	if (mainw->vpp!=NULL&&mainw->ext_playback&&mainw->vpp->fixed_fpsd>0.) 
-	  mainw->last_display_ticks+=U_SEC/mainw->vpp->fixed_fpsd;
-	else if (mainw->fixed_fpsd>0.) 
-	  mainw->last_display_ticks+=U_SEC/mainw->fixed_fpsd;
-	else mainw->last_display_ticks=curr_tc;
+    if ((next_frame_event=get_next_frame_event(next_event))!=NULL) {
+      next_tc=get_event_timecode(next_frame_event);
+      // drop frame if it is too far behind
+      if (mainw->playing_file>-1&&!mainw->noframedrop&&next_tc<=curr_tc) break;
+      if (!mainw->fs&&prefs->show_framecount) {
+        lives_signal_handler_block(mainw->spinbutton_pb_fps,mainw->pb_fps_func);
+        lives_spin_button_set_value(LIVES_SPIN_BUTTON(mainw->spinbutton_pb_fps),cfile->pb_fps);
+        lives_signal_handler_unblock(mainw->spinbutton_pb_fps,mainw->pb_fps_func);
       }
-      mainw->pchains=NULL;
     }
-  }
-  else {
-    if (mainw->num_tracks>1) {
-      mainw->blend_file=mainw->clip_index[1];
-      if (mainw->blend_file>-1) mainw->files[mainw->blend_file]->frameno=mainw->frame_index[1];
-    }
-    else mainw->blend_file=-1;
-
-    new_file=-1;
-    for (i=0;i<mainw->num_tracks&&new_file==-1;i++) new_file=mainw->clip_index[i];
-    if (i==2) mainw->blend_file=-1;
+
+    mainw->num_tracks=weed_leaf_num_elements(next_event,"clips");
+
+    if (mainw->clip_index!=NULL) lives_free(mainw->clip_index);
+    if (mainw->frame_index!=NULL) lives_free(mainw->frame_index);
+
+    mainw->clip_index=weed_get_int_array(next_event,"clips",&error);
+    mainw->frame_index=weed_get_int_array(next_event,"frames",&error);
+
+    // if we are in multitrack mode, we will just set up NULL layers and let the effects pull our frames
+    if (mainw->multitrack!=NULL) {
+      if ((mainw->fixed_fpsd<=0.&&(mainw->vpp==NULL||mainw->vpp->fixed_fpsd<=0.||!mainw->ext_playback))
+          ||(mainw->fixed_fpsd>0.&&(curr_tc-mainw->last_display_ticks)/U_SEC>=1./mainw->fixed_fpsd)||
+          (mainw->vpp!=NULL&&mainw->vpp->fixed_fpsd>0.&&mainw->ext_playback&&
+           (curr_tc-mainw->last_display_ticks)/U_SEC>=1./mainw->vpp->fixed_fpsd)) {
+        mainw->pchains=pchains;
+        load_frame_image(cfile->frameno);
+        if (mainw->last_display_ticks==0) mainw->last_display_ticks=curr_tc;
+        else {
+          if (mainw->vpp!=NULL&&mainw->ext_playback&&mainw->vpp->fixed_fpsd>0.)
+            mainw->last_display_ticks+=U_SEC/mainw->vpp->fixed_fpsd;
+          else if (mainw->fixed_fpsd>0.)
+            mainw->last_display_ticks+=U_SEC/mainw->fixed_fpsd;
+          else mainw->last_display_ticks=curr_tc;
+        }
+        mainw->pchains=NULL;
+      }
+    } else {
+      if (mainw->num_tracks>1) {
+        mainw->blend_file=mainw->clip_index[1];
+        if (mainw->blend_file>-1) mainw->files[mainw->blend_file]->frameno=mainw->frame_index[1];
+      } else mainw->blend_file=-1;
+
+      new_file=-1;
+      for (i=0; i<mainw->num_tracks&&new_file==-1; i++) new_file=mainw->clip_index[i];
+      if (i==2) mainw->blend_file=-1;
 
 #ifdef DEBUG_EVENTS
-    g_print ("event: front frame is %d tc %"PRId64" curr_tc=%"PRId64"\n",mainw->frame_index[0],tc,curr_tc);
+      g_print("event: front frame is %d tc %"PRId64" curr_tc=%"PRId64"\n",mainw->frame_index[0],tc,curr_tc);
 #endif
 
-    // handle case where new_file==-1: we must somehow create a blank frame in load_frame_image
-    if (new_file==-1) new_file=mainw->current_file;
-      
-    if (new_file!=mainw->current_file) {
-      mainw->files[new_file]->frameno=mainw->frame_index[i-1];
-	
-      if (new_file!=mainw->scrap_file) {
-	// switch to a new file
-	mainw->noswitch=FALSE;
-	do_quick_switch (new_file);
-	mainw->noswitch=TRUE;
-	cfile->next_event=return_event;
-	return_event=NULL;
-      }
-      else {
-	mainw->files[new_file]->hsize=cfile->hsize; // set size of scrap file
-	mainw->files[new_file]->vsize=cfile->vsize;
-	current_file=mainw->current_file;
-	mainw->current_file=new_file;
-	mainw->aframeno=(double)(aseek_tc/U_SEC)*cfile->fps;
-	mainw->pchains=pchains;
-	load_frame_image (cfile->frameno);
-	mainw->pchains=NULL;
-	if (mainw->playing_file>-1) lives_widget_context_update();
-	mainw->current_file=current_file;
-      }
-      break;
-    }
-    else {
-      if (mainw->multitrack!=NULL&&new_file==mainw->multitrack->render_file) {
-	cfile->frameno=0; // will force blank frame creation
+      // handle case where new_file==-1: we must somehow create a blank frame in load_frame_image
+      if (new_file==-1) new_file=mainw->current_file;
+
+      if (new_file!=mainw->current_file) {
+        mainw->files[new_file]->frameno=mainw->frame_index[i-1];
+
+        if (new_file!=mainw->scrap_file) {
+          // switch to a new file
+          mainw->noswitch=FALSE;
+          do_quick_switch(new_file);
+          mainw->noswitch=TRUE;
+          cfile->next_event=return_event;
+          return_event=NULL;
+        } else {
+          mainw->files[new_file]->hsize=cfile->hsize; // set size of scrap file
+          mainw->files[new_file]->vsize=cfile->vsize;
+          current_file=mainw->current_file;
+          mainw->current_file=new_file;
+          mainw->aframeno=(double)(aseek_tc/U_SEC)*cfile->fps;
+          mainw->pchains=pchains;
+          load_frame_image(cfile->frameno);
+          mainw->pchains=NULL;
+          if (mainw->playing_file>-1) lives_widget_context_update();
+          mainw->current_file=current_file;
+        }
+        break;
+      } else {
+        if (mainw->multitrack!=NULL&&new_file==mainw->multitrack->render_file) {
+          cfile->frameno=0; // will force blank frame creation
+        } else cfile->frameno=mainw->frame_index[i-1];
+        mainw->aframeno=(double)(aseek_tc/U_SEC)*cfile->fps;
+        mainw->pchains=pchains;
+        load_frame_image(cfile->frameno);
+        mainw->pchains=NULL;
       }
-      else cfile->frameno=mainw->frame_index[i-1];
-      mainw->aframeno=(double)(aseek_tc/U_SEC)*cfile->fps;
-      mainw->pchains=pchains;
-      load_frame_image (cfile->frameno);
-      mainw->pchains=NULL;
     }
-  }
-  if (mainw->playing_file>-1) lives_widget_context_update();
-  cfile->next_event=get_next_event(next_event);
-  break;
+    if (mainw->playing_file>-1) lives_widget_context_update();
+    cfile->next_event=get_next_event(next_event);
+    break;
   case WEED_EVENT_HINT_FILTER_INIT:
     // effect init
     //  bind the weed_fx to next free key/0
-    filter_name=weed_get_string_value (next_event,"filter",&error);
-    idx=weed_get_idx_for_hashname (filter_name,TRUE);
-    weed_free (filter_name);
+    filter_name=weed_get_string_value(next_event,"filter",&error);
+    idx=weed_get_idx_for_hashname(filter_name,TRUE);
+    lives_free(filter_name);
 
     if (idx!=-1) {
       filter=get_weed_filter(idx);
 
       if (!process_audio&&is_pure_audio(filter,FALSE)) {
-	if (weed_plant_has_leaf(next_event,"host_tag")) weed_leaf_delete(next_event,"host_tag");
-	break; // audio effects are processed in the audio renderer
+        if (weed_plant_has_leaf(next_event,"host_tag")) weed_leaf_delete(next_event,"host_tag");
+        break; // audio effects are processed in the audio renderer
       }
 
       if (process_audio&&!is_pure_audio(filter,FALSE)) break;
 
       key=get_next_free_key();
-      weed_add_effectkey_by_idx (key+1,idx);
-      key_string=g_strdup_printf ("%d",key);
-      weed_set_string_value (next_event,"host_tag",key_string);
-      g_free (key_string);
-    
+      weed_add_effectkey_by_idx(key+1,idx);
+      key_string=lives_strdup_printf("%d",key);
+      weed_set_string_value(next_event,"host_tag",key_string);
+      lives_free(key_string);
+
 #ifdef DEBUG_EVENTS
-      g_print ("event: init effect on key %d at tc %"PRId64" curr_tc=%"PRId64"\n",key,tc,curr_tc);
+      g_print("event: init effect on key %d at tc %"PRId64" curr_tc=%"PRId64"\n",key,tc,curr_tc);
 #endif
-    
+
       if (weed_plant_has_leaf(next_event,"in_count")) {
-	num_in_count=weed_leaf_num_elements(next_event,"in_count");
-	in_count=weed_get_int_array(next_event,"in_count",&error);
+        num_in_count=weed_leaf_num_elements(next_event,"in_count");
+        in_count=weed_get_int_array(next_event,"in_count",&error);
       }
 
       if (weed_plant_has_leaf(filter,"in_channel_templates")) {
-	if ((num_channels=weed_leaf_num_elements(filter,"in_channel_templates"))>0) {
-	  ctmpl=weed_get_plantptr_array(filter,"in_channel_templates",&error);
-	  if (num_channels!=num_in_count) LIVES_ERROR("num_in_count != num_in_channels");
-	  for (i=0;i<num_channels;i++) {
-	    if (in_count[i]>0) {
-	      weed_set_boolean_value(ctmpl[i],"host_disabled",WEED_FALSE);
-	      weed_set_int_value(ctmpl[i],"host_repeats",in_count[i]);
-	    }
-	    else weed_set_boolean_value(ctmpl[i],"host_disabled",WEED_TRUE);
-	  }
-	  weed_free(ctmpl);
-	}
+        if ((num_channels=weed_leaf_num_elements(filter,"in_channel_templates"))>0) {
+          ctmpl=weed_get_plantptr_array(filter,"in_channel_templates",&error);
+          if (num_channels!=num_in_count) LIVES_ERROR("num_in_count != num_in_channels");
+          for (i=0; i<num_channels; i++) {
+            if (in_count[i]>0) {
+              weed_set_boolean_value(ctmpl[i],"host_disabled",WEED_FALSE);
+              weed_set_int_value(ctmpl[i],"host_repeats",in_count[i]);
+            } else weed_set_boolean_value(ctmpl[i],"host_disabled",WEED_TRUE);
+          }
+          lives_free(ctmpl);
+        }
       }
 
-      if (in_count!=NULL) weed_free(in_count);
-	
+      if (in_count!=NULL) lives_free(in_count);
+
       if (weed_plant_has_leaf(filter,"out_channel_templates")) {
-	if ((num_channels=weed_leaf_num_elements(filter,"out_channel_templates"))>0) {
-	  ctmpl=weed_get_plantptr_array(filter,"out_channel_templates",&error);
-	  for (i=0;i<num_channels;i++) {
-	    if (!weed_plant_has_leaf(ctmpl[i],"host_disabled")||weed_get_boolean_value(ctmpl[i],"host_disabled",&error)!=WEED_TRUE) 
-	      weed_set_boolean_value(ctmpl[i],"host_disabled",WEED_FALSE);
-	    else weed_set_boolean_value(ctmpl[i],"host_disabled",WEED_TRUE);
-	  }
-	  weed_free(ctmpl);
-	}
+        if ((num_channels=weed_leaf_num_elements(filter,"out_channel_templates"))>0) {
+          ctmpl=weed_get_plantptr_array(filter,"out_channel_templates",&error);
+          for (i=0; i<num_channels; i++) {
+            if (!weed_plant_has_leaf(ctmpl[i],"host_disabled")||weed_get_boolean_value(ctmpl[i],"host_disabled",&error)!=WEED_TRUE)
+              weed_set_boolean_value(ctmpl[i],"host_disabled",WEED_FALSE);
+            else weed_set_boolean_value(ctmpl[i],"host_disabled",WEED_TRUE);
+          }
+          lives_free(ctmpl);
+        }
       }
 
-      weed_init_effect (key);
+      weed_init_effect(key);
 
       // reinit effect with saved parameters
       inst=rte_keymode_get_instance(key+1,0);
 
       if (weed_plant_has_leaf(next_event,"in_parameters")) {
-	pchains[key]=weed_get_voidptr_array(next_event,"in_parameters",&error);
-      }
-      else pchains[key]=NULL;
+        pchains[key]=weed_get_voidptr_array(next_event,"in_parameters",&error);
+      } else pchains[key]=NULL;
 
-    filterinit1:
+filterinit1:
 
       num_params=num_in_params(inst,FALSE,FALSE);
- 
+
       if (num_params>0) {
-	weed_call_deinit_func(inst);
-	if (weed_plant_has_leaf(next_event,"in_parameters")) {
-	  source_params=(weed_plant_t **)pchains[key];
-	  in_params=weed_get_plantptr_array(inst,"in_parameters",&error);
-
-	  for (i=0;i<num_params;i++) {
-	    if (source_params!=NULL&&source_params[i+offset]!=NULL&&is_init_pchange(next_event,source_params[i+offset])) 
-	      weed_leaf_copy(in_params[i],"value",source_params[i+offset],"value");
-	  }
-	  weed_free(in_params);
-	}
-
-	offset+=num_params;
-
-	filter=weed_instance_get_filter(inst,FALSE);
-
-	if (weed_plant_has_leaf(filter,"init_func")) {
-	  weed_deinit_f *init_func_ptr_ptr;
-	  weed_init_f init_func;
-	  weed_leaf_get(filter,"init_func",0,(void *)&init_func_ptr_ptr);
-	  init_func=init_func_ptr_ptr[0];
-	  set_param_gui_readwrite(inst);
-	  update_host_info(inst);
-	  if (init_func!=NULL) {
-	    gchar *cwd=cd_to_plugin_dir(filter);
-	    (*init_func)(inst);
-	    lives_chdir(cwd,FALSE);
-	    g_free(cwd);
-	  }
-	  set_param_gui_readonly(inst);
-	  
-	}
-	
-	weed_set_boolean_value(inst,"host_inited",WEED_TRUE);
+        weed_call_deinit_func(inst);
+        if (weed_plant_has_leaf(next_event,"in_parameters")) {
+          source_params=(weed_plant_t **)pchains[key];
+          in_params=weed_get_plantptr_array(inst,"in_parameters",&error);
+
+          for (i=0; i<num_params; i++) {
+            if (source_params!=NULL&&source_params[i+offset]!=NULL&&is_init_pchange(next_event,source_params[i+offset]))
+              weed_leaf_copy(in_params[i],"value",source_params[i+offset],"value");
+          }
+          lives_free(in_params);
+        }
+
+        offset+=num_params;
+
+        filter=weed_instance_get_filter(inst,FALSE);
+
+        if (weed_plant_has_leaf(filter,"init_func")) {
+          weed_deinit_f *init_func_ptr_ptr;
+          weed_init_f init_func;
+          weed_leaf_get(filter,"init_func",0,(void *)&init_func_ptr_ptr);
+          init_func=init_func_ptr_ptr[0];
+          set_param_gui_readwrite(inst);
+          update_host_info(inst);
+          if (init_func!=NULL) {
+            char *cwd=cd_to_plugin_dir(filter);
+            (*init_func)(inst);
+            lives_chdir(cwd,FALSE);
+            lives_free(cwd);
+          }
+          set_param_gui_readonly(inst);
+
+        }
+
+        weed_set_boolean_value(inst,"host_inited",WEED_TRUE);
       }
 
       if (weed_plant_has_leaf(next_event,"host_key")) {
-	// mt events will not have this;
-	// it is used to connect params and alpha channels during rendering
-	// holds our original key/mode values
-	
-	int hostkey=weed_get_int_value(next_event,"host_key",&error);
-	int hostmode=weed_get_int_value(next_event,"host_mode",&error);
-	
-	weed_set_int_value(inst,"host_key",hostkey);
-	weed_set_int_value(inst,"host_mode",hostmode);
-	
+        // mt events will not have this;
+        // it is used to connect params and alpha channels during rendering
+        // holds our original key/mode values
+
+        int hostkey=weed_get_int_value(next_event,"host_key",&error);
+        int hostmode=weed_get_int_value(next_event,"host_mode",&error);
+
+        weed_set_int_value(inst,"host_key",hostkey);
+        weed_set_int_value(inst,"host_mode",hostmode);
+
       }
 
       if (weed_plant_has_leaf(inst,"host_next_instance")) {
-	// handle compound fx
-	inst=weed_get_plantptr_value(inst,"host_next_instance",&error);
-	goto filterinit1;
+        // handle compound fx
+        inst=weed_get_plantptr_value(inst,"host_next_instance",&error);
+        goto filterinit1;
       }
 
 
     }
     break;
-      
+
   case WEED_EVENT_HINT_FILTER_DEINIT:
-    init_event=weed_get_voidptr_value ((weed_plant_t *)next_event,"init_event",&error);
+    init_event=weed_get_voidptr_value((weed_plant_t *)next_event,"init_event",&error);
     if (weed_plant_has_leaf((weed_plant_t *)init_event,"host_tag")) {
-      key_string=weed_get_string_value ((weed_plant_t *)init_event,"host_tag",&error);
-      key=atoi (key_string);
-      weed_free (key_string);
-
-      filter_name=weed_get_string_value ((weed_plant_t *)init_event,"filter",&error);
-      idx=weed_get_idx_for_hashname (filter_name,TRUE);
-      weed_free (filter_name);
-      
+      key_string=weed_get_string_value((weed_plant_t *)init_event,"host_tag",&error);
+      key=atoi(key_string);
+      lives_free(key_string);
+
+      filter_name=weed_get_string_value((weed_plant_t *)init_event,"filter",&error);
+      idx=weed_get_idx_for_hashname(filter_name,TRUE);
+      lives_free(filter_name);
+
       filter=get_weed_filter(idx);
 
       if (!process_audio) {
-	if (is_pure_audio(filter,FALSE)) break; // audio effects are processed in the audio renderer
+        if (is_pure_audio(filter,FALSE)) break; // audio effects are processed in the audio renderer
       }
-      
+
       if (process_audio&&!is_pure_audio(filter,FALSE)) break;
 
       if (rte_keymode_get_instance(key+1,0)!=NULL) {
-	weed_deinit_effect (key);
-	weed_delete_effectkey (key+1,0);
+        weed_deinit_effect(key);
+        weed_delete_effectkey(key+1,0);
       }
-      if (pchains[key]!=NULL) weed_free(pchains[key]);
+      if (pchains[key]!=NULL) lives_free(pchains[key]);
       pchains[key]=NULL;
     }
     break;
@@ -3264,7 +3292,7 @@
   case WEED_EVENT_HINT_FILTER_MAP:
     mainw->filter_map=next_event;
 #ifdef DEBUG_EVENTS
-    g_print ("got new effect map\n");
+    g_print("got new effect map\n");
 #endif
     break;
   case WEED_EVENT_HINT_PARAM_CHANGE:
@@ -3275,12 +3303,14 @@
 }
 
 
-lives_render_error_t render_events (boolean reset) {
+lives_render_error_t render_events(boolean reset) {
   // this is called repeatedly when we are rendering effect changes and/or clip switches
   // if we have clip switches we will resize and build a new clip
-  
-  gchar oname[PATH_MAX];
-  GError *error=NULL;
+
+  // call with flush_audio_tc set to non-zero to render audio up to that tc
+
+  char oname[PATH_MAX];
+  LiVESError *error=NULL;
 
   weed_timecode_t tc;
   weed_timecode_t next_tc=0,next_out_tc;
@@ -3331,15 +3361,15 @@
 
   static lives_render_error_t read_write_error;
 
-  gchar *blabel=NULL;
-  gchar *nlabel;
-  gchar *key_string,*com;
-  gchar *filter_name;
+  char *blabel=NULL;
+  char *nlabel;
+  char *key_string,*com;
+  char *filter_name;
 
   if (reset) {
     progress=frame=1;
     event=cfile->next_event;
-    out_frame=(int)((double)(get_event_timecode (event)/U_SECL)*cfile->fps+mainw->play_start);
+    out_frame=(int)((double)(get_event_timecode(event)/U_SECL)*cfile->fps+mainw->play_start);
     if (cfile->frames<out_frame) out_frame=cfile->frames+1;
     cfile->undo_start=out_frame;
     // store this, because if the user previews and there is no audio file yet, achans will get reset
@@ -3353,7 +3383,7 @@
     mainw->afilter_map=NULL;
     mainw->audio_event=event;
 
-    for (i=0;i<MAX_AUDIO_TRACKS;i++) {
+    for (i=0; i<MAX_AUDIO_TRACKS; i++) {
       xaclips[i]=-1;
       xaseek[i]=xavel[i]=0;
     }
@@ -3365,514 +3395,513 @@
 
   if (mainw->effects_paused) return LIVES_RENDER_EFFECTS_PAUSED;
 
-  nlabel=g_strdup(_("Rendering audio..."));
+  nlabel=lives_strdup(_("Rendering audio..."));
 
   mainw->rowstride_alignment=mainw->rowstride_alignment_hint;
   mainw->rowstride_alignment_hint=1;
 
+  if (flush_audio_tc!=0) {
+    event=get_next_audio_frame_event(event);
+  }
+
   if (event!=NULL) {
     eventnext=get_next_event(event);
 
-    hint=get_event_hint (event);
+    hint=get_event_hint(event);
+
     switch (hint) {
     case WEED_EVENT_HINT_FRAME:
-      tc=get_event_timecode (event);
+      if (flush_audio_tc==0) {
+        tc=get_event_timecode(event);
 
-      if ((mainw->multitrack==NULL||(mainw->multitrack->render_vidp&&!mainw->multitrack->pr_audio))&&
-	  !(!mainw->clip_switched&&cfile->hsize*cfile->vsize==0)) {
-	int scrap_track=-1;
-	  
-	num_tracks=weed_leaf_num_elements (event,"clips");
-	clip_index=weed_get_int_array (event,"clips",&weed_error);
-	frame_index=weed_get_int_array (event,"frames",&weed_error);
-	
-	if (mainw->scrap_file!=-1) {
-	  for (i=0;i<num_tracks;i++) {
-	    if (clip_index[i]!=mainw->scrap_file) {
-	      scrap_track=-1;
-	      break;
-	    }
-	    if (scrap_track==-1) scrap_track=i;
-	  }
-	}
-
-	if (scrap_track!=-1) {
-	  // do not apply fx, just pull frame
-	  layer=weed_plant_new(WEED_PLANT_CHANNEL);
-	  weed_set_int_value(layer,"clip",clip_index[scrap_track]);
-	  weed_set_int_value(layer,"frame",frame_index[scrap_track]);
-	  if (!pull_frame(layer,prefs->image_ext,tc)) {
-	    weed_plant_free(layer);
-	    layer=NULL;
-	  }
-	}
-	else {
-	  int oclip,nclip;
-
-	  layers=(weed_plant_t **)g_malloc((num_tracks+1)*sizeof(weed_plant_t *));
-
-	  // get list of active tracks from mainw->filter map
-	  get_active_track_list(mainw->clip_index,mainw->num_tracks,mainw->filter_map);
-	  for (i=0;i<mainw->num_tracks;i++) {
-	    oclip=mainw->old_active_track_list[i];
-	    mainw->ext_src_used[oclip]=FALSE;
-	    if (oclip>0&&oclip==(nclip=mainw->active_track_list[i])) {
-	      if (mainw->track_decoders[i]==mainw->files[oclip]->ext_src) mainw->ext_src_used[oclip]=TRUE;
-	    }
-	  }
-
-	  for (i=0;i<num_tracks;i++) {
-	    if (clip_index[i]>0&&frame_index[i]>0&&mainw->multitrack!=NULL) is_blank=FALSE;
-	    layers[i]=weed_plant_new(WEED_PLANT_CHANNEL);
-	    weed_set_int_value(layers[i],"clip",clip_index[i]);
-	    weed_set_int_value(layers[i],"frame",frame_index[i]);
-	    weed_set_voidptr_value(layers[i],"pixel_data",NULL);
-
-	    if ((oclip=mainw->old_active_track_list[i])!=(nclip=mainw->active_track_list[i])) {
-	      // now using threading, we want to start pulling all pixel_data for all active layers here
-	      // however, we may have more than one copy of the same clip - in this case we want to create clones of the decoder plugin
-	      // this is to prevent constant seeking between different frames in the clip
-
-	      // check if ext_src survives old->new
-
-
-	      ////
-	      if (oclip>0) {
-		if (mainw->files[oclip]->clip_type==CLIP_TYPE_FILE) {
-		  if (mainw->track_decoders[i]!=(lives_decoder_t *)mainw->files[oclip]->ext_src) {
-		    // remove the clone for oclip
-		    close_decoder_plugin(mainw->track_decoders[i]);
-		  }
-		  mainw->track_decoders[i]=NULL;
-		}
-	      }
-
-	      if (nclip>0) {
-		if (mainw->files[nclip]->clip_type==CLIP_TYPE_FILE) {
-		  if (!mainw->ext_src_used[nclip]) {
-		    mainw->track_decoders[i]=(lives_decoder_t *)mainw->files[nclip]->ext_src;
-		    mainw->ext_src_used[nclip]=TRUE;
-		  }
-		  else {
-		    // add new clone for nclip
-		    mainw->track_decoders[i]=clone_decoder(nclip);
-		  }
-		}
-	      }
-	    }
-
-	    mainw->old_active_track_list[i]=mainw->active_track_list[i];
-
-	    if (nclip>0) {
-	      const char *img_ext=get_image_ext_for_type(mainw->files[nclip]->img_type);
-	      // set alt src in layer
-	      weed_set_voidptr_value(layers[i],"host_decoder",(void *)mainw->track_decoders[i]);
-	      pull_frame_threaded(layers[i],img_ext,(weed_timecode_t)mainw->currticks);
-	    }
-	    else {
-	      weed_set_voidptr_value(layers[i],"pixel_data",NULL);
-	    }
-	  }
-	  layers[i]=NULL;
-	  
-	  layer=weed_apply_effects(layers,mainw->filter_map,tc,0,0,pchains);
-	  
-	  for (i=0;layers[i]!=NULL;i++) {
-	    if (layer!=layers[i]) {
-	      check_layer_ready(layers[i]);
-	      weed_plant_free(layers[i]);
-	    }
-	  }
-	  g_free(layers);
-	}
-
-	weed_free(clip_index);
-	weed_free(frame_index);
-
-	if (layer!=NULL) {
-	  layer_palette=weed_layer_get_palette(layer);
-	  if (cfile->img_type==IMG_TYPE_JPEG&&layer_palette!=WEED_PALETTE_RGB24&&layer_palette!=WEED_PALETTE_RGBA32) 
-	    layer_palette=WEED_PALETTE_RGB24;
-
-	  else if (cfile->img_type==IMG_TYPE_PNG&&layer_palette!=WEED_PALETTE_RGBA32) 
-	    layer_palette=WEED_PALETTE_RGBA32;
-
-	  resize_layer(layer,cfile->hsize,cfile->vsize,LIVES_INTERP_BEST,layer_palette,0);
-	  convert_layer_palette(layer,layer_palette,0);
-	  pixbuf=layer_to_pixbuf(layer);
-	  weed_plant_free(layer);
-	}
+        if ((mainw->multitrack==NULL||(mainw->multitrack->opts.render_vidp&&!mainw->multitrack->pr_audio))&&
+            !(!mainw->clip_switched&&cfile->hsize*cfile->vsize==0)) {
+          int scrap_track=-1;
+
+          num_tracks=weed_leaf_num_elements(event,"clips");
+          clip_index=weed_get_int_array(event,"clips",&weed_error);
+          frame_index=weed_get_int_array(event,"frames",&weed_error);
+
+          if (mainw->scrap_file!=-1) {
+            for (i=0; i<num_tracks; i++) {
+              if (clip_index[i]!=mainw->scrap_file) {
+                scrap_track=-1;
+                break;
+              }
+              if (scrap_track==-1) scrap_track=i;
+            }
+          }
+
+          if (scrap_track!=-1) {
+            // do not apply fx, just pull frame
+            layer=weed_plant_new(WEED_PLANT_CHANNEL);
+            weed_set_int_value(layer,"clip",clip_index[scrap_track]);
+            weed_set_int_value(layer,"frame",frame_index[scrap_track]);
+            if (!pull_frame(layer,prefs->image_ext,tc)) {
+              weed_plant_free(layer);
+              layer=NULL;
+            }
+          } else {
+            int oclip,nclip;
+
+            layers=(weed_plant_t **)lives_malloc((num_tracks+1)*sizeof(weed_plant_t *));
+
+            // get list of active tracks from mainw->filter map
+            get_active_track_list(mainw->clip_index,mainw->num_tracks,mainw->filter_map);
+            for (i=0; i<mainw->num_tracks; i++) {
+              oclip=mainw->old_active_track_list[i];
+              mainw->ext_src_used[oclip]=FALSE;
+              if (oclip>0&&oclip==(nclip=mainw->active_track_list[i])) {
+                if (mainw->track_decoders[i]==mainw->files[oclip]->ext_src) mainw->ext_src_used[oclip]=TRUE;
+              }
+            }
+
+            for (i=0; i<num_tracks; i++) {
+              if (clip_index[i]>0&&frame_index[i]>0&&mainw->multitrack!=NULL) is_blank=FALSE;
+              layers[i]=weed_plant_new(WEED_PLANT_CHANNEL);
+              weed_set_int_value(layers[i],"clip",clip_index[i]);
+              weed_set_int_value(layers[i],"frame",frame_index[i]);
+              weed_set_voidptr_value(layers[i],"pixel_data",NULL);
+
+              if ((oclip=mainw->old_active_track_list[i])!=(nclip=mainw->active_track_list[i])) {
+                // now using threading, we want to start pulling all pixel_data for all active layers here
+                // however, we may have more than one copy of the same clip - in this case we want to create clones of the decoder plugin
+                // this is to prevent constant seeking between different frames in the clip
+
+                // check if ext_src survives old->new
+
+
+                ////
+                if (oclip>0) {
+                  if (mainw->files[oclip]->clip_type==CLIP_TYPE_FILE) {
+                    if (mainw->track_decoders[i]!=(lives_decoder_t *)mainw->files[oclip]->ext_src) {
+                      // remove the clone for oclip
+                      close_decoder_plugin(mainw->track_decoders[i]);
+                    }
+                    mainw->track_decoders[i]=NULL;
+                  }
+                }
+
+                if (nclip>0) {
+                  if (mainw->files[nclip]->clip_type==CLIP_TYPE_FILE) {
+                    if (!mainw->ext_src_used[nclip]) {
+                      mainw->track_decoders[i]=(lives_decoder_t *)mainw->files[nclip]->ext_src;
+                      mainw->ext_src_used[nclip]=TRUE;
+                    } else {
+                      // add new clone for nclip
+                      mainw->track_decoders[i]=clone_decoder(nclip);
+                    }
+                  }
+                }
+              }
+
+              mainw->old_active_track_list[i]=mainw->active_track_list[i];
+
+              if (nclip>0) {
+                const char *img_ext=get_image_ext_for_type(mainw->files[nclip]->img_type);
+                // set alt src in layer
+                weed_set_voidptr_value(layers[i],"host_decoder",(void *)mainw->track_decoders[i]);
+                pull_frame_threaded(layers[i],img_ext,(weed_timecode_t)mainw->currticks);
+              } else {
+                weed_set_voidptr_value(layers[i],"pixel_data",NULL);
+              }
+            }
+            layers[i]=NULL;
+
+            layer=weed_apply_effects(layers,mainw->filter_map,tc,0,0,pchains);
+
+            for (i=0; layers[i]!=NULL; i++) {
+              if (layer!=layers[i]) {
+                check_layer_ready(layers[i]);
+                weed_plant_free(layers[i]);
+              }
+            }
+            lives_free(layers);
+          }
+
+          lives_free(clip_index);
+          lives_free(frame_index);
+
+          if (layer!=NULL) {
+            layer_palette=weed_layer_get_palette(layer);
+            if (cfile->img_type==IMG_TYPE_JPEG&&layer_palette!=WEED_PALETTE_RGB24&&layer_palette!=WEED_PALETTE_RGBA32)
+              layer_palette=WEED_PALETTE_RGB24;
+
+            else if (cfile->img_type==IMG_TYPE_PNG&&layer_palette!=WEED_PALETTE_RGBA32)
+              layer_palette=WEED_PALETTE_RGBA32;
+
+            resize_layer(layer,cfile->hsize,cfile->vsize,LIVES_INTERP_BEST,layer_palette,0);
+            convert_layer_palette(layer,layer_palette,0);
+            pixbuf=layer_to_pixbuf(layer);
+            weed_plant_free(layer);
+          }
+
+          mainw->blend_file=blend_file;
+        }
+      } else tc=flush_audio_tc;
 
-	mainw->blend_file=blend_file;
-      }
-
-      next_frame_event=get_next_frame_event (event);
+      next_frame_event=get_next_frame_event(event);
 
       // get tc of next frame event
-      if (next_frame_event!=NULL) next_tc=get_event_timecode (next_frame_event);
+      if (next_frame_event!=NULL) next_tc=get_event_timecode(next_frame_event);
       else {
-	if (has_audio&&!weed_plant_has_leaf(event,"audio_clips")) {
-	  // pad to end with silence
-	  cfile->achans=cfile->undo_achans;
-	  cfile->arate=cfile->undo_arate;
-	  cfile->arps=cfile->undo_arps;
-	  cfile->asampsize=cfile->undo_asampsize;
-	  if (cfile->proc_ptr!=NULL) {
-	    blabel=g_strdup(lives_label_get_text(LIVES_LABEL(cfile->proc_ptr->label)));
-	    lives_label_set_text(LIVES_LABEL(cfile->proc_ptr->label),nlabel);
-	    lives_widget_queue_draw(cfile->proc_ptr->processing);
-	    lives_widget_context_update();
-	  }
-
-	  mainw->read_failed=mainw->write_failed=FALSE;
-	  if (mainw->read_failed_file!=NULL) g_free(mainw->read_failed_file);
-	  mainw->read_failed_file=NULL;
-
-	  render_audio_segment(0, NULL, mainw->multitrack!=NULL?mainw->multitrack->render_file:mainw->current_file,
-			       NULL, NULL, atime*U_SEC, q_gint64(tc+(U_SEC/cfile->fps*!is_blank),cfile->fps), 
-			       chvols, 1., 1., NULL);
-	  
-	  if (mainw->write_failed) {
-	    int outfile=(mainw->multitrack!=NULL?mainw->multitrack->render_file:mainw->current_file);
-	    gchar *outfilename=g_build_filename(prefs->tmpdir,mainw->files[outfile]->handle,"audio",NULL);
-	    do_write_failed_error_s(outfilename,NULL);
-	    read_write_error=LIVES_RENDER_ERROR_WRITE_AUDIO;
-	  }
-
-	  if (mainw->read_failed) {
-	    do_read_failed_error_s(mainw->read_failed_file,NULL);
-	    read_write_error=LIVES_RENDER_ERROR_READ_AUDIO;
-	  }
-
-	  if (cfile->proc_ptr!=NULL) {
-	    lives_label_set_text(LIVES_LABEL(cfile->proc_ptr->label),blabel);
-	    g_free(blabel);
-	    lives_widget_queue_draw(cfile->proc_ptr->processing);
-	    lives_widget_context_update();
-	  }
-	}
+        // reached end of event_list
+
+        if (has_audio&&!WEED_EVENT_IS_AUDIO_FRAME(event)) {
+          // pad to end with silence
+          cfile->achans=cfile->undo_achans;
+          cfile->arate=cfile->undo_arate;
+          cfile->arps=cfile->undo_arps;
+          cfile->asampsize=cfile->undo_asampsize;
+          if (cfile->proc_ptr!=NULL) {
+            blabel=lives_strdup(lives_label_get_text(LIVES_LABEL(cfile->proc_ptr->label)));
+            lives_label_set_text(LIVES_LABEL(cfile->proc_ptr->label),nlabel);
+            lives_widget_queue_draw(cfile->proc_ptr->processing);
+            lives_widget_context_update();
+          }
+
+          mainw->read_failed=mainw->write_failed=FALSE;
+          if (mainw->read_failed_file!=NULL) lives_free(mainw->read_failed_file);
+          mainw->read_failed_file=NULL;
+          render_audio_segment(0, NULL, mainw->multitrack!=NULL?mainw->multitrack->render_file:mainw->current_file,
+                               NULL, NULL, atime*U_SEC, q_gint64(tc+(U_SEC/cfile->fps*!is_blank),cfile->fps),
+                               chvols, 1., 1., NULL);
+
+          if (mainw->write_failed) {
+            int outfile=(mainw->multitrack!=NULL?mainw->multitrack->render_file:mainw->current_file);
+            char *outfilename=lives_build_filename(prefs->tmpdir,mainw->files[outfile]->handle,"audio",NULL);
+            do_write_failed_error_s(outfilename,NULL);
+            read_write_error=LIVES_RENDER_ERROR_WRITE_AUDIO;
+          }
+
+          if (mainw->read_failed) {
+            do_read_failed_error_s(mainw->read_failed_file,NULL);
+            read_write_error=LIVES_RENDER_ERROR_READ_AUDIO;
+          }
+
+          if (cfile->proc_ptr!=NULL) {
+            lives_label_set_text(LIVES_LABEL(cfile->proc_ptr->label),blabel);
+            lives_free(blabel);
+            lives_widget_queue_draw(cfile->proc_ptr->processing);
+            lives_widget_context_update();
+          }
+        }
       }
 
       while (cfile->fps>0.) {
-	if ((mainw->multitrack==NULL&&prefs->render_audio)||(mainw->multitrack!=NULL&&mainw->multitrack->render_audp)) {
-	  if (firstframe) {
-	    // see if audio needs appending
-	    if (weed_plant_has_leaf(event,"audio_clips")) {
-	      int num_aclips=weed_leaf_num_elements(event,"audio_clips");
-	      int *aclips=weed_get_int_array(event,"audio_clips",&weed_error);
-	      double *aseeks=weed_get_double_array(event,"audio_seeks",&weed_error);
-	      int natracks=1,nbtracks=0;
-
-	      if (mainw->multitrack!=NULL) {
-		natracks=weed_leaf_num_elements(mainw->multitrack->avol_init_event,"in_tracks");
-		nbtracks=mainw->multitrack->opts.back_audio_tracks;
-	      }
-	      else {
-		natracks=1;
-		nbtracks=1;
-	      }
-
-	      has_audio=TRUE;
-
-	      if (mainw->multitrack!=NULL) {
-		for (track=0;track<natracks;track++) {
-		  // insert audio up to tc
-		  if (mainw->multitrack->audio_vols!=NULL) {
-		    chvols[track]=(double)GPOINTER_TO_INT(g_list_nth_data(mainw->multitrack->audio_vols,track))/1000000.;
-		  }
-		}
-	      }
-	      else {
-		chvols[0]=1.;
-	      }
-
-	      if (q_gint64(tc,cfile->fps)/U_SEC>atime) {
-		cfile->achans=cfile->undo_achans;
-		cfile->arate=cfile->undo_arate;
-		cfile->arps=cfile->undo_arps;
-		cfile->asampsize=cfile->undo_asampsize;
-
-		if (cfile->proc_ptr!=NULL) {
-		  blabel=g_strdup(lives_label_get_text(LIVES_LABEL(cfile->proc_ptr->label)));
-		  lives_label_set_text(LIVES_LABEL(cfile->proc_ptr->label),nlabel);
-		  lives_widget_queue_draw(cfile->proc_ptr->processing);
-		  lives_widget_context_update();
-		}
-
-		mainw->read_failed=mainw->write_failed=FALSE;
-		if (mainw->read_failed_file!=NULL) g_free(mainw->read_failed_file);
-		mainw->read_failed_file=NULL;
-
-		render_audio_segment(natracks, xaclips, mainw->multitrack!=NULL?mainw->multitrack->render_file:
-				     mainw->current_file, xavel, xaseek, (atime*U_SEC+.5), 
-				     q_gint64(tc+(U_SEC/cfile->fps*!is_blank),cfile->fps), chvols, 1., 1., NULL);
-
-
-		if (mainw->write_failed) {
-		  int outfile=(mainw->multitrack!=NULL?mainw->multitrack->render_file:mainw->current_file);
-		  gchar *outfilename=g_build_filename(prefs->tmpdir,mainw->files[outfile]->handle,"audio",NULL);
-		  do_write_failed_error_s(outfilename,NULL);
-		  read_write_error=LIVES_RENDER_ERROR_WRITE_AUDIO;
-		}
-		
-		if (mainw->read_failed) {
-		  do_read_failed_error_s(mainw->read_failed_file,NULL);
-		  read_write_error=LIVES_RENDER_ERROR_READ_AUDIO;
-		}
-
-		if (cfile->proc_ptr!=NULL) {
-		  lives_label_set_text(LIVES_LABEL(cfile->proc_ptr->label),blabel);
-		  g_free(blabel);
-		  lives_widget_queue_draw(cfile->proc_ptr->processing);
-		  lives_widget_context_update();
-		}
-
-		for (i=0;i<natracks;i++) {
-		  if (xaclips[i]>0) {
-		    xaseek[i]+=(q_gint64(tc,cfile->fps)/U_SEC+1./cfile->fps-atime)*xavel[i];
-		  }
-		}
-		atime=q_gint64(tc,cfile->fps)/U_SEC+1./cfile->fps;
-	      }
-	      for (i=0;i<num_aclips;i+=2) {
-		if (aclips[i+1]>0) { // clipnum
-		  mytrack=aclips[i]+nbtracks;
-		  xaclips[mytrack]=aclips[i+1];
-		  xaseek[mytrack]=aseeks[i];
-		  xavel[mytrack]=aseeks[i+1];
-		}
-	      }
-	      weed_free(aclips);
-	      weed_free(aseeks);
-	    }
-	    firstframe=FALSE;
-	  }
-	}
-
-	if (mainw->multitrack!=NULL&&mainw->multitrack->pr_audio) break;
-
-	if (pixbuf==NULL) break;
-	if (next_frame_event==NULL&&is_blank) break; // don't render final blank frame
-	next_out_tc=(weed_timecode_t)((out_frame-mainw->play_start)/cfile->fps*U_SEC); // calculate tc of next out frame
-	
-	if (next_frame_event!=NULL) {
-	  if (next_tc<next_out_tc||next_tc-next_out_tc<next_out_tc-tc) break;
-	}
-	else if (next_out_tc>tc) break;
-
-	// TODO - dirsep
-
-	if (cfile->old_frames>0) g_snprintf(oname,PATH_MAX,"%s/%s/%08d.mgk",prefs->tmpdir,cfile->handle,out_frame);
-	// sig_progress...
-	g_snprintf (mainw->msg,256,"%d",progress++);
-
-	if (prefs->ocp==-1) prefs->ocp=get_int_pref ("open_compression_percent");
-
-	if (cfile->old_frames==0) g_snprintf(oname,PATH_MAX,"%s/%s/%08d.%s",prefs->tmpdir,cfile->handle,out_frame,get_image_ext_for_type(cfile->img_type));
-
-	do {
-	  retval=0;
-	  lives_pixbuf_save (pixbuf, oname, cfile->img_type, 100-prefs->ocp, TRUE, &error);
-
-	  if (error!=NULL) {
-	    retval=do_write_failed_error_s_with_retry(oname,error->message,NULL);
-	    g_error_free(error);
-	    error=NULL;
-	    if (retval!=LIVES_RETRY) read_write_error=LIVES_RENDER_ERROR_WRITE_FRAME;
-	  }
-	} while (retval==LIVES_RETRY);
-
-	cfile->undo_end=out_frame;
-	if (out_frame>cfile->frames) cfile->frames=out_frame;
-	if (out_frame>cfile->end) cfile->end=out_frame;
-	if (cfile->start==0) cfile->start=1;
-	out_frame++;
+        if ((mainw->multitrack==NULL&&prefs->render_audio)||(mainw->multitrack!=NULL&&mainw->multitrack->opts.render_audp)) {
+          if (firstframe) {
+            // see if audio needs appending
+            if (WEED_EVENT_IS_AUDIO_FRAME(event)) {
+              int num_aclips=weed_leaf_num_elements(event,"audio_clips");
+              int *aclips=weed_get_int_array(event,"audio_clips",&weed_error);
+              double *aseeks=weed_get_double_array(event,"audio_seeks",&weed_error);
+              int natracks=1,nbtracks=0;
+
+              if (mainw->multitrack!=NULL) {
+                natracks=weed_leaf_num_elements(mainw->multitrack->avol_init_event,"in_tracks");
+                nbtracks=mainw->multitrack->opts.back_audio_tracks;
+              } else {
+                natracks=1;
+                nbtracks=1;
+              }
+
+              has_audio=TRUE;
+
+              if (mainw->multitrack!=NULL) {
+                for (track=0; track<natracks; track++) {
+                  // insert audio up to tc
+                  if (mainw->multitrack->audio_vols!=NULL) {
+                    chvols[track]=(double)LIVES_POINTER_TO_INT(lives_list_nth_data(mainw->multitrack->audio_vols,track))/1000000.;
+                  }
+                }
+              } else {
+                chvols[0]=1.;
+              }
+
+              if (flush_audio_tc>0||q_gint64(tc,cfile->fps)/U_SEC>atime) {
+                cfile->achans=cfile->undo_achans;
+                cfile->arate=cfile->undo_arate;
+                cfile->arps=cfile->undo_arps;
+                cfile->asampsize=cfile->undo_asampsize;
+
+                if (cfile->proc_ptr!=NULL) {
+                  blabel=lives_strdup(lives_label_get_text(LIVES_LABEL(cfile->proc_ptr->label)));
+                  lives_label_set_text(LIVES_LABEL(cfile->proc_ptr->label),nlabel);
+                  lives_widget_queue_draw(cfile->proc_ptr->processing);
+                  lives_widget_context_update();
+                }
+
+                mainw->read_failed=mainw->write_failed=FALSE;
+                if (mainw->read_failed_file!=NULL) lives_free(mainw->read_failed_file);
+                mainw->read_failed_file=NULL;
+
+                render_audio_segment(natracks, xaclips, mainw->multitrack!=NULL?mainw->multitrack->render_file:
+                                     mainw->current_file, xavel, xaseek, (atime*U_SEC+.5),
+                                     q_gint64(tc+(U_SEC/cfile->fps*!is_blank),cfile->fps), chvols, 1., 1., NULL);
+
+
+                if (mainw->write_failed) {
+                  int outfile=(mainw->multitrack!=NULL?mainw->multitrack->render_file:mainw->current_file);
+                  char *outfilename=lives_build_filename(prefs->tmpdir,mainw->files[outfile]->handle,"audio",NULL);
+                  do_write_failed_error_s(outfilename,NULL);
+                  read_write_error=LIVES_RENDER_ERROR_WRITE_AUDIO;
+                }
+
+                if (mainw->read_failed) {
+                  do_read_failed_error_s(mainw->read_failed_file,NULL);
+                  read_write_error=LIVES_RENDER_ERROR_READ_AUDIO;
+                }
+
+                if (cfile->proc_ptr!=NULL) {
+                  lives_label_set_text(LIVES_LABEL(cfile->proc_ptr->label),blabel);
+                  lives_free(blabel);
+                  lives_widget_queue_draw(cfile->proc_ptr->processing);
+                  lives_widget_context_update();
+                }
+
+                for (i=0; i<natracks; i++) {
+                  if (xaclips[i]>0) {
+                    xaseek[i]+=(q_gint64(tc,cfile->fps)/U_SEC+1./cfile->fps-atime)*xavel[i];
+                  }
+                }
+                atime=q_gint64(tc,cfile->fps)/U_SEC+1./cfile->fps;
+              }
+              for (i=0; i<num_aclips; i+=2) {
+                if (aclips[i+1]>0) { // clipnum
+                  mytrack=aclips[i]+nbtracks;
+                  xaclips[mytrack]=aclips[i+1];
+                  xaseek[mytrack]=aseeks[i];
+                  xavel[mytrack]=aseeks[i+1];
+                }
+              }
+              lives_free(aclips);
+              lives_free(aseeks);
+            }
+            firstframe=FALSE;
+          }
+        }
+
+        if (mainw->multitrack!=NULL&&mainw->multitrack->pr_audio) break;
+
+        if (pixbuf==NULL) break;
+        if (next_frame_event==NULL&&is_blank) break; // don't render final blank frame
+        next_out_tc=(weed_timecode_t)((out_frame-mainw->play_start)/cfile->fps*U_SEC); // calculate tc of next out frame
+
+        if (next_frame_event!=NULL) {
+          if (next_tc<next_out_tc||next_tc-next_out_tc<next_out_tc-tc) break;
+        } else if (next_out_tc>tc) break;
+
+        // TODO - dirsep
+
+        if (cfile->old_frames>0) lives_snprintf(oname,PATH_MAX,"%s/%s/%08d.mgk",prefs->tmpdir,cfile->handle,out_frame);
+        // sig_progress...
+        lives_snprintf(mainw->msg,256,"%d",progress++);
+
+        if (prefs->ocp==-1) prefs->ocp=get_int_pref("open_compression_percent");
+
+        if (cfile->old_frames==0) lives_snprintf(oname,PATH_MAX,"%s/%s/%08d.%s",prefs->tmpdir,cfile->handle,
+              out_frame,get_image_ext_for_type(cfile->img_type));
+
+        do {
+          retval=0;
+          lives_pixbuf_save(pixbuf, oname, cfile->img_type, 100-prefs->ocp, TRUE, &error);
+
+          if (error!=NULL) {
+            retval=do_write_failed_error_s_with_retry(oname,error->message,NULL);
+            lives_error_free(error);
+            error=NULL;
+            if (retval!=LIVES_RESPONSE_RETRY) read_write_error=LIVES_RENDER_ERROR_WRITE_FRAME;
+          }
+        } while (retval==LIVES_RESPONSE_RETRY);
+
+        cfile->undo_end=out_frame;
+        if (out_frame>cfile->frames) cfile->frames=out_frame;
+        if (out_frame>cfile->end) cfile->end=out_frame;
+        if (cfile->start==0) cfile->start=1;
+        out_frame++;
       }
-      if (pixbuf!=NULL) lives_object_unref (pixbuf);
+      if (pixbuf!=NULL) lives_object_unref(pixbuf);
 
       break;
     case WEED_EVENT_HINT_FILTER_INIT:
       // effect init
       //  bind the weed_fx to next free key/0
 
-      filter_name=weed_get_string_value (event,"filter",&weed_error);
+      filter_name=weed_get_string_value(event,"filter",&weed_error);
       // for now, assume we can find hashname
-      idx=weed_get_idx_for_hashname (filter_name,TRUE);
-      weed_free (filter_name);
+      idx=weed_get_idx_for_hashname(filter_name,TRUE);
+      lives_free(filter_name);
 
       filter=get_weed_filter(idx);
       if (is_pure_audio(filter,FALSE)) {
-	if (weed_plant_has_leaf(event,"host_tag")) weed_leaf_delete(event,"host_tag");
-	break; // audio effects are processed in the audio renderer
+        if (weed_plant_has_leaf(event,"host_tag")) weed_leaf_delete(event,"host_tag");
+        break; // audio effects are processed in the audio renderer
       }
 
       key=get_next_free_key();
-      weed_add_effectkey_by_idx (key+1,idx);
-      key_string=g_strdup_printf ("%d",key);
-      weed_set_string_value (event,"host_tag",key_string);
-      g_free (key_string);
+      weed_add_effectkey_by_idx(key+1,idx);
+      key_string=lives_strdup_printf("%d",key);
+      weed_set_string_value(event,"host_tag",key_string);
+      lives_free(key_string);
 
 
       if (weed_plant_has_leaf(event,"in_count")) {
-	num_in_count=weed_leaf_num_elements(event,"in_count");
-	in_count=weed_get_int_array(event,"in_count",&weed_error);
+        num_in_count=weed_leaf_num_elements(event,"in_count");
+        in_count=weed_get_int_array(event,"in_count",&weed_error);
       }
-      
+
       if (weed_plant_has_leaf(filter,"in_channel_templates")) {
-	if ((num_channels=weed_leaf_num_elements(filter,"in_channel_templates"))>0) {
-	  ctmpl=weed_get_plantptr_array(filter,"in_channel_templates",&weed_error);
-	  if (num_channels!=num_in_count) g_printerr("num_in_count != num_in_channels !!\n");
-	  for (i=0;i<num_channels;i++) {
-	    if (in_count[i]>0) {
-	      weed_set_boolean_value(ctmpl[i],"host_disabled",WEED_FALSE);
-	      weed_set_int_value(ctmpl[i],"host_repeats",in_count[i]);
-	    }
-	    else weed_set_boolean_value(ctmpl[i],"host_disabled",WEED_TRUE);
-	  }
-	  weed_free(ctmpl);
-	}
-      }
-      
-      if (in_count!=NULL) weed_free(in_count);
-      
+        if ((num_channels=weed_leaf_num_elements(filter,"in_channel_templates"))>0) {
+          ctmpl=weed_get_plantptr_array(filter,"in_channel_templates",&weed_error);
+          if (num_channels!=num_in_count) lives_printerr("num_in_count != num_in_channels !!\n");
+          for (i=0; i<num_channels; i++) {
+            if (in_count[i]>0) {
+              weed_set_boolean_value(ctmpl[i],"host_disabled",WEED_FALSE);
+              weed_set_int_value(ctmpl[i],"host_repeats",in_count[i]);
+            } else weed_set_boolean_value(ctmpl[i],"host_disabled",WEED_TRUE);
+          }
+          lives_free(ctmpl);
+        }
+      }
+
+      if (in_count!=NULL) lives_free(in_count);
+
       if (weed_plant_has_leaf(filter,"out_channel_templates")) {
-	if ((num_channels=weed_leaf_num_elements(filter,"out_channel_templates"))>0) {
-	  ctmpl=weed_get_plantptr_array(filter,"out_channel_templates",&weed_error);
-	  for (i=0;i<num_channels;i++) {
-	    if (!weed_plant_has_leaf(ctmpl[i],"host_disabled")||
-		weed_get_boolean_value(ctmpl[i],"host_disabled",&weed_error)!=WEED_TRUE) 
-	      weed_set_boolean_value(ctmpl[i],"host_disabled",WEED_FALSE);
-	    else weed_set_boolean_value(ctmpl[i],"host_disabled",WEED_TRUE);
-	  }
-	  weed_free(ctmpl);
-	}
+        if ((num_channels=weed_leaf_num_elements(filter,"out_channel_templates"))>0) {
+          ctmpl=weed_get_plantptr_array(filter,"out_channel_templates",&weed_error);
+          for (i=0; i<num_channels; i++) {
+            if (!weed_plant_has_leaf(ctmpl[i],"host_disabled")||
+                weed_get_boolean_value(ctmpl[i],"host_disabled",&weed_error)!=WEED_TRUE)
+              weed_set_boolean_value(ctmpl[i],"host_disabled",WEED_FALSE);
+            else weed_set_boolean_value(ctmpl[i],"host_disabled",WEED_TRUE);
+          }
+          lives_free(ctmpl);
+        }
       }
 
-      weed_init_effect (key);
+      weed_init_effect(key);
 
       // reinit effect with saved parameters
       inst=rte_keymode_get_instance(key+1,0);
 
       if (weed_plant_has_leaf(event,"in_parameters")) {
-	pchains[key]=weed_get_voidptr_array(event,"in_parameters",&weed_error);
-      }
-      else pchains[key]=NULL;
+        pchains[key]=weed_get_voidptr_array(event,"in_parameters",&weed_error);
+      } else pchains[key]=NULL;
 
-    filterinit2:
+filterinit2:
 
       num_params=num_in_params(inst,FALSE,FALSE);
- 
+
       if (num_params>0) {
-	weed_call_deinit_func(inst);
-	if (weed_plant_has_leaf(event,"in_parameters")) {
-	  source_params=(weed_plant_t **)pchains[key];
-	  in_params=weed_get_plantptr_array(inst,"in_parameters",&weed_error);
-
-	  for (i=0;i<num_params;i++) {
-	    if (source_params!=NULL&&source_params[i+offset]!=NULL&&is_init_pchange(event,source_params[i+offset])) 
-	      weed_leaf_copy(in_params[i],"value",source_params[i+offset],"value");
-	  }
-	  weed_free(in_params);
-	}
-
-	offset+=num_params;
-
-	filter=weed_instance_get_filter(inst,FALSE);
-
-	if (weed_plant_has_leaf(filter,"init_func")) {
-	  weed_deinit_f *init_func_ptr_ptr;
-	  weed_init_f init_func;
-	  weed_leaf_get(filter,"init_func",0,(void *)&init_func_ptr_ptr);
-	  init_func=init_func_ptr_ptr[0];
-	  set_param_gui_readwrite(inst);
-	  update_host_info(inst);
-	  if (init_func!=NULL) {
-	    gchar *cwd=cd_to_plugin_dir(filter);
-	    (*init_func)(inst);
-	    lives_chdir(cwd,FALSE);
-	    g_free(cwd);
-	  }
-	  set_param_gui_readonly(inst);
-	  
-	}
-	
-	weed_set_boolean_value(inst,"host_inited",WEED_TRUE);
+        weed_call_deinit_func(inst);
+        if (weed_plant_has_leaf(event,"in_parameters")) {
+          source_params=(weed_plant_t **)pchains[key];
+          in_params=weed_get_plantptr_array(inst,"in_parameters",&weed_error);
+
+          for (i=0; i<num_params; i++) {
+            if (source_params!=NULL&&source_params[i+offset]!=NULL&&is_init_pchange(event,source_params[i+offset]))
+              weed_leaf_copy(in_params[i],"value",source_params[i+offset],"value");
+          }
+          lives_free(in_params);
+        }
+
+        offset+=num_params;
+
+        filter=weed_instance_get_filter(inst,FALSE);
+
+        if (weed_plant_has_leaf(filter,"init_func")) {
+          weed_deinit_f *init_func_ptr_ptr;
+          weed_init_f init_func;
+          weed_leaf_get(filter,"init_func",0,(void *)&init_func_ptr_ptr);
+          init_func=init_func_ptr_ptr[0];
+          set_param_gui_readwrite(inst);
+          update_host_info(inst);
+          if (init_func!=NULL) {
+            char *cwd=cd_to_plugin_dir(filter);
+            (*init_func)(inst);
+            lives_chdir(cwd,FALSE);
+            lives_free(cwd);
+          }
+          set_param_gui_readonly(inst);
+
+        }
+
+        weed_set_boolean_value(inst,"host_inited",WEED_TRUE);
       }
 
       if (weed_plant_has_leaf(event,"host_key")) {
-	// mt events will not have this;
-	// it is used to connect params and alpha channels during rendering
-	// holds our original key/mode values
-	
-	int hostkey=weed_get_int_value(event,"host_key",&weed_error);
-	int hostmode=weed_get_int_value(event,"host_mode",&weed_error);
-	
-	weed_set_int_value(inst,"host_key",hostkey);
-	weed_set_int_value(inst,"host_mode",hostmode);
-	
+        // mt events will not have this;
+        // it is used to connect params and alpha channels during rendering
+        // holds our original key/mode values
+
+        int hostkey=weed_get_int_value(event,"host_key",&weed_error);
+        int hostmode=weed_get_int_value(event,"host_mode",&weed_error);
+
+        weed_set_int_value(inst,"host_key",hostkey);
+        weed_set_int_value(inst,"host_mode",hostmode);
+
       }
 
       if (weed_plant_has_leaf(inst,"host_next_instance")) {
-	// handle compound fx
-	inst=weed_get_plantptr_value(inst,"host_next_instance",&weed_error);
-	goto filterinit2;
+        // handle compound fx
+        inst=weed_get_plantptr_value(inst,"host_next_instance",&weed_error);
+        goto filterinit2;
       }
 
       break;
     case WEED_EVENT_HINT_FILTER_DEINIT:
-      init_event=weed_get_voidptr_value (event,"init_event",&weed_error);
+      init_event=weed_get_voidptr_value(event,"init_event",&weed_error);
 
-      filter_name=weed_get_string_value ((weed_plant_t *)init_event,"filter",&weed_error);
+      filter_name=weed_get_string_value((weed_plant_t *)init_event,"filter",&weed_error);
       // for now, assume we can find hashname
-      idx=weed_get_idx_for_hashname (filter_name,TRUE);
-      weed_free (filter_name);
+      idx=weed_get_idx_for_hashname(filter_name,TRUE);
+      lives_free(filter_name);
 
       filter=get_weed_filter(idx);
       if (is_pure_audio(filter,FALSE)) break; // audio effects are processed in the audio renderer
 
-      key_string=weed_get_string_value ((weed_plant_t *)init_event,"host_tag",&weed_error);
-      key=atoi (key_string);
-      weed_free (key_string);
+      key_string=weed_get_string_value((weed_plant_t *)init_event,"host_tag",&weed_error);
+      key=atoi(key_string);
+      lives_free(key_string);
       if (rte_keymode_get_instance(key+1,0)!=NULL) {
-	weed_deinit_effect (key);
-	weed_delete_effectkey (key+1,0);
+        weed_deinit_effect(key);
+        weed_delete_effectkey(key+1,0);
       }
-      if (pchains[key]!=NULL) weed_free(pchains[key]);
+      if (pchains[key]!=NULL) lives_free(pchains[key]);
       pchains[key]=NULL;
       break;
     case WEED_EVENT_HINT_PARAM_CHANGE:
       break;
     case WEED_EVENT_HINT_FILTER_MAP:
 #ifdef DEBUG_EVENTS
-      g_print ("got new effect map\n");
+      g_print("got new effect map\n");
 #endif
       mainw->filter_map=event;
       break;
     }
     event=eventnext;
-  }
-  else {
+  } else {
     lives_mt *multi;
 
     if (cfile->old_frames==0) cfile->undo_start=cfile->undo_end=0;
     if (mainw->multitrack==NULL||!mainw->multitrack->pr_audio) {
-      com=g_strdup_printf ("%s mv_mgk \"%s\" %d %d \"%s\"",prefs->backend,cfile->handle,cfile->undo_start,
-			   cfile->undo_end,get_image_ext_for_type(cfile->img_type));
+      com=lives_strdup_printf("%s mv_mgk \"%s\" %d %d \"%s\"",prefs->backend,cfile->handle,cfile->undo_start,
+                              cfile->undo_end,get_image_ext_for_type(cfile->img_type));
       unlink(cfile->info_file);
       mainw->error=FALSE;
       mainw->com_failed=FALSE;
       mainw->cancelled=CANCEL_NONE;
 
-      lives_system (com,FALSE);
-      g_free (com);
+      lives_system(com,FALSE);
+      lives_free(com);
       mainw->is_rendering=mainw->internal_messaging=FALSE;
 
       if (mainw->com_failed) {
-	read_write_error=LIVES_RENDER_ERROR_WRITE_FRAME;
-	//	cfile->may_be_damaged=TRUE;
+        read_write_error=LIVES_RENDER_ERROR_WRITE_FRAME;
+        //	cfile->may_be_damaged=TRUE;
       }
-    }
-    else g_snprintf(mainw->msg,512,"completed");
+    } else lives_snprintf(mainw->msg,512,"completed");
 
     multi=mainw->multitrack;
     mainw->multitrack=NULL;  // allow setting of audio filesize now
@@ -3883,7 +3912,7 @@
     completed=TRUE;
   }
 
-  g_free(nlabel);
+  lives_free(nlabel);
   if (read_write_error) return read_write_error;
   if (completed) return LIVES_RENDER_COMPLETE;
   return LIVES_RENDER_PROCESSING;
@@ -3892,12 +3921,14 @@
 
 
 
-boolean start_render_effect_events (weed_plant_t *event_list) {
+boolean start_render_effect_events(weed_plant_t *event_list) {
   // this is called to begin rendering effect events from an event_list into cfile
   // it will do a reorder/resample/resize/effect apply all in one pass
 
   // return FALSE in case of serious error
 
+  lives_mt *multi=mainw->multitrack;
+
   double old_pb_fps=cfile->pb_fps;
   int oundo_start=cfile->undo_start;
   int oundo_end=cfile->undo_end;
@@ -3908,30 +3939,29 @@
   cfile->next_event=get_first_event(event_list);
 
   mainw->progress_fn=&render_events;
-  mainw->progress_fn (TRUE);
+  mainw->progress_fn(TRUE);
 
   cfile->progress_start=1;
-  cfile->progress_end=count_resampled_events (event_list, cfile->fps);
+  cfile->progress_end=count_resampled_events(event_list, cfile->fps);
 
   cfile->pb_fps=1000000.;
 
   cfile->redoable=cfile->undoable=FALSE;
-  lives_widget_set_sensitive (mainw->redo, FALSE);
-  lives_widget_set_sensitive (mainw->undo, FALSE);
+  lives_widget_set_sensitive(mainw->redo, FALSE);
+  lives_widget_set_sensitive(mainw->undo, FALSE);
 
   cfile->undo_action=UNDO_RENDER;
   // play back the file as fast as possible, each time calling render_events()
   if ((!do_progress_dialog(TRUE,TRUE,"Rendering")&&mainw->cancelled!=CANCEL_KEEP)||mainw->error||
       mainw->render_error>=LIVES_RENDER_ERROR
-      ) {
+     ) {
     mainw->cancel_type=CANCEL_KILL;
     mainw->cancelled=CANCEL_NONE;
 
     if (mainw->error) {
-      do_error_dialog (mainw->msg);
+      do_error_dialog(mainw->msg);
       d_print_failed();
-    }
-    else if (mainw->render_error>=LIVES_RENDER_ERROR) d_print_failed();
+    } else if (mainw->render_error>=LIVES_RENDER_ERROR) d_print_failed();
     //else d_print_cancelled();
     cfile->undo_start=oundo_start;
     cfile->undo_end=oundo_end;
@@ -3943,6 +3973,18 @@
     return FALSE;
   }
 
+  if (mainw->effects_paused) {
+    // pressed "Keep", render audio to end of segment
+    mainw->effects_paused=FALSE;
+    flush_audio_tc=q_gint64((double)cfile->undo_end/cfile->fps*U_SEC,cfile->fps);
+
+    render_events(FALSE);
+    flush_audio_tc=0;
+    mainw->multitrack=NULL;  // allow setting of audio filesize now
+    reget_afilesize(mainw->current_file);
+    mainw->multitrack=multi;
+  }
+
   mainw->cancel_type=CANCEL_KILL;
   mainw->cancelled=CANCEL_NONE;
   cfile->changed=TRUE;
@@ -3950,22 +3992,22 @@
   get_total_time(cfile);
 
   if (cfile->total_time==0) {
-    d_print (_ ("nothing rendered.\n"));
+    d_print(_("nothing rendered.\n"));
     return FALSE;
   }
 
-  lives_widget_set_sensitive (mainw->undo, TRUE);
+  lives_widget_set_sensitive(mainw->undo, TRUE);
   cfile->undoable=TRUE;
   cfile->pb_fps=old_pb_fps;
-  lives_widget_set_sensitive (mainw->select_last, TRUE);
-  set_undoable (_ ("rendering"),TRUE);
+  lives_widget_set_sensitive(mainw->select_last, TRUE);
+  set_undoable(_("rendering"),TRUE);
   cfile->next_event=NULL;
   return TRUE;
 }
 
 
 
-int count_events (weed_plant_t *event_list, boolean all_events, weed_timecode_t start_tc, weed_timecode_t end_tc) {
+int count_events(weed_plant_t *event_list, boolean all_events, weed_timecode_t start_tc, weed_timecode_t end_tc) {
   weed_plant_t *event;
   weed_timecode_t tc;
   int i=0;
@@ -3975,9 +4017,8 @@
 
   while (event!=NULL) {
     tc=get_event_timecode(event);
-    if ((all_events||(get_event_hint(event)==WEED_EVENT_HINT_FRAME&&
-		      !weed_plant_has_leaf(event,"audio_clips")))&&
-	(end_tc==0||(tc>=start_tc&&tc<end_tc))) i++;
+    if ((all_events||(WEED_EVENT_IS_FRAME(event)&&!WEED_EVENT_IS_AUDIO_FRAME(event)))&&
+        (end_tc==0||(tc>=start_tc&&tc<end_tc))) i++;
     event=get_next_event(event);
   }
   return i;
@@ -3985,12 +4026,12 @@
 
 
 
-int count_resampled_events (weed_plant_t *event_list, double fps) {
+int count_resampled_events(weed_plant_t *event_list, double fps) {
   weed_plant_t *event;
   weed_timecode_t tc,seg_start_tc=0,seg_end_tc=0;
 
   int rframes=0,hint,marker_type,error;
-  
+
   boolean seg_start=FALSE;
 
   if (event_list==NULL) return 0;
@@ -4001,21 +4042,19 @@
     if (hint==WEED_EVENT_HINT_FRAME) {
       tc=get_event_timecode(event);
       if (!seg_start) {
-	seg_start_tc=seg_end_tc=tc;
-	seg_start=TRUE;
+        seg_start_tc=seg_end_tc=tc;
+        seg_start=TRUE;
+      } else {
+        seg_end_tc=tc;
       }
-      else {
-	seg_end_tc=tc;
-      }
-    }
-    else {
+    } else {
       if (hint==WEED_EVENT_HINT_MARKER) {
-	marker_type=weed_get_int_value(event,"lives_type",&error);
-	if (marker_type==EVENT_MARKER_RECORD_END) {
-	  // add (resampled) frames for one recording stretch
-	  if (seg_start) rframes+=1+((double)(seg_end_tc-seg_start_tc))/U_SEC*fps;
-	  seg_start=FALSE;
-	}
+        marker_type=weed_get_int_value(event,"lives_type",&error);
+        if (marker_type==EVENT_MARKER_RECORD_END) {
+          // add (resampled) frames for one recording stretch
+          if (seg_start) rframes+=1+((double)(seg_end_tc-seg_start_tc))/U_SEC*fps;
+          seg_start=FALSE;
+        }
       }
     }
     event=get_next_event(event);
@@ -4027,22 +4066,22 @@
 }
 
 
-weed_timecode_t event_list_get_end_tc (weed_plant_t *event_list) {
+weed_timecode_t event_list_get_end_tc(weed_plant_t *event_list) {
   if (event_list==NULL||get_last_event(event_list)==NULL) return 0.;
-  return get_event_timecode (get_last_event(event_list));
+  return get_event_timecode(get_last_event(event_list));
 }
 
-double event_list_get_end_secs (weed_plant_t *event_list) {
+double event_list_get_end_secs(weed_plant_t *event_list) {
   return (event_list_get_end_tc(event_list)/U_SEC);
 }
 
 
-weed_timecode_t event_list_get_start_tc (weed_plant_t *event_list) {
+weed_timecode_t event_list_get_start_tc(weed_plant_t *event_list) {
   if (event_list==NULL||get_first_event(event_list)==NULL) return 0.;
-  return get_event_timecode (get_first_event(event_list));
+  return get_event_timecode(get_first_event(event_list));
 }
 
-double event_list_get_start_secs (weed_plant_t *event_list) {
+double event_list_get_start_secs(weed_plant_t *event_list) {
   return (event_list_get_start_tc(event_list)/U_SEC);
 }
 
@@ -4051,7 +4090,7 @@
 boolean has_audio_frame(weed_plant_t *event_list) {
   weed_plant_t *event=get_first_frame_event(event_list);
   while (event!=NULL) {
-    if (weed_plant_has_leaf(event,"audio_clips")) return TRUE;
+    if (WEED_EVENT_IS_AUDIO_FRAME(event)) return TRUE;
     event=get_next_frame_event(event);
   }
   return FALSE;
@@ -4061,9 +4100,9 @@
 ///////////////////////////////////////////////////////////////////
 
 
-boolean render_to_clip (boolean new_clip) {
+boolean render_to_clip(boolean new_clip) {
   // this function is called to actually start rendering mainw->event_list to a new/current clip
-  gchar *com;
+  char *com;
 
   boolean retval=TRUE;
   boolean rendaud=TRUE;
@@ -4072,8 +4111,6 @@
   int xachans=0,xarate=0,xasamps=0,xse=0;
   int current_file=mainw->current_file;
 
-  if (mainw->multitrack!=NULL&&mainw->multitrack->pr_audio) d_print(_("Pre-rendering audio..."));
-  else d_print(_("Rendering..."));
 
   if (new_clip) {
 
@@ -4082,66 +4119,65 @@
       rdet=create_render_details(2);
 
       if (!has_audio_frame(mainw->event_list)) {
-	lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (resaudw->aud_checkbutton), FALSE);
-	lives_widget_set_sensitive(resaudw->aud_checkbutton,FALSE);
+        lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(resaudw->aud_checkbutton), FALSE);
+        lives_widget_set_sensitive(resaudw->aud_checkbutton,FALSE);
       }
       rdet->enc_changed=FALSE;
       do {
-	rdet->suggestion_followed=FALSE;
-	if ((response=lives_dialog_run(LIVES_DIALOG(rdet->dialog)))==LIVES_RESPONSE_OK) if (rdet->enc_changed) {
-	    check_encoder_restrictions(FALSE,TRUE,TRUE);
-	}
+        rdet->suggestion_followed=FALSE;
+        if ((response=lives_dialog_run(LIVES_DIALOG(rdet->dialog)))==LIVES_RESPONSE_OK) if (rdet->enc_changed) {
+            check_encoder_restrictions(FALSE,TRUE,TRUE);
+          }
       } while (rdet->suggestion_followed);
 
-      xarate=(int)atoi (lives_entry_get_text(LIVES_ENTRY(resaudw->entry_arate)));
-      xachans=(int)atoi (lives_entry_get_text(LIVES_ENTRY(resaudw->entry_achans)));
-      xasamps=(int)atoi (lives_entry_get_text(LIVES_ENTRY(resaudw->entry_asamps)));
+      xarate=(int)atoi(lives_entry_get_text(LIVES_ENTRY(resaudw->entry_arate)));
+      xachans=(int)atoi(lives_entry_get_text(LIVES_ENTRY(resaudw->entry_achans)));
+      xasamps=(int)atoi(lives_entry_get_text(LIVES_ENTRY(resaudw->entry_asamps)));
 
+      // do we render audio ?
       rendaud=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(resaudw->aud_checkbutton));
 
       if (lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(resaudw->rb_unsigned))) {
-	xse=AFORM_UNSIGNED;;
-      }
-      else xse=AFORM_SIGNED;
+        xse=AFORM_UNSIGNED;;
+      } else xse=AFORM_SIGNED;
       if (lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(resaudw->rb_bigend))) {
-	xse|=AFORM_BIG_ENDIAN;
-      }
-      else xse|=AFORM_LITTLE_ENDIAN;
+        xse|=AFORM_BIG_ENDIAN;
+      } else xse|=AFORM_LITTLE_ENDIAN;
+
+      lives_widget_destroy(rdet->dialog);
 
-      lives_widget_destroy (rdet->dialog);
-      
       if (response==LIVES_RESPONSE_CANCEL) {
-	g_free(rdet->encoder_name);
-	g_free(rdet);
-	rdet=NULL;
-	if (resaudw!=NULL) g_free(resaudw);
-	resaudw=NULL;
-	return FALSE;
+        lives_free(rdet->encoder_name);
+        lives_free(rdet);
+        rdet=NULL;
+        if (resaudw!=NULL) lives_free(resaudw);
+        resaudw=NULL;
+        return FALSE;
       }
 
     }
-  
+
     if (mainw->current_file>-1&&cfile!=NULL&&cfile->clip_type==CLIP_TYPE_GENERATOR) {
-      weed_generator_end ((weed_plant_t *)cfile->ext_src);
+      weed_generator_end((weed_plant_t *)cfile->ext_src);
     }
 
     // create new file
     mainw->current_file=mainw->first_free_file;
-    
+
     if (!get_new_handle(mainw->current_file,NULL)) {
       // bummer...
       mainw->current_file=current_file;
-      
+
       if (prefs->mt_enter_prompt) {
-	g_free(rdet->encoder_name);
-	g_free(rdet);
-	if (resaudw!=NULL) g_free(resaudw);
-	resaudw=NULL;
-	rdet=NULL;
+        lives_free(rdet->encoder_name);
+        lives_free(rdet);
+        if (resaudw!=NULL) lives_free(resaudw);
+        resaudw=NULL;
+        rdet=NULL;
       }
       return FALSE; // show dialog again
     }
-    
+
     if (prefs->render_prompt) {
       cfile->hsize=rdet->width;
       cfile->vsize=rdet->height;
@@ -4153,13 +4189,12 @@
       cfile->asampsize=xasamps;
       cfile->signed_endian=xse;
 
-      g_free(rdet->encoder_name);
-      g_free(rdet);
+      lives_free(rdet->encoder_name);
+      lives_free(rdet);
       rdet=NULL;
-      if (resaudw!=NULL) g_free(resaudw);
+      if (resaudw!=NULL) lives_free(resaudw);
       resaudw=NULL;
-    }
-    else {
+    } else {
       cfile->hsize=prefs->mt_def_width;
       cfile->vsize=prefs->mt_def_height;
       cfile->pb_fps=cfile->fps=prefs->mt_def_fps;
@@ -4169,109 +4204,107 @@
       cfile->asampsize=prefs->mt_def_asamps;
       cfile->signed_endian=prefs->mt_def_signed_endian;
     }
-    
+
     cfile->bpp=cfile->img_type==IMG_TYPE_JPEG?24:32;
     cfile->is_loaded=TRUE;
-  }
-  else if (mainw->multitrack==NULL) {
+  } else if (mainw->multitrack==NULL) {
     // back up audio to audio.back (in case we overwrite it)
     if (prefs->rec_opts&REC_AUDIO) {
       do_threaded_dialog(_("Backing up audio..."),FALSE);
-      com=g_strdup_printf("%s backup_audio \"%s\"",prefs->backend_sync,cfile->handle);
+      com=lives_strdup_printf("%s backup_audio \"%s\"",prefs->backend_sync,cfile->handle);
       mainw->com_failed=FALSE;
       mainw->error=FALSE;
       mainw->cancelled=CANCEL_NONE;
-      unlink (cfile->info_file);
+      unlink(cfile->info_file);
       lives_system(com,FALSE);
-      g_free(com);
+      lives_free(com);
       if (mainw->com_failed) return FALSE;
 
-    }
-    else {
+    } else {
       do_threaded_dialog(_("Clearing up clip..."),FALSE);
-      com=g_strdup_printf("%s clear_tmp_files \"%s\"",prefs->backend_sync,cfile->handle);
+      com=lives_strdup_printf("%s clear_tmp_files \"%s\"",prefs->backend_sync,cfile->handle);
       lives_system(com,FALSE);
-      g_free(com);
+      lives_free(com);
     }
     end_threaded_dialog();
   }
 
+  if (mainw->multitrack!=NULL&&mainw->multitrack->pr_audio) d_print(_("Pre-rendering audio..."));
+  else d_print(_("Rendering..."));
+
   cfile->old_frames=cfile->frames;
   cfile->changed=TRUE;
   mainw->effects_paused=FALSE;
+
   prefs->render_audio=rendaud;
 
   init_track_decoders();
 
-  if (start_render_effect_events(mainw->event_list)) { // re-render, applying effects 
+  if (start_render_effect_events(mainw->event_list)) { // re-render, applying effects
     // and reordering/resampling/resizing if necessary
 
     if (mainw->multitrack==NULL&&mainw->event_list!=NULL) {
       if (!new_clip) {
-	// this is needed in case we render to same clip, and then undo ///////
-	if (cfile->event_list_back!=NULL) event_list_free (cfile->event_list_back);
-	cfile->event_list_back=mainw->event_list;
-	///////////////////////////////////////////////////////////////////////
-      }
-      else event_list_free(mainw->event_list);
+        // this is needed in case we render to same clip, and then undo ///////
+        if (cfile->event_list_back!=NULL) event_list_free(cfile->event_list_back);
+        cfile->event_list_back=mainw->event_list;
+        ///////////////////////////////////////////////////////////////////////
+      } else event_list_free(mainw->event_list);
     }
     mainw->event_list=NULL;
     if (new_clip) {
-      gchar *tmp;
+      char *tmp;
       int old_file=current_file;
       cfile->start=1;
       cfile->end=cfile->frames;
-      set_undoable (NULL,FALSE);
+      set_undoable(NULL,FALSE);
       add_to_clipmenu();
       current_file=mainw->current_file;
       if (!save_clip_values(current_file)) {
-	close_current_file(old_file);
-	mainw->effects_paused=FALSE;
-	deinit_render_effects();
-	audio_free_fnames();
-	return FALSE;
+        close_current_file(old_file);
+        mainw->effects_paused=FALSE;
+        deinit_render_effects();
+        audio_free_fnames();
+        d_print_failed();
+        return FALSE;
       }
       if (prefs->crash_recovery) add_to_recovery_file(cfile->handle);
-      switch_to_file ((mainw->current_file=0),current_file);
-      d_print ((tmp=g_strdup_printf (_ ("rendered %d frames to new clip.\n"),cfile->frames)));
-      g_free(tmp);
+      switch_to_file((mainw->current_file=0),current_file);
+      d_print((tmp=lives_strdup_printf(_("rendered %d frames to new clip.\n"),cfile->frames)));
+      lives_free(tmp);
       mainw->pre_src_file=mainw->current_file; // if a generator started playback, we will switch back to this file after
-#ifdef ENABLE_OSC
-      lives_osc_notify(LIVES_OSC_NOTIFY_CLIP_OPENED,"");
-#endif
-    }
-    else {
+      lives_notify(LIVES_OSC_NOTIFY_CLIP_OPENED,"");
+
+    } else {
       // rendered to same clip - update number of frames
       save_clip_value(mainw->current_file,CLIP_DETAILS_FRAMES,&cfile->frames);
       if (mainw->com_failed||mainw->write_failed) do_header_write_error(mainw->current_file);
     }
 
     if (cfile->clip_type==CLIP_TYPE_FILE) {
-      if (cfile->frame_index_back!=NULL) g_free(cfile->frame_index_back);
+      if (cfile->frame_index_back!=NULL) lives_free(cfile->frame_index_back);
       cfile->frame_index_back=cfile->frame_index;
       cfile->frame_index=NULL;
 
       if (cfile->undo_start==1&&cfile->undo_end==cfile->frames) {
-	cfile->clip_type=CLIP_TYPE_DISK;
-	del_frame_index(cfile);
-      }
-      else {
-	register int i;
-	create_frame_index(mainw->current_file,FALSE,0,cfile->frames);
-	for (i=0;i<cfile->undo_start-1;i++) {
-	  cfile->frame_index[i]=cfile->frame_index_back[i];
-	}
-	for (i=cfile->undo_start-1;i<cfile->undo_end;i++) {
-	  cfile->frame_index[i]=-1;
-	}
-	for (i=cfile->undo_end;i<cfile->frames;i++) {
-	  cfile->frame_index[i]=cfile->frame_index_back[i];
-	}
-	save_frame_index(mainw->current_file);
+        cfile->clip_type=CLIP_TYPE_DISK;
+        del_frame_index(cfile);
+      } else {
+        register int i;
+        create_frame_index(mainw->current_file,FALSE,0,cfile->frames);
+        for (i=0; i<cfile->undo_start-1; i++) {
+          cfile->frame_index[i]=cfile->frame_index_back[i];
+        }
+        for (i=cfile->undo_start-1; i<cfile->undo_end; i++) {
+          cfile->frame_index[i]=-1;
+        }
+        for (i=cfile->undo_end; i<cfile->frames; i++) {
+          cfile->frame_index[i]=cfile->frame_index_back[i];
+        }
+        save_frame_index(mainw->current_file);
       }
     }
-  }
-  else {
+  } else {
     retval=FALSE; // cancelled or error, so show the dialog again
     if (new_clip&&mainw->multitrack==NULL) {
       close_current_file(current_file);
@@ -4288,11 +4321,11 @@
 
 
 LIVES_INLINE void dprint_recneg(void) {
-  d_print (_ ("nothing recorded.\n"));
+  d_print(_("nothing recorded.\n"));
 }
 
 
-boolean deal_with_render_choice (boolean add_deinit) {
+boolean deal_with_render_choice(boolean add_deinit) {
   // this is called from saveplay.c after record/playback ends
   // here we deal with the user's wishes as to how to deal with the recorded events
 
@@ -4324,16 +4357,16 @@
     event_list_free(mainw->event_list);
     mainw->event_list=NULL;
   }
-  
+
   if (mainw->event_list==NULL) {
     dprint_recneg();
     return FALSE;
   }
 
   // add deinit events for any effects that are left on
-  if (add_deinit&&!was_paused) mainw->event_list=add_filter_deinit_events (mainw->event_list);
+  if (add_deinit&&!was_paused) mainw->event_list=add_filter_deinit_events(mainw->event_list);
 
-  if (add_deinit) event_list_close_gaps (mainw->event_list);
+  if (add_deinit) event_list_close_gaps(mainw->event_list);
 
   // need to retain play_start for rendering to same clip
   oplay_start=mainw->play_start;
@@ -4341,9 +4374,9 @@
   do {
     //e_rec_dialog=events_rec_dialog(!was_paused);
     e_rec_dialog=events_rec_dialog(TRUE);
-    lives_widget_show (e_rec_dialog);
-    lives_dialog_run (LIVES_DIALOG (e_rec_dialog));
-    lives_widget_destroy (e_rec_dialog);
+    lives_widget_show(e_rec_dialog);
+    lives_dialog_run(LIVES_DIALOG(e_rec_dialog));
+    lives_widget_destroy(e_rec_dialog);
     lives_widget_context_update();
     switch (render_choice) {
     case RENDER_CHOICE_DISCARD:
@@ -4356,7 +4389,7 @@
       // preview
       cfile->next_event=get_first_event(mainw->event_list);
       mainw->is_rendering=TRUE;
-      on_preview_clicked (NULL,NULL);
+      on_preview_clicked(NULL,NULL);
       free_track_decoders();
       deinit_render_effects();
       mainw->is_processing=mainw->is_rendering=FALSE;
@@ -4371,21 +4404,21 @@
       das=prefs->mt_def_asamps;
       dse=prefs->mt_def_signed_endian;
       if (!mainw->clip_switched&&prefs->render_prompt&&mainw->current_file>-1) {
-	if (cfile->hsize>0) prefs->mt_def_width=cfile->hsize;
-	if (cfile->vsize>0) prefs->mt_def_height=cfile->vsize;
-	prefs->mt_def_fps=cfile->fps;
-	if (cfile->achans*cfile->arate*cfile->asampsize>0) {
-	  prefs->mt_def_arate=cfile->arate;
-	  prefs->mt_def_asamps=cfile->asampsize;
-	  prefs->mt_def_achans=cfile->achans;
-	  prefs->mt_def_signed_endian=cfile->signed_endian;
-	}
+        if (cfile->hsize>0) prefs->mt_def_width=cfile->hsize;
+        if (cfile->vsize>0) prefs->mt_def_height=cfile->vsize;
+        prefs->mt_def_fps=cfile->fps;
+        if (cfile->achans*cfile->arate*cfile->asampsize>0) {
+          prefs->mt_def_arate=cfile->arate;
+          prefs->mt_def_asamps=cfile->asampsize;
+          prefs->mt_def_achans=cfile->achans;
+          prefs->mt_def_signed_endian=cfile->signed_endian;
+        }
       }
       mainw->play_start=1;   ///< new clip frames always start  at 1
-      if (!render_to_clip (TRUE)) render_choice=RENDER_CHOICE_PREVIEW;
+      if (!render_to_clip(TRUE)) render_choice=RENDER_CHOICE_PREVIEW;
       else {
-	close_scrap_file();
-	close_ascrap_file();
+        close_scrap_file();
+        close_ascrap_file();
       }
       prefs->mt_def_width=dw;
       prefs->mt_def_height=dh;
@@ -4399,45 +4432,44 @@
       break;
     case RENDER_CHOICE_SAME_CLIP:
       mainw->play_start=oplay_start;  ///< same clip frames start where recording started
-      if (!render_to_clip (FALSE)) render_choice=RENDER_CHOICE_PREVIEW;
+      if (!render_to_clip(FALSE)) render_choice=RENDER_CHOICE_PREVIEW;
       else {
-	close_scrap_file();
-	close_ascrap_file();
-	d_print_done();
+        close_scrap_file();
+        close_ascrap_file();
+        d_print_done();
       }
       mainw->is_rendering=FALSE;
       break;
     case RENDER_CHOICE_MULTITRACK:
       if (mainw->stored_event_list!=NULL&&mainw->stored_event_list_changed) {
-	if (!check_for_layout_del(NULL,FALSE)) {
-	  render_choice=RENDER_CHOICE_PREVIEW;
-	  break;
-	}
+        if (!check_for_layout_del(NULL,FALSE)) {
+          render_choice=RENDER_CHOICE_PREVIEW;
+          break;
+        }
       }
       if (mainw->stored_event_list!=NULL||mainw->sl_undo_mem!=NULL) {
-	recover_layout_cancelled(FALSE);
-	stored_event_list_free_all(TRUE);
+        recover_layout_cancelled(FALSE);
+        stored_event_list_free_all(TRUE);
       }
       mainw->unordered_blocks=TRUE;
-      if (on_multitrack_activate (NULL, (weed_plant_t *)mainw->event_list)) {
-	mainw->event_list=NULL;
-	new_clip=TRUE;
-      }
-      else render_choice=RENDER_CHOICE_PREVIEW;
-     break;
+      if (on_multitrack_activate(NULL, (weed_plant_t *)mainw->event_list)) {
+        mainw->event_list=NULL;
+        new_clip=TRUE;
+      } else render_choice=RENDER_CHOICE_PREVIEW;
+      break;
     case RENDER_CHOICE_EVENT_LIST:
       if (count_events(mainw->event_list,prefs->event_window_show_frame_events,0,0)>1000) if (!do_event_list_warning()) {
-	render_choice=RENDER_CHOICE_PREVIEW;
-	break;
-      }
+          render_choice=RENDER_CHOICE_PREVIEW;
+          break;
+        }
       elist_dialog=create_event_list_dialog(mainw->event_list,0,0);
       lives_dialog_run(LIVES_DIALOG(elist_dialog));
       lives_widget_destroy(elist_dialog);
       render_choice=RENDER_CHOICE_PREVIEW;
       break;
     }
-    if 
-      (mainw->current_file>0&&mainw->files[mainw->current_file]!=NULL) {
+    if
+    (mainw->current_file>0&&mainw->files[mainw->current_file]!=NULL) {
       cfile->next_event=NULL;
     }
   } while (render_choice==RENDER_CHOICE_PREVIEW);
@@ -4453,8 +4485,8 @@
 
 
 
-double *get_track_visibility_at_tc(weed_plant_t *event_list, int ntracks, int nbtracks, 
-				    weed_timecode_t tc, weed_plant_t **shortcut, boolean bleedthru) {
+double *get_track_visibility_at_tc(weed_plant_t *event_list, int ntracks, int nbtracks,
+                                   weed_timecode_t tc, weed_plant_t **shortcut, boolean bleedthru) {
   // calculate the "visibility" of each track at timecode tc
   // that is to say, only the front track is visible, except if we have a transition and "host_audio_transition" is set
   // - in which case the track visibilty is proportional to the transition parameter
@@ -4487,10 +4519,10 @@
 
   nxtracks=weed_leaf_num_elements(frame_event,"clips");
 
-  vis=(double *)g_malloc(ntracks*sizeof(double));
+  vis=(double *)lives_malloc(ntracks*sizeof(double));
 
   if (bleedthru) {
-    for (i=0;i<ntracks;i++) {
+    for (i=0; i<ntracks; i++) {
       vis[i]=1.;
     }
     return vis;
@@ -4507,9 +4539,9 @@
     if (fmap==*shortcut) fmap=stored_fmap;
   }
 
-  for (i=0;i<ntracks;i++) {
-    matrix[i]=(double *)g_malloc(ntracks*sizeof(double));
-    for (j=0;j<ntracks;j++) {
+  for (i=0; i<ntracks; i++) {
+    matrix[i]=(double *)lives_malloc(ntracks*sizeof(double));
+    for (j=0; j<ntracks; j++) {
       matrix[i][j]=0.;
     }
     matrix[i][i]=1.;
@@ -4526,85 +4558,84 @@
     if (weed_plant_has_leaf(fmap,"init_events")) {
       weed_plant_t **iev=(weed_plant_t **)weed_get_voidptr_array(fmap,"init_events",&error);
       int nins=weed_leaf_num_elements(fmap,"init_events");
-      for (i=0;i<nins;i++) {
-	weed_plant_t *ievent=iev[i];
-	if (weed_plant_has_leaf(ievent,"host_audio_transition")&&
-	    weed_get_boolean_value(ievent,"host_audio_transition",&error)==WEED_TRUE) {
-	  int *in_tracks=weed_get_int_array(ievent,"in_tracks",&error);
-	  int *out_tracks=weed_get_int_array(ievent,"out_tracks",&error);
-	  gchar *filter_hash=weed_get_string_value(ievent,"filter",&error);
-	  int idx;
-	  if ((idx=weed_get_idx_for_hashname(filter_hash,TRUE))!=-1) {
-	    weed_plant_t *filter=get_weed_filter(idx);
-	    int tparam=get_transition_param(filter,FALSE);
-	    weed_plant_t *inst=weed_instance_from_filter(filter);
-	    weed_plant_t **in_params=weed_get_plantptr_array(inst,"in_parameters",&error);
-	    weed_plant_t *ttmpl=weed_get_plantptr_value(in_params[tparam],"template",&error);
-	    double trans;
-
-	    if (weed_plant_has_leaf(ievent,"in_parameters")&&tparam<weed_leaf_num_elements(ievent,"in_parameters")) {
-	      void **pchains=weed_get_voidptr_array(ievent,"in_parameters",&error);
-	      interpolate_param(inst,tparam,pchains[tparam],tc);
-	      weed_free(pchains);
-	    }
-
-	    if (weed_leaf_seed_type(in_params[tparam],"value")==WEED_SEED_DOUBLE) {
-	      double transd=weed_get_double_value(in_params[tparam],"value",&error);
-	      double tmin=weed_get_double_value(ttmpl,"min",&error);
-	      double tmax=weed_get_double_value(ttmpl,"max",&error);
-	      trans=(transd-tmin)/(tmax-tmin);
-	    }
-	    else {
-	      int transi=weed_get_int_value(in_params[tparam],"value",&error);
-	      int tmin=weed_get_int_value(ttmpl,"min",&error);
-	      int tmax=weed_get_int_value(ttmpl,"max",&error);
-	      trans=(double)(transi-tmin)/(double)(tmax-tmin);
-	    }
-	    weed_free(in_params);
-	    for (j=0;j<ntracks;j++) {
-	      matrix[in_tracks[1]+nbtracks][j]*=trans;
-	      matrix[in_tracks[0]+nbtracks][j]*=(1.-trans);
-	      matrix[out_tracks[0]+nbtracks][j]=matrix[in_tracks[0]+nbtracks][j]+matrix[in_tracks[1]+nbtracks][j];
-	    }
-	    weed_plant_free(inst);
-	  }
-	  weed_free(in_tracks);
-	  weed_free(out_tracks);
-	  weed_free(filter_hash);
-	}
+      for (i=0; i<nins; i++) {
+        weed_plant_t *ievent=iev[i];
+        if (weed_plant_has_leaf(ievent,"host_audio_transition")&&
+            weed_get_boolean_value(ievent,"host_audio_transition",&error)==WEED_TRUE) {
+          int *in_tracks=weed_get_int_array(ievent,"in_tracks",&error);
+          int *out_tracks=weed_get_int_array(ievent,"out_tracks",&error);
+          char *filter_hash=weed_get_string_value(ievent,"filter",&error);
+          int idx;
+          if ((idx=weed_get_idx_for_hashname(filter_hash,TRUE))!=-1) {
+            weed_plant_t *filter=get_weed_filter(idx);
+            int tparam=get_transition_param(filter,FALSE);
+            weed_plant_t *inst=weed_instance_from_filter(filter);
+            weed_plant_t **in_params=weed_get_plantptr_array(inst,"in_parameters",&error);
+            weed_plant_t *ttmpl=weed_get_plantptr_value(in_params[tparam],"template",&error);
+            double trans;
+
+            if (weed_plant_has_leaf(ievent,"in_parameters")&&tparam<weed_leaf_num_elements(ievent,"in_parameters")) {
+              void **pchains=weed_get_voidptr_array(ievent,"in_parameters",&error);
+              interpolate_param(inst,tparam,pchains[tparam],tc);
+              lives_free(pchains);
+            }
+
+            if (weed_leaf_seed_type(in_params[tparam],"value")==WEED_SEED_DOUBLE) {
+              double transd=weed_get_double_value(in_params[tparam],"value",&error);
+              double tmin=weed_get_double_value(ttmpl,"min",&error);
+              double tmax=weed_get_double_value(ttmpl,"max",&error);
+              trans=(transd-tmin)/(tmax-tmin);
+            } else {
+              int transi=weed_get_int_value(in_params[tparam],"value",&error);
+              int tmin=weed_get_int_value(ttmpl,"min",&error);
+              int tmax=weed_get_int_value(ttmpl,"max",&error);
+              trans=(double)(transi-tmin)/(double)(tmax-tmin);
+            }
+            lives_free(in_params);
+            for (j=0; j<ntracks; j++) {
+              matrix[in_tracks[1]+nbtracks][j]*=trans;
+              matrix[in_tracks[0]+nbtracks][j]*=(1.-trans);
+              matrix[out_tracks[0]+nbtracks][j]=matrix[in_tracks[0]+nbtracks][j]+matrix[in_tracks[1]+nbtracks][j];
+            }
+            weed_plant_free(inst);
+          }
+          lives_free(in_tracks);
+          lives_free(out_tracks);
+          lives_free(filter_hash);
+        }
       }
-      weed_free(iev);
+      lives_free(iev);
     }
   }
-  
+
 
   // now we select as visibility, whichever row is the first layer to have a non-blank frame
 
-  for (i=0;i<nxtracks;i++) {
+  for (i=0; i<nxtracks; i++) {
     if (clips[i]>=0&&frames[i]>0) {
       got=i+nbtracks;
       break;
     }
   }
 
-  weed_free(clips);
-  weed_free(frames);
+  lives_free(clips);
+  lives_free(frames);
 
   if (got==-1) {
     // all frames blank - backing audio only
-    for (i=0;i<ntracks;i++) {
+    for (i=0; i<ntracks; i++) {
       if (i>=nbtracks) vis[i]=0.;
-      g_free(matrix[i]);
+      lives_free(matrix[i]);
     }
     return vis;
   }
 
-  for (i=nbtracks;i<ntracks;i++) {
+  for (i=nbtracks; i<ntracks; i++) {
     vis[i]=matrix[got][i];
   }
 
-  for (i=0;i<ntracks;i++) {
-    g_free(matrix[i]);
+  for (i=0; i<ntracks; i++) {
+    lives_free(matrix[i]);
   }
 
   return vis;
@@ -4628,17 +4659,21 @@
 
 
 
-LiVESWidget *create_event_list_dialog (weed_plant_t *event_list, weed_timecode_t start_tc, weed_timecode_t end_tc) {
+LiVESWidget *create_event_list_dialog(weed_plant_t *event_list, weed_timecode_t start_tc, weed_timecode_t end_tc) {
   // TODO - some event properties should be editable, e.g. parameter values
   weed_timecode_t tc,tc_secs;
 
   LiVESTreeStore *treestore;
   LiVESTreeIter iter1,iter2,iter3;
 
-  gchar **string=NULL;
+  char **string=NULL
+                ;
   int *intval=NULL;
+
   void **voidval=NULL;
+
   double *doubval=NULL;
+
   int64_t *int64val=NULL;
 
   weed_plant_t *event;
@@ -4659,9 +4694,11 @@
 
   char **propnames;
 
-  gchar *strval=NULL;
-  gchar *text;
-  gchar *oldval=NULL,*final=NULL;
+  char *strval=NULL;
+  char *text;
+  char *oldval=NULL,*final=NULL;
+
+  boolean woat=widget_opts.apply_theme;
 
   int winsize_h,scr_width=mainw->scr_width;
   int winsize_v,scr_height=mainw->scr_height;
@@ -4681,306 +4718,307 @@
     scr_height=mainw->mgeom[prefs->gui_monitor-1].height;
   }
 
-  winsize_h=scr_width-100;
-  winsize_v=scr_height-180;
- 
-  event_dialog = lives_standard_dialog_new (_("LiVES: Event list"),FALSE);
+  winsize_h=scr_width-SCR_WIDTH_SAFETY;
+  winsize_v=scr_height-SCR_HEIGHT_SAFETY;
 
-  accel_group = LIVES_ACCEL_GROUP(lives_accel_group_new ());
-  lives_window_add_accel_group (LIVES_WINDOW (event_dialog), accel_group);
+  event_dialog = lives_standard_dialog_new(_("LiVES: Event list"),FALSE,winsize_h,winsize_v);
+
+  accel_group = LIVES_ACCEL_GROUP(lives_accel_group_new());
+  lives_window_add_accel_group(LIVES_WINDOW(event_dialog), accel_group);
 
   top_vbox=lives_dialog_get_content_area(LIVES_DIALOG(event_dialog));
 
-  table = lives_table_new (rows, 6, TRUE);
-  lives_widget_show (table);
+  table = lives_table_new(rows, 6, TRUE);
+  lives_widget_show(table);
 
   while (event!=NULL) {
-    tc=get_event_timecode (event);
+    tc=get_event_timecode(event);
 
     if (end_tc>0) {
       if (tc<start_tc) {
-	event=get_next_event(event);
-	continue;
+        event=get_next_event(event);
+        continue;
       }
       if (tc>=end_tc) break;
     }
 
-    if ((prefs->event_window_show_frame_events||!WEED_EVENT_IS_FRAME(event))||weed_plant_has_leaf(event,"audio_clips")) {
+    if ((prefs->event_window_show_frame_events||!WEED_EVENT_IS_FRAME(event))||WEED_EVENT_IS_AUDIO_FRAME(event)) {
       if (!prefs->event_window_show_frame_events&&WEED_EVENT_IS_FRAME(event)) {
-	// TODO - opts should be all frames, only audio frames, no frames
-	// or even better, filter for any event types
-	rows++;
-	lives_table_resize(LIVES_TABLE(table),rows,6);
-      }
-			
-      treestore = lives_tree_store_new (NUM_COLUMNS, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
-
-      lives_tree_store_append (treestore, &iter1, NULL);  /* Acquire an iterator */
-      lives_tree_store_set (treestore, &iter1, TITLE_COLUMN, "Properties", -1);
-
-      propnames=weed_plant_list_leaves (event);
-   
-      for (i=0;propnames[i]!=NULL;i++) {
-	if (!strcmp(propnames[i],"type")||!strcmp(propnames[i],"hint")||!strcmp(propnames[i],"timecode")) {
-	  weed_free(propnames[i]);
-	  continue;
-	}
-	lives_tree_store_append (treestore, &iter2, &iter1);  /* Acquire a child iterator */
-       
-	if (oldval!=NULL) {
-	  g_free(oldval);
-	  oldval=NULL;
-	}
-       
-	if (final!=NULL) {
-	  g_free(final);
-	  final=NULL;
-	}
-       
-	num_elems=weed_leaf_num_elements (event,propnames[i]);
-	seed_type=weed_leaf_seed_type (event,propnames[i]);
-       
-	switch (seed_type) {
-	case WEED_SEED_INT:
-	  intval=weed_get_int_array (event,propnames[i],&error);
-	  break;
-	case WEED_SEED_INT64:
-	  int64val=weed_get_int64_array (event,propnames[i],&error);
-	  break;
-	case WEED_SEED_BOOLEAN:
-	  intval=weed_get_boolean_array (event,propnames[i],&error);
-	  break;
-	case WEED_SEED_STRING:
-	  string=weed_get_string_array (event,propnames[i],&error);
-	  break;
-	case WEED_SEED_DOUBLE:
-	  doubval=weed_get_double_array (event,propnames[i],&error);
-	  break;
-	case WEED_SEED_VOIDPTR:
-	  voidval=weed_get_voidptr_array (event,propnames[i],&error);
-	  break;
-	case WEED_SEED_PLANTPTR:
-	  voidval=(void **)weed_get_plantptr_array (event,propnames[i],&error);
-	  break;
-	}
-       
-       
-	for (j=0;j<num_elems;j++) {
-	  switch (seed_type) {
-	  case WEED_SEED_INT:
-	    strval=g_strdup_printf("%d",intval[j]);
-	    break;
-	  case WEED_SEED_INT64:
-	    strval=g_strdup_printf("%"PRId64,int64val[j]);
-	    break;
-	  case WEED_SEED_DOUBLE:
-	    strval=g_strdup_printf("%.4f",doubval[j]);
-	    break;
-	  case WEED_SEED_BOOLEAN:
-	    if (intval[j]==WEED_TRUE) strval=g_strdup(_("TRUE"));
-	    else strval=g_strdup(_("FALSE"));
-	    break;
-	  case WEED_SEED_STRING:
-	    strval=g_strdup(string[j]);
-	    weed_free(string[j]);
-	    break;
-	  case WEED_SEED_VOIDPTR:
-	    if (!(strncmp(propnames[i],"init_event",10))) {
-	      weed_plant_t *ievent=(weed_plant_t *)voidval[j];
-	      if (ievent!=NULL) {
-		gchar *iname=weed_get_string_value(ievent,"filter",&error);
-		if (iname!=NULL) {
-		  gchar *fname=weed_filter_idx_get_name(weed_get_idx_for_hashname(iname,TRUE));
-		  strval=g_strdup_printf("%p (%s)",voidval[j],fname);
-		  weed_free(fname);
-		}
-		weed_free(iname);
-	      }
-	    }
-	    if (strval==NULL) strval=g_strdup_printf("%p",voidval[j]);
-	    break;
-	  case WEED_SEED_PLANTPTR:
-	    strval=g_strdup_printf("-->%p",voidval[j]);
-	    break;
-	  default:
-	    strval=g_strdup("???");
-	    break;
-	  }
-	  if (j==0) {
-	    if (num_elems==1) {
-	      lives_tree_store_set (treestore, &iter2, KEY_COLUMN, propnames[i], VALUE_COLUMN, strval, -1);
-	    }
-	    else {
-	      lives_tree_store_set (treestore, &iter2, KEY_COLUMN, propnames[i], VALUE_COLUMN, "", -1);
-	      lives_tree_store_append (treestore, &iter3, &iter2);
-	      lives_tree_store_set (treestore, &iter3, VALUE_COLUMN, strval, -1);
-	    }
-	  }
-	  else {
-	    lives_tree_store_append (treestore, &iter3, &iter2);
-	    lives_tree_store_set (treestore, &iter3, VALUE_COLUMN, strval, -1);
-	  }
-	  if (strval!=NULL) g_free (strval);
-	  strval=NULL;
-	}
-
-	switch (seed_type) {
-	case WEED_SEED_INT:
-	case WEED_SEED_BOOLEAN:
-	  weed_free(intval);
-	  break;
-	case WEED_SEED_INT64:
-	  weed_free(int64val);
-	  break;
-	case WEED_SEED_DOUBLE:
-	  weed_free(doubval);
-	  break;
-	case WEED_SEED_STRING:
-	  weed_free(string);
-	  break;
-	case WEED_SEED_VOIDPTR:
-	case WEED_SEED_PLANTPTR:
-	  weed_free(voidval);
-	  break;
-	default:
-	  break;
-	}
-	weed_free(propnames[i]);
+        // TODO - opts should be all frames, only audio frames, no frames
+        // or even better, filter for any event types
+        rows++;
+        lives_table_resize(LIVES_TABLE(table),rows,6);
+      }
+
+      treestore = lives_tree_store_new(NUM_COLUMNS, LIVES_COL_TYPE_STRING, LIVES_COL_TYPE_STRING, LIVES_COL_TYPE_STRING);
+
+      lives_tree_store_append(treestore, &iter1, NULL);   /* Acquire an iterator */
+      lives_tree_store_set(treestore, &iter1, TITLE_COLUMN, "Properties", -1);
+
+      propnames=weed_plant_list_leaves(event);
+
+      for (i=0; propnames[i]!=NULL; i++) {
+        if (!strcmp(propnames[i],"type")||!strcmp(propnames[i],"hint")||!strcmp(propnames[i],"timecode")) {
+          lives_free(propnames[i]);
+          continue;
+        }
+        lives_tree_store_append(treestore, &iter2, &iter1);   /* Acquire a child iterator */
+
+        if (oldval!=NULL) {
+          lives_free(oldval);
+          oldval=NULL;
+        }
+
+        if (final!=NULL) {
+          lives_free(final);
+          final=NULL;
+        }
+
+        num_elems=weed_leaf_num_elements(event,propnames[i]);
+        seed_type=weed_leaf_seed_type(event,propnames[i]);
+
+        switch (seed_type) {
+        case WEED_SEED_INT:
+          intval=weed_get_int_array(event,propnames[i],&error);
+          break;
+        case WEED_SEED_INT64:
+          int64val=weed_get_int64_array(event,propnames[i],&error);
+          break;
+        case WEED_SEED_BOOLEAN:
+          intval=weed_get_boolean_array(event,propnames[i],&error);
+          break;
+        case WEED_SEED_STRING:
+          string=weed_get_string_array(event,propnames[i],&error);
+          break;
+        case WEED_SEED_DOUBLE:
+          doubval=weed_get_double_array(event,propnames[i],&error);
+          break;
+        case WEED_SEED_VOIDPTR:
+          voidval=weed_get_voidptr_array(event,propnames[i],&error);
+          break;
+        case WEED_SEED_PLANTPTR:
+          voidval=(void **)weed_get_plantptr_array(event,propnames[i],&error);
+          break;
+        }
+
+
+        for (j=0; j<num_elems; j++) {
+          switch (seed_type) {
+          case WEED_SEED_INT:
+            strval=lives_strdup_printf("%d",intval[j]);
+            break;
+          case WEED_SEED_INT64:
+            strval=lives_strdup_printf("%"PRId64,int64val[j]);
+            break;
+          case WEED_SEED_DOUBLE:
+            strval=lives_strdup_printf("%.4f",doubval[j]);
+            break;
+          case WEED_SEED_BOOLEAN:
+            if (intval[j]==WEED_TRUE) strval=lives_strdup(_("TRUE"));
+            else strval=lives_strdup(_("FALSE"));
+            break;
+          case WEED_SEED_STRING:
+            strval=lives_strdup(string[j]);
+            lives_free(string[j]);
+            break;
+          case WEED_SEED_VOIDPTR:
+            if (!(strncmp(propnames[i],"init_event",10))) {
+              weed_plant_t *ievent=(weed_plant_t *)voidval[j];
+              if (ievent!=NULL) {
+                char *iname=weed_get_string_value(ievent,"filter",&error);
+                if (iname!=NULL) {
+                  char *fname=weed_filter_idx_get_name(weed_get_idx_for_hashname(iname,TRUE));
+                  strval=lives_strdup_printf("%p (%s)",voidval[j],fname);
+                  lives_free(fname);
+                }
+                lives_free(iname);
+              }
+            }
+            if (strval==NULL) strval=lives_strdup_printf("%p",voidval[j]);
+            break;
+          case WEED_SEED_PLANTPTR:
+            strval=lives_strdup_printf("-->%p",voidval[j]);
+            break;
+          default:
+            strval=lives_strdup("???");
+            break;
+          }
+          if (j==0) {
+            if (num_elems==1) {
+              lives_tree_store_set(treestore, &iter2, KEY_COLUMN, propnames[i], VALUE_COLUMN, strval, -1);
+            } else {
+              lives_tree_store_set(treestore, &iter2, KEY_COLUMN, propnames[i], VALUE_COLUMN, "", -1);
+              lives_tree_store_append(treestore, &iter3, &iter2);
+              lives_tree_store_set(treestore, &iter3, VALUE_COLUMN, strval, -1);
+            }
+          } else {
+            lives_tree_store_append(treestore, &iter3, &iter2);
+            lives_tree_store_set(treestore, &iter3, VALUE_COLUMN, strval, -1);
+          }
+          if (strval!=NULL) lives_free(strval);
+          strval=NULL;
+        }
+
+        switch (seed_type) {
+        case WEED_SEED_INT:
+        case WEED_SEED_BOOLEAN:
+          lives_free(intval);
+          break;
+        case WEED_SEED_INT64:
+          lives_free(int64val);
+          break;
+        case WEED_SEED_DOUBLE:
+          lives_free(doubval);
+          break;
+        case WEED_SEED_STRING:
+          lives_free(string);
+          break;
+        case WEED_SEED_VOIDPTR:
+        case WEED_SEED_PLANTPTR:
+          lives_free(voidval);
+          break;
+        default:
+          break;
+        }
+        lives_free(propnames[i]);
       }
 
-      weed_free (propnames);
+      lives_free(propnames);
 
       // now add the new treeview
-     
-      g_free(final);
+
+      lives_free(final);
 
       // timecode
       tc_secs=tc/U_SECL;
       tc-=tc_secs*U_SECL;
-      text=g_strdup_printf(_("Timecode=%"PRId64".%"PRId64),tc_secs,tc);
-      label = lives_standard_label_new (text);
-      g_free(text);
-     
-      lives_table_attach (LIVES_TABLE (table), label, 0, 1, currow, currow+1,
-			(LiVESAttachOptions) (LIVES_EXPAND),
-			(LiVESAttachOptions) (0), 0, 0);
-     
+      text=lives_strdup_printf(_("Timecode=%"PRId64".%"PRId64),tc_secs,tc);
+      label = lives_standard_label_new(text);
+      lives_free(text);
+
+      lives_table_attach(LIVES_TABLE(table), label, 0, 1, currow, currow+1,
+                         (LiVESAttachOptions)(LIVES_EXPAND),
+                         (LiVESAttachOptions)(0), 0, 0);
+
       // event type
-      hint=get_event_hint (event);
+      hint=get_event_hint(event);
       switch (hint) {
       case WEED_EVENT_HINT_FRAME:
-	label = lives_standard_label_new ("Frame");
-	break;
+        label = lives_standard_label_new("Frame");
+        break;
       case WEED_EVENT_HINT_FILTER_INIT:
-	label = lives_standard_label_new ("Filter on");
-	break;
+        label = lives_standard_label_new("Filter on");
+        break;
       case WEED_EVENT_HINT_FILTER_DEINIT:
-	label = lives_standard_label_new ("Filter off");
-	break;
+        label = lives_standard_label_new("Filter off");
+        break;
       case WEED_EVENT_HINT_PARAM_CHANGE:
-	label = lives_standard_label_new ("Parameter change");
-	break;
+        label = lives_standard_label_new("Parameter change");
+        break;
       case WEED_EVENT_HINT_FILTER_MAP:
-	label = lives_standard_label_new ("Filter map");
-	break;
+        label = lives_standard_label_new("Filter map");
+        break;
       case WEED_EVENT_HINT_MARKER:
-	label = lives_standard_label_new ("Marker");
-	break;
+        label = lives_standard_label_new("Marker");
+        break;
       default:
-	text=g_strdup_printf("unknown event hint %d",hint);
-	label = lives_standard_label_new (text);
-	g_free(text);
+        text=lives_strdup_printf("unknown event hint %d",hint);
+        label = lives_standard_label_new(text);
+        lives_free(text);
       }
 
-      lives_table_attach (LIVES_TABLE (table), label, 1, 2, currow, currow+1,
-			(LiVESAttachOptions) (LIVES_EXPAND),
-			(LiVESAttachOptions) (0), 0, 0);
-     
+      lives_table_attach(LIVES_TABLE(table), label, 1, 2, currow, currow+1,
+                         (LiVESAttachOptions)(LIVES_EXPAND),
+                         (LiVESAttachOptions)(0), 0, 0);
+
       // event id
-      text=g_strdup_printf(("Event id=%p"),(void *)event);
-      label = lives_standard_label_new (text);
-      g_free(text);
-
-      lives_table_attach (LIVES_TABLE (table), label, 2, 3, currow, currow+1,
-			(LiVESAttachOptions) (LIVES_EXPAND),
-			(LiVESAttachOptions) (0), 0, 0);
-     
+      text=lives_strdup_printf(_("Event id=%p"),(void *)event);
+      label = lives_standard_label_new(text);
+      lives_free(text);
+
+      lives_table_attach(LIVES_TABLE(table), label, 2, 3, currow, currow+1,
+                         (LiVESAttachOptions)(LIVES_EXPAND),
+                         (LiVESAttachOptions)(0), 0, 0);
+
       // properties
-      tree = lives_tree_view_new_with_model (LIVES_TREE_MODEL (treestore));
+      tree = lives_tree_view_new_with_model(LIVES_TREE_MODEL(treestore));
       if (palette->style&STYLE_1) {
-	lives_widget_set_base_color(tree, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
-	lives_widget_set_text_color(tree, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars_fore);
+        lives_widget_set_base_color(tree, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
+        lives_widget_set_text_color(tree, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars_fore);
       }
 
-      renderer = lives_cell_renderer_text_new ();
-      column = lives_tree_view_column_new_with_attributes (NULL,
-							 renderer,
-							 "text", TITLE_COLUMN,
-							 NULL);
-
-      lives_tree_view_append_column (LIVES_TREE_VIEW (tree), column);
-     
-      renderer = lives_cell_renderer_text_new ();
-      column = lives_tree_view_column_new_with_attributes ("Keys",
-							 renderer,
-							 "text", KEY_COLUMN,
-							 NULL);
-      lives_tree_view_append_column (LIVES_TREE_VIEW (tree), column);
-     
-     
-      renderer = lives_cell_renderer_text_new ();
-      column = lives_tree_view_column_new_with_attributes ("Values",
-							 renderer,
-							 "text", VALUE_COLUMN,
-							 NULL);
-      lives_tree_view_append_column (LIVES_TREE_VIEW (tree), column);
-     
-      lives_table_attach (LIVES_TABLE (table), tree, 3, 6, currow, currow+1,
-			(LiVESAttachOptions) (LIVES_FILL|LIVES_EXPAND),
-			(LiVESAttachOptions) (0), 0, 0);
-     
+      renderer = lives_cell_renderer_text_new();
+      column = lives_tree_view_column_new_with_attributes(NULL,
+               renderer,
+               "text", TITLE_COLUMN,
+               NULL);
+
+      lives_tree_view_append_column(LIVES_TREE_VIEW(tree), column);
+
+      renderer = lives_cell_renderer_text_new();
+      column = lives_tree_view_column_new_with_attributes("Keys",
+               renderer,
+               "text", KEY_COLUMN,
+               NULL);
+      lives_tree_view_append_column(LIVES_TREE_VIEW(tree), column);
+
+
+      renderer = lives_cell_renderer_text_new();
+      column = lives_tree_view_column_new_with_attributes("Values",
+               renderer,
+               "text", VALUE_COLUMN,
+               NULL);
+      lives_tree_view_append_column(LIVES_TREE_VIEW(tree), column);
+
+      lives_table_attach(LIVES_TABLE(table), tree, 3, 6, currow, currow+1,
+                         (LiVESAttachOptions)(LIVES_FILL|LIVES_EXPAND),
+                         (LiVESAttachOptions)(LIVES_FILL|LIVES_EXPAND), 0, 0);
+
       currow++;
     }
     event=get_next_event(event);
   }
 
-  scrolledwindow = lives_standard_scrolled_window_new (winsize_h, winsize_v, table);
-  lives_box_pack_start (LIVES_BOX (top_vbox), scrolledwindow, TRUE, TRUE, 0);
+  widget_opts.apply_theme=FALSE;
+  scrolledwindow = lives_standard_scrolled_window_new(winsize_h, winsize_v, table);
+  widget_opts.apply_theme=woat;
 
-  hbuttonbox = lives_hbutton_box_new ();
-  lives_widget_show (hbuttonbox);
+  lives_box_pack_start(LIVES_BOX(top_vbox), scrolledwindow, TRUE, TRUE, widget_opts.packing_height);
 
-  lives_box_pack_start (LIVES_BOX (top_vbox), hbuttonbox, TRUE, TRUE, 0);
+  hbuttonbox = lives_hbutton_box_new();
+  lives_widget_show(hbuttonbox);
 
-  lives_button_box_set_layout (LIVES_BUTTON_BOX (hbuttonbox), LIVES_BUTTONBOX_SPREAD);
+  lives_box_pack_start(LIVES_BOX(top_vbox), hbuttonbox, FALSE, TRUE, widget_opts.packing_height);
 
-  ok_button = lives_button_new_with_mnemonic (_("Close _window"));
-  lives_widget_show (ok_button);
-  lives_container_add (LIVES_CONTAINER (hbuttonbox), ok_button);
+  lives_button_box_set_layout(LIVES_BUTTON_BOX(hbuttonbox), LIVES_BUTTONBOX_SPREAD);
 
-  lives_button_box_set_button_width (LIVES_BUTTON_BOX (hbuttonbox), ok_button, DEF_BUTTON_WIDTH*4);
+  ok_button = lives_button_new_with_mnemonic(_("Close _window"));
+  lives_widget_show(ok_button);
+  lives_container_add(LIVES_CONTAINER(hbuttonbox), ok_button);
 
-  lives_widget_set_can_focus_and_default (ok_button);
-  lives_widget_grab_default (ok_button);
- 
-  lives_signal_connect (LIVES_GUI_OBJECT (ok_button), LIVES_WIDGET_CLICKED_EVENT,
-		    LIVES_GUI_CALLBACK (response_ok),
-		    NULL);
+  lives_button_box_set_button_width(LIVES_BUTTON_BOX(hbuttonbox), ok_button, DEF_BUTTON_WIDTH*4);
 
-  lives_widget_add_accelerator (ok_button, LIVES_WIDGET_CLICKED_EVENT, accel_group,
-			      LIVES_KEY_Escape,  (LiVESXModifierType)0, (LiVESAccelFlags)0);
+  lives_widget_set_can_focus_and_default(ok_button);
+  lives_widget_grab_default(ok_button);
+
+  lives_signal_connect(LIVES_GUI_OBJECT(ok_button), LIVES_WIDGET_CLICKED_SIGNAL,
+                       LIVES_GUI_CALLBACK(response_ok),
+                       NULL);
+
+  lives_widget_add_accelerator(ok_button, LIVES_WIDGET_CLICKED_SIGNAL, accel_group,
+                               LIVES_KEY_Escape, (LiVESXModifierType)0, (LiVESAccelFlags)0);
 
   if (prefs->gui_monitor!=0) {
     int xcen=mainw->mgeom[prefs->gui_monitor-1].x+
-      (mainw->mgeom[prefs->gui_monitor-1].width-lives_widget_get_allocation_width(event_dialog))/2;
+             (mainw->mgeom[prefs->gui_monitor-1].width-lives_widget_get_allocation_width(event_dialog))/2;
     int ycen=mainw->mgeom[prefs->gui_monitor-1].y+
-      (mainw->mgeom[prefs->gui_monitor-1].height-lives_widget_get_allocation_height(event_dialog))/2;
+             (mainw->mgeom[prefs->gui_monitor-1].height-lives_widget_get_allocation_height(event_dialog))/2;
     lives_window_set_screen(LIVES_WINDOW(event_dialog),mainw->mgeom[prefs->gui_monitor-1].screen);
     lives_window_move(LIVES_WINDOW(event_dialog),xcen,ycen);
   }
 
   if (prefs->open_maximised) {
-    lives_window_maximize (LIVES_WINDOW(event_dialog));
+    lives_window_maximize(LIVES_WINDOW(event_dialog));
   }
 
   lives_widget_show_all(event_dialog);
@@ -4990,26 +5028,26 @@
 
 
 
-void rdetw_spinh_changed (LiVESSpinButton *spinbutton, gpointer user_data) {
+void rdetw_spinh_changed(LiVESSpinButton *spinbutton, livespointer user_data) {
   render_details *rdet=(render_details *)user_data;
   rdet->height=lives_spin_button_get_value_as_int(LIVES_SPIN_BUTTON(spinbutton));
 }
 
 
-void rdetw_spinw_changed (LiVESSpinButton *spinbutton, gpointer user_data) {
+void rdetw_spinw_changed(LiVESSpinButton *spinbutton, livespointer user_data) {
   render_details *rdet=(render_details *)user_data;
   rdet->width=lives_spin_button_get_value_as_int(LIVES_SPIN_BUTTON(spinbutton));
 }
 
 
-void rdetw_spinf_changed (LiVESSpinButton *spinbutton, gpointer user_data) {
+void rdetw_spinf_changed(LiVESSpinButton *spinbutton, livespointer user_data) {
   render_details *rdet=(render_details *)user_data;
   rdet->fps=lives_spin_button_get_value(LIVES_SPIN_BUTTON(spinbutton));
 }
 
 
 
-render_details *create_render_details (int type) {
+render_details *create_render_details(int type) {
 
   // type == 1 :: pre-save (specified)
   // type == 2 :: render to new clip (!specified)
@@ -5031,18 +5069,21 @@
 
   LiVESAccelGroup *rdet_accel_group;
 
-  GList *ofmt_all=NULL;
-  GList *ofmt=NULL;
-  GList *encoders=NULL;
+  LiVESList *ofmt_all=NULL;
+  LiVESList *ofmt=NULL;
+  LiVESList *encoders=NULL;
 
-  gchar **array;
+  char **array;
 
-  gchar *tmp,*tmp2;
-  gchar *title;
+  char *tmp,*tmp2;
+  char *title;
 
   boolean specified=FALSE;
   boolean needs_new_encoder=FALSE;
 
+  int width;
+  int height;
+
   int scrw,scrh;
   int dbw;
 
@@ -5050,7 +5091,7 @@
 
   if (type==1) specified=TRUE;
 
-  rdet=(render_details *)g_malloc(sizeof(render_details));
+  rdet=(render_details *)lives_malloc(sizeof(render_details));
 
   rdet->is_encoding=FALSE;
 
@@ -5064,8 +5105,7 @@
     rdet->achans=prefs->mt_def_achans;
     rdet->asamps=prefs->mt_def_asamps;
     rdet->aendian=prefs->mt_def_signed_endian;
-  }
-  else {
+  } else {
     rdet->height=cfile->vsize;
     rdet->width=cfile->hsize;
     rdet->fps=cfile->fps;
@@ -5079,76 +5119,78 @@
 
   rdet->enc_changed=FALSE;
 
-  if (type==3||type==4) title=g_strdup(_("LiVES: Multitrack details"));
-  else if (type==1) title=g_strdup(_("LiVES: Encoding details"));
-  else title=g_strdup(_("LiVES: New clip details"));
-
-  rdet->dialog = lives_standard_dialog_new (title,FALSE);
-
-  g_free(title);
-
-  if (prefs->show_gui&&mainw->is_ready) lives_window_set_transient_for(LIVES_WINDOW(rdet->dialog),LIVES_WINDOW(mainw->LiVES));
-
-  rdet_accel_group = LIVES_ACCEL_GROUP(lives_accel_group_new ());
-  lives_window_add_accel_group (LIVES_WINDOW (rdet->dialog), rdet_accel_group);
-
-  dialog_vbox = lives_dialog_get_content_area(LIVES_DIALOG(rdet->dialog));
-
   if (prefs->gui_monitor!=0) {
     scrw=mainw->mgeom[prefs->gui_monitor-1].width;
     scrh=mainw->mgeom[prefs->gui_monitor-1].height;
-  }
-  else {
+  } else {
     scrw=mainw->scr_width;
     scrh=mainw->scr_height;
   }
 
-  top_vbox = lives_vbox_new (FALSE, 0);
 
+  if (type==3||type==4) {
+    title=lives_strdup(_("LiVES: Multitrack details"));
+  } else if (type==1) title=lives_strdup(_("LiVES: Encoding details"));
+  else title=lives_strdup(_("LiVES: New clip details"));
+
+  height=scrh-SCR_HEIGHT_SAFETY;
+  width=scrw-SCR_WIDTH_SAFETY;
+
+  rdet->dialog = lives_standard_dialog_new(title,FALSE,width,height);
+
+  lives_free(title);
+
+  if (prefs->show_gui&&mainw->is_ready) lives_window_set_transient_for(LIVES_WINDOW(rdet->dialog),LIVES_WINDOW(mainw->LiVES));
+
+  rdet_accel_group = LIVES_ACCEL_GROUP(lives_accel_group_new());
+  lives_window_add_accel_group(LIVES_WINDOW(rdet->dialog), rdet_accel_group);
+
+  dialog_vbox = lives_dialog_get_content_area(LIVES_DIALOG(rdet->dialog));
+
+  top_vbox = lives_vbox_new(FALSE, 0);
 
   if (!specified) {
     dbw=widget_opts.border_width;
     widget_opts.border_width=0;
-    scrollw = lives_standard_scrolled_window_new (scrw*.8, scrh*.75, top_vbox);
+    scrollw = lives_standard_scrolled_window_new(scrw*.8, scrh*.75, top_vbox);
     widget_opts.border_width=dbw;
-  }
-  else 
-    scrollw = lives_standard_scrolled_window_new (scrw*.35, scrh*.4, top_vbox);
+  } else
+    scrollw = lives_standard_scrolled_window_new(scrw*.35, scrh*.4, top_vbox);
+
+  lives_box_pack_start(LIVES_BOX(dialog_vbox), scrollw, TRUE, TRUE, 0);
 
-  lives_box_pack_start (LIVES_BOX (dialog_vbox), scrollw, TRUE, TRUE, 0);
+  lives_container_set_border_width(LIVES_CONTAINER(top_vbox), 0);
 
-  lives_container_set_border_width (LIVES_CONTAINER (top_vbox), 0);
+  frame = lives_frame_new(NULL);
 
-  frame = lives_frame_new (NULL);
+  if (type!=1) lives_box_pack_start(LIVES_BOX(top_vbox), frame, TRUE, TRUE, 0);
+  vbox = lives_vbox_new(FALSE, 0);
+  lives_container_add(LIVES_CONTAINER(frame), vbox);
 
-  if (type!=1) lives_box_pack_start (LIVES_BOX (top_vbox), frame, TRUE, TRUE, 0);
-  vbox = lives_vbox_new (FALSE, 0);
-  lives_container_add (LIVES_CONTAINER (frame), vbox);
-  
   if (palette->style&STYLE_1) {
-    lives_widget_set_bg_color (frame, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+    lives_widget_set_bg_color(frame, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
   }
-  
-  label = lives_standard_label_new (_("Video"));
-  lives_frame_set_label_widget (LIVES_FRAME (frame), label);
-  
-  hbox = lives_hbox_new (FALSE, widget_opts.packing_width*5);
-  lives_box_pack_start (LIVES_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
-  
-  rdet->spinbutton_width = lives_standard_spin_button_new 
-    (_("_Width"),TRUE,rdet->width,2.,MAX_FRAME_WIDTH,1.,16.,0,LIVES_BOX(hbox),NULL);
-  
-  lives_signal_connect_after (LIVES_GUI_OBJECT (rdet->spinbutton_width), "value_changed",
-			  LIVES_GUI_CALLBACK (rdetw_spinw_changed),
-			  rdet);
-  
-  
-  rdet->spinbutton_height = lives_standard_spin_button_new 
-    (_("_Height"),TRUE,rdet->height,2.,MAX_FRAME_WIDTH,1.,16.,0,LIVES_BOX(hbox),NULL);
-  
-  lives_signal_connect_after (LIVES_GUI_OBJECT (rdet->spinbutton_height), "value_changed",
-			  LIVES_GUI_CALLBACK (rdetw_spinh_changed),
-			  rdet);
+
+  label = lives_standard_label_new(_("Video"));
+  lives_frame_set_label_widget(LIVES_FRAME(frame), label);
+
+  hbox = lives_hbox_new(FALSE, widget_opts.packing_width*5);
+  lives_box_pack_start(LIVES_BOX(vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
+
+  rdet->spinbutton_width = lives_standard_spin_button_new
+                           (_("_Width"),TRUE,rdet->width,2.,MAX_FRAME_WIDTH,1.,16.,0,LIVES_BOX(hbox),NULL);
+
+  lives_signal_connect_after(LIVES_GUI_OBJECT(rdet->spinbutton_width), LIVES_WIDGET_VALUE_CHANGED_SIGNAL,
+                             LIVES_GUI_CALLBACK(rdetw_spinw_changed),
+                             rdet);
+
+
+  rdet->spinbutton_height = lives_standard_spin_button_new
+                            (_("_Height"),TRUE,rdet->height,2.,MAX_FRAME_WIDTH,1.,16.,0,LIVES_BOX(hbox),NULL);
+
+  lives_signal_connect_after(LIVES_GUI_OBJECT(rdet->spinbutton_height), LIVES_WIDGET_VALUE_CHANGED_SIGNAL,
+                             LIVES_GUI_CALLBACK(rdetw_spinh_changed),
+                             rdet);
 
   // add aspect button
   if (type==1) {
@@ -5159,75 +5201,75 @@
     aspect_height.widgets[0]=rdet->spinbutton_height;
 
     set_aspect_ratio_widgets(&aspect_width,&aspect_height);
-    check_for_special (NULL,&aspect_width,LIVES_BOX(vbox));
-    check_for_special (NULL,&aspect_height,LIVES_BOX(vbox));
+    check_for_special(NULL,&aspect_width,LIVES_BOX(vbox));
+    check_for_special(NULL,&aspect_height,LIVES_BOX(vbox));
   }
 
 
-  hbox = lives_hbox_new (FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
+  hbox = lives_hbox_new(FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
+
+  rdet->spinbutton_fps = lives_standard_spin_button_new
+                         (_("_Frames per second"),TRUE,rdet->fps,1.,FPS_MAX,1.,10.,0,LIVES_BOX(hbox),NULL);
 
-  rdet->spinbutton_fps = lives_standard_spin_button_new 
-    (_("_Frames per second"),TRUE,rdet->fps,1.,FPS_MAX,1.,10.,0,LIVES_BOX(hbox),NULL);
-  
   if (type==4&&mainw->multitrack->event_list!=NULL) lives_widget_set_sensitive(rdet->spinbutton_fps,FALSE);
-  
-  lives_signal_connect_after (LIVES_GUI_OBJECT (rdet->spinbutton_fps), "value_changed",
-			  LIVES_GUI_CALLBACK (rdetw_spinf_changed),
-			  rdet);
-  
+
+  lives_signal_connect_after(LIVES_GUI_OBJECT(rdet->spinbutton_fps), LIVES_WIDGET_VALUE_CHANGED_SIGNAL,
+                             LIVES_GUI_CALLBACK(rdetw_spinf_changed),
+                             rdet);
+
   // TODO
-  rdet->pertrack_checkbutton = lives_check_button_new ();
-  rdet->backaudio_checkbutton = lives_check_button_new ();
-  
+  rdet->pertrack_checkbutton = lives_check_button_new();
+  rdet->backaudio_checkbutton = lives_check_button_new();
+
   if (type==3) resaudw=create_resaudw(3,rdet,top_vbox);
   else if (type!=1) resaudw=create_resaudw(10,rdet,top_vbox);
 
   if (type==3) {
     // extra opts
-    
-    label= lives_standard_label_new (_("Options"));
-    
-    lives_box_pack_start (LIVES_BOX (top_vbox), label, FALSE, FALSE, widget_opts.packing_height);
-    
-    hbox = lives_hbox_new (FALSE, 0);
-    lives_box_pack_start (LIVES_BOX (top_vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
+
+    label= lives_standard_label_new(_("Options"));
+
+    lives_box_pack_start(LIVES_BOX(top_vbox), label, FALSE, FALSE, widget_opts.packing_height);
+
+    hbox = lives_hbox_new(FALSE, 0);
+    lives_box_pack_start(LIVES_BOX(top_vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
 
     rdet->backaudio_checkbutton=lives_standard_check_button_new
-      (_("Enable _backing audio track"),TRUE,LIVES_BOX(hbox),NULL);
+                                (_("Enable _backing audio track"),TRUE,LIVES_BOX(hbox),NULL);
 
     add_fill_to_box(LIVES_BOX(hbox));
 
-    lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (rdet->backaudio_checkbutton), prefs->mt_backaudio>0);
-    
-    lives_widget_set_sensitive(rdet->backaudio_checkbutton, 
-			     lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(resaudw->aud_checkbutton)));
+    lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(rdet->backaudio_checkbutton), prefs->mt_backaudio>0);
+
+    lives_widget_set_sensitive(rdet->backaudio_checkbutton,
+                               lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(resaudw->aud_checkbutton)));
 
-    rdet->pertrack_checkbutton=lives_standard_check_button_new 
-      (_("Audio track _per video track"),TRUE,LIVES_BOX(hbox),NULL);
+    rdet->pertrack_checkbutton=lives_standard_check_button_new
+                               (_("Audio track _per video track"),TRUE,LIVES_BOX(hbox),NULL);
 
-    lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (rdet->pertrack_checkbutton), prefs->mt_pertrack_audio);
+    lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(rdet->pertrack_checkbutton), prefs->mt_pertrack_audio);
 
-    lives_widget_set_sensitive(rdet->pertrack_checkbutton, 
-			     lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(resaudw->aud_checkbutton)));
+    lives_widget_set_sensitive(rdet->pertrack_checkbutton,
+                               lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(resaudw->aud_checkbutton)));
 
   }
-  
-  
+
+
 #ifndef IS_MINGW
-  if (capable->has_encoder_plugins) encoders=get_plugin_list (PLUGIN_ENCODERS,FALSE,NULL,NULL);
+  if (capable->has_encoder_plugins) encoders=get_plugin_list(PLUGIN_ENCODERS,FALSE,NULL,NULL);
 #else
-  if (capable->has_encoder_plugins) encoders=get_plugin_list (PLUGIN_ENCODERS,TRUE,NULL,NULL);
+  if (capable->has_encoder_plugins) encoders=get_plugin_list(PLUGIN_ENCODERS,TRUE,NULL,NULL);
 #endif
-  
+
   if (!specified) encoders=filter_encoders_by_img_ext(encoders,prefs->image_ext);
   else {
-    GList *encs=encoders=filter_encoders_by_img_ext(encoders,get_image_ext_for_type(cfile->img_type));
+    LiVESList *encs=encoders=filter_encoders_by_img_ext(encoders,get_image_ext_for_type(cfile->img_type));
     needs_new_encoder=TRUE;
     while (encs!=NULL) {
       if (!strcmp((char *)encs->data,prefs->encoder.name)) {
-	needs_new_encoder=FALSE;
-	break;
+        needs_new_encoder=FALSE;
+        break;
       }
       encs=encs->next;
     }
@@ -5235,105 +5277,101 @@
   }
 
   if (!specified) {
-    add_hsep_to_box (LIVES_BOX (top_vbox));
+    add_hsep_to_box(LIVES_BOX(top_vbox));
     if (type!=3) {
       label=lives_standard_label_new(_("Options"));
-      lives_box_pack_start (LIVES_BOX (top_vbox), label, FALSE, FALSE, widget_opts.packing_height);
+      lives_box_pack_start(LIVES_BOX(top_vbox), label, FALSE, FALSE, widget_opts.packing_height);
     }
   }
 
   widget_opts.expand=LIVES_EXPAND_EXTRA;
 
-  label = lives_standard_label_new (_("Target Encoder"));
-  lives_box_pack_start (LIVES_BOX (top_vbox), label, FALSE, FALSE, 0);
+  label = lives_standard_label_new(_("Target Encoder"));
+  lives_box_pack_start(LIVES_BOX(top_vbox), label, FALSE, FALSE, 0);
 
   if (!specified) {
-    rdet->encoder_name=g_strdup(mainw->string_constants[LIVES_STRING_CONSTANT_ANY]);
-    encoders=g_list_prepend(encoders,g_strdup(rdet->encoder_name));
-  }
-  else {
-    rdet->encoder_name=g_strdup(prefs->encoder.name);
+    rdet->encoder_name=lives_strdup(mainw->string_constants[LIVES_STRING_CONSTANT_ANY]);
+    encoders=lives_list_prepend(encoders,lives_strdup(rdet->encoder_name));
+  } else {
+    rdet->encoder_name=lives_strdup(prefs->encoder.name);
   }
 
   rdet->encoder_combo = lives_standard_combo_new(NULL,FALSE,encoders,LIVES_BOX(top_vbox),NULL);
 
-  rdet->encoder_name_fn = lives_signal_connect_after(LIVES_COMBO(rdet->encoder_combo), LIVES_WIDGET_CHANGED_EVENT,
-						 LIVES_GUI_CALLBACK(on_encoder_entry_changed), rdet);
+  rdet->encoder_name_fn = lives_signal_connect_after(LIVES_COMBO(rdet->encoder_combo), LIVES_WIDGET_CHANGED_SIGNAL,
+                          LIVES_GUI_CALLBACK(on_encoder_entry_changed), rdet);
 
   lives_signal_handler_block(rdet->encoder_combo, rdet->encoder_name_fn);
   lives_combo_set_active_string(LIVES_COMBO(rdet->encoder_combo), rdet->encoder_name);
   lives_signal_handler_unblock(rdet->encoder_combo, rdet->encoder_name_fn);
 
   if (encoders!=NULL) {
-    g_list_free_strings (encoders);
-    g_list_free (encoders);
+    lives_list_free_strings(encoders);
+    lives_list_free(encoders);
   }
 
   encoders=NULL;
-  
+
   if (!specified) {
-    ofmt=g_list_append(ofmt,g_strdup(mainw->string_constants[LIVES_STRING_CONSTANT_ANY]));
-  }
-  else {
+    ofmt=lives_list_append(ofmt,lives_strdup(mainw->string_constants[LIVES_STRING_CONSTANT_ANY]));
+  } else {
     add_fill_to_box(LIVES_BOX(top_vbox));
     if (capable->has_encoder_plugins) {
       // reqest formats from the encoder plugin
       if ((ofmt_all=plugin_request_by_line(PLUGIN_ENCODERS,prefs->encoder.name,"get_formats"))!=NULL) {
-	for (i=0;i<g_list_length(ofmt_all);i++) {
-	  if (get_token_count ((gchar *)g_list_nth_data (ofmt_all,i),'|')>2) {
-	    array=g_strsplit ((gchar *)g_list_nth_data (ofmt_all,i),"|",-1);
-	    if (!strcmp(array[0],prefs->encoder.of_name)) {
-	      prefs->encoder.of_allowed_acodecs=atoi(array[2]);
-	    }
-	    ofmt=g_list_append(ofmt,g_strdup(array[1]));
-	    g_strfreev (array);
-	  }
-	}
-	g_list_free_strings(ofmt_all);
-	g_list_free(ofmt_all);
-      }
-      else {
-	future_prefs->encoder.of_allowed_acodecs=0;
+        for (i=0; i<lives_list_length(ofmt_all); i++) {
+          if (get_token_count((char *)lives_list_nth_data(ofmt_all,i),'|')>2) {
+            array=lives_strsplit((char *)lives_list_nth_data(ofmt_all,i),"|",-1);
+            if (!strcmp(array[0],prefs->encoder.of_name)) {
+              prefs->encoder.of_allowed_acodecs=atoi(array[2]);
+            }
+            ofmt=lives_list_append(ofmt,lives_strdup(array[1]));
+            lives_strfreev(array);
+          }
+        }
+        lives_list_free_strings(ofmt_all);
+        lives_list_free(ofmt_all);
+      } else {
+        future_prefs->encoder.of_allowed_acodecs=0;
       }
     }
   }
 
-  label = lives_standard_label_new (_("Output format"));
-  lives_box_pack_start (LIVES_BOX (top_vbox), label, FALSE, FALSE, 0);
+  label = lives_standard_label_new(_("Output format"));
+  lives_box_pack_start(LIVES_BOX(top_vbox), label, FALSE, FALSE, 0);
 
   rdet->ofmt_combo = lives_standard_combo_new(NULL,FALSE,ofmt,LIVES_BOX(top_vbox),NULL);
 
   lives_combo_populate(LIVES_COMBO(rdet->ofmt_combo), ofmt);
 
-  g_list_free_strings(ofmt);
-  g_list_free(ofmt);
-  
-  rdet->encoder_ofmt_fn=lives_signal_connect_after (LIVES_COMBO(rdet->ofmt_combo), LIVES_WIDGET_CHANGED_EVENT, 
-						LIVES_GUI_CALLBACK (on_encoder_ofmt_changed), rdet);
+  lives_list_free_strings(ofmt);
+  lives_list_free(ofmt);
+
+  rdet->encoder_ofmt_fn=lives_signal_connect_after(LIVES_COMBO(rdet->ofmt_combo), LIVES_WIDGET_CHANGED_SIGNAL,
+                        LIVES_GUI_CALLBACK(on_encoder_ofmt_changed), rdet);
 
 
-  alabel = lives_standard_label_new (_("Audio format"));
+  alabel = lives_standard_label_new(_("Audio format"));
 
 
   if (!specified) {
     // add "Any" string
     if (prefs->acodec_list!=NULL) {
-      g_list_free_strings (prefs->acodec_list);
-      g_list_free (prefs->acodec_list);
+      lives_list_free_strings(prefs->acodec_list);
+      lives_list_free(prefs->acodec_list);
       prefs->acodec_list=NULL;
     }
-    prefs->acodec_list=g_list_append(prefs->acodec_list,g_strdup(mainw->string_constants[LIVES_STRING_CONSTANT_ANY]));
-    lives_box_pack_start (LIVES_BOX (top_vbox), alabel, FALSE, FALSE, 0);
-    rdet->acodec_combo = lives_standard_combo_new (NULL,FALSE,prefs->acodec_list,LIVES_BOX(top_vbox),NULL);
-  }
-  else {
+    prefs->acodec_list=lives_list_append(prefs->acodec_list,lives_strdup(mainw->string_constants[LIVES_STRING_CONSTANT_ANY]));
+    lives_box_pack_start(LIVES_BOX(top_vbox), alabel, FALSE, FALSE, 0);
+    rdet->acodec_combo = lives_standard_combo_new(NULL,FALSE,prefs->acodec_list,LIVES_BOX(top_vbox),NULL);
+  } else {
     add_fill_to_box(LIVES_BOX(top_vbox));
-    lives_box_pack_start (LIVES_BOX (top_vbox), alabel, FALSE, FALSE, 0);
+    lives_box_pack_start(LIVES_BOX(top_vbox), alabel, FALSE, FALSE, 0);
     lives_signal_handler_block(rdet->ofmt_combo, rdet->encoder_ofmt_fn);
     lives_combo_set_active_string(LIVES_COMBO(rdet->ofmt_combo), prefs->encoder.of_desc);
     lives_signal_handler_unblock(rdet->ofmt_combo, rdet->encoder_ofmt_fn);
 
-    rdet->acodec_combo = lives_standard_combo_new (NULL,FALSE,NULL,LIVES_BOX(top_vbox),NULL);
+    rdet->acodec_combo = lives_standard_combo_new(NULL,FALSE,NULL,LIVES_BOX(top_vbox),NULL);
 
     check_encoder_restrictions(TRUE,FALSE,TRUE);
     future_prefs->encoder.of_allowed_acodecs=prefs->encoder.of_allowed_acodecs;
@@ -5342,63 +5380,65 @@
 
   widget_opts.expand=LIVES_EXPAND_DEFAULT;
 
-  rdet->always_hbox = lives_hbox_new (TRUE, widget_opts.packing_width*2);
+  rdet->always_hbox = lives_hbox_new(TRUE, widget_opts.packing_width*2);
 
-  rdet->always_checkbutton=lives_standard_check_button_new ((tmp=g_strdup(_("_Always use these values"))),TRUE,
-							    LIVES_BOX(rdet->always_hbox),
-							    (tmp2=g_strdup( _("Check this button to always use these values when entering multitrack mode. Choice can be re-enabled from Preferences."))));
+  rdet->always_checkbutton=lives_standard_check_button_new((tmp=lives_strdup(_("_Always use these values"))),TRUE,
+                           LIVES_BOX(rdet->always_hbox),
+                           (tmp2=lives_strdup(
+                                   _("Check this button to always use these values when entering multitrack mode. Choice can be re-enabled from Preferences."))));
 
-  g_free(tmp);
-  g_free(tmp2);
+  lives_free(tmp);
+  lives_free(tmp2);
 
   add_fill_to_box(LIVES_BOX(rdet->always_hbox));
 
   daa=lives_dialog_get_action_area(LIVES_DIALOG(rdet->dialog));
 
-  lives_box_pack_start (LIVES_BOX (daa), rdet->always_hbox, FALSE, FALSE, widget_opts.packing_width*2);
+  lives_box_pack_start(LIVES_BOX(daa), rdet->always_hbox, FALSE, FALSE, widget_opts.packing_width*2);
 
-  add_fill_to_box(LIVES_BOX (daa));
+  add_fill_to_box(LIVES_BOX(daa));
 
 
-  cancelbutton = lives_button_new_from_stock (LIVES_STOCK_CANCEL);
+  cancelbutton = lives_button_new_from_stock(LIVES_STOCK_CANCEL);
   if (!(prefs->startup_interface==STARTUP_MT&&!mainw->is_ready)) {
-    lives_dialog_add_action_widget (LIVES_DIALOG (rdet->dialog), cancelbutton, LIVES_RESPONSE_CANCEL);
+    lives_dialog_add_action_widget(LIVES_DIALOG(rdet->dialog), cancelbutton, LIVES_RESPONSE_CANCEL);
 
-  }
-  else add_fill_to_box(LIVES_BOX (daa));
+    if (!specified) {
+      lives_button_box_set_button_width(LIVES_BUTTON_BOX(daa), cancelbutton, DEF_BUTTON_WIDTH*2);
+    }
+  } else add_fill_to_box(LIVES_BOX(daa));
 
-  lives_widget_set_can_focus (cancelbutton,TRUE);
+  lives_widget_set_can_focus(cancelbutton,TRUE);
 
 
   if (!specified) {
-    rdet->okbutton = lives_button_new_from_stock (LIVES_STOCK_OK);
-    lives_button_box_set_button_width (LIVES_BUTTON_BOX (daa), rdet->okbutton, DEF_BUTTON_WIDTH*4);
-  }
-  else  {
-    rdet->okbutton = lives_button_new_from_stock (LIVES_STOCK_GO_FORWARD);
+    rdet->okbutton = lives_button_new_from_stock(LIVES_STOCK_OK);
+    lives_button_box_set_button_width(LIVES_BUTTON_BOX(daa), rdet->okbutton, DEF_BUTTON_WIDTH*2);
+  } else  {
+    rdet->okbutton = lives_button_new_from_stock(LIVES_STOCK_GO_FORWARD);
     lives_button_set_label(LIVES_BUTTON(rdet->okbutton),_("_Next"));
   }
 
-  lives_dialog_add_action_widget (LIVES_DIALOG (rdet->dialog), rdet->okbutton, LIVES_RESPONSE_OK);
-  lives_widget_set_can_focus_and_default (rdet->okbutton);
-  lives_widget_grab_default (rdet->okbutton);
+  lives_dialog_add_action_widget(LIVES_DIALOG(rdet->dialog), rdet->okbutton, LIVES_RESPONSE_OK);
+  lives_widget_set_can_focus_and_default(rdet->okbutton);
+  lives_widget_grab_default(rdet->okbutton);
 
-  lives_widget_add_accelerator (cancelbutton, LIVES_WIDGET_CLICKED_EVENT, rdet_accel_group,
-                              LIVES_KEY_Escape, (LiVESXModifierType)0, (LiVESAccelFlags)0);
+  lives_widget_add_accelerator(cancelbutton, LIVES_WIDGET_CLICKED_SIGNAL, rdet_accel_group,
+                               LIVES_KEY_Escape, (LiVESXModifierType)0, (LiVESAccelFlags)0);
 
 
-  lives_widget_show_all (rdet->dialog);
+  lives_widget_show_all(rdet->dialog);
   lives_widget_hide(rdet->always_hbox);
 
   if (type==4) lives_widget_hide(resaudw->aud_hbox);
-  
+
   if (needs_new_encoder) {
     lives_widget_set_sensitive(rdet->okbutton,FALSE);
     lives_widget_context_update(); // force showing of transient window
     do_encoder_img_ftm_error(rdet);
   }
 
-  lives_signal_connect_after(LIVES_COMBO(rdet->acodec_combo), LIVES_WIDGET_CHANGED_EVENT, LIVES_GUI_CALLBACK (rdet_acodec_changed), rdet);
+  lives_signal_connect_after(LIVES_COMBO(rdet->acodec_combo), LIVES_WIDGET_CHANGED_SIGNAL, LIVES_GUI_CALLBACK(rdet_acodec_changed), rdet);
 
   return rdet;
 }

LiVES-2.2.8.tar.bz2/src/events.h -> LiVES-2.4.1.tar.bz2/src/events.h Changed

@@ -10,61 +10,66 @@
 #ifndef HAS_LIVES_EVENTS_H
 #define HAS_LIVES_EVENTS_H
 
-weed_plant_t *append_frame_event (weed_plant_t *event_list, weed_timecode_t tc, int numframes, 
-				  int *clips, int *frames) WARN_UNUSED;
-weed_plant_t *append_filter_init_event (weed_plant_t *event_list, weed_timecode_t tc, 
-					int filter_idx, int num_in_tracks, int key, weed_plant_t *inst) WARN_UNUSED;
-weed_plant_t *append_filter_deinit_event (weed_plant_t *event_list, weed_timecode_t tc, 
-					  void *init_event, void **pchain) WARN_UNUSED;
-weed_plant_t *append_filter_map_event (weed_plant_t *event_list, weed_timecode_t tc, void **init_events) WARN_UNUSED;
-weed_plant_t *append_param_change_event (weed_plant_t *event_list, weed_timecode_t tc, int pnum, 
-					 weed_plant_t *param, void *init_event, void **pchain) WARN_UNUSED;
-weed_plant_t *append_marker_event (weed_plant_t *event_list, weed_timecode_t tc, int marker_type) WARN_UNUSED;
+weed_plant_t *append_frame_event(weed_plant_t *event_list, weed_timecode_t tc, int numframes,
+                                 int *clips, int *frames) WARN_UNUSED;
+weed_plant_t *append_filter_init_event(weed_plant_t *event_list, weed_timecode_t tc,
+                                       int filter_idx, int num_in_tracks, int key, weed_plant_t *inst) WARN_UNUSED;
+weed_plant_t *append_filter_deinit_event(weed_plant_t *event_list, weed_timecode_t tc,
+    void *init_event, void **pchain) WARN_UNUSED;
+weed_plant_t *append_filter_map_event(weed_plant_t *event_list, weed_timecode_t tc, void **init_events) WARN_UNUSED;
+weed_plant_t *append_param_change_event(weed_plant_t *event_list, weed_timecode_t tc, int pnum,
+                                        weed_plant_t *param, void *init_event, void **pchain) WARN_UNUSED;
+weed_plant_t *append_marker_event(weed_plant_t *event_list, weed_timecode_t tc, int marker_type) WARN_UNUSED;
 
 /** will either insert or replace */
-weed_plant_t *insert_frame_event_at (weed_plant_t *event_list, weed_timecode_t tc, int numframes, 
-				     int *clips, int *frames, weed_plant_t **shortcut) WARN_UNUSED;
-void insert_audio_event_at(weed_plant_t *event_list,weed_plant_t *event, int track, int clipnum, 
-			   double time, double vel);
-void remove_audio_for_track (weed_plant_t *event, int track);
-weed_plant_t *insert_blank_frame_event_at (weed_plant_t *event_list, weed_timecode_t tc, 
-					   weed_plant_t **shortcut) WARN_UNUSED;
-
-void remove_frame_from_event (weed_plant_t *event_list, weed_plant_t *event, int track);
-void remove_end_blank_frames (weed_plant_t *event_list);
+weed_plant_t *insert_frame_event_at(weed_plant_t *event_list, weed_timecode_t tc, int numframes,
+                                    int *clips, int *frames, weed_plant_t **shortcut) WARN_UNUSED;
+void insert_audio_event_at(weed_plant_t *event_list,weed_plant_t *event, int track, int clipnum,
+                           double time, double vel);
+void remove_audio_for_track(weed_plant_t *event, int track);
+weed_plant_t *insert_blank_frame_event_at(weed_plant_t *event_list, weed_timecode_t tc,
+    weed_plant_t **shortcut) WARN_UNUSED;
+
+void remove_frame_from_event(weed_plant_t *event_list, weed_plant_t *event, int track);
+void remove_end_blank_frames(weed_plant_t *event_list, boolean remove_filter_inits);
 void remove_filter_from_event_list(weed_plant_t *event_list, weed_plant_t *init_event);
 
-weed_plant_t *process_events (weed_plant_t *next_event, boolean process_audio, weed_timecode_t curr_tc); ///< RT playback
-void event_list_close_start_gap (weed_plant_t *event_list);
-void event_list_add_track (weed_plant_t *event_list, int layer);
+weed_plant_t *process_events(weed_plant_t *next_event, boolean process_audio, weed_timecode_t curr_tc);  ///< RT playback
+void event_list_close_start_gap(weed_plant_t *event_list);
+void event_list_add_track(weed_plant_t *event_list, int layer);
 void add_track_to_avol_init(weed_plant_t *filter, weed_plant_t *event, int nbtracks, boolean behind);
-void event_list_free (weed_plant_t *event_list);
+void event_list_free(weed_plant_t *event_list);
 
 /// replace events in event_list with events in new_event_list
-void event_list_replace_events (weed_plant_t *event_list, weed_plant_t *new_event_list);
+void event_list_replace_events(weed_plant_t *event_list, weed_plant_t *new_event_list);
 
-/// called during quantisation 
-weed_plant_t *event_copy_and_insert (weed_plant_t *in_event, weed_plant_t *event_list);
+/// called during quantisation
+weed_plant_t *event_copy_and_insert(weed_plant_t *in_event, weed_plant_t *event_list);
 
 /// if all_events is FALSE we only count FRAME events
-int count_events (weed_plant_t *event_list, boolean all_events, weed_timecode_t start_tc, weed_timecode_t end_tc);
+int count_events(weed_plant_t *event_list, boolean all_events, weed_timecode_t start_tc, weed_timecode_t end_tc);
 
-int count_resampled_events (weed_plant_t *event_list, double fps);
+int count_resampled_events(weed_plant_t *event_list, double fps);
 
-boolean event_list_to_block (weed_plant_t *event_list, int num_events);
-double event_list_get_end_secs (weed_plant_t *event_list);
-double event_list_get_start_secs (weed_plant_t *event_list);
-weed_timecode_t event_list_get_end_tc (weed_plant_t *event_list);
-weed_timecode_t event_list_get_start_tc (weed_plant_t *event_list);
+boolean event_list_to_block(weed_plant_t *event_list, int num_events);
+double event_list_get_end_secs(weed_plant_t *event_list);
+double event_list_get_start_secs(weed_plant_t *event_list);
+weed_timecode_t event_list_get_end_tc(weed_plant_t *event_list);
+weed_timecode_t event_list_get_start_tc(weed_plant_t *event_list);
 
-weed_plant_t *get_last_frame_event (weed_plant_t *event_list);
-weed_plant_t *get_first_frame_event (weed_plant_t *event_list);
+weed_plant_t *get_last_frame_event(weed_plant_t *event_list);
+weed_plant_t *get_first_frame_event(weed_plant_t *event_list);
 
-weed_plant_t *get_next_frame_event (weed_plant_t *event);
-weed_plant_t *get_prev_frame_event (weed_plant_t *event);
+weed_plant_t *get_next_frame_event(weed_plant_t *event);
+weed_plant_t *get_prev_frame_event(weed_plant_t *event);
 
-weed_plant_t *get_frame_event_at (weed_plant_t *event_list, weed_timecode_t tc, weed_plant_t *shortcut, boolean exact);
-weed_plant_t *get_frame_event_at_or_before (weed_plant_t *event_list, weed_timecode_t tc, weed_plant_t *shortcut);
+weed_plant_t *get_next_audio_frame_event(weed_plant_t *event);
+weed_plant_t *get_prev_audio_frame_event(weed_plant_t *event);
+
+weed_plant_t *get_frame_event_at(weed_plant_t *event_list, weed_timecode_t tc, weed_plant_t *shortcut, boolean exact);
+weed_plant_t *get_frame_event_at_or_before(weed_plant_t *event_list, weed_timecode_t tc, weed_plant_t *shortcut);
+
+weed_plant_t *get_audio_block_start(weed_plant_t *event_list, int track, weed_timecode_t tc, boolean seek_back);
 
 boolean filter_map_after_frame(weed_plant_t *fmap);
 boolean init_event_is_relevant(weed_plant_t *init_event, int ctrack);
@@ -86,15 +91,15 @@
 #include "../libweed/weed-utils.h"
 #endif
 
-weed_timecode_t get_event_timecode (weed_plant_t *);
-int get_event_hint (weed_plant_t *);
-boolean is_blank_frame (weed_plant_t *, boolean count_audio);
+weed_timecode_t get_event_timecode(weed_plant_t *);
+int get_event_hint(weed_plant_t *);
+boolean is_blank_frame(weed_plant_t *, boolean count_audio);
 boolean has_audio_frame(weed_plant_t *event_list);
-int get_frame_event_clip (weed_plant_t *, int layer);
-int get_frame_event_frame (weed_plant_t *, int layer);
-boolean frame_event_has_frame_for_track (weed_plant_t *event, int track);
-double *get_track_visibility_at_tc(weed_plant_t *event_list, int ntracks, int n_back_tracks, 
-				    weed_timecode_t tc, weed_plant_t **shortcut, boolean bleedthru);
+int get_frame_event_clip(weed_plant_t *, int layer);
+int get_frame_event_frame(weed_plant_t *, int layer);
+boolean frame_event_has_frame_for_track(weed_plant_t *event, int track);
+double *get_track_visibility_at_tc(weed_plant_t *event_list, int ntracks, int n_back_tracks,
+                                   weed_timecode_t tc, weed_plant_t **shortcut, boolean bleedthru);
 void get_active_track_list(int *clip_index, int num_tracks, weed_plant_t *filter_map);
 
 //////////////////////////////////////////////////////////
@@ -118,10 +123,10 @@
   LiVESWidget *backaudio_checkbutton;
   LiVESWidget *always_checkbutton;
   LiVESWidget *always_hbox;
-  gulong encoder_name_fn;
-  gulong encoder_ofmt_fn;
+  ulong encoder_name_fn;
+  ulong encoder_ofmt_fn;
   boolean enc_changed;
-  gchar *encoder_name;
+  char *encoder_name;
   boolean suggestion_followed;
 
   boolean is_encoding;
@@ -140,9 +145,9 @@
 //// UI stuff ///////
 
 
-LiVESWidget *events_rec_dialog (boolean allow_mt);
-int get_render_choice (void);
-boolean deal_with_render_choice (boolean add_deinit);
+LiVESWidget *events_rec_dialog(boolean allow_mt);
+int get_render_choice(void);
+boolean deal_with_render_choice(boolean add_deinit);
 
 #define RENDER_CHOICE_DISCARD 0
 #define RENDER_CHOICE_PREVIEW 1
@@ -151,28 +156,28 @@
 #define RENDER_CHOICE_MULTITRACK 4
 #define RENDER_CHOICE_EVENT_LIST 5
 
-LiVESWidget *create_event_list_dialog (weed_plant_t *event_list, weed_timecode_t start_tc, weed_timecode_t end_tc);
-render_details *create_render_details (int type);
+LiVESWidget *create_event_list_dialog(weed_plant_t *event_list, weed_timecode_t start_tc, weed_timecode_t end_tc);
+render_details *create_render_details(int type);
 
 ////////////////////////////////////////////////////////////////
 /// rendering
 
-boolean render_to_clip (boolean new_clip); ///< render to clip
-boolean start_render_effect_events (weed_plant_t *event_list); ///< render to clip
+boolean render_to_clip(boolean new_clip);  ///< render to clip
+boolean start_render_effect_events(weed_plant_t *event_list);  ///< render to clip
 
 
 // effect insertion/updating
 void insert_filter_init_event_at(weed_plant_t *event_list, weed_plant_t *at_event, weed_plant_t *event);
-void **filter_init_add_pchanges (weed_plant_t *event_list, weed_plant_t *filter, weed_plant_t *init_event, int ntracks, int leave);
+void **filter_init_add_pchanges(weed_plant_t *event_list, weed_plant_t *filter, weed_plant_t *init_event, int ntracks, int leave);
 void insert_filter_deinit_event_at(weed_plant_t *event_list, weed_plant_t *at_event, weed_plant_t *event);
-boolean insert_filter_map_event_at(weed_plant_t *event_list, weed_plant_t *at_event, weed_plant_t *event, 
-				    boolean before_frames);
+boolean insert_filter_map_event_at(weed_plant_t *event_list, weed_plant_t *at_event, weed_plant_t *event,
+                                   boolean before_frames);
 weed_plant_t *get_filter_map_before(weed_plant_t *event, int ctrack, weed_plant_t *stop_event);
 weed_plant_t *get_filter_map_after(weed_plant_t *event, int ctrack);
 void **get_init_events_before(weed_plant_t *event, weed_plant_t *init_event, boolean add);
-void update_filter_maps (weed_plant_t *event, weed_plant_t *end_event, weed_plant_t *init_event);
+void update_filter_maps(weed_plant_t *event, weed_plant_t *end_event, weed_plant_t *init_event);
 void insert_param_change_event_at(weed_plant_t *event_list, weed_plant_t *at_event, weed_plant_t *event);
-void insert_marker_event_at(weed_plant_t *event_list, weed_plant_t *at_event, int marker_type, gpointer data);
+void insert_marker_event_at(weed_plant_t *event_list, weed_plant_t *at_event, int marker_type, livespointer data);
 
 void add_init_event_to_filter_map(weed_plant_t *fmap, weed_plant_t *event, void **hints);
 boolean init_event_in_list(void **init_events, int num_inits, weed_plant_t *event);
@@ -184,8 +189,8 @@
 boolean move_event_left(weed_plant_t *event_list, weed_plant_t *event, boolean can_stay, double fps);
 
 void move_filter_init_event(weed_plant_t *event_list, weed_timecode_t new_tc, weed_plant_t *init_event, double fps);
-void move_filter_deinit_event(weed_plant_t *event_list, weed_timecode_t new_tc, weed_plant_t *deinit_event, 
-			      double fps, boolean rescale_pchanges);
+void move_filter_deinit_event(weed_plant_t *event_list, weed_timecode_t new_tc, weed_plant_t *deinit_event,
+                              double fps, boolean rescale_pchanges);
 
 // event deletion
 void unlink_event(weed_plant_t *event_list, weed_plant_t *event);
@@ -199,21 +204,21 @@
 boolean insert_event_after(weed_plant_t *at_event,weed_plant_t *event);
 
 // param changes
-void ***get_event_pchains(void);
+void ** *get_event_pchains(void);
 weed_timecode_t get_next_paramchange(void **pchange_next,weed_timecode_t end_tc);
 weed_timecode_t get_prev_paramchange(void **pchange_next,weed_timecode_t start_tc);
 boolean is_init_pchange(weed_plant_t *init_event, weed_plant_t *pchange_event);
 void free_pchains(int key);
 
 // audio
-/// returns clip number for track layer (layer==-1 is backing audio)
-int get_audio_frame_clip (weed_plant_t *event, int layer);
- 
-/// returns velocity for track layer (layer==-1 is backing audio)
-double get_audio_frame_vel (weed_plant_t *event, int layer);
+/// returns clip number for track (track==-1 is backing audio)
+int get_audio_frame_clip(weed_plant_t *event, int track);
+
+/// returns velocity for track (track==-1 is backing audio)
+double get_audio_frame_vel(weed_plant_t *event, int track);
 
-/// returns velocity for track layer (layer==-1 is backing audio)
-double get_audio_frame_seek (weed_plant_t *event, int layer);
+/// returns velocity for track (track==-1 is backing audio)
+double get_audio_frame_seek(weed_plant_t *event, int track);
 
 
 // playback
@@ -229,10 +234,11 @@
 #define EVENT_MARKER_RECORD_START 1024
 #define EVENT_MARKER_RECORD_END 1025
 
-#define WEED_PLANT_IS_EVENT(plant) (weed_get_plant_type(plant)==WEED_PLANT_EVENT?1:0)
-#define WEED_PLANT_IS_EVENT_LIST(plant) (weed_get_plant_type(plant)==WEED_PLANT_EVENT_LIST?1:0)
+#define WEED_PLANT_IS_EVENT(plant) ((plant!=NULL&&weed_get_plant_type(plant)==WEED_PLANT_EVENT)?1:0)
+#define WEED_PLANT_IS_EVENT_LIST(plant) ((plant!=NULL&&weed_get_plant_type(plant)==WEED_PLANT_EVENT_LIST)?1:0)
 
 #define WEED_EVENT_IS_FRAME(event) (get_event_hint(event)==WEED_EVENT_HINT_FRAME?1:0)
+#define WEED_EVENT_IS_AUDIO_FRAME(event) ((get_event_hint(event)==WEED_EVENT_HINT_FRAME&&weed_plant_has_leaf(event,"audio_clips"))?1:0)
 #define WEED_EVENT_IS_FILTER_INIT(event) (get_event_hint(event)==WEED_EVENT_HINT_FILTER_INIT?1:0)
 #define WEED_EVENT_IS_FILTER_DEINIT(event) (get_event_hint(event)==WEED_EVENT_HINT_FILTER_DEINIT?1:0)
 #define WEED_EVENT_IS_FILTER_MAP(event) (get_event_hint(event)==WEED_EVENT_HINT_FILTER_MAP?1:0)

LiVES-2.2.8.tar.bz2/src/framedraw.c -> LiVES-2.4.1.tar.bz2/src/framedraw.c Changed

@@ -32,7 +32,7 @@
 static double calc_fd_scale(int width, int height) {
   double scale=1.;
 
- if (width<MIN_PRE_X) {
+  if (width<MIN_PRE_X) {
     width=MIN_PRE_X;
   }
   if (height<MIN_PRE_Y) {
@@ -45,16 +45,16 @@
 
 }
 
-static void start_preview (LiVESButton *button, lives_rfx_t *rfx) {
+static void start_preview(LiVESButton *button, lives_rfx_t *rfx) {
   int i;
-  gchar *com;
+  char *com;
 
   lives_widget_set_sensitive(mainw->framedraw_preview,FALSE);
   lives_widget_context_update();
 
   if (mainw->did_rfx_preview) {
 #ifndef IS_MINGW
-    com=g_strdup_printf("%s stopsubsub \"%s\" 2>/dev/null",prefs->backend_sync,cfile->handle);
+    com=lives_strdup_printf("%s stopsubsub \"%s\" 2>/dev/null",prefs->backend_sync,cfile->handle);
     lives_system(com,TRUE); // try to stop any in-progress preview
 #else
     // get pid from backend
@@ -62,16 +62,16 @@
     ssize_t rlen;
     char val[16];
     int pid;
-    com=g_strdup_printf("%s get_pid_for_handle \"%s\"",prefs->backend_sync,cfile->handle);
+    com=lives_strdup_printf("%s get_pid_for_handle \"%s\"",prefs->backend_sync,cfile->handle);
     rfile=popen(com,"r");
     rlen=fread(val,1,16,rfile);
     pclose(rfile);
     memset(val+rlen,0,1);
     pid=atoi(val);
-    
+
     lives_win32_kill_subprocesses(pid,TRUE);
 #endif
-    g_free(com);
+    lives_free(com);
 
     if (cfile->start==0) {
       cfile->start=1;
@@ -82,26 +82,26 @@
   }
 
 #ifndef IS_MINGW
-  com=g_strdup_printf("%s clear_pre_files \"%s\" 2>/dev/null",prefs->backend_sync,cfile->handle);
+  com=lives_strdup_printf("%s clear_pre_files \"%s\" 2>/dev/null",prefs->backend_sync,cfile->handle);
 #else
-  com=g_strdup_printf("%s clear_pre_files \"%s\" 2>NUL",prefs->backend_sync,cfile->handle);
+  com=lives_strdup_printf("%s clear_pre_files \"%s\" 2>NUL",prefs->backend_sync,cfile->handle);
 #endif
   lives_system(com,TRUE); // clear any .pre files from before
 
-  for (i=0;i<rfx->num_params;i++) {
+  for (i=0; i<rfx->num_params; i++) {
     rfx->params[i].changed=FALSE;
   }
 
   mainw->cancelled=CANCEL_NONE;
   mainw->error=FALSE;
 
-  // within do_effect() we check and if  
+  // within do_effect() we check and if
   do_effect(rfx,TRUE); // actually start effect processing in the background
 
   lives_widget_set_sensitive(mainw->framedraw_spinbutton,TRUE);
   lives_widget_set_sensitive(mainw->framedraw_scale,TRUE);
 
-  if (mainw->framedraw_frame>cfile->start&&!(cfile->start==0&&mainw->framedraw_frame==1)) 
+  if (mainw->framedraw_frame>cfile->start&&!(cfile->start==0&&mainw->framedraw_frame==1))
     lives_spin_button_set_value(LIVES_SPIN_BUTTON(mainw->framedraw_spinbutton),cfile->start);
   else {
     load_rfx_preview(rfx);
@@ -116,9 +116,9 @@
 void framedraw_connect_spinbutton(lives_special_framedraw_rect_t *framedraw, lives_rfx_t *rfx) {
   framedraw->rfx=rfx;
 
-  lives_signal_connect_after (LIVES_GUI_OBJECT (mainw->framedraw_spinbutton), "value_changed",
-			  LIVES_GUI_CALLBACK (after_framedraw_frame_spinbutton_changed),
-			  framedraw);
+  lives_signal_connect_after(LIVES_GUI_OBJECT(mainw->framedraw_spinbutton), LIVES_WIDGET_VALUE_CHANGED_SIGNAL,
+                             LIVES_GUI_CALLBACK(after_framedraw_frame_spinbutton_changed),
+                             framedraw);
 
 }
 
@@ -128,22 +128,22 @@
 
 
   // add mouse fn's so we can draw on frames
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->framedraw), "motion_notify_event",
-		    LIVES_GUI_CALLBACK (on_framedraw_mouse_update),
-		    framedraw);
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->framedraw), "button_release_event",
-		    LIVES_GUI_CALLBACK (on_framedraw_mouse_reset),
-		    framedraw);
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->framedraw), "button_press_event",
-		    LIVES_GUI_CALLBACK (on_framedraw_mouse_start),
-		    framedraw);
-  lives_signal_connect (LIVES_GUI_OBJECT(mainw->framedraw), "enter-notify-event",LIVES_GUI_CALLBACK (on_framedraw_enter),framedraw);
-  lives_signal_connect (LIVES_GUI_OBJECT(mainw->framedraw), "leave-notify-event",LIVES_GUI_CALLBACK (on_framedraw_leave),framedraw);
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->framedraw), LIVES_WIDGET_MOTION_NOTIFY_EVENT,
+                       LIVES_GUI_CALLBACK(on_framedraw_mouse_update),
+                       framedraw);
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->framedraw), LIVES_WIDGET_BUTTON_RELEASE_EVENT,
+                       LIVES_GUI_CALLBACK(on_framedraw_mouse_reset),
+                       framedraw);
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->framedraw), LIVES_WIDGET_BUTTON_PRESS_EVENT,
+                       LIVES_GUI_CALLBACK(on_framedraw_mouse_start),
+                       framedraw);
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->framedraw), LIVES_WIDGET_ENTER_EVENT,LIVES_GUI_CALLBACK(on_framedraw_enter),framedraw);
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->framedraw), LIVES_WIDGET_LEAVE_NOTIFY_EVENT,LIVES_GUI_CALLBACK(on_framedraw_leave),framedraw);
 
   framedraw_connect_spinbutton(framedraw,rfx);
 
-  lives_widget_set_bg_color (mainw->fd_frame, LIVES_WIDGET_STATE_NORMAL, &palette->light_red);
-  lives_widget_set_bg_color (fbord_eventbox, LIVES_WIDGET_STATE_NORMAL, &palette->light_red);
+  lives_widget_set_bg_color(mainw->fd_frame, LIVES_WIDGET_STATE_NORMAL, &palette->light_red);
+  lives_widget_set_bg_color(fbord_eventbox, LIVES_WIDGET_STATE_NORMAL, &palette->light_red);
 
   framedraw_redraw(framedraw, TRUE, NULL);
 }
@@ -154,34 +154,34 @@
 
   // TRANSLATORS - Preview refers to preview window; keep this phrase short
   label=lives_standard_label_new(_("You can click in Preview to change these values"));
-  lives_box_pack_start (LIVES_BOX (box), label, FALSE, FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(box), label, FALSE, FALSE, 0);
 }
 
 
 void framedraw_add_reset(LiVESVBox *box, lives_special_framedraw_rect_t *framedraw) {
   LiVESWidget *hbox_rst;
- 
+
   framedraw_add_label(box);
 
-  mainw->framedraw_reset = lives_button_new_from_stock (LIVES_STOCK_REFRESH);
-  hbox_rst = lives_hbox_new (FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (box), hbox_rst, FALSE, FALSE, 0);
-  
-  lives_button_set_label (LIVES_BUTTON (mainw->framedraw_reset),_ ("_Reset Values"));
-  lives_button_set_use_underline (LIVES_BUTTON (mainw->framedraw_reset), TRUE);
-  lives_box_pack_start (LIVES_BOX (hbox_rst), mainw->framedraw_reset, TRUE, FALSE, 0);
-  lives_widget_set_sensitive (mainw->framedraw_reset,FALSE);
-  
-  lives_signal_connect (mainw->framedraw_reset, LIVES_WIDGET_CLICKED_EVENT,LIVES_GUI_CALLBACK (on_framedraw_reset_clicked),framedraw);
+  mainw->framedraw_reset = lives_button_new_from_stock(LIVES_STOCK_REFRESH);
+  hbox_rst = lives_hbox_new(FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(box), hbox_rst, FALSE, FALSE, 0);
+
+  lives_button_set_label(LIVES_BUTTON(mainw->framedraw_reset),_("_Reset Values"));
+  lives_button_set_use_underline(LIVES_BUTTON(mainw->framedraw_reset), TRUE);
+  lives_box_pack_start(LIVES_BOX(hbox_rst), mainw->framedraw_reset, TRUE, FALSE, 0);
+  lives_widget_set_sensitive(mainw->framedraw_reset,FALSE);
+
+  lives_signal_connect(mainw->framedraw_reset, LIVES_WIDGET_CLICKED_SIGNAL,LIVES_GUI_CALLBACK(on_framedraw_reset_clicked),framedraw);
 }
 
 
-static boolean expose_fd_event (LiVESWidget *widget, GdkEventExpose ev) {
+static boolean expose_fd_event(LiVESWidget *widget, LiVESXEventExpose ev) {
   redraw_framedraw_image();
   return TRUE;
 }
 
-void widget_add_framedraw (LiVESVBox *box, int start, int end, boolean add_preview_button, int width, int height) {
+void widget_add_framedraw(LiVESVBox *box, int start, int end, boolean add_preview_button, int width, int height) {
   // adds the frame draw widget to box
   // the redraw button should be connected to an appropriate redraw function
   // after calling this function
@@ -194,7 +194,7 @@
   LiVESWidget *label;
   LiVESAdjustment *spinbutton_adj;
   LiVESWidget *frame;
- 
+
   lives_rfx_t *rfx;
 
   double fd_scale;
@@ -203,86 +203,84 @@
 
   mainw->framedraw_reset=NULL;
 
-  vseparator = lives_vseparator_new ();
-  lives_box_pack_start (LIVES_BOX (lives_widget_get_parent(LIVES_WIDGET (box))), vseparator, FALSE, FALSE, 0);
-  lives_widget_show (vseparator);
+  vseparator = lives_vseparator_new();
+  lives_box_pack_start(LIVES_BOX(lives_widget_get_parent(LIVES_WIDGET(box))), vseparator, FALSE, FALSE, 0);
+  lives_widget_show(vseparator);
 
-  vbox = lives_vbox_new (FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (lives_widget_get_parent(LIVES_WIDGET (box))), vbox, FALSE, FALSE, 0);
-  lives_container_set_border_width (LIVES_CONTAINER (vbox), widget_opts.border_width);
+  vbox = lives_vbox_new(FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(lives_widget_get_parent(LIVES_WIDGET(box))), vbox, FALSE, FALSE, 0);
+  lives_container_set_border_width(LIVES_CONTAINER(vbox), widget_opts.border_width);
 
   fd_scale=calc_fd_scale(width,height);
   width/=fd_scale;
   height/=fd_scale;
- 
-  hbox = lives_hbox_new (FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (vbox), hbox, FALSE, FALSE, 0);
-  add_fill_to_box(LIVES_BOX(hbox));
+
+  hbox = lives_hbox_new(FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(vbox), hbox, FALSE, FALSE, 0);
 
   fbord_eventbox=lives_event_box_new();
   lives_container_set_border_width(LIVES_CONTAINER(fbord_eventbox),widget_opts.border_width);
 
-  frame = lives_frame_new (NULL);
+  frame = lives_frame_new(NULL);
 
-  add_fill_to_box(LIVES_BOX(hbox));
-  lives_box_pack_start (LIVES_BOX (hbox), frame, FALSE, FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(hbox), frame, FALSE, FALSE, 0);
 
   if (palette->style&STYLE_1) {
-    lives_widget_set_bg_color (fbord_eventbox, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
-    lives_widget_set_bg_color (frame, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
-    lives_widget_set_fg_color (frame, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
+    lives_widget_set_bg_color(fbord_eventbox, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
+    lives_widget_set_bg_color(frame, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+    lives_widget_set_fg_color(frame, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
   }
 
   mainw->fd_frame=frame;
 
-  label = lives_standard_label_new (_("Preview"));
-  lives_frame_set_label_widget (LIVES_FRAME (frame), label);
+  label = lives_standard_label_new(_("Preview"));
+  lives_frame_set_label_widget(LIVES_FRAME(frame), label);
 
-  lives_frame_set_shadow_type (LIVES_FRAME(frame), LIVES_SHADOW_NONE);
+  lives_frame_set_shadow_type(LIVES_FRAME(frame), LIVES_SHADOW_NONE);
 
   mainw->framedraw=lives_event_box_new();
-  lives_widget_set_size_request (mainw->framedraw, width, height);
+  lives_widget_set_size_request(mainw->framedraw, width, height);
   lives_container_set_border_width(LIVES_CONTAINER(mainw->framedraw),1);
 
-  lives_widget_set_events (mainw->framedraw, LIVES_BUTTON1_MOTION_MASK | LIVES_BUTTON_RELEASE_MASK | 
-			 LIVES_BUTTON_PRESS_MASK| LIVES_ENTER_NOTIFY_MASK | LIVES_LEAVE_NOTIFY_MASK);
+  lives_widget_set_events(mainw->framedraw, LIVES_BUTTON1_MOTION_MASK | LIVES_BUTTON_RELEASE_MASK |
+                          LIVES_BUTTON_PRESS_MASK| LIVES_ENTER_NOTIFY_MASK | LIVES_LEAVE_NOTIFY_MASK);
 
   mainw->framedraw_frame=start;
 
-  lives_container_add (LIVES_CONTAINER (frame), fbord_eventbox);
-  lives_container_add (LIVES_CONTAINER (fbord_eventbox), mainw->framedraw);
+  lives_container_add(LIVES_CONTAINER(frame), fbord_eventbox);
+  lives_container_add(LIVES_CONTAINER(fbord_eventbox), mainw->framedraw);
 
   if (palette->style&STYLE_1) {
-    lives_widget_set_bg_color (mainw->framedraw, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
-    lives_widget_set_fg_color (mainw->framedraw, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
+    lives_widget_set_bg_color(mainw->framedraw, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+    lives_widget_set_fg_color(mainw->framedraw, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
   }
 
-  lives_signal_connect_after (LIVES_GUI_OBJECT (mainw->framedraw), LIVES_WIDGET_EXPOSE_EVENT,
-			  LIVES_GUI_CALLBACK (expose_fd_event), NULL);
+  lives_signal_connect_after(LIVES_GUI_OBJECT(mainw->framedraw), LIVES_WIDGET_EXPOSE_EVENT,
+                             LIVES_GUI_CALLBACK(expose_fd_event), NULL);
 
 
-  hbox = lives_hbox_new (FALSE, 2);
-  lives_box_pack_start (LIVES_BOX (vbox), hbox, FALSE, FALSE, 0);
+  hbox = lives_hbox_new(FALSE, 2);
+  lives_box_pack_start(LIVES_BOX(vbox), hbox, FALSE, FALSE, 0);
 
-  mainw->framedraw_spinbutton = lives_standard_spin_button_new (_("_Frame"),
-								TRUE,start,start,end,1.,10.,0,LIVES_BOX(hbox),NULL);
+  mainw->framedraw_spinbutton = lives_standard_spin_button_new(_("_Frame"),
+                                TRUE,start,start,end,1.,10.,0,LIVES_BOX(hbox),NULL);
 
   spinbutton_adj=lives_spin_button_get_adjustment(LIVES_SPIN_BUTTON(mainw->framedraw_spinbutton));
 
   mainw->framedraw_scale=lives_hscale_new(LIVES_ADJUSTMENT(spinbutton_adj));
-  lives_box_pack_start (LIVES_BOX (hbox), mainw->framedraw_scale, TRUE, TRUE, 0);
-  gtk_scale_set_draw_value(GTK_SCALE(mainw->framedraw_scale),FALSE);
-
-  rfx=(lives_rfx_t *)g_object_get_data(G_OBJECT(lives_widget_get_toplevel(LIVES_WIDGET(box))),"rfx");
-  mainw->framedraw_preview = lives_button_new_from_stock (LIVES_STOCK_REFRESH);
-  lives_button_set_label (LIVES_BUTTON (mainw->framedraw_preview),_ ("_Preview"));
-  lives_button_set_use_underline (LIVES_BUTTON (mainw->framedraw_preview), TRUE);
-  lives_box_pack_start (LIVES_BOX (hbox), mainw->framedraw_preview, TRUE, FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(hbox), mainw->framedraw_scale, TRUE, TRUE, 0);
+  lives_scale_set_draw_value(LIVES_SCALE(mainw->framedraw_scale),FALSE);
+
+  rfx=(lives_rfx_t *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(lives_widget_get_toplevel(LIVES_WIDGET(box))),"rfx");
+  mainw->framedraw_preview = lives_button_new_from_stock(LIVES_STOCK_REFRESH);
+  lives_button_set_label(LIVES_BUTTON(mainw->framedraw_preview),_("_Preview"));
+  lives_button_set_use_underline(LIVES_BUTTON(mainw->framedraw_preview), TRUE);
+  lives_box_pack_start(LIVES_BOX(hbox), mainw->framedraw_preview, TRUE, FALSE, 0);
   lives_widget_set_sensitive(mainw->framedraw_spinbutton,FALSE);
   lives_widget_set_sensitive(mainw->framedraw_scale,FALSE);
-  lives_signal_connect (mainw->framedraw_preview, LIVES_WIDGET_CLICKED_EVENT,LIVES_GUI_CALLBACK (start_preview),rfx);
-  
-  lives_widget_show_all (vbox);
+  lives_signal_connect(mainw->framedraw_preview, LIVES_WIDGET_CLICKED_SIGNAL,LIVES_GUI_CALLBACK(start_preview),rfx);
+
+  lives_widget_show_all(vbox);
 
   if (!add_preview_button) {
     lives_widget_hide(mainw->framedraw_preview);
@@ -292,7 +290,7 @@
 
 
 
-void framedraw_redraw (lives_special_framedraw_rect_t * framedraw, boolean reload, LiVESPixbuf *pixbuf) {
+void framedraw_redraw(lives_special_framedraw_rect_t *framedraw, boolean reload, LiVESPixbuf *pixbuf) {
   // this will draw the mask (framedraw_bitmap) and optionally reload the image
   // and then combine them
 
@@ -305,16 +303,16 @@
   lives_painter_t *cr;
 
   if (mainw->current_file<1||cfile==NULL) return;
-  
-  if (framedraw->rfx->source_type==LIVES_RFX_SOURCE_RFX) 
+
+  if (framedraw->rfx->source_type==LIVES_RFX_SOURCE_RFX)
     if (noupdate) return;
 
   fd_width=lives_widget_get_allocation_width(mainw->framedraw);
   fd_height=lives_widget_get_allocation_height(mainw->framedraw);
-    
+
   width=cfile->hsize;
   height=cfile->vsize;
-  
+
   calc_maxspect(fd_width,fd_height,&width,&height);
 
   // copy from orig, resize
@@ -323,13 +321,13 @@
     weed_layer_free(mainw->fd_layer);
     mainw->fd_layer=NULL;
   }
-  
+
   if (reload||mainw->fd_layer_orig==NULL) load_framedraw_image(pixbuf);
-  
+
   mainw->fd_layer=weed_layer_copy(NULL,mainw->fd_layer_orig);
   // resize to correct size
   resize_layer(mainw->fd_layer, width, height, LIVES_INTERP_BEST, WEED_PALETTE_END, 0);
-  
+
   cr=layer_to_lives_painter(mainw->fd_layer);
 
 
@@ -341,100 +339,91 @@
   case LIVES_PARAM_SPECIAL_TYPE_RECT_MULTRECT: // deprecated
     // scale values
     if (framedraw->xstart_param->dp==0) {
-      xstartf=(double)lives_spin_button_get_value_as_int(LIVES_SPIN_BUTTON (framedraw->xstart_param->widgets[0]));
+      xstartf=(double)lives_spin_button_get_value_as_int(LIVES_SPIN_BUTTON(framedraw->xstart_param->widgets[0]));
       xstartf=xstartf/(double)cfile->hsize*(double)width;
-    }
-    else {
-      xstartf=lives_spin_button_get_value (LIVES_SPIN_BUTTON (framedraw->xstart_param->widgets[0]));
+    } else {
+      xstartf=lives_spin_button_get_value(LIVES_SPIN_BUTTON(framedraw->xstart_param->widgets[0]));
       xstartf=xstartf*(double)width;
     }
 
     if (framedraw->xend_param->dp==0) {
-      xendf=(double)lives_spin_button_get_value_as_int(LIVES_SPIN_BUTTON (framedraw->xend_param->widgets[0]));
+      xendf=(double)lives_spin_button_get_value_as_int(LIVES_SPIN_BUTTON(framedraw->xend_param->widgets[0]));
       xendf=xendf/(double)cfile->hsize*(double)width;
-    }
-    else {
-      xendf=lives_spin_button_get_value (LIVES_SPIN_BUTTON (framedraw->xend_param->widgets[0]));
+    } else {
+      xendf=lives_spin_button_get_value(LIVES_SPIN_BUTTON(framedraw->xend_param->widgets[0]));
       xendf=xendf*(double)width;
     }
 
     if (framedraw->ystart_param->dp==0) {
-      ystartf=(double)lives_spin_button_get_value_as_int(LIVES_SPIN_BUTTON (framedraw->ystart_param->widgets[0]));
+      ystartf=(double)lives_spin_button_get_value_as_int(LIVES_SPIN_BUTTON(framedraw->ystart_param->widgets[0]));
       ystartf=ystartf/(double)cfile->vsize*(double)height;
-    }
-    else {
-      ystartf=lives_spin_button_get_value (LIVES_SPIN_BUTTON (framedraw->ystart_param->widgets[0]));
+    } else {
+      ystartf=lives_spin_button_get_value(LIVES_SPIN_BUTTON(framedraw->ystart_param->widgets[0]));
       ystartf=ystartf*(double)height;
     }
 
     if (framedraw->yend_param->dp==0) {
-      yendf=lives_spin_button_get_value_as_int(LIVES_SPIN_BUTTON (framedraw->yend_param->widgets[0]));
+      yendf=lives_spin_button_get_value_as_int(LIVES_SPIN_BUTTON(framedraw->yend_param->widgets[0]));
       yendf=yendf/(double)cfile->vsize*(double)height;
-    }
-    else {
-      yendf=lives_spin_button_get_value (LIVES_SPIN_BUTTON (framedraw->yend_param->widgets[0]));
+    } else {
+      yendf=lives_spin_button_get_value(LIVES_SPIN_BUTTON(framedraw->yend_param->widgets[0]));
       yendf=yendf*(double)height;
     }
 
     lives_painter_set_source_rgb(cr, 1., 0., 0.);
     lives_painter_rectangle(cr,xstartf-1.,ystartf-1.,xendf+2.,yendf+2.);
-    lives_painter_stroke (cr);
+    lives_painter_stroke(cr);
 
     break;
   case LIVES_PARAM_SPECIAL_TYPE_RECT_MULTIRECT:
   case LIVES_PARAM_SPECIAL_TYPE_RECT_DEMASK:
 
     if (framedraw->xstart_param->dp==0) {
-      xstartf=(double)lives_spin_button_get_value_as_int(LIVES_SPIN_BUTTON (framedraw->xstart_param->widgets[0]));
+      xstartf=(double)lives_spin_button_get_value_as_int(LIVES_SPIN_BUTTON(framedraw->xstart_param->widgets[0]));
       xstartf=xstartf/(double)cfile->hsize*(double)width;
-    }
-    else {
-      xstartf=lives_spin_button_get_value (LIVES_SPIN_BUTTON (framedraw->xstart_param->widgets[0]));
+    } else {
+      xstartf=lives_spin_button_get_value(LIVES_SPIN_BUTTON(framedraw->xstart_param->widgets[0]));
       xstartf=xstartf*(double)width;
     }
 
     if (framedraw->xend_param->dp==0) {
-      xendf=(double)lives_spin_button_get_value_as_int(LIVES_SPIN_BUTTON (framedraw->xend_param->widgets[0]));
+      xendf=(double)lives_spin_button_get_value_as_int(LIVES_SPIN_BUTTON(framedraw->xend_param->widgets[0]));
       xendf=xendf/(double)cfile->hsize*(double)width;
-    }
-    else {
-      xendf=lives_spin_button_get_value (LIVES_SPIN_BUTTON (framedraw->xend_param->widgets[0]));
+    } else {
+      xendf=lives_spin_button_get_value(LIVES_SPIN_BUTTON(framedraw->xend_param->widgets[0]));
       xendf=xendf*(double)width;
     }
 
     if (framedraw->ystart_param->dp==0) {
-      ystartf=(double)lives_spin_button_get_value_as_int(LIVES_SPIN_BUTTON (framedraw->ystart_param->widgets[0]));
+      ystartf=(double)lives_spin_button_get_value_as_int(LIVES_SPIN_BUTTON(framedraw->ystart_param->widgets[0]));
       ystartf=ystartf/(double)cfile->vsize*(double)height;
-    }
-    else {
-      ystartf=lives_spin_button_get_value (LIVES_SPIN_BUTTON (framedraw->ystart_param->widgets[0]));
+    } else {
+      ystartf=lives_spin_button_get_value(LIVES_SPIN_BUTTON(framedraw->ystart_param->widgets[0]));
       ystartf=ystartf*(double)height;
     }
 
     if (framedraw->yend_param->dp==0) {
-      yendf=(double)lives_spin_button_get_value_as_int(LIVES_SPIN_BUTTON (framedraw->yend_param->widgets[0]));
+      yendf=(double)lives_spin_button_get_value_as_int(LIVES_SPIN_BUTTON(framedraw->yend_param->widgets[0]));
       yendf=yendf/(double)cfile->vsize*(double)height;
-    }
-    else {
-      yendf=lives_spin_button_get_value (LIVES_SPIN_BUTTON (framedraw->yend_param->widgets[0]));
+    } else {
+      yendf=lives_spin_button_get_value(LIVES_SPIN_BUTTON(framedraw->yend_param->widgets[0]));
       yendf=yendf*(double)height;
     }
 
     if (b1_held||framedraw->type==LIVES_PARAM_SPECIAL_TYPE_RECT_MULTIRECT) {
       lives_painter_set_source_rgb(cr, 1., 0., 0.);
       lives_painter_rectangle(cr,xstartf-1.,ystartf-1.,xendf-xstartf+2.,yendf-ystartf+2.);
-      lives_painter_stroke (cr);
-    }
-    else {
+      lives_painter_stroke(cr);
+    } else {
       if (!b1_held) {
-	// create a mask which is only opaque within the clipping area
-
-	lives_painter_rectangle(cr,0,0,width,height);
-	lives_painter_rectangle(cr,xstartf,ystartf,xendf-xstartf+1.,yendf-ystartf+1.);
-	lives_painter_set_operator(cr, LIVES_PAINTER_OPERATOR_DEST_OUT);
-	lives_painter_set_source_rgba(cr, .0, .0, .0, .5);
-	lives_painter_set_fill_rule(cr, LIVES_PAINTER_FILL_RULE_EVEN_ODD);
-	lives_painter_fill (cr);
+        // create a mask which is only opaque within the clipping area
+
+        lives_painter_rectangle(cr,0,0,width,height);
+        lives_painter_rectangle(cr,xstartf,ystartf,xendf-xstartf+1.,yendf-ystartf+1.);
+        lives_painter_set_operator(cr, LIVES_PAINTER_OPERATOR_DEST_OUT);
+        lives_painter_set_source_rgba(cr, .0, .0, .0, .5);
+        lives_painter_set_fill_rule(cr, LIVES_PAINTER_FILL_RULE_EVEN_ODD);
+        lives_painter_fill(cr);
       }
     }
 
@@ -442,20 +431,18 @@
   case LIVES_PARAM_SPECIAL_TYPE_SINGLEPOINT:
 
     if (framedraw->xstart_param->dp==0) {
-      xstartf=(double)lives_spin_button_get_value_as_int(LIVES_SPIN_BUTTON (framedraw->xstart_param->widgets[0]));
+      xstartf=(double)lives_spin_button_get_value_as_int(LIVES_SPIN_BUTTON(framedraw->xstart_param->widgets[0]));
       xstartf=xstartf/(double)cfile->hsize*(double)width;
-    }
-    else {
-      xstartf=lives_spin_button_get_value (LIVES_SPIN_BUTTON (framedraw->xstart_param->widgets[0]));
+    } else {
+      xstartf=lives_spin_button_get_value(LIVES_SPIN_BUTTON(framedraw->xstart_param->widgets[0]));
       xstartf=xstartf*(double)width;
     }
 
     if (framedraw->ystart_param->dp==0) {
-      ystartf=(double)lives_spin_button_get_value_as_int(LIVES_SPIN_BUTTON (framedraw->ystart_param->widgets[0]));
+      ystartf=(double)lives_spin_button_get_value_as_int(LIVES_SPIN_BUTTON(framedraw->ystart_param->widgets[0]));
       ystartf=ystartf/(double)cfile->vsize*(double)height;
-    }
-    else {
-      ystartf=lives_spin_button_get_value (LIVES_SPIN_BUTTON (framedraw->ystart_param->widgets[0]));
+    } else {
+      ystartf=lives_spin_button_get_value(LIVES_SPIN_BUTTON(framedraw->ystart_param->widgets[0]));
       ystartf=ystartf*(double)height;
     }
 
@@ -464,12 +451,12 @@
     lives_painter_move_to(cr,xstartf,ystartf-3);
     lives_painter_line_to(cr,xstartf,ystartf+3);
 
-    lives_painter_stroke (cr);
+    lives_painter_stroke(cr);
 
     lives_painter_move_to(cr,xstartf-3,ystartf);
     lives_painter_line_to(cr,xstartf+3,ystartf);
 
-    lives_painter_stroke (cr);
+    lives_painter_stroke(cr);
 
     break;
 
@@ -483,7 +470,7 @@
 
   lives_painter_destroy(cr);
 
-  redraw_framedraw_image ();
+  redraw_framedraw_image();
 }
 
 
@@ -522,8 +509,8 @@
     do {
       lives_widget_context_update();
       if (is_virtual_frame(mainw->current_file,vend)) {
-	retb=virtual_to_images(mainw->current_file,vend,vend,FALSE,NULL);
-	if (!retb) return;
+        retb=virtual_to_images(mainw->current_file,vend,vend,FALSE,NULL);
+        if (!retb) return;
       }
       vend++;
       timeout=lives_alarm_get(alarm_handle);
@@ -544,20 +531,19 @@
       // if we have a virtual clip (frames inside a video file)
       // pull some more frames to images to get us started
       do {
-	retb=FALSE;
-	if (is_virtual_frame(mainw->current_file,vend)) {
-	  retb=virtual_to_images(mainw->current_file,vend,vend,FALSE,NULL);
-	  if (!retb) {
-	    fclose(infofile);
-	    return;
-	  }
-	}
-	vend++;
+        retb=FALSE;
+        if (is_virtual_frame(mainw->current_file,vend)) {
+          retb=virtual_to_images(mainw->current_file,vend,vend,FALSE,NULL);
+          if (!retb) {
+            fclose(infofile);
+            return;
+          }
+        }
+        vend++;
       } while (vend<=cfile->end&&!retb);
-    }
-    else {
+    } else {
       // otherwise wait
-      g_usleep(prefs->sleep_time);
+      lives_usleep(prefs->sleep_time);
     }
   }
 
@@ -572,7 +558,7 @@
     mainw->read_failed=FALSE;
     lives_fgets(mainw->msg,512,infofile);
     if (mainw->read_failed) retval=do_read_failed_error_s_with_retry(cfile->info_file,NULL,NULL);
-  } while (retval==LIVES_RETRY);
+  } while (retval==LIVES_RESPONSE_RETRY);
 
   fclose(infofile);
 
@@ -580,22 +566,20 @@
   if (strncmp(mainw->msg,"completed",9)) {
     if (rfx->num_in_channels>0) {
       max_frame=atoi(mainw->msg);
-    }
-    else {
-      int numtok=get_token_count (mainw->msg,'|');
+    } else {
+      int numtok=get_token_count(mainw->msg,'|');
       if (numtok>4) {
-	gchar **array=g_strsplit(mainw->msg,"|",numtok);
-	max_frame=atoi(array[0]);
-	cfile->hsize=atoi(array[1]);
-	cfile->vsize=atoi(array[2]);
-	cfile->fps=cfile->pb_fps=strtod(array[3],NULL);
-	if (cfile->fps==0) cfile->fps=cfile->pb_fps=prefs->default_fps;
-	tot_frames=atoi(array[4]);
-	g_strfreev(array);
+        char **array=lives_strsplit(mainw->msg,"|",numtok);
+        max_frame=atoi(array[0]);
+        cfile->hsize=atoi(array[1]);
+        cfile->vsize=atoi(array[2]);
+        cfile->fps=cfile->pb_fps=strtod(array[3],NULL);
+        if (cfile->fps==0) cfile->fps=cfile->pb_fps=prefs->default_fps;
+        tot_frames=atoi(array[4]);
+        lives_strfreev(array);
       }
     }
-  }
-  else {
+  } else {
     max_frame=cfile->end;
   }
 
@@ -604,12 +588,12 @@
   if (max_frame>0) {
     if (rfx->num_in_channels==0) {
       int maxlen=calc_spin_button_width(1.,(double)tot_frames,0);
-      lives_spin_button_set_range (LIVES_SPIN_BUTTON (mainw->framedraw_spinbutton),1,tot_frames);
-      lives_entry_set_width_chars (LIVES_ENTRY (mainw->framedraw_spinbutton),maxlen);
+      lives_spin_button_set_range(LIVES_SPIN_BUTTON(mainw->framedraw_spinbutton),1,tot_frames);
+      lives_entry_set_width_chars(LIVES_ENTRY(mainw->framedraw_spinbutton),maxlen);
       lives_widget_queue_draw(mainw->framedraw_spinbutton);
       lives_widget_queue_draw(mainw->framedraw_scale);
     }
-    
+
     if (mainw->framedraw_frame>max_frame) {
       lives_spin_button_set_value(LIVES_SPIN_BUTTON(mainw->framedraw_spinbutton),max_frame);
       mainw->current_file=current_file;
@@ -619,26 +603,25 @@
 
   if (rfx->num_in_channels>0) {
     img_ext="pre";
-  }
-  else {
+  } else {
     img_ext=get_image_ext_for_type(cfile->img_type);
   }
 
   tc=((mainw->framedraw_frame-1.))/cfile->fps*U_SECL;
-  pixbuf=pull_lives_pixbuf_at_size(mainw->current_file,mainw->framedraw_frame,(gchar *)img_ext,
-				   tc,(double)cfile->hsize,
-				   (double)cfile->vsize,LIVES_INTERP_BEST);
+  pixbuf=pull_lives_pixbuf_at_size(mainw->current_file,mainw->framedraw_frame,(char *)img_ext,
+                                   tc,(double)cfile->hsize,
+                                   (double)cfile->vsize,LIVES_INTERP_BEST);
 
 
   load_framedraw_image(pixbuf);
-  redraw_framedraw_image ();
+  redraw_framedraw_image();
 
   mainw->current_file=current_file;
 }
 
 
 
-void after_framedraw_frame_spinbutton_changed (LiVESSpinButton *spinbutton, lives_special_framedraw_rect_t *framedraw) {
+void after_framedraw_frame_spinbutton_changed(LiVESSpinButton *spinbutton, lives_special_framedraw_rect_t *framedraw) {
   // update the single frame/framedraw preview
   // after the "frame number" spinbutton has changed
   mainw->framedraw_frame=lives_spin_button_get_value_as_int(spinbutton);
@@ -646,8 +629,7 @@
     if (mainw->framedraw_preview!=NULL) lives_widget_set_sensitive(mainw->framedraw_preview,FALSE);
     lives_widget_context_update();
     load_rfx_preview(framedraw->rfx);
-  }
-  else framedraw_redraw(framedraw, TRUE, NULL);
+  } else framedraw_redraw(framedraw, TRUE, NULL);
 }
 
 
@@ -659,18 +641,20 @@
 
   weed_timecode_t tc;
 
+  boolean needs_unlock=FALSE;
+
   if (mainw->framedraw_frame>cfile->frames) mainw->framedraw_frame=cfile->frames;
 
   if (pixbuf==NULL) {
-    const gchar *img_ext=get_image_ext_for_type(cfile->img_type);
+    const char *img_ext=get_image_ext_for_type(cfile->img_type);
 
     // can happen if we preview for rendered generators
     if ((mainw->multitrack==NULL||mainw->current_file!=mainw->multitrack->render_file)&&mainw->framedraw_frame==0) return;
 
     tc=((mainw->framedraw_frame-1.))/cfile->fps*U_SECL;
     pixbuf=pull_lives_pixbuf_at_size(mainw->current_file,mainw->framedraw_frame,img_ext,tc,
-				     (double)cfile->hsize,(double)cfile->vsize,
-				     LIVES_INTERP_BEST);
+                                     (double)cfile->hsize,(double)cfile->vsize,
+                                     LIVES_INTERP_BEST);
   }
 
   if (pixbuf!=NULL) {
@@ -681,12 +665,16 @@
     mainw->fd_layer_orig=weed_layer_new(0,0,NULL,WEED_PALETTE_END);
 
     if (pixbuf_to_layer(mainw->fd_layer_orig,pixbuf)) {
-      mainw->do_not_free=(gpointer)lives_pixbuf_get_pixels_readonly(pixbuf);
-      mainw->free_fn=lives_free_with_check;
+      mainw->do_not_free=(livespointer)lives_pixbuf_get_pixels_readonly(pixbuf);
+      // might be threaded here so we need a mutex to stop other thread resetting free_fn
+      pthread_mutex_lock(&mainw->free_fn_mutex);
+      needs_unlock=TRUE;
+      mainw->free_fn=_lives_free_with_check;
     }
     lives_object_unref(pixbuf);
     mainw->do_not_free=NULL;
-    mainw->free_fn=lives_free_normal;
+    mainw->free_fn=_lives_free_normal;
+    if (needs_unlock) pthread_mutex_unlock(&mainw->free_fn_mutex);
 
   }
 
@@ -703,6 +691,8 @@
   lives_painter_t *cr;
   LiVESPixbuf *pixbuf;
 
+  boolean needs_unlock=FALSE;
+
   int fd_width=lives_widget_get_allocation_width(mainw->framedraw);
   int fd_height=lives_widget_get_allocation_height(mainw->framedraw);
 
@@ -731,24 +721,27 @@
   pixbuf=layer_to_pixbuf(mainw->fd_layer);
 
   // get lives_painter for window
-  cr = lives_painter_create_from_widget (mainw->framedraw);
+  cr = lives_painter_create_from_widget(mainw->framedraw);
 
   if (cr!=NULL) {
     // set source pixbuf for lives_painter
-    lives_painter_set_source_pixbuf (cr, pixbuf, (fd_width-width)>>1, (fd_height-height)>>1);
-    lives_painter_paint (cr);
+    lives_painter_set_source_pixbuf(cr, pixbuf, (fd_width-width)>>1, (fd_height-height)>>1);
+    lives_painter_paint(cr);
     lives_painter_destroy(cr);
   }
 
   // convert pixbuf back to layer (layer_to_pixbuf destroys it)
   if (pixbuf_to_layer(mainw->fd_layer,pixbuf)) {
-    mainw->do_not_free=(gpointer)lives_pixbuf_get_pixels_readonly(pixbuf);
-    mainw->free_fn=lives_free_with_check;
+    mainw->do_not_free=(livespointer)lives_pixbuf_get_pixels_readonly(pixbuf);
+    pthread_mutex_lock(&mainw->free_fn_mutex);
+    needs_unlock=TRUE;
+    mainw->free_fn=_lives_free_with_check;
   }
 
   lives_object_unref(pixbuf);
   mainw->do_not_free=NULL;
-  mainw->free_fn=lives_free_normal;
+  mainw->free_fn=_lives_free_normal;
+  if (needs_unlock) pthread_mutex_unlock(&mainw->free_fn_mutex);
 
 
 }
@@ -756,12 +749,12 @@
 
 // change cursor maybe when we enter or leave the framedraw window
 
-boolean on_framedraw_enter (LiVESWidget *widget, GdkEventCrossing *event, lives_special_framedraw_rect_t *framedraw) {
+boolean on_framedraw_enter(LiVESWidget *widget, LiVESXEventCrossing *event, lives_special_framedraw_rect_t *framedraw) {
 
   if (framedraw==NULL&&mainw->multitrack!=NULL) {
     framedraw=mainw->multitrack->framedraw;
-    if (framedraw==NULL&&mainw->multitrack->cursor_style==LIVES_CURSOR_NORMAL) 
-      lives_set_cursor_style (LIVES_CURSOR_NORMAL,mainw->multitrack->play_box);
+    if (framedraw==NULL&&mainw->multitrack->cursor_style==LIVES_CURSOR_NORMAL)
+      lives_set_cursor_style(LIVES_CURSOR_NORMAL,mainw->multitrack->play_box);
   }
 
   if (framedraw==NULL) return FALSE;
@@ -773,16 +766,14 @@
   case LIVES_PARAM_SPECIAL_TYPE_RECT_MULTIRECT:
     if (mainw->multitrack==NULL) {
       lives_set_cursor_style(LIVES_CURSOR_TOP_LEFT_CORNER,mainw->framedraw);
-    }
-    else {
+    } else {
       lives_set_cursor_style(LIVES_CURSOR_TOP_LEFT_CORNER,mainw->multitrack->play_box);
     }
     break;
   case LIVES_PARAM_SPECIAL_TYPE_SINGLEPOINT:
     if (mainw->multitrack==NULL) {
       lives_set_cursor_style(LIVES_CURSOR_CROSSHAIR,mainw->framedraw);
-    }
-    else {
+    } else {
       lives_set_cursor_style(LIVES_CURSOR_CROSSHAIR,mainw->multitrack->play_box);
     }
     break;
@@ -795,16 +786,16 @@
 }
 
 
-boolean on_framedraw_leave (LiVESWidget *widget, GdkEventCrossing *event, lives_special_framedraw_rect_t *framedraw) {
+boolean on_framedraw_leave(LiVESWidget *widget, LiVESXEventCrossing *event, lives_special_framedraw_rect_t *framedraw) {
   if (framedraw==NULL) return FALSE;
-  lives_set_cursor_style (LIVES_CURSOR_NORMAL,mainw->framedraw);
+  lives_set_cursor_style(LIVES_CURSOR_NORMAL,mainw->framedraw);
   return FALSE;
 }
 
 
 // using these 3 functions, the user can draw on frames
 
-boolean on_framedraw_mouse_start (LiVESWidget *widget, LiVESXEventButton *event, lives_special_framedraw_rect_t *framedraw) {
+boolean on_framedraw_mouse_start(LiVESWidget *widget, LiVESXEventButton *event, lives_special_framedraw_rect_t *framedraw) {
   // user clicked in the framedraw widget (or multitrack playback widget)
 
   int fd_height;
@@ -822,15 +813,15 @@
 
   if (framedraw==NULL&&mainw->multitrack!=NULL&&event->button==3) {
     // right click brings up context menu
-    frame_context(widget,event,GINT_TO_POINTER(0));
+    frame_context(widget,event,LIVES_INT_TO_POINTER(0));
   }
 
   if (event->button!=1) return FALSE;
 
   b1_held=TRUE;
 
-  lives_widget_get_pointer((LiVESXDevice *)mainw->mgeom[prefs->gui_monitor>0?prefs->gui_monitor-1:0].mouse_device, 
-			   widget, &xstarti, &ystarti);
+  lives_widget_get_pointer((LiVESXDevice *)mainw->mgeom[prefs->gui_monitor>0?prefs->gui_monitor-1:0].mouse_device,
+                           widget, &xstarti, &ystarti);
 
   if ((framedraw->type==LIVES_PARAM_SPECIAL_TYPE_RECT_MULTRECT||
        framedraw->type==LIVES_PARAM_SPECIAL_TYPE_RECT_MULTIRECT||
@@ -838,8 +829,7 @@
       (mainw->multitrack==NULL||mainw->multitrack->cursor_style==0)) {
     if (mainw->multitrack==NULL) {
       lives_set_cursor_style(LIVES_CURSOR_BOTTOM_RIGHT_CORNER,widget);
-    }
-    else {
+    } else {
       lives_set_cursor_style(LIVES_CURSOR_BOTTOM_RIGHT_CORNER,mainw->multitrack->play_box);
     }
   }
@@ -847,7 +837,7 @@
 
   fd_width=lives_widget_get_allocation_width(widget);
   fd_height=lives_widget_get_allocation_height(widget);
-    
+
   calc_maxspect(fd_width,fd_height,&width,&height);
 
   xstart=(double)xstarti-(double)(fd_width-width)/2.;
@@ -862,7 +852,7 @@
   noupdate=TRUE;
 
   switch (framedraw->type) {
-  case LIVES_PARAM_SPECIAL_TYPE_SINGLEPOINT: 
+  case LIVES_PARAM_SPECIAL_TYPE_SINGLEPOINT:
 
     if (framedraw->xstart_param->dp>0)
       lives_spin_button_set_value(LIVES_SPIN_BUTTON(framedraw->xstart_param->widgets[0]),xstart);
@@ -875,9 +865,9 @@
 
     break;
 
-  case LIVES_PARAM_SPECIAL_TYPE_RECT_MULTRECT: 
-  case LIVES_PARAM_SPECIAL_TYPE_RECT_MULTIRECT: 
-  case LIVES_PARAM_SPECIAL_TYPE_RECT_DEMASK: 
+  case LIVES_PARAM_SPECIAL_TYPE_RECT_MULTRECT:
+  case LIVES_PARAM_SPECIAL_TYPE_RECT_MULTIRECT:
+  case LIVES_PARAM_SPECIAL_TYPE_RECT_DEMASK:
 
     if (framedraw->xstart_param->dp>0)
       lives_spin_button_set_value(LIVES_SPIN_BUTTON(framedraw->xstart_param->widgets[0]),xstart);
@@ -891,16 +881,15 @@
     if (framedraw->type==LIVES_PARAM_SPECIAL_TYPE_RECT_MULTRECT) {
       lives_spin_button_set_value(LIVES_SPIN_BUTTON(framedraw->xend_param->widgets[0]),0.);
       lives_spin_button_set_value(LIVES_SPIN_BUTTON(framedraw->yend_param->widgets[0]),0.);
-    }
-    else {
+    } else {
       if (framedraw->xend_param->dp>0)
-	lives_spin_button_set_value(LIVES_SPIN_BUTTON(framedraw->xend_param->widgets[0]),xstart);
+        lives_spin_button_set_value(LIVES_SPIN_BUTTON(framedraw->xend_param->widgets[0]),xstart);
       else
-	lives_spin_button_set_value(LIVES_SPIN_BUTTON(framedraw->xend_param->widgets[0]),(int)(xstart*(double)cfile->hsize+.5));
+        lives_spin_button_set_value(LIVES_SPIN_BUTTON(framedraw->xend_param->widgets[0]),(int)(xstart*(double)cfile->hsize+.5));
       if (framedraw->xend_param->dp>0)
-	lives_spin_button_set_value(LIVES_SPIN_BUTTON(framedraw->yend_param->widgets[0]),ystart);
+        lives_spin_button_set_value(LIVES_SPIN_BUTTON(framedraw->yend_param->widgets[0]),ystart);
       else
-	lives_spin_button_set_value(LIVES_SPIN_BUTTON(framedraw->yend_param->widgets[0]),(int)(ystart*(double)cfile->vsize+.5));
+        lives_spin_button_set_value(LIVES_SPIN_BUTTON(framedraw->yend_param->widgets[0]),(int)(ystart*(double)cfile->vsize+.5));
     }
 
 
@@ -911,20 +900,20 @@
 
 
   if (mainw->framedraw_reset!=NULL) {
-    lives_widget_set_sensitive (mainw->framedraw_reset,TRUE);
+    lives_widget_set_sensitive(mainw->framedraw_reset,TRUE);
   }
   if (mainw->framedraw_preview!=NULL) {
-    lives_widget_set_sensitive (mainw->framedraw_preview,TRUE);
+    lives_widget_set_sensitive(mainw->framedraw_preview,TRUE);
   }
 
   noupdate=FALSE;
 
-  framedraw_redraw (framedraw, FALSE, NULL);
+  framedraw_redraw(framedraw, FALSE, NULL);
 
   return FALSE;
 }
 
-boolean on_framedraw_mouse_update (LiVESWidget *widget, LiVESXEventMotion *event, lives_special_framedraw_rect_t *framedraw) {
+boolean on_framedraw_mouse_update(LiVESWidget *widget, LiVESXEventMotion *event, lives_special_framedraw_rect_t *framedraw) {
   // pointer moved in the framedraw widget
   int xcurrenti,ycurrenti;
 
@@ -938,8 +927,8 @@
   if (framedraw==NULL) return FALSE;
   if (mainw->multitrack!=NULL&&mainw->multitrack->track_index==-1) return FALSE;
 
-  lives_widget_get_pointer((LiVESXDevice *)mainw->mgeom[prefs->gui_monitor>0?prefs->gui_monitor-1:0].mouse_device, 
-			   widget, &xcurrenti, &ycurrenti);
+  lives_widget_get_pointer((LiVESXDevice *)mainw->mgeom[prefs->gui_monitor>0?prefs->gui_monitor-1:0].mouse_device,
+                           widget, &xcurrenti, &ycurrenti);
 
 
   width=cfile->hsize;
@@ -947,7 +936,7 @@
 
   fd_width=lives_widget_get_allocation_width(widget);
   fd_height=lives_widget_get_allocation_height(widget);
-      
+
   calc_maxspect(fd_width,fd_height,&width,&height);
 
   xcurrent=(double)xcurrenti-(fd_width-width)/2.;
@@ -960,83 +949,74 @@
 
 
   switch (framedraw->type) {
-  case LIVES_PARAM_SPECIAL_TYPE_RECT_MULTRECT:
-    {
-      double xscale,yscale;
-
-      xscale=xcurrent-xstart;
-      yscale=ycurrent-ystart;
-      
-      if (xscale>0.) {
-	if (framedraw->xend_param->dp>0)
-	  lives_spin_button_set_value(LIVES_SPIN_BUTTON(framedraw->xend_param->widgets[0]),xscale);
-	else
-	  lives_spin_button_set_value(LIVES_SPIN_BUTTON(framedraw->xend_param->widgets[0]),(int)(xscale*(double)cfile->hsize+.5));
-      }
-      else {
-	if (framedraw->xstart_param->dp>0) {
-	  lives_spin_button_set_value(LIVES_SPIN_BUTTON(framedraw->xend_param->widgets[0]),-xscale);
-	  lives_spin_button_set_value(LIVES_SPIN_BUTTON(framedraw->xstart_param->widgets[0]),xcurrent);
-	}
-	else {
-	  lives_spin_button_set_value(LIVES_SPIN_BUTTON(framedraw->xend_param->widgets[0]),(int)(-xscale*(double)cfile->hsize-.5));
-	  lives_spin_button_set_value(LIVES_SPIN_BUTTON(framedraw->xstart_param->widgets[0]),(int)(xcurrent*(double)cfile->hsize+.5));
-	}
-      }
+  case LIVES_PARAM_SPECIAL_TYPE_RECT_MULTRECT: {
+    double xscale,yscale;
 
-      if (yscale>0.) {
-	if (framedraw->yend_param->dp>0)
-	  lives_spin_button_set_value(LIVES_SPIN_BUTTON(framedraw->yend_param->widgets[0]),yscale);
-	else 
-	  lives_spin_button_set_value(LIVES_SPIN_BUTTON(framedraw->yend_param->widgets[0]),(int)(yscale*(double)cfile->vsize+.5));
-      }
-      else {
-	if (framedraw->xstart_param->dp>0) {
-	  lives_spin_button_set_value(LIVES_SPIN_BUTTON(framedraw->yend_param->widgets[0]),-yscale);
-	  lives_spin_button_set_value(LIVES_SPIN_BUTTON(framedraw->ystart_param->widgets[0]),ycurrent);
-	}
-	else {
-	  lives_spin_button_set_value(LIVES_SPIN_BUTTON(framedraw->yend_param->widgets[0]),(int)(-yscale*(double)cfile->vsize-.5));
-	  lives_spin_button_set_value(LIVES_SPIN_BUTTON(framedraw->ystart_param->widgets[0]),(int)(ycurrent*(double)cfile->vsize+.5));
-	}
+    xscale=xcurrent-xstart;
+    yscale=ycurrent-ystart;
+
+    if (xscale>0.) {
+      if (framedraw->xend_param->dp>0)
+        lives_spin_button_set_value(LIVES_SPIN_BUTTON(framedraw->xend_param->widgets[0]),xscale);
+      else
+        lives_spin_button_set_value(LIVES_SPIN_BUTTON(framedraw->xend_param->widgets[0]),(int)(xscale*(double)cfile->hsize+.5));
+    } else {
+      if (framedraw->xstart_param->dp>0) {
+        lives_spin_button_set_value(LIVES_SPIN_BUTTON(framedraw->xend_param->widgets[0]),-xscale);
+        lives_spin_button_set_value(LIVES_SPIN_BUTTON(framedraw->xstart_param->widgets[0]),xcurrent);
+      } else {
+        lives_spin_button_set_value(LIVES_SPIN_BUTTON(framedraw->xend_param->widgets[0]),(int)(-xscale*(double)cfile->hsize-.5));
+        lives_spin_button_set_value(LIVES_SPIN_BUTTON(framedraw->xstart_param->widgets[0]),(int)(xcurrent*(double)cfile->hsize+.5));
       }
+    }
 
+    if (yscale>0.) {
+      if (framedraw->yend_param->dp>0)
+        lives_spin_button_set_value(LIVES_SPIN_BUTTON(framedraw->yend_param->widgets[0]),yscale);
+      else
+        lives_spin_button_set_value(LIVES_SPIN_BUTTON(framedraw->yend_param->widgets[0]),(int)(yscale*(double)cfile->vsize+.5));
+    } else {
+      if (framedraw->xstart_param->dp>0) {
+        lives_spin_button_set_value(LIVES_SPIN_BUTTON(framedraw->yend_param->widgets[0]),-yscale);
+        lives_spin_button_set_value(LIVES_SPIN_BUTTON(framedraw->ystart_param->widgets[0]),ycurrent);
+      } else {
+        lives_spin_button_set_value(LIVES_SPIN_BUTTON(framedraw->yend_param->widgets[0]),(int)(-yscale*(double)cfile->vsize-.5));
+        lives_spin_button_set_value(LIVES_SPIN_BUTTON(framedraw->ystart_param->widgets[0]),(int)(ycurrent*(double)cfile->vsize+.5));
+      }
     }
-    break;
+
+  }
+  break;
   case LIVES_PARAM_SPECIAL_TYPE_RECT_MULTIRECT:
   case LIVES_PARAM_SPECIAL_TYPE_RECT_DEMASK:
 
     if (xcurrent>xstart) {
       if (framedraw->xend_param->dp>0)
-	lives_spin_button_set_value(LIVES_SPIN_BUTTON(framedraw->xend_param->widgets[0]),xcurrent);
+        lives_spin_button_set_value(LIVES_SPIN_BUTTON(framedraw->xend_param->widgets[0]),xcurrent);
       else
-	lives_spin_button_set_value(LIVES_SPIN_BUTTON(framedraw->xend_param->widgets[0]),(int)(xcurrent*(double)cfile->hsize+.5));
-    }
-    else {
+        lives_spin_button_set_value(LIVES_SPIN_BUTTON(framedraw->xend_param->widgets[0]),(int)(xcurrent*(double)cfile->hsize+.5));
+    } else {
       if (framedraw->xstart_param->dp>0) {
-	lives_spin_button_set_value(LIVES_SPIN_BUTTON(framedraw->xend_param->widgets[0]),xstart);
-	lives_spin_button_set_value(LIVES_SPIN_BUTTON(framedraw->xstart_param->widgets[0]),xcurrent);
-      }
-      else {
-	lives_spin_button_set_value(LIVES_SPIN_BUTTON(framedraw->xend_param->widgets[0]),(int)(xstart*(double)cfile->hsize+.5));
-	lives_spin_button_set_value(LIVES_SPIN_BUTTON(framedraw->xstart_param->widgets[0]),(int)(xcurrent*(double)cfile->hsize+.5));
+        lives_spin_button_set_value(LIVES_SPIN_BUTTON(framedraw->xend_param->widgets[0]),xstart);
+        lives_spin_button_set_value(LIVES_SPIN_BUTTON(framedraw->xstart_param->widgets[0]),xcurrent);
+      } else {
+        lives_spin_button_set_value(LIVES_SPIN_BUTTON(framedraw->xend_param->widgets[0]),(int)(xstart*(double)cfile->hsize+.5));
+        lives_spin_button_set_value(LIVES_SPIN_BUTTON(framedraw->xstart_param->widgets[0]),(int)(xcurrent*(double)cfile->hsize+.5));
       }
     }
 
     if (ycurrent>ystart) {
       if (framedraw->yend_param->dp>0)
-	lives_spin_button_set_value(LIVES_SPIN_BUTTON(framedraw->yend_param->widgets[0]),ycurrent);
-      else 
-	lives_spin_button_set_value(LIVES_SPIN_BUTTON(framedraw->yend_param->widgets[0]),(int)(ycurrent*(double)cfile->vsize+.5));
-    }
-    else {
+        lives_spin_button_set_value(LIVES_SPIN_BUTTON(framedraw->yend_param->widgets[0]),ycurrent);
+      else
+        lives_spin_button_set_value(LIVES_SPIN_BUTTON(framedraw->yend_param->widgets[0]),(int)(ycurrent*(double)cfile->vsize+.5));
+    } else {
       if (framedraw->xstart_param->dp>0) {
-	lives_spin_button_set_value(LIVES_SPIN_BUTTON(framedraw->yend_param->widgets[0]),ystart);
-	lives_spin_button_set_value(LIVES_SPIN_BUTTON(framedraw->ystart_param->widgets[0]),ycurrent);
-      }
-      else {
-	lives_spin_button_set_value(LIVES_SPIN_BUTTON(framedraw->yend_param->widgets[0]),(int)(ystart*(double)cfile->vsize+.5));
-	lives_spin_button_set_value(LIVES_SPIN_BUTTON(framedraw->ystart_param->widgets[0]),(int)(ycurrent*(double)cfile->vsize+.5));
+        lives_spin_button_set_value(LIVES_SPIN_BUTTON(framedraw->yend_param->widgets[0]),ystart);
+        lives_spin_button_set_value(LIVES_SPIN_BUTTON(framedraw->ystart_param->widgets[0]),ycurrent);
+      } else {
+        lives_spin_button_set_value(LIVES_SPIN_BUTTON(framedraw->yend_param->widgets[0]),(int)(ystart*(double)cfile->vsize+.5));
+        lives_spin_button_set_value(LIVES_SPIN_BUTTON(framedraw->ystart_param->widgets[0]),(int)(ycurrent*(double)cfile->vsize+.5));
       }
     }
 
@@ -1049,20 +1029,20 @@
   }
 
   if (mainw->framedraw_reset!=NULL) {
-    lives_widget_set_sensitive (mainw->framedraw_reset,TRUE);
+    lives_widget_set_sensitive(mainw->framedraw_reset,TRUE);
   }
   if (mainw->framedraw_preview!=NULL) {
-    lives_widget_set_sensitive (mainw->framedraw_preview,TRUE);
+    lives_widget_set_sensitive(mainw->framedraw_preview,TRUE);
   }
 
   noupdate=FALSE;
-  framedraw_redraw (framedraw, FALSE, NULL);
+  framedraw_redraw(framedraw, FALSE, NULL);
 
   return FALSE;
 }
 
 
-boolean on_framedraw_mouse_reset (LiVESWidget *widget, LiVESXEventButton *event, lives_special_framedraw_rect_t *framedraw) {
+boolean on_framedraw_mouse_reset(LiVESWidget *widget, LiVESXEventButton *event, lives_special_framedraw_rect_t *framedraw) {
   // user released the mouse button in framedraw widget
   if (event->button!=1||!b1_held) return FALSE;
 
@@ -1078,8 +1058,7 @@
       (mainw->multitrack==NULL||mainw->multitrack->cursor_style==0)) {
     if (mainw->multitrack==NULL) {
       lives_set_cursor_style(LIVES_CURSOR_TOP_LEFT_CORNER,widget);
-    }
-    else {
+    } else {
       lives_set_cursor_style(LIVES_CURSOR_TOP_LEFT_CORNER,mainw->multitrack->play_box);
     }
   }
@@ -1089,55 +1068,55 @@
 }
 
 
-void after_framedraw_widget_changed (LiVESWidget *widget, lives_special_framedraw_rect_t *framedraw) {
+void after_framedraw_widget_changed(LiVESWidget *widget, lives_special_framedraw_rect_t *framedraw) {
   if (mainw->block_param_updates||noupdate) return;
 
   // redraw mask when spin values change
-  framedraw_redraw (framedraw, FALSE, NULL);
+  framedraw_redraw(framedraw, FALSE, NULL);
   if (mainw->framedraw_reset!=NULL) {
-    lives_widget_set_sensitive (mainw->framedraw_reset,TRUE);
+    lives_widget_set_sensitive(mainw->framedraw_reset,TRUE);
   }
   if (mainw->framedraw_preview!=NULL) {
-    lives_widget_set_sensitive (mainw->framedraw_preview,TRUE);
+    lives_widget_set_sensitive(mainw->framedraw_preview,TRUE);
   }
 }
 
 
 
-void on_framedraw_reset_clicked (LiVESButton *button, lives_special_framedraw_rect_t *framedraw) {
+void on_framedraw_reset_clicked(LiVESButton *button, lives_special_framedraw_rect_t *framedraw) {
   // reset to defaults
 
   noupdate=TRUE;
   if (framedraw->xend_param!=NULL) {
     if (framedraw->xend_param->dp==0)
       lives_spin_button_set_value(LIVES_SPIN_BUTTON(framedraw->xend_param->widgets[0]),(double)get_int_param(framedraw->xend_param->def));
-    else 
+    else
       lives_spin_button_set_value(LIVES_SPIN_BUTTON(framedraw->xend_param->widgets[0]),get_double_param(framedraw->xend_param->def));
   }
   if (framedraw->yend_param!=NULL) {
     if (framedraw->yend_param->dp==0)
       lives_spin_button_set_value(LIVES_SPIN_BUTTON(framedraw->yend_param->widgets[0]),(double)get_int_param(framedraw->yend_param->def));
-    else 
+    else
       lives_spin_button_set_value(LIVES_SPIN_BUTTON(framedraw->yend_param->widgets[0]),get_double_param(framedraw->yend_param->def));
   }
   if (framedraw->xstart_param!=NULL) {
     if (framedraw->xstart_param->dp==0)
       lives_spin_button_set_value(LIVES_SPIN_BUTTON(framedraw->xstart_param->widgets[0]),(double)get_int_param(framedraw->xstart_param->def));
-    else 
+    else
       lives_spin_button_set_value(LIVES_SPIN_BUTTON(framedraw->xstart_param->widgets[0]),get_double_param(framedraw->xstart_param->def));
   }
   if (framedraw->ystart_param!=NULL) {
     if (framedraw->ystart_param->dp==0)
       lives_spin_button_set_value(LIVES_SPIN_BUTTON(framedraw->ystart_param->widgets[0]),(double)get_int_param(framedraw->ystart_param->def));
-    else 
+    else
       lives_spin_button_set_value(LIVES_SPIN_BUTTON(framedraw->ystart_param->widgets[0]),get_double_param(framedraw->ystart_param->def));
   }
 
   if (mainw->framedraw_reset!=NULL) {
-    lives_widget_set_sensitive (mainw->framedraw_reset,TRUE);
+    lives_widget_set_sensitive(mainw->framedraw_reset,TRUE);
   }
   if (mainw->framedraw_preview!=NULL) {
-    lives_widget_set_sensitive (mainw->framedraw_preview,TRUE);
+    lives_widget_set_sensitive(mainw->framedraw_preview,TRUE);
   }
 
   // update widgets now
@@ -1145,6 +1124,6 @@
 
   noupdate=FALSE;
 
-  framedraw_redraw (framedraw, FALSE, NULL);
+  framedraw_redraw(framedraw, FALSE, NULL);
 
 }

LiVES-2.2.8.tar.bz2/src/framedraw.h -> LiVES-2.4.1.tar.bz2/src/framedraw.h Changed

@@ -18,13 +18,13 @@
 
 
 /// call this to add framedraw widget to an hbox
-void widget_add_framedraw (LiVESVBox *, int start, int end, boolean add_preview_button, int width, int height);
+void widget_add_framedraw(LiVESVBox *, int start, int end, boolean add_preview_button, int width, int height);
 
 /// redraw when exposed/frame number changes
-void framedraw_redraw (lives_special_framedraw_rect_t *, boolean reload_image, LiVESPixbuf *);
+void framedraw_redraw(lives_special_framedraw_rect_t *, boolean reload_image, LiVESPixbuf *);
 
 /// callback for widgets
-void after_framedraw_widget_changed (LiVESWidget *, lives_special_framedraw_rect_t *);
+void after_framedraw_widget_changed(LiVESWidget *, lives_special_framedraw_rect_t *);
 
 
 /// activate the image for clicks and draws
@@ -48,23 +48,23 @@
 void redraw_framedraw_image(void);
 
 /// change the frame number
-void after_framedraw_frame_spinbutton_changed (LiVESSpinButton *, lives_special_framedraw_rect_t *);
+void after_framedraw_frame_spinbutton_changed(LiVESSpinButton *, lives_special_framedraw_rect_t *);
 
 /// reset button
-void on_framedraw_reset_clicked (LiVESButton *, lives_special_framedraw_rect_t *);
+void on_framedraw_reset_clicked(LiVESButton *, lives_special_framedraw_rect_t *);
 
 
-boolean on_framedraw_mouse_start (LiVESWidget *, LiVESXEventButton *, lives_special_framedraw_rect_t *);
-boolean on_framedraw_mouse_update (LiVESWidget *, LiVESXEventMotion *, lives_special_framedraw_rect_t *);
-boolean on_framedraw_mouse_reset (LiVESWidget *, LiVESXEventButton *, lives_special_framedraw_rect_t *);
+boolean on_framedraw_mouse_start(LiVESWidget *, LiVESXEventButton *, lives_special_framedraw_rect_t *);
+boolean on_framedraw_mouse_update(LiVESWidget *, LiVESXEventMotion *, lives_special_framedraw_rect_t *);
+boolean on_framedraw_mouse_reset(LiVESWidget *, LiVESXEventButton *, lives_special_framedraw_rect_t *);
 
 
-boolean on_framedraw_leave (LiVESWidget *, GdkEventCrossing *, lives_special_framedraw_rect_t *);
-boolean on_framedraw_enter (LiVESWidget *, GdkEventCrossing *, lives_special_framedraw_rect_t *);
+boolean on_framedraw_leave(LiVESWidget *, LiVESXEventCrossing *, lives_special_framedraw_rect_t *);
+boolean on_framedraw_enter(LiVESWidget *, LiVESXEventCrossing *, lives_special_framedraw_rect_t *);
 
 // graphics routines
 
-void draw_rect_demask (lives_colRGBA32_t *col, int x1, int y1, int x2, int y2, boolean filled);
+void draw_rect_demask(lives_colRGBA32_t *col, int x1, int y1, int x2, int y2, boolean filled);
 
 
 #endif

LiVES-2.2.8.tar.bz2/src/giw/giwknob.c -> LiVES-2.4.1.tar.bz2/src/giw/giwknob.c Changed

@@ -16,7 +16,7 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 Maintainers
-Alexandre Pereira Bueno - alpebu@yahoo.com.br 
+Alexandre Pereira Bueno - alpebu@yahoo.com.br
 James Scott Jr <skoona@users.sourceforge.net>
 */
 
@@ -36,81 +36,81 @@
 #define KNOB_DEFAULT_SIZE 150
 
 /* Forward declarations */
-static void giw_knob_class_init               (GiwKnobClass    *klass);
-static void giw_knob_init                     (GiwKnob         *knob);
-static void giw_knob_realize                  (GtkWidget        *widget);
-static void giw_knob_size_request             (GtkWidget      *widget,
-					       GtkRequisition *requisition);
+static void giw_knob_class_init(GiwKnobClass    *klass);
+static void giw_knob_init(GiwKnob         *knob);
+static void giw_knob_realize(GtkWidget        *widget);
+static void giw_knob_size_request(GtkWidget      *widget,
+                                  GtkRequisition *requisition);
 #if GTK_CHECK_VERSION(3,0,0)
-static void giw_knob_dispose (GObject *object);
-static void giw_knob_get_preferred_width (GtkWidget *widget,
-					  gint      *minimal_width,
-					  gint      *natural_width);
-static void giw_knob_get_preferred_height (GtkWidget *widget,
-					   gint      *minimal_height,
-					   gint      *natural_height);
-static gboolean giw_knob_draw                (GtkWidget *widget, cairo_t *cairo);
-static void giw_knob_style_updated             (GtkWidget *widget);
+static void giw_knob_dispose(GObject *object);
+static void giw_knob_get_preferred_width(GtkWidget *widget,
+    gint      *minimal_width,
+    gint      *natural_width);
+static void giw_knob_get_preferred_height(GtkWidget *widget,
+    gint      *minimal_height,
+    gint      *natural_height);
+static gboolean giw_knob_draw(GtkWidget *widget, cairo_t *cairo);
+static void giw_knob_style_updated(GtkWidget *widget);
 #else
-static void giw_knob_destroy (GtkObject *object);
-static gint giw_knob_expose                   (GtkWidget        *widget,
-						GdkEventExpose   *event);
+static void giw_knob_destroy(GtkObject *object);
+static gint giw_knob_expose(GtkWidget        *widget,
+                            GdkEventExpose   *event);
 #endif
 
-static void giw_knob_size_allocate            (GtkWidget     *widget,
-					       GtkAllocation *allocation);
-static gint giw_knob_button_press             (GtkWidget        *widget,
-						GdkEventButton   *event);
-static gint giw_knob_button_release           (GtkWidget        *widget,
-						GdkEventButton   *event);
-static gint giw_knob_motion_notify            (GtkWidget        *widget,
-						GdkEventMotion   *event);
-static void giw_knob_style_set	              (GtkWidget      *widget,
-			                        GtkStyle       *previous_style);
+static void giw_knob_size_allocate(GtkWidget     *widget,
+                                   GtkAllocation *allocation);
+static gint giw_knob_button_press(GtkWidget        *widget,
+                                  GdkEventButton   *event);
+static gint giw_knob_button_release(GtkWidget        *widget,
+                                    GdkEventButton   *event);
+static gint giw_knob_motion_notify(GtkWidget        *widget,
+                                   GdkEventMotion   *event);
+static void giw_knob_style_set(GtkWidget      *widget,
+                               GtkStyle       *previous_style);
 // Changes the value, by mouse position
-void knob_update_mouse                             (GiwKnob *knob, gint x, gint y);
+void knob_update_mouse(GiwKnob *knob, gint x, gint y);
 
 // Updates the false pointer's angle
-void knob_update_false_mouse                       (GiwKnob *knob, gint x, gint y);
+void knob_update_false_mouse(GiwKnob *knob, gint x, gint y);
 
 // Calculate the value, using the angle
-gdouble knob_calculate_value_with_angle               (GiwKnob         *knob,
-						gdouble angle);
+gdouble knob_calculate_value_with_angle(GiwKnob         *knob,
+                                        gdouble angle);
 // Calculate the angle, using the value
-gdouble knob_calculate_angle_with_value               (GiwKnob         *knob,
-						gdouble value); 
-// Calculate all sizes 
-static void knob_calculate_sizes                      (GiwKnob         *knob); 
+gdouble knob_calculate_angle_with_value(GiwKnob         *knob,
+                                        gdouble value);
+// Calculate all sizes
+static void knob_calculate_sizes(GiwKnob         *knob);
 // To make the changes needed when someno changes the lower ans upper fields of the adjustment
-static void giw_knob_adjustment_changed       (GtkAdjustment    *adjustment,
-						gpointer          data);
+static void giw_knob_adjustment_changed(GtkAdjustment    *adjustment,
+                                        gpointer          data);
 // To make the changes needed when someno changes the value of the adjustment
-static void giw_knob_adjustment_value_changed (GtkAdjustment    *adjustment,
-						gpointer          data);
+static void giw_knob_adjustment_value_changed(GtkAdjustment    *adjustment,
+    gpointer          data);
 // A not public knob_set_angle function, for internal using, it only sets the angle, nothing more
-void knob_set_angle                                (GiwKnob *knob,
-						gdouble angle);
+void knob_set_angle(GiwKnob *knob,
+                    gdouble angle);
 // A not public knob_set_value function, for internal using, it only sets the value, nothing more
-void knob_set_value                                (GiwKnob *knob,
-						gdouble value);
+void knob_set_value(GiwKnob *knob,
+                    gdouble value);
 // A function that creates the layout of legends and calculates it's sizes
-void knob_build_legends(GiwKnob *knob); 
+void knob_build_legends(GiwKnob *knob);
 
-// A function that frees the layout of legends 
-void knob_free_legends(GiwKnob *knob); 
+// A function that frees the layout of legends
+void knob_free_legends(GiwKnob *knob);
 
 // A function that creates the layout of the title
 void knob_build_title(GiwKnob *knob);
 
 // A function that calculates width and height of the legend's the layout
-void knob_calculate_legends_sizes(GiwKnob *knob); 
+void knob_calculate_legends_sizes(GiwKnob *knob);
 
 // A function that calculates width and height of the title's the layout
-void knob_calculate_title_sizes(GiwKnob *knob);  
+void knob_calculate_title_sizes(GiwKnob *knob);
 
 
 #if GTK_CHECK_VERSION(3,0,0)
-G_DEFINE_TYPE (GiwKnob, giw_knob, GTK_TYPE_WIDGET)
+G_DEFINE_TYPE(GiwKnob, giw_knob, GTK_TYPE_WIDGET)
 #define parent_class giw_knob_parent_class
 
 #else
@@ -118,29 +118,26 @@
 
 
 /*********************
-* Widget's Functions * 
+* Widget's Functions *
 *********************/
 GType
-giw_knob_get_type ()
-{
+giw_knob_get_type() {
   static GType knob_type = 0;
 
-  if (!knob_type)
-    {
-      static const GtkTypeInfo knob_info =
-	{
-	  "GiwKnob",
-	    sizeof (GiwKnob),
-	  sizeof (GiwKnobClass),
-	  (GtkClassInitFunc) giw_knob_class_init,
-	  (GtkObjectInitFunc) giw_knob_init,
-	    /*(GtkArgSetFunc)*/ NULL,
-	    /*(GtkArgGetFunc)*/ NULL,
-	    (GtkClassInitFunc) NULL,
-	};
-      
-      knob_type = gtk_type_unique (gtk_widget_get_type (), &knob_info);
-    }
+  if (!knob_type) {
+    static const GtkTypeInfo knob_info = {
+      "GiwKnob",
+      sizeof(GiwKnob),
+      sizeof(GiwKnobClass),
+      (GtkClassInitFunc) giw_knob_class_init,
+      (GtkObjectInitFunc) giw_knob_init,
+      /*(GtkArgSetFunc)*/ NULL,
+      /*(GtkArgGetFunc)*/ NULL,
+      (GtkClassInitFunc) NULL,
+    };
+
+    knob_type = gtk_type_unique(gtk_widget_get_type(), &knob_info);
+  }
 
   return knob_type;
 }
@@ -148,21 +145,20 @@
 #endif
 
 static void
-giw_knob_class_init (GiwKnobClass *xclass)
-{
+giw_knob_class_init(GiwKnobClass *xclass) {
 #if GTK_CHECK_VERSION(3,0,0)
   GObjectClass *object_class = G_OBJECT_CLASS(xclass);
 #else
-  GtkObjectClass *object_class = (GtkObjectClass*) xclass;
+  GtkObjectClass *object_class = (GtkObjectClass *) xclass;
 #endif
   GtkWidgetClass *widget_class;
 
-  widget_class = (GtkWidgetClass*) xclass;
+  widget_class = (GtkWidgetClass *) xclass;
 
 #if GTK_CHECK_VERSION(3,0,0)
   object_class->dispose = giw_knob_dispose;
 #else
-  parent_class = (GtkWidgetClass *)gtk_type_class (gtk_widget_get_type ());
+  parent_class = (GtkWidgetClass *)gtk_type_class(gtk_widget_get_type());
   object_class->destroy = giw_knob_destroy;
 #endif
 
@@ -185,10 +181,9 @@
 }
 
 static void
-giw_knob_init (GiwKnob *knob)
-{
-  g_return_if_fail (knob != NULL);
-  g_return_if_fail (GIW_IS_KNOB (knob));
+giw_knob_init(GiwKnob *knob) {
+  g_return_if_fail(knob != NULL);
+  g_return_if_fail(GIW_IS_KNOB(knob));
 
   knob->button=0;
   knob->mouse_policy=GIW_KNOB_MOUSE_AUTOMATICALLY;
@@ -205,65 +200,63 @@
 
 }
 
-GtkWidget*
-giw_knob_new (GtkAdjustment *adjustment)
-{
+GtkWidget *
+giw_knob_new(GtkAdjustment *adjustment) {
   GiwKnob *knob;
-  
-  g_return_val_if_fail (adjustment != NULL, NULL);
+
+  g_return_val_if_fail(adjustment != NULL, NULL);
 
 #if GTK_CHECK_VERSION(3,0,0)
-  knob = (GiwKnob *)g_object_new (GIW_TYPE_KNOB, NULL);
+  knob = (GiwKnob *)g_object_new(GIW_TYPE_KNOB, NULL);
 #else
-  knob = (GiwKnob *)gtk_type_new (giw_knob_get_type ());
+  knob = (GiwKnob *)gtk_type_new(giw_knob_get_type());
 #endif
   giw_knob_set_adjustment(knob, adjustment);
-  
+
   // Without this, in the first draw, the pointer wouldn't be in the right value
   knob_set_angle(knob, knob_calculate_angle_with_value(knob, gtk_adjustment_get_value(adjustment)));
-    
-  return GTK_WIDGET (knob);
+
+  return GTK_WIDGET(knob);
 }
 
-GtkWidget*
-giw_knob_new_with_adjustment (gdouble value, 
-			gdouble lower, 
-			gdouble upper)
-{
+GtkWidget *
+giw_knob_new_with_adjustment(gdouble value,
+                             gdouble lower,
+                             gdouble upper) {
   GiwKnob *knob;
 
 #if GTK_CHECK_VERSION(3,0,0)
-  knob = (GiwKnob *)g_object_new (GIW_TYPE_KNOB, NULL);
+  knob = (GiwKnob *)g_object_new(GIW_TYPE_KNOB, NULL);
 #else
-  knob = (GiwKnob *)gtk_type_new (giw_knob_get_type ());
+  knob = (GiwKnob *)gtk_type_new(giw_knob_get_type());
 #endif
-  giw_knob_set_adjustment(knob, (GtkAdjustment*) gtk_adjustment_new (value, lower, upper, 1.0, 1.0, 1.0));
-  
+  giw_knob_set_adjustment(knob, (GtkAdjustment *) gtk_adjustment_new(value, lower, upper, 1.0, 1.0, 1.0));
+
   // Without this, in the first draw, the pointer wouldn't be in the right value
   knob_set_angle(knob, knob_calculate_angle_with_value(knob, gtk_adjustment_get_value(knob->adjustment)));
-  
-  return GTK_WIDGET (knob);
+
+  return GTK_WIDGET(knob);
 }
 
 #if GTK_CHECK_VERSION(3,0,0)
-static void giw_knob_dispose (GObject *object) {
+static void giw_knob_dispose(GObject *object) {
 #else
-static void giw_knob_destroy (GtkObject *object) {
+static void giw_knob_destroy(GtkObject *object) {
 #endif
   GiwKnob *knob;
   gint loop;
 
-  g_return_if_fail (object != NULL);
-  g_return_if_fail (GIW_IS_KNOB (object));
+  g_return_if_fail(object != NULL);
+  g_return_if_fail(GIW_IS_KNOB(object));
+
+  knob = GIW_KNOB(object);
 
-  knob = GIW_KNOB (object);
-  
   if (knob->adjustment)
-    g_object_unref (G_OBJECT (knob->adjustment));
+    g_object_unref(G_OBJECT(knob->adjustment));
   knob->adjustment=NULL;
 
   if (knob->legends) {
-    for (loop=0; loop<knob->major_ticks; loop++){
+    for (loop=0; loop<knob->major_ticks; loop++) {
       g_object_unref(G_OBJECT(knob->legends[loop]));
     }
     g_free(knob->legends);
@@ -275,16 +268,15 @@
     g_object_unref(G_OBJECT(knob->title));
 
 #if GTK_CHECK_VERSION(3,0,0)
-  G_OBJECT_CLASS (giw_knob_parent_class)->dispose (object);
+  G_OBJECT_CLASS(giw_knob_parent_class)->dispose(object);
 #else
-  if (LIVES_GUI_OBJECT_CLASS (parent_class)->destroy)
-    (* LIVES_GUI_OBJECT_CLASS (parent_class)->destroy) (object);
+  if (LIVES_GUI_OBJECT_CLASS(parent_class)->destroy)
+    (* LIVES_GUI_OBJECT_CLASS(parent_class)->destroy)(object);
 #endif
 }
 
 static void
-giw_knob_realize (GtkWidget *widget)
-{
+giw_knob_realize(GtkWidget *widget) {
   GiwKnob *knob;
   GdkWindowAttr attributes;
   gint attributes_mask;
@@ -292,17 +284,17 @@
 #if GTK_CHECK_VERSION(3,0,0)
   GtkStyleContext *stylecon;
 #endif
-  
-  g_return_if_fail (widget != NULL);
-  g_return_if_fail (GIW_IS_KNOB (widget));
+
+  g_return_if_fail(widget != NULL);
+  g_return_if_fail(GIW_IS_KNOB(widget));
 
 #if GTK_CHECK_VERSION(2,20,0)
   gtk_widget_set_realized(widget,TRUE);
 #else
-  GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
+  GTK_WIDGET_SET_FLAGS(widget, GTK_REALIZED);
 #endif
 
-  knob = GIW_KNOB (widget);
+  knob = GIW_KNOB(widget);
 
   attributes.x = lives_widget_get_allocation_x(widget);
   attributes.y = lives_widget_get_allocation_y(widget);
@@ -310,24 +302,24 @@
   attributes.height = lives_widget_get_allocation_height(widget);
   attributes.wclass = GDK_INPUT_OUTPUT;
   attributes.window_type = GDK_WINDOW_CHILD;
-  attributes.event_mask = gtk_widget_get_events (widget) | 
-    GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK | 
-    GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK |
-    GDK_POINTER_MOTION_HINT_MASK;
+  attributes.event_mask = gtk_widget_get_events(widget) |
+                          GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK |
+                          GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK |
+                          GDK_POINTER_MOTION_HINT_MASK;
 
   attributes_mask = GDK_WA_X | GDK_WA_Y;
-  
+
 
 #if !GTK_CHECK_VERSION(3,0,0)
   attributes_mask |= GDK_WA_COLORMAP | GDK_WA_VISUAL;
-  attributes.visual = gtk_widget_get_visual (widget);
-  attributes.colormap = gtk_widget_get_colormap (widget);
+  attributes.visual = gtk_widget_get_visual(widget);
+  attributes.colormap = gtk_widget_get_colormap(widget);
 #endif
 
 #if GTK_CHECK_VERSION(2,18,0)
-  gtk_widget_set_window(widget,gdk_window_new (lives_widget_get_xwindow(lives_widget_get_parent(widget)), &attributes, attributes_mask));
+  gtk_widget_set_window(widget,gdk_window_new(lives_widget_get_xwindow(lives_widget_get_parent(widget)), &attributes, attributes_mask));
 #else
-  widget->window = gdk_window_new (widget->parent->window, &attributes, attributes_mask);
+  widget->window = gdk_window_new(widget->parent->window, &attributes, attributes_mask);
 #endif
 
 #if GTK_CHECK_VERSION(3,0,0)
@@ -336,12 +328,12 @@
   gtk_style_context_set_state(stylecon,GTK_STATE_FLAG_ACTIVE);
   gtk_style_context_set_background(stylecon,lives_widget_get_xwindow(lives_widget_get_parent(widget)));
 #else
-  widget->style = gtk_style_attach (widget->style, lives_widget_get_xwindow(widget));
-  gtk_style_set_background (widget->style, lives_widget_get_xwindow(widget), GTK_STATE_ACTIVE);
+  widget->style = gtk_style_attach(widget->style, lives_widget_get_xwindow(widget));
+  gtk_style_set_background(widget->style, lives_widget_get_xwindow(widget), GTK_STATE_ACTIVE);
 #endif
 
-  gdk_window_set_user_data (lives_widget_get_xwindow(widget), widget);
-    
+  gdk_window_set_user_data(lives_widget_get_xwindow(widget), widget);
+
   // Create the initial legends
   knob_build_legends(knob);
 }
@@ -349,10 +341,9 @@
 
 
 
-static void 
-giw_knob_size_request (GtkWidget      *widget,
-		       GtkRequisition *requisition)
-{
+static void
+giw_knob_size_request(GtkWidget      *widget,
+                      GtkRequisition *requisition) {
   requisition->width = KNOB_DEFAULT_SIZE;
   requisition->height = KNOB_DEFAULT_SIZE;
 }
@@ -360,25 +351,23 @@
 #if GTK_CHECK_VERSION(3,0,0)
 
 static void
-giw_knob_get_preferred_width (GtkWidget *widget,
-    gint      *minimal_width,
-    gint      *natural_width)
-{
+giw_knob_get_preferred_width(GtkWidget *widget,
+                             gint      *minimal_width,
+                             gint      *natural_width) {
   GtkRequisition requisition;
 
-  giw_knob_size_request (widget, &requisition);
+  giw_knob_size_request(widget, &requisition);
 
   *minimal_width = *natural_width = requisition.width/4.;
 }
 
 static void
-giw_knob_get_preferred_height (GtkWidget *widget,
-    gint      *minimal_height,
-    gint      *natural_height)
-{
+giw_knob_get_preferred_height(GtkWidget *widget,
+                              gint      *minimal_height,
+                              gint      *natural_height) {
   GtkRequisition requisition;
 
-  giw_knob_size_request (widget, &requisition);
+  giw_knob_size_request(widget, &requisition);
 
   *minimal_height = *natural_height = requisition.height/4.;
 }
@@ -386,14 +375,13 @@
 #endif
 
 static void
-giw_knob_size_allocate (GtkWidget     *widget,
-			GtkAllocation *allocation)
-{
+giw_knob_size_allocate(GtkWidget     *widget,
+                       GtkAllocation *allocation) {
   GiwKnob *knob;
 
-  g_return_if_fail (widget != NULL);
-  g_return_if_fail (GIW_IS_KNOB (widget));
-  g_return_if_fail (allocation != NULL);
+  g_return_if_fail(widget != NULL);
+  g_return_if_fail(GIW_IS_KNOB(widget));
+  g_return_if_fail(allocation != NULL);
 
 #if GTK_CHECK_VERSION(2,18,0)
   gtk_widget_set_allocation(widget,allocation);
@@ -401,28 +389,26 @@
   widget->allocation = *allocation;
 #endif
 
-  knob = GIW_KNOB (widget);
+  knob = GIW_KNOB(widget);
 
-  if (lives_widget_is_realized (widget))
-    {
-      gdk_window_move_resize (lives_widget_get_xwindow(widget),
-			      allocation->x, allocation->y,
-			      allocation->width, allocation->height);
-      
-    }
+  if (lives_widget_is_realized(widget)) {
+    gdk_window_move_resize(lives_widget_get_xwindow(widget),
+                           allocation->x, allocation->y,
+                           allocation->width, allocation->height);
+
+  }
   knob_calculate_sizes(knob);
 }
 
 
 #if GTK_CHECK_VERSION(3,0,0)
- static gboolean giw_knob_draw (GtkWidget *widget, cairo_t *cairo) {
-   //GdkRGBA color;
+static gboolean giw_knob_draw(GtkWidget *widget, cairo_t *cairo) {
+  //GdkRGBA color;
 #else
 
 static gint
-giw_knob_expose (GtkWidget      *widget,
-		 GdkEventExpose *event)
-{
+giw_knob_expose(GtkWidget      *widget,
+                GdkEventExpose *event) {
 #endif
   GiwKnob *knob;
   gdouble s,c;
@@ -432,44 +418,45 @@
   gint counter=0;
   GdkRectangle rect;
 
-  g_return_val_if_fail (widget != NULL, FALSE);
-  g_return_val_if_fail (GIW_IS_KNOB (widget), FALSE);
+  g_return_val_if_fail(widget != NULL, FALSE);
+  g_return_val_if_fail(GIW_IS_KNOB(widget), FALSE);
 #if !GTK_CHECK_VERSION(3,0,0)
-  g_return_val_if_fail (event != NULL, FALSE);
+  g_return_val_if_fail(event != NULL, FALSE);
   if (event->count > 0)
     return FALSE;
 #endif
-      
+
   knob=GIW_KNOB(widget);
 
-  rect.x=0;rect.y=0;
+  rect.x=0;
+  rect.y=0;
   rect.width=lives_widget_get_allocation_width(widget);
   rect.height=lives_widget_get_allocation_height(widget);
 
   // The center
   xc = lives_widget_get_allocation_width(widget)/2;
   yc = lives_widget_get_allocation_height(widget)/2;
-    
+
   s = sin(knob->angle);
   c = cos(knob->angle);
 
 
 #if GTK_CHECK_VERSION(3,0,0)
   gtk_render_background(gtk_widget_get_style_context(widget),
-			cairo,
-			0,
-			0,
-			rect.width,
-			rect.height);
+                        cairo,
+                        0,
+                        0,
+                        rect.width,
+                        rect.height);
 
-  cairo_set_source_rgb (cairo, 0., 0., 0.);
+  cairo_set_source_rgb(cairo, 0., 0., 0.);
 
   cairo_arc(cairo,
-	    knob->x+((knob->size/2)),
-	    knob->y+((knob->size/2)),
-	    knob->radius,
-	    0,
-	    2.*M_PI);
+            knob->x+((knob->size/2)),
+            knob->y+((knob->size/2)),
+            knob->radius,
+            0,
+            2.*M_PI);
 
   cairo_fill(cairo);
 
@@ -479,33 +466,33 @@
   cairo_set_source_rgba (cairo, color.red, color.green, color.blue, color.alpha);
 
   cairo_arc(cairo,
-	    knob->x+((knob->size/2)),
-	    knob->y+((knob->size/2)),
-	    knob->radius/4.*3.,
-	    0,
-	    2.*M_PI);
+      knob->x+((knob->size/2)),
+      knob->y+((knob->size/2)),
+      knob->radius/4.*3.,
+      0,
+      2.*M_PI);
 
-	    cairo_fill(cairo);*/
+      cairo_fill(cairo);*/
 
 
-  cairo_set_source_rgb (cairo, 1., 1., 1.);
+  cairo_set_source_rgb(cairo, 1., 1., 1.);
 
   cairo_move_to(cairo,
-		xc+c*((float)knob->radius*0.6),
-		yc-s*((float)knob->radius*0.6));
+                xc+c*((float)knob->radius*0.6),
+                yc-s*((float)knob->radius*0.6));
 
   cairo_line_to(cairo,
-		xc+c*knob->radius,
-		yc-s*knob->radius);
+                xc+c*knob->radius,
+                yc-s*knob->radius);
 
   cairo_stroke(cairo);
 
   cairo_arc(cairo,
-	    xc+c*((float)knob->radius*0.8),
-	    yc-s*((float)knob->radius*0.8),
-	    knob->radius/2*0.1,
-	    0,
-	    2.*M_PI);
+            xc+c*((float)knob->radius*0.8),
+            yc-s*((float)knob->radius*0.8),
+            knob->radius/2*0.1,
+            0,
+            2.*M_PI);
 
   cairo_fill(cairo);
 
@@ -516,11 +503,11 @@
     //lives_widget_get_fg_state_color (widget, GTK_STATE_FLAG_PRELIGHT, &color);
 
     cairo_move_to(cairo,
-		  xc+c*((float)knob->radius*0.8),
-		  yc-s*((float)knob->radius*0.8));
+                  xc+c*((float)knob->radius*0.8),
+                  yc-s*((float)knob->radius*0.8));
     cairo_line_to(cairo,
-		  xc+c*knob->radius,
-		  yc-s*knob->radius);
+                  xc+c*knob->radius,
+                  yc-s*knob->radius);
 
 
   }
@@ -528,309 +515,306 @@
   // Now, draw the ticks
   // The major ticks (and legends)
   if (knob->major_ticks!=0)
-    for (loop1=(3.0*M_PI/2.0); loop1>=-0.0001; loop1-=knob->d_major_ticks){ // -0.0001 (and not 0) to avoid rounding errors
+    for (loop1=(3.0*M_PI/2.0); loop1>=-0.0001; loop1-=knob->d_major_ticks) { // -0.0001 (and not 0) to avoid rounding errors
       s=sin(loop1-M_PI/4.0);
       c=cos(loop1-M_PI/4.0);
       dx1=c*knob->radius;
       dy1=s*knob->radius;
       dx2=c*(knob->radius+knob->major_ticks_size);
       dy2=s*(knob->radius+knob->major_ticks_size);
-      cairo_move_to (cairo,
-		     xc+dx1,
-		     yc-dy1);
+      cairo_move_to(cairo,
+                    xc+dx1,
+                    yc-dy1);
 
       cairo_line_to(cairo,
-		    xc+dx2,
-		    yc-dy2);
+                    xc+dx2,
+                    yc-dy2);
 
       cairo_stroke(cairo);
 
       // Drawing the legends
       if (knob->legends_digits!=0)
-        gtk_render_layout (gtk_widget_get_style_context(widget),
-			   cairo,
-			   xc+(c*knob->legend_radius)-(knob->legend_width/2),
-			   yc-(s*knob->legend_radius)-(knob->legend_height/2),
-			   knob->legends[counter]);
+        gtk_render_layout(gtk_widget_get_style_context(widget),
+                          cairo,
+                          xc+(c*knob->legend_radius)-(knob->legend_width/2),
+                          yc-(s*knob->legend_radius)-(knob->legend_height/2),
+                          knob->legends[counter]);
       counter++;
     }
 
 
   // The minor ticks
   if (knob->minor_ticks!=0)
-    for (loop1=(3.0*M_PI/2.0); loop1>=0.0; loop1-=knob->d_minor_ticks){
+    for (loop1=(3.0*M_PI/2.0); loop1>=0.0; loop1-=knob->d_minor_ticks) {
       s=sin(loop1-M_PI/4.0);
       c=cos(loop1-M_PI/4.0);
       dx1=c*knob->radius;
       dy1=s*knob->radius;
       dx2=c*(knob->radius+knob->minor_ticks_size);
       dy2=s*(knob->radius+knob->minor_ticks_size);
-      cairo_move_to (cairo,
-		     xc+dx1,
-		     yc-dy1);
-      cairo_line_to (cairo,
-		     xc+dx2,
-		     yc-dy2); 
+      cairo_move_to(cairo,
+                    xc+dx1,
+                    yc-dy1);
+      cairo_line_to(cairo,
+                    xc+dx2,
+                    yc-dy2);
       cairo_stroke(cairo);
     }
 
   // Draw the title
   if (knob->title_str!=NULL) // font_str==NULL means no title
-    gtk_render_layout (gtk_widget_get_style_context(widget),
-		       cairo,
-		       xc-knob->title_width/2,
-		       knob->size-knob->title_height-5, // 5 pixels to separate from the borders
-		       knob->title);
+    gtk_render_layout(gtk_widget_get_style_context(widget),
+                      cairo,
+                      xc-knob->title_width/2,
+                      knob->size-knob->title_height-5, // 5 pixels to separate from the borders
+                      knob->title);
 
 #else
   // Drawing background
-  gtk_paint_flat_box (widget->style,
-			widget->window,
-			GTK_STATE_NORMAL,
-			GTK_SHADOW_NONE,
-			&rect,
-			widget,
-			NULL, 
-			0, 
-			0, 
-			-1,
-			-1);			
+  gtk_paint_flat_box(widget->style,
+                     widget->window,
+                     GTK_STATE_NORMAL,
+                     GTK_SHADOW_NONE,
+                     &rect,
+                     widget,
+                     NULL,
+                     0,
+                     0,
+                     -1,
+                     -1);
 
   // The arc
-  gdk_draw_arc (widget->window,
-			widget->style->black_gc,
-			TRUE,
-			knob->x+((knob->size/2)-knob->radius),
-			knob->y+((knob->size/2)-knob->radius),
-			knob->radius*2,
-			knob->radius*2,
-			0,
-			360*64);
- 
-
- 
-  gdk_draw_line (widget->window,
-			widget->style->white_gc,
-			xc+c*((float)knob->radius*0.6),
-			yc-s*((float)knob->radius*0.6),
-			xc+c*knob->radius,
-			yc-s*knob->radius);
-  gdk_draw_arc (widget->window,
-			widget->style->white_gc,
-			TRUE,
-			xc+c*((float)knob->radius*0.8)-knob->radius*0.1,
-			yc-s*((float)knob->radius*0.8)-knob->radius*0.1,
-			knob->radius*0.2,
-			knob->radius*0.2,
-			0,
-			360*64);
-
- // Draw the false-pointer if the delayed policy of mouse is set and a button is pressed
+  gdk_draw_arc(widget->window,
+               widget->style->black_gc,
+               TRUE,
+               knob->x+((knob->size/2)-knob->radius),
+               knob->y+((knob->size/2)-knob->radius),
+               knob->radius*2,
+               knob->radius*2,
+               0,
+               360*64);
+
+
+
+  gdk_draw_line(widget->window,
+                widget->style->white_gc,
+                xc+c*((float)knob->radius*0.6),
+                yc-s*((float)knob->radius*0.6),
+                xc+c*knob->radius,
+                yc-s*knob->radius);
+  gdk_draw_arc(widget->window,
+               widget->style->white_gc,
+               TRUE,
+               xc+c*((float)knob->radius*0.8)-knob->radius*0.1,
+               yc-s*((float)knob->radius*0.8)-knob->radius*0.1,
+               knob->radius*0.2,
+               knob->radius*0.2,
+               0,
+               360*64);
+
+  // Draw the false-pointer if the delayed policy of mouse is set and a button is pressed
   if ((knob->mouse_policy==GIW_KNOB_MOUSE_DELAYED) & (knob->button!=0)) {
     s = sin(knob->false_angle);
     c = cos(knob->false_angle);
 
-    gdk_draw_line (widget->window,
-			widget->style->fg_gc[widget->state],
-			xc+c*((float)knob->radius*0.8),
-			yc-s*((float)knob->radius*0.8),
-			xc+c*knob->radius,
-			yc-s*knob->radius);
-
-    gdk_draw_arc (widget->window,
-			widget->style->black_gc,
-			FALSE,
-			xc+c*((float)knob->radius*0.8)-knob->radius*0.1,
-			yc-s*((float)knob->radius*0.8)-knob->radius*0.1,
-			knob->radius*0.2,
-			knob->radius*0.2,
-			0,
-			360*64);
+    gdk_draw_line(widget->window,
+                  widget->style->fg_gc[widget->state],
+                  xc+c*((float)knob->radius*0.8),
+                  yc-s*((float)knob->radius*0.8),
+                  xc+c*knob->radius,
+                  yc-s*knob->radius);
+
+    gdk_draw_arc(widget->window,
+                 widget->style->black_gc,
+                 FALSE,
+                 xc+c*((float)knob->radius*0.8)-knob->radius*0.1,
+                 yc-s*((float)knob->radius*0.8)-knob->radius*0.1,
+                 knob->radius*0.2,
+                 knob->radius*0.2,
+                 0,
+                 360*64);
   }
-  
+
   // Now, draw the ticks
   // The major ticks (and legends)
   if (knob->major_ticks!=0)
-    for (loop1=(3.0*M_PI/2.0); loop1>=-0.0001; loop1-=knob->d_major_ticks){ // -0.0001 (and not 0) to avoid rounding errors
+    for (loop1=(3.0*M_PI/2.0); loop1>=-0.0001; loop1-=knob->d_major_ticks) { // -0.0001 (and not 0) to avoid rounding errors
       s=sin(loop1-M_PI/4.0);
       c=cos(loop1-M_PI/4.0);
       dx1=c*knob->radius;
       dy1=s*knob->radius;
       dx2=c*(knob->radius+knob->major_ticks_size);
       dy2=s*(knob->radius+knob->major_ticks_size);
-      gdk_draw_line (widget->window,
-			widget->style->fg_gc[widget->state],
-			xc+dx1,
-			yc-dy1,
-			xc+dx2,
-			yc-dy2);
+      gdk_draw_line(widget->window,
+                    widget->style->fg_gc[widget->state],
+                    xc+dx1,
+                    yc-dy1,
+                    xc+dx2,
+                    yc-dy2);
       // Drawing the legends
       if (knob->legends_digits!=0)
-        gtk_paint_layout (widget->style,
-			  widget->window,
-			  GTK_STATE_NORMAL,
-			  TRUE,
-			  &rect,
-			  widget,
-			  NULL,
-			  xc+(c*knob->legend_radius)-(knob->legend_width/2),
-			  yc-(s*knob->legend_radius)-(knob->legend_height/2),
-			  knob->legends[counter]);
+        gtk_paint_layout(widget->style,
+                         widget->window,
+                         GTK_STATE_NORMAL,
+                         TRUE,
+                         &rect,
+                         widget,
+                         NULL,
+                         xc+(c*knob->legend_radius)-(knob->legend_width/2),
+                         yc-(s*knob->legend_radius)-(knob->legend_height/2),
+                         knob->legends[counter]);
       counter++;
     }
   // The minor ticks
   if (knob->minor_ticks!=0)
-    for (loop1=(3.0*M_PI/2.0); loop1>=0.0; loop1-=knob->d_minor_ticks){
+    for (loop1=(3.0*M_PI/2.0); loop1>=0.0; loop1-=knob->d_minor_ticks) {
       s=sin(loop1-M_PI/4.0);
       c=cos(loop1-M_PI/4.0);
       dx1=c*knob->radius;
       dy1=s*knob->radius;
       dx2=c*(knob->radius+knob->minor_ticks_size);
       dy2=s*(knob->radius+knob->minor_ticks_size);
-      gdk_draw_line (widget->window,
-			widget->style->fg_gc[widget->state],
-			xc+dx1,
-			yc-dy1,
-			xc+dx2,
-			yc-dy2); 
+      gdk_draw_line(widget->window,
+                    widget->style->fg_gc[widget->state],
+                    xc+dx1,
+                    yc-dy1,
+                    xc+dx2,
+                    yc-dy2);
     }
-    
+
   // Draw the title
   if (knob->title_str!=NULL) // font_str==NULL means no title
-    gtk_paint_layout (widget->style,
-		      widget->window,
-		      GTK_STATE_NORMAL,
-		      TRUE,
-		      &rect,
-		      widget,
-		      NULL,
-		      xc-knob->title_width/2,
-		      knob->size-knob->title_height-5, // 5 pixels to separate from the borders
-		      knob->title);
+    gtk_paint_layout(widget->style,
+                     widget->window,
+                     GTK_STATE_NORMAL,
+                     TRUE,
+                     &rect,
+                     widget,
+                     NULL,
+                     xc-knob->title_width/2,
+                     knob->size-knob->title_height-5, // 5 pixels to separate from the borders
+                     knob->title);
 
 #endif
-    
+
   return FALSE;
 }
 
 
 static gint
-giw_knob_button_press (GtkWidget      *widget,
-		       GdkEventButton *event)
-{
+giw_knob_button_press(GtkWidget      *widget,
+                      GdkEventButton *event) {
   GiwKnob *knob;
   gint xc, yc, dx, dy;
-    
-  g_return_val_if_fail (widget != NULL, TRUE);
-  g_return_val_if_fail (GIW_IS_KNOB (widget), TRUE);
-  g_return_val_if_fail (event != NULL, TRUE);
 
-  knob = GIW_KNOB (widget);
-    
+  g_return_val_if_fail(widget != NULL, TRUE);
+  g_return_val_if_fail(GIW_IS_KNOB(widget), TRUE);
+  g_return_val_if_fail(event != NULL, TRUE);
+
+  knob = GIW_KNOB(widget);
+
   if (knob->mouse_policy==GIW_KNOB_MOUSE_DISABLED) return TRUE;
   if (knob->button) return TRUE; // Some button is already pressed
 
   /* To verify if the pointer is in the knob, the distance between the pointer and the center
   of the circle is calculated, if it's less the the radius of the circle , it's in!!*/
-   
+
   xc = lives_widget_get_allocation_width(widget)/2;
   yc = lives_widget_get_allocation_height(widget)/2;
-  
+
   dx = abs((int)event->x - xc);
   dy = abs((int)event->y - yc);
-      
+
   if (!knob->button & (dx<knob->radius) & (dy<knob->radius))
     knob->button = event->button;
-  
+
   return FALSE;
 }
 
 static gint
-giw_knob_button_release (GtkWidget      *widget,
-			  GdkEventButton *event)
-{
+giw_knob_button_release(GtkWidget      *widget,
+                        GdkEventButton *event) {
   GiwKnob *knob;
   gint x, y;
-  
-  g_return_val_if_fail (widget != NULL, TRUE);
-  g_return_val_if_fail (GIW_IS_KNOB (widget), TRUE);
-  g_return_val_if_fail (event != NULL, TRUE);
 
-  knob = GIW_KNOB (widget);
-  
-  g_return_val_if_fail (knob->adjustment != NULL,TRUE);
+  g_return_val_if_fail(widget != NULL, TRUE);
+  g_return_val_if_fail(GIW_IS_KNOB(widget), TRUE);
+  g_return_val_if_fail(event != NULL, TRUE);
+
+  knob = GIW_KNOB(widget);
+
+  g_return_val_if_fail(knob->adjustment != NULL,TRUE);
 
   if (knob->mouse_policy==GIW_KNOB_MOUSE_DISABLED) return TRUE;
-	  
-     // If the policy is delayed, now that the button was released (if it is), it's time to update the value
-  if ((knob->mouse_policy == GIW_KNOB_MOUSE_DELAYED) && 
-      (knob->button == event->button )){
+
+  // If the policy is delayed, now that the button was released (if it is), it's time to update the value
+  if ((knob->mouse_policy == GIW_KNOB_MOUSE_DELAYED) &&
+      (knob->button == event->button)) {
     x = event->x;
     y = event->y;
 
-    knob_update_mouse (knob, x,y);
+    knob_update_mouse(knob, x,y);
   }
 
 
   if (knob->button == event->button)
     knob->button = 0;
-  
+
   return FALSE;
 }
 
 static gint
-giw_knob_motion_notify (GtkWidget      *widget,
-			 GdkEventMotion *event)
-{
+giw_knob_motion_notify(GtkWidget      *widget,
+                       GdkEventMotion *event) {
   GiwKnob *knob;
   gint x, y;
 
-  g_return_val_if_fail (widget != NULL,TRUE);
-  g_return_val_if_fail (GTK_IS_WIDGET (widget),TRUE);
-  g_return_val_if_fail (GIW_IS_KNOB (widget),TRUE);
-  g_return_val_if_fail (event != NULL,TRUE);
+  g_return_val_if_fail(widget != NULL,TRUE);
+  g_return_val_if_fail(GTK_IS_WIDGET(widget),TRUE);
+  g_return_val_if_fail(GIW_IS_KNOB(widget),TRUE);
+  g_return_val_if_fail(event != NULL,TRUE);
 
-  knob = GIW_KNOB (widget);
+  knob = GIW_KNOB(widget);
+
+  g_return_val_if_fail(knob->adjustment != NULL,TRUE);
 
-  g_return_val_if_fail (knob->adjustment != NULL,TRUE);
-  
   if (knob->mouse_policy==GIW_KNOB_MOUSE_DISABLED) return TRUE;
-	  
-  // If the some button is pressed and the policy is set to update the value AUTOMATICALLY, update the knob's value 
-  if ( (knob->button != 0) && (knob->mouse_policy == GIW_KNOB_MOUSE_AUTOMATICALLY)) {
+
+  // If the some button is pressed and the policy is set to update the value AUTOMATICALLY, update the knob's value
+  if ((knob->button != 0) && (knob->mouse_policy == GIW_KNOB_MOUSE_AUTOMATICALLY)) {
     x = event->x;
     y = event->y;
 
-    if (event->is_hint || (event->window != lives_widget_get_xwindow(widget))) 
+    if (event->is_hint || (event->window != lives_widget_get_xwindow(widget)))
 #if GTK_CHECK_VERSION(3,0,0)
-      gdk_window_get_device_position (lives_widget_get_xwindow(widget),
-				      gdk_event_get_device ((GdkEvent *)(event)),
-				      &x,
-				      &y,
-				      NULL);
+      gdk_window_get_device_position(lives_widget_get_xwindow(widget),
+                                     gdk_event_get_device((GdkEvent *)(event)),
+                                     &x,
+                                     &y,
+                                     NULL);
 #else
-    gdk_window_get_pointer (lives_widget_get_xwindow(widget), &x, &y, NULL);
+      gdk_window_get_pointer(lives_widget_get_xwindow(widget), &x, &y, NULL);
 #endif
-    knob_update_mouse (knob, x, y);
+    knob_update_mouse(knob, x, y);
   }
-  
-  // If the some button is pressed and the policy is set to update the value delayed, update the knob's false pointer's angle 
-  if ( (knob->button != 0) && (knob->mouse_policy==GIW_KNOB_MOUSE_DELAYED)){
+
+  // If the some button is pressed and the policy is set to update the value delayed, update the knob's false pointer's angle
+  if ((knob->button != 0) && (knob->mouse_policy==GIW_KNOB_MOUSE_DELAYED)) {
     x = event->x;
     y = event->y;
 
     if (event->is_hint || (event->window != lives_widget_get_xwindow(widget)))
 #if GTK_CHECK_VERSION(3,0,0)
-      gdk_window_get_device_position (lives_widget_get_xwindow(widget),
-				      gdk_event_get_device ((GdkEvent *)(event)),
-				      &x,
-				      &y,
-				      NULL);
+      gdk_window_get_device_position(lives_widget_get_xwindow(widget),
+                                     gdk_event_get_device((GdkEvent *)(event)),
+                                     &x,
+                                     &y,
+                                     NULL);
 #else
-    gdk_window_get_pointer (lives_widget_get_xwindow(widget), &x, &y, NULL);
+      gdk_window_get_pointer(lives_widget_get_xwindow(widget), &x, &y, NULL);
 #endif
 
-    knob_update_false_mouse (knob, x, y);
+    knob_update_false_mouse(knob, x, y);
   }
 
   /*if (knob->button != 0)
@@ -843,21 +827,20 @@
 
       knob_update_mouse (knob, x,y);
     }*/
-   
+
   return FALSE;
 }
 
 static void
-giw_knob_style_set (GtkWidget *widget,
-			GtkStyle *previous_style)
-{
+giw_knob_style_set(GtkWidget *widget,
+                   GtkStyle *previous_style) {
   GiwKnob *knob;
-  
-  g_return_if_fail (widget != NULL);
-  g_return_if_fail (GIW_IS_KNOB (widget));
-  
-  knob = GIW_KNOB (widget);
-  
+
+  g_return_if_fail(widget != NULL);
+  g_return_if_fail(GIW_IS_KNOB(widget));
+
+  knob = GIW_KNOB(widget);
+
   // The only thing to fo is recalculate the layout's sizes
   knob_calculate_legends_sizes(knob);
   knob_calculate_title_sizes(knob);
@@ -865,147 +848,138 @@
 
 #if GTK_CHECK_VERSION(3,0,0)
 static void
-giw_knob_style_updated (GtkWidget *widget)
-{
+giw_knob_style_updated(GtkWidget *widget) {
 
 }
 
 #endif
 
 /******************
-* Users Functions * 
+* Users Functions *
 ******************/
 
 gdouble
-giw_knob_get_value (GiwKnob *knob)
-{
-  g_return_val_if_fail (knob != NULL, 0.0);
-  g_return_val_if_fail (GIW_IS_KNOB (knob), 0.0);
+giw_knob_get_value(GiwKnob *knob) {
+  g_return_val_if_fail(knob != NULL, 0.0);
+  g_return_val_if_fail(GIW_IS_KNOB(knob), 0.0);
 
   return (gtk_adjustment_get_value(knob->adjustment));
 }
 
-void 
-giw_knob_set_value (GiwKnob *knob, 
-			gdouble value)
-{
-  g_return_if_fail (knob != NULL);
-  g_return_if_fail (GIW_IS_KNOB (knob));
-  
-  
+void
+giw_knob_set_value(GiwKnob *knob,
+                   gdouble value) {
+  g_return_if_fail(knob != NULL);
+  g_return_if_fail(GIW_IS_KNOB(knob));
+
+
   if (value!=gtk_adjustment_get_value(knob->adjustment)) {
-    knob_set_value(knob, value);  
-    g_return_if_fail (knob->adjustment != NULL);
+    knob_set_value(knob, value);
+    g_return_if_fail(knob->adjustment != NULL);
     gtk_adjustment_value_changed(knob->adjustment);
   }
 }
 
 void
-giw_knob_set_adjustment (GiwKnob *knob,
-			 GtkAdjustment *adjustment)
-{
-  g_return_if_fail (knob != NULL);
-  g_return_if_fail (GIW_IS_KNOB (knob));
-  g_return_if_fail (adjustment != NULL);
+giw_knob_set_adjustment(GiwKnob *knob,
+                        GtkAdjustment *adjustment) {
+  g_return_if_fail(knob != NULL);
+  g_return_if_fail(GIW_IS_KNOB(knob));
+  g_return_if_fail(adjustment != NULL);
 
   // Freeing the last one
-  if (knob->adjustment){
+  if (knob->adjustment) {
 #if GTK_CHECK_VERSION(3,0,0)
     g_signal_handler_disconnect((gpointer)(knob->adjustment),knob->chsig);
     g_signal_handler_disconnect((gpointer)(knob->adjustment),knob->vchsig);
 #else
-    gtk_signal_disconnect_by_data (LIVES_GUI_OBJECT (knob->adjustment), (gpointer) knob);
+    gtk_signal_disconnect_by_data(LIVES_GUI_OBJECT(knob->adjustment), (gpointer) knob);
 #endif
-    g_object_unref (LIVES_GUI_OBJECT (knob->adjustment));
+    g_object_unref(LIVES_GUI_OBJECT(knob->adjustment));
   }
-   
+
   knob->adjustment = adjustment;
-  g_object_ref (LIVES_GUI_OBJECT (knob->adjustment));
-  
-  knob->chsig = g_signal_connect (LIVES_GUI_OBJECT (adjustment), "changed",
-				  (GCallback) giw_knob_adjustment_changed,
-				  (gpointer) knob);
-  knob->vchsig = g_signal_connect (LIVES_GUI_OBJECT (adjustment), "value_changed",
-				   (GCallback) giw_knob_adjustment_value_changed,
-				   (gpointer) knob);
+  g_object_ref(LIVES_GUI_OBJECT(knob->adjustment));
+
+  knob->chsig = g_signal_connect(LIVES_GUI_OBJECT(adjustment), "changed",
+                                 (GCallback) giw_knob_adjustment_changed,
+                                 (gpointer) knob);
+  knob->vchsig = g_signal_connect(LIVES_GUI_OBJECT(adjustment), "value_changed",
+                                  (GCallback) giw_knob_adjustment_value_changed,
+                                  (gpointer) knob);
 
   gtk_adjustment_value_changed(knob->adjustment);
-    
+
   gtk_adjustment_changed(knob->adjustment);
 }
 
-GtkAdjustment* 
-giw_knob_get_adjustment (GiwKnob *knob)
-{
-  g_return_val_if_fail (knob != NULL, NULL);
-  g_return_val_if_fail (GIW_IS_KNOB (knob), NULL);
+GtkAdjustment *
+giw_knob_get_adjustment(GiwKnob *knob) {
+  g_return_val_if_fail(knob != NULL, NULL);
+  g_return_val_if_fail(GIW_IS_KNOB(knob), NULL);
 
-  return(knob->adjustment);
+  return (knob->adjustment);
 }
 
 void
-giw_knob_set_legends_digits (GiwKnob *knob,
-			guint digits_number)
-{
-  g_return_if_fail (knob != NULL);
-  g_return_if_fail (GIW_IS_KNOB (knob));
-  
-  if (digits_number != knob->legends_digits){
+giw_knob_set_legends_digits(GiwKnob *knob,
+                            guint digits_number) {
+  g_return_if_fail(knob != NULL);
+  g_return_if_fail(GIW_IS_KNOB(knob));
+
+  if (digits_number != knob->legends_digits) {
     knob_free_legends(knob);
-  
+
     knob->legends_digits=digits_number;
-  
+
     knob_build_legends(knob);
     knob_calculate_sizes(knob);
-    gtk_widget_queue_draw(GTK_WIDGET(knob));  
+    gtk_widget_queue_draw(GTK_WIDGET(knob));
   }
 }
 
 void
-giw_knob_set_ticks_number (GiwKnob *knob,
-			guint major, guint minor)
-{
-  g_return_if_fail (knob != NULL);
-  g_return_if_fail (GIW_IS_KNOB (knob));
-  
-  if ((major != knob->major_ticks) || (minor != knob->minor_ticks)){
-    knob_free_legends(knob); 
-  
+giw_knob_set_ticks_number(GiwKnob *knob,
+                          guint major, guint minor) {
+  g_return_if_fail(knob != NULL);
+  g_return_if_fail(GIW_IS_KNOB(knob));
+
+  if ((major != knob->major_ticks) || (minor != knob->minor_ticks)) {
+    knob_free_legends(knob);
+
     knob->major_ticks=major;
-     
+
     if (knob->major_ticks==0)
       knob->minor_ticks=0;          // It's impossible to have minor ticks without major ticks
     else
       knob->minor_ticks=minor;
-  
+
     knob_build_legends(knob);
     knob_calculate_sizes(knob);
-    gtk_widget_queue_draw(GTK_WIDGET(knob));  
+    gtk_widget_queue_draw(GTK_WIDGET(knob));
   }
 }
 
 void
-giw_knob_set_mouse_policy (GiwKnob *knob,
-			GiwKnobMousePolicy policy)
-{
-  g_return_if_fail (knob != NULL);
-  g_return_if_fail (GIW_IS_KNOB (knob));
-  
+giw_knob_set_mouse_policy(GiwKnob *knob,
+                          GiwKnobMousePolicy policy) {
+  g_return_if_fail(knob != NULL);
+  g_return_if_fail(GIW_IS_KNOB(knob));
+
   if (knob->button==0) // The policy can only be change when there is no button pressed
     knob->mouse_policy=policy;
 }
 
 static void
-giw_knob_adjustment_changed (GtkAdjustment *adjustment,
-			      gpointer       data)
-{
+giw_knob_adjustment_changed(GtkAdjustment *adjustment,
+                            gpointer       data) {
   GiwKnob *knob;
 
-  g_return_if_fail (adjustment != NULL);
-  g_return_if_fail (data != NULL);
+  g_return_if_fail(adjustment != NULL);
+  g_return_if_fail(data != NULL);
+
+  knob = GIW_KNOB(data);
 
-  knob = GIW_KNOB (data);
-        
   knob_free_legends(knob);
   knob_build_legends(knob);
   knob_calculate_sizes(knob);
@@ -1013,45 +987,42 @@
 }
 
 static void
-giw_knob_adjustment_value_changed (GtkAdjustment *adjustment,
-				    gpointer       data)
-{
+giw_knob_adjustment_value_changed(GtkAdjustment *adjustment,
+                                  gpointer       data) {
   GiwKnob *knob;
 
-  g_return_if_fail (adjustment != NULL);
-  g_return_if_fail (data != NULL);
+  g_return_if_fail(adjustment != NULL);
+  g_return_if_fail(data != NULL);
+
+  knob = GIW_KNOB(data);
 
-  knob = GIW_KNOB (data);
-   
   knob_set_angle(knob, knob_calculate_angle_with_value(knob, gtk_adjustment_get_value(adjustment)));
-    
+
   gtk_widget_queue_draw(GTK_WIDGET(knob));
 }
 
-void           
-giw_knob_set_title (GiwKnob *knob, gchar *str)
-{
-  g_return_if_fail (knob != NULL);
-  g_return_if_fail (GIW_IS_KNOB (knob));
-    
+void
+giw_knob_set_title(GiwKnob *knob, gchar *str) {
+  g_return_if_fail(knob != NULL);
+  g_return_if_fail(GIW_IS_KNOB(knob));
+
   knob->title_str=g_strdup(str); // Duplicate the string, after this, str can be freed
-  
+
   knob_build_title(knob);
   knob_calculate_sizes(knob);
   gtk_widget_queue_draw(GTK_WIDGET(knob));
 }
 
 /******************
-* Local Functions * 
+* Local Functions *
 ******************/
 
 void
-knob_update_mouse (GiwKnob *knob, gint x, gint y)
-{
+knob_update_mouse(GiwKnob *knob, gint x, gint y) {
   gint xc, yc;
-  
-  g_return_if_fail (knob != NULL);
-  g_return_if_fail (GIW_IS_KNOB (knob));
+
+  g_return_if_fail(knob != NULL);
+  g_return_if_fail(GIW_IS_KNOB(knob));
 
   gtk_widget_queue_draw(GTK_WIDGET(knob));
 
@@ -1059,277 +1030,265 @@
   yc = lives_widget_get_allocation_height(LIVES_WIDGET(knob))/2;
 
   // Calculating the new angle
-  if (knob->angle != atan2(yc-y, x-xc)){
+  if (knob->angle != atan2(yc-y, x-xc)) {
     knob_set_value(knob, knob_calculate_value_with_angle(knob, atan2(yc-y, x-xc)));
-    g_return_if_fail (knob->adjustment != NULL);
+    g_return_if_fail(knob->adjustment != NULL);
     gtk_adjustment_value_changed(knob->adjustment);
   }
 }
 
 void
-knob_update_false_mouse (GiwKnob *knob, gint x, gint y)
-{
+knob_update_false_mouse(GiwKnob *knob, gint x, gint y) {
   gint xc, yc;
-  
-  g_return_if_fail (knob != NULL);
-  g_return_if_fail (GIW_IS_KNOB (knob));
+
+  g_return_if_fail(knob != NULL);
+  g_return_if_fail(GIW_IS_KNOB(knob));
 
   xc = lives_widget_get_allocation_width(LIVES_WIDGET(knob))/2;
   yc = lives_widget_get_allocation_height(LIVES_WIDGET(knob))/2;
 
   // Calculating the new angle
   knob->false_angle = atan2(yc-y, x-xc);
-  
+
   // Putting the angle between 0 and 2PI, because the atan2 returns the angle between PI and -PI
   while (knob->false_angle<0)
     knob->false_angle+=(2.0*M_PI);
-  
+
   // Taking out of the "forbideen" region
-  if ( (knob->false_angle <= (3.0*M_PI/2.0)) && 
-       (knob->false_angle > (5.0*M_PI/4.0)) )
+  if ((knob->false_angle <= (3.0*M_PI/2.0)) &&
+      (knob->false_angle > (5.0*M_PI/4.0)))
     knob->false_angle=5.0*M_PI/4.0;
-  if ( (knob->false_angle < (7.0*M_PI/4.0)) && 
-       (knob->false_angle >= (3.0*M_PI/2.0)))
-    knob->false_angle=7.0*M_PI/4.0; 
-  
-  gtk_widget_queue_draw(GTK_WIDGET(knob));  
+  if ((knob->false_angle < (7.0*M_PI/4.0)) &&
+      (knob->false_angle >= (3.0*M_PI/2.0)))
+    knob->false_angle=7.0*M_PI/4.0;
+
+  gtk_widget_queue_draw(GTK_WIDGET(knob));
 }
 
-static void 
-knob_calculate_sizes (GiwKnob *knob)
-{
+static void
+knob_calculate_sizes(GiwKnob *knob) {
   GtkWidget *widget;
-  
-  g_return_if_fail (knob != NULL);
-  g_return_if_fail (GIW_IS_KNOB (knob));
-   
+
+  g_return_if_fail(knob != NULL);
+  g_return_if_fail(GIW_IS_KNOB(knob));
+
   widget=GTK_WIDGET(knob);
-  
+
   // Getting the radius and size
-  if (lives_widget_get_allocation_width(widget) < lives_widget_get_allocation_height(widget)){
+  if (lives_widget_get_allocation_width(widget) < lives_widget_get_allocation_height(widget)) {
     knob->size=lives_widget_get_allocation_width(widget);
     knob->x=0;
     knob->y=lives_widget_get_allocation_height(widget)/2-knob->size/2;
-  }
-  else{
+  } else {
     knob->size=lives_widget_get_allocation_height(widget);
     knob->y=0;
     knob->x=lives_widget_get_allocation_width(widget)/2-knob->size/2;
   }
-    
+
   // The distance between the radius and the widget limits is the bigger dimension of the legends plus the major_ticks_size, so it's the half of size, less the bigger dimension of the legends less the major_ticks size (wich depends of the radius), them, with some algebra, it results in this equation:
-  knob->radius=8*((knob->size/2)-sqrt(knob->legend_width*knob->legend_width+knob->legend_height*knob->legend_height))/9; 
-   
+  knob->radius=8*((knob->size/2)-sqrt(knob->legend_width*knob->legend_width+knob->legend_height*knob->legend_height))/9;
+
   knob->d_major_ticks=(3.0*M_PI/2.0)/(knob->major_ticks-1);
-  knob->d_minor_ticks=knob->d_major_ticks/(knob->minor_ticks+1);  
-  
+  knob->d_minor_ticks=knob->d_major_ticks/(knob->minor_ticks+1);
+
   knob->major_ticks_size=knob->radius/8.0;
   knob->minor_ticks_size=knob->radius/16.0;
-  
-  // The legend will in the middle of the inside (plus the major_ticks_size) and outside circle 
+
+  // The legend will in the middle of the inside (plus the major_ticks_size) and outside circle
   knob->legend_radius=((knob->radius+knob->major_ticks_size+(knob->size/2))/2);
 }
 
 gdouble
-knob_calculate_value_with_angle (GiwKnob *knob, gdouble angle)
-{
+knob_calculate_value_with_angle(GiwKnob *knob, gdouble angle) {
   gdouble d_angle = 0.0; // How many the pointer is far from the lower angle (5PI/4)
 
-  g_return_val_if_fail (knob != NULL, 0.0);
-  g_return_val_if_fail (GIW_IS_KNOB (knob), 0.0);
-  
-   // Putting the angle between 0 and 2PI, because the atan2 returns the angle between PI and -PI
+  g_return_val_if_fail(knob != NULL, 0.0);
+  g_return_val_if_fail(GIW_IS_KNOB(knob), 0.0);
+
+  // Putting the angle between 0 and 2PI, because the atan2 returns the angle between PI and -PI
   while (angle<0)
     angle=angle+(2.0*M_PI);
-  
+
   // Taking out of the "forbideen" region
   if ((angle <= (3.0*M_PI/2.0)) && (angle  > (5.0*M_PI/4.0))) angle=5.0*M_PI/4.0;
-  if ((angle  < (7.0*M_PI/4.0)) && (angle >= (3.0*M_PI/2.0))) angle=7.0*M_PI/4.0; 
-   
-  // Calculating the distance (in radians) between the pointer and the lower angle   
+  if ((angle  < (7.0*M_PI/4.0)) && (angle >= (3.0*M_PI/2.0))) angle=7.0*M_PI/4.0;
+
+  // Calculating the distance (in radians) between the pointer and the lower angle
   if (angle<=(5.0*M_PI/4.0)) d_angle=(5.0*M_PI/4.0)-angle;
   if (angle>=(7.0*M_PI/4.0)) d_angle=(13.0*M_PI/4.0)-angle;
 
-  return(lives_adjustment_get_lower(knob->adjustment)+
-	 fabs(lives_adjustment_get_upper(knob->adjustment)-lives_adjustment_get_lower(knob->adjustment))*d_angle/(3.0*M_PI/2.0));
+  return (lives_adjustment_get_lower(knob->adjustment)+
+          fabs(lives_adjustment_get_upper(knob->adjustment)-lives_adjustment_get_lower(knob->adjustment))*d_angle/(3.0*M_PI/2.0));
 }
 
-gdouble 
-knob_calculate_angle_with_value (GiwKnob *knob, gdouble value)
-{
+gdouble
+knob_calculate_angle_with_value(GiwKnob *knob, gdouble value) {
   gdouble angle;
-  
-  g_return_val_if_fail (knob != NULL, 0.0);
-  g_return_val_if_fail (GIW_IS_KNOB (knob), 0.0);
-  g_return_val_if_fail (knob->adjustment!=NULL, 0.0);
+
+  g_return_val_if_fail(knob != NULL, 0.0);
+  g_return_val_if_fail(GIW_IS_KNOB(knob), 0.0);
+  g_return_val_if_fail(knob->adjustment!=NULL, 0.0);
 
   angle=(value-lives_adjustment_get_lower(knob->adjustment))*
-    (3.0*M_PI/2.0)/fabs(lives_adjustment_get_upper(knob->adjustment)-lives_adjustment_get_lower(knob->adjustment));
-    
-    // Now, the angle is relative to the 3 o'clock position, and need to be changed in order to be ralative to the initial angle ((5.0*M_PI/4.0)
-  angle=(5.0*M_PI/4.0)-angle; 
-  
-  return(angle);    
+        (3.0*M_PI/2.0)/fabs(lives_adjustment_get_upper(knob->adjustment)-lives_adjustment_get_lower(knob->adjustment));
+
+  // Now, the angle is relative to the 3 o'clock position, and need to be changed in order to be ralative to the initial angle ((5.0*M_PI/4.0)
+  angle=(5.0*M_PI/4.0)-angle;
+
+  return (angle);
 }
 
-void 
-knob_set_angle (GiwKnob *knob,
-			gdouble angle)
-{
+void
+knob_set_angle(GiwKnob *knob,
+               gdouble angle) {
+
+  g_return_if_fail(knob != NULL);
+  g_return_if_fail(GIW_IS_KNOB(knob));
 
-  g_return_if_fail (knob != NULL);
-  g_return_if_fail (GIW_IS_KNOB (knob));
-  
   // Putting the angle between 0 and 2PI(360�)
   while (angle > 2.0*M_PI)
     angle=angle-(2.0*M_PI);
-  
+
   while (angle<0)
     angle=angle+(2.0*M_PI);
-    
-  if (knob->angle != angle){
+
+  if (knob->angle != angle) {
     // Taking out of the "forbideen" region
     if ((angle <= (3.0*M_PI/2.0)) && (angle > (5.0*M_PI/4.0))) angle=5.0*M_PI/4.0;
-    if ((angle  < (7.0*M_PI/4.0)) && (angle >= (3.0*M_PI/2.0))) angle=7.0*M_PI/4.0; 
-            
+    if ((angle  < (7.0*M_PI/4.0)) && (angle >= (3.0*M_PI/2.0))) angle=7.0*M_PI/4.0;
+
     knob->angle=angle;
   }
 }
 
 void
-knob_set_value (GiwKnob *knob,
-			gdouble value)
-{
-  g_return_if_fail (knob != NULL);
-  g_return_if_fail (GIW_IS_KNOB (knob));
-  g_return_if_fail (knob->adjustment != NULL);
+knob_set_value(GiwKnob *knob,
+               gdouble value) {
+  g_return_if_fail(knob != NULL);
+  g_return_if_fail(GIW_IS_KNOB(knob));
+  g_return_if_fail(knob->adjustment != NULL);
 
   gtk_adjustment_set_value(knob->adjustment,value);
 }
 
 void
-knob_build_legends(GiwKnob *knob)
-{
+knob_build_legends(GiwKnob *knob) {
   GtkWidget *widget;
   gint loop;
   gchar *str;
 
-  g_return_if_fail (knob != NULL);
-  
+  g_return_if_fail(knob != NULL);
+
   widget=GTK_WIDGET(knob);
-  
+
   if (knob->major_ticks==0)  // Preventing from bugs
     return;
-     
+
   // Creating the legend's layouts
-  if (knob->legends_digits!=0){
-    knob->legends=g_new(PangoLayout*, knob->major_ticks);
+  if (knob->legends_digits!=0) {
+    knob->legends=g_new(PangoLayout *, knob->major_ticks);
     str=g_new(gchar, knob->legends_digits+1); // +1 for the '/0'
-    for (loop=0; loop<knob->major_ticks; loop++){
+    for (loop=0; loop<knob->major_ticks; loop++) {
       snprintf(str,knob->legends_digits+1,"%f",
-	       lives_adjustment_get_lower(knob->adjustment)+
-	       loop*(lives_adjustment_get_upper(knob->adjustment)-
-		     lives_adjustment_get_lower(knob->adjustment))/
-	       (knob->major_ticks-1)); // Creating the legends string
-      knob->legends[loop]=gtk_widget_create_pango_layout (widget, str); 
+               lives_adjustment_get_lower(knob->adjustment)+
+               loop*(lives_adjustment_get_upper(knob->adjustment)-
+                     lives_adjustment_get_lower(knob->adjustment))/
+               (knob->major_ticks-1)); // Creating the legends string
+      knob->legends[loop]=gtk_widget_create_pango_layout(widget, str);
     }
     g_free(str);
-    
-    // Getting the size of the legends 
+
+    // Getting the size of the legends
     knob_calculate_legends_sizes(knob);
-  }else{ // If there are no legends (0 digits), the size is the major ticks size (5)
-      knob->legend_width=0;
-      knob->legend_height=0;
+  } else { // If there are no legends (0 digits), the size is the major ticks size (5)
+    knob->legend_width=0;
+    knob->legend_height=0;
   }
 }
 
 void
-knob_free_legends(GiwKnob *knob)
-{
+knob_free_legends(GiwKnob *knob) {
   gint loop;
 
-  g_return_if_fail (knob != NULL);
-    
-  if (knob->legends!=NULL){
+  g_return_if_fail(knob != NULL);
+
+  if (knob->legends!=NULL) {
     for (loop=0; loop<knob->major_ticks; loop++)
       if (knob->legends[loop]!=NULL)
         g_object_unref(G_OBJECT(knob->legends[loop]));
     g_free(knob->legends);
-    knob->legends=NULL;    
+    knob->legends=NULL;
   }
 }
 
 void
-knob_build_title (GiwKnob *knob)
-{
+knob_build_title(GiwKnob *knob) {
   GtkWidget *widget;
-  
-  g_return_if_fail (knob != NULL);
-    
+
+  g_return_if_fail(knob != NULL);
+
   widget=GTK_WIDGET(knob);
-  
+
   if (knob->title_str==NULL) // Return if there is no title (the layout will be keeped, but not drawed)
     return;
-        
-  if (knob->title) 
-      pango_layout_set_text(knob->title, knob->title_str, strlen(knob->title_str));
+
+  if (knob->title)
+    pango_layout_set_text(knob->title, knob->title_str, strlen(knob->title_str));
   else // If the title hasn't been created yet..
-      knob->title=gtk_widget_create_pango_layout(widget, knob->title_str);
-  
+    knob->title=gtk_widget_create_pango_layout(widget, knob->title_str);
+
   // Calculating new size
   knob_calculate_title_sizes(knob);
 }
 
 void
-knob_calculate_legends_sizes(GiwKnob *knob)
-{
+knob_calculate_legends_sizes(GiwKnob *knob) {
   GtkWidget *widget;
-    
+
 #if GTK_CHECK_VERSION(3,8,0)
   PangoFontDescription *fontdesc;
 #endif
 
-  g_return_if_fail (knob != NULL);
-  
+  g_return_if_fail(knob != NULL);
+
   widget=GTK_WIDGET(knob);
-  
-  if (knob->legends!=NULL){
+
+  if (knob->legends!=NULL) {
 
 #if GTK_CHECK_VERSION(3,0,0)
 #if GTK_CHECK_VERSION(3,8,0)
     fontdesc=pango_font_description_new();
     gtk_style_context_get(gtk_widget_get_style_context(widget),
-			  gtk_widget_get_state_flags(widget),
-			  GTK_STYLE_PROPERTY_FONT,
-			  &fontdesc,
-			  NULL
-			  );
-    pango_layout_set_font_description (knob->legends[0],fontdesc);
+                          gtk_widget_get_state_flags(widget),
+                          GTK_STYLE_PROPERTY_FONT,
+                          &fontdesc,
+                          NULL
+                         );
+    pango_layout_set_font_description(knob->legends[0],fontdesc);
     pango_font_description_free(fontdesc);
 #else
-    pango_layout_set_font_description (knob->legends[0], 
-				       gtk_style_context_get_font(gtk_widget_get_style_context(widget),gtk_widget_get_state_flags(widget)));
+    pango_layout_set_font_description(knob->legends[0],
+                                      gtk_style_context_get_font(gtk_widget_get_style_context(widget),gtk_widget_get_state_flags(widget)));
 #endif
 #else
-    pango_layout_set_font_description (knob->legends[0], widget->style->font_desc);  
+    pango_layout_set_font_description(knob->legends[0], widget->style->font_desc);
 #endif
     pango_layout_get_size(knob->legends[0], &(knob->legend_width), &(knob->legend_height));
     knob->legend_width/=PANGO_SCALE;
     knob->legend_height/=PANGO_SCALE;
   }
-} 
+}
 
 void
-knob_calculate_title_sizes(GiwKnob *knob) 
-{
+knob_calculate_title_sizes(GiwKnob *knob) {
   GtkWidget *widget;
 
 #if GTK_CHECK_VERSION(3,8,0)
   PangoFontDescription *fontdesc;
 #endif
 
-  g_return_if_fail (knob != NULL);
-  
+  g_return_if_fail(knob != NULL);
+
   if (knob->title == NULL) return;
 
   widget=GTK_WIDGET(knob);
@@ -1338,19 +1297,19 @@
 #if GTK_CHECK_VERSION(3,8,0)
   fontdesc=pango_font_description_new();
   gtk_style_context_get(gtk_widget_get_style_context(widget),
-			gtk_widget_get_state_flags(widget),
-			GTK_STYLE_PROPERTY_FONT,
-			&fontdesc,
-			NULL
-			);
-  pango_layout_set_font_description (knob->legends[0],fontdesc);
+                        gtk_widget_get_state_flags(widget),
+                        GTK_STYLE_PROPERTY_FONT,
+                        &fontdesc,
+                        NULL
+                       );
+  pango_layout_set_font_description(knob->legends[0],fontdesc);
   pango_font_description_free(fontdesc);
 #else
-  pango_layout_set_font_description (knob->legends[0], 
-				     gtk_style_context_get_font(gtk_widget_get_style_context(widget),gtk_widget_get_state_flags(widget)));
+  pango_layout_set_font_description(knob->legends[0],
+                                    gtk_style_context_get_font(gtk_widget_get_style_context(widget),gtk_widget_get_state_flags(widget)));
 #endif
 #else
-  pango_layout_set_font_description (knob->legends[0], widget->style->font_desc);  
+  pango_layout_set_font_description(knob->legends[0], widget->style->font_desc);
 #endif
   pango_layout_get_size(knob->title, &(knob->title_width), &(knob->title_height));
   knob->title_width/=PANGO_SCALE;

LiVES-2.2.8.tar.bz2/src/giw/giwknob.h -> LiVES-2.4.1.tar.bz2/src/giw/giwknob.h Changed

LiVES-2.2.8.tar.bz2/src/giw/giwled.c -> LiVES-2.4.1.tar.bz2/src/giw/giwled.c Changed

LiVES-2.2.8.tar.bz2/src/giw/giwled.h -> LiVES-2.4.1.tar.bz2/src/giw/giwled.h Changed

LiVES-2.2.8.tar.bz2/src/giw/giwtimeline.c -> LiVES-2.4.1.tar.bz2/src/giw/giwtimeline.c Changed

@@ -45,8 +45,7 @@
 #define MINIMUM_INCR              5
 #define DEFAULT_MAX_SIZE 100000000.
 
-enum
-{
+enum {
   PROP_0,
   PROP_ORIENTATION,
   PROP_UNIT,
@@ -57,8 +56,7 @@
 /* All distances below are in 1/72nd's of an inch. (According to
  * Adobe that's a point, but points are really 1/72.27 in.)
  */
-typedef struct
-{
+typedef struct {
   GtkOrientation   orientation;
   GiwTimeUnit      unit;
   gdouble          max_size;
@@ -78,64 +76,61 @@
   G_TYPE_INSTANCE_GET_PRIVATE (timeline, GIW_TYPE_TIMELINE, GiwTimelinePrivate)
 
 
-static const struct
-{
+static const struct {
   const gdouble  timeline_scale[16];
   const gint     subdivide[5];
-} timeline_metric =
-{
+} timeline_metric = {
   { 1, 2, 5, 10, 25, 50, 100, 250, 500, 1000, 2500, 5000, 10000, 25000, 50000, 100000 },
   { 1, 5, 10, 50, 100 }
 };
 
 
-static void          giw_timeline_dispose              (GObject        *object);
-static void          giw_timeline_set_property         (GObject        *object,
-                                                      guint            prop_id,
-                                                      const GValue   *value,
-                                                      GParamSpec     *pspec);
-static void          giw_timeline_get_property         (GObject        *object,
-                                                      guint           prop_id,
-                                                      GValue         *value,
-                                                      GParamSpec     *pspec);
-
-static void          giw_timeline_realize              (GtkWidget      *widget);
-static void          giw_timeline_unrealize            (GtkWidget      *widget);
-static void          giw_timeline_map                  (GtkWidget      *widget);
-static void          giw_timeline_unmap                (GtkWidget      *widget);
-static void          giw_timeline_size_allocate        (GtkWidget      *widget,
-                                                      GtkAllocation  *allocation);
-static void          giw_timeline_get_preferred_width  (GtkWidget      *widget,
-                                                      gint           *minimum_width,
-                                                      gint           *natural_width);
-static void          giw_timeline_get_preferred_height (GtkWidget      *widget,
-                                                      gint           *minimum_height,
-                                                      gint           *natural_height);
-static void          giw_timeline_style_updated        (GtkWidget      *widget);
-static gboolean      giw_timeline_draw                 (GtkWidget      *widget,
-                                                      cairo_t        *cr);
-
-static void          giw_timeline_draw_ticks           (GiwTimeline      *timeline);
-static void          giw_timeline_draw_pos             (GiwTimeline      *timeline);
-static void          giw_timeline_make_pixmap          (GiwTimeline      *timeline);
-
-static PangoLayout * giw_timeline_get_layout           (GtkWidget      *widget,
-                                                      const gchar    *text);
+static void          giw_timeline_dispose(GObject        *object);
+static void          giw_timeline_set_property(GObject        *object,
+    guint            prop_id,
+    const GValue   *value,
+    GParamSpec     *pspec);
+static void          giw_timeline_get_property(GObject        *object,
+    guint           prop_id,
+    GValue         *value,
+    GParamSpec     *pspec);
+
+static void          giw_timeline_realize(GtkWidget      *widget);
+static void          giw_timeline_unrealize(GtkWidget      *widget);
+static void          giw_timeline_map(GtkWidget      *widget);
+static void          giw_timeline_unmap(GtkWidget      *widget);
+static void          giw_timeline_size_allocate(GtkWidget      *widget,
+    GtkAllocation  *allocation);
+static void          giw_timeline_get_preferred_width(GtkWidget      *widget,
+    gint           *minimum_width,
+    gint           *natural_width);
+static void          giw_timeline_get_preferred_height(GtkWidget      *widget,
+    gint           *minimum_height,
+    gint           *natural_height);
+static void          giw_timeline_style_updated(GtkWidget      *widget);
+static gboolean      giw_timeline_draw(GtkWidget      *widget,
+                                       cairo_t        *cr);
+
+static void          giw_timeline_draw_ticks(GiwTimeline      *timeline);
+static void          giw_timeline_draw_pos(GiwTimeline      *timeline);
+static void          giw_timeline_make_pixmap(GiwTimeline      *timeline);
+
+static PangoLayout *giw_timeline_get_layout(GtkWidget      *widget,
+    const gchar    *text);
 
 
 //G_DEFINE_TYPE (GiwTimeline, giw_timeline, GTK_TYPE_WIDGET)
 
-G_DEFINE_TYPE (GiwTimeline, giw_timeline, GTK_TYPE_SCALE);
+G_DEFINE_TYPE(GiwTimeline, giw_timeline, GTK_TYPE_SCALE);
 
 #define parent_class giw_timeline_parent_class
 
 
 
 static void
-giw_timeline_class_init (GiwTimelineClass *klass)
-{
-  GObjectClass   *object_class = G_OBJECT_CLASS (klass);
-  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
+giw_timeline_class_init(GiwTimelineClass *klass) {
+  GObjectClass   *object_class = G_OBJECT_CLASS(klass);
+  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS(klass);
 
   object_class->dispose              = giw_timeline_dispose;
   object_class->set_property         = giw_timeline_set_property;
@@ -151,7 +146,7 @@
   widget_class->style_updated        = giw_timeline_style_updated;
   widget_class->draw                 = giw_timeline_draw;
 
-  g_type_class_add_private (object_class, sizeof (GiwTimelinePrivate));
+  g_type_class_add_private(object_class, sizeof(GiwTimelinePrivate));
 
 #ifndef GTK_PARAM_READABLE
 #define GTK_PARAM_READABLE (GParamFlags)(G_PARAM_READABLE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB)
@@ -160,40 +155,39 @@
 #endif
 
 
-  g_object_class_install_property (object_class,
-                                   PROP_ORIENTATION,
-                                   g_param_spec_enum ("orientation",
-                                                      "Orientation",
-                                                      "The orientation of the timeline",
-                                                      GTK_TYPE_ORIENTATION,
-                                                      GTK_ORIENTATION_HORIZONTAL,
-                                                      GTK_PARAM_READWRITE));
-  
-  g_object_class_install_property (object_class,
-                                   PROP_MAX_SIZE,
-                                   g_param_spec_double ("max-size",
-                                                        "Max Size",
-                                                        "Maximum size of the timeline",
-                                                        -G_MAXDOUBLE,
-                                                        G_MAXDOUBLE,
-                                                        0.0,
-                                                        GTK_PARAM_READWRITE));
-
-  gtk_widget_class_install_style_property (widget_class,
-                                           g_param_spec_double ("font-scale",
-                                                                NULL, NULL,
-                                                                0.0,
-                                                                G_MAXDOUBLE,
-                                                                DEFAULT_TIMELINE_FONT_SCALE,
-                                                                GTK_PARAM_READABLE));
+  g_object_class_install_property(object_class,
+                                  PROP_ORIENTATION,
+                                  g_param_spec_enum("orientation",
+                                      "Orientation",
+                                      "The orientation of the timeline",
+                                      GTK_TYPE_ORIENTATION,
+                                      GTK_ORIENTATION_HORIZONTAL,
+                                      GTK_PARAM_READWRITE));
+
+  g_object_class_install_property(object_class,
+                                  PROP_MAX_SIZE,
+                                  g_param_spec_double("max-size",
+                                      "Max Size",
+                                      "Maximum size of the timeline",
+                                      -G_MAXDOUBLE,
+                                      G_MAXDOUBLE,
+                                      0.0,
+                                      GTK_PARAM_READWRITE));
+
+  gtk_widget_class_install_style_property(widget_class,
+                                          g_param_spec_double("font-scale",
+                                              NULL, NULL,
+                                              0.0,
+                                              G_MAXDOUBLE,
+                                              DEFAULT_TIMELINE_FONT_SCALE,
+                                              GTK_PARAM_READABLE));
 }
 
 static void
-giw_timeline_init (GiwTimeline *timeline)
-{
-  GiwTimelinePrivate *priv = GIW_TIMELINE_GET_PRIVATE (timeline);
+giw_timeline_init(GiwTimeline *timeline) {
+  GiwTimelinePrivate *priv = GIW_TIMELINE_GET_PRIVATE(timeline);
 
-  gtk_widget_set_has_window (GTK_WIDGET (timeline), FALSE);
+  gtk_widget_set_has_window(GTK_WIDGET(timeline), FALSE);
 
   priv->orientation   = GTK_ORIENTATION_HORIZONTAL;
   priv->unit          = GIW_TIME_UNIT_SECONDS;
@@ -203,75 +197,70 @@
 }
 
 static void
-giw_timeline_dispose (GObject *object)
-{
-  GiwTimeline        *timeline = GIW_TIMELINE (object);
-  GiwTimelinePrivate *priv  = GIW_TIMELINE_GET_PRIVATE (timeline);
+giw_timeline_dispose(GObject *object) {
+  GiwTimeline        *timeline = GIW_TIMELINE(object);
+  GiwTimelinePrivate *priv  = GIW_TIMELINE_GET_PRIVATE(timeline);
 
   while (priv->track_widgets)
-    giw_timeline_remove_track_widget (timeline, (GtkWidget *)priv->track_widgets->data);
+    giw_timeline_remove_track_widget(timeline, (GtkWidget *)priv->track_widgets->data);
 
-  G_OBJECT_CLASS (parent_class)->dispose (object);
+  G_OBJECT_CLASS(parent_class)->dispose(object);
 }
 
 static void
-giw_timeline_set_property (GObject      *object,
-			   guint         prop_id,
-			   const GValue *value,
-			   GParamSpec   *pspec)
-{
-  GiwTimeline        *timeline = GIW_TIMELINE (object);
-  GiwTimelinePrivate *priv  = GIW_TIMELINE_GET_PRIVATE (timeline);
-
-  switch (prop_id)
-    {
-    case PROP_ORIENTATION:
-      priv->orientation = (GtkOrientation)g_value_get_enum (value);
-      gtk_widget_queue_resize (GTK_WIDGET (timeline));
-      break;
-
-    case PROP_UNIT:
-      giw_timeline_set_unit (timeline, (GiwTimeUnit)g_value_get_int (value));
-      break;
-
-    case PROP_MAX_SIZE:
-      giw_timeline_set_max_size (timeline,
-				 g_value_get_double (value));
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
+giw_timeline_set_property(GObject      *object,
+                          guint         prop_id,
+                          const GValue *value,
+                          GParamSpec   *pspec) {
+  GiwTimeline        *timeline = GIW_TIMELINE(object);
+  GiwTimelinePrivate *priv  = GIW_TIMELINE_GET_PRIVATE(timeline);
+
+  switch (prop_id) {
+  case PROP_ORIENTATION:
+    priv->orientation = (GtkOrientation)g_value_get_enum(value);
+    gtk_widget_queue_resize(GTK_WIDGET(timeline));
+    break;
+
+  case PROP_UNIT:
+    giw_timeline_set_unit(timeline, (GiwTimeUnit)g_value_get_int(value));
+    break;
+
+  case PROP_MAX_SIZE:
+    giw_timeline_set_max_size(timeline,
+                              g_value_get_double(value));
+    break;
+
+  default:
+    G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
+    break;
+  }
 }
 
 static void
-giw_timeline_get_property (GObject    *object,
-			   guint       prop_id,
-			   GValue     *value,
-			   GParamSpec *pspec)
-{
-  GiwTimeline        *timeline = GIW_TIMELINE (object);
-  GiwTimelinePrivate *priv  = GIW_TIMELINE_GET_PRIVATE (timeline);
-
-  switch (prop_id)
-    {
-    case PROP_ORIENTATION:
-      g_value_set_enum (value, priv->orientation);
-      break;
-
-    case PROP_UNIT:
-      g_value_set_int (value, priv->unit);
-      break;
-
-    case PROP_MAX_SIZE:
-      g_value_set_double (value, priv->max_size);
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
+giw_timeline_get_property(GObject    *object,
+                          guint       prop_id,
+                          GValue     *value,
+                          GParamSpec *pspec) {
+  GiwTimeline        *timeline = GIW_TIMELINE(object);
+  GiwTimelinePrivate *priv  = GIW_TIMELINE_GET_PRIVATE(timeline);
+
+  switch (prop_id) {
+  case PROP_ORIENTATION:
+    g_value_set_enum(value, priv->orientation);
+    break;
+
+  case PROP_UNIT:
+    g_value_set_int(value, priv->unit);
+    break;
+
+  case PROP_MAX_SIZE:
+    g_value_set_double(value, priv->max_size);
+    break;
+
+  default:
+    G_OBJECT_WARN_INVALID_PROPERTY_ID(object, prop_id, pspec);
+    break;
+  }
 }
 
 /**
@@ -284,14 +273,13 @@
  *
  **/
 GtkWidget *
-giw_timeline_new (GtkOrientation orientation)
-{
+giw_timeline_new(GtkOrientation orientation) {
   GiwTimeline *timeline;
 
-  timeline = (GiwTimeline *)g_object_new (GIW_TYPE_TIMELINE,
-					  "orientation", orientation,
-					  NULL);
-  return GTK_WIDGET (timeline);
+  timeline = (GiwTimeline *)g_object_new(GIW_TYPE_TIMELINE,
+                                         "orientation", orientation,
+                                         NULL);
+  return GTK_WIDGET(timeline);
 }
 
 
@@ -308,23 +296,22 @@
  *
  */
 void
-giw_timeline_add_track_widget (GiwTimeline *timeline,
-                             GtkWidget *widget)
-{
+giw_timeline_add_track_widget(GiwTimeline *timeline,
+                              GtkWidget *widget) {
   GiwTimelinePrivate *priv;
 
-  g_return_if_fail (GIW_IS_TIMELINE (timeline));
-  g_return_if_fail (GTK_IS_WIDGET (timeline));
+  g_return_if_fail(GIW_IS_TIMELINE(timeline));
+  g_return_if_fail(GTK_IS_WIDGET(timeline));
 
-  priv = GIW_TIMELINE_GET_PRIVATE (timeline);
+  priv = GIW_TIMELINE_GET_PRIVATE(timeline);
 
-  g_return_if_fail (g_list_find (priv->track_widgets, widget) == NULL);
+  g_return_if_fail(g_list_find(priv->track_widgets, widget) == NULL);
 
-  priv->track_widgets = g_list_prepend (priv->track_widgets, widget);
+  priv->track_widgets = g_list_prepend(priv->track_widgets, widget);
 
-  g_signal_connect_swapped (widget, "destroy",
-                            G_CALLBACK (giw_timeline_remove_track_widget),
-                            timeline);
+  g_signal_connect_swapped(widget, "destroy",
+                           G_CALLBACK(giw_timeline_remove_track_widget),
+                           timeline);
 }
 
 /**
@@ -337,23 +324,22 @@
  *
  */
 void
-giw_timeline_remove_track_widget (GiwTimeline *timeline,
-                                GtkWidget *widget)
-{
+giw_timeline_remove_track_widget(GiwTimeline *timeline,
+                                 GtkWidget *widget) {
   GiwTimelinePrivate *priv;
 
-  g_return_if_fail (GIW_IS_TIMELINE (timeline));
-  g_return_if_fail (GTK_IS_WIDGET (timeline));
+  g_return_if_fail(GIW_IS_TIMELINE(timeline));
+  g_return_if_fail(GTK_IS_WIDGET(timeline));
 
-  priv = GIW_TIMELINE_GET_PRIVATE (timeline);
+  priv = GIW_TIMELINE_GET_PRIVATE(timeline);
 
-  g_return_if_fail (g_list_find (priv->track_widgets, widget) != NULL);
+  g_return_if_fail(g_list_find(priv->track_widgets, widget) != NULL);
 
-  priv->track_widgets = g_list_remove (priv->track_widgets, widget);
+  priv->track_widgets = g_list_remove(priv->track_widgets, widget);
 
-  g_signal_handlers_disconnect_by_func (widget,
-                                        (gpointer)giw_timeline_remove_track_widget,
-                                        timeline);
+  g_signal_handlers_disconnect_by_func(widget,
+                                       (gpointer)giw_timeline_remove_track_widget,
+                                       timeline);
 }
 
 /**
@@ -367,22 +353,20 @@
 
 
 void
-giw_timeline_set_unit (GiwTimeline *timeline,
-		       GiwTimeUnit   unit)
-{
+giw_timeline_set_unit(GiwTimeline *timeline,
+                      GiwTimeUnit   unit) {
   GiwTimelinePrivate *priv;
 
-  g_return_if_fail (GIW_IS_TIMELINE (timeline));
+  g_return_if_fail(GIW_IS_TIMELINE(timeline));
 
-  priv = GIW_TIMELINE_GET_PRIVATE (timeline);
+  priv = GIW_TIMELINE_GET_PRIVATE(timeline);
 
-  if (priv->unit != unit)
-    {
-      priv->unit = unit;
-      g_object_notify (G_OBJECT (timeline), "unit");
+  if (priv->unit != unit) {
+    priv->unit = unit;
+    g_object_notify(G_OBJECT(timeline), "unit");
 
-      gtk_widget_queue_draw (GTK_WIDGET (timeline));
-    }
+    gtk_widget_queue_draw(GTK_WIDGET(timeline));
+  }
 }
 
 /**
@@ -394,9 +378,8 @@
  **/
 
 GiwTimeUnit
-giw_timeline_get_unit (GiwTimeline *timeline)
-{
-  g_return_val_if_fail (GIW_IS_TIMELINE (timeline), (GiwTimeUnit)0);
+giw_timeline_get_unit(GiwTimeline *timeline) {
+  g_return_val_if_fail(GIW_IS_TIMELINE(timeline), (GiwTimeUnit)0);
 
   return GIW_TIMELINE_GET_PRIVATE(timeline)->unit;
 }
@@ -412,11 +395,10 @@
  * Since: GIW 2.8
  **/
 static gdouble
-giw_timeline_get_position (GiwTimeline *timeline)
-{
+giw_timeline_get_position(GiwTimeline *timeline) {
   GtkWidget *widget;
   GtkRange *range;
-  g_return_val_if_fail (GIW_IS_TIMELINE (timeline), 0.0);
+  g_return_val_if_fail(GIW_IS_TIMELINE(timeline), 0.0);
 
   widget=GTK_WIDGET(timeline);
   range=GTK_RANGE(widget);
@@ -436,36 +418,33 @@
  *
  */
 void
-giw_timeline_set_max_size (GiwTimeline *timeline,
-			   gdouble    max_size)
-{
+giw_timeline_set_max_size(GiwTimeline *timeline,
+                          gdouble    max_size) {
   GiwTimelinePrivate *priv;
 
-  g_return_if_fail (GIW_IS_TIMELINE (timeline));
+  g_return_if_fail(GIW_IS_TIMELINE(timeline));
 
-  priv = GIW_TIMELINE_GET_PRIVATE (timeline);
+  priv = GIW_TIMELINE_GET_PRIVATE(timeline);
 
-  g_object_freeze_notify (G_OBJECT (timeline));
-  if (priv->max_size != max_size)
-    {
-      priv->max_size = max_size;
-      g_object_notify (G_OBJECT (timeline), "max-size");
-    }
-  g_object_thaw_notify (G_OBJECT (timeline));
+  g_object_freeze_notify(G_OBJECT(timeline));
+  if (priv->max_size != max_size) {
+    priv->max_size = max_size;
+    g_object_notify(G_OBJECT(timeline), "max-size");
+  }
+  g_object_thaw_notify(G_OBJECT(timeline));
 
-  gtk_widget_queue_draw (GTK_WIDGET (timeline));
+  gtk_widget_queue_draw(GTK_WIDGET(timeline));
 }
 
 
 
-gdouble 
-giw_timeline_get_max_size (GiwTimeline *timeline)
-{
+gdouble
+giw_timeline_get_max_size(GiwTimeline *timeline) {
   GiwTimelinePrivate *priv;
 
-  g_return_val_if_fail (GIW_IS_TIMELINE (timeline), 0.0);
+  g_return_val_if_fail(GIW_IS_TIMELINE(timeline), 0.0);
 
-  priv = GIW_TIMELINE_GET_PRIVATE (timeline);
+  priv = GIW_TIMELINE_GET_PRIVATE(timeline);
 
   return priv->max_size;
 }
@@ -488,19 +467,18 @@
  *
  **/
 static void
-giw_timeline_get_range (GiwTimeline *timeline,
-			gdouble   *lower,
-			gdouble   *upper,
-			gdouble   *max_size)
-{
+giw_timeline_get_range(GiwTimeline *timeline,
+                       gdouble   *lower,
+                       gdouble   *upper,
+                       gdouble   *max_size) {
   GiwTimelinePrivate *priv;
   GtkWidget *widget;
   GtkRange *range;
   GtkAdjustment *adj;
 
-  g_return_if_fail (GIW_IS_TIMELINE (timeline));
+  g_return_if_fail(GIW_IS_TIMELINE(timeline));
 
-  priv = GIW_TIMELINE_GET_PRIVATE (timeline);
+  priv = GIW_TIMELINE_GET_PRIVATE(timeline);
 
   widget=GTK_WIDGET(timeline);
   range=GTK_RANGE(widget);
@@ -516,17 +494,16 @@
 }
 
 static void
-giw_timeline_realize (GtkWidget *widget)
-{
-  GiwTimeline        *timeline = GIW_TIMELINE (widget);
-  GiwTimelinePrivate *priv  = GIW_TIMELINE_GET_PRIVATE (timeline);
+giw_timeline_realize(GtkWidget *widget) {
+  GiwTimeline        *timeline = GIW_TIMELINE(widget);
+  GiwTimelinePrivate *priv  = GIW_TIMELINE_GET_PRIVATE(timeline);
   GtkAllocation     allocation;
   GdkWindowAttr     attributes;
   gint              attributes_mask;
 
-  GTK_WIDGET_CLASS (giw_timeline_parent_class)->realize (widget);
+  GTK_WIDGET_CLASS(giw_timeline_parent_class)->realize(widget);
 
-  gtk_widget_get_allocation (widget, &allocation);
+  gtk_widget_get_allocation(widget, &allocation);
 
   attributes.window_type = GDK_WINDOW_CHILD;
   attributes.x           = allocation.x;
@@ -534,194 +511,176 @@
   attributes.width       = allocation.width;
   attributes.height      = allocation.height;
   attributes.wclass      = GDK_INPUT_ONLY;
-  attributes.event_mask  = (gtk_widget_get_events (widget) |
+  attributes.event_mask  = (gtk_widget_get_events(widget) |
                             GDK_EXPOSURE_MASK              |
                             GDK_POINTER_MOTION_MASK);
 
   attributes_mask = GDK_WA_X | GDK_WA_Y;
 
-  priv->input_window = gdk_window_new (gtk_widget_get_window (widget),
-                                       &attributes, attributes_mask);
-  gdk_window_set_user_data (priv->input_window, timeline);
+  priv->input_window = gdk_window_new(gtk_widget_get_window(widget),
+                                      &attributes, attributes_mask);
+  gdk_window_set_user_data(priv->input_window, timeline);
 
-  giw_timeline_make_pixmap (timeline);
+  giw_timeline_make_pixmap(timeline);
 }
 
 static void
-giw_timeline_unrealize (GtkWidget *widget)
-{
-  GiwTimeline        *timeline = GIW_TIMELINE (widget);
-  GiwTimelinePrivate *priv  = GIW_TIMELINE_GET_PRIVATE (timeline);
+giw_timeline_unrealize(GtkWidget *widget) {
+  GiwTimeline        *timeline = GIW_TIMELINE(widget);
+  GiwTimelinePrivate *priv  = GIW_TIMELINE_GET_PRIVATE(timeline);
 
-  if (priv->backing_store)
-    {
-      cairo_surface_destroy (priv->backing_store);
-      priv->backing_store = NULL;
-    }
+  if (priv->backing_store) {
+    cairo_surface_destroy(priv->backing_store);
+    priv->backing_store = NULL;
+  }
 
-  if (priv->layout)
-    {
-      g_object_unref (priv->layout);
-      priv->layout = NULL;
-    }
+  if (priv->layout) {
+    g_object_unref(priv->layout);
+    priv->layout = NULL;
+  }
 
-  if (priv->input_window)
-    {
-      gdk_window_destroy (priv->input_window);
-      priv->input_window = NULL;
-    }
+  if (priv->input_window) {
+    gdk_window_destroy(priv->input_window);
+    priv->input_window = NULL;
+  }
 
-  GTK_WIDGET_CLASS (giw_timeline_parent_class)->unrealize (widget);
+  GTK_WIDGET_CLASS(giw_timeline_parent_class)->unrealize(widget);
 }
 
 static void
-giw_timeline_map (GtkWidget *widget)
-{
-  GiwTimelinePrivate *priv = GIW_TIMELINE_GET_PRIVATE (widget);
+giw_timeline_map(GtkWidget *widget) {
+  GiwTimelinePrivate *priv = GIW_TIMELINE_GET_PRIVATE(widget);
 
-  GTK_WIDGET_CLASS (parent_class)->map (widget);
+  GTK_WIDGET_CLASS(parent_class)->map(widget);
 
   if (priv->input_window)
-    gdk_window_show (priv->input_window);
+    gdk_window_show(priv->input_window);
 }
 
 static void
-giw_timeline_unmap (GtkWidget *widget)
-{
-  GiwTimelinePrivate *priv = GIW_TIMELINE_GET_PRIVATE (widget);
+giw_timeline_unmap(GtkWidget *widget) {
+  GiwTimelinePrivate *priv = GIW_TIMELINE_GET_PRIVATE(widget);
 
   if (priv->input_window)
-    gdk_window_hide (priv->input_window);
+    gdk_window_hide(priv->input_window);
 
-  GTK_WIDGET_CLASS (parent_class)->unmap (widget);
+  GTK_WIDGET_CLASS(parent_class)->unmap(widget);
 }
 
 static void
-giw_timeline_size_allocate (GtkWidget     *widget,
-                          GtkAllocation *allocation)
-{
-  GiwTimeline        *timeline = GIW_TIMELINE (widget);
-  GiwTimelinePrivate *priv  = GIW_TIMELINE_GET_PRIVATE (timeline);
+giw_timeline_size_allocate(GtkWidget     *widget,
+                           GtkAllocation *allocation) {
+  GiwTimeline        *timeline = GIW_TIMELINE(widget);
+  GiwTimelinePrivate *priv  = GIW_TIMELINE_GET_PRIVATE(timeline);
   GtkAllocation     widget_allocation;
   gboolean          resized;
 
-  gtk_widget_get_allocation (widget, &widget_allocation);
+  gtk_widget_get_allocation(widget, &widget_allocation);
 
   resized = (widget_allocation.width  != allocation->width ||
              widget_allocation.height != allocation->height);
 
-  gtk_widget_set_allocation (widget, allocation);
+  gtk_widget_set_allocation(widget, allocation);
 
-  if (gtk_widget_get_realized (widget))
-    {
-      gdk_window_move_resize (priv->input_window,
-                              allocation->x, allocation->y,
-                              allocation->width, allocation->height);
+  if (gtk_widget_get_realized(widget)) {
+    gdk_window_move_resize(priv->input_window,
+                           allocation->x, allocation->y,
+                           allocation->width, allocation->height);
 
-      if (resized)
-        giw_timeline_make_pixmap (timeline);
-    }
+    if (resized)
+      giw_timeline_make_pixmap(timeline);
+  }
 }
 
 static void
-giw_timeline_size_request (GtkWidget      *widget,
-                         GtkRequisition *requisition)
-{
-  GiwTimelinePrivate *priv    = GIW_TIMELINE_GET_PRIVATE (widget);
-  GtkStyleContext  *context = gtk_widget_get_style_context (widget);
+giw_timeline_size_request(GtkWidget      *widget,
+                          GtkRequisition *requisition) {
+  GiwTimelinePrivate *priv    = GIW_TIMELINE_GET_PRIVATE(widget);
+  GtkStyleContext  *context = gtk_widget_get_style_context(widget);
   PangoLayout      *layout;
   PangoRectangle    ink_rect;
   GtkBorder         border;
   gint              size;
 
-  layout = giw_timeline_get_layout (widget, "0123456789");
-  pango_layout_get_pixel_extents (layout, &ink_rect, NULL);
+  layout = giw_timeline_get_layout(widget, "0123456789");
+  pango_layout_get_pixel_extents(layout, &ink_rect, NULL);
 
   size = 2 + ink_rect.height * 1.7;
 
-  gtk_style_context_get_border (context, gtk_widget_get_state_flags(widget), &border);
+  gtk_style_context_get_border(context, gtk_widget_get_state_flags(widget), &border);
 
   requisition->width  = border.left + border.right;
   requisition->height = border.top + border.bottom;
 
-  if (priv->orientation == GTK_ORIENTATION_HORIZONTAL)
-    {
-      requisition->width  += 1;
-      requisition->height += size;
-    }
-  else
-    {
-      requisition->width  += size;
-      requisition->height += 1;
-    }
+  if (priv->orientation == GTK_ORIENTATION_HORIZONTAL) {
+    requisition->width  += 1;
+    requisition->height += size;
+  } else {
+    requisition->width  += size;
+    requisition->height += 1;
+  }
 }
 
 static void
-giw_timeline_get_preferred_width (GtkWidget *widget,
-                                gint      *minimum_width,
-                                gint      *natural_width)
-{
+giw_timeline_get_preferred_width(GtkWidget *widget,
+                                 gint      *minimum_width,
+                                 gint      *natural_width) {
   GtkRequisition requisition;
 
-  giw_timeline_size_request (widget, &requisition);
+  giw_timeline_size_request(widget, &requisition);
 
   *minimum_width = *natural_width = requisition.width;
 }
 
 static void
-giw_timeline_get_preferred_height (GtkWidget *widget,
-                                 gint      *minimum_height,
-                                 gint      *natural_height)
-{
+giw_timeline_get_preferred_height(GtkWidget *widget,
+                                  gint      *minimum_height,
+                                  gint      *natural_height) {
   GtkRequisition requisition;
 
-  giw_timeline_size_request (widget, &requisition);
+  giw_timeline_size_request(widget, &requisition);
 
   *minimum_height = *natural_height = requisition.height;
 }
 
 static void
-giw_timeline_style_updated (GtkWidget *widget)
-{
-  GiwTimelinePrivate *priv = GIW_TIMELINE_GET_PRIVATE (widget);
+giw_timeline_style_updated(GtkWidget *widget) {
+  GiwTimelinePrivate *priv = GIW_TIMELINE_GET_PRIVATE(widget);
 
-  GTK_WIDGET_CLASS (giw_timeline_parent_class)->style_updated (widget);
+  GTK_WIDGET_CLASS(giw_timeline_parent_class)->style_updated(widget);
 
-  gtk_widget_style_get (widget,
-                        "font-scale", &priv->font_scale,
-                        NULL);
+  gtk_widget_style_get(widget,
+                       "font-scale", &priv->font_scale,
+                       NULL);
 
-  if (priv->layout)
-    {
-      g_object_unref (priv->layout);
-      priv->layout = NULL;
-    }
+  if (priv->layout) {
+    g_object_unref(priv->layout);
+    priv->layout = NULL;
+  }
 }
 
 
 static gboolean
-giw_timeline_draw (GtkWidget *widget,
-		   cairo_t   *cr)
-{
-  GiwTimeline        *timeline = GIW_TIMELINE (widget);
-  GiwTimelinePrivate *priv  = GIW_TIMELINE_GET_PRIVATE (timeline);
+giw_timeline_draw(GtkWidget *widget,
+                  cairo_t   *cr) {
+  GiwTimeline        *timeline = GIW_TIMELINE(widget);
+  GiwTimelinePrivate *priv  = GIW_TIMELINE_GET_PRIVATE(timeline);
 
-  giw_timeline_draw_ticks (timeline);
+  giw_timeline_draw_ticks(timeline);
 
-  cairo_set_source_surface (cr, priv->backing_store, 0, 0);
-  cairo_paint (cr);
+  cairo_set_source_surface(cr, priv->backing_store, 0, 0);
+  cairo_paint(cr);
 
-  giw_timeline_draw_pos (timeline);
+  giw_timeline_draw_pos(timeline);
 
   return FALSE;
 }
 
 static void
-giw_timeline_draw_ticks (GiwTimeline *timeline)
-{
-  GtkWidget        *widget  = GTK_WIDGET (timeline);
-  GtkStyleContext  *context = gtk_widget_get_style_context (widget);
-  GiwTimelinePrivate *priv    = GIW_TIMELINE_GET_PRIVATE (timeline);
+giw_timeline_draw_ticks(GiwTimeline *timeline) {
+  GtkWidget        *widget  = GTK_WIDGET(timeline);
+  GtkStyleContext  *context = gtk_widget_get_style_context(widget);
+  GiwTimelinePrivate *priv    = GIW_TIMELINE_GET_PRIVATE(timeline);
   GtkAllocation     allocation;
   GtkBorder         border;
   GdkRGBA           color;
@@ -747,57 +706,51 @@
   PangoLayout      *layout;
   PangoRectangle    logical_rect, ink_rect;
 
-  if (! gtk_widget_is_drawable (widget))
+  if (! gtk_widget_is_drawable(widget))
     return;
 
-  gtk_widget_get_allocation (widget, &allocation);
-  gtk_style_context_get_border (context, gtk_widget_get_state_flags(widget), &border);
+  gtk_widget_get_allocation(widget, &allocation);
+  gtk_style_context_get_border(context, gtk_widget_get_state_flags(widget), &border);
 
-  layout = giw_timeline_get_layout (widget, "0123456789");
-  pango_layout_get_extents (layout, &ink_rect, &logical_rect);
+  layout = giw_timeline_get_layout(widget, "0123456789");
+  pango_layout_get_extents(layout, &ink_rect, &logical_rect);
 
-  digit_height = PANGO_PIXELS (ink_rect.height) + 2;
+  digit_height = PANGO_PIXELS(ink_rect.height) + 2;
   digit_offset = ink_rect.y;
 
-  if (priv->orientation == GTK_ORIENTATION_HORIZONTAL)
-    {
-      width  = allocation.width;
-      height = allocation.height - (border.top + border.bottom);
-    }
-  else
-    {
-      width  = allocation.height;
-      height = allocation.width - (border.top + border.bottom);
-    }
-
-  cr = cairo_create (priv->backing_store);
-
-  gtk_render_background (context, cr, 0, 0, allocation.width, allocation.height);
-  gtk_render_frame (context, cr, 0, 0, allocation.width, allocation.height);
-
-  gtk_style_context_get_color (context, gtk_widget_get_state_flags (widget),
-                               &color);
-  gdk_cairo_set_source_rgba (cr, &color);
+  if (priv->orientation == GTK_ORIENTATION_HORIZONTAL) {
+    width  = allocation.width;
+    height = allocation.height - (border.top + border.bottom);
+  } else {
+    width  = allocation.height;
+    height = allocation.width - (border.top + border.bottom);
+  }
 
-  if (priv->orientation == GTK_ORIENTATION_HORIZONTAL)
-    {
-      cairo_rectangle (cr,
-                       border.left,
-                       height - border.bottom,
-                       allocation.width - (border.left + border.right),
-                       1);
-    }
-  else
-    {
-      cairo_rectangle (cr,
-                       border.left,
-                       border.top,
-                       1,
-                       allocation.height - (border.top + border.bottom));
-    }
+  cr = cairo_create(priv->backing_store);
+
+  gtk_render_background(context, cr, 0, 0, allocation.width, allocation.height);
+  gtk_render_frame(context, cr, 0, 0, allocation.width, allocation.height);
+
+  gtk_style_context_get_color(context, gtk_widget_get_state_flags(widget),
+                              &color);
+  gdk_cairo_set_source_rgba(cr, &color);
+
+  if (priv->orientation == GTK_ORIENTATION_HORIZONTAL) {
+    cairo_rectangle(cr,
+                    border.left,
+                    height - border.bottom,
+                    allocation.width - (border.left + border.right),
+                    1);
+  } else {
+    cairo_rectangle(cr,
+                    border.left,
+                    border.top,
+                    1,
+                    allocation.height - (border.top + border.bottom));
+  }
   cairo_stroke(cr);
 
-  giw_timeline_get_range (timeline, &lower, &upper, &max_size);
+  giw_timeline_get_range(timeline, &lower, &upper, &max_size);
 
   if ((upper - lower) == 0)
     goto out;
@@ -814,12 +767,11 @@
    *   actually measuring the text width, so that the result for the
    *   scale looks consistent with an accompanying vtimeline.
    */
-  scale = ceil (max_size);
+  scale = ceil(max_size);
 
   if (priv->unit==GIW_TIME_UNIT_SECONDS) {
-    g_snprintf (unit_str, sizeof (unit_str), "%d", scale);
-  }
-  else {
+    g_snprintf(unit_str, sizeof(unit_str), "%d", scale);
+  } else {
     scaleh=(int)((double)scale/3600.);
     scalem=(int)((double)(scale-scaleh*3600)/60.);
     scales=scale-scaleh*3600-scalem*60;
@@ -829,140 +781,125 @@
       scales=-scales;
     }
 
-    g_snprintf (unit_str, sizeof (unit_str), "%02d:%02d:%02d", scaleh,scalem,scales);
+    g_snprintf(unit_str, sizeof(unit_str), "%02d:%02d:%02d", scaleh,scalem,scales);
   }
 
-    
-  text_size = strlen (unit_str) * digit_height + 1;
 
-  for (scale = 0; scale < G_N_ELEMENTS (timeline_metric.timeline_scale); scale++)
-    if (timeline_metric.timeline_scale[scale] * fabs (increment) > 2 * text_size)
+  text_size = strlen(unit_str) * digit_height + 1;
+
+  for (scale = 0; scale < G_N_ELEMENTS(timeline_metric.timeline_scale); scale++)
+    if (timeline_metric.timeline_scale[scale] * fabs(increment) > 2 * text_size)
       break;
 
-  if (scale == G_N_ELEMENTS (timeline_metric.timeline_scale))
-    scale = G_N_ELEMENTS (timeline_metric.timeline_scale) - 1;
+  if (scale == G_N_ELEMENTS(timeline_metric.timeline_scale))
+    scale = G_N_ELEMENTS(timeline_metric.timeline_scale) - 1;
 
   //unit = giw_timeline_get_unit (timeline);
   //unit=GIW_TIME_UNIT_SECONDS;
 
   /* drawing starts here */
   length = 0;
-  for (i = G_N_ELEMENTS (timeline_metric.subdivide) - 1; i >= 0; i--)
-    {
-      gdouble subd_incr;
-
-      /* hack to get proper subdivisions at full pixels */
-      if (scale == 1 && i == 1)
-        subd_incr = 1.0;
-      else
-        subd_incr = ((gdouble) timeline_metric.timeline_scale[scale] /
-                     (gdouble) timeline_metric.subdivide[i]);
-
-      if (subd_incr * fabs (increment) <= MINIMUM_INCR)
-        continue;
-
-      /* don't subdivide pixels */
-      if (subd_incr < 1.0)
-        continue;
-
-      /* Calculate the length of the tickmarks. Make sure that
-       * this length increases for each set of ticks
-       */
-      ideal_length = height / (i + 1) - 1;
-      if (ideal_length > ++length)
-        length = ideal_length;
-
-      if (lower < upper)
-        {
-          start = floor (lower / subd_incr) * subd_incr;
-          end   = ceil  (upper / subd_incr) * subd_incr;
-        }
-      else
-        {
-          start = floor (upper / subd_incr) * subd_incr;
-          end   = ceil  (lower / subd_incr) * subd_incr;
+  for (i = G_N_ELEMENTS(timeline_metric.subdivide) - 1; i >= 0; i--) {
+    gdouble subd_incr;
+
+    /* hack to get proper subdivisions at full pixels */
+    if (scale == 1 && i == 1)
+      subd_incr = 1.0;
+    else
+      subd_incr = ((gdouble) timeline_metric.timeline_scale[scale] /
+                   (gdouble) timeline_metric.subdivide[i]);
+
+    if (subd_incr * fabs(increment) <= MINIMUM_INCR)
+      continue;
+
+    /* don't subdivide pixels */
+    if (subd_incr < 1.0)
+      continue;
+
+    /* Calculate the length of the tickmarks. Make sure that
+     * this length increases for each set of ticks
+     */
+    ideal_length = height / (i + 1) - 1;
+    if (ideal_length > ++length)
+      length = ideal_length;
+
+    if (lower < upper) {
+      start = floor(lower / subd_incr) * subd_incr;
+      end   = ceil(upper / subd_incr) * subd_incr;
+    } else {
+      start = floor(upper / subd_incr) * subd_incr;
+      end   = ceil(lower / subd_incr) * subd_incr;
+    }
+
+    cairo_set_line_width(cr, 1.);
+
+    for (cur = start; cur <= end; cur += subd_incr) {
+      pos = ROUND((cur - lower) * increment);
+
+      if (priv->orientation == GTK_ORIENTATION_HORIZONTAL) {
+        cairo_rectangle(cr,
+                        pos, height + border.top - length,
+                        1,   length);
+      } else {
+        cairo_rectangle(cr,
+                        height + border.left - length, pos,
+                        length,                        1);
+      }
+      cairo_stroke(cr);
+
+      /* draw label */
+      if (i == 0) {
+        curi=(int)cur;
+        if (priv->unit==GIW_TIME_UNIT_SECONDS) {
+          g_snprintf(unit_str, sizeof(unit_str), "%d", curi);
+        } else {
+          curh=(int)(cur/3600.);
+          curm=(int)((double)(curi-curh*3600)/60.);
+          curs=curi-curh*3600-curm*60;
+
+          if (curi<0) {
+            curm=-curm;
+            curs=-curs;
+          }
+
+          g_snprintf(unit_str, sizeof(unit_str), "%02d:%02d:%02d", curh,curm,curs);
         }
 
-      cairo_set_line_width(cr, 1.);
-
-      for (cur = start; cur <= end; cur += subd_incr)
-        {
-          pos = ROUND ((cur - lower) * increment);
-
-          if (priv->orientation == GTK_ORIENTATION_HORIZONTAL)
-            {
-              cairo_rectangle (cr,
-                               pos, height + border.top - length,
-                               1,   length);
-            }
-          else
-            {
-              cairo_rectangle (cr,
-                               height + border.left - length, pos,
-                               length,                        1);
-            }
-	  cairo_stroke(cr);
-
-          /* draw label */
-          if (i == 0)
-            {
-	      curi=(int)cur;
-	      if (priv->unit==GIW_TIME_UNIT_SECONDS) {
-		g_snprintf (unit_str, sizeof (unit_str), "%d", curi);
-	      }
-	      else {
-		curh=(int)(cur/3600.);
-		curm=(int)((double)(curi-curh*3600)/60.);
-		curs=curi-curh*3600-curm*60;
-
-		if (curi<0) {
-		  curm=-curm;
-		  curs=-curs;
-		}
-	      
-		g_snprintf (unit_str, sizeof (unit_str), "%02d:%02d:%02d", curh,curm,curs);
-	      }
-
-              if (priv->orientation == GTK_ORIENTATION_HORIZONTAL)
-                {
-                  pango_layout_set_text (layout, unit_str, -1);
-                  pango_layout_get_extents (layout, &logical_rect, NULL);
-
-                  cairo_move_to (cr,
-                                 pos + 2,
-                                 border.top + PANGO_PIXELS (logical_rect.y - digit_offset));
-                  pango_cairo_show_layout (cr, layout);
-                }
-              else
-                {
-                  gint j;
-
-                  for (j = 0; j < (int) strlen (unit_str); j++)
-                    {
-                      pango_layout_set_text (layout, unit_str + j, 1);
-                      pango_layout_get_extents (layout, NULL, &logical_rect);
-
-                      cairo_move_to (cr,
-                                     border.left + 1,
-                                     pos + digit_height * j + 2 + PANGO_PIXELS (logical_rect.y - digit_offset));
-                      pango_cairo_show_layout (cr, layout);
-                    }
-                }
-            }
+        if (priv->orientation == GTK_ORIENTATION_HORIZONTAL) {
+          pango_layout_set_text(layout, unit_str, -1);
+          pango_layout_get_extents(layout, &logical_rect, NULL);
+
+          cairo_move_to(cr,
+                        pos + 2,
+                        border.top + PANGO_PIXELS(logical_rect.y - digit_offset));
+          pango_cairo_show_layout(cr, layout);
+        } else {
+          gint j;
+
+          for (j = 0; j < (int) strlen(unit_str); j++) {
+            pango_layout_set_text(layout, unit_str + j, 1);
+            pango_layout_get_extents(layout, NULL, &logical_rect);
+
+            cairo_move_to(cr,
+                          border.left + 1,
+                          pos + digit_height * j + 2 + PANGO_PIXELS(logical_rect.y - digit_offset));
+            pango_cairo_show_layout(cr, layout);
+          }
         }
+      }
     }
+  }
 
-  cairo_fill (cr);
+  cairo_fill(cr);
 out:
-  cairo_destroy (cr);
+  cairo_destroy(cr);
 }
 
 static void
-giw_timeline_draw_pos (GiwTimeline *timeline)
-{
-  GtkWidget        *widget  = GTK_WIDGET (timeline);
-  GtkStyleContext  *context = gtk_widget_get_style_context (widget);
-  GiwTimelinePrivate *priv    = GIW_TIMELINE_GET_PRIVATE (timeline);
+giw_timeline_draw_pos(GiwTimeline *timeline) {
+  GtkWidget        *widget  = GTK_WIDGET(timeline);
+  GtkStyleContext  *context = gtk_widget_get_style_context(widget);
+  GiwTimelinePrivate *priv    = GIW_TIMELINE_GET_PRIVATE(timeline);
   GtkAllocation     allocation;
   GtkBorder         border;
   GdkRGBA           color;
@@ -970,155 +907,140 @@
   gint              width, height;
   gint              bs_width, bs_height;
 
-  if (! gtk_widget_is_drawable (widget))
+  if (! gtk_widget_is_drawable(widget))
     return;
 
-  gtk_widget_get_allocation (widget, &allocation);
-  gtk_style_context_get_border (context, gtk_widget_get_state_flags(widget), &border);
+  gtk_widget_get_allocation(widget, &allocation);
+  gtk_style_context_get_border(context, gtk_widget_get_state_flags(widget), &border);
 
-  if (priv->orientation == GTK_ORIENTATION_HORIZONTAL)
-    {
-      width  = allocation.width;
-      height = allocation.height - (border.top + border.bottom);
+  if (priv->orientation == GTK_ORIENTATION_HORIZONTAL) {
+    width  = allocation.width;
+    height = allocation.height - (border.top + border.bottom);
 
-      bs_width = height / 2 + 2;
-      bs_width |= 1;  /* make sure it's odd */
-      bs_height = bs_width / 2 + 1;
-    }
-  else
-    {
-      width  = allocation.width - (border.left + border.right);
-      height = allocation.height;
-
-      bs_height = width / 2 + 2;
-      bs_height |= 1;  /* make sure it's odd */
-      bs_width = bs_height / 2 + 1;
-    }
+    bs_width = height / 2 + 2;
+    bs_width |= 1;  /* make sure it's odd */
+    bs_height = bs_width / 2 + 1;
+  } else {
+    width  = allocation.width - (border.left + border.right);
+    height = allocation.height;
 
-  if ((bs_width > 0) && (bs_height > 0))
-    {
-      cairo_t *cr = gdk_cairo_create (gtk_widget_get_window (widget));
-      gdouble  lower;
-      gdouble  upper;
-      gdouble  position;
-      gdouble  increment;
-
-      cairo_rectangle (cr,
-                       allocation.x, allocation.y,
-                       allocation.width, allocation.height);
-      cairo_clip (cr);
-
-      cairo_translate (cr, allocation.x, allocation.y);
-
-      /*  If a backing store exists, restore the timeline  */
-      if (priv->backing_store)
-        {
-          cairo_set_source_surface (cr, priv->backing_store, 0, 0);
-          cairo_rectangle (cr, priv->xsrc, priv->ysrc, bs_width, bs_height);
-          cairo_fill (cr);
-        }
+    bs_height = width / 2 + 2;
+    bs_height |= 1;  /* make sure it's odd */
+    bs_width = bs_height / 2 + 1;
+  }
 
-      position = giw_timeline_get_position (timeline);
+  if ((bs_width > 0) && (bs_height > 0)) {
+    cairo_t *cr = gdk_cairo_create(gtk_widget_get_window(widget));
+    gdouble  lower;
+    gdouble  upper;
+    gdouble  position;
+    gdouble  increment;
+
+    cairo_rectangle(cr,
+                    allocation.x, allocation.y,
+                    allocation.width, allocation.height);
+    cairo_clip(cr);
+
+    cairo_translate(cr, allocation.x, allocation.y);
+
+    /*  If a backing store exists, restore the timeline  */
+    if (priv->backing_store) {
+      cairo_set_source_surface(cr, priv->backing_store, 0, 0);
+      cairo_rectangle(cr, priv->xsrc, priv->ysrc, bs_width, bs_height);
+      cairo_fill(cr);
+    }
 
-      giw_timeline_get_range (timeline, &lower, &upper, NULL);
+    position = giw_timeline_get_position(timeline);
 
-      if (priv->orientation == GTK_ORIENTATION_HORIZONTAL)
-        {
-          increment = (gdouble) width / (upper - lower);
+    giw_timeline_get_range(timeline, &lower, &upper, NULL);
 
-          x = ROUND ((position - lower) * increment) + (border.left - bs_width) / 2 - 1;
-          y = (height + bs_height) / 2 + border.top;
-        }
-      else
-        {
-          increment = (gdouble) height / (upper - lower);
+    if (priv->orientation == GTK_ORIENTATION_HORIZONTAL) {
+      increment = (gdouble) width / (upper - lower);
 
-          x = (width + bs_width) / 2 + border.left;
-          y = ROUND ((position - lower) * increment) + (border.top - bs_height) / 2 - 1;
-        }
+      x = ROUND((position - lower) * increment) + (border.left - bs_width) / 2 - 1;
+      y = (height + bs_height) / 2 + border.top;
+    } else {
+      increment = (gdouble) height / (upper - lower);
 
-      gtk_style_context_get_color (context, gtk_widget_get_state_flags (widget),
-                                   &color);
-      gdk_cairo_set_source_rgba (cr, &color);
+      x = (width + bs_width) / 2 + border.left;
+      y = ROUND((position - lower) * increment) + (border.top - bs_height) / 2 - 1;
+    }
 
-      cairo_move_to (cr, x, y);
+    gtk_style_context_get_color(context, gtk_widget_get_state_flags(widget),
+                                &color);
+    gdk_cairo_set_source_rgba(cr, &color);
 
-      if (priv->orientation == GTK_ORIENTATION_HORIZONTAL)
-        {
-          cairo_line_to (cr, x + bs_width / 2.0, y + bs_height);
-          cairo_line_to (cr, x + bs_width,       y);
-        }
-      else
-        {
-          cairo_line_to (cr, x + bs_width, y + bs_height / 2.0);
-          cairo_line_to (cr, x,            y + bs_height);
-        }
+    cairo_move_to(cr, x, y);
+
+    if (priv->orientation == GTK_ORIENTATION_HORIZONTAL) {
+      cairo_line_to(cr, x + bs_width / 2.0, y + bs_height);
+      cairo_line_to(cr, x + bs_width,       y);
+    } else {
+      cairo_line_to(cr, x + bs_width, y + bs_height / 2.0);
+      cairo_line_to(cr, x,            y + bs_height);
+    }
 
-      cairo_fill (cr);
+    cairo_fill(cr);
 
-      cairo_destroy (cr);
+    cairo_destroy(cr);
 
-      priv->xsrc = x;
-      priv->ysrc = y;
-    }
+    priv->xsrc = x;
+    priv->ysrc = y;
+  }
 }
 
 static void
-giw_timeline_make_pixmap (GiwTimeline *timeline)
-{
-  GtkWidget        *widget = GTK_WIDGET (timeline);
-  GiwTimelinePrivate *priv   = GIW_TIMELINE_GET_PRIVATE (timeline);
+giw_timeline_make_pixmap(GiwTimeline *timeline) {
+  GtkWidget        *widget = GTK_WIDGET(timeline);
+  GiwTimelinePrivate *priv   = GIW_TIMELINE_GET_PRIVATE(timeline);
   GtkAllocation     allocation;
 
-  gtk_widget_get_allocation (widget, &allocation);
+  gtk_widget_get_allocation(widget, &allocation);
 
   if (priv->backing_store)
-    cairo_surface_destroy (priv->backing_store);
+    cairo_surface_destroy(priv->backing_store);
 
   priv->backing_store =
-    gdk_window_create_similar_surface (gtk_widget_get_window (widget),
-                                       CAIRO_CONTENT_COLOR,
-                                       allocation.width,
-                                       allocation.height);
+    gdk_window_create_similar_surface(gtk_widget_get_window(widget),
+                                      CAIRO_CONTENT_COLOR,
+                                      allocation.width,
+                                      allocation.height);
 }
 
 static PangoLayout *
-giw_timeline_create_layout (GtkWidget   *widget,
-                          const gchar *text)
-{
-  GiwTimelinePrivate *priv = GIW_TIMELINE_GET_PRIVATE (widget);
+giw_timeline_create_layout(GtkWidget   *widget,
+                           const gchar *text) {
+  GiwTimelinePrivate *priv = GIW_TIMELINE_GET_PRIVATE(widget);
   PangoLayout      *layout;
   PangoAttrList    *attrs;
   PangoAttribute   *attr;
 
-  layout = gtk_widget_create_pango_layout (widget, text);
+  layout = gtk_widget_create_pango_layout(widget, text);
 
-  attrs = pango_attr_list_new ();
+  attrs = pango_attr_list_new();
 
-  attr = pango_attr_scale_new (priv->font_scale);
+  attr = pango_attr_scale_new(priv->font_scale);
   attr->start_index = 0;
   attr->end_index   = -1;
-  pango_attr_list_insert (attrs, attr);
+  pango_attr_list_insert(attrs, attr);
 
-  pango_layout_set_attributes (layout, attrs);
-  pango_attr_list_unref (attrs);
+  pango_layout_set_attributes(layout, attrs);
+  pango_attr_list_unref(attrs);
 
   return layout;
 }
 
 static PangoLayout *
-giw_timeline_get_layout (GtkWidget   *widget,
-                       const gchar *text)
-{
-  GiwTimelinePrivate *priv = GIW_TIMELINE_GET_PRIVATE (widget);
-
-  if (priv->layout)
-    {
-      pango_layout_set_text (priv->layout, text, -1);
-      return priv->layout;
-    }
+giw_timeline_get_layout(GtkWidget   *widget,
+                        const gchar *text) {
+  GiwTimelinePrivate *priv = GIW_TIMELINE_GET_PRIVATE(widget);
+
+  if (priv->layout) {
+    pango_layout_set_text(priv->layout, text, -1);
+    return priv->layout;
+  }
 
-  priv->layout = giw_timeline_create_layout (widget, text);
+  priv->layout = giw_timeline_create_layout(widget, text);
 
   return priv->layout;
 }

LiVES-2.2.8.tar.bz2/src/giw/giwtimeline.h -> LiVES-2.4.1.tar.bz2/src/giw/giwtimeline.h Changed

@@ -44,30 +44,28 @@
 typedef struct _GiwTimeline   GiwTimeline;
 typedef struct _GiwTimelineClass   GiwTimelineClass;
 
-struct _GiwTimeline
-{
+struct _GiwTimeline {
   GtkScale  scale;
 };
 
-struct _GiwTimelineClass
-{
+struct _GiwTimelineClass {
   GtkScaleClass  parent_class;
 
 };
 
 
-GType       giw_timeline_get_type            (void) G_GNUC_CONST;
-GtkWidget * giw_timeline_new                 (GtkOrientation  orientation);
-void        giw_timeline_add_track_widget    (GiwTimeline      *timeline,
-					      GtkWidget      *widget);
-void        giw_timeline_remove_track_widget (GiwTimeline      *timeline,
-					      GtkWidget      *widget);
-void        giw_timeline_set_max_size        (GiwTimeline      *timeline,
-					      gdouble         max_size);
-gdouble     giw_timeline_get_max_size        (GiwTimeline    *timeline);
-void        giw_timeline_set_unit            (GiwTimeline    *timeline, 
-					      GiwTimeUnit    unit);
-GiwTimeUnit giw_timeline_get_unit            (GiwTimeline    *timeline);
+GType       giw_timeline_get_type(void) G_GNUC_CONST;
+GtkWidget *giw_timeline_new(GtkOrientation  orientation);
+void        giw_timeline_add_track_widget(GiwTimeline      *timeline,
+    GtkWidget      *widget);
+void        giw_timeline_remove_track_widget(GiwTimeline      *timeline,
+    GtkWidget      *widget);
+void        giw_timeline_set_max_size(GiwTimeline      *timeline,
+                                      gdouble         max_size);
+gdouble     giw_timeline_get_max_size(GiwTimeline    *timeline);
+void        giw_timeline_set_unit(GiwTimeline    *timeline,
+                                  GiwTimeUnit    unit);
+GiwTimeUnit giw_timeline_get_unit(GiwTimeline    *timeline);
 
 
 G_END_DECLS

LiVES-2.2.8.tar.bz2/src/giw/giwvslider.c -> LiVES-2.4.1.tar.bz2/src/giw/giwvslider.c Changed

@@ -16,7 +16,7 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 
 Maintainers
-Alexandre Pereira Bueno - alpebu@yahoo.com.br 
+Alexandre Pereira Bueno - alpebu@yahoo.com.br
 James Scott Jr <skoona@users.sourceforge.net>
 */
 
@@ -28,7 +28,7 @@
 
 #include "main.h"
 
-#include "giw/giwvslider.h" 
+#include "giw/giwvslider.h"
 
 
 
@@ -37,90 +37,87 @@
 #define VSLIDER_DEFAULT_HEIGHT 50
 
 /* Forward declarations */
-static void giw_vslider_class_init               (GiwVSliderClass    *klass);
-static void giw_vslider_init                     (GiwVSlider         *vslider);
-static void giw_vslider_realize                  (GtkWidget        *widget);
-static void giw_vslider_size_request             (GtkWidget      *widget,
-					       GtkRequisition *requisition);
+static void giw_vslider_class_init(GiwVSliderClass    *klass);
+static void giw_vslider_init(GiwVSlider         *vslider);
+static void giw_vslider_realize(GtkWidget        *widget);
+static void giw_vslider_size_request(GtkWidget      *widget,
+                                     GtkRequisition *requisition);
 #if GTK_CHECK_VERSION(3,0,0)
-static void giw_vslider_get_preferred_width (GtkWidget *widget,
-					     gint      *minimal_width,
-					     gint      *natural_width);
-static void giw_vslider_get_preferred_height (GtkWidget *widget,
-					      gint      *minimal_height,
-					      gint      *natural_height);
-static void giw_vslider_dispose                  (GObject        *object);
-static gboolean giw_vslider_draw                (GtkWidget *widget, cairo_t *cairo);
-static void giw_vslider_style_updated             (GtkWidget *widget);
+static void giw_vslider_get_preferred_width(GtkWidget *widget,
+    gint      *minimal_width,
+    gint      *natural_width);
+static void giw_vslider_get_preferred_height(GtkWidget *widget,
+    gint      *minimal_height,
+    gint      *natural_height);
+static void giw_vslider_dispose(GObject        *object);
+static gboolean giw_vslider_draw(GtkWidget *widget, cairo_t *cairo);
+static void giw_vslider_style_updated(GtkWidget *widget);
 #else
-static void giw_vslider_destroy                  (GtkObject        *object);
-static gint giw_vslider_expose                   (GtkWidget        *widget,
-						GdkEventExpose   *event);
+static void giw_vslider_destroy(GtkObject        *object);
+static gint giw_vslider_expose(GtkWidget        *widget,
+                               GdkEventExpose   *event);
 #endif
-static void giw_vslider_size_allocate            (GtkWidget     *widget,
-					       GtkAllocation *allocation);
-static gboolean giw_vslider_button_press             (GtkWidget        *widget,
-						GdkEventButton   *event);
-static gboolean giw_vslider_button_release           (GtkWidget        *widget,
-						GdkEventButton   *event);
-static gboolean giw_vslider_motion_notify            (GtkWidget        *widget,
-						      GdkEventMotion   *event);
-static void giw_vslider_adjustment_changed       (GtkAdjustment    *adjustment,
-						gpointer          data);
-static void giw_vslider_adjustment_value_changed (GtkAdjustment    *adjustment,
-						gpointer          data);
-static void giw_vslider_style_set	              (GtkWidget      *widget,
-						       GtkStyle       *previous_style);
+static void giw_vslider_size_allocate(GtkWidget     *widget,
+                                      GtkAllocation *allocation);
+static gboolean giw_vslider_button_press(GtkWidget        *widget,
+    GdkEventButton   *event);
+static gboolean giw_vslider_button_release(GtkWidget        *widget,
+    GdkEventButton   *event);
+static gboolean giw_vslider_motion_notify(GtkWidget        *widget,
+    GdkEventMotion   *event);
+static void giw_vslider_adjustment_changed(GtkAdjustment    *adjustment,
+    gpointer          data);
+static void giw_vslider_adjustment_value_changed(GtkAdjustment    *adjustment,
+    gpointer          data);
+static void giw_vslider_style_set(GtkWidget      *widget,
+                                  GtkStyle       *previous_style);
 
 /* Local data and functions */
 
 // A function that calculates distances and sizes for a later drawing..
-void vslider_calculate_sizes(GiwVSlider *vslider); 
+void vslider_calculate_sizes(GiwVSlider *vslider);
 
 // A function that calculates position and size of the button
-void vslider_calculate_button(GiwVSlider *vslider); 
+void vslider_calculate_button(GiwVSlider *vslider);
 
 // A function that calculates position and size of the phanton button
-void vslider_calculate_phanton_button(GiwVSlider *vslider); 
+void vslider_calculate_phanton_button(GiwVSlider *vslider);
 
 // A function that creates the layout of legends and calculates it's sizes
-void vslider_build_legends(GiwVSlider *vslider); 
+void vslider_build_legends(GiwVSlider *vslider);
 
-// A function that frees the layout of legends 
-void vslider_free_legends(GiwVSlider *vslider); 
+// A function that frees the layout of legends
+void vslider_free_legends(GiwVSlider *vslider);
 
 // A function that calculates width and height of the legend's the layout
-void vslider_calculate_legends_sizes(GiwVSlider *vslider); 
+void vslider_calculate_legends_sizes(GiwVSlider *vslider);
 
 
 #if GTK_CHECK_VERSION(3,0,0)
-G_DEFINE_TYPE (GiwVSlider, giw_vslider, GTK_TYPE_WIDGET)
+G_DEFINE_TYPE(GiwVSlider, giw_vslider, GTK_TYPE_WIDGET)
 #define parent_class giw_vslider_parent_class
 #else
 static GtkWidgetClass *parent_class = NULL;
 
 
 GType
-giw_vslider_get_type ()
-{
+giw_vslider_get_type() {
   static GType vslider_type = 0;
 
-  if (!vslider_type)
-    {
-      static const GtkTypeInfo vslider_info =
-	{
-	  "GiwVSlider",
-	  sizeof (GiwVSlider),
-	  sizeof (GiwVSliderClass),
-	  (GtkClassInitFunc) giw_vslider_class_init,
-	  (GtkObjectInitFunc) giw_vslider_init,
-	  /*(GtkArgSetFunc)*/ NULL,
-	  /*(GtkArgGetFunc)*/ NULL,
-	  (GtkClassInitFunc) NULL,
-	};
-      
-      vslider_type = gtk_type_unique (gtk_widget_get_type (), &vslider_info);
-    }
+  if (!vslider_type) {
+    static const GtkTypeInfo vslider_info = {
+      "GiwVSlider",
+      sizeof(GiwVSlider),
+      sizeof(GiwVSliderClass),
+      (GtkClassInitFunc) giw_vslider_class_init,
+      (GtkObjectInitFunc) giw_vslider_init,
+      /*(GtkArgSetFunc)*/ NULL,
+      /*(GtkArgGetFunc)*/ NULL,
+      (GtkClassInitFunc) NULL,
+    };
+
+    vslider_type = gtk_type_unique(gtk_widget_get_type(), &vslider_info);
+  }
 
   return vslider_type;
 }
@@ -128,21 +125,20 @@
 #endif
 
 static void
-giw_vslider_class_init (GiwVSliderClass *xclass)
-{
+giw_vslider_class_init(GiwVSliderClass *xclass) {
 #if GTK_CHECK_VERSION(3,0,0)
   GObjectClass *object_class = G_OBJECT_CLASS(xclass);
 #else
-  GtkObjectClass *object_class = (GtkObjectClass*) xclass;
+  GtkObjectClass *object_class = (GtkObjectClass *) xclass;
 #endif
   GtkWidgetClass *widget_class;
 
-  widget_class = (GtkWidgetClass*) xclass;
+  widget_class = (GtkWidgetClass *) xclass;
 
 #if GTK_CHECK_VERSION(3,0,0)
   object_class->dispose = giw_vslider_dispose;
 #else
-  parent_class = (GtkWidgetClass *)gtk_type_class (gtk_widget_get_type ());
+  parent_class = (GtkWidgetClass *)gtk_type_class(gtk_widget_get_type());
   object_class->destroy = giw_vslider_destroy;
 #endif
 
@@ -165,18 +161,17 @@
 }
 
 static void
-giw_vslider_init (GiwVSlider *vslider)
-{
+giw_vslider_init(GiwVSlider *vslider) {
   //Defaults
   vslider->legend_digits=3;
   vslider->major_ticks=3;
-  vslider->minor_ticks=1;  
-  
+  vslider->minor_ticks=1;
+
   // Default mouse policy : automatically
   vslider->mouse_policy=GIW_VSLIDER_MOUSE_AUTOMATICALLY;
-    
+
   vslider->button=FALSE;
-  
+
   // Conditions for a unpressed button
   vslider->button_state=GTK_STATE_NORMAL;
   vslider->button_shadow=GTK_SHADOW_OUT;
@@ -187,78 +182,75 @@
 
 }
 
-GtkWidget*
-giw_vslider_new (GtkAdjustment *adjustment)
-{
+GtkWidget *
+giw_vslider_new(GtkAdjustment *adjustment) {
   GiwVSlider *vslider;
 
-  g_return_val_if_fail (adjustment != NULL, NULL);
-  
+  g_return_val_if_fail(adjustment != NULL, NULL);
+
 #if GTK_CHECK_VERSION(3,0,0)
-  vslider = (GiwVSlider *)g_object_new (GIW_TYPE_VSLIDER, NULL);
+  vslider = (GiwVSlider *)g_object_new(GIW_TYPE_VSLIDER, NULL);
 #else
-  vslider = (GiwVSlider *)gtk_type_new (giw_vslider_get_type ());
+  vslider = (GiwVSlider *)gtk_type_new(giw_vslider_get_type());
 #endif
-  
+
   giw_vslider_set_adjustment(vslider, adjustment);
-  
-  return GTK_WIDGET (vslider);
+
+  return GTK_WIDGET(vslider);
 }
 
-GtkWidget*
-giw_vslider_new_with_adjustment (gdouble value,
-			 gdouble lower,
-			 gdouble upper)
-{
+GtkWidget *
+giw_vslider_new_with_adjustment(gdouble value,
+                                gdouble lower,
+                                gdouble upper) {
   GiwVSlider *vslider;
-  
+
 #if GTK_CHECK_VERSION(3,0,0)
-  vslider = (GiwVSlider *)g_object_new (GIW_TYPE_VSLIDER, NULL);
+  vslider = (GiwVSlider *)g_object_new(GIW_TYPE_VSLIDER, NULL);
 #else
-  vslider = (GiwVSlider *)gtk_type_new (giw_vslider_get_type ());
+  vslider = (GiwVSlider *)gtk_type_new(giw_vslider_get_type());
 #endif
-  
-  giw_vslider_set_adjustment(vslider, (GtkAdjustment*) gtk_adjustment_new (value, lower, upper, 1.0, 1.0, 1.0));
-  
-  return GTK_WIDGET (vslider);
+
+  giw_vslider_set_adjustment(vslider, (GtkAdjustment *) gtk_adjustment_new(value, lower, upper, 1.0, 1.0, 1.0));
+
+  return GTK_WIDGET(vslider);
 }
 
 #if GTK_CHECK_VERSION(3,0,0)
-static void giw_vslider_dispose (GObject *object) {
+static void giw_vslider_dispose(GObject *object) {
 #else
-static void giw_vslider_destroy (GtkObject *object) {
+static void giw_vslider_destroy(GtkObject *object) {
 #endif
   GiwVSlider *vslider;
   gint loop;
 
-  g_return_if_fail (object != NULL);
-  g_return_if_fail (GIW_IS_VSLIDER (object));
+  g_return_if_fail(object != NULL);
+  g_return_if_fail(GIW_IS_VSLIDER(object));
+
+  vslider = GIW_VSLIDER(object);
 
-  vslider = GIW_VSLIDER (object);
-    
   // Freeing all
   if (vslider->adjustment)
-    g_object_unref (G_OBJECT (vslider->adjustment));
+    g_object_unref(G_OBJECT(vslider->adjustment));
   vslider->adjustment=NULL;
   if (vslider->legends) {
-    for (loop=0; loop<vslider->major_ticks; loop++){
+    for (loop=0; loop<vslider->major_ticks; loop++) {
       if (vslider->legends[loop]!=NULL) g_object_unref(G_OBJECT(vslider->legends[loop]));
     }
     g_free(vslider->legends);
     vslider->legends=NULL;
   }
-    
+
 #if GTK_CHECK_VERSION(3,0,0)
-  G_OBJECT_CLASS (giw_vslider_parent_class)->dispose (object);
+  G_OBJECT_CLASS(giw_vslider_parent_class)->dispose(object);
 #else
-  if (LIVES_GUI_OBJECT_CLASS (parent_class)->destroy)
-    (* LIVES_GUI_OBJECT_CLASS (parent_class)->destroy) (object);
+  if (LIVES_GUI_OBJECT_CLASS(parent_class)->destroy)
+    (* LIVES_GUI_OBJECT_CLASS(parent_class)->destroy)(object);
 #endif
 }
 
 static void
-giw_vslider_realize (GtkWidget *widget)
-{
+giw_vslider_realize(GtkWidget *widget) {
   GiwVSlider *vslider;
   GdkWindowAttr attributes;
   gint attributes_mask;
@@ -266,17 +258,17 @@
 #if GTK_CHECK_VERSION(3,0,0)
   GtkStyleContext *stylecon;
 #endif
- 
-  g_return_if_fail (widget != NULL);
-  g_return_if_fail (GIW_IS_VSLIDER (widget));
+
+  g_return_if_fail(widget != NULL);
+  g_return_if_fail(GIW_IS_VSLIDER(widget));
 
 #if GTK_CHECK_VERSION(2,20,0)
   gtk_widget_set_realized(widget,TRUE);
 #else
-  GTK_WIDGET_SET_FLAGS (widget, GTK_REALIZED);
+  GTK_WIDGET_SET_FLAGS(widget, GTK_REALIZED);
 #endif
 
-  vslider = GIW_VSLIDER (widget);
+  vslider = GIW_VSLIDER(widget);
 
 
   attributes.x = lives_widget_get_allocation_x(widget);
@@ -285,23 +277,23 @@
   attributes.height = lives_widget_get_allocation_height(widget);
   attributes.wclass = GDK_INPUT_OUTPUT;
   attributes.window_type = GDK_WINDOW_CHILD;
-  attributes.event_mask = gtk_widget_get_events (widget) | 
-    GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK | 
-    GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK;
+  attributes.event_mask = gtk_widget_get_events(widget) |
+                          GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK |
+                          GDK_BUTTON_RELEASE_MASK | GDK_POINTER_MOTION_MASK;
 
 
   attributes_mask = GDK_WA_X | GDK_WA_Y;
 
 #if !GTK_CHECK_VERSION(3,0,0)
   attributes_mask |= GDK_WA_COLORMAP | GDK_WA_VISUAL;
-  attributes.visual = gtk_widget_get_visual (widget);
-  attributes.colormap = gtk_widget_get_colormap (widget);
+  attributes.visual = gtk_widget_get_visual(widget);
+  attributes.colormap = gtk_widget_get_colormap(widget);
 #endif
 
 #if GTK_CHECK_VERSION(2,18,0)
-  gtk_widget_set_window(widget,gdk_window_new (lives_widget_get_xwindow(lives_widget_get_parent(widget)), &attributes, attributes_mask));
+  gtk_widget_set_window(widget,gdk_window_new(lives_widget_get_xwindow(lives_widget_get_parent(widget)), &attributes, attributes_mask));
 #else
-  widget->window = gdk_window_new (widget->parent->window, &attributes, attributes_mask);
+  widget->window = gdk_window_new(widget->parent->window, &attributes, attributes_mask);
 #endif
 
 #if GTK_CHECK_VERSION(3,0,0)
@@ -310,23 +302,22 @@
   gtk_style_context_set_state(stylecon,GTK_STATE_FLAG_ACTIVE);
   gtk_style_context_set_background(stylecon,lives_widget_get_xwindow(lives_widget_get_parent(widget)));
 #else
-  widget->style = gtk_style_attach (widget->style, lives_widget_get_xwindow(widget));
-  gtk_style_set_background (widget->style, lives_widget_get_xwindow(widget), GTK_STATE_ACTIVE);
+  widget->style = gtk_style_attach(widget->style, lives_widget_get_xwindow(widget));
+  gtk_style_set_background(widget->style, lives_widget_get_xwindow(widget), GTK_STATE_ACTIVE);
 #endif
 
-  gdk_window_set_user_data (lives_widget_get_xwindow(widget), widget);
+  gdk_window_set_user_data(lives_widget_get_xwindow(widget), widget);
+
 
-  
   // Creating the legends
   vslider_build_legends(vslider);
 }
 
 
 
-static void 
-giw_vslider_size_request (GtkWidget      *widget,
-		       GtkRequisition *requisition)
-{
+static void
+giw_vslider_size_request(GtkWidget      *widget,
+                         GtkRequisition *requisition) {
   requisition->width = VSLIDER_DEFAULT_WIDTH;
   requisition->height = VSLIDER_DEFAULT_HEIGHT;
 }
@@ -334,25 +325,23 @@
 #if GTK_CHECK_VERSION(3,0,0)
 
 static void
-giw_vslider_get_preferred_width (GtkWidget *widget,
-    gint      *minimal_width,
-    gint      *natural_width)
-{
+giw_vslider_get_preferred_width(GtkWidget *widget,
+                                gint      *minimal_width,
+                                gint      *natural_width) {
   GtkRequisition requisition;
 
-  giw_vslider_size_request (widget, &requisition);
+  giw_vslider_size_request(widget, &requisition);
 
   *minimal_width = *natural_width = requisition.width;
 }
 
 static void
-giw_vslider_get_preferred_height (GtkWidget *widget,
-    gint      *minimal_height,
-    gint      *natural_height)
-{
+giw_vslider_get_preferred_height(GtkWidget *widget,
+                                 gint      *minimal_height,
+                                 gint      *natural_height) {
   GtkRequisition requisition;
 
-  giw_vslider_size_request (widget, &requisition);
+  giw_vslider_size_request(widget, &requisition);
 
   *minimal_height = *natural_height = requisition.height;
 }
@@ -361,14 +350,13 @@
 
 
 static void
-giw_vslider_size_allocate (GtkWidget     *widget,
-			GtkAllocation *allocation)
-{
+giw_vslider_size_allocate(GtkWidget     *widget,
+                          GtkAllocation *allocation) {
   GiwVSlider *vslider;
-  
-  g_return_if_fail (widget != NULL);
-  g_return_if_fail (GIW_IS_VSLIDER (widget));
-  g_return_if_fail (allocation != NULL);
+
+  g_return_if_fail(widget != NULL);
+  g_return_if_fail(GIW_IS_VSLIDER(widget));
+  g_return_if_fail(allocation != NULL);
 
 #if GTK_CHECK_VERSION(2,18,0)
   gtk_widget_set_allocation(widget,allocation);
@@ -376,28 +364,26 @@
   widget->allocation = *allocation;
 #endif
 
-  vslider = GIW_VSLIDER (widget);
+  vslider = GIW_VSLIDER(widget);
 
-  if (lives_widget_is_realized (widget))
-    {
-      gdk_window_move_resize (lives_widget_get_xwindow(widget),
-			      allocation->x, allocation->y,
-			      allocation->width, allocation->height);
+  if (lives_widget_is_realized(widget)) {
+    gdk_window_move_resize(lives_widget_get_xwindow(widget),
+                           allocation->x, allocation->y,
+                           allocation->width, allocation->height);
 
-    }
-    
-  // If the window size has changed, all the distances need to be recalculated 
+  }
+
+  // If the window size has changed, all the distances need to be recalculated
   vslider_calculate_sizes(vslider);
 }
 
 #if GTK_CHECK_VERSION(3,0,0)
- static gboolean giw_vslider_draw (GtkWidget *widget, cairo_t *cairo) {
-   GdkRGBA color;
+static gboolean giw_vslider_draw(GtkWidget *widget, cairo_t *cairo) {
+  GdkRGBA color;
 #else
 static gint
-giw_vslider_expose (GtkWidget      *widget,
-		 GdkEventExpose *event)
-{
+giw_vslider_expose(GtkWidget      *widget,
+                   GdkEventExpose *event) {
 #endif
 
   GiwVSlider *vslider;
@@ -406,54 +392,55 @@
 
 #if !GTK_CHECK_VERSION(3,0,0)
 
-  g_return_val_if_fail (event != NULL, FALSE);
+  g_return_val_if_fail(event != NULL, FALSE);
 
   if (event->count > 0)
     return FALSE;
 #endif
-      
-  g_return_val_if_fail (widget != NULL, FALSE);
-  g_return_val_if_fail (GIW_IS_VSLIDER (widget), FALSE);
-  
-  vslider = GIW_VSLIDER (widget);
 
-  rect.x=0;rect.y=0;
+  g_return_val_if_fail(widget != NULL, FALSE);
+  g_return_val_if_fail(GIW_IS_VSLIDER(widget), FALSE);
+
+  vslider = GIW_VSLIDER(widget);
+
+  rect.x=0;
+  rect.y=0;
   rect.width=lives_widget_get_allocation_width(widget);
   rect.height=lives_widget_get_allocation_height(widget);
 
 
 #if GTK_CHECK_VERSION(3,0,0)
   gtk_render_background(gtk_widget_get_style_context(widget),
-			cairo,
-			0,
-			0,
-			rect.width,
-			rect.height);
-  
+                        cairo,
+                        0,
+                        0,
+                        rect.width,
+                        rect.height);
+
   cairo_set_line_width(cairo,1.);
 
   // Drawing all the ticks and legends
-  for (loop=0; loop<vslider->major_ticks; loop++){
+  for (loop=0; loop<vslider->major_ticks; loop++) {
     // Legends
     if (vslider->legend_digits!=0)
-      gtk_render_layout (gtk_widget_get_style_context(widget),
-			 cairo,
-			 0,
-			 vslider->y+(gint)(vslider->major_dy*(gdouble)loop)-(vslider->legend_height/2),
-			 vslider->legends[loop]);
+      gtk_render_layout(gtk_widget_get_style_context(widget),
+                        cairo,
+                        0,
+                        vslider->y+(gint)(vslider->major_dy*(gdouble)loop)-(vslider->legend_height/2),
+                        vslider->legends[loop]);
 
-    gtk_style_context_get_color (gtk_widget_get_style_context (widget), gtk_widget_get_state_flags(widget), &color);
-    cairo_set_source_rgba (cairo, color.red, color.green, color.blue, color.alpha);
+    gtk_style_context_get_color(gtk_widget_get_style_context(widget), gtk_widget_get_state_flags(widget), &color);
+    cairo_set_source_rgba(cairo, color.red, color.green, color.blue, color.alpha);
 
     // Major ticks
     cairo_move_to(cairo,
-		  vslider->legend_width-5, 
-		  vslider->y+(gint)(vslider->major_dy*(gdouble)loop));
+                  vslider->legend_width-5,
+                  vslider->y+(gint)(vslider->major_dy*(gdouble)loop));
 
 
     cairo_line_to(cairo,
-		  vslider->legend_width,
-		  vslider->y+(gint)(vslider->major_dy*(gdouble)loop));
+                  vslider->legend_width,
+                  vslider->y+(gint)(vslider->major_dy*(gdouble)loop));
 
     cairo_stroke(cairo);
 
@@ -461,494 +448,478 @@
     for (loop2=1; loop2<vslider->minor_ticks+1; loop2++)
       if (loop!=vslider->major_ticks-1) { // If it's not the last one
         cairo_move_to(cairo,
-		      vslider->legend_width-3, 
-		      vslider->y+(gint)(vslider->major_dy*(gdouble)loop)+vslider->minor_dy*(gdouble)loop2);
-    
-	cairo_line_to(cairo,
-		      vslider->legend_width,
-		      vslider->y+(gint)(vslider->major_dy*(gdouble)loop)+vslider->minor_dy*(gdouble)loop2);
-
-	cairo_stroke(cairo);
+                      vslider->legend_width-3,
+                      vslider->y+(gint)(vslider->major_dy*(gdouble)loop)+vslider->minor_dy*(gdouble)loop2);
+
+        cairo_line_to(cairo,
+                      vslider->legend_width,
+                      vslider->y+(gint)(vslider->major_dy*(gdouble)loop)+vslider->minor_dy*(gdouble)loop2);
+
+        cairo_stroke(cairo);
       }
   }
 
   //Drawing the back hole
-  cairo_set_source_rgba (cairo, 0.,0.,0.,1.);
-  cairo_rectangle (cairo,
-		   vslider->x+vslider->width/2-2,
-		   vslider->y,
-		   4,
-		   vslider->height);
+  cairo_set_source_rgba(cairo, 0.,0.,0.,1.);
+  cairo_rectangle(cairo,
+                  vslider->x+vslider->width/2-2,
+                  vslider->y,
+                  4,
+                  vslider->height);
 
   cairo_fill(cairo);
 
-  gtk_style_context_get_background_color (gtk_widget_get_style_context (widget), gtk_widget_get_state_flags(widget), &color);
-  cairo_set_source_rgba (cairo, color.red, color.green, color.blue, color.alpha);
+  gtk_style_context_get_background_color(gtk_widget_get_style_context(widget), gtk_widget_get_state_flags(widget), &color);
+  cairo_set_source_rgba(cairo, color.red, color.green, color.blue, color.alpha);
 
-  cairo_rectangle (cairo,
-		   vslider->x+vslider->width/2-2,
-		   vslider->y,
-		   4,
-		   vslider->height);
+  cairo_rectangle(cairo,
+                  vslider->x+vslider->width/2-2,
+                  vslider->y,
+                  4,
+                  vslider->height);
 
   cairo_stroke(cairo);
 
-  gtk_style_context_get_color (gtk_widget_get_style_context (widget), gtk_widget_get_state_flags(widget), &color);
-  cairo_set_source_rgba (cairo, color.red, color.green, color.blue, color.alpha);
+  gtk_style_context_get_color(gtk_widget_get_style_context(widget), gtk_widget_get_state_flags(widget), &color);
+  cairo_set_source_rgba(cairo, color.red, color.green, color.blue, color.alpha);
 
-  cairo_rectangle (cairo,
-		   vslider->button_x,
-		   vslider->button_y,
-		   vslider->button_w,
-		   vslider->button_h);
+  cairo_rectangle(cairo,
+                  vslider->button_x,
+                  vslider->button_y,
+                  vslider->button_w,
+                  vslider->button_h);
 
   cairo_fill(cairo);
 
 
   // The phanton button
-  if ((vslider->mouse_policy == GIW_VSLIDER_MOUSE_DELAYED) && (vslider->button !=0 ))
-    gtk_render_slider (gtk_widget_get_style_context(widget),
-		       cairo,
-		       vslider->pbutton_x,
-		       vslider->pbutton_y,
-		       vslider->pbutton_w,
-		       vslider->pbutton_h,
-		       GTK_ORIENTATION_VERTICAL);
+  if ((vslider->mouse_policy == GIW_VSLIDER_MOUSE_DELAYED) && (vslider->button !=0))
+    gtk_render_slider(gtk_widget_get_style_context(widget),
+                      cairo,
+                      vslider->pbutton_x,
+                      vslider->pbutton_y,
+                      vslider->pbutton_w,
+                      vslider->pbutton_h,
+                      GTK_ORIENTATION_VERTICAL);
 
 #else
 
 
   // Drawing background
-  gtk_paint_flat_box (widget->style,
-			widget->window,
-			GTK_STATE_NORMAL,
-			GTK_SHADOW_NONE,
-			&rect,
-			widget,
-			NULL, 
-			0, 
-			0, 
-			-1,
-			-1);
-        
+  gtk_paint_flat_box(widget->style,
+                     widget->window,
+                     GTK_STATE_NORMAL,
+                     GTK_SHADOW_NONE,
+                     &rect,
+                     widget,
+                     NULL,
+                     0,
+                     0,
+                     -1,
+                     -1);
+
   // Drawing all the ticks and legends
-  for (loop=0; loop<vslider->major_ticks; loop++){
+  for (loop=0; loop<vslider->major_ticks; loop++) {
     // Legends
     if (vslider->legend_digits!=0)
-      gtk_paint_layout (widget->style,
-			widget->window,
-			GTK_STATE_NORMAL,
-			FALSE,
-			&rect,
-			widget,
-			NULL,
-                        0,
-			vslider->y+(gint)(vslider->major_dy*(gdouble)loop)-(vslider->legend_height/2),
-			vslider->legends[loop]);
+      gtk_paint_layout(widget->style,
+                       widget->window,
+                       GTK_STATE_NORMAL,
+                       FALSE,
+                       &rect,
+                       widget,
+                       NULL,
+                       0,
+                       vslider->y+(gint)(vslider->major_dy*(gdouble)loop)-(vslider->legend_height/2),
+                       vslider->legends[loop]);
     // Major ticks
-    gdk_draw_line(widget->window, 
-			widget->style->fg_gc[widget->state],
-			vslider->legend_width-5, 
-			vslider->y+(gint)(vslider->major_dy*(gdouble)loop),
-			vslider->legend_width,
-			vslider->y+(gint)(vslider->major_dy*(gdouble)loop));
+    gdk_draw_line(widget->window,
+                  widget->style->fg_gc[widget->state],
+                  vslider->legend_width-5,
+                  vslider->y+(gint)(vslider->major_dy*(gdouble)loop),
+                  vslider->legend_width,
+                  vslider->y+(gint)(vslider->major_dy*(gdouble)loop));
     // Minor ticks
     for (loop2=1; loop2<vslider->minor_ticks+1; loop2++)
       if (loop!=vslider->major_ticks-1) // If it's not the last one
-        gdk_draw_line(widget->window, 
-			    widget->style->fg_gc[widget->state],
-			    vslider->legend_width-3, 
-			    vslider->y+(gint)(vslider->major_dy*(gdouble)loop)+vslider->minor_dy*(gdouble)loop2,
-			    vslider->legend_width,
-			    vslider->y+(gint)(vslider->major_dy*(gdouble)loop)+vslider->minor_dy*(gdouble)loop2);
+        gdk_draw_line(widget->window,
+                      widget->style->fg_gc[widget->state],
+                      vslider->legend_width-3,
+                      vslider->y+(gint)(vslider->major_dy*(gdouble)loop)+vslider->minor_dy*(gdouble)loop2,
+                      vslider->legend_width,
+                      vslider->y+(gint)(vslider->major_dy*(gdouble)loop)+vslider->minor_dy*(gdouble)loop2);
   }
-   
+
   //Drawing the back hole
-  gdk_draw_rectangle (widget->window,
-	                widget->style->black_gc,
-			TRUE,
-			vslider->x+vslider->width/2-2,
-			vslider->y,
-			4,
-			vslider->height);
-  gdk_draw_rectangle (widget->window,
-	                widget->style->bg_gc[widget->state],
-			FALSE,
-			vslider->x+vslider->width/2-2,
-			vslider->y,
-			4,
-			vslider->height);
+  gdk_draw_rectangle(widget->window,
+                     widget->style->black_gc,
+                     TRUE,
+                     vslider->x+vslider->width/2-2,
+                     vslider->y,
+                     4,
+                     vslider->height);
+  gdk_draw_rectangle(widget->window,
+                     widget->style->bg_gc[widget->state],
+                     FALSE,
+                     vslider->x+vslider->width/2-2,
+                     vslider->y,
+                     4,
+                     vslider->height);
 
   // The button
   /*  gtk_paint_slider (widget->style,
-			widget->window,
-		        vslider->button_state,
-			vslider->button_shadow,
-			&rect,
-			widget,
-			NULL,
-			vslider->button_x,
-			vslider->button_y,
-			vslider->button_w,
-			vslider->button_h,
-			GTK_ORIENTATION_VERTICAL); */
-
-  gdk_draw_rectangle (widget->window,
-	                widget->style->fg_gc[widget->state],
-			TRUE,
-			vslider->button_x,
-			vslider->button_y,
-			vslider->button_w,
-			vslider->button_h);
+  		widget->window,
+  	        vslider->button_state,
+  		vslider->button_shadow,
+  		&rect,
+  		widget,
+  		NULL,
+  		vslider->button_x,
+  		vslider->button_y,
+  		vslider->button_w,
+  		vslider->button_h,
+  		GTK_ORIENTATION_VERTICAL); */
+
+  gdk_draw_rectangle(widget->window,
+                     widget->style->fg_gc[widget->state],
+                     TRUE,
+                     vslider->button_x,
+                     vslider->button_y,
+                     vslider->button_w,
+                     vslider->button_h);
 
   // The phanton button
-  if ((vslider->mouse_policy == GIW_VSLIDER_MOUSE_DELAYED) && (vslider->button !=0 ))
-    gtk_paint_slider (widget->style,
-			widget->window,
-			GTK_STATE_ACTIVE,
-			GTK_SHADOW_ETCHED_OUT,
-			&rect,
-			widget,
-			NULL,
-			vslider->pbutton_x,
-			vslider->pbutton_y,
-			vslider->pbutton_w,
-			vslider->pbutton_h,
-			GTK_ORIENTATION_VERTICAL);
+  if ((vslider->mouse_policy == GIW_VSLIDER_MOUSE_DELAYED) && (vslider->button !=0))
+    gtk_paint_slider(widget->style,
+                     widget->window,
+                     GTK_STATE_ACTIVE,
+                     GTK_SHADOW_ETCHED_OUT,
+                     &rect,
+                     widget,
+                     NULL,
+                     vslider->pbutton_x,
+                     vslider->pbutton_y,
+                     vslider->pbutton_w,
+                     vslider->pbutton_h,
+                     GTK_ORIENTATION_VERTICAL);
 #endif
- 
-  return(0);
+
+  return (0);
 }
 
 
 static gboolean
-giw_vslider_button_press (GtkWidget        *widget,
-			  GdkEventButton   *event)
-{
+giw_vslider_button_press(GtkWidget        *widget,
+                         GdkEventButton   *event) {
   GiwVSlider *vslider;
- 
-  g_return_val_if_fail (widget != NULL, FALSE);
-  g_return_val_if_fail (GIW_IS_VSLIDER (widget), FALSE);
-  g_return_val_if_fail (event != NULL, FALSE);
-    
+
+  g_return_val_if_fail(widget != NULL, FALSE);
+  g_return_val_if_fail(GIW_IS_VSLIDER(widget), FALSE);
+  g_return_val_if_fail(event != NULL, FALSE);
+
   vslider=GIW_VSLIDER(widget);
-  
-  if (vslider->mouse_policy==GIW_VSLIDER_MOUSE_DISABLED) return(FALSE);
-  
+
+  if (vslider->mouse_policy==GIW_VSLIDER_MOUSE_DISABLED) return (FALSE);
+
   // Checking if the pointer is inside the button
-  if (event->x > vslider->button_x && event->x < vslider->button_x+ vslider->button_w && event->y > 
-      vslider->button_y && event->y < vslider->button_y+vslider->button_h){
-    if (vslider->button==0){
+  if (event->x > vslider->button_x && event->x < vslider->button_x+ vslider->button_w && event->y >
+      vslider->button_y && event->y < vslider->button_y+vslider->button_h) {
+    if (vslider->button==0) {
       vslider->button=event->button;
       vslider->button_state=GTK_STATE_ACTIVE;
       vslider->button_shadow=GTK_SHADOW_IN;
     }
   }
-    
+
   gtk_widget_queue_draw(GTK_WIDGET(vslider));
-     
-  return(TRUE);
+
+  return (TRUE);
 }
 
-static gboolean 
-giw_vslider_button_release (GtkWidget        *widget,
-			    GdkEventButton   *event)
-{
+static gboolean
+giw_vslider_button_release(GtkWidget        *widget,
+                           GdkEventButton   *event) {
   GiwVSlider *vslider;
-  
-  g_return_val_if_fail (widget != NULL, FALSE);
-  g_return_val_if_fail (GIW_IS_VSLIDER (widget), FALSE);
-  g_return_val_if_fail (event != NULL, FALSE);
-    
+
+  g_return_val_if_fail(widget != NULL, FALSE);
+  g_return_val_if_fail(GIW_IS_VSLIDER(widget), FALSE);
+  g_return_val_if_fail(event != NULL, FALSE);
+
   vslider=GIW_VSLIDER(widget);
-  
-  if (vslider->mouse_policy==GIW_VSLIDER_MOUSE_DISABLED) return(FALSE);
-  
+
+  if (vslider->mouse_policy==GIW_VSLIDER_MOUSE_DISABLED) return (FALSE);
+
   // Get the position inside the vslider
   //x=event->x-vslider->x;
   //y=event->y-vslider->y;
-  
-  if (vslider->button == event->button){
+
+  if (vslider->button == event->button) {
     // If the mouse policy is to update delayed, it's time to update the value (the button was released)
     if (vslider->mouse_policy==GIW_VSLIDER_MOUSE_DELAYED)
       giw_vslider_set_value(vslider, vslider->phanton_value);
-    
+
     vslider->button=FALSE;
-    
+
     // If the mouse stills inside the button, state is prelight, else state is normal
-    if (event->x > vslider->button_x && event->x < vslider->button_x+ vslider->button_w && event->y > 
-	vslider->button_y && event->y < vslider->button_y+vslider->button_h)
+    if (event->x > vslider->button_x && event->x < vslider->button_x+ vslider->button_w && event->y >
+        vslider->button_y && event->y < vslider->button_y+vslider->button_h)
       vslider->button_state=GTK_STATE_PRELIGHT;
     else
       vslider->button_state=GTK_STATE_NORMAL;
-      
+
     vslider->button_shadow=GTK_SHADOW_OUT;  // Return to normal shadow
   }
-  
+
   gtk_widget_queue_draw(GTK_WIDGET(vslider));
-    
-  return(TRUE);
+
+  return (TRUE);
 }
 
-static gboolean 
-giw_vslider_motion_notify (GtkWidget        *widget,
-			   GdkEventMotion   *event)
-{
+static gboolean
+giw_vslider_motion_notify(GtkWidget        *widget,
+                          GdkEventMotion   *event) {
   GiwVSlider *vslider;
   gint y;
   gdouble new_value;
-  
-  g_return_val_if_fail (widget != NULL, FALSE);
-  g_return_val_if_fail (GIW_IS_VSLIDER (widget), FALSE);
-  g_return_val_if_fail (event != NULL, FALSE);
-    
+
+  g_return_val_if_fail(widget != NULL, FALSE);
+  g_return_val_if_fail(GIW_IS_VSLIDER(widget), FALSE);
+  g_return_val_if_fail(event != NULL, FALSE);
+
   vslider=GIW_VSLIDER(widget);
-  
-  if (vslider->mouse_policy==GIW_VSLIDER_MOUSE_DISABLED) return(FALSE);
-      
+
+  if (vslider->mouse_policy==GIW_VSLIDER_MOUSE_DISABLED) return (FALSE);
+
   // Get the position inside the vslider
   //x=event->x-vslider->x;
   y=event->y-vslider->y;
-  
+
   // If the mouse policy is to update automatically, change the value now if it's valid
-  if (vslider->button!=0 && vslider->mouse_policy==GIW_VSLIDER_MOUSE_AUTOMATICALLY){
+  if (vslider->button!=0 && vslider->mouse_policy==GIW_VSLIDER_MOUSE_AUTOMATICALLY) {
     new_value=lives_adjustment_get_lower(vslider->adjustment)+((gdouble)(vslider->height-y))/
-      ((gdouble)vslider->height)*(lives_adjustment_get_upper(vslider->adjustment)-lives_adjustment_get_lower(vslider->adjustment));
+              ((gdouble)vslider->height)*(lives_adjustment_get_upper(vslider->adjustment)-lives_adjustment_get_lower(vslider->adjustment));
 
     // If it's a valid value, update it!
-    if ( (new_value <= lives_adjustment_get_upper(vslider->adjustment)) && 
-         (new_value >= lives_adjustment_get_lower(vslider->adjustment)) )
+    if ((new_value <= lives_adjustment_get_upper(vslider->adjustment)) &&
+        (new_value >= lives_adjustment_get_lower(vslider->adjustment)))
       giw_vslider_set_value(vslider, new_value);
   }
-  
+
   // If the mouse policy is to update delayed, calculate the false value
-  if (vslider->button!=0 && vslider->mouse_policy==GIW_VSLIDER_MOUSE_DELAYED){
+  if (vslider->button!=0 && vslider->mouse_policy==GIW_VSLIDER_MOUSE_DELAYED) {
     new_value=lives_adjustment_get_lower(vslider->adjustment)+((gdouble)(vslider->height-y))/
-      ((gdouble)vslider->height)*(lives_adjustment_get_upper(vslider->adjustment)-lives_adjustment_get_lower(vslider->adjustment));
-  
+              ((gdouble)vslider->height)*(lives_adjustment_get_upper(vslider->adjustment)-lives_adjustment_get_lower(vslider->adjustment));
+
     // If it's a valid value, update the false value
-    if ( (new_value <= lives_adjustment_get_upper(vslider->adjustment)) && 
-         (new_value >= lives_adjustment_get_lower(vslider->adjustment)) ) {
+    if ((new_value <= lives_adjustment_get_upper(vslider->adjustment)) &&
+        (new_value >= lives_adjustment_get_lower(vslider->adjustment))) {
       vslider->phanton_value=new_value;
       vslider_calculate_phanton_button(vslider);
       gtk_widget_queue_draw(GTK_WIDGET(vslider));
     }
   }
-  
+
   // If the button is not pressed and the pointer is inside the button, set prelight, if the pointer is out  of the button, set normal
-  if (vslider->button==0){
-    if (event->x > vslider->button_x && event->x < vslider->button_x+ vslider->button_w && event->y > 
-	vslider->button_y && event->y < vslider->button_y+vslider->button_h)
+  if (vslider->button==0) {
+    if (event->x > vslider->button_x && event->x < vslider->button_x+ vslider->button_w && event->y >
+        vslider->button_y && event->y < vslider->button_y+vslider->button_h)
       vslider->button_state=GTK_STATE_PRELIGHT;
     else
       vslider->button_state=GTK_STATE_NORMAL;
   }
-  
+
   gtk_widget_queue_draw(GTK_WIDGET(vslider));
-    
-  return(TRUE);
+
+  return (TRUE);
 }
 
 static void
-giw_vslider_style_set (GtkWidget *widget,
-			GtkStyle *previous_style)
-{
+giw_vslider_style_set(GtkWidget *widget,
+                      GtkStyle *previous_style) {
   GiwVSlider *vslider;
-  
-  g_return_if_fail (widget != NULL);
-  g_return_if_fail (GIW_IS_VSLIDER (widget));
-  
-  vslider = GIW_VSLIDER (widget);
-  
+
+  g_return_if_fail(widget != NULL);
+  g_return_if_fail(GIW_IS_VSLIDER(widget));
+
+  vslider = GIW_VSLIDER(widget);
+
   // The only thing to fo is recalculate the layout's sizes
   vslider_calculate_legends_sizes(vslider);
 }
 
 #if GTK_CHECK_VERSION(3,0,0)
 static void
-giw_vslider_style_updated (GtkWidget *widget)
-{
+giw_vslider_style_updated(GtkWidget *widget) {
 
 }
 
 #endif
 
 void
-giw_vslider_set_value (GiwVSlider *vslider,
-			gdouble value)
-{
-  g_return_if_fail (vslider != NULL); 
-  g_return_if_fail (GIW_IS_VSLIDER (vslider));
-  
-  if (gtk_adjustment_get_value(vslider->adjustment)!=value){
+giw_vslider_set_value(GiwVSlider *vslider,
+                      gdouble value) {
+  g_return_if_fail(vslider != NULL);
+  g_return_if_fail(GIW_IS_VSLIDER(vslider));
+
+  if (gtk_adjustment_get_value(vslider->adjustment)!=value) {
     gtk_adjustment_set_value(vslider->adjustment,value);
-    
+
     gtk_adjustment_value_changed(vslider->adjustment);
   }
 }
 
 gdouble
-giw_vslider_get_value (GiwVSlider *vslider)
-{
-   g_return_val_if_fail (vslider != NULL, 0.0); 
-   g_return_val_if_fail (GIW_IS_VSLIDER (vslider), 0.0);
-   g_return_val_if_fail (vslider->adjustment != NULL, 0.0);
- 
-   return (gtk_adjustment_get_value(vslider->adjustment));
+giw_vslider_get_value(GiwVSlider *vslider) {
+  g_return_val_if_fail(vslider != NULL, 0.0);
+  g_return_val_if_fail(GIW_IS_VSLIDER(vslider), 0.0);
+  g_return_val_if_fail(vslider->adjustment != NULL, 0.0);
+
+  return (gtk_adjustment_get_value(vslider->adjustment));
 }
 
-GtkAdjustment*
-giw_vslider_get_adjustment (GiwVSlider *vslider)
-{
-  g_return_val_if_fail (vslider != NULL, NULL);
-  g_return_val_if_fail (GIW_IS_VSLIDER (vslider), NULL);
+GtkAdjustment *
+giw_vslider_get_adjustment(GiwVSlider *vslider) {
+  g_return_val_if_fail(vslider != NULL, NULL);
+  g_return_val_if_fail(GIW_IS_VSLIDER(vslider), NULL);
 
-  return(vslider->adjustment);
+  return (vslider->adjustment);
 }
 
 void
-giw_vslider_set_adjustment (GiwVSlider *vslider,
-			 GtkAdjustment *adjustment)
-{
-  g_return_if_fail (vslider != NULL);
-  g_return_if_fail (GIW_IS_VSLIDER (vslider));
-  g_return_if_fail (adjustment != NULL);
+giw_vslider_set_adjustment(GiwVSlider *vslider,
+                           GtkAdjustment *adjustment) {
+  g_return_if_fail(vslider != NULL);
+  g_return_if_fail(GIW_IS_VSLIDER(vslider));
+  g_return_if_fail(adjustment != NULL);
 
   // Freeing the last one
-  if (vslider->adjustment){
+  if (vslider->adjustment) {
 #if GTK_CHECK_VERSION(3,0,0)
     g_signal_handler_disconnect((gpointer)(vslider->adjustment),vslider->chsig);
     g_signal_handler_disconnect((gpointer)(vslider->adjustment),vslider->vchsig);
 #else
-    gtk_signal_disconnect_by_data (LIVES_GUI_OBJECT (vslider->adjustment), (gpointer) vslider);
+    gtk_signal_disconnect_by_data(LIVES_GUI_OBJECT(vslider->adjustment), (gpointer) vslider);
 #endif
-    g_object_unref (G_OBJECT (vslider->adjustment));
+    g_object_unref(G_OBJECT(vslider->adjustment));
     vslider->adjustment=NULL;
   }
-   
+
   vslider->adjustment = adjustment;
-  g_object_ref (LIVES_GUI_OBJECT (vslider->adjustment));
-  
-  vslider->chsig = g_signal_connect (LIVES_GUI_OBJECT (adjustment), "changed",
-				     (GCallback) giw_vslider_adjustment_changed,
-				     (gpointer) vslider);
-  vslider->vchsig = g_signal_connect (LIVES_GUI_OBJECT (adjustment), "value_changed",
-				      (GCallback) giw_vslider_adjustment_value_changed,
-				      (gpointer) vslider);
+  g_object_ref(LIVES_GUI_OBJECT(vslider->adjustment));
+
+  vslider->chsig = g_signal_connect(LIVES_GUI_OBJECT(adjustment), "changed",
+                                    (GCallback) giw_vslider_adjustment_changed,
+                                    (gpointer) vslider);
+  vslider->vchsig = g_signal_connect(LIVES_GUI_OBJECT(adjustment), "value_changed",
+                                     (GCallback) giw_vslider_adjustment_value_changed,
+                                     (gpointer) vslider);
 
   gtk_adjustment_value_changed(vslider->adjustment);
-    
+
   gtk_adjustment_changed(vslider->adjustment);
 }
 
-void 
-giw_vslider_set_legends_digits (GiwVSlider *vslider,
-			gint digits)
-{
-  g_return_if_fail (vslider != NULL);  
-  g_return_if_fail (GIW_IS_VSLIDER (vslider));
+void
+giw_vslider_set_legends_digits(GiwVSlider *vslider,
+                               gint digits) {
+  g_return_if_fail(vslider != NULL);
+  g_return_if_fail(GIW_IS_VSLIDER(vslider));
 
-  if (vslider->legend_digits!=digits){
+  if (vslider->legend_digits!=digits) {
     vslider_free_legends(vslider);
 
     vslider->legend_digits=digits;
     vslider_build_legends(vslider);
     vslider_calculate_sizes(vslider);
-    
+
     gtk_widget_queue_draw(GTK_WIDGET(vslider));
   }
 }
 
 void
-giw_vslider_set_mouse_policy (GiwVSlider *vslider,
-			GiwVSliderMousePolicy policy)
-{
-  g_return_if_fail (vslider != NULL);
-  g_return_if_fail (GIW_IS_VSLIDER (vslider));
+giw_vslider_set_mouse_policy(GiwVSlider *vslider,
+                             GiwVSliderMousePolicy policy) {
+  g_return_if_fail(vslider != NULL);
+  g_return_if_fail(GIW_IS_VSLIDER(vslider));
 
   vslider->mouse_policy=policy;
 }
 
 void
-giw_vslider_set_major_ticks_number (GiwVSlider *vslider,
-					 gint number)
-{
-  g_return_if_fail (vslider != NULL);
-  g_return_if_fail (GIW_IS_VSLIDER (vslider));
+giw_vslider_set_major_ticks_number(GiwVSlider *vslider,
+                                   gint number) {
+  g_return_if_fail(vslider != NULL);
+  g_return_if_fail(GIW_IS_VSLIDER(vslider));
 
-  if (number!=vslider->major_ticks){
+  if (number!=vslider->major_ticks) {
     // Freeing the old legends, because they will be changed
     vslider_free_legends(vslider);
-  
+
     vslider->major_ticks=number;
-  
+
     // Now, there are diferent legends, so, we have to create them
     vslider_build_legends(vslider);
-    
+
     vslider_calculate_sizes(vslider);
     gtk_widget_queue_draw(GTK_WIDGET(vslider));
   }
 }
 
 void
-giw_vslider_set_minor_ticks_number (GiwVSlider *vslider,
-					gint number)
-{
-  g_return_if_fail (vslider != NULL);
-  g_return_if_fail (GIW_IS_VSLIDER (vslider));
+giw_vslider_set_minor_ticks_number(GiwVSlider *vslider,
+                                   gint number) {
+  g_return_if_fail(vslider != NULL);
+  g_return_if_fail(GIW_IS_VSLIDER(vslider));
 
   vslider->minor_ticks=number;
-  
+
   vslider_calculate_sizes(vslider);
   gtk_widget_queue_draw(GTK_WIDGET(vslider));
 }
 
 static void
-giw_vslider_adjustment_changed (GtkAdjustment *adjustment,
-			      gpointer       data)
-{
+giw_vslider_adjustment_changed(GtkAdjustment *adjustment,
+                               gpointer       data) {
   GiwVSlider *vslider;
 
-  g_return_if_fail (adjustment != NULL);
-  g_return_if_fail (data != NULL);
+  g_return_if_fail(adjustment != NULL);
+  g_return_if_fail(data != NULL);
+
+  vslider = GIW_VSLIDER(data);
 
-  vslider = GIW_VSLIDER (data);
-  
   // The range  has changed, so the legends changed too
   vslider_free_legends(vslider);
   vslider_build_legends(vslider);
-        
+
   // Recalculating everything
   vslider_calculate_sizes(vslider);
   gtk_widget_queue_draw(GTK_WIDGET(vslider));
 }
 
 static void
-giw_vslider_adjustment_value_changed (GtkAdjustment *adjustment,
-				    gpointer       data)
-{
+giw_vslider_adjustment_value_changed(GtkAdjustment *adjustment,
+                                     gpointer       data) {
   GiwVSlider *vslider;
 
-  g_return_if_fail (adjustment != NULL);
-  g_return_if_fail (data != NULL);
-  g_return_if_fail (GIW_IS_VSLIDER(data));
+  g_return_if_fail(adjustment != NULL);
+  g_return_if_fail(data != NULL);
+  g_return_if_fail(GIW_IS_VSLIDER(data));
+
+  vslider = GIW_VSLIDER(data);
 
-  vslider = GIW_VSLIDER (data);
-  
   // Recalculating the button position
   vslider_calculate_button(vslider);
   gtk_widget_queue_draw(GTK_WIDGET(vslider));
 }
 
-void 
-vslider_calculate_sizes(GiwVSlider *vslider)
-{
+void
+vslider_calculate_sizes(GiwVSlider *vslider) {
   GtkWidget *widget;
-  
-  g_return_if_fail (vslider != NULL);
-  
+
+  g_return_if_fail(vslider != NULL);
+
   widget=GTK_WIDGET(vslider);
-          
+
   // Calculating the sizes and distances...
   vslider->width=lives_widget_get_allocation_width(widget)-vslider->legend_width;
   vslider->height=lives_widget_get_allocation_height(widget)-vslider->legend_height;
@@ -956,14 +927,14 @@
   vslider->y=vslider->legend_height/2;
 
   // If the legends are too small, or inexistant, it has to be some space left fot the button (when it's on he edge)
-  if (vslider->y < vslider->button_h/2){
+  if (vslider->y < vslider->button_h/2) {
     vslider->height = lives_widget_get_allocation_height(widget)-vslider->button_h;
     vslider->y = vslider->button_h/2;
   }
 
   /* The height of the vslider is the widget's height less a half of legend height (beacause a half of the legends are drawn outside the vslider's area .
      If there are no legends the temometer width is the widget's width, is there are legends, the width of the vslider is the space left by the legends.*/
-    
+
   vslider->major_dy=(gdouble)vslider->height/(gdouble)(vslider->major_ticks-1);
   vslider->minor_dy=vslider->major_dy/(vslider->minor_ticks+1);
 
@@ -972,36 +943,33 @@
 }
 
 void
-vslider_calculate_button (GiwVSlider *vslider)
-{
-  g_return_if_fail (vslider != NULL);
+vslider_calculate_button(GiwVSlider *vslider) {
+  g_return_if_fail(vslider != NULL);
 
   // Getting button's positon and dimensions
   vslider->button_x=vslider->x+5;
   vslider->button_y=vslider->y+vslider->height-vslider->height*
-    ((gtk_adjustment_get_value(vslider->adjustment)-lives_adjustment_get_lower(vslider->adjustment))/
-     (lives_adjustment_get_upper(vslider->adjustment)-lives_adjustment_get_lower(vslider->adjustment)))-5;
+                    ((gtk_adjustment_get_value(vslider->adjustment)-lives_adjustment_get_lower(vslider->adjustment))/
+                     (lives_adjustment_get_upper(vslider->adjustment)-lives_adjustment_get_lower(vslider->adjustment)))-5;
   vslider->button_w=vslider->width-10;
   vslider->button_h=10;
-} 
+}
 
 void
-vslider_calculate_phanton_button(GiwVSlider *vslider)
-{
-  g_return_if_fail (vslider != NULL);
+vslider_calculate_phanton_button(GiwVSlider *vslider) {
+  g_return_if_fail(vslider != NULL);
 
   // Getting phanton button's positon and dimensions
   vslider->pbutton_x=vslider->x+5;
   vslider->pbutton_y=vslider->y+vslider->height-vslider->height*
-    ((vslider->phanton_value-lives_adjustment_get_lower(vslider->adjustment))/
-     (lives_adjustment_get_upper(vslider->adjustment)-lives_adjustment_get_lower(vslider->adjustment)))-5;
+                     ((vslider->phanton_value-lives_adjustment_get_lower(vslider->adjustment))/
+                      (lives_adjustment_get_upper(vslider->adjustment)-lives_adjustment_get_lower(vslider->adjustment)))-5;
   vslider->pbutton_w=vslider->width-10;
   vslider->pbutton_h=10;
 }
 
-void 
-vslider_build_legends(GiwVSlider *vslider)
-{
+void
+vslider_build_legends(GiwVSlider *vslider) {
   GtkWidget *widget;
   gint loop;
   gchar *str;
@@ -1010,62 +978,61 @@
   PangoFontDescription *fontdesc;
 #endif
 
-  g_return_if_fail (vslider != NULL);
-  
+  g_return_if_fail(vslider != NULL);
+
   widget=GTK_WIDGET(vslider);
-  
+
   if (vslider->major_ticks==0)  // Preventing from bugs
     return;
-    
+
   // Creating the legend's layouts
-  if (vslider->legend_digits!=0){
-    vslider->legends=g_new(PangoLayout*, vslider->major_ticks);
+  if (vslider->legend_digits!=0) {
+    vslider->legends=g_new(PangoLayout *, vslider->major_ticks);
     str=g_new(gchar, vslider->legend_digits+1); // +1 for the '/0'
-    for (loop=0; loop<vslider->major_ticks; loop++){
+    for (loop=0; loop<vslider->major_ticks; loop++) {
       snprintf(str,vslider->legend_digits+1,"%f",lives_adjustment_get_lower(vslider->adjustment)+
-	       (vslider->major_ticks-1-loop)*
-	       (lives_adjustment_get_upper(vslider->adjustment)-lives_adjustment_get_lower(vslider->adjustment))/
-	       (vslider->major_ticks-1)); // Creating the legends string
-      vslider->legends[loop]=gtk_widget_create_pango_layout (widget, str); 
+               (vslider->major_ticks-1-loop)*
+               (lives_adjustment_get_upper(vslider->adjustment)-lives_adjustment_get_lower(vslider->adjustment))/
+               (vslider->major_ticks-1)); // Creating the legends string
+      vslider->legends[loop]=gtk_widget_create_pango_layout(widget, str);
 
 #if GTK_CHECK_VERSION(3,0,0)
 #if GTK_CHECK_VERSION(3,8,0)
       fontdesc=pango_font_description_new();
       gtk_style_context_get(gtk_widget_get_style_context(widget),
-			    gtk_widget_get_state_flags(widget),
-			    GTK_STYLE_PROPERTY_FONT,
-			    &fontdesc,
-			    NULL
-			    );
-      pango_layout_set_font_description (vslider->legends[loop],fontdesc);
+                            gtk_widget_get_state_flags(widget),
+                            GTK_STYLE_PROPERTY_FONT,
+                            &fontdesc,
+                            NULL
+                           );
+      pango_layout_set_font_description(vslider->legends[loop],fontdesc);
       pango_font_description_free(fontdesc);
 #else
-    pango_layout_set_font_description (vslider->legends[loop], 
-				       gtk_style_context_get_font(gtk_widget_get_style_context(widget),
-								  gtk_widget_get_state_flags(widget)));
+      pango_layout_set_font_description(vslider->legends[loop],
+                                        gtk_style_context_get_font(gtk_widget_get_style_context(widget),
+                                            gtk_widget_get_state_flags(widget)));
 #endif
 #else
-      pango_layout_set_font_description(vslider->legends[loop], widget->style->font_desc); // Setting te correct font  
+      pango_layout_set_font_description(vslider->legends[loop], widget->style->font_desc); // Setting te correct font
 #endif
     }
     g_free(str);
-  
+
     // Calculating sizes
     vslider_calculate_legends_sizes(vslider);
-  }else{ // If there are no legends (0 digits), the size is the major ticks size (5)
-      vslider->legend_width=5;
-      vslider->legend_height=0;
+  } else { // If there are no legends (0 digits), the size is the major ticks size (5)
+    vslider->legend_width=5;
+    vslider->legend_height=0;
   }
 }
 
-void 
-vslider_free_legends(GiwVSlider *vslider)
-{
+void
+vslider_free_legends(GiwVSlider *vslider) {
   gint loop;
 
-  g_return_if_fail (vslider != NULL);
-  
-  if (vslider->legends!=NULL){
+  g_return_if_fail(vslider != NULL);
+
+  if (vslider->legends!=NULL) {
     for (loop=0; loop<vslider->major_ticks; loop++) {
       if (vslider->legends[loop]!=NULL) {
         g_object_unref(G_OBJECT(vslider->legends[loop]));
@@ -1077,44 +1044,43 @@
 }
 
 void
-vslider_calculate_legends_sizes(GiwVSlider *vslider)
-{
+vslider_calculate_legends_sizes(GiwVSlider *vslider) {
   GtkWidget *widget;
-    
+
 #if GTK_CHECK_VERSION(3,8,0)
   PangoFontDescription *fontdesc;
 #endif
 
-  g_return_if_fail (vslider != NULL);
+  g_return_if_fail(vslider != NULL);
 
   widget=GTK_WIDGET(vslider);
 
-  if (vslider->legends!=NULL){
+  if (vslider->legends!=NULL) {
 #if GTK_CHECK_VERSION(3,0,0)
 #if GTK_CHECK_VERSION(3,8,0)
     fontdesc=pango_font_description_new();
     gtk_style_context_get(gtk_widget_get_style_context(widget),
-			  gtk_widget_get_state_flags(widget),
-			  GTK_STYLE_PROPERTY_FONT,
-			  &fontdesc,
-			  NULL
-			  );
-    pango_layout_set_font_description (vslider->legends[0],fontdesc);
+                          gtk_widget_get_state_flags(widget),
+                          GTK_STYLE_PROPERTY_FONT,
+                          &fontdesc,
+                          NULL
+                         );
+    pango_layout_set_font_description(vslider->legends[0],fontdesc);
     pango_font_description_free(fontdesc);
 #else
-    pango_layout_set_font_description (vslider->legends[0], 
-				       gtk_style_context_get_font(gtk_widget_get_style_context(widget),
-								  gtk_widget_get_state_flags(widget)));
+    pango_layout_set_font_description(vslider->legends[0],
+                                      gtk_style_context_get_font(gtk_widget_get_style_context(widget),
+                                          gtk_widget_get_state_flags(widget)));
 #endif
 #else
-    pango_layout_set_font_description (vslider->legends[0], widget->style->font_desc);  
+    pango_layout_set_font_description(vslider->legends[0], widget->style->font_desc);
 #endif
     pango_layout_get_size(vslider->legends[0], &(vslider->legend_width), &(vslider->legend_height));
     vslider->legend_width/=PANGO_SCALE;
     vslider->legend_height/=PANGO_SCALE;
     vslider->legend_width+=5;  // Five pixels for the ticks
-  
+
 
     vslider_calculate_sizes(vslider);
   }
-} 
+}

LiVES-2.2.8.tar.bz2/src/giw/giwvslider.h -> LiVES-2.4.1.tar.bz2/src/giw/giwvslider.h Changed

LiVES-2.2.8.tar.bz2/src/gui.c -> LiVES-2.4.1.tar.bz2/src/gui.c Changed

@@ -37,40 +37,39 @@
 
 
 // closures for keys for fade/unfade background
-static GClosure *stop_closure;
-static GClosure *fullscreen_closure;
-static GClosure *dblsize_closure;
-static GClosure *sepwin_closure;
-static GClosure *loop_closure;
-static GClosure *loop_cont_closure;
-static GClosure *fade_closure;
-static GClosure *showfct_closure;
-static GClosure *showsubs_closure;
-static GClosure *rec_closure;
-static GClosure *mute_audio_closure;
-static GClosure *ping_pong_closure;
+static LiVESWidgetClosure *stop_closure;
+static LiVESWidgetClosure *fullscreen_closure;
+static LiVESWidgetClosure *dblsize_closure;
+static LiVESWidgetClosure *sepwin_closure;
+static LiVESWidgetClosure *loop_closure;
+static LiVESWidgetClosure *loop_cont_closure;
+static LiVESWidgetClosure *fade_closure;
+static LiVESWidgetClosure *showfct_closure;
+static LiVESWidgetClosure *showsubs_closure;
+static LiVESWidgetClosure *rec_closure;
+static LiVESWidgetClosure *mute_audio_closure;
+static LiVESWidgetClosure *ping_pong_closure;
 
 
-void load_theme (void) {
+void load_theme(void) {
   // load the theme images
   // TODO - set palette in here ?
-  GError *error=NULL;
-  gchar *tmp=g_build_filename(prefs->prefix_dir,THEME_DIR,prefs->theme,"main.jpg",NULL);
+  LiVESError *error=NULL;
+  char *tmp=lives_build_filename(prefs->prefix_dir,THEME_DIR,prefs->theme,"main.jpg",NULL);
   mainw->imsep=lives_pixbuf_new_from_file(tmp,&error);
-  g_free(tmp);
-  
+  lives_free(tmp);
+
   if (!(error==NULL)) {
     palette->style=STYLE_PLAIN;
-    g_snprintf(prefs->theme,64,"%%ERROR%%");
-    g_error_free(error);
-  }
-  else {
-    mainw->sep_image = lives_image_new_from_pixbuf (mainw->imsep);
-    tmp=g_build_filename(prefs->prefix_dir,THEME_DIR,prefs->theme,"frame.jpg",NULL);
+    lives_snprintf(prefs->theme,64,"%%ERROR%%");
+    lives_error_free(error);
+  } else {
+    mainw->sep_image = lives_image_new_from_pixbuf(mainw->imsep);
+    tmp=lives_build_filename(prefs->prefix_dir,THEME_DIR,prefs->theme,"frame.jpg",NULL);
     mainw->imframe=lives_pixbuf_new_from_file(tmp,&error);
-    g_free(tmp);
+    lives_free(tmp);
     if (!(error==NULL)) {
-      g_error_free(error);
+      lives_error_free(error);
     }
   }
 }
@@ -78,7 +77,7 @@
 
 void add_message_scroller(LiVESWidget *conter) {
   LiVESTextBuffer *tbuff=NULL;
-  gchar *all_text=NULL;
+  char *all_text=NULL;
 
   if (mainw->textview1!=NULL) {
     all_text=lives_text_view_get_text(LIVES_TEXT_VIEW(mainw->textview1));
@@ -89,28 +88,28 @@
     lives_widget_destroy(mainw->scrolledwindow);
   }
 
-  mainw->scrolledwindow = lives_scrolled_window_new (NULL, NULL);
+  mainw->scrolledwindow = lives_scrolled_window_new(NULL, NULL);
   lives_scrolled_window_set_policy(LIVES_SCROLLED_WINDOW(mainw->scrolledwindow),LIVES_POLICY_AUTOMATIC,LIVES_POLICY_ALWAYS);
-  lives_widget_show (mainw->scrolledwindow);
+  lives_widget_show(mainw->scrolledwindow);
   lives_widget_set_vexpand(mainw->scrolledwindow,TRUE);
 
-  lives_container_add (LIVES_CONTAINER(conter), mainw->scrolledwindow);
+  lives_container_add(LIVES_CONTAINER(conter), mainw->scrolledwindow);
 
-  mainw->textview1 = lives_text_view_new ();
-  lives_widget_show (mainw->textview1);
-  lives_container_add (LIVES_CONTAINER (mainw->scrolledwindow), mainw->textview1);
+  mainw->textview1 = lives_text_view_new();
+  lives_widget_show(mainw->textview1);
+  lives_container_add(LIVES_CONTAINER(mainw->scrolledwindow), mainw->textview1);
 
   tbuff=lives_text_view_get_buffer(LIVES_TEXT_VIEW(mainw->textview1));
   if (tbuff!=NULL && all_text!=NULL) {
     lives_text_buffer_set_text(tbuff,all_text,-1);
-    g_free(all_text);
-    lives_text_view_scroll_onscreen(LIVES_TEXT_VIEW (mainw->textview1));
+    lives_free(all_text);
+    lives_text_view_scroll_onscreen(LIVES_TEXT_VIEW(mainw->textview1));
   }
 
-  lives_widget_set_size_request (mainw->textview1, -1, MSG_AREA_HEIGHT);
-  lives_text_view_set_editable (LIVES_TEXT_VIEW (mainw->textview1), FALSE);
-  lives_text_view_set_wrap_mode (LIVES_TEXT_VIEW (mainw->textview1), LIVES_WRAP_WORD);
-  lives_text_view_set_cursor_visible (LIVES_TEXT_VIEW (mainw->textview1), FALSE);
+  lives_widget_set_size_request(mainw->textview1, -1, MSG_AREA_HEIGHT);
+  lives_text_view_set_editable(LIVES_TEXT_VIEW(mainw->textview1), FALSE);
+  lives_text_view_set_wrap_mode(LIVES_TEXT_VIEW(mainw->textview1), LIVES_WRAP_WORD);
+  lives_text_view_set_cursor_visible(LIVES_TEXT_VIEW(mainw->textview1), FALSE);
 
   if (palette->style&STYLE_1) {
     lives_widget_set_base_color(mainw->textview1, LIVES_WIDGET_STATE_NORMAL, &palette->info_base);
@@ -120,36 +119,34 @@
 
 
 void make_custom_submenus(void) {
-  mainw->custom_gens_submenu = lives_menu_item_new_with_mnemonic (_ ("_Custom Generators"));
-  mainw->custom_effects_submenu = lives_menu_item_new_with_mnemonic (_ ("_Custom Effects"));
-  mainw->custom_utilities_submenu = lives_menu_item_new_with_mnemonic (_("Custom _Utilities"));
+  mainw->custom_gens_submenu = lives_menu_item_new_with_mnemonic(_("_Custom Generators"));
+  mainw->custom_effects_submenu = lives_menu_item_new_with_mnemonic(_("_Custom Effects"));
+  mainw->custom_utilities_submenu = lives_menu_item_new_with_mnemonic(_("Custom _Utilities"));
 
 }
 
 #if GTK_CHECK_VERSION(3,0,0)
-boolean expose_sim (LiVESWidget *widget, lives_painter_t *cr, gpointer user_data) {
+boolean expose_sim(LiVESWidget *widget, lives_painter_t *cr, livespointer user_data) {
   int current_file=mainw->current_file;
   if (current_file>-1&&cfile!=NULL&&cfile->cb_src!=-1) mainw->current_file=cfile->cb_src;
   if (mainw->current_file>0&&cfile!=NULL) {
     load_start_image(cfile->start);
-  }
-  else load_start_image(0);
+  } else load_start_image(0);
   mainw->current_file=current_file;
   return TRUE;
 }
 
-boolean expose_eim (LiVESWidget *widget, lives_painter_t *cr, gpointer user_data) {
+boolean expose_eim(LiVESWidget *widget, lives_painter_t *cr, livespointer user_data) {
   int current_file=mainw->current_file;
   if (current_file>-1&&cfile!=NULL&&cfile->cb_src!=-1) mainw->current_file=cfile->cb_src;
   if (mainw->current_file>0&&cfile!=NULL) {
     load_end_image(cfile->end);
-  }
-  else load_end_image(0);
+  } else load_end_image(0);
   mainw->current_file=current_file;
   return TRUE;
 }
 
-boolean expose_pim (LiVESWidget *widget, lives_painter_t *cr, gpointer user_data) {
+boolean expose_pim(LiVESWidget *widget, lives_painter_t *cr, livespointer user_data) {
   int current_file=mainw->current_file;
   if (current_file>-1&&cfile!=NULL&&cfile->cb_src!=-1) mainw->current_file=cfile->cb_src;
   if (!mainw->draw_blocked) {
@@ -160,7 +157,7 @@
 }
 #endif
 
-void create_LiVES (void) {
+void create_LiVES(void) {
   LiVESWidget *hbox1;
   LiVESWidget *vbox2;
   LiVESWidget *menuitem;
@@ -209,7 +206,7 @@
 
 #if defined (HAVE_YUV4MPEG) || defined (HAVE_UNICAP)
   LiVESWidget *submenu;
-#endif 
+#endif
 
   LiVESWidget *new_test_rfx;
   LiVESWidget *copy_rfx;
@@ -225,10 +222,10 @@
 
   LiVESPixbuf *pixbuf;
 
-  gchar buff[32768];
+  char buff[32768];
 
-  gchar *tmp;
-  gchar *fnamex;
+  char *tmp;
+  char *fnamex;
 
   int dpw;
   boolean woat;
@@ -255,9 +252,9 @@
 
   mainw->preview_image=NULL;
 
-  mainw->sep_image = lives_image_new_from_pixbuf (NULL);
-  mainw->start_image = lives_image_new_from_pixbuf (NULL);
-  mainw->end_image = lives_image_new_from_pixbuf (NULL);
+  mainw->sep_image = lives_image_new_from_pixbuf(NULL);
+  mainw->start_image = lives_image_new_from_pixbuf(NULL);
+  mainw->end_image = lives_image_new_from_pixbuf(NULL);
   mainw->imframe=mainw->imsep=NULL;
 
   lives_widget_show(mainw->start_image);
@@ -269,13 +266,13 @@
 
 
 #if GTK_CHECK_VERSION(3,0,0)
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->start_image), LIVES_WIDGET_EXPOSE_EVENT,
-		    LIVES_GUI_CALLBACK (expose_sim),
-		    NULL);
-
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->end_image), LIVES_WIDGET_EXPOSE_EVENT,
-		    LIVES_GUI_CALLBACK (expose_eim),
-		    NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->start_image), LIVES_WIDGET_EXPOSE_EVENT,
+                       LIVES_GUI_CALLBACK(expose_sim),
+                       NULL);
+
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->end_image), LIVES_WIDGET_EXPOSE_EVENT,
+                       LIVES_GUI_CALLBACK(expose_eim),
+                       NULL);
 #else
 
   if (mainw->imframe!=NULL) {
@@ -285,27 +282,29 @@
 
 #endif
 
-  mainw->accel_group = LIVES_ACCEL_GROUP(lives_accel_group_new ());
+  mainw->accel_group = LIVES_ACCEL_GROUP(lives_accel_group_new());
 
   mainw->layout_textbuffer=lives_text_buffer_new();
   lives_object_ref(mainw->layout_textbuffer);
   mainw->affected_layouts_map=NULL;
 
-  mainw->LiVES = lives_window_new (LIVES_WINDOW_TOPLEVEL);
+  mainw->LiVES = lives_window_new(LIVES_WINDOW_TOPLEVEL);
   lives_window_set_hide_titlebar_when_maximized(LIVES_WINDOW(mainw->LiVES),FALSE);
 
 
-  if (prefs->present) 
+  if (prefs->present)
     lives_window_present(LIVES_WINDOW(mainw->LiVES));
 
+#ifdef GUI_GTK
   // TODO - can we use just DEFAULT_DROP ?
   gtk_drag_dest_set(mainw->LiVES,GTK_DEST_DEFAULT_ALL,mainw->target_table,2,
-		    (GdkDragAction)(GDK_ACTION_COPY|GDK_ACTION_MOVE|GDK_ACTION_LINK));
+                    (GdkDragAction)(GDK_ACTION_COPY|GDK_ACTION_MOVE|GDK_ACTION_LINK));
 
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->LiVES), "drag-data-received",
-		    LIVES_GUI_CALLBACK (drag_from_outside),
-		    NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->LiVES), LIVES_WIDGET_DRAG_DATA_RECEIVED_SIGNAL,
+                       LIVES_GUI_CALLBACK(drag_from_outside),
+                       NULL);
 
+#endif
 
   if (capable->smog_version_correct) lives_window_set_decorated(LIVES_WINDOW(mainw->LiVES),prefs->open_decorated);
 
@@ -329,34 +328,34 @@
     lives_widget_set_bg_color(mainw->LiVES, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
     lives_widget_set_fg_color(mainw->LiVES, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
   }
- 
-  lives_window_set_title (LIVES_WINDOW (mainw->LiVES), "LiVES");
 
-  mainw->vbox1 = lives_vbox_new (FALSE, 0);
-  lives_container_add (LIVES_CONTAINER (mainw->LiVES), mainw->vbox1);
-  lives_widget_show (mainw->vbox1);
-
-  mainw->menu_hbox = lives_hbox_new (FALSE, 0);
-  lives_widget_show (mainw->menu_hbox);
-  lives_box_pack_start (LIVES_BOX (mainw->vbox1), mainw->menu_hbox, FALSE, FALSE, 0);
-
-  mainw->menubar = lives_menu_bar_new ();
-  lives_widget_show (mainw->menubar);
-  lives_box_pack_start (LIVES_BOX (mainw->menu_hbox), mainw->menubar, FALSE, FALSE, 0);
+  lives_window_set_title(LIVES_WINDOW(mainw->LiVES), "LiVES");
+
+  mainw->vbox1 = lives_vbox_new(FALSE, 0);
+  lives_container_add(LIVES_CONTAINER(mainw->LiVES), mainw->vbox1);
+  lives_widget_show(mainw->vbox1);
+
+  mainw->menu_hbox = lives_hbox_new(FALSE, 0);
+  lives_widget_show(mainw->menu_hbox);
+  lives_box_pack_start(LIVES_BOX(mainw->vbox1), mainw->menu_hbox, FALSE, FALSE, 0);
+
+  mainw->menubar = lives_menu_bar_new();
+  lives_widget_show(mainw->menubar);
+  lives_box_pack_start(LIVES_BOX(mainw->menu_hbox), mainw->menubar, FALSE, FALSE, 0);
 
   if (palette->style&STYLE_1) {
     lives_widget_set_bg_color(mainw->menubar, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
     lives_widget_set_fg_color(mainw->menubar, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars_fore);
   }
 
-  menuitem = lives_menu_item_new_with_mnemonic (_("_File"));
-  lives_widget_show (menuitem);
-  lives_container_add (LIVES_CONTAINER (mainw->menubar), menuitem);
+  menuitem = lives_menu_item_new_with_mnemonic(_("_File"));
+  lives_widget_show(menuitem);
+  lives_container_add(LIVES_CONTAINER(mainw->menubar), menuitem);
 
-  menuitem_menu = lives_menu_new ();
+  menuitem_menu = lives_menu_new();
   lives_menu_set_accel_group(LIVES_MENU(menuitem_menu),mainw->accel_group);
 
-  lives_menu_item_set_submenu (LIVES_MENU_ITEM (menuitem), menuitem_menu);
+  lives_menu_item_set_submenu(LIVES_MENU_ITEM(menuitem), menuitem_menu);
 
   if (palette->style&STYLE_1) {
     lives_widget_set_bg_color(menuitem_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
@@ -364,141 +363,141 @@
     lives_widget_set_bg_color(menuitem_menu, LIVES_WIDGET_STATE_INSENSITIVE, &palette->menu_and_bars);
   }
 
-  mainw->open = lives_menu_item_new_with_mnemonic (_("_Open File/Directory"));
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mainw->open);
-  lives_widget_add_accelerator (mainw->open, LIVES_WIDGET_ACTIVATE_EVENT, mainw->accel_group,
-                              LIVES_KEY_o, LIVES_CONTROL_MASK,
-                              LIVES_ACCEL_VISIBLE);
+  mainw->open = lives_menu_item_new_with_mnemonic(_("_Open File/Directory"));
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mainw->open);
+  lives_widget_add_accelerator(mainw->open, LIVES_WIDGET_ACTIVATE_SIGNAL, mainw->accel_group,
+                               LIVES_KEY_o, LIVES_CONTROL_MASK,
+                               LIVES_ACCEL_VISIBLE);
 
-  mainw->open_sel = lives_menu_item_new_with_mnemonic (_("O_pen Part of File..."));
+  mainw->open_sel = lives_menu_item_new_with_mnemonic(_("O_pen Part of File..."));
 
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mainw->open_sel);
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mainw->open_sel);
 
 
 
-  mainw->open_loc = lives_menu_item_new_with_mnemonic (_("Open _Location/Stream..."));
+  mainw->open_loc = lives_menu_item_new_with_mnemonic(_("Open _Location/Stream..."));
 
 #ifdef HAVE_WEBM
 
-  mainw->open_loc_menu = lives_menu_item_new_with_mnemonic (_("Open _Location/Stream..."));
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mainw->open_loc_menu);
+  mainw->open_loc_menu = lives_menu_item_new_with_mnemonic(_("Open _Location/Stream..."));
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mainw->open_loc_menu);
 
   mainw->open_loc_submenu=lives_menu_new();
-  lives_menu_item_set_submenu (LIVES_MENU_ITEM (mainw->open_loc_menu), mainw->open_loc_submenu);
+  lives_menu_item_set_submenu(LIVES_MENU_ITEM(mainw->open_loc_menu), mainw->open_loc_submenu);
   if (palette->style&STYLE_1) {
     lives_widget_set_bg_color(mainw->open_loc_submenu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
     lives_widget_set_fg_color(mainw->open_loc_submenu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars_fore);
   }
 
-  mainw->open_utube = lives_menu_item_new_with_mnemonic (_("Open _Youtube Clip..."));
-  lives_container_add (LIVES_CONTAINER (mainw->open_loc_submenu), mainw->open_utube);
+  mainw->open_utube = lives_menu_item_new_with_mnemonic(_("Open _Youtube Clip..."));
+  lives_container_add(LIVES_CONTAINER(mainw->open_loc_submenu), mainw->open_utube);
 
-  lives_container_add (LIVES_CONTAINER (mainw->open_loc_submenu), mainw->open_loc);
+  lives_container_add(LIVES_CONTAINER(mainw->open_loc_submenu), mainw->open_loc);
 
 #else
 
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mainw->open_loc);
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mainw->open_loc);
 
 #endif
 
-  mainw->open_vcd_menu = lives_menu_item_new_with_mnemonic (_("Import from _dvd/vcd..."));
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mainw->open_vcd_menu);
+  mainw->open_vcd_menu = lives_menu_item_new_with_mnemonic(_("Import from _dvd/vcd..."));
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mainw->open_vcd_menu);
   mainw->open_vcd_submenu=lives_menu_new();
-  lives_menu_item_set_submenu (LIVES_MENU_ITEM (mainw->open_vcd_menu), mainw->open_vcd_submenu);
+  lives_menu_item_set_submenu(LIVES_MENU_ITEM(mainw->open_vcd_menu), mainw->open_vcd_submenu);
   if (palette->style&STYLE_1) {
     lives_widget_set_bg_color(mainw->open_vcd_submenu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
     lives_widget_set_fg_color(mainw->open_vcd_submenu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars_fore);
   }
 
-  mainw->open_dvd = lives_menu_item_new_with_mnemonic (_("Import from _dvd"));
-  lives_container_add (LIVES_CONTAINER (mainw->open_vcd_submenu), mainw->open_dvd);
+  mainw->open_dvd = lives_menu_item_new_with_mnemonic(_("Import from _dvd"));
+  lives_container_add(LIVES_CONTAINER(mainw->open_vcd_submenu), mainw->open_dvd);
 
-  mainw->open_vcd = lives_menu_item_new_with_mnemonic (_("Import from _vcd"));
-  lives_container_add (LIVES_CONTAINER (mainw->open_vcd_submenu), mainw->open_vcd);
+  mainw->open_vcd = lives_menu_item_new_with_mnemonic(_("Import from _vcd"));
+  lives_container_add(LIVES_CONTAINER(mainw->open_vcd_submenu), mainw->open_vcd);
 
-  mainw->open_device_menu = lives_menu_item_new_with_mnemonic (_("_Import from Firewire"));
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mainw->open_device_menu);
+  mainw->open_device_menu = lives_menu_item_new_with_mnemonic(_("_Import from Firewire"));
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mainw->open_device_menu);
   mainw->open_device_submenu=lives_menu_new();
-  lives_menu_item_set_submenu (LIVES_MENU_ITEM (mainw->open_device_menu), mainw->open_device_submenu);
+  lives_menu_item_set_submenu(LIVES_MENU_ITEM(mainw->open_device_menu), mainw->open_device_submenu);
   if (palette->style&STYLE_1) {
     lives_widget_set_bg_color(mainw->open_device_submenu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
     lives_widget_set_fg_color(mainw->open_device_submenu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars_fore);
   }
 
-  mainw->open_firewire = lives_menu_item_new_with_mnemonic (_("Import from _Firewire Device (dv)"));
-  mainw->open_hfirewire = lives_menu_item_new_with_mnemonic (_("Import from _Firewire Device (hdv)"));
+  mainw->open_firewire = lives_menu_item_new_with_mnemonic(_("Import from _Firewire Device (dv)"));
+  mainw->open_hfirewire = lives_menu_item_new_with_mnemonic(_("Import from _Firewire Device (hdv)"));
 
 #ifdef HAVE_LDVGRAB
-  lives_container_add (LIVES_CONTAINER (mainw->open_device_submenu), mainw->open_firewire);
-  lives_container_add (LIVES_CONTAINER (mainw->open_device_submenu), mainw->open_hfirewire);
-  lives_widget_show (mainw->open_firewire);
-  lives_widget_show (mainw->open_hfirewire);
-  lives_widget_show (mainw->open_device_menu);
-  lives_widget_show (mainw->open_device_submenu);
+  lives_container_add(LIVES_CONTAINER(mainw->open_device_submenu), mainw->open_firewire);
+  lives_container_add(LIVES_CONTAINER(mainw->open_device_submenu), mainw->open_hfirewire);
+  lives_widget_show(mainw->open_firewire);
+  lives_widget_show(mainw->open_hfirewire);
+  lives_widget_show(mainw->open_device_menu);
+  lives_widget_show(mainw->open_device_submenu);
 #endif
 
-  lives_widget_show (mainw->open);
+  lives_widget_show(mainw->open);
 
   if (capable->has_mplayer||capable->has_mplayer2) {
-    lives_widget_show (mainw->open_sel);
+    lives_widget_show(mainw->open_sel);
 #ifdef ENABLE_DVD_GRAB
-    lives_widget_show (mainw->open_vcd_menu);
-    lives_widget_show (mainw->open_vcd_submenu);
-    lives_widget_show (mainw->open_dvd);
-    lives_widget_show (mainw->open_vcd);
+    lives_widget_show(mainw->open_vcd_menu);
+    lives_widget_show(mainw->open_vcd_submenu);
+    lives_widget_show(mainw->open_dvd);
+    lives_widget_show(mainw->open_vcd);
 #endif
 #ifdef HAVE_WEBM
-    lives_widget_show_all (mainw->open_loc_menu);
+    lives_widget_show_all(mainw->open_loc_menu);
 #else
-    lives_widget_show (mainw->open_loc);
+    lives_widget_show(mainw->open_loc);
 #endif
   }
 
-  mainw->add_live_menu = lives_menu_item_new_with_mnemonic (_("_Add Webcam/TV card..."));
+  mainw->add_live_menu = lives_menu_item_new_with_mnemonic(_("_Add Webcam/TV card..."));
 
 #if defined(HAVE_UNICAP) || defined(HAVE_YUV4MPEG)
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mainw->add_live_menu);
-  lives_widget_show (mainw->add_live_menu);
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mainw->add_live_menu);
+  lives_widget_show(mainw->add_live_menu);
 
 #ifndef HAVE_UNICAP
   if (capable->has_mplayer||capable->has_mplayer2) {
 #endif
 
     submenu=lives_menu_new();
-    lives_menu_item_set_submenu (LIVES_MENU_ITEM (mainw->add_live_menu), submenu);
+    lives_menu_item_set_submenu(LIVES_MENU_ITEM(mainw->add_live_menu), submenu);
     if (palette->style&STYLE_1) {
       lives_widget_set_bg_color(submenu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
       lives_widget_set_fg_color(submenu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars_fore);
     }
-    lives_widget_show (submenu);
+    lives_widget_show(submenu);
 
 #ifdef HAVE_UNICAP
-  menuitem = lives_menu_item_new_with_mnemonic (_("Add _Unicap Device"));
-  lives_container_add (LIVES_CONTAINER (submenu), menuitem);
-  lives_widget_show (menuitem);
-  lives_signal_connect (LIVES_GUI_OBJECT (menuitem), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (on_open_vdev_activate),
-		    NULL);
+    menuitem = lives_menu_item_new_with_mnemonic(_("Add _Unicap Device"));
+    lives_container_add(LIVES_CONTAINER(submenu), menuitem);
+    lives_widget_show(menuitem);
+    lives_signal_connect(LIVES_GUI_OBJECT(menuitem), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                         LIVES_GUI_CALLBACK(on_open_vdev_activate),
+                         NULL);
 #endif
 
 #ifdef HAVE_YUV4MPEG
     if (capable->has_dvgrab) {
-      menuitem = lives_menu_item_new_with_mnemonic (_("Add Live _Firewire Device"));
-      lives_container_add (LIVES_CONTAINER (submenu), menuitem);
-      lives_widget_show (menuitem);
-
-      lives_signal_connect (LIVES_GUI_OBJECT (menuitem), LIVES_WIDGET_ACTIVATE_EVENT,
-			LIVES_GUI_CALLBACK (on_live_fw_activate),
-			NULL);
-    }
-
-    menuitem = lives_menu_item_new_with_mnemonic (_("Add _TV Device"));
-    lives_container_add (LIVES_CONTAINER (submenu), menuitem);
-    lives_widget_show (menuitem);
-
-    lives_signal_connect (LIVES_GUI_OBJECT (menuitem), LIVES_WIDGET_ACTIVATE_EVENT,
-		      LIVES_GUI_CALLBACK (on_live_tvcard_activate),
-		      NULL);
+      menuitem = lives_menu_item_new_with_mnemonic(_("Add Live _Firewire Device"));
+      lives_container_add(LIVES_CONTAINER(submenu), menuitem);
+      lives_widget_show(menuitem);
+
+      lives_signal_connect(LIVES_GUI_OBJECT(menuitem), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                           LIVES_GUI_CALLBACK(on_live_fw_activate),
+                           NULL);
+    }
+
+    menuitem = lives_menu_item_new_with_mnemonic(_("Add _TV Device"));
+    lives_container_add(LIVES_CONTAINER(submenu), menuitem);
+    lives_widget_show(menuitem);
+
+    lives_signal_connect(LIVES_GUI_OBJECT(menuitem), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                         LIVES_GUI_CALLBACK(on_live_tvcard_activate),
+                         NULL);
 
 #ifndef HAVE_UNICAP
   } // if (capable->has_mplayer)
@@ -507,10 +506,10 @@
 #endif
 #endif // defined HAVE_UNICAP || defined HAVE_YUV4MPEG
 
-  mainw->recent_menu = lives_menu_item_new_with_mnemonic (_("_Recent Files..."));
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mainw->recent_menu);
+  mainw->recent_menu = lives_menu_item_new_with_mnemonic(_("_Recent Files..."));
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mainw->recent_menu);
   mainw->recent_submenu=lives_menu_new();
-  lives_menu_item_set_submenu (LIVES_MENU_ITEM (mainw->recent_menu), mainw->recent_submenu);
+  lives_menu_item_set_submenu(LIVES_MENU_ITEM(mainw->recent_menu), mainw->recent_submenu);
 
   memset(buff,0,1);
 
@@ -518,544 +517,544 @@
   if (capable->smog_version_correct&&capable->can_write_to_tempdir) {
     get_pref_utf8("recent1",buff,32768);
   }
-  mainw->recent1 = lives_menu_item_new_with_label (buff);
-  if (strlen (buff)) lives_widget_show (mainw->recent1);
+  mainw->recent1 = lives_menu_item_new_with_label(buff);
+  if (strlen(buff)) lives_widget_show(mainw->recent1);
   if (capable->smog_version_correct&&capable->can_write_to_tempdir) {
     get_pref_utf8("recent2",buff,32768);
   }
-  mainw->recent2 = lives_menu_item_new_with_label (buff);
-  if (strlen (buff)) lives_widget_show (mainw->recent2);
+  mainw->recent2 = lives_menu_item_new_with_label(buff);
+  if (strlen(buff)) lives_widget_show(mainw->recent2);
 
   if (capable->smog_version_correct&&capable->can_write_to_tempdir) {
     get_pref_utf8("recent3",buff,32768);
   }
-  mainw->recent3 = lives_menu_item_new_with_label (buff);
-  if (strlen (buff)) lives_widget_show (mainw->recent3);
+  mainw->recent3 = lives_menu_item_new_with_label(buff);
+  if (strlen(buff)) lives_widget_show(mainw->recent3);
 
   if (capable->smog_version_correct&&capable->can_write_to_tempdir) {
     get_pref_utf8("recent4",buff,32768);
   }
-  mainw->recent4 = lives_menu_item_new_with_label (buff);
-  if (strlen (buff)) lives_widget_show (mainw->recent4);
+  mainw->recent4 = lives_menu_item_new_with_label(buff);
+  if (strlen(buff)) lives_widget_show(mainw->recent4);
 
-  lives_container_add (LIVES_CONTAINER (mainw->recent_submenu), mainw->recent1);
-  lives_container_add (LIVES_CONTAINER (mainw->recent_submenu), mainw->recent2);
-  lives_container_add (LIVES_CONTAINER (mainw->recent_submenu), mainw->recent3);
-  lives_container_add (LIVES_CONTAINER (mainw->recent_submenu), mainw->recent4);
+  lives_container_add(LIVES_CONTAINER(mainw->recent_submenu), mainw->recent1);
+  lives_container_add(LIVES_CONTAINER(mainw->recent_submenu), mainw->recent2);
+  lives_container_add(LIVES_CONTAINER(mainw->recent_submenu), mainw->recent3);
+  lives_container_add(LIVES_CONTAINER(mainw->recent_submenu), mainw->recent4);
 
   if (palette->style&STYLE_1) {
     lives_widget_set_bg_color(mainw->recent_submenu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
     lives_widget_set_fg_color(mainw->recent_submenu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars_fore);
   }
-  
-  lives_widget_show (mainw->recent_submenu);
+
+  lives_widget_show(mainw->recent_submenu);
 
   if (capable->smog_version_correct&&prefs->show_recent) {
-    lives_widget_show (mainw->recent_menu);
+    lives_widget_show(mainw->recent_menu);
   }
 
   separatormenuitem=lives_menu_add_separator(LIVES_MENU(menuitem_menu));
-  lives_widget_show (separatormenuitem);
+  lives_widget_show(separatormenuitem);
 
-  mainw->vj_load_set = lives_menu_item_new_with_mnemonic (_("_Reload Clip Set..."));
-  lives_widget_show (mainw->vj_load_set);
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mainw->vj_load_set);
-
-  mainw->vj_save_set = lives_menu_item_new_with_mnemonic (_("Close/Sa_ve All Clips"));
-  lives_widget_show (mainw->vj_save_set);
-  lives_widget_set_sensitive (mainw->vj_save_set, FALSE);
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mainw->vj_save_set);
+  mainw->vj_load_set = lives_menu_item_new_with_mnemonic(_("_Reload Clip Set..."));
+  lives_widget_show(mainw->vj_load_set);
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mainw->vj_load_set);
+
+  mainw->vj_save_set = lives_menu_item_new_with_mnemonic(_("Close/Sa_ve All Clips"));
+  lives_widget_show(mainw->vj_save_set);
+  lives_widget_set_sensitive(mainw->vj_save_set, FALSE);
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mainw->vj_save_set);
 
   separatormenuitem=lives_menu_add_separator(LIVES_MENU(menuitem_menu));
-  lives_widget_show (separatormenuitem);
+  lives_widget_show(separatormenuitem);
 
-  mainw->save_as = lives_image_menu_item_new_from_stock (LIVES_STOCK_LABEL_SAVE, mainw->accel_group);
-  lives_container_add (LIVES_CONTAINER(menuitem_menu), mainw->save_as);
-  lives_widget_set_sensitive (mainw->save_as, FALSE);
+  mainw->save_as = lives_image_menu_item_new_from_stock(LIVES_STOCK_LABEL_SAVE, mainw->accel_group);
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mainw->save_as);
+  lives_widget_set_sensitive(mainw->save_as, FALSE);
   set_menu_text(mainw->save_as,_("_Encode Clip As..."),TRUE);
 
-  mainw->save_selection = lives_menu_item_new_with_mnemonic (_("Encode _Selection As..."));
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mainw->save_selection);
-  lives_widget_set_sensitive (mainw->save_selection, FALSE);
-
-  lives_widget_show (mainw->save_as);
-  lives_widget_show (mainw->save_selection);
-
-  mainw->close = lives_menu_item_new_with_mnemonic (_("_Close This Clip"));
-  lives_widget_add_accelerator (mainw->close, LIVES_WIDGET_ACTIVATE_EVENT, mainw->accel_group,
-                              LIVES_KEY_w, LIVES_CONTROL_MASK,
-                              LIVES_ACCEL_VISIBLE);
-  lives_widget_show (mainw->close);
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mainw->close);
-  lives_widget_set_sensitive (mainw->close, FALSE);
+  mainw->save_selection = lives_menu_item_new_with_mnemonic(_("Encode _Selection As..."));
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mainw->save_selection);
+  lives_widget_set_sensitive(mainw->save_selection, FALSE);
+
+  lives_widget_show(mainw->save_as);
+  lives_widget_show(mainw->save_selection);
+
+  mainw->close = lives_menu_item_new_with_mnemonic(_("_Close This Clip"));
+  lives_widget_add_accelerator(mainw->close, LIVES_WIDGET_ACTIVATE_SIGNAL, mainw->accel_group,
+                               LIVES_KEY_w, LIVES_CONTROL_MASK,
+                               LIVES_ACCEL_VISIBLE);
+  lives_widget_show(mainw->close);
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mainw->close);
+  lives_widget_set_sensitive(mainw->close, FALSE);
 
   separatormenuitem=lives_menu_add_separator(LIVES_MENU(menuitem_menu));
-  lives_widget_show (separatormenuitem);
+  lives_widget_show(separatormenuitem);
 
-  mainw->backup = lives_menu_item_new_with_mnemonic (_("_Backup Clip as .lv1..."));
-  lives_widget_show (mainw->backup);
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mainw->backup);
-  lives_widget_set_sensitive (mainw->backup, FALSE);
-
-  lives_widget_add_accelerator (mainw->backup, LIVES_WIDGET_ACTIVATE_EVENT, mainw->accel_group,
-                              LIVES_KEY_b, LIVES_CONTROL_MASK,
-                              LIVES_ACCEL_VISIBLE);
-
-  mainw->restore = lives_menu_item_new_with_mnemonic (_("_Restore Clip from .lv1..."));
-  lives_widget_show (mainw->restore);
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mainw->restore);
-
-  lives_widget_add_accelerator (mainw->restore, LIVES_WIDGET_ACTIVATE_EVENT, mainw->accel_group,
-                              LIVES_KEY_r, LIVES_CONTROL_MASK,
-                              LIVES_ACCEL_VISIBLE);
+  mainw->backup = lives_menu_item_new_with_mnemonic(_("_Backup Clip as .lv1..."));
+  lives_widget_show(mainw->backup);
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mainw->backup);
+  lives_widget_set_sensitive(mainw->backup, FALSE);
+
+  lives_widget_add_accelerator(mainw->backup, LIVES_WIDGET_ACTIVATE_SIGNAL, mainw->accel_group,
+                               LIVES_KEY_b, LIVES_CONTROL_MASK,
+                               LIVES_ACCEL_VISIBLE);
+
+  mainw->restore = lives_menu_item_new_with_mnemonic(_("_Restore Clip from .lv1..."));
+  lives_widget_show(mainw->restore);
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mainw->restore);
+
+  lives_widget_add_accelerator(mainw->restore, LIVES_WIDGET_ACTIVATE_SIGNAL, mainw->accel_group,
+                               LIVES_KEY_r, LIVES_CONTROL_MASK,
+                               LIVES_ACCEL_VISIBLE);
 
   separatormenuitem=lives_menu_add_separator(LIVES_MENU(menuitem_menu));
-  lives_widget_show (separatormenuitem);
+  lives_widget_show(separatormenuitem);
 
-  mainw->sw_sound = lives_check_menu_item_new_with_mnemonic (_("Encode/Load/Backup _with Sound"));
-  lives_widget_show (mainw->sw_sound);
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mainw->sw_sound);
+  mainw->sw_sound = lives_check_menu_item_new_with_mnemonic(_("Encode/Load/Backup _with Sound"));
+  lives_widget_show(mainw->sw_sound);
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mainw->sw_sound);
   lives_check_menu_item_set_active(LIVES_CHECK_MENU_ITEM(mainw->sw_sound),TRUE);
 
-  mainw->aload_subs = lives_check_menu_item_new_with_mnemonic (_("Auto load subtitles"));
-  lives_widget_show (mainw->aload_subs);
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mainw->aload_subs);
+  mainw->aload_subs = lives_check_menu_item_new_with_mnemonic(_("Auto load subtitles"));
+  lives_widget_show(mainw->aload_subs);
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mainw->aload_subs);
   lives_check_menu_item_set_active(LIVES_CHECK_MENU_ITEM(mainw->aload_subs),prefs->autoload_subs);
 
   separatormenuitem=lives_menu_add_separator(LIVES_MENU(menuitem_menu));
-  lives_widget_show (separatormenuitem);
+  lives_widget_show(separatormenuitem);
 
-  mainw->clear_ds = lives_menu_item_new_with_mnemonic (_("Clean _up Diskspace"));
-  lives_widget_show (mainw->clear_ds);
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mainw->clear_ds);
-
-  mainw->quit = lives_image_menu_item_new_from_stock (LIVES_STOCK_LABEL_QUIT, mainw->accel_group);
-  lives_widget_show (mainw->quit);
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mainw->quit);
-
-  menuitem = lives_menu_item_new_with_mnemonic (_("_Edit"));
-  lives_widget_show (menuitem);
-  lives_container_add (LIVES_CONTAINER (mainw->menubar), menuitem);
+  mainw->clear_ds = lives_menu_item_new_with_mnemonic(_("Clean _up Diskspace"));
+  lives_widget_show(mainw->clear_ds);
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mainw->clear_ds);
+
+  mainw->quit = lives_image_menu_item_new_from_stock(LIVES_STOCK_LABEL_QUIT, mainw->accel_group);
+  lives_widget_show(mainw->quit);
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mainw->quit);
+
+  menuitem = lives_menu_item_new_with_mnemonic(_("_Edit"));
+  lives_widget_show(menuitem);
+  lives_container_add(LIVES_CONTAINER(mainw->menubar), menuitem);
 
-  menuitem_menu = lives_menu_new ();
-  lives_menu_item_set_submenu (LIVES_MENU_ITEM (menuitem), menuitem_menu);
+  menuitem_menu = lives_menu_new();
+  lives_menu_item_set_submenu(LIVES_MENU_ITEM(menuitem), menuitem_menu);
 
   if (palette->style&STYLE_1) {
     lives_widget_set_bg_color(menuitem_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
     lives_widget_set_fg_color(menuitem_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars_fore);
-   }
+  }
 
-  mainw->undo = lives_image_menu_item_new_with_mnemonic (_("_Undo"));
+  mainw->undo = lives_image_menu_item_new_with_mnemonic(_("_Undo"));
 
-  lives_widget_show (mainw->undo);
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mainw->undo);
-  lives_widget_set_sensitive (mainw->undo, FALSE);
+  lives_widget_show(mainw->undo);
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mainw->undo);
+  lives_widget_set_sensitive(mainw->undo, FALSE);
 
 
-  lives_widget_add_accelerator (mainw->undo, LIVES_WIDGET_ACTIVATE_EVENT, mainw->accel_group,
-                              LIVES_KEY_u, LIVES_CONTROL_MASK,
-                              LIVES_ACCEL_VISIBLE);
+  lives_widget_add_accelerator(mainw->undo, LIVES_WIDGET_ACTIVATE_SIGNAL, mainw->accel_group,
+                               LIVES_KEY_u, LIVES_CONTROL_MASK,
+                               LIVES_ACCEL_VISIBLE);
 
 #if LIVES_HAS_IMAGE_MENU_ITEM
-  image = lives_image_new_from_stock (LIVES_STOCK_UNDO, LIVES_ICON_SIZE_MENU);
-  lives_widget_show (image);
+  image = lives_image_new_from_stock(LIVES_STOCK_UNDO, LIVES_ICON_SIZE_MENU);
+  lives_widget_show(image);
 
-  lives_image_menu_item_set_image (LIVES_IMAGE_MENU_ITEM (mainw->undo), image);
+  lives_image_menu_item_set_image(LIVES_IMAGE_MENU_ITEM(mainw->undo), image);
 #endif
 
-  mainw->redo = lives_image_menu_item_new_with_mnemonic (_("_Redo"));
-  lives_widget_hide (mainw->redo);
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mainw->redo);
-  lives_widget_set_sensitive (mainw->redo, FALSE);
+  mainw->redo = lives_image_menu_item_new_with_mnemonic(_("_Redo"));
+  lives_widget_hide(mainw->redo);
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mainw->redo);
+  lives_widget_set_sensitive(mainw->redo, FALSE);
 
-  lives_widget_add_accelerator (mainw->redo, LIVES_WIDGET_ACTIVATE_EVENT, mainw->accel_group,
-                              LIVES_KEY_z, LIVES_CONTROL_MASK,
-                              LIVES_ACCEL_VISIBLE);
+  lives_widget_add_accelerator(mainw->redo, LIVES_WIDGET_ACTIVATE_SIGNAL, mainw->accel_group,
+                               LIVES_KEY_z, LIVES_CONTROL_MASK,
+                               LIVES_ACCEL_VISIBLE);
 
 #if LIVES_HAS_IMAGE_MENU_ITEM
-  image = lives_image_new_from_stock (LIVES_STOCK_REDO, LIVES_ICON_SIZE_MENU);
-  lives_widget_show (image);
+  image = lives_image_new_from_stock(LIVES_STOCK_REDO, LIVES_ICON_SIZE_MENU);
+  lives_widget_show(image);
 
-  lives_image_menu_item_set_image (LIVES_IMAGE_MENU_ITEM (mainw->redo), image);
+  lives_image_menu_item_set_image(LIVES_IMAGE_MENU_ITEM(mainw->redo), image);
 #endif
 
   separatormenuitem=lives_menu_add_separator(LIVES_MENU(menuitem_menu));
-  lives_widget_show (separatormenuitem);
+  lives_widget_show(separatormenuitem);
 
-  mainw->mt_menu = lives_image_menu_item_new_with_mnemonic (_("_MULTITRACK mode"));
-  lives_widget_show (mainw->mt_menu);
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mainw->mt_menu);
+  mainw->mt_menu = lives_image_menu_item_new_with_mnemonic(_("_MULTITRACK mode"));
+  lives_widget_show(mainw->mt_menu);
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mainw->mt_menu);
 
   separatormenuitem=lives_menu_add_separator(LIVES_MENU(menuitem_menu));
-  lives_widget_show (separatormenuitem);
+  lives_widget_show(separatormenuitem);
 
-  lives_widget_add_accelerator (mainw->mt_menu, LIVES_WIDGET_ACTIVATE_EVENT, mainw->accel_group,
-                              LIVES_KEY_m, LIVES_CONTROL_MASK,
-                              LIVES_ACCEL_VISIBLE);
-
-  mainw->copy = lives_image_menu_item_new_with_mnemonic (_("_Copy Selection"));
-  lives_widget_show (mainw->copy);
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mainw->copy);
-  lives_widget_set_sensitive (mainw->copy, FALSE);
-
-  lives_widget_add_accelerator (mainw->copy, LIVES_WIDGET_ACTIVATE_EVENT, mainw->accel_group,
-                              LIVES_KEY_c, LIVES_CONTROL_MASK,
-                              LIVES_ACCEL_VISIBLE);
-
-  mainw->cut = lives_image_menu_item_new_with_mnemonic (_("Cu_t Selection"));
-  lives_widget_show (mainw->cut);
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mainw->cut);
-  lives_widget_set_sensitive (mainw->cut, FALSE);
-
-  lives_widget_add_accelerator (mainw->cut, LIVES_WIDGET_ACTIVATE_EVENT, mainw->accel_group,
-                              LIVES_KEY_t, LIVES_CONTROL_MASK,
-                              LIVES_ACCEL_VISIBLE);
-
-  mainw->insert = lives_image_menu_item_new_with_mnemonic (_("_Insert from Clipboard..."));
-  lives_widget_show (mainw->insert);
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mainw->insert);
-  lives_widget_set_sensitive (mainw->insert, FALSE);
-
-  lives_widget_add_accelerator (mainw->insert, LIVES_WIDGET_ACTIVATE_EVENT, mainw->accel_group,
-                              LIVES_KEY_i, LIVES_CONTROL_MASK,
-                              LIVES_ACCEL_VISIBLE);
+  lives_widget_add_accelerator(mainw->mt_menu, LIVES_WIDGET_ACTIVATE_SIGNAL, mainw->accel_group,
+                               LIVES_KEY_m, LIVES_CONTROL_MASK,
+                               LIVES_ACCEL_VISIBLE);
+
+  mainw->copy = lives_image_menu_item_new_with_mnemonic(_("_Copy Selection"));
+  lives_widget_show(mainw->copy);
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mainw->copy);
+  lives_widget_set_sensitive(mainw->copy, FALSE);
+
+  lives_widget_add_accelerator(mainw->copy, LIVES_WIDGET_ACTIVATE_SIGNAL, mainw->accel_group,
+                               LIVES_KEY_c, LIVES_CONTROL_MASK,
+                               LIVES_ACCEL_VISIBLE);
+
+  mainw->cut = lives_image_menu_item_new_with_mnemonic(_("Cu_t Selection"));
+  lives_widget_show(mainw->cut);
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mainw->cut);
+  lives_widget_set_sensitive(mainw->cut, FALSE);
+
+  lives_widget_add_accelerator(mainw->cut, LIVES_WIDGET_ACTIVATE_SIGNAL, mainw->accel_group,
+                               LIVES_KEY_t, LIVES_CONTROL_MASK,
+                               LIVES_ACCEL_VISIBLE);
+
+  mainw->insert = lives_image_menu_item_new_with_mnemonic(_("_Insert from Clipboard..."));
+  lives_widget_show(mainw->insert);
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mainw->insert);
+  lives_widget_set_sensitive(mainw->insert, FALSE);
+
+  lives_widget_add_accelerator(mainw->insert, LIVES_WIDGET_ACTIVATE_SIGNAL, mainw->accel_group,
+                               LIVES_KEY_i, LIVES_CONTROL_MASK,
+                               LIVES_ACCEL_VISIBLE);
 
 #if LIVES_HAS_IMAGE_MENU_ITEM
-  image = lives_image_new_from_stock (LIVES_STOCK_ADD, LIVES_ICON_SIZE_MENU);
-  lives_widget_show (image);
+  image = lives_image_new_from_stock(LIVES_STOCK_ADD, LIVES_ICON_SIZE_MENU);
+  lives_widget_show(image);
 
-  lives_image_menu_item_set_image (LIVES_IMAGE_MENU_ITEM (mainw->insert), image);
+  lives_image_menu_item_set_image(LIVES_IMAGE_MENU_ITEM(mainw->insert), image);
 #endif
 
-  mainw->paste_as_new = lives_image_menu_item_new_with_mnemonic (_("Paste as _New"));
-  lives_widget_show (mainw->paste_as_new);
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mainw->paste_as_new);
-  lives_widget_set_sensitive (mainw->paste_as_new, FALSE);
+  mainw->paste_as_new = lives_image_menu_item_new_with_mnemonic(_("Paste as _New"));
+  lives_widget_show(mainw->paste_as_new);
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mainw->paste_as_new);
+  lives_widget_set_sensitive(mainw->paste_as_new, FALSE);
 
-  lives_widget_add_accelerator (mainw->paste_as_new, LIVES_WIDGET_ACTIVATE_EVENT, mainw->accel_group,
-                              LIVES_KEY_n, LIVES_CONTROL_MASK,
-                              LIVES_ACCEL_VISIBLE);
+  lives_widget_add_accelerator(mainw->paste_as_new, LIVES_WIDGET_ACTIVATE_SIGNAL, mainw->accel_group,
+                               LIVES_KEY_n, LIVES_CONTROL_MASK,
+                               LIVES_ACCEL_VISIBLE);
 
-  mainw->merge = lives_menu_item_new_with_mnemonic (_("_Merge Clipboard with Selection..."));
+  mainw->merge = lives_menu_item_new_with_mnemonic(_("_Merge Clipboard with Selection..."));
   if (capable->has_composite&&capable->has_convert) {
-    lives_widget_show (mainw->merge);
+    lives_widget_show(mainw->merge);
   }
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mainw->merge);
-  lives_widget_set_sensitive (mainw->merge, FALSE);
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mainw->merge);
+  lives_widget_set_sensitive(mainw->merge, FALSE);
 
   mainw->xdelete = lives_image_menu_item_new_with_mnemonic(_("_Delete Selection"));
-  lives_widget_show (mainw->xdelete);
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mainw->xdelete);
-  lives_widget_set_sensitive (mainw->xdelete, FALSE);
+  lives_widget_show(mainw->xdelete);
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mainw->xdelete);
+  lives_widget_set_sensitive(mainw->xdelete, FALSE);
 
 #if LIVES_HAS_IMAGE_MENU_ITEM
-  image = lives_image_new_from_stock ("gtk-delete", LIVES_ICON_SIZE_MENU);
-  lives_widget_show (image);
-  lives_image_menu_item_set_image (LIVES_IMAGE_MENU_ITEM (mainw->xdelete), image);
+  image = lives_image_new_from_stock("gtk-delete", LIVES_ICON_SIZE_MENU);
+  lives_widget_show(image);
+  lives_image_menu_item_set_image(LIVES_IMAGE_MENU_ITEM(mainw->xdelete), image);
 #endif
 
-  lives_widget_add_accelerator (mainw->xdelete, LIVES_WIDGET_ACTIVATE_EVENT, mainw->accel_group,
-                              LIVES_KEY_d, LIVES_CONTROL_MASK,
-                              LIVES_ACCEL_VISIBLE);
+  lives_widget_add_accelerator(mainw->xdelete, LIVES_WIDGET_ACTIVATE_SIGNAL, mainw->accel_group,
+                               LIVES_KEY_d, LIVES_CONTROL_MASK,
+                               LIVES_ACCEL_VISIBLE);
 
   separatormenuitem=lives_menu_add_separator(LIVES_MENU(menuitem_menu));
-  lives_widget_show (separatormenuitem);
+  lives_widget_show(separatormenuitem);
 
-  mainw->ccpd_sound = lives_check_menu_item_new_with_mnemonic (_("Decouple _Video from Audio"));
-  lives_widget_show (mainw->ccpd_sound);
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mainw->ccpd_sound);
+  mainw->ccpd_sound = lives_check_menu_item_new_with_mnemonic(_("Decouple _Video from Audio"));
+  lives_widget_show(mainw->ccpd_sound);
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mainw->ccpd_sound);
   lives_check_menu_item_set_active(LIVES_CHECK_MENU_ITEM(mainw->ccpd_sound),!mainw->ccpd_with_sound);
 
   separatormenuitem=lives_menu_add_separator(LIVES_MENU(menuitem_menu));
-  lives_widget_show (separatormenuitem);
+  lives_widget_show(separatormenuitem);
 
-  mainw->select_submenu = lives_menu_item_new_with_mnemonic (_("_Select..."));
-  lives_widget_show (mainw->select_submenu);
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mainw->select_submenu);
+  mainw->select_submenu = lives_menu_item_new_with_mnemonic(_("_Select..."));
+  lives_widget_show(mainw->select_submenu);
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mainw->select_submenu);
   lives_widget_set_sensitive(mainw->select_submenu,FALSE);
 
   select_submenu_menu=lives_menu_new();
 
-  lives_menu_item_set_submenu (LIVES_MENU_ITEM (mainw->select_submenu), select_submenu_menu);
+  lives_menu_item_set_submenu(LIVES_MENU_ITEM(mainw->select_submenu), select_submenu_menu);
 
   if (palette->style&STYLE_1) {
     lives_widget_set_bg_color(select_submenu_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
     lives_widget_set_fg_color(select_submenu_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars_fore);
   }
 
-  mainw->select_all = lives_menu_item_new_with_mnemonic (_("Select _All Frames"));
-  lives_widget_show (mainw->select_all);
-  lives_container_add (LIVES_CONTAINER (select_submenu_menu), mainw->select_all);
-
-  lives_widget_add_accelerator (mainw->select_all, LIVES_WIDGET_ACTIVATE_EVENT, mainw->accel_group,
-                              LIVES_KEY_a, LIVES_CONTROL_MASK,
-                              LIVES_ACCEL_VISIBLE);
-
-  mainw->select_start_only = lives_image_menu_item_new_with_mnemonic (_("_Start Frame Only"));
-  lives_widget_show (mainw->select_start_only);
-  lives_container_add (LIVES_CONTAINER (select_submenu_menu), mainw->select_start_only);
-
-  lives_widget_add_accelerator (mainw->select_start_only, LIVES_WIDGET_ACTIVATE_EVENT, mainw->accel_group,
-			      LIVES_KEY_Home, LIVES_CONTROL_MASK,
-			      LIVES_ACCEL_VISIBLE);
-
-  mainw->select_end_only = lives_image_menu_item_new_with_mnemonic (_("_End Frame Only"));
-  lives_widget_show (mainw->select_end_only);
-  lives_container_add (LIVES_CONTAINER (select_submenu_menu), mainw->select_end_only);
-  lives_widget_add_accelerator (mainw->select_end_only, LIVES_WIDGET_ACTIVATE_EVENT, mainw->accel_group,
-			      LIVES_KEY_End, LIVES_CONTROL_MASK,
-			      LIVES_ACCEL_VISIBLE);
+  mainw->select_all = lives_menu_item_new_with_mnemonic(_("Select _All Frames"));
+  lives_widget_show(mainw->select_all);
+  lives_container_add(LIVES_CONTAINER(select_submenu_menu), mainw->select_all);
+
+  lives_widget_add_accelerator(mainw->select_all, LIVES_WIDGET_ACTIVATE_SIGNAL, mainw->accel_group,
+                               LIVES_KEY_a, LIVES_CONTROL_MASK,
+                               LIVES_ACCEL_VISIBLE);
+
+  mainw->select_start_only = lives_image_menu_item_new_with_mnemonic(_("_Start Frame Only"));
+  lives_widget_show(mainw->select_start_only);
+  lives_container_add(LIVES_CONTAINER(select_submenu_menu), mainw->select_start_only);
+
+  lives_widget_add_accelerator(mainw->select_start_only, LIVES_WIDGET_ACTIVATE_SIGNAL, mainw->accel_group,
+                               LIVES_KEY_Home, LIVES_CONTROL_MASK,
+                               LIVES_ACCEL_VISIBLE);
+
+  mainw->select_end_only = lives_image_menu_item_new_with_mnemonic(_("_End Frame Only"));
+  lives_widget_show(mainw->select_end_only);
+  lives_container_add(LIVES_CONTAINER(select_submenu_menu), mainw->select_end_only);
+  lives_widget_add_accelerator(mainw->select_end_only, LIVES_WIDGET_ACTIVATE_SIGNAL, mainw->accel_group,
+                               LIVES_KEY_End, LIVES_CONTROL_MASK,
+                               LIVES_ACCEL_VISIBLE);
 
 
   separatormenuitem=lives_menu_add_separator(LIVES_MENU(select_submenu_menu));
-  lives_widget_show (separatormenuitem);
+  lives_widget_show(separatormenuitem);
 
-  mainw->select_from_start = lives_image_menu_item_new_with_mnemonic (_("Select from _First Frame"));
-  lives_widget_show (mainw->select_from_start);
-  lives_container_add (LIVES_CONTAINER (select_submenu_menu), mainw->select_from_start);
-
-  mainw->select_to_end = lives_image_menu_item_new_with_mnemonic (_("Select to _Last Frame"));
-  lives_container_add (LIVES_CONTAINER (select_submenu_menu), mainw->select_to_end);
-  lives_widget_show (mainw->select_to_end);
-
-  mainw->select_new = lives_image_menu_item_new_with_mnemonic (_("Select Last Insertion/_Merge"));
-  lives_widget_show (mainw->select_new);
-  lives_container_add (LIVES_CONTAINER (select_submenu_menu), mainw->select_new);
-
-  mainw->select_last = lives_image_menu_item_new_with_mnemonic (_("Select Last _Effect"));
-  lives_widget_show (mainw->select_last);
-  lives_container_add (LIVES_CONTAINER (select_submenu_menu), mainw->select_last);
-
-  mainw->select_invert = lives_image_menu_item_new_with_mnemonic (_("_Invert Selection"));
-  lives_widget_show (mainw->select_invert);
-  lives_container_add (LIVES_CONTAINER (select_submenu_menu), mainw->select_invert);
-
-  lives_widget_add_accelerator (mainw->select_invert, LIVES_WIDGET_ACTIVATE_EVENT, mainw->accel_group,
-                              LIVES_KEY_Slash, LIVES_CONTROL_MASK,
-                              LIVES_ACCEL_VISIBLE);
-
-  mainw->lock_selwidth = lives_check_menu_item_new_with_mnemonic (_("_Lock Selection Width"));
-  lives_widget_show (mainw->lock_selwidth);
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mainw->lock_selwidth);
+  mainw->select_from_start = lives_image_menu_item_new_with_mnemonic(_("Select from _First Frame"));
+  lives_widget_show(mainw->select_from_start);
+  lives_container_add(LIVES_CONTAINER(select_submenu_menu), mainw->select_from_start);
+
+  mainw->select_to_end = lives_image_menu_item_new_with_mnemonic(_("Select to _Last Frame"));
+  lives_container_add(LIVES_CONTAINER(select_submenu_menu), mainw->select_to_end);
+  lives_widget_show(mainw->select_to_end);
+
+  mainw->select_new = lives_image_menu_item_new_with_mnemonic(_("Select Last Insertion/_Merge"));
+  lives_widget_show(mainw->select_new);
+  lives_container_add(LIVES_CONTAINER(select_submenu_menu), mainw->select_new);
+
+  mainw->select_last = lives_image_menu_item_new_with_mnemonic(_("Select Last _Effect"));
+  lives_widget_show(mainw->select_last);
+  lives_container_add(LIVES_CONTAINER(select_submenu_menu), mainw->select_last);
+
+  mainw->select_invert = lives_image_menu_item_new_with_mnemonic(_("_Invert Selection"));
+  lives_widget_show(mainw->select_invert);
+  lives_container_add(LIVES_CONTAINER(select_submenu_menu), mainw->select_invert);
+
+  lives_widget_add_accelerator(mainw->select_invert, LIVES_WIDGET_ACTIVATE_SIGNAL, mainw->accel_group,
+                               LIVES_KEY_Slash, LIVES_CONTROL_MASK,
+                               LIVES_ACCEL_VISIBLE);
+
+  mainw->lock_selwidth = lives_check_menu_item_new_with_mnemonic(_("_Lock Selection Width"));
+  lives_widget_show(mainw->lock_selwidth);
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mainw->lock_selwidth);
   lives_widget_set_sensitive(mainw->lock_selwidth,FALSE);
 
-  menuitem = lives_menu_item_new_with_mnemonic (_ ("_Play"));
-  lives_widget_show (menuitem);
-  lives_container_add (LIVES_CONTAINER (mainw->menubar), menuitem);
-  
-  menuitem_menu = lives_menu_new ();
-  lives_menu_item_set_submenu (LIVES_MENU_ITEM (menuitem), menuitem_menu);
+  menuitem = lives_menu_item_new_with_mnemonic(_("_Play"));
+  lives_widget_show(menuitem);
+  lives_container_add(LIVES_CONTAINER(mainw->menubar), menuitem);
+
+  menuitem_menu = lives_menu_new();
+  lives_menu_item_set_submenu(LIVES_MENU_ITEM(menuitem), menuitem_menu);
 
   if (palette->style&STYLE_1) {
     lives_widget_set_bg_color(menuitem_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
     lives_widget_set_fg_color(menuitem_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars_fore);
   }
 
-  mainw->playall = lives_image_menu_item_new_with_mnemonic (_("_Play All"));
-  lives_widget_add_accelerator (mainw->playall, LIVES_WIDGET_ACTIVATE_EVENT, mainw->accel_group,
-                              LIVES_KEY_p, (LiVESXModifierType)0,
-                              LIVES_ACCEL_VISIBLE);
-  lives_widget_show (mainw->playall);
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mainw->playall);
-  lives_widget_set_sensitive (mainw->playall, FALSE);
+  mainw->playall = lives_image_menu_item_new_with_mnemonic(_("_Play All"));
+  lives_widget_add_accelerator(mainw->playall, LIVES_WIDGET_ACTIVATE_SIGNAL, mainw->accel_group,
+                               LIVES_KEY_p, (LiVESXModifierType)0,
+                               LIVES_ACCEL_VISIBLE);
+  lives_widget_show(mainw->playall);
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mainw->playall);
+  lives_widget_set_sensitive(mainw->playall, FALSE);
 
 #if LIVES_HAS_IMAGE_MENU_ITEM
-  image = lives_image_new_from_stock (LIVES_STOCK_REFRESH, LIVES_ICON_SIZE_MENU);
-  lives_widget_show (image);
+  image = lives_image_new_from_stock(LIVES_STOCK_REFRESH, LIVES_ICON_SIZE_MENU);
+  lives_widget_show(image);
 
-  lives_image_menu_item_set_image (LIVES_IMAGE_MENU_ITEM (mainw->playall), image);
+  lives_image_menu_item_set_image(LIVES_IMAGE_MENU_ITEM(mainw->playall), image);
 #endif
 
-  mainw->playsel = lives_image_menu_item_new_with_mnemonic (_("Pla_y Selection"));
-  lives_widget_add_accelerator (mainw->playsel, LIVES_WIDGET_ACTIVATE_EVENT, mainw->accel_group,
-                              LIVES_KEY_y, (LiVESXModifierType)0,
-                              LIVES_ACCEL_VISIBLE);
-  lives_widget_show (mainw->playsel);
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mainw->playsel);
-  lives_widget_set_sensitive (mainw->playsel, FALSE);
-
-  mainw->playclip = lives_image_menu_item_new_with_mnemonic (_("Play _Clipboard"));
-  lives_widget_show (mainw->playclip);
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mainw->playclip);
-  lives_widget_set_sensitive (mainw->playclip, FALSE);
-
-  lives_widget_add_accelerator (mainw->playclip, LIVES_WIDGET_ACTIVATE_EVENT, mainw->accel_group,
-                              LIVES_KEY_c, (LiVESXModifierType)0,
-                              LIVES_ACCEL_VISIBLE);
+  mainw->playsel = lives_image_menu_item_new_with_mnemonic(_("Pla_y Selection"));
+  lives_widget_add_accelerator(mainw->playsel, LIVES_WIDGET_ACTIVATE_SIGNAL, mainw->accel_group,
+                               LIVES_KEY_y, (LiVESXModifierType)0,
+                               LIVES_ACCEL_VISIBLE);
+  lives_widget_show(mainw->playsel);
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mainw->playsel);
+  lives_widget_set_sensitive(mainw->playsel, FALSE);
+
+  mainw->playclip = lives_image_menu_item_new_with_mnemonic(_("Play _Clipboard"));
+  lives_widget_show(mainw->playclip);
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mainw->playclip);
+  lives_widget_set_sensitive(mainw->playclip, FALSE);
+
+  lives_widget_add_accelerator(mainw->playclip, LIVES_WIDGET_ACTIVATE_SIGNAL, mainw->accel_group,
+                               LIVES_KEY_c, (LiVESXModifierType)0,
+                               LIVES_ACCEL_VISIBLE);
 
 #if LIVES_HAS_IMAGE_MENU_ITEM
-  image = lives_image_new_from_stock (LIVES_STOCK_MEDIA_PLAY, LIVES_ICON_SIZE_MENU);
+  image = lives_image_new_from_stock(LIVES_STOCK_MEDIA_PLAY, LIVES_ICON_SIZE_MENU);
 
-  lives_image_menu_item_set_image (LIVES_IMAGE_MENU_ITEM (mainw->playsel), image);
+  lives_image_menu_item_set_image(LIVES_IMAGE_MENU_ITEM(mainw->playsel), image);
 #endif
 
 #if LIVES_HAS_IMAGE_MENU_ITEM
-  image = lives_image_new_from_stock (LIVES_STOCK_MEDIA_PLAY, LIVES_ICON_SIZE_MENU);
-  lives_widget_show (image);
+  image = lives_image_new_from_stock(LIVES_STOCK_MEDIA_PLAY, LIVES_ICON_SIZE_MENU);
+  lives_widget_show(image);
 
-  lives_image_menu_item_set_image (LIVES_IMAGE_MENU_ITEM (mainw->playclip), image);
+  lives_image_menu_item_set_image(LIVES_IMAGE_MENU_ITEM(mainw->playclip), image);
 #endif
 
-  mainw->stop = lives_image_menu_item_new_with_mnemonic (_("_Stop"));
-  lives_widget_show (mainw->stop);
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mainw->stop);
-  lives_widget_set_sensitive (mainw->stop, FALSE);
-  lives_widget_add_accelerator (mainw->stop, LIVES_WIDGET_ACTIVATE_EVENT, mainw->accel_group,
-                              LIVES_KEY_q, (LiVESXModifierType)0,
-                              LIVES_ACCEL_VISIBLE);
+  mainw->stop = lives_image_menu_item_new_with_mnemonic(_("_Stop"));
+  lives_widget_show(mainw->stop);
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mainw->stop);
+  lives_widget_set_sensitive(mainw->stop, FALSE);
+  lives_widget_add_accelerator(mainw->stop, LIVES_WIDGET_ACTIVATE_SIGNAL, mainw->accel_group,
+                               LIVES_KEY_q, (LiVESXModifierType)0,
+                               LIVES_ACCEL_VISIBLE);
 
 
 #if LIVES_HAS_IMAGE_MENU_ITEM
-  image = lives_image_new_from_stock (LIVES_STOCK_MEDIA_STOP, LIVES_ICON_SIZE_MENU);
-  lives_widget_show (image);
-  lives_image_menu_item_set_image (LIVES_IMAGE_MENU_ITEM (mainw->stop), image);
+  image = lives_image_new_from_stock(LIVES_STOCK_MEDIA_STOP, LIVES_ICON_SIZE_MENU);
+  lives_widget_show(image);
+  lives_image_menu_item_set_image(LIVES_IMAGE_MENU_ITEM(mainw->stop), image);
 #endif
 
-  mainw->rewind = lives_image_menu_item_new_with_mnemonic (_("Re_wind"));
-  lives_widget_show (mainw->rewind);
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mainw->rewind);
-  lives_widget_set_sensitive (mainw->rewind, FALSE);
+  mainw->rewind = lives_image_menu_item_new_with_mnemonic(_("Re_wind"));
+  lives_widget_show(mainw->rewind);
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mainw->rewind);
+  lives_widget_set_sensitive(mainw->rewind, FALSE);
 
 #if LIVES_HAS_IMAGE_MENU_ITEM
-  image = lives_image_new_from_stock (LIVES_STOCK_MEDIA_REWIND, LIVES_ICON_SIZE_MENU);
+  image = lives_image_new_from_stock(LIVES_STOCK_MEDIA_REWIND, LIVES_ICON_SIZE_MENU);
 
-  lives_widget_show (image);
-  lives_image_menu_item_set_image (LIVES_IMAGE_MENU_ITEM (mainw->rewind), image);
+  lives_widget_show(image);
+  lives_image_menu_item_set_image(LIVES_IMAGE_MENU_ITEM(mainw->rewind), image);
 #endif
 
-  lives_widget_add_accelerator (mainw->rewind, LIVES_WIDGET_ACTIVATE_EVENT, mainw->accel_group,
-                              LIVES_KEY_w, (LiVESXModifierType)0,
-                              LIVES_ACCEL_VISIBLE);
+  lives_widget_add_accelerator(mainw->rewind, LIVES_WIDGET_ACTIVATE_SIGNAL, mainw->accel_group,
+                               LIVES_KEY_w, (LiVESXModifierType)0,
+                               LIVES_ACCEL_VISIBLE);
 
   mainw->record_perf = lives_check_menu_item_new_with_mnemonic("");
 
   disable_record();
 
-  lives_widget_add_accelerator (mainw->record_perf, LIVES_WIDGET_ACTIVATE_EVENT, mainw->accel_group,
-			      LIVES_KEY_r, (LiVESXModifierType)0,
-			      LIVES_ACCEL_VISIBLE);
+  lives_widget_add_accelerator(mainw->record_perf, LIVES_WIDGET_ACTIVATE_SIGNAL, mainw->accel_group,
+                               LIVES_KEY_r, (LiVESXModifierType)0,
+                               LIVES_ACCEL_VISIBLE);
 
-  lives_widget_show (mainw->record_perf);
+  lives_widget_show(mainw->record_perf);
 
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mainw->record_perf);
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mainw->record_perf);
   lives_check_menu_item_set_active(LIVES_CHECK_MENU_ITEM(mainw->record_perf),FALSE);
 
   separatormenuitem=lives_menu_add_separator(LIVES_MENU(menuitem_menu));
-  lives_widget_show (separatormenuitem);
+  lives_widget_show(separatormenuitem);
+
+  mainw->full_screen = lives_check_menu_item_new_with_mnemonic(_("_Full Screen"));
+  lives_widget_show(mainw->full_screen);
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mainw->full_screen);
 
-  mainw->full_screen = lives_check_menu_item_new_with_mnemonic (_("_Full Screen"));
-  lives_widget_show (mainw->full_screen);
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mainw->full_screen);
-  
-
-  lives_widget_add_accelerator (mainw->full_screen, LIVES_WIDGET_ACTIVATE_EVENT, mainw->accel_group,
-                              LIVES_KEY_f, (LiVESXModifierType)0,
-                              LIVES_ACCEL_VISIBLE);
-
-  mainw->dsize = lives_check_menu_item_new_with_mnemonic (_("_Double Size"));
-  lives_widget_show (mainw->dsize);
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mainw->dsize);
-
-  lives_widget_add_accelerator (mainw->dsize, LIVES_WIDGET_ACTIVATE_EVENT, mainw->accel_group,
-                              LIVES_KEY_d, (LiVESXModifierType)0,
-                              LIVES_ACCEL_VISIBLE);
-
-  mainw->sepwin = lives_check_menu_item_new_with_mnemonic (_("Play in _Separate Window"));
-  lives_widget_show (mainw->sepwin);
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mainw->sepwin);
-
-  lives_widget_add_accelerator (mainw->sepwin, LIVES_WIDGET_ACTIVATE_EVENT, mainw->accel_group,
-                              LIVES_KEY_s, (LiVESXModifierType)0,
-                              LIVES_ACCEL_VISIBLE);
-
-
-  mainw->fade = lives_check_menu_item_new_with_mnemonic (_("_Blank Background"));
-  lives_widget_add_accelerator (mainw->fade, LIVES_WIDGET_ACTIVATE_EVENT, mainw->accel_group,
-                              LIVES_KEY_b, (LiVESXModifierType)0,
-                              LIVES_ACCEL_VISIBLE);
-  lives_widget_show (mainw->fade);
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mainw->fade);
-
-  mainw->loop_video = lives_check_menu_item_new_with_mnemonic (_("(Auto)_loop Video (to fit audio track)"));
-  lives_widget_show (mainw->loop_video);
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mainw->loop_video);
-  lives_widget_set_sensitive (mainw->loop_video, FALSE);
+
+  lives_widget_add_accelerator(mainw->full_screen, LIVES_WIDGET_ACTIVATE_SIGNAL, mainw->accel_group,
+                               LIVES_KEY_f, (LiVESXModifierType)0,
+                               LIVES_ACCEL_VISIBLE);
+
+  mainw->dsize = lives_check_menu_item_new_with_mnemonic(_("_Double Size"));
+  lives_widget_show(mainw->dsize);
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mainw->dsize);
+
+  lives_widget_add_accelerator(mainw->dsize, LIVES_WIDGET_ACTIVATE_SIGNAL, mainw->accel_group,
+                               LIVES_KEY_d, (LiVESXModifierType)0,
+                               LIVES_ACCEL_VISIBLE);
+
+  mainw->sepwin = lives_check_menu_item_new_with_mnemonic(_("Play in _Separate Window"));
+  lives_widget_show(mainw->sepwin);
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mainw->sepwin);
+
+  lives_widget_add_accelerator(mainw->sepwin, LIVES_WIDGET_ACTIVATE_SIGNAL, mainw->accel_group,
+                               LIVES_KEY_s, (LiVESXModifierType)0,
+                               LIVES_ACCEL_VISIBLE);
+
+
+  mainw->fade = lives_check_menu_item_new_with_mnemonic(_("_Blank Background"));
+  lives_widget_add_accelerator(mainw->fade, LIVES_WIDGET_ACTIVATE_SIGNAL, mainw->accel_group,
+                               LIVES_KEY_b, (LiVESXModifierType)0,
+                               LIVES_ACCEL_VISIBLE);
+  lives_widget_show(mainw->fade);
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mainw->fade);
+
+  mainw->loop_video = lives_check_menu_item_new_with_mnemonic(_("(Auto)_loop Video (to fit audio track)"));
+  lives_widget_show(mainw->loop_video);
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mainw->loop_video);
+  lives_widget_set_sensitive(mainw->loop_video, FALSE);
   lives_check_menu_item_set_active(LIVES_CHECK_MENU_ITEM(mainw->loop_video),mainw->loop);
-  lives_widget_add_accelerator (mainw->loop_video, LIVES_WIDGET_ACTIVATE_EVENT, mainw->accel_group,
-                              LIVES_KEY_l, (LiVESXModifierType)0,
-                              LIVES_ACCEL_VISIBLE);
-
-  mainw->loop_continue = lives_check_menu_item_new_with_mnemonic (_("L_oop Continuously"));
-  lives_widget_show (mainw->loop_continue);
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mainw->loop_continue);
-  lives_widget_set_sensitive (mainw->loop_continue, FALSE);
-
-  lives_widget_add_accelerator (mainw->loop_continue, LIVES_WIDGET_ACTIVATE_EVENT, mainw->accel_group,
-                              LIVES_KEY_o, (LiVESXModifierType)0,
-                              LIVES_ACCEL_VISIBLE);
-
-  mainw->loop_ping_pong = lives_check_menu_item_new_with_mnemonic (_("Pin_g Pong Loops"));
-  lives_widget_show (mainw->loop_ping_pong);
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mainw->loop_ping_pong);
-
-  lives_widget_add_accelerator (mainw->loop_ping_pong, LIVES_WIDGET_ACTIVATE_EVENT, mainw->accel_group,
-                              LIVES_KEY_g, (LiVESXModifierType)0,
-                              LIVES_ACCEL_VISIBLE);
-
-  mainw->mute_audio = lives_check_menu_item_new_with_mnemonic (_("_Mute"));
-  lives_widget_show (mainw->mute_audio);
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mainw->mute_audio);
-  lives_widget_set_sensitive (mainw->mute_audio, FALSE);
-
-  lives_widget_add_accelerator (mainw->mute_audio, LIVES_WIDGET_ACTIVATE_EVENT, mainw->accel_group,
-                              LIVES_KEY_z, (LiVESXModifierType)0,
-                              LIVES_ACCEL_VISIBLE);
+  lives_widget_add_accelerator(mainw->loop_video, LIVES_WIDGET_ACTIVATE_SIGNAL, mainw->accel_group,
+                               LIVES_KEY_l, (LiVESXModifierType)0,
+                               LIVES_ACCEL_VISIBLE);
+
+  mainw->loop_continue = lives_check_menu_item_new_with_mnemonic(_("L_oop Continuously"));
+  lives_widget_show(mainw->loop_continue);
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mainw->loop_continue);
+  lives_widget_set_sensitive(mainw->loop_continue, FALSE);
+
+  lives_widget_add_accelerator(mainw->loop_continue, LIVES_WIDGET_ACTIVATE_SIGNAL, mainw->accel_group,
+                               LIVES_KEY_o, (LiVESXModifierType)0,
+                               LIVES_ACCEL_VISIBLE);
+
+  mainw->loop_ping_pong = lives_check_menu_item_new_with_mnemonic(_("Pin_g Pong Loops"));
+  lives_widget_show(mainw->loop_ping_pong);
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mainw->loop_ping_pong);
+
+  lives_widget_add_accelerator(mainw->loop_ping_pong, LIVES_WIDGET_ACTIVATE_SIGNAL, mainw->accel_group,
+                               LIVES_KEY_g, (LiVESXModifierType)0,
+                               LIVES_ACCEL_VISIBLE);
+
+  mainw->mute_audio = lives_check_menu_item_new_with_mnemonic(_("_Mute"));
+  lives_widget_show(mainw->mute_audio);
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mainw->mute_audio);
+  lives_widget_set_sensitive(mainw->mute_audio, FALSE);
+
+  lives_widget_add_accelerator(mainw->mute_audio, LIVES_WIDGET_ACTIVATE_SIGNAL, mainw->accel_group,
+                               LIVES_KEY_z, (LiVESXModifierType)0,
+                               LIVES_ACCEL_VISIBLE);
 
   separatormenuitem=lives_menu_add_separator(LIVES_MENU(menuitem_menu));
-  lives_widget_show (separatormenuitem);
+  lives_widget_show(separatormenuitem);
 
-  mainw->sticky = lives_check_menu_item_new_with_mnemonic (_("Separate Window 'S_ticky' Mode"));
-  lives_widget_show (mainw->sticky);
+  mainw->sticky = lives_check_menu_item_new_with_mnemonic(_("Separate Window 'S_ticky' Mode"));
+  lives_widget_show(mainw->sticky);
 
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mainw->sticky);
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mainw->sticky);
   if (capable->smog_version_correct&&prefs->sepwin_type==SEPWIN_TYPE_STICKY) {
     lives_check_menu_item_set_active(LIVES_CHECK_MENU_ITEM(mainw->sticky),TRUE);
   }
 
-  mainw->showfct = lives_check_menu_item_new_with_mnemonic (_("S_how Frame Counter"));
-  lives_widget_show (mainw->showfct);
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mainw->showfct);
-
-  lives_widget_add_accelerator (mainw->showfct, LIVES_WIDGET_ACTIVATE_EVENT, mainw->accel_group,
-                              LIVES_KEY_h, (LiVESXModifierType)0,
-                              LIVES_ACCEL_VISIBLE);
+  mainw->showfct = lives_check_menu_item_new_with_mnemonic(_("S_how Frame Counter"));
+  lives_widget_show(mainw->showfct);
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mainw->showfct);
+
+  lives_widget_add_accelerator(mainw->showfct, LIVES_WIDGET_ACTIVATE_SIGNAL, mainw->accel_group,
+                               LIVES_KEY_h, (LiVESXModifierType)0,
+                               LIVES_ACCEL_VISIBLE);
 
   lives_check_menu_item_set_active(LIVES_CHECK_MENU_ITEM(mainw->showfct),capable->smog_version_correct&&prefs->show_framecount);
 
-  mainw->showsubs = lives_check_menu_item_new_with_mnemonic (_("Show Subtitles"));
-  lives_widget_show (mainw->showsubs);
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mainw->showsubs);
-
-  lives_widget_add_accelerator (mainw->showsubs, LIVES_WIDGET_ACTIVATE_EVENT, mainw->accel_group,
-                              LIVES_KEY_v, (LiVESXModifierType)0,
-                              LIVES_ACCEL_VISIBLE);
+  mainw->showsubs = lives_check_menu_item_new_with_mnemonic(_("Show Subtitles"));
+  lives_widget_show(mainw->showsubs);
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mainw->showsubs);
+
+  lives_widget_add_accelerator(mainw->showsubs, LIVES_WIDGET_ACTIVATE_SIGNAL, mainw->accel_group,
+                               LIVES_KEY_v, (LiVESXModifierType)0,
+                               LIVES_ACCEL_VISIBLE);
 
   lives_check_menu_item_set_active(LIVES_CHECK_MENU_ITEM(mainw->showsubs),prefs->show_subtitles);
 
-  mainw->letter = lives_check_menu_item_new_with_mnemonic (_("Letterbox mode"));
-  lives_widget_show (mainw->letter);
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mainw->letter);
+  mainw->letter = lives_check_menu_item_new_with_mnemonic(_("Letterbox mode"));
+  lives_widget_show(mainw->letter);
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mainw->letter);
 
   lives_check_menu_item_set_active(LIVES_CHECK_MENU_ITEM(mainw->letter),prefs->letterbox);
 
-  effects = lives_menu_item_new_with_mnemonic (_ ("Effect_s"));
-  lives_widget_show (effects);
-  lives_container_add (LIVES_CONTAINER (mainw->menubar), effects);
-  lives_widget_set_tooltip_text( effects,(_ ("Effects are applied to the current selection.")));
+  effects = lives_menu_item_new_with_mnemonic(_("Effect_s"));
+  lives_widget_show(effects);
+  lives_container_add(LIVES_CONTAINER(mainw->menubar), effects);
+  lives_widget_set_tooltip_text(effects,(_("Effects are applied to the current selection.")));
 
   // the dynamic effects menu
-  mainw->effects_menu = lives_menu_new ();
-  lives_menu_item_set_submenu (LIVES_MENU_ITEM (effects), mainw->effects_menu);
+  mainw->effects_menu = lives_menu_new();
+  lives_menu_item_set_submenu(LIVES_MENU_ITEM(effects), mainw->effects_menu);
 
   if (palette->style&STYLE_1) {
     lives_widget_set_bg_color(mainw->effects_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
@@ -1064,57 +1063,57 @@
 
   mainw->custom_effects_menu=NULL;
 
-  mainw->run_test_rfx_submenu=lives_menu_item_new_with_mnemonic (_("_Run Test Rendered Effect/Tool/Generator..."));
+  mainw->run_test_rfx_submenu=lives_menu_item_new_with_mnemonic(_("_Run Test Rendered Effect/Tool/Generator..."));
   mainw->run_test_rfx_menu=NULL;
 
   mainw->num_rendered_effects_builtin=mainw->num_rendered_effects_custom=mainw->num_rendered_effects_test=0;
 
-  tools = lives_menu_item_new_with_mnemonic (_("_Tools"));
-  lives_widget_show (tools);
-  lives_container_add (LIVES_CONTAINER (mainw->menubar), tools);
-  lives_widget_set_tooltip_text( tools,(_ ("Tools are applied to complete clips.")));
+  tools = lives_menu_item_new_with_mnemonic(_("_Tools"));
+  lives_widget_show(tools);
+  lives_container_add(LIVES_CONTAINER(mainw->menubar), tools);
+  lives_widget_set_tooltip_text(tools,(_("Tools are applied to complete clips.")));
 
-  mainw->tools_menu = lives_menu_new ();
-  lives_menu_item_set_submenu (LIVES_MENU_ITEM (tools), mainw->tools_menu);
+  mainw->tools_menu = lives_menu_new();
+  lives_menu_item_set_submenu(LIVES_MENU_ITEM(tools), mainw->tools_menu);
 
   if (palette->style&STYLE_1) {
     lives_widget_set_bg_color(mainw->tools_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
     lives_widget_set_fg_color(mainw->tools_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars_fore);
   }
 
-  mainw->rev_clipboard = lives_menu_item_new_with_mnemonic (_("_Reverse Clipboard"));
-  lives_widget_show (mainw->rev_clipboard);
-  lives_container_add (LIVES_CONTAINER (mainw->tools_menu), mainw->rev_clipboard);
-  lives_widget_set_sensitive (mainw->rev_clipboard, FALSE);
-
-  lives_widget_add_accelerator (mainw->rev_clipboard, LIVES_WIDGET_ACTIVATE_EVENT, mainw->accel_group,
-                              LIVES_KEY_x, LIVES_CONTROL_MASK,
-                              LIVES_ACCEL_VISIBLE);
-
-  mainw->change_speed = lives_menu_item_new_with_mnemonic (_("_Change Playback/Save Speed..."));
-  lives_widget_show (mainw->change_speed);
-  lives_container_add (LIVES_CONTAINER (mainw->tools_menu), mainw->change_speed);
-  lives_widget_set_sensitive (mainw->change_speed, FALSE);
-
-  mainw->resample_video = lives_menu_item_new_with_mnemonic (_("Resample _Video to New Frame Rate..."));
-  lives_widget_show (mainw->resample_video);
-  lives_container_add (LIVES_CONTAINER (mainw->tools_menu), mainw->resample_video);
-  lives_widget_set_sensitive (mainw->resample_video, FALSE);
+  mainw->rev_clipboard = lives_menu_item_new_with_mnemonic(_("_Reverse Clipboard"));
+  lives_widget_show(mainw->rev_clipboard);
+  lives_container_add(LIVES_CONTAINER(mainw->tools_menu), mainw->rev_clipboard);
+  lives_widget_set_sensitive(mainw->rev_clipboard, FALSE);
+
+  lives_widget_add_accelerator(mainw->rev_clipboard, LIVES_WIDGET_ACTIVATE_SIGNAL, mainw->accel_group,
+                               LIVES_KEY_x, LIVES_CONTROL_MASK,
+                               LIVES_ACCEL_VISIBLE);
+
+  mainw->change_speed = lives_menu_item_new_with_mnemonic(_("_Change Playback/Save Speed..."));
+  lives_widget_show(mainw->change_speed);
+  lives_container_add(LIVES_CONTAINER(mainw->tools_menu), mainw->change_speed);
+  lives_widget_set_sensitive(mainw->change_speed, FALSE);
+
+  mainw->resample_video = lives_menu_item_new_with_mnemonic(_("Resample _Video to New Frame Rate..."));
+  lives_widget_show(mainw->resample_video);
+  lives_container_add(LIVES_CONTAINER(mainw->tools_menu), mainw->resample_video);
+  lives_widget_set_sensitive(mainw->resample_video, FALSE);
 
   mainw->utilities_menu=NULL;
-  mainw->utilities_submenu = lives_menu_item_new_with_mnemonic (_("_Utilities"));
-  lives_widget_show (mainw->utilities_submenu);
+  mainw->utilities_submenu = lives_menu_item_new_with_mnemonic(_("_Utilities"));
+  lives_widget_show(mainw->utilities_submenu);
 
   mainw->custom_utilities_menu=NULL;
 
-  mainw->custom_tools_submenu = lives_menu_item_new_with_mnemonic (_("Custom _Tools"));
+  mainw->custom_tools_submenu = lives_menu_item_new_with_mnemonic(_("Custom _Tools"));
 
-  mainw->custom_tools_separator = lives_menu_item_new ();
-  lives_widget_set_sensitive (mainw->custom_tools_separator, FALSE);
+  mainw->custom_tools_separator = lives_menu_item_new();
+  lives_widget_set_sensitive(mainw->custom_tools_separator, FALSE);
 
   mainw->gens_menu=NULL;
-  mainw->gens_submenu = lives_menu_item_new_with_mnemonic (_("_Generate"));
-  lives_widget_show (mainw->gens_submenu);
+  mainw->gens_submenu = lives_menu_item_new_with_mnemonic(_("_Generate"));
+  lives_widget_show(mainw->gens_submenu);
 
   // add RFX plugins
   mainw->rte_separator=NULL;
@@ -1128,280 +1127,280 @@
     splash_msg(_("Starting GUI..."),.4);
   }
 
-  lives_container_add (LIVES_CONTAINER (mainw->tools_menu), mainw->utilities_submenu);
-  lives_container_add (LIVES_CONTAINER (mainw->tools_menu), mainw->custom_tools_separator);
-  lives_container_add (LIVES_CONTAINER (mainw->tools_menu), mainw->custom_tools_submenu);
-  lives_container_add (LIVES_CONTAINER (mainw->tools_menu), mainw->gens_submenu);
+  lives_container_add(LIVES_CONTAINER(mainw->tools_menu), mainw->utilities_submenu);
+  lives_container_add(LIVES_CONTAINER(mainw->tools_menu), mainw->custom_tools_separator);
+  lives_container_add(LIVES_CONTAINER(mainw->tools_menu), mainw->custom_tools_submenu);
+  lives_container_add(LIVES_CONTAINER(mainw->tools_menu), mainw->gens_submenu);
 
   separatormenuitem=lives_menu_add_separator(LIVES_MENU(mainw->tools_menu));
-  lives_widget_show (separatormenuitem);
+  lives_widget_show(separatormenuitem);
 
-  mainw->load_subs = lives_menu_item_new_with_mnemonic (_("Load _Subtitles from File..."));
-  lives_widget_show (mainw->load_subs);
-  lives_container_add (LIVES_CONTAINER (mainw->tools_menu), mainw->load_subs);
-  lives_widget_set_sensitive (mainw->load_subs, FALSE);
-
-  mainw->erase_subs = lives_menu_item_new_with_mnemonic (_("Erase subtitles"));
-  lives_widget_show (mainw->erase_subs);
-  lives_container_add (LIVES_CONTAINER (mainw->tools_menu), mainw->erase_subs);
-  lives_widget_set_sensitive (mainw->erase_subs, FALSE);
+  mainw->load_subs = lives_menu_item_new_with_mnemonic(_("Load _Subtitles from File..."));
+  lives_widget_show(mainw->load_subs);
+  lives_container_add(LIVES_CONTAINER(mainw->tools_menu), mainw->load_subs);
+  lives_widget_set_sensitive(mainw->load_subs, FALSE);
+
+  mainw->erase_subs = lives_menu_item_new_with_mnemonic(_("Erase subtitles"));
+  lives_widget_show(mainw->erase_subs);
+  lives_container_add(LIVES_CONTAINER(mainw->tools_menu), mainw->erase_subs);
+  lives_widget_set_sensitive(mainw->erase_subs, FALSE);
 
   separatormenuitem=lives_menu_add_separator(LIVES_MENU(mainw->tools_menu));
-  lives_widget_show (separatormenuitem);
+  lives_widget_show(separatormenuitem);
 
-  mainw->capture = lives_menu_item_new_with_mnemonic (_("Capture _External Window... "));
-  lives_widget_show (mainw->capture);
-  lives_container_add (LIVES_CONTAINER (mainw->tools_menu), mainw->capture);
+  mainw->capture = lives_menu_item_new_with_mnemonic(_("Capture _External Window... "));
+  lives_widget_show(mainw->capture);
+  lives_container_add(LIVES_CONTAINER(mainw->tools_menu), mainw->capture);
 
   separatormenuitem=lives_menu_add_separator(LIVES_MENU(mainw->tools_menu));
-  lives_widget_show (separatormenuitem);
+  lives_widget_show(separatormenuitem);
 
-  mainw->preferences = lives_image_menu_item_new_with_mnemonic (_("_Preferences..."));
-  lives_widget_show (mainw->preferences);
-  lives_container_add (LIVES_CONTAINER (mainw->tools_menu), mainw->preferences);
-  lives_widget_add_accelerator (mainw->preferences, LIVES_WIDGET_ACTIVATE_EVENT, mainw->accel_group,
-                              LIVES_KEY_p, LIVES_CONTROL_MASK,
-                              LIVES_ACCEL_VISIBLE);
+  mainw->preferences = lives_image_menu_item_new_with_mnemonic(_("_Preferences..."));
+  lives_widget_show(mainw->preferences);
+  lives_container_add(LIVES_CONTAINER(mainw->tools_menu), mainw->preferences);
+  lives_widget_add_accelerator(mainw->preferences, LIVES_WIDGET_ACTIVATE_SIGNAL, mainw->accel_group,
+                               LIVES_KEY_p, LIVES_CONTROL_MASK,
+                               LIVES_ACCEL_VISIBLE);
 
 #if LIVES_HAS_IMAGE_MENU_ITEM
-  image = lives_image_new_from_stock (LIVES_STOCK_PREFERENCES, LIVES_ICON_SIZE_MENU);
-  lives_widget_show (image);
-  lives_image_menu_item_set_image (LIVES_IMAGE_MENU_ITEM (mainw->preferences), image);
+  image = lives_image_new_from_stock(LIVES_STOCK_PREFERENCES, LIVES_ICON_SIZE_MENU);
+  lives_widget_show(image);
+  lives_image_menu_item_set_image(LIVES_IMAGE_MENU_ITEM(mainw->preferences), image);
 #endif
 
-  audio = lives_menu_item_new_with_mnemonic (_("_Audio"));
-  lives_widget_show (audio);
-  lives_container_add (LIVES_CONTAINER (mainw->menubar), audio);
+  audio = lives_menu_item_new_with_mnemonic(_("_Audio"));
+  lives_widget_show(audio);
+  lives_container_add(LIVES_CONTAINER(mainw->menubar), audio);
 
-  audio_menu = lives_menu_new ();
-  lives_menu_item_set_submenu (LIVES_MENU_ITEM (audio), audio_menu);
+  audio_menu = lives_menu_new();
+  lives_menu_item_set_submenu(LIVES_MENU_ITEM(audio), audio_menu);
 
   if (palette->style&STYLE_1) {
     lives_widget_set_bg_color(audio_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
     lives_widget_set_fg_color(audio_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars_fore);
   }
 
-  mainw->load_audio = lives_menu_item_new_with_mnemonic (_("Load _New Audio for Clip..."));
+  mainw->load_audio = lives_menu_item_new_with_mnemonic(_("Load _New Audio for Clip..."));
 
-  lives_widget_show (mainw->load_audio);
-  lives_container_add (LIVES_CONTAINER (audio_menu), mainw->load_audio);
-  lives_widget_set_sensitive (mainw->load_audio, FALSE);
-
-  mainw->load_cdtrack = lives_menu_item_new_with_mnemonic (_("Load _CD Track..."));
-  mainw->eject_cd = lives_menu_item_new_with_mnemonic (_("E_ject CD"));
-  lives_container_add (LIVES_CONTAINER (audio_menu), mainw->load_cdtrack);
-  lives_container_add (LIVES_CONTAINER (audio_menu), mainw->eject_cd);
+  lives_widget_show(mainw->load_audio);
+  lives_container_add(LIVES_CONTAINER(audio_menu), mainw->load_audio);
+  lives_widget_set_sensitive(mainw->load_audio, FALSE);
+
+  mainw->load_cdtrack = lives_menu_item_new_with_mnemonic(_("Load _CD Track..."));
+  mainw->eject_cd = lives_menu_item_new_with_mnemonic(_("E_ject CD"));
+  lives_container_add(LIVES_CONTAINER(audio_menu), mainw->load_cdtrack);
+  lives_container_add(LIVES_CONTAINER(audio_menu), mainw->eject_cd);
 
   if (capable->smog_version_correct) {
-    if (!(capable->has_cdda2wav&&strlen (prefs->cdplay_device))) {
-      lives_widget_set_sensitive (mainw->load_cdtrack, FALSE);
-      lives_widget_set_sensitive (mainw->eject_cd, FALSE);
+    if (!(capable->has_cdda2wav&&strlen(prefs->cdplay_device))) {
+      lives_widget_set_sensitive(mainw->load_cdtrack, FALSE);
+      lives_widget_set_sensitive(mainw->eject_cd, FALSE);
     }
   }
 
-  lives_widget_show (mainw->eject_cd);
-  lives_widget_show (mainw->load_cdtrack);
+  lives_widget_show(mainw->eject_cd);
+  lives_widget_show(mainw->load_cdtrack);
 
-  mainw->recaudio_submenu = lives_menu_item_new_with_mnemonic (_("Record E_xternal Audio..."));
-  if ((prefs->audio_player==AUD_PLAYER_JACK&&capable->has_jackd)||(prefs->audio_player==AUD_PLAYER_PULSE&&capable->has_pulse_audio)) 
-    lives_widget_show (mainw->recaudio_submenu);
-  lives_container_add (LIVES_CONTAINER (audio_menu), mainw->recaudio_submenu);
+  mainw->recaudio_submenu = lives_menu_item_new_with_mnemonic(_("Record E_xternal Audio..."));
+  if ((prefs->audio_player==AUD_PLAYER_JACK&&capable->has_jackd)||(prefs->audio_player==AUD_PLAYER_PULSE&&capable->has_pulse_audio))
+    lives_widget_show(mainw->recaudio_submenu);
+  lives_container_add(LIVES_CONTAINER(audio_menu), mainw->recaudio_submenu);
 
   submenu_menu=lives_menu_new();
-  lives_menu_item_set_submenu (LIVES_MENU_ITEM (mainw->recaudio_submenu), submenu_menu);
+  lives_menu_item_set_submenu(LIVES_MENU_ITEM(mainw->recaudio_submenu), submenu_menu);
   if (palette->style&STYLE_1) {
     lives_widget_set_bg_color(submenu_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
     lives_widget_set_fg_color(submenu_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars_fore);
   }
-  lives_widget_show (mainw->recaudio_submenu);
+  lives_widget_show(mainw->recaudio_submenu);
 
-  mainw->recaudio_clip = lives_menu_item_new_with_mnemonic (_("to New _Clip..."));
-  lives_widget_show (mainw->recaudio_clip);
-  lives_container_add (LIVES_CONTAINER (submenu_menu), mainw->recaudio_clip);
-
-  mainw->recaudio_sel = lives_menu_item_new_with_mnemonic (_("to _Selection"));
-  lives_widget_show (mainw->recaudio_sel);
-  lives_container_add (LIVES_CONTAINER (submenu_menu), mainw->recaudio_sel);
+  mainw->recaudio_clip = lives_menu_item_new_with_mnemonic(_("to New _Clip..."));
+  lives_widget_show(mainw->recaudio_clip);
+  lives_container_add(LIVES_CONTAINER(submenu_menu), mainw->recaudio_clip);
+
+  mainw->recaudio_sel = lives_menu_item_new_with_mnemonic(_("to _Selection"));
+  lives_widget_show(mainw->recaudio_sel);
+  lives_container_add(LIVES_CONTAINER(submenu_menu), mainw->recaudio_sel);
   lives_widget_set_sensitive(mainw->recaudio_sel,FALSE);
 
   separatormenuitem=lives_menu_add_separator(LIVES_MENU(audio_menu));
-  lives_widget_show (separatormenuitem);
-  
-  mainw->fade_aud_in = lives_menu_item_new_with_mnemonic (_("Fade Audio _In..."));
-  lives_container_add (LIVES_CONTAINER (audio_menu), mainw->fade_aud_in);
-  lives_widget_show (mainw->fade_aud_in);
-
-  mainw->fade_aud_out = lives_menu_item_new_with_mnemonic (_("Fade Audio _Out..."));
-  lives_container_add (LIVES_CONTAINER (audio_menu), mainw->fade_aud_out);
-  lives_widget_show (mainw->fade_aud_out);
+  lives_widget_show(separatormenuitem);
 
-  lives_widget_set_sensitive (mainw->fade_aud_in, FALSE);
-  lives_widget_set_sensitive (mainw->fade_aud_out, FALSE);
+  mainw->fade_aud_in = lives_menu_item_new_with_mnemonic(_("Fade Audio _In..."));
+  lives_container_add(LIVES_CONTAINER(audio_menu), mainw->fade_aud_in);
+  lives_widget_show(mainw->fade_aud_in);
+
+  mainw->fade_aud_out = lives_menu_item_new_with_mnemonic(_("Fade Audio _Out..."));
+  lives_container_add(LIVES_CONTAINER(audio_menu), mainw->fade_aud_out);
+  lives_widget_show(mainw->fade_aud_out);
+
+  lives_widget_set_sensitive(mainw->fade_aud_in, FALSE);
+  lives_widget_set_sensitive(mainw->fade_aud_out, FALSE);
 
   separatormenuitem=lives_menu_add_separator(LIVES_MENU(audio_menu));
-  lives_widget_show (separatormenuitem);
+  lives_widget_show(separatormenuitem);
 
-  mainw->export_submenu = lives_menu_item_new_with_mnemonic (_("_Export Audio..."));
-  lives_widget_show (mainw->export_submenu);
-  lives_container_add (LIVES_CONTAINER (audio_menu), mainw->export_submenu);
+  mainw->export_submenu = lives_menu_item_new_with_mnemonic(_("_Export Audio..."));
+  lives_widget_show(mainw->export_submenu);
+  lives_container_add(LIVES_CONTAINER(audio_menu), mainw->export_submenu);
   lives_widget_set_sensitive(mainw->export_submenu,FALSE);
 
   export_submenu_menu=lives_menu_new();
-  lives_menu_item_set_submenu (LIVES_MENU_ITEM (mainw->export_submenu), export_submenu_menu);
+  lives_menu_item_set_submenu(LIVES_MENU_ITEM(mainw->export_submenu), export_submenu_menu);
   if (palette->style&STYLE_1) {
     lives_widget_set_bg_color(export_submenu_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
     lives_widget_set_fg_color(export_submenu_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars_fore);
   }
-  lives_widget_show (mainw->export_submenu);
+  lives_widget_show(mainw->export_submenu);
 
-  mainw->export_selaudio = lives_menu_item_new_with_mnemonic (_("Export _Selected Audio..."));
-  lives_widget_show (mainw->export_selaudio);
-  lives_container_add (LIVES_CONTAINER (export_submenu_menu), mainw->export_selaudio);
-
-  mainw->export_allaudio = lives_menu_item_new_with_mnemonic (_("Export _All Audio..."));
-  lives_widget_show (mainw->export_allaudio);
-  lives_container_add (LIVES_CONTAINER (export_submenu_menu), mainw->export_allaudio);
-
-  mainw->append_audio = lives_menu_item_new_with_mnemonic (_("_Append Audio..."));
-  lives_widget_show (mainw->append_audio);
-  lives_container_add (LIVES_CONTAINER (audio_menu), mainw->append_audio);
-  lives_widget_set_sensitive (mainw->append_audio, FALSE);
-
-  mainw->trim_submenu = lives_menu_item_new_with_mnemonic (_("_Trim/Pad Audio..."));
-  lives_widget_show (mainw->trim_submenu);
-  lives_container_add (LIVES_CONTAINER (audio_menu), mainw->trim_submenu);
+  mainw->export_selaudio = lives_menu_item_new_with_mnemonic(_("Export _Selected Audio..."));
+  lives_widget_show(mainw->export_selaudio);
+  lives_container_add(LIVES_CONTAINER(export_submenu_menu), mainw->export_selaudio);
+
+  mainw->export_allaudio = lives_menu_item_new_with_mnemonic(_("Export _All Audio..."));
+  lives_widget_show(mainw->export_allaudio);
+  lives_container_add(LIVES_CONTAINER(export_submenu_menu), mainw->export_allaudio);
+
+  mainw->append_audio = lives_menu_item_new_with_mnemonic(_("_Append Audio..."));
+  lives_widget_show(mainw->append_audio);
+  lives_container_add(LIVES_CONTAINER(audio_menu), mainw->append_audio);
+  lives_widget_set_sensitive(mainw->append_audio, FALSE);
+
+  mainw->trim_submenu = lives_menu_item_new_with_mnemonic(_("_Trim/Pad Audio..."));
+  lives_widget_show(mainw->trim_submenu);
+  lives_container_add(LIVES_CONTAINER(audio_menu), mainw->trim_submenu);
   lives_widget_set_sensitive(mainw->trim_submenu,FALSE);
 
   trimaudio_submenu_menu=lives_menu_new();
-  lives_menu_item_set_submenu (LIVES_MENU_ITEM (mainw->trim_submenu), trimaudio_submenu_menu);
+  lives_menu_item_set_submenu(LIVES_MENU_ITEM(mainw->trim_submenu), trimaudio_submenu_menu);
   if (palette->style&STYLE_1) {
     lives_widget_set_bg_color(trimaudio_submenu_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
     lives_widget_set_fg_color(trimaudio_submenu_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars_fore);
   }
 
-  lives_widget_show (mainw->trim_submenu);
-  mainw->trim_audio = lives_menu_item_new_with_mnemonic (_("Trim/Pad Audio to _Selection"));
-  lives_widget_show (mainw->trim_audio);
-  lives_container_add (LIVES_CONTAINER (trimaudio_submenu_menu), mainw->trim_audio);
-  lives_widget_set_sensitive (mainw->trim_audio, FALSE);
-
-  mainw->trim_to_pstart = lives_menu_item_new_with_mnemonic (_("Trim/Pad Audio from Beginning to _Play Start"));
-  lives_widget_show (mainw->trim_to_pstart);
-  lives_container_add (LIVES_CONTAINER (trimaudio_submenu_menu), mainw->trim_to_pstart);
-  lives_widget_set_sensitive (mainw->trim_to_pstart, FALSE);
-
-  mainw->delaudio_submenu = lives_menu_item_new_with_mnemonic (_("_Delete Audio..."));
-  lives_widget_show (mainw->delaudio_submenu);
-  lives_container_add (LIVES_CONTAINER (audio_menu), mainw->delaudio_submenu);
+  lives_widget_show(mainw->trim_submenu);
+  mainw->trim_audio = lives_menu_item_new_with_mnemonic(_("Trim/Pad Audio to _Selection"));
+  lives_widget_show(mainw->trim_audio);
+  lives_container_add(LIVES_CONTAINER(trimaudio_submenu_menu), mainw->trim_audio);
+  lives_widget_set_sensitive(mainw->trim_audio, FALSE);
+
+  mainw->trim_to_pstart = lives_menu_item_new_with_mnemonic(_("Trim/Pad Audio from Beginning to _Play Start"));
+  lives_widget_show(mainw->trim_to_pstart);
+  lives_container_add(LIVES_CONTAINER(trimaudio_submenu_menu), mainw->trim_to_pstart);
+  lives_widget_set_sensitive(mainw->trim_to_pstart, FALSE);
+
+  mainw->delaudio_submenu = lives_menu_item_new_with_mnemonic(_("_Delete Audio..."));
+  lives_widget_show(mainw->delaudio_submenu);
+  lives_container_add(LIVES_CONTAINER(audio_menu), mainw->delaudio_submenu);
   lives_widget_set_sensitive(mainw->delaudio_submenu,FALSE);
 
   delaudio_submenu_menu=lives_menu_new();
-  lives_menu_item_set_submenu (LIVES_MENU_ITEM (mainw->delaudio_submenu), delaudio_submenu_menu);
+  lives_menu_item_set_submenu(LIVES_MENU_ITEM(mainw->delaudio_submenu), delaudio_submenu_menu);
   if (palette->style&STYLE_1) {
     lives_widget_set_bg_color(delaudio_submenu_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
     lives_widget_set_fg_color(delaudio_submenu_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars_fore);
   }
-  lives_widget_show (mainw->delaudio_submenu);
+  lives_widget_show(mainw->delaudio_submenu);
 
-  mainw->delsel_audio = lives_menu_item_new_with_mnemonic (_("Delete _Selected Audio"));
-  lives_widget_show (mainw->delsel_audio);
-  lives_container_add (LIVES_CONTAINER (delaudio_submenu_menu), mainw->delsel_audio);
-
-  mainw->delall_audio = lives_menu_item_new_with_mnemonic (_("Delete _All Audio"));
-  lives_widget_show (mainw->delall_audio);
-  lives_container_add (LIVES_CONTAINER (delaudio_submenu_menu), mainw->delall_audio);
-
-  mainw->ins_silence = lives_menu_item_new_with_mnemonic (_("Insert _Silence in Selection"));
-  lives_widget_show (mainw->ins_silence);
-  lives_container_add (LIVES_CONTAINER (audio_menu), mainw->ins_silence);
-  lives_widget_set_sensitive (mainw->ins_silence, FALSE);
-
-  mainw->resample_audio = lives_menu_item_new_with_mnemonic (_("_Resample Audio..."));
-  lives_widget_show (mainw->resample_audio);
-  lives_container_add (LIVES_CONTAINER (audio_menu), mainw->resample_audio);
-  lives_widget_set_sensitive (mainw->resample_audio, FALSE);
-
-  info = lives_menu_item_new_with_mnemonic (_("_Info"));
-  lives_widget_show (info);
-  lives_container_add (LIVES_CONTAINER(mainw->menubar), info);
+  mainw->delsel_audio = lives_menu_item_new_with_mnemonic(_("Delete _Selected Audio"));
+  lives_widget_show(mainw->delsel_audio);
+  lives_container_add(LIVES_CONTAINER(delaudio_submenu_menu), mainw->delsel_audio);
+
+  mainw->delall_audio = lives_menu_item_new_with_mnemonic(_("Delete _All Audio"));
+  lives_widget_show(mainw->delall_audio);
+  lives_container_add(LIVES_CONTAINER(delaudio_submenu_menu), mainw->delall_audio);
+
+  mainw->ins_silence = lives_menu_item_new_with_mnemonic(_("Insert _Silence in Selection"));
+  lives_widget_show(mainw->ins_silence);
+  lives_container_add(LIVES_CONTAINER(audio_menu), mainw->ins_silence);
+  lives_widget_set_sensitive(mainw->ins_silence, FALSE);
+
+  mainw->resample_audio = lives_menu_item_new_with_mnemonic(_("_Resample Audio..."));
+  lives_widget_show(mainw->resample_audio);
+  lives_container_add(LIVES_CONTAINER(audio_menu), mainw->resample_audio);
+  lives_widget_set_sensitive(mainw->resample_audio, FALSE);
+
+  info = lives_menu_item_new_with_mnemonic(_("_Info"));
+  lives_widget_show(info);
+  lives_container_add(LIVES_CONTAINER(mainw->menubar), info);
 
-  info_menu = lives_menu_new ();
-  lives_menu_item_set_submenu (LIVES_MENU_ITEM (info), info_menu);
+  info_menu = lives_menu_new();
+  lives_menu_item_set_submenu(LIVES_MENU_ITEM(info), info_menu);
 
   if (palette->style&STYLE_1) {
     lives_widget_set_bg_color(info_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
     lives_widget_set_fg_color(info_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars_fore);
   }
 
-  mainw->show_file_info = lives_image_menu_item_new_with_mnemonic (_("Show Clip _Info"));
-  lives_widget_add_accelerator (mainw->show_file_info, LIVES_WIDGET_ACTIVATE_EVENT, mainw->accel_group,
-                              LIVES_KEY_i, (LiVESXModifierType)0,
-                              LIVES_ACCEL_VISIBLE);
-  lives_widget_show (mainw->show_file_info);
-  lives_container_add (LIVES_CONTAINER (info_menu), mainw->show_file_info);
-  lives_widget_set_sensitive (mainw->show_file_info, FALSE);
-
-  mainw->show_file_comments = lives_image_menu_item_new_with_mnemonic (_("Show/_Edit File Comments"));
-  lives_widget_show (mainw->show_file_comments);
-  lives_container_add (LIVES_CONTAINER (info_menu), mainw->show_file_comments);
-  lives_widget_set_sensitive (mainw->show_file_comments, FALSE);
-
-  mainw->show_clipboard_info = lives_image_menu_item_new_with_mnemonic (_("Show _Clipboard Info"));
-  lives_widget_show (mainw->show_clipboard_info);
-  lives_container_add (LIVES_CONTAINER (info_menu), mainw->show_clipboard_info);
-  lives_widget_set_sensitive (mainw->show_clipboard_info, FALSE);
+  mainw->show_file_info = lives_image_menu_item_new_with_mnemonic(_("Show Clip _Info"));
+  lives_widget_add_accelerator(mainw->show_file_info, LIVES_WIDGET_ACTIVATE_SIGNAL, mainw->accel_group,
+                               LIVES_KEY_i, (LiVESXModifierType)0,
+                               LIVES_ACCEL_VISIBLE);
+  lives_widget_show(mainw->show_file_info);
+  lives_container_add(LIVES_CONTAINER(info_menu), mainw->show_file_info);
+  lives_widget_set_sensitive(mainw->show_file_info, FALSE);
+
+  mainw->show_file_comments = lives_image_menu_item_new_with_mnemonic(_("Show/_Edit File Comments"));
+  lives_widget_show(mainw->show_file_comments);
+  lives_container_add(LIVES_CONTAINER(info_menu), mainw->show_file_comments);
+  lives_widget_set_sensitive(mainw->show_file_comments, FALSE);
+
+  mainw->show_clipboard_info = lives_image_menu_item_new_with_mnemonic(_("Show _Clipboard Info"));
+  lives_widget_show(mainw->show_clipboard_info);
+  lives_container_add(LIVES_CONTAINER(info_menu), mainw->show_clipboard_info);
+  lives_widget_set_sensitive(mainw->show_clipboard_info, FALSE);
 
 #if LIVES_HAS_IMAGE_MENU_ITEM
-  image = lives_image_new_from_stock (LIVES_STOCK_DIALOG_INFO, LIVES_ICON_SIZE_MENU);
-  lives_widget_show (image);
-  lives_image_menu_item_set_image (LIVES_IMAGE_MENU_ITEM (mainw->show_file_info), image);
-#endif
-
-  mainw->show_messages = lives_image_menu_item_new_with_mnemonic (_("Show _Messages"));
-  lives_widget_show (mainw->show_messages);
-  lives_container_add (LIVES_CONTAINER (info_menu), mainw->show_messages);
-
-  mainw->show_layout_errors = lives_image_menu_item_new_with_mnemonic (_("Show _Layout Errors"));
-  lives_widget_show (mainw->show_layout_errors);
-  lives_container_add (LIVES_CONTAINER (info_menu), mainw->show_layout_errors);
-  lives_widget_set_sensitive (mainw->show_layout_errors, FALSE);
-
-  win = lives_menu_item_new_with_mnemonic (_("_Clips"));
-  lives_widget_show (win);
-  lives_container_add (LIVES_CONTAINER(mainw->menubar), win);
+  image = lives_image_new_from_stock(LIVES_STOCK_DIALOG_INFO, LIVES_ICON_SIZE_MENU);
+  lives_widget_show(image);
+  lives_image_menu_item_set_image(LIVES_IMAGE_MENU_ITEM(mainw->show_file_info), image);
+#endif
+
+  mainw->show_messages = lives_image_menu_item_new_with_mnemonic(_("Show _Messages"));
+  lives_widget_show(mainw->show_messages);
+  lives_container_add(LIVES_CONTAINER(info_menu), mainw->show_messages);
+
+  mainw->show_layout_errors = lives_image_menu_item_new_with_mnemonic(_("Show _Layout Errors"));
+  lives_widget_show(mainw->show_layout_errors);
+  lives_container_add(LIVES_CONTAINER(info_menu), mainw->show_layout_errors);
+  lives_widget_set_sensitive(mainw->show_layout_errors, FALSE);
+
+  win = lives_menu_item_new_with_mnemonic(_("_Clips"));
+  lives_widget_show(win);
+  lives_container_add(LIVES_CONTAINER(mainw->menubar), win);
 
-  mainw->clipsmenu = lives_menu_new ();
-  lives_menu_item_set_submenu (LIVES_MENU_ITEM (win), mainw->clipsmenu);
+  mainw->clipsmenu = lives_menu_new();
+  lives_menu_item_set_submenu(LIVES_MENU_ITEM(win), mainw->clipsmenu);
 
   if (palette->style&STYLE_1) {
     lives_widget_set_bg_color(mainw->clipsmenu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
     lives_widget_set_fg_color(mainw->clipsmenu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars_fore);
   }
 
-  mainw->rename = lives_image_menu_item_new_with_mnemonic (_("_Rename Current Clip in Menu..."));
-  lives_widget_show (mainw->rename);
-  lives_container_add (LIVES_CONTAINER (mainw->clipsmenu), mainw->rename);
-  lives_widget_set_sensitive (mainw->rename, FALSE);
+  mainw->rename = lives_image_menu_item_new_with_mnemonic(_("_Rename Current Clip in Menu..."));
+  lives_widget_show(mainw->rename);
+  lives_container_add(LIVES_CONTAINER(mainw->clipsmenu), mainw->rename);
+  lives_widget_set_sensitive(mainw->rename, FALSE);
 
   separatormenuitem=lives_menu_add_separator(LIVES_MENU(mainw->clipsmenu));
-  lives_widget_show (separatormenuitem);
+  lives_widget_show(separatormenuitem);
 
-  menuitemsep = lives_menu_item_new_with_label ("|");
-  lives_widget_show (menuitemsep);
-  lives_container_add (LIVES_CONTAINER(mainw->menubar), menuitemsep);
-  lives_widget_set_sensitive (menuitemsep,FALSE);
+  menuitemsep = lives_menu_item_new_with_label("|");
+  lives_widget_show(menuitemsep);
+  lives_container_add(LIVES_CONTAINER(mainw->menubar), menuitemsep);
+  lives_widget_set_sensitive(menuitemsep,FALSE);
 
   if (palette->style&STYLE_1) {
     lives_widget_set_bg_color(menuitemsep, LIVES_WIDGET_STATE_INSENSITIVE, &palette->menu_and_bars);
     lives_widget_set_fg_color(menuitemsep, LIVES_WIDGET_STATE_INSENSITIVE, &palette->menu_and_bars_fore);
   }
 
-  advanced = lives_menu_item_new_with_mnemonic (_("A_dvanced"));
-  lives_widget_show (advanced);
-  lives_container_add (LIVES_CONTAINER (mainw->menubar), advanced);
+  advanced = lives_menu_item_new_with_mnemonic(_("A_dvanced"));
+  lives_widget_show(advanced);
+  lives_container_add(LIVES_CONTAINER(mainw->menubar), advanced);
 
-  advanced_menu = lives_menu_new ();
-  lives_menu_item_set_submenu (LIVES_MENU_ITEM (advanced), advanced_menu);
+  advanced_menu = lives_menu_new();
+  lives_menu_item_set_submenu(LIVES_MENU_ITEM(advanced), advanced_menu);
 
   if (palette->style&STYLE_1) {
     lives_widget_set_bg_color(advanced_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
@@ -1409,117 +1408,116 @@
   }
   lives_widget_show(advanced_menu);
 
-  rfx_submenu = lives_menu_item_new_with_mnemonic (_ ("_RFX Effects/Tools/Utilities"));
+  rfx_submenu = lives_menu_item_new_with_mnemonic(_("_RFX Effects/Tools/Utilities"));
   lives_widget_show(rfx_submenu);
-  lives_container_add (LIVES_CONTAINER (advanced_menu), rfx_submenu);
+  lives_container_add(LIVES_CONTAINER(advanced_menu), rfx_submenu);
 
   rfx_menu=lives_menu_new();
-  lives_menu_item_set_submenu (LIVES_MENU_ITEM (rfx_submenu), rfx_menu);
+  lives_menu_item_set_submenu(LIVES_MENU_ITEM(rfx_submenu), rfx_menu);
   if (palette->style&STYLE_1) {
     lives_widget_set_bg_color(rfx_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
     lives_widget_set_fg_color(rfx_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars_fore);
   }
   lives_widget_show(rfx_menu);
 
-  new_test_rfx=lives_menu_item_new_with_mnemonic (_ ("_New Test RFX Script..."));
+  new_test_rfx=lives_menu_item_new_with_mnemonic(_("_New Test RFX Script..."));
   lives_widget_show(new_test_rfx);
-  lives_container_add (LIVES_CONTAINER (rfx_menu), new_test_rfx);
+  lives_container_add(LIVES_CONTAINER(rfx_menu), new_test_rfx);
 
-  copy_rfx=lives_menu_item_new_with_mnemonic (_ ("_Copy RFX Script to Test..."));
+  copy_rfx=lives_menu_item_new_with_mnemonic(_("_Copy RFX Script to Test..."));
   lives_widget_show(copy_rfx);
-  lives_container_add (LIVES_CONTAINER (rfx_menu), copy_rfx);
+  lives_container_add(LIVES_CONTAINER(rfx_menu), copy_rfx);
 
-  mainw->edit_test_rfx=lives_menu_item_new_with_mnemonic (_ ("_Edit Test RFX Script..."));
+  mainw->edit_test_rfx=lives_menu_item_new_with_mnemonic(_("_Edit Test RFX Script..."));
   lives_widget_show(mainw->edit_test_rfx);
-  lives_container_add (LIVES_CONTAINER (rfx_menu), mainw->edit_test_rfx);
+  lives_container_add(LIVES_CONTAINER(rfx_menu), mainw->edit_test_rfx);
 
-  mainw->rename_test_rfx=lives_menu_item_new_with_mnemonic (_ ("Rena_me Test RFX Script..."));
+  mainw->rename_test_rfx=lives_menu_item_new_with_mnemonic(_("Rena_me Test RFX Script..."));
   lives_widget_show(mainw->rename_test_rfx);
-  lives_container_add (LIVES_CONTAINER (rfx_menu), mainw->rename_test_rfx);
+  lives_container_add(LIVES_CONTAINER(rfx_menu), mainw->rename_test_rfx);
 
-  mainw->delete_test_rfx=lives_menu_item_new_with_mnemonic (_ ("_Delete Test RFX Script..."));
+  mainw->delete_test_rfx=lives_menu_item_new_with_mnemonic(_("_Delete Test RFX Script..."));
   lives_widget_show(mainw->delete_test_rfx);
-  lives_container_add (LIVES_CONTAINER (rfx_menu), mainw->delete_test_rfx);
+  lives_container_add(LIVES_CONTAINER(rfx_menu), mainw->delete_test_rfx);
 
   separatormenuitem=lives_menu_add_separator(LIVES_MENU(rfx_menu));
-  lives_widget_show (separatormenuitem);
+  lives_widget_show(separatormenuitem);
 
   lives_widget_show(mainw->run_test_rfx_submenu);
-  lives_container_add (LIVES_CONTAINER (rfx_menu), mainw->run_test_rfx_submenu);
-  
-  mainw->promote_test_rfx=lives_menu_item_new_with_mnemonic (_ ("_Promote Test Rendered Effect/Tool/Generator..."));
+  lives_container_add(LIVES_CONTAINER(rfx_menu), mainw->run_test_rfx_submenu);
+
+  mainw->promote_test_rfx=lives_menu_item_new_with_mnemonic(_("_Promote Test Rendered Effect/Tool/Generator..."));
   lives_widget_show(mainw->promote_test_rfx);
-  lives_container_add (LIVES_CONTAINER (rfx_menu), mainw->promote_test_rfx);
+  lives_container_add(LIVES_CONTAINER(rfx_menu), mainw->promote_test_rfx);
 
   separatormenuitem=lives_menu_add_separator(LIVES_MENU(rfx_menu));
-  lives_widget_show (separatormenuitem);
+  lives_widget_show(separatormenuitem);
 
-  import_custom_rfx=lives_menu_item_new_with_mnemonic (_ ("_Import Custom RFX script..."));
+  import_custom_rfx=lives_menu_item_new_with_mnemonic(_("_Import Custom RFX script..."));
   lives_widget_show(import_custom_rfx);
-  lives_container_add (LIVES_CONTAINER (rfx_menu), import_custom_rfx);
+  lives_container_add(LIVES_CONTAINER(rfx_menu), import_custom_rfx);
 
-  mainw->export_custom_rfx=lives_menu_item_new_with_mnemonic (_ ("E_xport Custom RFX script..."));
+  mainw->export_custom_rfx=lives_menu_item_new_with_mnemonic(_("E_xport Custom RFX script..."));
   lives_widget_show(mainw->export_custom_rfx);
-  lives_container_add (LIVES_CONTAINER (rfx_menu), mainw->export_custom_rfx);
+  lives_container_add(LIVES_CONTAINER(rfx_menu), mainw->export_custom_rfx);
 
-  mainw->delete_custom_rfx=lives_menu_item_new_with_mnemonic (_ ("De_lete Custom RFX Script..."));
+  mainw->delete_custom_rfx=lives_menu_item_new_with_mnemonic(_("De_lete Custom RFX Script..."));
   lives_widget_show(mainw->delete_custom_rfx);
-  lives_container_add (LIVES_CONTAINER (rfx_menu), mainw->delete_custom_rfx);
+  lives_container_add(LIVES_CONTAINER(rfx_menu), mainw->delete_custom_rfx);
 
   separatormenuitem=lives_menu_add_separator(LIVES_MENU(rfx_menu));
-  lives_widget_show (separatormenuitem);
+  lives_widget_show(separatormenuitem);
 
-  rebuild_rfx=lives_menu_item_new_with_mnemonic (_ ("Re_build all RFX plugins"));
+  rebuild_rfx=lives_menu_item_new_with_mnemonic(_("Re_build all RFX plugins"));
   lives_widget_show(rebuild_rfx);
-  lives_container_add (LIVES_CONTAINER (rfx_menu), rebuild_rfx);
+  lives_container_add(LIVES_CONTAINER(rfx_menu), rebuild_rfx);
 
 
   if (mainw->num_rendered_effects_custom>0) {
     lives_widget_set_sensitive(mainw->delete_custom_rfx,TRUE);
     lives_widget_set_sensitive(mainw->export_custom_rfx,TRUE);
-  }
-  else {
+  } else {
     lives_widget_set_sensitive(mainw->delete_custom_rfx,FALSE);
     lives_widget_set_sensitive(mainw->export_custom_rfx,FALSE);
   }
-  
+
   if (mainw->num_rendered_effects_test>0) {
     lives_widget_set_sensitive(mainw->run_test_rfx_submenu,TRUE);
     lives_widget_set_sensitive(mainw->promote_test_rfx,TRUE);
     lives_widget_set_sensitive(mainw->delete_test_rfx,TRUE);
     lives_widget_set_sensitive(mainw->rename_test_rfx,TRUE);
     lives_widget_set_sensitive(mainw->edit_test_rfx,TRUE);
-  }
-  else {
+  } else {
     lives_widget_set_sensitive(mainw->run_test_rfx_submenu,FALSE);
     lives_widget_set_sensitive(mainw->promote_test_rfx,FALSE);
     lives_widget_set_sensitive(mainw->delete_test_rfx,FALSE);
     lives_widget_set_sensitive(mainw->rename_test_rfx,FALSE);
     lives_widget_set_sensitive(mainw->edit_test_rfx,FALSE);
   }
-  
-  mainw->open_lives2lives = lives_menu_item_new_with_mnemonic (_("Receive _LiVES stream from..."));
+
+  mainw->open_lives2lives = lives_menu_item_new_with_mnemonic(_("Receive _LiVES stream from..."));
 
   separatormenuitem=lives_menu_add_separator(LIVES_MENU(advanced_menu));
-  lives_widget_show (separatormenuitem);
+  lives_widget_show(separatormenuitem);
 
-  mainw->send_lives2lives = lives_menu_item_new_with_mnemonic (_("_Send LiVES stream to..."));
+  mainw->send_lives2lives = lives_menu_item_new_with_mnemonic(_("_Send LiVES stream to..."));
 
-  lives_widget_show (mainw->send_lives2lives);
-  lives_widget_show (mainw->open_lives2lives);
+  lives_widget_show(mainw->send_lives2lives);
+  lives_widget_show(mainw->open_lives2lives);
 
-  lives_container_add (LIVES_CONTAINER (advanced_menu), mainw->send_lives2lives);
-  lives_container_add (LIVES_CONTAINER (advanced_menu), mainw->open_lives2lives);
+  lives_container_add(LIVES_CONTAINER(advanced_menu), mainw->send_lives2lives);
+  lives_container_add(LIVES_CONTAINER(advanced_menu), mainw->open_lives2lives);
 
   if (capable->smog_version_correct) {
-    mainw->open_yuv4m = lives_menu_item_new_with_mnemonic ((tmp=g_strdup_printf (_("Open _yuv4mpeg stream on %sstream.yuv..."),prefs->tmpdir)));
-    g_free(tmp);
+    mainw->open_yuv4m = lives_menu_item_new_with_mnemonic((tmp=lives_strdup_printf(_("Open _yuv4mpeg stream on %sstream.yuv..."),
+                        prefs->tmpdir)));
+    lives_free(tmp);
 #ifdef HAVE_YUV4MPEG
     separatormenuitem=lives_menu_add_separator(LIVES_MENU(advanced_menu));
-    lives_widget_show (separatormenuitem);
+    lives_widget_show(separatormenuitem);
 
-    lives_widget_show (mainw->open_yuv4m);
-    lives_container_add (LIVES_CONTAINER (advanced_menu), mainw->open_yuv4m);
+    lives_widget_show(mainw->open_yuv4m);
+    lives_container_add(LIVES_CONTAINER(advanced_menu), mainw->open_yuv4m);
 
     // TODO - apply a deinterlace filter to yuv4mpeg frames
     /*    mainw->yuv4m_deint = lives_check_menu_item_new_with_mnemonic (_("_Deinterlace yuv4mpeg frames"));
@@ -1531,212 +1529,212 @@
 
 
   separatormenuitem=lives_menu_add_separator(LIVES_MENU(advanced_menu));
-  lives_widget_show (separatormenuitem);
+  lives_widget_show(separatormenuitem);
 
-  mainw->import_proj = lives_menu_item_new_with_mnemonic (_("_Import Project (.lv2)..."));
-  lives_container_add (LIVES_CONTAINER (advanced_menu), mainw->import_proj);
-  lives_widget_show (mainw->import_proj);
-
-  mainw->export_proj = lives_menu_item_new_with_mnemonic (_("E_xport Project (.lv2)..."));
-  lives_container_add (LIVES_CONTAINER (advanced_menu), mainw->export_proj);
-  lives_widget_show (mainw->export_proj);
-  lives_widget_set_sensitive (mainw->export_proj, FALSE);
-
-  mainw->vj_menu = lives_menu_item_new_with_mnemonic (_("_VJ"));
-  lives_widget_show (mainw->vj_menu);
-  lives_container_add (LIVES_CONTAINER(mainw->menubar), mainw->vj_menu);
+  mainw->import_proj = lives_menu_item_new_with_mnemonic(_("_Import Project (.lv2)..."));
+  lives_container_add(LIVES_CONTAINER(advanced_menu), mainw->import_proj);
+  lives_widget_show(mainw->import_proj);
+
+  mainw->export_proj = lives_menu_item_new_with_mnemonic(_("E_xport Project (.lv2)..."));
+  lives_container_add(LIVES_CONTAINER(advanced_menu), mainw->export_proj);
+  lives_widget_show(mainw->export_proj);
+  lives_widget_set_sensitive(mainw->export_proj, FALSE);
+
+  mainw->vj_menu = lives_menu_item_new_with_mnemonic(_("_VJ"));
+  lives_widget_show(mainw->vj_menu);
+  lives_container_add(LIVES_CONTAINER(mainw->menubar), mainw->vj_menu);
 
-  vj_menu = lives_menu_new ();
-  lives_menu_item_set_submenu (LIVES_MENU_ITEM (mainw->vj_menu), vj_menu);
+  vj_menu = lives_menu_new();
+  lives_menu_item_set_submenu(LIVES_MENU_ITEM(mainw->vj_menu), vj_menu);
 
   if (palette->style&STYLE_1) {
     lives_widget_set_bg_color(vj_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
     lives_widget_set_fg_color(vj_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars_fore);
   }
 
-  assign_rte_keys = lives_menu_item_new_with_mnemonic (_("Real Time _Effect Mapping"));
-  lives_widget_show (assign_rte_keys);
-  lives_container_add (LIVES_CONTAINER (vj_menu), assign_rte_keys);
-  lives_widget_add_accelerator (assign_rte_keys, LIVES_WIDGET_ACTIVATE_EVENT, mainw->accel_group,
-                              LIVES_KEY_v, LIVES_CONTROL_MASK,
-                              LIVES_ACCEL_VISIBLE);
-  lives_widget_set_tooltip_text( assign_rte_keys,(_ ("Bind real time effects to ctrl-number keys.")));
-
-  mainw->rte_defs_menu=lives_menu_item_new_with_mnemonic (_("Set Real Time Effect _Defaults"));
-  lives_container_add (LIVES_CONTAINER (vj_menu), mainw->rte_defs_menu);
-  lives_widget_set_tooltip_text( mainw->rte_defs_menu,(_ ("Set default parameter values for real time effects.")));
+  assign_rte_keys = lives_menu_item_new_with_mnemonic(_("Real Time _Effect Mapping"));
+  lives_widget_show(assign_rte_keys);
+  lives_container_add(LIVES_CONTAINER(vj_menu), assign_rte_keys);
+  lives_widget_add_accelerator(assign_rte_keys, LIVES_WIDGET_ACTIVATE_SIGNAL, mainw->accel_group,
+                               LIVES_KEY_v, LIVES_CONTROL_MASK,
+                               LIVES_ACCEL_VISIBLE);
+  lives_widget_set_tooltip_text(assign_rte_keys,(_("Bind real time effects to ctrl-number keys.")));
+
+  mainw->rte_defs_menu=lives_menu_item_new_with_mnemonic(_("Set Real Time Effect _Defaults"));
+  lives_container_add(LIVES_CONTAINER(vj_menu), mainw->rte_defs_menu);
+  lives_widget_set_tooltip_text(mainw->rte_defs_menu,(_("Set default parameter values for real time effects.")));
 
   mainw->rte_defs=lives_menu_new();
-  lives_menu_item_set_submenu (LIVES_MENU_ITEM (mainw->rte_defs_menu), mainw->rte_defs);
+  lives_menu_item_set_submenu(LIVES_MENU_ITEM(mainw->rte_defs_menu), mainw->rte_defs);
 
   if (palette->style&STYLE_1) {
     lives_widget_set_bg_color(mainw->rte_defs, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
     lives_widget_set_fg_color(mainw->rte_defs, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars_fore);
   }
 
-  lives_widget_show (mainw->rte_defs_menu);
-  lives_widget_show (mainw->rte_defs);
+  lives_widget_show(mainw->rte_defs_menu);
+  lives_widget_show(mainw->rte_defs);
 
-  mainw->save_rte_defs=lives_menu_item_new_with_mnemonic (_("Save Real Time Effect _Defaults"));
-  lives_container_add (LIVES_CONTAINER (vj_menu), mainw->save_rte_defs);
-  lives_widget_show (mainw->save_rte_defs);
-  lives_widget_set_tooltip_text( mainw->save_rte_defs,(_ ("Save real time effect defaults so they will be restored each time you use LiVES.")));
+  mainw->save_rte_defs=lives_menu_item_new_with_mnemonic(_("Save Real Time Effect _Defaults"));
+  lives_container_add(LIVES_CONTAINER(vj_menu), mainw->save_rte_defs);
+  lives_widget_show(mainw->save_rte_defs);
+  lives_widget_set_tooltip_text(mainw->save_rte_defs,(_("Save real time effect defaults so they will be restored each time you use LiVES.")));
 
 
   separatormenuitem=lives_menu_add_separator(LIVES_MENU(vj_menu));
-  lives_widget_show (separatormenuitem);
+  lives_widget_show(separatormenuitem);
 
-  mainw->vj_reset=lives_menu_item_new_with_mnemonic (_("_Reset all playback speeds and positions"));
-  lives_container_add (LIVES_CONTAINER (vj_menu), mainw->vj_reset);
-  lives_widget_show (mainw->vj_reset);
-  lives_widget_set_tooltip_text( mainw->vj_reset,(_ ("Reset all playback positions to frame 1, and reset all playback frame rates.")));
+  mainw->vj_reset=lives_menu_item_new_with_mnemonic(_("_Reset all playback speeds and positions"));
+  lives_container_add(LIVES_CONTAINER(vj_menu), mainw->vj_reset);
+  lives_widget_show(mainw->vj_reset);
+  lives_widget_set_tooltip_text(mainw->vj_reset,(_("Reset all playback positions to frame 1, and reset all playback frame rates.")));
 
-  midi_submenu = lives_menu_item_new_with_mnemonic (_ ("_MIDI/joystick interface"));
+  midi_submenu = lives_menu_item_new_with_mnemonic(_("_MIDI/joystick interface"));
 
 #ifdef ENABLE_OSC
   lives_widget_show(midi_submenu);
-  lives_container_add (LIVES_CONTAINER (vj_menu), midi_submenu);
+  lives_container_add(LIVES_CONTAINER(vj_menu), midi_submenu);
 #endif
 
   midi_menu=lives_menu_new();
-  lives_menu_item_set_submenu (LIVES_MENU_ITEM (midi_submenu), midi_menu);
+  lives_menu_item_set_submenu(LIVES_MENU_ITEM(midi_submenu), midi_menu);
   if (palette->style&STYLE_1) {
     lives_widget_set_bg_color(midi_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
     lives_widget_set_fg_color(midi_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars_fore);
   }
   lives_widget_show(midi_menu);
 
-  midi_learn = lives_menu_item_new_with_mnemonic (_("_MIDI/joystick learner..."));
+  midi_learn = lives_menu_item_new_with_mnemonic(_("_MIDI/joystick learner..."));
 
-  lives_widget_show (midi_learn);
-  lives_container_add (LIVES_CONTAINER (midi_menu), midi_learn);
+  lives_widget_show(midi_learn);
+  lives_container_add(LIVES_CONTAINER(midi_menu), midi_learn);
 
-  midi_save = lives_menu_item_new_with_mnemonic (_("_Save device mapping..."));
+  midi_save = lives_menu_item_new_with_mnemonic(_("_Save device mapping..."));
 
-  lives_widget_show (midi_save);
-  lives_container_add (LIVES_CONTAINER (midi_menu), midi_save);
+  lives_widget_show(midi_save);
+  lives_container_add(LIVES_CONTAINER(midi_menu), midi_save);
 
 
-  midi_load = lives_menu_item_new_with_mnemonic (_("_Load device mapping..."));
+  midi_load = lives_menu_item_new_with_mnemonic(_("_Load device mapping..."));
 
-  lives_widget_show (midi_load);
-  lives_container_add (LIVES_CONTAINER (midi_menu), midi_load);
+  lives_widget_show(midi_load);
+  lives_container_add(LIVES_CONTAINER(midi_menu), midi_load);
 
   separatormenuitem=lives_menu_add_separator(LIVES_MENU(vj_menu));
-  lives_widget_show (separatormenuitem);
+  lives_widget_show(separatormenuitem);
 
-  mainw->vj_show_keys = lives_menu_item_new_with_mnemonic (_("Show VJ _Keys"));
-  lives_widget_show (mainw->vj_show_keys);
-  lives_container_add (LIVES_CONTAINER (vj_menu), mainw->vj_show_keys);
-
-  mainw->toys = lives_menu_item_new_with_mnemonic (_("To_ys"));
-  lives_widget_show (mainw->toys);
-  lives_container_add (LIVES_CONTAINER(mainw->menubar), mainw->toys);
+  mainw->vj_show_keys = lives_menu_item_new_with_mnemonic(_("Show VJ _Keys"));
+  lives_widget_show(mainw->vj_show_keys);
+  lives_container_add(LIVES_CONTAINER(vj_menu), mainw->vj_show_keys);
+
+  mainw->toys = lives_menu_item_new_with_mnemonic(_("To_ys"));
+  lives_widget_show(mainw->toys);
+  lives_container_add(LIVES_CONTAINER(mainw->menubar), mainw->toys);
 
-  toys_menu = lives_menu_new ();
-  lives_menu_item_set_submenu (LIVES_MENU_ITEM (mainw->toys), toys_menu);
+  toys_menu = lives_menu_new();
+  lives_menu_item_set_submenu(LIVES_MENU_ITEM(mainw->toys), toys_menu);
 
   if (palette->style&STYLE_1) {
     lives_widget_set_bg_color(toys_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
     lives_widget_set_fg_color(toys_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars_fore);
   }
 
-  mainw->toy_none = lives_check_menu_item_new_with_mnemonic (_("_None"));
-  lives_widget_show (mainw->toy_none);
-  lives_container_add (LIVES_CONTAINER (toys_menu), mainw->toy_none);
+  mainw->toy_none = lives_check_menu_item_new_with_mnemonic(_("_None"));
+  lives_widget_show(mainw->toy_none);
+  lives_container_add(LIVES_CONTAINER(toys_menu), mainw->toy_none);
   lives_check_menu_item_set_active(LIVES_CHECK_MENU_ITEM(mainw->toy_none),TRUE);
 
   separatormenuitem=lives_menu_add_separator(LIVES_MENU(toys_menu));
-  lives_widget_show (separatormenuitem);
+  lives_widget_show(separatormenuitem);
 
-  mainw->toy_autolives = lives_check_menu_item_new_with_mnemonic (_("_Autolives"));
-  lives_widget_show (mainw->toy_autolives);
-  lives_container_add (LIVES_CONTAINER (toys_menu), mainw->toy_autolives);
+  mainw->toy_autolives = lives_check_menu_item_new_with_mnemonic(_("_Autolives"));
+  lives_widget_show(mainw->toy_autolives);
+  lives_container_add(LIVES_CONTAINER(toys_menu), mainw->toy_autolives);
   lives_check_menu_item_set_active(LIVES_CHECK_MENU_ITEM(mainw->toy_autolives),FALSE);
 
-  mainw->toy_random_frames = lives_check_menu_item_new_with_mnemonic (_("_Mad Frames"));
-  lives_widget_show (mainw->toy_random_frames);
-  lives_container_add (LIVES_CONTAINER (toys_menu), mainw->toy_random_frames);
+  mainw->toy_random_frames = lives_check_menu_item_new_with_mnemonic(_("_Mad Frames"));
+  lives_widget_show(mainw->toy_random_frames);
+  lives_container_add(LIVES_CONTAINER(toys_menu), mainw->toy_random_frames);
   lives_check_menu_item_set_active(LIVES_CHECK_MENU_ITEM(mainw->toy_random_frames),FALSE);
 
-  mainw->toy_tv = lives_check_menu_item_new_with_mnemonic (_("_LiVES TV (broadband)"));
+  mainw->toy_tv = lives_check_menu_item_new_with_mnemonic(_("_LiVES TV (broadband)"));
 
-  lives_container_add (LIVES_CONTAINER (toys_menu), mainw->toy_tv);
+  lives_container_add(LIVES_CONTAINER(toys_menu), mainw->toy_tv);
 
 #ifdef LIVES_TV_CHANNEL1
-  lives_widget_show (mainw->toy_tv);
+  lives_widget_show(mainw->toy_tv);
 #else
-  lives_widget_hide (mainw->toy_tv);
+  lives_widget_hide(mainw->toy_tv);
 # endif
 
-  menuitem = lives_menu_item_new_with_mnemonic (_("_Help"));
-  lives_widget_show (menuitem);
-  lives_container_add (LIVES_CONTAINER (mainw->menubar), menuitem);
+  menuitem = lives_menu_item_new_with_mnemonic(_("_Help"));
+  lives_widget_show(menuitem);
+  lives_container_add(LIVES_CONTAINER(mainw->menubar), menuitem);
 
-  menuitem_menu = lives_menu_new ();
-  lives_menu_item_set_submenu (LIVES_MENU_ITEM (menuitem), menuitem_menu);
+  menuitem_menu = lives_menu_new();
+  lives_menu_item_set_submenu(LIVES_MENU_ITEM(menuitem), menuitem_menu);
 
   if (palette->style&STYLE_1) {
     lives_widget_set_bg_color(menuitem_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
     lives_widget_set_fg_color(menuitem_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars_fore);
   }
 
-  show_manual = lives_menu_item_new_with_mnemonic (_("_Manual (opens in browser)"));
-  lives_widget_show (show_manual);
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), show_manual);
+  show_manual = lives_menu_item_new_with_mnemonic(_("_Manual (opens in browser)"));
+  lives_widget_show(show_manual);
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), show_manual);
 
   separatormenuitem=lives_menu_add_separator(LIVES_MENU(menuitem_menu));
-  lives_widget_show (separatormenuitem);
+  lives_widget_show(separatormenuitem);
 
-  donate = lives_menu_item_new_with_mnemonic (_("_Donate to the project !"));
-  lives_widget_show (donate);
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), donate);
-
-  email_author = lives_menu_item_new_with_mnemonic (_("_Email the author"));
-  lives_widget_show (email_author);
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), email_author);
-
-  report_bug = lives_menu_item_new_with_mnemonic (_("Report a _bug"));
-  lives_widget_show (report_bug);
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), report_bug);
-
-  suggest_feature = lives_menu_item_new_with_mnemonic (_("Suggest a _feature"));
-  lives_widget_show (suggest_feature);
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), suggest_feature);
-
-  help_translate = lives_menu_item_new_with_mnemonic (_("Assist with _translating"));
-  lives_widget_show (help_translate);
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), help_translate);
+  donate = lives_menu_item_new_with_mnemonic(_("_Donate to the project !"));
+  lives_widget_show(donate);
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), donate);
+
+  email_author = lives_menu_item_new_with_mnemonic(_("_Email the author"));
+  lives_widget_show(email_author);
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), email_author);
+
+  report_bug = lives_menu_item_new_with_mnemonic(_("Report a _bug"));
+  lives_widget_show(report_bug);
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), report_bug);
+
+  suggest_feature = lives_menu_item_new_with_mnemonic(_("Suggest a _feature"));
+  lives_widget_show(suggest_feature);
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), suggest_feature);
+
+  help_translate = lives_menu_item_new_with_mnemonic(_("Assist with _translating"));
+  lives_widget_show(help_translate);
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), help_translate);
 
   separatormenuitem=lives_menu_add_separator(LIVES_MENU(menuitem_menu));
-  lives_widget_show (separatormenuitem);
+  lives_widget_show(separatormenuitem);
 
-  mainw->troubleshoot=lives_menu_item_new_with_mnemonic (_("_Troubleshoot"));
-  lives_widget_show (mainw->troubleshoot);
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mainw->troubleshoot);
-
-  about = lives_menu_item_new_with_mnemonic (_("_About"));
-  lives_widget_show (about);
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), about);
+  mainw->troubleshoot=lives_menu_item_new_with_mnemonic(_("_Troubleshoot"));
+  lives_widget_show(mainw->troubleshoot);
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mainw->troubleshoot);
+
+  about = lives_menu_item_new_with_mnemonic(_("_About"));
+  lives_widget_show(about);
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), about);
 
   mainw->btoolbar=lives_toolbar_new();
   lives_toolbar_set_show_arrow(LIVES_TOOLBAR(mainw->btoolbar),TRUE);
-  lives_box_pack_start (LIVES_BOX (mainw->menu_hbox), mainw->btoolbar, TRUE, TRUE, 0);
+  lives_box_pack_start(LIVES_BOX(mainw->menu_hbox), mainw->btoolbar, TRUE, TRUE, 0);
 
   if (palette->style&STYLE_1) {
     lives_widget_set_bg_color(mainw->btoolbar, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
     lives_widget_set_fg_color(mainw->btoolbar, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars_fore);
   }
 
-  lives_toolbar_set_style (LIVES_TOOLBAR (mainw->btoolbar), LIVES_TOOLBAR_ICONS);
-  lives_toolbar_set_icon_size (LIVES_TOOLBAR(mainw->btoolbar),LIVES_ICON_SIZE_MENU);
-  
+  lives_toolbar_set_style(LIVES_TOOLBAR(mainw->btoolbar), LIVES_TOOLBAR_ICONS);
+  lives_toolbar_set_icon_size(LIVES_TOOLBAR(mainw->btoolbar),LIVES_ICON_SIZE_MENU);
+
   if (capable->smog_version_correct) {
-    fnamex=g_build_filename(prefs->prefix_dir,ICON_DIR,"sepwin.png",NULL);
-    g_snprintf (buff,PATH_MAX,"%s",fnamex);
-    g_free(fnamex);
-    tmp_toolbar_icon=lives_image_new_from_file (buff);
-    if (g_file_test(buff,G_FILE_TEST_EXISTS)) {
+    fnamex=lives_build_filename(prefs->prefix_dir,ICON_DIR,"sepwin.png",NULL);
+    lives_snprintf(buff,PATH_MAX,"%s",fnamex);
+    lives_free(fnamex);
+    tmp_toolbar_icon=lives_image_new_from_file(buff);
+    if (lives_file_test(buff,LIVES_FILE_TEST_EXISTS)) {
       pixbuf=lives_image_get_pixbuf(LIVES_IMAGE(tmp_toolbar_icon));
       lives_pixbuf_saturate_and_pixelate(pixbuf,pixbuf,0.2,FALSE);
     }
@@ -1744,80 +1742,79 @@
     mainw->m_sepwinbutton=LIVES_WIDGET(lives_tool_button_new(LIVES_WIDGET(tmp_toolbar_icon),""));
     lives_toolbar_insert(LIVES_TOOLBAR(mainw->btoolbar),LIVES_TOOL_ITEM(mainw->m_sepwinbutton),0);
     lives_widget_set_tooltip_text(mainw->m_sepwinbutton,_("Show the play window (s)"));
-    
-    tmp_toolbar_icon = lives_image_new_from_stock (LIVES_STOCK_MEDIA_REWIND, lives_toolbar_get_icon_size (LIVES_TOOLBAR (mainw->btoolbar)));
-    
+
+    tmp_toolbar_icon = lives_image_new_from_stock(LIVES_STOCK_MEDIA_REWIND, lives_toolbar_get_icon_size(LIVES_TOOLBAR(mainw->btoolbar)));
+
     mainw->m_rewindbutton=LIVES_WIDGET(lives_tool_button_new(LIVES_WIDGET(tmp_toolbar_icon),""));
     lives_toolbar_insert(LIVES_TOOLBAR(mainw->btoolbar),LIVES_TOOL_ITEM(mainw->m_rewindbutton),-1);
     lives_widget_set_tooltip_text(mainw->m_rewindbutton,_("Rewind to start (w)"));
-    
+
     lives_widget_set_sensitive(mainw->m_rewindbutton,FALSE);
-    
-    tmp_toolbar_icon = lives_image_new_from_stock (LIVES_STOCK_MEDIA_PLAY, lives_toolbar_get_icon_size (LIVES_TOOLBAR (mainw->btoolbar)));
-    
+
+    tmp_toolbar_icon = lives_image_new_from_stock(LIVES_STOCK_MEDIA_PLAY, lives_toolbar_get_icon_size(LIVES_TOOLBAR(mainw->btoolbar)));
+
     mainw->m_playbutton=LIVES_WIDGET(lives_tool_button_new(LIVES_WIDGET(tmp_toolbar_icon),""));
     lives_toolbar_insert(LIVES_TOOLBAR(mainw->btoolbar),LIVES_TOOL_ITEM(mainw->m_playbutton),-1);
     lives_widget_set_tooltip_text(mainw->m_playbutton,_("Play all (p)"));
     lives_widget_set_sensitive(mainw->m_playbutton,FALSE);
 
 
-    tmp_toolbar_icon = lives_image_new_from_stock (LIVES_STOCK_MEDIA_STOP, lives_toolbar_get_icon_size (LIVES_TOOLBAR (mainw->btoolbar)));
-    
+    tmp_toolbar_icon = lives_image_new_from_stock(LIVES_STOCK_MEDIA_STOP, lives_toolbar_get_icon_size(LIVES_TOOLBAR(mainw->btoolbar)));
+
     mainw->m_stopbutton=LIVES_WIDGET(lives_tool_button_new(LIVES_WIDGET(tmp_toolbar_icon),""));
     lives_toolbar_insert(LIVES_TOOLBAR(mainw->btoolbar),LIVES_TOOL_ITEM(mainw->m_stopbutton),-1);
     lives_widget_set_tooltip_text(mainw->m_stopbutton,_("Stop playback (q)"));
-    
+
     lives_widget_set_sensitive(mainw->m_stopbutton,FALSE);
-    
-    fnamex=g_build_filename(prefs->prefix_dir,ICON_DIR,"playsel.png",NULL);
-    g_snprintf (buff,PATH_MAX,"%s",fnamex);
-    g_free(fnamex);
-    tmp_toolbar_icon=lives_image_new_from_file (buff);
-    
+
+    fnamex=lives_build_filename(prefs->prefix_dir,ICON_DIR,"playsel.png",NULL);
+    lives_snprintf(buff,PATH_MAX,"%s",fnamex);
+    lives_free(fnamex);
+    tmp_toolbar_icon=lives_image_new_from_file(buff);
+
     mainw->m_playselbutton=LIVES_WIDGET(lives_tool_button_new(LIVES_WIDGET(tmp_toolbar_icon),""));
     lives_toolbar_insert(LIVES_TOOLBAR(mainw->btoolbar),LIVES_TOOL_ITEM(mainw->m_playselbutton),-1);
     lives_widget_set_tooltip_text(mainw->m_playselbutton,_("Play selection (y)"));
-    
+
     lives_widget_set_sensitive(mainw->m_playselbutton,FALSE);
 
 
-    fnamex=g_build_filename(prefs->prefix_dir,ICON_DIR,"loop.png",NULL);
-    g_snprintf (buff,PATH_MAX,"%s",fnamex);
-    g_free(fnamex);
-    tmp_toolbar_icon=lives_image_new_from_file (buff);
-    if (g_file_test(buff,G_FILE_TEST_EXISTS)) {
+    fnamex=lives_build_filename(prefs->prefix_dir,ICON_DIR,"loop.png",NULL);
+    lives_snprintf(buff,PATH_MAX,"%s",fnamex);
+    lives_free(fnamex);
+    tmp_toolbar_icon=lives_image_new_from_file(buff);
+    if (lives_file_test(buff,LIVES_FILE_TEST_EXISTS)) {
       pixbuf=lives_image_get_pixbuf(LIVES_IMAGE(tmp_toolbar_icon));
       lives_pixbuf_saturate_and_pixelate(pixbuf,pixbuf,0.2,FALSE);
     }
-    
+
     mainw->m_loopbutton=LIVES_WIDGET(lives_tool_button_new(LIVES_WIDGET(tmp_toolbar_icon),""));
     lives_toolbar_insert(LIVES_TOOLBAR(mainw->btoolbar),LIVES_TOOL_ITEM(mainw->m_loopbutton),-1);
     lives_widget_set_tooltip_text(mainw->m_loopbutton,_("Switch continuous looping on (o)"));
-    
-    fnamex=g_build_filename(prefs->prefix_dir,ICON_DIR,"volume_mute.png",NULL);
-    g_snprintf (buff,PATH_MAX,"%s",fnamex);
-    g_free(fnamex);
-    tmp_toolbar_icon=lives_image_new_from_file (buff);
-    if (g_file_test(buff,G_FILE_TEST_EXISTS)) {
+
+    fnamex=lives_build_filename(prefs->prefix_dir,ICON_DIR,"volume_mute.png",NULL);
+    lives_snprintf(buff,PATH_MAX,"%s",fnamex);
+    lives_free(fnamex);
+    tmp_toolbar_icon=lives_image_new_from_file(buff);
+    if (lives_file_test(buff,LIVES_FILE_TEST_EXISTS)) {
       pixbuf=lives_image_get_pixbuf(LIVES_IMAGE(tmp_toolbar_icon));
       lives_pixbuf_saturate_and_pixelate(pixbuf,pixbuf,0.2,FALSE);
     }
-    
+
     mainw->m_mutebutton=LIVES_WIDGET(lives_tool_button_new(LIVES_WIDGET(tmp_toolbar_icon),""));
     lives_toolbar_insert(LIVES_TOOLBAR(mainw->btoolbar),LIVES_TOOL_ITEM(mainw->m_mutebutton),-1);
     lives_widget_set_tooltip_text(mainw->m_mutebutton,_("Mute the audio (z)"));
 
     lives_widget_show_all(mainw->btoolbar);
 
-  }
-  else {
-    mainw->m_sepwinbutton = lives_menu_item_new ();
-    mainw->m_rewindbutton = lives_menu_item_new ();
-    mainw->m_playbutton = lives_menu_item_new ();
-    mainw->m_stopbutton = lives_menu_item_new ();
-    mainw->m_playselbutton = lives_menu_item_new ();
-    mainw->m_loopbutton = lives_menu_item_new ();
-    mainw->m_mutebutton = lives_menu_item_new ();
+  } else {
+    mainw->m_sepwinbutton = lives_menu_item_new();
+    mainw->m_rewindbutton = lives_menu_item_new();
+    mainw->m_playbutton = lives_menu_item_new();
+    mainw->m_stopbutton = lives_menu_item_new();
+    mainw->m_playselbutton = lives_menu_item_new();
+    mainw->m_loopbutton = lives_menu_item_new();
+    mainw->m_mutebutton = lives_menu_item_new();
   }
 
   adj=lives_adjustment_new(mainw->volume,0.,1.,0.01,0.1,0.);
@@ -1828,23 +1825,25 @@
 
   if (LIVES_IS_RANGE(mainw->volume_scale)) {
     if (capable->smog_version_correct) {
-      mainw->vol_label=LIVES_WIDGET(gtk_tool_item_new());
+      mainw->vol_label=LIVES_WIDGET(lives_tool_item_new());
       label=lives_label_new(_("Volume"));
       lives_container_add(LIVES_CONTAINER(mainw->vol_label),label);
       lives_toolbar_insert(LIVES_TOOLBAR(mainw->btoolbar),LIVES_TOOL_ITEM(mainw->vol_label),-1);
       lives_widget_show(mainw->vol_label);
     }
-  }
-  else lives_object_unref(adj);
+  } else lives_object_unref(adj);
 
   lives_widget_show(mainw->volume_scale);
 
-  mainw->vol_toolitem=LIVES_WIDGET(gtk_tool_item_new());
+  mainw->vol_toolitem=LIVES_WIDGET(lives_tool_item_new());
+
+#ifdef GUI_GTK
   gtk_tool_item_set_homogeneous(LIVES_TOOL_ITEM(mainw->vol_toolitem),FALSE);
   gtk_tool_item_set_expand(LIVES_TOOL_ITEM(mainw->vol_toolitem),TRUE);
+#endif
 
   if ((prefs->audio_player==AUD_PLAYER_JACK&&capable->has_jackd)||
-      (prefs->audio_player==AUD_PLAYER_PULSE&&capable->has_pulse_audio)) 
+      (prefs->audio_player==AUD_PLAYER_PULSE&&capable->has_pulse_audio))
     lives_widget_show(mainw->vol_toolitem);
 
   lives_container_add(LIVES_CONTAINER(mainw->vol_toolitem),mainw->volume_scale);
@@ -1853,40 +1852,40 @@
   }
   lives_widget_set_tooltip_text(mainw->vol_toolitem,_("Audio volume (1.00)"));
 
-  lives_signal_connect_after (LIVES_GUI_OBJECT (mainw->volume_scale), "value_changed",
-			  LIVES_GUI_CALLBACK (on_volume_slider_value_changed),
-			  NULL);
+  lives_signal_connect_after(LIVES_GUI_OBJECT(mainw->volume_scale), LIVES_WIDGET_VALUE_CHANGED_SIGNAL,
+                             LIVES_GUI_CALLBACK(on_volume_slider_value_changed),
+                             NULL);
 
   mainw->play_window=NULL;
 
-  mainw->tb_hbox=lives_hbox_new (FALSE, 0);
-  mainw->toolbar = lives_toolbar_new ();
-  lives_widget_set_bg_color (mainw->tb_hbox, LIVES_WIDGET_STATE_NORMAL, &palette->fade_colour);
-  lives_widget_set_bg_color (mainw->toolbar, LIVES_WIDGET_STATE_NORMAL, &palette->fade_colour);
+  mainw->tb_hbox=lives_hbox_new(FALSE, 0);
+  mainw->toolbar = lives_toolbar_new();
+  lives_widget_set_bg_color(mainw->tb_hbox, LIVES_WIDGET_STATE_NORMAL, &palette->fade_colour);
+  lives_widget_set_bg_color(mainw->toolbar, LIVES_WIDGET_STATE_NORMAL, &palette->fade_colour);
   lives_toolbar_set_show_arrow(LIVES_TOOLBAR(mainw->toolbar),FALSE);
 
-  lives_box_pack_start (LIVES_BOX (mainw->vbox1), mainw->tb_hbox, FALSE, FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (mainw->tb_hbox), mainw->toolbar, TRUE, TRUE, 0);
+  lives_box_pack_start(LIVES_BOX(mainw->vbox1), mainw->tb_hbox, FALSE, FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(mainw->tb_hbox), mainw->toolbar, TRUE, TRUE, 0);
+
+  lives_toolbar_set_style(LIVES_TOOLBAR(mainw->toolbar), LIVES_TOOLBAR_ICONS);
+  lives_toolbar_set_icon_size(LIVES_TOOLBAR(mainw->toolbar),LIVES_ICON_SIZE_SMALL_TOOLBAR);
+  tmp_toolbar_icon = lives_image_new_from_stock(LIVES_STOCK_MEDIA_STOP, lives_toolbar_get_icon_size(LIVES_TOOLBAR(mainw->toolbar)));
 
-  lives_toolbar_set_style (LIVES_TOOLBAR (mainw->toolbar), LIVES_TOOLBAR_ICONS);
-  lives_toolbar_set_icon_size (LIVES_TOOLBAR(mainw->toolbar),LIVES_ICON_SIZE_SMALL_TOOLBAR);
-  tmp_toolbar_icon = lives_image_new_from_stock (LIVES_STOCK_MEDIA_STOP, lives_toolbar_get_icon_size (LIVES_TOOLBAR (mainw->toolbar)));
-  
   mainw->t_stopbutton=LIVES_WIDGET(lives_tool_button_new(LIVES_WIDGET(tmp_toolbar_icon),""));
   lives_toolbar_insert(LIVES_TOOLBAR(mainw->toolbar),LIVES_TOOL_ITEM(mainw->t_stopbutton),0);
   lives_widget_set_tooltip_text(mainw->t_stopbutton,_("Stop playback (q)"));
 
-  tmp_toolbar_icon = lives_image_new_from_stock (LIVES_STOCK_UNDO, lives_toolbar_get_icon_size (LIVES_TOOLBAR (mainw->toolbar)));
+  tmp_toolbar_icon = lives_image_new_from_stock(LIVES_STOCK_UNDO, lives_toolbar_get_icon_size(LIVES_TOOLBAR(mainw->toolbar)));
 
   mainw->t_bckground=LIVES_WIDGET(lives_tool_button_new(LIVES_WIDGET(tmp_toolbar_icon),""));
   lives_toolbar_insert(LIVES_TOOLBAR(mainw->toolbar),LIVES_TOOL_ITEM(mainw->t_bckground),1);
   lives_widget_set_tooltip_text(mainw->t_bckground,_("Unblank background (b)"));
 
-  fnamex=g_build_filename(prefs->prefix_dir,ICON_DIR,"sepwin.png",NULL);
-  g_snprintf (buff,PATH_MAX,"%s",fnamex);
-  g_free(fnamex);
-  tmp_toolbar_icon=lives_image_new_from_file (buff);
-  if (g_file_test(buff,G_FILE_TEST_EXISTS)&&!mainw->sep_win) {
+  fnamex=lives_build_filename(prefs->prefix_dir,ICON_DIR,"sepwin.png",NULL);
+  lives_snprintf(buff,PATH_MAX,"%s",fnamex);
+  lives_free(fnamex);
+  tmp_toolbar_icon=lives_image_new_from_file(buff);
+  if (lives_file_test(buff,LIVES_FILE_TEST_EXISTS)&&!mainw->sep_win) {
     pixbuf=lives_image_get_pixbuf(LIVES_IMAGE(tmp_toolbar_icon));
     lives_pixbuf_saturate_and_pixelate(pixbuf,pixbuf,0.2,FALSE);
   }
@@ -1895,11 +1894,11 @@
   lives_toolbar_insert(LIVES_TOOLBAR(mainw->toolbar),LIVES_TOOL_ITEM(mainw->t_sepwin),2);
   lives_widget_set_tooltip_text(mainw->t_sepwin,_("Play in separate window (s)"));
 
-  fnamex=g_build_filename(prefs->prefix_dir,ICON_DIR,"zoom-in.png",NULL);
-  g_snprintf (buff,PATH_MAX,"%s",fnamex);
-  g_free(fnamex);
-  tmp_toolbar_icon=lives_image_new_from_file (buff);
-  if (g_file_test(buff,G_FILE_TEST_EXISTS)&&!mainw->double_size) {
+  fnamex=lives_build_filename(prefs->prefix_dir,ICON_DIR,"zoom-in.png",NULL);
+  lives_snprintf(buff,PATH_MAX,"%s",fnamex);
+  lives_free(fnamex);
+  tmp_toolbar_icon=lives_image_new_from_file(buff);
+  if (lives_file_test(buff,LIVES_FILE_TEST_EXISTS)&&!mainw->double_size) {
     pixbuf=lives_image_get_pixbuf(LIVES_IMAGE(tmp_toolbar_icon));
     lives_pixbuf_saturate_and_pixelate(pixbuf,pixbuf,0.2,FALSE);
   }
@@ -1908,11 +1907,11 @@
 
   lives_toolbar_insert(LIVES_TOOLBAR(mainw->toolbar),LIVES_TOOL_ITEM(mainw->t_double),3);
 
-  fnamex=g_build_filename(prefs->prefix_dir,ICON_DIR,"fullscreen.png",NULL);
-  g_snprintf (buff,PATH_MAX,"%s",fnamex);
-  g_free(fnamex);
-  tmp_toolbar_icon=lives_image_new_from_file (buff);
-  if (g_file_test(buff,G_FILE_TEST_EXISTS)) {
+  fnamex=lives_build_filename(prefs->prefix_dir,ICON_DIR,"fullscreen.png",NULL);
+  lives_snprintf(buff,PATH_MAX,"%s",fnamex);
+  lives_free(fnamex);
+  tmp_toolbar_icon=lives_image_new_from_file(buff);
+  if (lives_file_test(buff,LIVES_FILE_TEST_EXISTS)) {
     pixbuf=lives_image_get_pixbuf(LIVES_IMAGE(tmp_toolbar_icon));
     lives_pixbuf_saturate_and_pixelate(pixbuf,pixbuf,0.2,FALSE);
   }
@@ -1921,120 +1920,119 @@
   lives_toolbar_insert(LIVES_TOOLBAR(mainw->toolbar),LIVES_TOOL_ITEM(mainw->t_fullscreen),4);
   lives_widget_set_tooltip_text(mainw->t_fullscreen,_("Fullscreen playback (f)"));
 
-  tmp_toolbar_icon = lives_image_new_from_stock (LIVES_STOCK_REMOVE, lives_toolbar_get_icon_size (LIVES_TOOLBAR (mainw->toolbar)));
+  tmp_toolbar_icon = lives_image_new_from_stock(LIVES_STOCK_REMOVE, lives_toolbar_get_icon_size(LIVES_TOOLBAR(mainw->toolbar)));
 
 
   mainw->t_slower=LIVES_WIDGET(lives_tool_button_new(LIVES_WIDGET(tmp_toolbar_icon),""));
   lives_toolbar_insert(LIVES_TOOLBAR(mainw->toolbar),LIVES_TOOL_ITEM(mainw->t_slower),5);
   lives_widget_set_tooltip_text(mainw->t_slower,_("Play slower (ctrl-down)"));
 
-  tmp_toolbar_icon = lives_image_new_from_stock (LIVES_STOCK_ADD, lives_toolbar_get_icon_size (LIVES_TOOLBAR (mainw->toolbar)));
+  tmp_toolbar_icon = lives_image_new_from_stock(LIVES_STOCK_ADD, lives_toolbar_get_icon_size(LIVES_TOOLBAR(mainw->toolbar)));
 
   mainw->t_faster=LIVES_WIDGET(lives_tool_button_new(LIVES_WIDGET(tmp_toolbar_icon),""));
   lives_toolbar_insert(LIVES_TOOLBAR(mainw->toolbar),LIVES_TOOL_ITEM(mainw->t_faster),6);
   lives_widget_set_tooltip_text(mainw->t_faster,_("Play faster (ctrl-up)"));
 
 
-  tmp_toolbar_icon = lives_image_new_from_stock (LIVES_STOCK_GO_BACK, lives_toolbar_get_icon_size (LIVES_TOOLBAR (mainw->toolbar)));
+  tmp_toolbar_icon = lives_image_new_from_stock(LIVES_STOCK_GO_BACK, lives_toolbar_get_icon_size(LIVES_TOOLBAR(mainw->toolbar)));
 
   mainw->t_back=LIVES_WIDGET(lives_tool_button_new(LIVES_WIDGET(tmp_toolbar_icon),""));
   lives_toolbar_insert(LIVES_TOOLBAR(mainw->toolbar),LIVES_TOOL_ITEM(mainw->t_back),7);
   lives_widget_set_tooltip_text(mainw->t_back,_("Skip back (ctrl-left)"));
 
-  tmp_toolbar_icon = lives_image_new_from_stock (LIVES_STOCK_GO_FORWARD, lives_toolbar_get_icon_size (LIVES_TOOLBAR (mainw->toolbar)));
+  tmp_toolbar_icon = lives_image_new_from_stock(LIVES_STOCK_GO_FORWARD, lives_toolbar_get_icon_size(LIVES_TOOLBAR(mainw->toolbar)));
 
   mainw->t_forward=LIVES_WIDGET(lives_tool_button_new(LIVES_WIDGET(tmp_toolbar_icon),""));
   lives_toolbar_insert(LIVES_TOOLBAR(mainw->toolbar),LIVES_TOOL_ITEM(mainw->t_forward),8);
   lives_widget_set_tooltip_text(mainw->t_forward,_("Skip forward (ctrl-right)"));
 
-  tmp_toolbar_icon = lives_image_new_from_stock (LIVES_STOCK_DIALOG_INFO, lives_toolbar_get_icon_size (LIVES_TOOLBAR (mainw->toolbar)));
+  tmp_toolbar_icon = lives_image_new_from_stock(LIVES_STOCK_DIALOG_INFO, lives_toolbar_get_icon_size(LIVES_TOOLBAR(mainw->toolbar)));
 
   mainw->t_infobutton=LIVES_WIDGET(lives_tool_button_new(LIVES_WIDGET(tmp_toolbar_icon),""));
   lives_toolbar_insert(LIVES_TOOLBAR(mainw->toolbar),LIVES_TOOL_ITEM(mainw->t_infobutton),9);
   lives_widget_set_tooltip_text(mainw->t_infobutton,_("Show clip info (i)"));
 
-  tmp_toolbar_icon = lives_image_new_from_stock (LIVES_STOCK_CLOSE, lives_toolbar_get_icon_size (LIVES_TOOLBAR (mainw->toolbar)));
+  tmp_toolbar_icon = lives_image_new_from_stock(LIVES_STOCK_CLOSE, lives_toolbar_get_icon_size(LIVES_TOOLBAR(mainw->toolbar)));
 
   mainw->t_hide=LIVES_WIDGET(lives_tool_button_new(LIVES_WIDGET(tmp_toolbar_icon),""));
   lives_toolbar_insert(LIVES_TOOLBAR(mainw->toolbar),LIVES_TOOL_ITEM(mainw->t_hide),10);
   lives_widget_set_tooltip_text(mainw->t_hide,_("Hide this toolbar"));
 
-  t_label=lives_label_new(_ ("Press \"s\" to toggle separate play window for improved performance, \"q\" to stop."));
+  t_label=lives_label_new(_("Press \"s\" to toggle separate play window for improved performance, \"q\" to stop."));
   lives_widget_set_fg_color(t_label, LIVES_WIDGET_STATE_NORMAL, &palette->white);
-  lives_box_pack_start (LIVES_BOX (mainw->tb_hbox), t_label, FALSE, FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(mainw->tb_hbox), t_label, FALSE, FALSE, 0);
 
-  lives_widget_show_all (mainw->tb_hbox);
-  lives_widget_hide (mainw->tb_hbox);
+  lives_widget_show_all(mainw->tb_hbox);
+  lives_widget_hide(mainw->tb_hbox);
 
-  vbox4 = lives_vbox_new (FALSE, 0);
-  lives_widget_show (vbox4);
+  vbox4 = lives_vbox_new(FALSE, 0);
+  lives_widget_show(vbox4);
 
-  mainw->eventbox = lives_event_box_new ();
-  lives_widget_show (mainw->eventbox);
-  lives_box_pack_start (LIVES_BOX (mainw->vbox1), mainw->eventbox, TRUE, TRUE, 0);
-  lives_container_add (LIVES_CONTAINER (mainw->eventbox), vbox4);
+  mainw->eventbox = lives_event_box_new();
+  lives_widget_show(mainw->eventbox);
+  lives_box_pack_start(LIVES_BOX(mainw->vbox1), mainw->eventbox, TRUE, TRUE, 0);
+  lives_container_add(LIVES_CONTAINER(mainw->eventbox), vbox4);
 
   if (palette->style&STYLE_1) {
-    lives_widget_set_bg_color (mainw->eventbox, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
-    lives_widget_set_bg_color (vbox4, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
-    lives_widget_set_bg_color (mainw->vbox1, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+    lives_widget_set_bg_color(mainw->eventbox, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+    lives_widget_set_bg_color(vbox4, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+    lives_widget_set_bg_color(mainw->vbox1, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
   }
 
-  lives_widget_set_events (mainw->eventbox, LIVES_SCROLL_MASK);
+  lives_widget_set_events(mainw->eventbox, LIVES_SCROLL_MASK);
 
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->eventbox), LIVES_WIDGET_SCROLL_EVENT,
-                      LIVES_GUI_CALLBACK (on_mouse_scroll),
-                      NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->eventbox), LIVES_WIDGET_SCROLL_EVENT,
+                       LIVES_GUI_CALLBACK(on_mouse_scroll),
+                       NULL);
 
-  mainw->framebar = lives_hbox_new (FALSE, 0);
-  lives_widget_show (mainw->framebar);
-  lives_box_pack_start (LIVES_BOX (vbox4), mainw->framebar, FALSE, FALSE, 0);
-  lives_container_set_border_width (LIVES_CONTAINER (mainw->framebar), 2*widget_opts.scale);
+  mainw->framebar = lives_hbox_new(FALSE, 0);
+  lives_widget_show(mainw->framebar);
+  lives_box_pack_start(LIVES_BOX(vbox4), mainw->framebar, FALSE, FALSE, 0);
+  lives_container_set_border_width(LIVES_CONTAINER(mainw->framebar), 2*widget_opts.scale);
 
   /* TRANSLATORS: please keep the translated string the same length */
-  mainw->vps_label = lives_standard_label_new (_("     Video playback speed (frames per second)        "));
-  tmp=g_strdup(lives_label_get_text(LIVES_LABEL(mainw->vps_label)));
+  mainw->vps_label = lives_standard_label_new(_("     Video playback speed (frames per second)        "));
+  tmp=lives_strdup(lives_label_get_text(LIVES_LABEL(mainw->vps_label)));
   if (strlen(tmp)>55) memset(tmp+55,0,1);
   lives_label_set_text(LIVES_LABEL(mainw->vps_label),tmp);
-  g_free(tmp);
+  lives_free(tmp);
 
   if (palette->style&STYLE_1) {
     lives_widget_set_fg_color(mainw->vps_label, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
   }
 
-  lives_widget_show (mainw->vps_label);
-  lives_box_pack_start (LIVES_BOX (mainw->framebar), mainw->vps_label, FALSE, FALSE, 0);
+  lives_widget_show(mainw->vps_label);
+  lives_box_pack_start(LIVES_BOX(mainw->framebar), mainw->vps_label, FALSE, FALSE, 0);
 
-  mainw->spinbutton_pb_fps = lives_standard_spin_button_new (NULL,FALSE,1, -FPS_MAX, FPS_MAX, 0.1, 0.01, 3,
-							     LIVES_BOX(mainw->framebar),_ ("Vary the video speed"));
+  mainw->spinbutton_pb_fps = lives_standard_spin_button_new(NULL,FALSE,1, -FPS_MAX, FPS_MAX, 0.1, 0.01, 3,
+                             LIVES_BOX(mainw->framebar),_("Vary the video speed"));
 
-  lives_widget_show (mainw->spinbutton_pb_fps);
+  lives_widget_show(mainw->spinbutton_pb_fps);
 
   widget_opts.justify=LIVES_JUSTIFY_CENTER;
   if (palette->style==STYLE_PLAIN) {
-    mainw->banner = lives_label_new ("             = <  L i V E S > =                ");
-  }
-  else {
-    mainw->banner = lives_label_new ("                                                ");
+    mainw->banner = lives_label_new("             = <  L i V E S > =                ");
+  } else {
+    mainw->banner = lives_label_new("                                                ");
   }
   widget_opts.justify=widget_opts.default_justify;
 
-  lives_widget_show (mainw->banner);
+  lives_widget_show(mainw->banner);
 
-  lives_box_pack_start (LIVES_BOX (mainw->framebar), mainw->banner, TRUE, TRUE, 0);
+  lives_box_pack_start(LIVES_BOX(mainw->framebar), mainw->banner, TRUE, TRUE, 0);
 
-  mainw->framecounter = lives_entry_new ();
-  lives_widget_show (mainw->framecounter);
-  lives_box_pack_start (LIVES_BOX (mainw->framebar), mainw->framecounter, FALSE, TRUE, 0);
-  lives_entry_set_editable (LIVES_ENTRY (mainw->framecounter), FALSE);
-  lives_entry_set_has_frame (LIVES_ENTRY (mainw->framecounter), FALSE);
-  lives_entry_set_width_chars (LIVES_ENTRY (mainw->framecounter), 18);
-
-  lives_widget_set_can_focus (mainw->framecounter, FALSE);
-
-  mainw->curf_label = lives_standard_label_new ("                                                            ");
-  lives_widget_show (mainw->curf_label);
-  lives_box_pack_start (LIVES_BOX (mainw->framebar), mainw->curf_label, FALSE, FALSE, 0);
+  mainw->framecounter = lives_entry_new();
+  lives_widget_show(mainw->framecounter);
+  lives_box_pack_start(LIVES_BOX(mainw->framebar), mainw->framecounter, FALSE, TRUE, 0);
+  lives_entry_set_editable(LIVES_ENTRY(mainw->framecounter), FALSE);
+  lives_entry_set_has_frame(LIVES_ENTRY(mainw->framecounter), FALSE);
+  lives_entry_set_width_chars(LIVES_ENTRY(mainw->framecounter), 18);
+
+  lives_widget_set_can_focus(mainw->framecounter, FALSE);
+
+  mainw->curf_label = lives_standard_label_new("                                                            ");
+  lives_widget_show(mainw->curf_label);
+  lives_box_pack_start(LIVES_BOX(mainw->framebar), mainw->curf_label, FALSE, FALSE, 0);
 
   if (palette->style&STYLE_1) {
     lives_widget_set_fg_color(mainw->curf_label, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
@@ -2042,121 +2040,121 @@
 
   lives_widget_hide(mainw->framebar);
 
-  hbox1 = lives_hbox_new (FALSE, 0);
+  hbox1 = lives_hbox_new(FALSE, 0);
   lives_widget_show(hbox1);
-  lives_box_pack_start (LIVES_BOX (vbox4), hbox1, FALSE, FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(vbox4), hbox1, FALSE, FALSE, 0);
   if (palette->style&STYLE_1) {
-    lives_widget_set_bg_color (hbox1, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+    lives_widget_set_bg_color(hbox1, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
   }
   lives_widget_set_vexpand(hbox1,FALSE);
 
-  mainw->eventbox3 = lives_event_box_new ();
-  lives_widget_show (mainw->eventbox3);
-  lives_box_pack_start (LIVES_BOX (hbox1), mainw->eventbox3, TRUE, FALSE, 0);
+  mainw->eventbox3 = lives_event_box_new();
+  lives_widget_show(mainw->eventbox3);
+  lives_box_pack_start(LIVES_BOX(hbox1), mainw->eventbox3, TRUE, FALSE, 0);
   if (palette->style&STYLE_1) {
-    lives_widget_set_bg_color (mainw->eventbox3, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+    lives_widget_set_bg_color(mainw->eventbox3, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
   }
 
-  mainw->frame1 = lives_frame_new (NULL);
-  lives_widget_show (mainw->frame1);
-  lives_container_set_border_width (LIVES_CONTAINER (mainw->frame1), widget_opts.border_width);
-  lives_container_add (LIVES_CONTAINER (mainw->eventbox3), mainw->frame1);
+  mainw->frame1 = lives_frame_new(NULL);
+  lives_widget_show(mainw->frame1);
+  lives_container_set_border_width(LIVES_CONTAINER(mainw->frame1), widget_opts.border_width);
+  lives_container_add(LIVES_CONTAINER(mainw->eventbox3), mainw->frame1);
 
   if (palette->style&STYLE_1) {
-    lives_widget_set_bg_color (mainw->frame1, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
-    lives_widget_set_fg_color (mainw->frame1, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
+    lives_widget_set_bg_color(mainw->frame1, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+    lives_widget_set_fg_color(mainw->frame1, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
   }
   lives_widget_set_vexpand(mainw->frame1,FALSE);
   lives_widget_set_hexpand(mainw->frame1,FALSE);
 
-  lives_frame_set_shadow_type (LIVES_FRAME(mainw->frame1), LIVES_SHADOW_NONE);
+  lives_frame_set_shadow_type(LIVES_FRAME(mainw->frame1), LIVES_SHADOW_NONE);
 
   mainw->freventbox0=lives_event_box_new();
   lives_widget_show(mainw->freventbox0);
   if (palette->style&STYLE_1) {
-    lives_widget_set_bg_color (mainw->freventbox0, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+    lives_widget_set_bg_color(mainw->freventbox0, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
   }
   lives_widget_set_vexpand(mainw->freventbox0,FALSE);
   lives_widget_set_hexpand(mainw->freventbox0,FALSE);
-  lives_container_add (LIVES_CONTAINER (mainw->frame1), mainw->freventbox0);
+  lives_container_add(LIVES_CONTAINER(mainw->frame1), mainw->freventbox0);
   lives_widget_set_app_paintable(mainw->freventbox0,TRUE);
 
-  lives_widget_show (mainw->start_image);
-  lives_container_add (LIVES_CONTAINER (mainw->freventbox0), mainw->start_image);
+  lives_widget_show(mainw->start_image);
+  lives_container_add(LIVES_CONTAINER(mainw->freventbox0), mainw->start_image);
   lives_widget_set_vexpand(mainw->start_image,FALSE);
   lives_widget_set_hexpand(mainw->start_image,FALSE);
   if (palette->style&STYLE_1) {
     lives_widget_set_bg_color(mainw->start_image, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
   }
 
-  label = lives_standard_label_new (_("First Frame"));
+  label = lives_standard_label_new(_("First Frame"));
   if (palette->style&STYLE_1) {
     lives_widget_set_fg_color(label, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
   }
-  lives_widget_show (label);
-  lives_frame_set_label_widget (LIVES_FRAME (mainw->frame1), label);
+  lives_widget_show(label);
+  lives_frame_set_label_widget(LIVES_FRAME(mainw->frame1), label);
 
-  mainw->playframe = lives_frame_new (NULL);
-  lives_widget_hide (mainw->playframe);
-  lives_box_pack_start (LIVES_BOX (hbox1), mainw->playframe, TRUE, FALSE, 0);
-  lives_widget_set_size_request (mainw->playframe, DEFAULT_FRAME_HSIZE, DEFAULT_FRAME_VSIZE);
-  lives_container_set_border_width (LIVES_CONTAINER (mainw->playframe), widget_opts.border_width);
+  mainw->playframe = lives_frame_new(NULL);
+  lives_widget_hide(mainw->playframe);
+  lives_box_pack_start(LIVES_BOX(hbox1), mainw->playframe, TRUE, FALSE, 0);
+  lives_widget_set_size_request(mainw->playframe, DEFAULT_FRAME_HSIZE, DEFAULT_FRAME_VSIZE);
+  lives_container_set_border_width(LIVES_CONTAINER(mainw->playframe), widget_opts.border_width);
 
-  lives_frame_set_shadow_type (LIVES_FRAME(mainw->playframe), LIVES_SHADOW_NONE);
+  lives_frame_set_shadow_type(LIVES_FRAME(mainw->playframe), LIVES_SHADOW_NONE);
   if (palette->style&STYLE_1) {
-    lives_widget_set_bg_color (mainw->playframe, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+    lives_widget_set_bg_color(mainw->playframe, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
   }
 
-  pf_label = lives_standard_label_new (_("Play"));
+  pf_label = lives_standard_label_new(_("Play"));
   if (palette->style&STYLE_1) {
     lives_widget_set_fg_color(pf_label, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
   }
-  lives_widget_show (pf_label);
-  lives_frame_set_label_widget (LIVES_FRAME (mainw->playframe), pf_label);
+  lives_widget_show(pf_label);
+  lives_frame_set_label_widget(LIVES_FRAME(mainw->playframe), pf_label);
 
-  mainw->pl_eventbox = lives_event_box_new ();
-  lives_widget_set_bg_color (mainw->pl_eventbox, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
-  lives_container_add (LIVES_CONTAINER (mainw->playframe), mainw->pl_eventbox);
+  mainw->pl_eventbox = lives_event_box_new();
+  lives_widget_set_bg_color(mainw->pl_eventbox, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+  lives_container_add(LIVES_CONTAINER(mainw->playframe), mainw->pl_eventbox);
   lives_widget_show(mainw->pl_eventbox);
 
-  mainw->playarea = lives_hbox_new (FALSE,0);
+  mainw->playarea = lives_hbox_new(FALSE,0);
 
-  lives_container_add (LIVES_CONTAINER (mainw->pl_eventbox), mainw->playarea);
+  lives_container_add(LIVES_CONTAINER(mainw->pl_eventbox), mainw->playarea);
 
   lives_widget_set_app_paintable(mainw->pl_eventbox,TRUE);
 
-  mainw->eventbox4 = lives_event_box_new ();
-  lives_box_pack_start (LIVES_BOX (hbox1), mainw->eventbox4, TRUE, FALSE, 0);
-  lives_widget_set_bg_color (mainw->eventbox4, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+  mainw->eventbox4 = lives_event_box_new();
+  lives_box_pack_start(LIVES_BOX(hbox1), mainw->eventbox4, TRUE, FALSE, 0);
+  lives_widget_set_bg_color(mainw->eventbox4, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
   lives_widget_set_vexpand(mainw->eventbox4,FALSE);
   lives_widget_set_hexpand(mainw->eventbox4,FALSE);
-  lives_widget_show (mainw->eventbox4);
+  lives_widget_show(mainw->eventbox4);
 
-  mainw->frame2 = lives_frame_new (NULL);
-  lives_widget_show (mainw->frame2);
-  lives_container_set_border_width (LIVES_CONTAINER (mainw->frame2), widget_opts.border_width);
-  lives_container_add (LIVES_CONTAINER (mainw->eventbox4), mainw->frame2);
+  mainw->frame2 = lives_frame_new(NULL);
+  lives_widget_show(mainw->frame2);
+  lives_container_set_border_width(LIVES_CONTAINER(mainw->frame2), widget_opts.border_width);
+  lives_container_add(LIVES_CONTAINER(mainw->eventbox4), mainw->frame2);
   if (palette->style&STYLE_1) {
-    lives_widget_set_bg_color (mainw->frame2, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+    lives_widget_set_bg_color(mainw->frame2, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
   }
   lives_widget_set_vexpand(mainw->frame2,FALSE);
   lives_widget_set_hexpand(mainw->frame2,FALSE);
 
-  lives_frame_set_shadow_type (LIVES_FRAME(mainw->frame2), LIVES_SHADOW_NONE);
+  lives_frame_set_shadow_type(LIVES_FRAME(mainw->frame2), LIVES_SHADOW_NONE);
 
   mainw->freventbox1=lives_event_box_new();
   lives_widget_show(mainw->freventbox1);
   if (palette->style&STYLE_1) {
-    lives_widget_set_bg_color (mainw->freventbox1, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+    lives_widget_set_bg_color(mainw->freventbox1, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
   }
   lives_widget_set_vexpand(mainw->freventbox1,FALSE);
   lives_widget_set_hexpand(mainw->freventbox1,FALSE);
   lives_widget_set_app_paintable(mainw->freventbox1,TRUE);
 
-  lives_container_add (LIVES_CONTAINER (mainw->frame2), mainw->freventbox1);
-  
-  lives_widget_show (mainw->end_image);
-  lives_container_add (LIVES_CONTAINER (mainw->freventbox1), mainw->end_image);
+  lives_container_add(LIVES_CONTAINER(mainw->frame2), mainw->freventbox1);
+
+  lives_widget_show(mainw->end_image);
+  lives_container_add(LIVES_CONTAINER(mainw->freventbox1), mainw->end_image);
   lives_widget_set_vexpand(mainw->end_image,FALSE);
   lives_widget_set_hexpand(mainw->end_image,FALSE);
   if (palette->style&STYLE_1) {
@@ -2168,18 +2166,18 @@
   mainw->def_height=DEFAULT_FRAME_HSIZE;
 
   if (!(mainw->imframe==NULL)) {
-    if (lives_pixbuf_get_width (mainw->imframe)+H_RESIZE_ADJUST<mainw->def_width) {
-      mainw->def_width=lives_pixbuf_get_width (mainw->imframe)+H_RESIZE_ADJUST;
+    if (lives_pixbuf_get_width(mainw->imframe)+H_RESIZE_ADJUST<mainw->def_width) {
+      mainw->def_width=lives_pixbuf_get_width(mainw->imframe)+H_RESIZE_ADJUST;
     }
-    if (lives_pixbuf_get_height (mainw->imframe)+V_RESIZE_ADJUST*mainw->foreign<mainw->def_height) {
-      mainw->def_height=lives_pixbuf_get_height (mainw->imframe)+V_RESIZE_ADJUST*mainw->foreign;
+    if (lives_pixbuf_get_height(mainw->imframe)+V_RESIZE_ADJUST*mainw->foreign<mainw->def_height) {
+      mainw->def_height=lives_pixbuf_get_height(mainw->imframe)+V_RESIZE_ADJUST*mainw->foreign;
     }
   }
 
   // the actual playback image for the internal player
-  mainw->play_image = lives_image_new_from_pixbuf (NULL);
+  mainw->play_image = lives_image_new_from_pixbuf(NULL);
 
-  lives_widget_show (mainw->play_image);
+  lives_widget_show(mainw->play_image);
   lives_object_ref(mainw->play_image);
   if (palette->style&STYLE_1) {
     lives_widget_set_bg_color(mainw->play_image, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
@@ -2190,39 +2188,39 @@
 
   lives_object_ref_sink(mainw->play_image);
 
-  label = lives_standard_label_new (_("Last Frame"));
-  lives_widget_show (label);
-  lives_frame_set_label_widget (LIVES_FRAME (mainw->frame2), label);
+  label = lives_standard_label_new(_("Last Frame"));
+  lives_widget_show(label);
+  lives_frame_set_label_widget(LIVES_FRAME(mainw->frame2), label);
   if (palette->style&STYLE_1) {
     lives_widget_set_fg_color(label, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
   }
 
-  hbox3 = lives_hbox_new (FALSE, 0);
-  lives_widget_show (hbox3);
-  lives_box_pack_start (LIVES_BOX (vbox4), hbox3, FALSE, TRUE, 0);
+  hbox3 = lives_hbox_new(FALSE, 0);
+  lives_widget_show(hbox3);
+  lives_box_pack_start(LIVES_BOX(vbox4), hbox3, FALSE, TRUE, 0);
 
   dpw=widget_opts.packing_width;
   woat=widget_opts.apply_theme;
   widget_opts.expand=LIVES_EXPAND_EXTRA;
   widget_opts.apply_theme=FALSE;
   widget_opts.packing_width=MAIN_SPIN_SPACER;
-  mainw->spinbutton_start = lives_standard_spin_button_new (NULL,FALSE,0., 0., 0., 1., 100.,0,
-							    LIVES_BOX(hbox3),_("The first selected frame in this clip"));
+  mainw->spinbutton_start = lives_standard_spin_button_new(NULL,FALSE,0., 0., 0., 1., 100.,0,
+                            LIVES_BOX(hbox3),_("The first selected frame in this clip"));
   widget_opts.expand=LIVES_EXPAND_DEFAULT;
   widget_opts.packing_width=dpw;
   widget_opts.apply_theme=woat;
 
-  lives_widget_show (mainw->spinbutton_start);
+  lives_widget_show(mainw->spinbutton_start);
 
-  mainw->arrow1 = lives_arrow_new (LIVES_ARROW_LEFT, LIVES_SHADOW_OUT);
-  lives_widget_show (mainw->arrow1);
-  lives_box_pack_start (LIVES_BOX (hbox3), mainw->arrow1, FALSE, FALSE, 0);
+  mainw->arrow1 = lives_arrow_new(LIVES_ARROW_LEFT, LIVES_SHADOW_OUT);
+  lives_widget_show(mainw->arrow1);
+  lives_box_pack_start(LIVES_BOX(hbox3), mainw->arrow1, FALSE, FALSE, 0);
 
   if (palette->style&STYLE_1) {
     lives_widget_set_fg_color(mainw->arrow1, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
   }
 
-  lives_entry_set_width_chars (LIVES_ENTRY (mainw->spinbutton_start),12);
+  lives_entry_set_width_chars(LIVES_ENTRY(mainw->spinbutton_start),12);
   mainw->sel_label = lives_standard_label_new(NULL);
 
   if (palette->style&STYLE_1) {
@@ -2230,12 +2228,12 @@
   }
 
   set_sel_label(mainw->sel_label);
-  lives_widget_show (mainw->sel_label);
-  lives_box_pack_start (LIVES_BOX (hbox3), mainw->sel_label, FALSE, FALSE, 0);
+  lives_widget_show(mainw->sel_label);
+  lives_box_pack_start(LIVES_BOX(hbox3), mainw->sel_label, FALSE, FALSE, 0);
 
-  mainw->arrow2 = lives_arrow_new (LIVES_ARROW_RIGHT, LIVES_SHADOW_OUT);
-  lives_widget_show (mainw->arrow2);
-  lives_box_pack_start (LIVES_BOX (hbox3), mainw->arrow2, FALSE, FALSE, 0);
+  mainw->arrow2 = lives_arrow_new(LIVES_ARROW_RIGHT, LIVES_SHADOW_OUT);
+  lives_widget_show(mainw->arrow2);
+  lives_box_pack_start(LIVES_BOX(hbox3), mainw->arrow2, FALSE, FALSE, 0);
 
   if (palette->style&STYLE_1) {
     lives_widget_set_fg_color(mainw->arrow2, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
@@ -2244,16 +2242,16 @@
   widget_opts.expand=LIVES_EXPAND_EXTRA;
   widget_opts.packing_width=MAIN_SPIN_SPACER;
   widget_opts.apply_theme=FALSE;
-  mainw->spinbutton_end = lives_standard_spin_button_new (NULL,FALSE,0., 0., 0., 1., 100.,0,
-							  LIVES_BOX(hbox3),_("The last selected frame in this clip"));
+  mainw->spinbutton_end = lives_standard_spin_button_new(NULL,FALSE,0., 0., 0., 1., 100.,0,
+                          LIVES_BOX(hbox3),_("The last selected frame in this clip"));
   widget_opts.expand=LIVES_EXPAND_DEFAULT;
   widget_opts.packing_width=dpw;
   widget_opts.apply_theme=woat;
 
-  lives_widget_show (mainw->spinbutton_end);
+  lives_widget_show(mainw->spinbutton_end);
 
 
-  lives_entry_set_width_chars (LIVES_ENTRY (mainw->spinbutton_end),12);
+  lives_entry_set_width_chars(LIVES_ENTRY(mainw->spinbutton_end),12);
 
   if (palette->style&STYLE_1&&palette->style&STYLE_2) {
 #if !GTK_CHECK_VERSION(3,0,0)
@@ -2273,24 +2271,24 @@
   lives_widget_set_sensitive(mainw->spinbutton_start,FALSE);
   lives_widget_set_sensitive(mainw->spinbutton_end,FALSE);
 
-  mainw->hseparator = lives_hseparator_new ();
+  mainw->hseparator = lives_hseparator_new();
 
   if (palette->style&STYLE_1) {
-    lives_box_pack_start (LIVES_BOX (vbox4), mainw->sep_image, FALSE, TRUE, widget_opts.packing_height*2);
-    lives_widget_show (mainw->sep_image);
+    lives_box_pack_start(LIVES_BOX(vbox4), mainw->sep_image, FALSE, TRUE, widget_opts.packing_height*2);
+    lives_widget_show(mainw->sep_image);
   }
 
   else {
-    lives_box_pack_start (LIVES_BOX (vbox4), mainw->hseparator, TRUE, TRUE, 0);
-    lives_widget_show (mainw->hseparator);
+    lives_box_pack_start(LIVES_BOX(vbox4), mainw->hseparator, TRUE, TRUE, 0);
+    lives_widget_show(mainw->hseparator);
   }
 
-  mainw->eventbox5 = lives_event_box_new ();
-  lives_box_pack_start (LIVES_BOX (vbox4), mainw->eventbox5, FALSE, FALSE, 0);
+  mainw->eventbox5 = lives_event_box_new();
+  lives_box_pack_start(LIVES_BOX(vbox4), mainw->eventbox5, FALSE, FALSE, 0);
   lives_widget_show(mainw->eventbox5);
 
   if (palette->style&STYLE_1) {
-    lives_widget_set_bg_color (mainw->eventbox5, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+    lives_widget_set_bg_color(mainw->eventbox5, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
   }
 
 #ifdef ENABLE_GIW_3
@@ -2298,772 +2296,881 @@
 #else
   mainw->hruler = lives_standard_hruler_new();
 #endif
-  lives_ruler_set_range (LIVES_RULER (mainw->hruler), 0., 1000000., 0., 1000000.);
+  lives_ruler_set_range(LIVES_RULER(mainw->hruler), 0., 1000000., 0., 1000000.);
 
-  lives_widget_set_size_request (mainw->hruler, -1, CE_HRULE_HEIGHT);
-  lives_container_add (LIVES_CONTAINER (mainw->eventbox5), mainw->hruler);
+  lives_widget_set_size_request(mainw->hruler, -1, CE_HRULE_HEIGHT);
+  lives_container_add(LIVES_CONTAINER(mainw->eventbox5), mainw->hruler);
 
-  lives_widget_add_events (mainw->eventbox5, LIVES_POINTER_MOTION_MASK | LIVES_BUTTON1_MOTION_MASK | LIVES_BUTTON_RELEASE_MASK | 
-			 LIVES_BUTTON_PRESS_MASK | LIVES_ENTER_NOTIFY_MASK);
+  lives_widget_add_events(mainw->eventbox5, LIVES_POINTER_MOTION_MASK | LIVES_BUTTON1_MOTION_MASK | LIVES_BUTTON_RELEASE_MASK |
+                          LIVES_BUTTON_PRESS_MASK | LIVES_ENTER_NOTIFY_MASK);
 
-  mainw->eventbox2 = lives_event_box_new ();
-  lives_widget_show (mainw->eventbox2);
-  lives_box_pack_start (LIVES_BOX (vbox4), mainw->eventbox2, TRUE, TRUE, 0);
-  lives_widget_add_events (mainw->eventbox2, LIVES_BUTTON1_MOTION_MASK | LIVES_BUTTON_RELEASE_MASK | LIVES_BUTTON_PRESS_MASK);
+  mainw->eventbox2 = lives_event_box_new();
+  lives_widget_show(mainw->eventbox2);
+  lives_box_pack_start(LIVES_BOX(vbox4), mainw->eventbox2, TRUE, TRUE, 0);
+  lives_widget_add_events(mainw->eventbox2, LIVES_BUTTON1_MOTION_MASK | LIVES_BUTTON_RELEASE_MASK | LIVES_BUTTON_PRESS_MASK);
 
   lives_widget_set_vexpand(mainw->eventbox2,TRUE);
 
   if (palette->style&STYLE_1) {
-    lives_widget_set_bg_color (mainw->eventbox2, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
-    lives_widget_set_bg_color (mainw->hruler, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
-    lives_widget_set_fg_color (mainw->hruler, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
+    lives_widget_set_bg_color(mainw->eventbox2, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+    lives_widget_set_bg_color(mainw->hruler, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+    lives_widget_set_fg_color(mainw->hruler, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
   }
 
-  vbox2 = lives_vbox_new (FALSE, 0);
-  lives_widget_show (vbox2);
-  lives_container_add (LIVES_CONTAINER (mainw->eventbox2), vbox2);
+  vbox2 = lives_vbox_new(FALSE, 0);
+  lives_widget_show(vbox2);
+  lives_container_add(LIVES_CONTAINER(mainw->eventbox2), vbox2);
 
-  mainw->vidbar = lives_standard_label_new (_("Video"));
+  mainw->vidbar = lives_standard_label_new(_("Video"));
 
   if (palette->style&STYLE_1) {
     lives_widget_set_fg_color(mainw->vidbar, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
   }
 
   if (palette->style==STYLE_PLAIN) {
-    lives_widget_show (mainw->vidbar);
-  }
-  else {
-    lives_widget_set_bg_color (vbox2, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
-    lives_widget_hide (mainw->vidbar);
+    lives_widget_show(mainw->vidbar);
+  } else {
+    lives_widget_set_bg_color(vbox2, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+    lives_widget_hide(mainw->vidbar);
   }
 
-  lives_box_pack_start (LIVES_BOX (vbox2), mainw->vidbar, TRUE, TRUE, 0);
+  lives_box_pack_start(LIVES_BOX(vbox2), mainw->vidbar, TRUE, TRUE, 0);
 
-  mainw->video_draw = gtk_drawing_area_new ();
+  mainw->video_draw = lives_drawing_area_new();
   lives_widget_set_app_paintable(mainw->video_draw,TRUE);
   lives_widget_set_size_request(mainw->video_draw,lives_widget_get_allocation_width(mainw->LiVES),CE_VIDBAR_HEIGHT);
-  lives_widget_show (mainw->video_draw);
-  lives_box_pack_start (LIVES_BOX (vbox2), mainw->video_draw, TRUE, TRUE, 0);
+  lives_widget_show(mainw->video_draw);
+  lives_box_pack_start(LIVES_BOX(vbox2), mainw->video_draw, TRUE, TRUE, 0);
   if (palette->style&STYLE_1) {
-    lives_widget_set_bg_color (mainw->video_draw, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+    lives_widget_set_bg_color(mainw->video_draw, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
   }
 
-  mainw->laudbar = lives_standard_label_new (_("Left Audio"));
+  mainw->laudbar = lives_standard_label_new(_("Left Audio"));
 
   if (palette->style&STYLE_1) {
     lives_widget_set_fg_color(mainw->laudbar, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
   }
 
-  lives_box_pack_start (LIVES_BOX (vbox2), mainw->laudbar, TRUE, TRUE, 0);
+  lives_box_pack_start(LIVES_BOX(vbox2), mainw->laudbar, TRUE, TRUE, 0);
 
   if (palette->style==STYLE_PLAIN) {
-    lives_widget_show (mainw->laudbar);
-  }
-  else {
-    lives_widget_hide (mainw->laudbar);
+    lives_widget_show(mainw->laudbar);
+  } else {
+    lives_widget_hide(mainw->laudbar);
   }
 
-  mainw->laudio_draw = gtk_drawing_area_new ();
+  mainw->laudio_draw = lives_drawing_area_new();
   lives_widget_set_app_paintable(mainw->laudio_draw,TRUE);
   lives_widget_set_size_request(mainw->laudio_draw,lives_widget_get_allocation_width(mainw->LiVES),CE_VIDBAR_HEIGHT);
-  lives_widget_show (mainw->laudio_draw);
-  lives_box_pack_start (LIVES_BOX (vbox2), mainw->laudio_draw, TRUE, TRUE, 0);
+  lives_widget_show(mainw->laudio_draw);
+  lives_box_pack_start(LIVES_BOX(vbox2), mainw->laudio_draw, TRUE, TRUE, 0);
   if (palette->style&STYLE_1) {
-    lives_widget_set_bg_color (mainw->laudio_draw, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+    lives_widget_set_bg_color(mainw->laudio_draw, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
   }
 
-  mainw->raudbar = lives_standard_label_new (_("Right Audio"));
+  mainw->raudbar = lives_standard_label_new(_("Right Audio"));
 
   if (palette->style&STYLE_1) {
     lives_widget_set_fg_color(mainw->raudbar, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
   }
 
-  lives_box_pack_start (LIVES_BOX (vbox2), mainw->raudbar, TRUE, TRUE, 0);
+  lives_box_pack_start(LIVES_BOX(vbox2), mainw->raudbar, TRUE, TRUE, 0);
 
   if (palette->style==STYLE_PLAIN) {
-    lives_widget_show (mainw->raudbar);
-  }
-  else {
-    lives_widget_hide (mainw->raudbar);
+    lives_widget_show(mainw->raudbar);
+  } else {
+    lives_widget_hide(mainw->raudbar);
   }
 
-  mainw->raudio_draw = gtk_drawing_area_new ();
+  mainw->raudio_draw = lives_drawing_area_new();
   lives_widget_set_app_paintable(mainw->raudio_draw,TRUE);
   lives_widget_set_size_request(mainw->raudio_draw,lives_widget_get_allocation_width(mainw->LiVES),CE_VIDBAR_HEIGHT);
-  lives_widget_show (mainw->raudio_draw);
-  lives_box_pack_start (LIVES_BOX (vbox2), mainw->raudio_draw, TRUE, TRUE, 0);
+  lives_widget_show(mainw->raudio_draw);
+  lives_box_pack_start(LIVES_BOX(vbox2), mainw->raudio_draw, TRUE, TRUE, 0);
   if (palette->style&STYLE_1) {
-    lives_widget_set_bg_color (mainw->raudio_draw, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+    lives_widget_set_bg_color(mainw->raudio_draw, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
   }
 
   eventbox=lives_event_box_new();
   lives_widget_set_vexpand(eventbox,TRUE);
-  lives_widget_show (eventbox);
+  lives_widget_show(eventbox);
 
   mainw->message_box=lives_vbox_new(FALSE, 0);
-  lives_widget_show (mainw->message_box);
+  lives_widget_show(mainw->message_box);
 
   lives_widget_set_vexpand(mainw->message_box,TRUE);
 
-  lives_box_pack_start (LIVES_BOX (mainw->vbox1), eventbox, TRUE, TRUE, 0);
-  lives_container_add (LIVES_CONTAINER (eventbox), mainw->message_box);
+  lives_box_pack_start(LIVES_BOX(mainw->vbox1), eventbox, TRUE, TRUE, 0);
+  lives_container_add(LIVES_CONTAINER(eventbox), mainw->message_box);
 
   mainw->textview1=NULL;
   mainw->scrolledwindow=NULL;
   add_message_scroller(mainw->message_box);
 
   // accel keys
-  lives_accel_group_connect (LIVES_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_Page_Up, LIVES_CONTROL_MASK, (LiVESAccelFlags)0, 
-			   g_cclosure_new (LIVES_GUI_CALLBACK (prevclip_callback),NULL,NULL));
+  lives_accel_group_connect(LIVES_ACCEL_GROUP(mainw->accel_group), LIVES_KEY_Page_Up, LIVES_CONTROL_MASK, (LiVESAccelFlags)0,
+                            lives_cclosure_new(LIVES_GUI_CALLBACK(prevclip_callback),NULL,NULL));
 
-  lives_accel_group_connect (LIVES_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_Page_Down, LIVES_CONTROL_MASK, (LiVESAccelFlags)0, 
-			   g_cclosure_new (LIVES_GUI_CALLBACK (nextclip_callback),NULL,NULL));
+  lives_accel_group_connect(LIVES_ACCEL_GROUP(mainw->accel_group), LIVES_KEY_Page_Down, LIVES_CONTROL_MASK, (LiVESAccelFlags)0,
+                            lives_cclosure_new(LIVES_GUI_CALLBACK(nextclip_callback),NULL,NULL));
 
-  lives_accel_group_connect (LIVES_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_Down, LIVES_CONTROL_MASK, (LiVESAccelFlags)0, 
-			   g_cclosure_new (LIVES_GUI_CALLBACK (slower_callback),NULL,NULL));
+  lives_accel_group_connect(LIVES_ACCEL_GROUP(mainw->accel_group), LIVES_KEY_Down, LIVES_CONTROL_MASK, (LiVESAccelFlags)0,
+                            lives_cclosure_new(LIVES_GUI_CALLBACK(slower_callback),NULL,NULL));
 
-  lives_accel_group_connect (LIVES_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_Up, LIVES_CONTROL_MASK, (LiVESAccelFlags)0, 
-			   g_cclosure_new (LIVES_GUI_CALLBACK (faster_callback),NULL,NULL));
+  lives_accel_group_connect(LIVES_ACCEL_GROUP(mainw->accel_group), LIVES_KEY_Up, LIVES_CONTROL_MASK, (LiVESAccelFlags)0,
+                            lives_cclosure_new(LIVES_GUI_CALLBACK(faster_callback),NULL,NULL));
 
-  lives_accel_group_connect (LIVES_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_Left, LIVES_CONTROL_MASK, (LiVESAccelFlags)0, 
-			   g_cclosure_new (LIVES_GUI_CALLBACK (skip_back_callback),NULL,NULL));
+  lives_accel_group_connect(LIVES_ACCEL_GROUP(mainw->accel_group), LIVES_KEY_Left, LIVES_CONTROL_MASK, (LiVESAccelFlags)0,
+                            lives_cclosure_new(LIVES_GUI_CALLBACK(skip_back_callback),NULL,NULL));
 
-  lives_accel_group_connect (LIVES_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_Right, LIVES_CONTROL_MASK, (LiVESAccelFlags)0, 
-			   g_cclosure_new (LIVES_GUI_CALLBACK (skip_forward_callback),NULL,NULL));
+  lives_accel_group_connect(LIVES_ACCEL_GROUP(mainw->accel_group), LIVES_KEY_Right, LIVES_CONTROL_MASK, (LiVESAccelFlags)0,
+                            lives_cclosure_new(LIVES_GUI_CALLBACK(skip_forward_callback),NULL,NULL));
 
-  lives_accel_group_connect (LIVES_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_Space, LIVES_CONTROL_MASK, (LiVESAccelFlags)0, 
-			   g_cclosure_new (LIVES_GUI_CALLBACK (dirchange_callback),GINT_TO_POINTER(TRUE),NULL));
+  lives_accel_group_connect(LIVES_ACCEL_GROUP(mainw->accel_group), LIVES_KEY_Space, LIVES_CONTROL_MASK, (LiVESAccelFlags)0,
+                            lives_cclosure_new(LIVES_GUI_CALLBACK(dirchange_callback),LIVES_INT_TO_POINTER(TRUE),NULL));
 
-  lives_accel_group_connect (LIVES_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_Return, LIVES_CONTROL_MASK, (LiVESAccelFlags)0, 
-			   g_cclosure_new (LIVES_GUI_CALLBACK (fps_reset_callback),GINT_TO_POINTER(TRUE),NULL));
+  lives_accel_group_connect(LIVES_ACCEL_GROUP(mainw->accel_group), LIVES_KEY_Return, LIVES_CONTROL_MASK, (LiVESAccelFlags)0,
+                            lives_cclosure_new(LIVES_GUI_CALLBACK(fps_reset_callback),LIVES_INT_TO_POINTER(TRUE),NULL));
 
-  lives_accel_group_connect (LIVES_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_k, (LiVESXModifierType)0, (LiVESAccelFlags)0, 
-			   g_cclosure_new (LIVES_GUI_CALLBACK (grabkeys_callback),NULL,NULL));
+  lives_accel_group_connect(LIVES_ACCEL_GROUP(mainw->accel_group), LIVES_KEY_k, (LiVESXModifierType)0, (LiVESAccelFlags)0,
+                            lives_cclosure_new(LIVES_GUI_CALLBACK(grabkeys_callback),NULL,NULL));
 
-  lives_accel_group_connect (LIVES_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_t, (LiVESXModifierType)0, (LiVESAccelFlags)0, 
-			   g_cclosure_new (LIVES_GUI_CALLBACK (textparm_callback),NULL,NULL));
+  lives_accel_group_connect(LIVES_ACCEL_GROUP(mainw->accel_group), LIVES_KEY_t, (LiVESXModifierType)0, (LiVESAccelFlags)0,
+                            lives_cclosure_new(LIVES_GUI_CALLBACK(textparm_callback),NULL,NULL));
 
-  lives_accel_group_connect (LIVES_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_m, (LiVESXModifierType)0, (LiVESAccelFlags)0, 
-			   g_cclosure_new (LIVES_GUI_CALLBACK (rtemode_callback),NULL,NULL));
+  lives_accel_group_connect(LIVES_ACCEL_GROUP(mainw->accel_group), LIVES_KEY_m, (LiVESXModifierType)0, (LiVESAccelFlags)0,
+                            lives_cclosure_new(LIVES_GUI_CALLBACK(rtemode_callback),NULL,NULL));
 
-  lives_accel_group_connect (LIVES_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_x, (LiVESXModifierType)0, (LiVESAccelFlags)0, 
-			   g_cclosure_new (LIVES_GUI_CALLBACK (swap_fg_bg_callback),NULL,NULL));
+  lives_accel_group_connect(LIVES_ACCEL_GROUP(mainw->accel_group), LIVES_KEY_x, (LiVESXModifierType)0, (LiVESAccelFlags)0,
+                            lives_cclosure_new(LIVES_GUI_CALLBACK(swap_fg_bg_callback),NULL,NULL));
 
-  lives_accel_group_connect (LIVES_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_n, (LiVESXModifierType)0, (LiVESAccelFlags)0, 
-			   g_cclosure_new (LIVES_GUI_CALLBACK (nervous_callback),NULL,NULL));
+  lives_accel_group_connect(LIVES_ACCEL_GROUP(mainw->accel_group), LIVES_KEY_n, (LiVESXModifierType)0, (LiVESAccelFlags)0,
+                            lives_cclosure_new(LIVES_GUI_CALLBACK(nervous_callback),NULL,NULL));
 
-  lives_accel_group_connect (LIVES_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_w, (LiVESXModifierType)0, (LiVESAccelFlags)0, 
-			   g_cclosure_new (LIVES_GUI_CALLBACK (show_sync_callback),NULL,NULL));
+  lives_accel_group_connect(LIVES_ACCEL_GROUP(mainw->accel_group), LIVES_KEY_w, (LiVESXModifierType)0, (LiVESAccelFlags)0,
+                            lives_cclosure_new(LIVES_GUI_CALLBACK(show_sync_callback),NULL,NULL));
 
   if (FN_KEYS>0) {
-    lives_accel_group_connect (LIVES_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_F1, (LiVESXModifierType)0, (LiVESAccelFlags)0, 
-			     g_cclosure_new (LIVES_GUI_CALLBACK (storeclip_callback),GINT_TO_POINTER (1),NULL));
+    lives_accel_group_connect(LIVES_ACCEL_GROUP(mainw->accel_group), LIVES_KEY_F1, (LiVESXModifierType)0, (LiVESAccelFlags)0,
+                              lives_cclosure_new(LIVES_GUI_CALLBACK(storeclip_callback),LIVES_INT_TO_POINTER(1),NULL));
     if (FN_KEYS>1) {
-      lives_accel_group_connect (LIVES_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_F2, (LiVESXModifierType)0, (LiVESAccelFlags)0, 
-			       g_cclosure_new (LIVES_GUI_CALLBACK (storeclip_callback),GINT_TO_POINTER (2),NULL));
+      lives_accel_group_connect(LIVES_ACCEL_GROUP(mainw->accel_group), LIVES_KEY_F2, (LiVESXModifierType)0, (LiVESAccelFlags)0,
+                                lives_cclosure_new(LIVES_GUI_CALLBACK(storeclip_callback),LIVES_INT_TO_POINTER(2),NULL));
       if (FN_KEYS>2) {
-	lives_accel_group_connect (LIVES_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_F3, (LiVESXModifierType)0, (LiVESAccelFlags)0, 
-				 g_cclosure_new (LIVES_GUI_CALLBACK (storeclip_callback),GINT_TO_POINTER (3),NULL));
-	if (FN_KEYS>3) {
-	  lives_accel_group_connect (LIVES_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_F4, (LiVESXModifierType)0, (LiVESAccelFlags)0, 
-				   g_cclosure_new (LIVES_GUI_CALLBACK (storeclip_callback),GINT_TO_POINTER (4),NULL));
-	  if (FN_KEYS>4) {
-	    lives_accel_group_connect (LIVES_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_F5, (LiVESXModifierType)0, (LiVESAccelFlags)0, 
-				     g_cclosure_new (LIVES_GUI_CALLBACK (storeclip_callback),GINT_TO_POINTER (5),NULL));
-	    if (FN_KEYS>5) {
-	      lives_accel_group_connect (LIVES_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_F6, (LiVESXModifierType)0, (LiVESAccelFlags)0, 
-				       g_cclosure_new (LIVES_GUI_CALLBACK (storeclip_callback),GINT_TO_POINTER (6),NULL));
-	      if (FN_KEYS>6) {
-		lives_accel_group_connect (LIVES_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_F7, (LiVESXModifierType)0, (LiVESAccelFlags)0, 
-					 g_cclosure_new (LIVES_GUI_CALLBACK (storeclip_callback),GINT_TO_POINTER (7),NULL));
-		if (FN_KEYS>7) {
-		  lives_accel_group_connect (LIVES_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_F8, (LiVESXModifierType)0, (LiVESAccelFlags)0, 
-					   g_cclosure_new (LIVES_GUI_CALLBACK (storeclip_callback),GINT_TO_POINTER (8),NULL));
-		  if (FN_KEYS>8) {
-		    lives_accel_group_connect (LIVES_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_F9, (LiVESXModifierType)0, (LiVESAccelFlags)0, 
-					     g_cclosure_new (LIVES_GUI_CALLBACK (storeclip_callback),GINT_TO_POINTER (9),NULL));
-		    if (FN_KEYS>9) {
-		      lives_accel_group_connect (LIVES_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_F10, (LiVESXModifierType)0, (LiVESAccelFlags)0, 
-					       g_cclosure_new (LIVES_GUI_CALLBACK (storeclip_callback),GINT_TO_POINTER (10),NULL));
-		      if (FN_KEYS>10) {
-		      lives_accel_group_connect (LIVES_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_F11, (LiVESXModifierType)0, (LiVESAccelFlags)0, 
-					       g_cclosure_new (LIVES_GUI_CALLBACK (storeclip_callback),GINT_TO_POINTER (11),NULL));
-		      if (FN_KEYS>11) {
-		      lives_accel_group_connect (LIVES_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_F12, (LiVESXModifierType)0, (LiVESAccelFlags)0, 
-					       g_cclosure_new (LIVES_GUI_CALLBACK (storeclip_callback),GINT_TO_POINTER (12),NULL));
-		      // ad nauseum...
-		      }}}}}}}}}}}}
+        lives_accel_group_connect(LIVES_ACCEL_GROUP(mainw->accel_group), LIVES_KEY_F3, (LiVESXModifierType)0, (LiVESAccelFlags)0,
+                                  lives_cclosure_new(LIVES_GUI_CALLBACK(storeclip_callback),LIVES_INT_TO_POINTER(3),NULL));
+        if (FN_KEYS>3) {
+          lives_accel_group_connect(LIVES_ACCEL_GROUP(mainw->accel_group), LIVES_KEY_F4, (LiVESXModifierType)0, (LiVESAccelFlags)0,
+                                    lives_cclosure_new(LIVES_GUI_CALLBACK(storeclip_callback),LIVES_INT_TO_POINTER(4),NULL));
+          if (FN_KEYS>4) {
+            lives_accel_group_connect(LIVES_ACCEL_GROUP(mainw->accel_group), LIVES_KEY_F5, (LiVESXModifierType)0, (LiVESAccelFlags)0,
+                                      lives_cclosure_new(LIVES_GUI_CALLBACK(storeclip_callback),LIVES_INT_TO_POINTER(5),NULL));
+            if (FN_KEYS>5) {
+              lives_accel_group_connect(LIVES_ACCEL_GROUP(mainw->accel_group), LIVES_KEY_F6, (LiVESXModifierType)0, (LiVESAccelFlags)0,
+                                        lives_cclosure_new(LIVES_GUI_CALLBACK(storeclip_callback),LIVES_INT_TO_POINTER(6),NULL));
+              if (FN_KEYS>6) {
+                lives_accel_group_connect(LIVES_ACCEL_GROUP(mainw->accel_group), LIVES_KEY_F7, (LiVESXModifierType)0, (LiVESAccelFlags)0,
+                                          lives_cclosure_new(LIVES_GUI_CALLBACK(storeclip_callback),LIVES_INT_TO_POINTER(7),NULL));
+                if (FN_KEYS>7) {
+                  lives_accel_group_connect(LIVES_ACCEL_GROUP(mainw->accel_group), LIVES_KEY_F8, (LiVESXModifierType)0, (LiVESAccelFlags)0,
+                                            lives_cclosure_new(LIVES_GUI_CALLBACK(storeclip_callback),LIVES_INT_TO_POINTER(8),NULL));
+                  if (FN_KEYS>8) {
+                    lives_accel_group_connect(LIVES_ACCEL_GROUP(mainw->accel_group), LIVES_KEY_F9, (LiVESXModifierType)0, (LiVESAccelFlags)0,
+                                              lives_cclosure_new(LIVES_GUI_CALLBACK(storeclip_callback),LIVES_INT_TO_POINTER(9),NULL));
+                    if (FN_KEYS>9) {
+                      lives_accel_group_connect(LIVES_ACCEL_GROUP(mainw->accel_group), LIVES_KEY_F10, (LiVESXModifierType)0, (LiVESAccelFlags)0,
+                                                lives_cclosure_new(LIVES_GUI_CALLBACK(storeclip_callback),LIVES_INT_TO_POINTER(10),NULL));
+                      if (FN_KEYS>10) {
+                        lives_accel_group_connect(LIVES_ACCEL_GROUP(mainw->accel_group), LIVES_KEY_F11, (LiVESXModifierType)0, (LiVESAccelFlags)0,
+                                                  lives_cclosure_new(LIVES_GUI_CALLBACK(storeclip_callback),LIVES_INT_TO_POINTER(11),NULL));
+                        if (FN_KEYS>11) {
+                          lives_accel_group_connect(LIVES_ACCEL_GROUP(mainw->accel_group), LIVES_KEY_F12, (LiVESXModifierType)0, (LiVESAccelFlags)0,
+                                                    lives_cclosure_new(LIVES_GUI_CALLBACK(storeclip_callback),LIVES_INT_TO_POINTER(12),NULL));
+                          // ad nauseum...
+                        }
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
 
-  lives_accel_group_connect (LIVES_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_0, LIVES_CONTROL_MASK, (LiVESAccelFlags)0, 
-			   g_cclosure_new (LIVES_GUI_CALLBACK (rte_on_off_callback),GINT_TO_POINTER (0),NULL));
+  lives_accel_group_connect(LIVES_ACCEL_GROUP(mainw->accel_group), LIVES_KEY_0, LIVES_CONTROL_MASK, (LiVESAccelFlags)0,
+                            lives_cclosure_new(LIVES_GUI_CALLBACK(rte_on_off_callback),LIVES_INT_TO_POINTER(0),NULL));
   if (FX_KEYS_PHYSICAL>0) {
-    lives_accel_group_connect (LIVES_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_1, LIVES_CONTROL_MASK, (LiVESAccelFlags)0, 
-			     g_cclosure_new (LIVES_GUI_CALLBACK (rte_on_off_callback),GINT_TO_POINTER (1),NULL));
+    lives_accel_group_connect(LIVES_ACCEL_GROUP(mainw->accel_group), LIVES_KEY_1, LIVES_CONTROL_MASK, (LiVESAccelFlags)0,
+                              lives_cclosure_new(LIVES_GUI_CALLBACK(rte_on_off_callback),LIVES_INT_TO_POINTER(1),NULL));
     if (FX_KEYS_PHYSICAL>1) {
-      lives_accel_group_connect (LIVES_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_2, LIVES_CONTROL_MASK, (LiVESAccelFlags)0, 
-			       g_cclosure_new (LIVES_GUI_CALLBACK (rte_on_off_callback),GINT_TO_POINTER (2),NULL));
+      lives_accel_group_connect(LIVES_ACCEL_GROUP(mainw->accel_group), LIVES_KEY_2, LIVES_CONTROL_MASK, (LiVESAccelFlags)0,
+                                lives_cclosure_new(LIVES_GUI_CALLBACK(rte_on_off_callback),LIVES_INT_TO_POINTER(2),NULL));
       if (FX_KEYS_PHYSICAL>2) {
-	lives_accel_group_connect (LIVES_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_3, LIVES_CONTROL_MASK, (LiVESAccelFlags)0, 
-				 g_cclosure_new (LIVES_GUI_CALLBACK (rte_on_off_callback),GINT_TO_POINTER (3),NULL));
-	if (FX_KEYS_PHYSICAL>3) {
-	  lives_accel_group_connect (LIVES_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_4, LIVES_CONTROL_MASK, (LiVESAccelFlags)0, 
-				   g_cclosure_new (LIVES_GUI_CALLBACK (rte_on_off_callback),GINT_TO_POINTER (4),NULL));
-	  if (FX_KEYS_PHYSICAL>4) {
-	    lives_accel_group_connect (LIVES_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_5, LIVES_CONTROL_MASK, (LiVESAccelFlags)0, 
-				     g_cclosure_new (LIVES_GUI_CALLBACK (rte_on_off_callback),GINT_TO_POINTER (5),NULL));
-	    if (FX_KEYS_PHYSICAL>5) {
-	      lives_accel_group_connect (LIVES_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_6, LIVES_CONTROL_MASK, (LiVESAccelFlags)0, 
-				       g_cclosure_new (LIVES_GUI_CALLBACK (rte_on_off_callback),GINT_TO_POINTER (6),NULL));
-	      if (FX_KEYS_PHYSICAL>6) {
-		lives_accel_group_connect (LIVES_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_7, LIVES_CONTROL_MASK, (LiVESAccelFlags)0, 
-					 g_cclosure_new (LIVES_GUI_CALLBACK (rte_on_off_callback),GINT_TO_POINTER (7),NULL));
-		if (FX_KEYS_PHYSICAL>7) {
-		  lives_accel_group_connect (LIVES_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_8, LIVES_CONTROL_MASK, (LiVESAccelFlags)0, 
-					   g_cclosure_new (LIVES_GUI_CALLBACK (rte_on_off_callback),GINT_TO_POINTER (8),NULL));
-		  if (FX_KEYS_PHYSICAL>8) {
-		    lives_accel_group_connect (LIVES_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_9, LIVES_CONTROL_MASK, (LiVESAccelFlags)0, 
-					     g_cclosure_new (LIVES_GUI_CALLBACK (rte_on_off_callback),GINT_TO_POINTER (9),NULL));
-		  }}}}}}}}}
+        lives_accel_group_connect(LIVES_ACCEL_GROUP(mainw->accel_group), LIVES_KEY_3, LIVES_CONTROL_MASK, (LiVESAccelFlags)0,
+                                  lives_cclosure_new(LIVES_GUI_CALLBACK(rte_on_off_callback),LIVES_INT_TO_POINTER(3),NULL));
+        if (FX_KEYS_PHYSICAL>3) {
+          lives_accel_group_connect(LIVES_ACCEL_GROUP(mainw->accel_group), LIVES_KEY_4, LIVES_CONTROL_MASK, (LiVESAccelFlags)0,
+                                    lives_cclosure_new(LIVES_GUI_CALLBACK(rte_on_off_callback),LIVES_INT_TO_POINTER(4),NULL));
+          if (FX_KEYS_PHYSICAL>4) {
+            lives_accel_group_connect(LIVES_ACCEL_GROUP(mainw->accel_group), LIVES_KEY_5, LIVES_CONTROL_MASK, (LiVESAccelFlags)0,
+                                      lives_cclosure_new(LIVES_GUI_CALLBACK(rte_on_off_callback),LIVES_INT_TO_POINTER(5),NULL));
+            if (FX_KEYS_PHYSICAL>5) {
+              lives_accel_group_connect(LIVES_ACCEL_GROUP(mainw->accel_group), LIVES_KEY_6, LIVES_CONTROL_MASK, (LiVESAccelFlags)0,
+                                        lives_cclosure_new(LIVES_GUI_CALLBACK(rte_on_off_callback),LIVES_INT_TO_POINTER(6),NULL));
+              if (FX_KEYS_PHYSICAL>6) {
+                lives_accel_group_connect(LIVES_ACCEL_GROUP(mainw->accel_group), LIVES_KEY_7, LIVES_CONTROL_MASK, (LiVESAccelFlags)0,
+                                          lives_cclosure_new(LIVES_GUI_CALLBACK(rte_on_off_callback),LIVES_INT_TO_POINTER(7),NULL));
+                if (FX_KEYS_PHYSICAL>7) {
+                  lives_accel_group_connect(LIVES_ACCEL_GROUP(mainw->accel_group), LIVES_KEY_8, LIVES_CONTROL_MASK, (LiVESAccelFlags)0,
+                                            lives_cclosure_new(LIVES_GUI_CALLBACK(rte_on_off_callback),LIVES_INT_TO_POINTER(8),NULL));
+                  if (FX_KEYS_PHYSICAL>8) {
+                    lives_accel_group_connect(LIVES_ACCEL_GROUP(mainw->accel_group), LIVES_KEY_9, LIVES_CONTROL_MASK, (LiVESAccelFlags)0,
+                                              lives_cclosure_new(LIVES_GUI_CALLBACK(rte_on_off_callback),LIVES_INT_TO_POINTER(9),NULL));
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
 
 
 
 
-  lives_text_view_set_text (LIVES_TEXT_VIEW (mainw->textview1),
-			    _("Starting...\n"), -1);
-  
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->LiVES), "delete_event",
-		    LIVES_GUI_CALLBACK (on_LiVES_delete_event),
-		    NULL);
-
-  mainw->config_func=lives_signal_connect_after (LIVES_GUI_OBJECT (mainw->video_draw), "configure_event",
-					     LIVES_GUI_CALLBACK (config_event),
-					     NULL);
-  mainw->vidbar_func=lives_signal_connect_after (LIVES_GUI_OBJECT (mainw->video_draw), LIVES_WIDGET_EXPOSE_EVENT,
-		    LIVES_GUI_CALLBACK (expose_vid_event),
-		    NULL);
-  mainw->laudbar_func=lives_signal_connect_after (LIVES_GUI_OBJECT (mainw->laudio_draw), LIVES_WIDGET_EXPOSE_EVENT,
-		    LIVES_GUI_CALLBACK (expose_laud_event),
-		    NULL);
-  mainw->raudbar_func=lives_signal_connect_after (LIVES_GUI_OBJECT (mainw->raudio_draw), LIVES_WIDGET_EXPOSE_EVENT,
-		    LIVES_GUI_CALLBACK (expose_raud_event),
-		    NULL);
-  mainw->pb_fps_func=lives_signal_connect_after (LIVES_GUI_OBJECT (mainw->spinbutton_pb_fps), "value_changed",
-                      LIVES_GUI_CALLBACK (changed_fps_during_pb),
-                      NULL);
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->open), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (on_open_activate),
-		    NULL);
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->open_sel), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (on_open_sel_activate),
-		    NULL);
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->open_dvd), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (on_open_vcd_activate),
-		    GINT_TO_POINTER (1));
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->open_vcd), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (on_open_vcd_activate),
-		    GINT_TO_POINTER (2));
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->open_loc), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (on_open_loc_activate),
-		    NULL);
+  lives_text_view_set_text(LIVES_TEXT_VIEW(mainw->textview1),
+                           _("Starting...\n"), -1);
+
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->LiVES), LIVES_WIDGET_DELETE_EVENT,
+                       LIVES_GUI_CALLBACK(on_LiVES_delete_event),
+                       NULL);
+
+  mainw->config_func=lives_signal_connect_after(LIVES_GUI_OBJECT(mainw->video_draw), LIVES_WIDGET_CONFIGURE_EVENT,
+                     LIVES_GUI_CALLBACK(config_event),
+                     NULL);
+  mainw->vidbar_func=lives_signal_connect_after(LIVES_GUI_OBJECT(mainw->video_draw), LIVES_WIDGET_EXPOSE_EVENT,
+                     LIVES_GUI_CALLBACK(expose_vid_event),
+                     NULL);
+  mainw->laudbar_func=lives_signal_connect_after(LIVES_GUI_OBJECT(mainw->laudio_draw), LIVES_WIDGET_EXPOSE_EVENT,
+                      LIVES_GUI_CALLBACK(expose_laud_event),
+                      NULL);
+  mainw->raudbar_func=lives_signal_connect_after(LIVES_GUI_OBJECT(mainw->raudio_draw), LIVES_WIDGET_EXPOSE_EVENT,
+                      LIVES_GUI_CALLBACK(expose_raud_event),
+                      NULL);
+  mainw->pb_fps_func=lives_signal_connect_after(LIVES_GUI_OBJECT(mainw->spinbutton_pb_fps), LIVES_WIDGET_VALUE_CHANGED_SIGNAL,
+                     LIVES_GUI_CALLBACK(changed_fps_during_pb),
+                     NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->open), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_open_activate),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->open_sel), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_open_sel_activate),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->open_dvd), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_open_vcd_activate),
+                       LIVES_INT_TO_POINTER(1));
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->open_vcd), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_open_vcd_activate),
+                       LIVES_INT_TO_POINTER(2));
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->open_loc), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_open_loc_activate),
+                       NULL);
 #ifdef HAVE_WEBM
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->open_utube), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (on_open_utube_activate),
-		    NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->open_utube), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_open_utube_activate),
+                       NULL);
 #endif
 
 #ifdef HAVE_LDVGRAB
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->open_firewire), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (on_open_fw_activate),
-		    GINT_TO_POINTER(CAM_FORMAT_DV));
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->open_hfirewire), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (on_open_fw_activate),
-		    GINT_TO_POINTER(CAM_FORMAT_HDV));
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->open_firewire), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_open_fw_activate),
+                       LIVES_INT_TO_POINTER(CAM_FORMAT_DV));
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->open_hfirewire), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_open_fw_activate),
+                       LIVES_INT_TO_POINTER(CAM_FORMAT_HDV));
 #endif
 
 #ifdef HAVE_YUV4MPEG
   if (capable->smog_version_correct) {
-    lives_signal_connect (LIVES_GUI_OBJECT (mainw->open_yuv4m), LIVES_WIDGET_ACTIVATE_EVENT,
-		      LIVES_GUI_CALLBACK (on_open_yuv4m_activate),
-		      NULL);
-  }
-#endif
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->open_lives2lives), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (on_open_lives2lives_activate),
-		    NULL);
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->send_lives2lives), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (on_send_lives2lives_activate),
-		    NULL);
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->recent1), LIVES_WIDGET_ACTIVATE_EVENT,
-                      LIVES_GUI_CALLBACK (on_recent_activate),
-		    GINT_TO_POINTER(1));
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->recent2), LIVES_WIDGET_ACTIVATE_EVENT,
-                      LIVES_GUI_CALLBACK (on_recent_activate),
-		    GINT_TO_POINTER(2));
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->recent3), LIVES_WIDGET_ACTIVATE_EVENT,
-                      LIVES_GUI_CALLBACK (on_recent_activate),
-		    GINT_TO_POINTER(3));
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->recent4), LIVES_WIDGET_ACTIVATE_EVENT,
-                      LIVES_GUI_CALLBACK (on_recent_activate),
-		    GINT_TO_POINTER(4));
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->backup), LIVES_WIDGET_ACTIVATE_EVENT,
-                      LIVES_GUI_CALLBACK (on_backup_activate),
-		    NULL);
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->restore), LIVES_WIDGET_ACTIVATE_EVENT,
-                      LIVES_GUI_CALLBACK (on_restore_activate),
-		    NULL);
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->save_as), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (on_save_as_activate),
-		    NULL);
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->save_selection), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (on_save_selection_activate),
-                      NULL);
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->close), LIVES_WIDGET_ACTIVATE_EVENT,
-                      LIVES_GUI_CALLBACK (on_close_activate),
-                      NULL);
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->import_proj), LIVES_WIDGET_ACTIVATE_EVENT,
-                      LIVES_GUI_CALLBACK (on_import_proj_activate),
-                      NULL);
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->export_proj), LIVES_WIDGET_ACTIVATE_EVENT,
-                      LIVES_GUI_CALLBACK (on_export_proj_activate),
-                      NULL);
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->clear_ds), LIVES_WIDGET_ACTIVATE_EVENT,
-                      LIVES_GUI_CALLBACK (on_cleardisk_activate),
-                      NULL);
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->quit), LIVES_WIDGET_ACTIVATE_EVENT,
-                      LIVES_GUI_CALLBACK (on_quit_activate),
-                      GINT_TO_POINTER(0));
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->vj_save_set), LIVES_WIDGET_ACTIVATE_EVENT,
-                      LIVES_GUI_CALLBACK (on_quit_activate),
-                      GINT_TO_POINTER(1));
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->undo), LIVES_WIDGET_ACTIVATE_EVENT,
-                      LIVES_GUI_CALLBACK (on_undo_activate),
-                      NULL);
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->redo), LIVES_WIDGET_ACTIVATE_EVENT,
-                      LIVES_GUI_CALLBACK (on_redo_activate),
-                      NULL);
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->copy), LIVES_WIDGET_ACTIVATE_EVENT,
-                      LIVES_GUI_CALLBACK (on_copy_activate),
-                      NULL);
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->mt_menu), LIVES_WIDGET_ACTIVATE_EVENT,
-                      LIVES_GUI_CALLBACK (on_multitrack_activate),
-                      NULL);
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->cut), LIVES_WIDGET_ACTIVATE_EVENT,
-                      LIVES_GUI_CALLBACK (on_cut_activate),
-                      NULL);
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->insert), LIVES_WIDGET_ACTIVATE_EVENT,
-                      LIVES_GUI_CALLBACK (on_insert_pre_activate),
-                      NULL);
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->merge), LIVES_WIDGET_ACTIVATE_EVENT,
-                      LIVES_GUI_CALLBACK (on_merge_activate),
-                      NULL);
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->paste_as_new), LIVES_WIDGET_ACTIVATE_EVENT,
-                      LIVES_GUI_CALLBACK (on_paste_as_new_activate),
-                      NULL);
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->xdelete), LIVES_WIDGET_ACTIVATE_EVENT,
-                      LIVES_GUI_CALLBACK (on_delete_activate),
-                      NULL);
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->select_all), LIVES_WIDGET_ACTIVATE_EVENT,
-                      LIVES_GUI_CALLBACK (on_select_all_activate),
-                      NULL);
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->select_start_only), LIVES_WIDGET_ACTIVATE_EVENT,
-                      LIVES_GUI_CALLBACK (on_select_start_only_activate),
-                      NULL);
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->select_end_only), LIVES_WIDGET_ACTIVATE_EVENT,
-                      LIVES_GUI_CALLBACK (on_select_end_only_activate),
-                      NULL);
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->select_invert), LIVES_WIDGET_ACTIVATE_EVENT,
-                      LIVES_GUI_CALLBACK (on_select_invert_activate),
-                      NULL);
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->select_new), LIVES_WIDGET_ACTIVATE_EVENT,
-                      LIVES_GUI_CALLBACK (on_select_new_activate),
-                      NULL);
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->select_to_end), LIVES_WIDGET_ACTIVATE_EVENT,
-                      LIVES_GUI_CALLBACK (on_select_to_end_activate),
-                      NULL);
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->select_from_start), LIVES_WIDGET_ACTIVATE_EVENT,
-                      LIVES_GUI_CALLBACK (on_select_from_start_activate),
-                      NULL);
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->select_last), LIVES_WIDGET_ACTIVATE_EVENT,
-                      LIVES_GUI_CALLBACK (on_select_last_activate),
-                      NULL);
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->lock_selwidth), LIVES_WIDGET_ACTIVATE_EVENT,
-                      LIVES_GUI_CALLBACK (on_lock_selwidth_activate),
-                      NULL);
-  mainw->record_perf_func=lives_signal_connect (LIVES_GUI_OBJECT (mainw->record_perf), LIVES_WIDGET_ACTIVATE_EVENT,
-                      LIVES_GUI_CALLBACK (on_record_perf_activate),
-                      NULL);
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->playall), LIVES_WIDGET_ACTIVATE_EVENT,
-                      LIVES_GUI_CALLBACK (on_playall_activate),
-                      NULL);
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->rewind), LIVES_WIDGET_ACTIVATE_EVENT,
-                      LIVES_GUI_CALLBACK (on_rewind_activate),
-                      NULL);
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->playsel), LIVES_WIDGET_ACTIVATE_EVENT,
-                      LIVES_GUI_CALLBACK (on_playsel_activate),
-                      NULL);
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->playclip), LIVES_WIDGET_ACTIVATE_EVENT,
-                      LIVES_GUI_CALLBACK (on_playclip_activate),
-                      NULL);
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->stop), LIVES_WIDGET_ACTIVATE_EVENT,
-                      LIVES_GUI_CALLBACK (on_stop_activate),
-                      NULL);
-  mainw->fullscreen_cb_func=lives_signal_connect (LIVES_GUI_OBJECT (mainw->full_screen), LIVES_WIDGET_ACTIVATE_EVENT,
-					      LIVES_GUI_CALLBACK (on_full_screen_activate),
-					      NULL);
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->sw_sound), LIVES_WIDGET_ACTIVATE_EVENT,
-                      LIVES_GUI_CALLBACK (on_boolean_toggled),
-		    &mainw->save_with_sound); // TODO - make pref
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->showsubs), LIVES_WIDGET_ACTIVATE_EVENT,
-                      LIVES_GUI_CALLBACK (on_showsubs_toggled),
-                      NULL);
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->letter), LIVES_WIDGET_ACTIVATE_EVENT,
-                      LIVES_GUI_CALLBACK (on_boolean_toggled),
-                      &prefs->letterbox);
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->aload_subs), LIVES_WIDGET_ACTIVATE_EVENT,
-                      LIVES_GUI_CALLBACK (on_boolean_toggled),
-                      &prefs->autoload_subs);
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->ccpd_sound), LIVES_WIDGET_ACTIVATE_EVENT,
-                      LIVES_GUI_CALLBACK (on_boolean_toggled),
-		    &mainw->ccpd_with_sound); // TODO - make pref
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->dsize), LIVES_WIDGET_ACTIVATE_EVENT,
-                      LIVES_GUI_CALLBACK (on_double_size_activate),
-                      NULL);
-  mainw->sepwin_cb_func=lives_signal_connect (LIVES_GUI_OBJECT (mainw->sepwin), LIVES_WIDGET_ACTIVATE_EVENT,
-					  LIVES_GUI_CALLBACK (on_sepwin_activate),
-					  NULL);
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->fade), LIVES_WIDGET_ACTIVATE_EVENT,
-                      LIVES_GUI_CALLBACK (on_fade_activate),
-                      NULL);
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->loop_video), LIVES_WIDGET_ACTIVATE_EVENT,
-                      LIVES_GUI_CALLBACK (on_loop_video_activate),
-                      NULL);
-  mainw->loop_cont_func=lives_signal_connect (LIVES_GUI_OBJECT (mainw->loop_continue), LIVES_WIDGET_ACTIVATE_EVENT,
-					  LIVES_GUI_CALLBACK (on_loop_cont_activate),
-					  NULL);
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->loop_ping_pong), LIVES_WIDGET_ACTIVATE_EVENT,
-                      LIVES_GUI_CALLBACK (on_ping_pong_activate),
-                      NULL);
-  mainw->mute_audio_func=lives_signal_connect (LIVES_GUI_OBJECT (mainw->mute_audio), LIVES_WIDGET_ACTIVATE_EVENT,
-					   LIVES_GUI_CALLBACK (on_mute_activate),
-					   NULL);
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->sticky), LIVES_WIDGET_ACTIVATE_EVENT,
-                      LIVES_GUI_CALLBACK (on_sticky_activate),
-                      NULL);
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->showfct), LIVES_WIDGET_ACTIVATE_EVENT,
-                      LIVES_GUI_CALLBACK (on_showfct_activate),
-                      NULL);
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->preferences), LIVES_WIDGET_ACTIVATE_EVENT,
-                      LIVES_GUI_CALLBACK (on_preferences_activate),
-                      NULL);
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->change_speed), LIVES_WIDGET_ACTIVATE_EVENT,
-                      LIVES_GUI_CALLBACK (on_change_speed_activate),
-                      NULL);
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->resample_video), LIVES_WIDGET_ACTIVATE_EVENT,
-                      LIVES_GUI_CALLBACK (on_resample_video_activate),
-                      NULL);
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->load_subs), LIVES_WIDGET_ACTIVATE_EVENT,
-                      LIVES_GUI_CALLBACK (on_load_subs_activate),
-                      NULL);
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->erase_subs), LIVES_WIDGET_ACTIVATE_EVENT,
-                      LIVES_GUI_CALLBACK (on_erase_subs_activate),
-                      NULL);
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->capture), LIVES_WIDGET_ACTIVATE_EVENT,
-                      LIVES_GUI_CALLBACK (on_capture_activate),
-                      NULL);
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->rev_clipboard), LIVES_WIDGET_ACTIVATE_EVENT,
-                      LIVES_GUI_CALLBACK (on_rev_clipboard_activate),
-                      NULL);
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->export_selaudio), LIVES_WIDGET_ACTIVATE_EVENT,
-                      LIVES_GUI_CALLBACK (on_export_audio_activate),
-                      GINT_TO_POINTER (0));
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->export_allaudio), LIVES_WIDGET_ACTIVATE_EVENT,
-                      LIVES_GUI_CALLBACK (on_export_audio_activate),
-                      GINT_TO_POINTER(1));
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->append_audio), LIVES_WIDGET_ACTIVATE_EVENT,
-                      LIVES_GUI_CALLBACK (on_append_audio_activate),
-                      NULL);
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->trim_audio), LIVES_WIDGET_ACTIVATE_EVENT,
-                      LIVES_GUI_CALLBACK (on_trim_audio_activate),
-                      GINT_TO_POINTER (0));
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->trim_to_pstart), LIVES_WIDGET_ACTIVATE_EVENT,
-                      LIVES_GUI_CALLBACK (on_trim_audio_activate),
-                      GINT_TO_POINTER (1));
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->delsel_audio), LIVES_WIDGET_ACTIVATE_EVENT,
-                      LIVES_GUI_CALLBACK (on_del_audio_activate),
-                      GINT_TO_POINTER (0));
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->fade_aud_in), LIVES_WIDGET_ACTIVATE_EVENT,
-                      LIVES_GUI_CALLBACK (on_fade_audio_activate),
-                      GINT_TO_POINTER (0));
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->fade_aud_out), LIVES_WIDGET_ACTIVATE_EVENT,
-                      LIVES_GUI_CALLBACK (on_fade_audio_activate),
-                      GINT_TO_POINTER (1));
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->delall_audio), LIVES_WIDGET_ACTIVATE_EVENT,
-                      LIVES_GUI_CALLBACK (on_del_audio_activate),
-                      GINT_TO_POINTER (1));
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->ins_silence), LIVES_WIDGET_ACTIVATE_EVENT,
-                      LIVES_GUI_CALLBACK (on_ins_silence_activate),
-                      NULL);
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->recaudio_clip), LIVES_WIDGET_ACTIVATE_EVENT,
-                      LIVES_GUI_CALLBACK (on_recaudclip_activate),
-                      NULL);
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->recaudio_sel), LIVES_WIDGET_ACTIVATE_EVENT,
-                      LIVES_GUI_CALLBACK (on_recaudsel_activate),
-                      NULL);
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->resample_audio), LIVES_WIDGET_ACTIVATE_EVENT,
-                      LIVES_GUI_CALLBACK (on_resample_audio_activate),
-                      NULL);
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->load_audio), LIVES_WIDGET_ACTIVATE_EVENT,
-                      LIVES_GUI_CALLBACK (on_load_audio_activate),
-                      NULL);
+    lives_signal_connect(LIVES_GUI_OBJECT(mainw->open_yuv4m), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                         LIVES_GUI_CALLBACK(on_open_yuv4m_activate),
+                         NULL);
+  }
+#endif
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->open_lives2lives), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_open_lives2lives_activate),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->send_lives2lives), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_send_lives2lives_activate),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->recent1), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_recent_activate),
+                       LIVES_INT_TO_POINTER(1));
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->recent2), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_recent_activate),
+                       LIVES_INT_TO_POINTER(2));
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->recent3), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_recent_activate),
+                       LIVES_INT_TO_POINTER(3));
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->recent4), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_recent_activate),
+                       LIVES_INT_TO_POINTER(4));
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->backup), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_backup_activate),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->restore), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_restore_activate),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->save_as), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_save_as_activate),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->save_selection), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_save_selection_activate),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->close), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_close_activate),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->import_proj), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_import_proj_activate),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->export_proj), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_export_proj_activate),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->clear_ds), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_cleardisk_activate),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->quit), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_quit_activate),
+                       LIVES_INT_TO_POINTER(0));
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->vj_save_set), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_quit_activate),
+                       LIVES_INT_TO_POINTER(1));
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->undo), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_undo_activate),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->redo), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_redo_activate),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->copy), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_copy_activate),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->mt_menu), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_multitrack_activate),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->cut), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_cut_activate),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->insert), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_insert_pre_activate),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->merge), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_merge_activate),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->paste_as_new), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_paste_as_new_activate),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->xdelete), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_delete_activate),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->select_all), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_select_all_activate),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->select_start_only), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_select_start_only_activate),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->select_end_only), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_select_end_only_activate),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->select_invert), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_select_invert_activate),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->select_new), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_select_new_activate),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->select_to_end), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_select_to_end_activate),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->select_from_start), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_select_from_start_activate),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->select_last), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_select_last_activate),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->lock_selwidth), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_lock_selwidth_activate),
+                       NULL);
+  mainw->record_perf_func=lives_signal_connect(LIVES_GUI_OBJECT(mainw->record_perf), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                          LIVES_GUI_CALLBACK(on_record_perf_activate),
+                          NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->playall), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_playall_activate),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->rewind), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_rewind_activate),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->playsel), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_playsel_activate),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->playclip), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_playclip_activate),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->stop), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_stop_activate),
+                       NULL);
+  mainw->fullscreen_cb_func=lives_signal_connect(LIVES_GUI_OBJECT(mainw->full_screen), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                            LIVES_GUI_CALLBACK(on_full_screen_activate),
+                            NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->sw_sound), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_boolean_toggled),
+                       &mainw->save_with_sound); // TODO - make pref
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->showsubs), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_showsubs_toggled),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->letter), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_boolean_toggled),
+                       &prefs->letterbox);
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->aload_subs), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_boolean_toggled),
+                       &prefs->autoload_subs);
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->ccpd_sound), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_boolean_toggled),
+                       &mainw->ccpd_with_sound); // TODO - make pref
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->dsize), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_double_size_activate),
+                       NULL);
+  mainw->sepwin_cb_func=lives_signal_connect(LIVES_GUI_OBJECT(mainw->sepwin), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                        LIVES_GUI_CALLBACK(on_sepwin_activate),
+                        NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->fade), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_fade_activate),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->loop_video), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_loop_video_activate),
+                       NULL);
+  mainw->loop_cont_func=lives_signal_connect(LIVES_GUI_OBJECT(mainw->loop_continue), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                        LIVES_GUI_CALLBACK(on_loop_cont_activate),
+                        NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->loop_ping_pong), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_ping_pong_activate),
+                       NULL);
+  mainw->mute_audio_func=lives_signal_connect(LIVES_GUI_OBJECT(mainw->mute_audio), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                         LIVES_GUI_CALLBACK(on_mute_activate),
+                         NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->sticky), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_sticky_activate),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->showfct), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_showfct_activate),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->preferences), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_preferences_activate),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->change_speed), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_change_speed_activate),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->resample_video), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_resample_video_activate),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->load_subs), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_load_subs_activate),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->erase_subs), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_erase_subs_activate),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->capture), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_capture_activate),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->rev_clipboard), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_rev_clipboard_activate),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->export_selaudio), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_export_audio_activate),
+                       LIVES_INT_TO_POINTER(0));
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->export_allaudio), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_export_audio_activate),
+                       LIVES_INT_TO_POINTER(1));
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->append_audio), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_append_audio_activate),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->trim_audio), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_trim_audio_activate),
+                       LIVES_INT_TO_POINTER(0));
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->trim_to_pstart), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_trim_audio_activate),
+                       LIVES_INT_TO_POINTER(1));
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->delsel_audio), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_del_audio_activate),
+                       LIVES_INT_TO_POINTER(0));
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->fade_aud_in), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_fade_audio_activate),
+                       LIVES_INT_TO_POINTER(0));
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->fade_aud_out), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_fade_audio_activate),
+                       LIVES_INT_TO_POINTER(1));
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->delall_audio), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_del_audio_activate),
+                       LIVES_INT_TO_POINTER(1));
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->ins_silence), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_ins_silence_activate),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->recaudio_clip), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_recaudclip_activate),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->recaudio_sel), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_recaudsel_activate),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->resample_audio), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_resample_audio_activate),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->load_audio), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_load_audio_activate),
+                       NULL);
   if (capable->has_cdda2wav) {
-    lives_signal_connect (LIVES_GUI_OBJECT (mainw->load_cdtrack), LIVES_WIDGET_ACTIVATE_EVENT,
-                      LIVES_GUI_CALLBACK (on_load_cdtrack_activate),
-                      NULL);
-    
-    lives_signal_connect (LIVES_GUI_OBJECT (mainw->eject_cd), LIVES_WIDGET_ACTIVATE_EVENT,
-                      LIVES_GUI_CALLBACK (on_eject_cd_activate),
-                      NULL);
-  }
-
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->show_file_info), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (on_show_file_info_activate),
-		    NULL);
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->show_file_comments), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (on_show_file_comments_activate),
-		    NULL);
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->show_clipboard_info), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (on_show_clipboard_info_activate),
-		    NULL);
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->show_messages), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (on_show_messages_activate),
-		    NULL);
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->show_layout_errors), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (popup_lmap_errors),
-		    NULL);
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->rename), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (on_rename_activate),
-		    NULL);
-
-  lives_signal_connect (LIVES_GUI_OBJECT (new_test_rfx), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (on_new_rfx_activate),
-		    GINT_TO_POINTER (RFX_STATUS_TEST));
-  lives_signal_connect (LIVES_GUI_OBJECT (copy_rfx), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (on_copy_rfx_activate),
-		    GINT_TO_POINTER (RFX_STATUS_TEST));
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->edit_test_rfx), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (on_edit_rfx_activate),
-		    GINT_TO_POINTER (RFX_STATUS_TEST));
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->rename_test_rfx), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (on_rename_rfx_activate),
-		    GINT_TO_POINTER (RFX_STATUS_TEST));
-  lives_signal_connect (LIVES_GUI_OBJECT (rebuild_rfx), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (on_rebuild_rfx_activate),
-		    NULL);
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->delete_test_rfx), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (on_delete_rfx_activate),
-		    GINT_TO_POINTER (RFX_STATUS_TEST));
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->delete_custom_rfx), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (on_delete_rfx_activate),
-		    GINT_TO_POINTER (RFX_STATUS_CUSTOM));
-  lives_signal_connect (LIVES_GUI_OBJECT (import_custom_rfx), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (on_import_rfx_activate),
-		    GINT_TO_POINTER (RFX_STATUS_CUSTOM));
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->export_custom_rfx), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (on_export_rfx_activate),
-		    GINT_TO_POINTER (RFX_STATUS_CUSTOM));
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->promote_test_rfx), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (on_promote_rfx_activate),
-		    GINT_TO_POINTER (RFX_STATUS_TEST));
-
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->vj_load_set), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (on_load_set_activate),
-		    NULL);
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->vj_show_keys), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (on_show_keys_activate),
-		    NULL);
-  lives_signal_connect (LIVES_GUI_OBJECT (assign_rte_keys), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (on_assign_rte_keys_activate),
-		    NULL);
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->save_rte_defs), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (on_save_rte_defs_activate),
-		    NULL);
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->vj_reset), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (on_vj_reset_activate),
-		    NULL);
+    lives_signal_connect(LIVES_GUI_OBJECT(mainw->load_cdtrack), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                         LIVES_GUI_CALLBACK(on_load_cdtrack_activate),
+                         NULL);
+
+    lives_signal_connect(LIVES_GUI_OBJECT(mainw->eject_cd), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                         LIVES_GUI_CALLBACK(on_eject_cd_activate),
+                         NULL);
+  }
+
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->show_file_info), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_show_file_info_activate),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->show_file_comments), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_show_file_comments_activate),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->show_clipboard_info), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_show_clipboard_info_activate),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->show_messages), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_show_messages_activate),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->show_layout_errors), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(popup_lmap_errors),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->rename), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_rename_activate),
+                       NULL);
+
+  lives_signal_connect(LIVES_GUI_OBJECT(new_test_rfx), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_new_rfx_activate),
+                       LIVES_INT_TO_POINTER(RFX_STATUS_TEST));
+  lives_signal_connect(LIVES_GUI_OBJECT(copy_rfx), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_copy_rfx_activate),
+                       LIVES_INT_TO_POINTER(RFX_STATUS_TEST));
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->edit_test_rfx), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_edit_rfx_activate),
+                       LIVES_INT_TO_POINTER(RFX_STATUS_TEST));
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->rename_test_rfx), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_rename_rfx_activate),
+                       LIVES_INT_TO_POINTER(RFX_STATUS_TEST));
+  lives_signal_connect(LIVES_GUI_OBJECT(rebuild_rfx), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_rebuild_rfx_activate),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->delete_test_rfx), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_delete_rfx_activate),
+                       LIVES_INT_TO_POINTER(RFX_STATUS_TEST));
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->delete_custom_rfx), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_delete_rfx_activate),
+                       LIVES_INT_TO_POINTER(RFX_STATUS_CUSTOM));
+  lives_signal_connect(LIVES_GUI_OBJECT(import_custom_rfx), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_import_rfx_activate),
+                       LIVES_INT_TO_POINTER(RFX_STATUS_CUSTOM));
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->export_custom_rfx), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_export_rfx_activate),
+                       LIVES_INT_TO_POINTER(RFX_STATUS_CUSTOM));
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->promote_test_rfx), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_promote_rfx_activate),
+                       LIVES_INT_TO_POINTER(RFX_STATUS_TEST));
+
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->vj_load_set), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_load_set_activate),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->vj_show_keys), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_show_keys_activate),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(assign_rte_keys), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_assign_rte_keys_activate),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->save_rte_defs), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_save_rte_defs_activate),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->vj_reset), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_vj_reset_activate),
+                       NULL);
 #ifdef ENABLE_OSC
-  lives_signal_connect (LIVES_GUI_OBJECT (midi_learn), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (on_midi_learn_activate),
-		    NULL);
-  lives_signal_connect (LIVES_GUI_OBJECT (midi_save), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (on_midi_save_activate),
-		    NULL);
-  lives_signal_connect (LIVES_GUI_OBJECT (midi_load), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (on_midi_load_activate),
-		    NULL);
-#endif
-
-  mainw->toy_func_none=lives_signal_connect_after (LIVES_GUI_OBJECT (mainw->toy_none), LIVES_WIDGET_ACTIVATE_EVENT,
-					 LIVES_GUI_CALLBACK (on_toy_activate),
-					 NULL);
-
-  mainw->toy_func_autolives=lives_signal_connect_after (LIVES_GUI_OBJECT (mainw->toy_autolives), LIVES_WIDGET_ACTIVATE_EVENT,
-						  LIVES_GUI_CALLBACK (on_toy_activate),
-						  GINT_TO_POINTER(LIVES_TOY_AUTOLIVES));
-
-  mainw->toy_func_random_frames=lives_signal_connect_after (LIVES_GUI_OBJECT (mainw->toy_random_frames), LIVES_WIDGET_ACTIVATE_EVENT,
-						  LIVES_GUI_CALLBACK (on_toy_activate),
-						  GINT_TO_POINTER(LIVES_TOY_MAD_FRAMES));
-
-  mainw->toy_func_lives_tv=lives_signal_connect_after (LIVES_GUI_OBJECT (mainw->toy_tv), LIVES_WIDGET_ACTIVATE_EVENT,
-					     LIVES_GUI_CALLBACK (on_toy_activate),
-					     GINT_TO_POINTER(LIVES_TOY_TV));
-
-  lives_signal_connect (LIVES_GUI_OBJECT (about), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (on_about_activate),
-		    NULL);
-
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->troubleshoot), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (on_troubleshoot_activate),
-		    NULL);
-
-  lives_signal_connect (LIVES_GUI_OBJECT (show_manual), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (show_manual_activate),
-		    NULL);
-
-  lives_signal_connect (LIVES_GUI_OBJECT (email_author), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (email_author_activate),
-		    NULL);
-
-  lives_signal_connect (LIVES_GUI_OBJECT (donate), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (donate_activate),
-		    NULL);
-
-  lives_signal_connect (LIVES_GUI_OBJECT (report_bug), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (report_bug_activate),
-		    NULL);
-
-  lives_signal_connect (LIVES_GUI_OBJECT (suggest_feature), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (suggest_feature_activate),
-		    NULL);
-
-  lives_signal_connect (LIVES_GUI_OBJECT (help_translate), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (help_translate_activate),
-		    NULL);
-
-  mainw->spin_start_func=lives_signal_connect_after (LIVES_GUI_OBJECT (mainw->spinbutton_start), "value_changed",
-						 LIVES_GUI_CALLBACK (on_spinbutton_start_value_changed),
-						 NULL);
-  mainw->spin_end_func=lives_signal_connect_after (LIVES_GUI_OBJECT (mainw->spinbutton_end), "value_changed",
-					       LIVES_GUI_CALLBACK (on_spinbutton_end_value_changed),
-					       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(midi_learn), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_midi_learn_activate),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(midi_save), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_midi_save_activate),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(midi_load), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_midi_load_activate),
+                       NULL);
+#endif
+
+  mainw->toy_func_none=lives_signal_connect_after(LIVES_GUI_OBJECT(mainw->toy_none), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_toy_activate),
+                       NULL);
+
+  mainw->toy_func_autolives=lives_signal_connect_after(LIVES_GUI_OBJECT(mainw->toy_autolives), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                            LIVES_GUI_CALLBACK(on_toy_activate),
+                            LIVES_INT_TO_POINTER(LIVES_TOY_AUTOLIVES));
+
+  mainw->toy_func_random_frames=lives_signal_connect_after(LIVES_GUI_OBJECT(mainw->toy_random_frames), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                                LIVES_GUI_CALLBACK(on_toy_activate),
+                                LIVES_INT_TO_POINTER(LIVES_TOY_MAD_FRAMES));
+
+  mainw->toy_func_lives_tv=lives_signal_connect_after(LIVES_GUI_OBJECT(mainw->toy_tv), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                           LIVES_GUI_CALLBACK(on_toy_activate),
+                           LIVES_INT_TO_POINTER(LIVES_TOY_TV));
+
+  lives_signal_connect(LIVES_GUI_OBJECT(about), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_about_activate),
+                       NULL);
+
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->troubleshoot), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_troubleshoot_activate),
+                       NULL);
+
+  lives_signal_connect(LIVES_GUI_OBJECT(show_manual), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(show_manual_activate),
+                       NULL);
+
+  lives_signal_connect(LIVES_GUI_OBJECT(email_author), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(email_author_activate),
+                       NULL);
+
+  lives_signal_connect(LIVES_GUI_OBJECT(donate), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(donate_activate),
+                       NULL);
+
+  lives_signal_connect(LIVES_GUI_OBJECT(report_bug), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(report_bug_activate),
+                       NULL);
+
+  lives_signal_connect(LIVES_GUI_OBJECT(suggest_feature), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(suggest_feature_activate),
+                       NULL);
+
+  lives_signal_connect(LIVES_GUI_OBJECT(help_translate), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(help_translate_activate),
+                       NULL);
+
+  mainw->spin_start_func=lives_signal_connect_after(LIVES_GUI_OBJECT(mainw->spinbutton_start), LIVES_WIDGET_VALUE_CHANGED_SIGNAL,
+                         LIVES_GUI_CALLBACK(on_spinbutton_start_value_changed),
+                         NULL);
+  mainw->spin_end_func=lives_signal_connect_after(LIVES_GUI_OBJECT(mainw->spinbutton_end), LIVES_WIDGET_VALUE_CHANGED_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_spinbutton_end_value_changed),
+                       NULL);
 
   // these are for the menu transport buttons
   if (capable->smog_version_correct) {
-    lives_signal_connect (LIVES_GUI_OBJECT (mainw->m_sepwinbutton), LIVES_WIDGET_CLICKED_EVENT,
-		      LIVES_GUI_CALLBACK (on_sepwin_pressed),
-		      NULL);
-    lives_signal_connect (LIVES_GUI_OBJECT (mainw->m_playbutton), LIVES_WIDGET_CLICKED_EVENT,
-		      LIVES_GUI_CALLBACK (on_playall_activate),
-		      NULL);
-    lives_signal_connect (LIVES_GUI_OBJECT (mainw->m_stopbutton), LIVES_WIDGET_CLICKED_EVENT,
-		      LIVES_GUI_CALLBACK (on_stop_activate),
-		      NULL);
-    lives_signal_connect (LIVES_GUI_OBJECT (mainw->m_playselbutton), LIVES_WIDGET_CLICKED_EVENT,
-		      LIVES_GUI_CALLBACK (on_playsel_activate),
-		      NULL);
-    lives_signal_connect (LIVES_GUI_OBJECT (mainw->m_rewindbutton), LIVES_WIDGET_CLICKED_EVENT,
-		      LIVES_GUI_CALLBACK (on_rewind_activate),
-		      NULL);
-    lives_signal_connect (LIVES_GUI_OBJECT (mainw->m_mutebutton), LIVES_WIDGET_CLICKED_EVENT,
-		      LIVES_GUI_CALLBACK (on_mute_button_activate),
-		      NULL);
-    lives_signal_connect (LIVES_GUI_OBJECT (mainw->m_loopbutton), LIVES_WIDGET_CLICKED_EVENT,
-		      LIVES_GUI_CALLBACK (on_loop_button_activate),
-		      NULL);
-    
+    lives_signal_connect(LIVES_GUI_OBJECT(mainw->m_sepwinbutton), LIVES_WIDGET_CLICKED_SIGNAL,
+                         LIVES_GUI_CALLBACK(on_sepwin_pressed),
+                         NULL);
+    lives_signal_connect(LIVES_GUI_OBJECT(mainw->m_playbutton), LIVES_WIDGET_CLICKED_SIGNAL,
+                         LIVES_GUI_CALLBACK(on_playall_activate),
+                         NULL);
+    lives_signal_connect(LIVES_GUI_OBJECT(mainw->m_stopbutton), LIVES_WIDGET_CLICKED_SIGNAL,
+                         LIVES_GUI_CALLBACK(on_stop_activate),
+                         NULL);
+    lives_signal_connect(LIVES_GUI_OBJECT(mainw->m_playselbutton), LIVES_WIDGET_CLICKED_SIGNAL,
+                         LIVES_GUI_CALLBACK(on_playsel_activate),
+                         NULL);
+    lives_signal_connect(LIVES_GUI_OBJECT(mainw->m_rewindbutton), LIVES_WIDGET_CLICKED_SIGNAL,
+                         LIVES_GUI_CALLBACK(on_rewind_activate),
+                         NULL);
+    lives_signal_connect(LIVES_GUI_OBJECT(mainw->m_mutebutton), LIVES_WIDGET_CLICKED_SIGNAL,
+                         LIVES_GUI_CALLBACK(on_mute_button_activate),
+                         NULL);
+    lives_signal_connect(LIVES_GUI_OBJECT(mainw->m_loopbutton), LIVES_WIDGET_CLICKED_SIGNAL,
+                         LIVES_GUI_CALLBACK(on_loop_button_activate),
+                         NULL);
+
     // these are 'invisible' buttons for the key accelerators
-    lives_signal_connect (LIVES_GUI_OBJECT (mainw->t_stopbutton), LIVES_WIDGET_CLICKED_EVENT,
-                      LIVES_GUI_CALLBACK (on_stop_activate),
-                      NULL);
-    lives_signal_connect (LIVES_GUI_OBJECT (mainw->t_bckground), LIVES_WIDGET_CLICKED_EVENT,
-                      LIVES_GUI_CALLBACK (on_fade_pressed),
-                      NULL);
-    lives_signal_connect (LIVES_GUI_OBJECT (mainw->t_sepwin), LIVES_WIDGET_CLICKED_EVENT,
-                      LIVES_GUI_CALLBACK (on_sepwin_pressed),
-                      NULL);
-    lives_signal_connect (LIVES_GUI_OBJECT (mainw->t_double), LIVES_WIDGET_CLICKED_EVENT,
-                      LIVES_GUI_CALLBACK (on_double_size_pressed),
-                      NULL);
-    lives_signal_connect (LIVES_GUI_OBJECT (mainw->t_fullscreen), LIVES_WIDGET_CLICKED_EVENT,
-                      LIVES_GUI_CALLBACK (on_full_screen_pressed),
-                      NULL);
-    lives_signal_connect (LIVES_GUI_OBJECT (mainw->t_infobutton), LIVES_WIDGET_CLICKED_EVENT,
-                      LIVES_GUI_CALLBACK (on_show_file_info_activate),
-                      NULL);
-    lives_signal_connect (LIVES_GUI_OBJECT (mainw->t_hide), LIVES_WIDGET_CLICKED_EVENT,
-                      LIVES_GUI_CALLBACK (on_toolbar_hide),
-                      NULL);
-    lives_signal_connect (LIVES_GUI_OBJECT (mainw->t_slower), LIVES_WIDGET_CLICKED_EVENT,
-                      LIVES_GUI_CALLBACK (on_slower_pressed),
-                      NULL);
-    lives_signal_connect (LIVES_GUI_OBJECT (mainw->t_faster), LIVES_WIDGET_CLICKED_EVENT,
-                      LIVES_GUI_CALLBACK (on_faster_pressed),
-                      NULL);
-    lives_signal_connect (LIVES_GUI_OBJECT (mainw->t_back), LIVES_WIDGET_CLICKED_EVENT,
-                      LIVES_GUI_CALLBACK (on_back_pressed),
-                      NULL);
-    lives_signal_connect (LIVES_GUI_OBJECT (mainw->t_forward), LIVES_WIDGET_CLICKED_EVENT,
-                      LIVES_GUI_CALLBACK (on_forward_pressed),
-                      NULL);
-    
-    mainw->mouse_fn1=lives_signal_connect (LIVES_GUI_OBJECT (mainw->eventbox2), "motion_notify_event",
-				       LIVES_GUI_CALLBACK (on_mouse_sel_update),
-				       NULL);
-    lives_signal_handler_block (mainw->eventbox2,mainw->mouse_fn1);
+    lives_signal_connect(LIVES_GUI_OBJECT(mainw->t_stopbutton), LIVES_WIDGET_CLICKED_SIGNAL,
+                         LIVES_GUI_CALLBACK(on_stop_activate),
+                         NULL);
+    lives_signal_connect(LIVES_GUI_OBJECT(mainw->t_bckground), LIVES_WIDGET_CLICKED_SIGNAL,
+                         LIVES_GUI_CALLBACK(on_fade_pressed),
+                         NULL);
+    lives_signal_connect(LIVES_GUI_OBJECT(mainw->t_sepwin), LIVES_WIDGET_CLICKED_SIGNAL,
+                         LIVES_GUI_CALLBACK(on_sepwin_pressed),
+                         NULL);
+    lives_signal_connect(LIVES_GUI_OBJECT(mainw->t_double), LIVES_WIDGET_CLICKED_SIGNAL,
+                         LIVES_GUI_CALLBACK(on_double_size_pressed),
+                         NULL);
+    lives_signal_connect(LIVES_GUI_OBJECT(mainw->t_fullscreen), LIVES_WIDGET_CLICKED_SIGNAL,
+                         LIVES_GUI_CALLBACK(on_full_screen_pressed),
+                         NULL);
+    lives_signal_connect(LIVES_GUI_OBJECT(mainw->t_infobutton), LIVES_WIDGET_CLICKED_SIGNAL,
+                         LIVES_GUI_CALLBACK(on_show_file_info_activate),
+                         NULL);
+    lives_signal_connect(LIVES_GUI_OBJECT(mainw->t_hide), LIVES_WIDGET_CLICKED_SIGNAL,
+                         LIVES_GUI_CALLBACK(on_toolbar_hide),
+                         NULL);
+    lives_signal_connect(LIVES_GUI_OBJECT(mainw->t_slower), LIVES_WIDGET_CLICKED_SIGNAL,
+                         LIVES_GUI_CALLBACK(on_slower_pressed),
+                         NULL);
+    lives_signal_connect(LIVES_GUI_OBJECT(mainw->t_faster), LIVES_WIDGET_CLICKED_SIGNAL,
+                         LIVES_GUI_CALLBACK(on_faster_pressed),
+                         NULL);
+    lives_signal_connect(LIVES_GUI_OBJECT(mainw->t_back), LIVES_WIDGET_CLICKED_SIGNAL,
+                         LIVES_GUI_CALLBACK(on_back_pressed),
+                         NULL);
+    lives_signal_connect(LIVES_GUI_OBJECT(mainw->t_forward), LIVES_WIDGET_CLICKED_SIGNAL,
+                         LIVES_GUI_CALLBACK(on_forward_pressed),
+                         NULL);
+
+    mainw->mouse_fn1=lives_signal_connect(LIVES_GUI_OBJECT(mainw->eventbox2), LIVES_WIDGET_MOTION_NOTIFY_EVENT,
+                                          LIVES_GUI_CALLBACK(on_mouse_sel_update),
+                                          NULL);
+    lives_signal_handler_block(mainw->eventbox2,mainw->mouse_fn1);
     mainw->mouse_blocked=TRUE;
-    lives_signal_connect (LIVES_GUI_OBJECT (mainw->eventbox2), "button_release_event",
-                      LIVES_GUI_CALLBACK (on_mouse_sel_reset),
-                      NULL);
-    lives_signal_connect (LIVES_GUI_OBJECT (mainw->eventbox2), "button_press_event",
-                      LIVES_GUI_CALLBACK (on_mouse_sel_start),
-                      NULL);
-    lives_signal_connect (LIVES_GUI_OBJECT (mainw->hruler), "motion_notify_event",
-                      LIVES_GUI_CALLBACK (return_true),
-                      NULL);
-    mainw->hrule_func=lives_signal_connect (LIVES_GUI_OBJECT (mainw->eventbox5), "motion_notify_event",
-					LIVES_GUI_CALLBACK (on_hrule_update),
-					NULL);
-    lives_signal_handler_block (mainw->eventbox5,mainw->hrule_func);
-    lives_signal_connect (LIVES_GUI_OBJECT(mainw->eventbox5), "enter-notify-event",LIVES_GUI_CALLBACK (on_hrule_enter),NULL);
+    lives_signal_connect(LIVES_GUI_OBJECT(mainw->eventbox2), LIVES_WIDGET_BUTTON_RELEASE_EVENT,
+                         LIVES_GUI_CALLBACK(on_mouse_sel_reset),
+                         NULL);
+    lives_signal_connect(LIVES_GUI_OBJECT(mainw->eventbox2), LIVES_WIDGET_BUTTON_PRESS_EVENT,
+                         LIVES_GUI_CALLBACK(on_mouse_sel_start),
+                         NULL);
+    lives_signal_connect(LIVES_GUI_OBJECT(mainw->hruler), LIVES_WIDGET_MOTION_NOTIFY_EVENT,
+                         LIVES_GUI_CALLBACK(return_true),
+                         NULL);
+    mainw->hrule_func=lives_signal_connect(LIVES_GUI_OBJECT(mainw->eventbox5), LIVES_WIDGET_MOTION_NOTIFY_EVENT,
+                                           LIVES_GUI_CALLBACK(on_hrule_update),
+                                           NULL);
+    lives_signal_handler_block(mainw->eventbox5,mainw->hrule_func);
+    lives_signal_connect(LIVES_GUI_OBJECT(mainw->eventbox5), LIVES_WIDGET_ENTER_EVENT,LIVES_GUI_CALLBACK(on_hrule_enter),NULL);
 
   }
 
   mainw->hrule_blocked=TRUE;
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->eventbox5), "button_release_event",
-                      LIVES_GUI_CALLBACK (on_hrule_reset),
-                      NULL);
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->eventbox5), "button_press_event",
-                      LIVES_GUI_CALLBACK (on_hrule_set),
-                      NULL);
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->eventbox3), "button_press_event",
-                      LIVES_GUI_CALLBACK (frame_context),
-                      GINT_TO_POINTER (1));
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->eventbox4), "button_press_event",
-                      LIVES_GUI_CALLBACK (frame_context),
-                      GINT_TO_POINTER (2));
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->eventbox5), LIVES_WIDGET_BUTTON_RELEASE_EVENT,
+                       LIVES_GUI_CALLBACK(on_hrule_reset),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->eventbox5), LIVES_WIDGET_BUTTON_PRESS_EVENT,
+                       LIVES_GUI_CALLBACK(on_hrule_set),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->eventbox3), LIVES_WIDGET_BUTTON_PRESS_EVENT,
+                       LIVES_GUI_CALLBACK(frame_context),
+                       LIVES_INT_TO_POINTER(1));
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->eventbox4), LIVES_WIDGET_BUTTON_PRESS_EVENT,
+                       LIVES_GUI_CALLBACK(frame_context),
+                       LIVES_INT_TO_POINTER(2));
 
-  lives_window_add_accel_group (LIVES_WINDOW (mainw->LiVES), mainw->accel_group);
+  lives_window_add_accel_group(LIVES_WINDOW(mainw->LiVES), mainw->accel_group);
   mainw->laudio_drawable=NULL;
   mainw->raudio_drawable=NULL;
   mainw->video_drawable=NULL;
   mainw->plug=NULL;
 
-  lives_widget_set_can_focus (mainw->LiVES, TRUE);
+  lives_widget_set_can_focus(mainw->LiVES, TRUE);
   lives_widget_grab_focus(mainw->textview1);
 
 }
 
 
+void set_interactive(boolean interactive) {
+  LiVESList *list;
+
+  if (!interactive) {
+    lives_object_ref(mainw->menubar);
+    lives_widget_unparent(mainw->menubar);
+    lives_widget_hide(mainw->btoolbar);
+    lives_widget_set_sensitive(mainw->menubar,FALSE);
+    lives_widget_set_sensitive(mainw->btoolbar,FALSE);
+    if (mainw->multitrack!=NULL) {
+      lives_object_ref(mainw->multitrack->menubar);
+      lives_widget_unparent(mainw->multitrack->menubar);
+      lives_widget_set_sensitive(mainw->multitrack->menubar,FALSE);
+      lives_widget_set_sensitive(mainw->multitrack->spinbutton_start,FALSE);
+      lives_widget_set_sensitive(mainw->multitrack->spinbutton_end,FALSE);
+      lives_widget_set_sensitive(mainw->m_playbutton,FALSE);
+      lives_widget_set_sensitive(mainw->m_stopbutton,FALSE);
+      lives_widget_set_sensitive(mainw->m_loopbutton,FALSE);
+      lives_widget_set_sensitive(mainw->m_rewindbutton,FALSE);
+      lives_widget_set_sensitive(mainw->m_sepwinbutton,FALSE);
+      lives_widget_set_sensitive(mainw->multitrack->btoolbar,FALSE);
+      lives_widget_set_sensitive(mainw->multitrack->btoolbar2,FALSE);
+      lives_widget_set_sensitive(mainw->multitrack->btoolbar3,FALSE);
+      lives_widget_set_sensitive(mainw->multitrack->insa_checkbutton,FALSE);
+      lives_widget_set_sensitive(mainw->multitrack->snapo_checkbutton,FALSE);
+      list=mainw->multitrack->cb_list;
+      while (list!=NULL) {
+        lives_widget_set_sensitive((LiVESWidget *)list->data,FALSE);
+        list=list->next;
+      }
+    }
+    lives_widget_set_sensitive(mainw->spinbutton_start,FALSE);
+    lives_widget_set_sensitive(mainw->spinbutton_end,FALSE);
+
+    if (mainw->current_file>-1&&cfile!=NULL&&cfile->proc_ptr!=NULL) {
+      lives_widget_set_sensitive(cfile->proc_ptr->cancel_button,FALSE);
+      lives_widget_set_sensitive(cfile->proc_ptr->stop_button,FALSE);
+      lives_widget_set_sensitive(cfile->proc_ptr->pause_button,FALSE);
+      lives_widget_set_sensitive(cfile->proc_ptr->preview_button,FALSE);
+    }
+
+  } else {
+    if (lives_widget_get_parent(mainw->menubar)==NULL) {
+      lives_box_pack_start(LIVES_BOX(mainw->menu_hbox), mainw->menubar, FALSE, FALSE, 0);
+      lives_object_unref(mainw->menubar);
+    }
+    lives_widget_show(mainw->btoolbar);
+    lives_widget_set_sensitive(mainw->menubar,TRUE);
+    lives_widget_set_sensitive(mainw->btoolbar,TRUE);
+    if (mainw->multitrack!=NULL) {
+      if (lives_widget_get_parent(mainw->multitrack->menubar)==NULL) {
+        lives_box_pack_start(LIVES_BOX(mainw->multitrack->menu_hbox), mainw->multitrack->menubar, FALSE, FALSE, 0);
+        lives_object_unref(mainw->multitrack->menubar);
+      }
+      lives_widget_show_all(mainw->multitrack->menubar);
+      lives_widget_set_sensitive(mainw->multitrack->menubar,TRUE);
+      lives_widget_set_sensitive(mainw->multitrack->spinbutton_start,TRUE);
+      lives_widget_set_sensitive(mainw->multitrack->spinbutton_end,TRUE);
+      lives_widget_set_sensitive(mainw->m_playbutton,TRUE);
+      lives_widget_set_sensitive(mainw->m_stopbutton,TRUE);
+      lives_widget_set_sensitive(mainw->m_loopbutton,TRUE);
+      lives_widget_set_sensitive(mainw->m_rewindbutton,TRUE);
+      lives_widget_set_sensitive(mainw->m_sepwinbutton,TRUE);
+      lives_widget_set_sensitive(mainw->multitrack->btoolbar,TRUE);
+      lives_widget_set_sensitive(mainw->multitrack->btoolbar2,TRUE);
+      lives_widget_set_sensitive(mainw->multitrack->btoolbar3,TRUE);
+      lives_widget_set_sensitive(mainw->multitrack->insa_checkbutton,TRUE);
+      lives_widget_set_sensitive(mainw->multitrack->snapo_checkbutton,TRUE);
+      list=mainw->multitrack->cb_list;
+      while (list!=NULL) {
+        lives_widget_set_sensitive((LiVESWidget *)list->data,TRUE);
+        list=list->next;
+      }
+    }
+    lives_widget_set_sensitive(mainw->spinbutton_start,TRUE);
+    lives_widget_set_sensitive(mainw->spinbutton_end,TRUE);
+
+    if (mainw->current_file>-1&&cfile!=NULL&&cfile->proc_ptr!=NULL) {
+      lives_widget_set_sensitive(cfile->proc_ptr->cancel_button,TRUE);
+      lives_widget_set_sensitive(cfile->proc_ptr->stop_button,TRUE);
+      lives_widget_set_sensitive(cfile->proc_ptr->pause_button,TRUE);
+      lives_widget_set_sensitive(cfile->proc_ptr->preview_button,TRUE);
+    }
+
+  }
+
+  if (mainw->ce_thumbs) ce_thumbs_set_interactive(interactive);
+  if (rte_window!=NULL) rte_window_set_interactive(interactive);
+
+}
+
+
+
 
 void fade_background(void) {
 
@@ -3074,36 +3181,40 @@
     lives_label_set_text(LIVES_LABEL(mainw->banner),_("    Press 'q' to stop recording.  DO NOT COVER THE PLAY WINDOW !   "));
     lives_widget_set_fg_color(mainw->banner, LIVES_WIDGET_STATE_NORMAL, &palette->banner_fade_text);
     lives_label_set_text(LIVES_LABEL(mainw->vps_label),("                      "));
-  }
-  else {
-    lives_widget_set_bg_color (mainw->playframe, LIVES_WIDGET_STATE_NORMAL, &palette->fade_colour);
+  } else {
+    lives_widget_set_bg_color(mainw->playframe, LIVES_WIDGET_STATE_NORMAL, &palette->fade_colour);
     if (mainw->sep_win) {
-      lives_widget_hide (mainw->playframe);
+      lives_widget_hide(mainw->playframe);
     }
-    lives_frame_set_shadow_type (LIVES_FRAME(mainw->playframe), LIVES_SHADOW_NONE);
+    lives_frame_set_shadow_type(LIVES_FRAME(mainw->playframe), LIVES_SHADOW_NONE);
   }
 
   lives_frame_set_label(LIVES_FRAME(mainw->playframe), "");
 
-  lives_widget_set_fg_color (mainw->curf_label, LIVES_WIDGET_STATE_NORMAL, &palette->fade_colour);
-  lives_widget_set_fg_color (mainw->vps_label, LIVES_WIDGET_STATE_NORMAL, &palette->fade_colour);
-  lives_widget_set_bg_color (mainw->vbox1, LIVES_WIDGET_STATE_NORMAL, &palette->fade_colour);
-  lives_widget_set_bg_color (mainw->LiVES, LIVES_WIDGET_STATE_NORMAL, &palette->fade_colour);
-
-  lives_widget_set_bg_color (mainw->eventbox3, LIVES_WIDGET_STATE_NORMAL, &palette->fade_colour);
-  lives_widget_set_bg_color (mainw->eventbox4, LIVES_WIDGET_STATE_NORMAL, &palette->fade_colour);
-  lives_widget_set_bg_color (mainw->eventbox, LIVES_WIDGET_STATE_NORMAL, &palette->fade_colour);
-  lives_widget_set_bg_color (mainw->pl_eventbox, LIVES_WIDGET_STATE_NORMAL, &palette->fade_colour);
-  lives_widget_set_bg_color (mainw->play_image, LIVES_WIDGET_STATE_NORMAL, &palette->fade_colour);
-
-  lives_widget_set_bg_color (mainw->frame1, LIVES_WIDGET_STATE_NORMAL, &palette->fade_colour);
-  lives_widget_set_bg_color (mainw->frame2, LIVES_WIDGET_STATE_NORMAL, &palette->fade_colour);
-  lives_widget_set_bg_color (mainw->freventbox0, LIVES_WIDGET_STATE_NORMAL, &palette->fade_colour);
-  lives_widget_set_bg_color (mainw->freventbox1, LIVES_WIDGET_STATE_NORMAL, &palette->fade_colour);
-  lives_frame_set_shadow_type (LIVES_FRAME(mainw->frame1), LIVES_SHADOW_NONE);
-  lives_frame_set_label (LIVES_FRAME(mainw->frame1), "");
-  lives_frame_set_shadow_type (LIVES_FRAME(mainw->frame2), LIVES_SHADOW_NONE);
-  lives_frame_set_label (LIVES_FRAME(mainw->frame2), "");
+  lives_widget_set_fg_color(mainw->curf_label, LIVES_WIDGET_STATE_NORMAL, &palette->fade_colour);
+  lives_widget_set_fg_color(mainw->vps_label, LIVES_WIDGET_STATE_NORMAL, &palette->fade_colour);
+  lives_widget_set_bg_color(mainw->vbox1, LIVES_WIDGET_STATE_NORMAL, &palette->fade_colour);
+  lives_widget_set_bg_color(mainw->LiVES, LIVES_WIDGET_STATE_NORMAL, &palette->fade_colour);
+  lives_widget_set_bg_color(mainw->eventbox3, LIVES_WIDGET_STATE_NORMAL, &palette->fade_colour);
+  lives_widget_set_bg_color(lives_widget_get_parent(mainw->message_box), LIVES_WIDGET_STATE_NORMAL, &palette->fade_colour);
+
+  lives_widget_set_bg_color(mainw->eventbox4, LIVES_WIDGET_STATE_NORMAL, &palette->fade_colour);
+  lives_widget_set_bg_color(mainw->eventbox, LIVES_WIDGET_STATE_NORMAL, &palette->fade_colour);
+  lives_widget_set_bg_color(mainw->pl_eventbox, LIVES_WIDGET_STATE_NORMAL, &palette->fade_colour);
+  lives_widget_set_bg_color(mainw->play_image, LIVES_WIDGET_STATE_NORMAL, &palette->fade_colour);
+
+  lives_widget_set_bg_color(mainw->frame1, LIVES_WIDGET_STATE_NORMAL, &palette->fade_colour);
+  lives_widget_set_bg_color(mainw->frame2, LIVES_WIDGET_STATE_NORMAL, &palette->fade_colour);
+  lives_widget_set_bg_color(mainw->freventbox0, LIVES_WIDGET_STATE_NORMAL, &palette->fade_colour);
+  lives_widget_set_app_paintable(mainw->freventbox0,FALSE);
+
+  lives_widget_set_bg_color(mainw->freventbox1, LIVES_WIDGET_STATE_NORMAL, &palette->fade_colour);
+  lives_widget_set_app_paintable(mainw->freventbox1,FALSE);
+
+  lives_frame_set_shadow_type(LIVES_FRAME(mainw->frame1), LIVES_SHADOW_NONE);
+  lives_frame_set_label(LIVES_FRAME(mainw->frame1), "");
+  lives_frame_set_shadow_type(LIVES_FRAME(mainw->frame2), LIVES_SHADOW_NONE);
+  lives_frame_set_label(LIVES_FRAME(mainw->frame2), "");
 
   if (mainw->toy_type!=LIVES_TOY_MAD_FRAMES||mainw->foreign) {
     lives_widget_hide(mainw->start_image);
@@ -3142,57 +3253,58 @@
   // we need to remove the accelerators and add accelerator keys instead
 
   if (stop_closure==NULL) {
-    lives_widget_remove_accelerator (mainw->stop, mainw->accel_group, LIVES_KEY_q, (LiVESXModifierType)0);
-    lives_accel_group_connect (LIVES_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_q, (LiVESXModifierType)0, (LiVESAccelFlags)0, 
-			     (stop_closure=g_cclosure_new (LIVES_GUI_CALLBACK (stop_callback),NULL,NULL)));
+    lives_widget_remove_accelerator(mainw->stop, mainw->accel_group, LIVES_KEY_q, (LiVESXModifierType)0);
+    lives_accel_group_connect(LIVES_ACCEL_GROUP(mainw->accel_group), LIVES_KEY_q, (LiVESXModifierType)0, (LiVESAccelFlags)0,
+                              (stop_closure=lives_cclosure_new(LIVES_GUI_CALLBACK(stop_callback),NULL,NULL)));
 
     if (!mainw->foreign) {
       // TODO - do these checks in the end functions
-      lives_widget_remove_accelerator (mainw->record_perf, mainw->accel_group, LIVES_KEY_r, (LiVESXModifierType)0);
-      lives_accel_group_connect (LIVES_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_r, (LiVESXModifierType)0, (LiVESAccelFlags)0, 
-			       (rec_closure=g_cclosure_new (LIVES_GUI_CALLBACK (rec_callback),NULL,NULL)));
-      
-      lives_widget_remove_accelerator (mainw->full_screen, mainw->accel_group, LIVES_KEY_f, (LiVESXModifierType)0);
-      lives_accel_group_connect (LIVES_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_f, (LiVESXModifierType)0, (LiVESAccelFlags)0, 
-			       (fullscreen_closure=g_cclosure_new (LIVES_GUI_CALLBACK (fullscreen_callback),NULL,NULL)));
-      
-      lives_widget_remove_accelerator (mainw->showfct, mainw->accel_group, LIVES_KEY_h, (LiVESXModifierType)0);
-      lives_accel_group_connect (LIVES_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_h, (LiVESXModifierType)0, (LiVESAccelFlags)0, 
-			       (showfct_closure=g_cclosure_new (LIVES_GUI_CALLBACK (showfct_callback),NULL,NULL)));
-      
-      lives_widget_remove_accelerator (mainw->showsubs, mainw->accel_group, LIVES_KEY_v, (LiVESXModifierType)0);
-      lives_accel_group_connect (LIVES_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_v, (LiVESXModifierType)0, (LiVESAccelFlags)0, 
-			       (showsubs_closure=g_cclosure_new (LIVES_GUI_CALLBACK (showsubs_callback),NULL,NULL)));
-      
-      lives_widget_remove_accelerator (mainw->sepwin, mainw->accel_group, LIVES_KEY_s, (LiVESXModifierType)0);
-      lives_accel_group_connect (LIVES_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_s, (LiVESXModifierType)0, (LiVESAccelFlags)0, 
-			       (sepwin_closure=g_cclosure_new (LIVES_GUI_CALLBACK (sepwin_callback),NULL,NULL)));
-
-      if (!cfile->achans||mainw->mute||mainw->loop_cont||prefs->audio_player==AUD_PLAYER_JACK||
-	  prefs->audio_player==AUD_PLAYER_PULSE) {
-	lives_widget_remove_accelerator (mainw->loop_video, mainw->accel_group, LIVES_KEY_l, (LiVESXModifierType)0);
-	lives_accel_group_connect (LIVES_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_l, (LiVESXModifierType)0, (LiVESAccelFlags)0, 
-				 (loop_closure=g_cclosure_new (LIVES_GUI_CALLBACK (loop_callback),NULL,NULL)));
-	
-	lives_widget_remove_accelerator (mainw->loop_continue, mainw->accel_group, LIVES_KEY_o, (LiVESXModifierType)0);
-	lives_accel_group_connect (LIVES_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_o, (LiVESXModifierType)0, (LiVESAccelFlags)0, 
-				 (loop_cont_closure=g_cclosure_new (LIVES_GUI_CALLBACK (loop_cont_callback),NULL,NULL)));
-	
+      lives_widget_remove_accelerator(mainw->record_perf, mainw->accel_group, LIVES_KEY_r, (LiVESXModifierType)0);
+      lives_accel_group_connect(LIVES_ACCEL_GROUP(mainw->accel_group), LIVES_KEY_r, (LiVESXModifierType)0, (LiVESAccelFlags)0,
+                                (rec_closure=lives_cclosure_new(LIVES_GUI_CALLBACK(rec_callback),NULL,NULL)));
+
+      lives_widget_remove_accelerator(mainw->full_screen, mainw->accel_group, LIVES_KEY_f, (LiVESXModifierType)0);
+      lives_accel_group_connect(LIVES_ACCEL_GROUP(mainw->accel_group), LIVES_KEY_f, (LiVESXModifierType)0, (LiVESAccelFlags)0,
+                                (fullscreen_closure=lives_cclosure_new(LIVES_GUI_CALLBACK(fullscreen_callback),NULL,NULL)));
+
+      lives_widget_remove_accelerator(mainw->showfct, mainw->accel_group, LIVES_KEY_h, (LiVESXModifierType)0);
+      lives_accel_group_connect(LIVES_ACCEL_GROUP(mainw->accel_group), LIVES_KEY_h, (LiVESXModifierType)0, (LiVESAccelFlags)0,
+                                (showfct_closure=lives_cclosure_new(LIVES_GUI_CALLBACK(showfct_callback),NULL,NULL)));
+
+      lives_widget_remove_accelerator(mainw->showsubs, mainw->accel_group, LIVES_KEY_v, (LiVESXModifierType)0);
+      lives_accel_group_connect(LIVES_ACCEL_GROUP(mainw->accel_group), LIVES_KEY_v, (LiVESXModifierType)0, (LiVESAccelFlags)0,
+                                (showsubs_closure=lives_cclosure_new(LIVES_GUI_CALLBACK(showsubs_callback),NULL,NULL)));
+
+      lives_widget_remove_accelerator(mainw->sepwin, mainw->accel_group, LIVES_KEY_s, (LiVESXModifierType)0);
+      lives_accel_group_connect(LIVES_ACCEL_GROUP(mainw->accel_group), LIVES_KEY_s, (LiVESXModifierType)0, (LiVESAccelFlags)0,
+                                (sepwin_closure=lives_cclosure_new(LIVES_GUI_CALLBACK(sepwin_callback),NULL,NULL)));
+
+      if (!cfile->achans||mainw->mute||mainw->loop_cont||is_realtime_aplayer(prefs->audio_player)) {
+        lives_widget_remove_accelerator(mainw->loop_video, mainw->accel_group, LIVES_KEY_l, (LiVESXModifierType)0);
+        lives_accel_group_connect(LIVES_ACCEL_GROUP(mainw->accel_group), LIVES_KEY_l, (LiVESXModifierType)0, (LiVESAccelFlags)0,
+                                  (loop_closure=lives_cclosure_new(LIVES_GUI_CALLBACK(loop_callback),NULL,NULL)));
+
+        lives_widget_remove_accelerator(mainw->loop_continue, mainw->accel_group, LIVES_KEY_o, (LiVESXModifierType)0);
+        lives_accel_group_connect(LIVES_ACCEL_GROUP(mainw->accel_group), LIVES_KEY_o, (LiVESXModifierType)0, (LiVESAccelFlags)0,
+                                  (loop_cont_closure=lives_cclosure_new(LIVES_GUI_CALLBACK(loop_cont_callback),NULL,NULL)));
+
       }
-      lives_widget_remove_accelerator (mainw->loop_ping_pong, mainw->accel_group, LIVES_KEY_g, (LiVESXModifierType)0);
-      lives_accel_group_connect (LIVES_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_g, (LiVESXModifierType)0, (LiVESAccelFlags)0, 
-			       (ping_pong_closure=g_cclosure_new (LIVES_GUI_CALLBACK (ping_pong_callback),NULL,NULL)));
-      lives_widget_remove_accelerator (mainw->mute_audio, mainw->accel_group, LIVES_KEY_z, (LiVESXModifierType)0);
-      lives_accel_group_connect (LIVES_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_z, (LiVESXModifierType)0, (LiVESAccelFlags)0, 
-			       (mute_audio_closure=g_cclosure_new (LIVES_GUI_CALLBACK (mute_audio_callback),NULL,NULL)));
-      lives_widget_remove_accelerator (mainw->dsize, mainw->accel_group, LIVES_KEY_d, (LiVESXModifierType)0);
-      lives_accel_group_connect (LIVES_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_d, (LiVESXModifierType)0, (LiVESAccelFlags)0, 
-			       (dblsize_closure=g_cclosure_new (LIVES_GUI_CALLBACK (dblsize_callback),NULL,NULL)));
-      lives_widget_remove_accelerator (mainw->fade, mainw->accel_group, LIVES_KEY_b, (LiVESXModifierType)0);
-      lives_accel_group_connect (LIVES_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_b, (LiVESXModifierType)0, (LiVESAccelFlags)0, 
-			       (fade_closure=g_cclosure_new (LIVES_GUI_CALLBACK (fade_callback),NULL,NULL)));
+      lives_widget_remove_accelerator(mainw->loop_ping_pong, mainw->accel_group, LIVES_KEY_g, (LiVESXModifierType)0);
+      lives_accel_group_connect(LIVES_ACCEL_GROUP(mainw->accel_group), LIVES_KEY_g, (LiVESXModifierType)0, (LiVESAccelFlags)0,
+                                (ping_pong_closure=lives_cclosure_new(LIVES_GUI_CALLBACK(ping_pong_callback),NULL,NULL)));
+      lives_widget_remove_accelerator(mainw->mute_audio, mainw->accel_group, LIVES_KEY_z, (LiVESXModifierType)0);
+      lives_accel_group_connect(LIVES_ACCEL_GROUP(mainw->accel_group), LIVES_KEY_z, (LiVESXModifierType)0, (LiVESAccelFlags)0,
+                                (mute_audio_closure=lives_cclosure_new(LIVES_GUI_CALLBACK(mute_audio_callback),NULL,NULL)));
+      lives_widget_remove_accelerator(mainw->dsize, mainw->accel_group, LIVES_KEY_d, (LiVESXModifierType)0);
+      lives_accel_group_connect(LIVES_ACCEL_GROUP(mainw->accel_group), LIVES_KEY_d, (LiVESXModifierType)0, (LiVESAccelFlags)0,
+                                (dblsize_closure=lives_cclosure_new(LIVES_GUI_CALLBACK(dblsize_callback),NULL,NULL)));
+      lives_widget_remove_accelerator(mainw->fade, mainw->accel_group, LIVES_KEY_b, (LiVESXModifierType)0);
+      lives_accel_group_connect(LIVES_ACCEL_GROUP(mainw->accel_group), LIVES_KEY_b, (LiVESXModifierType)0, (LiVESAccelFlags)0,
+                                (fade_closure=lives_cclosure_new(LIVES_GUI_CALLBACK(fade_callback),NULL,NULL)));
     }
   }
+
+  lives_widget_queue_draw(mainw->vbox1);
 }
 
 
@@ -3202,33 +3314,31 @@
 
 void unfade_background(void) {
   if (prefs->open_maximised&&prefs->show_gui) {
-    lives_window_maximize (LIVES_WINDOW(mainw->LiVES));
+    lives_window_maximize(LIVES_WINDOW(mainw->LiVES));
   }
 
   if (palette->style==STYLE_PLAIN) {
     lives_label_set_text(LIVES_LABEL(mainw->banner),"   = <  L i V E S > =                            ");
-  }
-  else {
+  } else {
     lives_label_set_text(LIVES_LABEL(mainw->banner),"                                                ");
   }
   lives_widget_set_fg_color(mainw->banner, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
-  lives_widget_set_bg_color (mainw->eventbox, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
-  lives_widget_set_bg_color (mainw->vbox1, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
-  lives_widget_set_bg_color (mainw->eventbox3, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
-  lives_frame_set_label (LIVES_FRAME(mainw->frame1), _("First Frame"));
+  lives_widget_set_bg_color(mainw->eventbox, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+  lives_widget_set_bg_color(mainw->vbox1, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+  lives_widget_set_bg_color(mainw->eventbox3, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+  lives_frame_set_label(LIVES_FRAME(mainw->frame1), _("First Frame"));
   if (!mainw->preview) {
     lives_frame_set_label(LIVES_FRAME(mainw->playframe),_("Play"));
-  }
-  else {
+  } else {
     lives_frame_set_label(LIVES_FRAME(mainw->playframe),_("Preview"));
   }
 
-  lives_frame_set_label (LIVES_FRAME(mainw->frame2), _("Last Frame"));
-  lives_widget_set_fg_color (mainw->curf_label, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
-  lives_widget_set_fg_color (mainw->vps_label, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
-  lives_widget_set_bg_color (mainw->LiVES, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+  lives_frame_set_label(LIVES_FRAME(mainw->frame2), _("Last Frame"));
+  lives_widget_set_fg_color(mainw->curf_label, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
+  lives_widget_set_fg_color(mainw->vps_label, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
+  lives_widget_set_bg_color(mainw->LiVES, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
 
-  lives_widget_set_bg_color (mainw->pl_eventbox, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+  lives_widget_set_bg_color(mainw->pl_eventbox, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
 
   if (palette->style&STYLE_1) {
     lives_widget_set_fg_color(lives_frame_get_label_widget(LIVES_FRAME(mainw->playframe)), LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
@@ -3236,14 +3346,25 @@
     lives_widget_set_fg_color(lives_frame_get_label_widget(LIVES_FRAME(mainw->frame2)), LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
   }
 
-  lives_widget_set_bg_color (mainw->eventbox4, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
-  lives_widget_set_bg_color (mainw->frame1, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
-  lives_widget_set_bg_color (mainw->frame2, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
-  lives_widget_set_bg_color (mainw->freventbox0, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
-  lives_widget_set_bg_color (mainw->freventbox1, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
-  lives_widget_set_bg_color (mainw->play_image, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+  lives_widget_set_fg_color(mainw->curf_label, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+  lives_widget_set_fg_color(mainw->vps_label, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+  lives_widget_set_bg_color(mainw->vbox1, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+  lives_widget_set_bg_color(mainw->LiVES, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+  lives_widget_set_bg_color(mainw->eventbox3, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+  lives_widget_set_bg_color(lives_widget_get_parent(mainw->message_box), LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+
+  lives_widget_set_bg_color(mainw->eventbox4, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+  lives_widget_set_bg_color(mainw->eventbox, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+  lives_widget_set_bg_color(mainw->pl_eventbox, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+  lives_widget_set_bg_color(mainw->play_image, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+
+  lives_widget_set_bg_color(mainw->frame1, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+  lives_widget_set_bg_color(mainw->frame2, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+  lives_widget_set_bg_color(mainw->freventbox0, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+  lives_widget_set_bg_color(mainw->freventbox1, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+  lives_widget_set_bg_color(mainw->play_image, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
 
-  lives_widget_set_bg_color (mainw->playframe, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+  lives_widget_set_bg_color(mainw->playframe, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
   lives_widget_show(mainw->menu_hbox);
   lives_widget_hide(mainw->tb_hbox);
   lives_widget_show(mainw->hseparator);
@@ -3270,87 +3391,91 @@
   lives_widget_show(mainw->arrow2);
   lives_widget_show(mainw->spinbutton_pb_fps);
   lives_widget_show(mainw->message_box);
-  lives_widget_set_fg_color (mainw->vps_label, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
-  lives_widget_set_fg_color (mainw->curf_label, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
+  lives_widget_set_fg_color(mainw->vps_label, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
+  lives_widget_set_fg_color(mainw->curf_label, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
 
   if (stop_closure!=NULL) {
-    lives_accel_group_disconnect (LIVES_ACCEL_GROUP (mainw->accel_group), stop_closure);
-    lives_widget_add_accelerator (mainw->stop, LIVES_WIDGET_ACTIVATE_EVENT, mainw->accel_group,
-				LIVES_KEY_q, (LiVESXModifierType)0,
-				LIVES_ACCEL_VISIBLE);
-    
-    lives_accel_group_disconnect (LIVES_ACCEL_GROUP (mainw->accel_group), rec_closure);
-    lives_widget_add_accelerator (mainw->record_perf, LIVES_WIDGET_ACTIVATE_EVENT, mainw->accel_group,
-				LIVES_KEY_r, (LiVESXModifierType)0,
-				LIVES_ACCEL_VISIBLE);
-    
-    lives_accel_group_disconnect (LIVES_ACCEL_GROUP (mainw->accel_group), fullscreen_closure);
-    lives_widget_add_accelerator (mainw->full_screen, LIVES_WIDGET_ACTIVATE_EVENT, mainw->accel_group,
-				  LIVES_KEY_f, (LiVESXModifierType)0,
-				LIVES_ACCEL_VISIBLE);
-    lives_accel_group_disconnect (LIVES_ACCEL_GROUP (mainw->accel_group), sepwin_closure);
-    lives_widget_add_accelerator (mainw->sepwin, LIVES_WIDGET_ACTIVATE_EVENT, mainw->accel_group,
-				LIVES_KEY_s, (LiVESXModifierType)0,
-				LIVES_ACCEL_VISIBLE);
-
-    lives_accel_group_disconnect (LIVES_ACCEL_GROUP (mainw->accel_group), mute_audio_closure);
-    lives_widget_add_accelerator (mainw->mute_audio, LIVES_WIDGET_ACTIVATE_EVENT, mainw->accel_group,
-				LIVES_KEY_z, (LiVESXModifierType)0,
-				LIVES_ACCEL_VISIBLE);
-
-    lives_accel_group_disconnect (LIVES_ACCEL_GROUP (mainw->accel_group), ping_pong_closure);
-    lives_widget_add_accelerator (mainw->loop_ping_pong, LIVES_WIDGET_ACTIVATE_EVENT, mainw->accel_group,
-				LIVES_KEY_g, (LiVESXModifierType)0,
-				LIVES_ACCEL_VISIBLE);
-
-    if (!cfile->achans||mainw->mute||mainw->loop_cont||prefs->audio_player==AUD_PLAYER_JACK||
-	prefs->audio_player==AUD_PLAYER_PULSE) {
-      lives_accel_group_disconnect (LIVES_ACCEL_GROUP (mainw->accel_group), loop_closure);
-      lives_widget_add_accelerator (mainw->loop_video, LIVES_WIDGET_ACTIVATE_EVENT, mainw->accel_group,
-				  LIVES_KEY_l, (LiVESXModifierType)0,
-				  LIVES_ACCEL_VISIBLE);
-      lives_accel_group_disconnect (LIVES_ACCEL_GROUP (mainw->accel_group), loop_cont_closure);
-      lives_widget_add_accelerator (mainw->loop_continue, LIVES_WIDGET_ACTIVATE_EVENT, mainw->accel_group,
-				  LIVES_KEY_o, (LiVESXModifierType)0,
-				  LIVES_ACCEL_VISIBLE);
-      lives_accel_group_disconnect (LIVES_ACCEL_GROUP (mainw->accel_group), showfct_closure);
-    }
-    lives_widget_add_accelerator (mainw->showfct, LIVES_WIDGET_ACTIVATE_EVENT, mainw->accel_group,
-				LIVES_KEY_h, (LiVESXModifierType)0,
-				LIVES_ACCEL_VISIBLE);
-
-    lives_accel_group_disconnect (LIVES_ACCEL_GROUP (mainw->accel_group), showsubs_closure);
-    lives_widget_add_accelerator (mainw->showsubs, LIVES_WIDGET_ACTIVATE_EVENT, mainw->accel_group,
-				LIVES_KEY_v, (LiVESXModifierType)0,
-				LIVES_ACCEL_VISIBLE);
-
-    lives_accel_group_disconnect (LIVES_ACCEL_GROUP (mainw->accel_group), sepwin_closure);
-    lives_widget_add_accelerator (mainw->sepwin, LIVES_WIDGET_ACTIVATE_EVENT, mainw->accel_group,
-				LIVES_KEY_s, (LiVESXModifierType)0,
-				LIVES_ACCEL_VISIBLE);
-
-    lives_accel_group_disconnect (LIVES_ACCEL_GROUP (mainw->accel_group), dblsize_closure);
-    lives_widget_add_accelerator (mainw->dsize, LIVES_WIDGET_ACTIVATE_EVENT, mainw->accel_group,
-				LIVES_KEY_d, (LiVESXModifierType)0,
-				LIVES_ACCEL_VISIBLE);
-
-    lives_accel_group_disconnect (LIVES_ACCEL_GROUP (mainw->accel_group), fade_closure);
-    lives_widget_add_accelerator (mainw->fade, LIVES_WIDGET_ACTIVATE_EVENT, mainw->accel_group,
-				LIVES_KEY_b, (LiVESXModifierType)0,
-				LIVES_ACCEL_VISIBLE);
+    lives_accel_group_disconnect(LIVES_ACCEL_GROUP(mainw->accel_group), stop_closure);
+    lives_widget_add_accelerator(mainw->stop, LIVES_WIDGET_ACTIVATE_SIGNAL, mainw->accel_group,
+                                 LIVES_KEY_q, (LiVESXModifierType)0,
+                                 LIVES_ACCEL_VISIBLE);
+
+    lives_accel_group_disconnect(LIVES_ACCEL_GROUP(mainw->accel_group), rec_closure);
+    lives_widget_add_accelerator(mainw->record_perf, LIVES_WIDGET_ACTIVATE_SIGNAL, mainw->accel_group,
+                                 LIVES_KEY_r, (LiVESXModifierType)0,
+                                 LIVES_ACCEL_VISIBLE);
+
+    lives_accel_group_disconnect(LIVES_ACCEL_GROUP(mainw->accel_group), fullscreen_closure);
+    lives_widget_add_accelerator(mainw->full_screen, LIVES_WIDGET_ACTIVATE_SIGNAL, mainw->accel_group,
+                                 LIVES_KEY_f, (LiVESXModifierType)0,
+                                 LIVES_ACCEL_VISIBLE);
+    lives_accel_group_disconnect(LIVES_ACCEL_GROUP(mainw->accel_group), sepwin_closure);
+    lives_widget_add_accelerator(mainw->sepwin, LIVES_WIDGET_ACTIVATE_SIGNAL, mainw->accel_group,
+                                 LIVES_KEY_s, (LiVESXModifierType)0,
+                                 LIVES_ACCEL_VISIBLE);
+
+    lives_accel_group_disconnect(LIVES_ACCEL_GROUP(mainw->accel_group), mute_audio_closure);
+    lives_widget_add_accelerator(mainw->mute_audio, LIVES_WIDGET_ACTIVATE_SIGNAL, mainw->accel_group,
+                                 LIVES_KEY_z, (LiVESXModifierType)0,
+                                 LIVES_ACCEL_VISIBLE);
+
+    lives_accel_group_disconnect(LIVES_ACCEL_GROUP(mainw->accel_group), ping_pong_closure);
+    lives_widget_add_accelerator(mainw->loop_ping_pong, LIVES_WIDGET_ACTIVATE_SIGNAL, mainw->accel_group,
+                                 LIVES_KEY_g, (LiVESXModifierType)0,
+                                 LIVES_ACCEL_VISIBLE);
+
+    if (!cfile->achans||mainw->mute||mainw->loop_cont||is_realtime_aplayer(prefs->audio_player)) {
+      lives_accel_group_disconnect(LIVES_ACCEL_GROUP(mainw->accel_group), loop_closure);
+      lives_widget_add_accelerator(mainw->loop_video, LIVES_WIDGET_ACTIVATE_SIGNAL, mainw->accel_group,
+                                   LIVES_KEY_l, (LiVESXModifierType)0,
+                                   LIVES_ACCEL_VISIBLE);
+      lives_accel_group_disconnect(LIVES_ACCEL_GROUP(mainw->accel_group), loop_cont_closure);
+      lives_widget_add_accelerator(mainw->loop_continue, LIVES_WIDGET_ACTIVATE_SIGNAL, mainw->accel_group,
+                                   LIVES_KEY_o, (LiVESXModifierType)0,
+                                   LIVES_ACCEL_VISIBLE);
+      lives_accel_group_disconnect(LIVES_ACCEL_GROUP(mainw->accel_group), showfct_closure);
+    }
+    lives_widget_add_accelerator(mainw->showfct, LIVES_WIDGET_ACTIVATE_SIGNAL, mainw->accel_group,
+                                 LIVES_KEY_h, (LiVESXModifierType)0,
+                                 LIVES_ACCEL_VISIBLE);
+
+    lives_accel_group_disconnect(LIVES_ACCEL_GROUP(mainw->accel_group), showsubs_closure);
+    lives_widget_add_accelerator(mainw->showsubs, LIVES_WIDGET_ACTIVATE_SIGNAL, mainw->accel_group,
+                                 LIVES_KEY_v, (LiVESXModifierType)0,
+                                 LIVES_ACCEL_VISIBLE);
+
+    lives_accel_group_disconnect(LIVES_ACCEL_GROUP(mainw->accel_group), sepwin_closure);
+    lives_widget_add_accelerator(mainw->sepwin, LIVES_WIDGET_ACTIVATE_SIGNAL, mainw->accel_group,
+                                 LIVES_KEY_s, (LiVESXModifierType)0,
+                                 LIVES_ACCEL_VISIBLE);
+
+    lives_accel_group_disconnect(LIVES_ACCEL_GROUP(mainw->accel_group), dblsize_closure);
+    lives_widget_add_accelerator(mainw->dsize, LIVES_WIDGET_ACTIVATE_SIGNAL, mainw->accel_group,
+                                 LIVES_KEY_d, (LiVESXModifierType)0,
+                                 LIVES_ACCEL_VISIBLE);
+
+    lives_accel_group_disconnect(LIVES_ACCEL_GROUP(mainw->accel_group), fade_closure);
+    lives_widget_add_accelerator(mainw->fade, LIVES_WIDGET_ACTIVATE_SIGNAL, mainw->accel_group,
+                                 LIVES_KEY_b, (LiVESXModifierType)0,
+                                 LIVES_ACCEL_VISIBLE);
 
     stop_closure=NULL;
-    
+
   }
   if (mainw->double_size) {
     resize(2);
-  }
-  else {
+  } else {
     resize(1);
   }
+
+  lives_widget_context_update();
+
+  lives_widget_set_app_paintable(mainw->freventbox0,TRUE);
+  lives_widget_set_app_paintable(mainw->freventbox1,TRUE);
 }
 
 
+
 void fullscreen_internal(void) {
   // resize for full screen, internal player, no separate window
 
@@ -3361,12 +3486,11 @@
   if (prefs->gui_monitor==0) {
     scr_width=mainw->scr_width;
     scr_height=mainw->scr_height;
-  }
-  else {
+  } else {
     scr_width=mainw->mgeom[prefs->gui_monitor-1].width;
     scr_height=mainw->mgeom[prefs->gui_monitor-1].height;
   }
-  
+
   if (mainw->multitrack==NULL) {
 
     lives_widget_hide(mainw->frame1);
@@ -3376,7 +3500,7 @@
     lives_widget_hide(mainw->eventbox4);
 
     lives_frame_set_label(LIVES_FRAME(mainw->playframe),NULL);
-    lives_container_set_border_width (LIVES_CONTAINER (mainw->playframe), 0);
+    lives_container_set_border_width(LIVES_CONTAINER(mainw->playframe), 0);
 
     lives_widget_hide(mainw->t_bckground);
     lives_widget_hide(mainw->t_double);
@@ -3394,19 +3518,18 @@
 
     if (future_prefs->show_tool) by+=lives_widget_get_allocation_height(mainw->tb_hbox);
 
-    lives_widget_set_size_request (mainw->playframe, lives_widget_get_allocation_width(mainw->LiVES)-bx, 
-    				   lives_widget_get_allocation_height(mainw->LiVES)-by);
+    lives_widget_set_size_request(mainw->playframe, lives_widget_get_allocation_width(mainw->LiVES)-bx,
+                                  lives_widget_get_allocation_height(mainw->LiVES)-by);
 
-  w=lives_widget_get_allocation_width(mainw->LiVES);
-  h=lives_widget_get_allocation_height(mainw->LiVES);
+    w=lives_widget_get_allocation_width(mainw->LiVES);
+    h=lives_widget_get_allocation_height(mainw->LiVES);
 
-  if (w>scr_width) w=scr_width;
-  if (h>scr_height) h=scr_height;
+    if (w>scr_width) w=scr_width;
+    if (h>scr_height) h=scr_height;
 
-  lives_widget_set_size_request(mainw->LiVES,w,h);
+    lives_widget_set_size_request(mainw->LiVES,w,h);
 
-  }
-  else {
+  } else {
     make_play_window();
   }
 
@@ -3414,7 +3537,7 @@
 
 
 
-void block_expose (void) {
+void block_expose(void) {
   // block expose/config events
   // sometimes we need to do this before showing/re-showing the play window
   // otherwise we get into a loop of expose events
@@ -3429,7 +3552,7 @@
 #endif
 }
 
-void unblock_expose (void) {
+void unblock_expose(void) {
   // unblock expose/config events
   mainw->draw_blocked=FALSE;
 #if !GTK_CHECK_VERSION(3,0,0)
@@ -3443,7 +3566,7 @@
 
 
 
-void make_preview_box (void) {
+void make_preview_box(void) {
   // create a box to show frames in, this will go in the sepwin when we are not playing
   LiVESWidget *hbox;
   LiVESWidget *hbox_buttons;
@@ -3457,71 +3580,70 @@
   LiVESWidget *loop_img;
   LiVESWidget *eventbox;
 
-  GSList *radiobutton_group = NULL;
+  LiVESSList *radiobutton_group = NULL;
 
-  gchar buff[PATH_MAX];
-  gchar *fnamex;
-  gchar *tmp,*tmp2;
+  char buff[PATH_MAX];
+  char *fnamex;
+  char *tmp,*tmp2;
 
-  mainw->preview_box = lives_vbox_new (FALSE, 0);
+  mainw->preview_box = lives_vbox_new(FALSE, 0);
   lives_object_ref(mainw->preview_box);
 
   eventbox=lives_event_box_new();
-  lives_widget_set_events (eventbox, LIVES_SCROLL_MASK);
+  lives_widget_set_events(eventbox, LIVES_SCROLL_MASK);
 
-  lives_signal_connect (LIVES_GUI_OBJECT (eventbox), LIVES_WIDGET_SCROLL_EVENT,
-		    LIVES_GUI_CALLBACK (on_mouse_scroll),
-		    NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(eventbox), LIVES_WIDGET_SCROLL_EVENT,
+                       LIVES_GUI_CALLBACK(on_mouse_scroll),
+                       NULL);
 
 #if GTK_CHECK_VERSION(3,0,0)
-  lives_signal_connect (LIVES_GUI_OBJECT (eventbox), LIVES_WIDGET_EXPOSE_EVENT,
-		    LIVES_GUI_CALLBACK (expose_pim),
-		    NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(eventbox), LIVES_WIDGET_EXPOSE_EVENT,
+                       LIVES_GUI_CALLBACK(expose_pim),
+                       NULL);
 #endif
 
-  lives_box_pack_start (LIVES_BOX (mainw->preview_box), eventbox, TRUE, TRUE, 0);
+  lives_box_pack_start(LIVES_BOX(mainw->preview_box), eventbox, TRUE, TRUE, 0);
 
-  lives_signal_connect (LIVES_GUI_OBJECT (eventbox), "button_press_event",
-                      LIVES_GUI_CALLBACK (frame_context),
-                      GINT_TO_POINTER (3));
+  lives_signal_connect(LIVES_GUI_OBJECT(eventbox), LIVES_WIDGET_BUTTON_PRESS_EVENT,
+                       LIVES_GUI_CALLBACK(frame_context),
+                       LIVES_INT_TO_POINTER(3));
 
 
-  mainw->preview_image = lives_image_new_from_pixbuf (NULL);
-  lives_widget_show (mainw->preview_image);
-  lives_container_add (LIVES_CONTAINER (eventbox), mainw->preview_image);
+  mainw->preview_image = lives_image_new_from_pixbuf(NULL);
+  lives_widget_show(mainw->preview_image);
+  lives_container_add(LIVES_CONTAINER(eventbox), mainw->preview_image);
   lives_widget_set_app_paintable(eventbox,TRUE);
 
   if (mainw->play_window!=NULL) {
     if (mainw->current_file<0||cfile->frames==0) {
       if (mainw->imframe!=NULL) {
-	lives_widget_set_size_request(mainw->preview_image,lives_pixbuf_get_width(mainw->imframe),lives_pixbuf_get_height(mainw->imframe));
-	
+        lives_widget_set_size_request(mainw->preview_image,lives_pixbuf_get_width(mainw->imframe),lives_pixbuf_get_height(mainw->imframe));
+
       }
-    }
-    else
+    } else
       lives_widget_set_size_request(mainw->preview_image,MAX(mainw->pwidth,mainw->sepwin_minwidth),mainw->pheight);
   }
 
   lives_widget_set_hexpand(mainw->preview_box,TRUE);
   lives_widget_set_vexpand(mainw->preview_box,TRUE);
 
-  mainw->preview_controls=lives_vbox_new (FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (mainw->preview_box), mainw->preview_controls, FALSE, FALSE, 0);
+  mainw->preview_controls=lives_vbox_new(FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(mainw->preview_box), mainw->preview_controls, FALSE, FALSE, 0);
   lives_widget_set_vexpand(mainw->preview_controls,FALSE);
 
-  hbox = lives_hbox_new (FALSE, 0);
+  hbox = lives_hbox_new(FALSE, 0);
   lives_widget_set_vexpand(hbox,FALSE);
-  lives_container_set_border_width (LIVES_CONTAINER (hbox), 0);
+  lives_container_set_border_width(LIVES_CONTAINER(hbox), 0);
 
 
-  mainw->preview_spinbutton = lives_standard_spin_button_new (NULL,FALSE,(mainw->current_file>-1&&cfile->frames>0.)?1.:0.,
-							      (mainw->current_file>-1&&cfile->frames>0.)?1.:0.,
-							      (mainw->current_file>-1&&cfile->frames>0.)?cfile->frames:0.,
-							      1., 10., 0,
-							      LIVES_BOX(hbox),_("Frame number to preview"));
+  mainw->preview_spinbutton = lives_standard_spin_button_new(NULL,FALSE,(mainw->current_file>-1&&cfile->frames>0.)?1.:0.,
+                              (mainw->current_file>-1&&cfile->frames>0.)?1.:0.,
+                              (mainw->current_file>-1&&cfile->frames>0.)?cfile->frames:0.,
+                              1., 10., 0,
+                              LIVES_BOX(hbox),_("Frame number to preview"));
 
   mainw->preview_scale=lives_hscale_new(lives_spin_button_get_adjustment(LIVES_SPIN_BUTTON(mainw->preview_spinbutton)));
-  gtk_scale_set_draw_value(GTK_SCALE(mainw->preview_scale),FALSE);
+  lives_scale_set_draw_value(LIVES_SCALE(mainw->preview_scale),FALSE);
 
   if (palette->style&STYLE_1) {
     lives_widget_set_bg_color(mainw->preview_image, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
@@ -3530,147 +3652,151 @@
     lives_widget_set_fg_color(mainw->preview_scale, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
   }
 
-  lives_box_pack_start (LIVES_BOX (mainw->preview_controls), mainw->preview_scale,FALSE, FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (mainw->preview_controls), hbox, FALSE, FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(mainw->preview_controls), mainw->preview_scale,FALSE, FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(mainw->preview_controls), hbox, FALSE, FALSE, 0);
 
-  lives_entry_set_width_chars (LIVES_ENTRY (mainw->preview_spinbutton),8);
+  lives_entry_set_width_chars(LIVES_ENTRY(mainw->preview_spinbutton),8);
 
-  radiobutton_free=lives_standard_radio_button_new((tmp=g_strdup(_ ("_Free"))),TRUE,radiobutton_group,LIVES_BOX(hbox),
-						   (tmp2=g_strdup(_("Free choice of frame number"))));
-  g_free(tmp); g_free(tmp2);
-  radiobutton_group = lives_radio_button_get_group (LIVES_RADIO_BUTTON (radiobutton_free));
+  radiobutton_free=lives_standard_radio_button_new((tmp=lives_strdup(_("_Free"))),TRUE,radiobutton_group,LIVES_BOX(hbox),
+                   (tmp2=lives_strdup(_("Free choice of frame number"))));
+  lives_free(tmp);
+  lives_free(tmp2);
+  radiobutton_group = lives_radio_button_get_group(LIVES_RADIO_BUTTON(radiobutton_free));
 
-  radiobutton_start=lives_standard_radio_button_new((tmp=g_strdup(_ ("_Start"))),TRUE,radiobutton_group,LIVES_BOX(hbox),
-						    (tmp2=g_strdup(_("Frame number is linked to start frame"))));
-  g_free(tmp); g_free(tmp2);
-  radiobutton_group = lives_radio_button_get_group (LIVES_RADIO_BUTTON (radiobutton_start));
+  radiobutton_start=lives_standard_radio_button_new((tmp=lives_strdup(_("_Start"))),TRUE,radiobutton_group,LIVES_BOX(hbox),
+                    (tmp2=lives_strdup(_("Frame number is linked to start frame"))));
+  lives_free(tmp);
+  lives_free(tmp2);
+  radiobutton_group = lives_radio_button_get_group(LIVES_RADIO_BUTTON(radiobutton_start));
 
-  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (radiobutton_start), mainw->prv_link==PRV_START);
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(radiobutton_start), mainw->prv_link==PRV_START);
 
 
-  radiobutton_end=lives_standard_radio_button_new((tmp=g_strdup(_ ("_End"))),TRUE,radiobutton_group,LIVES_BOX(hbox),
-						    (tmp2=g_strdup(_("Frame number is linked to end frame"))));
-  g_free(tmp); g_free(tmp2);
-  radiobutton_group = lives_radio_button_get_group (LIVES_RADIO_BUTTON (radiobutton_end));
+  radiobutton_end=lives_standard_radio_button_new((tmp=lives_strdup(_("_End"))),TRUE,radiobutton_group,LIVES_BOX(hbox),
+                  (tmp2=lives_strdup(_("Frame number is linked to end frame"))));
+  lives_free(tmp);
+  lives_free(tmp2);
+  radiobutton_group = lives_radio_button_get_group(LIVES_RADIO_BUTTON(radiobutton_end));
 
-  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (radiobutton_end), mainw->prv_link==PRV_END);
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(radiobutton_end), mainw->prv_link==PRV_END);
 
 
-  radiobutton_ptr=lives_standard_radio_button_new((tmp=g_strdup(_ ("_Pointer"))),TRUE,radiobutton_group,LIVES_BOX(hbox),
-						  (tmp2=g_strdup(_("Frame number is linked to playback pointer"))));
-  g_free(tmp); g_free(tmp2);
+  radiobutton_ptr=lives_standard_radio_button_new((tmp=lives_strdup(_("_Pointer"))),TRUE,radiobutton_group,LIVES_BOX(hbox),
+                  (tmp2=lives_strdup(_("Frame number is linked to playback pointer"))));
+  lives_free(tmp);
+  lives_free(tmp2);
 
 
-  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (radiobutton_end), mainw->prv_link==PRV_PTR);
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(radiobutton_end), mainw->prv_link==PRV_PTR);
 
 
-  add_hsep_to_box (LIVES_BOX (mainw->preview_controls));
+  add_hsep_to_box(LIVES_BOX(mainw->preview_controls));
 
   // buttons
-  hbox_buttons = lives_hbox_new (FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (mainw->preview_controls), hbox_buttons, TRUE, TRUE, 0);
+  hbox_buttons = lives_hbox_new(FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(mainw->preview_controls), hbox_buttons, TRUE, TRUE, 0);
 
-  rewind_img=lives_image_new_from_stock (LIVES_STOCK_MEDIA_REWIND, lives_toolbar_get_icon_size (LIVES_TOOLBAR (mainw->btoolbar)));
+  rewind_img=lives_image_new_from_stock(LIVES_STOCK_MEDIA_REWIND, lives_toolbar_get_icon_size(LIVES_TOOLBAR(mainw->btoolbar)));
   mainw->p_rewindbutton=lives_button_new();
-  lives_widget_set_bg_color (mainw->p_rewindbutton, LIVES_WIDGET_STATE_ACTIVE, &palette->menu_and_bars);
-  lives_button_set_relief (LIVES_BUTTON (mainw->p_rewindbutton), GTK_RELIEF_NONE);
-  lives_container_add (LIVES_CONTAINER(mainw->p_rewindbutton), rewind_img);
-  lives_box_pack_start (LIVES_BOX (hbox_buttons), mainw->p_rewindbutton, TRUE, TRUE, 0);
-  lives_widget_show (mainw->p_rewindbutton);
-  lives_widget_show (rewind_img);
-  lives_widget_set_tooltip_text( mainw->p_rewindbutton,_ ("Rewind"));
-  lives_widget_set_sensitive (mainw->p_rewindbutton, mainw->current_file>-1&&cfile->pointer_time>0.);
+  lives_widget_set_bg_color(mainw->p_rewindbutton, LIVES_WIDGET_STATE_ACTIVE, &palette->menu_and_bars);
+  lives_button_set_relief(LIVES_BUTTON(mainw->p_rewindbutton), LIVES_RELIEF_NONE);
+  lives_container_add(LIVES_CONTAINER(mainw->p_rewindbutton), rewind_img);
+  lives_box_pack_start(LIVES_BOX(hbox_buttons), mainw->p_rewindbutton, TRUE, TRUE, 0);
+  lives_widget_show(mainw->p_rewindbutton);
+  lives_widget_show(rewind_img);
+  lives_widget_set_tooltip_text(mainw->p_rewindbutton,_("Rewind"));
+  lives_widget_set_sensitive(mainw->p_rewindbutton, mainw->current_file>-1&&cfile->pointer_time>0.);
 
-  play_img=lives_image_new_from_stock (LIVES_STOCK_MEDIA_PLAY, lives_toolbar_get_icon_size (LIVES_TOOLBAR (mainw->btoolbar)));
+  play_img=lives_image_new_from_stock(LIVES_STOCK_MEDIA_PLAY, lives_toolbar_get_icon_size(LIVES_TOOLBAR(mainw->btoolbar)));
   mainw->p_playbutton=lives_button_new();
-  lives_widget_set_bg_color (mainw->p_playbutton, LIVES_WIDGET_STATE_ACTIVE, &palette->menu_and_bars);
-  lives_button_set_relief (LIVES_BUTTON (mainw->p_playbutton), GTK_RELIEF_NONE);
-  lives_container_add (LIVES_CONTAINER(mainw->p_playbutton), play_img);
-  lives_box_pack_start (LIVES_BOX (hbox_buttons), mainw->p_playbutton, TRUE, TRUE, 0);
-  lives_widget_show (mainw->p_playbutton);
-  lives_widget_show (play_img);
-  lives_widget_set_tooltip_text( mainw->p_playbutton,_ ("Play all"));
-
-  fnamex=g_build_filename(prefs->prefix_dir,ICON_DIR,"playsel.png",NULL);
-  g_snprintf (buff,PATH_MAX,"%s",fnamex);
-  g_free(fnamex);
-  playsel_img=lives_image_new_from_file (buff);
+  lives_widget_set_bg_color(mainw->p_playbutton, LIVES_WIDGET_STATE_ACTIVE, &palette->menu_and_bars);
+  lives_button_set_relief(LIVES_BUTTON(mainw->p_playbutton), LIVES_RELIEF_NONE);
+  lives_container_add(LIVES_CONTAINER(mainw->p_playbutton), play_img);
+  lives_box_pack_start(LIVES_BOX(hbox_buttons), mainw->p_playbutton, TRUE, TRUE, 0);
+  lives_widget_show(mainw->p_playbutton);
+  lives_widget_show(play_img);
+  lives_widget_set_tooltip_text(mainw->p_playbutton,_("Play all"));
+
+  fnamex=lives_build_filename(prefs->prefix_dir,ICON_DIR,"playsel.png",NULL);
+  lives_snprintf(buff,PATH_MAX,"%s",fnamex);
+  lives_free(fnamex);
+  playsel_img=lives_image_new_from_file(buff);
   mainw->p_playselbutton=lives_button_new();
-  lives_widget_set_bg_color (mainw->p_playselbutton, LIVES_WIDGET_STATE_ACTIVE, &palette->menu_and_bars);
-  lives_button_set_relief (LIVES_BUTTON (mainw->p_playselbutton), GTK_RELIEF_NONE);
-  lives_container_add (LIVES_CONTAINER(mainw->p_playselbutton), playsel_img);
-  lives_box_pack_start (LIVES_BOX (hbox_buttons), mainw->p_playselbutton, TRUE, TRUE, 0);
-  lives_widget_show (mainw->p_playselbutton);
-  lives_widget_show (playsel_img);
-  lives_widget_set_tooltip_text( mainw->p_playselbutton,_ ("Play Selection"));
-  lives_widget_set_sensitive (mainw->p_playselbutton, mainw->current_file>-1&&cfile->frames>0);
-
-  fnamex=g_build_filename(prefs->prefix_dir,ICON_DIR,"loop.png",NULL);
-  g_snprintf (buff,PATH_MAX,"%s",fnamex);
-  g_free(fnamex);
-  loop_img=lives_image_new_from_file (buff);
+  lives_widget_set_bg_color(mainw->p_playselbutton, LIVES_WIDGET_STATE_ACTIVE, &palette->menu_and_bars);
+  lives_button_set_relief(LIVES_BUTTON(mainw->p_playselbutton), LIVES_RELIEF_NONE);
+  lives_container_add(LIVES_CONTAINER(mainw->p_playselbutton), playsel_img);
+  lives_box_pack_start(LIVES_BOX(hbox_buttons), mainw->p_playselbutton, TRUE, TRUE, 0);
+  lives_widget_show(mainw->p_playselbutton);
+  lives_widget_show(playsel_img);
+  lives_widget_set_tooltip_text(mainw->p_playselbutton,_("Play Selection"));
+  lives_widget_set_sensitive(mainw->p_playselbutton, mainw->current_file>-1&&cfile->frames>0);
+
+  fnamex=lives_build_filename(prefs->prefix_dir,ICON_DIR,"loop.png",NULL);
+  lives_snprintf(buff,PATH_MAX,"%s",fnamex);
+  lives_free(fnamex);
+  loop_img=lives_image_new_from_file(buff);
   mainw->p_loopbutton=lives_button_new();
-  lives_widget_set_bg_color (mainw->p_loopbutton, LIVES_WIDGET_STATE_ACTIVE, &palette->menu_and_bars);
-  lives_button_set_relief (LIVES_BUTTON (mainw->p_loopbutton), GTK_RELIEF_NONE);
-  lives_container_add (LIVES_CONTAINER(mainw->p_loopbutton), loop_img);
-  lives_box_pack_start (LIVES_BOX (hbox_buttons), mainw->p_loopbutton, TRUE, TRUE, 0);
-  lives_widget_show (mainw->p_loopbutton);
-  lives_widget_show (loop_img);
-  lives_widget_set_tooltip_text( mainw->p_loopbutton,_ ("Loop On/Off"));
-  lives_widget_set_sensitive (mainw->p_loopbutton, TRUE);
-
-  fnamex=g_build_filename(prefs->prefix_dir,ICON_DIR,"volume_mute.png",NULL);
-  g_snprintf (buff,PATH_MAX,"%s",fnamex);
-  g_free(fnamex);
-  mainw->p_mute_img=lives_image_new_from_file (buff);
-  if (g_file_test(buff,G_FILE_TEST_EXISTS)&&!mainw->mute) {
+  lives_widget_set_bg_color(mainw->p_loopbutton, LIVES_WIDGET_STATE_ACTIVE, &palette->menu_and_bars);
+  lives_button_set_relief(LIVES_BUTTON(mainw->p_loopbutton), LIVES_RELIEF_NONE);
+  lives_container_add(LIVES_CONTAINER(mainw->p_loopbutton), loop_img);
+  lives_box_pack_start(LIVES_BOX(hbox_buttons), mainw->p_loopbutton, TRUE, TRUE, 0);
+  lives_widget_show(mainw->p_loopbutton);
+  lives_widget_show(loop_img);
+  lives_widget_set_tooltip_text(mainw->p_loopbutton,_("Loop On/Off"));
+  lives_widget_set_sensitive(mainw->p_loopbutton, TRUE);
+
+  fnamex=lives_build_filename(prefs->prefix_dir,ICON_DIR,"volume_mute.png",NULL);
+  lives_snprintf(buff,PATH_MAX,"%s",fnamex);
+  lives_free(fnamex);
+  mainw->p_mute_img=lives_image_new_from_file(buff);
+  if (lives_file_test(buff,LIVES_FILE_TEST_EXISTS)&&!mainw->mute) {
     LiVESPixbuf *pixbuf=lives_image_get_pixbuf(LIVES_IMAGE(mainw->p_mute_img));
     lives_pixbuf_saturate_and_pixelate(pixbuf,pixbuf,0.2,FALSE);
   }
 
   mainw->p_mutebutton=lives_button_new();
-  lives_widget_set_bg_color (mainw->p_mutebutton, LIVES_WIDGET_STATE_ACTIVE, &palette->menu_and_bars);
-  lives_button_set_relief (LIVES_BUTTON (mainw->p_mutebutton), GTK_RELIEF_NONE);
-  lives_container_add (LIVES_CONTAINER(mainw->p_mutebutton), mainw->p_mute_img);
-  lives_box_pack_start (LIVES_BOX (hbox_buttons), mainw->p_mutebutton, TRUE, TRUE, 0);
-  lives_widget_show (mainw->p_mutebutton);
-  lives_widget_show (mainw->p_mute_img);
-
-  if (!mainw->mute) lives_widget_set_tooltip_text( mainw->p_mutebutton,_("Mute the audio (z)"));
-  else lives_widget_set_tooltip_text( mainw->p_mutebutton,_("Unmute the audio (z)"));
-
-  lives_signal_connect (LIVES_GUI_OBJECT (radiobutton_free), LIVES_WIDGET_TOGGLED_EVENT,
-		    LIVES_GUI_CALLBACK (on_prv_link_toggled),
-		    GINT_TO_POINTER (PRV_FREE));
-  lives_signal_connect (LIVES_GUI_OBJECT (radiobutton_start), LIVES_WIDGET_TOGGLED_EVENT,
-		    LIVES_GUI_CALLBACK (on_prv_link_toggled),
-		    GINT_TO_POINTER (PRV_START));
-  lives_signal_connect (LIVES_GUI_OBJECT (radiobutton_end), LIVES_WIDGET_TOGGLED_EVENT,
-		    LIVES_GUI_CALLBACK (on_prv_link_toggled),
-		    GINT_TO_POINTER (PRV_END));
-  lives_signal_connect (LIVES_GUI_OBJECT (radiobutton_ptr), LIVES_WIDGET_TOGGLED_EVENT,
-		    LIVES_GUI_CALLBACK (on_prv_link_toggled),
-		    GINT_TO_POINTER (PRV_PTR));
-
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->p_playbutton), LIVES_WIDGET_CLICKED_EVENT,
-                      LIVES_GUI_CALLBACK (on_playall_activate),
-                      NULL);
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->p_playselbutton), LIVES_WIDGET_CLICKED_EVENT,
-                      LIVES_GUI_CALLBACK (on_playsel_activate),
-                      NULL);
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->p_rewindbutton), LIVES_WIDGET_CLICKED_EVENT,
-                      LIVES_GUI_CALLBACK (on_rewind_activate),
-                      NULL);
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->p_mutebutton), LIVES_WIDGET_CLICKED_EVENT,
-                      LIVES_GUI_CALLBACK (on_mute_button_activate),
-                      NULL);
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->p_loopbutton), LIVES_WIDGET_CLICKED_EVENT,
-                      LIVES_GUI_CALLBACK (on_loop_button_activate),
-                      NULL);
-
-  mainw->preview_spin_func=lives_signal_connect_after (LIVES_GUI_OBJECT (mainw->preview_spinbutton), "value_changed",
-						   LIVES_GUI_CALLBACK (on_preview_spinbutton_changed),
-						   NULL);
+  lives_widget_set_bg_color(mainw->p_mutebutton, LIVES_WIDGET_STATE_ACTIVE, &palette->menu_and_bars);
+  lives_button_set_relief(LIVES_BUTTON(mainw->p_mutebutton), LIVES_RELIEF_NONE);
+  lives_container_add(LIVES_CONTAINER(mainw->p_mutebutton), mainw->p_mute_img);
+  lives_box_pack_start(LIVES_BOX(hbox_buttons), mainw->p_mutebutton, TRUE, TRUE, 0);
+  lives_widget_show(mainw->p_mutebutton);
+  lives_widget_show(mainw->p_mute_img);
+
+  if (!mainw->mute) lives_widget_set_tooltip_text(mainw->p_mutebutton,_("Mute the audio (z)"));
+  else lives_widget_set_tooltip_text(mainw->p_mutebutton,_("Unmute the audio (z)"));
+
+  lives_signal_connect(LIVES_GUI_OBJECT(radiobutton_free), LIVES_WIDGET_TOGGLED_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_prv_link_toggled),
+                       LIVES_INT_TO_POINTER(PRV_FREE));
+  lives_signal_connect(LIVES_GUI_OBJECT(radiobutton_start), LIVES_WIDGET_TOGGLED_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_prv_link_toggled),
+                       LIVES_INT_TO_POINTER(PRV_START));
+  lives_signal_connect(LIVES_GUI_OBJECT(radiobutton_end), LIVES_WIDGET_TOGGLED_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_prv_link_toggled),
+                       LIVES_INT_TO_POINTER(PRV_END));
+  lives_signal_connect(LIVES_GUI_OBJECT(radiobutton_ptr), LIVES_WIDGET_TOGGLED_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_prv_link_toggled),
+                       LIVES_INT_TO_POINTER(PRV_PTR));
+
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->p_playbutton), LIVES_WIDGET_CLICKED_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_playall_activate),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->p_playselbutton), LIVES_WIDGET_CLICKED_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_playsel_activate),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->p_rewindbutton), LIVES_WIDGET_CLICKED_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_rewind_activate),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->p_mutebutton), LIVES_WIDGET_CLICKED_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_mute_button_activate),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->p_loopbutton), LIVES_WIDGET_CLICKED_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_loop_button_activate),
+                       NULL);
+
+  mainw->preview_spin_func=lives_signal_connect_after(LIVES_GUI_OBJECT(mainw->preview_spinbutton), LIVES_WIDGET_VALUE_CHANGED_SIGNAL,
+                           LIVES_GUI_CALLBACK(on_preview_spinbutton_changed),
+                           NULL);
 
   lives_widget_show_all(mainw->preview_box);
 
@@ -3689,41 +3815,41 @@
 
 #endif
 
-void enable_record (void) {
-  set_menu_text (mainw->record_perf, _("Start _recording"),TRUE);
-  lives_widget_set_sensitive (mainw->record_perf, TRUE);
+void enable_record(void) {
+  set_menu_text(mainw->record_perf, _("Start _recording"),TRUE);
+  lives_widget_set_sensitive(mainw->record_perf, TRUE);
 }
 
-void toggle_record (void) {
-  set_menu_text (mainw->record_perf, _("Stop _recording"),TRUE);
+void toggle_record(void) {
+  set_menu_text(mainw->record_perf, _("Stop _recording"),TRUE);
 }
 
 
-void disable_record (void) {
-  set_menu_text (mainw->record_perf, _("_Record Performance"),TRUE);
+void disable_record(void) {
+  set_menu_text(mainw->record_perf, _("_Record Performance"),TRUE);
 }
 
 
 
 void play_window_set_title(void) {
-  gchar *xtrabit;
-  gchar *title;
+  char *xtrabit;
+  char *title;
 
-  if (mainw->sepwin_scale!=100.) xtrabit=g_strdup_printf(_(" (%d %% scale)"),(int)mainw->sepwin_scale);
-  else xtrabit=g_strdup("");
+  if (mainw->sepwin_scale!=100.) xtrabit=lives_strdup_printf(_(" (%d %% scale)"),(int)mainw->sepwin_scale);
+  else xtrabit=lives_strdup("");
 
   if (mainw->playing_file>-1) {
-    title=g_strdup_printf(_("LiVES: - Play Window%s"),xtrabit);
-    lives_window_set_title (LIVES_WINDOW (mainw->play_window), title);
-  }
-  else {
-    title=g_strdup_printf("%s%s",lives_window_get_title(LIVES_WINDOW
-						      (mainw->multitrack==NULL?mainw->LiVES:
-						       mainw->multitrack->window)),xtrabit);
+    title=lives_strdup_printf(_("LiVES: - Play Window%s"),xtrabit);
+    lives_window_set_title(LIVES_WINDOW(mainw->play_window), title);
+  } else {
+    title=lives_strdup_printf("%s%s",lives_window_get_title(LIVES_WINDOW
+                              ((mainw->multitrack==NULL?mainw->LiVES:
+                                mainw->multitrack->window))),
+                              xtrabit);
     lives_window_set_title(LIVES_WINDOW(mainw->play_window),title);
   }
-  g_free(title);
-  g_free(xtrabit);
+  lives_free(title);
+  lives_free(xtrabit);
 }
 
 
@@ -3732,24 +3858,23 @@
 
   mainw->scr_width=mainw->mgeom[prefs->gui_monitor>0?prefs->gui_monitor-1:0].width;
   mainw->scr_height=mainw->mgeom[prefs->gui_monitor>0?prefs->gui_monitor-1:0].height;
-  
+
   if (mainw->multitrack==NULL) {
     if (prefs->gui_monitor!=0) {
       lives_window_center(LIVES_WINDOW(mainw->LiVES));
-      
+
     }
     if (prefs->open_maximised&&prefs->show_gui) {
-      lives_window_maximize (LIVES_WINDOW(mainw->LiVES));
+      lives_window_maximize(LIVES_WINDOW(mainw->LiVES));
     }
-  }
-  else {
+  } else {
     if (prefs->gui_monitor!=0) {
       lives_window_center(LIVES_WINDOW(mainw->multitrack->window));
     }
-	
-	
+
+
     if ((prefs->gui_monitor!=0||capable->nmonitors<=1)&&prefs->open_maximised) {
-      lives_window_maximize (LIVES_WINDOW(mainw->multitrack->window));
+      lives_window_maximize(LIVES_WINDOW(mainw->multitrack->window));
     }
   }
 
@@ -3779,21 +3904,21 @@
   if (mainw->play_window!=NULL) {
     // this shouldn't ever happen
     kill_play_window();
-  } 
-  
-  mainw->play_window = lives_window_new (LIVES_WINDOW_TOPLEVEL);
-  lives_window_set_hide_titlebar_when_maximized(LIVES_WINDOW(mainw->LiVES),TRUE);
+  }
 
-  lives_widget_set_events (mainw->play_window, LIVES_SCROLL_MASK);
+  mainw->play_window = lives_window_new(LIVES_WINDOW_TOPLEVEL);
+  //  lives_window_set_hide_titlebar_when_maximized(LIVES_WINDOW(mainw->LiVES),TRUE);
+
+  lives_widget_set_events(mainw->play_window, LIVES_SCROLL_MASK);
 
   // cannot do this or it forces showing on the GUI monitor
   //gtk_window_set_position(LIVES_WINDOW(mainw->play_window),GTK_WIN_POS_CENTER_ALWAYS);
 
-  if (mainw->multitrack==NULL) lives_window_add_accel_group (LIVES_WINDOW (mainw->play_window), mainw->accel_group);
-  else lives_window_add_accel_group (LIVES_WINDOW (mainw->play_window), mainw->multitrack->accel_group);
+  if (mainw->multitrack==NULL) lives_window_add_accel_group(LIVES_WINDOW(mainw->play_window), mainw->accel_group);
+  else lives_window_add_accel_group(LIVES_WINDOW(mainw->play_window), mainw->multitrack->accel_group);
 
   if (palette->style&STYLE_1) {
-    lives_widget_set_bg_color (mainw->play_window, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+    lives_widget_set_bg_color(mainw->play_window, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
   }
 
   // show the window (so we can hide its cursor !), and get its xwin
@@ -3815,25 +3940,23 @@
 
     //if (cfile->is_loaded) {
     //and add it the play window
-    lives_container_add (LIVES_CONTAINER (mainw->play_window), mainw->preview_box);
+    lives_container_add(LIVES_CONTAINER(mainw->play_window), mainw->preview_box);
 
-    if (mainw->is_processing&&mainw->current_file>-1&&!cfile->nopreview) 
-      lives_widget_set_tooltip_text( mainw->p_playbutton,_ ("Preview")); 
+    if (mainw->is_processing&&mainw->current_file>-1&&!cfile->nopreview)
+      lives_widget_set_tooltip_text(mainw->p_playbutton,_("Preview"));
 
     if (mainw->current_file>-1&&cfile->is_loaded) {
-      lives_widget_grab_focus (mainw->preview_spinbutton);
-    }
-    else {
+      lives_widget_grab_focus(mainw->preview_spinbutton);
+    } else {
       lives_widget_hide(mainw->preview_controls);
     }
 
     if (mainw->playing_file>-1) {
       lives_widget_hide(mainw->preview_box);
-    }
-    else {
+    } else {
       if (mainw->is_processing&&(mainw->prv_link==PRV_START||mainw->prv_link==PRV_END)) {
-	// block spinbutton in play window
-	lives_widget_set_sensitive(mainw->preview_spinbutton,FALSE);
+        // block spinbutton in play window
+        lives_widget_set_sensitive(mainw->preview_spinbutton,FALSE);
       }
     }
   }
@@ -3842,24 +3965,24 @@
 
   if ((mainw->current_file==-1||(!cfile->is_loaded&&!mainw->preview)||
        (cfile->frames==0&&(mainw->multitrack==NULL||mainw->playing_file==-1)))&&mainw->imframe!=NULL) {
-    lives_painter_t *cr = lives_painter_create_from_widget (mainw->play_window);
-    lives_painter_set_source_pixbuf (cr, mainw->imframe, (LiVESXModifierType)0, 0);
-    lives_painter_paint (cr);
-    lives_painter_destroy (cr);
+    lives_painter_t *cr = lives_painter_create_from_widget(mainw->play_window);
+    lives_painter_set_source_pixbuf(cr, mainw->imframe, (LiVESXModifierType)0, 0);
+    lives_painter_paint(cr);
+    lives_painter_destroy(cr);
   }
 
-  lives_widget_set_tooltip_text( mainw->m_sepwinbutton,_ ("Hide Play Window"));
-
-  lives_signal_connect (LIVES_GUI_OBJECT (mainw->play_window), "delete_event",
-		    LIVES_GUI_CALLBACK (on_stop_activate_by_del),
-		    NULL);
-  
+  lives_widget_set_tooltip_text(mainw->m_sepwinbutton,_("Hide Play Window"));
+
+  lives_signal_connect(LIVES_GUI_OBJECT(mainw->play_window), LIVES_WIDGET_DELETE_EVENT,
+                       LIVES_GUI_CALLBACK(on_stop_activate_by_del),
+                       NULL);
+
 
 }
 
 
 
-void resize_play_window (void) {
+void resize_play_window(void) {
   int opwx,opwy,pmonitor=prefs->play_monitor,gmonitor=prefs->gui_monitor;
 
   boolean fullscreen=TRUE;
@@ -3886,22 +4009,19 @@
        (!cfile->is_loaded&&!mainw->preview&&cfile->clip_type!=CLIP_TYPE_GENERATOR))||
       (mainw->multitrack!=NULL&&mainw->playing_file<1&&!mainw->preview)) {
     if (mainw->imframe!=NULL) {
-      mainw->pwidth=lives_pixbuf_get_width (mainw->imframe);
-      mainw->pheight=lives_pixbuf_get_height (mainw->imframe);
-    }
-    else {
+      mainw->pwidth=lives_pixbuf_get_width(mainw->imframe);
+      mainw->pheight=lives_pixbuf_get_height(mainw->imframe);
+    } else {
       if (mainw->multitrack==NULL) {
-	mainw->pwidth=DEFAULT_FRAME_HSIZE;
-	mainw->pheight=DEFAULT_FRAME_VSIZE;
+        mainw->pwidth=DEFAULT_FRAME_HSIZE;
+        mainw->pheight=DEFAULT_FRAME_VSIZE;
       }
     }
-  }
-  else {
+  } else {
     if (mainw->multitrack==NULL) {
       mainw->pwidth=cfile->hsize;
       mainw->pheight=cfile->vsize;
-    }
-    else {
+    } else {
       mainw->pwidth=mainw->files[mainw->multitrack->render_file]->hsize;
       mainw->pheight=mainw->files[mainw->multitrack->render_file]->vsize;
       mainw->must_resize=TRUE;
@@ -3911,283 +4031,264 @@
 
     do {
       if (pmonitor==0) {
-	if (mainw->pwidth>mainw->scr_width-SCR_WIDTH_SAFETY||
-	    mainw->pheight>mainw->scr_height-SCR_HEIGHT_SAFETY) { 
-	  mainw->pheight=(mainw->pheight>>2)<<1;
-	  mainw->pwidth=(mainw->pwidth>>2)<<1;
-	  mainw->sepwin_scale/=2.;
-	}
-	else size_ok=TRUE;
-      }
-      else {
-	if (mainw->pwidth>mainw->mgeom[pmonitor-1].width-SCR_WIDTH_SAFETY||
-	    mainw->pheight>mainw->mgeom[pmonitor-1].height-SCR_HEIGHT_SAFETY) {
-	  mainw->pheight=(mainw->pheight>>2)<<1;
-	  mainw->pwidth=(mainw->pwidth>>2)<<1;
-	  mainw->sepwin_scale/=2.;
-	}
-	else size_ok=TRUE;
+        if (mainw->pwidth>mainw->scr_width-SCR_WIDTH_SAFETY||
+            mainw->pheight>mainw->scr_height-SCR_HEIGHT_SAFETY) {
+          mainw->pheight=(mainw->pheight>>2)<<1;
+          mainw->pwidth=(mainw->pwidth>>2)<<1;
+          mainw->sepwin_scale/=2.;
+        } else size_ok=TRUE;
+      } else {
+        if (mainw->pwidth>mainw->mgeom[pmonitor-1].width-SCR_WIDTH_SAFETY||
+            mainw->pheight>mainw->mgeom[pmonitor-1].height-SCR_HEIGHT_SAFETY) {
+          mainw->pheight=(mainw->pheight>>2)<<1;
+          mainw->pwidth=(mainw->pwidth>>2)<<1;
+          mainw->sepwin_scale/=2.;
+        } else size_ok=TRUE;
       }
     } while (!size_ok);
   }
- 
+
   if (mainw->playing_file>-1) {
     if (mainw->double_size&&mainw->multitrack==NULL) {
       mainw->pheight*=2;
       mainw->pwidth*=2;
       if (pmonitor==0) {
-	if (mainw->pwidth>mainw->scr_width-SCR_WIDTH_SAFETY||mainw->pheight>mainw->scr_height-SCR_HEIGHT_SAFETY) {
-	  calc_maxspect(mainw->scr_width-SCR_WIDTH_SAFETY,mainw->scr_height-SCR_HEIGHT_SAFETY,&mainw->pwidth,&mainw->pheight);
-	  mainw->sepwin_scale=(float)mainw->pwidth/(float)cfile->hsize*100.;
-	}
-      }
-      else {
-	if (mainw->pwidth>mainw->mgeom[pmonitor-1].width-SCR_WIDTH_SAFETY||
-	    mainw->pheight>mainw->mgeom[pmonitor-1].height-SCR_HEIGHT_SAFETY) { 
-	  calc_maxspect(mainw->mgeom[pmonitor-1].width-SCR_WIDTH_SAFETY,mainw->mgeom[pmonitor-1].height-SCR_HEIGHT_SAFETY,
-			&mainw->pwidth,&mainw->pheight);
-	  mainw->sepwin_scale=(float)mainw->pwidth/(float)cfile->hsize*100.;
-	}
+        if (mainw->pwidth>mainw->scr_width-SCR_WIDTH_SAFETY||mainw->pheight>mainw->scr_height-SCR_HEIGHT_SAFETY) {
+          calc_maxspect(mainw->scr_width-SCR_WIDTH_SAFETY,mainw->scr_height-SCR_HEIGHT_SAFETY,&mainw->pwidth,&mainw->pheight);
+          mainw->sepwin_scale=(float)mainw->pwidth/(float)cfile->hsize*100.;
+        }
+      } else {
+        if (mainw->pwidth>mainw->mgeom[pmonitor-1].width-SCR_WIDTH_SAFETY||
+            mainw->pheight>mainw->mgeom[pmonitor-1].height-SCR_HEIGHT_SAFETY) {
+          calc_maxspect(mainw->mgeom[pmonitor-1].width-SCR_WIDTH_SAFETY,mainw->mgeom[pmonitor-1].height-SCR_HEIGHT_SAFETY,
+                        &mainw->pwidth,&mainw->pheight);
+          mainw->sepwin_scale=(float)mainw->pwidth/(float)cfile->hsize*100.;
+        }
       }
     }
 
     if (mainw->fs) {
-      if (!lives_widget_is_visible (mainw->play_window)) {
-	lives_widget_show (mainw->play_window);
-	// be careful, the user could switch out of sepwin here !
-	mainw->noswitch=TRUE;
-	lives_widget_context_update();
-	mainw->noswitch=FALSE;
-	if (mainw->play_window==NULL) return;
-	if (!mainw->fs||mainw->playing_file<0) goto point1;
-	mainw->opwx=mainw->opwy=-1;
-      }
-      else {
-	if (pmonitor==0) {
-	  mainw->opwx=(mainw->scr_width-mainw->pwidth)/2;
-	  mainw->opwy=(mainw->scr_height-mainw->pheight)/2;
-	}
-	else {
-	  mainw->opwx=mainw->mgeom[pmonitor-1].x+(mainw->mgeom[pmonitor-1].width-mainw->pwidth)/2;
-	  mainw->opwy=mainw->mgeom[pmonitor-1].y+(mainw->mgeom[pmonitor-1].height-mainw->pheight)/2;
-	}
+      if (!lives_widget_is_visible(mainw->play_window)) {
+        lives_widget_show(mainw->play_window);
+        // be careful, the user could switch out of sepwin here !
+        mainw->noswitch=TRUE;
+        lives_widget_context_update();
+        mainw->noswitch=FALSE;
+        if (mainw->play_window==NULL) return;
+        if (!mainw->fs||mainw->playing_file<0) goto point1;
+        mainw->opwx=mainw->opwy=-1;
+      } else {
+        if (pmonitor==0) {
+          mainw->opwx=(mainw->scr_width-mainw->pwidth)/2;
+          mainw->opwy=(mainw->scr_height-mainw->pheight)/2;
+        } else {
+          mainw->opwx=mainw->mgeom[pmonitor-1].x+(mainw->mgeom[pmonitor-1].width-mainw->pwidth)/2;
+          mainw->opwy=mainw->mgeom[pmonitor-1].y+(mainw->mgeom[pmonitor-1].height-mainw->pheight)/2;
+        }
       }
 
       if (pmonitor==0) {
-	mainw->pwidth=mainw->scr_width;
-	mainw->pheight=mainw->scr_height;
-	if (capable->nmonitors>1) {
-	  // spread over all monitors
-	  mainw->pwidth=gdk_screen_get_width(mainw->mgeom[0].screen);
-	  mainw->pheight=gdk_screen_get_height(mainw->mgeom[0].screen);
-	}
-      }
-      else {
-	mainw->pwidth=mainw->mgeom[pmonitor-1].width;
-	mainw->pheight=mainw->mgeom[pmonitor-1].height;
+        mainw->pwidth=mainw->scr_width;
+        mainw->pheight=mainw->scr_height;
+        if (capable->nmonitors>1) {
+          // spread over all monitors
+          mainw->pwidth=lives_screen_get_width(mainw->mgeom[0].screen);
+          mainw->pheight=lives_screen_get_height(mainw->mgeom[0].screen);
+        }
+      } else {
+        mainw->pwidth=mainw->mgeom[pmonitor-1].width;
+        mainw->pheight=mainw->mgeom[pmonitor-1].height;
       }
 
-      if (lives_widget_is_visible (mainw->play_window)) {
-	// store old postion of window
-	lives_window_get_position (LIVES_WINDOW (mainw->play_window),&opwx,&opwy);
-	if (opwx*opwy) {
-	  mainw->opwx=opwx;
-	  mainw->opwy=opwy;
-	}
+      if (lives_widget_is_visible(mainw->play_window)) {
+        // store old postion of window
+        lives_window_get_position(LIVES_WINDOW(mainw->play_window),&opwx,&opwy);
+        if (opwx*opwy) {
+          mainw->opwx=opwx;
+          mainw->opwy=opwy;
+        }
       }
 
       if (pmonitor==0) {
-	if (mainw->vpp!=NULL&&mainw->vpp->fwidth>0) {
-	  lives_window_move (LIVES_WINDOW (mainw->play_window), (mainw->scr_width-mainw->vpp->fwidth)/2,
-			   (mainw->scr_height-mainw->vpp->fheight)/2);
-	}
-	else lives_window_move (LIVES_WINDOW (mainw->play_window), 0, 0);
-      }
-      else {
-	lives_window_set_screen(LIVES_WINDOW(mainw->play_window),mainw->mgeom[pmonitor-1].screen);
-	if (mainw->vpp!=NULL&&mainw->vpp->fwidth>0) {
-	  lives_window_move (LIVES_WINDOW (mainw->play_window), mainw->mgeom[pmonitor-1].x+
-			   (mainw->mgeom[pmonitor-1].width-mainw->vpp->fwidth)/2,
-			   mainw->mgeom[pmonitor-1].y+(mainw->mgeom[pmonitor-1].height-mainw->vpp->fheight)/2);
-	}
-	else lives_window_move(LIVES_WINDOW(mainw->play_window),mainw->mgeom[pmonitor-1].x,mainw->mgeom[pmonitor-1].y);
+        if (mainw->vpp!=NULL&&mainw->vpp->fwidth>0) {
+          lives_window_move(LIVES_WINDOW(mainw->play_window), (mainw->scr_width-mainw->vpp->fwidth)/2,
+                            (mainw->scr_height-mainw->vpp->fheight)/2);
+        } else lives_window_move(LIVES_WINDOW(mainw->play_window), 0, 0);
+      } else {
+        lives_window_set_screen(LIVES_WINDOW(mainw->play_window),mainw->mgeom[pmonitor-1].screen);
+        if (mainw->vpp!=NULL&&mainw->vpp->fwidth>0) {
+          lives_window_move(LIVES_WINDOW(mainw->play_window), mainw->mgeom[pmonitor-1].x+
+                            (mainw->mgeom[pmonitor-1].width-mainw->vpp->fwidth)/2,
+                            mainw->mgeom[pmonitor-1].y+(mainw->mgeom[pmonitor-1].height-mainw->vpp->fheight)/2);
+        } else lives_window_move(LIVES_WINDOW(mainw->play_window),mainw->mgeom[pmonitor-1].x,mainw->mgeom[pmonitor-1].y);
       }
-      
+
       // leave this alone * !
       if (!(mainw->vpp!=NULL&&!(mainw->vpp->capabilities&VPP_LOCAL_DISPLAY))) {
-	lives_window_fullscreen(LIVES_WINDOW(mainw->play_window));
-	lives_window_resize (LIVES_WINDOW (mainw->play_window), mainw->pwidth, mainw->pheight);
-	lives_widget_queue_resize (mainw->play_window);
+        lives_window_fullscreen(LIVES_WINDOW(mainw->play_window));
+        lives_window_resize(LIVES_WINDOW(mainw->play_window), mainw->pwidth, mainw->pheight);
+        lives_widget_queue_resize(mainw->play_window);
       }
 
       // 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)) {
-	boolean fixed_size=FALSE;
+        boolean fixed_size=FALSE;
 
-	mainw->ptr_x=mainw->ptr_y=-1;
-	if (pmonitor==0) {
-	  // fullscreen playback on all screens (of first display)
-	  // get mouse position to warp it back after playback ends
-	  // in future we will handle multiple displays, so we will get the mouse device for the first screen of that display
-	  LiVESXDevice *device=mainw->mgeom[0].mouse_device;
+        mainw->ptr_x=mainw->ptr_y=-1;
+        if (pmonitor==0) {
+          // fullscreen playback on all screens (of first display)
+          // get mouse position to warp it back after playback ends
+          // in future we will handle multiple displays, so we will get the mouse device for the first screen of that display
+          LiVESXDevice *device=mainw->mgeom[0].mouse_device;
 #if GTK_CHECK_VERSION(3,0,0)
-	  if (device!=NULL) {
+          if (device!=NULL) {
 #endif
-	    LiVESXScreen *screen;
-	    LiVESXDisplay *display=mainw->mgeom[0].disp;
-	    lives_display_get_pointer(device,display,&screen,&mainw->ptr_x,&mainw->ptr_y,NULL);
+            LiVESXScreen *screen;
+            LiVESXDisplay *display=mainw->mgeom[0].disp;
+            lives_display_get_pointer(device,display,&screen,&mainw->ptr_x,&mainw->ptr_y,NULL);
 #if GTK_CHECK_VERSION(3,0,0)
-	  }
+          }
 #endif
-	}
-	if (mainw->vpp->fheight>-1&&mainw->vpp->fwidth>-1) {	  
-	  // fixed o/p size for stream
-	  if (!(mainw->vpp->fwidth*mainw->vpp->fheight)) {
-	    if (mainw->current_file>-1) {
-	      mainw->vpp->fwidth=cfile->hsize;
-	      mainw->vpp->fheight=cfile->vsize;
-	    }
-	    else mainw->vpp->fwidth=mainw->vpp->fheight=-1;
-	  }
-	  mainw->pwidth=mainw->vpp->fwidth;
-	  mainw->pheight=mainw->vpp->fheight;
-	  fixed_size=TRUE;
-
-	  // * leave this alone !
-	  lives_window_unfullscreen(LIVES_WINDOW(mainw->play_window));
-
-	  if (!(mainw->vpp->capabilities&VPP_LOCAL_DISPLAY)) 
-	    lives_window_set_title (LIVES_WINDOW (mainw->play_window),_("LiVES: - Streaming"));
-
-	  lives_window_resize (LIVES_WINDOW (mainw->play_window), mainw->pwidth, mainw->pheight);
-	  lives_widget_queue_resize (mainw->play_window);
-	}
-
-	if (pmonitor!=0) {
-	  fullscreen=FALSE;
-	  if (mainw->play_window!=NULL) {
-	    xwinid=lives_widget_get_xwinid(mainw->play_window,"Unsupported display type for playback plugin");
-	    if (xwinid==-1) return;
-	  }
-	}
-	if (mainw->ext_playback) {
-	  mainw->ext_keyboard=FALSE;
+        }
+        if (mainw->vpp->fheight>-1&&mainw->vpp->fwidth>-1) {
+          // fixed o/p size for stream
+          if (!(mainw->vpp->fwidth*mainw->vpp->fheight)) {
+            if (mainw->current_file>-1) {
+              mainw->vpp->fwidth=cfile->hsize;
+              mainw->vpp->fheight=cfile->vsize;
+            } else mainw->vpp->fwidth=mainw->vpp->fheight=-1;
+          }
+          mainw->pwidth=mainw->vpp->fwidth;
+          mainw->pheight=mainw->vpp->fheight;
+          fixed_size=TRUE;
+
+          // * leave this alone !
+          lives_window_unfullscreen(LIVES_WINDOW(mainw->play_window));
+
+          if (!(mainw->vpp->capabilities&VPP_LOCAL_DISPLAY))
+            lives_window_set_title(LIVES_WINDOW(mainw->play_window),_("LiVES: - Streaming"));
+
+          lives_window_resize(LIVES_WINDOW(mainw->play_window), mainw->pwidth, mainw->pheight);
+          lives_widget_queue_resize(mainw->play_window);
+        }
+
+        if (pmonitor!=0) {
+          fullscreen=FALSE;
+          if (mainw->play_window!=NULL) {
+            xwinid=lives_widget_get_xwinid(mainw->play_window,"Unsupported display type for playback plugin");
+            if (xwinid==-1) return;
+          }
+        }
+        if (mainw->ext_playback) {
+          mainw->ext_keyboard=FALSE;
 #ifdef RT_AUDIO
-	  stop_audio_stream();
+          stop_audio_stream();
 #endif
-	  if (mainw->vpp->exit_screen!=NULL) {
-	    (*mainw->vpp->exit_screen)(mainw->ptr_x,mainw->ptr_y);
-	  }
-	  if (mainw->vpp->capabilities&VPP_LOCAL_DISPLAY&&pmonitor==0) 
-	    lives_window_set_keep_below(LIVES_WINDOW(mainw->play_window),FALSE);
-	}
+          if (mainw->vpp->exit_screen!=NULL) {
+            (*mainw->vpp->exit_screen)(mainw->ptr_x,mainw->ptr_y);
+          }
+          if (mainw->vpp->capabilities&VPP_LOCAL_DISPLAY&&pmonitor==0)
+            lives_window_set_keep_below(LIVES_WINDOW(mainw->play_window),FALSE);
+        }
 
 #ifdef RT_AUDIO
-	if (mainw->vpp->audio_codec!=AUDIO_CODEC_NONE&&prefs->stream_audio_out) {
-	  start_audio_stream();
-	}
-	else {
-	  clear_audio_stream();
-	}
-#endif
-
-	if (mainw->vpp->capabilities&VPP_LOCAL_DISPLAY&&pmonitor==0) 
-	  lives_window_set_keep_below(LIVES_WINDOW(mainw->play_window),TRUE);
-
-	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;
-	  // the play window is still visible (in case it was 'always on top')
-	  // start key polling from ext plugin
-	  if (mainw->vpp->capabilities&VPP_LOCAL_DISPLAY&&pmonitor==0) {
-	    mainw->ext_keyboard=TRUE;
-	    return;
-	  }
-	}
+        if (mainw->vpp->audio_codec!=AUDIO_CODEC_NONE&&prefs->stream_audio_out) {
+          start_audio_stream();
+        } else {
+          clear_audio_stream();
+        }
+#endif
+
+        if (mainw->vpp->capabilities&VPP_LOCAL_DISPLAY&&pmonitor==0)
+          lives_window_set_keep_below(LIVES_WINDOW(mainw->play_window),TRUE);
+
+        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;
+          // the play window is still visible (in case it was 'always on top')
+          // start key polling from ext plugin
+          if (mainw->vpp->capabilities&VPP_LOCAL_DISPLAY&&pmonitor==0) {
+            mainw->ext_keyboard=TRUE;
+            return;
+          }
+        }
       }
 
 #define TEST_CE_THUMBS 0
       if (TEST_CE_THUMBS||(prefs->show_gui&&prefs->ce_thumb_mode&&prefs->play_monitor!=prefs->gui_monitor&&
-			   prefs->play_monitor!=0&&
-			   capable->nmonitors>1&&mainw->multitrack==NULL)) {
-	start_ce_thumb_mode();
+                           prefs->play_monitor!=0&&
+                           capable->nmonitors>1&&mainw->multitrack==NULL)) {
+        start_ce_thumb_mode();
       }
-    }
-    else {
+    } else {
 
       if (mainw->ce_thumbs) {
-	end_ce_thumb_mode();
+        end_ce_thumb_mode();
       }
 
-    point1:
+point1:
       if (mainw->playing_file==0) {
-	mainw->pheight=clipboard->vsize;
-	mainw->pwidth=clipboard->hsize;
+        mainw->pheight=clipboard->vsize;
+        mainw->pwidth=clipboard->hsize;
+
+        size_ok=FALSE;
 
-	size_ok=FALSE;
-	
-	do {
-	  if (pmonitor==0) {
-	    if (mainw->pwidth>mainw->scr_width-SCR_WIDTH_SAFETY||
-		mainw->pheight>mainw->scr_height-SCR_HEIGHT_SAFETY) { 
-	      mainw->pheight=(mainw->pheight>>2)<<1;
-	      mainw->pwidth=(mainw->pwidth>>2)<<1;
-	    }
-	    else size_ok=TRUE;
-	  }
-	  else {
-	    if (mainw->pwidth>mainw->mgeom[pmonitor-1].width-SCR_WIDTH_SAFETY||
-		mainw->pheight>mainw->mgeom[pmonitor-1].height-SCR_HEIGHT_SAFETY) {
-	      mainw->pheight=(mainw->pheight>>2)<<1;
-	      mainw->pwidth=(mainw->pwidth>>2)<<1;
-	    }
-	    else size_ok=TRUE;
-	  }
-	} while (!size_ok);
+        do {
+          if (pmonitor==0) {
+            if (mainw->pwidth>mainw->scr_width-SCR_WIDTH_SAFETY||
+                mainw->pheight>mainw->scr_height-SCR_HEIGHT_SAFETY) {
+              mainw->pheight=(mainw->pheight>>2)<<1;
+              mainw->pwidth=(mainw->pwidth>>2)<<1;
+            } else size_ok=TRUE;
+          } else {
+            if (mainw->pwidth>mainw->mgeom[pmonitor-1].width-SCR_WIDTH_SAFETY||
+                mainw->pheight>mainw->mgeom[pmonitor-1].height-SCR_HEIGHT_SAFETY) {
+              mainw->pheight=(mainw->pheight>>2)<<1;
+              mainw->pwidth=(mainw->pwidth>>2)<<1;
+            } else size_ok=TRUE;
+          }
+        } while (!size_ok);
       }
-      if (pmonitor==0) lives_window_move (LIVES_WINDOW (mainw->play_window), (mainw->scr_width-mainw->pwidth)/2, 
-					(mainw->scr_height-mainw->pheight)/2);
+      if (pmonitor==0) lives_window_move(LIVES_WINDOW(mainw->play_window), (mainw->scr_width-mainw->pwidth)/2,
+                                           (mainw->scr_height-mainw->pheight)/2);
       else {
-	int xcen=mainw->mgeom[pmonitor-1].x+(mainw->mgeom[pmonitor-1].width-mainw->pwidth)/2;
-	int ycen=mainw->mgeom[pmonitor-1].y+(mainw->mgeom[pmonitor-1].height-mainw->pheight)/2;
-	lives_window_set_screen(LIVES_WINDOW(mainw->play_window),mainw->mgeom[pmonitor-1].screen);
-	lives_window_move (LIVES_WINDOW (mainw->play_window), xcen, ycen);
+        int xcen=mainw->mgeom[pmonitor-1].x+(mainw->mgeom[pmonitor-1].width-mainw->pwidth)/2;
+        int ycen=mainw->mgeom[pmonitor-1].y+(mainw->mgeom[pmonitor-1].height-mainw->pheight)/2;
+        lives_window_set_screen(LIVES_WINDOW(mainw->play_window),mainw->mgeom[pmonitor-1].screen);
+        lives_window_move(LIVES_WINDOW(mainw->play_window), xcen, ycen);
       }
     }
-    lives_window_present (LIVES_WINDOW (mainw->play_window));
+    lives_window_present(LIVES_WINDOW(mainw->play_window));
     lives_xwindow_raise(lives_widget_get_xwindow(mainw->play_window));
-  }
-  else {
+  } else {
     // not playing
     if (mainw->fs&&mainw->playing_file==-2&&mainw->sep_win&&prefs->sepwin_type==SEPWIN_TYPE_STICKY) {
 
       if (mainw->ce_thumbs) {
-	end_ce_thumb_mode();
+        end_ce_thumb_mode();
       }
 
       if (mainw->opwx>=0&&mainw->opwy>=0) {
-	// move window back to its old position after play
-	if (pmonitor>0) lives_window_set_screen(LIVES_WINDOW(mainw->play_window),mainw->mgeom[pmonitor-1].screen);
-	lives_window_move (LIVES_WINDOW (mainw->play_window), mainw->opwx, mainw->opwy);
+        // move window back to its old position after play
+        if (pmonitor>0) lives_window_set_screen(LIVES_WINDOW(mainw->play_window),mainw->mgeom[pmonitor-1].screen);
+        lives_window_move(LIVES_WINDOW(mainw->play_window), mainw->opwx, mainw->opwy);
+      } else {
+        if (pmonitor==0) lives_window_move(LIVES_WINDOW(mainw->play_window), (mainw->scr_width-mainw->pwidth)/2,
+                                             (mainw->scr_height-mainw->pheight-mainw->sepwin_minheight*2)/2);
+        else {
+          int xcen=mainw->mgeom[pmonitor-1].x+(mainw->mgeom[pmonitor-1].width-mainw->pwidth)/2;
+          lives_window_set_screen(LIVES_WINDOW(mainw->play_window),mainw->mgeom[pmonitor-1].screen);
+          lives_window_move(LIVES_WINDOW(mainw->play_window), xcen, (mainw->mgeom[pmonitor-1].height-mainw->pheight-mainw->sepwin_minheight*2)/2);
+        }
       }
+    } else {
+      if (gmonitor==0) lives_window_move(LIVES_WINDOW(mainw->play_window), (mainw->scr_width-mainw->pwidth)/2,
+                                           (mainw->scr_height-mainw->pheight-mainw->sepwin_minheight*2)/2);
       else {
-	if (pmonitor==0) lives_window_move (LIVES_WINDOW (mainw->play_window), (mainw->scr_width-mainw->pwidth)/2, 
-					  (mainw->scr_height-mainw->pheight-mainw->sepwin_minheight*2)/2);
-	else {
-	  int xcen=mainw->mgeom[pmonitor-1].x+(mainw->mgeom[pmonitor-1].width-mainw->pwidth)/2;
-	  lives_window_set_screen(LIVES_WINDOW(mainw->play_window),mainw->mgeom[pmonitor-1].screen);
-	  lives_window_move (LIVES_WINDOW (mainw->play_window), xcen, (mainw->mgeom[pmonitor-1].height-mainw->pheight-mainw->sepwin_minheight*2)/2);
-	}
-      }
-    }
-    else {
-      if (gmonitor==0) lives_window_move (LIVES_WINDOW (mainw->play_window), (mainw->scr_width-mainw->pwidth)/2, 
-					(mainw->scr_height-mainw->pheight-mainw->sepwin_minheight*2)/2);
-      else {
-	int xcen=mainw->mgeom[gmonitor-1].x+(mainw->mgeom[gmonitor-1].width-mainw->pwidth)/2;
-	lives_window_set_screen(LIVES_WINDOW(mainw->play_window),mainw->mgeom[gmonitor-1].screen);
-	lives_window_move (LIVES_WINDOW (mainw->play_window), xcen, (mainw->mgeom[gmonitor-1].height-mainw->pheight-mainw->sepwin_minheight*2)/2);
+        int xcen=mainw->mgeom[gmonitor-1].x+(mainw->mgeom[gmonitor-1].width-mainw->pwidth)/2;
+        lives_window_set_screen(LIVES_WINDOW(mainw->play_window),mainw->mgeom[gmonitor-1].screen);
+        lives_window_move(LIVES_WINDOW(mainw->play_window), xcen, (mainw->mgeom[gmonitor-1].height-mainw->pheight-mainw->sepwin_minheight*2)/2);
       }
     }
     mainw->opwx=mainw->opwy=-1;
@@ -4199,12 +4300,12 @@
   nheight+=mainw->pheight;
 
   if (mainw->playing_file==-1&&mainw->current_file>-1&&cfile->frames>0&&
-      (cfile->clip_type==CLIP_TYPE_DISK||cfile->clip_type==CLIP_TYPE_FILE)) 
+      (cfile->clip_type==CLIP_TYPE_DISK||cfile->clip_type==CLIP_TYPE_FILE))
     nwidth=MAX(mainw->pwidth,mainw->sepwin_minwidth);
   else nwidth=mainw->pwidth;
 
-  lives_window_resize (LIVES_WINDOW (mainw->play_window), nwidth, nheight);
-  lives_widget_set_size_request (mainw->play_window, nwidth, nheight);
+  lives_window_resize(LIVES_WINDOW(mainw->play_window), nwidth, nheight);
+  lives_widget_set_size_request(mainw->play_window, nwidth, nheight);
 
   if (width!=-1&&(width!=nwidth||height!=nheight)&&mainw->preview_spinbutton!=NULL)
     if (mainw->playing_file==-1) {
@@ -4214,7 +4315,7 @@
 
 
 
-void kill_play_window (void) {
+void kill_play_window(void) {
   // plug our player back into internal window
 
   if (mainw->ce_thumbs) {
@@ -4224,17 +4325,17 @@
   if (mainw->play_window!=NULL) {
     if (mainw->preview_box!=NULL&&lives_widget_get_parent(mainw->preview_box)!=NULL) {
       // preview_box is refed, so it will survive
-      lives_container_remove (LIVES_CONTAINER (mainw->play_window), mainw->preview_box);
+      lives_container_remove(LIVES_CONTAINER(mainw->play_window), mainw->preview_box);
     }
-    if (LIVES_IS_WINDOW (mainw->play_window )) lives_widget_destroy(mainw->play_window);
+    if (LIVES_IS_WINDOW(mainw->play_window)) lives_widget_destroy(mainw->play_window);
     mainw->play_window=NULL;
   }
-  lives_widget_set_tooltip_text( mainw->m_sepwinbutton,_("Show Play Window"));
+  lives_widget_set_tooltip_text(mainw->m_sepwinbutton,_("Show Play Window"));
 }
 
 
 
-void add_to_playframe (void) {
+void add_to_playframe(void) {
   // plug the playback image into its frame in the main window
 
   lives_widget_show(mainw->playarea);
@@ -4242,11 +4343,11 @@
   ///////////////////////////////////////////////////
   if (mainw->plug==NULL) {
     if (!mainw->foreign&&(!mainw->sep_win||prefs->sepwin_type==SEPWIN_TYPE_NON_STICKY)) {
-      mainw->plug = lives_hbox_new (FALSE,0);
+      mainw->plug = lives_hbox_new(FALSE,0);
       lives_container_add(LIVES_CONTAINER(mainw->playarea),mainw->plug);
-      lives_widget_set_bg_color (mainw->plug, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
-      lives_widget_show (mainw->plug);
-      lives_container_add (LIVES_CONTAINER (mainw->plug), mainw->play_image);
+      lives_widget_set_bg_color(mainw->plug, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+      lives_widget_show(mainw->plug);
+      lives_container_add(LIVES_CONTAINER(mainw->plug), mainw->play_image);
     }
   }
 }
@@ -4254,32 +4355,37 @@
 
 LIVES_INLINE void frame_size_update(void) {
   // update widgets when the frame size changes
-  on_double_size_activate(NULL,GINT_TO_POINTER(1));
+  on_double_size_activate(NULL,LIVES_INT_TO_POINTER(1));
 }
 
 
+char *get_menu_name(lives_clip_t *sfile) {
+  if (sfile==NULL) return NULL;
+  return sfile->clip_type!=CLIP_TYPE_VIDEODEV?lives_path_get_basename(sfile->name):lives_strdup(sfile->name);
+}
+
 
 void add_to_clipmenu(void) {
   // TODO - indicate "opening"
-  gchar *tmp;
+  char *tmp;
 
-  cfile->menuentry = lives_radio_menu_item_new_with_label(mainw->clips_group, cfile->clip_type!=CLIP_TYPE_VIDEODEV?
-							  (tmp=g_path_get_basename(cfile->name)):
-							  (tmp=g_strdup(cfile->name)));
-  g_free(tmp);
+  cfile->menuentry = lives_radio_menu_item_new_with_label(mainw->clips_group, tmp=get_menu_name(cfile));
+  lives_free(tmp);
 
   mainw->clips_group=lives_radio_menu_item_get_group(LIVES_RADIO_MENU_ITEM(cfile->menuentry));
 
-  lives_widget_show (cfile->menuentry);
-  lives_container_add (LIVES_CONTAINER (mainw->clipsmenu), cfile->menuentry);
+  lives_widget_show(cfile->menuentry);
+  lives_container_add(LIVES_CONTAINER(mainw->clipsmenu), cfile->menuentry);
 
-  lives_widget_set_sensitive (cfile->menuentry, TRUE);
-  cfile->menuentry_func=lives_signal_connect (LIVES_GUI_OBJECT (cfile->menuentry), LIVES_WIDGET_TOGGLED_EVENT,
-					  LIVES_GUI_CALLBACK (switch_clip_activate),
-					  NULL);
+  lives_widget_set_sensitive(cfile->menuentry, TRUE);
+  cfile->menuentry_func=lives_signal_connect(LIVES_GUI_OBJECT(cfile->menuentry), LIVES_WIDGET_TOGGLED_SIGNAL,
+                        LIVES_GUI_CALLBACK(switch_clip_activate),
+                        NULL);
 
   if (cfile->clip_type==CLIP_TYPE_DISK||cfile->clip_type==CLIP_TYPE_FILE) mainw->clips_available++;
-  mainw->cliplist = g_list_append (mainw->cliplist, GINT_TO_POINTER (mainw->current_file));
+  pthread_mutex_lock(&mainw->clip_list_mutex);
+  mainw->cliplist = lives_list_append(mainw->cliplist, LIVES_INT_TO_POINTER(mainw->current_file));
+  pthread_mutex_unlock(&mainw->clip_list_mutex);
   cfile->old_frames=cfile->frames;
   cfile->ratio_fps=check_for_ratio_fps(cfile->fps);
 }
@@ -4288,13 +4394,15 @@
 
 
 void remove_from_clipmenu(void) {
-  GList *list;
+  LiVESList *list;
   int fileno;
 
   lives_container_remove(LIVES_CONTAINER(mainw->clipsmenu), cfile->menuentry);
   if (LIVES_IS_WIDGET(cfile->menuentry))
     lives_widget_destroy(cfile->menuentry);
-  mainw->cliplist=g_list_remove (mainw->cliplist, GINT_TO_POINTER (mainw->current_file));
+  pthread_mutex_lock(&mainw->clip_list_mutex);
+  mainw->cliplist=lives_list_remove(mainw->cliplist, LIVES_INT_TO_POINTER(mainw->current_file));
+  pthread_mutex_unlock(&mainw->clip_list_mutex);
   if (cfile->clip_type==CLIP_TYPE_DISK||cfile->clip_type==CLIP_TYPE_FILE) {
     mainw->clips_available--;
     if (prefs->crash_recovery) rewrite_recovery_file();
@@ -4303,7 +4411,7 @@
   list=mainw->cliplist;
   mainw->clips_group=NULL;
   while (list!=NULL) {
-    fileno=GPOINTER_TO_INT(list->data);
+    fileno=LIVES_POINTER_TO_INT(list->data);
     if (mainw->files[fileno]!=NULL&&mainw->files[fileno]->menuentry!=NULL) {
       mainw->clips_group=lives_radio_menu_item_get_group(LIVES_RADIO_MENU_ITEM(mainw->files[fileno]->menuentry));
       break;
@@ -4327,17 +4435,17 @@
   LiVESWidget *splash_img;
   LiVESPixbuf *splash_pix;
 
-  GError *error=NULL;
-  gchar *tmp=g_strdup_printf("%s/%s/lives-splash.png",prefs->prefix_dir,THEME_DIR);
+  LiVESError *error=NULL;
+  char *tmp=lives_strdup_printf("%s/%s/lives-splash.png",prefs->prefix_dir,THEME_DIR);
 
   lives_window_set_auto_startup_notification(FALSE);
 
-  mainw->splash_window = lives_window_new (LIVES_WINDOW_TOPLEVEL);
+  mainw->splash_window = lives_window_new(LIVES_WINDOW_TOPLEVEL);
 
   widget_opts.default_justify=LIVES_JUSTIFY_LEFT;
 
 #ifdef GUI_GTK
-  if (gtk_widget_get_direction(GTK_WIDGET(mainw->splash_window))==GTK_TEXT_DIR_RTL) 
+  if (gtk_widget_get_direction(GTK_WIDGET(mainw->splash_window))==GTK_TEXT_DIR_RTL)
     widget_opts.default_justify=LIVES_JUSTIFY_RIGHT;
 #endif
 
@@ -4351,37 +4459,37 @@
       lives_widget_set_bg_color(mainw->splash_window, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
     }
 
-  
-    vbox = lives_vbox_new (FALSE, widget_opts.packing_height);
-    lives_container_add (LIVES_CONTAINER (mainw->splash_window), vbox);
+
+    vbox = lives_vbox_new(FALSE, widget_opts.packing_height);
+    lives_container_add(LIVES_CONTAINER(mainw->splash_window), vbox);
 
     splash_pix=lives_pixbuf_new_from_file(tmp,&error);
-    g_free(tmp);
+    lives_free(tmp);
 
-    splash_img = lives_image_new_from_pixbuf (splash_pix);
+    splash_img = lives_image_new_from_pixbuf(splash_pix);
 
-    lives_box_pack_start (LIVES_BOX (vbox), splash_img, TRUE, TRUE, 0);
+    lives_box_pack_start(LIVES_BOX(vbox), splash_img, TRUE, TRUE, 0);
 
     if (splash_pix!=NULL) lives_object_unref(splash_pix);
 
 
     mainw->splash_label=lives_standard_label_new("");
 
-    lives_box_pack_start (LIVES_BOX (vbox), mainw->splash_label, TRUE, TRUE, 0);
+    lives_box_pack_start(LIVES_BOX(vbox), mainw->splash_label, TRUE, TRUE, 0);
 
-    mainw->splash_progress = lives_progress_bar_new ();
+    mainw->splash_progress = lives_progress_bar_new();
     lives_progress_bar_set_pulse_step(LIVES_PROGRESS_BAR(mainw->splash_progress),.01);
-    
+
     if (palette->style&STYLE_1) {
       lives_widget_set_fg_color(mainw->splash_label, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
       lives_widget_set_fg_color(mainw->splash_progress, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
     }
 
-    hbox = lives_hbox_new (FALSE, widget_opts.packing_width);
+    hbox = lives_hbox_new(FALSE, widget_opts.packing_width);
 
-    lives_box_pack_start (LIVES_BOX (hbox), mainw->splash_progress, TRUE, TRUE, widget_opts.packing_width*2);
+    lives_box_pack_start(LIVES_BOX(hbox), mainw->splash_progress, TRUE, TRUE, widget_opts.packing_width*2);
 
-    lives_box_pack_start (LIVES_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height*2);
+    lives_box_pack_start(LIVES_BOX(vbox), hbox, FALSE, FALSE, widget_opts.packing_height*2);
 
     lives_widget_show_all(mainw->splash_window);
 
@@ -4396,8 +4504,7 @@
 
     lives_widget_context_update();
     lives_set_cursor_style(LIVES_CURSOR_BUSY,mainw->splash_window);
-  }
-  else {
+  } else {
     lives_widget_destroy(mainw->splash_window);
     mainw->splash_window=NULL;
   }
@@ -4409,7 +4516,7 @@
 
 
 
-void splash_msg(const gchar *msg, double pct) {
+void splash_msg(const char *msg, double pct) {
 
   if (mainw->foreign||mainw->splash_window==NULL) return;
 
@@ -4428,19 +4535,19 @@
 
 
 void splash_end(void) {
-  
+
   if (mainw->foreign) return;
-    
+
   if (mainw->splash_window!=NULL) {
+    LiVESWidget *splash_window=mainw->splash_window; // end_threaded_dialog() will set mainw->splash_window to NULL
 
     end_threaded_dialog();
-    
-    lives_widget_destroy(mainw->splash_window);
-    
-    mainw->splash_window=NULL;
+
+    lives_widget_destroy(splash_window);
+
   }
 
-  if (prefs->startup_interface==STARTUP_MT&&prefs->startup_phase==0&&mainw->multitrack==NULL) 
+  if (prefs->startup_interface==STARTUP_MT&&prefs->startup_phase==0&&mainw->multitrack==NULL)
     on_multitrack_activate(NULL,NULL);
 
 }

LiVES-2.2.8.tar.bz2/src/htmsocket.c -> LiVES-2.4.1.tar.bz2/src/htmsocket.c Changed

@@ -1,6 +1,6 @@
 // htmsocket.c
 // LiVES
-// (c) G. Finch 2008 - 2012  <salsaman@gmail.com>
+// (c) G. Finch 2008 - 2015  <salsaman@gmail.com>
 // released under the GNU GPL 3 or later
 // see file ../COPYING for licensing details
 
@@ -23,9 +23,7 @@
 #endif
 
 #include "main.h"
-#include "support.h"
-
-#include "htmsocket.h"                          
+#include "htmsocket.h"
 
 typedef struct {
   struct sockaddr_in serv_addr;
@@ -39,7 +37,7 @@
 } desc;
 
 
-void *OpenHTMSocket(const char *host, int portnumber, gboolean sender) {
+void *OpenHTMSocket(const char *host, int portnumber, boolean sender) {
   int sockfd;
   struct sockaddr_in cl_addr;
   desc *o;
@@ -52,14 +50,14 @@
   o->len = sizeof(cl_addr);
   memset((char *)&o->serv_addr, 0, sizeof(o->serv_addr));
   o->serv_addr.sin_family = AF_INET;
-  
+
   if (strcmp(host,"INADDR_ANY")) {
     hostsEntry = gethostbyname(host);
-    
+
     if (hostsEntry == NULL) {
       return NULL;
     }
-    
+
     address = *((uint64_t *) hostsEntry->h_addr_list[0]);
   }
 
@@ -67,8 +65,7 @@
     // open sender socket
     o->serv_addr.sin_addr.s_addr = address;
     o->serv_addr.sin_port = htons(portnumber);
-  }
-  else {
+  } else {
     // open receiver socket
     if (!strcmp(host,"INADDR_ANY")) o->serv_addr.sin_addr.s_addr = INADDR_ANY;
     else o->serv_addr.sin_addr.s_addr = address;
@@ -88,25 +85,22 @@
       // bind on all interfaces, any port
       cl_addr.sin_addr.s_addr = INADDR_ANY;
       cl_addr.sin_port = htons(0);
-    }
-    else {
+    } else {
       // bind on all interfaces, specified port
       cl_addr.sin_addr.s_addr = INADDR_ANY;
       cl_addr.sin_port = htons(portnumber);
     }
     if (bind(sockfd, (struct sockaddr *) &cl_addr, sizeof(cl_addr)) < 0) {
-      g_printerr("could not bind\n");
+      lives_printerr("could not bind\n");
       close(sockfd);
       sockfd = -1;
     }
-  }
-  else g_printerr("unable to make socket\n");
+  } else lives_printerr("unable to make socket\n");
 
-  if(sockfd<0) {
-    g_free(o);
+  if (sockfd<0) {
+    lives_free(o);
     o = NULL;
-  }
-  else {
+  } else {
     int mxsize=1024*1024;
     o->sockfd = sockfd;
     if (!sender) setsockopt(sockfd, SOL_SOCKET, SO_RCVBUF, (void *) &mxsize, sizeof(mxsize));
@@ -148,7 +142,7 @@
   return res;
 }
 
-static gboolean sendudp(const struct sockaddr *sp, int sockfd, int length, size_t count, void  *b) {
+static boolean sendudp(const struct sockaddr *sp, int sockfd, int length, size_t count, void  *b) {
   size_t rcount;
   if ((rcount=sendto(sockfd, b, count, 0, sp, length)) != count) {
     //printf("sockfd %d count %d rcount %dlength %d errno %d\n", sockfd,count,rcount,length,errno);
@@ -157,7 +151,7 @@
   return TRUE;
 }
 
-gboolean lives_stream_out(void *htmsendhandle, size_t length, void *buffer) {
+boolean lives_stream_out(void *htmsendhandle, size_t length, void *buffer) {
   desc *o = (desc *)(htmsendhandle);
   return sendudp(o->addr, o->sockfd, o->len, length, buffer);
 }
@@ -174,5 +168,5 @@
 void CloseHTMSocket(void *htmsendhandle) {
   desc *o = (desc *)htmsendhandle;
   close(o->sockfd);
-  g_free(o);
+  lives_free(o);
 }

LiVES-2.2.8.tar.bz2/src/htmsocket.h -> LiVES-2.4.1.tar.bz2/src/htmsocket.h Changed

LiVES-2.2.8.tar.bz2/src/interface.c -> LiVES-2.4.1.tar.bz2/src/interface.c Changed

@@ -23,47 +23,46 @@
 #include "support.h"
 
 // functions called in multitrack.c
-extern void multitrack_preview_clicked  (LiVESButton *, gpointer user_data);
-extern void mt_change_disp_tracks_ok (LiVESButton *, gpointer user_data);
+extern void multitrack_preview_clicked(LiVESButton *, livespointer user_data);
+extern void mt_change_disp_tracks_ok(LiVESButton *, livespointer user_data);
 
 
-void add_suffix_check(LiVESBox *box, const gchar *ext) {
-  gchar *ltext;
+void add_suffix_check(LiVESBox *box, const char *ext) {
+  char *ltext;
 
   LiVESWidget *checkbutton;
 
-  if (ext==NULL) ltext=g_strdup (_ ("Let LiVES set the _file extension"));
-  else ltext=g_strdup_printf(_ ("Let LiVES set the _file extension (.%s)"),ext);
+  if (ext==NULL) ltext=lives_strdup(_("Let LiVES set the _file extension"));
+  else ltext=lives_strdup_printf(_("Let LiVES set the _file extension (.%s)"),ext);
   checkbutton=lives_standard_check_button_new(ltext,TRUE,box,NULL);
-  g_free(ltext);
-  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (checkbutton), mainw->fx1_bool);
-  lives_signal_connect_after (LIVES_GUI_OBJECT (checkbutton), LIVES_WIDGET_TOGGLED_EVENT,
-			  LIVES_GUI_CALLBACK (on_boolean_toggled),
-			  &mainw->fx1_bool);
-  
+  lives_free(ltext);
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(checkbutton), mainw->fx1_bool);
+  lives_signal_connect_after(LIVES_GUI_OBJECT(checkbutton), LIVES_WIDGET_TOGGLED_SIGNAL,
+                             LIVES_GUI_CALLBACK(on_boolean_toggled),
+                             &mainw->fx1_bool);
+
 }
 
 
 
 static LiVESWidget *add_deinterlace_checkbox(LiVESBox *for_deint) {
-  LiVESWidget *hbox=lives_hbox_new (FALSE, 0);
-  LiVESWidget *checkbutton = lives_standard_check_button_new (_ ("Apply _Deinterlace"),TRUE,LIVES_BOX(hbox),NULL);
+  LiVESWidget *hbox=lives_hbox_new(FALSE, 0);
+  LiVESWidget *checkbutton = lives_standard_check_button_new(_("Apply _Deinterlace"),TRUE,LIVES_BOX(hbox),NULL);
 
   if (LIVES_IS_HBOX(for_deint)) {
     LiVESWidget *filler;
-    lives_box_pack_start (for_deint, hbox, FALSE, FALSE, widget_opts.packing_width);
+    lives_box_pack_start(for_deint, hbox, FALSE, FALSE, widget_opts.packing_width);
     lives_box_reorder_child(for_deint, hbox, 0);
     filler=add_fill_to_box(LIVES_BOX(for_deint));
     if (filler!=NULL) lives_box_reorder_child(for_deint, filler, 1);
-  }
-  else lives_box_pack_start (for_deint, hbox, FALSE, FALSE, widget_opts.packing_height);
+  } else lives_box_pack_start(for_deint, hbox, FALSE, FALSE, widget_opts.packing_height);
 
-  lives_widget_set_can_focus_and_default (checkbutton);
-  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (checkbutton), mainw->open_deint);
-  lives_signal_connect_after (LIVES_GUI_OBJECT (checkbutton), LIVES_WIDGET_TOGGLED_EVENT,
-			  LIVES_GUI_CALLBACK (on_boolean_toggled),
-			  &mainw->open_deint);
-  lives_widget_set_tooltip_text( checkbutton,_("If this is set, frames will be deinterlaced as they are imported."));
+  lives_widget_set_can_focus_and_default(checkbutton);
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(checkbutton), mainw->open_deint);
+  lives_signal_connect_after(LIVES_GUI_OBJECT(checkbutton), LIVES_WIDGET_TOGGLED_SIGNAL,
+                             LIVES_GUI_CALLBACK(on_boolean_toggled),
+                             &mainw->open_deint);
+  lives_widget_set_tooltip_text(checkbutton,_("If this is set, frames will be deinterlaced as they are imported."));
 
   lives_widget_show_all(LIVES_WIDGET(for_deint));
 
@@ -71,18 +70,18 @@
 }
 
 
-static void pv_sel_changed(LiVESFileChooser *chooser, gpointer user_data) {
-  GSList *slist=lives_file_chooser_get_filenames (chooser);
+static void pv_sel_changed(LiVESFileChooser *chooser, livespointer user_data) {
+  LiVESSList *slist=lives_file_chooser_get_filenames(chooser);
   LiVESWidget *pbutton=(LiVESWidget *)user_data;
 
-  if (slist==NULL||slist->data==NULL||g_slist_length(slist)>1||!(g_file_test((gchar *)slist->data,G_FILE_TEST_IS_REGULAR))) {
+  if (slist==NULL||lives_slist_nth_data(slist,0)==NULL||lives_slist_length(slist)>1||
+      !(lives_file_test((char *)lives_slist_nth_data(slist,0),LIVES_FILE_TEST_IS_REGULAR))) {
     lives_widget_set_sensitive(pbutton,FALSE);
-  }
-  else lives_widget_set_sensitive(pbutton,TRUE);
-  
+  } else lives_widget_set_sensitive(pbutton,TRUE);
+
   if (slist!=NULL) {
-    g_list_free_strings((GList *)slist);
-    g_slist_free(slist);
+    lives_list_free_strings((LiVESList *)slist);
+    lives_slist_free(slist);
   }
 }
 
@@ -91,79 +90,68 @@
 
 
 void widget_add_preview(LiVESWidget *widget, LiVESBox *for_preview, LiVESBox *for_button, LiVESBox *for_deint, int preview_type) {
-  // preview type 1 - video and audio, fileselector
-  // preview type 2 - audio only, fileselector
-  // preview type 3 - range preview
-
   LiVESWidget *preview_button=NULL;
   LiVESWidget *fs_label;
 
-  mainw->fs_playframe = lives_frame_new (NULL);
-  mainw->fs_playalign = gtk_alignment_new (0.,0.,1.,1.);
-  mainw->fs_playarea = lives_event_box_new ();
-
-  if (preview_type==1||preview_type==3) {
+  mainw->fs_playframe = lives_frame_new(NULL);
+  mainw->fs_playalign = lives_alignment_new(0.,0.,1.,1.);
+  mainw->fs_playarea = lives_event_box_new();
 
-    lives_widget_show (mainw->fs_playframe);
-    lives_widget_show (mainw->fs_playalign);
+  lives_widget_object_set_data(LIVES_WIDGET_OBJECT(mainw->fs_playarea),"pixbuf",NULL);
 
-    lives_container_set_border_width (LIVES_CONTAINER(mainw->fs_playframe), widget_opts.border_width);
+  if (preview_type==LIVES_PREVIEW_TYPE_VIDEO_AUDIO||preview_type==LIVES_PREVIEW_TYPE_RANGE) {
+    lives_container_set_border_width(LIVES_CONTAINER(mainw->fs_playframe), widget_opts.border_width);
 
     widget_opts.justify=LIVES_JUSTIFY_RIGHT;
-    fs_label = lives_standard_label_new (_ ("Preview"));
+    fs_label = lives_standard_label_new(_("Preview"));
     widget_opts.justify=LIVES_JUSTIFY_DEFAULT;
-    lives_widget_show (fs_label);
-    lives_frame_set_label_widget (LIVES_FRAME (mainw->fs_playframe), fs_label);
+    lives_frame_set_label_widget(LIVES_FRAME(mainw->fs_playframe), fs_label);
 
-    lives_box_pack_start (for_preview, mainw->fs_playframe, FALSE, FALSE, 0);
-    lives_widget_set_size_request (mainw->fs_playarea, DEFAULT_FRAME_HSIZE, DEFAULT_FRAME_VSIZE);
+    lives_box_pack_start(for_preview, mainw->fs_playframe, FALSE, FALSE, 0);
 
-    lives_container_add (LIVES_CONTAINER (mainw->fs_playframe), mainw->fs_playalign);
-    lives_container_add (LIVES_CONTAINER (mainw->fs_playalign), mainw->fs_playarea);
+    lives_widget_set_size_request(mainw->fs_playarea, DEFAULT_FRAME_HSIZE, DEFAULT_FRAME_VSIZE);
 
-    lives_widget_set_bg_color (mainw->fs_playarea, LIVES_WIDGET_STATE_NORMAL, &palette->black);
-    lives_widget_set_bg_color (mainw->fs_playframe, LIVES_WIDGET_STATE_NORMAL, &palette->black);
-    lives_widget_set_bg_color (mainw->fs_playalign, LIVES_WIDGET_STATE_NORMAL, &palette->black);
+    lives_container_add(LIVES_CONTAINER(mainw->fs_playframe), mainw->fs_playalign);
+    lives_container_add(LIVES_CONTAINER(mainw->fs_playalign), mainw->fs_playarea);
 
-    lives_widget_show(mainw->fs_playarea);
-   }
+    lives_widget_set_bg_color(mainw->fs_playarea, LIVES_WIDGET_STATE_NORMAL, &palette->black);
+    lives_widget_set_bg_color(mainw->fs_playframe, LIVES_WIDGET_STATE_NORMAL, &palette->black);
+    lives_widget_set_bg_color(mainw->fs_playalign, LIVES_WIDGET_STATE_NORMAL, &palette->black);
 
-  if (preview_type==1) {
-    preview_button = lives_button_new_with_mnemonic (_ ("Click here to _Preview any selected video, image or audio file"));
-  }
-  else if (preview_type==2) {
-    preview_button = lives_button_new_with_mnemonic (_ ("Click here to _Preview any selected audio file"));
-  }
-  else if (preview_type==3) {
-    preview_button = lives_button_new_with_mnemonic (_ ("Click here to _Preview the video"));
   }
 
-  lives_widget_show (preview_button);
+
+  if (preview_type==LIVES_PREVIEW_TYPE_VIDEO_AUDIO) {
+    preview_button = lives_button_new_with_mnemonic(_("Click here to _Preview any selected video, image or audio file"));
+  } else if (preview_type==LIVES_PREVIEW_TYPE_AUDIO_ONLY) {
+    preview_button = lives_button_new_with_mnemonic(_("Click here to _Preview any selected audio file"));
+  } else if (preview_type==LIVES_PREVIEW_TYPE_RANGE) {
+    preview_button = lives_button_new_with_mnemonic(_("Click here to _Preview the video"));
+  }
 
 
-  lives_box_pack_start (for_button, preview_button, FALSE, FALSE, widget_opts.packing_width);
+  lives_box_pack_start(for_button, preview_button, FALSE, FALSE, widget_opts.packing_width);
 
-  if (preview_type==1||preview_type==3) {
+  if (preview_type==LIVES_PREVIEW_TYPE_VIDEO_AUDIO||preview_type==LIVES_PREVIEW_TYPE_RANGE) {
     add_deinterlace_checkbox(for_deint);
   }
 
+  lives_signal_connect(LIVES_GUI_OBJECT(preview_button), LIVES_WIDGET_CLICKED_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_fs_preview_clicked),
+                       LIVES_INT_TO_POINTER(preview_type));
 
-  lives_signal_connect (LIVES_GUI_OBJECT (preview_button), LIVES_WIDGET_CLICKED_EVENT,
-		    LIVES_GUI_CALLBACK (on_fs_preview_clicked),
-		    GINT_TO_POINTER (preview_type));
-
-  if (GTK_IS_FILE_CHOOSER(widget)) {
+  if (LIVES_IS_FILE_CHOOSER(widget)) {
     lives_widget_set_sensitive(preview_button,FALSE);
-    
-    lives_signal_connect (LIVES_GUI_OBJECT (widget), "selection_changed",
-		      LIVES_GUI_CALLBACK (pv_sel_changed),
-		      (gpointer)preview_button);
+
+    lives_signal_connect(LIVES_GUI_OBJECT(widget), LIVES_WIDGET_SELECTION_CHANGED_SIGNAL,
+                         LIVES_GUI_CALLBACK(pv_sel_changed),
+                         (livespointer)preview_button);
   }
 
 }
 
 
-xprocess * create_processing (const gchar *text) {
+xprocess *create_processing(const char *text) {
 
   LiVESWidget *dialog_vbox;
   LiVESWidget *vbox2;
@@ -171,17 +159,17 @@
   LiVESWidget *dialog_action_area;
   LiVESWidget *details_arrow;
 
-  LiVESAccelGroup *accel_group=LIVES_ACCEL_GROUP(lives_accel_group_new ());
+  LiVESAccelGroup *accel_group=LIVES_ACCEL_GROUP(lives_accel_group_new());
 
-  xprocess *procw=(xprocess*)(g_malloc(sizeof(xprocess)));
+  xprocess *procw=(xprocess *)(lives_malloc(sizeof(xprocess)));
 
-  gchar tmp_label[256];
+  char tmp_label[256];
 
   widget_opts.non_modal=TRUE;
-  procw->processing = lives_standard_dialog_new (_("LiVES: - Processing..."),FALSE);
+  procw->processing = lives_standard_dialog_new(_("LiVES: - Processing..."),FALSE,-1,-1);
   widget_opts.non_modal=FALSE;
 
-  lives_window_add_accel_group (LIVES_WINDOW (procw->processing), accel_group);
+  lives_window_add_accel_group(LIVES_WINDOW(procw->processing), accel_group);
 
   if (prefs->show_gui) {
     if (mainw->multitrack==NULL) lives_window_set_transient_for(LIVES_WINDOW(procw->processing),LIVES_WINDOW(mainw->LiVES));
@@ -189,54 +177,54 @@
   }
 
   dialog_vbox = lives_dialog_get_content_area(LIVES_DIALOG(procw->processing));
-  lives_widget_show (dialog_vbox);
+  lives_widget_show(dialog_vbox);
 
-  vbox2 = lives_vbox_new (FALSE, 0);
-  lives_widget_show (vbox2);
-  lives_box_pack_start (LIVES_BOX (dialog_vbox), vbox2, TRUE, TRUE, 0);
+  vbox2 = lives_vbox_new(FALSE, 0);
+  lives_widget_show(vbox2);
+  lives_box_pack_start(LIVES_BOX(dialog_vbox), vbox2, TRUE, TRUE, 0);
 
-  vbox3 = lives_vbox_new (FALSE, 0);
-  lives_widget_show (vbox3);
-  lives_box_pack_start (LIVES_BOX (vbox2), vbox3, TRUE, TRUE, 0);
+  vbox3 = lives_vbox_new(FALSE, 0);
+  lives_widget_show(vbox3);
+  lives_box_pack_start(LIVES_BOX(vbox2), vbox3, TRUE, TRUE, 0);
 
-  g_snprintf(tmp_label,256,"%s...\n",text);
-  procw->label = lives_standard_label_new (tmp_label);
-  lives_widget_show (procw->label);
+  lives_snprintf(tmp_label,256,"%s...\n",text);
+  procw->label = lives_standard_label_new(tmp_label);
+  lives_widget_show(procw->label);
 
-  lives_box_pack_start (LIVES_BOX (vbox3), procw->label, TRUE, TRUE, 0);
+  lives_box_pack_start(LIVES_BOX(vbox3), procw->label, TRUE, TRUE, 0);
 
-  procw->progressbar = lives_progress_bar_new ();
-  lives_widget_show (procw->progressbar);
-  lives_box_pack_start (LIVES_BOX (vbox3), procw->progressbar, FALSE, FALSE, 0);
+  procw->progressbar = lives_progress_bar_new();
+  lives_widget_show(procw->progressbar);
+  lives_box_pack_start(LIVES_BOX(vbox3), procw->progressbar, FALSE, FALSE, 0);
   if (palette->style&STYLE_1) {
     lives_widget_set_fg_color(procw->progressbar, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
   }
 
   widget_opts.justify=LIVES_JUSTIFY_CENTER;
   if (mainw->internal_messaging&&mainw->rte!=0) {
-    procw->label2 = lives_standard_label_new (_("\n\nPlease Wait\n\nRemember to switch off effects (ctrl-0) afterwards !"));
+    procw->label2 = lives_standard_label_new(_("\n\nPlease Wait\n\nRemember to switch off effects (ctrl-0) afterwards !"));
   }
 #ifdef RT_AUDIO
-  else if (mainw->jackd_read!=NULL||mainw->pulsed_read!=NULL) procw->label2 = lives_label_new ("");
+  else if (mainw->jackd_read!=NULL||mainw->pulsed_read!=NULL) procw->label2 = lives_label_new("");
 #endif
-  else procw->label2=lives_standard_label_new (_("\nPlease Wait"));
+  else procw->label2=lives_standard_label_new(_("\nPlease Wait"));
   widget_opts.justify=LIVES_JUSTIFY_DEFAULT;
 
-  lives_widget_show (procw->label2);
+  lives_widget_show(procw->label2);
 
-  lives_box_pack_start (LIVES_BOX (vbox3), procw->label2, FALSE, FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(vbox3), procw->label2, FALSE, FALSE, 0);
 
   widget_opts.justify=LIVES_JUSTIFY_CENTER;
-  procw->label3 = lives_standard_label_new (PROCW_STRETCHER);
-  lives_widget_show (procw->label3);
-  lives_box_pack_start (LIVES_BOX (vbox3), procw->label3, FALSE, FALSE, 0);
+  procw->label3 = lives_standard_label_new(PROCW_STRETCHER);
+  lives_widget_show(procw->label3);
+  lives_box_pack_start(LIVES_BOX(vbox3), procw->label3, FALSE, FALSE, 0);
   widget_opts.justify=LIVES_JUSTIFY_DEFAULT;
 
   if (mainw->iochan!=NULL) {
     // add "show details" arrow
     boolean woat=widget_opts.apply_theme;
     widget_opts.apply_theme=FALSE;
-    procw->scrolledwindow = lives_standard_scrolled_window_new (ENC_DETAILS_WIN_H, ENC_DETAILS_WIN_V, LIVES_WIDGET(mainw->optextview));
+    procw->scrolledwindow = lives_standard_scrolled_window_new(ENC_DETAILS_WIN_H, ENC_DETAILS_WIN_V, LIVES_WIDGET(mainw->optextview));
     widget_opts.apply_theme=woat;
 
     details_arrow=lives_standard_expander_new(_("Show Details"),FALSE,LIVES_BOX(vbox3),procw->scrolledwindow);
@@ -248,69 +236,68 @@
 
   lives_widget_show_all(vbox3);
 
-  dialog_action_area = lives_dialog_get_action_area(LIVES_DIALOG (procw->processing));
-  lives_button_box_set_layout (LIVES_BUTTON_BOX (dialog_action_area), LIVES_BUTTONBOX_END);
+  dialog_action_area = lives_dialog_get_action_area(LIVES_DIALOG(procw->processing));
+  lives_button_box_set_layout(LIVES_BUTTON_BOX(dialog_action_area), LIVES_BUTTONBOX_END);
 
-  procw->stop_button = lives_button_new_with_mnemonic (_ ("_Enough"));
-  procw->preview_button = lives_button_new_with_mnemonic (_ ("_Preview"));
+  procw->stop_button = lives_button_new_with_mnemonic(_("_Enough"));
+  procw->preview_button = lives_button_new_with_mnemonic(_("_Preview"));
 
-  if (cfile->nokeep) procw->pause_button = lives_button_new_with_mnemonic (_ ("Paus_e"));
-  else procw->pause_button = lives_button_new_with_mnemonic (_ ("Pause/_Enough"));
+  if (cfile->nokeep) procw->pause_button = lives_button_new_with_mnemonic(_("Paus_e"));
+  else procw->pause_button = lives_button_new_with_mnemonic(_("Pause/_Enough"));
 
-  lives_dialog_add_action_widget (LIVES_DIALOG (procw->processing), procw->preview_button, 1);
+  lives_dialog_add_action_widget(LIVES_DIALOG(procw->processing), procw->preview_button, 1);
   lives_widget_hide(procw->preview_button);
-  lives_widget_set_can_focus_and_default (procw->preview_button);
-    
-  lives_dialog_add_action_widget (LIVES_DIALOG (procw->processing), procw->pause_button, 0);
+  lives_widget_set_can_focus_and_default(procw->preview_button);
+
+  lives_dialog_add_action_widget(LIVES_DIALOG(procw->processing), procw->pause_button, 0);
   lives_widget_hide(procw->pause_button);
-  lives_widget_set_can_focus_and_default (procw->pause_button);
+  lives_widget_set_can_focus_and_default(procw->pause_button);
 
 
   if (mainw->current_file>-1) {
     if (cfile->opening_loc
 #ifdef ENABLE_JACK
-	||mainw->jackd_read!=NULL
+        ||mainw->jackd_read!=NULL
 #endif
 #ifdef HAVE_PULSE_AUDIO
-	||mainw->pulsed_read!=NULL
+        ||mainw->pulsed_read!=NULL
 #endif
-	) {
+       ) {
       // the "enough" button for opening
-      lives_dialog_add_action_widget (LIVES_DIALOG (procw->processing), procw->stop_button, 0);
+      lives_dialog_add_action_widget(LIVES_DIALOG(procw->processing), procw->stop_button, 0);
       lives_widget_show(procw->stop_button);
-      lives_widget_set_can_focus_and_default (procw->stop_button);
+      lives_widget_set_can_focus_and_default(procw->stop_button);
     }
   }
-  
-  procw->cancel_button = lives_button_new_with_mnemonic (_ ("_Cancel"));
-  lives_dialog_add_action_widget (LIVES_DIALOG (procw->processing), procw->cancel_button, LIVES_RESPONSE_CANCEL);
-  lives_widget_set_can_focus_and_default (procw->cancel_button);
 
-  lives_widget_add_accelerator (procw->cancel_button, LIVES_WIDGET_CLICKED_EVENT, accel_group,
-                              LIVES_KEY_Escape, (LiVESXModifierType)0, (LiVESAccelFlags)0);
+  procw->cancel_button = lives_button_new_with_mnemonic(_("_Cancel"));
+  lives_dialog_add_action_widget(LIVES_DIALOG(procw->processing), procw->cancel_button, LIVES_RESPONSE_CANCEL);
+  lives_widget_set_can_focus_and_default(procw->cancel_button);
+
+  lives_widget_add_accelerator(procw->cancel_button, LIVES_WIDGET_CLICKED_SIGNAL, accel_group,
+                               LIVES_KEY_Escape, (LiVESXModifierType)0, (LiVESAccelFlags)0);
 
-  lives_signal_connect (LIVES_GUI_OBJECT (procw->stop_button), LIVES_WIDGET_CLICKED_EVENT,
-		    LIVES_GUI_CALLBACK (on_stop_clicked),
-		    NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(procw->stop_button), LIVES_WIDGET_CLICKED_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_stop_clicked),
+                       NULL);
 
-  lives_signal_connect (LIVES_GUI_OBJECT (procw->pause_button), LIVES_WIDGET_CLICKED_EVENT,
-                      LIVES_GUI_CALLBACK (on_effects_paused),
-                      NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(procw->pause_button), LIVES_WIDGET_CLICKED_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_effects_paused),
+                       NULL);
 
   if (mainw->multitrack!=NULL&&mainw->multitrack->is_rendering) {
-    lives_signal_connect (LIVES_GUI_OBJECT (procw->preview_button), LIVES_WIDGET_CLICKED_EVENT,
-                      LIVES_GUI_CALLBACK (multitrack_preview_clicked),
-                      mainw->multitrack);
-  }
-  else {
-    lives_signal_connect (LIVES_GUI_OBJECT (procw->preview_button), LIVES_WIDGET_CLICKED_EVENT,
-                      LIVES_GUI_CALLBACK (on_preview_clicked),
-                      NULL);
+    lives_signal_connect(LIVES_GUI_OBJECT(procw->preview_button), LIVES_WIDGET_CLICKED_SIGNAL,
+                         LIVES_GUI_CALLBACK(multitrack_preview_clicked),
+                         mainw->multitrack);
+  } else {
+    lives_signal_connect(LIVES_GUI_OBJECT(procw->preview_button), LIVES_WIDGET_CLICKED_SIGNAL,
+                         LIVES_GUI_CALLBACK(on_preview_clicked),
+                         NULL);
   }
 
-  lives_signal_connect (LIVES_GUI_OBJECT (procw->cancel_button), LIVES_WIDGET_CLICKED_EVENT,
-                      LIVES_GUI_CALLBACK (on_cancel_keep_button_clicked),
-                      NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(procw->cancel_button), LIVES_WIDGET_CLICKED_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_cancel_keep_button_clicked),
+                       NULL);
 
 
   return procw;
@@ -329,10 +316,10 @@
     lives_widget_set_text_color(textview, LIVES_WIDGET_STATE_NORMAL, &palette->info_text);
   }
 
-  lives_widget_set_size_request (textview, TB_WIDTH, TB_HEIGHT_VID);
-  lives_text_view_set_editable (LIVES_TEXT_VIEW (textview), FALSE);
-  lives_text_view_set_justification (LIVES_TEXT_VIEW (textview), LIVES_JUSTIFY_CENTER);
-  lives_text_view_set_cursor_visible (LIVES_TEXT_VIEW (textview), FALSE);
+  lives_widget_set_size_request(textview, TB_WIDTH, TB_HEIGHT_VID);
+  lives_text_view_set_editable(LIVES_TEXT_VIEW(textview), FALSE);
+  lives_text_view_set_justification(LIVES_TEXT_VIEW(textview), LIVES_JUSTIFY_CENTER);
+  lives_text_view_set_cursor_visible(LIVES_TEXT_VIEW(textview), FALSE);
 
   return textview;
 }
@@ -345,16 +332,16 @@
     lives_widget_set_text_color(textview, LIVES_WIDGET_STATE_NORMAL, &palette->info_text);
   }
 
-  lives_widget_set_size_request (textview, TB_WIDTH, TB_HEIGHT_AUD);
-  lives_text_view_set_editable (LIVES_TEXT_VIEW (textview), FALSE);
-  lives_text_view_set_justification (LIVES_TEXT_VIEW (textview), LIVES_JUSTIFY_CENTER);
-  lives_text_view_set_cursor_visible (LIVES_TEXT_VIEW (textview), FALSE);
+  lives_widget_set_size_request(textview, TB_WIDTH, TB_HEIGHT_AUD);
+  lives_text_view_set_editable(LIVES_TEXT_VIEW(textview), FALSE);
+  lives_text_view_set_justification(LIVES_TEXT_VIEW(textview), LIVES_JUSTIFY_CENTER);
+  lives_text_view_set_cursor_visible(LIVES_TEXT_VIEW(textview), FALSE);
 
   return textview;
 }
 
 
-lives_clipinfo_t *create_clip_info_window (int audio_channels, boolean is_mt) {
+lives_clipinfo_t *create_clip_info_window(int audio_channels, boolean is_mt) {
   LiVESWidget *dialog_vbox;
   LiVESWidget *dialog_action_area;
   LiVESWidget *table;
@@ -366,20 +353,20 @@
 
   LiVESAccelGroup *accel_group;
 
-  lives_clipinfo_t *filew=(lives_clipinfo_t *)(g_malloc(sizeof(lives_clipinfo_t)));
+  lives_clipinfo_t *filew=(lives_clipinfo_t *)(lives_malloc(sizeof(lives_clipinfo_t)));
 
-  gchar *title;
+  char *title;
 
   if (mainw->multitrack==NULL)
-    title=g_strdup_printf(_("LiVES: - %s"),cfile->name);
-  else 
-    title=g_strdup(_("LiVES: - Multitrack details"));
+    title=lives_strdup_printf(_("LiVES: - %s"),cfile->name);
+  else
+    title=lives_strdup(_("LiVES: - Multitrack details"));
 
-  filew->dialog = lives_standard_dialog_new(title,FALSE);
-  g_free(title);
+  filew->dialog = lives_standard_dialog_new(title,FALSE,-1,-1);
+  lives_free(title);
 
-  accel_group = LIVES_ACCEL_GROUP(lives_accel_group_new ());
-  lives_window_add_accel_group (LIVES_WINDOW (filew->dialog), accel_group);
+  accel_group = LIVES_ACCEL_GROUP(lives_accel_group_new());
+  lives_window_add_accel_group(LIVES_WINDOW(filew->dialog), accel_group);
 
   if (prefs->show_gui) {
     if (mainw->multitrack==NULL) lives_window_set_transient_for(LIVES_WINDOW(filew->dialog),LIVES_WINDOW(mainw->LiVES));
@@ -389,199 +376,198 @@
   dialog_vbox = lives_dialog_get_content_area(LIVES_DIALOG(filew->dialog));
 
   if (cfile->frames>0||is_mt) {
-    vidframe = lives_frame_new (NULL);
+    vidframe = lives_frame_new(NULL);
 
-    lives_box_pack_start (LIVES_BOX (dialog_vbox), vidframe, TRUE, TRUE, 0);
+    lives_box_pack_start(LIVES_BOX(dialog_vbox), vidframe, TRUE, TRUE, 0);
     if (palette->style&STYLE_1) {
       lives_widget_set_bg_color(vidframe, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
     }
 
     table=lives_table_new(3,4,TRUE);
 
-    lives_table_set_col_spacings (LIVES_TABLE (table), widget_opts.packing_width*4);
-    lives_table_set_row_spacings (LIVES_TABLE (table), widget_opts.packing_height);
-    lives_container_set_border_width (LIVES_CONTAINER (table), widget_opts.border_width);
+    lives_table_set_col_spacings(LIVES_TABLE(table), widget_opts.packing_width*4);
+    lives_table_set_row_spacings(LIVES_TABLE(table), widget_opts.packing_height);
+    lives_container_set_border_width(LIVES_CONTAINER(table), widget_opts.border_width);
 
-    lives_container_add (LIVES_CONTAINER (vidframe), table);
+    lives_container_add(LIVES_CONTAINER(vidframe), table);
 
-    label = lives_standard_label_new (_("Format"));
-    lives_table_attach (LIVES_TABLE (table), label, 0, 1, 0, 1,
-			(LiVESAttachOptions) (LIVES_FILL|LIVES_EXPAND),
-			(LiVESAttachOptions) (0), 0, 0);
+    label = lives_standard_label_new(_("Format"));
+    lives_table_attach(LIVES_TABLE(table), label, 0, 1, 0, 1,
+                       (LiVESAttachOptions)(LIVES_FILL|LIVES_EXPAND),
+                       (LiVESAttachOptions)(0), 0, 0);
 
-    label = lives_standard_label_new (_("Frame size"));
-    lives_table_attach (LIVES_TABLE (table), label, 0, 1, 1, 2,
-			(LiVESAttachOptions) (LIVES_FILL|LIVES_EXPAND),
-			(LiVESAttachOptions) (0), 0, 0);
+    label = lives_standard_label_new(_("Frame size"));
+    lives_table_attach(LIVES_TABLE(table), label, 0, 1, 1, 2,
+                       (LiVESAttachOptions)(LIVES_FILL|LIVES_EXPAND),
+                       (LiVESAttachOptions)(0), 0, 0);
 
-    if (!is_mt) label = lives_standard_label_new (_("File size"));
-    else label = lives_standard_label_new (_("Byte size"));
-    lives_table_attach (LIVES_TABLE (table), label, 0, 1, 2, 3,
-			(LiVESAttachOptions) (LIVES_FILL|LIVES_EXPAND),
-			(LiVESAttachOptions) (0), 0, 0);
+    if (!is_mt) label = lives_standard_label_new(_("File size"));
+    else label = lives_standard_label_new(_("Byte size"));
+    lives_table_attach(LIVES_TABLE(table), label, 0, 1, 2, 3,
+                       (LiVESAttachOptions)(LIVES_FILL|LIVES_EXPAND),
+                       (LiVESAttachOptions)(0), 0, 0);
 
-    label = lives_standard_label_new (_("FPS"));
-    lives_table_attach (LIVES_TABLE (table), label, 2, 3, 0, 1,
-			(LiVESAttachOptions) (LIVES_FILL|LIVES_EXPAND),
-			(LiVESAttachOptions) (0), 0, 0);
+    label = lives_standard_label_new(_("FPS"));
+    lives_table_attach(LIVES_TABLE(table), label, 2, 3, 0, 1,
+                       (LiVESAttachOptions)(LIVES_FILL|LIVES_EXPAND),
+                       (LiVESAttachOptions)(0), 0, 0);
 
-    if (!is_mt) label = lives_standard_label_new (_("Frames"));
-    else label = lives_standard_label_new (_("Events"));
-    lives_table_attach (LIVES_TABLE (table), label, 2, 3, 1, 2,
-			(LiVESAttachOptions) (LIVES_FILL|LIVES_EXPAND),
-			(LiVESAttachOptions) (0), 0, 0);
+    if (!is_mt) label = lives_standard_label_new(_("Frames"));
+    else label = lives_standard_label_new(_("Events"));
+    lives_table_attach(LIVES_TABLE(table), label, 2, 3, 1, 2,
+                       (LiVESAttachOptions)(LIVES_FILL|LIVES_EXPAND),
+                       (LiVESAttachOptions)(0), 0, 0);
 
-    label = lives_standard_label_new (_("Total time"));
-    lives_table_attach (LIVES_TABLE (table), label, 2, 3, 2, 3,
-			(LiVESAttachOptions) (LIVES_FILL|LIVES_EXPAND),
-			(LiVESAttachOptions) (0), 0, 0);
+    label = lives_standard_label_new(_("Total time"));
+    lives_table_attach(LIVES_TABLE(table), label, 2, 3, 2, 3,
+                       (LiVESAttachOptions)(LIVES_FILL|LIVES_EXPAND),
+                       (LiVESAttachOptions)(0), 0, 0);
 
-    filew->textview24 = vid_text_view_new ();
-    lives_table_attach (LIVES_TABLE (table), filew->textview24, 1, 2, 0, 1,
-			(LiVESAttachOptions) (LIVES_FILL|LIVES_EXPAND),
-			(LiVESAttachOptions) (0), 0, 0);
+    filew->textview24 = vid_text_view_new();
+    lives_table_attach(LIVES_TABLE(table), filew->textview24, 1, 2, 0, 1,
+                       (LiVESAttachOptions)(LIVES_FILL|LIVES_EXPAND),
+                       (LiVESAttachOptions)(0), 0, 0);
 
-    filew->textview25 = vid_text_view_new ();
-    lives_table_attach (LIVES_TABLE (table), filew->textview25, 3, 4, 0, 1,
-			(LiVESAttachOptions) (LIVES_FILL|LIVES_EXPAND),
-			(LiVESAttachOptions) (0), 0, 0);
+    filew->textview25 = vid_text_view_new();
+    lives_table_attach(LIVES_TABLE(table), filew->textview25, 3, 4, 0, 1,
+                       (LiVESAttachOptions)(LIVES_FILL|LIVES_EXPAND),
+                       (LiVESAttachOptions)(0), 0, 0);
 
-    filew->textview26 = vid_text_view_new ();
-    lives_table_attach (LIVES_TABLE (table), filew->textview26, 1, 2, 1, 2,
-			(LiVESAttachOptions) (LIVES_FILL|LIVES_EXPAND),
-			(LiVESAttachOptions) (0), 0, 0);
+    filew->textview26 = vid_text_view_new();
+    lives_table_attach(LIVES_TABLE(table), filew->textview26, 1, 2, 1, 2,
+                       (LiVESAttachOptions)(LIVES_FILL|LIVES_EXPAND),
+                       (LiVESAttachOptions)(0), 0, 0);
 
-    filew->textview27 = vid_text_view_new ();
-    lives_table_attach (LIVES_TABLE (table), filew->textview27, 3, 4, 1, 2,
-			(LiVESAttachOptions) (LIVES_FILL|LIVES_EXPAND),
-			(LiVESAttachOptions) (0), 0, 0);
+    filew->textview27 = vid_text_view_new();
+    lives_table_attach(LIVES_TABLE(table), filew->textview27, 3, 4, 1, 2,
+                       (LiVESAttachOptions)(LIVES_FILL|LIVES_EXPAND),
+                       (LiVESAttachOptions)(0), 0, 0);
 
-    filew->textview28 = vid_text_view_new ();
-    lives_table_attach (LIVES_TABLE (table), filew->textview28, 3, 4, 2, 3,
-			(LiVESAttachOptions) (LIVES_FILL|LIVES_EXPAND),
-			(LiVESAttachOptions) (0), 0, 0);
+    filew->textview28 = vid_text_view_new();
+    lives_table_attach(LIVES_TABLE(table), filew->textview28, 3, 4, 2, 3,
+                       (LiVESAttachOptions)(LIVES_FILL|LIVES_EXPAND),
+                       (LiVESAttachOptions)(0), 0, 0);
 
-    filew->textview29 = vid_text_view_new ();
-    lives_table_attach (LIVES_TABLE (table), filew->textview29, 1, 2, 2, 3,
-			(LiVESAttachOptions) (LIVES_FILL|LIVES_EXPAND),
-			(LiVESAttachOptions) (0), 0, 0);
+    filew->textview29 = vid_text_view_new();
+    lives_table_attach(LIVES_TABLE(table), filew->textview29, 1, 2, 2, 3,
+                       (LiVESAttachOptions)(LIVES_FILL|LIVES_EXPAND),
+                       (LiVESAttachOptions)(0), 0, 0);
 
 
-    label = lives_standard_label_new (_("Video"));
-    lives_frame_set_label_widget (LIVES_FRAME (vidframe), label);
+    label = lives_standard_label_new(_("Video"));
+    lives_frame_set_label_widget(LIVES_FRAME(vidframe), label);
   }
 
   if (audio_channels>0) {
-    laudframe = lives_frame_new (NULL);
+    laudframe = lives_frame_new(NULL);
 
-    lives_box_pack_start (LIVES_BOX (dialog_vbox), laudframe, TRUE, TRUE, 0);
+    lives_box_pack_start(LIVES_BOX(dialog_vbox), laudframe, TRUE, TRUE, 0);
     if (palette->style&STYLE_1) {
       lives_widget_set_bg_color(laudframe, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
     }
 
     if (audio_channels>1) {
-      label = lives_standard_label_new (_("Left Audio"));
-    }
-    else {
-      label = lives_standard_label_new (_("Audio"));
+      label = lives_standard_label_new(_("Left Audio"));
+    } else {
+      label = lives_standard_label_new(_("Audio"));
     }
 
-    lives_frame_set_label_widget (LIVES_FRAME (laudframe), label);
+    lives_frame_set_label_widget(LIVES_FRAME(laudframe), label);
 
     table=lives_table_new(1,4,TRUE);
 
-    lives_table_set_col_spacings (LIVES_TABLE (table), widget_opts.packing_width*4);
-    lives_table_set_row_spacings (LIVES_TABLE (table), widget_opts.packing_height);
-    lives_container_set_border_width (LIVES_CONTAINER (table), widget_opts.border_width);
+    lives_table_set_col_spacings(LIVES_TABLE(table), widget_opts.packing_width*4);
+    lives_table_set_row_spacings(LIVES_TABLE(table), widget_opts.packing_height);
+    lives_container_set_border_width(LIVES_CONTAINER(table), widget_opts.border_width);
 
-    lives_container_add (LIVES_CONTAINER (laudframe), table);
+    lives_container_add(LIVES_CONTAINER(laudframe), table);
 
     if (!is_mt) {
-      label = lives_standard_label_new (_("Total time"));
-      lives_table_attach (LIVES_TABLE (table), label, 0, 1, 0, 1,
-			  (LiVESAttachOptions) (LIVES_FILL|LIVES_EXPAND),
-			  (LiVESAttachOptions) (0), 0, 0);
-
-      filew->textview_ltime = aud_text_view_new ();
-      lives_table_attach (LIVES_TABLE (table), filew->textview_ltime, 1, 2, 0, 1,
-			  (LiVESAttachOptions) (LIVES_FILL|LIVES_EXPAND),
-			  (LiVESAttachOptions) (0), 0, 0);
+      label = lives_standard_label_new(_("Total time"));
+      lives_table_attach(LIVES_TABLE(table), label, 0, 1, 0, 1,
+                         (LiVESAttachOptions)(LIVES_FILL|LIVES_EXPAND),
+                         (LiVESAttachOptions)(0), 0, 0);
+
+      filew->textview_ltime = aud_text_view_new();
+      lives_table_attach(LIVES_TABLE(table), filew->textview_ltime, 1, 2, 0, 1,
+                         (LiVESAttachOptions)(LIVES_FILL|LIVES_EXPAND),
+                         (LiVESAttachOptions)(0), 0, 0);
     }
 
-    label = lives_standard_label_new (_("Rate/size"));
-    lives_table_attach (LIVES_TABLE (table), label, 2, 3, 0, 1,
-			(LiVESAttachOptions) (LIVES_FILL|LIVES_EXPAND),
-			(LiVESAttachOptions) (0), 0, 0);
+    label = lives_standard_label_new(_("Rate/size"));
+    lives_table_attach(LIVES_TABLE(table), label, 2, 3, 0, 1,
+                       (LiVESAttachOptions)(LIVES_FILL|LIVES_EXPAND),
+                       (LiVESAttachOptions)(0), 0, 0);
 
-    filew->textview_lrate = aud_text_view_new ();
-    lives_table_attach (LIVES_TABLE (table), filew->textview_lrate, 3, 4, 0, 1,
-			(LiVESAttachOptions) (LIVES_FILL|LIVES_EXPAND),
-			(LiVESAttachOptions) (0), 0, 0);
+    filew->textview_lrate = aud_text_view_new();
+    lives_table_attach(LIVES_TABLE(table), filew->textview_lrate, 3, 4, 0, 1,
+                       (LiVESAttachOptions)(LIVES_FILL|LIVES_EXPAND),
+                       (LiVESAttachOptions)(0), 0, 0);
 
 
     if (audio_channels>1) {
-      raudframe = lives_frame_new (NULL);
+      raudframe = lives_frame_new(NULL);
 
-      lives_box_pack_start (LIVES_BOX (dialog_vbox), raudframe, TRUE, TRUE, 0);
+      lives_box_pack_start(LIVES_BOX(dialog_vbox), raudframe, TRUE, TRUE, 0);
       if (palette->style&STYLE_1) {
-	lives_widget_set_bg_color(raudframe, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+        lives_widget_set_bg_color(raudframe, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
       }
 
-      label = lives_standard_label_new (_("Right audio"));
-      lives_frame_set_label_widget (LIVES_FRAME (raudframe), label);
+      label = lives_standard_label_new(_("Right audio"));
+      lives_frame_set_label_widget(LIVES_FRAME(raudframe), label);
 
       table=lives_table_new(1,4,TRUE);
 
-      lives_table_set_col_spacings (LIVES_TABLE (table), widget_opts.packing_width*4);
-      lives_table_set_row_spacings (LIVES_TABLE (table), widget_opts.packing_height);
-      lives_container_set_border_width (LIVES_CONTAINER (table), widget_opts.border_width);
+      lives_table_set_col_spacings(LIVES_TABLE(table), widget_opts.packing_width*4);
+      lives_table_set_row_spacings(LIVES_TABLE(table), widget_opts.packing_height);
+      lives_container_set_border_width(LIVES_CONTAINER(table), widget_opts.border_width);
 
-      lives_container_add (LIVES_CONTAINER (raudframe), table);
+      lives_container_add(LIVES_CONTAINER(raudframe), table);
 
       if (!is_mt) {
-	label = lives_standard_label_new (_("Total time"));
-	lives_table_attach (LIVES_TABLE (table), label, 0, 1, 0, 1,
-			    (LiVESAttachOptions) (LIVES_FILL|LIVES_EXPAND),
-			    (LiVESAttachOptions) (0), 0, 0);
-
-	filew->textview_rtime = aud_text_view_new ();
-	lives_table_attach (LIVES_TABLE (table), filew->textview_rtime, 1, 2, 0, 1,
-			    (LiVESAttachOptions) (LIVES_FILL|LIVES_EXPAND),
-			    (LiVESAttachOptions) (0), 0, 0);
+        label = lives_standard_label_new(_("Total time"));
+        lives_table_attach(LIVES_TABLE(table), label, 0, 1, 0, 1,
+                           (LiVESAttachOptions)(LIVES_FILL|LIVES_EXPAND),
+                           (LiVESAttachOptions)(0), 0, 0);
+
+        filew->textview_rtime = aud_text_view_new();
+        lives_table_attach(LIVES_TABLE(table), filew->textview_rtime, 1, 2, 0, 1,
+                           (LiVESAttachOptions)(LIVES_FILL|LIVES_EXPAND),
+                           (LiVESAttachOptions)(0), 0, 0);
       }
 
-      label = lives_standard_label_new (_("Rate/size"));
-      lives_table_attach (LIVES_TABLE (table), label, 2, 3, 0, 1,
-			  (LiVESAttachOptions) (LIVES_FILL|LIVES_EXPAND),
-			  (LiVESAttachOptions) (0), 0, 0);
+      label = lives_standard_label_new(_("Rate/size"));
+      lives_table_attach(LIVES_TABLE(table), label, 2, 3, 0, 1,
+                         (LiVESAttachOptions)(LIVES_FILL|LIVES_EXPAND),
+                         (LiVESAttachOptions)(0), 0, 0);
 
-      filew->textview_rrate = aud_text_view_new ();
-      lives_table_attach (LIVES_TABLE (table), filew->textview_rrate, 3, 4, 0, 1,
-			  (LiVESAttachOptions) (LIVES_FILL|LIVES_EXPAND),
-			  (LiVESAttachOptions) (0), 0, 0);
+      filew->textview_rrate = aud_text_view_new();
+      lives_table_attach(LIVES_TABLE(table), filew->textview_rrate, 3, 4, 0, 1,
+                         (LiVESAttachOptions)(LIVES_FILL|LIVES_EXPAND),
+                         (LiVESAttachOptions)(0), 0, 0);
 
     }
   }
 
-  dialog_action_area = lives_dialog_get_action_area(LIVES_DIALOG (filew->dialog));
-  lives_button_box_set_layout (LIVES_BUTTON_BOX (dialog_action_area), LIVES_BUTTONBOX_SPREAD);
+  dialog_action_area = lives_dialog_get_action_area(LIVES_DIALOG(filew->dialog));
+  lives_button_box_set_layout(LIVES_BUTTON_BOX(dialog_action_area), LIVES_BUTTONBOX_SPREAD);
 
-  okbutton = lives_button_new_from_stock (LIVES_STOCK_OK);
-  lives_dialog_add_action_widget (LIVES_DIALOG (filew->dialog), okbutton, LIVES_RESPONSE_OK);
-  lives_widget_set_can_focus_and_default (okbutton);
-  lives_widget_grab_default (okbutton);
+  okbutton = lives_button_new_from_stock(LIVES_STOCK_OK);
+  lives_dialog_add_action_widget(LIVES_DIALOG(filew->dialog), okbutton, LIVES_RESPONSE_OK);
+  lives_widget_set_can_focus_and_default(okbutton);
+  lives_widget_grab_default(okbutton);
 
   lives_widget_set_size_request(okbutton,DEF_BUTTON_WIDTH*4,-1);
 
-  lives_signal_connect (LIVES_GUI_OBJECT (okbutton), LIVES_WIDGET_CLICKED_EVENT,
-                      LIVES_GUI_CALLBACK (lives_general_button_clicked),
-                      filew);
+  lives_signal_connect(LIVES_GUI_OBJECT(okbutton), LIVES_WIDGET_CLICKED_SIGNAL,
+                       LIVES_GUI_CALLBACK(lives_general_button_clicked),
+                       filew);
 
-  accel_group = LIVES_ACCEL_GROUP(lives_accel_group_new ());
-  lives_window_add_accel_group (LIVES_WINDOW (filew->dialog), accel_group);
+  accel_group = LIVES_ACCEL_GROUP(lives_accel_group_new());
+  lives_window_add_accel_group(LIVES_WINDOW(filew->dialog), accel_group);
 
-  lives_widget_add_accelerator (okbutton, LIVES_WIDGET_CLICKED_EVENT, accel_group,
-                              LIVES_KEY_Escape, (LiVESXModifierType)0, (LiVESAccelFlags)0);
+  lives_widget_add_accelerator(okbutton, LIVES_WIDGET_CLICKED_SIGNAL, accel_group,
+                               LIVES_KEY_Escape, (LiVESXModifierType)0, (LiVESAccelFlags)0);
 
 
   lives_widget_show_all(filew->dialog);
@@ -590,14 +576,13 @@
 }
 
 
-static void on_resizecb_toggled (LiVESToggleButton *t, gpointer user_data) {
+static void on_resizecb_toggled(LiVESToggleButton *t, livespointer user_data) {
   LiVESWidget *cb=(LiVESWidget *)user_data;
 
   if (!lives_toggle_button_get_active(t)) {
     lives_widget_set_sensitive(cb,FALSE);
     lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(cb),FALSE);
-  }
-  else {
+  } else {
     lives_widget_set_sensitive(cb,TRUE);
     lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(cb),prefs->enc_letterbox);
   }
@@ -606,7 +591,7 @@
 
 
 
-LiVESWidget* create_encoder_prep_dialog (const gchar *text1, const gchar *text2, boolean opt_resize) {
+LiVESWidget *create_encoder_prep_dialog(const char *text1, const char *text2, boolean opt_resize) {
   LiVESWidget *dialog;
   LiVESWidget *dialog_vbox;
   LiVESWidget *dialog_action_area;
@@ -617,9 +602,9 @@
   LiVESWidget *label;
   LiVESWidget *hbox;
 
-  gchar *labeltext,*tmp,*tmp2;
+  char *labeltext,*tmp,*tmp2;
 
-  dialog = lives_standard_dialog_new (_("LiVES: - Encoding options"),FALSE);
+  dialog = lives_standard_dialog_new(_("LiVES: - Encoding options"),FALSE,-1,-1);
 
   if (prefs->show_gui) {
     lives_window_set_transient_for(LIVES_WINDOW(dialog),LIVES_WINDOW(mainw->LiVES));
@@ -628,274 +613,177 @@
   dialog_vbox = lives_dialog_get_content_area(LIVES_DIALOG(dialog));
 
   widget_opts.justify=LIVES_JUSTIFY_CENTER;
-  label = lives_standard_label_new (text1);
+  label = lives_standard_label_new(text1);
   widget_opts.justify=LIVES_JUSTIFY_DEFAULT;
-  lives_box_pack_start (LIVES_BOX (dialog_vbox), label, TRUE, TRUE, 0);
+  lives_box_pack_start(LIVES_BOX(dialog_vbox), label, TRUE, TRUE, 0);
 
-  if (opt_resize) {      
-    if (text2!=NULL) labeltext=g_strdup (_("<------------- (Check the box to re_size as suggested)"));
-    else labeltext=g_strdup (_("<------------- (Check the box to use the _size recommendation)"));
+  if (opt_resize) {
+    if (text2!=NULL) labeltext=lives_strdup(_("<------------- (Check the box to re_size as suggested)"));
+    else labeltext=lives_strdup(_("<------------- (Check the box to use the _size recommendation)"));
 
-    hbox = lives_hbox_new (FALSE, 0);
-    lives_box_pack_start (LIVES_BOX (dialog_vbox), hbox, FALSE, FALSE, widget_opts.packing_width);
+    hbox = lives_hbox_new(FALSE, 0);
+    lives_box_pack_start(LIVES_BOX(dialog_vbox), hbox, FALSE, FALSE, widget_opts.packing_width);
 
-    checkbutton = lives_standard_check_button_new (labeltext,TRUE,LIVES_BOX(hbox),NULL);
+    checkbutton = lives_standard_check_button_new(labeltext,TRUE,LIVES_BOX(hbox),NULL);
 
-    g_free(labeltext);
-    
-    lives_signal_connect_after (LIVES_GUI_OBJECT (checkbutton), LIVES_WIDGET_TOGGLED_EVENT,
-			    LIVES_GUI_CALLBACK (on_boolean_toggled),
-			    &mainw->fx1_bool);
+    lives_free(labeltext);
 
-  }
-  else if (text2==NULL) mainw->fx1_bool=TRUE;
+    lives_signal_connect_after(LIVES_GUI_OBJECT(checkbutton), LIVES_WIDGET_TOGGLED_SIGNAL,
+                               LIVES_GUI_CALLBACK(on_boolean_toggled),
+                               &mainw->fx1_bool);
+
+  } else if (text2==NULL) mainw->fx1_bool=TRUE;
 
   if (text2!=NULL&&(mainw->fx1_bool||opt_resize)) {
 
-    hbox = lives_hbox_new (FALSE, 0);
+    hbox = lives_hbox_new(FALSE, 0);
     if (capable->has_composite&&capable->has_convert) {
       // only offer this if we have "composite" and "convert" - for now... TODO ****
-      lives_box_pack_start (LIVES_BOX (dialog_vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
+      lives_box_pack_start(LIVES_BOX(dialog_vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
     }
 
-    checkbutton2 = lives_standard_check_button_new 
-      ((tmp=g_strdup(_("Use _letterboxing to maintain aspect ratio (optional)"))),TRUE,LIVES_BOX(hbox),
-       (tmp2=g_strdup(_("Draw black rectangles either above or to the sides of the image, to prevent it from stretching."))));
+    checkbutton2 = lives_standard_check_button_new
+                   ((tmp=lives_strdup(_("Use _letterboxing to maintain aspect ratio (optional)"))),TRUE,LIVES_BOX(hbox),
+                    (tmp2=lives_strdup(_("Draw black rectangles either above or to the sides of the image, to prevent it from stretching."))));
 
-    g_free(tmp); g_free(tmp2);
+    lives_free(tmp);
+    lives_free(tmp2);
 
     if (opt_resize) {
       lives_widget_set_sensitive(checkbutton2,FALSE);
       lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(checkbutton2),FALSE);
-    }
-    else lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(checkbutton2),prefs->enc_letterbox);
-    
-    lives_signal_connect_after (LIVES_GUI_OBJECT (checkbutton2), LIVES_WIDGET_TOGGLED_EVENT,
-			    LIVES_GUI_CALLBACK (on_boolean_toggled),
-			    &prefs->enc_letterbox);
+    } else lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(checkbutton2),prefs->enc_letterbox);
 
-    if (opt_resize) 
-      lives_signal_connect_after (LIVES_GUI_OBJECT (checkbutton), LIVES_WIDGET_TOGGLED_EVENT,
-			      LIVES_GUI_CALLBACK (on_resizecb_toggled),
-			      checkbutton2);
+    lives_signal_connect_after(LIVES_GUI_OBJECT(checkbutton2), LIVES_WIDGET_TOGGLED_SIGNAL,
+                               LIVES_GUI_CALLBACK(on_boolean_toggled),
+                               &prefs->enc_letterbox);
+
+    if (opt_resize)
+      lives_signal_connect_after(LIVES_GUI_OBJECT(checkbutton), LIVES_WIDGET_TOGGLED_SIGNAL,
+                                 LIVES_GUI_CALLBACK(on_resizecb_toggled),
+                                 checkbutton2);
 
   }
 
-  dialog_action_area = lives_dialog_get_action_area(LIVES_DIALOG (dialog));
-  lives_button_box_set_layout (LIVES_BUTTON_BOX (dialog_action_area), LIVES_BUTTONBOX_END);
+  dialog_action_area = lives_dialog_get_action_area(LIVES_DIALOG(dialog));
+  lives_button_box_set_layout(LIVES_BUTTON_BOX(dialog_action_area), LIVES_BUTTONBOX_END);
 
   if (text2!=NULL) {
-    label = lives_standard_label_new (text2);
-    lives_box_pack_start (LIVES_BOX (dialog_vbox), label, TRUE, TRUE, 0);
-    cancelbutton = lives_button_new_from_stock (LIVES_STOCK_CANCEL);
-    okbutton = lives_button_new_from_stock (LIVES_STOCK_OK);
-  }
-  else {
-    cancelbutton = lives_button_new_with_mnemonic (_("Keep _my settings"));
-    okbutton = lives_button_new_with_mnemonic (_("Use _recommended settings"));
+    label = lives_standard_label_new(text2);
+    lives_box_pack_start(LIVES_BOX(dialog_vbox), label, TRUE, TRUE, 0);
+    cancelbutton = lives_button_new_from_stock(LIVES_STOCK_CANCEL);
+    okbutton = lives_button_new_from_stock(LIVES_STOCK_OK);
+  } else {
+    cancelbutton = lives_button_new_with_mnemonic(_("Keep _my settings"));
+    okbutton = lives_button_new_with_mnemonic(_("Use _recommended settings"));
   }
 
-  lives_dialog_add_action_widget (LIVES_DIALOG (dialog), cancelbutton, LIVES_RESPONSE_CANCEL);
-  lives_widget_set_can_focus_and_default (cancelbutton);
+  lives_dialog_add_action_widget(LIVES_DIALOG(dialog), cancelbutton, LIVES_RESPONSE_CANCEL);
+  lives_widget_set_can_focus_and_default(cancelbutton);
 
-  lives_dialog_add_action_widget (LIVES_DIALOG (dialog), okbutton, LIVES_RESPONSE_OK);
+  lives_dialog_add_action_widget(LIVES_DIALOG(dialog), okbutton, LIVES_RESPONSE_OK);
 
-  lives_widget_set_can_focus_and_default (okbutton);
-  lives_widget_grab_default (okbutton);
+  lives_widget_set_can_focus_and_default(okbutton);
+  lives_widget_grab_default(okbutton);
 
-  lives_widget_show_all (dialog);
+  lives_widget_show_all(dialog);
   return dialog;
 }
 
 
 // Information/error dialog
-LiVESWidget* create_info_error_dialog (const gchar *text, boolean is_blocking, int mask, lives_info_t info_type) {
-  LiVESWidget *dialog;
-  LiVESWidget *dialog_vbox;
-  LiVESWidget *info_text;
-  LiVESWidget *dialog_action_area;
-  LiVESWidget *info_ok_button;
-  LiVESWidget *details_button;
-  LiVESWidget *checkbutton;
-  LiVESWidget *hbox;
-  gchar *form_text;
-  gchar *textx;
-
-  LiVESAccelGroup *accel_group=LIVES_ACCEL_GROUP(lives_accel_group_new ());
-
-#ifdef GUI_GTK
-  if (info_type==LIVES_INFO_TYPE_WARNING)
-    dialog = gtk_message_dialog_new (NULL,(GtkDialogFlags)0,
-				     GTK_MESSAGE_WARNING,GTK_BUTTONS_NONE,"%s","");
-  else if (info_type==LIVES_INFO_TYPE_ERROR)
-    dialog = gtk_message_dialog_new (NULL,(GtkDialogFlags)0,
-				     GTK_MESSAGE_ERROR,GTK_BUTTONS_NONE,"%s","");
-  else // INFO
-    dialog = gtk_message_dialog_new (NULL,(GtkDialogFlags)0,
-				     GTK_MESSAGE_INFO,GTK_BUTTONS_NONE,"%s","");
-#endif
-
-  lives_window_set_title (LIVES_WINDOW (dialog), _("LiVES"));
-  
-  lives_window_set_deletable(LIVES_WINDOW(dialog), FALSE);
-  lives_window_set_resizable (LIVES_WINDOW (dialog), FALSE);
-
-  lives_container_set_border_width (LIVES_CONTAINER (dialog), widget_opts.border_width*2);
-
-  lives_window_add_accel_group (LIVES_WINDOW (dialog), accel_group);
-
-  if (mainw!=NULL&&widget_opts.apply_theme&&palette->style&STYLE_1) {
-    lives_dialog_set_has_separator(LIVES_DIALOG(dialog),FALSE);
-    lives_widget_set_bg_color(dialog, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
-  }
-
-  dialog_vbox = lives_dialog_get_content_area(LIVES_DIALOG(dialog));
-
-  textx=insert_newlines(text,MAX_MSG_WIDTH_CHARS);
-
-  form_text=g_strdup_printf("\n\n%s",textx);
-
-  widget_opts.justify=LIVES_JUSTIFY_CENTER;
-  info_text = lives_standard_label_new (form_text);
-  widget_opts.justify=LIVES_JUSTIFY_DEFAULT;
-  g_free(form_text);
-  g_free(textx);
-
-  lives_label_set_selectable (LIVES_LABEL (info_text), TRUE);
-
-  hbox = lives_hbox_new (FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (dialog_vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
-
-  lives_box_pack_start (LIVES_BOX (hbox), info_text, FALSE, FALSE, widget_opts.packing_width*2);
-  
-  if (mask>0) {
-    hbox = lives_hbox_new (FALSE, 0);
-    lives_box_pack_start (LIVES_BOX (dialog_vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
-    checkbutton = lives_standard_check_button_new (
-						   _("Do _not show this warning any more\n(can be turned back on from Preferences/Warnings)"),
-						   TRUE,LIVES_BOX(hbox),NULL);
-    lives_widget_set_can_focus_and_default (checkbutton);
-    lives_signal_connect (LIVES_GUI_OBJECT (checkbutton), LIVES_WIDGET_TOGGLED_EVENT,
-                      LIVES_GUI_CALLBACK (on_warn_mask_toggled),
-                      GINT_TO_POINTER(mask));
-  }
-
-  dialog_action_area = lives_dialog_get_action_area(LIVES_DIALOG (dialog));
-  lives_button_box_set_layout (LIVES_BUTTON_BOX (dialog_action_area), LIVES_BUTTONBOX_END);
-
-  if (mainw->iochan!=NULL) {
-    details_button = lives_button_new_with_mnemonic(_("Show _Details"));
-    lives_dialog_add_action_widget (LIVES_DIALOG (dialog), details_button, LIVES_RESPONSE_SHOW_DETAILS);
-
-    lives_signal_connect (LIVES_GUI_OBJECT (details_button), LIVES_WIDGET_CLICKED_EVENT,
-		      LIVES_GUI_CALLBACK (lives_general_button_clicked),
-		      NULL);
-  }
-  
-  info_ok_button = lives_button_new_from_stock (LIVES_STOCK_OK);
-  lives_dialog_add_action_widget (LIVES_DIALOG (dialog), info_ok_button, LIVES_RESPONSE_OK);
-
-
-  if (mainw->iochan==NULL) {
-    lives_widget_set_can_focus_and_default (info_ok_button);
-    lives_widget_grab_focus (info_ok_button);
-    lives_widget_grab_default (info_ok_button);
-  }
-
-  lives_signal_connect (LIVES_GUI_OBJECT (info_ok_button), LIVES_WIDGET_CLICKED_EVENT,
-		    LIVES_GUI_CALLBACK (lives_general_button_clicked),
-		    NULL);
-
-  lives_widget_add_accelerator (info_ok_button, LIVES_WIDGET_CLICKED_EVENT, accel_group,
-			      LIVES_KEY_Return, (LiVESXModifierType)0, (LiVESAccelFlags)0);
-
 
+// the type of message box here is with a single OK button
+// if 2 or more buttons (e.g. OK/CANCEL, YES/NO, ABORT/RETRY/CANCEL) are needed, use create_message_dialog() in dialogs.c
 
-  lives_widget_show_all(dialog);
-  if (is_blocking) lives_window_set_modal (LIVES_WINDOW (dialog), TRUE);
+LiVESWidget *create_info_error_dialog(lives_dialog_t info_type, const char *text, LiVESWindow *transient, int mask, boolean is_blocking) {
+  LiVESWidget *dialog;
 
-  if (prefs->present) {
-    lives_window_present (LIVES_WINDOW (dialog));
-    lives_xwindow_raise (lives_widget_get_xwindow(dialog));
+  if (!prefs->show_gui) {
+    transient=NULL;
+  } else {
+    if (mainw->multitrack==NULL) transient=LIVES_WINDOW(mainw->LiVES);
+    else transient=LIVES_WINDOW(mainw->multitrack->window);
   }
 
+  dialog=create_message_dialog(info_type,text,transient,mask,is_blocking);
   return dialog;
 }
 
 
 
-text_window *create_text_window (const gchar *title, const gchar *text, GtkTextBuffer *textbuffer) {
+text_window *create_text_window(const char *title, const char *text, LiVESTextBuffer *textbuffer) {
   // general text window
   LiVESWidget *dialog_vbox;
   LiVESWidget *scrolledwindow;
   LiVESWidget *dialog_action_area;
   LiVESWidget *okbutton;
 
-  gchar *mytitle=g_strdup(title);
-  gchar *mytext=NULL;
-  gchar *tmp;
+  char *mytitle=lives_strdup(title);
+  char *mytext=NULL;
+  char *tmp;
 
   boolean woat;
 
-  if (text!=NULL) mytext=g_strdup(text);
+  if (text!=NULL) mytext=lives_strdup(text);
 
-  textwindow=(text_window *)g_malloc(sizeof(text_window));
+  textwindow=(text_window *)lives_malloc(sizeof(text_window));
 
-  textwindow->dialog = lives_standard_dialog_new ((tmp=g_strconcat ("LiVES: - ",mytitle,NULL)),FALSE);
-  g_free(tmp);
+  textwindow->dialog = lives_standard_dialog_new((tmp=lives_strconcat("LiVES: - ",mytitle,NULL)),FALSE,DEF_DIALOG_WIDTH, DEF_DIALOG_HEIGHT);
+  lives_free(tmp);
 
   if (prefs->show_gui) {
     lives_window_set_transient_for(LIVES_WINDOW(textwindow->dialog),mainw->multitrack==NULL?
-				 LIVES_WINDOW(mainw->LiVES):LIVES_WINDOW(mainw->multitrack->window));
+                                   LIVES_WINDOW(mainw->LiVES):LIVES_WINDOW(mainw->multitrack->window));
   }
 
   dialog_vbox = lives_dialog_get_content_area(LIVES_DIALOG(textwindow->dialog));
 
   if (textbuffer!=NULL) textwindow->textview = lives_text_view_new_with_buffer(textbuffer);
-  else textwindow->textview = lives_text_view_new ();
+  else textwindow->textview = lives_text_view_new();
 
   woat=widget_opts.apply_theme;
   widget_opts.apply_theme=FALSE;
-  scrolledwindow = lives_standard_scrolled_window_new (RFX_WINSIZE_H, RFX_WINSIZE_V, textwindow->textview);
+  scrolledwindow = lives_standard_scrolled_window_new(RFX_WINSIZE_H, RFX_WINSIZE_V, textwindow->textview);
   widget_opts.apply_theme=woat;
 
-  lives_box_pack_start (LIVES_BOX (dialog_vbox), scrolledwindow, TRUE, TRUE, 0);
+  lives_box_pack_start(LIVES_BOX(dialog_vbox), scrolledwindow, TRUE, TRUE, 0);
 
-  lives_text_view_set_editable (LIVES_TEXT_VIEW (textwindow->textview), FALSE);
-  lives_text_view_set_cursor_visible (LIVES_TEXT_VIEW (textwindow->textview), FALSE);
+  lives_text_view_set_editable(LIVES_TEXT_VIEW(textwindow->textview), FALSE);
+  lives_text_view_set_cursor_visible(LIVES_TEXT_VIEW(textwindow->textview), FALSE);
 
   if (palette->style&STYLE_1) {
     lives_widget_set_base_color(textwindow->textview, LIVES_WIDGET_STATE_NORMAL, &palette->info_base);
     lives_widget_set_text_color(textwindow->textview, LIVES_WIDGET_STATE_NORMAL, &palette->info_text);
     lives_widget_set_bg_color(lives_bin_get_child(LIVES_BIN(scrolledwindow)), LIVES_WIDGET_STATE_NORMAL, &palette->info_base);
   }
-  
+
   if (mytext!=NULL) {
-    lives_text_view_set_text (LIVES_TEXT_VIEW (textwindow->textview), mytext, -1);
+    lives_text_view_set_text(LIVES_TEXT_VIEW(textwindow->textview), mytext, -1);
   }
-  
+
   if (mytext!=NULL||mainw->iochan!=NULL) {
-    dialog_action_area = lives_dialog_get_action_area(LIVES_DIALOG (textwindow->dialog));
-    lives_button_box_set_layout (LIVES_BUTTON_BOX (dialog_action_area), LIVES_BUTTONBOX_END);
+    dialog_action_area = lives_dialog_get_action_area(LIVES_DIALOG(textwindow->dialog));
+    lives_button_box_set_layout(LIVES_BUTTON_BOX(dialog_action_area), LIVES_BUTTONBOX_END);
+
+    okbutton = lives_button_new_with_mnemonic(_("_Close Window"));
+
+    LiVESWidget *savebutton = lives_button_new_with_mnemonic(_("_Save to file"));
+    lives_dialog_add_action_widget(LIVES_DIALOG(textwindow->dialog), savebutton, LIVES_RESPONSE_YES);
+    lives_dialog_add_action_widget(LIVES_DIALOG(textwindow->dialog), okbutton, LIVES_RESPONSE_OK);
+
+    lives_signal_connect(LIVES_GUI_OBJECT(savebutton), LIVES_WIDGET_CLICKED_SIGNAL,
+                         LIVES_GUI_CALLBACK(on_save_textview_clicked),
+                         textwindow->textview);
 
-    okbutton = lives_button_new_with_mnemonic (_("_Close Window"));
+    lives_signal_connect(LIVES_GUI_OBJECT(okbutton), LIVES_WIDGET_CLICKED_SIGNAL,
+                         LIVES_GUI_CALLBACK(lives_general_button_clicked),
+                         textwindow);
 
-    LiVESWidget *savebutton = lives_button_new_with_mnemonic (_("_Save to file"));
-    lives_dialog_add_action_widget (LIVES_DIALOG (textwindow->dialog), savebutton, LIVES_RESPONSE_YES);
-    lives_dialog_add_action_widget (LIVES_DIALOG (textwindow->dialog), okbutton, LIVES_RESPONSE_OK);
-    
-    lives_signal_connect (LIVES_GUI_OBJECT (savebutton), LIVES_WIDGET_CLICKED_EVENT,
-		      LIVES_GUI_CALLBACK (on_save_textview_clicked),
-		      textwindow->textview);
-    
-    lives_signal_connect (LIVES_GUI_OBJECT (okbutton), LIVES_WIDGET_CLICKED_EVENT,
-		      LIVES_GUI_CALLBACK (lives_general_button_clicked),
-		      textwindow);
-    
   }
 
-  if (mytitle!=NULL) g_free(mytitle);
-  if (mytext!=NULL) g_free(mytext);
+  if (mytitle!=NULL) lives_free(mytitle);
+  if (mytext!=NULL) lives_free(mytext);
 
   if (prefs->show_gui)
     lives_widget_show_all(textwindow->dialog);
@@ -905,7 +793,7 @@
 
 
 
-_insertw* create_insert_dialog (void) {
+_insertw *create_insert_dialog(void) {
   LiVESWidget *dialog_vbox;
   LiVESWidget *hbox1;
   LiVESWidget *hbox;
@@ -916,18 +804,18 @@
   LiVESWidget *cancelbutton;
   LiVESWidget *okbutton;
 
-  GSList *radiobutton1_group = NULL;
-  GSList *radiobutton2_group = NULL;
+  LiVESSList *radiobutton1_group = NULL;
+  LiVESSList *radiobutton2_group = NULL;
 
-  LiVESAccelGroup *accel_group=LIVES_ACCEL_GROUP(lives_accel_group_new ());
+  LiVESAccelGroup *accel_group=LIVES_ACCEL_GROUP(lives_accel_group_new());
 
-  gchar *tmp,*tmp2;
+  char *tmp,*tmp2;
 
-  _insertw *insertw=(_insertw*)(g_malloc(sizeof(_insertw)));
+  _insertw *insertw=(_insertw *)(lives_malloc(sizeof(_insertw)));
 
-  insertw->insert_dialog = lives_standard_dialog_new (_("LiVES: - Insert"),FALSE);
+  insertw->insert_dialog = lives_standard_dialog_new(_("LiVES: - Insert"),FALSE,-1,-1);
 
-  lives_window_add_accel_group (LIVES_WINDOW (insertw->insert_dialog), accel_group);
+  lives_window_add_accel_group(LIVES_WINDOW(insertw->insert_dialog), accel_group);
 
   if (prefs->show_gui) {
     lives_window_set_transient_for(LIVES_WINDOW(insertw->insert_dialog),LIVES_WINDOW(mainw->LiVES));
@@ -935,140 +823,141 @@
 
   dialog_vbox = lives_dialog_get_content_area(LIVES_DIALOG(insertw->insert_dialog));
 
-  hbox1 = lives_hbox_new (FALSE, 0);
+  hbox1 = lives_hbox_new(FALSE, 0);
 
-  lives_box_pack_start (LIVES_BOX (dialog_vbox), hbox1, TRUE, TRUE, widget_opts.packing_height);
+  lives_box_pack_start(LIVES_BOX(dialog_vbox), hbox1, TRUE, TRUE, widget_opts.packing_height);
 
-  hbox = lives_hbox_new (FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (hbox1), hbox, FALSE, FALSE, widget_opts.packing_width);
+  hbox = lives_hbox_new(FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(hbox1), hbox, FALSE, FALSE, widget_opts.packing_width);
 
   insertw->spinbutton_times = lives_standard_spin_button_new(_("_Number of times to insert"),
-							     TRUE,1.,1.,10000.,1.,10.,0.,LIVES_BOX(hbox),NULL);
+                              TRUE,1.,1.,10000.,1.,10.,0.,LIVES_BOX(hbox),NULL);
 
   add_fill_to_box(LIVES_BOX(hbox1));
 
-  hbox = lives_hbox_new (FALSE, 0);
+  hbox = lives_hbox_new(FALSE, 0);
 
-  lives_box_pack_start (LIVES_BOX (hbox1), hbox, FALSE, FALSE, widget_opts.packing_width);
+  lives_box_pack_start(LIVES_BOX(hbox1), hbox, FALSE, FALSE, widget_opts.packing_width);
 
-  insertw->fit_checkbutton = lives_standard_check_button_new (_("_Insert to fit audio"),TRUE,LIVES_BOX(hbox),NULL);
+  insertw->fit_checkbutton = lives_standard_check_button_new(_("_Insert to fit audio"),TRUE,LIVES_BOX(hbox),NULL);
 
   lives_widget_set_sensitive(LIVES_WIDGET(insertw->fit_checkbutton),cfile->achans>0&&clipboard->achans==0);
 
-  add_hsep_to_box (LIVES_BOX (dialog_vbox));
+  add_hsep_to_box(LIVES_BOX(dialog_vbox));
 
-  table = lives_table_new (2, 3, FALSE);
-  lives_box_pack_start (LIVES_BOX (dialog_vbox), table, TRUE, TRUE, widget_opts.packing_height);
-  lives_table_set_col_spacings (LIVES_TABLE (table), widget_opts.packing_width*4);
-  lives_table_set_row_spacings (LIVES_TABLE (table), widget_opts.packing_height);
+  table = lives_table_new(2, 3, FALSE);
+  lives_box_pack_start(LIVES_BOX(dialog_vbox), table, TRUE, TRUE, widget_opts.packing_height);
+  lives_table_set_col_spacings(LIVES_TABLE(table), widget_opts.packing_width*4);
+  lives_table_set_row_spacings(LIVES_TABLE(table), widget_opts.packing_height);
 
 
-  hbox = lives_hbox_new (FALSE, 0);
+  hbox = lives_hbox_new(FALSE, 0);
 
-  radiobutton=lives_standard_radio_button_new((tmp=g_strdup(_ ("Insert _before selection"))),
-					      TRUE,radiobutton1_group,LIVES_BOX(hbox),
-					      (tmp2=g_strdup(_("Insert clipboard before selected frames"))));
+  radiobutton=lives_standard_radio_button_new((tmp=lives_strdup(_("Insert _before selection"))),
+              TRUE,radiobutton1_group,LIVES_BOX(hbox),
+              (tmp2=lives_strdup(_("Insert clipboard before selected frames"))));
 
-  g_free(tmp); g_free(tmp2);
+  lives_free(tmp);
+  lives_free(tmp2);
 
-  radiobutton1_group = lives_radio_button_get_group (LIVES_RADIO_BUTTON (radiobutton));
+  radiobutton1_group = lives_radio_button_get_group(LIVES_RADIO_BUTTON(radiobutton));
 
-  lives_table_attach (LIVES_TABLE (table), hbox, 0, 1, 0, 1,
-                    (LiVESAttachOptions) (LIVES_FILL),
-                    (LiVESAttachOptions) (0), 0, 0);
+  lives_table_attach(LIVES_TABLE(table), hbox, 0, 1, 0, 1,
+                     (LiVESAttachOptions)(LIVES_FILL),
+                     (LiVESAttachOptions)(0), 0, 0);
 
   if (cfile->frames==0) {
-    lives_widget_set_sensitive (radiobutton, FALSE);
+    lives_widget_set_sensitive(radiobutton, FALSE);
   }
 
-  hbox = lives_hbox_new (FALSE, 0);
+  hbox = lives_hbox_new(FALSE, 0);
 
-  radiobutton=lives_standard_radio_button_new((tmp=g_strdup(_("Insert _after selection"))),
-					      TRUE,radiobutton1_group,LIVES_BOX(hbox),
-					      (tmp2=g_strdup(_("Insert clipboard after selected frames"))));
+  radiobutton=lives_standard_radio_button_new((tmp=lives_strdup(_("Insert _after selection"))),
+              TRUE,radiobutton1_group,LIVES_BOX(hbox),
+              (tmp2=lives_strdup(_("Insert clipboard after selected frames"))));
 
-  lives_table_attach (LIVES_TABLE (table), hbox, 0, 1, 1, 2,
-                    (LiVESAttachOptions) (LIVES_FILL),
-                    (LiVESAttachOptions) (0), 0, 0);
+  lives_table_attach(LIVES_TABLE(table), hbox, 0, 1, 1, 2,
+                     (LiVESAttachOptions)(LIVES_FILL),
+                     (LiVESAttachOptions)(0), 0, 0);
 
   lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(radiobutton),mainw->insert_after);
 
 
-  hbox = lives_hbox_new (FALSE, 0);
+  hbox = lives_hbox_new(FALSE, 0);
 
   insertw->with_sound=lives_standard_radio_button_new(_("Insert _with sound"),
-						      TRUE,radiobutton2_group,LIVES_BOX(hbox),NULL);
-  radiobutton2_group = lives_radio_button_get_group (LIVES_RADIO_BUTTON (insertw->with_sound));
+                      TRUE,radiobutton2_group,LIVES_BOX(hbox),NULL);
+  radiobutton2_group = lives_radio_button_get_group(LIVES_RADIO_BUTTON(insertw->with_sound));
 
 
-  lives_table_attach (LIVES_TABLE (table), hbox, 2, 3, 0, 1,
-                    (LiVESAttachOptions) (LIVES_FILL),
-                    (LiVESAttachOptions) (0), 0, 0);
+  lives_table_attach(LIVES_TABLE(table), hbox, 2, 3, 0, 1,
+                     (LiVESAttachOptions)(LIVES_FILL),
+                     (LiVESAttachOptions)(0), 0, 0);
 
   if (cfile->achans==0&&clipboard->achans==0) lives_widget_set_sensitive(insertw->with_sound,FALSE);
 
-  hbox = lives_hbox_new (FALSE, 0);
+  hbox = lives_hbox_new(FALSE, 0);
 
   insertw->without_sound=lives_standard_radio_button_new(_("Insert with_out sound"),
-							 TRUE,radiobutton2_group,LIVES_BOX(hbox),NULL);
+                         TRUE,radiobutton2_group,LIVES_BOX(hbox),NULL);
 
   lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(insertw->without_sound),
-				 !((cfile->achans>0||clipboard->achans>0)&&mainw->ccpd_with_sound));
+                                 !((cfile->achans>0||clipboard->achans>0)&&mainw->ccpd_with_sound));
 
-  lives_table_attach (LIVES_TABLE (table), hbox, 2, 3, 1, 2,
-                    (LiVESAttachOptions) (LIVES_FILL),
-                    (LiVESAttachOptions) (0), 0, 0);
+  lives_table_attach(LIVES_TABLE(table), hbox, 2, 3, 1, 2,
+                     (LiVESAttachOptions)(LIVES_FILL),
+                     (LiVESAttachOptions)(0), 0, 0);
 
-  lives_widget_set_sensitive (insertw->with_sound, clipboard->achans>0||cfile->achans>0);
-  lives_widget_set_sensitive (insertw->without_sound, clipboard->achans>0||cfile->achans>0);
+  lives_widget_set_sensitive(insertw->with_sound, clipboard->achans>0||cfile->achans>0);
+  lives_widget_set_sensitive(insertw->without_sound, clipboard->achans>0||cfile->achans>0);
 
-  vseparator = lives_vseparator_new ();
-  lives_table_attach (LIVES_TABLE (table), vseparator, 1, 2, 0, 1,
-                    (LiVESAttachOptions) (LIVES_EXPAND | LIVES_FILL),
-                    (LiVESAttachOptions) (LIVES_FILL), 0, 0);
+  vseparator = lives_vseparator_new();
+  lives_table_attach(LIVES_TABLE(table), vseparator, 1, 2, 0, 1,
+                     (LiVESAttachOptions)(LIVES_EXPAND | LIVES_FILL),
+                     (LiVESAttachOptions)(LIVES_FILL), 0, 0);
 
-  vseparator = lives_vseparator_new ();
-  lives_table_attach (LIVES_TABLE (table), vseparator, 1, 2, 1, 2,
-                    (LiVESAttachOptions) (LIVES_FILL),
-                    (LiVESAttachOptions) (LIVES_FILL), 0, 0);
+  vseparator = lives_vseparator_new();
+  lives_table_attach(LIVES_TABLE(table), vseparator, 1, 2, 1, 2,
+                     (LiVESAttachOptions)(LIVES_FILL),
+                     (LiVESAttachOptions)(LIVES_FILL), 0, 0);
 
-  dialog_action_area = lives_dialog_get_action_area(LIVES_DIALOG (insertw->insert_dialog));
+  dialog_action_area = lives_dialog_get_action_area(LIVES_DIALOG(insertw->insert_dialog));
 
-  lives_button_box_set_layout (LIVES_BUTTON_BOX (dialog_action_area), LIVES_BUTTONBOX_END);
+  lives_button_box_set_layout(LIVES_BUTTON_BOX(dialog_action_area), LIVES_BUTTONBOX_END);
 
-  cancelbutton = lives_button_new_from_stock (LIVES_STOCK_CANCEL);
-  lives_dialog_add_action_widget (LIVES_DIALOG (insertw->insert_dialog), cancelbutton, LIVES_RESPONSE_CANCEL);
+  cancelbutton = lives_button_new_from_stock(LIVES_STOCK_CANCEL);
+  lives_dialog_add_action_widget(LIVES_DIALOG(insertw->insert_dialog), cancelbutton, LIVES_RESPONSE_CANCEL);
 
-  okbutton = lives_button_new_from_stock (LIVES_STOCK_OK);
-  lives_dialog_add_action_widget (LIVES_DIALOG (insertw->insert_dialog), okbutton, LIVES_RESPONSE_OK);
-  lives_widget_set_can_focus_and_default (okbutton);
+  okbutton = lives_button_new_from_stock(LIVES_STOCK_OK);
+  lives_dialog_add_action_widget(LIVES_DIALOG(insertw->insert_dialog), okbutton, LIVES_RESPONSE_OK);
+  lives_widget_set_can_focus_and_default(okbutton);
   lives_widget_grab_default(okbutton);
   lives_widget_grab_focus(okbutton);
 
-  lives_signal_connect (LIVES_GUI_OBJECT (insertw->with_sound), LIVES_WIDGET_TOGGLED_EVENT,
-		    LIVES_GUI_CALLBACK (on_insertwsound_toggled),
-		    NULL);
-  lives_signal_connect (LIVES_GUI_OBJECT (radiobutton), LIVES_WIDGET_TOGGLED_EVENT,
-		    LIVES_GUI_CALLBACK (on_boolean_toggled),
-		    &mainw->insert_after);
-  lives_signal_connect (LIVES_GUI_OBJECT (cancelbutton), LIVES_WIDGET_CLICKED_EVENT,
-		    LIVES_GUI_CALLBACK (lives_general_button_clicked),
-		    insertw);
-  lives_signal_connect (LIVES_GUI_OBJECT (okbutton), LIVES_WIDGET_CLICKED_EVENT,
-		    LIVES_GUI_CALLBACK (on_insert_activate),
-		    NULL);
-  lives_signal_connect (LIVES_GUI_OBJECT (insertw->fit_checkbutton), LIVES_WIDGET_TOGGLED_EVENT,
-		    LIVES_GUI_CALLBACK (on_insfitaudio_toggled),
-		    NULL);
-  lives_signal_connect_after (LIVES_GUI_OBJECT (insertw->spinbutton_times), "value_changed",
-			  LIVES_GUI_CALLBACK (on_spin_value_changed),
-			  GINT_TO_POINTER (1));
-
-  lives_widget_add_accelerator (cancelbutton, LIVES_WIDGET_CLICKED_EVENT, accel_group,
-                              LIVES_KEY_Escape,  (LiVESXModifierType)0, (LiVESAccelFlags)0);
-
-  lives_widget_add_accelerator (okbutton, LIVES_WIDGET_CLICKED_EVENT, accel_group,
-                              LIVES_KEY_Return,  (LiVESXModifierType)0, (LiVESAccelFlags)0);
+  lives_signal_connect(LIVES_GUI_OBJECT(insertw->with_sound), LIVES_WIDGET_TOGGLED_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_insertwsound_toggled),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(radiobutton), LIVES_WIDGET_TOGGLED_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_boolean_toggled),
+                       &mainw->insert_after);
+  lives_signal_connect(LIVES_GUI_OBJECT(cancelbutton), LIVES_WIDGET_CLICKED_SIGNAL,
+                       LIVES_GUI_CALLBACK(lives_general_button_clicked),
+                       insertw);
+  lives_signal_connect(LIVES_GUI_OBJECT(okbutton), LIVES_WIDGET_CLICKED_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_insert_activate),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(insertw->fit_checkbutton), LIVES_WIDGET_TOGGLED_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_insfitaudio_toggled),
+                       NULL);
+  lives_signal_connect_after(LIVES_GUI_OBJECT(insertw->spinbutton_times), LIVES_WIDGET_VALUE_CHANGED_SIGNAL,
+                             LIVES_GUI_CALLBACK(on_spin_value_changed),
+                             LIVES_INT_TO_POINTER(1));
+
+  lives_widget_add_accelerator(cancelbutton, LIVES_WIDGET_CLICKED_SIGNAL, accel_group,
+                               LIVES_KEY_Escape, (LiVESXModifierType)0, (LiVESAccelFlags)0);
+
+  lives_widget_add_accelerator(okbutton, LIVES_WIDGET_CLICKED_SIGNAL, accel_group,
+                               LIVES_KEY_Return, (LiVESXModifierType)0, (LiVESAccelFlags)0);
 
   lives_widget_show_all(insertw->insert_dialog);
 
@@ -1079,7 +968,7 @@
 
 
 
-LiVESWidget *create_opensel_dialog (void) {
+LiVESWidget *create_opensel_dialog(void) {
   LiVESWidget *opensel_dialog;
   LiVESWidget *dialog_vbox;
   LiVESWidget *vbox;
@@ -1090,7 +979,11 @@
   LiVESWidget *cancelbutton;
   LiVESWidget *okbutton;
 
-  opensel_dialog = lives_standard_dialog_new (_("LiVES: - Open Selection"),FALSE);
+  boolean no_gui=widget_opts.no_gui;
+
+  widget_opts.no_gui=TRUE; // work around bugs in gtk+
+  opensel_dialog = lives_standard_dialog_new(_("LiVES: - Open Selection"),FALSE,-1,-1);
+  widget_opts.no_gui=no_gui;
 
   if (prefs->show_gui) {
     if (mainw->multitrack==NULL) lives_window_set_transient_for(LIVES_WINDOW(opensel_dialog),LIVES_WINDOW(mainw->LiVES));
@@ -1099,67 +992,69 @@
 
 
   dialog_vbox = lives_dialog_get_content_area(LIVES_DIALOG(opensel_dialog));
- 
-  vbox = lives_vbox_new (FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (dialog_vbox), vbox, TRUE, TRUE, 0);
 
-  table = lives_table_new (2, 2, FALSE);
-  lives_box_pack_start (LIVES_BOX (vbox), table, TRUE, TRUE, widget_opts.packing_height);
+  vbox = lives_vbox_new(FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(dialog_vbox), vbox, TRUE, TRUE, 0);
+
+  table = lives_table_new(2, 2, FALSE);
+  lives_box_pack_start(LIVES_BOX(vbox), table, TRUE, TRUE, widget_opts.packing_height);
 
-  lives_table_set_row_spacings (LIVES_TABLE (table), widget_opts.packing_height*2);
+  lives_table_set_row_spacings(LIVES_TABLE(table), widget_opts.packing_height*2);
 
-  label = lives_standard_label_new (_("Selection start time (sec)"));
-  lives_table_attach (LIVES_TABLE (table), label, 0, 1, 0, 1,
-                    (LiVESAttachOptions) (LIVES_EXPAND | LIVES_FILL),
-                    (LiVESAttachOptions) (0), 0, 0);
-  lives_label_set_halignment (LIVES_LABEL(label), 0.5);
+  label = lives_standard_label_new(_("Selection start time (sec)"));
+  lives_table_attach(LIVES_TABLE(table), label, 0, 1, 0, 1,
+                     (LiVESAttachOptions)(LIVES_EXPAND | LIVES_FILL),
+                     (LiVESAttachOptions)(0), 0, 0);
+  lives_label_set_halignment(LIVES_LABEL(label), 0.5);
 
-  label = lives_standard_label_new (_("Number of frames to open"));
-  lives_table_attach (LIVES_TABLE (table), label, 0, 1, 1, 2,
-                    (LiVESAttachOptions) (LIVES_EXPAND | LIVES_FILL),
-                    (LiVESAttachOptions) (0), 0, 0);
-  lives_label_set_halignment (LIVES_LABEL(label), 0.5);
+  label = lives_standard_label_new(_("Number of frames to open"));
+  lives_table_attach(LIVES_TABLE(table), label, 0, 1, 1, 2,
+                     (LiVESAttachOptions)(LIVES_EXPAND | LIVES_FILL),
+                     (LiVESAttachOptions)(0), 0, 0);
+  lives_label_set_halignment(LIVES_LABEL(label), 0.5);
 
-  spinbutton = lives_standard_spin_button_new (NULL, FALSE, 0., 0., 1000000000., 1., 10., 2, NULL, NULL);
+  spinbutton = lives_standard_spin_button_new(NULL, FALSE, 0., 0., 1000000000., 1., 10., 2, NULL, NULL);
 
-  lives_signal_connect_after (LIVES_GUI_OBJECT (spinbutton), "value_changed",
-                            LIVES_GUI_CALLBACK (on_spin_value_changed),
-                            GINT_TO_POINTER (1));
+  lives_signal_connect_after(LIVES_GUI_OBJECT(spinbutton), LIVES_WIDGET_VALUE_CHANGED_SIGNAL,
+                             LIVES_GUI_CALLBACK(on_spin_value_changed),
+                             LIVES_INT_TO_POINTER(1));
 
-  lives_table_attach (LIVES_TABLE (table), spinbutton, 1, 2, 0, 1,
-                    (LiVESAttachOptions) (LIVES_EXPAND | LIVES_FILL),
-                    (LiVESAttachOptions) (LIVES_EXPAND), widget_opts.packing_height*4+2, 0);
+  lives_table_attach(LIVES_TABLE(table), spinbutton, 1, 2, 0, 1,
+                     (LiVESAttachOptions)(LIVES_EXPAND | LIVES_FILL),
+                     (LiVESAttachOptions)(LIVES_EXPAND), widget_opts.packing_height*4+2, 0);
 
 
-  spinbutton = lives_standard_spin_button_new (NULL,FALSE,1000.,1.,(double)G_MAXINT, 1., 10., 0, NULL, NULL);
+  spinbutton = lives_standard_spin_button_new(NULL,FALSE,1000.,1.,(double)LIVES_MAXINT, 1., 10., 0, NULL, NULL);
 
-  lives_signal_connect_after (LIVES_GUI_OBJECT (spinbutton), "value_changed",
-			  LIVES_GUI_CALLBACK (on_spin_value_changed),
-			  GINT_TO_POINTER (2));
+  lives_signal_connect_after(LIVES_GUI_OBJECT(spinbutton), LIVES_WIDGET_VALUE_CHANGED_SIGNAL,
+                             LIVES_GUI_CALLBACK(on_spin_value_changed),
+                             LIVES_INT_TO_POINTER(2));
 
-  lives_table_attach (LIVES_TABLE (table), spinbutton, 1, 2, 1, 2,
-                    (LiVESAttachOptions) (LIVES_EXPAND | LIVES_FILL),
-                    (LiVESAttachOptions) (LIVES_EXPAND), widget_opts.packing_height*4+2, 0);
+  lives_table_attach(LIVES_TABLE(table), spinbutton, 1, 2, 1, 2,
+                     (LiVESAttachOptions)(LIVES_EXPAND | LIVES_FILL),
+                     (LiVESAttachOptions)(LIVES_EXPAND), widget_opts.packing_height*4+2, 0);
 
-  dialog_action_area = lives_dialog_get_action_area(LIVES_DIALOG (opensel_dialog));
-  lives_button_box_set_layout (LIVES_BUTTON_BOX (dialog_action_area), LIVES_BUTTONBOX_END);
+  dialog_action_area = lives_dialog_get_action_area(LIVES_DIALOG(opensel_dialog));
+  lives_button_box_set_layout(LIVES_BUTTON_BOX(dialog_action_area), LIVES_BUTTONBOX_END);
 
-  cancelbutton = lives_button_new_from_stock (LIVES_STOCK_CANCEL);
-  lives_dialog_add_action_widget (LIVES_DIALOG (opensel_dialog), cancelbutton, LIVES_RESPONSE_CANCEL);
+  cancelbutton = lives_button_new_from_stock(LIVES_STOCK_CANCEL);
+  lives_dialog_add_action_widget(LIVES_DIALOG(opensel_dialog), cancelbutton, LIVES_RESPONSE_CANCEL);
 
-  okbutton = lives_button_new_from_stock (LIVES_STOCK_OK);
-  lives_dialog_add_action_widget (LIVES_DIALOG (opensel_dialog), okbutton, LIVES_RESPONSE_OK);
-  lives_widget_set_can_focus_and_default (okbutton);
+  okbutton = lives_button_new_from_stock(LIVES_STOCK_OK);
+  lives_dialog_add_action_widget(LIVES_DIALOG(opensel_dialog), okbutton, LIVES_RESPONSE_OK);
+  lives_widget_set_can_focus_and_default(okbutton);
   lives_widget_grab_default(okbutton);
 
-  widget_add_preview (opensel_dialog, LIVES_BOX (dialog_vbox), GTK_BOX (dialog_vbox), GTK_BOX(dialog_vbox), 3);
+  widget_add_preview(opensel_dialog, LIVES_BOX(dialog_vbox), LIVES_BOX(dialog_vbox), LIVES_BOX(dialog_vbox), LIVES_PREVIEW_TYPE_RANGE);
+
+  lives_signal_connect(LIVES_GUI_OBJECT(cancelbutton), LIVES_WIDGET_CLICKED_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_cancel_opensel_clicked),
+                       NULL);
+
+  lives_signal_connect(LIVES_GUI_OBJECT(okbutton), LIVES_WIDGET_CLICKED_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_opensel_range_ok_clicked),
+                       NULL);
 
-  lives_signal_connect (LIVES_GUI_OBJECT (cancelbutton), LIVES_WIDGET_CLICKED_EVENT,
-		    LIVES_GUI_CALLBACK (on_cancel_opensel_clicked),
-		    NULL);
-  lives_signal_connect (LIVES_GUI_OBJECT (okbutton), LIVES_WIDGET_CLICKED_EVENT,
-		    LIVES_GUI_CALLBACK (on_opensel_range_ok_clicked),
-		    NULL);
 
   lives_widget_show_all(opensel_dialog);
 
@@ -1170,7 +1065,7 @@
 
 
 
-_entryw* create_location_dialog (int type) {
+_entryw *create_location_dialog(int type) {
   // type 1 is open location
   // type 2 is open youtube: - 3 fields:= URL, directory, file name
 
@@ -1183,22 +1078,22 @@
   LiVESWidget *hbox;
   LiVESWidget *buttond;
 
-  _entryw *locw=(_entryw*)(g_malloc(sizeof(_entryw)));
+  _entryw *locw=(_entryw *)(lives_malloc(sizeof(_entryw)));
 
-  LiVESAccelGroup *accel_group=LIVES_ACCEL_GROUP(lives_accel_group_new ());
+  LiVESAccelGroup *accel_group=LIVES_ACCEL_GROUP(lives_accel_group_new());
 
-  gchar *title,*tmp,*tmp2;
+  char *title,*tmp,*tmp2;
 
-  if (type==1) 
-    title=g_strdup(_("LiVES: - Open Location"));
-  else 
-    title=g_strdup(_("LiVES: - Open Youtube Clip"));
+  if (type==1)
+    title=lives_strdup(_("LiVES: - Open Location"));
+  else
+    title=lives_strdup(_("LiVES: - Open Youtube Clip"));
 
-  locw->dialog = lives_standard_dialog_new (title,FALSE);
+  locw->dialog = lives_standard_dialog_new(title,FALSE,-1,-1);
 
-  g_free(title);
+  lives_free(title);
 
-  lives_window_add_accel_group (LIVES_WINDOW (locw->dialog), accel_group);
+  lives_window_add_accel_group(LIVES_WINDOW(locw->dialog), accel_group);
 
   if (prefs->show_gui) {
     if (mainw->multitrack==NULL) lives_window_set_transient_for(LIVES_WINDOW(locw->dialog),LIVES_WINDOW(mainw->LiVES));
@@ -1210,114 +1105,116 @@
   widget_opts.justify=LIVES_JUSTIFY_CENTER;
 
   if (type==1) {
-    label = lives_standard_label_new (_("\n\nTo open a stream, you must make sure that you have the correct libraries compiled in mplayer.\nAlso make sure you have set your bandwidth in Preferences|Streaming\n\n"));
-  }
-  else { 
-    label = lives_standard_label_new (_("\n\nTo open a clip from Youtube, LiVES will first download it with youtube-dl.\nPlease make sure you have the latest version of that tool installed.\n\n"));
+    label = lives_standard_label_new(
+              _("\n\nTo open a stream, you must make sure that you have the correct libraries compiled in mplayer.\nAlso make sure you have set your bandwidth in Preferences|Streaming\n\n"));
+  } else {
+    label = lives_standard_label_new(
+              _("\n\nTo open a clip from Youtube, LiVES will first download it with youtube-dl.\nPlease make sure you have the latest version of that tool installed.\n\n"));
+
+    lives_box_pack_start(LIVES_BOX(dialog_vbox), label, FALSE, FALSE, 0);
 
-    lives_box_pack_start (LIVES_BOX (dialog_vbox), label, FALSE, FALSE, 0);
-    
     label=lives_standard_label_new(_("Enter the URL of the clip below.\nE.g: http://www.youtube.com/watch?v=WCR6f6WzjP8\n\n"));
 
   }
 
   widget_opts.justify=LIVES_JUSTIFY_DEFAULT;
 
-  lives_box_pack_start (LIVES_BOX (dialog_vbox), label, FALSE, FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(dialog_vbox), label, FALSE, FALSE, 0);
 
-  hbox = lives_hbox_new (FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (dialog_vbox), hbox, TRUE, TRUE, widget_opts.packing_height*2);
+  hbox = lives_hbox_new(FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(dialog_vbox), hbox, TRUE, TRUE, widget_opts.packing_height*2);
 
-  locw->entry = lives_standard_entry_new (type==1?_ ("URL : "):_ ("Youtube URL : "),FALSE,"",79,32768,LIVES_BOX(hbox),NULL);
+  locw->entry = lives_standard_entry_new(type==1?_("URL : "):_("Youtube URL : "),FALSE,"",79,32768,LIVES_BOX(hbox),NULL);
 
   if (type==1) {
-    hbox=lives_hbox_new (FALSE, 0);
-    checkbutton = lives_standard_check_button_new ((tmp=g_strdup(_("Do not send bandwidth information"))),
-						   TRUE,LIVES_BOX(hbox),
-						   (tmp2=g_strdup(_("Try this setting if you are having problems getting a stream"))));
+    hbox=lives_hbox_new(FALSE, 0);
+    checkbutton = lives_standard_check_button_new((tmp=lives_strdup(_("Do not send bandwidth information"))),
+                  TRUE,LIVES_BOX(hbox),
+                  (tmp2=lives_strdup(_("Try this setting if you are having problems getting a stream"))));
 
-    g_free(tmp); g_free(tmp2);
+    lives_free(tmp);
+    lives_free(tmp2);
 
     lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(checkbutton),prefs->no_bandwidth);
-    
-    lives_box_pack_start (LIVES_BOX(dialog_vbox), hbox, FALSE, FALSE, widget_opts.packing_height*2);
-    
-    lives_signal_connect (LIVES_GUI_OBJECT (checkbutton), LIVES_WIDGET_TOGGLED_EVENT,
-		      LIVES_GUI_CALLBACK (on_boolean_toggled),
-		      &prefs->no_bandwidth);
-    
+
+    lives_box_pack_start(LIVES_BOX(dialog_vbox), hbox, FALSE, FALSE, widget_opts.packing_height*2);
+
+    lives_signal_connect(LIVES_GUI_OBJECT(checkbutton), LIVES_WIDGET_TOGGLED_SIGNAL,
+                         LIVES_GUI_CALLBACK(on_boolean_toggled),
+                         &prefs->no_bandwidth);
+
     add_deinterlace_checkbox(LIVES_BOX(dialog_vbox));
 
   }
 
   if (type==2) {
-    hbox=lives_hbox_new (FALSE, 0);
-    
+    hbox=lives_hbox_new(FALSE, 0);
+
     lives_box_pack_start(LIVES_BOX(dialog_vbox),hbox,TRUE,FALSE,widget_opts.packing_height);
 
-    locw->dir_entry = lives_standard_entry_new (_("Download to _Directory : "),TRUE,mainw->vid_dl_dir,
-						72.*widget_opts.scale,PATH_MAX,LIVES_BOX(hbox),NULL);
+    locw->dir_entry = lives_standard_entry_new(_("Download to _Directory : "),TRUE,mainw->vid_dl_dir,
+                      72.*widget_opts.scale,PATH_MAX,LIVES_BOX(hbox),NULL);
 
     lives_entry_set_editable(LIVES_ENTRY(locw->dir_entry),FALSE);
-    lives_entry_set_max_length(LIVES_ENTRY (locw->dir_entry),PATH_MAX);
+    lives_entry_set_max_length(LIVES_ENTRY(locw->dir_entry),PATH_MAX);
 
     // add dir, with filechooser button
-    buttond = lives_standard_file_button_new (TRUE,NULL);
-    lives_label_set_mnemonic_widget (LIVES_LABEL(widget_opts.last_label),buttond);
+    buttond = lives_standard_file_button_new(TRUE,NULL);
+    lives_label_set_mnemonic_widget(LIVES_LABEL(widget_opts.last_label),buttond);
     lives_box_pack_start(LIVES_BOX(hbox),buttond,FALSE,FALSE,widget_opts.packing_width);
 
 
-    add_fill_to_box (LIVES_BOX (hbox));
+    add_fill_to_box(LIVES_BOX(hbox));
+
+    hbox=lives_hbox_new(FALSE, 0);
 
-    hbox=lives_hbox_new (FALSE, 0);
-    
     lives_box_pack_start(LIVES_BOX(dialog_vbox),hbox,TRUE,FALSE,widget_opts.packing_height);
 
-    locw->name_entry = lives_standard_entry_new (_("Download _File Name : "),TRUE,"",
-						 74.*widget_opts.scale,PATH_MAX,LIVES_BOX(hbox),NULL);
+    locw->name_entry = lives_standard_entry_new(_("Download _File Name : "),TRUE,"",
+                       74.*widget_opts.scale,PATH_MAX,LIVES_BOX(hbox),NULL);
 
-    lives_signal_connect(buttond, LIVES_WIDGET_CLICKED_EVENT, LIVES_GUI_CALLBACK (on_filesel_button_clicked), (gpointer)locw->dir_entry);
+    lives_signal_connect(buttond, LIVES_WIDGET_CLICKED_SIGNAL, LIVES_GUI_CALLBACK(on_filesel_button_clicked), (livespointer)locw->dir_entry);
 
-    label=lives_standard_label_new (_(".webm"));
+    label=lives_standard_label_new(_(".webm"));
 
     lives_box_pack_start(LIVES_BOX(hbox),label,FALSE,FALSE,widget_opts.packing_width);
-   }
+  }
 
 
 
-  dialog_action_area = lives_dialog_get_action_area(LIVES_DIALOG (locw->dialog));
-  lives_widget_show (dialog_action_area);
-  lives_button_box_set_layout (LIVES_BUTTON_BOX (dialog_action_area), LIVES_BUTTONBOX_END);
+  dialog_action_area = lives_dialog_get_action_area(LIVES_DIALOG(locw->dialog));
+  lives_widget_show(dialog_action_area);
+  lives_button_box_set_layout(LIVES_BUTTON_BOX(dialog_action_area), LIVES_BUTTONBOX_END);
 
-  cancelbutton = lives_button_new_from_stock (LIVES_STOCK_CANCEL);
-  lives_widget_show (cancelbutton);
-  lives_dialog_add_action_widget (LIVES_DIALOG (locw->dialog), cancelbutton, LIVES_RESPONSE_CANCEL);
-  lives_widget_set_can_focus_and_default (cancelbutton);
+  cancelbutton = lives_button_new_from_stock(LIVES_STOCK_CANCEL);
+  lives_widget_show(cancelbutton);
+  lives_dialog_add_action_widget(LIVES_DIALOG(locw->dialog), cancelbutton, LIVES_RESPONSE_CANCEL);
+  lives_widget_set_can_focus_and_default(cancelbutton);
 
-  okbutton = lives_button_new_from_stock (LIVES_STOCK_OK);
-  lives_widget_show (okbutton);
-  lives_dialog_add_action_widget (LIVES_DIALOG (locw->dialog), okbutton, LIVES_RESPONSE_OK);
-  lives_widget_set_can_focus_and_default (okbutton);
-  lives_widget_grab_default (okbutton);
+  okbutton = lives_button_new_from_stock(LIVES_STOCK_OK);
+  lives_widget_show(okbutton);
+  lives_dialog_add_action_widget(LIVES_DIALOG(locw->dialog), okbutton, LIVES_RESPONSE_OK);
+  lives_widget_set_can_focus_and_default(okbutton);
+  lives_widget_grab_default(okbutton);
 
 
-  lives_signal_connect (LIVES_GUI_OBJECT (cancelbutton), LIVES_WIDGET_CLICKED_EVENT,
-		    LIVES_GUI_CALLBACK (lives_general_button_clicked),
-		    locw);
+  lives_signal_connect(LIVES_GUI_OBJECT(cancelbutton), LIVES_WIDGET_CLICKED_SIGNAL,
+                       LIVES_GUI_CALLBACK(lives_general_button_clicked),
+                       locw);
 
-  if (type==1) 
-    lives_signal_connect (LIVES_GUI_OBJECT (okbutton), LIVES_WIDGET_CLICKED_EVENT,
-		      LIVES_GUI_CALLBACK (on_location_select),
-		      NULL);
+  if (type==1)
+    lives_signal_connect(LIVES_GUI_OBJECT(okbutton), LIVES_WIDGET_CLICKED_SIGNAL,
+                         LIVES_GUI_CALLBACK(on_location_select),
+                         NULL);
 
-  else if (type==2) 
-    lives_signal_connect (LIVES_GUI_OBJECT (okbutton), LIVES_WIDGET_CLICKED_EVENT,
-		      LIVES_GUI_CALLBACK (on_utube_select),
-		      NULL);
+  else if (type==2)
+    lives_signal_connect(LIVES_GUI_OBJECT(okbutton), LIVES_WIDGET_CLICKED_SIGNAL,
+                         LIVES_GUI_CALLBACK(on_utube_select),
+                         NULL);
 
 
-  lives_widget_add_accelerator (cancelbutton, LIVES_WIDGET_CLICKED_EVENT, accel_group,
-                              LIVES_KEY_Escape, (LiVESXModifierType)0, (LiVESAccelFlags)0);
+  lives_widget_add_accelerator(cancelbutton, LIVES_WIDGET_CLICKED_SIGNAL, accel_group,
+                               LIVES_KEY_Escape, (LiVESXModifierType)0, (LiVESAccelFlags)0);
 
   lives_widget_show_all(locw->dialog);
 
@@ -1326,7 +1223,7 @@
 
 #define RW_ENTRY_DISPWIDTH 40
 
-_entryw* create_rename_dialog (int type) {
+_entryw *create_rename_dialog(int type) {
   // type 1 = rename clip in menu
   // type 2 = save clip set
   // type 3 = reload clip set
@@ -1347,100 +1244,91 @@
   LiVESWidget *dirbutton1;
   LiVESWidget *dirimage1;
 
-  LiVESAccelGroup *accel_group=LIVES_ACCEL_GROUP(lives_accel_group_new ());
+  LiVESAccelGroup *accel_group=LIVES_ACCEL_GROUP(lives_accel_group_new());
 
-  gchar *title=NULL;
+  char *title=NULL;
 
-  _entryw *renamew=(_entryw*)(g_malloc(sizeof(_entryw)));
+  _entryw *renamew=(_entryw *)(lives_malloc(sizeof(_entryw)));
 
   renamew->setlist=NULL;
 
   if (type==1) {
-    title=g_strdup(_("LiVES: - Rename Clip"));
-  }
-  else if (type==2||type==4||type==5) {
-    title=g_strdup(_("LiVES: - Enter Set Name"));
-  }
-  else if (type==3) {
-    title=g_strdup(_("LiVES: - Enter a Set Name to Reload"));
-  }
-  else if (type==6) {
-    title=g_strdup(_("LiVES: - Choose a Working Directory"));
-  }
-  else if (type==7) {
-    title=g_strdup(_("LiVES: - Rename Current Track"));
+    title=lives_strdup(_("LiVES: - Rename Clip"));
+  } else if (type==2||type==4||type==5) {
+    title=lives_strdup(_("LiVES: - Enter Set Name to Save as"));
+  } else if (type==3) {
+    title=lives_strdup(_("LiVES: - Enter a Set Name to Reload"));
+  } else if (type==6) {
+    title=lives_strdup(_("LiVES: - Choose a Working Directory"));
+  } else if (type==7) {
+    title=lives_strdup(_("LiVES: - Rename Current Track"));
   }
 
-  renamew->dialog = lives_standard_dialog_new (title,FALSE);
+  renamew->dialog = lives_standard_dialog_new(title,FALSE,-1,-1);
 
-  lives_window_add_accel_group (LIVES_WINDOW (renamew->dialog), accel_group);
+  lives_window_add_accel_group(LIVES_WINDOW(renamew->dialog), accel_group);
 
   if (prefs->show_gui) {
     if (mainw->multitrack==NULL) {
       if (mainw->is_ready) {
-	lives_window_set_transient_for(LIVES_WINDOW(renamew->dialog),LIVES_WINDOW(mainw->LiVES));
+        lives_window_set_transient_for(LIVES_WINDOW(renamew->dialog),LIVES_WINDOW(mainw->LiVES));
       }
-    }
-    else lives_window_set_transient_for(LIVES_WINDOW(renamew->dialog),LIVES_WINDOW(mainw->multitrack->window));
+    } else lives_window_set_transient_for(LIVES_WINDOW(renamew->dialog),LIVES_WINDOW(mainw->multitrack->window));
   }
 
   dialog_vbox = lives_dialog_get_content_area(LIVES_DIALOG(renamew->dialog));
 
   if (type==4) {
-    label = lives_standard_label_new 
-      (_("You need to enter a name for the current clip set.\nThis will allow you reload the layout with the same clips later.\nPlease enter the set name you wish to use.\nLiVES will remind you to save the clip set later when you try to exit.\n"));
-    lives_box_pack_start (LIVES_BOX (dialog_vbox), label, FALSE, FALSE, 0);
+    label = lives_standard_label_new
+            (_("You need to enter a name for the current clip set.\nThis will allow you reload the layout with the same clips later.\nPlease enter the set name you wish to use.\nLiVES will remind you to save the clip set later when you try to exit.\n"));
+    lives_box_pack_start(LIVES_BOX(dialog_vbox), label, FALSE, FALSE, 0);
   }
 
   if (type==5) {
-    label = lives_standard_label_new 
-      (_("In order to export this project, you must enter a name for this clip set.\nThis will also be used for the project name.\n"));
-    lives_box_pack_start (LIVES_BOX (dialog_vbox), label, FALSE, FALSE, 0);
+    label = lives_standard_label_new
+            (_("In order to export this project, you must enter a name for this clip set.\nThis will also be used for the project name.\n"));
+    lives_box_pack_start(LIVES_BOX(dialog_vbox), label, FALSE, FALSE, 0);
   }
 
 
   if (type==6) {
-    label = lives_standard_label_new 
-      (_("Welcome to LiVES !\nThis startup wizard will guide you through the\ninitial install so that you can get the most from this application.\n"));
-    lives_box_pack_start (LIVES_BOX (dialog_vbox), label, FALSE, FALSE, 0);
+    label = lives_standard_label_new
+            (_("Welcome to LiVES !\nThis startup wizard will guide you through the\ninitial install so that you can get the most from this application.\n"));
+    lives_box_pack_start(LIVES_BOX(dialog_vbox), label, FALSE, FALSE, 0);
 
-    label = lives_standard_label_new 
-      (_("\nFirst of all you need to choose a working directory for LiVES.\nThis should be a directory with plenty of disk space available.\n"));
-    lives_box_pack_start (LIVES_BOX (dialog_vbox), label, FALSE, FALSE, 0);
+    label = lives_standard_label_new
+            (_("\nFirst of all you need to choose a working directory for LiVES.\nThis should be a directory with plenty of disk space available.\n"));
+    lives_box_pack_start(LIVES_BOX(dialog_vbox), label, FALSE, FALSE, 0);
   }
 
 
-  hbox = lives_hbox_new (FALSE, 0);
+  hbox = lives_hbox_new(FALSE, 0);
 
   if (type==3) {
-    lives_box_pack_start (LIVES_BOX (dialog_vbox), hbox, TRUE, FALSE, widget_opts.packing_height*4);
-  }
-  else if (type!=6&&type!=7&&type!=1) {
-    lives_box_pack_start (LIVES_BOX (dialog_vbox), hbox, TRUE, TRUE, widget_opts.packing_height*2);
-  }
-  else {
-    lives_box_pack_start (LIVES_BOX (dialog_vbox), hbox, TRUE, TRUE, widget_opts.packing_height*4);
+    lives_box_pack_start(LIVES_BOX(dialog_vbox), hbox, TRUE, FALSE, widget_opts.packing_height*4);
+  } else if (type!=6&&type!=7&&type!=1) {
+    lives_box_pack_start(LIVES_BOX(dialog_vbox), hbox, TRUE, TRUE, widget_opts.packing_height*2);
+  } else {
+    lives_box_pack_start(LIVES_BOX(dialog_vbox), hbox, TRUE, TRUE, widget_opts.packing_height*4);
   }
 
 
   if (type==1||type==7) {
-    label = lives_standard_label_new (_("New name "));
-  }
-  else if (type==2||type==3||type==4||type==5) {
-    label = lives_standard_label_new (_("Set name "));
-  }
-  else {
-    label = lives_standard_label_new ("");
+    label = lives_standard_label_new(_("New name "));
+  } else if (type==2||type==3||type==4||type==5) {
+    label = lives_standard_label_new(_("Set name "));
+  } else {
+    label = lives_standard_label_new("");
   }
 
-  lives_box_pack_start (LIVES_BOX (hbox), label, FALSE, FALSE, widget_opts.packing_width*4);
+  lives_box_pack_start(LIVES_BOX(hbox), label, FALSE, FALSE, widget_opts.packing_width*4);
 
 
   if (type==3) {
 
     set_combo=lives_combo_new();
 
-    renamew->setlist=get_set_list(prefs->tmpdir);
+    renamew->setlist=get_set_list(prefs->tmpdir,TRUE);
 
     lives_combo_populate(LIVES_COMBO(set_combo),renamew->setlist);
 
@@ -1451,96 +1339,93 @@
       lives_entry_set_text(LIVES_ENTRY(renamew->entry),prefs->ar_clipset_name);
     }
 
-    lives_box_pack_start (LIVES_BOX (hbox), set_combo, TRUE, TRUE, 0);
+    lives_box_pack_start(LIVES_BOX(hbox), set_combo, TRUE, TRUE, 0);
 
     lives_entry_set_completion_from_list(LIVES_ENTRY(renamew->entry),renamew->setlist);
 
-  }
-  else {
+  } else {
+    char *tmp;
     renamew->entry = lives_entry_new();
-    lives_entry_set_max_length (LIVES_ENTRY(renamew->entry),type==6?PATH_MAX:type==7?16:128);
-    if (type==2&&strlen (mainw->set_name)) {
-      lives_entry_set_text (LIVES_ENTRY (renamew->entry),mainw->set_name);
+    lives_entry_set_max_length(LIVES_ENTRY(renamew->entry),type==6?PATH_MAX:type==7?16:128);
+    if (type==2&&strlen(mainw->set_name)) {
+      lives_entry_set_text(LIVES_ENTRY(renamew->entry),(tmp=F2U8(mainw->set_name)));
+      lives_free(tmp);
     }
     if (type==6) {
-      gchar *tmpdir;
-      if (prefs->startup_phase==-1) tmpdir=g_build_filename(capable->home_dir,LIVES_TMP_NAME,NULL);
-      else tmpdir=g_strdup(prefs->tmpdir);
-      lives_entry_set_text (LIVES_ENTRY (renamew->entry),tmpdir);
-      g_free(tmpdir);
+      char *tmpdir;
+      if (prefs->startup_phase==-1) tmpdir=lives_build_filename(capable->home_dir,LIVES_TMP_NAME,NULL);
+      else tmpdir=lives_strdup(prefs->tmpdir);
+      lives_entry_set_text(LIVES_ENTRY(renamew->entry),(tmp=F2U8(tmpdir)));
+      lives_free(tmp);
+      lives_free(tmpdir);
     }
-    lives_box_pack_start (LIVES_BOX (hbox), renamew->entry, TRUE, TRUE, 0);
+    lives_box_pack_start(LIVES_BOX(hbox), renamew->entry, TRUE, TRUE, 0);
   }
 
 
   if (type==6) {
-    dirbutton1 = lives_button_new ();
-    
-    dirimage1 = lives_image_new_from_stock (LIVES_STOCK_OPEN, LIVES_ICON_SIZE_BUTTON);
+    dirbutton1 = lives_button_new();
+
+    dirimage1 = lives_image_new_from_stock(LIVES_STOCK_OPEN, LIVES_ICON_SIZE_BUTTON);
 
-    lives_container_add (LIVES_CONTAINER (dirbutton1), dirimage1);
+    lives_container_add(LIVES_CONTAINER(dirbutton1), dirimage1);
 
-    lives_box_pack_start (LIVES_BOX (hbox), dirbutton1, FALSE, TRUE, widget_opts.packing_width);
-    lives_signal_connect(dirbutton1, LIVES_WIDGET_CLICKED_EVENT, LIVES_GUI_CALLBACK (on_filesel_complex_clicked),renamew->entry);
+    lives_box_pack_start(LIVES_BOX(hbox), dirbutton1, FALSE, TRUE, widget_opts.packing_width);
+    lives_signal_connect(dirbutton1, LIVES_WIDGET_CLICKED_SIGNAL, LIVES_GUI_CALLBACK(on_filesel_complex_clicked),renamew->entry);
 
   }
 
 
-  lives_entry_set_activates_default (LIVES_ENTRY (renamew->entry), TRUE);
-  lives_entry_set_width_chars (LIVES_ENTRY (renamew->entry),RW_ENTRY_DISPWIDTH);
+  lives_entry_set_activates_default(LIVES_ENTRY(renamew->entry), TRUE);
+  lives_entry_set_width_chars(LIVES_ENTRY(renamew->entry),RW_ENTRY_DISPWIDTH);
 
-  dialog_action_area = lives_dialog_get_action_area(LIVES_DIALOG (renamew->dialog));
+  dialog_action_area = lives_dialog_get_action_area(LIVES_DIALOG(renamew->dialog));
 
-  lives_button_box_set_layout (LIVES_BUTTON_BOX (dialog_action_area), LIVES_BUTTONBOX_END);
+  lives_button_box_set_layout(LIVES_BUTTON_BOX(dialog_action_area), LIVES_BUTTONBOX_END);
 
-  cancelbutton = lives_button_new_from_stock (LIVES_STOCK_CANCEL);
+  cancelbutton = lives_button_new_from_stock(LIVES_STOCK_CANCEL);
 
-  lives_dialog_add_action_widget (LIVES_DIALOG (renamew->dialog), cancelbutton, LIVES_RESPONSE_CANCEL);
-  lives_widget_set_can_focus_and_default (cancelbutton);
+  if (!(type==4&&!mainw->interactive)) {
+    lives_dialog_add_action_widget(LIVES_DIALOG(renamew->dialog), cancelbutton, LIVES_RESPONSE_CANCEL);
+    lives_widget_set_can_focus_and_default(cancelbutton);
 
-  lives_widget_add_accelerator (cancelbutton, LIVES_WIDGET_CLICKED_EVENT, accel_group,
-			      LIVES_KEY_Escape, (LiVESXModifierType)0, (LiVESAccelFlags)0);
+    lives_widget_add_accelerator(cancelbutton, LIVES_WIDGET_CLICKED_SIGNAL, accel_group,
+                                 LIVES_KEY_Escape, (LiVESXModifierType)0, (LiVESAccelFlags)0);
+  }
 
   if (type==6) {
-    okbutton = lives_button_new_from_stock (LIVES_STOCK_GO_FORWARD);
+    okbutton = lives_button_new_from_stock(LIVES_STOCK_GO_FORWARD);
     lives_button_set_label(LIVES_BUTTON(okbutton),_("_Next"));
-  }
-  else okbutton = lives_button_new_from_stock (LIVES_STOCK_OK);
+  } else okbutton = lives_button_new_from_stock(LIVES_STOCK_OK);
 
-  lives_dialog_add_action_widget (LIVES_DIALOG (renamew->dialog), okbutton, LIVES_RESPONSE_OK);
-  lives_widget_set_can_focus_and_default (okbutton);
-  lives_widget_grab_default (okbutton);
+  lives_dialog_add_action_widget(LIVES_DIALOG(renamew->dialog), okbutton, LIVES_RESPONSE_OK);
+  lives_widget_set_can_focus_and_default(okbutton);
+  lives_widget_grab_default(okbutton);
 
-  if (type!=4&&type!=2&&type!=5) {
-    lives_signal_connect (LIVES_GUI_OBJECT (cancelbutton), LIVES_WIDGET_CLICKED_EVENT,
-		      LIVES_GUI_CALLBACK (lives_general_button_clicked),
-		      renamew);
+  if (type!=4&&type!=2&&type!=5&&type!=3) {
+    lives_signal_connect(LIVES_GUI_OBJECT(cancelbutton), LIVES_WIDGET_CLICKED_SIGNAL,
+                         LIVES_GUI_CALLBACK(lives_general_button_clicked),
+                         renamew);
   }
 
   if (type==1) {
-    lives_signal_connect (LIVES_GUI_OBJECT (okbutton), LIVES_WIDGET_CLICKED_EVENT,
-		      LIVES_GUI_CALLBACK (on_rename_set_name),
-		      NULL);
+    lives_signal_connect(LIVES_GUI_OBJECT(okbutton), LIVES_WIDGET_CLICKED_SIGNAL,
+                         LIVES_GUI_CALLBACK(on_rename_set_name),
+                         NULL);
   }
-  else if (type==3) {
-    lives_signal_connect (LIVES_GUI_OBJECT (okbutton), LIVES_WIDGET_CLICKED_EVENT,
-		      LIVES_GUI_CALLBACK (on_load_set_ok),
-		      GINT_TO_POINTER(FALSE));
-  }
-
 
-  lives_widget_add_accelerator (cancelbutton, LIVES_WIDGET_CLICKED_EVENT, accel_group,
-                              LIVES_KEY_Escape, (LiVESXModifierType)0, (LiVESAccelFlags)0);
+  lives_widget_add_accelerator(cancelbutton, LIVES_WIDGET_CLICKED_SIGNAL, accel_group,
+                               LIVES_KEY_Escape, (LiVESXModifierType)0, (LiVESAccelFlags)0);
 
   lives_widget_show_all(renamew->dialog);
 
-  lives_widget_grab_focus (renamew->entry);
+  lives_widget_grab_focus(renamew->entry);
 
   return renamew;
 }
 
 
-void on_liveinp_advanced_clicked (LiVESButton *button, gpointer user_data) {
+void on_liveinp_advanced_clicked(LiVESButton *button, livespointer user_data) {
   lives_tvcardw_t *tvcardw=(lives_tvcardw_t *)(user_data);
 
   tvcardw->use_advanced=!tvcardw->use_advanced;
@@ -1548,8 +1433,7 @@
   if (tvcardw->use_advanced) {
     lives_widget_show(tvcardw->adv_vbox);
     lives_button_set_label(LIVES_BUTTON(tvcardw->advbutton),_("Use def_aults"));
-  }
-  else {
+  } else {
     lives_button_set_label(LIVES_BUTTON(tvcardw->advbutton),_("_Advanced"));
     lives_window_resize(LIVES_WINDOW(lives_widget_get_toplevel(tvcardw->adv_vbox)),4,40);
     lives_widget_hide(tvcardw->adv_vbox);
@@ -1560,15 +1444,14 @@
 }
 
 
-static void rb_tvcarddef_toggled(LiVESToggleButton *tbut, gpointer user_data) {
+static void rb_tvcarddef_toggled(LiVESToggleButton *tbut, livespointer user_data) {
   lives_tvcardw_t *tvcardw=(lives_tvcardw_t *)(user_data);
 
   if (!lives_toggle_button_get_active(tbut)) {
     lives_widget_set_sensitive(tvcardw->spinbuttonw,TRUE);
     lives_widget_set_sensitive(tvcardw->spinbuttonh,TRUE);
     lives_widget_set_sensitive(tvcardw->spinbuttonf,TRUE);
-  }
-  else {
+  } else {
     lives_widget_set_sensitive(tvcardw->spinbuttonw,FALSE);
     lives_widget_set_sensitive(tvcardw->spinbuttonh,FALSE);
     lives_widget_set_sensitive(tvcardw->spinbuttonf,FALSE);
@@ -1578,15 +1461,15 @@
 }
 
 
-static void after_dialog_combo_changed (LiVESWidget *combo, gpointer user_data) {
-  GList *list=(GList *)user_data;
-  gchar *etext=lives_combo_get_active_text(LIVES_COMBO(combo));
-  mainw->fx1_val=lives_list_index(list,etext);
-  g_free(etext);
+static void after_dialog_combo_changed(LiVESWidget *combo, livespointer user_data) {
+  LiVESList *list=(LiVESList *)user_data;
+  char *etext=lives_combo_get_active_text(LIVES_COMBO(combo));
+  mainw->fx1_val=lives_list_strcmp_index(list,etext);
+  lives_free(etext);
 }
 
 
-LiVESWidget *create_combo_dialog (int type, gpointer user_data) {
+LiVESWidget *create_combo_dialog(int type, livespointer user_data) {
   // create a dialog with combo box selector
 
   // type 1 == 1 combo box
@@ -1596,22 +1479,21 @@
   LiVESWidget *label;
   LiVESWidget *combo;
 
-  gchar *label_text=NULL,*title=NULL;
+  char *label_text=NULL,*title=NULL;
 
-  GList *list=(GList *)user_data;
+  LiVESList *list=(LiVESList *)user_data;
 
   if (type==1) {
-    title=g_strdup(_("LiVES:- Select input device"));
+    title=lives_strdup(_("LiVES:- Select input device"));
   }
 
-  combo_dialog = lives_standard_dialog_new (title,TRUE);
-  if (title!=NULL) g_free(title);
+  combo_dialog = lives_standard_dialog_new(title,TRUE,-1,-1);
+  if (title!=NULL) lives_free(title);
 
   if (prefs->show_gui) {
     if (type==1) {
       lives_window_set_transient_for(LIVES_WINDOW(combo_dialog),LIVES_WINDOW(mainw->LiVES));
-    }
-    else {
+    } else {
       lives_window_set_transient_for(LIVES_WINDOW(combo_dialog),LIVES_WINDOW(mainw->multitrack->window));
     }
   }
@@ -1619,25 +1501,25 @@
   dialog_vbox = lives_dialog_get_content_area(LIVES_DIALOG(combo_dialog));
 
   if (type==1) {
-    label_text=g_strdup(_("Select input device:"));
+    label_text=lives_strdup(_("Select input device:"));
   }
 
-  label = lives_standard_label_new (label_text);
-  if (label_text!=NULL) g_free(label_text);
+  label = lives_standard_label_new(label_text);
+  if (label_text!=NULL) lives_free(label_text);
 
-  lives_box_pack_start (LIVES_BOX (dialog_vbox), label, TRUE, TRUE, 0);
+  lives_box_pack_start(LIVES_BOX(dialog_vbox), label, TRUE, TRUE, 0);
 
   combo = lives_combo_new();
 
-  lives_entry_set_width_chars (LIVES_ENTRY (lives_combo_get_entry(LIVES_COMBO(combo))), 64);
+  lives_entry_set_width_chars(LIVES_ENTRY(lives_combo_get_entry(LIVES_COMBO(combo))), 64);
 
   lives_combo_populate(LIVES_COMBO(combo),list);
 
   lives_combo_set_active_index(LIVES_COMBO(combo), 0);
 
-  lives_signal_connect_after (G_OBJECT (combo), LIVES_WIDGET_CHANGED_EVENT, LIVES_GUI_CALLBACK (after_dialog_combo_changed), list);
+  lives_signal_connect_after(LIVES_WIDGET_OBJECT(combo), LIVES_WIDGET_CHANGED_SIGNAL, LIVES_GUI_CALLBACK(after_dialog_combo_changed), list);
 
-  lives_box_pack_start (LIVES_BOX (dialog_vbox), combo, TRUE, TRUE, widget_opts.packing_height*2);
+  lives_box_pack_start(LIVES_BOX(dialog_vbox), combo, TRUE, TRUE, widget_opts.packing_height*2);
 
   if (type==1) {
     add_deinterlace_checkbox(LIVES_BOX(dialog_vbox));
@@ -1650,7 +1532,7 @@
 }
 
 
-LiVESWidget* create_cdtrack_dialog (int type, gpointer user_data) {
+LiVESWidget *create_cdtrack_dialog(int type, livespointer user_data) {
   // general purpose dialog with label and up to 2 spinbuttons
 
   // type 0 = cd track
@@ -1675,126 +1557,113 @@
   LiVESWidget *cancelbutton;
   LiVESWidget *okbutton;
 
-  LiVESAccelGroup *accel_group=LIVES_ACCEL_GROUP(lives_accel_group_new ());
-  
-  GSList *radiobutton_group=NULL;
+  LiVESAccelGroup *accel_group=LIVES_ACCEL_GROUP(lives_accel_group_new());
+
+  LiVESSList *radiobutton_group=NULL;
+
+  char *label_text=NULL,*title;
 
-  gchar *label_text=NULL,*title;
- 
 
   if (type==0) {
-    title=g_strdup(_("LiVES:- Load CD Track"));
-  }
-  else if (type==1) {
-    title=g_strdup(_("LiVES:- Select DVD Title/Chapter"));
-  }
-  else if (type==2) {
-    title=g_strdup(_("LiVES:- Select VCD Title"));
-  }
-  else if (type==3) {
-    title=g_strdup(_("LiVES:- Change Maximum Visible Tracks"));
-  }
-  else {
-    title=g_strdup(_("LiVES:- Device details"));
+    title=lives_strdup(_("LiVES:- Load CD Track"));
+  } else if (type==1) {
+    title=lives_strdup(_("LiVES:- Select DVD Title/Chapter"));
+  } else if (type==2) {
+    title=lives_strdup(_("LiVES:- Select VCD Title"));
+  } else if (type==3) {
+    title=lives_strdup(_("LiVES:- Change Maximum Visible Tracks"));
+  } else {
+    title=lives_strdup(_("LiVES:- Device details"));
   }
 
-  cd_dialog = lives_standard_dialog_new (title,FALSE);
-  g_free(title);
+  cd_dialog = lives_standard_dialog_new(title,FALSE,-1,-1);
+  lives_free(title);
 
   //lives_window_set_default_size (LIVES_WINDOW (cd_dialog), 300, 240);
 
   if (prefs->show_gui) {
     if (type==0||type==1||type==2||type==4||type==5) {
       lives_window_set_transient_for(LIVES_WINDOW(cd_dialog),LIVES_WINDOW(mainw->LiVES));
-    }
-    else {
+    } else {
       lives_window_set_transient_for(LIVES_WINDOW(cd_dialog),LIVES_WINDOW(mainw->multitrack->window));
     }
   }
 
   dialog_vbox = lives_dialog_get_content_area(LIVES_DIALOG(cd_dialog));
 
-  hbox = lives_hbox_new (FALSE, widget_opts.packing_width*5);
-  lives_box_pack_start (LIVES_BOX (dialog_vbox), hbox, TRUE, TRUE, widget_opts.packing_height);
+  hbox = lives_hbox_new(FALSE, widget_opts.packing_width*5);
+  lives_box_pack_start(LIVES_BOX(dialog_vbox), hbox, TRUE, TRUE, widget_opts.packing_height);
 
   if (type==0) {
-    label_text=g_strdup_printf(_("Track to load (from %s)"),prefs->cdplay_device);
-  }
-  else if (type==1) {
-    label_text=g_strdup(_("DVD Title"));
-  }
-  else if (type==2) {
-    label_text=g_strdup(_("VCD Title"));
-  }
-  else if (type==3) {
-    label_text=g_strdup(_("Maximum number of tracks to display"));
-  }
-  else if (type==4) {
-    label_text=g_strdup(_("Device:        /dev/video"));
-  }
-  else if (type==5) {
-    label_text=g_strdup(_("Device:        fw:"));
+    label_text=lives_strdup_printf(_("Track to load (from %s)"),prefs->cdplay_device);
+  } else if (type==1) {
+    label_text=lives_strdup(_("DVD Title"));
+  } else if (type==2) {
+    label_text=lives_strdup(_("VCD Title"));
+  } else if (type==3) {
+    label_text=lives_strdup(_("Maximum number of tracks to display"));
+  } else if (type==4) {
+    label_text=lives_strdup(_("Device:        /dev/video"));
+  } else if (type==5) {
+    label_text=lives_strdup(_("Device:        fw:"));
   }
 
 
   if (type==0||type==1||type==2) {
-    spinbutton = lives_standard_spin_button_new (label_text,FALSE, mainw->fx1_val,
-						 1., 256., 1., 10., 0,
-						 LIVES_BOX(hbox),NULL);
-  }
-  else if (type==3) {
-    spinbutton = lives_standard_spin_button_new (label_text,FALSE, mainw->fx1_val,
-						 4., 8., 1., 1.,0,
-						 LIVES_BOX(hbox),NULL);
-  }
-  else {
-    spinbutton = lives_standard_spin_button_new (label_text,FALSE, 0.,
-						 0., 31., 1., 1., 0, 
-						 LIVES_BOX(hbox),NULL);
+    spinbutton = lives_standard_spin_button_new(label_text,FALSE, mainw->fx1_val,
+                 1., 256., 1., 10., 0,
+                 LIVES_BOX(hbox),NULL);
+  } else if (type==3) {
+    spinbutton = lives_standard_spin_button_new(label_text,FALSE, mainw->fx1_val,
+                 4., 8., 1., 1.,0,
+                 LIVES_BOX(hbox),NULL);
+  } else {
+    spinbutton = lives_standard_spin_button_new(label_text,FALSE, 0.,
+                 0., 31., 1., 1., 0,
+                 LIVES_BOX(hbox),NULL);
   }
 
-  g_free(label_text);
+  lives_free(label_text);
 
-  lives_signal_connect_after (LIVES_GUI_OBJECT (spinbutton), "value_changed",
-			  LIVES_GUI_CALLBACK (on_spin_value_changed),
-			  GINT_TO_POINTER (1));
+  lives_signal_connect_after(LIVES_GUI_OBJECT(spinbutton), LIVES_WIDGET_VALUE_CHANGED_SIGNAL,
+                             LIVES_GUI_CALLBACK(on_spin_value_changed),
+                             LIVES_INT_TO_POINTER(1));
 
 
   add_fill_to_box(LIVES_BOX(hbox));
 
   if (type==1||type==4) {
 
-    hbox = lives_hbox_new (FALSE, widget_opts.packing_width*5);
-    lives_box_pack_start (LIVES_BOX (dialog_vbox), hbox, TRUE, TRUE, widget_opts.packing_height);
+    hbox = lives_hbox_new(FALSE, widget_opts.packing_width*5);
+    lives_box_pack_start(LIVES_BOX(dialog_vbox), hbox, TRUE, TRUE, widget_opts.packing_height);
 
     if (type==1) {
-      spinbutton = lives_standard_spin_button_new (_("Chapter  "), FALSE, mainw->fx2_val,
-						   1., 1024., 1., 10., 0, 
-						   LIVES_BOX(hbox),NULL);
-    }
-    else {
-      spinbutton = lives_standard_spin_button_new (_("Channel  "), FALSE, 1.,
-						   1., 69., 1., 1., 0, 
-						   LIVES_BOX(hbox),NULL);
+      spinbutton = lives_standard_spin_button_new(_("Chapter  "), FALSE, mainw->fx2_val,
+                   1., 1024., 1., 10., 0,
+                   LIVES_BOX(hbox),NULL);
+    } else {
+      spinbutton = lives_standard_spin_button_new(_("Channel  "), FALSE, 1.,
+                   1., 69., 1., 1., 0,
+                   LIVES_BOX(hbox),NULL);
 
     }
 
-    lives_signal_connect_after (LIVES_GUI_OBJECT (spinbutton), "value_changed",
-			    LIVES_GUI_CALLBACK (on_spin_value_changed),
-			    GINT_TO_POINTER (2));
+    lives_signal_connect_after(LIVES_GUI_OBJECT(spinbutton), LIVES_WIDGET_VALUE_CHANGED_SIGNAL,
+                               LIVES_GUI_CALLBACK(on_spin_value_changed),
+                               LIVES_INT_TO_POINTER(2));
 
 
     if (type==1) {
-      hbox = lives_hbox_new (FALSE, widget_opts.packing_width*5);
-      lives_box_pack_start (LIVES_BOX (dialog_vbox), hbox, TRUE, TRUE, widget_opts.packing_height);
-      
-      spinbutton = lives_standard_spin_button_new (_("Audio ID  "), FALSE, mainw->fx3_val,
-						   128., 159., 1., 1., 0, 
-						   LIVES_BOX(hbox),NULL);
+      hbox = lives_hbox_new(FALSE, widget_opts.packing_width*5);
+      lives_box_pack_start(LIVES_BOX(dialog_vbox), hbox, TRUE, TRUE, widget_opts.packing_height);
 
-      lives_signal_connect_after (LIVES_GUI_OBJECT (spinbutton), "value_changed",
-			      LIVES_GUI_CALLBACK (on_spin_value_changed),
-			      GINT_TO_POINTER (3));
+      spinbutton = lives_standard_spin_button_new(_("Audio ID  "), FALSE, mainw->fx3_val,
+                   128., 159., 1., 1., 0,
+                   LIVES_BOX(hbox),NULL);
+
+      lives_signal_connect_after(LIVES_GUI_OBJECT(spinbutton), LIVES_WIDGET_VALUE_CHANGED_SIGNAL,
+                                 LIVES_GUI_CALLBACK(on_spin_value_changed),
+                                 LIVES_INT_TO_POINTER(3));
 
     }
   }
@@ -1806,157 +1675,155 @@
 
 
   if (type==4) {
-    GList *dlist=NULL;
-    GList *olist=NULL;
+    LiVESList *dlist=NULL;
+    LiVESList *olist=NULL;
 
-    tvcardw=(lives_tvcardw_t *)g_malloc(sizeof(lives_tvcardw_t));
+    tvcardw=(lives_tvcardw_t *)lives_malloc(sizeof(lives_tvcardw_t));
     tvcardw->use_advanced=FALSE;
 
-    dlist=g_list_append(dlist,(gpointer)"autodetect");
-    dlist=g_list_append(dlist,(gpointer)"v4l2");
-    dlist=g_list_append(dlist,(gpointer)"v4l");
-    dlist=g_list_append(dlist,(gpointer)"bsdbt848");
-    dlist=g_list_append(dlist,(gpointer)"dummy");
+    dlist=lives_list_append(dlist,(livespointer)"autodetect");
+    dlist=lives_list_append(dlist,(livespointer)"v4l2");
+    dlist=lives_list_append(dlist,(livespointer)"v4l");
+    dlist=lives_list_append(dlist,(livespointer)"bsdbt848");
+    dlist=lives_list_append(dlist,(livespointer)"dummy");
 
-    olist=g_list_append(olist,(gpointer)"autodetect");
-    olist=g_list_append(olist,(gpointer)"yv12");
-    olist=g_list_append(olist,(gpointer)"rgb32");
-    olist=g_list_append(olist,(gpointer)"rgb24");
-    olist=g_list_append(olist,(gpointer)"rgb16");
-    olist=g_list_append(olist,(gpointer)"rgb15");
-    olist=g_list_append(olist,(gpointer)"uyvy");
-    olist=g_list_append(olist,(gpointer)"yuy2");
-    olist=g_list_append(olist,(gpointer)"i420");
+    olist=lives_list_append(olist,(livespointer)"autodetect");
+    olist=lives_list_append(olist,(livespointer)"yv12");
+    olist=lives_list_append(olist,(livespointer)"rgb32");
+    olist=lives_list_append(olist,(livespointer)"rgb24");
+    olist=lives_list_append(olist,(livespointer)"rgb16");
+    olist=lives_list_append(olist,(livespointer)"rgb15");
+    olist=lives_list_append(olist,(livespointer)"uyvy");
+    olist=lives_list_append(olist,(livespointer)"yuy2");
+    olist=lives_list_append(olist,(livespointer)"i420");
 
 
     lives_box_set_spacing(LIVES_BOX(dialog_vbox),widget_opts.packing_height*2);
 
-    hbox = lives_hbox_new (FALSE, widget_opts.packing_width*5);
+    hbox = lives_hbox_new(FALSE, widget_opts.packing_width*5);
+
+    lives_box_pack_start(LIVES_BOX(dialog_vbox), hbox, FALSE, FALSE, widget_opts.packing_height*2);
 
-    lives_box_pack_start (LIVES_BOX (dialog_vbox), hbox, FALSE, FALSE, widget_opts.packing_height*2);
-    
     add_fill_to_box(LIVES_BOX(hbox));
 
-    tvcardw->advbutton = lives_button_new_with_mnemonic (_("_Advanced"));
+    tvcardw->advbutton = lives_button_new_with_mnemonic(_("_Advanced"));
+
+    lives_box_pack_start(LIVES_BOX(hbox), tvcardw->advbutton, TRUE, TRUE, widget_opts.packing_width*4);
 
-    lives_box_pack_start (LIVES_BOX (hbox), tvcardw->advbutton, TRUE, TRUE, widget_opts.packing_width*4);
-    
     add_fill_to_box(LIVES_BOX(hbox));
 
 
-    tvcardw->adv_vbox = lives_vbox_new (FALSE, widget_opts.packing_width*5);
-    lives_box_pack_start (LIVES_BOX (dialog_vbox), tvcardw->adv_vbox, TRUE, TRUE, widget_opts.packing_height*2);
-    
+    tvcardw->adv_vbox = lives_vbox_new(FALSE, widget_opts.packing_width*5);
+    lives_box_pack_start(LIVES_BOX(dialog_vbox), tvcardw->adv_vbox, TRUE, TRUE, widget_opts.packing_height*2);
+
 
     // add input, width, height, fps, driver and outfmt
 
 
-    hbox = lives_hbox_new (FALSE, 0);
-    lives_box_pack_start (LIVES_BOX (tvcardw->adv_vbox), hbox, TRUE, FALSE, 0);
+    hbox = lives_hbox_new(FALSE, 0);
+    lives_box_pack_start(LIVES_BOX(tvcardw->adv_vbox), hbox, TRUE, FALSE, 0);
+
+    tvcardw->spinbuttoni = lives_standard_spin_button_new(_("Input number"),FALSE,
+                           0.,0.,16.,1.,1.,0,
+                           LIVES_BOX(hbox),NULL);
 
-    tvcardw->spinbuttoni = lives_standard_spin_button_new (_("Input number"),FALSE,
-							   0.,0.,16.,1.,1.,0,
-							   LIVES_BOX(hbox),NULL);
-							   
 
-    hbox = lives_hbox_new (FALSE, 0);
-    lives_box_pack_start (LIVES_BOX (tvcardw->adv_vbox), hbox, TRUE, FALSE, 0);
+    hbox = lives_hbox_new(FALSE, 0);
+    lives_box_pack_start(LIVES_BOX(tvcardw->adv_vbox), hbox, TRUE, FALSE, 0);
 
-    tvcardw->radiobuttond = lives_standard_radio_button_new (_("Use default width, height and FPS"),FALSE,
-							     radiobutton_group,LIVES_BOX(hbox),NULL);
-    radiobutton_group = lives_radio_button_get_group (LIVES_RADIO_BUTTON (tvcardw->radiobuttond));
-    
-    lives_signal_connect_after (LIVES_GUI_OBJECT (tvcardw->radiobuttond), LIVES_WIDGET_TOGGLED_EVENT,
-			    LIVES_GUI_CALLBACK (rb_tvcarddef_toggled),
-			    (gpointer)tvcardw);
+    tvcardw->radiobuttond = lives_standard_radio_button_new(_("Use default width, height and FPS"),FALSE,
+                            radiobutton_group,LIVES_BOX(hbox),NULL);
+    radiobutton_group = lives_radio_button_get_group(LIVES_RADIO_BUTTON(tvcardw->radiobuttond));
 
-    hbox = lives_hbox_new (FALSE, 0);
-    lives_box_pack_start (LIVES_BOX (tvcardw->adv_vbox), hbox, TRUE, FALSE, 0);
+    lives_signal_connect_after(LIVES_GUI_OBJECT(tvcardw->radiobuttond), LIVES_WIDGET_TOGGLED_SIGNAL,
+                               LIVES_GUI_CALLBACK(rb_tvcarddef_toggled),
+                               (livespointer)tvcardw);
 
-    lives_standard_radio_button_new (NULL,FALSE,
-				     radiobutton_group,LIVES_BOX(hbox),NULL);
-    
-    tvcardw->spinbuttonw = lives_standard_spin_button_new (_("Width"),FALSE,
-							   640.,4.,4096.,2.,2.,0,
-							   LIVES_BOX(hbox),NULL);
+    hbox = lives_hbox_new(FALSE, 0);
+    lives_box_pack_start(LIVES_BOX(tvcardw->adv_vbox), hbox, TRUE, FALSE, 0);
+
+    lives_standard_radio_button_new(NULL,FALSE,
+                                    radiobutton_group,LIVES_BOX(hbox),NULL);
+
+    tvcardw->spinbuttonw = lives_standard_spin_button_new(_("Width"),FALSE,
+                           640.,4.,4096.,2.,2.,0,
+                           LIVES_BOX(hbox),NULL);
 
     lives_widget_set_sensitive(tvcardw->spinbuttonw,FALSE);
 
-    tvcardw->spinbuttonh = lives_standard_spin_button_new (_("Height"),FALSE,
-							   480.,4.,4096.,2.,2.,0,
-							   LIVES_BOX(hbox),NULL);
+    tvcardw->spinbuttonh = lives_standard_spin_button_new(_("Height"),FALSE,
+                           480.,4.,4096.,2.,2.,0,
+                           LIVES_BOX(hbox),NULL);
 
     lives_widget_set_sensitive(tvcardw->spinbuttonh,FALSE);
-    
-    tvcardw->spinbuttonf = lives_standard_spin_button_new (_("FPS"),FALSE,
-							   25., 1., FPS_MAX, 1., 10., 3,
-							   LIVES_BOX(hbox),NULL);
+
+    tvcardw->spinbuttonf = lives_standard_spin_button_new(_("FPS"),FALSE,
+                           25., 1., FPS_MAX, 1., 10., 3,
+                           LIVES_BOX(hbox),NULL);
 
     lives_widget_set_sensitive(tvcardw->spinbuttonf,FALSE);
 
-    hbox = lives_hbox_new (FALSE, 0);
+    hbox = lives_hbox_new(FALSE, 0);
 
-    tvcardw->combod = lives_standard_combo_new (_("_Driver"),TRUE,dlist,LIVES_BOX(hbox),NULL);
+    tvcardw->combod = lives_standard_combo_new(_("_Driver"),TRUE,dlist,LIVES_BOX(hbox),NULL);
     lives_combo_set_active_index(LIVES_COMBO(tvcardw->combod), 0);
 
-    tvcardw->comboo = lives_standard_combo_new (_("_Output format"),TRUE,olist,LIVES_BOX(hbox),NULL);
+    tvcardw->comboo = lives_standard_combo_new(_("_Output format"),TRUE,olist,LIVES_BOX(hbox),NULL);
 
 
-    lives_widget_show_all (hbox);
-    lives_box_pack_start (LIVES_BOX (tvcardw->adv_vbox), hbox, TRUE, FALSE, 0);
+    lives_widget_show_all(hbox);
+    lives_box_pack_start(LIVES_BOX(tvcardw->adv_vbox), hbox, TRUE, FALSE, 0);
 
-    lives_signal_connect (LIVES_GUI_OBJECT (tvcardw->advbutton), LIVES_WIDGET_CLICKED_EVENT,
-		      LIVES_GUI_CALLBACK (on_liveinp_advanced_clicked),
-		      tvcardw);
+    lives_signal_connect(LIVES_GUI_OBJECT(tvcardw->advbutton), LIVES_WIDGET_CLICKED_SIGNAL,
+                         LIVES_GUI_CALLBACK(on_liveinp_advanced_clicked),
+                         tvcardw);
 
     lives_widget_hide(tvcardw->adv_vbox);
 
-    g_object_set_data(G_OBJECT(cd_dialog),"tvcard_data",tvcardw);
+    lives_widget_object_set_data(LIVES_WIDGET_OBJECT(cd_dialog),"tvcard_data",tvcardw);
 
   }
 
-  dialog_action_area = lives_dialog_get_action_area(LIVES_DIALOG (cd_dialog));
-  lives_button_box_set_layout (LIVES_BUTTON_BOX (dialog_action_area), LIVES_BUTTONBOX_END);
+  dialog_action_area = lives_dialog_get_action_area(LIVES_DIALOG(cd_dialog));
+  lives_button_box_set_layout(LIVES_BUTTON_BOX(dialog_action_area), LIVES_BUTTONBOX_END);
 
-  cancelbutton = lives_button_new_from_stock (LIVES_STOCK_CANCEL);
-  lives_dialog_add_action_widget (LIVES_DIALOG (cd_dialog), cancelbutton, LIVES_RESPONSE_CANCEL);
+  cancelbutton = lives_button_new_from_stock(LIVES_STOCK_CANCEL);
+  lives_dialog_add_action_widget(LIVES_DIALOG(cd_dialog), cancelbutton, LIVES_RESPONSE_CANCEL);
 
-  okbutton = lives_button_new_from_stock (LIVES_STOCK_OK);
-  lives_dialog_add_action_widget (LIVES_DIALOG (cd_dialog), okbutton, LIVES_RESPONSE_OK);
-  lives_widget_set_can_focus_and_default (okbutton);
+  okbutton = lives_button_new_from_stock(LIVES_STOCK_OK);
+  lives_dialog_add_action_widget(LIVES_DIALOG(cd_dialog), okbutton, LIVES_RESPONSE_OK);
+  lives_widget_set_can_focus_and_default(okbutton);
 
-  lives_widget_grab_default (okbutton);
+  lives_widget_grab_default(okbutton);
 
-  lives_widget_add_accelerator (cancelbutton, LIVES_WIDGET_CLICKED_EVENT, accel_group,
-                              LIVES_KEY_Escape, (LiVESXModifierType)0, (LiVESAccelFlags)0);
+  lives_widget_add_accelerator(cancelbutton, LIVES_WIDGET_CLICKED_SIGNAL, accel_group,
+                               LIVES_KEY_Escape, (LiVESXModifierType)0, (LiVESAccelFlags)0);
 
-  
-  lives_widget_add_accelerator (okbutton, LIVES_WIDGET_CLICKED_EVENT, accel_group,
-                              LIVES_KEY_Return, (LiVESXModifierType)0, (LiVESAccelFlags)0);
+
+  lives_widget_add_accelerator(okbutton, LIVES_WIDGET_CLICKED_SIGNAL, accel_group,
+                               LIVES_KEY_Return, (LiVESXModifierType)0, (LiVESAccelFlags)0);
 
   if (type!=4&&type!=5) {
-    lives_signal_connect (LIVES_GUI_OBJECT (cancelbutton), LIVES_WIDGET_CLICKED_EVENT,
-		      LIVES_GUI_CALLBACK (lives_general_button_clicked),
-		      NULL);
+    lives_signal_connect(LIVES_GUI_OBJECT(cancelbutton), LIVES_WIDGET_CLICKED_SIGNAL,
+                         LIVES_GUI_CALLBACK(lives_general_button_clicked),
+                         NULL);
   }
 
   if (type==0) {
-    lives_signal_connect (LIVES_GUI_OBJECT (okbutton), LIVES_WIDGET_CLICKED_EVENT,
-		      LIVES_GUI_CALLBACK (on_load_cdtrack_ok_clicked),
-		      NULL);
-  }
-  else if (type==1||type==2)  {
-    lives_signal_connect (LIVES_GUI_OBJECT (okbutton), LIVES_WIDGET_CLICKED_EVENT,
-		      LIVES_GUI_CALLBACK (on_load_vcd_ok_clicked),
-		      GINT_TO_POINTER (type));
-  }
-  else if (type==3)  {
-    lives_signal_connect (LIVES_GUI_OBJECT (okbutton), LIVES_WIDGET_CLICKED_EVENT,
-		      LIVES_GUI_CALLBACK (mt_change_disp_tracks_ok),
-		      user_data);
+    lives_signal_connect(LIVES_GUI_OBJECT(okbutton), LIVES_WIDGET_CLICKED_SIGNAL,
+                         LIVES_GUI_CALLBACK(on_load_cdtrack_ok_clicked),
+                         NULL);
+  } else if (type==1||type==2)  {
+    lives_signal_connect(LIVES_GUI_OBJECT(okbutton), LIVES_WIDGET_CLICKED_SIGNAL,
+                         LIVES_GUI_CALLBACK(on_load_vcd_ok_clicked),
+                         LIVES_INT_TO_POINTER(type));
+  } else if (type==3)  {
+    lives_signal_connect(LIVES_GUI_OBJECT(okbutton), LIVES_WIDGET_CLICKED_SIGNAL,
+                         LIVES_GUI_CALLBACK(mt_change_disp_tracks_ok),
+                         user_data);
   }
 
-  lives_window_add_accel_group (LIVES_WINDOW (cd_dialog), accel_group);
+  lives_window_add_accel_group(LIVES_WINDOW(cd_dialog), accel_group);
 
   lives_widget_show_all(cd_dialog);
 
@@ -1967,7 +1834,7 @@
 
 
 
-static void rb_aud_sel_pressed (LiVESButton *button, gpointer user_data) {
+static void rb_aud_sel_pressed(LiVESButton *button, livespointer user_data) {
   aud_dialog_t *audd=(aud_dialog_t *)user_data;
   audd->is_sel=!audd->is_sel;
   lives_widget_set_sensitive(audd->time_spin,!audd->is_sel);
@@ -1976,7 +1843,7 @@
 
 
 
-aud_dialog_t *create_audfade_dialog (int type) {
+aud_dialog_t *create_audfade_dialog(int type) {
   // type 0 = fade in
   // type 1 = fade out
 
@@ -1986,23 +1853,22 @@
   LiVESWidget *rb_sel;
   LiVESWidget *label;
 
-  gchar *label_text=NULL,*label_text2=NULL,*title;
+  char *label_text=NULL,*label_text2=NULL,*title;
 
   double max;
 
-  GSList *radiobutton_group = NULL;
+  LiVESSList *radiobutton_group = NULL;
 
-  aud_dialog_t *audd=(aud_dialog_t *)g_malloc(sizeof(aud_dialog_t));
+  aud_dialog_t *audd=(aud_dialog_t *)lives_malloc(sizeof(aud_dialog_t));
 
   if (type==0) {
-    title=g_strdup(_("LiVES:- Fade Audio In"));
-  }
-  else {
-    title=g_strdup(_("LiVES:- Fade Audio Out"));
+    title=lives_strdup(_("LiVES:- Fade Audio In"));
+  } else {
+    title=lives_strdup(_("LiVES:- Fade Audio Out"));
   }
 
-  audd->dialog = lives_standard_dialog_new (title,TRUE);
-  g_free(title);
+  audd->dialog = lives_standard_dialog_new(title,TRUE,-1,-1);
+  lives_free(title);
 
   if (prefs->show_gui) {
     lives_window_set_transient_for(LIVES_WINDOW(audd->dialog),LIVES_WINDOW(mainw->LiVES));
@@ -2010,44 +1876,43 @@
 
   dialog_vbox = lives_dialog_get_content_area(LIVES_DIALOG(audd->dialog));
 
-  hbox = lives_hbox_new (FALSE, TB_HEIGHT_AUD);
-  lives_box_pack_start (LIVES_BOX (dialog_vbox), hbox, TRUE, TRUE, widget_opts.packing_height);
+  hbox = lives_hbox_new(FALSE, TB_HEIGHT_AUD);
+  lives_box_pack_start(LIVES_BOX(dialog_vbox), hbox, TRUE, TRUE, widget_opts.packing_height);
 
   if (type==0) {
-    label_text=g_strdup(_("Fade in over  "));
-    label_text2=g_strdup(_("first"));
-  }
-  else if (type==1) {
-    label_text=g_strdup(_("Fade out over  "));
-    label_text2=g_strdup(_("last"));
+    label_text=lives_strdup(_("Fade in over  "));
+    label_text2=lives_strdup(_("first"));
+  } else if (type==1) {
+    label_text=lives_strdup(_("Fade out over  "));
+    label_text2=lives_strdup(_("last"));
   }
 
 
-  label = lives_standard_label_new (label_text);
-  if (label_text!=NULL) g_free(label_text);
+  label = lives_standard_label_new(label_text);
+  if (label_text!=NULL) lives_free(label_text);
 
-  lives_box_pack_start (LIVES_BOX (hbox), label, FALSE, FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(hbox), label, FALSE, FALSE, 0);
 
-  hbox = lives_hbox_new (FALSE, widget_opts.packing_width*5);
-  lives_box_pack_start (LIVES_BOX (dialog_vbox), hbox, TRUE, TRUE, widget_opts.packing_height);
+  hbox = lives_hbox_new(FALSE, widget_opts.packing_width*5);
+  lives_box_pack_start(LIVES_BOX(dialog_vbox), hbox, TRUE, TRUE, widget_opts.packing_height);
 
   rb_time=lives_standard_radio_button_new(label_text2,FALSE,radiobutton_group,
-					  LIVES_BOX(hbox),NULL);
+                                          LIVES_BOX(hbox),NULL);
 
-  radiobutton_group = lives_radio_button_get_group (LIVES_RADIO_BUTTON (rb_time));
-  if (label_text2!=NULL) g_free(label_text2);
+  radiobutton_group = lives_radio_button_get_group(LIVES_RADIO_BUTTON(rb_time));
+  if (label_text2!=NULL) lives_free(label_text2);
 
 
   max=cfile->laudio_time;
 
   widget_opts.swap_label=TRUE;
-  audd->time_spin = lives_standard_spin_button_new (_("seconds."),FALSE,
-						    max/2.>DEF_AUD_FADE_SECS?DEF_AUD_FADE_SECS:max/2., .1, max, 1., 10., 2,
-						    LIVES_BOX(hbox),NULL);
+  audd->time_spin = lives_standard_spin_button_new(_("seconds."),FALSE,
+                    max/2.>DEF_AUD_FADE_SECS?DEF_AUD_FADE_SECS:max/2., .1, max, 1., 10., 2,
+                    LIVES_BOX(hbox),NULL);
   widget_opts.swap_label=FALSE;
 
-  hbox = lives_hbox_new (FALSE, widget_opts.packing_width*5);
-  lives_box_pack_start (LIVES_BOX (dialog_vbox), hbox, TRUE, TRUE, widget_opts.packing_height);
+  hbox = lives_hbox_new(FALSE, widget_opts.packing_width*5);
+  lives_box_pack_start(LIVES_BOX(dialog_vbox), hbox, TRUE, TRUE, widget_opts.packing_height);
 
   rb_sel=lives_standard_radio_button_new(_("selection"),FALSE,radiobutton_group,LIVES_BOX(hbox),NULL);
 
@@ -2056,22 +1921,21 @@
   if ((cfile->end-1.)/cfile->fps>cfile->laudio_time) {
     // if selection is longer than audio time, we cannot use sel len
     lives_widget_set_sensitive(rb_sel,FALSE);
-  }
-  else {
+  } else {
     lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(rb_sel),TRUE);
-    rb_aud_sel_pressed(LIVES_BUTTON(rb_sel),(gpointer)audd);
+    rb_aud_sel_pressed(LIVES_BUTTON(rb_sel),(livespointer)audd);
   }
 
-  lives_signal_connect_after (LIVES_GUI_OBJECT (rb_sel), LIVES_WIDGET_TOGGLED_EVENT,
-			  LIVES_GUI_CALLBACK (rb_aud_sel_pressed),
-			  (gpointer)audd);
+  lives_signal_connect_after(LIVES_GUI_OBJECT(rb_sel), LIVES_WIDGET_TOGGLED_SIGNAL,
+                             LIVES_GUI_CALLBACK(rb_aud_sel_pressed),
+                             (livespointer)audd);
 
 
   add_fill_to_box(LIVES_BOX(hbox));
 
 
   lives_widget_show_all(audd->dialog);
-  
+
   return audd;
 }
 
@@ -2079,7 +1943,7 @@
 
 
 
-_commentsw* create_comments_dialog (lives_clip_t *sfile, gchar *filename) {
+_commentsw *create_comments_dialog(lives_clip_t *sfile, char *filename) {
   LiVESWidget *dialog_vbox;
   LiVESWidget *table;
   LiVESWidget *label;
@@ -2087,9 +1951,9 @@
   LiVESWidget *hbox;
   LiVESWidget *buttond;
 
-  _commentsw *commentsw=(_commentsw*)(g_malloc(sizeof(_commentsw)));
+  _commentsw *commentsw=(_commentsw *)(lives_malloc(sizeof(_commentsw)));
 
-  commentsw->comments_dialog = lives_standard_dialog_new (_("LiVES: - File Comments (optional)"),TRUE);
+  commentsw->comments_dialog = lives_standard_dialog_new(_("LiVES: - File Comments (optional)"),TRUE,-1,-1);
 
   if (prefs->show_gui) {
     lives_window_set_transient_for(LIVES_WINDOW(commentsw->comments_dialog),LIVES_WINDOW(mainw->LiVES));
@@ -2097,84 +1961,83 @@
 
   dialog_vbox = lives_dialog_get_content_area(LIVES_DIALOG(commentsw->comments_dialog));
 
-  table = lives_table_new (4, 2, FALSE);
+  table = lives_table_new(4, 2, FALSE);
   lives_container_set_border_width(LIVES_CONTAINER(table), widget_opts.border_width);
 
   lives_table_set_row_spacings(LIVES_TABLE(table), widget_opts.packing_height*2);
 
-  lives_box_pack_start (LIVES_BOX (dialog_vbox), table, TRUE, TRUE, widget_opts.packing_height);
+  lives_box_pack_start(LIVES_BOX(dialog_vbox), table, TRUE, TRUE, widget_opts.packing_height);
 
-  label = lives_standard_label_new (_("Title/Name : "));
+  label = lives_standard_label_new(_("Title/Name : "));
 
-  lives_table_attach (LIVES_TABLE (table), label, 0, 1, 0, 1,
-                    (LiVESAttachOptions) (LIVES_FILL),
-                    (LiVESAttachOptions) (0), 0, 0);
-  lives_label_set_halignment (LIVES_LABEL(label), 0.5);
+  lives_table_attach(LIVES_TABLE(table), label, 0, 1, 0, 1,
+                     (LiVESAttachOptions)(LIVES_FILL),
+                     (LiVESAttachOptions)(0), 0, 0);
+  lives_label_set_halignment(LIVES_LABEL(label), 0.5);
 
-  label = lives_standard_label_new (_("Author/Artist : "));
+  label = lives_standard_label_new(_("Author/Artist : "));
 
-  lives_table_attach (LIVES_TABLE (table), label, 0, 1, 1, 2,
-                    (LiVESAttachOptions) (LIVES_FILL),
-                    (LiVESAttachOptions) (0), 0, 0);
-  lives_label_set_halignment (LIVES_LABEL(label), 0.5);
+  lives_table_attach(LIVES_TABLE(table), label, 0, 1, 1, 2,
+                     (LiVESAttachOptions)(LIVES_FILL),
+                     (LiVESAttachOptions)(0), 0, 0);
+  lives_label_set_halignment(LIVES_LABEL(label), 0.5);
 
-  label = lives_standard_label_new (_("Comments : "));
+  label = lives_standard_label_new(_("Comments : "));
 
-  lives_table_attach (LIVES_TABLE (table), label, 0, 1, 3, 4,
-                    (LiVESAttachOptions) (LIVES_FILL),
-                    (LiVESAttachOptions) (0), 0, 0);
+  lives_table_attach(LIVES_TABLE(table), label, 0, 1, 3, 4,
+                     (LiVESAttachOptions)(LIVES_FILL),
+                     (LiVESAttachOptions)(0), 0, 0);
 
-  lives_label_set_halignment (LIVES_LABEL(label), 0.5);
+  lives_label_set_halignment(LIVES_LABEL(label), 0.5);
 
-  commentsw->title_entry = lives_standard_entry_new (NULL,FALSE,cfile->title,80,-1,NULL,NULL);
+  commentsw->title_entry = lives_standard_entry_new(NULL,FALSE,cfile->title,80,-1,NULL,NULL);
 
-  lives_table_attach (LIVES_TABLE (table), commentsw->title_entry, 1, 2, 0, 1,
-                    (LiVESAttachOptions) (LIVES_EXPAND | LIVES_FILL),
-                    (LiVESAttachOptions) (LIVES_EXPAND), 0, 0);
+  lives_table_attach(LIVES_TABLE(table), commentsw->title_entry, 1, 2, 0, 1,
+                     (LiVESAttachOptions)(LIVES_EXPAND | LIVES_FILL),
+                     (LiVESAttachOptions)(LIVES_EXPAND), 0, 0);
 
-  commentsw->author_entry = lives_standard_entry_new (NULL,FALSE,cfile->author,80,-1,NULL,NULL);
+  commentsw->author_entry = lives_standard_entry_new(NULL,FALSE,cfile->author,80,-1,NULL,NULL);
 
-  lives_table_attach (LIVES_TABLE (table), commentsw->author_entry, 1, 2, 1, 2,
-                    (LiVESAttachOptions) (LIVES_EXPAND | LIVES_FILL),
-                    (LiVESAttachOptions) (LIVES_EXPAND), 0, 0);
+  lives_table_attach(LIVES_TABLE(table), commentsw->author_entry, 1, 2, 1, 2,
+                     (LiVESAttachOptions)(LIVES_EXPAND | LIVES_FILL),
+                     (LiVESAttachOptions)(LIVES_EXPAND), 0, 0);
 
-  commentsw->comment_entry = lives_standard_entry_new (NULL,FALSE,cfile->comment,80,250,NULL,NULL);
+  commentsw->comment_entry = lives_standard_entry_new(NULL,FALSE,cfile->comment,80,250,NULL,NULL);
 
-  lives_table_attach (LIVES_TABLE (table), commentsw->comment_entry, 1, 2, 3, 4,
-                    (LiVESAttachOptions) (LIVES_EXPAND | LIVES_FILL),
-                    (LiVESAttachOptions) (LIVES_EXPAND), 0, 0);
+  lives_table_attach(LIVES_TABLE(table), commentsw->comment_entry, 1, 2, 3, 4,
+                     (LiVESAttachOptions)(LIVES_EXPAND | LIVES_FILL),
+                     (LiVESAttachOptions)(LIVES_EXPAND), 0, 0);
 
   if (sfile!=NULL) {
     // options
-    vbox = lives_vbox_new (FALSE, 0);
+    vbox = lives_vbox_new(FALSE, 0);
 
     lives_standard_expander_new(_("_Options"),TRUE,LIVES_BOX(dialog_vbox),vbox);
 
     add_fill_to_box(LIVES_BOX(vbox));
 
-    hbox = lives_hbox_new (FALSE, 0);
-    lives_box_pack_start (LIVES_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
+    hbox = lives_hbox_new(FALSE, 0);
+    lives_box_pack_start(LIVES_BOX(vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
 
-    commentsw->subt_checkbutton = lives_standard_check_button_new (_("Save _subtitles to file"),TRUE,LIVES_BOX(hbox),NULL);
+    commentsw->subt_checkbutton = lives_standard_check_button_new(_("Save _subtitles to file"),TRUE,LIVES_BOX(hbox),NULL);
 
     if (sfile->subt==NULL) {
       lives_widget_set_sensitive(commentsw->subt_checkbutton,FALSE);
       lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(commentsw->subt_checkbutton),FALSE);
-    }
-    else lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(commentsw->subt_checkbutton),TRUE);
+    } else lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(commentsw->subt_checkbutton),TRUE);
 
 
-    hbox = lives_hbox_new (FALSE, 0);
-    lives_box_pack_start (LIVES_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
+    hbox = lives_hbox_new(FALSE, 0);
+    lives_box_pack_start(LIVES_BOX(vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
 
     commentsw->subt_entry=lives_standard_entry_new(_("Subtitle file"),FALSE,NULL,32,-1,LIVES_BOX(hbox),NULL);
 
     buttond = lives_button_new_with_mnemonic(_("Browse..."));
 
-    lives_signal_connect (buttond, LIVES_WIDGET_CLICKED_EVENT,LIVES_GUI_CALLBACK (on_save_subs_activate),
-    		      (gpointer)commentsw->subt_entry);
+    lives_signal_connect(buttond, LIVES_WIDGET_CLICKED_SIGNAL,LIVES_GUI_CALLBACK(on_save_subs_activate),
+                         (livespointer)commentsw->subt_entry);
 
-    lives_box_pack_start (LIVES_BOX (hbox), buttond, FALSE, FALSE, widget_opts.packing_width);
+    lives_box_pack_start(LIVES_BOX(hbox), buttond, FALSE, FALSE, widget_opts.packing_width);
 
     add_fill_to_box(LIVES_BOX(vbox));
 
@@ -2182,24 +2045,23 @@
     if (sfile->subt==NULL) {
       lives_widget_set_sensitive(commentsw->subt_entry,FALSE);
       lives_widget_set_sensitive(buttond,FALSE);
-    }
-    else {
-      gchar xfilename[512];
-      gchar *osubfname=NULL;
+    } else {
+      char xfilename[512];
+      char *osubfname=NULL;
 
-      g_snprintf(xfilename,512,"%s",filename);
+      lives_snprintf(xfilename,512,"%s",filename);
       get_filename(xfilename,FALSE); // strip extension
       switch (sfile->subt->type) {
       case SUBTITLE_TYPE_SRT:
-	osubfname=g_strdup_printf("%s.srt",xfilename);
-	break;
+        osubfname=lives_strdup_printf("%s.srt",xfilename);
+        break;
 
       case SUBTITLE_TYPE_SUB:
-	osubfname=g_strdup_printf("%s.sub",xfilename);
-	break;
+        osubfname=lives_strdup_printf("%s.sub",xfilename);
+        break;
 
       default:
-	break;
+        break;
       }
       lives_entry_set_text(LIVES_ENTRY(commentsw->subt_entry),osubfname);
       mainw->subt_save_file=osubfname; // assign instead of free
@@ -2212,72 +2074,92 @@
 }
 
 
-gchar last_good_folder[PATH_MAX];
+char last_good_folder[PATH_MAX];
 
-static void chooser_check_dir(LiVESFileChooser *chooser, gpointer user_data) {
-  gchar *cwd=g_get_current_dir();
-  gchar *new_dir=gtk_file_chooser_get_current_folder(chooser);
+static void chooser_check_dir(LiVESFileChooser *chooser, livespointer user_data) {
+  char *cwd=lives_get_current_dir();
+  char *new_dir;
+
+#ifdef GUI_GTK
+  new_dir=gtk_file_chooser_get_current_folder(chooser);
+#endif
+#ifdef GUI_QT
+  QFileDialog *qchooser = static_cast<QFileDialog *>(chooser);
+  new_dir = qchooser->directory().path().toLocal8Bit().data();
+#endif
 
   if (!strcmp(new_dir,last_good_folder)) return;
 
   if (lives_chdir(new_dir,TRUE)) {
-    g_free(cwd);
+    lives_free(cwd);
+#ifdef GUI_GTK
     gtk_file_chooser_set_current_folder(chooser,last_good_folder);
+#endif
+#ifdef GUI_QT
+    qchooser->setDirectory(last_good_folder);
+#endif
     do_dir_perm_access_error(new_dir);
+    lives_free(new_dir);
     return;
   }
-  g_snprintf(last_good_folder,PATH_MAX,"%s",new_dir);
+  lives_snprintf(last_good_folder,PATH_MAX,"%s",new_dir);
   lives_chdir(cwd,FALSE);
-  g_free(cwd);
+  lives_free(new_dir);
+  lives_free(cwd);
 
 }
 
 
 
 
-gchar *choose_file(gchar *dir, gchar *fname, gchar **filt, LiVESFileChooserAction act, const char *title, LiVESWidget *extra_widget) {
+char *choose_file(const char *dir, const char *fname, char **const filt, LiVESFileChooserAction act,
+                  const char *title, LiVESWidget *extra_widget) {
   // new style file chooser
 
   // in/out values are in utf8 encoding
 
   LiVESWidget *chooser;
-  GtkFileFilter *filter;
 
-  gchar *filename=NULL;
-  gchar *mytitle;
+  char *mytitle;
+  char *filename=NULL;
 
   int response;
-
   register int i;
 
+
   if (title==NULL) {
     if (act==LIVES_FILE_CHOOSER_ACTION_SELECT_DEVICE) {
-      mytitle=g_strdup(_("LiVES: - choose a device"));
+      mytitle=lives_strdup(_("LiVES: - choose a device"));
       act=LIVES_FILE_CHOOSER_ACTION_OPEN;
+    } else if (act==LIVES_FILE_CHOOSER_ACTION_SELECT_FOLDER) {
+      mytitle=lives_strdup(_("LiVES: - choose a directory"));
+    } else {
+      mytitle=lives_strdup(_("LiVES: - choose a file"));
     }
-    else if (act==LIVES_FILE_CHOOSER_ACTION_SELECT_FOLDER) {
-      mytitle=g_strdup(_("LiVES: - choose a directory"));
-    }
-    else {
-      mytitle=g_strdup(_("LiVES: - choose a file"));
-    }
-  }
-  else mytitle=g_strdup(title);
+  } else mytitle=lives_strdup(title);
+
 
-  if (act!=LIVES_FILE_CHOOSER_ACTION_SAVE) 
-    chooser=gtk_file_chooser_dialog_new(mytitle,LIVES_WINDOW(mainw->LiVES),(LiVESFileChooserAction)act, 
-					LIVES_STOCK_LABEL_CANCEL, LIVES_RESPONSE_CANCEL,
-					LIVES_STOCK_LABEL_OPEN, LIVES_RESPONSE_ACCEPT,
-					NULL);
 
-  else {
-    chooser=gtk_file_chooser_dialog_new(mytitle,LIVES_WINDOW(mainw->LiVES),(LiVESFileChooserAction)act, 
-					LIVES_STOCK_LABEL_CANCEL, LIVES_RESPONSE_CANCEL,
-					LIVES_STOCK_LABEL_SAVE, LIVES_RESPONSE_ACCEPT,
-					NULL);
+#ifdef GUI_GTK
+
+  if (act!=LIVES_FILE_CHOOSER_ACTION_SAVE) {
+    if (mainw->interactive)
+      chooser=gtk_file_chooser_dialog_new(mytitle,LIVES_WINDOW(mainw->LiVES),(LiVESFileChooserAction)act,
+                                          LIVES_STOCK_LABEL_CANCEL, LIVES_RESPONSE_CANCEL,
+                                          LIVES_STOCK_LABEL_OPEN, LIVES_RESPONSE_ACCEPT,
+                                          NULL);
+    else
+      chooser=gtk_file_chooser_dialog_new(mytitle,LIVES_WINDOW(mainw->LiVES),(LiVESFileChooserAction)act,
+                                          LIVES_STOCK_LABEL_OPEN, LIVES_RESPONSE_ACCEPT,
+                                          NULL);
+  } else {
+    chooser=gtk_file_chooser_dialog_new(mytitle,LIVES_WINDOW(mainw->LiVES),(LiVESFileChooserAction)act,
+                                        LIVES_STOCK_LABEL_CANCEL, LIVES_RESPONSE_CANCEL,
+                                        LIVES_STOCK_LABEL_SAVE, LIVES_RESPONSE_ACCEPT,
+                                        NULL);
+
   }
 
-  g_free(mytitle);
 
   gtk_file_chooser_set_local_only(LIVES_FILE_CHOOSER(chooser),TRUE);
 
@@ -2293,64 +2175,127 @@
   }
 
   if (filt!=NULL) {
-    filter=gtk_file_filter_new();
-    gtk_file_filter_add_pattern(filter,filt[0]);
-    for (i=1;filt[i]!=NULL;i++) gtk_file_filter_add_pattern(filter,filt[i]);
+    GtkFileFilter *filter=gtk_file_filter_new();
+    for (i=0; filt[i]!=NULL; i++) gtk_file_filter_add_pattern(filter,filt[i]);
     gtk_file_chooser_set_filter(LIVES_FILE_CHOOSER(chooser),filter);
-    if (fname==NULL&&i==1&&act==LIVES_FILE_CHOOSER_ACTION_SAVE) 
+    if (fname==NULL&&i==1&&act==LIVES_FILE_CHOOSER_ACTION_SAVE)
       gtk_file_chooser_set_current_name(LIVES_FILE_CHOOSER(chooser),filt[0]); //utf-8
   }
 
   if (fname!=NULL) {
     gtk_file_chooser_set_current_name(LIVES_FILE_CHOOSER(chooser),fname); // utf-8
     if (fname!=NULL&&dir!=NULL) {
-      gchar *ffname=g_build_filename(dir,fname,NULL);
+      char *ffname=lives_build_filename(dir,fname,NULL);
       gtk_file_chooser_select_filename(LIVES_FILE_CHOOSER(chooser),ffname); // must be dir and file
-      g_free(ffname);
+      lives_free(ffname);
     }
   }
 
-  lives_container_set_border_width (LIVES_CONTAINER (chooser), widget_opts.border_width);
+  if (extra_widget!=NULL && extra_widget!=mainw->LiVES) gtk_file_chooser_set_extra_widget(LIVES_FILE_CHOOSER(chooser),extra_widget);
+
+#endif
+
+#ifdef GUI_QT
+  LiVESFileChooser *fchooser=new LiVESFileChooser();
+  QFileDialog *qchooser = static_cast<QFileDialog *>(fchooser);
+  qchooser->setModal(true);
+  qchooser->setWindowTitle(QString::fromUtf8(mytitle));
+
+  //  LiVESWidget *aarea = chooser->get_action_area();
+
+  if (act!=LIVES_FILE_CHOOSER_ACTION_SAVE) {
+    // open, select folder, create folder, select device
+    //aarea->setStandardButtons(QDialogButtonBox::Open | QDialogButtonBox::Cancel);
+    qchooser->setAcceptMode(QFileDialog::AcceptOpen);
+  } else {
+    //aarea->setStandardButtons(QDialogButtonBox::Save | QDialogButtonBox::Cancel);
+    qchooser->setAcceptMode(QFileDialog::AcceptSave);
+  }
+
+
+  if (act == LIVES_FILE_CHOOSER_ACTION_SELECT_FOLDER || act == LIVES_FILE_CHOOSER_ACTION_CREATE_FOLDER) {
+    qchooser->setFileMode(QFileDialog::Directory);
+    qchooser->setOptions(QFileDialog::ShowDirsOnly);
+  }
+
+  if (act == LIVES_FILE_CHOOSER_ACTION_SELECT_FOLDER || act == LIVES_FILE_CHOOSER_ACTION_OPEN) {
+    qchooser->setFileMode(QFileDialog::ExistingFile);
+    qchooser->setOptions(QFileDialog::ReadOnly);
+  }
+
+
+  if (mainw->is_ready && palette->style&STYLE_1) {
+    lives_widget_set_bg_color(fchooser, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+    //set_child_colour(chooser,FALSE);
+  }
+
+  if (dir!=NULL) {
+    qchooser->setDirectory(QString::fromUtf8(dir));
+    QList<QUrl> urls = qchooser->sidebarUrls();
+    urls.append(QString::fromUtf8(dir));
+    qchooser->setSidebarUrls(urls);
+  }
+
+
+  if (filt!=NULL) {
+    QStringList filter;
+    for (i=0; filt[i]!=NULL; i++) filter.append(QString::fromUtf8(filt[i]));
+
+    qchooser->setNameFilters(filter);
+
+    if (fname==NULL&&i==1&&act==LIVES_FILE_CHOOSER_ACTION_SAVE)
+      qchooser->setDefaultSuffix(QString::fromUtf8(filt[0]));
+  }
+
+  // TODO
+  //if (extra_widget!=NULL) gtk_file_chooser_set_extra_widget(fchooser,extra_widget);
+
+  chooser = static_cast<LiVESWidget *>(fchooser);
+
+#endif
+
+
+  lives_container_set_border_width(LIVES_CONTAINER(chooser), widget_opts.border_width);
 
   if (prefs->show_gui) {
     if (mainw->multitrack==NULL) lives_window_set_transient_for(LIVES_WINDOW(chooser),LIVES_WINDOW(mainw->LiVES));
     else lives_window_set_transient_for(LIVES_WINDOW(chooser),LIVES_WINDOW(mainw->multitrack->window));
   }
 
-  lives_signal_connect (chooser, "current-folder-changed", LIVES_GUI_CALLBACK (chooser_check_dir), NULL);
+  lives_signal_connect(chooser, LIVES_WIDGET_CURRENT_FOLDER_CHANGED_SIGNAL, LIVES_GUI_CALLBACK(chooser_check_dir), NULL);
 
-  lives_widget_grab_focus (chooser);
+  lives_widget_grab_focus(chooser);
 
-  lives_widget_show(chooser);
+  lives_widget_show_all(chooser);
 
   lives_window_center(LIVES_WINDOW(chooser));
-  
-  lives_window_set_modal (LIVES_WINDOW (chooser), TRUE);
+
+  lives_window_set_modal(LIVES_WINDOW(chooser), TRUE);
 
   memset(last_good_folder,0,1);
 
   if (extra_widget==mainw->LiVES) {
-    return (gchar *)chooser; // kludge to allow custom adding of extra widgets
+    return (char *)chooser; // kludge to allow custom adding of extra widgets
   }
 
-  if (extra_widget!=NULL) gtk_file_chooser_set_extra_widget(LIVES_FILE_CHOOSER(chooser),extra_widget);
+rundlg:
 
- rundlg:
-  
   if ((response=lives_dialog_run(LIVES_DIALOG(chooser)))!=LIVES_RESPONSE_CANCEL) {
-    gchar *tmp;
-    filename=g_filename_to_utf8((tmp=lives_file_chooser_get_filename(LIVES_FILE_CHOOSER(chooser))),-1,NULL,NULL,NULL);
-    g_free(tmp);
+    char *tmp;
+    filename=lives_filename_to_utf8((tmp=lives_file_chooser_get_filename(LIVES_FILE_CHOOSER(chooser))),-1,NULL,NULL,NULL);
+    lives_free(tmp);
   }
 
   if (filename!=NULL&&act==LIVES_FILE_CHOOSER_ACTION_SAVE) {
     if (!check_file(filename,TRUE)) {
-      g_free(filename);
+      lives_free(filename);
       filename=NULL;
       goto rundlg;
     }
   }
 
+  lives_free(mytitle);
+
   lives_widget_destroy(chooser);
 
   return filename;
@@ -2358,66 +2303,49 @@
 }
 
 
-static void chooser_response(LiVESDialog *dialog, int response, gpointer user_data) {
-  int type=GPOINTER_TO_INT(user_data);
-
-  if (response!=LIVES_RESPONSE_CANCEL) {
-    switch (type) {
-    case 1:
-      on_ok_filesel_open_clicked(LIVES_FILE_CHOOSER(dialog),NULL);
-      break;
-    case 2:
-      on_open_new_audio_clicked(LIVES_FILE_CHOOSER(dialog),NULL);
-      break;
-    case 3:
-      on_ok_file_open_clicked(LIVES_FILE_CHOOSER(dialog),NULL);
-      break;
-    case 4:
-      //on_xmms_ok_clicked(LIVES_FILE_CHOOSER(dialog),NULL);
-      break;
-    case 5:
-      on_ok_append_audio_clicked(LIVES_FILE_CHOOSER(dialog),NULL);
-      break;
-    default:
-      end_fs_preview();
-      break;
-    }
-  }
-  else on_cancel_button1_clicked(LIVES_WIDGET(dialog),NULL);
-}
-
-
-
 
-LiVESWidget *choose_file_with_preview (gchar *dir, const gchar *title, int preview_type) {
+LiVESWidget *choose_file_with_preview(const char *dir, const char *title, int preview_type) {
   // preview_type 1 - video and audio open (single - opensel)
+  //LIVES_FILE_SELECTION_VIDEO_AUDIO
+
   // preview type 2 - import audio
+  // LIVES_FILE_SELECTION_AUDIO_ONLY
+
   // preview_type 3 - video and audio open (multiple)
-  // type 4 xmms (deprecated)
-  // type 5 append audio
-  
-  // type 128 - locate missing clip
+  //LIVES_FILE_SELECTION_VIDEO_AUDIO_MULTI
 
+  // type 4
+  // LIVES_FILE_SELECTION_VIDEO_RANGE
 
   LiVESWidget *chooser;
 
   chooser=(LiVESWidget *)choose_file(dir,NULL,NULL,LIVES_FILE_CHOOSER_ACTION_OPEN,title,mainw->LiVES);
-  
-  if (preview_type==3) gtk_file_chooser_set_select_multiple(LIVES_FILE_CHOOSER(chooser),TRUE);
+
+  if (preview_type==LIVES_FILE_SELECTION_VIDEO_AUDIO_MULTI) {
+#ifdef GUI_GTK
+    gtk_file_chooser_set_select_multiple(LIVES_FILE_CHOOSER(chooser),TRUE);
+#endif
+#ifdef GUI_QT
+    QFileDialog *qchooser = static_cast<QFileDialog *>(static_cast<LiVESFileChooser *>(chooser));
+    qchooser->setFileMode(QFileDialog::ExistingFiles);
+#endif
+  }
 
   widget_add_preview(chooser,LIVES_BOX(lives_dialog_get_content_area(LIVES_DIALOG(chooser))),
-		     LIVES_BOX(lives_dialog_get_content_area(LIVES_DIALOG(chooser))),
-		     LIVES_BOX(lives_dialog_get_action_area(LIVES_DIALOG(chooser))),
-		     (preview_type==3||preview_type==128)?1:preview_type>3?2:preview_type);
+                     LIVES_BOX(lives_dialog_get_content_area(LIVES_DIALOG(chooser))),
+                     LIVES_BOX(lives_dialog_get_action_area(LIVES_DIALOG(chooser))),
+                     (preview_type==LIVES_FILE_SELECTION_VIDEO_AUDIO||
+                      preview_type==LIVES_FILE_SELECTION_VIDEO_AUDIO_MULTI)?LIVES_PREVIEW_TYPE_VIDEO_AUDIO:
+                     LIVES_PREVIEW_TYPE_AUDIO_ONLY);
 
   if (prefs->fileselmax) {
-    lives_window_set_resizable (LIVES_WINDOW(chooser),TRUE);
-    lives_window_maximize (LIVES_WINDOW(chooser));
+    lives_window_set_resizable(LIVES_WINDOW(chooser),TRUE);
+    lives_window_maximize(LIVES_WINDOW(chooser));
     lives_widget_queue_draw(chooser);
     lives_widget_context_update();
   }
 
-  lives_signal_connect (chooser, "response", LIVES_GUI_CALLBACK (chooser_response), GINT_TO_POINTER(preview_type));
+  lives_widget_show_all(chooser);
 
   return chooser;
 }
@@ -2428,7 +2356,15 @@
 
 
 //cancel/discard/save dialog
-_entryw* create_cds_dialog (int type) {
+_entryw *create_cds_dialog(int type) {
+  // values for type are:
+  // 0 == leave multitrack, user pref is warn when leave multitrack
+  // 1 == exit from LiVES, or save set
+  // 2 == ?
+  // 3 == wipe layout confirmation
+  // 4 == prompt for render after recording / viewing in mt
+
+
   LiVESWidget *dialog_vbox;
   LiVESWidget *dialog_action_area;
   LiVESWidget *cancelbutton;
@@ -2438,14 +2374,14 @@
   LiVESWidget *hbox;
   LiVESAccelGroup *accel_group;
 
-  _entryw *cdsw=(_entryw*)(g_malloc(sizeof(_entryw)));
+  _entryw *cdsw=(_entryw *)(lives_malloc(sizeof(_entryw)));
 
   cdsw->warn_checkbutton=NULL;
 
-  cdsw->dialog = lives_standard_dialog_new (_("LiVES: - Cancel/Discard/Save"),FALSE);
+  cdsw->dialog = lives_standard_dialog_new(_("LiVES: - Cancel/Discard/Save"),FALSE,-1,-1);
 
-  accel_group = LIVES_ACCEL_GROUP(lives_accel_group_new ());
-  lives_window_add_accel_group (LIVES_WINDOW (cdsw->dialog), accel_group);
+  accel_group = LIVES_ACCEL_GROUP(lives_accel_group_new());
+  lives_window_add_accel_group(LIVES_WINDOW(cdsw->dialog), accel_group);
 
   if (prefs->show_gui) {
     if (mainw->multitrack==NULL) lives_window_set_transient_for(LIVES_WINDOW(cdsw->dialog),LIVES_WINDOW(mainw->LiVES));
@@ -2457,96 +2393,95 @@
   widget_opts.justify=LIVES_JUSTIFY_CENTER;
   if (type==0) {
     if (strlen(mainw->multitrack->layout_name)==0) {
-      label = lives_standard_label_new (_("You are about to leave multitrack mode.\nThe current layout has not been saved.\nWhat would you like to do ?\n"));
+      label = lives_standard_label_new(
+                _("You are about to leave multitrack mode.\nThe current layout has not been saved.\nWhat would you like to do ?\n"));
+    } else {
+      label = lives_standard_label_new(
+                _("You are about to leave multitrack mode.\nThe current layout has been changed since the last save.\nWhat would you like to do ?\n"));
     }
-    else {
-      label = lives_standard_label_new (_("You are about to leave multitrack mode.\nThe current layout has been changed since the last save.\nWhat would you like to do ?\n"));
-    }
-  }
-  else if (type==1) {
-    if (!mainw->only_close) label = lives_standard_label_new (_("You are about to exit LiVES.\nThe current clip set can be saved.\nWhat would you like to do ?\n"));
-    else label = lives_standard_label_new (_("The current clip set has not been saved.\nWhat would you like to do ?\n"));
-  }
-  else if (type==2||type==3) {
+  } else if (type==1) {
+    if (!mainw->only_close) label = lives_standard_label_new(
+                                        _("You are about to exit LiVES.\nThe current clip set can be saved.\nWhat would you like to do ?\n"));
+    else label = lives_standard_label_new(_("The current clip set has not been saved.\nWhat would you like to do ?\n"));
+  } else if (type==2||type==3) {
     if ((mainw->multitrack!=NULL&&mainw->multitrack->changed)||(mainw->stored_event_list!=NULL&&mainw->stored_event_list_changed)) {
-      label = lives_standard_label_new (_("The current layout has not been saved.\nWhat would you like to do ?\n"));
-    }
-    else {
-      label = lives_standard_label_new (_("The current layout has *not* been changed since it was last saved.\nWhat would you like to do ?\n"));
+      label = lives_standard_label_new(_("The current layout has not been saved.\nWhat would you like to do ?\n"));
+    } else {
+      label = lives_standard_label_new(_("The current layout has *not* been changed since it was last saved.\nWhat would you like to do ?\n"));
     }
-  }
-  else if (type==4) {
+  } else if (type==4) {
     if (mainw->multitrack!=NULL&&mainw->multitrack->changed) {
-      label = lives_standard_label_new (_("The current layout contains generated frames and cannot be retained.\nYou may wish to render it before exiting multitrack mode.\n"));
-    }
-    else {
-      label = lives_standard_label_new (_("You are about to leave multitrack mode.\nThe current layout contains generated frames and cannot be retained.\nWhat do you wish to do ?"));
+      label = lives_standard_label_new(
+                _("The current layout contains generated frames and cannot be retained.\nYou may wish to render it before exiting multitrack mode.\n"));
+    } else {
+      label = lives_standard_label_new(
+                _("You are about to leave multitrack mode.\nThe current layout contains generated frames and cannot be retained.\nWhat do you wish to do ?"));
     }
   }
   widget_opts.justify=LIVES_JUSTIFY_DEFAULT;
 
-  lives_box_pack_start (LIVES_BOX (dialog_vbox), label, TRUE, TRUE, 0);
+  lives_box_pack_start(LIVES_BOX(dialog_vbox), label, TRUE, TRUE, 0);
 
   if (type==1) {
     LiVESWidget *checkbutton;
 
-    hbox = lives_hbox_new (FALSE, 0);
-    lives_box_pack_start (LIVES_BOX (dialog_vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
-    
-    cdsw->entry = lives_standard_entry_new (_("Clip set _name"),TRUE,strlen (mainw->set_name)?mainw->set_name:"",
-					    32.*widget_opts.scale,128.*widget_opts.scale,LIVES_BOX(hbox),NULL);
+    hbox = lives_hbox_new(FALSE, 0);
+    lives_box_pack_start(LIVES_BOX(dialog_vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
+
+    cdsw->entry = lives_standard_entry_new(_("Clip set _name"),TRUE,strlen(mainw->set_name)?mainw->set_name:"",
+                                           32.*widget_opts.scale,128.*widget_opts.scale,LIVES_BOX(hbox),NULL);
 
-    hbox = lives_hbox_new (FALSE, 0);
-    lives_box_pack_start (LIVES_BOX (dialog_vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
+    hbox = lives_hbox_new(FALSE, 0);
+    lives_box_pack_start(LIVES_BOX(dialog_vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
 
-    checkbutton = lives_standard_check_button_new (_("_Auto reload next time"),TRUE,LIVES_BOX(hbox),NULL);
+    checkbutton = lives_standard_check_button_new(_("_Auto reload next time"),TRUE,LIVES_BOX(hbox),NULL);
 
     if ((type==0&&prefs->ar_layout)||(type==1&&!mainw->only_close)) {
       lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(checkbutton),TRUE);
       if (type==1) prefs->ar_clipset=TRUE;
       else prefs->ar_layout=TRUE;
-    }
-    else {
+    } else {
       lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(checkbutton),FALSE);
       if (type==1) prefs->ar_clipset=FALSE;
       else prefs->ar_layout=FALSE;
     }
-    
-    g_object_set_data(G_OBJECT(checkbutton),"cdsw",(gpointer)cdsw);
-    
-    lives_signal_connect (LIVES_GUI_OBJECT (checkbutton), LIVES_WIDGET_TOGGLED_EVENT,
-		      LIVES_GUI_CALLBACK (on_autoreload_toggled),
-		      GINT_TO_POINTER(type));
+
+    lives_widget_object_set_data(LIVES_WIDGET_OBJECT(checkbutton),"cdsw",(livespointer)cdsw);
+
+    lives_signal_connect(LIVES_GUI_OBJECT(checkbutton), LIVES_WIDGET_TOGGLED_SIGNAL,
+                         LIVES_GUI_CALLBACK(on_autoreload_toggled),
+                         LIVES_INT_TO_POINTER(type));
   }
 
   if (type==0&&!(prefs->warning_mask&WARN_MASK_EXIT_MT)) {
     add_warn_check(LIVES_BOX(dialog_vbox),WARN_MASK_EXIT_MT);
   }
 
-  dialog_action_area = lives_dialog_get_action_area(LIVES_DIALOG (cdsw->dialog));
-  lives_button_box_set_layout (LIVES_BUTTON_BOX (dialog_action_area), LIVES_BUTTONBOX_END);
+  dialog_action_area = lives_dialog_get_action_area(LIVES_DIALOG(cdsw->dialog));
+  lives_button_box_set_layout(LIVES_BUTTON_BOX(dialog_action_area), LIVES_BUTTONBOX_END);
+
+  cancelbutton = lives_button_new_from_stock(LIVES_STOCK_CANCEL);
+  lives_dialog_add_action_widget(LIVES_DIALOG(cdsw->dialog), cancelbutton, LIVES_RESPONSE_CANCEL);
+  lives_widget_add_accelerator(cancelbutton, LIVES_WIDGET_CLICKED_SIGNAL, accel_group,
+                               LIVES_KEY_Escape, (LiVESXModifierType)0, (LiVESAccelFlags)0);
 
-  cancelbutton = lives_button_new_from_stock (LIVES_STOCK_CANCEL);
-  lives_dialog_add_action_widget (LIVES_DIALOG (cdsw->dialog), cancelbutton, 0);
-  lives_widget_add_accelerator (cancelbutton, LIVES_WIDGET_CLICKED_EVENT, accel_group,
-                              LIVES_KEY_Escape, (LiVESXModifierType)0, (LiVESAccelFlags)0);
+  discardbutton = lives_button_new_from_stock(LIVES_STOCK_DELETE);
 
-  discardbutton = lives_button_new_from_stock (LIVES_STOCK_DELETE);
-  lives_dialog_add_action_widget (LIVES_DIALOG (cdsw->dialog), discardbutton, 1+(type==2));
+  lives_dialog_add_action_widget(LIVES_DIALOG(cdsw->dialog), discardbutton, 1+(type==2));
   lives_button_set_use_underline(LIVES_BUTTON(discardbutton),TRUE);
-  if ((type==0&&strlen(mainw->multitrack->layout_name)==0)||type==3||type==4) 
+  if ((type==0&&strlen(mainw->multitrack->layout_name)==0)||type==3||type==4)
     lives_button_set_label(LIVES_BUTTON(discardbutton),_("_Wipe layout"));
   else if (type==0) lives_button_set_label(LIVES_BUTTON(discardbutton),_("_Ignore changes"));
   else if (type==1) lives_button_set_label(LIVES_BUTTON(discardbutton),_("_Delete clip set"));
   else if (type==2) lives_button_set_label(LIVES_BUTTON(discardbutton),_("_Delete layout"));
 
-  savebutton = lives_button_new_from_stock (LIVES_STOCK_SAVE);
+  savebutton = lives_button_new_from_stock(LIVES_STOCK_SAVE);
   lives_button_set_use_underline(LIVES_BUTTON(savebutton),TRUE);
   if (type==0||type==3) lives_button_set_label(LIVES_BUTTON(savebutton),_("_Save layout"));
   else if (type==1) lives_button_set_label(LIVES_BUTTON(savebutton),_("_Save clip set"));
   else if (type==2) lives_button_set_label(LIVES_BUTTON(savebutton),_("_Wipe layout"));
-  if (type!=4) lives_dialog_add_action_widget (LIVES_DIALOG (cdsw->dialog), savebutton, 2-(type==2));
-  lives_widget_set_can_focus_and_default (savebutton);
+  if (type!=4) lives_dialog_add_action_widget(LIVES_DIALOG(cdsw->dialog), savebutton, 2-(type==2));
+  lives_widget_set_can_focus_and_default(savebutton);
   if (type==1||type==2)lives_widget_grab_default(savebutton);
 
   lives_widget_show_all(cdsw->dialog);
@@ -2555,6 +2490,8 @@
     lives_widget_grab_focus(cdsw->entry);
   }
 
+  if (!mainw->interactive) lives_widget_set_sensitive(cancelbutton,FALSE);
+
   return cdsw;
 }
 
@@ -2568,8 +2505,8 @@
 }
 
 
-static void flip_cdisk_bit (LiVESToggleButton *t, gpointer user_data) {
-  uint32_t bitmask=GPOINTER_TO_INT(user_data);
+static void flip_cdisk_bit(LiVESToggleButton *t, livespointer user_data) {
+  uint32_t bitmask=LIVES_POINTER_TO_INT(user_data);
   prefs->clear_disk_opts^=bitmask;
 }
 
@@ -2584,9 +2521,11 @@
   LiVESWidget *okbutton;
   LiVESWidget *resetbutton;
 
-  gchar *tmp,*tmp2;
+  boolean woat=widget_opts.apply_theme;
 
-  dialog = lives_standard_dialog_new (_("LiVES: - Disk Recovery Options"),FALSE);
+  char *tmp,*tmp2;
+
+  dialog = lives_standard_dialog_new(_("LiVES: - Disk Recovery Options"),FALSE,-1,-1);
 
   if (prefs->show_gui) {
     if (mainw->multitrack==NULL) lives_window_set_transient_for(LIVES_WINDOW(dialog),LIVES_WINDOW(mainw->LiVES));
@@ -2595,59 +2534,62 @@
 
   dialog_vbox = lives_dialog_get_content_area(LIVES_DIALOG(dialog));
 
-  vbox = lives_vbox_new (FALSE, 0);
-  lives_container_set_border_width (LIVES_CONTAINER (vbox), widget_opts.border_width*2);
+  vbox = lives_vbox_new(FALSE, 0);
+  lives_container_set_border_width(LIVES_CONTAINER(vbox), widget_opts.border_width*2);
+
+  widget_opts.apply_theme=FALSE;
+  scrollw = lives_standard_scrolled_window_new(450.*widget_opts.scale,300.*widget_opts.scale,vbox);
+  widget_opts.apply_theme=woat;
 
-  scrollw = lives_standard_scrolled_window_new (450.*widget_opts.scale,300.*widget_opts.scale,vbox);
+  lives_container_add(LIVES_CONTAINER(dialog_vbox), scrollw);
 
-  lives_container_add (LIVES_CONTAINER (dialog_vbox), scrollw);
-   
-  hbox = lives_hbox_new (FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (vbox), hbox, FALSE, TRUE, widget_opts.packing_height);
+  hbox = lives_hbox_new(FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(vbox), hbox, FALSE, TRUE, widget_opts.packing_height);
 
-  checkbutton = lives_standard_check_button_new((tmp=g_strdup(_("Delete _Orphaned Clips"))),TRUE,LIVES_BOX(hbox),
-						(tmp2=g_strdup(_("Delete any clips which are not currently loaded or part of a set"))));
+  checkbutton = lives_standard_check_button_new((tmp=lives_strdup(_("Delete _Orphaned Clips"))),TRUE,LIVES_BOX(hbox),
+                (tmp2=lives_strdup(_("Delete any clips which are not currently loaded or part of a set"))));
 
-  g_free(tmp); g_free(tmp2);
+  lives_free(tmp);
+  lives_free(tmp2);
 
   lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(checkbutton), !(prefs->clear_disk_opts & LIVES_CDISK_LEAVE_ORPHAN_SETS));
 
-  lives_signal_connect_after (LIVES_GUI_OBJECT (checkbutton), LIVES_WIDGET_TOGGLED_EVENT,
-			  LIVES_GUI_CALLBACK (flip_cdisk_bit),
-			  GINT_TO_POINTER(LIVES_CDISK_LEAVE_ORPHAN_SETS));
+  lives_signal_connect_after(LIVES_GUI_OBJECT(checkbutton), LIVES_WIDGET_TOGGLED_SIGNAL,
+                             LIVES_GUI_CALLBACK(flip_cdisk_bit),
+                             LIVES_INT_TO_POINTER(LIVES_CDISK_LEAVE_ORPHAN_SETS));
 
-  hbox = lives_hbox_new (FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (vbox), hbox, FALSE, TRUE, widget_opts.packing_height);
+  hbox = lives_hbox_new(FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(vbox), hbox, FALSE, TRUE, widget_opts.packing_height);
 
   checkbutton = lives_standard_check_button_new(_("Clear _Backup Files from Closed Clips"),TRUE,LIVES_BOX(hbox),NULL);
 
   lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(checkbutton), !(prefs->clear_disk_opts & LIVES_CDISK_LEAVE_BFILES));
 
-  lives_signal_connect_after (LIVES_GUI_OBJECT (checkbutton), LIVES_WIDGET_TOGGLED_EVENT,
-			  LIVES_GUI_CALLBACK (flip_cdisk_bit),
-			  GINT_TO_POINTER(LIVES_CDISK_LEAVE_BFILES));
+  lives_signal_connect_after(LIVES_GUI_OBJECT(checkbutton), LIVES_WIDGET_TOGGLED_SIGNAL,
+                             LIVES_GUI_CALLBACK(flip_cdisk_bit),
+                             LIVES_INT_TO_POINTER(LIVES_CDISK_LEAVE_BFILES));
 
-  hbox = lives_hbox_new (FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (vbox), hbox, FALSE, TRUE, widget_opts.packing_height);
+  hbox = lives_hbox_new(FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(vbox), hbox, FALSE, TRUE, widget_opts.packing_height);
 
   checkbutton = lives_standard_check_button_new(_("Remove Sets which have _Layouts but no Clips"),TRUE,LIVES_BOX(hbox),NULL);
 
-  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(checkbutton), 
-				 (prefs->clear_disk_opts & LIVES_CDISK_REMOVE_ORPHAN_LAYOUTS));
-  
-  lives_signal_connect_after (LIVES_GUI_OBJECT (checkbutton), LIVES_WIDGET_TOGGLED_EVENT,
-			  LIVES_GUI_CALLBACK (flip_cdisk_bit),
-			  GINT_TO_POINTER(LIVES_CDISK_REMOVE_ORPHAN_LAYOUTS));
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(checkbutton),
+                                 (prefs->clear_disk_opts & LIVES_CDISK_REMOVE_ORPHAN_LAYOUTS));
+
+  lives_signal_connect_after(LIVES_GUI_OBJECT(checkbutton), LIVES_WIDGET_TOGGLED_SIGNAL,
+                             LIVES_GUI_CALLBACK(flip_cdisk_bit),
+                             LIVES_INT_TO_POINTER(LIVES_CDISK_REMOVE_ORPHAN_LAYOUTS));
 
-  resetbutton = lives_button_new_from_stock (LIVES_STOCK_REFRESH);
-  lives_dialog_add_action_widget (LIVES_DIALOG (dialog), resetbutton, LIVES_RETRY);
+  resetbutton = lives_button_new_from_stock(LIVES_STOCK_REFRESH);
+  lives_dialog_add_action_widget(LIVES_DIALOG(dialog), resetbutton, LIVES_RESPONSE_RETRY);
   lives_button_set_label(LIVES_BUTTON(resetbutton),_("_Reset to Defaults"));
 
-  okbutton = lives_button_new_from_stock (LIVES_STOCK_OK);
-  lives_dialog_add_action_widget (LIVES_DIALOG (dialog), okbutton, LIVES_RESPONSE_OK);
+  okbutton = lives_button_new_from_stock(LIVES_STOCK_OK);
+  lives_dialog_add_action_widget(LIVES_DIALOG(dialog), okbutton, LIVES_RESPONSE_OK);
 
-  lives_widget_set_can_focus_and_default (okbutton);
-  lives_widget_grab_default (okbutton);
+  lives_widget_set_can_focus_and_default(okbutton);
+  lives_widget_grab_default(okbutton);
   lives_button_set_label(LIVES_BUTTON(okbutton),_("_Accept"));
 
   return dialog;
@@ -2657,7 +2599,7 @@
 
 LiVESTextView *create_output_textview(void) {
   LiVESWidget *textview=lives_text_view_new();
-  lives_text_view_set_editable (LIVES_TEXT_VIEW (textview), FALSE);
+  lives_text_view_set_editable(LIVES_TEXT_VIEW(textview), FALSE);
 
   if (palette->style&STYLE_1) {
     lives_widget_set_base_color(textview, LIVES_WIDGET_STATE_NORMAL, &palette->info_base);

LiVES-2.2.8.tar.bz2/src/interface.h -> LiVES-2.4.1.tar.bz2/src/interface.h Changed

@@ -7,12 +7,12 @@
 #ifndef HAS_LIVES_INTERFACE_H
 #define HAS_LIVES_INTERFACE_H
 
-LiVESWidget* create_info_error_dialog (const gchar *text, boolean is_blocking, int mask, lives_info_t infotype);
-LiVESWidget* create_opensel_dialog (void);
-LiVESWidget* create_encoder_prep_dialog (const gchar *text1, const gchar *text2, boolean opt_resize);
+LiVESWidget *create_info_error_dialog(lives_dialog_t info_type, const char *text, LiVESWindow *transient, int mask, boolean is_blocking);
+LiVESWidget *create_opensel_dialog(void);
+LiVESWidget *create_encoder_prep_dialog(const char *text1, const char *text2, boolean opt_resize);
 
-void widget_add_preview(LiVESWidget *widget, LiVESBox *for_preview, LiVESBox *for_button, 
-			LiVESBox *for_deinterlace, int preview_type);  ///< for fileselector preview
+void widget_add_preview(LiVESWidget *widget, LiVESBox *for_preview, LiVESBox *for_button,
+                        LiVESBox *for_deinterlace, int preview_type);  ///< for fileselector preview
 
 boolean do_audio_choice_dialog(short startup_phase);
 
@@ -34,7 +34,7 @@
   LiVESWidget *textview_rrate;
 } lives_clipinfo_t;
 
-lives_clipinfo_t * create_clip_info_window (int audio_channels, boolean is_mt);
+lives_clipinfo_t *create_clip_info_window(int audio_channels, boolean is_mt);
 
 
 typedef struct {
@@ -43,12 +43,12 @@
   LiVESWidget *dir_entry;
   LiVESWidget *name_entry;
   LiVESWidget *warn_checkbutton;
-  GList *setlist;
+  LiVESList *setlist;
 } _entryw;
 
-_entryw* create_rename_dialog (int type);
-_entryw* create_location_dialog (int type);
-_entryw* create_cds_dialog (int type);
+_entryw *create_rename_dialog(int type);
+_entryw *create_location_dialog(int type);
+_entryw *create_cds_dialog(int type);
 
 typedef struct __insertw {
   LiVESWidget *insert_dialog;
@@ -58,7 +58,7 @@
   LiVESWidget *fit_checkbutton;
 } _insertw;
 
-_insertw* create_insert_dialog (void);
+_insertw *create_insert_dialog(void);
 
 
 typedef struct __commentsw {
@@ -70,7 +70,7 @@
   LiVESWidget *subt_entry;
 } _commentsw;
 
-_commentsw* create_comments_dialog (lives_clip_t *sfile, gchar *filename);
+_commentsw *create_comments_dialog(lives_clip_t *sfile, char *filename);
 
 
 typedef struct {
@@ -80,7 +80,7 @@
   LiVESWidget *textview;
 } text_window;
 
-text_window* create_text_window (const gchar *title_part, const gchar *text, LiVESTextBuffer *);
+text_window *create_text_window(const char *title_part, const char *text, LiVESTextBuffer *);
 
 
 typedef struct {
@@ -105,9 +105,18 @@
 } lives_tvcardw_t;
 
 
+#define LIVES_PREVIEW_TYPE_VIDEO_AUDIO 1
+#define LIVES_PREVIEW_TYPE_AUDIO_ONLY 2
+#define LIVES_PREVIEW_TYPE_RANGE 3
 
-aud_dialog_t *create_audfade_dialog (int type);
-LiVESWidget *create_combo_dialog (int type, gpointer user_data);
+#define LIVES_FILE_SELECTION_VIDEO_AUDIO 1
+#define LIVES_FILE_SELECTION_AUDIO_ONLY 2
+#define LIVES_FILE_SELECTION_VIDEO_AUDIO_MULTI 3
+#define LIVES_FILE_SELECTION_VIDEO_RANGE 4
+
+
+aud_dialog_t *create_audfade_dialog(int type);
+LiVESWidget *create_combo_dialog(int type, livespointer user_data);
 
 _commentsw *commentsw;
 _entryw *renamew;
@@ -119,5 +128,7 @@
 #define DEF_AUD_FADE_SECS 10. ///< default time to offer fade audio in/out for
 
 
+#define MIN_MSGBOX_WIDTH ((int)(mainw->scr_width>1024?(820.*widget_opts.scale):600))
+
 
 #endif

LiVES-2.2.8.tar.bz2/src/jack.c -> LiVES-2.4.1.tar.bz2/src/jack.c Changed

@@ -10,7 +10,6 @@
 
 #ifdef ENABLE_JACK
 #include "callbacks.h"
-#include "support.h"
 #include "effects.h"
 #include "effects-weed.h"
 
@@ -23,12 +22,12 @@
 
 static boolean seek_err;
 
-static size_t audio_read_inner(jack_driver_t *jackd, float **in_buffer, int fileno, 
-			       int nframes, double out_scale, boolean rev_endian, boolean out_unsigned, size_t rbytes);
+static size_t audio_read_inner(jack_driver_t *jackd, float **in_buffer, int fileno,
+                               int nframes, double out_scale, boolean rev_endian, boolean out_unsigned, size_t rbytes);
 
 static boolean check_zero_buff(size_t check_size) {
   if (check_size>zero_buff_count) {
-    zero_buff=(unsigned char *)g_try_realloc(zero_buff,check_size);
+    zero_buff=(unsigned char *)lives_try_realloc(zero_buff,check_size);
     if (zero_buff) {
       memset(zero_buff+zero_buff_count,0,check_size-zero_buff_count);
       zero_buff_count=check_size;
@@ -40,8 +39,8 @@
   return TRUE;
 }
 
-boolean lives_jack_init (void) {
-  gchar *jt_client=g_strdup_printf("LiVES-%d",capable->mainpid);
+boolean lives_jack_init(void) {
+  char *jt_client=lives_strdup_printf("LiVES-%d",capable->mainpid);
   const char *server_name="default";
   jack_options_t options=JackServerName;
   jack_status_t status;
@@ -49,59 +48,58 @@
   jack_transport_client=NULL;
 
   if ((prefs->jack_opts&JACK_OPTS_START_TSERVER)||(prefs->jack_opts&JACK_OPTS_START_ASERVER)) {
-    unsetenv ("JACK_NO_START_SERVER");
-    setenv ("JACK_START_SERVER","1",0);
+    unsetenv("JACK_NO_START_SERVER");
+    setenv("JACK_START_SERVER","1",0);
 
-    if (!g_file_test(prefs->jack_aserver,G_FILE_TEST_EXISTS)) {
-      gchar *com;
+    if (!lives_file_test(prefs->jack_aserver,LIVES_FILE_TEST_EXISTS)) {
+      char *com;
       char jackd_loc[PATH_MAX];
       get_location("jackd",jackd_loc,PATH_MAX);
       if (strlen(jackd_loc)) {
 
 #ifndef IS_DARWIN
-	com=g_strdup_printf("echo \"%s -d alsa\">\"%s\"",jackd_loc,prefs->jack_aserver);
+        com=lives_strdup_printf("echo \"%s -d alsa\">\"%s\"",jackd_loc,prefs->jack_aserver);
 #else
 #ifdef IS_SOLARIS
-	// use OSS on Solaris
-	com=g_strdup_printf("echo \"%s -d oss\">\"%s\"",jackd_loc,prefs->jack_aserver);
+        // use OSS on Solaris
+        com=lives_strdup_printf("echo \"%s -d oss\">\"%s\"",jackd_loc,prefs->jack_aserver);
 #else
-	// use coreaudio on Darwin
-	com=g_strdup_printf("echo \"%s -d coreaudio\">\"%s\"",jackd_loc,prefs->jack_aserver);
+        // use coreaudio on Darwin
+        com=lives_strdup_printf("echo \"%s -d coreaudio\">\"%s\"",jackd_loc,prefs->jack_aserver);
 #endif
 #endif
-	lives_system(com,FALSE);
-	g_free(com);
-	com=g_strdup_printf("/bin/chmod o+x \"%s\"",prefs->jack_aserver);
-	lives_system(com,FALSE);
-	g_free(com);
+        lives_system(com,FALSE);
+        lives_free(com);
+        com=lives_strdup_printf("%s o+x \"%s\"",capable->chmod_cmd,prefs->jack_aserver);
+        lives_system(com,FALSE);
+        lives_free(com);
       }
     }
 
-  }
-  else {
-    unsetenv ("JACK_START_SERVER");
-    setenv ("JACK_NO_START_SERVER","1",0);
+  } else {
+    unsetenv("JACK_START_SERVER");
+    setenv("JACK_NO_START_SERVER","1",0);
     options=(jack_options_t)((int)options | (int)JackNoStartServer);
   }
 
   // startup the server
-  jack_transport_client=jack_client_open (jt_client, options, &status, server_name);
-  g_free(jt_client);
+  jack_transport_client=jack_client_open(jt_client, options, &status, server_name);
+  lives_free(jt_client);
 
   if (jack_transport_client==NULL) return FALSE;
 
 #ifdef ENABLE_JACK_TRANSPORT
   jack_activate(jack_transport_client);
   jack_set_sync_timeout(jack_transport_client,5000000); // seems to not work
-  jack_set_sync_callback (jack_transport_client, lives_start_ready_callback, NULL);
+  jack_set_sync_callback(jack_transport_client, lives_start_ready_callback, NULL);
   mainw->jack_trans_poll=TRUE;
 #else
-  jack_client_close (jack_transport_client);
+  jack_client_close(jack_transport_client);
   jack_transport_client=NULL;
 #endif
 
   if (status&JackServerStarted) {
-    d_print (_("JACK server started\n"));
+    d_print(_("JACK server started\n"));
   }
 
   return TRUE;
@@ -117,10 +115,10 @@
 #ifdef ENABLE_JACK_TRANSPORT
   uint64_t val;
 
-  jack_nframes_t srate; 
+  jack_nframes_t srate;
   jack_position_t pos;
 
-  jack_transport_query (jack_transport_client, &pos);
+  jack_transport_query(jack_transport_client, &pos);
 
   srate=jack_get_sample_rate(jack_transport_client);
   val=(double)pos.frame/(double)srate;
@@ -135,7 +133,7 @@
 
 
 #ifdef ENABLE_JACK_TRANSPORT
-static void jack_transport_check_state (void) {
+static void jack_transport_check_state(void) {
   jack_position_t pos;
   jack_transport_state_t jacktstate;
 
@@ -146,14 +144,14 @@
 
   if (jack_transport_client==NULL) return;
 
-  jacktstate=jack_transport_query (jack_transport_client, &pos);
+  jacktstate=jack_transport_query(jack_transport_client, &pos);
 
   if (mainw->jack_can_start&&(jacktstate==JackTransportRolling||jacktstate==JackTransportStarting)&&
       mainw->playing_file==-1&&mainw->current_file>0&&!mainw->is_processing) {
     mainw->jack_can_start=FALSE;
     mainw->jack_can_stop=TRUE;
     // re - add the timer, as we will hang here, and we want to receive messages still during playback
-    lives_timer_remove (mainw->kb_timer);
+    lives_timer_remove(mainw->kb_timer);
     mainw->kb_timer=lives_timer_add(KEY_RPT_INTERVAL,&ext_triggers_poll,NULL);
 
     on_playall_activate(NULL,NULL);
@@ -164,7 +162,7 @@
 
   if (jacktstate==JackTransportStopped) {
     if (mainw->playing_file>-1&&mainw->jack_can_stop) {
-      on_stop_activate (NULL,NULL);
+      on_stop_activate(NULL,NULL);
     }
     mainw->jack_can_start=TRUE;
   }
@@ -180,31 +178,31 @@
   return TRUE;
 }
 
-void lives_jack_end (void) {
+void lives_jack_end(void) {
 #ifdef ENABLE_JACK_TRANSPORT
   jack_client_t *client=jack_transport_client;
 #endif
   jack_transport_client=NULL; // stop polling transport
 #ifdef ENABLE_JACK_TRANSPORT
   if (client!=NULL) {
-    jack_deactivate (client);
-    jack_client_close (client);
+    jack_deactivate(client);
+    jack_client_close(client);
   }
 #endif
 }
 
 
-void jack_pb_start (void) {
+void jack_pb_start(void) {
   // call this ASAP, then in load_frame_image; we will wait for sync from other clients (and ourself !)
 #ifdef ENABLE_JACK_TRANSPORT
-  if (prefs->jack_opts&JACK_OPTS_TRANSPORT_MASTER) jack_transport_start (jack_transport_client);
+  if (prefs->jack_opts&JACK_OPTS_TRANSPORT_MASTER) jack_transport_start(jack_transport_client);
 #endif
 }
 
-void jack_pb_stop (void) {
+void jack_pb_stop(void) {
   // call this after pb stops
 #ifdef ENABLE_JACK_TRANSPORT
-  if (prefs->jack_opts&JACK_OPTS_TRANSPORT_MASTER) jack_transport_stop (jack_transport_client);
+  if (prefs->jack_opts&JACK_OPTS_TRANSPORT_MASTER) jack_transport_stop(jack_transport_client);
 #endif
 }
 
@@ -253,26 +251,26 @@
 }
 
 
-static void push_cache_buffer (lives_audio_buf_t *cache_buffer, jack_driver_t *jackd, 
-			       size_t in_bytes, size_t nframes, double shrink_factor) {
+static void push_cache_buffer(lives_audio_buf_t *cache_buffer, jack_driver_t *jackd,
+                              size_t in_bytes, size_t nframes, double shrink_factor) {
 
   // push a cache_buffer for another thread to fill
 
   cache_buffer->fileno = jackd->playing_file;
   cache_buffer->seek = jackd->seek_pos;
   cache_buffer->bytesize = in_bytes;
-  
+
   cache_buffer->in_achans = jackd->num_input_channels;
   cache_buffer->out_achans = jackd->num_output_channels;
-  
+
   cache_buffer->in_asamps = afile->asampsize;
   cache_buffer->out_asamps = -32;  ///< 32 bit float
-  
+
   cache_buffer->shrink_factor = shrink_factor;
-  
+
   cache_buffer->swap_sign = jackd->usigned;
   cache_buffer->swap_endian = jackd->reverse_endian?SWAP_X_TO_L:0;
-  
+
   cache_buffer->samp_space=nframes;
 
   cache_buffer->in_interleaf=TRUE;
@@ -283,7 +281,7 @@
 }
 
 
-static lives_audio_buf_t *pop_cache_buffer (void) {
+static lives_audio_buf_t *pop_cache_buffer(void) {
   // get next available cache_buffer
 
   lives_audio_buf_t *cache_buffer=audio_cache_get_buffer();
@@ -293,10 +291,10 @@
 
 
 
-static int audio_process (nframes_t nframes, void *arg) {
+static int audio_process(nframes_t nframes, void *arg) {
   // JACK calls this periodically to get the next audio buffer
-  float* out_buffer[JACK_MAX_OUTPUT_PORTS];
-  jack_driver_t* jackd = (jack_driver_t*)arg;
+  float *out_buffer[JACK_MAX_OUTPUT_PORTS];
+  jack_driver_t *jackd = (jack_driver_t *)arg;
   jack_position_t pos;
   register int i;
   aserver_message_t *msg;
@@ -309,7 +307,7 @@
   size_t nbytes,rbytes;
 
 #ifdef DEBUG_AJACK
-  g_printerr("nframes %ld, sizeof(float) == %d\n", (int64_t)nframes, sizeof(float));
+  lives_printerr("nframes %ld, sizeof(float) == %d\n", (int64_t)nframes, sizeof(float));
 #endif
 
   if (!mainw->is_ready||jackd==NULL||(mainw->playing_file==-1&&jackd->is_silent&&jackd->msgq==NULL)) return 0;
@@ -322,7 +320,7 @@
     case ASERVER_CMD_FILE_OPEN:
       new_file=atoi((char *)msg->data);
       if (jackd->playing_file!=new_file) {
-	jackd->playing_file=new_file;
+        jackd->playing_file=new_file;
       }
       // TODO - use afile
       jackd->num_input_channels=afile->achans;
@@ -344,53 +342,53 @@
     default:
       msg->data=NULL;
     }
-    if (msg->data!=NULL) g_free((char *)msg->data);
+    if (msg->data!=NULL) lives_free((char *)msg->data);
     msg->command=ASERVER_CMD_PROCESSED;
-    if (msg->next==NULL) jackd->msgq=NULL; 
+    if (msg->next==NULL) jackd->msgq=NULL;
     else jackd->msgq = msg->next;
   }
 
   if (nframes==0) return 0;
 
   /* retrieve the buffers for the output ports */
-  for (i = 0; i < jackd->num_output_channels; i++) 
-    out_buffer[i] = (float *) jack_port_get_buffer(jackd->output_port[i], 
-						   nframes);
+  for (i = 0; i < jackd->num_output_channels; i++)
+    out_buffer[i] = (float *) jack_port_get_buffer(jackd->output_port[i],
+                    nframes);
   if (mainw->agen_key==0||mainw->agen_needs_reinit||mainw->multitrack!=NULL) {
     // if a plugin is generating audio we do not use cache_buffers, otherwise:
     if (jackd->read_abuf==-1) {
       // assign local copy from cache_buffers
-      if (mainw->playing_file==-1 || ( cache_buffer = pop_cache_buffer() )==NULL || !cache_buffer->is_ready ) {
-	// audio buffer is not ready yet
-	if (mainw->audio_frame_buffer!=NULL) {
-	  pthread_mutex_lock(&mainw->abuf_frame_mutex);
-	}
-	for(i = 0; i < jackd->num_output_channels; i++) {
-	  if (!jackd->is_silent) {
-	    sample_silence_dS(out_buffer[i], nframes);
-	  }
-	  if (mainw->audio_frame_buffer!=NULL) {
-	    append_to_audio_bufferf(mainw->audio_frame_buffer,out_buffer[i],nframes,i);
-	  }
-	}
-	if (mainw->audio_frame_buffer!=NULL) {
-	  mainw->audio_frame_buffer->samples_filled+=nframes;
-	  pthread_mutex_unlock(&mainw->abuf_frame_mutex);
-	}
-	jackd->is_silent=TRUE;
-	return 0;
+      if (mainw->playing_file==-1 || (cache_buffer = pop_cache_buffer())==NULL || !cache_buffer->is_ready) {
+        // audio buffer is not ready yet
+        if (mainw->audio_frame_buffer!=NULL) {
+          pthread_mutex_lock(&mainw->abuf_frame_mutex);
+        }
+        for (i = 0; i < jackd->num_output_channels; i++) {
+          if (!jackd->is_silent) {
+            sample_silence_dS(out_buffer[i], nframes);
+          }
+          if (mainw->audio_frame_buffer!=NULL) {
+            append_to_audio_bufferf(mainw->audio_frame_buffer,out_buffer[i],nframes,i);
+          }
+        }
+        if (mainw->audio_frame_buffer!=NULL) {
+          mainw->audio_frame_buffer->samples_filled+=nframes;
+          pthread_mutex_unlock(&mainw->abuf_frame_mutex);
+        }
+        jackd->is_silent=TRUE;
+        return 0;
       }
       if (cache_buffer->fileno==-1) jackd->playing_file=-1;
     }
-    
-    if (cache_buffer!=NULL && cache_buffer->in_achans>0 && !cache_buffer->is_ready ) wait_cache_buffer=TRUE;
+
+    if (cache_buffer!=NULL && cache_buffer->in_achans>0 && !cache_buffer->is_ready) wait_cache_buffer=TRUE;
   }
 
-  jackd->state=jack_transport_query (jackd->client, &pos);
+  jackd->state=jack_transport_query(jackd->client, &pos);
 
 
 #ifdef DEBUG_AJACK
-  g_printerr("STATE is %d %d\n",jackd->state,jackd->play_when_stopped);
+  lives_printerr("STATE is %d %d\n",jackd->state,jackd->play_when_stopped);
 #endif
 
   /* handle playing state */
@@ -406,31 +404,31 @@
     lives_clip_t *xfile=afile;
 
 #ifdef DEBUG_AJACK
-    g_printerr("playing... jackFramesAvailable = %ld\n", jackFramesAvailable);
+    lives_printerr("playing... jackFramesAvailable = %ld\n", jackFramesAvailable);
 #endif
 
     jackd->num_calls++;
 
 
     if (!jackd->in_use||((jackd->playing_file<0||jackd->seek_pos<0.)&&jackd->read_abuf<0
-			  &&(mainw->agen_key==0||mainw->multitrack!=NULL))
-			 ||jackd->is_paused) {
+                         &&(mainw->agen_key==0||mainw->multitrack!=NULL))
+        ||jackd->is_paused) {
 
       /* output silence if nothing is being outputted */
       if (!jackd->is_silent) {
-	if (mainw->audio_frame_buffer!=NULL) {
-	  pthread_mutex_lock(&mainw->abuf_frame_mutex);
-	}
-	for(i = 0; i < jackd->num_output_channels; i++) {
-	  sample_silence_dS(out_buffer[i], nframes);
-	  if (mainw->audio_frame_buffer!=NULL) {
-	    append_to_audio_bufferf(mainw->audio_frame_buffer,out_buffer[i],nframes,i);
-	  }
-	}
-	if (mainw->audio_frame_buffer!=NULL) {
-	  mainw->audio_frame_buffer->samples_filled+=nframes;
-	  pthread_mutex_unlock(&mainw->abuf_frame_mutex);
-	}
+        if (mainw->audio_frame_buffer!=NULL) {
+          pthread_mutex_lock(&mainw->abuf_frame_mutex);
+        }
+        for (i = 0; i < jackd->num_output_channels; i++) {
+          sample_silence_dS(out_buffer[i], nframes);
+          if (mainw->audio_frame_buffer!=NULL) {
+            append_to_audio_bufferf(mainw->audio_frame_buffer,out_buffer[i],nframes,i);
+          }
+        }
+        if (mainw->audio_frame_buffer!=NULL) {
+          mainw->audio_frame_buffer->samples_filled+=nframes;
+          pthread_mutex_unlock(&mainw->abuf_frame_mutex);
+        }
       }
 
       jackd->is_silent=TRUE;
@@ -442,526 +440,510 @@
 
       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;
+        jackd->seek_pos+=nframes*afile->achans*afile->asampsize/8;
       }
       return 0;
     }
 
     jackd->is_silent=FALSE;
 
-    if (G_LIKELY(jackFramesAvailable>0)) {
+    if (LIVES_LIKELY(jackFramesAvailable>0)) {
       /* (bytes of data) / (2 bytes(16 bits) * X input channels) == frames */
 
       if (mainw->playing_file>-1&&jackd->read_abuf>-1) {
-	// playing back from memory buffers instead of from file
-	// this is used in multitrack
-	from_memory=TRUE;
-
-	numFramesToWrite=jackFramesAvailable;
-	jackd->frames_written+=numFramesToWrite;
-	jackFramesAvailable=0;
-
-      }
-      else {
-
-	if (G_LIKELY(jackd->playing_file>=0)) {
-
-	  if (jackd->playing_file==mainw->ascrap_file&&mainw->playing_file>=-1&&mainw->files[mainw->playing_file]->achans>0) {
-	    xfile=mainw->files[mainw->playing_file];
-	  }
-
-	  in_bytes=ABS((in_frames=((double)jackd->sample_in_rate/(double)jackd->sample_out_rate*
-				   (double)jackFramesAvailable+((double)fastrand()/(double)G_MAXUINT32))))
-	    *jackd->num_input_channels*jackd->bytes_per_channel;
-	  if ((shrink_factor=(float)in_frames/(float)jackFramesAvailable)<0.f) {
-	    // reverse playback
-	    if ((jackd->seek_pos-=in_bytes)<0) {
-	      // reached beginning backwards
-
-	      if (jackd->loop==AUDIO_LOOP_NONE) {
-		if (*jackd->whentostop==STOP_ON_AUD_END) {
-		  *jackd->cancelled=CANCEL_AUD_END;
-		}
-		jackd->in_use=FALSE;
-		jack_set_rec_avals(jackd,FALSE);
-	      }
-	      else {
-		if (jackd->loop==AUDIO_LOOP_PINGPONG) {
-		  jackd->sample_in_rate=-jackd->sample_in_rate;
-		  shrink_factor=-shrink_factor;
-		  jackd->seek_pos=0;
-		  jack_set_rec_avals(jackd,TRUE);
-		}
-		else jackd->seek_pos=jackd->seek_end-in_bytes;
-		jack_set_rec_avals(jackd,FALSE);
-	      }
-	    }
-	  }
-
-	  // TODO - look into refactoring
-	  if (jackd->mute) {
-	    if (shrink_factor>0.f) jackd->seek_pos+=in_bytes;
-	    if (jackd->seek_pos>=jackd->seek_end) {
-	      if (*jackd->whentostop==STOP_ON_AUD_END) {
-		*jackd->cancelled=CANCEL_AUD_END;
-		jackd->in_use=FALSE;
-	      }
-	      else {
-		if (jackd->loop==AUDIO_LOOP_PINGPONG) {
-		  jackd->sample_in_rate=-jackd->sample_in_rate;
-		  jackd->seek_pos-=(jackd->seek_pos - jackd->seek_end);
-		}
-		else {
-		  jackd->seek_pos=0;
-		}
-	      }
-	    }
-
-	    if (!wait_cache_buffer&&((mainw->agen_key==0&&!mainw->agen_needs_reinit)||mainw->multitrack!=NULL)) 
-	      push_cache_buffer( cache_buffer, jackd, in_bytes, nframes, shrink_factor );
-
-	    if (mainw->audio_frame_buffer!=NULL) {
-	      pthread_mutex_lock(&mainw->abuf_frame_mutex);
-	    }
-	    for(i = 0; i < jackd->num_output_channels; i++) {
-	      sample_silence_dS(out_buffer[i], nframes);
-	      if (mainw->audio_frame_buffer!=NULL) {
-		append_to_audio_bufferf(mainw->audio_frame_buffer,out_buffer[i],nframes,i);
-	      }
-	    }
-	    if (mainw->audio_frame_buffer!=NULL) {
-	      mainw->audio_frame_buffer->samples_filled+=nframes;
-	      pthread_mutex_unlock(&mainw->abuf_frame_mutex);
-	    }
-
-	    // external streaming
-	    rbytes=nframes*jackd->num_output_channels*2;
-	    check_zero_buff(rbytes);
-	    audio_stream(zero_buff,rbytes,jackd->astream_fd);
-
-	    jackd->frames_written+=nframes;
-	    return 0;
-	  }
-
-	  else {
-	    if (shrink_factor>0.) {
-	      if (!(*jackd->cancelled)) {
-		boolean eof=FALSE;
-
-		if (mainw->agen_key==0) eof=cache_buffer->eof;
-		else if (jackd->playing_file>-1 && xfile!=NULL && xfile->afilesize <=jackd->seek_pos) eof=TRUE;
-
-		if (eof) {
-		  // reached the end, forwards
-
-		  if (*jackd->whentostop==STOP_ON_AUD_END) {
-		    jackd->in_use=FALSE;
-		    *jackd->cancelled=CANCEL_AUD_END;
-		  }
-		  else {
-		    if (jackd->loop==AUDIO_LOOP_PINGPONG) {
-		      jackd->sample_in_rate=-jackd->sample_in_rate;
-		      jackd->seek_pos-=in_bytes; // TODO
-		      jack_set_rec_avals(jackd,FALSE);
-		    }
-		    else {
-		      if (jackd->loop!=AUDIO_LOOP_NONE) {
-			jackd->seek_pos=0;
-			jack_set_rec_avals(jackd,TRUE);
-		      }
-		      else {
-			jackd->in_use=FALSE;
-			jack_set_rec_avals(jackd,TRUE);
-		      }
-		    }
-		  }
-		}
-	      }
-	    }
-	  }
-	  xin_bytes=in_bytes;
-	}
-	if (mainw->agen_key!=0&&mainw->multitrack==NULL) {
-	  in_bytes=jackFramesAvailable*jackd->num_output_channels*4;
-	  if (xin_bytes==0) xin_bytes=in_bytes;
-	}
-
-	if (!jackd->in_use||in_bytes==0) {
-	  // reached end of audio with no looping
-
-	  if (mainw->audio_frame_buffer!=NULL) {
-	    pthread_mutex_lock(&mainw->abuf_frame_mutex);
-	  }
-	  for(i = 0; i < jackd->num_output_channels; i++) {
-	    sample_silence_dS(out_buffer[i], nframes);
-	    if (mainw->audio_frame_buffer!=NULL) {
-	      append_to_audio_bufferf(mainw->audio_frame_buffer,out_buffer[i],nframes,i);
-	    }
-	  }
-	  if (mainw->audio_frame_buffer!=NULL) {
-	    mainw->audio_frame_buffer->samples_filled+=nframes;
-	    pthread_mutex_unlock(&mainw->abuf_frame_mutex);
-	  }
-
-	  jackd->is_silent=TRUE;
-
-	  // external streaming
-	  rbytes=nframes*jackd->num_output_channels*2;
-	  check_zero_buff(rbytes);
-	  audio_stream(zero_buff,rbytes,jackd->astream_fd);
-
-	  if (!jackd->is_paused) jackd->frames_written+=nframes;
-	  if (jackd->seek_pos<0.&&jackd->playing_file>-1&&xfile!=NULL) {
-	    jackd->seek_pos+=nframes*xfile->achans*xfile->asampsize/8;
-	  }
-	  return 0;
-	}
-	
-	if (mainw->multitrack!=NULL||(mainw->agen_key==0&&!mainw->agen_needs_reinit)) 
-	  inputFramesAvailable = cache_buffer->samp_space;
-	else inputFramesAvailable=jackFramesAvailable;
+        // playing back from memory buffers instead of from file
+        // this is used in multitrack
+        from_memory=TRUE;
+
+        numFramesToWrite=jackFramesAvailable;
+        jackd->frames_written+=numFramesToWrite;
+        jackFramesAvailable=0;
+
+      } else {
+
+        if (LIVES_LIKELY(jackd->playing_file>=0)) {
+
+          if (jackd->playing_file==mainw->ascrap_file&&mainw->playing_file>=-1&&mainw->files[mainw->playing_file]->achans>0) {
+            xfile=mainw->files[mainw->playing_file];
+          }
+
+          in_bytes=ABS((in_frames=((double)jackd->sample_in_rate/(double)jackd->sample_out_rate*
+                                   (double)jackFramesAvailable+((double)fastrand()/(double)LIVES_MAXUINT32))))
+                   *jackd->num_input_channels*jackd->bytes_per_channel;
+          if ((shrink_factor=(float)in_frames/(float)jackFramesAvailable)<0.f) {
+            // reverse playback
+            if ((jackd->seek_pos-=in_bytes)<0) {
+              // reached beginning backwards
+
+              if (jackd->loop==AUDIO_LOOP_NONE) {
+                if (*jackd->whentostop==STOP_ON_AUD_END) {
+                  *jackd->cancelled=CANCEL_AUD_END;
+                }
+                jackd->in_use=FALSE;
+                jack_set_rec_avals(jackd,FALSE);
+              } else {
+                if (jackd->loop==AUDIO_LOOP_PINGPONG) {
+                  jackd->sample_in_rate=-jackd->sample_in_rate;
+                  shrink_factor=-shrink_factor;
+                  jackd->seek_pos=0;
+                  jack_set_rec_avals(jackd,TRUE);
+                } else jackd->seek_pos=jackd->seek_end-in_bytes;
+                jack_set_rec_avals(jackd,FALSE);
+              }
+            }
+          }
+
+          // TODO - look into refactoring
+          if (jackd->mute) {
+            if (shrink_factor>0.f) jackd->seek_pos+=in_bytes;
+            if (jackd->seek_pos>=jackd->seek_end) {
+              if (*jackd->whentostop==STOP_ON_AUD_END) {
+                *jackd->cancelled=CANCEL_AUD_END;
+                jackd->in_use=FALSE;
+              } else {
+                if (jackd->loop==AUDIO_LOOP_PINGPONG) {
+                  jackd->sample_in_rate=-jackd->sample_in_rate;
+                  jackd->seek_pos-=(jackd->seek_pos - jackd->seek_end);
+                } else {
+                  jackd->seek_pos=0;
+                }
+              }
+            }
+
+            if (!wait_cache_buffer&&((mainw->agen_key==0&&!mainw->agen_needs_reinit)||mainw->multitrack!=NULL))
+              push_cache_buffer(cache_buffer, jackd, in_bytes, nframes, shrink_factor);
+
+            if (mainw->audio_frame_buffer!=NULL) {
+              pthread_mutex_lock(&mainw->abuf_frame_mutex);
+            }
+            for (i = 0; i < jackd->num_output_channels; i++) {
+              sample_silence_dS(out_buffer[i], nframes);
+              if (mainw->audio_frame_buffer!=NULL) {
+                append_to_audio_bufferf(mainw->audio_frame_buffer,out_buffer[i],nframes,i);
+              }
+            }
+            if (mainw->audio_frame_buffer!=NULL) {
+              mainw->audio_frame_buffer->samples_filled+=nframes;
+              pthread_mutex_unlock(&mainw->abuf_frame_mutex);
+            }
+
+            // external streaming
+            rbytes=nframes*jackd->num_output_channels*2;
+            check_zero_buff(rbytes);
+            audio_stream(zero_buff,rbytes,jackd->astream_fd);
+
+            jackd->frames_written+=nframes;
+            return 0;
+          }
+
+          else {
+            if (shrink_factor>0.) {
+              if (!(*jackd->cancelled)) {
+                boolean eof=FALSE;
+
+                if (mainw->agen_key==0) eof=cache_buffer->eof;
+                else if (jackd->playing_file>-1 && xfile!=NULL && xfile->afilesize <=jackd->seek_pos) eof=TRUE;
+
+                if (eof) {
+                  // reached the end, forwards
+
+                  if (*jackd->whentostop==STOP_ON_AUD_END) {
+                    jackd->in_use=FALSE;
+                    *jackd->cancelled=CANCEL_AUD_END;
+                  } else {
+                    if (jackd->loop==AUDIO_LOOP_PINGPONG) {
+                      jackd->sample_in_rate=-jackd->sample_in_rate;
+                      jackd->seek_pos-=in_bytes; // TODO
+                      jack_set_rec_avals(jackd,FALSE);
+                    } else {
+                      if (jackd->loop!=AUDIO_LOOP_NONE) {
+                        jackd->seek_pos=0;
+                        jack_set_rec_avals(jackd,TRUE);
+                      } else {
+                        jackd->in_use=FALSE;
+                        jack_set_rec_avals(jackd,TRUE);
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+          xin_bytes=in_bytes;
+        }
+        if (mainw->agen_key!=0&&mainw->multitrack==NULL) {
+          in_bytes=jackFramesAvailable*jackd->num_output_channels*4;
+          if (xin_bytes==0) xin_bytes=in_bytes;
+        }
+
+        if (!jackd->in_use||in_bytes==0) {
+          // reached end of audio with no looping
+
+          if (mainw->audio_frame_buffer!=NULL) {
+            pthread_mutex_lock(&mainw->abuf_frame_mutex);
+          }
+          for (i = 0; i < jackd->num_output_channels; i++) {
+            sample_silence_dS(out_buffer[i], nframes);
+            if (mainw->audio_frame_buffer!=NULL) {
+              append_to_audio_bufferf(mainw->audio_frame_buffer,out_buffer[i],nframes,i);
+            }
+          }
+          if (mainw->audio_frame_buffer!=NULL) {
+            mainw->audio_frame_buffer->samples_filled+=nframes;
+            pthread_mutex_unlock(&mainw->abuf_frame_mutex);
+          }
+
+          jackd->is_silent=TRUE;
+
+          // external streaming
+          rbytes=nframes*jackd->num_output_channels*2;
+          check_zero_buff(rbytes);
+          audio_stream(zero_buff,rbytes,jackd->astream_fd);
+
+          if (!jackd->is_paused) jackd->frames_written+=nframes;
+          if (jackd->seek_pos<0.&&jackd->playing_file>-1&&xfile!=NULL) {
+            jackd->seek_pos+=nframes*xfile->achans*xfile->asampsize/8;
+          }
+          return 0;
+        }
+
+        if (mainw->multitrack!=NULL||(mainw->agen_key==0&&!mainw->agen_needs_reinit))
+          inputFramesAvailable = cache_buffer->samp_space;
+        else inputFramesAvailable=jackFramesAvailable;
 
 #ifdef DEBUG_AJACK
-	g_printerr("%d inputFramesAvailable == %ld, %ld %ld,jackFramesAvailable == %ld\n", inputFramesAvailable, 
-		   in_frames,jackd->sample_in_rate,jackd->sample_out_rate,jackFramesAvailable);
+        lives_printerr("%d inputFramesAvailable == %ld, %ld %ld,jackFramesAvailable == %ld\n", inputFramesAvailable,
+                       in_frames,jackd->sample_in_rate,jackd->sample_out_rate,jackFramesAvailable);
 #endif
-	
-	/* write as many bytes as we have space remaining, or as much as we have data to write */
-	numFramesToWrite = MIN(jackFramesAvailable, inputFramesAvailable);
+
+        /* write as many bytes as we have space remaining, or as much as we have data to write */
+        numFramesToWrite = MIN(jackFramesAvailable, inputFramesAvailable);
 
 #ifdef DEBUG_AJACK
-	g_printerr("nframes == %d, jackFramesAvailable == %ld,\n\tjackd->num_input_channels == %ld, jackd->num_output_channels == %ld, nf2w %ld, in_bytes %d, sf %.8f\n",  nframes, jackFramesAvailable, jackd->num_input_channels, jackd->num_output_channels, numFramesToWrite, in_bytes, shrink_factor);
+        lives_printerr("nframes == %d, jackFramesAvailable == %ld,\n\tjackd->num_input_channels == %ld, jackd->num_output_channels == %ld, nf2w %ld, in_bytes %d, sf %.8f\n",
+                       nframes, jackFramesAvailable, jackd->num_input_channels, jackd->num_output_channels, numFramesToWrite, in_bytes, shrink_factor);
 #endif
-	jackd->frames_written+=numFramesToWrite;
-	jackFramesAvailable-=numFramesToWrite; /* take away what was written */
-	
+        jackd->frames_written+=numFramesToWrite;
+        jackFramesAvailable-=numFramesToWrite; /* take away what was written */
+
 #ifdef DEBUG_AJACK
-	g_printerr("jackFramesAvailable == %ld\n", jackFramesAvailable);
+        lives_printerr("jackFramesAvailable == %ld\n", jackFramesAvailable);
 #endif
       }
 
       // playback from memory or file
       vol=mainw->volume*mainw->volume; // TODO - we should really use a logarithmic scale
-      
+
       if (numFramesToWrite) {
 
-	if (!from_memory) {
-	  //	if (((int)(jackd->num_calls/100.))*100==jackd->num_calls) if (mainw->soft_debug) g_print("audio pip\n");
-	  if ((mainw->agen_key!=0||mainw->agen_needs_reinit||cache_buffer->bufferf!=NULL)&&!jackd->mute) {
-	    float *fbuffer=NULL;
-
-	    if (mainw->agen_key!=0||mainw->agen_needs_reinit) {
-	      // audio generated from plugin
-
-	      if (mainw->agen_needs_reinit) pl_error=TRUE;
-	      else {
-		fbuffer=(float *)g_malloc(numFramesToWrite*jackd->num_output_channels*4);
-		
-		if (!get_audio_from_plugin(fbuffer,jackd->num_output_channels,jackd->sample_out_rate,numFramesToWrite)) {
-		  pl_error=TRUE;
-		}
-	      }
-
-	      // get back non-interleaved float fbuffer; rate and channels should match
-
-	      for (i=0;i<jackd->num_output_channels;i++) {
-		if (pl_error) {
-		  if (mainw->audio_frame_buffer!=NULL) {
-		    pthread_mutex_lock(&mainw->abuf_frame_mutex);
-		  }
-		  for(i = 0; i < jackd->num_output_channels; i++) {
-		    sample_silence_dS(out_buffer[i], numFramesToWrite);
-		    if (mainw->audio_frame_buffer!=NULL) {
-		      append_to_audio_bufferf(mainw->audio_frame_buffer,out_buffer[i],nframes,i);
-		    }
-		  }
-		  if (mainw->audio_frame_buffer!=NULL) {
-		    mainw->audio_frame_buffer->samples_filled+=numFramesToWrite;
-		    pthread_mutex_unlock(&mainw->abuf_frame_mutex);
-		  }
-		}
-		else {
-		  if (mainw->audio_frame_buffer!=NULL) {
-		    pthread_mutex_lock(&mainw->abuf_frame_mutex);
-		  }
-		  for(i = 0; i < jackd->num_output_channels; i++) {
-		    lives_memcpy(out_buffer[i],fbuffer+(i*numFramesToWrite),numFramesToWrite*sizeof(float));
-		    if (mainw->audio_frame_buffer!=NULL) {
-		      append_to_audio_bufferf(mainw->audio_frame_buffer,out_buffer[i],nframes,i);
-		    }
-		  }
-		  if (mainw->audio_frame_buffer!=NULL) {
-		    mainw->audio_frame_buffer->samples_filled+=nframes;
-		    pthread_mutex_unlock(&mainw->abuf_frame_mutex);
-		  }
-		}
-	      }
-
-	      if (!pl_error&&has_audio_filters(AF_TYPE_ANY)) {
-		uint64_t tc=jackd->audio_ticks+(uint64_t)(jackd->frames_written/(double)jackd->sample_out_rate*U_SEC);
-	       // apply any audio effects with in_channels
-		weed_apply_audio_effects_rt(out_buffer,jackd->num_output_channels,numFramesToWrite,jackd->sample_out_rate,tc,FALSE);
-	      }
-
-	      if (mainw->record&&mainw->ascrap_file!=-1&&mainw->playing_file>0) {
-		int out_unsigned=mainw->files[mainw->ascrap_file]->signed_endian&AFORM_UNSIGNED;
-		rbytes=numFramesToWrite*mainw->files[mainw->ascrap_file]->achans*
-		  mainw->files[mainw->ascrap_file]->asampsize>>3;
-
-		rbytes=audio_read_inner(jackd,out_buffer,mainw->ascrap_file,numFramesToWrite,1.0,
-					!(mainw->files[mainw->ascrap_file]->signed_endian&AFORM_BIG_ENDIAN),out_unsigned,rbytes);
-		mainw->files[mainw->ascrap_file]->aseek_pos+=rbytes;
-	      }
-
-	    }
-	    else {
-	      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, FALSE, vol);
-	      }
-
-	      if (has_audio_filters(AF_TYPE_ANY)&&jackd->playing_file!=mainw->ascrap_file) {
-		uint64_t tc=jackd->audio_ticks+(uint64_t)(jackd->frames_written/(double)jackd->sample_out_rate*U_SEC);
-	       // apply any audio effects with in_channels
-		weed_apply_audio_effects_rt(out_buffer,jackd->num_output_channels,numFramesToWrite,jackd->sample_out_rate,tc,FALSE);
-	      }
-
-	    }
-	    
-	    if (jackd->astream_fd!=-1) {
-	      // audio streaming if enabled
-	      unsigned char *xbuf;
-
-	      nbytes=numFramesToWrite*jackd->num_output_channels*4;
-	      rbytes=numFramesToWrite*jackd->num_output_channels*2;
-
-	      if (pl_error) {
-		check_zero_buff(rbytes);
-		audio_stream(zero_buff,rbytes,jackd->astream_fd);
-	      }
-	      else {
-		if (mainw->agen_key==0)
-		  xbuf=(unsigned char *)cache_buffer->buffer16[0];
-		else {
-		  // plugin is generating and we are streaming: convert fbuffer to s16
-		  float **fp=(float **)g_malloc(jackd->num_output_channels*sizeof(float *));
-		  for (i=0;i<jackd->num_output_channels;i++) {
-		    fp[i]=fbuffer+i;
-		  }
-
-		  xbuf=(unsigned char *)g_malloc(nbytes*jackd->num_output_channels);
-
-		  sample_move_float_int((void *)xbuf,fp,numFramesToWrite,1.0,jackd->num_output_channels,16,0,TRUE,TRUE,1.0);
-
-		}
-	      
-		if (jackd->num_output_channels!=2) {
-		  // need to remap channels to stereo (assumed for now)
-		  size_t bysize=4,tsize=0;
-		  unsigned char *inbuf,*oinbuf=NULL;
-
-		  if (mainw->agen_key!=0) inbuf=(unsigned char *)cache_buffer->buffer16[0];
-		  else oinbuf=inbuf=xbuf;
-
-		  xbuf=(unsigned char *)g_try_malloc(nbytes);
-		  if (!xbuf) {
-		    // external streaming
-		    rbytes=numFramesToWrite*jackd->num_output_channels*2;
-		    if (check_zero_buff(rbytes))
-		      audio_stream(zero_buff,rbytes,jackd->astream_fd);
-		    return 0;
-		  }
-		  if (jackd->num_output_channels==1) bysize=2;
-		  while (nbytes>0) {
-		    lives_memcpy(xbuf+tsize,inbuf,bysize);
-		    tsize+=bysize;
-		    nbytes-=bysize;
-		    if (bysize==2) {
-		      // duplicate mono channel
-		      lives_memcpy(xbuf+tsize,inbuf,bysize);
-		      tsize+=bysize;
-		      nbytes-=bysize;
-		      inbuf+=bysize;
-		    }
-		    else {
-		      // or skip extra channels
-		      inbuf+=jackd->num_output_channels*4;
-		    }
-		  }
-		  nbytes=numFramesToWrite*jackd->num_output_channels*4;
-		  if (oinbuf!=NULL) g_free(oinbuf);
-		}
-		rbytes=numFramesToWrite*jackd->num_output_channels*2;
-		audio_stream(xbuf,rbytes,jackd->astream_fd);
-		if (mainw->agen_key!=0||xbuf!=(unsigned char *)cache_buffer->buffer16[0]) g_free(xbuf);
-	      }
-	    }
-	    
-	    if (fbuffer!=NULL) g_free(fbuffer);
-	    
-	  }
-	  else {
-	    if (mainw->audio_frame_buffer!=NULL) {
-	      pthread_mutex_lock(&mainw->abuf_frame_mutex);
-	    }
-	    for(i = 0; i < jackd->num_output_channels; i++) {
-	      sample_silence_dS(out_buffer[i], numFramesToWrite);
-	      if (mainw->audio_frame_buffer!=NULL) {
-		append_to_audio_bufferf(mainw->audio_frame_buffer,out_buffer[i],nframes,i);
-	      }
-	    }
-	    if (mainw->audio_frame_buffer!=NULL) {
-	      mainw->audio_frame_buffer->samples_filled+=numFramesToWrite;
-	      pthread_mutex_unlock(&mainw->abuf_frame_mutex);
-	    }
-
-	    // external streaming
-	    if (jackd->astream_fd!=-1) {
-	      rbytes=numFramesToWrite*jackd->num_output_channels*2;
-	      check_zero_buff(rbytes);
-	      audio_stream(zero_buff,rbytes,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*jackd->num_output_channels*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=(unsigned char *)g_try_malloc(nbytes);
-		if (!xbuf) {
-		  if (mainw->audio_frame_buffer!=NULL) {
-		    pthread_mutex_lock(&mainw->abuf_frame_mutex);
-		  }
-		  for(i = 0; i < jackd->num_output_channels; i++) {
-		    sample_silence_dS(out_buffer[i], numFramesToWrite);
-		    if (mainw->audio_frame_buffer!=NULL) {
-		      append_to_audio_bufferf(mainw->audio_frame_buffer,out_buffer[i],nframes,i);
-		    }
-		  }
-		  if (mainw->audio_frame_buffer!=NULL) {
-		    mainw->audio_frame_buffer->samples_filled+=numFramesToWrite;
-		    pthread_mutex_unlock(&mainw->abuf_frame_mutex);
-		  }
-		  
-		  // external streaming
-		  rbytes=numFramesToWrite*jackd->num_output_channels*2;
-		  if (check_zero_buff(rbytes))
-		    audio_stream(zero_buff,rbytes,jackd->astream_fd);
-		  return 0;
-		}
-		
-		if (jackd->num_output_channels==1) bysize=2;
-		while (nbytes>0) {
-		  lives_memcpy(xbuf+tsize,inbuf,bysize);
-		  tsize+=bysize;
-		  nbytes-=bysize;
-		  if (bysize==2) {
-		    // duplicate mono channel
-		    lives_memcpy(xbuf+tsize,inbuf,bysize);
-		    tsize+=bysize;
-		    nbytes-=bysize;
-		    inbuf+=bysize;
-		  }
-		  else {
-		    // or skip extra channels
-		    inbuf+=jackd->num_output_channels*4;
-		  }
-		}
-		nbytes=numFramesToWrite*jackd->num_output_channels*2;
-	      }
-	      rbytes=numFramesToWrite*jackd->num_output_channels*2;
-	      audio_stream(xbuf,rbytes,jackd->astream_fd);
-	      if (xbuf!=(unsigned char *)out_buffer) g_free(xbuf);
-	    }
-	  }
-	  else {
-	    if (mainw->audio_frame_buffer!=NULL) {
-	      pthread_mutex_lock(&mainw->abuf_frame_mutex);
-	    }
-	    for(i = 0; i < jackd->num_output_channels; i++) {
-	      if (mainw->audio_frame_buffer!=NULL) {
-		sample_silence_dS(out_buffer[i], numFramesToWrite);
-	      }
-	      append_to_audio_bufferf(mainw->audio_frame_buffer,out_buffer[i],nframes,i);
-	    }
-	    if (mainw->audio_frame_buffer!=NULL) {
-	      mainw->audio_frame_buffer->samples_filled+=numFramesToWrite;
-	      pthread_mutex_unlock(&mainw->abuf_frame_mutex);
-	    }
-	    
-	    // external streaming
-	    rbytes=numFramesToWrite*jackd->num_output_channels*2;
-	    check_zero_buff(rbytes);
-	    audio_stream(zero_buff,rbytes,jackd->astream_fd);
-	  }
-	}
-      }
-      else {
-	// no input frames
-	nframes=jackFramesAvailable;
-	if (mainw->audio_frame_buffer!=NULL) {
-	  pthread_mutex_lock(&mainw->abuf_frame_mutex);
-	}
-	for(i = 0; i < jackd->num_output_channels; i++) {
-	  sample_silence_dS(out_buffer[i], numFramesToWrite);
-	  if (mainw->audio_frame_buffer!=NULL) {
-	    append_to_audio_bufferf(mainw->audio_frame_buffer,out_buffer[i],nframes,i);
-	  }
-	}
-	if (mainw->audio_frame_buffer!=NULL) {
-	  mainw->audio_frame_buffer->samples_filled+=numFramesToWrite;
-	  pthread_mutex_unlock(&mainw->abuf_frame_mutex);
-	}
-	  
-	// external streaming
-	rbytes=numFramesToWrite*jackd->num_output_channels*2;
-	check_zero_buff(rbytes);
-	audio_stream(zero_buff,rbytes,jackd->astream_fd);
+        if (!from_memory) {
+          //	if (((int)(jackd->num_calls/100.))*100==jackd->num_calls) if (mainw->soft_debug) g_print("audio pip\n");
+          if ((mainw->agen_key!=0||mainw->agen_needs_reinit||cache_buffer->bufferf!=NULL)&&!jackd->mute) {
+            float *fbuffer=NULL;
+
+            if (mainw->agen_key!=0||mainw->agen_needs_reinit) {
+              // audio generated from plugin
+
+              if (mainw->agen_needs_reinit) pl_error=TRUE;
+              else {
+                fbuffer=(float *)lives_malloc(numFramesToWrite*jackd->num_output_channels*4);
+
+                if (!get_audio_from_plugin(fbuffer,jackd->num_output_channels,jackd->sample_out_rate,numFramesToWrite)) {
+                  pl_error=TRUE;
+                }
+              }
+
+              // get back non-interleaved float fbuffer; rate and channels should match
+
+              for (i=0; i<jackd->num_output_channels; i++) {
+                if (pl_error) {
+                  if (mainw->audio_frame_buffer!=NULL) {
+                    pthread_mutex_lock(&mainw->abuf_frame_mutex);
+                  }
+                  for (i = 0; i < jackd->num_output_channels; i++) {
+                    sample_silence_dS(out_buffer[i], numFramesToWrite);
+                    if (mainw->audio_frame_buffer!=NULL) {
+                      append_to_audio_bufferf(mainw->audio_frame_buffer,out_buffer[i],nframes,i);
+                    }
+                  }
+                  if (mainw->audio_frame_buffer!=NULL) {
+                    mainw->audio_frame_buffer->samples_filled+=numFramesToWrite;
+                    pthread_mutex_unlock(&mainw->abuf_frame_mutex);
+                  }
+                } else {
+                  if (mainw->audio_frame_buffer!=NULL) {
+                    pthread_mutex_lock(&mainw->abuf_frame_mutex);
+                  }
+                  for (i = 0; i < jackd->num_output_channels; i++) {
+                    lives_memcpy(out_buffer[i],fbuffer+(i*numFramesToWrite),numFramesToWrite*sizeof(float));
+                    if (mainw->audio_frame_buffer!=NULL) {
+                      append_to_audio_bufferf(mainw->audio_frame_buffer,out_buffer[i],nframes,i);
+                    }
+                  }
+                  if (mainw->audio_frame_buffer!=NULL) {
+                    mainw->audio_frame_buffer->samples_filled+=nframes;
+                    pthread_mutex_unlock(&mainw->abuf_frame_mutex);
+                  }
+                }
+              }
+
+              if (!pl_error&&has_audio_filters(AF_TYPE_ANY)) {
+                uint64_t tc=jackd->audio_ticks+(uint64_t)(jackd->frames_written/(double)jackd->sample_out_rate*U_SEC);
+                // apply any audio effects with in_channels
+                weed_apply_audio_effects_rt(out_buffer,jackd->num_output_channels,numFramesToWrite,jackd->sample_out_rate,tc,FALSE);
+              }
+
+              if (mainw->record&&mainw->ascrap_file!=-1&&mainw->playing_file>0) {
+                int out_unsigned=mainw->files[mainw->ascrap_file]->signed_endian&AFORM_UNSIGNED;
+                rbytes=numFramesToWrite*mainw->files[mainw->ascrap_file]->achans*
+                       mainw->files[mainw->ascrap_file]->asampsize>>3;
+
+                rbytes=audio_read_inner(jackd,out_buffer,mainw->ascrap_file,numFramesToWrite,1.0,
+                                        !(mainw->files[mainw->ascrap_file]->signed_endian&AFORM_BIG_ENDIAN),out_unsigned,rbytes);
+                mainw->files[mainw->ascrap_file]->aseek_pos+=rbytes;
+              }
+
+            } else {
+              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, FALSE, vol);
+              }
+
+              if (has_audio_filters(AF_TYPE_ANY)&&jackd->playing_file!=mainw->ascrap_file) {
+                uint64_t tc=jackd->audio_ticks+(uint64_t)(jackd->frames_written/(double)jackd->sample_out_rate*U_SEC);
+                // apply any audio effects with in_channels
+                weed_apply_audio_effects_rt(out_buffer,jackd->num_output_channels,numFramesToWrite,jackd->sample_out_rate,tc,FALSE);
+              }
+
+            }
+
+            if (jackd->astream_fd!=-1) {
+              // audio streaming if enabled
+              unsigned char *xbuf;
+
+              nbytes=numFramesToWrite*jackd->num_output_channels*4;
+              rbytes=numFramesToWrite*jackd->num_output_channels*2;
+
+              if (pl_error) {
+                check_zero_buff(rbytes);
+                audio_stream(zero_buff,rbytes,jackd->astream_fd);
+              } else {
+                if (mainw->agen_key==0)
+                  xbuf=(unsigned char *)cache_buffer->buffer16[0];
+                else {
+                  // plugin is generating and we are streaming: convert fbuffer to s16
+                  float **fp=(float **)lives_malloc(jackd->num_output_channels*sizeof(float *));
+                  for (i=0; i<jackd->num_output_channels; i++) {
+                    fp[i]=fbuffer+i;
+                  }
+
+                  xbuf=(unsigned char *)lives_malloc(nbytes*jackd->num_output_channels);
+
+                  sample_move_float_int((void *)xbuf,fp,numFramesToWrite,1.0,jackd->num_output_channels,16,0,TRUE,TRUE,1.0);
+
+                }
+
+                if (jackd->num_output_channels!=2) {
+                  // need to remap channels to stereo (assumed for now)
+                  size_t bysize=4,tsize=0;
+                  unsigned char *inbuf,*oinbuf=NULL;
+
+                  if (mainw->agen_key!=0) inbuf=(unsigned char *)cache_buffer->buffer16[0];
+                  else oinbuf=inbuf=xbuf;
+
+                  xbuf=(unsigned char *)lives_try_malloc(nbytes);
+                  if (!xbuf) {
+                    // external streaming
+                    rbytes=numFramesToWrite*jackd->num_output_channels*2;
+                    if (check_zero_buff(rbytes))
+                      audio_stream(zero_buff,rbytes,jackd->astream_fd);
+                    return 0;
+                  }
+                  if (jackd->num_output_channels==1) bysize=2;
+                  while (nbytes>0) {
+                    lives_memcpy(xbuf+tsize,inbuf,bysize);
+                    tsize+=bysize;
+                    nbytes-=bysize;
+                    if (bysize==2) {
+                      // duplicate mono channel
+                      lives_memcpy(xbuf+tsize,inbuf,bysize);
+                      tsize+=bysize;
+                      nbytes-=bysize;
+                      inbuf+=bysize;
+                    } else {
+                      // or skip extra channels
+                      inbuf+=jackd->num_output_channels*4;
+                    }
+                  }
+                  nbytes=numFramesToWrite*jackd->num_output_channels*4;
+                  if (oinbuf!=NULL) lives_free(oinbuf);
+                }
+                rbytes=numFramesToWrite*jackd->num_output_channels*2;
+                audio_stream(xbuf,rbytes,jackd->astream_fd);
+                if (mainw->agen_key!=0||xbuf!=(unsigned char *)cache_buffer->buffer16[0]) lives_free(xbuf);
+              }
+            }
+
+            if (fbuffer!=NULL) lives_free(fbuffer);
+
+          } else {
+            if (mainw->audio_frame_buffer!=NULL) {
+              pthread_mutex_lock(&mainw->abuf_frame_mutex);
+            }
+            for (i = 0; i < jackd->num_output_channels; i++) {
+              sample_silence_dS(out_buffer[i], numFramesToWrite);
+              if (mainw->audio_frame_buffer!=NULL) {
+                append_to_audio_bufferf(mainw->audio_frame_buffer,out_buffer[i],nframes,i);
+              }
+            }
+            if (mainw->audio_frame_buffer!=NULL) {
+              mainw->audio_frame_buffer->samples_filled+=numFramesToWrite;
+              pthread_mutex_unlock(&mainw->abuf_frame_mutex);
+            }
+
+            // external streaming
+            if (jackd->astream_fd!=-1) {
+              rbytes=numFramesToWrite*jackd->num_output_channels*2;
+              check_zero_buff(rbytes);
+              audio_stream(zero_buff,rbytes,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*jackd->num_output_channels*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=(unsigned char *)lives_try_malloc(nbytes);
+                if (!xbuf) {
+                  if (mainw->audio_frame_buffer!=NULL) {
+                    pthread_mutex_lock(&mainw->abuf_frame_mutex);
+                  }
+                  for (i = 0; i < jackd->num_output_channels; i++) {
+                    sample_silence_dS(out_buffer[i], numFramesToWrite);
+                    if (mainw->audio_frame_buffer!=NULL) {
+                      append_to_audio_bufferf(mainw->audio_frame_buffer,out_buffer[i],nframes,i);
+                    }
+                  }
+                  if (mainw->audio_frame_buffer!=NULL) {
+                    mainw->audio_frame_buffer->samples_filled+=numFramesToWrite;
+                    pthread_mutex_unlock(&mainw->abuf_frame_mutex);
+                  }
+
+                  // external streaming
+                  rbytes=numFramesToWrite*jackd->num_output_channels*2;
+                  if (check_zero_buff(rbytes))
+                    audio_stream(zero_buff,rbytes,jackd->astream_fd);
+                  return 0;
+                }
+
+                if (jackd->num_output_channels==1) bysize=2;
+                while (nbytes>0) {
+                  lives_memcpy(xbuf+tsize,inbuf,bysize);
+                  tsize+=bysize;
+                  nbytes-=bysize;
+                  if (bysize==2) {
+                    // duplicate mono channel
+                    lives_memcpy(xbuf+tsize,inbuf,bysize);
+                    tsize+=bysize;
+                    nbytes-=bysize;
+                    inbuf+=bysize;
+                  } else {
+                    // or skip extra channels
+                    inbuf+=jackd->num_output_channels*4;
+                  }
+                }
+                nbytes=numFramesToWrite*jackd->num_output_channels*2;
+              }
+              rbytes=numFramesToWrite*jackd->num_output_channels*2;
+              audio_stream(xbuf,rbytes,jackd->astream_fd);
+              if (xbuf!=(unsigned char *)out_buffer) lives_free(xbuf);
+            }
+          } else {
+            if (mainw->audio_frame_buffer!=NULL) {
+              pthread_mutex_lock(&mainw->abuf_frame_mutex);
+            }
+            for (i = 0; i < jackd->num_output_channels; i++) {
+              if (mainw->audio_frame_buffer!=NULL) {
+                sample_silence_dS(out_buffer[i], numFramesToWrite);
+              }
+              append_to_audio_bufferf(mainw->audio_frame_buffer,out_buffer[i],nframes,i);
+            }
+            if (mainw->audio_frame_buffer!=NULL) {
+              mainw->audio_frame_buffer->samples_filled+=numFramesToWrite;
+              pthread_mutex_unlock(&mainw->abuf_frame_mutex);
+            }
+
+            // external streaming
+            rbytes=numFramesToWrite*jackd->num_output_channels*2;
+            check_zero_buff(rbytes);
+            audio_stream(zero_buff,rbytes,jackd->astream_fd);
+          }
+        }
+      } else {
+        // no input frames
+        nframes=jackFramesAvailable;
+        if (mainw->audio_frame_buffer!=NULL) {
+          pthread_mutex_lock(&mainw->abuf_frame_mutex);
+        }
+        for (i = 0; i < jackd->num_output_channels; i++) {
+          sample_silence_dS(out_buffer[i], numFramesToWrite);
+          if (mainw->audio_frame_buffer!=NULL) {
+            append_to_audio_bufferf(mainw->audio_frame_buffer,out_buffer[i],nframes,i);
+          }
+        }
+        if (mainw->audio_frame_buffer!=NULL) {
+          mainw->audio_frame_buffer->samples_filled+=numFramesToWrite;
+          pthread_mutex_unlock(&mainw->abuf_frame_mutex);
+        }
+
+        // external streaming
+        rbytes=numFramesToWrite*jackd->num_output_channels*2;
+        check_zero_buff(rbytes);
+        audio_stream(zero_buff,rbytes,jackd->astream_fd);
       }
 
     }
 
 
     if (!from_memory) {
-      if (!wait_cache_buffer&&mainw->agen_key==0) 
-	push_cache_buffer( cache_buffer, jackd, in_bytes, nframes, shrink_factor );
+      if (!wait_cache_buffer&&mainw->agen_key==0)
+        push_cache_buffer(cache_buffer, jackd, in_bytes, nframes, shrink_factor);
       if (shrink_factor>0.) jackd->seek_pos+=xin_bytes;
     }
 
     /*    jackd->jack_pulse[0]=set_pulse(out_buffer[0],jack->buffer_size,8);
-	  if (jackd->num_output_channels>1) {
-	  jackd->jack_pulse[1]=set_pulse(out_buffer[1],jackd->buffer_size,8);
-	  }
-	  else jackd->jack_pulse[1]=jackd->jack_pulse[0];
+    if (jackd->num_output_channels>1) {
+    jackd->jack_pulse[1]=set_pulse(out_buffer[1],jackd->buffer_size,8);
+    }
+    else jackd->jack_pulse[1]=jackd->jack_pulse[0];
     */
-    
-    if(jackFramesAvailable) {
+
+    if (jackFramesAvailable) {
 #ifdef DEBUG_AJACK
-      g_printerr("buffer underrun of %ld frames\n", jackFramesAvailable);
+      lives_printerr("buffer underrun of %ld frames\n", jackFramesAvailable);
 #endif
-      for(i = 0 ; i < jackd->num_output_channels; i++) {
-	if (mainw->audio_frame_buffer!=NULL) {
-	  pthread_mutex_lock(&mainw->abuf_frame_mutex);
-	}
-	for(i = 0; i < jackd->num_output_channels; i++) {
-	  sample_silence_dS(out_buffer[i] + (nframes - jackFramesAvailable), jackFramesAvailable);
-	  if (mainw->audio_frame_buffer!=NULL) {
-	    append_to_audio_bufferf(mainw->audio_frame_buffer,out_buffer[i],nframes,i);
-	  }
-	}
-	if (mainw->audio_frame_buffer!=NULL) {
-	  mainw->audio_frame_buffer->samples_filled+=jackFramesAvailable;
-	  pthread_mutex_unlock(&mainw->abuf_frame_mutex);
-	}
+      for (i = 0 ; i < jackd->num_output_channels; i++) {
+        if (mainw->audio_frame_buffer!=NULL) {
+          pthread_mutex_lock(&mainw->abuf_frame_mutex);
+        }
+        for (i = 0; i < jackd->num_output_channels; i++) {
+          sample_silence_dS(out_buffer[i] + (nframes - jackFramesAvailable), jackFramesAvailable);
+          if (mainw->audio_frame_buffer!=NULL) {
+            append_to_audio_bufferf(mainw->audio_frame_buffer,out_buffer[i],nframes,i);
+          }
+        }
+        if (mainw->audio_frame_buffer!=NULL) {
+          mainw->audio_frame_buffer->samples_filled+=jackFramesAvailable;
+          pthread_mutex_unlock(&mainw->abuf_frame_mutex);
+        }
       }
 
       // external streaming
@@ -971,21 +953,20 @@
       audio_stream(zero_buff,rbytes,jackd->astream_fd);
     }
 
-  }
-  else if(jackd->state == JackTransportStarting || jackd->state == JackTransportStopped || 
-	  jackd->state == JackTClosed || jackd->state == JackTReset) {
+  } else if (jackd->state == JackTransportStarting || jackd->state == JackTransportStopped ||
+             jackd->state == JackTClosed || jackd->state == JackTReset) {
 #ifdef DEBUG_AJACK
-    g_printerr("PAUSED or STOPPED or CLOSED, outputting silence\n");
+    lives_printerr("PAUSED or STOPPED or CLOSED, outputting silence\n");
 #endif
-    
+
     /* output silence if nothing is being outputted */
     if (mainw->audio_frame_buffer!=NULL) {
       pthread_mutex_lock(&mainw->abuf_frame_mutex);
     }
-    for(i = 0; i < jackd->num_output_channels; i++) {
+    for (i = 0; i < jackd->num_output_channels; i++) {
       sample_silence_dS(out_buffer[i], nframes);
       if (mainw->audio_frame_buffer!=NULL) {
-	append_to_audio_bufferf(mainw->audio_frame_buffer,out_buffer[i],nframes,i);
+        append_to_audio_bufferf(mainw->audio_frame_buffer,out_buffer[i],nframes,i);
       }
     }
     if (mainw->audio_frame_buffer!=NULL) {
@@ -1002,13 +983,13 @@
 
     /* if we were told to reset then zero out some variables */
     /* and transition to STOPPED */
-    if(jackd->state == JackTReset) {
+    if (jackd->state == JackTReset) {
       jackd->state = (jack_transport_state_t)JackTStopped; /* transition to STOPPED */
     }
   }
 
 #ifdef DEBUG_AJACK
-  g_printerr("done\n");
+  lives_printerr("done\n");
 #endif
 
   return 0;
@@ -1016,11 +997,11 @@
 
 
 
-int lives_start_ready_callback (jack_transport_state_t state, jack_position_t *pos, void *arg) {
+int lives_start_ready_callback(jack_transport_state_t state, jack_position_t *pos, void *arg) {
   boolean seek_ready;
 
   // mainw->video_seek_ready is generally FALSE
-  // if we are not playing, the transport poll should start playing which will set set 
+  // if we are not playing, the transport poll should start playing which will set set
   // mainw->video_seek_ready to true, as soon as the audio seeks to the right place
 
   // if we are playing, we set mainw->scratch
@@ -1057,11 +1038,11 @@
 }
 
 
-static size_t audio_read_inner(jack_driver_t *jackd, float **in_buffer, int ofileno, int nframes, 
-			       double out_scale, boolean rev_endian, boolean out_unsigned, size_t rbytes) {
+static size_t audio_read_inner(jack_driver_t *jackd, float **in_buffer, int ofileno, int nframes,
+                               double out_scale, boolean rev_endian, boolean out_unsigned, size_t rbytes) {
   int frames_out;
 
-  void *holding_buff=g_try_malloc(rbytes);
+  void *holding_buff=lives_try_malloc(rbytes);
 
   lives_clip_t *ofile=mainw->files[ofileno];
 
@@ -1070,7 +1051,7 @@
   if (!holding_buff) return 0;
 
   frames_out=sample_move_float_int((void *)holding_buff,in_buffer,nframes,out_scale,ofile->achans,
-				   ofile->asampsize,out_unsigned,rev_endian,FALSE,1.);
+                                   ofile->asampsize,out_unsigned,rev_endian,FALSE,1.);
 
   if (mainw->rec_samples>0) {
     if (frames_out>mainw->rec_samples) frames_out=mainw->rec_samples;
@@ -1080,24 +1061,24 @@
   if (mainw->bad_aud_file==NULL) {
     size_t target=frames_out*(ofile->asampsize/8)*ofile->achans;
     // use write not lives_write - because of potential threading issues
-    bytes=write (mainw->aud_rec_fd,holding_buff,target);
+    bytes=write(mainw->aud_rec_fd,holding_buff,target);
 
     if (bytes<target) mainw->bad_aud_file=filename_from_fd(NULL,mainw->aud_rec_fd);
     if (bytes<0) bytes=0;
   }
 
-  g_free(holding_buff);
+  lives_free(holding_buff);
 
   return bytes;
 }
 
 
-static int audio_read (nframes_t nframes, void *arg) {
+static int audio_read(nframes_t nframes, void *arg) {
   // read nframes from jack buffer, and then write to mainw->aud_rec_fd
 
   // this is the jack callback for when we are recording audio
 
-  jack_driver_t* jackd = (jack_driver_t*)arg;
+  jack_driver_t *jackd = (jack_driver_t *)arg;
   float *in_buffer[jackd->num_input_channels];
   float out_scale;
   int out_unsigned;
@@ -1108,13 +1089,13 @@
 
   if (!jackd->in_use) return 0;
 
-  if (mainw->playing_file<0&&prefs->audio_src==AUDIO_SRC_EXT) return 0; 
+  if (mainw->playing_file<0&&prefs->audio_src==AUDIO_SRC_EXT) return 0;
 
   if (mainw->effects_paused) return 0; // pause during record
 
   if (mainw->rec_samples==0) return 0; // wrote enough already, return until main thread stop
 
-  for (i=0;i<jackd->num_input_channels;i++) {
+  for (i=0; i<jackd->num_input_channels; i++) {
     in_buffer[i] = (float *) jack_port_get_buffer(jackd->input_port[i], nframes);
   }
 
@@ -1127,20 +1108,20 @@
     // we may wish to analyse the audio for example, or push it to a video generator
 
     if (has_audio_filters(AF_TYPE_A)) {
-	uint64_t tc=jackd->audio_ticks+(uint64_t)(jackd->frames_written/(double)jackd->sample_in_rate*U_SEC);
-
-	if (mainw->audio_frame_buffer!=NULL) {
-	  // if we have audio triggered gens., push audio to it
-	  pthread_mutex_lock(&mainw->abuf_frame_mutex);
-	  for (i=0;i<jackd->num_input_channels;i++) {
-	    append_to_audio_bufferf(mainw->audio_frame_buffer,in_buffer[i],nframes,i);
-	  }
-	  mainw->audio_frame_buffer->samples_filled+=nframes;
-	  pthread_mutex_unlock(&mainw->abuf_frame_mutex);
-	}
-
-	// apply any audio effects with in_channels and no out_channels
-	weed_apply_audio_effects_rt(in_buffer,jackd->num_input_channels,nframes,jackd->sample_in_rate,tc,TRUE);
+      uint64_t tc=jackd->audio_ticks+(uint64_t)(jackd->frames_written/(double)jackd->sample_in_rate*U_SEC);
+
+      if (mainw->audio_frame_buffer!=NULL) {
+        // if we have audio triggered gens., push audio to it
+        pthread_mutex_lock(&mainw->abuf_frame_mutex);
+        for (i=0; i<jackd->num_input_channels; i++) {
+          append_to_audio_bufferf(mainw->audio_frame_buffer,in_buffer[i],nframes,i);
+        }
+        mainw->audio_frame_buffer->samples_filled+=nframes;
+        pthread_mutex_unlock(&mainw->abuf_frame_mutex);
+      }
+
+      // apply any audio effects with in_channels and no out_channels
+      weed_apply_audio_effects_rt(in_buffer,jackd->num_input_channels,nframes,jackd->sample_in_rate,tc,TRUE);
     }
 
 
@@ -1152,15 +1133,15 @@
 
   if (jackd->playing_file==-1) out_scale=1.0; // just listening
   else out_scale=(float)jackd->sample_in_rate/(float)afile->arate;
-  
+
   out_unsigned=afile->signed_endian&AFORM_UNSIGNED;
-  
+
   frames_out=(int64_t)((double)nframes/out_scale+1.);
   rbytes=frames_out*afile->achans*afile->asampsize/8;
-  
+
   rbytes=audio_read_inner(jackd,in_buffer,jackd->playing_file,nframes,out_scale,jackd->reverse_endian,
-			  out_unsigned,rbytes);
-  
+                          out_unsigned,rbytes);
+
 
   if (mainw->record&&prefs->audio_src==AUDIO_SRC_EXT&&mainw->ascrap_file!=-1&&mainw->playing_file>0) {
     mainw->files[mainw->playing_file]->aseek_pos+=rbytes;
@@ -1175,22 +1156,22 @@
 
 
 
-int jack_get_srate (nframes_t nframes, void *arg) {
-  //g_printerr("the sample rate is now %ld/sec\n", (int64_t)nframes);
+int jack_get_srate(nframes_t nframes, void *arg) {
+  //lives_printerr("the sample rate is now %ld/sec\n", (int64_t)nframes);
   return 0;
 }
 
 
 
-void jack_shutdown(void* arg) {
-  jack_driver_t* jackd = (jack_driver_t*)arg;
+void jack_shutdown(void *arg) {
+  jack_driver_t *jackd = (jack_driver_t *)arg;
 
   jackd->client = NULL; /* reset client */
   jackd->jackd_died = TRUE;
   jackd->msgq=NULL;
 
-  g_printerr("jack shutdown, setting client to 0 and jackd_died to true\n");
-  g_printerr("trying to reconnect right now\n");
+  lives_printerr("jack shutdown, setting client to 0 and jackd_died to true\n");
+  lives_printerr("trying to reconnect right now\n");
 
   /////////////////////
 
@@ -1199,38 +1180,38 @@
   mainw->jackd=jack_get_driver(0,TRUE);
   mainw->jackd->msgq=NULL;
 
-  if (mainw->jackd->playing_file!=-1&&afile!=NULL) 
+  if (mainw->jackd->playing_file!=-1&&afile!=NULL)
     jack_audio_seek_bytes(mainw->jackd,mainw->jackd->seek_pos); // at least re-seek to the right place
 }
 
 
 static void jack_reset_driver(jack_driver_t *jackd) {
-  //g_printerr("resetting jackd->dev_idx(%d)\n", jackd->dev_idx);
+  //lives_printerr("resetting jackd->dev_idx(%d)\n", jackd->dev_idx);
   /* tell the callback that we are to reset, the callback will transition this to STOPPED */
   jackd->state=(jack_transport_state_t)JackTReset;
 }
 
 
-void jack_close_device(jack_driver_t* jackd) {
+void jack_close_device(jack_driver_t *jackd) {
   int i;
 
-  //g_printerr("closing the jack client thread\n");
+  //lives_printerr("closing the jack client thread\n");
   if (jackd->client) {
     jack_deactivate(jackd->client); /* supposed to help the jack_client_close() to succeed */
-    //g_printerr("after jack_deactivate()\n");
+    //lives_printerr("after jack_deactivate()\n");
     jack_client_close(jackd->client);
   }
-  
+
   jack_reset_driver(jackd);
   jackd->client=NULL;
-  
+
   jackd->is_active=FALSE;
 
 
   /* free up the port strings */
-  //g_printerr("freeing up port strings\n");
+  //lives_printerr("freeing up port strings\n");
   if (jackd->jack_port_name_count>1) {
-    for (i=0;i<jackd->jack_port_name_count;i++) free(jackd->jack_port_name[i]);
+    for (i=0; i<jackd->jack_port_name_count; i++) free(jackd->jack_port_name[i]);
     free(jackd->jack_port_name);
   }
 }
@@ -1239,7 +1220,7 @@
 
 
 static void jack_error_func(const char *desc) {
-  g_printerr("Jack audio error %s\n",desc);
+  lives_printerr("Jack audio error %s\n",desc);
 }
 
 
@@ -1254,7 +1235,7 @@
   jack_options_t options=(jack_options_t)((int)JackServerName|(int)JackNoStartServer);
   jack_status_t status;
   int i;
-  
+
   int64_t ntime=0,stime;
 
   if (mainw->aplayer_broken) return 2;
@@ -1270,49 +1251,49 @@
   stime=lives_get_current_ticks();
 
   while (jackd->client==NULL&&ntime<JACK_START_WAIT) {
-    jackd->client = jack_client_open (client_name, options, &status, server_name);
-    
-    g_usleep(prefs->sleep_time);
+    jackd->client = jack_client_open(client_name, options, &status, server_name);
+
+    lives_usleep(prefs->sleep_time);
 
     ntime=lives_get_current_ticks()-stime;
   }
 
 
   if (jackd->client==NULL) {
-    g_printerr ("jack_client_open() failed, status = 0x%2.0x\n", status);
+    lives_printerr("jack_client_open() failed, status = 0x%2.0x\n", status);
     if (status&JackServerFailed) {
-      d_print (_("Unable to connect to JACK server\n"));
+      d_print(_("Unable to connect to JACK server\n"));
     }
     return 1;
   }
-  
+
   if (status&JackNameNotUnique) {
     client_name= jack_get_client_name(jackd->client);
-    g_printerr ("unique name `%s' assigned\n", client_name);
+    lives_printerr("unique name `%s' assigned\n", client_name);
   }
-  
+
   jackd->sample_out_rate=jack_get_sample_rate(jackd->client);
-  
-  //g_printerr (g_strdup_printf("engine sample rate: %ld\n",jackd->sample_rate));
 
-  for (i=0;i<jackd->num_output_channels;i++) {
+  //lives_printerr (lives_strdup_printf("engine sample rate: %ld\n",jackd->sample_rate));
+
+  for (i=0; i<jackd->num_output_channels; i++) {
     char portname[32];
-    g_snprintf(portname, 32, "out_%d", i);
+    lives_snprintf(portname, 32, "out_%d", i);
 
 #ifdef DEBUG_JACK_PORTS
-    g_printerr("output port %d is named '%s'\n", i, portname);
+    lives_printerr("output port %d is named '%s'\n", i, portname);
 #endif
     jackd->output_port[i] = jack_port_register(jackd->client, portname,
-					       JACK_DEFAULT_AUDIO_TYPE,
-					       JackPortIsOutput,
-					       0);
+                            JACK_DEFAULT_AUDIO_TYPE,
+                            JackPortIsOutput,
+                            0);
     if (jackd->output_port[i]==NULL) {
-      g_printerr("no more JACK output ports available\n");
+      lives_printerr("no more JACK output ports available\n");
       return 1;
     }
     jackd->out_chans_available++;
   }
-  
+
   /* tell the JACK server to call `srate()' whenever
      the sample rate of the system changes. */
   jack_set_sample_rate_callback(jackd->client, jack_get_srate, jackd);
@@ -1323,7 +1304,7 @@
      just decides to stop calling us. */
   jack_on_shutdown(jackd->client, jack_shutdown, jackd);
 
-  jack_set_process_callback ((jack_client_t *)jackd->client, audio_process, jackd);  
+  jack_set_process_callback((jack_client_t *)jackd->client, audio_process, jackd);
 
   return 0;
 
@@ -1344,44 +1325,44 @@
   /* set up an error handler */
   jack_set_error_function(jack_error_func);
   jackd->client=NULL;
-  while (jackd->client==NULL) 
-    jackd->client = jack_client_open (client_name, options, &status, server_name);
-    
+  while (jackd->client==NULL)
+    jackd->client = jack_client_open(client_name, options, &status, server_name);
+
   if (jackd->client==NULL) {
-    g_printerr ("jack_client_open() failed, status = 0x%2.0x\n", status);
+    lives_printerr("jack_client_open() failed, status = 0x%2.0x\n", status);
     if (status&JackServerFailed) {
-      d_print (_("Unable to connect to JACK server\n"));
+      d_print(_("Unable to connect to JACK server\n"));
     }
     return 1;
   }
-  
+
   if (status&JackNameNotUnique) {
     client_name= jack_get_client_name(jackd->client);
-    g_printerr ("unique name `%s' assigned\n", client_name);
+    lives_printerr("unique name `%s' assigned\n", client_name);
   }
-  
+
   jackd->sample_in_rate=jack_get_sample_rate(jackd->client);
-  
-  //g_printerr (g_strdup_printf("engine sample rate: %ld\n",jackd->sample_rate));
 
-  for (i=0;i<jackd->num_input_channels;i++) {
+  //lives_printerr (lives_strdup_printf("engine sample rate: %ld\n",jackd->sample_rate));
+
+  for (i=0; i<jackd->num_input_channels; i++) {
     char portname[32];
-    g_snprintf(portname, 32, "in_%d", i);
+    lives_snprintf(portname, 32, "in_%d", i);
 
 #ifdef DEBUG_JACK_PORTS
-    g_printerr("input port %d is named '%s'\n", i, portname);
+    lives_printerr("input port %d is named '%s'\n", i, portname);
 #endif
     jackd->input_port[i] = jack_port_register(jackd->client, portname,
-					      JACK_DEFAULT_AUDIO_TYPE,
-					      JackPortIsInput,
-					      0);
+                           JACK_DEFAULT_AUDIO_TYPE,
+                           JackPortIsInput,
+                           0);
     if (jackd->input_port[i]==NULL) {
-      g_printerr("no more JACK input ports available\n");
+      lives_printerr("no more JACK input ports available\n");
       return 1;
     }
     jackd->in_chans_available++;
   }
-  
+
   /* tell the JACK server to call `srate()' whenever
      the sample rate of the system changes. */
   jack_set_sample_rate_callback(jackd->client, jack_get_srate, jackd);
@@ -1392,7 +1373,7 @@
   jack_on_shutdown(jackd->client, jack_shutdown, jackd);
 
   // set process callback and start
-  jack_set_process_callback (jackd->client, audio_read, jackd);  
+  jack_set_process_callback(jackd->client, audio_read, jackd);
 
   return 0;
 
@@ -1401,13 +1382,13 @@
 
 
 
-int jack_driver_activate (jack_driver_t *jackd) {
+int jack_driver_activate(jack_driver_t *jackd) {
   // activate client and connect it
 
   // TODO *** - handle errors here !
 
   int i;
-  const char** ports;
+  const char **ports;
   boolean failed=FALSE;
 
   if (jackd->is_active) return 0; // already running
@@ -1423,71 +1404,69 @@
 
   /* determine how we are to acquire port names */
   if ((jackd->jack_port_name_count==0)||(jackd->jack_port_name_count==1)) {
-    if(jackd->jack_port_name_count==0) {
-      //g_printerr("jack_get_ports() passing in NULL/NULL\n");
+    if (jackd->jack_port_name_count==0) {
+      //lives_printerr("jack_get_ports() passing in NULL/NULL\n");
       ports=jack_get_ports(jackd->client, NULL, NULL, jackd->jack_port_flags);
-    }
-    else {
-      //g_printerr("jack_get_ports() passing in port of '%s'\n", jackd->jack_port_name[0]);
+    } else {
+      //lives_printerr("jack_get_ports() passing in port of '%s'\n", jackd->jack_port_name[0]);
       ports=jack_get_ports(jackd->client, jackd->jack_port_name[0], NULL, jackd->jack_port_flags);
     }
 
     if (ports==NULL) {
-      g_printerr("No jack ports available !\n");
+      lives_printerr("No jack ports available !\n");
       return 1;
     }
 
     /* display a trace of the output ports we found */
 #ifdef DEBUG_JACK_PORTS
-    for (i=0;ports[i];i++) g_printerr("ports[%d] = '%s'\n",i,ports[i]);
+    for (i=0; ports[i]; i++) lives_printerr("ports[%d] = '%s'\n",i,ports[i]);
 #endif
 
     /* see if we have enough ports */
-    if(jackd->out_chans_available<jackd->num_output_channels) {
+    if (jackd->out_chans_available<jackd->num_output_channels) {
 #ifdef DEBUG_JACK_PORTS
-      g_printerr("ERR: jack_get_ports() failed to find ports with jack port flags of 0x%lX'\n", jackd->jack_port_flags);
+      lives_printerr("ERR: jack_get_ports() failed to find ports with jack port flags of 0x%lX'\n", jackd->jack_port_flags);
 #endif
       return ERR_PORT_NOT_FOUND;
     }
 
     /* connect the ports. Note: you can't do this before
        the client is activated (this may change in the future). */
-    for(i=0;i<jackd->num_output_channels;i++) {
+    for (i=0; i<jackd->num_output_channels; i++) {
 #ifdef DEBUG_JACK_PORTS
-      g_printerr("jack_connect() to port %d('%p')\n", i, jackd->output_port[i]);
+      lives_printerr("jack_connect() to port %d('%p')\n", i, jackd->output_port[i]);
 #endif
-      if(jack_connect(jackd->client, jack_port_name(jackd->output_port[i]), ports[i])) {
+      if (jack_connect(jackd->client, jack_port_name(jackd->output_port[i]), ports[i])) {
 #ifdef DEBUG_JACK_PORTS
-          g_printerr("cannot connect to output port %d('%s')\n", i, ports[i]);
+        lives_printerr("cannot connect to output port %d('%s')\n", i, ports[i]);
 #endif
-          failed=TRUE;
+        failed=TRUE;
       }
-    } 
+    }
     free(ports); /* free the returned array of ports */
-  }
-  else {
-    for(i=0;i<jackd->jack_port_name_count;i++) {
+  } else {
+    for (i=0; i<jackd->jack_port_name_count; i++) {
 #ifdef DEBUG_JACK_PORTS
-      g_printerr("jack_get_ports() portname %d of '%s\n", i, jackd->jack_port_name[i]);
+      lives_printerr("jack_get_ports() portname %d of '%s\n", i, jackd->jack_port_name[i]);
 #endif
       ports=jack_get_ports(jackd->client, jackd->jack_port_name[i], NULL, jackd->jack_port_flags);
 #ifdef DEBUG_JACK_PORTS
-      g_printerr ("ports[%d] = '%s'\n", 0, ports[0]);      /* display a trace of the output port we found */
+      lives_printerr("ports[%d] = '%s'\n", 0, ports[0]);       /* display a trace of the output port we found */
 #endif
-      if(!ports) {
+      if (!ports) {
 #ifdef DEBUG_JACK_PORTS
-	g_printerr("jack_get_ports() failed to find ports with jack port flags of 0x%lX'\n", jackd->jack_port_flags);
+        lives_printerr("jack_get_ports() failed to find ports with jack port flags of 0x%lX'\n", jackd->jack_port_flags);
 #endif
-	return ERR_PORT_NOT_FOUND;
+        return ERR_PORT_NOT_FOUND;
       }
 
       /* connect the port */
 #ifdef DEBUG_JACK_PORTS
-      g_printerr ("jack_connect() to port %d('%p')\n", i, jackd->output_port[i]);
+      lives_printerr("jack_connect() to port %d('%p')\n", i, jackd->output_port[i]);
 #endif
-      if(jack_connect(jackd->client, jack_port_name(jackd->output_port[i]), ports[0])) {
-	//ERR("cannot connect to output port %d('%s')\n", 0, ports[0]);
-	failed=TRUE;
+      if (jack_connect(jackd->client, jack_port_name(jackd->output_port[i]), ports[0])) {
+        //ERR("cannot connect to output port %d('%s')\n", 0, ports[0]);
+        failed=TRUE;
       }
       free(ports); /* free the returned array of ports */
     }
@@ -1497,7 +1476,7 @@
 
   /* if something failed we need to shut the client down and return 0 */
   if (failed) {
-    g_printerr("failed, closing and returning error\n");
+    lives_printerr("failed, closing and returning error\n");
     jack_close_device(jackd);
     return 1;
   }
@@ -1519,10 +1498,10 @@
 
 
 
-int jack_read_driver_activate (jack_driver_t *jackd, boolean autocon) {
+int jack_read_driver_activate(jack_driver_t *jackd, boolean autocon) {
   // connect driver for reading
   int i;
-  const char** ports;
+  const char **ports;
   boolean failed=FALSE;
 
   /* tell the JACK server that we are ready to roll */
@@ -1538,66 +1517,64 @@
 
   /* determine how we are to acquire port names */
   if ((jackd->jack_port_name_count==0)||(jackd->jack_port_name_count==1)) {
-    if(jackd->jack_port_name_count==0) {
-      //g_printerr("jack_get_ports() passing in NULL/NULL\n");
+    if (jackd->jack_port_name_count==0) {
+      //lives_printerr("jack_get_ports() passing in NULL/NULL\n");
       ports=jack_get_ports(jackd->client, NULL, NULL, jackd->jack_port_flags);
-    }
-    else {
-      //g_printerr("jack_get_ports() passing in port of '%s'\n", jackd->jack_port_name[0]);
+    } else {
+      //lives_printerr("jack_get_ports() passing in port of '%s'\n", jackd->jack_port_name[0]);
       ports=jack_get_ports(jackd->client, jackd->jack_port_name[0], NULL, jackd->jack_port_flags);
     }
 
     /* display a trace of the output ports we found */
 #ifdef DEBUG_JACK_PORTS
-    for (i=0;ports[i];i++) g_printerr("ports[%d] = '%s'\n",i,ports[i]);
+    for (i=0; ports[i]; i++) lives_printerr("ports[%d] = '%s'\n",i,ports[i]);
 #endif
 
     /* see if we have enough ports */
-    if(jackd->in_chans_available<jackd->num_input_channels) {
+    if (jackd->in_chans_available<jackd->num_input_channels) {
 #ifdef DEBUG_JACK_PORTS
-      g_printerr("ERR: jack_get_ports() failed to find ports with jack port flags of 0x%lX'\n", jackd->jack_port_flags);
+      lives_printerr("ERR: jack_get_ports() failed to find ports with jack port flags of 0x%lX'\n", jackd->jack_port_flags);
 #endif
       return ERR_PORT_NOT_FOUND;
     }
 
     /* connect the ports. Note: you can't do this before
        the client is activated (this may change in the future). */
-    for(i=0;i<jackd->num_input_channels;i++) {
+    for (i=0; i<jackd->num_input_channels; i++) {
 #ifdef DEBUG_JACK_PORTS
-      g_printerr("jack_connect() to port name %d('%p')\n", i, jackd->input_port[i]);
+      lives_printerr("jack_connect() to port name %d('%p')\n", i, jackd->input_port[i]);
 #endif
-      if(jack_connect(jackd->client, ports[i], jack_port_name(jackd->input_port[i]))) {
+      if (jack_connect(jackd->client, ports[i], jack_port_name(jackd->input_port[i]))) {
 #ifdef DEBUG_JACK_PORTS
-          g_printerr("cannot connect to input port %d('%s')\n", i, ports[i]);
+        lives_printerr("cannot connect to input port %d('%s')\n", i, ports[i]);
 #endif
-          failed=TRUE;
+        failed=TRUE;
       }
-    } 
+    }
     free(ports); /* free the returned array of ports */
-  }
-  else {
-    for(i=0;i<jackd->jack_port_name_count;i++) {
+  } else {
+    for (i=0; i<jackd->jack_port_name_count; i++) {
 #ifdef DEBUG_JACK_PORTS
-      g_printerr("jack_get_ports() portname %d of '%s\n", i, jackd->jack_port_name[i]);
+      lives_printerr("jack_get_ports() portname %d of '%s\n", i, jackd->jack_port_name[i]);
 #endif
       ports=jack_get_ports(jackd->client, jackd->jack_port_name[i], NULL, jackd->jack_port_flags);
 #ifdef DEBUG_JACK_PORTS
-      g_printerr ("ports[%d] = '%s'\n", 0, ports[0]);      /* display a trace of the output port we found */
+      lives_printerr("ports[%d] = '%s'\n", 0, ports[0]);       /* display a trace of the output port we found */
 #endif
-      if(!ports) {
+      if (!ports) {
 #ifdef DEBUG_JACK_PORTS
-	g_printerr("jack_get_ports() failed to find ports with jack port flags of 0x%lX'\n", jackd->jack_port_flags);
+        lives_printerr("jack_get_ports() failed to find ports with jack port flags of 0x%lX'\n", jackd->jack_port_flags);
 #endif
-	return ERR_PORT_NOT_FOUND;
+        return ERR_PORT_NOT_FOUND;
       }
 
       /* connect the port */
 #ifdef DEBUG_JACK_PORTS
-      g_printerr ("jack_connect() to port %d('%p')\n", i, jackd->input_port[i]);
+      lives_printerr("jack_connect() to port %d('%p')\n", i, jackd->input_port[i]);
 #endif
-      if(jack_connect(jackd->client, ports[0], jack_port_name(jackd->input_port[i]))) {
-	//ERR("cannot connect to output port %d('%s')\n", 0, ports[0]);
-	failed=TRUE;
+      if (jack_connect(jackd->client, ports[0], jack_port_name(jackd->input_port[i]))) {
+        //ERR("cannot connect to output port %d('%s')\n", 0, ports[0]);
+        failed=TRUE;
       }
       free(ports); /* free the returned array of ports */
     }
@@ -1605,12 +1582,12 @@
 
   /* if something failed we need to shut the client down and return 0 */
   if (failed) {
-    g_printerr("failed, closing and returning error\n");
+    lives_printerr("failed, closing and returning error\n");
     jack_close_device(jackd);
     return 1;
   }
 
- jackreadactive:
+jackreadactive:
 
   jackd->jackd_died = FALSE;
 
@@ -1633,9 +1610,9 @@
   if (is_output) jackd = &outdev[dev_idx];
   else jackd = &indev[dev_idx];
 #ifdef TRACE_getReleaseDevice
-  g_printerr("dev_idx is %d\n", dev_idx);
+  lives_printerr("dev_idx is %d\n", dev_idx);
 #endif
-  
+
   return jackd;
 }
 
@@ -1643,7 +1620,7 @@
 
 static void jack_reset_dev(int dev_idx, boolean is_output) {
   jack_driver_t *jackd = jack_get_driver(dev_idx,is_output);
-  //g_printerr("resetting dev %d\n", dev_idx);
+  //lives_printerr("resetting dev %d\n", dev_idx);
   jack_reset_driver(jackd);
 }
 
@@ -1653,13 +1630,13 @@
   int i,j;
   jack_driver_t *jackd;
 
-  for (i=0;i<JACK_MAX_OUTDEVICES;i++) {
+  for (i=0; i<JACK_MAX_OUTDEVICES; i++) {
     jackd = &outdev[i];
     jack_reset_dev(i,TRUE);
     jackd->dev_idx=i;
     jackd->client=NULL;
     jackd->in_use=FALSE;
-    for (j=0;j<JACK_MAX_OUTPUT_PORTS;j++) jackd->volume[j]=1.0f;
+    for (j=0; j<JACK_MAX_OUTPUT_PORTS; j++) jackd->volume[j]=1.0f;
     jackd->state=(jack_transport_state_t)JackTClosed;
     jackd->sample_out_rate=jackd->sample_in_rate=0;
     jackd->seek_pos=jackd->seek_end=0;
@@ -1687,13 +1664,13 @@
   int i,j;
   jack_driver_t *jackd;
 
-  for (i=0;i<JACK_MAX_INDEVICES;i++) {
+  for (i=0; i<JACK_MAX_INDEVICES; i++) {
     jackd = &indev[i];
     jack_reset_dev(i,FALSE);
     jackd->dev_idx=i;
     jackd->client=NULL;
     jackd->in_use=FALSE;
-    for (j=0;j<JACK_MAX_INPUT_PORTS;j++) jackd->volume[j]=1.0f;
+    for (j=0; j<JACK_MAX_INPUT_PORTS; j++) jackd->volume[j]=1.0f;
     jackd->state=(jack_transport_state_t)JackTClosed;
     jackd->sample_out_rate=jackd->sample_in_rate=0;
     jackd->seek_pos=jackd->seek_end=0;
@@ -1715,8 +1692,8 @@
 
 volatile aserver_message_t *jack_get_msgq(jack_driver_t *jackd) {
   // force update - "volatile" doesn't seem to work...
-  gchar *tmp=g_strdup_printf("%p %d",jackd->msgq,jackd->jackd_died);
-  g_free(tmp);
+  char *tmp=lives_strdup_printf("%p %d",jackd->msgq,jackd->jackd_died);
+  lives_free(tmp);
   if (jackd->jackd_died||mainw->aplayer_broken) return NULL;
   return jackd->msgq;
 }
@@ -1755,7 +1732,7 @@
 
 
 
-boolean jack_audio_seek_frame (jack_driver_t *jackd, int frame) {
+boolean jack_audio_seek_frame(jack_driver_t *jackd, int frame) {
   // seek to frame "frame" in current audio file
   // position will be adjusted to (floor) nearest sample
 
@@ -1783,7 +1760,7 @@
 }
 
 
-int64_t jack_audio_seek_bytes (jack_driver_t *jackd, int64_t bytes) {
+int64_t jack_audio_seek_bytes(jack_driver_t *jackd, int64_t bytes) {
   // seek to position "bytes" in current audio file
   // position will be adjusted to (floor) nearest sample
 
@@ -1819,7 +1796,7 @@
   if (seekstart>afile->afilesize) seekstart=afile->afilesize;
   jack_message.command=ASERVER_CMD_FILE_SEEK;
   jack_message.next=NULL;
-  jack_message.data=g_strdup_printf("%ld",seekstart);
+  jack_message.data=lives_strdup_printf("%ld",seekstart);
   jackd->msgq=&jack_message;
   return seekstart;
 }
@@ -1838,7 +1815,7 @@
   d_print(_("\nConnection to jack audio was reset.\n"));
   return TRUE;
 
- err123:
+err123:
   mainw->aplayer_broken=TRUE;
   mainw->jackd=NULL;
   do_jack_lost_conn_error();
@@ -1857,7 +1834,7 @@
   // - set vals
 
   // called at pb start and rec stop (after rec_ext_audio)
-  gchar *tmpfilename=NULL;
+  char *tmpfilename=NULL;
   lives_clip_t *sfile=mainw->files[fileno];
   int asigned=!(sfile->signed_endian&AFORM_UNSIGNED);
   int aendian=!(sfile->signed_endian&AFORM_BIG_ENDIAN);
@@ -1866,55 +1843,54 @@
     mainw->jackd->is_paused=FALSE;
     mainw->jackd->mute=mainw->mute;
     if (mainw->loop_cont&&!mainw->preview) {
-      if (mainw->ping_pong&&prefs->audio_opts&AUDIO_OPTS_FOLLOW_FPS&&mainw->multitrack==NULL) 
-	mainw->jackd->loop=AUDIO_LOOP_PINGPONG;
+      if (mainw->ping_pong&&prefs->audio_opts&AUDIO_OPTS_FOLLOW_FPS&&mainw->multitrack==NULL)
+        mainw->jackd->loop=AUDIO_LOOP_PINGPONG;
       else mainw->jackd->loop=AUDIO_LOOP_FORWARD;
-    }
-    else mainw->jackd->loop=AUDIO_LOOP_NONE;
+    } else mainw->jackd->loop=AUDIO_LOOP_NONE;
     if (sfile->achans>0&&(!mainw->preview||(mainw->preview&&mainw->is_processing))&&
-	(sfile->laudio_time>0.||sfile->opening||
-	 (mainw->multitrack!=NULL&&mainw->multitrack->is_rendering&&
-	  g_file_test((tmpfilename=g_build_filename(prefs->tmpdir,sfile->handle,"audio",NULL)),
-		      G_FILE_TEST_EXISTS)))) {
+        (sfile->laudio_time>0.||sfile->opening||
+         (mainw->multitrack!=NULL&&mainw->multitrack->is_rendering&&
+          lives_file_test((tmpfilename=lives_build_filename(prefs->tmpdir,sfile->handle,"audio",NULL)),
+                          LIVES_FILE_TEST_EXISTS)))) {
       boolean timeout;
       int alarm_handle;
-      
-      if (tmpfilename!=NULL) g_free(tmpfilename);
+
+      if (tmpfilename!=NULL) lives_free(tmpfilename);
       mainw->jackd->num_input_channels=sfile->achans;
       mainw->jackd->bytes_per_channel=sfile->asampsize/8;
       mainw->jackd->sample_in_rate=sfile->arate;
       mainw->jackd->usigned=!asigned;
       mainw->jackd->seek_end=sfile->afilesize;
-      
-      if ((aendian&&(capable->byte_order==LIVES_BIG_ENDIAN))||(!aendian&&(capable->byte_order==LIVES_LITTLE_ENDIAN))) 
-	mainw->jackd->reverse_endian=TRUE;
+
+      if ((aendian&&(capable->byte_order==LIVES_BIG_ENDIAN))||(!aendian&&(capable->byte_order==LIVES_LITTLE_ENDIAN)))
+        mainw->jackd->reverse_endian=TRUE;
       else mainw->jackd->reverse_endian=FALSE;
-      
+
       alarm_handle=lives_alarm_set(LIVES_ACONNECT_TIMEOUT);
       while (!(timeout=lives_alarm_get(alarm_handle))&&jack_get_msgq(mainw->jackd)!=NULL) {
-	sched_yield(); // wait for seek
+        sched_yield(); // wait for seek
       }
       if (timeout) jack_try_reconnect();
       lives_alarm_clear(alarm_handle);
-      
+
       if ((mainw->multitrack==NULL||mainw->multitrack->is_rendering)&&
-	  (mainw->event_list==NULL||mainw->record||(mainw->preview&&mainw->is_processing))) {
-	// tell jack server to open audio file and start playing it
-	jack_message.command=ASERVER_CMD_FILE_OPEN;
-	jack_message.data=g_strdup_printf("%d",fileno);
-	
-	jack_message.next=NULL;
-	mainw->jackd->msgq=&jack_message;
-	
-	jack_audio_seek_bytes(mainw->jackd,sfile->aseek_pos);
-	if (seek_err) {
-	  if (jack_try_reconnect()) jack_audio_seek_bytes(mainw->jackd,sfile->aseek_pos);
-	}
-	
-	mainw->jackd->in_use=TRUE;
-	mainw->rec_aclip=fileno;
-	mainw->rec_avel=sfile->pb_fps/sfile->fps;
-	mainw->rec_aseek=(double)sfile->aseek_pos/(double)(sfile->arate*sfile->achans*(sfile->asampsize/8));
+          (mainw->event_list==NULL||mainw->record||(mainw->preview&&mainw->is_processing))) {
+        // tell jack server to open audio file and start playing it
+        jack_message.command=ASERVER_CMD_FILE_OPEN;
+        jack_message.data=lives_strdup_printf("%d",fileno);
+
+        jack_message.next=NULL;
+        mainw->jackd->msgq=&jack_message;
+
+        jack_audio_seek_bytes(mainw->jackd,sfile->aseek_pos);
+        if (seek_err) {
+          if (jack_try_reconnect()) jack_audio_seek_bytes(mainw->jackd,sfile->aseek_pos);
+        }
+
+        mainw->jackd->in_use=TRUE;
+        mainw->rec_aclip=fileno;
+        mainw->rec_avel=sfile->pb_fps/sfile->fps;
+        mainw->rec_aseek=(double)sfile->aseek_pos/(double)(sfile->arate*sfile->achans*(sfile->asampsize/8));
       }
     }
     if (mainw->agen_key!=0&&mainw->multitrack==NULL) mainw->jackd->in_use=TRUE; // audio generator is active

LiVES-2.2.8.tar.bz2/src/jack.h -> LiVES-2.4.1.tar.bz2/src/jack.h Changed

@@ -18,14 +18,14 @@
 #include <jack/jack.h>
 #include <jack/transport.h>
 
-boolean lives_jack_init (void); /** start up server on LiVES init */
+boolean lives_jack_init(void);  /** start up server on LiVES init */
 boolean lives_jack_poll(void); /** poll function to check transport state */
-void lives_jack_end (void);
+void lives_jack_end(void);
 
-int lives_start_ready_callback (jack_transport_state_t state, jack_position_t *pos, void *arg);
+int lives_start_ready_callback(jack_transport_state_t state, jack_position_t *pos, void *arg);
 
-void jack_pb_start (void); /** start playback transport master */
-void jack_pb_stop (void); /** pause playback transport master */
+void jack_pb_start(void);  /** start playback transport master */
+void jack_pb_stop(void);  /** pause playback transport master */
 
 
 ////////////////////////////////////////////////////////////////////////////
@@ -49,7 +49,7 @@
 #define JackTStopped 1026
 
 typedef struct {
-  int      dev_idx;                      /**< id of this device ??? */ 
+  int      dev_idx;                      /**< id of this device ??? */
   int64_t     sample_out_rate;                   /**< samples(frames) per second */
   int64_t     sample_in_rate;                   /**< samples(frames) per second */
   uint64_t    num_input_channels;            /**< number of input channels(1 is mono, 2 stereo etc..) */
@@ -58,9 +58,9 @@
 
   uint64_t    num_calls;                     /**< count of process_audio() calls */
 
-  jack_port_t*     output_port[JACK_MAX_OUTPUT_PORTS]; /**< output ports */
-  jack_port_t*     input_port[JACK_MAX_INPUT_PORTS]; /**< input ports */
-  jack_client_t*   client;                        /**< pointer to jack client */
+  jack_port_t     *output_port[JACK_MAX_OUTPUT_PORTS]; /**< output ports */
+  jack_port_t     *input_port[JACK_MAX_INPUT_PORTS]; /**< input ports */
+  jack_client_t   *client;                        /**< pointer to jack client */
 
   char             **jack_port_name;              /**< user given strings for the port names, can be NULL */
   unsigned int     jack_port_name_count;          /**< the number of port names given */
@@ -130,10 +130,10 @@
 int jack_open_device(jack_driver_t *); ///< open device for host output
 int jack_open_device_read(jack_driver_t *); ///< open device for host input
 
-int jack_driver_activate (jack_driver_t *); ///< activate for host playback
-int jack_read_driver_activate (jack_driver_t *, boolean autocon); ///< activate for host recording
+int jack_driver_activate(jack_driver_t *);  ///< activate for host playback
+int jack_read_driver_activate(jack_driver_t *, boolean autocon);  ///< activate for host recording
 
-void jack_close_device(jack_driver_t*);
+void jack_close_device(jack_driver_t *);
 
 boolean jack_try_reconnect(void);
 
@@ -143,8 +143,8 @@
 // utils
 volatile aserver_message_t *jack_get_msgq(jack_driver_t *); ///< pull last msg from msgq, or return NULL
 uint64_t lives_jack_get_time(jack_driver_t *, boolean absolute); ///< get time from jack, in 10^-8 seconds
-boolean jack_audio_seek_frame (jack_driver_t *, int frame); ///< seek to (video) frame
-int64_t jack_audio_seek_bytes (jack_driver_t *, int64_t bytes); ///< seek to byte position
+boolean jack_audio_seek_frame(jack_driver_t *, int frame);  ///< seek to (video) frame
+int64_t jack_audio_seek_bytes(jack_driver_t *, int64_t bytes);  ///< seek to byte position
 
 void jack_get_rec_avals(jack_driver_t *);

LiVES-2.2.8.tar.bz2/src/keyboard.c -> LiVES-2.4.1.tar.bz2/src/keyboard.c Changed

@@ -39,37 +39,37 @@
   int i;
 
 #ifdef OMC_JS_IMPL
-    if (mainw->ext_cntl[EXT_CNTL_JS]) {
-      gchar *string=js_mangle();
-      if (string!=NULL) {
-	omc_process_string(OMC_JS,string,FALSE,NULL);
-	g_free(string);
-	string=NULL;
-      }
+  if (mainw->ext_cntl[EXT_CNTL_JS]) {
+    char *string=js_mangle();
+    if (string!=NULL) {
+      omc_process_string(OMC_JS,string,FALSE,NULL);
+      lives_free(string);
+      string=NULL;
     }
+  }
 #endif // OMC_JS_IMPL
-    
+
 #ifdef OMC_MIDI_IMPL
-    midi_check_rate=prefs->midi_check_rate;
+  midi_check_rate=prefs->midi_check_rate;
 #ifdef ALSA_MIDI
-    if (prefs->use_alsa_midi) midi_check_rate=1; // because we loop for events in midi_mangle()
+  if (prefs->use_alsa_midi) midi_check_rate=1; // because we loop for events in midi_mangle()
 #endif
-    if (mainw->ext_cntl[EXT_CNTL_MIDI]) {
-      do {
-	gotone=FALSE;
-	for (i=0;i<midi_check_rate;i++) {
-	  gchar *string=midi_mangle();
-	  if (string!=NULL) {
-	    omc_process_string(OMC_MIDI,string,FALSE,NULL);
-	    g_free(string);
-	    string=NULL;
+  if (mainw->ext_cntl[EXT_CNTL_MIDI]) {
+    do {
+      gotone=FALSE;
+      for (i=0; i<midi_check_rate; i++) {
+        char *string=midi_mangle();
+        if (string!=NULL) {
+          omc_process_string(OMC_MIDI,string,FALSE,NULL);
+          lives_free(string);
+          string=NULL;
 #ifdef ALSA_MIDI
-	    if (prefs->use_alsa_midi) gotone=TRUE;
+          if (prefs->use_alsa_midi) gotone=TRUE;
 #endif
-	  }
-	}
-      } while (gotone);
-    }
+        }
+      }
+    } while (gotone);
+  }
 #endif // OMC_MIDI_IMPL
 }
 
@@ -77,7 +77,7 @@
 #endif
 
 
-boolean ext_triggers_poll(gpointer data) {
+boolean ext_triggers_poll(livespointer data) {
 
   if (mainw->is_exiting) return FALSE;
 
@@ -112,11 +112,14 @@
 }
 
 
+#define LIVES_XEVENT_TYPE_KEYPRESS 2
+#define LIVES_XEVENT_TYPE_KEYRELEASE 3
 
-
-GdkFilterReturn filter_func(GdkXEvent *xevent, GdkEvent *event, gpointer data) {
+#if defined HAVE_X11 || defined IS_MINGW
+LiVESFilterReturn filter_func(LiVESXXEvent *xevent, LiVESXEvent *event, livespointer data) {
   // filter events at X11 level and act on key press/release
   uint32_t modifiers=0;
+  uint32_t key;
 
 #ifndef IS_MINGW
   // seems to broken in some cases - X does not send keypress/keyrelease events
@@ -125,14 +128,18 @@
 
   //g_print("t is %d\n",xev->type);
 
-  if (xev->type<2||xev->type>3) return GDK_FILTER_CONTINUE;
-  modifiers = (gtk_accelerator_get_default_mod_mask() & xev->xkey.state)|NEEDS_TRANSLATION;
+  if (xev->type != LIVES_XEVENT_TYPE_KEYPRESS && xev->type != LIVES_XEVENT_TYPE_KEYRELEASE) return LIVES_FILTER_CONTINUE;
+
+  key = xev->xkey.state;
+  modifiers = xev->xkey.state;
+
+  modifiers = (lives_accelerator_get_default_mod_mask() & modifiers)|NEEDS_TRANSLATION;
 
   // key down
-  if (xev->type==2) return pl_key_function(TRUE,xev->xkey.keycode,modifiers)?GDK_FILTER_REMOVE:GDK_FILTER_CONTINUE;
+  if (xev->type==LIVES_XEVENT_TYPE_KEYPRESS) return pl_key_function(TRUE,key,modifiers)?LIVES_FILTER_REMOVE:LIVES_FILTER_CONTINUE;
 
   // key up
-  return pl_key_function(FALSE,xev->xkey.keycode,modifiers)?GDK_FILTER_REMOVE:GDK_FILTER_CONTINUE;
+  return pl_key_function(FALSE,key,modifiers)?LIVES_FILTER_REMOVE:LIVES_FILTER_CONTINUE;
 #else
   // windows uses MSGs
   PMSG msg=(PMSG)xevent;
@@ -140,45 +147,58 @@
 
 #define KEY_DOWN(vk_code) ((GetAsyncKeyState(vk_code) & 0x8000) ? 1 : 0)
 
-  if (msg->message!=WM_KEYDOWN && msg->message!=WM_KEYUP) return GDK_FILTER_CONTINUE;
+  if (msg->message!=WM_KEYDOWN && msg->message!=WM_KEYUP) return LIVES_FILTER_CONTINUE;
 
   if (KEY_DOWN(VK_CONTROL))
     modifiers |= LIVES_CONTROL_MASK;
-  
+
   if (KEY_DOWN(VK_MENU))
     modifiers |= LIVES_ALT_MASK;
-  
+
   if (KEY_DOWN(VK_SHIFT))
     modifiers |= LIVES_SHIFT_MASK;
 
   key = (uint16_t)msg->wParam;
-  
+
   switch (key) {
-  case VK_LEFT: key=LIVES_KEY_Left; break;
-  case VK_RIGHT: key=LIVES_KEY_Right; break;
-  case VK_UP: key=LIVES_KEY_Up; break;
-  case VK_DOWN: key=LIVES_KEY_Down; break;
-  default: break;
+  case VK_LEFT:
+    key=LIVES_KEY_Left;
+    break;
+  case VK_RIGHT:
+    key=LIVES_KEY_Right;
+    break;
+  case VK_UP:
+    key=LIVES_KEY_Up;
+    break;
+  case VK_DOWN:
+    key=LIVES_KEY_Down;
+    break;
+  default:
+    break;
   }
-  
+
   if (msg->message==WM_KEYDOWN) return pl_key_function(TRUE,key,modifiers)?
-				  GDK_FILTER_REMOVE:GDK_FILTER_CONTINUE;
+                                         LIVES_FILTER_REMOVE:LIVES_FILTER_CONTINUE;
 
-  return pl_key_function(FALSE,key,modifiers)?GDK_FILTER_REMOVE:GDK_FILTER_CONTINUE;
+  return pl_key_function(FALSE,key,modifiers)?LIVES_FILTER_REMOVE:LIVES_FILTER_CONTINUE;
 
 #endif
 
-  return GDK_FILTER_CONTINUE;
+  return LIVES_FILTER_CONTINUE;
 }
 
 
+bool nevfilter::nativeEventFilter(const QByteArray &eventType, livespointer message, long *result)  Q_DECL_OVERRIDE {
+  return filter_func(message, NULL, NULL);
+}
 
+#endif
 
-boolean plugin_poll_keyboard (void) {
+boolean plugin_poll_keyboard(void) {
   static int last_kb_time=0,current_kb_time;
 
   // this is a function which should be called periodically during playback.
-  // If a video playback plugin has control of the keyboard 
+  // If a video playback plugin has control of the keyboard
   // (e.g fullscreen video playback plugins)
   // it will be asked to send keycodes via pl_key_function
 
@@ -187,16 +207,16 @@
 
 
   if (mainw->ext_keyboard) {
-     //let plugin call pl_key_function itself, with any keycodes it has received
-    if (mainw->vpp->send_keycodes!=NULL) (*mainw->vpp->send_keycodes)(pl_key_function);
-   }
-  
+    //let plugin call pl_key_function itself, with any keycodes it has received
+    if (mainw->vpp->send_keycodes!=NULL)(*mainw->vpp->send_keycodes)(pl_key_function);
+  }
+
   current_kb_time=mainw->currticks*(1000/U_SEC_RATIO);
 
   // we also auto-repeat our cached keys
   if (cached_key&&current_kb_time-last_kb_time>KEY_RPT_INTERVAL*10) {
     last_kb_time=current_kb_time;
-    lives_accel_groups_activate (G_OBJECT (mainw->LiVES),(uint32_t)cached_key, (LiVESXModifierType)cached_mod);
+    lives_accel_groups_activate(LIVES_WIDGET_OBJECT(mainw->LiVES),(uint32_t)cached_key, (LiVESXModifierType)cached_mod);
   }
 
   return TRUE;
@@ -204,7 +224,7 @@
 
 
 
-boolean pl_key_function (boolean down, uint16_t unicode, uint16_t keymod) {
+boolean pl_key_function(boolean down, uint16_t unicode, uint16_t keymod) {
   // translate key events
   // plugins can also call this with a unicode key to pass key events to LiVES
   // (via a polling mechanism)
@@ -218,18 +238,25 @@
     // up...
     if (keymod&NEEDS_TRANSLATION) {
       switch (unicode) {
-	// some keys need translating when a modifier is held down
-      case(key_left) :
-      case (key_left2): if (cached_key==LIVES_KEY_Left) cached_key=0;return FALSE;
-      case(key_right) : 
-      case (key_right2): if (cached_key==LIVES_KEY_Right) cached_key=0;return FALSE;
-      case(key_up)  :
-      case (key_up2): if (cached_key==LIVES_KEY_Up) cached_key=0;return FALSE;
-      case(key_down) : 
-      case (key_down2): if (cached_key==LIVES_KEY_Down) cached_key=0;return FALSE;
+        // some keys need translating when a modifier is held down
+      case (key_left) :
+      case (key_left2):
+        if (cached_key==LIVES_KEY_Left) cached_key=0;
+        return FALSE;
+      case (key_right) :
+      case (key_right2):
+        if (cached_key==LIVES_KEY_Right) cached_key=0;
+        return FALSE;
+      case (key_up)  :
+      case (key_up2):
+        if (cached_key==LIVES_KEY_Up) cached_key=0;
+        return FALSE;
+      case (key_down) :
+      case (key_down2):
+        if (cached_key==LIVES_KEY_Down) cached_key=0;
+        return FALSE;
       }
-    }
-    else {
+    } else {
       if (cached_key==unicode) cached_key=0;
     }
     return FALSE;
@@ -239,46 +266,110 @@
   if (keymod&NEEDS_TRANSLATION) {
     switch (unicode) {
       // some keys need translating when a modifier is held down
-    case (65) :unicode=LIVES_KEY_Space;break;
-    case (22) :unicode=LIVES_KEY_BackSpace;break;
-    case (36) :unicode=LIVES_KEY_Return;break;
-    case (24) :unicode=LIVES_KEY_q;break;
-    case (10) :unicode=LIVES_KEY_1;break;
-    case (11) :unicode=LIVES_KEY_2;break;
-    case (12) :unicode=LIVES_KEY_3;break;
-    case (13) :unicode=LIVES_KEY_4;break;
-    case (14) :unicode=LIVES_KEY_5;break;
-    case (15) :unicode=LIVES_KEY_6;break;
-    case (16) :unicode=LIVES_KEY_7;break;
-    case (17) :unicode=LIVES_KEY_8;break;
-    case (18) :unicode=LIVES_KEY_9;break;
-    case (19) :unicode=LIVES_KEY_0;break;
-    case (67) :unicode=LIVES_KEY_F1;break;
-    case (68) :unicode=LIVES_KEY_F2;break;
-    case (69) :unicode=LIVES_KEY_F3;break;
-    case (70) :unicode=LIVES_KEY_F4;break;
-    case (71) :unicode=LIVES_KEY_F5;break;
-    case (72) :unicode=LIVES_KEY_F6;break;
-    case (73) :unicode=LIVES_KEY_F7;break;
-    case (74) :unicode=LIVES_KEY_F8;break;
-    case (75) :unicode=LIVES_KEY_F9;break;
-    case (76) :unicode=LIVES_KEY_F10;break;
-    case (95) :unicode=LIVES_KEY_F11;break;
-    case (96) :unicode=LIVES_KEY_F12;break;
+    case (65) :
+      unicode=LIVES_KEY_Space;
+      break;
+    case (22) :
+      unicode=LIVES_KEY_BackSpace;
+      break;
+    case (36) :
+      unicode=LIVES_KEY_Return;
+      break;
+    case (24) :
+      unicode=LIVES_KEY_q;
+      break;
+    case (10) :
+      unicode=LIVES_KEY_1;
+      break;
+    case (11) :
+      unicode=LIVES_KEY_2;
+      break;
+    case (12) :
+      unicode=LIVES_KEY_3;
+      break;
+    case (13) :
+      unicode=LIVES_KEY_4;
+      break;
+    case (14) :
+      unicode=LIVES_KEY_5;
+      break;
+    case (15) :
+      unicode=LIVES_KEY_6;
+      break;
+    case (16) :
+      unicode=LIVES_KEY_7;
+      break;
+    case (17) :
+      unicode=LIVES_KEY_8;
+      break;
+    case (18) :
+      unicode=LIVES_KEY_9;
+      break;
+    case (19) :
+      unicode=LIVES_KEY_0;
+      break;
+    case (67) :
+      unicode=LIVES_KEY_F1;
+      break;
+    case (68) :
+      unicode=LIVES_KEY_F2;
+      break;
+    case (69) :
+      unicode=LIVES_KEY_F3;
+      break;
+    case (70) :
+      unicode=LIVES_KEY_F4;
+      break;
+    case (71) :
+      unicode=LIVES_KEY_F5;
+      break;
+    case (72) :
+      unicode=LIVES_KEY_F6;
+      break;
+    case (73) :
+      unicode=LIVES_KEY_F7;
+      break;
+    case (74) :
+      unicode=LIVES_KEY_F8;
+      break;
+    case (75) :
+      unicode=LIVES_KEY_F9;
+      break;
+    case (76) :
+      unicode=LIVES_KEY_F10;
+      break;
+    case (95) :
+      unicode=LIVES_KEY_F11;
+      break;
+    case (96) :
+      unicode=LIVES_KEY_F12;
+      break;
     case (99) :
-    case (112) :unicode=LIVES_KEY_Page_Up;break;
+    case (112) :
+      unicode=LIVES_KEY_Page_Up;
+      break;
     case (105) :
-    case (117) :unicode=LIVES_KEY_Page_Down;break;
+    case (117) :
+      unicode=LIVES_KEY_Page_Down;
+      break;
 
       // auto repeat keys
-    case(key_left) :
-    case (key_left2): unicode=LIVES_KEY_Left;break;
-    case(key_right) :
-    case (key_right2): unicode=LIVES_KEY_Right;break;
-    case(key_up)  :
-    case (key_up2): unicode=LIVES_KEY_Up;break;
-    case(key_down) :
-    case (key_down2): unicode=LIVES_KEY_Down;break;
+    case (key_left) :
+    case (key_left2):
+      unicode=LIVES_KEY_Left;
+      break;
+    case (key_right) :
+    case (key_right2):
+      unicode=LIVES_KEY_Right;
+      break;
+    case (key_up)  :
+    case (key_up2):
+      unicode=LIVES_KEY_Up;
+      break;
+    case (key_down) :
+    case (key_down2):
+      unicode=LIVES_KEY_Down;
+      break;
 
     }
   }
@@ -299,118 +390,118 @@
       int error;
       char *nval;
       char *cval=weed_get_string_value(mainw->rte_textparm,"value",&error);
-      if (unicode==8&&strlen(cval)>0) { 
-	memset(cval+strlen(cval)-1,0,1); // delete 1 char
-	nval=g_strdup(cval);
-      }
-      else nval=g_strdup_printf("%s%c",cval,(unsigned char)unicode); // append 1 char
-      weed_free(cval);
+      if (unicode==8&&strlen(cval)>0) {
+        memset(cval+strlen(cval)-1,0,1); // delete 1 char
+        nval=lives_strdup(cval);
+      } else nval=lives_strdup_printf("%s%c",cval,(unsigned char)unicode); // append 1 char
+      lives_free(cval);
       weed_set_string_value(mainw->rte_textparm,"value",nval);
       inst=weed_get_plantptr_value(mainw->rte_textparm,"host_instance",&error);
       param_number=weed_get_int_value(mainw->rte_textparm,"host_idx",&error);
       copyto=set_copy_to(inst,param_number,TRUE);
       if (mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
-	// if we are recording, add this change to our event_list
-	rec_param_change(inst,param_number);
-	if (copyto!=-1) rec_param_change(inst,copyto);
+        // if we are recording, add this change to our event_list
+        rec_param_change(inst,param_number);
+        if (copyto!=-1) rec_param_change(inst,copyto);
       }
-      g_free(nval);
+      lives_free(nval);
       return TRUE;
     }
   }
 
   if (mainw->ext_keyboard) {
     if (cached_key) return FALSE;
-    if (mainw->multitrack==NULL) lives_accel_groups_activate (G_OBJECT (mainw->LiVES),(uint32_t)unicode,state);
-    else lives_accel_groups_activate (G_OBJECT (mainw->multitrack->window),(uint32_t)unicode,state);
+    if (mainw->multitrack==NULL) lives_accel_groups_activate(LIVES_WIDGET_OBJECT(mainw->LiVES),(uint32_t)unicode,state);
+    else lives_accel_groups_activate(LIVES_WIDGET_OBJECT(mainw->multitrack->window),(uint32_t)unicode,state);
     if (!mainw->ext_keyboard) return TRUE; // if user switched out of ext_keyboard, do no further processing *
   }
 
   return FALSE;
 
-  // * function was disabled so we must exit 
+  // * function was disabled so we must exit
 }
 
 
 // key callback functions - ones which have keys and need wrappers
 
 
-boolean slower_callback (LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, gpointer user_data) {
-  
-  on_slower_pressed (NULL,user_data);
+boolean slower_callback(LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, livespointer user_data) {
+
+  on_slower_pressed(NULL,user_data);
   return TRUE;
 }
 
-boolean faster_callback (LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, gpointer user_data) {
-  
-  on_faster_pressed (NULL,user_data);
+boolean faster_callback(LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, livespointer user_data) {
+
+  on_faster_pressed(NULL,user_data);
   return TRUE;
 }
 
-boolean skip_back_callback (LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, gpointer user_data) {
-  
-  on_back_pressed (NULL,user_data);
+boolean skip_back_callback(LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, livespointer user_data) {
+
+  on_back_pressed(NULL,user_data);
   return TRUE;
 }
 
-boolean skip_forward_callback (LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, gpointer user_data) {
-  
-  on_forward_pressed (NULL,user_data);
+boolean skip_forward_callback(LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, livespointer user_data) {
+
+  on_forward_pressed(NULL,user_data);
   return TRUE;
 }
 
-boolean stop_callback (LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, gpointer user_data) {
-  on_stop_activate (NULL,NULL);
+boolean stop_callback(LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, livespointer user_data) {
+  on_stop_activate(NULL,NULL);
   return TRUE;
 }
 
-boolean fullscreen_callback (LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, gpointer user_data) {
-  on_full_screen_pressed (NULL,NULL);
+boolean fullscreen_callback(LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, livespointer user_data) {
+  on_full_screen_pressed(NULL,NULL);
   return TRUE;
 }
 
-boolean sepwin_callback (LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, gpointer user_data) {
-  on_sepwin_pressed (NULL,NULL);
+boolean sepwin_callback(LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, livespointer user_data) {
+  on_sepwin_pressed(NULL,NULL);
   return TRUE;
 }
 
-boolean loop_cont_callback (LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, gpointer user_data) {
-  on_loop_button_activate (NULL,NULL);
+boolean loop_cont_callback(LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, livespointer user_data) {
+  on_loop_button_activate(NULL,NULL);
   return TRUE;
 }
 
-boolean ping_pong_callback (LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, gpointer user_data) {
-  on_ping_pong_activate (NULL,NULL);
+boolean ping_pong_callback(LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, livespointer user_data) {
+  on_ping_pong_activate(NULL,NULL);
   return TRUE;
 }
 
-boolean fade_callback (LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, gpointer user_data) {
-  on_fade_pressed (NULL,NULL);
+boolean fade_callback(LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, livespointer user_data) {
+  on_fade_pressed(NULL,NULL);
   return TRUE;
 }
 
-boolean showfct_callback (LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, gpointer user_data) {
+boolean showfct_callback(LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, livespointer user_data) {
   lives_check_menu_item_set_active(LIVES_CHECK_MENU_ITEM(mainw->showfct),!prefs->show_framecount);
   return TRUE;
 }
 
-boolean showsubs_callback (LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, gpointer user_data) {
+boolean showsubs_callback(LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, livespointer user_data) {
   lives_check_menu_item_set_active(LIVES_CHECK_MENU_ITEM(mainw->showsubs),!prefs->show_subtitles);
   return TRUE;
 }
 
-boolean loop_callback (LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, gpointer user_data) {
+boolean loop_callback(LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, livespointer user_data) {
   lives_check_menu_item_set_active(LIVES_CHECK_MENU_ITEM(mainw->loop_video),!mainw->loop);
   return TRUE;
 }
 
-boolean dblsize_callback (LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, gpointer user_data) {
-  on_double_size_pressed (NULL,NULL);
+boolean dblsize_callback(LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, livespointer user_data) {
+  on_double_size_pressed(NULL,NULL);
   return TRUE;
 }
 
-boolean rec_callback (LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, gpointer user_data) {
-  lives_check_menu_item_set_active(LIVES_CHECK_MENU_ITEM(mainw->record_perf),!lives_check_menu_item_get_active (LIVES_CHECK_MENU_ITEM (mainw->record_perf)));
+boolean rec_callback(LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, livespointer user_data) {
+  lives_check_menu_item_set_active(LIVES_CHECK_MENU_ITEM(mainw->record_perf),
+                                   !lives_check_menu_item_get_active(LIVES_CHECK_MENU_ITEM(mainw->record_perf)));
   return TRUE;
 }

LiVES-2.2.8.tar.bz2/src/keyboard.h -> LiVES-2.4.1.tar.bz2/src/keyboard.h Changed

@@ -1,6 +1,6 @@
 // keyboard.h
 // LiVES
-// (c) G. Finch 2004 - 2012 <salsaman@gmail.com>
+// (c) G. Finch 2004 - 2015 <salsaman@gmail.com>
 // see file ../COPYING for licensing details
 
 // repeating keys
@@ -18,43 +18,45 @@
 #define key_down2 116
 
 
-boolean ext_triggers_poll(gpointer); ///< poll for external playback start
+boolean ext_triggers_poll(livespointer); ///< poll for external playback start
 
-GdkFilterReturn filter_func(GdkXEvent *xevent, LiVESXEvent *event, gpointer data);
+#if defined HAVE_X11 || defined IS_MINGW
+LiVESFilterReturn filter_func(LiVESXXEvent *xevent, LiVESXEvent *event, livespointer data);
+#endif
 
-boolean plugin_poll_keyboard (void);
+boolean plugin_poll_keyboard(void);
 
-boolean pl_key_function (boolean down, uint16_t unicode, uint16_t keymod);
+boolean pl_key_function(boolean down, uint16_t unicode, uint16_t keymod);
 
-boolean faster_callback (LiVESAccelGroup *, LiVESObject *, uint32_t, LiVESXModifierType, gpointer user_data);
+boolean faster_callback(LiVESAccelGroup *, LiVESObject *, uint32_t, LiVESXModifierType, livespointer user_data);
 
-boolean slower_callback (LiVESAccelGroup *, LiVESObject *, uint32_t, LiVESXModifierType, gpointer user_data);
+boolean slower_callback(LiVESAccelGroup *, LiVESObject *, uint32_t, LiVESXModifierType, livespointer user_data);
 
-boolean skip_back_callback (LiVESAccelGroup *, LiVESObject *, uint32_t, LiVESXModifierType, gpointer user_data);
+boolean skip_back_callback(LiVESAccelGroup *, LiVESObject *, uint32_t, LiVESXModifierType, livespointer user_data);
 
-boolean skip_forward_callback (LiVESAccelGroup *, LiVESObject *, uint32_t, LiVESXModifierType, gpointer user_data);
+boolean skip_forward_callback(LiVESAccelGroup *, LiVESObject *, uint32_t, LiVESXModifierType, livespointer user_data);
 
-boolean stop_callback (LiVESAccelGroup *, LiVESObject *, uint32_t, LiVESXModifierType, gpointer user_data);
+boolean stop_callback(LiVESAccelGroup *, LiVESObject *, uint32_t, LiVESXModifierType, livespointer user_data);
 
-boolean rec_callback (LiVESAccelGroup *, LiVESObject *, uint32_t, LiVESXModifierType, gpointer user_data);
+boolean rec_callback(LiVESAccelGroup *, LiVESObject *, uint32_t, LiVESXModifierType, livespointer user_data);
 
-boolean loop_callback (LiVESAccelGroup *, LiVESObject *, uint32_t, LiVESXModifierType, gpointer user_data);
+boolean loop_callback(LiVESAccelGroup *, LiVESObject *, uint32_t, LiVESXModifierType, livespointer user_data);
 
-boolean loop_cont_callback (LiVESAccelGroup *, LiVESObject *, uint32_t, LiVESXModifierType, gpointer user_data);
+boolean loop_cont_callback(LiVESAccelGroup *, LiVESObject *, uint32_t, LiVESXModifierType, livespointer user_data);
 
-boolean ping_pong_callback (LiVESAccelGroup *, LiVESObject *, uint32_t, LiVESXModifierType, gpointer user_data);
+boolean ping_pong_callback(LiVESAccelGroup *, LiVESObject *, uint32_t, LiVESXModifierType, livespointer user_data);
 
-boolean dblsize_callback (LiVESAccelGroup *, LiVESObject *, uint32_t, LiVESXModifierType, gpointer user_data);
+boolean dblsize_callback(LiVESAccelGroup *, LiVESObject *, uint32_t, LiVESXModifierType, livespointer user_data);
 
-boolean showfct_callback (LiVESAccelGroup *, LiVESObject *, uint32_t, LiVESXModifierType, gpointer user_data);
+boolean showfct_callback(LiVESAccelGroup *, LiVESObject *, uint32_t, LiVESXModifierType, livespointer user_data);
 
-boolean showsubs_callback (LiVESAccelGroup *, LiVESObject *, uint32_t, LiVESXModifierType, gpointer user_data);
+boolean showsubs_callback(LiVESAccelGroup *, LiVESObject *, uint32_t, LiVESXModifierType, livespointer user_data);
 
-boolean fullscreen_callback (LiVESAccelGroup *, LiVESObject *, uint32_t, LiVESXModifierType, gpointer user_data);
+boolean fullscreen_callback(LiVESAccelGroup *, LiVESObject *, uint32_t, LiVESXModifierType, livespointer user_data);
 
-boolean sepwin_callback (LiVESAccelGroup *, LiVESObject *, uint32_t, LiVESXModifierType, gpointer user_data);
+boolean sepwin_callback(LiVESAccelGroup *, LiVESObject *, uint32_t, LiVESXModifierType, livespointer user_data);
 
-boolean fade_callback (LiVESAccelGroup *, LiVESObject *, uint32_t, LiVESXModifierType, gpointer user_data);
+boolean fade_callback(LiVESAccelGroup *, LiVESObject *, uint32_t, LiVESXModifierType, livespointer user_data);
 
 
 #define KEY_RPT_INTERVAL 4

LiVES-2.4.1.tar.bz2/src/lbindings.c Added

@@ -0,0 +1,1948 @@
+// lbindings.c
+// LiVES (lives-exe)
+// (c) G. Finch <salsaman@gmail.com> 2015
+// Released under the GPL 3 or later
+// see file ../COPYING for licensing details
+
+#define NEED_ENDIAN_TEST
+
+#include "main.h"
+#include "interface.h"
+#include "callbacks.h"
+#include "rte_window.h"
+#include "effects-weed.h"
+#include "effects.h"
+
+#include "liblives.hpp"
+
+
+typedef boolean Boolean;
+
+#include <libOSC/libosc.h>
+#include <libOSC/OSC-client.h>
+
+
+
+typedef struct {
+  // c
+  ulong id;
+  char *msg;
+} msginfo;
+
+
+typedef struct {
+  // i, c
+  ulong id;
+  int val;
+  char *string;
+} lset;
+
+
+typedef struct {
+  // i,v
+  ulong id;
+  int arglen;
+  const void *vargs;
+} oscdata;
+
+
+typedef struct {
+  // c, d, i
+  ulong id;
+  char *fname;
+  double stime;
+  int frames;
+} opfidata;
+
+
+typedef struct {
+  // c, c, i
+  ulong id;
+  char *dir;
+  char *title;
+  int preview_type;
+} fprev;
+
+
+typedef struct {
+  // b
+  ulong id;
+  boolean setting;
+} sintdata;
+
+
+typedef struct {
+  ulong id;
+} udata;
+
+
+typedef struct {
+  // i, i, i
+  ulong id;
+  int key;
+  int mode;
+  int idx;
+} fxmapdata;
+
+
+typedef struct {
+  // i, b
+  // boolean pref
+  ulong id;
+  int prefidx;
+  boolean val;
+} bpref;
+
+
+typedef struct {
+  // i, i, b
+  // bitmapped pref
+  ulong id;
+  int prefidx;
+  int bitfield;
+  boolean val;
+} bmpref;
+
+
+typedef struct {
+  // i, i
+  // int pref
+  ulong id;
+  int prefidx;
+  int val;
+} ipref;
+
+
+typedef struct {
+  // i, b, b
+  ulong id;
+  int clip;
+  boolean ign_sel;
+  boolean with_audio;
+} iblock;
+
+
+typedef struct {
+  ulong id;
+  track_rect *block;
+  int track;
+  double time;
+} mblockdata;
+
+
+
+/////////////////////////////////////////
+/// extern functions with no headers
+
+boolean lives_osc_cb_saveset(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra);
+boolean lives_osc_cb_play(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra);
+
+boolean lives_osc_cb_clip_goto(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra);
+boolean lives_osc_cb_bgclip_goto(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra);
+
+
+
+/// osc utils
+
+
+
+
+int padup(char **str, int arglen) {
+  int newlen = pad4(arglen);
+  char *ostr = *str;
+  *str = (char *)lives_calloc(1,newlen);
+  lives_memcpy(*str, ostr, arglen);
+  lives_free(ostr);
+  return newlen;
+}
+
+
+int add_int_arg(char **str, int arglen, int val) {
+  int newlen = arglen + 4;
+  char *ostr = *str;
+  *str = (char *)lives_calloc(1,newlen);
+  lives_memcpy(*str, ostr, arglen);
+  if (!IS_BIG_ENDIAN) {
+    (*str)[arglen] = (unsigned char)((val&0xFF000000)>>3);
+    (*str)[arglen+1] = (unsigned char)((val&0x00FF0000)>>2);
+    (*str)[arglen+2] = (unsigned char)((val&0x0000FF00)>>1);
+    (*str)[arglen+3] = (unsigned char)(val&0x000000FF);
+  } else {
+    lives_memcpy(*str + arglen, &val, 4);
+  }
+  lives_free(ostr);
+  return newlen;
+}
+
+
+static int add_string_arg(char **str, int arglen, const char *val) {
+  int newlen = arglen + strlen(val) + 1;
+  char *ostr = *str;
+  *str = (char *)lives_calloc(1,newlen);
+  lives_memcpy(*str, ostr, arglen);
+  lives_memcpy(*str + arglen, val, strlen(val));
+  lives_free(ostr);
+  return newlen;
+}
+
+
+/////////// value return functions ///////////////////////
+
+
+static void ext_caller_return_int(ulong caller_id, int ret) {
+  // this is for the C++ binding
+  char *msgstring = lives_strdup_printf("%lu %d",caller_id,ret);
+  if (mainw!=NULL) binding_cb(LIVES_CALLBACK_PRIVATE, msgstring, mainw->id);
+  lives_free(msgstring);
+}
+
+
+static void ext_caller_return_ulong(ulong caller_id, ulong ret) {
+  // this is for the C++ binding
+  char *msgstring = lives_strdup_printf("%lu %lu",caller_id,ret);
+  if (mainw!=NULL) binding_cb(LIVES_CALLBACK_PRIVATE, msgstring, mainw->id);
+  lives_free(msgstring);
+}
+
+
+static void ext_caller_return_string(ulong caller_id, const char *ret) {
+  // this is for the C++ binding
+  char *msgstring = lives_strdup_printf("%lu %s",caller_id,ret);
+  if (mainw!=NULL) binding_cb(LIVES_CALLBACK_PRIVATE, msgstring, mainw->id);
+  lives_free(msgstring);
+}
+
+
+///////////////////////////////////////////////////////////////
+/// utility functions for liblives /////
+
+ulong *get_unique_ids(void) {
+  // return array of unique_id (ulong) for all "real" clips
+  int i=0;
+  ulong *uids=NULL;
+  LiVESList *list;
+  if (mainw!=NULL&&!mainw->go_away) {
+    pthread_mutex_lock(&mainw->clip_list_mutex);
+    list=mainw->cliplist;
+    uids=(ulong *)lives_malloc((lives_list_length(mainw->cliplist) + 1)*sizeof(ulong));
+    while (list!=NULL) {
+      int uid=0;
+      int cnum=LIVES_POINTER_TO_INT(list->data);
+      if (mainw->files[cnum]!=NULL) uid=mainw->files[cnum]->unique_id;
+      list=list->next;
+      if (uid==0) continue;
+      uids[i++]=uid;
+    }
+    uids[i]=0;
+    pthread_mutex_unlock(&mainw->clip_list_mutex);
+  }
+  return uids;
+}
+
+
+int cnum_for_uid(ulong uid) {
+  LiVESList *list;
+  if (mainw!=NULL&&!mainw->go_away) {
+    pthread_mutex_lock(&mainw->clip_list_mutex);
+    list=mainw->cliplist;
+    while (list!=NULL) {
+      int cnum=LIVES_POINTER_TO_INT(list->data);
+      if (mainw->files[cnum]!=NULL && uid==mainw->files[cnum]->unique_id) {
+        pthread_mutex_unlock(&mainw->clip_list_mutex);
+        return cnum;
+      }
+      list=list->next;
+    }
+    pthread_mutex_unlock(&mainw->clip_list_mutex);
+  }
+  return -1;
+}
+
+
+boolean start_player(void) {
+  boolean ret;
+  int arglen = 1;
+  char **vargs=(char **)lives_malloc(sizeof(char *));
+  *vargs = strdup(",");
+  arglen = padup(vargs, arglen);
+
+  // this will set our idlefunc and return
+  ret = lives_osc_cb_play(NULL, arglen, (const void *)(*vargs), OSCTT_CurrentTime(), NULL);
+  if (ret) {
+    while (!mainw->error && mainw->playing_file < 0) lives_usleep(prefs->sleep_time);
+    if (mainw->error) ret=FALSE;
+  }
+
+  lives_free(*vargs);
+  lives_free(vargs);
+  return ret;
+}
+
+enum {
+  const_domain_notify,
+  const_domain_response,
+  const_domain_grav,
+  const_domain_insert_mode
+};
+
+inline int trans_rev(int consta, int a, int b) {
+  if (consta==a) return b;
+  else return consta;
+}
+
+int trans_constant(int consta, int domain) {
+  int nconsta;
+  if (domain==const_domain_notify) {
+    nconsta=trans_rev(consta,LIVES_CALLBACK_FRAME_SYNCH,LIVES_OSC_NOTIFY_FRAME_SYNCH);
+    if (nconsta!=consta) return nconsta;
+    nconsta=trans_rev(consta,LIVES_CALLBACK_PLAYBACK_STARTED,LIVES_OSC_NOTIFY_PLAYBACK_STARTED);
+    if (nconsta!=consta) return nconsta;
+    nconsta=trans_rev(consta,LIVES_CALLBACK_PLAYBACK_STOPPED,LIVES_OSC_NOTIFY_PLAYBACK_STOPPED);
+    if (nconsta!=consta) return nconsta;
+    nconsta=trans_rev(consta,LIVES_CALLBACK_PLAYBACK_STOPPED_RD,LIVES_OSC_NOTIFY_PLAYBACK_STOPPED_RD);
+    if (nconsta!=consta) return nconsta;
+    nconsta=trans_rev(consta,LIVES_CALLBACK_RECORD_STARTED,LIVES_OSC_NOTIFY_RECORD_STARTED);
+    if (nconsta!=consta) return nconsta;
+    nconsta=trans_rev(consta,LIVES_CALLBACK_RECORD_STOPPED,LIVES_OSC_NOTIFY_RECORD_STOPPED);
+    if (nconsta!=consta) return nconsta;
+    nconsta=trans_rev(consta,LIVES_CALLBACK_APP_QUIT,LIVES_OSC_NOTIFY_QUIT);
+    if (nconsta!=consta) return nconsta;
+    nconsta=trans_rev(consta,LIVES_CALLBACK_CLIP_OPENED,LIVES_OSC_NOTIFY_CLIP_OPENED);
+    if (nconsta!=consta) return nconsta;
+    nconsta=trans_rev(consta,LIVES_CALLBACK_CLIP_CLOSED,LIVES_OSC_NOTIFY_CLIP_CLOSED);
+    if (nconsta!=consta) return nconsta;
+    nconsta=trans_rev(consta,LIVES_CALLBACK_CLIPSET_OPENED,LIVES_OSC_NOTIFY_CLIPSET_OPENED);
+    if (nconsta!=consta) return nconsta;
+    nconsta=trans_rev(consta,LIVES_CALLBACK_CLIPSET_SAVED,LIVES_OSC_NOTIFY_CLIPSET_SAVED);
+    if (nconsta!=consta) return nconsta;
+    nconsta=trans_rev(consta,LIVES_CALLBACK_MODE_CHANGED,LIVES_OSC_NOTIFY_MODE_CHANGED);
+    if (nconsta!=consta) return nconsta;
+  }
+  if (domain==const_domain_response) {
+    if (consta==LIVES_RESPONSE_NONE) return LIVES_DIALOG_RESPONSE_NONE;
+    if (consta==LIVES_RESPONSE_OK) return LIVES_DIALOG_RESPONSE_OK;
+    if (consta==LIVES_RESPONSE_CANCEL) return LIVES_DIALOG_RESPONSE_CANCEL;
+    if (consta==LIVES_RESPONSE_ACCEPT) return LIVES_DIALOG_RESPONSE_ACCEPT;
+    if (consta==LIVES_RESPONSE_YES) return LIVES_DIALOG_RESPONSE_YES;
+    if (consta==LIVES_RESPONSE_NO) return LIVES_DIALOG_RESPONSE_NO;
+
+    // positive values for custom responses
+    if (consta==LIVES_RESPONSE_INVALID) return LIVES_DIALOG_RESPONSE_INVALID;
+    if (consta==LIVES_RESPONSE_RETRY) return LIVES_DIALOG_RESPONSE_RETRY;
+    if (consta==LIVES_RESPONSE_ABORT) return LIVES_DIALOG_RESPONSE_ABORT;
+    if (consta==LIVES_RESPONSE_RESET) return LIVES_DIALOG_RESPONSE_RESET;
+    if (consta==LIVES_RESPONSE_SHOW_DETAILS) return LIVES_DIALOG_RESPONSE_SHOW_DETAILS;
+  }
+
+  if (domain==const_domain_grav) {
+    if (consta==LIVES_GRAVITY_NORMAL) return GRAV_MODE_NORMAL;
+    if (consta==LIVES_GRAVITY_LEFT) return GRAV_MODE_LEFT;
+    if (consta==LIVES_GRAVITY_RIGHT) return GRAV_MODE_RIGHT;
+  }
+
+
+  if (domain==const_domain_insert_mode) {
+    if (consta==LIVES_INSERT_MODE_NORMAL) return INSERT_MODE_NORMAL;
+  }
+
+  return consta;
+}
+
+
+int get_first_fx_matched(const char *package, const char *fxname, const char *author, int version) {
+  int *allvals=weed_get_indices_from_template(package,fxname,author,version);
+  int fval=allvals[0];
+  lives_free(allvals);
+  return fval;
+}
+
+
+// 1 based key here
+int get_num_mapped_modes_for_key(int key) {
+  return rte_key_getmaxmode(key)+1;
+}
+
+
+int get_current_mode_for_key(int key) {
+  return rte_key_getmode(key);
+}
+
+
+boolean get_rte_key_is_enabled(int key) {
+  return rte_key_is_enabled(key);
+}
+
+
+//// interface callers
+
+
+static boolean call_osc_show_info(livespointer text) {
+  // function that is picked up on idle
+  if (mainw!=NULL&&!mainw->go_away&&!mainw->is_processing) {
+    do_info_dialog(text);
+  }
+  lives_free(text);
+  return FALSE;
+}
+
+
+
+static boolean call_osc_show_blocking_info(livespointer data) {
+  // function that is picked up on idle
+  int ret=LIVES_RESPONSE_INVALID;
+  msginfo *minfo = (msginfo *)data;
+  if (mainw!=NULL&&!mainw->go_away&&!mainw->is_processing) {
+    ret=do_blocking_info_dialog(minfo->msg);
+    ret=trans_constant(ret,const_domain_notify);
+  }
+  ext_caller_return_int(minfo->id,ret);
+  lives_free(minfo->msg);
+  lives_free(data);
+  return FALSE;
+}
+
+
+static boolean call_osc_save_set(livespointer data) {
+  // function that is picked up on idle
+  boolean ret=FALSE;
+  oscdata *oscd = (oscdata *)data;
+  if (mainw!=NULL&&!mainw->go_away&&!mainw->is_processing) {
+    ret=lives_osc_cb_saveset(NULL, oscd->arglen, oscd->vargs, OSCTT_CurrentTime(), NULL);
+  }
+  ext_caller_return_int(oscd->id,(int)ret);
+  lives_free((char *)*((char **)(oscd->vargs)));
+  lives_free((char **)(oscd->vargs));
+  lives_free(data);
+  return FALSE;
+}
+
+
+static boolean call_file_choose_with_preview(livespointer data) {
+  LiVESWidget *chooser;
+  fprev *fdata = (fprev *)data;
+
+  char *fname=NULL,*rstr=NULL;
+
+  int preview_type;
+  int response;
+
+  if (mainw!=NULL&&!mainw->go_away&&!mainw->is_processing) {
+    if (fdata->preview_type==LIVES_FILE_CHOOSER_VIDEO_AUDIO) preview_type=LIVES_FILE_SELECTION_VIDEO_AUDIO;
+    else preview_type=LIVES_FILE_SELECTION_AUDIO_ONLY;
+    chooser=choose_file_with_preview(fdata->dir, fdata->title, preview_type);
+    response=lives_dialog_run(LIVES_DIALOG(chooser));
+    end_fs_preview();
+    mainw->fs_playarea=NULL;
+
+    if (response == LIVES_RESPONSE_ACCEPT) {
+      fname=lives_file_chooser_get_filename(LIVES_FILE_CHOOSER(chooser));
+    }
+    if (fname==NULL) fname=lives_strdup("");
+
+    on_filechooser_cancel_clicked(chooser);
+
+    if (fdata->dir!=NULL) lives_free(fdata->dir);
+    if (fdata->title!=NULL) lives_free(fdata->title);
+
+    rstr = lives_strdup_printf("%s %d", fname, mainw->open_deint);
+  }
+  ext_caller_return_string(fdata->id,rstr);
+  if (rstr!=NULL) lives_free(rstr);
+  if (fdata!=NULL) lives_free(fdata);
+  if (fname!=NULL) free(fname);
+  if (data!=NULL) lives_free(data);
+  return FALSE;
+}
+
+
+static boolean call_choose_set(livespointer data) {
+  udata *ud=(udata *)data;
+  if (mainw!=NULL&&!mainw->was_set&&!mainw->go_away&&!mainw->is_processing) {
+    char *setname=on_load_set_activate(NULL,(livespointer)1);
+    if (setname==NULL) setname=lives_strdup("");
+    ext_caller_return_string(ud->id,setname);
+    lives_free(setname);
+  } else ext_caller_return_string(ud->id,"");
+  lives_free(data);
+  return FALSE;
+}
+
+
+static boolean call_set_set_name(livespointer data) {
+  ulong uid=(ulong)data;
+  boolean ret=FALSE;
+
+  if (mainw!=NULL&&!mainw->go_away&&!mainw->is_processing&&mainw->playing_file==-1) {
+    ret=set_new_set_name(mainw->multitrack);
+  } else ext_caller_return_int(uid,(int)ret);
+  return FALSE;
+}
+
+
+static boolean call_open_file(livespointer data) {
+  opfidata *opfi = (opfidata *)data;
+  ulong uid=0l;
+  if (mainw!=NULL&&!mainw->go_away&&!mainw->is_processing) {
+    uid=open_file_sel(opfi->fname,opfi->stime,opfi->frames);
+    if (opfi->fname!=NULL) lives_free(opfi->fname);
+  }
+  ext_caller_return_ulong(opfi->id,uid);
+  lives_free(opfi->fname);
+  lives_free(data);
+  return FALSE;
+}
+
+
+static boolean call_reload_set(livespointer data) {
+  msginfo *mdata = (msginfo *)data;
+  boolean resp=FALSE;
+  if (mainw!=NULL&&!mainw->go_away&&!mainw->is_processing) {
+    mainw->osc_auto=1;
+    if (!strlen(mdata->msg)) {
+      lives_free(mdata->msg);
+      mdata->msg=on_load_set_activate(NULL,(livespointer)1);
+      if (mdata->msg==NULL) mdata->msg=lives_strdup("");
+    }
+    if (!is_legal_set_name(mdata->msg,TRUE)) {
+      mainw->osc_auto=0;
+      resp=FALSE;
+    } else {
+      mainw->osc_auto=0;
+      resp=reload_set(mdata->msg);
+    }
+  }
+  lives_free(mdata->msg);
+  ext_caller_return_int(mdata->id,resp);
+  lives_free(data);
+  return FALSE;
+}
+
+
+static boolean call_set_interactive(livespointer data) {
+  sintdata *sint = (sintdata *)data;
+  if (mainw!=NULL&&!mainw->go_away) {
+    mainw->interactive=sint->setting;
+    set_interactive(mainw->interactive);
+    ext_caller_return_int(sint->id,TRUE);
+  } else ext_caller_return_int(sint->id,FALSE);
+  lives_free(data);
+  return FALSE;
+}
+
+
+static boolean call_set_sepwin(livespointer data) {
+  sintdata *sint = (sintdata *)data;
+  if (mainw!=NULL&&!mainw->go_away) {
+    if (mainw->sep_win!=sint->setting)
+      on_sepwin_pressed(NULL,NULL);
+    ext_caller_return_int(sint->id,TRUE);
+  } else ext_caller_return_int(sint->id,FALSE);
+  lives_free(data);
+  return FALSE;
+}
+
+
+
+static boolean call_set_fullscreen(livespointer data) {
+  sintdata *sint = (sintdata *)data;
+  if (mainw!=NULL&&!mainw->go_away) {
+    mainw->interactive=sint->setting;
+    if (mainw->fs!=sint->setting)
+      on_full_screen_pressed(NULL,NULL);
+    ext_caller_return_int(sint->id,TRUE);
+  } else ext_caller_return_int(sint->id,FALSE);
+  lives_free(data);
+  return FALSE;
+}
+
+
+static boolean call_set_fullscreen_sepwin(livespointer data) {
+  sintdata *sint = (sintdata *)data;
+  if (mainw!=NULL&&!mainw->go_away) {
+    mainw->interactive=sint->setting;
+    if (mainw->sep_win!=sint->setting)
+      on_sepwin_pressed(NULL,NULL);
+    if (mainw->fs!=sint->setting)
+      on_full_screen_pressed(NULL,NULL);
+    ext_caller_return_int(sint->id,TRUE);
+  } else ext_caller_return_int(sint->id,FALSE);
+  lives_free(data);
+  return FALSE;
+}
+
+
+static boolean call_set_ping_pong(livespointer data) {
+  sintdata *sint = (sintdata *)data;
+  if (mainw!=NULL&&!mainw->go_away) {
+    if (mainw->ping_pong!=sint->setting)
+      lives_check_menu_item_set_active(LIVES_CHECK_MENU_ITEM(mainw->loop_ping_pong),!mainw->ping_pong);
+    ext_caller_return_int(sint->id,TRUE);
+  } else ext_caller_return_int(sint->id,FALSE);
+  lives_free(data);
+  return FALSE;
+}
+
+
+static boolean call_set_pref_bool(livespointer data) {
+  bpref *bdata=(bpref *)data;
+  if (mainw!=NULL&&!mainw->go_away) {
+    pref_factory_bool(bdata->prefidx, bdata->val);
+    ext_caller_return_int(bdata->id,TRUE);
+  } else ext_caller_return_int(bdata->id,FALSE);
+  lives_free(data);
+  return FALSE;
+}
+
+
+static boolean call_set_pref_int(livespointer data) {
+  ipref *idata=(ipref *)data;
+  if (mainw!=NULL&&!mainw->go_away) {
+    pref_factory_int(idata->prefidx, idata->val);
+    ext_caller_return_int(idata->id,TRUE);
+  } else ext_caller_return_int(idata->id,FALSE);
+  lives_free(data);
+  return FALSE;
+}
+
+
+
+static boolean call_set_pref_bitmapped(livespointer data) {
+  bmpref *bmdata=(bmpref *)data;
+  if (mainw!=NULL&&!mainw->go_away) {
+    pref_factory_bitmapped(bmdata->prefidx, bmdata->bitfield, bmdata->val);
+    ext_caller_return_int(bmdata->id,TRUE);
+  } else ext_caller_return_int(bmdata->id,FALSE);
+  lives_free(data);
+  return FALSE;
+}
+
+
+static boolean call_set_gravity(livespointer data) {
+  ipref *idata=(ipref *)data;
+  if (mainw!=NULL&&!mainw->go_away&&mainw->multitrack!=NULL) {
+    lives_mt_grav_mode_t grav=trans_constant(idata->val,const_domain_grav);
+    mainw->multitrack->opts.grav_mode=grav;
+    update_grav_mode(mainw->multitrack);
+  } else ext_caller_return_int(idata->id,FALSE);
+  lives_free(idata);
+  return FALSE;
+}
+
+
+static boolean call_set_insert_mode(livespointer data) {
+  ipref *idata=(ipref *)data;
+  if (mainw!=NULL&&!mainw->go_away&&mainw->multitrack!=NULL) {
+    lives_mt_insert_mode_t mode=trans_constant(idata->val,const_domain_insert_mode);
+    mainw->multitrack->opts.insert_mode=mode;
+    update_insert_mode(mainw->multitrack);
+  } else ext_caller_return_int(idata->id,FALSE);
+  lives_free(idata);
+  return FALSE;
+}
+
+
+static boolean call_mt_set_track(livespointer data) {
+  ipref *idata=(ipref *)data;
+  if (mainw!=NULL&&!mainw->go_away&&mainw->multitrack!=NULL && (mt_track_is_video(mainw->multitrack, idata->val)
+      || mt_track_is_audio(mainw->multitrack, idata->val))) {
+    mainw->multitrack->current_track=idata->val;
+    track_select(mainw->multitrack);
+    ext_caller_return_int(idata->id,TRUE);
+  } else ext_caller_return_int(idata->id,FALSE);
+  lives_free(data);
+  return FALSE;
+}
+
+
+static boolean call_insert_vtrack(livespointer data) {
+  bpref *bdata=(bpref *)data;
+  if (mainw!=NULL&&!mainw->go_away&&!mainw->is_processing&&mainw->playing_file==-1&&mainw->multitrack!=NULL) {
+    int tnum;
+    if (!bdata->val) tnum=add_video_track_behind(NULL, mainw->multitrack);
+    else tnum=add_video_track_front(NULL, mainw->multitrack);
+    ext_caller_return_int(bdata->id,tnum);
+  } else ext_caller_return_int(bdata->id,-1);
+  lives_free(data);
+  return FALSE;
+}
+
+
+static boolean call_mt_set_track_label(livespointer data) {
+  lset *ldata=(lset *)data;
+  if (mainw!=NULL&&!mainw->go_away&&mainw->multitrack!=NULL && (mt_track_is_video(mainw->multitrack, ldata->val)
+      || mt_track_is_audio(mainw->multitrack, ldata->val))) {
+    if (ldata->string==NULL) {
+      int current_track=mainw->multitrack->current_track;
+      mainw->multitrack->current_track=ldata->val;
+      on_rename_track_activate(NULL,(livespointer)mainw->multitrack);
+      mainw->multitrack->current_track=current_track;
+    } else {
+      set_track_label_string(mainw->multitrack,ldata->val,ldata->string);
+    }
+    ext_caller_return_int(ldata->id,TRUE);
+  } else ext_caller_return_int(ldata->id,FALSE);
+  if (ldata->string!=NULL) lives_free(ldata->string);
+  lives_free(data);
+  return FALSE;
+}
+
+
+static boolean call_set_if_mode(livespointer data) {
+  ipref *idata=(ipref *)data;
+  if (mainw!=NULL&&!mainw->go_away&&!mainw->is_processing) {
+    if (idata->val==LIVES_INTERFACE_MODE_CLIPEDIT&&mainw->multitrack!=NULL) {
+      multitrack_delete(mainw->multitrack,FALSE);
+    }
+    if (idata->val==LIVES_INTERFACE_MODE_MULTITRACK&&mainw->multitrack==NULL) {
+      on_multitrack_activate(NULL,NULL);
+      while (mainw->multitrack==NULL || !mainw->multitrack->is_ready) lives_usleep(prefs->sleep_time);
+    }
+    ext_caller_return_int(idata->id,TRUE);
+  } else ext_caller_return_int(idata->id,FALSE);
+  lives_free(data);
+  return FALSE;
+}
+
+
+static boolean call_switch_clip(livespointer data) {
+  ipref *idata=(ipref *)data;
+  if (mainw!=NULL&&!mainw->go_away&&!mainw->is_processing) {
+    switch_clip(idata->prefidx,idata->val);
+    ext_caller_return_int(idata->id,TRUE);
+  } else ext_caller_return_int(idata->id,FALSE);
+  lives_free(data);
+  return FALSE;
+}
+
+
+static boolean call_set_current_time(livespointer data) {
+  opfidata *idata=(opfidata *)data;
+  if (mainw!=NULL&&!mainw->go_away&&!mainw->is_processing&&!mainw->preview&&mainw->playing_file==-1) {
+    if (mainw->multitrack!=NULL) {
+      if (idata->stime >=0.) {
+        if (idata->stime>mainw->multitrack->end_secs) set_timeline_end_secs(mainw->multitrack,idata->stime);
+        mt_tl_move(mainw->multitrack,idata->stime);
+      }
+    } else {
+      if (mainw->current_file>0 && idata->stime>=0. && idata->stime<=cfile->total_time) {
+        cfile->pointer_time=idata->stime;
+        lives_ruler_set_value(LIVES_RULER(mainw->hruler),cfile->pointer_time);
+        lives_widget_queue_draw(mainw->hruler);
+        get_play_times();
+      }
+    }
+    ext_caller_return_int(idata->id,TRUE);
+  } else ext_caller_return_int(idata->id,FALSE);
+  lives_free(data);
+  return FALSE;
+}
+
+
+static boolean call_set_current_audio_time(livespointer data) {
+  opfidata *idata=(opfidata *)data;
+  if (mainw!=NULL&&!mainw->go_away&&!mainw->is_processing&&!mainw->preview&&mainw->playing_file>0&&
+      is_realtime_aplayer(prefs->audio_player)&&mainw->multitrack==NULL&&!(mainw->record&&prefs->audio_src==AUDIO_SRC_EXT)&&
+      idata->stime>=0.&&idata->stime<=cfile->laudio_time) {
+    resync_audio((int)(idata->stime*cfile->fps+.5)+1);
+    ext_caller_return_int(idata->id,TRUE);
+  } else ext_caller_return_int(idata->id,FALSE);
+  lives_free(data);
+  return FALSE;
+}
+
+
+static boolean call_unmap_effects(livespointer data) {
+  ulong id=(ulong)data;
+  if (mainw!=NULL&&!mainw->go_away&&!mainw->is_processing) {
+    on_clear_all_clicked(NULL,NULL);
+    ext_caller_return_int(id,TRUE);
+  } else ext_caller_return_int(id,FALSE);
+  return FALSE;
+}
+
+
+static boolean call_stop_playback(livespointer data) {
+  ulong id=(ulong)data;
+  if (mainw!=NULL&&!mainw->go_away&&!mainw->is_processing) {
+    on_stop_activate(NULL,NULL); // should send play stop event
+    ext_caller_return_int(id,TRUE);
+  } else ext_caller_return_int(id,FALSE);
+  return FALSE;
+}
+
+
+static boolean call_quit_app(livespointer data) {
+  if (mainw!=NULL) {
+    mainw->only_close=mainw->no_exit=FALSE;
+    mainw->leave_recovery=FALSE;
+
+    if (mainw->was_set) {
+      on_save_set_activate(NULL,mainw->set_name);
+    } else mainw->leave_files=FALSE;
+    lives_exit(0);
+  }
+  return FALSE;
+}
+
+
+static boolean call_map_effect(livespointer data) {
+  fxmapdata *fxdata=(fxmapdata *)data;
+  if (mainw!=NULL&&!mainw->go_away&&!mainw->is_processing) {
+    char *hashname=make_weed_hashname(fxdata->idx,TRUE,FALSE);
+    int error=rte_switch_keymode(fxdata->key,fxdata->mode,hashname);
+    ext_caller_return_int(fxdata->id,(error==0));
+    lives_free(hashname);
+  } else ext_caller_return_int(fxdata->id,FALSE);
+  lives_free(data);
+  return FALSE;
+}
+
+
+static boolean call_unmap_effect(livespointer data) {
+  fxmapdata *fxdata=(fxmapdata *)data;
+  if (mainw!=NULL&&!mainw->go_away&&!mainw->is_processing&&rte_keymode_valid(fxdata->key,fxdata->mode,TRUE)) {
+    int idx=fxdata->key*rte_getmodespk()+fxdata->mode;
+    on_clear_clicked(NULL,LIVES_INT_TO_POINTER(idx));
+    ext_caller_return_int(fxdata->id,TRUE);
+  } else ext_caller_return_int(fxdata->id,FALSE);
+  lives_free(data);
+  return FALSE;
+}
+
+
+static boolean call_fx_setmode(livespointer data) {
+  fxmapdata *fxdata=(fxmapdata *)data;
+  if (mainw!=NULL&&!mainw->go_away&&!mainw->is_processing) {
+    boolean ret=rte_key_setmode(fxdata->key,fxdata->mode);
+    ext_caller_return_int(fxdata->id,(int)ret);
+  } else ext_caller_return_int(fxdata->id,FALSE);
+  lives_free(data);
+  return FALSE;
+}
+
+
+static boolean call_wipe_layout(livespointer data) {
+  iblock *fxdata=(iblock *)data;
+  boolean force=fxdata->ign_sel;
+  char *lname=lives_strdup("");
+  if (mainw!=NULL&&!mainw->go_away&&!mainw->is_processing&&mainw->multitrack!=NULL) {
+    if (force) {
+      wipe_layout(mainw->multitrack);
+    } else {
+      memset(mainw->recent_file,0,1);
+      check_for_layout_del(mainw->multitrack, FALSE);
+      if (strlen(mainw->recent_file)) {
+        lives_free(lname);
+        lname=strdup(mainw->recent_file);
+      }
+    }
+  }
+  ext_caller_return_string(fxdata->id,lname);
+  lives_free(lname);
+  lives_free(data);
+  return FALSE;
+}
+
+
+
+
+static boolean call_choose_layout(livespointer data) {
+  iblock *fxdata=(iblock *)data;
+  char *lname=lives_strdup("");
+  if (mainw!=NULL&&!mainw->go_away&&!mainw->is_processing&&mainw->multitrack!=NULL&&strlen(mainw->set_name)>0) {
+    lives_free(lname);
+    lname=get_eload_filename(mainw->multitrack,FALSE);
+    if (lname==NULL) lname=lives_strdup("");
+  }
+  ext_caller_return_string(fxdata->id,lname);
+  lives_free(lname);
+  lives_free(data);
+  return FALSE;
+}
+
+
+
+
+static boolean call_render_layout(livespointer data) {
+  iblock *bdata=(iblock *)data;
+  ulong uid=0l;
+  boolean ret;
+
+  if (mainw!=NULL&&!mainw->go_away&&!mainw->is_processing&&mainw->multitrack!=NULL) {
+    ulong new_uid=mainw->files[mainw->multitrack->render_file]->unique_id;
+    boolean ra=mainw->multitrack->opts.render_audp;
+    boolean rn=mainw->multitrack->opts.normalise_audp;
+
+    mainw->multitrack->opts.render_audp=bdata->with_audio;
+    mainw->multitrack->opts.normalise_audp=bdata->ign_sel;
+
+    ret=on_render_activate(LIVES_MENU_ITEM(1),mainw->multitrack);
+    if (ret) uid=new_uid;
+
+    mainw->multitrack->opts.render_audp=ra;
+    mainw->multitrack->opts.normalise_audp=rn;
+
+  }
+  ext_caller_return_ulong(bdata->id,uid);
+  lives_free(data);
+  return FALSE;
+}
+
+
+
+
+static boolean call_reload_layout(livespointer data) {
+  msginfo *mdata = (msginfo *)data;
+  boolean resp=FALSE;
+  if (mainw!=NULL&&!mainw->go_away&&!mainw->is_processing&&mainw->multitrack!=NULL&&strlen(mainw->set_name)>0) {
+    if (!strlen(mdata->msg)) {
+      lives_free(mdata->msg);
+      mdata->msg=get_eload_filename(mainw->multitrack,FALSE);
+      if (mdata->msg==NULL) mdata->msg=lives_strdup("");
+    }
+    if (strlen(mainw->msg)) {
+      mainw->multitrack->force_load_name=mainw->msg;
+      resp=on_load_event_list_activate(NULL,mainw->multitrack);
+      mainw->multitrack->force_load_name=NULL;
+    }
+  }
+  lives_free(mdata->msg);
+  ext_caller_return_int(mdata->id,resp);
+  lives_free(mdata);
+  return resp;
+}
+
+
+
+static boolean call_save_layout(livespointer data) {
+  msginfo *mdata = (msginfo *)data;
+  boolean resp=FALSE;
+
+  char *lname=lives_strdup("");
+
+  if (mainw!=NULL&&!mainw->go_away&&!mainw->is_processing) {
+    if (mdata->msg!=NULL) {
+      if (mainw->multitrack!=NULL) lives_snprintf(mainw->multitrack->layout_name,PATH_MAX,"%s",mdata->msg);
+      else lives_snprintf(mainw->stored_layout_name,PATH_MAX,"%s",mdata->msg);
+    }
+    resp=on_save_event_list_activate(NULL,mainw->multitrack);
+    if (resp) {
+      lives_free(lname);
+      lname=lives_strdup(mainw->recent_file);
+    }
+  }
+
+  lives_free(mdata->msg);
+  ext_caller_return_string(mdata->id,lname);
+  lives_free(lname);
+  lives_free(mdata);
+  return resp;
+}
+
+
+
+
+static boolean call_set_current_fps(livespointer data) {
+  opfidata *idata=(opfidata *)data;
+  if (mainw!=NULL&&!mainw->go_away&&!mainw->is_processing&&mainw->playing_file>-1&&mainw->multitrack==NULL) {
+    lives_spin_button_set_value(LIVES_SPIN_BUTTON(mainw->spinbutton_pb_fps),idata->stime);
+    ext_caller_return_int(idata->id,(int)TRUE);
+  } else ext_caller_return_int(idata->id,(int)FALSE);
+  lives_free(data);
+  return FALSE;
+}
+
+
+static boolean call_set_current_frame(livespointer data) {
+  bpref *bdata=(bpref *)data;
+  boolean ret;
+
+  char **vargs;
+
+  int arglen=2;
+
+  if (mainw==NULL||(mainw->preview||(mainw->multitrack==NULL&&mainw->event_list!=NULL))||mainw->go_away||mainw->is_processing||
+      mainw->playing_file>-1) return FALSE;
+
+  vargs=(char **)lives_malloc(sizeof(char *));
+
+  *vargs = strdup(",i");
+  arglen = padup(vargs, arglen);
+  arglen = add_int_arg(vargs, arglen, bdata->prefidx);
+
+  if (!bdata->val)
+    ret=lives_osc_cb_clip_goto(NULL, arglen, (const void *)(*vargs), OSCTT_CurrentTime(), NULL);
+  else
+    ret=lives_osc_cb_bgclip_goto(NULL, arglen, (const void *)(*vargs), OSCTT_CurrentTime(), NULL);
+
+  ext_caller_return_int(bdata->id,(int)ret);
+  lives_free(data);
+  lives_free((char *)*vargs);
+  lives_free(vargs);
+  return FALSE;
+}
+
+
+static boolean call_select_all(livespointer data) {
+  ipref *idata=(ipref *)data;
+  int cnum = idata->val;
+
+  if (mainw!=NULL) {
+    lives_clip_t *sfile=mainw->files[cnum];
+    boolean selwidth_locked=mainw->selwidth_locked;
+
+    if (!mainw->go_away&&!mainw->is_processing&&sfile!=NULL) {
+      mainw->selwidth_locked=FALSE;
+      if (cnum==mainw->current_file) on_select_all_activate(NULL,NULL);
+      else {
+        sfile->start=sfile->frames>0?1:0;
+        sfile->end=sfile->frames;
+      }
+      mainw->selwidth_locked=selwidth_locked;
+      ext_caller_return_int(idata->id,(int)TRUE);
+    } else ext_caller_return_int(idata->id,(int)FALSE);
+  } else ext_caller_return_int(idata->id,(int)FALSE);
+  lives_free(data);
+  return FALSE;
+}
+
+
+
+static boolean call_select_start(livespointer data) {
+  ipref *idata=(ipref *)data;
+
+  int cnum = idata->val;
+  int frame=idata->prefidx;
+
+  if (mainw!=NULL) {
+    lives_clip_t *sfile=mainw->files[cnum];
+    boolean selwidth_locked=mainw->selwidth_locked;
+    if (!mainw->go_away&&!mainw->is_processing&&sfile!=NULL) {
+      mainw->selwidth_locked=FALSE;
+      if (cnum==mainw->current_file) lives_spin_button_set_value(LIVES_SPIN_BUTTON(mainw->spinbutton_start),frame);
+      else {
+        if (frame>sfile->frames) frame=sfile->frames;
+        if (sfile->end<frame) sfile->end=frame;
+        sfile->start=frame;
+      }
+      mainw->selwidth_locked=selwidth_locked;
+      ext_caller_return_int(idata->id,(int)TRUE);
+    } else ext_caller_return_int(idata->id,(int)FALSE);
+  } else ext_caller_return_int(idata->id,(int)FALSE);
+  lives_free(data);
+  return FALSE;
+}
+
+
+static boolean call_select_end(livespointer data) {
+  ipref *idata=(ipref *)data;
+
+  int cnum = idata->val;
+  int frame=idata->prefidx;
+  if (mainw!=NULL) {
+    lives_clip_t *sfile=mainw->files[cnum];
+    boolean selwidth_locked=mainw->selwidth_locked;
+
+    if (!mainw->go_away&&!mainw->is_processing&&sfile!=NULL) {
+      mainw->selwidth_locked=FALSE;
+      if (cnum==mainw->current_file) lives_spin_button_set_value(LIVES_SPIN_BUTTON(mainw->spinbutton_end),frame);
+      else {
+        if (frame>sfile->frames) frame=sfile->frames;
+        if (sfile->start>frame) sfile->start=frame;
+        sfile->end=frame;
+      }
+      mainw->selwidth_locked=selwidth_locked;
+      ext_caller_return_int(idata->id,(int)TRUE);
+    } else ext_caller_return_int(idata->id,(int)FALSE);
+  } else ext_caller_return_int(idata->id,(int)FALSE);
+  lives_free(data);
+  return FALSE;
+}
+
+
+
+static boolean call_insert_block(livespointer data) {
+  iblock *idata=(iblock *)data;
+  boolean ins_audio;
+  boolean ign_ins_sel;
+
+  ulong block_uid;
+
+  if (mainw!=NULL&&!mainw->go_away&&!mainw->is_processing&&mainw->playing_file==-1&&mainw->multitrack!=NULL) {
+    mainw->multitrack->clip_selected=idata->clip-1;
+    mt_clip_select(mainw->multitrack,TRUE);
+
+    ins_audio=mainw->multitrack->opts.insert_audio;
+    ign_ins_sel=mainw->multitrack->opts.ign_ins_sel;
+
+    mainw->multitrack->opts.insert_audio=idata->with_audio;
+    mainw->multitrack->opts.ign_ins_sel=idata->ign_sel;
+
+    multitrack_insert(NULL,mainw->multitrack);
+
+    mainw->multitrack->opts.ign_ins_sel=ign_ins_sel;
+    mainw->multitrack->opts.insert_audio=ins_audio;
+
+    block_uid=mt_get_last_block_uid(mainw->multitrack);
+    ext_caller_return_ulong(idata->id,block_uid);
+  } else ext_caller_return_ulong(idata->id,0l);
+  lives_free(data);
+  return FALSE;
+}
+
+
+
+
+static boolean call_remove_block(livespointer data) {
+  mblockdata *rdata=(mblockdata *)data;
+
+  if (mainw!=NULL&&!mainw->go_away&&!mainw->is_processing&&mainw->playing_file==-1&&mainw->multitrack!=NULL) {
+    track_rect *oblock=mainw->multitrack->block_selected;
+    mainw->multitrack->block_selected=rdata->block;
+    delete_block_cb(NULL,(livespointer)mainw->multitrack);
+    if (oblock!=rdata->block) mainw->multitrack->block_selected=oblock;
+    ext_caller_return_int(rdata->id,(int)TRUE);
+  } else ext_caller_return_int(rdata->id,(int)FALSE);
+  lives_free(data);
+  return FALSE;
+}
+
+
+
+static boolean call_move_block(livespointer data) {
+  mblockdata *mdata=(mblockdata *)data;
+
+  if (mainw!=NULL&&!mainw->go_away&&!mainw->is_processing&&mainw->playing_file==-1&&mainw->multitrack!=NULL) {
+    track_rect *bsel=mainw->multitrack->block_selected;
+    int track=get_track_for_block(mdata->block);
+    ulong block_uid=mdata->block->uid;
+    track_rect *nblock=move_block(mainw->multitrack,mdata->block,mdata->time,track,mdata->track);
+    mainw->multitrack->block_selected=bsel;
+    if (nblock==NULL) ext_caller_return_int(mdata->id,(int)FALSE);
+    else {
+      nblock->uid=block_uid;
+      ext_caller_return_int(mdata->id,(int)TRUE);
+    }
+  }
+  lives_free(data);
+  return FALSE;
+}
+
+
+
+static boolean call_fx_enable(livespointer data) {
+  fxmapdata *fxdata=(fxmapdata *)data;
+  boolean nstate=(boolean)fxdata->mode;
+  boolean ret=FALSE;
+
+  if (mainw!=NULL&&!mainw->go_away&&!mainw->is_processing) {
+    int grab=mainw->last_grabbable_effect;
+    int effect_key=fxdata->key;
+
+    if (nstate) {
+      // fx is on
+      if (!(mainw->rte&(GU641<<(effect_key-1)))) {
+        weed_plant_t *filter=rte_keymode_get_filter(effect_key,rte_key_getmode(effect_key));
+        if (filter==NULL) ret=FALSE;
+        else {
+          int count=enabled_in_channels(filter, FALSE);
+          if (mainw->playing_file==-1&&count==0) {
+            // return value first because...
+            ext_caller_return_int(fxdata->id,(int)TRUE);
+            // ...we are going to hang here until playback ends
+            ret=rte_on_off_callback_hook(NULL,LIVES_INT_TO_POINTER(effect_key));
+            return FALSE;
+          } else {
+            ret=rte_on_off_callback_hook(NULL,LIVES_INT_TO_POINTER(effect_key));
+            mainw->last_grabbable_effect=grab;
+          }
+        }
+      }
+    } else {
+      if (mainw->rte&(GU641<<(effect_key-1))) {
+        ret=rte_on_off_callback_hook(NULL,LIVES_INT_TO_POINTER(effect_key));
+      }
+    }
+  }
+  ext_caller_return_int(fxdata->id,(int)ret);
+  lives_free(data);
+  return FALSE;
+}
+
+
+static boolean call_set_loop_mode(livespointer data) {
+  ipref *idata=(ipref *)data;
+  int lmode=idata->val;
+
+  if (mainw!=NULL&&!mainw->go_away) {
+    if (lmode==LIVES_LOOP_MODE_NONE) {
+      if (mainw->loop_cont) on_loop_button_activate(NULL,NULL);
+      if (mainw->loop) lives_check_menu_item_set_active(LIVES_CHECK_MENU_ITEM(mainw->loop_video),!mainw->loop);
+    } else {
+      if (lmode & LIVES_LOOP_MODE_CONTINUOUS) {
+        if (!mainw->loop_cont) on_loop_button_activate(NULL,NULL);
+      } else if (mainw->loop_cont) on_loop_button_activate(NULL,NULL);
+
+      if (lmode & LIVES_LOOP_MODE_FIT_AUDIO) {
+        if (mainw->loop) lives_check_menu_item_set_active(LIVES_CHECK_MENU_ITEM(mainw->loop_video),!mainw->loop);
+      } else if (!mainw->loop) lives_check_menu_item_set_active(LIVES_CHECK_MENU_ITEM(mainw->loop_video),!mainw->loop);
+    }
+    ext_caller_return_int(idata->id,(int)TRUE);
+  } else ext_caller_return_int(idata->id,(int)FALSE);
+  lives_free(data);
+  return FALSE;
+}
+
+
+
+static boolean call_resync_fps(livespointer data) {
+  ipref *idata=(ipref *)data;
+  if (mainw!=NULL&& mainw->playing_file>-1) {
+    fps_reset_callback(NULL, NULL, 0, (LiVESXModifierType)0, NULL);
+    ext_caller_return_int(idata->id,(int)TRUE);
+  } else ext_caller_return_int(idata->id,(int)FALSE);
+  lives_free(data);
+  return FALSE;
+}
+
+
+
+static boolean call_cancel_proc(livespointer data) {
+  ipref *idata=(ipref *)data;
+  if (mainw==NULL||mainw->current_file==-1||cfile==NULL||cfile->proc_ptr==NULL||
+      !lives_widget_is_visible(cfile->proc_ptr->cancel_button)) {
+    ext_caller_return_int(idata->id,(int)FALSE);
+  } else {
+    on_cancel_keep_button_clicked(NULL,NULL);
+    ext_caller_return_int(idata->id,(int)TRUE);
+  }
+  lives_free(data);
+  return FALSE;
+}
+
+
+
+
+//////////////////////////////////////////////////////////////////
+
+/// idlefunc hooks
+
+
+boolean idle_show_info(const char *text, boolean blocking, ulong id) {
+  if (mainw==NULL||(mainw->preview||(mainw->multitrack==NULL&&mainw->event_list!=NULL))||mainw->go_away||mainw->is_processing||
+      mainw->playing_file>-1) return FALSE;
+  if (text==NULL) return FALSE;
+  if (!blocking) lives_idle_add(call_osc_show_info,(livespointer)text);
+  else {
+    msginfo *minfo = (msginfo *)lives_malloc(sizeof(msginfo));
+    minfo->msg = strdup(text);
+    minfo->id = id;
+    lives_idle_add(call_osc_show_blocking_info,(livespointer)minfo);
+  }
+  return TRUE;
+}
+
+
+boolean idle_switch_clip(int type, int cnum, ulong id) {
+  ipref *info;
+
+  if (mainw==NULL||(mainw->preview||(mainw->multitrack==NULL&&mainw->event_list!=NULL))||mainw->go_away||mainw->is_processing) return FALSE;
+  if (mainw->multitrack!=NULL) return FALSE;
+
+  info = (ipref *)lives_malloc(sizeof(ipref));
+  info->id = id;
+  info->val = cnum;
+  info->prefidx = type;
+  lives_idle_add(call_switch_clip,(livespointer)info);
+  return TRUE;
+}
+
+
+boolean idle_mt_set_track(int tnum, ulong id) {
+  ipref *info;
+
+  if (mainw==NULL||(mainw->preview||(mainw->multitrack==NULL&&mainw->event_list!=NULL))||mainw->go_away||mainw->is_processing) return FALSE;
+  if (mainw->multitrack==NULL) return FALSE;
+
+  info = (ipref *)lives_malloc(sizeof(ipref));
+  info->id = id;
+  info->val = tnum;
+  lives_idle_add(call_mt_set_track,(livespointer)info);
+  return TRUE;
+}
+
+
+boolean idle_set_track_label(int tnum, const char *label, ulong id) {
+  lset *data;
+
+  if (mainw==NULL||(mainw->preview||(mainw->multitrack==NULL&&mainw->event_list!=NULL))||mainw->go_away||mainw->is_processing) return FALSE;
+  if (mainw->multitrack==NULL) return FALSE;
+
+  data = (lset *)lives_malloc(sizeof(lset));
+  data->id = id;
+  data->val=tnum;
+  if (label!=NULL) data->string=lives_strdup(label);
+  else data->string=NULL;
+  lives_idle_add(call_mt_set_track_label,(livespointer)data);
+  return TRUE;
+}
+
+
+boolean idle_insert_vtrack(boolean in_front, ulong id) {
+  bpref *data;
+
+  if (mainw==NULL||mainw->playing_file == -1) return FALSE;
+  if (mainw->multitrack != NULL) return FALSE;
+
+  data=(bpref *)lives_malloc(sizeof(bpref));
+  data->val=in_front;
+  lives_idle_add(call_insert_vtrack,(livespointer)data);
+  return TRUE;
+}
+
+
+
+boolean idle_set_current_time(double time, ulong id) {
+  opfidata *info;
+
+  if (mainw==NULL||(mainw->preview||(mainw->multitrack==NULL&&mainw->event_list!=NULL))||mainw->go_away||mainw->is_processing||
+      mainw->playing_file>-1) return FALSE;
+
+  info = (opfidata *)lives_malloc(sizeof(opfidata));
+  info->id = id;
+  info->stime=time;
+  lives_idle_add(call_set_current_time,(livespointer)info);
+  return TRUE;
+}
+
+
+boolean idle_set_current_audio_time(double time, ulong id) {
+  opfidata *info;
+
+  if (mainw!=NULL&&!mainw->go_away&&!mainw->is_processing&&!mainw->preview&&mainw->playing_file>0&&
+      is_realtime_aplayer(prefs->audio_player)&&mainw->multitrack==NULL&&!(mainw->record&&prefs->audio_src==AUDIO_SRC_EXT)&&
+      time>=0.&&time<=cfile->laudio_time) {
+    info = (opfidata *)lives_malloc(sizeof(opfidata));
+    info->id = id;
+    info->stime=time;
+    lives_idle_add(call_set_current_audio_time,(livespointer)info);
+    return TRUE;
+  }
+  return FALSE;
+}
+
+
+boolean idle_unmap_effects(ulong id) {
+  if (mainw==NULL||(mainw->preview||(mainw->multitrack==NULL&&mainw->event_list!=NULL))||mainw->go_away||mainw->is_processing) return FALSE;
+
+  lives_idle_add(call_unmap_effects,(livespointer)id);
+
+  return TRUE;
+}
+
+
+boolean idle_stop_playback(ulong id) {
+  if (mainw==NULL||mainw->go_away||mainw->is_processing) return FALSE;
+
+  lives_idle_add(call_stop_playback,(livespointer)id);
+
+  return TRUE;
+}
+
+
+
+boolean idle_quit(pthread_t *gtk_thread) {
+  if (mainw==NULL) return FALSE;
+
+  lives_idle_add(call_quit_app,NULL);
+
+  pthread_join(*gtk_thread,NULL);
+
+  return TRUE;
+}
+
+
+boolean idle_save_set(const char *name, boolean force_append, ulong id) {
+  oscdata *data;
+  char **vargs;
+
+  int arglen=3;
+
+  if (mainw==NULL||(mainw->preview||(mainw->multitrack==NULL&&mainw->event_list!=NULL))||mainw->go_away||mainw->is_processing||
+      mainw->playing_file>-1) return FALSE;
+
+  vargs=(char **)lives_malloc(sizeof(char *));
+
+  *vargs = strdup(",si");
+  arglen = padup(vargs, arglen);
+  arglen = add_string_arg(vargs, arglen, name);
+  arglen = add_int_arg(vargs, arglen, force_append);
+
+  data= (oscdata *)lives_malloc(sizeof(oscdata));
+  data->id=id;
+  data->arglen=arglen;
+  data->vargs=vargs;
+  lives_idle_add(call_osc_save_set,(livespointer)data);
+
+  return TRUE;
+}
+
+
+boolean idle_choose_file_with_preview(const char *dirname, const char *title, int preview_type, ulong id) {
+  fprev *data;
+
+  if (mainw==NULL||(mainw->preview||(mainw->multitrack==NULL&&mainw->event_list!=NULL))||mainw->go_away||mainw->is_processing||
+      mainw->playing_file>-1) return FALSE;
+
+  data= (fprev *)lives_malloc(sizeof(fprev));
+  data->id=id;
+
+  if (dirname!=NULL && strlen(dirname) > 0) data->dir=strdup(dirname);
+  else data->dir=NULL;
+
+  if (title!=NULL && strlen(title) > 0) data->title=strdup(title);
+  else data->title=NULL;
+
+  data->preview_type=preview_type;
+  lives_idle_add(call_file_choose_with_preview,(livespointer)data);
+  return TRUE;
+}
+
+
+boolean idle_choose_set(ulong id) {
+  udata *data;
+
+  if (mainw==NULL||(mainw->preview||(mainw->multitrack==NULL&&mainw->event_list!=NULL))||mainw->go_away||mainw->is_processing||
+      mainw->playing_file>-1) return FALSE;
+  if (mainw->was_set) return FALSE;
+
+  data=(udata *)lives_malloc(sizeof(udata));
+  data->id=id;
+  lives_idle_add(call_choose_set,(livespointer)data);
+  return TRUE;
+}
+
+
+
+boolean idle_set_set_name(ulong id) {
+  if (mainw==NULL||(mainw->preview||(mainw->multitrack==NULL&&mainw->event_list!=NULL))||mainw->go_away||mainw->is_processing||
+      mainw->playing_file) return FALSE;
+  lives_idle_add(call_set_set_name,(livespointer)id);
+  return TRUE;
+}
+
+
+boolean idle_open_file(const char *fname, double stime, int frames, ulong id) {
+  opfidata *data;
+
+  if (mainw==NULL||(mainw->preview||(mainw->multitrack==NULL&&mainw->event_list!=NULL))||mainw->go_away||mainw->is_processing||
+      mainw->playing_file>-1) return FALSE;
+  if (fname==NULL || strlen(fname)==0) return FALSE;
+
+  data= (opfidata *)lives_malloc(sizeof(opfidata));
+  data->id=id;
+  data->fname=strdup(fname);
+  data->stime=stime;
+  data->frames=frames;
+
+  lives_idle_add(call_open_file,(livespointer)data);
+  return TRUE;
+}
+
+
+boolean idle_reload_set(const char *setname, ulong id) {
+  msginfo *data;
+
+  if (mainw==NULL||(mainw->preview||(mainw->multitrack==NULL&&mainw->event_list!=NULL))||mainw->go_away||mainw->is_processing||
+      mainw->playing_file>-1) return FALSE;
+  if (mainw->was_set) return FALSE;
+
+  if (setname==NULL) return FALSE;
+
+  if (strlen(setname)&&!is_legal_set_name(setname,TRUE)) return FALSE;
+
+  data=(msginfo *)lives_malloc(sizeof(msginfo));
+  data->id=id;
+  data->msg=strdup(setname);
+
+  lives_idle_add(call_reload_set,(livespointer)data);
+  return TRUE;
+}
+
+
+
+boolean idle_set_interactive(boolean setting, ulong id) {
+  sintdata *data;
+
+  if (mainw==NULL||mainw->go_away) return FALSE;
+
+  data=(sintdata *)lives_malloc(sizeof(sintdata));
+  data->id=id;
+  data->setting=setting;
+  lives_idle_add(call_set_interactive,(livespointer)data);
+  return TRUE;
+}
+
+
+boolean idle_set_sepwin(boolean setting, ulong id) {
+  sintdata *data;
+
+  if (mainw==NULL||mainw->go_away) return FALSE;
+
+  data=(sintdata *)lives_malloc(sizeof(sintdata));
+  data->id=id;
+  data->setting=setting;
+  lives_idle_add(call_set_sepwin,(livespointer)data);
+  return TRUE;
+}
+
+
+boolean idle_set_fullscreen(boolean setting, ulong id) {
+  sintdata *data;
+
+  if (mainw==NULL||mainw->go_away) return FALSE;
+
+  data=(sintdata *)lives_malloc(sizeof(sintdata));
+  data->id=id;
+  data->setting=setting;
+  lives_idle_add(call_set_fullscreen,(livespointer)data);
+  return TRUE;
+}
+
+
+boolean idle_set_fullscreen_sepwin(boolean setting, ulong id) {
+  sintdata *data;
+
+  if (mainw==NULL||mainw->go_away) return FALSE;
+
+  data=(sintdata *)lives_malloc(sizeof(sintdata));
+  data->id=id;
+  data->setting=setting;
+  lives_idle_add(call_set_fullscreen_sepwin,(livespointer)data);
+  return TRUE;
+}
+
+
+
+boolean idle_set_ping_pong(boolean setting, ulong id) {
+  sintdata *data;
+
+  if (mainw==NULL||mainw->go_away) return FALSE;
+
+  data=(sintdata *)lives_malloc(sizeof(sintdata));
+  data->id=id;
+  data->setting=setting;
+  lives_idle_add(call_set_ping_pong,(livespointer)data);
+  return TRUE;
+}
+
+
+
+boolean idle_set_gravity(int grav, ulong id) {
+  ipref *data;
+
+  if (mainw==NULL||mainw->go_away) return FALSE;
+
+  data=(ipref *)lives_malloc(sizeof(ipref));
+  data->id=id;
+  data->val=grav;
+  lives_idle_add(call_set_gravity,(livespointer)data);
+  return TRUE;
+}
+
+
+boolean idle_set_insert_mode(int mode, ulong id) {
+  ipref *data;
+
+  if (mainw==NULL||mainw->go_away) return FALSE;
+
+  data=(ipref *)lives_malloc(sizeof(ipref));
+  data->id=id;
+  data->val=mode;
+  lives_idle_add(call_set_insert_mode,(livespointer)data);
+  return TRUE;
+}
+
+
+
+boolean idle_map_fx(int key, int mode, int idx, ulong id) {
+  fxmapdata *data;
+
+  if (mainw==NULL||(mainw->preview||(mainw->multitrack==NULL&&mainw->event_list!=NULL))||mainw->go_away||mainw->is_processing) return FALSE;
+
+  data=(fxmapdata *)lives_malloc(sizeof(fxmapdata));
+  data->key=key;
+  data->mode=mode;
+  data->idx=idx;
+  data->id=id;
+  lives_idle_add(call_map_effect,(livespointer)data);
+  return TRUE;
+}
+
+
+
+boolean idle_unmap_fx(int key, int mode, ulong id) {
+  fxmapdata *data;
+
+  if (mainw==NULL||(mainw->preview||(mainw->multitrack==NULL&&mainw->event_list!=NULL))||mainw->go_away||mainw->is_processing) return FALSE;
+
+  if (!rte_keymode_valid(key,mode,TRUE)) return FALSE;
+
+  data=(fxmapdata *)lives_malloc(sizeof(fxmapdata));
+  data->key=key;
+  data->mode=mode;
+  data->id=id;
+  lives_idle_add(call_unmap_effect,(livespointer)data);
+  return TRUE;
+}
+
+
+
+boolean idle_fx_setmode(int key, int mode, ulong id) {
+  fxmapdata *data;
+
+  if (mainw==NULL||(mainw->preview||(mainw->multitrack==NULL&&mainw->event_list!=NULL))||mainw->go_away||mainw->is_processing) return FALSE;
+
+  data=(fxmapdata *)lives_malloc(sizeof(fxmapdata));
+  data->key=key;
+  data->mode=mode;
+  data->id=id;
+
+  lives_idle_add(call_fx_setmode,(livespointer)data);
+  return TRUE;
+}
+
+
+
+boolean idle_fx_enable(int key, boolean setting, ulong id) {
+  fxmapdata *data;
+
+  if (mainw==NULL||(mainw->preview||(mainw->multitrack==NULL&&mainw->event_list!=NULL))||mainw->go_away||mainw->is_processing) return FALSE;
+
+  data=(fxmapdata *)lives_malloc(sizeof(fxmapdata));
+  data->key=key;
+  data->mode=setting;
+  data->id=id;
+
+  lives_idle_add(call_fx_enable,(livespointer)data);
+  return TRUE;
+}
+
+
+
+boolean idle_set_pref_bool(int prefidx, boolean val, ulong id) {
+  bpref *data;
+
+  if (mainw==NULL||(mainw->preview||(mainw->multitrack==NULL&&mainw->event_list!=NULL))||mainw->go_away) return FALSE;
+
+  data=(bpref *)lives_malloc(sizeof(bpref));
+  data->id=id;
+  data->prefidx=prefidx;
+  data->val=val;
+  lives_idle_add(call_set_pref_bool,(livespointer)data);
+  return TRUE;
+}
+
+
+boolean idle_set_pref_int(int prefidx, int val, ulong id) {
+  ipref *data;
+
+  if (mainw==NULL||(mainw->preview||(mainw->multitrack==NULL&&mainw->event_list!=NULL))||mainw->go_away) return FALSE;
+
+  data=(ipref *)lives_malloc(sizeof(ipref));
+  data->id=id;
+  data->prefidx=prefidx;
+  data->val=val;
+  lives_idle_add(call_set_pref_int,(livespointer)data);
+  return TRUE;
+}
+
+
+boolean idle_set_pref_bitmapped(int prefidx, int bitfield, boolean val, ulong id) {
+  bmpref *data;
+
+  if (mainw==NULL||(mainw->preview||(mainw->multitrack==NULL&&mainw->event_list!=NULL))||mainw->go_away) return FALSE;
+
+  data=(bmpref *)lives_malloc(sizeof(bmpref));
+  data->id=id;
+  data->prefidx=prefidx;
+  data->bitfield=bitfield;
+  data->val=val;
+  lives_idle_add(call_set_pref_bitmapped,(livespointer)data);
+  return TRUE;
+}
+
+
+
+boolean idle_set_if_mode(lives_interface_mode_t mode, ulong id) {
+  ipref *data;
+
+  if (mainw==NULL||(mainw->preview||(mainw->multitrack==NULL&&mainw->event_list!=NULL))||mainw->go_away||mainw->is_processing||
+      mainw->playing_file>-1) return FALSE;
+
+  data=(ipref *)lives_malloc(sizeof(ipref));
+  data->id=id;
+  data->val=(int)mode;
+  lives_idle_add(call_set_if_mode,(livespointer)data);
+  return TRUE;
+}
+
+
+
+boolean idle_insert_block(int clipno, boolean ign_sel, boolean with_audio, ulong id) {
+  iblock *data;
+
+  if (mainw==NULL||(mainw->preview||(mainw->multitrack==NULL&&mainw->event_list!=NULL))||mainw->go_away||mainw->is_processing||
+      mainw->playing_file>-1) return FALSE;
+  if (mainw->multitrack==NULL) return FALSE;
+
+  data=(iblock *)lives_malloc(sizeof(iblock));
+  data->id=id;
+  data->clip=clipno;
+  data->ign_sel=ign_sel;
+  data->with_audio=with_audio;
+  lives_idle_add(call_insert_block,(livespointer)data);
+  return TRUE;
+}
+
+
+boolean idle_remove_block(ulong uid, ulong id) {
+  mblockdata *data;
+  track_rect *tr;
+
+  if (mainw==NULL||(mainw->preview||(mainw->multitrack==NULL&&mainw->event_list!=NULL))||mainw->go_away||mainw->is_processing||
+      mainw->playing_file>-1) return FALSE;
+  if (mainw->multitrack==NULL) return FALSE;
+
+  tr=find_block_by_uid(mainw->multitrack, uid);
+  if (tr==NULL) return FALSE;
+
+  data=(mblockdata *)lives_malloc(sizeof(mblockdata));
+  data->id=id;
+  data->block=tr;
+  lives_idle_add(call_remove_block,(livespointer)data);
+  return TRUE;
+}
+
+
+boolean idle_move_block(ulong uid, int track, double time, ulong id) {
+  mblockdata *data;
+  track_rect *tr;
+
+  if (mainw==NULL||(mainw->preview||(mainw->multitrack==NULL&&mainw->event_list!=NULL))||mainw->go_away||mainw->is_processing||
+      mainw->playing_file>-1) return FALSE;
+  if (mainw->multitrack==NULL) return FALSE;
+
+  tr=find_block_by_uid(mainw->multitrack, uid);
+  if (tr==NULL) return FALSE;
+
+  if (track>=lives_list_length(mainw->multitrack->video_draws)||track<-mainw->multitrack->opts.back_audio_tracks) return FALSE;
+
+  if (time<0.) return FALSE;
+
+  data=(mblockdata *)lives_malloc(sizeof(mblockdata));
+  data->id=id;
+  data->block=tr;
+  data->track=track;
+  data->time=time;
+  lives_idle_add(call_move_block,(livespointer)data);
+  return TRUE;
+}
+
+
+boolean idle_wipe_layout(boolean force, ulong id) {
+  iblock *data;
+
+  if (mainw==NULL||(mainw->preview||(mainw->multitrack==NULL&&mainw->event_list!=NULL))||mainw->go_away||mainw->is_processing||
+      mainw->playing_file>-1) return FALSE;
+  if (mainw->multitrack==NULL) return FALSE;
+
+  data=(iblock *)lives_malloc(sizeof(iblock));
+  data->ign_sel=force;
+  data->id=id;
+  lives_idle_add(call_wipe_layout,(livespointer)data);
+  return TRUE;
+}
+
+
+
+boolean idle_choose_layout(ulong id) {
+  iblock *data;
+
+  if (mainw==NULL||(mainw->preview||(mainw->multitrack==NULL&&mainw->event_list!=NULL))||mainw->go_away||mainw->is_processing||
+      mainw->playing_file>-1) return FALSE;
+  if (mainw->multitrack==NULL) return FALSE;
+
+  data=(iblock *)lives_malloc(sizeof(iblock));
+  data->id=id;
+  lives_idle_add(call_choose_layout,(livespointer)data);
+  return TRUE;
+}
+
+
+
+boolean idle_reload_layout(const char *lname, ulong id) {
+  msginfo *data;
+
+  if (mainw==NULL||(mainw->preview||(mainw->multitrack==NULL&&mainw->event_list!=NULL))||mainw->go_away||mainw->is_processing||
+      mainw->playing_file>-1) return FALSE;
+  if (mainw->multitrack==NULL) return FALSE;
+
+  data=(msginfo *)lives_malloc(sizeof(msginfo));
+  data->id=id;
+  data->msg=lives_strdup(lname);
+  lives_idle_add(call_reload_layout,(livespointer)data);
+  return TRUE;
+}
+
+
+
+
+boolean idle_save_layout(const char *lname, ulong id) {
+  msginfo *data;
+
+  if (mainw==NULL||(mainw->preview||(mainw->multitrack==NULL&&mainw->event_list!=NULL))||mainw->go_away||mainw->is_processing||
+      mainw->playing_file>-1) return FALSE;
+  if (mainw->multitrack==NULL) return FALSE;
+
+  data=(msginfo *)lives_malloc(sizeof(msginfo));
+  data->id=id;
+  if (lname!=NULL) data->msg=lives_strdup(lname);
+  else data->msg=NULL;
+  lives_idle_add(call_save_layout,(livespointer)data);
+  return TRUE;
+}
+
+
+
+boolean idle_render_layout(boolean with_aud, boolean normalise_aud, ulong id) {
+  iblock *data;
+
+  if (mainw==NULL||(mainw->preview||(mainw->multitrack==NULL&&mainw->event_list!=NULL))||mainw->go_away||mainw->is_processing||
+      mainw->playing_file>-1) return FALSE;
+  if (mainw->multitrack==NULL) return FALSE;
+
+  data=(iblock *)lives_malloc(sizeof(iblock));
+  data->with_audio=with_aud;
+  data->ign_sel=normalise_aud;
+  data->id=id;
+  lives_idle_add(call_render_layout,(livespointer)data);
+  return TRUE;
+}
+
+
+
+boolean idle_select_all(int cnum, ulong id) {
+  ipref *data;
+
+  if (mainw==NULL||((mainw->preview||(mainw->multitrack==NULL&&mainw->event_list!=NULL))&&mainw->multitrack==NULL)||mainw->go_away||
+      mainw->is_processing) return FALSE;
+
+  data=(ipref *)lives_malloc(sizeof(ipref));
+  data->id=id;
+  data->val=cnum;
+  lives_idle_add(call_select_all,(livespointer)data);
+  return TRUE;
+}
+
+
+boolean idle_select_start(int cnum, int frame, ulong id) {
+  ipref *data;
+
+  if (mainw==NULL||((mainw->preview||(mainw->multitrack==NULL&&mainw->event_list!=NULL))&&mainw->multitrack==NULL)||mainw->go_away||
+      mainw->is_processing) return FALSE;
+
+  data=(ipref *)lives_malloc(sizeof(ipref));
+  data->id=id;
+  data->val=cnum;
+  data->prefidx=frame;
+  lives_idle_add(call_select_start,(livespointer)data);
+  return TRUE;
+}
+
+
+
+boolean idle_select_end(int cnum, int frame, ulong id) {
+  ipref *data;
+
+  if (mainw==NULL||((mainw->preview||(mainw->multitrack==NULL&&mainw->event_list!=NULL))&&mainw->multitrack==NULL)||mainw->go_away||
+      mainw->is_processing) return FALSE;
+
+  data=(ipref *)lives_malloc(sizeof(ipref));
+  data->id=id;
+  data->val=cnum;
+  data->prefidx=frame;
+  lives_idle_add(call_select_end,(livespointer)data);
+  return TRUE;
+}
+
+
+
+boolean idle_set_current_fps(double fps, ulong id) {
+  opfidata *data;
+
+  if (mainw==NULL||mainw->playing_file == -1) return FALSE;
+
+  if (mainw->multitrack != NULL) return FALSE;
+
+  data=(opfidata *)lives_malloc(sizeof(opfidata));
+  data->id=id;
+  data->stime=fps;
+  lives_idle_add(call_set_current_fps,(livespointer)data);
+  return TRUE;
+}
+
+
+boolean idle_set_current_frame(int frame, boolean bg, ulong id) {
+  bpref *data;
+
+  if (mainw==NULL||mainw->playing_file == -1) return FALSE;
+  if (mainw->multitrack != NULL) return FALSE;
+
+  data=(bpref *)lives_malloc(sizeof(bpref));
+  data->prefidx=frame;
+  data->val=bg;
+  lives_idle_add(call_set_current_frame,(livespointer)data);
+  return TRUE;
+}
+
+
+
+boolean idle_set_loop_mode(int mode, ulong id) {
+  ipref *data;
+
+  if (mainw==NULL||mainw->go_away) return FALSE;
+
+  data=(ipref *)lives_malloc(sizeof(ipref));
+  data->id=id;
+  data->val=mode;
+  lives_idle_add(call_set_loop_mode,(livespointer)data);
+  return TRUE;
+}
+
+
+
+boolean idle_resync_fps(ulong id) {
+  ipref *data;
+
+  if (mainw==NULL||mainw->playing_file==-1) return FALSE;
+
+  data=(ipref *)lives_malloc(sizeof(ipref));
+  data->id=id;
+  lives_idle_add(call_resync_fps,(livespointer)data);
+  return TRUE;
+}
+
+
+
+boolean idle_cancel_proc(ulong id) {
+  ipref *data;
+
+  if (mainw==NULL||mainw->current_file==-1||cfile==NULL||cfile->proc_ptr==NULL||
+      !lives_widget_is_visible(cfile->proc_ptr->cancel_button)) return FALSE;
+
+  data=(ipref *)lives_malloc(sizeof(ipref));
+  data->id=id;
+  lives_idle_add(call_cancel_proc,(livespointer)data);
+  return TRUE;
+}

LiVES-2.4.1.tar.bz2/src/lbindings.h Added

@@ -0,0 +1,84 @@
+// bindings.h
+// LiVES (lives-exe)
+// (c) G. Finch <salsaman@gmail.com> 2015
+// Released under the GPL 3 or later
+// see file ../COPYING for licensing details
+
+#ifndef HAS_LIVES_LBINDINGS_H
+#define HAS_LIVES_LBINDINGS_H
+
+#ifndef __cplusplus
+
+#ifdef IS_LIBLIVES
+void binding_cb(int msgnumber, const char *msgstring, ulong myid);
+
+#endif
+
+#endif
+
+#define pad4(val) ((int)((val+4)/4)*4)
+
+int padup(char **str, int arglen);
+int add_int_arg(char **str, int arglen, int val);
+
+
+boolean start_player(void);
+boolean idle_stop_playback(ulong id);
+
+boolean idle_quit(pthread_t *gtk_thread);
+
+boolean idle_show_info(const char *text, boolean blocking, ulong id);
+boolean idle_save_set(const char *name, boolean force_append, ulong id);
+boolean idle_choose_file_with_preview(const char *dirname, const char *title, int preview_type, ulong id);
+boolean idle_open_file(const char *fname, double stime, int frames, ulong id);
+boolean idle_set_interactive(boolean setting, ulong id);
+boolean idle_choose_set(ulong id);
+boolean idle_reload_set(const char *setname, ulong id);
+boolean idle_set_set_name(ulong id);
+boolean idle_set_pref_bool(int prefidx, boolean val, ulong id);
+boolean idle_set_pref_int(int prefidx, int val, ulong id);
+boolean idle_set_pref_bitmapped(int prefidx, int bitfield, boolean val, ulong id);
+boolean idle_switch_clip(int type, int cnum, ulong id);
+boolean idle_unmap_effects(ulong id);
+boolean idle_map_fx(int key, int mode, int idx, ulong id);
+boolean idle_unmap_fx(int key, int mode, ulong id);
+boolean idle_fx_setmode(int key, int mode, ulong id);
+boolean idle_fx_enable(int key, boolean setting, ulong id);
+boolean idle_set_fullscreen_sepwin(boolean setting, ulong id);
+boolean idle_set_fullscreen(boolean setting, ulong id);
+boolean idle_set_sepwin(boolean setting, ulong id);
+boolean idle_set_if_mode(int mode, ulong id);
+boolean idle_insert_block(int clipno, boolean ign_sel, boolean with_audio, ulong id);
+boolean idle_remove_block(ulong block_id, ulong id);
+boolean idle_move_block(ulong block_uid, int track, double time, ulong id);
+boolean idle_mt_set_track(int tnum, ulong id);
+boolean idle_set_current_time(double time, ulong id);
+boolean idle_set_current_audio_time(double time, ulong id);
+boolean idle_set_current_frame(int frame, boolean bg, ulong id);
+boolean idle_wipe_layout(boolean force, ulong id);
+boolean idle_choose_layout(ulong id);
+boolean idle_save_layout(const char *lname, ulong id);
+boolean idle_reload_layout(const char *lname, ulong id);
+boolean idle_render_layout(boolean with_aud, boolean normalise_aud, ulong id);
+boolean idle_select_all(int cnum, ulong id);
+boolean idle_select_start(int cnum, int frame, ulong id);
+boolean idle_select_end(int cnum, int frame, ulong id);
+boolean idle_set_current_fps(double fps, ulong id);
+boolean idle_set_loop_mode(int mode, ulong id);
+boolean idle_set_ping_pong(boolean setting, ulong id);
+boolean idle_resync_fps(ulong id);
+boolean idle_cancel_proc(ulong id);
+boolean idle_set_track_label(int tnum, const char *label, ulong id);
+boolean idle_insert_vtrack(boolean in_front, ulong id);
+boolean idle_set_gravity(int grav, ulong id);
+boolean idle_set_insert_mode(int mode, ulong id);
+
+ulong *get_unique_ids(void);
+int cnum_for_uid(ulong uid);
+
+int get_first_fx_matched(const char *package, const char *fxname, const char *author, int version);
+int get_num_mapped_modes_for_key(int i);
+int get_current_mode_for_key(int key);
+boolean get_rte_key_is_enabled(int key);
+
+#endif //HAS_LIVES_LBINDINGS_H

LiVES-2.2.8.tar.bz2/src/ldvcallbacks.c -> LiVES-2.4.1.tar.bz2/src/ldvcallbacks.c Changed

@@ -11,26 +11,26 @@
 
 
 
-void on_camgrab_clicked (LiVESButton *button, gpointer user_data) {
-  gchar *msg;
+void on_camgrab_clicked(LiVESButton *button, livespointer user_data) {
+  char *msg;
   s_cam *cam=(s_cam *)user_data;
-  if (dvgrabw->filename!=NULL) g_free(dvgrabw->filename);
+  if (dvgrabw->filename!=NULL) lives_free(dvgrabw->filename);
   dvgrabw->filename=find_free_camfile(cam->format);
   if (dvgrabw->filename==NULL) return;
   lives_widget_set_sensitive(dvgrabw->grab,FALSE);
   lives_set_cursor_style(LIVES_CURSOR_BUSY,dvgrabw->dialog);
   if (!dvgrabw->playing) on_camplay_clicked(NULL,user_data);
-  msg=g_strdup_printf(_("Recording to %s/%s"),dvgrabw->dirname,dvgrabw->filename);
+  msg=lives_strdup_printf(_("Recording to %s/%s"),dvgrabw->dirname,dvgrabw->filename);
   lives_entry_set_text(LIVES_ENTRY(dvgrabw->status_entry),msg);
   if (cam->format==CAM_FORMAT_DV) {
-    dvgrabw->filename=g_strdup(lives_entry_get_text(LIVES_ENTRY(dvgrabw->filent)));
+    dvgrabw->filename=lives_strdup(lives_entry_get_text(LIVES_ENTRY(dvgrabw->filent)));
   }
   rec(cam);
   cam->grabbed_clips=TRUE;
 }
 
 
-void on_camstop_clicked (LiVESButton *button, gpointer user_data) {
+void on_camstop_clicked(LiVESButton *button, livespointer user_data) {
   s_cam *cam=(s_cam *)user_data;
   lives_widget_set_sensitive(dvgrabw->stop,FALSE);
   dvgrabw->playing=FALSE;
@@ -48,55 +48,54 @@
 }
 
 
-void on_camplay_clicked (LiVESButton *button, gpointer user_data) {
+void on_camplay_clicked(LiVESButton *button, livespointer user_data) {
   s_cam *cam=(s_cam *)user_data;
   camplay(cam);
   dvgrabw->playing=!dvgrabw->playing;
   if (dvgrabw->playing) {
     lives_button_set_label(LIVES_BUTTON(dvgrabw->play),"gtk-media-pause");
-  }
-  else {
+  } else {
     lives_button_set_label(LIVES_BUTTON(dvgrabw->play),"gtk-media-play");
   }
   lives_widget_set_sensitive(dvgrabw->stop,TRUE);
 }
 
-void on_camrew_clicked (LiVESButton *button, gpointer user_data) {
+void on_camrew_clicked(LiVESButton *button, livespointer user_data) {
   s_cam *cam=(s_cam *)user_data;
   camrew(cam);
   lives_widget_set_sensitive(dvgrabw->stop,TRUE);
 }
 
 
-void on_camff_clicked (LiVESButton *button, gpointer user_data) {
+void on_camff_clicked(LiVESButton *button, livespointer user_data) {
   s_cam *cam=(s_cam *)user_data;
   camff(cam);
   lives_widget_set_sensitive(dvgrabw->stop,TRUE);
 }
 
-void on_cameject_clicked (LiVESButton *button, gpointer user_data) {
+void on_cameject_clicked(LiVESButton *button, livespointer user_data) {
   s_cam *cam=(s_cam *)user_data;
   cameject(cam);
 }
 
 
-boolean on_camdelete_event (LiVESWidget *widget, GdkEvent *event, gpointer user_data) {
+boolean on_camdelete_event(LiVESWidget *widget, GdkEvent *event, livespointer user_data) {
   on_camquit_clicked(NULL,user_data);
   return FALSE;
 }
 
 
-void on_camquit_clicked (LiVESButton *button, gpointer user_data) {
+void on_camquit_clicked(LiVESButton *button, livespointer user_data) {
   s_cam *cam=(s_cam *)user_data;
   on_camstop_clicked(button,user_data);
   //if (cam->format==CAM_FORMAT_HDV) close_raw1394(cam->rec_handle);
   lives_widget_destroy(dvgrabw->dialog);
   if (dvgrabw->cursor!=NULL) lives_cursor_unref(dvgrabw->cursor);
-  if (dvgrabw->filename!=NULL) g_free(dvgrabw->filename);
-  if (dvgrabw->dirname!=NULL) g_free(dvgrabw->dirname);
+  if (dvgrabw->filename!=NULL) lives_free(dvgrabw->filename);
+  if (dvgrabw->dirname!=NULL) lives_free(dvgrabw->dirname);
   if (cam->grabbed_clips) do_error_dialog_with_check
-			    (_("\nClips grabbed from the device can now be loaded with File|Open File/Directory.\n"),
-			     WARN_MASK_AFTER_DVGRAB);
+    (_("\nClips grabbed from the device can now be loaded with File|Open File/Directory.\n"),
+     WARN_MASK_AFTER_DVGRAB);
 
   if (mainw->multitrack!=NULL) {
     mt_sensitise(mainw->multitrack);

LiVES-2.2.8.tar.bz2/src/ldvcallbacks.h -> LiVES-2.4.1.tar.bz2/src/ldvcallbacks.h Changed

@@ -5,13 +5,13 @@
 // see file ../COPYING for licensing details
 
 
-void on_camgrab_clicked (LiVESButton *, gpointer s_cam);
-void on_camplay_clicked (LiVESButton *, gpointer s_cam);
-void on_camstop_clicked (LiVESButton *, gpointer s_cam);
-void on_camrew_clicked (LiVESButton *, gpointer s_cam);
-void on_camff_clicked (LiVESButton *, gpointer s_cam);
-void on_cameject_clicked (LiVESButton *, gpointer s_cam);
-void on_campause_clicked (LiVESButton *, gpointer s_cam);
-void on_camquit_clicked (LiVESButton *, gpointer s_cam);
+void on_camgrab_clicked(LiVESButton *, livespointer s_cam);
+void on_camplay_clicked(LiVESButton *, livespointer s_cam);
+void on_camstop_clicked(LiVESButton *, livespointer s_cam);
+void on_camrew_clicked(LiVESButton *, livespointer s_cam);
+void on_camff_clicked(LiVESButton *, livespointer s_cam);
+void on_cameject_clicked(LiVESButton *, livespointer s_cam);
+void on_campause_clicked(LiVESButton *, livespointer s_cam);
+void on_camquit_clicked(LiVESButton *, livespointer s_cam);
 
-boolean on_camdelete_event (LiVESWidget *, LiVESXEvent *, gpointer s_cam);
+boolean on_camdelete_event(LiVESWidget *, LiVESXEvent *, livespointer s_cam);

LiVES-2.2.8.tar.bz2/src/ldvgrab.c -> LiVES-2.4.1.tar.bz2/src/ldvgrab.c Changed

@@ -39,7 +39,7 @@
   return 0;
 }
 
-/* libraw1394 executes this when there is a bus reset. We'll just keep it 
+/* libraw1394 executes this when there is a bus reset. We'll just keep it
    simple and quit */
 int reset_handler(raw1394handle_t handle, unsigned int generation) {
   raw1394_update_generation(handle, generation);
@@ -53,7 +53,7 @@
   struct raw1394_portinfo pinf[16];
   raw1394handle_t handle;
   struct pollfd raw1394_poll;
-  
+
   if (!(handle = raw1394_new_handle())) {
     d_print(_("raw1394 - couldn't get handle"));
     do_error_dialog(_("\nThe ieee1394 driver is not loaded or /dev/raw1394 does not exist.\n"));
@@ -70,20 +70,20 @@
     do_error_dialog(_("\nraw1394 - couldn't set port.\n"));
     return NULL;
   }
-    
+
   /* tell libraw1394 the names of our callback functions */
   //raw1394_set_iso_handler(handle, g_rx_channel, raw_iso_handler);
   raw1394_set_bus_reset_handler(handle, reset_handler);
-  
+
   /* poll for leftover events */
   raw1394_poll.fd = raw1394_get_fd(handle);
   raw1394_poll.events = POLLIN;
 
-  while(1) {
-    if ( poll( &raw1394_poll, 1, 10) < 1 ) break;
+  while (1) {
+    if (poll(&raw1394_poll, 1, 10) < 1) break;
     raw1394_loop_iterate(handle);
   }
-  
+
   /* Starting iso receive */
   /*  if (raw1394_start_iso_rcv(handle, g_rx_channel) < 0) {
     do_error_dialog(_("\nraw1394 - couldn't start iso receive.\n"));
@@ -101,18 +101,18 @@
 
 void camdest(s_cam *cam) {
   raw1394_destroy_handle(cam->handle);
-  g_free(cam);
+  lives_free(cam);
 }
 
-s_cam *camready (void) {
-  gchar *msg;
+s_cam *camready(void) {
+  char *msg;
   rom1394_directory rom_dir;
   int i,j;
 
   int n_ports;
   struct raw1394_portinfo pinf[ 16 ];
 
-  s_cam *cam=(s_cam *)g_malloc(sizeof(s_cam));
+  s_cam *cam=(s_cam *)lives_malloc(sizeof(s_cam));
 
   cam->device=-1;
 
@@ -130,44 +130,41 @@
       do_error_dialog(_("\nIs ieee1394, driver, and raw1394 loaded?\n"));
     }
     return NULL;
-  } 
+  }
 
-  if ( ( n_ports = raw1394_get_port_info( cam->handle, pinf, 16 ) ) < 0 ) {
-      msg=g_strdup_printf(_("raw1394 - failed to get port info: %s.\n"), g_strerror( errno ));
-      raw1394_destroy_handle( cam->handle ); 
-      return NULL;;
+  if ((n_ports = raw1394_get_port_info(cam->handle, pinf, 16)) < 0) {
+    msg=lives_strdup_printf(_("raw1394 - failed to get port info: %s.\n"), lives_strerror(errno));
+    raw1394_destroy_handle(cam->handle);
+    return NULL;;
   }
 
 
 
-  for ( j = 0; j < n_ports && cam->device == -1; j++ ) {
+  for (j = 0; j < n_ports && cam->device == -1; j++) {
 
     if (raw1394_set_port(cam->handle, j) < 0) {
-      msg=g_strdup_printf(_("\nraw1394 - couldn't set port %d !\n"),j);
-      d_print(msg);
-      g_free(msg);
+      d_print(_("\nraw1394 - couldn't set port %d !\n"),j);
       continue;
     }
-    
+
     for (i=0; i < raw1394_get_nodecount(cam->handle); ++i) {
 
       if (rom1394_get_directory(cam->handle, i, &rom_dir) < 0) {
-	msg=g_strdup_printf(_("error reading config rom directory for node %d\n"), i);
-	d_print(msg);
-	g_free(msg);
-	continue;
+        d_print(_("error reading config rom directory for node %d\n"), i);
+        continue;
       }
 
-      if ( (rom1394_get_node_type(&rom_dir) == ROM1394_NODE_TYPE_AVC) &&
-	   avc1394_check_subunit_type(cam->handle, i, AVC1394_SUBUNIT_TYPE_VCR)) {
-	cam->device = i;
-	break;
+      if ((rom1394_get_node_type(&rom_dir) == ROM1394_NODE_TYPE_AVC) &&
+          avc1394_check_subunit_type(cam->handle, i, AVC1394_SUBUNIT_TYPE_VCR)) {
+        cam->device = i;
+        break;
       }
     }
   }
 
   if (cam->device == -1) {
-    do_error_dialog(_("\nLiVES could not find any firewire camera.\nPlease make sure your camera is switched on,\nand check that you have read/write permissions for the camera device\n(generally /dev/raw1394*).\n"));
+    do_error_dialog(
+      _("\nLiVES could not find any firewire camera.\nPlease make sure your camera is switched on,\nand check that you have read/write permissions for the camera device\n(generally /dev/raw1394*).\n"));
     raw1394_destroy_handle(cam->handle);
     return NULL;
   }
@@ -186,24 +183,24 @@
   avc1394_vcr_play(cam->handle, cam->device);
 }
 
-void camstop (s_cam *cam) {
+void camstop(s_cam *cam) {
   g_alldone=1;
   avc1394_vcr_stop(cam->handle, cam->device);
 }
 
-void camrew (s_cam *cam) {
+void camrew(s_cam *cam) {
   avc1394_vcr_rewind(cam->handle, cam->device);
 }
 
-void camff (s_cam *cam) {
+void camff(s_cam *cam) {
   avc1394_vcr_forward(cam->handle, cam->device);
 }
 
-void campause (s_cam *cam) {
+void campause(s_cam *cam) {
   avc1394_vcr_pause(cam->handle, cam->device);
 }
 
-void cameject (s_cam *cam) {
+void cameject(s_cam *cam) {
   avc1394_vcr_eject(cam->handle, cam->device);
 }
 
@@ -212,37 +209,36 @@
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 
-gchar *find_free_camfile(int format) {
-  gchar *filename=g_strdup(lives_entry_get_text(LIVES_ENTRY(dvgrabw->filent)));
+char *find_free_camfile(int format) {
+  char *filename=lives_strdup(lives_entry_get_text(LIVES_ENTRY(dvgrabw->filent)));
   int i;
-  gchar *fname,*tmp=NULL,*tmp2,*tmp3;
+  char *fname,*tmp=NULL,*tmp2,*tmp3;
 
   if (format==CAM_FORMAT_HDV) {
-    for (i=1;i<10000;i++) {
-      fname=g_strdup_printf("%s%04d.mpg",filename,i);
-      if (!g_file_test((tmp=g_build_filename((tmp2=g_filename_from_utf8(dvgrabw->dirname,-1,NULL,NULL,NULL)),
-					     (tmp3=g_filename_from_utf8(fname,-1,NULL,NULL,NULL)),NULL)),
-		       G_FILE_TEST_EXISTS)) break;
-      g_free(tmp);
-      g_free(tmp2);
-      g_free(tmp3);
+    for (i=1; i<10000; i++) {
+      fname=lives_strdup_printf("%s%04d.mpg",filename,i);
+      if (!lives_file_test((tmp=lives_build_filename((tmp2=lives_filename_from_utf8(dvgrabw->dirname,-1,NULL,NULL,NULL)),
+                                (tmp3=lives_filename_from_utf8(fname,-1,NULL,NULL,NULL)),NULL)),
+                           LIVES_FILE_TEST_EXISTS)) break;
+      lives_free(tmp);
+      lives_free(tmp2);
+      lives_free(tmp3);
       tmp=NULL;
     }
-  }
-  else {
-    for (i=1;i<1000;i++) {
-      fname=g_strdup_printf("%s%03d.dv",filename,i);
-      if (!g_file_test((tmp=g_build_filename((tmp2=g_filename_from_utf8(dvgrabw->dirname,-1,NULL,NULL,NULL)),
-					     (tmp3=g_filename_from_utf8(fname,-1,NULL,NULL,NULL)),NULL)),
-		       G_FILE_TEST_EXISTS)) break;
-      g_free(tmp);
-      g_free(tmp2);
-      g_free(tmp3);
+  } else {
+    for (i=1; i<1000; i++) {
+      fname=lives_strdup_printf("%s%03d.dv",filename,i);
+      if (!lives_file_test((tmp=lives_build_filename((tmp2=lives_filename_from_utf8(dvgrabw->dirname,-1,NULL,NULL,NULL)),
+                                (tmp3=lives_filename_from_utf8(fname,-1,NULL,NULL,NULL)),NULL)),
+                           LIVES_FILE_TEST_EXISTS)) break;
+      lives_free(tmp);
+      lives_free(tmp2);
+      lives_free(tmp3);
       tmp=NULL;
     }
   }
-  if (tmp!=NULL) g_free(tmp);
-  g_free(filename);
+  if (tmp!=NULL) lives_free(tmp);
+  lives_free(filename);
 
   return fname;
 }
@@ -251,56 +247,56 @@
 boolean rec(s_cam *cam) {
   // returns filename of file being written
 
-  gchar *tmp2,*tmp3,*com;
-  gchar *splits;
+  char *tmp2,*tmp3,*com;
+  char *splits;
 
   if (cam->pgid!=0) return FALSE;
 
-  if (lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(dvgrabw->split))) splits=g_strdup("-autosplit ");
-  else splits=g_strdup("");
+  if (lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(dvgrabw->split))) splits=lives_strdup("-autosplit ");
+  else splits=lives_strdup("");
 
   if (cam->format==CAM_FORMAT_DV) {
     // dv format
 #ifndef IS_MINGW
-    com=g_strdup_printf("dvgrab -format raw %s\"%s/%s\" >/dev/null 2>&1 &",splits,
-			(tmp2=g_filename_from_utf8(dvgrabw->dirname,-1,NULL,NULL,NULL)),
-			(tmp3=g_filename_from_utf8(dvgrabw->filename,-1,NULL,NULL,NULL)));
+    com=lives_strdup_printf("dvgrab -format raw %s\"%s/%s\" >/dev/null 2>&1 &",splits,
+                            (tmp2=lives_filename_from_utf8(dvgrabw->dirname,-1,NULL,NULL,NULL)),
+                            (tmp3=lives_filename_from_utf8(dvgrabw->filename,-1,NULL,NULL,NULL)));
 #else
-    com=g_strdup_printf("dvgrab.exe -format raw %s\"%s/%s\" >NUL 2>&1 &",splits,
-			(tmp2=g_filename_from_utf8(dvgrabw->dirname,-1,NULL,NULL,NULL)),
-			(tmp3=g_filename_from_utf8(dvgrabw->filename,-1,NULL,NULL,NULL)));
+    com=lives_strdup_printf("dvgrab.exe -format raw %s\"%s/%s\" >NUL 2>&1 &",splits,
+                            (tmp2=lives_filename_from_utf8(dvgrabw->dirname,-1,NULL,NULL,NULL)),
+                            (tmp3=lives_filename_from_utf8(dvgrabw->filename,-1,NULL,NULL,NULL)));
 #endif
-    cam->pgid=lives_fork (com);
-    g_free(com);
-    g_free(tmp2);
-    g_free(tmp3);
-    g_free(splits);
+    cam->pgid=lives_fork(com);
+    lives_free(com);
+    lives_free(tmp2);
+    lives_free(tmp3);
+    lives_free(splits);
     return TRUE;
   }
 
   // hdv format
 #ifndef IS_MINGW
-  com=g_strdup_printf("dvgrab -format mpeg2 %s\"%s/%s\" >/dev/null 2>&1 &",splits,
-		      (tmp2=g_filename_from_utf8(dvgrabw->dirname,-1,NULL,NULL,NULL)),
-		      (tmp3=g_filename_from_utf8(dvgrabw->filename,-1,NULL,NULL,NULL)));
+  com=lives_strdup_printf("dvgrab -format mpeg2 %s\"%s/%s\" >/dev/null 2>&1 &",splits,
+                          (tmp2=lives_filename_from_utf8(dvgrabw->dirname,-1,NULL,NULL,NULL)),
+                          (tmp3=lives_filename_from_utf8(dvgrabw->filename,-1,NULL,NULL,NULL)));
 #else
-  com=g_strdup_printf("dvgrab.exe -format mpeg2 %s\"%s/%s\" >NUL 2>&1 &",splits,
-		      (tmp2=g_filename_from_utf8(dvgrabw->dirname,-1,NULL,NULL,NULL)),
-		      (tmp3=g_filename_from_utf8(dvgrabw->filename,-1,NULL,NULL,NULL)));
+  com=lives_strdup_printf("dvgrab.exe -format mpeg2 %s\"%s/%s\" >NUL 2>&1 &",splits,
+                          (tmp2=lives_filename_from_utf8(dvgrabw->dirname,-1,NULL,NULL,NULL)),
+                          (tmp3=lives_filename_from_utf8(dvgrabw->filename,-1,NULL,NULL,NULL)));
 #endif
-  cam->pgid=lives_fork (com);
-  g_free(com);
-  g_free(tmp2);
-  g_free(tmp3);
-  g_free(splits);
+  cam->pgid=lives_fork(com);
+  lives_free(com);
+  lives_free(tmp2);
+  lives_free(tmp3);
+  lives_free(splits);
 
   return TRUE;
 }
 
 
 
-void on_open_fw_activate (LiVESMenuItem *menuitem, gpointer user_data) {
-  int type=GPOINTER_TO_INT(user_data); // type 0==dv, type 1==hdv
+void on_open_fw_activate(LiVESMenuItem *menuitem, livespointer user_data) {
+  int type=LIVES_POINTER_TO_INT(user_data); // type 0==dv, type 1==hdv
   s_cam *cam;
 
   if (type==CAM_FORMAT_DV&&!capable->has_dvgrab) {
@@ -315,23 +311,23 @@
     cam->rec_handle=open_raw1394();
     if (cam->rec_handle==NULL) return;
   }
-  else*/ 
+  else*/
   cam->rec_handle=NULL;
 
   if (mainw->multitrack!=NULL) {
     if (mainw->multitrack->idlefunc>0) {
-      g_source_remove(mainw->multitrack->idlefunc);
+      lives_source_remove(mainw->multitrack->idlefunc);
       mainw->multitrack->idlefunc=0;
     }
     mt_desensitise(mainw->multitrack);
   }
 
-  dvgrabw = create_camwindow (cam,type);
+  dvgrabw = create_camwindow(cam,type);
   dvgrabw->cursor=NULL;
   cam->format=type;
   cam->grabbed_clips=FALSE;
   cam->pgid=0;
-  lives_widget_show (dvgrabw->dialog);
+  lives_widget_show(dvgrabw->dialog);
   dvgrabw->cam=cam;
 }

LiVES-2.2.8.tar.bz2/src/ldvgrab.h -> LiVES-2.4.1.tar.bz2/src/ldvgrab.h Changed

LiVES-2.2.8.tar.bz2/src/ldvinterface.c -> LiVES-2.4.1.tar.bz2/src/ldvinterface.c Changed

@@ -10,7 +10,7 @@
 #include "ldvinterface.h"
 
 
-struct _dvgrabw *create_camwindow (s_cam *cam, int type) {
+struct _dvgrabw *create_camwindow(s_cam *cam, int type) {
   LiVESWidget *hbuttonbox1;
   LiVESWidget *hbuttonbox2;
   LiVESWidget *button3;
@@ -22,16 +22,16 @@
   LiVESWidget *label;
   LiVESWidget *direntry;
 
-  gchar *tmp;
+  char *tmp;
 
-  struct _dvgrabw * dvgrabw=(struct _dvgrabw *)g_malloc(sizeof(struct _dvgrabw));
+  struct _dvgrabw *dvgrabw=(struct _dvgrabw *)lives_malloc(sizeof(struct _dvgrabw));
 
   dvgrabw->filename=NULL;
 
-  dvgrabw->dialog = lives_standard_dialog_new (_("LiVES: DVGrab"),FALSE);
+  dvgrabw->dialog = lives_standard_dialog_new(_("LiVES: DVGrab"),FALSE,-1,-1);
   dvgrabw->playing=FALSE;
 
-  lives_container_set_border_width (LIVES_CONTAINER (dvgrabw->dialog), widget_opts.border_width*2);
+  lives_container_set_border_width(LIVES_CONTAINER(dvgrabw->dialog), widget_opts.border_width*2);
 
   if (prefs->show_gui) {
     if (mainw->multitrack==NULL) lives_window_set_transient_for(LIVES_WINDOW(dvgrabw->dialog),LIVES_WINDOW(mainw->LiVES));
@@ -40,7 +40,7 @@
 
   vbox=lives_dialog_get_content_area(LIVES_DIALOG(dvgrabw->dialog));
 
-  hbox = lives_hbox_new (FALSE,0);
+  hbox = lives_hbox_new(FALSE,0);
   lives_box_pack_start(LIVES_BOX(vbox),hbox,FALSE,FALSE,widget_opts.packing_height);
 
 
@@ -51,18 +51,18 @@
 
   lives_box_pack_start(LIVES_BOX(hbox),buttond,FALSE,FALSE,widget_opts.packing_width);
 
-  direntry=lives_standard_entry_new(NULL,FALSE,(tmp=g_filename_to_utf8(g_get_current_dir(),-1,NULL,NULL,NULL)),-1,PATH_MAX,
-				    LIVES_BOX(hbox),NULL);
+  direntry=lives_standard_entry_new(NULL,FALSE,(tmp=lives_filename_to_utf8(lives_get_current_dir(),-1,NULL,NULL,NULL)),-1,PATH_MAX,
+                                    LIVES_BOX(hbox),NULL);
 
-  g_free(tmp);
+  lives_free(tmp);
 
 
-  lives_signal_connect(buttond, LIVES_WIDGET_CLICKED_EVENT, LIVES_GUI_CALLBACK (on_filesel_button_clicked), (gpointer)direntry);
+  lives_signal_connect(buttond, LIVES_WIDGET_CLICKED_SIGNAL, LIVES_GUI_CALLBACK(on_filesel_button_clicked), (livespointer)direntry);
 
 
   //////////////////
 
-  hbox = lives_hbox_new (FALSE,0);
+  hbox = lives_hbox_new(FALSE,0);
   lives_box_pack_start(LIVES_BOX(vbox),hbox,FALSE,FALSE,widget_opts.packing_height);
 
   dvgrabw->filent=lives_standard_entry_new(_("File_name:"),TRUE,type==CAM_FORMAT_DV?"dvgrab-":"hdvgrab-",-1,-1,LIVES_BOX(hbox),NULL);
@@ -74,8 +74,8 @@
   label=lives_standard_label_new(_("(files will not be overwritten)"));
   lives_box_pack_end(LIVES_BOX(hbox),label,FALSE,FALSE,widget_opts.packing_width);
 
-  hbox = lives_hbox_new (FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
+  hbox = lives_hbox_new(FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
 
   dvgrabw->split=lives_standard_check_button_new(_("_Split into scenes"),TRUE,LIVES_BOX(hbox),NULL);
 
@@ -85,75 +85,76 @@
 
   lives_box_pack_start(LIVES_BOX(vbox),dvgrabw->status_entry,FALSE,FALSE,widget_opts.packing_height);
   lives_entry_set_text(LIVES_ENTRY(dvgrabw->status_entry),_("Status: Ready"));
-  lives_editable_set_editable (LIVES_EDITABLE(dvgrabw->status_entry),FALSE);
+  lives_editable_set_editable(LIVES_EDITABLE(dvgrabw->status_entry),FALSE);
 
   add_hsep_to_box(LIVES_BOX(vbox));
 
-  hbuttonbox1 = lives_hbutton_box_new ();
+  hbuttonbox1 = lives_hbutton_box_new();
 
   lives_box_pack_start(LIVES_BOX(vbox),hbuttonbox1,FALSE,FALSE,widget_opts.packing_height);
 
 #if GTK_CHECK_VERSION(2,6,0)
-  button3 = lives_button_new_from_stock (GTK_STOCK_MEDIA_REWIND);
+  button3 = lives_button_new_from_stock(GTK_STOCK_MEDIA_REWIND);
 #else
-  button3 = lives_button_new_from_stock (GTK_STOCK_GO_BACK);
+  button3 = lives_button_new_from_stock(GTK_STOCK_GO_BACK);
 #endif
 
-  lives_container_add (LIVES_CONTAINER (hbuttonbox1), button3);
-  lives_widget_set_can_focus (button3,TRUE);
+  lives_container_add(LIVES_CONTAINER(hbuttonbox1), button3);
+  lives_widget_set_can_focus(button3,TRUE);
 
 #if GTK_CHECK_VERSION(2,6,0)
-  button4 = lives_button_new_from_stock (GTK_STOCK_MEDIA_FORWARD);
+  button4 = lives_button_new_from_stock(GTK_STOCK_MEDIA_FORWARD);
 #else
-  button4 = lives_button_new_from_stock (GTK_STOCK_GO_FORWARD);
+  button4 = lives_button_new_from_stock(GTK_STOCK_GO_FORWARD);
 #endif
-  lives_container_add (LIVES_CONTAINER (hbuttonbox1), button4);
-  lives_widget_set_can_focus (button4,TRUE);
+  lives_container_add(LIVES_CONTAINER(hbuttonbox1), button4);
+  lives_widget_set_can_focus(button4,TRUE);
 
 #if GTK_CHECK_VERSION(2,6,0)
-  dvgrabw->stop = lives_button_new_from_stock (GTK_STOCK_MEDIA_STOP);
+  dvgrabw->stop = lives_button_new_from_stock(GTK_STOCK_MEDIA_STOP);
 #else
-  dvgrabw->stop = lives_button_new_from_stock (GTK_STOCK_STOP);
+  dvgrabw->stop = lives_button_new_from_stock(GTK_STOCK_STOP);
 #endif
-  lives_container_add (LIVES_CONTAINER (hbuttonbox1), dvgrabw->stop);
-  lives_widget_set_can_focus_and_default (dvgrabw->stop);
+  lives_container_add(LIVES_CONTAINER(hbuttonbox1), dvgrabw->stop);
+  lives_widget_set_can_focus_and_default(dvgrabw->stop);
   lives_widget_set_sensitive(dvgrabw->stop,FALSE);
 
 #if GTK_CHECK_VERSION(2,6,0)
-  dvgrabw->play = lives_button_new_from_stock (GTK_STOCK_MEDIA_PLAY);
+  dvgrabw->play = lives_button_new_from_stock(GTK_STOCK_MEDIA_PLAY);
 #else
-  dvgrabw->play = lives_button_new_from_stock (GTK_STOCK_GO_FORWARD);
+  dvgrabw->play = lives_button_new_from_stock(GTK_STOCK_GO_FORWARD);
 #endif
-  lives_container_add (LIVES_CONTAINER (hbuttonbox1), dvgrabw->play);
-  lives_widget_set_can_focus_and_default (dvgrabw->play);
+  lives_container_add(LIVES_CONTAINER(hbuttonbox1), dvgrabw->play);
+  lives_widget_set_can_focus_and_default(dvgrabw->play);
 
 
 #if GTK_CHECK_VERSION(2,6,0)
-  dvgrabw->grab = lives_button_new_from_stock (GTK_STOCK_MEDIA_RECORD);
+  dvgrabw->grab = lives_button_new_from_stock(GTK_STOCK_MEDIA_RECORD);
 #else
-  dvgrabw->grab = lives_button_new_from_stock (GTK_STOCK_NO);
+  dvgrabw->grab = lives_button_new_from_stock(GTK_STOCK_NO);
 #endif
-  lives_container_add (LIVES_CONTAINER (hbuttonbox1), dvgrabw->grab);
-  lives_widget_set_can_focus_and_default (dvgrabw->grab);
+  lives_container_add(LIVES_CONTAINER(hbuttonbox1), dvgrabw->grab);
+  lives_widget_set_can_focus_and_default(dvgrabw->grab);
 
 #if GTK_CHECK_VERSION(2,6,0)
-  image = lives_image_new_from_stock (LIVES_STOCK_MEDIA_RECORD,LIVES_ICON_SIZE_BUTTON);
+  image = lives_image_new_from_stock(LIVES_STOCK_MEDIA_RECORD,LIVES_ICON_SIZE_BUTTON);
 #else
-  image = lives_image_new_from_stock (GTK_STOCK_NO,LIVES_ICON_SIZE_BUTTON);
+  image = lives_image_new_from_stock(GTK_STOCK_NO,LIVES_ICON_SIZE_BUTTON);
 #endif
   lives_button_set_label(LIVES_BUTTON(dvgrabw->grab),_("_Grab"));
   lives_button_set_image(LIVES_BUTTON(dvgrabw->grab),image);
 
-  label=lives_standard_label_new(_("\nUse this tool to control your camera and grab clips.\nAfter grabbing your clips, you can close this window \nand then load them into LiVES.\n"));
+  label=lives_standard_label_new(
+          _("\nUse this tool to control your camera and grab clips.\nAfter grabbing your clips, you can close this window \nand then load them into LiVES.\n"));
   lives_box_pack_start(LIVES_BOX(vbox),label,FALSE,FALSE,widget_opts.packing_height*4);
 
 
-  hbuttonbox2 = lives_hbutton_box_new ();
+  hbuttonbox2 = lives_hbutton_box_new();
   lives_box_pack_start(LIVES_BOX(vbox),hbuttonbox2,FALSE,FALSE,widget_opts.packing_height);
 
-  dvgrabw->quit = lives_button_new_from_stock (GTK_STOCK_CLOSE);
-  lives_container_add (LIVES_CONTAINER (hbuttonbox2), dvgrabw->quit);
-  lives_widget_set_can_focus_and_default (dvgrabw->quit);
+  dvgrabw->quit = lives_button_new_from_stock(GTK_STOCK_CLOSE);
+  lives_container_add(LIVES_CONTAINER(hbuttonbox2), dvgrabw->quit);
+  lives_widget_set_can_focus_and_default(dvgrabw->quit);
 
   image=lives_image_new_from_stock(LIVES_STOCK_CLOSE,LIVES_ICON_SIZE_BUTTON);
   lives_button_set_label(LIVES_BUTTON(dvgrabw->quit),_("_Close Window"));
@@ -161,16 +162,16 @@
 
   //////////////////////////////////////////////////////////////////////////////////////////
 
-  lives_signal_connect (button3, LIVES_WIDGET_CLICKED_EVENT,LIVES_GUI_CALLBACK (on_camrew_clicked),(gpointer)cam);
-  lives_signal_connect (button4, LIVES_WIDGET_CLICKED_EVENT,LIVES_GUI_CALLBACK (on_camff_clicked),(gpointer)cam);
-  lives_signal_connect (dvgrabw->stop, LIVES_WIDGET_CLICKED_EVENT,LIVES_GUI_CALLBACK (on_camstop_clicked),(gpointer)cam);
-  lives_signal_connect (dvgrabw->play, LIVES_WIDGET_CLICKED_EVENT,LIVES_GUI_CALLBACK (on_camplay_clicked),(gpointer)cam);
-  lives_signal_connect (dvgrabw->grab, LIVES_WIDGET_CLICKED_EVENT,LIVES_GUI_CALLBACK (on_camgrab_clicked),(gpointer)cam);
-  lives_signal_connect (dvgrabw->quit, LIVES_WIDGET_CLICKED_EVENT,LIVES_GUI_CALLBACK (on_camquit_clicked),(gpointer)cam);
+  lives_signal_connect(button3, LIVES_WIDGET_CLICKED_SIGNAL,LIVES_GUI_CALLBACK(on_camrew_clicked),(livespointer)cam);
+  lives_signal_connect(button4, LIVES_WIDGET_CLICKED_SIGNAL,LIVES_GUI_CALLBACK(on_camff_clicked),(livespointer)cam);
+  lives_signal_connect(dvgrabw->stop, LIVES_WIDGET_CLICKED_SIGNAL,LIVES_GUI_CALLBACK(on_camstop_clicked),(livespointer)cam);
+  lives_signal_connect(dvgrabw->play, LIVES_WIDGET_CLICKED_SIGNAL,LIVES_GUI_CALLBACK(on_camplay_clicked),(livespointer)cam);
+  lives_signal_connect(dvgrabw->grab, LIVES_WIDGET_CLICKED_SIGNAL,LIVES_GUI_CALLBACK(on_camgrab_clicked),(livespointer)cam);
+  lives_signal_connect(dvgrabw->quit, LIVES_WIDGET_CLICKED_SIGNAL,LIVES_GUI_CALLBACK(on_camquit_clicked),(livespointer)cam);
 
 
   lives_widget_show_all(dvgrabw->dialog);
-  
+
   dvgrabw->dirname=NULL;
 
   return dvgrabw;

LiVES-2.2.8.tar.bz2/src/ldvinterface.h -> LiVES-2.4.1.tar.bz2/src/ldvinterface.h Changed

LiVES-2.4.1.tar.bz2/src/liblives.cpp Added

@@ -0,0 +1,2433 @@
+// liblives.cpp
+// LiVES (lives-exe)
+// (c) G. Finch <salsaman@gmail.com> 2015
+// Released under the GPL 3 or later
+// see file ../COPYING for licensing details
+
+/** \file liblives.cpp
+    liblives interface
+ */
+
+#ifndef DOXYGEN_SKIP
+
+#include "liblives.hpp"
+
+#include <stdlib.h>
+#include <pthread.h>
+#include <unistd.h>
+#include <iostream>
+
+extern "C" {
+  typedef int Boolean;
+#include <libOSC/libosc.h>
+#include <libOSC/OSC-client.h>
+#include "main.h"
+#include "lbindings.h"
+#include "effects-weed.h"
+
+  int real_main(int argc, char *argv[], pthread_t *gtk_thread, ulong id);
+
+  bool lives_osc_cb_quit(void *context, int arglen, const void *vargs, OSCTimeTag when, void * ra);
+
+  track_rect *find_block_by_uid(lives_mt *mt, ulong uid);
+
+}
+
+
+static volatile bool spinning;
+static ulong msg_id;
+static char *private_response;
+static pthread_mutex_t spin_mutex = PTHREAD_MUTEX_INITIALIZER;
+static pthread_mutex_t cond_mutex = PTHREAD_MUTEX_INITIALIZER;
+static pthread_cond_t cond_done = PTHREAD_COND_INITIALIZER;
+
+static bool private_cb(lives::_privateInfo *info, void *data) {
+  if (info->id == msg_id) {
+    private_response = strdup(info->response);
+    spinning = false;
+    pthread_cond_signal(&cond_done);
+    return false;
+  }
+  return true;
+}
+
+#endif // doxygen_skip
+
+//////////////////////////////////////////////////
+
+namespace lives {
+
+#ifndef DOXYGEN_SKIP
+  typedef struct {
+    ulong id;
+    livesApp *app;
+  } livesAppCtx;
+
+  static list<livesAppCtx> appMgr;
+
+  static livesApp *find_instance_for_id(ulong id) {
+    list<livesAppCtx>::iterator it = appMgr.begin();
+    while (it != appMgr.end()) {
+      if ((*it).id == id) {
+	return (*it).app;
+      }
+      ++it;
+    }
+    return NULL;
+  }
+
+#endif
+
+  void livesString::setEncoding(lives_char_encoding_t enc) {
+    m_encoding = enc;
+  }
+
+  lives_char_encoding_t livesString::encoding() {
+    return m_encoding;
+  }
+
+  livesString livesString::toEncoding(lives_char_encoding_t enc) {
+    if (enc == LIVES_CHAR_ENCODING_UTF8) {
+      if (m_encoding == LIVES_CHAR_ENCODING_LOCAL8BIT) {
+	livesString str(L2U8(this->c_str()));
+	str.setEncoding(LIVES_CHAR_ENCODING_UTF8);
+	return str;
+      }
+#ifndef IS_MINGW
+      else if (m_encoding == LIVES_CHAR_ENCODING_FILESYSTEM) {
+	livesString str(F2U8(this->c_str()));
+	str.setEncoding(LIVES_CHAR_ENCODING_UTF8);
+	return str;
+      }
+#endif
+    }
+    else if (enc == LIVES_CHAR_ENCODING_FILESYSTEM) {
+#ifndef IS_MINGW
+      if (m_encoding == LIVES_CHAR_ENCODING_UTF8) {
+	livesString str(U82F(this->c_str()));
+	str.setEncoding(LIVES_CHAR_ENCODING_FILESYSTEM);
+	return str;
+      }
+#else
+      if (m_encoding == LIVES_CHAR_ENCODING_LOCAL8BIT) {
+	livesString str(U82L(this->c_str()));
+	str.setEncoding(LIVES_CHAR_ENCODING_FILESYSTEM);
+	return str;
+      }
+#endif
+    }
+    else if (enc == LIVES_CHAR_ENCODING_LOCAL8BIT) {
+      if (m_encoding == LIVES_CHAR_ENCODING_UTF8) {
+	livesString str(U82L(this->c_str()));
+	str.setEncoding(LIVES_CHAR_ENCODING_LOCAL8BIT);
+	return str;
+      }
+#ifndef IS_MINGW
+      if (m_encoding == LIVES_CHAR_ENCODING_FILESYSTEM) {
+	livesString str(F2U8(this->c_str()));
+	str.assign(U82L(str.c_str()));
+	str.setEncoding(LIVES_CHAR_ENCODING_LOCAL8BIT);
+	return str;
+      }
+#endif
+    }
+    return *this;
+  }
+  
+
+
+  void livesApp::init(int argc, char *oargv[]) {
+    char **argv;
+    char progname[] = "lives-exe";
+    if (argc < 0) argc=0;
+    argc++;
+
+    argv=(char **)malloc(argc * sizeof(char *));
+    argv[0]=strdup(progname);
+
+    for (int i=1; i < argc; i++) {
+      argv[i]=strdup(oargv[i-1]);
+    }
+
+    ulong id = lives_random();
+    livesAppCtx *ctx = new livesAppCtx;
+
+    pthread_t *gtk_thread = new pthread_t;
+
+    ctx->id = id;
+    ctx->app = this;
+    appMgr.push_back(*ctx);
+
+    m_set = new set(this);
+    m_player = new player(this);
+    m_effectKeyMap = new effectKeyMap(this);
+    m_multitrack = new multitrack(this);
+
+    m_deinterlace = false;
+
+    m_thread = gtk_thread;
+
+    m_id = id;
+
+    real_main(argc, argv, m_thread, m_id);
+    free(argv);
+
+
+  }
+
+
+  livesApp::livesApp() : m_id(0l) {
+    if (appMgr.empty())
+      init(0,NULL);
+  }
+
+  livesApp::livesApp(int argc, char *argv[]) : m_id(0l) {
+    if (appMgr.empty())
+      init(argc,argv);
+  }
+
+
+  livesApp::~livesApp() {
+    if (!isValid()) return;
+    idle_quit(m_thread);
+  }
+
+
+  bool livesApp::isValid() const {
+    return this != NULL && m_id != 0l;
+  }
+
+
+  bool livesApp::isPlaying() const {
+    return status() == LIVES_STATUS_PLAYING;
+  }
+
+
+  bool livesApp::isReady() const {
+    return status() == LIVES_STATUS_READY;
+  }
+
+
+  const set& livesApp::getSet() {
+    return *m_set;
+  }
+
+
+  const player& livesApp::getPlayer() {
+    return *m_player;
+  }
+
+
+  const multitrack& livesApp::getMultitrack() {
+    return *m_multitrack;
+  }
+
+
+  ulong livesApp::appendClosure(lives_callback_t cb_type, callback_f func, void *data) const {
+    closure *cl = new closure;
+    cl->id = lives_random();
+    cl->object = (livesApp *)this;
+    cl->cb_type = cb_type;
+    cl->func = (callback_f)func;
+    cl->data = data;
+    while (pthread_mutex_trylock(&spin_mutex)) {
+      // lock mutex so that new callbacks cannot be added yet
+      lives_usleep(::prefs->sleep_time);
+    }
+    ((livesApp *)this)->m_closures.push_back(cl);
+    pthread_mutex_unlock(&spin_mutex);
+    return cl->id;
+  }
+
+#ifndef DOXYGEN_SKIP
+
+  void livesApp::setClosures(closureList cl) {
+    m_closures = cl;
+  }
+
+#endif
+
+  ulong livesApp::addCallback(lives_callback_t cb_type, modeChanged_callback_f func, void *data) const {
+    if (cb_type != LIVES_CALLBACK_MODE_CHANGED) return 0l;
+    return appendClosure(cb_type, (callback_f)func, data);
+  }
+
+  ulong livesApp::addCallback(lives_callback_t cb_type, private_callback_f func, void *data) const {
+    if (cb_type != LIVES_CALLBACK_PRIVATE) return 0l;
+    return appendClosure(cb_type, (callback_f)func, data);
+  }
+
+  ulong livesApp::addCallback(lives_callback_t cb_type, objectDestroyed_callback_f func, void *data) const {
+    if (cb_type != LIVES_CALLBACK_OBJECT_DESTROYED) return 0l;
+    return appendClosure(cb_type, (callback_f)func, data);
+  }
+
+  ulong livesApp::addCallback(lives_callback_t cb_type, appQuit_callback_f func, void *data) const {
+    if (cb_type != LIVES_CALLBACK_APP_QUIT) return 0l;
+    return appendClosure(cb_type, (callback_f)func, data);
+  }
+
+  bool livesApp::removeCallback(ulong id) const {
+    while (pthread_mutex_trylock(&spin_mutex)) {
+      // lock mutex so that new callbacks cannot be added yet
+      lives_usleep(::prefs->sleep_time);
+    }
+    closureListIterator it = ((livesApp *)this)->m_closures.begin();
+    while (it != ((livesApp *)this)->m_closures.end()) {
+      if ((*it)->id == id) {
+	delete *it;
+	((livesApp *)this)->m_closures.erase(it);
+	pthread_mutex_unlock(&spin_mutex);
+	return true;
+      }
+      ++it;
+    }
+    pthread_mutex_unlock(&spin_mutex);
+    return false;
+  }
+
+
+  lives_dialog_response_t livesApp::showInfo(livesString text, bool blocking) {
+    lives_dialog_response_t ret=LIVES_DIALOG_RESPONSE_INVALID;
+    if (!isValid() || status() == LIVES_STATUS_NOTREADY) return ret;
+    // if blocking wait for response
+    if (blocking) {
+      spinning = true;
+      msg_id = lives_random();
+      ulong cbid = addCallback(LIVES_CALLBACK_PRIVATE, private_cb, NULL); 
+      pthread_mutex_lock(&cond_mutex);
+      if (!idle_show_info(text.toEncoding(LIVES_CHAR_ENCODING_UTF8).c_str(),blocking, msg_id)) {
+	pthread_mutex_unlock(&cond_mutex);
+	spinning = false;
+	removeCallback(cbid);
+      }
+      else {
+	while (spinning) pthread_cond_wait(&cond_done, &cond_mutex);
+	pthread_mutex_unlock(&cond_mutex);
+	if (isValid()) {
+	  ret = (lives_dialog_response_t)atoi(private_response);
+	  lives_free(private_response);
+	}
+      }
+      return ret;
+    }
+    if (idle_show_info(text.toEncoding(LIVES_CHAR_ENCODING_UTF8).c_str(),blocking,0))
+      return LIVES_DIALOG_RESPONSE_NONE;
+    return ret;
+  }
+
+
+  livesString livesApp::chooseFileWithPreview(livesString dirname, lives_filechooser_t preview_type, livesString title) {
+    livesString emptystr;
+    if (!isValid() || status() == LIVES_STATUS_NOTREADY) return emptystr;
+    if (preview_type != LIVES_FILE_CHOOSER_VIDEO_AUDIO && preview_type != LIVES_FILE_CHOOSER_AUDIO_ONLY) return emptystr;
+    spinning = true;
+    msg_id = lives_random();
+    ulong cbid = addCallback(LIVES_CALLBACK_PRIVATE, private_cb, NULL);
+    pthread_mutex_lock(&cond_mutex);
+    if (!idle_choose_file_with_preview(dirname.toEncoding(LIVES_CHAR_ENCODING_FILESYSTEM).c_str(),
+				       title.toEncoding(LIVES_CHAR_ENCODING_UTF8).c_str(),
+				       preview_type, msg_id)) {
+      pthread_mutex_unlock(&cond_mutex);
+      spinning = false;
+      removeCallback(cbid);
+    }
+    else {
+      while (spinning) pthread_cond_wait(&cond_done, &cond_mutex);
+      pthread_mutex_unlock(&cond_mutex);
+      if (isValid()) {
+	// last 2 chars are " " and %d (deinterlace choice)
+	livesString str(private_response, strlen(private_response) - 2, LIVES_CHAR_ENCODING_FILESYSTEM);
+	m_deinterlace = (bool)atoi(private_response + strlen(private_response) - 2);
+	lives_free(private_response);
+	return str;
+      }
+    }
+    return emptystr;
+  }
+
+
+  livesString livesApp::chooseSet() {
+    livesString emptystr;
+    if (!isValid() || status() == LIVES_STATUS_NOTREADY) return emptystr;
+    spinning = true;
+    msg_id = lives_random();
+    ulong cbid = addCallback(LIVES_CALLBACK_PRIVATE, private_cb, NULL);
+    pthread_mutex_lock(&cond_mutex);
+    if (!idle_choose_set(msg_id)) {
+      pthread_mutex_unlock(&cond_mutex);
+      spinning = false;
+      removeCallback(cbid);
+    }
+    else {
+      while (spinning) pthread_cond_wait(&cond_done, &cond_mutex);
+      pthread_mutex_unlock(&cond_mutex);
+      if (isValid()) {
+	livesString str(private_response, LIVES_CHAR_ENCODING_FILESYSTEM);
+	lives_free(private_response);
+	return str;
+      }
+    }
+    return emptystr;
+  }
+
+
+  livesStringList livesApp::availableSets() {
+    livesStringList list;
+    if (!isValid() || status() == LIVES_STATUS_NOTREADY) return list;
+    LiVESList *setlist=get_set_list(::prefs->tmpdir, true), *slist=setlist;
+    while (slist != NULL) {
+      list.push_back(livesString((const char *)slist->data, LIVES_CHAR_ENCODING_UTF8));
+      lives_free(slist->data);
+      slist = slist->next;
+    }
+    lives_list_free(setlist);
+    return list;
+  }
+
+
+  clip livesApp::openFile(livesString fname, bool with_audio, double stime, int frames, bool deinterlace) {
+    if (!isValid() || status() == LIVES_STATUS_NOTREADY) return clip();
+    if (fname.empty()) return clip();
+    spinning = true;
+    msg_id = lives_random();
+    ulong cbid = addCallback(LIVES_CALLBACK_PRIVATE, private_cb, NULL);
+    ulong cid = 0l;
+    
+    pthread_mutex_lock(&cond_mutex);
+    if (!idle_open_file(fname.toEncoding(LIVES_CHAR_ENCODING_FILESYSTEM).c_str(), stime, frames, msg_id)) {
+      pthread_mutex_unlock(&cond_mutex);
+      spinning = false;
+      removeCallback(cbid);
+    }
+    else {
+      while (spinning) pthread_cond_wait(&cond_done, &cond_mutex);
+      pthread_mutex_unlock(&cond_mutex);
+      if (isValid()) {
+	cid = strtoul(private_response, NULL, 10);
+	lives_free(private_response);
+      }
+    }
+    return clip(cid, this);
+  }
+
+
+  bool livesApp::reloadSet(livesString setname) {
+    if (!isValid() || status() == LIVES_STATUS_NOTREADY) return false;
+    spinning = true;
+    msg_id = lives_random();
+    ulong cbid = addCallback(LIVES_CALLBACK_PRIVATE, private_cb, NULL);
+    
+    pthread_mutex_lock(&cond_mutex);
+    if (!idle_reload_set(setname.toEncoding(LIVES_CHAR_ENCODING_FILESYSTEM).c_str(), msg_id)) {
+      pthread_mutex_unlock(&cond_mutex);
+      spinning = false;
+      removeCallback(cbid);
+      return false;
+    }
+    while (spinning) pthread_cond_wait(&cond_done, &cond_mutex);
+    pthread_mutex_unlock(&cond_mutex);
+    if (isValid()) {
+      bool ret = (bool)atoi(private_response);
+      lives_free(private_response);
+      return ret;
+    }
+    return false;
+  }
+
+
+  bool livesApp::deinterlaceOption() {
+    return m_deinterlace;
+  }
+
+  lives_interface_mode_t livesApp::mode() {
+    if (!isValid() || status() == LIVES_STATUS_NOTREADY) return LIVES_INTERFACE_MODE_INVALID;
+    if (m_multitrack->isActive()) return LIVES_INTERFACE_MODE_MULTITRACK;
+    return LIVES_INTERFACE_MODE_CLIPEDIT;
+  }
+
+
+  lives_interface_mode_t livesApp::setMode(lives_interface_mode_t newmode) {
+    if (!isValid() || status() == LIVES_STATUS_NOTREADY) return LIVES_INTERFACE_MODE_INVALID;
+    spinning = true;
+    msg_id = lives_random();
+    ulong cbid = addCallback(LIVES_CALLBACK_PRIVATE, private_cb, NULL);
+    
+    pthread_mutex_lock(&cond_mutex);
+    if (!idle_set_if_mode(newmode, msg_id)) {
+      pthread_mutex_unlock(&cond_mutex);
+      spinning = false;
+      removeCallback(cbid);
+      return mode();
+    }
+    while (spinning) pthread_cond_wait(&cond_done, &cond_mutex);
+    pthread_mutex_unlock(&cond_mutex);
+    if (isValid()) {
+      bool ret = (bool)atoi(private_response);
+      lives_free(private_response);
+    }
+    return mode();
+  }
+
+
+  lives_status_t livesApp::status() const {
+    if (!isValid()) return LIVES_STATUS_INVALID;
+    if (mainw->go_away) return LIVES_STATUS_NOTREADY;
+    if (mainw->is_processing) return LIVES_STATUS_PROCESSING;
+    if ((mainw->preview || mainw->event_list != NULL) && mainw->multitrack==NULL) return LIVES_STATUS_PREVIEW;
+    if (mainw->playing_file > -1 || mainw->preview) return LIVES_STATUS_PLAYING;
+    return LIVES_STATUS_READY;
+  }
+
+
+
+  bool livesApp::cancel() {
+    if (!isValid()) return false;
+    if (status() != LIVES_STATUS_PROCESSING) return false;
+    bool ret = false;
+    spinning = true;
+    msg_id = lives_random();
+    ulong cbid = addCallback(LIVES_CALLBACK_PRIVATE, private_cb, NULL);
+    
+    pthread_mutex_lock(&cond_mutex);
+    if (!idle_cancel_proc(msg_id)) {
+      pthread_mutex_unlock(&cond_mutex);
+      spinning = false;
+      removeCallback(cbid);
+      return false;
+    }
+    while (spinning) pthread_cond_wait(&cond_done, &cond_mutex);
+    pthread_mutex_unlock(&cond_mutex);
+    if (isValid()) {
+      ret = (bool)atoi(private_response);
+      lives_free(private_response);
+    }
+    return ret;
+  }
+
+#ifndef DOXYGEN_SKIP
+
+  closureList& livesApp::closures() {
+    return m_closures;
+  }
+
+
+#endif
+
+  void livesApp::invalidate() {
+    m_id = 0l;
+  }
+
+  bool livesApp::interactive() {
+    return mainw->interactive;
+  }
+
+
+  bool livesApp::setInteractive(bool setting) {
+    if (!isValid() || status() == LIVES_STATUS_NOTREADY) return mainw->interactive;
+    spinning = true;
+    msg_id = lives_random();
+    ulong cbid = addCallback(LIVES_CALLBACK_PRIVATE, private_cb, NULL); 
+    pthread_mutex_lock(&cond_mutex);
+    if (!idle_set_interactive(setting, msg_id)) {
+      pthread_mutex_unlock(&cond_mutex);
+      spinning = false;
+      removeCallback(cbid);
+    }
+    while (spinning) pthread_cond_wait(&cond_done, &cond_mutex);
+    pthread_mutex_unlock(&cond_mutex);
+    if (isValid()) {
+      lives_free(private_response);
+    }
+    return setting;
+  }
+
+
+
+  const effectKeyMap& livesApp::getEffectKeyMap() {
+    return *m_effectKeyMap;
+  }
+
+
+#ifndef DOXYGEN_SKIP
+  bool livesApp::setPref(int prefidx, bool val) const {
+    if (!isValid() || status() == LIVES_STATUS_NOTREADY) return false;
+    spinning = true;
+    msg_id = lives_random();
+    ulong cbid = addCallback(LIVES_CALLBACK_PRIVATE, private_cb, NULL); 
+    pthread_mutex_lock(&cond_mutex);
+    if (!idle_set_pref_bool(prefidx, val, msg_id)) {
+      pthread_mutex_unlock(&cond_mutex);
+      spinning = false;
+      removeCallback(cbid);
+      return false;
+    }
+    while (spinning) pthread_cond_wait(&cond_done, &cond_mutex);
+    pthread_mutex_unlock(&cond_mutex);
+    if (isValid()) {
+      lives_free(private_response);
+    }
+    return true;
+  }
+
+  bool livesApp::setPref(int prefidx, int val) const {
+    if (!isValid() || status() == LIVES_STATUS_NOTREADY) return false;
+    spinning = true;
+    msg_id = lives_random();
+    ulong cbid = addCallback(LIVES_CALLBACK_PRIVATE, private_cb, NULL); 
+    pthread_mutex_lock(&cond_mutex);
+    if (!idle_set_pref_int(prefidx, val, msg_id)) {
+      pthread_mutex_unlock(&cond_mutex);
+      spinning = false;
+      removeCallback(cbid);
+      return false;
+    }
+    while (spinning) pthread_cond_wait(&cond_done, &cond_mutex);
+    pthread_mutex_unlock(&cond_mutex);
+    if (isValid()) {
+      lives_free(private_response);
+    }
+    return true;
+  }
+
+  bool livesApp::setPref(int prefidx, int bitfield, bool val) const {
+    if (!isValid() || status() == LIVES_STATUS_NOTREADY) return false;
+    spinning = true;
+    msg_id = lives_random();
+    ulong cbid = addCallback(LIVES_CALLBACK_PRIVATE, private_cb, NULL); 
+    pthread_mutex_lock(&cond_mutex);
+    if (!idle_set_pref_bitmapped(prefidx, bitfield, val, msg_id)) {
+      pthread_mutex_unlock(&cond_mutex);
+      spinning = false;
+      removeCallback(cbid);
+      return false;
+    }
+    while (spinning) pthread_cond_wait(&cond_done, &cond_mutex);
+    pthread_mutex_unlock(&cond_mutex);
+    if (isValid()) {
+      lives_free(private_response);
+    }
+    return true;
+  }
+#endif
+
+  //////////////// player ////////////////////
+
+  player::player(livesApp *lives) {
+    // make shared ptr
+    m_lives = lives;
+  }
+
+
+  bool player::isValid() const {
+    return m_lives != NULL && m_lives->isValid() && m_lives->status() != LIVES_STATUS_NOTREADY;
+  }
+
+
+  bool player::isPlaying() const {
+    return isValid() && m_lives->isPlaying();
+  }
+
+
+  bool player::isRecording() const {
+    return isValid() && mainw->record;
+  }
+
+
+  bool player::play() const {
+    if (!isValid() || !m_lives->isReady()) return false;
+    return start_player();
+  }
+
+  bool player::stop() const {
+    if (!isPlaying()) return false;
+    spinning = true;
+    msg_id = lives_random();
+    ulong cbid = m_lives->addCallback(LIVES_CALLBACK_PRIVATE, private_cb, NULL); 
+    pthread_mutex_lock(&cond_mutex);
+    if (!idle_stop_playback(msg_id)) {
+      pthread_mutex_unlock(&cond_mutex);
+      spinning = false;
+      m_lives->removeCallback(cbid);
+      return false;
+    }
+    while (spinning) pthread_cond_wait(&cond_done, &cond_mutex);
+    pthread_mutex_unlock(&cond_mutex);
+    if (isValid()) {
+      bool ret = atoi(private_response);
+      lives_free(private_response);
+      return ret;
+    }
+    return false;
+  }
+
+
+  void player::setSepWin(bool setting) const {
+    if (!isValid()) return;
+    spinning = true;
+    msg_id = lives_random();
+    ulong cbid = m_lives->addCallback(LIVES_CALLBACK_PRIVATE, private_cb, NULL); 
+    pthread_mutex_lock(&cond_mutex);
+    if (!idle_set_sepwin(setting, msg_id)) {
+      pthread_mutex_unlock(&cond_mutex);
+      spinning = false;
+      m_lives->removeCallback(cbid);
+      return;
+    }
+    while (spinning) pthread_cond_wait(&cond_done, &cond_mutex);
+    pthread_mutex_unlock(&cond_mutex);
+    if (isValid()) {
+      lives_free(private_response);
+    }
+    return;
+  }
+
+
+  void player::setFullScreen(bool setting) const {
+    if (!isValid()) return;
+    spinning = true;
+    msg_id = lives_random();
+    ulong cbid = m_lives->addCallback(LIVES_CALLBACK_PRIVATE, private_cb, NULL); 
+    pthread_mutex_lock(&cond_mutex);
+    if (!idle_set_fullscreen(setting, msg_id)) {
+      pthread_mutex_unlock(&cond_mutex);
+      spinning = false;
+      m_lives->removeCallback(cbid);
+      return;
+    }
+    while (spinning) pthread_cond_wait(&cond_done, &cond_mutex);
+    pthread_mutex_unlock(&cond_mutex);
+    if (isValid()) {
+      lives_free(private_response);
+    }
+    return;
+  }
+
+
+  bool player::sepWin() const {
+    if (!isValid()) return false;
+    return mainw->sep_win;
+  }
+
+
+  bool player::fullScreen() const {
+    if (!isValid()) return false;
+    return mainw->fs;
+  }
+
+
+  bool player::setForegroundClip(clip c) const {
+    if (!isPlaying()) return false;
+    return c.switchTo();
+  }
+
+
+  bool player::setBackgroundClip(clip c) const {
+    if (!isPlaying()) return false;
+    return c.setIsBackground();
+  }
+
+  clip player::foregroundClip() const {
+    if (!isPlaying()) return clip();
+    if (m_lives->m_multitrack->isActive()) return clip();
+    if (mainw->files[mainw->playing_file] != NULL) return clip(mainw->files[mainw->playing_file]->unique_id, m_lives);
+    return clip();
+  }
+
+  clip player::backgroundClip() const {
+    if (!isPlaying()) return clip();
+    if (m_lives->m_multitrack->isActive()) return clip();
+    if (mainw->files[mainw->blend_file] != NULL) return clip(mainw->files[mainw->blend_file]->unique_id, m_lives);
+    return clip();
+  }
+
+  void player::setFS(bool setting) const {
+    if (!isValid()) return;
+    spinning = true;
+    msg_id = lives_random();
+    ulong cbid = m_lives->addCallback(LIVES_CALLBACK_PRIVATE, private_cb, NULL); 
+    pthread_mutex_lock(&cond_mutex);
+    if (!idle_set_fullscreen_sepwin(setting, msg_id)) {
+      pthread_mutex_unlock(&cond_mutex);
+      spinning = false;
+      m_lives->removeCallback(cbid);
+      return;
+    }
+    while (spinning) pthread_cond_wait(&cond_done, &cond_mutex);
+    pthread_mutex_unlock(&cond_mutex);
+    if (isValid()) {
+      lives_free(private_response);
+    }
+    return;
+  }
+
+
+  double player::videoPlaybackTime(bool background) const {
+    if (!isValid()) return 0.;
+
+    if (m_lives->status() == LIVES_STATUS_NOTREADY || m_lives->status() == LIVES_STATUS_PROCESSING) return 0.;
+
+    if (!m_lives->m_multitrack->isActive()) {
+      if (mainw->current_file == -1) return 0.;
+      if (mainw->playing_file > -1) {
+	if (!background) return (cfile->frameno - 1.)/cfile->fps;
+	else if (mainw->blend_file != -1 && mainw->blend_file != mainw->current_file && mainw->files[mainw->blend_file] != NULL) {
+	  return mainw->files[mainw->blend_file]->frameno;
+	}
+	else return 0.;
+      }
+      else return cfile->pointer_time;
+    }
+    else {
+      return lives_ruler_get_value(LIVES_RULER(mainw->multitrack->timeline));
+    }
+  }
+
+
+  double player::audioPlaybackTime() const {
+    if (!isValid()) return 0.;
+
+    if (m_lives->status() != LIVES_STATUS_NOTREADY || m_lives->status() == LIVES_STATUS_PROCESSING) return 0.;
+
+    if (!m_lives->m_multitrack->isActive()) {
+      if (mainw->current_file == -1) return 0.;
+      if (mainw->playing_file > -1) return (mainw->aframeno - 1.)/cfile->fps;
+      else return cfile->pointer_time;
+    }
+    else {
+      return lives_ruler_get_value(LIVES_RULER(mainw->multitrack->timeline));
+    }
+  }
+
+
+  double player::setAudioPlaybackTime(double time) const {
+    if (!isValid()) return 0.;
+    if (!m_lives->isPlaying()) return 0.;
+    if (!is_realtime_aplayer(::prefs->audio_player)) return 0.;
+    if (mainw->record && ::prefs->audio_src == AUDIO_SRC_EXT) return 0.;
+    if (mainw->multitrack != NULL) return 0.;
+    if (time<0. || time > cfile->laudio_time) return 0.;
+
+    spinning = true;
+    msg_id = lives_random();
+    ulong cbid = m_lives->addCallback(LIVES_CALLBACK_PRIVATE, private_cb, NULL);
+    pthread_mutex_lock(&cond_mutex);
+    if (!idle_set_current_audio_time(time, msg_id)) {
+      pthread_mutex_unlock(&cond_mutex);
+      spinning = false;
+      m_lives->removeCallback(cbid);
+    }
+    else {
+      while (spinning) pthread_cond_wait(&cond_done, &cond_mutex);
+      pthread_mutex_unlock(&cond_mutex);
+      if (isValid()) {
+	lives_free(private_response);
+      }
+    }
+    return audioPlaybackTime();
+  }
+
+
+  double player::setPlaybackStartTime(double time) const {
+    if (!isValid()) return 0.;
+    if (!m_lives->isReady()) return 0.;
+
+    spinning = true;
+    msg_id = lives_random();
+    ulong cbid = m_lives->addCallback(LIVES_CALLBACK_PRIVATE, private_cb, NULL);
+    pthread_mutex_lock(&cond_mutex);
+    if (!idle_set_current_time(time, msg_id)) {
+      pthread_mutex_unlock(&cond_mutex);
+      spinning = false;
+      m_lives->removeCallback(cbid);
+    }
+    else {
+      while (spinning) pthread_cond_wait(&cond_done, &cond_mutex);
+      pthread_mutex_unlock(&cond_mutex);
+      if (isValid()) {
+	lives_free(private_response);
+      }
+    }
+    return videoPlaybackTime();
+  }
+
+
+
+  int player::setVideoPlaybackFrame(int frame, bool bg) const {
+    if (!isValid()) return 0;
+
+    spinning = true;
+    msg_id = lives_random();
+    ulong cbid = m_lives->addCallback(LIVES_CALLBACK_PRIVATE, private_cb, NULL);
+    pthread_mutex_lock(&cond_mutex);
+    if (!idle_set_current_frame(frame, bg, msg_id)) {
+      pthread_mutex_unlock(&cond_mutex);
+      spinning = false;
+      m_lives->removeCallback(cbid);
+    }
+    else {
+      while (spinning) pthread_cond_wait(&cond_done, &cond_mutex);
+      pthread_mutex_unlock(&cond_mutex);
+      if (isValid()) {
+	lives_free(private_response);
+      }
+    }
+    return videoPlaybackTime();
+  }
+
+
+  double player::elapsedTime() const {
+    if (!isPlaying()) return 0.;
+    return mainw->currticks/U_SEC;
+  }
+
+
+  double player::currentFPS() const {
+    if (!isValid()) return 0.;
+    if (mainw->current_file == -1 || cfile == NULL) return 0.;
+    if (m_lives->status() != LIVES_STATUS_PLAYING && m_lives->status() != LIVES_STATUS_READY) return 0.;
+    return cfile->pb_fps;
+  }
+
+
+  double player::setCurrentFPS(double fps) const {
+    if (!isPlaying()) return 0.;
+
+    spinning = true;
+    msg_id = lives_random();
+    ulong cbid = m_lives->addCallback(LIVES_CALLBACK_PRIVATE, private_cb, NULL);
+    pthread_mutex_lock(&cond_mutex);
+    if (!idle_set_current_fps(fps, msg_id)) {
+      pthread_mutex_unlock(&cond_mutex);
+      spinning = false;
+      m_lives->removeCallback(cbid);
+    }
+    else {
+      while (spinning) pthread_cond_wait(&cond_done, &cond_mutex);
+      pthread_mutex_unlock(&cond_mutex);
+      if (isValid()) {
+	lives_free(private_response);
+      }
+    }
+    return currentFPS();
+  }
+
+
+  int player::currentAudioRate() const {
+    if (!isValid()) return 0.;
+    if (m_lives->status() != LIVES_STATUS_PLAYING && m_lives->status() != LIVES_STATUS_READY) return 0.;
+    if (mainw->current_file == -1 || cfile == NULL) return 0.;
+    return cfile->arps;
+  }
+
+
+  lives_loop_mode_t player::setLoopMode(lives_loop_mode_t mode) const {
+    if (!isValid()) return loopMode();
+    spinning = true;
+    msg_id = lives_random();
+    ulong cbid = m_lives->addCallback(LIVES_CALLBACK_PRIVATE, private_cb, NULL);
+    pthread_mutex_lock(&cond_mutex);
+    if (!idle_set_loop_mode(mode, msg_id)) {
+      pthread_mutex_unlock(&cond_mutex);
+      spinning = false;
+      m_lives->removeCallback(cbid);
+    }
+    else {
+      while (spinning) pthread_cond_wait(&cond_done, &cond_mutex);
+      pthread_mutex_unlock(&cond_mutex);
+      if (isValid()) {
+	lives_free(private_response);
+      }
+    }
+    return loopMode();
+  }
+
+
+  lives_loop_mode_t player::loopMode() const {
+    unsigned int lmode = LIVES_LOOP_MODE_NONE;
+    if (!isValid()) return (lives_loop_mode_t)lmode;
+
+    if (mainw->loop) lmode |= LIVES_LOOP_MODE_FIT_AUDIO;
+    if (mainw->loop_cont) lmode |= LIVES_LOOP_MODE_CONTINUOUS;
+
+    return (lives_loop_mode_t)lmode;
+  }
+
+
+
+  bool player::setPingPong(bool setting) const {
+    if (!isValid()) return pingPong();
+    spinning = true;
+    msg_id = lives_random();
+    ulong cbid = m_lives->addCallback(LIVES_CALLBACK_PRIVATE, private_cb, NULL);
+    pthread_mutex_lock(&cond_mutex);
+    if (!idle_set_ping_pong(setting, msg_id)) {
+      pthread_mutex_unlock(&cond_mutex);
+      spinning = false;
+      m_lives->removeCallback(cbid);
+    }
+    else {
+      while (spinning) pthread_cond_wait(&cond_done, &cond_mutex);
+      pthread_mutex_unlock(&cond_mutex);
+      if (isValid()) {
+	lives_free(private_response);
+      }
+    }
+    return pingPong();
+  }
+
+
+  bool player::pingPong() const {
+    if (!isValid()) return false;
+    return mainw->ping_pong;
+  }
+
+
+  bool player::resyncFPS() const {
+    if (!isPlaying()) return false;
+    spinning = true;
+    msg_id = lives_random();
+    ulong cbid = m_lives->addCallback(LIVES_CALLBACK_PRIVATE, private_cb, NULL);
+    pthread_mutex_lock(&cond_mutex);
+    if (!idle_resync_fps(msg_id)) {
+      pthread_mutex_unlock(&cond_mutex);
+      spinning = false;
+      m_lives->removeCallback(cbid);
+    }
+    else {
+      while (spinning) pthread_cond_wait(&cond_done, &cond_mutex);
+      pthread_mutex_unlock(&cond_mutex);
+      if (isValid()) {
+	lives_free(private_response);
+      }
+    }
+    return true;
+  }
+
+
+
+  //////////////// set ////////////////////
+
+
+  set::set(livesApp *lives) {
+    m_lives = lives;
+  }
+
+
+  bool set::isValid() const {
+    return m_lives != NULL && m_lives->isValid() && m_lives->status() != LIVES_STATUS_NOTREADY;
+  }
+
+
+  livesString set::name() const {
+    if (!isValid()) return livesString();
+    return livesString(get_set_name(), LIVES_CHAR_ENCODING_UTF8);
+  }
+
+
+  bool set::setName(livesString name) const {
+    if (!isValid()) return false;
+    if (strlen(mainw->set_name) > 0) return false;
+    if (numClips() == 0) return false;
+    
+    if (!name.empty()) {
+      const char *new_set_name = name.toEncoding(LIVES_CHAR_ENCODING_FILESYSTEM).c_str();
+      if (is_legal_set_name(new_set_name, TRUE)) {
+	lives_snprintf(mainw->set_name,128,"%s",new_set_name);
+	return true;
+      }
+      return false;
+    }
+
+    spinning = true;
+    msg_id = lives_random();
+    ulong cbid = m_lives->addCallback(LIVES_CALLBACK_PRIVATE, private_cb, NULL);
+    
+    pthread_mutex_lock(&cond_mutex);
+    if (!idle_set_set_name(msg_id)) {
+      pthread_mutex_unlock(&cond_mutex);
+      spinning = false;
+      m_lives->removeCallback(cbid);
+      return false;
+    }
+    while (spinning) pthread_cond_wait(&cond_done, &cond_mutex);
+    pthread_mutex_unlock(&cond_mutex);
+    if (isValid()) {
+      bool ret = (bool)atoi(private_response);
+      lives_free(private_response);
+      return ret;
+    }
+    return false;
+  }
+
+
+  unsigned int set::numClips() const {
+    if (!isValid()) return 0;
+    (const_cast<set *>(this))->update_clip_list();
+    return m_clips.size();
+  }
+
+
+  clip set::nthClip(unsigned int n) const {
+    if (!isValid()) return clip();
+    (const_cast<set *>(this))->update_clip_list();
+    if (n >= m_clips.size()) return clip();
+    return clip(m_clips[n], m_lives);
+  }
+
+
+  int set::indexOf(clip c) const {
+    if (!isValid()) return -1;
+    if (!c.isValid()) return -1;
+    (const_cast<set *>(this))->update_clip_list();
+    int i;
+    for (i = 0; i < m_clips.size(); i++) {
+      if (m_clips[i] == c.m_uid) return i;
+    }
+    return -1;
+  }
+
+
+  bool set::save(livesString name, bool force_append) const {
+    if (!isValid()) return FALSE;
+    const char *cname = name.toEncoding(LIVES_CHAR_ENCODING_FILESYSTEM).c_str();
+
+    spinning = true;
+    msg_id = lives_random();
+
+    ulong cbid = m_lives->addCallback(LIVES_CALLBACK_PRIVATE, private_cb, NULL); 
+
+    bool ret = false;
+
+    pthread_mutex_lock(&cond_mutex);
+    if (!idle_save_set(cname,force_append, msg_id)) {
+      pthread_mutex_unlock(&cond_mutex);
+      spinning = false;
+      m_lives->removeCallback(cbid);
+    }
+    else {
+      while (spinning) pthread_cond_wait(&cond_done, &cond_mutex);
+      pthread_mutex_unlock(&cond_mutex);
+      if (isValid()) {
+	ret = (bool)(atoi(private_response));
+	lives_free(private_response);
+      }
+    }
+    return ret;
+  }
+
+
+  bool set::save() const {
+    return save(name());
+  }
+
+
+
+  void set::update_clip_list() {
+    clipListIterator it = m_clips.begin();
+    while (it != m_clips.end()) {
+      it = m_clips.erase(it);
+    }
+    if (isValid()) {
+      ulong *ids = get_unique_ids();
+
+      for (int i=0; ids[i] != 0l; i++) {
+	m_clips.push_back(ids[i]);
+      }
+      lives_free(ids);
+      }
+  }
+
+
+  /////////////// clip ////////////////
+
+
+  clip::clip() : m_uid(0l), m_lives(NULL) {};
+
+  clip::clip(ulong uid, livesApp *lives) {
+    m_uid = uid;
+    m_lives = lives;
+  }
+
+  bool clip::isValid() const {
+    return (m_lives != NULL && m_lives->isValid() && m_lives->status() != LIVES_STATUS_NOTREADY && cnum_for_uid(m_uid) != -1);
+  }
+
+  int clip::frames() {
+    if (isValid()) {
+      int cnum = cnum_for_uid(m_uid);
+      if (cnum > -1 && mainw->files[cnum] != NULL) return mainw->files[cnum]->frames;
+    }
+    return 0;
+  }
+
+  int clip::width() {
+    if (isValid()) {
+      int cnum = cnum_for_uid(m_uid);
+      if (cnum > -1 && mainw->files[cnum] != NULL) return mainw->files[cnum]->hsize;
+    }
+    return 0;
+  }
+
+  int clip::height() {
+    if (isValid()) {
+      int cnum = cnum_for_uid(m_uid);
+      if (cnum > -1 && mainw->files[cnum] != NULL) return mainw->files[cnum]->vsize;
+    }
+    return 0;
+  }
+
+  double clip::FPS() {
+    if (isValid()) {
+      int cnum = cnum_for_uid(m_uid);
+      if (cnum > -1 && mainw->files[cnum] != NULL) return mainw->files[cnum]->fps;
+    }
+    return 0.;
+  }
+
+
+  double clip::playbackFPS() {
+    if (isValid()) {
+      if (!m_lives->m_multitrack->isActive()) {
+	int cnum = cnum_for_uid(m_uid);
+	if (cnum > -1 && mainw->files[cnum] != NULL) return mainw->files[cnum]->pb_fps;
+      }
+      else return m_lives->m_multitrack->FPS();
+    }
+    return 0.;
+  }
+
+
+  int clip::audioRate() {
+    if (isValid()) {
+      int cnum = cnum_for_uid(m_uid);
+      if (cnum > -1 && mainw->files[cnum] != NULL) return mainw->files[cnum]->arate;
+    }
+    return 0;
+  }
+
+
+  int clip::playbackAudioRate() {
+    int arps = -1;
+    if (isValid()) {
+      if (!m_lives->m_multitrack->isActive()) {
+	int cnum = cnum_for_uid(m_uid);
+	if (cnum > -1 && mainw->files[cnum] != NULL) {
+	  arps = mainw->files[cnum]->arps;
+	  arps *= mainw->files[cnum]->pb_fps / mainw->files[cnum]->fps;
+	}
+      }
+      else arps = mainw->files[mainw->multitrack->render_file]->arate;
+    }
+    return arps;
+  }
+
+
+  double clip::audioLength() {
+    if (isValid()) {
+      int cnum = cnum_for_uid(m_uid);
+      if (cnum > -1 && mainw->files[cnum] != NULL) return mainw->files[cnum]->laudio_time;
+    }
+    return 0.;
+  }
+
+
+  int clip::audioChannels() {
+    if (isValid()) {
+      int cnum = cnum_for_uid(m_uid);
+      if (cnum > -1 && mainw->files[cnum] != NULL) return mainw->files[cnum]->achans;
+    }
+    return 0;
+  }
+
+  int clip::audioSampleSize() {
+    if (isValid()) {
+      int cnum = cnum_for_uid(m_uid);
+      if (cnum > -1 && mainw->files[cnum] != NULL) return mainw->files[cnum]->asampsize;
+    }
+    return 0;
+  }
+
+  bool clip::audioSigned() {
+    if (isValid()) {
+      int cnum = cnum_for_uid(m_uid);
+      if (cnum > -1 && mainw->files[cnum] != NULL) return !(mainw->files[cnum]->signed_endian & AFORM_UNSIGNED);
+    }
+    return true;
+  }
+
+  lives_endian_t clip::audioEndian() {
+    if (isValid()) {
+      int cnum = cnum_for_uid(m_uid);
+      if (cnum > -1 && mainw->files[cnum] != NULL) {
+	if (mainw->files[cnum]->signed_endian & AFORM_BIG_ENDIAN) return LIVES_BIGENDIAN;
+      }
+    }
+    return LIVES_LITTLEENDIAN;
+  }
+
+  livesString clip::name() {
+    if (isValid()) {
+      int cnum = cnum_for_uid(m_uid);
+      if (cnum > -1 && mainw->files[cnum] != NULL) return livesString(get_menu_name(mainw->files[cnum]), LIVES_CHAR_ENCODING_UTF8);
+    }
+    return livesString();
+  }
+
+  int clip::selectionStart() {
+    if (isValid()) {
+      int cnum = cnum_for_uid(m_uid);
+      if (cnum > -1 && mainw->files[cnum] != NULL) return mainw->files[cnum]->start;
+    }
+    return 0;
+  }
+
+  int clip::selectionEnd() {
+    if (isValid()) {
+      int cnum = cnum_for_uid(m_uid);
+      if (cnum > -1 && mainw->files[cnum] != NULL) return mainw->files[cnum]->end;
+    }
+    return 0;
+  }
+
+
+  bool clip::selectAll() {
+    if (!isValid() || m_lives->status() == LIVES_STATUS_NOTREADY) return false;
+    spinning = true;
+    msg_id = lives_random();
+    ulong cbid = m_lives->addCallback(LIVES_CALLBACK_PRIVATE, private_cb, NULL);
+    
+    int cnum = cnum_for_uid(m_uid);
+    pthread_mutex_lock(&cond_mutex);
+    if (!idle_select_all(cnum, msg_id)) {
+      pthread_mutex_unlock(&cond_mutex);
+      spinning = false;
+      m_lives->removeCallback(cbid);
+      return false;
+    }
+    while (spinning) pthread_cond_wait(&cond_done, &cond_mutex);
+    pthread_mutex_unlock(&cond_mutex);
+    if (isValid()) {
+      bool ret = (bool)atoi(private_response);
+      lives_free(private_response);
+      return ret;
+    }
+    return false;
+  }
+
+
+
+  bool clip::setSelectionStart(unsigned int frame) {
+    if (!isValid()) return false;
+    spinning = true;
+    msg_id = lives_random();
+    ulong cbid = m_lives->addCallback(LIVES_CALLBACK_PRIVATE, private_cb, NULL);
+    
+    int cnum = cnum_for_uid(m_uid);
+    pthread_mutex_lock(&cond_mutex);
+    if (!idle_select_start(cnum, frame, msg_id)) {
+      pthread_mutex_unlock(&cond_mutex);
+      spinning = false;
+      m_lives->removeCallback(cbid);
+      return false;
+    }
+    while (spinning) pthread_cond_wait(&cond_done, &cond_mutex);
+    pthread_mutex_unlock(&cond_mutex);
+    if (isValid()) {
+      bool ret = (bool)atoi(private_response);
+      lives_free(private_response);
+      return ret;
+    }
+    return false;
+  }
+
+
+  bool clip::setSelectionEnd(unsigned int frame) {
+    if (!isValid()) return false;
+    spinning = true;
+    msg_id = lives_random();
+    ulong cbid = m_lives->addCallback(LIVES_CALLBACK_PRIVATE, private_cb, NULL);
+    
+    int cnum = cnum_for_uid(m_uid);
+    pthread_mutex_lock(&cond_mutex);
+    if (!idle_select_end(cnum, frame, msg_id)) {
+      pthread_mutex_unlock(&cond_mutex);
+      spinning = false;
+      m_lives->removeCallback(cbid);
+      return false;
+    }
+    while (spinning) pthread_cond_wait(&cond_done, &cond_mutex);
+    pthread_mutex_unlock(&cond_mutex);
+    if (isValid()) {
+      bool ret = (bool)atoi(private_response);
+      lives_free(private_response);
+      return ret;
+    }
+    return false;
+  }
+
+  
+  bool clip::switchTo() {
+    if (!isValid()) return false;
+    if (m_lives->m_multitrack->isActive()) return false;
+    spinning = true;
+    msg_id = lives_random();
+    ulong cbid = m_lives->addCallback(LIVES_CALLBACK_PRIVATE, private_cb, NULL);
+    
+    int cnum = cnum_for_uid(m_uid);
+    pthread_mutex_lock(&cond_mutex);
+    if (!idle_switch_clip(1,cnum, msg_id)) {
+      pthread_mutex_unlock(&cond_mutex);
+      spinning = false;
+      m_lives->removeCallback(cbid);
+      return false;
+    }
+    while (spinning) pthread_cond_wait(&cond_done, &cond_mutex);
+    pthread_mutex_unlock(&cond_mutex);
+    if (isValid()) {
+      bool ret = (bool)atoi(private_response);
+      lives_free(private_response);
+      return ret;
+    }
+    return false;
+  }
+
+
+  bool clip::setIsBackground() {
+    if (!isValid()) return false;
+    if (m_lives->m_multitrack->isActive()) return false;
+    spinning = true;
+    msg_id = lives_random();
+    ulong cbid = m_lives->addCallback(LIVES_CALLBACK_PRIVATE, private_cb, NULL);
+    
+    int cnum = cnum_for_uid(m_uid);
+    pthread_mutex_lock(&cond_mutex);
+    if (!idle_switch_clip(2,cnum, msg_id)) {
+      pthread_mutex_unlock(&cond_mutex);
+      spinning = false;
+      m_lives->removeCallback(cbid);
+      return false;
+    }
+    while (spinning) pthread_cond_wait(&cond_done, &cond_mutex);
+    pthread_mutex_unlock(&cond_mutex);
+    if (isValid()) {
+      bool ret = (bool)atoi(private_response);
+      lives_free(private_response);
+      return ret;
+    }
+    return false;
+  }
+
+  //////////////////////////////////////////////
+
+  //// effectKeyMap
+  effectKeyMap::effectKeyMap(livesApp *lives) {
+    m_lives = lives;
+  }
+
+
+  bool effectKeyMap::isValid() const {
+    return m_lives != NULL && m_lives->isValid() && m_lives->status() != LIVES_STATUS_NOTREADY;
+  }
+
+
+  effectKey effectKeyMap::at(int i) const {
+    return (*this)[i];
+  }
+
+  size_t effectKeyMap::size() const {
+    if (!isValid()) return 0;
+    return (size_t) prefs::rteKeysVirtual(*m_lives);
+  }
+
+  bool effectKeyMap::clear() const {
+    if (!isValid()) return false;
+    spinning = true;
+    msg_id = lives_random();
+    ulong cbid = m_lives->addCallback(LIVES_CALLBACK_PRIVATE, private_cb, NULL);
+    
+    pthread_mutex_lock(&cond_mutex);
+    if (!idle_unmap_effects(msg_id)) {
+      pthread_mutex_unlock(&cond_mutex);
+      spinning = false;
+      m_lives->removeCallback(cbid);
+      return false;
+    }
+    while (spinning) pthread_cond_wait(&cond_done, &cond_mutex);
+    pthread_mutex_unlock(&cond_mutex);
+    if (isValid()) {
+      bool ret = (bool)atoi(private_response);
+      lives_free(private_response);
+      return ret;
+    }
+    return false;
+  }
+
+
+  /////////////////////////////////////////////////
+
+  /// effectKey
+  effectKey::effectKey() {
+    m_key = 0;
+  }
+
+  effectKey::effectKey(livesApp *lives, int key) {
+    m_lives = lives;
+    m_key = key;
+  }
+
+  bool effectKey::isValid() const {
+    return m_lives != NULL && m_lives->isValid() && m_lives->status() != LIVES_STATUS_NOTREADY && 
+      m_key >= 1 && m_key <= prefs::rteKeysVirtual(*(m_lives));
+  }
+  
+  int effectKey::key() {
+    return m_key;
+  }
+
+
+  int effectKey::numModes() {
+    if (!isValid()) return 0;
+    return ::prefs->max_modes_per_key;
+  }
+
+  int effectKey::numMappedModes() {
+    if (!isValid()) return 0;
+    return get_num_mapped_modes_for_key(m_key);
+  }
+
+
+  int effectKey::currentMode() {
+    if (!isValid()) return -1;
+    return get_current_mode_for_key(m_key);
+  }
+
+  bool effectKey::enabled() {
+    if (!isValid()) return false;
+    return get_rte_key_is_enabled(m_key);
+  }
+
+
+  int effectKey::setCurrentMode(int new_mode) {
+    if (!isValid()) return -1;
+    if (new_mode < 0 || new_mode >= numMappedModes()) return currentMode();
+
+    if (new_mode == currentMode()) return currentMode();
+
+    spinning = true;
+    msg_id = lives_random();
+    ulong cbid = m_lives->addCallback(LIVES_CALLBACK_PRIVATE, private_cb, NULL);
+    
+    pthread_mutex_lock(&cond_mutex);
+    if (!idle_fx_setmode(m_key, new_mode, msg_id)) {
+      pthread_mutex_unlock(&cond_mutex);
+      spinning = false;
+      m_lives->removeCallback(cbid);
+      return currentMode();
+    }
+    while (spinning) pthread_cond_wait(&cond_done, &cond_mutex);
+    pthread_mutex_unlock(&cond_mutex);
+    if (isValid()) {
+      bool ret = (bool)atoi(private_response);
+      lives_free(private_response);
+    }
+    return currentMode();
+  }
+
+
+
+  bool effectKey::setEnabled(bool setting) {
+    if (!isValid()) return false;
+
+    spinning = true;
+    msg_id = lives_random();
+    ulong cbid = m_lives->addCallback(LIVES_CALLBACK_PRIVATE, private_cb, NULL);
+    
+    pthread_mutex_lock(&cond_mutex);
+    if (!idle_fx_enable(m_key, setting,  msg_id)) {
+      spinning = false;
+      m_lives->removeCallback(cbid);
+      return enabled();
+    }
+    while (spinning) pthread_cond_wait(&cond_done, &cond_mutex);
+    pthread_mutex_unlock(&cond_mutex);
+    if (isValid()) {
+      bool ret = (bool)atoi(private_response);
+      lives_free(private_response);
+
+      // TODO: if it was a generator, wait for playing or error
+
+
+    }
+    return enabled();
+  }
+
+
+
+  int effectKey::appendMapping(effect fx) {
+    if (!isValid()) return -1;
+
+    if (!fx.isValid()) return -1;
+
+    if (fx.m_lives != m_lives) return -1;
+
+    if (!m_lives->isReady() && !m_lives->isPlaying()) return -1;
+
+    int mode = numMappedModes();
+    if (mode == numModes()) return -1;
+
+    spinning = true;
+    msg_id = lives_random();
+    ulong cbid = m_lives->addCallback(LIVES_CALLBACK_PRIVATE, private_cb, NULL);
+    
+    pthread_mutex_lock(&cond_mutex);
+    if (!idle_map_fx(m_key, mode, fx.m_idx, msg_id)) {
+      pthread_mutex_unlock(&cond_mutex);
+      spinning = false;
+      m_lives->removeCallback(cbid);
+      return -1;
+    }
+    while (spinning) pthread_cond_wait(&cond_done, &cond_mutex);
+    pthread_mutex_unlock(&cond_mutex);
+    if (isValid()) {
+      bool ret = (bool)atoi(private_response);
+      lives_free(private_response);
+      if (ret) return mode;
+    }
+    return -1;
+  }
+
+
+  bool effectKey::removeMapping(int mode) {
+    if (!isValid()) return false;
+
+    if (!m_lives->isReady() && !m_lives->isPlaying()) return false;
+
+    if (mode >= numMappedModes()) return false;
+
+    spinning = true;
+    msg_id = lives_random();
+    ulong cbid = m_lives->addCallback(LIVES_CALLBACK_PRIVATE, private_cb, NULL);
+    
+    pthread_mutex_lock(&cond_mutex);
+    if (!idle_unmap_fx(m_key, mode, msg_id)) {
+      pthread_mutex_unlock(&cond_mutex);
+      spinning = false;
+      m_lives->removeCallback(cbid);
+      return false;
+    }
+    while (spinning) pthread_cond_wait(&cond_done, &cond_mutex);
+    pthread_mutex_unlock(&cond_mutex);
+    if (isValid()) {
+      bool ret = (bool)atoi(private_response);
+      lives_free(private_response);
+      return ret;
+    }
+    return false;
+  }
+
+
+  effect effectKey::at(int mode) {
+    effect e;
+    if (!isValid()) return e;
+    int idx = rte_keymode_get_filter_idx(m_key, mode);
+    if (idx == -1) return e;
+    e = effect(m_lives, idx);
+    return e;
+  }
+
+
+  ////////////////////////////////////////////////////////
+
+  effect::effect(const livesApp &lives, livesString hashname, bool match_full) {
+    m_idx = -1;
+    m_lives = (livesApp *)&lives;
+    if (m_lives != NULL && m_lives->isValid() && m_lives->status() != LIVES_STATUS_NOTREADY) {
+      m_idx = weed_get_idx_for_hashname(hashname.toEncoding(LIVES_CHAR_ENCODING_UTF8).c_str(), match_full);
+    }
+  }
+
+  effect::effect(const livesApp &lives, livesString package, livesString fxname, livesString author, int version) {
+    m_idx = -1;
+    m_lives = (livesApp *)&lives;
+    if (m_lives != NULL && m_lives->isValid() && m_lives->status() != LIVES_STATUS_NOTREADY) {
+      m_idx = get_first_fx_matched(package.toEncoding(LIVES_CHAR_ENCODING_UTF8).c_str(), 
+    				   fxname.toEncoding(LIVES_CHAR_ENCODING_UTF8).c_str(), 
+    				   author.toEncoding(LIVES_CHAR_ENCODING_UTF8).c_str(), 
+    				   version);
+    }
+  }
+
+  bool effect::isValid() const {
+    return (m_idx != -1 && m_lives != NULL && m_lives->isValid() && m_lives->status() != LIVES_STATUS_NOTREADY);
+  }
+
+
+  effect::effect() : m_lives(NULL), m_idx(-1) {}
+
+  effect::effect(livesApp *lives, int idx) : m_lives(lives), m_idx(idx) {}
+
+
+
+  ///////////////////////////////
+  //// block
+
+  block::block(multitrack *m, ulong uid) : m_uid(uid) {
+    if (m == NULL) m_lives = NULL;
+    else m_lives = m->m_lives;
+  }
+
+
+  block::block(multitrack m, int track, double time) {
+    m_lives = m.m_lives;
+    if (!m.isActive()) m_uid = 0l;
+    else {
+      track_rect *tr = get_block_from_track_and_time(mainw->multitrack, track, time);
+      if (tr == NULL) m_uid = 0l;
+      else m_uid = tr->uid;
+    }
+  }
+
+  bool block::isValid() const {
+    if (m_lives == NULL || !m_lives->isValid() || !m_lives->m_multitrack->isActive() || m_uid == 0l || 
+	find_block_by_uid(mainw->multitrack, m_uid) == NULL) return false;
+    return true;
+  }
+
+  void block::invalidate() {
+    m_uid = 0l;
+  }
+
+  double block::startTime() {
+    track_rect *tr = find_block_by_uid(mainw->multitrack, m_uid);
+    if (tr == NULL) return -1.;
+    return (double)get_event_timecode(tr->start_event)/U_SEC;
+  }
+
+  double block::length() {
+    track_rect *tr = find_block_by_uid(mainw->multitrack, m_uid);
+    if (tr == NULL) return -1.;
+    return (double)get_event_timecode(tr->end_event)/U_SEC + 1./mainw->multitrack->fps -
+      (double)get_event_timecode(tr->start_event)/U_SEC;
+  }
+
+  clip block::clipSource() {
+    track_rect *tr = find_block_by_uid(mainw->multitrack, m_uid);
+    if (tr == NULL) return clip();
+    int cnum = get_clip_for_block(tr);
+    if (cnum == -1) return clip();
+    return clip(mainw->files[cnum]->unique_id, m_lives);
+  }
+
+  int block::track() {
+    track_rect *tr = find_block_by_uid(mainw->multitrack, m_uid);
+    if (tr == NULL) return 0;
+    return get_track_for_block(tr);
+  }
+
+
+  bool block::remove() {
+    if (!isValid()) return false;
+    if (!m_lives->isReady()) return false;
+
+    track_rect *tr = find_block_by_uid(mainw->multitrack, m_uid);
+    if (tr == NULL) return false;
+
+    spinning = true;
+    msg_id = lives_random();
+    ulong cbid = m_lives->addCallback(LIVES_CALLBACK_PRIVATE, private_cb, NULL); 
+    pthread_mutex_lock(&cond_mutex);
+    if (!idle_remove_block(m_uid, msg_id)) {
+      pthread_mutex_unlock(&cond_mutex);
+      spinning = false;
+      m_lives->removeCallback(cbid);
+      return false;
+    }
+    while (spinning) pthread_cond_wait(&cond_done, &cond_mutex);
+    pthread_mutex_unlock(&cond_mutex);
+    if (isValid()) {
+      bool ret=(bool)atoi(private_response);
+      lives_free(private_response);
+      if (ret) invalidate();
+      return ret;
+   }
+    return false;
+  }
+
+
+  bool block::moveTo(int track, double time) {
+    if (!isValid()) return false;
+    if (!m_lives->isReady()) return false;
+
+    track_rect *tr = find_block_by_uid(mainw->multitrack, m_uid);
+    if (tr == NULL) return false;
+
+    spinning = true;
+    msg_id = lives_random();
+    ulong cbid = m_lives->addCallback(LIVES_CALLBACK_PRIVATE, private_cb, NULL); 
+    pthread_mutex_lock(&cond_mutex);
+    if (!idle_move_block(m_uid, track, time, msg_id)) {
+      pthread_mutex_unlock(&cond_mutex);
+      spinning = false;
+      m_lives->removeCallback(cbid);
+      return false;
+    }
+    while (spinning) pthread_cond_wait(&cond_done, &cond_mutex);
+    pthread_mutex_unlock(&cond_mutex);
+    if (isValid()) {
+      bool ret=(bool)atoi(private_response);
+      lives_free(private_response);
+      if (ret) invalidate();
+      return ret;
+   }
+    return false;
+  }
+
+
+
+  ///////////////////////////////////////////////////////////////////
+  /// multitrack
+
+  multitrack::multitrack(livesApp *lives) {
+    m_lives = lives;
+  }
+
+  bool multitrack::isValid() const {
+    return m_lives != NULL && m_lives->m_id != 0l && m_lives->status() != LIVES_STATUS_NOTREADY;
+  }
+
+
+  bool multitrack::isActive() const {
+    return (isValid() && mainw->multitrack != NULL);
+  }
+
+
+  double multitrack::currentTime() const {
+    if (!isActive()) return 0.;
+    return m_lives->m_player->videoPlaybackTime();
+  }
+
+
+  double multitrack::setCurrentTime(double time) const {
+    if (!isActive() || !m_lives->isReady()) return currentTime();
+    return m_lives->m_player->setPlaybackStartTime(time);
+  }
+
+
+  block multitrack::insertBlock(clip c, bool ign_sel, bool without_audio) const {
+    if (!isActive()) return block();
+    if (!c.isValid()) return block();
+    if (!m_lives->isReady()) return block();
+
+    int clipno = cnum_for_uid(c.m_uid);
+
+    spinning = true;
+    msg_id = lives_random();
+    ulong cbid = m_lives->addCallback(LIVES_CALLBACK_PRIVATE, private_cb, NULL); 
+    pthread_mutex_lock(&cond_mutex);
+    if (!idle_insert_block(clipno, ign_sel, !without_audio, msg_id)) {
+      pthread_mutex_unlock(&cond_mutex);
+      spinning = false;
+      m_lives->removeCallback(cbid);
+      return block();
+    }
+    while (spinning) pthread_cond_wait(&cond_done, &cond_mutex);
+    pthread_mutex_unlock(&cond_mutex);
+    if (isValid()) {
+      ulong uid = strtoul(private_response, NULL, 10);
+      lives_free(private_response);
+      return block(const_cast<multitrack *>(this), uid);
+   }
+    return block();
+  }
+
+
+
+  livesString multitrack::wipeLayout(bool force) const {
+    livesString emptystr;
+    if (!isActive()) return emptystr;
+    if (!m_lives->isReady()) return emptystr;
+
+    spinning = true;
+    msg_id = lives_random();
+    ulong cbid = m_lives->addCallback(LIVES_CALLBACK_PRIVATE, private_cb, NULL);
+    
+    pthread_mutex_lock(&cond_mutex);
+    if (!idle_wipe_layout(force,  msg_id)) {
+      pthread_mutex_unlock(&cond_mutex);
+      spinning = false;
+      m_lives->removeCallback(cbid);
+      return emptystr;
+    }
+    while (spinning) pthread_cond_wait(&cond_done, &cond_mutex);
+    pthread_mutex_unlock(&cond_mutex);
+    if (isValid()) {
+      livesString str(private_response, LIVES_CHAR_ENCODING_UTF8);
+      lives_free(private_response);
+      return str;
+    }
+    return emptystr;
+  }
+
+
+
+  livesString multitrack::chooseLayout() const {
+    livesString emptystr;
+    if (!isActive()) return emptystr;
+    if (!m_lives->isReady()) return emptystr;
+
+    spinning = true;
+    msg_id = lives_random();
+    ulong cbid = m_lives->addCallback(LIVES_CALLBACK_PRIVATE, private_cb, NULL);
+    
+    pthread_mutex_lock(&cond_mutex);
+    if (!idle_choose_layout(msg_id)) {
+      pthread_mutex_unlock(&cond_mutex);
+      spinning = false;
+      m_lives->removeCallback(cbid);
+      return emptystr;
+    }
+    while (spinning) pthread_cond_wait(&cond_done, &cond_mutex);
+    pthread_mutex_unlock(&cond_mutex);
+    if (isValid()) {
+      livesString str(private_response, LIVES_CHAR_ENCODING_UTF8);
+      lives_free(private_response);
+      return str;
+    }
+    return emptystr;
+  }
+
+
+  livesStringList multitrack::availableLayouts() const {
+    livesStringList list;
+    if (!isValid()) return list;
+    LiVESList *layoutlist=mainw->current_layouts_map;
+    while (layoutlist != NULL) {
+      char *data=repl_tmpdir((const char *)layoutlist->data, FALSE);
+      list.push_back(livesString(data, LIVES_CHAR_ENCODING_FILESYSTEM).toEncoding(LIVES_CHAR_ENCODING_UTF8));
+      lives_free(data);
+      layoutlist = layoutlist->next;
+    }
+    return list;
+  }
+
+
+  bool multitrack::reloadLayout(livesString layoutname) const {
+    if (!isActive()) return false;
+    if (!m_lives->isReady()) return false;
+
+    spinning = true;
+    msg_id = lives_random();
+    ulong cbid = m_lives->addCallback(LIVES_CALLBACK_PRIVATE, private_cb, NULL);
+    
+    pthread_mutex_lock(&cond_mutex);
+    if (!idle_reload_layout(layoutname.toEncoding(LIVES_CHAR_ENCODING_FILESYSTEM).c_str(), msg_id)) {
+      pthread_mutex_unlock(&cond_mutex);
+      spinning = false;
+      m_lives->removeCallback(cbid);
+      return false;
+    }
+    while (spinning) pthread_cond_wait(&cond_done, &cond_mutex);
+    pthread_mutex_unlock(&cond_mutex);
+    if (isValid()) {
+      bool ret = (bool)atoi(private_response);
+      lives_free(private_response);
+      return ret;
+    }
+    return false;
+  }
+
+
+  livesString multitrack::saveLayout(livesString name) const {
+    livesString emptystr;
+    if (!isActive()) return emptystr;
+    if (!m_lives->isReady()) return emptystr;
+
+    spinning = true;
+    msg_id = lives_random();
+    ulong cbid = m_lives->addCallback(LIVES_CALLBACK_PRIVATE, private_cb, NULL);
+    
+    pthread_mutex_lock(&cond_mutex);
+    if (!idle_save_layout(name.toEncoding(LIVES_CHAR_ENCODING_FILESYSTEM).c_str(), msg_id)) {
+      pthread_mutex_unlock(&cond_mutex);
+      spinning = false;
+      m_lives->removeCallback(cbid);
+      return emptystr;
+    }
+    while (spinning) pthread_cond_wait(&cond_done, &cond_mutex);
+    pthread_mutex_unlock(&cond_mutex);
+    if (isValid()) {
+      char *lname = strdup(private_response);
+      lives_free(private_response);
+      return livesString(lname).toEncoding(LIVES_CHAR_ENCODING_UTF8);
+    }
+    return emptystr;
+  }
+
+
+  livesString multitrack::saveLayout() const {
+    livesString emptystr;
+    if (!isActive()) return emptystr;
+    if (!m_lives->isReady()) return emptystr;
+
+    spinning = true;
+    msg_id = lives_random();
+    ulong cbid = m_lives->addCallback(LIVES_CALLBACK_PRIVATE, private_cb, NULL);
+    
+    pthread_mutex_lock(&cond_mutex);
+    if (!idle_save_layout(NULL, msg_id)) {
+      pthread_mutex_unlock(&cond_mutex);
+      spinning = false;
+      m_lives->removeCallback(cbid);
+      return emptystr;
+    }
+    while (spinning) pthread_cond_wait(&cond_done, &cond_mutex);
+    pthread_mutex_unlock(&cond_mutex);
+    if (isValid()) {
+      char *lname = strdup(private_response);
+      lives_free(private_response);
+      return livesString(lname).toEncoding(LIVES_CHAR_ENCODING_UTF8);
+    }
+    return emptystr;
+  }
+
+
+  clip multitrack::render(bool with_audio, bool normalise_audio) const {
+    clip c;
+    if (!isActive()) return c;
+    if (!m_lives->isReady()) return c;
+
+    spinning = true;
+    msg_id = lives_random();
+    ulong cbid = m_lives->addCallback(LIVES_CALLBACK_PRIVATE, private_cb, NULL);
+    
+    pthread_mutex_lock(&cond_mutex);
+    if (!idle_render_layout(with_audio, normalise_audio, msg_id)) {
+      pthread_mutex_unlock(&cond_mutex);
+      spinning = false;
+      m_lives->removeCallback(cbid);
+      return c;
+    }
+    while (spinning) pthread_cond_wait(&cond_done, &cond_mutex);
+    pthread_mutex_unlock(&cond_mutex);
+    if (isValid()) {
+      ulong uid = strtoul(private_response,NULL,10);
+      c = clip(uid, m_lives);
+      lives_free(private_response);
+    }
+    return c;
+  }
+
+
+  effect multitrack::autoTransition() const {
+    effect e;
+    if (!m_lives->isValid() || m_lives->status() == LIVES_STATUS_NOTREADY) return e;
+    if (::prefs->atrans_fx == -1) return e;
+    e = effect(m_lives, ::prefs->atrans_fx);
+    return e;
+  }
+
+
+  bool multitrack::setAutoTransition(effect autotrans) const {
+    if (!m_lives->isValid()) return false;
+    if (!autotrans.isValid()) return disableAutoTransition();
+
+    // check if is transition
+    if (get_transition_param(get_weed_filter(autotrans.m_idx), FALSE) == -1) return false;
+
+    if (m_lives->status() != LIVES_STATUS_READY && m_lives->status() != LIVES_STATUS_PLAYING) return false;
+    mt_set_autotrans(autotrans.m_idx);
+    return true;
+  }
+
+
+  bool multitrack::disableAutoTransition() const {
+    if (!m_lives->isValid()) return false;
+    if (m_lives->status() != LIVES_STATUS_READY && m_lives->status() != LIVES_STATUS_PLAYING) return false;
+    mt_set_autotrans(-1);
+    return true;
+  }
+
+
+  int multitrack::currentTrack() const {
+    if (!isActive()) return 0;
+    return mainw->multitrack->current_track;
+  }
+
+
+  bool multitrack::setCurrentTrack(int track) const {
+    if (m_lives->status() == LIVES_STATUS_PROCESSING) return false;
+    if (!isActive()) return false;
+
+    spinning = true;
+    msg_id = lives_random();
+    ulong cbid = m_lives->addCallback(LIVES_CALLBACK_PRIVATE, private_cb, NULL);
+    pthread_mutex_lock(&cond_mutex);
+    if (!idle_mt_set_track(track, msg_id)) {
+      pthread_mutex_unlock(&cond_mutex);
+      spinning = false;
+      m_lives->removeCallback(cbid);
+    }
+    else {
+      while (spinning) pthread_cond_wait(&cond_done, &cond_mutex);
+      pthread_mutex_unlock(&cond_mutex);
+      if (isValid()) {
+	bool ret=(bool)(atoi(private_response));
+	lives_free(private_response);
+	return ret;
+      }
+    }
+    return false;
+  }
+
+
+
+  livesString multitrack::trackLabel(int track) const {
+    livesString emptystr;
+    if (!isActive()) return emptystr;
+
+    if (mt_track_is_video(mainw->multitrack, track)) 
+      return livesString(get_track_name(mainw->multitrack, track, FALSE), LIVES_CHAR_ENCODING_UTF8); 
+    if (mt_track_is_audio(mainw->multitrack, track)) 
+      return livesString(get_track_name(mainw->multitrack, track, TRUE), LIVES_CHAR_ENCODING_UTF8); 
+
+    return emptystr;
+  }
+
+
+  double multitrack::FPS() const {
+    if (!isActive()) return 0.;
+    return mainw->multitrack->fps;
+  }
+
+
+
+  bool multitrack::setTrackLabel(int track, livesString label) const {
+    if (m_lives->status() == LIVES_STATUS_PROCESSING) return false;
+    if (!isActive()) return false;
+
+    spinning = true;
+    msg_id = lives_random();
+    ulong cbid = m_lives->addCallback(LIVES_CALLBACK_PRIVATE, private_cb, NULL);
+    pthread_mutex_lock(&cond_mutex);
+    if (!idle_set_track_label(track, label.toEncoding(LIVES_CHAR_ENCODING_UTF8).c_str(), msg_id)) {
+      pthread_mutex_unlock(&cond_mutex);
+      spinning = false;
+      m_lives->removeCallback(cbid);
+    }
+    else {
+      while (spinning) pthread_cond_wait(&cond_done, &cond_mutex);
+      pthread_mutex_unlock(&cond_mutex);
+      if (isValid()) {
+	bool ret=(bool)(atoi(private_response));
+	lives_free(private_response);
+	return ret;
+      }
+    }
+    return false;
+  }
+
+
+  lives_gravity_t multitrack::gravity() const {
+    if (!isActive()) return LIVES_GRAVITY_NORMAL;
+    switch (mainw->multitrack->opts.grav_mode) {
+    case GRAV_MODE_LEFT: return LIVES_GRAVITY_LEFT;
+    case GRAV_MODE_RIGHT: return LIVES_GRAVITY_RIGHT;
+    default: return LIVES_GRAVITY_NORMAL;
+    }
+
+  }
+
+
+  lives_gravity_t multitrack::setGravity(lives_gravity_t grav) const {
+    if (m_lives->status() == LIVES_STATUS_PROCESSING) return gravity();
+    if (!isActive()) return gravity();
+
+    spinning = true;
+    msg_id = lives_random();
+    ulong cbid = m_lives->addCallback(LIVES_CALLBACK_PRIVATE, private_cb, NULL);
+    pthread_mutex_lock(&cond_mutex);
+    if (!idle_set_gravity((int)grav, msg_id)) {
+      pthread_mutex_unlock(&cond_mutex);
+      spinning = false;
+      m_lives->removeCallback(cbid);
+    }
+    else {
+      while (spinning) pthread_cond_wait(&cond_done, &cond_mutex);
+      pthread_mutex_unlock(&cond_mutex);
+      if (isValid()) {
+	lives_free(private_response);
+      }
+    }
+    return gravity();
+  }
+
+
+  lives_insert_mode_t multitrack::insertMode() const {
+    if (!isActive()) return LIVES_INSERT_MODE_NORMAL;
+    switch (mainw->multitrack->opts.insert_mode) {
+    default: return LIVES_INSERT_MODE_NORMAL;
+    }
+
+  }
+
+
+  lives_insert_mode_t multitrack::setInsertMode(lives_insert_mode_t mode) const {
+    if (m_lives->status() == LIVES_STATUS_PROCESSING) return insertMode();
+    if (!isActive()) return insertMode();
+
+    spinning = true;
+    msg_id = lives_random();
+    ulong cbid = m_lives->addCallback(LIVES_CALLBACK_PRIVATE, private_cb, NULL);
+    pthread_mutex_lock(&cond_mutex);
+    if (!idle_set_insert_mode((int)mode, msg_id)) {
+      pthread_mutex_unlock(&cond_mutex);
+      spinning = false;
+      m_lives->removeCallback(cbid);
+    }
+    else {
+      while (spinning) pthread_cond_wait(&cond_done, &cond_mutex);
+      pthread_mutex_unlock(&cond_mutex);
+      if (isValid()) {
+	lives_free(private_response);
+      }
+    }
+    return insertMode();
+  }
+
+
+  int multitrack::numAudioTracks() const {
+    if (!isActive()) return 0;
+    return mainw->multitrack->opts.back_audio_tracks;
+  }
+
+
+  int multitrack::numVideoTracks() const {
+    if (!isActive()) return 0;
+    return mainw->multitrack->num_video_tracks;
+  }
+
+
+  int multitrack::addVideoTrack(bool in_front) const {
+    if (!isActive()) return -1;
+    if (m_lives->isReady()) return -1.;
+
+    spinning = true;
+    msg_id = lives_random();
+    ulong cbid = m_lives->addCallback(LIVES_CALLBACK_PRIVATE, private_cb, NULL);
+    pthread_mutex_lock(&cond_mutex);
+    if (!idle_insert_vtrack(in_front, msg_id)) {
+      pthread_mutex_unlock(&cond_mutex);
+      spinning = false;
+      m_lives->removeCallback(cbid);
+    }
+    else {
+      while (spinning) pthread_cond_wait(&cond_done, &cond_mutex);
+      pthread_mutex_unlock(&cond_mutex);
+      if (isValid()) {
+	int tnum = atoi(private_response);
+	lives_free(private_response);
+	return tnum;
+      }
+    }
+    return -1;
+  }
+
+
+  //////////////////////////////////////////////
+
+  ////// prefs
+  
+
+  namespace prefs {
+    livesString currentVideoLoadDir(const livesApp &lives) {
+      if (!lives.isValid() || lives.status() == LIVES_STATUS_NOTREADY) return livesString();
+      return livesString(mainw->vid_load_dir, LIVES_CHAR_ENCODING_UTF8);
+    }
+
+    livesString currentAudioDir(const livesApp &lives) {
+      if (!lives.isValid() || lives.status() == LIVES_STATUS_NOTREADY) return livesString();
+      return livesString(mainw->audio_dir, LIVES_CHAR_ENCODING_UTF8);
+    }
+
+    livesString tmpDir(const livesApp &lives) {
+      if (!lives.isValid() || lives.status() == LIVES_STATUS_NOTREADY) return livesString();
+      return livesString(::prefs->tmpdir, LIVES_CHAR_ENCODING_FILESYSTEM);
+    }
+
+    lives_audio_source_t audioSource(const livesApp &lives) {
+      if (!lives.isValid() || lives.status() == LIVES_STATUS_NOTREADY) return LIVES_AUDIO_SOURCE_UNKNOWN;
+      if (::prefs->audio_src == AUDIO_SRC_EXT) return LIVES_AUDIO_SOURCE_EXTERNAL;
+      return LIVES_AUDIO_SOURCE_INTERNAL;
+    }
+
+    bool setAudioSource(const livesApp &lives, lives_audio_source_t asrc) {
+      if (!lives.isReady()) return false;
+      return lives.setPref(PREF_REC_EXT_AUDIO, (bool)(asrc==LIVES_AUDIO_SOURCE_EXTERNAL));
+    }
+
+    lives_audio_player_t audioPlayer(const livesApp &lives) {
+      if (!lives.isValid() || lives.status() == LIVES_STATUS_NOTREADY) return LIVES_AUDIO_PLAYER_UNKNOWN;
+      if (::prefs->audio_player == AUD_PLAYER_SOX) return LIVES_AUDIO_PLAYER_SOX;
+      if (::prefs->audio_player == AUD_PLAYER_JACK) return LIVES_AUDIO_PLAYER_JACK;
+      if (::prefs->audio_player == AUD_PLAYER_PULSE) return LIVES_AUDIO_PLAYER_PULSE;
+      if (::prefs->audio_player == AUD_PLAYER_MPLAYER) return LIVES_AUDIO_PLAYER_MPLAYER;
+      if (::prefs->audio_player == AUD_PLAYER_MPLAYER2) return LIVES_AUDIO_PLAYER_MPLAYER2;
+    }
+
+    int audioPlayerRate(const livesApp &lives) {
+      if (!lives.isValid() || lives.status() == LIVES_STATUS_NOTREADY) return 0;
+#ifdef ENABLE_JACK
+      if (::prefs->audio_player == AUD_PLAYER_JACK && mainw->jackd != NULL) return mainw->jackd->sample_out_rate;
+#endif
+#ifdef HAVE_PULSE_AUDIO
+      if (::prefs->audio_player == AUD_PLAYER_PULSE && mainw->pulsed != NULL) return mainw->pulsed->out_arate;
+#endif
+      return 0;
+    }
+
+    bool isRealtimeAudioPlayer(lives_audio_player_t player_type) {
+      int ptype;
+      if (player_type == LIVES_AUDIO_PLAYER_SOX) ptype = AUD_PLAYER_SOX;
+      else if (player_type == LIVES_AUDIO_PLAYER_JACK) ptype = AUD_PLAYER_JACK;
+      else if (player_type == LIVES_AUDIO_PLAYER_PULSE) ptype = AUD_PLAYER_PULSE;
+      else if (player_type == LIVES_AUDIO_PLAYER_MPLAYER) ptype = AUD_PLAYER_MPLAYER;
+      else if (player_type == LIVES_AUDIO_PLAYER_MPLAYER2) ptype = AUD_PLAYER_MPLAYER2;
+      return is_realtime_aplayer(ptype);
+    }
+
+    int rteKeysVirtual(const livesApp &lives) {
+      if (!lives.isValid() || lives.status() == LIVES_STATUS_NOTREADY) return 0;
+      return ::prefs->rte_keys_virtual;
+    }
+
+    double maxFPS(const livesApp &lives) {
+      if (!lives.isValid() || lives.status() == LIVES_STATUS_NOTREADY) return 0.;
+      return FPS_MAX;
+    }
+
+    bool audioFollowsVideoChanges(const livesApp &lives) {
+      if (!lives.isValid() || lives.status() == LIVES_STATUS_NOTREADY) return false;
+      return ::prefs->audio_opts & AUDIO_OPTS_FOLLOW_CLIPS;
+    }
+
+    bool audioFollowsFPSChanges(const livesApp &lives) {
+      if (!lives.isValid() || lives.status() == LIVES_STATUS_NOTREADY) return false;
+      return ::prefs->audio_opts & AUDIO_OPTS_FOLLOW_FPS;
+    }
+
+    bool setAudioFollowsVideoChanges(const livesApp &lives, bool setting) {
+      if (!lives.isValid() || lives.status() == LIVES_STATUS_NOTREADY) return false;
+      return lives.setPref(PREF_AUDIO_OPTS, AUDIO_OPTS_FOLLOW_CLIPS, setting);
+    }
+
+    bool setAudioFollowsFPSChanges(const livesApp &lives, bool setting) {
+      if (!lives.isValid() || lives.status() == LIVES_STATUS_NOTREADY) return false;
+      return lives.setPref(PREF_AUDIO_OPTS, AUDIO_OPTS_FOLLOW_FPS, setting);
+    }
+
+    bool sepWinSticky(const livesApp &lives) {
+      if (!lives.isValid() || lives.status() == LIVES_STATUS_NOTREADY) return false;
+      return ::prefs->sepwin_type==SEPWIN_TYPE_STICKY;
+    }
+
+    bool setSepWinSticky(const livesApp &lives, bool setting) {
+      if (!lives.isValid() || lives.status() == LIVES_STATUS_NOTREADY) return false;
+      return lives.setPref(PREF_SEPWIN_STICKY, setting);
+    }
+
+    bool mtExitRender(const livesApp &lives) {
+      if (!lives.isValid() || lives.status() == LIVES_STATUS_NOTREADY) return false;
+      return ::prefs->mt_exit_render;
+    }
+
+    bool setMtExitRender(const livesApp &lives, bool setting) {
+      if (!lives.isValid() || lives.status() == LIVES_STATUS_NOTREADY) return false;
+      return lives.setPref(PREF_MT_EXIT_RENDER, setting);
+    }
+
+    
+
+
+  }
+
+
+}
+
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+#ifndef DOXYGEN_SKIP
+
+void binding_cb (lives_callback_t cb_type, const char *msgstring, ulong id) {
+  bool ret;
+  lives::livesApp *lapp;
+
+  if (cb_type == LIVES_CALLBACK_OBJECT_DESTROYED) lapp = (lives::livesApp *)id;
+  else lapp = lives::find_instance_for_id(id);
+
+  if (lapp == NULL) return;
+
+  pthread_mutex_lock(&spin_mutex); // lock mutex so that new callbacks cannot be added yet
+
+  lives::closureList cl = lapp->closures();
+
+  lives::closureListIterator it = cl.begin();
+  while (it != cl.end()) {
+
+    if ((*it)->cb_type == cb_type) {
+      switch (cb_type) {
+      case LIVES_CALLBACK_MODE_CHANGED:
+	{
+	  lives::modeChangedInfo info;
+	  info.mode = (lives_interface_mode_t)atoi(msgstring);
+	  lives::modeChanged_callback_f fn = (lives::modeChanged_callback_f)((*it)->func);
+	  ret = (fn)((*it)->object, &info, (*it)->data);
+	}
+	break;
+      case LIVES_CALLBACK_APP_QUIT:
+	{
+	  // TODO !! test
+	  lives::appQuitInfo info;
+	  info.signum = atoi(msgstring);
+	  lives::appQuit_callback_f fn = (lives::appQuit_callback_f)((*it)->func);
+	  lapp->invalidate();
+	  ret = (fn)((*it)->object, &info, (*it)->data);
+	  spinning = false;
+	}
+	break;
+      case LIVES_CALLBACK_OBJECT_DESTROYED:
+	{
+	  lives::objectDestroyed_callback_f fn = (lives::objectDestroyed_callback_f)((*it)->func);
+	  ret = (fn)((*it)->object, (*it)->data);
+	}
+	break;
+      case LIVES_CALLBACK_PRIVATE:
+	{
+	  // private event type
+	  lives::_privateInfo info;
+	  char *endptr;
+	  info.id = strtoul(msgstring,&endptr,10);
+	  info.response = endptr+1;
+	  lives::private_callback_f fn = (lives::private_callback_f)((*it)->func);
+	  ret = (fn)(&info, (*it)->data);
+	}
+	break;
+      default:
+	continue;
+      }
+      if (!ret) {
+	delete *it;
+	it = cl.erase(it);
+	lapp->setClosures(cl);
+	continue;
+      }
+    }
+    ++it;
+  }
+
+  pthread_mutex_unlock(&spin_mutex);
+
+}
+
+#endif // doxygen_skip

LiVES-2.4.1.tar.bz2/src/liblives.hpp Added

@@ -0,0 +1,2183 @@
+// liblives.hpp
+// LiVES (lives-exe)
+// (c) G. Finch <salsaman@gmail.com> 2015
+// Released under the GPL 3 or later
+// see file ../COPYING for licensing details
+
+/** \file liblives.hpp
+    Header file for liblives.
+ */
+
+#ifndef HAS_LIBLIVES_H
+#define HAS_LIBLIVES_H
+
+/**
+   Version number major
+*/
+#define LIVES_VERSION_MAJOR 2
+
+/**
+   Version number minor
+*/
+#define LIVES_VERSION_MINOR 4
+
+/**
+   Version number micro
+*/
+#define LIVES_VERSION_MICRO 1
+
+/**
+   Macro to check if livesApp version is >= major.minor.micro
+*/
+#define LIVES_CHECK_VERSION(major, minor, micro) (major > LIVES_VERSION_MAJOR || (major == LIVES_VERSION_MAJOR && (minor > LIVES_VERSION_MINOR || (minor == LIVES_VERSION_MINOR && micro >= LIVES_VERSION_MICRO)))) ///< 
+
+
+// defs shared with lbindings.c
+
+/**
+   Filechooser hinting types
+*/
+typedef enum {
+  LIVES_FILE_CHOOSER_VIDEO_AUDIO,  ///< file chooser options for single video or audio file
+  LIVES_FILE_CHOOSER_AUDIO_ONLY, ///< file chooser options for single audio file
+  //  LIVES_FILE_CHOOSER_VIDEO_AUDIO_MULTI, ///< file chooser options for multiple video or audio files
+  //LIVES_FILE_CHOOSER_VIDEO_RANGE ///< file chooser options for video range (start time/number of frames)
+} lives_filechooser_t;
+
+/**
+   LiVES operation mode
+*/
+typedef enum {
+  LIVES_INTERFACE_MODE_INVALID=-1, ///< livesApp instance is invalid
+  LIVES_INTERFACE_MODE_CLIPEDIT, ///< clip editor mode
+  LIVES_INTERFACE_MODE_MULTITRACK ///< multitrack mode
+} lives_interface_mode_t;
+
+
+/**
+   LiVES operational status
+*/
+typedef enum {
+  LIVES_STATUS_INVALID=-1, ///< livesApp instance is invalid
+  LIVES_STATUS_NOTREADY, ///< application is starting up; not ready
+  LIVES_STATUS_READY, ///< application is ready for commands
+  LIVES_STATUS_PLAYING, ///< application is playing, only player commands will be responded to
+  LIVES_STATUS_PROCESSING, ///< application is processing, commands will be ignored
+  LIVES_STATUS_PREVIEW ///< user is previewing an operation, commands will be ignored
+} lives_status_t;
+
+
+/**
+   Endian values
+*/
+typedef enum {
+  LIVES_LITTLEENDIAN,
+  LIVES_BIGENDIAN
+} lives_endian_t;
+
+
+/**
+   Callback types
+*/
+typedef enum {
+  LIVES_CALLBACK_FRAME_SYNCH = 1, ///< sent when a frame is displayed
+  LIVES_CALLBACK_PLAYBACK_STARTED = 2,  ///< sent when a/v playback starts or clip is switched
+  LIVES_CALLBACK_PLAYBACK_STOPPED = 3, ///< sent when a/v playback ends
+  /// sent when a/v playback ends and there is recorded data for 
+  /// rendering/previewing
+  LIVES_CALLBACK_PLAYBACK_STOPPED_RD = 4,
+
+  LIVES_CALLBACK_RECORD_STARTED = 32, ///< sent when record starts (TODO)
+  LIVES_CALLBACK_RECORD_STOPPED = 33, ///< sent when record stops (TODO)
+
+  LIVES_CALLBACK_APP_QUIT = 64, ///< sent when app quits
+
+  LIVES_CALLBACK_CLIP_OPENED = 128, ///< sent after a clip is opened
+  LIVES_CALLBACK_CLIP_CLOSED = 129, ///< sent after a clip is closed
+
+
+  LIVES_CALLBACK_CLIPSET_OPENED = 256, ///< sent after a clip set is opened
+  LIVES_CALLBACK_CLIPSET_SAVED = 257, ///< sent after a clip set is closed
+
+  LIVES_CALLBACK_MODE_CHANGED = 4096, ///< sent when interface mode changes
+
+  LIVES_CALLBACK_OBJECT_DESTROYED = 16384, ///< sent when livesApp object is deleted
+
+#ifndef DOXYGEN_SKIP
+  LIVES_CALLBACK_PRIVATE = 32768 ///< for internal use
+#endif
+} lives_callback_t;
+
+
+
+/**
+   Character encoding types
+*/
+typedef enum {
+  LIVES_CHAR_ENCODING_UTF8, ///< UTF-8 char encoding
+  LIVES_CHAR_ENCODING_LOCAL8BIT, ///< 8 bit locale file encoding
+  LIVES_CHAR_ENCODING_FILESYSTEM, ///< file system encoding (UTF-8 on windows, local8bit on others)
+  //LIVES_CHAR_ENCODING_UTF16, ///< UTF-16 char encoding
+} lives_char_encoding_t;
+
+/**
+   Default character encoding
+*/
+#define LIVES_CHAR_ENCODING_DEFAULT LIVES_CHAR_ENCODING_UTF8
+
+/**
+   Dialog response values
+*/
+typedef enum {
+// positive values for custom responses
+  LIVES_DIALOG_RESPONSE_INVALID=-1, ///< INVALID response
+  LIVES_DIALOG_RESPONSE_NONE=0, ///< Response not obtained
+  LIVES_DIALOG_RESPONSE_OK, ///< OK button clicked
+  LIVES_DIALOG_RESPONSE_RETRY, ///< Retry button clicked
+  LIVES_DIALOG_RESPONSE_ABORT, ///< Abort button clicked
+  LIVES_DIALOG_RESPONSE_RESET, ///< Reset button clicked
+  LIVES_DIALOG_RESPONSE_SHOW_DETAILS, ///< Show details button clicked
+  LIVES_DIALOG_RESPONSE_CANCEL, ///< Cancel button clicked
+  LIVES_DIALOG_RESPONSE_ACCEPT, ///< Accept button clicked
+  LIVES_DIALOG_RESPONSE_YES, ///< Yes button clicked
+  LIVES_DIALOG_RESPONSE_NO ///< No button clicked
+} lives_dialog_response_t;
+
+
+/**
+   Audio sources
+*/
+typedef enum {
+  LIVES_AUDIO_SOURCE_UNKNOWN, ///< Unknown / invalid
+  LIVES_AUDIO_SOURCE_INTERNAL, ///< Audio source is internal to LiVES
+  LIVES_AUDIO_SOURCE_EXTERNAL ///< Audio source is external to LiVES
+} lives_audio_source_t;
+
+
+/**
+   Audio players
+*/
+typedef enum {
+  LIVES_AUDIO_PLAYER_UNKNOWN, ///< Unknown / invalid
+  LIVES_AUDIO_PLAYER_PULSE, ///< Audio playback is through PulseAudio
+  LIVES_AUDIO_PLAYER_JACK, ///< Audio playback is thorugh Jack
+  LIVES_AUDIO_PLAYER_SOX, ///< Audio playback is through Sox
+  LIVES_AUDIO_PLAYER_MPLAYER, ///< Audio playback is through mplayer
+  LIVES_AUDIO_PLAYER_MPLAYER2 ///< Audio playback is through mplayer2
+} lives_audio_player_t;
+
+
+
+/**
+   Multitrack insert modes
+*/
+typedef enum {
+  LIVES_INSERT_MODE_NORMAL
+} lives_insert_mode_t;
+
+
+
+/**
+   Multitrack gravity
+*/
+typedef enum {
+  LIVES_GRAVITY_NORMAL, ///< no gravity
+  LIVES_GRAVITY_LEFT, ///< inserted blocks gravitate to the left
+  LIVES_GRAVITY_RIGHT ///< inserted blocks gravitate to the right
+} lives_gravity_t;
+
+
+
+/**
+   Player looping modes (bitmap)
+*/
+typedef enum {
+  LIVES_LOOP_MODE_NONE=0, ///< no looping
+  LIVES_LOOP_MODE_CONTINUOUS=1, ///< both video and audio loop continuously
+  LIVES_LOOP_MODE_FIT_AUDIO=2 ///< video keeps looping until audio playback finishes
+} lives_loop_mode_t;
+
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+#ifdef __cplusplus
+
+#include <vector>
+#include <list>
+#include <map>
+
+#include <inttypes.h>
+
+#include <string>
+
+/**
+   typedef
+*/
+typedef unsigned long ulong;
+
+
+#ifndef DOXYGEN_SKIP
+extern "C" {
+  void binding_cb (lives_callback_t cb_type, const char *msgstring, uint64_t id);
+}
+#endif
+
+using namespace std;
+
+/////////////////////////////////////////////////////////////////////////////////////////////////////
+
+
+
+
+
+/**
+   lives namespace.
+*/
+namespace lives {
+
+  ////////////////////////////////////////////////////
+
+  /**
+     typedef
+  */
+  typedef class livesApp livesApp;
+
+  /**
+    typedef
+  */
+  typedef class set set;
+
+  /**
+     typedef
+  */
+  typedef class clip clip;
+
+  /**
+     typedef
+  */
+  typedef class effectKey effectKey;
+
+  /**
+     typedef
+  */
+  typedef class effectKeyMap effectKeyMap;
+
+  /**
+     typedef
+  */
+  typedef class effect effect;
+
+
+  /**
+     typedef
+  */
+  typedef class player player;
+
+
+  /**
+     typedef
+  */
+  typedef class multitrack multitrack;
+
+
+  /**
+     typedef
+  */
+  typedef class block block;
+
+
+  /**
+     typedef
+  */
+  typedef class livesString livesString;
+
+
+  /**
+     typedef
+  */
+  typedef list<livesString> livesStringList;
+
+
+  ///////////////////////////////////////////////////
+
+
+  /**
+     class "livesString". 
+     A subclass of std::string which automatically handles various character encodings.
+  */
+  class livesString : public std::string {
+  public:
+    livesString(const string& str="", lives_char_encoding_t e=LIVES_CHAR_ENCODING_DEFAULT) : m_encoding(e), std::string(str) {}
+    livesString(const string& str, size_t pos, size_t len = npos, lives_char_encoding_t e=LIVES_CHAR_ENCODING_DEFAULT) : m_encoding(e),
+      std::string(str, pos, len) {}
+    livesString(const char* s, lives_char_encoding_t e=LIVES_CHAR_ENCODING_DEFAULT) : m_encoding(e), std::string(s) {}
+    livesString(const char* s, size_t n, lives_char_encoding_t e=LIVES_CHAR_ENCODING_DEFAULT) : m_encoding(e), std::string(s, n) {}
+    livesString(size_t n, char c, lives_char_encoding_t e=LIVES_CHAR_ENCODING_DEFAULT) : m_encoding(e), std::string(n, c) {}
+    template <class InputIterator>
+    livesString  (InputIterator first, InputIterator last, 
+		  lives_char_encoding_t e=LIVES_CHAR_ENCODING_DEFAULT) : m_encoding(e), std::string(first, last) {}
+
+    /**
+       Change the character encoding of the string.
+       @param enc the character encoding to convert to.
+       @return either the same string if no conversion is needed, or a new string if conversion is needed
+    */
+    livesString toEncoding(lives_char_encoding_t enc);
+
+    /**
+       Define the character encoding of the string.
+       @param enc the character encoding the string is in.
+    */
+    void setEncoding(lives_char_encoding_t enc);
+
+    /**
+       Return the encoding that the string was declared as.
+       @return the character encoding the string is in.
+    */
+    lives_char_encoding_t encoding();
+
+  private:
+    lives_char_encoding_t m_encoding;
+  };
+
+#ifndef DOXYGEN_SKIP
+  typedef void *(*callback_f)(void *);
+
+  typedef struct {
+    ulong id;
+    livesApp *object;
+    lives_callback_t cb_type;
+    callback_f func;
+    void *data;
+  } closure;
+
+  typedef list<closure *> closureList;
+  typedef list<closure *>::iterator closureListIterator;
+#endif
+
+  /**
+     Struct passed to modeChanged callback.
+  */
+  typedef struct {
+    lives_interface_mode_t mode; ///< mode changed to
+  } modeChangedInfo;
+
+
+  /**
+     Struct passed to appQuit callback.
+  */
+  typedef struct {
+    int signum; ///< signal which caused the app to exit, or 0 if the user or script quit normally.
+  } appQuitInfo;
+
+
+#ifndef DOXYGEN_SKIP
+  typedef struct {
+    ulong id;
+    char *response;
+  } _privateInfo;
+
+
+  typedef bool (*private_callback_f)(_privateInfo *, void *);
+#endif
+
+  /**
+     Type of callback function for LIVES_CALLBACK_MODE_CHANGED.
+     @see LIVES_CALLBACK_MODE_CHANGED
+     @see livesApp::addCallback(lives_callback_t cb_type, modeChanged_callback_f func, void *data)
+  */
+  typedef bool (*modeChanged_callback_f)(livesApp *, modeChangedInfo *, void *);
+
+  /**
+     Type of callback function for LIVES_CALLBACK_APP_QUIT.
+     @see LIVES_CALLBACK_APP_QUIT
+     @see livesApp::addCallback(lives_callback_t cb_type, appQuit_callback_f func, void *data)
+  */
+  typedef bool (*appQuit_callback_f)(livesApp *, appQuitInfo *, void *);
+
+
+  /**
+     Type of callback function for LIVES_CALLBACK_OBJECT_DESTROYED.
+     @see LIVES_CALLBACK_OBJECT_DESTROYED
+     @see livesApp::addCallback(lives_callback_t cb_type, objectDestroyed_callback_f func, void *data)
+  */
+  typedef bool (*objectDestroyed_callback_f)(livesApp *, void *);
+
+
+
+  /**
+     class "livesApp". 
+     Represents a single LiVES application. Note that currently only one such instance can be valid at a time, 
+     attempting to create a second concurrent instance will return an invalid instance.
+  */
+  class livesApp {
+    friend set;
+    friend clip;
+    friend effectKeyMap;
+    friend effectKey;
+    friend player;
+    friend multitrack;
+    friend block;
+
+  public:
+    /**
+       Constructor with no arguments.
+    */
+    livesApp();
+
+    /**
+       Constructor with argc, argv arguments.
+       argv array is equivalent to commandline options passed to the LiVES application.
+       @param argc count of number of arguments
+       @param argv[] array of options.
+    */
+    livesApp(int argc, char *argv[]);
+
+    /**
+       Destructor: closes the LiVES application.
+       Deletes any callbacks which were set for this instance.
+    */
+    ~livesApp();
+
+    /**
+       Returns whether the instance is valid or not.
+       A valid instance is connected to a running LiVES application.
+       @return true if instance is connected to a running LiVES application.
+    */
+    bool isValid() const;
+
+    /**
+       @return true if status() == LIVES_STATUS_READY.
+       @see status().
+    */
+    bool isReady() const;
+
+    /**
+       Equivalent to status() == LIVES_STATUS_PLAYING.
+       @return true if status() == LIVES_STATUS_PLAYING.
+       @see status().
+    */
+    bool isPlaying() const;
+
+    /**
+       @return the current set.
+    */
+    const set& getSet();
+
+    /**
+       @return the current effectKeyMap.
+    */
+    const effectKeyMap& getEffectKeyMap();
+
+    /**
+       @return the player for this livesApp.
+    */
+    const player& getPlayer();
+
+    /**
+       @return the multitrack object for this livesApp.
+    */
+    const multitrack& getMultitrack();
+
+    /**
+       Remove a previously added callback.
+       @param id value previously returned from addCallback.
+       @return true if playback was stopped.
+    */
+    bool removeCallback(ulong id) const;
+
+    /**
+       Add a modeChanged callback.
+       @param cb_type must have value LIVES_CALLBACK_MODE_CHANGED.
+       @param func function to be called when this signal is received.
+       @param data data to be passed to callback function
+       @return unsigned long callback_id
+       @see LIVES_CALLBACK_MODE_CHANGED
+       @see removeCallback().
+    */
+    ulong addCallback(lives_callback_t cb_type, modeChanged_callback_f func, void *data) const;
+
+    /**
+       Add an appQuit callback.
+       @param cb_type must have value LIVES_CALLBACK_APP_QUIT
+       @param func function to be called when this signal is received.
+       @param data data to be passed to callback function
+       @return unsigned long callback_id
+       @see LIVES_CALLBACK_APP_QUIT
+       @see removeCallback().
+    */
+    ulong addCallback(lives_callback_t cb_type, appQuit_callback_f func, void *data) const;
+
+    /**
+       Add an objectDestroyed callback.
+       @param cb_type must have value LIVES_CALLBACK_OBJECT_DESTROYED
+       @param func function to be called when this signal is received.
+       @param data data to be passed to callback function
+       @return unsigned long callback_id
+       @see LIVES_CALLBACK_OBJECT_DESTROYED
+       @see removeCallback().
+    */
+    ulong addCallback(lives_callback_t cb_type, objectDestroyed_callback_f func, void *data) const;
+
+    /**
+       Show Info dialog in the LiVES GUI.
+       Only has an effect when status() is LIVES_STATUS_READY.
+       @param text text to be diaplayed in the dialog.
+       @param blocking if true then function will block until the user presses "OK"
+       @return if blocking, returns the response code from the dialog.
+    */
+    lives_dialog_response_t showInfo(livesString text, bool blocking=true);
+
+   /**
+       Allow the user choose a file via a fileselector.
+       Only has an effect when status() is LIVES_STATUS_READY, otherwise returns an empty livesString.
+       After returning, the setting that the user selected for deinterlace may be obtained by calling 
+       deinterlaceOption(). This value can the be passed into openFile().
+       Chooser type will direct the user towards the type of file to choose, however there is no guarantee 
+       that a file of the "correct" type will be returned. If the user cancels then an empty livesString will be returned.
+       @param dirname directory name to start in (or NULL)
+       @param chooser_type must be either LIVES_FILE_CHOOSER_VIDEO_AUDIO or LIVES_FILE_CHOOSER_AUDIO_ONLY.
+       @param title title of window to display, or NULL to use a default title.
+       @return the name of the file selected.
+       @see openFile().
+    */
+    livesString chooseFileWithPreview(livesString dirname, lives_filechooser_t chooser_type, livesString title=livesString(""));
+
+   /**
+      Open a file and return a clip for it.
+      Only works when status() is LIVES_STATUS_READY, otherwise an invalid clip is returned.
+      If the file pointed to cannot be opened as a clip, an invalid clip is returned.
+      If interactive() is true, the user may cancel the load, or choose to load only part of the file.
+      @param fname the full pathname of the file to open
+      @param with_audio if true the audio will be loaded as well as the video
+      @param stime the time in seconds from which to start loading
+      @param frames number of frames to open (0 means all frames)
+      @param deinterlace set to true to force deinterlacing
+      @return a clip.
+      @see chooseFileWithPreview().
+      @see deinterlaceOption().
+    */
+    clip openFile(livesString fname, bool with_audio=true, double stime=0., int frames=0, bool deinterlace=false);
+
+    /**
+       Returns a list of available sets. The list returned depends on the setting of prefs::tmpDir().
+       This may be an expensive operation as it requires accessing the underlying filesystem.
+       If the set is invalid, an empty livesStringList is returned.
+       @return a list<livesString> of set names.
+       @see reloadSet().
+       @see set::save().
+    */
+    livesStringList availableSets();
+
+   /**
+       Allow the user to choose a set to open.
+       Only has an effect when status() is LIVES_STATUS_READY, and there are no currently open clips, 
+       otherwise returns an empty livesString.
+       If the user cancels, an empty livesString is returned.
+       The valid list of sets to choose from will be equivalent to the list returned by availableSets().
+       @return the name of the set selected.
+       @see reloadSet().
+       @see availableSets().
+    */
+    livesString chooseSet();
+
+   /**
+      Reload an existing clip set.
+      Only works when status() is LIVES_STATUS_READY, otherwise false is returned.
+      A set may not be accessed concurrently by more than one copy of LiVES.
+      The valid list of sets is equivalent to the list returned by availableSets().
+      If setname is an empty livesString, chooseSet() will be called first to get a set name.
+      @param setname the name of the set to reload.
+      @see chooseSet().
+      @see availableSets().
+    */
+    bool reloadSet(livesString setname);
+
+    /**
+       Change the interactivity of the GUI application.
+       Interactivity is via menus and keyboard accelerators
+       @param setting set to true to allow interaction with the GUI.
+       @return the new setting.
+       @see interactive().
+    */
+    bool setInteractive(bool setting);
+
+    /**
+       Returns whether the GUI app is in interactive mode.
+       @return true if GUI interactivity via menus and keyboard accelerators is enabled.
+       @see setInteractive().
+    */
+    bool interactive();
+
+    /**
+       Returns last setting of deinterlace by user.
+       @return value that the user selected during the last filechooser with preview operation.
+       This value may be passed into openFile().
+       @see openFile().
+    */
+    bool deinterlaceOption();
+
+    /**
+       Get the current interface mode of the livesApp.
+       If the livesApp is invalid, returns LIVES_INTERFACE_MODE_INVALID.
+       @return current mode.
+       @see setMode().
+    */
+    lives_interface_mode_t mode();
+
+    /**
+       Set the current interface mode of the livesApp.
+       Only works if status() is LIVES_STATUS_READY.
+       If the livesApp is invalid, returns LIVES_INTERFACE_MODE_INVALID.
+       @param mode the interface mode to set to
+       @return the new interface mode.
+       @see mode().
+    */
+    lives_interface_mode_t setMode(lives_interface_mode_t mode);//, livesMultitrackSettings settings=NULL);
+
+    /**
+       Get the current operational status of the livesApp.
+       @return current status.
+       @see isReady().
+       @see isPlaying().
+    */
+    lives_status_t status() const;
+
+    /**
+       If status() is LIVES_STATUS_PROCESSING, cancel the current processing if possible.
+       @return true if the processing was cancelled.
+    */
+    bool cancel();
+
+
+
+#ifndef DOXYGEN_SKIP
+    // For internal use only.
+    closureList& closures();
+    void invalidate();
+    void setClosures(closureList cl);
+    
+    bool setPref(int prefidx, bool val) const;
+    bool setPref(int prefidx, int val) const;
+    bool setPref(int prefidx, int bitfield, bool val) const;
+
+#endif
+
+  protected:
+    ulong addCallback(lives_callback_t cb_type, private_callback_f func, void *data) const;
+
+  private:
+    ulong m_id;
+    closureList m_closures;
+    set * m_set;
+    player *m_player;
+    effectKeyMap * m_effectKeyMap;
+    multitrack *m_multitrack;
+
+    pthread_t *m_thread;
+
+    bool m_deinterlace;
+
+    ulong appendClosure(lives_callback_t cb_type, callback_f func, void *data) const;
+    void init(int argc, char *argv[]);
+
+    void operator=(livesApp const&); // Don't implement
+    livesApp(const livesApp &other); // Don't implement
+
+  };
+
+
+
+
+  /**
+     class "clip". 
+     Represents a clip which is open in LiVES.
+     @see set::nthClip()
+     @see livesApp::openFile()
+     @see player::foregroundClip()
+     @see player::backgroundClip()
+  */
+  class clip {
+    friend livesApp;
+    friend set;
+    friend block;
+    friend multitrack;
+    friend player;
+
+  public:
+
+    /**
+       Creates a new, invalid clip
+    */
+    clip();
+
+    /**
+       Check if clip is valid. 
+       A clip is valid if it is loaded in a valid livesApp instance, and the livesApp::status() is not LIVES_STATUS_NOTREADY. 
+       @see livesApp::openFile().
+       @return true if the clip is valid.
+    */
+    bool isValid() const;
+
+    /**
+       Number of frames in this clip. 
+       If the clip is audio only, 0 is returned.
+       If clip is not valid then 0 is returned.
+       @return int number of frames, or 0 if clip is not valid.
+    */
+    int frames();
+
+    /**
+       Width of the clip in pixels.
+       If the clip is audio only, 0 is returned.
+       If clip is not valid then 0 is returned.
+       @return int width in pixels, or 0 if clip is not valid.
+    */
+    int width();
+
+    /**
+       Height of the clip in pixels.
+       If the clip is audio only, 0 is returned.
+       If clip is not valid then 0 is returned.
+       @return int height in pixels, or 0 if clip is not valid.
+    */
+    int height();
+
+    /**
+       Framerate (frames per second) of the clip.
+       If the clip is audio only, 0.0 is returned.
+       If clip is not valid then 0.0 is returned.
+       @return double framerate of the clip, or 0.0 if clip is not valid.
+    */
+    double FPS();
+
+    /**
+       Framerate (frames per second) that the clip is/will be played back at.
+       This may vary from the normal FPS(). During playback it will be equivalent to player::FPS().
+       If livesApp::mode() is LIVES_INTERFACE_MODE_MULTITRACK then this will return multitrack::FPS().
+       IF the clip is invalid, 0. is returned.
+       @return the playback framerate
+       @see player::setCurrentFPS().
+       @see player::FPS().
+    */
+    double playbackFPS();
+
+    /**
+       Human readable name of the clip.
+       If clip is not valid then empty livesString is returned.
+       @return livesString name, or empty livesString if clip is not valid.
+    */
+    livesString name();
+
+    /**
+       Audio rate for this clip. 
+       If the clip is video only, 0 is returned.
+       If clip is not valid then 0 is returned.
+       Note this is not necessarily the same as the soundcard audio rate which can be obtained via prefs::audioPlayerRate().
+       @return int audio rate, or 0 if clip is not valid.
+       @see playbackAudioRate()
+    */
+    int audioRate();
+
+    /**
+       The current playback audio rate for this clip, which may differ from audioRate(). 
+       If the clip is video only, 0 is returned.
+       If clip is not valid then 0 is returned.
+       Note this is not necessarily the same as the soundcard audio rate which can be obtained via prefs::audioPlayerRate().
+       If livesApp::mode() is LIVES_INTERFACE_MODE_MULTITRACK then this will return multitrack::audioRate().
+       @return int playback audio rate, or 0 if clip is not valid.
+       @see audiorate().
+    */
+    int playbackAudioRate();
+
+    /**
+       Number of audio channels (eg. left, right) for this clip. 
+       If the clip is video only, 0 is returned.
+       If clip is not valid then 0 is returned.
+       @return int audio channels, or 0 if clip is not valid.
+    */
+    int audioChannels();
+
+    /**
+       Size in bits of audio samples (eg. 8, 16, 32) for this clip. 
+       If the clip is video only, 0 is returned.
+       If clip is not valid then 0 is returned.
+       @return int audio sample size, or 0 if clip is not valid.
+    */
+    int audioSampleSize();
+
+    /**
+       Returns whether the audio is signed (true) or unsigned (false).
+       If clip is video only or not valid then the return value is undefined.
+       @return bool audio signed.
+    */
+    bool audioSigned();
+
+    /**
+       Returns the endianness of the audio.
+       If clip is video only or not valid then the return value is undefined.
+       @return bool audio signed.
+    */
+    lives_endian_t audioEndian();
+
+
+    /**
+       Returns the length in seconds for audio in the clip
+       If the clip is invalid, returns 0.
+       @return the length of the clip audio, in seconds.
+    */
+    double audioLength();
+
+    /**
+       Start of the selected frame region.
+       If the clip is audio only, 0 is returned.
+       If clip is not valid then 0 is returned.
+       @return int frame selection start, or 0 if clip is not valid.
+    */
+    int selectionStart();
+
+    /**
+       End of the selected frame region.
+       If the clip is audio only, 0 is returned.
+       If clip is not valid then 0 is returned.
+       @return int frame selection end, or 0 if clip is not valid.
+    */
+    int selectionEnd();
+
+
+    /**
+       Select all frames in the clip. if the clip is invalid does nothing.
+       Only works is livesApp::status() is LIVES_STATUS_READY or LIVES_STATUS_PLAYING.
+       @return true if the operation was successful.
+    */
+    bool selectAll();
+
+    /**
+       Set the selection start frame for the clip. If the new start is > selectionEnd() then selection end will be set to the new start.
+       If the clip is invalid there is no effect.
+       Only functions if livesApp::status() is LIVES_STATUS_READY or LIVES_STATUS_PLAYING.
+       @param start the selection start frame which must be in range 1 <= start <= frames().
+       @see setSelectionEnd().
+    */
+    bool setSelectionStart(unsigned int start);
+
+    /**
+       Set the selection end frame for the clip. If the new end is < selectionStart() then selection start will be set to the new end.
+       If the clip is invalid there is no effect.
+       Only functions if livesApp::status() is LIVES_STATUS_READY or LIVES_STATUS_PLAYING.
+       @param end the selection end frame which must be in range 1 <= end <= frames().
+       @see setSelectionStart().
+    */
+    bool setSelectionEnd(unsigned int end);
+
+    /**
+       Switch to this clip as the current foreground clip.
+       Only works if livesApp::status() is LIVES_STATUS_READY or LIVES_STATUS_PLAYING and livesApp::mode() is LIVES_INTERFACE_MODE_CLIP_EDITOR.
+       If clips are switched during playback, the application acts as if livesApp::loopMode() were set to LIVES_LOOP_MODE_CONTINUOUS.
+       If the clip is invalid, nothing happens and false is returned.
+       @return true if the switch was successful.
+       @see player::setForegroundClip()
+    */
+    bool switchTo();
+
+    /**
+       Switch to this clip as the current background clip.
+       Only works if livesApp::status() is LIVES_STATUS_READY or LIVES_STATUS_PLAYING and livesApp::mode() is LIVES_INTERFACE_MODE_CLIP_EDITOR.
+       If the clip is invalid, nothing happens and false is returned.
+       @return true if the switch was successful.
+       @see player::setBackgroundClip()
+    */
+    bool setIsBackground();
+
+    /**
+       @return true if the two clips have the same internal id, and belong to the same livesApp.
+    */
+    inline bool operator==(const clip& other) {
+      return other.m_uid == m_uid && m_lives == other.m_lives;
+    }
+
+  protected:
+    clip(ulong uid, livesApp *lives=NULL);
+    ulong m_uid;
+
+  private:
+    livesApp *m_lives;
+
+  };
+  
+
+
+#ifndef DOXYGEN_SKIP
+  typedef vector<ulong> clipList;
+  typedef vector<ulong>::iterator clipListIterator;
+#endif
+
+  ///// set ////////
+
+
+  /**
+     class "set". 
+     Represents a list of clips and/or layouts which are open in LiVES. May be obtained from livesApp::getSet().
+     @see livesApp::getSet()
+  */
+  class set {
+    friend livesApp;
+
+  public:
+
+    /**
+       Returns whether the set is valid or not.
+       The set is valid if belongs to a valid livesApp, and the livesApp::status() is not LIVES_STATUS_NOTREADY.
+       @return true if the set is valid (associated with a valid livesApp instance).
+    */
+    bool isValid() const;
+
+    /**
+       Returns the current name of the set. 
+       If it has not been defined, an empty livesString is returned. If the set is invalid, an empty livesString is returned.
+       @return livesString name.
+    */
+    livesString name() const;
+
+    /**
+       Set the name of the current set. Only works if there are clips loaded, and the livesApp::status() is LIVES_STATUS_READY.
+       Can only be done if the current set has no name. You need to do this before saving a layout if the current set has no name.
+       If name is an empty string, the user can choose the name at runtime. If livesApp::interactive() is false, the user can cancel.
+       Valid set names may not be empty, begin with a "." or contain spaces or the characters / \ * or ". The set name must not be in use by 
+       another copy of LiVES. The maximum length of a set name is 128 characters.
+       @param name the name of the set
+       @return true if the name was set.
+       @see name().
+    */
+    bool setName(livesString name=livesString()) const;
+
+    /**
+       Save the set, and close all open clips and layouts. 
+       If the set name is empty, the user can choose the name via the GUI. If livesApp::interactive() is false, the user may not cancel.
+       If the name is defined, and it points to a different, existing set, the set will not be saved and false will be returned, 
+       unless force_append is set to true, in which case the current clips and layouts will be appended to the other set.
+       Saving a set with a new name is an expensive operation as it requires moving files in the underlying filesystem.
+       See setName() for the rules on valid set names.
+       @param name name to save set as, or empty livesString to let the user choose a name.
+       @param force_append set to true to force appending to another existing set.
+       @return true if the set was saved.
+    */
+    bool save(livesString name, bool force_append=false) const;
+
+    /**
+       Save the set, and close all open clips and layouts. 
+       The current set name() is used. If the set name is not defined, the user will be prompted to enter it at runtime.
+       @return true if the set was saved.
+    */
+    bool save() const;
+
+    /**
+       Returns the number of clips in the set. If the set is invalid, returns 0.
+       @return number of clips.
+       @see indexOf().
+       @see nthClip().
+    */
+    unsigned int numClips() const;
+
+    /**
+       Returns the nth clip in the set. If n  >= numClips(), returns an invalid clip. If the set is invalid, returns an invalid clip.
+       @return the nth clip in the set.
+       @see indexOf().
+       @see numClips().
+    */
+    clip nthClip(unsigned int n) const;
+
+    /**
+       Returns the index of a clip in the currentSet. If the clip is not in the current set, then -1 is returned.
+       If the set is invalid or the clip is invalid, returns -1.
+       @return the index of the clip in the set.
+       @see nthClip().
+       @see numClips().
+    */
+    int indexOf(clip c) const;
+
+    /**
+       Returns a list of layout names for this set. If the set is invalid, returns an empty livesStringList.
+       @return a list of layout names for this set.
+       @see livesApp::reloadLayout().
+    */
+    livesStringList layoutNames(unsigned int n) const;
+
+    /**
+       @return true if the two sets belong to the same livesApp.
+    */
+    inline bool operator==(const set& other) const {
+      return other.m_lives == m_lives;
+    }
+
+
+  protected:
+    set(livesApp *lives=NULL);
+
+  private:
+    livesApp *m_lives;
+    clipList m_clips;
+
+    void update_clip_list(void);
+
+
+  };
+
+
+
+
+
+  /**
+     class "player". 
+     Represents a media player associated with a livesApp.
+     @see livesApp::getPlayer()
+  */
+  class player {
+    friend livesApp;
+
+  public:
+
+    /**
+       Returns whether the player is valid or not.
+       A valid player belongs to a valid livesApp, and the livesApp::status() is not LIVES_STATUS_NOTREADY.
+       @return true if the player is valid.
+    */
+    bool isValid() const;
+
+    /**
+       @return true if the livesApp::status() is LIVES_STATUS_PLAYING.
+    */
+    bool isPlaying() const;
+
+
+    /**
+       @return true if the player is set to record. Recording will only actually occur if isPlaying() is also true.
+    */
+    bool isRecording() const;
+
+    /**
+       Set playback in a detached window.
+       If the livesApp::mode() is LIVES_INTERFACE_MODE_CLIPEDIT and prefs::sepWinSticky() is true, the window appears straight away;
+       otherwise it appears only when isPlaying() is true.
+       @param setting the value to set to
+       @see setFS().
+       @see sepWin().
+    */
+    void setSepWin(bool setting) const;
+
+    /**
+       @return true if playback is in a separate window from the main GUI.
+       @see setSepWin().
+    */
+    bool sepWin() const;
+
+    /**
+       Set playback fullscreen. Use of setFS() is recommended instead.
+       @param setting the value to set to
+       @see setFS().
+       @see fullScreen().
+    */
+    void setFullScreen(bool setting) const;
+
+    /**
+       @return true if playback is full screen.
+       @see setFullScreen().
+    */
+    bool fullScreen() const;
+
+    /**
+       Combines the functionality of setSepWin() and setFullScreen().
+       If the livesApp::mode() is LIVES_INTERFACE_MODE_CLIPEDIT and prefs::sepWinSticky() is true, the window appears straight away,
+       but it will only fill the screen when isPlaying() is true; otherwise it appears only when isPlaying() is true.
+       @param setting the value to set to
+       @see setSepWin()
+       @see setFullScreen()
+    */
+    void setFS(bool setting) const;
+
+    /**
+       Commence playback of video and audio with the currently selected clip.
+       Only has an effect when livesApp::status() is LIVES_STATUS_READY.
+       @return true if playback was started.
+    */
+    bool play() const;
+
+    /**
+       Stop playback.
+       If livesApp::status() is not LIVES_STATUS_PLAYING, nothing happens.
+       @return true if playback was stopped.
+    */
+    bool stop() const;
+
+    /**
+       Set the foreground clip for the player. Equivalent to clip::switchTo() except that it only functions when 
+       livesApp::status() is LIVES_STATUS_PLAYING and the livesApp::mode() is LIVES_INTERFACE_MODE_CLIPEDIT.
+       If the clip is invalid, or isActive() is false, nothing happens and false is returned.
+       @param c the clip to set as foreground.
+       @return true if the function was successful.
+       @see foregroundClip().
+       @see setBackgroundClip().
+    */
+    bool setForegroundClip(clip c) const;
+
+    /**
+       Returns the current foreground clip of the player. If isActive() is false, returns an invalid clip.
+       If the livesApp::mode() is not LIVES_INTERFACE_MODE_CLIPEDIT, returns an invalid clip.
+       @return the current foreground clip.
+       @see setForegroundClip().
+       @see backgroundClip().
+    */
+    clip foregroundClip() const;
+
+    /**
+       Set the background clip for the player. Equivalent to clip::setIsBackground() except that it only functions when 
+       livesApp::status() is LIVES_STATUS_PLAYING and the livesApp::mode() is LIVES_INTERFACE_MODE_CLIPEDIT.
+       Only works if there is one or more transition effects active.
+       If the clip is invalid, or isActive() is false, nothing happens and false is returned.
+       @return true if the function was successful.
+       @see backgroundClip().
+       @see setForegroundClip().
+    */
+    bool setBackgroundClip(clip c) const;
+
+    /**
+       Returns the current background clip of the player. If isActive() is false, returns an invalid clip.
+       If the livesApp::mode() is not LIVES_INTERFACE_MODE_CLIPEDIT, returns an invalid clip.
+       @return the current background clip.
+       @see setBackgroundClip().
+       @see foregroundClip().
+    */
+    clip backgroundClip() const;
+
+    /**
+       Set the current playback start time in seconds (this is also the insertion point in multitrack mode).
+       Only works if the livesApp::status() is LIVES_STATUS_READY. If livesApp::mode() is LIVES_INTERFACE_MODE_CLIP_EDITOR, 
+       the start time may not be set beyond the end of the current clip (video and audio). 
+       The outcome of setting playback beyond the end of video but not of audio and vice-versa depends on the value of loopMode().
+       If livesApp::mode() is LIVES_INTERFACE_MODE_MULITRACK, setting the current time may cause the timeline to stretch visually 
+       (i.e zoom out). 
+       The miminum value is 0.0 in every mode. Values < 0. will be ignored.
+       If isValid() is false, nothing happens and 0. is returned.
+       @param time the time in seconds to set playback start time to.
+       @return the new playback start time.
+       @see videoPlaybackTime().
+       @see multitrack::setCurrentTime().
+    */
+    double setPlaybackStartTime(double time) const;
+
+    /**
+       Set the video playback frame. Only works if livesApp::status() is LIVES_STATUS_PLAYING and livesApp::mode() is 
+       LIVES_INTERFACE_MODE_CLIPEDIT.
+       If the frame parameter is < 1 or > foregroundClip().frames() nothing happens.
+       If background is true, the function sets the frame for backgroundClip().
+       If background is false and prefs::audioFollowsFPSChanges() is true, then the audio playback will sync to the new video position.
+       @param frame the new frame to set to
+       @param background if true sets the frame for the background clip (if any)
+       @return the video frame set to, or 0 if the operation is invalid.
+       @see videoPlaybackTime()
+       @see setPlaybackTime()
+    */
+    int setVideoPlaybackFrame(int frame, bool background=false) const;
+
+    /**
+       Return the current clip playback time. If livesApp::mode() is LIVES_INTERFACE_MODE_CLIPEDIT, then this returns 
+       the current playback time for video in the current foregroundClip(), or the current backgroundClip() if background is true:
+       if there is no background clip, 0. is returned.
+       If livesApp::mode() is LIVES_INTERFACE_MODE_MULTITRACK, then this returns the current player time in the multitrack timeline, 
+       (equivalent to multitrack::currentTime()), and the background parameter is ignored.
+       This function works if livesApp::status() is LIVES_STATUS_READY or LIVES_STATUS_PLAYING.
+       If isValid() is false, 0. is returned.
+       @param background if true returns the playback time for the background clip.
+       @return the current foreground or background clip playback time.
+       @see setVideoPlaybackFrame().
+       @see audioPlaybackTime().
+       @see elapsedTime().
+       @see multitrack::currentTime().
+    */
+    double videoPlaybackTime(bool background=false) const;
+
+    /**
+       Set the audio playback time. Only works if livesApp::status() is LIVES_STATUS_PLAYING and livesApp::mode() is 
+       LIVES_INTERFACE_MODE_CLIPEDIT and prefs::isRealtimeAudioPlayer() is true for prefs::audioPlayer().
+       Does not work if prefs::audioSource() is LIVES_AUDIO_SOURCE_INTERNAL and player::recording() is true.
+       If the time parameter is < 0. or > clip::audioLength() nothing happens.
+       The time is actually set to the nearest video frame start to the requested time.
+       @param time the new time to set to
+       @return the audio playback time, or 0. if the operation is invalid.
+       @see audioPlaybackTime()
+       @see setVideoPlaybackFrame()
+    */
+    double setAudioPlaybackTime(double time) const;
+       
+    /**
+       Return the current clip audio playback time in seconds. If livesApp::mode() is LIVES_INTERFACE_MODE_CLIPEDIT, then this returns 
+       the current playback time for audio in the current foregroundClip().
+       If livesApp::mode() is LIVES_INTERFACE_MODE_MULTITRACK, then this returns the current player time in the multitrack timeline 
+       (equivalent to multitrack::currentTime()).
+       This function works with livesApp::status() of LIVES_STATUS_READY and LIVES_STATUS_PLAYING.
+       If isValid() is false, 0. is returned.
+       If prefs::audioSource() is not LIVES_AUDIO_SOURCE_INTERNAL the value returned is not defined.
+       @return the current clip audio playback time.
+       @see videoPlaybackTime().
+       @see elapsedTime().
+       @see multitrack::currentTime().
+    */
+    double audioPlaybackTime() const;
+
+    /**
+       Return the elapsed time, i.e. total time in seconds since playback began.
+       If livesApp::status() is not LIVES_STATUS_PLAYING, 0. is returned.
+       @return the time in seconds since playback began.
+       @see playbackTime().
+       @see audioPlaybackTime().
+       @see multitrack::currentTime().
+    */
+    double elapsedTime() const;
+
+    /**
+       Set the current playback framerate in frames per second. Only works if livesApp::mode() is LIVES_INTERFACE_MODE_CLIPEDIT and
+       livesApp::status() is LIVES_STATUS_PLAYING.
+       Allowed values range from -prefs::maxFPS() to +prefs::maxFPS().
+       If prefs::audioFollowsFPSChanges() is true, then the audio playback rate will change proportionally.
+       If isPlaying() is false, nothing happens and 0. is returned.
+       Note, the setting only applies to the current clip; if the clip being played is switched then currentFPS() may change.
+       @param fps the framerate to set
+       @return the new framerate
+       @see currentFPS().
+     */
+    double setCurrentFPS(double fps) const;
+
+    /**
+       Return the current playback framerate in frames per second of the player.
+       If isValid() is false, returns 0. If livesApp::status is neither LIVES_STATUS_READY nor LIVES_STATUS_PLAYING, returns 0.
+       Otherwise, this is equivalent to foregroundClip::playbackFPS().
+       @return the current or potential playback rate in frames per second.
+       @see setCurrentFPS().
+       @see clip::playbackFPS().
+    */
+    double currentFPS() const;
+
+    /**
+       Return the current audio rate of the player.
+       If isValid() is false, returns 0. If livesApp::status is neither LIVES_STATUS_READY nor LIVES_STATUS_PLAYING, returns 0.
+       Otherwise, this is equivalent to foregroundClip::playbackAudioRate().
+       Note this is not necessarily the same as the soundcard audio rate which can be obtained via prefs::audioPlayerRate().
+       @return the current or potential audio rate in Hz.
+       @see clip::playbackAudioRate().
+    */
+    int currentAudioRate() const;
+
+    /**
+       Set the loop mode for the player. The value is a bitmap, however LIVES_LOOP_MODE_FIT_AUDIO 
+       only has meaning when livesApp::mode() is LIVES_INTERFACE_MODE_CLIPEDIT.
+       If isValid() is false, nothing happens.
+       @param mode the desired loop mode
+       @return the new loop mode
+       @see loopMode().
+    */
+    lives_loop_mode_t setLoopMode(lives_loop_mode_t mode) const;
+
+    /**
+       Return the loop mode of the player.
+       If isValid() is false, returns LIVES_LOOP_MODE_NONE.
+       @return the current loop mode of the player
+       @see setLoopMode().
+    */
+    lives_loop_mode_t loopMode() const;
+
+    /**
+       Set ping pong mode. If pingPong is true then rather than looping forward, video and audio will "bounce" 
+       forwards and backwards off their end points, provided the mode() is LIVES_INTERFACE_MODE_CLIPEDIT.
+       If mode() is LIVES_INTERFACE_MODE_MULTITRACK, then the value is ignored.
+       @param setting the desired value
+       @return the new value
+       @see pingPong().
+       @see loopMode().
+    */
+    bool setPingPong(bool setting) const;
+
+    /**
+       Return ping pong mode. If pingPong is true then rather than looping forward, video and audio will "bounce" 
+       forwards and backwards off their end points, provided the mode() is LIVES_INTERFACE_MODE_CLIPEDIT.
+       If mode() is LIVES_INTERFACE_MODE_MULTITRACK, then the value is ignored.
+       If the player is invalid, false is returned.
+       @return the current value.
+       @see setPingPong().
+       @see loopMode().
+    */
+    bool pingPong() const;
+
+    /**
+       Resets the clip::playbackFPS() for the current foreground clip, so it is equal to the clip::FPS().
+       Resets the clip::playbackAudioRate so it is equal to the clip::audioRate().
+       If possible equalizes the audioPlaybackTime() with the playbackTime() so video and audio are in sync.
+       Only works if isPlaying() is true.
+       @return true if the method succeeded.
+    */
+    bool resyncFPS() const;
+
+
+    /**
+       @return true if the two players belong to the same livesApp.
+    */
+    inline bool operator==(const player& other) const {
+      return other.m_lives == m_lives;
+    }
+
+
+  protected:
+    player(livesApp *lives=NULL);
+
+  private:
+    livesApp *m_lives;
+
+  };
+
+  /////////////////////////////////////////////////////
+
+  /**
+     class "effectKey". 
+     Represents a single effect key slot. A valid livesApp will have a map of these (effectKeyMapping()) whose size() is equal to 
+     prefs::rteKeysVirtual().
+     @see effectKeyMap::operator[]
+  */
+  class effectKey {
+    friend effectKeyMap;
+  public:
+    /**
+       Creates a new, invalid effect key
+    */
+    effectKey();
+
+    /**
+       Returns whether the effectKey is valid or not.
+       An effect key is valid if it is owned by a valid livesApp, and the livesApp::status() is not LIVES_STATUS_NOTREADY, 
+       and the key value is in the range 1 <= key <= prefs::rteKeysVirtual.
+       @return true if the effectKey is valid.
+    */
+    bool isValid() const;
+
+    /**
+       Return the (physical or virtual) key associated with this effectKey.
+       Effects (apart from generators) are applied in ascending key order.
+       Physical keys (1 - 9) can also be toggled from the keyboard by simultaneously holding down the ctrl key, 
+       provided livesApp::interactive() is true.
+       If the effectKey is invalid, 0 is returned.
+       @return the physical or virtual key associated with this effectKey.
+    */
+    int key();
+
+    /**
+       Return the number of modes for this effectKey slot. Modes run from 0 to numModes() - 1.
+       Effects can be mapped to modes in ascending order, but only one mode is the active mode for the effectKey.
+       If the effectKey is invalid, 0 will be returned.
+       @return the number of modes for this effectKey.
+    */
+    int numModes();
+
+    /**
+       Return the number of mapped modes for this effectKey slot. Modes run from 0 to numModes() - 1.
+       When numMappedModes() == numModes() for an effectKey, no more effects may be mapped to it until a mapping is erased.
+       If the effectKey is invalid, 0 will be returned.
+       @return the number of modes for this effectKey.
+    */
+    int numMappedModes();
+
+    /**
+       Set the current mode this effectKey.
+       Only works if the effecKey is valid, a valid effect is mapped to the mode, and livesApp::status() is 
+       LIVES_STATUS_PLAYING or LIVES_STATUS_READY.
+       @param mode the mode to switch to.
+       @return the new mode of the effectKey.
+       @see currentMode().
+       @see numMappedModes().
+    */
+    int setCurrentMode(int mode);
+
+    /**
+       Get the current mode for this effectKey.
+       If the effectKey is invalid, the current mode is -1.
+       @return the current mode of the effectKey.
+       @see setCurrentMode().
+    */
+    int currentMode();
+
+    /**
+       Enable an effect mapped to this effectKey, mode().
+       Only works if the effecKey is valid, a valid effect is mapped to the mode, and livesApp::status() is 
+       LIVES_STATUS_PLAYING or LIVES_STATUS_READY.
+       @param setting the value to set to
+       @return the new state of the effectKey
+       @see enabled().
+    */
+    bool setEnabled(bool setting);
+
+    /**
+       Return a value to indicate whether the effect mapped to this effectKey, mode() is active. 
+       If the effectKey is invalid, returns false.
+       @return true if the effect mapped at mode() is enabled.
+       @see setEnabled().
+    */
+    bool enabled();
+
+    /**
+       Map an effect to the next unused mode for the effectKey.
+       Will only work if the livesApp::status() is LIVES_STATUS_PLAYING or LIVES_STATUS_READY.
+       The effectKey and the effect must share the same owner livesApp, and both must be valid.
+       @param e the effect to append
+       @return the mode number the effect was mapped to, or -1 if the mapping failed.
+       @see removeMapping().
+    */
+    int appendMapping(effect e);
+
+    /**
+       Remove an effect from being mapped to this key.
+       Will only work if the livesApp::status() is LIVES_STATUS_PLAYING or LIVES_STATUS_READY.
+       If the effectKey is invalid, or if no effect is mapped to the mode, false is returned and nothing happens.
+       If an effect is removed, effects mapped to higher mode numbers on the same effectKey will move down a mode to close the gap.
+       Note: the currentMode() does not change unless this is the last mapped effect for this effectKey, 
+       so this may cause the currently enabled effect to change.
+       @param mode the mode to remove the effect from.
+       @return true if an effect was unmapped.
+       @see appendMapping().
+    */
+    bool removeMapping(int mode);
+
+    /**
+       Returns the effect mapped to the key at the specified mode.
+       If the effectKey is invalid, or if no effect is mapped to the mode, an invalid effect is returned.
+       @param mode the specified mode.
+       @return the effect mapped to the key at the specified mode.
+    */
+    effect at(int mode);
+
+    /**
+       @return true if the two effectKeys have the same livesApp and key value and belong to the same livesApp
+    */
+    inline bool operator==(const effectKey& other) {
+      return other.m_key == m_key && m_lives == other.m_lives;
+    }
+
+  protected:
+    effectKey(livesApp *lives, int key);
+
+  private:
+    int m_key;
+    livesApp *m_lives;
+
+  };
+
+
+
+  /**
+     class "effectKeyMap". 
+     Represents a mapping of effectKey instances to key slots. Real time effects are always applied in order of ascending index value 
+     (with the exception of generator effects, which are applied first).
+     @see livesApp::getEffectKeyMap()
+  */
+    class effectKeyMap {
+      friend livesApp;
+    public:
+      /**
+	 Returns whether the effectKeyMap is valid or not.
+	 A valid effectKeyMap is owned by a valid livesApp, the livesApp::status() is not LIVES_STATUS_NOTREADY, 
+	 and the index is 1 <= i <= prefs::rteKeysVirtual(). 
+	 @return true if the effectKeyMap is valid.
+      */
+      bool isValid() const;
+
+      /**
+	 Unmap all effects from effectKey mappings, leaving an empty map.
+	 Only has an effect when livesApp::status() is LIVES_STATUS_READY.
+	 @return true if all effects were unmapped
+      */
+      bool clear() const;
+
+      /**
+	 Returns the ith effect key for this key map.
+	 Valid range for i is 1 <= i <= prefs::rteKeysVirtual().
+	 For values of i outside this range, an invalid effectKey is returned.
+	 @param i the index value
+	 @return an effectKey with index i.
+	 @see effectKey::operator[]
+      */
+      effectKey at(int i) const;
+
+      /**
+	 Returns the number of key slots (indices) in the effectKeyMap.
+	 The valid range of keys is 1 <= key <= size().
+	 Equivalent to prefs::rteKeysVirtual(), except that if the effectKeyMap is invalid, returns 0.
+	 @return the number of key slots.
+	 @see prefs::rteKeysVirtual()
+      */
+      size_t size() const;
+
+      /**
+	 @return true if the two effectKeyMaps have the same livesApp
+      */
+      inline bool operator==(const effectKeyMap& other) const {
+	return other.m_lives == m_lives;
+      }
+
+      /**
+	 Returns an effect key with index i for this key map. The value of i may be chosen freely, but if it is outside the range 
+	 1 <= i <= size() then the effectKey will be considered invalid.
+	 @return an effectKey with index i for this key map.
+	 @see at()
+      */
+      inline effectKey operator [] (int i) const {
+	return effectKey(m_lives, i);
+      }
+
+
+    protected:
+      effectKeyMap(livesApp *lives);
+
+    private:
+      livesApp *m_lives;
+    };
+
+
+
+  /**
+     class "effect". 
+     Represents a single effect.
+  */
+  class effect {
+    friend effectKey;
+    friend multitrack;
+  public:
+    /**
+       Create a new effect from a hashname. In case of multiple matches, only the first match is returned. 
+       The hashname should be in utf-8 format, and matching is case insensitive.
+       In the case of no matches, an invalid effect is returned.
+       If livesApp::isInvalid() is true, or livesApp::status() is LIVES_STATUS_NOTREADY, an invalid effect will be returned.
+       Implementation note: we use const livesApp & here to avoid the destructor being called on a copy object, 
+       which would cause LiVES to terminate prematurely.
+       @param lives a livesApp instance
+       @param hashname the hashname of an effect, a concatenation of package name, filter name, and if match_full is true, 
+       author and version string. If the filter has "extra_authors" these are also checked.
+       @param match_full if true then author and version string must match, otherwise only package name and filter name are matched.
+       If false then the hashname and the target must be equivalent strings.
+       @return an effect.
+    */
+    effect(const livesApp &lives, livesString hashname, bool match_full=false);
+
+    /**
+       Create a new effect from a template. In case of multiple matches, only the first match is returned. 
+       In the case of no matches, an invalid effect is returned.
+       LiVESStrings here should be in utf-8 format and matching is case insensitive.
+       If livesApp::isInvalid() is true, or livesApp::status() is LIVES_STATUS_NOTREADY, an invalid effect will be returned.
+       Implementation note: we use const livesApp & here to avoid the destructor being called on a copy object, 
+       which would cause LiVES to terminate prematurely.
+       @param lives a livesApp instance
+       @param package a package name (e.g. "frei0r", "LADSPA"), or "" to match any package.
+       @param fxname the name of a filter (e.g. "chroma blend") or "" to match any filter name.
+       @param author the name of the author of the effect (e.g. "jsmith") or "" to match any author. If the plugin has "extra_authors" 
+       this value is also permitted as a match.
+       @param version the number of a version to match, or 0 to match any version.
+       @return an effect.
+    */
+    effect(const livesApp &lives, livesString package, livesString fxname, livesString author=livesString(), int version=0);
+
+    /**
+       Returns whether the effect is valid or not.
+       A valid effect is owned by a valid livesApp, whose livesApp::status() is not LIVES_STATUS_NOTREADY, 
+       and which references an existing effect plugin.
+       @return true if the effect is valid.
+    */
+    bool isValid() const;
+
+    /**
+       @return true if the two effects have the same index and the same livesApp owner
+    */
+    inline bool operator==(const effect& other) {
+      return other.m_idx == m_idx && m_lives == other.m_lives;
+    }
+
+  protected:
+    effect();
+    effect(livesApp *m_lives, int idx);
+    livesApp *m_lives;
+    int m_idx;
+
+  private:
+
+  };
+
+
+
+  /**
+     class "block". 
+     Represents a sequence of frames from the same clip on the same track which forms part of a layout. 
+     This is an abstracted level, since layouts are fundamentally formed of "events" which may span multiple tracks.
+  */
+  class block {
+    friend multitrack;
+
+  public:
+
+    /**
+       returns whether the block is valid or not. A block may become invalid if it is deleted from a layout for example. 
+       Undoing a deletion does not cause a block to become valid again, you need to search for it again by time and track number.
+       If the livesApp::mode() is changed from LIVES_INTERFACE_MODE_MULTITRACK, then all existing blocks become invalid.
+       @return whether the block is contained in an active multitrack instance.
+    */
+    bool isValid() const;
+
+    /**
+       Returns a reference to the block on the specified track at the specified time. If no such block exists, returns an invalid block.
+       @param m the multitrack object
+       @param track the track number. Values < 0 indicate backing audio tracks.
+       @param time the time in seconds on the timeline.
+       @return the block on the given track at the given time.
+    */
+    block(multitrack m, int track, double time);
+
+    /**
+       Returns the start time in seconds of the block.
+       If the block is invalid, returns -1.
+       @return start time in seconds.
+    */
+    double startTime();
+    
+    /**
+       Returns the duration in seconds of the block.
+       If the block is invalid, returns -1.
+       @return duration in seconds.
+    */
+    double length();
+
+    /**
+       Returns the clip which is the source of frames for this block.
+       If the block is invalid, returns an invalid clip.
+       @return the clip which is the source of frames for this block.
+    */
+    clip clipSource();
+
+    /**
+       Returns the track number to which this block is currently attached.
+       A track number < 0 indicates a backing audio track.
+       If the block is invalid, returns 0.
+       @return the current track number for this block.
+    */
+    int track();
+
+    /**
+       Removes a block from the multitrack timeline. Upon being removed, the block becomes invalid.
+       Undoing the operation does not cause the block to become valid again, although it can be searched for using the constructor.
+       If the block is invalid, nothing happens and false is returned.
+       Only works if livesApp::status() is LIVES_STATUS_READY.
+       May cause other blocks to move, depending on the setting of multitrack::gravity().
+       @return true if the block was removed.
+       @see multitrack::insertBlock().
+    */
+    bool remove();
+
+    /**
+       Move the block to a new track at a new timeline time.
+       Depending on the value of multitrack::insertMode(), it may not be possible to do the insertion. 
+       In case of failure an invalid block is returned.
+       Only works if livesApp::status() is LIVES_STATUS_READY and isActive() is true.
+       Note: the actual place where the block ends up, and its final size depends on various factors such as the multitrack::gravity() setting, 
+       the multitrack::insertMode() setting, and the location of other blocks in the layout.
+       The insertion may cause other blocks to relocate.
+       If the block is invalid, nothing happens and false is returned.
+       @param track the new track to move to.
+       @param time the timeline time in seconds to move to.
+       @return true if the block could be moved.
+    */
+    bool moveTo(int track, double time);
+
+
+
+  protected:
+    /**
+       Protected initialiser
+    */
+    block(multitrack *m=NULL, ulong uid=0l);
+
+
+  private:
+    ulong m_uid;
+    livesApp *m_lives;
+
+    void invalidate();
+  };
+
+
+
+  /**
+     class "multitrack". 
+     Represents the multitrack object in a livesApp.
+  */
+  class multitrack {
+    friend livesApp;
+    friend block;
+
+  public:
+
+    /**
+       returns whether the multitrack is valid or not. A valid multitrack is one which is owned by a valid livesApp, 
+       whose livesApp::status() is not LIVES_STATUS_NOTREADY.
+       @return whether the multitrack is valid
+    */
+    bool isValid() const;
+
+    /**
+       returns whether the multitrack is active or not. This is equivent to livesApp::mode() == LIVES_INTERFACE_MODE_MULTITRACK.
+       @return whether the multitrack is active or not.
+    */
+    bool isActive() const;
+
+    /**
+       Set the current track if isActive() is true.
+       Only works when livesApp::status() is LIVES_STATUS_READY or LIVES_STATUS_PLAYING.
+       @param track a value >= 0 represents a video track, a value < 0 represents a backing audio track.
+       @return true if the track setting was successful.
+       @see currentTrack().
+    */
+    bool setCurrentTrack(int track) const;
+
+    /**
+       If isActive() is true, then this method returns the current active track.
+       The active track defines the insertion point for video and audio, along with the currentTime().
+       If isActive() is false, or the livesApp::status is not LIVES_STATUS_READY or LIVES_STATUS_PLAYING 
+       then the return value is undefined.
+       @return the current active track in multitrack mode. A value >= 0 represents a video track, a value < 0 represents a backing audio track.
+       @see setCurrentTrack().
+    */
+    int currentTrack() const;
+
+    /**
+       Set the current playback start time in seconds. This is also the insertion point for insertBlock().
+       Only works if the livesApp::status() is LIVES_STATUS_READY and isActive() is true.
+       Setting the current time may cause the timeline to stretch visually (i.e zoom out). 
+       The miminum value is 0.0; values < 0.0 will be ignored.
+       This function is synonymous with player::setPlaybackTime().
+       @param time the time in seconds to set playback start time to.
+       @return the new playback start time.
+       @see currentTime().
+    */
+    double setCurrentTime(double time) const;
+
+    /**
+       Return the current playback time in seconds. If isActive() is true this returns the current player time in the multitrack timeline 
+       (equivalent to to player::playbackTime(), and during playback, equivalent to player::elapsedTime() plus a constant offset).
+       This function works when livesApp::status() is LIVE_STATUS_READY or LIVES_STATUS_PLAYING.
+       If isActive() is false, 0. is returned.
+       @return the current clip playback time.
+       @see setCurrentTime().
+       @see currentAudioTime().
+       @see elapsedTime().
+    */
+    double currentTime() const;
+
+    /**
+       If isActive() is true, then this method returns the label for a track.
+       @param track the track number. A value >= 0 represents a video track, a value < 0 represents a backing audio track.
+       @return the track label, or empty livesString if the specified track does not exist.
+       @see setTrackLabel().
+    */
+    livesString trackLabel(int track) const;
+
+    /**
+       Set the label for a track. This is for display purposes only and has no other effect.
+       If isActive() is false, the track label is not changed, and false is returned.
+       If the label is not provided, or is an empty livesString, the user will be prompted to enter a name at runtime.
+       @param track the track number. Must be >= 0.
+       @param label a livesString containing the text to label the track with.
+       @return true if it was possible to change the label.
+       @see trackLabel().
+    */
+    bool setTrackLabel(int track, livesString label=livesString()) const;
+
+    /**
+       Returns the value of the multitrack gravity. This value, together with the insertMode() defines what happens when a block is inserted, 
+       moved or deleted.
+       If isActive() is false, the return value is undefined.
+       @return the multitrack gravity.
+       @see insertMode().
+    */
+    lives_gravity_t gravity() const;
+
+    /**
+       Set the gravity mode for multitrack. If isActive() is false, nothing happens and an undefined value is returned, 
+       otherwise if livesApp::status() is not LIVES_STATUS_READY or LIVES_STATUS_PLAYING, nothing happens.
+       @param mode the new gravity mode to set.
+       @return the new gravity mode.
+       @see gravity().
+    */
+    lives_gravity_t setGravity(lives_gravity_t mode) const;
+
+    /**
+       Returns the value of the multitrack insert mode. This value, together with gravity() defines what happens when a block is inserted, 
+       moved or deleted.
+       If isActive() is false, the return value is undefined.
+       @return the multitrack insert mode.
+       @see gravity().
+    */
+    lives_insert_mode_t insertMode() const;
+
+    /**
+       Set the gravity mode for multitrack. If isActive() is false, nothing happens and an undefined value is returned, 
+       otherwise if livesApp::status() is not LIVES_STATUS_READY or LIVES_STATUS_PLAYING, nothing happens.
+       @param mode the new insert mode to set.
+       @return the new insert mode.
+       @see insertMode().
+    */
+    lives_insert_mode_t setInsertMode(lives_insert_mode_t mode) const;
+
+
+    /**
+       Append a new video track into the timeline. Only works if isActive() is true, and livesApp::status() is LIVES_STATUS_READY.
+       @param in_front set to true to insert a video track in front of existing video tracks. Otherwise insert will be behind.
+       @return the index number of the newly added track, or -1 if the operation failed.
+    */
+    int addVideoTrack(bool in_front) const;
+
+
+    /**
+       Returns the number of video tracks for multitrack. If isActive() is false, 0 is returned.
+       @return the number of video tracks
+       @see addVideoTrack()
+    */
+    int numVideoTracks() const;
+
+
+    /**
+       Returns the number of audio backing tracks for multitrack. If isActive() is false, 0 is returned.
+       @return the number of audio tracks
+    */
+    int numAudioTracks() const;
+
+
+    /**
+       Return the framerate of the multitrack in frames per second.
+       If isActive() is false, returns 0. Otherwise when the livesAPP::status() is LIVES_STATUS_PLAYING, player::FPS() takes this value.
+       @return the framerate of the multitrack in frames per second.
+    */
+    double FPS() const;
+
+    /**
+       Insert frames from clip c into currentTrack() at currentTime()
+       If ignore_selection_limits is true, then all frames from the clip will be inserted, 
+       otherwise (the default) only frames from clip::selectionStart() to clip::selectionEnd() will be used.
+       If without_audio is false (the default), audio is also inserted.
+       Frames are automatically resampled to fit layout::fps().
+       Depending on the insertMode(), it may not be possible to do the insertion. In case of failure an invalid block is returned.
+       If the current track is a backing audio track, then only audio is inserted; 
+       in this case if without_audio is true an invalid block is returned.
+       Only works if livesApp::status() is LIVES_STATUS_READY and isActive() is true.
+       Note: the actual place where the block ends up, and its final size depends on various factors such as the gravity() setting, 
+       the insertMode() setting, and the location of other blocks in the layout.
+       The insertion may cause other blocks to relocate.
+       @param c the clip to insert from
+       @param ignore_selection_limits if true then all frames from the clip will be inserted
+       @param without_audio if false then audio is also inserted
+       @return the newly inserted block.
+       @see setCurrentTrack().
+       @see setCurrentTime().
+       @see clip::setSelectionStart().
+       @see clip::setSelectionEnd().
+       @see setGravity().
+       @see block::remove().
+    */
+    block insertBlock(clip c, bool ignore_selection_limits=false, bool without_audio=false) const;
+
+    /**
+       Wipe the current layout, leaving a blank layout.
+       If force is false, then the user will have a chance to cancel (if livesApp::interactive() is true), 
+       or to save the layout.
+       Only works if livesApp::status() is LIVES_STATUS_READY and isActive() is true.
+       Otherwise, the layout will not be wiped, and an empty livesString will be returned.
+       @param force set to true to force the layout to be wiped.
+       @return the name which the layout was saved to, or empty livesString if it was not saved.
+    */
+    livesString wipeLayout(bool force=false) const;
+
+    /**
+       Allow the user to graphically choose a layout to load for the set.
+       Only works if livesApp::status() is LIVES_STATUS_READY and isActive() is true, otherwise an empty livesString is returned.
+       @return the name of the layout selected.
+       @see reloadLayout().
+       @see availableLayouts().
+    */
+    livesString chooseLayout() const;
+
+    /**
+       Return a list of the available layouts for the currently loaded set.
+       If livesApp::isReady() is false, or if no set is loaded, then an empty livesStringList is returned.
+       @return list of available layouts for the currently loaded set
+       @see reloadLayout().
+    */
+    livesStringList availableLayouts() const;
+
+    /**
+       Reload the selected layout, replacing the current multitrack layout.
+       Only works if livesApp::status() is LIVES_STATUS_READY and isActive() is true.
+       The layout must be "owned" by the currently loaded set, otherwise an error may be shown and it will not be loaded.
+       If filename is an empty livesString, chooseLayout() will be called first to get the layout name.
+       If livesApp::interactive() is true, the user will have a chance to save the current layout (if any) first.
+       @param filename the filename of the layout to load
+       @return true if the specified layout could be loaded
+       @see chooseLayout().
+       @see availableLayouts().
+       @see saveLayout().
+    */
+    bool reloadLayout(livesString filename) const;
+
+    /**
+       Save the current layout using the name supplied. The layout will be saved in the layouts directory for the 
+       currently loaded set, so the name should not include any directory component.
+       Only works if the livesApp::status() is LIVES_STATUS_READY, and the current layout is not empty, 
+       otherwise an empty livesString is returned. Note that this WILL work even if isActive() is false.
+       If livesApp::interactive() is true, the user may choose to cancel the operation.
+       If the layout name is empty, the user will be prompted graphically to enter a name. If the set name is empty, the user will be 
+       prompted to enter a set name (if livesApp::interactive() is true; otherwise this will fail and an empty string will be returned).
+       Rarely it will not be possible to save a layout (if it was generated by recording events, and it contains generated audio or video).
+       @param name the name to save the layout
+       @return the filename the set was saved to, or empty livesString if saving failed.
+       @see wipeLayout().
+       @see reloadLayout();
+       @see set::setName().
+    */
+    livesString saveLayout(livesString name) const;
+
+    /**
+       Save the current layout using the current layout name.
+       Only works if the livesApp::status() is LIVES_STATUS_READY, and the current layout is not empty, 
+       otherwise an empty livesString is returned. Note that this WILL work even if isActive() is false.
+       If livesApp::interactive() is true, the user may choose to cancel the operation.
+       If the layout name has not been previously set, the user will be prompted graphically to enter a name. 
+       If the set name is empty, the user will be 
+       prompted to enter a set name (if livesApp::interactive() is true; otherwise this will fail and an empty string will be returned).
+       Rarely it will not be possible to save a layout (if it was generated by recording events, and it contains generated audio or video).
+       @return the filename the set was saved to, or empty livesString if saving failed.
+       @see wipeLayout().
+       @see reloadLayout();
+       @see set::setName().
+    */
+    livesString saveLayout() const;
+
+    /**
+       Render the current layout to a new clip and return it.
+       Only works if isActive() is true, and livesApp::status() is LIVES_STATUS_READY, and the current layout is not empty.
+       If livesApp::interactive() is true, the user may choose to cancel the operation, or to render fewer than all frames.
+       After rendering, if prefs::mtExitRender() is true, the livesApp::mode() will change to LIVES_INTERFACE_MODE_CLIPEDIT, 
+       and isActive() will change to false. 
+       @param render_audio true if audio should be rendered in addition to video.
+       @param normalise_audio if true then the audio volume is normalized (backing audio gets half volume, video tracks get half volume)
+       @return clip a new clip which contains the rendered video, or an invalid clip in case of failure.
+    */
+    clip render(bool render_audio=true, bool normalise_audio=true) const;
+
+    /**
+       Returns the current autotransition effect for multitrack mode.
+       If no effect is set, returns an invalid effect.
+       If the owning livesApp::isInvalid() is true, or if livesApp::Status() is LIVES_STATUS_NOTREADY, returns an invalid effect.
+       @return the autotransition effect for multitrack.
+       @see setAutoTransition().
+       @see disableAutoTransition().
+    */
+    effect autoTransition() const;
+
+    /**
+       Set the current autotransition effect for multitrack mode to "None" (no effect).
+       If the livesApp::status() is not LIVES_STATUS_READY or LIVES_STATUS_PLAYING, returns false and nothing happens.
+       @return true if the autotransition was disabled.
+       @see autoTransition().
+       @see setAutoTransition().
+    */
+    bool disableAutoTransition() const;
+
+    /**
+       Set the current autotransition effect for multitrack mode.
+       If the livesApp::status() is not LIVES_STATUS_READY or LIVES_STATUS_PLAYING, returns false and nothing happens.
+       If the effect is not a transition, false is returned and nothing happens.
+       If the effect is invalid, this is the same as calling disableAutoTransition().
+       @param autotrans the new autotransition effect for multitrack.
+       @return true if the autotransition was changed.
+       @see autoTransition().
+       @see disableAutoTransition().
+    */
+    bool setAutoTransition(effect autotrans) const;
+
+    /**
+       @return true if the two layouts have the same livesApp owner
+    */
+    inline bool operator==(const multitrack& other) const {
+      return m_lives == other.m_lives;
+    }
+
+
+  protected:
+    multitrack(livesApp *lives=NULL);
+
+    /**
+       The linked LiVES application
+    */
+    livesApp *m_lives;
+
+
+  };
+
+
+
+
+
+
+  /**
+     Preferences. Valid values are only returned if the livesApp::isValid() is true, and livesApp::status() is not LIVES_STATUS_NOTREADY.
+     Implementation note: we use const livesApp & here to avoid the destructor being called on a copy object, 
+     which would cause LiVES to terminate prematurely.
+  */
+  namespace prefs {
+    /**
+      @param lives a reference to a valid livesApp instance
+      @return the currently preferred directory for loading video clips.
+    */
+    livesString currentVideoLoadDir(const livesApp &lives); 
+
+    /**
+       @param lives a reference to a valid const livesApp &instance
+       @return the currently preferred directory for loading and saving audio.
+       */
+    livesString currentAudioDir(const livesApp &lives); 
+
+    /**
+       Despite the name, this is the working directory for the LiVES application. 
+       The valid list of sets is drawn from this directory, for it is here that they are saved and loaded.
+       The value can only be set at runtime through the GUI preferences window. Otherwise you can override the default value 
+       when the livesApp() is created via argv[] option "-tmpdir", eg: <BR>
+       <BR><BLOCKQUOTE><I>
+       char *argv[2]; <BR>
+       argv[0]="-tmpdir"; <BR>
+       argv[1]="/home/user/tempdir/"; <BR>
+       livesApp lives(2, argv); <BR>
+       </I></BLOCKQUOTE>
+       @param lives a reference to a valid livesApp instance
+       @return the LiVES working directory
+    */
+    livesString tmpDir(const livesApp &lives);
+
+    /**
+       @param lives a reference to a valid livesApp instance
+       @return the current audio source
+       @see setAudioSource().
+     */
+    lives_audio_source_t audioSource(const livesApp &lives);
+
+    /**
+       Set the audio source. Only works if livesApp::status() is LIVES_STATUS_READY.
+       @param lives a reference to a valid livesApp instance
+       @param asrc the desired audio source
+       @return true if the audio source could be changed.
+    */
+    bool setAudioSource(const livesApp &lives, lives_audio_source_t asrc); 
+
+    /**
+       @param lives a reference to a livesApp instance
+       @return the current audio player
+    */
+    lives_audio_player_t audioPlayer(const livesApp &lives);
+
+    /**
+       Returns the audio rate for the player. Note this may be different from the clip audio rate.
+       Only valid if isRealtimeAudioPlayer(lives.audioPlayer()) is true.
+       @param lives a reference to a livesApp instance
+       @return the current audio player rate in Hz.
+       @see isRealtimeAudioPlayer()
+    */
+    int audioPlayerRate(const livesApp &lives);
+
+    /**
+       @param ptype an audio player type
+       @return true if the audio player type is realtime controllable
+    */
+    bool isRealtimeAudioPlayer(lives_audio_player_t ptype);
+
+    /**
+       @param lives a reference to a valid livesApp instance
+       @return the maximum value for effectKey indices
+    */
+    int rteKeysVirtual(const livesApp &lives);
+
+    /**
+       @param lives a reference to a valid livesApp instance
+       @return the maximum allowed framerate for a clip
+    */
+    double maxFPS(const livesApp &lives);
+
+    /**
+       @param lives a reference to a valid livesApp instance
+       @return true if the audio clip changes to match video clip changes during playback
+       @see setAudioFollowsVideoChanges().
+    */
+    bool audioFollowsVideoChanges(const livesApp &lives);
+
+    /**
+       @param lives a reference to a valid livesApp instance
+       @return true if the clip audio playback rate changes to match video clip framerate changes during playback
+       @see setAudioFollowsFPSChanges().
+    */
+    bool audioFollowsFPSChanges(const livesApp &lives);
+
+    /**
+       @param lives a reference to a valid livesApp instance
+       @param setting the new setting
+       @return true if the preference was updated
+       @see audioFollowsFPSChanges
+    */
+    bool setAudioFollowsFPSChanges(const livesApp &lives, bool setting);
+
+    /**
+       @param lives a reference to a valid livesApp instance
+       @param setting the new setting
+       @return true if the preference was updated
+       @see audioFollowsFPSChanges
+    */
+    bool setAudioFollowsVideoChanges(const livesApp &lives, bool setting);
+
+    /**
+       @param lives a reference to a valid livesApp instance
+       @return true if the separate playback window is shown even when livesApp::isPlaying() is false.
+       @see setSepWinSticky()
+       @see player::sepWin()
+    */
+    bool sepWinSticky(const livesApp &lives);
+
+    /**
+       @param lives a reference to a valid livesApp instance
+       @return true if the preference was updated
+       @see sepWinSticky()
+       @see player::sepWin()
+    */
+    bool setSepWinSticky(const livesApp &lives, bool);
+
+    /**
+       @param lives a reference to a valid livesApp instance
+       @return true if the livesApp::mode() switches to LIVES_INTERFACE_MODE_CLIPEDIT after calling multitrack::render()
+       @see setMtExitRender()
+       @see multitrack::render()
+    */
+    bool mtExitRender(const livesApp &lives);
+
+    /**
+       @param lives a reference to a valid livesApp instance
+       @param setting the new setting
+       @return true if the preference was updated
+       @see mtExitRender().
+       @see multitrack::render().
+    */
+    bool setMtExitRender(const livesApp &lives, bool setting);
+
+
+  }
+
+
+}
+
+#endif // __cplusplus
+
+#endif //HAS_LIBLIVES_H

LiVES-2.2.8.tar.bz2/src/lives-yuv4mpeg.c -> LiVES-2.4.1.tar.bz2/src/lives-yuv4mpeg.c Changed

@@ -1,6 +1,6 @@
 // yuv4mpeg.c
 // LiVES
-// (c) G. Finch 2004 - 2013 <salsaman@gmail.com>
+// (c) G. Finch 2004 - 2015 <salsaman@gmail.com>
 // released under the GNU GPL 3 or later
 // see file ../COPYING or www.gnu.org for licensing details
 
@@ -25,7 +25,7 @@
 
 
 typedef struct y4data {
-  const gchar *filename;
+  const char *filename;
   lives_yuv4m_t *yuv4mpeg;
 
   int fd;
@@ -38,16 +38,16 @@
 
 
 // lists of cards in use
-static GList *fw_cards=NULL;
+static LiVESList *fw_cards=NULL;
 
 
-static lives_yuv4m_t *lives_yuv4mpeg_alloc (void) {
-  lives_yuv4m_t *yuv4mpeg = (lives_yuv4m_t *) malloc (sizeof(lives_yuv4m_t));
+static lives_yuv4m_t *lives_yuv4mpeg_alloc(void) {
+  lives_yuv4m_t *yuv4mpeg = (lives_yuv4m_t *) malloc(sizeof(lives_yuv4m_t));
   if (yuv4mpeg==NULL) return NULL;
   yuv4mpeg->sar = y4m_sar_UNKNOWN;
   yuv4mpeg->dar = y4m_dar_4_3;
-  y4m_init_stream_info (&(yuv4mpeg->streaminfo));
-  y4m_init_frame_info (&(yuv4mpeg->frameinfo));
+  y4m_init_stream_info(&(yuv4mpeg->streaminfo));
+  y4m_init_frame_info(&(yuv4mpeg->frameinfo));
   yuv4mpeg->filename=NULL;
   yuv4mpeg->name=NULL;
   yuv4mpeg->fd=-1;
@@ -56,7 +56,7 @@
 }
 
 
-static void *y4open_thread (void *arg) {
+static void *y4open_thread(void *arg) {
   y4data *thread_data=(y4data *)arg;
   int fd=open(thread_data->filename,O_RDONLY);
   thread_data->fd=fd;
@@ -64,10 +64,10 @@
 }
 
 
-static void *y4header_thread (void *arg) {
+static void *y4header_thread(void *arg) {
   y4data *thread_data=(y4data *)arg;
   lives_yuv4m_t *yuv4mpeg=thread_data->yuv4mpeg;
-  thread_data->i = y4m_read_stream_header (yuv4mpeg->fd, &(yuv4mpeg->streaminfo));
+  thread_data->i = y4m_read_stream_header(yuv4mpeg->fd, &(yuv4mpeg->streaminfo));
   pthread_exit(NULL);
 }
 
@@ -85,7 +85,7 @@
 }
 
 
-static void *y4frame_thread (void *arg) {
+static void *y4frame_thread(void *arg) {
   y4data *thread_data=(y4data *)arg;
   lives_yuv4m_t *yuv4mpeg=thread_data->yuv4mpeg;
   char buff[5],bchar;
@@ -118,14 +118,14 @@
 #define YUV4_H_TIME 500000000 // ticks to wait to get stream header
 
 
-static boolean lives_yuv_stream_start_read (lives_clip_t *sfile) {
+static boolean lives_yuv_stream_start_read(lives_clip_t *sfile) {
   double ofps=sfile->fps;
 
   lives_yuv4m_t *yuv4mpeg=(lives_yuv4m_t *)sfile->ext_src;
 
   pthread_t y4thread;
 
-  gchar *filename=yuv4mpeg->filename,*tmp;
+  char *filename=yuv4mpeg->filename,*tmp;
 
   int alarm_handle=0;
 
@@ -153,10 +153,10 @@
 
     while (!lives_alarm_get(alarm_handle)&&!pthread_kill(y4thread,0)) {
       // wait for thread to complete or timeout
-      g_usleep(prefs->sleep_time);
+      lives_usleep(prefs->sleep_time);
       lives_widget_context_update();
     }
-    
+
     if (lives_alarm_get(alarm_handle)) {
       // timeout - kill thread and wait for it to terminate
       pthread_cancel(y4thread);
@@ -169,8 +169,8 @@
       yuv4mpeg->fd=thread_data.fd;
 
       if (yuv4mpeg->fd>=0) {
-	close(yuv4mpeg->fd);
-	yuv4mpeg->fd=-1;
+        close(yuv4mpeg->fd);
+        yuv4mpeg->fd=-1;
       }
 
       return FALSE;
@@ -193,7 +193,7 @@
 
   while (!lives_alarm_get(alarm_handle)&&!pthread_kill(y4thread,0)) {
     // wait for thread to complete or timeout
-    g_usleep(prefs->sleep_time);
+    lives_usleep(prefs->sleep_time);
     lives_widget_context_update();
   }
 
@@ -212,33 +212,33 @@
   i=thread_data.i;
 
   if (i != Y4M_OK) {
-    gchar *tmp;
-    d_print ((tmp=g_strdup_printf ("yuv4mpeg: %s\n", y4m_strerr (i))));
-    g_free(tmp);
+    char *tmp;
+    d_print((tmp=lives_strdup_printf("yuv4mpeg: %s\n", y4m_strerr(i))));
+    lives_free(tmp);
     return FALSE;
   }
 
   d_print(_("got header\n"));
 
-  sfile->hsize = yuv4mpeg->hsize = y4m_si_get_width (&(yuv4mpeg->streaminfo));
-  sfile->vsize = yuv4mpeg->vsize = y4m_si_get_height (&(yuv4mpeg->streaminfo));
+  sfile->hsize = yuv4mpeg->hsize = y4m_si_get_width(&(yuv4mpeg->streaminfo));
+  sfile->vsize = yuv4mpeg->vsize = y4m_si_get_height(&(yuv4mpeg->streaminfo));
 
-  sfile->fps=cfile->pb_fps=g_strtod (g_strdup_printf ("%.8f",Y4M_RATIO_DBL 
-						      (y4m_si_get_framerate (&(yuv4mpeg->streaminfo)))),NULL);
+  sfile->fps=cfile->pb_fps=lives_strtod(lives_strdup_printf("%.8f",Y4M_RATIO_DBL
+                                        (y4m_si_get_framerate(&(yuv4mpeg->streaminfo)))),NULL);
 
-  if(!(sfile->hsize*sfile->vsize)){
-      do_error_dialog (g_strdup_printf (_("Video dimensions: %d x %d are invalid. Stream cannot be opened"), 
-					sfile->hsize,sfile->vsize));
-      return FALSE;
+  if (!(sfile->hsize*sfile->vsize)) {
+    do_error_dialog(lives_strdup_printf(_("Video dimensions: %d x %d are invalid. Stream cannot be opened"),
+                                        sfile->hsize,sfile->vsize));
+    return FALSE;
   }
 
   if (sfile->hsize!=ohsize||sfile->vsize!=ovsize||sfile->fps!=ofps) {
     set_main_title(sfile->file_name,0);
   }
 
-  d_print ((tmp=g_strdup_printf(_ ("Reset clip values for %s: size=%dx%d fps=%.3f\n"),yuv4mpeg->name,
-				cfile->hsize,yuv4mpeg->vsize,cfile->bpp,cfile->fps)));
-  g_free(tmp);
+  d_print((tmp=lives_strdup_printf(_("Reset clip values for %s: size=%dx%d fps=%.3f\n"),yuv4mpeg->name,
+                                   cfile->hsize,yuv4mpeg->vsize,cfile->bpp,cfile->fps)));
+  lives_free(tmp);
 
   yuv4mpeg->ready=TRUE;
 
@@ -247,23 +247,23 @@
 
 
 
-void lives_yuv_stream_stop_read (lives_yuv4m_t *yuv4mpeg) {
+void lives_yuv_stream_stop_read(lives_yuv4m_t *yuv4mpeg) {
 
-  y4m_fini_stream_info (&(yuv4mpeg->streaminfo));
-  y4m_fini_frame_info (&(yuv4mpeg->frameinfo));
+  y4m_fini_stream_info(&(yuv4mpeg->streaminfo));
+  y4m_fini_frame_info(&(yuv4mpeg->frameinfo));
   yuv4mpeg->sar = y4m_sar_UNKNOWN;
   yuv4mpeg->dar = y4m_dar_4_3;
-  if (yuv4mpeg->fd!=-1) close (yuv4mpeg->fd);
+  if (yuv4mpeg->fd!=-1) close(yuv4mpeg->fd);
 
   if (yuv4mpeg->filename!=NULL) {
     unlink(yuv4mpeg->filename);
-    g_free(yuv4mpeg->filename);
+    lives_free(yuv4mpeg->filename);
   }
 
-  if (yuv4mpeg->name!=NULL) g_free(yuv4mpeg->name);
+  if (yuv4mpeg->name!=NULL) lives_free(yuv4mpeg->name);
 
-  if (yuv4mpeg->type==YUV4_TYPE_FW) fw_cards=g_list_remove(fw_cards,GINT_TO_POINTER(yuv4mpeg->cardno));
-  if (yuv4mpeg->type==YUV4_TYPE_TV) mainw->videodevs=g_list_remove(mainw->videodevs,GINT_TO_POINTER(yuv4mpeg->cardno));
+  if (yuv4mpeg->type==YUV4_TYPE_FW) fw_cards=lives_list_remove(fw_cards,LIVES_INT_TO_POINTER(yuv4mpeg->cardno));
+  if (yuv4mpeg->type==YUV4_TYPE_TV) mainw->videodevs=lives_list_remove(mainw->videodevs,LIVES_INT_TO_POINTER(yuv4mpeg->cardno));
 
 
 }
@@ -271,7 +271,7 @@
 #define YUV4_F_TIME 200000000 // ticks to wait to get stream header
 
 
-void weed_layer_set_from_yuv4m (weed_plant_t *layer, lives_clip_t *sfile) {
+void weed_layer_set_from_yuv4m(weed_plant_t *layer, lives_clip_t *sfile) {
   lives_yuv4m_t *yuv4mpeg=(lives_yuv4m_t *)(sfile->ext_src);
 
   y4data thread_data;
@@ -306,7 +306,7 @@
 
   while (!lives_alarm_get(alarm_handle)&&!pthread_kill(y4thread,0)) {
     // wait for thread to complete or timeout
-    g_usleep(prefs->sleep_time);
+    lives_usleep(prefs->sleep_time);
   }
 
   if (lives_alarm_get(alarm_handle)) {
@@ -319,7 +319,7 @@
   pthread_join(y4thread,NULL);
   lives_alarm_clear(alarm_handle);
 
-  weed_free(yuv4mpeg->pixel_data);
+  lives_free(yuv4mpeg->pixel_data);
   yuv4mpeg->pixel_data=NULL;
 
   weed_set_int_value(layer,"YUV_sampling",WEED_YUV_SAMPLING_MPEG);
@@ -330,7 +330,7 @@
 
 
 
-static boolean open_yuv4m_inner(const gchar *filename, const gchar *fname, int new_file, int type, int cardno) {
+static boolean open_yuv4m_inner(const char *filename, const char *fname, int new_file, int type, int cardno) {
   // create a virtual clip
   int old_file=mainw->current_file;
 
@@ -343,8 +343,8 @@
 
   yuv4mpeg->fd=-1;
 
-  yuv4mpeg->filename=g_strdup(filename);
-  yuv4mpeg->name=g_strdup(fname);
+  yuv4mpeg->filename=lives_strdup(filename);
+  yuv4mpeg->name=lives_strdup(fname);
 
   yuv4mpeg->type=type;
   yuv4mpeg->cardno=cardno;
@@ -371,67 +371,66 @@
 
 
 
-void on_open_yuv4m_activate (LiVESMenuItem *menuitem, gpointer user_data) {
+void on_open_yuv4m_activate(LiVESMenuItem *menuitem, livespointer user_data) {
   // open a general yuvmpeg stream
   // start "playing" but open frames in yuv4mpeg format on stdin
 
   int old_file=mainw->current_file,new_file=mainw->first_free_file;
-  gchar *tmp;
-  gchar *filename;
-  gchar *fname;
+  char *tmp;
+  char *filename;
+  char *fname;
 
-  gchar *audio_real,*audio_fake;
+  char *audio_real,*audio_fake;
 
   if (menuitem && !do_yuv4m_open_warning()) return;
 
-  fname=g_strdup(_("yuv4mpeg stream"));
+  fname=lives_strdup(_("yuv4mpeg stream"));
 
   if (!get_new_handle(new_file,fname)) {
-    g_free(fname);
+    lives_free(fname);
     return;
   }
 
   mainw->current_file=new_file;
 
   if (!strlen(prefs->yuvin))
-      filename=g_build_filename(prefs->tmpdir,"stream.yuv",NULL);
+    filename=lives_build_filename(prefs->tmpdir,"stream.yuv",NULL);
   else
-    filename=g_strdup(prefs->yuvin);
+    filename=lives_strdup(prefs->yuvin);
 
   mkfifo(filename,S_IRUSR|S_IWUSR);
 
   if (!open_yuv4m_inner(filename,fname,new_file,YUV4_TYPE_GENERIC,0)) {
     close_current_file(old_file);
-    g_free(filename);
-    g_free(fname);
+    lives_free(filename);
+    lives_free(fname);
     return;
   }
 
-  g_free(fname);
+  lives_free(fname);
 
   if (!lives_yuv_stream_start_read(cfile)) {
     close_current_file(old_file);
-    g_free(filename);
+    lives_free(filename);
     return;
   }
 
   new_file=mainw->current_file;
 
-  g_snprintf(cfile->type,40,"%s",_("yu4mpeg stream in"));
+  lives_snprintf(cfile->type,40,"%s",_("yu4mpeg stream in"));
 
-  d_print ((tmp=g_strdup_printf (_("Opened yuv4mpeg stream on %s"),filename)));
-  g_free(tmp);
-  g_free(filename);
+  d_print((tmp=lives_strdup_printf(_("Opened yuv4mpeg stream on %s"),filename)));
+  lives_free(tmp);
+  lives_free(filename);
 
   d_print(_("Audio: "));
 
   if (cfile->achans==0) {
-    d_print (_ ("none\n"));
-  }
-  else {
-    d_print ((tmp=g_strdup_printf(P_("%d Hz %d channel %d bps\n","%d Hz %d channels %d bps\n",cfile->achans),
-				  cfile->arate,cfile->achans,cfile->asampsize)));
-    g_free(tmp);
+    d_print(_("none\n"));
+  } else {
+    d_print((tmp=lives_strdup_printf(P_("%d Hz %d channel %d bps\n","%d Hz %d channels %d bps\n",cfile->achans),
+                                     cfile->arate,cfile->achans,cfile->asampsize)));
+    lives_free(tmp);
   }
 
   // if not playing, start playing
@@ -441,29 +440,29 @@
     // an opening preview . Doesn't work with fifo.
     // and we dont really care if it doesnt work
 
-    // but what it means is, if we have an audio file or stream at 
+    // but what it means is, if we have an audio file or stream at
     // "prefs->tmpdir/audiodump.pcm" we will try to play it
 
 
 
     // real is tmpdir/audiodump.pcm
-    audio_real=g_build_filename(prefs->tmpdir,"audiodump.pcm",NULL);
+    audio_real=lives_build_filename(prefs->tmpdir,"audiodump.pcm",NULL);
     // fake is tmpdir/handle/audiodump.pcm
-    audio_fake=g_build_filename(prefs->tmpdir,cfile->handle,"audiodump.pcm",NULL);
+    audio_fake=lives_build_filename(prefs->tmpdir,cfile->handle,"audiodump.pcm",NULL);
 
 
 #ifndef IS_MINGW
     // fake file will go away when we close the current clip
-    lives_system ((tmp=g_strdup_printf ("/bin/ln -s \"%s\" \"%s\" >/dev/null 2>&1",
-					audio_real,audio_fake)),TRUE);
+    lives_system((tmp=lives_strdup_printf("%s -s \"%s\" \"%s\" >/dev/null 2>&1",capable->ln_cmd,
+                                          audio_real,audio_fake)),TRUE);
 #else
     // TODO
 #endif
 
-    g_free(audio_real);
-    g_free(audio_fake);
+    lives_free(audio_real);
+    lives_free(audio_fake);
 
-    g_free(tmp);
+    lives_free(tmp);
 
     // start playing
     play_file();
@@ -471,8 +470,8 @@
     mainw->noswitch=FALSE;
   }
   // TODO - else...
-  
-  if (mainw->current_file!=old_file&&mainw->current_file!=new_file) 
+
+  if (mainw->current_file!=old_file&&mainw->current_file!=new_file)
     old_file=mainw->current_file; // we could have rendered to a new file
 
   mainw->current_file=new_file;
@@ -487,33 +486,32 @@
 // write functions - not used currently
 
 
-boolean lives_yuv_stream_start_write (lives_yuv4m_t * yuv4mpeg, const gchar *filename, int hsize, int vsize, double fps) {
+boolean lives_yuv_stream_start_write(lives_yuv4m_t *yuv4mpeg, const char *filename, int hsize, int vsize, double fps) {
   int i;
 
   if (mainw->fixed_fpsd>-1.&&mainw->fixed_fpsd!=fps) {
-    do_error_dialog(g_strdup_printf(_("Unable to set display framerate to %.3f fps.\n\n"),fps));
+    do_error_dialog(lives_strdup_printf(_("Unable to set display framerate to %.3f fps.\n\n"),fps));
     return FALSE;
   }
   mainw->fixed_fpsd=fps;
 
-  if (filename==NULL) filename=g_strdup_printf ("%s/streamout.yuv",prefs->tmpdir);
+  if (filename==NULL) filename=lives_strdup_printf("%s/streamout.yuv",prefs->tmpdir);
 
   // TODO - do_threaded_dialog
-  if ((yuvout=creat (filename,O_CREAT))<0) {
-    do_error_dialog (g_strdup_printf (_("Unable to open yuv4mpeg out stream %s\n"),filename));
+  if ((yuvout=creat(filename,O_CREAT))<0) {
+    do_error_dialog(lives_strdup_printf(_("Unable to open yuv4mpeg out stream %s\n"),filename));
     return FALSE;
   }
 
   if (mainw->fixed_fpsd>23.9999&&mainw->fixed_fpsd<24.0001) {
     y4m_si_set_framerate(&(yuv4mpeg->streaminfo),y4m_fps_FILM);
-  }
-  else return FALSE;
+  } else return FALSE;
   y4m_si_set_interlace(&(yuv4mpeg->streaminfo), Y4M_ILACE_NONE);
 
   y4m_si_set_width(&(yuv4mpeg->streaminfo), (hsize_out=hsize));
   y4m_si_set_height(&(yuv4mpeg->streaminfo), (vsize_out=vsize));
   y4m_si_set_sampleaspect(&(yuv4mpeg->streaminfo), yuv4mpeg->sar);
-    
+
   i = y4m_write_stream_header(yuvout, &(yuv4mpeg->streaminfo));
 
   if (i != Y4M_OK) return FALSE;
@@ -522,11 +520,11 @@
 }
 
 
-boolean lives_yuv_stream_write_frame (lives_yuv4m_t *yuv4mpeg, void *pixel_data) {
+boolean lives_yuv_stream_write_frame(lives_yuv4m_t *yuv4mpeg, void *pixel_data) {
   // pixel_data is planar yuv420 data
   int i;
 
-  guchar *planes[3];
+  uint8_t *planes[3];
   uint8_t *pixels=(uint8_t *)pixel_data;
 
   planes[0]=&(pixels[0]);
@@ -534,16 +532,16 @@
   planes[2]=&(pixels[hsize_out*vsize_out*5/4]);
 
   i = y4m_write_frame(yuvout, &(yuv4mpeg->streaminfo),
-  		&(yuv4mpeg->frameinfo), (uint8_t **)&planes[0]);
+                      &(yuv4mpeg->frameinfo), (uint8_t **)&planes[0]);
   if (i != Y4M_OK) return FALSE;
   return TRUE;
 }
 
 
-void lives_yuv_stream_stop_write (lives_yuv4m_t *yuv4mpeg) {
+void lives_yuv_stream_stop_write(lives_yuv4m_t *yuv4mpeg) {
   y4m_fini_stream_info(&(yuv4mpeg->streaminfo));
   y4m_fini_frame_info(&(yuv4mpeg->frameinfo));
-  close (yuvout);
+  close(yuvout);
 }
 
 
@@ -579,20 +577,20 @@
 
 
 
-void on_live_tvcard_activate (LiVESMenuItem *menuitem, gpointer user_data) {
+void on_live_tvcard_activate(LiVESMenuItem *menuitem, livespointer user_data) {
   int cardno=0;
 
   int new_file=mainw->first_free_file;
 
   int response;
 
-  gchar *com,*tmp;
-  gchar *fifofile=g_strdup_printf("%s/tvpic.%d",prefs->tmpdir,capable->mainpid);
+  char *com,*tmp;
+  char *fifofile=lives_strdup_printf("%s/tvpic.%d",prefs->tmpdir,capable->mainpid);
 
-  gchar *chanstr;
-  gchar *devstr;
+  char *chanstr;
+  char *devstr;
 
-  gchar *fname;
+  char *fname;
 
   LiVESWidget *card_dialog;
 
@@ -602,54 +600,54 @@
 
   card_dialog=create_cdtrack_dialog(4,NULL);
 
-  tvcardw=(lives_tvcardw_t *)g_object_get_data(G_OBJECT(card_dialog),"tvcard_data");
+  tvcardw=(lives_tvcardw_t *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(card_dialog),"tvcard_data");
 
 
   response=lives_dialog_run(LIVES_DIALOG(card_dialog));
   if (response==LIVES_RESPONSE_CANCEL) {
     lives_widget_destroy(card_dialog);
-    g_free(fifofile);
-    g_free(tvcardw);
+    lives_free(fifofile);
+    lives_free(tvcardw);
     return;
   }
 
   cardno=(int)mainw->fx1_val;
-  chanstr=g_strdup_printf("%d",(int)mainw->fx2_val);
+  chanstr=lives_strdup_printf("%d",(int)mainw->fx2_val);
 
-  if (g_list_find(mainw->videodevs,GINT_TO_POINTER(cardno))) {
+  if (lives_list_find(mainw->videodevs,LIVES_INT_TO_POINTER(cardno))) {
     lives_widget_destroy(card_dialog);
     do_card_in_use_error();
-    g_free(chanstr);
-    g_free(fifofile);
-    g_free(tvcardw);
+    lives_free(chanstr);
+    lives_free(fifofile);
+    lives_free(tvcardw);
     return;
   }
 
-  fname=g_strdup_printf(_("TV card %d"),cardno);
+  fname=lives_strdup_printf(_("TV card %d"),cardno);
 
   if (!get_new_handle(new_file,fname)) {
     lives_widget_destroy(card_dialog);
-    g_free(chanstr);
-    g_free(fifofile);
-    g_free(fname);
-    g_free(tvcardw);
+    lives_free(chanstr);
+    lives_free(fifofile);
+    lives_free(fname);
+    lives_free(tvcardw);
     return;
   }
 
-  devstr=g_strdup_printf("/dev/video%d",cardno);
+  devstr=lives_strdup_printf("/dev/video%d",cardno);
 
   if (!check_dev_busy(devstr)) {
     lives_widget_destroy(card_dialog);
     do_dev_busy_error(fname);
-    g_free(devstr);
-    g_free(chanstr);
-    g_free(fifofile);
-    g_free(fname);
-    g_free(tvcardw);
+    lives_free(devstr);
+    lives_free(chanstr);
+    lives_free(fifofile);
+    lives_free(fname);
+    lives_free(tvcardw);
     return;
   }
 
-  mainw->videodevs=g_list_append(mainw->videodevs,GINT_TO_POINTER(cardno));
+  mainw->videodevs=lives_list_append(mainw->videodevs,LIVES_INT_TO_POINTER(cardno));
 
   mainw->current_file=new_file;
 
@@ -659,15 +657,14 @@
   mkfifo(fifofile,S_IRUSR|S_IWUSR);
 
   if (!tvcardw->use_advanced) {
-    com=g_strdup_printf("%s open_tv_card \"%s\" \"%s\" \"%s\" \"%s\"",prefs->backend,cfile->handle,chanstr,
-			devstr,fifofile);
-  }
-  else {
+    com=lives_strdup_printf("%s open_tv_card \"%s\" \"%s\" \"%s\" \"%s\"",prefs->backend,cfile->handle,chanstr,
+                            devstr,fifofile);
+  } else {
     double fps=0.;
-    gchar *driver=NULL,*outfmt=NULL;
+    char *driver=NULL,*outfmt=NULL;
     int width=0,height=0;
     int input=lives_spin_button_get_value_as_int(LIVES_SPIN_BUTTON(tvcardw->spinbuttoni));
-    
+
     if (!lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(tvcardw->radiobuttond))) {
       width=lives_spin_button_get_value_as_int(LIVES_SPIN_BUTTON(tvcardw->spinbuttonw));
       height=lives_spin_button_get_value_as_int(LIVES_SPIN_BUTTON(tvcardw->spinbuttonh));
@@ -677,54 +674,54 @@
     driver=lives_combo_get_active_text(LIVES_COMBO(tvcardw->combod));
     outfmt=lives_combo_get_active_text(LIVES_COMBO(tvcardw->comboo));
 
-    com=g_strdup_printf("%s open_tv_card \"%s\" \"%s\" \"%s\" \"%s\" %d %d %d %.3f \"%s\" \"%s\"",
-			prefs->backend,cfile->handle,chanstr,
-			devstr,fifofile,input,width,height,fps,driver,outfmt);
-    g_free(driver);
-    g_free(outfmt);
+    com=lives_strdup_printf("%s open_tv_card \"%s\" \"%s\" \"%s\" \"%s\" %d %d %d %.3f \"%s\" \"%s\"",
+                            prefs->backend,cfile->handle,chanstr,
+                            devstr,fifofile,input,width,height,fps,driver,outfmt);
+    lives_free(driver);
+    lives_free(outfmt);
 
   }
   lives_widget_destroy(card_dialog);
-  g_free(tvcardw);
+  lives_free(tvcardw);
 
   mainw->com_failed=FALSE;
   lives_system(com,FALSE);
-  g_free(com);
+  lives_free(com);
 
   if (mainw->com_failed) {
     mainw->com_failed=FALSE;
-    g_free(fname);
-    g_free(chanstr);
-    g_free(fifofile);
-    g_free(devstr);
+    lives_free(fname);
+    lives_free(chanstr);
+    lives_free(fifofile);
+    lives_free(devstr);
     return;
   }
-			       
+
   if (!open_yuv4m_inner(fifofile,fname,new_file,YUV4_TYPE_TV,cardno)) {
-    g_free(fname);
-    g_free(chanstr);
-    g_free(fifofile);
-    g_free(devstr);
+    lives_free(fname);
+    lives_free(chanstr);
+    lives_free(fifofile);
+    lives_free(devstr);
     return;
   }
-			       
-  g_snprintf(cfile->type,40,"%s",fname);
-  
-  d_print ((tmp=g_strdup_printf (_("Opened TV card %d (%s)"),cardno,devstr)));
-
-  g_free(tmp);
-  g_free(fname);
-  g_free(chanstr);
-  g_free(devstr);
-  g_free(fifofile);
-    
+
+  lives_snprintf(cfile->type,40,"%s",fname);
+
+  d_print((tmp=lives_strdup_printf(_("Opened TV card %d (%s)"),cardno,devstr)));
+
+  lives_free(tmp);
+  lives_free(fname);
+  lives_free(chanstr);
+  lives_free(devstr);
+  lives_free(fifofile);
+
 }
 
 
 
-void on_live_fw_activate (LiVESMenuItem *menuitem, gpointer user_data) {
+void on_live_fw_activate(LiVESMenuItem *menuitem, livespointer user_data) {
 
-  gchar *com,*tmp;
+  char *com,*tmp;
   int cardno;
   int cache=1024;
 
@@ -732,8 +729,8 @@
 
   int response;
 
-  gchar *fifofile=g_strdup_printf("%s/firew.%d",prefs->tmpdir,capable->mainpid);
-  gchar *fname;
+  char *fifofile=lives_strdup_printf("%s/firew.%d",prefs->tmpdir,capable->mainpid);
+  char *fname;
 
   LiVESWidget *card_dialog;
 
@@ -743,7 +740,7 @@
   response=lives_dialog_run(LIVES_DIALOG(card_dialog));
   if (response==LIVES_RESPONSE_CANCEL) {
     lives_widget_destroy(card_dialog);
-    g_free(fifofile);
+    lives_free(fifofile);
     return;
   }
 
@@ -751,21 +748,21 @@
 
   lives_widget_destroy(card_dialog);
 
-  if (g_list_find(fw_cards,GINT_TO_POINTER(cardno))) {
-    g_free(fifofile);
+  if (lives_list_find(fw_cards,LIVES_INT_TO_POINTER(cardno))) {
+    lives_free(fifofile);
     do_card_in_use_error();
     return;
   }
 
-  fname=g_strdup_printf(_("Firewire card %d"),cardno);
+  fname=lives_strdup_printf(_("Firewire card %d"),cardno);
 
   if (!get_new_handle(new_file,fname)) {
-    g_free(fifofile);
-    g_free(fname);
+    lives_free(fifofile);
+    lives_free(fname);
     return;
   }
 
-  fw_cards=g_list_append(fw_cards,GINT_TO_POINTER(cardno));
+  fw_cards=lives_list_append(fw_cards,LIVES_INT_TO_POINTER(cardno));
 
   mainw->current_file=new_file;
   cfile->deinterlace=mainw->open_deint;
@@ -773,30 +770,30 @@
   unlink(fifofile);
   mkfifo(fifofile,S_IRUSR|S_IWUSR);
 
-  com=g_strdup_printf("%s open_fw_card \"%s\" %d %d \"%s\"",prefs->backend,cfile->handle,cardno,cache,fifofile);
+  com=lives_strdup_printf("%s open_fw_card \"%s\" %d %d \"%s\"",prefs->backend,cfile->handle,cardno,cache,fifofile);
   mainw->com_failed=FALSE;
   lives_system(com,FALSE);
-  g_free(com);
+  lives_free(com);
 
   if (mainw->com_failed) {
     mainw->com_failed=FALSE;
-    g_free(fname);
-    g_free(fifofile);
+    lives_free(fname);
+    lives_free(fifofile);
     return;
   }
 
   if (!open_yuv4m_inner(fifofile,fname,new_file,YUV4_TYPE_FW,cardno)) {
-    g_free(fname);
-    g_free(fifofile);
+    lives_free(fname);
+    lives_free(fifofile);
     return;
   }
-			       
-  g_snprintf(cfile->type,40,"%s",fname);
-  
-  d_print ((tmp=g_strdup_printf (_("Opened firewire card %d"),cardno)));
-
-  g_free(tmp);
-  g_free(fname);
-  g_free(fifofile);
+
+  lives_snprintf(cfile->type,40,"%s",fname);
+
+  d_print((tmp=lives_strdup_printf(_("Opened firewire card %d"),cardno)));
+
+  lives_free(tmp);
+  lives_free(fname);
+  lives_free(fifofile);
 
 }

LiVES-2.2.8.tar.bz2/src/lives-yuv4mpeg.h -> LiVES-2.4.1.tar.bz2/src/lives-yuv4mpeg.h Changed

@@ -22,8 +22,8 @@
   y4m_frame_info_t frameinfo;
   y4m_ratio_t sar;
   y4m_ratio_t dar;
-  gchar *name;
-  gchar *filename;
+  char *name;
+  char *filename;
   int fd;
   int hsize;
   int vsize;
@@ -31,26 +31,26 @@
   boolean ready;
 } lives_yuv4m_t;
 
-void weed_layer_set_from_yuv4m (weed_plant_t *layer, lives_clip_t *);
+void weed_layer_set_from_yuv4m(weed_plant_t *layer, lives_clip_t *);
 
 // callbacks
-void on_open_yuv4m_activate (LiVESMenuItem *, gpointer);
-void on_live_tvcard_activate (LiVESMenuItem *, gpointer);
-void on_live_fw_activate (LiVESMenuItem *, gpointer);
+void on_open_yuv4m_activate(LiVESMenuItem *, livespointer);
+void on_live_tvcard_activate(LiVESMenuItem *, livespointer);
+void on_live_fw_activate(LiVESMenuItem *, livespointer);
 
-void lives_yuv_stream_stop_read (lives_yuv4m_t *);
+void lives_yuv_stream_stop_read(lives_yuv4m_t *);
 
 
 /// not used
-boolean lives_yuv_stream_start_write (lives_yuv4m_t *, const gchar *filename, int hsize, int vsize, double fps);
-boolean lives_yuv_stream_write_frame (lives_yuv4m_t *, void *pixel_data);
-void lives_yuv_stream_stop_write (lives_yuv4m_t *);
+boolean lives_yuv_stream_start_write(lives_yuv4m_t *, const char *filename, int hsize, int vsize, double fps);
+boolean lives_yuv_stream_write_frame(lives_yuv4m_t *, void *pixel_data);
+void lives_yuv_stream_stop_write(lives_yuv4m_t *);
 
 
 typedef struct {
   LiVESWidget *dialog;
   LiVESWidget *card_spin;
-  LiVESWidget * channel_spin;
+  LiVESWidget *channel_spin;
 } lives_card_w;

LiVES-2.2.8.tar.bz2/src/main.c -> LiVES-2.4.1.tar.bz2/src/main.c Changed

@@ -16,7 +16,10 @@
     Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
 */
 
+
+#ifdef USE_GLIB
 #include <glib.h>
+#endif
 
 #if HAVE_SYSTEM_WEED
 #include <weed/weed.h>
@@ -32,8 +35,11 @@
 #include "../libweed/weed-host.h"
 #endif
 
+
 #define NEED_DEF_WIDGET_OPTS
 
+#define NEED_ENDIAN_TEST
+
 #include "main.h"
 #include "interface.h"
 #include "support.h"
@@ -49,6 +55,7 @@
 #include "cvirtual.h"
 #include "ce_thumbs.h"
 
+
 #ifdef ENABLE_OSC
 #include "omc-learn.h"
 #endif
@@ -76,10 +83,11 @@
 #endif
 
 
+
 ////////////////////////////////
 capability *capable;
 _palette *palette;
-size_t sizint, sizdbl, sizshrt;
+ssize_t sizint, sizdbl, sizshrt;
 mainwindow *mainw;
 
 
@@ -87,7 +95,7 @@
 
 static boolean no_recover=FALSE,auto_recover=FALSE;
 static boolean upgrade_error=FALSE;
-static gchar start_file[PATH_MAX];
+static char start_file[PATH_MAX];
 static double start=0.;
 static int end=0;
 
@@ -98,24 +106,26 @@
 static int zargc;
 static char **zargv;
 
+#ifndef NO_PROG_LOAD
 static int xxwidth=0,xxheight=0;
+#endif
 
 ////////////////////
 
-
-/* not static */
-GtkTargetEntry target_table[]  = {
+#ifdef GUI_GTK
+LiVESTargetEntry target_table[]  = {
   { "STRING",                     GTK_TARGET_OTHER_APP, 0 },
   { "text/uri-list",              GTK_TARGET_OTHER_APP, 0 },
 };
-
+#endif
 
 
 /////////////////////////////////
 #ifdef NO_COMPILE // never compile this
 void tr_msg(void) {
   // TRANSLATORS: do not translate this message
-  gchar *msg=(_("Attention Translators !\nThis message is intended for you, so please do not translate it.\n\nAll translators should read the LiVES translation notes at\nhttp://lives.sourceforge.net/TRANS-README.txt"));
+  char *msg=
+    (_("Attention Translators !\nThis message is intended for you, so please do not translate it.\n\nAll translators should read the LiVES translation notes at\nhttp://lives.sourceforge.net/TRANS-README.txt"));
 }
 #endif
 
@@ -124,31 +134,42 @@
   // breakpoint for gdb
 }
 
-static void lives_log_handler (const char *domain, LiVESLogLevelFlags level, const char *message,  gpointer data) {
-  gchar *msg;
+
+// in library we run gtk in a thread so we can return to caller
+void *gtk_thread_wrapper(void *data) {
+  gtk_main();
+  return NULL;
+}
+
+
+#ifdef USE_GLIB
+static void lives_log_handler(const char *domain, LiVESLogLevelFlags level, const char *message,  livespointer data) {
+  char *msg;
 
 #ifdef LIVES_NO_DEBUG
-  if (level>=LIVES_LOG_LEVEL_WARNING ) return;
+  if (level>=LIVES_LOG_LEVEL_WARNING) return;
 #else
-  if ((level&LIVES_LOG_LEVEL_MASK)==LIVES_LOG_LEVEL_WARNING) 
-    msg=g_strdup_printf(_("%s Warning: %s\n"),domain,message);
+  if ((level&LIVES_LOG_LEVEL_MASK)==LIVES_LOG_LEVEL_WARNING)
+    msg=lives_strdup_printf(_("%s Warning: %s\n"),domain,message);
 #endif
   else {
-    if ((level&LIVES_LOG_LEVEL_MASK)==LIVES_LOG_LEVEL_CRITICAL) 
-      msg=g_strdup_printf(_("%s Critical error: %s\n"),domain,message);
-    else msg=g_strdup_printf(_("%s Fatal error: %s\n"),domain,message);
+    if ((level&LIVES_LOG_LEVEL_MASK)==LIVES_LOG_LEVEL_CRITICAL)
+      msg=lives_strdup_printf(_("%s Critical error: %s\n"),domain,message);
+    else msg=lives_strdup_printf(_("%s Fatal error: %s\n"),domain,message);
   }
 
   if (mainw->is_ready) {
     d_print(msg);
   }
 
-  g_printerr("%s",msg);
-  g_free(msg);
+  lives_printerr("%s",msg);
+  lives_free(msg);
 
   if (level&LIVES_LOG_FATAL_MASK) raise(LIVES_SIGSEGV);
 }
 
+#endif
+
 #ifdef IS_MINGW
 typedef void (*SignalHandlerPointer)(int);
 #endif
@@ -160,42 +181,45 @@
 }
 
 void catch_sigint(int signum) {
-  // trap for ctrl-C and others 
+  // trap for ctrl-C and others
   if (mainw!=NULL) {
     if (mainw->LiVES!=NULL) {
       if (mainw->foreign) {
-	exit (signum);
+        exit(signum);
       }
 
       if (mainw->multitrack!=NULL) mainw->multitrack->idlefunc=0;
       mainw->fatal=TRUE;
 
       if (signum==LIVES_SIGABRT||signum==LIVES_SIGSEGV) {
-	signal (LIVES_SIGSEGV, SIG_DFL);
-	signal (LIVES_SIGABRT, SIG_DFL);
-	g_printerr("%s",_("\nUnfortunately LiVES crashed.\nPlease report this bug at http://sourceforge.net/tracker/?group_id=64341&atid=507139\nThanks. Recovery should be possible if you restart LiVES.\n"));
-	g_printerr("%s",_("\n\nWhen reporting crashes, please include details of your operating system, distribution, and the LiVES version (" LiVES_VERSION ")\n"));
-
-	if (capable->has_gdb) {
-	  if (mainw->debug) g_printerr("%s",_("and any information shown below:\n\n"));
-	  else g_printerr("%s","Please try running LiVES with the -debug option to collect more information.\n\n");
-	}
-	else {
-	  g_printerr("%s",_("Please install gdb and then run LiVES with the -debug option to collect more information.\n\n"));
-	}
-	if (mainw->debug) {
-	  g_on_error_stack_trace(capable->myname_full);
-	}
+        signal(LIVES_SIGSEGV, SIG_DFL);
+        signal(LIVES_SIGABRT, SIG_DFL);
+        lives_printerr("%s",
+                       _("\nUnfortunately LiVES crashed.\nPlease report this bug at http://sourceforge.net/tracker/?group_id=64341&atid=507139\nThanks. Recovery should be possible if you restart LiVES.\n"));
+        lives_printerr("%s",_("\n\nWhen reporting crashes, please include details of your operating system, distribution, and the LiVES version ("
+                              LiVES_VERSION ")\n"));
+
+        if (capable->has_gdb) {
+          if (mainw->debug) lives_printerr("%s",_("and any information shown below:\n\n"));
+          else lives_printerr("%s","Please try running LiVES with the -debug option to collect more information.\n\n");
+        } else {
+          lives_printerr("%s",_("Please install gdb and then run LiVES with the -debug option to collect more information.\n\n"));
+        }
+        if (mainw->debug) {
+#ifdef USE_GLIB
+          g_on_error_stack_trace(capable->myname_full);
+#endif
+        }
       }
-      
+
       if (mainw->was_set) {
-	g_printerr ("%s",_("Preserving set.\n"));
+        lives_printerr("%s",_("Preserving set.\n"));
       }
 
       mainw->leave_recovery=mainw->leave_files=TRUE;
-      
+
       mainw->only_close=FALSE;
-      lives_exit();
+      lives_exit(signum);
     }
   }
   exit(signum);
@@ -204,21 +228,22 @@
 
 
 void get_monitors(void) {
+  char buff[256];
+
+#ifdef GUI_GTK
   GSList *dlist,*dislist;
   GdkDisplay *disp;
   GdkScreen *screen;
 #if LIVES_HAS_DEVICE_MANAGER
   GdkDeviceManager *devman;
-  GList *devlist;
+  LiVESList *devlist;
   register int k;
 #endif
 
-  gchar buff[256];
-
   int nscreens,nmonitors;
   register int i,j,idx=0;
 
-  if (mainw->mgeom!=NULL) g_free(mainw->mgeom);
+  if (mainw->mgeom!=NULL) lives_free(mainw->mgeom);
   mainw->mgeom=NULL;
 
   dlist=dislist=gdk_display_manager_list_displays(gdk_display_manager_get());
@@ -232,16 +257,15 @@
 
     // get screens
     nscreens=lives_display_get_n_screens(disp);
-    for (i=0;i<nscreens;i++) {
+    for (i=0; i<nscreens; i++) {
       screen=gdk_display_get_screen(disp,i);
       capable->nmonitors+=gdk_screen_get_n_monitors(screen);
     }
     dlist=dlist->next;
   }
 
-  if (prefs->force_single_monitor) capable->nmonitors=1; // force for clone mode
+  mainw->mgeom=(lives_mgeometry_t *)lives_malloc(capable->nmonitors*sizeof(lives_mgeometry_t));
 
-  mainw->mgeom=(lives_mgeometry_t *)g_malloc(capable->nmonitors*sizeof(lives_mgeometry_t));
   dlist=dislist;
 
   while (dlist!=NULL) {
@@ -253,41 +277,64 @@
 #endif
     // get screens
     nscreens=lives_display_get_n_screens(disp);
-    for (i=0;i<nscreens;i++) {
+    for (i=0; i<nscreens; i++) {
       screen=gdk_display_get_screen(disp,i);
       nmonitors=gdk_screen_get_n_monitors(screen);
-      for (j=0;j<nmonitors;j++) {
-	GdkRectangle rect;
-	gdk_screen_get_monitor_geometry(screen,j,&(rect));
-	mainw->mgeom[idx].x=rect.x;
-	mainw->mgeom[idx].y=rect.y;
-	mainw->mgeom[idx].width=rect.width;
-	mainw->mgeom[idx].height=rect.height;
-	mainw->mgeom[idx].mouse_device=NULL;
+      for (j=0; j<nmonitors; j++) {
+        GdkRectangle rect;
+        gdk_screen_get_monitor_geometry(screen,j,&(rect));
+        mainw->mgeom[idx].x=rect.x;
+        mainw->mgeom[idx].y=rect.y;
+        mainw->mgeom[idx].width=rect.width;
+        mainw->mgeom[idx].height=rect.height;
+        mainw->mgeom[idx].mouse_device=NULL;
 #if LIVES_HAS_DEVICE_MANAGER
-	// get (virtual) mouse device for this screen
-	for (k=0;k<g_list_length(devlist);k++) {
-	  GdkDevice *device=(GdkDevice *)g_list_nth_data(devlist,k);
-	  if (gdk_device_get_display(device)==disp&&
-	      gdk_device_get_source(device)==GDK_SOURCE_MOUSE) { 
-	    mainw->mgeom[idx].mouse_device=device;
-	    break;
-	  }
-	}
-#endif
-	mainw->mgeom[idx].disp=disp;
-	mainw->mgeom[idx].screen=screen;
-	idx++;
-	if (idx>=capable->nmonitors) break;
+        // get (virtual) mouse device for this screen
+        for (k=0; k<lives_list_length(devlist); k++) {
+          GdkDevice *device=(GdkDevice *)lives_list_nth_data(devlist,k);
+          if (gdk_device_get_display(device)==disp&&
+              gdk_device_get_source(device)==GDK_SOURCE_MOUSE) {
+            mainw->mgeom[idx].mouse_device=device;
+            break;
+          }
+        }
+#endif
+        mainw->mgeom[idx].disp=disp;
+        mainw->mgeom[idx].screen=screen;
+        idx++;
+        if (idx>=capable->nmonitors) break;
       }
     }
 #if LIVES_HAS_DEVICE_MANAGER
-    g_list_free(devlist);
+    lives_list_free(devlist);
 #endif
     dlist=dlist->next;
   }
 
-  g_slist_free(dislist);
+  lives_slist_free(dislist);
+#endif
+
+#ifdef GUI_QT
+  mainw->mgeom=(lives_mgeometry_t *)lives_malloc(capable->nmonitors*sizeof(lives_mgeometry_t));
+
+  capable->nmonitors = lives_display_get_n_screens(NULL);
+
+  QList<QScreen *>screens = QApplication::screens();
+
+  for (int i=0; i < capable->nmonitors; i++) {
+    QRect qr = QApplication::desktop()->screenGeometry(i);
+    mainw->mgeom[i].x = qr.x();
+    mainw->mgeom[i].y = qr.y();
+    mainw->mgeom[i].width = qr.width();
+    mainw->mgeom[i].height = qr.height();
+
+    mainw->mgeom[i].mouse_device = NULL;
+    mainw->mgeom[i].disp = mainw->mgeom[i].screen = screens.at(i);
+  }
+
+#endif
+
+  if (prefs->force_single_monitor) capable->nmonitors=1; // force for clone mode
 
   prefs->gui_monitor=0;
   prefs->play_monitor=1;
@@ -299,12 +346,11 @@
     if (strlen(buff)==0||get_token_count(buff,',')==1) {
       prefs->gui_monitor=1;
       prefs->play_monitor=2;
-    }
-    else {
-      gchar **array=g_strsplit(buff,",",2);
+    } else {
+      char **array=lives_strsplit(buff,",",2);
       prefs->gui_monitor=atoi(array[0]);
       prefs->play_monitor=atoi(array[1]);
-      g_strfreev(array);
+      lives_strfreev(array);
     }
 
     if (prefs->gui_monitor<1) prefs->gui_monitor=1;
@@ -329,7 +375,7 @@
 
   pthread_mutexattr_t mattr;
 
-  gchar buff[256];
+  char buff[256];
 
   boolean needs_update=FALSE;
 
@@ -340,23 +386,29 @@
   sizdbl=sizeof(double);
   sizshrt=sizeof(short);
 
-  mainw=(mainwindow*)(g_malloc0(sizeof(mainwindow)));
+  mainw=(mainwindow *)(calloc(1,sizeof(mainwindow))); // must not use lives_malloc() yet !
   mainw->is_ready=mainw->fatal=FALSE;
 
-  mainw->free_fn=lives_free_normal;
+  mainw->free_fn=_lives_free_normal;
   mainw->do_not_free=NULL;
-  mainw->alt_vtable.malloc=lives_malloc;
-  mainw->alt_vtable.realloc=realloc;
-  mainw->alt_vtable.free=lives_free;  ///< wrapper for mainw->free_fn
+
+  mainw->alt_vtable.malloc=_lives_malloc;
+  mainw->alt_vtable.realloc=_lives_realloc;
+  mainw->alt_vtable.free=_lives_free;  ///< wrapper for mainw->free_fn
   mainw->alt_vtable.calloc=NULL;
   mainw->alt_vtable.try_malloc=NULL;
   mainw->alt_vtable.try_realloc=NULL;
 
-  g_mem_set_vtable(&mainw->alt_vtable);
+  lives_mem_set_vtable(&mainw->alt_vtable);
+
+  prefs=(_prefs *)lives_malloc(sizeof(_prefs));
+  future_prefs=(_future_prefs *)lives_malloc(sizeof(_future_prefs));
+
+  prefs->gui_monitor=-1;
 
   // set to allow multiple locking by the same thread
   pthread_mutexattr_init(&mattr);
-  pthread_mutexattr_settype(&mattr,PTHREAD_MUTEX_RECURSIVE); 
+  pthread_mutexattr_settype(&mattr,PTHREAD_MUTEX_RECURSIVE);
   pthread_mutex_init(&mainw->gtk_mutex,&mattr);
 
   pthread_mutex_init(&mainw->interp_mutex,&mattr);
@@ -369,7 +421,11 @@
 
   pthread_mutex_init(&mainw->event_list_mutex,NULL);
 
-  for (i=0;i<FX_KEYS_MAX;i++) {
+  pthread_mutex_init(&mainw->clip_list_mutex,NULL);
+
+  pthread_mutex_init(&mainw->free_fn_mutex,NULL);
+
+  for (i=0; i<FX_KEYS_MAX; i++) {
     pthread_mutex_init(&mainw->data_mutex[i],&mattr); // because audio filters can enable/disable video filters and vice-versa
   }
 
@@ -377,30 +433,28 @@
 
   mainw->kb_timer=-1;
 
-  prefs=(_prefs *)g_malloc0(sizeof(_prefs));
-  future_prefs=(_future_prefs *)g_malloc(sizeof(_future_prefs));
-
-  prefs->gui_monitor=-1;
-
   prefs->wm=NULL;
   prefs->sleep_time=1000;
   mainw->cached_list=NULL;
 
   mainw->splash_window=NULL;
 
+  prefs->present=FALSE;
+
   mainw->threaded_dialog=FALSE;
   clear_mainw_msg();
 
-  
+  mainw->interactive=TRUE;
+
 #ifdef IS_MINGW
   // TODO - for mingw we will get from the registry, whatever was set at install time
-  g_snprintf (prefs->prefix_dir,PATH_MAX,"%s",PREFIX_DEFAULT);
+  lives_snprintf(prefs->prefix_dir,PATH_MAX,"%s",PREFIX_DEFAULT);
 #endif
 
   // check the backend is there, get some system details and prefs
   capable=get_capabilities();
 
-  palette=(_palette*)(g_malloc(sizeof(_palette)));
+  palette=(_palette *)(lives_malloc(sizeof(_palette)));
 
   widget_helper_init();
 
@@ -410,7 +464,7 @@
   prefs->sepwin_type=1;
   prefs->show_framecount=TRUE;
   prefs->audio_player=AUD_PLAYER_SOX;
-  g_snprintf(prefs->aplayer,512,"%s","sox");
+  lives_snprintf(prefs->aplayer,512,"%s","sox");
   prefs->open_decorated=TRUE;
 
 #ifdef ENABLE_GIW
@@ -430,13 +484,13 @@
 #endif
 
 #ifndef IS_MINGW
-  capable->rcfile=g_strdup_printf("%s/.lives",capable->home_dir);
+  capable->rcfile=lives_strdup_printf("%s/.lives",capable->home_dir);
 #else
-  capable->rcfile=g_strdup_printf("%s/LiVES.ini",capable->home_dir);
+  capable->rcfile=lives_strdup_printf("%s/LiVES.ini",capable->home_dir);
 #endif
 
   if (!capable->smog_version_correct||!capable->can_write_to_tempdir) {
-    g_snprintf(prefs->theme,64,"none");
+    lives_snprintf(prefs->theme,64,"none");
     return FALSE;
   }
 
@@ -447,24 +501,23 @@
 
   get_pref("gui_theme",prefs->theme,64);
   if (!strlen(prefs->theme)) {
-    g_snprintf(prefs->theme,64,"none");
+    lives_snprintf(prefs->theme,64,"none");
   }
   // get some prefs we need to set menu options
-  future_prefs->show_recent=prefs->show_recent=get_boolean_pref ("show_recent_files");
+  future_prefs->show_recent=prefs->show_recent=get_boolean_pref("show_recent_files");
 
-#ifndef IS_MINGW  
-  get_pref ("prefix_dir",prefs->prefix_dir,PATH_MAX);
-  
-  if (!strlen (prefs->prefix_dir)) {
-    if (strcmp (PREFIX,"NONE")) {
-      g_snprintf (prefs->prefix_dir,PATH_MAX,"%s",PREFIX);
-    }
-    else {
-      g_snprintf (prefs->prefix_dir,PATH_MAX,"%s",PREFIX_DEFAULT);
+#ifndef IS_MINGW
+  get_pref("prefix_dir",prefs->prefix_dir,PATH_MAX);
+
+  if (!strlen(prefs->prefix_dir)) {
+    if (strcmp(PREFIX,"NONE")) {
+      lives_snprintf(prefs->prefix_dir,PATH_MAX,"%s",PREFIX);
+    } else {
+      lives_snprintf(prefs->prefix_dir,PATH_MAX,"%s",PREFIX_DEFAULT);
     }
     needs_update=TRUE;
   }
-  
+
   if (ensure_isdir(prefs->prefix_dir)) needs_update=TRUE;
 
 
@@ -472,11 +525,11 @@
 
   needs_update=FALSE;
 
-  get_pref ("lib_dir",prefs->lib_dir,PATH_MAX);
-  
-  if (!strlen (prefs->lib_dir)) {
+  get_pref("lib_dir",prefs->lib_dir,PATH_MAX);
+
+  if (!strlen(prefs->lib_dir)) {
 
-    g_snprintf (prefs->lib_dir,PATH_MAX,"%s",LIVES_LIBDIR);
+    lives_snprintf(prefs->lib_dir,PATH_MAX,"%s",LIVES_LIBDIR);
     needs_update=TRUE;
   }
 
@@ -484,9 +537,9 @@
   if (needs_update) set_pref("lib_dir",prefs->lib_dir);
 
 #else
-    g_snprintf (prefs->lib_dir,PATH_MAX,"%s",prefs->prefix_dir);
+  lives_snprintf(prefs->lib_dir,PATH_MAX,"%s",prefs->prefix_dir);
 #endif
-  
+
   needs_update=FALSE;
 
   set_palette_colours();
@@ -504,23 +557,22 @@
     prefs->audio_player=AUD_PLAYER_JACK;
   if (!strcmp(buff,"pulse"))
     prefs->audio_player=AUD_PLAYER_PULSE;
-  g_snprintf(prefs->aplayer,512,"%s",buff);
+  lives_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");
+    lives_snprintf(prefs->aplayer,512,"%s","pulse");
     set_pref("audio_player","pulse");
-  }
-  else {
+  } else {
 #endif
-  
+
 
 
 #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");
+      lives_snprintf(prefs->aplayer,512,"%s","jack");
       set_pref("audio_player","jack");
     }
 #endif
@@ -539,14 +591,14 @@
 
   get_monitors();
 
-  for (i=0;i<MAX_FX_CANDIDATE_TYPES;i++) {
+  for (i=0; i<MAX_FX_CANDIDATE_TYPES; i++) {
     mainw->fx_candidates[i].delegate=-1;
     mainw->fx_candidates[i].list=NULL;
     mainw->fx_candidates[i].func=0l;
     mainw->fx_candidates[i].rfx=NULL;
   }
 
-  for (i=0;i<MAX_EXT_CNTL;i++) mainw->ext_cntl[i]=FALSE;
+  for (i=0; i<MAX_EXT_CNTL; i++) mainw->ext_cntl[i]=FALSE;
 
   prefs->omc_dev_opts=get_int_pref("omc_dev_opts");
 
@@ -556,23 +608,23 @@
 #ifdef OMC_JS_IMPL
 #ifndef IS_MINGW
   if (strlen(prefs->omc_js_fname)==0) {
-    const gchar *tmp=get_js_filename();
+    const char *tmp=get_js_filename();
     if (tmp!=NULL) {
-      g_snprintf(prefs->omc_js_fname,256,"%s",tmp);
-      }
+      lives_snprintf(prefs->omc_js_fname,256,"%s",tmp);
+    }
   }
 #endif
 #endif
 #endif
-  
+
   get_pref_utf8("omc_midi_fname",prefs->omc_midi_fname,256);
 #ifdef ENABLE_OSC
 #ifdef OMC_MIDI_IMPL
 #ifndef IS_MINGW
   if (strlen(prefs->omc_midi_fname)==0) {
-    const gchar *tmp=get_midi_filename();
+    const char *tmp=get_midi_filename();
     if (tmp!=NULL) {
-      g_snprintf(prefs->omc_midi_fname,256,"%s",tmp);
+      lives_snprintf(prefs->omc_midi_fname,256,"%s",tmp);
     }
   }
 #endif
@@ -580,10 +632,10 @@
 #endif
 
 #ifdef ALSA_MIDI
-    prefs->use_alsa_midi=TRUE;
-    mainw->seq_handle=NULL;
+  prefs->use_alsa_midi=TRUE;
+  mainw->seq_handle=NULL;
 
-    if (prefs->omc_dev_opts&OMC_DEV_FORCE_RAW_MIDI) prefs->use_alsa_midi=FALSE;
+  if (prefs->omc_dev_opts&OMC_DEV_FORCE_RAW_MIDI) prefs->use_alsa_midi=FALSE;
 
 #endif
 
@@ -592,20 +644,23 @@
 
   mainw->loop=TRUE;
   mainw->loop_cont=FALSE;
+
+#ifdef GUI_GTK
   mainw->target_table=target_table;
+#endif
 
   prefs->max_modes_per_key=0;
   mainw->debug=FALSE;
 
   mainw->next_free_alarm=0;
 
-  for (i=0;i<LIVES_MAX_ALARMS;i++) {
+  for (i=0; i<LIVES_MAX_ALARMS; i++) {
     mainw->alarms[i]=LIVES_NO_ALARM_TICKS;
   }
 
   needs_update=needs_update; // stop compiler warnings
 
-  if (!g_ascii_strcasecmp(prefs->theme,"none")) return FALSE;
+  if (!lives_ascii_strcasecmp(prefs->theme,"none")) return FALSE;
 
   return TRUE;
 
@@ -613,63 +668,63 @@
 
 
 
-static void replace_with_delegates (void) {
+static void replace_with_delegates(void) {
   int resize_fx;
   weed_plant_t *filter;
   lives_rfx_t *rfx;
-  gchar mtext[256];
+  char mtext[256];
   int i;
 
   int deint_idx;
 
   if (mainw->fx_candidates[FX_CANDIDATE_RESIZER].delegate!=-1) {
-    
-    resize_fx=GPOINTER_TO_INT(g_list_nth_data(mainw->fx_candidates[FX_CANDIDATE_RESIZER].list,
-					      mainw->fx_candidates[FX_CANDIDATE_RESIZER].delegate));
+
+    resize_fx=LIVES_POINTER_TO_INT(lives_list_nth_data(mainw->fx_candidates[FX_CANDIDATE_RESIZER].list,
+                                   mainw->fx_candidates[FX_CANDIDATE_RESIZER].delegate));
     filter=get_weed_filter(resize_fx);
     rfx=weed_to_rfx(filter,TRUE);
-    
+
     rfx->is_template=FALSE;
     rfx->props|=RFX_PROPS_MAY_RESIZE;
 
-    g_free(rfx->action_desc);
-    rfx->action_desc=g_strdup(_("Resizing"));
+    lives_free(rfx->action_desc);
+    rfx->action_desc=lives_strdup(_("Resizing"));
 
     rfx->min_frames=1;
 
-    g_free(rfx->menu_text);
+    lives_free(rfx->menu_text);
 
     if (mainw->resize_menuitem==NULL) {
-      rfx->menu_text=g_strdup(_("_Resize All Frames"));
+      rfx->menu_text=lives_strdup(_("_Resize All Frames"));
       mainw->resize_menuitem = lives_menu_item_new_with_mnemonic(rfx->menu_text);
       lives_widget_show(mainw->resize_menuitem);
-      lives_menu_shell_insert (LIVES_MENU_SHELL (mainw->tools_menu), mainw->resize_menuitem, RFX_TOOL_MENU_POSN);
-    }
-    else {
+      lives_menu_shell_insert(LIVES_MENU_SHELL(mainw->tools_menu), mainw->resize_menuitem, RFX_TOOL_MENU_POSN);
+    } else {
       get_menu_text(mainw->resize_menuitem,mtext);
-      
+
       // remove trailing dots
-      for (i=strlen(mtext)-1;i>0&&!strncmp(&mtext[i],".",1);i--) memset(&mtext[i],0,1);
-      
-      rfx->menu_text=g_strdup(mtext);
+      for (i=strlen(mtext)-1; i>0&&!strncmp(&mtext[i],".",1); i--) memset(&mtext[i],0,1);
+
+      rfx->menu_text=lives_strdup(mtext);
 
       // disconnect old menu entry
       lives_signal_handler_disconnect(mainw->resize_menuitem,mainw->fx_candidates[FX_CANDIDATE_RESIZER].func);
-      
+
     }
     // connect new menu entry
-    mainw->fx_candidates[FX_CANDIDATE_RESIZER].func=lives_signal_connect (LIVES_GUI_OBJECT (mainw->resize_menuitem), LIVES_WIDGET_ACTIVATE_EVENT,
-								      LIVES_GUI_CALLBACK (on_render_fx_pre_activate),
-								      (gpointer)rfx);
+    mainw->fx_candidates[FX_CANDIDATE_RESIZER].func=lives_signal_connect(LIVES_GUI_OBJECT(mainw->resize_menuitem), LIVES_WIDGET_ACTIVATE_SIGNAL,
+        LIVES_GUI_CALLBACK(on_render_fx_pre_activate),
+        (livespointer)rfx);
     mainw->fx_candidates[FX_CANDIDATE_RESIZER].rfx=rfx;
   }
 
   deint_idx=weed_get_idx_for_hashname("deinterlacedeinterlace",FALSE);
   if (deint_idx>-1) {
-    mainw->fx_candidates[FX_CANDIDATE_DEINTERLACE].list=g_list_append(mainw->fx_candidates[FX_CANDIDATE_DEINTERLACE].list,GINT_TO_POINTER(deint_idx));
+    mainw->fx_candidates[FX_CANDIDATE_DEINTERLACE].list=lives_list_append(mainw->fx_candidates[FX_CANDIDATE_DEINTERLACE].list,
+        LIVES_INT_TO_POINTER(deint_idx));
     mainw->fx_candidates[FX_CANDIDATE_DEINTERLACE].delegate=0;
   }
-  
+
 
 }
 
@@ -684,17 +739,17 @@
   boolean needs_free;
 
   ssize_t randres;
-  gchar buff[256];
+  char buff[256];
   uint32_t rseed;
-  GList *encoders=NULL;
-  GList *encoder_capabilities=NULL;
+  LiVESList *encoders=NULL;
+  LiVESList *encoder_capabilities=NULL;
 
-  gchar *weed_plugin_path;
-  gchar *frei0r_path;
-  gchar *ladspa_path;
+  char *weed_plugin_path;
+  char *frei0r_path;
+  char *ladspa_path;
 
 
-  for (i=0;i<=MAX_FILES;mainw->files[i++]=NULL);
+  for (i=0; i<=MAX_FILES; mainw->files[i++]=NULL);
   mainw->fs=FALSE;
   mainw->prefs_changed=FALSE;
   mainw->last_dprint_file=mainw->current_file=mainw->playing_file=-1;
@@ -729,8 +784,7 @@
   mainw->aframeno=0;
   if (capable->byte_order==LIVES_LITTLE_ENDIAN) {
     mainw->endian=0;
-  }
-  else {
+  } else {
     mainw->endian=AFORM_BIG_ENDIAN;
   }
 
@@ -738,7 +792,7 @@
   mainw->was_set=FALSE;
   mainw->toy_go_wild=FALSE;
 
-  for (i=0;i<FN_KEYS-1;i++) {
+  for (i=0; i<FN_KEYS-1; i++) {
     mainw->clipstore[i]=0;
   }
 
@@ -760,7 +814,7 @@
   mainw->internal_messaging=FALSE;
   mainw->progress_fn=NULL;
 
-  mainw->last_grabable_effect=-1;
+  mainw->last_grabbable_effect=-1;
   mainw->blend_file=-1;
 
   mainw->pre_src_file=-2;
@@ -808,10 +862,9 @@
     prefs->osc_udp_port=0;
 #ifdef ENABLE_OSC
     if (!mainw->foreign) {
-      prefs->osc_udp_port=get_int_pref ("osc_port");
+      prefs->osc_udp_port=get_int_pref("osc_port");
       future_prefs->osc_start=prefs->osc_start=get_boolean_pref("osc_start");
-    }
-    else {
+    } else {
       future_prefs->osc_start=prefs->osc_start=FALSE;
     }
 #endif
@@ -866,7 +919,7 @@
 
   mainw->affected_layouts_map=mainw->current_layouts_map=NULL;
 
-  mainw->recovery_file=g_strdup_printf("%s/recovery.%d.%d.%d",prefs->tmpdir,lives_getuid(),lives_getgid(),capable->mainpid);
+  mainw->recovery_file=lives_strdup_printf("%s/recovery.%d.%d.%d",prefs->tmpdir,lives_getuid(),lives_getgid(),capable->mainpid);
   mainw->leave_recovery=TRUE;
 
   mainw->pchains=NULL;
@@ -892,21 +945,21 @@
   mainw->suppress_dprint=FALSE;
 
   // TRANSLATORS: text saying "Any", for encoder and output format (as in "does not matter")
-  mainw->string_constants[LIVES_STRING_CONSTANT_ANY]=g_strdup(_("Any"));
+  mainw->string_constants[LIVES_STRING_CONSTANT_ANY]=lives_strdup(_("Any"));
   // TRANSLATORS: text saying "None", for playback plugin name (as in "none specified")
-  mainw->string_constants[LIVES_STRING_CONSTANT_NONE]=g_strdup(_("None"));
+  mainw->string_constants[LIVES_STRING_CONSTANT_NONE]=lives_strdup(_("None"));
   // TRANSLATORS: text saying "recommended", for plugin names, etc.
-  mainw->string_constants[LIVES_STRING_CONSTANT_RECOMMENDED]=g_strdup(_("recommended"));
+  mainw->string_constants[LIVES_STRING_CONSTANT_RECOMMENDED]=lives_strdup(_("recommended"));
   // TRANSLATORS: text saying "disabled", (as in "not enabled")
-  mainw->string_constants[LIVES_STRING_CONSTANT_DISABLED]=g_strdup(_("disabled !"));
+  mainw->string_constants[LIVES_STRING_CONSTANT_DISABLED]=lives_strdup(_("disabled !"));
   // TRANSLATORS: text saying "**The current layout**", to warn users that the current layout is affected
-  mainw->string_constants[LIVES_STRING_CONSTANT_CL]=g_strdup(_("**The current layout**"));
+  mainw->string_constants[LIVES_STRING_CONSTANT_CL]=lives_strdup(_("**The current layout**"));
   // TRANSLATORS: adjective for "Built in" type effects
-  mainw->string_constants[LIVES_STRING_CONSTANT_BUILTIN]=g_strdup(_("Builtin"));
+  mainw->string_constants[LIVES_STRING_CONSTANT_BUILTIN]=lives_strdup(_("Builtin"));
   // TRANSLATORS: adjective for "Custom" type effects
-  mainw->string_constants[LIVES_STRING_CONSTANT_CUSTOM]=g_strdup(_("Custom"));
+  mainw->string_constants[LIVES_STRING_CONSTANT_CUSTOM]=lives_strdup(_("Custom"));
   // TRANSLATORS: adjective for "Test" type effects
-  mainw->string_constants[LIVES_STRING_CONSTANT_TEST]=g_strdup(_("Test"));
+  mainw->string_constants[LIVES_STRING_CONSTANT_TEST]=lives_strdup(_("Test"));
 
   mainw->opening_frames=-1;
 
@@ -936,7 +989,7 @@
 
   mainw->reverse_pb=FALSE;
 
-  mainw->osc_auto=FALSE;
+  mainw->osc_auto=0;
   mainw->osc_enc_width=mainw->osc_enc_height=0;
 
 
@@ -989,7 +1042,7 @@
   mainw->camframe=NULL;
 
   if (!ign_opts->ign_vppdefs)
-    g_snprintf(mainw->vpp_defs_file,PATH_MAX,"%s/%svpp_defaults",capable->home_dir,LIVES_CONFIG_DIR);
+    lives_snprintf(mainw->vpp_defs_file,PATH_MAX,"%s/%svpp_defaults",capable->home_dir,LIVES_CONFIG_DIR);
 
   mainw->has_custom_tools=FALSE;
   mainw->has_custom_gens=FALSE;
@@ -1013,9 +1066,9 @@
   mainw->bad_aud_file=NULL;
 
   mainw->render_error=LIVES_RENDER_ERROR_NONE;
-  
+
   mainw->is_exiting=FALSE;
-  
+
   mainw->add_clear_ds_button=FALSE;
   mainw->add_clear_ds_adv=FALSE;
   mainw->tried_ds_recover=FALSE;
@@ -1050,9 +1103,9 @@
   mainw->ce_thumbs=FALSE;
 
   mainw->n_screen_areas=SCREEN_AREA_USER_DEFINED1;
-  mainw->screen_areas=(lives_screen_area_t *)g_malloc(mainw->n_screen_areas*sizeof(lives_screen_area_t));
-  mainw->screen_areas[SCREEN_AREA_FOREGROUND].name=g_strdup(_("Foreground"));
-  mainw->screen_areas[SCREEN_AREA_BACKGROUND].name=g_strdup(_("Background"));
+  mainw->screen_areas=(lives_screen_area_t *)lives_malloc(mainw->n_screen_areas*sizeof(lives_screen_area_t));
+  mainw->screen_areas[SCREEN_AREA_FOREGROUND].name=lives_strdup(_("Foreground"));
+  mainw->screen_areas[SCREEN_AREA_BACKGROUND].name=lives_strdup(_("Background"));
 
   mainw->active_sa_clips=mainw->active_sa_fx=SCREEN_AREA_FOREGROUND;
 
@@ -1071,10 +1124,12 @@
 
   mainw->audio_frame_buffer=NULL;
   mainw->afbuffer_clients=0;
+
+  memset(mainw->recent_file,0,1);
   /////////////////////////////////////////////////// add new stuff just above here ^^
 
 
-  memset (mainw->set_name,0,1);
+  memset(mainw->set_name,0,1);
   mainw->clips_available=0;
 
   prefs->pause_effect_during_preview=FALSE;
@@ -1082,7 +1137,7 @@
   if (capable->smog_version_correct&&capable->can_write_to_tempdir) {
 
     int pb_quality=get_int_pref("pb_quality");
-    
+
     prefs->pb_quality=PB_QUALITY_MED;
     if (pb_quality==PB_QUALITY_LOW) prefs->pb_quality=PB_QUALITY_LOW;
     else if (pb_quality==PB_QUALITY_HIGH) prefs->pb_quality=PB_QUALITY_HIGH;
@@ -1091,30 +1146,30 @@
     mainw->ext_playback=mainw->ext_keyboard=FALSE;
 
     get_pref("default_image_format",buff,256);
-    if (!strcmp(buff,"jpeg")) g_snprintf (prefs->image_ext,16,"%s","jpg");
-    else g_snprintf (prefs->image_ext,16,"%s",buff);
+    if (!strcmp(buff,"jpeg")) lives_snprintf(prefs->image_ext,16,"%s","jpg");
+    else lives_snprintf(prefs->image_ext,16,"%s",buff);
 
     prefs->loop_recording=TRUE;
     prefs->no_bandwidth=FALSE;
-    prefs->ocp=get_int_pref ("open_compression_percent");
+    prefs->ocp=get_int_pref("open_compression_percent");
 
     lives_widget_color_copy(&palette->fade_colour,&palette->black);
 
     // we set the theme here in case it got reset to 'none'
     set_pref("gui_theme",prefs->theme);
-    g_snprintf(future_prefs->theme,64,"%s",prefs->theme);
+    lives_snprintf(future_prefs->theme,64,"%s",prefs->theme);
 
     prefs->stop_screensaver=get_boolean_pref("stop_screensaver");
     prefs->open_maximised=get_boolean_pref("open_maximised");
     future_prefs->show_tool=prefs->show_tool=get_boolean_pref("show_toolbar");
-    memset (future_prefs->vpp_name,0,64);
+    memset(future_prefs->vpp_name,0,64);
     future_prefs->vpp_argv=NULL;
 
     if (prefs->gui_monitor!=0) {
       int xcen=mainw->mgeom[prefs->gui_monitor-1].x+(mainw->mgeom[prefs->gui_monitor-1].width-
-						     lives_widget_get_allocation_width(mainw->LiVES))/2;
+               lives_widget_get_allocation_width(mainw->LiVES))/2;
       int ycen=mainw->mgeom[prefs->gui_monitor-1].y+(mainw->mgeom[prefs->gui_monitor-1].height-
-						     lives_widget_get_allocation_height(mainw->LiVES))/2;
+               lives_widget_get_allocation_height(mainw->LiVES))/2;
       lives_window_set_screen(LIVES_WINDOW(mainw->LiVES),mainw->mgeom[prefs->gui_monitor-1].screen);
       lives_window_move(LIVES_WINDOW(mainw->LiVES),xcen,ycen);
 
@@ -1122,7 +1177,7 @@
 
 
     if (prefs->open_maximised&&prefs->show_gui) {
-      lives_window_maximize (LIVES_WINDOW(mainw->LiVES));
+      lives_window_maximize(LIVES_WINDOW(mainw->LiVES));
     }
 
     prefs->default_fps=get_double_pref("default_fps");
@@ -1138,8 +1193,6 @@
 
     prefs->acodec_list=NULL;
 
-    prefs->collate_images=TRUE;
-    
     prefs->render_audio=TRUE;
     prefs->normalise_audio=TRUE;
 
@@ -1187,8 +1240,6 @@
 
     prefs->force64bit=FALSE;
 
-    prefs->present=FALSE;
-
 #if LIVES_HAS_GRID_WIDGET
     prefs->ce_thumb_mode=get_boolean_pref("ce_thumb_mode");
 #else
@@ -1200,6 +1251,7 @@
     prefs->push_audio_to_gens=TRUE;
 
     prefs->perm_audio_reader=TRUE;
+
     //////////////////////////////////////////////////////////////////
 
     weed_memory_init();
@@ -1210,15 +1262,15 @@
 
       // try to get randomness from /dev/urandom
       randfd=open("/dev/urandom",O_RDONLY);
- 
-     if (randfd>-1) {
-	randres=read(randfd,&rseed,sizint);
-	close(randfd);
+
+      if (randfd>-1) {
+        randres=read(randfd,&rseed,sizint);
+        close(randfd);
       }
 
       if (randres!=sizint) {
-	gettimeofday(&tv,NULL);
-	rseed=tv.tv_sec+tv.tv_usec;
+        gettimeofday(&tv,NULL);
+        rseed=tv.tv_sec+tv.tv_usec;
       }
 
       lives_srandom(rseed);
@@ -1228,52 +1280,52 @@
       randfd=open("/dev/urandom",O_RDONLY);
 
       if (randfd>-1) {
-	randres=read(randfd,&rseed,sizint);
-	close(randfd);
+        randres=read(randfd,&rseed,sizint);
+        close(randfd);
       }
       if (randres!=sizint) {
-	gettimeofday(&tv,NULL);
-	rseed=tv.tv_sec+tv.tv_usec;
+        gettimeofday(&tv,NULL);
+        rseed=tv.tv_sec+tv.tv_usec;
       }
 
       fastsrand(rseed);
 
       prefs->midi_check_rate=get_int_pref("midi_check_rate");
       if (prefs->midi_check_rate==0) prefs->midi_check_rate=DEF_MIDI_CHECK_RATE;
-      
+
       if (prefs->midi_check_rate<1) prefs->midi_check_rate=1;
-      
+
       prefs->midi_rpt=get_int_pref("midi_rpt");
       if (prefs->midi_rpt==0) prefs->midi_rpt=DEF_MIDI_RPT;
 
       prefs->mouse_scroll_clips=get_boolean_pref("mouse_scroll_clips");
-      
+
       prefs->mt_auto_back=get_int_pref("mt_auto_back");
 
-      get_pref ("vid_playback_plugin",buff,256);
-      if (strlen (buff)&&strcmp (buff,"(null)")&&strcmp(buff,"none")) {
-	mainw->vpp=open_vid_playback_plugin (buff,TRUE);
+      get_pref("vid_playback_plugin",buff,256);
+      if (strlen(buff)&&strcmp(buff,"(null)")&&strcmp(buff,"none")) {
+        mainw->vpp=open_vid_playback_plugin(buff,TRUE);
       }
 
       get_pref("video_open_command",prefs->video_open_command,256);
 
       if (!ign_opts->ign_aplayer) {
-	get_pref("audio_play_command",prefs->audio_play_command,256);
+        get_pref("audio_play_command",prefs->audio_play_command,256);
       }
 
       if (!strlen(prefs->video_open_command)&&capable->has_mplayer) {
-	get_location("mplayer",prefs->video_open_command,256);
-	set_pref("video_open_command",prefs->video_open_command);
+        get_location("mplayer",prefs->video_open_command,256);
+        set_pref("video_open_command",prefs->video_open_command);
       }
-      
+
       if (!strlen(prefs->video_open_command)&&capable->has_mplayer2) {
-	get_location("mplayer2",prefs->video_open_command,256);
-	set_pref("video_open_command",prefs->video_open_command);
+        get_location("mplayer2",prefs->video_open_command,256);
+        set_pref("video_open_command",prefs->video_open_command);
       }
-      
+
       prefs->warn_file_size=get_int_pref("warn_file_size");
       if (prefs->warn_file_size==0) {
-	prefs->warn_file_size=WARN_FILE_SIZE;
+        prefs->warn_file_size=WARN_FILE_SIZE;
       }
 
       prefs->rte_keys_virtual=get_int_pref("rte_keys_virtual");
@@ -1313,9 +1365,9 @@
       prefs->auto_nobord=get_boolean_pref("auto_cut_borders");
 
       if (!ign_opts->ign_clipset) {
-	get_pref("ar_clipset",prefs->ar_clipset_name,128);
-	if (strlen(prefs->ar_clipset_name)) prefs->ar_clipset=TRUE;
-	else prefs->ar_clipset=FALSE;
+        get_pref("ar_clipset",prefs->ar_clipset_name,128);
+        if (strlen(prefs->ar_clipset_name)) prefs->ar_clipset=TRUE;
+        else prefs->ar_clipset=FALSE;
       }
 
       get_pref("ar_layout",prefs->ar_layout_name,PATH_MAX);
@@ -1326,198 +1378,203 @@
 
       future_prefs->startup_interface=get_int_pref("startup_interface");
       if (!ign_opts->ign_stmode) {
-	prefs->startup_interface=future_prefs->startup_interface;
+        prefs->startup_interface=future_prefs->startup_interface;
       }
 
       // scan for encoder plugins
 #ifndef IS_MINGW
-      if ((encoders=get_plugin_list (PLUGIN_ENCODERS,FALSE,NULL,NULL))!=NULL) {
+      if ((encoders=get_plugin_list(PLUGIN_ENCODERS,FALSE,NULL,NULL))!=NULL) {
 #else
-      if ((encoders=get_plugin_list (PLUGIN_ENCODERS,TRUE,NULL,NULL))!=NULL) {
+      if ((encoders=get_plugin_list(PLUGIN_ENCODERS,TRUE,NULL,NULL))!=NULL) {
 #endif
-	capable->has_encoder_plugins=TRUE;
-	g_list_free_strings (encoders);
-	g_list_free (encoders);
+        capable->has_encoder_plugins=TRUE;
+        lives_list_free_strings(encoders);
+        lives_list_free(encoders);
       }
-      
+
       memset(prefs->encoder.of_name,0,1);
 
       if ((prefs->startup_phase==1||prefs->startup_phase==-1)&&capable->has_encoder_plugins&&capable->has_python) {
-	GList *ofmt_all=NULL;
-	gchar **array;
-	g_snprintf(prefs->encoder.name,52,"%s","multi_encoder");
-
-	// need to change the output format
-
-	if ((ofmt_all=plugin_request_by_line(PLUGIN_ENCODERS,prefs->encoder.name,"get_formats"))!=NULL) {
-	  
-	  set_pref("encoder",prefs->encoder.name);
-
-	  for (i=0;i<g_list_length(ofmt_all);i++) {
-	    if (get_token_count ((gchar *)g_list_nth_data (ofmt_all,i),'|')>2) {
-	      array=g_strsplit ((gchar *)g_list_nth_data (ofmt_all,i),"|",-1);
-
-	      if (!strcmp(array[0],"hi-theora")) {
-		g_snprintf(prefs->encoder.of_name,51,"%s",array[0]);
-		g_strfreev (array);
-		break;
-	      }
-	      if (!strcmp(array[0],"hi-mpeg")) {
-		g_snprintf(prefs->encoder.of_name,51,"%s",array[0]);
-	      }
-	      else if (!strcmp(array[0],"hi_h-mkv")&&strcmp(prefs->encoder.of_name,"hi-mpeg")) {
-		g_snprintf(prefs->encoder.of_name,51,"%s",array[0]);
-	      }
-	      else if (!strcmp(array[0],"hi_h-avi")&&strcmp(prefs->encoder.of_name,"hi-mpeg")&&strcmp(prefs->encoder.of_name,"hi_h-mkv")) {
-		g_snprintf(prefs->encoder.of_name,51,"%s",array[0]);
-	      }
-	      else if (!strlen(prefs->encoder.of_name)) {
-		g_snprintf(prefs->encoder.of_name,51,"%s",array[0]);
-	      }
-
-	      g_strfreev (array);
-	    }
-	  }
-
-	  set_pref("output_type",prefs->encoder.of_name);
-
-	  g_list_free_strings (ofmt_all);
-	  g_list_free (ofmt_all);
-	}
+        LiVESList *ofmt_all=NULL;
+        char **array;
+        lives_snprintf(prefs->encoder.name,52,"%s","multi_encoder");
+
+        // need to change the output format
+
+        if ((ofmt_all=plugin_request_by_line(PLUGIN_ENCODERS,prefs->encoder.name,"get_formats"))!=NULL) {
+
+          set_pref("encoder",prefs->encoder.name);
+
+          for (i=0; i<lives_list_length(ofmt_all); i++) {
+            if (get_token_count((char *)lives_list_nth_data(ofmt_all,i),'|')>2) {
+              array=lives_strsplit((char *)lives_list_nth_data(ofmt_all,i),"|",-1);
+
+              if (!strcmp(array[0],"hi-theora")) {
+                lives_snprintf(prefs->encoder.of_name,51,"%s",array[0]);
+                lives_strfreev(array);
+                break;
+              }
+              if (!strcmp(array[0],"hi-mpeg")) {
+                lives_snprintf(prefs->encoder.of_name,51,"%s",array[0]);
+              } else if (!strcmp(array[0],"hi_h-mkv")&&strcmp(prefs->encoder.of_name,"hi-mpeg")) {
+                lives_snprintf(prefs->encoder.of_name,51,"%s",array[0]);
+              } else if (!strcmp(array[0],"hi_h-avi")&&strcmp(prefs->encoder.of_name,"hi-mpeg")&&strcmp(prefs->encoder.of_name,"hi_h-mkv")) {
+                lives_snprintf(prefs->encoder.of_name,51,"%s",array[0]);
+              } else if (!strlen(prefs->encoder.of_name)) {
+                lives_snprintf(prefs->encoder.of_name,51,"%s",array[0]);
+              }
+
+              lives_strfreev(array);
+            }
+          }
+
+          set_pref("output_type",prefs->encoder.of_name);
+
+          lives_list_free_strings(ofmt_all);
+          lives_list_free(ofmt_all);
+        }
       }
 
       if (!strlen(prefs->encoder.of_name)) {
-	get_pref("encoder",prefs->encoder.name,51);
-	get_pref("output_type",prefs->encoder.of_name,51);	
+        get_pref("encoder",prefs->encoder.name,51);
+        get_pref("output_type",prefs->encoder.of_name,51);
       }
-      
+
       future_prefs->encoder.audio_codec=prefs->encoder.audio_codec=get_int_pref("encoder_acodec");
       prefs->encoder.capabilities=0;
       prefs->encoder.of_allowed_acodecs=AUDIO_CODEC_UNKNOWN;
 
-      g_snprintf(future_prefs->encoder.name,52,"%s",prefs->encoder.name);
+      lives_snprintf(future_prefs->encoder.name,52,"%s",prefs->encoder.name);
 
-      memset (future_prefs->encoder.of_restrict,0,1);
-      memset (prefs->encoder.of_restrict,0,1);
+      memset(future_prefs->encoder.of_restrict,0,1);
+      memset(prefs->encoder.of_restrict,0,1);
 
       if (capable->has_encoder_plugins) {
-	gchar **array;
-	int numtok;
-	GList *ofmt_all,*dummy_list;
-
-	dummy_list=plugin_request("encoders",prefs->encoder.name,"init");
-	if (dummy_list!=NULL) {
-	  g_list_free_strings(dummy_list);
-	  g_list_free(dummy_list);
-	}
-	if (!((encoder_capabilities=plugin_request(PLUGIN_ENCODERS,prefs->encoder.name,"get_capabilities"))==NULL)) {
-	  prefs->encoder.capabilities=atoi ((gchar *)g_list_nth_data (encoder_capabilities,0));
-	  g_list_free_strings (encoder_capabilities);
-	  g_list_free (encoder_capabilities);
-	  if ((ofmt_all=plugin_request_by_line(PLUGIN_ENCODERS,prefs->encoder.name,"get_formats"))!=NULL) {
-	    // get any restrictions for the current format
-	    for (i=0;i<g_list_length(ofmt_all);i++) {
-	      if ((numtok=get_token_count ((gchar *)g_list_nth_data (ofmt_all,i),'|'))>2) {
-		array=g_strsplit ((gchar *)g_list_nth_data (ofmt_all,i),"|",-1);
-		if (!strcmp(array[0],prefs->encoder.of_name)) {
-		  if (numtok>1) {
-		    g_snprintf(prefs->encoder.of_desc,128,"%s",array[1]);
-		  }
-		  g_strfreev(array);
-		  break;
-		}
-		g_strfreev(array);
-	      }
-	    }
-	    g_list_free_strings(ofmt_all);
-	    g_list_free (ofmt_all);
-	  }
-	}
+        char **array;
+        int numtok;
+        LiVESList *ofmt_all,*dummy_list;
+
+        dummy_list=plugin_request("encoders",prefs->encoder.name,"init");
+        if (dummy_list!=NULL) {
+          lives_list_free_strings(dummy_list);
+          lives_list_free(dummy_list);
+        }
+        if (!((encoder_capabilities=plugin_request(PLUGIN_ENCODERS,prefs->encoder.name,"get_capabilities"))==NULL)) {
+          prefs->encoder.capabilities=atoi((char *)lives_list_nth_data(encoder_capabilities,0));
+          lives_list_free_strings(encoder_capabilities);
+          lives_list_free(encoder_capabilities);
+          if ((ofmt_all=plugin_request_by_line(PLUGIN_ENCODERS,prefs->encoder.name,"get_formats"))!=NULL) {
+            // get any restrictions for the current format
+            for (i=0; i<lives_list_length(ofmt_all); i++) {
+              if ((numtok=get_token_count((char *)lives_list_nth_data(ofmt_all,i),'|'))>2) {
+                array=lives_strsplit((char *)lives_list_nth_data(ofmt_all,i),"|",-1);
+                if (!strcmp(array[0],prefs->encoder.of_name)) {
+                  if (numtok>1) {
+                    lives_snprintf(prefs->encoder.of_desc,128,"%s",array[1]);
+                  }
+                  lives_strfreev(array);
+                  break;
+                }
+                lives_strfreev(array);
+              }
+            }
+            lives_list_free_strings(ofmt_all);
+            lives_list_free(ofmt_all);
+          }
+        }
       }
 
       get_pref_utf8("vid_load_dir",prefs->def_vid_load_dir,PATH_MAX);
       if (!strlen(prefs->def_vid_load_dir)) {
+#ifdef USE_GLIB
 #if GLIB_CHECK_VERSION(2,14,0)
-	g_snprintf(prefs->def_vid_load_dir,PATH_MAX,"%s",g_get_user_special_dir(G_USER_DIRECTORY_VIDEOS));
+        lives_snprintf(prefs->def_vid_load_dir,PATH_MAX,"%s",g_get_user_special_dir(G_USER_DIRECTORY_VIDEOS));
 #else
-	g_snprintf(prefs->def_vid_load_dir,PATH_MAX,"%s",capable->home_dir);
+        lives_snprintf(prefs->def_vid_load_dir,PATH_MAX,"%s",capable->home_dir);
 #endif
-	set_pref("vid_load_dir",prefs->def_vid_load_dir);
+#endif
+        set_pref("vid_load_dir",prefs->def_vid_load_dir);
       }
-      g_snprintf(mainw->vid_load_dir,PATH_MAX,"%s",prefs->def_vid_load_dir);
+      lives_snprintf(mainw->vid_load_dir,PATH_MAX,"%s",prefs->def_vid_load_dir);
       ensure_isdir(mainw->vid_load_dir);
 
       get_pref_utf8("vid_save_dir",prefs->def_vid_save_dir,PATH_MAX);
       if (!strlen(prefs->def_vid_save_dir)) {
+#ifdef USE_GLIB
 #if GLIB_CHECK_VERSION(2,14,0)
-	g_snprintf(prefs->def_vid_save_dir,PATH_MAX,"%s",g_get_user_special_dir(G_USER_DIRECTORY_VIDEOS));
+        lives_snprintf(prefs->def_vid_save_dir,PATH_MAX,"%s",g_get_user_special_dir(G_USER_DIRECTORY_VIDEOS));
 #else
-	g_snprintf(prefs->def_vid_save_dir,PATH_MAX,"%s",capable->home_dir);
+        lives_snprintf(prefs->def_vid_save_dir,PATH_MAX,"%s",capable->home_dir);
+#endif
 #endif
-	set_pref("vid_save_dir",prefs->def_vid_save_dir);
+        set_pref("vid_save_dir",prefs->def_vid_save_dir);
       }
-      g_snprintf(mainw->vid_save_dir,PATH_MAX,"%s",prefs->def_vid_save_dir);
+      lives_snprintf(mainw->vid_save_dir,PATH_MAX,"%s",prefs->def_vid_save_dir);
       ensure_isdir(mainw->vid_save_dir);
 
-      g_snprintf(mainw->vid_dl_dir,PATH_MAX,"%s",mainw->vid_save_dir);
-      
+      lives_snprintf(mainw->vid_dl_dir,PATH_MAX,"%s",mainw->vid_save_dir);
+
       get_pref_utf8("audio_dir",prefs->def_audio_dir,PATH_MAX);
       if (!strlen(prefs->def_audio_dir)) {
+#ifdef USE_GLIB
 #if GLIB_CHECK_VERSION(2,14,0)
-	g_snprintf(prefs->def_audio_dir,PATH_MAX,"%s",g_get_user_special_dir(G_USER_DIRECTORY_MUSIC));
+        lives_snprintf(prefs->def_audio_dir,PATH_MAX,"%s",g_get_user_special_dir(G_USER_DIRECTORY_MUSIC));
 #else
-	g_snprintf(prefs->def_audio_dir,PATH_MAX,"%s",capable->home_dir);
+        lives_snprintf(prefs->def_audio_dir,PATH_MAX,"%s",capable->home_dir);
 #endif
-	set_pref("audio_dir",prefs->def_audio_dir);
+#endif
+        set_pref("audio_dir",prefs->def_audio_dir);
       }
-      g_snprintf(mainw->audio_dir,PATH_MAX,"%s",prefs->def_audio_dir);
+      lives_snprintf(mainw->audio_dir,PATH_MAX,"%s",prefs->def_audio_dir);
       ensure_isdir(mainw->audio_dir);
-      
+
       get_pref_utf8("image_dir",prefs->def_image_dir,PATH_MAX);
       if (!strlen(prefs->def_image_dir)) {
+#ifdef USE_GLIB
 #if GLIB_CHECK_VERSION(2,14,0)
-	g_snprintf(prefs->def_image_dir,PATH_MAX,"%s",g_get_user_special_dir(G_USER_DIRECTORY_PICTURES));
+        lives_snprintf(prefs->def_image_dir,PATH_MAX,"%s",g_get_user_special_dir(G_USER_DIRECTORY_PICTURES));
 #else
-	g_snprintf(prefs->def_image_dir,PATH_MAX,"%s",capable->home_dir);
+        lives_snprintf(prefs->def_image_dir,PATH_MAX,"%s",capable->home_dir);
+#endif
 #endif
-	set_pref("image_dir",prefs->def_image_dir);
+        set_pref("image_dir",prefs->def_image_dir);
       }
-      g_snprintf(mainw->image_dir,PATH_MAX,"%s",prefs->def_image_dir);
+      lives_snprintf(mainw->image_dir,PATH_MAX,"%s",prefs->def_image_dir);
       ensure_isdir(mainw->image_dir);
 
       get_pref_utf8("proj_dir",prefs->def_proj_dir,PATH_MAX);
       if (!strlen(prefs->def_proj_dir)) {
-	g_snprintf(prefs->def_proj_dir,PATH_MAX,"%s",capable->home_dir);
-	set_pref("proj_dir",prefs->def_proj_dir);
+        lives_snprintf(prefs->def_proj_dir,PATH_MAX,"%s",capable->home_dir);
+        set_pref("proj_dir",prefs->def_proj_dir);
       }
-      g_snprintf(mainw->proj_load_dir,PATH_MAX,"%s",prefs->def_proj_dir);
+      lives_snprintf(mainw->proj_load_dir,PATH_MAX,"%s",prefs->def_proj_dir);
       ensure_isdir(mainw->proj_load_dir);
-      g_snprintf(mainw->proj_save_dir,PATH_MAX,"%s",mainw->proj_load_dir);
-      
-      prefs->show_player_stats=get_boolean_pref ("show_player_stats");
-      
-      prefs->dl_bandwidth=get_int_pref ("dl_bandwidth_K");
+      lives_snprintf(mainw->proj_save_dir,PATH_MAX,"%s",mainw->proj_load_dir);
+
+      prefs->show_player_stats=get_boolean_pref("show_player_stats");
+
+      prefs->dl_bandwidth=get_int_pref("dl_bandwidth_K");
       prefs->fileselmax=get_boolean_pref("filesel_maximised");
 
-      prefs->midisynch=get_boolean_pref ("midisynch");
+      prefs->midisynch=get_boolean_pref("midisynch");
       if (prefs->midisynch&&!capable->has_midistartstop) {
-	set_boolean_pref("midisynch",FALSE);
-	prefs->midisynch=FALSE;
+        set_boolean_pref("midisynch",FALSE);
+        prefs->midisynch=FALSE;
       }
-      
+
 
       prefs->discard_tv=FALSE;
-      
+
       // conserve disk space ?
-      prefs->conserve_space=get_boolean_pref ("conserve_space");
-      prefs->ins_resample=get_boolean_pref ("insert_resample");
-      
+      prefs->conserve_space=get_boolean_pref("conserve_space");
+      prefs->ins_resample=get_boolean_pref("insert_resample");
+
       // need better control of audio channels first
       prefs->pause_during_pb=FALSE;
 
       // should we always use the last directory ?
       // TODO - add to GUI
-      prefs->save_directories=get_boolean_pref ("save_directories");
+      prefs->save_directories=get_boolean_pref("save_directories");
       prefs->antialias=get_boolean_pref("antialias");
 
       prefs->concat_images=get_boolean_pref("concat_images");
@@ -1526,42 +1583,43 @@
 
       prefs->fxdefsfile=NULL;
       prefs->fxsizesfile=NULL;
-      
+
       needs_free=FALSE;
       weed_plugin_path=getenv("WEED_PLUGIN_PATH");
       if (weed_plugin_path==NULL) {
-	get_pref("weed_plugin_path",prefs->weed_plugin_path,PATH_MAX);
-	if (strlen(prefs->weed_plugin_path)==0) weed_plugin_path=g_build_filename(prefs->lib_dir,PLUGIN_EXEC_DIR,PLUGIN_WEED_FX_BUILTIN,NULL);
-	else weed_plugin_path=g_strdup(prefs->weed_plugin_path);
-	lives_setenv("WEED_PLUGIN_PATH",weed_plugin_path);
-	needs_free=TRUE;
+        get_pref("weed_plugin_path",prefs->weed_plugin_path,PATH_MAX);
+        if (strlen(prefs->weed_plugin_path)==0) weed_plugin_path=lives_build_filename(prefs->lib_dir,PLUGIN_EXEC_DIR,PLUGIN_WEED_FX_BUILTIN,NULL);
+        else weed_plugin_path=lives_strdup(prefs->weed_plugin_path);
+        lives_setenv("WEED_PLUGIN_PATH",weed_plugin_path);
+        needs_free=TRUE;
       }
       snprintf(prefs->weed_plugin_path,PATH_MAX,"%s",weed_plugin_path);
-      if (needs_free) g_free(weed_plugin_path);
-      
+      if (needs_free) lives_free(weed_plugin_path);
+
       needs_free=FALSE;
       frei0r_path=getenv("FREI0R_PATH");
       if (frei0r_path==NULL) {
-	get_pref("frei0r_path",prefs->frei0r_path,PATH_MAX);
-	if (strlen(prefs->frei0r_path)==0) frei0r_path=g_strdup_printf("/usr/lib/frei0r-1:/usr/local/lib/frei0r-1:%s/frei0r-1",capable->home_dir);
-	else frei0r_path=g_strdup(prefs->frei0r_path);
-	lives_setenv("FREI0R_PATH",frei0r_path);
-	needs_free=TRUE;
+        get_pref("frei0r_path",prefs->frei0r_path,PATH_MAX);
+        if (strlen(prefs->frei0r_path)==0) frei0r_path=lives_strdup_printf("/usr/lib/frei0r-1:/usr/local/lib/frei0r-1:%s/frei0r-1",
+              capable->home_dir);
+        else frei0r_path=lives_strdup(prefs->frei0r_path);
+        lives_setenv("FREI0R_PATH",frei0r_path);
+        needs_free=TRUE;
       }
       snprintf(prefs->frei0r_path,PATH_MAX,"%s",frei0r_path);
-      if (needs_free) g_free(frei0r_path);
-      
+      if (needs_free) lives_free(frei0r_path);
+
       needs_free=FALSE;
       ladspa_path=getenv("LADSPA_PATH");
       if (ladspa_path==NULL||strlen(ladspa_path)==0) {
-	get_pref("ladspa_path",prefs->ladspa_path,PATH_MAX);
-	if (strlen(prefs->ladspa_path)==0) ladspa_path=g_build_filename(prefs->lib_dir,"ladspa",NULL);
-	else ladspa_path=g_strdup(prefs->ladspa_path);
-	lives_setenv("LADSPA_PATH",ladspa_path);
-	needs_free=TRUE;
+        get_pref("ladspa_path",prefs->ladspa_path,PATH_MAX);
+        if (strlen(prefs->ladspa_path)==0) ladspa_path=lives_build_filename(prefs->lib_dir,"ladspa",NULL);
+        else ladspa_path=lives_strdup(prefs->ladspa_path);
+        lives_setenv("LADSPA_PATH",ladspa_path);
+        needs_free=TRUE;
       }
       snprintf(prefs->ladspa_path,PATH_MAX,"%s",ladspa_path);
-      if (needs_free) g_free(ladspa_path);
+      if (needs_free) lives_free(ladspa_path);
 
       splash_msg(_("Loading realtime effect plugins..."),.6);
       weed_load_all();
@@ -1575,8 +1633,8 @@
 
       prefs->audio_opts=get_int_pref("audio_opts");
 #ifdef ENABLE_JACK
-      g_snprintf(prefs->jack_aserver,256,"%s/.jackdrc",capable->home_dir);
-      g_snprintf(prefs->jack_tserver,256,"%s/.jackdrc",capable->home_dir);
+      lives_snprintf(prefs->jack_aserver,256,"%s/.jackdrc",capable->home_dir);
+      lives_snprintf(prefs->jack_tserver,256,"%s/.jackdrc",capable->home_dir);
 
 #endif
 
@@ -1585,23 +1643,23 @@
       else prefs->atrans_fx=weed_get_idx_for_hashname(buff,FALSE);
 
       if ((prefs->startup_phase==1||prefs->startup_phase==-1)) {
-	splash_end();
-	// get initial tempdir
-	if (!do_tempdir_query()) {
-	  lives_exit();
-	}
-	prefs->startup_phase=2;
-	set_int_pref("startup_phase",2);
+        splash_end();
+        // get initial tempdir
+        if (!do_tempdir_query()) {
+          lives_exit(0);
+        }
+        prefs->startup_phase=2;
+        set_int_pref("startup_phase",2);
       }
 
 
       if (prefs->startup_phase>0&&prefs->startup_phase<3) {
-	splash_end();
-	if (!do_startup_tests(FALSE)) {
-	  lives_exit();
-	}
-	prefs->startup_phase=3;
-	set_int_pref("startup_phase",3);
+        splash_end();
+        if (!do_startup_tests(FALSE)) {
+          lives_exit(0);
+        }
+        prefs->startup_phase=3;
+        set_int_pref("startup_phase",3);
       }
 
 
@@ -1612,117 +1670,119 @@
       if (capable->has_mplayer2) naudp++;
 
       if (naudp>1) {
-	if (prefs->startup_phase>0&&prefs->startup_phase<=4) {
-	  splash_end();
-	  if (!do_audio_choice_dialog(prefs->startup_phase)) {
-	    lives_exit();
-	  }
-	  if (prefs->audio_player==AUD_PLAYER_JACK) future_prefs->jack_opts=prefs->jack_opts=JACK_OPTS_START_ASERVER;
-	  else future_prefs->jack_opts=prefs->jack_opts=0;
-	  set_int_pref("jack_opts",prefs->jack_opts);
-
-	  prefs->startup_phase=4;
-	  set_int_pref("startup_phase",4);
-	}
+        if (prefs->startup_phase>0&&prefs->startup_phase<=4) {
+          splash_end();
+          if (!do_audio_choice_dialog(prefs->startup_phase)) {
+            lives_exit(0);
+          }
+          if (prefs->audio_player==AUD_PLAYER_JACK) future_prefs->jack_opts=prefs->jack_opts=JACK_OPTS_START_ASERVER;
+          else future_prefs->jack_opts=prefs->jack_opts=0;
+          set_int_pref("jack_opts",prefs->jack_opts);
+
+          prefs->startup_phase=4;
+          set_int_pref("startup_phase",4);
+        }
 
 #ifdef ENABLE_JACK
-	if (prefs->jack_opts&JACK_OPTS_TRANSPORT_MASTER||prefs->jack_opts&JACK_OPTS_TRANSPORT_CLIENT||prefs->jack_opts&JACK_OPTS_START_ASERVER||prefs->jack_opts&JACK_OPTS_START_TSERVER) {
-	  // start jack transport polling
-	  if (prefs->jack_opts&JACK_OPTS_START_ASERVER) splash_msg(_("Starting jack audio server..."),.8);
-	  else {
-	    if (prefs->jack_opts&JACK_OPTS_START_TSERVER) splash_msg(_("Starting jack transport server..."),.8);
-	    else splash_msg(_("Connecting to jack transport server..."),.8);
-	  }
-	  if (!lives_jack_init()) {
-	    if ((prefs->jack_opts&JACK_OPTS_START_ASERVER)||(prefs->jack_opts&JACK_OPTS_START_TSERVER)) do_jack_noopen_warn();
-	    else do_jack_noopen_warn3();
-	    if (prefs->startup_phase==4) {
-	      do_jack_noopen_warn2();
-	    }
-	    future_prefs->jack_opts=0; // jack is causing hassle, get rid of it
-	    set_int_pref("jack_opts",0);
-	    lives_exit();
-	  }
-	}
-
-	if (prefs->audio_player==AUD_PLAYER_JACK) {
-	  jack_audio_init();
-	  jack_audio_read_init();
-	  mainw->jackd=jack_get_driver(0,TRUE);
-	  if (mainw->jackd!=NULL) {
-	    if (jack_open_device(mainw->jackd)) mainw->jackd=NULL;
+        if (prefs->jack_opts&JACK_OPTS_TRANSPORT_MASTER||prefs->jack_opts&JACK_OPTS_TRANSPORT_CLIENT||prefs->jack_opts&JACK_OPTS_START_ASERVER||
+            prefs->jack_opts&JACK_OPTS_START_TSERVER) {
+          // start jack transport polling
+          if (prefs->jack_opts&JACK_OPTS_START_ASERVER) splash_msg(_("Starting jack audio server..."),.8);
+          else {
+            if (prefs->jack_opts&JACK_OPTS_START_TSERVER) splash_msg(_("Starting jack transport server..."),.8);
+            else splash_msg(_("Connecting to jack transport server..."),.8);
+          }
+          if (!lives_jack_init()) {
+            if ((prefs->jack_opts&JACK_OPTS_START_ASERVER)||(prefs->jack_opts&JACK_OPTS_START_TSERVER)) do_jack_noopen_warn();
+            else do_jack_noopen_warn3();
+            if (prefs->startup_phase==4) {
+              do_jack_noopen_warn2();
+            }
+            future_prefs->jack_opts=0; // jack is causing hassle, get rid of it
+            set_int_pref("jack_opts",0);
+            lives_exit(0);
+          }
+        }
+
+        if (prefs->audio_player==AUD_PLAYER_JACK) {
+          jack_audio_init();
+          jack_audio_read_init();
+          mainw->jackd=jack_get_driver(0,TRUE);
+          if (mainw->jackd!=NULL) {
+            if (jack_open_device(mainw->jackd)) mainw->jackd=NULL;
 
-	    if (mainw->jackd==NULL&&prefs->startup_phase==0) {
+            if (mainw->jackd==NULL&&prefs->startup_phase==0) {
 #ifdef HAVE_PULSE_AUDIO
-	      gchar *otherbit="\"lives -aplayer pulse\".";
+              char *otherbit=lives_strdup("\"lives -aplayer pulse\".");
 #else
-	      gchar *otherbit="\"lives -aplayer sox\".";
+              char *otherbit=lives_strdup("\"lives -aplayer sox\".");
 #endif
-	      gchar *tmp;
+              char *tmp;
 
-	      gchar *msg=g_strdup_printf(_("\n\nManual start of jackd required. Please make sure jackd is running, \nor else change the value of <jack_opts> in %s to 16\nand restart LiVES.\n\nAlternatively, try to start lives with either \"lives -jackopts 16\", or "),(tmp=g_filename_to_utf8(capable->rcfile,-1,NULL,NULL,NULL)));
-	      g_printerr("%s%s\n\n",msg,otherbit);
-	      g_free(msg);
-	      g_free(tmp);
-
-	    }
-
-	    if (mainw->jackd==NULL) {
-	      do_jack_noopen_warn3();
-	      if (prefs->startup_phase==4) {
-		do_jack_noopen_warn2();
-	      }
-	      else do_jack_noopen_warn4();
-	      lives_exit();
-	    }
-
-	    mainw->jackd->whentostop=&mainw->whentostop;
-	    mainw->jackd->cancelled=&mainw->cancelled;
-	    mainw->jackd->in_use=FALSE;
-	    mainw->jackd->play_when_stopped=(prefs->jack_opts&JACK_OPTS_NOPLAY_WHEN_PAUSED)?FALSE:TRUE;
-
-	    if (prefs->perm_audio_reader&&prefs->audio_src==AUDIO_SRC_EXT) {
-	      // create reader connection now, if permanent
-	      jack_rec_audio_to_clip(-1,-1,RECA_EXTERNAL);
-	    }
+              char *msg=lives_strdup_printf(
+                          _("\n\nManual start of jackd required. Please make sure jackd is running, \nor else change the value of <jack_opts> in %s to 16\nand restart LiVES.\n\nAlternatively, try to start lives with either \"lives -jackopts 16\", or "),
+                          (tmp=lives_filename_to_utf8(capable->rcfile,-1,NULL,NULL,NULL)));
+              lives_printerr("%s%s\n\n",msg,otherbit);
+              lives_free(msg);
+              lives_free(tmp);
+              lives_free(otherbit);
+
+            }
+
+            if (mainw->jackd==NULL) {
+              do_jack_noopen_warn3();
+              if (prefs->startup_phase==4) {
+                do_jack_noopen_warn2();
+              } else do_jack_noopen_warn4();
+              lives_exit(0);
+            }
+
+            mainw->jackd->whentostop=&mainw->whentostop;
+            mainw->jackd->cancelled=&mainw->cancelled;
+            mainw->jackd->in_use=FALSE;
+            mainw->jackd->play_when_stopped=(prefs->jack_opts&JACK_OPTS_NOPLAY_WHEN_PAUSED)?FALSE:TRUE;
+
+            if (prefs->perm_audio_reader&&prefs->audio_src==AUDIO_SRC_EXT) {
+              // create reader connection now, if permanent
+              jack_rec_audio_to_clip(-1,-1,RECA_EXTERNAL);
+            }
 
-	  }
-	}
+          }
+        }
 #endif
       }
 
 
 #ifdef HAVE_PULSE_AUDIO
-	if (prefs->audio_player==AUD_PLAYER_PULSE) {
-	  splash_msg(_("Starting pulse audio server..."),.8);
+      if (prefs->audio_player==AUD_PLAYER_PULSE) {
+        splash_msg(_("Starting pulse audio server..."),.8);
 
-	  if (!lives_pulse_init(prefs->startup_phase)) {
-	    if (prefs->startup_phase==4) {
-	      lives_exit();
-	    }
-	  }
-	  else {
-	    pulse_audio_init();
-	    pulse_audio_read_init();
-	    mainw->pulsed=pulse_get_driver(TRUE);
-	    
-	    mainw->pulsed->whentostop=&mainw->whentostop;
-	    mainw->pulsed->cancelled=&mainw->cancelled;
-	    mainw->pulsed->in_use=FALSE;
-	    if (prefs->perm_audio_reader&&prefs->audio_src==AUDIO_SRC_EXT) {
-	      // create reader connection now, if permanent
-	      pulse_rec_audio_to_clip(-1,-1,RECA_EXTERNAL);
-	    }
+        if (!lives_pulse_init(prefs->startup_phase)) {
+          if (prefs->startup_phase==4) {
+            lives_exit(0);
+          }
+        } else {
+          pulse_audio_init();
+          pulse_audio_read_init();
+          mainw->pulsed=pulse_get_driver(TRUE);
+
+          mainw->pulsed->whentostop=&mainw->whentostop;
+          mainw->pulsed->cancelled=&mainw->cancelled;
+          mainw->pulsed->in_use=FALSE;
+          if (prefs->perm_audio_reader&&prefs->audio_src==AUDIO_SRC_EXT) {
+            // create reader connection now, if permanent
+            pulse_rec_audio_to_clip(-1,-1,RECA_EXTERNAL);
+          }
 
-	  }
-	}
+        }
+      }
 #endif
 
     }
 
-    
+
     if (prefs->startup_phase!=0) {
-      gchar *txt;
+      char *txt;
 
       splash_end();
       set_int_pref("startup_phase",5);
@@ -1730,7 +1790,7 @@
       do_startup_interface_query();
       txt=get_new_install_msg();
       startup_message_info(txt);
-      g_free(txt);
+      lives_free(txt);
 
       set_int_pref("startup_phase",100); // tell backend to delete this
       prefs->startup_phase=100;
@@ -1739,112 +1799,112 @@
     if (mainw->vpp!=NULL&&mainw->vpp->get_audio_fmts!=NULL) mainw->vpp->audio_codec=get_best_audio(mainw->vpp);
 
     // toolbar buttons
-    lives_widget_set_bg_color (mainw->tb_hbox, LIVES_WIDGET_STATE_NORMAL, &palette->fade_colour);
-    lives_widget_set_bg_color (mainw->toolbar, LIVES_WIDGET_STATE_NORMAL, &palette->fade_colour);
-    lives_widget_set_bg_color (mainw->t_stopbutton, LIVES_WIDGET_STATE_PRELIGHT, &palette->fade_colour);
-    lives_widget_set_bg_color (mainw->t_bckground, LIVES_WIDGET_STATE_PRELIGHT, &palette->fade_colour);
-    lives_widget_set_bg_color (mainw->t_sepwin, LIVES_WIDGET_STATE_PRELIGHT, &palette->fade_colour);
-    lives_widget_set_bg_color (mainw->t_double, LIVES_WIDGET_STATE_PRELIGHT, &palette->fade_colour);
-    lives_widget_set_bg_color (mainw->t_fullscreen, LIVES_WIDGET_STATE_PRELIGHT, &palette->fade_colour);
-    lives_widget_set_bg_color (mainw->t_faster, LIVES_WIDGET_STATE_PRELIGHT, &palette->fade_colour);
-    lives_widget_set_bg_color (mainw->t_slower, LIVES_WIDGET_STATE_PRELIGHT, &palette->fade_colour);
-    lives_widget_set_bg_color (mainw->t_forward, LIVES_WIDGET_STATE_PRELIGHT, &palette->fade_colour);
-    lives_widget_set_bg_color (mainw->t_back, LIVES_WIDGET_STATE_PRELIGHT, &palette->fade_colour);
-    lives_widget_set_bg_color (mainw->t_infobutton, LIVES_WIDGET_STATE_PRELIGHT, &palette->fade_colour);
-    
+    lives_widget_set_bg_color(mainw->tb_hbox, LIVES_WIDGET_STATE_NORMAL, &palette->fade_colour);
+    lives_widget_set_bg_color(mainw->toolbar, LIVES_WIDGET_STATE_NORMAL, &palette->fade_colour);
+    lives_widget_set_bg_color(mainw->t_stopbutton, LIVES_WIDGET_STATE_PRELIGHT, &palette->fade_colour);
+    lives_widget_set_bg_color(mainw->t_bckground, LIVES_WIDGET_STATE_PRELIGHT, &palette->fade_colour);
+    lives_widget_set_bg_color(mainw->t_sepwin, LIVES_WIDGET_STATE_PRELIGHT, &palette->fade_colour);
+    lives_widget_set_bg_color(mainw->t_double, LIVES_WIDGET_STATE_PRELIGHT, &palette->fade_colour);
+    lives_widget_set_bg_color(mainw->t_fullscreen, LIVES_WIDGET_STATE_PRELIGHT, &palette->fade_colour);
+    lives_widget_set_bg_color(mainw->t_faster, LIVES_WIDGET_STATE_PRELIGHT, &palette->fade_colour);
+    lives_widget_set_bg_color(mainw->t_slower, LIVES_WIDGET_STATE_PRELIGHT, &palette->fade_colour);
+    lives_widget_set_bg_color(mainw->t_forward, LIVES_WIDGET_STATE_PRELIGHT, &palette->fade_colour);
+    lives_widget_set_bg_color(mainw->t_back, LIVES_WIDGET_STATE_PRELIGHT, &palette->fade_colour);
+    lives_widget_set_bg_color(mainw->t_infobutton, LIVES_WIDGET_STATE_PRELIGHT, &palette->fade_colour);
 
-    }
+
+  }
 }
 
 
 
 void do_start_messages(void) {
-  gchar *endian;
+  char *endian;
 
   d_print("\n");
   d_print(_("Checking optional dependencies:"));
-  if (capable->has_mplayer) d_print(_ ("mplayer...detected..."));
-  else d_print(_ ("mplayer...NOT DETECTED..."));
-  if (capable->has_mplayer2) d_print(_ ("mplayer2...detected..."));
-  else d_print(_ ("mplayer2...NOT DETECTED..."));
-  if (capable->has_convert) d_print(_ ("convert...detected..."));
-  else d_print(_ ("convert...NOT DETECTED..."));
-  if (capable->has_composite) d_print(_ ("composite...detected..."));
-  else d_print(_ ("composite...NOT DETECTED..."));
-  if (capable->has_sox_sox) d_print(_ ("sox...detected\n"));
-  else d_print(_ ("sox...NOT DETECTED\n"));
-  if (capable->has_cdda2wav) d_print(_ ("cdda2wav...detected..."));
-  else d_print(_ ("cdda2wav...NOT DETECTED..."));
-  if (capable->has_jackd) d_print(_ ("jackd...detected..."));
-  else d_print(_ ("jackd...NOT DETECTED..."));
-  if (capable->has_pulse_audio) d_print(_ ("pulse audio...detected..."));
-  else d_print(_ ("pulse audio...NOT DETECTED..."));
-  if (capable->has_python) d_print(_ ("python...detected..."));
-  else d_print(_ ("python...NOT DETECTED..."));
-  if (capable->has_dvgrab) d_print(_ ("dvgrab...detected..."));
-  else d_print(_ ("dvgrab...NOT DETECTED..."));
-  if (capable->has_xwininfo) d_print(_ ("xwininfo...detected..."));
-  else d_print(_ ("xwininfo...NOT DETECTED..."));
+  if (capable->has_mplayer) d_print(_("mplayer...detected..."));
+  else d_print(_("mplayer...NOT DETECTED..."));
+  if (capable->has_mplayer2) d_print(_("mplayer2...detected..."));
+  else d_print(_("mplayer2...NOT DETECTED..."));
+  if (capable->has_convert) d_print(_("convert...detected..."));
+  else d_print(_("convert...NOT DETECTED..."));
+  if (capable->has_composite) d_print(_("composite...detected..."));
+  else d_print(_("composite...NOT DETECTED..."));
+  if (capable->has_sox_sox) d_print(_("sox...detected\n"));
+  else d_print(_("sox...NOT DETECTED\n"));
+  if (capable->has_cdda2wav) d_print(_("cdda2wav...detected..."));
+  else d_print(_("cdda2wav...NOT DETECTED..."));
+  if (capable->has_jackd) d_print(_("jackd...detected..."));
+  else d_print(_("jackd...NOT DETECTED..."));
+  if (capable->has_pulse_audio) d_print(_("pulse audio...detected..."));
+  else d_print(_("pulse audio...NOT DETECTED..."));
+  if (capable->has_python) d_print(_("python...detected..."));
+  else d_print(_("python...NOT DETECTED..."));
+  if (capable->has_dvgrab) d_print(_("dvgrab...detected..."));
+  else d_print(_("dvgrab...NOT DETECTED..."));
+  if (capable->has_xwininfo) d_print(_("xwininfo...detected..."));
+  else d_print(_("xwininfo...NOT DETECTED..."));
 
 #ifdef GDK_WINDOWING_X11
-  prefs->wm=g_strdup(gdk_x11_screen_get_window_manager_name (gdk_screen_get_default()));
+  prefs->wm=lives_strdup(gdk_x11_screen_get_window_manager_name(gdk_screen_get_default()));
 #else
 #ifdef IS_MINGW
-  prefs->wm=g_strdup_printf(_("Windows version %04X"),WINVER);
+  prefs->wm=lives_strdup_printf(_("Windows version %04X"),WINVER);
 #else
-  prefs->wm=g_strdup((_("UNKNOWN - please patch me !")));
+  prefs->wm=lives_strdup((_("UNKNOWN - please patch me !")));
 #endif
 #endif
 
-  g_snprintf(mainw->msg,512,_ ("\n\nWindow manager reports as \"%s\"; "),prefs->wm);
+  lives_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"),capable->nmonitors);
+  lives_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 "),capable->ncpus);
+  lives_snprintf(mainw->msg,512,_("Number of CPUs detected: %d "),capable->ncpus);
   d_print(mainw->msg);
 
-  if (capable->byte_order==LIVES_LITTLE_ENDIAN) endian=g_strdup(_("little endian"));
-  else endian=g_strdup(_("big endian"));
-  g_snprintf(mainw->msg,512,_("(%d bits, %s)\n"),capable->cpu_bits,endian);
+  if (capable->byte_order==LIVES_LITTLE_ENDIAN) endian=lives_strdup(_("little endian"));
+  else endian=lives_strdup(_("big endian"));
+  lives_snprintf(mainw->msg,512,_("(%d bits, %s)\n"),capable->cpu_bits,endian);
   d_print(mainw->msg);
-  g_free(endian);
+  lives_free(endian);
 
-  g_snprintf(mainw->msg,512,"%s",_("GUI type is: "));
+  lives_snprintf(mainw->msg,512,"%s",_("GUI type is: "));
   d_print(mainw->msg);
 
 #ifdef GUI_GTK
-  g_snprintf(mainw->msg,512,_("GTK+ "
+  lives_snprintf(mainw->msg,512,_("GTK+ "
 #if GTK_CHECK_VERSION(3,0,0)
-"version %d.%d.%d ("
+                                  "version %d.%d.%d ("
 #endif
-"compiled with %d.%d.%d"
+                                  "compiled with %d.%d.%d"
 #if GTK_CHECK_VERSION(3,0,0)
-")"
+                                  ")"
 #endif
-),
+                                 ),
 #if GTK_CHECK_VERSION(3,0,0)
-	     gtk_get_major_version(),
-	     gtk_get_minor_version(),
-	     gtk_get_micro_version(),
-#endif
-	     GTK_MAJOR_VERSION,
-	     GTK_MINOR_VERSION,
-	     GTK_MICRO_VERSION
-	     );
+                 gtk_get_major_version(),
+                 gtk_get_minor_version(),
+                 gtk_get_micro_version(),
+#endif
+                 GTK_MAJOR_VERSION,
+                 GTK_MINOR_VERSION,
+                 GTK_MICRO_VERSION
+                );
   d_print(mainw->msg);
 #endif
 
 #ifdef PAINTER_CAIRO
-  g_snprintf(mainw->msg,512,"%s",_(", with cairo support"));
+  lives_snprintf(mainw->msg,512,"%s",_(", with cairo support"));
   d_print(mainw->msg);
 #endif
 
-  g_snprintf(mainw->msg,512,"\n");
+  lives_snprintf(mainw->msg,512,"\n");
   d_print(mainw->msg);
 
-  g_snprintf(mainw->msg,512,_ ("Temp directory is %s\n"),prefs->tmpdir);
+  lives_snprintf(mainw->msg,512,_("Temp directory is %s\n"),prefs->tmpdir);
   d_print(mainw->msg);
 
 #ifndef RT_AUDIO
@@ -1858,7 +1918,7 @@
 #endif
 #endif
 
-  g_snprintf(mainw->msg,512,_ ("Welcome to LiVES version %s.\n\n"),LiVES_VERSION);
+  lives_snprintf(mainw->msg,512,_("Welcome to LiVES version %s.\n\n"),LiVES_VERSION);
   d_print(mainw->msg);
 
 }
@@ -1867,43 +1927,42 @@
 
 
 // TODO - allow user definable themes
-void set_palette_colours (void) {
+void set_palette_colours(void) {
 
   // set configurable colours and theme colours for the app
-  lives_color_parse ("black", &palette->black);
-  lives_color_parse ("white", &palette->white);
-  lives_color_parse ("SeaGreen3", &palette->light_green);
-  lives_color_parse ("dark red", &palette->dark_red);
-  lives_color_parse ("light blue", &palette->light_blue);
-  lives_color_parse ("light yellow", &palette->light_yellow);
-  lives_color_parse ("grey10", &palette->grey20);
-  lives_color_parse ("grey25", &palette->grey25);
-  lives_color_parse ("grey45", &palette->grey45);
-  lives_color_parse ("grey60", &palette->grey60);
-  lives_color_parse ("pink", &palette->pink);
-  lives_color_parse ("salmon", &palette->light_red);
-  lives_color_parse ("DarkOrange4", &palette->dark_orange);
+  lives_color_parse("black", &palette->black);
+  lives_color_parse("white", &palette->white);
+  lives_color_parse("SeaGreen3", &palette->light_green);
+  lives_color_parse("dark red", &palette->dark_red);
+  lives_color_parse("light blue", &palette->light_blue);
+  lives_color_parse("light yellow", &palette->light_yellow);
+  lives_color_parse("grey10", &palette->grey20);
+  lives_color_parse("grey25", &palette->grey25);
+  lives_color_parse("grey45", &palette->grey45);
+  lives_color_parse("grey60", &palette->grey60);
+  lives_color_parse("pink", &palette->pink);
+  lives_color_parse("salmon", &palette->light_red);
+  lives_color_parse("DarkOrange4", &palette->dark_orange);
 
   lives_widget_color_copy(&palette->banner_fade_text,&palette->white);
   palette->style=STYLE_PLAIN;
 
   // STYLE_PLAIN will overwrite this
   if (!(strcmp(prefs->theme,"pinks"))) {
-    
+
     palette->normal_back.red=LIVES_WIDGET_COLOR_SCALE_255(228.);
     palette->normal_back.green=LIVES_WIDGET_COLOR_SCALE_255(196.);
     palette->normal_back.blue=LIVES_WIDGET_COLOR_SCALE_255(196.);
 #if LIVES_WIDGET_COLOR_HAS_ALPHA
     palette->normal_back.alpha=1.;
-#endif      
+#endif
     lives_widget_color_copy(&palette->normal_fore,&palette->black);
     lives_widget_color_copy(&palette->menu_and_bars,&palette->pink);
     lives_widget_color_copy(&palette->info_text,&palette->normal_fore);
     lives_widget_color_copy(&palette->info_base,&palette->normal_back);
     palette->style=STYLE_1|STYLE_2|STYLE_3|STYLE_4|STYLE_5;
     lives_widget_color_copy(&palette->menu_and_bars_fore,&palette->normal_fore);
-  }
-  else {
+  } else {
     if (!(strcmp(prefs->theme,"cutting_room"))) {
 
       palette->normal_back.red=LIVES_WIDGET_COLOR_SCALE_255(224.);
@@ -1911,103 +1970,96 @@
       palette->normal_back.blue=LIVES_WIDGET_COLOR_SCALE_255(128.);
 #if LIVES_WIDGET_COLOR_HAS_ALPHA
       palette->normal_back.alpha=1.;
-#endif      
-	  
+#endif
+
       lives_widget_color_copy(&palette->normal_fore,&palette->black);
       lives_widget_color_copy(&palette->menu_and_bars,&palette->white);
       lives_widget_color_copy(&palette->info_text,&palette->normal_fore);
       lives_widget_color_copy(&palette->info_base,&palette->white);
       lives_widget_color_copy(&palette->menu_and_bars_fore,&palette->normal_fore);
       palette->style=STYLE_1|STYLE_2|STYLE_3|STYLE_4;
-    }
-    else {
+    } else {
       if (!(strcmp(prefs->theme,"camera"))) {
 
-	palette->normal_back.red=LIVES_WIDGET_COLOR_SCALE_255(30.);
-	palette->normal_back.green=LIVES_WIDGET_COLOR_SCALE_255(144.);
-	palette->normal_back.blue=LIVES_WIDGET_COLOR_SCALE_255(232.);
+        palette->normal_back.red=LIVES_WIDGET_COLOR_SCALE_255(30.);
+        palette->normal_back.green=LIVES_WIDGET_COLOR_SCALE_255(144.);
+        palette->normal_back.blue=LIVES_WIDGET_COLOR_SCALE_255(232.);
 #if LIVES_WIDGET_COLOR_HAS_ALPHA
-	palette->normal_back.alpha=1.;
-#endif      
-	  
-	lives_widget_color_copy(&palette->normal_fore,&palette->black);
-	lives_widget_color_copy(&palette->menu_and_bars,&palette->white);
-	lives_widget_color_copy(&palette->info_base,&palette->normal_back);
-	lives_widget_color_copy(&palette->info_text,&palette->normal_fore);
-	lives_widget_color_copy(&palette->menu_and_bars_fore,&palette->normal_fore);
-	palette->style=STYLE_1|STYLE_2|STYLE_3|STYLE_4;
-      }
-      else {
-	if (!(strcmp(prefs->theme,"editor"))) {
-	  lives_widget_color_copy(&palette->normal_back,&palette->grey25);
-	  lives_widget_color_copy(&palette->normal_fore,&palette->white);
-	  lives_widget_color_copy(&palette->menu_and_bars,&palette->grey60);
-	  lives_widget_color_copy(&palette->info_base,&palette->grey20);
-	  lives_widget_color_copy(&palette->info_text,&palette->white);
-	  lives_widget_color_copy(&palette->menu_and_bars_fore,&palette->normal_fore);
-	  palette->style=STYLE_1|STYLE_2|STYLE_3|STYLE_4|STYLE_5;
-	}
-	else {
-	  if (!(strcmp(prefs->theme,"crayons-bright"))) {
-	    lives_widget_color_copy(&palette->normal_back,&palette->black);
-	    lives_widget_color_copy(&palette->normal_fore,&palette->white);
-
-	    palette->menu_and_bars.red=LIVES_WIDGET_COLOR_SCALE_255(225.);
-	    palette->menu_and_bars.green=LIVES_WIDGET_COLOR_SCALE_255(160.);
-	    palette->menu_and_bars.blue=LIVES_WIDGET_COLOR_SCALE_255(80.);
+        palette->normal_back.alpha=1.;
+#endif
+
+        lives_widget_color_copy(&palette->normal_fore,&palette->black);
+        lives_widget_color_copy(&palette->menu_and_bars,&palette->white);
+        lives_widget_color_copy(&palette->info_base,&palette->normal_back);
+        lives_widget_color_copy(&palette->info_text,&palette->normal_fore);
+        lives_widget_color_copy(&palette->menu_and_bars_fore,&palette->normal_fore);
+        palette->style=STYLE_1|STYLE_2|STYLE_3|STYLE_4;
+      } else {
+        if (!(strcmp(prefs->theme,"editor"))) {
+          lives_widget_color_copy(&palette->normal_back,&palette->grey25);
+          lives_widget_color_copy(&palette->normal_fore,&palette->white);
+          lives_widget_color_copy(&palette->menu_and_bars,&palette->grey60);
+          lives_widget_color_copy(&palette->info_base,&palette->grey20);
+          lives_widget_color_copy(&palette->info_text,&palette->white);
+          lives_widget_color_copy(&palette->menu_and_bars_fore,&palette->normal_fore);
+          palette->style=STYLE_1|STYLE_2|STYLE_3|STYLE_4|STYLE_5;
+        } else {
+          if (!(strcmp(prefs->theme,"crayons-bright"))) {
+            lives_widget_color_copy(&palette->normal_back,&palette->black);
+            lives_widget_color_copy(&palette->normal_fore,&palette->white);
+
+            palette->menu_and_bars.red=LIVES_WIDGET_COLOR_SCALE_255(225.);
+            palette->menu_and_bars.green=LIVES_WIDGET_COLOR_SCALE_255(160.);
+            palette->menu_and_bars.blue=LIVES_WIDGET_COLOR_SCALE_255(80.);
 #if LIVES_WIDGET_COLOR_HAS_ALPHA
-	    palette->menu_and_bars.alpha=1.;
-#endif      
+            palette->menu_and_bars.alpha=1.;
+#endif
 
-	    palette->info_base.red=LIVES_WIDGET_COLOR_SCALE_255(200.);
-	    palette->info_base.green=LIVES_WIDGET_COLOR_SCALE_255(190.);
-	    palette->info_base.blue=LIVES_WIDGET_COLOR_SCALE_255(52.);
+            palette->info_base.red=LIVES_WIDGET_COLOR_SCALE_255(200.);
+            palette->info_base.green=LIVES_WIDGET_COLOR_SCALE_255(190.);
+            palette->info_base.blue=LIVES_WIDGET_COLOR_SCALE_255(52.);
 #if LIVES_WIDGET_COLOR_HAS_ALPHA
-	    palette->info_base.alpha=1.;
-#endif      
-	      
-	    lives_widget_color_copy(&palette->info_text,&palette->black);
-	    lives_widget_color_copy(&palette->menu_and_bars_fore,&palette->normal_fore);
-
-	    palette->style=STYLE_1|STYLE_2|STYLE_3|STYLE_4;
-	  }
-	  else {
-	    if (!(strcmp(prefs->theme,"crayons"))) {
-	      lives_widget_color_copy(&palette->normal_back,&palette->grey25);
-	      lives_widget_color_copy(&palette->normal_fore,&palette->white);
-	      lives_widget_color_copy(&palette->menu_and_bars,&palette->grey60);
-	      lives_widget_color_copy(&palette->info_base,&palette->grey20);
-	      lives_widget_color_copy(&palette->info_text,&palette->white);
-	      lives_widget_color_copy(&palette->menu_and_bars_fore,&palette->normal_fore);
-	      palette->style=STYLE_1|STYLE_2|STYLE_3|STYLE_4|STYLE_5;
-
-	    }
-	    else {
-	      palette->style=STYLE_PLAIN;
-	    }}}}}}
-}
+            palette->info_base.alpha=1.;
+#endif
 
+            lives_widget_color_copy(&palette->info_text,&palette->black);
+            lives_widget_color_copy(&palette->menu_and_bars_fore,&palette->normal_fore);
 
-static boolean is_big_endian() {
-  int32_t testint = 0x12345678;
-  char *pMem;
-  pMem = (char *) &testint;
-  if (pMem[0] == 0x78) return FALSE;
-  return TRUE;
+            palette->style=STYLE_1|STYLE_2|STYLE_3|STYLE_4;
+          } else {
+            if (!(strcmp(prefs->theme,"crayons"))) {
+              lives_widget_color_copy(&palette->normal_back,&palette->grey25);
+              lives_widget_color_copy(&palette->normal_fore,&palette->white);
+              lives_widget_color_copy(&palette->menu_and_bars,&palette->grey60);
+              lives_widget_color_copy(&palette->info_base,&palette->grey20);
+              lives_widget_color_copy(&palette->info_text,&palette->white);
+              lives_widget_color_copy(&palette->menu_and_bars_fore,&palette->normal_fore);
+              palette->style=STYLE_1|STYLE_2|STYLE_3|STYLE_4|STYLE_5;
+
+            } else {
+              palette->style=STYLE_PLAIN;
+            }
+          }
+        }
+      }
+    }
+  }
 }
 
 
-capability *get_capabilities (void) {
+
+
+capability *get_capabilities(void) {
   // get capabilities of backend system
-  gchar *safer_bfile;
-  gchar **array;
-  
-  gchar buffer[4096+PATH_MAX];
+  char *safer_bfile;
+  char **array;
+
+  char buffer[4096+PATH_MAX];
   FILE *bootfile;
-  gchar string[256];
+  char string[256];
   int err;
   int numtok;
-  gchar *tmp;
+  char *tmp;
 
 #ifdef IS_DARWIN
   processor_info_array_t processorInfo;
@@ -2021,7 +2073,7 @@
 #endif
 #endif
 
-  capable=(capability *)g_malloc(sizeof(capability));
+  capable=(capability *)lives_malloc(sizeof(capability));
 
 
   // this is _compile time_ bits, not runtime bits
@@ -2029,9 +2081,9 @@
   if (sizeof(void *)==8) capable->cpu_bits=64;
 
   // _runtime_ byte order
-  if (is_big_endian()) 
+  if (IS_BIG_ENDIAN)
     capable->byte_order=LIVES_BIG_ENDIAN;
-  else 
+  else
     capable->byte_order=LIVES_LITTLE_ENDIAN;
 
   capable->has_smogrify=FALSE;
@@ -2039,22 +2091,45 @@
 
   capable->mainpid=lives_getpid();
 
+#ifndef IS_MINGW
+  get_location("touch", capable->touch_cmd, PATH_MAX);
+  get_location("rm", capable->rm_cmd, PATH_MAX);
+  get_location("mv", capable->mv_cmd, PATH_MAX);
+  get_location("cp", capable->cp_cmd, PATH_MAX);
+  get_location("ln", capable->ln_cmd, PATH_MAX);
+  get_location("chmod", capable->chmod_cmd, PATH_MAX);
+  get_location("cat", capable->cat_cmd, PATH_MAX);
+  get_location("echo", capable->echo_cmd, PATH_MAX);
+  get_location("rmdir", capable->rmdir_cmd, PATH_MAX);
+#endif
+
   // required
   capable->can_write_to_tmp=FALSE;
   capable->can_write_to_tempdir=FALSE;
   capable->can_write_to_config=FALSE;
   capable->can_read_from_config=FALSE;
 
+#ifdef GUI_GTK
 #ifndef IS_MINGW
-  g_snprintf(capable->home_dir,PATH_MAX,"%s",g_get_home_dir());
+  lives_snprintf(capable->home_dir,PATH_MAX,"%s",g_get_home_dir());
 #else
   // TODO/REG - we will get from registry
 
-  g_snprintf(capable->home_dir,PATH_MAX,"%s\\Application Data\\LiVES",g_get_home_dir());
+  lives_snprintf(capable->home_dir,PATH_MAX,"%s\\Application Data\\LiVES",g_get_home_dir());
 #endif
 
   g_snprintf(capable->system_tmpdir,PATH_MAX,"%s",g_get_tmp_dir());
 
+#endif
+
+#ifdef GUI_QT
+  QStringList qsl = QStandardPaths::standardLocations(QStandardPaths::HomeLocation);
+  lives_snprintf(capable->home_dir,PATH_MAX,"%s",qsl.at(0).toLocal8Bit().constData());
+
+  qsl = QStandardPaths::standardLocations(QStandardPaths::TempLocation);
+  lives_snprintf(capable->system_tmpdir,PATH_MAX,"%s",qsl.at(0).toLocal8Bit().constData());
+#endif
+
   memset(capable->startup_msg,0,1);
 
   // optional
@@ -2081,48 +2156,48 @@
   capable->has_xdg_screensaver=FALSE;
 
 #ifndef IS_MINGW
-  safer_bfile=g_strdup_printf("%s"G_DIR_SEPARATOR_S".smogrify.%d.%d",capable->system_tmpdir,lives_getuid(),lives_getgid());
+  safer_bfile=lives_strdup_printf("%s"LIVES_DIR_SEPARATOR_S".smogrify.%d.%d",capable->system_tmpdir,lives_getuid(),lives_getgid());
 #else
-  safer_bfile=g_strdup_printf("%s"G_DIR_SEPARATOR_S"smogrify.%d.%d",capable->system_tmpdir,lives_getuid(),lives_getgid());
+  safer_bfile=lives_strdup_printf("%s"LIVES_DIR_SEPARATOR_S"smogrify.%d.%d",capable->system_tmpdir,lives_getuid(),lives_getgid());
 #endif
-  unlink (safer_bfile);
+  unlink(safer_bfile);
 
   // check that we can write to /tmp
-  if (!check_file (safer_bfile,FALSE)) return capable;
+  if (!check_file(safer_bfile,FALSE)) return capable;
   capable->can_write_to_tmp=TRUE;
 
 #ifndef IS_MINGW
-  g_snprintf(prefs->backend_sync,PATH_MAX,"%s","smogrify");
-  g_snprintf(prefs->backend,PATH_MAX,"%s","smogrify");
-  if ((tmp=g_find_program_in_path ("smogrify"))==NULL) return capable;
-  g_free(tmp);
+  lives_snprintf(prefs->backend_sync,PATH_MAX,"%s","smogrify");
+  lives_snprintf(prefs->backend,PATH_MAX,"%s","smogrify");
+  if ((tmp=lives_find_program_in_path("smogrify"))==NULL) return capable;
+  lives_free(tmp);
 
-  g_snprintf(string,256,"%s report \"%s\" 2>/dev/null",prefs->backend_sync,
-	     (tmp=g_filename_from_utf8 (safer_bfile,-1,NULL,NULL,NULL)));
+  lives_snprintf(string,256,"%s report \"%s\" 2>/dev/null",prefs->backend_sync,
+                 (tmp=lives_filename_from_utf8(safer_bfile,-1,NULL,NULL,NULL)));
 
-  g_free(tmp);
+  lives_free(tmp);
 
-  g_snprintf(string,256,"%s report \"%s\" 2>/dev/null",prefs->backend_sync,
-	     (tmp=g_filename_from_utf8 (safer_bfile,-1,NULL,NULL,NULL)));
+  lives_snprintf(string,256,"%s report \"%s\" 2>/dev/null",prefs->backend_sync,
+                 (tmp=lives_filename_from_utf8(safer_bfile,-1,NULL,NULL,NULL)));
 #else
 
-  g_snprintf(prefs->backend_sync,PATH_MAX,"perl \"%s\\smogrify\"",prefs->prefix_dir);
-  g_snprintf(prefs->backend,PATH_MAX,"START /MIN /B perl \"%s\\smogrify\"",prefs->prefix_dir);
+  lives_snprintf(prefs->backend_sync,PATH_MAX,"perl \"%s\\smogrify\"",prefs->prefix_dir);
+  lives_snprintf(prefs->backend,PATH_MAX,"START /MIN /B perl \"%s\\smogrify\"",prefs->prefix_dir);
 
-  g_snprintf(string,256,"%s report \"%s\" 2>NUL",prefs->backend_sync,
-	     (tmp=g_filename_from_utf8 (safer_bfile,-1,NULL,NULL,NULL)));
+  lives_snprintf(string,256,"%s report \"%s\" 2>NUL",prefs->backend_sync,
+                 (tmp=lives_filename_from_utf8(safer_bfile,-1,NULL,NULL,NULL)));
 
 #endif
 
 
-  g_free(tmp);
+  lives_free(tmp);
 
   err=system(string);
 
   if (err==32512||err==32256) {
     return capable;
   }
-  
+
   capable->has_smogrify=TRUE;
 
   if (err==512) {
@@ -2147,7 +2222,7 @@
   }
 
   if (!(bootfile=fopen(safer_bfile,"r"))) {
-    g_free(safer_bfile);
+    lives_free(safer_bfile);
     return capable;
   }
 
@@ -2155,47 +2230,46 @@
   lives_fgets(buffer,8192,bootfile);
   fclose(bootfile);
 
-  unlink (safer_bfile);
-  g_free(safer_bfile);
+  unlink(safer_bfile);
+  lives_free(safer_bfile);
 
   if (mainw->read_failed) return capable;
 
   // get backend version, tempdir, and any startup message
-  numtok=get_token_count (buffer,'|');
-  array=g_strsplit(buffer,"|",numtok);
+  numtok=get_token_count(buffer,'|');
+  array=lives_strsplit(buffer,"|",numtok);
 
-  g_snprintf(string,256,"%s",array[0]);
+  lives_snprintf(string,256,"%s",array[0]);
 
   if (strcmp(string,LiVES_VERSION)) {
-    g_strfreev(array);
+    lives_strfreev(array);
     return capable;
   }
 
   capable->smog_version_correct=TRUE;
 
-  g_snprintf(prefs->tmpdir,PATH_MAX,"%s",array[1]);
-  g_snprintf(future_prefs->tmpdir,PATH_MAX,"%s",prefs->tmpdir);
+  lives_snprintf(prefs->tmpdir,PATH_MAX,"%s",array[1]);
+  lives_snprintf(future_prefs->tmpdir,PATH_MAX,"%s",prefs->tmpdir);
 
-  prefs->startup_phase=atoi (array[2]);
+  prefs->startup_phase=atoi(array[2]);
 
-  if (numtok>3&&strlen (array[3])) {
+  if (numtok>3&&strlen(array[3])) {
     if (!strcmp(array[3],"!updmsg")) {
-      gchar *text=get_upd_msg();
-      g_snprintf(capable->startup_msg,256,"%s\n\n",text);
-      g_free(text);
+      char *text=get_upd_msg();
+      lives_snprintf(capable->startup_msg,256,"%s\n\n",text);
+      lives_free(text);
 
-      if (numtok>4&&strlen (array[4])) {
-	g_strappend (capable->startup_msg,256,array[4]);
+      if (numtok>4&&strlen(array[4])) {
+        lives_strappend(capable->startup_msg,256,array[4]);
       }
-    }
-    else {
-      g_snprintf(capable->startup_msg,256,"%s\n\n",array[3]);
-      if (numtok>4&&strlen (array[4])) {
-	g_strappend (capable->startup_msg,256,array[4]);
+    } else {
+      lives_snprintf(capable->startup_msg,256,"%s\n\n",array[3]);
+      if (numtok>4&&strlen(array[4])) {
+        lives_strappend(capable->startup_msg,256,array[4]);
       }
     }
   }
-  g_strfreev(array);
+  lives_strfreev(array);
 
   if (!capable->can_write_to_tempdir) return capable;
 
@@ -2295,58 +2369,61 @@
 }
 
 void print_notice() {
-  g_printerr("\nLiVES %s\n",LiVES_VERSION);
-  g_printerr("Copyright 2002-2015 Gabriel Finch (salsaman@gmail.com) 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");
+  lives_printerr("\nLiVES %s\n",LiVES_VERSION);
+  lives_printerr("Copyright 2002-2015 Gabriel Finch (salsaman@gmail.com) and others.\n");
+  lives_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");
 }
 
 
 void print_opthelp(void) {
   print_notice();
-  g_printerr(_("\nStartup syntax is: %s [opts] [filename [start_time] [frames]]\n"),capable->myname);
-  g_printerr("%s",_("Where: filename is the name of a media file or backup file.\n"));
-  g_printerr("%s",_("start_time : filename start time in seconds\n"));
-  g_printerr("%s",_("frames : maximum number of frames to open\n"));
-  g_printerr("%s","\n");
-  g_printerr("%s",_("opts can be:\n"));
-  g_printerr("%s",_("-help            : show this help text and exit\n"));
-  g_printerr("%s",_("-tmpdir <tempdir>: use alternate working directory (e.g /var/ramdisk)\n"));
-  g_printerr("%s",_("-set <setname>   : autoload clip set setname\n"));
-  g_printerr("%s",_("-noset           : do not load any set on startup\n"));
-  g_printerr("%s",_("-norecover       : force no-loading of crash recovery\n"));
-  g_printerr("%s",_("-recover         : force loading of crash recovery\n"));
-  g_printerr("%s",_("-nothreaddialog  : doe nothing - retained for backwards compatibility\n"));
-  g_printerr("%s",_("-nogui           : do not show the gui\n"));
-  g_printerr("%s",_("-nosplash        : do not show the splash window\n"));
-  g_printerr("%s",_("-noplaywin       : do not show the play window\n"));
-  g_printerr("%s",_("-startup-ce      : start in clip editor mode\n"));
-  g_printerr("%s",_("-startup-mt      : start in multitrack mode\n"));
-  g_printerr("%s",_("-fxmodesmax <n>  : allow <n> modes per effect key (minimum is 1, default is 8)\n"));
+  lives_printerr(_("\nStartup syntax is: %s [opts] [filename [start_time] [frames]]\n"),capable->myname);
+  lives_printerr("%s",_("Where: filename is the name of a media file or backup file.\n"));
+  lives_printerr("%s",_("start_time : filename start time in seconds\n"));
+  lives_printerr("%s",_("frames : maximum number of frames to open\n"));
+  lives_printerr("%s","\n");
+  lives_printerr("%s",_("opts can be:\n"));
+  lives_printerr("%s",_("-help            : show this help text and exit\n"));
+  lives_printerr("%s",_("-tmpdir <tempdir>: use alternate working directory (e.g /var/ramdisk)\n"));
+  lives_printerr("%s",_("-set <setname>   : autoload clip set setname\n"));
+  lives_printerr("%s",_("-noset           : do not load any set on startup\n"));
+  lives_printerr("%s",_("-norecover       : force no-loading of crash recovery\n"));
+  lives_printerr("%s",_("-recover         : force loading of crash recovery\n"));
+  lives_printerr("%s",_("-nothreaddialog  : does nothing - retained for backwards compatibility\n"));
+  lives_printerr("%s",_("-nogui           : do not show the gui\n"));
+  lives_printerr("%s",_("-nosplash        : do not show the splash window\n"));
+  lives_printerr("%s",_("-noplaywin       : do not show the play window\n"));
+  lives_printerr("%s",_("-noninteractive  : disable menu interactivity\n"));
+  lives_printerr("%s",_("-startup-ce      : start in clip editor mode\n"));
+  lives_printerr("%s",_("-startup-mt      : start in multitrack mode\n"));
+  lives_printerr("%s",_("-fxmodesmax <n>  : allow <n> modes per effect key (minimum is 1, default is 8)\n"));
 #ifdef ENABLE_OSC
-  g_printerr("%s",_("-oscstart <port> : start OSC listener on UDP port <port>\n"));
-  g_printerr("%s",_("-nooscstart      : do not start OSC listener\n"));
+  lives_printerr("%s",_("-oscstart <port> : start OSC listener on UDP port <port>\n"));
+  lives_printerr("%s",_("-nooscstart      : do not start OSC listener\n"));
 #endif
-  g_printerr("%s",_("-aplayer <ap>    : start with selected audio player. <ap> can be mplayer, mplayer2"));
+  lives_printerr("%s",_("-aplayer <ap>    : start with selected audio player. <ap> can be mplayer, mplayer2"));
 #ifdef HAVE_PULSE_AUDIO
   // TRANSLATORS: pulse (audio)
-  g_printerr("%s",_(", pulse"));
+  lives_printerr("%s",_(", pulse"));
 #endif
 #ifdef ENABLE_JACK
-  g_printerr("%s",_(", sox or jack\n"));
-  g_printerr("%s",_("-jackopts <opts>    : opts is a bitmap of jack startup options [1 = jack transport client, 2 = jack transport master, 4 = start jack transport server, 8 = pause audio when video paused, 16 = start jack audio server] \n"));
-#else
-  g_printerr("%s",_(" or sox\n"));
-#endif
-  g_printerr("%s",_("-devicemap <mapname>          : autoload devicemap\n"));
-  g_printerr("%s",_("-vppdefaults <file>          : load video playback plugin defaults from <file> (Note: only sets the settings, not the plugin type)\n"));
-  g_printerr("%s",_("-debug            : try to debug crashes (requires 'gdb' installed)\n"));
+  lives_printerr("%s",_(", sox or jack\n"));
+  lives_printerr("%s",
+                 _("-jackopts <opts>    : opts is a bitmap of jack startup options [1 = jack transport client, 2 = jack transport master, 4 = start jack transport server, 8 = pause audio when video paused, 16 = start jack audio server] \n"));
+#else
+  lives_printerr("%s",_(" or sox\n"));
+#endif
+  lives_printerr("%s",_("-devicemap <mapname>          : autoload devicemap\n"));
+  lives_printerr("%s",
+                 _("-vppdefaults <file>          : load video playback plugin defaults from <file> (Note: only sets the settings, not the plugin type)\n"));
+  lives_printerr("%s",_("-debug            : try to debug crashes (requires 'gdb' installed)\n"));
 
-  g_printerr("%s","\n");
+  lives_printerr("%s","\n");
 }
 
 //// things to do - on startup
 #ifdef HAVE_YUV4MPEG
-static boolean open_yuv4m_startup(gpointer data) {
+static boolean open_yuv4m_startup(livespointer data) {
   on_open_yuv4m_activate(NULL,data);
   return FALSE;
 }
@@ -2355,15 +2432,14 @@
 
 /////////////////////////////////
 
-
-static boolean lives_startup(gpointer data) {
+static boolean lives_startup(livespointer data) {
 #ifdef GUI_GTK
-  GError *gerr=NULL;
-  gchar *icon;
+  LiVESError *gerr=NULL;
+  char *icon;
 #endif
 
   boolean got_files=FALSE;
-  gchar *tmp;
+  char *tmp;
 
   if (!mainw->foreign) {
     if (prefs->show_splash) splash_init();
@@ -2373,15 +2449,17 @@
   splash_msg(_("Starting GUI..."),0.);
 
   if (palette->style&STYLE_1) widget_opts.apply_theme=TRUE;
-  create_LiVES ();
+  create_LiVES();
   widget_opts.apply_theme=FALSE;
 
+  set_interactive(mainw->interactive);
+
 #ifdef GUI_GTK
-  icon=g_build_filename(prefs->prefix_dir,DESKTOP_ICON_DIR,"lives.png",NULL);
+  icon=lives_build_filename(prefs->prefix_dir,DESKTOP_ICON_DIR,"lives.png",NULL);
   gtk_window_set_default_icon_from_file(icon,&gerr);
-  g_free(icon);
+  lives_free(icon);
 
-  if (gerr!=NULL) g_error_free(gerr);
+  if (gerr!=NULL) lives_error_free(gerr);
 #endif
 
   lives_widget_queue_draw(mainw->LiVES);
@@ -2392,13 +2470,16 @@
   if (capable->smog_version_correct) {
     if (theme_expected&&palette->style==STYLE_PLAIN&&!mainw->foreign) {
       // non-fatal errors
-      gchar *tmp2;
-      gchar *err=g_strdup_printf(_ ("\n\nThe theme you requested could not be located. Please make sure you have the themes installed in\n%s/%s.\n(Maybe you need to change the value of <prefix_dir> in your %s file)\n"),(tmp=g_filename_to_utf8(prefs->prefix_dir,-1,NULL,NULL,NULL)),THEME_DIR,(tmp2=g_filename_to_utf8(capable->rcfile,-1,NULL,NULL,NULL)));
-      g_free(tmp2);
-      g_free(tmp);
-      startup_message_nonfatal (err);
-      g_free(err);
-      g_snprintf(prefs->theme,64,"none");
+      char *tmp2;
+      char *err=lives_strdup_printf(
+                  _("\n\nThe theme you requested could not be located. Please make sure you have the themes installed in\n%s/%s.\n(Maybe you need to change the value of <prefix_dir> in your %s file)\n"),
+                  (tmp=lives_filename_to_utf8(prefs->prefix_dir,-1,NULL,NULL,NULL)),THEME_DIR,(tmp2=lives_filename_to_utf8(capable->rcfile,-1,NULL,NULL,
+                      NULL)));
+      lives_free(tmp2);
+      lives_free(tmp);
+      startup_message_nonfatal(err);
+      lives_free(err);
+      lives_snprintf(prefs->theme,64,"none");
       upgrade_error=TRUE;
     }
     lives_init(&ign_opts);
@@ -2407,136 +2488,151 @@
   if (!mainw->foreign) {
     // fatal errors
     if (!capable->can_write_to_tmp) {
-      startup_message_fatal((tmp=g_strdup_printf(_ ("\nLiVES was unable to write a small file to %s\nPlease make sure you have write access to %s and try again.\n"),capable->system_tmpdir)));
-      g_free(tmp);
-    }
-    else {
+      startup_message_fatal((tmp=lives_strdup_printf(
+                                   _("\nLiVES was unable to write a small file to %s\nPlease make sure you have write access to %s and try again.\n"),
+                                   capable->system_tmpdir)));
+      lives_free(tmp);
+    } else {
       if (!capable->has_smogrify) {
-	gchar *err=g_strdup (_ ("\n`smogrify` must be in your path, and be executable\n\nPlease review the README file which came with this package\nbefore running LiVES.\n"));
-	startup_message_fatal(err);
-	g_free(err);
-      }
-      else {
-	if (!capable->can_read_from_config) {
-	  gchar *err=g_strdup_printf(_ ("\nLiVES was unable to read from its configuration file\n%s\n\nPlease check the file permissions for this file and try again.\n"),(tmp=g_filename_to_utf8(capable->rcfile,-1,NULL,NULL,NULL)));
-	  g_free(tmp);
-	  startup_message_fatal(err);
-	  g_free(err);
-	}
-	else {
-	  if (!capable->can_write_to_config) {
-	    gchar *err=g_strdup_printf(_ ("\nLiVES was unable to write to its configuration file\n%s\n\nPlease check the file permissions for this file and directory\nand try again.\n"),(tmp=g_filename_to_utf8(capable->rcfile,-1,NULL,NULL,NULL)));
-	    g_free(tmp);
-	    startup_message_fatal(err);
-	    g_free(err);
-	  }
-	  else {
-	    if (!capable->can_write_to_tempdir) {
-	      gchar *extrabit;
-	      gchar *err;
-	      if (!mainw->has_session_tmpdir) {
-		extrabit=g_strdup_printf(_("Please check the <tempdir> setting in \n%s\nand try again.\n"),
-				  (tmp=g_filename_to_utf8(capable->rcfile,-1,NULL,NULL,NULL)));
-		g_free(tmp);
-	      }
-	      else 
-		extrabit=g_strdup("");
-
-	      err=g_strdup_printf(_ ("\nLiVES was unable to use the temporary directory\n%s\n\n%s"),
-				  prefs->tmpdir,extrabit);
-	      g_free(extrabit);
-	      startup_message_fatal(err);
-	      g_free(err);
-	    }
-	    else {
-	      if (!capable->smog_version_correct) {
-		startup_message_fatal(_ ("\nAn incorrect version of smogrify was found in your path.\n\nPlease review the README file which came with this package\nbefore running LiVES.\n\nThankyou.\n"));
-	      }
-	      else {
-		#ifndef IS_MINGW
-		if ((!capable->has_sox_sox||!capable->has_sox_play)&&!capable->has_mplayer&&!capable->has_mplayer2){
-		  startup_message_fatal(_ ("\nLiVES currently requires 'mplayer', 'mplayer2' or 'sox' to function. Please install one or other of these, and try again.\n"));
-		}
-		#else
-		if (!capable->has_sox_sox||(!capable->has_mplayer&&!capable->has_mplayer2)){
-		  startup_message_fatal(_ ("\nLiVES currently requires both 'mplayer' or 'mplayer2' and 'sox' to function. Please install these, and try again.\n"));
-		}
-		#endif
-		else {
-		  if (strlen(capable->startup_msg)) {
-		    startup_message_nonfatal (capable->startup_msg);
-		  }
-		  else {
-		    // non-fatal errors
-		    if (!capable->has_mplayer&&!capable->has_mplayer2&&!(prefs->warning_mask&WARN_MASK_NO_MPLAYER)) {
-		      startup_message_nonfatal_dismissable (_ ("\nLiVES was unable to locate 'mplayer' or 'mplayer2'. You may wish to install either one to use LiVES more fully.\n"),WARN_MASK_NO_MPLAYER);
-		    }
-		    if (!capable->has_convert) {
-		      startup_message_nonfatal_dismissable (_ ("\nLiVES was unable to locate 'convert'. You should install convert and image-magick if you want to use rendered effects.\n"),WARN_MASK_NO_MPLAYER);
-		    }
-		    if (!capable->has_composite) {
-		      startup_message_nonfatal_dismissable (_ ("\nLiVES was unable to locate 'composite'. You should install composite and image-magick if you want to use the merge function.\n"),WARN_MASK_NO_MPLAYER);
-		    }
-		    if (!capable->has_sox_sox) {
-		      startup_message_nonfatal_dismissable (_ ("\nLiVES was unable to locate 'sox'. Some audio features may not work. You should install 'sox'.\n"),WARN_MASK_NO_MPLAYER);
-		    }
-		    if (!capable->has_encoder_plugins) {
-		      gchar *err=g_strdup_printf(_ ("\nLiVES was unable to find any encoder plugins.\nPlease check that you have them installed correctly in\n%s%s%s/\nYou will not be able to 'Save' without them.\nYou may need to change the value of <lib_dir> in %s\n"),prefs->lib_dir,PLUGIN_EXEC_DIR,PLUGIN_ENCODERS,(tmp=g_filename_to_utf8(capable->rcfile,-1,NULL,NULL,NULL)));
-		      g_free(tmp);
-		      startup_message_nonfatal_dismissable (err,WARN_MASK_NO_ENCODERS);
-		      g_free(err);
-		      upgrade_error=TRUE;
-		    }
-
-		    if (mainw->next_ds_warn_level>0) {
-		      uint64_t dsval;
-		      lives_storage_status_t ds=get_storage_status(prefs->tmpdir,mainw->next_ds_warn_level,&dsval);
-		      if (ds==LIVES_STORAGE_STATUS_WARNING) {
-			gchar *err;
-			uint64_t curr_ds_warn=mainw->next_ds_warn_level;
-			mainw->next_ds_warn_level>>=1;
-			if (mainw->next_ds_warn_level>(dsval>>1)) mainw->next_ds_warn_level=dsval>>1;
-			if (mainw->next_ds_warn_level<prefs->ds_crit_level) mainw->next_ds_warn_level=prefs->ds_crit_level;
-			tmp=ds_warning_msg(prefs->tmpdir,dsval,curr_ds_warn,mainw->next_ds_warn_level);
-			err=g_strdup_printf("\n%s\n",tmp);
-			g_free(tmp);
-			startup_message_nonfatal(err);
-			g_free(err);
-		      }
-		      else if (ds==LIVES_STORAGE_STATUS_CRITICAL) {
-			gchar *err;
-			tmp=ds_critical_msg(prefs->tmpdir,dsval);
-			err=g_strdup_printf("\n%s\n",tmp);
-			g_free(tmp);
-			startup_message_fatal(err);
-			g_free(err);
-		      }
-		    }
-		  }
-
-		  if (prefs->startup_interface!=STARTUP_MT) {
-		    if (prefs->show_gui) {
-		      lives_widget_show (mainw->LiVES);
-		    }
-#ifdef ENABLE_OSC
-		    lives_osc_notify(LIVES_OSC_NOTIFY_MODE_CHANGED,(tmp=g_strdup_printf("%d",STARTUP_CE)));
-		    g_free(tmp);
-#endif
-		  }
-		}}}}}}}}
+        char *err=lives_strdup(
+                    _("\n`smogrify` must be in your path, and be executable\n\nPlease review the README file which came with this package\nbefore running LiVES.\n"));
+        startup_message_fatal(err);
+        lives_free(err);
+      } else {
+        if (!capable->can_read_from_config) {
+          char *err=lives_strdup_printf(
+                      _("\nLiVES was unable to read from its configuration file\n%s\n\nPlease check the file permissions for this file and try again.\n"),
+                      (tmp=lives_filename_to_utf8(capable->rcfile,-1,NULL,NULL,NULL)));
+          lives_free(tmp);
+          startup_message_fatal(err);
+          lives_free(err);
+        } else {
+          if (!capable->can_write_to_config) {
+            char *err=lives_strdup_printf(
+                        _("\nLiVES was unable to write to its configuration file\n%s\n\nPlease check the file permissions for this file and directory\nand try again.\n"),
+                        (tmp=lives_filename_to_utf8(capable->rcfile,-1,NULL,NULL,NULL)));
+            lives_free(tmp);
+            startup_message_fatal(err);
+            lives_free(err);
+          } else {
+            if (!capable->can_write_to_tempdir) {
+              char *extrabit;
+              char *err;
+              if (!mainw->has_session_tmpdir) {
+                extrabit=lives_strdup_printf(_("Please check the <tempdir> setting in \n%s\nand try again.\n"),
+                                             (tmp=lives_filename_to_utf8(capable->rcfile,-1,NULL,NULL,NULL)));
+                lives_free(tmp);
+              } else
+                extrabit=lives_strdup("");
+
+              err=lives_strdup_printf(_("\nLiVES was unable to use the temporary directory\n%s\n\n%s"),
+                                      prefs->tmpdir,extrabit);
+              lives_free(extrabit);
+              startup_message_fatal(err);
+              lives_free(err);
+            } else {
+              if (!capable->smog_version_correct) {
+                startup_message_fatal(
+                  _("\nAn incorrect version of smogrify was found in your path.\n\nPlease review the README file which came with this package\nbefore running LiVES.\n\nThankyou.\n"));
+              } else {
+#ifndef IS_MINGW
+                if ((!capable->has_sox_sox||!capable->has_sox_play)&&!capable->has_mplayer&&!capable->has_mplayer2) {
+                  startup_message_fatal(
+                    _("\nLiVES currently requires 'mplayer', 'mplayer2' or 'sox' to function. Please install one or other of these, and try again.\n"));
+                }
+#else
+                if (!capable->has_sox_sox||(!capable->has_mplayer&&!capable->has_mplayer2)) {
+                  startup_message_fatal(
+                    _("\nLiVES currently requires both 'mplayer' or 'mplayer2' and 'sox' to function. Please install these, and try again.\n"));
+                }
+#endif
+                else {
+                  if (strlen(capable->startup_msg)) {
+                    startup_message_nonfatal(capable->startup_msg);
+                  } else {
+                    // non-fatal errors
+                    if (!capable->has_mplayer&&!capable->has_mplayer2&&!(prefs->warning_mask&WARN_MASK_NO_MPLAYER)) {
+                      startup_message_nonfatal_dismissable(
+                        _("\nLiVES was unable to locate 'mplayer' or 'mplayer2'. You may wish to install either one to use LiVES more fully.\n"),
+                        WARN_MASK_NO_MPLAYER);
+                    }
+                    if (!capable->has_convert) {
+                      startup_message_nonfatal_dismissable(
+                        _("\nLiVES was unable to locate 'convert'. You should install convert and image-magick if you want to use rendered effects.\n"),
+                        WARN_MASK_NO_MPLAYER);
+                    }
+                    if (!capable->has_composite) {
+                      startup_message_nonfatal_dismissable(
+                        _("\nLiVES was unable to locate 'composite'. You should install composite and image-magick if you want to use the merge function.\n"),
+                        WARN_MASK_NO_MPLAYER);
+                    }
+                    if (!capable->has_sox_sox) {
+                      startup_message_nonfatal_dismissable(_("\nLiVES was unable to locate 'sox'. Some audio features may not work. You should install 'sox'.\n"),
+                                                           WARN_MASK_NO_MPLAYER);
+                    }
+                    if (!capable->has_encoder_plugins) {
+                      char *err=lives_strdup_printf(
+                                  _("\nLiVES was unable to find any encoder plugins.\nPlease check that you have them installed correctly in\n%s%s%s/\nYou will not be able to 'Save' without them.\nYou may need to change the value of <lib_dir> in %s\n"),
+                                  prefs->lib_dir,PLUGIN_EXEC_DIR,PLUGIN_ENCODERS,(tmp=lives_filename_to_utf8(capable->rcfile,-1,NULL,NULL,NULL)));
+                      lives_free(tmp);
+                      startup_message_nonfatal_dismissable(err,WARN_MASK_NO_ENCODERS);
+                      lives_free(err);
+                      upgrade_error=TRUE;
+                    }
+
+                    if (mainw->next_ds_warn_level>0) {
+                      uint64_t dsval;
+                      lives_storage_status_t ds=get_storage_status(prefs->tmpdir,mainw->next_ds_warn_level,&dsval);
+                      if (ds==LIVES_STORAGE_STATUS_WARNING) {
+                        char *err;
+                        uint64_t curr_ds_warn=mainw->next_ds_warn_level;
+                        mainw->next_ds_warn_level>>=1;
+                        if (mainw->next_ds_warn_level>(dsval>>1)) mainw->next_ds_warn_level=dsval>>1;
+                        if (mainw->next_ds_warn_level<prefs->ds_crit_level) mainw->next_ds_warn_level=prefs->ds_crit_level;
+                        tmp=ds_warning_msg(prefs->tmpdir,dsval,curr_ds_warn,mainw->next_ds_warn_level);
+                        err=lives_strdup_printf("\n%s\n",tmp);
+                        lives_free(tmp);
+                        startup_message_nonfatal(err);
+                        lives_free(err);
+                      } else if (ds==LIVES_STORAGE_STATUS_CRITICAL) {
+                        char *err;
+                        tmp=ds_critical_msg(prefs->tmpdir,dsval);
+                        err=lives_strdup_printf("\n%s\n",tmp);
+                        lives_free(tmp);
+                        startup_message_fatal(err);
+                        lives_free(err);
+                      }
+                    }
+                  }
+
+                  if (prefs->startup_interface!=STARTUP_MT) {
+                    if (prefs->show_gui) {
+                      // mainw->ready gets set here
+                      lives_widget_show(mainw->LiVES);
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  }
 
   else {
     // capture mode
     mainw->foreign_key=atoi(zargv[2]);
 
-#if GTK_CHECK_VERSION(3,0,0)
+#if GTK_CHECK_VERSION(3,0,0) || defined GUI_QT
     mainw->foreign_id=(Window)atoi(zargv[3]);
 #else
     mainw->foreign_id=(GdkNativeWindow)atoi(zargv[3]);
 #endif
+
     mainw->foreign_width=atoi(zargv[4]);
     mainw->foreign_height=atoi(zargv[5]);
-    g_snprintf(prefs->image_ext,16,"%s",zargv[6]);
+    lives_snprintf(prefs->image_ext,16,"%s",zargv[6]);
     mainw->foreign_bpp=atoi(zargv[7]);
     mainw->rec_vid_frames=atoi(zargv[8]);
     mainw->rec_fps=strtod(zargv[9],NULL);
@@ -2546,10 +2642,10 @@
     mainw->rec_signed_endian=atoi(zargv[13]);
 
     if (zargc>14) {
-      mainw->foreign_visual=g_strdup(zargv[14]);
+      mainw->foreign_visual=lives_strdup(zargv[14]);
       if (!strcmp(mainw->foreign_visual,"(null)")) {
-	g_free(mainw->foreign_visual);
-	mainw->foreign_visual=NULL;
+        lives_free(mainw->foreign_visual);
+        mainw->foreign_visual=NULL;
       }
     }
 
@@ -2565,13 +2661,13 @@
       pulse_audio_read_init();
     }
 #endif
-    lives_widget_show (mainw->LiVES);
+    lives_widget_show(mainw->LiVES);
     on_capture2_activate();  // exits
   }
 
 #ifdef NOTTY
   if (!mainw->foreign) {
-    close (2);
+    close(2);
     capable->has_stderr=FALSE;
   }
 #endif
@@ -2579,8 +2675,8 @@
   do_start_messages();
 
   if (mainw->cached_list!=NULL) {
-    g_list_free_strings(mainw->cached_list);
-    g_list_free(mainw->cached_list);
+    lives_list_free_strings(mainw->cached_list);
+    lives_list_free(mainw->cached_list);
     mainw->cached_list=NULL;
   }
 
@@ -2595,8 +2691,8 @@
     prefs->startup_phase=0;
   }
 
-  // splash_end() will start up mulitrack if in STARTUP_MT mode
-  if (strlen (start_file)&&strcmp(start_file,"-")) {
+  // splash_end() will start up multirack if in STARTUP_MT mode
+  if (strlen(start_file)&&strcmp(start_file,"-")) {
     splash_end();
     deduce_file(start_file,start,end);
     got_files=TRUE;
@@ -2608,13 +2704,11 @@
   if (prefs->crash_recovery&&!no_recover) got_files=check_for_recovery_files(auto_recover);
 
   if (!mainw->foreign&&!got_files&&prefs->ar_clipset) {
-    gchar *msg=g_strdup_printf(_("Autoloading set %s..."),prefs->ar_clipset_name);
+    char *msg=lives_strdup_printf(_("Autoloading set %s..."),prefs->ar_clipset_name);
     d_print(msg);
     splash_msg(msg,1.);
-    g_free(msg);
-    g_snprintf(mainw->set_name,128,"%s",prefs->ar_clipset_name);
-    on_load_set_ok(NULL,GINT_TO_POINTER(FALSE));
-    if (mainw->current_file==-1) {
+    lives_free(msg);
+    if (!reload_set(prefs->ar_clipset_name) || mainw->current_file==-1) {
       set_pref("ar_clipset","");
       prefs->ar_clipset=FALSE;
     }
@@ -2632,10 +2726,21 @@
   mainw->kb_timer=lives_timer_add(KEY_RPT_INTERVAL,&ext_triggers_poll,NULL);
 
 #ifdef HAVE_YUV4MPEG
-  if (strlen(prefs->yuvin)>0) g_idle_add(open_yuv4m_startup,NULL);
+  if (strlen(prefs->yuvin)>0) lives_idle_add(open_yuv4m_startup,NULL);
 #endif
 
+#ifdef GUI_GTK
+#if defined HAVE_X11 || defined IS_MINGW
   gdk_window_add_filter(NULL, filter_func, NULL);
+#endif
+#endif
+
+#ifdef GUI_QT
+#if defined HAVE_X11 || defined IS_MINGW
+  nevfilter *nf = new nevfilter;
+  qapp->installNativeEventFilter(nf);
+#endif
+#endif
 
 #if GTK_CHECK_VERSION(3,0,0)
   if (!mainw->foreign&&prefs->show_gui) {
@@ -2645,6 +2750,9 @@
 
   mainw->go_away=FALSE;
 
+  lives_notify(LIVES_OSC_NOTIFY_MODE_CHANGED,(tmp=lives_strdup_printf("%d",STARTUP_CE)));
+  lives_free(tmp);
+
   return FALSE;
 } // end lives_startup()
 
@@ -2667,14 +2775,14 @@
   sact.sa_mask=smask;
 
 
-  sigaction (LIVES_SIGINT, &sact, NULL);
-  sigaction (LIVES_SIGTERM, &sact, NULL);
-  sigaction (LIVES_SIGSEGV, &sact, NULL);
-  sigaction (LIVES_SIGABRT, &sact, NULL);
+  sigaction(LIVES_SIGINT, &sact, NULL);
+  sigaction(LIVES_SIGTERM, &sact, NULL);
+  sigaction(LIVES_SIGSEGV, &sact, NULL);
+  sigaction(LIVES_SIGABRT, &sact, NULL);
 
 #else
   SignalHandlerPointer previousHandler;
-  
+
   previousHandler = signal(LIVES_SIGINT, (SignalHandlerPointer)catch_sigint);
   previousHandler = signal(LIVES_SIGTERM, (SignalHandlerPointer)catch_sigint);
   previousHandler = signal(LIVES_SIGSEGV, (SignalHandlerPointer)catch_sigint);
@@ -2690,7 +2798,7 @@
 }
 
 
-int main (int argc, char *argv[]) {
+int real_main(int argc, char *argv[], pthread_t *gtk_thread, ulong id) {
 #ifdef ENABLE_OSC
 #ifdef IS_MINGW
   WSADATA wsaData;
@@ -2698,7 +2806,13 @@
 #endif
 #endif
   ssize_t mynsize;
-  gchar fbuff[PATH_MAX];
+  char fbuff[PATH_MAX];
+
+#ifdef GUI_QT
+  qapp = new QApplication(argc,argv);
+  qtime = new QTime();
+  qtime->start();
+#endif
 
   mainw=NULL;
   set_signal_handlers((SignalHandlerPointer)catch_sigint);
@@ -2708,7 +2822,7 @@
 #ifdef ENABLE_OIL
   oil_init();
 #endif
-  
+
   zargc=argc;
   zargv=argv;
 
@@ -2716,15 +2830,15 @@
 
 #ifdef ENABLE_NLS
   trString=NULL;
-  bindtextdomain (GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR);
+  bindtextdomain(GETTEXT_PACKAGE, PACKAGE_LOCALE_DIR);
 #ifdef UTF8_CHARSET
-  bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
+  bind_textdomain_codeset(GETTEXT_PACKAGE, "UTF-8");
 #endif
-  textdomain (GETTEXT_PACKAGE);
+  textdomain(GETTEXT_PACKAGE);
 #endif
 
   // force decimal point to be a "."
-  putenv ("LC_NUMERIC=C");
+  putenv("LC_NUMERIC=C");
 
 #ifdef ENABLE_OSC
 #ifdef IS_MINGW
@@ -2733,52 +2847,59 @@
   iResult = WSAStartup(MAKEWORD(2,2), &wsaData);
   if (iResult != 0) {
     printf("WSAStartup failed: %d\n", iResult);
-    exit (1);
+    exit(1);
 
   }
 #endif
 #endif
 
-  gtk_init (&argc, &argv);
+#ifdef GUI_GTK
+  gtk_init(&argc, &argv);
+#endif
 
+#ifdef GUI_GTK
 #ifdef LIVES_NO_DEBUG
   // don't crash on GTK+ fatals
-  //g_log_set_always_fatal ((GLogLevelFlags)0);
+  g_log_set_always_fatal((GLogLevelFlags)0);
 #endif
 
   g_log_set_default_handler(lives_log_handler,NULL);
+#endif
 
   theme_expected=pre_init();
 
   // mainw->foreign is set if we are grabbing an external window
   mainw->foreign=FALSE;
-  memset (start_file,0,1);
+  memset(start_file,0,1);
   mainw->has_session_tmpdir=FALSE;
 
+  mainw->libthread=gtk_thread;
+  mainw->id=id;
+
 #ifndef IS_MINGW
-  g_snprintf(mainw->first_info_file,PATH_MAX,"%s"G_DIR_SEPARATOR_S".info.%d",prefs->tmpdir,capable->mainpid);
+  lives_snprintf(mainw->first_info_file,PATH_MAX,"%s"LIVES_DIR_SEPARATOR_S".info.%d",prefs->tmpdir,capable->mainpid);
 #else
-  g_snprintf(mainw->first_info_file,PATH_MAX,"%s"G_DIR_SEPARATOR_S"info.%d",prefs->tmpdir,capable->mainpid);
+  lives_snprintf(mainw->first_info_file,PATH_MAX,"%s"LIVES_DIR_SEPARATOR_S"info.%d",prefs->tmpdir,capable->mainpid);
 #endif
 
   // what's my name ?
-  capable->myname_full=g_find_program_in_path(argv[0]);
+  capable->myname_full=lives_find_program_in_path(argv[0]);
 
   if ((mynsize=lives_readlink(capable->myname_full,fbuff,PATH_MAX))!=-1) {
     // no. i mean, what's my real name ?
     memset(fbuff+mynsize,0,1);
-    g_free(capable->myname_full);
-    capable->myname_full=g_strdup(fbuff);
+    lives_free(capable->myname_full);
+    capable->myname_full=lives_strdup(fbuff);
   }
 
   // what's my short name (without the path) ?
-  g_snprintf(fbuff,PATH_MAX,"%s",capable->myname_full);
+  lives_snprintf(fbuff,PATH_MAX,"%s",capable->myname_full);
   get_basename(fbuff);
-  capable->myname=g_strdup(fbuff);
+  capable->myname=lives_strdup(fbuff);
 
 
   /* TRANSLATORS: localised name may be used here */
-  g_set_application_name(_("LiVES"));
+  lives_set_application_name(_("LiVES"));
 
 
   // format is:
@@ -2788,115 +2909,112 @@
     if (!strcmp(argv[1],"-capture")) {
       // special mode for grabbing external window
       mainw->foreign=TRUE;
-    }
-    else if (!strcmp(argv[1],"-help")||!strcmp(argv[1],"--help")) {
+    } else if (!strcmp(argv[1],"-help")||!strcmp(argv[1],"--help")) {
       print_opthelp();
-      exit (0);
-    }
-    else if (!strcmp(argv[1],"-version")||!strcmp(argv[1],"--version")) {
+      exit(0);
+    } else if (!strcmp(argv[1],"-version")||!strcmp(argv[1],"--version")) {
       print_notice();
-      exit (0);
-    }
-    else {
+      exit(0);
+    } else {
       struct option longopts[] = {
-	{"aplayer", 1, 0, 0},
-	{"tmpdir", 1, 0, 0},
-	{"yuvin", 1, 0, 0},
-	{"set", 1, 0, 0},
-	{"noset", 0, 0, 0},
+        {"aplayer", 1, 0, 0},
+        {"tmpdir", 1, 0, 0},
+        {"yuvin", 1, 0, 0},
+        {"set", 1, 0, 0},
+        {"noset", 0, 0, 0},
 #ifdef ENABLE_OSC
         {"devicemap", 1, 0, 0},
 #endif
         {"vppdefaults", 1, 0, 0},
-	{"recover", 0, 0, 0},
-	{"norecover", 0, 0, 0},
-	{"nothreaddialog", 0, 0, 0},
-	{"nogui", 0, 0, 0},
-	{"nosplash", 0, 0, 0},
-	{"noplaywin", 0, 0, 0},
-	{"startup-ce", 0, 0, 0},
-	{"startup-mt", 0, 0, 0},
-	{"debug", 0, 0, 0},
-	{"bigendbug", 1, 0, 0},
-	{"fxmodesmax", 1, 0, 0},
+        {"recover", 0, 0, 0},
+        {"norecover", 0, 0, 0},
+        {"nothreaddialog", 0, 0, 0},
+        {"nogui", 0, 0, 0},
+        {"nosplash", 0, 0, 0},
+        {"noplaywin", 0, 0, 0},
+        {"noninteractive", 0, 0, 0},
+        {"startup-ce", 0, 0, 0},
+        {"startup-mt", 0, 0, 0},
+        {"debug", 0, 0, 0},
+        {"bigendbug", 1, 0, 0},
+        {"fxmodesmax", 1, 0, 0},
 #ifdef ENABLE_OSC
-	{"oscstart", 1, 0, 0},
-	{"nooscstart", 0, 0, 0},
+        {"oscstart", 1, 0, 0},
+        {"nooscstart", 0, 0, 0},
 #endif
 #ifdef ENABLE_JACK
-	{"jackopts", 1, 0, 0},
+        {"jackopts", 1, 0, 0},
 #endif
-	{0, 0, 0, 0}
+        {0, 0, 0, 0}
       };
       int option_index=0;
       const char *charopt;
       int c;
 
       while (1) {
-	c=getopt_long_only(argc,argv,"",longopts,&option_index);
-	if (c==-1) break; // end of options
-	charopt=longopts[option_index].name;
-	if (!strcmp(charopt,"norecover")) {
-	  // auto no-recovery
-	  no_recover=TRUE;
-	  continue;
-	}
-	if (!strcmp(charopt,"debug")) {
-	  // debug crashes
-	  mainw->debug=TRUE;
-	  continue;
-	}
-	if (!strcmp(charopt,"recover")) {
-	  // auto recovery
-	  auto_recover=TRUE;
-	  continue;
-	}
-	if (!strcmp(charopt,"tmpdir")) {
-	  mainw->has_session_tmpdir=TRUE;
-	  // override tempdir setting
-	  g_snprintf(prefs->tmpdir,PATH_MAX,"%s",optarg);
-	  g_snprintf(future_prefs->tmpdir,PATH_MAX,"%s",prefs->tmpdir);
-	  set_pref("session_tempdir",prefs->tmpdir);
-
-	  if (g_mkdir_with_parents(prefs->tmpdir,S_IRWXU)==-1) {
-	    if (!check_dir_access(prefs->tmpdir)) {
-	      // abort if we cannot create the new subdir
-	      LIVES_ERROR("Could not create directory");
-	      LIVES_ERROR(prefs->tmpdir);
-	    }
-	    capable->can_write_to_tempdir=FALSE;
-	  }
-	  else {
-	    LIVES_INFO("Created directory");
-	    LIVES_INFO(prefs->tmpdir);
-	  }
-	  mainw->com_failed=FALSE;
-	  continue;
-	}
-	if (!strcmp(charopt,"yuvin")) {
+        c=getopt_long_only(argc,argv,"",longopts,&option_index);
+        if (c==-1) break; // end of options
+        charopt=longopts[option_index].name;
+        if (!strcmp(charopt,"norecover")) {
+          // auto no-recovery
+          no_recover=TRUE;
+          continue;
+        }
+        if (!strcmp(charopt,"debug")) {
+          // debug crashes
+          mainw->debug=TRUE;
+          continue;
+        }
+        if (!strcmp(charopt,"recover")) {
+          // auto recovery
+          auto_recover=TRUE;
+          continue;
+        }
+        if (!strcmp(charopt,"tmpdir")) {
+          mainw->has_session_tmpdir=TRUE;
+          // override tempdir setting
+          lives_snprintf(prefs->tmpdir,PATH_MAX,"%s",optarg);
+          lives_snprintf(future_prefs->tmpdir,PATH_MAX,"%s",prefs->tmpdir);
+          set_pref("session_tempdir",prefs->tmpdir);
+
+          if (lives_mkdir_with_parents(prefs->tmpdir,S_IRWXU)==-1) {
+            if (!check_dir_access(prefs->tmpdir)) {
+              // abort if we cannot create the new subdir
+              LIVES_ERROR("Could not create directory");
+              LIVES_ERROR(prefs->tmpdir);
+            }
+            capable->can_write_to_tempdir=FALSE;
+          } else {
+            LIVES_INFO("Created directory");
+            LIVES_INFO(prefs->tmpdir);
+          }
+          mainw->com_failed=FALSE;
+          continue;
+        }
+        if (!strcmp(charopt,"yuvin")) {
 #ifdef HAVE_YUV4MPEG
-	  g_snprintf(prefs->yuvin,PATH_MAX,"%s",optarg);
-	  prefs->startup_interface=STARTUP_CE;
-	  ign_opts.ign_stmode=TRUE;
-#else
-	  LIVES_ERROR("Must have mjpegtools installed for yuvin to work");
-#endif
-	  continue;
-	}
-	if (!strcmp(charopt,"noset")) {
-	  // override clipset loading
-	  memset(prefs->ar_clipset_name,0,1);
-	  prefs->ar_clipset=FALSE;
-	  ign_opts.ign_clipset=TRUE;
-	  continue;
-	}
-	if (!strcmp(charopt,"set")&&optarg!=NULL) {
-	  // force clipset loading
-	  g_snprintf(prefs->ar_clipset_name,128,"%s",optarg);
-	  prefs->ar_clipset=TRUE;
-	  ign_opts.ign_clipset=TRUE;
-	  continue;
-	}
+          lives_snprintf(prefs->yuvin,PATH_MAX,"%s",optarg);
+          prefs->startup_interface=STARTUP_CE;
+          ign_opts.ign_stmode=TRUE;
+#else
+          LIVES_ERROR("Must have mjpegtools installed for yuvin to work");
+#endif
+          continue;
+        }
+        if (!strcmp(charopt,"noset")) {
+          // override clipset loading
+          memset(prefs->ar_clipset_name,0,1);
+          prefs->ar_clipset=FALSE;
+          ign_opts.ign_clipset=TRUE;
+          continue;
+        }
+        if (!strcmp(charopt,"set")&&optarg!=NULL) {
+          // force clipset loading
+          lives_snprintf(prefs->ar_clipset_name,128,"%s",optarg);
+          prefs->ar_clipset=TRUE;
+          ign_opts.ign_clipset=TRUE;
+          continue;
+        }
 #ifdef ENABLE_OSC
         if (!strcmp(charopt,"devicemap")&&optarg!=NULL) {
           // force devicemap loading
@@ -2906,199 +3024,216 @@
 #endif
         if (!strcmp(charopt,"vppdefaults")&&optarg!=NULL) {
           // load alternate vpp file
-	  g_snprintf(mainw->vpp_defs_file,PATH_MAX,"%s",optarg);
-	  ign_opts.ign_vppdefs=TRUE;
+          lives_snprintf(mainw->vpp_defs_file,PATH_MAX,"%s",optarg);
+          ign_opts.ign_vppdefs=TRUE;
           continue;
         }
-	if (!strcmp(charopt,"aplayer")) {
-	  gchar buff[256];
-	  boolean apl_valid=FALSE;
-
-	  g_snprintf(buff,256,"%s",optarg);
-	  // override aplayer default
-	  if (!strcmp(buff,"sox")) {
-	    switch_aud_to_sox(TRUE);
-	    apl_valid=TRUE;
-	  }
-	  if (!strcmp(buff,"mplayer")) {
-	    switch_aud_to_mplayer(TRUE);
-	    apl_valid=TRUE;
-	  }
-	  if (!strcmp(buff,"mplayer2")) {
-	    switch_aud_to_mplayer2(TRUE);
-	    apl_valid=TRUE;
-	  }
-	  if (!strcmp(buff,"jack")) {
+        if (!strcmp(charopt,"aplayer")) {
+          char buff[256];
+          boolean apl_valid=FALSE;
+
+          lives_snprintf(buff,256,"%s",optarg);
+          // override aplayer default
+          if (!strcmp(buff,"sox")) {
+            switch_aud_to_sox(TRUE);
+            apl_valid=TRUE;
+          }
+          if (!strcmp(buff,"mplayer")) {
+            switch_aud_to_mplayer(TRUE);
+            apl_valid=TRUE;
+          }
+          if (!strcmp(buff,"mplayer2")) {
+            switch_aud_to_mplayer2(TRUE);
+            apl_valid=TRUE;
+          }
+          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;
+            prefs->audio_player=AUD_PLAYER_JACK;
+            lives_snprintf(prefs->aplayer,512,"%s","jack");
+            set_pref("audio_player","jack");
+            apl_valid=TRUE;
 #endif
-	  }
-	  if (!strcmp(buff,"pulse")) {
+          }
+          if (!strcmp(buff,"pulse")) {
 #ifdef HAVE_PULSE_AUDIO
-	    prefs->audio_player=AUD_PLAYER_PULSE;
-	    set_pref("audio_player","pulse");
-	    g_snprintf(prefs->aplayer,512,"%s","pulse");
-	    apl_valid=TRUE;
-#endif
-	  }
-	  if (apl_valid) ign_opts.ign_aplayer=TRUE;
-	  else g_printerr(_("Invalid audio player %s\n"),buff);
-	  continue;
-	}
-	if (!strcmp(charopt,"nogui")) {
-	  // force headless mode
-	  prefs->show_gui=FALSE;
-	  continue;
-	}
-	if (!strcmp(charopt,"nosplash")) {
-	  // do not show splash
-	  prefs->show_splash=FALSE;
-	  continue;
-	}
-	if (!strcmp(charopt,"noplaywin")) {
-	  // do not show the play window
-	  prefs->show_playwin=FALSE;
-	  continue;
-	}
-	if (!strcmp(charopt,"nothreaddialog")) {
-	  // disable threaded dialog (does nothing now)
-	  continue;
-	}
-	if (!strcmp(charopt,"fxmodesmax")&&optarg!=NULL) {
-	  // set number of fx modes
-	  prefs->max_modes_per_key=atoi(optarg);
-	  if (prefs->max_modes_per_key<1) prefs->max_modes_per_key=1;
-	  ign_opts.ign_osc=TRUE;
-	  continue;
-	}
-	if (!strcmp(charopt,"bigendbug")) {
-	  if (optarg!=NULL) {
-	    // set bigendbug
-	    prefs->bigendbug=atoi(optarg);
-	  }
-	  else prefs->bigendbug=1;
-	  continue;
-	}
+            prefs->audio_player=AUD_PLAYER_PULSE;
+            set_pref("audio_player","pulse");
+            lives_snprintf(prefs->aplayer,512,"%s","pulse");
+            apl_valid=TRUE;
+#endif
+          }
+          if (apl_valid) ign_opts.ign_aplayer=TRUE;
+          else lives_printerr(_("Invalid audio player %s\n"),buff);
+          continue;
+        }
+        if (!strcmp(charopt,"nogui")) {
+          // force headless mode
+          prefs->show_gui=FALSE;
+          continue;
+        }
+        if (!strcmp(charopt,"nosplash")) {
+          // do not show splash
+          prefs->show_splash=FALSE;
+          continue;
+        }
+        if (!strcmp(charopt,"noplaywin")) {
+          // do not show the play window
+          prefs->show_playwin=FALSE;
+          continue;
+        }
+        if (!strcmp(charopt,"noninteractive")) {
+          // disable menu/toolbar interactivity
+          mainw->interactive=FALSE;
+          continue;
+        }
+        if (!strcmp(charopt,"nothreaddialog")) {
+          // disable threaded dialog (does nothing now)
+          continue;
+        }
+        if (!strcmp(charopt,"fxmodesmax")&&optarg!=NULL) {
+          // set number of fx modes
+          prefs->max_modes_per_key=atoi(optarg);
+          if (prefs->max_modes_per_key<1) prefs->max_modes_per_key=1;
+          ign_opts.ign_osc=TRUE;
+          continue;
+        }
+        if (!strcmp(charopt,"bigendbug")) {
+          if (optarg!=NULL) {
+            // set bigendbug
+            prefs->bigendbug=atoi(optarg);
+          } else prefs->bigendbug=1;
+          continue;
+        }
 #ifdef ENABLE_OSC
-	if (!strcmp(charopt,"oscstart")&&optarg!=NULL) {
-	  // force OSC start
-	  prefs->osc_udp_port=atoi(optarg);
-	  prefs->osc_start=TRUE;
-	  ign_opts.ign_osc=TRUE;
-	  continue;
-	}
-	if (!strcmp(charopt,"nooscstart")) {
-	  // force no OSC start
-	  prefs->osc_start=FALSE;
-	  ign_opts.ign_osc=TRUE;
-	  continue;
-	}
+        if (!strcmp(charopt,"oscstart")&&optarg!=NULL) {
+          // force OSC start
+          prefs->osc_udp_port=atoi(optarg);
+          prefs->osc_start=TRUE;
+          ign_opts.ign_osc=TRUE;
+          continue;
+        }
+        if (!strcmp(charopt,"nooscstart")) {
+          // force no OSC start
+          prefs->osc_start=FALSE;
+          ign_opts.ign_osc=TRUE;
+          continue;
+        }
 #endif
 
 #ifdef ENABLE_JACK
-	if (!strcmp(charopt,"jackopts")&&optarg!=NULL) {
-	  // override jackopts in config file
-	  prefs->jack_opts=atoi(optarg);
-	  continue;
-	}
-#endif
-	if (!strcmp(charopt,"startup-ce")) {
-	  // force start in clip editor mode
-	  if (!ign_opts.ign_stmode) {
-	    prefs->startup_interface=STARTUP_CE;
-	    ign_opts.ign_stmode=TRUE;
-	  }
-	  continue;
-	}
-	if (!strcmp(charopt,"startup-mt")) {
-	  // force start in multitrack mode
-	  if (!ign_opts.ign_stmode) {
-	    prefs->startup_interface=STARTUP_MT;
-	    ign_opts.ign_stmode=TRUE;
-	  }
-	  continue;
-	}
+        if (!strcmp(charopt,"jackopts")&&optarg!=NULL) {
+          // override jackopts in config file
+          prefs->jack_opts=atoi(optarg);
+          continue;
+        }
+#endif
+        if (!strcmp(charopt,"startup-ce")) {
+          // force start in clip editor mode
+          if (!ign_opts.ign_stmode) {
+            prefs->startup_interface=STARTUP_CE;
+            ign_opts.ign_stmode=TRUE;
+          }
+          continue;
+        }
+        if (!strcmp(charopt,"startup-mt")) {
+          // force start in multitrack mode
+          if (!ign_opts.ign_stmode) {
+            prefs->startup_interface=STARTUP_MT;
+            ign_opts.ign_stmode=TRUE;
+          }
+          continue;
+        }
 
       }
       if (optind<argc) {
-	// remaining opts are filename [start_time] [end_frame]
-	g_snprintf(start_file,PATH_MAX,"%s",argv[optind++]); // filename
-	if (optind<argc) start=g_strtod(argv[optind++],NULL); // start time (seconds)
-	if (optind<argc) end=atoi(argv[optind++]); // number of frames
-      }}}
+        // remaining opts are filename [start_time] [end_frame]
+        lives_snprintf(start_file,PATH_MAX,"%s",argv[optind++]); // filename
+        if (optind<argc) start=lives_strtod(argv[optind++],NULL); // start time (seconds)
+        if (optind<argc) end=atoi(argv[optind++]); // number of frames
+      }
+    }
+  }
+
 
-  g_idle_add(lives_startup,NULL);
+  lives_idle_add(lives_startup,NULL);
+
+
+#ifdef GUI_GTK
+  if (gtk_thread==NULL) {
+    gtk_main();
+  } else {
+    pthread_create(gtk_thread,NULL,gtk_thread_wrapper,NULL);
+  }
+#endif
+
+#ifdef GUI_QT
+  return qapp->exec();
+#endif
 
-  gtk_main ();
   return 0;
 }
 
 
 
 
-boolean startup_message_fatal(const gchar *msg) {
+boolean startup_message_fatal(const char *msg) {
   splash_end();
-  do_blocking_error_dialog (msg);
+  do_blocking_error_dialog(msg);
   mainw->startup_error=TRUE;
-  lives_exit();
+  lives_exit(0);
   return TRUE;
 }
 
-boolean startup_message_nonfatal(const gchar *msg) {
+boolean startup_message_nonfatal(const char *msg) {
   if (palette->style&STYLE_1) widget_opts.apply_theme=TRUE;
-  do_error_dialog (msg);
+  do_error_dialog(msg);
   widget_opts.apply_theme=FALSE;
   return TRUE;
 }
 
-boolean startup_message_info(const gchar *msg) {
+boolean startup_message_info(const char *msg) {
   if (palette->style&STYLE_1) widget_opts.apply_theme=TRUE;
-  do_info_dialog (msg);
+  do_info_dialog(msg);
   widget_opts.apply_theme=FALSE;
   return TRUE;
 }
 
-boolean startup_message_nonfatal_dismissable(const gchar *msg, int warning_mask) {
+boolean startup_message_nonfatal_dismissable(const char *msg, int warning_mask) {
   if (palette->style&STYLE_1) widget_opts.apply_theme=TRUE;
-  do_error_dialog_with_check (msg, warning_mask);
+  do_error_dialog_with_check(msg, warning_mask);
   widget_opts.apply_theme=FALSE;
   return TRUE;
 }
 
 
-void set_main_title(const gchar *file, int untitled) {
-  gchar *title,*tmp;
-  gchar short_file[256];
+void set_main_title(const char *file, int untitled) {
+  char *title,*tmp;
+  char short_file[256];
 
   if (file!=NULL) {
-    if (untitled) title=g_strdup_printf(_ ("LiVES-%s: <Untitled%d> %dx%d : %d frames %d bpp %.3f fps"),LiVES_VERSION,untitled,
-					cfile->hsize,cfile->vsize,cfile->frames,cfile->bpp,cfile->fps);
+    if (untitled) title=lives_strdup_printf(_("LiVES-%s: <Untitled%d> %dx%d : %d frames %d bpp %.3f fps"),LiVES_VERSION,untitled,
+                                              cfile->hsize,cfile->vsize,cfile->frames,cfile->bpp,cfile->fps);
     else {
-      g_snprintf(short_file,256,"%s",file);
+      lives_snprintf(short_file,256,"%s",file);
       if (cfile->restoring||(cfile->opening&&cfile->frames==123456789)) {
-	title=g_strdup_printf(_("LiVES-%s: <%s> %dx%d : ??? frames ??? bpp %.3f fps"),LiVES_VERSION,
-			      (tmp=g_path_get_basename(file)),cfile->hsize,cfile->vsize,cfile->fps);
-      }
-      else {
-	title=g_strdup_printf(_ ("LiVES-%s: <%s> %dx%d : %d frames %d bpp %.3f fps"),LiVES_VERSION,
-			      cfile->clip_type!=CLIP_TYPE_VIDEODEV?(tmp=g_path_get_basename(file))
-			      :(tmp=g_strdup(file)),cfile->hsize,cfile->vsize,cfile->frames,cfile->bpp,cfile->fps);
+        title=lives_strdup_printf(_("LiVES-%s: <%s> %dx%d : ??? frames ??? bpp %.3f fps"),LiVES_VERSION,
+                                  (tmp=lives_path_get_basename(file)),cfile->hsize,cfile->vsize,cfile->fps);
+      } else {
+        title=lives_strdup_printf(_("LiVES-%s: <%s> %dx%d : %d frames %d bpp %.3f fps"),LiVES_VERSION,
+                                  cfile->clip_type!=CLIP_TYPE_VIDEODEV?(tmp=lives_path_get_basename(file))
+                                  :(tmp=lives_strdup(file)),cfile->hsize,cfile->vsize,cfile->frames,cfile->bpp,cfile->fps);
       }
-      g_free(tmp);
+      lives_free(tmp);
     }
-  }
-  else {
-    title=g_strdup_printf(_ ("LiVES-%s: <No File>"),LiVES_VERSION);
+  } else {
+    title=lives_strdup_printf(_("LiVES-%s: <No File>"),LiVES_VERSION);
   }
 
-  lives_window_set_title (LIVES_WINDOW (mainw->LiVES), title);
+  lives_window_set_title(LIVES_WINDOW(mainw->LiVES), title);
 
   if (mainw->playing_file==-1&&mainw->play_window!=NULL) lives_window_set_title(LIVES_WINDOW(mainw->play_window),title);
 
-  g_free(title);
+  lives_free(title);
 }
 
 
@@ -3109,153 +3244,153 @@
 
   if (mainw->multitrack!=NULL) return;
 
-  lives_widget_set_sensitive (mainw->open, TRUE);
-  lives_widget_set_sensitive (mainw->open_sel, TRUE);
-  lives_widget_set_sensitive (mainw->open_vcd_menu, TRUE);
+  lives_widget_set_sensitive(mainw->open, TRUE);
+  lives_widget_set_sensitive(mainw->open_sel, TRUE);
+  lives_widget_set_sensitive(mainw->open_vcd_menu, TRUE);
 #ifdef HAVE_WEBM
-  lives_widget_set_sensitive (mainw->open_loc_menu, TRUE);
+  lives_widget_set_sensitive(mainw->open_loc_menu, TRUE);
 #else
-  lives_widget_set_sensitive (mainw->open_loc, TRUE);
+  lives_widget_set_sensitive(mainw->open_loc, TRUE);
 #endif
-  lives_widget_set_sensitive (mainw->open_device_menu, TRUE);
-  lives_widget_set_sensitive (mainw->restore, TRUE);
-  lives_widget_set_sensitive (mainw->recent_menu, TRUE);
-  lives_widget_set_sensitive (mainw->save_as, mainw->current_file>0&&capable->has_encoder_plugins);
-  lives_widget_set_sensitive (mainw->backup, mainw->current_file>0);
-  lives_widget_set_sensitive (mainw->save_selection, mainw->current_file>0&&cfile->frames>0&&capable->has_encoder_plugins);
-  lives_widget_set_sensitive (mainw->clear_ds, TRUE);
-  lives_widget_set_sensitive (mainw->playsel, mainw->current_file>0&&cfile->frames>0);
-  lives_widget_set_sensitive (mainw->copy, mainw->current_file>0&&cfile->frames>0);
-  lives_widget_set_sensitive (mainw->cut, mainw->current_file>0&&cfile->frames>0);
-  lives_widget_set_sensitive (mainw->rev_clipboard, !(clipboard==NULL));
-  lives_widget_set_sensitive (mainw->playclip, !(clipboard==NULL));
-  lives_widget_set_sensitive (mainw->paste_as_new, !(clipboard==NULL));
-  lives_widget_set_sensitive (mainw->insert, !(clipboard==NULL));
-  lives_widget_set_sensitive (mainw->merge,(clipboard!=NULL&&cfile->frames>0));
-  lives_widget_set_sensitive (mainw->xdelete, mainw->current_file>0&&cfile->frames>0);
-  lives_widget_set_sensitive (mainw->playall, mainw->current_file>0);
-  lives_widget_set_sensitive (mainw->m_playbutton, mainw->current_file>0);
-  lives_widget_set_sensitive (mainw->m_playselbutton, mainw->current_file>0&&cfile->frames>0);
-  lives_widget_set_sensitive (mainw->m_rewindbutton, mainw->current_file>0&&cfile->pointer_time>0.);
-  lives_widget_set_sensitive (mainw->m_loopbutton, TRUE);
-  lives_widget_set_sensitive (mainw->m_mutebutton, TRUE);
+  lives_widget_set_sensitive(mainw->open_device_menu, TRUE);
+  lives_widget_set_sensitive(mainw->restore, TRUE);
+  lives_widget_set_sensitive(mainw->recent_menu, TRUE);
+  lives_widget_set_sensitive(mainw->save_as, mainw->current_file>0&&capable->has_encoder_plugins);
+  lives_widget_set_sensitive(mainw->backup, mainw->current_file>0);
+  lives_widget_set_sensitive(mainw->save_selection, mainw->current_file>0&&cfile->frames>0&&capable->has_encoder_plugins);
+  lives_widget_set_sensitive(mainw->clear_ds, TRUE);
+  lives_widget_set_sensitive(mainw->playsel, mainw->current_file>0&&cfile->frames>0);
+  lives_widget_set_sensitive(mainw->copy, mainw->current_file>0&&cfile->frames>0);
+  lives_widget_set_sensitive(mainw->cut, mainw->current_file>0&&cfile->frames>0);
+  lives_widget_set_sensitive(mainw->rev_clipboard, !(clipboard==NULL));
+  lives_widget_set_sensitive(mainw->playclip, !(clipboard==NULL));
+  lives_widget_set_sensitive(mainw->paste_as_new, !(clipboard==NULL));
+  lives_widget_set_sensitive(mainw->insert, !(clipboard==NULL));
+  lives_widget_set_sensitive(mainw->merge,(clipboard!=NULL&&cfile->frames>0));
+  lives_widget_set_sensitive(mainw->xdelete, mainw->current_file>0&&cfile->frames>0);
+  lives_widget_set_sensitive(mainw->playall, mainw->current_file>0);
+  lives_widget_set_sensitive(mainw->m_playbutton, mainw->current_file>0);
+  lives_widget_set_sensitive(mainw->m_playselbutton, mainw->current_file>0&&cfile->frames>0);
+  lives_widget_set_sensitive(mainw->m_rewindbutton, mainw->current_file>0&&cfile->pointer_time>0.);
+  lives_widget_set_sensitive(mainw->m_loopbutton, TRUE);
+  lives_widget_set_sensitive(mainw->m_mutebutton, TRUE);
   if (mainw->preview_box!=NULL) {
-    lives_widget_set_sensitive (mainw->p_playbutton, mainw->current_file>0);
-    lives_widget_set_sensitive (mainw->p_playselbutton, mainw->current_file>0&&cfile->frames>0);
-    lives_widget_set_sensitive (mainw->p_rewindbutton, mainw->current_file>0&&cfile->pointer_time>0.);
-    lives_widget_set_sensitive (mainw->p_loopbutton, TRUE);
-    lives_widget_set_sensitive (mainw->p_mutebutton, TRUE);
-  }
-
-  lives_widget_set_sensitive (mainw->rewind, mainw->current_file>0&&cfile->pointer_time>0.);
-  lives_widget_set_sensitive (mainw->show_file_info, mainw->current_file>0);
-  lives_widget_set_sensitive (mainw->show_file_comments, mainw->current_file>0);
-  lives_widget_set_sensitive (mainw->full_screen, TRUE);
-  lives_widget_set_sensitive (mainw->mt_menu, TRUE);
-  lives_widget_set_sensitive (mainw->add_live_menu,TRUE);
-  lives_widget_set_sensitive (mainw->export_proj, mainw->current_file>0);
-  lives_widget_set_sensitive (mainw->import_proj, mainw->current_file==-1);
-  
+    lives_widget_set_sensitive(mainw->p_playbutton, mainw->current_file>0);
+    lives_widget_set_sensitive(mainw->p_playselbutton, mainw->current_file>0&&cfile->frames>0);
+    lives_widget_set_sensitive(mainw->p_rewindbutton, mainw->current_file>0&&cfile->pointer_time>0.);
+    lives_widget_set_sensitive(mainw->p_loopbutton, TRUE);
+    lives_widget_set_sensitive(mainw->p_mutebutton, TRUE);
+  }
+
+  lives_widget_set_sensitive(mainw->rewind, mainw->current_file>0&&cfile->pointer_time>0.);
+  lives_widget_set_sensitive(mainw->show_file_info, mainw->current_file>0);
+  lives_widget_set_sensitive(mainw->show_file_comments, mainw->current_file>0);
+  lives_widget_set_sensitive(mainw->full_screen, TRUE);
+  lives_widget_set_sensitive(mainw->mt_menu, TRUE);
+  lives_widget_set_sensitive(mainw->add_live_menu,TRUE);
+  lives_widget_set_sensitive(mainw->export_proj, mainw->current_file>0);
+  lives_widget_set_sensitive(mainw->import_proj, mainw->current_file==-1);
+
   if (!mainw->foreign) {
-    for (i=1;i<=mainw->num_rendered_effects_builtin+mainw->num_rendered_effects_custom+
-	   mainw->num_rendered_effects_test;i++) 
-      if (mainw->rendered_fx[i].menuitem!=NULL&&mainw->rendered_fx[i].min_frames>=0) 
-	lives_widget_set_sensitive(mainw->rendered_fx[i].menuitem,mainw->current_file>0&&cfile->frames>0);
+    for (i=1; i<=mainw->num_rendered_effects_builtin+mainw->num_rendered_effects_custom+
+         mainw->num_rendered_effects_test; i++)
+      if (mainw->rendered_fx[i].menuitem!=NULL&&mainw->rendered_fx[i].min_frames>=0)
+        lives_widget_set_sensitive(mainw->rendered_fx[i].menuitem,mainw->current_file>0&&cfile->frames>0);
 
     if (mainw->current_file>0&&((has_video_filters(FALSE)&&!has_video_filters(TRUE))||
-				(cfile->achans>0&&prefs->audio_src==AUDIO_SRC_INT&&has_audio_filters(AF_TYPE_ANY))||
-				mainw->agen_key!=0)) {
-      
+                                (cfile->achans>0&&prefs->audio_src==AUDIO_SRC_INT&&has_audio_filters(AF_TYPE_ANY))||
+                                mainw->agen_key!=0)) {
+
       lives_widget_set_sensitive(mainw->rendered_fx[0].menuitem,TRUE);
-    }
-    else lives_widget_set_sensitive(mainw->rendered_fx[0].menuitem,FALSE);
+    } else lives_widget_set_sensitive(mainw->rendered_fx[0].menuitem,FALSE);
   }
-  
-  lives_widget_set_sensitive (mainw->record_perf, TRUE);
-  lives_widget_set_sensitive (mainw->export_submenu, mainw->current_file>0&&(cfile->achans>0));
-  lives_widget_set_sensitive (mainw->recaudio_submenu, TRUE);
-  lives_widget_set_sensitive (mainw->recaudio_sel, mainw->current_file>0&&cfile->frames>0);
-  lives_widget_set_sensitive (mainw->append_audio, mainw->current_file>0&&cfile->achans>0);
-  lives_widget_set_sensitive (mainw->trim_submenu, mainw->current_file>0&&cfile->achans>0);
-  lives_widget_set_sensitive (mainw->fade_aud_in, mainw->current_file>0&&cfile->achans>0);
-  lives_widget_set_sensitive (mainw->fade_aud_out, mainw->current_file>0&&cfile->achans>0);
-  lives_widget_set_sensitive (mainw->trim_audio, mainw->current_file>0&&(cfile->achans*cfile->frames>0));
-  lives_widget_set_sensitive (mainw->trim_to_pstart, mainw->current_file>0&&(cfile->achans&&cfile->pointer_time>0.));
-  lives_widget_set_sensitive (mainw->delaudio_submenu, mainw->current_file>0&&cfile->achans>0);
-  lives_widget_set_sensitive (mainw->delsel_audio, mainw->current_file>0&&cfile->frames>0);
-  lives_widget_set_sensitive (mainw->resample_audio, mainw->current_file>0&&(cfile->achans>0&&capable->has_sox_sox));
-  lives_widget_set_sensitive (mainw->dsize, !(mainw->fs));
-  lives_widget_set_sensitive (mainw->fade, !(mainw->fs));
-  lives_widget_set_sensitive (mainw->mute_audio, TRUE);
-  lives_widget_set_sensitive (mainw->loop_video, mainw->current_file>0&&(cfile->achans>0&&cfile->frames>0));
-  lives_widget_set_sensitive (mainw->loop_continue, TRUE);
-  lives_widget_set_sensitive (mainw->load_audio, TRUE);
-  lives_widget_set_sensitive (mainw->load_subs, mainw->current_file>0);
-  lives_widget_set_sensitive (mainw->erase_subs, mainw->current_file>0&&cfile->subt!=NULL);
-  if (capable->has_cdda2wav&&strlen (prefs->cdplay_device)) lives_widget_set_sensitive (mainw->load_cdtrack, TRUE);
-  lives_widget_set_sensitive (mainw->rename, mainw->current_file>0&&!cfile->opening);
-  lives_widget_set_sensitive (mainw->change_speed, mainw->current_file>0);
-  lives_widget_set_sensitive (mainw->resample_video, mainw->current_file>0&&cfile->frames>0);
-  lives_widget_set_sensitive (mainw->ins_silence, mainw->current_file>0&&cfile->frames>0);
-  lives_widget_set_sensitive (mainw->close, mainw->current_file>0);
-  lives_widget_set_sensitive (mainw->select_submenu, mainw->current_file>0&&!mainw->selwidth_locked&&cfile->frames>0);
-  lives_widget_set_sensitive (mainw->select_all, mainw->current_file>0);
-  lives_widget_set_sensitive (mainw->select_start_only, TRUE);
-  lives_widget_set_sensitive (mainw->select_end_only, TRUE);
-  lives_widget_set_sensitive (mainw->select_from_start, TRUE);
-  lives_widget_set_sensitive (mainw->select_to_end, TRUE);
+
+  lives_widget_set_sensitive(mainw->record_perf, TRUE);
+  lives_widget_set_sensitive(mainw->export_submenu, mainw->current_file>0&&(cfile->achans>0));
+  lives_widget_set_sensitive(mainw->recaudio_submenu, TRUE);
+  lives_widget_set_sensitive(mainw->recaudio_sel, mainw->current_file>0&&cfile->frames>0);
+  lives_widget_set_sensitive(mainw->append_audio, mainw->current_file>0&&cfile->achans>0);
+  lives_widget_set_sensitive(mainw->trim_submenu, mainw->current_file>0&&cfile->achans>0);
+  lives_widget_set_sensitive(mainw->fade_aud_in, mainw->current_file>0&&cfile->achans>0);
+  lives_widget_set_sensitive(mainw->fade_aud_out, mainw->current_file>0&&cfile->achans>0);
+  lives_widget_set_sensitive(mainw->trim_audio, mainw->current_file>0&&(cfile->achans*cfile->frames>0));
+  lives_widget_set_sensitive(mainw->trim_to_pstart, mainw->current_file>0&&(cfile->achans&&cfile->pointer_time>0.));
+  lives_widget_set_sensitive(mainw->delaudio_submenu, mainw->current_file>0&&cfile->achans>0);
+  lives_widget_set_sensitive(mainw->delsel_audio, mainw->current_file>0&&cfile->frames>0);
+  lives_widget_set_sensitive(mainw->resample_audio, mainw->current_file>0&&(cfile->achans>0&&capable->has_sox_sox));
+  lives_widget_set_sensitive(mainw->dsize, !(mainw->fs));
+  lives_widget_set_sensitive(mainw->fade, !(mainw->fs));
+  lives_widget_set_sensitive(mainw->mute_audio, TRUE);
+  lives_widget_set_sensitive(mainw->loop_video, mainw->current_file>0&&(cfile->achans>0&&cfile->frames>0));
+  lives_widget_set_sensitive(mainw->loop_continue, TRUE);
+  lives_widget_set_sensitive(mainw->load_audio, TRUE);
+  lives_widget_set_sensitive(mainw->load_subs, mainw->current_file>0);
+  lives_widget_set_sensitive(mainw->erase_subs, mainw->current_file>0&&cfile->subt!=NULL);
+  if (capable->has_cdda2wav&&strlen(prefs->cdplay_device)) lives_widget_set_sensitive(mainw->load_cdtrack, TRUE);
+  lives_widget_set_sensitive(mainw->rename, mainw->current_file>0&&!cfile->opening);
+  lives_widget_set_sensitive(mainw->change_speed, mainw->current_file>0);
+  lives_widget_set_sensitive(mainw->resample_video, mainw->current_file>0&&cfile->frames>0);
+  lives_widget_set_sensitive(mainw->ins_silence, mainw->current_file>0&&cfile->frames>0);
+  lives_widget_set_sensitive(mainw->close, mainw->current_file>0);
+  lives_widget_set_sensitive(mainw->select_submenu, mainw->current_file>0&&!mainw->selwidth_locked&&cfile->frames>0);
+  lives_widget_set_sensitive(mainw->select_all, mainw->current_file>0);
+  lives_widget_set_sensitive(mainw->select_start_only, TRUE);
+  lives_widget_set_sensitive(mainw->select_end_only, TRUE);
+  lives_widget_set_sensitive(mainw->select_from_start, TRUE);
+  lives_widget_set_sensitive(mainw->select_to_end, TRUE);
 #ifdef HAVE_YUV4MPEG
-  lives_widget_set_sensitive (mainw->open_yuv4m, TRUE);
+  lives_widget_set_sensitive(mainw->open_yuv4m, TRUE);
 #endif
 
-  lives_widget_set_sensitive (mainw->select_new, mainw->current_file>0&&(cfile->insert_start>0));
-  lives_widget_set_sensitive (mainw->select_last, mainw->current_file>0&&(cfile->undo_start>0));
-  lives_widget_set_sensitive (mainw->lock_selwidth, mainw->current_file>0&&cfile->frames>0);
-  lives_widget_set_sensitive (mainw->undo, mainw->current_file>0&&cfile->undoable);
-  lives_widget_set_sensitive (mainw->redo, mainw->current_file>0&&cfile->redoable);
-  lives_widget_set_sensitive (mainw->show_clipboard_info, !(clipboard==NULL));
-  lives_widget_set_sensitive (mainw->capture,TRUE);
-  lives_widget_set_sensitive (mainw->vj_save_set, mainw->current_file>0);
-  lives_widget_set_sensitive (mainw->vj_load_set, !mainw->was_set);
-  lives_widget_set_sensitive (mainw->toy_tv, TRUE);
-  lives_widget_set_sensitive (mainw->toy_autolives, TRUE);
-  lives_widget_set_sensitive (mainw->toy_random_frames, TRUE);
-  lives_widget_set_sensitive (mainw->open_lives2lives, TRUE);
-  lives_widget_set_sensitive (mainw->gens_submenu, TRUE);
-  lives_widget_set_sensitive (mainw->troubleshoot, TRUE);
+  lives_widget_set_sensitive(mainw->select_new, mainw->current_file>0&&(cfile->insert_start>0));
+  lives_widget_set_sensitive(mainw->select_last, mainw->current_file>0&&(cfile->undo_start>0));
+  lives_widget_set_sensitive(mainw->lock_selwidth, mainw->current_file>0&&cfile->frames>0);
+  lives_widget_set_sensitive(mainw->undo, mainw->current_file>0&&cfile->undoable);
+  lives_widget_set_sensitive(mainw->redo, mainw->current_file>0&&cfile->redoable);
+  lives_widget_set_sensitive(mainw->show_clipboard_info, !(clipboard==NULL));
+  lives_widget_set_sensitive(mainw->capture,TRUE);
+  lives_widget_set_sensitive(mainw->vj_save_set, mainw->current_file>0);
+  lives_widget_set_sensitive(mainw->vj_load_set, !mainw->was_set);
+  lives_widget_set_sensitive(mainw->toy_tv, TRUE);
+  lives_widget_set_sensitive(mainw->toy_autolives, TRUE);
+  lives_widget_set_sensitive(mainw->toy_random_frames, TRUE);
+  lives_widget_set_sensitive(mainw->open_lives2lives, TRUE);
+  lives_widget_set_sensitive(mainw->gens_submenu, TRUE);
+  lives_widget_set_sensitive(mainw->troubleshoot, TRUE);
 
   if (mainw->current_file>0&&(cfile->start==1||cfile->end==cfile->frames)&&!(cfile->start==1&&cfile->end==cfile->frames)) {
     lives_widget_set_sensitive(mainw->select_invert,TRUE);
-  }
-  else {
+  } else {
     lives_widget_set_sensitive(mainw->select_invert,FALSE);
   }
- 
+
   if (mainw->current_file>0&&!(cfile->menuentry==NULL)) {
     lives_signal_handler_block(mainw->spinbutton_end,mainw->spin_end_func);
     lives_spin_button_set_range(LIVES_SPIN_BUTTON(mainw->spinbutton_end),1,cfile->frames);
     lives_spin_button_set_value(LIVES_SPIN_BUTTON(mainw->spinbutton_end),cfile->end);
     lives_signal_handler_unblock(mainw->spinbutton_end,mainw->spin_end_func);
-    
+
     lives_signal_handler_block(mainw->spinbutton_start,mainw->spin_start_func);
     lives_spin_button_set_range(LIVES_SPIN_BUTTON(mainw->spinbutton_start),1,cfile->frames);
     lives_spin_button_set_value(LIVES_SPIN_BUTTON(mainw->spinbutton_start),cfile->start);
     lives_signal_handler_unblock(mainw->spinbutton_start,mainw->spin_start_func);
 
-    lives_widget_set_sensitive(mainw->spinbutton_start,TRUE);
-    lives_widget_set_sensitive(mainw->spinbutton_end,TRUE);
+    if (mainw->interactive) {
+      lives_widget_set_sensitive(mainw->spinbutton_start,TRUE);
+      lives_widget_set_sensitive(mainw->spinbutton_end,TRUE);
+    }
 
     if (mainw->play_window!=NULL&&(mainw->prv_link==PRV_START||mainw->prv_link==PRV_END)) {
       // unblock spinbutton in play window
       lives_widget_set_sensitive(mainw->preview_spinbutton,TRUE);
     }
   }
- 
+
   // clips menu
-  for (i=1;i<MAX_FILES;i++) {
+  for (i=1; i<MAX_FILES; i++) {
     if (!(mainw->files[i]==NULL)) {
       if (!(mainw->files[i]->menuentry==NULL)) {
-	lives_widget_set_sensitive (mainw->files[i]->menuentry, TRUE);
+        lives_widget_set_sensitive(mainw->files[i]->menuentry, TRUE);
       }
     }
   }
@@ -3269,89 +3404,91 @@
   if (mainw->multitrack!=NULL) return;
 
   //lives_widget_set_sensitive (mainw->open, mainw->playing_file>-1);
-  lives_widget_set_sensitive (mainw->open, FALSE);
-  lives_widget_set_sensitive (mainw->open_sel, FALSE);
-  lives_widget_set_sensitive (mainw->open_vcd_menu, FALSE);
+  lives_widget_set_sensitive(mainw->open, FALSE);
+  lives_widget_set_sensitive(mainw->open_sel, FALSE);
+  lives_widget_set_sensitive(mainw->open_vcd_menu, FALSE);
 #ifdef HAVE_WEBM
-  lives_widget_set_sensitive (mainw->open_loc_menu, FALSE);
+  lives_widget_set_sensitive(mainw->open_loc_menu, FALSE);
 #else
-  lives_widget_set_sensitive (mainw->open_loc, FALSE);
+  lives_widget_set_sensitive(mainw->open_loc, FALSE);
 #endif
-  lives_widget_set_sensitive (mainw->open_device_menu, FALSE);
+  lives_widget_set_sensitive(mainw->open_device_menu, FALSE);
 #ifdef HAVE_YUV4MPEG
-  lives_widget_set_sensitive (mainw->open_yuv4m, FALSE);
+  lives_widget_set_sensitive(mainw->open_yuv4m, FALSE);
 #endif
 
-  lives_widget_set_sensitive (mainw->add_live_menu, FALSE);
+  lives_widget_set_sensitive(mainw->add_live_menu, FALSE);
 
-  lives_widget_set_sensitive (mainw->recent_menu, FALSE);
-  lives_widget_set_sensitive (mainw->restore, FALSE);
-  lives_widget_set_sensitive (mainw->clear_ds, FALSE);
-  lives_widget_set_sensitive (mainw->save_as, FALSE);
-  lives_widget_set_sensitive (mainw->backup, FALSE);
-  lives_widget_set_sensitive (mainw->playsel, FALSE);
-  lives_widget_set_sensitive (mainw->playclip, FALSE);
-  lives_widget_set_sensitive (mainw->copy, FALSE);
-  lives_widget_set_sensitive (mainw->cut, FALSE);
-  lives_widget_set_sensitive (mainw->rev_clipboard, FALSE);
-  lives_widget_set_sensitive (mainw->insert, FALSE);
-  lives_widget_set_sensitive (mainw->merge, FALSE);
-  lives_widget_set_sensitive (mainw->xdelete, FALSE);
+  lives_widget_set_sensitive(mainw->recent_menu, FALSE);
+  lives_widget_set_sensitive(mainw->restore, FALSE);
+  lives_widget_set_sensitive(mainw->clear_ds, FALSE);
+  lives_widget_set_sensitive(mainw->save_as, FALSE);
+  lives_widget_set_sensitive(mainw->backup, FALSE);
+  lives_widget_set_sensitive(mainw->playsel, FALSE);
+  lives_widget_set_sensitive(mainw->playclip, FALSE);
+  lives_widget_set_sensitive(mainw->copy, FALSE);
+  lives_widget_set_sensitive(mainw->cut, FALSE);
+  lives_widget_set_sensitive(mainw->rev_clipboard, FALSE);
+  lives_widget_set_sensitive(mainw->insert, FALSE);
+  lives_widget_set_sensitive(mainw->merge, FALSE);
+  lives_widget_set_sensitive(mainw->xdelete, FALSE);
   if (!prefs->pause_during_pb) {
-    lives_widget_set_sensitive (mainw->playall, FALSE);
+    lives_widget_set_sensitive(mainw->playall, FALSE);
   }
-  lives_widget_set_sensitive (mainw->rewind,FALSE);
+  lives_widget_set_sensitive(mainw->rewind,FALSE);
   if (!mainw->foreign) {
-    for (i=0;i<=mainw->num_rendered_effects_builtin+mainw->num_rendered_effects_custom+
-	   mainw->num_rendered_effects_test;i++) 
+    for (i=0; i<=mainw->num_rendered_effects_builtin+mainw->num_rendered_effects_custom+
+         mainw->num_rendered_effects_test; i++)
       if (mainw->rendered_fx[i].menuitem!=NULL&&mainw->rendered_fx[i].menuitem!=NULL&&
-	  mainw->rendered_fx[i].min_frames>=0) 
-	lives_widget_set_sensitive(mainw->rendered_fx[i].menuitem,FALSE);
+          mainw->rendered_fx[i].min_frames>=0)
+        lives_widget_set_sensitive(mainw->rendered_fx[i].menuitem,FALSE);
   }
 
-  lives_widget_set_sensitive (mainw->export_submenu, FALSE);
-  lives_widget_set_sensitive (mainw->recaudio_submenu, FALSE);
-  lives_widget_set_sensitive (mainw->append_audio, FALSE);
-  lives_widget_set_sensitive (mainw->trim_submenu, FALSE);
-  lives_widget_set_sensitive (mainw->delaudio_submenu, FALSE);
-  lives_widget_set_sensitive (mainw->gens_submenu, FALSE);
-  lives_widget_set_sensitive (mainw->troubleshoot, FALSE);
-  lives_widget_set_sensitive (mainw->resample_audio, FALSE);
-  lives_widget_set_sensitive (mainw->fade_aud_in, FALSE);
-  lives_widget_set_sensitive (mainw->fade_aud_out, FALSE);
-  lives_widget_set_sensitive (mainw->ins_silence, FALSE);
-  lives_widget_set_sensitive (mainw->loop_video, (prefs->audio_player==AUD_PLAYER_JACK||
-						prefs->audio_player==AUD_PLAYER_PULSE));
-  if (prefs->audio_player!=AUD_PLAYER_JACK&&prefs->audio_player!=AUD_PLAYER_PULSE) 
-    lives_widget_set_sensitive (mainw->mute_audio, FALSE);
-  lives_widget_set_sensitive (mainw->load_audio, FALSE);
-  lives_widget_set_sensitive (mainw->load_subs, FALSE);
-  lives_widget_set_sensitive (mainw->erase_subs, FALSE);
-  lives_widget_set_sensitive (mainw->save_selection, FALSE);
-  lives_widget_set_sensitive (mainw->close, FALSE);
-  lives_widget_set_sensitive (mainw->change_speed, FALSE);
-  lives_widget_set_sensitive (mainw->resample_video, FALSE);
-  lives_widget_set_sensitive (mainw->undo, FALSE);
-  lives_widget_set_sensitive (mainw->redo, FALSE);
-  lives_widget_set_sensitive (mainw->paste_as_new, FALSE);
-  lives_widget_set_sensitive (mainw->capture, FALSE);
-  lives_widget_set_sensitive (mainw->toy_tv, FALSE);
-  lives_widget_set_sensitive (mainw->vj_save_set, FALSE);
-  lives_widget_set_sensitive (mainw->vj_load_set, FALSE);
-  lives_widget_set_sensitive (mainw->export_proj, FALSE);
-  lives_widget_set_sensitive (mainw->import_proj, FALSE);
-  lives_widget_set_sensitive (mainw->recaudio_sel,FALSE);
-  lives_widget_set_sensitive (mainw->mt_menu,FALSE);
+  lives_widget_set_sensitive(mainw->export_submenu, FALSE);
+  lives_widget_set_sensitive(mainw->recaudio_submenu, FALSE);
+  lives_widget_set_sensitive(mainw->append_audio, FALSE);
+  lives_widget_set_sensitive(mainw->trim_submenu, FALSE);
+  lives_widget_set_sensitive(mainw->delaudio_submenu, FALSE);
+  lives_widget_set_sensitive(mainw->gens_submenu, FALSE);
+  lives_widget_set_sensitive(mainw->troubleshoot, FALSE);
+  lives_widget_set_sensitive(mainw->resample_audio, FALSE);
+  lives_widget_set_sensitive(mainw->fade_aud_in, FALSE);
+  lives_widget_set_sensitive(mainw->fade_aud_out, FALSE);
+  lives_widget_set_sensitive(mainw->ins_silence, FALSE);
+  lives_widget_set_sensitive(mainw->loop_video, is_realtime_aplayer(prefs->audio_player==AUD_PLAYER_JACK));
+  if (!is_realtime_aplayer(prefs->audio_player)) lives_widget_set_sensitive(mainw->mute_audio, FALSE);
+  lives_widget_set_sensitive(mainw->load_audio, FALSE);
+  lives_widget_set_sensitive(mainw->load_subs, FALSE);
+  lives_widget_set_sensitive(mainw->erase_subs, FALSE);
+  lives_widget_set_sensitive(mainw->save_selection, FALSE);
+  lives_widget_set_sensitive(mainw->close, FALSE);
+  lives_widget_set_sensitive(mainw->change_speed, FALSE);
+  lives_widget_set_sensitive(mainw->resample_video, FALSE);
+  lives_widget_set_sensitive(mainw->undo, FALSE);
+  lives_widget_set_sensitive(mainw->redo, FALSE);
+  lives_widget_set_sensitive(mainw->paste_as_new, FALSE);
+  lives_widget_set_sensitive(mainw->capture, FALSE);
+  lives_widget_set_sensitive(mainw->toy_tv, FALSE);
+  lives_widget_set_sensitive(mainw->vj_save_set, FALSE);
+  lives_widget_set_sensitive(mainw->vj_load_set, FALSE);
+  lives_widget_set_sensitive(mainw->export_proj, FALSE);
+  lives_widget_set_sensitive(mainw->import_proj, FALSE);
+  lives_widget_set_sensitive(mainw->recaudio_sel,FALSE);
+  lives_widget_set_sensitive(mainw->mt_menu,FALSE);
 
   if (mainw->current_file>=0&&(mainw->playing_file==-1||mainw->foreign)) {
     //  if (!cfile->opening||mainw->dvgrab_preview||mainw->preview||cfile->opening_only_audio) {
-      // disable the 'clips' menu entries
-      for (i=1;i<MAX_FILES;i++) {
-	if (!(mainw->files[i]==NULL)) {
-	  if (!(mainw->files[i]->menuentry==NULL)) {
-	    if (!(i==mainw->current_file)) {
-	      lives_widget_set_sensitive (mainw->files[i]->menuentry, FALSE);
-	    }}}}}
+    // disable the 'clips' menu entries
+    for (i=1; i<MAX_FILES; i++) {
+      if (!(mainw->files[i]==NULL)) {
+        if (!(mainw->files[i]->menuentry==NULL)) {
+          if (!(i==mainw->current_file)) {
+            lives_widget_set_sensitive(mainw->files[i]->menuentry, FALSE);
+          }
+        }
+      }
+    }
+  }
   //}
 }
 
@@ -3365,24 +3502,24 @@
 
   if (mainw->current_file>0&&(cfile->menuentry!=NULL||cfile->opening)&&!mainw->preview) {
     // an effect etc,
-    lives_widget_set_sensitive (mainw->loop_video, cfile->achans>0&&cfile->frames>0);
-    lives_widget_set_sensitive (mainw->loop_continue, TRUE);
+    lives_widget_set_sensitive(mainw->loop_video, cfile->achans>0&&cfile->frames>0);
+    lives_widget_set_sensitive(mainw->loop_continue, TRUE);
 
     if (cfile->achans>0&&cfile->frames>0) {
-      mainw->loop=lives_check_menu_item_get_active (LIVES_CHECK_MENU_ITEM (mainw->loop_video));
+      mainw->loop=lives_check_menu_item_get_active(LIVES_CHECK_MENU_ITEM(mainw->loop_video));
     }
     if (cfile->achans>0&&cfile->frames>0) {
-      mainw->mute=lives_check_menu_item_get_active (LIVES_CHECK_MENU_ITEM (mainw->mute_audio));
+      mainw->mute=lives_check_menu_item_get_active(LIVES_CHECK_MENU_ITEM(mainw->mute_audio));
     }
   }
   if (mainw->current_file>0&&cfile->menuentry==NULL) {
-    lives_widget_set_sensitive (mainw->rename, FALSE);
+    lives_widget_set_sensitive(mainw->rename, FALSE);
     if (cfile->opening||cfile->restoring) {
       // loading, restoring etc
-      lives_widget_set_sensitive (mainw->lock_selwidth, FALSE);
-      lives_widget_set_sensitive (mainw->show_file_comments, FALSE);
+      lives_widget_set_sensitive(mainw->lock_selwidth, FALSE);
+      lives_widget_set_sensitive(mainw->show_file_comments, FALSE);
       if (!cfile->opening_only_audio) {
-	lives_widget_set_sensitive (mainw->toy_random_frames, FALSE);
+        lives_widget_set_sensitive(mainw->toy_random_frames, FALSE);
       }
     }
   }
@@ -3409,20 +3546,20 @@
     lives_widget_set_sensitive(mainw->preview_spinbutton,FALSE);
   }
 
-  lives_widget_set_sensitive (mainw->select_submenu, FALSE);
-  lives_widget_set_sensitive (mainw->toy_tv, FALSE);
-  lives_widget_set_sensitive (mainw->toy_autolives, FALSE);
-  lives_widget_set_sensitive (mainw->trim_submenu, FALSE);
-  lives_widget_set_sensitive (mainw->delaudio_submenu, FALSE);
-  lives_widget_set_sensitive (mainw->load_cdtrack, FALSE);
-  lives_widget_set_sensitive (mainw->open_lives2lives, FALSE);
-  lives_widget_set_sensitive (mainw->record_perf, FALSE);
+  lives_widget_set_sensitive(mainw->select_submenu, FALSE);
+  lives_widget_set_sensitive(mainw->toy_tv, FALSE);
+  lives_widget_set_sensitive(mainw->toy_autolives, FALSE);
+  lives_widget_set_sensitive(mainw->trim_submenu, FALSE);
+  lives_widget_set_sensitive(mainw->delaudio_submenu, FALSE);
+  lives_widget_set_sensitive(mainw->load_cdtrack, FALSE);
+  lives_widget_set_sensitive(mainw->open_lives2lives, FALSE);
+  lives_widget_set_sensitive(mainw->record_perf, FALSE);
 
   if (mainw->current_file>0&&cfile->nopreview) {
-    lives_widget_set_sensitive (mainw->m_playbutton, FALSE);
-    if (mainw->preview_box!=NULL) lives_widget_set_sensitive (mainw->p_playbutton, FALSE);
-    lives_widget_set_sensitive (mainw->m_playselbutton, FALSE);
-    if (mainw->preview_box!=NULL) lives_widget_set_sensitive (mainw->p_playselbutton, FALSE);
+    lives_widget_set_sensitive(mainw->m_playbutton, FALSE);
+    if (mainw->preview_box!=NULL) lives_widget_set_sensitive(mainw->p_playbutton, FALSE);
+    lives_widget_set_sensitive(mainw->m_playselbutton, FALSE);
+    if (mainw->preview_box!=NULL) lives_widget_set_sensitive(mainw->p_playselbutton, FALSE);
   }
 }
 
@@ -3431,13 +3568,13 @@
 
 void set_ce_frame_from_pixbuf(LiVESImage *image, LiVESPixbuf *pixbuf, lives_painter_t *cairo) {
 #if GTK_CHECK_VERSION(3,0,0)
-  
+
   int rwidth=lives_widget_get_allocation_width(LIVES_WIDGET(image));
   int rheight=lives_widget_get_allocation_height(LIVES_WIDGET(image));
 
   lives_painter_t *cr;
 
-  if (cairo==NULL) cr=lives_painter_create_from_widget (LIVES_WIDGET(image));
+  if (cairo==NULL) cr=lives_painter_create_from_widget(LIVES_WIDGET(image));
   else cr=cairo;
 
   if (cr==NULL) return;
@@ -3447,20 +3584,18 @@
     int cx=(rwidth-width)/2;
     int cy=(rheight-height)/2;
 
-    lives_painter_set_source_pixbuf (cr, pixbuf, cx, cy);
+    lives_painter_set_source_pixbuf(cr, pixbuf, cx, cy);
     lives_painter_rectangle(cr,cx,cy,
-			    width,
-			    height);
-    lives_painter_fill(cr);
-  }
-  else {
+                            width,
+                            height);
+  } else {
     lives_painter_set_source_to_bg(cr,LIVES_WIDGET(image));
 
     lives_painter_rectangle(cr,0,0,
-			    rwidth,
-			    rheight);
-    lives_painter_fill(cr);
+                            rwidth,
+                            rheight);
   }
+  lives_painter_fill(cr);
   if (cairo==NULL) lives_painter_destroy(cr);
 #else
   lives_image_set_from_pixbuf(image,pixbuf);
@@ -3489,21 +3624,21 @@
   if (mainw->multitrack!=NULL) return;
 
 #if GTK_CHECK_VERSION(3,0,0)
-  lives_signal_handlers_block_by_func(mainw->start_image,(gpointer)expose_sim,NULL);
+  lives_signal_handlers_block_by_func(mainw->start_image,(livespointer)expose_sim,NULL);
 #endif
 
   if (mainw->current_file>-1&&cfile!=NULL&&(cfile->clip_type==CLIP_TYPE_YUV4MPEG||cfile->clip_type==CLIP_TYPE_VIDEODEV)) {
     if (mainw->camframe==NULL) {
-      GError *error=NULL;
-      gchar *tmp=g_build_filename(prefs->prefix_dir,THEME_DIR,"camera","frame.jpg",NULL);
+      LiVESError *error=NULL;
+      char *tmp=lives_build_filename(prefs->prefix_dir,THEME_DIR,"camera","frame.jpg",NULL);
       mainw->camframe=lives_pixbuf_new_from_file(tmp,&error);
       if (mainw->camframe!=NULL) lives_pixbuf_saturate_and_pixelate(mainw->camframe,mainw->camframe,0.0,FALSE);
-      g_free(tmp);
+      lives_free(tmp);
     }
 
     set_ce_frame_from_pixbuf(LIVES_IMAGE(mainw->start_image),mainw->camframe,NULL);
 #if GTK_CHECK_VERSION(3,0,0)
-    lives_signal_handlers_unblock_by_func(mainw->start_image,(gpointer)expose_sim,NULL);
+    lives_signal_handlers_unblock_by_func(mainw->start_image,(livespointer)expose_sim,NULL);
     lives_signal_stop_emission_by_name(mainw->start_image,LIVES_WIDGET_EXPOSE_EVENT);
 #endif
     return;
@@ -3514,13 +3649,12 @@
     threaded_dialog_spin();
     if (!(mainw->imframe==NULL)) {
       set_ce_frame_from_pixbuf(LIVES_IMAGE(mainw->start_image),mainw->imframe,NULL);
-    }
-    else {
+    } else {
       set_ce_frame_from_pixbuf(LIVES_IMAGE(mainw->start_image),NULL,NULL);
     }
     threaded_dialog_spin();
 #if GTK_CHECK_VERSION(3,0,0)
-    lives_signal_handlers_unblock_by_func(mainw->start_image,(gpointer)expose_sim,NULL);
+    lives_signal_handlers_unblock_by_func(mainw->start_image,(livespointer)expose_sim,NULL);
     lives_signal_stop_emission_by_name(mainw->start_image,LIVES_WIDGET_EXPOSE_EVENT);
 #endif
     return;
@@ -3535,8 +3669,8 @@
     if (mainw->playing_file==-1&&cfile->clip_type==CLIP_TYPE_FILE&&is_virtual_frame(mainw->current_file,frame)&&cfile->ext_src!=NULL) {
       lives_clip_data_t *cdata=((lives_decoder_t *)cfile->ext_src)->cdata;
       if (cdata!=NULL&&!(cdata->seek_flag&LIVES_SEEK_FAST)) {
-	boolean resb=virtual_to_images(mainw->current_file,frame,frame,FALSE,NULL);
-	resb=resb; // dont care (much) if it fails
+        boolean resb=virtual_to_images(mainw->current_file,frame,frame,FALSE,NULL);
+        resb=resb; // dont care (much) if it fails
       }
     }
 
@@ -3544,7 +3678,7 @@
     weed_set_int_value(layer,"clip",mainw->current_file);
     weed_set_int_value(layer,"frame",frame);
     if (pull_frame_at_size(layer,get_image_ext_for_type(cfile->img_type),tc,cfile->hsize,cfile->vsize,
-			   WEED_PALETTE_RGB24)) {
+                           WEED_PALETTE_RGB24)) {
       interp=get_interp_value(prefs->pb_quality);
       resize_layer(layer,cfile->hsize,cfile->vsize,interp,WEED_PALETTE_RGB24,0);
       convert_layer_palette(layer,WEED_PALETTE_RGB24,0);
@@ -3556,13 +3690,13 @@
       set_ce_frame_from_pixbuf(LIVES_IMAGE(mainw->start_image),start_pixbuf,NULL);
     }
     if (start_pixbuf!=NULL) {
-      if (G_IS_OBJECT(start_pixbuf)) {
-	lives_object_unref(start_pixbuf);
+      if (LIVES_IS_WIDGET_OBJECT(start_pixbuf)) {
+        lives_object_unref(start_pixbuf);
       }
     }
     threaded_dialog_spin();
 #if GTK_CHECK_VERSION(3,0,0)
-    lives_signal_handlers_unblock_by_func(mainw->start_image,(gpointer)expose_sim,NULL);
+    lives_signal_handlers_unblock_by_func(mainw->start_image,(livespointer)expose_sim,NULL);
     lives_signal_stop_emission_by_name(mainw->start_image,LIVES_WIDGET_EXPOSE_EVENT);
 #endif
     return;
@@ -3593,9 +3727,9 @@
     if (mainw->playing_file==-1&&cfile->clip_type==CLIP_TYPE_FILE&&is_virtual_frame(mainw->current_file,frame)&&cfile->ext_src!=NULL) {
       lives_clip_data_t *cdata=((lives_decoder_t *)cfile->ext_src)->cdata;
       if (cdata!=NULL&&!(cdata->seek_flag&LIVES_SEEK_FAST)) {
-	boolean resb=virtual_to_images(mainw->current_file,frame,frame,FALSE,NULL);
-	resb=resb; // dont care (much) if it fails
-	
+        boolean resb=virtual_to_images(mainw->current_file,frame,frame,FALSE,NULL);
+        resb=resb; // dont care (much) if it fails
+
       }
     }
 
@@ -3615,8 +3749,8 @@
       set_ce_frame_from_pixbuf(LIVES_IMAGE(mainw->start_image),start_pixbuf,NULL);
     }
     if (start_pixbuf!=NULL) {
-      if (G_IS_OBJECT(start_pixbuf)) {
-	lives_object_unref(start_pixbuf);
+      if (LIVES_IS_WIDGET_OBJECT(start_pixbuf)) {
+        lives_object_unref(start_pixbuf);
       }
     }
 
@@ -3633,13 +3767,14 @@
     }
   } while (rwidth!=lives_widget_get_allocation_width(mainw->start_image)||rheight!=lives_widget_get_allocation_height(mainw->start_image));
 #else
-  } while (FALSE);
+  }
+  while (FALSE);
 #endif
   threaded_dialog_spin();
   mainw->noswitch=noswitch;
 
 #if GTK_CHECK_VERSION(3,0,0)
-  lives_signal_handlers_unblock_by_func(mainw->start_image,(gpointer)expose_sim,NULL);
+  lives_signal_handlers_unblock_by_func(mainw->start_image,(livespointer)expose_sim,NULL);
   lives_signal_stop_emission_by_name(mainw->start_image,LIVES_WIDGET_EXPOSE_EVENT);
 #endif
 
@@ -3660,21 +3795,21 @@
   if (mainw->multitrack!=NULL) return;
 
 #if GTK_CHECK_VERSION(3,0,0)
-  lives_signal_handlers_block_by_func(mainw->end_image,(gpointer)expose_eim,NULL);
+  lives_signal_handlers_block_by_func(mainw->end_image,(livespointer)expose_eim,NULL);
 #endif
 
   if (mainw->current_file>-1&&cfile!=NULL&&(cfile->clip_type==CLIP_TYPE_YUV4MPEG||cfile->clip_type==CLIP_TYPE_VIDEODEV)) {
     if (mainw->camframe==NULL) {
-      GError *error=NULL;
-      gchar *tmp=g_build_filename(prefs->prefix_dir,THEME_DIR,"camera","frame.jpg",NULL);
+      LiVESError *error=NULL;
+      char *tmp=lives_build_filename(prefs->prefix_dir,THEME_DIR,"camera","frame.jpg",NULL);
       mainw->camframe=lives_pixbuf_new_from_file(tmp,&error);
       if (mainw->camframe!=NULL) lives_pixbuf_saturate_and_pixelate(mainw->camframe,mainw->camframe,0.0,FALSE);
-      g_free(tmp);
+      lives_free(tmp);
     }
 
     set_ce_frame_from_pixbuf(LIVES_IMAGE(mainw->end_image),mainw->camframe,NULL);
 #if GTK_CHECK_VERSION(3,0,0)
-    lives_signal_handlers_unblock_by_func(mainw->end_image,(gpointer)expose_eim,NULL);
+    lives_signal_handlers_unblock_by_func(mainw->end_image,(livespointer)expose_eim,NULL);
     lives_signal_stop_emission_by_name(mainw->end_image,LIVES_WIDGET_EXPOSE_EVENT);
 #endif
     return;
@@ -3685,13 +3820,12 @@
     threaded_dialog_spin();
     if (!(mainw->imframe==NULL)) {
       set_ce_frame_from_pixbuf(LIVES_IMAGE(mainw->end_image),mainw->imframe,NULL);
-    }
-    else {
+    } else {
       set_ce_frame_from_pixbuf(LIVES_IMAGE(mainw->end_image),NULL,NULL);
     }
     threaded_dialog_spin();
 #if GTK_CHECK_VERSION(3,0,0)
-    lives_signal_handlers_unblock_by_func(mainw->end_image,(gpointer)expose_eim,NULL);
+    lives_signal_handlers_unblock_by_func(mainw->end_image,(livespointer)expose_eim,NULL);
     lives_signal_stop_emission_by_name(mainw->end_image,LIVES_WIDGET_EXPOSE_EVENT);
 #endif
     return;
@@ -3707,8 +3841,8 @@
     if (mainw->playing_file==-1&&cfile->clip_type==CLIP_TYPE_FILE&&is_virtual_frame(mainw->current_file,frame)&&cfile->ext_src!=NULL) {
       lives_clip_data_t *cdata=((lives_decoder_t *)cfile->ext_src)->cdata;
       if (cdata!=NULL&&!(cdata->seek_flag&LIVES_SEEK_FAST)) {
-	boolean resb=virtual_to_images(mainw->current_file,frame,frame,FALSE,NULL);
-	resb=resb; // dont care (much) if it fails
+        boolean resb=virtual_to_images(mainw->current_file,frame,frame,FALSE,NULL);
+        resb=resb; // dont care (much) if it fails
       }
     }
 
@@ -3717,7 +3851,7 @@
     weed_set_int_value(layer,"frame",frame);
 
     if (pull_frame_at_size(layer,get_image_ext_for_type(cfile->img_type),tc,cfile->hsize,cfile->vsize,
-			   WEED_PALETTE_RGB24)) {
+                           WEED_PALETTE_RGB24)) {
       interp=get_interp_value(prefs->pb_quality);
       resize_layer(layer,cfile->hsize,cfile->vsize,interp,WEED_PALETTE_RGB24,0);
       convert_layer_palette(layer,WEED_PALETTE_RGB24,0);
@@ -3729,13 +3863,13 @@
       set_ce_frame_from_pixbuf(LIVES_IMAGE(mainw->end_image),end_pixbuf,NULL);
     }
     if (end_pixbuf!=NULL) {
-      if (G_IS_OBJECT(end_pixbuf)) {
-	lives_object_unref(end_pixbuf);
+      if (LIVES_IS_WIDGET_OBJECT(end_pixbuf)) {
+        lives_object_unref(end_pixbuf);
       }
     }
     threaded_dialog_spin();
 #if GTK_CHECK_VERSION(3,0,0)
-    lives_signal_handlers_unblock_by_func(mainw->end_image,(gpointer)expose_eim,NULL);
+    lives_signal_handlers_unblock_by_func(mainw->end_image,(livespointer)expose_eim,NULL);
     lives_signal_stop_emission_by_name(mainw->end_image,LIVES_WIDGET_EXPOSE_EVENT);
 #endif
     return;
@@ -3762,8 +3896,8 @@
     if (mainw->playing_file==-1&&cfile->clip_type==CLIP_TYPE_FILE&&is_virtual_frame(mainw->current_file,frame)&&cfile->ext_src!=NULL) {
       lives_clip_data_t *cdata=((lives_decoder_t *)cfile->ext_src)->cdata;
       if (cdata!=NULL&&!(cdata->seek_flag&LIVES_SEEK_FAST)) {
-	boolean resb=virtual_to_images(mainw->current_file,frame,frame,FALSE,NULL);
-	resb=resb; // dont care (much) if it fails
+        boolean resb=virtual_to_images(mainw->current_file,frame,frame,FALSE,NULL);
+        resb=resb; // dont care (much) if it fails
       }
     }
 
@@ -3774,7 +3908,7 @@
     if (pull_frame_at_size(layer,get_image_ext_for_type(cfile->img_type),tc,width,height,WEED_PALETTE_RGB24)) {
       interp=get_interp_value(prefs->pb_quality);
       resize_layer(layer,width,height,interp,WEED_PALETTE_RGB24,0);
-      convert_layer_palette(layer,WEED_PALETTE_RGB24,0);  
+      convert_layer_palette(layer,WEED_PALETTE_RGB24,0);
       end_pixbuf=layer_to_pixbuf(layer);
     }
 
@@ -3784,8 +3918,8 @@
       set_ce_frame_from_pixbuf(LIVES_IMAGE(mainw->end_image),end_pixbuf,NULL);
     }
     if (end_pixbuf!=NULL) {
-      if (G_IS_OBJECT(end_pixbuf)) {
-	lives_object_unref(end_pixbuf);
+      if (LIVES_IS_WIDGET_OBJECT(end_pixbuf)) {
+        lives_object_unref(end_pixbuf);
       }
     }
 
@@ -3802,23 +3936,27 @@
     }
   } while (rwidth!=lives_widget_get_allocation_width(mainw->end_image)||rheight!=lives_widget_get_allocation_height(mainw->end_image));
 #else
-  } while (FALSE);
+  }
+  while (FALSE);
 #endif
 
   threaded_dialog_spin();
   mainw->noswitch=noswitch;
 
 #if GTK_CHECK_VERSION(3,0,0)
-  lives_signal_handlers_unblock_by_func(mainw->end_image,(gpointer)expose_eim,NULL);
+  lives_signal_handlers_unblock_by_func(mainw->end_image,(livespointer)expose_eim,NULL);
   lives_signal_stop_emission_by_name(mainw->end_image,LIVES_WIDGET_EXPOSE_EVENT);
 #endif
 
 }
 
 
-
-
-
+#ifndef IS_LIBLIVES
+int main(int argc, char *argv[]) {
+  // call any hooks here
+  return real_main(argc, argv, NULL, 0l);
+}
+#endif
 
 void load_preview_image(boolean update_always) {
   // this is for the sepwin preview
@@ -3832,16 +3970,16 @@
   if (mainw->playing_file>-1) return;
 
 #if GTK_CHECK_VERSION(3,0,0)
-  lives_signal_handlers_block_by_func(mainw->preview_image,(gpointer)expose_pim,NULL);
+  lives_signal_handlers_block_by_func(mainw->preview_image,(livespointer)expose_pim,NULL);
 #endif
 
   if (mainw->current_file>-1&&cfile!=NULL&&(cfile->clip_type==CLIP_TYPE_YUV4MPEG||cfile->clip_type==CLIP_TYPE_VIDEODEV)) {
     if (mainw->camframe==NULL) {
-      GError *error=NULL;
-      gchar *tmp=g_strdup_printf("%s/%s/camera/frame.jpg",prefs->prefix_dir,THEME_DIR);
+      LiVESError *error=NULL;
+      char *tmp=lives_strdup_printf("%s/%s/camera/frame.jpg",prefs->prefix_dir,THEME_DIR);
       mainw->camframe=lives_pixbuf_new_from_file(tmp,&error);
       if (mainw->camframe!=NULL) lives_pixbuf_saturate_and_pixelate(mainw->camframe,mainw->camframe,0.0,FALSE);
-      g_free(tmp);
+      lives_free(tmp);
     }
     pixbuf=lives_pixbuf_scale_simple(mainw->camframe,mainw->pwidth,mainw->pheight,LIVES_INTERP_BEST);
     set_ce_frame_from_pixbuf(LIVES_IMAGE(mainw->preview_image),pixbuf,NULL);
@@ -3853,14 +3991,14 @@
     lives_signal_handler_unblock(mainw->preview_spinbutton,mainw->preview_spin_func);
     lives_widget_set_size_request(mainw->preview_image,mainw->pwidth,mainw->pheight);
 #if GTK_CHECK_VERSION(3,0,0)
-    lives_signal_handlers_unblock_by_func(mainw->preview_image,(gpointer)expose_pim,NULL);
+    lives_signal_handlers_unblock_by_func(mainw->preview_image,(livespointer)expose_pim,NULL);
     lives_signal_stop_emission_by_name(mainw->preview_image,LIVES_WIDGET_EXPOSE_EVENT);
 #endif
     return;
   }
 
   if (mainw->current_file<0||cfile==NULL||!cfile->frames||(cfile->clip_type!=CLIP_TYPE_DISK&&
-							   cfile->clip_type!=CLIP_TYPE_FILE)) {
+      cfile->clip_type!=CLIP_TYPE_FILE)) {
 
     mainw->preview_frame=0;
     lives_signal_handler_block(mainw->preview_spinbutton,mainw->preview_spin_func);
@@ -3870,10 +4008,9 @@
     if (mainw->imframe!=NULL) {
       lives_widget_set_size_request(mainw->preview_image,lives_pixbuf_get_width(mainw->imframe),lives_pixbuf_get_height(mainw->imframe));
       set_ce_frame_from_pixbuf(LIVES_IMAGE(mainw->preview_image), mainw->imframe, NULL);
-    }
-    else set_ce_frame_from_pixbuf(LIVES_IMAGE(mainw->preview_image), NULL, NULL);
+    } else set_ce_frame_from_pixbuf(LIVES_IMAGE(mainw->preview_image), NULL, NULL);
 #if GTK_CHECK_VERSION(3,0,0)
-    lives_signal_handlers_unblock_by_func(mainw->preview_image,(gpointer)expose_pim,NULL);
+    lives_signal_handlers_unblock_by_func(mainw->preview_image,(livespointer)expose_pim,NULL);
     lives_signal_stop_emission_by_name(mainw->preview_image,LIVES_WIDGET_EXPOSE_EVENT);
 #endif
     return;
@@ -3882,51 +4019,50 @@
   if (!update_always) {
     // set current frame from spins, set range
     // set mainw->preview_frame to 0 before calling to force an update (e.g after a clip switch)
-      switch (mainw->prv_link) {
-      case PRV_END:
-	preview_frame=cfile->end;
-	break;
-      case PRV_PTR:
-	preview_frame=calc_frame_from_time(mainw->current_file,cfile->pointer_time);
-	break;
-      case PRV_START:
-	preview_frame=cfile->start;
-	break;
-      default:
-	preview_frame=mainw->preview_frame>0?mainw->preview_frame:1;
-	if (preview_frame>cfile->frames) preview_frame=cfile->frames;
-	break;
-      }
-
-      lives_signal_handler_block(mainw->preview_spinbutton,mainw->preview_spin_func);
-      lives_spin_button_set_range(LIVES_SPIN_BUTTON(mainw->preview_spinbutton),1,cfile->frames);
-      lives_spin_button_set_value(LIVES_SPIN_BUTTON(mainw->preview_spinbutton),preview_frame);
-      lives_signal_handler_unblock(mainw->preview_spinbutton,mainw->preview_spin_func);
+    switch (mainw->prv_link) {
+    case PRV_END:
+      preview_frame=cfile->end;
+      break;
+    case PRV_PTR:
+      preview_frame=calc_frame_from_time(mainw->current_file,cfile->pointer_time);
+      break;
+    case PRV_START:
+      preview_frame=cfile->start;
+      break;
+    default:
+      preview_frame=mainw->preview_frame>0?mainw->preview_frame:1;
+      if (preview_frame>cfile->frames) preview_frame=cfile->frames;
+      break;
+    }
 
-      mainw->preview_frame=preview_frame;
+    lives_signal_handler_block(mainw->preview_spinbutton,mainw->preview_spin_func);
+    lives_spin_button_set_range(LIVES_SPIN_BUTTON(mainw->preview_spinbutton),1,cfile->frames);
+    lives_spin_button_set_value(LIVES_SPIN_BUTTON(mainw->preview_spinbutton),preview_frame);
+    lives_signal_handler_unblock(mainw->preview_spinbutton,mainw->preview_spin_func);
+
+    mainw->preview_frame=preview_frame;
   }
-  
+
   if (mainw->preview_frame<1||mainw->preview_frame>cfile->frames) {
     pixbuf=lives_pixbuf_scale_simple(mainw->imframe,cfile->hsize,cfile->vsize,LIVES_INTERP_BEST);
-  }
-  else {
+  } else {
     weed_plant_t *layer=weed_plant_new(WEED_PLANT_CHANNEL);
     weed_timecode_t tc=((mainw->preview_frame-1.))/cfile->fps*U_SECL;
 
     // if we are not playing, and it would be slow to seek to the frame, convert it to an image
     if (mainw->playing_file==-1&&cfile->clip_type==CLIP_TYPE_FILE&&
-	is_virtual_frame(mainw->current_file,mainw->preview_frame)&&cfile->ext_src!=NULL) {
+        is_virtual_frame(mainw->current_file,mainw->preview_frame)&&cfile->ext_src!=NULL) {
       lives_clip_data_t *cdata=((lives_decoder_t *)cfile->ext_src)->cdata;
       if (cdata!=NULL&&!(cdata->seek_flag&LIVES_SEEK_FAST)) {
-	boolean resb=virtual_to_images(mainw->current_file,mainw->preview_frame,mainw->preview_frame,FALSE,NULL);
-	resb=resb; // dont care (much) if it fails
+        boolean resb=virtual_to_images(mainw->current_file,mainw->preview_frame,mainw->preview_frame,FALSE,NULL);
+        resb=resb; // dont care (much) if it fails
       }
     }
 
     weed_set_int_value(layer,"clip",mainw->current_file);
     weed_set_int_value(layer,"frame",mainw->preview_frame);
     if (pull_frame_at_size(layer,get_image_ext_for_type(cfile->img_type),tc,mainw->pwidth,mainw->pheight,
-			   WEED_PALETTE_RGB24)) {
+                           WEED_PALETTE_RGB24)) {
       LiVESInterpType interp=get_interp_value(prefs->pb_quality);
       resize_layer(layer,mainw->pwidth,mainw->pheight,interp,WEED_PALETTE_RGB24,0);
       convert_layer_palette(layer,WEED_PALETTE_RGB24,0);
@@ -3946,64 +4082,65 @@
       cfile->pointer_time=calc_time_from_frame(mainw->current_file,mainw->preview_frame);
       lives_ruler_set_value(LIVES_RULER(mainw->hruler),cfile->pointer_time);
       if (cfile->pointer_time>0.) {
-	lives_widget_set_sensitive (mainw->rewind, TRUE);
-	lives_widget_set_sensitive (mainw->trim_to_pstart, cfile->achans>0);
-	lives_widget_set_sensitive (mainw->m_rewindbutton, TRUE);
-	if (mainw->preview_box!=NULL) {
-	  lives_widget_set_sensitive (mainw->p_rewindbutton, TRUE);
-	}
-	get_play_times();
+        lives_widget_set_sensitive(mainw->rewind, TRUE);
+        lives_widget_set_sensitive(mainw->trim_to_pstart, cfile->achans>0);
+        lives_widget_set_sensitive(mainw->m_rewindbutton, TRUE);
+        if (mainw->preview_box!=NULL) {
+          lives_widget_set_sensitive(mainw->p_rewindbutton, TRUE);
+        }
+        get_play_times();
       }
       break;
-	
+
     case PRV_START:
       if (cfile->start!=mainw->preview_frame) {
-	lives_spin_button_set_value(LIVES_SPIN_BUTTON(mainw->spinbutton_start),mainw->preview_frame);
-	get_play_times();
+        lives_spin_button_set_value(LIVES_SPIN_BUTTON(mainw->spinbutton_start),mainw->preview_frame);
+        get_play_times();
       }
       break;
-      
+
 
     case PRV_END:
       if (cfile->end!=mainw->preview_frame) {
-	lives_spin_button_set_value(LIVES_SPIN_BUTTON(mainw->spinbutton_end),mainw->preview_frame);
-	get_play_times();
+        lives_spin_button_set_value(LIVES_SPIN_BUTTON(mainw->spinbutton_end),mainw->preview_frame);
+        get_play_times();
       }
       break;
 
     default:
-      lives_widget_set_sensitive (mainw->rewind, FALSE);
-      lives_widget_set_sensitive (mainw->trim_to_pstart, FALSE);
-      lives_widget_set_sensitive (mainw->m_rewindbutton, FALSE);
+      lives_widget_set_sensitive(mainw->rewind, FALSE);
+      lives_widget_set_sensitive(mainw->trim_to_pstart, FALSE);
+      lives_widget_set_sensitive(mainw->m_rewindbutton, FALSE);
       if (mainw->preview_box!=NULL) {
-	lives_widget_set_sensitive (mainw->p_rewindbutton, FALSE);
+        lives_widget_set_sensitive(mainw->p_rewindbutton, FALSE);
       }
       break;
     }
   }
   if (pixbuf!=NULL) lives_object_unref(pixbuf);
 #if GTK_CHECK_VERSION(3,0,0)
-  lives_signal_handlers_unblock_by_func(mainw->preview_image,(gpointer)expose_pim,NULL);
+  lives_signal_handlers_unblock_by_func(mainw->preview_image,(livespointer)expose_pim,NULL);
   lives_signal_stop_emission_by_name(mainw->preview_image,LIVES_WIDGET_EXPOSE_EVENT);
 #endif
 
 }
 
-#ifndef NO_PROG_LOAD
-
 
 #ifdef USE_LIBPNG
 static void png_row_callback(png_structp png_ptr,
-			     png_uint_32 row, int pass) {
+                             png_uint_32 row, int pass) {
   sched_yield();
 }
 
 #endif
 
-static void pbsize_set(GdkPixbufLoader *pbload, int width, int height, gpointer ptr) {
+#ifndef NO_PROG_LOAD
+
+#ifdef GUI_GTK
+static void pbsize_set(GdkPixbufLoader *pbload, int width, int height, livespointer ptr) {
   if (xxwidth*xxheight>0) gdk_pixbuf_loader_set_size(pbload,xxwidth,xxheight);
 }
-
+#endif
 
 #endif
 
@@ -4035,31 +4172,30 @@
 
   if (!is_png) return FALSE;
 
-  png_ptr = png_create_read_struct (PNG_LIBPNG_VER_STRING, 
-				      (png_voidp)NULL, NULL, NULL);
-  
+  png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING,
+                                   (png_voidp)NULL, NULL, NULL);
+
   if (!png_ptr) return FALSE;
-  
+
   info_ptr = png_create_info_struct(png_ptr);
-  
+
   if (!info_ptr) {
     png_destroy_read_struct(&png_ptr,
-			    (png_infopp)NULL, (png_infopp)NULL);
+                            (png_infopp)NULL, (png_infopp)NULL);
+    return FALSE;
+  }
+
+
+  if (setjmp(png_jmpbuf(png_ptr))) {
+    // libpng will longjump to here on error
+    png_destroy_read_struct(&png_ptr, &info_ptr,
+                            (png_infopp)NULL);
     return FALSE;
   }
 
-  
-  if (setjmp(png_jmpbuf(png_ptr)))
-    {
-      // libpng will longjump to here on error
-      png_destroy_read_struct(&png_ptr, &info_ptr,
-			      (png_infopp)NULL);
-      return FALSE;
-    }
-  
   png_init_io(png_ptr, fp);
   png_set_sig_bytes(png_ptr, bsize);
-  
+
   // progressive read calls png_row_callback on each row
   if (prog) png_set_read_status_fn(png_ptr, png_row_callback);
 
@@ -4070,26 +4206,26 @@
     png_set_gamma(png_ptr, screen_gamma, file_gamma);
   else
     png_set_gamma(png_ptr, screen_gamma, 1.0/screen_gamma);
-  
+
   // read header info
   png_read_info(png_ptr, info_ptr);
 
   // want to convert everything (greyscale, RGB, RGBA64 etc.) to RGBA32
   color_type = png_get_color_type(png_ptr, info_ptr);
   bit_depth = png_get_bit_depth(png_ptr, info_ptr);
-  
+
   if (color_type == PNG_COLOR_TYPE_PALETTE)
     png_set_palette_to_rgb(png_ptr);
-  
+
   if (png_get_valid(png_ptr, info_ptr,
-		    PNG_INFO_tRNS)) png_set_tRNS_to_alpha(png_ptr);
-  
+                    PNG_INFO_tRNS)) png_set_tRNS_to_alpha(png_ptr);
+
   if (color_type == PNG_COLOR_TYPE_GRAY &&
       bit_depth < 8) png_set_expand_gray_1_2_4_to_8(png_ptr);
- 
+
   if (color_type == PNG_COLOR_TYPE_GRAY ||
-        color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
-       png_set_gray_to_rgb(png_ptr);
+      color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
+    png_set_gray_to_rgb(png_ptr);
 
 
   if (bit_depth == 16) {
@@ -4100,8 +4236,8 @@
 #endif
   }
 
-  if (color_type != PNG_COLOR_TYPE_RGB_ALPHA && 
-      color_type !=PNG_COLOR_TYPE_GRAY_ALPHA ) 
+  if (color_type != PNG_COLOR_TYPE_RGB_ALPHA &&
+      color_type !=PNG_COLOR_TYPE_GRAY_ALPHA)
     png_set_add_alpha(png_ptr, 255, PNG_FILLER_AFTER);
 
   png_set_interlace_handling(png_ptr);
@@ -4113,7 +4249,7 @@
   width = png_get_image_width(png_ptr, info_ptr);
   height = png_get_image_height(png_ptr, info_ptr);
   *rowstrides = png_get_rowbytes(png_ptr, info_ptr);
-  
+
 
   weed_set_int_value(layer,"width",width);
   weed_set_int_value(layer,"height",height);
@@ -4127,12 +4263,12 @@
   // so here we round up
   framesize=CEIL(*rowstrides*height,32);
 
-  ptr=mem=(unsigned char *)g_malloc(framesize+64);
+  ptr=mem=(unsigned char *)lives_malloc(framesize+64);
   weed_set_voidptr_value(layer, "pixel_data", mem);
-  
+
   // libpng needs pointers to each row
-  row_ptrs=(unsigned char **)g_malloc(height*sizeof(unsigned char *));
-  for (i=0;i<height;i++) {
+  row_ptrs=(unsigned char **)lives_malloc(height*sizeof(unsigned char *));
+  for (i=0; i<height; i++) {
     row_ptrs[i]=ptr;
     ptr+=*rowstrides;
   }
@@ -4142,18 +4278,17 @@
 
   // end read
   png_read_end(png_ptr, (png_infop)NULL);
-  
-  g_free(row_ptrs);
+
+  lives_free(row_ptrs);
 
   png_destroy_read_struct(&png_ptr, &info_ptr,
-			  (png_infopp)NULL);
-  
+                          (png_infopp)NULL);
+
 
   if (prefs->alpha_post) {
     // un-premultiply the alpha
     alpha_unpremult(layer,TRUE);
-  }
-  else {
+  } else {
     int flags=0,error;
     if (weed_plant_has_leaf(layer,"flags"))
       flags=weed_get_int_value(layer,"flags",&error);
@@ -4169,11 +4304,11 @@
 #endif
 
 
-static boolean weed_layer_new_from_file_progressive(weed_plant_t *layer, 
-						    const char *fname, int width, 
-						    int height, 
-						    const char *img_ext, 
-						    GError **gerror) {
+static boolean weed_layer_new_from_file_progressive(weed_plant_t *layer,
+    const char *fname, int width,
+    int height,
+    const char *img_ext,
+    LiVESError **gerror) {
 
 
   LiVESPixbuf *pixbuf=NULL;
@@ -4206,16 +4341,16 @@
   else if (!strcmp(img_ext,"jpg")) pbload=gdk_pixbuf_loader_new_with_type("jpeg",gerror);
   else pbload=gdk_pixbuf_loader_new();
 
-  lives_signal_connect (G_OBJECT (pbload), "size_prepared",
-                      LIVES_GUI_CALLBACK (pbsize_set),
-                      NULL);
+  lives_signal_connect(LIVES_WIDGET_OBJECT(pbload), LIVES_WIDGET_SIZE_PREPARED_SIGNAL,
+                       LIVES_GUI_CALLBACK(pbsize_set),
+                       NULL);
 
 
   while (1) {
     if (!(bsize=fread(buff,1,IMG_BUFF_SIZE,fp))) break;
     sched_yield();
     if (!gdk_pixbuf_loader_write(pbload,buff,bsize,gerror)) {
-      fclose (fp);
+      fclose(fp);
       return FALSE;
     }
     sched_yield();
@@ -4250,7 +4385,7 @@
 #endif
 
   if (*gerror!=NULL) {
-    g_error_free(*gerror);
+    lives_error_free(*gerror);
     pixbuf=NULL;
   }
 
@@ -4260,20 +4395,23 @@
     /* unfortunately gdk pixbuf loader does not preserve the original alpha channel, instead it adds its own. We need to hence reset it back to opaque */
     lives_pixbuf_set_opaque(pixbuf);
     weed_set_int_value(layer,"current_palette",WEED_PALETTE_RGBA32);
-  }
-  else weed_set_int_value(layer,"current_palette",WEED_PALETTE_RGB24);
+  } else weed_set_int_value(layer,"current_palette",WEED_PALETTE_RGB24);
 
 
   do_not_free=pixbuf_to_layer(layer,pixbuf);
 
+
+  // might be threaded here so we need a mutex to stop other thread resetting free_fn
+  pthread_mutex_lock(&mainw->free_fn_mutex);
   if (do_not_free) {
-    mainw->do_not_free=(gpointer)lives_pixbuf_get_pixels_readonly(pixbuf);
-    mainw->free_fn=lives_free_with_check;
+    mainw->do_not_free=(livespointer)lives_pixbuf_get_pixels_readonly(pixbuf);
+    mainw->free_fn=_lives_free_with_check;
   }
+
   if (pixbuf!=NULL) lives_object_unref(pixbuf);
   mainw->do_not_free=NULL;
-  mainw->free_fn=lives_free_normal;
-
+  mainw->free_fn=_lives_free_normal;
+  pthread_mutex_unlock(&mainw->free_fn_mutex);
 
   return TRUE;
 
@@ -4282,58 +4420,58 @@
 
 
 static weed_plant_t *render_subs_from_file(lives_clip_t *sfile, double xtime, weed_plant_t *layer) {
-    // render subtitles from whatever (.srt or .sub) file
-    // uses default values for colours, fonts, size, etc.
+  // render subtitles from whatever (.srt or .sub) file
+  // uses default values for colours, fonts, size, etc.
 
-    // TODO - allow prefs settings for colours, fonts, size, alpha
+  // TODO - allow prefs settings for colours, fonts, size, alpha
 
-    //char *sfont=mainw->font_list[prefs->sub_font];
-    const char *sfont="Sans";
-    lives_colRGBA32_t col_white,col_black_a;
-    
-    int error,size;
+  //char *sfont=mainw->font_list[prefs->sub_font];
+  const char *sfont="Sans";
+  lives_colRGBA32_t col_white,col_black_a;
 
-    xtime-=(double)sfile->subt->offset/sfile->fps;
+  int error,size;
 
-    // round to 2 dp
-    xtime=(double)((int)(xtime*100.+.5))/100.;
+  xtime-=(double)sfile->subt->offset/sfile->fps;
 
-    if (xtime<0.||(sfile->subt->last_time>-1.&&xtime>sfile->subt->last_time)) return layer;
+  // round to 2 dp
+  xtime=(double)((int)(xtime*100.+.5))/100.;
 
-    switch (sfile->subt->type) {
-    case SUBTITLE_TYPE_SRT:
-      get_srt_text(sfile,xtime);
-      break;
-    case SUBTITLE_TYPE_SUB:
-      get_sub_text(sfile,xtime);
-      break;
-    default:
-      return layer;
-    }
+  if (xtime<0.||(sfile->subt->last_time>-1.&&xtime>sfile->subt->last_time)) return layer;
 
-    /////////// use plugin //////////////
+  switch (sfile->subt->type) {
+  case SUBTITLE_TYPE_SRT:
+    get_srt_text(sfile,xtime);
+    break;
+  case SUBTITLE_TYPE_SUB:
+    get_sub_text(sfile,xtime);
+    break;
+  default:
+    return layer;
+  }
 
-    size=weed_get_int_value(layer,"width",&error)/32;
+  /////////// use plugin //////////////
 
-    col_white.red=col_white.green=col_white.blue=col_white.alpha=65535;
-    col_black_a.red=col_black_a.green=col_black_a.blue=0;
-    col_black_a.alpha=20480;
-    
-    if (sfile->subt->text!=NULL) {
-      gchar *tmp;
-      layer=render_text_to_layer(layer,(tmp=g_strdup_printf(" %s ",sfile->subt->text)),sfont,size,
-				 LIVES_TEXT_MODE_FOREGROUND_AND_BACKGROUND,&col_white,&col_black_a,TRUE,TRUE,0.);
-      g_free(tmp);
-    }
+  size=weed_get_int_value(layer,"width",&error)/32;
 
+  col_white.red=col_white.green=col_white.blue=col_white.alpha=65535;
+  col_black_a.red=col_black_a.green=col_black_a.blue=0;
+  col_black_a.alpha=20480;
 
-    return layer;
+  if (sfile->subt->text!=NULL) {
+    char *tmp;
+    layer=render_text_to_layer(layer,(tmp=lives_strdup_printf(" %s ",sfile->subt->text)),sfont,size,
+                               LIVES_TEXT_MODE_FOREGROUND_AND_BACKGROUND,&col_white,&col_black_a,TRUE,TRUE,0.);
+    lives_free(tmp);
+  }
+
+
+  return layer;
 }
 
 
 
-boolean pull_frame_at_size (weed_plant_t *layer, const gchar *image_ext, weed_timecode_t tc, int width, int height, 
-			    int target_palette) {
+boolean pull_frame_at_size(weed_plant_t *layer, const char *image_ext, weed_timecode_t tc, int width, int height,
+                           int target_palette) {
   // pull a frame from an external source into a layer
   // the "clip" and "frame" leaves must be set in layer
   // tc is used instead of "frame" for some sources (e.g. generator plugins)
@@ -4343,7 +4481,7 @@
 
   // if we pull from a decoder plugin, then we may also deinterlace
 
-  GError *gerror=NULL;
+  LiVESError *gerror=NULL;
 
   weed_plant_t *vlayer;
   void **pixel_data;
@@ -4381,133 +4519,125 @@
     if (frame==0) {
       mainw->osc_block=FALSE;
       if ((width==0||height==0)&&weed_plant_has_leaf(layer,"width")&&weed_plant_has_leaf(layer,"height")) {
-	width=weed_get_int_value(layer,"width",&error);
-	height=weed_get_int_value(layer,"height",&error);
+        width=weed_get_int_value(layer,"width",&error);
+        height=weed_get_int_value(layer,"height",&error);
       }
       if (width==0) width=4;
       if (height==0) height=4;
       weed_set_int_value(layer,"width",width);
       weed_set_int_value(layer,"height",height);
       if (!weed_plant_has_leaf(layer,"current_palette")) {
-	if (image_ext==NULL||!strcmp(image_ext,"jpg")) weed_set_int_value(layer,"current_palette",WEED_PALETTE_RGB24);
-	else weed_set_int_value(layer,"current_palette",WEED_PALETTE_RGBA32);
+        if (image_ext==NULL||!strcmp(image_ext,"jpg")) weed_set_int_value(layer,"current_palette",WEED_PALETTE_RGB24);
+        else weed_set_int_value(layer,"current_palette",WEED_PALETTE_RGBA32);
       }
       create_empty_pixel_data(layer,TRUE,TRUE);
       return TRUE;
-    }
-    else if (clip==mainw->scrap_file) {
+    } else if (clip==mainw->scrap_file) {
       return load_from_scrap_file(layer,frame);
-    }
-    else {
+    } else {
       if (sfile->clip_type==CLIP_TYPE_FILE&&sfile->frame_index!=NULL&&frame>0&&
-	  frame<=sfile->frames&&is_virtual_frame(clip,frame)) {
-	// pull frame from video clip
+          frame<=sfile->frames&&is_virtual_frame(clip,frame)) {
+        // pull frame from video clip
 
-	// this could be threaded, so we must not use any gtk functions here
+        // this could be threaded, so we must not use any gtk functions here
 
-	boolean res=TRUE;
+        boolean res=TRUE;
 
-	lives_decoder_t *dplug;
-	if (weed_plant_has_leaf(layer,"host_decoder")) {
-	  dplug=(lives_decoder_t *)weed_get_voidptr_value(layer,"host_decoder",&error);
-	}
-	else dplug=(lives_decoder_t *)sfile->ext_src;
-	if (dplug==NULL||dplug->cdata==NULL) return FALSE;
-	if (target_palette!=dplug->cdata->current_palette) {
-	  // try to switch palette
-	  if (decplugin_supports_palette(dplug,target_palette)) {
-	    // switch palettes and re-read clip_data
-	    int oldpal=dplug->cdata->current_palette;
-	    dplug->cdata->current_palette=target_palette;
-	    if (dplug->decoder->set_palette!=NULL) {
-	      if (!(*dplug->decoder->set_palette)(dplug->cdata)) {
-		dplug->cdata->current_palette=oldpal;
-		(*dplug->decoder->set_palette)(dplug->cdata);
-	      }
-	    }
-	  }
-	  else {
-	    if (dplug->cdata->current_palette!=dplug->cdata->palettes[0]&&
-		((weed_palette_is_rgb_palette(target_palette)&&
-		  weed_palette_is_rgb_palette(dplug->cdata->palettes[0]))||
-		 (weed_palette_is_yuv_palette(target_palette)&&
-		  weed_palette_is_yuv_palette(dplug->cdata->palettes[0])))) {
-	      int oldpal=dplug->cdata->current_palette;
-	      dplug->cdata->current_palette=dplug->cdata->palettes[0];
-	      if (dplug->decoder->set_palette!=NULL) {
-		if (!(*dplug->decoder->set_palette)(dplug->cdata)) {
-		  dplug->cdata->current_palette=oldpal;
-		  (*dplug->decoder->set_palette)(dplug->cdata);
-		}
-	      }
-	    }
-	  }
-	}
-	// TODO *** - check for auto-border : we might use width,height instead of frame_width,frame_height, and handle this in the plugin
-
-	if (!prefs->auto_nobord) {
-	  width=dplug->cdata->frame_width/weed_palette_get_pixels_per_macropixel(dplug->cdata->current_palette);
-	  height=dplug->cdata->frame_height;
-	}
-	else {
-	  width=dplug->cdata->width/weed_palette_get_pixels_per_macropixel(dplug->cdata->current_palette);
-	  height=dplug->cdata->height;
-	}
-
-	weed_set_int_value(layer,"width",width);
-	weed_set_int_value(layer,"height",height);
-	weed_set_int_value(layer,"current_palette",dplug->cdata->current_palette);
-
-	if (weed_palette_is_yuv_palette(dplug->cdata->current_palette)) {
-	  weed_set_int_value(layer,"YUV_sampling",dplug->cdata->YUV_sampling);
-	  weed_set_int_value(layer,"YUV_clamping",dplug->cdata->YUV_clamping);
-	  weed_set_int_value(layer,"YUV_subspace",dplug->cdata->YUV_subspace);
-	}
-
-	create_empty_pixel_data(layer,FALSE,TRUE);
-
-
-	pixel_data=weed_get_voidptr_array(layer,"pixel_data",&error);
-	rowstrides=weed_get_int_array(layer,"rowstrides",&error);
-
-	// try to pull frame from decoder plugin
-	if (!(*dplug->decoder->get_frame)(dplug->cdata,(int64_t)(sfile->frame_index[frame-1]),
-					  rowstrides,sfile->vsize,pixel_data)) {
-
-	  // if get_frame fails, return a black frame
-	  if (!is_thread) {
-	    weed_layer_pixel_data_free(layer);
-	    create_empty_pixel_data(layer,TRUE,TRUE);
-	  }
-	  res=FALSE;
-	}
+        lives_decoder_t *dplug;
+        if (weed_plant_has_leaf(layer,"host_decoder")) {
+          dplug=(lives_decoder_t *)weed_get_voidptr_value(layer,"host_decoder",&error);
+        } else dplug=(lives_decoder_t *)sfile->ext_src;
+        if (dplug==NULL||dplug->cdata==NULL) return FALSE;
+        if (target_palette!=dplug->cdata->current_palette) {
+          // try to switch palette
+          if (decplugin_supports_palette(dplug,target_palette)) {
+            // switch palettes and re-read clip_data
+            int oldpal=dplug->cdata->current_palette;
+            dplug->cdata->current_palette=target_palette;
+            if (dplug->decoder->set_palette!=NULL) {
+              if (!(*dplug->decoder->set_palette)(dplug->cdata)) {
+                dplug->cdata->current_palette=oldpal;
+                (*dplug->decoder->set_palette)(dplug->cdata);
+              }
+            }
+          } else {
+            if (dplug->cdata->current_palette!=dplug->cdata->palettes[0]&&
+                ((weed_palette_is_rgb_palette(target_palette)&&
+                  weed_palette_is_rgb_palette(dplug->cdata->palettes[0]))||
+                 (weed_palette_is_yuv_palette(target_palette)&&
+                  weed_palette_is_yuv_palette(dplug->cdata->palettes[0])))) {
+              int oldpal=dplug->cdata->current_palette;
+              dplug->cdata->current_palette=dplug->cdata->palettes[0];
+              if (dplug->decoder->set_palette!=NULL) {
+                if (!(*dplug->decoder->set_palette)(dplug->cdata)) {
+                  dplug->cdata->current_palette=oldpal;
+                  (*dplug->decoder->set_palette)(dplug->cdata);
+                }
+              }
+            }
+          }
+        }
+        // TODO *** - check for auto-border : we might use width,height instead of frame_width,frame_height, and handle this in the plugin
+
+        if (!prefs->auto_nobord) {
+          width=dplug->cdata->frame_width/weed_palette_get_pixels_per_macropixel(dplug->cdata->current_palette);
+          height=dplug->cdata->frame_height;
+        } else {
+          width=dplug->cdata->width/weed_palette_get_pixels_per_macropixel(dplug->cdata->current_palette);
+          height=dplug->cdata->height;
+        }
+
+        weed_set_int_value(layer,"width",width);
+        weed_set_int_value(layer,"height",height);
+        weed_set_int_value(layer,"current_palette",dplug->cdata->current_palette);
+
+        if (weed_palette_is_yuv_palette(dplug->cdata->current_palette)) {
+          weed_set_int_value(layer,"YUV_sampling",dplug->cdata->YUV_sampling);
+          weed_set_int_value(layer,"YUV_clamping",dplug->cdata->YUV_clamping);
+          weed_set_int_value(layer,"YUV_subspace",dplug->cdata->YUV_subspace);
+        }
+
+        create_empty_pixel_data(layer,FALSE,TRUE);
 
-	weed_free(pixel_data);
-	weed_free(rowstrides);
+
+        pixel_data=weed_get_voidptr_array(layer,"pixel_data",&error);
+        rowstrides=weed_get_int_array(layer,"rowstrides",&error);
+
+        // try to pull frame from decoder plugin
+        if (!(*dplug->decoder->get_frame)(dplug->cdata,(int64_t)(sfile->frame_index[frame-1]),
+                                          rowstrides,sfile->vsize,pixel_data)) {
+
+          // if get_frame fails, return a black frame
+          if (!is_thread) {
+            weed_layer_pixel_data_free(layer);
+            create_empty_pixel_data(layer,TRUE,TRUE);
+          }
+          res=FALSE;
+        }
+
+        lives_free(pixel_data);
+        lives_free(rowstrides);
 
         // deinterlace
-	if (sfile->deinterlace||(prefs->auto_deint&&dplug->cdata->interlace!=LIVES_INTERLACE_NONE)) {
-	  if (!is_thread) {
-	    deinterlace_frame(layer,tc);
-	  }
- 	  else weed_set_boolean_value(layer,"host_deinterlace",WEED_TRUE);
-	}
-	mainw->osc_block=FALSE;
-	return res;
-      }
-      else {
-	// pull frame from decoded images
-	boolean ret;
-	gchar *fname=g_strdup_printf("%s/%s/%08d.%s",prefs->tmpdir,sfile->handle,frame,image_ext);
-	if (height*width==0) {
-	  ret=weed_layer_new_from_file_progressive(layer,fname,0,0,image_ext,&gerror);
-	}
-	else {
-	  ret=weed_layer_new_from_file_progressive(layer,fname,width,height,image_ext,&gerror);
-	}
-	g_free(fname);
-	mainw->osc_block=FALSE;
-	if (ret==FALSE) return FALSE;
+        if (sfile->deinterlace||(prefs->auto_deint&&dplug->cdata->interlace!=LIVES_INTERLACE_NONE)) {
+          if (!is_thread) {
+            deinterlace_frame(layer,tc);
+          } else weed_set_boolean_value(layer,"host_deinterlace",WEED_TRUE);
+        }
+        mainw->osc_block=FALSE;
+        return res;
+      } else {
+        // pull frame from decoded images
+        boolean ret;
+        char *fname=lives_strdup_printf("%s/%s/%08d.%s",prefs->tmpdir,sfile->handle,frame,image_ext);
+        if (height*width==0) {
+          ret=weed_layer_new_from_file_progressive(layer,fname,0,0,image_ext,&gerror);
+        } else {
+          ret=weed_layer_new_from_file_progressive(layer,fname,width,height,image_ext,&gerror);
+        }
+        lives_free(fname);
+        mainw->osc_block=FALSE;
+        if (ret==FALSE) return FALSE;
       }
     }
     break;
@@ -4519,9 +4649,8 @@
     weed_layer_set_from_yuv4m(layer,sfile);
     if (sfile->deinterlace) {
       if (!is_thread) {
-	deinterlace_frame(layer,tc);
-      }
-      else weed_set_boolean_value(layer,"host_deinterlace",WEED_TRUE);
+        deinterlace_frame(layer,tc);
+      } else weed_set_boolean_value(layer,"host_deinterlace",WEED_TRUE);
     }
     mainw->osc_block=FALSE;
     return TRUE;
@@ -4531,9 +4660,8 @@
     weed_layer_set_from_lvdev(layer,sfile,4./cfile->pb_fps);
     if (sfile->deinterlace) {
       if (!is_thread) {
-	deinterlace_frame(layer,tc);
-      }
-      else weed_set_boolean_value(layer,"host_deinterlace",WEED_TRUE);
+        deinterlace_frame(layer,tc);
+      } else weed_set_boolean_value(layer,"host_deinterlace",WEED_TRUE);
     }
     mainw->osc_block=FALSE;
     return TRUE;
@@ -4569,7 +4697,7 @@
 }
 
 
-boolean pull_frame (weed_plant_t *layer, const gchar *image_ext, weed_timecode_t tc) {
+boolean pull_frame(weed_plant_t *layer, const char *image_ext, weed_timecode_t tc) {
   // pull a frame from an external source into a layer
   // the "clip" and "frame" leaves must be set in layer
   // tc is used instead of "frame" for some sources (e.g. generator plugins)
@@ -4593,7 +4721,7 @@
     pthread_join(*frame_thread,NULL);
     weed_leaf_delete(layer,"host_pthread");
     free(frame_thread);
- 
+
     if (weed_plant_has_leaf(layer,"host_deinterlace")&&weed_get_boolean_value(layer,"host_deinterlace",&error)==WEED_TRUE) {
       int error;
       weed_timecode_t tc=weed_get_int64_value(layer,"host_tc",&error);
@@ -4609,8 +4737,8 @@
 
       // render subtitles from file
       if (prefs->show_subtitles&&sfile->subt!=NULL&&sfile->subt->tfile!=NULL) {
-	double xtime=(double)(frame-1)/sfile->fps;
-	layer=render_subs_from_file(sfile,xtime,layer);
+        double xtime=(double)(frame-1)/sfile->fps;
+        layer=render_subs_from_file(sfile,xtime,layer);
       }
     }
   }
@@ -4630,14 +4758,14 @@
   weed_plant_t *layer=data->layer;
   weed_timecode_t tc=data->tc;
   const char *img_ext=data->img_ext;
-  g_free(in);
+  lives_free(in);
   pull_frame_at_size(layer,img_ext,tc,0,0,WEED_PALETTE_END);
   return NULL;
 }
 
 
 
-void pull_frame_threaded (weed_plant_t *layer, const char *img_ext, weed_timecode_t tc) {
+void pull_frame_threaded(weed_plant_t *layer, const char *img_ext, weed_timecode_t tc) {
   // pull a frame from an external source into a layer
   // the "clip" and "frame" leaves must be set in layer
 
@@ -4650,7 +4778,7 @@
   return;
 #else
 
-  pft_priv_data *in=(pft_priv_data *)g_malloc(sizeof(pft_priv_data));
+  pft_priv_data *in=(pft_priv_data *)lives_malloc(sizeof(pft_priv_data));
   pthread_t *frame_thread=(pthread_t *)calloc(sizeof(pthread_t),1);
 
   weed_set_int64_value(layer,"host_tc",tc);
@@ -4665,8 +4793,8 @@
 }
 
 
-LiVESPixbuf *pull_lives_pixbuf_at_size(int clip, int frame, const char *image_ext, weed_timecode_t tc, 
-				       int width, int height, LiVESInterpType interp) {
+LiVESPixbuf *pull_lives_pixbuf_at_size(int clip, int frame, const char *image_ext, weed_timecode_t tc,
+                                       int width, int height, LiVESInterpType interp) {
   // return a correctly sized (Gdk)Pixbuf (RGB24 for jpeg, RGBA32 for png) for the given clip and frame
   // tc is used instead of "frame" for some sources (e.g. generator plugins)
   // image_ext is used if the source is an image file (eg. "jpg" or "png")
@@ -4688,7 +4816,7 @@
   }
   weed_plant_free(layer);
   if (pixbuf!=NULL&&((width!=0&&lives_pixbuf_get_width(pixbuf)!=width)
-		     ||(height!=0&&lives_pixbuf_get_height(pixbuf)!=height))) {
+                     ||(height!=0&&lives_pixbuf_get_height(pixbuf)!=height))) {
     LiVESPixbuf *pixbuf2;
     threaded_dialog_spin();
     // TODO - could use resize plugin here
@@ -4711,74 +4839,67 @@
 
   if (mainw->multitrack!=NULL) {
     if (mainw->multitrack->is_rendering) {
-	*opwidth=cfile->hsize;
-	*opheight=cfile->vsize;
-    }
-    else {
+      *opwidth=cfile->hsize;
+      *opheight=cfile->vsize;
+    } else {
       if (!mainw->fs||mainw->play_window==NULL||mainw->ext_playback) {
-	if (mainw->play_window==NULL) {
-	  *opwidth=mainw->files[mainw->multitrack->render_file]->hsize;
-	  *opheight=mainw->files[mainw->multitrack->render_file]->vsize;
-	  calc_maxspect(mainw->multitrack->play_width,mainw->multitrack->play_height,opwidth,opheight);
-	}
-	else {
-	  *opwidth=cfile->hsize;
-	  *opheight=cfile->vsize;
-	}
-	
-	if (!mainw->fs&&mainw->play_window!=NULL&&(mainw->pwidth<*opwidth||mainw->pheight<*opheight)) {
-	  *opwidth=mainw->pwidth;
-	  *opheight=mainw->pheight;
-	}
-      }
-      else {
-	if (prefs->play_monitor==0) {
-	  *opwidth=mainw->scr_width;
-	  *opheight=mainw->scr_height;
-	  if (capable->nmonitors>1) {
-	    // spread over all monitors
-	    *opwidth=gdk_screen_get_width(mainw->mgeom[0].screen);
-	    *opheight=gdk_screen_get_height(mainw->mgeom[0].screen);
-	  }
-	}
-	else {
-	  if (mainw->play_window!=NULL) pmonitor=prefs->play_monitor;
-	  else pmonitor=prefs->gui_monitor;
-	  *opwidth=mainw->mgeom[pmonitor-1].width;
-	  *opheight=mainw->mgeom[pmonitor-1].height;
-	}
+        if (mainw->play_window==NULL) {
+          *opwidth=mainw->files[mainw->multitrack->render_file]->hsize;
+          *opheight=mainw->files[mainw->multitrack->render_file]->vsize;
+          calc_maxspect(mainw->multitrack->play_width,mainw->multitrack->play_height,opwidth,opheight);
+        } else {
+          *opwidth=cfile->hsize;
+          *opheight=cfile->vsize;
+        }
+
+        if (!mainw->fs&&mainw->play_window!=NULL&&(mainw->pwidth<*opwidth||mainw->pheight<*opheight)) {
+          *opwidth=mainw->pwidth;
+          *opheight=mainw->pheight;
+        }
+      } else {
+        if (prefs->play_monitor==0) {
+          *opwidth=mainw->scr_width;
+          *opheight=mainw->scr_height;
+          if (capable->nmonitors>1) {
+            // spread over all monitors
+            *opwidth=lives_screen_get_width(mainw->mgeom[0].screen);
+            *opheight=lives_screen_get_height(mainw->mgeom[0].screen);
+          }
+        } else {
+          if (mainw->play_window!=NULL) pmonitor=prefs->play_monitor;
+          else pmonitor=prefs->gui_monitor;
+          *opwidth=mainw->mgeom[pmonitor-1].width;
+          *opheight=mainw->mgeom[pmonitor-1].height;
+        }
       }
     }
   }
   if (mainw->ext_playback) {
     if (mainw->vpp->capabilities&VPP_LOCAL_DISPLAY) {
       if (mainw->vpp->capabilities&VPP_CAN_RESIZE) {
-	if (mainw->fs) {
-	  if (prefs->play_monitor==0) {
-	    *opwidth=mainw->scr_width;
-	    *opheight=mainw->scr_height;
-	    if (capable->nmonitors>1) {
-	      // spread over all monitors
-	      *opwidth=gdk_screen_get_width(mainw->mgeom[0].screen);
-	      *opheight=gdk_screen_get_height(mainw->mgeom[0].screen);
-	    }
-	  }
-	  else {
-	    *opwidth=mainw->mgeom[prefs->play_monitor-1].width;
-	    *opheight=mainw->mgeom[prefs->play_monitor-1].height;
-	  }
-	}
-      }
-      else {
-	// ext plugin can't resize
-	*opwidth=mainw->vpp->fwidth;
-	*opheight=mainw->vpp->fheight;
+        if (mainw->fs) {
+          if (prefs->play_monitor==0) {
+            *opwidth=mainw->scr_width;
+            *opheight=mainw->scr_height;
+            if (capable->nmonitors>1) {
+              // spread over all monitors
+              *opwidth=lives_screen_get_width(mainw->mgeom[0].screen);
+              *opheight=lives_screen_get_height(mainw->mgeom[0].screen);
+            }
+          } else {
+            *opwidth=mainw->mgeom[prefs->play_monitor-1].width;
+            *opheight=mainw->mgeom[prefs->play_monitor-1].height;
+          }
+        }
+      } else {
+        // ext plugin can't resize
+        *opwidth=mainw->vpp->fwidth;
+        *opheight=mainw->vpp->fheight;
       }
-    }
-    else {
+    } else {
       if (!(mainw->vpp->capabilities&VPP_CAN_RESIZE)) {
-	*opwidth=mainw->vpp->fwidth;
-	*opheight=mainw->vpp->fheight;
+        *opwidth=mainw->vpp->fwidth;
+        *opheight=mainw->vpp->fheight;
       }
     }
   }
@@ -4786,63 +4907,57 @@
     // no playback plugin
     if (mainw->fs&&!mainw->is_rendering) {
       if (!mainw->sep_win) {
-	do {
-	  *opwidth=lives_widget_get_allocation_width(mainw->playframe);
-	  *opheight=lives_widget_get_allocation_height(mainw->playframe);
-	  if (*opwidth * *opheight==0) {
-	    lives_widget_context_update();
-	  }
-	} while (*opwidth * *opheight == 0);
-      }
-      else {
-	if (prefs->play_monitor==0) {
-	  if (capable->nmonitors==1) {
-	    if (mainw->scr_width>*opwidth) *opwidth=mainw->scr_width;
-	    if (mainw->scr_height>*opheight) *opheight=mainw->scr_height;
-	  }
-	  else {
-	    // spread over all monitors
-	    if (gdk_screen_get_width(mainw->mgeom[0].screen)>*opwidth) *opwidth=gdk_screen_get_width(mainw->mgeom[0].screen);
-	    if (gdk_screen_get_height(mainw->mgeom[0].screen)>*opheight) *opheight=gdk_screen_get_height(mainw->mgeom[0].screen);
-	  }
-	}
-	else {
-	  if (mainw->play_window!=NULL) pmonitor=prefs->play_monitor;
-	  else pmonitor=prefs->gui_monitor;
-	  if (mainw->mgeom[pmonitor-1].width>*opwidth) *opwidth=mainw->mgeom[pmonitor-1].width;
-	  if (mainw->mgeom[pmonitor-1].height>*opheight) *opheight=mainw->mgeom[pmonitor-1].height;
-	}
+        do {
+          *opwidth=lives_widget_get_allocation_width(mainw->playframe);
+          *opheight=lives_widget_get_allocation_height(mainw->playframe);
+          if (*opwidth **opheight==0) {
+            lives_widget_context_update();
+          }
+        } while (*opwidth **opheight == 0);
+      } else {
+        if (prefs->play_monitor==0) {
+          if (capable->nmonitors==1) {
+            if (mainw->scr_width>*opwidth) *opwidth=mainw->scr_width;
+            if (mainw->scr_height>*opheight) *opheight=mainw->scr_height;
+          } else {
+            // spread over all monitors
+            if (lives_screen_get_width(mainw->mgeom[0].screen)>*opwidth) *opwidth=lives_screen_get_width(mainw->mgeom[0].screen);
+            if (lives_screen_get_height(mainw->mgeom[0].screen)>*opheight) *opheight=lives_screen_get_height(mainw->mgeom[0].screen);
+          }
+        } else {
+          if (mainw->play_window!=NULL) pmonitor=prefs->play_monitor;
+          else pmonitor=prefs->gui_monitor;
+          if (mainw->mgeom[pmonitor-1].width>*opwidth) *opwidth=mainw->mgeom[pmonitor-1].width;
+          if (mainw->mgeom[pmonitor-1].height>*opheight) *opheight=mainw->mgeom[pmonitor-1].height;
+        }
       }
-    }
-    else {
+    } else {
       if (mainw->is_rendering) {
-	if (cfile->hsize>*opwidth) *opwidth=cfile->hsize;
-	if (cfile->vsize>*opheight) *opheight=cfile->vsize;
-      }
-      else {
-	if (!mainw->sep_win) {
+        if (cfile->hsize>*opwidth) *opwidth=cfile->hsize;
+        if (cfile->vsize>*opheight) *opheight=cfile->vsize;
+      } else {
+        if (!mainw->sep_win) {
 #if GTK_CHECK_VERSION(3,0,0)
-	  int rwidth=mainw->ce_frame_width;
-	  int rheight=mainw->ce_frame_height;
-	  *opwidth=cfile->hsize;
-	  *opheight=cfile->vsize;
-	  calc_maxspect(rwidth,rheight,opwidth,opheight);
-#else
-	  do {
-	    *opwidth=lives_widget_get_allocation_width(mainw->playframe);
-	    *opheight=lives_widget_get_allocation_height(mainw->playframe);
-	    if (*opwidth * *opheight==0) {
-	      lives_widget_context_update();
-	    }
-	  } while (*opwidth * *opheight == 0);
-#endif
-	}
-	else {
-	  if (mainw->pwidth<*opwidth||mainw->pheight<*opheight||*opwidth==0||*opheight==0) {
-	    *opwidth=mainw->pwidth;
-	    *opheight=mainw->pheight;
-	  }
-	}
+          int rwidth=mainw->ce_frame_width;
+          int rheight=mainw->ce_frame_height;
+          *opwidth=cfile->hsize;
+          *opheight=cfile->vsize;
+          calc_maxspect(rwidth,rheight,opwidth,opheight);
+#else
+          do {
+            *opwidth=lives_widget_get_allocation_width(mainw->playframe);
+            *opheight=lives_widget_get_allocation_height(mainw->playframe);
+            if (*opwidth **opheight==0) {
+              lives_widget_context_update();
+            }
+          } while (*opwidth **opheight == 0);
+#endif
+        } else {
+          if (mainw->pwidth<*opwidth||mainw->pheight<*opheight||*opwidth==0||*opheight==0) {
+            *opwidth=mainw->pwidth;
+            *opheight=mainw->pheight;
+          }
+        }
       }
     }
   }
@@ -4853,20 +4968,20 @@
 void init_track_decoders(void) {
   register int i;
 
-  for (i=0;i<MAX_TRACKS;i++) {
+  for (i=0; i<MAX_TRACKS; i++) {
     mainw->track_decoders[i]=NULL;
     mainw->old_active_track_list[i]=mainw->active_track_list[i]=0;
   }
-  for (i=0;i<MAX_FILES;i++) mainw->ext_src_used[i]=FALSE;
+  for (i=0; i<MAX_FILES; i++) mainw->ext_src_used[i]=FALSE;
 }
 
 
 void free_track_decoders(void) {
   register int i;
 
-  for (i=0;i<MAX_TRACKS;i++) {
-    if (mainw->track_decoders[i]!=NULL && 
-	(mainw->active_track_list[i]<=0||mainw->track_decoders[i]!=mainw->files[mainw->active_track_list[i]]->ext_src))
+  for (i=0; i<MAX_TRACKS; i++) {
+    if (mainw->track_decoders[i]!=NULL &&
+        (mainw->active_track_list[i]<=0||mainw->track_decoders[i]!=mainw->files[mainw->active_track_list[i]]->ext_src))
       close_decoder_plugin(mainw->track_decoders[i]);
   }
 }
@@ -4893,9 +5008,9 @@
 
   LiVESPixbuf *pixbuf=NULL;
 
-  gchar *framecount=NULL,*tmp;
-  gchar *fname_next=NULL,*info_file=NULL;
-  const gchar *img_ext=NULL;
+  char *framecount=NULL,*tmp;
+  char *fname_next=NULL,*info_file=NULL;
+  const char *img_ext=NULL;
 
   LiVESInterpType interp;
 
@@ -4914,16 +5029,17 @@
 
 #define BFC_LIMIT 1000
 
-  if (G_UNLIKELY(cfile->frames==0&&!mainw->foreign&&!mainw->is_rendering)) {
+  if (LIVES_UNLIKELY(cfile->frames==0&&!mainw->foreign&&!mainw->is_rendering)) {
     if (mainw->record&&!mainw->record_paused) {
       // add blank frame
       weed_plant_t *event=get_last_event(mainw->event_list);
       weed_plant_t *event_list=insert_blank_frame_event_at(mainw->event_list,mainw->currticks,&event);
-      if (mainw->rec_aclip!=-1&&(prefs->rec_opts&REC_AUDIO)&&!mainw->record_starting&&prefs->audio_src==AUDIO_SRC_INT&&!(has_audio_filters(AF_TYPE_NONA))) {
-	// we are recording, and the audio clip changed; add audio
-	if (mainw->event_list==NULL) mainw->event_list=event_list;
-	insert_audio_event_at(mainw->event_list,event,-1,mainw->rec_aclip,mainw->rec_aseek,mainw->rec_avel);
-	mainw->rec_aclip=-1;
+      if (mainw->rec_aclip!=-1&&(prefs->rec_opts&REC_AUDIO)&&!mainw->record_starting&&prefs->audio_src==AUDIO_SRC_INT&&
+          !(has_audio_filters(AF_TYPE_NONA))) {
+        // we are recording, and the audio clip changed; add audio
+        if (mainw->event_list==NULL) mainw->event_list=event_list;
+        insert_audio_event_at(mainw->event_list,event,-1,mainw->rec_aclip,mainw->rec_aseek,mainw->rec_avel);
+        mainw->rec_aclip=-1;
       }
     }
     get_play_times();
@@ -4943,514 +5059,496 @@
 
       // normal play
 
-      if (G_UNLIKELY(mainw->nervous)) {
-	// nervous mode
+      if (LIVES_UNLIKELY(mainw->nervous)) {
+        // nervous mode
 
-	if ((mainw->actual_frame+=(-10+(int) (21.*rand()/(RAND_MAX+1.0))))>cfile->frames||
-	    mainw->actual_frame<1) mainw->actual_frame=frame;
-	else {
-	  frame=mainw->actual_frame;
+        if ((mainw->actual_frame+=(-10+(int)(21.*rand()/(RAND_MAX+1.0))))>cfile->frames||
+            mainw->actual_frame<1) mainw->actual_frame=frame;
+        else {
+          frame=mainw->actual_frame;
 #ifdef ENABLE_JACK
-	  if (prefs->audio_player==AUD_PLAYER_JACK&&(prefs->audio_opts&AUDIO_OPTS_FOLLOW_FPS)&&
-	      mainw->jackd!=NULL&&cfile->achans>0 &&
-	      !(prefs->audio_src==AUDIO_SRC_EXT||mainw->agen_key!=0)) {
-	    if (mainw->jackd->playing_file!=-1&&!jack_audio_seek_frame(mainw->jackd,frame)) {
-	      if (jack_try_reconnect()) jack_audio_seek_frame(mainw->jackd,frame);
-	    }
-
-	    if (!(mainw->record&&!mainw->record_paused)&&has_audio_filters(AF_TYPE_NONA)) {
-	      mainw->rec_aclip=mainw->current_file;
-	      mainw->rec_avel=cfile->pb_fps/cfile->fps;
-	      mainw->rec_aseek=cfile->aseek_pos/(cfile->arate*cfile->achans*cfile->asampsize/8);
-	    }
-	  }
+          if (prefs->audio_player==AUD_PLAYER_JACK&&(prefs->audio_opts&AUDIO_OPTS_FOLLOW_FPS)&&
+              mainw->jackd!=NULL&&cfile->achans>0 &&
+              !(prefs->audio_src==AUDIO_SRC_EXT||mainw->agen_key!=0)) {
+            if (mainw->jackd->playing_file!=-1&&!jack_audio_seek_frame(mainw->jackd,frame)) {
+              if (jack_try_reconnect()) jack_audio_seek_frame(mainw->jackd,frame);
+            }
+
+            if (!(mainw->record&&!mainw->record_paused)&&has_audio_filters(AF_TYPE_NONA)) {
+              mainw->rec_aclip=mainw->current_file;
+              mainw->rec_avel=cfile->pb_fps/cfile->fps;
+              mainw->rec_aseek=cfile->aseek_pos/(cfile->arate*cfile->achans*cfile->asampsize/8);
+            }
+          }
 #endif
 #ifdef HAVE_PULSE_AUDIO
-	  if (prefs->audio_player==AUD_PLAYER_PULSE&&(prefs->audio_opts&AUDIO_OPTS_FOLLOW_FPS)&&
-	      mainw->pulsed!=NULL&&cfile->achans>0 &&
-	      !(prefs->audio_src==AUDIO_SRC_EXT||mainw->agen_key!=0)) {
-
-	    if (mainw->pulsed->playing_file!=-1&&!pulse_audio_seek_frame(mainw->pulsed,mainw->play_start)) {
-	      if (pulse_try_reconnect()) pulse_audio_seek_frame(mainw->pulsed,mainw->play_start);
-	      else mainw->aplayer_broken=TRUE;
-	    }
-
-	    if (!(mainw->record&&!mainw->record_paused)&&has_audio_filters(AF_TYPE_NONA)) {
-	      mainw->rec_aclip=mainw->current_file;
-	      mainw->rec_avel=cfile->pb_fps/cfile->fps;
-	      mainw->rec_aseek=cfile->aseek_pos/(cfile->arate*cfile->achans*cfile->asampsize/8);
-	    }
-	  }
+          if (prefs->audio_player==AUD_PLAYER_PULSE&&(prefs->audio_opts&AUDIO_OPTS_FOLLOW_FPS)&&
+              mainw->pulsed!=NULL&&cfile->achans>0 &&
+              !(prefs->audio_src==AUDIO_SRC_EXT||mainw->agen_key!=0)) {
+
+            if (mainw->pulsed->playing_file!=-1&&!pulse_audio_seek_frame(mainw->pulsed,mainw->play_start)) {
+              if (pulse_try_reconnect()) pulse_audio_seek_frame(mainw->pulsed,mainw->play_start);
+              else mainw->aplayer_broken=TRUE;
+            }
+
+            if (!(mainw->record&&!mainw->record_paused)&&has_audio_filters(AF_TYPE_NONA)) {
+              mainw->rec_aclip=mainw->current_file;
+              mainw->rec_avel=cfile->pb_fps/cfile->fps;
+              mainw->rec_aseek=cfile->aseek_pos/(cfile->arate*cfile->achans*cfile->asampsize/8);
+            }
+          }
 #endif
-	}
+        }
       }
       if (mainw->opening_loc||(cfile->clip_type!=CLIP_TYPE_DISK&&cfile->clip_type!=CLIP_TYPE_FILE)) {
-	framecount=g_strdup_printf("%9d",mainw->actual_frame);
-      }
-      else {
-	framecount=g_strdup_printf("%9d/%d",mainw->actual_frame,cfile->frames);
+        framecount=lives_strdup_printf("%9d",mainw->actual_frame);
+      } else {
+        framecount=lives_strdup_printf("%9d/%d",mainw->actual_frame,cfile->frames);
       }
 
       mainw->noswitch=TRUE;
 
       /////////////////////////////////////////////////
-      
+
       // record performance
       if ((mainw->record&&!mainw->record_paused)||mainw->record_starting) {
-	int fg_file=mainw->current_file;
-	int fg_frame=mainw->actual_frame;
-	int bg_file=mainw->blend_file>0&&mainw->blend_file!=mainw->current_file&&
-	  mainw->files[mainw->blend_file]!=NULL?mainw->blend_file:-1;
-	int bg_frame=bg_file>0&&bg_file!=mainw->current_file?mainw->files[bg_file]->frameno:0;
-	int numframes;
-	int *clips,*frames;
-	weed_plant_t *event_list;
-
-	// should we record the output from the playback plugin ?
-	if (mainw->record && (prefs->rec_opts&REC_AFTER_PB) && mainw->ext_playback && 
-	    (mainw->vpp->capabilities&VPP_CAN_RETURN)) {
-	  rec_after_pb=TRUE;
-	}
-
-	if (rec_after_pb||(cfile->clip_type!=CLIP_TYPE_DISK&&cfile->clip_type!=CLIP_TYPE_FILE)||
-	    (prefs->rec_opts&REC_EFFECTS&&bg_file!=-1&&(mainw->files[bg_file]->clip_type!=CLIP_TYPE_DISK&&
-							mainw->files[bg_file]->clip_type!=CLIP_TYPE_FILE))) {
-	  // TODO - handle non-opening of scrap_file
-	  if (mainw->scrap_file==-1) open_scrap_file();
-	  fg_file=mainw->scrap_file;
-	  fg_frame=mainw->files[mainw->scrap_file]->frames+1;
-	  bg_file=-1;
-	  bg_frame=0;
-	}
-
-	if (mainw->record_starting) {
-	  // mark record start
-	  //pthread_mutex_lock(&mainw->event_list_mutex);
-	  event_list=append_marker_event(mainw->event_list, mainw->currticks, EVENT_MARKER_RECORD_START);
-	  if (mainw->event_list==NULL) mainw->event_list=event_list;
-	  
-	  if (prefs->rec_opts&REC_EFFECTS) {
-	    // add init events and pchanges for all active fx
-	    add_filter_init_events(mainw->event_list,mainw->currticks);
-	  }
-	  //pthread_mutex_unlock(&mainw->event_list_mutex);
+        int fg_file=mainw->current_file;
+        int fg_frame=mainw->actual_frame;
+        int bg_file=mainw->blend_file>0&&mainw->blend_file!=mainw->current_file&&
+                    mainw->files[mainw->blend_file]!=NULL?mainw->blend_file:-1;
+        int bg_frame=bg_file>0&&bg_file!=mainw->current_file?mainw->files[bg_file]->frameno:0;
+        int numframes;
+        int *clips,*frames;
+        weed_plant_t *event_list;
+
+        // should we record the output from the playback plugin ?
+        if (mainw->record && (prefs->rec_opts&REC_AFTER_PB) && mainw->ext_playback &&
+            (mainw->vpp->capabilities&VPP_CAN_RETURN)) {
+          rec_after_pb=TRUE;
+        }
+
+        if (rec_after_pb||(cfile->clip_type!=CLIP_TYPE_DISK&&cfile->clip_type!=CLIP_TYPE_FILE)||
+            (prefs->rec_opts&REC_EFFECTS&&bg_file!=-1&&(mainw->files[bg_file]->clip_type!=CLIP_TYPE_DISK&&
+                mainw->files[bg_file]->clip_type!=CLIP_TYPE_FILE))) {
+          // TODO - handle non-opening of scrap_file
+          if (mainw->scrap_file==-1) open_scrap_file();
+          fg_file=mainw->scrap_file;
+          fg_frame=mainw->files[mainw->scrap_file]->frames+1;
+          bg_file=-1;
+          bg_frame=0;
+        }
+
+        if (mainw->record_starting) {
+          // mark record start
+          //pthread_mutex_lock(&mainw->event_list_mutex);
+          event_list=append_marker_event(mainw->event_list, mainw->currticks, EVENT_MARKER_RECORD_START);
+          if (mainw->event_list==NULL) mainw->event_list=event_list;
+
+          if (prefs->rec_opts&REC_EFFECTS) {
+            // add init events and pchanges for all active fx
+            add_filter_init_events(mainw->event_list,mainw->currticks);
+          }
+          //pthread_mutex_unlock(&mainw->event_list_mutex);
 
 #ifdef ENABLE_JACK
-	  if (prefs->audio_player==AUD_PLAYER_JACK&&mainw->jackd!=NULL&&
-	      (prefs->rec_opts&REC_AUDIO)&&prefs->audio_src==AUDIO_SRC_INT&&mainw->rec_aclip!=mainw->ascrap_file) {
-	    // get current seek postion
-	    jack_get_rec_avals(mainw->jackd);
-	  }
+          if (prefs->audio_player==AUD_PLAYER_JACK&&mainw->jackd!=NULL&&
+              (prefs->rec_opts&REC_AUDIO)&&prefs->audio_src==AUDIO_SRC_INT&&mainw->rec_aclip!=mainw->ascrap_file) {
+            // get current seek postion
+            jack_get_rec_avals(mainw->jackd);
+          }
 #endif
 #ifdef HAVE_PULSE_AUDIO
-	  if (prefs->audio_player==AUD_PLAYER_PULSE&&mainw->pulsed!=NULL&&
-	      (prefs->rec_opts&REC_AUDIO)&&prefs->audio_src==AUDIO_SRC_INT&&mainw->rec_aclip!=mainw->ascrap_file) {
-	    // get current seek postion
-	    pulse_get_rec_avals(mainw->pulsed);
-	  }
-#endif
-	  mainw->record=TRUE;
-	  mainw->record_paused=FALSE;
-	  mainw->record_starting=FALSE;
-	}
-
-	numframes=(bg_file==-1)?1:2;
-	clips=(int *)g_malloc(numframes*sizint);
-	frames=(int *)g_malloc(numframes*sizint);
-	
-	clips[0]=fg_file;
-	frames[0]=fg_frame;
-	if (numframes==2) {
-	  clips[1]=bg_file;
-	  frames[1]=bg_frame;
-	}
-	if (framecount!=NULL) g_free(framecount);
-	pthread_mutex_lock(&mainw->event_list_mutex);
-	if ((event_list=append_frame_event (mainw->event_list,mainw->currticks,numframes,clips,frames))!=NULL) {
-	  if (mainw->event_list==NULL) mainw->event_list=event_list;
-	  if (mainw->rec_aclip!=-1&&((prefs->rec_opts&REC_AUDIO))) {
-	    weed_plant_t *event=get_last_frame_event(mainw->event_list);
-
-	    if (mainw->rec_aclip==mainw->ascrap_file) {
-	      mainw->rec_aseek=(double)mainw->files[mainw->ascrap_file]->aseek_pos/
-		(double)(mainw->files[mainw->ascrap_file]->arps*mainw->files[mainw->ascrap_file]->achans*mainw->files[mainw->ascrap_file]->asampsize>>3);
-
-	    }
-	    insert_audio_event_at(mainw->event_list,event,-1,mainw->rec_aclip,mainw->rec_aseek,mainw->rec_avel);
-	    mainw->rec_aclip=-1;
-	  }
-	  pthread_mutex_unlock(&mainw->event_list_mutex);
-
-	  /* TRANSLATORS: rec(ord) */
-	  framecount=g_strdup_printf(_("rec %9d/%d"),mainw->actual_frame,
-				     cfile->frames>mainw->actual_frame?cfile->frames:mainw->actual_frame);
-	}
-	else {
-	  pthread_mutex_unlock(&mainw->event_list_mutex);
-	  /* TRANSLATORS: out of memory (rec(ord)) */
-	  (framecount=g_strdup_printf(_("!rec %9d/%d"),mainw->actual_frame,cfile->frames));
-	}
-	g_free(clips);
-	g_free(frames);
-      }
-      else {
-	if (mainw->toy_type!=LIVES_TOY_NONE) {
-	  if (mainw->toy_type==LIVES_TOY_MAD_FRAMES&&!mainw->fs&&(cfile->clip_type==CLIP_TYPE_DISK||
-								  cfile->clip_type==CLIP_TYPE_FILE)) {
-	    int current_file=mainw->current_file;
-	    if (mainw->toy_go_wild) {
-	      int i,other_file;
-	      for (i=0;i<11;i++) {
-		other_file=(1+(int) ((double)(mainw->clips_available)*rand()/(RAND_MAX+1.0)));
-		other_file=GPOINTER_TO_INT(g_list_nth_data(mainw->cliplist,other_file));
-		if (mainw->files[other_file]!=NULL) {
-		  // steal a frame from another clip
-		  mainw->current_file=other_file;
-		}
-	      }
-	    }
-	    load_start_image (1+(int) ((double)cfile->frames*rand()/(RAND_MAX+1.0)));
-	    load_end_image (1+(int) ((double)cfile->frames*rand()/(RAND_MAX+1.0)));
-	    mainw->current_file=current_file;
-	  }
-	}
+          if (prefs->audio_player==AUD_PLAYER_PULSE&&mainw->pulsed!=NULL&&
+              (prefs->rec_opts&REC_AUDIO)&&prefs->audio_src==AUDIO_SRC_INT&&mainw->rec_aclip!=mainw->ascrap_file) {
+            // get current seek postion
+            pulse_get_rec_avals(mainw->pulsed);
+          }
+#endif
+          mainw->record=TRUE;
+          mainw->record_paused=FALSE;
+          mainw->record_starting=FALSE;
+        }
+
+        numframes=(bg_file==-1)?1:2;
+        clips=(int *)lives_malloc(numframes*sizint);
+        frames=(int *)lives_malloc(numframes*sizint);
+
+        clips[0]=fg_file;
+        frames[0]=fg_frame;
+        if (numframes==2) {
+          clips[1]=bg_file;
+          frames[1]=bg_frame;
+        }
+        if (framecount!=NULL) lives_free(framecount);
+        pthread_mutex_lock(&mainw->event_list_mutex);
+        if ((event_list=append_frame_event(mainw->event_list,mainw->currticks,numframes,clips,frames))!=NULL) {
+          if (mainw->event_list==NULL) mainw->event_list=event_list;
+          if (mainw->rec_aclip!=-1&&((prefs->rec_opts&REC_AUDIO))) {
+            weed_plant_t *event=get_last_frame_event(mainw->event_list);
+
+            if (mainw->rec_aclip==mainw->ascrap_file) {
+              mainw->rec_aseek=(double)mainw->files[mainw->ascrap_file]->aseek_pos/
+                               (double)(mainw->files[mainw->ascrap_file]->arps*mainw->files[mainw->ascrap_file]->achans*
+                                        mainw->files[mainw->ascrap_file]->asampsize>>3);
+
+            }
+            insert_audio_event_at(mainw->event_list,event,-1,mainw->rec_aclip,mainw->rec_aseek,mainw->rec_avel);
+            mainw->rec_aclip=-1;
+          }
+          pthread_mutex_unlock(&mainw->event_list_mutex);
+
+          /* TRANSLATORS: rec(ord) */
+          framecount=lives_strdup_printf(_("rec %9d/%d"),mainw->actual_frame,
+                                         cfile->frames>mainw->actual_frame?cfile->frames:mainw->actual_frame);
+        } else {
+          pthread_mutex_unlock(&mainw->event_list_mutex);
+          /* TRANSLATORS: out of memory (rec(ord)) */
+          (framecount=lives_strdup_printf(_("!rec %9d/%d"),mainw->actual_frame,cfile->frames));
+        }
+        lives_free(clips);
+        lives_free(frames);
+      } else {
+        if (mainw->toy_type!=LIVES_TOY_NONE) {
+          if (mainw->toy_type==LIVES_TOY_MAD_FRAMES&&!mainw->fs&&(cfile->clip_type==CLIP_TYPE_DISK||
+              cfile->clip_type==CLIP_TYPE_FILE)) {
+            int current_file=mainw->current_file;
+            if (mainw->toy_go_wild) {
+              int i,other_file;
+              for (i=0; i<11; i++) {
+                other_file=(1+(int)((double)(mainw->clips_available)*rand()/(RAND_MAX+1.0)));
+                other_file=LIVES_POINTER_TO_INT(lives_list_nth_data(mainw->cliplist,other_file));
+                if (mainw->files[other_file]!=NULL) {
+                  // steal a frame from another clip
+                  mainw->current_file=other_file;
+                }
+              }
+            }
+            load_start_image(1+(int)((double)cfile->frames*rand()/(RAND_MAX+1.0)));
+            load_end_image(1+(int)((double)cfile->frames*rand()/(RAND_MAX+1.0)));
+            mainw->current_file=current_file;
+          }
+        }
       }
-      
+
       if ((!mainw->fs||prefs->play_monitor!=prefs->gui_monitor||
-	   (mainw->ext_playback&&!(mainw->vpp->capabilities&VPP_LOCAL_DISPLAY)))
-	  &&prefs->show_framecount) {
-	lives_entry_set_text(LIVES_ENTRY(mainw->framecounter),framecount);
-	lives_widget_queue_draw(mainw->framecounter);
+           (mainw->ext_playback&&!(mainw->vpp->capabilities&VPP_LOCAL_DISPLAY)))
+          &&prefs->show_framecount) {
+        lives_entry_set_text(LIVES_ENTRY(mainw->framecounter),framecount);
+        lives_widget_queue_draw(mainw->framecounter);
       }
-      g_free(framecount);
+      lives_free(framecount);
       framecount=NULL;
     }
 
     if (was_preview) {
 #ifndef IS_MINGW
-      info_file=g_build_filename(prefs->tmpdir,cfile->handle,".status",NULL);
+      info_file=lives_build_filename(prefs->tmpdir,cfile->handle,".status",NULL);
 #else
-      info_file=g_build_filename(prefs->tmpdir,cfile->handle,"status",NULL);
+      info_file=lives_build_filename(prefs->tmpdir,cfile->handle,"status",NULL);
 #endif
       // preview
       if (prefs->safer_preview&&cfile->proc_ptr!=NULL&&cfile->proc_ptr->frames_done>0&&
-	  frame>=(cfile->proc_ptr->frames_done-cfile->progress_start+cfile->start)) {
-	mainw->cancelled=CANCEL_PREVIEW_FINISHED;
-	mainw->noswitch=noswitch;
-	if (framecount!=NULL) g_free(framecount);
-	return;
+          frame>=(cfile->proc_ptr->frames_done-cfile->progress_start+cfile->start)) {
+        mainw->cancelled=CANCEL_PREVIEW_FINISHED;
+        mainw->noswitch=noswitch;
+        if (framecount!=NULL) lives_free(framecount);
+        return;
       }
 
       // play preview
       if (cfile->opening||(cfile->next_event!=NULL&&cfile->proc_ptr==NULL)) {
 
-	fname_next=g_strdup_printf("%s/%s/%08d.%s",prefs->tmpdir,cfile->handle,frame+1,prefs->image_ext);
+        fname_next=lives_strdup_printf("%s/%s/%08d.%s",prefs->tmpdir,cfile->handle,frame+1,prefs->image_ext);
 
-	if (!mainw->fs&&prefs->show_framecount&&!mainw->is_rendering) {
-	  if (framecount!=NULL) g_free(framecount);
-	  if (cfile->frames>0&&cfile->frames!=123456789) {
-	    framecount=g_strdup_printf("%9d/%d",frame,cfile->frames);
-	  }
-	  else {
-	    framecount=g_strdup_printf("%9d",frame);
-	  }
-	  lives_entry_set_text(LIVES_ENTRY(mainw->framecounter),framecount);
-	  lives_widget_queue_draw(mainw->framecounter);
-	  g_free(framecount);
-	  framecount=NULL;
-	}
-	if (mainw->toy_type!=LIVES_TOY_NONE) {
-	  // TODO - move into toys.c
-	  if (mainw->toy_type==LIVES_TOY_MAD_FRAMES&&!mainw->fs) {
-	    if (cfile->opening_only_audio) {
-	      load_start_image  (1+(int) ((double)cfile->frames*rand()/(RAND_MAX+1.0)));
-	      load_end_image (1+(int) ((double)cfile->frames*rand()/(RAND_MAX+1.0)));
-	    }
-	    else {
-	      load_start_image (1+(int) ((double)frame*rand()/(RAND_MAX+1.0)));
-	      load_end_image (1+(int) ((double)frame*rand()/(RAND_MAX+1.0)));
-	    }
-	  }
-	}
-      }
-      else {
-	if (mainw->is_rendering||mainw->is_generating) {
-	  fname_next=g_strdup_printf("%s/%s/%08d.%s",prefs->tmpdir,cfile->handle,frame+1,prefs->image_ext);
-	}
-	else {
-	  if (!mainw->keep_pre) {
-	    img_ext="mgk";
-	  }
-	  else {
-	    img_ext="pre";
-	  }
-	  fname_next=g_strdup_printf("%s/%s/%08d.pre",prefs->tmpdir,cfile->handle,frame+1);
-	}
+        if (!mainw->fs&&prefs->show_framecount&&!mainw->is_rendering) {
+          if (framecount!=NULL) lives_free(framecount);
+          if (cfile->frames>0&&cfile->frames!=123456789) {
+            framecount=lives_strdup_printf("%9d/%d",frame,cfile->frames);
+          } else {
+            framecount=lives_strdup_printf("%9d",frame);
+          }
+          lives_entry_set_text(LIVES_ENTRY(mainw->framecounter),framecount);
+          lives_widget_queue_draw(mainw->framecounter);
+          lives_free(framecount);
+          framecount=NULL;
+        }
+        if (mainw->toy_type!=LIVES_TOY_NONE) {
+          // TODO - move into toys.c
+          if (mainw->toy_type==LIVES_TOY_MAD_FRAMES&&!mainw->fs) {
+            if (cfile->opening_only_audio) {
+              load_start_image(1+(int)((double)cfile->frames*rand()/(RAND_MAX+1.0)));
+              load_end_image(1+(int)((double)cfile->frames*rand()/(RAND_MAX+1.0)));
+            } else {
+              load_start_image(1+(int)((double)frame*rand()/(RAND_MAX+1.0)));
+              load_end_image(1+(int)((double)frame*rand()/(RAND_MAX+1.0)));
+            }
+          }
+        }
+      } else {
+        if (mainw->is_rendering||mainw->is_generating) {
+          fname_next=lives_strdup_printf("%s/%s/%08d.%s",prefs->tmpdir,cfile->handle,frame+1,prefs->image_ext);
+        } else {
+          if (!mainw->keep_pre) {
+            img_ext="mgk";
+          } else {
+            img_ext="pre";
+          }
+          fname_next=lives_strdup_printf("%s/%s/%08d.pre",prefs->tmpdir,cfile->handle,frame+1);
+        }
       }
       mainw->actual_frame=frame;
     }
 
     // maybe the performance finished and we weren't looping
     if ((mainw->actual_frame<1||mainw->actual_frame>cfile->frames)&&
-	(cfile->clip_type==CLIP_TYPE_DISK||cfile->clip_type==CLIP_TYPE_FILE)&&!mainw->is_rendering) {
+        (cfile->clip_type==CLIP_TYPE_DISK||cfile->clip_type==CLIP_TYPE_FILE)&&!mainw->is_rendering) {
       mainw->noswitch=noswitch;
-      if (framecount!=NULL) g_free(framecount);
+      if (framecount!=NULL) lives_free(framecount);
       return;
     }
-  
+
 
     // limit max frame size unless we are saving to disk or rendering
 
-    // frame_layer will in any case be equal to or smaller than this depending on maximum source frame size 
+    // frame_layer will in any case be equal to or smaller than this depending on maximum source frame size
 
     if (!(mainw->record&&!mainw->record_paused&&(prefs->rec_opts&REC_EFFECTS)&&
-	  ((cfile->clip_type!=CLIP_TYPE_DISK&&cfile->clip_type!=CLIP_TYPE_FILE)||
-	   (mainw->blend_file!=-1&&mainw->files[mainw->blend_file]!=NULL&&
-	    mainw->files[mainw->blend_file]->clip_type!=CLIP_TYPE_DISK&&
-	    mainw->files[mainw->blend_file]->clip_type!=CLIP_TYPE_FILE)))) {
+          ((cfile->clip_type!=CLIP_TYPE_DISK&&cfile->clip_type!=CLIP_TYPE_FILE)||
+           (mainw->blend_file!=-1&&mainw->files[mainw->blend_file]!=NULL&&
+            mainw->files[mainw->blend_file]->clip_type!=CLIP_TYPE_DISK&&
+            mainw->files[mainw->blend_file]->clip_type!=CLIP_TYPE_FILE)))) {
       get_max_opsize(&opwidth,&opheight);
     }
 
-
     ////////////////////////////////////////////////////////////
     // load a frame from disk buffer
 
     do {
       if (mainw->frame_layer!=NULL) {
-	check_layer_ready(mainw->frame_layer);
-	weed_layer_free(mainw->frame_layer);
-	mainw->frame_layer=NULL;
+        check_layer_ready(mainw->frame_layer);
+        weed_layer_free(mainw->frame_layer);
+        mainw->frame_layer=NULL;
       }
 
       if (mainw->is_rendering&&!(cfile->proc_ptr!=NULL&&mainw->preview)) {
-	// here if we are rendering from multitrack, previewing a recording, or applying realtime effects to a selection
-	weed_timecode_t tc=mainw->cevent_tc;
+        // here if we are rendering from multitrack, previewing a recording, or applying realtime effects to a selection
+        weed_timecode_t tc=mainw->cevent_tc;
+
+        if (mainw->clip_index[0]==mainw->scrap_file&&mainw->clip_index[0]>-1&&mainw->num_tracks==1) {
+          // do not apply fx, just pull frame
+          mainw->frame_layer=weed_plant_new(WEED_PLANT_CHANNEL);
+          weed_set_int_value(mainw->frame_layer,"clip",mainw->clip_index[0]);
+          weed_set_int_value(mainw->frame_layer,"frame",mainw->frame_index[0]);
+          if (!pull_frame(mainw->frame_layer,get_image_ext_for_type(cfile->img_type),tc)) {
+            weed_plant_free(mainw->frame_layer);
+            mainw->frame_layer=NULL;
+          }
+        } else {
+          int oclip,nclip;
+          register int i;
+          weed_plant_t **layers=(weed_plant_t **)lives_malloc((mainw->num_tracks+1)*sizeof(weed_plant_t *));
+
+          // get list of active tracks from mainw->filter map
+          get_active_track_list(mainw->clip_index,mainw->num_tracks,mainw->filter_map);
+          for (i=0; i<mainw->num_tracks; i++) {
+            oclip=mainw->old_active_track_list[i];
+            mainw->ext_src_used[oclip]=FALSE;
+            if (oclip>0&&oclip==(nclip=mainw->active_track_list[i])) {
+              // check if ext_src survives old->new
+              if (mainw->track_decoders[i]==mainw->files[oclip]->ext_src) mainw->ext_src_used[oclip]=TRUE;
+            }
+          }
+
+          for (i=0; i<mainw->num_tracks; i++) {
+            layers[i]=weed_plant_new(WEED_PLANT_CHANNEL);
+            weed_set_int_value(layers[i],"clip",mainw->clip_index[i]);
+            weed_set_int_value(layers[i],"frame",mainw->frame_index[i]);
+            weed_set_int_value(layers[i],"current_palette",(mainw->clip_index[i]==-1||
+                               mainw->files[mainw->clip_index[i]]->img_type==
+                               IMG_TYPE_JPEG)?WEED_PALETTE_RGB24:WEED_PALETTE_RGBA32);
+
+            if ((oclip=mainw->old_active_track_list[i])!=(nclip=mainw->active_track_list[i])) {
+              // now using threading, we want to start pulling all pixel_data for all active layers here
+              // however, we may have more than one copy of the same clip - in this case we want to create clones of the decoder plugin
+              // this is to prevent constant seeking between different frames in the clip
+              if (oclip>0) {
+                if (mainw->files[oclip]->clip_type==CLIP_TYPE_FILE) {
+                  if (mainw->track_decoders[i]!=(lives_decoder_t *)mainw->files[oclip]->ext_src) {
+                    // remove the clone for oclip
+                    close_decoder_plugin(mainw->track_decoders[i]);
+                  }
+                  mainw->track_decoders[i]=NULL;
+                }
+              }
+
+              if (nclip>0) {
+                if (mainw->files[nclip]->clip_type==CLIP_TYPE_FILE) {
+                  if (!mainw->ext_src_used[nclip]) {
+                    mainw->track_decoders[i]=(lives_decoder_t *)mainw->files[nclip]->ext_src;
+                    mainw->ext_src_used[nclip]=TRUE;
+                  } else {
+                    // add new clone for nclip
+                    mainw->track_decoders[i]=clone_decoder(nclip);
+                  }
+                }
+              }
+            }
+
+            mainw->old_active_track_list[i]=mainw->active_track_list[i];
+
+            if (nclip>0) {
+              img_ext=get_image_ext_for_type(mainw->files[nclip]->img_type);
+              // set alt src in layer
+              weed_set_voidptr_value(layers[i],"host_decoder",(void *)mainw->track_decoders[i]);
+              pull_frame_threaded(layers[i],img_ext,(weed_timecode_t)mainw->currticks);
+            } else {
+              weed_set_voidptr_value(layers[i],"pixel_data",NULL);
+            }
+          }
+          layers[i]=NULL;
+
+          mainw->frame_layer=weed_apply_effects(layers,mainw->filter_map,tc,opwidth,opheight,mainw->pchains);
+
+          for (i=0; layers[i]!=NULL; i++) if (layers[i]!=mainw->frame_layer) {
+              check_layer_ready(layers[i]);
+              weed_plant_free(layers[i]);
+            }
+          lives_free(layers);
+
+        }
+
+        if (mainw->internal_messaging) {
+          // this happens if we are calling from multitrack, or apply rte.  We get our mainw->frame_layer and exit.
+          mainw->noswitch=noswitch;
+          if (framecount!=NULL) lives_free(framecount);
+          return;
+        }
+      } else {
+        // normal playback in the clip editor, or applying a non-realtime effect
+        if (!mainw->preview||cfile->clip_type==CLIP_TYPE_FILE||lives_file_test(fname_next,LIVES_FILE_TEST_EXISTS)) {
+          mainw->frame_layer=weed_plant_new(WEED_PLANT_CHANNEL);
+          weed_set_int_value(mainw->frame_layer,"clip",mainw->current_file);
+          weed_set_int_value(mainw->frame_layer,"frame",mainw->actual_frame);
+          if (img_ext==NULL) img_ext=get_image_ext_for_type(cfile->img_type);
+
+          if (mainw->preview&&mainw->frame_layer==NULL&&(mainw->event_list==NULL||cfile->opening)) {
+            if (!pull_frame_at_size(mainw->frame_layer,img_ext,(weed_timecode_t)mainw->currticks,
+                                    cfile->hsize,cfile->vsize,WEED_PALETTE_END)) {
+              if (mainw->frame_layer!=NULL) weed_layer_free(mainw->frame_layer);
+              mainw->frame_layer=NULL;
+
+              if (cfile->opening && cfile->img_type==IMG_TYPE_PNG && sget_file_size(fname_next)==0) {
+                if (++bad_frame_count>BFC_LIMIT) {
+                  mainw->cancelled=check_for_bad_ffmpeg();
+                  bad_frame_count=0;
+                } else lives_usleep(prefs->sleep_time);
+              }
+            }
+          } else {
+            pull_frame_threaded(mainw->frame_layer,img_ext,(weed_timecode_t)mainw->currticks);
+          }
+        }
+        if ((cfile->next_event==NULL&&mainw->is_rendering&&!mainw->switch_during_pb&&
+             (mainw->multitrack==NULL||(!mainw->multitrack->is_rendering&&!mainw->is_generating)))||
+            ((!mainw->is_rendering||(mainw->multitrack!=NULL&&mainw->multitrack->is_rendering))&&
+             mainw->preview&&mainw->frame_layer==NULL)) {
+          // preview ended
+          if (!cfile->opening) mainw->cancelled=CANCEL_NO_MORE_PREVIEW;
+          if (mainw->cancelled) {
+            lives_free(fname_next);
+            lives_free(info_file);
+            mainw->noswitch=noswitch;
+            if (framecount!=NULL) lives_free(framecount);
+            check_layer_ready(mainw->frame_layer);
+            return;
+          }
+          gettimeofday(&tv, NULL);
+          mainw->currticks=U_SECL*(tv.tv_sec-mainw->origsecs)+tv.tv_usec*U_SEC_RATIO-mainw->origusecs*U_SEC_RATIO;
+          mainw->startticks=mainw->currticks+mainw->deltaticks;
+        }
+
+        img_ext=NULL;
+
+        if (mainw->internal_messaging) {
+          mainw->noswitch=noswitch;
+          if (framecount!=NULL) lives_free(framecount);
+          check_layer_ready(mainw->frame_layer);
+          return;
+        }
+
+        if (mainw->frame_layer==NULL&&(!mainw->preview||(mainw->multitrack!=NULL&&!cfile->opening))) {
+          mainw->noswitch=noswitch;
+          if (framecount!=NULL) lives_free(framecount);
+          return;
+        }
 
-	if (mainw->clip_index[0]==mainw->scrap_file&&mainw->clip_index[0]>-1&&mainw->num_tracks==1) {
-	  // do not apply fx, just pull frame
-	  mainw->frame_layer=weed_plant_new(WEED_PLANT_CHANNEL);
-	  weed_set_int_value(mainw->frame_layer,"clip",mainw->clip_index[0]);
-	  weed_set_int_value(mainw->frame_layer,"frame",mainw->frame_index[0]);
-	  if (!pull_frame(mainw->frame_layer,get_image_ext_for_type(cfile->img_type),tc)) {
-	    weed_plant_free(mainw->frame_layer);
-	    mainw->frame_layer=NULL;
-	  }
-	}
-	else {
-	  int oclip,nclip;
-	  register int i;
-	  weed_plant_t **layers=(weed_plant_t **)g_malloc((mainw->num_tracks+1)*sizeof(weed_plant_t *));
-
-	  // get list of active tracks from mainw->filter map
-	  get_active_track_list(mainw->clip_index,mainw->num_tracks,mainw->filter_map);
-	  for (i=0;i<mainw->num_tracks;i++) {
-	    oclip=mainw->old_active_track_list[i];
-	    mainw->ext_src_used[oclip]=FALSE;
-	    if (oclip>0&&oclip==(nclip=mainw->active_track_list[i])) {
-	      // check if ext_src survives old->new
-	      if (mainw->track_decoders[i]==mainw->files[oclip]->ext_src) mainw->ext_src_used[oclip]=TRUE;
-	    }
-	  }
-
-	  for (i=0;i<mainw->num_tracks;i++) {
-	    layers[i]=weed_plant_new(WEED_PLANT_CHANNEL);
-	    weed_set_int_value(layers[i],"clip",mainw->clip_index[i]);
-	    weed_set_int_value(layers[i],"frame",mainw->frame_index[i]);
-	    weed_set_int_value(layers[i],"current_palette",(mainw->clip_index[i]==-1||
-							    mainw->files[mainw->clip_index[i]]->img_type==
-							    IMG_TYPE_JPEG)?WEED_PALETTE_RGB24:WEED_PALETTE_RGBA32);
-
-	    if ((oclip=mainw->old_active_track_list[i])!=(nclip=mainw->active_track_list[i])) {
-	      // now using threading, we want to start pulling all pixel_data for all active layers here
-	      // however, we may have more than one copy of the same clip - in this case we want to create clones of the decoder plugin
-	      // this is to prevent constant seeking between different frames in the clip
-	      if (oclip>0) {
-		if (mainw->files[oclip]->clip_type==CLIP_TYPE_FILE) {
-		  if (mainw->track_decoders[i]!=(lives_decoder_t *)mainw->files[oclip]->ext_src) {
-		    // remove the clone for oclip
-		    close_decoder_plugin(mainw->track_decoders[i]);
-		  }
-		  mainw->track_decoders[i]=NULL;
-		}
-	      }
-
-	      if (nclip>0) {
-		if (mainw->files[nclip]->clip_type==CLIP_TYPE_FILE) {
-		  if (!mainw->ext_src_used[nclip]) {
-		    mainw->track_decoders[i]=(lives_decoder_t *)mainw->files[nclip]->ext_src;
-		    mainw->ext_src_used[nclip]=TRUE;
-		  }
-		  else {
-		    // add new clone for nclip
-		    mainw->track_decoders[i]=clone_decoder(nclip);
-		  }
-		}
-	      }
-	    }
-
-	    mainw->old_active_track_list[i]=mainw->active_track_list[i];
-
-	    if (nclip>0) {
-	      img_ext=get_image_ext_for_type(mainw->files[nclip]->img_type);
-	      // set alt src in layer
-	      weed_set_voidptr_value(layers[i],"host_decoder",(void *)mainw->track_decoders[i]);
-	      pull_frame_threaded(layers[i],img_ext,(weed_timecode_t)mainw->currticks);
-	    }
-	    else {
-	      weed_set_voidptr_value(layers[i],"pixel_data",NULL);
-	    }
-	  }
-	  layers[i]=NULL;
-
-	  mainw->frame_layer=weed_apply_effects(layers,mainw->filter_map,tc,opwidth,opheight,mainw->pchains);
-	  
-	  for (i=0;layers[i]!=NULL;i++) if (layers[i]!=mainw->frame_layer) {
-	      check_layer_ready(layers[i]);
-	      weed_plant_free(layers[i]);
-	    }
-	  g_free(layers);
-
-	}
-
-	if (mainw->internal_messaging) {
-	  // this happens if we are calling from multitrack, or apply rte.  We get our mainw->frame_layer and exit.
-	  mainw->noswitch=noswitch;
-	  if (framecount!=NULL) g_free(framecount);
-	  return;
-	}
-      }
-      else {
-	// normal playback in the clip editor, or applying a non-realtime effect
-	if (!mainw->preview||cfile->clip_type==CLIP_TYPE_FILE||g_file_test(fname_next,G_FILE_TEST_EXISTS)) {
-	  mainw->frame_layer=weed_plant_new(WEED_PLANT_CHANNEL);
-	  weed_set_int_value(mainw->frame_layer,"clip",mainw->current_file);
-	  weed_set_int_value(mainw->frame_layer,"frame",mainw->actual_frame);
-	  if (img_ext==NULL) img_ext=get_image_ext_for_type(cfile->img_type);
-
-	  if (mainw->preview&&mainw->frame_layer==NULL&&(mainw->event_list==NULL||cfile->opening)) {
-	    if (!pull_frame_at_size(mainw->frame_layer,img_ext,(weed_timecode_t)mainw->currticks,
-				    cfile->hsize,cfile->vsize,WEED_PALETTE_END)) {
-	      if (mainw->frame_layer!=NULL) weed_layer_free(mainw->frame_layer);
-	      mainw->frame_layer=NULL;
-
-	      if (cfile->opening && cfile->img_type==IMG_TYPE_PNG && sget_file_size(fname_next)==0) {
-		if (++bad_frame_count>BFC_LIMIT) {
-		  mainw->cancelled=check_for_bad_ffmpeg();
-		  bad_frame_count=0;
-		}
-		else g_usleep(prefs->sleep_time);
-	      }
-	    }
-	  }
-	  else {
-	    pull_frame_threaded(mainw->frame_layer,img_ext,(weed_timecode_t)mainw->currticks);
-	  }
-	}
-	if ((cfile->next_event==NULL&&mainw->is_rendering&&!mainw->switch_during_pb&&
-	     (mainw->multitrack==NULL||(!mainw->multitrack->is_rendering&&!mainw->is_generating)))||
-	    ((!mainw->is_rendering||(mainw->multitrack!=NULL&&mainw->multitrack->is_rendering))&&
-	     mainw->preview&&mainw->frame_layer==NULL)) {
-	  // preview ended
-	  if (!cfile->opening) mainw->cancelled=CANCEL_NO_MORE_PREVIEW;
-	  if (mainw->cancelled) {
-	    g_free(fname_next);
-	    g_free(info_file);
-	    mainw->noswitch=noswitch;
-	    if (framecount!=NULL) g_free(framecount);
-	    check_layer_ready(mainw->frame_layer);
-	    return;
-	  }
-	  gettimeofday(&tv, NULL);
-	  mainw->currticks=U_SECL*(tv.tv_sec-mainw->origsecs)+tv.tv_usec*U_SEC_RATIO-mainw->origusecs*U_SEC_RATIO;
-	  mainw->startticks=mainw->currticks+mainw->deltaticks;
-	}
-	  
-	img_ext=NULL;
-	
-	if (mainw->internal_messaging) {
-	  mainw->noswitch=noswitch;
-	  if (framecount!=NULL) g_free(framecount);
-	  check_layer_ready(mainw->frame_layer);
-	  return;
-	}
-	
-	if (mainw->frame_layer==NULL&&(!mainw->preview||(mainw->multitrack!=NULL&&!cfile->opening))) {
-	  mainw->noswitch=noswitch;
-	  if (framecount!=NULL) g_free(framecount);
-	  return;
-	}
-
-	if (mainw->preview&&mainw->frame_layer==NULL&&(mainw->event_list==NULL||cfile->opening)) {
-	  FILE *fd;
-	  // non-realtime effect preview
-	  // check effect to see if it finished yet
-	  if ((fd=fopen(info_file,"r"))) {
-	    clear_mainw_msg();
-	    do {
-	      retval=0;
-	      mainw->read_failed=FALSE;
-	      lives_fgets(mainw->msg,512,fd);
-	      if (mainw->read_failed) retval=do_read_failed_error_s_with_retry(info_file,NULL,NULL);
-	    } while (retval==LIVES_RETRY);
-	    fclose(fd);
-	    if (!strncmp(mainw->msg,"completed",9)||!strncmp(mainw->msg,"error",5)) {
-	      // effect completed whilst we were busy playing a preview
-	      if (mainw->preview_box!=NULL) lives_widget_set_tooltip_text( mainw->p_playbutton,_ ("Play"));
-	      lives_widget_set_tooltip_text( mainw->m_playbutton,_ ("Play"));
-	      if (cfile->opening&&!cfile->is_loaded) {
-		if (mainw->toy_type==LIVES_TOY_TV) {
-		  on_toy_activate(NULL,GINT_TO_POINTER(LIVES_TOY_NONE));
-		}
-	      }
-	      mainw->preview=FALSE;
-	    }
-	    else {
-	      g_usleep(prefs->sleep_time);
-	    }
-	  }
-	  else {
-	    g_usleep(prefs->sleep_time);
-	  }
-	  
-	  // or we reached the end of the preview
-	  if ((!cfile->opening&&frame>=(cfile->proc_ptr->frames_done-cfile->progress_start+cfile->start))||
-	      (cfile->opening&&(mainw->toy_type==LIVES_TOY_TV||!mainw->preview||mainw->effects_paused))) {
-	    if (mainw->toy_type==LIVES_TOY_TV) {
-	      // force a loop (set mainw->cancelled to 100 to play selection again)
-	      mainw->cancelled=CANCEL_KEEP_LOOPING;
-	    }
-	    else mainw->cancelled=CANCEL_NO_MORE_PREVIEW;
-	    g_free(info_file);
-	    g_free(fname_next);
-	    check_layer_ready(mainw->frame_layer);
-	    if (mainw->frame_layer!=NULL) weed_layer_free(mainw->frame_layer);
-	    mainw->frame_layer=NULL;
-	    mainw->noswitch=noswitch;
-	    if (framecount!=NULL) g_free(framecount);
-	    return;
-	  }
-	  else if (mainw->preview||cfile->opening) lives_widget_context_update();
-	}
+        if (mainw->preview&&mainw->frame_layer==NULL&&(mainw->event_list==NULL||cfile->opening)) {
+          FILE *fd;
+          // non-realtime effect preview
+          // check effect to see if it finished yet
+          if ((fd=fopen(info_file,"r"))) {
+            clear_mainw_msg();
+            do {
+              retval=0;
+              mainw->read_failed=FALSE;
+              lives_fgets(mainw->msg,512,fd);
+              if (mainw->read_failed) retval=do_read_failed_error_s_with_retry(info_file,NULL,NULL);
+            } while (retval==LIVES_RESPONSE_RETRY);
+            fclose(fd);
+            if (!strncmp(mainw->msg,"completed",9)||!strncmp(mainw->msg,"error",5)) {
+              // effect completed whilst we were busy playing a preview
+              if (mainw->preview_box!=NULL) lives_widget_set_tooltip_text(mainw->p_playbutton,_("Play"));
+              lives_widget_set_tooltip_text(mainw->m_playbutton,_("Play"));
+              if (cfile->opening&&!cfile->is_loaded) {
+                if (mainw->toy_type==LIVES_TOY_TV) {
+                  on_toy_activate(NULL,LIVES_INT_TO_POINTER(LIVES_TOY_NONE));
+                }
+              }
+              mainw->preview=FALSE;
+            } else {
+              lives_usleep(prefs->sleep_time);
+            }
+          } else {
+            lives_usleep(prefs->sleep_time);
+          }
+
+          // or we reached the end of the preview
+          if ((!cfile->opening&&frame>=(cfile->proc_ptr->frames_done-cfile->progress_start+cfile->start))||
+              (cfile->opening&&(mainw->toy_type==LIVES_TOY_TV||!mainw->preview||mainw->effects_paused))) {
+            if (mainw->toy_type==LIVES_TOY_TV) {
+              // force a loop (set mainw->cancelled to 100 to play selection again)
+              mainw->cancelled=CANCEL_KEEP_LOOPING;
+            } else mainw->cancelled=CANCEL_NO_MORE_PREVIEW;
+            lives_free(info_file);
+            lives_free(fname_next);
+            check_layer_ready(mainw->frame_layer);
+            if (mainw->frame_layer!=NULL) weed_layer_free(mainw->frame_layer);
+            mainw->frame_layer=NULL;
+            mainw->noswitch=noswitch;
+            if (framecount!=NULL) lives_free(framecount);
+            return;
+          } else if (mainw->preview||cfile->opening) lives_widget_context_update();
+        }
       }
     } while (mainw->frame_layer==NULL&&mainw->cancelled==CANCEL_NONE&&cfile->clip_type==CLIP_TYPE_DISK);
 
-    
+
     // from this point onwards we don't need to keep mainw->frame_layer around when we return
 
-    if (G_UNLIKELY((mainw->frame_layer==NULL)||mainw->cancelled>0)) {
+    if (LIVES_UNLIKELY((mainw->frame_layer==NULL)||mainw->cancelled>0)) {
 
       check_layer_ready(mainw->frame_layer);
 
       if (mainw->frame_layer!=NULL) weed_layer_free(mainw->frame_layer);
       mainw->frame_layer=NULL;
       mainw->noswitch=noswitch;
-      if (framecount!=NULL) g_free(framecount);
+      if (framecount!=NULL) lives_free(framecount);
       return;
     }
 
     if (was_preview) {
-      g_free(fname_next);
-      g_free(info_file);
+      lives_free(fname_next);
+      lives_free(info_file);
     }
 
     if (prefs->show_player_stats) {
@@ -5460,37 +5558,35 @@
     // OK. Here is the deal now. We have a layer from the current file, current frame.
     // (or at least we sent out a thread to fetch it).
     // We will pass this into the effects, and we will get back a layer.
-    // The palette of the effected layer could be any Weed palette. 
+    // The palette of the effected layer could be any Weed palette.
     // We will pass the layer to all playback plugins.
-    // Finally we may want to end up with a GkdPixbuf (unless the playback plugin is VPP_DISPLAY_LOCAL 
+    // Finally we may want to end up with a GkdPixbuf (unless the playback plugin is VPP_DISPLAY_LOCAL
     // and we are in full screen mode).
 
     if ((mainw->current_file!=mainw->scrap_file||mainw->multitrack!=NULL)&&
-	!(mainw->is_rendering&&!(cfile->proc_ptr!=NULL&&mainw->preview))&&!(mainw->multitrack!=NULL&&cfile->opening)) {
+        !(mainw->is_rendering&&!(cfile->proc_ptr!=NULL&&mainw->preview))&&!(mainw->multitrack!=NULL&&cfile->opening)) {
       boolean size_ok=FALSE;
       if (is_virtual_frame(mainw->current_file,mainw->actual_frame)||(cfile->clip_type!=CLIP_TYPE_DISK&&cfile->clip_type!=CLIP_TYPE_FILE)) {
-	size_ok=TRUE;
-      }
-      else {
-	check_layer_ready(mainw->frame_layer);
-	if ((weed_get_int_value(mainw->frame_layer,"height",&weed_error)==cfile->vsize)&&
-	    (weed_get_int_value(mainw->frame_layer,"width",&weed_error)*
-	     weed_palette_get_pixels_per_macropixel(weed_layer_get_palette(mainw->frame_layer)))==cfile->hsize) {
-	  size_ok=TRUE;
-	}
+        size_ok=TRUE;
+      } else {
+        check_layer_ready(mainw->frame_layer);
+        if ((weed_get_int_value(mainw->frame_layer,"height",&weed_error)==cfile->vsize)&&
+            (weed_get_int_value(mainw->frame_layer,"width",&weed_error)*
+             weed_palette_get_pixels_per_macropixel(weed_layer_get_palette(mainw->frame_layer)))==cfile->hsize) {
+          size_ok=TRUE;
+        }
       }
       if (size_ok) {
-	if ((mainw->rte!=0||mainw->is_rendering)&&(mainw->current_file!=mainw->scrap_file||mainw->multitrack!=NULL)) {
+        if ((mainw->rte!=0||mainw->is_rendering)&&(mainw->current_file!=mainw->scrap_file||mainw->multitrack!=NULL)) {
 
-	  mainw->frame_layer=on_rte_apply (mainw->frame_layer, opwidth, opheight, (weed_timecode_t)mainw->currticks);
+          mainw->frame_layer=on_rte_apply(mainw->frame_layer, opwidth, opheight, (weed_timecode_t)mainw->currticks);
 
-	}
-      }
-      else {
-	if (!mainw->resizing&&!cfile->opening) {
-	  // warn the user after playback that badly sized frames were found
-	  mainw->size_warn=TRUE;
-	}
+        }
+      } else {
+        if (!mainw->resizing&&!cfile->opening) {
+          // warn the user after playback that badly sized frames were found
+          mainw->size_warn=TRUE;
+        }
       }
     }
 
@@ -5501,7 +5597,7 @@
       boolean timeout;
       int alarm_handle=lives_alarm_set(LIVES_ACONNECT_TIMEOUT);
       while (!(timeout=lives_alarm_get(alarm_handle))&&jack_get_msgq(mainw->jackd)!=NULL) {
-	sched_yield(); // wait for seek
+        sched_yield(); // wait for seek
       }
       if (timeout) jack_try_reconnect();
 
@@ -5513,7 +5609,7 @@
       boolean timeout;
       int alarm_handle=lives_alarm_set(LIVES_ACONNECT_TIMEOUT);
       while (!(timeout=lives_alarm_get(alarm_handle))&&pulse_get_msgq(mainw->pulsed)!=NULL) {
-	sched_yield(); // wait for seek
+        sched_yield(); // wait for seek
       }
 
       if (timeout) pulse_try_reconnect();
@@ -5525,37 +5621,36 @@
 
     // save to scrap_file now if we have to
     if (mainw->record&&!rec_after_pb&&!mainw->record_paused&&(prefs->rec_opts&REC_EFFECTS)&&
-	((cfile->clip_type!=CLIP_TYPE_DISK&&cfile->clip_type!=CLIP_TYPE_FILE)||
-	 (mainw->blend_file!=-1&&mainw->files[mainw->blend_file]!=NULL&&
-	  mainw->files[mainw->blend_file]->clip_type!=CLIP_TYPE_DISK&&
-	  mainw->files[mainw->blend_file]->clip_type!=CLIP_TYPE_FILE))) {
+        ((cfile->clip_type!=CLIP_TYPE_DISK&&cfile->clip_type!=CLIP_TYPE_FILE)||
+         (mainw->blend_file!=-1&&mainw->files[mainw->blend_file]!=NULL&&
+          mainw->files[mainw->blend_file]->clip_type!=CLIP_TYPE_DISK&&
+          mainw->files[mainw->blend_file]->clip_type!=CLIP_TYPE_FILE))) {
       if (!rec_after_pb) {
-	check_layer_ready(mainw->frame_layer);
-	save_to_scrap_file (mainw->frame_layer);
+        check_layer_ready(mainw->frame_layer);
+        save_to_scrap_file(mainw->frame_layer);
       }
       get_max_opsize(&opwidth,&opheight);
     }
- 
+
     if (mainw->playing_file>-1&&prefs->letterbox&&mainw->fs&&
-	(mainw->multitrack==NULL||mainw->sep_win)&&
-	(!mainw->ext_playback||(mainw->vpp->capabilities&VPP_LOCAL_DISPLAY))) {
+        (mainw->multitrack==NULL||mainw->sep_win)&&
+        (!mainw->ext_playback||(mainw->vpp->capabilities&VPP_LOCAL_DISPLAY))) {
       // consider letterboxing
       lb_width=cfile->hsize;
       lb_height=cfile->vsize;
 
       if (mainw->multitrack==NULL&&mainw->is_rendering&&
-	  !(cfile->proc_ptr!=NULL&&mainw->preview)&&mainw->clip_index[0]>-1) {
-	if (mainw->clip_index[0]==mainw->scrap_file&&mainw->num_tracks==1) {
-	  // scrap file playback - use original clip size
-	  check_layer_ready(mainw->frame_layer);
-	  lb_width=weed_get_int_value(mainw->frame_layer,"width",&weed_error);
-	  lb_height=weed_get_int_value(mainw->frame_layer,"height",&weed_error);
-	}
-	else {
-	  // playing from event list, use original clip size
-	  lb_width=mainw->files[mainw->clip_index[0]]->hsize;
-	  lb_height=mainw->files[mainw->clip_index[0]]->vsize;
-	}
+          !(cfile->proc_ptr!=NULL&&mainw->preview)&&mainw->clip_index[0]>-1) {
+        if (mainw->clip_index[0]==mainw->scrap_file&&mainw->num_tracks==1) {
+          // scrap file playback - use original clip size
+          check_layer_ready(mainw->frame_layer);
+          lb_width=weed_get_int_value(mainw->frame_layer,"width",&weed_error);
+          lb_height=weed_get_int_value(mainw->frame_layer,"height",&weed_error);
+        } else {
+          // playing from event list, use original clip size
+          lb_width=mainw->files[mainw->clip_index[0]]->hsize;
+          lb_height=mainw->files[mainw->clip_index[0]]->vsize;
+        }
       }
 
       // calc inner frame size
@@ -5566,9 +5661,9 @@
     if (mainw->ext_playback&&(mainw->vpp->capabilities&VPP_CAN_RESIZE)&&lb_width==0) {
 
       // here we are outputting video through a video playback plugin which can resize: thus we just send whatever we have
-      // we need only to convert the palette to whatever was agreed with the plugin when we called set_palette() 
+      // we need only to convert the palette to whatever was agreed with the plugin when we called set_palette()
       // in plugins.c
-      // 
+      //
       // if we want letterboxing we do this ourselves, later in code
 
 
@@ -5579,18 +5674,17 @@
 
       layer_palette=weed_layer_get_palette(mainw->frame_layer);
 
-      if (!(mainw->vpp->capabilities&VPP_LOCAL_DISPLAY) && 
-	  ((weed_palette_is_rgb_palette(layer_palette) && 
-	    !(weed_palette_is_rgb_palette(mainw->vpp->palette))) || 
-	(weed_palette_is_lower_quality(mainw->vpp->palette,layer_palette)))) {
-	// mainw->frame_layer is RGB and so is our screen, but plugin is YUV
-	// so copy layer and convert, retaining original
-	frame_layer=weed_layer_copy(NULL,mainw->frame_layer);
-      }
-      else frame_layer=mainw->frame_layer;
+      if (!(mainw->vpp->capabilities&VPP_LOCAL_DISPLAY) &&
+          ((weed_palette_is_rgb_palette(layer_palette) &&
+            !(weed_palette_is_rgb_palette(mainw->vpp->palette))) ||
+           (weed_palette_is_lower_quality(mainw->vpp->palette,layer_palette)))) {
+        // mainw->frame_layer is RGB and so is our screen, but plugin is YUV
+        // so copy layer and convert, retaining original
+        frame_layer=weed_layer_copy(NULL,mainw->frame_layer);
+      } else frame_layer=mainw->frame_layer;
 
       convert_layer_palette(frame_layer,mainw->vpp->palette,mainw->vpp->YUV_clamping);
-      
+
       // vid plugin expects compacted rowstrides (i.e. no padding/alignment after pixel row)
       compact_rowstrides(frame_layer);
 
@@ -5599,124 +5693,118 @@
       if (mainw->stream_ticks==-1) mainw->stream_ticks=(mainw->currticks);
 
       if (rec_after_pb) {
-	// record output from playback plugin
-	int retwidth=mainw->pwidth/weed_palette_get_pixels_per_macropixel(mainw->vpp->palette);
-	int retheight=mainw->pheight;
-
-	return_layer=weed_layer_new(retwidth,retheight,NULL,mainw->vpp->palette);
-
-	if (weed_palette_is_yuv_palette(mainw->vpp->palette)) {
-	  weed_set_int_value(return_layer,"YUV_clamping",mainw->vpp->YUV_clamping);
-	  weed_set_int_value(return_layer,"YUV_subspace",mainw->vpp->YUV_subspace);
-	  weed_set_int_value(return_layer,"YUV_sampling",mainw->vpp->YUV_sampling);
-	}
+        // record output from playback plugin
+        int retwidth=mainw->pwidth/weed_palette_get_pixels_per_macropixel(mainw->vpp->palette);
+        int retheight=mainw->pheight;
+
+        return_layer=weed_layer_new(retwidth,retheight,NULL,mainw->vpp->palette);
+
+        if (weed_palette_is_yuv_palette(mainw->vpp->palette)) {
+          weed_set_int_value(return_layer,"YUV_clamping",mainw->vpp->YUV_clamping);
+          weed_set_int_value(return_layer,"YUV_subspace",mainw->vpp->YUV_subspace);
+          weed_set_int_value(return_layer,"YUV_sampling",mainw->vpp->YUV_sampling);
+        }
 
-	create_empty_pixel_data(return_layer,FALSE,TRUE);
+        create_empty_pixel_data(return_layer,FALSE,TRUE);
 
-	// vid plugin expects compacted rowstrides (i.e. no padding/alignment after pixel row)
-	compact_rowstrides(return_layer);
+        // vid plugin expects compacted rowstrides (i.e. no padding/alignment after pixel row)
+        compact_rowstrides(return_layer);
 
-	retdata=weed_get_voidptr_array(return_layer,"pixel_data",&weed_error);
+        retdata=weed_get_voidptr_array(return_layer,"pixel_data",&weed_error);
 
       }
 
       // chain any data to the playback plugin
       if (!(mainw->preview||mainw->is_rendering)) {
-	// chain any data pipelines
-	if (mainw->pconx!=NULL) {
-	  pconx_chain_data(-2,0);
-	}
-	if (mainw->cconx!=NULL) cconx_chain_data(-2,0);
+        // chain any data pipelines
+        if (mainw->pconx!=NULL) {
+          pconx_chain_data(-2,0);
+        }
+        if (mainw->cconx!=NULL) cconx_chain_data(-2,0);
       }
 
       if (!(*mainw->vpp->render_frame)(weed_get_int_value(frame_layer,"width",&weed_error),
-				       weed_get_int_value(mainw->frame_layer,"height",&weed_error),
-				       mainw->currticks-mainw->stream_ticks,pd_array,retdata,mainw->vpp->play_params)) {
-	vid_playback_plugin_exit();
-	if (return_layer!=NULL) weed_layer_free(return_layer);
-	weed_free(retdata);
-	return_layer=NULL;
+                                       weed_get_int_value(mainw->frame_layer,"height",&weed_error),
+                                       mainw->currticks-mainw->stream_ticks,pd_array,retdata,mainw->vpp->play_params)) {
+        vid_playback_plugin_exit();
+        if (return_layer!=NULL) weed_layer_free(return_layer);
+        lives_free(retdata);
+        return_layer=NULL;
       }
-      weed_free(pd_array);
+      lives_free(pd_array);
 
       if (frame_layer!=mainw->frame_layer) {
-	weed_layer_free(frame_layer);
+        weed_layer_free(frame_layer);
       }
 
       if (return_layer!=NULL) {
-	int width=MIN(weed_get_int_value(frame_layer,"width",&weed_error),
-		      weed_get_int_value(return_layer,"width",&weed_error));
-	int height=MIN(weed_get_int_value(mainw->frame_layer,"height",&weed_error),
-		       weed_get_int_value(return_layer,"height",&weed_error));
-	resize_layer(return_layer,width,height,LIVES_INTERP_FAST,WEED_PALETTE_END,0); 
-
-	save_to_scrap_file (return_layer);
-	weed_layer_free(return_layer);
-	weed_free(retdata);
-	return_layer=NULL;
-      }
-
-      if (mainw->vpp->capabilities&VPP_LOCAL_DISPLAY) {      
-	if (mainw->frame_layer!=NULL) weed_layer_free(mainw->frame_layer);
-	mainw->frame_layer=NULL;
-	mainw->noswitch=noswitch;
-	
-	if (!mainw->faded&&(!mainw->fs||prefs->gui_monitor!=prefs->play_monitor)&&
-	    mainw->current_file!=mainw->scrap_file) get_play_times();
-	if (mainw->multitrack!=NULL&&!cfile->opening) animate_multitrack(mainw->multitrack);
-	if (framecount!=NULL) g_free(framecount);
-	
-#ifdef ENABLE_OSC
-	// format is now msg|timecode|fgclip|fgframe|fgfps|
-	lives_osc_notify(LIVES_OSC_NOTIFY_FRAME_SYNCH,(const gchar *)
-			 (tmp=g_strdup_printf("%.8f|%d|%d|%.3f|",(double)mainw->currticks/U_SEC,
-					      mainw->current_file,mainw->actual_frame,cfile->pb_fps)));
-	g_free(tmp);
-#endif
-	
-	return;
+        int width=MIN(weed_get_int_value(frame_layer,"width",&weed_error),
+                      weed_get_int_value(return_layer,"width",&weed_error));
+        int height=MIN(weed_get_int_value(mainw->frame_layer,"height",&weed_error),
+                       weed_get_int_value(return_layer,"height",&weed_error));
+        resize_layer(return_layer,width,height,LIVES_INTERP_FAST,WEED_PALETTE_END,0);
+
+        save_to_scrap_file(return_layer);
+        weed_layer_free(return_layer);
+        lives_free(retdata);
+        return_layer=NULL;
+      }
+
+      if (mainw->vpp->capabilities&VPP_LOCAL_DISPLAY) {
+        if (mainw->frame_layer!=NULL) weed_layer_free(mainw->frame_layer);
+        mainw->frame_layer=NULL;
+        mainw->noswitch=noswitch;
+
+        if (!mainw->faded&&(!mainw->fs||prefs->gui_monitor!=prefs->play_monitor)&&
+            mainw->current_file!=mainw->scrap_file) get_play_times();
+        if (mainw->multitrack!=NULL&&!cfile->opening) animate_multitrack(mainw->multitrack);
+        if (framecount!=NULL) lives_free(framecount);
+
+        // format is now msg|timecode|fgclip|fgframe|fgfps|
+        lives_notify(LIVES_OSC_NOTIFY_FRAME_SYNCH,(const char *)
+                     (tmp=lives_strdup_printf("%.8f|%d|%d|%.3f|",(double)mainw->currticks/U_SEC,
+                                              mainw->current_file,mainw->actual_frame,cfile->pb_fps)));
+        lives_free(tmp);
+
+        return;
       }
 
     }
 
     if ((mainw->multitrack==NULL&&mainw->double_size&&(!prefs->ce_maxspect||mainw->sep_win))||
-	(mainw->fs&&(!mainw->ext_playback||!(mainw->vpp->capabilities&VPP_CAN_RESIZE)))||
-	(mainw->must_resize&&((mainw->multitrack==NULL&&mainw->sep_win)||
-			      (mainw->multitrack!=NULL&&!mainw->sep_win)))) {
+        (mainw->fs&&(!mainw->ext_playback||!(mainw->vpp->capabilities&VPP_CAN_RESIZE)))||
+        (mainw->must_resize&&((mainw->multitrack==NULL&&mainw->sep_win)||
+                              (mainw->multitrack!=NULL&&!mainw->sep_win)))) {
       if (!mainw->ext_playback||(mainw->pwidth!=mainw->vpp->fwidth||mainw->pheight!=mainw->vpp->fheight)) {
-	if (mainw->multitrack!=NULL) {
-	  if (!mainw->fs||mainw->play_window==NULL) {
-	    if (mainw->play_window==NULL) {
-	      mainw->pwidth=mainw->files[mainw->multitrack->render_file]->hsize;
-	      mainw->pheight=mainw->files[mainw->multitrack->render_file]->vsize;
-	      calc_maxspect(mainw->multitrack->play_width,mainw->multitrack->play_height,&mainw->pwidth,&mainw->pheight);
-	    }
-	    else {
-	      mainw->pwidth=cfile->hsize;
-	      mainw->pheight=cfile->vsize;
-	    }
-	  }
-	  else {
-	    if (prefs->play_monitor==0) {
-	      mainw->pwidth=mainw->scr_width;
-	      mainw->pheight=mainw->scr_height;
-	      if (capable->nmonitors>1) {
-		// spread over all monitors
-		mainw->pwidth=gdk_screen_get_width(mainw->mgeom[0].screen);
-		mainw->pheight=gdk_screen_get_height(mainw->mgeom[0].screen);
-	      }
-	    }
-	    else {
-	      if (mainw->play_window!=NULL) pmonitor=prefs->play_monitor;
-	      else pmonitor=prefs->gui_monitor;
-	      mainw->pwidth=mainw->mgeom[pmonitor-1].width;
-	      mainw->pheight=mainw->mgeom[pmonitor-1].height;
-	    }
-	  }
-	}
+        if (mainw->multitrack!=NULL) {
+          if (!mainw->fs||mainw->play_window==NULL) {
+            if (mainw->play_window==NULL) {
+              mainw->pwidth=mainw->files[mainw->multitrack->render_file]->hsize;
+              mainw->pheight=mainw->files[mainw->multitrack->render_file]->vsize;
+              calc_maxspect(mainw->multitrack->play_width,mainw->multitrack->play_height,&mainw->pwidth,&mainw->pheight);
+            } else {
+              mainw->pwidth=cfile->hsize;
+              mainw->pheight=cfile->vsize;
+            }
+          } else {
+            if (prefs->play_monitor==0) {
+              mainw->pwidth=mainw->scr_width;
+              mainw->pheight=mainw->scr_height;
+              if (capable->nmonitors>1) {
+                // spread over all monitors
+                mainw->pwidth=lives_screen_get_width(mainw->mgeom[0].screen);
+                mainw->pheight=lives_screen_get_height(mainw->mgeom[0].screen);
+              }
+            } else {
+              if (mainw->play_window!=NULL) pmonitor=prefs->play_monitor;
+              else pmonitor=prefs->gui_monitor;
+              mainw->pwidth=mainw->mgeom[pmonitor-1].width;
+              mainw->pheight=mainw->mgeom[pmonitor-1].height;
+            }
+          }
+        }
       }
-    }
-    else {
+    } else {
 
       boolean size_ok=FALSE;
 
@@ -5724,56 +5812,55 @@
 
       mainw->pwidth=cfile->hsize;
       mainw->pheight=cfile->vsize;
-   
+
       if (!mainw->is_rendering) {
-	do {
-	  if (pmonitor==0) {
-	    if (mainw->pwidth>mainw->scr_width-SCR_WIDTH_SAFETY||
-		mainw->pheight>mainw->scr_height-SCR_HEIGHT_SAFETY) { 
-	      mainw->pheight=(mainw->pheight>>2)<<1;
-	      mainw->pwidth=(mainw->pwidth>>2)<<1;
-	      mainw->sepwin_scale/=2.;
-	    }
-	    else size_ok=TRUE;
-	  }
-	  else {
-	    if (mainw->pwidth>mainw->mgeom[pmonitor-1].width-SCR_WIDTH_SAFETY||
-		mainw->pheight>mainw->mgeom[pmonitor-1].height-SCR_HEIGHT_SAFETY) {
-	      mainw->pheight=(mainw->pheight>>2)<<1;
-	      mainw->pwidth=(mainw->pwidth>>2)<<1;
-	      mainw->sepwin_scale/=2.;
-	    }
-	    else size_ok=TRUE;
-	  }
-	} while (!size_ok);
+        do {
+          if (pmonitor==0) {
+            if (mainw->pwidth>mainw->scr_width-SCR_WIDTH_SAFETY||
+                mainw->pheight>mainw->scr_height-SCR_HEIGHT_SAFETY) {
+              mainw->pheight=(mainw->pheight>>2)<<1;
+              mainw->pwidth=(mainw->pwidth>>2)<<1;
+              mainw->sepwin_scale/=2.;
+            } else size_ok=TRUE;
+          } else {
+            if (mainw->pwidth>mainw->mgeom[pmonitor-1].width-SCR_WIDTH_SAFETY||
+                mainw->pheight>mainw->mgeom[pmonitor-1].height-SCR_HEIGHT_SAFETY) {
+              mainw->pheight=(mainw->pheight>>2)<<1;
+              mainw->pwidth=(mainw->pwidth>>2)<<1;
+              mainw->sepwin_scale/=2.;
+            } else size_ok=TRUE;
+          }
+        } while (!size_ok);
       }
 
-       if (mainw->multitrack==NULL&&mainw->play_window==NULL&&prefs->ce_maxspect) {
+      if (mainw->multitrack==NULL&&mainw->play_window==NULL&&prefs->ce_maxspect) {
 #if GTK_CHECK_VERSION(3,0,0)
-	int rwidth=mainw->ce_frame_width-H_RESIZE_ADJUST*2;
-	int rheight=mainw->ce_frame_height-V_RESIZE_ADJUST*2;
-	if (mainw->double_size) {
-	  rwidth*=4;
-	  rheight*=4;
-	}
-#else
-	int rwidth=lives_widget_get_allocation_width(mainw->play_image);
-	int rheight=lives_widget_get_allocation_height(mainw->play_image);
-#endif
-	if (mainw->double_size) {
-	  mainw->pwidth=(mainw->pwidth-H_RESIZE_ADJUST)*4+H_RESIZE_ADJUST;
-	  mainw->pheight=(mainw->pheight-V_RESIZE_ADJUST)*4+H_RESIZE_ADJUST;
-
-	  if (mainw->pwidth<2) mainw->pwidth=weed_get_int_value(mainw->frame_layer,"width",&weed_error);
-	  if (mainw->pheight<2) mainw->pheight=weed_get_int_value(mainw->frame_layer,"height",&weed_error);
+        int rwidth=mainw->ce_frame_width-H_RESIZE_ADJUST*2;
+        int rheight=mainw->ce_frame_height-V_RESIZE_ADJUST*2;
+
+        if (mainw->double_size) {
+          rwidth*=4;
+          rheight*=4;
+        }
+#else
+        int rwidth=lives_widget_get_allocation_width(mainw->play_image);
+        int rheight=lives_widget_get_allocation_height(mainw->play_image);
+#endif
+        if (mainw->double_size) {
+          mainw->pwidth=(mainw->pwidth-H_RESIZE_ADJUST)*4+H_RESIZE_ADJUST;
+          mainw->pheight=(mainw->pheight-V_RESIZE_ADJUST)*4+H_RESIZE_ADJUST;
+
+          if (mainw->pwidth<2) mainw->pwidth=weed_get_int_value(mainw->frame_layer,"width",&weed_error);
+          if (mainw->pheight<2) mainw->pheight=weed_get_int_value(mainw->frame_layer,"height",&weed_error);
 
-	}
-	calc_maxspect(rwidth,rheight,&mainw->pwidth,&mainw->pheight);
+        }
+
+        calc_maxspect(rwidth,rheight,&mainw->pwidth,&mainw->pheight);
 
-	check_layer_ready(mainw->frame_layer);
+        check_layer_ready(mainw->frame_layer);
 
-	if (mainw->pwidth<2) mainw->pwidth=weed_get_int_value(mainw->frame_layer,"width",&weed_error);
-	if (mainw->pheight<2) mainw->pheight=weed_get_int_value(mainw->frame_layer,"height",&weed_error);
+        if (mainw->pwidth<2) mainw->pwidth=weed_get_int_value(mainw->frame_layer,"width",&weed_error);
+        if (mainw->pheight<2) mainw->pheight=weed_get_int_value(mainw->frame_layer,"height",&weed_error);
       }
 
     }
@@ -5783,7 +5870,7 @@
       // we must resize to whatever width and height we set when we called init_screen() in the plugin
       // i.e. mainw->vpp->fwidth, mainw->vpp fheight
 
-      // both dimensions are in RGB(A) pixels, so we must adjust here and send 
+      // both dimensions are in RGB(A) pixels, so we must adjust here and send
       // macropixel size in the plugin's render_frame()
 
       // - this is also used if we are letterboxing to fullscreen with an external plugin
@@ -5797,69 +5884,68 @@
 
       interp=get_interp_value(prefs->pb_quality);
 
-      if (!(mainw->vpp->capabilities&VPP_LOCAL_DISPLAY) && mainw->vpp->fwidth>0 && mainw->vpp->fheight>0 && 
-	  ((mainw->vpp->fwidth/weed_palette_get_pixels_per_macropixel(layer_palette)<
-	   mainw->pwidth) || 
-	  (mainw->vpp->fheight/weed_palette_get_pixels_per_macropixel(layer_palette)<
-	   mainw->pheight))) {
-	// mainw->frame_layer will be downsized for the plugin but upsized for screen
-	// so copy layer and convert, retaining original
-	frame_layer=weed_layer_copy(NULL,mainw->frame_layer);
-      }
-      else frame_layer=mainw->frame_layer;
-
-      if (frame_layer==mainw->frame_layer && !(mainw->vpp->capabilities&VPP_LOCAL_DISPLAY) && 
-	  ((weed_palette_is_rgb_palette(layer_palette) && 
-	  !(weed_palette_is_rgb_palette(mainw->vpp->palette))) || 
-	(weed_palette_is_lower_quality(mainw->vpp->palette,layer_palette)))) {
-	// mainw->frame_layer is RGB and so is our screen, but plugin is YUV
-	// so copy layer and convert, retaining original
-	frame_layer=weed_layer_copy(NULL,mainw->frame_layer);
+      if (!(mainw->vpp->capabilities&VPP_LOCAL_DISPLAY) && mainw->vpp->fwidth>0 && mainw->vpp->fheight>0 &&
+          ((mainw->vpp->fwidth/weed_palette_get_pixels_per_macropixel(layer_palette)<
+            mainw->pwidth) ||
+           (mainw->vpp->fheight/weed_palette_get_pixels_per_macropixel(layer_palette)<
+            mainw->pheight))) {
+        // mainw->frame_layer will be downsized for the plugin but upsized for screen
+        // so copy layer and convert, retaining original
+        frame_layer=weed_layer_copy(NULL,mainw->frame_layer);
+      } else frame_layer=mainw->frame_layer;
+
+      if (frame_layer==mainw->frame_layer && !(mainw->vpp->capabilities&VPP_LOCAL_DISPLAY) &&
+          ((weed_palette_is_rgb_palette(layer_palette) &&
+            !(weed_palette_is_rgb_palette(mainw->vpp->palette))) ||
+           (weed_palette_is_lower_quality(mainw->vpp->palette,layer_palette)))) {
+        // mainw->frame_layer is RGB and so is our screen, but plugin is YUV
+        // so copy layer and convert, retaining original
+        frame_layer=weed_layer_copy(NULL,mainw->frame_layer);
       }
 
       if ((mainw->vpp->fwidth>0&&mainw->vpp->fheight>0)&&lb_width==0) {
-	resize_layer(frame_layer,mainw->vpp->fwidth/weed_palette_get_pixels_per_macropixel(layer_palette),
-		     mainw->vpp->fheight,interp,mainw->vpp->palette,mainw->vpp->YUV_clamping);
+        resize_layer(frame_layer,mainw->vpp->fwidth/weed_palette_get_pixels_per_macropixel(layer_palette),
+                     mainw->vpp->fheight,interp,mainw->vpp->palette,mainw->vpp->YUV_clamping);
       }
 
       // resize_layer can change palette
       layer_palette=weed_get_int_value(frame_layer,"current_palette",&weed_error);
-    
-      if (frame_layer==mainw->frame_layer && !(mainw->vpp->capabilities&VPP_LOCAL_DISPLAY) && 
-	  ((weed_palette_is_rgb_palette(layer_palette) && 
-	  !(weed_palette_is_rgb_palette(mainw->vpp->palette))) || 
-	(weed_palette_is_lower_quality(mainw->vpp->palette,layer_palette)))) {
-	// mainw->frame_layer is RGB and so is our screen, but plugin is YUV
-	// so copy layer and convert, retaining original
-	frame_layer=weed_layer_copy(NULL,mainw->frame_layer);
+
+      if (frame_layer==mainw->frame_layer && !(mainw->vpp->capabilities&VPP_LOCAL_DISPLAY) &&
+          ((weed_palette_is_rgb_palette(layer_palette) &&
+            !(weed_palette_is_rgb_palette(mainw->vpp->palette))) ||
+           (weed_palette_is_lower_quality(mainw->vpp->palette,layer_palette)))) {
+        // mainw->frame_layer is RGB and so is our screen, but plugin is YUV
+        // so copy layer and convert, retaining original
+        frame_layer=weed_layer_copy(NULL,mainw->frame_layer);
       }
 
       pwidth=weed_get_int_value(frame_layer,"width",&weed_error)*
-	weed_palette_get_pixels_per_macropixel(layer_palette);
+             weed_palette_get_pixels_per_macropixel(layer_palette);
       pheight=weed_get_int_value(frame_layer,"height",&weed_error);
 
       if (mainw->fs&&(mainw->vpp->capabilities&VPP_LOCAL_DISPLAY)) {
-	mainw->vpp->fwidth=mainw->scr_width;
-	mainw->vpp->fheight=mainw->scr_height;
+        mainw->vpp->fwidth=mainw->scr_width;
+        mainw->vpp->fheight=mainw->scr_height;
       }
 
       convert_layer_palette(frame_layer,mainw->vpp->palette,mainw->vpp->YUV_clamping);
 
       if (mainw->vpp->fwidth!=pwidth||mainw->vpp->fheight!=pheight||lb_width!=0) {
 
-	if (lb_width==0) {
-	  lb_width=pwidth;
-	  lb_height=pheight;
-
-	  calc_maxspect(mainw->vpp->fwidth,mainw->vpp->fheight,&lb_width,&lb_height);
-	}
+        if (lb_width==0) {
+          lb_width=pwidth;
+          lb_height=pheight;
+
+          calc_maxspect(mainw->vpp->fwidth,mainw->vpp->fheight,&lb_width,&lb_height);
+        }
 
 
-	letterbox_layer(frame_layer,lb_width/
-			weed_palette_get_pixels_per_macropixel(mainw->vpp->palette),
-			lb_height,mainw->vpp->fwidth/
-			weed_palette_get_pixels_per_macropixel(mainw->vpp->palette),
-			mainw->vpp->fheight);
+        letterbox_layer(frame_layer,lb_width/
+                        weed_palette_get_pixels_per_macropixel(mainw->vpp->palette),
+                        lb_height,mainw->vpp->fwidth/
+                        weed_palette_get_pixels_per_macropixel(mainw->vpp->palette),
+                        mainw->vpp->fheight);
 
       }
 
@@ -5869,89 +5955,87 @@
       compact_rowstrides(frame_layer);
 
       if (rec_after_pb) {
-	// record output from playback plugin
-	int retwidth=mainw->pwidth/weed_palette_get_pixels_per_macropixel(mainw->vpp->palette);
-	int retheight=mainw->pheight;
-	
-	return_layer=weed_layer_new(retwidth,retheight,NULL,mainw->vpp->palette);
-
-	if (weed_palette_is_yuv_palette(mainw->vpp->palette)) {
-	  weed_set_int_value(return_layer,"YUV_clamping",mainw->vpp->YUV_clamping);
-	  weed_set_int_value(return_layer,"YUV_subspace",mainw->vpp->YUV_subspace);
-	  weed_set_int_value(return_layer,"YUV_sampling",mainw->vpp->YUV_sampling);
-	}
+        // record output from playback plugin
+        int retwidth=mainw->pwidth/weed_palette_get_pixels_per_macropixel(mainw->vpp->palette);
+        int retheight=mainw->pheight;
+
+        return_layer=weed_layer_new(retwidth,retheight,NULL,mainw->vpp->palette);
+
+        if (weed_palette_is_yuv_palette(mainw->vpp->palette)) {
+          weed_set_int_value(return_layer,"YUV_clamping",mainw->vpp->YUV_clamping);
+          weed_set_int_value(return_layer,"YUV_subspace",mainw->vpp->YUV_subspace);
+          weed_set_int_value(return_layer,"YUV_sampling",mainw->vpp->YUV_sampling);
+        }
 
-	create_empty_pixel_data(return_layer,FALSE,TRUE);
+        create_empty_pixel_data(return_layer,FALSE,TRUE);
 
-	// vid plugin expects compacted rowstrides (i.e. no padding/alignment after pixel row)
-	compact_rowstrides(return_layer);
+        // vid plugin expects compacted rowstrides (i.e. no padding/alignment after pixel row)
+        compact_rowstrides(return_layer);
 
-	retdata=weed_get_voidptr_array(return_layer,"pixel_data",&weed_error);
+        retdata=weed_get_voidptr_array(return_layer,"pixel_data",&weed_error);
       }
 
       // chain any data to the playback plugin
       if (!(mainw->preview||mainw->is_rendering)) {
-	// chain any data pipelines
-	if (mainw->pconx!=NULL) {
-	  pconx_chain_data(-2,0);
-	}
-	if (mainw->cconx!=NULL) cconx_chain_data(-2,0);
+        // chain any data pipelines
+        if (mainw->pconx!=NULL) {
+          pconx_chain_data(-2,0);
+        }
+        if (mainw->cconx!=NULL) cconx_chain_data(-2,0);
       }
 
       if (!(*mainw->vpp->render_frame)(weed_get_int_value(frame_layer,"width",&weed_error),
-				       weed_get_int_value(frame_layer,"height",&weed_error),
-				       mainw->currticks-mainw->stream_ticks,
-				       (pd_array=weed_get_voidptr_array(frame_layer,"pixel_data",&weed_error)),
-				       retdata,mainw->vpp->play_params)) {
-	vid_playback_plugin_exit();
-	if (return_layer!=NULL) {
-	  weed_layer_free(return_layer);
-	  weed_free(retdata);
-	  return_layer=NULL;
-	}
+                                       weed_get_int_value(frame_layer,"height",&weed_error),
+                                       mainw->currticks-mainw->stream_ticks,
+                                       (pd_array=weed_get_voidptr_array(frame_layer,"pixel_data",&weed_error)),
+                                       retdata,mainw->vpp->play_params)) {
+        vid_playback_plugin_exit();
+        if (return_layer!=NULL) {
+          weed_layer_free(return_layer);
+          lives_free(retdata);
+          return_layer=NULL;
+        }
       }
-      g_free(pd_array);
+      lives_free(pd_array);
 
       if (frame_layer!=mainw->frame_layer) {
-	weed_layer_free(frame_layer);
+        weed_layer_free(frame_layer);
       }
 
       if (return_layer!=NULL) {
-	int width=MIN(weed_get_int_value(frame_layer,"width",&weed_error),
-		      weed_get_int_value(return_layer,"width",&weed_error));
-	int height=MIN(weed_get_int_value(mainw->frame_layer,"height",&weed_error),
-		       weed_get_int_value(return_layer,"height",&weed_error));
-	resize_layer(return_layer,width,height,LIVES_INTERP_FAST,WEED_PALETTE_END,0); 
-
-	save_to_scrap_file (return_layer);
-	weed_layer_free(return_layer);
-	weed_free(retdata);
-	return_layer=NULL;
+        int width=MIN(weed_get_int_value(frame_layer,"width",&weed_error),
+                      weed_get_int_value(return_layer,"width",&weed_error));
+        int height=MIN(weed_get_int_value(mainw->frame_layer,"height",&weed_error),
+                       weed_get_int_value(return_layer,"height",&weed_error));
+        resize_layer(return_layer,width,height,LIVES_INTERP_FAST,WEED_PALETTE_END,0);
+
+        save_to_scrap_file(return_layer);
+        weed_layer_free(return_layer);
+        lives_free(retdata);
+        return_layer=NULL;
       }
 
       if (mainw->vpp->capabilities&VPP_LOCAL_DISPLAY) {
-	mainw->noswitch=noswitch;
+        mainw->noswitch=noswitch;
 
-	if (!mainw->faded&&(!mainw->fs||prefs->gui_monitor!=prefs->play_monitor)&&
-	    mainw->current_file!=mainw->scrap_file) get_play_times();
-	if (mainw->multitrack!=NULL&&!cfile->opening) animate_multitrack(mainw->multitrack);
-	if (framecount!=NULL) g_free(framecount);
-      
-#ifdef ENABLE_OSC
-	// format is now msg|timecode|fgclip|fgframe|fgfps|
-	lives_osc_notify(LIVES_OSC_NOTIFY_FRAME_SYNCH,(const gchar *)
-			 (tmp=g_strdup_printf("%.8f|%d|%d|%.3f|",(double)mainw->currticks/U_SEC,
-					      mainw->current_file,mainw->actual_frame,cfile->pb_fps)));
-	g_free(tmp);
-#endif
-	
-	return;
+        if (!mainw->faded&&(!mainw->fs||prefs->gui_monitor!=prefs->play_monitor)&&
+            mainw->current_file!=mainw->scrap_file) get_play_times();
+        if (mainw->multitrack!=NULL&&!cfile->opening) animate_multitrack(mainw->multitrack);
+        if (framecount!=NULL) lives_free(framecount);
+
+        // format is now msg|timecode|fgclip|fgframe|fgfps|
+        lives_notify(LIVES_OSC_NOTIFY_FRAME_SYNCH,(const char *)
+                     (tmp=lives_strdup_printf("%.8f|%d|%d|%.3f|",(double)mainw->currticks/U_SEC,
+                                              mainw->current_file,mainw->actual_frame,cfile->pb_fps)));
+        lives_free(tmp);
+
+        return;
       }
     }
-  
+
     ////////////////////////////////////////////////////////
-    
-    // local display - either we are playing with no playback plugin, or else the playback plugin has no 
+
+    // local display - either we are playing with no playback plugin, or else the playback plugin has no
     // local display of its own
 
     check_layer_ready(mainw->frame_layer);
@@ -5964,66 +6048,67 @@
     if (mainw->fs&&!mainw->ext_playback&&(mainw->multitrack==NULL||mainw->sep_win)) {
       // set again, in case vpp was turned off because of preview conditions
       if (!mainw->sep_win) {
-	do {
-	  mainw->pwidth=lives_widget_get_allocation_width(mainw->playframe);
-	  mainw->pheight=lives_widget_get_allocation_height(mainw->playframe);
-	  if (mainw->pwidth * mainw->pheight==0) {
-	    lives_widget_context_update();
-	  }
-	} while (mainw->pwidth * mainw->pheight == 0);
-      }
-      else {
-	if (prefs->play_monitor==0) {
-	  mainw->pwidth=mainw->scr_width;
-	  mainw->pheight=mainw->scr_height;
-	  if (capable->nmonitors>1) {
-	    // spread over all monitors
-	    mainw->pwidth=gdk_screen_get_width(mainw->mgeom[0].screen);
-	    mainw->pheight=gdk_screen_get_height(mainw->mgeom[0].screen);
-	  }
-	}
-	else {
-	  if (mainw->play_window!=NULL) pmonitor=prefs->play_monitor;
-	  else pmonitor=prefs->gui_monitor;
-	  mainw->pwidth=mainw->mgeom[pmonitor-1].width;
-	  mainw->pheight=mainw->mgeom[pmonitor-1].height;
-	}
+        do {
+          mainw->pwidth=lives_widget_get_allocation_width(mainw->playframe);
+          mainw->pheight=lives_widget_get_allocation_height(mainw->playframe);
+          if (mainw->pwidth * mainw->pheight==0) {
+            lives_widget_context_update();
+          }
+        } while (mainw->pwidth * mainw->pheight == 0);
+      } else {
+        if (prefs->play_monitor==0) {
+          mainw->pwidth=mainw->scr_width;
+          mainw->pheight=mainw->scr_height;
+          if (capable->nmonitors>1) {
+            // spread over all monitors
+            mainw->pwidth=lives_screen_get_width(mainw->mgeom[0].screen);
+            mainw->pheight=lives_screen_get_height(mainw->mgeom[0].screen);
+          }
+        } else {
+          if (mainw->play_window!=NULL) pmonitor=prefs->play_monitor;
+          else pmonitor=prefs->gui_monitor;
+          mainw->pwidth=mainw->mgeom[pmonitor-1].width;
+          mainw->pheight=mainw->mgeom[pmonitor-1].height;
+        }
       }
     }
 
     if (mainw->play_window!=NULL&&!mainw->fs) {
       mainw->pwidth=lives_widget_get_allocation_width(mainw->play_window);
       mainw->pheight=lives_widget_get_allocation_height(mainw->play_window);
+    } else if (!mainw->fs) {
+      if (mainw->pwidth>lives_widget_get_allocation_width(mainw->play_image)-widget_opts.border_width*2)
+        mainw->pwidth=lives_widget_get_allocation_width(mainw->play_image)-widget_opts.border_width*2;
+      if (mainw->pheight>lives_widget_get_allocation_height(mainw->play_image)-widget_opts.border_width*2)
+        mainw->pheight=lives_widget_get_allocation_height(mainw->play_image)-widget_opts.border_width*2;
     }
 
     pwidth=weed_get_int_value(mainw->frame_layer,"width",&weed_error)*
-      weed_palette_get_pixels_per_macropixel(layer_palette);
+           weed_palette_get_pixels_per_macropixel(layer_palette);
     pheight=weed_get_int_value(mainw->frame_layer,"height",&weed_error)*
-      weed_palette_get_pixels_per_macropixel(layer_palette);
+            weed_palette_get_pixels_per_macropixel(layer_palette);
 
     if (pwidth!=mainw->pwidth||pheight!=mainw->pheight||lb_width!=0) {
       if (lb_width!=0) {
-	convert_layer_palette(mainw->frame_layer,cpal,0);
+        convert_layer_palette(mainw->frame_layer,cpal,0);
 
-	letterbox_layer(mainw->frame_layer,lb_width/
-			weed_palette_get_pixels_per_macropixel(layer_palette),
-			lb_height,mainw->pwidth/
-			weed_palette_get_pixels_per_macropixel(layer_palette),
-			mainw->pheight);
-      }
-      else {
-	interp=get_interp_value(prefs->pb_quality);
-	resize_layer(mainw->frame_layer,mainw->pwidth/weed_palette_get_pixels_per_macropixel(layer_palette),
-		     mainw->pheight,interp,cpal,0);
-	convert_layer_palette(mainw->frame_layer,cpal,0);
-      }
-    }
-    else {
-      if (mainw->play_window!=NULL&&LIVES_IS_XWINDOW (lives_widget_get_xwindow(mainw->play_window))) {
-	interp=get_interp_value(prefs->pb_quality);
-	resize_layer(mainw->frame_layer,mainw->pwidth/weed_palette_get_pixels_per_macropixel(layer_palette),
-		     mainw->pheight,interp,cpal,0);
-	convert_layer_palette(mainw->frame_layer,cpal,0);
+        letterbox_layer(mainw->frame_layer,lb_width/
+                        weed_palette_get_pixels_per_macropixel(layer_palette),
+                        lb_height,mainw->pwidth/
+                        weed_palette_get_pixels_per_macropixel(layer_palette),
+                        mainw->pheight);
+      } else {
+        interp=get_interp_value(prefs->pb_quality);
+        resize_layer(mainw->frame_layer,mainw->pwidth/weed_palette_get_pixels_per_macropixel(layer_palette),
+                     mainw->pheight,interp,cpal,0);
+        convert_layer_palette(mainw->frame_layer,cpal,0);
+      }
+    } else {
+      if (mainw->play_window!=NULL&&LIVES_IS_XWINDOW(lives_widget_get_xwindow(mainw->play_window))) {
+        interp=get_interp_value(prefs->pb_quality);
+        resize_layer(mainw->frame_layer,mainw->pwidth/weed_palette_get_pixels_per_macropixel(layer_palette),
+                     mainw->pheight,interp,cpal,0);
+        convert_layer_palette(mainw->frame_layer,cpal,0);
       }
     }
 
@@ -6035,443 +6120,588 @@
 
     // internal player, double size or fullscreen, or multitrack
 
-    if (mainw->play_window!=NULL&&LIVES_IS_XWINDOW (lives_widget_get_xwindow(mainw->play_window))) {
+    if (mainw->play_window!=NULL&&LIVES_IS_XWINDOW(lives_widget_get_xwindow(mainw->play_window))) {
       lives_painter_t *cr = lives_painter_create_from_widget(mainw->play_window);
       block_expose();
 
-      lives_painter_set_source_pixbuf (cr, pixbuf, 0, 0);
-      lives_painter_paint (cr);
-      lives_painter_destroy (cr);
+      lives_painter_set_source_pixbuf(cr, pixbuf, 0, 0);
+      lives_painter_paint(cr);
+      lives_painter_destroy(cr);
 
       unblock_expose();
-    }
-    else set_ce_frame_from_pixbuf(LIVES_IMAGE(mainw->play_image),pixbuf,NULL);
+    } else set_ce_frame_from_pixbuf(LIVES_IMAGE(mainw->play_image),pixbuf,NULL);
 
     if (mainw->multitrack!=NULL&&!cfile->opening) animate_multitrack(mainw->multitrack);
 
     else if (!mainw->faded&&(!mainw->fs||prefs->gui_monitor!=prefs->play_monitor||
-			     (mainw->ext_playback&&!(mainw->vpp->capabilities&VPP_LOCAL_DISPLAY)))&&
-			     mainw->current_file!=mainw->scrap_file) 
+                             (mainw->ext_playback&&!(mainw->vpp->capabilities&VPP_LOCAL_DISPLAY)))&&
+             mainw->current_file!=mainw->scrap_file)
       get_play_times();
-    
+
     if (pixbuf!=NULL) lives_object_unref(pixbuf);
-    
-#ifdef ENABLE_OSC
+
     // format is now msg|timecode|fgclip|fgframe|fgfps|
-    lives_osc_notify(LIVES_OSC_NOTIFY_FRAME_SYNCH,(const gchar *)
-		     (tmp=g_strdup_printf("%.8f|%d|%d|%.3f|",(double)mainw->currticks/U_SEC,
-					  mainw->current_file,mainw->actual_frame,cfile->pb_fps)));
-    g_free(tmp);
-#endif
-    if (framecount!=NULL) g_free(framecount);
+    lives_notify(LIVES_OSC_NOTIFY_FRAME_SYNCH,(const char *)
+                 (tmp=lives_strdup_printf("%.8f|%d|%d|%.3f|",(double)mainw->currticks/U_SEC,
+                                          mainw->current_file,mainw->actual_frame,cfile->pb_fps)));
+    lives_free(tmp);
+
+    if (framecount!=NULL) lives_free(framecount);
     return;
   }
 
   // record external window
   if (mainw->record_foreign) {
-    gchar fname[PATH_MAX];
+    char fname[PATH_MAX];
     int xwidth,xheight;
-    GError *gerror=NULL;
-    lives_painter_t *cr = lives_painter_create_from_widget (mainw->playarea);
+    LiVESError *gerror=NULL;
+    lives_painter_t *cr = lives_painter_create_from_widget(mainw->playarea);
 
     if (mainw->rec_vid_frames==-1) {
-      lives_entry_set_text(LIVES_ENTRY(mainw->framecounter),(tmp=g_strdup_printf("%9d",frame)));
+      lives_entry_set_text(LIVES_ENTRY(mainw->framecounter),(tmp=lives_strdup_printf("%9d",frame)));
       lives_widget_queue_draw(mainw->framecounter);
-    }
-    else {
+    } else {
       if (frame>mainw->rec_vid_frames) {
-	mainw->cancelled=CANCEL_KEEP;
-	if (cfile->frames>0) cfile->frames=mainw->rec_vid_frames;
-	return;
+        mainw->cancelled=CANCEL_KEEP;
+        if (cfile->frames>0) cfile->frames=mainw->rec_vid_frames;
+        return;
       }
 
-      lives_entry_set_text(LIVES_ENTRY(mainw->framecounter),(tmp=g_strdup_printf("%9d/%9d",frame,mainw->rec_vid_frames)));
+      lives_entry_set_text(LIVES_ENTRY(mainw->framecounter),(tmp=lives_strdup_printf("%9d/%9d",frame,mainw->rec_vid_frames)));
       lives_widget_queue_draw(mainw->framecounter);
-      g_free(tmp);
+      lives_free(tmp);
     }
 
 #ifdef GUI_GTK
 #if GTK_CHECK_VERSION(3,0,0)
     xwidth=gdk_window_get_width(mainw->foreign_window);
     xheight=gdk_window_get_height(mainw->foreign_window);
-    if ((pixbuf=gdk_pixbuf_get_from_window (mainw->foreign_window,
-					      0,0,
-					      xwidth,
-					      xheight
-					      ))!=NULL) {
+    if ((pixbuf=gdk_pixbuf_get_from_window(mainw->foreign_window,
+                                           0,0,
+                                           xwidth,
+                                           xheight
+                                          ))!=NULL) {
 #else
     gdk_window_get_size(mainw->foreign_window,&xwidth,&xheight);
-    if ((pixbuf=gdk_pixbuf_get_from_drawable (NULL,GDK_DRAWABLE(mainw->foreign_window),
-					      mainw->foreign_cmap,0,0,0,0,
-					      xwidth,
-					      xheight
-					      ))!=NULL) {
-#endif
-#endif
-      g_snprintf(fname,PATH_MAX,"%s/%s/%08d.%s",prefs->tmpdir,cfile->handle,frame,prefs->image_ext);
-      do {
-	if (gerror!=NULL) g_error_free(gerror);
-	if (!strcmp(prefs->image_ext,"jpg")) lives_pixbuf_save(pixbuf, fname, IMG_TYPE_JPEG, 100, FALSE, &gerror);
-	else if (!strcmp(prefs->image_ext,"png")) 
-	  lives_pixbuf_save(pixbuf, fname, IMG_TYPE_PNG, 100, FALSE, &gerror);
-      } while (gerror!=NULL);
-
-
-      lives_painter_set_source_pixbuf (cr, pixbuf, 0, 0);
-      lives_painter_paint (cr);
-      lives_painter_destroy (cr);
+    if ((pixbuf=gdk_pixbuf_get_from_drawable(NULL,GDK_DRAWABLE(mainw->foreign_window),
+                mainw->foreign_cmap,0,0,0,0,
+                xwidth,
+                xheight
+                                            ))!=NULL) {
+#endif
+#endif
+#ifdef GUI_QT
+      xwidth = mainw->foreign_window->size().width();
+      xheight = mainw->foreign_window->size().height();
+      QScreen *qscreen = mainw->foreign_window->screen();
+      QPixmap qp = qscreen->grabWindow(mainw->foreign_id, 0, 0, xwidth, xheight);
+      if (0) { // TODO
+#endif
+        lives_snprintf(fname,PATH_MAX,"%s/%s/%08d.%s",prefs->tmpdir,cfile->handle,frame,prefs->image_ext);
+        do {
+          if (gerror!=NULL) lives_error_free(gerror);
+          if (!strcmp(prefs->image_ext,"jpg")) lives_pixbuf_save(pixbuf, fname, IMG_TYPE_JPEG, 100, FALSE, &gerror);
+          else if (!strcmp(prefs->image_ext,"png"))
+            lives_pixbuf_save(pixbuf, fname, IMG_TYPE_PNG, 100, FALSE, &gerror);
+        } while (gerror!=NULL);
 
-      if (pixbuf!=NULL) lives_object_unref(pixbuf);
-      cfile->frames=frame;
-    }
-    else {
-      do_error_dialog(_ ("LiVES was unable to capture this image\n\n"));
-      mainw->cancelled=CANCEL_CAPTURE_ERROR;
-    }
 
-    if (frame==mainw->rec_vid_frames) mainw->cancelled=CANCEL_KEEP;
+        lives_painter_set_source_pixbuf(cr, pixbuf, 0, 0);
+        lives_painter_paint(cr);
+        lives_painter_destroy(cr);
+
+        if (pixbuf!=NULL) lives_object_unref(pixbuf);
+        cfile->frames=frame;
+      } else {
+        do_error_dialog(_("LiVES was unable to capture this image\n\n"));
+        mainw->cancelled=CANCEL_CAPTURE_ERROR;
+      }
+
+      if (frame==mainw->rec_vid_frames) mainw->cancelled=CANCEL_KEEP;
 
+    }
+    if (framecount!=NULL) lives_free(framecount);
   }
-  if (framecount!=NULL) g_free(framecount);
-}
 
 
-/** Save a pixbuf to a file using the specified imgtype and the specified quality/compression value */
+  /** Save a pixbuf to a file using the specified imgtype and the specified quality/compression value */
 
-GError *lives_pixbuf_save(LiVESPixbuf *pixbuf, gchar *fname, lives_image_type_t imgtype, int quality, boolean do_chmod, 
-			  GError **gerrorptr) {
-  // CALLER should check for errors
+  LiVESError *lives_pixbuf_save(LiVESPixbuf *pixbuf, char *fname, lives_image_type_t imgtype, int quality, boolean do_chmod,
+                                LiVESError **gerrorptr) {
+    // CALLER should check for errors
 
-  // fname should be in local charset
+    // fname should be in local charset
 
-  // if do_chmod, we try to set permissions to default
+    // if do_chmod, we try to set permissions to default
 
 #ifndef IS_MINGW
-  mode_t xumask=0;
+    mode_t xumask=0;
 
-  if (do_chmod) {
-    xumask=umask(DEF_FILE_UMASK);
-  }
+    if (do_chmod) {
+      xumask=umask(DEF_FILE_UMASK);
+    }
 #endif
 
-  if (imgtype==IMG_TYPE_JPEG) {
-    gchar *qstr=g_strdup_printf("%d",quality);
-    gdk_pixbuf_save (pixbuf, fname, "jpeg", gerrorptr, "quality", qstr, NULL);
-    g_free(qstr);
-  }
-  else if (imgtype==IMG_TYPE_PNG) {
-    gchar *cstr=g_strdup_printf("%d",(int)((100.-(double)quality+5.)/10.));
-    gdk_pixbuf_save (pixbuf, fname, "png", gerrorptr, "compression", cstr, NULL);
-    g_free(cstr);
-  }
-  else {
-    //gdk_pixbuf_save_to_callback(...);
-  }
+    if (imgtype==IMG_TYPE_JPEG) {
+      char *qstr=lives_strdup_printf("%d",quality);
+#ifdef GUI_GTK
+      gdk_pixbuf_save(pixbuf, fname, "jpeg", gerrorptr, "quality", qstr, NULL);
+#endif
+#ifdef GUI_QT
+      qt_jpeg_save(pixbuf, fname, gerrorptr, quality);
+#endif
+      lives_free(qstr);
+    } else if (imgtype==IMG_TYPE_PNG) {
+      char *cstr=lives_strdup_printf("%d",(int)((100.-(double)quality+5.)/10.));
+#ifdef GUI_GTK
+      gdk_pixbuf_save(pixbuf, fname, "png", gerrorptr, "compression", cstr, NULL);
+#endif
+#ifdef GUI_QT
+      qt_png_save(pixbuf, fname, gerrorptr, (int)((100.-(double)quality+5.)/10.));
+#endif
+      lives_free(cstr);
+    } else {
+      //gdk_pixbuf_save_to_callback(...);
+    }
 
 #ifndef IS_MINGW
-  if (do_chmod) {
-    umask(xumask);
-  }
+    if (do_chmod) {
+      umask(xumask);
+    }
 #endif
 
-  return *gerrorptr;
-}
+    return *gerrorptr;
+  }
 
 
 
-void close_current_file(int file_to_switch_to) {
-  // close the current file, and free the file struct and all sub storage
-  gchar *com;
-  GList *list_index;
-  int index=-1;
-  int old_file=mainw->current_file;
-  boolean need_new_blend_file=FALSE;
-
-  if (mainw->playing_file==-1) {
-    if (mainw->current_file!=mainw->scrap_file) desensitize();
-    lives_widget_set_sensitive (mainw->playall, FALSE);
-    lives_widget_set_sensitive (mainw->m_playbutton, FALSE);
-    lives_widget_set_sensitive (mainw->m_playselbutton, FALSE);
-    lives_widget_set_sensitive (mainw->m_loopbutton, FALSE);
-    lives_widget_set_sensitive (mainw->m_rewindbutton, FALSE);
-    if (mainw->preview_box!=NULL) {
-      lives_widget_set_sensitive (mainw->p_playbutton, FALSE);
-      lives_widget_set_sensitive (mainw->p_playselbutton, FALSE);
-      lives_widget_set_sensitive (mainw->p_loopbutton, FALSE);
-      lives_widget_set_sensitive (mainw->p_rewindbutton, FALSE);
-    }
-    lives_widget_set_sensitive (mainw->rewind, FALSE);
-    lives_widget_set_sensitive (mainw->select_submenu, FALSE);
-    lives_widget_set_sensitive (mainw->trim_submenu, FALSE);
-    lives_widget_set_sensitive (mainw->delaudio_submenu, FALSE);
-    lives_widget_set_sensitive (mainw->lock_selwidth, FALSE);
-    lives_widget_set_sensitive (mainw->show_file_info, FALSE);
-    lives_widget_set_sensitive (mainw->show_file_comments, FALSE);
-    lives_widget_set_sensitive (mainw->rename, FALSE);
-    lives_widget_set_sensitive (mainw->open, TRUE);
-    lives_widget_set_sensitive (mainw->capture, TRUE);
-    lives_widget_set_sensitive (mainw->preferences, TRUE);
-    lives_widget_set_sensitive (mainw->dsize, !mainw->fs);
-    lives_widget_set_sensitive (mainw->rev_clipboard, !(clipboard==NULL));
-    lives_widget_set_sensitive (mainw->show_clipboard_info, !(clipboard==NULL));
-    lives_widget_set_sensitive (mainw->playclip, !(clipboard==NULL));
-    lives_widget_set_sensitive (mainw->paste_as_new, !(clipboard==NULL));
-    lives_widget_set_sensitive (mainw->open_sel, TRUE);
-    lives_widget_set_sensitive (mainw->recaudio_submenu, TRUE);
-    lives_widget_set_sensitive (mainw->open_vcd_menu, TRUE);
-    lives_widget_set_sensitive (mainw->full_screen, TRUE);
+  void close_current_file(int file_to_switch_to) {
+    // close the current file, and free the file struct and all sub storage
+    char *com;
+    LiVESList *list_index;
+    int index=-1;
+    int old_file=mainw->current_file;
+    boolean need_new_blend_file=FALSE;
+
+    if (mainw->playing_file==-1) {
+      if (mainw->current_file!=mainw->scrap_file) desensitize();
+      lives_widget_set_sensitive(mainw->playall, FALSE);
+      lives_widget_set_sensitive(mainw->m_playbutton, FALSE);
+      lives_widget_set_sensitive(mainw->m_playselbutton, FALSE);
+      lives_widget_set_sensitive(mainw->m_loopbutton, FALSE);
+      lives_widget_set_sensitive(mainw->m_rewindbutton, FALSE);
+      if (mainw->preview_box!=NULL) {
+        lives_widget_set_sensitive(mainw->p_playbutton, FALSE);
+        lives_widget_set_sensitive(mainw->p_playselbutton, FALSE);
+        lives_widget_set_sensitive(mainw->p_loopbutton, FALSE);
+        lives_widget_set_sensitive(mainw->p_rewindbutton, FALSE);
+      }
+      lives_widget_set_sensitive(mainw->rewind, FALSE);
+      lives_widget_set_sensitive(mainw->select_submenu, FALSE);
+      lives_widget_set_sensitive(mainw->trim_submenu, FALSE);
+      lives_widget_set_sensitive(mainw->delaudio_submenu, FALSE);
+      lives_widget_set_sensitive(mainw->lock_selwidth, FALSE);
+      lives_widget_set_sensitive(mainw->show_file_info, FALSE);
+      lives_widget_set_sensitive(mainw->show_file_comments, FALSE);
+      lives_widget_set_sensitive(mainw->rename, FALSE);
+      lives_widget_set_sensitive(mainw->open, TRUE);
+      lives_widget_set_sensitive(mainw->capture, TRUE);
+      lives_widget_set_sensitive(mainw->preferences, TRUE);
+      lives_widget_set_sensitive(mainw->dsize, !mainw->fs);
+      lives_widget_set_sensitive(mainw->rev_clipboard, !(clipboard==NULL));
+      lives_widget_set_sensitive(mainw->show_clipboard_info, !(clipboard==NULL));
+      lives_widget_set_sensitive(mainw->playclip, !(clipboard==NULL));
+      lives_widget_set_sensitive(mainw->paste_as_new, !(clipboard==NULL));
+      lives_widget_set_sensitive(mainw->open_sel, TRUE);
+      lives_widget_set_sensitive(mainw->recaudio_submenu, TRUE);
+      lives_widget_set_sensitive(mainw->open_vcd_menu, TRUE);
+      lives_widget_set_sensitive(mainw->full_screen, TRUE);
 #ifdef HAVE_WEBM
-    lives_widget_set_sensitive (mainw->open_loc_menu, TRUE);
+      lives_widget_set_sensitive(mainw->open_loc_menu, TRUE);
 #else
-    lives_widget_set_sensitive (mainw->open_loc, TRUE);
+      lives_widget_set_sensitive(mainw->open_loc, TRUE);
 #endif
-    lives_widget_set_sensitive (mainw->open_device_menu, TRUE);
-    lives_widget_set_sensitive (mainw->recent_menu, TRUE);
-    lives_widget_set_sensitive (mainw->restore, TRUE);
-    lives_widget_set_sensitive (mainw->toy_tv, TRUE);
-    lives_widget_set_sensitive (mainw->toy_autolives, TRUE);
-    lives_widget_set_sensitive (mainw->toy_random_frames, TRUE);
-    lives_widget_set_sensitive (mainw->vj_load_set, !mainw->was_set);
-    lives_widget_set_sensitive (mainw->clear_ds, TRUE);
-    lives_widget_set_sensitive (mainw->gens_submenu, TRUE);
-    lives_widget_set_sensitive (mainw->mt_menu, TRUE);
-    lives_widget_set_sensitive (mainw->add_live_menu,TRUE);
-    lives_widget_set_sensitive (mainw->troubleshoot, TRUE);
+      lives_widget_set_sensitive(mainw->open_device_menu, TRUE);
+      lives_widget_set_sensitive(mainw->recent_menu, TRUE);
+      lives_widget_set_sensitive(mainw->restore, TRUE);
+      lives_widget_set_sensitive(mainw->toy_tv, TRUE);
+      lives_widget_set_sensitive(mainw->toy_autolives, TRUE);
+      lives_widget_set_sensitive(mainw->toy_random_frames, TRUE);
+      lives_widget_set_sensitive(mainw->vj_load_set, !mainw->was_set);
+      lives_widget_set_sensitive(mainw->clear_ds, TRUE);
+      lives_widget_set_sensitive(mainw->gens_submenu, TRUE);
+      lives_widget_set_sensitive(mainw->mt_menu, TRUE);
+      lives_widget_set_sensitive(mainw->add_live_menu,TRUE);
+      lives_widget_set_sensitive(mainw->troubleshoot, TRUE);
 #ifdef HAVE_YUV4MPEG
-    lives_widget_set_sensitive (mainw->open_yuv4m, TRUE);
-#endif
-  }
-  //update the bar text
-  if (mainw->current_file>-1) {
-    int i;
-    gchar *tmp;
-    if (cfile->clip_type!=CLIP_TYPE_GENERATOR&&mainw->current_file!=mainw->scrap_file&&
-	(mainw->multitrack==NULL||mainw->current_file!=mainw->multitrack->render_file)) {
-      d_print ((tmp=g_strdup_printf(_ ("Closed file %s\n"),cfile->file_name)));
-      g_free(tmp);
-#ifdef ENABLE_OSC
-      lives_osc_notify(LIVES_OSC_NOTIFY_CLIP_CLOSED,"");
+      lives_widget_set_sensitive(mainw->open_yuv4m, TRUE);
 #endif
     }
-    
-    // resize frame widgets to default
-    cfile->hsize=mainw->def_width-H_RESIZE_ADJUST;
-    cfile->vsize=mainw->def_height-V_RESIZE_ADJUST;
-    
-    for (i=0;i<FN_KEYS-1;i++) {
-      if (mainw->clipstore[i]==mainw->current_file) mainw->clipstore[i]=0;
-    }
+    //update the bar text
+    if (mainw->current_file>-1) {
+      register int i;
+      if (cfile->clip_type!=CLIP_TYPE_GENERATOR&&mainw->current_file!=mainw->scrap_file&&
+          (mainw->multitrack==NULL||mainw->current_file!=mainw->multitrack->render_file)) {
+        d_print(_("Closed file %s\n"),cfile->file_name);
 
-    // this must all be done last...
-    if (cfile->menuentry!=NULL) {
-      // c.f. on_prevclip_activate
-      list_index=g_list_find (mainw->cliplist, GINT_TO_POINTER (mainw->current_file));
-      do {
-	if ((list_index=g_list_previous(list_index))==NULL) list_index=g_list_last (mainw->cliplist);
-	index=GPOINTER_TO_INT (list_index->data);
-      } while ((mainw->files[index]==NULL||mainw->files[index]->opening||mainw->files[index]->restoring||
-		(index==mainw->scrap_file&&index>-1)||(!mainw->files[index]->frames&&mainw->playing_file>-1))&&
-	       index!=mainw->current_file);
-      if (index==mainw->current_file) index=-1;
-      if (mainw->current_file!=mainw->scrap_file) remove_from_clipmenu();
-    }
-
-    if ((cfile->clip_type==CLIP_TYPE_FILE||cfile->clip_type==CLIP_TYPE_DISK)&&cfile->ext_src!=NULL) {
-      gchar *cwd=g_get_current_dir();
-      gchar *ppath=g_build_filename(prefs->tmpdir,cfile->handle,NULL);
-      lives_chdir(ppath,FALSE);
-      g_free(ppath);
-      close_decoder_plugin((lives_decoder_t *)cfile->ext_src);
-      cfile->ext_src=NULL;
-
-      lives_chdir(cwd,FALSE);
-      g_free(cwd);
-    }
-  
-    if (cfile->frame_index!=NULL) g_free(cfile->frame_index);
-    if (cfile->frame_index_back!=NULL) g_free(cfile->frame_index_back);
+        lives_notify(LIVES_OSC_NOTIFY_CLIP_CLOSED,"");
+
+      }
+
+      // resize frame widgets to default
+      cfile->hsize=mainw->def_width-H_RESIZE_ADJUST;
+      cfile->vsize=mainw->def_height-V_RESIZE_ADJUST;
+
+      for (i=0; i<FN_KEYS-1; i++) {
+        if (mainw->clipstore[i]==mainw->current_file) mainw->clipstore[i]=0;
+      }
+
+      // this must all be done last...
+      if (cfile->menuentry!=NULL) {
+        // c.f. on_prevclip_activate
+        list_index=lives_list_find(mainw->cliplist, LIVES_INT_TO_POINTER(mainw->current_file));
+        do {
+          if ((list_index=lives_list_previous(list_index))==NULL) list_index=lives_list_last(mainw->cliplist);
+          index=LIVES_POINTER_TO_INT(lives_list_nth_data(list_index,0));
+        } while ((mainw->files[index]==NULL||mainw->files[index]->opening||mainw->files[index]->restoring||
+                  (index==mainw->scrap_file&&index>-1)||(!mainw->files[index]->frames&&mainw->playing_file>-1))&&
+                 index!=mainw->current_file);
+        if (index==mainw->current_file) index=-1;
+        if (mainw->current_file!=mainw->scrap_file) remove_from_clipmenu();
+      }
+
+      if ((cfile->clip_type==CLIP_TYPE_FILE||cfile->clip_type==CLIP_TYPE_DISK)&&cfile->ext_src!=NULL) {
+        char *cwd=lives_get_current_dir();
+        char *ppath=lives_build_filename(prefs->tmpdir,cfile->handle,NULL);
+        lives_chdir(ppath,FALSE);
+        lives_free(ppath);
+        close_decoder_plugin((lives_decoder_t *)cfile->ext_src);
+        cfile->ext_src=NULL;
+
+        lives_chdir(cwd,FALSE);
+        lives_free(cwd);
+      }
+
+      if (cfile->frame_index!=NULL) lives_free(cfile->frame_index);
+      if (cfile->frame_index_back!=NULL) lives_free(cfile->frame_index_back);
 
-    if (cfile->op_dir!=NULL) g_free(cfile->op_dir);
+      if (cfile->op_dir!=NULL) lives_free(cfile->op_dir);
 
-    if (cfile->clip_type!=CLIP_TYPE_GENERATOR&&!mainw->only_close) {
+      if (cfile->clip_type!=CLIP_TYPE_GENERATOR&&!mainw->only_close) {
 #ifdef IS_MINGW
-      // kill any active processes: for other OSes the backend does this
-      // get pid from backend
-      FILE *rfile;
-      ssize_t rlen;
-      char val[16];
-      int pid;
-      com=g_strdup_printf("%s get_pid_for_handle \"%s\"",prefs->backend_sync,cfile->handle);
-      rfile=popen(com,"r");
-      rlen=fread(val,1,16,rfile);
-      pclose(rfile);
-      memset(val+rlen,0,1);
-      pid=atoi(val);
-      lives_win32_kill_subprocesses(pid,TRUE);
-  
-#endif
+        // kill any active processes: for other OSes the backend does this
+        // get pid from backend
+        FILE *rfile;
+        ssize_t rlen;
+        char val[16];
+        int pid;
+        com=lives_strdup_printf("%s get_pid_for_handle \"%s\"",prefs->backend_sync,cfile->handle);
+        rfile=popen(com,"r");
+        rlen=fread(val,1,16,rfile);
+        pclose(rfile);
+        memset(val+rlen,0,1);
+        pid=atoi(val);
+        lives_win32_kill_subprocesses(pid,TRUE);
 
-      com=g_strdup_printf("%s close \"%s\"",prefs->backend_sync,cfile->handle);
-      lives_system(com,TRUE);
-      g_free(com); 
+#endif
 
-      if (cfile->event_list_back!=NULL) event_list_free (cfile->event_list_back);
-      if (cfile->event_list!=NULL) event_list_free (cfile->event_list);
+        com=lives_strdup_printf("%s close \"%s\"",prefs->backend_sync,cfile->handle);
+        lives_system(com,TRUE);
+        lives_free(com);
+
+        if (cfile->event_list_back!=NULL) event_list_free(cfile->event_list_back);
+        if (cfile->event_list!=NULL) event_list_free(cfile->event_list);
+
+        if (cfile->layout_map!=NULL) {
+          lives_list_free_strings(cfile->layout_map);
+          lives_list_free(cfile->layout_map);
+        }
 
-      if (cfile->layout_map!=NULL) {
-	g_list_free_strings(cfile->layout_map);
-	g_list_free(cfile->layout_map);
       }
 
-    }
-
-    if (cfile->subt!=NULL) subtitles_free(cfile);
+      if (cfile->subt!=NULL) subtitles_free(cfile);
 
-    if (cfile->clip_type==CLIP_TYPE_YUV4MPEG) {
+      if (cfile->clip_type==CLIP_TYPE_YUV4MPEG) {
 #ifdef HAVE_YUV4MPEG
-      lives_yuv_stream_stop_read((lives_yuv4m_t *)cfile->ext_src);
-      g_free (cfile->ext_src);
+        lives_yuv_stream_stop_read((lives_yuv4m_t *)cfile->ext_src);
+        lives_free(cfile->ext_src);
 #endif
-    }
+      }
 
-    if (cfile->clip_type==CLIP_TYPE_VIDEODEV) {
+      if (cfile->clip_type==CLIP_TYPE_VIDEODEV) {
 #ifdef HAVE_UNICAP
-      lives_vdev_free((lives_vdev_t *)cfile->ext_src);
-      g_free (cfile->ext_src);
+        lives_vdev_free((lives_vdev_t *)cfile->ext_src);
+        lives_free(cfile->ext_src);
 #endif
+      }
+
+      if (cfile->laudio_drawable!=NULL) {
+        lives_painter_surface_destroy(cfile->laudio_drawable);
+      }
+
+      if (cfile->raudio_drawable!=NULL) {
+        lives_painter_surface_destroy(cfile->raudio_drawable);
+      }
+
+      lives_free(cfile);
+      cfile=NULL;
+
+      if (mainw->multitrack!=NULL&&mainw->current_file!=mainw->multitrack->render_file) {
+        mt_delete_clips(mainw->multitrack,mainw->current_file);
+      }
+
+      if (mainw->first_free_file==-1||mainw->first_free_file>mainw->current_file)
+        mainw->first_free_file=mainw->current_file;
+
+      if (!mainw->only_close) {
+        if (file_to_switch_to>0&&mainw->files[file_to_switch_to]!=NULL) {
+          if (mainw->playing_file==-1) {
+            switch_to_file((mainw->current_file=0),file_to_switch_to);
+            d_print("");
+          } else do_quick_switch(file_to_switch_to);
+
+          if (mainw->multitrack!=NULL&&old_file!=mainw->multitrack->render_file) {
+            mt_clip_select(mainw->multitrack,TRUE);
+          }
+
+          return;
+        }
+      }
+
+      if (mainw->current_file==mainw->blend_file) {
+        need_new_blend_file=TRUE;
+      }
+
+      mainw->preview_frame=0;
+
+      if (!mainw->only_close) {
+        // find another clip to switch to
+        if (index>-1) {
+          if (mainw->playing_file==-1) {
+            switch_to_file((mainw->current_file=0),index);
+            d_print("");
+          } else do_quick_switch(index);
+          if (need_new_blend_file) mainw->blend_file=mainw->current_file;
+
+          if (mainw->multitrack!=NULL) {
+            mainw->multitrack->clip_selected=-mainw->multitrack->clip_selected;
+            mt_clip_select(mainw->multitrack,TRUE);
+          }
+
+          return;
+        }
+        if (mainw->clips_available>0) {
+          for (i=mainw->current_file-1; i>0; i--) {
+            if (!(mainw->files[i]==NULL)) {
+              if (mainw->playing_file==-1) {
+                switch_to_file((mainw->current_file=0),i);
+                d_print("");
+              } else do_quick_switch(index);
+              if (need_new_blend_file) mainw->blend_file=mainw->current_file;
+
+              if (mainw->multitrack!=NULL) {
+                mainw->multitrack->clip_selected=-mainw->multitrack->clip_selected;
+                mt_clip_select(mainw->multitrack,TRUE);
+              }
+
+              return;
+            }
+          }
+          for (i=1; i<MAX_FILES; i++) {
+            if (!(mainw->files[i]==NULL)) {
+              if (mainw->playing_file==-1) {
+                switch_to_file((mainw->current_file=0),i);
+                d_print("");
+              } else do_quick_switch(index);
+              if (need_new_blend_file) mainw->blend_file=mainw->current_file;
+
+              if (mainw->multitrack!=NULL) {
+                mainw->multitrack->clip_selected=-mainw->multitrack->clip_selected;
+                mt_clip_select(mainw->multitrack,TRUE);
+              }
+
+              return;
+            }
+          }
+        }
+      }
+
+      // no other clips
+      mainw->current_file=-1;
+      mainw->blend_file=-1;
+      set_main_title(NULL,0);
+
+      lives_widget_set_sensitive(mainw->vj_save_set, FALSE);
+      lives_widget_set_sensitive(mainw->vj_load_set, TRUE);
+      lives_widget_set_sensitive(mainw->export_proj, FALSE);
+      lives_widget_set_sensitive(mainw->import_proj, FALSE);
+
+      if (mainw->multitrack!=NULL) lives_widget_set_sensitive(mainw->multitrack->load_set,TRUE);
+
+      // can't use set_undoable, as we don't have a cfile
+      set_menu_text(mainw->undo,_("_Undo"),TRUE);
+      set_menu_text(mainw->redo,_("_Redo"),TRUE);
+      lives_widget_hide(mainw->redo);
+      lives_widget_show(mainw->undo);
+      lives_widget_set_sensitive(mainw->undo,FALSE);
+
+
+      if (!mainw->is_ready) return;
+
+      if (mainw->playing_file==-1&&mainw->play_window!=NULL) {
+        // if the clip is loaded
+        if (mainw->preview_box==NULL) {
+          // create the preview box that shows frames...
+          make_preview_box();
+        }
+        // add it the play window...
+        if (lives_widget_get_parent(mainw->preview_box)==NULL) {
+          lives_widget_queue_draw(mainw->play_window);
+          lives_container_add(LIVES_CONTAINER(mainw->play_window), mainw->preview_box);
+          lives_widget_grab_focus(mainw->preview_spinbutton);
+        }
+
+        lives_widget_hide(mainw->preview_controls);
+
+        // and resize it
+        resize_play_window();
+
+        play_window_set_title();
+
+        load_preview_image(FALSE);
+      }
+
+      if (mainw->multitrack==NULL) {
+        resize(1);
+        load_start_image(0);
+        load_end_image(0);
+      }
     }
 
-    if (cfile->laudio_drawable!=NULL) {
-      lives_painter_surface_destroy(cfile->laudio_drawable);
+    set_sel_label(mainw->sel_label);
+
+    lives_label_set_text(LIVES_LABEL(mainw->vidbar),_("Video"));
+    lives_label_set_text(LIVES_LABEL(mainw->laudbar),_("Left Audio"));
+    lives_label_set_text(LIVES_LABEL(mainw->raudbar),_("Right Audio"));
+
+    zero_spinbuttons();
+    lives_widget_hide(mainw->hruler);
+    lives_widget_hide(mainw->eventbox5);
+
+    if (palette->style&STYLE_1) {
+      lives_widget_hide(mainw->vidbar);
+      lives_widget_hide(mainw->laudbar);
+      lives_widget_hide(mainw->raudbar);
+    } else {
+      lives_widget_show(mainw->vidbar);
+      lives_widget_show(mainw->laudbar);
+      lives_widget_show(mainw->raudbar);
     }
+    if (!mainw->only_close) {
+      lives_widget_queue_draw(mainw->LiVES);
+      if (mainw->playing_file==-1) d_print("");
 
-    if (cfile->raudio_drawable!=NULL) {
-      lives_painter_surface_destroy(cfile->raudio_drawable);
+      if (mainw->multitrack!=NULL) {
+        mainw->multitrack->clip_selected=-mainw->multitrack->clip_selected;
+        mt_clip_select(mainw->multitrack,TRUE);
+      }
     }
 
-    g_free(cfile);
-    cfile=NULL;
+  }
 
-    if (mainw->multitrack!=NULL&&mainw->current_file!=mainw->multitrack->render_file) {
-      mt_delete_clips(mainw->multitrack,mainw->current_file);
-    }
 
-    if (mainw->first_free_file==-1||mainw->first_free_file>mainw->current_file) 
-      mainw->first_free_file=mainw->current_file;
 
-    if (!mainw->only_close) {
-      if (file_to_switch_to>0&&mainw->files[file_to_switch_to]!=NULL) {
-	if (mainw->playing_file==-1) {
-	  switch_to_file((mainw->current_file=0),file_to_switch_to);
-	  d_print("");
-	}
-	else do_quick_switch(file_to_switch_to);
-
-	if (mainw->multitrack!=NULL&&old_file!=mainw->multitrack->render_file) {
-	  mt_clip_select(mainw->multitrack,TRUE);
-	}
-
-	return;
-      }
-    }
-    
-    if (mainw->current_file==mainw->blend_file) {
-      need_new_blend_file=TRUE;
+  void switch_to_file(int old_file, int new_file) {
+    // this function is used for full clip switching (during non-playback or non fs)
+    char title[256];
+    int orig_file=mainw->current_file;
+
+    // should use close_current_file
+    if (new_file==-1||new_file>MAX_FILES) {
+      lives_printerr("warning - attempt to switch to invalid clip %d\n",new_file);
+      return;
     }
 
-    mainw->preview_frame=0;
-    
-    if (!mainw->only_close) {
-      // find another clip to switch to
-      if (index>-1) {
-	if (mainw->playing_file==-1) {
-	  switch_to_file((mainw->current_file=0),index);
-	  d_print("");
-	}
-	else do_quick_switch(index);
-	if (need_new_blend_file) mainw->blend_file=mainw->current_file;
-
-	if (mainw->multitrack!=NULL) {
-	  mainw->multitrack->clip_selected=-mainw->multitrack->clip_selected;
-	  mt_clip_select(mainw->multitrack,TRUE);
-	}
-
-	return;
-      }
-      if (mainw->clips_available>0) {
-	for (i=mainw->current_file-1;i>0;i--) {
-	  if (!(mainw->files[i]==NULL)) {
-	    if (mainw->playing_file==-1) {
-	      switch_to_file((mainw->current_file=0),i);
-	      d_print("");
-	    }
-	    else do_quick_switch(index);
-	    if (need_new_blend_file) mainw->blend_file=mainw->current_file;
-
-	    if (mainw->multitrack!=NULL) {
-	      mainw->multitrack->clip_selected=-mainw->multitrack->clip_selected;
-	      mt_clip_select(mainw->multitrack,TRUE);
-	    }
-
-	    return;
-	  }
-	}
-	for (i=1;i<MAX_FILES;i++) {
-	  if (!(mainw->files[i]==NULL)) {
-	    if (mainw->playing_file==-1) {
-	      switch_to_file((mainw->current_file=0),i);
-	      d_print("");
-	    }
-	    else do_quick_switch(index);
-	    if (need_new_blend_file) mainw->blend_file=mainw->current_file;
-
-	    if (mainw->multitrack!=NULL) {
-	      mainw->multitrack->clip_selected=-mainw->multitrack->clip_selected;
-	      mt_clip_select(mainw->multitrack,TRUE);
-	    }
-
-	    return;
-	  }
-	}
+    if (mainw->files[new_file]==NULL) return;
+
+    if (cfile!=NULL&&old_file*new_file>0&&cfile->opening) {
+      if (prefs->audio_player==AUD_PLAYER_MPLAYER||prefs->audio_player==AUD_PLAYER_MPLAYER2) {
+        do_error_dialog(
+          _("\n\nLiVES cannot switch clips whilst opening if the audio player is set to mplayer or mplayer2.\nPlease adjust the playback options in Preferences and try again.\n"));
+        return;
       }
     }
 
-    // no other clips
-    mainw->current_file=-1;
-    mainw->blend_file=-1;
-    set_main_title(NULL,0);
+    mainw->current_file=new_file;
 
-    lives_widget_set_sensitive (mainw->vj_save_set, FALSE);
-    lives_widget_set_sensitive (mainw->vj_load_set, TRUE);
-    lives_widget_set_sensitive (mainw->export_proj, FALSE);
-    lives_widget_set_sensitive (mainw->import_proj, FALSE);
+    if (mainw->playing_file==-1&&mainw->multitrack!=NULL) return;
 
-    if (mainw->multitrack!=NULL) lives_widget_set_sensitive (mainw->multitrack->load_set,TRUE);
+    if (cfile->frames) {
+      mainw->pwidth=cfile->hsize;
+      mainw->pheight=cfile->vsize;
 
-    // can't use set_undoable, as we don't have a cfile
-    set_menu_text(mainw->undo,_ ("_Undo"),TRUE);
-    set_menu_text(mainw->redo,_ ("_Redo"),TRUE);
-    lives_widget_hide(mainw->redo);
-    lives_widget_show(mainw->undo);
-    lives_widget_set_sensitive(mainw->undo,FALSE);
+      mainw->play_start=1;
+      mainw->play_end=cfile->frames;
 
+      if (mainw->playing_file>-1) {
+        lives_spin_button_set_value(LIVES_SPIN_BUTTON(mainw->spinbutton_pb_fps),cfile->pb_fps);
+        changed_fps_during_pb(LIVES_SPIN_BUTTON(mainw->spinbutton_pb_fps), NULL);
+      }
+
+      if ((cfile->clip_type!=CLIP_TYPE_DISK&&cfile->clip_type!=CLIP_TYPE_FILE)||(mainw->event_list!=NULL&&!mainw->record))
+        mainw->play_end=INT_MAX;
+    }
+
+    if (old_file!=new_file) {
+      if (old_file*new_file) mainw->preview_frame=0;
+      if (old_file!=-1) {
+        // TODO - indicate "opening" in clipmenu
+
+        //      if (old_file>0&&mainw->files[old_file]!=NULL&&mainw->files[old_file]->menuentry!=NULL&&
+        //  (mainw->files[old_file]->clip_type==CLIP_TYPE_DISK||mainw->files[old_file]->clip_type==CLIP_TYPE_FILE)) {
+        //char menutext[32768];
+        //get_menu_text_long(mainw->files[old_file]->menuentry,menutext);
+
+        //set_menu_text(mainw->files[old_file]->menuentry,menutext,FALSE);
+        //}
+        lives_widget_set_sensitive(mainw->select_new, (cfile->insert_start>0));
+        lives_widget_set_sensitive(mainw->select_last, (cfile->undo_start>0));
+        if ((cfile->start==1||cfile->end==cfile->frames)&&!(cfile->start==1&&cfile->end==cfile->frames)) {
+          lives_widget_set_sensitive(mainw->select_invert,TRUE);
+        } else {
+          lives_widget_set_sensitive(mainw->select_invert,FALSE);
+        }
+        if (new_file*old_file>0&&mainw->files[old_file]!=NULL&&mainw->files[old_file]->opening) {
+          // switch while opening - come out of processing dialog
+          if (!(mainw->files[old_file]->proc_ptr==NULL)) {
+            lives_widget_destroy(mainw->files[old_file]->proc_ptr->processing);
+            lives_free(mainw->files[old_file]->proc_ptr);
+            mainw->files[old_file]->proc_ptr=NULL;
+          }
+        }
+      }
+    }
 
-    if (!mainw->is_ready) return;
+    if (!mainw->switch_during_pb&&!cfile->opening) {
+      sensitize();
+    }
 
-    if (mainw->playing_file==-1&&mainw->play_window!=NULL) {
+    if ((mainw->playing_file==-1&&mainw->play_window!=NULL&&cfile->is_loaded)
+        &&orig_file!=new_file) {
       // if the clip is loaded
       if (mainw->preview_box==NULL) {
-	// create the preview box that shows frames...
-	make_preview_box();
+        // create the preview box that shows frames...
+        make_preview_box();
       }
       // add it the play window...
       if (lives_widget_get_parent(mainw->preview_box)==NULL) {
-	lives_widget_queue_draw(mainw->play_window);
-	lives_container_add (LIVES_CONTAINER (mainw->play_window), mainw->preview_box);
-	lives_widget_grab_focus (mainw->preview_spinbutton);
+        lives_widget_queue_draw(mainw->play_window);
+        lives_container_add(LIVES_CONTAINER(mainw->play_window), mainw->preview_box);
+        lives_widget_grab_focus(mainw->preview_spinbutton);
       }
 
-      lives_widget_hide(mainw->preview_controls);
+      lives_widget_show(mainw->preview_controls);
+      lives_widget_grab_focus(mainw->preview_spinbutton);
 
       // and resize it
       resize_play_window();
@@ -6480,763 +6710,610 @@
 
       load_preview_image(FALSE);
     }
-      
-    if (mainw->multitrack==NULL) {
-      resize(1);
-      load_start_image (0);
-      load_end_image (0);
-    }
-  }
 
-  set_sel_label(mainw->sel_label);
-
-  lives_label_set_text(LIVES_LABEL(mainw->vidbar),_ ("Video"));
-  lives_label_set_text(LIVES_LABEL(mainw->laudbar),_ ("Left Audio"));
-  lives_label_set_text(LIVES_LABEL(mainw->raudbar),_ ("Right Audio"));
-    
-  zero_spinbuttons();
-  lives_widget_hide (mainw->hruler);
-  lives_widget_hide (mainw->eventbox5);
-
-  if (palette->style&STYLE_1) {
-    lives_widget_hide (mainw->vidbar);
-    lives_widget_hide (mainw->laudbar);
-    lives_widget_hide (mainw->raudbar);
-  }
-  else {
-    lives_widget_show (mainw->vidbar);
-    lives_widget_show (mainw->laudbar);
-    lives_widget_show (mainw->raudbar);
-  }
-  if (!mainw->only_close) {
-    lives_widget_queue_draw (mainw->LiVES);
-    if (mainw->playing_file==-1) d_print("");
+    if (new_file>0) {
+      lives_ruler_set_value(LIVES_RULER(mainw->hruler),cfile->pointer_time);
+    }
 
-    if (mainw->multitrack!=NULL) {
-      mainw->multitrack->clip_selected=-mainw->multitrack->clip_selected;
-      mt_clip_select(mainw->multitrack,TRUE);
+    if (cfile->opening||!(cfile->clip_type==CLIP_TYPE_DISK||cfile->clip_type==CLIP_TYPE_FILE)) {
+      load_start_image(0);
+      load_end_image(0);
+      lives_widget_set_sensitive(mainw->rename, FALSE);
     }
-  }
 
-}
 
+    if (cfile->menuentry!=NULL) {
+      // TODO - indicate "opening"
+      //char menutext[32768];
+      //get_menu_text_long(cfile->menuentry,menutext);
+      lives_signal_handler_block(cfile->menuentry, cfile->menuentry_func);
+      lives_check_menu_item_set_active(LIVES_CHECK_MENU_ITEM(cfile->menuentry),TRUE);
+      lives_signal_handler_unblock(cfile->menuentry, cfile->menuentry_func);
+      //set_menu_text(cfile->menuentry,menutext,FALSE);
+    }
 
-  
-void switch_to_file(int old_file, int new_file) {
-  // this function is used for full clip switching (during non-playback or non fs)
-  gchar title[256];
-  int orig_file=mainw->current_file;
 
-  // should use close_current_file
-  if (new_file==-1||new_file>MAX_FILES) {
-    g_printerr("warning - attempt to switch to invalid clip %d\n",new_file);
-    return;
-  }
+    if (cfile->clip_type==CLIP_TYPE_DISK||cfile->clip_type==CLIP_TYPE_FILE) {
+      reget_afilesize(mainw->current_file);
+    }
 
-  if (mainw->files[new_file]==NULL) return;
 
-  if (cfile!=NULL&&old_file*new_file>0&&cfile->opening) {
-    if (prefs->audio_player==AUD_PLAYER_MPLAYER||prefs->audio_player==AUD_PLAYER_MPLAYER2) {
-      do_error_dialog(_ ("\n\nLiVES cannot switch clips whilst opening if the audio player is set to mplayer or mplayer2.\nPlease adjust the playback options in Preferences and try again.\n"));
-      return;
+    if (!mainw->switch_during_pb) {
+      // switch on/off loop video if we have/don't have audio
+      if (cfile->achans==0) {
+        mainw->loop=FALSE;
+      } else {
+        mainw->loop=lives_check_menu_item_get_active(LIVES_CHECK_MENU_ITEM(mainw->loop_video));
+      }
+
+      lives_widget_set_sensitive(mainw->undo, cfile->undoable);
+      lives_widget_set_sensitive(mainw->redo, cfile->redoable);
+      lives_widget_set_sensitive(mainw->export_submenu, (cfile->achans>0));
+      lives_widget_set_sensitive(mainw->recaudio_submenu, TRUE);
+      lives_widget_set_sensitive(mainw->recaudio_sel, (cfile->frames>0));
+      lives_widget_set_sensitive(mainw->export_selaudio, (cfile->frames>0));
+      lives_widget_set_sensitive(mainw->append_audio, (cfile->achans>0));
+      lives_widget_set_sensitive(mainw->trim_submenu, (cfile->achans>0));
+      lives_widget_set_sensitive(mainw->trim_audio, mainw->current_file>0&&(cfile->achans*cfile->frames>0));
+      lives_widget_set_sensitive(mainw->trim_to_pstart, (cfile->achans>0&&cfile->pointer_time>0.));
+      lives_widget_set_sensitive(mainw->delaudio_submenu, (cfile->achans>0));
+      lives_widget_set_sensitive(mainw->delsel_audio, (cfile->frames>0));
+      lives_widget_set_sensitive(mainw->resample_audio, (cfile->achans>0&&capable->has_sox_sox));
+      lives_widget_set_sensitive(mainw->fade_aud_in, cfile->achans>0);
+      lives_widget_set_sensitive(mainw->fade_aud_out, cfile->achans>0);
+      lives_widget_set_sensitive(mainw->loop_video, (cfile->achans>0&&cfile->frames>0));
     }
-  }
 
-  mainw->current_file=new_file;
+    set_menu_text(mainw->undo,cfile->undo_text,TRUE);
+    set_menu_text(mainw->redo,cfile->redo_text,TRUE);
 
-  if (mainw->playing_file==-1&&mainw->multitrack!=NULL) return;
+    set_sel_label(mainw->sel_label);
 
-  if (cfile->frames) {
-    mainw->pwidth=cfile->hsize;
-    mainw->pheight=cfile->vsize;
+    lives_widget_show(mainw->vidbar);
+    lives_widget_show(mainw->laudbar);
 
-    mainw->play_start=1;
-    mainw->play_end=cfile->frames;
+    if (cfile->achans<2) {
+      lives_widget_hide(mainw->raudbar);
+    } else {
+      lives_widget_show(mainw->raudbar);
+    }
 
-    if (mainw->playing_file>-1) {
-      lives_spin_button_set_value(LIVES_SPIN_BUTTON(mainw->spinbutton_pb_fps),cfile->pb_fps);
-      changed_fps_during_pb (LIVES_SPIN_BUTTON(mainw->spinbutton_pb_fps), NULL);
+    if (cfile->redoable) {
+      lives_widget_show(mainw->redo);
+      lives_widget_hide(mainw->undo);
+    } else {
+      lives_widget_hide(mainw->redo);
+      lives_widget_show(mainw->undo);
     }
 
-    if ((cfile->clip_type!=CLIP_TYPE_DISK&&cfile->clip_type!=CLIP_TYPE_FILE)||(mainw->event_list!=NULL&&!mainw->record)) 
-      mainw->play_end=INT_MAX;
-  }
+    if (new_file>0) {
+      if (cfile->menuentry!=NULL) {
+        get_menu_text(cfile->menuentry,title);
+        set_main_title(title,0);
+      } else set_main_title(cfile->file_name,0);
+    }
 
-  if (old_file!=new_file) {
-    if (old_file*new_file) mainw->preview_frame=0;
-    if (old_file!=-1) {
-      // TODO - indicate "opening" in clipmenu
+    if (cfile->frames==0) {
+      zero_spinbuttons();
+    }
 
-      //      if (old_file>0&&mainw->files[old_file]!=NULL&&mainw->files[old_file]->menuentry!=NULL&&
-      //  (mainw->files[old_file]->clip_type==CLIP_TYPE_DISK||mainw->files[old_file]->clip_type==CLIP_TYPE_FILE)) {
-	//gchar menutext[32768];
-	//get_menu_text_long(mainw->files[old_file]->menuentry,menutext);
+    if (mainw->multitrack==NULL) resize(1);
 
-	//set_menu_text(mainw->files[old_file]->menuentry,menutext,FALSE);
-      //}
-      lives_widget_set_sensitive (mainw->select_new, (cfile->insert_start>0));
-      lives_widget_set_sensitive (mainw->select_last, (cfile->undo_start>0));
-      if ((cfile->start==1||cfile->end==cfile->frames)&&!(cfile->start==1&&cfile->end==cfile->frames)) {
-	lives_widget_set_sensitive(mainw->select_invert,TRUE);
-      }
-      else {
-	lives_widget_set_sensitive(mainw->select_invert,FALSE);
+    if (mainw->playing_file>-1) {
+      if (mainw->fs) {
+        //on_full_screen_activate (NULL,LIVES_INT_TO_POINTER (1));
+      } else {
+        if (!mainw->faded&&cfile->frames>0) {
+          lives_signal_handler_block(mainw->spinbutton_end,mainw->spin_end_func);
+          lives_spin_button_set_range(LIVES_SPIN_BUTTON(mainw->spinbutton_end),1,cfile->frames);
+          lives_spin_button_set_value(LIVES_SPIN_BUTTON(mainw->spinbutton_end),cfile->end);
+          lives_signal_handler_unblock(mainw->spinbutton_end,mainw->spin_end_func);
+
+          lives_signal_handler_block(mainw->spinbutton_start,mainw->spin_start_func);
+          lives_spin_button_set_range(LIVES_SPIN_BUTTON(mainw->spinbutton_start),1,cfile->frames);
+          lives_spin_button_set_value(LIVES_SPIN_BUTTON(mainw->spinbutton_start),cfile->start);
+          lives_signal_handler_unblock(mainw->spinbutton_start,mainw->spin_start_func);
+          load_start_image(cfile->start);
+          load_end_image(cfile->end);
+          load_frame_image(cfile->frameno);
+        }
+        if (mainw->double_size) {
+          frame_size_update();
+        }
       }
-      if (new_file*old_file>0&&mainw->files[old_file]!=NULL&&mainw->files[old_file]->opening) {
-	// switch while opening - come out of processing dialog
-	if (!(mainw->files[old_file]->proc_ptr==NULL)) {
-	  lives_widget_destroy (mainw->files[old_file]->proc_ptr->processing);
-	  g_free (mainw->files[old_file]->proc_ptr);
-	  mainw->files[old_file]->proc_ptr=NULL;
-	}
+    } else {
+      // it is unfortunate that we might resize after this, and our timer bars will then look the wrong width
+      if (mainw->is_ready) {
+        get_play_times();
       }
+      // ...so we need an expose event in callbacks.c
     }
-  }
-
-  if (!mainw->switch_during_pb&&!cfile->opening) {
-    sensitize();
-  }
 
-  if ((mainw->playing_file==-1&&mainw->play_window!=NULL&&cfile->is_loaded)
-      &&orig_file!=new_file) {
-    // if the clip is loaded
-    if (mainw->preview_box==NULL) {
-      // create the preview box that shows frames...
-      make_preview_box();
+    // if the file was opening, continue...
+    if (cfile->opening) {
+      open_file(cfile->file_name);
     }
-    // add it the play window...
-    if (lives_widget_get_parent(mainw->preview_box)==NULL) {
-      lives_widget_queue_draw(mainw->play_window);
-      lives_container_add (LIVES_CONTAINER (mainw->play_window), mainw->preview_box);
-      lives_widget_grab_focus (mainw->preview_spinbutton);
-    }
-
-    lives_widget_show(mainw->preview_controls);
-    lives_widget_grab_focus (mainw->preview_spinbutton);
+  }
 
-    // and resize it
-    resize_play_window();
 
-    play_window_set_title();
+  void switch_audio_clip(int new_file, boolean activate) {
 
-    load_preview_image(FALSE);
-  }
-  
-  if (new_file>0) {
-    lives_ruler_set_value (LIVES_RULER(mainw->hruler),cfile->pointer_time);
-  }
+    if (prefs->audio_player==AUD_PLAYER_JACK) {
+#ifdef ENABLE_JACK
+      if (mainw->jackd!=NULL) {
+        boolean timeout;
+        int alarm_handle=lives_alarm_set(LIVES_ACONNECT_TIMEOUT);
+        if (!activate) mainw->jackd->in_use=FALSE;
 
-  if (cfile->opening||!(cfile->clip_type==CLIP_TYPE_DISK||cfile->clip_type==CLIP_TYPE_FILE)) {
-    load_start_image(0);
-    load_end_image(0);
-    lives_widget_set_sensitive (mainw->rename, FALSE);
-  }
+        if (mainw->jackd->playing_file==new_file) return;
 
+        while (!(timeout=lives_alarm_get(alarm_handle))&&jack_get_msgq(mainw->jackd)!=NULL) {
+          sched_yield(); // wait for seek
+        }
+        if (timeout) jack_try_reconnect();
+        lives_alarm_clear(alarm_handle);
 
-  if (cfile->menuentry!=NULL) {
-    // TODO - indicate "opening"
-    //gchar menutext[32768];
-    //get_menu_text_long(cfile->menuentry,menutext);
-    lives_signal_handler_block (cfile->menuentry, cfile->menuentry_func);
-    lives_check_menu_item_set_active(LIVES_CHECK_MENU_ITEM(cfile->menuentry),TRUE);
-    lives_signal_handler_unblock (cfile->menuentry, cfile->menuentry_func);
-    //set_menu_text(cfile->menuentry,menutext,FALSE);
-  }
+        if (mainw->jackd->playing_file>0) {
+          jack_message.command=ASERVER_CMD_FILE_CLOSE;
+          jack_message.data=NULL;
+          jack_message.next=NULL;
+          mainw->jackd->msgq=&jack_message;
+
+          lives_alarm_set(LIVES_ACONNECT_TIMEOUT);
+          while (!(timeout=lives_alarm_get(alarm_handle))&&jack_get_msgq(mainw->jackd)!=NULL) {
+            sched_yield(); // wait for seek
+          }
+          if (timeout) jack_try_reconnect();
+          lives_alarm_clear(alarm_handle);
 
+        }
 
-  if (cfile->clip_type==CLIP_TYPE_DISK||cfile->clip_type==CLIP_TYPE_FILE) {
-    reget_afilesize (mainw->current_file);
-  }
+        if (new_file<0||mainw->files[new_file]==NULL) {
+          mainw->jackd->in_use=FALSE;
+          return;
+        }
 
+        if (activate) mainw->jackd->in_use=TRUE;
 
-  if (!mainw->switch_during_pb) {
-    // switch on/off loop video if we have/don't have audio
-    if (cfile->achans==0) {
-      mainw->loop=FALSE;
-    }
-    else {
-      mainw->loop=lives_check_menu_item_get_active(LIVES_CHECK_MENU_ITEM(mainw->loop_video));
+        if (mainw->files[new_file]->achans>0) {
+          int asigned=!(mainw->files[new_file]->signed_endian&AFORM_UNSIGNED);
+          int aendian=!(mainw->files[new_file]->signed_endian&AFORM_BIG_ENDIAN);
+          mainw->jackd->num_input_channels=mainw->files[new_file]->achans;
+          mainw->jackd->bytes_per_channel=mainw->files[new_file]->asampsize/8;
+          if (activate&&(prefs->audio_opts&AUDIO_OPTS_FOLLOW_FPS)) {
+            if (!mainw->files[new_file]->play_paused)
+              mainw->jackd->sample_in_rate=mainw->files[new_file]->arate*mainw->files[new_file]->pb_fps/
+                                           mainw->files[new_file]->fps;
+            else mainw->jackd->sample_in_rate=mainw->files[new_file]->arate*mainw->files[new_file]->freeze_fps/
+                                                mainw->files[new_file]->fps;
+          } else mainw->jackd->sample_in_rate=mainw->files[new_file]->arate;
+          mainw->jackd->usigned=!asigned;
+          mainw->jackd->seek_end=mainw->files[new_file]->afilesize;
+
+          if ((aendian&&(capable->byte_order==LIVES_BIG_ENDIAN))||
+              (!aendian&&(capable->byte_order==LIVES_LITTLE_ENDIAN)))
+            mainw->jackd->reverse_endian=TRUE;
+          else mainw->jackd->reverse_endian=FALSE;
+
+          if (mainw->ping_pong) mainw->jackd->loop=AUDIO_LOOP_PINGPONG;
+          else mainw->jackd->loop=AUDIO_LOOP_FORWARD;
+
+          // tell jack server to open audio file and start playing it
+
+          jack_message.command=ASERVER_CMD_FILE_OPEN;
+
+          jack_message.data=lives_strdup_printf("%d",new_file);
+
+          jack_message2.command=ASERVER_CMD_FILE_SEEK;
+          jack_message.next=&jack_message2;
+          jack_message2.data=lives_strdup_printf("%"PRId64,mainw->files[new_file]->aseek_pos);
+          jack_message2.next=NULL;
+
+          mainw->jackd->msgq=&jack_message;
+          mainw->jackd->in_use=TRUE;
+
+          if (mainw->agen_key==0&&!mainw->agen_needs_reinit) {
+            if (prefs->audio_opts&AUDIO_OPTS_FOLLOW_FPS) {
+              mainw->jackd->is_paused=mainw->files[new_file]->play_paused;
+              mainw->jackd->is_silent=FALSE;
+            }
+
+            mainw->rec_aclip=new_file;
+            mainw->rec_avel=mainw->files[new_file]->pb_fps/mainw->files[new_file]->fps;
+            mainw->rec_aseek=(double)mainw->files[new_file]->aseek_pos/
+                             (double)(mainw->files[new_file]->arate*mainw->files[new_file]->achans*mainw->files[new_file]->asampsize/8);
+          }
+        } else {
+          if (mainw->agen_key==0&&!mainw->agen_needs_reinit) {
+            mainw->rec_aclip=mainw->current_file;
+            mainw->rec_avel=0.;
+            mainw->rec_aseek=0.;
+          }
+        }
+      }
+#endif
     }
-    
-    lives_widget_set_sensitive (mainw->undo, cfile->undoable);
-    lives_widget_set_sensitive (mainw->redo, cfile->redoable);
-    lives_widget_set_sensitive (mainw->export_submenu, (cfile->achans>0));
-    lives_widget_set_sensitive (mainw->recaudio_submenu, TRUE);
-    lives_widget_set_sensitive (mainw->recaudio_sel, (cfile->frames>0));
-    lives_widget_set_sensitive (mainw->export_selaudio, (cfile->frames>0));
-    lives_widget_set_sensitive (mainw->append_audio, (cfile->achans>0));
-    lives_widget_set_sensitive (mainw->trim_submenu, (cfile->achans>0));
-    lives_widget_set_sensitive (mainw->trim_audio, mainw->current_file>0&&(cfile->achans*cfile->frames>0));
-    lives_widget_set_sensitive (mainw->trim_to_pstart, (cfile->achans>0&&cfile->pointer_time>0.));
-    lives_widget_set_sensitive (mainw->delaudio_submenu, (cfile->achans>0));
-    lives_widget_set_sensitive (mainw->delsel_audio, (cfile->frames>0));
-    lives_widget_set_sensitive (mainw->resample_audio, (cfile->achans>0&&capable->has_sox_sox));
-    lives_widget_set_sensitive (mainw->fade_aud_in, cfile->achans>0);
-    lives_widget_set_sensitive (mainw->fade_aud_out, cfile->achans>0);
-    lives_widget_set_sensitive (mainw->loop_video, (cfile->achans>0&&cfile->frames>0));
-  }
-
-  set_menu_text(mainw->undo,cfile->undo_text,TRUE);
-  set_menu_text(mainw->redo,cfile->redo_text,TRUE);
-  
-  set_sel_label(mainw->sel_label);
 
-  lives_widget_show(mainw->vidbar);
-  lives_widget_show(mainw->laudbar);
+    // switch audio clip
+    if (prefs->audio_player==AUD_PLAYER_PULSE) {
+#ifdef HAVE_PULSE_AUDIO
+      if (mainw->pulsed!=NULL) {
+        boolean timeout;
+        int alarm_handle;
 
-  if (cfile->achans<2) {
-    lives_widget_hide(mainw->raudbar);
-  }
-  else {
-    lives_widget_show(mainw->raudbar);
-  }
+        if (mainw->pulsed->playing_file==new_file) return;
 
-  if (cfile->redoable) {
-    lives_widget_show(mainw->redo);
-    lives_widget_hide(mainw->undo);
-  }
-  else {
-    lives_widget_hide(mainw->redo);
-    lives_widget_show(mainw->undo);
-  }
+        alarm_handle=lives_alarm_set(LIVES_ACONNECT_TIMEOUT);
 
-  if (new_file>0) {
-    if (cfile->menuentry!=NULL) {
-      get_menu_text(cfile->menuentry,title);
-      set_main_title(title,0);
-    }
-   else set_main_title(cfile->file_name,0);
-  }
+        while (!(timeout=lives_alarm_get(alarm_handle))&&pulse_get_msgq(mainw->pulsed)!=NULL) {
+          sched_yield(); // wait for seek
+        }
+        if (timeout) pulse_try_reconnect();
+        lives_alarm_clear(alarm_handle);
 
-  if (cfile->frames==0) {
-    zero_spinbuttons();
-  }
+        if (mainw->pulsed->fd>0) {
+          pulse_message.command=ASERVER_CMD_FILE_CLOSE;
+          pulse_message.data=NULL;
+          pulse_message.next=NULL;
+          mainw->pulsed->msgq=&pulse_message;
+
+          lives_alarm_set(LIVES_ACONNECT_TIMEOUT);
+          while (!(timeout=lives_alarm_get(alarm_handle))&&pulse_get_msgq(mainw->pulsed)!=NULL) {
+            sched_yield(); // wait for seek
+          }
+          if (timeout) pulse_try_reconnect();
+          lives_alarm_clear(alarm_handle);
+        }
 
-  if (mainw->multitrack==NULL) resize(1);
+        if (new_file<0||mainw->files[new_file]==NULL) {
+          mainw->pulsed->in_use=FALSE;
+          return;
+        }
 
-  if (mainw->playing_file>-1) {
-      if (mainw->fs) {
-	//on_full_screen_activate (NULL,GINT_TO_POINTER (1));
+        mainw->pulsed->in_use=TRUE;
+
+        if (mainw->files[new_file]->achans>0) {
+          int asigned=!(mainw->files[new_file]->signed_endian&AFORM_UNSIGNED);
+          int aendian=!(mainw->files[new_file]->signed_endian&AFORM_BIG_ENDIAN);
+          mainw->pulsed->in_achans=mainw->files[new_file]->achans;
+          mainw->pulsed->in_asamps=mainw->files[new_file]->asampsize;
+          if (activate&&(prefs->audio_opts&AUDIO_OPTS_FOLLOW_FPS)) {
+            if (!mainw->files[new_file]->play_paused)
+              mainw->pulsed->in_arate=mainw->files[new_file]->arate*mainw->files[new_file]->pb_fps/
+                                      mainw->files[new_file]->fps;
+            else mainw->pulsed->in_arate=mainw->files[new_file]->arate*mainw->files[new_file]->freeze_fps/
+                                           mainw->files[new_file]->fps;
+          } else mainw->pulsed->in_arate=mainw->files[new_file]->arate;
+          mainw->pulsed->usigned=!asigned;
+          mainw->pulsed->seek_end=mainw->files[new_file]->afilesize;
+          if (mainw->files[new_file]->opening) mainw->pulsed->is_opening=TRUE;
+          else mainw->pulsed->is_opening=FALSE;
+
+          if ((aendian&&(capable->byte_order==LIVES_BIG_ENDIAN))||
+              (!aendian&&(capable->byte_order==LIVES_LITTLE_ENDIAN)))
+            mainw->pulsed->reverse_endian=TRUE;
+          else mainw->pulsed->reverse_endian=FALSE;
+
+          if (mainw->ping_pong) mainw->pulsed->loop=AUDIO_LOOP_PINGPONG;
+          else mainw->pulsed->loop=AUDIO_LOOP_FORWARD;
+
+          // tell pulse server to open audio file and start playing it
+
+          pulse_message.command=ASERVER_CMD_FILE_OPEN;
+
+          if (mainw->files[new_file]->opening) {
+            mainw->pulsed->is_opening=TRUE;
+          }
+          pulse_message.data=lives_strdup_printf("%d",new_file);
+
+          pulse_message2.command=ASERVER_CMD_FILE_SEEK;
+          pulse_message.next=&pulse_message2;
+          pulse_message2.data=lives_strdup_printf("%"PRId64,mainw->files[new_file]->aseek_pos);
+          pulse_message2.next=NULL;
+          mainw->pulsed->msgq=&pulse_message;
+          mainw->pulsed->in_use=TRUE;
+
+          if (mainw->agen_key==0&&!mainw->agen_needs_reinit) {
+            if (prefs->audio_opts&AUDIO_OPTS_FOLLOW_FPS) {
+              mainw->pulsed->is_paused=mainw->files[new_file]->play_paused;
+            }
+
+            mainw->rec_aclip=new_file;
+            mainw->rec_avel=mainw->files[new_file]->pb_fps/mainw->files[new_file]->fps;
+            mainw->rec_aseek=(double)mainw->files[new_file]->aseek_pos/
+                             (double)(mainw->files[new_file]->arate*mainw->files[new_file]->achans*mainw->files[new_file]->asampsize/8);
+          }
+        } else {
+          if (mainw->agen_key==0&&!mainw->agen_needs_reinit) {
+            mainw->rec_aclip=mainw->current_file;
+            mainw->rec_avel=0.;
+            mainw->rec_aseek=0.;
+          }
+        }
       }
-      else {
-	if (!mainw->faded&&cfile->frames>0) {
-	  lives_signal_handler_block(mainw->spinbutton_end,mainw->spin_end_func);
-	  lives_spin_button_set_range(LIVES_SPIN_BUTTON(mainw->spinbutton_end),1,cfile->frames);
-	  lives_spin_button_set_value(LIVES_SPIN_BUTTON(mainw->spinbutton_end),cfile->end);
-	  lives_signal_handler_unblock(mainw->spinbutton_end,mainw->spin_end_func);
-	  
-	  lives_signal_handler_block(mainw->spinbutton_start,mainw->spin_start_func);
-	  lives_spin_button_set_range(LIVES_SPIN_BUTTON(mainw->spinbutton_start),1,cfile->frames);
-	  lives_spin_button_set_value(LIVES_SPIN_BUTTON(mainw->spinbutton_start),cfile->start);
-	  lives_signal_handler_unblock(mainw->spinbutton_start,mainw->spin_start_func);
-          load_start_image(cfile->start);
-          load_end_image(cfile->end);
-	  load_frame_image(cfile->frameno);
-	}
-	if (mainw->double_size) {
-	  frame_size_update();
-	}
-     }
-  }
-  else {
-    // it is unfortunate that we might resize after this, and our timer bars will then look the wrong width
-    if (mainw->is_ready) {
-      get_play_times();
+#endif
     }
-    // ...so we need an expose event in callbacks.c
-  }
-
-  // if the file was opening, continue...
-  if (cfile->opening) {
-    open_file(cfile->file_name);
   }
-}
-
 
-void switch_audio_clip(int new_file, boolean activate) {
 
-  if (prefs->audio_player==AUD_PLAYER_JACK) {
-#ifdef ENABLE_JACK
-    if (mainw->jackd!=NULL) {
-      boolean timeout;
-      int alarm_handle=lives_alarm_set(LIVES_ACONNECT_TIMEOUT);
-      if (!activate) mainw->jackd->in_use=FALSE;
 
-      while (!(timeout=lives_alarm_get(alarm_handle))&&jack_get_msgq(mainw->jackd)!=NULL) {
-	sched_yield(); // wait for seek
-      }
-      if (timeout) jack_try_reconnect();
-      lives_alarm_clear(alarm_handle);
+  void do_quick_switch(int new_file) {
+    // handle clip switching during playback
 
-      if (mainw->jackd->playing_file>0) {
-	jack_message.command=ASERVER_CMD_FILE_CLOSE;
-	jack_message.data=NULL;
-	jack_message.next=NULL;
-	mainw->jackd->msgq=&jack_message;
-	
-	lives_alarm_set(LIVES_ACONNECT_TIMEOUT);
-	while (!(timeout=lives_alarm_get(alarm_handle))&&jack_get_msgq(mainw->jackd)!=NULL) {
-	  sched_yield(); // wait for seek
-	}
-	if (timeout) jack_try_reconnect();
-	lives_alarm_clear(alarm_handle);
-	
-      }
-
-      if (new_file<0||mainw->files[new_file]==NULL) {
-	mainw->jackd->in_use=FALSE;
-	return;
-      }
-      
-      if (activate) mainw->jackd->in_use=TRUE;
-      
-      if (mainw->files[new_file]->achans>0) { 
-	int asigned=!(mainw->files[new_file]->signed_endian&AFORM_UNSIGNED);
-	int aendian=!(mainw->files[new_file]->signed_endian&AFORM_BIG_ENDIAN);
-	mainw->jackd->num_input_channels=mainw->files[new_file]->achans;
-	mainw->jackd->bytes_per_channel=mainw->files[new_file]->asampsize/8;
-	if (activate&&(prefs->audio_opts&AUDIO_OPTS_FOLLOW_FPS)) {
-	  if (!mainw->files[new_file]->play_paused) 
-	    mainw->jackd->sample_in_rate=mainw->files[new_file]->arate*mainw->files[new_file]->pb_fps/
-	      mainw->files[new_file]->fps;
-	  else mainw->jackd->sample_in_rate=mainw->files[new_file]->arate*mainw->files[new_file]->freeze_fps/
-		 mainw->files[new_file]->fps;
-	}
-	else mainw->jackd->sample_in_rate=mainw->files[new_file]->arate;
-	mainw->jackd->usigned=!asigned;
-	mainw->jackd->seek_end=mainw->files[new_file]->afilesize;
-
-	if ((aendian&&(capable->byte_order==LIVES_BIG_ENDIAN))||
-	    (!aendian&&(capable->byte_order==LIVES_LITTLE_ENDIAN))) 
-	  mainw->jackd->reverse_endian=TRUE;
-	else mainw->jackd->reverse_endian=FALSE;
-
-	if (mainw->ping_pong) mainw->jackd->loop=AUDIO_LOOP_PINGPONG;
-	else mainw->jackd->loop=AUDIO_LOOP_FORWARD;
-
-	// tell jack server to open audio file and start playing it
-
-	jack_message.command=ASERVER_CMD_FILE_OPEN;
-
-	jack_message.data=g_strdup_printf("%d",new_file);
-
-	jack_message2.command=ASERVER_CMD_FILE_SEEK;
-	jack_message.next=&jack_message2;
-	jack_message2.data=g_strdup_printf("%"PRId64,mainw->files[new_file]->aseek_pos);
-	jack_message2.next=NULL;
-
-	mainw->jackd->msgq=&jack_message;
-	mainw->jackd->in_use=TRUE;
-
-	if (mainw->agen_key==0&&!mainw->agen_needs_reinit) {
-	  if (prefs->audio_opts&AUDIO_OPTS_FOLLOW_FPS) {
-	    mainw->jackd->is_paused=mainw->files[new_file]->play_paused;
-	    mainw->jackd->is_silent=FALSE;
-	  }
-	  
-	  mainw->rec_aclip=new_file;
-	  mainw->rec_avel=mainw->files[new_file]->pb_fps/mainw->files[new_file]->fps;
-	  mainw->rec_aseek=(double)mainw->files[new_file]->aseek_pos/
-	    (double)(mainw->files[new_file]->arate*mainw->files[new_file]->achans*mainw->files[new_file]->asampsize/8);
-	}
-      }
-      else {
-	if (mainw->agen_key==0&&!mainw->agen_needs_reinit) {
-	  mainw->rec_aclip=mainw->current_file;
-	  mainw->rec_avel=0.;
-	  mainw->rec_aseek=0.;
-	}
-      }
+    int ovsize=mainw->pheight;
+    int ohsize=mainw->pwidth;
+    boolean osc_block;
+
+    if (mainw->current_file<1||mainw->files[new_file]==NULL) return;
+
+    if (mainw->noswitch||(mainw->record&&!mainw->record_paused&&!(prefs->rec_opts&REC_CLIPS))||
+        mainw->foreign||(mainw->preview&&!mainw->is_rendering&&mainw->multitrack==NULL)) return;
+
+    if (!mainw->sep_win&&mainw->multitrack==NULL) {
+      lives_widget_show(mainw->playframe);
     }
-#endif
-  }
 
-  // switch audio clip
- if (prefs->audio_player==AUD_PLAYER_PULSE) {
-#ifdef HAVE_PULSE_AUDIO
-    if (mainw->pulsed!=NULL) {
-      boolean timeout;
-      int alarm_handle=lives_alarm_set(LIVES_ACONNECT_TIMEOUT);
-      while (!(timeout=lives_alarm_get(alarm_handle))&&pulse_get_msgq(mainw->pulsed)!=NULL) {
-	sched_yield(); // wait for seek
-      }
-      if (timeout) pulse_try_reconnect();
-      lives_alarm_clear(alarm_handle);
 
-      if (mainw->pulsed->fd>0) {
-	pulse_message.command=ASERVER_CMD_FILE_CLOSE;
-	pulse_message.data=NULL;
-	pulse_message.next=NULL;
-	mainw->pulsed->msgq=&pulse_message;
-
-	lives_alarm_set(LIVES_ACONNECT_TIMEOUT);
-	while (!(timeout=lives_alarm_get(alarm_handle))&&pulse_get_msgq(mainw->pulsed)!=NULL) {
-	  sched_yield(); // wait for seek
-	}
-	if (timeout) pulse_try_reconnect();
-	lives_alarm_clear(alarm_handle);
-      }
-
-      if (new_file<0||mainw->files[new_file]==NULL) {
-	mainw->pulsed->in_use=FALSE;
-	return;
-      }
-
-      mainw->pulsed->in_use=TRUE;
-      
-      if (mainw->files[new_file]->achans>0) { 
-	int asigned=!(mainw->files[new_file]->signed_endian&AFORM_UNSIGNED);
-	int aendian=!(mainw->files[new_file]->signed_endian&AFORM_BIG_ENDIAN);
-	mainw->pulsed->in_achans=mainw->files[new_file]->achans;
-	mainw->pulsed->in_asamps=mainw->files[new_file]->asampsize;
-	if (activate&&(prefs->audio_opts&AUDIO_OPTS_FOLLOW_FPS)) {
-	  if (!mainw->files[new_file]->play_paused) 
-	    mainw->pulsed->in_arate=mainw->files[new_file]->arate*mainw->files[new_file]->pb_fps/
-	      mainw->files[new_file]->fps;
-	  else mainw->pulsed->in_arate=mainw->files[new_file]->arate*mainw->files[new_file]->freeze_fps/
-		 mainw->files[new_file]->fps;
-	}
-	else mainw->pulsed->in_arate=mainw->files[new_file]->arate;
-	mainw->pulsed->usigned=!asigned;
-	mainw->pulsed->seek_end=mainw->files[new_file]->afilesize;
-	if (mainw->files[new_file]->opening) mainw->pulsed->is_opening=TRUE;
-	else mainw->pulsed->is_opening=FALSE;
-
-	if ((aendian&&(capable->byte_order==LIVES_BIG_ENDIAN))||
-	    (!aendian&&(capable->byte_order==LIVES_LITTLE_ENDIAN))) 
-	  mainw->pulsed->reverse_endian=TRUE;
-	else mainw->pulsed->reverse_endian=FALSE;
-
-	if (mainw->ping_pong) mainw->pulsed->loop=AUDIO_LOOP_PINGPONG;
-	else mainw->pulsed->loop=AUDIO_LOOP_FORWARD;
-
-	// tell pulse server to open audio file and start playing it
-
-	pulse_message.command=ASERVER_CMD_FILE_OPEN;
-
-	if (mainw->files[new_file]->opening) {
-	  mainw->pulsed->is_opening=TRUE;
-	}
-	pulse_message.data=g_strdup_printf("%d",new_file);
-
-	pulse_message2.command=ASERVER_CMD_FILE_SEEK;
-	pulse_message.next=&pulse_message2;
-	pulse_message2.data=g_strdup_printf("%"PRId64,mainw->files[new_file]->aseek_pos);
-	pulse_message2.next=NULL;
-	mainw->pulsed->msgq=&pulse_message;
-	mainw->pulsed->in_use=TRUE;
-
-	if (mainw->agen_key==0&&!mainw->agen_needs_reinit) {
-	  if (prefs->audio_opts&AUDIO_OPTS_FOLLOW_FPS) {
-	    mainw->pulsed->is_paused=mainw->files[new_file]->play_paused;
-	  }
-	    
-	  mainw->rec_aclip=new_file;
-	  mainw->rec_avel=mainw->files[new_file]->pb_fps/mainw->files[new_file]->fps;
-	  mainw->rec_aseek=(double)mainw->files[new_file]->aseek_pos/
-	    (double)(mainw->files[new_file]->arate*mainw->files[new_file]->achans*mainw->files[new_file]->asampsize/8);
-	}
-      }
-      else {
-	if (mainw->agen_key==0&&!mainw->agen_needs_reinit) {
-	  mainw->rec_aclip=mainw->current_file;
-	  mainw->rec_avel=0.;
-	  mainw->rec_aseek=0.;
-	}
-      }
-    }
-#endif
- }
-}
-
-
-
-void do_quick_switch (int new_file) {
-  // handle clip switching during playback
-
-  int ovsize=mainw->pheight;
-  int ohsize=mainw->pwidth;
-  boolean osc_block;
-
-  if (mainw->current_file<1||mainw->files[new_file]==NULL) return;
-
-  if (mainw->noswitch||(mainw->record&&!mainw->record_paused&&!(prefs->rec_opts&REC_CLIPS))||
-      mainw->foreign||(mainw->preview&&!mainw->is_rendering&&mainw->multitrack==NULL)) return;
-
-  if (!mainw->sep_win&&mainw->multitrack==NULL) {
-    lives_widget_show(mainw->playframe);
-  }
-
-
-  if (new_file==mainw->current_file) {
-    if (!((mainw->fs&&prefs->gui_monitor==prefs->play_monitor)||(mainw->faded&&mainw->double_size)||
-	  mainw->multitrack!=NULL)) {
-      switch_to_file (mainw->current_file=0, new_file);
-      if (mainw->play_window!=NULL&&!mainw->double_size&&!mainw->fs&&mainw->current_file!=-1&&cfile!=NULL&&
-	  (ohsize!=cfile->hsize||ovsize!=cfile->vsize)) {
-	// for single size sepwin, we resize frames to fit the window
-	mainw->must_resize=TRUE;
-	mainw->pheight=ovsize;
-	mainw->pwidth=ohsize;
+    if (new_file==mainw->current_file) {
+      if (!((mainw->fs&&prefs->gui_monitor==prefs->play_monitor)||(mainw->faded&&mainw->double_size)||
+            mainw->multitrack!=NULL)) {
+        switch_to_file(mainw->current_file=0, new_file);
+        if (mainw->play_window!=NULL&&!mainw->double_size&&!mainw->fs&&mainw->current_file!=-1&&cfile!=NULL&&
+            (ohsize!=cfile->hsize||ovsize!=cfile->vsize)) {
+          // for single size sepwin, we resize frames to fit the window
+          mainw->must_resize=TRUE;
+          mainw->pheight=ovsize;
+          mainw->pwidth=ohsize;
+        } else if (mainw->multitrack==NULL) mainw->must_resize=FALSE;
       }
-      else if (mainw->multitrack==NULL) mainw->must_resize=FALSE;
+      return;
     }
-    return;
-  }
 
-  // reset old info file
-  if (cfile!=NULL) {
-    gchar *tmp;
+    // reset old info file
+    if (cfile!=NULL) {
+      char *tmp;
 #ifndef IS_MINGW
-      tmp=g_build_filename(prefs->tmpdir,cfile->handle,".status",NULL);
+      tmp=lives_build_filename(prefs->tmpdir,cfile->handle,".status",NULL);
 #else
-      tmp=g_build_filename(prefs->tmpdir,cfile->handle,"status",NULL);
+      tmp=lives_build_filename(prefs->tmpdir,cfile->handle,"status",NULL);
 #endif
-    g_snprintf(cfile->info_file,PATH_MAX,"%s",tmp);
-    g_free(tmp);
-  }
-
-  osc_block=mainw->osc_block;
-  mainw->osc_block=TRUE;
- 
-  // switch audio clip
-  if ((prefs->audio_player==AUD_PLAYER_JACK||prefs->audio_player==AUD_PLAYER_PULSE)&&(prefs->audio_opts&AUDIO_OPTS_FOLLOW_CLIPS)&&!mainw->is_rendering&&
-      (mainw->preview||!(mainw->agen_key!=0||prefs->audio_src==AUDIO_SRC_EXT))) {
-    switch_audio_clip(new_file,TRUE);
-  }
+      lives_snprintf(cfile->info_file,PATH_MAX,"%s",tmp);
+      lives_free(tmp);
+    }
 
-  mainw->whentostop=NEVER_STOP;
+    osc_block=mainw->osc_block;
+    mainw->osc_block=TRUE;
 
-  if (cfile!=NULL&&cfile->clip_type==CLIP_TYPE_GENERATOR&&new_file!=mainw->current_file&&
-      new_file!=mainw->blend_file&&!mainw->is_rendering) {
-    if (mainw->files[new_file]->clip_type==CLIP_TYPE_DISK||mainw->files[new_file]->clip_type==CLIP_TYPE_FILE) 
-      mainw->pre_src_file=new_file;
-
-    if (rte_window!=NULL) rtew_set_keych(rte_fg_gen_key(),FALSE);
-    if (mainw->ce_thumbs) ce_thumbs_set_keych(rte_fg_gen_key(),FALSE);
-    if (mainw->current_file==mainw->blend_file) mainw->new_blend_file=new_file;
-    weed_generator_end ((weed_plant_t *)cfile->ext_src);
-    if (mainw->current_file==-1) {
-      mainw->osc_block=osc_block;
-      return;
+    // switch audio clip
+    if (is_realtime_aplayer(prefs->audio_player)&&(prefs->audio_opts&AUDIO_OPTS_FOLLOW_CLIPS)
+        &&!mainw->is_rendering&&(mainw->preview||!(mainw->agen_key!=0||prefs->audio_src==AUDIO_SRC_EXT))) {
+      switch_audio_clip(new_file,TRUE);
     }
-  }
-  
-  mainw->switch_during_pb=TRUE;
-  mainw->clip_switched=TRUE;
 
-  if (mainw->fs||(mainw->faded&&mainw->double_size)||mainw->multitrack!=NULL) {
-    mainw->current_file=new_file;
-    if (!mainw->sep_win) {
-      if (mainw->faded&&mainw->double_size) resize(2);
-      if (cfile->menuentry!=NULL) {
-	gchar title[256];
-	get_menu_text(cfile->menuentry,title);
-	set_main_title(title,0);
+    mainw->whentostop=NEVER_STOP;
+
+    if (cfile!=NULL&&cfile->clip_type==CLIP_TYPE_GENERATOR&&new_file!=mainw->current_file&&
+        new_file!=mainw->blend_file&&!mainw->is_rendering) {
+      if (mainw->files[new_file]->clip_type==CLIP_TYPE_DISK||mainw->files[new_file]->clip_type==CLIP_TYPE_FILE)
+        mainw->pre_src_file=new_file;
+
+      if (rte_window!=NULL) rtew_set_keych(rte_fg_gen_key(),FALSE);
+      if (mainw->ce_thumbs) ce_thumbs_set_keych(rte_fg_gen_key(),FALSE);
+      if (mainw->current_file==mainw->blend_file) mainw->new_blend_file=new_file;
+      weed_generator_end((weed_plant_t *)cfile->ext_src);
+      if (mainw->current_file==-1) {
+        mainw->osc_block=osc_block;
+        return;
       }
-      else set_main_title(cfile->file_name,0);
     }
-  }
-  else {
-    // force update of labels, prevent widgets becoming sensitized
-    switch_to_file (mainw->current_file, new_file);
-  }
-
-  if (mainw->ce_thumbs&&mainw->active_sa_clips==SCREEN_AREA_FOREGROUND) ce_thumbs_highlight_current_clip();
 
-  mainw->play_start=1;
-  mainw->play_end=cfile->frames;
+    mainw->switch_during_pb=TRUE;
+    mainw->clip_switched=TRUE;
 
-  if (mainw->play_window!=NULL) {
-    gchar *title=g_strdup(_("LiVES: - Play Window"));
-    lives_window_set_title (LIVES_WINDOW (mainw->play_window), title);
-    g_free(title);
-    if (mainw->double_size&&!mainw->fs&&(ohsize!=cfile->hsize||ovsize!=cfile->vsize)) {
-      // for single size sepwin, we resize frames to fit the window
-      mainw->must_resize=TRUE;
-      mainw->pheight=ovsize;
-      mainw->pwidth=ohsize;
+    if (mainw->fs||(mainw->faded&&mainw->double_size)||mainw->multitrack!=NULL) {
+      mainw->current_file=new_file;
+      if (!mainw->sep_win) {
+        if (mainw->faded&&mainw->double_size) resize(2);
+        if (cfile->menuentry!=NULL) {
+          char title[256];
+          get_menu_text(cfile->menuentry,title);
+          set_main_title(title,0);
+        } else set_main_title(cfile->file_name,0);
+      }
+    } else {
+      // force update of labels, prevent widgets becoming sensitized
+      switch_to_file(mainw->current_file, new_file);
     }
-  }
-  else if (mainw->multitrack==NULL) mainw->must_resize=FALSE;
 
-  if ((cfile->clip_type!=CLIP_TYPE_DISK&&cfile->clip_type!=CLIP_TYPE_FILE)||(mainw->event_list!=NULL&&!mainw->record)) 
-    mainw->play_end=INT_MAX;
+    if (mainw->ce_thumbs&&mainw->active_sa_clips==SCREEN_AREA_FOREGROUND) ce_thumbs_highlight_current_clip();
 
-  // act like we are not playing a selection (but we will try to keep to 
-  // selection bounds)
-  mainw->playing_sel=FALSE;
-  
-  lives_spin_button_set_value(LIVES_SPIN_BUTTON(mainw->spinbutton_pb_fps),cfile->pb_fps);
-  changed_fps_during_pb (LIVES_SPIN_BUTTON(mainw->spinbutton_pb_fps), NULL);
-
-  if (!cfile->frameno&&cfile->frames) cfile->frameno=1;
-  cfile->last_frameno=cfile->frameno;
-
-  mainw->playing_file=new_file;
-
-  cfile->next_event=NULL;
-  mainw->deltaticks=0;
-  mainw->startticks=mainw->currticks;
-  // force loading of a frame from the new clip
-  if (!mainw->noswitch&&(cfile->clip_type==CLIP_TYPE_DISK||cfile->clip_type==CLIP_TYPE_FILE)) {
-    weed_plant_t *frame_layer=mainw->frame_layer;
-    mainw->frame_layer=NULL;
-    load_frame_image (cfile->frameno);
-    mainw->frame_layer=frame_layer;
-  }
+    mainw->play_start=1;
+    mainw->play_end=cfile->frames;
 
-  if (mainw->play_window!=NULL) {
-    lives_window_present (LIVES_WINDOW (mainw->play_window));
-    lives_xwindow_raise(lives_widget_get_xwindow(mainw->play_window));
-  }
+    if (mainw->play_window!=NULL) {
+      char *title=lives_strdup(_("LiVES: - Play Window"));
+      lives_window_set_title(LIVES_WINDOW(mainw->play_window), title);
+      lives_free(title);
+      if (mainw->double_size&&!mainw->fs&&(ohsize!=cfile->hsize||ovsize!=cfile->vsize)) {
+        // for single size sepwin, we resize frames to fit the window
+        mainw->must_resize=TRUE;
+        mainw->pheight=ovsize;
+        mainw->pwidth=ohsize;
+      }
+    } else if (mainw->multitrack==NULL) mainw->must_resize=FALSE;
 
-  mainw->switch_during_pb=FALSE;
-  mainw->osc_block=osc_block;
-}
+    if ((cfile->clip_type!=CLIP_TYPE_DISK&&cfile->clip_type!=CLIP_TYPE_FILE)||(mainw->event_list!=NULL&&!mainw->record))
+      mainw->play_end=INT_MAX;
 
+    // act like we are not playing a selection (but we will try to keep to
+    // selection bounds)
+    mainw->playing_sel=FALSE;
+
+    lives_spin_button_set_value(LIVES_SPIN_BUTTON(mainw->spinbutton_pb_fps),cfile->pb_fps);
+    changed_fps_during_pb(LIVES_SPIN_BUTTON(mainw->spinbutton_pb_fps), NULL);
+
+    if (!cfile->frameno&&cfile->frames) cfile->frameno=1;
+    cfile->last_frameno=cfile->frameno;
+
+    mainw->playing_file=new_file;
+
+    cfile->next_event=NULL;
+    mainw->deltaticks=0;
+    mainw->startticks=mainw->currticks;
+    // force loading of a frame from the new clip
+    if (!mainw->noswitch&&(cfile->clip_type==CLIP_TYPE_DISK||cfile->clip_type==CLIP_TYPE_FILE)) {
+      weed_plant_t *frame_layer=mainw->frame_layer;
+      mainw->frame_layer=NULL;
+      load_frame_image(cfile->frameno);
+      mainw->frame_layer=frame_layer;
+    }
 
+    if (mainw->play_window!=NULL) {
+      lives_window_present(LIVES_WINDOW(mainw->play_window));
+      lives_xwindow_raise(lives_widget_get_xwindow(mainw->play_window));
+    }
 
+    mainw->switch_during_pb=FALSE;
+    mainw->osc_block=osc_block;
+  }
 
 
-void resize (double scale) {
-  // resize the frame widgets
-  // set scale<0. to _force_ the playback frame to expand (for external capture)
 
-  LiVESPixbuf *sepbuf;
 
-  double oscale=scale;
 
-  int xsize;
-  int bx,by;
+  void resize(double scale) {
+    // resize the frame widgets
+    // set scale<0. to _force_ the playback frame to expand (for external capture)
 
-  int hspace=((sepbuf=lives_image_get_pixbuf (LIVES_IMAGE (mainw->sep_image)))!=NULL)?lives_pixbuf_get_height (sepbuf):0;
+    LiVESPixbuf *sepbuf;
 
-  // maximum values
-  int hsize,vsize;
-  int w,h,scr_width,scr_height;
+    double oscale=scale;
 
-  if (!prefs->show_gui||mainw->multitrack!=NULL) return;
-  get_border_size (mainw->LiVES,&bx,&by);
+    int xsize;
+    int bx,by;
 
-  if (prefs->gui_monitor==0) {
-    scr_width=mainw->scr_width;
-    scr_height=mainw->scr_height;
-  }
-  else {
-    scr_width=mainw->mgeom[prefs->gui_monitor-1].width;
-    scr_height=mainw->mgeom[prefs->gui_monitor-1].height;
-  }
+    int hspace=((sepbuf=lives_image_get_pixbuf(LIVES_IMAGE(mainw->sep_image)))!=NULL)?lives_pixbuf_get_height(sepbuf):0;
 
-  hsize=(scr_width-(V_RESIZE_ADJUST*2+bx))/3;    // yes this is correct (V_RESIZE_ADJUST)
-  vsize=(scr_height-(CE_FRAME_HSPACE+hspace+by));
+    // maximum values
+    int hsize,vsize;
+    int w,h,scr_width,scr_height;
 
-  if (scale<0.) {
-    // foreign capture
-    scale=-scale;
-    hsize=(scr_width-H_RESIZE_ADJUST-bx)/scale;
-    vsize=(scr_height-V_RESIZE_ADJUST-by)/scale;
-  }
+    if (!prefs->show_gui||mainw->multitrack!=NULL) return;
+    get_border_size(mainw->LiVES,&bx,&by);
 
-  if (mainw->current_file==-1||cfile==NULL||cfile->hsize==0) {
-    hsize=mainw->def_width-H_RESIZE_ADJUST;
-  }
-  else {
-    if (cfile->hsize<hsize) {
-      hsize=cfile->hsize;
+    if (prefs->gui_monitor==0) {
+      scr_width=mainw->scr_width;
+      scr_height=mainw->scr_height;
+    } else {
+      scr_width=mainw->mgeom[prefs->gui_monitor-1].width;
+      scr_height=mainw->mgeom[prefs->gui_monitor-1].height;
     }
-  }
 
-  if (mainw->current_file==-1||cfile==NULL||cfile->vsize==0) {
-    vsize=mainw->def_height-V_RESIZE_ADJUST;
-  }
-  else {
-    if (cfile->hsize>0&&(cfile->vsize*hsize/cfile->hsize<vsize)) {
-      vsize=cfile->vsize*hsize/cfile->hsize;
+    hsize=(scr_width-(V_RESIZE_ADJUST*2+bx))/3;    // yes this is correct (V_RESIZE_ADJUST)
+    vsize=(scr_height-(CE_FRAME_HSPACE+hspace+by));
+
+    if (scale<0.) {
+      // foreign capture
+      scale=-scale;
+      hsize=(scr_width-H_RESIZE_ADJUST-bx)/scale;
+      vsize=(scr_height-V_RESIZE_ADJUST-by)/scale;
     }
-  }
 
-  mainw->ce_frame_width=hsize;
-  mainw->ce_frame_height=vsize;
+    if (mainw->current_file==-1||cfile==NULL||cfile->hsize==0) {
+      hsize=mainw->def_width-H_RESIZE_ADJUST;
+    } else {
+      if (cfile->hsize<hsize) {
+        hsize=cfile->hsize;
+      }
+    }
 
-  if (!mainw->is_ready) return;
+    if (mainw->current_file==-1||cfile==NULL||cfile->vsize==0) {
+      vsize=mainw->def_height-V_RESIZE_ADJUST;
+    } else {
+      if (cfile->hsize>0&&(cfile->vsize*hsize/cfile->hsize<vsize)) {
+        vsize=cfile->vsize*hsize/cfile->hsize;
+      }
+    }
 
-  lives_widget_set_size_request (mainw->playframe, (int)hsize*scale+H_RESIZE_ADJUST, (int)vsize*scale+V_RESIZE_ADJUST);
+    mainw->ce_frame_width=hsize;
+    mainw->ce_frame_height=vsize;
 
-  if (oscale==2.) {
-    if (hsize*4<scr_width-70) {
-      scale=1.;
-    }
-  }
+    //if (!mainw->is_ready) return;
 
-  if (oscale>0.) {
-    mainw->ce_frame_width=(int)hsize/scale+H_RESIZE_ADJUST;
-    mainw->ce_frame_height=vsize/scale+V_RESIZE_ADJUST;
+    lives_widget_set_size_request(mainw->playframe, (int)hsize*scale+H_RESIZE_ADJUST, (int)vsize*scale+V_RESIZE_ADJUST);
 
-    if (mainw->current_file>-1&&cfile!=NULL) {
-      if (cfile->clip_type==CLIP_TYPE_YUV4MPEG||cfile->clip_type==CLIP_TYPE_VIDEODEV) {
-	if (mainw->camframe==NULL) {
-	  GError *error=NULL;
-	  gchar *tmp=g_build_filename(prefs->prefix_dir,THEME_DIR,"camera","frame.jpg",NULL);
-	  mainw->camframe=lives_pixbuf_new_from_file(tmp,&error);
-	  if (mainw->camframe!=NULL) lives_pixbuf_saturate_and_pixelate(mainw->camframe,mainw->camframe,0.0,FALSE);
-	  g_free(tmp);
-	}
-	if (mainw->camframe==NULL) {
-	  hsize=mainw->def_width-H_RESIZE_ADJUST;
-	  vsize=mainw->def_height-V_RESIZE_ADJUST;
-	}
-	else {
-	  hsize=lives_pixbuf_get_width(mainw->camframe);
-	  vsize=lives_pixbuf_get_height(mainw->camframe);
-	}
+    if (oscale==2.) {
+      if (hsize*4<scr_width-70) {
+        scale=1.;
       }
     }
 
-    lives_widget_set_size_request (mainw->frame1, (int)hsize/scale+H_RESIZE_ADJUST, vsize/scale+V_RESIZE_ADJUST);
-    lives_widget_set_size_request (mainw->eventbox3, (int)hsize/scale+H_RESIZE_ADJUST, vsize+V_RESIZE_ADJUST);
-    lives_widget_set_size_request (mainw->frame2, (int)hsize/scale+H_RESIZE_ADJUST, vsize/scale+V_RESIZE_ADJUST);
-    lives_widget_set_size_request (mainw->eventbox4, (int)hsize/scale+H_RESIZE_ADJUST, vsize+V_RESIZE_ADJUST);
+    if (oscale>0.) {
+      mainw->ce_frame_width=(int)hsize/scale+H_RESIZE_ADJUST;
+      mainw->ce_frame_height=vsize/scale+V_RESIZE_ADJUST;
 
-  }
+      if (mainw->current_file>-1&&cfile!=NULL) {
+        if (cfile->clip_type==CLIP_TYPE_YUV4MPEG||cfile->clip_type==CLIP_TYPE_VIDEODEV) {
+          if (mainw->camframe==NULL) {
+            LiVESError *error=NULL;
+            char *tmp=lives_build_filename(prefs->prefix_dir,THEME_DIR,"camera","frame.jpg",NULL);
+            mainw->camframe=lives_pixbuf_new_from_file(tmp,&error);
+            if (mainw->camframe!=NULL) lives_pixbuf_saturate_and_pixelate(mainw->camframe,mainw->camframe,0.0,FALSE);
+            lives_free(tmp);
+          }
+          if (mainw->camframe==NULL) {
+            hsize=mainw->def_width-H_RESIZE_ADJUST;
+            vsize=mainw->def_height-V_RESIZE_ADJUST;
+          } else {
+            hsize=lives_pixbuf_get_width(mainw->camframe);
+            vsize=lives_pixbuf_get_height(mainw->camframe);
+          }
+        }
+      }
+
+      lives_widget_set_size_request(mainw->frame1, (int)hsize/scale+H_RESIZE_ADJUST, vsize/scale+V_RESIZE_ADJUST);
+      lives_widget_set_size_request(mainw->eventbox3, (int)hsize/scale+H_RESIZE_ADJUST, vsize+V_RESIZE_ADJUST);
+      lives_widget_set_size_request(mainw->frame2, (int)hsize/scale+H_RESIZE_ADJUST, vsize/scale+V_RESIZE_ADJUST);
+      lives_widget_set_size_request(mainw->eventbox4, (int)hsize/scale+H_RESIZE_ADJUST, vsize+V_RESIZE_ADJUST);
 
-  else {
-    xsize=(scr_width-hsize*-oscale-H_RESIZE_ADJUST)/2;
-    if (xsize>0) {
-      lives_widget_set_size_request (mainw->frame1, xsize/scale, vsize+V_RESIZE_ADJUST);
-      lives_widget_set_size_request (mainw->eventbox3, xsize/scale, vsize+V_RESIZE_ADJUST);
-      lives_widget_set_size_request (mainw->frame2, xsize/scale, vsize+V_RESIZE_ADJUST);
-      lives_widget_set_size_request (mainw->eventbox4, xsize/scale, vsize+V_RESIZE_ADJUST);
-      mainw->ce_frame_width=xsize/scale;
-      mainw->ce_frame_height=vsize+V_RESIZE_ADJUST;
     }
+
     else {
-      // this is for foreign capture
-      lives_widget_hide(mainw->frame1);
-      lives_widget_hide(mainw->frame2);
-      lives_widget_hide(mainw->eventbox3);
-      lives_widget_hide(mainw->eventbox4);
-      lives_container_set_border_width (LIVES_CONTAINER (mainw->playframe), 0);
+      xsize=(scr_width-hsize*-oscale-H_RESIZE_ADJUST)/2;
+      if (xsize>0) {
+        lives_widget_set_size_request(mainw->frame1, xsize/scale, vsize+V_RESIZE_ADJUST);
+        lives_widget_set_size_request(mainw->eventbox3, xsize/scale, vsize+V_RESIZE_ADJUST);
+        lives_widget_set_size_request(mainw->frame2, xsize/scale, vsize+V_RESIZE_ADJUST);
+        lives_widget_set_size_request(mainw->eventbox4, xsize/scale, vsize+V_RESIZE_ADJUST);
+        mainw->ce_frame_width=xsize/scale;
+        mainw->ce_frame_height=vsize+V_RESIZE_ADJUST;
+      } else {
+        // this is for foreign capture
+        lives_widget_hide(mainw->frame1);
+        lives_widget_hide(mainw->frame2);
+        lives_widget_hide(mainw->eventbox3);
+        lives_widget_hide(mainw->eventbox4);
+        lives_container_set_border_width(LIVES_CONTAINER(mainw->playframe), 0);
+      }
     }
-  }
-
-  w=lives_widget_get_allocation_width(mainw->LiVES);
-  h=lives_widget_get_allocation_height(mainw->LiVES);
 
-  if (prefs->open_maximised||w>scr_width-bx||h>scr_height-by) {
-    lives_window_resize(LIVES_WINDOW(mainw->LiVES),scr_width-bx,scr_height-by);
-    lives_window_maximize (LIVES_WINDOW(mainw->LiVES));
-    lives_widget_queue_resize(mainw->LiVES);
-  }
+    w=lives_widget_get_allocation_width(mainw->LiVES);
+    h=lives_widget_get_allocation_height(mainw->LiVES);
+
+    if (prefs->open_maximised||w>scr_width-bx||h>scr_height-by) {
+      lives_window_resize(LIVES_WINDOW(mainw->LiVES),scr_width-bx,scr_height-by);
+      lives_window_maximize(LIVES_WINDOW(mainw->LiVES));
+      lives_widget_queue_resize(mainw->LiVES);
+    }
 
-  if (!mainw->foreign&&mainw->playing_file==-1&&mainw->current_file>0&&cfile!=NULL&&(!cfile->opening||cfile->clip_type==CLIP_TYPE_FILE)) {
+    if (!mainw->foreign&&mainw->playing_file==-1&&mainw->current_file>0&&cfile!=NULL&&(!cfile->opening||cfile->clip_type==CLIP_TYPE_FILE)) {
       lives_spin_button_set_value(LIVES_SPIN_BUTTON(mainw->spinbutton_start),cfile->start);
       lives_spin_button_set_value(LIVES_SPIN_BUTTON(mainw->spinbutton_end),cfile->end);
       load_start_image(cfile->start);
       load_end_image(cfile->end);
+    }
+
   }
-  
-}

LiVES-2.2.8.tar.bz2/src/main.h -> LiVES-2.4.1.tar.bz2/src/main.h Changed

@@ -4,7 +4,7 @@
 // see file ../COPYING for full licensing details
 
 /*  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 
+    it under the terms of the GNU General Public License version 3 or higher as
     published by the Free Software Foundation.
 
     This program is distributed in the hope that it will be useful,
@@ -48,6 +48,9 @@
 // Have fun, and let's fight for Free Speech, Open Media and True Creativity !
 // - Salsaman
 
+
+// note: preferred coding style is: astyle --style=java -H -Y -s2 -U -k3 -W3 -xC140 -xL
+
 #ifndef HAS_LIVES_MAIN_H
 #define HAS_LIVES_MAIN_H
 
@@ -55,14 +58,19 @@
 #undef HAVE_UNICAP
 #endif
 
+#ifndef GUI_QT
 #define GUI_GTK
 #define PAINTER_CAIRO
-
-//#define GUI_QT
-//#define PAINTER_QPAINTER
+#else
+#define PAINTER_QPAINTER
+#define NO_PROG_LOAD
+#undef ENABLE_GIW
+#endif
 
 #ifdef GUI_GTK
 
+#define USE_GLIB
+
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
 
@@ -87,8 +95,8 @@
 
 #define O_SYNC (FILE_FLAG_NO_BUFFERING|FILE_FLAG_WRITE_THROUGH)
 
-typedef PROCESS_INFORMATION * lives_pid_t;
-typedef PROCESS_INFORMATION * lives_pgid_t;
+typedef PROCESS_INFORMATION *lives_pid_t;
+typedef PROCESS_INFORMATION *lives_pgid_t;
 
 #ifdef GUI_GTK
 #ifndef GDK_WINDOWING_WIN32
@@ -133,6 +141,12 @@
 #endif
 
 #include <stdint.h>
+#include <stdarg.h>
+
+
+#ifndef ulong
+#define ulong unsigned long
+#endif
 
 
 #define QUOTEME(x) #x
@@ -237,6 +251,7 @@
 #endif
 
 #include <limits.h>
+#include <float.h>
 
 #ifndef PATH_MAX
 #ifdef MAX_PATH
@@ -260,7 +275,7 @@
 
 #include "widget-helper.h"
 
-typedef  void *(*fn_ptr) (void *ptr);
+typedef  void *(*fn_ptr)(void *ptr);
 
 
 /// this struct is used only when physically resampling frames on the disk
@@ -271,6 +286,7 @@
 } event;
 
 typedef struct {
+  // processing / busy dialog
   LiVESWidget *processing;
   LiVESWidget *progressbar;
   LiVESWidget *label;
@@ -282,6 +298,7 @@
   LiVESWidget *cancel_button;
   LiVESWidget *scrolledwindow;
   uint32_t frames_done;
+  boolean is_ready;
 } xprocess;
 
 
@@ -293,6 +310,7 @@
   double vel;
 } lives_audio_track_state_t;
 
+
 #if HAVE_SYSTEM_WEED
 #include <weed/weed.h>
 #include <weed/weed-events.h>
@@ -301,13 +319,15 @@
 #include "../libweed/weed-events.h"
 #endif
 
-
-
 // see weed event spec. for more info
 
 /// need this for event_list_t *
 #include "events.h"
 
+#ifdef IS_LIBLIVES
+#include "liblives.hpp"
+#include "lbindings.h"
+#endif
 
 typedef enum {
   UNDO_NONE=0,
@@ -473,10 +493,10 @@
 
   /////////////////
   int frames;
-  gchar title[256];
-  gchar author[256];
-  gchar comment[256];
-  gchar keywords[256];
+  char title[256];
+  char author[256];
+  char comment[256];
+  char keywords[256];
   ////////////////
 
   lives_interlace_t interlace; ///< interlace type (if known - none, topfirst, bottomfirst or : see plugins.h)
@@ -491,17 +511,17 @@
   /// the processing window
   xprocess *proc_ptr;
 
-  gchar handle[256];
+  char handle[256];
   int ohsize;
   int ovsize;
   int64_t f_size;
   int64_t afilesize;
   int old_frames; ///< for deordering, etc.
-  gchar file_name[PATH_MAX]; ///< input file
-  gchar info_file[PATH_MAX];
-  gchar name[256];  ///< the display name
-  gchar save_file_name[PATH_MAX];
-  gchar type[40];
+  char file_name[PATH_MAX]; ///< input file
+  char info_file[PATH_MAX];
+  char name[256];  ///< the display name
+  char save_file_name[PATH_MAX];
+  char type[40];
   int start;
   int end;
   int insert_start;
@@ -510,14 +530,14 @@
   int progress_end;
   boolean changed;
   LiVESWidget *menuentry;
-  gulong menuentry_func;
+  ulong menuentry_func;
   boolean orig_file_name;
   boolean was_renamed;
   boolean is_untitled;
   double pb_fps;
   double freeze_fps;
   boolean play_paused;
-  
+
   //opening/restoring status
   boolean opening;
   boolean opening_audio;
@@ -549,14 +569,14 @@
   // see resample.c for new events system
 
 
-  // events 
+  // events
   event *events[1];  ///<for block resampler
 
   weed_plant_t *event_list;
   weed_plant_t *event_list_back;
   weed_plant_t *next_event;
 
-  GList *layout_map;
+  LiVESList *layout_map;
   ////////////////////////////////////////////////////////////////////////////////////////
 
   ///undo
@@ -564,8 +584,8 @@
 
   int undo_start;
   int undo_end;
-  gchar undo_text[32];
-  gchar redo_text[32];
+  char undo_text[32];
+  char redo_text[32];
   boolean undoable;
   boolean redoable;
 
@@ -611,7 +631,7 @@
 
   // decoder data
 
-  gchar mime_type[256];
+  char mime_type[256];
 
 
   boolean deinterlace; ///< auto deinterlace
@@ -626,7 +646,7 @@
 
   lives_subtitles_t *subt;
 
-  gchar *op_dir;
+  char *op_dir;
   uint64_t op_ds_warn_level; ///< current disk space warning level for any output directory
 
   boolean no_proc_sys_errors; ///< skip system error dialogs in processing
@@ -672,15 +692,27 @@
   boolean has_xdg_screensaver;
 
   /// home directory - default location for config file - locale encoding
-  gchar home_dir[PATH_MAX];
+  char home_dir[PATH_MAX];
 
   /// system tempdir (e.g /tmp for linux, C:\TEMP for win32)
-  gchar system_tmpdir[PATH_MAX];  ///< kept in locale encoding
+  char system_tmpdir[PATH_MAX];  ///< kept in locale encoding
+
+#ifndef IS_MINGW
+  char touch_cmd[PATH_MAX];
+  char rm_cmd[PATH_MAX];
+  char mv_cmd[PATH_MAX];
+  char cp_cmd[PATH_MAX];
+  char ln_cmd[PATH_MAX];
+  char chmod_cmd[PATH_MAX];
+  char cat_cmd[PATH_MAX];
+  char echo_cmd[PATH_MAX];
+  char rmdir_cmd[PATH_MAX];
+#endif
 
-  gchar *rcfile;
+  char *rcfile;
 
   /// used for returning startup messages from the backend
-  gchar startup_msg[256];
+  char startup_msg[256];
 
   // plugins
   boolean has_encoder_plugins;
@@ -689,10 +721,10 @@
   uint64_t python_version;
 
   short cpu_bits;
-  
 
-  gchar *myname_full;
-  gchar *myname;
+
+  char *myname_full;
+  char *myname;
 
   boolean has_stderr;
 
@@ -700,10 +732,6 @@
 
   int ncpus;
 
-
-#define LIVES_LITTLE_ENDIAN G_LITTLE_ENDIAN
-#define LIVES_BIG_ENDIAN G_BIG_ENDIAN
-
   int byte_order;
 
   pid_t mainpid;
@@ -765,7 +793,7 @@
 
 
 /// type sizes
-extern size_t sizint, sizdbl, sizshrt;
+extern ssize_t sizint, sizdbl, sizshrt;
 
 
 
@@ -799,47 +827,49 @@
 // some useful functions
 
 // interface.c
-xprocess* create_processing (const gchar *text);
+xprocess *create_processing(const char *text);
 void add_to_clipmenu(void);
 void remove_from_clipmenu(void);
 void make_play_window(void);
-void resize_play_window (void);
-void kill_play_window (void);
-void make_preview_box (void);
+void resize_play_window(void);
+void kill_play_window(void);
+void make_preview_box(void);
 void play_window_set_title(void);
-void add_to_playframe (void);
-LiVESWidget* create_cdtrack_dialog (int type, gpointer user_data);
+void add_to_playframe(void);
+LiVESWidget *create_cdtrack_dialog(int type, livespointer user_data);
 LiVESTextView *create_output_textview(void);
-gchar *choose_file(gchar *dir, gchar *fname, gchar **filt, LiVESFileChooserAction act, const char *title, LiVESWidget *extra);
-LiVESWidget *choose_file_with_preview (gchar *dir, const gchar *title, int preview_type);
-void add_suffix_check(LiVESBox *box, const gchar *ext);
+char *choose_file(const char *dir, const char *fname, char **const filt, LiVESFileChooserAction act, const char *title, LiVESWidget *extra);
+LiVESWidget *choose_file_with_preview(const char *dir, const char *title, int preview_type);
+void add_suffix_check(LiVESBox *box, const char *ext);
 
 
 // dialogs.c
-boolean do_progress_dialog(boolean visible, boolean cancellable, const gchar *text);
-boolean do_warning_dialog(const gchar *text);
-boolean do_warning_dialog_with_check(const gchar *text, int warn_mask_number);
-boolean do_warning_dialog_with_check_transient(const gchar *text, int warn_mask_number, LiVESWindow *transient);
-boolean do_yesno_dialog(const gchar *text);
-boolean do_yesno_dialog_with_check (const gchar *text, int warn_mask_number);
-boolean do_yesno_dialog_with_check_transient(const gchar *text, int warn_mask_number, LiVESWindow *transient);
-boolean do_yesno_dialog_with_check(const gchar *text, int warn_mask_number);
-boolean do_yesno_dialog_with_check_transient(const gchar *text, int warn_mask_number, LiVESWindow *transient);
-int do_abort_cancel_retry_dialog(const gchar *text, LiVESWindow *transient) WARN_UNUSED;
-int do_error_dialog(const gchar *text);
-int do_info_dialog(const gchar *text);
-int do_error_dialog_with_check(const gchar *text, int warn_mask_number);
-int do_blocking_error_dialog(const gchar *text);
-int do_blocking_info_dialog(const gchar *text);
-int do_error_dialog_with_check_transient(const gchar *text, boolean is_blocking, int warn_mask_number, 
-					 LiVESWindow *transient);
-int do_info_dialog_with_transient(const gchar *text, boolean is_blocking, LiVESWindow *transient);
+boolean do_progress_dialog(boolean visible, boolean cancellable, const char *text);
+boolean do_warning_dialog(const char *text);
+boolean do_warning_dialog_with_check(const char *text, int warn_mask_number);
+boolean do_warning_dialog_with_check_transient(const char *text, int warn_mask_number, LiVESWindow *transient);
+boolean do_yesno_dialog(const char *text);
+boolean do_yesno_dialog_with_check(const char *text, int warn_mask_number);
+boolean do_yesno_dialog_with_check_transient(const char *text, int warn_mask_number, LiVESWindow *transient);
+boolean do_yesno_dialog_with_check(const char *text, int warn_mask_number);
+boolean do_yesno_dialog_with_check_transient(const char *text, int warn_mask_number, LiVESWindow *transient);
+int do_abort_cancel_retry_dialog(const char *text, LiVESWindow *transient) WARN_UNUSED;
+int do_error_dialog(const char *text);
+int do_info_dialog(const char *text);
+int do_error_dialog_with_check(const char *text, int warn_mask_number);
+int do_blocking_error_dialog(const char *text);
+int do_blocking_info_dialog(const char *text);
+int do_error_dialog_with_check_transient(const char *text, boolean is_blocking, int warn_mask_number,
+    LiVESWindow *transient);
+int do_info_dialog_with_transient(const char *text, boolean is_blocking, LiVESWindow *transient);
+LiVESWidget *create_message_dialog(lives_dialog_t diat, const char *text, LiVESWindow *transient,
+                                   int warn_mask_number, boolean is_blocking);
 
 
 void do_system_failed_error(const char *com, int retval, const char *addinfo);
-int do_write_failed_error_s_with_retry(const gchar *fname, const gchar *errtext, LiVESWindow *transient) WARN_UNUSED;
+int do_write_failed_error_s_with_retry(const char *fname, const char *errtext, LiVESWindow *transient) WARN_UNUSED;
 void do_write_failed_error_s(const char *filename, const char *addinfo);
-int do_read_failed_error_s_with_retry(const gchar *fname, const gchar *errtext, LiVESWindow *transient) WARN_UNUSED;
+int do_read_failed_error_s_with_retry(const char *fname, const char *errtext, LiVESWindow *transient) WARN_UNUSED;
 void do_read_failed_error_s(const char *filename, const char *addinfo);
 boolean do_header_write_error(int clip);
 int do_header_read_error_with_retry(int clip) WARN_UNUSED;
@@ -849,37 +879,37 @@
 boolean check_backend_return(lives_clip_t *sfile);
 
 /** warn about disk space */
-gchar *ds_critical_msg(const gchar *dir, uint64_t dsval);
-gchar *ds_warning_msg(const gchar *dir, uint64_t dsval, uint64_t cwarn, uint64_t nwarn);
+char *ds_critical_msg(const char *dir, uint64_t dsval);
+char *ds_warning_msg(const char *dir, uint64_t dsval, uint64_t cwarn, uint64_t nwarn);
 boolean check_storage_space(lives_clip_t *sfile, boolean is_processing);
 
-gchar *get_upd_msg(void);
-gchar *get_new_install_msg(void);
+char *get_upd_msg(void);
+char *get_new_install_msg(void);
 
 boolean ask_permission_dialog(int what);
 boolean do_abort_check(void);
-void add_warn_check (LiVESBox *box, int warn_mask_number);
-void do_memory_error_dialog (void);
+void add_warn_check(LiVESBox *box, int warn_mask_number);
+void do_memory_error_dialog(void);
 void too_many_files(void);
-void tempdir_warning (void);
+void tempdir_warning(void);
 void do_audio_import_error(void);
 void do_mt_backup_space_error(lives_mt *, int memreq_mb);
 
 boolean do_clipboard_fps_warning(void);
 void perf_mem_warning(void);
 void do_dvgrab_error(void);
-boolean do_comments_dialog (lives_clip_t *sfile, gchar *filename);
-boolean do_auto_dialog(const gchar *text, int type);
-void do_encoder_acodec_error (void);
+boolean do_comments_dialog(lives_clip_t *sfile, char *filename);
+boolean do_auto_dialog(const char *text, int type);
+void do_encoder_acodec_error(void);
 void do_encoder_sox_error(void);
-boolean rdet_suggest_values (int width, int height, double fps, int fps_num, int fps_denom, int arate, 
-			     int asigned, boolean swap_endian, boolean anr, boolean ignore_fps);
-boolean do_encoder_restrict_dialog (int width, int height, double fps, int fps_num, int fps_denom, 
-				    int arate, int asigned, boolean swap_endian, boolean anr, boolean save_all);
-void do_keys_window (void);
-void do_mt_keys_window (void);
-void do_messages_window (void);
-void do_firstever_dialog (void);
+boolean rdet_suggest_values(int width, int height, double fps, int fps_num, int fps_denom, int arate,
+                            int asigned, boolean swap_endian, boolean anr, boolean ignore_fps);
+boolean do_encoder_restrict_dialog(int width, int height, double fps, int fps_num, int fps_denom,
+                                   int arate, int asigned, boolean swap_endian, boolean anr, boolean save_all);
+void do_keys_window(void);
+void do_mt_keys_window(void);
+void do_messages_window(void);
+void do_firstever_dialog(void);
 void do_upgrade_error_dialog(void);
 void do_no_mplayer_sox_error(void);
 void do_aud_during_play_error(void);
@@ -887,8 +917,8 @@
 void do_layout_scrap_file_error(void);
 void do_layout_ascrap_file_error(void);
 void do_set_load_lmap_error(void);
-boolean do_set_duplicate_warning (const gchar *new_set);
-boolean do_set_rename_old_layouts_warning(const gchar *new_set);
+boolean do_set_duplicate_warning(const char *new_set);
+boolean do_set_rename_old_layouts_warning(const char *new_set);
 boolean do_layout_alter_frames_warning(void);
 boolean do_layout_alter_audio_warning(void);
 boolean do_yuv4m_open_warning(void);
@@ -902,45 +932,45 @@
 void do_audrate_error_dialog(void);
 boolean do_event_list_warning(void);
 void do_nojack_rec_error(void);
-void do_vpp_palette_error (void);
-void do_vpp_fps_error (void);
-void do_decoder_palette_error (void);
-void do_rmem_max_error (int size);
-boolean do_original_lost_warning(const gchar *fname);
-void do_no_decoder_error(const gchar *fname);
+void do_vpp_palette_error(void);
+void do_vpp_fps_error(void);
+void do_decoder_palette_error(void);
+void do_rmem_max_error(int size);
+boolean do_original_lost_warning(const char *fname);
+void do_no_decoder_error(const char *fname);
 void do_jack_noopen_warn(void);
 void do_jack_noopen_warn2(void);
 void do_jack_noopen_warn3(void);
 void do_jack_noopen_warn4(void);
-void do_file_perm_error(const gchar *file_name);
-void do_dir_perm_error(const gchar *dir_name);
-void do_dir_perm_access_error(const gchar *dir_name);
+void do_file_perm_error(const char *file_name);
+void do_dir_perm_error(const char *dir_name);
+void do_dir_perm_access_error(const char *dir_name);
 void do_encoder_img_ftm_error(render_details *rdet);
-void do_after_crash_warning (void);
+void do_after_crash_warning(void);
 void do_bad_layout_error(void);
 void do_card_in_use_error(void);
-void do_dev_busy_error(const gchar *devstr);
+void do_dev_busy_error(const char *devstr);
 boolean do_existing_subs_warning(void);
 void do_invalid_subs_error(void);
 boolean do_erase_subs_warning(void);
-boolean do_sub_type_warning(const gchar *ext, const gchar *type_ext);
+boolean do_sub_type_warning(const char *ext, const char *type_ext);
 boolean do_move_tmpdir_dialog(void);
-void do_set_locked_warning (const gchar *setname);
+void do_set_locked_warning(const char *setname);
 void do_no_in_vdevs_error(void);
 void do_locked_in_vdevs_error(void);
-void do_do_not_close_d (void);
+void do_do_not_close_d(void);
 void do_set_noclips_error(const char *setname);
 void do_no_autolives_error(void);
 void do_autolives_needs_clips_error(void);
 void do_pulse_lost_conn_error(void);
 void do_jack_lost_conn_error(void);
 
-boolean process_one (boolean visible);
-void do_threaded_dialog(gchar *translated_text, boolean has_cancel);
+boolean process_one(boolean visible);
+void do_threaded_dialog(char *translated_text, boolean has_cancel);
 void end_threaded_dialog(void);
-void threaded_dialog_spin (void);
-void response_ok (LiVESButton *button, gpointer user_data);
-void pump_io_chan(GIOChannel *iochan);
+void threaded_dialog_spin(void);
+void response_ok(LiVESButton *button, livespointer user_data);
+void pump_io_chan(LiVESIOChannel *iochan);
 
 void do_splash_progress(void);
 
@@ -952,54 +982,54 @@
 void d_print_file_error_failed(void);
 
 // general
-void do_text_window (const gchar *title, const gchar *text);
+void do_text_window(const char *title, const char *text);
 
 // saveplay.c
-boolean read_file_details(const gchar *file_name, boolean only_check_for_audio);
-boolean add_file_info(const gchar *check_handle, boolean aud_only);
-boolean save_file_comments (int fileno);
+boolean read_file_details(const char *file_name, boolean only_check_for_audio);
+boolean add_file_info(const char *check_handle, boolean aud_only);
+boolean save_file_comments(int fileno);
 boolean reload_clip(int fileno);
-void reget_afilesize (int fileno);
-void deduce_file(const gchar *filename, double start_time, int end);
-void open_file (const gchar *filename);
-void open_file_sel(const gchar *file_name, double start_time, int frames);
-void open_fw_device (void);
-boolean get_new_handle(int index, const gchar *name);
+void reget_afilesize(int fileno);
+ulong deduce_file(const char *filename, double start_time, int end);
+ulong open_file(const char *filename);
+ulong open_file_sel(const char *file_name, double start_time, int frames);
+void open_fw_device(void);
+boolean get_new_handle(int index, const char *name);
 boolean get_temp_handle(int index, boolean create);
 boolean get_handle_from_info_file(int index);
 void create_cfile(void);
-void save_file (int clip, int start, int end, const char *filename);
-void play_file (void);
-void save_frame (LiVESMenuItem *menuitem, gpointer user_data);
-boolean save_frame_inner(int clip, int frame, const gchar *file_name, int width, int height, boolean from_osc);
-void wait_for_stop (const gchar *stop_command);
+void save_file(int clip, int start, int end, const char *filename);
+void play_file(void);
+void save_frame(LiVESMenuItem *menuitem, livespointer user_data);
+boolean save_frame_inner(int clip, int frame, const char *file_name, int width, int height, boolean from_osc);
+void wait_for_stop(const char *stop_command);
 boolean save_clip_values(int which_file);
-void add_to_recovery_file (const gchar *handle);
+void add_to_recovery_file(const char *handle);
 void rewrite_recovery_file(void);
-boolean check_for_recovery_files (boolean auto_recover);
+boolean check_for_recovery_files(boolean auto_recover);
 void recover_layout_map(int numclips);
-const gchar *get_deinterlace_string(void);
+const char *get_deinterlace_string(void);
 
 // saveplay.c backup
-void backup_file(int clip, int start, int end, const gchar *filename);
+void backup_file(int clip, int start, int end, const char *filename);
 int save_event_frames(void);
-boolean write_headers (lives_clip_t *file);
+boolean write_headers(lives_clip_t *file);
 
 // saveplay.c restore
-void restore_file(const gchar *filename);
-boolean read_headers(const gchar *file_name);
+ulong restore_file(const char *filename);
+boolean read_headers(const char *file_name);
 
 // saveplay.c sets
-void open_set_file (const gchar *set_name, int clipnum);
+void open_set_file(const char *set_name, int clipnum);
 
 
 // saveplay.c scrap file
-boolean open_scrap_file (void);
-boolean open_ascrap_file (void);
-int save_to_scrap_file (weed_plant_t *layer);
+boolean open_scrap_file(void);
+boolean open_ascrap_file(void);
+int save_to_scrap_file(weed_plant_t *layer);
 boolean load_from_scrap_file(weed_plant_t *layer, int frame);
-void close_ascrap_file (void);
-void close_scrap_file (void);
+void close_ascrap_file(void);
+void close_scrap_file(void);
 
 
 // main.c
@@ -1008,10 +1038,10 @@
 void set_signal_handlers(SignalHandlerPointer sigfunc);
 void catch_sigint(int signum);
 void defer_sigint(int signum);
-boolean startup_message_fatal(const gchar *msg);
-boolean startup_message_nonfatal(const gchar *msg);
-boolean startup_message_info(const gchar *msg);
-boolean startup_message_nonfatal_dismissable(const gchar *msg, int warning_mask);
+boolean startup_message_fatal(const char *msg);
+boolean startup_message_nonfatal(const char *msg);
+boolean startup_message_info(const char *msg);
+boolean startup_message_nonfatal_dismissable(const char *msg, int warning_mask);
 capability *get_capabilities(void);
 void get_monitors(void);
 void set_ce_frame_from_pixbuf(LiVESImage *image, LiVESPixbuf *pixbuf, lives_painter_t *);
@@ -1019,17 +1049,17 @@
 void load_end_image(int frame);
 void load_preview_image(boolean update_always);
 
-boolean pull_frame(weed_plant_t *layer, const gchar *image_ext, weed_timecode_t tc);
-void pull_frame_threaded (weed_plant_t *layer, const char *img_ext, weed_timecode_t tc);
+boolean pull_frame(weed_plant_t *layer, const char *image_ext, weed_timecode_t tc);
+void pull_frame_threaded(weed_plant_t *layer, const char *img_ext, weed_timecode_t tc);
 void check_layer_ready(weed_plant_t *layer);
-boolean pull_frame_at_size (weed_plant_t *layer, const gchar *image_ext, weed_timecode_t tc, 
-			    int width, int height, int target_palette);
-LiVESPixbuf *pull_lives_pixbuf_at_size(int clip, int frame, const char *image_ext, weed_timecode_t tc, 
-				       int width, int height, LiVESInterpType interp);
+boolean pull_frame_at_size(weed_plant_t *layer, const char *image_ext, weed_timecode_t tc,
+                           int width, int height, int target_palette);
+LiVESPixbuf *pull_lives_pixbuf_at_size(int clip, int frame, const char *image_ext, weed_timecode_t tc,
+                                       int width, int height, LiVESInterpType interp);
 LiVESPixbuf *pull_lives_pixbuf(int clip, int frame, const char *image_ext, weed_timecode_t tc);
 
-GError * lives_pixbuf_save(LiVESPixbuf *pixbuf, gchar *fname, lives_image_type_t imgtype, 
-			   int quality, boolean do_chmod, GError **gerrorptr);
+LiVESError *lives_pixbuf_save(LiVESPixbuf *pixbuf, char *fname, lives_image_type_t imgtype,
+                              int quality, boolean do_chmod, LiVESError **gerrorptr);
 
 void init_track_decoders(void);
 void free_track_decoders(void);
@@ -1039,39 +1069,46 @@
 void sensitize(void);
 void desensitize(void);
 void procw_desensitize(void);
-void close_current_file (int file_to_switch_to);  ///< close current file, and try to switch to file_to_switch_to
+void close_current_file(int file_to_switch_to);   ///< close current file, and try to switch to file_to_switch_to
 void get_next_free_file(void);
 void switch_to_file(int old_file, int new_file);
-void do_quick_switch (int new_file);
+void do_quick_switch(int new_file);
 void switch_audio_clip(int new_file, boolean activate);
-void resize (double scale);
+void resize(double scale);
 void do_start_messages(void);
-void set_palette_colours (void);
-void set_main_title(const gchar *filename, int or_untitled_number);
-void set_record (void);
+void set_palette_colours(void);
+void set_main_title(const char *filename, int or_untitled_number);
+void set_record(void);
 
 //gui.c
-void  create_LiVES (void);
-void enable_record (void);
-void toggle_record (void);
-void disable_record (void);
+void  create_LiVES(void);
+void set_interactive(boolean interactive);
+char *get_menu_name(lives_clip_t *sfile);
+void enable_record(void);
+void toggle_record(void);
+void disable_record(void);
 void make_custom_submenus(void);
 void fade_background(void);
 void unfade_background(void);
-void block_expose (void);
-void unblock_expose (void);
+void block_expose(void);
+void unblock_expose(void);
 void frame_size_update(void);
 void splash_init(void);
 void splash_end(void);
-void splash_msg(const gchar *msg, double pct);
+void splash_msg(const char *msg, double pct);
 void add_message_scroller(LiVESWidget *conter);
 void resize_widgets_for_monitor(boolean get_play_times);
 #if GTK_CHECK_VERSION(3,0,0)
 void calibrate_sepwin_size(void);
-boolean expose_pim (LiVESWidget *widget, lives_painter_t *cr, gpointer user_data);
-boolean expose_sim (LiVESWidget *widget, lives_painter_t *cr, gpointer user_data);
-boolean expose_eim (LiVESWidget *widget, lives_painter_t *cr, gpointer user_data);
+boolean expose_pim(LiVESWidget *widget, lives_painter_t *cr, livespointer user_data);
+boolean expose_sim(LiVESWidget *widget, lives_painter_t *cr, livespointer user_data);
+boolean expose_eim(LiVESWidget *widget, lives_painter_t *cr, livespointer user_data);
 #endif
+
+
+
+
+
 // system calls in utils.c
 int lives_system(const char *com, boolean allow_error);
 lives_pid_t lives_fork(const char *com);
@@ -1080,10 +1117,10 @@
 int lives_close_buffered(int fd);
 void lives_close_all_file_buffers(void);
 off_t lives_lseek_buffered_rdonly(int fd, off_t offset);
-ssize_t lives_write(int fd, const void *buf, size_t count, boolean allow_fail);
-ssize_t lives_write_buffered(int fd, const void *buf, size_t count, boolean allow_fail);
-ssize_t lives_write_le(int fd, const void *buf, size_t count, boolean allow_fail);
-ssize_t lives_write_le_buffered(int fd, const void *buf, size_t count, boolean allow_fail);
+ssize_t lives_write(int fd, livesconstpointer buf, size_t count, boolean allow_fail);
+ssize_t lives_write_buffered(int fd, livesconstpointer buf, size_t count, boolean allow_fail);
+ssize_t lives_write_le(int fd, livesconstpointer buf, size_t count, boolean allow_fail);
+ssize_t lives_write_le_buffered(int fd, livesconstpointer buf, size_t count, boolean allow_fail);
 ssize_t lives_read(int fd, void *buf, size_t count, boolean allow_less);
 ssize_t lives_read_buffered(int fd, void *buf, size_t count, boolean allow_less);
 ssize_t lives_read_le(int fd, void *buf, size_t count, boolean allow_less);
@@ -1095,8 +1132,6 @@
 int lives_getgid(void);
 int lives_getuid(void);
 void lives_freep(void **ptr);
-void lives_free(livespointer ptr);
-void lives_free_with_check(livespointer ptr);
 #ifdef IS_MINGW
 boolean lives_win32_suspend_resume_process(DWORD pid, boolean suspend);
 boolean lives_win32_kill_subprocesses(DWORD pid, boolean kill_parent);
@@ -1110,6 +1145,8 @@
 boolean lives_fsync(int fd);
 void lives_sync(void);
 
+int lives_utf8_strcasecmp(const char *s1, const char *s2);
+
 char *filename_from_fd(char *val, int fd);
 
 float LEFloat_to_BEFloat(float f);
@@ -1132,7 +1169,7 @@
 char *get_extension(const char *filename);
 uint64_t get_version_hash(const char *exe, const char *sep, int piece);
 uint64_t make_version_hash(const char *ver);
-void d_print(const char *text);
+void d_print(const char *fmt, ...);
 void init_clipboard(void);
 boolean cache_file_contents(const char *filename);
 char *get_val_from_cached_list(const char *key, size_t maxlen);
@@ -1142,10 +1179,10 @@
 void set_menu_text(LiVESWidget *menu, const char *text, boolean use_mnemonic);
 void get_menu_text(LiVESWidget *menu, char *text);
 void get_menu_text_long(LiVESWidget *menuitem, char *text);
-void reset_clipmenu (void);
+void reset_clipmenu(void);
 void get_play_times(void);
-void get_total_time (lives_clip_t *file);
-uint32_t get_signed_endian (boolean is_signed, boolean little_endian);
+void get_total_time(lives_clip_t *file);
+uint32_t get_signed_endian(boolean is_signed, boolean little_endian);
 void fullscreen_internal(void);
 void switch_to_int_player(void);
 void switch_to_mplayer(void);
@@ -1157,7 +1194,7 @@
 boolean prepare_to_play_foreign(void);
 boolean after_foreign_play(void);
 boolean check_file(const char *file_name, boolean check_exists);  ///< check if file exists
-boolean check_dir_access (const char *dir);
+boolean check_dir_access(const char *dir);
 uint64_t get_file_size(int fd);
 uint64_t sget_file_size(const char *name);
 uint64_t get_fs_free(const char *dir);
@@ -1166,23 +1203,23 @@
 char *ensure_extension(const char *fname, const char *ext) WARN_UNUSED;
 boolean check_dev_busy(char *devstr);
 void activate_url_inner(const char *link);
-void activate_url (GtkAboutDialog *about, const char *link, gpointer data);
-void show_manual_section (const char *lang, const char *section);
+void activate_url(LiVESAboutDialog *about, const char *link, livespointer data);
+void show_manual_section(const char *lang, const char *section);
 
-double calc_time_from_frame (int clip, int frame);
-int calc_frame_from_time (int filenum, double time);  ///< nearest frame start
-int calc_frame_from_time2 (int filenum, double time); ///< nearest frame end
-int calc_frame_from_time3 (int filenum, double time); ///< nearest frame mid
+double calc_time_from_frame(int clip, int frame);
+int calc_frame_from_time(int filenum, double time);   ///< nearest frame start
+int calc_frame_from_time2(int filenum, double time);  ///< nearest frame end
+int calc_frame_from_time3(int filenum, double time);  ///< nearest frame mid
 
-boolean check_for_ratio_fps (double fps);
+boolean check_for_ratio_fps(double fps);
 double get_ratio_fps(const char *string);
 void calc_maxspect(int rwidth, int rheight, int *cwidth, int *cheight);
 
 char *remove_trailing_zeroes(double val);
 
-void remove_layout_files(GList *lmap);
-boolean add_lmap_error(lives_lmap_error_t lerror, const char *name, gpointer user_data, 
-			int clipno, int frameno, double atime, boolean affects_current);
+void remove_layout_files(LiVESList *lmap);
+boolean add_lmap_error(lives_lmap_error_t lerror, const char *name, livespointer user_data,
+                       int clipno, int frameno, double atime, boolean affects_current);
 void clear_lmap_errors(void);
 boolean prompt_remove_layout_files(void);
 boolean is_legal_set_name(const char *set_name, boolean allow_dupes);
@@ -1193,113 +1230,119 @@
 boolean check_frame_count(int idx);
 void get_frame_count(int idx);
 void get_frames_sizes(int fileno, int frame_to_test);
-int count_resampled_frames (int in_frames, double orig_fps, double resampled_fps);
+int count_resampled_frames(int in_frames, double orig_fps, double resampled_fps);
 boolean int_array_contains_value(int *array, int num_elems, int value);
 boolean check_for_lock_file(const char *set_name, int type);
-void g_list_free_strings(GList *list);
+void lives_list_free_strings(LiVESList *list);
 
 boolean create_event_space(int length_in_eventsb);
 void add_to_recent(const char *filename, double start, int frames, const char *file_open_params);
-int verhash (char *version);
-void set_undoable (const char *what, boolean sensitive);
-void set_redoable (const char *what, boolean sensitive);
-void zero_spinbuttons (void);
-void draw_little_bars (double ptrtime);
-void set_sel_label (LiVESWidget *label);
-void clear_mainw_msg (void);
-int get_token_count (const char *string, int delim);
+int verhash(char *version);
+void set_undoable(const char *what, boolean sensitive);
+void set_redoable(const char *what, boolean sensitive);
+void zero_spinbuttons(void);
+void draw_little_bars(double ptrtime);
+void set_sel_label(LiVESWidget *label);
+void clear_mainw_msg(void);
+int get_token_count(const char *string, int delim);
 LiVESPixbuf *lives_pixbuf_new_blank(int width, int height, int palette);
-char *g_strappend (char *string, int len, const char *newbit);
-GList *g_list_append_unique(GList *xlist, const char *add);
-void find_when_to_stop (void);
+char *lives_strappend(char *string, int len, const char *newbit);
+LiVESList *lives_list_append_unique(LiVESList *xlist, const char *add);
+void find_when_to_stop(void);
 int calc_new_playback_position(int fileno, uint64_t otc, uint64_t *ntc);
 void calc_aframeno(int fileno);
-void minimise_aspect_delta (double allowed_aspect,int hblock,int vblock,int hsize,int vsize,int *width,int *height);
+void minimise_aspect_delta(double allowed_aspect,int hblock,int vblock,int hsize,int vsize,int *width,int *height);
 LiVESInterpType get_interp_value(short quality);
 
-GList *lives_list_move_to_first(GList *list, GList *item) WARN_UNUSED;
-GList *g_list_delete_string(GList *, char *string) WARN_UNUSED;
-GList *g_list_copy_strings(GList *list);
-boolean string_lists_differ(GList *, GList *);
+LiVESList *lives_list_move_to_first(LiVESList *list, LiVESList *item) WARN_UNUSED;
+LiVESList *lives_list_delete_string(LiVESList *, char *string) WARN_UNUSED;
+LiVESList *lives_list_copy_strings(LiVESList *list);
+boolean string_lists_differ(LiVESList *, LiVESList *);
 
+boolean is_realtime_aplayer(int ptype);
 
-GList *get_set_list(const char *dir);
+LiVESList *get_set_list(const char *dir, boolean utf8);
 
-char *subst (const char *string, const char *from, const char *to);
+char *subst(const char *string, const char *from, const char *to);
 char *insert_newlines(const char *text, int maxwidth);
 
-int hextodec (const char *string);
-int get_hex_digit (const char *c);
+int hextodec(char *string);
+int get_hex_digit(const char *c);
 
 const char *get_image_ext_for_type(lives_image_type_t imgtype);
 
 uint32_t fastrand(void);
 void fastsrand(uint32_t seed);
 
-int lives_list_index (GList *list, const char *data);
+int lives_list_strcmp_index(LiVESList *list, livesconstpointer data);
 
 lives_cancel_t check_for_bad_ffmpeg(void);
 
 // plugins.c
-GList *get_external_window_hints(lives_rfx_t *rfx);
-boolean check_encoder_restrictions (boolean get_extension, boolean user_audio, boolean save_all);
+LiVESList *get_external_window_hints(lives_rfx_t *rfx);
+boolean check_encoder_restrictions(boolean get_extension, boolean user_audio, boolean save_all);
 
 //callbacks.c
-void lives_exit (void);
+void lives_exit(int signum);
+void lives_notify(int msgnumber,const char *msgstring);
+const char *get_set_name(void);
 void count_opening_frames(void);
-void on_fileread_clicked (LiVESFileChooser *, gpointer widget);
-boolean dirchange_callback (LiVESAccelGroup *, LiVESObject *, uint32_t, LiVESXModifierType, gpointer user_data);
-void on_effects_paused (LiVESButton *, gpointer user_data);
-void on_cancel_keep_button_clicked (LiVESButton *, gpointer user_data);
-void on_cleardisk_activate (LiVESWidget *, gpointer user_data);
-void on_cleardisk_advanced_clicked (LiVESWidget *, gpointer user_data);
-void popup_lmap_errors(LiVESMenuItem *, gpointer);
-void on_filesel_button_clicked (LiVESButton *, gpointer user_data);
+void on_fileread_clicked(LiVESFileChooser *, livespointer widget);
+boolean dirchange_callback(LiVESAccelGroup *, LiVESObject *, uint32_t, LiVESXModifierType, livespointer user_data);
+void on_effects_paused(LiVESButton *, livespointer user_data);
+void on_cancel_keep_button_clicked(LiVESButton *, livespointer user_data);
+void on_cleardisk_activate(LiVESWidget *, livespointer user_data);
+void on_cleardisk_advanced_clicked(LiVESWidget *, livespointer user_data);
+void popup_lmap_errors(LiVESMenuItem *, livespointer);
+void on_filesel_button_clicked(LiVESButton *, livespointer user_data);
 void switch_clip(int type, int newclip);
-void on_details_button_clicked (void);
+void on_details_button_clicked(void);
+
 
 
 
 //preferences.c
-void get_pref(const gchar *key, gchar *val, int maxlen);
-void get_pref_utf8(const gchar *key, gchar *val, int maxlen);
-void get_pref_default(const gchar *key, gchar *val, int maxlen);
-boolean get_boolean_pref(const gchar *key);
-double get_double_pref(const gchar *key);
-int get_int_pref(const gchar *key);
-GList *get_list_pref(const gchar *key);
-void set_pref (const gchar *key, const gchar *value);
-void delete_pref (const gchar *key);
-void set_boolean_pref(const gchar *key, boolean value);
-void set_double_pref(const gchar *key, double value);
-void set_int_pref(const gchar *key, int value);
-void set_int64_pref(const gchar *key, int64_t value);
-void set_list_pref(const char *key, GList *values);
+void get_pref(const char *key, char *val, int maxlen);
+void get_pref_utf8(const char *key, char *val, int maxlen);
+void get_pref_default(const char *key, char *val, int maxlen);
+boolean get_boolean_pref(const char *key);
+double get_double_pref(const char *key);
+int get_int_pref(const char *key);
+LiVESList *get_list_pref(const char *key);
+void set_pref(const char *key, const char *value);
+void delete_pref(const char *key);
+void set_boolean_pref(const char *key, boolean value);
+void set_double_pref(const char *key, double value);
+void set_int_pref(const char *key, int value);
+void set_int64_pref(const char *key, int64_t value);
+void set_list_pref(const char *key, LiVESList *values);
 boolean apply_prefs(boolean skip_warnings);
 void save_future_prefs(void);
 
 // multitrack.c
-LiVESPixbuf *make_thumb (lives_mt *, int file, int width, int height, int frame, boolean noblanks);
+LiVESPixbuf *make_thumb(lives_mt *, int file, int width, int height, int frame, boolean noblanks);
 
 // paramspecial.c
 LiVESPixbuf *mt_framedraw(lives_mt *, LiVESPixbuf *);
 
 // rte_window.c
-LiVESWidget *refresh_rte_window (void);
+LiVESWidget *refresh_rte_window(void);
 
 // effects-weed.c
-void * lives_malloc(size_t size);
-void *lives_memcpy(void *dest, const void *src, size_t n);
-void *lives_memset(void *s, int c, size_t n);
-void lives_free(void *ptr); ///< calls mainw->free_fn
-void *lives_calloc(size_t nmemb, size_t size);
+livespointer _lives_malloc(size_t size);
+livespointer lives_memcpy(livespointer dest, livesconstpointer src, size_t n);
+livespointer lives_memset(livespointer s, int c, size_t n);
+void _lives_free(livespointer ptr); ///< calls mainw->free_fn
+livespointer lives_calloc(size_t n_blocks, size_t n_block_bytes);
+livespointer _lives_realloc(livespointer ptr, size_t new_size);
+
 
 /// values of mainw->free_fn
-void lives_free_normal(void *ptr);
-void lives_free_with_check(gpointer ptr); ///< checks if ptr is mainw->do_not_free, otherwise calls lives_free_normal()
+void _lives_free_normal(livespointer ptr);
+void _lives_free_with_check(livespointer ptr); ///< checks if ptr is mainw->do_not_free, otherwise calls lives_free_normal()
 
 // pangotext.c
-boolean subtitles_init(lives_clip_t *sfile, char * fname, lives_subtitle_type_t);
+boolean subtitles_init(lives_clip_t *sfile, char *fname, lives_subtitle_type_t);
 void subtitles_free(lives_clip_t *sfile);
 boolean get_srt_text(lives_clip_t *sfile, double xtime);
 boolean get_sub_text(lives_clip_t *sfile, double xtime);
@@ -1309,18 +1352,18 @@
 // osc.c
 #ifdef ENABLE_OSC
 boolean lives_osc_init(uint32_t osc_udp_port);
-int lives_osc_poll(gpointer data);
+boolean lives_osc_poll(livespointer data);
 void lives_osc_end(void);
 boolean lives_osc_notify(int msgtype, const char *msgstring);
-void lives_osc_notify_success (const gchar *msg);
-void lives_osc_notify_failure (void);
-void lives_osc_notify_cancel (void);
+boolean lives_osc_notify_success(const char *msg);
+boolean lives_osc_notify_failure(void);
+void lives_osc_notify_cancel(void);
 #include "osc_notify.h"
 #endif
 
 // ldvgrab.c
 #ifdef HAVE_LDVGRAB
-void on_open_fw_activate (LiVESMenuItem *menuitem, gpointer format);
+void on_open_fw_activate(LiVESMenuItem *menuitem, livespointer format);
 
 #define CAM_FORMAT_DV 0
 #define CAM_FORMAT_HDV 1
@@ -1331,10 +1374,6 @@
 #define cfile mainw->files[mainw->current_file]
 #define clipboard mainw->files[0]
 
-#define U82L(String) ( g_locale_from_utf8 (String,-1,NULL,NULL,NULL) ) 
-#define L2U8(String) ( g_locale_to_utf8 (String,-1,NULL,NULL,NULL) ) 
-
-
 #define PREFS_TIMEOUT 10000000 ///< 10 seconds
 
 #define LIVES_TV_CHANNEL1 "http://www.serverwillprovide.com/sorteal/livestvclips/livestv.ogm"
@@ -1343,8 +1382,14 @@
 // round (double) a up to next (integer) multiple of (double) b
 #define CEIL(a,b) ((int)(((double)a+(double)b-.000000001)/((double)b))*b)
 
+#ifdef NEED_ENDIAN_TEST
+#undef NEED_ENDIAN_TEST
+static int32_t testint = 0x12345678;
+#define IS_BIG_ENDIAN (((char *)&testint)[0] == 0x12)
+#endif
+
 
-gchar *dummychar;
+char *dummychar;
 
 void break_me(void);

LiVES-2.2.8.tar.bz2/src/mainwindow.h -> LiVES-2.4.1.tar.bz2/src/mainwindow.h Changed

@@ -1,6 +1,6 @@
 // mainwindow.h
 // LiVES (lives-exe)
-// (c) G. Finch <salsaman@gmail.com> 2003 - 2013
+// (c) G. Finch <salsaman@gmail.com> 2003 - 2015
 // Released under the GPL 3 or later
 // see file ../COPYING for licensing details
 
@@ -19,6 +19,8 @@
 
 #ifdef HAVE_PULSE_AUDIO
 #include "pulse.h"
+#else
+#include "audio.h"
 #endif
 
 // hardware related prefs
@@ -79,6 +81,7 @@
 #define ENC_DETAILS_WIN_H ((int)(600.*widget_opts.scale)) ///< horizontal size in pixels of the encoder output window
 #define ENC_DETAILS_WIN_V ((int)(200.*widget_opts.scale)) ///< vertical size in pixels of the encoder output window
 
+#define MIN_MSG_WIDTH_CHARS ((int)(40.*widget_opts.scale)) ///< min width of text on warning/error labels
 #define MAX_MSG_WIDTH_CHARS ((int)(100.*widget_opts.scale)) ///< max width of text on warning/error labels
 
 /// size of the fx dialog windows scrollwindow
@@ -89,6 +92,10 @@
 
 #define DEF_BUTTON_WIDTH ((int)(80.*widget_opts.scale))
 
+#define DEF_DIALOG_WIDTH 640
+#define DEF_DIALOG_HEIGHT 480
+
+
 ////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 /// number of function keys
@@ -141,29 +148,14 @@
 
 
 typedef enum {
+  LIVES_DIALOG_INFO,
+  LIVES_DIALOG_ERROR,
   LIVES_DIALOG_WARN,
+  LIVES_DIALOG_WARN_WITH_CANCEL,
   LIVES_DIALOG_YESNO,
   LIVES_DIALOG_ABORT_CANCEL_RETRY
 } lives_dialog_t;
 
-typedef enum {
-  LIVES_INFO_TYPE_INFO,
-  LIVES_INFO_TYPE_WARNING,
-  LIVES_INFO_TYPE_QUESTION,
-  LIVES_INFO_TYPE_ERROR
-} lives_info_t;
-
-
-/// return values from abort/cancel/retry dialog and yes/no dialog
-enum {
-  LIVES_NO=0,
-  LIVES_YES,
-  LIVES_CANCEL,
-  LIVES_RETRY,
-  LIVES_ABORT,
-  LIVES_RESET
-};
-
 
 /// various return conditions from rendering (multitrack or after recording)
 typedef enum {
@@ -273,30 +265,31 @@
 
 /// mainw->
 typedef struct {
-  gchar msg[512];
+  char msg[512];
 
   // files
   int current_file;
   int first_free_file;
   lives_clip_t *files[MAX_FILES+1]; ///< +1 for the clipboard
-  gchar vid_load_dir[PATH_MAX];
-  gchar vid_save_dir[PATH_MAX];
-  gchar vid_dl_dir[PATH_MAX];
-  gchar audio_dir[PATH_MAX];
-  gchar image_dir[PATH_MAX];
-  gchar proj_load_dir[PATH_MAX];
-  gchar proj_save_dir[PATH_MAX];
+  char vid_load_dir[PATH_MAX];
+  char vid_save_dir[PATH_MAX];
+  char vid_dl_dir[PATH_MAX];
+  char audio_dir[PATH_MAX];
+  char image_dir[PATH_MAX];
+  char proj_load_dir[PATH_MAX];
+  char proj_save_dir[PATH_MAX];
+  char recent_file[PATH_MAX];
   int untitled_number;
   int cap_number;
   int clips_available;
 
   /// hash table of clips in menu order
-  GList *cliplist;
+  LiVESList *cliplist;
 
-  GSList *clips_group;
+  LiVESSList *clips_group;
 
   /// sets
-  gchar set_name[256];   // actually 128 is the limit now
+  char set_name[256];   // actually 128 is the limit now, filesystem encoding
 
   // playback
   boolean faded;
@@ -344,9 +337,9 @@
   boolean stored_event_list_changed;
   boolean stored_event_list_auto_changed;
   boolean stored_layout_save_all_vals;
-  gchar stored_layout_name[PATH_MAX];
+  char stored_layout_name[PATH_MAX];
 
-  GList *stored_layout_undos;
+  LiVESList *stored_layout_undos;
   size_t sl_undo_buffer_used;
   unsigned char *sl_undo_mem;
   int sl_undo_offset;
@@ -393,7 +386,7 @@
   int foreign_width;
   int foreign_height;
   int foreign_bpp;
-  gchar *foreign_visual;
+  char *foreign_visual;
 
   /// some VJ effects
   boolean nervous;
@@ -413,11 +406,11 @@
 
   uint64_t rte; ///< current max for VJ mode == 64 effects on fg clip
 
-  uint32_t last_grabable_effect;
+  uint32_t last_grabbable_effect;
   int rte_keys; ///< which effect is bound to keyboard
   int num_tr_applied; ///< number of transitions active
   double blend_factor; ///< keyboard control parameter
-  
+
   int blend_file;
   int last_blend_file;
 
@@ -426,7 +419,7 @@
   int ascrap_file; ///< scrap file for recording audio scraps
 
   /// which number file we are playing (or -1)
-  int playing_file;
+  volatile int playing_file;
 
   int pre_src_file; ///< video file we were playing before any ext input started
   int pre_src_audio_file; ///< audio file we were playing before any ext input started
@@ -471,12 +464,12 @@
   /////////////////////////////////////////////////
 
   // end of static-ish info
-  gchar first_info_file[PATH_MAX];
+  char first_info_file[PATH_MAX];
   boolean leave_files;
   boolean was_set;
 
   /// extra parameters for opening special files
-  gchar *file_open_params;
+  char *file_open_params;
   boolean open_deint;
 
   int last_dprint_file;
@@ -505,9 +498,9 @@
 
   boolean size_warn; ///< warn the user that incorrectly sized frames were found
 
-  /// set to TRUE during frame load/display operation. If TRUE we should not switch clips, 
+  /// set to TRUE during frame load/display operation. If TRUE we should not switch clips,
   /// close the current clip, or call load_frame_image()
-  boolean noswitch; 
+  boolean noswitch;
   int new_clip;
 
   int aud_file_to_kill; ///< # of audio file to kill on crash
@@ -517,7 +510,7 @@
   /// TODO - make this a mutex and more finely grained : things we need to block are (clip switches, clip closure, effects on/off, etc)
   boolean osc_block;
 
-  boolean osc_auto; ///< bypass user choices automatically
+  int osc_auto; ///< bypass user choices automatically
 
   /// encode width, height and fps set externally
   int osc_enc_width;
@@ -541,7 +534,7 @@
 
   /// internal fx
   boolean internal_messaging;
-  lives_render_error_t (*progress_fn) (boolean reset);
+  lives_render_error_t (*progress_fn)(boolean reset);
 
   volatile boolean threaded_dialog;
 
@@ -581,24 +574,24 @@
   uint32_t kb_timer;
 
   //function pointers
-  gulong config_func;
-  gulong pb_fps_func;
-  gulong spin_start_func;
-  gulong spin_end_func;
-  gulong record_perf_func;
-  gulong vidbar_func;
-  gulong laudbar_func;
-  gulong raudbar_func;
-  gulong hrule_func;
-  gulong toy_func_none;
-  gulong toy_func_random_frames;
-  gulong toy_func_lives_tv;
-  gulong toy_func_autolives;
-  gulong hnd_id;
-  gulong loop_cont_func;
-  gulong mute_audio_func;
-  gulong fullscreen_cb_func;
-  gulong sepwin_cb_func;
+  ulong config_func;
+  ulong pb_fps_func;
+  ulong spin_start_func;
+  ulong spin_end_func;
+  ulong record_perf_func;
+  ulong vidbar_func;
+  ulong laudbar_func;
+  ulong raudbar_func;
+  ulong hrule_func;
+  ulong toy_func_none;
+  ulong toy_func_random_frames;
+  ulong toy_func_lives_tv;
+  ulong toy_func_autolives;
+  ulong hnd_id;
+  ulong loop_cont_func;
+  ulong mute_audio_func;
+  ulong fullscreen_cb_func;
+  ulong sepwin_cb_func;
 
   // for jack transport
   boolean jack_can_stop;
@@ -607,7 +600,7 @@
   volatile boolean video_seek_ready;
 
   // selection pointers
-  gulong mouse_fn1;
+  ulong mouse_fn1;
   boolean mouse_blocked;
   boolean hrule_blocked;
 
@@ -795,7 +788,7 @@
   weed_plant_t *filter_map; // the video filter map for rendering
   weed_plant_t *afilter_map; // the audio filter map for renering
   weed_plant_t *audio_event; // event for audio render tracking
-  void ***pchains; // parameter value chains for interpolation
+  void ** *pchains; // parameter value chains for interpolation
 
   // for the internal player
   LiVESWidget *play_image;
@@ -810,7 +803,7 @@
   LiVESWidget *preview_spinbutton;
   LiVESWidget *preview_scale;
   int preview_frame;
-  gulong preview_spin_func;
+  ulong preview_spin_func;
   int prv_link;
 #define PRV_FREE 0
 #define PRV_START 1
@@ -932,7 +925,7 @@
   boolean only_close; ///< only close clips - do not exit
   volatile boolean is_exiting; ///< set during shutdown (inverse of only_close then)
 
-  gulong pw_scroll_func;
+  ulong pw_scroll_func;
 
 #ifdef ENABLE_JACK
   jack_driver_t *jackd; ///< jack audio playback device
@@ -954,17 +947,17 @@
 
   // layouts
   LiVESTextBuffer *layout_textbuffer; ///< stores layout errors
-  GList *affected_layouts_map; ///< map of layouts with errors
-  GList *current_layouts_map; ///< map of all layouts for set
+  LiVESList *affected_layouts_map; ///< map of layouts with errors
+  LiVESList *current_layouts_map; ///< map of all layouts for set
 
-  /// list of pairs of marks in affected_layouts_map, text between them should be deleted when 
+  /// list of pairs of marks in affected_layouts_map, text between them should be deleted when
   /// stored_layout is deleted
-  GList *affected_layout_marks;
+  LiVESList *affected_layout_marks;
 
   /// immediately (to be) affected layout maps
-  GList *xlays;
+  LiVESList *xlays;
 
-  gchar *recovery_file;  ///< the filename of our recover file
+  char *recovery_file;  ///< the filename of our recover file
   boolean leave_recovery;
 
   boolean unordered_blocks; ///< are we recording unordered blocks ?
@@ -977,27 +970,30 @@
   double rec_avel;
   double rec_aseek;
 
-  gpointer do_not_free; ///< mess with memory so that g_object_unref can be forced not to free() the pixel_data
-  GMemVTable alt_vtable;
-  void (*free_fn)(gpointer);
+  livespointer do_not_free; ///< mess with memory so that lives_object_unref can be forced not to free() the pixel_data
+  LiVESMemVTable alt_vtable;
+  void (* free_fn)(livespointer);
 
   pthread_mutex_t gtk_mutex;  ///< gtk drawing mutex - no longer used
   pthread_mutex_t interp_mutex;  ///< interpolation mutex - parameter interpolation must be single threaded
+  pthread_mutex_t free_fn_mutex; ///< stop threads squelching each others free_fns
 
   pthread_mutex_t abuf_mutex;  ///< used to synch audio buffer request count - shared between audio and video threads
   pthread_mutex_t abuf_frame_mutex;  ///< used to synch audio buffer for generators
   pthread_mutex_t data_mutex[FX_KEYS_MAX];  ///< used to prevent data being connected while it is possibly being updated
   pthread_mutex_t fxd_active_mutex; ///< prevent simultaneous writing to active_dummy by audio and video threads
   pthread_mutex_t event_list_mutex; /// prevent simultaneous writing to event_list by audio and video threads
+  pthread_mutex_t clip_list_mutex; /// prevent adding/removing to cliplist while another thread could be reading it
 
   volatile lives_rfx_t *vrfx_update;
 
-  lives_fx_candidate_t fx_candidates[MAX_FX_CANDIDATE_TYPES]; ///< effects which can have candidates from which a delegate is selected (current examples are: audio_volume, resize)
+  lives_fx_candidate_t
+  fx_candidates[MAX_FX_CANDIDATE_TYPES]; ///< effects which can have candidates from which a delegate is selected (current examples are: audio_volume, resize)
 
-  GList *cached_list;  ///< cache of preferences or file header file (or NULL)
+  LiVESList *cached_list;  ///< cache of preferences or file header file (or NULL)
   FILE *clip_header;
 
-  GList *file_buffers;
+  LiVESList *file_buffers;
 
   float volume; ///< audio volume level (for jack)
 
@@ -1015,12 +1011,12 @@
 
   boolean no_recurse; ///< flag to prevent recursive function calls
 
-  gchar *string_constants[NUM_LIVES_STRING_CONSTANTS];
-  gchar *any_string;  ///< localised text saying "Any", for encoder and output format
-  gchar *none_string;  ///< localised text saying "None", for playback plugin name, etc.
-  gchar *recommended_string;  ///< localised text saying "recommended", for encoder and output format
-  gchar *disabled_string;  ///< localised text saying "disabled !", for playback plugin name, etc.
-  gchar *cl_string; ///< localised text saying "*The current layout*", for layout warnings
+  char *string_constants[NUM_LIVES_STRING_CONSTANTS];
+  char *any_string;  ///< localised text saying "Any", for encoder and output format
+  char *none_string;  ///< localised text saying "None", for playback plugin name, etc.
+  char *recommended_string;  ///< localised text saying "recommended", for encoder and output format
+  char *disabled_string;  ///< localised text saying "disabled !", for playback plugin name, etc.
+  char *cl_string; ///< localised text saying "*The current layout*", for layout warnings
 
   int opening_frames; ///< count of frames so far opened, updated after preview (currently)
 
@@ -1056,10 +1052,10 @@
   /// external control inputs
   boolean ext_cntl[MAX_EXT_CNTL];
 
-  #ifdef ALSA_MIDI
+#ifdef ALSA_MIDI
   snd_seq_t *seq_handle;
   int alsa_midi_port;
-  #endif
+#endif
 
   weed_plant_t *rte_textparm; ///< send keyboard input to this paramter (usually NULL)
 
@@ -1075,7 +1071,7 @@
   boolean soft_debug; ///< for testing
 
   /// encoder text output
-  GIOChannel *iochan;
+  LiVESIOChannel *iochan;
   LiVESTextView *optextview;
 
   boolean has_custom_tools;
@@ -1084,21 +1080,21 @@
 
   /// decoders
   boolean decoders_loaded;
-  GList *decoder_list;
+  LiVESList *decoder_list;
 
   boolean go_away;
   boolean debug; ///< debug crashes and asserts
 
-  gchar *subt_save_file; ///< name of file to save subtitles to
+  char *subt_save_file; ///< name of file to save subtitles to
 
-  gchar **fonts_array;
+  char **fonts_array;
   int nfonts;
 
-  GtkTargetEntry *target_table; ///< drag and drop target table
+  LiVESTargetEntry *target_table; ///< drag and drop target table
 
-  GList *videodevs;
+  LiVESList *videodevs;
 
-  gchar vpp_defs_file[PATH_MAX];
+  char vpp_defs_file[PATH_MAX];
 
   int log_fd;
 
@@ -1136,9 +1132,9 @@
   int ce_frame_height;
   int ce_frame_width;
 
-  gchar *read_failed_file;
-  gchar *write_failed_file;
-  gchar *bad_aud_file;
+  char *read_failed_file;
+  char *write_failed_file;
+  char *bad_aud_file;
 
   lives_render_error_t render_error;
 
@@ -1183,14 +1179,19 @@
 
   lives_audio_buf_t *audio_frame_buffer; ///< used for buffering / feeding audio to video generators
   int afbuffer_clients;
-////////////////////
+
+  pthread_t *libthread;
+  ulong id;
+
+  boolean interactive;
+  ////////////////////
 
 } mainwindow;
 
 extern _palette *palette;
 
 typedef struct {
-  gulong ins_frame_function;
+  ulong ins_frame_function;
 
   LiVESWidget *merge_dialog;
   LiVESWidget *ins_frame_button;
@@ -1203,11 +1204,11 @@
   boolean ins_frames;
 
   int *list_to_rfx_index;
-  GList *trans_list;
+  LiVESList *trans_list;
 
 } _merge_opts;
 
-extern _merge_opts* merge_opts;
+extern _merge_opts *merge_opts;
 
 /// note, we can only have two of these currently, one for rendered effects, one for real time effects
 /// 0 for rfx, 1 for rte
@@ -1226,13 +1227,13 @@
 
 
 #ifdef ENABLE_JACK
-  volatile aserver_message_t jack_message;
-  volatile aserver_message_t jack_message2;
+volatile aserver_message_t jack_message;
+volatile aserver_message_t jack_message2;
 #endif
 
 #ifdef HAVE_PULSE_AUDIO
-  volatile aserver_message_t pulse_message;
-  volatile aserver_message_t pulse_message2;
+volatile aserver_message_t pulse_message;
+volatile aserver_message_t pulse_message2;
 #endif
 
 #endif // HAS_LIVES_MAINWINDOW_H

LiVES-2.2.8.tar.bz2/src/merge.c -> LiVES-2.4.1.tar.bz2/src/merge.c Changed

@@ -1,6 +1,6 @@
 // merge.c
 // LiVES (lives-exe)
-// (c) G. Finch 2003 - 2013 (salsaman@gmail.com)
+// (c) G. Finch 2003 - 2015 (salsaman@gmail.com)
 // Released under the GPL 3 or later
 // see file ../COPYING for licensing details
 
@@ -18,9 +18,9 @@
 #include "resample.h"
 #include "support.h"
 
-_merge_opts* merge_opts;
+_merge_opts *merge_opts;
 
-void create_merge_dialog (void) {
+void create_merge_dialog(void) {
   lives_rfx_t *rfx;
 
   LiVESWidget *dialog_vbox;
@@ -35,57 +35,68 @@
   LiVESWidget *cancelbutton;
   LiVESWidget *okbutton;
 
-  GSList *radiobutton_align_group = NULL;
-  GSList *radiobutton_insdrop_group = NULL;
+  LiVESSList *radiobutton_align_group = NULL;
+  LiVESSList *radiobutton_insdrop_group = NULL;
 
-  GList *retvals;
+  LiVESList *retvals;
 
   LiVESAccelGroup *accel_group;
 
-  gchar *txt;
+  char *txt;
 
   int idx=0;
 
+  int scrw,scrh,width,height;
+
   int cb_frames=clipboard->frames;
   int defstart=0;
 
   register int i;
 
-  merge_opts=(_merge_opts*)(g_malloc(sizeof(_merge_opts)));
-  merge_opts->list_to_rfx_index=(int *)g_malloc (sizint*(mainw->num_rendered_effects_builtin+
-							 mainw->num_rendered_effects_custom+
-							 mainw->num_rendered_effects_test));
+  merge_opts=(_merge_opts *)(lives_malloc(sizeof(_merge_opts)));
+  merge_opts->list_to_rfx_index=(int *)lives_malloc(sizint*(mainw->num_rendered_effects_builtin+
+                                mainw->num_rendered_effects_custom+
+                                mainw->num_rendered_effects_test));
   merge_opts->trans_list=NULL;
 
   merge_opts->spinbutton_loops=NULL;
 
-  for (i=0;i<mainw->num_rendered_effects_builtin+mainw->num_rendered_effects_custom+mainw->num_rendered_effects_test;i++) {
+  for (i=0; i<mainw->num_rendered_effects_builtin+mainw->num_rendered_effects_custom+mainw->num_rendered_effects_test; i++) {
     if ((rfx=&mainw->rendered_fx[i])->num_in_channels==2) {
       if (i==mainw->last_transition_idx) defstart=idx;
       merge_opts->list_to_rfx_index[idx++]=i;
       if (rfx->status==RFX_STATUS_CUSTOM) {
-	merge_opts->trans_list = g_list_append (merge_opts->trans_list,g_strconcat ( _(rfx->menu_text)," (custom)",NULL));
-      }
-      else if (rfx->status==RFX_STATUS_TEST) {
-	merge_opts->trans_list = g_list_append (merge_opts->trans_list,g_strconcat ( _(rfx->menu_text)," (test)",NULL));
-      }
-      else {
-	merge_opts->trans_list = g_list_append (merge_opts->trans_list, g_strdup(_(rfx->menu_text)));
+        merge_opts->trans_list = lives_list_append(merge_opts->trans_list,lives_strconcat(_(rfx->menu_text)," (custom)",NULL));
+      } else if (rfx->status==RFX_STATUS_TEST) {
+        merge_opts->trans_list = lives_list_append(merge_opts->trans_list,lives_strconcat(_(rfx->menu_text)," (test)",NULL));
+      } else {
+        merge_opts->trans_list = lives_list_append(merge_opts->trans_list, lives_strdup(_(rfx->menu_text)));
       }
     }
   }
 
   if (!idx) {
     do_rendered_fx_dialog();
-    g_free (merge_opts->list_to_rfx_index);
-    g_free (merge_opts);
+    lives_free(merge_opts->list_to_rfx_index);
+    lives_free(merge_opts);
     return;
   }
 
-  merge_opts->merge_dialog = lives_standard_dialog_new (_("LiVES: - Merge"),FALSE);
+  if (prefs->gui_monitor!=0) {
+    scrw=mainw->mgeom[prefs->gui_monitor-1].width;
+    scrh=mainw->mgeom[prefs->gui_monitor-1].height;
+  } else {
+    scrw=mainw->scr_width;
+    scrh=mainw->scr_height;
+  }
+
+  height=scrh-SCR_HEIGHT_SAFETY;
+  width=scrw-SCR_WIDTH_SAFETY;
 
-  accel_group = LIVES_ACCEL_GROUP(lives_accel_group_new ());
-  lives_window_add_accel_group (LIVES_WINDOW (merge_opts->merge_dialog), accel_group);
+  merge_opts->merge_dialog = lives_standard_dialog_new(_("LiVES: - Merge"),FALSE,width,height);
+
+  accel_group = LIVES_ACCEL_GROUP(lives_accel_group_new());
+  lives_window_add_accel_group(LIVES_WINDOW(merge_opts->merge_dialog), accel_group);
 
   if (prefs->show_gui) {
     lives_window_set_transient_for(LIVES_WINDOW(merge_opts->merge_dialog),LIVES_WINDOW(mainw->LiVES));
@@ -93,84 +104,84 @@
 
   dialog_vbox = lives_dialog_get_content_area(LIVES_DIALOG(merge_opts->merge_dialog));
 
-  vbox = lives_vbox_new (FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (dialog_vbox), vbox, TRUE, TRUE, 0);
+  vbox = lives_vbox_new(FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(dialog_vbox), vbox, TRUE, TRUE, 0);
 
-  hbox = lives_hbox_new (FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height*2);
+  hbox = lives_hbox_new(FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(vbox), hbox, FALSE, FALSE, widget_opts.packing_height*2);
 
-  txt=g_strdup_printf(_ ("Merge Clipboard [ %d Frames ]       With Selection [ %d Frames ]"),clipboard->frames,cfile->end-cfile->start+1);
+  txt=lives_strdup_printf(_("Merge Clipboard [ %d Frames ]       With Selection [ %d Frames ]"),clipboard->frames,cfile->end-cfile->start+1);
   if (prefs->ins_resample&&clipboard->fps!=cfile->fps) {
     cb_frames=count_resampled_frames(clipboard->frames,clipboard->fps,cfile->fps);
     if (!(cb_frames==clipboard->frames)) {
-      g_free(txt);
-      txt=g_strdup_printf(_ ("Merge Clipboard [ %d Frames (resampled) ]       With Selection [ %d Frames ]"),cb_frames,cfile->end-cfile->start+1);
+      lives_free(txt);
+      txt=lives_strdup_printf(_("Merge Clipboard [ %d Frames (resampled) ]       With Selection [ %d Frames ]"),cb_frames,
+                              cfile->end-cfile->start+1);
     }
   }
 
-  label = lives_standard_label_new (txt);
-  g_free(txt);
+  label = lives_standard_label_new(txt);
+  lives_free(txt);
 
-  lives_box_pack_start (LIVES_BOX (hbox), label, FALSE, FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(hbox), label, FALSE, FALSE, 0);
 
   add_fill_to_box(LIVES_BOX(hbox));
 
-  align_start_button = lives_standard_radio_button_new (_("Align _Starts"),TRUE,radiobutton_align_group,LIVES_BOX(hbox),NULL);
-  radiobutton_align_group = lives_radio_button_get_group (LIVES_RADIO_BUTTON (align_start_button));
+  align_start_button = lives_standard_radio_button_new(_("Align _Starts"),TRUE,radiobutton_align_group,LIVES_BOX(hbox),NULL);
+  radiobutton_align_group = lives_radio_button_get_group(LIVES_RADIO_BUTTON(align_start_button));
 
   add_fill_to_box(LIVES_BOX(hbox));
 
-  align_end_button = lives_standard_radio_button_new (_("Align _Ends"),TRUE,radiobutton_align_group,LIVES_BOX(hbox),NULL);
+  align_end_button = lives_standard_radio_button_new(_("Align _Ends"),TRUE,radiobutton_align_group,LIVES_BOX(hbox),NULL);
 
   lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(align_end_button),!mainw->last_transition_align_start);
 
 
 
-  hbox = lives_hbox_new (FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (vbox), hbox, FALSE, TRUE, widget_opts.packing_height*2);
+  hbox = lives_hbox_new(FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(vbox), hbox, FALSE, TRUE, widget_opts.packing_height*2);
 
   if ((cfile->end-cfile->start+1)<cb_frames) {
     // hide loop controls if selection is smaller than clipboard
-    label = lives_standard_label_new (_("What to do with extra clipboard frames -"));
-    lives_box_pack_start (LIVES_BOX (hbox), label, FALSE, FALSE, 0);
+    label = lives_standard_label_new(_("What to do with extra clipboard frames -"));
+    lives_box_pack_start(LIVES_BOX(hbox), label, FALSE, FALSE, 0);
 
     merge_opts->ins_frame_button=lives_standard_radio_button_new(_("_Insert Frames"),TRUE,radiobutton_insdrop_group,LIVES_BOX(hbox),NULL);
-    radiobutton_insdrop_group = lives_radio_button_get_group (LIVES_RADIO_BUTTON (merge_opts->ins_frame_button));
+    radiobutton_insdrop_group = lives_radio_button_get_group(LIVES_RADIO_BUTTON(merge_opts->ins_frame_button));
 
-    merge_opts->ins_frame_function=lives_signal_connect (LIVES_GUI_OBJECT (merge_opts->ins_frame_button),
-						     LIVES_WIDGET_TOGGLED_EVENT,LIVES_GUI_CALLBACK (on_ins_frames_toggled),NULL);
+    merge_opts->ins_frame_function=lives_signal_connect(LIVES_GUI_OBJECT(merge_opts->ins_frame_button),
+                                   LIVES_WIDGET_TOGGLED_SIGNAL,LIVES_GUI_CALLBACK(on_ins_frames_toggled),NULL);
 
     merge_opts->drop_frame_button=lives_standard_radio_button_new(_("_Drop Frames"),TRUE,radiobutton_insdrop_group,LIVES_BOX(hbox),NULL);
 
     lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(merge_opts->drop_frame_button),!mainw->last_transition_ins_frames);
-  }
-  else if ((cfile->end-cfile->start+1)>cb_frames) {
-    merge_opts->spinbutton_loops = lives_standard_spin_button_new 
-      (_("Number of Times to Loop Clipboard"),FALSE,1.,1.,
-       (int)((cfile->end-cfile->start+1)/cb_frames), 1., 10., 0, LIVES_BOX(hbox), NULL);
-    
+  } else if ((cfile->end-cfile->start+1)>cb_frames) {
+    merge_opts->spinbutton_loops = lives_standard_spin_button_new
+                                   (_("Number of Times to Loop Clipboard"),FALSE,1.,1.,
+                                    (int)((cfile->end-cfile->start+1)/cb_frames), 1., 10., 0, LIVES_BOX(hbox), NULL);
+
 
-    lives_spin_button_set_value (LIVES_SPIN_BUTTON (merge_opts->spinbutton_loops),mainw->last_transition_loops);
+    lives_spin_button_set_value(LIVES_SPIN_BUTTON(merge_opts->spinbutton_loops),mainw->last_transition_loops);
     lives_widget_set_sensitive(merge_opts->spinbutton_loops,!mainw->last_transition_loop_to_fit);
 
-    lives_signal_connect_after (LIVES_GUI_OBJECT (merge_opts->spinbutton_loops), "value_changed",
-			    LIVES_GUI_CALLBACK (after_spinbutton_loops_changed),
-			    NULL);
+    lives_signal_connect_after(LIVES_GUI_OBJECT(merge_opts->spinbutton_loops), LIVES_WIDGET_VALUE_CHANGED_SIGNAL,
+                               LIVES_GUI_CALLBACK(after_spinbutton_loops_changed),
+                               NULL);
 
-    fit_button = lives_standard_check_button_new (_("_Loop Clipboard to Fit Selection"),TRUE,LIVES_BOX(hbox),NULL);
+    fit_button = lives_standard_check_button_new(_("_Loop Clipboard to Fit Selection"),TRUE,LIVES_BOX(hbox),NULL);
     lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(fit_button),mainw->last_transition_loop_to_fit);
 
-    lives_signal_connect (LIVES_GUI_OBJECT (fit_button), LIVES_WIDGET_TOGGLED_EVENT,
-		      LIVES_GUI_CALLBACK (on_fit_toggled),
-		      NULL);
+    lives_signal_connect(LIVES_GUI_OBJECT(fit_button), LIVES_WIDGET_TOGGLED_SIGNAL,
+                         LIVES_GUI_CALLBACK(on_fit_toggled),
+                         NULL);
   }
 
   add_hsep_to_box(LIVES_BOX(vbox));
-  
-  hbox = lives_hbox_new (TRUE, 0);
-  lives_box_pack_start (LIVES_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
 
-  transition_combo = lives_standard_combo_new (_("_Transition Method:"),TRUE,merge_opts->trans_list,LIVES_BOX(hbox),NULL);
+  hbox = lives_hbox_new(TRUE, 0);
+  lives_box_pack_start(LIVES_BOX(vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
+
+  transition_combo = lives_standard_combo_new(_("_Transition Method:"),TRUE,merge_opts->trans_list,LIVES_BOX(hbox),NULL);
 
   lives_combo_set_active_index(LIVES_COMBO(transition_combo),defstart);
 
@@ -180,60 +191,60 @@
 
 
   // now the dynamic part...
-  merge_opts->param_vbox = lives_vbox_new (FALSE, 0);
-  lives_container_set_border_width (LIVES_CONTAINER(merge_opts->param_vbox), widget_opts.border_width>>1);
+  merge_opts->param_vbox = lives_vbox_new(FALSE, 0);
+  lives_container_set_border_width(LIVES_CONTAINER(merge_opts->param_vbox), widget_opts.border_width>>1);
 
-  lives_box_pack_start (LIVES_BOX (vbox), merge_opts->param_vbox, TRUE, TRUE, 0);
+  lives_box_pack_start(LIVES_BOX(vbox), merge_opts->param_vbox, TRUE, TRUE, 0);
 
   rfx=&mainw->rendered_fx[mainw->last_transition_idx];
   mainw->overflow_height=900;
-  make_param_box(LIVES_VBOX (merge_opts->param_vbox), rfx);
+  make_param_box(LIVES_VBOX(merge_opts->param_vbox), rfx);
   mainw->overflow_height=0;
-  lives_widget_show_all (merge_opts->param_vbox);
+  lives_widget_show_all(merge_opts->param_vbox);
 
   retvals=do_onchange_init(rfx);
 
   if (retvals!=NULL) {
     // now apply visually anything we got from onchange_init
     //param_demarshall (rfx,retvals,TRUE,TRUE);
-    g_list_free_strings (retvals);
-    g_list_free (retvals);
+    lives_list_free_strings(retvals);
+    lives_list_free(retvals);
   }
 
   // done !
 
 
-  dialog_action_area = lives_dialog_get_action_area(LIVES_DIALOG (merge_opts->merge_dialog));
-  lives_button_box_set_layout (LIVES_BUTTON_BOX (dialog_action_area), LIVES_BUTTONBOX_END);
+  dialog_action_area = lives_dialog_get_action_area(LIVES_DIALOG(merge_opts->merge_dialog));
+  lives_button_box_set_layout(LIVES_BUTTON_BOX(dialog_action_area), LIVES_BUTTONBOX_END);
+
+  cancelbutton = lives_button_new_from_stock(LIVES_STOCK_CANCEL);
+  lives_dialog_add_action_widget(LIVES_DIALOG(merge_opts->merge_dialog), cancelbutton, LIVES_RESPONSE_CANCEL);
+  lives_widget_set_can_focus(cancelbutton,TRUE);
 
-  cancelbutton = lives_button_new_from_stock (LIVES_STOCK_CANCEL);
-  lives_dialog_add_action_widget (LIVES_DIALOG (merge_opts->merge_dialog), cancelbutton, LIVES_RESPONSE_CANCEL);
-  lives_widget_set_can_focus (cancelbutton,TRUE);
+  okbutton = lives_button_new_from_stock(LIVES_STOCK_OK);
+  lives_dialog_add_action_widget(LIVES_DIALOG(merge_opts->merge_dialog), okbutton, LIVES_RESPONSE_OK);
+  lives_widget_set_can_focus_and_default(okbutton);
+  lives_widget_grab_default(okbutton);
 
-  okbutton = lives_button_new_from_stock (LIVES_STOCK_OK);
-  lives_dialog_add_action_widget (LIVES_DIALOG (merge_opts->merge_dialog), okbutton, LIVES_RESPONSE_OK);
-  lives_widget_set_can_focus_and_default (okbutton);
-  lives_widget_grab_default (okbutton);
+  lives_signal_connect(LIVES_GUI_OBJECT(cancelbutton), LIVES_WIDGET_CLICKED_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_merge_cancel_clicked),
+                       rfx);
 
-  lives_signal_connect (LIVES_GUI_OBJECT (cancelbutton), LIVES_WIDGET_CLICKED_EVENT,
-                      LIVES_GUI_CALLBACK (on_merge_cancel_clicked),
-                      rfx);
 
+  lives_widget_add_accelerator(cancelbutton, LIVES_WIDGET_CLICKED_SIGNAL, accel_group,
+                               LIVES_KEY_Escape, (LiVESXModifierType)0, (LiVESAccelFlags)0);
 
-  lives_widget_add_accelerator (cancelbutton, LIVES_WIDGET_CLICKED_EVENT, accel_group,
-                              LIVES_KEY_Escape,  (LiVESXModifierType)0, (LiVESAccelFlags)0);
 
+  lives_signal_connect(LIVES_GUI_OBJECT(okbutton), LIVES_WIDGET_CLICKED_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_merge_ok_clicked),
+                       rfx);
 
-  lives_signal_connect (LIVES_GUI_OBJECT (okbutton), LIVES_WIDGET_CLICKED_EVENT,
-                      LIVES_GUI_CALLBACK (on_merge_ok_clicked),
-                      rfx);
-  
-  lives_signal_connect (LIVES_GUI_OBJECT(transition_combo),LIVES_WIDGET_CHANGED_EVENT,LIVES_GUI_CALLBACK (on_trans_method_changed),NULL);
-  
+  lives_signal_connect(LIVES_GUI_OBJECT(transition_combo),LIVES_WIDGET_CHANGED_SIGNAL,LIVES_GUI_CALLBACK(on_trans_method_changed),NULL);
 
-  lives_signal_connect (LIVES_GUI_OBJECT (align_start_button), LIVES_WIDGET_TOGGLED_EVENT,
-		    LIVES_GUI_CALLBACK (on_align_start_end_toggled),
-		    rfx);
+
+  lives_signal_connect(LIVES_GUI_OBJECT(align_start_button), LIVES_WIDGET_TOGGLED_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_align_start_end_toggled),
+                       rfx);
 
 
   if (prefs->show_gui) {
@@ -241,99 +252,89 @@
   }
 }
 
-static void bang (LiVESWidget *widget, gpointer null) {
-  lives_widget_destroy (widget);
+static void bang(LiVESWidget *widget, livespointer null) {
+  lives_widget_destroy(widget);
 }
 
 
-void on_trans_method_changed (LiVESCombo *combo, gpointer user_data) {
+void on_trans_method_changed(LiVESCombo *combo, livespointer user_data) {
   lives_rfx_t *rfx;
 
-  GList *retvals;
+  LiVESList *retvals;
 
-  char *txt=lives_combo_get_active_text (combo);
+  char *txt=lives_combo_get_active_text(combo);
 
   int idx;
 
-  if (!strlen (txt)) {
-    g_free(txt);
+  if (!strlen(txt)) {
+    lives_free(txt);
     return;
   }
 
   rfx=&mainw->rendered_fx[mainw->last_transition_idx];
 
-  lives_container_foreach (LIVES_CONTAINER(merge_opts->param_vbox),bang,NULL);
-  on_paramwindow_cancel_clicked (NULL,rfx);
+  lives_container_foreach(LIVES_CONTAINER(merge_opts->param_vbox),bang,NULL);
+  on_paramwindow_cancel_clicked(NULL,rfx);
 
-  idx=lives_list_index(merge_opts->trans_list,txt);
+  idx=lives_list_strcmp_index(merge_opts->trans_list,txt);
 
-  g_free(txt);
+  lives_free(txt);
 
   mainw->last_transition_idx=merge_opts->list_to_rfx_index[idx];
   rfx=&mainw->rendered_fx[mainw->last_transition_idx];
 
-  make_param_box(LIVES_VBOX (merge_opts->param_vbox), rfx);
-  lives_widget_show_all (merge_opts->param_vbox);
+  make_param_box(LIVES_VBOX(merge_opts->param_vbox), rfx);
+  lives_widget_show_all(merge_opts->param_vbox);
 
   retvals=do_onchange_init(rfx);
 
   if (retvals!=NULL) {
     // now apply visually anything we got from onchange_init
-    param_demarshall (rfx,retvals,TRUE,TRUE);
-    g_list_free_strings (retvals);
-    g_list_free (retvals);
+    param_demarshall(rfx,retvals,TRUE,TRUE);
+    lives_list_free_strings(retvals);
+    lives_list_free(retvals);
   }
 
   merge_opts->align_start=!merge_opts->align_start;
-  on_align_start_end_toggled (NULL,NULL);
+  on_align_start_end_toggled(NULL,NULL);
 }
 
 
 
 
-void
-on_merge_activate                     (LiVESMenuItem     *menuitem,
-                                        gpointer         user_data)
-{
+void on_merge_activate(LiVESMenuItem *menuitem, livespointer user_data) {
   create_merge_dialog();
 
   merge_opts->loop_to_fit=mainw->last_transition_loop_to_fit;
   merge_opts->ins_frames=mainw->last_transition_ins_frames;
   merge_opts->align_start=!mainw->last_transition_align_start;
 
-  on_align_start_end_toggled (NULL,NULL);
+  on_align_start_end_toggled(NULL,NULL);
 }
 
 
 
-void
-on_merge_cancel_clicked                   (LiVESButton       *button,
-					   gpointer         user_data)
-{
+void on_merge_cancel_clicked(LiVESButton *button, livespointer user_data) {
   lives_rfx_t *rfx=(lives_rfx_t *)user_data;
-  on_paramwindow_cancel_clicked (NULL,rfx);
-  if (merge_opts->spinbutton_loops!=NULL) 
-    mainw->last_transition_loops=lives_spin_button_get_value_as_int (LIVES_SPIN_BUTTON (merge_opts->spinbutton_loops));
+  on_paramwindow_cancel_clicked(NULL,rfx);
+  if (merge_opts->spinbutton_loops!=NULL)
+    mainw->last_transition_loops=lives_spin_button_get_value_as_int(LIVES_SPIN_BUTTON(merge_opts->spinbutton_loops));
   lives_widget_destroy(merge_opts->merge_dialog);
   lives_widget_context_update();
   mainw->last_transition_loop_to_fit=merge_opts->loop_to_fit;
   mainw->last_transition_ins_frames=merge_opts->ins_frames;
   mainw->last_transition_align_start=merge_opts->align_start;
-  g_list_free_strings (merge_opts->trans_list);
-  g_list_free (merge_opts->trans_list);
-  g_free (merge_opts->list_to_rfx_index);
-  g_free(merge_opts);
+  lives_list_free_strings(merge_opts->trans_list);
+  lives_list_free(merge_opts->trans_list);
+  lives_free(merge_opts->list_to_rfx_index);
+  lives_free(merge_opts);
 }
 
 
 
 
 
-void
-on_merge_ok_clicked                   (LiVESButton       *button,
-				       gpointer         user_data)
-{
-  gchar *msg;
+void on_merge_ok_clicked(LiVESButton *button, livespointer user_data) {
   int start,end;
 
   int cb_start=1;
@@ -349,8 +350,8 @@
 
   lives_rfx_t *rfx;
 
-  if (merge_opts->spinbutton_loops!=NULL) 
-    mainw->last_transition_loops=lives_spin_button_get_value_as_int (LIVES_SPIN_BUTTON (merge_opts->spinbutton_loops));
+  if (merge_opts->spinbutton_loops!=NULL)
+    mainw->last_transition_loops=lives_spin_button_get_value_as_int(LIVES_SPIN_BUTTON(merge_opts->spinbutton_loops));
 
   mainw->last_transition_loop_to_fit=merge_opts->loop_to_fit;
   mainw->last_transition_ins_frames=merge_opts->ins_frames;
@@ -360,27 +361,27 @@
 
   if (cfile->fps!=clipboard->fps) {
     if (!do_clipboard_fps_warning()) {
-      on_paramwindow_cancel_clicked (NULL,rfx);
+      on_paramwindow_cancel_clicked(NULL,rfx);
       lives_widget_destroy(merge_opts->merge_dialog);
       lives_widget_context_update();
-      g_list_free (merge_opts->trans_list);
-      g_free (merge_opts->list_to_rfx_index);
-      g_free(merge_opts);
+      lives_list_free(merge_opts->trans_list);
+      lives_free(merge_opts->list_to_rfx_index);
+      lives_free(merge_opts);
       return;
     }
   }
 
-  if (merge_opts->spinbutton_loops!=NULL) 
+  if (merge_opts->spinbutton_loops!=NULL)
     times_to_loop=lives_spin_button_get_value_as_int(LIVES_SPIN_BUTTON(merge_opts->spinbutton_loops));
-  else 
+  else
     times_to_loop=1;
 
-  on_paramwindow_cancel_clicked (NULL,rfx);
+  on_paramwindow_cancel_clicked(NULL,rfx);
   lives_widget_destroy(merge_opts->merge_dialog);
   lives_widget_context_update();
-  g_list_free (merge_opts->trans_list);
-  g_free (merge_opts->list_to_rfx_index);
-  g_free(merge_opts);
+  lives_list_free(merge_opts->trans_list);
+  lives_free(merge_opts->list_to_rfx_index);
+  lives_free(merge_opts);
 
   // if pref is set, resample clipboard video
   if (prefs->ins_resample&&cfile->fps!=clipboard->fps) {
@@ -391,9 +392,7 @@
     times_to_loop=1;
   }
 
-  msg=g_strdup(_ ("Merging clipboard with selection..."));
-  d_print(msg);
-  g_free(msg);
+  d_print(_("Merging clipboard with selection..."));
 
   excess_frames=clipboard->frames-(cfile->end-cfile->start+1);
   if (excess_frames<0) excess_frames=0;
@@ -413,10 +412,8 @@
   // insert pre-frames
   if (!mainw->last_transition_align_start&&excess_frames>0&&mainw->last_transition_ins_frames) {
     mainw->insert_after=FALSE;
-    msg=g_strdup_printf(P_ ("inserting %d extra frame before merge\n","inserting %d extra frames before merge\n",excess_frames),excess_frames);
-    d_print(msg);
-    g_free(msg);
-  
+    d_print(P_("inserting %d extra frame before merge\n","inserting %d extra frames before merge\n",excess_frames),excess_frames);
+
     // fx1_start and fx2_start indicate the clipboard start/end values, fx2_bool is insert_with_audio
     // TODO - allow this to be cancelled
     mainw->fx1_start=1;
@@ -433,7 +430,7 @@
   }
 
   // these should be the original values, maybe shifted if frames were inserted
-  
+
   // now the merge section
   mainw->effects_paused=FALSE;
 
@@ -450,11 +447,10 @@
   // number of frames to merge, must be <= selection length
   if (!mainw->last_transition_loop_to_fit) {
     cb_end=(clipboard->frames-excess_frames)*times_to_loop;
-  }
-  else {
+  } else {
     //loop_to_fit_audio
     cb_end=cfile->end-cfile->start+1;
-  } 
+  }
 
 
   // here we use undo_start and undo_end to mark the merged section,
@@ -462,8 +458,7 @@
   if (mainw->last_transition_align_start) {
     cfile->undo_start=cfile->start;
     cfile->undo_end=cfile->start+(cb_end*times_to_loop)-1;
-  }
-  else {
+  } else {
     cfile->undo_start=cfile->end-(cb_end*times_to_loop)+1;
     cfile->undo_end=cfile->end;
     cb_start=excess_frames+1;
@@ -479,89 +474,82 @@
     if (mainw->last_transition_align_start) {
       cfile->progress_end=cb_end-cb_start+cfile->start+excess_frames*!mainw->last_transition_align_start;
       cfile->progress_start=cfile->start;
-    }
-    else {
+    } else {
       cfile->progress_end=cfile->end;
       cfile->progress_start=cfile->end-cb_end+1;
     }
-  }
-  else {
+  } else {
     cfile->progress_start=cfile->start;
     cfile->progress_end=cfile->end;
   }
 
   // do the actual merge
-  if (!do_effect (rfx,FALSE)) {
+  if (!do_effect(rfx,FALSE)) {
     // cancelled
     // delete pre-inserted frames
-      if (!mainw->last_transition_align_start&&excess_frames>0) {
-	start=cfile->start;
-	end=cfile->end;
-	cfile->start=cfile->insert_start;
-	cfile->end=cfile->insert_end;
-	on_delete_activate(NULL,NULL);
-	// reset to original values
-	cfile->start=start;
-	cfile->end=end;
-      }
-      
-      cfile->undo_start=oundo_start;
-      cfile->undo_end=oundo_end;
-      cfile->insert_start=cfile->insert_end=0;
-
-      if (cb_video_change) {
-	mainw->current_file=0;
-	on_undo_activate(NULL,NULL);
-	switch_to_file(0,current_file);
-      }
-      set_undoable (NULL, FALSE);
+    if (!mainw->last_transition_align_start&&excess_frames>0) {
+      start=cfile->start;
+      end=cfile->end;
+      cfile->start=cfile->insert_start;
+      cfile->end=cfile->insert_end;
+      on_delete_activate(NULL,NULL);
+      // reset to original values
+      cfile->start=start;
+      cfile->end=end;
+    }
 
-      if (!mainw->last_transition_align_start&&excess_frames>0) {
-	// we've added and now deleted frames, we need to redraw everything...
-	cfile->start-=excess_frames;
-	cfile->end-=excess_frames;
-	switch_to_file(mainw->current_file,mainw->current_file);
-      }
-      else {
-	sensitize();
-	get_play_times();
-      }
-      return;
+    cfile->undo_start=oundo_start;
+    cfile->undo_end=oundo_end;
+    cfile->insert_start=cfile->insert_end=0;
+
+    if (cb_video_change) {
+      mainw->current_file=0;
+      on_undo_activate(NULL,NULL);
+      switch_to_file(0,current_file);
+    }
+    set_undoable(NULL, FALSE);
+
+    if (!mainw->last_transition_align_start&&excess_frames>0) {
+      // we've added and now deleted frames, we need to redraw everything...
+      cfile->start-=excess_frames;
+      cfile->end-=excess_frames;
+      switch_to_file(mainw->current_file,mainw->current_file);
+    } else {
+      sensitize();
+      get_play_times();
+    }
+    return;
   }
 
   // insert any post frames
   if (mainw->last_transition_align_start&&excess_frames>0&&mainw->last_transition_ins_frames) {
     mainw->insert_after=TRUE;
-    msg=g_strdup_printf(P_ ("now inserting %d extra frame\n","now inserting %d extra frames\n",excess_frames),excess_frames);
-    d_print(msg);
-    g_free(msg);
-    
-      
+    d_print(P_("now inserting %d extra frame\n","now inserting %d extra frames\n",excess_frames),excess_frames);
+
     // fx1_start and fx2_start hold the clipboard start/end values
     mainw->fx1_start=clipboard->frames-excess_frames+1;
     mainw->fx2_start=clipboard->frames;
 
-    on_insert_activate(NULL,GINT_TO_POINTER (1));
+    on_insert_activate(NULL,LIVES_INT_TO_POINTER(1));
   }
-  
+
   if (excess_frames==0||!mainw->last_transition_ins_frames) {
     d_print_done();
+  } else {
+    d_print(_("Merge done.\n"));
   }
-  else {
-    d_print(_ ("Merge done.\n"));
-  }
-  
+
   if (cb_video_change) {
     clipboard->old_frames=old_frames;
     mainw->current_file=0;
     on_undo_activate(NULL,NULL);
     mainw->current_file=current_file;
   }
-  
+
   cfile->undo_action=UNDO_MERGE;
   // can get overwritten by undo insert
-  set_undoable (_ (rfx->menu_text),TRUE);
-  
+  set_undoable(_(rfx->menu_text),TRUE);
+
   if (cfile->insert_start==0) {
     cfile->insert_start=cfile->undo_start;
     cfile->insert_end=cfile->undo_end;
@@ -572,29 +560,29 @@
   if (cfile->undo_start<cfile->insert_start) {
     cfile->insert_start=cfile->undo_start;
   }
-  
-  switch_to_file (mainw->current_file,mainw->current_file);
+
+  switch_to_file(mainw->current_file,mainw->current_file);
 }
 
 
-void after_spinbutton_loops_changed (LiVESSpinButton *spinbutton, gpointer user_data) {
-  setmergealign ();
+void after_spinbutton_loops_changed(LiVESSpinButton *spinbutton, livespointer user_data) {
+  setmergealign();
 }
 
 
-void on_align_start_end_toggled (LiVESToggleButton *togglebutton, gpointer user_data) {
+void on_align_start_end_toggled(LiVESToggleButton *togglebutton, livespointer user_data) {
   merge_opts->align_start=!merge_opts->align_start;
-  setmergealign ();
+  setmergealign();
 }
 
 
-void on_fit_toggled (LiVESToggleButton *togglebutton, gpointer user_data) {
+void on_fit_toggled(LiVESToggleButton *togglebutton, livespointer user_data) {
   merge_opts->loop_to_fit=!merge_opts->loop_to_fit;
   lives_widget_set_sensitive(merge_opts->spinbutton_loops,!merge_opts->loop_to_fit);
   setmergealign();
 }
 
 
-void on_ins_frames_toggled (LiVESToggleButton *togglebutton, gpointer user_data) {
+void on_ins_frames_toggled(LiVESToggleButton *togglebutton, livespointer user_data) {
   merge_opts->ins_frames=!merge_opts->ins_frames;
 }

LiVES-2.2.8.tar.bz2/src/merge.h -> LiVES-2.4.1.tar.bz2/src/merge.h Changed

@@ -7,23 +7,23 @@
 #ifndef HAS_LIVES_MERGE_H
 #define HAS_LIVES_MERGE_H
 
-void create_merge_dialog (void);
+void create_merge_dialog(void);
 
-void on_merge_activate (LiVESMenuItem *, gpointer);
+void on_merge_activate(LiVESMenuItem *, livespointer);
 
-void on_merge_ok_clicked (LiVESButton *, gpointer);
+void on_merge_ok_clicked(LiVESButton *, livespointer);
 
-void on_align_start_end_toggled (LiVESToggleButton *, gpointer);
+void on_align_start_end_toggled(LiVESToggleButton *, livespointer);
 
-void on_trans_method_changed (LiVESCombo *, gpointer);
+void on_trans_method_changed(LiVESCombo *, livespointer);
 
-void on_merge_cancel_clicked (LiVESButton *, gpointer);
+void on_merge_cancel_clicked(LiVESButton *, livespointer);
 
-void on_fit_toggled (LiVESToggleButton *, gpointer);
+void on_fit_toggled(LiVESToggleButton *, livespointer);
 
-void on_ins_frames_toggled (LiVESToggleButton *, gpointer);
+void on_ins_frames_toggled(LiVESToggleButton *, livespointer);
 
-void after_spinbutton_loops_changed (LiVESSpinButton *, gpointer);
+void after_spinbutton_loops_changed(LiVESSpinButton *, livespointer);
 
 
 #endif

LiVES-2.2.8.tar.bz2/src/multitrack.c -> LiVES-2.4.1.tar.bz2/src/multitrack.c Changed

@@ -1,7 +1,6 @@
-
 // multitrack.c
 // LiVES
-// (c) G. Finch 2005 - 2014 <salsaman@gmail.com>
+// (c) G. Finch 2005 - 2015 <salsaman@gmail.com>
 // released under the GNU GPL 3 or later
 // see file ../COPYING for licensing details
 
@@ -21,10 +20,11 @@
 // we use a Weed event list to store our timeline
 // (see weed events extension in weed-docs directory)
 
-// future plans include timeline plugins, which would generate event lists 
+// future plans include timeline plugins, which would generate event lists
 // or adjust the currently playing one
 // and it would be nice to be able to read/write event lists in other formats than the default
 
+
 #ifdef HAVE_SYSTEM_WEED
 #include <weed/weed.h>
 #include <weed/weed-palettes.h>
@@ -51,6 +51,7 @@
 #include "cvirtual.h"
 #include "pangotext.h"
 
+
 #ifdef ENABLE_GIW
 #include "giw/giwvslider.h"
 #include "giw/giwled.h"
@@ -62,18 +63,16 @@
 
 
 #if GTK_CHECK_VERSION(3,0,0)
-static boolean expose_timeline_reg_event (LiVESWidget *, lives_painter_t *cr, gpointer mt);
-static boolean mt_expose_audtrack_event (LiVESWidget *ebox, lives_painter_t *, gpointer mt);
+static boolean expose_timeline_reg_event(LiVESWidget *, lives_painter_t *cr, livespointer mt);
+static boolean mt_expose_audtrack_event(LiVESWidget *ebox, lives_painter_t *, livespointer mt);
 #else
-static boolean expose_timeline_reg_event (LiVESWidget *, GdkEventExpose *, gpointer mt);
-static boolean mt_expose_audtrack_event (LiVESWidget *ebox, GdkEventExpose *, gpointer mt);
+static boolean expose_timeline_reg_event(LiVESWidget *, LiVESXEventExpose *, livespointer mt);
+static boolean mt_expose_audtrack_event(LiVESWidget *ebox, LiVESXEventExpose *, livespointer mt);
 #endif
 
-static void on_rename_track_activate (LiVESMenuItem *, gpointer mt);
-
-static boolean mt_add_block_effect_idle (gpointer mt);
-static boolean mt_add_region_effect_idle (gpointer mt);
-static boolean mt_fx_edit_idle (gpointer mt);
+static boolean mt_add_block_effect_idle(livespointer mt);
+static boolean mt_add_region_effect_idle(livespointer mt);
+static boolean mt_fx_edit_idle(livespointer mt);
 
 static void paint_lines(lives_mt *mt, double currtime, boolean unpaint);
 
@@ -115,56 +114,55 @@
 
 static int ce_sepwin_type;
 
+static boolean needs_clear;
+
 ////////////////////////////
 
 // menuitem callbacks - TODO : make static
-void on_add_video_track_activate (LiVESMenuItem *, gpointer mt);
-void multitrack_adj_start_end (LiVESMenuItem *, gpointer mt);
-void multitrack_audio_insert (LiVESMenuItem *, gpointer mt);
-void multitrack_view_events (LiVESMenuItem *, gpointer mt);
-void multitrack_view_sel_events (LiVESMenuItem *, gpointer mt);
-void on_render_activate (LiVESMenuItem *, gpointer mt);
-void on_prerender_aud_activate (LiVESMenuItem *, gpointer mt);
-void on_jumpnext_activate (LiVESMenuItem *, gpointer mt);
-void on_jumpback_activate (LiVESMenuItem *, gpointer mt);
-void on_delblock_activate (LiVESMenuItem *, gpointer mt);
-void on_seltrack_activate (LiVESMenuItem *, gpointer mt);
-void multitrack_view_details (LiVESMenuItem *, gpointer mt);
-void mt_add_region_effect (LiVESMenuItem *, gpointer mt);
-void mt_add_block_effect (LiVESMenuItem *, gpointer mt);
-void on_save_event_list_activate (LiVESMenuItem *, gpointer mt);
-void on_load_event_list_activate (LiVESMenuItem *, gpointer mt);
-void on_clear_event_list_activate (LiVESMenuItem *, gpointer mt);
-void show_frame_events_activate (LiVESMenuItem *, gpointer);
-void mt_save_vals_toggled (LiVESMenuItem *, gpointer mt);
-void mt_load_vals_toggled (LiVESMenuItem *, gpointer mt);
-void mt_load_vals_toggled (LiVESMenuItem *, gpointer mt);
-void mt_render_vid_toggled (LiVESMenuItem *, gpointer mt);
-void mt_render_aud_toggled (LiVESMenuItem *, gpointer mt);
-void mt_norm_aud_toggled (LiVESMenuItem *, gpointer mt);
-void mt_fplay_toggled (LiVESMenuItem *, gpointer mt);
-void mt_change_vals_activate (LiVESMenuItem *, gpointer mt);
-void on_set_pvals_clicked  (LiVESWidget *button, gpointer mt);
-void on_move_fx_changed (LiVESMenuItem *, gpointer mt);
-void select_all_time (LiVESMenuItem *, gpointer mt);
-void select_from_zero_time (LiVESMenuItem *, gpointer mt);
-void select_to_end_time (LiVESMenuItem *, gpointer mt);
-void select_all_vid (LiVESMenuItem *, gpointer mt);
-void select_no_vid (LiVESMenuItem *, gpointer mt);
-void on_split_sel_activate (LiVESMenuItem *, gpointer mt);
-void on_split_curr_activate (LiVESMenuItem *, gpointer mt);
-void multitrack_undo (LiVESMenuItem *, gpointer mt);
-void multitrack_redo (LiVESMenuItem *, gpointer mt);
-void on_mt_showkeys_activate (LiVESMenuItem *, gpointer);
-void on_mt_list_fx_activate (LiVESMenuItem *, gpointer mt);
-void on_mt_delfx_activate (LiVESMenuItem *, gpointer mt);
-void on_mt_fx_edit_activate (LiVESMenuItem *, gpointer mt);
-void mt_view_audio_toggled (LiVESMenuItem *, gpointer mt);
-void mt_view_ctx_toggled (LiVESMenuItem *, gpointer mt);
-void mt_ign_ins_sel_toggled (LiVESMenuItem *, gpointer mt);
-void mt_change_max_disp_tracks (LiVESMenuItem *, gpointer mt);
+void on_add_video_track_activate(LiVESMenuItem *, livespointer mt);
+void multitrack_adj_start_end(LiVESMenuItem *, livespointer mt);
+boolean multitrack_audio_insert(LiVESMenuItem *, livespointer mt);
+void multitrack_view_events(LiVESMenuItem *, livespointer mt);
+void multitrack_view_sel_events(LiVESMenuItem *, livespointer mt);
+void on_prerender_aud_activate(LiVESMenuItem *, livespointer mt);
+void on_jumpnext_activate(LiVESMenuItem *, livespointer mt);
+void on_jumpback_activate(LiVESMenuItem *, livespointer mt);
+static void on_delblock_activate(LiVESMenuItem *, livespointer mt);
+void on_seltrack_activate(LiVESMenuItem *, livespointer mt);
+void multitrack_view_details(LiVESMenuItem *, livespointer mt);
+void mt_add_region_effect(LiVESMenuItem *, livespointer mt);
+void mt_add_block_effect(LiVESMenuItem *, livespointer mt);
+void on_clear_event_list_activate(LiVESMenuItem *, livespointer mt);
+void show_frame_events_activate(LiVESMenuItem *, livespointer);
+void mt_save_vals_toggled(LiVESMenuItem *, livespointer mt);
+void mt_load_vals_toggled(LiVESMenuItem *, livespointer mt);
+void mt_load_vals_toggled(LiVESMenuItem *, livespointer mt);
+void mt_render_vid_toggled(LiVESMenuItem *, livespointer mt);
+void mt_render_aud_toggled(LiVESMenuItem *, livespointer mt);
+void mt_norm_aud_toggled(LiVESMenuItem *, livespointer mt);
+void mt_fplay_toggled(LiVESMenuItem *, livespointer mt);
+void mt_change_vals_activate(LiVESMenuItem *, livespointer mt);
+void on_set_pvals_clicked(LiVESWidget *button, livespointer mt);
+void on_move_fx_changed(LiVESMenuItem *, livespointer mt);
+void select_all_time(LiVESMenuItem *, livespointer mt);
+void select_from_zero_time(LiVESMenuItem *, livespointer mt);
+void select_to_end_time(LiVESMenuItem *, livespointer mt);
+void select_all_vid(LiVESMenuItem *, livespointer mt);
+void select_no_vid(LiVESMenuItem *, livespointer mt);
+void on_split_sel_activate(LiVESMenuItem *, livespointer mt);
+void on_split_curr_activate(LiVESMenuItem *, livespointer mt);
+void multitrack_undo(LiVESMenuItem *, livespointer mt);
+void multitrack_redo(LiVESMenuItem *, livespointer mt);
+void on_mt_showkeys_activate(LiVESMenuItem *, livespointer);
+void on_mt_list_fx_activate(LiVESMenuItem *, livespointer mt);
+void on_mt_delfx_activate(LiVESMenuItem *, livespointer mt);
+void on_mt_fx_edit_activate(LiVESMenuItem *, livespointer mt);
+void mt_view_audio_toggled(LiVESMenuItem *, livespointer mt);
+void mt_view_ctx_toggled(LiVESMenuItem *, livespointer mt);
+void mt_ign_ins_sel_toggled(LiVESMenuItem *, livespointer mt);
+void mt_change_max_disp_tracks(LiVESMenuItem *, livespointer mt);
 
-static void mt_ac_audio_toggled (LiVESMenuItem *, gpointer mt);
+static void mt_ac_audio_toggled(LiVESMenuItem *, livespointer mt);
 
 ///////////////////////////////////////////////////////////////////
 
@@ -176,38 +174,50 @@
 
 static LIVES_INLINE int mt_clip_from_file(lives_mt *mt, int file) {
   register int i;
-  for (i=0;i<MAX_FILES;i++) {
+  for (i=0; i<MAX_FILES; i++) {
     if (clips_to_files[i]==file) return i;
   }
   return -1;
 }
 
 /// return track number for a given block
-static LIVES_INLINE int get_track_for_block(track_rect *block) {
-  return GPOINTER_TO_INT(g_object_get_data(G_OBJECT(block->eventbox),"layer_number"));  
+int get_track_for_block(track_rect *block) {
+  return LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(block->eventbox),"layer_number"));
 }
 
 
 
 static LIVES_INLINE boolean is_empty_track(LiVESObject *track) {
-  return (g_object_get_data(track, "blocks")==NULL);
+  return (lives_widget_object_get_data(track, "blocks")==NULL);
 }
 
 double get_mixer_track_vol(lives_mt *mt, int trackno) {
-  double vol=(double)(GPOINTER_TO_INT(g_list_nth_data(mt->audio_vols,trackno)));
+  double vol=(double)(LIVES_POINTER_TO_INT(lives_list_nth_data(mt->audio_vols,trackno)));
   return vol/LIVES_AVOL_SCALE;
 }
 
 void set_mixer_track_vol(lives_mt *mt, int trackno, double vol) {
   int x=vol*LIVES_AVOL_SCALE;
-  g_list_nth(mt->audio_vols,trackno)->data=GINT_TO_POINTER(x);
+  lives_list_nth(mt->audio_vols,trackno)->data=LIVES_INT_TO_POINTER(x);
 }
 
 
-
 static boolean save_event_list_inner(lives_mt *mt, int fd, weed_plant_t *event_list, unsigned char **mem) {
   weed_plant_t *event;
+
+  void **ievs=NULL;
+
+  void *next,*prev;
+
+  int64_t *uievs;
+
+  int64_t iev=0l;
+
   int count=0;
+  int nivs=0;
+
+  int error;
+
   register int i;
 
   if (event_list==NULL) return TRUE;
@@ -222,35 +232,59 @@
   weed_set_int_value(event_list,"audio_rate",cfile->arate);
   weed_set_int_value(event_list,"audio_sample_size",cfile->asampsize);
 
-  // new: save sizeof(void *) - for conversion to/from 8/16 bit systems
-  weed_set_int_value(event_list,"ptrsize",8);
-
+  weed_set_int_value(event_list,"weed_event_api_version",WEED_EVENT_API_VERSION);
 
   if (cfile->signed_endian&AFORM_UNSIGNED) weed_set_boolean_value(event_list,"audio_signed",WEED_FALSE);
   else weed_set_boolean_value(event_list,"audio_signed",WEED_TRUE);
   if (cfile->signed_endian&AFORM_BIG_ENDIAN) weed_set_int_value(event_list,"audio_endian",1);
   else weed_set_int_value(event_list,"audio_endian",0);
-  
+
   if (mt!=NULL&&mt->audio_vols!=NULL&&mt->audio_draws!=NULL) {
-    int natracks=g_list_length(mt->audio_draws);
-    int *atracks=(int *)g_malloc(natracks*sizint);
+    int natracks=lives_list_length(mt->audio_draws);
+
+    int *atracks=(int *)lives_malloc(natracks*sizint);
     double *avols;
+
     int navols;
-    for (i=0;i<natracks;i++) {
+
+    for (i=0; i<natracks; i++) {
       atracks[i]=i-mt->opts.back_audio_tracks;
     }
     weed_set_int_array(event_list,"audio_volume_tracks",natracks,atracks);
-    g_free(atracks);
-    
+    lives_free(atracks);
+
     if (mt->opts.gang_audio) navols=1+mt->opts.back_audio_tracks;
     else navols=natracks;
-    
-    avols=(double *)g_malloc(navols*sizeof(double));
-    for (i=0;i<navols;i++) {
+
+    avols=(double *)lives_malloc(navols*sizeof(double));
+    for (i=0; i<navols; i++) {
       avols[i]=get_mixer_track_vol(mt,i);
     }
     weed_set_double_array(event_list,"audio_volume_values",navols,avols);
-    g_free(avols);
+    lives_free(avols);
+  }
+
+
+  if (mt!=NULL) {
+    int nvtracks=lives_list_length(mt->video_draws);
+
+    int *vtracks=(int *)lives_malloc(nvtracks*sizint);
+    char **const labels=(char **)lives_malloc(nvtracks*sizeof(char *));
+
+    for (i=0; i<nvtracks; i++) {
+      LiVESWidget *ebox=get_eventbox_for_track(mt,i);
+      const char *tname=(const char *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(ebox),"track_name");
+      labels[i]=(char *)tname;
+      vtracks[i]=i;
+    }
+
+    weed_set_int_array(event_list,"track_label_tracks",nvtracks,vtracks);
+    lives_free(vtracks);
+
+    weed_set_string_array(event_list,"track_label_values",nvtracks,labels);
+
+    lives_free(labels);
+
   }
 
   if (mem==NULL&&fd<0) return TRUE;
@@ -260,11 +294,49 @@
   mainw->write_failed=FALSE;
   weed_plant_serialise(fd,event_list,mem);
   while (!mainw->write_failed&&event!=NULL) {
+
+    next=weed_get_voidptr_value(event,"next",&error);
+    weed_leaf_delete(event,"next");
+
+    prev=weed_get_voidptr_value(event,"prev",&error);
+    weed_leaf_delete(event,"prev");
+
     if (WEED_EVENT_IS_FILTER_INIT(event)) {
       weed_leaf_delete(event,"event_id");
-      weed_set_voidptr_value(event,"event_id",(void *)event);
+      weed_set_int64_value(event,"event_id",(int64_t)(uint64_t)((void *)event));
+    } else if (WEED_EVENT_IS_FILTER_DEINIT(event)||WEED_EVENT_IS_PARAM_CHANGE(event)) {
+      iev=(int64_t)(uint64_t)weed_get_voidptr_value(event,"init_event",&error);
+      weed_leaf_delete(event,"init_event");
+      weed_set_int64_value(event,"init_event",iev);
+    } else if (WEED_EVENT_IS_FILTER_MAP(event)) {
+      nivs=weed_leaf_num_elements(event,"init_events");
+      ievs=weed_get_voidptr_array(event,"init_events",&error);
+      uievs=(int64_t *)lives_malloc(nivs*8);
+      for (i=0; i<nivs; i++) {
+        uievs[i]=(int64_t)(uint64_t)ievs[i];
+      }
+      weed_leaf_delete(event,"init_events");
+      weed_set_int64_array(event,"init_events",nivs,uievs);
+      lives_free(uievs);
     }
+
     weed_plant_serialise(fd,event,mem);
+
+    if (WEED_EVENT_IS_FILTER_INIT(event)) {
+      weed_leaf_delete(event,"event_id");
+    }
+    if (WEED_EVENT_IS_FILTER_DEINIT(event)||WEED_EVENT_IS_PARAM_CHANGE(event)) {
+      weed_leaf_delete(event,"init_event");
+      weed_set_voidptr_value(event,"init_event",(void *)iev);
+    } else if (WEED_EVENT_IS_FILTER_MAP(event)) {
+      weed_leaf_delete(event,"init_events");
+      weed_set_voidptr_array(event,"init_events",nivs,ievs);
+      lives_free(ievs);
+    }
+
+    weed_set_voidptr_value(event,"next",next);
+    weed_set_voidptr_value(event,"prev",prev);
+
     event=get_next_event(event);
     if (++count==100) {
       count=0;
@@ -278,9 +350,9 @@
 }
 
 
-LiVESPixbuf *make_thumb (lives_mt *mt, int file, int width, int height, int frame, boolean noblanks) {
+LiVESPixbuf *make_thumb(lives_mt *mt, int file, int width, int height, int frame, boolean noblanks) {
   LiVESPixbuf *thumbnail=NULL,*pixbuf;
-  GError *error=NULL;
+  LiVESError *error=NULL;
   char *buf;
 
   boolean tried_all=FALSE;
@@ -297,7 +369,7 @@
 
   if (mt!=NULL&&mt->idlefunc>0) {
     needs_idlefunc=TRUE;
-    g_source_remove(mt->idlefunc);
+    lives_source_remove(mt->idlefunc);
     mt->idlefunc=0;
   }
 
@@ -306,47 +378,45 @@
     if (mainw->files[file]->frames>0) {
       weed_timecode_t tc=(frame-1.)/mainw->files[file]->fps*U_SECL;
       if (mainw->files[file]->frames>0&&mainw->files[file]->clip_type==CLIP_TYPE_FILE) {
-	lives_clip_data_t *cdata=((lives_decoder_t *)mainw->files[file]->ext_src)->cdata;
-	if (cdata!=NULL&&!(cdata->seek_flag&LIVES_SEEK_FAST)&&
-	    is_virtual_frame(file,frame)) {
-	  boolean resb=virtual_to_images(file,frame,frame,FALSE,NULL);
-	  resb=resb; // dont care (much) if it fails
-	}
+        lives_clip_data_t *cdata=((lives_decoder_t *)mainw->files[file]->ext_src)->cdata;
+        if (cdata!=NULL&&!(cdata->seek_flag&LIVES_SEEK_FAST)&&
+            is_virtual_frame(file,frame)) {
+          boolean resb=virtual_to_images(file,frame,frame,FALSE,NULL);
+          resb=resb; // dont care (much) if it fails
+        }
       }
       thumbnail=pull_lives_pixbuf_at_size(file,frame,get_image_ext_for_type(mainw->files[file]->img_type),tc,
-					  width,height,LIVES_INTERP_BEST);
-    }
-    else {
-      buf=g_build_filename(prefs->prefix_dir,ICON_DIR,"audio.png",NULL);
+                                          width,height,LIVES_INTERP_BEST);
+    } else {
+      buf=lives_build_filename(prefs->prefix_dir,ICON_DIR,"audio.png",NULL);
       pixbuf=lives_pixbuf_new_from_file_at_scale(buf,width,height,FALSE,&error);
       // ...at_scale is inaccurate !
-      
-      g_free(buf);
+
+      lives_free(buf);
       if (error!=NULL||pixbuf==NULL) {
-	g_error_free(error);
-	if (needs_idlefunc) {
-	  mt->idlefunc=mt_idle_add(mt);
-	}
-	return NULL;
+        lives_error_free(error);
+        if (needs_idlefunc) {
+          mt->idlefunc=mt_idle_add(mt);
+        }
+        return NULL;
       }
-      
+
       if (lives_pixbuf_get_width(pixbuf)!=width||lives_pixbuf_get_height(pixbuf)!=height) {
-	// ...at_scale is inaccurate
-	thumbnail=lives_pixbuf_scale_simple(pixbuf,width,height,LIVES_INTERP_BEST);
-	lives_object_unref(pixbuf);
-      }
-      else thumbnail=pixbuf;
+        // ...at_scale is inaccurate
+        thumbnail=lives_pixbuf_scale_simple(pixbuf,width,height,LIVES_INTERP_BEST);
+        lives_object_unref(pixbuf);
+      } else thumbnail=pixbuf;
     }
 
     if (tried_all) noblanks=FALSE;
 
-    if (noblanks&&!lives_pixbuf_is_all_black(thumbnail)) noblanks=FALSE;
+    if (noblanks&&thumbnail!=NULL&&!lives_pixbuf_is_all_black(thumbnail)) noblanks=FALSE;
     if (noblanks) {
       nframe=frame+mainw->files[file]->frames/10.;
       if (nframe==frame) nframe++;
       if (nframe>mainw->files[file]->frames) {
-	nframe=oframe;
-	tried_all=TRUE;
+        nframe=oframe;
+        tried_all=TRUE;
       }
       frame=nframe;
       if (thumbnail!=NULL) lives_object_unref(thumbnail);
@@ -364,7 +434,7 @@
 }
 
 
-LiVESPixbuf *make_thumb_fast_between (lives_mt *mt, int fileno, int width, int height, int tframe, int range) {
+LiVESPixbuf *make_thumb_fast_between(lives_mt *mt, int fileno, int width, int height, int tframe, int range) {
   int nvframe=-1;
   register int i;
 
@@ -375,7 +445,7 @@
 
   if (width<2||height<2) return NULL;
 
-  for (i=1;i<=range;i++) {
+  for (i=1; i<=range; i++) {
     if (tframe-i>0&&!is_virtual_frame(fileno,tframe-i)) {
       nvframe=tframe-i;
       break;
@@ -395,7 +465,7 @@
 
 
 static void mt_set_cursor_style(lives_mt *mt, lives_cursor_t cstyle, int width, int height, int clip, int hsx, int hsy) {
-  GdkCursor *cursor;
+  LiVESXCursor *cursor;
   LiVESXDisplay *disp;
 
   LiVESPixbuf *pixbuf=NULL;
@@ -416,99 +486,104 @@
 
   disp=lives_widget_get_display(mt->window);
 
+#ifdef GUI_GTK
   gdk_display_get_maximal_cursor_size(disp,&cwidth,&cheight);
+#endif
+#ifdef GUI_QT
+  cwidth = MAX_CURSOR_WIDTH;
+#endif
+
   if (width>cwidth) width=cwidth;
 
   mt->cursor_style=cstyle;
-  switch(cstyle) {
+  switch (cstyle) {
   case LIVES_CURSOR_BLOCK:
     if (sfile!=NULL&&sfile->frames>0) {
       frame_start=mt->opts.ign_ins_sel?1:sfile->start;
       frames_width=(double)(mt->opts.ign_ins_sel?sfile->frames:sfile->end-sfile->start+1.);
 
-      pixbuf=lives_pixbuf_new (TRUE, width, height);
+      pixbuf=lives_pixbuf_new(TRUE, width, height);
 
-      for (i=0;i<width;i+=BLOCK_THUMB_WIDTH) {
-	// create a small thumb
-	twidth=BLOCK_THUMB_WIDTH;
-	if ((i+twidth)>width) twidth=width-i;
-	if (twidth>=2) {
-	  thumbnail=make_thumb(mt,clip,twidth,height,frame_start+(int)((double)i/(double)width*frames_width),FALSE);
-	  // render it in the eventbox
-	  if (thumbnail!=NULL) {
-	    trow=lives_pixbuf_get_rowstride(thumbnail);
-	    twidth=lives_pixbuf_get_width(thumbnail);
-	    cpixels=lives_pixbuf_get_pixels(pixbuf)+(i*4);
-	    tpixels=lives_pixbuf_get_pixels(thumbnail);
-
-	    if (!lives_pixbuf_get_has_alpha(thumbnail)) {
-	      twidth3=twidth*3;
-	      for (j=0;j<height;j++) {
-		for (k=0;k<twidth3;k+=3) {
-		  lives_memcpy(cpixels,&tpixels[k],3);
-		  memset(cpixels+3,0xFF,1);
-		  cpixels+=4;
-		}
-		tpixels+=trow;
-		cpixels+=(width-twidth)<<2;
-	      }
-	    }
-	    else {
-	      twidth4=twidth*4;
-	      for (j=0;j<height;j++) {
-		lives_memcpy(cpixels,tpixels,twidth4);
-		tpixels+=trow;
-		cpixels+=width<<2;
-	      }
-	    }
-	    lives_object_unref(thumbnail);
-	  }
-	}
+      for (i=0; i<width; i+=BLOCK_THUMB_WIDTH) {
+        // create a small thumb
+        twidth=BLOCK_THUMB_WIDTH;
+        if ((i+twidth)>width) twidth=width-i;
+        if (twidth>=2) {
+          thumbnail=make_thumb(mt,clip,twidth,height,frame_start+(int)((double)i/(double)width*frames_width),FALSE);
+          // render it in the eventbox
+          if (thumbnail!=NULL) {
+            trow=lives_pixbuf_get_rowstride(thumbnail);
+            twidth=lives_pixbuf_get_width(thumbnail);
+            cpixels=lives_pixbuf_get_pixels(pixbuf)+(i*4);
+            tpixels=lives_pixbuf_get_pixels(thumbnail);
+
+            if (!lives_pixbuf_get_has_alpha(thumbnail)) {
+              twidth3=twidth*3;
+              for (j=0; j<height; j++) {
+                for (k=0; k<twidth3; k+=3) {
+                  lives_memcpy(cpixels,&tpixels[k],3);
+                  memset(cpixels+3,0xFF,1);
+                  cpixels+=4;
+                }
+                tpixels+=trow;
+                cpixels+=(width-twidth)<<2;
+              }
+            } else {
+              twidth4=twidth*4;
+              for (j=0; j<height; j++) {
+                lives_memcpy(cpixels,tpixels,twidth4);
+                tpixels+=trow;
+                cpixels+=width<<2;
+              }
+            }
+            lives_object_unref(thumbnail);
+          }
+        }
       }
       break;
     }
     // fallthrough
   case LIVES_CURSOR_AUDIO_BLOCK:
-    pixbuf=lives_pixbuf_new (TRUE, width, height);
+    pixbuf=lives_pixbuf_new(TRUE, width, height);
     trow=lives_pixbuf_get_rowstride(pixbuf);
     cpixels=lives_pixbuf_get_pixels(pixbuf);
-    for (j=0;j<height;j++) {
-      for (k=0;k<width;k++) {
-	cpixels[0]=audcol.red;
-	cpixels[1]=audcol.green;
-	cpixels[2]=audcol.blue;
-	cpixels[3]=0xFF;
-	cpixels+=4;
+    for (j=0; j<height; j++) {
+      for (k=0; k<width; k++) {
+        cpixels[0]=audcol.red;
+        cpixels[1]=audcol.green;
+        cpixels[2]=audcol.blue;
+        cpixels[3]=0xFF;
+        cpixels+=4;
       }
       cpixels+=(trow-width*4);
     }
     break;
   case LIVES_CURSOR_VIDEO_BLOCK:
-    pixbuf=lives_pixbuf_new (TRUE, width, height);
+    pixbuf=lives_pixbuf_new(TRUE, width, height);
     trow=lives_pixbuf_get_rowstride(pixbuf);
     cpixels=lives_pixbuf_get_pixels(pixbuf);
-    for (j=0;j<height;j++) {
-      for (k=0;k<width;k++) {
-	cpixels[0]=vidcol.red;
-	cpixels[1]=vidcol.green;
-	cpixels[2]=vidcol.blue;
-	cpixels[3]=0xFF;
-	cpixels+=4;
+    for (j=0; j<height; j++) {
+      for (k=0; k<width; k++) {
+        cpixels[0]=vidcol.red;
+        cpixels[1]=vidcol.green;
+        cpixels[2]=vidcol.blue;
+        cpixels[3]=0xFF;
+        cpixels+=4;
       }
       cpixels+=(trow-width*4);
     }
     break;
   case LIVES_CURSOR_FX_BLOCK:
-    pixbuf=lives_pixbuf_new (TRUE, width, height);
+    pixbuf=lives_pixbuf_new(TRUE, width, height);
     trow=lives_pixbuf_get_rowstride(pixbuf);
     cpixels=lives_pixbuf_get_pixels(pixbuf);
-    for (j=0;j<height;j++) {
-      for (k=0;k<width;k++) {
-	cpixels[0]=fxcol.red;
-	cpixels[1]=fxcol.green;
-	cpixels[2]=fxcol.blue;
-	cpixels[3]=0xFF;
-	cpixels+=4;
+    for (j=0; j<height; j++) {
+      for (k=0; k<width; k++) {
+        cpixels[0]=fxcol.red;
+        cpixels[1]=fxcol.green;
+        cpixels[2]=fxcol.blue;
+        cpixels[3]=0xFF;
+        cpixels+=4;
       }
       cpixels+=(trow-width*4);
     }
@@ -517,10 +592,10 @@
     return;
   }
 
-  cursor = gdk_cursor_new_from_pixbuf (disp, pixbuf, hsx, hsy);
-  lives_xwindow_set_cursor (lives_widget_get_xwindow(mt->window), cursor);
+  cursor = lives_cursor_new_from_pixbuf(disp, pixbuf, hsx, hsy);
+  lives_xwindow_set_cursor(lives_widget_get_xwindow(mt->window), cursor);
 
-  if (pixbuf!=NULL) lives_object_unref (pixbuf);
+  if (pixbuf!=NULL) lives_object_unref(pixbuf);
   if (cursor!=NULL) lives_cursor_unref(cursor);
 }
 
@@ -531,45 +606,44 @@
 
   int fd,i,vali,hdlsize;
   double vald;
-  gchar *asave_file=g_strdup_printf("%s/layout_numbering.%d.%d.%d",prefs->tmpdir,lives_getuid(),lives_getgid(),
-				    capable->mainpid);
-  GList *clist=mainw->cliplist;
+  char *asave_file=lives_strdup_printf("%s/layout_numbering.%d.%d.%d",prefs->tmpdir,lives_getuid(),lives_getgid(),
+                                       capable->mainpid);
+  LiVESList *clist=mainw->cliplist;
 
   fd=lives_creat_buffered(asave_file,DEF_FILE_PERMS);
-  g_free(asave_file);
+  lives_free(asave_file);
 
   mainw->write_failed=FALSE;
 
   if (fd!=-1) {
     while (mainw->write_failed&&clist!=NULL) {
-      i=GPOINTER_TO_INT(clist->data);
+      i=LIVES_POINTER_TO_INT(clist->data);
       if (mainw->files[i]->clip_type!=CLIP_TYPE_DISK&&mainw->files[i]->clip_type!=CLIP_TYPE_FILE) {
-	clist=clist->next;
-	continue;
+        clist=clist->next;
+        continue;
 
       }
       if (mt!=NULL) {
-	lives_write_le_buffered(fd,&i,4,TRUE);
-	vald=mainw->files[i]->fps;
-	lives_write_le_buffered(fd,&vald,8,TRUE);
-	hdlsize=strlen(mainw->files[i]->handle);
-	lives_write_le_buffered (fd,&hdlsize,4,TRUE);
-	lives_write_buffered (fd,&mainw->files[i]->handle,hdlsize,TRUE);
-      }
-      else {
-	vali=mainw->files[i]->stored_layout_idx;
-	if (vali!=-1) {
-	  lives_write_le_buffered(fd,&vali,4,TRUE);
-	  vald=mainw->files[i]->fps;
-	  lives_write_le_buffered(fd,&vald,8,TRUE);
-	  hdlsize=strlen(mainw->files[i]->handle);
-	  lives_write_le_buffered (fd,&hdlsize,4,TRUE);
-	  lives_write_buffered (fd,&mainw->files[i]->handle,hdlsize,TRUE);
-	}
+        lives_write_le_buffered(fd,&i,4,TRUE);
+        vald=mainw->files[i]->fps;
+        lives_write_le_buffered(fd,&vald,8,TRUE);
+        hdlsize=strlen(mainw->files[i]->handle);
+        lives_write_le_buffered(fd,&hdlsize,4,TRUE);
+        lives_write_buffered(fd,&mainw->files[i]->handle,hdlsize,TRUE);
+      } else {
+        vali=mainw->files[i]->stored_layout_idx;
+        if (vali!=-1) {
+          lives_write_le_buffered(fd,&vali,4,TRUE);
+          vald=mainw->files[i]->fps;
+          lives_write_le_buffered(fd,&vald,8,TRUE);
+          hdlsize=strlen(mainw->files[i]->handle);
+          lives_write_le_buffered(fd,&hdlsize,4,TRUE);
+          lives_write_buffered(fd,&mainw->files[i]->handle,hdlsize,TRUE);
+        }
       }
       clist=clist->next;
     }
-    
+
     lives_close_buffered(fd);
   }
 
@@ -589,8 +663,8 @@
 
   int fd,vari,clipn,offs;
   double vard;
-  gchar *aload_file=g_strdup_printf("%s/layout_numbering.%d.%d.%d",prefs->tmpdir,lives_getuid(),lives_getgid(),
-				    capable->mainpid);
+  char *aload_file=lives_strdup_printf("%s/layout_numbering.%d.%d.%d",prefs->tmpdir,lives_getuid(),lives_getgid(),
+                                       capable->mainpid);
   boolean isfirst=TRUE;
   char buf[256];
 
@@ -599,31 +673,27 @@
   if (fd!=-1) {
     while (1) {
       if (lives_read_le_buffered(fd,&clipn,4,TRUE)==4) {
-	if (isfirst) offs=-clipn+1;
-	else isfirst=FALSE;
-	if (lives_read_le_buffered(fd,&vard,8,TRUE)==8) {
-
-	  if (lives_read_le_buffered(fd,&vari,4,TRUE)==4) {
-	    // compare the handle - assume clip ordering has not changed
-	    if (vari>255) vari=255;
-	    if (lives_read_buffered(fd,buf,vari,TRUE)==vari) {
-	      memset(buf+vari,0,1);
-	      while (mainw->files[clipn+offs]!=NULL&&strcmp(mainw->files[clipn+offs]->handle,buf)) {
-		offs++;
-	      }
-	      if (mainw->files[clipn+offs]==NULL) break;
-	      // got a match - index the current clip order -> clip order in layout
-	      renumbered_clips[clipn]=clipn+offs;
-	      // lfps contains the fps at the time of the crash
-	      lfps[clipn+offs]=vard;
-	    }
-	    else break;
-	  }
-	  else break;
-	}
-	else break;
-      }
-      else break;
+        if (isfirst) offs=-clipn+1;
+        else isfirst=FALSE;
+        if (lives_read_le_buffered(fd,&vard,8,TRUE)==8) {
+
+          if (lives_read_le_buffered(fd,&vari,4,TRUE)==4) {
+            // compare the handle - assume clip ordering has not changed
+            if (vari>255) vari=255;
+            if (lives_read_buffered(fd,buf,vari,TRUE)==vari) {
+              memset(buf+vari,0,1);
+              while (mainw->files[clipn+offs]!=NULL&&strcmp(mainw->files[clipn+offs]->handle,buf)) {
+                offs++;
+              }
+              if (mainw->files[clipn+offs]==NULL) break;
+              // got a match - index the current clip order -> clip order in layout
+              renumbered_clips[clipn]=clipn+offs;
+              // lfps contains the fps at the time of the crash
+              lfps[clipn+offs]=vard;
+            } else break;
+          } else break;
+        } else break;
+      } else break;
     }
     lives_close_buffered(fd);
   }
@@ -642,7 +712,7 @@
   struct timeval otv;
 
   int fd;
-  gchar *asave_file=g_strdup_printf("%s/layout.%d.%d.%d",prefs->tmpdir,lives_getuid(),lives_getgid(),capable->mainpid);
+  char *asave_file=lives_strdup_printf("%s/layout.%d.%d.%d",prefs->tmpdir,lives_getuid(),lives_getgid(),capable->mainpid);
   lives_mt_poly_state_t poly_state;
 
   boolean retval=TRUE;
@@ -664,7 +734,7 @@
 #endif
       add_markers(mt,mt->event_list);
       do_threaded_dialog(_("Auto backup"),FALSE);
-      
+
       set_signal_handlers((SignalHandlerPointer)defer_sigint);
 
       retval=save_event_list_inner(mt,fd,mt->event_list,NULL);
@@ -674,42 +744,41 @@
       set_signal_handlers((SignalHandlerPointer)catch_sigint);
 
       end_threaded_dialog();
-      
+
       if (retval) retval=write_backup_layout_numbering(mt);
-      
+
       remove_markers(mt->event_list);
       lives_close_buffered(fd);
-    }
-    else mainw->write_failed=TRUE;
-    
+    } else mainw->write_failed=TRUE;
+
     poly_state=mt->poly_state;
     if (mt->poly_state!=POLY_IN_OUT) mt->poly_state=POLY_NONE;
     mt_sensitise(mt);
     mt->poly_state=poly_state;
-    
+
     if (!mainw->write_failed) mt->auto_changed=FALSE;
     else mainw->write_failed=FALSE;
-    
+
     if (!retval||mainw->write_failed) {
       retval2=do_write_failed_error_s_with_retry(asave_file,NULL,NULL);
     }
-  } while (retval2==LIVES_RETRY);
+  } while (retval2==LIVES_RESPONSE_RETRY);
 
-  g_free(asave_file);
+  lives_free(asave_file);
 
   if (stime==0) {
     gettimeofday(&otv, NULL);
     stime=otv.tv_sec;
   }
-    
+
   mt->auto_back_time=stime;
-    
+
 
 }
 
 
 
-static boolean mt_auto_backup(gpointer user_data) {
+static boolean mt_auto_backup(livespointer user_data) {
 
   struct timeval otv;
   int64_t stime,diff;
@@ -721,7 +790,7 @@
     return FALSE;
   }
 
-  g_source_remove(mt->idlefunc);
+  lives_source_remove(mt->idlefunc);
   mt->idlefunc=0;
 
   gettimeofday(&otv, NULL);
@@ -756,7 +825,7 @@
 
   set_signal_handlers((SignalHandlerPointer)defer_sigint);
 
-  retval=g_idle_add_full(G_PRIORITY_LOW,mt_auto_backup,mt,NULL);
+  retval=lives_idle_add_full(G_PRIORITY_LOW,mt_auto_backup,mt,NULL);
 
   if (mainw->signal_caught) catch_sigint(mainw->signal_caught);
 
@@ -768,16 +837,16 @@
 
 
 void recover_layout_cancelled(boolean is_startup) {
-  gchar *eload_file=g_strdup_printf("%s/layout.%d.%d.%d",prefs->tmpdir,lives_getuid(),lives_getgid(),capable->mainpid);
+  char *eload_file=lives_strdup_printf("%s/layout.%d.%d.%d",prefs->tmpdir,lives_getuid(),lives_getgid(),capable->mainpid);
 
   if (is_startup) mainw->recoverable_layout=FALSE;
 
   unlink(eload_file);
-  g_free(eload_file);
-  
-  eload_file=g_strdup_printf("%s/layout_numbering.%d.%d.%d",prefs->tmpdir,lives_getuid(),lives_getgid(),capable->mainpid);
+  lives_free(eload_file);
+
+  eload_file=lives_strdup_printf("%s/layout_numbering.%d.%d.%d",prefs->tmpdir,lives_getuid(),lives_getgid(),capable->mainpid);
   unlink(eload_file);
-  g_free(eload_file);
+  lives_free(eload_file);
 
   if (is_startup) do_after_crash_warning();
 
@@ -786,50 +855,49 @@
 
 
 static void mt_load_recovery_layout(lives_mt *mt) {
-    gchar *aload_file=g_strdup_printf("%s/layout_numbering.%d.%d.%d",prefs->tmpdir,lives_getuid(),lives_getgid(),
-				      capable->mainpid);
-    gchar *eload_file=g_strdup_printf("%s/layout.%d.%d.%d",prefs->tmpdir,lives_getuid(),lives_getgid(),capable->mainpid);
+  char *aload_file=lives_strdup_printf("%s/layout_numbering.%d.%d.%d",prefs->tmpdir,lives_getuid(),lives_getgid(),
+                                       capable->mainpid);
+  char *eload_file=lives_strdup_printf("%s/layout.%d.%d.%d",prefs->tmpdir,lives_getuid(),lives_getgid(),capable->mainpid);
 
-    mt->auto_reloading=TRUE;
-    mainw->event_list=mt->event_list=load_event_list(mt,eload_file);
-    mt->auto_reloading=FALSE;
-    if (mt->event_list!=NULL) {
-      unlink(eload_file);
-      unlink(aload_file);
-      mt_init_tracks(mt,TRUE);
-      remove_markers(mt->event_list);
-      save_mt_autoback(mt,0);
-    }
-    else {
-      // failed to load
-      // keep the faulty layout for forensic purposes
-      gchar *com;
-      gchar *uldir=g_build_filename(prefs->tmpdir,"unrecoverable_layouts",G_DIR_SEPARATOR_S,NULL);
+  mt->auto_reloading=TRUE;
+  mainw->event_list=mt->event_list=load_event_list(mt,eload_file);
+  mt->auto_reloading=FALSE;
+  if (mt->event_list!=NULL) {
+    unlink(eload_file);
+    unlink(aload_file);
+    mt_init_tracks(mt,TRUE);
+    remove_markers(mt->event_list);
+    save_mt_autoback(mt,0);
+  } else {
+    // failed to load
+    // keep the faulty layout for forensic purposes
+    char *com;
+    char *uldir=lives_build_filename(prefs->tmpdir,"unrecoverable_layouts",LIVES_DIR_SEPARATOR_S,NULL);
 
-      g_mkdir_with_parents(uldir,S_IRWXU);
+    lives_mkdir_with_parents(uldir,S_IRWXU);
 
 #ifndef IS_MINGW
-      com=g_strdup_printf("/bin/mv \"%s\" \"%s\"",eload_file,uldir);
+    com=lives_strdup_printf("%s \"%s\" \"%s\"",capable->mv_cmd,eload_file,uldir);
 #else
-      com=g_strdup_printf("mv.exe \"%s\" \"%s\"",eload_file,uldir);
+    com=lives_strdup_printf("mv.exe \"%s\" \"%s\"",eload_file,uldir);
 #endif
-      lives_system(com,TRUE);
-      g_free(com);
+    lives_system(com,TRUE);
+    lives_free(com);
 
 #ifndef IS_MINGW
-      com=g_strdup_printf("/bin/mv \"%s\" \"%s\"",aload_file,uldir);
+    com=lives_strdup_printf("%s \"%s\" \"%s\"",capable->mv_cmd,aload_file,uldir);
 #else
-      com=g_strdup_printf("mv.exe \"%s\" \"%s\"",aload_file,uldir);
+    com=lives_strdup_printf("mv.exe \"%s\" \"%s\"",aload_file,uldir);
 #endif
-      lives_system(com,TRUE);
-      g_free(com);
+    lives_system(com,TRUE);
+    lives_free(com);
 
-      mt->fps=prefs->mt_def_fps;
-      g_free(uldir);
-    }
+    mt->fps=prefs->mt_def_fps;
+    lives_free(uldir);
+  }
 
-    g_free(eload_file);
-    g_free(aload_file);
+  lives_free(eload_file);
+  lives_free(aload_file);
 
 }
 
@@ -840,8 +908,7 @@
       multitrack_delete(mainw->multitrack,FALSE);
       do_bad_layout_error();
     }
-  }
-  else {
+  } else {
     mainw->multitrack->auto_reloading=TRUE;
     set_pref("ar_layout",""); // in case we crash...
     mt_load_recovery_layout(mainw->multitrack);
@@ -854,7 +921,7 @@
   do_after_crash_warning();
 
 }
-  
+
 
 
 
@@ -863,12 +930,12 @@
 }
 
 
-LIVES_INLINE gchar *get_track_name(lives_mt *mt, int track_num, boolean is_audio) {
+LIVES_INLINE char *get_track_name(lives_mt *mt, int track_num, boolean is_audio) {
   LiVESWidget *xeventbox;
-  if (track_num<0) return g_strdup(_("Backing audio")); 
-  if (!is_audio) xeventbox=(LiVESWidget *)g_list_nth_data(mt->video_draws,track_num);
-  else xeventbox=(LiVESWidget *)g_list_nth_data(mt->audio_draws,track_num+mt->opts.back_audio_tracks);
-  return g_strdup((gchar *)g_object_get_data(G_OBJECT(xeventbox),"track_name"));
+  if (track_num<0) return lives_strdup(_("Backing audio"));
+  if (!is_audio) xeventbox=(LiVESWidget *)lives_list_nth_data(mt->video_draws,track_num);
+  else xeventbox=(LiVESWidget *)lives_list_nth_data(mt->audio_draws,track_num+mt->opts.back_audio_tracks);
+  return lives_strdup((char *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(xeventbox),"track_name"));
 }
 
 
@@ -882,37 +949,32 @@
 
 LIVES_INLINE void set_params_unchanged(lives_rfx_t *rfx) {
   int i;
-  for (i=0;i<rfx->num_params;i++) rfx->params[i].changed=FALSE;
+  for (i=0; i<rfx->num_params; i++) rfx->params[i].changed=FALSE;
 }
 
+
 static int get_track_height(lives_mt *mt) {
   LiVESWidget *eventbox;
-  GList *glist=mt->video_draws;
+  LiVESList *list=mt->video_draws;
 
-  while (glist!=NULL) {
-    eventbox=(LiVESWidget *)glist->data;
-    if (GPOINTER_TO_INT(g_object_get_data(G_OBJECT(eventbox),"hidden"))==0) 
+  while (list!=NULL) {
+    eventbox=(LiVESWidget *)list->data;
+    if (LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"hidden"))==0)
       return lives_widget_get_allocation_height(eventbox);
-    glist=glist->next;
+    list=list->next;
   }
 
   return 0;
 }
 
 
-static boolean is_audio_eventbox(lives_mt *mt, LiVESWidget *ebox) {
-  GList *slist=mt->audio_draws;
-
-  while (slist!=NULL) {
-    if (ebox==slist->data) return TRUE;
-    slist=slist->next;
-  }
-  return FALSE;
+static boolean is_audio_eventbox(LiVESWidget *ebox) {
+  return LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(ebox),"is_audio"));
 }
 
 
-static void draw_block (lives_mt *mt, lives_painter_t *cairo, 
-			lives_painter_surface_t *surf, track_rect *block, int x1, int x2) {
+static void draw_block(lives_mt *mt, lives_painter_t *cairo,
+                       lives_painter_surface_t *surf, track_rect *block, int x1, int x2) {
   // x1 is start point of drawing area (in pixels), x2 is width of drawing area (in pixels)
   lives_painter_t *cr;
 
@@ -940,10 +1002,12 @@
   int framenum,last_framenum;
   int width=BLOCK_THUMB_WIDTH;
 
-  int hidden=(int)GPOINTER_TO_INT(g_object_get_data (G_OBJECT(eventbox), "hidden"));
+  int hidden=(int)LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox), "hidden"));
 
   register int i;
 
+  if (mt->no_expose) return;
+
   if (hidden) return;
 
   // block to right of screen
@@ -953,7 +1017,7 @@
   offset_start=(int)((offset_startd-mt->tl_min)/tl_span*lives_widget_get_allocation_width(eventbox)+.5);
   if ((x1>0||x2>0)&&offset_start>(x1+x2)) return;
 
-  offset_endd=get_event_timecode(block->end_event)/U_SEC+(!is_audio_eventbox(mt,eventbox))/cfile->fps;
+  offset_endd=get_event_timecode(block->end_event)/U_SEC+(!is_audio_eventbox(eventbox))/cfile->fps;
   offset_end=(offset_endd-mt->tl_min)/tl_span*lives_widget_get_allocation_width(eventbox);
 
   //if (offset_end+offset_start>eventbox->allocation.width) offset_end=eventbox->allocation.width-offset_start;
@@ -964,11 +1028,14 @@
   if (surf==NULL) cr=cairo;
   else cr=lives_painter_create(surf);
 
+  if (cr==NULL) return;
+
   lives_painter_set_line_width(cr,1.);
 
   lives_widget_get_bg_color(mt->window,&bgcolor);
 
-  track=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(eventbox),"layer_number"));
+  track=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"layer_number"));
+  is_audio=is_audio_eventbox(eventbox);
   if (track<0) is_audio=TRUE;
 
   if (!is_audio) filenum=get_frame_event_clip(block->start_event,track);
@@ -989,77 +1056,82 @@
       lives_painter_line_to(cr,offset_start, lives_widget_get_allocation_height(eventbox));
 
       lives_painter_stroke(cr);
-    }
-    else {
+    } else {
       if (!is_audio&&track>-1) {
-	last_framenum=-1;
-	for (i=offset_start;i<offset_end;i+=BLOCK_THUMB_WIDTH) {
-	  if (i>x2-x1) break;
-	  tc+=tl_span/lives_widget_get_allocation_width(eventbox)*width*U_SEC;
-	  if (i+BLOCK_THUMB_WIDTH<x1) continue;
-	  event=get_frame_event_at(mt->event_list,tc,event,FALSE);
-	  if (i+width>=0) {
-	    // create a small thumb
-	    framenum=get_frame_event_frame(event,track);
-	    
-	    if (thumbnail!=NULL) lives_object_unref(thumbnail);
-	    thumbnail=NULL;
-
-
-	    if (mainw->files[filenum]!=NULL&&framenum!=last_framenum) {
-	      if (mainw->files[filenum]->frames>0&&mainw->files[filenum]->clip_type==CLIP_TYPE_FILE) {
-		lives_clip_data_t *cdata=((lives_decoder_t *)mainw->files[filenum]->ext_src)->cdata;
-		if (cdata!=NULL&&!(cdata->seek_flag&LIVES_SEEK_FAST)&&
-		    is_virtual_frame(filenum,framenum)) {
-		  thumbnail=make_thumb_fast_between(mt,filenum,width,
-						    lives_widget_get_allocation_height(eventbox),
-						    framenum,last_framenum==-1?0:framenum-last_framenum);
-		}
-		else {
-		  thumbnail=make_thumb(mt,filenum,width,
-				       lives_widget_get_allocation_height(eventbox),
-				       framenum,FALSE);
-		}
-	      }
-	      else {
-		thumbnail=make_thumb(mt,filenum,width,
-				     lives_widget_get_allocation_height(eventbox),
-				     framenum,FALSE);
-	      }
-	    }
-	    last_framenum=framenum;
-	    // render it in the eventbox
-	    if (thumbnail!=NULL) {
-	      lives_painter_set_source_pixbuf (cr, thumbnail, i, 0);
-	      if (i+width>offset_end) {
-		width=offset_end-i;
-		// crop to width
-		lives_painter_new_path(cr);
-		lives_painter_rectangle(cr,i,0,width,lives_widget_get_allocation_height(eventbox));
-		lives_painter_clip(cr);
-	      }
-	      lives_painter_paint (cr);
-	    }
-	    else {
-	      if (i+width>offset_end) width=offset_end-i;
-	      lives_painter_set_source_rgb(cr,(double)vidcol.red/65535.,(double)vidcol.green/65535.,(double)vidcol.blue/65535.);
-	      lives_painter_new_path(cr);
-	      lives_painter_rectangle(cr,i,0,width,lives_widget_get_allocation_height(eventbox));
-	      lives_painter_fill(cr);
-	    }
-	    if (mainw->playing_file>-1) unpaint_lines(mt);
-	    mt->redraw_block=TRUE; // stop drawing cursor during playback
-	    if (mainw->playing_file>-1&&mainw->cancelled==CANCEL_NONE) process_one(FALSE);
-	    mt->redraw_block=FALSE;
-	  }
-	}
-	if (thumbnail!=NULL) lives_object_unref(thumbnail);
-      }
-      else {
-	lives_painter_set_source_rgb(cr,(double)audcol.red/65535.,(double)audcol.green/65535.,(double)audcol.blue/65535.);
-	lives_painter_new_path(cr);
-	lives_painter_rectangle(cr,offset_start,0,offset_end-offset_start,lives_widget_get_allocation_height(eventbox));
-	lives_painter_fill(cr);
+        last_framenum=-1;
+        for (i=offset_start; i<offset_end; i+=BLOCK_THUMB_WIDTH) {
+          if (i>x2-x1) break;
+          tc+=tl_span/lives_widget_get_allocation_width(eventbox)*width*U_SEC;
+          if (i+BLOCK_THUMB_WIDTH<x1) continue;
+          event=get_frame_event_at(mt->event_list,tc,event,FALSE);
+          if (i+width>=0) {
+            // create a small thumb
+            framenum=get_frame_event_frame(event,track);
+
+            if (thumbnail!=NULL) lives_object_unref(thumbnail);
+            thumbnail=NULL;
+
+
+            if (mainw->files[filenum]!=NULL&&framenum!=last_framenum) {
+              if (mainw->files[filenum]->frames>0&&mainw->files[filenum]->clip_type==CLIP_TYPE_FILE) {
+                lives_clip_data_t *cdata=((lives_decoder_t *)mainw->files[filenum]->ext_src)->cdata;
+                if (cdata!=NULL&&!(cdata->seek_flag&LIVES_SEEK_FAST)&&
+                    is_virtual_frame(filenum,framenum)) {
+                  thumbnail=make_thumb_fast_between(mt,filenum,width,
+                                                    lives_widget_get_allocation_height(eventbox),
+                                                    framenum,last_framenum==-1?0:framenum-last_framenum);
+                } else {
+                  thumbnail=make_thumb(mt,filenum,width,
+                                       lives_widget_get_allocation_height(eventbox),
+                                       framenum,FALSE);
+                }
+              } else {
+                thumbnail=make_thumb(mt,filenum,width,
+                                     lives_widget_get_allocation_height(eventbox),
+                                     framenum,FALSE);
+              }
+            }
+            last_framenum=framenum;
+            // render it in the eventbox
+            if (thumbnail!=NULL) {
+              lives_painter_set_source_pixbuf(cr, thumbnail, i, 0);
+              if (i+width>offset_end) {
+                width=offset_end-i;
+                // crop to width
+                lives_painter_new_path(cr);
+                lives_painter_rectangle(cr,i,0,width,lives_widget_get_allocation_height(eventbox));
+                lives_painter_clip(cr);
+              }
+              lives_painter_paint(cr);
+            } else {
+              if (i+width>offset_end) width=offset_end-i;
+              lives_painter_set_source_rgb(cr,(double)vidcol.red/65535.,(double)vidcol.green/65535.,(double)vidcol.blue/65535.);
+              lives_painter_new_path(cr);
+              lives_painter_rectangle(cr,i,0,width,lives_widget_get_allocation_height(eventbox));
+              lives_painter_fill(cr);
+            }
+            if (mainw->playing_file>-1) {
+              mt->no_expose=TRUE;
+              // expose is not re-entrant due to bgimg refs
+              unpaint_lines(mt);
+              mt->no_expose=FALSE;
+            }
+            mt->redraw_block=TRUE; // stop drawing cursor during playback
+            if (mainw->playing_file>-1&&mainw->cancelled==CANCEL_NONE) {
+              // expose is not re-entrant
+              mt->no_expose=TRUE;
+              process_one(FALSE);
+              mt->no_expose=FALSE;
+            }
+            mt->redraw_block=FALSE;
+          }
+        }
+        if (thumbnail!=NULL) lives_object_unref(thumbnail);
+      } else {
+        lives_painter_set_source_rgb(cr,(double)audcol.red/65535.,(double)audcol.green/65535.,(double)audcol.blue/65535.);
+        lives_painter_new_path(cr);
+        lives_painter_rectangle(cr,offset_start,0,offset_end-offset_start,lives_widget_get_allocation_height(eventbox));
+        lives_painter_fill(cr);
       }
       lives_painter_set_source_rgb(cr, 0., 0., 0.); ///< opaque black
       lives_painter_new_path(cr);
@@ -1067,46 +1139,57 @@
       lives_painter_stroke(cr);
 
       if (needs_text) {
-	const char *sfont="Sans";
-	gchar *fname=g_path_get_basename(mainw->files[filenum]->name);
-	lives_colRGBA32_t col_white,col_black;
-	PangoLayout *layout;
-	lives_painter_surface_t *surface;
-	
-	int text_start=offset_start+2,text_end=offset_end;
+        const char *sfont="Sans";
+        char *fname=lives_path_get_basename(mainw->files[filenum]->name);
+        lives_colRGBA32_t col_white,col_black;
+        LingoLayout *layout;
+        lives_painter_surface_t *surface;
+
+        int text_start=offset_start+2,text_end=offset_end;
+
+        if (text_start<2) text_start=2;
 
-	if (text_start<2) text_start=2;
+        surface=lives_painter_get_target(cr);
+        lives_painter_surface_flush(surface);
 
-	surface=lives_painter_get_target(cr);
-	lives_painter_surface_flush (surface);
+        col_white.red=col_white.green=col_white.blue=col_white.alpha=col_black.alpha=65535;
+        col_black.red=col_black.green=col_black.blue=0;
 
-	col_white.red=col_white.green=col_white.blue=col_white.alpha=col_black.alpha=65535;
-	col_black.red=col_black.green=col_black.blue=0;
 
-	layout=render_text_to_cr(cr,fname,sfont,10.,
-				 LIVES_TEXT_MODE_FOREGROUND_ONLY,&col_white,&col_white,FALSE,FALSE,0.2,text_start,
-				 text_end-text_start,lives_widget_get_allocation_height(eventbox));
+        layout=render_text_to_cr(cr,fname,sfont,10.,
+                                 LIVES_TEXT_MODE_FOREGROUND_ONLY,&col_white,&col_white,FALSE,FALSE,0.2,text_start,
+                                 text_end-text_start,lives_widget_get_allocation_height(eventbox));
 
-	pango_cairo_show_layout(cr, layout);
-	if (layout) lives_object_unref(layout);
-	g_free(fname);
+        lingo_painter_show_layout(cr, layout);
 
-	lives_painter_fill(cr);
+        if (layout) lives_object_unref(layout);
+
+        lives_free(fname);
+
+        lives_painter_fill(cr);
       }
 
-      if (mainw->playing_file>-1) unpaint_lines(mt);
+      if (mainw->playing_file>-1) {
+        mt->no_expose=TRUE; // expose is not re-entrant due to bgimg refs.
+        unpaint_lines(mt);
+        mt->no_expose=FALSE;
+      }
       mt->redraw_block=TRUE; // stop drawing cursor during playback
-      if (mainw->playing_file>-1&&mainw->cancelled==CANCEL_NONE) process_one(FALSE);
+      if (mainw->playing_file>-1&&mainw->cancelled==CANCEL_NONE) {
+        mt->no_expose=TRUE;
+        process_one(FALSE);
+        mt->no_expose=FALSE;
+      }
       mt->redraw_block=FALSE;
     }
     break;
   case BLOCK_SELECTED:
     lives_painter_new_path(cr);
-    lives_painter_set_source_rgba (cr, 
-				   LIVES_WIDGET_COLOR_SCALE(bgcolor.red),
-				   LIVES_WIDGET_COLOR_SCALE(bgcolor.green), 
-				   LIVES_WIDGET_COLOR_SCALE(bgcolor.blue), 
-				   0.6);
+    lives_painter_set_source_rgba(cr,
+                                  LIVES_WIDGET_COLOR_SCALE(bgcolor.red),
+                                  LIVES_WIDGET_COLOR_SCALE(bgcolor.green),
+                                  LIVES_WIDGET_COLOR_SCALE(bgcolor.blue),
+                                  0.6);
     lives_painter_rectangle(cr,offset_start, 0, offset_end-offset_start, lives_widget_get_allocation_height(eventbox));
     lives_painter_fill(cr);
 
@@ -1116,7 +1199,7 @@
 
     lives_painter_move_to(cr,offset_start,0);
     lives_painter_line_to(cr,offset_end, lives_widget_get_allocation_height(eventbox));
-    
+
     lives_painter_move_to(cr,offset_end,0);
     lives_painter_line_to(cr,offset_start, lives_widget_get_allocation_height(eventbox));
 
@@ -1125,19 +1208,19 @@
     break;
   }
 
-  if (surf!=NULL) lives_painter_destroy (cr);
+  if (surf!=NULL) lives_painter_destroy(cr);
 
 }
 
 
 
-static void draw_aparams(lives_mt *mt, LiVESWidget *eventbox, lives_painter_t *cr, GList *param_list, weed_plant_t *init_event, 
-			 int startx, int width) {
-  // draw audio parameters : currently we overlay coloured lines on the audio track to show the level of 
+static void draw_aparams(lives_mt *mt, LiVESWidget *eventbox, lives_painter_t *cr, LiVESList *param_list, weed_plant_t *init_event,
+                         int startx, int width) {
+  // draw audio parameters : currently we overlay coloured lines on the audio track to show the level of
   // parameters in the audio_volume plugin
   // we only display whichever parameters the user has elected to show
 
-  GList *plist;
+  LiVESList *plist;
 
   weed_plant_t **in_params,*param,*ptmpl;
   weed_plant_t *filter,*inst,*deinit_event;
@@ -1158,7 +1241,7 @@
   int offset_start,offset_end,startpos;
   int track;
 
-  gchar *fhash;
+  char *fhash;
 
   void **pchainx=NULL;
 
@@ -1169,7 +1252,7 @@
   }
 
   filter=get_weed_filter(weed_get_idx_for_hashname(fhash,TRUE));
-  weed_free(fhash);
+  lives_free(fhash);
 
   inst=weed_instance_from_filter(filter);
   in_params=weed_get_plantptr_array(inst,"in_parameters",&error);
@@ -1183,14 +1266,14 @@
   offset_end=(int)((end_tc/U_SEC-mt->tl_min)/tl_span*lives_widget_get_allocation_width(eventbox)+.5);
 
   if (offset_end<0||offset_start>lives_widget_get_allocation_width(eventbox)) {
-    weed_free(in_params);
+    lives_free(in_params);
     return;
   }
 
   if (offset_start>startx) startpos=offset_start;
   else startpos=startx;
 
-  track=GPOINTER_TO_INT(g_object_get_data (G_OBJECT(eventbox),"layer_number"))+mt->opts.back_audio_tracks;
+  track=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"layer_number"))+mt->opts.back_audio_tracks;
 
   lives_painter_set_line_width(cr,1.);
   lives_painter_set_source_rgb(cr, 0., 0., 0.); ///< opaque black
@@ -1201,7 +1284,7 @@
   }
 
   //lives_painter_set_operator (cr, LIVES_PAINTER_OPERATOR_DEST_OVER);
-  for (i=startpos;i<startx+width;i++) {
+  for (i=startpos; i<startx+width; i++) {
     dtime=get_time_from_x(mt,i);
     tc=dtime*U_SEC;
     if (tc>=end_tc) break;
@@ -1210,80 +1293,79 @@
 
     plist=param_list;
     while (plist!=NULL) {
-      pnum=GPOINTER_TO_INT(plist->data);
+      pnum=LIVES_POINTER_TO_INT(plist->data);
       param=in_params[pnum];
       ptmpl=weed_get_plantptr_value(param,"template",&error);
       hint=weed_get_int_value(ptmpl,"hint",&error);
-      switch(hint) {
+      switch (hint) {
       case WEED_HINT_INTEGER:
-	valis=weed_get_int_array(param,"value",&error);
-	if (is_perchannel_multiw(in_params[pnum])) vali=valis[track];
-	else vali=valis[0];
-	mini=weed_get_int_value(ptmpl,"min",&error);
-	maxi=weed_get_int_value(ptmpl,"max",&error);
-	ratio=(double)(vali-mini)/(double)(maxi-mini);
-	weed_free(valis);
-	break;
+        valis=weed_get_int_array(param,"value",&error);
+        if (is_perchannel_multiw(in_params[pnum])) vali=valis[track];
+        else vali=valis[0];
+        mini=weed_get_int_value(ptmpl,"min",&error);
+        maxi=weed_get_int_value(ptmpl,"max",&error);
+        ratio=(double)(vali-mini)/(double)(maxi-mini);
+        lives_free(valis);
+        break;
       case WEED_HINT_FLOAT:
-	valds=weed_get_double_array(param,"value",&error);
-	if (is_perchannel_multiw(in_params[pnum])) vald=valds[track];
-	else vald=valds[0];
-	mind=weed_get_double_value(ptmpl,"min",&error);
-	maxd=weed_get_double_value(ptmpl,"max",&error);
-	ratio=(vald-mind)/(maxd-mind);
-	weed_free(valds);
-	break;
+        valds=weed_get_double_array(param,"value",&error);
+        if (is_perchannel_multiw(in_params[pnum])) vald=valds[track];
+        else vald=valds[0];
+        mind=weed_get_double_value(ptmpl,"min",&error);
+        maxd=weed_get_double_value(ptmpl,"max",&error);
+        ratio=(vald-mind)/(maxd-mind);
+        lives_free(valds);
+        break;
       default:
-	continue;
+        continue;
       }
 
       y=(1.-ratio)*(double)lives_widget_get_allocation_height(eventbox);
 
       lives_painter_move_to(cr, i-1, y-1);
       lives_painter_line_to(cr, i, y);
- 
+
       plist=plist->next;
     }
   }
 
-  lives_painter_stroke (cr);
-  lives_painter_surface_flush (lives_painter_get_target(cr));
+  lives_painter_stroke(cr);
+  lives_painter_surface_flush(lives_painter_get_target(cr));
 
-  weed_free(pchainx);
-  weed_free(in_params);
+  lives_free(pchainx);
+  lives_free(in_params);
 }
 
 
 
 static void redraw_eventbox(lives_mt *mt, LiVESWidget *eventbox) {
 
-  if (!G_IS_OBJECT(eventbox)) return;
+  if (!LIVES_IS_WIDGET_OBJECT(eventbox)) return;
 
-  g_object_set_data(G_OBJECT(eventbox),"drawn",GINT_TO_POINTER(FALSE));
-  lives_widget_queue_draw (eventbox); // redraw the track
+  lives_widget_object_set_data(LIVES_WIDGET_OBJECT(eventbox),"drawn",LIVES_INT_TO_POINTER(FALSE));
+  lives_widget_queue_draw(eventbox);  // redraw the track
 
-  if (is_audio_eventbox(mt,eventbox)) {
+  if (is_audio_eventbox(eventbox)) {
     // handle expanded audio
     LiVESWidget *xeventbox;
     if (cfile->achans>0) {
-      xeventbox=(LiVESWidget *)g_object_get_data(G_OBJECT(eventbox),"achan0");
-      g_object_set_data (G_OBJECT(xeventbox), "drawn",GINT_TO_POINTER(FALSE));
-      lives_widget_queue_draw (xeventbox); // redraw the track
+      xeventbox=(LiVESWidget *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"achan0");
+      lives_widget_object_set_data(LIVES_WIDGET_OBJECT(xeventbox), "drawn",LIVES_INT_TO_POINTER(FALSE));
+      lives_widget_queue_draw(xeventbox);  // redraw the track
       if (cfile->achans>1) {
-	xeventbox=(LiVESWidget *)g_object_get_data(G_OBJECT(eventbox),"achan1");
-	g_object_set_data (G_OBJECT(xeventbox), "drawn",GINT_TO_POINTER(FALSE));
-	lives_widget_queue_draw (xeventbox); // redraw the track
+        xeventbox=(LiVESWidget *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"achan1");
+        lives_widget_object_set_data(LIVES_WIDGET_OBJECT(xeventbox), "drawn",LIVES_INT_TO_POINTER(FALSE));
+        lives_widget_queue_draw(xeventbox);  // redraw the track
       }
     }
   }
-  gdk_window_process_all_updates();
 }
 
 
 #if GTK_CHECK_VERSION(3,0,0)
-static boolean expose_track_event (LiVESWidget *eventbox, lives_painter_t *cairo, gpointer user_data) {
+static boolean expose_track_event(LiVESWidget *eventbox, lives_painter_t *cairo, livespointer user_data) {
 #else
-static boolean expose_track_event (LiVESWidget *eventbox, GdkEventExpose *event, gpointer user_data) {
+static boolean expose_track_event(LiVESWidget *eventbox, LiVESXEventExpose *event, livespointer user_data) {
   lives_painter_t *cairo=NULL;
 #endif
 
@@ -1294,12 +1376,7 @@
   track_rect *block;
   track_rect *sblock=NULL;
 
-  gulong idlefunc;
-
-#if !GTK_CHECK_VERSION(3,0,0)
-  GdkRegion *reg;
-  GdkRectangle rect;
-#endif
+  ulong idlefunc;
 
   lives_painter_surface_t *bgimage;
 
@@ -1312,12 +1389,10 @@
   if (event!=NULL&&event->count>0) {
     return TRUE;
   }
-  reg=event->region;
-  gdk_region_get_clipbox(reg,&rect);
-  startx=rect.x;
-  starty=rect.y;
-  width=rect.width;
-  height=rect.height;
+  startx=event->area.x;
+  starty=event->area.y;
+  width=event->area.width;
+  height=event->area.height;
 #else
   startx=starty=0;
   width=lives_widget_get_allocation_width(eventbox);
@@ -1326,9 +1401,9 @@
 
   if (width==0) return FALSE;
 
-  hidden=(int)GPOINTER_TO_INT(g_object_get_data (G_OBJECT(eventbox), "hidden"));
+  hidden=(int)LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox), "hidden"));
   if (hidden!=0) {
-    LiVESWidget *label=(LiVESWidget *)g_object_get_data (G_OBJECT(eventbox), "label");
+    LiVESWidget *label=(LiVESWidget *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox), "label");
     lives_widget_hide(eventbox);
     lives_widget_hide(lives_widget_get_parent(label));
     return FALSE;
@@ -1336,38 +1411,40 @@
 
   idlefunc=mt->idlefunc;
   if (mt->idlefunc>0) {
-    g_source_remove(mt->idlefunc);
+    lives_source_remove(mt->idlefunc);
     mt->idlefunc=0;
   }
 
   if (width>lives_widget_get_allocation_width(eventbox)-startx) width=lives_widget_get_allocation_width(eventbox)-startx;
 
-  if (cairo==NULL) cr = lives_painter_create_from_widget (eventbox);
-  bgimage=(lives_painter_surface_t *)g_object_get_data (G_OBJECT(eventbox), "bgimg");
+  if (cairo==NULL) cr = lives_painter_create_from_widget(eventbox);
+  bgimage=(lives_painter_surface_t *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox), "bgimg");
 
- draw1:
+draw1:
 
-  if (GPOINTER_TO_INT(g_object_get_data (G_OBJECT(eventbox), "drawn"))) {
+  if (LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox), "drawn"))) {
     if (bgimage!=NULL&&lives_painter_image_surface_get_width(bgimage)>0) {
-      lives_painter_set_source_surface (cr, bgimage, startx, starty);
+      lives_painter_set_source_surface(cr, bgimage, startx, starty);
       lives_painter_rectangle(cr,startx,starty,width,height);
-      lives_painter_paint (cr);
- 
+      lives_painter_fill(cr);
+
       if (mt->block_selected!=NULL&&mt->block_selected->eventbox==eventbox) {
-	draw_block(mt,cr,NULL,mt->block_selected,-1,-1);
+        draw_block(mt,cr,NULL,mt->block_selected,-1,-1);
       }
 
-      if (is_audio_eventbox(mt,eventbox)&&mt->avol_init_event!=NULL&&mt->aparam_view_list!=NULL) 
-	draw_aparams(mt,eventbox,cr,mt->aparam_view_list,mt->avol_init_event,startx,width);
+      if (is_audio_eventbox(eventbox)&&mt->avol_init_event!=NULL&&mt->aparam_view_list!=NULL)
+        draw_aparams(mt,eventbox,cr,mt->aparam_view_list,mt->avol_init_event,startx,width);
 
       if (idlefunc>0) {
-	mt->idlefunc=mt_idle_add(mt);
+        mt->idlefunc=mt_idle_add(mt);
       }
-      if (cairo==NULL) lives_painter_destroy (cr);
+      if (cairo==NULL) lives_painter_destroy(cr);
+
       return TRUE;
     }
   }
 
+
 #if !GTK_CHECK_VERSION(3,0,0)
   width=lives_widget_get_allocation_width(eventbox);
   height=lives_widget_get_allocation_height(eventbox);
@@ -1376,8 +1453,8 @@
   if (bgimage!=NULL) lives_painter_surface_destroy(bgimage);
 
   bgimage=lives_painter_image_surface_create(LIVES_PAINTER_FORMAT_ARGB32,
-					     width,
-					     height);
+          width,
+          height);
 
   if (bgimage!=NULL&&lives_painter_image_surface_get_width(bgimage)>0) {
     lives_set_cursor_style(LIVES_CURSOR_BUSY,NULL);
@@ -1386,14 +1463,18 @@
       sblock=mt->block_selected;
       sblock->state=BLOCK_UNSELECTED;
     }
-    
-    block=(track_rect *)g_object_get_data (G_OBJECT(eventbox), "blocks");
-    
+
+    block=(track_rect *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox), "blocks");
+
     while (block!=NULL) {
       draw_block(mt,NULL,bgimage,block,startx,width);
       block=block->next;
       mt->redraw_block=TRUE; // stop drawing cursor during playback
-      if (mainw->playing_file>-1&&mainw->cancelled==CANCEL_NONE) process_one(FALSE);
+      if (mainw->playing_file>-1&&mainw->cancelled==CANCEL_NONE) {
+        mt->no_expose=TRUE;
+        process_one(FALSE);
+        mt->no_expose=FALSE;
+      }
       mt->redraw_block=FALSE;
     }
 
@@ -1403,18 +1484,17 @@
     }
 
     lives_set_cursor_style(LIVES_CURSOR_NORMAL,NULL);
-  }
-  else if (bgimage!=NULL) {
+  } else if (bgimage!=NULL) {
     lives_painter_surface_destroy(bgimage);
     bgimage=NULL;
   }
 
-  g_object_set_data(G_OBJECT(eventbox),"bgimg",(gpointer)bgimage);
-  g_object_set_data(G_OBJECT(eventbox),"drawn",GINT_TO_POINTER(bgimage!=NULL));
+  lives_widget_object_set_data(LIVES_WIDGET_OBJECT(eventbox),"bgimg",(livespointer)bgimage);
+  lives_widget_object_set_data(LIVES_WIDGET_OBJECT(eventbox),"drawn",LIVES_INT_TO_POINTER(bgimage!=NULL));
 
   if (bgimage!=NULL&&lives_painter_image_surface_get_width(bgimage)>0) goto draw1;
 
-  if (cairo==NULL) lives_painter_destroy (cr);
+  if (cairo==NULL) lives_painter_destroy(cr);
 
   if (idlefunc>0) {
     mt->idlefunc=mt_idle_add(mt);
@@ -1425,18 +1505,17 @@
 
 
 
-static gchar *mt_params_label(lives_mt *mt) {
-  gchar *fname=weed_filter_idx_get_name(mt->current_fx);
-  gchar *layer_name;
-  gchar *ltext;
+static char *mt_params_label(lives_mt *mt) {
+  char *fname=weed_filter_idx_get_name(mt->current_fx);
+  char *layer_name;
+  char *ltext;
 
   if (has_perchannel_multiw(get_weed_filter(mt->current_fx))) {
     layer_name=get_track_name(mt,mt->current_track,mt->aud_track_selected);
-    ltext=g_strdup_printf(_("%s : parameters for %s"),fname,layer_name);
-    g_free(layer_name);
-  }
-  else ltext=g_strdup(fname);
-  g_free(fname);
+    ltext=lives_strdup_printf(_("%s : parameters for %s"),fname,layer_name);
+    lives_free(layer_name);
+  } else ltext=lives_strdup(fname);
+  lives_free(fname);
 
   return ltext;
 }
@@ -1459,9 +1538,9 @@
   weed_timecode_t tc;
 
   double fx_start_time,fx_end_time;
-  double cur_time=lives_ruler_get_value(LIVES_RULER (mt->timeline));
+  double cur_time=mt->ptr_time;
 
-  gchar *ltext;
+  char *ltext;
 
   boolean res=FALSE;
 
@@ -1472,7 +1551,7 @@
 
   tc=get_event_timecode((weed_plant_t *)mt->init_event);
   deinit_event=(weed_plant_t *)weed_get_voidptr_value(mt->init_event,"deinit_event",&error);
-  
+
   fx_start_time=tc/U_SEC;
   fx_end_time=get_event_timecode(deinit_event)/U_SEC;
 
@@ -1485,20 +1564,20 @@
 
   ltext=mt_params_label(mt);
 
-  lives_signal_handlers_block_by_func(mt->node_spinbutton,(gpointer)on_node_spin_value_changed,(gpointer)mt);
-  lives_spin_button_configure (LIVES_SPIN_BUTTON(mt->node_spinbutton), cur_time-fx_start_time, 0., 
-			       fx_end_time-fx_start_time, 1./mt->fps, 10./mt->fps);
-  lives_signal_handlers_unblock_by_func(mt->node_spinbutton,(gpointer)on_node_spin_value_changed,(gpointer)mt);
+  lives_signal_handlers_block_by_func(mt->node_spinbutton,(livespointer)on_node_spin_value_changed,(livespointer)mt);
+  lives_spin_button_configure(LIVES_SPIN_BUTTON(mt->node_spinbutton), cur_time-fx_start_time, 0.,
+                              fx_end_time-fx_start_time, 1./mt->fps, 10./mt->fps);
+  lives_signal_handlers_unblock_by_func(mt->node_spinbutton,(livespointer)on_node_spin_value_changed,(livespointer)mt);
 
   widget_opts.packing_height=2.*widget_opts.scale;
   widget_opts.border_width=2.*widget_opts.scale;
-  res=make_param_box(LIVES_VBOX (mt->fx_box), mt->current_rfx);
+  res=make_param_box(LIVES_VBOX(mt->fx_box), mt->current_rfx);
   widget_opts.packing_height=dph;
   widget_opts.border_width=dbw;
 
   lives_label_set_text(LIVES_LABEL(mt->fx_params_label),ltext);
 
-  g_free(ltext);
+  lives_free(ltext);
 
   lives_widget_show_all(mt->fx_base_box);
 
@@ -1510,17 +1589,17 @@
 }
 
 
-static track_rect *get_block_from_time (LiVESWidget *eventbox, double time, lives_mt *mt) {
+static track_rect *get_block_from_time(LiVESWidget *eventbox, double time, lives_mt *mt) {
   // return block (track_rect) at seconds time in eventbox
   weed_timecode_t tc=time*U_SECL;
   track_rect *block;
 
-  block=(track_rect *)g_object_get_data (G_OBJECT(eventbox),"blocks");
+  block=(track_rect *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"blocks");
   tc=q_gint64(tc,mt->fps);
 
   while (block!=NULL) {
     if (get_event_timecode(block->start_event)>tc) return NULL;
-    if (q_gint64(get_event_timecode(block->end_event)+(!is_audio_eventbox(mt,eventbox))*U_SEC/mt->fps,mt->fps)>tc) break;
+    if (q_gint64(get_event_timecode(block->end_event)+(!is_audio_eventbox(eventbox))*U_SEC/mt->fps,mt->fps)>tc) break;
     block=block->next;
   }
   return block;
@@ -1544,13 +1623,13 @@
 
   in_tracks=weed_get_int_array(ievent,"in_tracks",&error);
 
-  for (i=0;i<ntracks;i++) {
+  for (i=0; i<ntracks; i++) {
     if (in_tracks[i]==track) {
-      g_free(in_tracks);
+      lives_free(in_tracks);
       return i;
     }
   }
-  g_free(in_tracks);
+  lives_free(in_tracks);
   return -1;
 }
 
@@ -1598,30 +1677,30 @@
       add_mt_param_box(mt);
       retval=TRUE;
     }
-    weed_free(clips);
+    lives_free(clips);
     return retval;
   }
 
   if ((num_in_tracks=weed_leaf_num_elements(mt->init_event,"in_tracks"))>0) {
     in_tracks=weed_get_int_array(mt->init_event,"in_tracks",&error);
-    for (i=0;i<num_in_tracks;i++) {
+    for (i=0; i<num_in_tracks; i++) {
       if (in_tracks[i]==mt->current_track) {
-	mt->track_index=i;
-	if (mt->current_track>=0&&mt->current_track<numtracks&&
-	    (clips[mt->current_track]>-1)) {
-	  mt->inwidth=mainw->files[clips[mt->current_track]]->hsize*opwidth/cfile->hsize;
-	  mt->inheight=mainw->files[clips[mt->current_track]]->vsize*opheight/cfile->vsize;
-	}
-	if (track_index==-1&&mt->fx_box!=NULL) {
-	  add_mt_param_box(mt);
-	  retval=TRUE;
-	}
-	break;
+        mt->track_index=i;
+        if (mt->current_track>=0&&mt->current_track<numtracks&&
+            (clips[mt->current_track]>-1)) {
+          mt->inwidth=mainw->files[clips[mt->current_track]]->hsize*opwidth/cfile->hsize;
+          mt->inheight=mainw->files[clips[mt->current_track]]->vsize*opheight/cfile->vsize;
+        }
+        if (track_index==-1&&mt->fx_box!=NULL) {
+          add_mt_param_box(mt);
+          retval=TRUE;
+        }
+        break;
       }
     }
-    weed_free(in_tracks);
+    lives_free(in_tracks);
   }
-  weed_free(clips);
+  lives_free(clips);
   if (track_index!=-1&&mt->track_index==-1&&mt->fx_box!=NULL) {
     add_mt_param_box(mt);
     retval=TRUE;
@@ -1632,7 +1711,7 @@
 
 
 
-void track_select (lives_mt *mt) {
+void track_select(lives_mt *mt) {
   LiVESWidget *labelbox,*ahbox,*eventbox,*oeventbox,*checkbutton=NULL;
   weed_timecode_t tc;
 
@@ -1642,7 +1721,7 @@
 
   if (mt->current_track<0) {
     // back aud sel
-    
+
     lives_widget_set_sensitive(mt->select_track,FALSE);
     lives_widget_set_sensitive(mt->rename_track,FALSE);
     lives_widget_set_sensitive(mt->insert, FALSE);
@@ -1650,12 +1729,11 @@
     lives_check_menu_item_set_active(LIVES_CHECK_MENU_ITEM(mt->select_track),FALSE);
 
     lives_widget_set_sensitive(mt->cback_audio,FALSE);
-    lives_widget_set_sensitive (mt->audio_insert, mt->file_selected>0&&
-			      mainw->files[mt->file_selected]->achans>0&&
-			      mainw->files[mt->file_selected]->laudio_time>0.);
+    lives_widget_set_sensitive(mt->audio_insert, mt->file_selected>0&&
+                               mainw->files[mt->file_selected]->achans>0&&
+                               mainw->files[mt->file_selected]->laudio_time>0.);
 
-  }
-  else {
+  } else {
     // vid sel
     lives_widget_set_sensitive(mt->select_track,TRUE);
     lives_widget_set_sensitive(mt->rename_track,TRUE);
@@ -1667,103 +1745,98 @@
   }
 
   if (cfile->achans>0) {
-    for (i=0;i<g_list_length(mt->audio_draws);i++) {
-      eventbox=(LiVESWidget *)g_list_nth_data(mt->audio_draws,i);
-      if ((oeventbox=(LiVESWidget *)g_object_get_data(G_OBJECT(eventbox),"owner"))!=NULL) 
-	hidden=!GPOINTER_TO_INT(g_object_get_data(G_OBJECT(oeventbox),"expanded"));
-      if (hidden==0) hidden=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(eventbox),"hidden"));
+    for (i=0; i<lives_list_length(mt->audio_draws); i++) {
+      eventbox=(LiVESWidget *)lives_list_nth_data(mt->audio_draws,i);
+      if ((oeventbox=(LiVESWidget *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"owner"))!=NULL)
+        hidden=!LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(oeventbox),"expanded"));
+      if (hidden==0) hidden=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"hidden"));
       if (hidden==0) {
-	labelbox=(LiVESWidget *)g_object_get_data(G_OBJECT(eventbox),"labelbox");
-	ahbox=(LiVESWidget *)g_object_get_data(G_OBJECT(eventbox),"ahbox");
-	if (mt->current_track==i-mt->opts.back_audio_tracks&&(mt->current_track<0||mt->aud_track_selected)) {
-	  // audio track is selected
+        labelbox=(LiVESWidget *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"labelbox");
+        ahbox=(LiVESWidget *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"ahbox");
+        if (mt->current_track==i-mt->opts.back_audio_tracks&&(mt->current_track<0||mt->aud_track_selected)) {
+          // audio track is selected
 
-	  if (labelbox!=NULL) lives_widget_set_state(labelbox,LIVES_WIDGET_STATE_PRELIGHT);
-	  if (ahbox!=NULL) lives_widget_set_state(ahbox,LIVES_WIDGET_STATE_PRELIGHT);
-	  lives_widget_set_sensitive (mt->jumpback, g_object_get_data(G_OBJECT(eventbox),"blocks")!=NULL);
-	  lives_widget_set_sensitive (mt->jumpnext, g_object_get_data(G_OBJECT(eventbox),"blocks")!=NULL);
+          if (labelbox!=NULL) lives_widget_set_state(labelbox,LIVES_WIDGET_STATE_PRELIGHT);
+          if (ahbox!=NULL) lives_widget_set_state(ahbox,LIVES_WIDGET_STATE_PRELIGHT);
+          lives_widget_set_sensitive(mt->jumpback, lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"blocks")!=NULL);
+          lives_widget_set_sensitive(mt->jumpnext, lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"blocks")!=NULL);
 
-	}
-	else {
-	  if (labelbox!=NULL&&LIVES_IS_WIDGET(labelbox)) lives_widget_set_state(labelbox,LIVES_WIDGET_STATE_NORMAL);
-	  if (ahbox!=NULL&&LIVES_IS_WIDGET(ahbox)) lives_widget_set_state(ahbox,LIVES_WIDGET_STATE_NORMAL);
-	}
+        } else {
+          if (labelbox!=NULL&&LIVES_IS_WIDGET(labelbox)) lives_widget_set_state(labelbox,LIVES_WIDGET_STATE_NORMAL);
+          if (ahbox!=NULL&&LIVES_IS_WIDGET(ahbox)) lives_widget_set_state(ahbox,LIVES_WIDGET_STATE_NORMAL);
+        }
       }
     }
   }
 
-  for (i=0;i<mt->num_video_tracks;i++) {
-    eventbox=(LiVESWidget *)g_list_nth_data(mt->video_draws,i);
-    hidden=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(eventbox),"hidden"));
+  for (i=0; i<mt->num_video_tracks; i++) {
+    eventbox=(LiVESWidget *)lives_list_nth_data(mt->video_draws,i);
+    hidden=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"hidden"));
     if (hidden==0) {
-      labelbox=(LiVESWidget *)g_object_get_data(G_OBJECT(eventbox),"labelbox");
-      ahbox=(LiVESWidget *)g_object_get_data(G_OBJECT(eventbox),"ahbox");
-      checkbutton=(LiVESWidget *)g_object_get_data (G_OBJECT(eventbox), "checkbutton");
+      labelbox=(LiVESWidget *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"labelbox");
+      ahbox=(LiVESWidget *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"ahbox");
+      checkbutton=(LiVESWidget *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox), "checkbutton");
       if (i==mt->current_track) {
-	
-	if (!mt->aud_track_selected) {
-	  if (labelbox!=NULL) {
-	    lives_widget_set_state(labelbox,LIVES_WIDGET_STATE_PRELIGHT);
-	  }
-	  if (ahbox!=NULL) lives_widget_set_state(ahbox,LIVES_WIDGET_STATE_PRELIGHT);
-	  if (checkbutton!=NULL) {
-	    // gtk 3+ idiocy...
-	    lives_widget_set_state(checkbutton,LIVES_WIDGET_STATE_NORMAL);
-	    lives_widget_queue_draw(checkbutton);
-	    lives_widget_set_state(checkbutton,LIVES_WIDGET_STATE_PRELIGHT);
-	    lives_widget_queue_draw(checkbutton);
-	  }
-	  lives_widget_set_sensitive (mt->jumpback, g_object_get_data(G_OBJECT(eventbox),"blocks")!=NULL);
-	  lives_widget_set_sensitive (mt->jumpnext, g_object_get_data(G_OBJECT(eventbox),"blocks")!=NULL);
-	}
-	else {
-	  if (labelbox!=NULL) lives_widget_set_state(labelbox,LIVES_WIDGET_STATE_NORMAL);
-	  if (ahbox!=NULL) lives_widget_set_state(ahbox,LIVES_WIDGET_STATE_NORMAL);
-	  if (checkbutton!=NULL) {
-	    // gtk 3+ idiocy...
-	    lives_widget_set_state(checkbutton,LIVES_WIDGET_STATE_PRELIGHT);
-	    lives_widget_queue_draw(checkbutton);
-	    lives_widget_set_state(checkbutton,LIVES_WIDGET_STATE_NORMAL);
-	    lives_widget_queue_draw(checkbutton);
-	  }
-	}
+
+        if (!mt->aud_track_selected) {
+          if (labelbox!=NULL) {
+            lives_widget_set_state(labelbox,LIVES_WIDGET_STATE_PRELIGHT);
+          }
+          if (ahbox!=NULL) lives_widget_set_state(ahbox,LIVES_WIDGET_STATE_PRELIGHT);
+          if (checkbutton!=NULL) {
+            // gtk 3+ idiocy...
+            lives_widget_set_state(checkbutton,LIVES_WIDGET_STATE_NORMAL);
+            lives_widget_queue_draw(checkbutton);
+            lives_widget_set_state(checkbutton,LIVES_WIDGET_STATE_PRELIGHT);
+            lives_widget_queue_draw(checkbutton);
+          }
+          lives_widget_set_sensitive(mt->jumpback, lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"blocks")!=NULL);
+          lives_widget_set_sensitive(mt->jumpnext, lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"blocks")!=NULL);
+        } else {
+          if (labelbox!=NULL) lives_widget_set_state(labelbox,LIVES_WIDGET_STATE_NORMAL);
+          if (ahbox!=NULL) lives_widget_set_state(ahbox,LIVES_WIDGET_STATE_NORMAL);
+          if (checkbutton!=NULL) {
+            // gtk 3+ idiocy...
+            lives_widget_set_state(checkbutton,LIVES_WIDGET_STATE_PRELIGHT);
+            lives_widget_queue_draw(checkbutton);
+            lives_widget_set_state(checkbutton,LIVES_WIDGET_STATE_NORMAL);
+            lives_widget_queue_draw(checkbutton);
+          }
+        }
 
 #ifdef ENABLE_GIW
-	if ((prefs->lamp_buttons&&!giw_led_get_mode(GIW_LED(checkbutton)))||(!prefs->lamp_buttons&&
-#else			
-	if (
+        if ((prefs->lamp_buttons&&!giw_led_get_mode(GIW_LED(checkbutton)))||(!prefs->lamp_buttons&&
+#else
+        if (
 #endif
-	    !lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(checkbutton)))
+            !lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(checkbutton)))
 #ifdef ENABLE_GIW
-	  )
+           )
 #endif
-	  {
-	    // set other widgets
-	    if (lives_check_menu_item_get_active(LIVES_CHECK_MENU_ITEM(mt->select_track))) {
- 	      lives_check_menu_item_set_active(LIVES_CHECK_MENU_ITEM(mt->select_track),FALSE);
-	    }
-	  else on_seltrack_activate(LIVES_MENU_ITEM(mt->select_track),mt);
-	}
-	else {
-	  if (!lives_check_menu_item_get_active(LIVES_CHECK_MENU_ITEM(mt->select_track))) 
-	    lives_check_menu_item_set_active(LIVES_CHECK_MENU_ITEM(mt->select_track),TRUE);
-	  else on_seltrack_activate(LIVES_MENU_ITEM(mt->select_track),mt);
-	}
-    }
-    else {
-	if (labelbox!=NULL) lives_widget_set_state(labelbox,LIVES_WIDGET_STATE_NORMAL);
-	if (ahbox!=NULL) lives_widget_set_state(ahbox,LIVES_WIDGET_STATE_NORMAL);
-	if (checkbutton!=NULL) {
-	  lives_widget_set_state(checkbutton,LIVES_WIDGET_STATE_NORMAL);
-	  lives_widget_queue_draw(checkbutton);
-	}
+        {
+          // set other widgets
+          if (lives_check_menu_item_get_active(LIVES_CHECK_MENU_ITEM(mt->select_track))) {
+            lives_check_menu_item_set_active(LIVES_CHECK_MENU_ITEM(mt->select_track),FALSE);
+          } else on_seltrack_activate(LIVES_MENU_ITEM(mt->select_track),mt);
+        } else {
+          if (!lives_check_menu_item_get_active(LIVES_CHECK_MENU_ITEM(mt->select_track)))
+            lives_check_menu_item_set_active(LIVES_CHECK_MENU_ITEM(mt->select_track),TRUE);
+          else on_seltrack_activate(LIVES_MENU_ITEM(mt->select_track),mt);
+        }
+      } else {
+        if (labelbox!=NULL) lives_widget_set_state(labelbox,LIVES_WIDGET_STATE_NORMAL);
+        if (ahbox!=NULL) lives_widget_set_state(ahbox,LIVES_WIDGET_STATE_NORMAL);
+        if (checkbutton!=NULL) {
+          lives_widget_set_state(checkbutton,LIVES_WIDGET_STATE_NORMAL);
+          lives_widget_queue_draw(checkbutton);
+        }
       }
     }
   }
 
   if (mt->poly_state==POLY_FX_STACK) polymorph(mt,POLY_FX_STACK);
   else if (mt->current_rfx!=NULL&&mt->init_event!=NULL&&mt->poly_state==POLY_PARAMS&&
-      weed_plant_has_leaf(mt->init_event,"in_tracks")) {
+           weed_plant_has_leaf(mt->init_event,"in_tracks")) {
     boolean xx;
     weed_timecode_t init_tc=get_event_timecode(mt->init_event);
     tc=q_gint64(lives_spin_button_get_value(LIVES_SPIN_BUTTON(mt->node_spinbutton))*U_SEC+init_tc,mt->fps);
@@ -1772,91 +1845,92 @@
     xx=get_track_index(mt,tc);
     if (mt->track_index!=-1) {
       if (mt->current_track>=0) {
-	interpolate_params((weed_plant_t *)mt->current_rfx->source,pchain,tc);
+        interpolate_params((weed_plant_t *)mt->current_rfx->source,pchain,tc);
       }
       if (!xx) {
-	boolean aprev=mt->opts.fx_auto_preview;
-	mt->opts.fx_auto_preview=FALSE;
-	mainw->block_param_updates=TRUE;
-	update_visual_params(mt->current_rfx,FALSE);
-	mainw->block_param_updates=FALSE;
-	mt->opts.fx_auto_preview=aprev;
-      }
-      if (mt->current_track>=0){
-	set_params_unchanged(mt->current_rfx);
-	mt_show_current_frame(mt, FALSE);
+        boolean aprev=mt->opts.fx_auto_preview;
+        mt->opts.fx_auto_preview=FALSE;
+        mainw->block_param_updates=TRUE;
+        update_visual_params(mt->current_rfx,FALSE);
+        mainw->block_param_updates=FALSE;
+        mt->opts.fx_auto_preview=aprev;
+      }
+      if (mt->current_track>=0) {
+        set_params_unchanged(mt->current_rfx);
+        mt_show_current_frame(mt, FALSE);
       }
       if (mt->fx_params_label!=NULL) {
-	gchar *ltext=mt_params_label(mt);
-	lives_label_set_text(LIVES_LABEL(mt->fx_params_label),ltext);
-	g_free(ltext);
+        char *ltext=mt_params_label(mt);
+        lives_label_set_text(LIVES_LABEL(mt->fx_params_label),ltext);
+        lives_free(ltext);
       }
-    }
-    else polymorph(mt,POLY_FX_STACK);
+    } else polymorph(mt,POLY_FX_STACK);
   }
 
 }
 
 
 static void show_track_info(lives_mt *mt, LiVESWidget *eventbox, int track, double timesecs) {
-  gchar *tmp,*tmp1;
+  char *tmp,*tmp1;
   track_rect *block=get_block_from_time(eventbox,timesecs,mt);
   int filenum;
 
   clear_context(mt);
-  if (!is_audio_eventbox(mt,eventbox)) add_context_label 
-					 (mt,(tmp=g_strdup_printf 
-					      (_("Current track: %s (layer %d)\n"),
-					       g_object_get_data(G_OBJECT(eventbox),
-								 "track_name"),track)));
-  else {
-    if (track==-1) add_context_label (mt,(tmp=g_strdup (_("Current track: Backing audio\n"))));
-    else add_context_label (mt,(tmp=g_strdup_printf (_("Current track: Layer %d audio\n"),track)));
-  }
-  g_free(tmp);
-  add_context_label (mt,(tmp=g_strdup_printf (_("%.2f sec.\n"),timesecs)));
-  g_free(tmp);
+  if (!is_audio_eventbox(eventbox)) add_context_label
+    (mt,(tmp=lives_strdup_printf
+             (_("Current track: %s (layer %d)\n"),
+              lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),
+                                           "track_name"),track)));
+  else {
+    if (track==-1) add_context_label(mt,(tmp=lives_strdup(_("Current track: Backing audio\n"))));
+    else add_context_label(mt,(tmp=lives_strdup_printf(_("Current track: Layer %d audio\n"),track)));
+  }
+  lives_free(tmp);
+  add_context_label(mt,(tmp=lives_strdup_printf(_("%.2f sec.\n"),timesecs)));
+  lives_free(tmp);
   if (block!=NULL) {
-    if (!is_audio_eventbox(mt,eventbox)) filenum=get_frame_event_clip(block->start_event,track);
+    if (!is_audio_eventbox(eventbox)) filenum=get_frame_event_clip(block->start_event,track);
     else filenum=get_audio_frame_clip(block->start_event,track);
-    add_context_label (mt,(tmp=g_strdup_printf (_("Source: %s"),(tmp1=g_path_get_basename(mainw->files[filenum]->name)))));
-    g_free(tmp);
-    g_free(tmp1);
-    add_context_label (mt,(_("Right click for context menu.\n")));
+    add_context_label(mt,(tmp=lives_strdup_printf(_("Source: %s"),(tmp1=lives_path_get_basename(mainw->files[filenum]->name)))));
+    lives_free(tmp);
+    lives_free(tmp1);
+    add_context_label(mt,(_("Right click for context menu.\n")));
   }
-  add_context_label (mt,(_("Double click on a block\nto select it.")));
+  add_context_label(mt,(_("Double click on a block\nto select it.")));
 }
 
 
-static boolean atrack_ebox_pressed (LiVESWidget *labelbox, LiVESXEventButton *event, gpointer user_data) {
+static boolean atrack_ebox_pressed(LiVESWidget *labelbox, LiVESXEventButton *event, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   int current_track=mt->current_track;
-  mt->current_track=GPOINTER_TO_INT(g_object_get_data (G_OBJECT(labelbox),"layer_number"));
+  if (!mainw->interactive) return FALSE;
+  mt->current_track=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(labelbox),"layer_number"));
   if (current_track!=mt->current_track) mt->fm_edit_event=NULL;
   mt->aud_track_selected=TRUE;
   track_select(mt);
-  show_track_info(mt,(LiVESWidget *)g_list_nth_data(mt->audio_draws,mt->current_track+mt->opts.back_audio_tracks),
-		  mt->current_track,mt->ptr_time);
+  show_track_info(mt,(LiVESWidget *)lives_list_nth_data(mt->audio_draws,mt->current_track+mt->opts.back_audio_tracks),
+                  mt->current_track,mt->ptr_time);
   return FALSE;
 }
 
 
 
 
-static boolean track_ebox_pressed (LiVESWidget *labelbox, LiVESXEventButton *event, gpointer user_data) {
+static boolean track_ebox_pressed(LiVESWidget *labelbox, LiVESXEventButton *event, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   int current_track=mt->current_track;
-  mt->current_track=GPOINTER_TO_INT(g_object_get_data (G_OBJECT(labelbox),"layer_number"));
+  if (!mainw->interactive) return FALSE;
+  mt->current_track=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(labelbox),"layer_number"));
   if (current_track!=mt->current_track) mt->fm_edit_event=NULL;
   mt->aud_track_selected=FALSE;
   track_select(mt);
-  show_track_info(mt,(LiVESWidget *)g_list_nth_data(mt->video_draws,mt->current_track),mt->current_track,mt->ptr_time);
+  show_track_info(mt,(LiVESWidget *)lives_list_nth_data(mt->video_draws,mt->current_track),mt->current_track,mt->ptr_time);
   return FALSE;
 }
 
 
 
-static boolean on_mt_timeline_scroll (LiVESWidget *widget, LiVESXEventScroll *event, gpointer user_data) {
+static boolean on_mt_timeline_scroll(LiVESWidget *widget, LiVESXEventScroll *event, livespointer user_data) {
   // scroll timeline up/down with mouse wheel
   lives_mt *mt=(lives_mt *)user_data;
 
@@ -1868,9 +1942,8 @@
 
   if (event->direction==LIVES_SCROLL_UP) {
     if (--cval<0) return FALSE;;
-  }
-  else if (event->direction==LIVES_SCROLL_DOWN) {
-    if (++cval>=g_list_length(mt->video_draws)) return FALSE;
+  } else if (event->direction==LIVES_SCROLL_DOWN) {
+    if (++cval>=lives_list_length(mt->video_draws)) return FALSE;
   }
 
   lives_range_set_value(LIVES_RANGE(mt->scrollbar),cval);
@@ -1884,32 +1957,32 @@
   // find top track such that all of track fits at the bottom
 
   LiVESWidget *eventbox;
-  GList *vdraw;
+  LiVESList *vdraw;
   int extras=mt->max_disp_vtracks-1;
   int hidden,expanded;
 
   if (mt->opts.back_audio_tracks>0&&mt->audio_draws==NULL) mt->opts.back_audio_tracks=0;
   if (cfile->achans>0&&mt->opts.back_audio_tracks>0) {
     eventbox=(LiVESWidget *)mt->audio_draws->data;
-    hidden=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(eventbox),"hidden"));
+    hidden=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"hidden"));
     if (!hidden) {
       extras--;
-      expanded=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(eventbox),"expanded"));
+      expanded=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"expanded"));
       if (expanded) {
-	extras-=cfile->achans;
+        extras-=cfile->achans;
       }
     }
   }
 
   if (extras<0) return track;
 
-  vdraw=g_list_nth(mt->video_draws,track);
+  vdraw=lives_list_nth(mt->video_draws,track);
   eventbox=(LiVESWidget *)vdraw->data;
-  expanded=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(eventbox),"expanded"));
+  expanded=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"expanded"));
   if (expanded) {
-    eventbox=(LiVESWidget *)(g_object_get_data(G_OBJECT(eventbox),"atrack"));
+    eventbox=(LiVESWidget *)(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"atrack"));
     extras--;
-    expanded=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(eventbox),"expanded"));
+    expanded=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"expanded"));
     if (expanded) {
       extras-=cfile->achans;
     }
@@ -1921,15 +1994,15 @@
 
   while (vdraw!=NULL) {
     eventbox=(LiVESWidget *)vdraw->data;
-    hidden=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(eventbox),"hidden"))&TRACK_I_HIDDEN_USER;
-    expanded=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(eventbox),"expanded"));
+    hidden=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"hidden"))&TRACK_I_HIDDEN_USER;
+    expanded=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"expanded"));
     extras--;
     if (expanded) {
-      eventbox=(LiVESWidget *)(g_object_get_data(G_OBJECT(eventbox),"atrack"));
+      eventbox=(LiVESWidget *)(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"atrack"));
       extras--;
-      expanded=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(eventbox),"expanded"));
+      expanded=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"expanded"));
       if (expanded) {
-	extras-=cfile->achans;
+        extras-=cfile->achans;
       }
     }
     if (extras<0) break;
@@ -1943,13 +2016,28 @@
 }
 
 
+static void redraw_all_event_boxes(lives_mt *mt) {
+  LiVESList *slist;
+
+  slist=mt->audio_draws;
+  while (slist!=NULL) {
+    redraw_eventbox(mt,(LiVESWidget *)slist->data);
+    slist=slist->next;
+  }
+
+  slist=mt->video_draws;
+  while (slist!=NULL) {
+    redraw_eventbox(mt,(LiVESWidget *)slist->data);
+    slist=slist->next;
+  }
+}
 
 
 
 
-void scroll_tracks (lives_mt *mt, int top_track, boolean set_value) {
-  GList *vdraws=mt->video_draws;
-  GList *table_children,*xlist;
+void scroll_tracks(lives_mt *mt, int top_track, boolean set_value) {
+  LiVESList *vdraws=mt->video_draws;
+  LiVESList *table_children,*xlist;
 
   LiVESWidget *eventbox;
   LiVESWidget *label;
@@ -1973,40 +2061,40 @@
     lives_adjustment_set_value(LIVES_ADJUSTMENT(mt->vadjustment),(double)top_track);
 
   if (top_track<0) top_track=0;
-  if (top_track>=g_list_length(mt->video_draws)) top_track=g_list_length(mt->video_draws)-1;
+  if (top_track>=lives_list_length(mt->video_draws)) top_track=lives_list_length(mt->video_draws)-1;
 
   mt->top_track=top_track;
 
   // first set all tracks to hidden
   while (vdraws!=NULL) {
     eventbox=(LiVESWidget *)vdraws->data;
-    hidden=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(eventbox),"hidden"));
+    hidden=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"hidden"));
     hidden|=TRACK_I_HIDDEN_SCROLLED;
-    g_object_set_data(G_OBJECT(eventbox),"hidden",GINT_TO_POINTER(hidden));
+    lives_widget_object_set_data(LIVES_WIDGET_OBJECT(eventbox),"hidden",LIVES_INT_TO_POINTER(hidden));
 
-    aeventbox=LIVES_WIDGET(g_object_get_data(G_OBJECT(eventbox),"atrack"));
+    aeventbox=LIVES_WIDGET(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"atrack"));
 
     if (aeventbox!=NULL) {
-      hidden=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(aeventbox),"hidden"));
+      hidden=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(aeventbox),"hidden"));
       hidden|=TRACK_I_HIDDEN_SCROLLED;
-      g_object_set_data(G_OBJECT(aeventbox),"hidden",GINT_TO_POINTER(hidden));
-      
-      
-      xeventbox=(LiVESWidget *)g_object_get_data(G_OBJECT(aeventbox),"achan0");
-    
+      lives_widget_object_set_data(LIVES_WIDGET_OBJECT(aeventbox),"hidden",LIVES_INT_TO_POINTER(hidden));
+
+
+      xeventbox=(LiVESWidget *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(aeventbox),"achan0");
+
       if (xeventbox!=NULL) {
-	hidden=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(xeventbox),"hidden"));
-	hidden|=TRACK_I_HIDDEN_SCROLLED;
-	g_object_set_data(G_OBJECT(xeventbox),"hidden",GINT_TO_POINTER(hidden));
-	
+        hidden=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(xeventbox),"hidden"));
+        hidden|=TRACK_I_HIDDEN_SCROLLED;
+        lives_widget_object_set_data(LIVES_WIDGET_OBJECT(xeventbox),"hidden",LIVES_INT_TO_POINTER(hidden));
+
       }
 
-      xeventbox=(LiVESWidget *)g_object_get_data(G_OBJECT(aeventbox),"achan1");
-    
+      xeventbox=(LiVESWidget *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(aeventbox),"achan1");
+
       if (xeventbox!=NULL) {
-	hidden=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(xeventbox),"hidden"));
-	hidden|=TRACK_I_HIDDEN_SCROLLED;
-	g_object_set_data(G_OBJECT(xeventbox),"hidden",GINT_TO_POINTER(hidden));
+        hidden=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(xeventbox),"hidden"));
+        hidden|=TRACK_I_HIDDEN_SCROLLED;
+        lives_widget_object_set_data(LIVES_WIDGET_OBJECT(xeventbox),"hidden",LIVES_INT_TO_POINTER(hidden));
       }
     }
 
@@ -2017,163 +2105,164 @@
     lives_widget_destroy(mt->timeline_table);
   }
 
-  mt->timeline_table = lives_table_new (mt->max_disp_vtracks, 40, TRUE);
+  mt->timeline_table = lives_table_new(mt->max_disp_vtracks, 40, TRUE);
   lives_widget_set_bg_color(LIVES_WIDGET(mt->timeline_table), LIVES_WIDGET_STATE_NORMAL, &palette->white);
 
-  lives_container_add (LIVES_CONTAINER (mt->tl_eventbox), mt->timeline_table);
+  lives_container_add(LIVES_CONTAINER(mt->tl_eventbox), mt->timeline_table);
+
+  lives_table_set_row_spacings(LIVES_TABLE(mt->timeline_table),widget_opts.packing_height>>1);
+  lives_table_set_col_spacings(LIVES_TABLE(mt->timeline_table),0);
 
-  lives_table_set_row_spacings (LIVES_TABLE(mt->timeline_table),widget_opts.packing_height>>1);
-  lives_table_set_col_spacings (LIVES_TABLE(mt->timeline_table),0);
+  lives_widget_set_vexpand(mt->timeline_table,FALSE);
 
   if (mt->opts.back_audio_tracks>0&&mt->audio_draws==NULL) mt->opts.back_audio_tracks=0;
 
   if (cfile->achans>0&&mt->opts.back_audio_tracks>0) {
     // show our float audio
-    if (GPOINTER_TO_INT(g_object_get_data(G_OBJECT(mt->audio_draws->data),"hidden"))==0) {
+    if (LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(mt->audio_draws->data),"hidden"))==0) {
       aud_tracks++;
-      
-      expanded=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(mt->audio_draws->data),"expanded"));
 
-      label=(LIVES_WIDGET(g_object_get_data(G_OBJECT(mt->audio_draws->data),"label")));
-      arrow=(LIVES_WIDGET(g_object_get_data(G_OBJECT(mt->audio_draws->data),"arrow")));
-      
+      expanded=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(mt->audio_draws->data),"expanded"));
+
+      label=(LIVES_WIDGET(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(mt->audio_draws->data),"label")));
+      arrow=(LIVES_WIDGET(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(mt->audio_draws->data),"arrow")));
+
       labelbox=lives_event_box_new();
       hbox=lives_hbox_new(FALSE,widget_opts.packing_width);
       ahbox=lives_event_box_new();
-      
+
       lives_widget_set_state(label,LIVES_WIDGET_STATE_NORMAL);
       lives_widget_set_state(arrow,LIVES_WIDGET_STATE_NORMAL);
 
       if (palette->style&STYLE_1) {
-	if (labelbox!=NULL) {
-	    lives_widget_set_bg_color (labelbox, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
-	    lives_widget_set_fg_color (labelbox, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
-	}
-	if (ahbox!=NULL) {
-	    lives_widget_set_bg_color (ahbox, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
-	    lives_widget_set_fg_color (ahbox, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
-	}
-	lives_widget_set_fg_color (label, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
-	lives_widget_set_fg_color (arrow, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
-	lives_widget_set_bg_color (label, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
-	lives_widget_set_bg_color (arrow, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
-	if (palette->style&STYLE_3) {
-	  if (labelbox!=NULL) {
-	    lives_widget_set_bg_color (labelbox, LIVES_WIDGET_STATE_PRELIGHT, &palette->menu_and_bars);
-	    lives_widget_set_fg_color (labelbox, LIVES_WIDGET_STATE_PRELIGHT, &palette->menu_and_bars_fore);
-	  }
-	  if (ahbox!=NULL) {
-	    lives_widget_set_bg_color (ahbox, LIVES_WIDGET_STATE_PRELIGHT, &palette->menu_and_bars);
-	    lives_widget_set_fg_color (ahbox, LIVES_WIDGET_STATE_PRELIGHT, &palette->menu_and_bars_fore);
-	  }
-	  lives_widget_set_bg_color (label, LIVES_WIDGET_STATE_PRELIGHT, &palette->menu_and_bars);
-	  lives_widget_set_bg_color (arrow, LIVES_WIDGET_STATE_PRELIGHT, &palette->menu_and_bars);
-	  lives_widget_set_fg_color (label, LIVES_WIDGET_STATE_PRELIGHT, &palette->menu_and_bars_fore);
-	  lives_widget_set_fg_color (arrow, LIVES_WIDGET_STATE_PRELIGHT, &palette->menu_and_bars_fore);
-	}
-	else {
-	  if (labelbox!=NULL) {
-	    lives_widget_set_bg_color (labelbox, LIVES_WIDGET_STATE_PRELIGHT, &palette->normal_back);
-	    lives_widget_set_fg_color (labelbox, LIVES_WIDGET_STATE_PRELIGHT, &palette->normal_fore);
-	  }
-	  if (ahbox!=NULL) {
-	    lives_widget_set_bg_color (ahbox, LIVES_WIDGET_STATE_PRELIGHT, &palette->normal_back);
-	    lives_widget_set_fg_color (ahbox, LIVES_WIDGET_STATE_PRELIGHT, &palette->normal_fore);
-	  }
-	  lives_widget_set_fg_color (label, LIVES_WIDGET_STATE_PRELIGHT, &palette->normal_fore);
-	  lives_widget_set_fg_color (arrow, LIVES_WIDGET_STATE_PRELIGHT, &palette->normal_fore);
-	  lives_widget_set_bg_color (label, LIVES_WIDGET_STATE_PRELIGHT, &palette->normal_back);
-	  lives_widget_set_bg_color (arrow, LIVES_WIDGET_STATE_PRELIGHT, &palette->normal_back);
-	}
-      }
-      lives_container_add (LIVES_CONTAINER (labelbox), hbox);
-      lives_box_pack_start (LIVES_BOX (hbox), label, FALSE, FALSE, 0);
-      lives_container_add (LIVES_CONTAINER (ahbox), arrow);
-      
-      lives_table_attach (LIVES_TABLE (mt->timeline_table), labelbox, 1, 6, 0, 1, LIVES_FILL, (LiVESAttachOptions)0, 0, 0);
-      lives_table_attach (LIVES_TABLE (mt->timeline_table), ahbox, 6, 7, 0, 1, LIVES_FILL, (LiVESAttachOptions)0, 0, 0);
-      
-      g_object_set_data (G_OBJECT(mt->audio_draws->data),"labelbox",labelbox);
-      g_object_set_data (G_OBJECT(mt->audio_draws->data),"ahbox",ahbox);
-      g_object_set_data (G_OBJECT(ahbox),"eventbox",mt->audio_draws->data);
-      g_object_set_data(G_OBJECT(labelbox),"layer_number",GINT_TO_POINTER(GPOINTER_TO_INT(-1)));
-      
-      lives_signal_connect (LIVES_GUI_OBJECT (labelbox), "button_press_event",
-			LIVES_GUI_CALLBACK (atrack_ebox_pressed),
-			(gpointer)mt);
-      
-      lives_signal_connect (LIVES_GUI_OBJECT (ahbox), "button_press_event",
-			LIVES_GUI_CALLBACK (track_arrow_pressed),
-			(gpointer)mt);
-      
-      lives_table_attach (LIVES_TABLE (mt->timeline_table), (LiVESWidget *)mt->audio_draws->data, 7, 40, 0, 1,
-			(LiVESAttachOptions) (LIVES_EXPAND | LIVES_FILL),
-			(LiVESAttachOptions) (LIVES_FILL), 0, 0);
-
-      lives_signal_connect (LIVES_GUI_OBJECT (mt->audio_draws->data), "button_press_event",
-			LIVES_GUI_CALLBACK (on_track_click),
-			(gpointer)mt);
-      lives_signal_connect (LIVES_GUI_OBJECT (mt->audio_draws->data), "button_release_event",
-			LIVES_GUI_CALLBACK (on_track_release),
-			(gpointer)mt);
+        if (labelbox!=NULL) {
+          lives_widget_set_bg_color(labelbox, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+          lives_widget_set_fg_color(labelbox, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
+        }
+        if (ahbox!=NULL) {
+          lives_widget_set_bg_color(ahbox, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+          lives_widget_set_fg_color(ahbox, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
+        }
+        lives_widget_set_fg_color(label, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
+        lives_widget_set_fg_color(arrow, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
+        lives_widget_set_bg_color(label, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+        lives_widget_set_bg_color(arrow, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+        if (palette->style&STYLE_3) {
+          if (labelbox!=NULL) {
+            lives_widget_set_bg_color(labelbox, LIVES_WIDGET_STATE_PRELIGHT, &palette->menu_and_bars);
+            lives_widget_set_fg_color(labelbox, LIVES_WIDGET_STATE_PRELIGHT, &palette->menu_and_bars_fore);
+          }
+          if (ahbox!=NULL) {
+            lives_widget_set_bg_color(ahbox, LIVES_WIDGET_STATE_PRELIGHT, &palette->menu_and_bars);
+            lives_widget_set_fg_color(ahbox, LIVES_WIDGET_STATE_PRELIGHT, &palette->menu_and_bars_fore);
+          }
+          lives_widget_set_bg_color(label, LIVES_WIDGET_STATE_PRELIGHT, &palette->menu_and_bars);
+          lives_widget_set_bg_color(arrow, LIVES_WIDGET_STATE_PRELIGHT, &palette->menu_and_bars);
+          lives_widget_set_fg_color(label, LIVES_WIDGET_STATE_PRELIGHT, &palette->menu_and_bars_fore);
+          lives_widget_set_fg_color(arrow, LIVES_WIDGET_STATE_PRELIGHT, &palette->menu_and_bars_fore);
+        } else {
+          if (labelbox!=NULL) {
+            lives_widget_set_bg_color(labelbox, LIVES_WIDGET_STATE_PRELIGHT, &palette->normal_back);
+            lives_widget_set_fg_color(labelbox, LIVES_WIDGET_STATE_PRELIGHT, &palette->normal_fore);
+          }
+          if (ahbox!=NULL) {
+            lives_widget_set_bg_color(ahbox, LIVES_WIDGET_STATE_PRELIGHT, &palette->normal_back);
+            lives_widget_set_fg_color(ahbox, LIVES_WIDGET_STATE_PRELIGHT, &palette->normal_fore);
+          }
+          lives_widget_set_fg_color(label, LIVES_WIDGET_STATE_PRELIGHT, &palette->normal_fore);
+          lives_widget_set_fg_color(arrow, LIVES_WIDGET_STATE_PRELIGHT, &palette->normal_fore);
+          lives_widget_set_bg_color(label, LIVES_WIDGET_STATE_PRELIGHT, &palette->normal_back);
+          lives_widget_set_bg_color(arrow, LIVES_WIDGET_STATE_PRELIGHT, &palette->normal_back);
+        }
+      }
+      lives_container_add(LIVES_CONTAINER(labelbox), hbox);
+      lives_box_pack_start(LIVES_BOX(hbox), label, FALSE, FALSE, 0);
+      lives_container_add(LIVES_CONTAINER(ahbox), arrow);
+
+      lives_table_attach(LIVES_TABLE(mt->timeline_table), labelbox, 1, 6, 0, 1, LIVES_FILL, (LiVESAttachOptions)0, 0, 0);
+      lives_table_attach(LIVES_TABLE(mt->timeline_table), ahbox, 6, 7, 0, 1, LIVES_FILL, (LiVESAttachOptions)0, 0, 0);
+
+      lives_widget_object_set_data(LIVES_WIDGET_OBJECT(mt->audio_draws->data),"labelbox",labelbox);
+      lives_widget_object_set_data(LIVES_WIDGET_OBJECT(mt->audio_draws->data),"ahbox",ahbox);
+      lives_widget_object_set_data(LIVES_WIDGET_OBJECT(ahbox),"eventbox",(livespointer)mt->audio_draws->data);
+      lives_widget_object_set_data(LIVES_WIDGET_OBJECT(labelbox),"layer_number",LIVES_INT_TO_POINTER(-1));
+
+      lives_signal_connect(LIVES_GUI_OBJECT(labelbox), LIVES_WIDGET_BUTTON_PRESS_EVENT,
+                           LIVES_GUI_CALLBACK(atrack_ebox_pressed),
+                           (livespointer)mt);
+
+      lives_signal_connect(LIVES_GUI_OBJECT(ahbox), LIVES_WIDGET_BUTTON_PRESS_EVENT,
+                           LIVES_GUI_CALLBACK(track_arrow_pressed),
+                           (livespointer)mt);
+
+      lives_table_attach(LIVES_TABLE(mt->timeline_table), (LiVESWidget *)mt->audio_draws->data, 7, 40, 0, 1,
+                         (LiVESAttachOptions)(LIVES_EXPAND | LIVES_FILL),
+                         (LiVESAttachOptions)(LIVES_FILL), 0, 0);
+
+      lives_signal_connect(LIVES_GUI_OBJECT(mt->audio_draws->data), LIVES_WIDGET_BUTTON_PRESS_EVENT,
+                           LIVES_GUI_CALLBACK(on_track_click),
+                           (livespointer)mt);
+      lives_signal_connect(LIVES_GUI_OBJECT(mt->audio_draws->data), LIVES_WIDGET_BUTTON_RELEASE_EVENT,
+                           LIVES_GUI_CALLBACK(on_track_release),
+                           (livespointer)mt);
 
       lives_widget_set_bg_color(LIVES_WIDGET(mt->audio_draws->data), LIVES_WIDGET_STATE_NORMAL, &palette->white);
       lives_widget_set_app_paintable(LIVES_WIDGET(mt->audio_draws->data),TRUE);
-      lives_signal_connect (LIVES_GUI_OBJECT (mt->audio_draws->data), LIVES_WIDGET_EXPOSE_EVENT,
-			LIVES_GUI_CALLBACK (expose_track_event),
-			(gpointer)mt);
+      lives_signal_connect(LIVES_GUI_OBJECT(mt->audio_draws->data), LIVES_WIDGET_EXPOSE_EVENT,
+                           LIVES_GUI_CALLBACK(expose_track_event),
+                           (livespointer)mt);
 
       if (expanded) {
-	xeventbox=(LiVESWidget *)g_object_get_data(G_OBJECT(mt->audio_draws->data),"achan0");
-	
-	lives_table_attach (LIVES_TABLE (mt->timeline_table), xeventbox, 7, 40, 1, 2,
-			  (LiVESAttachOptions) (LIVES_EXPAND | LIVES_FILL),
-			  (LiVESAttachOptions) (LIVES_FILL), 0, 0);
-	
-	lives_widget_set_bg_color(xeventbox, LIVES_WIDGET_STATE_NORMAL, &palette->white);
-	lives_widget_set_app_paintable(xeventbox,TRUE);
-	lives_signal_connect (LIVES_GUI_OBJECT (xeventbox), LIVES_WIDGET_EXPOSE_EVENT,
-			  LIVES_GUI_CALLBACK (mt_expose_audtrack_event),
-			  (gpointer)mt);
-
-	if (cfile->achans>1) {
-	  xeventbox=(LiVESWidget *)g_object_get_data(G_OBJECT(mt->audio_draws->data),"achan1");
-	  
-	  lives_table_attach (LIVES_TABLE (mt->timeline_table), xeventbox, 7, 40, 2, 3,
-			    (LiVESAttachOptions) (LIVES_EXPAND | LIVES_FILL),
-			    (LiVESAttachOptions) (LIVES_FILL), 0, 0);
-	  
-	  lives_widget_set_bg_color(xeventbox, LIVES_WIDGET_STATE_NORMAL, &palette->white);
-	  lives_widget_set_app_paintable(xeventbox,TRUE);
-	  lives_signal_connect (LIVES_GUI_OBJECT (xeventbox), LIVES_WIDGET_EXPOSE_EVENT,
-			    LIVES_GUI_CALLBACK (mt_expose_audtrack_event),
-			    (gpointer)mt);
-	  
-	}
-	aud_tracks+=cfile->achans;
+        xeventbox=(LiVESWidget *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(mt->audio_draws->data),"achan0");
+
+        lives_table_attach(LIVES_TABLE(mt->timeline_table), xeventbox, 7, 40, 1, 2,
+                           (LiVESAttachOptions)(LIVES_EXPAND | LIVES_FILL),
+                           (LiVESAttachOptions)(LIVES_FILL), 0, 0);
+
+        lives_widget_set_bg_color(xeventbox, LIVES_WIDGET_STATE_NORMAL, &palette->white);
+        lives_widget_set_app_paintable(xeventbox,TRUE);
+        lives_signal_connect(LIVES_GUI_OBJECT(xeventbox), LIVES_WIDGET_EXPOSE_EVENT,
+                             LIVES_GUI_CALLBACK(mt_expose_audtrack_event),
+                             (livespointer)mt);
+
+        if (cfile->achans>1) {
+          xeventbox=(LiVESWidget *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(mt->audio_draws->data),"achan1");
+
+          lives_table_attach(LIVES_TABLE(mt->timeline_table), xeventbox, 7, 40, 2, 3,
+                             (LiVESAttachOptions)(LIVES_EXPAND | LIVES_FILL),
+                             (LiVESAttachOptions)(LIVES_FILL), 0, 0);
+
+          lives_widget_set_bg_color(xeventbox, LIVES_WIDGET_STATE_NORMAL, &palette->white);
+          lives_widget_set_app_paintable(xeventbox,TRUE);
+          lives_signal_connect(LIVES_GUI_OBJECT(xeventbox), LIVES_WIDGET_EXPOSE_EVENT,
+                               LIVES_GUI_CALLBACK(mt_expose_audtrack_event),
+                               (livespointer)mt);
+
+        }
+        aud_tracks+=cfile->achans;
       }
     }
   }
 
 
   lives_adjustment_set_page_size(LIVES_ADJUSTMENT(mt->vadjustment),
-				 (double)((int)(lives_adjustment_get_page_size(LIVES_ADJUSTMENT(mt->vadjustment)))-aud_tracks));
+                                 (double)((int)(lives_adjustment_get_page_size(LIVES_ADJUSTMENT(mt->vadjustment)))-aud_tracks));
 
-  vdraws=g_list_nth(mt->video_draws,top_track);
+  vdraws=lives_list_nth(mt->video_draws,top_track);
 
   rows+=aud_tracks;
 
   while (vdraws!=NULL&&rows<mt->max_disp_vtracks) {
     eventbox=(LiVESWidget *)vdraws->data;
 
-    hidden=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(eventbox),"hidden"))&TRACK_I_HIDDEN_USER;
-    g_object_set_data(G_OBJECT(eventbox),"hidden",GINT_TO_POINTER(hidden));
+    hidden=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"hidden"))&TRACK_I_HIDDEN_USER;
+    lives_widget_object_set_data(LIVES_WIDGET_OBJECT(eventbox),"hidden",LIVES_INT_TO_POINTER(hidden));
 
     if (hidden==0) {
 
-      label=(LIVES_WIDGET(g_object_get_data(G_OBJECT(eventbox),"label")));
-      arrow=(LIVES_WIDGET(g_object_get_data(G_OBJECT(eventbox),"arrow")));
-      checkbutton=(LIVES_WIDGET(g_object_get_data(G_OBJECT(eventbox),"checkbutton")));
+      label=(LIVES_WIDGET(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"label")));
+      arrow=(LIVES_WIDGET(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"arrow")));
+      checkbutton=(LIVES_WIDGET(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"checkbutton")));
       labelbox=lives_event_box_new();
       hbox=lives_hbox_new(FALSE,widget_opts.packing_width);
       ahbox=lives_event_box_new();
@@ -2185,309 +2274,340 @@
       lives_widget_set_bg_color(LIVES_WIDGET(eventbox), LIVES_WIDGET_STATE_NORMAL, &palette->white);
 
       if (palette->style&STYLE_1) {
-	lives_widget_set_bg_color (labelbox, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
-	lives_widget_set_fg_color (labelbox, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
-	lives_widget_set_bg_color (ahbox, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
-	lives_widget_set_fg_color (ahbox, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
-	lives_widget_set_bg_color (checkbutton, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
-	lives_widget_set_fg_color (checkbutton, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
-	lives_widget_set_bg_color (label, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
-	lives_widget_set_fg_color (label, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
-	lives_widget_set_bg_color (arrow, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
-	lives_widget_set_fg_color (arrow, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
-	if (palette->style&STYLE_3) {
-	  lives_widget_set_bg_color (labelbox, LIVES_WIDGET_STATE_PRELIGHT, &palette->menu_and_bars);
-	  lives_widget_set_bg_color (ahbox, LIVES_WIDGET_STATE_PRELIGHT, &palette->menu_and_bars);
-	  lives_widget_set_bg_color (checkbutton, LIVES_WIDGET_STATE_PRELIGHT, &palette->menu_and_bars);
-	  lives_widget_set_fg_color (labelbox, LIVES_WIDGET_STATE_PRELIGHT, &palette->menu_and_bars_fore);
-	  lives_widget_set_fg_color (ahbox, LIVES_WIDGET_STATE_PRELIGHT, &palette->menu_and_bars_fore);
-	  lives_widget_set_fg_color (checkbutton, LIVES_WIDGET_STATE_PRELIGHT, &palette->menu_and_bars_fore);
-	  lives_widget_set_fg_color (label, LIVES_WIDGET_STATE_PRELIGHT, &palette->menu_and_bars_fore);
-	  lives_widget_set_fg_color (arrow, LIVES_WIDGET_STATE_PRELIGHT, &palette->menu_and_bars_fore);
-	  lives_widget_set_fg_color (checkbutton, LIVES_WIDGET_STATE_PRELIGHT, &palette->menu_and_bars_fore);
-	}
-	else {
-	  lives_widget_set_bg_color (labelbox, LIVES_WIDGET_STATE_PRELIGHT, &palette->normal_back);
-	  lives_widget_set_bg_color (ahbox, LIVES_WIDGET_STATE_PRELIGHT, &palette->normal_back);
-	  lives_widget_set_bg_color (checkbutton, LIVES_WIDGET_STATE_PRELIGHT, &palette->normal_back);
-	  lives_widget_set_fg_color (labelbox, LIVES_WIDGET_STATE_PRELIGHT, &palette->normal_fore);
-	  lives_widget_set_fg_color (ahbox, LIVES_WIDGET_STATE_PRELIGHT, &palette->normal_fore);
-	  lives_widget_set_fg_color (checkbutton, LIVES_WIDGET_STATE_PRELIGHT, &palette->normal_fore);
-	  lives_widget_set_fg_color (label, LIVES_WIDGET_STATE_PRELIGHT, &palette->normal_fore);
-	  lives_widget_set_fg_color (arrow, LIVES_WIDGET_STATE_PRELIGHT, &palette->normal_fore);
-	  lives_widget_set_fg_color (checkbutton, LIVES_WIDGET_STATE_PRELIGHT, &palette->normal_fore);
-	}
+        lives_widget_set_bg_color(labelbox, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+        lives_widget_set_fg_color(labelbox, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
+        lives_widget_set_bg_color(ahbox, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+        lives_widget_set_fg_color(ahbox, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
+        lives_widget_set_bg_color(checkbutton, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+        lives_widget_set_fg_color(checkbutton, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
+        lives_widget_set_bg_color(label, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+        lives_widget_set_fg_color(label, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
+        lives_widget_set_bg_color(arrow, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+        lives_widget_set_fg_color(arrow, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
+        if (palette->style&STYLE_3) {
+          lives_widget_set_bg_color(labelbox, LIVES_WIDGET_STATE_PRELIGHT, &palette->menu_and_bars);
+          lives_widget_set_bg_color(ahbox, LIVES_WIDGET_STATE_PRELIGHT, &palette->menu_and_bars);
+          lives_widget_set_bg_color(checkbutton, LIVES_WIDGET_STATE_PRELIGHT, &palette->menu_and_bars);
+          lives_widget_set_fg_color(labelbox, LIVES_WIDGET_STATE_PRELIGHT, &palette->menu_and_bars_fore);
+          lives_widget_set_fg_color(ahbox, LIVES_WIDGET_STATE_PRELIGHT, &palette->menu_and_bars_fore);
+          lives_widget_set_fg_color(checkbutton, LIVES_WIDGET_STATE_PRELIGHT, &palette->menu_and_bars_fore);
+          lives_widget_set_fg_color(label, LIVES_WIDGET_STATE_PRELIGHT, &palette->menu_and_bars_fore);
+          lives_widget_set_fg_color(arrow, LIVES_WIDGET_STATE_PRELIGHT, &palette->menu_and_bars_fore);
+          lives_widget_set_fg_color(checkbutton, LIVES_WIDGET_STATE_PRELIGHT, &palette->menu_and_bars_fore);
+        } else {
+          lives_widget_set_bg_color(labelbox, LIVES_WIDGET_STATE_PRELIGHT, &palette->normal_back);
+          lives_widget_set_bg_color(ahbox, LIVES_WIDGET_STATE_PRELIGHT, &palette->normal_back);
+          lives_widget_set_bg_color(checkbutton, LIVES_WIDGET_STATE_PRELIGHT, &palette->normal_back);
+          lives_widget_set_fg_color(labelbox, LIVES_WIDGET_STATE_PRELIGHT, &palette->normal_fore);
+          lives_widget_set_fg_color(ahbox, LIVES_WIDGET_STATE_PRELIGHT, &palette->normal_fore);
+          lives_widget_set_fg_color(checkbutton, LIVES_WIDGET_STATE_PRELIGHT, &palette->normal_fore);
+          lives_widget_set_fg_color(label, LIVES_WIDGET_STATE_PRELIGHT, &palette->normal_fore);
+          lives_widget_set_fg_color(arrow, LIVES_WIDGET_STATE_PRELIGHT, &palette->normal_fore);
+          lives_widget_set_fg_color(checkbutton, LIVES_WIDGET_STATE_PRELIGHT, &palette->normal_fore);
+        }
       }
 
 #ifdef ENABLE_GIW
       if (prefs->lamp_buttons) {
 #if GTK_CHECK_VERSION(3,0,0)
-	giw_led_set_rgba(GIW_LED(checkbutton),palette->light_green,palette->dark_red);
+        giw_led_set_rgba(GIW_LED(checkbutton),palette->light_green,palette->dark_red);
 #else
-	giw_led_set_colors(GIW_LED(checkbutton),palette->light_green,palette->dark_red);
+        giw_led_set_colors(GIW_LED(checkbutton),palette->light_green,palette->dark_red);
 #endif
       }
 #endif
 
 
-      g_object_set_data(G_OBJECT(labelbox),"layer_number",GINT_TO_POINTER(GPOINTER_TO_INT(g_object_get_data(G_OBJECT(eventbox),"layer_number"))));
+      lives_widget_object_set_data(LIVES_WIDGET_OBJECT(labelbox),"layer_number",
+                                   LIVES_INT_TO_POINTER(LIVES_POINTER_TO_INT
+                                       (lives_widget_object_get_data
+                                        (LIVES_WIDGET_OBJECT(eventbox),"layer_number"))));
+
+      lives_container_add(LIVES_CONTAINER(labelbox), hbox);
+      lives_box_pack_start(LIVES_BOX(hbox), checkbutton, FALSE, FALSE, 0);
+      lives_box_pack_start(LIVES_BOX(hbox), label, FALSE, FALSE, 0);
+      lives_container_add(LIVES_CONTAINER(ahbox), arrow);
 
-      lives_container_add (LIVES_CONTAINER (labelbox), hbox);
-      lives_box_pack_start (LIVES_BOX (hbox), checkbutton, FALSE, FALSE, 0);
-      lives_box_pack_start (LIVES_BOX (hbox), label, FALSE, FALSE, 0);
-      lives_container_add (LIVES_CONTAINER (ahbox), arrow);
+      lives_table_attach(LIVES_TABLE(mt->timeline_table), labelbox, 0, 6, rows, rows+1, LIVES_FILL, (LiVESAttachOptions)0, 0, 0);
+      lives_table_attach(LIVES_TABLE(mt->timeline_table), ahbox, 6, 7, rows, rows+1, LIVES_FILL, (LiVESAttachOptions)0, 0, 0);
 
-      lives_table_attach (LIVES_TABLE (mt->timeline_table), labelbox, 0, 6, rows, rows+1, LIVES_FILL, (LiVESAttachOptions)0, 0, 0);
-      lives_table_attach (LIVES_TABLE (mt->timeline_table), ahbox, 6, 7, rows, rows+1, LIVES_FILL, (LiVESAttachOptions)0, 0, 0);
-      
-      g_object_set_data (G_OBJECT(eventbox),"labelbox",labelbox);
-      g_object_set_data (G_OBJECT(eventbox),"ahbox",ahbox);
-      g_object_set_data (G_OBJECT(ahbox),"eventbox",eventbox);
+      lives_widget_object_set_data(LIVES_WIDGET_OBJECT(eventbox),"labelbox",labelbox);
+      lives_widget_object_set_data(LIVES_WIDGET_OBJECT(eventbox),"ahbox",ahbox);
+      lives_widget_object_set_data(LIVES_WIDGET_OBJECT(ahbox),"eventbox",eventbox);
 
-      lives_table_attach (LIVES_TABLE (mt->timeline_table), eventbox, 7, 40, rows, rows+1,
-			(LiVESAttachOptions) (LIVES_EXPAND | LIVES_FILL),
-			(LiVESAttachOptions) (LIVES_FILL), 0, 0);
+      lives_table_attach(LIVES_TABLE(mt->timeline_table), eventbox, 7, 40, rows, rows+1,
+                         (LiVESAttachOptions)(LIVES_EXPAND | LIVES_FILL),
+                         (LiVESAttachOptions)(LIVES_FILL), 0, 0);
 
       if (!prefs->lamp_buttons) {
-	lives_signal_connect_after (LIVES_GUI_OBJECT (checkbutton), LIVES_WIDGET_TOGGLED_EVENT,
-					      LIVES_GUI_CALLBACK (on_seltrack_toggled),
-					      mt);
-      }
-      else {
-	lives_signal_connect_after (LIVES_GUI_OBJECT (checkbutton), "mode-changed",
-				LIVES_GUI_CALLBACK (on_seltrack_toggled),
-				mt);
+        lives_signal_connect_after(LIVES_GUI_OBJECT(checkbutton), LIVES_WIDGET_TOGGLED_SIGNAL,
+                                   LIVES_GUI_CALLBACK(on_seltrack_toggled),
+                                   mt);
+      } else {
+        lives_signal_connect_after(LIVES_GUI_OBJECT(checkbutton), LIVES_WIDGET_MODE_CHANGED_SIGNAL,
+                                   LIVES_GUI_CALLBACK(on_seltrack_toggled),
+                                   mt);
       }
 
-      lives_signal_connect (LIVES_GUI_OBJECT (labelbox), "button_press_event",
-			LIVES_GUI_CALLBACK (track_ebox_pressed),
-			(gpointer)mt);
+      lives_signal_connect(LIVES_GUI_OBJECT(labelbox), LIVES_WIDGET_BUTTON_PRESS_EVENT,
+                           LIVES_GUI_CALLBACK(track_ebox_pressed),
+                           (livespointer)mt);
 
       lives_widget_set_bg_color(eventbox, LIVES_WIDGET_STATE_NORMAL, &palette->white);
       lives_widget_set_app_paintable(eventbox,TRUE);
-      lives_signal_connect (LIVES_GUI_OBJECT (eventbox), LIVES_WIDGET_EXPOSE_EVENT,
-			LIVES_GUI_CALLBACK (expose_track_event),
-			(gpointer)mt);
-      lives_widget_set_app_paintable(eventbox,TRUE);
-
-      lives_signal_connect (LIVES_GUI_OBJECT (eventbox), "button_press_event",
-			LIVES_GUI_CALLBACK (on_track_click),
-			(gpointer)mt);
-      lives_signal_connect (LIVES_GUI_OBJECT (eventbox), "button_release_event",
-			LIVES_GUI_CALLBACK (on_track_release),
-			(gpointer)mt);
-
-      lives_signal_connect (LIVES_GUI_OBJECT (ahbox), "button_press_event",
-			LIVES_GUI_CALLBACK (track_arrow_pressed),
-			(gpointer)mt);
+      lives_signal_connect(LIVES_GUI_OBJECT(eventbox), LIVES_WIDGET_EXPOSE_EVENT,
+                           LIVES_GUI_CALLBACK(expose_track_event),
+                           (livespointer)mt);
+
+      lives_signal_connect(LIVES_GUI_OBJECT(eventbox), LIVES_WIDGET_BUTTON_PRESS_EVENT,
+                           LIVES_GUI_CALLBACK(on_track_click),
+                           (livespointer)mt);
+      lives_signal_connect(LIVES_GUI_OBJECT(eventbox), LIVES_WIDGET_BUTTON_RELEASE_EVENT,
+                           LIVES_GUI_CALLBACK(on_track_release),
+                           (livespointer)mt);
+
+      lives_signal_connect(LIVES_GUI_OBJECT(ahbox), LIVES_WIDGET_BUTTON_PRESS_EVENT,
+                           LIVES_GUI_CALLBACK(track_arrow_pressed),
+                           (livespointer)mt);
       rows++;
 
       if (rows==mt->max_disp_vtracks) break;
 
 
-      if (mt->opts.pertrack_audio&&g_object_get_data(G_OBJECT(eventbox),"expanded")) {
+      if (mt->opts.pertrack_audio&&lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"expanded")) {
 
-	aeventbox=LIVES_WIDGET(g_object_get_data(G_OBJECT(eventbox),"atrack"));
+        aeventbox=LIVES_WIDGET(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"atrack"));
 
-	hidden=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(aeventbox),"hidden"))&TRACK_I_HIDDEN_USER;
-	g_object_set_data(G_OBJECT(aeventbox),"hidden",GINT_TO_POINTER(hidden));
+        hidden=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(aeventbox),"hidden"))&TRACK_I_HIDDEN_USER;
+        lives_widget_object_set_data(LIVES_WIDGET_OBJECT(aeventbox),"hidden",LIVES_INT_TO_POINTER(hidden));
 
 
-	if (hidden==0) {
-	  lives_adjustment_set_page_size(LIVES_ADJUSTMENT(mt->vadjustment),
-					 (double)((int)lives_adjustment_get_page_size(LIVES_ADJUSTMENT(mt->vadjustment))-1));
-	    
-	  expanded=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(aeventbox),"expanded"));
-	    
-	  label=(LIVES_WIDGET(g_object_get_data(G_OBJECT(aeventbox),"label")));
-	  arrow=(LIVES_WIDGET(g_object_get_data(G_OBJECT(aeventbox),"arrow")));
-	  
-	  labelbox=lives_event_box_new();
-	  hbox=lives_hbox_new(FALSE,widget_opts.packing_width);
-	  ahbox=lives_event_box_new();
-	  
-	  lives_widget_set_state(label,LIVES_WIDGET_STATE_NORMAL);
-	  lives_widget_set_state(arrow,LIVES_WIDGET_STATE_NORMAL);
-
-	  lives_widget_set_bg_color(LIVES_WIDGET(aeventbox), LIVES_WIDGET_STATE_NORMAL, &palette->white);
-	  
-	  if (palette->style&STYLE_1) {
-	    lives_widget_set_bg_color (labelbox, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
-	    lives_widget_set_fg_color (labelbox, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
-	    if (palette->style&STYLE_3) {
-	      lives_widget_set_bg_color (labelbox, LIVES_WIDGET_STATE_PRELIGHT, &palette->menu_and_bars);
-	      lives_widget_set_bg_color (ahbox, LIVES_WIDGET_STATE_PRELIGHT, &palette->menu_and_bars);
-	      lives_widget_set_fg_color (labelbox, LIVES_WIDGET_STATE_PRELIGHT, &palette->menu_and_bars_fore);
-	      lives_widget_set_fg_color (ahbox, LIVES_WIDGET_STATE_PRELIGHT, &palette->menu_and_bars_fore);
-	      lives_widget_set_fg_color (label, LIVES_WIDGET_STATE_PRELIGHT, &palette->menu_and_bars_fore);
-	      lives_widget_set_fg_color (arrow, LIVES_WIDGET_STATE_PRELIGHT, &palette->menu_and_bars_fore);
-	    }
-	    else {
-	      lives_widget_set_bg_color (labelbox, LIVES_WIDGET_STATE_PRELIGHT, &palette->normal_back);
-	      lives_widget_set_bg_color (ahbox, LIVES_WIDGET_STATE_PRELIGHT, &palette->normal_back);
-	      lives_widget_set_fg_color (labelbox, LIVES_WIDGET_STATE_PRELIGHT, &palette->normal_fore);
-	      lives_widget_set_fg_color (ahbox, LIVES_WIDGET_STATE_PRELIGHT, &palette->normal_fore);
-	      lives_widget_set_fg_color (label, LIVES_WIDGET_STATE_PRELIGHT, &palette->normal_fore);
-	      lives_widget_set_fg_color (arrow, LIVES_WIDGET_STATE_PRELIGHT, &palette->normal_fore);
-	    }
-	  }
-	  
-	  lives_container_add (LIVES_CONTAINER (labelbox), hbox);
-	  lives_box_pack_start (LIVES_BOX (hbox), label, FALSE, FALSE, 0);
-	  lives_container_add (LIVES_CONTAINER (ahbox), arrow);
-	  
-	  lives_table_attach (LIVES_TABLE (mt->timeline_table), labelbox, 1, 6, rows, rows+1, LIVES_FILL, (LiVESAttachOptions)0, 0, 0);
-	  lives_table_attach (LIVES_TABLE (mt->timeline_table), ahbox, 6, 7, rows, rows+1, LIVES_FILL, (LiVESAttachOptions)0, 0, 0);
-	  
-	  g_object_set_data (G_OBJECT(aeventbox),"labelbox",labelbox);
-	  g_object_set_data (G_OBJECT(aeventbox),"ahbox",ahbox);
-	  g_object_set_data (G_OBJECT(ahbox),"eventbox",aeventbox);
-	  g_object_set_data(G_OBJECT(labelbox),"layer_number",GINT_TO_POINTER(GPOINTER_TO_INT(g_object_get_data(G_OBJECT(eventbox),"layer_number"))));
-	  
-	  lives_signal_connect (LIVES_GUI_OBJECT (labelbox), "button_press_event",
-			    LIVES_GUI_CALLBACK (atrack_ebox_pressed),
-			    (gpointer)mt);
-	  
-	  lives_signal_connect (LIVES_GUI_OBJECT (ahbox), "button_press_event",
-			    LIVES_GUI_CALLBACK (track_arrow_pressed),
-			    (gpointer)mt);
-	  
-	  lives_table_attach (LIVES_TABLE (mt->timeline_table), aeventbox, 7, 40, rows, rows+1,
-			    (LiVESAttachOptions) (LIVES_EXPAND | LIVES_FILL),
-			    (LiVESAttachOptions) (LIVES_FILL), 0, 0);
-	  
-	  lives_signal_connect (LIVES_GUI_OBJECT (aeventbox), "button_press_event",
-			    LIVES_GUI_CALLBACK (on_track_click),
-			    (gpointer)mt);
-	  lives_signal_connect (LIVES_GUI_OBJECT (aeventbox), "button_release_event",
-			    LIVES_GUI_CALLBACK (on_track_release),
-			    (gpointer)mt);
-
-	  lives_widget_set_bg_color(aeventbox, LIVES_WIDGET_STATE_NORMAL, &palette->white);
-	  lives_widget_set_app_paintable(aeventbox,TRUE);
-	  lives_signal_connect (LIVES_GUI_OBJECT (aeventbox), LIVES_WIDGET_EXPOSE_EVENT,
-			    LIVES_GUI_CALLBACK (expose_track_event),
-			    (gpointer)mt);
-	  
-
-	  rows++;
-
-	  if (rows==mt->max_disp_vtracks) break;
-
-	  if (expanded) {
-	    xeventbox=(LiVESWidget *)g_object_get_data(G_OBJECT(aeventbox),"achan0");
-	    hidden=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(xeventbox),"hidden"))&TRACK_I_HIDDEN_USER;
-	    g_object_set_data(G_OBJECT(xeventbox),"hidden",GINT_TO_POINTER(hidden));
-	    
-	    if (hidden==0) {
-	      lives_adjustment_set_page_size(LIVES_ADJUSTMENT(mt->vadjustment),
-					     (double)((int)lives_adjustment_get_page_size(LIVES_ADJUSTMENT(mt->vadjustment))-1));
-
-
-	      lives_table_attach (LIVES_TABLE (mt->timeline_table), xeventbox, 7, 40, rows, rows+1,
-				(LiVESAttachOptions) (LIVES_EXPAND | LIVES_FILL),
-				(LiVESAttachOptions) (LIVES_FILL), 0, 0);
-	      
-	      lives_widget_set_bg_color(xeventbox, LIVES_WIDGET_STATE_NORMAL, &palette->white);
-	      lives_widget_set_app_paintable(xeventbox,TRUE);
-	      lives_signal_connect (LIVES_GUI_OBJECT (xeventbox), LIVES_WIDGET_EXPOSE_EVENT,
-				LIVES_GUI_CALLBACK (mt_expose_audtrack_event),
-				(gpointer)mt);
-	      
-	      rows++;
-	      if (rows==mt->max_disp_vtracks) break;
-	    }
-
-	    if (cfile->achans>1) {
-	      xeventbox=(LiVESWidget *)g_object_get_data(G_OBJECT(aeventbox),"achan1");
-	      hidden=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(xeventbox),"hidden"))&TRACK_I_HIDDEN_USER;
-	      g_object_set_data(G_OBJECT(xeventbox),"hidden",GINT_TO_POINTER(hidden));
-	      
-	      if (hidden==0) {
-		lives_adjustment_set_page_size(LIVES_ADJUSTMENT(mt->vadjustment),
-					       (double)((int)lives_adjustment_get_page_size(LIVES_ADJUSTMENT(mt->vadjustment))-1));
-		
-		lives_table_attach (LIVES_TABLE (mt->timeline_table), xeventbox, 7, 40, rows, rows+1,
-				  (LiVESAttachOptions) (LIVES_EXPAND | LIVES_FILL),
-				  (LiVESAttachOptions) (LIVES_FILL), 0, 0);
-		
-		lives_widget_set_bg_color(xeventbox, LIVES_WIDGET_STATE_NORMAL, &palette->white);
-		lives_widget_set_app_paintable(xeventbox,TRUE);
-		lives_signal_connect (LIVES_GUI_OBJECT (xeventbox), LIVES_WIDGET_EXPOSE_EVENT,
-				  LIVES_GUI_CALLBACK (mt_expose_audtrack_event),
-				  (gpointer)mt);
-		
-		
-		rows++;
-		if (rows==mt->max_disp_vtracks) break;
-
-	      }
-	    }
-	  }
-	}
+        if (hidden==0) {
+          lives_adjustment_set_page_size(LIVES_ADJUSTMENT(mt->vadjustment),
+                                         (double)((int)lives_adjustment_get_page_size(LIVES_ADJUSTMENT(mt->vadjustment))-1));
+
+          expanded=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(aeventbox),"expanded"));
+
+          label=(LIVES_WIDGET(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(aeventbox),"label")));
+          arrow=(LIVES_WIDGET(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(aeventbox),"arrow")));
+
+          labelbox=lives_event_box_new();
+          hbox=lives_hbox_new(FALSE,widget_opts.packing_width);
+          ahbox=lives_event_box_new();
+
+          lives_widget_set_state(label,LIVES_WIDGET_STATE_NORMAL);
+          lives_widget_set_state(arrow,LIVES_WIDGET_STATE_NORMAL);
+
+          lives_widget_set_bg_color(LIVES_WIDGET(aeventbox), LIVES_WIDGET_STATE_NORMAL, &palette->white);
+
+          if (palette->style&STYLE_1) {
+
+            if (labelbox!=NULL) {
+              lives_widget_set_bg_color(labelbox, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+              lives_widget_set_fg_color(labelbox, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
+            }
+            if (ahbox!=NULL) {
+              lives_widget_set_bg_color(ahbox, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+              lives_widget_set_fg_color(ahbox, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
+            }
+            lives_widget_set_fg_color(label, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
+            lives_widget_set_fg_color(arrow, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
+            lives_widget_set_bg_color(label, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+            lives_widget_set_bg_color(arrow, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+            if (palette->style&STYLE_3) {
+              if (labelbox!=NULL) {
+                lives_widget_set_bg_color(labelbox, LIVES_WIDGET_STATE_PRELIGHT, &palette->menu_and_bars);
+                lives_widget_set_fg_color(labelbox, LIVES_WIDGET_STATE_PRELIGHT, &palette->menu_and_bars_fore);
+              }
+              if (ahbox!=NULL) {
+                lives_widget_set_bg_color(ahbox, LIVES_WIDGET_STATE_PRELIGHT, &palette->menu_and_bars);
+                lives_widget_set_fg_color(ahbox, LIVES_WIDGET_STATE_PRELIGHT, &palette->menu_and_bars_fore);
+              }
+              lives_widget_set_bg_color(label, LIVES_WIDGET_STATE_PRELIGHT, &palette->menu_and_bars);
+              lives_widget_set_bg_color(arrow, LIVES_WIDGET_STATE_PRELIGHT, &palette->menu_and_bars);
+              lives_widget_set_fg_color(label, LIVES_WIDGET_STATE_PRELIGHT, &palette->menu_and_bars_fore);
+              lives_widget_set_fg_color(arrow, LIVES_WIDGET_STATE_PRELIGHT, &palette->menu_and_bars_fore);
+            } else {
+              if (labelbox!=NULL) {
+                lives_widget_set_bg_color(labelbox, LIVES_WIDGET_STATE_PRELIGHT, &palette->normal_back);
+                lives_widget_set_fg_color(labelbox, LIVES_WIDGET_STATE_PRELIGHT, &palette->normal_fore);
+              }
+              if (ahbox!=NULL) {
+                lives_widget_set_bg_color(ahbox, LIVES_WIDGET_STATE_PRELIGHT, &palette->normal_back);
+                lives_widget_set_fg_color(ahbox, LIVES_WIDGET_STATE_PRELIGHT, &palette->normal_fore);
+              }
+              lives_widget_set_fg_color(label, LIVES_WIDGET_STATE_PRELIGHT, &palette->normal_fore);
+              lives_widget_set_fg_color(arrow, LIVES_WIDGET_STATE_PRELIGHT, &palette->normal_fore);
+              lives_widget_set_bg_color(label, LIVES_WIDGET_STATE_PRELIGHT, &palette->normal_back);
+              lives_widget_set_bg_color(arrow, LIVES_WIDGET_STATE_PRELIGHT, &palette->normal_back);
+            }
+          }
+
+          lives_container_add(LIVES_CONTAINER(labelbox), hbox);
+          lives_box_pack_start(LIVES_BOX(hbox), label, FALSE, FALSE, 0);
+          lives_container_add(LIVES_CONTAINER(ahbox), arrow);
+
+          lives_table_attach(LIVES_TABLE(mt->timeline_table), labelbox, 1, 6, rows, rows+1, LIVES_FILL, (LiVESAttachOptions)0, 0, 0);
+          lives_table_attach(LIVES_TABLE(mt->timeline_table), ahbox, 6, 7, rows, rows+1, LIVES_FILL, (LiVESAttachOptions)0, 0, 0);
+
+          lives_widget_object_set_data(LIVES_WIDGET_OBJECT(aeventbox),"labelbox",labelbox);
+          lives_widget_object_set_data(LIVES_WIDGET_OBJECT(aeventbox),"ahbox",ahbox);
+          lives_widget_object_set_data(LIVES_WIDGET_OBJECT(ahbox),"eventbox",aeventbox);
+          lives_widget_object_set_data(LIVES_WIDGET_OBJECT(labelbox),"layer_number",
+                                       LIVES_INT_TO_POINTER(LIVES_POINTER_TO_INT
+                                           (lives_widget_object_get_data
+                                            (LIVES_WIDGET_OBJECT(eventbox),"layer_number"))));
+
+          lives_signal_connect(LIVES_GUI_OBJECT(labelbox), LIVES_WIDGET_BUTTON_PRESS_EVENT,
+                               LIVES_GUI_CALLBACK(atrack_ebox_pressed),
+                               (livespointer)mt);
+
+          lives_signal_connect(LIVES_GUI_OBJECT(ahbox), LIVES_WIDGET_BUTTON_PRESS_EVENT,
+                               LIVES_GUI_CALLBACK(track_arrow_pressed),
+                               (livespointer)mt);
+
+          lives_table_attach(LIVES_TABLE(mt->timeline_table), aeventbox, 7, 40, rows, rows+1,
+                             (LiVESAttachOptions)(LIVES_EXPAND | LIVES_FILL),
+                             (LiVESAttachOptions)(LIVES_FILL), 0, 0);
+
+          lives_signal_connect(LIVES_GUI_OBJECT(aeventbox), LIVES_WIDGET_BUTTON_PRESS_EVENT,
+                               LIVES_GUI_CALLBACK(on_track_click),
+                               (livespointer)mt);
+          lives_signal_connect(LIVES_GUI_OBJECT(aeventbox), LIVES_WIDGET_BUTTON_RELEASE_EVENT,
+                               LIVES_GUI_CALLBACK(on_track_release),
+                               (livespointer)mt);
+
+          lives_widget_set_bg_color(aeventbox, LIVES_WIDGET_STATE_NORMAL, &palette->white);
+          lives_widget_set_app_paintable(aeventbox,TRUE);
+          lives_signal_connect(LIVES_GUI_OBJECT(aeventbox), LIVES_WIDGET_EXPOSE_EVENT,
+                               LIVES_GUI_CALLBACK(expose_track_event),
+                               (livespointer)mt);
+
+
+          rows++;
+
+          if (rows==mt->max_disp_vtracks) break;
+
+          if (expanded) {
+            xeventbox=(LiVESWidget *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(aeventbox),"achan0");
+            hidden=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(xeventbox),"hidden"))&TRACK_I_HIDDEN_USER;
+            lives_widget_object_set_data(LIVES_WIDGET_OBJECT(xeventbox),"hidden",LIVES_INT_TO_POINTER(hidden));
+
+            if (hidden==0) {
+              lives_adjustment_set_page_size(LIVES_ADJUSTMENT(mt->vadjustment),
+                                             (double)((int)lives_adjustment_get_page_size(LIVES_ADJUSTMENT(mt->vadjustment))-1));
+
+
+              lives_table_attach(LIVES_TABLE(mt->timeline_table), xeventbox, 7, 40, rows, rows+1,
+                                 (LiVESAttachOptions)(LIVES_EXPAND | LIVES_FILL),
+                                 (LiVESAttachOptions)(LIVES_FILL), 0, 0);
+
+              lives_widget_set_bg_color(xeventbox, LIVES_WIDGET_STATE_NORMAL, &palette->white);
+              lives_widget_set_app_paintable(xeventbox,TRUE);
+              lives_signal_connect(LIVES_GUI_OBJECT(xeventbox), LIVES_WIDGET_EXPOSE_EVENT,
+                                   LIVES_GUI_CALLBACK(mt_expose_audtrack_event),
+                                   (livespointer)mt);
+
+              rows++;
+              if (rows==mt->max_disp_vtracks) break;
+            }
+
+            if (cfile->achans>1) {
+              xeventbox=(LiVESWidget *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(aeventbox),"achan1");
+              hidden=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(xeventbox),"hidden"))&TRACK_I_HIDDEN_USER;
+              lives_widget_object_set_data(LIVES_WIDGET_OBJECT(xeventbox),"hidden",LIVES_INT_TO_POINTER(hidden));
+
+              if (hidden==0) {
+                lives_adjustment_set_page_size(LIVES_ADJUSTMENT(mt->vadjustment),
+                                               (double)((int)lives_adjustment_get_page_size(LIVES_ADJUSTMENT(mt->vadjustment))-1));
+
+                lives_table_attach(LIVES_TABLE(mt->timeline_table), xeventbox, 7, 40, rows, rows+1,
+                                   (LiVESAttachOptions)(LIVES_EXPAND | LIVES_FILL),
+                                   (LiVESAttachOptions)(LIVES_FILL), 0, 0);
+
+                lives_widget_set_bg_color(xeventbox, LIVES_WIDGET_STATE_NORMAL, &palette->white);
+                lives_widget_set_app_paintable(xeventbox,TRUE);
+                lives_signal_connect(LIVES_GUI_OBJECT(xeventbox), LIVES_WIDGET_EXPOSE_EVENT,
+                                     LIVES_GUI_CALLBACK(mt_expose_audtrack_event),
+                                     (livespointer)mt);
+
+
+                rows++;
+                if (rows==mt->max_disp_vtracks) break;
+
+              }
+            }
+          }
+        }
       }
     }
     vdraws=vdraws->next;
   }
-  
 
-  if (lives_adjustment_get_page_size(LIVES_ADJUSTMENT(mt->vadjustment))<1.) 
+
+  if (lives_adjustment_get_page_size(LIVES_ADJUSTMENT(mt->vadjustment))<1.)
     lives_adjustment_set_page_size(LIVES_ADJUSTMENT(mt->vadjustment),1.);
 
   lives_adjustment_set_upper(LIVES_ADJUSTMENT(mt->vadjustment),
-			     (double)(get_top_track_for(mt,mt->num_video_tracks-1)+
-				      (int)lives_adjustment_get_page_size(LIVES_ADJUSTMENT(mt->vadjustment))));
+                             (double)(get_top_track_for(mt,mt->num_video_tracks-1)+
+                                      (int)lives_adjustment_get_page_size(LIVES_ADJUSTMENT(mt->vadjustment))));
 
 
   if (lives_adjustment_get_value(LIVES_ADJUSTMENT(mt->vadjustment))+lives_adjustment_get_page_size(LIVES_ADJUSTMENT(mt->vadjustment))>
       lives_adjustment_get_upper(LIVES_ADJUSTMENT(mt->vadjustment)))
     lives_adjustment_set_upper(LIVES_ADJUSTMENT(mt->vadjustment),lives_adjustment_get_value(LIVES_ADJUSTMENT(mt->vadjustment))+
-			       lives_adjustment_get_page_size(LIVES_ADJUSTMENT(mt->vadjustment)));
+                               lives_adjustment_get_page_size(LIVES_ADJUSTMENT(mt->vadjustment)));
 
   xlist=table_children=lives_container_get_children(LIVES_CONTAINER(mt->timeline_table));
 
   while (table_children!=NULL) {
-    //GtkRequisition req;
+    //LiVESRequisition req;
     LiVESWidget *child=(LiVESWidget *)table_children->data;
     //req=child->requisition;
     lives_widget_set_size_request(child,-1,MT_TRACK_HEIGHT);
     table_children=table_children->next;
   }
 
-  if (xlist!=NULL) g_list_free(xlist);
+  if (xlist!=NULL) lives_list_free(xlist);
 
   lives_widget_show_all(mt->timeline_table);
-  lives_widget_queue_draw (mt->vpaned);
+  lives_widget_queue_draw(mt->vpaned);
+
+  if (mt->is_ready) {
+    mt->no_expose=FALSE;
+    lives_widget_context_update();
+  }
 
 }
 
 
 
-boolean track_arrow_pressed (LiVESWidget *ebox, LiVESXEventButton *event, gpointer user_data) {
-  LiVESWidget *eventbox=(LiVESWidget *)g_object_get_data(G_OBJECT(ebox),"eventbox");
-  LiVESWidget *arrow=(LiVESWidget *)g_object_get_data(G_OBJECT(eventbox),"arrow"),*new_arrow;
+boolean track_arrow_pressed(LiVESWidget *ebox, LiVESXEventButton *event, livespointer user_data) {
+  LiVESWidget *eventbox=(LiVESWidget *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(ebox),"eventbox");
+  LiVESWidget *arrow=(LiVESWidget *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"arrow"),*new_arrow;
   lives_mt *mt=(lives_mt *)user_data;
-  boolean expanded=!(g_object_get_data(G_OBJECT(eventbox),"expanded"));
+  boolean expanded=!(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"expanded"));
+
+  if (!mainw->interactive) return FALSE;
 
   if (mt->audio_draws==NULL||(!mt->opts.pertrack_audio&&(mt->opts.back_audio_tracks==0||
-							 eventbox!=mt->audio_draws->data))) {
+                              eventbox!=mt->audio_draws->data))) {
     track_ebox_pressed(eventbox,NULL,mt);
     return FALSE;
   }
 
-  g_object_set_data(G_OBJECT(eventbox),"expanded",GINT_TO_POINTER(expanded));
+  lives_widget_object_set_data(LIVES_WIDGET_OBJECT(eventbox),"expanded",LIVES_INT_TO_POINTER(expanded));
 
   if (!expanded) {
-    new_arrow = lives_arrow_new (LIVES_ARROW_RIGHT, LIVES_SHADOW_OUT);
-  }
-  else {
-    new_arrow = lives_arrow_new (LIVES_ARROW_DOWN, LIVES_SHADOW_OUT);
+    new_arrow = lives_arrow_new(LIVES_ARROW_RIGHT, LIVES_SHADOW_OUT);
+  } else {
+    new_arrow = lives_arrow_new(LIVES_ARROW_DOWN, LIVES_SHADOW_OUT);
   }
 
 
   lives_object_ref(new_arrow);
 
-  g_object_set_data(G_OBJECT(eventbox),"arrow",new_arrow);
+  lives_widget_object_set_data(LIVES_WIDGET_OBJECT(eventbox),"arrow",new_arrow);
 
   lives_tooltips_copy(new_arrow,arrow);
 
@@ -2502,22 +2622,26 @@
 
 
 
-void multitrack_view_clips (LiVESMenuItem *menuitem, gpointer user_data) {
+void multitrack_view_clips(LiVESMenuItem *menuitem, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
-  polymorph (mt,POLY_CLIPS);
+  polymorph(mt,POLY_CLIPS);
 }
 
 
-void multitrack_view_in_out (LiVESMenuItem *menuitem, gpointer user_data) {
+void multitrack_view_in_out(LiVESMenuItem *menuitem, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   if (mt->block_selected==NULL) return;
-  if (!nb_ignore) polymorph (mt,POLY_IN_OUT);
+  if (!nb_ignore) {
+    // workaround for...you guessed it....the wonderful gtk+
+    polymorph(mt,POLY_IN_OUT);
+    polymorph(mt,POLY_CLIPS);
+    polymorph(mt,POLY_IN_OUT);
+  }
 }
 
-
-static void time_to_string (lives_mt *mt, double secs, int length) {
+static void time_to_string(lives_mt *mt, double secs, int length) {
   int hours,mins,rest;
-  gchar *string;
+  char *string;
 
   hours=secs/3600;
   secs-=hours*3600.;
@@ -2525,16 +2649,16 @@
   secs-=mins*60.;
   rest=(secs-((int)secs)*1.)*100.+.5;
   secs=(int)secs*1.;
-  string=g_strdup_printf("   %02d:%02d:%02d.%02d",hours,mins,(int)secs,rest);
-  lives_entry_set_text (LIVES_ENTRY (mt->timecode),string);
-  g_free(string);
+  string=lives_strdup_printf("   %02d:%02d:%02d.%02d",hours,mins,(int)secs,rest);
+  lives_entry_set_text(LIVES_ENTRY(mt->timecode),string);
+  lives_free(string);
 }
 
 
 static void renumber_clips(void) {
   // remove gaps in our mainw->files array - caused when clips are closed
   // we also ensure each clip has a (non-zero) 64 bit unique_id to help with later id of the clips
-  // this is not strictly necessary any more, since we now track clips in the layout by 
+  // this is not strictly necessary any more, since we now track clips in the layout by
   // handle and unique id
 
   // however, it helps to keep the numbers low if many files have been closed
@@ -2544,7 +2668,7 @@
   int cclip;
   int i=1,j;
 
-  GList *clist;
+  LiVESList *clist;
 
   boolean bad_header=FALSE;
 
@@ -2556,35 +2680,35 @@
   // if we find a gap we move i to cclip
 
 
-  for (cclip=1;i<=MAX_FILES;cclip++) {
+  for (cclip=1; i<=MAX_FILES; cclip++) {
     if (mainw->files[cclip]==NULL) {
 
       if (i!=cclip) {
-	mainw->files[cclip]=mainw->files[i];
+        mainw->files[cclip]=mainw->files[i];
 
-	for (j=0;j<FN_KEYS-1;j++) {
-	  if (mainw->clipstore[j]==i) mainw->clipstore[j]=cclip;
-	}
-
-	// we need to change the entries in mainw->cliplist
-	clist=mainw->cliplist;
-	while (clist!=NULL) {
-	  if (GPOINTER_TO_INT(clist->data)==i) {
-	    clist->data=GINT_TO_POINTER(cclip);
-	    break;
-	  }
-	  clist=clist->next;
-	}
-
-	mainw->files[i]=NULL;
-	
-	if (mainw->scrap_file==i) mainw->scrap_file=cclip;
-	if (mainw->ascrap_file==i) mainw->ascrap_file=cclip;
-	if (mainw->current_file==i) mainw->current_file=cclip;
+        for (j=0; j<FN_KEYS-1; j++) {
+          if (mainw->clipstore[j]==i) mainw->clipstore[j]=cclip;
+        }
+
+        // we need to change the entries in mainw->cliplist
+        clist=mainw->cliplist;
+        while (clist!=NULL) {
+          if (LIVES_POINTER_TO_INT(clist->data)==i) {
+            clist->data=LIVES_INT_TO_POINTER(cclip);
+            break;
+          }
+          clist=clist->next;
+        }
+
+        mainw->files[i]=NULL;
+
+        if (mainw->scrap_file==i) mainw->scrap_file=cclip;
+        if (mainw->ascrap_file==i) mainw->ascrap_file=cclip;
+        if (mainw->current_file==i) mainw->current_file=cclip;
 
-	if (mainw->first_free_file==cclip) mainw->first_free_file++;
+        if (mainw->first_free_file==cclip) mainw->first_free_file++;
 
-	renumbered_clips[i]=cclip;
+        renumbered_clips[i]=cclip;
 
       }
       // process this clip again
@@ -2597,8 +2721,8 @@
     }
 
     if (mainw->files[cclip]!=NULL&&cclip!=mainw->scrap_file&&cclip!=mainw->ascrap_file&&
-	(mainw->files[cclip]->clip_type==CLIP_TYPE_DISK||mainw->files[cclip]->clip_type==CLIP_TYPE_FILE)&&
-	mainw->files[cclip]->unique_id==0l) {
+        (mainw->files[cclip]->clip_type==CLIP_TYPE_DISK||mainw->files[cclip]->clip_type==CLIP_TYPE_FILE)&&
+        mainw->files[cclip]->unique_id==0l) {
       mainw->files[cclip]->unique_id=lives_random();
       save_clip_value(cclip,CLIP_DETAILS_UNIQUE_ID,&mainw->files[cclip]->unique_id);
       if (mainw->com_failed||mainw->write_failed) bad_header=TRUE;
@@ -2606,7 +2730,7 @@
       if (bad_header) do_header_write_error(cclip);
     }
 
-    for (;i<=MAX_FILES;i++) {
+    for (; i<=MAX_FILES; i++) {
       if (mainw->files[i]!=NULL) break;
     }
   }
@@ -2623,13 +2747,13 @@
 
 
 
-  GList *lmap;
+  LiVESList *lmap;
   int i,rnc;
-  gchar **array;
+  char **array;
 
   renumbered_clips[0]=0;
-  
-  for (i=1;i<=MAX_FILES&&mainw->files[i]!=NULL;i++) {
+
+  for (i=1; i<=MAX_FILES&&mainw->files[i]!=NULL; i++) {
     renumbered_clips[i]=0;
     if (mainw->files[i]!=NULL) lfps[i]=mainw->files[i]->fps;
     else lfps[i]=cfile->fps;
@@ -2637,47 +2761,46 @@
 
   if (lfile!=NULL) {
     // lfile is supplied layout file name
-    for (i=1;i<=MAX_FILES&&mainw->files[i]!=NULL;i++) {
+    for (i=1; i<=MAX_FILES&&mainw->files[i]!=NULL; i++) {
       lmap=mainw->files[i]->layout_map;
       while (lmap!=NULL) {
 
-	// lmap->data starts with layout name
-	if (!strncmp((gchar *)lmap->data,lfile,strlen(lfile))) {
-	  threaded_dialog_spin();
-	  array=g_strsplit((gchar *)lmap->data,"|",-1);
-	  threaded_dialog_spin();
-
-	  // piece 2 is the clip number
-	  rnc=atoi(array[1]);
-	  
-	  renumbered_clips[rnc]=i;
-
-	  // original fps
-	  lfps[i]=strtod(array[3],NULL);
-	  threaded_dialog_spin();
-	  g_strfreev(array);
-	  threaded_dialog_spin();
-	}
-	lmap=lmap->next;
+        // lmap->data starts with layout name
+        if (!strncmp((char *)lmap->data,lfile,strlen(lfile))) {
+          threaded_dialog_spin();
+          array=lives_strsplit((char *)lmap->data,"|",-1);
+          threaded_dialog_spin();
+
+          // piece 2 is the clip number
+          rnc=atoi(array[1]);
+
+          renumbered_clips[rnc]=i;
+
+          // original fps
+          lfps[i]=strtod(array[3],NULL);
+          threaded_dialog_spin();
+          lives_strfreev(array);
+          threaded_dialog_spin();
+        }
+        lmap=lmap->next;
       }
     }
-  }
-  else {
+  } else {
     // current event_list
-    for (i=1;i<=MAX_FILES&&mainw->files[i]!=NULL;i++) {
+    for (i=1; i<=MAX_FILES&&mainw->files[i]!=NULL; i++) {
       if (mainw->files[i]->stored_layout_idx!=-1) {
-	renumbered_clips[mainw->files[i]->stored_layout_idx]=i;
+        renumbered_clips[mainw->files[i]->stored_layout_idx]=i;
       }
       lfps[i]=mainw->files[i]->stored_layout_fps;
     }
   }
-  
+
 }
 
 
 
-void mt_clip_select (lives_mt *mt, boolean scroll) {
-  GList *list=lives_container_get_children(LIVES_CONTAINER (mt->clip_inner_box));
+void mt_clip_select(lives_mt *mt, boolean scroll) {
+  LiVESList *list=lives_container_get_children(LIVES_CONTAINER(mt->clip_inner_box));
   LiVESWidget *clipbox=NULL;
   int len;
   int i;
@@ -2690,15 +2813,14 @@
     if (!mt->was_undo_redo) {
       polymorph(mt,POLY_FX_STACK);
     }
-  }
-  else polymorph(mt,POLY_CLIPS);
+  } else polymorph(mt,POLY_CLIPS);
 
   if (mt->clip_selected<0) {
     was_neg=TRUE;
     mt->clip_selected=-mt->clip_selected;
   }
 
-  if (mt->clip_selected>=(len=g_list_length(list))&&!was_neg) mt->clip_selected=0;
+  if (mt->clip_selected>=(len=lives_list_length(list))&&!was_neg) mt->clip_selected=0;
 
   if (was_neg) mt->clip_selected--;
 
@@ -2706,47 +2828,47 @@
 
   if (mt->clip_selected<0) {
     mt->file_selected=-1;
-    g_list_free(list);
+    lives_list_free(list);
     return;
   }
 
   mt->file_selected=mt_file_from_clip(mt,mt->clip_selected);
 
-  for (i=0;i<len;i++) {
-    clipbox=(LiVESWidget *)g_list_nth_data (list,i);
+  for (i=0; i<len; i++) {
+    clipbox=(LiVESWidget *)lives_list_nth_data(list,i);
     if (i==mt->clip_selected) {
       LiVESAdjustment *adj;
       int value=lives_adjustment_get_upper((adj=lives_scrolled_window_get_hadjustment(LIVES_SCROLLED_WINDOW(mt->clip_scroll))))
-	*(mt->clip_selected+.5)/len;
+                *(mt->clip_selected+.5)/len;
       if (scroll) lives_adjustment_clamp_page(adj,value-lives_adjustment_get_page_size(adj)/2,
-					      value+lives_adjustment_get_page_size(adj)/2);
+                                                value+lives_adjustment_get_page_size(adj)/2);
       lives_widget_set_state(clipbox,LIVES_WIDGET_STATE_PRELIGHT);
-      lives_widget_set_sensitive (mt->adjust_start_end, mainw->files[mt->file_selected]->frames>0);
+      lives_widget_set_sensitive(mt->adjust_start_end, mainw->files[mt->file_selected]->frames>0);
       if (mt->current_track>-1) {
-	lives_widget_set_sensitive (mt->insert, mainw->files[mt->file_selected]->frames>0);
-	lives_widget_set_sensitive (mt->audio_insert, FALSE);
-      }
-      else {
-	lives_widget_set_sensitive (mt->audio_insert, mainw->files[mt->file_selected]->achans>0);
-	lives_widget_set_sensitive (mt->insert, FALSE);
+        lives_widget_set_sensitive(mt->insert, mainw->files[mt->file_selected]->frames>0);
+        lives_widget_set_sensitive(mt->audio_insert, FALSE);
+      } else {
+        lives_widget_set_sensitive(mt->audio_insert, mainw->files[mt->file_selected]->achans>0);
+        lives_widget_set_sensitive(mt->insert, FALSE);
       }
-    }
-    else lives_widget_set_state(clipbox,LIVES_WIDGET_STATE_NORMAL);
+    } else lives_widget_set_state(clipbox,LIVES_WIDGET_STATE_NORMAL);
   }
-  g_list_free(list);
+  lives_list_free(list);
 }
 
 
-boolean mt_prevclip (LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, gpointer user_data) {
+boolean mt_prevclip(LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
+  if (!mainw->interactive) return TRUE;
   mt->clip_selected--;
   polymorph(mt,POLY_CLIPS);
   mt_clip_select(mt,TRUE);
   return TRUE;
 }
 
-boolean mt_nextclip (LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, gpointer user_data) {
+boolean mt_nextclip(LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
+  if (!mainw->interactive) return TRUE;
   mt->clip_selected++;
   polymorph(mt,POLY_CLIPS);
   mt_clip_select(mt,TRUE);
@@ -2760,46 +2882,31 @@
 
   if (mt->tl_max>mt->end_secs) mt->end_secs=mt->tl_max;
 
-  g_object_freeze_notify (G_OBJECT(mt->hadjustment));
+  g_object_freeze_notify(LIVES_WIDGET_OBJECT(mt->hadjustment));
   lives_range_set_range(LIVES_RANGE(mt->time_scrollbar),0.,mt->end_secs);
   lives_range_set_increments(LIVES_RANGE(mt->time_scrollbar),page/4.,page);
   lives_adjustment_set_page_size(LIVES_ADJUSTMENT(mt->hadjustment),(double)page);
   lives_adjustment_set_value(LIVES_ADJUSTMENT(mt->hadjustment),(double)mt->tl_min);
-  g_object_thaw_notify (G_OBJECT(mt->hadjustment));
+  g_object_thaw_notify(LIVES_WIDGET_OBJECT(mt->hadjustment));
   lives_widget_queue_draw(mt->time_scrollbar);
 
 }
 
-void redraw_all_event_boxes(lives_mt *mt) {
-  GList *slist;
 
-  slist=mt->audio_draws;
-  while (slist!=NULL) {
-    redraw_eventbox(mt,(LiVESWidget *)slist->data);
-    slist=slist->next;
-  }
-
-  slist=mt->video_draws;
-  while (slist!=NULL) {
-    redraw_eventbox(mt,(LiVESWidget *)slist->data);
-    slist=slist->next;
-  }
-}
-
-void set_timeline_end_secs (lives_mt *mt, double secs) {
-  double pos=lives_ruler_get_value(LIVES_RULER (mt->timeline));
+void set_timeline_end_secs(lives_mt *mt, double secs) {
+  double pos=mt->ptr_time;
 
   mt->end_secs=secs;
 
-  lives_ruler_set_range (LIVES_RULER (mt->timeline), mt->tl_min, mt->tl_max, mt->tl_min, mt->end_secs+1./mt->fps);
-  lives_widget_queue_draw (mt->timeline);
-  lives_widget_queue_draw (mt->timeline_table);
-  lives_spin_button_set_range (LIVES_SPIN_BUTTON (mt->spinbutton_start),0.,mt->end_secs);
-  lives_spin_button_set_range (LIVES_SPIN_BUTTON (mt->spinbutton_end),0.,mt->end_secs+1./mt->fps);
+  lives_ruler_set_range(LIVES_RULER(mt->timeline), mt->tl_min, mt->tl_max, mt->tl_min, mt->end_secs+1./mt->fps);
+  lives_widget_queue_draw(mt->timeline);
+  lives_widget_queue_draw(mt->timeline_table);
+  lives_spin_button_set_range(LIVES_SPIN_BUTTON(mt->spinbutton_start),0.,mt->end_secs);
+  lives_spin_button_set_range(LIVES_SPIN_BUTTON(mt->spinbutton_end),0.,mt->end_secs+1./mt->fps);
 
   set_time_scrollbar(mt);
 
-  lives_ruler_set_value(LIVES_RULER (mt->timeline),pos);
+  lives_ruler_set_value(LIVES_RULER(mt->timeline),pos);
 
   redraw_all_event_boxes(mt);
 }
@@ -2813,30 +2920,39 @@
   weed_timecode_t tc;
 #ifdef ENABLE_JACK_TRANSPORT
   weed_timecode_t end_tc=event_list_get_end_tc(mt->event_list);
-#endif  
+#endif
 
   mainw->cancelled=CANCEL_NONE;
 
 #ifdef ENABLE_JACK_TRANSPORT
+  // if we have jack transport enabled, we get our playback start time from there
+
   if (mainw->jack_can_stop&&(prefs->jack_opts&JACK_OPTS_TIMEBASE_START)&&(prefs->jack_opts&JACK_OPTS_TRANSPORT_CLIENT)) {
     mt->pb_loop_event=get_first_frame_event(mt->event_list);
     has_pb_loop_event=TRUE;
     tc=q_gint64(U_SEC*jack_transport_get_time(),cfile->fps);
     if (!mainw->loop_cont) {
       if (tc>end_tc) {
-	mainw->cancelled=CANCEL_VID_END;
-	return 0;
+        mainw->cancelled=CANCEL_VID_END;
+        return 0;
       }
     }
     tc%=end_tc;
     mt->is_paused=FALSE;
-  }
-  else {
+  } else {
 #endif
-    tc=q_gint64(lives_ruler_get_value(LIVES_RULER(mt->timeline))*U_SEC,cfile->fps);
+    //////////////////////////////////////////
+
+    // set actual playback start time, from mt->ptr_time
+    tc=q_gint64(mt->ptr_time*U_SEC,cfile->fps);
+    mt->pb_start_time=mt->ptr_time;
+
+    //////////////////////////////////
 #ifdef ENABLE_JACK_TRANSPORT
   }
 #endif
+
+  // get the start event to play from
   if (tc>event_list_get_end_tc(mt->event_list)||tc==0) mt->pb_start_event=get_first_frame_event(mt->event_list);
   else {
     mt->pb_start_event=get_frame_event_at(mt->event_list,tc,NULL,TRUE);
@@ -2844,20 +2960,20 @@
 
   if (!has_pb_loop_event) mt->pb_loop_event=mt->pb_start_event;
 
+  // return timecode of start event
   return get_event_timecode(mt->pb_start_event);
 }
 
- 
- 
- 
+
+
 void mt_show_current_frame(lives_mt *mt, boolean return_layer) {
   // show preview of current frame in play_box and/or play_window
 
-  // or, if return_layer is TRUE, we just set mainw->frame_layer
+  // or, if return_layer is TRUE, we just set mainw->frame_layer (used when we want to save the frame, e.g right click context)
 
   weed_timecode_t curr_tc;
 
-  double ptr_time=lives_ruler_get_value(LIVES_RULER(mt->timeline));
+  double ptr_time=mt->ptr_time;
 
   weed_plant_t *frame_layer=mainw->frame_layer;
 
@@ -2870,7 +2986,7 @@
   boolean needs_idlefunc=FALSE;
 
   if (mt->idlefunc>0) {
-    g_source_remove(mt->idlefunc);
+    lives_source_remove(mt->idlefunc);
     mt->idlefunc=0;
     needs_idlefunc=TRUE;
   }
@@ -2882,24 +2998,24 @@
       mt->mt_frame_preview=TRUE;
 
       if (lives_widget_get_parent(mt->play_blank)!=NULL) {
-	lives_object_ref(mt->play_blank);
-	lives_container_remove (LIVES_CONTAINER(mt->play_box),mt->play_blank);
+        lives_object_ref(mt->play_blank);
+        lives_container_remove(LIVES_CONTAINER(mt->play_box),mt->play_blank);
       }
 
       if (mainw->plug!=NULL) {
-	lives_container_remove (LIVES_CONTAINER(mainw->plug),mainw->play_image);
-	lives_widget_destroy (mainw->plug);
-	mainw->plug=NULL;
+        lives_container_remove(LIVES_CONTAINER(mainw->plug),mainw->play_image);
+        lives_widget_destroy(mainw->plug);
+        mainw->plug=NULL;
       }
 
-      if (LIVES_IS_WIDGET(mainw->playarea)) lives_widget_destroy (mainw->playarea);
-      mainw->playarea = lives_hbox_new (FALSE,0);
+      if (LIVES_IS_WIDGET(mainw->playarea)) lives_widget_destroy(mainw->playarea);
+      mainw->playarea = lives_hbox_new(FALSE,0);
       lives_widget_show(mainw->playarea);
-      lives_container_add (LIVES_CONTAINER (mt->play_box), mainw->playarea);
+      lives_container_add(LIVES_CONTAINER(mt->play_box), mainw->playarea);
 
       if (mt->is_ready)
-	lives_widget_context_update();
-  
+        lives_widget_context_update();
+
       mainw->sep_win=FALSE;
       add_to_playframe();
       mainw->sep_win=sep_win;
@@ -2907,33 +3023,33 @@
   }
 
   if (mainw->playing_file>-1) {
-    if (mainw->play_window!=NULL&&LIVES_IS_XWINDOW (lives_widget_get_xwindow(mainw->play_window))) {
+    if (mainw->play_window!=NULL&&LIVES_IS_XWINDOW(lives_widget_get_xwindow(mainw->play_window))) {
 #if GTK_CHECK_VERSION(3,0,0)
       if (mt->frame_pixbuf==NULL||mt->frame_pixbuf!=mainw->imframe) {
-	if (mt->frame_pixbuf!=NULL) lives_object_unref(mt->frame_pixbuf);
-	mt->frame_pixbuf=mainw->imframe;
+        if (mt->frame_pixbuf!=NULL) lives_object_unref(mt->frame_pixbuf);
+        // set frame_pixbuf, this gets painted in in expose_event
+        mt->frame_pixbuf=mainw->imframe;
       }
 #else
       set_ce_frame_from_pixbuf(LIVES_IMAGE(mainw->play_image),mainw->imframe,NULL);
 #endif
-    }
-    else {
+    } else {
 #if GTK_CHECK_VERSION(3,0,0)
       if (mt->frame_pixbuf!=mainw->imframe) {
-	if (mt->frame_pixbuf!=NULL) lives_object_unref(mt->frame_pixbuf);
-	mt->frame_pixbuf=NULL;
+        if (mt->frame_pixbuf!=NULL) lives_object_unref(mt->frame_pixbuf);
+        mt->frame_pixbuf=NULL;
       }
 #else
       set_ce_frame_from_pixbuf(LIVES_IMAGE(mainw->play_image),NULL,NULL);
 #endif
     }
     lives_widget_queue_draw_area(mt->play_box,0,0,
-			       lives_widget_get_allocation_width(mt->play_box),
-			       lives_widget_get_allocation_height(mt->play_box));
+                                 lives_widget_get_allocation_width(mt->play_box),
+                                 lives_widget_get_allocation_height(mt->play_box));
     return;
   }
 
-  // start "playback" at current pos, we just "play" one frame
+  // start "playback" at mt->ptr_time; we just "render" one frame
   curr_tc=set_play_position(mt);
   actual_frame=(int)((double)(curr_tc/U_SECL)*cfile->fps+1.4999);
   mainw->frame_layer=NULL;
@@ -2944,18 +3060,17 @@
     weed_set_int_value(mainw->frame_layer,"clip",mainw->current_file);
     weed_set_int_value(mainw->frame_layer,"frame",actual_frame);
     pull_frame(mainw->frame_layer,prefs->image_ext,curr_tc);
-  }
-  else {
+  } else {
     mainw->is_rendering=TRUE;
-  
+
     if (mt->pb_start_event!=NULL) {
       // "play" a single frame
       current_file=mainw->current_file;
       mainw->internal_messaging=TRUE; // stop load_frame from showing image
       cfile->next_event=mt->pb_start_event;
       if (is_rendering) {
-	backup_weed_instances();
-	backup_host_tags(mt->event_list,curr_tc);
+        backup_weed_instances();
+        backup_host_tags(mt->event_list,curr_tc);
       }
 
       // pass quickly through events_list, switching on and off effects an interpolating at current time
@@ -2963,16 +3078,20 @@
 
       // if we are previewing a specific effect we also need to init it
       if (mt->current_rfx!=NULL&&mt->init_event!=NULL) {
-	if (mt->current_rfx->source_type==LIVES_RFX_SOURCE_WEED&&mt->current_rfx->source!=NULL) {
-	  weed_plant_t *inst=(weed_plant_t *)mt->current_rfx->source;
-	  do {
-	    weed_call_init_func(inst);
-	  } while (weed_plant_has_leaf(inst,"host_next_instance")&&(inst=weed_get_plantptr_value(inst,"host_next_instance",&error))!=NULL);
-	}
+        if (mt->current_rfx->source_type==LIVES_RFX_SOURCE_WEED&&mt->current_rfx->source!=NULL) {
+          weed_plant_t *inst=(weed_plant_t *)mt->current_rfx->source;
+          do {
+            weed_call_init_func(inst);
+          } while (weed_plant_has_leaf(inst,"host_next_instance")&&(inst=weed_get_plantptr_value(inst,"host_next_instance",&error))!=NULL);
+        }
       }
 
       mainw->last_display_ticks=0;
+
+      // start decoder plugins, one per track
       init_track_decoders();
+
+      // render one frame
       process_events(mt->pb_start_event,FALSE,0);
       free_track_decoders();
       mainw->internal_messaging=internal_messaging;
@@ -2981,17 +3100,17 @@
 
       // if we are previewing an effect we now need to deinit it
       if (mt->current_rfx!=NULL&&mt->init_event!=NULL) {
-	if (mt->current_rfx->source_type==LIVES_RFX_SOURCE_WEED&&mt->current_rfx->source!=NULL) {
-	  weed_plant_t *inst=(weed_plant_t *)mt->current_rfx->source;
-	  do {
-	    weed_call_deinit_func(inst);
-	  } while (weed_plant_has_leaf(inst,"host_next_instance")&&(inst=weed_get_plantptr_value(inst,"host_next_instance",&error))!=NULL);
-	}
+        if (mt->current_rfx->source_type==LIVES_RFX_SOURCE_WEED&&mt->current_rfx->source!=NULL) {
+          weed_plant_t *inst=(weed_plant_t *)mt->current_rfx->source;
+          do {
+            weed_call_deinit_func(inst);
+          } while (weed_plant_has_leaf(inst,"host_next_instance")&&(inst=weed_get_plantptr_value(inst,"host_next_instance",&error))!=NULL);
+        }
       }
 
       if (is_rendering) {
-	restore_weed_instances();
-	restore_host_tags(mt->event_list,curr_tc);
+        restore_weed_instances();
+        restore_host_tags(mt->event_list,curr_tc);
       }
       cfile->next_event=NULL;
       mainw->is_rendering=is_rendering;
@@ -3011,6 +3130,15 @@
   mt->outheight=cfile->vsize;
   calc_maxspect(mt->play_width,mt->play_height,&mt->outwidth,&mt->outheight);
 
+  if (lives_widget_get_allocation_width(mainw->play_image)-widget_opts.border_width*2>0) {
+    // make sure we are consistent with main.c
+    if (mt->outwidth>lives_widget_get_allocation_width(mainw->play_image)-widget_opts.border_width*2)
+      mt->outwidth=lives_widget_get_allocation_width(mainw->play_image)-widget_opts.border_width*2;
+    if (mt->outheight>lives_widget_get_allocation_height(mainw->play_image)-widget_opts.border_width*2)
+      mt->outheight=lives_widget_get_allocation_height(mainw->play_image)-widget_opts.border_width*2;
+    needs_clear=FALSE;
+  } else needs_clear=TRUE;
+
   if (mainw->frame_layer!=NULL) {
     LiVESPixbuf *pixbuf;
     int weed_error;
@@ -3019,7 +3147,7 @@
     mainw->pheight=mt->outheight;
 
     if ((mt->outwidth!=(weed_get_int_value(mainw->frame_layer,"width",&weed_error))||
-	 mt->outheight!=weed_get_int_value(mainw->frame_layer,"height",&weed_error))) 
+         mt->outheight!=weed_get_int_value(mainw->frame_layer,"height",&weed_error)))
       resize_layer(mainw->frame_layer,mt->outwidth,mt->outheight,LIVES_INTERP_BEST,WEED_PALETTE_RGB24,0);
 
     convert_layer_palette(mainw->frame_layer,WEED_PALETTE_RGB24,0);
@@ -3031,16 +3159,17 @@
     if (mt->framedraw!=NULL) pixbuf=mt_framedraw(mt,pixbuf);
 
 #if GTK_CHECK_VERSION(3,0,0)
-      mt->frame_pixbuf=pixbuf;
+    // set frame_pixbuf, this gets painted in in expose_event
+    mt->frame_pixbuf=pixbuf;
 #else
-      set_ce_frame_from_pixbuf(LIVES_IMAGE(mainw->play_image),pixbuf,NULL);
+    set_ce_frame_from_pixbuf(LIVES_IMAGE(mainw->play_image),pixbuf,NULL);
 #endif
-      lives_widget_queue_draw(mt->play_box);
+    lives_widget_queue_draw(mt->play_box);
 
-  }
-  else {
+  } else {
     // no frame - show blank
 #if GTK_CHECK_VERSION(3,0,0)
+    // set frame_pixbuf, this gets painted in in expose_event
     mt->frame_pixbuf=mainw->imframe;
 #else
     set_ce_frame_from_pixbuf(LIVES_IMAGE(mainw->play_image),mainw->imframe,NULL);
@@ -3061,9 +3190,8 @@
 
 
 
-void mt_tl_move(lives_mt *mt, double pos_rel) {
+void mt_tl_move(lives_mt *mt, double pos) {
   int ebwidth,offset,offset_old;
-  double pos;
 
   if (mainw->playing_file>-1) return;
 
@@ -3071,26 +3199,24 @@
 
   offset_old=(lives_ruler_get_value(LIVES_RULER(mt->timeline))-mt->tl_min)/(mt->tl_max-mt->tl_min)*(double)ebwidth;
 
-  pos=lives_ruler_get_value(LIVES_RULER (mt->timeline))+pos_rel;
-
   pos=q_dbl(pos,mt->fps)/U_SEC;
   if (pos<0.) pos=0.;
 
-  mt->ptr_time=lives_ruler_set_value(LIVES_RULER (mt->timeline),pos);
+  // need to reference ONLY mt->ptr_time, since it may be outside the range of mt->timeline
+  mt->ptr_time=lives_ruler_set_value(LIVES_RULER(mt->timeline),pos);
 
   if (pos>0.) {
-    lives_widget_set_sensitive (mt->rewind,TRUE);
-    lives_widget_set_sensitive (mainw->m_rewindbutton, TRUE);
-  }
-  else {
-    lives_widget_set_sensitive (mt->rewind,FALSE);
-    lives_widget_set_sensitive (mainw->m_rewindbutton, FALSE);
+    lives_widget_set_sensitive(mt->rewind,TRUE);
+    lives_widget_set_sensitive(mainw->m_rewindbutton, TRUE);
+  } else {
+    lives_widget_set_sensitive(mt->rewind,FALSE);
+    lives_widget_set_sensitive(mainw->m_rewindbutton, FALSE);
   }
 
   if (mt->is_paused) {
     mt->is_paused=FALSE;
-    lives_widget_set_sensitive (mainw->stop, FALSE);
-    lives_widget_set_sensitive (mainw->m_stopbutton, FALSE);
+    lives_widget_set_sensitive(mainw->stop, FALSE);
+    lives_widget_set_sensitive(mainw->m_stopbutton, FALSE);
   }
 
   lives_widget_queue_draw(mt->timeline);
@@ -3099,7 +3225,7 @@
     lives_spin_button_set_value(LIVES_SPIN_BUTTON(mt->node_spinbutton),pos-get_event_timecode(mt->init_event)/U_SEC);
     mt->block_tl_move=FALSE;
   }
-  time_to_string (mt,pos,TIMECODE_LENGTH);
+  time_to_string(mt,pos,TIMECODE_LENGTH);
 
   if (pos>mt->region_end-1./mt->fps) lives_widget_set_sensitive(mt->tc_to_rs,FALSE);
   else lives_widget_set_sensitive(mt->tc_to_rs,TRUE);
@@ -3129,32 +3255,42 @@
 }
 
 
-boolean mt_tlfor (LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, gpointer user_data) {
+LIVES_INLINE void mt_tl_move_relative(lives_mt *mt, double pos_rel) {
+  mt_tl_move(mt,mt->ptr_time+pos_rel);
+}
+
+
+
+boolean mt_tlfor(LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
+  if (!mainw->interactive) return TRUE;
   mt->fm_edit_event=NULL;
-  mt_tl_move(mt,1.);
+  mt_tl_move_relative(mt,1.);
   return TRUE;
 }
 
-boolean mt_tlfor_frame (LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, gpointer user_data) {
+boolean mt_tlfor_frame(LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
+  if (!mainw->interactive) return TRUE;
   mt->fm_edit_event=NULL;
-  mt_tl_move(mt,1./mt->fps);
+  mt_tl_move_relative(mt,1./mt->fps);
   return TRUE;
 }
 
 
-boolean mt_tlback (LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, gpointer user_data) {
+boolean mt_tlback(LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
+  if (!mainw->interactive) return TRUE;
   mt->fm_edit_event=NULL;
-  mt_tl_move(mt,-1.);
+  mt_tl_move_relative(mt,-1.);
   return TRUE;
 }
 
-boolean mt_tlback_frame (LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, gpointer user_data) {
+boolean mt_tlback_frame(LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
+  if (!mainw->interactive) return TRUE;
   mt->fm_edit_event=NULL;
-  mt_tl_move(mt,-1./mt->fps);
+  mt_tl_move_relative(mt,-1./mt->fps);
   return TRUE;
 }
 
@@ -3163,14 +3299,14 @@
 static void scroll_track_on_screen(lives_mt *mt, int track) {
   if (track>mt->top_track) track=get_top_track_for(mt,track);
   scroll_tracks(mt,track,track!=mt->top_track);
- 
+
   return;
 }
 
 
 
 
-void scroll_track_by_scrollbar (GtkScrollbar *sbar, gpointer user_data) {
+void scroll_track_by_scrollbar(LiVESScrollbar *sbar, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   scroll_tracks(mt,lives_adjustment_get_value(lives_range_get_adjustment(LIVES_RANGE(sbar))),FALSE);
   track_select(mt);
@@ -3179,14 +3315,17 @@
 
 
 
-static void mt_zoom (lives_mt *mt, double scale) {
-  // scale < 1.0 == zoom in
+static void mt_zoom(lives_mt *mt, double scale) {
+  // ABS(scale) < 1.0 == zoom in
+
+  // scale < 0.0 = center on screen middle
+  // scale > 0.0 = center on cursor
 
   double tl_span=(mt->tl_max-mt->tl_min)/2.;
   double tl_cur;
 
 
-  if (scale>0.) tl_cur=lives_ruler_get_value(LIVES_RULER(mt->timeline));  // center on cursor
+  if (scale>0.) tl_cur=mt->ptr_time;  // center on cursor
   else {
     tl_cur=mt->tl_min+tl_span; // center on middle of screen
     scale=-scale;
@@ -3210,32 +3349,32 @@
 
   set_time_scrollbar(mt);
 
-  lives_widget_queue_draw (mt->vpaned);
+  lives_widget_queue_draw(mt->vpaned);
 
   redraw_all_event_boxes(mt);
 
 }
 
 
-static void scroll_time_by_scrollbar (GtkHScrollbar *sbar, gpointer user_data) {
+static void scroll_time_by_scrollbar(LiVESHScrollbar *sbar, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   mt->tl_min=lives_adjustment_get_value(lives_range_get_adjustment(LIVES_RANGE(sbar)));
   mt->tl_max=lives_adjustment_get_value(lives_range_get_adjustment(LIVES_RANGE(sbar)))
-    +lives_adjustment_get_page_size(lives_range_get_adjustment(LIVES_RANGE(sbar)));
+             +lives_adjustment_get_page_size(lives_range_get_adjustment(LIVES_RANGE(sbar)));
   mt_zoom(mt,-1.);
-  paint_lines(mt,lives_ruler_get_value(LIVES_RULER (mt->timeline)),TRUE);
+  paint_lines(mt,mt->ptr_time,TRUE);
 }
 
 
-boolean mt_trdown (LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, gpointer user_data) {
+boolean mt_trdown(LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
+  if (!mainw->interactive) return TRUE;
 
   if (mt->current_track>=0&&mt->opts.pertrack_audio&&!mt->aud_track_selected) {
-    LiVESWidget *eventbox=(LiVESWidget *)g_list_nth_data(mt->video_draws,mt->current_track);
-    mt->aud_track_selected=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(eventbox),"expanded"));
+    LiVESWidget *eventbox=(LiVESWidget *)lives_list_nth_data(mt->video_draws,mt->current_track);
+    mt->aud_track_selected=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"expanded"));
     if (!mt->aud_track_selected&&mt->current_track==mt->num_video_tracks-1) return TRUE;
-  }
-  else {
+  } else {
     if (mt->current_track==mt->num_video_tracks-1) return TRUE;
     mt->aud_track_selected=FALSE;
   }
@@ -3244,14 +3383,14 @@
     if (mt->current_track>-1) mt->current_track++;
     else {
       int i=0;
-      GList *llist=mt->video_draws;
+      LiVESList *llist=mt->video_draws;
       while (llist!=NULL) {
-	if (GPOINTER_TO_INT(g_object_get_data(G_OBJECT(llist->data),"hidden"))==0) {
-	  mt->current_track=i;
-	  break;
-	}
-	llist=llist->next;
-	i++;
+        if (LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(llist->data),"hidden"))==0) {
+          mt->current_track=i;
+          break;
+        }
+        llist=llist->next;
+        i++;
       }
       mt->current_track=i;
     }
@@ -3264,16 +3403,17 @@
 }
 
 
-boolean mt_trup (LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, gpointer user_data) {
+boolean mt_trup(LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   if (mt->current_track==-1||(mt->current_track==0&&!mt->aud_track_selected&&!mt->opts.show_audio)) return TRUE;
+  if (!mainw->interactive) return TRUE;
 
   if (mt->aud_track_selected) mt->aud_track_selected=FALSE;
   else {
     mt->current_track--;
     if (mt->current_track>=0&&mt->opts.pertrack_audio) {
-      LiVESWidget *eventbox=(LiVESWidget *)g_list_nth_data(mt->video_draws,mt->current_track);
-      mt->aud_track_selected=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(eventbox),"expanded"));
+      LiVESWidget *eventbox=(LiVESWidget *)lives_list_nth_data(mt->video_draws,mt->current_track);
+      mt->aud_track_selected=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"expanded"));
     }
   }
   mt->selected_init_event=NULL;
@@ -3307,7 +3447,7 @@
 
   widget_opts.justify=LIVES_JUSTIFY_CENTER;
 
-  switch(err) {
+  switch (err) {
   case NB_ERROR_SEL:
     mt->nb_label=lives_standard_label_new(_("\n\nPlease select a block\nin the timeline by\nright or double clicking on it.\n"));
     break;
@@ -3318,7 +3458,8 @@
     mt->nb_label=lives_standard_label_new(_("\n\nNo clips loaded.\n"));
     break;
   case NB_ERROR_NOTRANS:
-    mt->nb_label=lives_standard_label_new(_("You must select two video tracks\nand a time region\nto apply transitions.\n\nAlternately, you can enable Autotransitions from the Effects menu\nbefore inserting clips into the timeline."));
+    mt->nb_label=lives_standard_label_new(
+                   _("You must select two video tracks\nand a time region\nto apply transitions.\n\nAlternately, you can enable Autotransitions from the Effects menu\nbefore inserting clips into the timeline."));
     break;
   case NB_ERROR_NOCOMP:
     mt->nb_label=lives_standard_label_new(_("\n\nYou must select at least one video track\nand a time region\nto apply compositors.\n"));
@@ -3329,8 +3470,11 @@
 
   lives_widget_set_hexpand(mt->nb_label,TRUE);
 
+  // add label to notebook page
   lives_container_add(LIVES_CONTAINER(lives_notebook_get_nth_page(LIVES_NOTEBOOK(nb),page)),mt->nb_label);
   lives_widget_show(mt->nb_label);
+
+  // hide the poly box
   lives_widget_hide(mt->poly_box);
 
   lives_widget_queue_resize(mt->nb_label);
@@ -3343,7 +3487,7 @@
   int num_in_tracks;
   int *in_tracks;
   void **pchainx;
-  gchar *fhash;
+  char *fhash;
 
   mt->init_event=mt->selected_init_event;
 
@@ -3352,43 +3496,51 @@
   if ((num_in_tracks=weed_leaf_num_elements(mt->init_event,"in_tracks"))>0) {
     in_tracks=weed_get_int_array(mt->init_event,"in_tracks",&error);
     // set track_index (for special widgets)
-    for (i=0;i<num_in_tracks;i++) {
+    for (i=0; i<num_in_tracks; i++) {
       if (mt->current_track==in_tracks[i]) mt->track_index=i;
     }
-    weed_free(in_tracks);
+    lives_free(in_tracks);
   }
 
   fhash=weed_get_string_value(mt->init_event,"filter",&error);
   mt->current_fx=weed_get_idx_for_hashname(fhash,TRUE);
-  weed_free(fhash);
+  lives_free(fhash);
 
-  if (weed_plant_has_leaf(mt->selected_init_event,"in_parameters")&&weed_get_voidptr_value(mt->selected_init_event,"in_parameters",&error)!=NULL) {
+  if (weed_plant_has_leaf(mt->selected_init_event,"in_parameters")&&
+      weed_get_voidptr_value(mt->selected_init_event,"in_parameters",&error)!=NULL) {
     npch=weed_leaf_num_elements(mt->init_event,"in_parameters");
     pchainx=weed_get_voidptr_array(mt->init_event,"in_parameters",&error);
-    pchain=(void **)g_malloc(npch*sizeof(void *)); 
-    for (i=0;i<npch;i++) pchain[i]=pchainx[i];
-    weed_free(pchainx);
+    pchain=(void **)lives_malloc(npch*sizeof(void *));
+    for (i=0; i<npch; i++) pchain[i]=pchainx[i];
+    lives_free(pchainx);
   }
- }
+}
 
 
-static boolean notebook_page(LiVESWidget *nb, LiVESWidget *nbp, uint32_t tab, gpointer user_data) {
+static boolean notebook_page(LiVESWidget *nb, LiVESWidget *nbp, uint32_t tab, livespointer user_data) {
   uint32_t page;
   lives_mt *mt=(lives_mt *)user_data;
 
   if (nbp!=NULL) {
     page=tab;
     tab=poly_page_to_tab(page);
-  }
-  else {
+  } else {
     page=poly_tab_to_page(tab);
   }
 
+  // destroy the label that was in the page
   if (mt->nb_label!=NULL) lives_widget_destroy(mt->nb_label);
   mt->nb_label=NULL;
 
   lives_widget_show(mt->poly_box);
 
+
+  // we remove every widget from the notebook page and reparent it in the poly_box
+  // the tabs at the top are now only used to select the page, which is hidden or shown in poly_box
+  // or to show a label in the page
+  //
+  // i forget why it is done like this, but i think there was a reason
+
   switch (tab) {
   case POLY_CLIPS:
     if (mt->clip_labels==NULL) {
@@ -3419,7 +3571,7 @@
     else lives_widget_reparent(mt->poly_box,lives_notebook_get_nth_page(LIVES_NOTEBOOK(mt->nb),page));
     break;
   case POLY_TRANS:
-    if (g_list_length(mt->selected_tracks)!=2||mt->region_start==mt->region_end) {
+    if (lives_list_length(mt->selected_tracks)!=2||mt->region_start==mt->region_end) {
       notebook_error(LIVES_NOTEBOOK(mt->nb),tab,NB_ERROR_NOTRANS,mt);
       return FALSE;
     }
@@ -3448,7 +3600,7 @@
   }
 
   return TRUE;
-} 
+}
 
 
 static void set_poly_tab(lives_mt *mt, uint32_t tab) {
@@ -3459,44 +3611,45 @@
 
 
 
-static void select_block (lives_mt *mt) {
+static void select_block(lives_mt *mt) {
   track_rect *block=mt->putative_block;
   int track;
   int filenum;
-  gchar *tmp,*tmp2;
+  char *tmp,*tmp2;
 
   if (block!=NULL) {
     LiVESWidget *eventbox=block->eventbox;
 
-    if (cfile->achans==0||mt->audio_draws==NULL||(mt->opts.back_audio_tracks==0||eventbox!=mt->audio_draws->data)) 
-      track=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(eventbox),"layer_number"));
+    if (cfile->achans==0||mt->audio_draws==NULL||(mt->opts.back_audio_tracks==0||eventbox!=mt->audio_draws->data))
+      track=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"layer_number"));
     else track=-1;
 
-    if (!is_audio_eventbox(mt,eventbox)) filenum=get_frame_event_clip(block->start_event,track);
+    if (!is_audio_eventbox(eventbox)) filenum=get_frame_event_clip(block->start_event,track);
     else filenum=get_audio_frame_clip(block->start_event,track);
     block->state=BLOCK_SELECTED;
     mt->block_selected=block;
 
     clear_context(mt);
 
-    if (cfile->achans==0||mt->audio_draws==NULL||(mt->opts.back_audio_tracks==0||eventbox!=mt->audio_draws->data)) 
-      add_context_label (mt,(tmp2=g_strdup_printf (_("Current track: %s (layer %d)\n"),g_object_get_data(G_OBJECT(eventbox),"track_name"),track)));
-    else add_context_label (mt,(tmp2=g_strdup (_("Current track: Backing audio\n"))));
-    g_free(tmp2);
-    
-    add_context_label (mt,(tmp2=g_strdup_printf (_("%.2f sec. to %.2f sec.\n"),get_event_timecode(block->start_event)/U_SEC,
-						 get_event_timecode(block->end_event)/U_SEC+1./mt->fps)));
-    g_free(tmp2);
-    add_context_label (mt,(tmp2=g_strdup_printf (_("Source: %s"),(tmp=g_path_get_basename (mainw->files[filenum]->name)))));
-    g_free(tmp2);
-    add_context_label (mt,(_("Right click for context menu.\n")));
-    add_context_label (mt,(_("Single click on timeline\nto select a frame.\n")));
-    g_free(tmp);
+    if (cfile->achans==0||mt->audio_draws==NULL||(mt->opts.back_audio_tracks==0||eventbox!=mt->audio_draws->data))
+      add_context_label(mt,(tmp2=lives_strdup_printf(_("Current track: %s (layer %d)\n"),
+                                 lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"track_name"),track)));
+    else add_context_label(mt,(tmp2=lives_strdup(_("Current track: Backing audio\n"))));
+    lives_free(tmp2);
+
+    add_context_label(mt,(tmp2=lives_strdup_printf(_("%.2f sec. to %.2f sec.\n"),get_event_timecode(block->start_event)/U_SEC,
+                               get_event_timecode(block->end_event)/U_SEC+1./mt->fps)));
+    lives_free(tmp2);
+    add_context_label(mt,(tmp2=lives_strdup_printf(_("Source: %s"),(tmp=lives_path_get_basename(mainw->files[filenum]->name)))));
+    lives_free(tmp2);
+    add_context_label(mt,(_("Right click for context menu.\n")));
+    add_context_label(mt,(_("Single click on timeline\nto select a frame.\n")));
+    lives_free(tmp);
 
     lives_widget_set_sensitive(mt->view_in_out,TRUE);
-    lives_widget_set_sensitive (mt->fx_block, TRUE);
-    lives_widget_set_sensitive (mt->fx_blockv, TRUE);
-    if (cfile->achans>0) lives_widget_set_sensitive (mt->fx_blocka, TRUE);
+    lives_widget_set_sensitive(mt->fx_block, TRUE);
+    lives_widget_set_sensitive(mt->fx_blockv, TRUE);
+    if (cfile->achans>0) lives_widget_set_sensitive(mt->fx_blocka, TRUE);
 
     redraw_eventbox(mt,eventbox);
 
@@ -3504,15 +3657,12 @@
   }
 
   mt->context_time=-1.;
-  
+
 }
 
 
-static boolean
-on_drag_filter_end           (LiVESWidget       *widget,
-			      LiVESXEventButton  *event,
-			      gpointer         user_data) {
-  GdkWindow *window;
+static boolean on_drag_filter_end(LiVESWidget *widget, LiVESXEventButton *event, livespointer user_data) {
+  LiVESXWindow *window;
   LiVESWidget *eventbox=NULL,*oeventbox;
   LiVESWidget *labelbox;
   LiVESWidget *ahbox;
@@ -3540,46 +3690,46 @@
     return FALSE;
   }
 
-  window=lives_display_get_window_at_pointer 
-    ((LiVESXDevice *)mainw->mgeom[prefs->gui_monitor>0?prefs->gui_monitor-1:0].mouse_device,
-     mt->display,&win_x,&win_y);
+  window=lives_display_get_window_at_pointer
+         ((LiVESXDevice *)mainw->mgeom[prefs->gui_monitor>0?prefs->gui_monitor-1:0].mouse_device,
+          mt->display,&win_x,&win_y);
 
   if (cfile->achans>0&&enabled_in_channels(get_weed_filter(mt->selected_filter),TRUE)==1) {
-    for (i=0;i<g_list_length(mt->audio_draws);i++) {
-      eventbox=(LiVESWidget *)g_list_nth_data(mt->audio_draws,i);
-      if (GPOINTER_TO_INT(g_object_get_data(G_OBJECT(eventbox),"hidden"))!=0) continue;
-      labelbox=(LiVESWidget *)g_object_get_data(G_OBJECT(eventbox),"labelbox");
+    for (i=0; i<lives_list_length(mt->audio_draws); i++) {
+      eventbox=(LiVESWidget *)lives_list_nth_data(mt->audio_draws,i);
+      if (LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"hidden"))!=0) continue;
+      labelbox=(LiVESWidget *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"labelbox");
       if (lives_widget_get_xwindow(eventbox)==window||lives_widget_get_xwindow(labelbox)==window) {
-	if (lives_widget_get_xwindow(labelbox)!=window) {
-	  lives_widget_get_pointer((LiVESXDevice *)mainw->mgeom[prefs->gui_monitor>0?prefs->gui_monitor-1:0].mouse_device, 
-				   mt->timeline, &mt->sel_x, &mt->sel_y);
-	  timesecs=get_time_from_x(mt,mt->sel_x);
-	}
-	tchan=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(eventbox),"layer_number"));
-	if ((oeventbox=(LiVESWidget *)g_object_get_data(G_OBJECT(eventbox),"owner"))!=NULL) {
-	  eventbox=oeventbox;
-	}
-	ok=TRUE;
-	break;
+        if (lives_widget_get_xwindow(labelbox)!=window) {
+          lives_widget_get_pointer((LiVESXDevice *)mainw->mgeom[prefs->gui_monitor>0?prefs->gui_monitor-1:0].mouse_device,
+                                   mt->timeline, &mt->sel_x, &mt->sel_y);
+          timesecs=get_time_from_x(mt,mt->sel_x);
+        }
+        tchan=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"layer_number"));
+        if ((oeventbox=(LiVESWidget *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"owner"))!=NULL) {
+          eventbox=oeventbox;
+        }
+        ok=TRUE;
+        break;
       }
     }
   }
 
   if (!ok) {
-    for (i=0;i<g_list_length(mt->video_draws);i++) {
-      eventbox=(LiVESWidget *)g_list_nth_data(mt->video_draws,i);
-      if (GPOINTER_TO_INT(g_object_get_data(G_OBJECT(eventbox),"hidden"))!=0) continue;
-      labelbox=(LiVESWidget *)g_object_get_data(G_OBJECT(eventbox),"labelbox");
-      ahbox=(LiVESWidget *)g_object_get_data(G_OBJECT(eventbox),"ahbox");
+    for (i=0; i<lives_list_length(mt->video_draws); i++) {
+      eventbox=(LiVESWidget *)lives_list_nth_data(mt->video_draws,i);
+      if (LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"hidden"))!=0) continue;
+      labelbox=(LiVESWidget *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"labelbox");
+      ahbox=(LiVESWidget *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"ahbox");
       if (lives_widget_get_xwindow(eventbox)==window||lives_widget_get_xwindow(labelbox)==window||lives_widget_get_xwindow(ahbox)==window) {
-	if (lives_widget_get_xwindow(labelbox)!=window) {
-	  lives_widget_get_pointer((LiVESXDevice *)mainw->mgeom[prefs->gui_monitor>0?prefs->gui_monitor-1:0].mouse_device, 
-				   mt->timeline, &mt->sel_x, &mt->sel_y);
-	  timesecs=get_time_from_x(mt,mt->sel_x);
-	}
-	tchan=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(eventbox),"layer_number"));
-	ok=TRUE;
-	break;
+        if (lives_widget_get_xwindow(labelbox)!=window) {
+          lives_widget_get_pointer((LiVESXDevice *)mainw->mgeom[prefs->gui_monitor>0?prefs->gui_monitor-1:0].mouse_device,
+                                   mt->timeline, &mt->sel_x, &mt->sel_y);
+          timesecs=get_time_from_x(mt,mt->sel_x);
+        }
+        tchan=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"layer_number"));
+        ok=TRUE;
+        break;
       }
     }
   }
@@ -3594,12 +3744,12 @@
 
   // create dummy menuitem
   dummy_menuitem=lives_menu_item_new();
-  g_object_set_data(G_OBJECT(dummy_menuitem),"idx",GINT_TO_POINTER(mt->current_fx));
+  lives_widget_object_set_data(LIVES_WIDGET_OBJECT(dummy_menuitem),"idx",LIVES_INT_TO_POINTER(mt->current_fx));
 
   nins=enabled_in_channels(get_weed_filter(mt->current_fx),TRUE);
   if (nins==1) {
     /*    // filter - either we drop on a region or on a block
-    if (g_list_length(mt->selected_tracks)==1&&mt->region_start!=mt->region_end) {
+    if (lives_list_length(mt->selected_tracks)==1&&mt->region_start!=mt->region_end) {
       // apply to region
       mt_add_region_effect(LIVES_MENU_ITEM(menuitem),mt);
     }
@@ -3622,20 +3772,18 @@
     nb_ignore=FALSE;
     // apply to block
     mt->putative_block=NULL;
-    g_idle_add_full(G_PRIORITY_HIGH,mt_add_block_effect_idle,mt,NULL); // work around bug in gtk+
-  }
-  else if (nins==2) {
+    lives_idle_add_full(G_PRIORITY_HIGH,mt_add_block_effect_idle,mt,NULL); // work around bug in gtk+
+  } else if (nins==2) {
     // transition
-    if (g_list_length(mt->selected_tracks)==2&&mt->region_start!=mt->region_end) {
+    if (lives_list_length(mt->selected_tracks)==2&&mt->region_start!=mt->region_end) {
       // apply to region
-      g_idle_add_full(G_PRIORITY_HIGH,mt_add_region_effect_idle,mt,NULL);
+      lives_idle_add_full(G_PRIORITY_HIGH,mt_add_region_effect_idle,mt,NULL);
     }
-  }
-  else if (nins>=1000000) {
+  } else if (nins>=1000000) {
     // compositor
     if (mt->selected_tracks!=NULL&&mt->region_start!=mt->region_end) {
       // apply to region
-      g_idle_add_full(G_PRIORITY_HIGH,mt_add_region_effect_idle,mt,NULL);
+      lives_idle_add_full(G_PRIORITY_HIGH,mt_add_region_effect_idle,mt,NULL);
     }
   }
 
@@ -3645,14 +3793,14 @@
 
 
 
-static boolean filter_ebox_pressed (LiVESWidget *eventbox, LiVESXEventButton *event, gpointer user_data) {
+static boolean filter_ebox_pressed(LiVESWidget *eventbox, LiVESXEventButton *event, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
 
   if (mt->is_rendering) return FALSE;
 
-  mt->selected_filter=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(eventbox),"fxid"));
+  mt->selected_filter=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"fxid"));
 
-  if (event->type!=GDK_BUTTON_PRESS) {
+  if (event->type!=LIVES_BUTTON_PRESS) {
     // double click
     return FALSE;
   }
@@ -3661,8 +3809,7 @@
     // change cursor to mini block
     if (mt->video_draws==NULL&&mt->audio_draws==NULL) {
       return FALSE;
-    }
-    else {
+    } else {
       mt_set_cursor_style(mt,LIVES_CURSOR_FX_BLOCK,FX_BLOCK_WIDTH,FX_BLOCK_HEIGHT,0,0,FX_BLOCK_HEIGHT/2);
       mt->hotspot_x=mt->hotspot_y=0;
     }
@@ -3680,8 +3827,8 @@
 
 static void populate_filter_box(LiVESWidget *box, int ninchans, lives_mt *mt) {
   LiVESWidget *eventbox=NULL,*xeventbox,*vbox,*label;
-  gchar *txt;
-  gchar *tmp;
+  char *txt;
+  char *tmp;
 
   lives_fx_cat_t cat,subcat;
 
@@ -3694,72 +3841,70 @@
 
   if (mt->block_selected) eventbox=mt->block_selected->eventbox;
 
-  for (i=0;i<nfilts;i++) {
+  for (i=0; i<nfilts; i++) {
     weed_plant_t *filter=get_weed_filter(i);
     if (filter!=NULL&&!weed_plant_has_leaf(filter,"host_menu_hide")) {
 
-      if ((is_pure_audio(filter,FALSE)&&(eventbox==NULL||!is_audio_eventbox(mt,eventbox)))||
-	  (!is_pure_audio(filter,FALSE)&&eventbox!=NULL&&is_audio_eventbox(mt,eventbox))) continue;
+      if ((is_pure_audio(filter,FALSE)&&(eventbox==NULL||!is_audio_eventbox(eventbox)))||
+          (!is_pure_audio(filter,FALSE)&&eventbox!=NULL&&is_audio_eventbox(eventbox))) continue;
 
       nins=enabled_in_channels(filter,TRUE);
 
       if ((nins==ninchans||(ninchans==1000000&&nins>=ninchans))&&enabled_out_channels(filter,FALSE)==1) {
-	if (weed_plant_has_leaf(filter,"plugin_unstable")&&
-	    weed_get_boolean_value(filter,"plugin_unstable",&error)==WEED_TRUE) {
-	  if (!prefs->unstable_fx) continue;
-	  tmp=weed_filter_idx_get_name(i);
-	  txt=g_strdup_printf(_("%s [unstable]"),tmp);
-	  g_free(tmp);
-	}
-	else txt=weed_filter_idx_get_name(i);
-
-	cat=weed_filter_categorise(filter,enabled_in_channels(filter,TRUE),enabled_out_channels(filter,FALSE));
-	if ((subcat=weed_filter_subcategorise(filter,cat,(cat==LIVES_FX_CAT_COMPOSITOR)))!=0) {
-	  tmp=g_strdup_printf("%s (%s)",txt,lives_fx_cat_to_text(subcat,FALSE));
-	  g_free(txt);
-	  txt=tmp;
-	}
-
-	xeventbox=lives_event_box_new();
-	g_object_set_data(G_OBJECT(xeventbox),"fxid",GINT_TO_POINTER(i));
-
-	lives_widget_add_events (xeventbox, LIVES_BUTTON_RELEASE_MASK | LIVES_BUTTON_PRESS_MASK);
-	if (palette->style&STYLE_1) {
-	  if (palette->style&STYLE_3) {
-	    lives_widget_set_bg_color(xeventbox, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
-	    lives_widget_set_bg_color(xeventbox, LIVES_WIDGET_STATE_PRELIGHT, &palette->menu_and_bars);
-	  }
-	  else {
-	    lives_widget_set_bg_color(xeventbox, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
-	    lives_widget_set_bg_color(xeventbox, LIVES_WIDGET_STATE_PRELIGHT, &palette->normal_back);
-	  }
-	}
-
-	vbox=lives_vbox_new(FALSE,0);
-
-	lives_container_set_border_width (LIVES_CONTAINER (vbox), widget_opts.border_width>>1);
-	lives_container_add (LIVES_CONTAINER (xeventbox), vbox);
-	label=lives_standard_label_new(txt);
-	g_free(txt);
-	
-	if (palette->style&STYLE_1) {
-	  lives_widget_set_fg_color (label, LIVES_WIDGET_STATE_NORMAL, &palette->info_text);
-	  lives_widget_set_fg_color (label, LIVES_WIDGET_STATE_PRELIGHT, &palette->info_text);
-	}
-	lives_container_set_border_width (LIVES_CONTAINER (xeventbox), widget_opts.border_width>>1);
-	lives_box_pack_start (LIVES_BOX (vbox), label, FALSE, FALSE, 0);
-
-	// pack a/v transitions first
-	if (get_transition_param(filter,FALSE)==-1||!has_video_chans_in(filter,FALSE)) 
-	  lives_box_pack_end (LIVES_BOX (box), xeventbox, FALSE, FALSE, 0);
-	else lives_box_pack_start (LIVES_BOX (box), xeventbox, FALSE, FALSE, 0);
-	
-	lives_signal_connect (LIVES_GUI_OBJECT (xeventbox), "button_press_event",
-			  LIVES_GUI_CALLBACK (filter_ebox_pressed),
-			  (gpointer)mt);
-	lives_signal_connect (LIVES_GUI_OBJECT (xeventbox), "button_release_event",
-			  LIVES_GUI_CALLBACK (on_drag_filter_end),
-			  (gpointer)mt);
+        if (weed_plant_has_leaf(filter,"plugin_unstable")&&
+            weed_get_boolean_value(filter,"plugin_unstable",&error)==WEED_TRUE) {
+          if (!prefs->unstable_fx) continue;
+          tmp=weed_filter_idx_get_name(i);
+          txt=lives_strdup_printf(_("%s [unstable]"),tmp);
+          lives_free(tmp);
+        } else txt=weed_filter_idx_get_name(i);
+
+        cat=weed_filter_categorise(filter,enabled_in_channels(filter,TRUE),enabled_out_channels(filter,FALSE));
+        if ((subcat=weed_filter_subcategorise(filter,cat,(cat==LIVES_FX_CAT_COMPOSITOR)))!=0) {
+          tmp=lives_strdup_printf("%s (%s)",txt,lives_fx_cat_to_text(subcat,FALSE));
+          lives_free(txt);
+          txt=tmp;
+        }
+
+        xeventbox=lives_event_box_new();
+        lives_widget_object_set_data(LIVES_WIDGET_OBJECT(xeventbox),"fxid",LIVES_INT_TO_POINTER(i));
+
+        lives_widget_add_events(xeventbox, LIVES_BUTTON_RELEASE_MASK | LIVES_BUTTON_PRESS_MASK);
+        if (palette->style&STYLE_1) {
+          if (palette->style&STYLE_3) {
+            lives_widget_set_bg_color(xeventbox, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+            lives_widget_set_bg_color(xeventbox, LIVES_WIDGET_STATE_PRELIGHT, &palette->menu_and_bars);
+          } else {
+            lives_widget_set_bg_color(xeventbox, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
+            lives_widget_set_bg_color(xeventbox, LIVES_WIDGET_STATE_PRELIGHT, &palette->normal_back);
+          }
+        }
+
+        vbox=lives_vbox_new(FALSE,0);
+
+        lives_container_set_border_width(LIVES_CONTAINER(vbox), widget_opts.border_width>>1);
+        lives_container_add(LIVES_CONTAINER(xeventbox), vbox);
+        label=lives_standard_label_new(txt);
+        lives_free(txt);
+
+        if (palette->style&STYLE_1) {
+          lives_widget_set_fg_color(label, LIVES_WIDGET_STATE_NORMAL, &palette->info_text);
+          lives_widget_set_fg_color(label, LIVES_WIDGET_STATE_PRELIGHT, &palette->info_text);
+        }
+        lives_container_set_border_width(LIVES_CONTAINER(xeventbox), widget_opts.border_width>>1);
+        lives_box_pack_start(LIVES_BOX(vbox), label, FALSE, FALSE, 0);
+
+        // pack a/v transitions first
+        if (get_transition_param(filter,FALSE)==-1||!has_video_chans_in(filter,FALSE))
+          lives_box_pack_end(LIVES_BOX(box), xeventbox, FALSE, FALSE, 0);
+        else lives_box_pack_start(LIVES_BOX(box), xeventbox, FALSE, FALSE, 0);
+
+        lives_signal_connect(LIVES_GUI_OBJECT(xeventbox), LIVES_WIDGET_BUTTON_PRESS_EVENT,
+                             LIVES_GUI_CALLBACK(filter_ebox_pressed),
+                             (livespointer)mt);
+        lives_signal_connect(LIVES_GUI_OBJECT(xeventbox), LIVES_WIDGET_BUTTON_RELEASE_EVENT,
+                             LIVES_GUI_CALLBACK(on_drag_filter_end),
+                             (livespointer)mt);
       }
     }
   }
@@ -3767,16 +3912,16 @@
 
 
 
-static void mt_selblock(LiVESMenuItem *menuitem, gpointer user_data) {
+static void mt_selblock(LiVESMenuItem *menuitem, livespointer user_data) {
   // ctrl-Enter - select block at current time/track
   lives_mt *mt=(lives_mt *)user_data;
   LiVESWidget *eventbox;
-  double timesecs=lives_ruler_get_value(LIVES_RULER(mt->timeline));
+  double timesecs=mt->ptr_time;
   boolean desel=TRUE;
 
-  if (mt->current_track==-1||mt->aud_track_selected) 
-    eventbox=(LiVESWidget *)g_list_nth_data(mt->audio_draws,mt->current_track+mt->opts.back_audio_tracks);
-  else eventbox=(LiVESWidget *)g_list_nth_data(mt->video_draws,mt->current_track);
+  if (mt->current_track==-1||mt->aud_track_selected)
+    eventbox=(LiVESWidget *)lives_list_nth_data(mt->audio_draws,mt->current_track+mt->opts.back_audio_tracks);
+  else eventbox=(LiVESWidget *)lives_list_nth_data(mt->video_draws,mt->current_track);
 
   mt->putative_block=get_block_from_time(eventbox,timesecs,mt);
 
@@ -3787,83 +3932,89 @@
 }
 
 
-void mt_center_on_cursor (LiVESMenuItem *menuitem, gpointer user_data) {
+void mt_center_on_cursor(LiVESMenuItem *menuitem, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   mt_zoom(mt,1.);
-  paint_lines(mt,lives_ruler_get_value(LIVES_RULER (mt->timeline)),TRUE);
+  paint_lines(mt,mt->ptr_time,TRUE);
 }
 
-void mt_zoom_in (LiVESMenuItem *menuitem, gpointer user_data) {
+void mt_zoom_in(LiVESMenuItem *menuitem, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
-  mt_zoom(mt,0.5);
-  paint_lines(mt,lives_ruler_get_value(LIVES_RULER (mt->timeline)),TRUE);
+  mt_zoom(mt,-0.5);
+  if (mainw->playing_file>-1&&mt->opts.follow_playback) {
+    mt_zoom(mt,1.);
+  }
+  paint_lines(mt,mt->ptr_time,TRUE);
 }
 
-void mt_zoom_out (LiVESMenuItem *menuitem, gpointer user_data) {
+void mt_zoom_out(LiVESMenuItem *menuitem, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
-  mt_zoom(mt,2.);
-  paint_lines(mt,lives_ruler_get_value(LIVES_RULER (mt->timeline)),TRUE);
+  mt_zoom(mt,-2.);
+  if (mainw->playing_file>-1&&mt->opts.follow_playback) {
+    mt_zoom(mt,1.);
+  }
+  paint_lines(mt,mt->ptr_time,TRUE);
 }
 
 
-static void paned_pos (LiVESWidget *paned, gpointer user_data) {
+static void paned_pos(LiVESWidget *paned, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
-  lives_widget_queue_draw (mt->timeline_table);
+  lives_widget_queue_draw(mt->timeline_table);
 }
 
-static void hpaned_pos (LiVESWidget *paned, gpointer user_data) {
+static void hpaned_pos(LiVESWidget *paned, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
-  lives_widget_queue_draw (mt->hbox);
+  lives_widget_queue_draw(mt->hbox);
 }
 
 
 static void no_time_selected(lives_mt *mt) {
-    clear_context(mt);
-    add_context_label(mt,_("You can click and drag\nbelow the timeline"));
-    add_context_label(mt,_("to select a time region.\n"));
- }
+  clear_context(mt);
+  add_context_label(mt,_("You can click and drag\nbelow the timeline"));
+  add_context_label(mt,_("to select a time region.\n"));
+}
 
 
 
-void
-mt_spin_start_value_changed           (LiVESSpinButton   *spinbutton,
-				       gpointer         user_data) {
+void mt_spin_start_value_changed(LiVESSpinButton *spinbutton, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   boolean has_region=(mt->region_start!=mt->region_end);
 
+  if (!mainw->interactive) return;
+
   lives_signal_handler_block(mt->spinbutton_start,mt->spin_start_func);
   mt->region_start=q_dbl(lives_spin_button_get_value(spinbutton),mt->fps)/U_SEC;
   lives_spin_button_set_value(spinbutton,mt->region_start);
-  lives_spin_button_set_range (LIVES_SPIN_BUTTON (mt->spinbutton_end),mt->region_start,mt->end_secs);
+  lives_spin_button_set_range(LIVES_SPIN_BUTTON(mt->spinbutton_end),mt->region_start,mt->end_secs);
   lives_widget_queue_draw(mt->timeline_reg);
-  gdk_window_process_updates(lives_widget_get_xwindow(mt->timeline_reg),FALSE);
+  lives_widget_process_updates(mt->timeline_reg,FALSE);
   draw_region(mt);
   do_sel_context(mt);
 
   if ((((mt->region_start!=mt->region_end&&!has_region)||(mt->region_start==mt->region_end&&has_region)))&&
       mt->event_list!=NULL&&get_first_event(mt->event_list)!=NULL) {
-  if (mt->selected_tracks!=NULL) {
+    if (mt->selected_tracks!=NULL) {
       lives_widget_set_sensitive(mt->split_sel,TRUE);
       if (mt->region_start!=mt->region_end) {
-	lives_widget_set_sensitive(mt->playsel,TRUE);
-	lives_widget_set_sensitive(mt->ins_gap_sel,TRUE);
-	lives_widget_set_sensitive (mt->remove_first_gaps, TRUE);
-	lives_widget_set_sensitive(mt->fx_region,TRUE);
-	switch (g_list_length(mt->selected_tracks)) {
-	case 1:
-	  lives_widget_set_sensitive(mt->fx_region_1,TRUE);
-	  break;
-	case 2:
-	  lives_widget_set_sensitive(mt->fx_region_2,TRUE);
-	  break;
-	default:
-	  break;
-	}
+        lives_widget_set_sensitive(mt->playsel,TRUE);
+        lives_widget_set_sensitive(mt->ins_gap_sel,TRUE);
+        lives_widget_set_sensitive(mt->remove_first_gaps, TRUE);
+        lives_widget_set_sensitive(mt->fx_region,TRUE);
+        switch (lives_list_length(mt->selected_tracks)) {
+        case 1:
+          lives_widget_set_sensitive(mt->fx_region_1,TRUE);
+          break;
+        case 2:
+          lives_widget_set_sensitive(mt->fx_region_2,TRUE);
+          break;
+        default:
+          break;
+        }
       }
       // update labels
       if (get_poly_state_from_page(mt)==POLY_TRANS||get_poly_state_from_page(mt)==POLY_COMP) {
-	//polymorph(mt,POLY_NONE);
-	polymorph(mt,get_poly_state_from_page(mt));
+        //polymorph(mt,POLY_NONE);
+        polymorph(mt,get_poly_state_from_page(mt));
       }
     }
   }
@@ -3875,18 +4026,18 @@
 
 
 
-void
-mt_spin_end_value_changed           (LiVESSpinButton   *spinbutton,
-				     gpointer         user_data) {
+void mt_spin_end_value_changed(LiVESSpinButton *spinbutton, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   boolean has_region=(mt->region_start!=mt->region_end);
 
+  if (!mainw->interactive) return;
+
   lives_signal_handler_block(mt->spinbutton_end,mt->spin_end_func);
   mt->region_end=q_dbl(lives_spin_button_get_value(spinbutton),mt->fps)/U_SEC;
   lives_spin_button_set_value(spinbutton,mt->region_end);
-  lives_spin_button_set_range (LIVES_SPIN_BUTTON (mt->spinbutton_start),0.,mt->region_end);
+  lives_spin_button_set_range(LIVES_SPIN_BUTTON(mt->spinbutton_start),0.,mt->region_end);
   lives_widget_queue_draw(mt->timeline_reg);
-  gdk_window_process_updates(lives_widget_get_xwindow(mt->timeline_reg),FALSE);
+  lives_widget_process_updates(mt->timeline_reg,FALSE);
   draw_region(mt);
   do_sel_context(mt);
 
@@ -3895,26 +4046,26 @@
     if (mt->selected_tracks!=NULL) {
       lives_widget_set_sensitive(mt->split_sel,TRUE);
       if (mt->region_start!=mt->region_end) {
-	lives_widget_set_sensitive(mt->playsel,TRUE);
-	lives_widget_set_sensitive(mt->ins_gap_sel,TRUE);
-	lives_widget_set_sensitive (mt->remove_gaps, TRUE);
-	lives_widget_set_sensitive (mt->remove_first_gaps, TRUE);
-	lives_widget_set_sensitive(mt->fx_region,TRUE);
-	switch (g_list_length(mt->selected_tracks)) {
-	case 1:
-	  lives_widget_set_sensitive(mt->fx_region_1,TRUE);
-	  break;
-	case 2:
-	  lives_widget_set_sensitive(mt->fx_region_2,TRUE);
-	  break;
-	default:
-	  break;
-	}
+        lives_widget_set_sensitive(mt->playsel,TRUE);
+        lives_widget_set_sensitive(mt->ins_gap_sel,TRUE);
+        lives_widget_set_sensitive(mt->remove_gaps, TRUE);
+        lives_widget_set_sensitive(mt->remove_first_gaps, TRUE);
+        lives_widget_set_sensitive(mt->fx_region,TRUE);
+        switch (lives_list_length(mt->selected_tracks)) {
+        case 1:
+          lives_widget_set_sensitive(mt->fx_region_1,TRUE);
+          break;
+        case 2:
+          lives_widget_set_sensitive(mt->fx_region_2,TRUE);
+          break;
+        default:
+          break;
+        }
       }
       // update labels
       if (get_poly_state_from_page(mt)==POLY_TRANS||get_poly_state_from_page(mt)==POLY_COMP) {
-	polymorph(mt,POLY_NONE);
-	polymorph(mt,get_poly_state_from_page(mt));
+        polymorph(mt,POLY_NONE);
+        polymorph(mt,get_poly_state_from_page(mt));
       }
     }
   }
@@ -3925,7 +4076,7 @@
 }
 
 
-static boolean in_out_ebox_pressed (LiVESWidget *eventbox, LiVESXEventButton *event, gpointer user_data) {
+static boolean in_out_ebox_pressed(LiVESWidget *eventbox, LiVESXEventButton *event, livespointer user_data) {
 
   int height;
   double width;
@@ -3934,6 +4085,8 @@
   int file;
   lives_mt *mt=(lives_mt *)user_data;
 
+  if (!mainw->interactive) return FALSE;
+
   if (mt->block_selected!=NULL) return FALSE;
 
   ebwidth=lives_widget_get_allocation_width(mt->timeline);
@@ -3943,30 +4096,27 @@
   // change cursor to block
   if (mt->video_draws==NULL&&mt->audio_draws==NULL) {
     return FALSE;
-  }
-  else {
+  } else {
     if (sfile->frames>0) {
       if (!mt->opts.ign_ins_sel) {
-	width=(sfile->end-sfile->start+1.)/sfile->fps;
+        width=(sfile->end-sfile->start+1.)/sfile->fps;
+      } else {
+        width=sfile->frames/sfile->fps;
       }
-      else {
-	width=sfile->frames/sfile->fps;
-      }
-    }
-    else width=sfile->laudio_time;
+    } else width=sfile->laudio_time;
     if (width==0) return FALSE;
     width=width/(mt->tl_max-mt->tl_min)*(double)ebwidth;
     if (width>ebwidth) width=ebwidth;
     if (width<2) width=2;
     height=get_track_height(mt);
 
-    lives_set_cursor_style (LIVES_CURSOR_NORMAL,eventbox);
+    lives_set_cursor_style(LIVES_CURSOR_NORMAL,eventbox);
     mt_set_cursor_style(mt,LIVES_CURSOR_BLOCK,width,height,file,0,height/2);
 
     mt->hotspot_x=mt->hotspot_y=0;
   }
 
-  
+
   return FALSE;
 
 }
@@ -3974,7 +4124,7 @@
 
 
 
-static void do_clip_context (lives_mt *mt, LiVESXEventButton *event, lives_clip_t *sfile) {
+static void do_clip_context(lives_mt *mt, LiVESXEventButton *event, lives_clip_t *sfile) {
   // pop up a context menu when clip is right clicked on
 
   // unfinished...
@@ -3982,7 +4132,9 @@
   LiVESWidget *edit_start_end,*edit_clipedit,*close_clip,*show_clipinfo;
   LiVESWidget *menu=lives_menu_new();
 
-  lives_menu_set_title (LIVES_MENU(menu),_("LiVES: Selected clip"));
+  if (!mainw->interactive) return;
+
+  lives_menu_set_title(LIVES_MENU(menu),_("LiVES: Selected clip"));
 
   if (palette->style&STYLE_1) {
     lives_widget_set_bg_color(menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
@@ -3990,44 +4142,44 @@
   }
 
   if (sfile->frames>0) {
-    edit_start_end = lives_menu_item_new_with_mnemonic (_("_Adjust start and end points"));
-    lives_signal_connect (LIVES_GUI_OBJECT (edit_start_end), LIVES_WIDGET_ACTIVATE_EVENT,
-		      LIVES_GUI_CALLBACK (edit_start_end_cb),
-		      (gpointer)mt);
-    
-    lives_container_add (LIVES_CONTAINER (menu), edit_start_end);
+    edit_start_end = lives_menu_item_new_with_mnemonic(_("_Adjust start and end points"));
+    lives_signal_connect(LIVES_GUI_OBJECT(edit_start_end), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                         LIVES_GUI_CALLBACK(edit_start_end_cb),
+                         (livespointer)mt);
+
+    lives_container_add(LIVES_CONTAINER(menu), edit_start_end);
 
   }
 
-  edit_clipedit = lives_menu_item_new_with_mnemonic (_("_Edit/encode in clip editor"));
-  lives_signal_connect (LIVES_GUI_OBJECT (edit_clipedit), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (multitrack_end_cb),
-		    (gpointer)mt);
+  edit_clipedit = lives_menu_item_new_with_mnemonic(_("_Edit/encode in clip editor"));
+  lives_signal_connect(LIVES_GUI_OBJECT(edit_clipedit), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(multitrack_end_cb),
+                       (livespointer)mt);
 
-  lives_container_add (LIVES_CONTAINER (menu), edit_clipedit);
+  lives_container_add(LIVES_CONTAINER(menu), edit_clipedit);
 
-  show_clipinfo = lives_menu_item_new_with_mnemonic (_("_Show clip information"));
-  lives_signal_connect (LIVES_GUI_OBJECT (show_clipinfo), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (show_clipinfo_cb),
-		    (gpointer)mt);
+  show_clipinfo = lives_menu_item_new_with_mnemonic(_("_Show clip information"));
+  lives_signal_connect(LIVES_GUI_OBJECT(show_clipinfo), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(show_clipinfo_cb),
+                       (livespointer)mt);
 
-  lives_container_add (LIVES_CONTAINER (menu), show_clipinfo);
+  lives_container_add(LIVES_CONTAINER(menu), show_clipinfo);
 
-  close_clip = lives_menu_item_new_with_mnemonic (_("_Close this clip"));
-  lives_signal_connect (LIVES_GUI_OBJECT (close_clip), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (close_clip_cb),
-		    (gpointer)mt);
+  close_clip = lives_menu_item_new_with_mnemonic(_("_Close this clip"));
+  lives_signal_connect(LIVES_GUI_OBJECT(close_clip), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(close_clip_cb),
+                       (livespointer)mt);
 
-  lives_container_add (LIVES_CONTAINER (menu), close_clip);
+  lives_container_add(LIVES_CONTAINER(menu), close_clip);
 
-  lives_widget_show_all (menu);
-  lives_menu_popup (LIVES_MENU(menu), event);
+  lives_widget_show_all(menu);
+  lives_menu_popup(LIVES_MENU(menu), event);
 
 }
 
 
 
-static boolean clip_ebox_pressed (LiVESWidget *eventbox, LiVESXEventButton *event, gpointer user_data) {
+static boolean clip_ebox_pressed(LiVESWidget *eventbox, LiVESXEventButton *event, livespointer user_data) {
 
   int height;
   double width;
@@ -4038,7 +4190,9 @@
 
   if (!mt->is_ready) return FALSE;
 
-  if (event->type!=GDK_BUTTON_PRESS&&!mt->is_rendering) {
+  if (!mainw->interactive) return FALSE;
+
+  if (event->type!=LIVES_BUTTON_PRESS&&!mt->is_rendering) {
     lives_set_cursor_style(LIVES_CURSOR_NORMAL,NULL);
     // double click, open up in clip editor
     if (mainw->playing_file==-1) multitrack_delete(mt,!(prefs->warning_mask&WARN_MASK_EXIT_MT));
@@ -4047,7 +4201,7 @@
 
   mt->clip_selected=get_box_child_index(LIVES_BOX(mt->clip_inner_box),eventbox);
   mt_clip_select(mt,FALSE);
-  
+
   ebwidth=lives_widget_get_allocation_width(mt->timeline);
   file=mt_file_from_clip(mt,mt->clip_selected);
   sfile=mainw->files[file];
@@ -4060,39 +4214,33 @@
   // change cursor to block
   if (mt->video_draws==NULL&&mt->audio_draws==NULL) {
     return FALSE;
-  }
-  else {
+  } else {
     if (sfile->frames>0) {
       if (!mt->opts.ign_ins_sel) {
-	width=(sfile->end-sfile->start+1.)/sfile->fps;
-      }
-      else {
-	width=sfile->frames/sfile->fps;
+        width=(sfile->end-sfile->start+1.)/sfile->fps;
+      } else {
+        width=sfile->frames/sfile->fps;
       }
-    }
-    else width=sfile->laudio_time;
+    } else width=sfile->laudio_time;
     if (width==0) return FALSE;
     width=width/(mt->tl_max-mt->tl_min)*(double)ebwidth;
     if (width>ebwidth) width=ebwidth;
     if (width<2) width=2;
     height=get_track_height(mt);
-    lives_set_cursor_style (LIVES_CURSOR_NORMAL,eventbox);
+    lives_set_cursor_style(LIVES_CURSOR_NORMAL,eventbox);
     mt_set_cursor_style(mt,LIVES_CURSOR_BLOCK,width,height,file,0,height/2);
     mt->hotspot_x=mt->hotspot_y=0;
   }
-  
+
   return FALSE;
 }
 
 
 
-static boolean
-on_drag_clip_end           (LiVESWidget       *widget,
-			    LiVESXEventButton  *event,
-			    gpointer         user_data) {
+static boolean on_drag_clip_end(LiVESWidget *widget, LiVESXEventButton *event, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
 
-  GdkWindow *window;
+  LiVESXWindow *window;
   LiVESWidget *eventbox;
   LiVESWidget *labelbox;
   LiVESWidget *ahbox;
@@ -4103,100 +4251,104 @@
 
   register int i;
 
+  if (!mainw->interactive) return FALSE;
+
   if (mt->is_rendering) return FALSE;
 
   if (mt->cursor_style!=LIVES_CURSOR_BLOCK) return FALSE;
 
-  osecs=lives_ruler_get_value(LIVES_RULER(mt->timeline));
+  osecs=mt->ptr_time;
 
   lives_set_cursor_style(LIVES_CURSOR_BUSY,NULL);
 
-  window=lives_display_get_window_at_pointer 
-    ((LiVESXDevice *)mainw->mgeom[prefs->gui_monitor>0?prefs->gui_monitor-1:0].mouse_device,
-     mt->display,&win_x,&win_y);
-
-  if (cfile->achans>0&&mt->opts.back_audio_tracks>0&&GPOINTER_TO_INT(g_object_get_data(G_OBJECT(mt->audio_draws->data),"hidden"))==0) {
-    labelbox=(LiVESWidget *)g_object_get_data(G_OBJECT(mt->audio_draws->data),"labelbox");
-    ahbox=(LiVESWidget *)g_object_get_data(G_OBJECT(mt->audio_draws->data),"ahbox");
-  
+  window=lives_display_get_window_at_pointer
+         ((LiVESXDevice *)mainw->mgeom[prefs->gui_monitor>0?prefs->gui_monitor-1:0].mouse_device,
+          mt->display,&win_x,&win_y);
+
+  if (cfile->achans>0&&mt->opts.back_audio_tracks>0&&
+      LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(mt->audio_draws->data),"hidden"))==0) {
+    labelbox=(LiVESWidget *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(mt->audio_draws->data),"labelbox");
+    ahbox=(LiVESWidget *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(mt->audio_draws->data),"ahbox");
+
     if (lives_widget_get_xwindow(LIVES_WIDGET(mt->audio_draws->data))==window||
-	lives_widget_get_xwindow(labelbox)==window||lives_widget_get_xwindow(ahbox)==window) {
+        lives_widget_get_xwindow(labelbox)==window||lives_widget_get_xwindow(ahbox)==window) {
 
       // insert in backing audio
       if (lives_widget_get_xwindow(labelbox)==window||lives_widget_get_xwindow(ahbox)==window) timesecs=0.;
       else {
-	lives_widget_get_pointer((LiVESXDevice *)mainw->mgeom[prefs->gui_monitor>0?prefs->gui_monitor-1:0].mouse_device, 
-				 mt->timeline, &mt->sel_x, &mt->sel_y);
-	timesecs=get_time_from_x(mt,mt->sel_x);
+        lives_widget_get_pointer((LiVESXDevice *)mainw->mgeom[prefs->gui_monitor>0?prefs->gui_monitor-1:0].mouse_device,
+                                 mt->timeline, &mt->sel_x, &mt->sel_y);
+        timesecs=get_time_from_x(mt,mt->sel_x);
       }
       mt->current_track=-1;
       track_select(mt);
-      
+
       if (mainw->playing_file==-1) {
-	lives_ruler_set_value(LIVES_RULER (mt->timeline),timesecs);
-	if (!mt->is_paused) {
-	  if (mt->poly_state==POLY_FX_STACK) {
-	    polymorph(mt,POLY_FX_STACK);
-	  }
-	  mt_show_current_frame(mt, FALSE);
-	  if (timesecs>0.) {
-	    lives_widget_set_sensitive (mt->rewind,TRUE);
-	    lives_widget_set_sensitive (mainw->m_rewindbutton, TRUE);
-	  }
-	}
-	lives_widget_queue_draw (mt->timeline);
+        mt->ptr_time=lives_ruler_set_value(LIVES_RULER(mt->timeline),timesecs);
+        if (!mt->is_paused) {
+          if (mt->poly_state==POLY_FX_STACK) {
+            polymorph(mt,POLY_FX_STACK);
+          }
+          mt_show_current_frame(mt, FALSE);
+          if (timesecs>0.) {
+            lives_widget_set_sensitive(mt->rewind,TRUE);
+            lives_widget_set_sensitive(mainw->m_rewindbutton, TRUE);
+          }
+        }
+        lives_widget_queue_draw(mt->timeline);
       }
 
       if (mainw->playing_file==-1&&(mainw->files[mt->file_selected]->laudio_time>
-				    ((mainw->files[mt->file_selected]->start-1.)/mainw->files[mt->file_selected]->fps)||
-				    (mainw->files[mt->file_selected]->laudio_time>0.&&mt->opts.ign_ins_sel))) 
-	insert_audio_here_cb(NULL,(gpointer)mt);
+                                    ((mainw->files[mt->file_selected]->start-1.)/mainw->files[mt->file_selected]->fps)||
+                                    (mainw->files[mt->file_selected]->laudio_time>0.&&mt->opts.ign_ins_sel)))
+        insert_audio_here_cb(NULL,(livespointer)mt);
       lives_set_cursor_style(LIVES_CURSOR_NORMAL,NULL);
-      if (mt->is_paused) lives_ruler_set_value(LIVES_RULER (mt->timeline),osecs);
+      if (mt->is_paused) mt->ptr_time=lives_ruler_set_value(LIVES_RULER(mt->timeline),osecs);
       return FALSE;
     }
   }
 
-  for (i=0;i<g_list_length(mt->video_draws);i++) {
-    eventbox=(LiVESWidget *)g_list_nth_data(mt->video_draws,i);
-    if (GPOINTER_TO_INT(g_object_get_data(G_OBJECT(eventbox),"hidden"))!=0) continue;
-    labelbox=(LiVESWidget *)g_object_get_data(G_OBJECT(eventbox),"labelbox");
-    ahbox=(LiVESWidget *)g_object_get_data(G_OBJECT(eventbox),"ahbox");
+  for (i=0; i<lives_list_length(mt->video_draws); i++) {
+    eventbox=(LiVESWidget *)lives_list_nth_data(mt->video_draws,i);
+    if (LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"hidden"))!=0) continue;
+    labelbox=(LiVESWidget *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"labelbox");
+    ahbox=(LiVESWidget *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"ahbox");
     if (lives_widget_get_xwindow(eventbox)==window||lives_widget_get_xwindow(labelbox)==window||lives_widget_get_xwindow(ahbox)==window) {
       if (lives_widget_get_xwindow(labelbox)==window||lives_widget_get_xwindow(ahbox)==window) timesecs=0.;
       else {
-	lives_widget_get_pointer((LiVESXDevice *)mainw->mgeom[prefs->gui_monitor>0?prefs->gui_monitor-1:0].mouse_device, 
-				 mt->timeline, &mt->sel_x, &mt->sel_y);
-	timesecs=get_time_from_x(mt,mt->sel_x);
+        lives_widget_get_pointer((LiVESXDevice *)mainw->mgeom[prefs->gui_monitor>0?prefs->gui_monitor-1:0].mouse_device,
+                                 mt->timeline, &mt->sel_x, &mt->sel_y);
+        timesecs=get_time_from_x(mt,mt->sel_x);
       }
-      mt->current_track=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(eventbox),"layer_number"));
+      mt->current_track=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"layer_number"));
 
       track_select(mt);
 
       if (mainw->playing_file==-1) {
-	lives_ruler_set_value(LIVES_RULER (mt->timeline),timesecs);
-	if (!mt->is_paused) {
-	  mt_show_current_frame(mt, FALSE);
-	  if (timesecs>0.) {
-	    lives_widget_set_sensitive (mt->rewind,TRUE);
-	    lives_widget_set_sensitive (mainw->m_rewindbutton, TRUE);
-	  }
-	}
-	lives_widget_queue_draw (mt->timeline);
+        mt->ptr_time=lives_ruler_set_value(LIVES_RULER(mt->timeline),timesecs);
+        if (!mt->is_paused) {
+          mt_show_current_frame(mt, FALSE);
+          if (timesecs>0.) {
+            lives_widget_set_sensitive(mt->rewind,TRUE);
+            lives_widget_set_sensitive(mainw->m_rewindbutton, TRUE);
+          }
+        }
+        lives_widget_queue_draw(mt->timeline);
       }
       if (mainw->playing_file==-1&&mainw->files[mt->file_selected]->frames>0) insert_here_cb(NULL,mt);
       break;
     }
   }
 
-  if (mt->is_paused) lives_ruler_set_value(LIVES_RULER (mt->timeline),osecs);
+  if (mt->is_paused) mt->ptr_time=lives_ruler_set_value(LIVES_RULER(mt->timeline),osecs);
+
   lives_set_cursor_style(LIVES_CURSOR_NORMAL,NULL);
 
   return FALSE;
 }
 
 
-static boolean on_clipbox_enter (LiVESWidget *widget, GdkEventCrossing *event, gpointer user_data) {
+static boolean on_clipbox_enter(LiVESWidget *widget, LiVESXEventCrossing *event, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   if (mt->cursor_style!=LIVES_CURSOR_NORMAL) return FALSE;
   lives_set_cursor_style(LIVES_CURSOR_HAND2,widget);
@@ -4205,104 +4357,104 @@
 
 
 void mt_init_start_end_spins(lives_mt *mt) {
-  LiVESWidget *hbox,*btoolbar,*label,*eventbox;
+  LiVESWidget *hbox,*label,*eventbox;
 
   int dpw;
   boolean woat;
 
-  hbox = lives_hbox_new (FALSE, 0);
-  lives_widget_show (hbox);
-  
-  lives_box_pack_start (LIVES_BOX (mt->top_vbox), hbox, FALSE, FALSE, 6);
+  hbox = lives_hbox_new(FALSE, 0);
+  lives_widget_show(hbox);
+
+  lives_box_pack_start(LIVES_BOX(mt->top_vbox), hbox, FALSE, FALSE, 6);
 
-  eventbox = lives_event_box_new ();
-  lives_box_pack_start (LIVES_BOX (hbox), eventbox, FALSE, FALSE, widget_opts.packing_width*2);
+  eventbox = lives_event_box_new();
+  lives_box_pack_start(LIVES_BOX(hbox), eventbox, FALSE, FALSE, widget_opts.packing_width*2);
 
   if (palette->style&STYLE_1) {
     lives_widget_set_bg_color(eventbox, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
     lives_widget_set_fg_color(eventbox, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars_fore);
   }
 
-  btoolbar=lives_toolbar_new();
-  lives_container_add (LIVES_CONTAINER (eventbox), btoolbar);
+  mt->btoolbar=lives_toolbar_new();
+  lives_container_add(LIVES_CONTAINER(eventbox), mt->btoolbar);
 
-  lives_toolbar_set_show_arrow(LIVES_TOOLBAR(btoolbar),FALSE);
+  lives_toolbar_set_show_arrow(LIVES_TOOLBAR(mt->btoolbar),FALSE);
 
-  lives_toolbar_set_style (LIVES_TOOLBAR (btoolbar), LIVES_TOOLBAR_TEXT);
+  lives_toolbar_set_style(LIVES_TOOLBAR(mt->btoolbar), LIVES_TOOLBAR_TEXT);
 
 
   mt->amixer_button=LIVES_WIDGET(lives_tool_button_new(NULL,NULL));
 
-  label=lives_standard_label_new(_ ("Audio mixer (ctrl-m)"));
+  label=lives_standard_label_new(_("Audio mixer (ctrl-m)"));
   lives_tool_button_set_label_widget(LIVES_TOOL_BUTTON(mt->amixer_button),label);
 
-  lives_toolbar_insert(LIVES_TOOLBAR(btoolbar),LIVES_TOOL_ITEM(mt->amixer_button),-1);
+  lives_toolbar_insert(LIVES_TOOLBAR(mt->btoolbar),LIVES_TOOL_ITEM(mt->amixer_button),-1);
 
   if (palette->style&STYLE_1) {
-    lives_widget_set_bg_color(btoolbar, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
+    lives_widget_set_bg_color(mt->btoolbar, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
 
     lives_widget_set_bg_color(mt->amixer_button, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
     lives_widget_set_bg_color(label, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
 
-    lives_widget_set_bg_color(btoolbar, LIVES_WIDGET_STATE_PRELIGHT, &palette->menu_and_bars);
-    lives_widget_set_bg_color(btoolbar, LIVES_WIDGET_STATE_INSENSITIVE, &palette->menu_and_bars);
+    lives_widget_set_bg_color(mt->btoolbar, LIVES_WIDGET_STATE_PRELIGHT, &palette->menu_and_bars);
+    lives_widget_set_bg_color(mt->btoolbar, LIVES_WIDGET_STATE_INSENSITIVE, &palette->menu_and_bars);
 
-    lives_widget_set_fg_color(btoolbar, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars_fore);
+    lives_widget_set_fg_color(mt->btoolbar, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars_fore);
 
     lives_widget_set_fg_color(mt->amixer_button, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars_fore);
     lives_widget_set_fg_color(label, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars_fore);
 
-    lives_widget_set_fg_color(btoolbar, LIVES_WIDGET_STATE_PRELIGHT, &palette->menu_and_bars_fore);
-    lives_widget_set_fg_color(btoolbar, LIVES_WIDGET_STATE_INSENSITIVE, &palette->menu_and_bars_fore);
+    lives_widget_set_fg_color(mt->btoolbar, LIVES_WIDGET_STATE_PRELIGHT, &palette->menu_and_bars_fore);
+    lives_widget_set_fg_color(mt->btoolbar, LIVES_WIDGET_STATE_INSENSITIVE, &palette->menu_and_bars_fore);
   }
 
-  lives_widget_add_accelerator (mt->amixer_button, LIVES_WIDGET_CLICKED_EVENT, mt->accel_group,
-                              LIVES_KEY_m, LIVES_CONTROL_MASK,
-                              LIVES_ACCEL_VISIBLE);
+  lives_widget_add_accelerator(mt->amixer_button, LIVES_WIDGET_CLICKED_SIGNAL, mt->accel_group,
+                               LIVES_KEY_m, LIVES_CONTROL_MASK,
+                               LIVES_ACCEL_VISIBLE);
 
   if (cfile->achans==0||!mt->opts.pertrack_audio) lives_widget_set_sensitive(mt->amixer_button,FALSE);
 
-  lives_signal_connect (LIVES_GUI_OBJECT (mt->amixer_button), LIVES_WIDGET_CLICKED_EVENT,
-		    LIVES_GUI_CALLBACK (amixer_show),
-		    (gpointer)mt);
+  lives_signal_connect(LIVES_GUI_OBJECT(mt->amixer_button), LIVES_WIDGET_CLICKED_SIGNAL,
+                       LIVES_GUI_CALLBACK(amixer_show),
+                       (livespointer)mt);
 
   woat=widget_opts.apply_theme;
   dpw=widget_opts.packing_width;
 
   widget_opts.apply_theme=FALSE;
   widget_opts.packing_width=MAIN_SPIN_SPACER;
-  mt->spinbutton_start = lives_standard_spin_button_new (NULL,FALSE,0., 0., 0., 1./mt->fps, 1./mt->fps, 3,
-							 NULL,NULL);
+  mt->spinbutton_start = lives_standard_spin_button_new(NULL,FALSE,0., 0., 0., 1./mt->fps, 1./mt->fps, 3,
+                         NULL,NULL);
   widget_opts.apply_theme=woat;
   widget_opts.packing_width=dpw;
 
-  lives_box_pack_start (LIVES_BOX (hbox), mt->spinbutton_start, TRUE, FALSE, MAIN_SPIN_SPACER);
+  lives_box_pack_start(LIVES_BOX(hbox), mt->spinbutton_start, TRUE, FALSE, MAIN_SPIN_SPACER);
 
-  mt->l_sel_arrow = lives_arrow_new (LIVES_ARROW_LEFT, LIVES_SHADOW_OUT);
-  lives_box_pack_start (LIVES_BOX (hbox), mt->l_sel_arrow, FALSE, FALSE, 0);
+  mt->l_sel_arrow = lives_arrow_new(LIVES_ARROW_LEFT, LIVES_SHADOW_OUT);
+  lives_box_pack_start(LIVES_BOX(hbox), mt->l_sel_arrow, FALSE, FALSE, 0);
   lives_widget_set_fg_color(mt->l_sel_arrow, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
 
-  lives_entry_set_width_chars (LIVES_ENTRY (mt->spinbutton_start),12);
+  lives_entry_set_width_chars(LIVES_ENTRY(mt->spinbutton_start),12);
   mt->sel_label = lives_standard_label_new(NULL);
 
   set_sel_label(mt->sel_label);
-  lives_box_pack_start (LIVES_BOX (hbox), mt->sel_label, FALSE, FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(hbox), mt->sel_label, FALSE, FALSE, 0);
 
-  mt->r_sel_arrow = lives_arrow_new (LIVES_ARROW_RIGHT, LIVES_SHADOW_OUT);
-  lives_box_pack_start (LIVES_BOX (hbox), mt->r_sel_arrow, FALSE, FALSE, 3);
+  mt->r_sel_arrow = lives_arrow_new(LIVES_ARROW_RIGHT, LIVES_SHADOW_OUT);
+  lives_box_pack_start(LIVES_BOX(hbox), mt->r_sel_arrow, FALSE, FALSE, 3);
   lives_widget_set_fg_color(mt->r_sel_arrow, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
 
   widget_opts.apply_theme=FALSE;
   widget_opts.packing_width=MAIN_SPIN_SPACER;
-  mt->spinbutton_end = lives_standard_spin_button_new (NULL,FALSE,0., 0., 0., 1./mt->fps, 1./mt->fps, 3,
-							 NULL,NULL);
+  mt->spinbutton_end = lives_standard_spin_button_new(NULL,FALSE,0., 0., 0., 1./mt->fps, 1./mt->fps, 3,
+                       NULL,NULL);
 
   widget_opts.apply_theme=woat;
   widget_opts.packing_width=dpw;
 
-  lives_entry_set_width_chars (LIVES_ENTRY (mt->spinbutton_end),12);
+  lives_entry_set_width_chars(LIVES_ENTRY(mt->spinbutton_end),12);
 
-  lives_box_pack_start (LIVES_BOX (hbox), mt->spinbutton_end, TRUE, FALSE, MAIN_SPIN_SPACER);
+  lives_box_pack_start(LIVES_BOX(hbox), mt->spinbutton_end, TRUE, FALSE, MAIN_SPIN_SPACER);
 
   if (palette->style&STYLE_1&&palette->style&STYLE_2) {
 #if !GTK_CHECK_VERSION(3,0,0)
@@ -4318,67 +4470,73 @@
     lives_widget_set_fg_color(mt->sel_label, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
   }
 
-  mt->spin_start_func=lives_signal_connect_after (LIVES_GUI_OBJECT (mt->spinbutton_start), "value_changed",
-					      LIVES_GUI_CALLBACK (mt_spin_start_value_changed),
-					      (gpointer)mt);
-
-  mt->spin_end_func=lives_signal_connect_after (LIVES_GUI_OBJECT (mt->spinbutton_end), "value_changed",
-					    LIVES_GUI_CALLBACK (mt_spin_end_value_changed),
-					    (gpointer)mt);
+  mt->spin_start_func=lives_signal_connect_after(LIVES_GUI_OBJECT(mt->spinbutton_start), LIVES_WIDGET_VALUE_CHANGED_SIGNAL,
+                      LIVES_GUI_CALLBACK(mt_spin_start_value_changed),
+                      (livespointer)mt);
+
+  mt->spin_end_func=lives_signal_connect_after(LIVES_GUI_OBJECT(mt->spinbutton_end), LIVES_WIDGET_VALUE_CHANGED_SIGNAL,
+                    LIVES_GUI_CALLBACK(mt_spin_end_value_changed),
+                    (livespointer)mt);
 }
 
 
 
 void mouse_mode_context(lives_mt *mt) {
   clear_context(mt);
-  
+
   if (mt->opts.mouse_mode==MOUSE_MODE_MOVE) {
-    add_context_label (mt,(_("Single click on timeline")));
-    add_context_label (mt,(_("to select a frame.")));
-    add_context_label (mt,(_("Double click or right click on timeline")));
-    add_context_label (mt,(_("to select a block.")));
-    add_context_label (mt,(_("Clips can be dragged")));
-    add_context_label (mt,(_("onto the timeline.")));
-    
-    add_context_label (mt,(_("Mouse mode is: Move")));
-    add_context_label (mt,(_("clips can be moved around.")));
-  }
-  else if (mt->opts.mouse_mode==MOUSE_MODE_SELECT) {
+    add_context_label(mt,(_("Single click on timeline")));
+    add_context_label(mt,(_("to select a frame.")));
+    add_context_label(mt,(_("Double click or right click on timeline")));
+    add_context_label(mt,(_("to select a block.")));
+    add_context_label(mt,(_("Clips can be dragged")));
+    add_context_label(mt,(_("onto the timeline.")));
+
+    add_context_label(mt,(_("Mouse mode is: Move")));
+    add_context_label(mt,(_("clips can be moved around.")));
+  } else if (mt->opts.mouse_mode==MOUSE_MODE_SELECT) {
     clear_context(mt);
-    
-    add_context_label (mt,(_("Mouse mode is: Select.")));
-    add_context_label (mt,(_("Drag with mouse on timeline")));
-    add_context_label (mt,(_("to select tracks and time.")));
+
+    add_context_label(mt,(_("Mouse mode is: Select.")));
+    add_context_label(mt,(_("Drag with mouse on timeline")));
+    add_context_label(mt,(_("to select tracks and time.")));
   }
 }
 
 
-
-
-static void on_insert_mode_changed (LiVESMenuItem *menuitem, gpointer user_data) {
-  lives_mt *mt=(lives_mt *)user_data;
-
-  if (menuitem==(LiVESMenuItem *)mt->ins_normal) {
+void update_insert_mode(lives_mt *mt) {
+  if (mt->opts.insert_mode==INSERT_MODE_NORMAL) {
     set_menu_text(mt->ins_menuitem,_("_Insert mode: Normal"),TRUE);
-    mt->opts.insert_mode=INSERT_MODE_NORMAL;
   }
 
   lives_signal_handler_block(mt->ins_normal,mt->ins_normal_func);
   lives_check_menu_item_set_active(LIVES_CHECK_MENU_ITEM(mt->ins_normal),mt->opts.insert_mode==INSERT_MODE_NORMAL);
   lives_signal_handler_unblock(mt->ins_normal,mt->ins_normal_func);
+}
+
+
+
+static void on_insert_mode_changed(LiVESMenuItem *menuitem, livespointer user_data) {
+  lives_mt *mt=(lives_mt *)user_data;
 
+  if (!mainw->interactive) return;
 
+  if (menuitem==(LiVESMenuItem *)mt->ins_normal) {
+    mt->opts.insert_mode=INSERT_MODE_NORMAL;
+  }
+  update_insert_mode(mt);
 }
 
 
-static void on_mouse_mode_changed (LiVESMenuItem *menuitem, gpointer user_data) {
+static void on_mouse_mode_changed(LiVESMenuItem *menuitem, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
 
+  if (!mainw->interactive) return;
+
   if (menuitem==(LiVESMenuItem *)mt->mm_move) {
     set_menu_text(mt->mm_menuitem,_("_Mouse mode: Move"),TRUE);
     mt->opts.mouse_mode=MOUSE_MODE_MOVE;
-  }
-  else if (menuitem==(LiVESMenuItem *)mt->mm_select) {
+  } else if (menuitem==(LiVESMenuItem *)mt->mm_select) {
     set_menu_text(mt->mm_menuitem,_("_Mouse mode: Select"),TRUE);
     mt->opts.mouse_mode=MOUSE_MODE_SELECT;
   }
@@ -4398,24 +4556,19 @@
 
 
 
-static void on_grav_mode_changed (LiVESMenuItem *menuitem, gpointer user_data) {
-  lives_mt *mt=(lives_mt *)user_data;
+void update_grav_mode(lives_mt *mt) {
+  // update GUI after grav mode change
 
-  if (menuitem==(LiVESMenuItem *)mt->grav_normal) {
+  if (mt->opts.grav_mode==GRAV_MODE_NORMAL) {
     lives_label_set_text(LIVES_LABEL(mt->grav_label),_("Gravity: Normal"));
-    mt->opts.grav_mode=GRAV_MODE_NORMAL;
-  }
-  else if (menuitem==(LiVESMenuItem *)mt->grav_left) {
+  } else if (mt->opts.grav_mode==GRAV_MODE_LEFT) {
     lives_label_set_text(LIVES_LABEL(mt->grav_label),_("Gravity: Left"));
-    mt->opts.grav_mode=GRAV_MODE_LEFT;
   }
 
-  if (menuitem==(LiVESMenuItem *)mt->grav_right) {
+  if (mt->opts.grav_mode==GRAV_MODE_RIGHT) {
     lives_label_set_text(LIVES_LABEL(mt->grav_menuitem),_("Gravity: Right"));
-    mt->opts.grav_mode=GRAV_MODE_RIGHT;
     set_menu_text(mt->remove_first_gaps,_("Close _last gap(s) in selected tracks/time"),TRUE);
-  }
-  else {
+  } else {
     set_menu_text(mt->remove_first_gaps,_("Close _first gap(s) in selected tracks/time"),TRUE);
   }
 
@@ -4431,11 +4584,27 @@
   lives_check_menu_item_set_active(LIVES_CHECK_MENU_ITEM(mt->grav_right),mt->opts.grav_mode==GRAV_MODE_RIGHT);
   lives_signal_handler_unblock(mt->grav_right,mt->grav_right_func);
 
+}
+
+
+
+static void on_grav_mode_changed(LiVESMenuItem *menuitem, livespointer user_data) {
+  lives_mt *mt=(lives_mt *)user_data;
 
+  if (!mainw->interactive) return;
 
+  if (menuitem==(LiVESMenuItem *)mt->grav_normal) {
+    mt->opts.grav_mode=GRAV_MODE_NORMAL;
+  } else if (menuitem==(LiVESMenuItem *)mt->grav_left) {
+    mt->opts.grav_mode=GRAV_MODE_LEFT;
+  } else if (menuitem==(LiVESMenuItem *)mt->grav_right) {
+    mt->opts.grav_mode=GRAV_MODE_RIGHT;
+  }
+  update_grav_mode(mt);
 }
 
 
+
 static size_t estimate_space(lives_mt *mt, int undo_type) {
   size_t needed=sizeof(mt_undo);
 
@@ -4449,100 +4618,98 @@
   return needed;
 }
 
-static gchar *get_undo_text(int action, void *extra) {
-  gchar *filtname,*ret;
+static char *get_undo_text(int action, void *extra) {
+  char *filtname,*ret;
   int error;
 
   switch (action) {
   case MT_UNDO_REMOVE_GAPS:
-    return g_strdup(_("Close gaps"));
+    return lives_strdup(_("Close gaps"));
   case MT_UNDO_MOVE_BLOCK:
-    return g_strdup(_("Move block"));
+    return lives_strdup(_("Move block"));
   case MT_UNDO_MOVE_AUDIO_BLOCK:
-    return g_strdup(_("Move audio block"));
+    return lives_strdup(_("Move audio block"));
   case MT_UNDO_DELETE_BLOCK:
-    return g_strdup(_("Delete block"));
+    return lives_strdup(_("Delete block"));
   case MT_UNDO_DELETE_AUDIO_BLOCK:
-    return g_strdup(_("Delete audio block"));
+    return lives_strdup(_("Delete audio block"));
   case MT_UNDO_SPLIT_MULTI:
-    return g_strdup(_("Split tracks"));
+    return lives_strdup(_("Split tracks"));
   case MT_UNDO_SPLIT:
-    return g_strdup(_("Split block"));
+    return lives_strdup(_("Split block"));
   case MT_UNDO_APPLY_FILTER:
     filtname=weed_get_string_value((weed_plant_t *)extra,"name",&error);
-    ret=g_strdup_printf(_("Apply %s"),filtname);
-    g_free(filtname);
+    ret=lives_strdup_printf(_("Apply %s"),filtname);
+    lives_free(filtname);
     return ret;
   case MT_UNDO_DELETE_FILTER:
     filtname=weed_get_string_value((weed_plant_t *)extra,"name",&error);
-    ret=g_strdup_printf(_("Delete %s"),filtname);
-    g_free(filtname);
+    ret=lives_strdup_printf(_("Delete %s"),filtname);
+    lives_free(filtname);
     return ret;
   case MT_UNDO_INSERT_BLOCK:
-    return g_strdup(_("Insert block"));
+    return lives_strdup(_("Insert block"));
   case MT_UNDO_INSERT_GAP:
-    return g_strdup(_("Insert gap"));
+    return lives_strdup(_("Insert gap"));
   case MT_UNDO_INSERT_AUDIO_BLOCK:
-    return g_strdup(_("Insert audio block"));
+    return lives_strdup(_("Insert audio block"));
   case MT_UNDO_FILTER_MAP_CHANGE:
-    return g_strdup(_("Effect order change"));
+    return lives_strdup(_("Effect order change"));
   }
-  return g_strdup("");
+  return lives_strdup("");
 }
 
 
 
 
 
-static void mt_set_undoable (lives_mt *mt, int what, void *extra, boolean sensitive) {
+static void mt_set_undoable(lives_mt *mt, int what, void *extra, boolean sensitive) {
   mt->undoable=sensitive;
   if (what!=MT_UNDO_NONE) {
-    gchar *what_safe;
-    gchar *text=get_undo_text(what,extra);
-    what_safe=g_strdelimit (g_strdup (text),"_",' ');
-    g_snprintf(mt->undo_text,32,_ ("_Undo %s"),what_safe);
-
-    g_free (what_safe);
-    g_free(text);
-  }
-  else {
+    char *what_safe;
+    char *text=get_undo_text(what,extra);
+    what_safe=lives_strdelimit(lives_strdup(text),"_",' ');
+    lives_snprintf(mt->undo_text,32,_("_Undo %s"),what_safe);
+
+    lives_free(what_safe);
+    lives_free(text);
+  } else {
     mt->undoable=FALSE;
-    g_snprintf(mt->undo_text,32,"%s",_ ("_Undo"));
+    lives_snprintf(mt->undo_text,32,"%s",_("_Undo"));
   }
   set_menu_text(mt->undo,mt->undo_text,TRUE);
 
-  lives_widget_set_sensitive (mt->undo,sensitive);
+  lives_widget_set_sensitive(mt->undo,sensitive);
 
 }
 
 
-static void mt_set_redoable (lives_mt *mt, int what, void *extra, boolean sensitive) {
+static void mt_set_redoable(lives_mt *mt, int what, void *extra, boolean sensitive) {
   mt->redoable=sensitive;
   if (what!=MT_UNDO_NONE) {
-    gchar *what_safe;
-    gchar *text=get_undo_text(what,extra);
-    what_safe=g_strdelimit (g_strdup (text),"_",' ');
-    g_snprintf(mt->redo_text,32,_ ("_Redo %s"),what_safe);
-    g_free (what_safe);
-    g_free(text);
-  }
-  else {
+    char *what_safe;
+    char *text=get_undo_text(what,extra);
+    what_safe=lives_strdelimit(lives_strdup(text),"_",' ');
+    lives_snprintf(mt->redo_text,32,_("_Redo %s"),what_safe);
+    lives_free(what_safe);
+    lives_free(text);
+  } else {
     mt->redoable=FALSE;
-    g_snprintf(mt->redo_text,32,"%s",_ ("_Redo"));
+    lives_snprintf(mt->redo_text,32,"%s",_("_Redo"));
   }
   set_menu_text(mt->redo,mt->redo_text,TRUE);
 
-  lives_widget_set_sensitive (mt->redo,sensitive);
+  lives_widget_set_sensitive(mt->redo,sensitive);
 
 }
 
 
 
-boolean make_backup_space (lives_mt *mt, size_t space_needed) {
+boolean make_backup_space(lives_mt *mt, size_t space_needed) {
   // read thru mt->undos and eliminate that space until we have space_needed
   size_t space_avail=(size_t)(prefs->mt_undo_buf*1024*1024)-mt->undo_buffer_used;
   size_t space_freed=0;
-  GList *xundo=mt->undos,*ulist;
+  LiVESList *xundo=mt->undos,*ulist;
   int count=0;
   mt_undo *undo;
 
@@ -4552,26 +4719,26 @@
     space_freed+=undo->data_len;
     if ((space_avail+space_freed)>=space_needed) {
       memmove(mt->undo_mem,mt->undo_mem+space_freed,mt->undo_buffer_used-space_freed);
-      ulist=g_list_copy(g_list_nth(mt->undos,count));
+      ulist=lives_list_copy(lives_list_nth(mt->undos,count));
       if (ulist!=NULL) ulist->prev=NULL;
-      g_list_free(mt->undos);
+      lives_list_free(mt->undos);
       mt->undos=ulist;
       while (ulist!=NULL) {
-	ulist->data=(unsigned char *)(ulist->data)-space_freed;
-	ulist=ulist->next;
+        ulist->data=(unsigned char *)(ulist->data)-space_freed;
+        ulist=ulist->next;
       }
       mt->undo_buffer_used-=space_freed;
-      if (mt->undo_offset>g_list_length(mt->undos)) {
-	mt->undo_offset=g_list_length(mt->undos);
-	mt_set_undoable(mt,MT_UNDO_NONE,NULL,FALSE);
-	mt_set_redoable(mt,((mt_undo *)(mt->undos->data))->action,NULL,TRUE);
+      if (mt->undo_offset>lives_list_length(mt->undos)) {
+        mt->undo_offset=lives_list_length(mt->undos);
+        mt_set_undoable(mt,MT_UNDO_NONE,NULL,FALSE);
+        mt_set_redoable(mt,((mt_undo *)(mt->undos->data))->action,NULL,TRUE);
       }
       return TRUE;
     }
     xundo=xundo->next;
   }
   mt->undo_buffer_used=0;
-  g_list_free(mt->undos);
+  lives_list_free(mt->undos);
   mt->undos=NULL;
   mt->undo_offset=0;
   mt_set_undoable(mt,MT_UNDO_NONE,NULL,FALSE);
@@ -4598,35 +4765,34 @@
 
   if (mt->undos!=NULL&&mt->undo_offset!=0) {
     // invalidate redo's - we are backing up, so we can't redo any more
-    // invalidate from g_list_length-undo_offset onwards
-    if ((g_list_length(mt->undos))==mt->undo_offset) {
+    // invalidate from lives_list_length-undo_offset onwards
+    if ((lives_list_length(mt->undos))==mt->undo_offset) {
       mt->undos=NULL;
       mt->undo_buffer_used=0;
-    }
-    else {
+    } else {
       int i=0;
-      GList *ulist=mt->undos;
-      while (i<((int)g_list_length(mt->undos)-1-mt->undo_offset)) {
-	ulist=ulist->next;
-	i++;
+      LiVESList *ulist=mt->undos;
+      while (i<((int)lives_list_length(mt->undos)-1-mt->undo_offset)) {
+        ulist=ulist->next;
+        i++;
       }
       if (ulist!=NULL) {
-	memblock=(unsigned char *)ulist->data;
-	last_valid_undo=(mt_undo *)memblock;
-	memblock+=last_valid_undo->data_len;
-	mt->undo_buffer_used=memblock-mt->undo_mem;
-	if (ulist->next!=NULL) {
-	  ulist=ulist->next;
-	  ulist->prev->next=NULL;
-	  g_list_free(ulist);
-	}
+        memblock=(unsigned char *)ulist->data;
+        last_valid_undo=(mt_undo *)memblock;
+        memblock+=last_valid_undo->data_len;
+        mt->undo_buffer_used=memblock-mt->undo_mem;
+        if (ulist->next!=NULL) {
+          ulist=ulist->next;
+          ulist->prev->next=NULL;
+          lives_list_free(ulist);
+        }
       }
     }
     mt_set_redoable(mt,MT_UNDO_NONE,NULL,FALSE);
     mt->undo_offset=0;
   }
 
-  undo=(mt_undo *)g_malloc(sizeof(mt_undo));
+  undo=(mt_undo *)lives_malloc(sizeof(mt_undo));
   undo->action=(lives_mt_undo_t)undo_type;
   undo->extra=NULL;
 
@@ -4661,28 +4827,28 @@
   remove_markers(mt->event_list);
 
   memcpy(mt->undo_mem+mt->undo_buffer_used,undo,sizeof(mt_undo));
-  mt->undos=g_list_append(mt->undos,mt->undo_mem+mt->undo_buffer_used);
+  mt->undos=lives_list_append(mt->undos,mt->undo_mem+mt->undo_buffer_used);
   mt->undo_buffer_used+=space_needed;
   mt_set_undoable(mt,undo->action,undo->extra,TRUE);
-  g_free(undo);
+  lives_free(undo);
 
 }
 
-void mt_aparam_view_toggled (LiVESMenuItem *menuitem, gpointer user_data) {
+void mt_aparam_view_toggled(LiVESMenuItem *menuitem, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
-  int which=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(menuitem),"pnum"));
+  int which=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(menuitem),"pnum"));
   register int i;
 
-  if (lives_check_menu_item_get_active(LIVES_CHECK_MENU_ITEM(menuitem))) 
-    mt->aparam_view_list=g_list_append(mt->aparam_view_list,GINT_TO_POINTER(which));
-  else mt->aparam_view_list=g_list_remove(mt->aparam_view_list,GINT_TO_POINTER(which));
-  for (i=0;i<g_list_length(mt->audio_draws);i++) {
-    lives_widget_queue_draw((LiVESWidget *)g_list_nth_data(mt->audio_draws,i));
+  if (lives_check_menu_item_get_active(LIVES_CHECK_MENU_ITEM(menuitem)))
+    mt->aparam_view_list=lives_list_append(mt->aparam_view_list,LIVES_INT_TO_POINTER(which));
+  else mt->aparam_view_list=lives_list_remove(mt->aparam_view_list,LIVES_INT_TO_POINTER(which));
+  for (i=0; i<lives_list_length(mt->audio_draws); i++) {
+    lives_widget_queue_draw((LiVESWidget *)lives_list_nth_data(mt->audio_draws,i));
   }
 }
 
 
-static void destroy_widget(LiVESWidget *widget, gpointer user_data) {
+static void destroy_widget(LiVESWidget *widget, livespointer user_data) {
   lives_widget_destroy(widget);
 }
 
@@ -4709,7 +4875,7 @@
     lives_widget_hide(mt->render_sep);
 
     if (mt->aparam_view_list!=NULL) {
-      g_list_free(mt->aparam_view_list);
+      lives_list_free(mt->aparam_view_list);
       mt->aparam_view_list=NULL;
     }
     return;
@@ -4729,23 +4895,23 @@
 
   filter=get_weed_filter(mt->avol_fx);
   rfx=weed_to_rfx(filter,FALSE);
-  for (i=0;i<rfx->num_params;i++) {
+  for (i=0; i<rfx->num_params; i++) {
     // TODO - check rfx->params[i].multi
     if ((rfx->params[i].hidden|HIDDEN_MULTI)==HIDDEN_MULTI&&rfx->params[i].type==LIVES_PARAM_NUM) {
-      menuitem = lives_check_menu_item_new_with_label (rfx->params[i].name);
-      if (mt->aparam_view_list!=NULL&&g_list_find(mt->aparam_view_list,GINT_TO_POINTER(i))) 
-	lives_check_menu_item_set_active(LIVES_CHECK_MENU_ITEM(menuitem),TRUE);
+      menuitem = lives_check_menu_item_new_with_label(rfx->params[i].name);
+      if (mt->aparam_view_list!=NULL&&lives_list_find(mt->aparam_view_list,LIVES_INT_TO_POINTER(i)))
+        lives_check_menu_item_set_active(LIVES_CHECK_MENU_ITEM(menuitem),TRUE);
       else lives_check_menu_item_set_active(LIVES_CHECK_MENU_ITEM(menuitem),FALSE);
-      lives_container_add (LIVES_CONTAINER (mt->aparam_submenu), menuitem);
+      lives_container_add(LIVES_CONTAINER(mt->aparam_submenu), menuitem);
       lives_widget_show(menuitem);
-      g_object_set_data(G_OBJECT(menuitem),"pnum",GINT_TO_POINTER(i));
-      lives_signal_connect (LIVES_GUI_OBJECT (menuitem), LIVES_WIDGET_ACTIVATE_EVENT,
-			LIVES_GUI_CALLBACK (mt_aparam_view_toggled),
-			(gpointer)mt);
+      lives_widget_object_set_data(LIVES_WIDGET_OBJECT(menuitem),"pnum",LIVES_INT_TO_POINTER(i));
+      lives_signal_connect(LIVES_GUI_OBJECT(menuitem), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                           LIVES_GUI_CALLBACK(mt_aparam_view_toggled),
+                           (livespointer)mt);
     }
   }
   rfx_free(rfx);
-  g_free(rfx);
+  lives_free(rfx);
 }
 
 
@@ -4768,8 +4934,8 @@
   if (new_end_event==NULL&&init_event!=NULL) {
     remove_filter_from_event_list(mt->event_list,init_event);
     if (mt->aparam_view_list!=NULL) {
-      for (i=0;i<g_list_length(mt->audio_draws);i++) {
-	lives_widget_queue_draw((LiVESWidget *)g_list_nth_data(mt->audio_draws,i));
+      for (i=0; i<lives_list_length(mt->audio_draws); i++) {
+        lives_widget_queue_draw((LiVESWidget *)lives_list_nth_data(mt->audio_draws,i));
       }
     }
     return;
@@ -4778,7 +4944,7 @@
   if (mt->opts.pertrack_audio) lives_widget_set_sensitive(mt->prerender_aud,TRUE);
 
   if (init_event==NULL) {
-    GList *slist=g_list_copy(mt->selected_tracks);
+    LiVESList *slist=lives_list_copy(mt->selected_tracks);
 
     weed_plant_t *old_mt_init=mt->init_event;
 
@@ -4793,20 +4959,20 @@
 
     if (!did_backup&&mt->idlefunc>0) {
       needs_idlefunc=TRUE;
-      g_source_remove(mt->idlefunc);
+      lives_source_remove(mt->idlefunc);
       mt->idlefunc=0;
     }
 
     mt->region_start=0.;
     mt->region_end=(get_event_timecode(new_end_event)+U_SEC/mt->fps)/U_SEC;
     if (mt->selected_tracks!=NULL) {
-      g_list_free(mt->selected_tracks);
+      lives_list_free(mt->selected_tracks);
       mt->selected_tracks=NULL;
     }
-    if (mt->opts.back_audio_tracks>0) mt->selected_tracks=g_list_append(mt->selected_tracks,GINT_TO_POINTER(-1));
+    if (mt->opts.back_audio_tracks>0) mt->selected_tracks=lives_list_append(mt->selected_tracks,LIVES_INT_TO_POINTER(-1));
     if (mt->opts.pertrack_audio) {
-      for (i=0;i<mt->num_video_tracks;i++) {
-	mt->selected_tracks=g_list_append(mt->selected_tracks,GINT_TO_POINTER(i));
+      for (i=0; i<mt->num_video_tracks; i++) {
+        mt->selected_tracks=lives_list_append(mt->selected_tracks,LIVES_INT_TO_POINTER(i));
       }
     }
     mt->current_fx=mt->avol_fx;
@@ -4817,17 +4983,17 @@
 
     mt->region_start=region_start;
     mt->region_end=region_end;
-    g_list_free(mt->selected_tracks);
-    mt->selected_tracks=g_list_copy(slist);
-    if (slist!=NULL) g_list_free(slist);
+    lives_list_free(mt->selected_tracks);
+    mt->selected_tracks=lives_list_copy(slist);
+    if (slist!=NULL) lives_list_free(slist);
     mt->current_fx=current_fx;
     mt->init_event=old_mt_init;
 
     mt->did_backup=did_backup;
 
     if (mt->aparam_view_list!=NULL) {
-      for (i=0;i<g_list_length(mt->audio_draws);i++) {
-	lives_widget_queue_draw((LiVESWidget *)g_list_nth_data(mt->audio_draws,i));
+      for (i=0; i<lives_list_length(mt->audio_draws); i++) {
+        lives_widget_queue_draw((LiVESWidget *)lives_list_nth_data(mt->audio_draws,i));
       }
     }
 
@@ -4843,8 +5009,8 @@
   move_filter_deinit_event(mt->event_list,new_tc,deinit_event,mt->fps,FALSE);
 
   if (mt->aparam_view_list!=NULL) {
-    for (i=0;i<g_list_length(mt->audio_draws);i++) {
-      lives_widget_queue_draw((LiVESWidget *)g_list_nth_data(mt->audio_draws,i));
+    for (i=0; i<lives_list_length(mt->audio_draws); i++) {
+      lives_widget_queue_draw((LiVESWidget *)lives_list_nth_data(mt->audio_draws,i));
     }
   }
 }
@@ -4862,7 +5028,7 @@
 
   int num_in,num_out;
   int i,error;
-  
+
   add_aparam_menuitems(mt);
 
   if (mt->current_rfx==NULL||mt->current_fx==-1||mt->current_fx!=mt->avol_fx) return;
@@ -4870,19 +5036,19 @@
   inst=(weed_plant_t *)mt->current_rfx->source;
   if (weed_plant_has_leaf(inst,"in_channels")&&(num_in=weed_leaf_num_elements(inst,"in_channels"))) {
     in_channels=weed_get_plantptr_array(inst,"in_channels",&error);
-    for (i=0;i<num_in;i++) {
+    for (i=0; i<num_in; i++) {
       weed_set_int_value(in_channels[i],"audio_channels",cfile->achans);
       weed_set_int_value(in_channels[i],"audio_rate",cfile->arate);
     }
   }
   if (weed_plant_has_leaf(inst,"out_channels")&&(num_out=weed_leaf_num_elements(inst,"out_channels"))) {
     out_channels=weed_get_plantptr_array(inst,"out_channels",&error);
-    for (i=0;i<num_out;i++) {
+    for (i=0; i<num_out; i++) {
       weed_set_int_value(out_channels[i],"audio_channels",cfile->achans);
       weed_set_int_value(out_channels[i],"audio_rate",cfile->arate);
     }
   }
-  
+
   mt->changed=mt->auto_changed=TRUE;
 
   weed_reinit_effect(inst,TRUE);
@@ -4892,17 +5058,18 @@
 
 
 
-static gchar *mt_set_vals_string(void) {
-  gchar sendian[128];
+static char *mt_set_vals_string(void) {
+  char sendian[128];
 
-  if (cfile->signed_endian&AFORM_UNSIGNED) g_snprintf(sendian,128,"%s",_("unsigned "));
-  else g_snprintf(sendian,128,"%s",_("signed "));
-  
-  if (cfile->signed_endian&AFORM_BIG_ENDIAN) g_strappend(sendian,128,_("big endian"));
-  else g_strappend(sendian,128,_("little endian"));
-  
-  return g_strdup_printf(_("Multitrack values set to %.3f fps, frame size %d x %d, audio channels %d, audio rate %d, audio sample size %d, %s.\n"),
-			 cfile->fps,cfile->hsize,cfile->vsize,cfile->achans,cfile->arate,cfile->asampsize,sendian);
+  if (cfile->signed_endian&AFORM_UNSIGNED) lives_snprintf(sendian,128,"%s",_("unsigned "));
+  else lives_snprintf(sendian,128,"%s",_("signed "));
+
+  if (cfile->signed_endian&AFORM_BIG_ENDIAN) lives_strappend(sendian,128,_("big endian"));
+  else lives_strappend(sendian,128,_("little endian"));
+
+  return lives_strdup_printf(
+           _("Multitrack values set to %.3f fps, frame size %d x %d, audio channels %d, audio rate %d, audio sample size %d, %s.\n"),cfile->fps,
+           cfile->hsize,cfile->vsize,cfile->achans,cfile->arate,cfile->asampsize,sendian);
 }
 
 
@@ -4912,8 +5079,7 @@
     mt->play_height=MIN(height,MT_PLAY_HEIGHT_EXP);
     mt->play_window_width=MT_PLAY_WIDTH_EXP;
     mt->play_window_height=MT_PLAY_HEIGHT_EXP;
-  }
-  else {
+  } else {
     mt->play_width=MIN(width,MT_PLAY_WIDTH_SMALL);
     mt->play_height=MIN(height,MT_PLAY_HEIGHT_SMALL);
     mt->play_window_width=MT_PLAY_WIDTH_SMALL;
@@ -4921,46 +5087,50 @@
   }
 }
 
-static weed_plant_t *load_event_list_inner (lives_mt *mt, int fd, boolean show_errors, int *num_events, 
-					    unsigned char **mem, unsigned char *mem_end) {
+static weed_plant_t *load_event_list_inner(lives_mt *mt, int fd, boolean show_errors, int *num_events,
+    unsigned char **mem, unsigned char *mem_end) {
   weed_plant_t *event,*eventprev=NULL;
   weed_plant_t *event_list;
   int error;
   double fps=-1;
-  gchar *msg;
+  char *msg;
 
   if (fd>0||mem!=NULL) event_list=weed_plant_deserialise(fd,mem);
   else event_list=mainw->stored_event_list;
 
   if (mt!=NULL) mt->layout_set_properties=FALSE;
-  
+
   if (event_list==NULL||!WEED_PLANT_IS_EVENT_LIST(event_list)) {
     if (show_errors) d_print(_("invalid event list. Failed.\n"));
     return NULL;
   }
 
   if (show_errors&&(!weed_plant_has_leaf(event_list,"fps")||(fps=weed_get_double_value(event_list,"fps",&error))<1.||
-		    fps>FPS_MAX)) {
+                    fps>FPS_MAX)) {
     d_print(_("event list has invalid fps. Failed.\n"));
     return NULL;
   }
-  
+
   if (weed_plant_has_leaf(event_list,"needs_set")) {
     if (show_errors) {
-      gchar *set_needed=weed_get_string_value(event_list,"needs_set",&error);
-      gchar *err;
-      if (!mainw->was_set||strcmp(set_needed,mainw->set_name)) {
-	err=g_strdup_printf(_("\nThis layout requires the set \"%s\"\nIn order to load it you must return to the Clip Editor, \nclose the current set,\nthen load in the new set from the File menu.\n"),set_needed);
-	d_print(err);
-	do_error_dialog_with_check_transient(err,TRUE,0,LIVES_WINDOW(mt->window));
-	g_free(err);
-	weed_free(set_needed);
-	return NULL;
+      char *set_needed=weed_get_string_value(event_list,"needs_set",&error);
+      char *err;
+      char *tmp=NULL;
+      if (!mainw->was_set||strcmp((tmp=U82F(set_needed)),mainw->set_name)) {
+        if (tmp!=NULL) lives_free(tmp);
+        err=lives_strdup_printf(
+              _("\nThis layout requires the set \"%s\"\nIn order to load it you must return to the Clip Editor, \nclose the current set,\nthen load in the new set from the File menu.\n"),
+              set_needed);
+        d_print(err);
+        do_error_dialog_with_check_transient(err,TRUE,0,LIVES_WINDOW(mt->window));
+        lives_free(err);
+        lives_free(set_needed);
+        return NULL;
       }
-      weed_free(set_needed);
+      if (tmp!=NULL) lives_free(tmp);
+      lives_free(set_needed);
     }
-  }
-  else if (!show_errors&&mem==NULL) return NULL; // no change needed
+  } else if (!show_errors&&mem==NULL) return NULL; // no change needed
 
   if (event_list==mainw->stored_event_list||(mt!=NULL&&!mt->ignore_load_vals)) {
     if (fps>-1) {
@@ -4973,79 +5143,75 @@
     if (weed_plant_has_leaf(event_list,"width")) {
       int width=weed_get_int_value(event_list,"width",&error);
       if (width>0) {
-	cfile->hsize=width;
-	if (mt!=NULL) mt->layout_set_properties=TRUE;
+        cfile->hsize=width;
+        if (mt!=NULL) mt->layout_set_properties=TRUE;
       }
     }
-    
+
     if (weed_plant_has_leaf(event_list,"height")) {
       int height=weed_get_int_value(event_list,"height",&error);
       if (height>0) {
-	cfile->vsize=height;
-	if (mt!=NULL) mt->layout_set_properties=TRUE;
+        cfile->vsize=height;
+        if (mt!=NULL) mt->layout_set_properties=TRUE;
       }
     }
-    
+
     if (weed_plant_has_leaf(event_list,"audio_channels")) {
       int achans=weed_get_int_value(event_list,"audio_channels",&error);
       if (achans>=0&&mt!=NULL) {
-	if (achans>2) {
-	  gchar *err=g_strdup_printf(_("\nThis has an invalid number of audio channels (%d) for LiVES.\nIt cannot be loaded.\n"),achans);
-	  d_print(err);
-	  do_error_dialog_with_check_transient(err,TRUE,0,LIVES_WINDOW(mt->window));
-	  g_free(err);
-	  return NULL;
-	}
-	cfile->achans=achans;
-	if (mt!=NULL) mt->layout_set_properties=TRUE;
+        if (achans>2) {
+          char *err=lives_strdup_printf(_("\nThis has an invalid number of audio channels (%d) for LiVES.\nIt cannot be loaded.\n"),achans);
+          d_print(err);
+          do_error_dialog_with_check_transient(err,TRUE,0,LIVES_WINDOW(mt->window));
+          lives_free(err);
+          return NULL;
+        }
+        cfile->achans=achans;
+        if (mt!=NULL) mt->layout_set_properties=TRUE;
       }
     }
-    
+
     if (weed_plant_has_leaf(event_list,"audio_rate")) {
       int arate=weed_get_int_value(event_list,"audio_rate",&error);
       if (arate>0) {
-	cfile->arate=cfile->arps=arate;
-	if (mt!=NULL) mt->layout_set_properties=TRUE;
+        cfile->arate=cfile->arps=arate;
+        if (mt!=NULL) mt->layout_set_properties=TRUE;
       }
     }
-    
+
     if (weed_plant_has_leaf(event_list,"audio_sample_size")) {
       int asamps=weed_get_int_value(event_list,"audio_sample_size",&error);
       if (asamps==8||asamps==16) {
-	cfile->asampsize=asamps;
-	if (mt!=NULL) mt->layout_set_properties=TRUE;
-      }
-      else if (cfile->achans>0) g_printerr("Layout has invalid sample size %d\n",asamps);
+        cfile->asampsize=asamps;
+        if (mt!=NULL) mt->layout_set_properties=TRUE;
+      } else if (cfile->achans>0) lives_printerr("Layout has invalid sample size %d\n",asamps);
     }
-    
+
     if (weed_plant_has_leaf(event_list,"audio_signed")) {
       int asigned=weed_get_boolean_value(event_list,"audio_signed",&error);
       if (asigned==WEED_TRUE) {
-	if (cfile->signed_endian&AFORM_UNSIGNED) cfile->signed_endian^=AFORM_UNSIGNED;
-      }
-      else {
-	if (!(cfile->signed_endian&AFORM_UNSIGNED)) cfile->signed_endian|=AFORM_UNSIGNED;
+        if (cfile->signed_endian&AFORM_UNSIGNED) cfile->signed_endian^=AFORM_UNSIGNED;
+      } else {
+        if (!(cfile->signed_endian&AFORM_UNSIGNED)) cfile->signed_endian|=AFORM_UNSIGNED;
       }
       if (mt!=NULL) mt->layout_set_properties=TRUE;
     }
-    
+
     if (weed_plant_has_leaf(event_list,"audio_endian")) {
       int aendian=weed_get_int_value(event_list,"audio_endian",&error);
       if (aendian==0) {
-	if (cfile->signed_endian&AFORM_BIG_ENDIAN) cfile->signed_endian^=AFORM_BIG_ENDIAN;
-      }
-      else {
-	if (!(cfile->signed_endian&AFORM_BIG_ENDIAN)) cfile->signed_endian|=AFORM_BIG_ENDIAN;
+        if (cfile->signed_endian&AFORM_BIG_ENDIAN) cfile->signed_endian^=AFORM_BIG_ENDIAN;
+      } else {
+        if (!(cfile->signed_endian&AFORM_BIG_ENDIAN)) cfile->signed_endian|=AFORM_BIG_ENDIAN;
       }
       if (mt!=NULL) mt->layout_set_properties=TRUE;
     }
-  }
-  else {
+  } else {
     if (mt!=NULL) {
       msg=set_values_from_defs(mt,FALSE);
       if (msg!=NULL) {
-	if (mt!=NULL) mt->layout_set_properties=TRUE;
-	g_free(msg);
+        if (mt!=NULL) mt->layout_set_properties=TRUE;
+        lives_free(msg);
       }
       cfile->fps=cfile->pb_fps;
       if (mt!=NULL) mt->fps=cfile->fps;
@@ -5064,8 +5230,12 @@
   // force 64 bit ptrs when reading layouts (for compatibility)
   prefs->force64bit=FALSE;
 
-  if (weed_plant_has_leaf(event_list,"ptrsize")) {
-    if (weed_get_int_value(event_list,"ptrsize",&error)==8) prefs->force64bit=TRUE;
+  if (weed_plant_has_leaf(event_list,"weed_event_api_version")) {
+    if (weed_get_int_value(event_list,"weed_event_api_version",&error)>=110) prefs->force64bit=TRUE;
+  } else {
+    if (weed_plant_has_leaf(event_list,"ptrsize")) {
+      if (weed_get_int_value(event_list,"ptrsize",&error)==8) prefs->force64bit=TRUE;
+    }
   }
 
   do {
@@ -5078,12 +5248,12 @@
       weed_set_voidptr_value(event,"previous",eventprev);
       weed_set_voidptr_value(event,"next",NULL);
       if (get_first_event(event_list)==NULL) {
-	weed_set_voidptr_value(event_list,"first",event);
+        weed_set_voidptr_value(event_list,"first",event);
       }
       weed_set_voidptr_value(event_list,"last",event);
       weed_add_plant_flags(event,WEED_LEAF_READONLY_PLUGIN);
       eventprev=event;
-      if (num_events!=NULL) (*num_events)++;
+      if (num_events!=NULL)(*num_events)++;
     }
   } while (event!=NULL);
 
@@ -5092,8 +5262,9 @@
 }
 
 
-static void on_insa_toggled (LiVESToggleButton *tbutton, gpointer user_data) {
+static void on_insa_toggled(LiVESToggleButton *tbutton, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
+  if (!mainw->interactive) return;
   mt->opts.insert_audio=lives_toggle_button_get_active(tbutton);
   if (prefs->lamp_buttons) {
     if (mt->opts.insert_audio) lives_widget_set_bg_color(LIVES_WIDGET(tbutton), LIVES_WIDGET_STATE_PRELIGHT, &palette->light_green);
@@ -5101,8 +5272,9 @@
   }
 }
 
-static void on_snapo_toggled (LiVESToggleButton *tbutton, gpointer user_data) {
+static void on_snapo_toggled(LiVESToggleButton *tbutton, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
+  if (!mainw->interactive) return;
   mt->opts.snap_over=lives_toggle_button_get_active(tbutton);
   if (prefs->lamp_buttons) {
     if (mt->opts.snap_over) lives_widget_set_bg_color(LIVES_WIDGET(tbutton), LIVES_WIDGET_STATE_PRELIGHT, &palette->light_green);
@@ -5112,10 +5284,10 @@
 
 
 
-gchar *set_values_from_defs(lives_mt *mt, boolean from_prefs) {
+char *set_values_from_defs(lives_mt *mt, boolean from_prefs) {
   // set various multitrack state flags from either defaults or user preferences
 
-  gchar *retval=NULL;
+  char *retval=NULL;
 
   int hsize=cfile->hsize;
   int vsize=cfile->vsize;
@@ -5133,8 +5305,7 @@
     mt->user_achans=cfile->achans;
     mt->user_asamps=cfile->asampsize;
     mt->user_signed_endian=cfile->signed_endian;
-  }
-  else {
+  } else {
     if (!from_prefs) {
       cfile->hsize=mt->user_width;
       cfile->vsize=mt->user_height;
@@ -5143,8 +5314,7 @@
       cfile->achans=mt->user_achans;
       cfile->asampsize=mt->user_asamps;
       cfile->signed_endian=mt->user_signed_endian;
-    }
-    else {
+    } else {
       mt->user_width=cfile->hsize=prefs->mt_def_width;
       mt->user_height=cfile->vsize=prefs->mt_def_height;
       mt->user_fps=cfile->pb_fps=cfile->fps=mt->fps=prefs->mt_def_fps;
@@ -5180,7 +5350,7 @@
 void event_list_free_undos(lives_mt *mt) {
   if (mt==NULL) return;
 
-  if (mt->undos!=NULL) g_list_free(mt->undos);
+  if (mt->undos!=NULL) lives_list_free(mt->undos);
   mt->undos=NULL;
   mt->undo_buffer_used=0;
   mt->undo_offset=0;
@@ -5197,9 +5367,9 @@
 
 
 void stored_event_list_free_undos(void) {
-  if (mainw->stored_layout_undos!=NULL) g_list_free(mainw->stored_layout_undos);
+  if (mainw->stored_layout_undos!=NULL) lives_list_free(mainw->stored_layout_undos);
   mainw->stored_layout_undos=NULL;
-  if (mainw->sl_undo_mem!=NULL) g_free(mainw->sl_undo_mem);
+  if (mainw->sl_undo_mem!=NULL) lives_free(mainw->sl_undo_mem);
   mainw->sl_undo_mem=NULL;
   mainw->sl_undo_buffer_used=0;
   mainw->sl_undo_offset=0;
@@ -5211,16 +5381,17 @@
 void remove_current_from_affected_layouts(lives_mt *mt) {
   // remove from affected layouts map
   if (mainw->affected_layouts_map!=NULL) {
-    GList *found=g_list_find_custom(mainw->affected_layouts_map,mainw->string_constants[LIVES_STRING_CONSTANT_CL],(GCompareFunc)strcmp);
+    LiVESList *found=lives_list_find_custom(mainw->affected_layouts_map,mainw->string_constants[LIVES_STRING_CONSTANT_CL],
+                                            (LiVESCompareFunc)strcmp);
     if (found!=NULL) {
-      g_free(found->data);
-      mainw->affected_layouts_map=g_list_delete_link(mainw->affected_layouts_map,found);
+      lives_free((livespointer)found->data);
+      mainw->affected_layouts_map=lives_list_delete_link(mainw->affected_layouts_map,found);
     }
   }
-  
+
   if (mainw->affected_layouts_map==NULL) {
-    lives_widget_set_sensitive (mainw->show_layout_errors, FALSE);
-    if (mt!=NULL) lives_widget_set_sensitive (mt->show_layout_errors, FALSE);
+    lives_widget_set_sensitive(mainw->show_layout_errors, FALSE);
+    if (mt!=NULL) lives_widget_set_sensitive(mt->show_layout_errors, FALSE);
   }
 
   recover_layout_cancelled(FALSE);
@@ -5230,20 +5401,20 @@
       event_list_free(mt->event_list);
       mt->event_list=NULL;
     }
-    
+
     mt_clear_timeline(mt);
   }
 
   // remove some text
-  
+
   if (mainw->layout_textbuffer!=NULL) {
     LiVESTextIter iter1,iter2;
-    GList *markmap=mainw->affected_layout_marks;
+    LiVESList *markmap=mainw->affected_layout_marks;
     while (markmap!=NULL) {
       lives_text_buffer_get_iter_at_mark(LIVES_TEXT_BUFFER(mainw->layout_textbuffer),&iter1,(LiVESTextMark *)markmap->data);
       lives_text_buffer_get_iter_at_mark(LIVES_TEXT_BUFFER(mainw->layout_textbuffer),&iter2,(LiVESTextMark *)markmap->next->data);
       lives_text_buffer_delete(LIVES_TEXT_BUFFER(mainw->layout_textbuffer),&iter1,&iter2);
-      
+
       lives_text_buffer_delete_mark(LIVES_TEXT_BUFFER(mainw->layout_textbuffer),(LiVESTextMark *)markmap->data);
       lives_text_buffer_delete_mark(LIVES_TEXT_BUFFER(mainw->layout_textbuffer),(LiVESTextMark *)markmap->next->data);
       markmap=markmap->next->next;
@@ -5257,7 +5428,7 @@
 void stored_event_list_free_all(boolean wiped) {
   int i;
 
-  for (i=0;i<MAX_FILES;i++) {
+  for (i=0; i<MAX_FILES; i++) {
     if (mainw->files[i]!=NULL) {
       mainw->files[i]->stored_layout_frame=0;
       mainw->files[i]->stored_layout_audio=0.;
@@ -5277,37 +5448,40 @@
   }
 }
 
+static LIVES_INLINE void print_layout_wiped(void) {
+  d_print(_("Layout was wiped.\n"));
+}
 
 
-boolean check_for_layout_del (lives_mt *mt, boolean exiting) {
+boolean check_for_layout_del(lives_mt *mt, boolean exiting) {
   // save or wipe event_list
+  // returns FALSE if cancelled
   int resp=2;
 
   if ((mt==NULL||mt->event_list==NULL||get_first_event(mt->event_list)==NULL)&&
       (mainw->stored_event_list==NULL||get_first_event(mainw->stored_event_list)==NULL)) return TRUE;
 
   if (((mt!=NULL&&(mt->changed||mainw->scrap_file!=-1||mainw->ascrap_file!=-1))||(mainw->stored_event_list!=NULL&&
-										  mainw->stored_event_list_changed))) {
+       mainw->stored_event_list_changed))) {
     int type=((mainw->scrap_file==-1&&mainw->ascrap_file==-1)||mt==NULL)?3*(!exiting):4;
     _entryw *cdsw=create_cds_dialog(type);
 
     do {
       resp=lives_dialog_run(LIVES_DIALOG(cdsw->dialog));
       if (resp==2) {
-	// save
-	mainw->cancelled=CANCEL_NONE;
-	on_save_event_list_activate(NULL,mt);
-	if (mainw->cancelled==CANCEL_NONE) {
-	  break;
-	}
-	else mainw->cancelled=CANCEL_NONE;
+        // save
+        mainw->cancelled=CANCEL_NONE;
+        on_save_event_list_activate(NULL,mt);
+        if (mainw->cancelled==CANCEL_NONE) {
+          break;
+        } else mainw->cancelled=CANCEL_NONE;
       }
     } while (resp==2);
 
     lives_widget_destroy(cdsw->dialog);
-    g_free(cdsw);
+    lives_free(cdsw);
 
-    if (resp==0) {
+    if (resp==LIVES_RESPONSE_CANCEL) {
       // cancel
       return FALSE;
     }
@@ -5320,91 +5494,91 @@
       set_pref("ar_layout","");
       memset(prefs->ar_layout_name,0,1);
     }
- 
+
   }
 
 
   if (mainw->stored_event_list!=NULL||mainw->sl_undo_mem!=NULL) {
     stored_event_list_free_all(TRUE);
-    d_print(_("Layout was wiped.\n"));
-  }
-  else if (mt!=NULL&&mt->event_list!=NULL&&(exiting||resp==1)) {
+    print_layout_wiped();
+  } else if (mt!=NULL&&mt->event_list!=NULL&&(exiting||resp==1)) {
     event_list_free(mt->event_list);
     event_list_free_undos(mt);
     mt->event_list=NULL;
     mt_clear_timeline(mt);
     close_scrap_file();
     close_ascrap_file();
-    d_print(_("Layout was wiped.\n"));
+    print_layout_wiped();
   }
 
   return TRUE;
 }
 
 
-static void on_comp_exp (LiVESButton *button, gpointer user_data) {
+static LIVES_INLINE void on_comp_exp(LiVESButton *button, livespointer user_data) {
   lives_check_menu_item_set_active(LIVES_CHECK_MENU_ITEM(user_data),!lives_check_menu_item_get_active(LIVES_CHECK_MENU_ITEM(user_data)));
 }
 
 
-void delete_audio_tracks(lives_mt *mt, GList *list, boolean full) {
-  GList *slist=list;
+void delete_audio_tracks(lives_mt *mt, LiVESList *list, boolean full) {
+  LiVESList *slist=list;
   while (slist!=NULL) {
     delete_audio_track(mt,(LiVESWidget *)slist->data,full);
     slist=slist->next;
   }
-  g_list_free(list);
+  lives_list_free(list);
 }
 
 
 
 
-void mt_quit_activate (LiVESMenuItem *menuitem, gpointer user_data) {
+void mt_quit_activate(LiVESMenuItem *menuitem, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
 
   if (!check_for_layout_del(mt,FALSE)) return;
 
-  if (mt->idlefunc>0) g_source_remove(mt->idlefunc);
+  if (mt->idlefunc>0) lives_source_remove(mt->idlefunc);
   mt->idlefunc=0;
 
   on_quit_activate(menuitem,NULL);
 }
 
-static void set_mt_title (lives_mt *mt) {
-  gchar *wtxt=g_strdup_printf(_("LiVES-%s: Multitrack %dx%d : %d bpp %.3f fps"),LiVES_VERSION,cfile->hsize,cfile->vsize,cfile->bpp,cfile->fps);
-  lives_window_set_title (LIVES_WINDOW (mt->window), wtxt);
-  g_free(wtxt);
+static void set_mt_title(lives_mt *mt) {
+  char *wtxt=lives_strdup_printf(_("LiVES-%s: Multitrack %dx%d : %d bpp %.3f fps"),LiVES_VERSION,cfile->hsize,cfile->vsize,cfile->bpp,
+                                 cfile->fps);
+  lives_window_set_title(LIVES_WINDOW(mt->window), wtxt);
+  lives_free(wtxt);
 }
 
 
 static boolean timecode_string_validate(LiVESEntry *entry, lives_mt *mt) {
-  const gchar *etext=lives_entry_get_text(entry);
-  gchar **array;
+  const char *etext=lives_entry_get_text(entry);
+  char **array;
 
   double secs;
   double tl_range,pos;
 
   int hrs,mins;
 
-  if (get_token_count((gchar *)etext,':')!=3) return FALSE;
+  if (get_token_count((char *)etext,':')!=3) return FALSE;
 
-  array=g_strsplit(etext,":",3);
+  array=lives_strsplit(etext,":",3);
 
   if (get_token_count(array[2],'.')!=2) {
-    g_strfreev(array);
+    lives_strfreev(array);
     return FALSE;
   }
 
   hrs=atoi(array[0]);
   mins=atoi(array[1]);
   if (mins>59) mins=59;
-  secs=g_strtod(array[2],NULL);
+  secs=lives_strtod(array[2],NULL);
 
-  g_strfreev(array);
+  lives_strfreev(array);
 
   secs=secs+mins*60.+hrs*3600.;
 
-  if (secs>mt->end_secs){
+  if (secs>mt->end_secs) {
     tl_range=mt->tl_max-mt->tl_min;
     set_timeline_end_secs(mt,secs);
 
@@ -5417,17 +5591,12 @@
     }
 
   }
-  
-  pos=lives_ruler_get_value(LIVES_RULER(mt->timeline));
 
-  pos=q_dbl(pos,mt->fps)/U_SEC;
-  if (pos<0.) pos=0.;
-
-  mt_tl_move(mt,secs-pos);
+  mt_tl_move(mt,secs);
 
   lives_widget_context_update();
 
-  pos=lives_ruler_get_value(LIVES_RULER(mt->timeline));
+  pos=mt->ptr_time;
 
   pos=q_dbl(pos,mt->fps)/U_SEC;
   if (pos<0.) pos=0.;
@@ -5437,56 +5606,64 @@
   return TRUE;
 }
 
-static boolean on_mt_delete_event (LiVESWidget *widget, GdkEvent *event, gpointer user_data) {
+static boolean on_mt_delete_event(LiVESWidget *widget, LiVESXEventDelete *event, livespointer user_data) {
+  if (!mainw->interactive) return TRUE;
   mt_quit_activate(NULL,user_data);
   return FALSE;
 }
 
 
-static void cmi_set_inactive(LiVESWidget *widget, gpointer data) {
+static void cmi_set_inactive(LiVESWidget *widget, livespointer data) {
   if (widget==data) return;
-  g_object_freeze_notify(G_OBJECT(widget));
+  g_object_freeze_notify(LIVES_WIDGET_OBJECT(widget));
   lives_check_menu_item_set_active(LIVES_CHECK_MENU_ITEM(widget),FALSE);
-  g_object_thaw_notify(G_OBJECT(widget));
+  g_object_thaw_notify(LIVES_WIDGET_OBJECT(widget));
 }
 
-static void mt_set_atrans_effect (LiVESMenuItem *menuitem, gpointer user_data) {
-  lives_mt *mt=(lives_mt *)user_data;
-  gchar *atrans_hash;
 
-  if (!lives_check_menu_item_get_active(LIVES_CHECK_MENU_ITEM(menuitem))) return;
-  lives_container_foreach(LIVES_CONTAINER(mt->submenu_atransfx),cmi_set_inactive,menuitem);
-  prefs->atrans_fx=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(menuitem),"idx"));
+void mt_set_autotrans(int idx) {
+  char *atrans_hash;
+  prefs->atrans_fx=idx;
 
   // set pref
   atrans_hash=make_weed_hashname(prefs->atrans_fx,FALSE,FALSE);
   set_pref("current_autotrans",atrans_hash);
-  g_free(atrans_hash);
+  lives_free(atrans_hash);
+}
+
+
+static void mt_set_atrans_effect(LiVESMenuItem *menuitem, livespointer user_data) {
+  lives_mt *mt=(lives_mt *)user_data;
+
+  if (!lives_check_menu_item_get_active(LIVES_CHECK_MENU_ITEM(menuitem))) return;
+  lives_container_foreach(LIVES_CONTAINER(mt->submenu_atransfx),cmi_set_inactive,menuitem);
+
+  mt_set_autotrans(LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(menuitem),"idx")));
 }
 
 
-static void after_timecode_changed(LiVESWidget *entry, GtkDirectionType dir, gpointer user_data) {
+static void after_timecode_changed(LiVESWidget *entry, LiVESXEventFocus *dir, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   double pos;
 
   if (!timecode_string_validate(LIVES_ENTRY(entry),mt)) {
-    pos=lives_ruler_get_value(LIVES_RULER(mt->timeline));
+    pos=mt->ptr_time;
     pos=q_dbl(pos,mt->fps)/U_SEC;
     if (pos<0.) pos=0.;
     time_to_string(mt,pos,TIMECODE_LENGTH);
   }
-  
+
 }
 
 #if GTK_CHECK_VERSION(3,0,0)
-static boolean expose_pb (LiVESWidget *widget, lives_painter_t *cr, gpointer user_data) {
+static boolean expose_pb(LiVESWidget *widget, lives_painter_t *cr, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   if (mainw->playing_file>-1) return TRUE;
   set_ce_frame_from_pixbuf(LIVES_IMAGE(mainw->play_image),mt->frame_pixbuf,cr);
   return TRUE;
 }
 
-static boolean draw_cool_toggle (LiVESWidget *widget, lives_painter_t *cr, gpointer user_data) {
+static boolean draw_cool_toggle(LiVESWidget *widget, lives_painter_t *cr, livespointer user_data) {
   double rwidth=(double)lives_widget_get_allocation_width(LIVES_WIDGET(widget));
   double rheight=(double)lives_widget_get_allocation_height(LIVES_WIDGET(widget));
 
@@ -5503,28 +5680,27 @@
   // draw the inside
 
   if (lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(widget))) {
-      lives_painter_set_source_rgba (cr, palette->light_green.red, palette->light_green.green,
-				     palette->light_green.blue, 1.);
+    lives_painter_set_source_rgba(cr, palette->light_green.red, palette->light_green.green,
+                                  palette->light_green.blue, 1.);
+  } else {
+    lives_painter_set_source_rgba(cr, palette->dark_red.red, palette->dark_red.green,
+                                  palette->dark_red.blue, 1.);
   }
-  else {
-      lives_painter_set_source_rgba (cr, palette->dark_red.red, palette->dark_red.green,
-				     palette->dark_red.blue, 1.);
-  }
- 
+
   // draw rounded rctangle
   lives_painter_rectangle(cr,0,rwidth/4,
-			  rwidth,
-			  rheight-rwidth/2);
+                          rwidth,
+                          rheight-rwidth/2);
   lives_painter_fill(cr);
 
   lives_painter_rectangle(cr,rwidth/4,0,
-			  rwidth/2,
-			  rwidth/4);
+                          rwidth/2,
+                          rwidth/4);
   lives_painter_fill(cr);
 
   lives_painter_rectangle(cr,rwidth/4,rheight-rwidth/4,
-			  rwidth/2,
-			  rwidth/4);
+                          rwidth/2,
+                          rwidth/4);
   lives_painter_fill(cr);
 
   rad=rwidth/4.;
@@ -5558,7 +5734,7 @@
 
   lives_painter_new_path(cr);
 
-  lives_painter_set_source_rgba (cr, 0., 0., 0., .8);
+  lives_painter_set_source_rgba(cr, 0., 0., 0., .8);
   lives_painter_set_line_width(cr,1.);
 
   lives_painter_arc(cr,rwidth/4.,rwidth/4.,rad,M_PI,1.5*M_PI);
@@ -5592,7 +5768,7 @@
   lives_painter_stroke(cr);
 
   if (lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(widget))) {
-    lives_painter_set_source_rgba (cr, 1., 1., 1., .6);
+    lives_painter_set_source_rgba(cr, 1., 1., 1., .6);
 
     lives_painter_move_to(cr,rwidth/4.,rwidth/4.);
     lives_painter_line_to(cr,rwidth/4.*3.,rheight-rwidth/4.);
@@ -5609,14 +5785,14 @@
 #endif
 
 
-static gchar *get_tab_name(uint32_t tab) {
+static char *get_tab_name(uint32_t tab) {
   switch (tab) {
   case POLY_CLIPS:
-    return g_strdup(_("Clips"));
+    return lives_strdup(_("Clips"));
   case POLY_IN_OUT:
-    return g_strdup(_("In/out"));
+    return lives_strdup(_("In/out"));
   case POLY_FX_STACK:
-    return g_strdup(_("FX stack"));
+    return lives_strdup(_("FX stack"));
   case POLY_EFFECTS:
     return lives_fx_cat_to_text(LIVES_FX_CAT_EFFECT,TRUE); // effects
   case POLY_TRANS:
@@ -5624,19 +5800,17 @@
   case POLY_COMP:
     return lives_fx_cat_to_text(LIVES_FX_CAT_COMPOSITOR,TRUE); // compositors
   case POLY_PARAMS:
-    return g_strdup(_("Params."));
+    return lives_strdup(_("Params."));
   default:
     break;
   }
-  return g_strdup("");
+  return lives_strdup("");
 }
 
 
-lives_mt *multitrack (weed_plant_t *event_list, int orig_file, double fps) {
+lives_mt *multitrack(weed_plant_t *event_list, int orig_file, double fps) {
   LiVESWidget *hseparator;
-  LiVESWidget *menubar;
   LiVESWidget *btoolbar;
-  LiVESWidget *menu_hbox;
   LiVESWidget *menuitem;
   LiVESWidget *menuitem2;
   LiVESWidget *menuitemsep;
@@ -5702,10 +5876,10 @@
   LiVESObject *vadjustment;
   LiVESAdjustment *spinbutton_adj;
 
-  gchar buff[32768];
+  char buff[32768];
 
-  gchar *cname,*tname,*msg;
-  gchar *tmp,*tmp2;
+  char *cname,*tname,*msg;
+  char *tmp,*tmp2;
 
   int scr_width,dph;
   int num_filters;
@@ -5714,7 +5888,7 @@
 
   register int i;
 
-  lives_mt *mt=(lives_mt *)g_malloc(sizeof(lives_mt));
+  lives_mt *mt=(lives_mt *)lives_malloc(sizeof(lives_mt));
 
   mainw->multitrack=mt;
 
@@ -5744,15 +5918,14 @@
   fxcol.green=fxcol.blue=0;
 
   if (mainw->sl_undo_mem==NULL) {
-    mt->undo_mem=(uint8_t *)g_try_malloc(prefs->mt_undo_buf*1024*1024);
+    mt->undo_mem=(uint8_t *)lives_try_malloc(prefs->mt_undo_buf*1024*1024);
     if (mt->undo_mem==NULL) {
       do_mt_undo_mem_error();
     }
     mt->undo_buffer_used=0;
     mt->undos=NULL;
     mt->undo_offset=0;
-  }
-  else {
+  } else {
     mt->undo_mem=mainw->sl_undo_mem;
     mt->undo_buffer_used=mainw->sl_undo_buffer_used;
     mt->undos=mainw->stored_layout_undos;
@@ -5773,6 +5946,8 @@
 
   mt->clip_labels=NULL;
 
+  mt->force_load_name=NULL;
+
   if (mainw->multi_opts.set) {
     mt->opts.move_effects=mainw->multi_opts.move_effects;
     mt->opts.fx_auto_preview=mainw->multi_opts.fx_auto_preview;
@@ -5785,8 +5960,9 @@
     mt->opts.ign_ins_sel=mainw->multi_opts.ign_ins_sel;
     mt->opts.follow_playback=mainw->multi_opts.follow_playback;
     mt->opts.autocross_audio=mainw->multi_opts.autocross_audio;
-  }
-  else {
+    mt->opts.render_audp=mainw->multi_opts.render_audp;
+    mt->opts.normalise_audp=mainw->multi_opts.normalise_audp;
+  } else {
     mt->opts.move_effects=TRUE;
     mt->opts.fx_auto_preview=TRUE;
     mt->opts.snap_over=FALSE;
@@ -5794,13 +5970,16 @@
     mt->opts.show_audio=TRUE;
     mt->opts.show_ctx=TRUE;
     mt->opts.ign_ins_sel=FALSE;
-    mt->opts.follow_playback=FALSE;
+    mt->opts.follow_playback=TRUE;
     mt->opts.grav_mode=GRAV_MODE_NORMAL;
     mt->opts.insert_mode=INSERT_MODE_NORMAL;
     mt->opts.autocross_audio=TRUE;
+    mt->opts.render_audp=TRUE;
+    mt->opts.normalise_audp=TRUE;
   }
 
   mt->opts.insert_audio=TRUE;
+  mt->opts.render_vidp=TRUE;
 
   mt->opts.pertrack_audio=prefs->mt_pertrack_audio;
   mt->opts.audio_bleedthru=FALSE;
@@ -5815,7 +5994,7 @@
   mt->video_draws=NULL;
   mt->block_selected=NULL;
   mt->event_list=event_list;
-  mt->accel_group = LIVES_ACCEL_GROUP(lives_accel_group_new ());
+  mt->accel_group = LIVES_ACCEL_GROUP(lives_accel_group_new());
   mt->fps=fps;
   mt->hotspot_x=mt->hotspot_y=0;
   mt->redraw_block=FALSE;
@@ -5839,7 +6018,7 @@
 
   mt->last_fx_type=MT_LAST_FX_NONE;
 
-  mt->display=gdk_display_get_default(); // TODO
+  mt->display=mainw->mgeom[prefs->gui_monitor==0?0:prefs->gui_monitor-1].disp;
 
   mt->moving_block=FALSE;
 
@@ -5870,10 +6049,6 @@
 
   mt->exact_preview=0;
 
-  mt->render_vidp=TRUE;
-  mt->render_audp=prefs->render_audio;
-  mt->normalise_audp=prefs->normalise_audio;
-
   mt->context_time=-1.;
   mt->use_context=FALSE;
 
@@ -5894,12 +6069,13 @@
 
   mt->top_track=0;
 
+  mt->cb_list=NULL;
+
   if (mainw->fx_candidates[FX_CANDIDATE_AUDIO_VOL].delegate!=-1) {
     // user (or system) has delegated an audio volume filter from the candidates
-    mt->avol_fx=GPOINTER_TO_INT(g_list_nth_data(mainw->fx_candidates[FX_CANDIDATE_AUDIO_VOL].list,
-						mainw->fx_candidates[FX_CANDIDATE_AUDIO_VOL].delegate));
-  }
-  else mt->avol_fx=-1;
+    mt->avol_fx=LIVES_POINTER_TO_INT(lives_list_nth_data(mainw->fx_candidates[FX_CANDIDATE_AUDIO_VOL].list,
+                                     mainw->fx_candidates[FX_CANDIDATE_AUDIO_VOL].delegate));
+  } else mt->avol_fx=-1;
   mt->avol_init_event=NULL;
 
   mt->aparam_view_list=NULL;
@@ -5914,58 +6090,61 @@
     mt->user_signed_endian=xse;
     mt->opts.pertrack_audio=ptaud;
     mt->opts.back_audio_tracks=btaud;
-    g_free(rdet->encoder_name);
-    g_free(rdet);
+    lives_free(rdet->encoder_name);
+    lives_free(rdet);
     rdet=NULL;
-    if (resaudw!=NULL) g_free(resaudw);
+    if (resaudw!=NULL) lives_free(resaudw);
     resaudw=NULL;
   }
 
   if (force_backing_tracks>mt->opts.back_audio_tracks) mt->opts.back_audio_tracks=force_backing_tracks;
   force_backing_tracks=0;
 
-  mt->window = lives_window_new (LIVES_WINDOW_TOPLEVEL);
-  lives_window_set_hide_titlebar_when_maximized(LIVES_WINDOW(mainw->LiVES),FALSE);
+  mt->window = lives_window_new(LIVES_WINDOW_TOPLEVEL);
+  lives_window_set_hide_titlebar_when_maximized(LIVES_WINDOW(mt->window),FALSE);
 
   if (palette->style&STYLE_1) {
     if (palette->style&STYLE_3) {
       lives_widget_set_bg_color(mt->window, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
       lives_widget_set_fg_color(mt->window, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
-    }
-    else {
+    } else {
       lives_widget_set_bg_color(mt->window, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
       lives_widget_set_fg_color(mt->window, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars_fore);
     }
   }
 
+#ifdef GUI_GTK
   gtk_drag_dest_set(mt->window,GTK_DEST_DEFAULT_ALL,mainw->target_table,2,
-		    (GdkDragAction)(GDK_ACTION_COPY|GDK_ACTION_MOVE|GDK_ACTION_LINK));
+                    (GdkDragAction)(GDK_ACTION_COPY|GDK_ACTION_MOVE|GDK_ACTION_LINK));
+
+  lives_signal_connect(LIVES_GUI_OBJECT(mt->window), LIVES_WIDGET_DRAG_DATA_RECEIVED_SIGNAL,
+                       LIVES_GUI_CALLBACK(drag_from_outside),
+                       NULL);
+#endif
+
 
-  lives_signal_connect (LIVES_GUI_OBJECT (mt->window), "drag-data-received",
-		    LIVES_GUI_CALLBACK (drag_from_outside),
-		    NULL);
 
-  mt->top_vbox = lives_vbox_new (FALSE, 0);
-  lives_container_add (LIVES_CONTAINER (mt->window), mt->top_vbox);
+  mt->top_vbox = lives_vbox_new(FALSE, 0);
+  lives_container_add(LIVES_CONTAINER(mt->window), mt->top_vbox);
 
-  menu_hbox = lives_hbox_new (FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (mt->top_vbox), menu_hbox, FALSE, FALSE, 0);
+  mt->menu_hbox = lives_hbox_new(FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(mt->top_vbox), mt->menu_hbox, FALSE, FALSE, 0);
 
-  menubar = lives_menu_bar_new ();
-  lives_box_pack_start (LIVES_BOX (menu_hbox), menubar, TRUE, TRUE, 0);
+  mt->menubar = lives_menu_bar_new();
+  lives_box_pack_start(LIVES_BOX(mt->menu_hbox), mt->menubar, FALSE, FALSE, 0);
 
   if (palette->style&STYLE_1) {
-    lives_widget_set_bg_color(menubar, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
-    lives_widget_set_fg_color(menubar, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars_fore);
+    lives_widget_set_bg_color(mt->menubar, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
+    lives_widget_set_fg_color(mt->menubar, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars_fore);
   }
 
 
   // File
-  menuitem = lives_menu_item_new_with_mnemonic (_ ("_File"));
-  lives_container_add (LIVES_CONTAINER (menubar), menuitem);
-  
-  menuitem_menu = lives_menu_new ();
-  lives_menu_item_set_submenu (LIVES_MENU_ITEM (menuitem), menuitem_menu);
+  menuitem = lives_menu_item_new_with_mnemonic(_("_File"));
+  lives_container_add(LIVES_CONTAINER(mt->menubar), menuitem);
+
+  menuitem_menu = lives_menu_new();
+  lives_menu_item_set_submenu(LIVES_MENU_ITEM(menuitem), menuitem_menu);
 
   if (palette->style&STYLE_1) {
     lives_widget_set_bg_color(menuitem_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
@@ -5975,596 +6154,599 @@
 
 
 
-  mt->open_menu = lives_menu_item_new_with_mnemonic (_("_Open..."));
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mt->open_menu);
+  mt->open_menu = lives_menu_item_new_with_mnemonic(_("_Open..."));
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mt->open_menu);
 
-  menuitem_menu2 = lives_menu_new ();
-  lives_menu_item_set_submenu (LIVES_MENU_ITEM (mt->open_menu), menuitem_menu2);
+  menuitem_menu2 = lives_menu_new();
+  lives_menu_item_set_submenu(LIVES_MENU_ITEM(mt->open_menu), menuitem_menu2);
 
   if (palette->style&STYLE_1) {
     lives_widget_set_bg_color(menuitem_menu2, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
     lives_widget_set_fg_color(menuitem_menu2, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars_fore);
   }
 
-  menuitem = lives_menu_item_new_with_mnemonic (_("_Open File/Directory"));
-  lives_container_add (LIVES_CONTAINER (menuitem_menu2), menuitem);
+  menuitem = lives_menu_item_new_with_mnemonic(_("_Open File/Directory"));
+  lives_container_add(LIVES_CONTAINER(menuitem_menu2), menuitem);
 
-  lives_signal_connect (LIVES_GUI_OBJECT (menuitem), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (on_open_activate),
-		    NULL);
-
-  menuitem = lives_menu_item_new_with_mnemonic (_("O_pen File Selection..."));
-  lives_container_add (LIVES_CONTAINER (menuitem_menu2), menuitem);
-
-  lives_signal_connect (LIVES_GUI_OBJECT (menuitem), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (on_open_sel_activate),
-		    NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(menuitem), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_open_activate),
+                       NULL);
+
+  menuitem = lives_menu_item_new_with_mnemonic(_("O_pen File Selection..."));
+  lives_container_add(LIVES_CONTAINER(menuitem_menu2), menuitem);
+
+  lives_signal_connect(LIVES_GUI_OBJECT(menuitem), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_open_sel_activate),
+                       NULL);
 
   if (capable->has_mplayer||capable->has_mplayer2) {
 
 #ifdef HAVE_WEBM
-    open_loc_menu = lives_menu_item_new_with_mnemonic (_("Open _Location/Stream..."));
-    lives_container_add (LIVES_CONTAINER (menuitem_menu2), open_loc_menu);
+    open_loc_menu = lives_menu_item_new_with_mnemonic(_("Open _Location/Stream..."));
+    lives_container_add(LIVES_CONTAINER(menuitem_menu2), open_loc_menu);
 
     open_loc_submenu=lives_menu_new();
-    lives_menu_item_set_submenu (LIVES_MENU_ITEM (open_loc_menu), open_loc_submenu);
+    lives_menu_item_set_submenu(LIVES_MENU_ITEM(open_loc_menu), open_loc_submenu);
     if (palette->style&STYLE_1) {
       lives_widget_set_bg_color(open_loc_submenu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
       lives_widget_set_fg_color(open_loc_submenu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars_fore);
     }
 
-    menuitem = lives_menu_item_new_with_mnemonic (_("Open _Youtube Clip..."));
-    lives_container_add (LIVES_CONTAINER (open_loc_submenu), menuitem);
+    menuitem = lives_menu_item_new_with_mnemonic(_("Open _Youtube Clip..."));
+    lives_container_add(LIVES_CONTAINER(open_loc_submenu), menuitem);
 
-    lives_signal_connect (LIVES_GUI_OBJECT (menuitem), LIVES_WIDGET_ACTIVATE_EVENT,
-		      LIVES_GUI_CALLBACK (on_open_utube_activate),
-		      NULL);
+    lives_signal_connect(LIVES_GUI_OBJECT(menuitem), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                         LIVES_GUI_CALLBACK(on_open_utube_activate),
+                         NULL);
 
-    menuitem = lives_menu_item_new_with_mnemonic (_("Open _Location/Stream..."));
-    lives_container_add (LIVES_CONTAINER (open_loc_submenu), menuitem);
+    menuitem = lives_menu_item_new_with_mnemonic(_("Open _Location/Stream..."));
+    lives_container_add(LIVES_CONTAINER(open_loc_submenu), menuitem);
 
 #else
 
-    menuitem = lives_menu_item_new_with_mnemonic (_("Open _Location/Stream..."));
-    lives_container_add (LIVES_CONTAINER (menuitem_menu2), menuitem);
-    
+    menuitem = lives_menu_item_new_with_mnemonic(_("Open _Location/Stream..."));
+    lives_container_add(LIVES_CONTAINER(menuitem_menu2), menuitem);
+
 #endif
 
-    lives_signal_connect (LIVES_GUI_OBJECT (menuitem), LIVES_WIDGET_ACTIVATE_EVENT,
-		      LIVES_GUI_CALLBACK (on_open_loc_activate),
-		      NULL);
-    
-    
-    
+    lives_signal_connect(LIVES_GUI_OBJECT(menuitem), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                         LIVES_GUI_CALLBACK(on_open_loc_activate),
+                         NULL);
+
+
+
 #ifdef ENABLE_DVD_GRAB
-    vcd_dvd_menu = lives_menu_item_new_with_mnemonic (_("Import Selection from _dvd/vcd..."));
-    lives_container_add (LIVES_CONTAINER (menuitem_menu2), vcd_dvd_menu);
+    vcd_dvd_menu = lives_menu_item_new_with_mnemonic(_("Import Selection from _dvd/vcd..."));
+    lives_container_add(LIVES_CONTAINER(menuitem_menu2), vcd_dvd_menu);
     vcd_dvd_submenu=lives_menu_new();
-    lives_menu_item_set_submenu (LIVES_MENU_ITEM (vcd_dvd_menu), vcd_dvd_submenu);
+    lives_menu_item_set_submenu(LIVES_MENU_ITEM(vcd_dvd_menu), vcd_dvd_submenu);
     if (palette->style&STYLE_1) {
       lives_widget_set_bg_color(vcd_dvd_submenu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
       lives_widget_set_fg_color(vcd_dvd_submenu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars_fore);
     }
-    
-    
-    menuitem = lives_menu_item_new_with_mnemonic (_("Import Selection from _dvd"));
-    lives_container_add (LIVES_CONTAINER (vcd_dvd_submenu), menuitem);
-    
-    lives_signal_connect (LIVES_GUI_OBJECT (menuitem), LIVES_WIDGET_ACTIVATE_EVENT,
-		      LIVES_GUI_CALLBACK (on_open_vcd_activate),
-		      GINT_TO_POINTER (1));
-    
-    
+
+
+    menuitem = lives_menu_item_new_with_mnemonic(_("Import Selection from _dvd"));
+    lives_container_add(LIVES_CONTAINER(vcd_dvd_submenu), menuitem);
+
+    lives_signal_connect(LIVES_GUI_OBJECT(menuitem), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                         LIVES_GUI_CALLBACK(on_open_vcd_activate),
+                         LIVES_INT_TO_POINTER(1));
+
+
 # endif
-    
-    menuitem = lives_menu_item_new_with_mnemonic (_("Import Selection from _vcd"));
-    
+
+    menuitem = lives_menu_item_new_with_mnemonic(_("Import Selection from _vcd"));
+
 #ifdef ENABLE_DVD_GRAB
-    lives_container_add (LIVES_CONTAINER (vcd_dvd_submenu), menuitem);
+    lives_container_add(LIVES_CONTAINER(vcd_dvd_submenu), menuitem);
 #else
-    lives_container_add (LIVES_CONTAINER (menuitem_menu2), menuitem);
+    lives_container_add(LIVES_CONTAINER(menuitem_menu2), menuitem);
 #endif
-    
-    lives_signal_connect (LIVES_GUI_OBJECT (menuitem), LIVES_WIDGET_ACTIVATE_EVENT,
-		      LIVES_GUI_CALLBACK (on_open_vcd_activate),
-		      GINT_TO_POINTER (2));
+
+    lives_signal_connect(LIVES_GUI_OBJECT(menuitem), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                         LIVES_GUI_CALLBACK(on_open_vcd_activate),
+                         LIVES_INT_TO_POINTER(2));
 
   }
 
 
 #ifdef HAVE_LDVGRAB
-  device_menu = lives_menu_item_new_with_mnemonic (_("_Import from Device"));
-  lives_container_add (LIVES_CONTAINER (menuitem_menu2), device_menu);
+  device_menu = lives_menu_item_new_with_mnemonic(_("_Import from Device"));
+  lives_container_add(LIVES_CONTAINER(menuitem_menu2), device_menu);
   device_submenu=lives_menu_new();
 
-  lives_menu_item_set_submenu (LIVES_MENU_ITEM (device_menu), device_submenu);
+  lives_menu_item_set_submenu(LIVES_MENU_ITEM(device_menu), device_submenu);
   if (palette->style&STYLE_1) {
     lives_widget_set_bg_color(device_submenu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
     lives_widget_set_fg_color(device_submenu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars_fore);
   }
 
-  menuitem = lives_menu_item_new_with_mnemonic (_("Import from _Firewire Device (dv)"));
-  lives_container_add (LIVES_CONTAINER (device_submenu), menuitem);
+  menuitem = lives_menu_item_new_with_mnemonic(_("Import from _Firewire Device (dv)"));
+  lives_container_add(LIVES_CONTAINER(device_submenu), menuitem);
 
 
-  lives_signal_connect (LIVES_GUI_OBJECT (menuitem), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (on_open_fw_activate),
-		    GINT_TO_POINTER(CAM_FORMAT_DV));
+  lives_signal_connect(LIVES_GUI_OBJECT(menuitem), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_open_fw_activate),
+                       LIVES_INT_TO_POINTER(CAM_FORMAT_DV));
 
-  menuitem = lives_menu_item_new_with_mnemonic (_("Import from _Firewire Device (hdv)"));
-  lives_container_add (LIVES_CONTAINER (device_submenu), menuitem);
+  menuitem = lives_menu_item_new_with_mnemonic(_("Import from _Firewire Device (hdv)"));
+  lives_container_add(LIVES_CONTAINER(device_submenu), menuitem);
 
-  lives_signal_connect (LIVES_GUI_OBJECT (menuitem), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (on_open_fw_activate),
-		    GINT_TO_POINTER(CAM_FORMAT_HDV));
+  lives_signal_connect(LIVES_GUI_OBJECT(menuitem), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_open_fw_activate),
+                       LIVES_INT_TO_POINTER(CAM_FORMAT_HDV));
 #endif
 
 
-  mt->close = lives_menu_item_new_with_mnemonic (_("_Close the selected clip"));
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mt->close);
-  
-  lives_signal_connect (LIVES_GUI_OBJECT (mt->close), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (on_close_activate),
-		    NULL);
+  mt->close = lives_menu_item_new_with_mnemonic(_("_Close the selected clip"));
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mt->close);
+
+  lives_signal_connect(LIVES_GUI_OBJECT(mt->close), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_close_activate),
+                       NULL);
 
   lives_widget_set_sensitive(mt->close,FALSE);
 
 
-  lives_widget_add_accelerator (mt->close, LIVES_WIDGET_ACTIVATE_EVENT, mt->accel_group,
-                              LIVES_KEY_w, LIVES_CONTROL_MASK,
-                              LIVES_ACCEL_VISIBLE);
+  lives_widget_add_accelerator(mt->close, LIVES_WIDGET_ACTIVATE_SIGNAL, mt->accel_group,
+                               LIVES_KEY_w, LIVES_CONTROL_MASK,
+                               LIVES_ACCEL_VISIBLE);
 
-  mt->recent_menu = lives_menu_item_new_with_mnemonic (_("_Recent Files..."));
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mt->recent_menu);
+  mt->recent_menu = lives_menu_item_new_with_mnemonic(_("_Recent Files..."));
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mt->recent_menu);
   recent_submenu=lives_menu_new();
-  lives_menu_item_set_submenu (LIVES_MENU_ITEM (mt->recent_menu), recent_submenu);
+  lives_menu_item_set_submenu(LIVES_MENU_ITEM(mt->recent_menu), recent_submenu);
 
   memset(buff,0,1);
 
   get_pref_utf8("recent1",buff,32768);
 
-  mt->recent1 = lives_menu_item_new_with_label (buff);
-  if (strlen (buff)) lives_widget_show (mt->recent1);
+  mt->recent1 = lives_menu_item_new_with_label(buff);
+  if (strlen(buff)) lives_widget_show(mt->recent1);
 
   get_pref_utf8("recent2",buff,32768);
 
-  mt->recent2 = lives_menu_item_new_with_label (buff);
-  if (strlen (buff)) lives_widget_show (mt->recent2);
+  mt->recent2 = lives_menu_item_new_with_label(buff);
+  if (strlen(buff)) lives_widget_show(mt->recent2);
 
 
   get_pref_utf8("recent3",buff,32768);
 
-  mt->recent3 = lives_menu_item_new_with_label (buff);
-  if (strlen (buff)) lives_widget_show (mt->recent3);
+  mt->recent3 = lives_menu_item_new_with_label(buff);
+  if (strlen(buff)) lives_widget_show(mt->recent3);
 
 
   get_pref_utf8("recent4",buff,32768);
 
-  mt->recent4 = lives_menu_item_new_with_label (buff);
-  if (strlen (buff)) lives_widget_show (mt->recent4);
+  mt->recent4 = lives_menu_item_new_with_label(buff);
+  if (strlen(buff)) lives_widget_show(mt->recent4);
 
-  lives_container_add (LIVES_CONTAINER (recent_submenu), mt->recent1);
-  lives_container_add (LIVES_CONTAINER (recent_submenu), mt->recent2);
-  lives_container_add (LIVES_CONTAINER (recent_submenu), mt->recent3);
-  lives_container_add (LIVES_CONTAINER (recent_submenu), mt->recent4);
+  lives_container_add(LIVES_CONTAINER(recent_submenu), mt->recent1);
+  lives_container_add(LIVES_CONTAINER(recent_submenu), mt->recent2);
+  lives_container_add(LIVES_CONTAINER(recent_submenu), mt->recent3);
+  lives_container_add(LIVES_CONTAINER(recent_submenu), mt->recent4);
 
   if (palette->style&STYLE_1) {
     lives_widget_set_bg_color(recent_submenu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
     lives_widget_set_fg_color(recent_submenu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars_fore);
   }
-  
-  lives_widget_show (recent_submenu);
 
+  lives_widget_show(recent_submenu);
 
-  lives_signal_connect (LIVES_GUI_OBJECT (mt->recent1), LIVES_WIDGET_ACTIVATE_EVENT,
-                      LIVES_GUI_CALLBACK (on_recent_activate),
-		    GINT_TO_POINTER(1));
-  lives_signal_connect (LIVES_GUI_OBJECT (mt->recent2), LIVES_WIDGET_ACTIVATE_EVENT,
-                      LIVES_GUI_CALLBACK (on_recent_activate),
-		    GINT_TO_POINTER(2));
-  lives_signal_connect (LIVES_GUI_OBJECT (mt->recent3), LIVES_WIDGET_ACTIVATE_EVENT,
-                      LIVES_GUI_CALLBACK (on_recent_activate),
-		    GINT_TO_POINTER(3));
-  lives_signal_connect (LIVES_GUI_OBJECT (mt->recent4), LIVES_WIDGET_ACTIVATE_EVENT,
-                      LIVES_GUI_CALLBACK (on_recent_activate),
-		    GINT_TO_POINTER(4));
-
-
-  separator = lives_menu_item_new ();
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), separator);
-  lives_widget_set_sensitive (separator, FALSE);
-
-  mt->load_set = lives_menu_item_new_with_mnemonic (_("_Reload Clip Set..."));
-  lives_widget_show (mt->load_set);
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mt->load_set);
-
-  lives_signal_connect (LIVES_GUI_OBJECT (mt->load_set), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (on_load_set_activate),
-		    NULL);
-
-  mt->save_set = lives_menu_item_new_with_mnemonic (_("Close/Sa_ve All Clips"));
-  lives_widget_show (mt->save_set);
-  lives_widget_set_sensitive (mt->save_set, FALSE);
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mt->save_set);
-
-  lives_signal_connect (LIVES_GUI_OBJECT (mt->save_set), LIVES_WIDGET_ACTIVATE_EVENT,
-                      LIVES_GUI_CALLBACK (on_quit_activate),
-                      GINT_TO_POINTER(1));
-
-  separator = lives_menu_item_new ();
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), separator);
-  lives_widget_set_sensitive (separator, FALSE);
-
-  mt->save_event_list = lives_image_menu_item_new_with_mnemonic (_("_Save layout as..."));
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mt->save_event_list);
-  lives_widget_set_sensitive (mt->save_event_list, FALSE);
-
-  lives_widget_add_accelerator (mt->save_event_list, LIVES_WIDGET_ACTIVATE_EVENT, mt->accel_group,
-                              LIVES_KEY_s, LIVES_CONTROL_MASK,
-                              LIVES_ACCEL_VISIBLE);
-
-  mt->load_event_list = lives_image_menu_item_new_with_mnemonic (_("_Load layout..."));
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mt->load_event_list);
-  lives_widget_set_sensitive (mt->load_event_list, strlen(mainw->set_name)>0);
 
-  mt->clear_event_list = lives_image_menu_item_new_with_mnemonic (_("_Wipe/Delete layout..."));
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mt->clear_event_list);
-
-  lives_widget_add_accelerator (mt->clear_event_list, LIVES_WIDGET_ACTIVATE_EVENT, mt->accel_group,
-                              LIVES_KEY_d, LIVES_CONTROL_MASK,
-                              LIVES_ACCEL_VISIBLE);
+  lives_signal_connect(LIVES_GUI_OBJECT(mt->recent1), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_recent_activate),
+                       LIVES_INT_TO_POINTER(1));
+  lives_signal_connect(LIVES_GUI_OBJECT(mt->recent2), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_recent_activate),
+                       LIVES_INT_TO_POINTER(2));
+  lives_signal_connect(LIVES_GUI_OBJECT(mt->recent3), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_recent_activate),
+                       LIVES_INT_TO_POINTER(3));
+  lives_signal_connect(LIVES_GUI_OBJECT(mt->recent4), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_recent_activate),
+                       LIVES_INT_TO_POINTER(4));
+
+
+  separator = lives_menu_item_new();
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), separator);
+  lives_widget_set_sensitive(separator, FALSE);
+
+  mt->load_set = lives_menu_item_new_with_mnemonic(_("_Reload Clip Set..."));
+  lives_widget_show(mt->load_set);
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mt->load_set);
+
+  lives_signal_connect(LIVES_GUI_OBJECT(mt->load_set), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_load_set_activate),
+                       NULL);
+
+  mt->save_set = lives_menu_item_new_with_mnemonic(_("Close/Sa_ve All Clips"));
+  lives_widget_show(mt->save_set);
+  lives_widget_set_sensitive(mt->save_set, FALSE);
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mt->save_set);
+
+  lives_signal_connect(LIVES_GUI_OBJECT(mt->save_set), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_quit_activate),
+                       LIVES_INT_TO_POINTER(1));
+
+  separator = lives_menu_item_new();
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), separator);
+  lives_widget_set_sensitive(separator, FALSE);
+
+  mt->save_event_list = lives_image_menu_item_new_with_mnemonic(_("_Save layout as..."));
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mt->save_event_list);
+  lives_widget_set_sensitive(mt->save_event_list, FALSE);
+
+  lives_widget_add_accelerator(mt->save_event_list, LIVES_WIDGET_ACTIVATE_SIGNAL, mt->accel_group,
+                               LIVES_KEY_s, LIVES_CONTROL_MASK,
+                               LIVES_ACCEL_VISIBLE);
+
+  mt->load_event_list = lives_image_menu_item_new_with_mnemonic(_("_Load layout..."));
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mt->load_event_list);
+  lives_widget_set_sensitive(mt->load_event_list, strlen(mainw->set_name)>0);
+
+  mt->clear_event_list = lives_image_menu_item_new_with_mnemonic(_("_Wipe/Delete layout..."));
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mt->clear_event_list);
+
+  lives_widget_add_accelerator(mt->clear_event_list, LIVES_WIDGET_ACTIVATE_SIGNAL, mt->accel_group,
+                               LIVES_KEY_d, LIVES_CONTROL_MASK,
+                               LIVES_ACCEL_VISIBLE);
 
   lives_widget_set_sensitive(mt->clear_event_list,mt->event_list!=NULL);
 
 
-  separator = lives_menu_item_new ();
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), separator);
-  lives_widget_set_sensitive (separator, FALSE);
-
-  mt->clear_ds = lives_menu_item_new_with_mnemonic (_("Clean _up Diskspace"));
-  lives_widget_show (mt->clear_ds);
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mt->clear_ds);
-
-  lives_signal_connect (LIVES_GUI_OBJECT (mt->clear_ds), LIVES_WIDGET_ACTIVATE_EVENT,
-                      LIVES_GUI_CALLBACK (on_cleardisk_activate),
-                      NULL);
-
-  separator = lives_menu_item_new ();
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), separator);
-  lives_widget_set_sensitive (separator, FALSE);
+  separator = lives_menu_item_new();
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), separator);
+  lives_widget_set_sensitive(separator, FALSE);
+
+  mt->clear_ds = lives_menu_item_new_with_mnemonic(_("Clean _up Diskspace"));
+  lives_widget_show(mt->clear_ds);
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mt->clear_ds);
+
+  lives_signal_connect(LIVES_GUI_OBJECT(mt->clear_ds), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_cleardisk_activate),
+                       NULL);
+
+  separator = lives_menu_item_new();
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), separator);
+  lives_widget_set_sensitive(separator, FALSE);
 
-  mt->load_vals = lives_check_menu_item_new_with_mnemonic (_("_Ignore width, height and audio values from loaded layouts"));
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mt->load_vals);
+  mt->load_vals = lives_check_menu_item_new_with_mnemonic(_("_Ignore width, height and audio values from loaded layouts"));
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mt->load_vals);
   lives_check_menu_item_set_active(LIVES_CHECK_MENU_ITEM(mt->load_vals),mt->ignore_load_vals);
 
-  mt->aload_subs = lives_check_menu_item_new_with_mnemonic (_("Auto load _subtitles with clips"));
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mt->aload_subs);
+  mt->aload_subs = lives_check_menu_item_new_with_mnemonic(_("Auto load _subtitles with clips"));
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mt->aload_subs);
   lives_check_menu_item_set_active(LIVES_CHECK_MENU_ITEM(mt->aload_subs),prefs->autoload_subs);
 
-  separator = lives_menu_item_new ();
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), separator);
-  lives_widget_set_sensitive (separator, FALSE);
-
-  mt->quit = lives_image_menu_item_new_from_stock (LIVES_STOCK_LABEL_QUIT, mt->accel_group);
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mt->quit);
-
-  lives_widget_add_accelerator (mt->quit, LIVES_WIDGET_ACTIVATE_EVENT, mt->accel_group,
-                              LIVES_KEY_q, LIVES_CONTROL_MASK,
-                              LIVES_ACCEL_VISIBLE);
+  separator = lives_menu_item_new();
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), separator);
+  lives_widget_set_sensitive(separator, FALSE);
+
+  mt->quit = lives_image_menu_item_new_from_stock(LIVES_STOCK_LABEL_QUIT, mt->accel_group);
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mt->quit);
+
+  lives_widget_add_accelerator(mt->quit, LIVES_WIDGET_ACTIVATE_SIGNAL, mt->accel_group,
+                               LIVES_KEY_q, LIVES_CONTROL_MASK,
+                               LIVES_ACCEL_VISIBLE);
 
   // Edit
 
-  menuitem = lives_menu_item_new_with_mnemonic (_("_Edit"));
-  lives_container_add (LIVES_CONTAINER (menubar), menuitem);
+  menuitem = lives_menu_item_new_with_mnemonic(_("_Edit"));
+  lives_container_add(LIVES_CONTAINER(mt->menubar), menuitem);
 
-  menuitem_menu = lives_menu_new ();
-  lives_menu_item_set_submenu (LIVES_MENU_ITEM (menuitem), menuitem_menu);
+  menuitem_menu = lives_menu_new();
+  lives_menu_item_set_submenu(LIVES_MENU_ITEM(menuitem), menuitem_menu);
 
   if (palette->style&STYLE_1) {
     lives_widget_set_bg_color(menuitem_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
     lives_widget_set_fg_color(menuitem_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars_fore);
   }
 
-  mt->undo = lives_image_menu_item_new_with_mnemonic (_("_Undo"));
-  lives_widget_show (mt->undo);
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mt->undo);
-  lives_widget_set_sensitive (mt->undo, FALSE);
+  mt->undo = lives_image_menu_item_new_with_mnemonic(_("_Undo"));
+  lives_widget_show(mt->undo);
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mt->undo);
+  lives_widget_set_sensitive(mt->undo, FALSE);
+
+  lives_widget_add_accelerator(mt->undo, LIVES_WIDGET_ACTIVATE_SIGNAL, mt->accel_group,
+                               LIVES_KEY_u, LIVES_CONTROL_MASK,
+                               LIVES_ACCEL_VISIBLE);
 
-  lives_widget_add_accelerator (mt->undo, LIVES_WIDGET_ACTIVATE_EVENT, mt->accel_group,
-                              LIVES_KEY_u, LIVES_CONTROL_MASK,
-                              LIVES_ACCEL_VISIBLE);
-  
 #if LIVES_HAS_IMAGE_MENU_ITEM
-  image = lives_image_new_from_stock (LIVES_STOCK_UNDO, LIVES_ICON_SIZE_MENU);
-  lives_widget_show (image);
-  lives_image_menu_item_set_image (LIVES_IMAGE_MENU_ITEM (mt->undo), image);
+  image = lives_image_new_from_stock(LIVES_STOCK_UNDO, LIVES_ICON_SIZE_MENU);
+  lives_widget_show(image);
+  lives_image_menu_item_set_image(LIVES_IMAGE_MENU_ITEM(mt->undo), image);
 #endif
 
-  if (mt->undo_offset==g_list_length(mt->undos)) mt_set_undoable(mt,MT_UNDO_NONE,NULL,FALSE);
+  if (mt->undo_offset==lives_list_length(mt->undos)) mt_set_undoable(mt,MT_UNDO_NONE,NULL,FALSE);
   else {
-    mt_undo *undo=(mt_undo *)(g_list_nth_data(mt->undos,g_list_length(mt->undos)-mt->undo_offset-1));
+    mt_undo *undo=(mt_undo *)(lives_list_nth_data(mt->undos,lives_list_length(mt->undos)-mt->undo_offset-1));
     mt_set_undoable(mt,undo->action,undo->extra,TRUE);
   }
 
-  lives_signal_connect (LIVES_GUI_OBJECT (mt->undo), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (multitrack_undo),
-		    (gpointer)mt);
-
-  mt->redo = lives_image_menu_item_new_with_mnemonic (_("_Redo"));
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mt->redo);
-  lives_widget_set_sensitive (mt->redo, FALSE);
-
-  lives_widget_add_accelerator (mt->redo, LIVES_WIDGET_ACTIVATE_EVENT, mt->accel_group,
-                              LIVES_KEY_z, LIVES_CONTROL_MASK,
-                              LIVES_ACCEL_VISIBLE);
+  lives_signal_connect(LIVES_GUI_OBJECT(mt->undo), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(multitrack_undo),
+                       (livespointer)mt);
+
+  mt->redo = lives_image_menu_item_new_with_mnemonic(_("_Redo"));
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mt->redo);
+  lives_widget_set_sensitive(mt->redo, FALSE);
+
+  lives_widget_add_accelerator(mt->redo, LIVES_WIDGET_ACTIVATE_SIGNAL, mt->accel_group,
+                               LIVES_KEY_z, LIVES_CONTROL_MASK,
+                               LIVES_ACCEL_VISIBLE);
 
 #if LIVES_HAS_IMAGE_MENU_ITEM
-  image = lives_image_new_from_stock (LIVES_STOCK_REDO, LIVES_ICON_SIZE_MENU);
-  lives_widget_show (image);
-  lives_image_menu_item_set_image (LIVES_IMAGE_MENU_ITEM (mt->redo), image);
+  image = lives_image_new_from_stock(LIVES_STOCK_REDO, LIVES_ICON_SIZE_MENU);
+  lives_widget_show(image);
+  lives_image_menu_item_set_image(LIVES_IMAGE_MENU_ITEM(mt->redo), image);
 #endif
 
   if (mt->undo_offset<=1) mt_set_redoable(mt,MT_UNDO_NONE,NULL,FALSE);
   else {
-    mt_undo *redo=(mt_undo *)(g_list_nth_data(mt->undos,g_list_length(mt->undos)-mt->undo_offset));
+    mt_undo *redo=(mt_undo *)(lives_list_nth_data(mt->undos,lives_list_length(mt->undos)-mt->undo_offset));
     mt_set_redoable(mt,redo->action,redo->extra,TRUE);
   }
 
-  lives_signal_connect (LIVES_GUI_OBJECT (mt->redo), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (multitrack_redo),
-		    (gpointer)mt);
+  lives_signal_connect(LIVES_GUI_OBJECT(mt->redo), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(multitrack_redo),
+                       (livespointer)mt);
 
-  separator = lives_menu_item_new ();
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), separator);
-  lives_widget_set_sensitive (separator, FALSE);
+  separator = lives_menu_item_new();
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), separator);
+  lives_widget_set_sensitive(separator, FALSE);
 
 
-  mt->clipedit = lives_image_menu_item_new_with_mnemonic (_("_CLIP EDITOR"));
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mt->clipedit);
+  mt->clipedit = lives_image_menu_item_new_with_mnemonic(_("_CLIP EDITOR"));
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mt->clipedit);
 
-  lives_widget_add_accelerator (mt->clipedit, LIVES_WIDGET_ACTIVATE_EVENT, mt->accel_group,
-                              LIVES_KEY_e, LIVES_CONTROL_MASK,
-                              LIVES_ACCEL_VISIBLE);
+  lives_widget_add_accelerator(mt->clipedit, LIVES_WIDGET_ACTIVATE_SIGNAL, mt->accel_group,
+                               LIVES_KEY_e, LIVES_CONTROL_MASK,
+                               LIVES_ACCEL_VISIBLE);
 
 
-  separator = lives_menu_item_new ();
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), separator);
-  lives_widget_set_sensitive (separator, FALSE);
+  separator = lives_menu_item_new();
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), separator);
+  lives_widget_set_sensitive(separator, FALSE);
 
-  mt->adjust_start_end = lives_image_menu_item_new_with_mnemonic (_("_Adjust selected clip start/end points"));
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mt->adjust_start_end);
+  mt->adjust_start_end = lives_image_menu_item_new_with_mnemonic(_("_Adjust selected clip start/end points"));
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mt->adjust_start_end);
 
-  lives_widget_add_accelerator (mt->adjust_start_end, LIVES_WIDGET_ACTIVATE_EVENT, mt->accel_group,
-                              LIVES_KEY_x, LIVES_CONTROL_MASK,
-                              LIVES_ACCEL_VISIBLE);
-  lives_widget_set_sensitive (mt->adjust_start_end, FALSE);
+  lives_widget_add_accelerator(mt->adjust_start_end, LIVES_WIDGET_ACTIVATE_SIGNAL, mt->accel_group,
+                               LIVES_KEY_x, LIVES_CONTROL_MASK,
+                               LIVES_ACCEL_VISIBLE);
+  lives_widget_set_sensitive(mt->adjust_start_end, FALSE);
 
 
-  mt->insert = lives_image_menu_item_new_with_mnemonic (_("_Insert selected clip"));
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mt->insert);
+  mt->insert = lives_image_menu_item_new_with_mnemonic(_("_Insert selected clip"));
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mt->insert);
 
-  lives_widget_add_accelerator (mt->insert, LIVES_WIDGET_ACTIVATE_EVENT, mt->accel_group,
-                              LIVES_KEY_i, (LiVESXModifierType)0,
-                              LIVES_ACCEL_VISIBLE);
-  lives_widget_add_accelerator (mt->insert, LIVES_WIDGET_ACTIVATE_EVENT, mt->accel_group,
-                              LIVES_KEY_i, LIVES_CONTROL_MASK,
-                              (LiVESAccelFlags)0);
-  lives_widget_set_sensitive (mt->insert, FALSE);
+  lives_widget_add_accelerator(mt->insert, LIVES_WIDGET_ACTIVATE_SIGNAL, mt->accel_group,
+                               LIVES_KEY_i, (LiVESXModifierType)0,
+                               LIVES_ACCEL_VISIBLE);
+  lives_widget_add_accelerator(mt->insert, LIVES_WIDGET_ACTIVATE_SIGNAL, mt->accel_group,
+                               LIVES_KEY_i, LIVES_CONTROL_MASK,
+                               (LiVESAccelFlags)0);
+  lives_widget_set_sensitive(mt->insert, FALSE);
 
 
-  mt->audio_insert = lives_image_menu_item_new_with_mnemonic (_("_Insert selected clip audio"));
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mt->audio_insert);
+  mt->audio_insert = lives_image_menu_item_new_with_mnemonic(_("_Insert selected clip audio"));
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mt->audio_insert);
+
+  lives_widget_add_accelerator(mt->audio_insert, LIVES_WIDGET_ACTIVATE_SIGNAL, mt->accel_group,
+                               LIVES_KEY_i, LIVES_CONTROL_MASK,
+                               LIVES_ACCEL_VISIBLE);
+  lives_widget_set_sensitive(mt->audio_insert, FALSE);
 
-  lives_widget_add_accelerator (mt->audio_insert, LIVES_WIDGET_ACTIVATE_EVENT, mt->accel_group,
-                              LIVES_KEY_i, LIVES_CONTROL_MASK,
-                              LIVES_ACCEL_VISIBLE);
-  lives_widget_set_sensitive (mt->audio_insert, FALSE);
 
+  mt->delblock = lives_image_menu_item_new_with_mnemonic(_("_Delete selected block"));
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mt->delblock);
+  lives_widget_set_sensitive(mt->delblock, FALSE);
 
-  mt->delblock = lives_image_menu_item_new_with_mnemonic (_("_Delete selected block"));
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mt->delblock);
-  lives_widget_set_sensitive (mt->delblock, FALSE);
 
-  lives_widget_add_accelerator (mt->delblock, LIVES_WIDGET_ACTIVATE_EVENT, mt->accel_group,
+  // TODO
+  /*
+  lives_widget_add_accelerator (mt->delblock, LIVES_WIDGET_ACTIVATE_SIGNAL, mt->accel_group,
                               LIVES_KEY_d, LIVES_CONTROL_MASK,
                               LIVES_ACCEL_VISIBLE);
+  */
 
+  mt->jumpback = lives_image_menu_item_new_with_mnemonic(_("_Jump to previous block boundary"));
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mt->jumpback);
 
-  mt->jumpback = lives_image_menu_item_new_with_mnemonic (_("_Jump to previous block boundary"));
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mt->jumpback);
-
-  lives_widget_add_accelerator (mt->jumpback, LIVES_WIDGET_ACTIVATE_EVENT, mt->accel_group,
-                              LIVES_KEY_j, LIVES_CONTROL_MASK,
-                              LIVES_ACCEL_VISIBLE);
+  lives_widget_add_accelerator(mt->jumpback, LIVES_WIDGET_ACTIVATE_SIGNAL, mt->accel_group,
+                               LIVES_KEY_j, LIVES_CONTROL_MASK,
+                               LIVES_ACCEL_VISIBLE);
 
-  lives_widget_set_sensitive (mt->jumpback, FALSE);
+  lives_widget_set_sensitive(mt->jumpback, FALSE);
 
-  mt->jumpnext = lives_image_menu_item_new_with_mnemonic (_("_Jump to next block boundary"));
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mt->jumpnext);
+  mt->jumpnext = lives_image_menu_item_new_with_mnemonic(_("_Jump to next block boundary"));
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mt->jumpnext);
 
-  lives_widget_add_accelerator (mt->jumpnext, LIVES_WIDGET_ACTIVATE_EVENT, mt->accel_group,
-                              LIVES_KEY_l, LIVES_CONTROL_MASK,
-                              LIVES_ACCEL_VISIBLE);
+  lives_widget_add_accelerator(mt->jumpnext, LIVES_WIDGET_ACTIVATE_SIGNAL, mt->accel_group,
+                               LIVES_KEY_l, LIVES_CONTROL_MASK,
+                               LIVES_ACCEL_VISIBLE);
 
-  lives_widget_set_sensitive (mt->jumpnext, FALSE);
+  lives_widget_set_sensitive(mt->jumpnext, FALSE);
 
-  separator = lives_menu_item_new ();
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), separator);
-  lives_widget_set_sensitive (separator, FALSE);
+  separator = lives_menu_item_new();
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), separator);
+  lives_widget_set_sensitive(separator, FALSE);
 
-  mt->clear_marks = lives_image_menu_item_new_with_mnemonic (_("Clear _marks from timeline"));
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mt->clear_marks);
+  mt->clear_marks = lives_image_menu_item_new_with_mnemonic(_("Clear _marks from timeline"));
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mt->clear_marks);
   lives_widget_set_sensitive(mt->clear_marks,FALSE);
 
-  separator = lives_menu_item_new ();
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), separator);
-  lives_widget_set_sensitive (separator, FALSE);
+  separator = lives_menu_item_new();
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), separator);
+  lives_widget_set_sensitive(separator, FALSE);
 
-  ign_ins_sel = lives_check_menu_item_new_with_mnemonic (_("Ignore selection limits when inserting"));
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), ign_ins_sel);
+  ign_ins_sel = lives_check_menu_item_new_with_mnemonic(_("Ignore selection limits when inserting"));
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), ign_ins_sel);
   lives_check_menu_item_set_active(LIVES_CHECK_MENU_ITEM(ign_ins_sel),mt->opts.ign_ins_sel);
 
   // Play
 
-  menuitem = lives_menu_item_new_with_mnemonic (_ ("_Play"));
-  lives_container_add (LIVES_CONTAINER (menubar), menuitem);
-  
-  menuitem_menu = lives_menu_new ();
-  lives_menu_item_set_submenu (LIVES_MENU_ITEM (menuitem), menuitem_menu);
+  menuitem = lives_menu_item_new_with_mnemonic(_("_Play"));
+  lives_container_add(LIVES_CONTAINER(mt->menubar), menuitem);
+
+  menuitem_menu = lives_menu_new();
+  lives_menu_item_set_submenu(LIVES_MENU_ITEM(menuitem), menuitem_menu);
 
   if (palette->style&STYLE_1) {
     lives_widget_set_bg_color(menuitem_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
     lives_widget_set_fg_color(menuitem_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars_fore);
   }
 
-  mt->playall = lives_image_menu_item_new_with_mnemonic (_("_Play from Timeline Position"));
-  lives_widget_add_accelerator (mt->playall, LIVES_WIDGET_ACTIVATE_EVENT, mt->accel_group,
-                              LIVES_KEY_p, (LiVESXModifierType)0,
-                              LIVES_ACCEL_VISIBLE);
-  lives_widget_set_sensitive (mt->playall, FALSE);
+  mt->playall = lives_image_menu_item_new_with_mnemonic(_("_Play from Timeline Position"));
+  lives_widget_add_accelerator(mt->playall, LIVES_WIDGET_ACTIVATE_SIGNAL, mt->accel_group,
+                               LIVES_KEY_p, (LiVESXModifierType)0,
+                               LIVES_ACCEL_VISIBLE);
+  lives_widget_set_sensitive(mt->playall, FALSE);
 
 
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mt->playall);
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mt->playall);
 
 #if LIVES_HAS_IMAGE_MENU_ITEM
-  image = lives_image_new_from_stock (LIVES_STOCK_REFRESH, LIVES_ICON_SIZE_MENU);
-  lives_image_menu_item_set_image (LIVES_IMAGE_MENU_ITEM (mt->playall), image);
+  image = lives_image_new_from_stock(LIVES_STOCK_REFRESH, LIVES_ICON_SIZE_MENU);
+  lives_image_menu_item_set_image(LIVES_IMAGE_MENU_ITEM(mt->playall), image);
 #endif
 
-  mt->playsel = lives_image_menu_item_new_with_mnemonic (_("Pla_y selected time only"));
-  lives_widget_add_accelerator (mt->playsel, LIVES_WIDGET_ACTIVATE_EVENT, mt->accel_group,
-                              LIVES_KEY_y, (LiVESXModifierType)0,
-                              LIVES_ACCEL_VISIBLE);
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mt->playsel);
-  lives_widget_set_sensitive (mt->playsel, FALSE);
-
-  mt->stop = lives_image_menu_item_new_with_mnemonic (_("_Stop"));
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mt->stop);
-  lives_widget_set_sensitive (mt->stop, FALSE);
-  lives_widget_add_accelerator (mt->stop, LIVES_WIDGET_ACTIVATE_EVENT, mt->accel_group,
-                              LIVES_KEY_q, (LiVESXModifierType)0,
-                              LIVES_ACCEL_VISIBLE);
+  mt->playsel = lives_image_menu_item_new_with_mnemonic(_("Pla_y selected time only"));
+  lives_widget_add_accelerator(mt->playsel, LIVES_WIDGET_ACTIVATE_SIGNAL, mt->accel_group,
+                               LIVES_KEY_y, (LiVESXModifierType)0,
+                               LIVES_ACCEL_VISIBLE);
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mt->playsel);
+  lives_widget_set_sensitive(mt->playsel, FALSE);
+
+  mt->stop = lives_image_menu_item_new_with_mnemonic(_("_Stop"));
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mt->stop);
+  lives_widget_set_sensitive(mt->stop, FALSE);
+  lives_widget_add_accelerator(mt->stop, LIVES_WIDGET_ACTIVATE_SIGNAL, mt->accel_group,
+                               LIVES_KEY_q, (LiVESXModifierType)0,
+                               LIVES_ACCEL_VISIBLE);
 
 #if LIVES_HAS_IMAGE_MENU_ITEM
-  image = lives_image_new_from_stock (LIVES_STOCK_MEDIA_STOP, LIVES_ICON_SIZE_MENU);
-  lives_image_menu_item_set_image (LIVES_IMAGE_MENU_ITEM (mt->stop), image);
+  image = lives_image_new_from_stock(LIVES_STOCK_MEDIA_STOP, LIVES_ICON_SIZE_MENU);
+  lives_image_menu_item_set_image(LIVES_IMAGE_MENU_ITEM(mt->stop), image);
 #endif
 
-  mt->rewind = lives_image_menu_item_new_with_mnemonic (_("Re_wind"));
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mt->rewind);
+  mt->rewind = lives_image_menu_item_new_with_mnemonic(_("Re_wind"));
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mt->rewind);
 
 #if LIVES_HAS_IMAGE_MENU_ITEM
-  image = lives_image_new_from_stock (LIVES_STOCK_MEDIA_REWIND, LIVES_ICON_SIZE_MENU);
-  lives_image_menu_item_set_image (LIVES_IMAGE_MENU_ITEM (mt->rewind), image);
+  image = lives_image_new_from_stock(LIVES_STOCK_MEDIA_REWIND, LIVES_ICON_SIZE_MENU);
+  lives_image_menu_item_set_image(LIVES_IMAGE_MENU_ITEM(mt->rewind), image);
 #endif
 
-  lives_widget_set_sensitive (mt->rewind, FALSE);
+  lives_widget_set_sensitive(mt->rewind, FALSE);
 
-  lives_widget_add_accelerator (mt->rewind, LIVES_WIDGET_ACTIVATE_EVENT, mt->accel_group,
-                              LIVES_KEY_w, (LiVESXModifierType)0,
-                              LIVES_ACCEL_VISIBLE);
+  lives_widget_add_accelerator(mt->rewind, LIVES_WIDGET_ACTIVATE_SIGNAL, mt->accel_group,
+                               LIVES_KEY_w, (LiVESXModifierType)0,
+                               LIVES_ACCEL_VISIBLE);
 
-  separator = lives_menu_item_new ();
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), separator);
-  lives_widget_set_sensitive (separator, FALSE);
+  separator = lives_menu_item_new();
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), separator);
+  lives_widget_set_sensitive(separator, FALSE);
 
-  full_screen = lives_check_menu_item_new_with_mnemonic (_("_Full Screen"));
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), full_screen);
+  full_screen = lives_check_menu_item_new_with_mnemonic(_("_Full Screen"));
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), full_screen);
   lives_check_menu_item_set_active(LIVES_CHECK_MENU_ITEM(full_screen),mainw->fs);
 
-  lives_widget_add_accelerator (full_screen, LIVES_WIDGET_ACTIVATE_EVENT, mt->accel_group,
-                              LIVES_KEY_f, (LiVESXModifierType)0,
-                              LIVES_ACCEL_VISIBLE);
+  lives_widget_add_accelerator(full_screen, LIVES_WIDGET_ACTIVATE_SIGNAL, mt->accel_group,
+                               LIVES_KEY_f, (LiVESXModifierType)0,
+                               LIVES_ACCEL_VISIBLE);
 
-  mt->sepwin = lives_check_menu_item_new_with_mnemonic (_("Play in _Separate Window"));
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mt->sepwin);
+  mt->sepwin = lives_check_menu_item_new_with_mnemonic(_("Play in _Separate Window"));
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mt->sepwin);
   lives_check_menu_item_set_active(LIVES_CHECK_MENU_ITEM(mt->sepwin),mainw->sep_win);
 
-  lives_widget_add_accelerator (mt->sepwin, LIVES_WIDGET_ACTIVATE_EVENT, mt->accel_group,
-                              LIVES_KEY_s, (LiVESXModifierType)0,
-                              LIVES_ACCEL_VISIBLE);
+  lives_widget_add_accelerator(mt->sepwin, LIVES_WIDGET_ACTIVATE_SIGNAL, mt->accel_group,
+                               LIVES_KEY_s, (LiVESXModifierType)0,
+                               LIVES_ACCEL_VISIBLE);
 
-  mt->loop_continue = lives_check_menu_item_new_with_mnemonic (_("L_oop Continuously"));
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mt->loop_continue);
+  mt->loop_continue = lives_check_menu_item_new_with_mnemonic(_("L_oop Continuously"));
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mt->loop_continue);
   lives_check_menu_item_set_active(LIVES_CHECK_MENU_ITEM(mt->loop_continue),mainw->loop_cont);
 
-  lives_widget_add_accelerator (mt->loop_continue, LIVES_WIDGET_ACTIVATE_EVENT, mt->accel_group,
-                              LIVES_KEY_o, (LiVESXModifierType)0,
-                              LIVES_ACCEL_VISIBLE);
+  lives_widget_add_accelerator(mt->loop_continue, LIVES_WIDGET_ACTIVATE_SIGNAL, mt->accel_group,
+                               LIVES_KEY_o, (LiVESXModifierType)0,
+                               LIVES_ACCEL_VISIBLE);
 
-  mt->mute_audio = lives_check_menu_item_new_with_mnemonic (_("_Mute"));
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mt->mute_audio);
+  mt->mute_audio = lives_check_menu_item_new_with_mnemonic(_("_Mute"));
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mt->mute_audio);
   lives_check_menu_item_set_active(LIVES_CHECK_MENU_ITEM(mt->mute_audio),mainw->mute);
 
-  lives_widget_add_accelerator (mt->mute_audio, LIVES_WIDGET_ACTIVATE_EVENT, mt->accel_group,
-                              LIVES_KEY_z, (LiVESXModifierType)0,
-                              LIVES_ACCEL_VISIBLE);
+  lives_widget_add_accelerator(mt->mute_audio, LIVES_WIDGET_ACTIVATE_SIGNAL, mt->accel_group,
+                               LIVES_KEY_z, (LiVESXModifierType)0,
+                               LIVES_ACCEL_VISIBLE);
 
 
 
   // Effects
 
-  menuitem = lives_menu_item_new_with_mnemonic (_ ("Effect_s"));
-  lives_container_add (LIVES_CONTAINER (menubar), menuitem);
-  
-  menuitem_menu = lives_menu_new ();
-  lives_menu_item_set_submenu (LIVES_MENU_ITEM (menuitem), menuitem_menu);
+  menuitem = lives_menu_item_new_with_mnemonic(_("Effect_s"));
+  lives_container_add(LIVES_CONTAINER(mt->menubar), menuitem);
+
+  menuitem_menu = lives_menu_new();
+  lives_menu_item_set_submenu(LIVES_MENU_ITEM(menuitem), menuitem_menu);
 
   if (palette->style&STYLE_1) {
     lives_widget_set_bg_color(menuitem_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
     lives_widget_set_fg_color(menuitem_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars_fore);
   }
 
-  mt->move_fx = lives_check_menu_item_new_with_mnemonic (_("_Move effects with blocks"));
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mt->move_fx);
+  mt->move_fx = lives_check_menu_item_new_with_mnemonic(_("_Move effects with blocks"));
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mt->move_fx);
   lives_check_menu_item_set_active(LIVES_CHECK_MENU_ITEM(mt->move_fx),mt->opts.move_effects);
 
-  lives_signal_connect_after (LIVES_GUI_OBJECT (mt->move_fx), LIVES_WIDGET_TOGGLED_EVENT,
-			  LIVES_GUI_CALLBACK (on_move_fx_changed),
-			  (gpointer)mt);
+  lives_signal_connect_after(LIVES_GUI_OBJECT(mt->move_fx), LIVES_WIDGET_TOGGLED_SIGNAL,
+                             LIVES_GUI_CALLBACK(on_move_fx_changed),
+                             (livespointer)mt);
 
-  separator = lives_menu_item_new ();
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), separator);
-  lives_widget_set_sensitive (separator, FALSE);
+  separator = lives_menu_item_new();
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), separator);
+  lives_widget_set_sensitive(separator, FALSE);
 
 
-  mt->atrans_menuitem = lives_menu_item_new_with_mnemonic (_("Select _autotransition effect..."));
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mt->atrans_menuitem);
+  mt->atrans_menuitem = lives_menu_item_new_with_mnemonic(_("Select _autotransition effect..."));
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mt->atrans_menuitem);
 
   mt->submenu_atransfx=lives_menu_new();
-  lives_menu_item_set_submenu (LIVES_MENU_ITEM (mt->atrans_menuitem), mt->submenu_atransfx);
+  lives_menu_item_set_submenu(LIVES_MENU_ITEM(mt->atrans_menuitem), mt->submenu_atransfx);
 
   if (palette->style&STYLE_1) {
     lives_widget_set_bg_color(mt->submenu_atransfx, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
     lives_widget_set_fg_color(mt->submenu_atransfx, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars_fore);
   }
 
-  mt->ac_audio_check = lives_check_menu_item_new_with_mnemonic (_("Crossfade audio with autotransition"));
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mt->ac_audio_check);
+  mt->ac_audio_check = lives_check_menu_item_new_with_mnemonic(_("Crossfade audio with autotransition"));
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mt->ac_audio_check);
   lives_check_menu_item_set_active(LIVES_CHECK_MENU_ITEM(mt->ac_audio_check),mt->opts.autocross_audio);
 
-  separator = lives_menu_item_new ();
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), separator);
-  lives_widget_set_sensitive (separator, FALSE);
+  separator = lives_menu_item_new();
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), separator);
+  lives_widget_set_sensitive(separator, FALSE);
 
-  mt->fx_edit = lives_menu_item_new_with_mnemonic (_("View/_Edit selected effect"));
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mt->fx_edit);
+  mt->fx_edit = lives_menu_item_new_with_mnemonic(_("View/_Edit selected effect"));
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mt->fx_edit);
   lives_widget_set_sensitive(mt->fx_edit,FALSE);
 
-  mt->fx_delete = lives_menu_item_new_with_mnemonic (_("_Delete selected effect"));
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mt->fx_delete);
+  mt->fx_delete = lives_menu_item_new_with_mnemonic(_("_Delete selected effect"));
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mt->fx_delete);
   lives_widget_set_sensitive(mt->fx_delete,FALSE);
 
-  separator = lives_menu_item_new ();
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), separator);
-  lives_widget_set_sensitive (separator, FALSE);
+  separator = lives_menu_item_new();
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), separator);
+  lives_widget_set_sensitive(separator, FALSE);
 
-  mt->fx_block = lives_menu_item_new_with_mnemonic (_("Apply effect to _block..."));
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mt->fx_block);
+  mt->fx_block = lives_menu_item_new_with_mnemonic(_("Apply effect to _block..."));
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mt->fx_block);
   lives_widget_set_sensitive(mt->fx_block,FALSE);
 
   submenu_menu=lives_menu_new();
-  lives_menu_item_set_submenu (LIVES_MENU_ITEM (mt->fx_block), submenu_menu);
+  lives_menu_item_set_submenu(LIVES_MENU_ITEM(mt->fx_block), submenu_menu);
 
   if (palette->style&STYLE_1) {
     lives_widget_set_bg_color(submenu_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
@@ -6575,18 +6757,18 @@
 
 
   tname=lives_fx_cat_to_text(LIVES_FX_CAT_VIDEO_EFFECT,TRUE); // video effects
-  cname=g_strdup_printf("_%s...",tname);
-  g_free(tname);
+  cname=lives_strdup_printf("_%s...",tname);
+  lives_free(tname);
 
-  mt->fx_blockv = lives_menu_item_new_with_mnemonic (cname);
-  g_free(cname);
+  mt->fx_blockv = lives_menu_item_new_with_mnemonic(cname);
+  lives_free(cname);
 
 
-  lives_container_add (LIVES_CONTAINER (submenu_menu), mt->fx_blockv);
+  lives_container_add(LIVES_CONTAINER(submenu_menu), mt->fx_blockv);
   lives_widget_set_sensitive(mt->fx_blockv,FALSE);
 
   submenu_menuv=lives_menu_new();
-  lives_menu_item_set_submenu (LIVES_MENU_ITEM (mt->fx_blockv), submenu_menuv);
+  lives_menu_item_set_submenu(LIVES_MENU_ITEM(mt->fx_blockv), submenu_menuv);
 
   if (palette->style&STYLE_1) {
     lives_widget_set_bg_color(submenu_menuv, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
@@ -6596,18 +6778,18 @@
 
 
   tname=lives_fx_cat_to_text(LIVES_FX_CAT_AUDIO_EFFECT,TRUE); // audio effects
-  cname=g_strdup_printf("_%s...",tname);
-  g_free(tname);
+  cname=lives_strdup_printf("_%s...",tname);
+  lives_free(tname);
 
-  mt->fx_blocka = lives_menu_item_new_with_mnemonic (cname);
-  g_free(cname);
+  mt->fx_blocka = lives_menu_item_new_with_mnemonic(cname);
+  lives_free(cname);
 
 
-  lives_container_add (LIVES_CONTAINER (submenu_menu), mt->fx_blocka);
+  lives_container_add(LIVES_CONTAINER(submenu_menu), mt->fx_blocka);
   lives_widget_set_sensitive(mt->fx_blocka,FALSE);
 
   submenu_menua=lives_menu_new();
-  lives_menu_item_set_submenu (LIVES_MENU_ITEM (mt->fx_blocka), submenu_menua);
+  lives_menu_item_set_submenu(LIVES_MENU_ITEM(mt->fx_blocka), submenu_menua);
 
   if (palette->style&STYLE_1) {
     lives_widget_set_bg_color(submenu_menua, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
@@ -6616,12 +6798,12 @@
 
 
 
-  mt->fx_region = lives_menu_item_new_with_mnemonic (_("Apply effect to _region..."));
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mt->fx_region);
+  mt->fx_region = lives_menu_item_new_with_mnemonic(_("Apply effect to _region..."));
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mt->fx_region);
   lives_widget_set_sensitive(mt->fx_region,FALSE);
 
   submenu_menu2=lives_menu_new();
-  lives_menu_item_set_submenu (LIVES_MENU_ITEM (mt->fx_region), submenu_menu2);
+  lives_menu_item_set_submenu(LIVES_MENU_ITEM(mt->fx_region), submenu_menu2);
 
   if (palette->style&STYLE_1) {
     lives_widget_set_bg_color(submenu_menu2, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
@@ -6629,17 +6811,17 @@
   }
 
   tname=lives_fx_cat_to_text(LIVES_FX_CAT_EFFECT,TRUE); // effects
-  cname=g_strdup_printf("_%s...",tname);
-  g_free(tname);
+  cname=lives_strdup_printf("_%s...",tname);
+  lives_free(tname);
 
-  mt->fx_region_1 = lives_menu_item_new_with_mnemonic (cname);
-  g_free(cname);
-  lives_container_add (LIVES_CONTAINER (submenu_menu2), mt->fx_region_1);
+  mt->fx_region_1 = lives_menu_item_new_with_mnemonic(cname);
+  lives_free(cname);
+  lives_container_add(LIVES_CONTAINER(submenu_menu2), mt->fx_region_1);
   lives_widget_set_sensitive(mt->fx_region_1,FALSE);
 
 
   submenu_menu3=lives_menu_new();
-  lives_menu_item_set_submenu (LIVES_MENU_ITEM (mt->fx_region_1), submenu_menu3);
+  lives_menu_item_set_submenu(LIVES_MENU_ITEM(mt->fx_region_1), submenu_menu3);
 
   if (palette->style&STYLE_1) {
     lives_widget_set_bg_color(submenu_menu3, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
@@ -6648,55 +6830,55 @@
 
 
   tname=lives_fx_cat_to_text(LIVES_FX_CAT_VIDEO_EFFECT,TRUE); // video effects
-  cname=g_strdup_printf("_%s...",tname);
-  g_free(tname);
+  cname=lives_strdup_printf("_%s...",tname);
+  lives_free(tname);
 
-  mt->fx_region_1v = lives_menu_item_new_with_mnemonic (cname);
-  g_free(cname);
-  lives_container_add (LIVES_CONTAINER (submenu_menu3), mt->fx_region_1v);
+  mt->fx_region_1v = lives_menu_item_new_with_mnemonic(cname);
+  lives_free(cname);
+  lives_container_add(LIVES_CONTAINER(submenu_menu3), mt->fx_region_1v);
   lives_widget_set_sensitive(mt->fx_region_1v,FALSE);
 
   submenu_menu4v=lives_menu_new();
-  lives_menu_item_set_submenu (LIVES_MENU_ITEM (mt->fx_region_1v), submenu_menu4v);
+  lives_menu_item_set_submenu(LIVES_MENU_ITEM(mt->fx_region_1v), submenu_menu4v);
 
   if (palette->style&STYLE_1) {
     lives_widget_set_bg_color(submenu_menu4v, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
     lives_widget_set_fg_color(submenu_menu4v, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars_fore);
   }
 
-  
+
 
   tname=lives_fx_cat_to_text(LIVES_FX_CAT_AUDIO_EFFECT,TRUE); // audio effects
-  cname=g_strdup_printf("_%s...",tname);
-  g_free(tname);
+  cname=lives_strdup_printf("_%s...",tname);
+  lives_free(tname);
 
-  mt->fx_region_1a = lives_menu_item_new_with_mnemonic (cname);
-  g_free(cname);
-  lives_container_add (LIVES_CONTAINER (submenu_menu3), mt->fx_region_1a);
+  mt->fx_region_1a = lives_menu_item_new_with_mnemonic(cname);
+  lives_free(cname);
+  lives_container_add(LIVES_CONTAINER(submenu_menu3), mt->fx_region_1a);
   lives_widget_set_sensitive(mt->fx_region_1a,FALSE);
 
   submenu_menu4a=lives_menu_new();
-  lives_menu_item_set_submenu (LIVES_MENU_ITEM (mt->fx_region_1a), submenu_menu4a);
+  lives_menu_item_set_submenu(LIVES_MENU_ITEM(mt->fx_region_1a), submenu_menu4a);
 
   if (palette->style&STYLE_1) {
     lives_widget_set_bg_color(submenu_menu4a, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
     lives_widget_set_fg_color(submenu_menu4a, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars_fore);
   }
 
-  
+
 
 
 
   tname=lives_fx_cat_to_text(LIVES_FX_CAT_TRANSITION,TRUE); // transitions
-  cname=g_strdup_printf("_%s...",tname);
-  g_free(tname);
+  cname=lives_strdup_printf("_%s...",tname);
+  lives_free(tname);
 
-  mt->fx_region_2 = lives_menu_item_new_with_mnemonic (cname);
-  g_free(cname);
-  lives_container_add (LIVES_CONTAINER (submenu_menu2), mt->fx_region_2);
+  mt->fx_region_2 = lives_menu_item_new_with_mnemonic(cname);
+  lives_free(cname);
+  lives_container_add(LIVES_CONTAINER(submenu_menu2), mt->fx_region_2);
 
   submenu_menu4=lives_menu_new();
-  lives_menu_item_set_submenu (LIVES_MENU_ITEM (mt->fx_region_2), submenu_menu4);
+  lives_menu_item_set_submenu(LIVES_MENU_ITEM(mt->fx_region_2), submenu_menu4);
 
   if (palette->style&STYLE_1) {
     lives_widget_set_bg_color(submenu_menu4, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
@@ -6705,15 +6887,15 @@
 
 
   tname=lives_fx_cat_to_text(LIVES_FX_CAT_AV_TRANSITION,TRUE); //audio/video transitions
-  cname=g_strdup_printf("_%s...",tname);
-  g_free(tname);
+  cname=lives_strdup_printf("_%s...",tname);
+  lives_free(tname);
 
-  mt->fx_region_2av = lives_menu_item_new_with_mnemonic (cname);
-  g_free(cname);
-  lives_container_add (LIVES_CONTAINER (submenu_menu4), mt->fx_region_2av);
+  mt->fx_region_2av = lives_menu_item_new_with_mnemonic(cname);
+  lives_free(cname);
+  lives_container_add(LIVES_CONTAINER(submenu_menu4), mt->fx_region_2av);
 
   submenu_menu10=lives_menu_new();
-  lives_menu_item_set_submenu (LIVES_MENU_ITEM (mt->fx_region_2av), submenu_menu10);
+  lives_menu_item_set_submenu(LIVES_MENU_ITEM(mt->fx_region_2av), submenu_menu10);
 
   if (palette->style&STYLE_1) {
     lives_widget_set_bg_color(submenu_menu10, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
@@ -6722,15 +6904,15 @@
 
 
   tname=lives_fx_cat_to_text(LIVES_FX_CAT_VIDEO_TRANSITION,TRUE); //video only transitions
-  cname=g_strdup_printf("_%s...",tname);
-  g_free(tname);
+  cname=lives_strdup_printf("_%s...",tname);
+  lives_free(tname);
 
-  mt->fx_region_2v = lives_menu_item_new_with_mnemonic (cname);
-  g_free(cname);
-  lives_container_add (LIVES_CONTAINER (submenu_menu4), mt->fx_region_2v);
+  mt->fx_region_2v = lives_menu_item_new_with_mnemonic(cname);
+  lives_free(cname);
+  lives_container_add(LIVES_CONTAINER(submenu_menu4), mt->fx_region_2v);
 
   submenu_menu11=lives_menu_new();
-  lives_menu_item_set_submenu (LIVES_MENU_ITEM (mt->fx_region_2v), submenu_menu11);
+  lives_menu_item_set_submenu(LIVES_MENU_ITEM(mt->fx_region_2v), submenu_menu11);
 
   if (palette->style&STYLE_1) {
     lives_widget_set_bg_color(submenu_menu11, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
@@ -6739,17 +6921,17 @@
 
 
   tname=lives_fx_cat_to_text(LIVES_FX_CAT_AUDIO_TRANSITION,TRUE); //audio only transitions
-  cname=g_strdup_printf("_%s...",tname);
-  g_free(tname);
+  cname=lives_strdup_printf("_%s...",tname);
+  lives_free(tname);
 
-  mt->fx_region_2a = lives_menu_item_new_with_mnemonic (cname);
-  g_free(cname);
-  lives_container_add (LIVES_CONTAINER (submenu_menu4), mt->fx_region_2a);
+  mt->fx_region_2a = lives_menu_item_new_with_mnemonic(cname);
+  lives_free(cname);
+  lives_container_add(LIVES_CONTAINER(submenu_menu4), mt->fx_region_2a);
 
   if (!mt->opts.pertrack_audio) lives_widget_set_sensitive(mt->fx_region_2a,FALSE);
 
   submenu_menu12=lives_menu_new();
-  lives_menu_item_set_submenu (LIVES_MENU_ITEM (mt->fx_region_2a), submenu_menu12);
+  lives_menu_item_set_submenu(LIVES_MENU_ITEM(mt->fx_region_2a), submenu_menu12);
 
   if (palette->style&STYLE_1) {
     lives_widget_set_bg_color(submenu_menu12, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
@@ -6760,15 +6942,15 @@
 
 
   tname=lives_fx_cat_to_text(LIVES_FX_CAT_COMPOSITOR,TRUE); // compositors
-  cname=g_strdup_printf("_%s...",tname);
-  g_free(tname);
+  cname=lives_strdup_printf("_%s...",tname);
+  lives_free(tname);
 
-  mt->fx_region_3 = lives_menu_item_new_with_mnemonic (cname);
-  g_free(cname);
-  lives_container_add (LIVES_CONTAINER (submenu_menu2), mt->fx_region_3);
+  mt->fx_region_3 = lives_menu_item_new_with_mnemonic(cname);
+  lives_free(cname);
+  lives_container_add(LIVES_CONTAINER(submenu_menu2), mt->fx_region_3);
 
   submenu_menu5=lives_menu_new();
-  lives_menu_item_set_submenu (LIVES_MENU_ITEM (mt->fx_region_3), submenu_menu5);
+  lives_menu_item_set_submenu(LIVES_MENU_ITEM(mt->fx_region_3), submenu_menu5);
 
   if (palette->style&STYLE_1) {
     lives_widget_set_bg_color(submenu_menu5, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
@@ -6776,355 +6958,349 @@
   }
 
   num_filters=rte_get_numfilters(FALSE);
-  for (i=0;i<num_filters;i++) {
+  for (i=0; i<num_filters; i++) {
     weed_plant_t *filter=get_weed_filter(i);
     if (filter!=NULL&&!weed_plant_has_leaf(filter,"host_menu_hide")) {
       LiVESWidget *menuitem;
-      gchar *fname=weed_filter_idx_get_name(i),*fxname;
+      char *fname=weed_filter_idx_get_name(i),*fxname;
       if (weed_plant_has_leaf(filter,"plugin_unstable")&&
-	  weed_get_boolean_value(filter,"plugin_unstable",&error)==WEED_TRUE) {
-	if (!prefs->unstable_fx) {
-	  weed_free(fname);
-	  continue;
-	}
-	fxname=g_strdup_printf(_("%s [unstable]"),fname);
-      }
-      else fxname=g_strdup(fname);
+          weed_get_boolean_value(filter,"plugin_unstable",&error)==WEED_TRUE) {
+        if (!prefs->unstable_fx) {
+          lives_free(fname);
+          continue;
+        }
+        fxname=lives_strdup_printf(_("%s [unstable]"),fname);
+      } else fxname=lives_strdup(fname);
 
       if (enabled_in_channels(filter,TRUE)>=1000000&&enabled_out_channels(filter,FALSE)==1) {
-	menuitem = lives_image_menu_item_new_with_label (fxname);
-	lives_container_add (LIVES_CONTAINER (submenu_menu5), menuitem);
-	g_object_set_data(G_OBJECT(menuitem),"idx",GINT_TO_POINTER(i));
-	lives_signal_connect (LIVES_GUI_OBJECT (menuitem), LIVES_WIDGET_ACTIVATE_EVENT,
-			  LIVES_GUI_CALLBACK (mt_add_region_effect),
-			  (gpointer)mt);
-      }
-      else if (enabled_in_channels(filter,FALSE)==1&&enabled_out_channels(filter,FALSE)==1) {
-	// add all filter effects to submenus
-	menuitem = lives_image_menu_item_new_with_label (fxname);
-
-	if (!is_pure_audio(filter,FALSE)) {
-	  lives_container_add (LIVES_CONTAINER (submenu_menuv), menuitem);
-	  g_object_set_data(G_OBJECT(menuitem),"idx",GINT_TO_POINTER(i));
-	  lives_signal_connect (LIVES_GUI_OBJECT (menuitem), LIVES_WIDGET_ACTIVATE_EVENT,
-			    LIVES_GUI_CALLBACK (mt_add_block_effect),
-			    (gpointer)mt);
-
-	  menuitem = lives_image_menu_item_new_with_label (fxname);
-	  lives_container_add (LIVES_CONTAINER (submenu_menu4v), menuitem);
-	  g_object_set_data(G_OBJECT(menuitem),"idx",GINT_TO_POINTER(i));
-	  lives_signal_connect (LIVES_GUI_OBJECT (menuitem), LIVES_WIDGET_ACTIVATE_EVENT,
-			    LIVES_GUI_CALLBACK (mt_add_region_effect),
-			    (gpointer)mt);
-	}
-	else {
-	  lives_container_add (LIVES_CONTAINER (submenu_menua), menuitem);
-	  g_object_set_data(G_OBJECT(menuitem),"idx",GINT_TO_POINTER(i));
-	  lives_signal_connect (LIVES_GUI_OBJECT (menuitem), LIVES_WIDGET_ACTIVATE_EVENT,
-			    LIVES_GUI_CALLBACK (mt_add_block_effect),
-			    (gpointer)mt);
-
-	  menuitem = lives_image_menu_item_new_with_label (fxname);
-	  lives_container_add (LIVES_CONTAINER (submenu_menu4a), menuitem);
-	  g_object_set_data(G_OBJECT(menuitem),"idx",GINT_TO_POINTER(i));
-	  lives_signal_connect (LIVES_GUI_OBJECT (menuitem), LIVES_WIDGET_ACTIVATE_EVENT,
-			    LIVES_GUI_CALLBACK (mt_add_region_effect),
-			    (gpointer)mt);
-	}
-
-
-      }
-      else if (enabled_in_channels(filter,FALSE)==2&&enabled_out_channels(filter,FALSE)==1) {
-	// add all transitions to submenus
-	menuitem = lives_image_menu_item_new_with_label (fxname);
-	g_object_set_data(G_OBJECT(menuitem),"idx",GINT_TO_POINTER(i));
-	if (get_transition_param(filter,FALSE)==-1) lives_container_add (LIVES_CONTAINER (submenu_menu11), menuitem);
-	else {
-	  if (has_video_chans_in(filter,FALSE)) {
-	    /// the autotransitions menu
-	    menuitem2 = lives_check_menu_item_new_with_label (fxname);
-	    lives_check_menu_item_set_active(LIVES_CHECK_MENU_ITEM(menuitem2),prefs->atrans_fx==i);
-	    g_object_set_data(G_OBJECT(menuitem2),"idx",GINT_TO_POINTER(i));
-
-	    lives_signal_connect (LIVES_GUI_OBJECT (menuitem2), LIVES_WIDGET_ACTIVATE_EVENT,
-			      LIVES_GUI_CALLBACK (mt_set_atrans_effect),
-			      (gpointer)mt);
-
-
-	    if (!strcmp(fname,prefs->def_autotrans)) {
-	      lives_menu_shell_prepend(LIVES_MENU_SHELL(mt->submenu_atransfx),menuitem2);
-	    }
-	    else lives_menu_shell_append(LIVES_MENU_SHELL(mt->submenu_atransfx),menuitem2);
-	    /// apply block effect menu
-	    lives_container_add (LIVES_CONTAINER (submenu_menu10), menuitem);
-	  }
-	  else lives_container_add (LIVES_CONTAINER (submenu_menu12), menuitem);
-	}
-	lives_signal_connect (LIVES_GUI_OBJECT (menuitem), LIVES_WIDGET_ACTIVATE_EVENT,
-			  LIVES_GUI_CALLBACK (mt_add_region_effect),
-			  (gpointer)mt);
+        menuitem = lives_image_menu_item_new_with_label(fxname);
+        lives_container_add(LIVES_CONTAINER(submenu_menu5), menuitem);
+        lives_widget_object_set_data(LIVES_WIDGET_OBJECT(menuitem),"idx",LIVES_INT_TO_POINTER(i));
+        lives_signal_connect(LIVES_GUI_OBJECT(menuitem), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                             LIVES_GUI_CALLBACK(mt_add_region_effect),
+                             (livespointer)mt);
+      } else if (enabled_in_channels(filter,FALSE)==1&&enabled_out_channels(filter,FALSE)==1) {
+        // add all filter effects to submenus
+        menuitem = lives_image_menu_item_new_with_label(fxname);
+
+        if (!is_pure_audio(filter,FALSE)) {
+          lives_container_add(LIVES_CONTAINER(submenu_menuv), menuitem);
+          lives_widget_object_set_data(LIVES_WIDGET_OBJECT(menuitem),"idx",LIVES_INT_TO_POINTER(i));
+          lives_signal_connect(LIVES_GUI_OBJECT(menuitem), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                               LIVES_GUI_CALLBACK(mt_add_block_effect),
+                               (livespointer)mt);
+
+          menuitem = lives_image_menu_item_new_with_label(fxname);
+          lives_container_add(LIVES_CONTAINER(submenu_menu4v), menuitem);
+          lives_widget_object_set_data(LIVES_WIDGET_OBJECT(menuitem),"idx",LIVES_INT_TO_POINTER(i));
+          lives_signal_connect(LIVES_GUI_OBJECT(menuitem), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                               LIVES_GUI_CALLBACK(mt_add_region_effect),
+                               (livespointer)mt);
+        } else {
+          lives_container_add(LIVES_CONTAINER(submenu_menua), menuitem);
+          lives_widget_object_set_data(LIVES_WIDGET_OBJECT(menuitem),"idx",LIVES_INT_TO_POINTER(i));
+          lives_signal_connect(LIVES_GUI_OBJECT(menuitem), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                               LIVES_GUI_CALLBACK(mt_add_block_effect),
+                               (livespointer)mt);
+
+          menuitem = lives_image_menu_item_new_with_label(fxname);
+          lives_container_add(LIVES_CONTAINER(submenu_menu4a), menuitem);
+          lives_widget_object_set_data(LIVES_WIDGET_OBJECT(menuitem),"idx",LIVES_INT_TO_POINTER(i));
+          lives_signal_connect(LIVES_GUI_OBJECT(menuitem), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                               LIVES_GUI_CALLBACK(mt_add_region_effect),
+                               (livespointer)mt);
+        }
+
+
+      } else if (enabled_in_channels(filter,FALSE)==2&&enabled_out_channels(filter,FALSE)==1) {
+        // add all transitions to submenus
+        menuitem = lives_image_menu_item_new_with_label(fxname);
+        lives_widget_object_set_data(LIVES_WIDGET_OBJECT(menuitem),"idx",LIVES_INT_TO_POINTER(i));
+        if (get_transition_param(filter,FALSE)==-1) lives_container_add(LIVES_CONTAINER(submenu_menu11), menuitem);
+        else {
+          if (has_video_chans_in(filter,FALSE)) {
+            /// the autotransitions menu
+            menuitem2 = lives_check_menu_item_new_with_label(fxname);
+            lives_check_menu_item_set_active(LIVES_CHECK_MENU_ITEM(menuitem2),prefs->atrans_fx==i);
+            lives_widget_object_set_data(LIVES_WIDGET_OBJECT(menuitem2),"idx",LIVES_INT_TO_POINTER(i));
+
+            lives_signal_connect(LIVES_GUI_OBJECT(menuitem2), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                                 LIVES_GUI_CALLBACK(mt_set_atrans_effect),
+                                 (livespointer)mt);
+
+
+            if (!strcmp(fname,prefs->def_autotrans)) {
+              lives_menu_shell_prepend(LIVES_MENU_SHELL(mt->submenu_atransfx),menuitem2);
+            } else lives_menu_shell_append(LIVES_MENU_SHELL(mt->submenu_atransfx),menuitem2);
+            /// apply block effect menu
+            lives_container_add(LIVES_CONTAINER(submenu_menu10), menuitem);
+          } else lives_container_add(LIVES_CONTAINER(submenu_menu12), menuitem);
+        }
+        lives_signal_connect(LIVES_GUI_OBJECT(menuitem), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                             LIVES_GUI_CALLBACK(mt_add_region_effect),
+                             (livespointer)mt);
       }
-      g_free(fname);
-      g_free(fxname);
+      lives_free(fname);
+      lives_free(fxname);
     }
   }
 
   /// None autotransition
-  menuitem2 = lives_check_menu_item_new_with_label (mainw->string_constants[LIVES_STRING_CONSTANT_NONE]);
-  g_object_set_data(G_OBJECT(menuitem2),"idx",GINT_TO_POINTER(-1));
+  menuitem2 = lives_check_menu_item_new_with_label(mainw->string_constants[LIVES_STRING_CONSTANT_NONE]);
+  lives_widget_object_set_data(LIVES_WIDGET_OBJECT(menuitem2),"idx",LIVES_INT_TO_POINTER(-1));
   lives_check_menu_item_set_active(LIVES_CHECK_MENU_ITEM(menuitem2),prefs->atrans_fx==-1);
   lives_menu_shell_prepend(LIVES_MENU_SHELL(mt->submenu_atransfx),menuitem2);
 
-  lives_signal_connect (LIVES_GUI_OBJECT (menuitem2), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (mt_set_atrans_effect),
-		    (gpointer)mt);
+  lives_signal_connect(LIVES_GUI_OBJECT(menuitem2), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(mt_set_atrans_effect),
+                       (livespointer)mt);
 
 
   // Tracks
 
-  menuitem = lives_menu_item_new_with_mnemonic (_ ("_Tracks"));
-  lives_container_add (LIVES_CONTAINER (menubar), menuitem);
-  
-  menuitem_menu = lives_menu_new ();
-  lives_menu_item_set_submenu (LIVES_MENU_ITEM (menuitem), menuitem_menu);
+  menuitem = lives_menu_item_new_with_mnemonic(_("_Tracks"));
+  lives_container_add(LIVES_CONTAINER(mt->menubar), menuitem);
+
+  menuitem_menu = lives_menu_new();
+  lives_menu_item_set_submenu(LIVES_MENU_ITEM(menuitem), menuitem_menu);
 
   if (palette->style&STYLE_1) {
     lives_widget_set_bg_color(menuitem_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
     lives_widget_set_fg_color(menuitem_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars_fore);
   }
 
-  mt->rename_track = lives_image_menu_item_new_with_mnemonic (_("Rename current track"));
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mt->rename_track);
+  mt->rename_track = lives_image_menu_item_new_with_mnemonic(_("Rename current track"));
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mt->rename_track);
 
-  separator = lives_menu_item_new ();
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), separator);
-  lives_widget_set_sensitive (separator, FALSE);
+  separator = lives_menu_item_new();
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), separator);
+  lives_widget_set_sensitive(separator, FALSE);
 
 
-  mt->cback_audio = lives_image_menu_item_new_with_mnemonic (_("Make _Backing Audio current track"));
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mt->cback_audio);
+  mt->cback_audio = lives_image_menu_item_new_with_mnemonic(_("Make _Backing Audio current track"));
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mt->cback_audio);
 
-  lives_widget_add_accelerator (mt->cback_audio, LIVES_WIDGET_ACTIVATE_EVENT, mt->accel_group,
-                              LIVES_KEY_b, LIVES_CONTROL_MASK,
-                              LIVES_ACCEL_VISIBLE);
+  lives_widget_add_accelerator(mt->cback_audio, LIVES_WIDGET_ACTIVATE_SIGNAL, mt->accel_group,
+                               LIVES_KEY_b, LIVES_CONTROL_MASK,
+                               LIVES_ACCEL_VISIBLE);
 
-  separator = lives_menu_item_new ();
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), separator);
-  lives_widget_set_sensitive (separator, FALSE);
+  separator = lives_menu_item_new();
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), separator);
+  lives_widget_set_sensitive(separator, FALSE);
 
-  mt->add_vid_behind = lives_image_menu_item_new_with_mnemonic (_("Add Video Track at _Rear"));
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mt->add_vid_behind);
+  mt->add_vid_behind = lives_image_menu_item_new_with_mnemonic(_("Add Video Track at _Rear"));
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mt->add_vid_behind);
 
-  lives_widget_add_accelerator (mt->add_vid_behind, LIVES_WIDGET_ACTIVATE_EVENT, mt->accel_group,
-                              LIVES_KEY_t, LIVES_CONTROL_MASK,
-                              LIVES_ACCEL_VISIBLE);
+  lives_widget_add_accelerator(mt->add_vid_behind, LIVES_WIDGET_ACTIVATE_SIGNAL, mt->accel_group,
+                               LIVES_KEY_t, LIVES_CONTROL_MASK,
+                               LIVES_ACCEL_VISIBLE);
 
 
-  mt->add_vid_front = lives_image_menu_item_new_with_mnemonic (_("Add Video Track at _Front"));
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mt->add_vid_front);
+  mt->add_vid_front = lives_image_menu_item_new_with_mnemonic(_("Add Video Track at _Front"));
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mt->add_vid_front);
 
-  lives_widget_add_accelerator (mt->add_vid_front, LIVES_WIDGET_ACTIVATE_EVENT, mt->accel_group,
-                              LIVES_KEY_t, (LiVESXModifierType)(LIVES_CONTROL_MASK|LIVES_SHIFT_MASK),
-                              LIVES_ACCEL_VISIBLE);
+  lives_widget_add_accelerator(mt->add_vid_front, LIVES_WIDGET_ACTIVATE_SIGNAL, mt->accel_group,
+                               LIVES_KEY_t, (LiVESXModifierType)(LIVES_CONTROL_MASK|LIVES_SHIFT_MASK),
+                               LIVES_ACCEL_VISIBLE);
 
 
-  separator = lives_menu_item_new ();
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), separator);
-  lives_widget_set_sensitive (separator, FALSE);
+  separator = lives_menu_item_new();
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), separator);
+  lives_widget_set_sensitive(separator, FALSE);
 
 
-  menuitem = lives_menu_item_new_with_mnemonic (_("_Split current track at cursor"));
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), menuitem);
+  menuitem = lives_menu_item_new_with_mnemonic(_("_Split current track at cursor"));
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), menuitem);
 
-  lives_signal_connect (LIVES_GUI_OBJECT (menuitem), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (on_split_curr_activate),
-		    (gpointer)mt);
+  lives_signal_connect(LIVES_GUI_OBJECT(menuitem), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_split_curr_activate),
+                       (livespointer)mt);
 
-  lives_widget_add_accelerator (menuitem, LIVES_WIDGET_ACTIVATE_EVENT, mt->accel_group,
-                              LIVES_KEY_s, (LiVESXModifierType)LIVES_CONTROL_MASK,
-                              LIVES_ACCEL_VISIBLE);
+  lives_widget_add_accelerator(menuitem, LIVES_WIDGET_ACTIVATE_SIGNAL, mt->accel_group,
+                               LIVES_KEY_s, (LiVESXModifierType)LIVES_CONTROL_MASK,
+                               LIVES_ACCEL_VISIBLE);
 
 
-  mt->split_sel = lives_menu_item_new_with_mnemonic (_("_Split selected video tracks"));
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mt->split_sel);
-  lives_widget_set_sensitive (mt->split_sel, FALSE);
+  mt->split_sel = lives_menu_item_new_with_mnemonic(_("_Split selected video tracks"));
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mt->split_sel);
+  lives_widget_set_sensitive(mt->split_sel, FALSE);
 
-  lives_signal_connect (LIVES_GUI_OBJECT (mt->split_sel), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (on_split_sel_activate),
-		    (gpointer)mt);
+  lives_signal_connect(LIVES_GUI_OBJECT(mt->split_sel), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_split_sel_activate),
+                       (livespointer)mt);
 
 
-  separator = lives_menu_item_new ();
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), separator);
-  lives_widget_set_sensitive (separator, FALSE);
+  separator = lives_menu_item_new();
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), separator);
+  lives_widget_set_sensitive(separator, FALSE);
 
-  mt->ins_gap_sel = lives_image_menu_item_new_with_mnemonic (_("Insert gap in selected tracks/time"));
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mt->ins_gap_sel);
-  lives_widget_set_sensitive (mt->ins_gap_sel, FALSE);
+  mt->ins_gap_sel = lives_image_menu_item_new_with_mnemonic(_("Insert gap in selected tracks/time"));
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mt->ins_gap_sel);
+  lives_widget_set_sensitive(mt->ins_gap_sel, FALSE);
 
-  lives_signal_connect (LIVES_GUI_OBJECT (mt->ins_gap_sel), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (on_insgap_sel_activate),
-		    (gpointer)mt);
+  lives_signal_connect(LIVES_GUI_OBJECT(mt->ins_gap_sel), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_insgap_sel_activate),
+                       (livespointer)mt);
 
-  mt->ins_gap_cur = lives_image_menu_item_new_with_mnemonic (_("Insert gap in current track/selected time"));
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mt->ins_gap_cur);
-  lives_widget_set_sensitive (mt->ins_gap_cur, FALSE);
+  mt->ins_gap_cur = lives_image_menu_item_new_with_mnemonic(_("Insert gap in current track/selected time"));
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mt->ins_gap_cur);
+  lives_widget_set_sensitive(mt->ins_gap_cur, FALSE);
 
-  lives_signal_connect (LIVES_GUI_OBJECT (mt->ins_gap_cur), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (on_insgap_cur_activate),
-		    (gpointer)mt);
+  lives_signal_connect(LIVES_GUI_OBJECT(mt->ins_gap_cur), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_insgap_cur_activate),
+                       (livespointer)mt);
 
-  separator = lives_menu_item_new ();
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), separator);
-  lives_widget_set_sensitive (separator, FALSE);
+  separator = lives_menu_item_new();
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), separator);
+  lives_widget_set_sensitive(separator, FALSE);
 
-  mt->remove_gaps = lives_menu_item_new_with_mnemonic (_("Close all _gaps in selected tracks/time"));
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mt->remove_gaps);
+  mt->remove_gaps = lives_menu_item_new_with_mnemonic(_("Close all _gaps in selected tracks/time"));
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mt->remove_gaps);
 
-  lives_signal_connect (LIVES_GUI_OBJECT (mt->remove_gaps), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (remove_gaps),
-		    (gpointer)mt);
+  lives_signal_connect(LIVES_GUI_OBJECT(mt->remove_gaps), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(remove_gaps),
+                       (livespointer)mt);
 
-  lives_widget_add_accelerator (mt->remove_gaps, LIVES_WIDGET_ACTIVATE_EVENT, mt->accel_group,
-                              LIVES_KEY_g, LIVES_CONTROL_MASK,
-                              LIVES_ACCEL_VISIBLE);
+  lives_widget_add_accelerator(mt->remove_gaps, LIVES_WIDGET_ACTIVATE_SIGNAL, mt->accel_group,
+                               LIVES_KEY_g, LIVES_CONTROL_MASK,
+                               LIVES_ACCEL_VISIBLE);
 
-  mt->remove_first_gaps = lives_menu_item_new_with_mnemonic ("");
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mt->remove_first_gaps);
+  mt->remove_first_gaps = lives_menu_item_new_with_mnemonic("");
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mt->remove_first_gaps);
 
-  lives_signal_connect (LIVES_GUI_OBJECT (mt->remove_first_gaps), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (remove_first_gaps),
-		    (gpointer)mt);
+  lives_signal_connect(LIVES_GUI_OBJECT(mt->remove_first_gaps), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(remove_first_gaps),
+                       (livespointer)mt);
 
-  lives_widget_add_accelerator (mt->remove_first_gaps, LIVES_WIDGET_ACTIVATE_EVENT, mt->accel_group,
-                              LIVES_KEY_f, LIVES_CONTROL_MASK,
-                              LIVES_ACCEL_VISIBLE);
+  lives_widget_add_accelerator(mt->remove_first_gaps, LIVES_WIDGET_ACTIVATE_SIGNAL, mt->accel_group,
+                               LIVES_KEY_f, LIVES_CONTROL_MASK,
+                               LIVES_ACCEL_VISIBLE);
 
 
 
   // Selection
 
-  menuitem = lives_menu_item_new_with_mnemonic (_ ("Se_lection"));
-  lives_container_add (LIVES_CONTAINER (menubar), menuitem);
+  menuitem = lives_menu_item_new_with_mnemonic(_("Se_lection"));
+  lives_container_add(LIVES_CONTAINER(mt->menubar), menuitem);
 
-  menuitem_menu = lives_menu_new ();
-  lives_menu_item_set_submenu (LIVES_MENU_ITEM (menuitem), menuitem_menu);
+  menuitem_menu = lives_menu_new();
+  lives_menu_item_set_submenu(LIVES_MENU_ITEM(menuitem), menuitem_menu);
 
   if (palette->style&STYLE_1) {
     lives_widget_set_bg_color(menuitem_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
     lives_widget_set_fg_color(menuitem_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars_fore);
   }
 
-  mt->select_track = lives_check_menu_item_new_with_mnemonic (_("_Select Current Track"));
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mt->select_track);
+  mt->select_track = lives_check_menu_item_new_with_mnemonic(_("_Select Current Track"));
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mt->select_track);
 
-  lives_widget_add_accelerator (mt->select_track, LIVES_WIDGET_ACTIVATE_EVENT, mt->accel_group,
-                              LIVES_KEY_Space, LIVES_CONTROL_MASK,
-                              LIVES_ACCEL_VISIBLE);
+  lives_widget_add_accelerator(mt->select_track, LIVES_WIDGET_ACTIVATE_SIGNAL, mt->accel_group,
+                               LIVES_KEY_Space, LIVES_CONTROL_MASK,
+                               LIVES_ACCEL_VISIBLE);
 
-  menuitem = lives_menu_item_new_with_mnemonic (_("Select _all video tracks"));
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), menuitem);
+  menuitem = lives_menu_item_new_with_mnemonic(_("Select _all video tracks"));
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), menuitem);
 
-  lives_signal_connect (LIVES_GUI_OBJECT (menuitem), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (select_all_vid),
-		    (gpointer)mt);
+  lives_signal_connect(LIVES_GUI_OBJECT(menuitem), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(select_all_vid),
+                       (livespointer)mt);
 
-  menuitem = lives_menu_item_new_with_mnemonic (_("Select _no video tracks"));
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), menuitem);
+  menuitem = lives_menu_item_new_with_mnemonic(_("Select _no video tracks"));
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), menuitem);
 
-  lives_signal_connect (LIVES_GUI_OBJECT (menuitem), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (select_no_vid),
-		    (gpointer)mt);
+  lives_signal_connect(LIVES_GUI_OBJECT(menuitem), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(select_no_vid),
+                       (livespointer)mt);
 
-  menuitem = lives_menu_item_new_with_mnemonic (_("Select all _time"));
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), menuitem);
+  menuitem = lives_menu_item_new_with_mnemonic(_("Select all _time"));
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), menuitem);
 
-  lives_signal_connect (LIVES_GUI_OBJECT (menuitem), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (select_all_time),
-		    (gpointer)mt);
+  lives_signal_connect(LIVES_GUI_OBJECT(menuitem), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(select_all_time),
+                       (livespointer)mt);
 
-  lives_widget_add_accelerator (menuitem, LIVES_WIDGET_ACTIVATE_EVENT, mt->accel_group,
-                              LIVES_KEY_a, LIVES_CONTROL_MASK,
-                              LIVES_ACCEL_VISIBLE);
+  lives_widget_add_accelerator(menuitem, LIVES_WIDGET_ACTIVATE_SIGNAL, mt->accel_group,
+                               LIVES_KEY_a, LIVES_CONTROL_MASK,
+                               LIVES_ACCEL_VISIBLE);
 
-  menuitem = lives_menu_item_new_with_mnemonic (_("Select from _zero time"));
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), menuitem);
+  menuitem = lives_menu_item_new_with_mnemonic(_("Select from _zero time"));
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), menuitem);
 
-  lives_signal_connect (LIVES_GUI_OBJECT (menuitem), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (select_from_zero_time),
-		    (gpointer)mt);
+  lives_signal_connect(LIVES_GUI_OBJECT(menuitem), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(select_from_zero_time),
+                       (livespointer)mt);
 
-  menuitem = lives_menu_item_new_with_mnemonic (_("Select to _end time"));
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), menuitem);
+  menuitem = lives_menu_item_new_with_mnemonic(_("Select to _end time"));
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), menuitem);
 
-  lives_signal_connect (LIVES_GUI_OBJECT (menuitem), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (select_to_end_time),
-		    (gpointer)mt);
+  lives_signal_connect(LIVES_GUI_OBJECT(menuitem), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(select_to_end_time),
+                       (livespointer)mt);
 
-  menuitem = lives_menu_item_new_with_mnemonic (_("_Copy..."));
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), menuitem);
+  menuitem = lives_menu_item_new_with_mnemonic(_("_Copy..."));
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), menuitem);
 
-  selcopy_menu = lives_menu_new ();
-  lives_menu_item_set_submenu (LIVES_MENU_ITEM (menuitem), selcopy_menu);
+  selcopy_menu = lives_menu_new();
+  lives_menu_item_set_submenu(LIVES_MENU_ITEM(menuitem), selcopy_menu);
 
   if (palette->style&STYLE_1) {
     lives_widget_set_bg_color(selcopy_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
     lives_widget_set_fg_color(selcopy_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars_fore);
   }
 
-  mt->tc_to_rs = lives_menu_item_new_with_mnemonic (_("_Timecode to region start"));
-  lives_container_add (LIVES_CONTAINER (selcopy_menu), mt->tc_to_rs);
+  mt->tc_to_rs = lives_menu_item_new_with_mnemonic(_("_Timecode to region start"));
+  lives_container_add(LIVES_CONTAINER(selcopy_menu), mt->tc_to_rs);
 
-  lives_signal_connect (LIVES_GUI_OBJECT (mt->tc_to_rs), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (tc_to_rs),
-		    (gpointer)mt);
+  lives_signal_connect(LIVES_GUI_OBJECT(mt->tc_to_rs), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(tc_to_rs),
+                       (livespointer)mt);
 
-  mt->tc_to_re = lives_menu_item_new_with_mnemonic (_("_Timecode to region end"));
-  lives_container_add (LIVES_CONTAINER (selcopy_menu), mt->tc_to_re);
+  mt->tc_to_re = lives_menu_item_new_with_mnemonic(_("_Timecode to region end"));
+  lives_container_add(LIVES_CONTAINER(selcopy_menu), mt->tc_to_re);
 
-  lives_signal_connect (LIVES_GUI_OBJECT (mt->tc_to_re), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (tc_to_re),
-		    (gpointer)mt);
+  lives_signal_connect(LIVES_GUI_OBJECT(mt->tc_to_re), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(tc_to_re),
+                       (livespointer)mt);
 
-  mt->rs_to_tc = lives_menu_item_new_with_mnemonic (_("_Region start to timecode"));
-  lives_container_add (LIVES_CONTAINER (selcopy_menu), mt->rs_to_tc);
+  mt->rs_to_tc = lives_menu_item_new_with_mnemonic(_("_Region start to timecode"));
+  lives_container_add(LIVES_CONTAINER(selcopy_menu), mt->rs_to_tc);
 
-  lives_signal_connect (LIVES_GUI_OBJECT (mt->rs_to_tc), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (rs_to_tc),
-		    (gpointer)mt);
+  lives_signal_connect(LIVES_GUI_OBJECT(mt->rs_to_tc), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(rs_to_tc),
+                       (livespointer)mt);
 
-  mt->re_to_tc = lives_menu_item_new_with_mnemonic (_("_Region end to timecode"));
-  lives_container_add (LIVES_CONTAINER (selcopy_menu), mt->re_to_tc);
+  mt->re_to_tc = lives_menu_item_new_with_mnemonic(_("_Region end to timecode"));
+  lives_container_add(LIVES_CONTAINER(selcopy_menu), mt->re_to_tc);
 
-  lives_signal_connect (LIVES_GUI_OBJECT (mt->re_to_tc), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (re_to_tc),
-		    (gpointer)mt);
+  lives_signal_connect(LIVES_GUI_OBJECT(mt->re_to_tc), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(re_to_tc),
+                       (livespointer)mt);
 
   lives_widget_set_sensitive(mt->rs_to_tc,FALSE);
   lives_widget_set_sensitive(mt->re_to_tc,FALSE);
 
-  separator = lives_menu_item_new ();
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), separator);
-  lives_widget_set_sensitive (separator, FALSE);
-
-  mt->seldesel_menuitem = lives_menu_item_new_with_mnemonic (_("Select/deselect block at current track/time"));
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mt->seldesel_menuitem);
-
-  lives_signal_connect (LIVES_GUI_OBJECT (mt->seldesel_menuitem), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (mt_selblock),
-		    (gpointer)mt);
-
-  lives_widget_add_accelerator (mt->seldesel_menuitem, LIVES_WIDGET_ACTIVATE_EVENT, mt->accel_group,
-                              LIVES_KEY_Return, LIVES_CONTROL_MASK,
-                              LIVES_ACCEL_VISIBLE);
+  separator = lives_menu_item_new();
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), separator);
+  lives_widget_set_sensitive(separator, FALSE);
+
+  mt->seldesel_menuitem = lives_menu_item_new_with_mnemonic(_("Select/deselect block at current track/time"));
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mt->seldesel_menuitem);
+
+  lives_signal_connect(LIVES_GUI_OBJECT(mt->seldesel_menuitem), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(mt_selblock),
+                       (livespointer)mt);
+
+  lives_widget_add_accelerator(mt->seldesel_menuitem, LIVES_WIDGET_ACTIVATE_SIGNAL, mt->accel_group,
+                               LIVES_KEY_Return, LIVES_CONTROL_MASK,
+                               LIVES_ACCEL_VISIBLE);
 
   // Tools
 
-  menuitem = lives_menu_item_new_with_mnemonic (_ ("_Tools"));
-  lives_container_add (LIVES_CONTAINER (menubar), menuitem);
-  
-  menuitem_menu = lives_menu_new ();
-  lives_menu_item_set_submenu (LIVES_MENU_ITEM (menuitem), menuitem_menu);
+  menuitem = lives_menu_item_new_with_mnemonic(_("_Tools"));
+  lives_container_add(LIVES_CONTAINER(mt->menubar), menuitem);
+
+  menuitem_menu = lives_menu_new();
+  lives_menu_item_set_submenu(LIVES_MENU_ITEM(menuitem), menuitem_menu);
 
   if (palette->style&STYLE_1) {
     lives_widget_set_bg_color(menuitem_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
@@ -7132,114 +7308,114 @@
   }
 
 
-  mt->change_vals = lives_image_menu_item_new_with_mnemonic (_("_Change width, height and audio values..."));
-  lives_widget_show (mt->change_vals);
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mt->change_vals);
+  mt->change_vals = lives_image_menu_item_new_with_mnemonic(_("_Change width, height and audio values..."));
+  lives_widget_show(mt->change_vals);
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mt->change_vals);
 
-  lives_signal_connect (LIVES_GUI_OBJECT (mt->change_vals), LIVES_WIDGET_ACTIVATE_EVENT,
-                      LIVES_GUI_CALLBACK (mt_change_vals_activate),
-                      (gpointer)mt);
+  lives_signal_connect(LIVES_GUI_OBJECT(mt->change_vals), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(mt_change_vals_activate),
+                       (livespointer)mt);
 
 
-  separator = lives_menu_item_new ();
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), separator);
-  lives_widget_set_sensitive (separator, FALSE);
+  separator = lives_menu_item_new();
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), separator);
+  lives_widget_set_sensitive(separator, FALSE);
 
 
-  mt->gens_submenu = lives_menu_item_new_with_mnemonic (_("_Generate"));
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mt->gens_submenu);
+  mt->gens_submenu = lives_menu_item_new_with_mnemonic(_("_Generate"));
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mt->gens_submenu);
 
   lives_object_ref(mainw->gens_menu);
   lives_menu_detach(LIVES_MENU(mainw->gens_menu));
 
-  lives_menu_item_set_submenu (LIVES_MENU_ITEM (mt->gens_submenu), mainw->gens_menu);
+  lives_menu_item_set_submenu(LIVES_MENU_ITEM(mt->gens_submenu), mainw->gens_menu);
 
 
-  mt->capture = lives_menu_item_new_with_mnemonic (_("Capture _External Window... "));
-  lives_widget_show (mt->capture);
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mt->capture);
+  mt->capture = lives_menu_item_new_with_mnemonic(_("Capture _External Window... "));
+  lives_widget_show(mt->capture);
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mt->capture);
 
 
-  lives_signal_connect (LIVES_GUI_OBJECT (mt->capture), LIVES_WIDGET_ACTIVATE_EVENT,
-                      LIVES_GUI_CALLBACK (on_capture_activate),
-                      NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(mt->capture), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_capture_activate),
+                       NULL);
 
 
-  separator = lives_menu_item_new ();
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), separator);
-  lives_widget_set_sensitive (separator, FALSE);
+  separator = lives_menu_item_new();
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), separator);
+  lives_widget_set_sensitive(separator, FALSE);
 
 
-  menuitem = lives_image_menu_item_new_with_mnemonic (_("_Preferences..."));
-  lives_widget_show (menuitem);
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), menuitem);
-  lives_widget_add_accelerator (menuitem, LIVES_WIDGET_ACTIVATE_EVENT, mt->accel_group,
-                              LIVES_KEY_p, LIVES_CONTROL_MASK,
-                              LIVES_ACCEL_VISIBLE);
+  menuitem = lives_image_menu_item_new_with_mnemonic(_("_Preferences..."));
+  lives_widget_show(menuitem);
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), menuitem);
+  lives_widget_add_accelerator(menuitem, LIVES_WIDGET_ACTIVATE_SIGNAL, mt->accel_group,
+                               LIVES_KEY_p, LIVES_CONTROL_MASK,
+                               LIVES_ACCEL_VISIBLE);
 
 #if LIVES_HAS_IMAGE_MENU_ITEM
-  image = lives_image_new_from_stock (LIVES_STOCK_PREFERENCES, LIVES_ICON_SIZE_MENU);
-  lives_widget_show (image);
-  lives_image_menu_item_set_image (LIVES_IMAGE_MENU_ITEM (menuitem), image);
+  image = lives_image_new_from_stock(LIVES_STOCK_PREFERENCES, LIVES_ICON_SIZE_MENU);
+  lives_widget_show(image);
+  lives_image_menu_item_set_image(LIVES_IMAGE_MENU_ITEM(menuitem), image);
 #endif
 
-  lives_signal_connect (LIVES_GUI_OBJECT (menuitem), LIVES_WIDGET_ACTIVATE_EVENT,
-                      LIVES_GUI_CALLBACK (on_preferences_activate),
-                      NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(menuitem), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_preferences_activate),
+                       NULL);
 
 
 
   // Render
 
-  menuitem = lives_menu_item_new_with_mnemonic (_ ("_Render"));
-  lives_container_add (LIVES_CONTAINER (menubar), menuitem);
-  
-  menuitem_menu = lives_menu_new ();
-  lives_menu_item_set_submenu (LIVES_MENU_ITEM (menuitem), menuitem_menu);
+  menuitem = lives_menu_item_new_with_mnemonic(_("_Render"));
+  lives_container_add(LIVES_CONTAINER(mt->menubar), menuitem);
+
+  menuitem_menu = lives_menu_new();
+  lives_menu_item_set_submenu(LIVES_MENU_ITEM(menuitem), menuitem_menu);
 
   if (palette->style&STYLE_1) {
     lives_widget_set_bg_color(menuitem_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
     lives_widget_set_fg_color(menuitem_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars_fore);
   }
 
-  mt->render = lives_image_menu_item_new_with_mnemonic (_("_Render all to new clip"));
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mt->render);
-  lives_widget_set_sensitive (mt->render, FALSE);
-
-  lives_widget_add_accelerator (mt->render, LIVES_WIDGET_ACTIVATE_EVENT, mt->accel_group,
-                              LIVES_KEY_r, LIVES_CONTROL_MASK,
-                              LIVES_ACCEL_VISIBLE);
+  mt->render = lives_image_menu_item_new_with_mnemonic(_("_Render all to new clip"));
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mt->render);
+  lives_widget_set_sensitive(mt->render, FALSE);
+
+  lives_widget_add_accelerator(mt->render, LIVES_WIDGET_ACTIVATE_SIGNAL, mt->accel_group,
+                               LIVES_KEY_r, LIVES_CONTROL_MASK,
+                               LIVES_ACCEL_VISIBLE);
 
   // TODO - render selected time
 
 
-  mt->render_sep = lives_menu_item_new ();
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mt->render_sep);
-  lives_widget_set_sensitive (mt->render_sep, FALSE);
+  mt->render_sep = lives_menu_item_new();
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mt->render_sep);
+  lives_widget_set_sensitive(mt->render_sep, FALSE);
 
-  mt->render_vid = lives_check_menu_item_new_with_mnemonic (_("Render _video"));
+  mt->render_vid = lives_check_menu_item_new_with_mnemonic(_("Render _video"));
   lives_check_menu_item_set_active(LIVES_CHECK_MENU_ITEM(mt->render_vid), TRUE);
 
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mt->render_vid);
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mt->render_vid);
 
-  mt->render_aud = lives_check_menu_item_new_with_mnemonic (_("Render _audio"));
-  lives_check_menu_item_set_active(LIVES_CHECK_MENU_ITEM(mt->render_aud), mt->render_audp);
+  mt->render_aud = lives_check_menu_item_new_with_mnemonic(_("Render _audio"));
+  lives_check_menu_item_set_active(LIVES_CHECK_MENU_ITEM(mt->render_aud), mt->opts.render_audp);
 
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mt->render_aud);
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mt->render_aud);
 
-  sep = lives_menu_item_new ();
+  sep = lives_menu_item_new();
 
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), sep);
-  lives_widget_set_sensitive (sep, FALSE);
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), sep);
+  lives_widget_set_sensitive(sep, FALSE);
 
-  mt->normalise_aud = lives_check_menu_item_new_with_mnemonic (_("_Normalise rendered audio"));
-  lives_check_menu_item_set_active(LIVES_CHECK_MENU_ITEM(mt->normalise_aud), mt->normalise_audp);
+  mt->normalise_aud = lives_check_menu_item_new_with_mnemonic(_("_Normalise rendered audio"));
+  lives_check_menu_item_set_active(LIVES_CHECK_MENU_ITEM(mt->normalise_aud), mt->opts.normalise_audp);
 
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mt->normalise_aud);
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mt->normalise_aud);
 
 
 
-  mt->prerender_aud = lives_menu_item_new_with_mnemonic (_("_Pre-render audio"));
+  mt->prerender_aud = lives_menu_item_new_with_mnemonic(_("_Pre-render audio"));
   lives_widget_set_sensitive(mt->prerender_aud, FALSE);
 
   //lives_container_add (LIVES_CONTAINER (menuitem_menu), mt->prerender_aud);
@@ -7248,11 +7424,11 @@
 
   // View
 
-  menuitem = lives_menu_item_new_with_mnemonic (_ ("_View"));
-  lives_container_add (LIVES_CONTAINER (menubar), menuitem);
-  
-  menuitem_menu = lives_menu_new ();
-  lives_menu_item_set_submenu (LIVES_MENU_ITEM (menuitem), menuitem_menu);
+  menuitem = lives_menu_item_new_with_mnemonic(_("_View"));
+  lives_container_add(LIVES_CONTAINER(mt->menubar), menuitem);
+
+  menuitem_menu = lives_menu_new();
+  lives_menu_item_set_submenu(LIVES_MENU_ITEM(menuitem), menuitem_menu);
 
   if (palette->style&STYLE_1) {
     lives_widget_set_bg_color(menuitem_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
@@ -7260,454 +7436,454 @@
   }
 
 
-  mt->view_clips = lives_menu_item_new_with_mnemonic (_("_Clips"));
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mt->view_clips);
-
-  lives_widget_add_accelerator (mt->view_clips, LIVES_WIDGET_ACTIVATE_EVENT, mt->accel_group,
-                              LIVES_KEY_c, (LiVESXModifierType)0,
-                              LIVES_ACCEL_VISIBLE);
-
-  mt->view_in_out = lives_menu_item_new_with_mnemonic (_("Block _In/out points"));
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mt->view_in_out);
+  mt->view_clips = lives_menu_item_new_with_mnemonic(_("_Clips"));
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mt->view_clips);
 
-  lives_widget_add_accelerator (mt->view_in_out, LIVES_WIDGET_ACTIVATE_EVENT, mt->accel_group,
-                              LIVES_KEY_n, (LiVESXModifierType)0,
-                              LIVES_ACCEL_VISIBLE);
+  lives_widget_add_accelerator(mt->view_clips, LIVES_WIDGET_ACTIVATE_SIGNAL, mt->accel_group,
+                               LIVES_KEY_c, (LiVESXModifierType)0,
+                               LIVES_ACCEL_VISIBLE);
+
+  mt->view_in_out = lives_menu_item_new_with_mnemonic(_("Block _In/out points"));
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mt->view_in_out);
+
+  lives_widget_add_accelerator(mt->view_in_out, LIVES_WIDGET_ACTIVATE_SIGNAL, mt->accel_group,
+                               LIVES_KEY_n, (LiVESXModifierType)0,
+                               LIVES_ACCEL_VISIBLE);
 
   lives_widget_set_sensitive(mt->view_in_out,FALSE);
 
-  mt->view_effects = lives_menu_item_new_with_mnemonic (_("_Effects at current"));
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mt->view_effects);
-
-  lives_widget_add_accelerator (mt->view_effects, LIVES_WIDGET_ACTIVATE_EVENT, mt->accel_group,
-                              LIVES_KEY_e, (LiVESXModifierType)0,
-                              LIVES_ACCEL_VISIBLE);
-
-  show_messages = lives_image_menu_item_new_with_mnemonic (_("Show _Messages"));
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), show_messages);
+  mt->view_effects = lives_menu_item_new_with_mnemonic(_("_Effects at current"));
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mt->view_effects);
 
-  separator = lives_menu_item_new ();
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), separator);
-  lives_widget_set_sensitive (separator, FALSE);
-
-  mt->aparam_separator = lives_menu_item_new ();
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mt->aparam_separator);
-  lives_widget_set_sensitive (mt->aparam_separator, FALSE);
+  lives_widget_add_accelerator(mt->view_effects, LIVES_WIDGET_ACTIVATE_SIGNAL, mt->accel_group,
+                               LIVES_KEY_e, (LiVESXModifierType)0,
+                               LIVES_ACCEL_VISIBLE);
+
+  show_messages = lives_image_menu_item_new_with_mnemonic(_("Show _Messages"));
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), show_messages);
+
+  separator = lives_menu_item_new();
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), separator);
+  lives_widget_set_sensitive(separator, FALSE);
+
+  mt->aparam_separator = lives_menu_item_new();
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mt->aparam_separator);
+  lives_widget_set_sensitive(mt->aparam_separator, FALSE);
 
-  mt->aparam_menuitem = lives_menu_item_new_with_mnemonic (_("Audio parameters"));
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mt->aparam_menuitem);
+  mt->aparam_menuitem = lives_menu_item_new_with_mnemonic(_("Audio parameters"));
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mt->aparam_menuitem);
 
   mt->aparam_submenu=lives_menu_new();
-  lives_menu_item_set_submenu (LIVES_MENU_ITEM (mt->aparam_menuitem), mt->aparam_submenu);
+  lives_menu_item_set_submenu(LIVES_MENU_ITEM(mt->aparam_menuitem), mt->aparam_submenu);
 
   if (palette->style&STYLE_1) {
     lives_widget_set_bg_color(mt->aparam_submenu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
     lives_widget_set_fg_color(mt->aparam_submenu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars_fore);
   }
 
-  mt->view_audio = lives_check_menu_item_new_with_mnemonic (_("Show backing _audio track"));
+  mt->view_audio = lives_check_menu_item_new_with_mnemonic(_("Show backing _audio track"));
   lives_check_menu_item_set_active(LIVES_CHECK_MENU_ITEM(mt->view_audio), mt->opts.show_audio);
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mt->view_audio);
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mt->view_audio);
 
-  view_ctx = lives_check_menu_item_new_with_mnemonic (_("Compact view"));
+  view_ctx = lives_check_menu_item_new_with_mnemonic(_("Compact view"));
   lives_check_menu_item_set_active(LIVES_CHECK_MENU_ITEM(view_ctx), mt->opts.show_ctx);
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), view_ctx);
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), view_ctx);
 
-  lives_widget_add_accelerator (view_ctx, LIVES_WIDGET_ACTIVATE_EVENT, mt->accel_group,
-                              LIVES_KEY_d, (LiVESXModifierType)0,
-                              LIVES_ACCEL_VISIBLE);
+  lives_widget_add_accelerator(view_ctx, LIVES_WIDGET_ACTIVATE_SIGNAL, mt->accel_group,
+                               LIVES_KEY_d, (LiVESXModifierType)0,
+                               LIVES_ACCEL_VISIBLE);
 
-  mt->change_max_disp = lives_menu_item_new_with_mnemonic (_("Maximum tracks to display..."));
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mt->change_max_disp);
+  mt->change_max_disp = lives_menu_item_new_with_mnemonic(_("Maximum tracks to display..."));
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mt->change_max_disp);
 
-  separator = lives_menu_item_new ();
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), separator);
-  lives_widget_set_sensitive (separator, FALSE);
+  separator = lives_menu_item_new();
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), separator);
+  lives_widget_set_sensitive(separator, FALSE);
 
-  mt->follow_play = lives_check_menu_item_new_with_mnemonic (_("Scroll to follow playback"));
+  mt->follow_play = lives_check_menu_item_new_with_mnemonic(_("Scroll to follow playback"));
   lives_check_menu_item_set_active(LIVES_CHECK_MENU_ITEM(mt->follow_play), mt->opts.follow_playback);
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mt->follow_play);
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mt->follow_play);
 
-  ccursor = lives_menu_item_new_with_mnemonic (_("_Center on cursor"));
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), ccursor);
+  ccursor = lives_menu_item_new_with_mnemonic(_("_Center on cursor"));
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), ccursor);
 
-  lives_widget_add_accelerator (ccursor, LIVES_WIDGET_ACTIVATE_EVENT, mt->accel_group,
-                              LIVES_KEY_c, (LiVESXModifierType)LIVES_CONTROL_MASK,
-                              LIVES_ACCEL_VISIBLE);
+  lives_widget_add_accelerator(ccursor, LIVES_WIDGET_ACTIVATE_SIGNAL, mt->accel_group,
+                               LIVES_KEY_c, (LiVESXModifierType)LIVES_CONTROL_MASK,
+                               LIVES_ACCEL_VISIBLE);
 
-  zoom_in = lives_menu_item_new_with_mnemonic (_("_Zoom in"));
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), zoom_in);
+  zoom_in = lives_menu_item_new_with_mnemonic(_("_Zoom in"));
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), zoom_in);
 
-  lives_widget_add_accelerator (zoom_in, LIVES_WIDGET_ACTIVATE_EVENT, mt->accel_group,
-                              LIVES_KEY_Plus, (LiVESXModifierType)LIVES_CONTROL_MASK,
-                              LIVES_ACCEL_VISIBLE);
+  lives_widget_add_accelerator(zoom_in, LIVES_WIDGET_ACTIVATE_SIGNAL, mt->accel_group,
+                               LIVES_KEY_Plus, (LiVESXModifierType)LIVES_CONTROL_MASK,
+                               LIVES_ACCEL_VISIBLE);
 
-  lives_widget_add_accelerator (zoom_in, LIVES_WIDGET_ACTIVATE_EVENT, mt->accel_group,
-                              LIVES_KEY_Equal, (LiVESXModifierType)LIVES_CONTROL_MASK,
-                              (LiVESAccelFlags)0);
+  lives_widget_add_accelerator(zoom_in, LIVES_WIDGET_ACTIVATE_SIGNAL, mt->accel_group,
+                               LIVES_KEY_Equal, (LiVESXModifierType)LIVES_CONTROL_MASK,
+                               (LiVESAccelFlags)0);
 
-  zoom_out = lives_menu_item_new_with_mnemonic (_("_Zoom out"));
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), zoom_out);
+  zoom_out = lives_menu_item_new_with_mnemonic(_("_Zoom out"));
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), zoom_out);
 
-  lives_widget_add_accelerator (zoom_out, LIVES_WIDGET_ACTIVATE_EVENT, mt->accel_group,
-                              LIVES_KEY_Minus, (LiVESXModifierType)LIVES_CONTROL_MASK,
-                              LIVES_ACCEL_VISIBLE);
+  lives_widget_add_accelerator(zoom_out, LIVES_WIDGET_ACTIVATE_SIGNAL, mt->accel_group,
+                               LIVES_KEY_Minus, (LiVESXModifierType)LIVES_CONTROL_MASK,
+                               LIVES_ACCEL_VISIBLE);
 
 
-  separator = lives_menu_item_new ();
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), separator);
-  lives_widget_set_sensitive (separator, FALSE);
+  separator = lives_menu_item_new();
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), separator);
+  lives_widget_set_sensitive(separator, FALSE);
 
-  view_mt_details = lives_menu_item_new_with_mnemonic (_("Multitrack _details"));
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), view_mt_details);
+  view_mt_details = lives_menu_item_new_with_mnemonic(_("Multitrack _details"));
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), view_mt_details);
 
 
-  mt->show_layout_errors = lives_image_menu_item_new_with_mnemonic (_("Show _Layout Errors"));
-  lives_widget_show (mt->show_layout_errors);
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mt->show_layout_errors);
-  lives_widget_set_sensitive (mt->show_layout_errors, mainw->affected_layouts_map!=NULL);
+  mt->show_layout_errors = lives_image_menu_item_new_with_mnemonic(_("Show _Layout Errors"));
+  lives_widget_show(mt->show_layout_errors);
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mt->show_layout_errors);
+  lives_widget_set_sensitive(mt->show_layout_errors, mainw->affected_layouts_map!=NULL);
 
-  separator = lives_menu_item_new ();
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), separator);
-  lives_widget_set_sensitive (separator, FALSE);
+  separator = lives_menu_item_new();
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), separator);
+  lives_widget_set_sensitive(separator, FALSE);
 
-  mt->view_events = lives_image_menu_item_new_with_mnemonic (_("_Event Window"));
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mt->view_events);
-  lives_widget_set_sensitive (mt->view_events, FALSE);
+  mt->view_events = lives_image_menu_item_new_with_mnemonic(_("_Event Window"));
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mt->view_events);
+  lives_widget_set_sensitive(mt->view_events, FALSE);
 
-  mt->view_sel_events = lives_image_menu_item_new_with_mnemonic (_("_Event Window (selected time only)"));
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mt->view_sel_events);
-  lives_widget_set_sensitive (mt->view_sel_events, FALSE);
+  mt->view_sel_events = lives_image_menu_item_new_with_mnemonic(_("_Event Window (selected time only)"));
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mt->view_sel_events);
+  lives_widget_set_sensitive(mt->view_sel_events, FALSE);
 
-  show_frame_events = lives_check_menu_item_new_with_mnemonic (_("_Show FRAME events"));
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), show_frame_events);
+  show_frame_events = lives_check_menu_item_new_with_mnemonic(_("_Show FRAME events"));
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), show_frame_events);
   lives_check_menu_item_set_active(LIVES_CHECK_MENU_ITEM(show_frame_events),prefs->event_window_show_frame_events);
 
   // help
-  menuitem = lives_menu_item_new_with_mnemonic (_("_Help"));
-  lives_widget_show (menuitem);
-  lives_container_add (LIVES_CONTAINER (menubar), menuitem);
+  menuitem = lives_menu_item_new_with_mnemonic(_("_Help"));
+  lives_widget_show(menuitem);
+  lives_container_add(LIVES_CONTAINER(mt->menubar), menuitem);
 
-  menuitem_menu = lives_menu_new ();
-  lives_menu_item_set_submenu (LIVES_MENU_ITEM (menuitem), menuitem_menu);
+  menuitem_menu = lives_menu_new();
+  lives_menu_item_set_submenu(LIVES_MENU_ITEM(menuitem), menuitem_menu);
 
   if (palette->style&STYLE_1) {
     lives_widget_set_bg_color(menuitem_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
     lives_widget_set_fg_color(menuitem_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars_fore);
   }
 
-  show_mt_keys = lives_menu_item_new_with_mnemonic (_("_Show multitrack keys"));
-  lives_widget_show (show_mt_keys);
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), show_mt_keys);
-
-  separator = lives_menu_item_new ();
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), separator);
-  lives_widget_set_sensitive (separator, FALSE);
-
-  show_manual = lives_menu_item_new_with_mnemonic (_("_Manual (opens in browser)"));
-  lives_widget_show (show_manual);
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), show_manual);
-
-  separator = lives_menu_item_new ();
-  lives_widget_show (separator);
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), separator);
-  lives_widget_set_sensitive (separator, FALSE);
-
-  donate = lives_menu_item_new_with_mnemonic (_("_Donate to the project !"));
-  lives_widget_show (donate);
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), donate);
-
-  email_author = lives_menu_item_new_with_mnemonic (_("_Email the author"));
-  lives_widget_show (email_author);
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), email_author);
-
-  report_bug = lives_menu_item_new_with_mnemonic (_("Report a _bug"));
-  lives_widget_show (report_bug);
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), report_bug);
-
-  suggest_feature = lives_menu_item_new_with_mnemonic (_("Suggest a _feature"));
-  lives_widget_show (suggest_feature);
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), suggest_feature);
-
-  help_translate = lives_menu_item_new_with_mnemonic (_("Assist with _translating"));
-  lives_widget_show (help_translate);
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), help_translate);
+  show_mt_keys = lives_menu_item_new_with_mnemonic(_("_Show multitrack keys"));
+  lives_widget_show(show_mt_keys);
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), show_mt_keys);
+
+  separator = lives_menu_item_new();
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), separator);
+  lives_widget_set_sensitive(separator, FALSE);
+
+  show_manual = lives_menu_item_new_with_mnemonic(_("_Manual (opens in browser)"));
+  lives_widget_show(show_manual);
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), show_manual);
+
+  separator = lives_menu_item_new();
+  lives_widget_show(separator);
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), separator);
+  lives_widget_set_sensitive(separator, FALSE);
+
+  donate = lives_menu_item_new_with_mnemonic(_("_Donate to the project !"));
+  lives_widget_show(donate);
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), donate);
+
+  email_author = lives_menu_item_new_with_mnemonic(_("_Email the author"));
+  lives_widget_show(email_author);
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), email_author);
+
+  report_bug = lives_menu_item_new_with_mnemonic(_("Report a _bug"));
+  lives_widget_show(report_bug);
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), report_bug);
+
+  suggest_feature = lives_menu_item_new_with_mnemonic(_("Suggest a _feature"));
+  lives_widget_show(suggest_feature);
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), suggest_feature);
+
+  help_translate = lives_menu_item_new_with_mnemonic(_("Assist with _translating"));
+  lives_widget_show(help_translate);
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), help_translate);
 
   separator = lives_menu_add_separator(LIVES_MENU(menuitem_menu));
-  lives_widget_show (separator);
+  lives_widget_show(separator);
 
-  mt->troubleshoot=lives_menu_item_new_with_mnemonic (_("_Troubleshoot"));
-  lives_widget_show (mt->troubleshoot);
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), mt->troubleshoot);
-
-  about = lives_menu_item_new_with_mnemonic (_("_About"));
-  lives_widget_show (about);
-  lives_container_add (LIVES_CONTAINER (menuitem_menu), about);
+  mt->troubleshoot=lives_menu_item_new_with_mnemonic(_("_Troubleshoot"));
+  lives_widget_show(mt->troubleshoot);
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), mt->troubleshoot);
+
+  about = lives_menu_item_new_with_mnemonic(_("_About"));
+  lives_widget_show(about);
+  lives_container_add(LIVES_CONTAINER(menuitem_menu), about);
 
   // gtk dont like menu_item_separator in horizontal menus
   menuitemsep = lives_menu_item_new_with_label("|");
   lives_widget_set_sensitive(menuitemsep,FALSE);
-  lives_container_add (LIVES_CONTAINER(menubar), menuitemsep);
+  lives_container_add(LIVES_CONTAINER(mt->menubar), menuitemsep);
 
   if (palette->style&STYLE_1) {
     lives_widget_set_bg_color(menuitemsep, LIVES_WIDGET_STATE_INSENSITIVE, &palette->menu_and_bars);
     lives_widget_set_fg_color(menuitemsep, LIVES_WIDGET_STATE_INSENSITIVE, &palette->menu_and_bars_fore);
   }
 
-  mt->mm_menuitem = lives_menu_item_new_with_label ("");
+  mt->mm_menuitem = lives_menu_item_new_with_label("");
 
-  lives_container_add (LIVES_CONTAINER(menubar), mt->mm_menuitem);
+  lives_container_add(LIVES_CONTAINER(mt->menubar), mt->mm_menuitem);
 
-  submenu = lives_menu_new ();
+  submenu = lives_menu_new();
   if (palette->style&STYLE_1) {
     lives_widget_set_bg_color(submenu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
     lives_widget_set_fg_color(submenu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars_fore);
   }
-  lives_menu_item_set_submenu (LIVES_MENU_ITEM (mt->mm_menuitem), submenu);
+  lives_menu_item_set_submenu(LIVES_MENU_ITEM(mt->mm_menuitem), submenu);
 
-  mt->mm_move = lives_check_menu_item_new_with_mnemonic (_("Mouse mode: _Move"));
-  lives_container_add (LIVES_CONTAINER(submenu), mt->mm_move);
+  mt->mm_move = lives_check_menu_item_new_with_mnemonic(_("Mouse mode: _Move"));
+  lives_container_add(LIVES_CONTAINER(submenu), mt->mm_move);
   lives_check_menu_item_set_active(LIVES_CHECK_MENU_ITEM(mt->mm_move),mt->opts.mouse_mode==MOUSE_MODE_MOVE);
 
-  mt->mm_move_func=lives_signal_connect (LIVES_GUI_OBJECT (mt->mm_move), LIVES_WIDGET_TOGGLED_EVENT,
-				     LIVES_GUI_CALLBACK (on_mouse_mode_changed),
-				     (gpointer)mt);
+  mt->mm_move_func=lives_signal_connect(LIVES_GUI_OBJECT(mt->mm_move), LIVES_WIDGET_TOGGLED_SIGNAL,
+                                        LIVES_GUI_CALLBACK(on_mouse_mode_changed),
+                                        (livespointer)mt);
 
-  mt->mm_select = lives_check_menu_item_new_with_mnemonic (_("Mouse mode: _Select"));
-  lives_container_add (LIVES_CONTAINER(submenu), mt->mm_select);
+  mt->mm_select = lives_check_menu_item_new_with_mnemonic(_("Mouse mode: _Select"));
+  lives_container_add(LIVES_CONTAINER(submenu), mt->mm_select);
   lives_check_menu_item_set_active(LIVES_CHECK_MENU_ITEM(mt->mm_select),mt->opts.mouse_mode==MOUSE_MODE_SELECT);
 
-  mt->mm_select_func=lives_signal_connect (LIVES_GUI_OBJECT (mt->mm_select), LIVES_WIDGET_TOGGLED_EVENT,
-				       LIVES_GUI_CALLBACK (on_mouse_mode_changed),
-				       (gpointer)mt);
+  mt->mm_select_func=lives_signal_connect(LIVES_GUI_OBJECT(mt->mm_select), LIVES_WIDGET_TOGGLED_SIGNAL,
+                                          LIVES_GUI_CALLBACK(on_mouse_mode_changed),
+                                          (livespointer)mt);
 
 
   menuitemsep = lives_menu_item_new_with_label("|");
   lives_widget_set_sensitive(menuitemsep,FALSE);
-  lives_container_add (LIVES_CONTAINER(menubar), menuitemsep);
+  lives_container_add(LIVES_CONTAINER(mt->menubar), menuitemsep);
 
   if (palette->style&STYLE_1) {
     lives_widget_set_bg_color(menuitemsep, LIVES_WIDGET_STATE_INSENSITIVE, &palette->menu_and_bars);
     lives_widget_set_fg_color(menuitemsep, LIVES_WIDGET_STATE_INSENSITIVE, &palette->menu_and_bars_fore);
   }
 
-  mt->ins_menuitem = lives_menu_item_new_with_label ("");
+  mt->ins_menuitem = lives_menu_item_new_with_label("");
 
-  lives_container_add (LIVES_CONTAINER(menubar), mt->ins_menuitem);
+  lives_container_add(LIVES_CONTAINER(mt->menubar), mt->ins_menuitem);
 
-  submenu = lives_menu_new ();
+  submenu = lives_menu_new();
   if (palette->style&STYLE_1) {
     lives_widget_set_bg_color(submenu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
     lives_widget_set_fg_color(submenu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars_fore);
   }
-  lives_menu_item_set_submenu (LIVES_MENU_ITEM (mt->ins_menuitem), submenu);
+  lives_menu_item_set_submenu(LIVES_MENU_ITEM(mt->ins_menuitem), submenu);
 
-  mt->ins_normal = lives_check_menu_item_new_with_mnemonic (_("Insert mode: _Normal"));
-  lives_container_add (LIVES_CONTAINER(submenu), mt->ins_normal);
+  mt->ins_normal = lives_check_menu_item_new_with_mnemonic(_("Insert mode: _Normal"));
+  lives_container_add(LIVES_CONTAINER(submenu), mt->ins_normal);
 
   lives_check_menu_item_set_active(LIVES_CHECK_MENU_ITEM(mt->ins_normal),mt->opts.insert_mode==INSERT_MODE_NORMAL);
 
-  mt->ins_normal_func=lives_signal_connect (LIVES_GUI_OBJECT (mt->ins_normal), LIVES_WIDGET_TOGGLED_EVENT,
-				      LIVES_GUI_CALLBACK (on_insert_mode_changed),
-				      (gpointer)mt);
-
-
-
-  lives_signal_connect (LIVES_GUI_OBJECT (mt->quit), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (mt_quit_activate),
-		    (gpointer)mt);
-  lives_signal_connect (LIVES_GUI_OBJECT (mt->load_vals), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (mt_load_vals_toggled),
-		    (gpointer)mt);
-  lives_signal_connect (LIVES_GUI_OBJECT (mt->ac_audio_check), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (mt_ac_audio_toggled),
-		    (gpointer)mt);
-  lives_signal_connect (LIVES_GUI_OBJECT (mt->aload_subs), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (on_boolean_toggled),
-		    &prefs->autoload_subs);
-  lives_signal_connect (LIVES_GUI_OBJECT (mt->clipedit), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (multitrack_end_cb),
-		    (gpointer)mt);
-  lives_signal_connect (LIVES_GUI_OBJECT (mt->playall), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (on_playall_activate),
-		    NULL);
-  lives_signal_connect (LIVES_GUI_OBJECT (mt->playsel), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (multitrack_play_sel),
-		    (gpointer)mt);
-  lives_signal_connect (LIVES_GUI_OBJECT (mt->insert), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (multitrack_insert),
-		    (gpointer)mt);
-  lives_signal_connect (LIVES_GUI_OBJECT (mt->audio_insert), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (multitrack_audio_insert),
-		    (gpointer)mt);
-  lives_signal_connect (LIVES_GUI_OBJECT (mt->adjust_start_end), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (multitrack_adj_start_end),
-		    (gpointer)mt);
-  lives_signal_connect (LIVES_GUI_OBJECT (mt->view_events), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (multitrack_view_events),
-		    (gpointer)mt);
-  lives_signal_connect (LIVES_GUI_OBJECT (mt->view_sel_events), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (multitrack_view_sel_events),
-		    (gpointer)mt);
-  lives_signal_connect (LIVES_GUI_OBJECT (mt->clear_marks), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (multitrack_clear_marks),
-		    (gpointer)mt);
-  lives_signal_connect (LIVES_GUI_OBJECT (view_mt_details), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (multitrack_view_details),
-		    (gpointer)mt);
-  lives_signal_connect (LIVES_GUI_OBJECT (mt->show_layout_errors), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (popup_lmap_errors),
-		    NULL);
-  lives_signal_connect (LIVES_GUI_OBJECT (mt->view_clips), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (multitrack_view_clips),
-		    (gpointer)mt);
-  lives_signal_connect (LIVES_GUI_OBJECT (mt->view_in_out), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (multitrack_view_in_out),
-		    (gpointer)mt);
-  lives_signal_connect (LIVES_GUI_OBJECT (show_messages), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (on_show_messages_activate),
-		    NULL);
-  lives_signal_connect (LIVES_GUI_OBJECT (mt->stop), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (on_stop_activate),
-		    NULL);
-  lives_signal_connect (LIVES_GUI_OBJECT (mt->rewind), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (on_rewind_activate),
-		    NULL);
-  mt->sepwin_func=lives_signal_connect (LIVES_GUI_OBJECT (mt->sepwin), LIVES_WIDGET_ACTIVATE_EVENT,
-				    LIVES_GUI_CALLBACK (on_sepwin_activate),
-				    NULL);
-  lives_signal_connect (LIVES_GUI_OBJECT (full_screen), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (on_full_screen_activate),
-		    NULL);
-  mt->loop_cont_func=lives_signal_connect (LIVES_GUI_OBJECT (mt->loop_continue), LIVES_WIDGET_ACTIVATE_EVENT,
-				       LIVES_GUI_CALLBACK (on_loop_cont_activate),
-				       NULL);
-  mt->mute_audio_func=lives_signal_connect (LIVES_GUI_OBJECT (mt->mute_audio), LIVES_WIDGET_ACTIVATE_EVENT,
-					LIVES_GUI_CALLBACK (on_mute_activate),
-					NULL);
-  lives_signal_connect (LIVES_GUI_OBJECT (mt->rename_track), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (on_rename_track_activate),
-		    (gpointer)mt);
-  lives_signal_connect (LIVES_GUI_OBJECT (mt->cback_audio), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (on_cback_audio_activate),
-		    (gpointer)mt);
-  lives_signal_connect (LIVES_GUI_OBJECT (mt->add_vid_behind), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (add_video_track_behind),
-		    (gpointer)mt);
-  lives_signal_connect (LIVES_GUI_OBJECT (mt->add_vid_front), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (add_video_track_front),
-		    (gpointer)mt);
-  lives_signal_connect (LIVES_GUI_OBJECT (mt->render), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (on_render_activate),
-		    (gpointer)mt);
-  lives_signal_connect (LIVES_GUI_OBJECT (mt->prerender_aud), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (on_prerender_aud_activate),
-		    (gpointer)mt);
-  lives_signal_connect (LIVES_GUI_OBJECT (mt->jumpback), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (on_jumpback_activate),
-		    (gpointer)mt);
-  lives_signal_connect (LIVES_GUI_OBJECT (mt->jumpnext), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (on_jumpnext_activate),
-		    (gpointer)mt);
-  lives_signal_connect (LIVES_GUI_OBJECT (mt->delblock), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (on_delblock_activate),
-		    (gpointer)mt);
-  lives_signal_connect (LIVES_GUI_OBJECT (mt->save_event_list), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (on_save_event_list_activate),
-		    (gpointer)mt);
-  lives_signal_connect (LIVES_GUI_OBJECT (mt->load_event_list), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (on_load_event_list_activate),
-		    (gpointer)mt);
-  lives_signal_connect (LIVES_GUI_OBJECT (mt->clear_event_list), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (on_clear_event_list_activate),
-		    (gpointer)mt);
-  lives_signal_connect (LIVES_GUI_OBJECT (mt->view_audio), LIVES_WIDGET_ACTIVATE_EVENT,
-                      LIVES_GUI_CALLBACK (mt_view_audio_toggled),
-                      (gpointer)mt);
-  lives_signal_connect (LIVES_GUI_OBJECT (view_ctx), LIVES_WIDGET_ACTIVATE_EVENT,
-                      LIVES_GUI_CALLBACK (mt_view_ctx_toggled),
-                      (gpointer)mt);
-  lives_signal_connect (LIVES_GUI_OBJECT (mt->change_max_disp), LIVES_WIDGET_ACTIVATE_EVENT,
-                      LIVES_GUI_CALLBACK (mt_change_max_disp_tracks),
-                      (gpointer)mt);
-  lives_signal_connect (LIVES_GUI_OBJECT (mt->render_vid), LIVES_WIDGET_ACTIVATE_EVENT,
-                      LIVES_GUI_CALLBACK (mt_render_vid_toggled),
-                      (gpointer)mt);
-  lives_signal_connect (LIVES_GUI_OBJECT (mt->render_aud), LIVES_WIDGET_ACTIVATE_EVENT,
-                      LIVES_GUI_CALLBACK (mt_render_aud_toggled),
-                      (gpointer)mt);
-  lives_signal_connect (LIVES_GUI_OBJECT (mt->normalise_aud), LIVES_WIDGET_ACTIVATE_EVENT,
-                      LIVES_GUI_CALLBACK (mt_norm_aud_toggled),
-                      (gpointer)mt);
-  lives_signal_connect (LIVES_GUI_OBJECT (ign_ins_sel), LIVES_WIDGET_ACTIVATE_EVENT,
-                      LIVES_GUI_CALLBACK (mt_ign_ins_sel_toggled),
-                      (gpointer)mt);
-  lives_signal_connect (LIVES_GUI_OBJECT (show_frame_events), LIVES_WIDGET_ACTIVATE_EVENT,
-                      LIVES_GUI_CALLBACK (show_frame_events_activate),
+  mt->ins_normal_func=lives_signal_connect(LIVES_GUI_OBJECT(mt->ins_normal), LIVES_WIDGET_TOGGLED_SIGNAL,
+                      LIVES_GUI_CALLBACK(on_insert_mode_changed),
+                      (livespointer)mt);
+
+
+
+  lives_signal_connect(LIVES_GUI_OBJECT(mt->quit), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(mt_quit_activate),
+                       (livespointer)mt);
+  lives_signal_connect(LIVES_GUI_OBJECT(mt->load_vals), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(mt_load_vals_toggled),
+                       (livespointer)mt);
+  lives_signal_connect(LIVES_GUI_OBJECT(mt->ac_audio_check), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(mt_ac_audio_toggled),
+                       (livespointer)mt);
+  lives_signal_connect(LIVES_GUI_OBJECT(mt->aload_subs), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_boolean_toggled),
+                       &prefs->autoload_subs);
+  lives_signal_connect(LIVES_GUI_OBJECT(mt->clipedit), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(multitrack_end_cb),
+                       (livespointer)mt);
+  lives_signal_connect(LIVES_GUI_OBJECT(mt->playall), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_playall_activate),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(mt->playsel), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(multitrack_play_sel),
+                       (livespointer)mt);
+  lives_signal_connect(LIVES_GUI_OBJECT(mt->insert), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(multitrack_insert),
+                       (livespointer)mt);
+  lives_signal_connect(LIVES_GUI_OBJECT(mt->audio_insert), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(multitrack_audio_insert),
+                       (livespointer)mt);
+  lives_signal_connect(LIVES_GUI_OBJECT(mt->adjust_start_end), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(multitrack_adj_start_end),
+                       (livespointer)mt);
+  lives_signal_connect(LIVES_GUI_OBJECT(mt->view_events), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(multitrack_view_events),
+                       (livespointer)mt);
+  lives_signal_connect(LIVES_GUI_OBJECT(mt->view_sel_events), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(multitrack_view_sel_events),
+                       (livespointer)mt);
+  lives_signal_connect(LIVES_GUI_OBJECT(mt->clear_marks), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(multitrack_clear_marks),
+                       (livespointer)mt);
+  lives_signal_connect(LIVES_GUI_OBJECT(view_mt_details), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(multitrack_view_details),
+                       (livespointer)mt);
+  lives_signal_connect(LIVES_GUI_OBJECT(mt->show_layout_errors), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(popup_lmap_errors),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(mt->view_clips), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(multitrack_view_clips),
+                       (livespointer)mt);
+  lives_signal_connect(LIVES_GUI_OBJECT(mt->view_in_out), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(multitrack_view_in_out),
+                       (livespointer)mt);
+  lives_signal_connect(LIVES_GUI_OBJECT(show_messages), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_show_messages_activate),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(mt->stop), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_stop_activate),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(mt->rewind), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_rewind_activate),
+                       NULL);
+  mt->sepwin_func=lives_signal_connect(LIVES_GUI_OBJECT(mt->sepwin), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                                       LIVES_GUI_CALLBACK(on_sepwin_activate),
+                                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(full_screen), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_full_screen_activate),
+                       NULL);
+  mt->loop_cont_func=lives_signal_connect(LIVES_GUI_OBJECT(mt->loop_continue), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                                          LIVES_GUI_CALLBACK(on_loop_cont_activate),
+                                          NULL);
+  mt->mute_audio_func=lives_signal_connect(LIVES_GUI_OBJECT(mt->mute_audio), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                      LIVES_GUI_CALLBACK(on_mute_activate),
                       NULL);
-  lives_signal_connect (LIVES_GUI_OBJECT (ccursor), LIVES_WIDGET_ACTIVATE_EVENT,
-                      LIVES_GUI_CALLBACK (mt_center_on_cursor),
-                      (gpointer)mt);
-  lives_signal_connect (LIVES_GUI_OBJECT (mt->follow_play), LIVES_WIDGET_ACTIVATE_EVENT,
-                      LIVES_GUI_CALLBACK (mt_fplay_toggled),
-                      (gpointer)mt);
-  lives_signal_connect (LIVES_GUI_OBJECT (zoom_in), LIVES_WIDGET_ACTIVATE_EVENT,
-                      LIVES_GUI_CALLBACK (mt_zoom_in),
-                      (gpointer)mt);
-  lives_signal_connect (LIVES_GUI_OBJECT (zoom_out), LIVES_WIDGET_ACTIVATE_EVENT,
-                      LIVES_GUI_CALLBACK (mt_zoom_out),
-                      (gpointer)mt);
-  mt->seltrack_func=lives_signal_connect (LIVES_GUI_OBJECT (mt->select_track), LIVES_WIDGET_ACTIVATE_EVENT,
-				      LIVES_GUI_CALLBACK (on_seltrack_activate),
-				      (gpointer)mt);
-
-  lives_signal_connect (LIVES_GUI_OBJECT (show_manual), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (show_manual_activate),
-		    NULL);
-
-  lives_signal_connect (LIVES_GUI_OBJECT (email_author), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (email_author_activate),
-		    NULL);
-
-  lives_signal_connect (LIVES_GUI_OBJECT (donate), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (donate_activate),
-		    NULL);
-
-  lives_signal_connect (LIVES_GUI_OBJECT (report_bug), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (report_bug_activate),
-		    NULL);
-
-  lives_signal_connect (LIVES_GUI_OBJECT (suggest_feature), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (suggest_feature_activate),
-		    NULL);
-
-  lives_signal_connect (LIVES_GUI_OBJECT (help_translate), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (help_translate_activate),
-		    NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(mt->rename_track), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_rename_track_activate),
+                       (livespointer)mt);
+  lives_signal_connect(LIVES_GUI_OBJECT(mt->cback_audio), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_cback_audio_activate),
+                       (livespointer)mt);
+  lives_signal_connect(LIVES_GUI_OBJECT(mt->add_vid_behind), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(add_video_track_behind),
+                       (livespointer)mt);
+  lives_signal_connect(LIVES_GUI_OBJECT(mt->add_vid_front), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(add_video_track_front),
+                       (livespointer)mt);
+  lives_signal_connect(LIVES_GUI_OBJECT(mt->render), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_render_activate),
+                       (livespointer)mt);
+  lives_signal_connect(LIVES_GUI_OBJECT(mt->prerender_aud), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_prerender_aud_activate),
+                       (livespointer)mt);
+  lives_signal_connect(LIVES_GUI_OBJECT(mt->jumpback), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_jumpback_activate),
+                       (livespointer)mt);
+  lives_signal_connect(LIVES_GUI_OBJECT(mt->jumpnext), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_jumpnext_activate),
+                       (livespointer)mt);
+  lives_signal_connect(LIVES_GUI_OBJECT(mt->delblock), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_delblock_activate),
+                       (livespointer)mt);
+  lives_signal_connect(LIVES_GUI_OBJECT(mt->save_event_list), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_save_event_list_activate),
+                       (livespointer)mt);
+  lives_signal_connect(LIVES_GUI_OBJECT(mt->load_event_list), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_load_event_list_activate),
+                       (livespointer)mt);
+  lives_signal_connect(LIVES_GUI_OBJECT(mt->clear_event_list), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_clear_event_list_activate),
+                       (livespointer)mt);
+  lives_signal_connect(LIVES_GUI_OBJECT(mt->view_audio), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(mt_view_audio_toggled),
+                       (livespointer)mt);
+  lives_signal_connect(LIVES_GUI_OBJECT(view_ctx), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(mt_view_ctx_toggled),
+                       (livespointer)mt);
+  lives_signal_connect(LIVES_GUI_OBJECT(mt->change_max_disp), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(mt_change_max_disp_tracks),
+                       (livespointer)mt);
+  lives_signal_connect(LIVES_GUI_OBJECT(mt->render_vid), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(mt_render_vid_toggled),
+                       (livespointer)mt);
+  lives_signal_connect(LIVES_GUI_OBJECT(mt->render_aud), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(mt_render_aud_toggled),
+                       (livespointer)mt);
+  lives_signal_connect(LIVES_GUI_OBJECT(mt->normalise_aud), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(mt_norm_aud_toggled),
+                       (livespointer)mt);
+  lives_signal_connect(LIVES_GUI_OBJECT(ign_ins_sel), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(mt_ign_ins_sel_toggled),
+                       (livespointer)mt);
+  lives_signal_connect(LIVES_GUI_OBJECT(show_frame_events), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(show_frame_events_activate),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(ccursor), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(mt_center_on_cursor),
+                       (livespointer)mt);
+  lives_signal_connect(LIVES_GUI_OBJECT(mt->follow_play), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(mt_fplay_toggled),
+                       (livespointer)mt);
+  lives_signal_connect(LIVES_GUI_OBJECT(zoom_in), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(mt_zoom_in),
+                       (livespointer)mt);
+  lives_signal_connect(LIVES_GUI_OBJECT(zoom_out), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(mt_zoom_out),
+                       (livespointer)mt);
+  mt->seltrack_func=lives_signal_connect(LIVES_GUI_OBJECT(mt->select_track), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                                         LIVES_GUI_CALLBACK(on_seltrack_activate),
+                                         (livespointer)mt);
+
+  lives_signal_connect(LIVES_GUI_OBJECT(show_manual), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(show_manual_activate),
+                       NULL);
+
+  lives_signal_connect(LIVES_GUI_OBJECT(email_author), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(email_author_activate),
+                       NULL);
+
+  lives_signal_connect(LIVES_GUI_OBJECT(donate), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(donate_activate),
+                       NULL);
+
+  lives_signal_connect(LIVES_GUI_OBJECT(report_bug), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(report_bug_activate),
+                       NULL);
+
+  lives_signal_connect(LIVES_GUI_OBJECT(suggest_feature), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(suggest_feature_activate),
+                       NULL);
+
+  lives_signal_connect(LIVES_GUI_OBJECT(help_translate), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(help_translate_activate),
+                       NULL);
+
+  lives_signal_connect(LIVES_GUI_OBJECT(about), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_about_activate),
+                       NULL);
+
+  lives_signal_connect(LIVES_GUI_OBJECT(mt->troubleshoot), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_troubleshoot_activate),
+                       NULL);
+
+  lives_signal_connect(LIVES_GUI_OBJECT(show_mt_keys), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_mt_showkeys_activate),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(mt->fx_delete), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_mt_delfx_activate),
+                       (livespointer)mt);
+  lives_signal_connect(LIVES_GUI_OBJECT(mt->fx_edit), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_mt_fx_edit_activate),
+                       (livespointer)mt);
+  lives_signal_connect(LIVES_GUI_OBJECT(mt->view_effects), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_mt_list_fx_activate),
+                       (livespointer)mt);
 
-  lives_signal_connect (LIVES_GUI_OBJECT (about), LIVES_WIDGET_ACTIVATE_EVENT,
-                      LIVES_GUI_CALLBACK (on_about_activate),
-                      NULL);
-
-  lives_signal_connect (LIVES_GUI_OBJECT (mt->troubleshoot), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (on_troubleshoot_activate),
-		    NULL);
-
-  lives_signal_connect (LIVES_GUI_OBJECT (show_mt_keys), LIVES_WIDGET_ACTIVATE_EVENT,
-                      LIVES_GUI_CALLBACK (on_mt_showkeys_activate),
-                      NULL);
-  lives_signal_connect (LIVES_GUI_OBJECT (mt->fx_delete), LIVES_WIDGET_ACTIVATE_EVENT,
-                      LIVES_GUI_CALLBACK (on_mt_delfx_activate),
-                      (gpointer)mt);
-  lives_signal_connect (LIVES_GUI_OBJECT (mt->fx_edit), LIVES_WIDGET_ACTIVATE_EVENT,
-                      LIVES_GUI_CALLBACK (on_mt_fx_edit_activate),
-                      (gpointer)mt);
-  lives_signal_connect (LIVES_GUI_OBJECT (mt->view_effects), LIVES_WIDGET_ACTIVATE_EVENT,
-                      LIVES_GUI_CALLBACK (on_mt_list_fx_activate),
-                      (gpointer)mt);
-
-  lives_accel_group_connect (LIVES_ACCEL_GROUP (mt->accel_group), LIVES_KEY_m, (LiVESXModifierType)0, (LiVESAccelFlags)0, 
-			   g_cclosure_new (LIVES_GUI_CALLBACK (mt_mark_callback),(gpointer)mt,NULL));
+  lives_accel_group_connect(LIVES_ACCEL_GROUP(mt->accel_group), LIVES_KEY_m, (LiVESXModifierType)0, (LiVESAccelFlags)0,
+                            lives_cclosure_new(LIVES_GUI_CALLBACK(mt_mark_callback),(livespointer)mt,NULL));
 
   eventbox=lives_event_box_new();
   if (palette->style&STYLE_1) {
@@ -7715,13 +7891,13 @@
     lives_widget_set_fg_color(eventbox, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars_fore);
   }
 
-  lives_box_pack_start (LIVES_BOX (mt->top_vbox), eventbox, FALSE, FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(mt->top_vbox), eventbox, FALSE, FALSE, 0);
 
-  hbox = lives_hbox_new (FALSE, 0);
+  hbox = lives_hbox_new(FALSE, 0);
   lives_container_add(LIVES_CONTAINER(eventbox),hbox);
 
-  btoolbar=lives_toolbar_new();
-  lives_box_pack_start (LIVES_BOX (hbox), btoolbar, FALSE, FALSE, 0);
+  mt->btoolbar2=lives_toolbar_new();
+  lives_box_pack_start(LIVES_BOX(hbox), mt->btoolbar2, FALSE, FALSE, 0);
 
   widget_opts.apply_theme=FALSE;
   widget_opts.expand=LIVES_EXPAND_NONE;
@@ -7730,10 +7906,11 @@
 
   dpw=widget_opts.packing_width;
   widget_opts.packing_width=2.*widget_opts.scale;
-  mt->insa_checkbutton = lives_standard_check_button_new ((tmp=g_strdup(_("Insert with _audio"))),TRUE,LIVES_BOX(hbox),
-							   (tmp2=g_strdup(_("Select whether video clips are inserted and moved with their audio or not"))));
+  mt->insa_checkbutton = lives_standard_check_button_new((tmp=lives_strdup(_("Insert with _audio"))),TRUE,LIVES_BOX(hbox),
+                         (tmp2=lives_strdup(_("Select whether video clips are inserted and moved with their audio or not"))));
   widget_opts.packing_width=dpw;
-  g_free(tmp); g_free(tmp2);
+  lives_free(tmp);
+  lives_free(tmp2);
 
   if (palette->style&STYLE_1) {
     lives_widget_set_bg_color(lives_widget_get_parent(widget_opts.last_label), LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
@@ -7745,53 +7922,54 @@
 
   // must do this here to set cfile->hsize, cfile->vsize; and we must have created aparam_submenu and insa_eventbox and insa_checkbutton
   msg=set_values_from_defs(mt,!prefs->mt_enter_prompt||(mainw->recoverable_layout&&prefs->startup_interface==STARTUP_CE));
-  if (msg!=NULL) g_free(msg);
+  if (msg!=NULL) lives_free(msg);
 
   // play buttons
 
-  lives_toolbar_set_show_arrow(LIVES_TOOLBAR(btoolbar),FALSE);
+  lives_toolbar_set_show_arrow(LIVES_TOOLBAR(mt->btoolbar2),FALSE);
 
   if (palette->style&STYLE_1) {
-    lives_widget_set_bg_color(btoolbar, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
-    lives_widget_set_fg_color(btoolbar, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars_fore);
+    lives_widget_set_bg_color(mt->btoolbar2, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
+    lives_widget_set_fg_color(mt->btoolbar2, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars_fore);
   }
 
-  lives_toolbar_set_style (LIVES_TOOLBAR (btoolbar), LIVES_TOOLBAR_ICONS);
-  lives_toolbar_set_icon_size (LIVES_TOOLBAR(btoolbar),LIVES_ICON_SIZE_SMALL_TOOLBAR);
+  lives_toolbar_set_style(LIVES_TOOLBAR(mt->btoolbar2), LIVES_TOOLBAR_ICONS);
+  lives_toolbar_set_icon_size(LIVES_TOOLBAR(mt->btoolbar2),LIVES_ICON_SIZE_SMALL_TOOLBAR);
 
   lives_object_ref(mainw->m_sepwinbutton);
   lives_widget_unparent(mainw->m_sepwinbutton);
-  lives_toolbar_insert(LIVES_TOOLBAR(btoolbar),LIVES_TOOL_ITEM(mainw->m_sepwinbutton),-1);
+  lives_toolbar_insert(LIVES_TOOLBAR(mt->btoolbar2),LIVES_TOOL_ITEM(mainw->m_sepwinbutton),-1);
   lives_object_unref(mainw->m_sepwinbutton);
 
   lives_object_ref(mainw->m_rewindbutton);
   lives_widget_unparent(mainw->m_rewindbutton);
-  lives_toolbar_insert(LIVES_TOOLBAR(btoolbar),LIVES_TOOL_ITEM(mainw->m_rewindbutton),-1);
+  lives_toolbar_insert(LIVES_TOOLBAR(mt->btoolbar2),LIVES_TOOL_ITEM(mainw->m_rewindbutton),-1);
   lives_object_unref(mainw->m_rewindbutton);
 
   lives_object_ref(mainw->m_playbutton);
   lives_widget_unparent(mainw->m_playbutton);
-  lives_toolbar_insert(LIVES_TOOLBAR(btoolbar),LIVES_TOOL_ITEM(mainw->m_playbutton),-1);
+  lives_toolbar_insert(LIVES_TOOLBAR(mt->btoolbar2),LIVES_TOOL_ITEM(mainw->m_playbutton),-1);
   lives_object_unref(mainw->m_playbutton);
 
   lives_object_ref(mainw->m_stopbutton);
   lives_widget_unparent(mainw->m_stopbutton);
-  lives_toolbar_insert(LIVES_TOOLBAR(btoolbar),LIVES_TOOL_ITEM(mainw->m_stopbutton),-1);
+  lives_toolbar_insert(LIVES_TOOLBAR(mt->btoolbar2),LIVES_TOOL_ITEM(mainw->m_stopbutton),-1);
   lives_object_unref(mainw->m_stopbutton);
 
   lives_object_ref(mainw->m_loopbutton);
   lives_widget_unparent(mainw->m_loopbutton);
-  lives_toolbar_insert(LIVES_TOOLBAR(btoolbar),LIVES_TOOL_ITEM(mainw->m_loopbutton),-1);
+  lives_toolbar_insert(LIVES_TOOLBAR(mt->btoolbar2),LIVES_TOOL_ITEM(mainw->m_loopbutton),-1);
   lives_object_unref(mainw->m_loopbutton);
 
 
 
-  time_to_string (mt,0.,TIMECODE_LENGTH);
+  time_to_string(mt,0.,TIMECODE_LENGTH);
 
   lives_widget_add_events(mt->timecode,LIVES_FOCUS_CHANGE_MASK);
   lives_widget_set_sensitive(mt->timecode,FALSE);
 
-  mt->tc_func=lives_signal_connect_after (G_OBJECT (mt->timecode),"focus_out_event", LIVES_GUI_CALLBACK (after_timecode_changed), (gpointer) mt);
+  mt->tc_func=lives_signal_connect_after(LIVES_WIDGET_OBJECT(mt->timecode),LIVES_WIDGET_FOCUS_OUT_EVENT,
+                                         LIVES_GUI_CALLBACK(after_timecode_changed), (livespointer) mt);
 
   lives_widget_set_bg_color(mt->timecode, LIVES_WIDGET_STATE_NORMAL, &palette->black);
   lives_widget_set_base_color(mt->timecode, LIVES_WIDGET_STATE_NORMAL, &palette->black);
@@ -7803,22 +7981,22 @@
 
   lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(mt->insa_checkbutton),mt->opts.insert_audio);
 
-  lives_signal_connect_after (LIVES_GUI_OBJECT (mt->insa_checkbutton), LIVES_WIDGET_TOGGLED_EVENT,
-			  LIVES_GUI_CALLBACK (on_insa_toggled),
-			  mt);
+  lives_signal_connect_after(LIVES_GUI_OBJECT(mt->insa_checkbutton), LIVES_WIDGET_TOGGLED_SIGNAL,
+                             LIVES_GUI_CALLBACK(on_insa_toggled),
+                             mt);
 
 
   if (prefs->lamp_buttons) {
     on_insa_toggled(LIVES_TOGGLE_BUTTON(mt->insa_checkbutton),mt);
-    gtk_toggle_button_set_mode(LIVES_TOGGLE_BUTTON(mt->insa_checkbutton),FALSE);
+    lives_toggle_button_set_mode(LIVES_TOGGLE_BUTTON(mt->insa_checkbutton),FALSE);
 
     lives_widget_set_bg_color(mt->insa_checkbutton, LIVES_WIDGET_STATE_ACTIVE, &palette->light_green);
     lives_widget_set_bg_color(mt->insa_checkbutton, LIVES_WIDGET_STATE_NORMAL, &palette->dark_red);
 
 #if GTK_CHECK_VERSION(3,0,0)
-  lives_signal_connect (LIVES_GUI_OBJECT (mt->insa_checkbutton), LIVES_WIDGET_EXPOSE_EVENT,
-		    LIVES_GUI_CALLBACK (draw_cool_toggle),
-		    NULL);
+    lives_signal_connect(LIVES_GUI_OBJECT(mt->insa_checkbutton), LIVES_WIDGET_EXPOSE_EVENT,
+                         LIVES_GUI_CALLBACK(draw_cool_toggle),
+                         NULL);
 #endif
 
   }
@@ -7826,10 +8004,11 @@
   dpw=widget_opts.packing_width;
   widget_opts.packing_width=2.*widget_opts.scale;
 
-  mt->snapo_checkbutton = lives_standard_check_button_new ((tmp=g_strdup(_("Select _overlap"))),TRUE,LIVES_BOX(hbox),
-							   (tmp2=g_strdup(_("Select whether timeline selection snaps to overlap between selected tracks or not"))));
+  mt->snapo_checkbutton = lives_standard_check_button_new((tmp=lives_strdup(_("Select _overlap"))),TRUE,LIVES_BOX(hbox),
+                          (tmp2=lives_strdup(_("Select whether timeline selection snaps to overlap between selected tracks or not"))));
   widget_opts.packing_width=dpw;
-  g_free(tmp); g_free(tmp2);
+  lives_free(tmp);
+  lives_free(tmp2);
 
   widget_opts.apply_theme=TRUE;
 
@@ -7842,20 +8021,20 @@
 
   lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(mt->snapo_checkbutton),mt->opts.snap_over);
 
-  lives_signal_connect_after (LIVES_GUI_OBJECT (mt->snapo_checkbutton), LIVES_WIDGET_TOGGLED_EVENT,
-			  LIVES_GUI_CALLBACK (on_snapo_toggled),
-			  mt);
+  lives_signal_connect_after(LIVES_GUI_OBJECT(mt->snapo_checkbutton), LIVES_WIDGET_TOGGLED_SIGNAL,
+                             LIVES_GUI_CALLBACK(on_snapo_toggled),
+                             mt);
 
   if (prefs->lamp_buttons) {
-    gtk_toggle_button_set_mode(LIVES_TOGGLE_BUTTON(mt->snapo_checkbutton),FALSE);
+    lives_toggle_button_set_mode(LIVES_TOGGLE_BUTTON(mt->snapo_checkbutton),FALSE);
 #if GTK_CHECK_VERSION(3,0,0)
-  lives_signal_connect (LIVES_GUI_OBJECT (mt->snapo_checkbutton), LIVES_WIDGET_EXPOSE_EVENT,
-		    LIVES_GUI_CALLBACK (draw_cool_toggle),
-		    NULL);
+    lives_signal_connect(LIVES_GUI_OBJECT(mt->snapo_checkbutton), LIVES_WIDGET_EXPOSE_EVENT,
+                         LIVES_GUI_CALLBACK(draw_cool_toggle),
+                         NULL);
 #endif
     lives_widget_set_bg_color(mt->snapo_checkbutton, LIVES_WIDGET_STATE_ACTIVE, &palette->light_green);
     lives_widget_set_bg_color(mt->snapo_checkbutton, LIVES_WIDGET_STATE_NORMAL, &palette->dark_red);
-    
+
     on_snapo_toggled(LIVES_TOGGLE_BUTTON(mt->snapo_checkbutton),mt);
   }
 
@@ -7878,7 +8057,7 @@
 
 
   btoolbar=lives_toolbar_new();
-  lives_box_pack_start (LIVES_BOX (hbox), btoolbar, FALSE, FALSE, widget_opts.packing_width*2);
+  lives_box_pack_start(LIVES_BOX(hbox), btoolbar, FALSE, FALSE, widget_opts.packing_width*2);
 
   lives_toolbar_set_show_arrow(LIVES_TOOLBAR(btoolbar),FALSE);
 
@@ -7887,76 +8066,76 @@
     lives_widget_set_fg_color(btoolbar, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars_fore);
   }
 
-  lives_toolbar_set_style (LIVES_TOOLBAR (btoolbar), LIVES_TOOLBAR_TEXT);
+  lives_toolbar_set_style(LIVES_TOOLBAR(btoolbar), LIVES_TOOLBAR_TEXT);
 
   mt->eview_button=lives_tool_button_new(NULL,NULL);
 
-  mt->eview_label=lives_label_new(_ ("Expanded View (d)"));
+  mt->eview_label=lives_label_new(_("Expanded View (d)"));
   lives_tool_button_set_label_widget(LIVES_TOOL_BUTTON(mt->eview_button),mt->eview_label);
 
-  if (!mt->opts.show_ctx) lives_label_set_text(LIVES_LABEL(mt->eview_label),_ ("Compact View (d)"));
+  if (!mt->opts.show_ctx) lives_label_set_text(LIVES_LABEL(mt->eview_label),_("Compact View (d)"));
 
   lives_toolbar_insert(LIVES_TOOLBAR(btoolbar),LIVES_TOOL_ITEM(mt->eview_button),-1);
 
-  lives_signal_connect (LIVES_GUI_OBJECT (mt->eview_button), LIVES_WIDGET_CLICKED_EVENT,
-		    LIVES_GUI_CALLBACK (on_comp_exp),
-		    (gpointer)view_ctx);
+  lives_signal_connect(LIVES_GUI_OBJECT(mt->eview_button), LIVES_WIDGET_CLICKED_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_comp_exp),
+                       (livespointer)view_ctx);
 
 
 
 
-  btoolbar=lives_toolbar_new();
-  lives_box_pack_start (LIVES_BOX (hbox), btoolbar, FALSE, FALSE, 0);
+  mt->btoolbar3=lives_toolbar_new();
+  lives_box_pack_start(LIVES_BOX(hbox), mt->btoolbar3, FALSE, FALSE, 0);
 
-  lives_toolbar_set_show_arrow(LIVES_TOOLBAR(btoolbar),FALSE);
+  lives_toolbar_set_show_arrow(LIVES_TOOLBAR(mt->btoolbar3),FALSE);
 
   if (palette->style&STYLE_1) {
-    lives_widget_set_bg_color(btoolbar, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
-    lives_widget_set_fg_color(btoolbar, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars_fore);
+    lives_widget_set_bg_color(mt->btoolbar3, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
+    lives_widget_set_fg_color(mt->btoolbar3, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars_fore);
     lives_widget_set_bg_color(mt->eview_label, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
     lives_widget_set_fg_color(mt->eview_label, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars_fore);
   }
 
-  lives_toolbar_set_style (LIVES_TOOLBAR (btoolbar), LIVES_TOOLBAR_TEXT);
+  lives_toolbar_set_style(LIVES_TOOLBAR(mt->btoolbar3), LIVES_TOOLBAR_TEXT);
 
-  mt->grav_menuitem = lives_menu_tool_button_new (NULL,NULL);
-  lives_tool_button_set_use_underline (LIVES_TOOL_BUTTON(mt->grav_menuitem),TRUE);
+  mt->grav_menuitem = lives_menu_tool_button_new(NULL,NULL);
+  lives_tool_button_set_use_underline(LIVES_TOOL_BUTTON(mt->grav_menuitem),TRUE);
 
   mt->grav_label=lives_label_new(_("Gravity: Normal"));
   lives_tool_button_set_label_widget(LIVES_TOOL_BUTTON(mt->grav_menuitem),mt->grav_label);
 
-  lives_toolbar_insert(LIVES_TOOLBAR(btoolbar),LIVES_TOOL_ITEM(mt->grav_menuitem),-1);
+  lives_toolbar_insert(LIVES_TOOLBAR(mt->btoolbar3),LIVES_TOOL_ITEM(mt->grav_menuitem),-1);
 
-  submenu = lives_menu_new ();
+  submenu = lives_menu_new();
   if (palette->style&STYLE_1) {
     lives_widget_set_bg_color(submenu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
     lives_widget_set_fg_color(submenu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars_fore);
     lives_widget_set_bg_color(mt->grav_label, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
     lives_widget_set_fg_color(mt->grav_label, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars_fore);
   }
-  lives_menu_tool_button_set_menu (LIVES_MENU_TOOL_BUTTON (mt->grav_menuitem), submenu);
+  lives_menu_tool_button_set_menu(LIVES_MENU_TOOL_BUTTON(mt->grav_menuitem), submenu);
 
-  mt->grav_normal = lives_check_menu_item_new_with_mnemonic (_("Gravity: _Normal"));
-  lives_container_add (LIVES_CONTAINER(submenu), mt->grav_normal);
+  mt->grav_normal = lives_check_menu_item_new_with_mnemonic(_("Gravity: _Normal"));
+  lives_container_add(LIVES_CONTAINER(submenu), mt->grav_normal);
 
   lives_check_menu_item_set_active(LIVES_CHECK_MENU_ITEM(mt->grav_normal),mt->opts.grav_mode==GRAV_MODE_NORMAL);
 
-  mt->grav_normal_func=lives_signal_connect (LIVES_GUI_OBJECT (mt->grav_normal), LIVES_WIDGET_TOGGLED_EVENT,
-					 LIVES_GUI_CALLBACK (on_grav_mode_changed),
-					 (gpointer)mt);
+  mt->grav_normal_func=lives_signal_connect(LIVES_GUI_OBJECT(mt->grav_normal), LIVES_WIDGET_TOGGLED_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_grav_mode_changed),
+                       (livespointer)mt);
   if (palette->style&STYLE_1) {
     lives_widget_set_bg_color(lives_bin_get_child(LIVES_BIN(mt->grav_normal)), LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
     lives_widget_set_fg_color(lives_bin_get_child(LIVES_BIN(mt->grav_normal)), LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars_fore);
   }
 
-  mt->grav_left = lives_check_menu_item_new_with_mnemonic (_("Gravity: _Left"));
-  lives_container_add (LIVES_CONTAINER(submenu), mt->grav_left);
+  mt->grav_left = lives_check_menu_item_new_with_mnemonic(_("Gravity: _Left"));
+  lives_container_add(LIVES_CONTAINER(submenu), mt->grav_left);
 
   lives_check_menu_item_set_active(LIVES_CHECK_MENU_ITEM(mt->grav_left),mt->opts.grav_mode==GRAV_MODE_LEFT);
 
-  mt->grav_left_func=lives_signal_connect (LIVES_GUI_OBJECT (mt->grav_left), LIVES_WIDGET_TOGGLED_EVENT,
-				       LIVES_GUI_CALLBACK (on_grav_mode_changed),
-				       (gpointer)mt);
+  mt->grav_left_func=lives_signal_connect(LIVES_GUI_OBJECT(mt->grav_left), LIVES_WIDGET_TOGGLED_SIGNAL,
+                                          LIVES_GUI_CALLBACK(on_grav_mode_changed),
+                                          (livespointer)mt);
 
 
   if (palette->style&STYLE_1) {
@@ -7964,8 +8143,8 @@
     lives_widget_set_fg_color(lives_bin_get_child(LIVES_BIN(mt->grav_left)), LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars_fore);
   }
 
-  mt->grav_right = lives_check_menu_item_new_with_mnemonic (_("Gravity: _Right"));
-  lives_container_add (LIVES_CONTAINER(submenu), mt->grav_right);
+  mt->grav_right = lives_check_menu_item_new_with_mnemonic(_("Gravity: _Right"));
+  lives_container_add(LIVES_CONTAINER(submenu), mt->grav_right);
 
   lives_check_menu_item_set_active(LIVES_CHECK_MENU_ITEM(mt->grav_right),mt->opts.grav_mode==GRAV_MODE_RIGHT);
 
@@ -7974,9 +8153,9 @@
     lives_widget_set_fg_color(lives_bin_get_child(LIVES_BIN(mt->grav_right)), LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars_fore);
   }
 
-  mt->grav_right_func=lives_signal_connect (LIVES_GUI_OBJECT (mt->grav_right), LIVES_WIDGET_TOGGLED_EVENT,
-					LIVES_GUI_CALLBACK (on_grav_mode_changed),
-					(gpointer)mt);
+  mt->grav_right_func=lives_signal_connect(LIVES_GUI_OBJECT(mt->grav_right), LIVES_WIDGET_TOGGLED_SIGNAL,
+                      LIVES_GUI_CALLBACK(on_grav_mode_changed),
+                      (livespointer)mt);
 
 
   lives_widget_show_all(submenu);
@@ -7986,7 +8165,7 @@
 
 
   btoolbar=lives_toolbar_new();
-  lives_box_pack_start (LIVES_BOX (hbox), btoolbar, TRUE, TRUE, 0);
+  lives_box_pack_start(LIVES_BOX(hbox), btoolbar, TRUE, TRUE, 0);
 
   lives_toolbar_set_show_arrow(LIVES_TOOLBAR(btoolbar),FALSE);
 
@@ -7995,8 +8174,8 @@
     lives_widget_set_fg_color(btoolbar, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars_fore);
   }
 
-  lives_toolbar_set_style (LIVES_TOOLBAR (btoolbar), LIVES_TOOLBAR_ICONS);
-  lives_toolbar_set_icon_size (LIVES_TOOLBAR(btoolbar),LIVES_ICON_SIZE_SMALL_TOOLBAR);
+  lives_toolbar_set_style(LIVES_TOOLBAR(btoolbar), LIVES_TOOLBAR_ICONS);
+  lives_toolbar_set_icon_size(LIVES_TOOLBAR(btoolbar),LIVES_ICON_SIZE_SMALL_TOOLBAR);
 
 
 
@@ -8005,7 +8184,7 @@
   lives_toolbar_insert(LIVES_TOOLBAR(btoolbar),LIVES_TOOL_ITEM(mainw->m_mutebutton),-1);
   lives_object_unref(mainw->m_mutebutton);
 
-  if (!lives_scale_button_set_orientation (LIVES_SCALE_BUTTON(mainw->volume_scale),LIVES_ORIENTATION_VERTICAL)) {
+  if (!lives_scale_button_set_orientation(LIVES_SCALE_BUTTON(mainw->volume_scale),LIVES_ORIENTATION_VERTICAL)) {
     if (mainw->vol_label!=NULL) {
       lives_object_ref(mainw->vol_label);
       lives_widget_unparent(mainw->vol_label);
@@ -8021,102 +8200,109 @@
 
 
 
-  hseparator = lives_hseparator_new ();
-  lives_box_pack_start (LIVES_BOX (mt->top_vbox), hseparator, FALSE, FALSE, 0);
+  hseparator = lives_hseparator_new();
+  lives_box_pack_start(LIVES_BOX(mt->top_vbox), hseparator, FALSE, FALSE, 0);
 
-  mt->hbox = lives_hbox_new (FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (mt->top_vbox), mt->hbox, FALSE, FALSE, 0);
+  mt->hbox = lives_hbox_new(FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(mt->top_vbox), mt->hbox, FALSE, FALSE, 0);
 
-  mt->play_blank = lives_image_new_from_pixbuf (mainw->imframe);
-  frame = lives_frame_new (_("Preview"));
-  lives_box_pack_start (LIVES_BOX (mt->hbox), frame, FALSE, FALSE, 0);
+  mt->play_blank = lives_image_new_from_pixbuf(mainw->imframe);
+  frame = lives_frame_new(_("Preview"));
+  lives_box_pack_start(LIVES_BOX(mt->hbox), frame, FALSE, FALSE, 0);
   mt->fd_frame=frame;
 
   if (palette->style&STYLE_1) {
-    lives_widget_set_bg_color (frame, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
-    lives_widget_set_fg_color (frame, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
-    lives_widget_set_fg_color (lives_frame_get_label_widget(LIVES_FRAME(frame)), LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
+    lives_widget_set_bg_color(frame, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+    lives_widget_set_fg_color(frame, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
+    lives_widget_set_fg_color(lives_frame_get_label_widget(LIVES_FRAME(frame)), LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
   }
 
   eventbox=lives_event_box_new();
-  lives_widget_set_size_request (eventbox, mt->play_window_width, mt->play_window_height);
-  mt->play_box = lives_vbox_new (FALSE, widget_opts.border_width);
+  lives_widget_set_size_request(eventbox, mt->play_window_width, mt->play_window_height);
+  mt->play_box = lives_vbox_new(FALSE, widget_opts.border_width);
   lives_widget_set_app_paintable(eventbox,TRUE);
-  lives_widget_set_size_request (mt->play_box, mt->play_window_width, mt->play_window_height);
+  lives_widget_set_size_request(mt->play_box, mt->play_window_width, mt->play_window_height);
 
   lives_widget_set_hexpand(mt->play_box,FALSE);
   lives_widget_set_vexpand(mt->play_box,FALSE);
 
 
 #if GTK_CHECK_VERSION(3,0,0)
-  lives_signal_connect (LIVES_GUI_OBJECT (mt->play_box), LIVES_WIDGET_EXPOSE_EVENT,
-		    LIVES_GUI_CALLBACK (expose_pb),
-		    (gpointer)mt);
+  lives_signal_connect(LIVES_GUI_OBJECT(mt->play_box), LIVES_WIDGET_EXPOSE_EVENT,
+                       LIVES_GUI_CALLBACK(expose_pb),
+                       (livespointer)mt);
 #endif
 
-  lives_container_add (LIVES_CONTAINER (frame), eventbox);
-  lives_container_add (LIVES_CONTAINER (eventbox), mt->play_box);
+  lives_container_add(LIVES_CONTAINER(frame), eventbox);
+  lives_container_add(LIVES_CONTAINER(eventbox), mt->play_box);
   if (palette->style&STYLE_1) {
-    lives_widget_set_bg_color (eventbox, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+    lives_widget_set_bg_color(eventbox, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
   }
-  lives_container_add (LIVES_CONTAINER (mt->play_box), mt->play_blank);
+  lives_container_add(LIVES_CONTAINER(mt->play_box), mt->play_blank);
 
 
-  lives_widget_add_events (eventbox, LIVES_BUTTON1_MOTION_MASK | LIVES_BUTTON_RELEASE_MASK | LIVES_BUTTON_PRESS_MASK | LIVES_ENTER_NOTIFY_MASK);
+  lives_widget_add_events(eventbox, LIVES_BUTTON1_MOTION_MASK | LIVES_BUTTON_RELEASE_MASK | LIVES_BUTTON_PRESS_MASK |
+                          LIVES_ENTER_NOTIFY_MASK);
 
-  lives_signal_connect (LIVES_GUI_OBJECT (eventbox), "motion_notify_event",
-		    LIVES_GUI_CALLBACK (on_framedraw_mouse_update),
-		    NULL);
-  lives_signal_connect (LIVES_GUI_OBJECT (eventbox), "button_release_event",
-		    LIVES_GUI_CALLBACK (on_framedraw_mouse_reset),
-		    NULL);
-  lives_signal_connect (LIVES_GUI_OBJECT (eventbox), "button_press_event",
-		    LIVES_GUI_CALLBACK (on_framedraw_mouse_start),
-		    NULL);
-  lives_signal_connect (LIVES_GUI_OBJECT(eventbox), "enter-notify-event",LIVES_GUI_CALLBACK (on_framedraw_enter),NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(eventbox), LIVES_WIDGET_MOTION_NOTIFY_EVENT,
+                       LIVES_GUI_CALLBACK(on_framedraw_mouse_update),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(eventbox), LIVES_WIDGET_BUTTON_RELEASE_EVENT,
+                       LIVES_GUI_CALLBACK(on_framedraw_mouse_reset),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(eventbox), LIVES_WIDGET_BUTTON_PRESS_EVENT,
+                       LIVES_GUI_CALLBACK(on_framedraw_mouse_start),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(eventbox), LIVES_WIDGET_ENTER_EVENT,LIVES_GUI_CALLBACK(on_framedraw_enter),NULL);
 
 
   mt->hpaned=lives_hpaned_new();
-  lives_box_pack_start (LIVES_BOX (mt->hbox), mt->hpaned, TRUE, TRUE, 0);
+  lives_box_pack_start(LIVES_BOX(mt->hbox), mt->hpaned, TRUE, TRUE, 0);
 
-  lives_signal_connect (LIVES_GUI_OBJECT (mt->hpaned), "accept_position",
-		    LIVES_GUI_CALLBACK (hpaned_pos),
-		    (gpointer)mt);
+  lives_signal_connect(LIVES_GUI_OBJECT(mt->hpaned), LIVES_WIDGET_ACCEPT_POSITION_SIGNAL,
+                       LIVES_GUI_CALLBACK(hpaned_pos),
+                       (livespointer)mt);
 
 
-  mt->nb = lives_notebook_new ();
+  mt->nb = lives_notebook_new();
   if (palette->style&STYLE_1) {
-    lives_widget_set_bg_color (mt->hpaned, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
-    lives_widget_set_bg_color (mt->nb, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
-    lives_widget_set_bg_color (mt->nb, LIVES_WIDGET_STATE_ACTIVE, &palette->menu_and_bars);
-    lives_widget_set_fg_color (mt->nb, LIVES_WIDGET_STATE_ACTIVE, &palette->menu_and_bars_fore);
+    lives_widget_set_bg_color(mt->hpaned, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+    lives_widget_set_bg_color(mt->nb, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+    lives_widget_set_bg_color(mt->nb, LIVES_WIDGET_STATE_ACTIVE, &palette->menu_and_bars);
+    lives_widget_set_fg_color(mt->nb, LIVES_WIDGET_STATE_ACTIVE, &palette->menu_and_bars_fore);
   }
 
 
-  hbox = lives_hbox_new (FALSE, 0);
+  hbox = lives_hbox_new(FALSE, 0);
   lives_widget_show(hbox);
 
-  lives_container_add (LIVES_CONTAINER (mt->nb), hbox);
+  // add a page
+  lives_container_add(LIVES_CONTAINER(mt->nb), hbox);
 
   tname=get_tab_name(POLY_CLIPS);
-  label=lives_standard_label_new (tname);
-  g_free(tname);
+  label=lives_standard_label_new(tname);
+  lives_free(tname);
 
 #if !GTK_CHECK_VERSION(3,0,0)
   if (palette->style&STYLE_1) {
-    lives_widget_set_fg_color (label, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
+    lives_widget_set_fg_color(label, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
   }
 #endif
 
   // prepare polymorph box
-  mt->poly_box = lives_vbox_new (FALSE, 0);
+  mt->poly_box = lives_vbox_new(FALSE, 0);
 
   lives_widget_set_vexpand(mt->poly_box,FALSE);
   lives_widget_set_hexpand(mt->poly_box,TRUE);
 
-  lives_container_add (LIVES_CONTAINER (hbox), mt->poly_box);
+  lives_container_add(LIVES_CONTAINER(hbox), mt->poly_box);
+
+  lives_notebook_set_tab_label(LIVES_NOTEBOOK(mt->nb), lives_notebook_get_nth_page(LIVES_NOTEBOOK(mt->nb), 0), label);
+
+  // poly box is first page in notebook
+
+
 
-  lives_notebook_set_tab_label (LIVES_NOTEBOOK(mt->nb), lives_notebook_get_nth_page (LIVES_NOTEBOOK (mt->nb), 0), label);
 
 
   // does not work...
@@ -8124,149 +8310,162 @@
   if (palette->style&STYLE_1) {
     GtkCssProvider *provider = gtk_css_provider_new ();
     GtkStyleContext *ctx = lives_widget_get_style_context(mt->nb);
-    gtk_style_context_add_provider (ctx, GTK_STYLE_PROVIDER     
-				    (provider), GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
-    
+    gtk_style_context_add_provider (ctx, GTK_STYLE_PROVIDER
+  			    (provider), GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+
     gtk_css_provider_load_from_data (GTK_CSS_PROVIDER (provider),
-				     " GtkNotebook tab {\n"  // or  " * tab {\n"
-				     "   background-color: blue;\n"
-				     " }\n"
-				     " GtkNotebook tab LiVESLabel {\n"
-				     "   background-color: blue;\n"
-				     "}\n", -1, NULL);
+  			     " GtkNotebook tab {\n"  // or  " * tab {\n"
+  			     "   background-color: blue;\n"
+  			     " }\n"
+  			     " GtkNotebook tab LiVESLabel {\n"
+  			     "   background-color: blue;\n"
+  			     "}\n", -1, NULL);
 
     lives_object_unref (provider);
   }
   */
-    
 
-  gtk_paned_pack1 (GTK_PANED (mt->hpaned), mt->nb, TRUE, FALSE);
 
-  gtk_paned_set_position(GTK_PANED(mt->hpaned),scr_width/2);
+  // notebook goes in paned: so we have paned -> nb-> poly_box
+  lives_paned_pack(1,LIVES_PANED(mt->hpaned), mt->nb, TRUE, FALSE);
+  lives_paned_set_position(LIVES_PANED(mt->hpaned),scr_width/2);
 
   // poly clip scroll
-  mt->clip_scroll = lives_scrolled_window_new (NULL, NULL);
-  lives_object_ref (mt->clip_scroll);
-  lives_widget_set_events (mt->clip_scroll, LIVES_SCROLL_MASK);
-  lives_signal_connect (LIVES_GUI_OBJECT (mt->clip_scroll), LIVES_WIDGET_SCROLL_EVENT,
-                      LIVES_GUI_CALLBACK (on_mouse_scroll),
-                      mt);
+  mt->clip_scroll = lives_scrolled_window_new(NULL, NULL);
+  lives_object_ref(mt->clip_scroll);
+  lives_widget_set_events(mt->clip_scroll, LIVES_SCROLL_MASK);
+  lives_signal_connect(LIVES_GUI_OBJECT(mt->clip_scroll), LIVES_WIDGET_SCROLL_EVENT,
+                       LIVES_GUI_CALLBACK(on_mouse_scroll),
+                       mt);
 
-  lives_scrolled_window_set_policy (LIVES_SCROLLED_WINDOW (mt->clip_scroll), LIVES_POLICY_AUTOMATIC, LIVES_POLICY_NEVER);
+  lives_scrolled_window_set_policy(LIVES_SCROLLED_WINDOW(mt->clip_scroll), LIVES_POLICY_AUTOMATIC, LIVES_POLICY_NEVER);
 
   lives_widget_set_hexpand(mt->clip_scroll,TRUE);
 
-  mt->clip_inner_box = lives_hbox_new (FALSE, widget_opts.packing_width);
+  mt->clip_inner_box = lives_hbox_new(FALSE, widget_opts.packing_width);
 
-  lives_scrolled_window_add_with_viewport (LIVES_SCROLLED_WINDOW (mt->clip_scroll), mt->clip_inner_box);
+  lives_scrolled_window_add_with_viewport(LIVES_SCROLLED_WINDOW(mt->clip_scroll), mt->clip_inner_box);
 
   if (palette->style&STYLE_4) {
     lives_widget_set_bg_color(lives_bin_get_child(LIVES_BIN(mt->clip_scroll)), LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
   }
 
 
+
+  // add a dummy hbox to nb (adds a tab with a label)
+
   tname=get_tab_name(POLY_IN_OUT);
-  label=lives_label_new (tname);
-  g_free(tname);
+  label=lives_label_new(tname);
+  lives_free(tname);
 
-  hbox = lives_hbox_new (FALSE, 0);
+  hbox = lives_hbox_new(FALSE, 0);
   lives_widget_show(hbox);
   lives_widget_set_hexpand(hbox,TRUE);
   lives_widget_set_vexpand(hbox,TRUE);
 
-  lives_container_add (LIVES_CONTAINER (mt->nb), hbox);
-  lives_notebook_set_tab_label (LIVES_NOTEBOOK(mt->nb), lives_notebook_get_nth_page (LIVES_NOTEBOOK (mt->nb), 1), label);
+  lives_container_add(LIVES_CONTAINER(mt->nb), hbox);
+  lives_notebook_set_tab_label(LIVES_NOTEBOOK(mt->nb), lives_notebook_get_nth_page(LIVES_NOTEBOOK(mt->nb), 1), label);
 #if !GTK_CHECK_VERSION(3,0,0)
   if (palette->style&STYLE_1) {
-    lives_widget_set_fg_color (label, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
+    lives_widget_set_fg_color(label, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
   }
 #endif
 
 
+  // add a dummy hbox to nb (adds a tab with label)
+
   tname=get_tab_name(POLY_FX_STACK);
-  label=lives_label_new (tname);
-  g_free(tname);
+  label=lives_label_new(tname);
+  lives_free(tname);
 
-  hbox = lives_hbox_new (FALSE, 0);
+  hbox = lives_hbox_new(FALSE, 0);
   lives_widget_show(hbox);
   lives_widget_set_hexpand(hbox,TRUE);
   lives_widget_set_vexpand(hbox,TRUE);
 
-  lives_container_add (LIVES_CONTAINER (mt->nb), hbox);
-  lives_notebook_set_tab_label (LIVES_NOTEBOOK(mt->nb), lives_notebook_get_nth_page (LIVES_NOTEBOOK (mt->nb), 2), label);
+  lives_container_add(LIVES_CONTAINER(mt->nb), hbox);
+  lives_notebook_set_tab_label(LIVES_NOTEBOOK(mt->nb), lives_notebook_get_nth_page(LIVES_NOTEBOOK(mt->nb), 2), label);
 #if !GTK_CHECK_VERSION(3,0,0)
   if (palette->style&STYLE_1) {
-    lives_widget_set_fg_color (label, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
+    lives_widget_set_fg_color(label, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
   }
 #endif
 
+  // add a dummy hbox to nb
+
   tname=get_tab_name(POLY_EFFECTS);
-  label=lives_label_new (tname);
-  g_free(tname);
+  label=lives_label_new(tname);
+  lives_free(tname);
 
-  hbox = lives_hbox_new (FALSE, 0);
+  hbox = lives_hbox_new(FALSE, 0);
   lives_widget_show(hbox);
   lives_widget_set_hexpand(hbox,TRUE);
   lives_widget_set_vexpand(hbox,TRUE);
 
-  lives_container_add (LIVES_CONTAINER (mt->nb), hbox);
-  lives_notebook_set_tab_label (LIVES_NOTEBOOK(mt->nb), lives_notebook_get_nth_page (LIVES_NOTEBOOK (mt->nb), 3), label);
+  lives_container_add(LIVES_CONTAINER(mt->nb), hbox);
+  lives_notebook_set_tab_label(LIVES_NOTEBOOK(mt->nb), lives_notebook_get_nth_page(LIVES_NOTEBOOK(mt->nb), 3), label);
 #if !GTK_CHECK_VERSION(3,0,0)
   if (palette->style&STYLE_1) {
-    lives_widget_set_fg_color (label, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
+    lives_widget_set_fg_color(label, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
   }
 #endif
 
+  // add a dummy hbox to nb
+
 
   tname=get_tab_name(POLY_TRANS);
-  label=lives_label_new (tname);
-  g_free(tname);
+  label=lives_label_new(tname);
+  lives_free(tname);
 
-  hbox = lives_hbox_new (FALSE, 0);
+  hbox = lives_hbox_new(FALSE, 0);
   lives_widget_show(hbox);
   lives_widget_set_hexpand(hbox,TRUE);
   lives_widget_set_vexpand(hbox,TRUE);
 
-  lives_container_add (LIVES_CONTAINER (mt->nb), hbox);
-  lives_notebook_set_tab_label (LIVES_NOTEBOOK(mt->nb), lives_notebook_get_nth_page (LIVES_NOTEBOOK (mt->nb), 4), label);
+  lives_container_add(LIVES_CONTAINER(mt->nb), hbox);
+  lives_notebook_set_tab_label(LIVES_NOTEBOOK(mt->nb), lives_notebook_get_nth_page(LIVES_NOTEBOOK(mt->nb), 4), label);
 #if !GTK_CHECK_VERSION(3,0,0)
   if (palette->style&STYLE_1) {
-    lives_widget_set_fg_color (label, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
+    lives_widget_set_fg_color(label, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
   }
 #endif
 
+  // add a dummy hbox to nb
+
   tname=get_tab_name(POLY_COMP);
-  label=lives_label_new (tname);
-  g_free(tname);
+  label=lives_label_new(tname);
+  lives_free(tname);
 
-  hbox = lives_hbox_new (FALSE, 0);
+  hbox = lives_hbox_new(FALSE, 0);
   lives_widget_show(hbox);
   lives_widget_set_hexpand(hbox,TRUE);
   lives_widget_set_vexpand(hbox,TRUE);
 
-  lives_container_add (LIVES_CONTAINER (mt->nb), hbox);
-  lives_notebook_set_tab_label (LIVES_NOTEBOOK(mt->nb), lives_notebook_get_nth_page (LIVES_NOTEBOOK (mt->nb), 5), label);
+  lives_container_add(LIVES_CONTAINER(mt->nb), hbox);
+  lives_notebook_set_tab_label(LIVES_NOTEBOOK(mt->nb), lives_notebook_get_nth_page(LIVES_NOTEBOOK(mt->nb), 5), label);
 #if !GTK_CHECK_VERSION(3,0,0)
   if (palette->style&STYLE_1) {
-    lives_widget_set_fg_color (label, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
+    lives_widget_set_fg_color(label, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
   }
 #endif
 
+  // add a dummy hbox to nb
+
   tname=get_tab_name(POLY_PARAMS);
-  label=lives_label_new (tname);
-  g_free(tname);
+  label=lives_label_new(tname);
+  lives_free(tname);
 
-  hbox = lives_hbox_new (FALSE, 0);
+  hbox = lives_hbox_new(FALSE, 0);
   lives_widget_show(hbox);
   lives_widget_set_hexpand(hbox,TRUE);
   lives_widget_set_vexpand(hbox,TRUE);
 
 
-  lives_container_add (LIVES_CONTAINER (mt->nb), hbox);
-  lives_notebook_set_tab_label (LIVES_NOTEBOOK(mt->nb), lives_notebook_get_nth_page (LIVES_NOTEBOOK (mt->nb), 6), label);
+  lives_container_add(LIVES_CONTAINER(mt->nb), hbox);
+  lives_notebook_set_tab_label(LIVES_NOTEBOOK(mt->nb), lives_notebook_get_nth_page(LIVES_NOTEBOOK(mt->nb), 6), label);
 #if !GTK_CHECK_VERSION(3,0,0)
   if (palette->style&STYLE_1) {
-    lives_widget_set_fg_color (label, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
+    lives_widget_set_fg_color(label, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
   }
 #endif
 
@@ -8274,7 +8473,7 @@
 
   // params contents
 
-  mt->fx_base_box = lives_vbox_new (FALSE, 0);
+  mt->fx_base_box = lives_vbox_new(FALSE, 0);
   lives_object_ref(mt->fx_base_box);
 
   if (palette->style&STYLE_1) {
@@ -8289,134 +8488,136 @@
   add_hsep_to_box(LIVES_BOX(mt->fx_contents_box));
   widget_opts.packing_height=dph;
 
-  lives_box_pack_end (LIVES_BOX (mt->fx_base_box), mt->fx_contents_box, FALSE, FALSE, 0);
+  lives_box_pack_end(LIVES_BOX(mt->fx_base_box), mt->fx_contents_box, FALSE, FALSE, 0);
 
   hbox=lives_hbox_new(FALSE,widget_opts.packing_width);
-  lives_box_pack_end (LIVES_BOX (mt->fx_contents_box), hbox, FALSE, FALSE, 0);
+  lives_box_pack_end(LIVES_BOX(mt->fx_contents_box), hbox, FALSE, FALSE, 0);
 
-  mt->apply_fx_button = lives_button_new_with_mnemonic (_("_Apply"));
-  lives_box_pack_start (LIVES_BOX (hbox), mt->apply_fx_button, FALSE, FALSE, 0);
-  
-  lives_signal_connect (LIVES_GUI_OBJECT (mt->apply_fx_button), LIVES_WIDGET_CLICKED_EVENT,
-		    LIVES_GUI_CALLBACK (on_set_pvals_clicked),
-		    (gpointer)mt);
-  
+  mt->apply_fx_button = lives_button_new_with_mnemonic(_("_Apply"));
+  lives_box_pack_start(LIVES_BOX(hbox), mt->apply_fx_button, FALSE, FALSE, 0);
 
-  mt->node_adj = (LiVESObject *)lives_adjustment_new (0., 0., 0., 1./mt->fps, 10./mt->fps, 0.);
+  lives_signal_connect(LIVES_GUI_OBJECT(mt->apply_fx_button), LIVES_WIDGET_CLICKED_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_set_pvals_clicked),
+                       (livespointer)mt);
+
+
+  mt->node_adj = (LiVESObject *)lives_adjustment_new(0., 0., 0., 1./mt->fps, 10./mt->fps, 0.);
 
   mt->node_scale=lives_hscale_new(LIVES_ADJUSTMENT(mt->node_adj));
-  gtk_scale_set_draw_value(GTK_SCALE(mt->node_scale),FALSE);
-  mt->node_spinbutton = lives_spin_button_new (LIVES_ADJUSTMENT (mt->node_adj), 0, 3);
+  lives_scale_set_draw_value(LIVES_SCALE(mt->node_scale),FALSE);
+  mt->node_spinbutton = lives_spin_button_new(LIVES_ADJUSTMENT(mt->node_adj), 0, 3);
+
+  lives_signal_connect_after(LIVES_GUI_OBJECT(mt->node_spinbutton), LIVES_WIDGET_VALUE_CHANGED_SIGNAL,
+                             LIVES_GUI_CALLBACK(on_node_spin_value_changed),
+                             (livespointer)mt);
 
-  lives_signal_connect_after (LIVES_GUI_OBJECT (mt->node_spinbutton), "value_changed",
-			  LIVES_GUI_CALLBACK (on_node_spin_value_changed),
-			  (gpointer)mt);
-  
 
-  lives_widget_show (mt->node_spinbutton);
-  lives_box_pack_start (LIVES_BOX (hbox), mt->node_spinbutton, FALSE, TRUE, 0);
+  lives_widget_show(mt->node_spinbutton);
+  lives_box_pack_start(LIVES_BOX(hbox), mt->node_spinbutton, FALSE, TRUE, 0);
 
   label=lives_standard_label_new(_("Time"));
-  lives_box_pack_start (LIVES_BOX (hbox), label, FALSE, TRUE, 0);
+  lives_box_pack_start(LIVES_BOX(hbox), label, FALSE, TRUE, 0);
 
   lives_widget_show(mt->node_scale);
   lives_widget_show(hbox);
-  lives_box_pack_start (LIVES_BOX (hbox), mt->node_scale, TRUE, TRUE, widget_opts.packing_width);
-  
+  lives_box_pack_start(LIVES_BOX(hbox), mt->node_scale, TRUE, TRUE, widget_opts.packing_width);
+
 
   hbox=lives_hbox_new(FALSE,widget_opts.packing_width);
-  lives_box_pack_end (LIVES_BOX (mt->fx_contents_box), hbox, FALSE, FALSE, 0);
+  lives_box_pack_end(LIVES_BOX(mt->fx_contents_box), hbox, FALSE, FALSE, 0);
 
   mt->fx_params_label=lives_standard_label_new("");
-  lives_box_pack_start (LIVES_BOX (hbox), mt->fx_params_label, TRUE, TRUE, widget_opts.packing_width);
+  lives_box_pack_start(LIVES_BOX(hbox), mt->fx_params_label, TRUE, TRUE, widget_opts.packing_width);
 
-  mt->del_node_button = lives_button_new_with_mnemonic (_("_Del. node"));
-  lives_box_pack_end (LIVES_BOX (hbox), mt->del_node_button, FALSE, FALSE, 0);
+  mt->del_node_button = lives_button_new_with_mnemonic(_("_Del. node"));
+  lives_box_pack_end(LIVES_BOX(hbox), mt->del_node_button, FALSE, FALSE, 0);
   lives_widget_set_sensitive(mt->del_node_button,FALSE);
-  
-  lives_signal_connect (LIVES_GUI_OBJECT (mt->del_node_button), LIVES_WIDGET_CLICKED_EVENT,
-		    LIVES_GUI_CALLBACK (on_del_node_clicked),
-		    (gpointer)mt);
-  
-  mt->next_node_button = lives_button_new_with_mnemonic (_("_Next node"));
-  lives_box_pack_end (LIVES_BOX (hbox), mt->next_node_button, FALSE, FALSE, 0);
+
+  lives_signal_connect(LIVES_GUI_OBJECT(mt->del_node_button), LIVES_WIDGET_CLICKED_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_del_node_clicked),
+                       (livespointer)mt);
+
+  mt->next_node_button = lives_button_new_with_mnemonic(_("_Next node"));
+  lives_box_pack_end(LIVES_BOX(hbox), mt->next_node_button, FALSE, FALSE, 0);
   lives_widget_set_sensitive(mt->next_node_button,FALSE);
 
-  lives_signal_connect (LIVES_GUI_OBJECT (mt->next_node_button), LIVES_WIDGET_CLICKED_EVENT,
-		    LIVES_GUI_CALLBACK (on_next_node_clicked),
-		    (gpointer)mt);
-  
-  mt->prev_node_button = lives_button_new_with_mnemonic (_("_Prev node"));
-  lives_box_pack_end (LIVES_BOX (hbox), mt->prev_node_button, FALSE, FALSE, 0);
+  lives_signal_connect(LIVES_GUI_OBJECT(mt->next_node_button), LIVES_WIDGET_CLICKED_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_next_node_clicked),
+                       (livespointer)mt);
+
+  mt->prev_node_button = lives_button_new_with_mnemonic(_("_Prev node"));
+  lives_box_pack_end(LIVES_BOX(hbox), mt->prev_node_button, FALSE, FALSE, 0);
   lives_widget_set_sensitive(mt->prev_node_button,FALSE);
-  
-  lives_signal_connect (LIVES_GUI_OBJECT (mt->prev_node_button), LIVES_WIDGET_CLICKED_EVENT,
-		    LIVES_GUI_CALLBACK (on_prev_node_clicked),
-		    (gpointer)mt);
-  
+
+  lives_signal_connect(LIVES_GUI_OBJECT(mt->prev_node_button), LIVES_WIDGET_CLICKED_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_prev_node_clicked),
+                       (livespointer)mt);
+
 
   mt->fx_label=lives_standard_label_new("");
-  lives_box_pack_end (LIVES_BOX (hbox), mt->fx_label, FALSE, FALSE, widget_opts.packing_width*2);
+  lives_box_pack_end(LIVES_BOX(hbox), mt->fx_label, FALSE, FALSE, widget_opts.packing_width*2);
 
 
   set_mt_title(mt);
 
-  mt_init_clips (mt,orig_file,FALSE);
+  mt_init_clips(mt,orig_file,FALSE);
+
+
 
   // poly audio velocity
-  mt->avel_box = lives_vbox_new (FALSE, 0);
-  lives_object_ref (mt->avel_box);
+  mt->avel_box = lives_vbox_new(FALSE, 0);
+  lives_object_ref(mt->avel_box);
 
-  hbox = lives_hbox_new (FALSE, 0);
+  hbox = lives_hbox_new(FALSE, 0);
   lives_box_pack_start(LIVES_BOX(mt->avel_box),hbox,FALSE,FALSE,widget_opts.packing_height>>1);
 
-  mt->checkbutton_avel_reverse = lives_standard_check_button_new (_("_Reverse playback  "),TRUE,LIVES_BOX(hbox),NULL);
+  mt->checkbutton_avel_reverse = lives_standard_check_button_new(_("_Reverse playback  "),TRUE,LIVES_BOX(hbox),NULL);
 
   if (palette->style&STYLE_1) {
     if (palette->style&STYLE_3) {
       lives_widget_set_bg_color(hbox, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
       lives_widget_set_fg_color(hbox, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
-    }
-    else {
+    } else {
       lives_widget_set_bg_color(hbox, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
       lives_widget_set_fg_color(hbox, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars_fore);
     }
   }
 
-  mt->check_avel_rev_func=lives_signal_connect_after (LIVES_GUI_OBJECT (mt->checkbutton_avel_reverse), LIVES_WIDGET_TOGGLED_EVENT,
-						  LIVES_GUI_CALLBACK (avel_reverse_toggled),
-						  mt);
+  mt->check_avel_rev_func=lives_signal_connect_after(LIVES_GUI_OBJECT(mt->checkbutton_avel_reverse), LIVES_WIDGET_TOGGLED_SIGNAL,
+                          LIVES_GUI_CALLBACK(avel_reverse_toggled),
+                          mt);
+
 
 
-  hbox = lives_hbox_new (FALSE, 8);
+  hbox = lives_hbox_new(FALSE, 8);
   lives_box_pack_start(LIVES_BOX(mt->avel_box),hbox,FALSE,FALSE,widget_opts.packing_height);
 
-  
-  mt->spinbutton_avel = lives_standard_spin_button_new (_("_Velocity  "),TRUE,1.,0.5,2.,.1,1.,2,
-							LIVES_BOX(hbox),NULL);
-
-  mt->spin_avel_func=lives_signal_connect_after (LIVES_GUI_OBJECT (mt->spinbutton_avel), "value_changed",
-					     LIVES_GUI_CALLBACK (avel_spin_changed),
-					     mt);
+
+  mt->spinbutton_avel = lives_standard_spin_button_new(_("_Velocity  "),TRUE,1.,0.5,2.,.1,1.,2,
+                        LIVES_BOX(hbox),NULL);
+
+  mt->spin_avel_func=lives_signal_connect_after(LIVES_GUI_OBJECT(mt->spinbutton_avel), LIVES_WIDGET_VALUE_CHANGED_SIGNAL,
+                     LIVES_GUI_CALLBACK(avel_spin_changed),
+                     mt);
 
   spinbutton_adj=lives_spin_button_get_adjustment(LIVES_SPIN_BUTTON(mt->spinbutton_avel));
 
 
   mt->avel_scale=lives_hscale_new(LIVES_ADJUSTMENT(spinbutton_adj));
-  lives_box_pack_start (LIVES_BOX (hbox), mt->avel_scale, TRUE, TRUE, widget_opts.packing_width);
-  gtk_scale_set_draw_value(GTK_SCALE(mt->avel_scale),FALSE);
+  lives_box_pack_start(LIVES_BOX(hbox), mt->avel_scale, TRUE, TRUE, widget_opts.packing_width);
+  lives_scale_set_draw_value(LIVES_SCALE(mt->avel_scale),FALSE);
 
   lives_widget_show_all(mt->avel_box);
 
   // poly in_out_box
-  mt->in_out_box = lives_hbox_new (FALSE, 0);
-  lives_object_ref (mt->in_out_box);
+  mt->in_out_box = lives_hbox_new(FALSE, 0);
+  lives_object_ref(mt->in_out_box);
 
   lives_widget_set_hexpand(mt->in_out_box,TRUE);
   lives_widget_set_vexpand(mt->in_out_box,TRUE);
 
 
-  vbox = lives_vbox_new (FALSE, 0);
+  vbox = lives_vbox_new(FALSE, 0);
   lives_box_pack_start(LIVES_BOX(mt->in_out_box),vbox,FALSE,TRUE,0);
 
   mt->in_image=lives_image_new();
@@ -8424,24 +8625,23 @@
   lives_widget_set_vexpand(mt->in_image,TRUE);
 
   eventbox=lives_event_box_new();
-  lives_container_add (LIVES_CONTAINER (eventbox), mt->in_image);
+  lives_container_add(LIVES_CONTAINER(eventbox), mt->in_image);
   lives_box_pack_start(LIVES_BOX(vbox),eventbox,FALSE,FALSE,0);
 
 
-  lives_signal_connect (LIVES_GUI_OBJECT (eventbox), "button_press_event",
-		    LIVES_GUI_CALLBACK (in_out_ebox_pressed),
-		    (gpointer)mt);
-  lives_signal_connect (LIVES_GUI_OBJECT (eventbox), "button_release_event",
-		    LIVES_GUI_CALLBACK (on_drag_clip_end),
-		    (gpointer)mt);
+  lives_signal_connect(LIVES_GUI_OBJECT(eventbox), LIVES_WIDGET_BUTTON_PRESS_EVENT,
+                       LIVES_GUI_CALLBACK(in_out_ebox_pressed),
+                       (livespointer)mt);
+  lives_signal_connect(LIVES_GUI_OBJECT(eventbox), LIVES_WIDGET_BUTTON_RELEASE_EVENT,
+                       LIVES_GUI_CALLBACK(on_drag_clip_end),
+                       (livespointer)mt);
 
   if (palette->style&STYLE_1) {
     lives_widget_set_fg_color(eventbox, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
     if (palette->style&STYLE_3) {
       lives_widget_set_bg_color(eventbox, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
       lives_widget_set_fg_color(eventbox, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
-    }
-    else {
+    } else {
       lives_widget_set_bg_color(eventbox, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
       lives_widget_set_fg_color(eventbox, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars_fore);
     }
@@ -8452,40 +8652,36 @@
 
   add_fill_to_box(LIVES_BOX(hbox));
 
-  mt->in_hbox = lives_hbox_new (FALSE, 0);
+  mt->in_hbox = lives_hbox_new(FALSE, 0);
   lives_box_pack_start(LIVES_BOX(hbox),mt->in_hbox,TRUE,TRUE,0);
- 
+
   dpw=widget_opts.packing_width;
   widget_opts.packing_width=0;
-  mt->spinbutton_in = lives_standard_spin_button_new (NULL,FALSE,0.,0.,0.,1./mt->fps,1.,2,
-						      LIVES_BOX(mt->in_hbox),NULL);
+  mt->spinbutton_in = lives_standard_spin_button_new(NULL,FALSE,0.,0.,1000000.,1./mt->fps,1.,2,
+                      LIVES_BOX(mt->in_hbox),NULL);
   widget_opts.packing_width=dpw;
 
-  mt->checkbutton_start_anchored = lives_standard_check_button_new ((tmp=g_strdup(_("Anchor _start"))),TRUE,LIVES_BOX(mt->in_hbox),
-								    (tmp2=g_strdup(_("Anchor the start point to the timeline"))));
+  mt->checkbutton_start_anchored = lives_standard_check_button_new((tmp=lives_strdup(_("Anchor _start"))),TRUE,LIVES_BOX(mt->in_hbox),
+                                   (tmp2=lives_strdup(_("Anchor the start point to the timeline"))));
 
 
-  g_free(tmp); g_free(tmp2);
+  lives_free(tmp);
+  lives_free(tmp2);
 
   add_fill_to_box(LIVES_BOX(hbox));
-  
-  mt->spin_in_func=lives_signal_connect_after (LIVES_GUI_OBJECT (mt->spinbutton_in), "value_changed",
-					   LIVES_GUI_CALLBACK (in_out_start_changed),
-					   mt);
-
-  mt->check_start_func=lives_signal_connect_after (LIVES_GUI_OBJECT (mt->checkbutton_start_anchored), LIVES_WIDGET_TOGGLED_EVENT,
-					    LIVES_GUI_CALLBACK (in_anchor_toggled),
-					    mt);
-
 
-  mt->start_in_label=lives_standard_label_new(_("Start frame"));
-  lives_box_pack_start (LIVES_BOX (mt->in_hbox), mt->start_in_label, FALSE, FALSE, widget_opts.packing_width);
+  mt->spin_in_func=lives_signal_connect_after(LIVES_GUI_OBJECT(mt->spinbutton_in), LIVES_WIDGET_VALUE_CHANGED_SIGNAL,
+                   LIVES_GUI_CALLBACK(in_out_start_changed),
+                   mt);
 
+  mt->check_start_func=lives_signal_connect_after(LIVES_GUI_OBJECT(mt->checkbutton_start_anchored), LIVES_WIDGET_TOGGLED_SIGNAL,
+                       LIVES_GUI_CALLBACK(in_anchor_toggled),
+                       mt);
 
 
 
 
-  vbox = lives_vbox_new (FALSE, 0);
+  vbox = lives_vbox_new(FALSE, 0);
 
   lives_box_pack_end(LIVES_BOX(mt->in_out_box),vbox,FALSE,TRUE,0);
 
@@ -8494,23 +8690,22 @@
   lives_widget_set_vexpand(mt->out_image,TRUE);
 
   eventbox=lives_event_box_new();
-  lives_container_add (LIVES_CONTAINER (eventbox), mt->out_image);
+  lives_container_add(LIVES_CONTAINER(eventbox), mt->out_image);
   lives_box_pack_start(LIVES_BOX(vbox),eventbox,FALSE,FALSE,0);
 
-  lives_signal_connect (LIVES_GUI_OBJECT (eventbox), "button_press_event",
-		    LIVES_GUI_CALLBACK (in_out_ebox_pressed),
-		    (gpointer)mt);
-  lives_signal_connect (LIVES_GUI_OBJECT (eventbox), "button_release_event",
-		    LIVES_GUI_CALLBACK (on_drag_clip_end),
-		    (gpointer)mt);
+  lives_signal_connect(LIVES_GUI_OBJECT(eventbox), LIVES_WIDGET_BUTTON_PRESS_EVENT,
+                       LIVES_GUI_CALLBACK(in_out_ebox_pressed),
+                       (livespointer)mt);
+  lives_signal_connect(LIVES_GUI_OBJECT(eventbox), LIVES_WIDGET_BUTTON_RELEASE_EVENT,
+                       LIVES_GUI_CALLBACK(on_drag_clip_end),
+                       (livespointer)mt);
 
   if (palette->style&STYLE_1) {
     lives_widget_set_fg_color(eventbox, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
     if (palette->style&STYLE_3) {
       lives_widget_set_bg_color(eventbox, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
       lives_widget_set_fg_color(eventbox, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
-    }
-    else {
+    } else {
       lives_widget_set_bg_color(eventbox, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
       lives_widget_set_fg_color(eventbox, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars_fore);
     }
@@ -8521,40 +8716,39 @@
 
   add_fill_to_box(LIVES_BOX(hbox));
 
-  mt->out_hbox = lives_hbox_new (FALSE, 0);
+  mt->out_hbox = lives_hbox_new(FALSE, 0);
   lives_box_pack_start(LIVES_BOX(hbox),mt->out_hbox,TRUE,TRUE,0);
 
   dpw=widget_opts.packing_width;
   widget_opts.packing_width=0;
-  mt->spinbutton_out = lives_standard_spin_button_new (NULL,FALSE,0.,0.,0.,1./mt->fps,1.,2,
-						       LIVES_BOX(mt->out_hbox),NULL);
+  mt->spinbutton_out = lives_standard_spin_button_new(NULL,FALSE,0.,0.,1000000.,1./mt->fps,1.,2,
+                       LIVES_BOX(mt->out_hbox),NULL);
   widget_opts.packing_width=dpw;
 
-  mt->checkbutton_end_anchored = lives_standard_check_button_new ((tmp=g_strdup(_("Anchor _end"))),TRUE,LIVES_BOX(mt->out_hbox),
-								  (tmp2=g_strdup(_("Anchor the end point to the timeline"))));
+  mt->checkbutton_end_anchored = lives_standard_check_button_new((tmp=lives_strdup(_("Anchor _end"))),TRUE,LIVES_BOX(mt->out_hbox),
+                                 (tmp2=lives_strdup(_("Anchor the end point to the timeline"))));
 
-  g_free(tmp); g_free(tmp2);
+  lives_free(tmp);
+  lives_free(tmp2);
 
-  mt->spin_out_func=lives_signal_connect_after (LIVES_GUI_OBJECT (mt->spinbutton_out), "value_changed",
-					    LIVES_GUI_CALLBACK (in_out_end_changed),
-					    mt);
+  mt->spin_out_func=lives_signal_connect_after(LIVES_GUI_OBJECT(mt->spinbutton_out), LIVES_WIDGET_VALUE_CHANGED_SIGNAL,
+                    LIVES_GUI_CALLBACK(in_out_end_changed),
+                    mt);
 
-  mt->check_end_func=lives_signal_connect_after (LIVES_GUI_OBJECT (mt->checkbutton_end_anchored), LIVES_WIDGET_TOGGLED_EVENT,
-					     LIVES_GUI_CALLBACK (out_anchor_toggled),
-					     mt);
+  mt->check_end_func=lives_signal_connect_after(LIVES_GUI_OBJECT(mt->checkbutton_end_anchored), LIVES_WIDGET_TOGGLED_SIGNAL,
+                     LIVES_GUI_CALLBACK(out_anchor_toggled),
+                     mt);
 
-  mt->end_out_label=lives_standard_label_new(_("End frame"));
-  lives_box_pack_start (LIVES_BOX (mt->out_hbox), mt->end_out_label, FALSE, FALSE, widget_opts.packing_width);
 
-  lives_signal_handler_block (mt->spinbutton_in,mt->spin_in_func);
-  lives_signal_handler_block (mt->spinbutton_out,mt->spin_out_func);
+  lives_signal_handler_block(mt->spinbutton_in,mt->spin_in_func);
+  lives_signal_handler_block(mt->spinbutton_out,mt->spin_out_func);
 
   lives_widget_show_all(mt->in_out_box);
   lives_widget_show_all(mt->nb);
 
-  lives_signal_connect (LIVES_GUI_OBJECT (mt->nb), "switch_page",
-		    LIVES_GUI_CALLBACK (notebook_page),
-		    (gpointer)mt);
+  lives_signal_connect(LIVES_GUI_OBJECT(mt->nb), LIVES_WIDGET_SWITCH_PAGE_SIGNAL,
+                       LIVES_GUI_CALLBACK(notebook_page),
+                       (livespointer)mt);
 
 
 
@@ -8565,12 +8759,12 @@
   mt->poly_state=POLY_NONE;
   polymorph(mt,POLY_CLIPS);
 
-  mt->context_frame = lives_frame_new (_("Info"));
-  lives_widget_set_bg_color (mt->context_frame, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
-  lives_widget_set_fg_color (mt->context_frame, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
-  lives_widget_set_fg_color (lives_frame_get_label_widget(LIVES_FRAME(mt->context_frame)), LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
+  mt->context_frame = lives_frame_new(_("Info"));
+  lives_widget_set_bg_color(mt->context_frame, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+  lives_widget_set_fg_color(mt->context_frame, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
+  lives_widget_set_fg_color(lives_frame_get_label_widget(LIVES_FRAME(mt->context_frame)), LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
 
-  gtk_paned_pack2 (GTK_PANED (mt->hpaned), mt->context_frame, TRUE, TRUE);
+  lives_paned_pack(2, LIVES_PANED(mt->hpaned), mt->context_frame, TRUE, TRUE);
 
   mt->context_scroll=NULL;
 
@@ -8578,24 +8772,23 @@
 
   if (mainw->imsep==NULL) {
     mt->sep_image=NULL;
-    hseparator = lives_hseparator_new ();
-    lives_box_pack_start (LIVES_BOX (mt->top_vbox), hseparator, FALSE, FALSE, 2);
+    hseparator = lives_hseparator_new();
+    lives_box_pack_start(LIVES_BOX(mt->top_vbox), hseparator, FALSE, FALSE, 2);
     if (palette->style&STYLE_5) {
       lives_widget_set_fg_color(hseparator, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
       lives_widget_set_bg_color(hseparator, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
     }
-  }
-  else {
-    hseparator = lives_hseparator_new ();
-    lives_box_pack_start (LIVES_BOX (mt->top_vbox), hseparator, FALSE, FALSE, 0);
+  } else {
+    hseparator = lives_hseparator_new();
+    lives_box_pack_start(LIVES_BOX(mt->top_vbox), hseparator, FALSE, FALSE, 0);
     if (palette->style&STYLE_5) {
       lives_widget_set_fg_color(hseparator, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
       lives_widget_set_bg_color(hseparator, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
     }
-    mt->sep_image = lives_image_new_from_pixbuf (mainw->imsep);
-    lives_box_pack_start (LIVES_BOX (mt->top_vbox), mt->sep_image, FALSE, FALSE, 0);
-    hseparator = lives_hseparator_new ();
-    lives_box_pack_start (LIVES_BOX (mt->top_vbox), hseparator, FALSE, FALSE, 0);
+    mt->sep_image = lives_image_new_from_pixbuf(mainw->imsep);
+    lives_box_pack_start(LIVES_BOX(mt->top_vbox), mt->sep_image, FALSE, FALSE, 0);
+    hseparator = lives_hseparator_new();
+    lives_box_pack_start(LIVES_BOX(mt->top_vbox), hseparator, FALSE, FALSE, 0);
     if (palette->style&STYLE_5) {
       lives_widget_set_fg_color(hseparator, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
       lives_widget_set_bg_color(hseparator, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
@@ -8605,149 +8798,146 @@
   mt_init_start_end_spins(mt);
 
   mt->vpaned=lives_vpaned_new();
-  lives_box_pack_start (LIVES_BOX (mt->top_vbox), mt->vpaned, TRUE, TRUE, 0);
+  lives_box_pack_start(LIVES_BOX(mt->top_vbox), mt->vpaned, TRUE, TRUE, 0);
 
   if (palette->style&STYLE_1) {
     if (palette->style&STYLE_3) {
       lives_widget_set_bg_color(mt->vpaned, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
       lives_widget_set_fg_color(mt->vpaned, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
-    }
-    else {
+    } else {
       lives_widget_set_bg_color(mt->vpaned, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
       lives_widget_set_fg_color(mt->vpaned, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars_fore);
     }
   }
 
-  lives_signal_connect (LIVES_GUI_OBJECT (mt->vpaned), "accept_position",
-		    LIVES_GUI_CALLBACK (paned_pos),
-		    (gpointer)mt);
+  lives_signal_connect(LIVES_GUI_OBJECT(mt->vpaned), LIVES_WIDGET_ACCEPT_POSITION_SIGNAL,
+                       LIVES_GUI_CALLBACK(paned_pos),
+                       (livespointer)mt);
 
-  tl_vbox = lives_vbox_new (FALSE, 0);
-  lives_container_set_border_width (LIVES_CONTAINER (tl_vbox), 0);
+  tl_vbox = lives_vbox_new(FALSE, 0);
+  lives_container_set_border_width(LIVES_CONTAINER(tl_vbox), 0);
 
-  lives_container_add (LIVES_CONTAINER (mt->vpaned), tl_vbox);
+  lives_container_add(LIVES_CONTAINER(mt->vpaned), tl_vbox);
 
 
-  mt->timeline_table_header = lives_table_new (2, 40, TRUE);
+  mt->timeline_table_header = lives_table_new(2, 40, TRUE);
   lives_table_set_row_spacings(LIVES_TABLE(mt->timeline_table_header),0);
 
   eventbox=lives_event_box_new();
-  lives_box_pack_start (LIVES_BOX (tl_vbox), eventbox, FALSE, FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(tl_vbox), eventbox, FALSE, FALSE, 0);
 
   if (palette->style&STYLE_1) {
     if (palette->style&STYLE_3) {
       lives_widget_set_bg_color(eventbox, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
       lives_widget_set_fg_color(eventbox, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
-    }
-    else {
+    } else {
       lives_widget_set_bg_color(eventbox, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
       lives_widget_set_fg_color(eventbox, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars_fore);
     }
   }
 
-  lives_signal_connect (LIVES_GUI_OBJECT (eventbox), "button_press_event",
-		    LIVES_GUI_CALLBACK (on_track_header_click),
-		    (gpointer)mt);
-
-  lives_signal_connect (LIVES_GUI_OBJECT (eventbox), "button_release_event",
-		    LIVES_GUI_CALLBACK (on_track_header_release),
-		    (gpointer)mt);
-
-  lives_widget_add_events (eventbox, LIVES_BUTTON1_MOTION_MASK | LIVES_BUTTON_RELEASE_MASK | LIVES_BUTTON_PRESS_MASK);
-  mt->mouse_mot1=lives_signal_connect (LIVES_GUI_OBJECT (eventbox), "motion_notify_event",
-				   LIVES_GUI_CALLBACK (on_track_header_move),
-				   (gpointer)mt);
-  lives_signal_handler_block (eventbox,mt->mouse_mot1);
+  lives_signal_connect(LIVES_GUI_OBJECT(eventbox), LIVES_WIDGET_BUTTON_PRESS_EVENT,
+                       LIVES_GUI_CALLBACK(on_track_header_click),
+                       (livespointer)mt);
+
+  lives_signal_connect(LIVES_GUI_OBJECT(eventbox), LIVES_WIDGET_BUTTON_RELEASE_EVENT,
+                       LIVES_GUI_CALLBACK(on_track_header_release),
+                       (livespointer)mt);
+
+  lives_widget_add_events(eventbox, LIVES_BUTTON1_MOTION_MASK | LIVES_BUTTON_RELEASE_MASK | LIVES_BUTTON_PRESS_MASK);
+  mt->mouse_mot1=lives_signal_connect(LIVES_GUI_OBJECT(eventbox), LIVES_WIDGET_MOTION_NOTIFY_EVENT,
+                                      LIVES_GUI_CALLBACK(on_track_header_move),
+                                      (livespointer)mt);
+  lives_signal_handler_block(eventbox,mt->mouse_mot1);
 
-  hbox = lives_hbox_new (FALSE, 0);
-  lives_container_add (LIVES_CONTAINER (eventbox), hbox);
+  hbox = lives_hbox_new(FALSE, 0);
+  lives_container_add(LIVES_CONTAINER(eventbox), hbox);
 
-  vadjustment = (LiVESObject *)lives_adjustment_new (1.0,1.0,1.0,1.0,1.0,1.0);
+  vadjustment = (LiVESObject *)lives_adjustment_new(1.0,1.0,1.0,1.0,1.0,1.0);
   scrollbar=lives_vscrollbar_new(LIVES_ADJUSTMENT(vadjustment));
   lives_widget_set_sensitive(scrollbar,FALSE);
 
-  lives_box_pack_start (LIVES_BOX (hbox), mt->timeline_table_header, TRUE, TRUE, 0);
-  lives_box_pack_end (LIVES_BOX (hbox), scrollbar, FALSE, FALSE, widget_opts.packing_width);
+  lives_box_pack_start(LIVES_BOX(hbox), mt->timeline_table_header, TRUE, TRUE, 0);
+  lives_box_pack_end(LIVES_BOX(hbox), scrollbar, FALSE, FALSE, widget_opts.packing_width);
+
+  mt->tl_hbox = lives_hbox_new(FALSE, 0);
+  lives_container_set_border_width(LIVES_CONTAINER(mt->tl_hbox), 0);
 
-  mt->tl_hbox = lives_hbox_new (FALSE, 0);
-  lives_container_set_border_width (LIVES_CONTAINER (mt->tl_hbox), 0);
-    
-  lives_box_pack_start (LIVES_BOX (tl_vbox), mt->tl_hbox, TRUE, TRUE, 0);
+  lives_box_pack_start(LIVES_BOX(tl_vbox), mt->tl_hbox, TRUE, TRUE, 0);
 
-  mt->vadjustment = (LiVESObject *)lives_adjustment_new (0.0,0.0,1.0,1.0,mt->max_disp_vtracks,1.0);
+  mt->vadjustment = (LiVESObject *)lives_adjustment_new(0.0,0.0,1.0,1.0,mt->max_disp_vtracks,1.0);
   mt->scrollbar=lives_vscrollbar_new(LIVES_ADJUSTMENT(mt->vadjustment));
 
-  lives_signal_connect_after (LIVES_GUI_OBJECT (mt->scrollbar), "value_changed",
-			  LIVES_GUI_CALLBACK (scroll_track_by_scrollbar),
-			  (gpointer)mt);
+  lives_signal_connect_after(LIVES_GUI_OBJECT(mt->scrollbar), LIVES_WIDGET_VALUE_CHANGED_SIGNAL,
+                             LIVES_GUI_CALLBACK(scroll_track_by_scrollbar),
+                             (livespointer)mt);
 
   mt->tl_eventbox=lives_event_box_new();
-  lives_box_pack_start (LIVES_BOX (mt->tl_hbox), mt->tl_eventbox, TRUE, TRUE, 0);
+  lives_box_pack_start(LIVES_BOX(mt->tl_hbox), mt->tl_eventbox, TRUE, TRUE, 0);
 
   if (palette->style&STYLE_1) {
     if (palette->style&STYLE_3) {
       lives_widget_set_bg_color(mt->tl_eventbox, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
       lives_widget_set_fg_color(mt->tl_eventbox, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
-    }
-    else {
+    } else {
       lives_widget_set_bg_color(mt->tl_eventbox, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
       lives_widget_set_fg_color(mt->tl_eventbox, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars_fore);
     }
   }
 
-  lives_signal_connect (LIVES_GUI_OBJECT (mt->tl_eventbox), "button_press_event",
-		    LIVES_GUI_CALLBACK (on_track_between_click),
-		    (gpointer)mt);
+  lives_signal_connect(LIVES_GUI_OBJECT(mt->tl_eventbox), LIVES_WIDGET_BUTTON_PRESS_EVENT,
+                       LIVES_GUI_CALLBACK(on_track_between_click),
+                       (livespointer)mt);
 
-  lives_signal_connect (LIVES_GUI_OBJECT (mt->tl_eventbox), "button_release_event",
-		    LIVES_GUI_CALLBACK (on_track_between_release),
-		    (gpointer)mt);
+  lives_signal_connect(LIVES_GUI_OBJECT(mt->tl_eventbox), LIVES_WIDGET_BUTTON_RELEASE_EVENT,
+                       LIVES_GUI_CALLBACK(on_track_between_release),
+                       (livespointer)mt);
 
 
-  lives_widget_add_events (mt->tl_eventbox, LIVES_BUTTON1_MOTION_MASK | LIVES_BUTTON_RELEASE_MASK | LIVES_BUTTON_PRESS_MASK| LIVES_SCROLL_MASK);
-  mt->mouse_mot2=lives_signal_connect (LIVES_GUI_OBJECT (mt->tl_eventbox), "motion_notify_event",
-				  LIVES_GUI_CALLBACK (on_track_move),
-				  (gpointer)mt);
+  lives_widget_add_events(mt->tl_eventbox, LIVES_BUTTON1_MOTION_MASK | LIVES_BUTTON_RELEASE_MASK | LIVES_BUTTON_PRESS_MASK|
+                          LIVES_SCROLL_MASK);
+  mt->mouse_mot2=lives_signal_connect(LIVES_GUI_OBJECT(mt->tl_eventbox), LIVES_WIDGET_MOTION_NOTIFY_EVENT,
+                                      LIVES_GUI_CALLBACK(on_track_move),
+                                      (livespointer)mt);
 
-  lives_signal_handler_block (mt->tl_eventbox,mt->mouse_mot2);
+  lives_signal_handler_block(mt->tl_eventbox,mt->mouse_mot2);
 
 
-  lives_signal_connect (LIVES_GUI_OBJECT (mt->tl_eventbox), LIVES_WIDGET_SCROLL_EVENT,
-		    LIVES_GUI_CALLBACK (on_mt_timeline_scroll),
-		    (gpointer)mt);
+  lives_signal_connect(LIVES_GUI_OBJECT(mt->tl_eventbox), LIVES_WIDGET_SCROLL_EVENT,
+                       LIVES_GUI_CALLBACK(on_mt_timeline_scroll),
+                       (livespointer)mt);
 
-  lives_box_pack_end (LIVES_BOX (mt->tl_hbox), mt->scrollbar, FALSE, FALSE, widget_opts.packing_width);
+  lives_box_pack_end(LIVES_BOX(mt->tl_hbox), mt->scrollbar, FALSE, FALSE, widget_opts.packing_width);
 
 
-  eventbox = lives_event_box_new ();
+  eventbox = lives_event_box_new();
   hbox=lives_hbox_new(FALSE,0);
 
   if (palette->style&STYLE_1) {
     if (palette->style&STYLE_3) {
       lives_widget_set_bg_color(eventbox, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
       lives_widget_set_fg_color(eventbox, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
-    }
-    else {
+    } else {
       lives_widget_set_bg_color(eventbox, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
       lives_widget_set_fg_color(eventbox, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars_fore);
     }
   }
 
-  lives_box_pack_start (LIVES_BOX (tl_vbox), eventbox, FALSE, FALSE, 4.*widget_opts.scale);
-  lives_container_add (LIVES_CONTAINER (eventbox), hbox);
+  lives_box_pack_start(LIVES_BOX(tl_vbox), eventbox, FALSE, FALSE, 4.*widget_opts.scale);
+  lives_container_add(LIVES_CONTAINER(eventbox), hbox);
 
   label=lives_standard_label_new(_("Scroll"));
 
-  lives_box_pack_start (LIVES_BOX (hbox), label, FALSE, FALSE, widget_opts.packing_width);
+  lives_box_pack_start(LIVES_BOX(hbox), label, FALSE, FALSE, widget_opts.packing_width);
 
-  mt->hadjustment = (LiVESObject *)lives_adjustment_new (0.0,0.0,1.,0.25,1.,1.);
+  mt->hadjustment = (LiVESObject *)lives_adjustment_new(0.0,0.0,1.,0.25,1.,1.);
   mt->time_scrollbar=lives_hscrollbar_new(LIVES_ADJUSTMENT(mt->hadjustment));
 
-  lives_box_pack_start (LIVES_BOX (hbox), mt->time_scrollbar, TRUE, TRUE, widget_opts.packing_width);
+  lives_box_pack_start(LIVES_BOX(hbox), mt->time_scrollbar, TRUE, TRUE, widget_opts.packing_width);
 
-  lives_signal_connect (LIVES_GUI_OBJECT (mt->time_scrollbar), "value_changed",
-		    LIVES_GUI_CALLBACK (scroll_time_by_scrollbar),
-		    (gpointer)mt);
+  lives_signal_connect(LIVES_GUI_OBJECT(mt->time_scrollbar), LIVES_WIDGET_VALUE_CHANGED_SIGNAL,
+                       LIVES_GUI_CALLBACK(scroll_time_by_scrollbar),
+                       (livespointer)mt);
 
   mt->num_video_tracks=0;
 
@@ -8755,75 +8945,72 @@
   mt->timeline_eb=NULL;
 
   if (prefs->ar_layout&&mt->event_list==NULL&&!mainw->recoverable_layout) {
-    gchar *eload_file=g_build_filename(prefs->tmpdir,mainw->set_name,"layouts",prefs->ar_layout_name,NULL);
+    char *eload_file=lives_build_filename(prefs->tmpdir,mainw->set_name,"layouts",prefs->ar_layout_name,NULL);
     mt->auto_reloading=TRUE;
     set_pref("ar_layout",""); // in case we crash...
     mainw->event_list=mt->event_list=load_event_list(mt,eload_file);
     mt->auto_reloading=FALSE;
-    g_free(eload_file);
+    lives_free(eload_file);
     if (mt->event_list!=NULL) {
       mt_init_tracks(mt,TRUE);
       remove_markers(mt->event_list);
       set_pref("ar_layout",prefs->ar_layout_name);
-    }
-    else {
+    } else {
       prefs->ar_layout=FALSE;
       memset(prefs->ar_layout_name,0,1);
-      mt_init_tracks (mt,TRUE);
+      mt_init_tracks(mt,TRUE);
       mainw->unordered_blocks=FALSE;
     }
-  }
-  else if (mainw->recoverable_layout) {
+  } else if (mainw->recoverable_layout) {
     mt_load_recovery_layout(mt);
-  }
-  else {
-    mt_init_tracks (mt,TRUE);
+  } else {
+    mt_init_tracks(mt,TRUE);
     mainw->unordered_blocks=FALSE;
   }
 
   add_message_scroller(mt->vpaned);
 
-  lives_widget_set_size_request (mt->window, scr_width-widget_opts.border_width, -1);
+  lives_widget_set_size_request(mt->window, scr_width-widget_opts.border_width, -1);
 
   // add info bar
 
-  lives_window_add_accel_group (LIVES_WINDOW (mt->window), mt->accel_group);
+  lives_window_add_accel_group(LIVES_WINDOW(mt->window), mt->accel_group);
 
-  lives_signal_connect (LIVES_GUI_OBJECT (mt->window), "delete_event",
-		    LIVES_GUI_CALLBACK (on_mt_delete_event),
-		    (gpointer)mt);
-
-  lives_accel_group_connect (LIVES_ACCEL_GROUP (mt->accel_group), LIVES_KEY_Page_Up, LIVES_CONTROL_MASK, (LiVESAccelFlags)0,
-			   g_cclosure_new (LIVES_GUI_CALLBACK (mt_prevclip),mt,NULL));
-  lives_accel_group_connect (LIVES_ACCEL_GROUP (mt->accel_group), LIVES_KEY_Page_Down, LIVES_CONTROL_MASK, (LiVESAccelFlags)0, 
-			   g_cclosure_new (LIVES_GUI_CALLBACK (mt_nextclip),mt,NULL));
-
-  lives_accel_group_connect (LIVES_ACCEL_GROUP (mt->accel_group), LIVES_KEY_Left, LIVES_CONTROL_MASK, (LiVESAccelFlags)0, 
-			   g_cclosure_new (LIVES_GUI_CALLBACK (mt_tlback),mt,NULL));
-  lives_accel_group_connect (LIVES_ACCEL_GROUP (mt->accel_group), LIVES_KEY_Right, LIVES_CONTROL_MASK, (LiVESAccelFlags)0, 
-			   g_cclosure_new (LIVES_GUI_CALLBACK (mt_tlfor),mt,NULL));
-
-  lives_accel_group_connect (LIVES_ACCEL_GROUP (mt->accel_group), LIVES_KEY_Left, LIVES_SHIFT_MASK, (LiVESAccelFlags)0, 
-			   g_cclosure_new (LIVES_GUI_CALLBACK (mt_tlback_frame),mt,NULL));
-  lives_accel_group_connect (LIVES_ACCEL_GROUP (mt->accel_group), LIVES_KEY_Right, LIVES_SHIFT_MASK, (LiVESAccelFlags)0, 
-			   g_cclosure_new (LIVES_GUI_CALLBACK (mt_tlfor_frame),mt,NULL));
-
-  lives_accel_group_connect (LIVES_ACCEL_GROUP (mt->accel_group), LIVES_KEY_Up, LIVES_CONTROL_MASK, (LiVESAccelFlags)0, 
-			   g_cclosure_new (LIVES_GUI_CALLBACK (mt_trup),mt,NULL));
-  lives_accel_group_connect (LIVES_ACCEL_GROUP (mt->accel_group), LIVES_KEY_Down, LIVES_CONTROL_MASK, (LiVESAccelFlags)0, 
-			   g_cclosure_new (LIVES_GUI_CALLBACK (mt_trdown),mt,NULL));
+  lives_signal_connect(LIVES_GUI_OBJECT(mt->window), LIVES_WIDGET_DELETE_EVENT,
+                       LIVES_GUI_CALLBACK(on_mt_delete_event),
+                       (livespointer)mt);
+
+  lives_accel_group_connect(LIVES_ACCEL_GROUP(mt->accel_group), LIVES_KEY_Page_Up, LIVES_CONTROL_MASK, (LiVESAccelFlags)0,
+                            lives_cclosure_new(LIVES_GUI_CALLBACK(mt_prevclip),mt,NULL));
+  lives_accel_group_connect(LIVES_ACCEL_GROUP(mt->accel_group), LIVES_KEY_Page_Down, LIVES_CONTROL_MASK, (LiVESAccelFlags)0,
+                            lives_cclosure_new(LIVES_GUI_CALLBACK(mt_nextclip),mt,NULL));
+
+  lives_accel_group_connect(LIVES_ACCEL_GROUP(mt->accel_group), LIVES_KEY_Left, LIVES_CONTROL_MASK, (LiVESAccelFlags)0,
+                            lives_cclosure_new(LIVES_GUI_CALLBACK(mt_tlback),mt,NULL));
+  lives_accel_group_connect(LIVES_ACCEL_GROUP(mt->accel_group), LIVES_KEY_Right, LIVES_CONTROL_MASK, (LiVESAccelFlags)0,
+                            lives_cclosure_new(LIVES_GUI_CALLBACK(mt_tlfor),mt,NULL));
+
+  lives_accel_group_connect(LIVES_ACCEL_GROUP(mt->accel_group), LIVES_KEY_Left, LIVES_SHIFT_MASK, (LiVESAccelFlags)0,
+                            lives_cclosure_new(LIVES_GUI_CALLBACK(mt_tlback_frame),mt,NULL));
+  lives_accel_group_connect(LIVES_ACCEL_GROUP(mt->accel_group), LIVES_KEY_Right, LIVES_SHIFT_MASK, (LiVESAccelFlags)0,
+                            lives_cclosure_new(LIVES_GUI_CALLBACK(mt_tlfor_frame),mt,NULL));
+
+  lives_accel_group_connect(LIVES_ACCEL_GROUP(mt->accel_group), LIVES_KEY_Up, LIVES_CONTROL_MASK, (LiVESAccelFlags)0,
+                            lives_cclosure_new(LIVES_GUI_CALLBACK(mt_trup),mt,NULL));
+  lives_accel_group_connect(LIVES_ACCEL_GROUP(mt->accel_group), LIVES_KEY_Down, LIVES_CONTROL_MASK, (LiVESAccelFlags)0,
+                            lives_cclosure_new(LIVES_GUI_CALLBACK(mt_trdown),mt,NULL));
 
   mt->last_direction=DIRECTION_POSITIVE;
 
   // set check menuitems
-  if (mt->opts.mouse_mode==MOUSE_MODE_MOVE) on_mouse_mode_changed(LIVES_MENU_ITEM(mt->mm_move),(gpointer)mt);
-  else if (mt->opts.mouse_mode==MOUSE_MODE_SELECT) on_mouse_mode_changed(LIVES_MENU_ITEM(mt->mm_select),(gpointer)mt);
+  if (mt->opts.mouse_mode==MOUSE_MODE_MOVE) on_mouse_mode_changed(LIVES_MENU_ITEM(mt->mm_move),(livespointer)mt);
+  else if (mt->opts.mouse_mode==MOUSE_MODE_SELECT) on_mouse_mode_changed(LIVES_MENU_ITEM(mt->mm_select),(livespointer)mt);
 
-  if (mt->opts.insert_mode==INSERT_MODE_NORMAL) on_insert_mode_changed(LIVES_MENU_ITEM(mt->ins_normal),(gpointer)mt);
+  if (mt->opts.insert_mode==INSERT_MODE_NORMAL) on_insert_mode_changed(LIVES_MENU_ITEM(mt->ins_normal),(livespointer)mt);
 
-  if (mt->opts.grav_mode==GRAV_MODE_NORMAL) on_grav_mode_changed(LIVES_MENU_ITEM(mt->grav_normal),(gpointer)mt);
-  else if (mt->opts.grav_mode==GRAV_MODE_LEFT) on_grav_mode_changed(LIVES_MENU_ITEM(mt->grav_left),(gpointer)mt);
-  else if (mt->opts.grav_mode==GRAV_MODE_RIGHT) on_grav_mode_changed(LIVES_MENU_ITEM(mt->grav_right),(gpointer)mt);
+  if (mt->opts.grav_mode==GRAV_MODE_NORMAL) on_grav_mode_changed(LIVES_MENU_ITEM(mt->grav_normal),(livespointer)mt);
+  else if (mt->opts.grav_mode==GRAV_MODE_LEFT) on_grav_mode_changed(LIVES_MENU_ITEM(mt->grav_left),(livespointer)mt);
+  else if (mt->opts.grav_mode==GRAV_MODE_RIGHT) on_grav_mode_changed(LIVES_MENU_ITEM(mt->grav_right),(livespointer)mt);
 
 
   mt_sensitise(mt);
@@ -8839,7 +9026,7 @@
   // WARNING - does not yet delete events from event_list
   // only deletes visually
 
-  track_rect *block=(track_rect *)g_object_get_data (G_OBJECT(eventbox), "blocks"),*blocknext;
+  track_rect *block=(track_rect *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox), "blocks"),*blocknext;
 
   LiVESWidget *label,*labelbox,*arrow,*ahbox,*xeventbox;
   lives_painter_surface_t *bgimg;
@@ -8847,45 +9034,45 @@
   while (block!=NULL) {
     blocknext=block->next;
     if (mt->block_selected==block) mt->block_selected=NULL;
-    g_free(block);
+    lives_free(block);
     block=blocknext;
   }
 
-  if ((bgimg=(lives_painter_surface_t *)g_object_get_data(G_OBJECT(eventbox), "bgimg"))!=NULL) {
+  if ((bgimg=(lives_painter_surface_t *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox), "bgimg"))!=NULL) {
     lives_painter_surface_destroy(bgimg);
   }
 
-  label=(LiVESWidget *)g_object_get_data (G_OBJECT(eventbox), "label");
-  arrow=(LiVESWidget *)g_object_get_data (G_OBJECT(eventbox), "arrow");
+  label=(LiVESWidget *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox), "label");
+  arrow=(LiVESWidget *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox), "arrow");
   lives_widget_destroy(label);
   lives_widget_destroy(arrow);
-  if (GPOINTER_TO_INT(g_object_get_data(G_OBJECT(eventbox),"hidden"))==0) {
-    labelbox=(LiVESWidget *)g_object_get_data (G_OBJECT(eventbox), "labelbox");
-    ahbox=(LiVESWidget *)g_object_get_data (G_OBJECT(eventbox), "ahbox");
+  if (LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"hidden"))==0) {
+    labelbox=(LiVESWidget *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox), "labelbox");
+    ahbox=(LiVESWidget *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox), "ahbox");
     if (labelbox!=NULL) lives_widget_destroy(labelbox);
     if (ahbox!=NULL) lives_widget_destroy(ahbox);
   }
 
-  xeventbox=(LiVESWidget *)g_object_get_data(G_OBJECT(eventbox),"achan0");
+  xeventbox=(LiVESWidget *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"achan0");
   if (xeventbox!=NULL) {
-    if ((bgimg=(lives_painter_surface_t *)g_object_get_data(G_OBJECT(xeventbox), "bgimg"))!=NULL) {
+    if ((bgimg=(lives_painter_surface_t *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(xeventbox), "bgimg"))!=NULL) {
       lives_painter_surface_destroy(bgimg);
     }
-    
+
     lives_widget_destroy(xeventbox);
   }
   if (cfile->achans>1) {
-    xeventbox=(LiVESWidget *)g_object_get_data(G_OBJECT(eventbox),"achan1");
+    xeventbox=(LiVESWidget *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"achan1");
     if (xeventbox!=NULL) {
-      if ((bgimg=(lives_painter_surface_t *)g_object_get_data(G_OBJECT(xeventbox), "bgimg"))!=NULL) {
-	lives_painter_surface_destroy(bgimg);
+      if ((bgimg=(lives_painter_surface_t *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(xeventbox), "bgimg"))!=NULL) {
+        lives_painter_surface_destroy(bgimg);
       }
-      
+
       lives_widget_destroy(xeventbox);
     }
   }
 
-  g_free(g_object_get_data(G_OBJECT(eventbox),"track_name"));
+  lives_free(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"track_name"));
   lives_widget_destroy(eventbox);
 }
 
@@ -8898,8 +9085,8 @@
   weed_plant_t *event;
   int i;
 
-  used_clips=(int *)g_malloc((MAX_FILES+1)*sizint);
-  for (i=1;i<=MAX_FILES;i++) used_clips[i]=0;
+  used_clips=(int *)lives_malloc((MAX_FILES+1)*sizint);
+  for (i=1; i<=MAX_FILES; i++) used_clips[i]=0;
 
   if (event_list==NULL) return used_clips;
 
@@ -8910,14 +9097,14 @@
     if (WEED_EVENT_IS_FRAME(event)) {
       int numtracks=weed_leaf_num_elements(event,"clips");
       if (numtracks>0) {
-	int i,error;
-	int *clip_index=weed_get_int_array(event,"clips",&error);
-	int *frame_index=weed_get_int_array(event,"frames",&error);
-	for (i=0;i<numtracks;i++) {
-	  if (clip_index[i]>0&&(frame_index[i]>used_clips[clip_index[i]])) used_clips[clip_index[i]]=frame_index[i];
-	}
-	weed_free(clip_index);
-	weed_free(frame_index);
+        int i,error;
+        int *clip_index=weed_get_int_array(event,"clips",&error);
+        int *frame_index=weed_get_int_array(event,"frames",&error);
+        for (i=0; i<numtracks; i++) {
+          if (clip_index[i]>0&&(frame_index[i]>used_clips[clip_index[i]])) used_clips[clip_index[i]]=frame_index[i];
+        }
+        lives_free(clip_index);
+        lives_free(frame_index);
       }
     }
     event=get_next_event(event);
@@ -8950,67 +9137,64 @@
   weed_timecode_t tc;
   int last_aclip;
 
-  used_clips=(double *)g_malloc((MAX_FILES+1)*sizdbl);
-  for (i=1;i<=MAX_FILES;i++) used_clips[i]=0.;
+  used_clips=(double *)lives_malloc((MAX_FILES+1)*sizdbl);
+  for (i=1; i<=MAX_FILES; i++) used_clips[i]=0.;
 
   if (event_list==NULL) return used_clips;
 
   event=get_first_event(event_list);
 
-  for (i=0;i<MAX_AUDIO_TRACKS;i++) {
+  for (i=0; i<MAX_AUDIO_TRACKS; i++) {
     avel[i]=neg_avel[i]=0.;
   }
 
 
   while (event!=NULL) {
     if (WEED_EVENT_IS_FRAME(event)) {
-      if (weed_plant_has_leaf(event,"audio_clips")) {
-	int numatracks=weed_leaf_num_elements(event,"audio_clips");
-	int i,error;
-	int *aclip_index=weed_get_int_array(event,"audio_clips",&error);
-	double *aseek_index=weed_get_double_array(event,"audio_seeks",&error);
-	for (i=0;i<numatracks;i+=2) {
-	  if (aclip_index[i+1]>0) {
-	    atrack=aclip_index[i];
-	    tc=get_event_timecode(event);
-	    if (atrack>=0) {
-	      if (atrack>=MAX_AUDIO_TRACKS) {
-		LIVES_ERROR("invalid atrack");
-	      }
-	      else {
-		if (avel[atrack]!=0.) {
-		  aval=aseek[atrack]+(tc-atc[atrack])/U_SEC*avel[atrack];
-		  last_aclip=last_aclips[atrack];
-		  if (aval>used_clips[last_aclip]) used_clips[last_aclip]=aval;
-		}
-		aseek[atrack]=aseek_index[i];
-		avel[atrack]=aseek_index[i+1];
-		atc[atrack]=tc;
-		last_aclips[atrack]=aclip_index[i+1];
-	      }
-
-	    }
-	    else {
-	      atrack=-atrack;
-	      if (atrack>MAX_AUDIO_TRACKS) {
-		LIVES_ERROR("invalid back atrack");
-	      }
-	      else {
-		if (neg_avel[atrack]!=0.) {
-		  aval=neg_aseek[atrack]+(tc-neg_atc[atrack])/U_SEC*neg_avel[atrack];
-		  last_aclip=neg_last_aclips[atrack];
-		  if (aval>used_clips[last_aclip]) used_clips[last_aclip]=aval;
-		}
-		neg_aseek[atrack]=aseek_index[i];
-		neg_avel[atrack]=aseek_index[i+1];
-		neg_atc[atrack]=tc;
-		neg_last_aclips[atrack]=aclip_index[i+1];
-	      }
-	    }
-	  }
-	}
-	weed_free(aclip_index);
-	weed_free(aseek_index);
+      if (WEED_EVENT_IS_AUDIO_FRAME(event)) {
+        int numatracks=weed_leaf_num_elements(event,"audio_clips");
+        int i,error;
+        int *aclip_index=weed_get_int_array(event,"audio_clips",&error);
+        double *aseek_index=weed_get_double_array(event,"audio_seeks",&error);
+        for (i=0; i<numatracks; i+=2) {
+          if (aclip_index[i+1]>0) {
+            atrack=aclip_index[i];
+            tc=get_event_timecode(event);
+            if (atrack>=0) {
+              if (atrack>=MAX_AUDIO_TRACKS) {
+                LIVES_ERROR("invalid atrack");
+              } else {
+                if (avel[atrack]!=0.) {
+                  aval=aseek[atrack]+(tc-atc[atrack])/U_SEC*avel[atrack];
+                  last_aclip=last_aclips[atrack];
+                  if (aval>used_clips[last_aclip]) used_clips[last_aclip]=aval;
+                }
+                aseek[atrack]=aseek_index[i];
+                avel[atrack]=aseek_index[i+1];
+                atc[atrack]=tc;
+                last_aclips[atrack]=aclip_index[i+1];
+              }
+
+            } else {
+              atrack=-atrack;
+              if (atrack>MAX_AUDIO_TRACKS) {
+                LIVES_ERROR("invalid back atrack");
+              } else {
+                if (neg_avel[atrack]!=0.) {
+                  aval=neg_aseek[atrack]+(tc-neg_atc[atrack])/U_SEC*neg_avel[atrack];
+                  last_aclip=neg_last_aclips[atrack];
+                  if (aval>used_clips[last_aclip]) used_clips[last_aclip]=aval;
+                }
+                neg_aseek[atrack]=aseek_index[i];
+                neg_avel[atrack]=aseek_index[i+1];
+                neg_atc[atrack]=tc;
+                neg_last_aclips[atrack]=aclip_index[i+1];
+              }
+            }
+          }
+        }
+        lives_free(aclip_index);
+        lives_free(aseek_index);
       }
     }
     event=get_next_event(event);
@@ -9019,7 +9203,7 @@
   return used_clips;
 }
 
- 
+
 
 boolean used_in_current_layout(lives_mt *mt, int file) {
   // see if <file> is used in current layout
@@ -9034,11 +9218,11 @@
   if (mt!=NULL&&mt->event_list!=NULL) {
     layout_map=update_layout_map(mt->event_list);
     layout_map_audio=update_layout_map_audio(mt->event_list);
-    
+
     if (layout_map[file]>0||layout_map_audio[file]>0.) retval=TRUE;
-    
-    if (layout_map!=NULL) g_free(layout_map);
-    if (layout_map_audio!=NULL) g_free(layout_map_audio);
+
+    if (layout_map!=NULL) lives_free(layout_map);
+    if (layout_map_audio!=NULL) lives_free(layout_map_audio);
   }
 
   return retval;
@@ -9050,12 +9234,12 @@
 
 
 
-boolean multitrack_delete (lives_mt *mt, boolean save_layout) {
+boolean multitrack_delete(lives_mt *mt, boolean save_layout) {
   // free lives_mt struct
   int *layout_map;
   double *layout_map_audio=NULL;
 #ifdef ENABLE_OSC
-  gchar *tmp;
+  char *tmp;
 #endif
 
   boolean transfer_focus=FALSE;
@@ -9067,7 +9251,7 @@
 
   if (mt->idlefunc>0) {
     needs_idlefunc=TRUE;
-    g_source_remove(mt->idlefunc);
+    lives_source_remove(mt->idlefunc);
     mt->idlefunc=0;
   }
 
@@ -9083,8 +9267,7 @@
       return FALSE;
     }
     mt->file_selected=file_selected; // because init_clips will reset this
-  }
-  else {
+  } else {
     if (mt->event_list!=NULL) {
       save_event_list_inner(mt,-1,mt->event_list,NULL); // set width, height, fps etc.
       add_markers(mt,mt->event_list);
@@ -9103,24 +9286,24 @@
       mt->undo_mem=NULL;
 
       // update layout maps (kind of) with the stored_event_list
-      
+
       layout_map=update_layout_map(mainw->stored_event_list);
       layout_map_audio=update_layout_map_audio(mainw->stored_event_list);
-      
-      for (i=1;i<MAX_FILES;i++) {
-	if (mainw->files[i]!=NULL&&(layout_map[i]!=0||(layout_map_audio!=NULL&&layout_map_audio[i]!=0.))) {
-	  mainw->files[i]->stored_layout_frame=layout_map[i];
-	  if (layout_map_audio!=NULL) 
-	    mainw->files[i]->stored_layout_audio=layout_map_audio[i];
-	  else
-	    mainw->files[i]->stored_layout_audio=0.;
-	  mainw->files[i]->stored_layout_fps=mainw->files[i]->fps;
-	  mainw->files[i]->stored_layout_idx=i;
-	}
+
+      for (i=1; i<MAX_FILES; i++) {
+        if (mainw->files[i]!=NULL&&(layout_map[i]!=0||(layout_map_audio!=NULL&&layout_map_audio[i]!=0.))) {
+          mainw->files[i]->stored_layout_frame=layout_map[i];
+          if (layout_map_audio!=NULL)
+            mainw->files[i]->stored_layout_audio=layout_map_audio[i];
+          else
+            mainw->files[i]->stored_layout_audio=0.;
+          mainw->files[i]->stored_layout_fps=mainw->files[i]->fps;
+          mainw->files[i]->stored_layout_idx=i;
+        }
       }
 
-      if (layout_map!=NULL) g_free(layout_map);
-      if (layout_map_audio!=NULL) g_free(layout_map_audio);
+      if (layout_map!=NULL) lives_free(layout_map);
+      if (layout_map_audio!=NULL) lives_free(layout_map_audio);
     }
   }
 
@@ -9142,46 +9325,49 @@
   mainw->multi_opts.follow_playback=mt->opts.follow_playback;
   mainw->multi_opts.autocross_audio=mt->opts.autocross_audio;
 
+  mainw->multi_opts.render_audp=mt->opts.render_audp;
+  mainw->multi_opts.normalise_audp=mt->opts.normalise_audp;
+
   if (mt->poly_state==POLY_PARAMS) polymorph(mt,POLY_CLIPS);
 
-  if (mt->undo_mem!=NULL) g_free(mt->undo_mem);
+  if (mt->undo_mem!=NULL) lives_free(mt->undo_mem);
   mt->undo_mem=NULL;
-  if (mt->undos!=NULL) g_list_free(mt->undos);
+  if (mt->undos!=NULL) lives_list_free(mt->undos);
 
-  if (mt->selected_tracks!=NULL) g_list_free(mt->selected_tracks);
+  if (mt->selected_tracks!=NULL) lives_list_free(mt->selected_tracks);
 
-  if (mt->aparam_view_list!=NULL) g_list_free(mt->aparam_view_list);
+  if (mt->aparam_view_list!=NULL) lives_list_free(mt->aparam_view_list);
 
   if (mainw->event_list==mt->event_list) mainw->event_list=NULL;
   if (mt->event_list!=NULL) event_list_free(mt->event_list);
   mt->event_list=NULL;
 
-  if (mt->clip_selected>=0&&mainw->files[mt_file_from_clip(mt,mt->clip_selected)]!=NULL) 
+  if (mt->clip_selected>=0&&mainw->files[mt_file_from_clip(mt,mt->clip_selected)]!=NULL)
     mt_file_from_clip(mt,mt->clip_selected);
 
-  if (mt->clip_labels!=NULL) g_list_free(mt->clip_labels);
+  if (mt->clip_labels!=NULL) lives_list_free(mt->clip_labels);
 
   add_message_scroller(mainw->message_box);
 
   if (prefs->show_gui) {
     if (lives_window_has_toplevel_focus(LIVES_WINDOW(mt->window))) transfer_focus=TRUE;
-    lives_widget_show (mainw->LiVES);
+    lives_widget_show(mainw->LiVES);
     mainw->is_ready=mainw_was_ready;
     unblock_expose();
   }
 
-  lives_window_remove_accel_group (LIVES_WINDOW (mt->window), mt->accel_group);
+  lives_window_remove_accel_group(LIVES_WINDOW(mt->window), mt->accel_group);
 
   lives_signal_handler_block(mainw->full_screen,mainw->fullscreen_cb_func);
   lives_signal_handler_block(mainw->sepwin,mainw->sepwin_cb_func);
-  lives_check_menu_item_set_active (LIVES_CHECK_MENU_ITEM (mainw->full_screen),mainw->fs);
-  lives_check_menu_item_set_active (LIVES_CHECK_MENU_ITEM (mainw->sepwin),mainw->sep_win);
+  lives_check_menu_item_set_active(LIVES_CHECK_MENU_ITEM(mainw->full_screen),mainw->fs);
+  lives_check_menu_item_set_active(LIVES_CHECK_MENU_ITEM(mainw->sepwin),mainw->sep_win);
   lives_signal_handler_unblock(mainw->full_screen,mainw->fullscreen_cb_func);
   lives_signal_handler_unblock(mainw->sepwin,mainw->sepwin_cb_func);
 
   if (mainw->play_window!=NULL) {
-    lives_window_remove_accel_group (LIVES_WINDOW (mainw->play_window), mt->accel_group);
-    lives_window_add_accel_group (LIVES_WINDOW (mainw->play_window), mainw->accel_group);
+    lives_window_remove_accel_group(LIVES_WINDOW(mainw->play_window), mt->accel_group);
+    lives_window_add_accel_group(LIVES_WINDOW(mainw->play_window), mainw->accel_group);
   }
 
   // put buttons back in mainw->menubar
@@ -9231,7 +9417,7 @@
   lives_toolbar_insert(LIVES_TOOLBAR(mainw->btoolbar),LIVES_TOOL_ITEM(mainw->m_mutebutton),6);
   lives_object_unref(mainw->m_mutebutton);
 
-  if (!lives_scale_button_set_orientation (LIVES_SCALE_BUTTON(mainw->volume_scale),LIVES_ORIENTATION_HORIZONTAL)) {
+  if (!lives_scale_button_set_orientation(LIVES_SCALE_BUTTON(mainw->volume_scale),LIVES_ORIENTATION_HORIZONTAL)) {
     if (mainw->vol_label!=NULL) {
       lives_object_ref(mainw->vol_label);
       lives_widget_unparent(mainw->vol_label);
@@ -9248,19 +9434,19 @@
   lives_object_ref(mainw->gens_menu);
   lives_menu_detach(LIVES_MENU(mainw->gens_menu));
 
-  lives_menu_item_set_submenu (LIVES_MENU_ITEM (mainw->gens_submenu), mainw->gens_menu);
+  lives_menu_item_set_submenu(LIVES_MENU_ITEM(mainw->gens_submenu), mainw->gens_menu);
 
   if (mt->mt_frame_preview) {
     if (mainw->plug!=NULL) {
-      lives_container_remove (LIVES_CONTAINER(mainw->plug),mainw->play_image);
-      lives_widget_destroy (mainw->plug);
+      lives_container_remove(LIVES_CONTAINER(mainw->plug),mainw->play_image);
+      lives_widget_destroy(mainw->plug);
       mainw->plug=NULL;
     }
 
-    mainw->playarea = lives_hbox_new (FALSE,0);
+    mainw->playarea = lives_hbox_new(FALSE,0);
 
-    lives_container_add (LIVES_CONTAINER (mainw->pl_eventbox), mainw->playarea);
-    lives_widget_set_bg_color (mainw->playframe, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+    lives_container_add(LIVES_CONTAINER(mainw->pl_eventbox), mainw->playarea);
+    lives_widget_set_bg_color(mainw->playframe, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
     lives_widget_show(mainw->playarea);
   }
 
@@ -9268,33 +9454,33 @@
   // free our track_rects
   if (cfile->achans>0) {
     delete_audio_tracks(mt,mt->audio_draws,FALSE);
-    if (mt->audio_vols!=NULL) g_list_free(mt->audio_vols);
+    if (mt->audio_vols!=NULL) lives_list_free(mt->audio_vols);
   }
 
   if (cfile->total_time==0.) close_current_file(mt->file_selected);
 
   if (mt->video_draws!=NULL) {
-    for (i=0;i<mt->num_video_tracks;i++) {
+    for (i=0; i<mt->num_video_tracks; i++) {
       delete_video_track(mt,i,FALSE);
     }
-    g_list_free (mt->video_draws);
+    lives_list_free(mt->video_draws);
   }
 
   lives_widget_destroy(mt->in_out_box);
   lives_widget_destroy(mt->clip_scroll);
   lives_widget_destroy(mt->fx_base_box);
 
-  g_list_free(mt->tl_marks);
+  lives_list_free(mt->tl_marks);
 
-  lives_widget_destroy (mt->window);
+  lives_widget_destroy(mt->window);
 
   mainw->multitrack=NULL;
   mainw->event_list=NULL;
 
-  for (i=1;i<MAX_FILES;i++) {
+  for (i=1; i<MAX_FILES; i++) {
     if (mainw->files[i]!=NULL) {
       if (mainw->files[i]->event_list!=NULL) {
-	event_list_free(mainw->files[i]->event_list);
+        event_list_free(mainw->files[i]->event_list);
       }
       mainw->files[i]->event_list=NULL;
     }
@@ -9313,42 +9499,40 @@
 
   lives_widget_context_update();
 
-  d_print (_ ("\n==============================\nSwitched to Clip Edit mode\n"));
+  d_print(_("\n==============================\nSwitched to Clip Edit mode\n"));
 
   if (mt->file_selected!=-1) {
-    switch_to_file ((mainw->current_file=0),mt->file_selected);
+    switch_to_file((mainw->current_file=0),mt->file_selected);
   }
 
   lives_widget_context_update();
 
   if (prefs->show_gui&&prefs->open_maximised) {
     int wx,wy;
-    lives_window_get_position (LIVES_WINDOW (mainw->LiVES),&wx,&wy);
+    lives_window_get_position(LIVES_WINDOW(mainw->LiVES),&wx,&wy);
     if (prefs->gui_monitor==0&&(wx>0||wy>0)) lives_window_move(LIVES_WINDOW(mainw->LiVES),0,0);
-    lives_window_maximize (LIVES_WINDOW(mainw->LiVES));
+    lives_window_maximize(LIVES_WINDOW(mainw->LiVES));
   }
 
   if (ce_sepwin_type==SEPWIN_TYPE_STICKY) on_sticky_activate(NULL,NULL);
 
   lives_widget_context_update();
 
-  g_free (mt);
+  lives_free(mt);
 
   if (mainw->play_window!=NULL) {
-    gchar *xtrabit,*title;
+    char *xtrabit,*title;
     resize_play_window();
-    if (mainw->sepwin_scale!=100.) xtrabit=g_strdup_printf(_(" (%d %% scale)"),(int)mainw->sepwin_scale);
-    else xtrabit=g_strdup("");
-    title=g_strdup_printf("%s%s",lives_window_get_title(LIVES_WINDOW(mainw->LiVES)),xtrabit);
+    if (mainw->sepwin_scale!=100.) xtrabit=lives_strdup_printf(_(" (%d %% scale)"),(int)mainw->sepwin_scale);
+    else xtrabit=lives_strdup("");
+    title=lives_strdup_printf("%s%s",lives_window_get_title(LIVES_WINDOW(mainw->LiVES)),xtrabit);
     lives_window_set_title(LIVES_WINDOW(mainw->play_window),title);
-    g_free(title);
-    g_free(xtrabit);
+    lives_free(title);
+    lives_free(xtrabit);
   }
 
-#ifdef ENABLE_OSC
-  lives_osc_notify(LIVES_OSC_NOTIFY_MODE_CHANGED,(tmp=g_strdup_printf("%d",STARTUP_CE)));
-  g_free(tmp);
-#endif
+  lives_notify(LIVES_OSC_NOTIFY_MODE_CHANGED,(tmp=lives_strdup_printf("%d",STARTUP_CE)));
+  lives_free(tmp);
 
   return TRUE;
 }
@@ -9359,18 +9543,18 @@
   // once we have detected or assigned our audio volume effect, we search for a FILTER_INIT event for it
   // this becomes our mt->avol_init_event
   int error;
-  gchar *filter_hash;
+  char *filter_hash;
   weed_plant_t *event=get_first_event(event_list);
 
   while (event!=NULL) {
     if (WEED_EVENT_IS_FILTER_INIT(event)) {
       filter_hash=weed_get_string_value(event,"filter",&error);
       if (avol_fx==weed_get_idx_for_hashname(filter_hash,TRUE)) {
-	weed_free(filter_hash);
-	mt->avol_init_event=event;
-	return;
+        lives_free(filter_hash);
+        mt->avol_init_event=event;
+        return;
       }
-      weed_free(filter_hash);
+      lives_free(filter_hash);
     }
     event=get_next_event(event);
   }
@@ -9378,10 +9562,10 @@
 
 
 
-static track_rect *add_block_start_point (LiVESWidget *eventbox, weed_timecode_t tc, int filenum, 
-					  weed_timecode_t offset_start, weed_plant_t *event, boolean ordered) {
-  // each mt->video_draw (eventbox) has a gulong data which points to a linked list of track_rect
-  // here we create a new linked list item and set the start timecode in the timeline, 
+static track_rect *add_block_start_point(LiVESWidget *eventbox, weed_timecode_t tc, int filenum,
+    weed_timecode_t offset_start, weed_plant_t *event, boolean ordered) {
+  // each mt->video_draw (eventbox) has a ulong data which points to a linked list of track_rect
+  // here we create a new linked list item and set the start timecode in the timeline,
   // offset in the source file, and start event
   // then append it to our list
 
@@ -9389,9 +9573,10 @@
 
   // note: filenum is unused and may be removed in future
 
-  track_rect *block=(track_rect *)g_object_get_data (G_OBJECT(eventbox), "blocks");
-  track_rect *new_block=(track_rect *)g_malloc (sizeof(track_rect));
+  track_rect *block=(track_rect *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox), "blocks");
+  track_rect *new_block=(track_rect *)lives_malloc(sizeof(track_rect));
 
+  new_block->uid=lives_random();
   new_block->next=new_block->prev=NULL;
   new_block->state=BLOCK_UNSELECTED;
   new_block->start_anchored=new_block->end_anchored=FALSE;
@@ -9400,17 +9585,17 @@
   new_block->eventbox=eventbox;
   new_block->offset_start=offset_start;
 
-  g_object_set_data (G_OBJECT(eventbox),"block_last",(gpointer)new_block);
+  lives_widget_object_set_data(LIVES_WIDGET_OBJECT(eventbox),"block_last",(livespointer)new_block);
 
   while (block!=NULL) {
     if (get_event_timecode(block->start_event)>tc) {
       // found a block after insertion point
       if (block->prev!=NULL) {
-	block->prev->next=new_block;
-	new_block->prev=block->prev;
+        block->prev->next=new_block;
+        new_block->prev=block->prev;
       }
       // add as first block
-      else g_object_set_data (G_OBJECT(eventbox),"blocks",(gpointer)new_block);
+      else lives_widget_object_set_data(LIVES_WIDGET_OBJECT(eventbox),"blocks",(livespointer)new_block);
       new_block->next=block;
       block->prev=new_block;
       break;
@@ -9425,27 +9610,27 @@
   }
 
   // there were no blocks there
-  if (block==NULL) g_object_set_data (G_OBJECT(eventbox),"blocks",(gpointer)new_block);
+  if (block==NULL) lives_widget_object_set_data(LIVES_WIDGET_OBJECT(eventbox),"blocks",(livespointer)new_block);
 
   return new_block;
 }
 
 
-static track_rect *add_block_end_point (LiVESWidget *eventbox, weed_plant_t *event) {
+static track_rect *add_block_end_point(LiVESWidget *eventbox, weed_plant_t *event) {
   // here we add the end point to our last track_rect
-  track_rect *block=(track_rect *)g_object_get_data (G_OBJECT(eventbox),"block_last");
+  track_rect *block=(track_rect *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"block_last");
   if (block!=NULL) block->end_event=event;
   return block;
 }
 
-static boolean on_tlreg_enter (LiVESWidget *widget, GdkEventCrossing *event, gpointer user_data) {
+static boolean on_tlreg_enter(LiVESWidget *widget, LiVESXEventCrossing *event, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   if (mt->cursor_style!=LIVES_CURSOR_NORMAL) return FALSE;
   lives_set_cursor_style(LIVES_CURSOR_SB_H_DOUBLE_ARROW,widget);
   return FALSE;
 }
 
-static boolean on_tleb_enter (LiVESWidget *widget, GdkEventCrossing *event, gpointer user_data) {
+static boolean on_tleb_enter(LiVESWidget *widget, LiVESXEventCrossing *event, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   if (mt->cursor_style!=LIVES_CURSOR_NORMAL) return FALSE;
   lives_set_cursor_style(LIVES_CURSOR_CENTER_PTR,widget);
@@ -9458,23 +9643,44 @@
 static void reset_renumbering(lives_mt *mt) {
   int i;
 
-  for (i=1;i<=MAX_FILES;i++) {
+  for (i=1; i<=MAX_FILES; i++) {
     if (mainw->files[i]!=NULL) {
       renumbered_clips[i]=i;
-    }
-    else renumbered_clips[i]=0;
+    } else renumbered_clips[i]=0;
   }
 }
 
 
 
+static void set_track_labels(lives_mt *mt) {
+  int error;
+  register int i;
+
+  if (weed_plant_has_leaf(mt->event_list,"track_label_tracks")) {
+    int navs=weed_leaf_num_elements(mt->event_list,"track_label_tracks");
+    int *navals=weed_get_int_array(mt->event_list,"track_label_tracks",&error);
+
+    int nlabs=weed_leaf_num_elements(mt->event_list,"track_label_values");
+    char **labs=weed_get_string_array(mt->event_list,"track_label_values",&error);
+
+    if (nlabs<navs) navs=nlabs;
 
+    for (i=0; i<navs; i++) {
+      int nt=navals[i];
+      if (nt<mt->num_video_tracks) {
+        set_track_label_string(mt,nt,labs[i]);
+      }
+    }
 
+    lives_free(labs);
+    lives_free(navals);
+  }
+}
 
 
-void mt_init_tracks (lives_mt *mt, boolean set_min_max) {
+void mt_init_tracks(lives_mt *mt, boolean set_min_max) {
   LiVESWidget *label;
-  GList *tlist;
+  LiVESList *tlist;
 
   mt->avol_init_event=NULL;
 
@@ -9485,7 +9691,7 @@
     mt->audio_draws=mt->audio_draws->next;
   }
 
-  g_list_free(tlist);
+  lives_list_free(tlist);
 
   tlist=mt->video_draws;
 
@@ -9494,13 +9700,13 @@
     mt->video_draws=mt->video_draws->next;
   }
 
-  g_list_free(tlist);
+  lives_list_free(tlist);
   mt->num_video_tracks=0;
 
 #ifndef ENABLE_GIW_3
   if (mt->timeline_table==NULL) {
-    label=lives_standard_label_new (_("Timeline (seconds)"));
-    lives_table_attach (LIVES_TABLE (mt->timeline_table_header), label, 0, 7, 0, 2, LIVES_FILL, (LiVESAttachOptions)0, 0, 0);
+    label=lives_standard_label_new(_("Timeline (seconds)"));
+    lives_table_attach(LIVES_TABLE(mt->timeline_table_header), label, 0, 7, 0, 2, LIVES_FILL, (LiVESAttachOptions)0, 0, 0);
   }
 #endif
 
@@ -9515,8 +9721,8 @@
   }
 
   // start with 2 video tracks
-  add_video_track_behind (NULL,mt);
-  add_video_track_behind (NULL,mt);
+  add_video_track_behind(NULL,mt);
+  add_video_track_behind(NULL,mt);
 
   mt->current_track=0;
   mt->block_selected=NULL;
@@ -9530,73 +9736,85 @@
     mt->timeline=lives_standard_hruler_new();
 #endif
     mt->timeline_reg=lives_event_box_new();
-    label=lives_standard_label_new (""); // dummy label
-    lives_container_add (LIVES_CONTAINER (mt->timeline_reg), label);
+    label=lives_standard_label_new("");  // dummy label
+    lives_container_add(LIVES_CONTAINER(mt->timeline_reg), label);
 
     lives_widget_show(mt->timeline_reg);
 
     mt->timeline_eb=lives_event_box_new();
     lives_widget_show(mt->timeline_eb);
-    
+
     if (palette->style&STYLE_1) {
       if (palette->style&STYLE_3) {
-	lives_widget_set_fg_color (mt->timeline, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
-	lives_widget_set_bg_color (mt->timeline, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
-	lives_widget_set_bg_color (mt->timeline_eb, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
-	lives_widget_set_bg_color (mt->timeline_reg, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
-	lives_widget_set_fg_color (mt->timeline_eb, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars_fore);
-	lives_widget_set_fg_color (mt->timeline_reg, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars_fore);
+        lives_widget_set_fg_color(mt->timeline, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
+        lives_widget_set_bg_color(mt->timeline, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+        lives_widget_set_bg_color(mt->timeline_eb, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
+        lives_widget_set_bg_color(mt->timeline_reg, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
+        lives_widget_set_fg_color(mt->timeline_eb, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars_fore);
+        lives_widget_set_fg_color(mt->timeline_reg, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars_fore);
       }
     }
 
-    lives_widget_add_events (mt->timeline_eb, LIVES_POINTER_MOTION_MASK | LIVES_BUTTON1_MOTION_MASK | 
-			   LIVES_BUTTON_RELEASE_MASK | LIVES_BUTTON_PRESS_MASK | LIVES_ENTER_NOTIFY_MASK);
-    lives_widget_add_events (mt->timeline_reg, LIVES_POINTER_MOTION_MASK | LIVES_BUTTON1_MOTION_MASK | 
-			   LIVES_BUTTON_RELEASE_MASK | LIVES_BUTTON_PRESS_MASK | LIVES_ENTER_NOTIFY_MASK);
-    lives_signal_connect (LIVES_GUI_OBJECT(mt->timeline_eb), "enter-notify-event",LIVES_GUI_CALLBACK (on_tleb_enter),(gpointer)mt);
-    lives_signal_connect (LIVES_GUI_OBJECT(mt->timeline_reg), "enter-notify-event",LIVES_GUI_CALLBACK (on_tlreg_enter),(gpointer)mt);
-    
-    lives_signal_connect (LIVES_GUI_OBJECT (mt->timeline), "motion_notify_event",
-		      LIVES_GUI_CALLBACK (return_true),
-		      NULL);
-
-    lives_signal_connect (LIVES_GUI_OBJECT (mt->timeline_eb), "motion_notify_event",
-		      LIVES_GUI_CALLBACK (on_timeline_update),
-		      (gpointer)mt);
-
-    lives_signal_connect (LIVES_GUI_OBJECT (mt->timeline_eb), "button_release_event",
-		      LIVES_GUI_CALLBACK (on_timeline_release),
-		      (gpointer)mt);
-    
-    lives_signal_connect (LIVES_GUI_OBJECT (mt->timeline_eb), "button_press_event",
-		      LIVES_GUI_CALLBACK (on_timeline_press),
-		      (gpointer)mt);
-
-    lives_signal_connect (LIVES_GUI_OBJECT (mt->timeline_reg), "motion_notify_event",
-		      LIVES_GUI_CALLBACK (on_timeline_update),
-		      (gpointer)mt);
-    
-    lives_signal_connect (LIVES_GUI_OBJECT (mt->timeline_reg), "button_release_event",
-		      LIVES_GUI_CALLBACK (on_timeline_release),
-		      (gpointer)mt);
-    
-    lives_signal_connect (LIVES_GUI_OBJECT (mt->timeline_reg), "button_press_event",
-		      LIVES_GUI_CALLBACK (on_timeline_press),
-		      (gpointer)mt);
-    
-    lives_signal_connect (LIVES_GUI_OBJECT (mt->timeline_reg), LIVES_WIDGET_EXPOSE_EVENT,
-		      LIVES_GUI_CALLBACK (expose_timeline_reg_event),
-		      (gpointer)mt);
-    
-    lives_container_add (LIVES_CONTAINER (mt->timeline_eb), mt->timeline);
-    
-    lives_table_attach (LIVES_TABLE (mt->timeline_table_header), mt->timeline_eb, 7, 40, 0, 1,
-		      (LiVESAttachOptions) (LIVES_EXPAND | LIVES_FILL),
-		      (LiVESAttachOptions) (LIVES_FILL), 0, 0);
-
-    lives_table_attach (LIVES_TABLE (mt->timeline_table_header), mt->timeline_reg, 7, 40, 1, 2,
-		      (LiVESAttachOptions) (LIVES_EXPAND | LIVES_FILL),
-		      (LiVESAttachOptions) (LIVES_FILL), 0, 0);
+    lives_widget_add_events(mt->timeline_eb, LIVES_POINTER_MOTION_MASK | LIVES_BUTTON1_MOTION_MASK |
+                            LIVES_BUTTON_RELEASE_MASK | LIVES_BUTTON_PRESS_MASK | LIVES_ENTER_NOTIFY_MASK);
+    lives_widget_add_events(mt->timeline_reg, LIVES_POINTER_MOTION_MASK | LIVES_BUTTON1_MOTION_MASK |
+                            LIVES_BUTTON_RELEASE_MASK | LIVES_BUTTON_PRESS_MASK | LIVES_ENTER_NOTIFY_MASK);
+    lives_signal_connect(LIVES_GUI_OBJECT(mt->timeline_eb), LIVES_WIDGET_ENTER_EVENT,LIVES_GUI_CALLBACK(on_tleb_enter),(livespointer)mt);
+    lives_signal_connect(LIVES_GUI_OBJECT(mt->timeline_reg), LIVES_WIDGET_ENTER_EVENT,LIVES_GUI_CALLBACK(on_tlreg_enter),(livespointer)mt);
+
+    lives_signal_connect(LIVES_GUI_OBJECT(mt->timeline), LIVES_WIDGET_MOTION_NOTIFY_EVENT,
+                         LIVES_GUI_CALLBACK(return_true),
+                         NULL);
+
+    lives_signal_connect(LIVES_GUI_OBJECT(mt->timeline_eb), LIVES_WIDGET_MOTION_NOTIFY_EVENT,
+                         LIVES_GUI_CALLBACK(on_timeline_update),
+                         (livespointer)mt);
+
+    lives_signal_connect(LIVES_GUI_OBJECT(mt->timeline_eb), LIVES_WIDGET_BUTTON_RELEASE_EVENT,
+                         LIVES_GUI_CALLBACK(on_timeline_release),
+                         (livespointer)mt);
+
+    lives_signal_connect(LIVES_GUI_OBJECT(mt->timeline_eb), LIVES_WIDGET_BUTTON_PRESS_EVENT,
+                         LIVES_GUI_CALLBACK(on_timeline_press),
+                         (livespointer)mt);
+
+    lives_signal_connect(LIVES_GUI_OBJECT(mt->timeline_reg), LIVES_WIDGET_MOTION_NOTIFY_EVENT,
+                         LIVES_GUI_CALLBACK(on_timeline_update),
+                         (livespointer)mt);
+
+    lives_signal_connect(LIVES_GUI_OBJECT(mt->timeline_reg), LIVES_WIDGET_BUTTON_RELEASE_EVENT,
+                         LIVES_GUI_CALLBACK(on_timeline_release),
+                         (livespointer)mt);
+
+    lives_signal_connect(LIVES_GUI_OBJECT(mt->timeline_reg), LIVES_WIDGET_BUTTON_PRESS_EVENT,
+                         LIVES_GUI_CALLBACK(on_timeline_press),
+                         (livespointer)mt);
+
+    lives_signal_connect(LIVES_GUI_OBJECT(mt->timeline_reg), LIVES_WIDGET_EXPOSE_EVENT,
+                         LIVES_GUI_CALLBACK(expose_timeline_reg_event),
+                         (livespointer)mt);
+
+    lives_container_add(LIVES_CONTAINER(mt->timeline_eb), mt->timeline);
+
+    label=lives_standard_label_new("");  // dummy label
+
+    lives_table_attach(LIVES_TABLE(mt->timeline_table_header), label, 0, 7, 0, 1,
+                       (LiVESAttachOptions)(LIVES_EXPAND | LIVES_FILL),
+                       (LiVESAttachOptions)(LIVES_FILL), 0, 0);
+
+    lives_table_attach(LIVES_TABLE(mt->timeline_table_header), mt->timeline_eb, 7, 40, 0, 1,
+                       (LiVESAttachOptions)(LIVES_EXPAND | LIVES_FILL),
+                       (LiVESAttachOptions)(LIVES_FILL), 0, 0);
+
+    label=lives_standard_label_new("");  // dummy label
+
+    lives_table_attach(LIVES_TABLE(mt->timeline_table_header), label, 0, 7, 1, 2,
+                       (LiVESAttachOptions)(LIVES_EXPAND | LIVES_FILL),
+                       (LiVESAttachOptions)(LIVES_FILL), 0, 0);
+
+    lives_table_attach(LIVES_TABLE(mt->timeline_table_header), mt->timeline_reg, 7, 40, 1, 2,
+                       (LiVESAttachOptions)(LIVES_EXPAND | LIVES_FILL),
+                       (LiVESAttachOptions)(LIVES_FILL), 0, 0);
   }
 
   if (mt->event_list!=NULL) {
@@ -9626,12 +9844,12 @@
     boolean shown_audio_warn=FALSE;
 
     LiVESWidget *audio_draw;
-    
-    GList *slist;
+
+    LiVESList *slist;
 
     track_rect *block;
 
-    for (j=0;j<MAX_TRACKS;j++) {
+    for (j=0; j<MAX_TRACKS; j++) {
       tracks[j]=0;
       avels[j]=0.;
     }
@@ -9641,16 +9859,16 @@
       navals=weed_get_int_array(mt->event_list,"audio_volume_tracks",&error);
       maxval=mt->num_video_tracks-1;
 
-      for (j=0;j<navs;j++) {
-	if (navals[j]>maxval) maxval=navals[j];
+      for (j=0; j<navs; j++) {
+        if (navals[j]>maxval) maxval=navals[j];
       }
 
       num_tracks=maxval+1;
 
       if (num_tracks>mt->num_video_tracks) {
-	for (j=mt->num_video_tracks;j<num_tracks;j++) {
-	  add_video_track_behind(NULL,mt);
-	}
+        for (j=mt->num_video_tracks; j<num_tracks; j++) {
+          add_video_track_behind(NULL,mt);
+        }
       }
     }
 
@@ -9659,214 +9877,209 @@
     event=get_first_event(mt->event_list);
     while (event!=NULL) {
       if (WEED_EVENT_IS_MARKER(event)) {
-	if (weed_get_int_value(event,"lives_type",&error)==EVENT_MARKER_BLOCK_START) {
-	  block_marker_tc=get_event_timecode(event);
-	  block_marker_num_tracks=weed_leaf_num_elements(event,"tracks");
-	  if (block_marker_tracks!=NULL) weed_free(block_marker_tracks);
-	  block_marker_tracks=weed_get_int_array(event,"tracks",&error);
-	}
-	else if (weed_get_int_value(event,"lives_type",&error)==EVENT_MARKER_BLOCK_UNORDERED) {
-	  block_marker_uo_tc=get_event_timecode(event);
-	  block_marker_uo_num_tracks=weed_leaf_num_elements(event,"tracks");
-	  if (block_marker_uo_tracks!=NULL) weed_free(block_marker_uo_tracks);
-	  block_marker_uo_tracks=weed_get_int_array(event,"tracks",&error);
-	}
-      }
-      else if (WEED_EVENT_IS_FILTER_INIT(event)) {
-	if (weed_plant_has_leaf(event,"in_tracks")) {
-	  navs=weed_leaf_num_elements(event,"in_tracks");
-	  navals=weed_get_int_array(event,"in_tracks",&error);
-	  maxval=mt->num_video_tracks-1;
-
-	  for (j=0;j<navs;j++) {
-	    if (navals[j]>maxval) maxval=navals[j];
-	  }
-
-	  num_tracks=maxval+1;
-
-	  if (num_tracks>mt->num_video_tracks) {
-	    for (j=mt->num_video_tracks;j<num_tracks;j++) {
-	      add_video_track_behind(NULL,mt);
-	    }
-	  }
-	}
+        if (weed_get_int_value(event,"lives_type",&error)==EVENT_MARKER_BLOCK_START) {
+          block_marker_tc=get_event_timecode(event);
+          block_marker_num_tracks=weed_leaf_num_elements(event,"tracks");
+          if (block_marker_tracks!=NULL) lives_free(block_marker_tracks);
+          block_marker_tracks=weed_get_int_array(event,"tracks",&error);
+        } else if (weed_get_int_value(event,"lives_type",&error)==EVENT_MARKER_BLOCK_UNORDERED) {
+          block_marker_uo_tc=get_event_timecode(event);
+          block_marker_uo_num_tracks=weed_leaf_num_elements(event,"tracks");
+          if (block_marker_uo_tracks!=NULL) lives_free(block_marker_uo_tracks);
+          block_marker_uo_tracks=weed_get_int_array(event,"tracks",&error);
+        }
+      } else if (WEED_EVENT_IS_FILTER_INIT(event)) {
+        if (weed_plant_has_leaf(event,"in_tracks")) {
+          navs=weed_leaf_num_elements(event,"in_tracks");
+          navals=weed_get_int_array(event,"in_tracks",&error);
+          maxval=mt->num_video_tracks-1;
+
+          for (j=0; j<navs; j++) {
+            if (navals[j]>maxval) maxval=navals[j];
+          }
+
+          num_tracks=maxval+1;
+
+          if (num_tracks>mt->num_video_tracks) {
+            for (j=mt->num_video_tracks; j<num_tracks; j++) {
+              add_video_track_behind(NULL,mt);
+            }
+          }
+        }
       }
 
       else if (WEED_EVENT_IS_FRAME(event)) {
-	tc=get_event_timecode (event);
-	num_tracks=weed_leaf_num_elements (event,"clips");
+        tc=get_event_timecode(event);
+        num_tracks=weed_leaf_num_elements(event,"clips");
 
-	clip_index=weed_get_int_array(event,"clips",&error);
-	frame_index=weed_get_int_array(event,"frames",&error);
+        clip_index=weed_get_int_array(event,"clips",&error);
+        frame_index=weed_get_int_array(event,"frames",&error);
 
-	if (num_tracks<last_tracks) {
-	  for (j=num_tracks;j<last_tracks;j++) {
-	    // TODO - tracks should be linked list
-	    if (tracks[j]>0) {
-	      add_block_end_point (LIVES_WIDGET(g_list_nth_data(mt->video_draws,j)),last_event); // end of previous rectangle
-	      tracks[j]=0;
-	    }
-	  }
-	}
-
-	if (num_tracks>mt->num_video_tracks) {
-	  for (j=mt->num_video_tracks;j<num_tracks;j++) {
-	    add_video_track_behind(NULL,mt);
-	  }
-	}
-
-	last_tracks=num_tracks;
-	new_clip_index=(int *)g_malloc(num_tracks*sizint);
-	new_frame_index=(int *)g_malloc(num_tracks*sizint);
-	last_valid_frame=0;
-
-	for (j=0;j<num_tracks;j++) {
-	  // TODO - tracks should be linked list
-	  if (clip_index[j]>0&&frame_index[j]>-1&&renumbered_clips[clip_index[j]]>0&&frame_index[j]<=
-	      mainw->files[renumbered_clips[clip_index[j]]]->frames) {
-	    forced_end=FALSE;
-	    if (tc==block_marker_tc&&int_array_contains_value(block_marker_tracks,block_marker_num_tracks,j)) 
-	      forced_end=TRUE;
-	    if ((tracks[j]!=renumbered_clips[clip_index[j]])||forced_end) {
-	      // handling for block end or split blocks
-	      if (tracks[j]>0) {
-		add_block_end_point (LIVES_WIDGET(g_list_nth_data(mt->video_draws,j)),last_event); // end of previous rectangle
-	      }
-	      if (clip_index[j]>0) {
-		ordered=!mainw->unordered_blocks;
-		if (tc==block_marker_uo_tc&&int_array_contains_value(block_marker_uo_tracks,block_marker_uo_num_tracks,j)) 
-		  ordered=FALSE;
-		// start a new rectangle
-		offset_start=calc_time_from_frame(renumbered_clips[clip_index[j]],frame_index[j])*U_SEC;
-		add_block_start_point (LIVES_WIDGET(g_list_nth_data(mt->video_draws,j)),tc,
-				       renumbered_clips[clip_index[j]],offset_start,event,ordered);
-	      }
-	      tracks[j]=renumbered_clips[clip_index[j]];
-	    }
-	    new_clip_index[j]=renumbered_clips[clip_index[j]];
-	    new_frame_index[j]=frame_index[j];
-	    last_valid_frame=j+1;
-	  }
-	  else {
-	    // clip has probably been closed, so we remove its frames
-
-	    // TODO - do similar check for audio
-	    new_clip_index[j]=-1;
-	    new_frame_index[j]=0;
-	    if (tracks[j]>0) {
-	      add_block_end_point (LIVES_WIDGET(g_list_nth_data(mt->video_draws,j)),last_event); // end of previous rectangle
-	      tracks[j]=0;
-	    }
-	  }
-	}
-
-	if (last_valid_frame==0) {
-	  g_free(new_clip_index);
-	  g_free(new_frame_index);
-	  new_clip_index=(int *)g_malloc(sizint);
-	  new_frame_index=(int *)g_malloc(sizint);
-	  *new_clip_index=-1;
-	  *new_frame_index=0;
-	  num_tracks=1;
-	}
-	else {
-	  if (last_valid_frame<num_tracks) {
-	    g_free(new_clip_index);
-	    g_free(new_frame_index);
-	    new_clip_index=(int *)g_malloc(last_valid_frame*sizint);
-	    new_frame_index=(int *)g_malloc(last_valid_frame*sizint);
-	    for (j=0;j<last_valid_frame;j++) {
-	      new_clip_index[j]=clip_index[j];
-	      new_frame_index[j]=frame_index[j];
-	    }
-	    num_tracks=last_valid_frame;
-	  }
-	}
-
-	weed_set_int_array(event,"clips",num_tracks,new_clip_index);
-	weed_set_int_array(event,"frames",num_tracks,new_frame_index);
-
-	weed_free(clip_index);
-	g_free(new_clip_index);
-	weed_free(frame_index);
-	g_free(new_frame_index);
-
-
-	if (weed_plant_has_leaf(event,"audio_clips")) {
-	  // audio starts or stops here
-	  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);
-	  for (i=0;i<num_aclips;i+=2) {
-	    if (aclips[i+1]>0) {
-	      if (cfile->achans==0) {
-		if (!shown_audio_warn) {
-		  shown_audio_warn=TRUE;
-		  do_mt_audchan_error(WARN_MASK_MT_ACHANS);
-		}
-	      }
-	      else {
-		if (aclips[i]==-1) audio_draw=(LiVESWidget *)mt->audio_draws->data;
-		else audio_draw=(LiVESWidget *)g_list_nth_data(mt->audio_draws,aclips[i]+mt->opts.back_audio_tracks);
-		if (avels[aclips[i]+1]!=0.) {
-		  add_block_end_point (audio_draw,event);
-		}
-		//if (renumbered_clips[clip_index[aclips[i+1]]]>0) {
-		  avels[aclips[i]+1]=aseeks[i+1];
-		  //}
-		if (avels[aclips[i]+1]!=0.) {
-		  add_block_start_point (audio_draw,tc,renumbered_clips[aclips[i+1]],aseeks[i]*U_SEC,event,TRUE);
-		}
-	      }
-	    }
-	    if (aclips[i+1]>0) aclips[i+1]=renumbered_clips[aclips[i+1]];
-	  }
-	  weed_set_int_array(event,"audio_clips",num_aclips,aclips);
-	  weed_free(aseeks);
-	}
-
-	num_aclips=g_list_length(mt->audio_draws);
-	for (i=0;i<num_aclips;i++) {
-	  // handling for split blocks
-	  if (tc==block_marker_tc&&int_array_contains_value(block_marker_tracks,block_marker_num_tracks,-i-1)) {
-	    audio_draw=(LiVESWidget *)g_list_nth_data(mt->audio_draws,i+mt->opts.back_audio_tracks-1);
-	    if (avels[i]!=0.) {
-	      // end the current block and add a new one
-	      // note we only add markers here, when drawing the block audio events will be added
-	      block=add_block_end_point (audio_draw,event);
-	      if (block!=NULL) {
-		last_tc=get_event_timecode(block->start_event);
-		offset_start=block->offset_start+(weed_timecode_t)((double)(tc-last_tc)*avels[i]+.5);
-		add_block_start_point (audio_draw,tc,-1,offset_start,event,TRUE);
-	      }
-	    }
-	  }
-	}
-
-	next_frame_event=get_next_frame_event(event);
-      
-	if (next_frame_event==NULL) {
-	  // this is the last FRAME event, so close all our rectangles
-	  for (j=0;j<mt->num_video_tracks;j++) {
-	    if (tracks[j]>0) {
-	      add_block_end_point (LIVES_WIDGET(g_list_nth_data(mt->video_draws,j)),event);
-	    }
-	  }
-	  slist=mt->audio_draws;
-	  for (j=0;j<g_list_length(mt->audio_draws);j++) {
-	    if (cfile->achans>0&&avels[j]!=0.) add_block_end_point ((LiVESWidget *)slist->data,event);
-	    slist=slist->next;
-	  }
-	}
-	last_event=event;
+        if (num_tracks<last_tracks) {
+          for (j=num_tracks; j<last_tracks; j++) {
+            // TODO - tracks should be linked list
+            if (tracks[j]>0) {
+              add_block_end_point(LIVES_WIDGET(lives_list_nth_data(mt->video_draws,j)),last_event);  // end of previous rectangle
+              tracks[j]=0;
+            }
+          }
+        }
+
+        if (num_tracks>mt->num_video_tracks) {
+          for (j=mt->num_video_tracks; j<num_tracks; j++) {
+            add_video_track_behind(NULL,mt);
+          }
+        }
+
+        last_tracks=num_tracks;
+        new_clip_index=(int *)lives_malloc(num_tracks*sizint);
+        new_frame_index=(int *)lives_malloc(num_tracks*sizint);
+        last_valid_frame=0;
+
+        for (j=0; j<num_tracks; j++) {
+          // TODO - tracks should be linked list
+          if (clip_index[j]>0&&frame_index[j]>-1&&renumbered_clips[clip_index[j]]>0&&frame_index[j]<=
+              mainw->files[renumbered_clips[clip_index[j]]]->frames) {
+            forced_end=FALSE;
+            if (tc==block_marker_tc&&int_array_contains_value(block_marker_tracks,block_marker_num_tracks,j))
+              forced_end=TRUE;
+            if ((tracks[j]!=renumbered_clips[clip_index[j]])||forced_end) {
+              // handling for block end or split blocks
+              if (tracks[j]>0) {
+                add_block_end_point(LIVES_WIDGET(lives_list_nth_data(mt->video_draws,j)),last_event);  // end of previous rectangle
+              }
+              if (clip_index[j]>0) {
+                ordered=!mainw->unordered_blocks;
+                if (tc==block_marker_uo_tc&&int_array_contains_value(block_marker_uo_tracks,block_marker_uo_num_tracks,j))
+                  ordered=FALSE;
+                // start a new rectangle
+                offset_start=calc_time_from_frame(renumbered_clips[clip_index[j]],frame_index[j])*U_SEC;
+                add_block_start_point(LIVES_WIDGET(lives_list_nth_data(mt->video_draws,j)),tc,
+                                      renumbered_clips[clip_index[j]],offset_start,event,ordered);
+              }
+              tracks[j]=renumbered_clips[clip_index[j]];
+            }
+            new_clip_index[j]=renumbered_clips[clip_index[j]];
+            new_frame_index[j]=frame_index[j];
+            last_valid_frame=j+1;
+          } else {
+            // clip has probably been closed, so we remove its frames
+
+            // TODO - do similar check for audio
+            new_clip_index[j]=-1;
+            new_frame_index[j]=0;
+            if (tracks[j]>0) {
+              add_block_end_point(LIVES_WIDGET(lives_list_nth_data(mt->video_draws,j)),last_event);  // end of previous rectangle
+              tracks[j]=0;
+            }
+          }
+        }
+
+        if (last_valid_frame==0) {
+          lives_free(new_clip_index);
+          lives_free(new_frame_index);
+          new_clip_index=(int *)lives_malloc(sizint);
+          new_frame_index=(int *)lives_malloc(sizint);
+          *new_clip_index=-1;
+          *new_frame_index=0;
+          num_tracks=1;
+        } else {
+          if (last_valid_frame<num_tracks) {
+            lives_free(new_clip_index);
+            lives_free(new_frame_index);
+            new_clip_index=(int *)lives_malloc(last_valid_frame*sizint);
+            new_frame_index=(int *)lives_malloc(last_valid_frame*sizint);
+            for (j=0; j<last_valid_frame; j++) {
+              new_clip_index[j]=clip_index[j];
+              new_frame_index[j]=frame_index[j];
+            }
+            num_tracks=last_valid_frame;
+          }
+        }
+
+        weed_set_int_array(event,"clips",num_tracks,new_clip_index);
+        weed_set_int_array(event,"frames",num_tracks,new_frame_index);
+
+        lives_free(clip_index);
+        lives_free(new_clip_index);
+        lives_free(frame_index);
+        lives_free(new_frame_index);
+
+
+        if (WEED_EVENT_IS_AUDIO_FRAME(event)) {
+          // audio starts or stops here
+          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);
+          for (i=0; i<num_aclips; i+=2) {
+            if (aclips[i+1]>0) {
+              if (cfile->achans==0) {
+                if (!shown_audio_warn) {
+                  shown_audio_warn=TRUE;
+                  do_mt_audchan_error(WARN_MASK_MT_ACHANS);
+                }
+              } else {
+                if (aclips[i]==-1) audio_draw=(LiVESWidget *)mt->audio_draws->data;
+                else audio_draw=(LiVESWidget *)lives_list_nth_data(mt->audio_draws,aclips[i]+mt->opts.back_audio_tracks);
+                if (avels[aclips[i]+1]!=0.) {
+                  add_block_end_point(audio_draw,event);
+                }
+                //if (renumbered_clips[clip_index[aclips[i+1]]]>0) {
+                avels[aclips[i]+1]=aseeks[i+1];
+                //}
+                if (avels[aclips[i]+1]!=0.) {
+                  add_block_start_point(audio_draw,tc,renumbered_clips[aclips[i+1]],aseeks[i]*U_SEC,event,TRUE);
+                }
+              }
+            }
+            if (aclips[i+1]>0) aclips[i+1]=renumbered_clips[aclips[i+1]];
+          }
+          weed_set_int_array(event,"audio_clips",num_aclips,aclips);
+          lives_free(aseeks);
+        }
+
+        num_aclips=lives_list_length(mt->audio_draws);
+        for (i=0; i<num_aclips; i++) {
+          // handling for split blocks
+          if (tc==block_marker_tc&&int_array_contains_value(block_marker_tracks,block_marker_num_tracks,-i-1)) {
+            audio_draw=(LiVESWidget *)lives_list_nth_data(mt->audio_draws,i+mt->opts.back_audio_tracks-1);
+            if (avels[i]!=0.) {
+              // end the current block and add a new one
+              // note we only add markers here, when drawing the block audio events will be added
+              block=add_block_end_point(audio_draw,event);
+              if (block!=NULL) {
+                last_tc=get_event_timecode(block->start_event);
+                offset_start=block->offset_start+(weed_timecode_t)((double)(tc-last_tc)*avels[i]+.5);
+                add_block_start_point(audio_draw,tc,-1,offset_start,event,TRUE);
+              }
+            }
+          }
+        }
+
+        next_frame_event=get_next_frame_event(event);
+
+        if (next_frame_event==NULL) {
+          // this is the last FRAME event, so close all our rectangles
+          for (j=0; j<mt->num_video_tracks; j++) {
+            if (tracks[j]>0) {
+              add_block_end_point(LIVES_WIDGET(lives_list_nth_data(mt->video_draws,j)),event);
+            }
+          }
+          slist=mt->audio_draws;
+          for (j=0; j<lives_list_length(mt->audio_draws); j++) {
+            if (cfile->achans>0&&avels[j]!=0.) add_block_end_point((LiVESWidget *)slist->data,event);
+            slist=slist->next;
+          }
+        }
+        last_event=event;
       }
       event=get_next_event(event);
     }
-    if (!mt->was_undo_redo) remove_end_blank_frames(mt->event_list);
-    if (block_marker_tracks!=NULL) weed_free(block_marker_tracks);
-    if (block_marker_uo_tracks!=NULL) weed_free(block_marker_uo_tracks);
+    if (!mt->was_undo_redo) remove_end_blank_frames(mt->event_list,TRUE);
+    if (block_marker_tracks!=NULL) lives_free(block_marker_tracks);
+    if (block_marker_uo_tracks!=NULL) lives_free(block_marker_uo_tracks);
 
-    if (cfile->achans>0&&mt->opts.back_audio_tracks>0) lives_widget_show (mt->view_audio);
+    if (cfile->achans>0&&mt->opts.back_audio_tracks>0) lives_widget_show(mt->view_audio);
 
     if (mt->avol_fx!=-1) locate_avol_init_event(mt,mt->event_list,mt->avol_fx);
 
@@ -9890,19 +10103,21 @@
   set_timeline_end_secs(mt,mt->end_secs);
 
   if (!mt->was_undo_redo) {
+
+    set_track_labels(mt);
+
     if (mt->is_ready) {
       if (mt->current_track!=0) {
-	mt->current_track=0;
-	track_select(mt);
+        mt->current_track=0;
+        track_select(mt);
       }
       if (mt->region_start!=mt->region_end||mt->region_start!=0.) {
-	mt->region_start=mt->region_end=0.;
-	draw_region(mt);
+        mt->region_start=mt->region_end=0.;
+        draw_region(mt);
       }
     }
-    mt_tl_move(mt,-lives_ruler_get_value(LIVES_RULER(mt->timeline)));
-  }
-  else mt->was_undo_redo=FALSE;
+    mt_tl_move(mt,0.);
+  } else mt->was_undo_redo=FALSE;
 
   reset_renumbering(mt);
 
@@ -9913,8 +10128,8 @@
   // WARNING - does not yet delete events from event_list
   // only deletes visually
 
-  LiVESWidget *eventbox=(LiVESWidget *)g_list_nth_data(mt->video_draws,layer);
-  track_rect *block=(track_rect *)g_object_get_data (G_OBJECT(eventbox), "blocks"),*blocknext;
+  LiVESWidget *eventbox=(LiVESWidget *)lives_list_nth_data(mt->video_draws,layer);
+  track_rect *block=(track_rect *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox), "blocks"),*blocknext;
 
   LiVESWidget *checkbutton;
   LiVESWidget *label,*labelbox,*ahbox,*arrow;
@@ -9923,28 +10138,30 @@
   while (block!=NULL) {
     blocknext=block->next;
     if (mt->block_selected==block) mt->block_selected=NULL;
-    g_free(block);
+    lives_free(block);
     block=blocknext;
   }
 
-  if ((bgimg=(lives_painter_surface_t *)g_object_get_data(G_OBJECT(eventbox), "bgimg"))!=NULL) {
+  if ((bgimg=(lives_painter_surface_t *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox), "bgimg"))!=NULL) {
     lives_painter_surface_destroy(bgimg);
   }
 
-  checkbutton=(LiVESWidget *)g_object_get_data (G_OBJECT(eventbox), "checkbutton");
-  label=(LiVESWidget *)g_object_get_data (G_OBJECT(eventbox), "label");
-  arrow=(LiVESWidget *)g_object_get_data (G_OBJECT(eventbox), "arrow");
+  checkbutton=(LiVESWidget *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox), "checkbutton");
+  label=(LiVESWidget *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox), "label");
+  arrow=(LiVESWidget *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox), "arrow");
+
+  mt->cb_list=lives_list_remove(mt->cb_list,(livespointer)checkbutton);
 
   lives_widget_destroy(checkbutton);
   lives_widget_destroy(label);
   lives_widget_destroy(arrow);
-  if (GPOINTER_TO_INT(g_object_get_data(G_OBJECT(eventbox),"hidden"))==0) {
-    labelbox=(LiVESWidget *)g_object_get_data (G_OBJECT(eventbox), "labelbox");
-    ahbox=(LiVESWidget *)g_object_get_data (G_OBJECT(eventbox), "ahbox");
+  if (LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"hidden"))==0) {
+    labelbox=(LiVESWidget *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox), "labelbox");
+    ahbox=(LiVESWidget *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox), "ahbox");
     if (labelbox!=NULL) lives_widget_destroy(labelbox);
     if (ahbox!=NULL) lives_widget_destroy(ahbox);
   }
-  g_free(g_object_get_data(G_OBJECT(eventbox),"track_name"));
+  lives_free(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"track_name"));
 
 
   // corresponding audio track will be deleted in delete_audio_track(s)
@@ -9953,7 +10170,7 @@
 }
 
 
-LiVESWidget *add_audio_track (lives_mt *mt, int track, boolean behind) {
+LiVESWidget *add_audio_track(lives_mt *mt, int track, boolean behind) {
   // add float or pertrack audio track to our timeline_table
   LiVESObject *adj;
   LiVESWidget *label;
@@ -9961,7 +10178,7 @@
   LiVESWidget *eventbox;
   LiVESWidget *vbox;
   LiVESWidget *audio_draw=lives_event_box_new();
-  gchar *pname,*tname;
+  char *pname,*tname;
   int max_disp_vtracks=mt->max_disp_vtracks-1;
   int llen,vol=0;
   int nachans=0;
@@ -9969,91 +10186,85 @@
 
   lives_object_ref(audio_draw);
 
-  g_object_set_data (G_OBJECT(audio_draw), "blocks", (gpointer)NULL);
-  g_object_set_data (G_OBJECT(audio_draw), "block_last", (gpointer)NULL);
-  g_object_set_data (G_OBJECT(audio_draw), "hidden", GINT_TO_POINTER(0));
-  g_object_set_data (G_OBJECT(audio_draw), "expanded",GINT_TO_POINTER(FALSE));
-  g_object_set_data (G_OBJECT(audio_draw), "bgimg", NULL);
+  lives_widget_object_set_data(LIVES_WIDGET_OBJECT(audio_draw), "blocks", (livespointer)NULL);
+  lives_widget_object_set_data(LIVES_WIDGET_OBJECT(audio_draw), "block_last", (livespointer)NULL);
+  lives_widget_object_set_data(LIVES_WIDGET_OBJECT(audio_draw), "hidden", LIVES_INT_TO_POINTER(0));
+  lives_widget_object_set_data(LIVES_WIDGET_OBJECT(audio_draw), "expanded",LIVES_INT_TO_POINTER(FALSE));
+  lives_widget_object_set_data(LIVES_WIDGET_OBJECT(audio_draw), "bgimg", NULL);
+  lives_widget_object_set_data(LIVES_WIDGET_OBJECT(audio_draw),"is_audio",LIVES_INT_TO_POINTER(TRUE));
 
   lives_adjustment_set_upper(LIVES_ADJUSTMENT(mt->vadjustment),(double)mt->num_video_tracks);
   lives_adjustment_set_page_size(LIVES_ADJUSTMENT(mt->vadjustment),(double)(max_disp_vtracks>mt->num_video_tracks?
-									    mt->num_video_tracks:max_disp_vtracks));
+                                 mt->num_video_tracks:max_disp_vtracks));
 
   widget_opts.justify=LIVES_JUSTIFY_LEFT;
   if (track==-1) {
-    label=lives_label_new (_(" Backing audio"));
-  }
-  else {
-    gchar *tmp=g_strdup_printf(_(" Layer %d audio"),track);
-    label=lives_label_new (tmp);
-    g_free(tmp);
+    label=lives_label_new(_(" Backing audio"));
+  } else {
+    char *tmp=lives_strdup_printf(_(" Layer %d audio"),track);
+    label=lives_label_new(tmp);
+    lives_free(tmp);
   }
   widget_opts.justify=widget_opts.default_justify;
   lives_object_ref(label);
 
-  arrow = lives_arrow_new (LIVES_ARROW_RIGHT, LIVES_SHADOW_OUT);
-  lives_widget_set_tooltip_text( arrow, _("Show/hide audio details"));
+  arrow = lives_arrow_new(LIVES_ARROW_RIGHT, LIVES_SHADOW_OUT);
+  lives_widget_set_tooltip_text(arrow, _("Show/hide audio details"));
   lives_object_ref(arrow);
 
   if (palette->style&STYLE_1) {
     if (!(palette->style&STYLE_3)) {
-      lives_widget_set_fg_color (label, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
-      lives_widget_set_fg_color (label, LIVES_WIDGET_STATE_PRELIGHT, &palette->normal_back);
+      lives_widget_set_fg_color(label, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+      lives_widget_set_fg_color(label, LIVES_WIDGET_STATE_PRELIGHT, &palette->normal_back);
     }
   }
 
-  g_object_set_data (G_OBJECT(audio_draw),"label",label);
-  g_object_set_data (G_OBJECT(audio_draw),"arrow",arrow);
+  lives_widget_object_set_data(LIVES_WIDGET_OBJECT(audio_draw),"label",label);
+  lives_widget_object_set_data(LIVES_WIDGET_OBJECT(audio_draw),"arrow",arrow);
 
-  g_object_set_data (G_OBJECT(arrow),"layer_number",GINT_TO_POINTER(track));
-  g_object_set_data (G_OBJECT(audio_draw),"layer_number",GINT_TO_POINTER(track));
-  g_object_set_data (G_OBJECT(audio_draw),"track_name",g_strdup_printf(_("Layer %d audio"),track));
+  lives_widget_object_set_data(LIVES_WIDGET_OBJECT(arrow),"layer_number",LIVES_INT_TO_POINTER(track));
+  lives_widget_object_set_data(LIVES_WIDGET_OBJECT(audio_draw),"layer_number",LIVES_INT_TO_POINTER(track));
+  lives_widget_object_set_data(LIVES_WIDGET_OBJECT(audio_draw),"track_name",lives_strdup_printf(_("Layer %d audio"),track));
 
   // add channel subtracks
-  for (i=0;i<cfile->achans;i++) {
+  for (i=0; i<cfile->achans; i++) {
     eventbox=lives_event_box_new();
     lives_object_ref(eventbox);
-    pname=g_strdup_printf("achan%d",i);
-    g_object_set_data(G_OBJECT(audio_draw),pname,eventbox);
-    g_free(pname);
-    g_object_set_data(G_OBJECT(eventbox),"owner",audio_draw);
-    g_object_set_data (G_OBJECT(eventbox), "hidden", GINT_TO_POINTER(0));
-    g_object_set_data (G_OBJECT(eventbox), "bgimg", NULL);
-    g_object_set_data (G_OBJECT(eventbox), "channel", GINT_TO_POINTER(i));
+    pname=lives_strdup_printf("achan%d",i);
+    lives_widget_object_set_data(LIVES_WIDGET_OBJECT(audio_draw),pname,eventbox);
+    lives_free(pname);
+    lives_widget_object_set_data(LIVES_WIDGET_OBJECT(eventbox),"owner",audio_draw);
+    lives_widget_object_set_data(LIVES_WIDGET_OBJECT(eventbox), "hidden", LIVES_INT_TO_POINTER(0));
+    lives_widget_object_set_data(LIVES_WIDGET_OBJECT(eventbox), "bgimg", NULL);
+    lives_widget_object_set_data(LIVES_WIDGET_OBJECT(eventbox), "channel", LIVES_INT_TO_POINTER(i));
   }
 
-  lives_widget_queue_draw (mt->vpaned);
+  lives_widget_queue_draw(mt->vpaned);
 
   if (!mt->was_undo_redo) {
     // calc layer volume value
-    llen=g_list_length(mt->audio_draws);
+    llen=lives_list_length(mt->audio_draws);
     if (llen==0) {
       // set vol to 1.0
       vol=LIVES_AVOL_SCALE;
-    }
-    else if (llen==1) {
+    } else if (llen==1) {
       if (mt->opts.back_audio_tracks>0) {
-	vol=LIVES_AVOL_SCALE/2.;
-	mt->audio_vols->data=GINT_TO_POINTER(vol);
-      }
-      else {
-	if (mt->opts.gang_audio) {
-	  vol=GPOINTER_TO_INT(g_list_nth_data(mt->audio_vols,0));
-	}
-	else vol=LIVES_AVOL_SCALE;
+        vol=LIVES_AVOL_SCALE/2.;
+        mt->audio_vols->data=LIVES_INT_TO_POINTER(vol);
+      } else {
+        if (mt->opts.gang_audio) {
+          vol=LIVES_POINTER_TO_INT(lives_list_nth_data(mt->audio_vols,0));
+        } else vol=LIVES_AVOL_SCALE;
       }
-    }
-    else {
+    } else {
       if (mt->opts.gang_audio) {
-	vol=GPOINTER_TO_INT(g_list_nth_data(mt->audio_vols,mt->opts.back_audio_tracks));
-      }
-      else {
-	if (mt->opts.back_audio_tracks>0) {
-	  vol=LIVES_AVOL_SCALE/2.;
-	}
-	else {
-	  vol=LIVES_AVOL_SCALE;
-	}
+        vol=LIVES_POINTER_TO_INT(lives_list_nth_data(mt->audio_vols,mt->opts.back_audio_tracks));
+      } else {
+        if (mt->opts.back_audio_tracks>0) {
+          vol=LIVES_AVOL_SCALE/2.;
+        } else {
+          vol=LIVES_AVOL_SCALE;
+        }
       }
     }
   }
@@ -10061,73 +10272,71 @@
   if (!mt->was_undo_redo&&mt->amixer!=NULL&&track>=0) {
     // if mixer is open add space for another slider
     LiVESWidget **ch_sliders;
-    gulong *ch_slider_fns;
+    ulong *ch_slider_fns;
 
     int j=0;
 
-    nachans=g_list_length(mt->audio_vols)+1;
+    nachans=lives_list_length(mt->audio_vols)+1;
+
+    ch_sliders=(LiVESWidget **)lives_malloc(nachans*sizeof(LiVESWidget *));
+    ch_slider_fns=(ulong *)lives_malloc(nachans*sizeof(ulong));
 
-    ch_sliders=(LiVESWidget **)g_malloc(nachans*sizeof(LiVESWidget *));
-    ch_slider_fns=(gulong *)g_malloc(nachans*sizeof(gulong));
-    
     // make a gap
-    for (i=0;i<nachans-1;i++) {
+    for (i=0; i<nachans-1; i++) {
       if (!behind&&i==mt->opts.back_audio_tracks) j++;
       ch_sliders[j]=mt->amixer->ch_sliders[i];
       ch_slider_fns[j]=mt->amixer->ch_slider_fns[i];
       j++;
     }
 
-    g_free(mt->amixer->ch_sliders);
-    g_free(mt->amixer->ch_slider_fns);
+    lives_free(mt->amixer->ch_sliders);
+    lives_free(mt->amixer->ch_slider_fns);
 
     mt->amixer->ch_sliders=ch_sliders;
     mt->amixer->ch_slider_fns=ch_slider_fns;
   }
 
   if (track==-1) {
-    mt->audio_draws=g_list_prepend(mt->audio_draws,(gpointer)audio_draw);
-    if (!mt->was_undo_redo) mt->audio_vols=g_list_prepend(mt->audio_vols,GINT_TO_POINTER(vol));
-  }
-  else if (behind) {
-    mt->audio_draws=g_list_append(mt->audio_draws,(gpointer)audio_draw);
+    mt->audio_draws=lives_list_prepend(mt->audio_draws,(livespointer)audio_draw);
+    if (!mt->was_undo_redo) mt->audio_vols=lives_list_prepend(mt->audio_vols,LIVES_INT_TO_POINTER(vol));
+  } else if (behind) {
+    mt->audio_draws=lives_list_append(mt->audio_draws,(livespointer)audio_draw);
 
     if (!mt->was_undo_redo) {
       if (mt->amixer!=NULL) {
-	// if mixer is open add a new track at end
-	vbox=amixer_add_channel_slider(mt,nachans-1-mt->opts.back_audio_tracks);
-	lives_box_pack_start (LIVES_BOX (mt->amixer->main_hbox), vbox, FALSE, FALSE, widget_opts.packing_width);
-	lives_widget_show_all(vbox);
+        // if mixer is open add a new track at end
+        vbox=amixer_add_channel_slider(mt,nachans-1-mt->opts.back_audio_tracks);
+        lives_box_pack_start(LIVES_BOX(mt->amixer->main_hbox), vbox, FALSE, FALSE, widget_opts.packing_width);
+        lives_widget_show_all(vbox);
       }
 
-      mt->audio_vols=g_list_append(mt->audio_vols,GINT_TO_POINTER(vol));
+      mt->audio_vols=lives_list_append(mt->audio_vols,LIVES_INT_TO_POINTER(vol));
     }
-  }
-  else {
-    mt->audio_draws=g_list_insert(mt->audio_draws,(gpointer)audio_draw,mt->opts.back_audio_tracks);
+  } else {
+    mt->audio_draws=lives_list_insert(mt->audio_draws,(livespointer)audio_draw,mt->opts.back_audio_tracks);
     if (!mt->was_undo_redo) {
-      mt->audio_vols=g_list_insert(mt->audio_vols,GINT_TO_POINTER(vol),mt->opts.back_audio_tracks);
+      mt->audio_vols=lives_list_insert(mt->audio_vols,LIVES_INT_TO_POINTER(vol),mt->opts.back_audio_tracks);
 
       if (mt->amixer!=NULL) {
-	// if mixer is open add a new track at posn 0 and update all labels and layer numbers
-	vbox=amixer_add_channel_slider(mt,0);
+        // if mixer is open add a new track at posn 0 and update all labels and layer numbers
+        vbox=amixer_add_channel_slider(mt,0);
 
-	// pack at posn 2
-	lives_box_pack_start (LIVES_BOX (mt->amixer->main_hbox), vbox, FALSE, FALSE, widget_opts.packing_width);
-	lives_box_reorder_child(LIVES_BOX(mt->amixer->main_hbox), vbox, 2);
-	lives_widget_show_all(vbox);
-
-	// update labels and layer numbers
-
-	for (i=mt->opts.back_audio_tracks+1;i<nachans;i++) {
-	  label=(LiVESWidget *)g_object_get_data(G_OBJECT(mt->amixer->ch_sliders[i]),"label");
-	  tname=get_track_name(mt,i-mt->opts.back_audio_tracks,TRUE);
-	  lives_label_set_text(LIVES_LABEL(label),tname);
-	  g_free(tname);
-	  
-	  adj=(LiVESObject *)g_object_get_data(G_OBJECT(mt->amixer->ch_sliders[i]),"adj");
-	  g_object_set_data(G_OBJECT(adj),"layer",GINT_TO_POINTER(i));
-	}
+        // pack at posn 2
+        lives_box_pack_start(LIVES_BOX(mt->amixer->main_hbox), vbox, FALSE, FALSE, widget_opts.packing_width);
+        lives_box_reorder_child(LIVES_BOX(mt->amixer->main_hbox), vbox, 2);
+        lives_widget_show_all(vbox);
+
+        // update labels and layer numbers
+
+        for (i=mt->opts.back_audio_tracks+1; i<nachans; i++) {
+          label=(LiVESWidget *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(mt->amixer->ch_sliders[i]),"label");
+          tname=get_track_name(mt,i-mt->opts.back_audio_tracks,TRUE);
+          lives_label_set_text(LIVES_LABEL(label),tname);
+          lives_free(tname);
+
+          adj=(LiVESObject *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(mt->amixer->ch_sliders[i]),"adj");
+          lives_widget_object_set_data(LIVES_WIDGET_OBJECT(adj),"layer",LIVES_INT_TO_POINTER(i));
+        }
 
       }
     }
@@ -10139,30 +10348,39 @@
 
 
 static void set_track_label(LiVESEventBox *xeventbox, int tnum) {
-  LiVESWidget *label=LIVES_WIDGET(g_object_get_data(G_OBJECT(xeventbox),"label"));
-  const gchar *tname=(const gchar *)g_object_get_data(G_OBJECT(xeventbox),"track_name");
-  gchar *newtext=g_strdup_printf(_("%s (layer %d)"),tname,tnum);
+  LiVESWidget *label=LIVES_WIDGET(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(xeventbox),"label"));
+  const char *tname=(const char *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(xeventbox),"track_name");
+  char *newtext=lives_strdup_printf(_("%s (layer %d)"),tname,tnum);
   lives_label_set_text(LIVES_LABEL(label),newtext);
-  g_free(newtext);
+  lives_free(newtext);
+}
+
+
+void set_track_label_string(lives_mt *mt, int track, const char *label) {
+  LiVESWidget *ebox=get_eventbox_for_track(mt,track);
+  if (ebox==NULL) return;
+  lives_widget_object_set_data(LIVES_WIDGET_OBJECT(ebox),"track_name",(livespointer)label);
+  set_track_label(LIVES_EVENT_BOX(ebox),track);
 }
 
 
-void add_video_track (lives_mt *mt, boolean behind) {
+static int add_video_track(lives_mt *mt, boolean behind) {
   // add another video track to our timeline_table
   LiVESWidget *label;
   LiVESWidget *checkbutton;
   LiVESWidget *arrow;
-  LiVESWidget *eventbox;  // each track has an eventbox, which we store in GList *video_draws
-  LiVESWidget *aeventbox; // each track has optionally an associated audio track, which we store in GList *audio_draws
+  LiVESWidget *eventbox;  // each track has an eventbox, which we store in LiVESList *video_draws
+  LiVESWidget *aeventbox; // each track has optionally an associated audio track, which we store in LiVESList *audio_draws
   int i;
-  GList *liste;
+  LiVESList *liste;
   int max_disp_vtracks=mt->max_disp_vtracks;
-  gchar *tmp;
+  char *tmp;
 
   if (mt->audio_draws!=NULL&&mt->audio_draws->data!=NULL&&mt->opts.back_audio_tracks>0&&
-      GPOINTER_TO_INT(g_object_get_data(G_OBJECT(mt->audio_draws->data),"hidden"))==0) {
+      LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(mt->audio_draws->data),"hidden"))==0) {
     max_disp_vtracks--;
-    if (GPOINTER_TO_INT(g_object_get_data(G_OBJECT(mt->audio_draws->data),"expanded"))) max_disp_vtracks-=cfile->achans;
+    if (LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(mt->audio_draws->data),
+                             "expanded"))) max_disp_vtracks-=cfile->achans;
   }
 
   mt->num_video_tracks++;
@@ -10170,114 +10388,118 @@
 #ifdef ENABLE_GIW
   if (!prefs->lamp_buttons) {
 #endif
-    checkbutton = lives_check_button_new ();
+    checkbutton = lives_check_button_new();
 #ifdef ENABLE_GIW
-  }
-  else {
+  } else {
     checkbutton=giw_led_new();
     giw_led_enable_mouse(GIW_LED(checkbutton),TRUE);
   }
 #endif
   lives_object_ref(checkbutton);
 
+  mt->cb_list=lives_list_append(mt->cb_list,checkbutton);
+
   if (LIVES_IS_WIDGET(checkbutton)) {
-    lives_widget_set_tooltip_text( checkbutton, _("Select track"));
+    lives_widget_set_tooltip_text(checkbutton, _("Select track"));
   }
 
-  arrow = lives_arrow_new (LIVES_ARROW_RIGHT, LIVES_SHADOW_OUT);
-  lives_widget_set_tooltip_text( arrow, _("Show/hide audio"));
+  arrow = lives_arrow_new(LIVES_ARROW_RIGHT, LIVES_SHADOW_OUT);
+  lives_widget_set_tooltip_text(arrow, _("Show/hide audio"));
   lives_object_ref(arrow);
 
   eventbox=lives_event_box_new();
   lives_object_ref(eventbox);
 
-  g_object_set_data (G_OBJECT(eventbox),"track_name",g_strdup_printf(_("Video %d"),mt->num_video_tracks));
-  g_object_set_data (G_OBJECT(eventbox),"checkbutton",(gpointer)checkbutton);
-  g_object_set_data (G_OBJECT(eventbox),"arrow",(gpointer)arrow);
-  g_object_set_data (G_OBJECT(eventbox),"expanded",GINT_TO_POINTER(FALSE));
-
-  g_object_set_data (G_OBJECT(eventbox), "blocks", (gpointer)NULL);
-  g_object_set_data (G_OBJECT(eventbox), "block_last", (gpointer)NULL);
-  g_object_set_data (G_OBJECT(eventbox), "hidden", GINT_TO_POINTER(0));
-  g_object_set_data (G_OBJECT(eventbox), "bgimg", NULL);
+  lives_widget_object_set_data(LIVES_WIDGET_OBJECT(eventbox),"track_name",lives_strdup_printf(_("Video %d"),mt->num_video_tracks));
+  lives_widget_object_set_data(LIVES_WIDGET_OBJECT(eventbox),"checkbutton",(livespointer)checkbutton);
+  lives_widget_object_set_data(LIVES_WIDGET_OBJECT(eventbox),"arrow",(livespointer)arrow);
+  lives_widget_object_set_data(LIVES_WIDGET_OBJECT(eventbox),"expanded",LIVES_INT_TO_POINTER(FALSE));
+
+  lives_widget_object_set_data(LIVES_WIDGET_OBJECT(eventbox), "blocks", (livespointer)NULL);
+  lives_widget_object_set_data(LIVES_WIDGET_OBJECT(eventbox), "block_last", (livespointer)NULL);
+  lives_widget_object_set_data(LIVES_WIDGET_OBJECT(eventbox), "hidden", LIVES_INT_TO_POINTER(0));
+  lives_widget_object_set_data(LIVES_WIDGET_OBJECT(eventbox), "bgimg", NULL);
 
   lives_adjustment_set_page_size(LIVES_ADJUSTMENT(mt->vadjustment),(double)(max_disp_vtracks>mt->num_video_tracks?
-									    mt->num_video_tracks:max_disp_vtracks));
+                                 mt->num_video_tracks:max_disp_vtracks));
   lives_adjustment_set_upper(LIVES_ADJUSTMENT(mt->vadjustment),(double)(mt->num_video_tracks+
-									(int)lives_adjustment_get_page_size(LIVES_ADJUSTMENT(mt->vadjustment))));
+                             (int)lives_adjustment_get_page_size(LIVES_ADJUSTMENT(mt->vadjustment))));
 
   if (!behind) {
     // track in front of (above) stack
     // shift all rows down
     // increment "layer_number"s, change labels
-    g_object_set_data (G_OBJECT(eventbox),"layer_number",GINT_TO_POINTER(0));
-    for (i=0;i<mt->num_video_tracks-1;i++) {
-      gchar *newtext;
-      LiVESWidget *xeventbox=(LiVESWidget *)g_list_nth_data(mt->video_draws,i);
-      LiVESWidget *xcheckbutton=(LiVESWidget *)g_object_get_data(G_OBJECT(xeventbox),"checkbutton");
-      LiVESWidget *xarrow=(LiVESWidget *)g_object_get_data(G_OBJECT(xeventbox),"arrow");
-      g_object_set_data (G_OBJECT(xeventbox),"layer_number",GINT_TO_POINTER(i+1));
-      g_object_set_data (G_OBJECT(xcheckbutton),"layer_number",GINT_TO_POINTER(i+1));
-      g_object_set_data (G_OBJECT(xarrow),"layer_number",GINT_TO_POINTER(i+1));
+    lives_widget_object_set_data(LIVES_WIDGET_OBJECT(eventbox),"layer_number",LIVES_INT_TO_POINTER(0));
+    for (i=0; i<mt->num_video_tracks-1; i++) {
+      char *newtext;
+      LiVESWidget *xeventbox=(LiVESWidget *)lives_list_nth_data(mt->video_draws,i);
+      LiVESWidget *xcheckbutton=(LiVESWidget *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(xeventbox),"checkbutton");
+      LiVESWidget *xarrow=(LiVESWidget *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(xeventbox),"arrow");
+      lives_widget_object_set_data(LIVES_WIDGET_OBJECT(xeventbox),"layer_number",LIVES_INT_TO_POINTER(i+1));
+      lives_widget_object_set_data(LIVES_WIDGET_OBJECT(xcheckbutton),"layer_number",LIVES_INT_TO_POINTER(i+1));
+      lives_widget_object_set_data(LIVES_WIDGET_OBJECT(xarrow),"layer_number",LIVES_INT_TO_POINTER(i+1));
+      lives_widget_object_set_data(LIVES_WIDGET_OBJECT(xeventbox),"is_audio",LIVES_INT_TO_POINTER(FALSE));
 
 
       set_track_label(LIVES_EVENT_BOX(xeventbox),i+1);
 
       if (mt->opts.pertrack_audio) {
-	LiVESWidget *aeventbox=(LiVESWidget *)g_object_get_data(G_OBJECT(xeventbox),"atrack");
-	g_object_set_data (G_OBJECT(aeventbox),"layer_number",GINT_TO_POINTER(i+1));
-	xarrow=(LiVESWidget *)g_object_get_data(G_OBJECT(aeventbox),"arrow");
-	g_object_set_data (G_OBJECT(xarrow),"layer_number",GINT_TO_POINTER(i+1));
-	label=(LiVESWidget *)g_object_get_data(G_OBJECT(aeventbox),"label");
-	g_object_set_data (G_OBJECT(aeventbox),"track_name",g_strdup_printf(_("Layer %d audio"),i+1));
-	newtext=g_strdup_printf(_(" %s"),g_object_get_data(G_OBJECT(aeventbox),"track_name"));
-	lives_label_set_text(LIVES_LABEL(label),newtext);
+        LiVESWidget *aeventbox=(LiVESWidget *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(xeventbox),"atrack");
+        lives_widget_object_set_data(LIVES_WIDGET_OBJECT(aeventbox),"layer_number",LIVES_INT_TO_POINTER(i+1));
+        xarrow=(LiVESWidget *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(aeventbox),"arrow");
+        lives_widget_object_set_data(LIVES_WIDGET_OBJECT(xarrow),"layer_number",LIVES_INT_TO_POINTER(i+1));
+        label=(LiVESWidget *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(aeventbox),"label");
+        lives_widget_object_set_data(LIVES_WIDGET_OBJECT(aeventbox),"track_name",lives_strdup_printf(_("Layer %d audio"),i+1));
+        newtext=lives_strdup_printf(_(" %s"),lives_widget_object_get_data(LIVES_WIDGET_OBJECT(aeventbox),"track_name"));
+        lives_label_set_text(LIVES_LABEL(label),newtext);
+        lives_widget_object_set_data(LIVES_WIDGET_OBJECT(aeventbox),"is_audio",LIVES_INT_TO_POINTER(TRUE));
       }
     }
     // add a -1,0 in all frame events
     // renumber "in_tacks", "out_tracks" in effect_init events
     event_list_add_track(mt->event_list,0);
 
-    mt->video_draws=g_list_prepend (mt->video_draws, (gpointer)eventbox);
+    mt->video_draws=lives_list_prepend(mt->video_draws, (livespointer)eventbox);
     mt->current_track=0;
 
     //renumber all tracks in mt->selected_tracks
     liste=mt->selected_tracks;
     while (liste!=NULL) {
-      liste->data=GINT_TO_POINTER(GPOINTER_TO_INT(liste->data)+1);
+      liste->data=LIVES_INT_TO_POINTER(LIVES_POINTER_TO_INT(liste->data)+1);
       liste=liste->next;
     }
-  }
-  else {
+  } else {
     // add track behind (below) stack
-    mt->video_draws=g_list_append (mt->video_draws, (gpointer)eventbox);
-    g_object_set_data (G_OBJECT(eventbox),"layer_number",GINT_TO_POINTER(mt->num_video_tracks-1));
-    g_object_set_data (G_OBJECT(checkbutton),"layer_number",GINT_TO_POINTER(mt->num_video_tracks-1));
-    g_object_set_data (G_OBJECT(arrow),"layer_number",GINT_TO_POINTER(mt->num_video_tracks-1));
+    mt->video_draws=lives_list_append(mt->video_draws, (livespointer)eventbox);
+    lives_widget_object_set_data(LIVES_WIDGET_OBJECT(eventbox),"layer_number",LIVES_INT_TO_POINTER(mt->num_video_tracks-1));
+    lives_widget_object_set_data(LIVES_WIDGET_OBJECT(checkbutton),"layer_number",LIVES_INT_TO_POINTER(mt->num_video_tracks-1));
+    lives_widget_object_set_data(LIVES_WIDGET_OBJECT(arrow),"layer_number",LIVES_INT_TO_POINTER(mt->num_video_tracks-1));
     mt->current_track=mt->num_video_tracks-1;
   }
 
   widget_opts.justify=LIVES_JUSTIFY_LEFT;
-  label=lives_label_new ((tmp=g_strdup_printf(_("%s (layer %d)"),g_object_get_data (G_OBJECT(eventbox),"track_name"),
-					    GPOINTER_TO_INT(g_object_get_data(G_OBJECT(eventbox),"layer_number")))));
+  label=lives_label_new((tmp=lives_strdup_printf(_("%s (layer %d)"),
+                             lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"track_name"),
+                             LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),
+                                 "layer_number")))));
   widget_opts.justify=widget_opts.default_justify;
-  
-  g_free(tmp);
+
+  lives_free(tmp);
   lives_object_ref(label);
 
   if (palette->style&STYLE_1) {
     if (!(palette->style&STYLE_3)) {
-      lives_widget_set_fg_color (label, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
-      lives_widget_set_fg_color (label, LIVES_WIDGET_STATE_PRELIGHT, &palette->normal_back);
+      lives_widget_set_fg_color(label, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+      lives_widget_set_fg_color(label, LIVES_WIDGET_STATE_PRELIGHT, &palette->normal_back);
     }
   }
 
-  g_object_set_data (G_OBJECT(eventbox),"label",label);
+  lives_widget_object_set_data(LIVES_WIDGET_OBJECT(eventbox),"label",label);
 
   if (mt->opts.pertrack_audio) {
     aeventbox=add_audio_track(mt,mt->current_track,behind);
-    g_object_set_data (G_OBJECT(aeventbox),"owner",eventbox);
-    g_object_set_data (G_OBJECT(eventbox),"atrack",aeventbox);
+    lives_widget_object_set_data(LIVES_WIDGET_OBJECT(aeventbox),"owner",eventbox);
+    lives_widget_object_set_data(LIVES_WIDGET_OBJECT(eventbox),"atrack",aeventbox);
 
     if (mt->avol_init_event!=NULL) {
       weed_plant_t *filter=get_weed_filter(mt->avol_fx);
@@ -10287,27 +10509,33 @@
   if (!behind) scroll_track_on_screen(mt,0);
   else scroll_track_on_screen(mt,mt->num_video_tracks-1);
 
-  lives_widget_queue_draw (mt->vpaned);
+  lives_widget_queue_draw(mt->vpaned);
 
+  if (!behind) return 0;
+  else return mt->num_video_tracks-1;
 }
 
-void add_video_track_behind (LiVESMenuItem *menuitem, gpointer user_data) {
+int add_video_track_behind(LiVESMenuItem *menuitem, livespointer user_data) {
+  int tnum;
   lives_mt *mt=(lives_mt *)user_data;
   if (menuitem!=NULL) mt_desensitise(mt);
-  add_video_track (mt,TRUE);
+  tnum=add_video_track(mt,TRUE);
   if (menuitem!=NULL) mt_sensitise(mt);
+  return tnum;
 }
 
-void add_video_track_front (LiVESMenuItem *menuitem, gpointer user_data) {
+int add_video_track_front(LiVESMenuItem *menuitem, livespointer user_data) {
+  int tnum;
   lives_mt *mt=(lives_mt *)user_data;
   if (menuitem!=NULL) mt_desensitise(mt);
-  add_video_track (mt,FALSE);
+  tnum=add_video_track(mt,FALSE);
   if (menuitem!=NULL) mt_sensitise(mt);
+  return tnum;
 }
 
 
- 
-void on_mt_fx_edit_activate (LiVESMenuItem *menuitem, gpointer user_data) {
+
+void on_mt_fx_edit_activate(LiVESMenuItem *menuitem, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   if (mt->selected_init_event==NULL) return;
   fubar(mt);
@@ -10315,23 +10543,23 @@
   lives_widget_set_sensitive(mt->apply_fx_button,FALSE);
 }
 
-static boolean mt_fx_edit_idle (gpointer user_data) {
+static boolean mt_fx_edit_idle(livespointer user_data) {
   on_mt_fx_edit_activate(NULL,user_data);
   return FALSE;
 }
 
-static void mt_avol_quick(LiVESMenuItem *menuitem, gpointer user_data) {
+static void mt_avol_quick(LiVESMenuItem *menuitem, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   mt->selected_init_event=mt->avol_init_event;
   on_mt_fx_edit_activate(menuitem,user_data);
 }
 
-static void rdrw_cb(LiVESMenuItem *menuitem, gpointer user_data) {
+static void rdrw_cb(LiVESMenuItem *menuitem, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   redraw_all_event_boxes(mt);
 }
 
-void do_effect_context (lives_mt *mt, LiVESXEventButton *event) {
+void do_effect_context(lives_mt *mt, LiVESXEventButton *event) {
   // pop up a context menu when a selected block is right clicked on
 
   LiVESWidget *edit_effect;
@@ -10339,11 +10567,11 @@
   LiVESWidget *menu=lives_menu_new();
 
   weed_plant_t *filter;
-  gchar *fhash;
+  char *fhash;
 
   int error;
 
-  lives_menu_set_title (LIVES_MENU(menu),_("LiVES: Selected effect"));
+  lives_menu_set_title(LIVES_MENU(menu),_("LiVES: Selected effect"));
 
   if (palette->style&STYLE_1) {
     lives_widget_set_bg_color(menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
@@ -10352,52 +10580,50 @@
 
   fhash=weed_get_string_value(mt->selected_init_event,"filter",&error);
   filter=get_weed_filter(weed_get_idx_for_hashname(fhash,TRUE));
-  weed_free(fhash);
+  lives_free(fhash);
 
   if (num_in_params(filter,TRUE,TRUE)>0) {
-    edit_effect = lives_menu_item_new_with_mnemonic (_("_View/Edit this effect"));
-  }
-  else {
-    edit_effect = lives_menu_item_new_with_mnemonic (_("_View this effect"));
+    edit_effect = lives_menu_item_new_with_mnemonic(_("_View/Edit this effect"));
+  } else {
+    edit_effect = lives_menu_item_new_with_mnemonic(_("_View this effect"));
   }
-  lives_container_add (LIVES_CONTAINER (menu), edit_effect);
-  
-  lives_signal_connect (LIVES_GUI_OBJECT (edit_effect), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (on_mt_fx_edit_activate),
-		    (gpointer)mt);
+  lives_container_add(LIVES_CONTAINER(menu), edit_effect);
 
-  delete_effect = lives_menu_item_new_with_mnemonic (_("_Delete this effect"));
+  lives_signal_connect(LIVES_GUI_OBJECT(edit_effect), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_mt_fx_edit_activate),
+                       (livespointer)mt);
+
+  delete_effect = lives_menu_item_new_with_mnemonic(_("_Delete this effect"));
   if (mt->selected_init_event!=mt->avol_init_event) {
-    lives_container_add (LIVES_CONTAINER (menu), delete_effect);
-  
-    lives_signal_connect (LIVES_GUI_OBJECT (delete_effect), LIVES_WIDGET_ACTIVATE_EVENT,
-		      LIVES_GUI_CALLBACK (on_mt_delfx_activate),
-		      (gpointer)mt);
+    lives_container_add(LIVES_CONTAINER(menu), delete_effect);
+
+    lives_signal_connect(LIVES_GUI_OBJECT(delete_effect), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                         LIVES_GUI_CALLBACK(on_mt_delfx_activate),
+                         (livespointer)mt);
   }
 
-  lives_widget_show_all (menu);
-  lives_menu_popup (LIVES_MENU(menu), event);
+  lives_widget_show_all(menu);
+  lives_menu_popup(LIVES_MENU(menu), event);
 
 }
 
 
 
 
-static boolean
-fx_ebox_pressed (LiVESWidget *eventbox, LiVESXEventButton *event, gpointer user_data) {
+static boolean fx_ebox_pressed(LiVESWidget *eventbox, LiVESXEventButton *event, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
-  GList *children,*xlist;
+  LiVESList *children,*xlist;
   weed_plant_t *osel=mt->selected_init_event;
 
   if (mt->is_rendering) return FALSE;
 
-  mt->selected_init_event=(weed_plant_t *)g_object_get_data(G_OBJECT(eventbox),"init_event");
+  mt->selected_init_event=(weed_plant_t *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"init_event");
 
-  if (event->type==GDK_2BUTTON_PRESS) {
+  if (event->type==LIVES_BUTTON2_PRESS) {
     // double click
     mt->moving_fx=NULL;
     if (mainw->playing_file==-1) {
-      g_idle_add_full(G_PRIORITY_LOW,mt_fx_edit_idle,mt,NULL); // work around bug in gtk+
+      lives_idle_add_full(G_PRIORITY_LOW,mt_fx_edit_idle,mt,NULL); // work around bug in gtk+
     }
     return FALSE;
   }
@@ -10405,40 +10631,40 @@
   if (mainw->playing_file==-1) {
     if (mt->fx_order!=FX_ORD_NONE) {
       if (osel!=mt->selected_init_event&&osel!=mt->avol_init_event) {
-	switch (mt->fx_order) {
-	case FX_ORD_BEFORE:
-	  /// backup events and note timecode of filter map
-	  mt_backup(mt,MT_UNDO_FILTER_MAP_CHANGE,get_event_timecode(mt->fm_edit_event));
-
-	  /// move the init event in the filter map
-	  move_init_in_filter_map(mt,mt->event_list,mt->fm_edit_event,osel,mt->selected_init_event,
-				  mt->current_track,FALSE);
-	  mt->did_backup=FALSE;
-	  break;
-	case FX_ORD_AFTER:
-	  if (init_event_is_process_last(mt->selected_init_event)) {
-	    // cannot insert after a process_last effect
-	    clear_context(mt);
-	    add_context_label(mt,_("Cannot insert after this effect"));
-	    mt->selected_init_event=osel;
-	    mt->fx_order=FX_ORD_NONE;
-	    return FALSE;
-	  }
-
-	  /// backup events and note timecode of filter map
-	  mt_backup(mt,MT_UNDO_FILTER_MAP_CHANGE,get_event_timecode(mt->fm_edit_event));
-
-	  /// move the init event in the filter map
-	  move_init_in_filter_map(mt,mt->event_list,mt->fm_edit_event,osel,mt->selected_init_event,
-				  mt->current_track,TRUE);
-	  mt->did_backup=FALSE;
-	  break;
-
-	default:
-	  break;
-	}
+        switch (mt->fx_order) {
+        case FX_ORD_BEFORE:
+          /// backup events and note timecode of filter map
+          mt_backup(mt,MT_UNDO_FILTER_MAP_CHANGE,get_event_timecode(mt->fm_edit_event));
+
+          /// move the init event in the filter map
+          move_init_in_filter_map(mt,mt->event_list,mt->fm_edit_event,osel,mt->selected_init_event,
+                                  mt->current_track,FALSE);
+          mt->did_backup=FALSE;
+          break;
+        case FX_ORD_AFTER:
+          if (init_event_is_process_last(mt->selected_init_event)) {
+            // cannot insert after a process_last effect
+            clear_context(mt);
+            add_context_label(mt,_("Cannot insert after this effect"));
+            mt->selected_init_event=osel;
+            mt->fx_order=FX_ORD_NONE;
+            return FALSE;
+          }
+
+          /// backup events and note timecode of filter map
+          mt_backup(mt,MT_UNDO_FILTER_MAP_CHANGE,get_event_timecode(mt->fm_edit_event));
+
+          /// move the init event in the filter map
+          move_init_in_filter_map(mt,mt->event_list,mt->fm_edit_event,osel,mt->selected_init_event,
+                                  mt->current_track,TRUE);
+          mt->did_backup=FALSE;
+          break;
+
+        default:
+          break;
+        }
       }
-      
+
       mt->selected_init_event=osel;
       mt->fx_order=FX_ORD_NONE;
       polymorph(mt,POLY_FX_STACK);
@@ -10446,16 +10672,15 @@
       return FALSE;
     }
     if (mt->fx_order==FX_ORD_NONE&&WEED_EVENT_IS_FILTER_MAP(mt->fm_edit_event)) {
-      if (init_event_is_process_last(mt->selected_init_event)){
-	clear_context(mt);
-	add_context_label(mt,_("This effect cannot be moved"));
-	if (mt->fx_ibefore_button!=NULL) lives_widget_set_sensitive(mt->fx_ibefore_button,FALSE);
-	if (mt->fx_iafter_button!=NULL) lives_widget_set_sensitive(mt->fx_iafter_button,FALSE);
-      }
-      else {
-	do_fx_move_context(mt);
-	if (mt->fx_ibefore_button!=NULL) lives_widget_set_sensitive(mt->fx_ibefore_button,TRUE);
-	if (mt->fx_iafter_button!=NULL) lives_widget_set_sensitive(mt->fx_iafter_button,TRUE);
+      if (init_event_is_process_last(mt->selected_init_event)) {
+        clear_context(mt);
+        add_context_label(mt,_("This effect cannot be moved"));
+        if (mt->fx_ibefore_button!=NULL) lives_widget_set_sensitive(mt->fx_ibefore_button,FALSE);
+        if (mt->fx_iafter_button!=NULL) lives_widget_set_sensitive(mt->fx_iafter_button,FALSE);
+      } else {
+        do_fx_move_context(mt);
+        if (mt->fx_ibefore_button!=NULL) lives_widget_set_sensitive(mt->fx_ibefore_button,TRUE);
+        if (mt->fx_iafter_button!=NULL) lives_widget_set_sensitive(mt->fx_iafter_button,TRUE);
       }
     }
     lives_widget_set_sensitive(mt->fx_edit,TRUE);
@@ -10471,7 +10696,7 @@
     children=children->next;
   }
 
-  if (xlist!=NULL) g_list_free(xlist);
+  if (xlist!=NULL) lives_list_free(xlist);
 
   if (event->button==3&&mainw->playing_file==-1) {
     do_effect_context(mt,event);
@@ -10484,7 +10709,7 @@
 
 
 static void set_clip_labels_variable(lives_mt *mt, int i) {
-  gchar *tmp;
+  char *tmp;
   LiVESLabel *label1,*label2;
   lives_clip_t *sfile=mainw->files[i];
 
@@ -10493,14 +10718,14 @@
   i=mt_clip_from_file(mt,i);
   i*=2;
 
-  label1=(LiVESLabel *)g_list_nth_data(mt->clip_labels,i);
-  label2=(LiVESLabel *)g_list_nth_data(mt->clip_labels,++i);
+  label1=(LiVESLabel *)lives_list_nth_data(mt->clip_labels,i);
+  label2=(LiVESLabel *)lives_list_nth_data(mt->clip_labels,++i);
 
-  lives_label_set_text(label1,(tmp=g_strdup_printf (_("  %d to %d selected  "),sfile->start,sfile->end)));
-  g_free(tmp);
+  lives_label_set_text(label1,(tmp=lives_strdup_printf(_("  %d to %d selected  "),sfile->start,sfile->end)));
+  lives_free(tmp);
 
-  lives_label_set_text(label2,(tmp=g_strdup_printf (_("%.2f sec."),(sfile->end-sfile->start+1.)/sfile->fps)));
-  g_free(tmp);
+  lives_label_set_text(label2,(tmp=lives_strdup_printf(_("%.2f sec."),(sfile->end-sfile->start+1.)/sfile->fps)));
+  lives_free(tmp);
 
 
 }
@@ -10508,24 +10733,24 @@
 
 void mt_clear_timeline(lives_mt *mt) {
   int i;
-  gchar *msg;
+  char *msg;
 
-  for (i=0;i<mt->num_video_tracks;i++) {
+  for (i=0; i<mt->num_video_tracks; i++) {
     delete_video_track(mt,i,FALSE);
   }
-  g_list_free(mt->video_draws);
+  lives_list_free(mt->video_draws);
   mt->video_draws=NULL;
   mt->num_video_tracks=0;
   mainw->event_list=mt->event_list=NULL;
 
-  if (mt->selected_tracks!=NULL) g_list_free(mt->selected_tracks);
+  if (mt->selected_tracks!=NULL) lives_list_free(mt->selected_tracks);
   mt->selected_tracks=NULL;
 
   if (mt->amixer!=NULL) on_amixer_close_clicked(NULL,mt);
 
   delete_audio_tracks(mt,mt->audio_draws,FALSE);
   mt->audio_draws=NULL;
-  if (mt->audio_vols!=NULL) g_list_free(mt->audio_vols);
+  if (mt->audio_vols!=NULL) lives_list_free(mt->audio_vols);
   mt->audio_vols=NULL;
 
   mt_init_tracks(mt,TRUE);
@@ -10539,16 +10764,16 @@
 
   if (msg!=NULL) {
     d_print(msg);
-    g_free(msg);
+    lives_free(msg);
     set_mt_title(mt);
   }
 
   // reset avol_fx
   if (cfile->achans>0&&mainw->fx_candidates[FX_CANDIDATE_AUDIO_VOL].delegate!=-1) {
     // user (or system) has delegated an audio volume filter from the candidates
-    mt->avol_fx=GPOINTER_TO_INT(g_list_nth_data(mainw->fx_candidates[FX_CANDIDATE_AUDIO_VOL].list,mainw->fx_candidates[FX_CANDIDATE_AUDIO_VOL].delegate));
-  }
-  else mt->avol_fx=-1;
+    mt->avol_fx=LIVES_POINTER_TO_INT(lives_list_nth_data(mainw->fx_candidates[FX_CANDIDATE_AUDIO_VOL].list,
+                                     mainw->fx_candidates[FX_CANDIDATE_AUDIO_VOL].delegate));
+  } else mt->avol_fx=-1;
   mt->avol_init_event=NULL;
 
   add_aparam_menuitems(mt);
@@ -10562,7 +10787,7 @@
 
 void mt_delete_clips(lives_mt *mt, int file) {
   // close eventbox(es) for a given file
-  GList *list=lives_container_get_children(LIVES_CONTAINER (mt->clip_inner_box)),*list_next,*olist=list;
+  LiVESList *list=lives_container_get_children(LIVES_CONTAINER(mt->clip_inner_box)),*list_next,*olist=list;
 
   LiVESWidget *child;
   LiVESWidget *label1,*label2;
@@ -10582,11 +10807,11 @@
       child=(LiVESWidget *)list->data;
       lives_widget_destroy(child);
 
-      label1=(LiVESWidget *)g_list_nth_data(mt->clip_labels,i*2);
-      label2=(LiVESWidget *)g_list_nth_data(mt->clip_labels,i*2+1);
+      label1=(LiVESWidget *)lives_list_nth_data(mt->clip_labels,i*2);
+      label2=(LiVESWidget *)lives_list_nth_data(mt->clip_labels,i*2+1);
 
-      mt->clip_labels=g_list_remove(mt->clip_labels,label1);
-      mt->clip_labels=g_list_remove(mt->clip_labels,label2);
+      mt->clip_labels=lives_list_remove(mt->clip_labels,label1);
+      mt->clip_labels=lives_list_remove(mt->clip_labels,label2);
 
       lives_widget_context_update();
 
@@ -10597,7 +10822,7 @@
     i++;
   }
 
-  if (olist!=NULL) g_list_free(olist);
+  if (olist!=NULL) lives_list_free(olist);
 
   if (mt->event_list!=NULL&&used_in_current_layout(mt,file)&&removed) {
     int current_file=mainw->current_file;
@@ -10607,8 +10832,7 @@
       mainw->current_file=mt->render_file;
       remove_current_from_affected_layouts(mt);
       mainw->current_file=current_file;
-    }
-    else {
+    } else {
       mainw->current_file=mt->render_file;
       mt_init_tracks(mt,FALSE);
       mainw->current_file=current_file;
@@ -10616,7 +10840,7 @@
   }
 
   if (mainw->current_file==-1) {
-    lives_widget_set_sensitive (mt->adjust_start_end, FALSE);
+    lives_widget_set_sensitive(mt->adjust_start_end, FALSE);
   }
 
 }
@@ -10628,7 +10852,7 @@
 
 
 
-void mt_init_clips (lives_mt *mt, int orig_file, boolean add) {
+void mt_init_clips(lives_mt *mt, int orig_file, boolean add) {
   // setup clip boxes in the poly window. if add is TRUE then we are just adding a new clip
   // orig_file is the file we want to select
 
@@ -10641,15 +10865,15 @@
 
   LiVESPixbuf *thumbnail;
 
-  GList *cliplist=mainw->cliplist;
+  LiVESList *cliplist=mainw->cliplist;
 
-  gchar filename[PATH_MAX];
-  gchar clip_name[CLIP_LABEL_LENGTH];
-  gchar *tmp;
+  char filename[PATH_MAX];
+  char clip_name[CLIP_LABEL_LENGTH];
+  char *tmp;
 
   int i=1;
   int width=CLIP_THUMB_WIDTH,height=CLIP_THUMB_HEIGHT;
-  int count=g_list_length(mt->clip_labels)/2;
+  int count=lives_list_length(mt->clip_labels)/2;
 
   mt->clip_selected=-1;
 
@@ -10657,111 +10881,109 @@
 
   while (add||cliplist!=NULL) {
     if (add) i=orig_file;
-    else i=GPOINTER_TO_INT(cliplist->data);
+    else i=LIVES_POINTER_TO_INT(cliplist->data);
     if (mainw->files[i]->clip_type!=CLIP_TYPE_DISK&&mainw->files[i]->clip_type!=CLIP_TYPE_FILE) {
       cliplist=cliplist->next;
       continue;
-      
+
     }
     if (i!=mainw->scrap_file&&i!=mainw->ascrap_file) {
       if (i==orig_file||(mt->clip_selected==-1&&i==mainw->pre_src_file)) {
-	if (!add) mt->clip_selected=mt_clip_from_file(mt,i);
-	else {
-	  mt->file_selected=i;
-	  mt->clip_selected=count;
-	  renumbered_clips[i]=i;
-	}
+        if (!add) mt->clip_selected=mt_clip_from_file(mt,i);
+        else {
+          mt->file_selected=i;
+          mt->clip_selected=count;
+          renumbered_clips[i]=i;
+        }
       }
       // make a small thumbnail, add it to the clips box
       thumbnail=make_thumb(mt,i,width,height,mainw->files[i]->start,TRUE);
 
       eventbox=lives_event_box_new();
       if (palette->style&STYLE_1) {
-	if (palette->style&STYLE_3) {
-	  lives_widget_set_bg_color (eventbox, LIVES_WIDGET_STATE_PRELIGHT, &palette->menu_and_bars);
-	  lives_widget_set_fg_color (eventbox, LIVES_WIDGET_STATE_PRELIGHT, &palette->menu_and_bars_fore);
-	}
-	else {
-	  lives_widget_set_bg_color (eventbox, LIVES_WIDGET_STATE_PRELIGHT, &palette->normal_back);
-	  lives_widget_set_fg_color (eventbox, LIVES_WIDGET_STATE_PRELIGHT, &palette->normal_fore);
-	}
+        if (palette->style&STYLE_3) {
+          lives_widget_set_bg_color(eventbox, LIVES_WIDGET_STATE_PRELIGHT, &palette->menu_and_bars);
+          lives_widget_set_fg_color(eventbox, LIVES_WIDGET_STATE_PRELIGHT, &palette->menu_and_bars_fore);
+        } else {
+          lives_widget_set_bg_color(eventbox, LIVES_WIDGET_STATE_PRELIGHT, &palette->normal_back);
+          lives_widget_set_fg_color(eventbox, LIVES_WIDGET_STATE_PRELIGHT, &palette->normal_fore);
+        }
       }
-      lives_widget_add_events (eventbox, LIVES_BUTTON_RELEASE_MASK | LIVES_BUTTON_PRESS_MASK | LIVES_ENTER_NOTIFY_MASK);
-      lives_signal_connect (LIVES_GUI_OBJECT(eventbox), "enter-notify-event",LIVES_GUI_CALLBACK (on_clipbox_enter),(gpointer)mt);
+      lives_widget_add_events(eventbox, LIVES_BUTTON_RELEASE_MASK | LIVES_BUTTON_PRESS_MASK | LIVES_ENTER_NOTIFY_MASK);
+      lives_signal_connect(LIVES_GUI_OBJECT(eventbox), LIVES_WIDGET_ENTER_EVENT,LIVES_GUI_CALLBACK(on_clipbox_enter),(livespointer)mt);
 
       clips_to_files[count]=i;
 
-      vbox = lives_vbox_new (FALSE, 6.*widget_opts.scale);
+      vbox = lives_vbox_new(FALSE, 6.*widget_opts.scale);
 
       thumb_image=lives_image_new();
       lives_image_set_from_pixbuf(LIVES_IMAGE(thumb_image),thumbnail);
       if (thumbnail!=NULL) lives_object_unref(thumbnail);
-      lives_container_add (LIVES_CONTAINER (eventbox), vbox);
-      lives_box_pack_start (LIVES_BOX (mt->clip_inner_box), eventbox, FALSE, FALSE, 0);
+      lives_container_add(LIVES_CONTAINER(eventbox), vbox);
+      lives_box_pack_start(LIVES_BOX(mt->clip_inner_box), eventbox, FALSE, FALSE, 0);
       if (palette->style&STYLE_4) {
-	lives_widget_set_bg_color(eventbox, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+        lives_widget_set_bg_color(eventbox, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
       }
 
-      g_snprintf (filename,PATH_MAX,"%s",(tmp=g_path_get_basename(mainw->files[i]->name)));
-      g_free(tmp);
+      lives_snprintf(filename,PATH_MAX,"%s",(tmp=lives_path_get_basename(mainw->files[i]->name)));
+      lives_free(tmp);
       get_basename(filename);
-      g_snprintf (clip_name,CLIP_LABEL_LENGTH,"  %s  ",filename);
-      label=lives_label_new (clip_name);
-      if (palette->style&STYLE_3) lives_widget_set_fg_color (label, LIVES_WIDGET_STATE_PRELIGHT, &palette->info_text);
-      if (palette->style&STYLE_4) lives_widget_set_fg_color (label, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
-      lives_box_pack_start (LIVES_BOX (vbox), label, FALSE, FALSE, 0);
-      lives_box_pack_start (LIVES_BOX (vbox), thumb_image, FALSE, FALSE, 0);
-      
-      if (mainw->files[i]->frames>0) {
-	gchar *tmp;
-	label=lives_label_new ((tmp=g_strdup_printf (_("%d frames"),mainw->files[i]->frames)));
-	g_free(tmp);
-	if (palette->style&STYLE_3) lives_widget_set_fg_color (label, LIVES_WIDGET_STATE_PRELIGHT, &palette->info_text);
-	if (palette->style&STYLE_4) lives_widget_set_fg_color (label, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
-	lives_box_pack_start (LIVES_BOX (vbox), label, FALSE, FALSE, 0);
-
-	label=lives_label_new ("");
-	mt->clip_labels=g_list_append(mt->clip_labels,label);
-
-	if (palette->style&STYLE_3) lives_widget_set_fg_color (label, LIVES_WIDGET_STATE_PRELIGHT, &palette->info_text);
-	if (palette->style&STYLE_4) lives_widget_set_fg_color (label, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
-	lives_box_pack_start (LIVES_BOX (vbox), label, FALSE, FALSE, 0);
-
-	label=lives_label_new ("");
-	mt->clip_labels=g_list_append(mt->clip_labels,label);
-
-	if (palette->style&STYLE_3) lives_widget_set_fg_color (label, LIVES_WIDGET_STATE_PRELIGHT, &palette->info_text);
-	if (palette->style&STYLE_4) lives_widget_set_fg_color (label, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
-	lives_box_pack_start (LIVES_BOX (vbox), label, FALSE, FALSE, 0);
+      lives_snprintf(clip_name,CLIP_LABEL_LENGTH,"  %s  ",filename);
+      label=lives_label_new(clip_name);
+      if (palette->style&STYLE_3) lives_widget_set_fg_color(label, LIVES_WIDGET_STATE_PRELIGHT, &palette->info_text);
+      if (palette->style&STYLE_4) lives_widget_set_fg_color(label, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
+      lives_box_pack_start(LIVES_BOX(vbox), label, FALSE, FALSE, 0);
+      lives_box_pack_start(LIVES_BOX(vbox), thumb_image, FALSE, FALSE, 0);
 
-	set_clip_labels_variable(mt,i);
-      }
-      else {
-	label=lives_label_new (g_strdup (_("audio only")));
-	if (palette->style&STYLE_3) lives_widget_set_fg_color (label, LIVES_WIDGET_STATE_PRELIGHT, &palette->info_text);
-	if (palette->style&STYLE_4) lives_widget_set_fg_color (label, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
-	lives_box_pack_start (LIVES_BOX (vbox), label, FALSE, FALSE, 0);
-	mt->clip_labels=g_list_append(mt->clip_labels,label);
-
-	label=lives_label_new (g_strdup_printf (_("%.2f sec."),mainw->files[i]->laudio_time));
-	if (palette->style&STYLE_3) lives_widget_set_fg_color (label, LIVES_WIDGET_STATE_PRELIGHT, &palette->info_text);
-	if (palette->style&STYLE_4) lives_widget_set_fg_color (label, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
-	lives_box_pack_start (LIVES_BOX (vbox), label, FALSE, FALSE, 0);
-	mt->clip_labels=g_list_append(mt->clip_labels,label);
+      if (mainw->files[i]->frames>0) {
+        char *tmp;
+        label=lives_label_new((tmp=lives_strdup_printf(_("%d frames"),mainw->files[i]->frames)));
+        lives_free(tmp);
+        if (palette->style&STYLE_3) lives_widget_set_fg_color(label, LIVES_WIDGET_STATE_PRELIGHT, &palette->info_text);
+        if (palette->style&STYLE_4) lives_widget_set_fg_color(label, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
+        lives_box_pack_start(LIVES_BOX(vbox), label, FALSE, FALSE, 0);
+
+        label=lives_label_new("");
+        mt->clip_labels=lives_list_append(mt->clip_labels,label);
+
+        if (palette->style&STYLE_3) lives_widget_set_fg_color(label, LIVES_WIDGET_STATE_PRELIGHT, &palette->info_text);
+        if (palette->style&STYLE_4) lives_widget_set_fg_color(label, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
+        lives_box_pack_start(LIVES_BOX(vbox), label, FALSE, FALSE, 0);
+
+        label=lives_label_new("");
+        mt->clip_labels=lives_list_append(mt->clip_labels,label);
+
+        if (palette->style&STYLE_3) lives_widget_set_fg_color(label, LIVES_WIDGET_STATE_PRELIGHT, &palette->info_text);
+        if (palette->style&STYLE_4) lives_widget_set_fg_color(label, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
+        lives_box_pack_start(LIVES_BOX(vbox), label, FALSE, FALSE, 0);
+
+        set_clip_labels_variable(mt,i);
+      } else {
+        label=lives_label_new(lives_strdup(_("audio only")));
+        if (palette->style&STYLE_3) lives_widget_set_fg_color(label, LIVES_WIDGET_STATE_PRELIGHT, &palette->info_text);
+        if (palette->style&STYLE_4) lives_widget_set_fg_color(label, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
+        lives_box_pack_start(LIVES_BOX(vbox), label, FALSE, FALSE, 0);
+        mt->clip_labels=lives_list_append(mt->clip_labels,label);
+
+        label=lives_label_new(lives_strdup_printf(_("%.2f sec."),mainw->files[i]->laudio_time));
+        if (palette->style&STYLE_3) lives_widget_set_fg_color(label, LIVES_WIDGET_STATE_PRELIGHT, &palette->info_text);
+        if (palette->style&STYLE_4) lives_widget_set_fg_color(label, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
+        lives_box_pack_start(LIVES_BOX(vbox), label, FALSE, FALSE, 0);
+        mt->clip_labels=lives_list_append(mt->clip_labels,label);
       }
 
       count++;
-      
-      lives_signal_connect (LIVES_GUI_OBJECT (eventbox), "button_press_event",
-			LIVES_GUI_CALLBACK (clip_ebox_pressed),
-			(gpointer)mt);
-      lives_signal_connect (LIVES_GUI_OBJECT (eventbox), "button_release_event",
-			LIVES_GUI_CALLBACK (on_drag_clip_end),
-			(gpointer)mt);
-      
+
+      lives_signal_connect(LIVES_GUI_OBJECT(eventbox), LIVES_WIDGET_BUTTON_PRESS_EVENT,
+                           LIVES_GUI_CALLBACK(clip_ebox_pressed),
+                           (livespointer)mt);
+      lives_signal_connect(LIVES_GUI_OBJECT(eventbox), LIVES_WIDGET_BUTTON_RELEASE_EVENT,
+                           LIVES_GUI_CALLBACK(on_drag_clip_end),
+                           (livespointer)mt);
+
       if (add) {
-	lives_widget_show_all(eventbox);
-	break;
+        lives_widget_show_all(eventbox);
+        break;
       }
     }
     cliplist=cliplist->next;
@@ -10773,7 +10995,7 @@
   int natracks,navols;
   int *atracks;
   double *avols;
-  int catracks=g_list_length(mt->audio_vols);
+  int catracks=lives_list_length(mt->audio_vols);
   int error,i,xtrack,xavol;
 
   if (!weed_plant_has_leaf(elist,"audio_volume_tracks")||!weed_plant_has_leaf(elist,"audio_volume_values")) return;
@@ -10786,11 +11008,11 @@
 
   avols=weed_get_double_array(elist,"audio_volume_values",&error);
   if (error!=WEED_NO_ERROR) {
-    weed_free(atracks);
+    lives_free(atracks);
     return;
   }
 
-  for (i=0;i<natracks;i++) {
+  for (i=0; i<natracks; i++) {
     xtrack=atracks[i];
     if (xtrack<-mt->opts.back_audio_tracks) continue;
     if (xtrack>=catracks-mt->opts.back_audio_tracks) continue;
@@ -10803,19 +11025,24 @@
     set_mixer_track_vol(mt,xtrack+mt->opts.back_audio_tracks,avols[xavol]);
   }
 
-  weed_free(atracks);
-  weed_free(avols);
+  lives_free(atracks);
+  lives_free(avols);
 }
 
 
+static boolean mt_idle_show_current_frame(livespointer mt) {
+  mt_show_current_frame((lives_mt *)mt,FALSE);
+  return FALSE;
+}
+
 
-boolean on_multitrack_activate (LiVESMenuItem *menuitem, weed_plant_t *event_list) {
+boolean on_multitrack_activate(LiVESMenuItem *menuitem, weed_plant_t *event_list) {
   //returns TRUE if we go into mt mode
   int orig_file;
   boolean response;
   boolean transfer_focus=FALSE;
 #ifdef ENABLE_OSC
-  gchar *tmp;
+  char *tmp;
 #endif
   lives_mt *multi;
 
@@ -10826,7 +11053,8 @@
   if (mainw->frame_layer!=NULL) weed_layer_free(mainw->frame_layer);
   mainw->frame_layer=NULL;
 
-  if (prefs->mt_enter_prompt&&mainw->stored_event_list==NULL&&prefs->show_gui&&!(mainw->recoverable_layout&&prefs->startup_interface==STARTUP_CE)) {
+  if (prefs->mt_enter_prompt&&mainw->stored_event_list==NULL&&prefs->show_gui&&!(mainw->recoverable_layout&&
+      prefs->startup_interface==STARTUP_CE)) {
     if (palette->style&STYLE_1) widget_opts.apply_theme=TRUE;
     rdet=create_render_details(3);  // WARNING !! - rdet is global in events.h
     rdet->enc_changed=FALSE;
@@ -10834,16 +11062,16 @@
     do {
       rdet->suggestion_followed=FALSE;
       if ((response=lives_dialog_run(LIVES_DIALOG(rdet->dialog)))==LIVES_RESPONSE_OK) {
-	if (rdet->enc_changed) {
-	  check_encoder_restrictions(FALSE,lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(resaudw->aud_checkbutton)),TRUE);
-	}
+        if (rdet->enc_changed) {
+          check_encoder_restrictions(FALSE,lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(resaudw->aud_checkbutton)),TRUE);
+        }
       }
     } while (rdet->suggestion_followed);
 
-    xarate=(int)atoi (lives_entry_get_text(LIVES_ENTRY(resaudw->entry_arate)));
-    xachans=(int)atoi (lives_entry_get_text(LIVES_ENTRY(resaudw->entry_achans)));
-    xasamps=(int)atoi (lives_entry_get_text(LIVES_ENTRY(resaudw->entry_asamps)));
-    
+    xarate=(int)atoi(lives_entry_get_text(LIVES_ENTRY(resaudw->entry_arate)));
+    xachans=(int)atoi(lives_entry_get_text(LIVES_ENTRY(resaudw->entry_achans)));
+    xasamps=(int)atoi(lives_entry_get_text(LIVES_ENTRY(resaudw->entry_asamps)));
+
     if (lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(resaudw->rb_unsigned))) {
       xse=AFORM_UNSIGNED;;
     }
@@ -10880,29 +11108,28 @@
       set_boolean_pref("mt_pertrack_audio",prefs->mt_pertrack_audio);
       prefs->mt_backaudio=btaud;
       set_int_pref("mt_backaudio",prefs->mt_backaudio);
-    }
-    else {
+    } else {
       if (!prefs->mt_enter_prompt) {
-	prefs->mt_enter_prompt=TRUE;
-	set_boolean_pref("mt_enter_prompt",prefs->mt_enter_prompt);
+        prefs->mt_enter_prompt=TRUE;
+        set_boolean_pref("mt_enter_prompt",prefs->mt_enter_prompt);
       }
     }
 
     if (lives_window_has_toplevel_focus(LIVES_WINDOW(rdet->dialog))) transfer_focus=TRUE;
-    lives_widget_destroy (rdet->dialog); 
-    
+    lives_widget_destroy(rdet->dialog);
+
     if (response==LIVES_RESPONSE_CANCEL) {
-      g_free(rdet->encoder_name);
-      g_free(rdet);
+      lives_free(rdet->encoder_name);
+      lives_free(rdet);
       rdet=NULL;
-      if (resaudw!=NULL) g_free(resaudw);
+      if (resaudw!=NULL) lives_free(resaudw);
       resaudw=NULL;
       return FALSE;
     }
   }
 
   if (mainw->current_file>-1&&cfile!=NULL&&cfile->clip_type==CLIP_TYPE_GENERATOR) {
-    weed_generator_end ((weed_plant_t *)cfile->ext_src);
+    weed_generator_end((weed_plant_t *)cfile->ext_src);
   }
 
   if (prefs->show_gui) {
@@ -10922,7 +11149,7 @@
   cfile->bpp=cfile->img_type==IMG_TYPE_JPEG?24:32;
   cfile->changed=TRUE;
   cfile->is_loaded=TRUE;
-  
+
   cfile->old_frames=cfile->frames;
 
   force_pertrack_audio=FALSE;
@@ -10932,7 +11159,7 @@
     event_list=mainw->stored_event_list;
     rerenumber_clips(NULL);
   }
-  
+
   if (prefs->show_gui) {
     // must check this before event_list_rectify, since it can throw error dialogs
     if (lives_window_has_toplevel_focus(LIVES_WINDOW(mainw->LiVES))) transfer_focus=TRUE;
@@ -10968,6 +11195,7 @@
   if (palette->style&STYLE_1) widget_opts.apply_theme=TRUE;
   multi=multitrack(event_list,orig_file,cfile->fps);
 
+
   if (mainw->stored_event_list!=NULL) {
     mainw->stored_event_list=NULL;
     mainw->stored_layout_undos=NULL;
@@ -10994,13 +11222,13 @@
   }
 
   if (prefs->show_gui) {
-    lives_widget_show_all (multi->window);
+    lives_widget_show_all(multi->window);
 
     if (!prefs->show_recent) {
-      lives_widget_hide (multi->recent_menu);
+      lives_widget_hide(multi->recent_menu);
     }
     if (multi->nb_label!=NULL) {
-      lives_widget_hide (multi->poly_box);
+      lives_widget_hide(multi->poly_box);
       lives_widget_queue_resize(multi->nb_label);
     }
     if (!mainw->has_custom_gens) {
@@ -11022,7 +11250,7 @@
     multi->opts.pertrack_audio=FALSE;
   }
 
-  if (prefs->audio_player!=AUD_PLAYER_JACK&&prefs->audio_player!=AUD_PLAYER_PULSE) {
+  if (!is_realtime_aplayer(prefs->audio_player)) {
     lives_widget_hide(mainw->vol_toolitem);
     if (mainw->vol_label!=NULL) lives_widget_hide(mainw->vol_label);
   }
@@ -11046,67 +11274,64 @@
 
   if (mainw->preview_box!=NULL&&lives_widget_get_parent(mainw->preview_box)!=NULL) {
     lives_object_unref(mainw->preview_box);
-    lives_container_remove (LIVES_CONTAINER (mainw->play_window), mainw->preview_box);
+    lives_container_remove(LIVES_CONTAINER(mainw->play_window), mainw->preview_box);
     mainw->preview_box=NULL;
   }
 
   if (mainw->play_window!=NULL) {
-    gchar *title,*xtrabit;
+    char *title,*xtrabit;
 
-    lives_window_remove_accel_group (LIVES_WINDOW (mainw->play_window), mainw->accel_group);
-    lives_window_add_accel_group (LIVES_WINDOW (mainw->play_window), multi->accel_group);
+    lives_window_remove_accel_group(LIVES_WINDOW(mainw->play_window), mainw->accel_group);
+    lives_window_add_accel_group(LIVES_WINDOW(mainw->play_window), multi->accel_group);
 
     resize_play_window();
-    if (mainw->sepwin_scale!=100.) xtrabit=g_strdup_printf(_(" (%d %% scale)"),(int)mainw->sepwin_scale);
-    else xtrabit=g_strdup("");
-    title=g_strdup_printf("%s%s",lives_window_get_title(LIVES_WINDOW(multi->window)),xtrabit);
+    if (mainw->sepwin_scale!=100.) xtrabit=lives_strdup_printf(_(" (%d %% scale)"),(int)mainw->sepwin_scale);
+    else xtrabit=lives_strdup("");
+    title=lives_strdup_printf("%s%s",lives_window_get_title(LIVES_WINDOW(multi->window)),xtrabit);
     lives_window_set_title(LIVES_WINDOW(mainw->play_window),title);
-    g_free(title);
-    g_free(xtrabit);
+    lives_free(title);
+    lives_free(xtrabit);
 
 
   }
 
-  d_print (_ ("\n==============================\nSwitched to Multitrack mode\n"));
+
+  d_print(_("\n==============================\nSwitched to Multitrack mode\n"));
 
 
-  if (cfile->achans>0&&prefs->audio_player!=AUD_PLAYER_JACK&&prefs->audio_player!=AUD_PLAYER_PULSE) {
+  if (cfile->achans>0&&!is_realtime_aplayer(prefs->audio_player)) {
     do_mt_no_jack_error(WARN_MASK_MT_NO_JACK);
   }
 
   if (prefs->gui_monitor!=0) {
     int xcen=mainw->mgeom[prefs->gui_monitor-1].x+(mainw->mgeom[prefs->gui_monitor-1].width-
-						    lives_widget_get_allocation_width(multi->window))/2;
+             lives_widget_get_allocation_width(multi->window))/2;
     int ycen=mainw->mgeom[prefs->gui_monitor-1].y+(mainw->mgeom[prefs->gui_monitor-1].height-
-						    lives_widget_get_allocation_height(multi->window))/2;
+             lives_widget_get_allocation_height(multi->window))/2;
     lives_window_set_screen(LIVES_WINDOW(multi->window),mainw->mgeom[prefs->gui_monitor-1].screen);
     lives_window_move(LIVES_WINDOW(multi->window),xcen,ycen);
   }
 
 
   if ((prefs->gui_monitor!=0||capable->nmonitors<=1)&&prefs->open_maximised) {
-    lives_window_maximize (LIVES_WINDOW(multi->window));
+    lives_window_maximize(LIVES_WINDOW(multi->window));
   }
 
-  multi->is_ready=FALSE;
-  mt_show_current_frame(multi,FALSE);
-  multi->is_ready=TRUE;
+  lives_idle_add(mt_idle_show_current_frame,(livespointer)multi);
 
   if (transfer_focus) lives_window_present(LIVES_WINDOW(multi->window));
 
   mainw_was_ready=mainw->is_ready;
   mainw->is_ready=TRUE;
 
-#ifdef ENABLE_OSC
-  lives_osc_notify(LIVES_OSC_NOTIFY_MODE_CHANGED,(tmp=g_strdup_printf("%d",STARTUP_MT)));
-  g_free(tmp);
-#endif
+  lives_notify(LIVES_OSC_NOTIFY_MODE_CHANGED,(tmp=lives_strdup_printf("%d",STARTUP_MT)));
+  lives_free(tmp);
 
   multi->no_expose=FALSE;
 
   if (prefs->show_gui)
-    lives_widget_hide (mainw->LiVES);
-  
+    lives_widget_hide(mainw->LiVES);
+
   lives_widget_context_update();
 
   redraw_all_event_boxes(multi);
@@ -11117,14 +11342,15 @@
     multi->idlefunc=mt_idle_add(multi);
   }
 
+  set_interactive(mainw->interactive);
   return TRUE;
 }
 
 
-boolean block_overlap (LiVESWidget *eventbox, double time_start, double time_end) {
+boolean block_overlap(LiVESWidget *eventbox, double time_start, double time_end) {
   weed_timecode_t tc_start=time_start*U_SECL;
   weed_timecode_t tc_end=time_end*U_SECL;
-  track_rect *block=(track_rect *)g_object_get_data (G_OBJECT(eventbox),"blocks");
+  track_rect *block=(track_rect *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"blocks");
 
   while (block!=NULL) {
     if (get_event_timecode(block->start_event)>tc_end) return FALSE;
@@ -11132,18 +11358,18 @@
     block=block->next;
   }
   return FALSE;
-}  
+}
 
 
 
 
-static track_rect *get_block_before (LiVESWidget *eventbox, double time, boolean allow_cur) {
+static track_rect *get_block_before(LiVESWidget *eventbox, double time, boolean allow_cur) {
   // get the last block which ends before or at time
-  // if allow_cur is TRUE, we may count blocks whose end is after "time" but whose start is 
+  // if allow_cur is TRUE, we may count blocks whose end is after "time" but whose start is
   // before or at time
 
   weed_timecode_t tc=time*U_SECL;
-  track_rect *block=(track_rect *)g_object_get_data (G_OBJECT(eventbox),"blocks"),*last_block=NULL;
+  track_rect *block=(track_rect *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"blocks"),*last_block=NULL;
 
   while (block!=NULL) {
     if ((allow_cur&&get_event_timecode(block->start_event)>=tc)||(!allow_cur&&get_event_timecode(block->end_event)>=tc)) break;
@@ -11153,13 +11379,13 @@
   return last_block;
 }
 
-static track_rect *get_block_after (LiVESWidget *eventbox, double time, boolean allow_cur) {
+static track_rect *get_block_after(LiVESWidget *eventbox, double time, boolean allow_cur) {
   // return the first block which starts at or after time
-  // if allow_cur is TRUE, we may count blocks whose end is after "time" but whose start is 
+  // if allow_cur is TRUE, we may count blocks whose end is after "time" but whose start is
   // before or at time
 
   weed_timecode_t tc=time*U_SECL;
-  track_rect *block=(track_rect *)g_object_get_data (G_OBJECT(eventbox),"blocks");
+  track_rect *block=(track_rect *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"blocks");
 
   while (block!=NULL) {
     if (get_event_timecode(block->start_event)>=tc||(allow_cur&&get_event_timecode(block->end_event)>=tc)) break;
@@ -11169,31 +11395,66 @@
 }
 
 
-static track_rect *move_block (lives_mt *mt, track_rect *block, double timesecs, int old_track, int new_track) {
+
+track_rect *move_block(lives_mt *mt, track_rect *block, double timesecs, int old_track, int new_track) {
   weed_timecode_t new_start_tc,end_tc;
   weed_timecode_t start_tc=get_event_timecode(block->start_event);
+
+  ulong uid=block->uid;
+
   LiVESWidget *eventbox,*oeventbox;
+
   int clip,current_track=-1;
+
   boolean did_backup=mt->did_backup;
 
   if (!did_backup&&mt->idlefunc>0) {
-    g_source_remove(mt->idlefunc);
+    lives_source_remove(mt->idlefunc);
     mt->idlefunc=0;
   }
 
-  if (!did_backup) {
-    if (old_track==-1) mt_backup(mt,MT_UNDO_MOVE_AUDIO_BLOCK,0);
-    else mt_backup(mt,MT_UNDO_MOVE_BLOCK,0);
-  }
 
-  if (is_audio_eventbox(mt,block->eventbox)&&(oeventbox=(LiVESWidget *)g_object_get_data(G_OBJECT(block->eventbox),"owner"))!=NULL) {
+  if (is_audio_eventbox(block->eventbox)&&(oeventbox=
+        (LiVESWidget *)lives_widget_object_get_data
+        (LIVES_WIDGET_OBJECT(block->eventbox),"owner"))!=NULL) {
     // if moving an audio block we move the associated video block first
     block=get_block_from_time(oeventbox,start_tc/U_SEC,mt);
   }
 
   mt->block_selected=block;
   end_tc=get_event_timecode(block->end_event);
-  
+
+
+  if (mt->opts.insert_mode==INSERT_MODE_NORMAL) {
+    // first check if there is space to move the block to, otherwise we will abort the move
+    weed_plant_t *event=NULL;
+    weed_timecode_t tc=0,tcnow;
+    weed_timecode_t tclen=end_tc-start_tc;
+    while (tc<=tclen) {
+      tcnow=q_gint64(tc+timesecs*U_SEC,mt->fps);
+      tc+=U_SEC/mt->fps;
+      if (old_track==new_track&&tcnow>=start_tc&&tcnow<=end_tc) continue; // ignore ourself !
+      event=get_frame_event_at(mt->event_list,tcnow,event,TRUE);
+      if (event==NULL) break; // must be end of timeline
+      if (new_track>=0) {
+        // is video track, if we have a non-blank frame, abort
+        if (get_frame_event_clip(event,new_track)>=0) return NULL;
+      } else {
+        // is audio track, see if we are in an audio block
+        if (tc==start_tc&&get_audio_block_start(mt->event_list,new_track,tcnow,TRUE)!=NULL) return NULL;
+        // or if one starts here
+        if (get_audio_block_start(mt->event_list,new_track,tcnow,FALSE)!=NULL) return NULL;
+      }
+    }
+  }
+
+
+  if (!did_backup) {
+    if (old_track<0) mt_backup(mt,MT_UNDO_MOVE_AUDIO_BLOCK,0);
+    else mt_backup(mt,MT_UNDO_MOVE_BLOCK,0);
+  }
+
+
   mt->specific_event=get_prev_event(block->start_event);
   while (mt->specific_event!=NULL&&get_event_timecode(mt->specific_event)==start_tc) {
     mt->specific_event=get_prev_event(mt->specific_event);
@@ -11203,8 +11464,7 @@
     clip=get_frame_event_clip(block->start_event,old_track);
     mt->insert_start=block->offset_start;
     mt->insert_end=block->offset_start+end_tc-start_tc+q_gint64(U_SEC/mt->fps,mt->fps);
-  }
-  else {
+  } else {
     clip=get_audio_frame_clip(block->start_event,old_track);
     mt->insert_avel=get_audio_frame_vel(block->start_event,old_track);
     mt->insert_start=q_gint64(get_audio_frame_seek(block->start_event,old_track)*U_SEC,mt->fps);
@@ -11213,49 +11473,53 @@
 
   mt->moving_block=TRUE;
   mt->current_track=old_track;
-  delete_block_cb(NULL,(gpointer)mt);
+  delete_block_cb(NULL,(livespointer)mt);
   mt->block_selected=NULL;
   mt->current_track=new_track;
   track_select(mt);
   mt->clip_selected=mt_clip_from_file(mt,clip);
   mt_clip_select(mt,TRUE);
-  mt_tl_move(mt,timesecs-lives_ruler_get_value(LIVES_RULER(mt->timeline)));
+  mt_tl_move(mt,timesecs);
+
+  if (new_track!=-1) insert_here_cb(NULL,(livespointer)mt);
 
-  if (new_track!=-1) insert_here_cb(NULL,(gpointer)mt);
   else {
-    insert_audio_here_cb(NULL,(gpointer)mt);
+    insert_audio_here_cb(NULL,(livespointer)mt);
     mt->insert_avel=1.;
   }
 
   mt->insert_start=mt->insert_end=-1;
 
   new_start_tc=q_gint64(timesecs*U_SEC,mt->fps);
+
+  remove_end_blank_frames(mt->event_list,FALSE); // leave filter inits
+
+  // if !move_effects we deleted fx in delete_block, here we move them
   if (mt->opts.move_effects) update_filter_events(mt,mt->specific_event,start_tc,end_tc,old_track,new_start_tc,mt->current_track);
+
+  remove_end_blank_frames(mt->event_list, TRUE); // remove filter inits
   mt->moving_block=FALSE;
   mt->specific_event=NULL;
 
-  if (new_track!=-1) eventbox=(LiVESWidget *)g_list_nth_data(mt->video_draws,mt->current_track);
+  if (new_track!=-1) eventbox=(LiVESWidget *)lives_list_nth_data(mt->video_draws,mt->current_track);
   else eventbox=(LiVESWidget *)mt->audio_draws->data;
-  block = (track_rect *)g_object_get_data(G_OBJECT(eventbox),"block_last");
-  
-  remove_end_blank_frames(mt->event_list);
+  block = (track_rect *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"block_last");
 
   if (block!=NULL&&(mt->opts.grav_mode==GRAV_MODE_LEFT||(mt->opts.grav_mode==GRAV_MODE_RIGHT&&block->next!=NULL))&&!did_backup) {
     double oldr_start=mt->region_start;
     double oldr_end=mt->region_end;
-    GList *tracks_sel=NULL;
+    LiVESList *tracks_sel=NULL;
     track_rect *lblock;
     double rtc=get_event_timecode(block->start_event)/U_SEC-1./mt->fps,rstart=0.,rend;
 
     if (mt->opts.grav_mode==GRAV_MODE_LEFT) {
       // gravity left - move left until we hit another block or time 0
       if (rtc>=0.) {
-	lblock=block->prev;
-	if (lblock!=NULL) rstart=get_event_timecode(lblock->end_event)/U_SEC;
+        lblock=block->prev;
+        if (lblock!=NULL) rstart=get_event_timecode(lblock->end_event)/U_SEC;
       }
       rend=get_event_timecode(block->end_event)/U_SEC;
-    }
-    else {
+    } else {
       // gravity right - move right until we hit the next block
       lblock=block->next;
       rstart=get_event_timecode(block->start_event)/U_SEC;
@@ -11266,34 +11530,35 @@
     mt->region_end=rend;
 
     if (new_track>-1) {
-      tracks_sel=g_list_copy(mt->selected_tracks);
-      if (mt->selected_tracks!=NULL) g_list_free(mt->selected_tracks);
+      tracks_sel=lives_list_copy(mt->selected_tracks);
+      if (mt->selected_tracks!=NULL) lives_list_free(mt->selected_tracks);
       mt->selected_tracks=NULL;
-      mt->selected_tracks=g_list_append(mt->selected_tracks,GINT_TO_POINTER(new_track));
-     }
-    else {
+      mt->selected_tracks=lives_list_append(mt->selected_tracks,LIVES_INT_TO_POINTER(new_track));
+    } else {
       current_track=mt->current_track;
       mt->current_track=old_track;
     }
 
     remove_first_gaps(NULL,mt);
     if (old_track>-1) {
-      g_list_free(mt->selected_tracks);
-      mt->selected_tracks=g_list_copy(tracks_sel);
-      if (tracks_sel!=NULL) g_list_free(tracks_sel);
-    }
-    else mt->current_track=current_track;
+      lives_list_free(mt->selected_tracks);
+      mt->selected_tracks=lives_list_copy(tracks_sel);
+      if (tracks_sel!=NULL) lives_list_free(tracks_sel);
+    } else mt->current_track=current_track;
     mt->region_start=oldr_start;
     mt->region_end=oldr_end;
     mt_sensitise(mt);
   }
 
   // get this again because it could have moved
-  block = (track_rect *)g_object_get_data(G_OBJECT(eventbox),"block_last");
+  block = (track_rect *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"block_last");
+
+  // apply autotransition
+  if (prefs->atrans_fx!=-1) mt_do_autotransition(mt, block);
 
   if (!did_backup) {
     if (mt->avol_fx!=-1&&(block==NULL||block->next==NULL)&&mt->audio_draws!=NULL&&
-	mt->audio_draws->data!=NULL&&get_first_event(mt->event_list)!=NULL) {
+        mt->audio_draws->data!=NULL&&get_first_event(mt->event_list)!=NULL) {
       apply_avol_filter(mt);
     }
   }
@@ -11303,18 +11568,21 @@
   if (!did_backup&&mt->framedraw!=NULL&&mt->current_rfx!=NULL&&mt->init_event!=NULL&&
       mt->poly_state==POLY_PARAMS&&weed_plant_has_leaf(mt->init_event,"in_tracks")) {
     weed_timecode_t tc=q_gint64(lives_spin_button_get_value(LIVES_SPIN_BUTTON(mt->node_spinbutton))*U_SEC+
-				get_event_timecode(mt->init_event),mt->fps);
+                                get_event_timecode(mt->init_event),mt->fps);
     get_track_index(mt,tc);
   }
 
+  // give the new block the same uid as the old one
+  if (block!=NULL) block->uid=uid;
+
   if (!did_backup) mt->idlefunc=mt_idle_add(mt);
 
   return block;
 }
 
 
-void unselect_all (lives_mt *mt) {
-  // unselect all blocks 
+void unselect_all(lives_mt *mt) {
+  // unselect all blocks
   int i;
   LiVESWidget *eventbox;
   track_rect *trec;
@@ -11322,56 +11590,56 @@
   if (mt->block_selected!=NULL) lives_widget_queue_draw(mt->block_selected->eventbox);
 
   if (cfile->achans>0) {
-    for (i=0;i<g_list_length(mt->audio_draws);i++) {
-      eventbox=(LiVESWidget *)g_list_nth_data(mt->audio_draws,i);
+    for (i=0; i<lives_list_length(mt->audio_draws); i++) {
+      eventbox=(LiVESWidget *)lives_list_nth_data(mt->audio_draws,i);
       if (eventbox!=NULL) {
-	trec=(track_rect *)g_object_get_data (G_OBJECT(eventbox),"blocks");
-	while (trec!=NULL) {
-	  trec->state=BLOCK_UNSELECTED;
-	  trec=trec->next;
-	}
+        trec=(track_rect *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"blocks");
+        while (trec!=NULL) {
+          trec->state=BLOCK_UNSELECTED;
+          trec=trec->next;
+        }
       }
     }
   }
 
-  for (i=0;i<mt->num_video_tracks;i++) {
-    eventbox=(LiVESWidget *)g_list_nth_data(mt->video_draws,i);
+  for (i=0; i<mt->num_video_tracks; i++) {
+    eventbox=(LiVESWidget *)lives_list_nth_data(mt->video_draws,i);
     if (eventbox!=NULL) {
-      trec=(track_rect *)g_object_get_data (G_OBJECT(eventbox),"blocks");
+      trec=(track_rect *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"blocks");
       while (trec!=NULL) {
-	trec->state=BLOCK_UNSELECTED;
-	trec=trec->next;
+        trec->state=BLOCK_UNSELECTED;
+        trec=trec->next;
       }
     }
   }
   mt->block_selected=NULL;
   lives_widget_set_sensitive(mt->view_in_out,FALSE);
-  lives_widget_set_sensitive (mt->delblock, FALSE);
-  lives_widget_set_sensitive (mt->fx_block, FALSE);
-  lives_widget_set_sensitive (mt->fx_blocka, FALSE);
-  lives_widget_set_sensitive (mt->fx_blockv, FALSE);
-  if (!nb_ignore&&mt->poly_state!=POLY_FX_STACK) polymorph (mt,POLY_CLIPS);
+  lives_widget_set_sensitive(mt->delblock, FALSE);
+  lives_widget_set_sensitive(mt->fx_block, FALSE);
+  lives_widget_set_sensitive(mt->fx_blocka, FALSE);
+  lives_widget_set_sensitive(mt->fx_blockv, FALSE);
+  if (!nb_ignore&&mt->poly_state!=POLY_FX_STACK) polymorph(mt,POLY_CLIPS);
 }
 
 
-void clear_context (lives_mt *mt) {
+void clear_context(lives_mt *mt) {
   if (mt->context_scroll!=NULL) {
-    lives_widget_destroy (mt->context_scroll);
+    lives_widget_destroy(mt->context_scroll);
   }
 
-  mt->context_scroll=lives_scrolled_window_new (NULL, NULL);
+  mt->context_scroll=lives_scrolled_window_new(NULL, NULL);
 
-  lives_container_add (LIVES_CONTAINER (mt->context_frame), mt->context_scroll);
+  lives_container_add(LIVES_CONTAINER(mt->context_frame), mt->context_scroll);
 
-  lives_scrolled_window_set_policy (LIVES_SCROLLED_WINDOW (mt->context_scroll), LIVES_POLICY_AUTOMATIC, 
-				    LIVES_POLICY_AUTOMATIC);
-  
-  mt->context_box = lives_vbox_new (FALSE, 4);
+  lives_scrolled_window_set_policy(LIVES_SCROLLED_WINDOW(mt->context_scroll), LIVES_POLICY_AUTOMATIC,
+                                   LIVES_POLICY_AUTOMATIC);
+
+  mt->context_box = lives_vbox_new(FALSE, 4);
   if (palette->style&STYLE_1) {
     lives_widget_set_bg_color(mt->context_box, LIVES_WIDGET_STATE_NORMAL, &palette->info_base);
   }
 
-  lives_scrolled_window_add_with_viewport (LIVES_SCROLLED_WINDOW (mt->context_scroll), mt->context_box);
+  lives_scrolled_window_add_with_viewport(LIVES_SCROLLED_WINDOW(mt->context_scroll), mt->context_box);
 
   // Apply theme background to scrolled window
   if (palette->style&STYLE_1) {
@@ -11379,28 +11647,28 @@
     lives_widget_set_bg_color(lives_bin_get_child(LIVES_BIN(mt->context_scroll)), LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
   }
 
-  if (mt->opts.show_ctx) lives_widget_show_all (mt->context_frame);
+  if (mt->opts.show_ctx) lives_widget_show_all(mt->context_frame);
 }
 
 
-void add_context_label (lives_mt *mt, const gchar *text) {
+void add_context_label(lives_mt *mt, const char *text) {
   // WARNING - do not add > 8 lines of text (including newlines) - otherwise the window can get resized
 
   LiVESWidget *label;
 
   widget_opts.justify=LIVES_JUSTIFY_CENTER;
   widget_opts.line_wrap=TRUE;
-  label=lives_standard_label_new (text);
+  label=lives_standard_label_new(text);
   widget_opts.line_wrap=FALSE;
   widget_opts.justify=LIVES_JUSTIFY_DEFAULT;
 
-  lives_widget_show (label);
-  lives_box_pack_start (LIVES_BOX (mt->context_box), label, FALSE, FALSE, 0);
+  lives_widget_show(label);
+  lives_box_pack_start(LIVES_BOX(mt->context_box), label, FALSE, FALSE, 0);
 }
 
 
 
-boolean resize_timeline (lives_mt *mt) {
+boolean resize_timeline(lives_mt *mt) {
   double end_secs;
 
   if (mt->event_list==NULL||get_first_event(mt->event_list)==NULL||mt->tl_fixed_length>0.) return FALSE;
@@ -11429,10 +11697,10 @@
   double in_end_range=out_val-1./mt->fps,real_in_start_range=in_start_range;
   double avel=1.;
 
-  int track=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(block->eventbox),"layer_number"));
+  int track=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(block->eventbox),"layer_number"));
 
-  lives_signal_handler_block (mt->spinbutton_out,mt->spin_out_func);
-  lives_signal_handler_block (mt->spinbutton_in,mt->spin_in_func);
+  lives_signal_handler_block(mt->spinbutton_out,mt->spin_out_func);
+  lives_signal_handler_block(mt->spinbutton_in,mt->spin_in_func);
 
   if (block->prev!=NULL) min_tc=get_event_timecode(block->prev->end_event)+(double)(track>=0)*U_SEC/mt->fps;
   if (block->next!=NULL) max_tc=get_event_timecode(block->next->start_event)-(double)(track>=0)*U_SEC/mt->fps;
@@ -11440,11 +11708,10 @@
   if (track>=0) {
     filenum=get_frame_event_clip(block->start_event,track);
 
-    // actually we should quantise this to the mt->fps, but we leave it in case clip has only 
+    // actually we should quantise this to the mt->fps, but we leave it in case clip has only
     // one frame -> otherwise we could quantise to zero frames
     out_end_range=count_resampled_frames(mainw->files[filenum]->frames,mainw->files[filenum]->fps,mt->fps)/mt->fps;
-  }
-  else {
+  } else {
     filenum=get_audio_frame_clip(block->start_event,track);
     out_end_range=q_gint64(mainw->files[filenum]->laudio_time*U_SEC,mt->fps)/U_SEC;
     avel=get_audio_frame_vel(block->start_event,track);
@@ -11452,28 +11719,27 @@
   real_out_end_range=out_end_range;
 
   if (mt->opts.insert_mode!=INSERT_MODE_OVERWRITE) {
-    if (!block->end_anchored&&max_tc>-1&&(((max_tc-offset_start)/U_SEC*ABS(avel)+in_val)<out_end_range)) 
+    if (!block->end_anchored&&max_tc>-1&&(((max_tc-offset_start)/U_SEC*ABS(avel)+in_val)<out_end_range))
       real_out_end_range=q_gint64((max_tc-offset_start)*ABS(avel)+in_val*U_SEC,mt->fps)/U_SEC;
-    if (!block->start_anchored&&min_tc>-1&&(((min_tc-offset_start)/U_SEC*ABS(avel)+in_val)>in_start_range)) 
+    if (!block->start_anchored&&min_tc>-1&&(((min_tc-offset_start)/U_SEC*ABS(avel)+in_val)>in_start_range))
       real_in_start_range=q_gint64((min_tc-offset_start)*ABS(avel)+in_val*U_SEC,mt->fps)/U_SEC;
-    if (!block->start_anchored) out_end_range=real_out_end_range; 
-    if (!block->end_anchored) in_start_range=real_in_start_range; 
+    if (!block->start_anchored) out_end_range=real_out_end_range;
+    if (!block->end_anchored) in_start_range=real_in_start_range;
   }
-  
+
   if (block->end_anchored&&(out_val-in_val>out_start_range)) out_start_range=in_start_range+out_val-in_val;
   if (block->start_anchored&&(out_end_range-out_val+in_val)<in_end_range) in_end_range=out_end_range-out_val+in_val;
-  
+
   if (avel>0.) {
     lives_spin_button_set_range(LIVES_SPIN_BUTTON(mt->spinbutton_out), out_start_range, real_out_end_range);
     lives_spin_button_set_range(LIVES_SPIN_BUTTON(mt->spinbutton_in), real_in_start_range, in_end_range);
-  }
-  else {
+  } else {
     lives_spin_button_set_range(LIVES_SPIN_BUTTON(mt->spinbutton_in), out_start_range, real_out_end_range);
     lives_spin_button_set_range(LIVES_SPIN_BUTTON(mt->spinbutton_out), real_in_start_range, in_end_range);
   }
 
-  lives_signal_handler_unblock (mt->spinbutton_out,mt->spin_out_func);
-  lives_signal_handler_unblock (mt->spinbutton_in,mt->spin_in_func);
+  lives_signal_handler_unblock(mt->spinbutton_out,mt->spin_out_func);
+  lives_signal_handler_unblock(mt->spinbutton_in,mt->spin_in_func);
 
 }
 
@@ -11487,20 +11753,19 @@
   int height=cfile->vsize;
 
   if (block!=NULL) {
-    track=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(block->eventbox),"layer_number"));
+    track=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(block->eventbox),"layer_number"));
     filenum=get_frame_event_clip(block->start_event,track);
     frame_start=calc_frame_from_time(filenum,block->offset_start/U_SEC);
-  }
-  else {
+  } else {
     filenum=mt->file_selected;
     frame_start=mainw->files[filenum]->start;
   }
 
   calc_maxspect(lives_widget_get_allocation_width(mt->poly_box)/2-widget_opts.packing_width,lives_widget_get_allocation_height(mt->poly_box)-
-		((block==NULL||block->ordered)?lives_widget_get_allocation_height(mainw->spinbutton_start):0),&width,&height);
+                ((block==NULL||block->ordered)?lives_widget_get_allocation_height(mainw->spinbutton_start):0),&width,&height);
 
   thumb=make_thumb(mt,filenum,width,height,frame_start,FALSE);
-  lives_image_set_from_pixbuf (LIVES_IMAGE(mt->in_image),thumb);
+  lives_image_set_from_pixbuf(LIVES_IMAGE(mt->in_image),thumb);
   if (thumb!=NULL) lives_object_unref(thumb);
 }
 
@@ -11513,29 +11778,28 @@
   int frame_end;
   int width=cfile->hsize;
   int height=cfile->vsize;
-  
+
   if (block!=NULL) {
-    track=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(block->eventbox),"layer_number"));
+    track=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(block->eventbox),"layer_number"));
     filenum=get_frame_event_clip(block->start_event,track);
     frame_end=calc_frame_from_time(filenum,end_tc/U_SEC-1./mt->fps);
-  }
-  else {
+  } else {
     filenum=mt->file_selected;
     frame_end=mainw->files[filenum]->end;
   }
 
   calc_maxspect(lives_widget_get_allocation_width(mt->poly_box)/2-widget_opts.packing_width,lives_widget_get_allocation_height(mt->poly_box)-
-		((block==NULL||block->ordered)?lives_widget_get_allocation_height(mainw->spinbutton_end):0),&width,&height);
+                ((block==NULL||block->ordered)?lives_widget_get_allocation_height(mainw->spinbutton_end):0),&width,&height);
 
   thumb=make_thumb(mt,filenum,width,height,frame_end,FALSE);
-  lives_image_set_from_pixbuf (LIVES_IMAGE(mt->out_image),thumb);
+  lives_image_set_from_pixbuf(LIVES_IMAGE(mt->out_image),thumb);
   if (thumb!=NULL) lives_object_unref(thumb);
 }
 
 
 
 
-void in_out_start_changed (LiVESWidget *widget, gpointer user_data) {
+void in_out_start_changed(LiVESWidget *widget, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   track_rect *block=mt->block_selected,*ablock=NULL;
   double new_start;
@@ -11552,6 +11816,8 @@
 
   boolean start_anchored;
 
+  if (!mainw->interactive) return;
+
   if (block==NULL) {
     lives_clip_t *sfile=mainw->files[mt->file_selected];
     sfile->start=lives_spin_button_get_value_as_int(LIVES_SPIN_BUTTON(widget));
@@ -11566,7 +11832,7 @@
 
   event=block->start_event;
   orig_start_tc=block->offset_start;
-  track=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(block->eventbox),"layer_number"));
+  track=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(block->eventbox),"layer_number"));
   new_start_tc=q_dbl(new_start,mt->fps);
 
   if (new_start_tc==orig_start_tc||!block->ordered) {
@@ -11575,23 +11841,23 @@
   }
 
   tl_start=get_event_timecode(event);
+
+  // get the audio block (if exists)
   if (track>=0) {
     if (!mt->aud_track_selected) {
       if (mt->opts.pertrack_audio) {
-	LiVESWidget *aeventbox=LIVES_WIDGET(g_object_get_data(G_OBJECT(block->eventbox),"atrack"));
-	ablock=get_block_from_time(aeventbox,tl_start/U_SEC,mt);
+        LiVESWidget *aeventbox=LIVES_WIDGET(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(block->eventbox),"atrack"));
+        ablock=get_block_from_time(aeventbox,tl_start/U_SEC,mt);
       }
       start_anchored=block->start_anchored;
-    }
-    else {
-      LiVESWidget *eventbox=LIVES_WIDGET(g_object_get_data(G_OBJECT(block->eventbox),"owner"));
+    } else {
+      LiVESWidget *eventbox=LIVES_WIDGET(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(block->eventbox),"owner"));
       ablock=block;
       block=get_block_from_time(eventbox,tl_start/U_SEC,mt);
       start_anchored=ablock->start_anchored;
     }
     filenum=get_frame_event_clip(block->start_event,track);
-  }
-  else {
+  } else {
     ablock=block;
     start_anchored=block->start_anchored;
     avel=get_audio_frame_vel(ablock->start_event,track);
@@ -11604,37 +11870,36 @@
 
       // start increased, not anchored
       while (event!=NULL) {
-	if ((get_event_timecode(event)-tl_start)>=(new_start_tc-block->offset_start)/avel) {
-	  if (event==block->end_event) return;
-	  // done
-	  if (ablock!=NULL) {
-	    aclip=get_audio_frame_clip(ablock->start_event,track);
-	    aseek=get_audio_frame_seek(ablock->start_event,track);
-	    
-	    if (ablock->prev!=NULL&&ablock->prev->end_event==ablock->start_event) {
-	      int last_aclip=get_audio_frame_clip(ablock->prev->start_event,track);
-	      insert_audio_event_at(mt->event_list,ablock->start_event,track,last_aclip,0.,0.);
-	    }
-	    else {
-	      remove_audio_for_track(ablock->start_event,track);
-	    }
-	    aseek+=avel*(get_event_timecode(event)-get_event_timecode(ablock->start_event))/U_SEC;
-	    ablock->start_event=event;
-	    ablock->offset_start=new_start_tc;
-	  }
-	  if (block!=ablock) {
-	    block->start_event=event;
-	    block->offset_start=new_start_tc;
-	  }
-	  break;
-	}
-	if (track>=0) remove_frame_from_event(mt->event_list,event,track);
-	event=get_next_frame_event(event);
+        if ((get_event_timecode(event)-tl_start)>=(new_start_tc-block->offset_start)/avel) {
+          if (event==block->end_event) return;
+          // done
+          if (ablock!=NULL) {
+            aclip=get_audio_frame_clip(ablock->start_event,track);
+            aseek=get_audio_frame_seek(ablock->start_event,track);
+
+            if (ablock->prev!=NULL&&ablock->prev->end_event==ablock->start_event) {
+              int last_aclip=get_audio_frame_clip(ablock->prev->start_event,track);
+              insert_audio_event_at(mt->event_list,ablock->start_event,track,last_aclip,0.,0.);
+            } else {
+              remove_audio_for_track(ablock->start_event,track);
+            }
+            aseek+=avel*(get_event_timecode(event)-get_event_timecode(ablock->start_event))/U_SEC;
+            ablock->start_event=event;
+            ablock->offset_start=new_start_tc;
+          }
+          if (block!=ablock) {
+            block->start_event=event;
+            block->offset_start=new_start_tc;
+          }
+          break;
+        }
+        if (track>=0) remove_frame_from_event(mt->event_list,event,track);
+        event=get_next_frame_event(event);
       }
 
       if (ablock!=NULL) {
-	insert_audio_event_at(mt->event_list,ablock->start_event,track,aclip,aseek,avel);
-	ablock->offset_start=aseek*U_SEC;
+        insert_audio_event_at(mt->event_list,ablock->start_event,track,aclip,aseek,avel);
+        ablock->offset_start=aseek*U_SEC;
       }
 
       // move filter_inits right, and deinits left
@@ -11644,54 +11909,51 @@
       while (event!=NULL&&get_event_timecode(event)<tl_start) event=get_next_event(event);
 
       while (event!=NULL&&get_event_timecode(event)<new_tl_tc) {
-	event_next=get_next_event(event);
-	was_moved=FALSE;
-	if (WEED_EVENT_IS_FILTER_INIT(event)&&event!=mt->avol_init_event) {
-	  if (!move_event_right(mt->event_list,event,TRUE,mt->fps)) {
-	    was_moved=TRUE;
-	    if (event==start_event) start_event=NULL;
-	  }
-	}
-	else {
-	  if (WEED_EVENT_IS_FILTER_DEINIT(event)) {
-	    if (!move_event_left(mt->event_list,event,TRUE,mt->fps)) {
-	      was_moved=TRUE;
-	    }
-	  }
-	}
-	if (was_moved) {
-	  if (start_event==NULL) event=get_first_event(mt->event_list);
-	  else event=get_next_event(start_event);
-	  while (event!=NULL&&get_event_timecode(event)<tl_start) event=get_next_event(event);
-	}
-	else {
-	  event=event_next;
-	  if (WEED_EVENT_IS_FRAME(event)) start_event=event;
-	}
+        event_next=get_next_event(event);
+        was_moved=FALSE;
+        if (WEED_EVENT_IS_FILTER_INIT(event)&&event!=mt->avol_init_event) {
+          if (!move_event_right(mt->event_list,event,TRUE,mt->fps)) {
+            was_moved=TRUE;
+            if (event==start_event) start_event=NULL;
+          }
+        } else {
+          if (WEED_EVENT_IS_FILTER_DEINIT(event)) {
+            if (!move_event_left(mt->event_list,event,TRUE,mt->fps)) {
+              was_moved=TRUE;
+            }
+          }
+        }
+        if (was_moved) {
+          if (start_event==NULL) event=get_first_event(mt->event_list);
+          else event=get_next_event(start_event);
+          while (event!=NULL&&get_event_timecode(event)<tl_start) event=get_next_event(event);
+        } else {
+          event=event_next;
+          if (WEED_EVENT_IS_FRAME(event)) start_event=event;
+        }
       }
-    }
-    else {
+    } else {
       // move start left, not anchored
       if (ablock!=NULL) {
-	aclip=get_audio_frame_clip(ablock->start_event,track);
-	aseek=get_audio_frame_seek(ablock->start_event,track);
-	
-	remove_audio_for_track(ablock->start_event,track);
-
-	aseek+=(new_start_tc-ablock->offset_start)/U_SEC;
-	ablock->start_event=get_frame_event_at_or_before(mt->event_list,
-							 q_gint64(tl_start+(new_start_tc-ablock->offset_start)/avel,mt->fps),
-							 get_prev_frame_event(ablock->start_event));
-	insert_audio_event_at(mt->event_list,ablock->start_event,track,aclip,aseek,avel);
-	ablock->offset_start=aseek*U_SEC;
+        aclip=get_audio_frame_clip(ablock->start_event,track);
+        aseek=get_audio_frame_seek(ablock->start_event,track);
+
+        remove_audio_for_track(ablock->start_event,track);
+
+        aseek+=(new_start_tc-ablock->offset_start)/U_SEC;
+        ablock->start_event=get_frame_event_at_or_before(mt->event_list,
+                            q_gint64(tl_start+(new_start_tc-ablock->offset_start)/avel,mt->fps),
+                            get_prev_frame_event(ablock->start_event));
+        insert_audio_event_at(mt->event_list,ablock->start_event,track,aclip,aseek,avel);
+        ablock->offset_start=aseek*U_SEC;
       }
       if (block!=ablock) {
-	// do an insert from offset_start down
-	insert_frames (filenum,block->offset_start,new_start_tc,tl_start,DIRECTION_NEGATIVE,block->eventbox,mt,block);
-	block->start_event=get_frame_event_at_or_before(mt->event_list,
-							q_gint64(tl_start+new_start_tc-block->offset_start,mt->fps),
-							get_prev_frame_event(block->start_event));
-	block->offset_start=new_start_tc;
+        // do an insert from offset_start down
+        insert_frames(filenum,block->offset_start,new_start_tc,tl_start,DIRECTION_NEGATIVE,block->eventbox,mt,block);
+        block->start_event=get_frame_event_at_or_before(mt->event_list,
+                           q_gint64(tl_start+new_start_tc-block->offset_start,mt->fps),
+                           get_prev_frame_event(block->start_event));
+        block->offset_start=new_start_tc;
       }
 
       // any filter_inits with this track as owner get moved as far left as possible
@@ -11699,32 +11961,31 @@
       event=block->start_event;
 
       while (event!=NULL&&get_event_timecode(event)<tl_start) {
-	start_event=event;
-	event=get_next_event(event);
+        start_event=event;
+        event=get_next_event(event);
       }
       while (event!=NULL&&get_event_timecode(event)==tl_start) {
-	if (WEED_EVENT_IS_FILTER_INIT(event)&&event!=mt->avol_init_event) {
-	  if (filter_init_has_owner(event,track)) {
-	    // candidate for moving
-	    move_filter_init_event(mt->event_list,new_tl_tc,event,mt->fps);
-	    // account for overlaps
-	    move_event_right(mt->event_list,event,TRUE,mt->fps);
-	    event=start_event;
-	    while (event!=NULL&&get_event_timecode(event)<tl_start) event=get_next_event(event);
-	    continue;
-	  }
-	}
-	event=get_next_event(event);
+        if (WEED_EVENT_IS_FILTER_INIT(event)&&event!=mt->avol_init_event) {
+          if (filter_init_has_owner(event,track)) {
+            // candidate for moving
+            move_filter_init_event(mt->event_list,new_tl_tc,event,mt->fps);
+            // account for overlaps
+            move_event_right(mt->event_list,event,TRUE,mt->fps);
+            event=start_event;
+            while (event!=NULL&&get_event_timecode(event)<tl_start) event=get_next_event(event);
+            continue;
+          }
+        }
+        event=get_next_event(event);
       }
     }
-  }
-  else {
+  } else {
     // start is anchored, do a re-insert from start to end
     lives_mt_insert_mode_t insert_mode=mt->opts.insert_mode;
     offset_end=q_gint64((block->offset_start=new_start_tc)+(weed_timecode_t)(U_SEC/mt->fps)+
-			(get_event_timecode(block->end_event)-get_event_timecode(block->start_event)),mt->fps);
+                        (get_event_timecode(block->end_event)-get_event_timecode(block->start_event)),mt->fps);
     mt->opts.insert_mode=INSERT_MODE_OVERWRITE;
-    if (track>=0) insert_frames (filenum,new_start_tc,offset_end,tl_start,DIRECTION_POSITIVE,block->eventbox,mt,block);
+    if (track>=0) insert_frames(filenum,new_start_tc,offset_end,tl_start,DIRECTION_POSITIVE,block->eventbox,mt,block);
     if (ablock!=NULL) {
       aclip=get_audio_frame_clip(ablock->start_event,track);
       aseek=get_audio_frame_seek(ablock->start_event,track);
@@ -11737,18 +11998,18 @@
 
   new_start_tc=block->offset_start;
   offset_end=(new_start_tc=block->offset_start)+(weed_timecode_t)((double)(track>=0)*U_SEC/mt->fps)+
-    avel*(get_event_timecode(block->end_event)-get_event_timecode(block->start_event));
+             avel*(get_event_timecode(block->end_event)-get_event_timecode(block->start_event));
 
   if (mt->poly_state==POLY_IN_OUT) {
-    lives_signal_handler_block (mt->spinbutton_out,mt->spin_out_func);
-    lives_signal_handler_block (mt->spinbutton_in,mt->spin_in_func);
+    lives_signal_handler_block(mt->spinbutton_out,mt->spin_out_func);
+    lives_signal_handler_block(mt->spinbutton_in,mt->spin_in_func);
     set_in_out_spin_ranges(mt,new_start_tc,offset_end);
     lives_spin_button_set_value(LIVES_SPIN_BUTTON(mt->spinbutton_out),offset_end/U_SEC);
     lives_spin_button_set_value(LIVES_SPIN_BUTTON(mt->spinbutton_in),new_start_tc/U_SEC);
     lives_spin_button_update(LIVES_SPIN_BUTTON(mt->spinbutton_out));
     lives_spin_button_update(LIVES_SPIN_BUTTON(mt->spinbutton_in));
-    lives_signal_handler_unblock (mt->spinbutton_out,mt->spin_out_func);
-    lives_signal_handler_unblock (mt->spinbutton_in,mt->spin_in_func);
+    lives_signal_handler_unblock(mt->spinbutton_out,mt->spin_out_func);
+    lives_signal_handler_unblock(mt->spinbutton_in,mt->spin_in_func);
 
     if (track>=0) {
       // update images
@@ -11765,7 +12026,7 @@
 
 
 
-void in_out_end_changed (LiVESWidget *widget, gpointer user_data) {
+void in_out_end_changed(LiVESWidget *widget, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   track_rect *block=mt->block_selected,*ablock=NULL;
   double new_end=lives_spin_button_get_value(LIVES_SPIN_BUTTON(widget));
@@ -11784,6 +12045,8 @@
 
   boolean end_anchored;
 
+  if (!mainw->interactive) return;
+
   if (block==NULL) {
     lives_clip_t *sfile=mainw->files[mt->file_selected];
     sfile->end=(int)new_end;
@@ -11796,27 +12059,26 @@
 
   start_val=block->offset_start/U_SEC;
   event=block->end_event;
-  track=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(block->eventbox),"layer_number"));
+  track=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(block->eventbox),"layer_number"));
 
   tl_end=get_event_timecode(event);
 
+  // get the audio block (if exists)
   if (track>=0) {
     if (!mt->aud_track_selected) {
       if (mt->opts.pertrack_audio) {
-	LiVESWidget *aeventbox=LIVES_WIDGET(g_object_get_data(G_OBJECT(block->eventbox),"atrack"));
-	ablock=get_block_from_time(aeventbox,tl_end/U_SEC-1./mt->fps,mt);
+        LiVESWidget *aeventbox=LIVES_WIDGET(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(block->eventbox),"atrack"));
+        ablock=get_block_from_time(aeventbox,tl_end/U_SEC-1./mt->fps,mt);
       }
       end_anchored=block->end_anchored;
-    }
-    else {
-      LiVESWidget *eventbox=LIVES_WIDGET(g_object_get_data(G_OBJECT(block->eventbox),"owner"));
+    } else {
+      LiVESWidget *eventbox=LIVES_WIDGET(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(block->eventbox),"owner"));
       ablock=block;
       block=get_block_from_time(eventbox,tl_end/U_SEC-1./mt->fps,mt);
       end_anchored=ablock->end_anchored;
     }
     filenum=get_frame_event_clip(block->start_event,track);
-  }
-  else {
+  } else {
     ablock=block;
     end_anchored=block->end_anchored;
     avel=get_audio_frame_vel(ablock->start_event,track);
@@ -11825,24 +12087,24 @@
 
   // offset_end is timecode of end event within source (scaled for velocity)
   offset_end=q_gint64(block->offset_start+(weed_timecode_t)((double)(track>=0)*U_SEC/mt->fps)+
-		      (weed_timecode_t)((double)(get_event_timecode(block->end_event)-
-						  get_event_timecode(block->start_event))*avel),mt->fps);
+                      (weed_timecode_t)((double)(get_event_timecode(block->end_event)-
+                                        get_event_timecode(block->start_event))*avel),mt->fps);
 
   if (track>=0&&new_end>mainw->files[filenum]->frames/mainw->files[filenum]->fps) new_end=mainw->files[filenum]->frames/
-										    mainw->files[filenum]->fps;
+        mainw->files[filenum]->fps;
 
   new_end_tc=q_gint64(block->offset_start+(new_end-start_val)*U_SEC,mt->fps);
   orig_end_tc=offset_end;
 
 #ifdef DEBUG_BL_MOVE
   g_print("pt a %lld %lld %lld %.4f %lld %lld\n",block->offset_start,get_event_timecode(block->end_event),
-	  get_event_timecode(block->start_event),new_end,orig_end_tc,new_end_tc);
+          get_event_timecode(block->start_event),new_end,orig_end_tc,new_end_tc);
 #endif
 
   if (ABS(new_end_tc-orig_end_tc)<(.5*U_SEC)/mt->fps||!block->ordered) {
-    lives_signal_handler_block (mt->spinbutton_out,mt->spin_out_func);
+    lives_signal_handler_block(mt->spinbutton_out,mt->spin_out_func);
     lives_spin_button_set_value(LIVES_SPIN_BUTTON(mt->spinbutton_out),new_end_tc/U_SEC);
-    lives_signal_handler_unblock (mt->spinbutton_out,mt->spin_out_func);
+    lives_signal_handler_unblock(mt->spinbutton_out,mt->spin_out_func);
     return;
   }
 
@@ -11850,7 +12112,7 @@
 
   if (!end_anchored) {
     new_tl_tc=q_gint64(get_event_timecode(block->start_event)+(new_end-start_val)*U_SEC/avel-
-		       (double)(track>=0)*U_SEC/mt->fps,mt->fps);
+                       (double)(track>=0)*U_SEC/mt->fps,mt->fps);
     if (track<0) new_tl_tc-=(U_SEC/mt->fps);
 
 
@@ -11861,34 +12123,33 @@
       // end decreased, not anchored
 
       while (event!=NULL) {
-	if (get_event_timecode(event)<=new_tl_tc) {
-	  if (event==block->start_event) return;
-	  // done
-	  if (ablock!=NULL) {
-	    if (ablock->next==NULL||ablock->next->start_event!=ablock->end_event) 
-	      remove_audio_for_track(ablock->end_event,track);
-	    aclip=get_audio_frame_clip(ablock->start_event,track);
-	  }
-	  block->end_event=event;
-	  break;
-	}
-	prevevent=get_prev_frame_event(event);
-	if (track>=0) remove_frame_from_event(mt->event_list,event,track);
-	event=prevevent;
+        if (get_event_timecode(event)<=new_tl_tc) {
+          if (event==block->start_event) return;
+          // done
+          if (ablock!=NULL) {
+            if (ablock->next==NULL||ablock->next->start_event!=ablock->end_event)
+              remove_audio_for_track(ablock->end_event,track);
+            aclip=get_audio_frame_clip(ablock->start_event,track);
+          }
+          block->end_event=event;
+          break;
+        }
+        prevevent=get_prev_frame_event(event);
+        if (track>=0) remove_frame_from_event(mt->event_list,event,track);
+        event=prevevent;
       }
 
       if (ablock!=NULL) {
-	new_end_event=get_next_frame_event(event);
-	if (new_end_event==NULL) {
-	  weed_plant_t *shortcut=ablock->end_event;
-	  mt->event_list=insert_blank_frame_event_at(mt->event_list,
-						     q_gint64(new_tl_tc+(weed_timecode_t)((double)(track>=0)*
-											  U_SEC/mt->fps),mt->fps),
-						     &shortcut);
-	  ablock->end_event=shortcut;
-	}
-	else ablock->end_event=new_end_event;
-	insert_audio_event_at(mt->event_list,ablock->end_event,track,aclip,0.,0.);
+        new_end_event=get_next_frame_event(event);
+        if (new_end_event==NULL) {
+          weed_plant_t *shortcut=ablock->end_event;
+          mt->event_list=insert_blank_frame_event_at(mt->event_list,
+                         q_gint64(new_tl_tc+(weed_timecode_t)((double)(track>=0)*
+                                  U_SEC/mt->fps),mt->fps),
+                         &shortcut);
+          ablock->end_event=shortcut;
+        } else ablock->end_event=new_end_event;
+        insert_audio_event_at(mt->event_list,ablock->end_event,track,aclip,0.,0.);
       }
 
       // move filter_inits right, and deinits left
@@ -11897,65 +12158,61 @@
       while (event!=NULL&&get_event_timecode(event)<=new_tl_tc) event=get_next_event(event);
 
       while (event!=NULL&&get_event_timecode(event)<=tl_end) {
-	event_next=get_next_event(event);
-	was_moved=FALSE;
-	if (WEED_EVENT_IS_FILTER_INIT(event)) {
-	  if (!move_event_right(mt->event_list,event,TRUE,mt->fps)) {
-	    was_moved=TRUE;
-	    if (event==start_event) start_event=NULL;
-	  }
-	}
-	else {
-	  if (WEED_EVENT_IS_FILTER_DEINIT(event)) {
-	    init_event=(weed_plant_t *)weed_get_voidptr_value(event,"init_event",&error);
-	    if (init_event!=mt->avol_init_event) {
-	      if (!move_event_left(mt->event_list,event,TRUE,mt->fps)) {
-		was_moved=TRUE;
-	      }
-	    }
-	  }
-	}
-	if (was_moved) {
-	  if (start_event==NULL) event=get_first_event(mt->event_list);
-	  else event=get_next_event(start_event);
-	  while (event!=NULL&&get_event_timecode(event)<=new_tl_tc) event=get_next_event(event);
-	}
-	else {
-	  event=event_next;
-	  if (WEED_EVENT_IS_FRAME(event)) start_event=event;
-	}
+        event_next=get_next_event(event);
+        was_moved=FALSE;
+        if (WEED_EVENT_IS_FILTER_INIT(event)) {
+          if (!move_event_right(mt->event_list,event,TRUE,mt->fps)) {
+            was_moved=TRUE;
+            if (event==start_event) start_event=NULL;
+          }
+        } else {
+          if (WEED_EVENT_IS_FILTER_DEINIT(event)) {
+            init_event=(weed_plant_t *)weed_get_voidptr_value(event,"init_event",&error);
+            if (init_event!=mt->avol_init_event) {
+              if (!move_event_left(mt->event_list,event,TRUE,mt->fps)) {
+                was_moved=TRUE;
+              }
+            }
+          }
+        }
+        if (was_moved) {
+          if (start_event==NULL) event=get_first_event(mt->event_list);
+          else event=get_next_event(start_event);
+          while (event!=NULL&&get_event_timecode(event)<=new_tl_tc) event=get_next_event(event);
+        } else {
+          event=event_next;
+          if (WEED_EVENT_IS_FRAME(event)) start_event=event;
+        }
       }
-      remove_end_blank_frames(mt->event_list);
-    }
-    else {
+      remove_end_blank_frames(mt->event_list,TRUE);
+    } else {
       // end increased, not anchored
       if (track>=0) {
-	// do an insert from end_tc up, starting with end_frame and finishing at new_end
-	insert_frames (filenum,offset_end,new_end_tc,tl_end+(weed_timecode_t)(U_SEC/mt->fps),DIRECTION_POSITIVE,
-		       block->eventbox,mt,block);
-	block->end_event=get_frame_event_at(mt->event_list,q_gint64(new_end_tc+tl_end-offset_end,mt->fps),
-					    block->end_event,TRUE);
+        // do an insert from end_tc up, starting with end_frame and finishing at new_end
+        insert_frames(filenum,offset_end,new_end_tc,tl_end+(weed_timecode_t)(U_SEC/mt->fps),DIRECTION_POSITIVE,
+                      block->eventbox,mt,block);
+        block->end_event=get_frame_event_at(mt->event_list,q_gint64(new_end_tc+tl_end-offset_end,mt->fps),
+                                            block->end_event,TRUE);
       }
       if (ablock!=NULL) {
-	new_end_event=get_frame_event_at(mt->event_list,q_gint64(new_tl_tc+U_SEC/mt->fps,mt->fps),ablock->end_event,TRUE);
-	if (new_end_event==ablock->end_event) {
-	  lives_signal_handler_block (mt->spinbutton_out,mt->spin_out_func);
-	  lives_spin_button_set_value(LIVES_SPIN_BUTTON(mt->spinbutton_out),orig_end_tc/U_SEC);
-	  lives_signal_handler_unblock (mt->spinbutton_out,mt->spin_out_func);
-	  return;
-	}
-	remove_audio_for_track(ablock->end_event,track);
-	if (new_end_event==NULL) {
-	  weed_plant_t *shortcut=ablock->end_event;
-	  mt->event_list=insert_blank_frame_event_at(mt->event_list,q_gint64(new_tl_tc+U_SEC/mt->fps,mt->fps),&shortcut);
-	  ablock->end_event=shortcut;
-	}
-	else ablock->end_event=new_end_event;
-
-	if (ablock->next==NULL||ablock->next->start_event!=ablock->end_event) {
-	  aclip=get_audio_frame_clip(ablock->start_event,track);
-	  insert_audio_event_at(mt->event_list,ablock->end_event,track,aclip,0.,0.);
-	}
+        new_end_event=get_frame_event_at(mt->event_list,q_gint64(new_tl_tc+U_SEC/mt->fps,mt->fps),ablock->end_event,TRUE);
+        if (new_end_event==ablock->end_event) {
+          lives_signal_handler_block(mt->spinbutton_out,mt->spin_out_func);
+          lives_spin_button_set_value(LIVES_SPIN_BUTTON(mt->spinbutton_out),orig_end_tc/U_SEC);
+          lives_signal_handler_unblock(mt->spinbutton_out,mt->spin_out_func);
+          return;
+        }
+        remove_audio_for_track(ablock->end_event,track);
+        if (new_end_event==NULL) {
+          weed_plant_t *shortcut=ablock->end_event;
+          mt->event_list=insert_blank_frame_event_at(mt->event_list,q_gint64(new_tl_tc+U_SEC/mt->fps,mt->fps),&shortcut);
+          ablock->end_event=shortcut;
+        } else ablock->end_event=new_end_event;
+
+        if (ablock->next==NULL||ablock->next->start_event!=ablock->end_event) {
+          aclip=get_audio_frame_clip(ablock->start_event,track);
+          insert_audio_event_at(mt->event_list,ablock->end_event,track,aclip,0.,0.);
+        }
       }
 
       new_tl_tc=get_event_timecode(block->end_event);
@@ -11963,36 +12220,37 @@
       start_event=event;
 
       while (event!=NULL&&get_event_timecode(event)==tl_end) {
-	if (WEED_EVENT_IS_FILTER_DEINIT(event)) {
-	  init_event=(weed_plant_t *)weed_get_voidptr_value(event,"init_event",&error);
-	  if (init_event!=mt->avol_init_event) {
-	    if (filter_init_has_owner(init_event,track)) {
-	      // candidate for moving
-	      move_filter_deinit_event(mt->event_list,new_tl_tc,event,mt->fps,TRUE);
-	      // account for overlaps
-	      //move_event_left(mt->event_list,event,TRUE,mt->fps);
-	      event=start_event;
-	      continue;
-	    }
-	  }
-	}
-	event=get_next_event(event);
+        if (WEED_EVENT_IS_FILTER_DEINIT(event)) {
+          init_event=(weed_plant_t *)weed_get_voidptr_value(event,"init_event",&error);
+          if (init_event!=mt->avol_init_event) {
+            if (filter_init_has_owner(init_event,track)) {
+              // candidate for moving
+              move_filter_deinit_event(mt->event_list,new_tl_tc,event,mt->fps,TRUE);
+              // account for overlaps
+              //move_event_left(mt->event_list,event,TRUE,mt->fps);
+              event=start_event;
+              continue;
+            }
+          }
+        }
+        event=get_next_event(event);
       }
     }
-  }
-  else {
+  } else {
     // end is anchored, do a re-insert from end to start
     weed_timecode_t offset_start;
     lives_mt_insert_mode_t insert_mode=mt->opts.insert_mode;
 
     offset_end=q_gint64((offset_start=block->offset_start+new_end_tc-orig_end_tc)+
-			(weed_timecode_t)((double)(track>=0)*U_SEC/mt->fps)+
-			(get_event_timecode(block->end_event)-get_event_timecode(block->start_event)),mt->fps);
+                        (weed_timecode_t)((double)(track>=0)*U_SEC/mt->fps)+
+                        (get_event_timecode(block->end_event)-get_event_timecode(block->start_event)),mt->fps);
 
     mt->opts.insert_mode=INSERT_MODE_OVERWRITE;
-    if (track>=0) insert_frames (filenum,offset_end,offset_start,tl_end+
-				 (weed_timecode_t)((double)(track>=0&&!mt->aud_track_selected)*U_SEC/mt->fps),
-				 DIRECTION_NEGATIVE,block->eventbox,mt,block);
+
+    // note: audio blocks end at the timecode, video blocks end at tc + U_SEC/mt->fps
+    if (track>=0) insert_frames(filenum,offset_end,offset_start,tl_end+
+                                  (weed_timecode_t)((double)(track>=0&&!mt->aud_track_selected)*U_SEC/mt->fps),
+                                  DIRECTION_NEGATIVE,block->eventbox,mt,block);
 
     block->offset_start=q_gint64(offset_start,mt->fps);
 
@@ -12010,11 +12268,11 @@
 
   // get new offset_end
   new_end_tc=(block->offset_start+(weed_timecode_t)((double)(track>=0)*U_SEC/mt->fps)+
-	      (get_event_timecode(block->end_event)-get_event_timecode(block->start_event))*avel);
+              (get_event_timecode(block->end_event)-get_event_timecode(block->start_event))*avel);
 
 #ifdef DEBUG_BL_MOVE
   g_print("new end tc is %ld %ld %ld %.4f\n",get_event_timecode(block->end_event),
-	  get_event_timecode(block->start_event),block->offset_start,avel);
+          get_event_timecode(block->start_event),block->offset_start,avel);
 #endif
 
   if (mt->avol_fx!=-1&&mt->avol_init_event!=NULL&&mt->audio_draws!=NULL&&
@@ -12024,14 +12282,14 @@
 
 
   if (mt->poly_state==POLY_IN_OUT) {
-    lives_signal_handler_block (mt->spinbutton_out,mt->spin_out_func);
-    lives_signal_handler_block (mt->spinbutton_in,mt->spin_in_func);
+    lives_signal_handler_block(mt->spinbutton_out,mt->spin_out_func);
+    lives_signal_handler_block(mt->spinbutton_in,mt->spin_in_func);
 
     set_in_out_spin_ranges(mt,block->offset_start,new_end_tc);
     lives_spin_button_set_value(LIVES_SPIN_BUTTON(mt->spinbutton_in), block->offset_start/U_SEC);
     lives_spin_button_set_value(LIVES_SPIN_BUTTON(mt->spinbutton_out), new_end_tc/U_SEC);
-    lives_signal_handler_unblock (mt->spinbutton_out,mt->spin_out_func);
-    lives_signal_handler_unblock (mt->spinbutton_in,mt->spin_in_func);
+    lives_signal_handler_unblock(mt->spinbutton_out,mt->spin_out_func);
+    lives_signal_handler_unblock(mt->spinbutton_in,mt->spin_in_func);
 
     if (track>=0) {
       // update image
@@ -12050,14 +12308,14 @@
 }
 
 
-void avel_reverse_toggled (LiVESToggleButton *togglebutton, gpointer user_data) {
+void avel_reverse_toggled(LiVESToggleButton *togglebutton, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   track_rect *block=mt->block_selected;
-  int track=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(block->eventbox),"layer_number"));
+  int track=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(block->eventbox),"layer_number"));
   double avel=-get_audio_frame_vel(block->start_event,track);
   double aseek=get_audio_frame_seek(block->start_event,track),aseek_end;
   int aclip=get_audio_frame_clip(block->start_event,track);
-  
+
   double old_in_val=lives_spin_button_get_value(LIVES_SPIN_BUTTON(mt->spinbutton_in));
   double old_out_val=lives_spin_button_get_value(LIVES_SPIN_BUTTON(mt->spinbutton_out));
 
@@ -12066,8 +12324,8 @@
   insert_audio_event_at(mt->event_list,block->start_event,track,aclip,aseek_end,avel);
 
 
-  lives_signal_handler_block (mt->spinbutton_out,mt->spin_out_func);
-  lives_signal_handler_block (mt->spinbutton_in,mt->spin_in_func);
+  lives_signal_handler_block(mt->spinbutton_out,mt->spin_out_func);
+  lives_signal_handler_block(mt->spinbutton_in,mt->spin_in_func);
 
   if (avel<0.) set_in_out_spin_ranges(mt,old_in_val*U_SEC,old_out_val*U_SEC);
   else set_in_out_spin_ranges(mt,old_out_val*U_SEC,old_in_val*U_SEC);
@@ -12075,8 +12333,8 @@
   lives_spin_button_set_value(LIVES_SPIN_BUTTON(mt->spinbutton_in),old_out_val);
   lives_spin_button_set_value(LIVES_SPIN_BUTTON(mt->spinbutton_out),old_in_val);
 
-  lives_signal_handler_unblock (mt->spinbutton_in,mt->spin_in_func);
-  lives_signal_handler_unblock (mt->spinbutton_out,mt->spin_out_func);
+  lives_signal_handler_unblock(mt->spinbutton_in,mt->spin_in_func);
+  lives_signal_handler_unblock(mt->spinbutton_out,mt->spin_out_func);
 
   if (avel<0.) {
     lives_widget_set_sensitive(mt->spinbutton_in,FALSE);
@@ -12085,8 +12343,7 @@
     lives_widget_set_sensitive(mt->avel_scale,FALSE);
     lives_widget_set_sensitive(mt->checkbutton_start_anchored,FALSE);
     lives_widget_set_sensitive(mt->checkbutton_end_anchored,FALSE);
-  }
-  else {
+  } else {
     lives_widget_set_sensitive(mt->spinbutton_in,TRUE);
     lives_widget_set_sensitive(mt->spinbutton_out,TRUE);
     if (!block->start_anchored||!block->end_anchored) {
@@ -12100,10 +12357,10 @@
 }
 
 
-void avel_spin_changed (LiVESSpinButton *spinbutton, gpointer user_data) {
+void avel_spin_changed(LiVESSpinButton *spinbutton, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   track_rect *block=mt->block_selected;
-  int track=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(block->eventbox),"layer_number"));
+  int track=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(block->eventbox),"layer_number"));
   double new_avel=lives_spin_button_get_value(spinbutton);
   double aseek=get_audio_frame_seek(block->start_event,track);
   int aclip=get_audio_frame_clip(block->start_event,track);
@@ -12112,6 +12369,8 @@
   double orig_end_val,orig_start_val;
   boolean was_adjusted=FALSE;
 
+  if (!mainw->interactive) return;
+
   if (lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(mt->checkbutton_avel_reverse))) new_avel=-new_avel;
 
   start_tc=block->offset_start;
@@ -12121,8 +12380,8 @@
 
   if (!block->end_anchored) {
     new_end_tc=q_gint64(start_tc+((orig_end_val=
-				   lives_spin_button_get_value(LIVES_SPIN_BUTTON(mt->spinbutton_out)))*U_SEC-start_tc)
-			/new_avel,mt->fps);
+                                     lives_spin_button_get_value(LIVES_SPIN_BUTTON(mt->spinbutton_out)))*U_SEC-start_tc)
+                        /new_avel,mt->fps);
 
     insert_audio_event_at(mt->event_list,block->start_event,track,aclip,aseek,new_avel);
 
@@ -12131,16 +12390,16 @@
     // move end point (if we can)
     if (block->next!=NULL&&new_tl_tc>=get_event_timecode(block->next->start_event)) {
       new_end_tc=q_gint64((get_event_timecode(block->next->start_event)-
-			   get_event_timecode(block->start_event))*new_avel+block->offset_start,mt->fps);
-      lives_signal_handler_block (mt->spinbutton_out,mt->spin_out_func);
-      lives_signal_handler_block (mt->spinbutton_in,mt->spin_in_func);
+                           get_event_timecode(block->start_event))*new_avel+block->offset_start,mt->fps);
+      lives_signal_handler_block(mt->spinbutton_out,mt->spin_out_func);
+      lives_signal_handler_block(mt->spinbutton_in,mt->spin_in_func);
       set_in_out_spin_ranges(mt,block->offset_start,new_end_tc);
       lives_spin_button_set_value(LIVES_SPIN_BUTTON(mt->spinbutton_out),new_end_tc/U_SEC);
-      lives_signal_handler_unblock (mt->spinbutton_in,mt->spin_in_func);
-      lives_signal_handler_unblock (mt->spinbutton_out,mt->spin_out_func);
+      lives_signal_handler_unblock(mt->spinbutton_in,mt->spin_in_func);
+      lives_signal_handler_unblock(mt->spinbutton_out,mt->spin_out_func);
       return;
     }
-    
+
     if (new_tl_tc!=old_tl_tc) {
       weed_plant_t *shortcut;
       if (new_tl_tc>old_tl_tc) shortcut=block->end_event;
@@ -12149,26 +12408,26 @@
       new_end_event=get_frame_event_at(mt->event_list,new_tl_tc,shortcut,TRUE);
       if (new_end_event==block->start_event) return;
       block->end_event=new_end_event;
-      
+
       if (block->end_event==NULL) {
-	weed_plant_t *last_frame_event=get_last_frame_event(mt->event_list);
-	add_blank_frames_up_to(mt->event_list,last_frame_event,new_tl_tc,mt->fps);
-	block->end_event=get_last_frame_event(mt->event_list);
-      }
-      if (block->next==NULL||block->next->start_event!=block->end_event) 
-	insert_audio_event_at(mt->event_list,block->end_event,-1,aclip,0.,0.);
-      
+        weed_plant_t *last_frame_event=get_last_frame_event(mt->event_list);
+        add_blank_frames_up_to(mt->event_list,last_frame_event,new_tl_tc,mt->fps);
+        block->end_event=get_last_frame_event(mt->event_list);
+      }
+      if (block->next==NULL||block->next->start_event!=block->end_event)
+        insert_audio_event_at(mt->event_list,block->end_event,-1,aclip,0.,0.);
+
       lives_widget_queue_draw((LiVESWidget *)mt->audio_draws->data);
       new_end_tc=start_tc+(get_event_timecode(block->end_event)-get_event_timecode(block->start_event))*new_avel;
-      lives_signal_handler_block (mt->spinbutton_out,mt->spin_out_func);
+      lives_signal_handler_block(mt->spinbutton_out,mt->spin_out_func);
       lives_spin_button_set_value(LIVES_SPIN_BUTTON(mt->spinbutton_out),new_end_tc/U_SEC);
-      lives_signal_handler_unblock (mt->spinbutton_out,mt->spin_out_func);
+      lives_signal_handler_unblock(mt->spinbutton_out,mt->spin_out_func);
       lives_spin_button_set_value(LIVES_SPIN_BUTTON(mt->spinbutton_out),orig_end_val);
 
-      remove_end_blank_frames(mt->event_list);
+      remove_end_blank_frames(mt->event_list,TRUE);
 
       if (mt->avol_fx!=-1&&block->next==NULL) {
-	apply_avol_filter(mt);
+        apply_avol_filter(mt);
       }
     }
     if (!resize_timeline(mt)) {
@@ -12192,7 +12451,7 @@
   }
 
   orig_start_val=lives_spin_button_get_value(LIVES_SPIN_BUTTON(mt->spinbutton_in));
-  
+
   if (was_adjusted||new_tl_tc!=old_tl_tc) {
     weed_plant_t *shortcut;
     if (new_tl_tc>old_tl_tc) shortcut=block->start_event;
@@ -12200,28 +12459,28 @@
       if (block->prev!=NULL) shortcut=block->prev->end_event;
       else shortcut=NULL;
     }
-    
+
     new_start_event=get_frame_event_at(mt->event_list,new_tl_tc,shortcut,TRUE);
     if (new_start_event==block->end_event) return;
 
     if (block->prev==NULL||block->start_event!=block->prev->end_event) remove_audio_for_track(block->start_event,-1);
     else insert_audio_event_at(mt->event_list,block->start_event,-1,aclip,0.,0.);
     block->start_event=new_start_event;
-    
+
     insert_audio_event_at(mt->event_list,block->start_event,-1,aclip,aseek,new_avel);
-    
+
     lives_widget_queue_draw((LiVESWidget *)mt->audio_draws->data);
-    
-    lives_signal_handler_block (mt->spinbutton_out,mt->spin_out_func);
-    lives_signal_handler_block (mt->spinbutton_in,mt->spin_in_func);
+
+    lives_signal_handler_block(mt->spinbutton_out,mt->spin_out_func);
+    lives_signal_handler_block(mt->spinbutton_in,mt->spin_in_func);
 
     set_in_out_spin_ranges(mt,start_tc,new_end_tc);
     lives_spin_button_set_value(LIVES_SPIN_BUTTON(mt->spinbutton_in),start_tc/U_SEC);
 
     if (!was_adjusted) lives_spin_button_set_value(LIVES_SPIN_BUTTON(mt->spinbutton_in),orig_start_val);
 
-    lives_signal_handler_unblock (mt->spinbutton_in,mt->spin_in_func);
-    lives_signal_handler_unblock (mt->spinbutton_out,mt->spin_out_func);
+    lives_signal_handler_unblock(mt->spinbutton_in,mt->spin_in_func);
+    lives_signal_handler_unblock(mt->spinbutton_out,mt->spin_out_func);
 
     if (mt->avol_fx!=-1&&block->next==NULL) {
       apply_avol_filter(mt);
@@ -12231,35 +12490,35 @@
 }
 
 
-void
-in_anchor_toggled (LiVESToggleButton *togglebutton, gpointer user_data) {
+void in_anchor_toggled(LiVESToggleButton *togglebutton, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   track_rect *block=mt->block_selected;
   weed_timecode_t offset_end;
   double avel=1.;
 
+  if (!mainw->interactive) return;
+
   if (mt->current_track<0) {
     avel=get_audio_frame_vel(block->start_event,mt->current_track);
   }
 
   offset_end=block->offset_start+(double)(mt->current_track>=0&&!mt->aud_track_selected)*
-    (weed_timecode_t)(U_SEC/mt->fps)+((get_event_timecode(block->end_event)-
-				       get_event_timecode(block->start_event)))*avel;
+             (weed_timecode_t)(U_SEC/mt->fps)+((get_event_timecode(block->end_event)-
+                 get_event_timecode(block->start_event)))*avel;
 
   block->start_anchored=!block->start_anchored;
 
 
-  lives_signal_handler_block (mt->spinbutton_out,mt->spin_out_func);
-  lives_signal_handler_block (mt->spinbutton_in,mt->spin_in_func);
+  lives_signal_handler_block(mt->spinbutton_out,mt->spin_out_func);
+  lives_signal_handler_block(mt->spinbutton_in,mt->spin_in_func);
   set_in_out_spin_ranges(mt,block->offset_start,offset_end);
-  lives_signal_handler_unblock (mt->spinbutton_in,mt->spin_in_func);
-  lives_signal_handler_unblock (mt->spinbutton_out,mt->spin_out_func);
+  lives_signal_handler_unblock(mt->spinbutton_in,mt->spin_in_func);
+  lives_signal_handler_unblock(mt->spinbutton_out,mt->spin_out_func);
 
   if ((block->start_anchored&&block->end_anchored)||mainw->playing_file>-1) {
     lives_widget_set_sensitive(mt->spinbutton_avel,FALSE);
     lives_widget_set_sensitive(mt->avel_scale,FALSE);
-  }
-  else {
+  } else {
     lives_widget_set_sensitive(mt->spinbutton_avel,TRUE);
     lives_widget_set_sensitive(mt->avel_scale,TRUE);
   }
@@ -12268,11 +12527,11 @@
     LiVESWidget *xeventbox;
     track_rect *xblock;
 
+    // if video, find the audio track, and vice-versa
     if (mt->aud_track_selected) {
-      xeventbox=(LiVESWidget *)g_object_get_data(G_OBJECT(block->eventbox),"owner");
-    }
-    else {
-      xeventbox=(LiVESWidget *)g_object_get_data(G_OBJECT(block->eventbox),"atrack");
+      xeventbox=(LiVESWidget *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(block->eventbox),"owner");
+    } else {
+      xeventbox=(LiVESWidget *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(block->eventbox),"atrack");
     }
     if (xeventbox!=NULL) {
       xblock=get_block_from_time(xeventbox,get_event_timecode(block->start_event)/U_SEC,mt);
@@ -12281,34 +12540,35 @@
   }
 }
 
-void
-out_anchor_toggled (LiVESToggleButton *togglebutton, gpointer user_data) {
+
+void out_anchor_toggled(LiVESToggleButton *togglebutton, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   track_rect *block=mt->block_selected;
   weed_timecode_t offset_end;
   double avel=1.;
 
+  if (!mainw->interactive) return;
+
   if (mt->current_track<0) {
     avel=get_audio_frame_vel(block->start_event,mt->current_track);
   }
 
   offset_end=block->offset_start+(double)(mt->current_track>=0&&!mt->aud_track_selected)*
-    (weed_timecode_t)(U_SEC/mt->fps)+((get_event_timecode(block->end_event)-
-				       get_event_timecode(block->start_event)))*avel;
+             (weed_timecode_t)(U_SEC/mt->fps)+((get_event_timecode(block->end_event)-
+                 get_event_timecode(block->start_event)))*avel;
 
   block->end_anchored=!block->end_anchored;
 
-  lives_signal_handler_block (mt->spinbutton_out,mt->spin_out_func);
-  lives_signal_handler_block (mt->spinbutton_in,mt->spin_in_func);
+  lives_signal_handler_block(mt->spinbutton_out,mt->spin_out_func);
+  lives_signal_handler_block(mt->spinbutton_in,mt->spin_in_func);
   set_in_out_spin_ranges(mt,block->offset_start,offset_end);
-  lives_signal_handler_unblock (mt->spinbutton_in,mt->spin_in_func);
-  lives_signal_handler_unblock (mt->spinbutton_out,mt->spin_out_func);
+  lives_signal_handler_unblock(mt->spinbutton_in,mt->spin_in_func);
+  lives_signal_handler_unblock(mt->spinbutton_out,mt->spin_out_func);
 
   if ((block->start_anchored&&block->end_anchored)||mainw->playing_file>-1) {
     lives_widget_set_sensitive(mt->spinbutton_avel,FALSE);
     lives_widget_set_sensitive(mt->avel_scale,FALSE);
-  }
-  else {
+  } else {
     lives_widget_set_sensitive(mt->spinbutton_avel,TRUE);
     lives_widget_set_sensitive(mt->avel_scale,TRUE);
   }
@@ -12317,11 +12577,11 @@
     LiVESWidget *xeventbox;
     track_rect *xblock;
 
+    // if video, find the audio track, and vice-versa
     if (mt->aud_track_selected) {
-      xeventbox=(LiVESWidget *)g_object_get_data(G_OBJECT(block->eventbox),"owner");
-    }
-    else {
-      xeventbox=(LiVESWidget *)g_object_get_data(G_OBJECT(block->eventbox),"atrack");
+      xeventbox=(LiVESWidget *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(block->eventbox),"owner");
+    } else {
+      xeventbox=(LiVESWidget *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(block->eventbox),"atrack");
     }
     if (xeventbox!=NULL) {
       xblock=get_block_from_time(xeventbox,get_event_timecode(block->start_event)/U_SEC,mt);
@@ -12332,7 +12592,7 @@
 }
 
 
-void polymorph (lives_mt *mt, lives_mt_poly_state_t poly) {
+void polymorph(lives_mt *mt, lives_mt_poly_state_t poly) {
   LiVESPixbuf *thumb;
 
   weed_timecode_t offset_end=0;
@@ -12356,8 +12616,8 @@
   double out_end_range;
   double avel=1.;
 
-  gchar *fhash;
-  gchar *fname,*otrackname,*txt;
+  char *fhash;
+  char *fname,*otrackname,*txt;
 
   boolean is_input,is_output;
   boolean has_effect=FALSE;
@@ -12378,58 +12638,59 @@
   int track,fromtrack;
   int frame_start,frame_end=0;
   int filenum;
-  
+
   static int xxwidth,xxheight;
 
   register int i,j;
 
-  if (poly==mt->poly_state&&poly!=POLY_PARAMS&&poly!=POLY_FX_STACK) return;
+  if (poly==mt->poly_state&&poly!=POLY_PARAMS&&poly!=POLY_FX_STACK) {
+    return;
+  }
 
   if (lives_widget_get_allocation_width(mt->poly_box)>1&&lives_widget_get_allocation_height(mt->poly_box)>1) {
     calc_maxspect(lives_widget_get_allocation_width(mt->poly_box)/2-widget_opts.packing_width,
-		  lives_widget_get_allocation_height(mt->poly_box)-
-		  ((block==NULL||block->ordered)?lives_widget_get_allocation_height(mainw->spinbutton_start):0),&width,&height);
-    
+                  lives_widget_get_allocation_height(mt->poly_box)-
+                  ((block==NULL||block->ordered)?lives_widget_get_allocation_height(mainw->spinbutton_start):0),&width,&height);
+
     xxwidth=width;
     xxheight=height;
-  }
-  else {
+  } else {
     width=xxwidth;
     height=xxheight;
   }
 
   switch (mt->poly_state) {
   case (POLY_CLIPS) :
-    lives_container_remove (LIVES_CONTAINER(mt->poly_box),mt->clip_scroll);
+    lives_container_remove(LIVES_CONTAINER(mt->poly_box),mt->clip_scroll);
     break;
   case (POLY_IN_OUT) :
-    lives_signal_handler_block (mt->spinbutton_in,mt->spin_in_func);
-    lives_signal_handler_block (mt->spinbutton_out,mt->spin_out_func);
-    if (lives_widget_get_parent(mt->in_out_box)!=NULL) lives_widget_unparent (mt->in_out_box);
-    if (lives_widget_get_parent(mt->avel_box)!=NULL) lives_widget_unparent (mt->avel_box);
+    lives_signal_handler_block(mt->spinbutton_in,mt->spin_in_func);
+    lives_signal_handler_block(mt->spinbutton_out,mt->spin_out_func);
+    if (lives_widget_get_parent(mt->in_out_box)!=NULL) lives_widget_unparent(mt->in_out_box);
+    if (lives_widget_get_parent(mt->avel_box)!=NULL) lives_widget_unparent(mt->avel_box);
 
     break;
   case (POLY_PARAMS) :
     mt->framedraw=NULL;
     if (mt->current_rfx!=NULL) {
       rfx_free(mt->current_rfx);
-      g_free(mt->current_rfx);
+      lives_free(mt->current_rfx);
     }
     mt->current_rfx=NULL;
 
     if (mt->fx_box!=NULL) {
       lives_widget_destroy(mt->fx_box);
       mt->fx_box=NULL;
-      lives_container_remove (LIVES_CONTAINER(mt->poly_box),mt->fx_base_box);
+      lives_container_remove(LIVES_CONTAINER(mt->poly_box),mt->fx_base_box);
     }
 
     if (mt->mt_frame_preview) {
       // put blank back in preview window
-      lives_object_ref (mainw->playarea);
-      lives_widget_set_bg_color (mt->fd_frame, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+      lives_object_ref(mainw->playarea);
+      lives_widget_set_bg_color(mt->fd_frame, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
     }
     if (pchain!=NULL&&poly!=POLY_PARAMS) {
-      g_free(pchain);
+      lives_free(pchain);
       pchain=NULL;
     }
     mouse_mode_context(mt); // reset context box text
@@ -12437,10 +12698,9 @@
 
     lives_widget_set_sensitive(mt->fx_edit,FALSE);
     lives_widget_set_sensitive(mt->fx_delete,FALSE);
-    if (poly==POLY_PARAMS) { 
+    if (poly==POLY_PARAMS) {
       lives_widget_context_update();
-    }
-    else {
+    } else {
       mt->init_event=NULL;
       mt_show_current_frame(mt, FALSE);
     }
@@ -12477,22 +12737,20 @@
     if (block==NULL||block->ordered) {
       lives_widget_show(mt->in_hbox);
       lives_widget_show(mt->out_hbox);
-    }
-    else {
+    } else {
       lives_widget_hide(mt->in_hbox);
       lives_widget_hide(mt->out_hbox);
     }
 
     if (block!=NULL) {
-      track=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(block->eventbox),"layer_number"));
+      track=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(block->eventbox),"layer_number"));
 
       offset_end=block->offset_start+(weed_timecode_t)((double)(track>=0)*U_SEC/mt->fps)+
-	((get_event_timecode(block->end_event)-get_event_timecode(block->start_event))*ABS(avel));
+                 ((get_event_timecode(block->end_event)-get_event_timecode(block->start_event))*ABS(avel));
 
       start_anchored=block->start_anchored;
       end_anchored=block->end_anchored;
-    }
-    else {
+    } else {
       track=0;
 
       start_anchored=end_anchored=FALSE;
@@ -12508,35 +12766,34 @@
       LiVESWidget *oeventbox;
 
       if (block!=NULL) {
-	secs=lives_ruler_get_value(LIVES_RULER(mt->timeline));
-	if (mt->context_time!=-1.&&mt->use_context) secs=mt->context_time;
-	if (is_audio_eventbox(mt,block->eventbox)&&(oeventbox=(LiVESWidget *)g_object_get_data(G_OBJECT(block->eventbox),
-										"owner"))!=NULL) {
-	  // if moving an audio block we move the associated video block first
-	  block=get_block_from_time(oeventbox,secs,mt);
-	}
-	filenum=get_frame_event_clip(block->start_event,track);
-	
-	frame_start=calc_frame_from_time(filenum,block->offset_start/U_SEC);
-	frame_end=calc_frame_from_time(filenum,offset_end/U_SEC-1./mt->fps);
+        secs=lives_ruler_get_value(LIVES_RULER(mt->timeline));
+        if (mt->context_time!=-1.&&mt->use_context) secs=mt->context_time;
+        if (is_audio_eventbox(block->eventbox)&&(oeventbox=(LiVESWidget *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(block->eventbox),
+            "owner"))!=NULL) {
+          // if moving an audio block we move the associated video block first
+          block=get_block_from_time(oeventbox,secs,mt);
+        }
+        filenum=get_frame_event_clip(block->start_event,track);
+
+        frame_start=calc_frame_from_time(filenum,block->offset_start/U_SEC);
+        frame_end=calc_frame_from_time(filenum,offset_end/U_SEC-1./mt->fps);
       }
 
-      lives_container_set_border_width (LIVES_CONTAINER (mt->poly_box), 0);
+      lives_container_set_border_width(LIVES_CONTAINER(mt->poly_box), 0);
       lives_widget_hide(mt->avel_box);
       lives_widget_show(mt->in_image);
       lives_widget_show(mt->out_image);
 
       if (mainw->playing_file==filenum) {
-	mainw->files[filenum]->event_list=mt->event_list;
+        mainw->files[filenum]->event_list=mt->event_list;
       }
-      
+
       // start image
       thumb=make_thumb(mt,filenum,width,height,frame_start,FALSE);
-      lives_image_set_from_pixbuf (LIVES_IMAGE(mt->in_image),thumb);
+      lives_image_set_from_pixbuf(LIVES_IMAGE(mt->in_image),thumb);
       if (thumb!=NULL) lives_object_unref(thumb);
-    }
-    else {
-      lives_container_set_border_width (LIVES_CONTAINER (mt->poly_box), widget_opts.border_width);
+    } else {
+      lives_container_set_border_width(LIVES_CONTAINER(mt->poly_box), widget_opts.border_width);
       filenum=get_audio_frame_clip(block->start_event,track);
       lives_widget_hide(mt->in_image);
       lives_widget_hide(mt->out_image);
@@ -12544,8 +12801,8 @@
       lives_widget_show(mt->avel_box);
       avel=get_audio_frame_vel(block->start_event,track);
       offset_end=block->offset_start+q_gint64((weed_timecode_t)((double)(track>=0)*U_SEC/mt->fps)+
-					      ((get_event_timecode(block->end_event)-
-						get_event_timecode(block->start_event))*ABS(avel)),mt->fps);
+                                              ((get_event_timecode(block->end_event)-
+                                                  get_event_timecode(block->start_event))*ABS(avel)),mt->fps);
     }
 
     if (block==NULL) {
@@ -12554,79 +12811,70 @@
       lives_spin_button_set_digits(LIVES_SPIN_BUTTON(mt->spinbutton_in),0);
       lives_spin_button_set_digits(LIVES_SPIN_BUTTON(mt->spinbutton_out),0);
       lives_spin_button_configure(LIVES_SPIN_BUTTON(mt->spinbutton_in),mainw->files[filenum]->start,1.,
-				  mainw->files[filenum]->frames,1.,100.);
+                                  mainw->files[filenum]->frames,1.,100.);
       lives_spin_button_configure(LIVES_SPIN_BUTTON(mt->spinbutton_out),mainw->files[filenum]->end,1.,
-				  mainw->files[filenum]->frames,1.,100.);
-      lives_widget_show(mt->start_in_label);
-      lives_widget_show(mt->end_out_label);
-    }
-    else {
+                                  mainw->files[filenum]->frames,1.,100.);
+    } else {
       lives_widget_show(mt->checkbutton_start_anchored);
       lives_widget_show(mt->checkbutton_end_anchored);
       lives_spin_button_set_digits(LIVES_SPIN_BUTTON(mt->spinbutton_in),2);
       lives_spin_button_set_digits(LIVES_SPIN_BUTTON(mt->spinbutton_out),2);
       lives_spin_button_configure(LIVES_SPIN_BUTTON(mt->spinbutton_in),0.,0.,0.,1./mt->fps,1.);
       lives_spin_button_configure(LIVES_SPIN_BUTTON(mt->spinbutton_out),0.,0.,0.,1./mt->fps,1.);
-      lives_widget_hide(mt->start_in_label);
-      lives_widget_hide(mt->end_out_label);
     }
 
     if (avel>0.) {
       if (block!=NULL) {
-	lives_spin_button_set_range(LIVES_SPIN_BUTTON(mt->spinbutton_in),0., offset_end/U_SEC-1./mt->fps);
-	lives_spin_button_set_value(LIVES_SPIN_BUTTON(mt->spinbutton_in),block->offset_start/U_SEC);
+        lives_spin_button_set_range(LIVES_SPIN_BUTTON(mt->spinbutton_in),0., offset_end/U_SEC-1./mt->fps);
+        lives_spin_button_set_value(LIVES_SPIN_BUTTON(mt->spinbutton_in),block->offset_start/U_SEC);
 
+      } else {
+        lives_spin_button_set_range(LIVES_SPIN_BUTTON(mt->spinbutton_in),1., mainw->files[filenum]->frames);
+        lives_spin_button_set_value(LIVES_SPIN_BUTTON(mt->spinbutton_in),mainw->files[filenum]->start);
       }
-      else {
-	lives_spin_button_set_range(LIVES_SPIN_BUTTON(mt->spinbutton_in),1., mainw->files[filenum]->frames);
-	lives_spin_button_set_value(LIVES_SPIN_BUTTON(mt->spinbutton_in),mainw->files[filenum]->start);
-      }
-      lives_signal_handler_block (mt->checkbutton_start_anchored,mt->check_start_func);
-      lives_signal_handler_block (mt->checkbutton_avel_reverse,mt->check_avel_rev_func);
+      lives_signal_handler_block(mt->checkbutton_start_anchored,mt->check_start_func);
+      lives_signal_handler_block(mt->checkbutton_avel_reverse,mt->check_avel_rev_func);
       lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(mt->checkbutton_start_anchored),start_anchored);
-      lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON(mt->checkbutton_avel_reverse),FALSE);
-      lives_signal_handler_unblock (mt->checkbutton_avel_reverse,mt->check_avel_rev_func);
-      lives_signal_handler_unblock (mt->checkbutton_start_anchored,mt->check_start_func);
-    }
-    else {
+      lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(mt->checkbutton_avel_reverse),FALSE);
+      lives_signal_handler_unblock(mt->checkbutton_avel_reverse,mt->check_avel_rev_func);
+      lives_signal_handler_unblock(mt->checkbutton_start_anchored,mt->check_start_func);
+    } else {
       lives_spin_button_set_range(LIVES_SPIN_BUTTON(mt->spinbutton_out),0., offset_end/U_SEC-1./mt->fps);
       lives_spin_button_set_value(LIVES_SPIN_BUTTON(mt->spinbutton_out),block->offset_start/U_SEC);
-      lives_signal_handler_block (mt->checkbutton_start_anchored,mt->check_start_func);
-      lives_signal_handler_block (mt->checkbutton_avel_reverse,mt->check_avel_rev_func);
+      lives_signal_handler_block(mt->checkbutton_start_anchored,mt->check_start_func);
+      lives_signal_handler_block(mt->checkbutton_avel_reverse,mt->check_avel_rev_func);
       lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(mt->checkbutton_start_anchored),start_anchored);
-      lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON(mt->checkbutton_avel_reverse),TRUE);
-      lives_signal_handler_unblock (mt->checkbutton_avel_reverse,mt->check_avel_rev_func);
-      lives_signal_handler_unblock (mt->checkbutton_start_anchored,mt->check_start_func);
+      lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(mt->checkbutton_avel_reverse),TRUE);
+      lives_signal_handler_unblock(mt->checkbutton_avel_reverse,mt->check_avel_rev_func);
+      lives_signal_handler_unblock(mt->checkbutton_start_anchored,mt->check_start_func);
     }
 
-    lives_signal_handler_block (mt->spinbutton_avel,mt->spin_avel_func);
+    lives_signal_handler_block(mt->spinbutton_avel,mt->spin_avel_func);
     lives_spin_button_set_value(LIVES_SPIN_BUTTON(mt->spinbutton_avel),ABS(avel));
-    lives_signal_handler_unblock (mt->spinbutton_avel,mt->spin_avel_func);
+    lives_signal_handler_unblock(mt->spinbutton_avel,mt->spin_avel_func);
 
     if (track>-1) {
       // end image
       thumb=make_thumb(mt,filenum,width,height,frame_end,FALSE);
-      lives_image_set_from_pixbuf (LIVES_IMAGE(mt->out_image),thumb);
+      lives_image_set_from_pixbuf(LIVES_IMAGE(mt->out_image),thumb);
       if (thumb!=NULL) lives_object_unref(thumb);
       out_end_range=count_resampled_frames(mainw->files[filenum]->frames,mainw->files[filenum]->fps,mt->fps)/mt->fps;
-    }
-    else out_end_range=q_gint64(mainw->files[filenum]->laudio_time*U_SEC,mt->fps)/U_SEC;
+    } else out_end_range=q_gint64(mainw->files[filenum]->laudio_time*U_SEC,mt->fps)/U_SEC;
 
     if (avel>0.) {
       if (block!=NULL) {
-	lives_spin_button_set_range(LIVES_SPIN_BUTTON(mt->spinbutton_out), block->offset_start/U_SEC+1./mt->fps, out_end_range);
-	lives_spin_button_set_value(LIVES_SPIN_BUTTON(mt->spinbutton_out),offset_end/U_SEC);
-	if (!block->start_anchored||!block->end_anchored) {
-	  lives_widget_set_sensitive(mt->spinbutton_avel,TRUE);
-	  lives_widget_set_sensitive(mt->avel_scale,TRUE);
-	}
+        lives_spin_button_set_range(LIVES_SPIN_BUTTON(mt->spinbutton_out), block->offset_start/U_SEC+1./mt->fps, out_end_range);
+        lives_spin_button_set_value(LIVES_SPIN_BUTTON(mt->spinbutton_out),offset_end/U_SEC);
+        if (!block->start_anchored||!block->end_anchored) {
+          lives_widget_set_sensitive(mt->spinbutton_avel,TRUE);
+          lives_widget_set_sensitive(mt->avel_scale,TRUE);
+        }
       }
       lives_widget_set_sensitive(mt->spinbutton_in,TRUE);
       lives_widget_set_sensitive(mt->spinbutton_out,TRUE);
 
       lives_widget_grab_focus(mt->spinbutton_in);
-    }
-    else {
+    } else {
       lives_spin_button_set_range(LIVES_SPIN_BUTTON(mt->spinbutton_in), block->offset_start/U_SEC+1./mt->fps, out_end_range);
       lives_spin_button_set_value(LIVES_SPIN_BUTTON(mt->spinbutton_in),offset_end/U_SEC);
       lives_widget_set_sensitive(mt->spinbutton_in,FALSE);
@@ -12635,16 +12883,16 @@
       lives_widget_set_sensitive(mt->avel_scale,FALSE);
     }
 
-    lives_signal_handler_block (mt->checkbutton_end_anchored,mt->check_end_func);
+    lives_signal_handler_block(mt->checkbutton_end_anchored,mt->check_end_func);
     lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(mt->checkbutton_end_anchored),end_anchored);
-    lives_signal_handler_unblock (mt->checkbutton_end_anchored,mt->check_end_func);
+    lives_signal_handler_unblock(mt->checkbutton_end_anchored,mt->check_end_func);
     lives_box_pack_start(LIVES_BOX(mt->poly_box),mt->in_out_box,TRUE,TRUE,0);
 
-    lives_signal_handler_unblock (mt->spinbutton_in,mt->spin_in_func);
-    lives_signal_handler_unblock (mt->spinbutton_out,mt->spin_out_func);
+    lives_signal_handler_unblock(mt->spinbutton_in,mt->spin_in_func);
+    lives_signal_handler_unblock(mt->spinbutton_out,mt->spin_out_func);
 
     if (mainw->playing_file>-1) mt_desensitise(mt);
-    else mt_sensitise (mt);
+    else mt_sensitise(mt);
 
     break;
   case (POLY_CLIPS) :
@@ -12662,7 +12910,7 @@
 
     if (mt->current_rfx!=NULL) {
       rfx_free(mt->current_rfx);
-      g_free(mt->current_rfx);
+      lives_free(mt->current_rfx);
     }
 
     mt->current_rfx=weed_to_rfx(filter,FALSE);
@@ -12670,7 +12918,7 @@
     tc=get_event_timecode(mt->init_event);
 
     if (fx_dialog[1]!=NULL) {
-      lives_rfx_t *rfx=(lives_rfx_t *)g_object_get_data (G_OBJECT (fx_dialog[1]),"rfx");
+      lives_rfx_t *rfx=(lives_rfx_t *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(fx_dialog[1]),"rfx");
       lives_widget_destroy(fx_dialog[1]);
       on_paramwindow_cancel_clicked2(NULL,rfx);
     }
@@ -12692,20 +12940,19 @@
       add_context_label(mt,_("want to set effect parameters"));
       add_context_label(mt,_("Set parameters, then click \"Apply\"\n"));
       add_context_label(mt,_("NODES are points where parameters\nhave been set.\nNodes can be deleted."));
-    }
-    else {
+    } else {
       add_context_label(mt,_("Effect has no parameters.\n"));
     }
     lives_widget_show_all(mt->fx_box);
     break;
   case POLY_FX_STACK:
     mt->init_event=NULL;
-    if (mt->current_track>=0) eventbox=(LiVESWidget *)g_list_nth_data(mt->video_draws,mt->current_track);
+    if (mt->current_track>=0) eventbox=(LiVESWidget *)lives_list_nth_data(mt->video_draws,mt->current_track);
     else eventbox=(LiVESWidget *)mt->audio_draws->data;
 
     if (eventbox==NULL) break; /// < can happen during mt exit
 
-    secs=lives_ruler_get_value(LIVES_RULER(mt->timeline));
+    secs=mt->ptr_time;
     if (mt->context_time!=-1.&&mt->use_context) secs=mt->context_time;
 
     block=get_block_from_time(eventbox,secs,mt);
@@ -12713,8 +12960,7 @@
       block=get_block_before(eventbox,secs,FALSE);
       if (block!=NULL) shortcut=block->end_event;
       else shortcut=NULL;
-    }
-    else shortcut=block->start_event;
+    } else shortcut=block->start_event;
 
     tc=q_gint64(secs*U_SEC,mt->fps);
 
@@ -12722,195 +12968,186 @@
     filter_map=mt->fm_edit_event=get_filter_map_before(frame_event,-1000000,NULL);
 
     mt->fx_list_box=lives_vbox_new(FALSE,0);
-    mt->fx_list_scroll = lives_scrolled_window_new (NULL, NULL);
+    mt->fx_list_scroll = lives_scrolled_window_new(NULL, NULL);
     lives_widget_set_hexpand(mt->fx_list_scroll,TRUE);
 
-    lives_scrolled_window_set_policy (LIVES_SCROLLED_WINDOW (mt->fx_list_scroll), LIVES_POLICY_AUTOMATIC, LIVES_POLICY_AUTOMATIC);
-    lives_box_pack_start (LIVES_BOX (mt->fx_list_box), mt->fx_list_scroll, TRUE, TRUE, 0);
+    lives_scrolled_window_set_policy(LIVES_SCROLLED_WINDOW(mt->fx_list_scroll), LIVES_POLICY_AUTOMATIC, LIVES_POLICY_AUTOMATIC);
+    lives_box_pack_start(LIVES_BOX(mt->fx_list_box), mt->fx_list_scroll, TRUE, TRUE, 0);
     lives_box_pack_start(LIVES_BOX(mt->poly_box),mt->fx_list_box,TRUE,TRUE,0);
 
     mt->fx_list_vbox=lives_vbox_new(FALSE,widget_opts.packing_height);
-    lives_container_set_border_width (LIVES_CONTAINER (mt->fx_list_vbox), widget_opts.border_width);
-    lives_scrolled_window_add_with_viewport (LIVES_SCROLLED_WINDOW (mt->fx_list_scroll), mt->fx_list_vbox);
+    lives_container_set_border_width(LIVES_CONTAINER(mt->fx_list_vbox), widget_opts.border_width);
+    lives_scrolled_window_add_with_viewport(LIVES_SCROLLED_WINDOW(mt->fx_list_scroll), mt->fx_list_vbox);
 
     if (filter_map!=NULL) {
       if (weed_plant_has_leaf(filter_map,"init_events")) num_fx=weed_leaf_num_elements(filter_map,"init_events");
       if (num_fx>0) {
-	init_events=weed_get_voidptr_array(filter_map,"init_events",&error);
-	for (i=0;i<num_fx;i++) {
-	  init_event=(weed_plant_t *)init_events[i];
-	  if (init_event!=NULL) {
-
-	    num_in_tracks=0;
-	    is_input=FALSE;
-	    if (weed_plant_has_leaf(init_event,"in_tracks")) {
-	      num_in_tracks=weed_leaf_num_elements(init_event,"in_tracks");
-	      if (num_in_tracks>0) {
-		in_tracks=weed_get_int_array(init_event,"in_tracks",&error);
-		for (j=0;j<num_in_tracks;j++) {
-		  if (in_tracks[j]==mt->current_track) {
-		    is_input=TRUE;
-		  }
-		  else if (num_in_tracks==2) fromtrack=in_tracks[j];
-		}
-		weed_free(in_tracks);
-	      }
-	    }
-	    num_out_tracks=0;
-	    is_output=FALSE;
-	    if (weed_plant_has_leaf(init_event,"out_tracks")) {
-	      num_out_tracks=weed_leaf_num_elements(init_event,"out_tracks");
-	      if (num_out_tracks>0) {
-		out_tracks=weed_get_int_array(init_event,"out_tracks",&error);
-		def_out_track=out_tracks[0];
-		for (j=0;j<num_out_tracks;j++) {
-		  if (out_tracks[j]==mt->current_track) {
-		    is_output=TRUE;
-		    break;
-		  }
-		}
-		weed_free(out_tracks);
-	      }
-	    }
-
-	    if (!is_input&&!is_output) continue;
-
-	    has_effect=TRUE;
-
-	    fxcount++;
-
-	    fhash=weed_get_string_value(init_event,"filter",&error);
-	    fidx=weed_get_idx_for_hashname(fhash,TRUE);
-	    weed_free(fhash);
-	    fname=weed_filter_idx_get_name(fidx);
-
-	    if (!is_input) {
-	      txt=g_strdup_printf(_("%s output"),fname);
-	    }
-	    else if (!is_output&&num_out_tracks>0) {
-	      if (def_out_track>-1) {
-		yeventbox=(LiVESWidget *)g_list_nth_data(mt->video_draws,def_out_track);
-		olayer=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(yeventbox),"layer_number"));
-		otrackname=g_strdup_printf(_("layer %d"),olayer);
-	      }
-	      else otrackname=g_strdup(_("audio track"));
-	      txt=g_strdup_printf(_("%s to %s"),fname,otrackname);
-	      g_free(otrackname);
-	    }
-	    else if (num_in_tracks==2&&num_out_tracks>0) {
-	      if (fromtrack>-1) {
-		yeventbox=(LiVESWidget *)g_list_nth_data(mt->video_draws,fromtrack);
-		olayer=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(yeventbox),"layer_number"));
-		otrackname=g_strdup_printf(_("layer %d"),olayer);
-	      }
-	      else otrackname=g_strdup(_("audio track"));
-	      txt=g_strdup_printf(_("%s from %s"),fname,otrackname);
-	      g_free(otrackname);
-	    }
-	    else {
-	      txt=g_strdup(fname);
-	    }
-	    xeventbox=lives_event_box_new();
-	    g_object_set_data(G_OBJECT(xeventbox),"init_event",(gpointer)init_event);
-
-	    lives_widget_add_events (xeventbox, LIVES_BUTTON_RELEASE_MASK | LIVES_BUTTON_PRESS_MASK);
-	    if (palette->style&STYLE_1) {
-	      if (palette->style&STYLE_3) {
-		lives_widget_set_bg_color(xeventbox, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
-		lives_widget_set_bg_color(xeventbox, LIVES_WIDGET_STATE_PRELIGHT, &palette->menu_and_bars);
-		lives_widget_set_fg_color(xeventbox, LIVES_WIDGET_STATE_PRELIGHT, &palette->menu_and_bars_fore);
-	      }
-	      else {
-		lives_widget_set_bg_color(xeventbox, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
-		lives_widget_set_bg_color(xeventbox, LIVES_WIDGET_STATE_PRELIGHT, &palette->normal_back);
-		lives_widget_set_fg_color(xeventbox, LIVES_WIDGET_STATE_PRELIGHT, &palette->normal_fore);
-	      }
-	    }
-
-	    if (init_event==mt->selected_init_event) lives_widget_set_state(xeventbox,LIVES_WIDGET_STATE_PRELIGHT);
-	    vbox=lives_vbox_new(FALSE,0);
-
-	    lives_container_set_border_width (LIVES_CONTAINER (vbox), widget_opts.border_width>>1);
-	    lives_container_add (LIVES_CONTAINER (xeventbox), vbox);
-	    label=lives_label_new(txt);
-	    g_free(txt);
-	    g_free(fname);
-
-	    if (palette->style&STYLE_1) {
-	      lives_widget_set_fg_color (label, LIVES_WIDGET_STATE_NORMAL, &palette->info_text);
-	      lives_widget_set_fg_color (label, LIVES_WIDGET_STATE_PRELIGHT, &palette->info_text);
-	    }
-	    lives_container_set_border_width (LIVES_CONTAINER (xeventbox), widget_opts.border_width>>1);
-	    lives_box_pack_start (LIVES_BOX (vbox), label, FALSE, FALSE, 0);
-	    lives_box_pack_start (LIVES_BOX (mt->fx_list_vbox), xeventbox, FALSE, FALSE, 0);
-
-	    lives_signal_connect (LIVES_GUI_OBJECT (xeventbox), "button_press_event",
-			      LIVES_GUI_CALLBACK (fx_ebox_pressed),
-			      (gpointer)mt);
-	  }
-	}
-	weed_free(init_events);
+        init_events=weed_get_voidptr_array(filter_map,"init_events",&error);
+        for (i=0; i<num_fx; i++) {
+          init_event=(weed_plant_t *)init_events[i];
+          if (init_event!=NULL) {
+
+            num_in_tracks=0;
+            is_input=FALSE;
+            if (weed_plant_has_leaf(init_event,"in_tracks")) {
+              num_in_tracks=weed_leaf_num_elements(init_event,"in_tracks");
+              if (num_in_tracks>0) {
+                in_tracks=weed_get_int_array(init_event,"in_tracks",&error);
+                for (j=0; j<num_in_tracks; j++) {
+                  if (in_tracks[j]==mt->current_track) {
+                    is_input=TRUE;
+                  } else if (num_in_tracks==2) fromtrack=in_tracks[j];
+                }
+                lives_free(in_tracks);
+              }
+            }
+            num_out_tracks=0;
+            is_output=FALSE;
+            if (weed_plant_has_leaf(init_event,"out_tracks")) {
+              num_out_tracks=weed_leaf_num_elements(init_event,"out_tracks");
+              if (num_out_tracks>0) {
+                out_tracks=weed_get_int_array(init_event,"out_tracks",&error);
+                def_out_track=out_tracks[0];
+                for (j=0; j<num_out_tracks; j++) {
+                  if (out_tracks[j]==mt->current_track) {
+                    is_output=TRUE;
+                    break;
+                  }
+                }
+                lives_free(out_tracks);
+              }
+            }
+
+            if (!is_input&&!is_output) continue;
+
+            has_effect=TRUE;
+
+            fxcount++;
+
+            fhash=weed_get_string_value(init_event,"filter",&error);
+            fidx=weed_get_idx_for_hashname(fhash,TRUE);
+            lives_free(fhash);
+            fname=weed_filter_idx_get_name(fidx);
+
+            if (!is_input) {
+              txt=lives_strdup_printf(_("%s output"),fname);
+            } else if (!is_output&&num_out_tracks>0) {
+              if (def_out_track>-1) {
+                yeventbox=(LiVESWidget *)lives_list_nth_data(mt->video_draws,def_out_track);
+                olayer=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(yeventbox),"layer_number"));
+                otrackname=lives_strdup_printf(_("layer %d"),olayer);
+              } else otrackname=lives_strdup(_("audio track"));
+              txt=lives_strdup_printf(_("%s to %s"),fname,otrackname);
+              lives_free(otrackname);
+            } else if (num_in_tracks==2&&num_out_tracks>0) {
+              if (fromtrack>-1) {
+                yeventbox=(LiVESWidget *)lives_list_nth_data(mt->video_draws,fromtrack);
+                olayer=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(yeventbox),"layer_number"));
+                otrackname=lives_strdup_printf(_("layer %d"),olayer);
+              } else otrackname=lives_strdup(_("audio track"));
+              txt=lives_strdup_printf(_("%s from %s"),fname,otrackname);
+              lives_free(otrackname);
+            } else {
+              txt=lives_strdup(fname);
+            }
+            xeventbox=lives_event_box_new();
+            lives_widget_object_set_data(LIVES_WIDGET_OBJECT(xeventbox),"init_event",(livespointer)init_event);
+
+            lives_widget_add_events(xeventbox, LIVES_BUTTON_RELEASE_MASK | LIVES_BUTTON_PRESS_MASK);
+            if (palette->style&STYLE_1) {
+              if (palette->style&STYLE_3) {
+                lives_widget_set_bg_color(xeventbox, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+                lives_widget_set_bg_color(xeventbox, LIVES_WIDGET_STATE_PRELIGHT, &palette->menu_and_bars);
+                lives_widget_set_fg_color(xeventbox, LIVES_WIDGET_STATE_PRELIGHT, &palette->menu_and_bars_fore);
+              } else {
+                lives_widget_set_bg_color(xeventbox, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
+                lives_widget_set_bg_color(xeventbox, LIVES_WIDGET_STATE_PRELIGHT, &palette->normal_back);
+                lives_widget_set_fg_color(xeventbox, LIVES_WIDGET_STATE_PRELIGHT, &palette->normal_fore);
+              }
+            }
+
+            if (init_event==mt->selected_init_event) lives_widget_set_state(xeventbox,LIVES_WIDGET_STATE_PRELIGHT);
+            vbox=lives_vbox_new(FALSE,0);
+
+            lives_container_set_border_width(LIVES_CONTAINER(vbox), widget_opts.border_width>>1);
+            lives_container_add(LIVES_CONTAINER(xeventbox), vbox);
+            label=lives_label_new(txt);
+            lives_free(txt);
+            lives_free(fname);
+
+            if (palette->style&STYLE_1) {
+              lives_widget_set_fg_color(label, LIVES_WIDGET_STATE_NORMAL, &palette->info_text);
+              lives_widget_set_fg_color(label, LIVES_WIDGET_STATE_PRELIGHT, &palette->info_text);
+            }
+            lives_container_set_border_width(LIVES_CONTAINER(xeventbox), widget_opts.border_width>>1);
+            lives_box_pack_start(LIVES_BOX(vbox), label, FALSE, FALSE, 0);
+            lives_box_pack_start(LIVES_BOX(mt->fx_list_vbox), xeventbox, FALSE, FALSE, 0);
+
+            lives_signal_connect(LIVES_GUI_OBJECT(xeventbox), LIVES_WIDGET_BUTTON_PRESS_EVENT,
+                                 LIVES_GUI_CALLBACK(fx_ebox_pressed),
+                                 (livespointer)mt);
+          }
+        }
+        lives_free(init_events);
       }
     }
 
     bbox=lives_hbutton_box_new();
-    lives_button_box_set_layout (LIVES_BUTTON_BOX (bbox), LIVES_BUTTONBOX_SPREAD);
-    lives_box_pack_end (LIVES_BOX (mt->fx_list_box), bbox, FALSE, FALSE, 0);
+    lives_button_box_set_layout(LIVES_BUTTON_BOX(bbox), LIVES_BUTTONBOX_SPREAD);
+    lives_box_pack_end(LIVES_BOX(mt->fx_list_box), bbox, FALSE, FALSE, 0);
 
-    mt->prev_fm_button = lives_button_new_with_mnemonic (_("_Prev filter map")); // Note to translators: previous filter map
-    lives_box_pack_start (LIVES_BOX (bbox), mt->prev_fm_button, FALSE, FALSE, 0);
+    mt->prev_fm_button = lives_button_new_with_mnemonic(_("_Prev filter map"));  // Note to translators: previous filter map
+    lives_box_pack_start(LIVES_BOX(bbox), mt->prev_fm_button, FALSE, FALSE, 0);
 
     lives_widget_set_sensitive(mt->prev_fm_button,(prev_fm_event=get_prev_fm(mt,mt->current_track,frame_event))!=NULL&&
-			     (get_event_timecode(prev_fm_event)!=(get_event_timecode(frame_event))));
-    
-    lives_signal_connect (LIVES_GUI_OBJECT (mt->prev_fm_button), LIVES_WIDGET_CLICKED_EVENT,
-		      LIVES_GUI_CALLBACK (on_prev_fm_clicked),
-		      (gpointer)mt);
+                               (get_event_timecode(prev_fm_event)!=(get_event_timecode(frame_event))));
+
+    lives_signal_connect(LIVES_GUI_OBJECT(mt->prev_fm_button), LIVES_WIDGET_CLICKED_SIGNAL,
+                         LIVES_GUI_CALLBACK(on_prev_fm_clicked),
+                         (livespointer)mt);
 
     if (fxcount>1) {
-      mt->fx_ibefore_button = lives_button_new_with_mnemonic (_("Insert _before"));
-      lives_box_pack_start (LIVES_BOX (bbox), mt->fx_ibefore_button, FALSE, FALSE, 0);
+      mt->fx_ibefore_button = lives_button_new_with_mnemonic(_("Insert _before"));
+      lives_box_pack_start(LIVES_BOX(bbox), mt->fx_ibefore_button, FALSE, FALSE, 0);
       lives_widget_set_sensitive(mt->fx_ibefore_button,mt->fx_order==FX_ORD_NONE&&
-			       get_event_timecode(mt->fm_edit_event)==get_event_timecode(frame_event)&&
-			       mt->selected_init_event!=NULL);
-      
-      lives_signal_connect (LIVES_GUI_OBJECT (mt->fx_ibefore_button), LIVES_WIDGET_CLICKED_EVENT,
-			LIVES_GUI_CALLBACK (on_fx_insb_clicked),
-			(gpointer)mt);
-      
-      mt->fx_iafter_button = lives_button_new_with_mnemonic (_("Insert _after"));
-      lives_box_pack_start (LIVES_BOX (bbox), mt->fx_iafter_button, FALSE, FALSE, 0);
+                                 get_event_timecode(mt->fm_edit_event)==get_event_timecode(frame_event)&&
+                                 mt->selected_init_event!=NULL);
+
+      lives_signal_connect(LIVES_GUI_OBJECT(mt->fx_ibefore_button), LIVES_WIDGET_CLICKED_SIGNAL,
+                           LIVES_GUI_CALLBACK(on_fx_insb_clicked),
+                           (livespointer)mt);
+
+      mt->fx_iafter_button = lives_button_new_with_mnemonic(_("Insert _after"));
+      lives_box_pack_start(LIVES_BOX(bbox), mt->fx_iafter_button, FALSE, FALSE, 0);
       lives_widget_set_sensitive(mt->fx_iafter_button,mt->fx_order==FX_ORD_NONE&&
-			       get_event_timecode(mt->fm_edit_event)==get_event_timecode(frame_event)&&
-			       mt->selected_init_event!=NULL);
-      
-      lives_signal_connect (LIVES_GUI_OBJECT (mt->fx_iafter_button), LIVES_WIDGET_CLICKED_EVENT,
-			LIVES_GUI_CALLBACK (on_fx_insa_clicked),
-			(gpointer)mt);
-      
-    }
-    else {
+                                 get_event_timecode(mt->fm_edit_event)==get_event_timecode(frame_event)&&
+                                 mt->selected_init_event!=NULL);
+
+      lives_signal_connect(LIVES_GUI_OBJECT(mt->fx_iafter_button), LIVES_WIDGET_CLICKED_SIGNAL,
+                           LIVES_GUI_CALLBACK(on_fx_insa_clicked),
+                           (livespointer)mt);
+
+    } else {
       mt->fx_ibefore_button=mt->fx_iafter_button=NULL;
     }
 
-    mt->next_fm_button = lives_button_new_with_mnemonic (_("_Next filter map"));
-    lives_box_pack_end (LIVES_BOX (bbox), mt->next_fm_button, FALSE, FALSE, 0);
-    
+    mt->next_fm_button = lives_button_new_with_mnemonic(_("_Next filter map"));
+    lives_box_pack_end(LIVES_BOX(bbox), mt->next_fm_button, FALSE, FALSE, 0);
+
     lives_widget_set_sensitive(mt->next_fm_button,(next_fm_event=get_next_fm(mt,mt->current_track,frame_event))!=NULL&&
-			     (get_event_timecode(next_fm_event)>get_event_timecode(frame_event)));
+                               (get_event_timecode(next_fm_event)>get_event_timecode(frame_event)));
 
-    lives_signal_connect (LIVES_GUI_OBJECT (mt->next_fm_button), LIVES_WIDGET_CLICKED_EVENT,
-		      LIVES_GUI_CALLBACK (on_next_fm_clicked),
-		      (gpointer)mt);
+    lives_signal_connect(LIVES_GUI_OBJECT(mt->next_fm_button), LIVES_WIDGET_CLICKED_SIGNAL,
+                         LIVES_GUI_CALLBACK(on_next_fm_clicked),
+                         (livespointer)mt);
 
     if (has_effect) {
       do_fx_list_context(mt,fxcount);
-    }
-    else {
+    } else {
       widget_opts.justify=LIVES_JUSTIFY_CENTER;
       label=lives_standard_label_new(_("\n\nNo effects at current track,\ncurrent time.\n"));
       widget_opts.justify=LIVES_JUSTIFY_DEFAULT;
-      lives_box_pack_start (LIVES_BOX (mt->fx_list_box), label, TRUE, TRUE, 0);
+      lives_box_pack_start(LIVES_BOX(mt->fx_list_box), label, TRUE, TRUE, 0);
     }
 
     lives_widget_show_all(mt->fx_list_box);
@@ -12926,33 +13163,33 @@
   case POLY_COMP:
     set_poly_tab(mt,POLY_COMP);
     clear_context(mt);
-    add_context_label (mt,(_("Drag a compositor anywhere\non the timeline\nto apply it to the selected region.")));
+    add_context_label(mt,(_("Drag a compositor anywhere\non the timeline\nto apply it to the selected region.")));
     tab_set=TRUE;
     ++nins;
   case POLY_TRANS:
-    if (!tab_set){
+    if (!tab_set) {
       set_poly_tab(mt,POLY_TRANS);
       clear_context(mt);
-      add_context_label (mt,(_("Drag a transition anywhere\non the timeline\nto apply it to the selected region.")));
+      add_context_label(mt,(_("Drag a transition anywhere\non the timeline\nto apply it to the selected region.")));
     }
-    tab_set=TRUE; 
+    tab_set=TRUE;
     ++nins;
   case POLY_EFFECTS:
-    if (!tab_set){
+    if (!tab_set) {
       set_poly_tab(mt,POLY_EFFECTS);
       clear_context(mt);
-      add_context_label (mt,(_("Effects can be dragged\nonto blocks on the timeline.")));
+      add_context_label(mt,(_("Effects can be dragged\nonto blocks on the timeline.")));
     }
     mt->fx_list_box=lives_vbox_new(FALSE,0);
-    mt->fx_list_scroll = lives_scrolled_window_new (NULL, NULL);
+    mt->fx_list_scroll = lives_scrolled_window_new(NULL, NULL);
     lives_widget_set_hexpand(mt->fx_list_scroll,TRUE);
-    lives_scrolled_window_set_policy (LIVES_SCROLLED_WINDOW (mt->fx_list_scroll), LIVES_POLICY_AUTOMATIC, LIVES_POLICY_AUTOMATIC);
-    lives_box_pack_start (LIVES_BOX (mt->fx_list_box), mt->fx_list_scroll, TRUE, TRUE, 0);
+    lives_scrolled_window_set_policy(LIVES_SCROLLED_WINDOW(mt->fx_list_scroll), LIVES_POLICY_AUTOMATIC, LIVES_POLICY_AUTOMATIC);
+    lives_box_pack_start(LIVES_BOX(mt->fx_list_box), mt->fx_list_scroll, TRUE, TRUE, 0);
     lives_box_pack_start(LIVES_BOX(mt->poly_box),mt->fx_list_box,TRUE,TRUE,0);
 
     mt->fx_list_vbox=lives_vbox_new(FALSE,widget_opts.packing_height);
-    lives_container_set_border_width (LIVES_CONTAINER (mt->fx_list_vbox), widget_opts.border_width);
-    lives_scrolled_window_add_with_viewport (LIVES_SCROLLED_WINDOW (mt->fx_list_scroll), mt->fx_list_vbox);
+    lives_container_set_border_width(LIVES_CONTAINER(mt->fx_list_vbox), widget_opts.border_width);
+    lives_scrolled_window_add_with_viewport(LIVES_SCROLLED_WINDOW(mt->fx_list_scroll), mt->fx_list_vbox);
 
     if (mt->poly_state==POLY_COMP) nins=1000000;
     populate_filter_box(mt->fx_list_vbox,nins,mt);
@@ -12966,7 +13203,7 @@
   lives_widget_queue_draw(mt->poly_box);
 
   if (prefs->open_maximised) {
-    lives_window_maximize (LIVES_WINDOW(mt->window));
+    lives_window_maximize(LIVES_WINDOW(mt->window));
   }
 
 }
@@ -12976,11 +13213,13 @@
   double timesecs;
   int min_x;
 
+  if (!mainw->interactive) return;
+
   lives_widget_set_sensitive(mt->mm_menuitem,FALSE);
   lives_widget_set_sensitive(mt->view_sel_events,FALSE);
-  
-  lives_widget_get_pointer((LiVESXDevice *)mainw->mgeom[prefs->gui_monitor>0?prefs->gui_monitor-1:0].mouse_device, 
-			   mt->timeline, &mt->sel_x, &mt->sel_y);
+
+  lives_widget_get_pointer((LiVESXDevice *)mainw->mgeom[prefs->gui_monitor>0?prefs->gui_monitor-1:0].mouse_device,
+                           mt->timeline, &mt->sel_x, &mt->sel_y);
   timesecs=get_time_from_x(mt,mt->sel_x);
   mt->region_start=mt->region_end=mt->region_init=timesecs;
 
@@ -12988,9 +13227,9 @@
   on_timeline_update(mt->timeline_eb,NULL,mt);
   mt->region_updating=FALSE;
 
-  lives_widget_get_pointer((LiVESXDevice *)mainw->mgeom[prefs->gui_monitor>0?prefs->gui_monitor-1:0].mouse_device, 
-			   mt->tl_eventbox, &mt->sel_x, &mt->sel_y);
-  gdk_window_get_position(lives_widget_get_xwindow(mt->timeline_eb), &min_x, NULL);
+  lives_widget_get_pointer((LiVESXDevice *)mainw->mgeom[prefs->gui_monitor>0?prefs->gui_monitor-1:0].mouse_device,
+                           mt->tl_eventbox, &mt->sel_x, &mt->sel_y);
+  lives_widget_get_position(mt->timeline_eb, &min_x, NULL);
 
   if (mt->sel_x<min_x) mt->sel_x=min_x;
   if (mt->sel_y<0.) mt->sel_y=0.;
@@ -13003,9 +13242,11 @@
 }
 
 static void mouse_select_end(LiVESWidget *widget, LiVESXEventButton *event, lives_mt *mt) {
+  if (!mainw->interactive) return;
+
   mt->tl_selecting=FALSE;
-  lives_widget_get_pointer((LiVESXDevice *)mainw->mgeom[prefs->gui_monitor>0?prefs->gui_monitor-1:0].mouse_device, 
-			   mt->timeline, &mt->sel_x, &mt->sel_y);
+  lives_widget_get_pointer((LiVESXDevice *)mainw->mgeom[prefs->gui_monitor>0?prefs->gui_monitor-1:0].mouse_device,
+                           mt->timeline, &mt->sel_x, &mt->sel_y);
   lives_widget_set_sensitive(mt->mm_menuitem,TRUE);
   lives_widget_queue_draw(mt->tl_eventbox);
   on_timeline_release(mt->timeline_reg,NULL,mt);
@@ -13027,31 +13268,31 @@
 
   register int i;
 
+  if (!mainw->interactive) return;
+
   if (mt->block_selected!=NULL) unselect_all(mt);
 
-  lives_widget_get_pointer((LiVESXDevice *)mainw->mgeom[prefs->gui_monitor>0?prefs->gui_monitor-1:0].mouse_device, 
-			   mt->tl_eventbox, &x, &y);
-  gdk_window_get_position(lives_widget_get_xwindow(mt->timeline_eb), &min_x, NULL);
+  lives_widget_get_pointer((LiVESXDevice *)mainw->mgeom[prefs->gui_monitor>0?prefs->gui_monitor-1:0].mouse_device,
+                           mt->tl_eventbox, &x, &y);
+  lives_widget_get_position(mt->timeline_eb, &min_x, NULL);
 
   if (x<min_x) x=min_x;
   if (y<0.) y=0.;
 
   lives_widget_queue_draw(mt->tl_hbox);
-  gdk_window_process_updates(lives_widget_get_xwindow(mt->tl_eventbox),FALSE);
+  lives_widget_process_updates(mt->tl_eventbox,FALSE);
 
   if (x>=mt->sel_x) {
     start_x=mt->sel_x;
     width=x-mt->sel_x;
-  }
-  else {
+  } else {
     start_x=x;
     width=mt->sel_x-x;
   }
   if (y>=mt->sel_y) {
     start_y=mt->sel_y;
     height=y-mt->sel_y;
-  }
-  else {
+  } else {
     start_y=y;
     height=mt->sel_y-y;
   }
@@ -13059,81 +13300,79 @@
   if (start_x<0) start_x=0;
   if (start_y<0) start_y=0;
 
-  cr = lives_painter_create_from_widget (mt->tl_eventbox);
+  cr = lives_painter_create_from_widget(mt->tl_eventbox);
   lives_painter_set_source_rgb(cr, 0., 0., 0.); ///< opaque black
-	
+
   lives_painter_rectangle(cr,start_x,start_y,width,height);
   lives_painter_fill(cr);
 
-  for (i=0;i<mt->num_video_tracks;i++) {
-    xeventbox=(LiVESWidget *)g_list_nth_data(mt->video_draws,i);
-    if (GPOINTER_TO_INT(g_object_get_data(G_OBJECT(xeventbox),"hidden"))==0) {
+  for (i=0; i<mt->num_video_tracks; i++) {
+    xeventbox=(LiVESWidget *)lives_list_nth_data(mt->video_draws,i);
+    if (LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(xeventbox),"hidden"))==0) {
       xheight=lives_widget_get_allocation_height(xeventbox);
-      checkbutton=(LiVESWidget *)g_object_get_data(G_OBJECT(xeventbox),"checkbutton");
-      gdk_window_get_position(lives_widget_get_xwindow(xeventbox),&rel_x,&rel_y);
+      checkbutton=(LiVESWidget *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(xeventbox),"checkbutton");
+      lives_widget_get_position(xeventbox,&rel_x,&rel_y);
       if (start_y>(rel_y+xheight/2)||(start_y+height)<(rel_y+xheight/2)) {
 #ifdef ENABLE_GIW
-	if (!prefs->lamp_buttons) {
+        if (!prefs->lamp_buttons) {
 #endif
-	  if (lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(checkbutton))) {
-	    lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(checkbutton),FALSE);
-	    mt->current_track=current_track;
-	    track_select(mt);
-	  }
+          if (lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(checkbutton))) {
+            lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(checkbutton),FALSE);
+            mt->current_track=current_track;
+            track_select(mt);
+          }
 #ifdef ENABLE_GIW
-	}
-	else {
-	  if (giw_led_get_mode(GIW_LED(checkbutton))) {
-	    giw_led_set_mode(GIW_LED(checkbutton),FALSE);
-	    mt->current_track=current_track;
-	    track_select(mt);
-	  }
-	}
+        } else {
+          if (giw_led_get_mode(GIW_LED(checkbutton))) {
+            giw_led_set_mode(GIW_LED(checkbutton),FALSE);
+            mt->current_track=current_track;
+            track_select(mt);
+          }
+        }
 #endif
-	continue;
+        continue;
       }
       offs_y_start=0;
       offs_y_end=xheight;
 
       if (start_y<rel_y+xheight) {
-	offs_y_start=start_y-rel_y;
-	lives_painter_move_to(cr,start_x-rel_x,offs_y_start);
-	lives_painter_line_to(cr,start_x+width-rel_x-1, offs_y_start);
+        offs_y_start=start_y-rel_y;
+        lives_painter_move_to(cr,start_x-rel_x,offs_y_start);
+        lives_painter_line_to(cr,start_x+width-rel_x-1, offs_y_start);
       }
       if (start_y+height<rel_y+xheight) {
-	offs_y_end=start_y-rel_y+height;
-	lives_painter_move_to(cr,start_x-rel_x,offs_y_end);
-	lives_painter_line_to(cr,start_x+width-rel_x-1, offs_y_end);
+        offs_y_end=start_y-rel_y+height;
+        lives_painter_move_to(cr,start_x-rel_x,offs_y_end);
+        lives_painter_line_to(cr,start_x+width-rel_x-1, offs_y_end);
       }
 
-      lives_painter_move_to(cr,start_x-rel_x,offs_y_start); 
+      lives_painter_move_to(cr,start_x-rel_x,offs_y_start);
       lives_painter_line_to(cr,start_x-rel_x,offs_y_end);
-      lives_painter_move_to(cr,start_x-rel_x-1,offs_y_start); 
+      lives_painter_move_to(cr,start_x-rel_x-1,offs_y_start);
       lives_painter_line_to(cr,start_x-rel_x-1,offs_y_end);
       lives_painter_stroke(cr);
 
 #ifdef ENABLE_GIW
       if (!prefs->lamp_buttons) {
 #endif
-	if (!lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(checkbutton))) {
-	  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(checkbutton),TRUE);
-	  mt->current_track=current_track;
-	  track_select(mt);
-	}
+        if (!lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(checkbutton))) {
+          lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(checkbutton),TRUE);
+          mt->current_track=current_track;
+          track_select(mt);
+        }
 #ifdef ENABLE_GIW
-      }
-      else {
-	if (!giw_led_get_mode(GIW_LED(checkbutton))) {
-	  giw_led_set_mode(GIW_LED(checkbutton),TRUE);
-	  mt->current_track=current_track;
-	  track_select(mt);
-	}
+      } else {
+        if (!giw_led_get_mode(GIW_LED(checkbutton))) {
+          giw_led_set_mode(GIW_LED(checkbutton),TRUE);
+          mt->current_track=current_track;
+          track_select(mt);
+        }
       }
 #endif
     }
   }
 
-  lives_painter_destroy (cr);
+  lives_painter_destroy(cr);
 
   if (widget!=mt->timeline_eb) {
     mt->region_updating=TRUE;
@@ -13141,13 +13380,13 @@
     mt->region_updating=FALSE;
   }
 
-  
+
 }
 
 
 
 
-void do_block_context (lives_mt *mt, LiVESXEventButton *event, track_rect *block) {
+void do_block_context(lives_mt *mt, LiVESXEventButton *event, track_rect *block) {
   // pop up a context menu when a selected block is right clicked on
 
   // unfinished...
@@ -13162,71 +13401,72 @@
   int error;
 
   //mouse_select_end(NULL,mt);
+  if (!mainw->interactive) return;
 
-  lives_menu_set_title (LIVES_MENU(menu),_("LiVES: Selected block/frame"));
+  lives_menu_set_title(LIVES_MENU(menu),_("LiVES: Selected block/frame"));
 
   if (palette->style&STYLE_1) {
     lives_widget_set_bg_color(menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
     lives_widget_set_fg_color(menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars_fore);
   }
-  
-  selblock = lives_menu_item_new_with_mnemonic (_("_Select this block"));
-  lives_container_add (LIVES_CONTAINER (menu), selblock);
 
-  lives_signal_connect (LIVES_GUI_OBJECT (selblock), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (selblock_cb),
-		    (gpointer)mt);
+  selblock = lives_menu_item_new_with_mnemonic(_("_Select this block"));
+  lives_container_add(LIVES_CONTAINER(menu), selblock);
+
+  lives_signal_connect(LIVES_GUI_OBJECT(selblock), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(selblock_cb),
+                       (livespointer)mt);
+
 
 
-  
   if (block->ordered) { // TODO
-    split_here = lives_menu_item_new_with_mnemonic (_("_Split block here"));
-    lives_container_add (LIVES_CONTAINER (menu), split_here);
-    
-    lives_signal_connect (LIVES_GUI_OBJECT (split_here), LIVES_WIDGET_ACTIVATE_EVENT,
-		      LIVES_GUI_CALLBACK (on_split_activate),
-		      (gpointer)mt);
-  }
-
-  list_fx_here = lives_menu_item_new_with_mnemonic (_("List _effects here"));
-  lives_container_add (LIVES_CONTAINER (menu), list_fx_here);
-
-  lives_signal_connect (LIVES_GUI_OBJECT (list_fx_here), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (list_fx_here_cb),
-		    (gpointer)mt);
-
-  if (is_audio_eventbox(mt,block->eventbox)&&mt->avol_init_event!=NULL) {
-    gchar *avol_fxname=weed_get_string_value(get_weed_filter(mt->avol_fx),"name",&error);
-    gchar *text=g_strdup_printf(_("_Adjust %s"),avol_fxname);
-    avol = lives_menu_item_new_with_mnemonic (text);
-    g_free(avol_fxname);
-    g_free(text);
-    lives_container_add (LIVES_CONTAINER (menu), avol);
-
-    lives_signal_connect (LIVES_GUI_OBJECT (avol), LIVES_WIDGET_ACTIVATE_EVENT,
-		      LIVES_GUI_CALLBACK (mt_avol_quick),
-		      (gpointer)mt);
-    
+    split_here = lives_menu_item_new_with_mnemonic(_("_Split block here"));
+    lives_container_add(LIVES_CONTAINER(menu), split_here);
+
+    lives_signal_connect(LIVES_GUI_OBJECT(split_here), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                         LIVES_GUI_CALLBACK(on_split_activate),
+                         (livespointer)mt);
+  }
+
+  list_fx_here = lives_menu_item_new_with_mnemonic(_("List _effects here"));
+  lives_container_add(LIVES_CONTAINER(menu), list_fx_here);
+
+  lives_signal_connect(LIVES_GUI_OBJECT(list_fx_here), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(list_fx_here_cb),
+                       (livespointer)mt);
+
+  if (is_audio_eventbox(block->eventbox)&&mt->avol_init_event!=NULL) {
+    char *avol_fxname=weed_get_string_value(get_weed_filter(mt->avol_fx),"name",&error);
+    char *text=lives_strdup_printf(_("_Adjust %s"),avol_fxname);
+    avol = lives_menu_item_new_with_mnemonic(text);
+    lives_free(avol_fxname);
+    lives_free(text);
+    lives_container_add(LIVES_CONTAINER(menu), avol);
+
+    lives_signal_connect(LIVES_GUI_OBJECT(avol), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                         LIVES_GUI_CALLBACK(mt_avol_quick),
+                         (livespointer)mt);
+
     if (mt->event_list==NULL) lives_widget_set_sensitive(avol,FALSE);
 
   }
 
 
-  delete_block = lives_menu_item_new_with_mnemonic (_("_Delete this block"));
-  lives_container_add (LIVES_CONTAINER (menu), delete_block);
+  delete_block = lives_menu_item_new_with_mnemonic(_("_Delete this block"));
+  lives_container_add(LIVES_CONTAINER(menu), delete_block);
   if (mt->is_rendering) lives_widget_set_sensitive(delete_block,FALSE);
 
-  lives_signal_connect (LIVES_GUI_OBJECT (delete_block), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (delete_block_cb),
-		    (gpointer)mt);
+  lives_signal_connect(LIVES_GUI_OBJECT(delete_block), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(delete_block_cb),
+                       (livespointer)mt);
 
-  lives_widget_show_all (menu);
-  lives_menu_popup (LIVES_MENU(menu), event);
+  lives_widget_show_all(menu);
+  lives_menu_popup(LIVES_MENU(menu), event);
 
 }
 
 
-void do_track_context (lives_mt *mt, LiVESXEventButton *event, double timesecs, int track) {
+void do_track_context(lives_mt *mt, LiVESXEventButton *event, double timesecs, int track) {
   // pop up a context menu when track is right clicked on
 
   // unfinished...
@@ -13236,15 +13476,17 @@
   boolean has_something=FALSE;
   boolean needs_idlefunc=FALSE;
 
+  if (!mainw->interactive) return;
+
   if (mt->idlefunc>0) {
-    g_source_remove(mt->idlefunc);
+    lives_source_remove(mt->idlefunc);
     mt->idlefunc=0;
     needs_idlefunc=TRUE;
   }
 
   mouse_select_end(NULL,event,mt);
 
-  lives_menu_set_title (LIVES_MENU(menu),_("LiVES: Selected frame"));
+  lives_menu_set_title(LIVES_MENU(menu),_("LiVES: Selected frame"));
 
   if (palette->style&STYLE_1) {
     lives_widget_set_bg_color(menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
@@ -13252,37 +13494,36 @@
   }
 
   if (mt->file_selected>0&&((track<0&&mainw->files[mt->file_selected]->achans>0&&
-			     mainw->files[mt->file_selected]->laudio_time>0.)||
-			    (track>=0&&mainw->files[mt->file_selected]->frames>0))) {
+                             mainw->files[mt->file_selected]->laudio_time>0.)||
+                            (track>=0&&mainw->files[mt->file_selected]->frames>0))) {
     if (track>=0) {
-      insert_here = lives_menu_item_new_with_mnemonic (_("_Insert here"));
-      lives_signal_connect (LIVES_GUI_OBJECT (insert_here), LIVES_WIDGET_ACTIVATE_EVENT,
-			LIVES_GUI_CALLBACK (insert_at_ctx_cb),
-			(gpointer)mt);
+      insert_here = lives_menu_item_new_with_mnemonic(_("_Insert here"));
+      lives_signal_connect(LIVES_GUI_OBJECT(insert_here), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                           LIVES_GUI_CALLBACK(insert_at_ctx_cb),
+                           (livespointer)mt);
+    } else {
+      insert_here = lives_menu_item_new_with_mnemonic(_("_Insert audio here"));
+      lives_signal_connect(LIVES_GUI_OBJECT(insert_here), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                           LIVES_GUI_CALLBACK(insert_audio_at_ctx_cb),
+                           (livespointer)mt);
     }
-    else {
-      insert_here = lives_menu_item_new_with_mnemonic (_("_Insert audio here"));
-      lives_signal_connect (LIVES_GUI_OBJECT (insert_here), LIVES_WIDGET_ACTIVATE_EVENT,
-			LIVES_GUI_CALLBACK (insert_audio_at_ctx_cb),
-			(gpointer)mt);
-    }
-    lives_container_add (LIVES_CONTAINER (menu), insert_here);
+    lives_container_add(LIVES_CONTAINER(menu), insert_here);
     has_something=TRUE;
   }
 
 
   if (mt->audio_draws!=NULL&&(track<0||mt->opts.pertrack_audio)&&mt->event_list!=NULL) {
     int error;
-    gchar *avol_fxname=weed_get_string_value(get_weed_filter(mt->avol_fx),"name",&error);
-    gchar *text=g_strdup_printf(_("_Adjust %s"),avol_fxname);
-    avol = lives_menu_item_new_with_mnemonic (text);
-    g_free(avol_fxname);
-    g_free(text);
-    lives_container_add (LIVES_CONTAINER (menu), avol);
-
-    lives_signal_connect (LIVES_GUI_OBJECT (avol), LIVES_WIDGET_ACTIVATE_EVENT,
-		      LIVES_GUI_CALLBACK (mt_avol_quick),
-		      (gpointer)mt);
+    char *avol_fxname=weed_get_string_value(get_weed_filter(mt->avol_fx),"name",&error);
+    char *text=lives_strdup_printf(_("_Adjust %s"),avol_fxname);
+    avol = lives_menu_item_new_with_mnemonic(text);
+    lives_free(avol_fxname);
+    lives_free(text);
+    lives_container_add(LIVES_CONTAINER(menu), avol);
+
+    lives_signal_connect(LIVES_GUI_OBJECT(avol), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                         LIVES_GUI_CALLBACK(mt_avol_quick),
+                         (livespointer)mt);
 
     if (mt->event_list==NULL) lives_widget_set_sensitive(avol,FALSE);
 
@@ -13292,16 +13533,15 @@
 
 
   if (has_something) {
-    lives_widget_show_all (menu);
-    lives_menu_popup (LIVES_MENU(menu), event);
+    lives_widget_show_all(menu);
+    lives_menu_popup(LIVES_MENU(menu), event);
 
-    lives_signal_connect (LIVES_GUI_OBJECT (menu), "unmap",
-		      LIVES_GUI_CALLBACK (rdrw_cb),
-		      (gpointer)mt);
+    lives_signal_connect(LIVES_GUI_OBJECT(menu), LIVES_WIDGET_UNMAP_SIGNAL,
+                         LIVES_GUI_CALLBACK(rdrw_cb),
+                         (livespointer)mt);
 
 
-  }
-  else lives_widget_destroy(menu);
+  } else lives_widget_destroy(menu);
 
   if (needs_idlefunc) {
     mt->idlefunc=mt_idle_add(mt);
@@ -13311,7 +13551,7 @@
 }
 
 
-boolean on_track_release (LiVESWidget *eventbox, LiVESXEventButton *event, gpointer user_data) {
+boolean on_track_release(LiVESWidget *eventbox, LiVESXEventButton *event, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   weed_timecode_t tc,tcpp;
 
@@ -13319,7 +13559,7 @@
   LiVESWidget *oeventbox;
   LiVESWidget *xlabelbox;
   LiVESWidget *xahbox;
-  GdkWindow *window;
+  LiVESXWindow *window;
 
   double timesecs;
 
@@ -13334,68 +13574,69 @@
 
   register int i;
 
+  if (!mainw->interactive) return FALSE;
+
   if (mt->idlefunc>0) {
-    g_source_remove(mt->idlefunc);
+    lives_source_remove(mt->idlefunc);
     mt->idlefunc=0;
     needs_idlefunc=TRUE;
   }
 
   lives_set_cursor_style(LIVES_CURSOR_BUSY,NULL);
 
-  lives_widget_get_pointer((LiVESXDevice *)mainw->mgeom[prefs->gui_monitor>0?prefs->gui_monitor-1:0].mouse_device, 
-			   eventbox, &x, &y);
+  lives_widget_get_pointer((LiVESXDevice *)mainw->mgeom[prefs->gui_monitor>0?prefs->gui_monitor-1:0].mouse_device,
+                           eventbox, &x, &y);
   timesecs=get_time_from_x(mt,x);
   tc=timesecs*U_SECL;
 
 
-  window=lives_display_get_window_at_pointer 
-    ((LiVESXDevice *)mainw->mgeom[prefs->gui_monitor>0?prefs->gui_monitor-1:0].mouse_device,
-     mt->display,&win_x,&win_y);
-  
+  window=lives_display_get_window_at_pointer
+         ((LiVESXDevice *)mainw->mgeom[prefs->gui_monitor>0?prefs->gui_monitor-1:0].mouse_device,
+          mt->display,&win_x,&win_y);
+
   if (cfile->achans>0) {
-    for (i=0;i<g_list_length(mt->audio_draws);i++) {
-      xeventbox=(LiVESWidget *)g_list_nth_data(mt->audio_draws,i);
-      oeventbox=(LiVESWidget *)g_object_get_data(G_OBJECT(xeventbox),"owner");
-      if (i>=mt->opts.back_audio_tracks&&!GPOINTER_TO_INT(g_object_get_data(G_OBJECT(oeventbox),"expanded"))) continue;
-      xlabelbox=(LiVESWidget *)g_object_get_data(G_OBJECT(xeventbox),"labelbox");
-      xahbox=(LiVESWidget *)g_object_get_data(G_OBJECT(xeventbox),"ahbox");
+    for (i=0; i<lives_list_length(mt->audio_draws); i++) {
+      xeventbox=(LiVESWidget *)lives_list_nth_data(mt->audio_draws,i);
+      oeventbox=(LiVESWidget *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(xeventbox),"owner");
+      if (i>=mt->opts.back_audio_tracks&&!LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(oeventbox),"expanded"))) continue;
+      xlabelbox=(LiVESWidget *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(xeventbox),"labelbox");
+      xahbox=(LiVESWidget *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(xeventbox),"ahbox");
       if (lives_widget_get_xwindow(xeventbox)==window||lives_widget_get_xwindow(xlabelbox)==window||lives_widget_get_xwindow(xahbox)==window) {
-	track=i-1;
-	got_track=TRUE;
-	mt->aud_track_selected=TRUE;
-	break;
+        track=i-1;
+        got_track=TRUE;
+        mt->aud_track_selected=TRUE;
+        break;
       }
     }
   }
   if (track!=-1) {
-    for (i=0;i<g_list_length(mt->video_draws);i++) {
-      xeventbox=(LiVESWidget *)g_list_nth_data(mt->video_draws,i);
-      xlabelbox=(LiVESWidget *)g_object_get_data(G_OBJECT(xeventbox),"labelbox");
-      xahbox=(LiVESWidget *)g_object_get_data(G_OBJECT(xeventbox),"ahbox");
+    for (i=0; i<lives_list_length(mt->video_draws); i++) {
+      xeventbox=(LiVESWidget *)lives_list_nth_data(mt->video_draws,i);
+      xlabelbox=(LiVESWidget *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(xeventbox),"labelbox");
+      xahbox=(LiVESWidget *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(xeventbox),"ahbox");
       if (lives_widget_get_xwindow(xeventbox)==window||lives_widget_get_xwindow(xlabelbox)==window||lives_widget_get_xwindow(xahbox)==window) {
-	track=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(xeventbox),"layer_number"));
-	mt->aud_track_selected=FALSE;
-	got_track=TRUE;
-	break;
+        track=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(xeventbox),"layer_number"));
+        mt->aud_track_selected=FALSE;
+        got_track=TRUE;
+        break;
       }
     }
   }
 
   if (mt->opts.mouse_mode==MOUSE_MODE_SELECT) {
     mouse_select_end(eventbox,event,mt);
-    lives_signal_handler_block (mt->tl_eventbox,mt->mouse_mot2);
+    lives_signal_handler_block(mt->tl_eventbox,mt->mouse_mot2);
     mt->sel_y-=y+2;
-  }
-  else {
+  } else {
     if (mt->hotspot_x!=0||mt->hotspot_y!=0) {
-      GdkScreen *screen;
+      LiVESXScreen *screen;
       int abs_x,abs_y;
 
-      int height=lives_widget_get_allocation_height(LIVES_WIDGET(g_list_nth_data(mt->video_draws,0)));
-      lives_display_get_pointer((LiVESXDevice *)mainw->mgeom[prefs->gui_monitor>0?prefs->gui_monitor-1:0].mouse_device, 
-				mt->display,&screen,&abs_x,&abs_y,NULL);
-      lives_display_warp_pointer((LiVESXDevice *)mainw->mgeom[prefs->gui_monitor>0?prefs->gui_monitor-1:0].mouse_device, 
-				 mt->display,screen,abs_x+mt->hotspot_x,abs_y+mt->hotspot_y-height/2);
+      int height=lives_widget_get_allocation_height(LIVES_WIDGET(lives_list_nth_data(mt->video_draws,0)));
+      lives_display_get_pointer((LiVESXDevice *)mainw->mgeom[prefs->gui_monitor>0?prefs->gui_monitor-1:0].mouse_device,
+                                mt->display,&screen,&abs_x,&abs_y,NULL);
+      lives_display_warp_pointer((LiVESXDevice *)mainw->mgeom[prefs->gui_monitor>0?prefs->gui_monitor-1:0].mouse_device,
+                                 mt->display,screen,abs_x+mt->hotspot_x,abs_y+mt->hotspot_y-height/2);
       mt->hotspot_x=mt->hotspot_y=0;
       // we need to call this to warp the pointer
       lives_widget_context_update();
@@ -13411,7 +13652,7 @@
     }
 
     if (got_track&&!mt->is_rendering&&mt->putative_block!=NULL&&mainw->playing_file==-1&&
-	event->button==1) {
+        event->button==1) {
       weed_timecode_t start_tc;
 
       mt_desensitise(mt);
@@ -13420,26 +13661,26 @@
 
       // timecodes per pixel
       tcpp=U_SEC*((mt->tl_max-mt->tl_min)/
-		  (double)lives_widget_get_allocation_width(LIVES_WIDGET(g_list_nth_data(mt->video_draws,0))));
+                  (double)lives_widget_get_allocation_width(LIVES_WIDGET(lives_list_nth_data(mt->video_draws,0))));
 
       // need to move at least 1.5 pixels, or to another track
       if ((track!=mt->current_track||(tc-start_tc>(tcpp*3/2))||(start_tc-tc>(tcpp*3/2)))&&
-	  ((old_track<0&&track<0)||(old_track>=0&&track>=0))) {
-	move_block(mt,mt->putative_block,timesecs,old_track,track);
-	mt->putative_block=NULL;
+          ((old_track<0&&track<0)||(old_track>=0&&track>=0))) {
+        move_block(mt,mt->putative_block,timesecs,old_track,track);
+        mt->putative_block=NULL;
 
-	lives_widget_get_pointer((LiVESXDevice *)mainw->mgeom[prefs->gui_monitor>0?prefs->gui_monitor-1:0].mouse_device, 
-				 eventbox, &x, &y);
-	timesecs=get_time_from_x(mt,x);
+        lives_widget_get_pointer((LiVESXDevice *)mainw->mgeom[prefs->gui_monitor>0?prefs->gui_monitor-1:0].mouse_device,
+                                 eventbox, &x, &y);
+        timesecs=get_time_from_x(mt,x);
 
-	mt_tl_move(mt,timesecs-lives_ruler_get_value(LIVES_RULER(mt->timeline)));
+        mt_tl_move(mt,timesecs);
       }
     }
 
   }
 
- track_rel_done:
-  
+track_rel_done:
+
   if (mainw->playing_file==-1) mt_sensitise(mt);
   mt->hotspot_x=mt->hotspot_y=0;
   mt->putative_block=NULL;
@@ -13457,45 +13698,49 @@
 
 
 
-boolean on_track_header_click (LiVESWidget *widget, LiVESXEventButton *event, gpointer user_data) {
+boolean on_track_header_click(LiVESWidget *widget, LiVESXEventButton *event, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
+  if (!mainw->interactive) return FALSE;
   if (mt->opts.mouse_mode==MOUSE_MODE_SELECT) {
     mouse_select_start(widget,event,mt);
-    lives_signal_handler_unblock (widget,mt->mouse_mot1);
+    lives_signal_handler_unblock(widget,mt->mouse_mot1);
   }
   return TRUE;
 }
 
-boolean on_track_header_release (LiVESWidget *widget, LiVESXEventButton *event, gpointer user_data) {
+boolean on_track_header_release(LiVESWidget *widget, LiVESXEventButton *event, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
+  if (!mainw->interactive) return FALSE;
   if (mt->opts.mouse_mode==MOUSE_MODE_SELECT) {
     mouse_select_end(widget,event,mt);
-    lives_signal_handler_block (widget,mt->mouse_mot1);
+    lives_signal_handler_block(widget,mt->mouse_mot1);
   }
   return TRUE;
 }
 
-boolean on_track_between_click (LiVESWidget *widget, LiVESXEventButton *event, gpointer user_data) {
+boolean on_track_between_click(LiVESWidget *widget, LiVESXEventButton *event, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
+  if (!mainw->interactive) return FALSE;
   if (mt->opts.mouse_mode==MOUSE_MODE_SELECT) {
     mouse_select_start(widget,event,mt);
-    lives_signal_handler_unblock (mt->tl_eventbox,mt->mouse_mot2);
+    lives_signal_handler_unblock(mt->tl_eventbox,mt->mouse_mot2);
   }
   return TRUE;
 }
 
-boolean on_track_between_release (LiVESWidget *widget, LiVESXEventButton *event, gpointer user_data) {
+boolean on_track_between_release(LiVESWidget *widget, LiVESXEventButton *event, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
+  if (!mainw->interactive) return FALSE;
   if (mt->opts.mouse_mode==MOUSE_MODE_SELECT) {
     mouse_select_end(widget,event,mt);
-    lives_signal_handler_block (mt->tl_eventbox,mt->mouse_mot2);
+    lives_signal_handler_block(mt->tl_eventbox,mt->mouse_mot2);
   }
   return TRUE;
 }
 
 
 
-boolean on_track_click (LiVESWidget *eventbox, LiVESXEventButton *event, gpointer user_data) {
+boolean on_track_click(LiVESWidget *eventbox, LiVESXEventButton *event, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   track_rect *block;
 
@@ -13507,116 +13752,112 @@
 
   //doubleclick=FALSE;
 
-  mt->aud_track_selected=is_audio_eventbox(mt,eventbox);
+  if (!mainw->interactive) return FALSE;
+
+  mt->aud_track_selected=is_audio_eventbox(eventbox);
 
   lives_widget_set_sensitive(mt->mm_menuitem,FALSE);
 
-  lives_widget_get_pointer((LiVESXDevice *)mainw->mgeom[prefs->gui_monitor>0?prefs->gui_monitor-1:0].mouse_device, 
-			   eventbox, &x, &y);
+  lives_widget_get_pointer((LiVESXDevice *)mainw->mgeom[prefs->gui_monitor>0?prefs->gui_monitor-1:0].mouse_device,
+                           eventbox, &x, &y);
 
   timesecs=get_time_from_x(mt,x+mt->hotspot_x);
 
-  if (cfile->achans==0||mt->audio_draws==NULL||(mt->opts.back_audio_tracks==0||eventbox!=mt->audio_draws->data)) 
-    track=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(eventbox),"layer_number"));
+  if (cfile->achans==0||mt->audio_draws==NULL||(mt->opts.back_audio_tracks==0||eventbox!=mt->audio_draws->data))
+    track=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"layer_number"));
   else track=-1;
   block=mt->putative_block=get_block_from_time(eventbox,timesecs,mt);
 
   unselect_all(mt); // set all blocks unselected
 
-  if (mt->opts.mouse_mode==MOUSE_MODE_SELECT&&event->type==GDK_BUTTON_PRESS) {
+  if (mt->opts.mouse_mode==MOUSE_MODE_SELECT&&event->type==LIVES_BUTTON_PRESS) {
     mouse_select_start(eventbox,event,mt);
-    lives_signal_handler_unblock (mt->tl_eventbox,mt->mouse_mot2);
-  }
-  else {
-    if (gdk_event_get_time((GdkEvent *)event)-last_press_time<LIVES_DCLICK_TIME) {
+    lives_signal_handler_unblock(mt->tl_eventbox,mt->mouse_mot2);
+  } else {
+    if (lives_event_get_time((LiVESXEvent *)event)-last_press_time<LIVES_DCLICK_TIME) {
       doubleclick=TRUE;
       return TRUE;
-    }
-    else {
+    } else {
       // single click, TODO - locate the frame for the track in event_list
 
       if (mainw->playing_file==-1) {
-	mt->fm_edit_event=NULL;
-	mt_tl_move(mt,timesecs-lives_ruler_get_value(LIVES_RULER(mt->timeline)));
+        mt->fm_edit_event=NULL;
+        mt_tl_move(mt,timesecs);
       }
 
-      // for a double click, gdk normally sends 2 single click events, 
+      // for a double click, gdk normally sends 2 single click events,
       // followed by a double click
 
-      // calling mt_tl_move causes any double click to be triggered during
-      // the second single click and then we return here 
+      // calling mt_tl_move() causes any double click to be triggered during
+      // the second single click and then we return here
       // however, this is quite useful as we can skip the next bit
 
       if (event->time!=dclick_time) {
-	show_track_info(mt,eventbox,track,timesecs);
-	if (block!=NULL) {
-	  if (!is_audio_eventbox(mt,eventbox)) 
-	    filenum=get_frame_event_clip(block->start_event,track);
-	  else filenum=get_audio_frame_clip(block->start_event,-1);
-	  if (filenum!=mainw->scrap_file&&filenum!=mainw->ascrap_file) {
-	    mt->clip_selected=mt_clip_from_file(mt,filenum);
-	    mt_clip_select(mt,TRUE);
-	  }
-
-	  if (event->button!=3&&!mt->is_rendering) {
-	    double start_secs,end_secs;
-	    
-	    GdkScreen *screen;
-	    int abs_x,abs_y;
-	    
-	    int ebwidth=lives_widget_get_allocation_width(mt->timeline);
-	    
-	    double width=((end_secs=(get_event_timecode(block->end_event)/U_SEC))-
-			   (start_secs=(get_event_timecode(block->start_event)/U_SEC))+1./mt->fps);
-	    int height;
-	    
-	    // start point must be on timeline to move a block
-	    if (block!=NULL&&(mt->tl_min*U_SEC>get_event_timecode(block->start_event))) {
-	      mt->putative_block=NULL;
-	      return TRUE;
-	    }
-
-	    if (!is_audio_eventbox(mt,eventbox)) 
-	      height=lives_widget_get_allocation_height(LIVES_WIDGET(g_list_nth_data(mt->video_draws,0)));
-	    else height=lives_widget_get_allocation_height(LIVES_WIDGET(mt->audio_draws->data));
-	    
-	    width=(width/(mt->tl_max-mt->tl_min)*(double)ebwidth);
-	    if (width>ebwidth) width=ebwidth;
-	    if (width<2) width=2;
-
-	    mt->hotspot_x=x-(int)((ebwidth*((double)start_secs-mt->tl_min)/(mt->tl_max-mt->tl_min))+.5);
-	    mt->hotspot_y=y;
-	    lives_display_get_pointer((LiVESXDevice *)mainw->mgeom[prefs->gui_monitor>0?prefs->gui_monitor-1:0].mouse_device, 
-				      mt->display,&screen,&abs_x,&abs_y,NULL);
-	    lives_display_warp_pointer((LiVESXDevice *)mainw->mgeom[prefs->gui_monitor>0?prefs->gui_monitor-1:0].mouse_device, 
-	      mt->display,screen,abs_x-mt->hotspot_x,abs_y-y+height/2);
-	    if (track>=0&&!mt->aud_track_selected) {
-	      if (mainw->files[filenum]->clip_type==CLIP_TYPE_FILE) {
-		lives_clip_data_t *cdata=((lives_decoder_t *)mainw->files[filenum]->ext_src)->cdata;
-		if (cdata!=NULL&&!(cdata->seek_flag&LIVES_SEEK_FAST)) {
-		  mt_set_cursor_style(mt,LIVES_CURSOR_VIDEO_BLOCK,width,height,filenum,0,height/2);
-		}
-		else {
-		  mt_set_cursor_style(mt,LIVES_CURSOR_BLOCK,width,height,filenum,0,height/2);
-		}
-	      }
-	      else {
-		mt_set_cursor_style(mt,LIVES_CURSOR_BLOCK,width,height,filenum,0,height/2);
-	      }
-	    }
-  	    else mt_set_cursor_style(mt,LIVES_CURSOR_AUDIO_BLOCK,width,height,filenum,0,height/2);
-	  }
-	}
-      }
-      else {
-	mt->putative_block=NULL; // please don't move the block
+        show_track_info(mt,eventbox,track,timesecs);
+        if (block!=NULL) {
+          if (!is_audio_eventbox(eventbox))
+            filenum=get_frame_event_clip(block->start_event,track);
+          else filenum=get_audio_frame_clip(block->start_event,-1);
+          if (filenum!=mainw->scrap_file&&filenum!=mainw->ascrap_file) {
+            mt->clip_selected=mt_clip_from_file(mt,filenum);
+            mt_clip_select(mt,TRUE);
+          }
+
+          if (event->button!=3&&!mt->is_rendering) {
+            double start_secs,end_secs;
+
+            LiVESXScreen *screen;
+            int abs_x,abs_y;
+
+            int ebwidth=lives_widget_get_allocation_width(mt->timeline);
+
+            double width=((end_secs=(get_event_timecode(block->end_event)/U_SEC))-
+                          (start_secs=(get_event_timecode(block->start_event)/U_SEC))+1./mt->fps);
+            int height;
+
+            // start point must be on timeline to move a block
+            if (block!=NULL&&(mt->tl_min*U_SEC>get_event_timecode(block->start_event))) {
+              mt->putative_block=NULL;
+              return TRUE;
+            }
+
+            if (!is_audio_eventbox(eventbox))
+              height=lives_widget_get_allocation_height(LIVES_WIDGET(lives_list_nth_data(mt->video_draws,0)));
+            else height=lives_widget_get_allocation_height(LIVES_WIDGET(mt->audio_draws->data));
+
+            width=(width/(mt->tl_max-mt->tl_min)*(double)ebwidth);
+            if (width>ebwidth) width=ebwidth;
+            if (width<2) width=2;
+
+            mt->hotspot_x=x-(int)((ebwidth*((double)start_secs-mt->tl_min)/(mt->tl_max-mt->tl_min))+.5);
+            mt->hotspot_y=y;
+            lives_display_get_pointer((LiVESXDevice *)mainw->mgeom[prefs->gui_monitor>0?prefs->gui_monitor-1:0].mouse_device,
+                                      mt->display,&screen,&abs_x,&abs_y,NULL);
+            lives_display_warp_pointer((LiVESXDevice *)mainw->mgeom[prefs->gui_monitor>0?prefs->gui_monitor-1:0].mouse_device,
+                                       mt->display,screen,abs_x-mt->hotspot_x,abs_y-y+height/2);
+            if (track>=0&&!mt->aud_track_selected) {
+              if (mainw->files[filenum]->clip_type==CLIP_TYPE_FILE) {
+                lives_clip_data_t *cdata=((lives_decoder_t *)mainw->files[filenum]->ext_src)->cdata;
+                if (cdata!=NULL&&!(cdata->seek_flag&LIVES_SEEK_FAST)) {
+                  mt_set_cursor_style(mt,LIVES_CURSOR_VIDEO_BLOCK,width,height,filenum,0,height/2);
+                } else {
+                  mt_set_cursor_style(mt,LIVES_CURSOR_BLOCK,width,height,filenum,0,height/2);
+                }
+              } else {
+                mt_set_cursor_style(mt,LIVES_CURSOR_BLOCK,width,height,filenum,0,height/2);
+              }
+            } else mt_set_cursor_style(mt,LIVES_CURSOR_AUDIO_BLOCK,width,height,filenum,0,height/2);
+          }
+        }
+      } else {
+        mt->putative_block=NULL; // please don't move the block
       }
     }
   }
 
   mt->current_track=track;
   track_select(mt);
-  
+
   if (event->button==3&&mainw->playing_file==-1) {
     lives_widget_set_sensitive(mt->mm_menuitem,TRUE);
     mt->context_time=timesecs;
@@ -13625,28 +13866,29 @@
       mt->putative_block=block;
       do_block_context(mt,event,block);
       return TRUE;
-    }
-    else {
+    } else {
       do_track_context(mt,event,timesecs,track);
       return TRUE;
     }
   }
 
-  last_press_time=gdk_event_get_time((GdkEvent *)event);
+  last_press_time=lives_event_get_time((LiVESXEvent *)event);
 
   return TRUE;
 }
 
-boolean on_track_move (LiVESWidget *widget, LiVESXEventMotion *event, gpointer user_data) {
+boolean on_track_move(LiVESWidget *widget, LiVESXEventMotion *event, livespointer user_data) {
   // used for mouse mode SELECT
   lives_mt *mt=(lives_mt *)user_data;
+  if (!mainw->interactive) return FALSE;
   if (mt->opts.mouse_mode==MOUSE_MODE_SELECT) mouse_select_move(widget,event,mt);
   return TRUE;
 }
 
-boolean on_track_header_move (LiVESWidget *widget, LiVESXEventMotion *event, gpointer user_data) {
+boolean on_track_header_move(LiVESWidget *widget, LiVESXEventMotion *event, livespointer user_data) {
   // used for mouse mode SELECT
   lives_mt *mt=(lives_mt *)user_data;
+  if (!mainw->interactive) return FALSE;
   if (mt->opts.mouse_mode==MOUSE_MODE_SELECT) mouse_select_move(widget,event,mt);
   return TRUE;
 }
@@ -13664,48 +13906,46 @@
 
   ebwidth=lives_widget_get_allocation_width(eventbox);
 
-  bth=((uint64_t)((uint32_t)(GPOINTER_TO_INT(g_object_get_data(G_OBJECT(eventbox),"backup_timepos_h")))))<<32;
-  btl=(uint64_t)((uint32_t)(GPOINTER_TO_INT(g_object_get_data(G_OBJECT(eventbox),"backup_timepos_l"))));
+  bth=((uint64_t)((uint32_t)(LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"backup_timepos_h")))))<<32;
+  btl=(uint64_t)((uint32_t)(LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"backup_timepos_l"))));
   ocurrtime=(bth+btl)/U_SEC;
   xoffset=(ocurrtime-mt->tl_min)/(mt->tl_max-mt->tl_min)*(double)ebwidth+.5;
 
   if (xoffset>=0&&xoffset<ebwidth) {
     lives_widget_queue_draw_area(eventbox,xoffset-4,0,9,lives_widget_get_allocation_height(eventbox));
-    gdk_window_process_updates(lives_widget_get_xwindow(eventbox),TRUE);
+    lives_widget_process_updates(eventbox,TRUE);
   }
 }
 
 
 void unpaint_lines(lives_mt *mt) {
-  int len=g_list_length(mt->video_draws);
+  int len=lives_list_length(mt->video_draws);
   int i;
   LiVESWidget *eventbox,*xeventbox;
   boolean is_video=FALSE;
 
-  for (i=-1;i<len;i++) {
+  for (i=-1; i<len; i++) {
     if (i==-1) {
       if (mt->audio_draws==NULL||(eventbox=(LiVESWidget *)mt->audio_draws->data)==NULL) continue;
-    }
-    else {
-      eventbox=(LiVESWidget *)g_list_nth_data(mt->video_draws,i);
+    } else {
+      eventbox=(LiVESWidget *)lives_list_nth_data(mt->video_draws,i);
       is_video=TRUE;
     }
-    if (GPOINTER_TO_INT(g_object_get_data(G_OBJECT(eventbox),"hidden"))==0) {
+    if (LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"hidden"))==0) {
       unpaint_line(mt,eventbox);
     }
     if (is_video) {
-      if (GPOINTER_TO_INT(g_object_get_data(G_OBJECT(eventbox),"expanded"))) {
-	eventbox=LIVES_WIDGET(g_object_get_data(G_OBJECT(eventbox),"atrack"));
-	unpaint_line(mt,eventbox);
-      }
-      else continue;
+      if (LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"expanded"))) {
+        eventbox=LIVES_WIDGET(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"atrack"));
+        unpaint_line(mt,eventbox);
+      } else continue;
     }
-    if (GPOINTER_TO_INT(g_object_get_data(G_OBJECT(eventbox),"expanded"))) {
-      xeventbox=(LiVESWidget *)g_object_get_data(G_OBJECT(eventbox),"achan0");
+    if (LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"expanded"))) {
+      xeventbox=(LiVESWidget *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"achan0");
       unpaint_line(mt,xeventbox);
       if (cfile->achans>1) {
-	xeventbox=(LiVESWidget *)g_object_get_data(G_OBJECT(eventbox),"achan1");
-	unpaint_line(mt,xeventbox);
+        xeventbox=(LiVESWidget *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"achan1");
+        unpaint_line(mt,xeventbox);
       }
     }
   }
@@ -13720,129 +13960,130 @@
   boolean expanded=FALSE;
   boolean is_video=FALSE;
 
-  int len=g_list_length (mt->video_draws);
+  int len=lives_list_length(mt->video_draws);
   int ebwidth=lives_widget_get_allocation_width(mt->timeline);
   int offset;
 
   register int i;
 
+  if (currtime<mt->tl_min||currtime>mt->tl_max) return;
+
   offset=(currtime-mt->tl_min)/(mt->tl_max-mt->tl_min)*(double)ebwidth;
 
-  for (i=-mt->opts.back_audio_tracks;i<len;i++) {
+  for (i=-mt->opts.back_audio_tracks; i<len; i++) {
     if (i==-1) {
       if (mt->audio_draws==NULL||((aeventbox=eventbox=(LiVESWidget *)mt->audio_draws->data)==NULL)) continue;
-    }
-    else {
-      eventbox=(LiVESWidget *)g_list_nth_data(mt->video_draws,i);
+    } else {
+      eventbox=(LiVESWidget *)lives_list_nth_data(mt->video_draws,i);
       is_video=TRUE;
     }
-    expanded=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(eventbox),"expanded"));
+    expanded=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"expanded"));
     if (lives_widget_is_visible(eventbox)) {
       if (unpaint) unpaint_line(mt,eventbox);
 
       if (offset>0&&offset<ebwidth) {
 
-	g_object_set_data(G_OBJECT(eventbox),"backup_timepos_h",
-			  GINT_TO_POINTER((int)(((uint64_t)(currtime*U_SEC))>>32))); // upper 4 bytes
-	g_object_set_data(G_OBJECT(eventbox),"backup_timepos_l",
-			  GINT_TO_POINTER((uint32_t)(((uint64_t)(currtime*U_SEC))&0XFFFFFFFF))); // lower 4 bytes
-
-	cr = lives_painter_create_from_widget (eventbox);
-
-
-	if (lives_painter_set_operator(cr, LIVES_PAINTER_OPERATOR_DIFFERENCE)) 
-	  lives_painter_set_source_rgb(cr,1.,1.,1.);
-	else 
-	  lives_painter_set_source_rgb(cr,0.,0.,0.);
-
-	lives_painter_set_line_width(cr,1.);
-
-	lives_painter_move_to(cr,offset,0.);
-	lives_painter_line_to(cr,offset,lives_widget_get_allocation_height(eventbox));
-	
-	lives_painter_stroke(cr);
-	lives_painter_destroy(cr);
+        lives_widget_object_set_data(LIVES_WIDGET_OBJECT(eventbox),"backup_timepos_h",
+                                     LIVES_INT_TO_POINTER((int)(((uint64_t)(currtime*U_SEC))>>32))); // upper 4 bytes
+        lives_widget_object_set_data(LIVES_WIDGET_OBJECT(eventbox),"backup_timepos_l",
+                                     LIVES_INT_TO_POINTER((uint32_t)(((uint64_t)(currtime*U_SEC))&0XFFFFFFFF))); // lower 4 bytes
+
+        cr = lives_painter_create_from_widget(eventbox);
+
+
+        if (lives_painter_set_operator(cr, LIVES_PAINTER_OPERATOR_DIFFERENCE))
+          lives_painter_set_source_rgb(cr,1.,1.,1.);
+        else
+          lives_painter_set_source_rgb(cr,0.,0.,0.);
+
+        lives_painter_set_line_width(cr,1.);
+
+        lives_painter_move_to(cr,offset,0.);
+        lives_painter_line_to(cr,offset,lives_widget_get_allocation_height(eventbox));
+
+        lives_painter_stroke(cr);
+        lives_painter_destroy(cr);
       }
     }
     if (expanded) {
       if (is_video) {
-	aeventbox=LIVES_WIDGET(g_object_get_data(G_OBJECT(eventbox),"atrack"));
-	expanded=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(aeventbox),"expanded"));
-	if (lives_widget_is_visible(aeventbox)) {
-	  if (unpaint) unpaint_line(mt,aeventbox);
-
-	  if (offset>0&&offset<ebwidth) {
-	    g_object_set_data(G_OBJECT(aeventbox),"backup_timepos_h",
-			      GINT_TO_POINTER((int)(((uint64_t)(currtime*U_SEC))>>32))); // upper 4 bytes
-	    g_object_set_data(G_OBJECT(aeventbox),"backup_timepos_l",
-			      GINT_TO_POINTER((uint32_t)(((uint64_t)(currtime*U_SEC))&0XFFFFFFFF))); // lower 4 bytes
-
-	    cr = lives_painter_create_from_widget (aeventbox);
-
-	    if (lives_painter_set_operator(cr, LIVES_PAINTER_OPERATOR_DIFFERENCE)) 
-	      lives_painter_set_source_rgb(cr,1.,1.,1.);
-	    else 
-	      lives_painter_set_source_rgb(cr,0.,0.,0.);
-	    
-	    lives_painter_move_to(cr,offset,0.);
-	    lives_painter_line_to(cr,offset,lives_widget_get_allocation_height(aeventbox));
-	    
-	    lives_painter_stroke(cr);
-	    lives_painter_destroy(cr);
-	  }
-	}
+        aeventbox=LIVES_WIDGET(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"atrack"));
+        expanded=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(aeventbox),"expanded"));
+        if (lives_widget_is_visible(aeventbox)) {
+          if (unpaint) unpaint_line(mt,aeventbox);
+
+          if (offset>0&&offset<ebwidth) {
+            lives_widget_object_set_data(LIVES_WIDGET_OBJECT(aeventbox),"backup_timepos_h",
+                                         LIVES_INT_TO_POINTER((int)(((uint64_t)(currtime*U_SEC))>>32))); // upper 4 bytes
+            lives_widget_object_set_data(LIVES_WIDGET_OBJECT(aeventbox),"backup_timepos_l",
+                                         LIVES_INT_TO_POINTER((uint32_t)(((uint64_t)(currtime*U_SEC))&0XFFFFFFFF))); // lower 4 bytes
+
+            cr = lives_painter_create_from_widget(aeventbox);
+
+            if (lives_painter_set_operator(cr, LIVES_PAINTER_OPERATOR_DIFFERENCE))
+              lives_painter_set_source_rgb(cr,1.,1.,1.);
+            else
+              lives_painter_set_source_rgb(cr,0.,0.,0.);
+
+            lives_painter_move_to(cr,offset,0.);
+            lives_painter_line_to(cr,offset,lives_widget_get_allocation_height(aeventbox));
+
+            lives_painter_stroke(cr);
+            lives_painter_destroy(cr);
+          }
+        }
       }
-      if (expanded) eventbox=(LiVESWidget *)g_object_get_data(G_OBJECT(aeventbox),"achan0");
+      if (expanded) eventbox=(LiVESWidget *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(aeventbox),"achan0");
       else continue;
       if (lives_widget_is_visible(eventbox)) {
-	if (unpaint) unpaint_line(mt,eventbox);
+        if (unpaint) unpaint_line(mt,eventbox);
+
+        if (offset>0&&offset<ebwidth) {
+          lives_widget_object_set_data(LIVES_WIDGET_OBJECT(eventbox),"backup_timepos_h",
+                                       LIVES_INT_TO_POINTER((int)(((uint64_t)(currtime*U_SEC))>>32))); // upper 4 bytes
+          lives_widget_object_set_data(LIVES_WIDGET_OBJECT(eventbox),"backup_timepos_l",
+                                       LIVES_INT_TO_POINTER((uint32_t)(((uint64_t)(currtime*U_SEC))&0XFFFFFFFF))); // lower 4 bytes
+
+          cr = lives_painter_create_from_widget(eventbox);
 
-	if (offset>0&&offset<ebwidth) {
-	  g_object_set_data(G_OBJECT(eventbox),"backup_timepos_h",
-			    GINT_TO_POINTER((int)(((uint64_t)(currtime*U_SEC))>>32))); // upper 4 bytes
-	  g_object_set_data(G_OBJECT(eventbox),"backup_timepos_l",
-			    GINT_TO_POINTER((uint32_t)(((uint64_t)(currtime*U_SEC))&0XFFFFFFFF))); // lower 4 bytes
-
-	  cr = lives_painter_create_from_widget (eventbox);
-
-	  if (lives_painter_set_operator(cr, LIVES_PAINTER_OPERATOR_DIFFERENCE)) 
-	    lives_painter_set_source_rgb(cr,1.,1.,1.);
-	  else 
-	    lives_painter_set_source_rgb(cr,0.,0.,0.);
-	    
-	  lives_painter_move_to(cr,offset,0.);
-	  lives_painter_line_to(cr,offset,lives_widget_get_allocation_height(eventbox));
-	
-	  lives_painter_stroke(cr);
-	  lives_painter_destroy(cr);
+          if (lives_painter_set_operator(cr, LIVES_PAINTER_OPERATOR_DIFFERENCE))
+            lives_painter_set_source_rgb(cr,1.,1.,1.);
+          else
+            lives_painter_set_source_rgb(cr,0.,0.,0.);
 
-	}
+          lives_painter_move_to(cr,offset,0.);
+          lives_painter_line_to(cr,offset,lives_widget_get_allocation_height(eventbox));
+
+          lives_painter_stroke(cr);
+          lives_painter_destroy(cr);
+
+        }
       }
       // expanded right audio
-      if (cfile->achans>1) eventbox=(LiVESWidget *)g_object_get_data(G_OBJECT(aeventbox),"achan1");
+      if (cfile->achans>1) eventbox=(LiVESWidget *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(aeventbox),"achan1");
       else continue;
       if (lives_widget_is_visible(eventbox)) {
-	if (unpaint) unpaint_line(mt,eventbox);
+        if (unpaint) unpaint_line(mt,eventbox);
+
+        if (offset>0&&offset<ebwidth) {
+          lives_widget_object_set_data(LIVES_WIDGET_OBJECT(eventbox),"backup_timepos_h",
+                                       LIVES_INT_TO_POINTER((int)(((uint64_t)(currtime*U_SEC))>>32))); // upper 4 bytes
+          lives_widget_object_set_data(LIVES_WIDGET_OBJECT(eventbox),"backup_timepos_l",
+                                       LIVES_INT_TO_POINTER((uint32_t)(((uint64_t)(currtime*U_SEC))&0XFFFFFFFF))); // lower 4 bytes
 
-	if (offset>0&&offset<ebwidth) {
-	  g_object_set_data(G_OBJECT(eventbox),"backup_timepos_h",
-			    GINT_TO_POINTER((int)(((uint64_t)(currtime*U_SEC))>>32))); // upper 4 bytes
-	  g_object_set_data(G_OBJECT(eventbox),"backup_timepos_l",
-			    GINT_TO_POINTER((uint32_t)(((uint64_t)(currtime*U_SEC))&0XFFFFFFFF))); // lower 4 bytes
+          cr = lives_painter_create_from_widget(eventbox);
 
-	  cr = lives_painter_create_from_widget (eventbox);
+          if (lives_painter_set_operator(cr, LIVES_PAINTER_OPERATOR_DIFFERENCE))
+            lives_painter_set_source_rgb(cr,1.,1.,1.);
+          else
+            lives_painter_set_source_rgb(cr,0.,0.,0.);
 
-	  if (lives_painter_set_operator(cr, LIVES_PAINTER_OPERATOR_DIFFERENCE)) 
-	    lives_painter_set_source_rgb(cr,1.,1.,1.);
-	  else 
-	    lives_painter_set_source_rgb(cr,0.,0.,0.);
+          lives_painter_move_to(cr,offset,0.);
+          lives_painter_line_to(cr,offset,lives_widget_get_allocation_height(eventbox));
 
-	  lives_painter_move_to(cr,offset,0.);
-	  lives_painter_line_to(cr,offset,lives_widget_get_allocation_height(eventbox));
-	
-	  lives_painter_stroke(cr);
-	  lives_painter_destroy(cr);
-	}
+          lives_painter_stroke(cr);
+          lives_painter_destroy(cr);
+        }
       }
     }
   }
@@ -13852,7 +14093,7 @@
 
 
 
-void animate_multitrack (lives_mt *mt) {
+void animate_multitrack(lives_mt *mt) {
   // update timeline pointer(s)
   double currtime=mainw->currticks/U_SEC;
   double tl_page;
@@ -13866,6 +14107,8 @@
   offset=(currtime-mt->tl_min)/(mt->tl_max-mt->tl_min)*(double)ebwidth;
   offset_old=(lives_ruler_get_value(LIVES_RULER(mt->timeline))-mt->tl_min)/(mt->tl_max-mt->tl_min)*(double)ebwidth;
 
+  mt->ptr_time=lives_ruler_set_value(LIVES_RULER(mt->timeline),currtime);
+
   if (offset==offset_old) return;
 
   if (mt->opts.follow_playback) {
@@ -13877,13 +14120,12 @@
     }
   }
 
-  lives_ruler_set_value(LIVES_RULER (mt->timeline),currtime);
-  lives_widget_queue_draw (mt->timeline);
+  if ((offset<0.&&offset_old<0.)||(offset>(double)ebwidth&&offset_old>(double)ebwidth)) return;
 
+  lives_widget_queue_draw(mt->timeline);
   if (mt->redraw_block) return; // don't update during expose event, otherwise we might leave lines
-
   paint_lines(mt,currtime,TRUE);
-} 
+}
 
 
 
@@ -13894,46 +14136,46 @@
 // menuitem callbacks
 
 
-static boolean multitrack_end (LiVESMenuItem *menuitem, gpointer user_data) {
+static boolean multitrack_end(LiVESMenuItem *menuitem, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
-  return multitrack_delete (mt,!(prefs->warning_mask&WARN_MASK_EXIT_MT)||menuitem==NULL);
+  return multitrack_delete(mt,!(prefs->warning_mask&WARN_MASK_EXIT_MT)||menuitem==NULL);
 }
 
 
 
 // callbacks for future adding to osc.c
-void multitrack_end_cb (LiVESMenuItem *menuitem, gpointer user_data) {
+void multitrack_end_cb(LiVESMenuItem *menuitem, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   if (mt->is_rendering) return;
   multitrack_end(menuitem,user_data);
 }
 
-void insert_here_cb (LiVESMenuItem *menuitem, gpointer user_data) {
+void insert_here_cb(LiVESMenuItem *menuitem, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   if (mt->is_rendering) return;
   multitrack_insert(NULL,user_data);
 }
 
-void insert_at_ctx_cb (LiVESMenuItem *menuitem, gpointer user_data) {
+void insert_at_ctx_cb(LiVESMenuItem *menuitem, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   if (mt->is_rendering) return;
   mt->use_context=TRUE;
   multitrack_insert(NULL,user_data);
 }
 
-void edit_start_end_cb (LiVESMenuItem *menuitem, gpointer user_data) {
+void edit_start_end_cb(LiVESMenuItem *menuitem, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   if (mt->is_rendering) return;
   multitrack_adj_start_end(NULL,user_data);
 }
 
-void close_clip_cb (LiVESMenuItem *menuitem, gpointer user_data) {
+void close_clip_cb(LiVESMenuItem *menuitem, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   if (mt->is_rendering) return;
   on_close_activate(NULL,NULL);
 }
 
-void show_clipinfo_cb (LiVESMenuItem *menuitem, gpointer user_data) {
+void show_clipinfo_cb(LiVESMenuItem *menuitem, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   int current_file=mainw->current_file;
   if (mt->file_selected!=-1) {
@@ -13943,32 +14185,32 @@
   }
 }
 
-void insert_audio_here_cb (LiVESMenuItem *menuitem, gpointer user_data) {
+void insert_audio_here_cb(LiVESMenuItem *menuitem, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   if (mt->is_rendering) return;
   multitrack_audio_insert(NULL,user_data);
 }
 
-void insert_audio_at_ctx_cb (LiVESMenuItem *menuitem, gpointer user_data) {
+void insert_audio_at_ctx_cb(LiVESMenuItem *menuitem, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   if (mt->is_rendering) return;
   mt->use_context=TRUE;
   multitrack_audio_insert(NULL,user_data);
 }
 
-void delete_block_cb (LiVESMenuItem *menuitem, gpointer user_data) {
+void delete_block_cb(LiVESMenuItem *menuitem, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   if (mt->is_rendering) return;
   on_delblock_activate(NULL,user_data);
 }
 
-void selblock_cb (LiVESMenuItem *menuitem, gpointer user_data) {
+void selblock_cb(LiVESMenuItem *menuitem, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   select_block(mt);
   mt->putative_block=NULL;
 }
 
-void list_fx_here_cb (LiVESMenuItem *menuitem, gpointer user_data) {
+void list_fx_here_cb(LiVESMenuItem *menuitem, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   mt->context_time=-1.;
   on_mt_list_fx_activate(NULL,user_data);
@@ -13977,27 +14219,27 @@
 
 ///////////////////////////////////////////////////////////
 
-void tc_to_rs (LiVESMenuItem *menuitem, gpointer user_data) {
+void tc_to_rs(LiVESMenuItem *menuitem, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
-  mt->region_start=lives_ruler_get_value(LIVES_RULER(mt->timeline));
+  mt->region_start=mt->ptr_time;
   on_timeline_release(mt->timeline_reg,NULL,mt);
 }
 
-void tc_to_re (LiVESMenuItem *menuitem, gpointer user_data) {
+void tc_to_re(LiVESMenuItem *menuitem, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
-  mt->region_end=lives_ruler_get_value(LIVES_RULER(mt->timeline));
+  mt->region_end=mt->ptr_time;
   on_timeline_release(mt->timeline_reg,NULL,mt);
 }
 
 
-void rs_to_tc (LiVESMenuItem *menuitem, gpointer user_data) {
+void rs_to_tc(LiVESMenuItem *menuitem, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
-  mt_tl_move(mt,mt->region_start-lives_ruler_get_value(LIVES_RULER(mt->timeline)));
+  mt_tl_move(mt,mt->region_start);
 }
 
-void re_to_tc (LiVESMenuItem *menuitem, gpointer user_data) {
+void re_to_tc(LiVESMenuItem *menuitem, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
-  mt_tl_move(mt,mt->region_end-lives_ruler_get_value(LIVES_RULER(mt->timeline)));
+  mt_tl_move(mt,mt->region_end);
 }
 
 
@@ -14005,70 +14247,69 @@
 
 
 
-void on_move_fx_changed (LiVESMenuItem *menuitem, gpointer user_data) {
+void on_move_fx_changed(LiVESMenuItem *menuitem, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   mt->opts.move_effects=!mt->opts.move_effects;
 }
 
 
-void multitrack_clear_marks (LiVESMenuItem *menuitem, gpointer user_data) {
+void multitrack_clear_marks(LiVESMenuItem *menuitem, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
-  g_list_free(mt->tl_marks);
+  lives_list_free(mt->tl_marks);
   mt->tl_marks=NULL;
   lives_widget_set_sensitive(mt->clear_marks,FALSE);
   lives_widget_queue_draw(mt->timeline_reg);
 }
 
 
-void select_all_time (LiVESMenuItem *menuitem, gpointer user_data) {
+void select_all_time(LiVESMenuItem *menuitem, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   mt->region_start=0.;
-  mt->region_end=mt->end_secs;
+  mt->region_end=get_event_timecode(get_last_event(mt->event_list));
   on_timeline_release(mt->timeline_reg,NULL,mt);
 }
 
 
-void select_from_zero_time (LiVESMenuItem *menuitem, gpointer user_data) {
+void select_from_zero_time(LiVESMenuItem *menuitem, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
-  if (mt->region_start==0.&&mt->region_end==0.) mt->region_end=lives_ruler_get_value(LIVES_RULER(mt->timeline));
+  if (mt->region_start==0.&&mt->region_end==0.) mt->region_end=mt->ptr_time;
   mt->region_start=0.;
   on_timeline_release(mt->timeline_reg,NULL,mt);
 }
 
-void select_to_end_time (LiVESMenuItem *menuitem, gpointer user_data) {
+void select_to_end_time(LiVESMenuItem *menuitem, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
-  if (mt->region_start==0.&&mt->region_end==0.) mt->region_start=lives_ruler_get_value(LIVES_RULER(mt->timeline));
-  mt->region_end=mt->end_secs;
+  if (mt->region_start==0.&&mt->region_end==0.) mt->region_start=mt->ptr_time;
+  mt->region_end=get_event_timecode(get_last_event(mt->event_list));
   on_timeline_release(mt->timeline_reg,NULL,mt);
 }
 
 
 
-void select_all_vid (LiVESMenuItem *menuitem, gpointer user_data) {
+void select_all_vid(LiVESMenuItem *menuitem, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   LiVESWidget *eventbox,*checkbutton;
-  GList *vdr=mt->video_draws;
+  LiVESList *vdr=mt->video_draws;
 
   int current_track=mt->current_track;
   int i=0;
 
   lives_signal_handler_block(mt->select_track,mt->seltrack_func);
-  if (!lives_check_menu_item_get_active(LIVES_CHECK_MENU_ITEM(mt->select_track))) 
+  if (!lives_check_menu_item_get_active(LIVES_CHECK_MENU_ITEM(mt->select_track)))
     lives_check_menu_item_set_active(LIVES_CHECK_MENU_ITEM(mt->select_track),TRUE);
   lives_signal_handler_unblock(mt->select_track,mt->seltrack_func);
 
   while (vdr!=NULL) {
     eventbox=(LiVESWidget *)vdr->data;
-    checkbutton=(LiVESWidget *)g_object_get_data(G_OBJECT(eventbox),"checkbutton");
+    checkbutton=(LiVESWidget *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"checkbutton");
 
 #ifdef ENABLE_GIW
     if (!prefs->lamp_buttons) {
 #endif
-      if (!lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(checkbutton))) 
-	lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(checkbutton),TRUE);
+      if (!lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(checkbutton)))
+        lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(checkbutton),TRUE);
 #ifdef ENABLE_GIW
-    }
-    else {
+    } else {
       if (!giw_led_get_mode(GIW_LED(checkbutton))) giw_led_set_mode(GIW_LED(checkbutton),TRUE);
     }
 #endif
@@ -14081,32 +14322,31 @@
 
 }
 
-void select_no_vid (LiVESMenuItem *menuitem, gpointer user_data) {
+void select_no_vid(LiVESMenuItem *menuitem, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   LiVESWidget *eventbox,*checkbutton;
-  GList *vdr=mt->video_draws;
+  LiVESList *vdr=mt->video_draws;
 
   int current_track=mt->current_track;
   int i=0;
 
   lives_signal_handler_block(mt->select_track,mt->seltrack_func);
-  if (lives_check_menu_item_get_active(LIVES_CHECK_MENU_ITEM(mt->select_track))) 
+  if (lives_check_menu_item_get_active(LIVES_CHECK_MENU_ITEM(mt->select_track)))
     lives_check_menu_item_set_active(LIVES_CHECK_MENU_ITEM(mt->select_track),FALSE);
   lives_signal_handler_unblock(mt->select_track,mt->seltrack_func);
 
   while (vdr!=NULL) {
     eventbox=(LiVESWidget *)vdr->data;
-    checkbutton=(LiVESWidget *)g_object_get_data(G_OBJECT(eventbox),"checkbutton");
+    checkbutton=(LiVESWidget *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"checkbutton");
 
 
 #ifdef ENABLE_GIW
     if (!prefs->lamp_buttons) {
 #endif
-      if (lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(checkbutton))) 
-	lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(checkbutton),FALSE);
+      if (lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(checkbutton)))
+        lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(checkbutton),FALSE);
 #ifdef ENABLE_GIW
-    }
-    else {
+    } else {
       if (giw_led_get_mode(GIW_LED(checkbutton))) giw_led_set_mode(GIW_LED(checkbutton),FALSE);
     }
 #endif
@@ -14120,64 +14360,48 @@
 }
 
 
-void
-mt_fplay_toggled                (LiVESMenuItem     *menuitem,
-				 gpointer         user_data)
-{
+void mt_fplay_toggled(LiVESMenuItem *menuitem, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   mt->opts.follow_playback=!mt->opts.follow_playback;
   lives_widget_set_sensitive(mt->follow_play,mt->opts.follow_playback);
 }
 
-void
-mt_render_vid_toggled                (LiVESMenuItem     *menuitem,
-				      gpointer         user_data)
-{
+void mt_render_vid_toggled(LiVESMenuItem *menuitem, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
-  mt->render_vidp=!mt->render_vidp;
-  lives_widget_set_sensitive(mt->render_aud,mt->render_vidp);
+  mt->opts.render_vidp=!mt->opts.render_vidp;
+  lives_widget_set_sensitive(mt->render_aud,mt->opts.render_vidp);
 }
 
 
-void
-mt_render_aud_toggled                (LiVESMenuItem     *menuitem,
-				      gpointer         user_data)
-{
-  lives_mt *mt=(lives_mt *)user_data;
-  mt->render_audp=!mt->render_audp;
-  lives_widget_set_sensitive(mt->render_vid,mt->render_audp);
-  lives_widget_set_sensitive(mt->normalise_aud,mt->render_audp);
+void mt_render_aud_toggled(LiVESMenuItem *menuitem, livespointer user_data) {
+  lives_mt *mt=(lives_mt *)user_data;
+  mt->opts.render_audp=!mt->opts.render_audp;
+  lives_widget_set_sensitive(mt->render_vid,mt->opts.render_audp);
+  lives_widget_set_sensitive(mt->normalise_aud,mt->opts.render_audp);
 }
 
 
-void
-mt_norm_aud_toggled                (LiVESMenuItem     *menuitem,
-				    gpointer         user_data)
-{
+void mt_norm_aud_toggled(LiVESMenuItem *menuitem, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
-  mt->normalise_audp=!mt->normalise_audp;
+  mt->opts.normalise_audp=!mt->opts.normalise_audp;
 }
 
 
 
-void
-mt_view_audio_toggled                (LiVESMenuItem     *menuitem,
-				      gpointer         user_data)
-{
+void mt_view_audio_toggled(LiVESMenuItem *menuitem, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   mt->opts.show_audio=lives_check_menu_item_get_active(LIVES_CHECK_MENU_ITEM(menuitem));
 
-  if (!mt->opts.show_audio) g_object_set_data(G_OBJECT(mt->audio_draws->data),"hidden",
-					      GINT_TO_POINTER(TRACK_I_HIDDEN_USER));
-  else g_object_set_data(G_OBJECT(mt->audio_draws->data),"hidden",GINT_TO_POINTER(0));
+  if (!mt->opts.show_audio) lives_widget_object_set_data(LIVES_WIDGET_OBJECT(mt->audio_draws->data),"hidden",
+        LIVES_INT_TO_POINTER(TRACK_I_HIDDEN_USER));
+  else lives_widget_object_set_data(LIVES_WIDGET_OBJECT(mt->audio_draws->data),"hidden",LIVES_INT_TO_POINTER(0));
 
   scroll_tracks(mt,mt->top_track,FALSE);
   track_select(mt);
 }
 
-void
-mt_view_ctx_toggled                (LiVESMenuItem     *menuitem,
-				    gpointer         user_data) {
+
+void mt_view_ctx_toggled(LiVESMenuItem *menuitem, livespointer user_data) {
   // toggle between compact view and expanded view
 
   lives_mt *mt=(lives_mt *)user_data;
@@ -14189,20 +14413,19 @@
   set_mt_play_sizes(mt,cfile->hsize,cfile->vsize);
   mt_show_current_frame(mt, FALSE);
 
-  lives_widget_set_size_request (mt->fd_frame, mt->play_window_width, mt->play_window_height+2*widget_opts.border_width);
-  lives_widget_set_size_request (mt->play_box, mt->play_window_width, mt->play_window_height);
-  lives_widget_set_size_request (mt->hbox, -1, mt->play_window_height+2*widget_opts.border_width);
+  lives_widget_set_size_request(mt->fd_frame, mt->play_window_width, mt->play_window_height+2*widget_opts.border_width);
+  lives_widget_set_size_request(mt->play_box, mt->play_window_width, mt->play_window_height);
+  lives_widget_set_size_request(mt->hbox, -1, mt->play_window_height+2*widget_opts.border_width);
 
   if (mt->opts.show_ctx) {
     // set text to expanded
-    lives_label_set_text(LIVES_LABEL(mt->eview_label),_ ("Expanded View (d)"));
+    lives_label_set_text(LIVES_LABEL(mt->eview_label),_("Expanded View (d)"));
 
     lives_widget_show(mainw->scrolledwindow);
     lives_widget_show(mt->sep_image);
     lives_widget_show(mt->context_frame);
-  }
-  else {
-    lives_label_set_text(LIVES_LABEL(mt->eview_label),_ ("Compact View (d)"));
+  } else {
+    lives_label_set_text(LIVES_LABEL(mt->eview_label),_("Compact View (d)"));
 
     lives_widget_hide(mainw->scrolledwindow);
     lives_widget_hide(mt->sep_image);
@@ -14211,7 +14434,7 @@
 
   // disable auto-backup while we redraw the screen
   if (mt->idlefunc>0) {
-    g_source_remove(mt->idlefunc);
+    lives_source_remove(mt->idlefunc);
     mt->idlefunc=0;
     needs_idlefunc=TRUE;
   }
@@ -14219,8 +14442,7 @@
     polymorph(mt,POLY_NONE);
     if (poly_state==POLY_IN_OUT) lives_widget_context_update();
     polymorph(mt,poly_state);
-  }
-  else polymorph(mt,POLY_PARAMS);
+  } else polymorph(mt,POLY_PARAMS);
 
   if (poly_state!=POLY_IN_OUT) lives_widget_context_update();
 
@@ -14230,41 +14452,42 @@
   }
 
   if (prefs->open_maximised) {
-    lives_window_maximize (LIVES_WINDOW(mt->window));
+    lives_window_maximize(LIVES_WINDOW(mt->window));
     lives_widget_queue_resize(mt->window);
   }
 
   mt->play_window_width=lives_widget_get_allocation_width(mt->play_box);
   mt->play_window_height=lives_widget_get_allocation_height(mt->play_box);
+
+  mt_show_current_frame(mt,FALSE);
 }
 
 
 
 void
-mt_ign_ins_sel_toggled                (LiVESMenuItem     *menuitem,
-				       gpointer         user_data)
-{
+mt_ign_ins_sel_toggled(LiVESMenuItem     *menuitem,
+                       livespointer         user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   mt->opts.ign_ins_sel=lives_check_menu_item_get_active(LIVES_CHECK_MENU_ITEM(menuitem));
 }
 
 
 
-static void remove_gaps_inner (LiVESMenuItem *menuitem, gpointer user_data, boolean only_first) {
+static void remove_gaps_inner(LiVESMenuItem *menuitem, livespointer user_data, boolean only_first) {
   lives_mt *mt=(lives_mt *)user_data;
-  GList *vsel=mt->selected_tracks;
+  LiVESList *vsel=mt->selected_tracks;
   track_rect *block=NULL;
   int track;
   LiVESWidget *eventbox;
   weed_timecode_t tc,new_tc,tc_last,new_tc_last,tc_first,block_tc;
   int filenum;
   boolean did_backup=mt->did_backup;
-  GList *track_sel;
+  LiVESList *track_sel;
   boolean audio_done=FALSE;
   weed_timecode_t offset=0;
 
   if (!did_backup&&mt->idlefunc>0) {
-    g_source_remove(mt->idlefunc);
+    lives_source_remove(mt->idlefunc);
     mt->idlefunc=0;
   }
 
@@ -14277,10 +14500,9 @@
   while (vsel!=NULL||(mt->current_track==-1&&!audio_done)) {
     offset=0;
     if (mt->current_track>-1) {
-      track=GPOINTER_TO_INT(vsel->data);
-      eventbox=(LiVESWidget *)g_list_nth_data(mt->video_draws,track);
-    }
-    else {
+      track=LIVES_POINTER_TO_INT(vsel->data);
+      eventbox=(LiVESWidget *)lives_list_nth_data(mt->video_draws,track);
+    } else {
       track=-1;
       eventbox=(LiVESWidget *)mt->audio_draws->data;
     }
@@ -14291,16 +14513,15 @@
       // adjust the region so it begins after any first partially contained block
       block=get_block_before(eventbox,tc/U_SEC,TRUE);
       if (block!=NULL) {
-	new_tc=q_gint64(get_event_timecode(block->end_event)+(double)(track>-1)*U_SEC/mt->fps,mt->fps);
-	if (new_tc>tc) tc=new_tc;
+        new_tc=q_gint64(get_event_timecode(block->end_event)+(double)(track>-1)*U_SEC/mt->fps,mt->fps);
+        if (new_tc>tc) tc=new_tc;
       }
-    }
-    else {
+    } else {
       // adjust the region so it ends before any last partially contained block
       block=get_block_after(eventbox,tc_last/U_SEC,TRUE);
       if (block!=NULL) {
-	new_tc_last=q_gint64(get_event_timecode(block->start_event)-(double)(track>-1)*U_SEC/mt->fps,mt->fps);
-	if (new_tc_last<tc_last) tc_last=new_tc_last;
+        new_tc_last=q_gint64(get_event_timecode(block->start_event)-(double)(track>-1)*U_SEC/mt->fps,mt->fps);
+        if (new_tc_last<tc_last) tc_last=new_tc_last;
       }
     }
 
@@ -14321,35 +14542,34 @@
 
 
       while (tc<=tc_last) {
-	
-	block=get_block_after(eventbox,tc/U_SEC,FALSE);
-	if (block==NULL) break;
-	
-	new_tc=get_event_timecode(block->start_event);
-	if (new_tc>tc_last) break;
-	
-	if (tc<new_tc) {
-	  // move this block to tc
-	  if (offset>0) tc=q_gint64(new_tc-offset,mt->fps);
-	  filenum=get_frame_event_clip(block->start_event,track);
-	  mt->clip_selected=mt_clip_from_file(mt,filenum);
-	  mt_clip_select(mt,FALSE);
-	  if (!mt->did_backup) mt_backup(mt,MT_UNDO_REMOVE_GAPS,0);
-	  
-	  // save current selected_tracks, move_block may change this
-	  track_sel=mt->selected_tracks;
-	  mt->selected_tracks=NULL;
-	  block=move_block(mt,block,tc/U_SEC,track,track);
-	  if (mt->selected_tracks!=NULL) g_list_free(mt->selected_tracks);
-	  mt->selected_tracks=track_sel;
-	  if (only_first&&offset==0) offset=new_tc-tc;
-	}
-	tc=q_gint64(get_event_timecode(block->end_event)+(double)(track>-1)*U_SEC/mt->fps,mt->fps);
+
+        block=get_block_after(eventbox,tc/U_SEC,FALSE);
+        if (block==NULL) break;
+
+        new_tc=get_event_timecode(block->start_event);
+        if (new_tc>tc_last) break;
+
+        if (tc<new_tc) {
+          // move this block to tc
+          if (offset>0) tc=q_gint64(new_tc-offset,mt->fps);
+          filenum=get_frame_event_clip(block->start_event,track);
+          mt->clip_selected=mt_clip_from_file(mt,filenum);
+          mt_clip_select(mt,FALSE);
+          if (!mt->did_backup) mt_backup(mt,MT_UNDO_REMOVE_GAPS,0);
+
+          // save current selected_tracks, move_block may change this
+          track_sel=mt->selected_tracks;
+          mt->selected_tracks=NULL;
+          block=move_block(mt,block,tc/U_SEC,track,track);
+          if (mt->selected_tracks!=NULL) lives_list_free(mt->selected_tracks);
+          mt->selected_tracks=track_sel;
+          if (only_first&&offset==0) offset=new_tc-tc;
+        }
+        tc=q_gint64(get_event_timecode(block->end_event)+(double)(track>-1)*U_SEC/mt->fps,mt->fps);
       }
       if (mt->current_track>-1) vsel=vsel->next;
       else audio_done=TRUE;
-    }
-    else {
+    } else {
       // moving right
       // here we do the reverse:
       // find last block in range. move it right so it ends at tc
@@ -14360,42 +14580,42 @@
       tc=tc_last;
       while (tc>=tc_first) {
 
-	block=get_block_before(eventbox,tc/U_SEC,FALSE);
-	if (block==NULL) break;
-	
-	new_tc=get_event_timecode(block->end_event);
-	if (new_tc<tc_first) break;
-
-	// subtract the length of the block to get the start point
-	block_tc=new_tc-get_event_timecode(block->start_event)+(double)(track>-1)*U_SEC/mt->fps;
-
-	if (tc>new_tc) {
-	  // move this block to tc
-	  if (offset>0) tc=q_gint64(new_tc-block_tc+offset,mt->fps);
-	  else tc=q_gint64(tc-block_tc,mt->fps);
-	  filenum=get_frame_event_clip(block->start_event,track);
-	  mt->clip_selected=mt_clip_from_file(mt,filenum);
-	  mt_clip_select(mt,FALSE);
-	  if (!mt->did_backup) mt_backup(mt,MT_UNDO_REMOVE_GAPS,0);
-	  
-	  // save current selected_tracks, move_block may change this
-	  track_sel=mt->selected_tracks;
-	  mt->selected_tracks=NULL;
-	  block=move_block(mt,block,tc/U_SEC,track,track);
-	  if (mt->selected_tracks!=NULL) g_list_free(mt->selected_tracks);
-	  mt->selected_tracks=track_sel;
-	  if (only_first&&offset==0) offset=tc-new_tc+block_tc;
-	}
-	tc=q_gint64(get_event_timecode(block->start_event)-(double)(track>-1)*U_SEC/mt->fps,mt->fps);
+        block=get_block_before(eventbox,tc/U_SEC,FALSE);
+        if (block==NULL) break;
+
+        new_tc=get_event_timecode(block->end_event);
+        if (new_tc<tc_first) break;
+
+        // subtract the length of the block to get the start point
+        block_tc=new_tc-get_event_timecode(block->start_event)+(double)(track>-1)*U_SEC/mt->fps;
+
+        if (tc>new_tc) {
+          // move this block to tc
+          if (offset>0) tc=q_gint64(new_tc-block_tc+offset,mt->fps);
+          else tc=q_gint64(tc-block_tc,mt->fps);
+          filenum=get_frame_event_clip(block->start_event,track);
+          mt->clip_selected=mt_clip_from_file(mt,filenum);
+          mt_clip_select(mt,FALSE);
+          if (!mt->did_backup) mt_backup(mt,MT_UNDO_REMOVE_GAPS,0);
+
+          // save current selected_tracks, move_block may change this
+          track_sel=mt->selected_tracks;
+          mt->selected_tracks=NULL;
+          block=move_block(mt,block,tc/U_SEC,track,track);
+          if (mt->selected_tracks!=NULL) lives_list_free(mt->selected_tracks);
+          mt->selected_tracks=track_sel;
+          if (only_first&&offset==0) offset=tc-new_tc+block_tc;
+        }
+        tc=q_gint64(get_event_timecode(block->start_event)-(double)(track>-1)*U_SEC/mt->fps,mt->fps);
       }
       if (mt->current_track>-1) vsel=vsel->next;
       else audio_done=TRUE;
     }
   }
-  
+
   if (!did_backup) {
     if (mt->avol_fx!=-1&&(block==NULL||block->next==NULL)&&mt->audio_draws!=NULL&&
-	mt->audio_draws->data!=NULL&&get_first_event(mt->event_list)!=NULL) {
+        mt->audio_draws->data!=NULL&&get_first_event(mt->event_list)!=NULL) {
       apply_avol_filter(mt);
     }
   }
@@ -14412,14 +14632,14 @@
 }
 
 
-void remove_first_gaps (LiVESMenuItem *menuitem, gpointer user_data) {
+void remove_first_gaps(LiVESMenuItem *menuitem, livespointer user_data) {
   // remove first gaps in selected time/tracks
   // if gravity is Right then we remove last gaps instead
 
   remove_gaps_inner(menuitem,user_data,TRUE);
 }
 
-void remove_gaps (LiVESMenuItem *menuitem, gpointer user_data) {
+void remove_gaps(LiVESMenuItem *menuitem, livespointer user_data) {
   remove_gaps_inner(menuitem,user_data,FALSE);
 }
 
@@ -14448,22 +14668,21 @@
   if (!WEED_EVENT_IS_FRAME(event)) event=get_next_frame_event(event);
   eventbox=block->eventbox;
 
-  if (!is_audio_eventbox(mt,eventbox)) {
+  if (!is_audio_eventbox(eventbox)) {
     if (!no_recurse) {
       // if we have an audio block, split it too
-      LiVESWidget *aeventbox=LIVES_WIDGET(g_object_get_data(G_OBJECT(eventbox),"atrack"));
+      LiVESWidget *aeventbox=LIVES_WIDGET(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"atrack"));
       if (aeventbox!=NULL) {
-	track_rect *ablock=get_block_from_time(aeventbox,tc/U_SEC+1./mt->fps,mt);
-	if (ablock!=NULL) split_block(mt,ablock,tc+U_SEC/mt->fps,track,TRUE);
+        track_rect *ablock=get_block_from_time(aeventbox,tc/U_SEC+1./mt->fps,mt);
+        if (ablock!=NULL) split_block(mt,ablock,tc+U_SEC/mt->fps,track,TRUE);
       }
     }
     frame=get_frame_event_frame(event,track);
     clip=get_frame_event_clip(event,track);
-  }
-  else {
+  } else {
     if (!no_recurse) {
       // if we have a video block, split it too
-      LiVESWidget *oeventbox=LIVES_WIDGET(g_object_get_data(G_OBJECT(eventbox),"owner"));
+      LiVESWidget *oeventbox=LIVES_WIDGET(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"owner"));
       if (oeventbox!=NULL) split_block(mt,get_block_from_time(oeventbox,tc/U_SEC-1./mt->fps,mt),tc-U_SEC/mt->fps,track,TRUE);
     }
     clip=get_audio_frame_clip(start_event,track);
@@ -14474,10 +14693,11 @@
     insert_audio_event_at(mt->event_list,event,track,clip,new_seek,vel);
   }
 
-  if (block->ordered||(is_audio_eventbox(mt,eventbox))) offset_start=block->offset_start-get_event_timecode(start_event)+get_event_timecode(event);
+  if (block->ordered||
+      (is_audio_eventbox(eventbox))) offset_start=block->offset_start-get_event_timecode(start_event)+get_event_timecode(event);
   else offset_start=calc_time_from_frame(clip,frame)*U_SEC;
 
-  new_block=add_block_start_point (LIVES_WIDGET(eventbox),tc,clip,offset_start,event,block->ordered);
+  new_block=add_block_start_point(LIVES_WIDGET(eventbox),tc,clip,offset_start,event,block->ordered);
   new_block->end_event=old_end_event;
 
   mt->no_expose=FALSE;
@@ -14489,9 +14709,9 @@
 
 
 
-static void insgap_inner (lives_mt *mt, int tnum, boolean is_sel, int passnm) {
+static void insgap_inner(lives_mt *mt, int tnum, boolean is_sel, int passnm) {
   // insert a gap in track tnum
-  
+
   // we will process in 2 passes
 
   // pass 1
@@ -14519,7 +14739,7 @@
   weed_timecode_t start_tc,new_init_tc,init_tc;
   int nintracks,*in_tracks;
   weed_plant_t *init_event;
-  GList *slist;
+  LiVESList *slist;
   boolean found;
   int notmatched;
 
@@ -14528,7 +14748,7 @@
   switch (passnm) {
   case 1:
     // frames and blocks
-    if (tnum>=0) eventbox=(LiVESWidget *)g_list_nth_data(mt->video_draws,tnum);
+    if (tnum>=0) eventbox=(LiVESWidget *)lives_list_nth_data(mt->video_draws,tnum);
     else eventbox=(LiVESWidget *)mt->audio_draws->data;
     tc=q_dbl(mt->region_start,mt->fps);
     sblock=get_block_from_time(eventbox,mt->region_start,mt);
@@ -14536,153 +14756,150 @@
     if (sblock!=NULL) {
       split_block(mt,sblock,tc,tnum,FALSE);
       sblock=sblock->next;
-    }
-    else {
+    } else {
       sblock=get_block_after(eventbox,mt->region_start,FALSE);
     }
 
     if (sblock==NULL) return;
 
     block=sblock;
-    while (block->next!=NULL) block=block->next; 
+    while (block->next!=NULL) block=block->next;
     event=block->end_event;
 
     if (tnum>=0&&mt->opts.pertrack_audio) {
-      LiVESWidget *aeventbox=LIVES_WIDGET(g_object_get_data(G_OBJECT(eventbox),"atrack"));
+      LiVESWidget *aeventbox=LIVES_WIDGET(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"atrack"));
       if (aeventbox!=NULL) {
-	ablock=get_block_after(aeventbox,mt->region_start,FALSE);
-	if (ablock!=NULL) {
-	  while (ablock->next!=NULL) ablock=ablock->next; 
-	  event=ablock->end_event;
-	}
+        ablock=get_block_after(aeventbox,mt->region_start,FALSE);
+        if (ablock!=NULL) {
+          while (ablock->next!=NULL) ablock=ablock->next;
+          event=ablock->end_event;
+        }
       }
     }
 
     while (event!=NULL) {
       if (WEED_EVENT_IS_FRAME(event)) {
-	tc=get_event_timecode(event);
-	new_tc=q_gint64(tc+(mt->region_end-mt->region_start)*U_SEC,mt->fps);
-	new_event=event;
-
-	if (tnum>=0&&tc<=get_event_timecode(block->end_event)) {
-	  frame=get_frame_event_frame(event,tnum);
-	  clip=get_frame_event_clip(event,tnum);
-	    
-	  if ((new_event=get_frame_event_at(mt->event_list,new_tc,event,TRUE))==NULL) {
-	    last_frame_event=get_last_frame_event(mt->event_list);
-	    mt->event_list=add_blank_frames_up_to(mt->event_list,last_frame_event,new_tc,mt->fps);
-	    new_event=get_last_frame_event(mt->event_list);
-	  }
-	  
-	  remove_frame_from_event(mt->event_list,event,tnum);
-
-	  xnumclips=numclips=weed_leaf_num_elements(new_event,"clips");
-	  if (numclips<tnum+1) xnumclips=tnum+1;
-	  
-	  new_clips=(int *)g_malloc(xnumclips*sizint);
-	  new_frames=(int *)g_malloc(xnumclips*sizint);
-	  
-	  clips=weed_get_int_array(new_event,"clips",&error);
-	  frames=weed_get_int_array(new_event,"frames",&error);
-	  
-	  for (i=0;i<xnumclips;i++) {
-	    if (i==tnum) {
-	      new_clips[i]=clip;
-	      new_frames[i]=frame;
-	    }
-	    else {
-	      if (i<numclips) {
-		new_clips[i]=clips[i];
-		new_frames[i]=frames[i];
-	      }
-	      else {
-		new_clips[i]=-1;
-		new_frames[i]=0;
-	      }
-	    }
-	  }
-	  
-	  weed_set_int_array(new_event,"clips",xnumclips,new_clips);
-	  weed_set_int_array(new_event,"frames",xnumclips,new_frames);
-	  
-	  weed_free(clips);
-	  weed_free(frames);
-	  g_free(new_clips);
-	  g_free(new_frames);
-
-	}
-
-	if (weed_plant_has_leaf(event,"audio_clips")) {
-	  if ((new_event=get_frame_event_at(mt->event_list,new_tc,event,TRUE))==NULL) {
-	    last_frame_event=get_last_frame_event(mt->event_list);
-	    mt->event_list=add_blank_frames_up_to(mt->event_list,last_frame_event,q_gint64(new_tc,mt->fps),mt->fps);
-	    new_event=get_last_frame_event(mt->event_list);
-	  }
-	  
-	  naclips=weed_leaf_num_elements(event,"audio_clips");
-	  audio_clips=weed_get_int_array(event,"audio_clips",&error);
-	  audio_seeks=weed_get_double_array(event,"audio_seeks",&error);
-	  
-	  for (i=0;i<naclips;i+=2) {
-	    if (audio_clips[i]==tnum) {
-	      aclip=audio_clips[i+1];
-	      aseek=audio_seeks[i];
-	      avel=audio_seeks[i+1];
-	    }
-	  }
-	  
-	  weed_free(audio_clips);
-	  weed_free(audio_seeks);
-
-	  remove_audio_for_track(event,tnum);
-	  insert_audio_event_at(mt->event_list,new_event,tnum,aclip,aseek,avel);
-
-	  if (mt->avol_fx!=-1) {
-	    apply_avol_filter(mt);
-	  }
-
-	}
-	
-	if (new_event!=event) {
-	  
-	  if (ablock!=NULL) {
-	    if (event==ablock->end_event) ablock->end_event=new_event;
-	    else if (event==ablock->start_event) {
-	      ablock->start_event=new_event;
-	    }
-	  }
-
-	  if (event==block->end_event) block->end_event=new_event;
-	  else if (event==block->start_event) {
-	    block->start_event=new_event;
-	    if (block==sblock) {
-	      if (tnum<0||ablock!=NULL) {
-		if (ablock!=NULL) block=ablock;
-		if (block->prev!=NULL&&block->prev->end_event==event) {
-		  // audio block was split, need to add a new "audio off" event
-		  insert_audio_event_at(mt->event_list,event,tnum,aclip,0.,0.);
-		}
-		if (mt->avol_fx!=-1) {
-		  apply_avol_filter(mt);
-		}
-	      }
-	      mt_fixup_events(mt,event,new_event);
-	      redraw_eventbox(mt,eventbox);
-	      return;
-	    }
-	    block=block->prev;
-	  }
-	  if (ablock!=NULL&&ablock->start_event==new_event) {
-	    ablock=ablock->prev;
-	    if (ablock!=NULL&&event==ablock->end_event) ablock->end_event=new_event;
-	  }
-	  mt_fixup_events(mt,event,new_event);
-	}
+        tc=get_event_timecode(event);
+        new_tc=q_gint64(tc+(mt->region_end-mt->region_start)*U_SEC,mt->fps);
+        new_event=event;
+
+        if (tnum>=0&&tc<=get_event_timecode(block->end_event)) {
+          frame=get_frame_event_frame(event,tnum);
+          clip=get_frame_event_clip(event,tnum);
+
+          if ((new_event=get_frame_event_at(mt->event_list,new_tc,event,TRUE))==NULL) {
+            last_frame_event=get_last_frame_event(mt->event_list);
+            mt->event_list=add_blank_frames_up_to(mt->event_list,last_frame_event,new_tc,mt->fps);
+            new_event=get_last_frame_event(mt->event_list);
+          }
+
+          remove_frame_from_event(mt->event_list,event,tnum);
+
+          xnumclips=numclips=weed_leaf_num_elements(new_event,"clips");
+          if (numclips<tnum+1) xnumclips=tnum+1;
+
+          new_clips=(int *)lives_malloc(xnumclips*sizint);
+          new_frames=(int *)lives_malloc(xnumclips*sizint);
+
+          clips=weed_get_int_array(new_event,"clips",&error);
+          frames=weed_get_int_array(new_event,"frames",&error);
+
+          for (i=0; i<xnumclips; i++) {
+            if (i==tnum) {
+              new_clips[i]=clip;
+              new_frames[i]=frame;
+            } else {
+              if (i<numclips) {
+                new_clips[i]=clips[i];
+                new_frames[i]=frames[i];
+              } else {
+                new_clips[i]=-1;
+                new_frames[i]=0;
+              }
+            }
+          }
+
+          weed_set_int_array(new_event,"clips",xnumclips,new_clips);
+          weed_set_int_array(new_event,"frames",xnumclips,new_frames);
+
+          lives_free(clips);
+          lives_free(frames);
+          lives_free(new_clips);
+          lives_free(new_frames);
+
+        }
+
+        if (WEED_EVENT_IS_AUDIO_FRAME(event)) {
+          if ((new_event=get_frame_event_at(mt->event_list,new_tc,event,TRUE))==NULL) {
+            last_frame_event=get_last_frame_event(mt->event_list);
+            mt->event_list=add_blank_frames_up_to(mt->event_list,last_frame_event,q_gint64(new_tc,mt->fps),mt->fps);
+            new_event=get_last_frame_event(mt->event_list);
+          }
+
+          naclips=weed_leaf_num_elements(event,"audio_clips");
+          audio_clips=weed_get_int_array(event,"audio_clips",&error);
+          audio_seeks=weed_get_double_array(event,"audio_seeks",&error);
+
+          for (i=0; i<naclips; i+=2) {
+            if (audio_clips[i]==tnum) {
+              aclip=audio_clips[i+1];
+              aseek=audio_seeks[i];
+              avel=audio_seeks[i+1];
+            }
+          }
+
+          lives_free(audio_clips);
+          lives_free(audio_seeks);
+
+          remove_audio_for_track(event,tnum);
+          insert_audio_event_at(mt->event_list,new_event,tnum,aclip,aseek,avel);
+
+          if (mt->avol_fx!=-1) {
+            apply_avol_filter(mt);
+          }
+
+        }
+
+        if (new_event!=event) {
+
+          if (ablock!=NULL) {
+            if (event==ablock->end_event) ablock->end_event=new_event;
+            else if (event==ablock->start_event) {
+              ablock->start_event=new_event;
+            }
+          }
+
+          if (event==block->end_event) block->end_event=new_event;
+          else if (event==block->start_event) {
+            block->start_event=new_event;
+            if (block==sblock) {
+              if (tnum<0||ablock!=NULL) {
+                if (ablock!=NULL) block=ablock;
+                if (block->prev!=NULL&&block->prev->end_event==event) {
+                  // audio block was split, need to add a new "audio off" event
+                  insert_audio_event_at(mt->event_list,event,tnum,aclip,0.,0.);
+                }
+                if (mt->avol_fx!=-1) {
+                  apply_avol_filter(mt);
+                }
+              }
+              mt_fixup_events(mt,event,new_event);
+              redraw_eventbox(mt,eventbox);
+              return;
+            }
+            block=block->prev;
+          }
+          if (ablock!=NULL&&ablock->start_event==new_event) {
+            ablock=ablock->prev;
+            if (ablock!=NULL&&event==ablock->end_event) ablock->end_event=new_event;
+          }
+          mt_fixup_events(mt,event,new_event);
+        }
       }
       if (tnum>=0) event=get_prev_event(event);
       else {
-	if (new_event==block->end_event) event=block->start_event;
-	else event=block->end_event; // we will have moved to the previous block
+        if (new_event==block->end_event) event=block->start_event;
+        else event=block->end_event; // we will have moved to the previous block
       }
     }
 
@@ -14696,59 +14913,58 @@
 
     while (event!=NULL&&(tc=get_event_timecode(event))>=start_tc) {
       if (WEED_EVENT_IS_FILTER_DEINIT(event)) {
-	init_event=(weed_plant_t *)weed_get_voidptr_value(event,"init_event",&error);
+        init_event=(weed_plant_t *)weed_get_voidptr_value(event,"init_event",&error);
 
-	if (init_event==mt->avol_init_event) {
-	  event=get_prev_event(event);
-	  continue;
-	}
-
-	// see if all of this filter`s in_tracks were moved
-	nintracks=weed_leaf_num_elements(init_event,"in_tracks");
-	in_tracks=weed_get_int_array(init_event,"in_tracks",&error);
-
-	if (!is_sel) {
-	  if ((nintracks==1&&in_tracks[0]!=mt->current_track)||(nintracks==2&&in_tracks[0]!=mt->current_track&&in_tracks[1]!=mt->current_track)) {
-	    event=get_prev_event(event);
-	    continue;
-	  }
-	}
-	else {
-	  for (i=0;i<nintracks;i++) {
-	    slist=mt->selected_tracks;
-	    found=FALSE;
-	    notmatched=0;
-	    while (slist!=NULL&&!found) {
-	      if (GPOINTER_TO_INT(slist->data)==in_tracks[i]) found=TRUE;
-	      slist=slist->next;
-	    }
-	    if (!found) {
-	      if (nintracks!=2||notmatched>0) return;
-	      notmatched=1;
-	    }
-	  }
-	}
-
-	weed_free(in_tracks);
-
-	// move filter_deinit
-	new_tc=q_gint64(tc+(mt->region_end-mt->region_start)*U_SEC,mt->fps);
-	move_filter_deinit_event(mt->event_list,new_tc,event,mt->fps,TRUE);
-
-	init_tc=get_event_timecode(init_event);
-
-	if (init_tc>=start_tc) {
-	  // move filter init
-	  new_init_tc=q_gint64(init_tc+(mt->region_end-mt->region_start)*U_SEC,mt->fps);
-	  move_filter_init_event(mt->event_list,new_init_tc,init_event,mt->fps);
-	}
-
-	// for a transition where only one track moved, pack around the overlap
-
-	if (nintracks==2) {
-	  move_event_left(mt->event_list,event,TRUE,mt->fps);
-	  if (init_tc>=start_tc&&init_event!=mt->avol_init_event) move_event_right(mt->event_list,init_event,TRUE,mt->fps);
-	}
+        if (init_event==mt->avol_init_event) {
+          event=get_prev_event(event);
+          continue;
+        }
+
+        // see if all of this filter`s in_tracks were moved
+        nintracks=weed_leaf_num_elements(init_event,"in_tracks");
+        in_tracks=weed_get_int_array(init_event,"in_tracks",&error);
+
+        if (!is_sel) {
+          if ((nintracks==1&&in_tracks[0]!=mt->current_track)||(nintracks==2&&in_tracks[0]!=mt->current_track&&in_tracks[1]!=mt->current_track)) {
+            event=get_prev_event(event);
+            continue;
+          }
+        } else {
+          for (i=0; i<nintracks; i++) {
+            slist=mt->selected_tracks;
+            found=FALSE;
+            notmatched=0;
+            while (slist!=NULL&&!found) {
+              if (LIVES_POINTER_TO_INT(slist->data)==in_tracks[i]) found=TRUE;
+              slist=slist->next;
+            }
+            if (!found) {
+              if (nintracks!=2||notmatched>0) return;
+              notmatched=1;
+            }
+          }
+        }
+
+        lives_free(in_tracks);
+
+        // move filter_deinit
+        new_tc=q_gint64(tc+(mt->region_end-mt->region_start)*U_SEC,mt->fps);
+        move_filter_deinit_event(mt->event_list,new_tc,event,mt->fps,TRUE);
+
+        init_tc=get_event_timecode(init_event);
+
+        if (init_tc>=start_tc) {
+          // move filter init
+          new_init_tc=q_gint64(init_tc+(mt->region_end-mt->region_start)*U_SEC,mt->fps);
+          move_filter_init_event(mt->event_list,new_init_tc,init_event,mt->fps);
+        }
+
+        // for a transition where only one track moved, pack around the overlap
+
+        if (nintracks==2) {
+          move_event_left(mt->event_list,event,TRUE,mt->fps);
+          if (init_tc>=start_tc&&init_event!=mt->avol_init_event) move_event_right(mt->event_list,init_event,TRUE,mt->fps);
+        }
       }
       event=get_prev_event(event);
     }
@@ -14769,25 +14985,24 @@
 
 
 
-void on_insgap_sel_activate (LiVESMenuItem     *menuitem,
-			     gpointer         user_data) {
+void on_insgap_sel_activate(LiVESMenuItem     *menuitem,
+                            livespointer         user_data) {
 
 
   lives_mt *mt=(lives_mt *)user_data;
-  GList *slist=mt->selected_tracks;
+  LiVESList *slist=mt->selected_tracks;
   int track;
   boolean did_backup=mt->did_backup;
-  gchar *msg;
 
   if (!did_backup&&mt->idlefunc>0) {
-    g_source_remove(mt->idlefunc);
+    lives_source_remove(mt->idlefunc);
     mt->idlefunc=0;
   }
 
   if (!did_backup) mt_backup(mt,MT_UNDO_INSERT_GAP,0);
 
   while (slist!=NULL) {
-    track=GPOINTER_TO_INT(slist->data);
+    track=LIVES_POINTER_TO_INT(slist->data);
     insgap_inner(mt,track,TRUE,1);
     slist=slist->next;
   }
@@ -14798,10 +15013,8 @@
 
   mt->did_backup=did_backup;
   mt_show_current_frame(mt, FALSE);
-  msg=g_strdup_printf(_("Inserted gap in selected tracks from time %.4f to %.4f\n"),mt->region_start,mt->region_end);
 
-  d_print(msg);
-  g_free(msg);
+  d_print(_("Inserted gap in selected tracks from time %.4f to %.4f\n"),mt->region_start,mt->region_end);
 
   if (!did_backup) mt->idlefunc=mt_idle_add(mt);
 
@@ -14809,14 +15022,14 @@
 
 
 
-void on_insgap_cur_activate (LiVESMenuItem     *menuitem,
-			     gpointer         user_data) {
+void on_insgap_cur_activate(LiVESMenuItem     *menuitem,
+                            livespointer         user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   boolean did_backup=mt->did_backup;
-  gchar *msg,*tname;
+  char *tname;
 
   if (!did_backup&&mt->idlefunc>0) {
-    g_source_remove(mt->idlefunc);
+    lives_source_remove(mt->idlefunc);
     mt->idlefunc=0;
   }
 
@@ -14832,11 +15045,8 @@
   mt_show_current_frame(mt, FALSE);
 
   tname=get_track_name(mt,mt->current_track,FALSE);
-  msg=g_strdup_printf(_("Inserted gap in track %s from time %.4f to %.4f\n"),tname,mt->region_start,mt->region_end);
-  g_free(tname);
-
-  d_print(msg);
-  g_free(msg);
+  d_print(_("Inserted gap in track %s from time %.4f to %.4f\n"),tname,mt->region_start,mt->region_end);
+  lives_free(tname);
 
   if (!did_backup) mt->idlefunc=mt_idle_add(mt);
 
@@ -14844,14 +15054,11 @@
 
 
 
-void
-multitrack_undo            (LiVESMenuItem     *menuitem,
-			    gpointer         user_data) {
-
+void multitrack_undo(LiVESMenuItem *menuitem, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   size_t space_avail=(size_t)(prefs->mt_undo_buf*1024*1024)-mt->undo_buffer_used;
   size_t space_needed;
-  mt_undo *last_undo=(mt_undo *)g_list_nth_data(mt->undos,g_list_length(mt->undos)-1-mt->undo_offset);
+  mt_undo *last_undo=(mt_undo *)lives_list_nth_data(mt->undos,lives_list_length(mt->undos)-1-mt->undo_offset);
   unsigned char *memblock,*mem_end;
   mt_undo *new_redo=NULL;
   int i;
@@ -14861,52 +15068,54 @@
   int num_tracks;
   boolean block_is_selected=FALSE;
   boolean avoid_fx_list=FALSE;
-  gchar *msg,*utxt,*tmp;
-  gchar *txt;
+  char *utxt,*tmp;
+  char *txt;
 
   double end_secs;
-  GList *slist;
-  GList *label_list=NULL;
-  GList *vlist,*llist;
-  GList *seltracks=NULL;
-  GList *aparam_view_list;
+  double ptr_time;
+
+  LiVESList *slist;
+  LiVESList *label_list=NULL;
+  LiVESList *vlist,*llist;
+  LiVESList *seltracks=NULL;
+  LiVESList *aparam_view_list;
   LiVESWidget *checkbutton,*eventbox,*label;
 
   if (mt->undo_mem==NULL) return;
 
   if (mt->idlefunc>0) {
-    g_source_remove(mt->idlefunc);
+    lives_source_remove(mt->idlefunc);
     mt->idlefunc=0;
   }
 
   mt_desensitise(mt);
 
   mt->was_undo_redo=TRUE;
-  mt->ptr_time=lives_ruler_get_value(LIVES_RULER(mt->timeline));
+  ptr_time=mt->ptr_time;
 
   if (mt->block_selected!=NULL) block_is_selected=TRUE;
-  
+
   if (last_undo->action!=MT_UNDO_NONE) {
     if (mt->undo_offset==0) {
       add_markers(mt,mt->event_list);
       if ((space_needed=estimate_space(mt,last_undo->action)+sizeof(mt_undo))>space_avail) {
-	if (!make_backup_space(mt,space_needed)||mt->undos==NULL) {
-	  remove_markers(mt->event_list);
-	  mt->idlefunc=mt_idle_add(mt);
-	  do_mt_undo_buf_error();
-	  mt_sensitise(mt);
-	  return;
-	}
+        if (!make_backup_space(mt,space_needed)||mt->undos==NULL) {
+          remove_markers(mt->event_list);
+          mt->idlefunc=mt_idle_add(mt);
+          do_mt_undo_buf_error();
+          mt_sensitise(mt);
+          return;
+        }
       }
 
       new_redo=(mt_undo *)(mt->undo_mem+mt->undo_buffer_used);
       new_redo->action=last_undo->action;
-      
+
       memblock=(unsigned char *)(new_redo)+sizeof(mt_undo);
       new_redo->data_len=space_needed;
       save_event_list_inner(NULL,0,mt->event_list,&memblock);
       mt->undo_buffer_used+=space_needed;
-      mt->undos=g_list_append(mt->undos,new_redo);
+      mt->undos=lives_list_append(mt->undos,new_redo);
       mt->undo_offset++;
     }
 
@@ -14915,25 +15124,25 @@
     num_tracks=mt->num_video_tracks;
     clip_sel=mt->clip_selected;
 
-    seltracks=g_list_copy(mt->selected_tracks);
+    seltracks=lives_list_copy(mt->selected_tracks);
 
     vlist=mt->video_draws;
     while (vlist!=NULL) {
       eventbox=LIVES_WIDGET(vlist->data);
-      label=LIVES_WIDGET(g_object_get_data(G_OBJECT(eventbox),"label"));
-      txt=g_strdup(lives_label_get_text(LIVES_LABEL(label)));
-      label_list=g_list_append(label_list,txt);
+      label=LIVES_WIDGET(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"label"));
+      txt=lives_strdup(lives_label_get_text(LIVES_LABEL(label)));
+      label_list=lives_list_append(label_list,txt);
       vlist=vlist->next;
     }
 
-    aparam_view_list=g_list_copy(mt->aparam_view_list);
+    aparam_view_list=lives_list_copy(mt->aparam_view_list);
     avol_fx=mt->avol_fx;
     mt->avol_fx=-1;
 
     mt->no_expose=TRUE;
 
     event_list_free(mt->event_list);
-    last_undo=(mt_undo *)g_list_nth_data(mt->undos,g_list_length(mt->undos)-1-mt->undo_offset);
+    last_undo=(mt_undo *)lives_list_nth_data(mt->undos,lives_list_length(mt->undos)-1-mt->undo_offset);
     memblock=(unsigned char *)(last_undo)+sizeof(mt_undo);
     mem_end=memblock+last_undo->data_len-sizeof(mt_undo);
     mt->event_list=load_event_list_inner(mt,-1,FALSE,NULL,&memblock,mem_end);
@@ -14942,16 +15151,16 @@
       event_list_free(mt->event_list);
       mt->event_list=NULL;
     }
-    
+
     if (get_first_event(mt->event_list)==NULL) {
       event_list_free(mt->event_list);
       mt->event_list=NULL;
     }
-    
-    for (i=0;i<mt->num_video_tracks;i++) {
+
+    for (i=0; i<mt->num_video_tracks; i++) {
       delete_video_track(mt,i,FALSE);
     }
-    g_list_free(mt->video_draws);
+    lives_list_free(mt->video_draws);
     mt->video_draws=NULL;
     mt->num_video_tracks=0;
 
@@ -14967,14 +15176,14 @@
     mt_init_tracks(mt,FALSE);
 
     if (mt->avol_fx==-1) mt->avol_fx=avol_fx;
-    if (mt->avol_fx!=-1) mt->aparam_view_list=g_list_copy(aparam_view_list);
-    if (aparam_view_list!=NULL) g_list_free(aparam_view_list);
+    if (mt->avol_fx!=-1) mt->aparam_view_list=lives_list_copy(aparam_view_list);
+    if (aparam_view_list!=NULL) lives_list_free(aparam_view_list);
 
     add_aparam_menuitems(mt);
 
     unselect_all(mt);
-    for (i=mt->num_video_tracks;i<num_tracks;i++) {
-      add_video_track_behind (NULL,mt);
+    for (i=mt->num_video_tracks; i<num_tracks; i++) {
+      add_video_track_behind(NULL,mt);
     }
 
     mt->clip_selected=clip_sel;
@@ -14984,61 +15193,58 @@
     llist=label_list;
     while (vlist!=NULL) {
       eventbox=LIVES_WIDGET(vlist->data);
-      label=LIVES_WIDGET(g_object_get_data(G_OBJECT(eventbox),"label"));
-      lives_label_set_text(LIVES_LABEL(label),(const gchar *)llist->data);
+      label=LIVES_WIDGET(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"label"));
+      lives_label_set_text(LIVES_LABEL(label),(const char *)llist->data);
       vlist=vlist->next;
       llist=llist->next;
     }
-    g_list_free(label_list);
+    lives_list_free(label_list);
 
     if (mt->event_list!=NULL) remove_markers(mt->event_list);
 
-     mt->selected_tracks=g_list_copy(seltracks);
+    mt->selected_tracks=lives_list_copy(seltracks);
     slist=mt->selected_tracks;
     while (slist!=NULL) {
-      eventbox=(LiVESWidget *)g_list_nth_data(mt->video_draws,GPOINTER_TO_INT(slist->data));
-      checkbutton=(LiVESWidget *)g_object_get_data(G_OBJECT(eventbox),"checkbutton");
+      eventbox=(LiVESWidget *)lives_list_nth_data(mt->video_draws,LIVES_POINTER_TO_INT(slist->data));
+      checkbutton=(LiVESWidget *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"checkbutton");
 #ifdef ENABLE_GIW
       if (!prefs->lamp_buttons) {
 #endif
-	lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(checkbutton),TRUE);
+        lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(checkbutton),TRUE);
 #ifdef ENABLE_GIW
-      }
-      else {
-	giw_led_set_mode(GIW_LED(checkbutton),TRUE);
+      } else {
+        giw_led_set_mode(GIW_LED(checkbutton),TRUE);
       }
 #endif
       slist=slist->next;
     }
-    if (seltracks!=NULL) g_list_free(seltracks);
+    if (seltracks!=NULL) lives_list_free(seltracks);
 
     mt->current_track=current_track;
     track_select(mt);
-    if (mt->end_secs!=end_secs&&event_list_get_end_secs(mt->event_list)<=end_secs) set_timeline_end_secs (mt, end_secs);
+    if (mt->end_secs!=end_secs&&event_list_get_end_secs(mt->event_list)<=end_secs) set_timeline_end_secs(mt, end_secs);
   }
 
   mt->no_expose=FALSE;
 
   mt->undo_offset++;
 
-  if (mt->undo_offset==g_list_length(mt->undos)) mt_set_undoable(mt,MT_UNDO_NONE,NULL,FALSE);
+  if (mt->undo_offset==lives_list_length(mt->undos)) mt_set_undoable(mt,MT_UNDO_NONE,NULL,FALSE);
   else {
-    mt_undo *undo=(mt_undo *)(g_list_nth_data(mt->undos,g_list_length(mt->undos)-mt->undo_offset-1));
+    mt_undo *undo=(mt_undo *)(lives_list_nth_data(mt->undos,lives_list_length(mt->undos)-mt->undo_offset-1));
     mt_set_undoable(mt,undo->action,undo->extra,TRUE);
   }
   mt_set_redoable(mt,last_undo->action,last_undo->extra,TRUE);
-  lives_ruler_set_value(LIVES_RULER(mt->timeline),mt->ptr_time);
+  lives_ruler_set_value(LIVES_RULER(mt->timeline),ptr_time);
   lives_widget_queue_draw(mt->timeline);
 
-  utxt=g_utf8_strdown((tmp=get_undo_text(last_undo->action,last_undo->extra)),-1);
-  g_free(tmp);
+  utxt=lives_utf8_strdown((tmp=get_undo_text(last_undo->action,last_undo->extra)),-1);
+  lives_free(tmp);
 
-  msg=g_strdup_printf(_("Undid %s\n"),utxt);
-  d_print(msg);
-  g_free(utxt);
-  g_free(msg);
+  d_print(_("Undid %s\n"),utxt);
+  lives_free(utxt);
 
-  if (last_undo->action<=1024&&block_is_selected) mt_selblock(NULL, (gpointer)mt);
+  if (last_undo->action<=1024&&block_is_selected) mt_selblock(NULL, (livespointer)mt);
 
   // TODO - make sure this is the effect which is now deleted/added...
   if (mt->poly_state==POLY_PARAMS) {
@@ -15047,7 +15253,7 @@
     avoid_fx_list=TRUE;
   }
   if ((last_undo->action==MT_UNDO_FILTER_MAP_CHANGE||mt->poly_state==POLY_FX_STACK)&&!avoid_fx_list) {
-    if (last_undo->action==MT_UNDO_FILTER_MAP_CHANGE) mt_tl_move(mt,last_undo->tc-mt->ptr_time);
+    if (last_undo->action==MT_UNDO_FILTER_MAP_CHANGE) mt_tl_move(mt,last_undo->tc);
     polymorph(mt,POLY_FX_STACK);
   }
   if (mt->poly_state!=POLY_PARAMS) mt_show_current_frame(mt, FALSE);
@@ -15059,42 +15265,47 @@
 }
 
 
-void
-multitrack_redo            (LiVESMenuItem     *menuitem,
-			    gpointer         user_data) {
-
+void multitrack_redo(LiVESMenuItem *menuitem, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
-  mt_undo *last_redo=(mt_undo *)g_list_nth_data(mt->undos,g_list_length(mt->undos)+1-mt->undo_offset);
+
+  mt_undo *last_redo=(mt_undo *)lives_list_nth_data(mt->undos,lives_list_length(mt->undos)+1-mt->undo_offset);
+
+  LiVESWidget *checkbutton,*eventbox,*label;
+
+  LiVESList *slist;
+  LiVESList *label_list=NULL;
+  LiVESList *vlist,*llist;
+  LiVESList *seltracks=NULL;
+  LiVESList *aparam_view_list;
+
   unsigned char *memblock,*mem_end;
-  int i;
-  int current_track;
+
+  char *txt;
+  char *utxt,*tmp;
+
+  double ptr_time;
   double end_secs;
-  GList *slist;
+
+  int current_track;
   int num_tracks;
-  LiVESWidget *checkbutton,*eventbox,*label;
-  GList *label_list=NULL;
-  GList *vlist,*llist;
-  gchar *txt;
-  GList *seltracks=NULL;
   int clip_sel;
-  //boolean block_is_selected;
-  gchar *msg,*utxt,*tmp;
-  GList *aparam_view_list;
   int avol_fx;
 
+  register int i;
+
   if (mt->undo_mem==NULL) return;
 
   if (mt->idlefunc>0) {
-    g_source_remove(mt->idlefunc);
+    lives_source_remove(mt->idlefunc);
     mt->idlefunc=0;
   }
 
   mt_desensitise(mt);
 
-  //if (mt->block_selected!=NULL) block_is_selected=TRUE; // TODO *** - need to set track and time 
+  //if (mt->block_selected!=NULL) block_is_selected=TRUE; // TODO *** - need to set track and time
 
   mt->was_undo_redo=TRUE;
-  mt->ptr_time=lives_ruler_get_value(LIVES_RULER(mt->timeline));
+  ptr_time=mt->ptr_time;
 
   if (last_redo->action!=MT_UNDO_NONE) {
     current_track=mt->current_track;
@@ -15102,18 +15313,18 @@
     num_tracks=mt->num_video_tracks;
     clip_sel=mt->clip_selected;
 
-    seltracks=g_list_copy(mt->selected_tracks);
+    seltracks=lives_list_copy(mt->selected_tracks);
 
     vlist=mt->video_draws;
     while (vlist!=NULL) {
       eventbox=LIVES_WIDGET(vlist->data);
-      label=LIVES_WIDGET(g_object_get_data(G_OBJECT(eventbox),"label"));
-      txt=g_strdup(lives_label_get_text(LIVES_LABEL(label)));
-      label_list=g_list_append(label_list,txt);
+      label=LIVES_WIDGET(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"label"));
+      txt=lives_strdup(lives_label_get_text(LIVES_LABEL(label)));
+      label_list=lives_list_append(label_list,txt);
       vlist=vlist->next;
     }
 
-    aparam_view_list=g_list_copy(mt->aparam_view_list);
+    aparam_view_list=lives_list_copy(mt->aparam_view_list);
     avol_fx=mt->avol_fx;
     mt->avol_fx=-1;
 
@@ -15128,16 +15339,16 @@
       event_list_free(mt->event_list);
       mt->event_list=NULL;
     }
-    
+
     if (get_first_event(mt->event_list)==NULL) {
       event_list_free(mt->event_list);
       mt->event_list=NULL;
     }
-    
-    for (i=0;i<mt->num_video_tracks;i++) {
+
+    for (i=0; i<mt->num_video_tracks; i++) {
       delete_video_track(mt,i,FALSE);
     }
-    g_list_free(mt->video_draws);
+    lives_list_free(mt->video_draws);
     mt->video_draws=NULL;
     mt->num_video_tracks=0;
 
@@ -15153,15 +15364,15 @@
     mt_init_tracks(mt,FALSE);
 
     if (mt->avol_fx==avol_fx) {
-      mt->aparam_view_list=g_list_copy(aparam_view_list);
+      mt->aparam_view_list=lives_list_copy(aparam_view_list);
     }
-    if (aparam_view_list!=NULL) g_list_free(aparam_view_list);
+    if (aparam_view_list!=NULL) lives_list_free(aparam_view_list);
 
     add_aparam_menuitems(mt);
 
     unselect_all(mt);
-    for (i=mt->num_video_tracks;i<num_tracks;i++) {
-      add_video_track_behind (NULL,mt);
+    for (i=mt->num_video_tracks; i<num_tracks; i++) {
+      add_video_track_behind(NULL,mt);
     }
 
     mt->clip_selected=clip_sel;
@@ -15171,37 +15382,36 @@
     llist=label_list;
     while (vlist!=NULL) {
       eventbox=LIVES_WIDGET(vlist->data);
-      label=LIVES_WIDGET(g_object_get_data(G_OBJECT(eventbox),"label"));
-      lives_label_set_text(LIVES_LABEL(label),(const gchar *)llist->data);
+      label=LIVES_WIDGET(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"label"));
+      lives_label_set_text(LIVES_LABEL(label),(const char *)llist->data);
       vlist=vlist->next;
       llist=llist->next;
     }
-    g_list_free(label_list);
+    lives_list_free(label_list);
 
     if (mt->event_list!=NULL) remove_markers(mt->event_list);
 
-    mt->selected_tracks=g_list_copy(seltracks);
+    mt->selected_tracks=lives_list_copy(seltracks);
     slist=mt->selected_tracks;
     while (slist!=NULL) {
-      eventbox=(LiVESWidget *)g_list_nth_data(mt->video_draws,GPOINTER_TO_INT(slist->data));
-      checkbutton=(LiVESWidget *)g_object_get_data(G_OBJECT(eventbox),"checkbutton");
+      eventbox=(LiVESWidget *)lives_list_nth_data(mt->video_draws,LIVES_POINTER_TO_INT(slist->data));
+      checkbutton=(LiVESWidget *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"checkbutton");
 #ifdef ENABLE_GIW
       if (!prefs->lamp_buttons) {
 #endif
-	lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(checkbutton),TRUE);
+        lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(checkbutton),TRUE);
 #ifdef ENABLE_GIW
-      }
-      else {
-	giw_led_set_mode(GIW_LED(checkbutton),TRUE);
+      } else {
+        giw_led_set_mode(GIW_LED(checkbutton),TRUE);
       }
 #endif
       slist=slist->next;
     }
-    if (seltracks!=NULL) g_list_free(seltracks);
+    if (seltracks!=NULL) lives_list_free(seltracks);
 
     mt->current_track=current_track;
     track_select(mt);
-    if (mt->end_secs!=end_secs&&event_list_get_end_secs(mt->event_list)<=end_secs) set_timeline_end_secs (mt, end_secs);
+    if (mt->end_secs!=end_secs&&event_list_get_end_secs(mt->event_list)<=end_secs) set_timeline_end_secs(mt, end_secs);
   }
 
   mt->no_expose=FALSE;
@@ -15210,32 +15420,30 @@
 
   if (mt->undo_offset<=1) mt_set_redoable(mt,MT_UNDO_NONE,NULL,FALSE);
   else {
-    mt_undo *redo=(mt_undo *)(g_list_nth_data(mt->undos,g_list_length(mt->undos)-mt->undo_offset));
+    mt_undo *redo=(mt_undo *)(lives_list_nth_data(mt->undos,lives_list_length(mt->undos)-mt->undo_offset));
     mt_set_redoable(mt,redo->action,redo->extra,TRUE);
   }
-  last_redo=(mt_undo *)g_list_nth_data(mt->undos,g_list_length(mt->undos)-1-mt->undo_offset);
+  last_redo=(mt_undo *)lives_list_nth_data(mt->undos,lives_list_length(mt->undos)-1-mt->undo_offset);
   mt_set_undoable(mt,last_redo->action,last_redo->extra,TRUE);
 
-  lives_ruler_set_value(LIVES_RULER(mt->timeline),mt->ptr_time);
+  lives_ruler_set_value(LIVES_RULER(mt->timeline),ptr_time);
   lives_widget_queue_draw(mt->timeline);
 
 
   // TODO *****
-  //if (last_redo->action<1024&&block_is_selected) mt_selblock(NULL, NULL, 0, 0, (gpointer)mt);
+  //if (last_redo->action<1024&&block_is_selected) mt_selblock(NULL, NULL, 0, 0, (livespointer)mt);
 
   if (last_redo->action==MT_UNDO_FILTER_MAP_CHANGE||mt->poly_state==POLY_FX_STACK) {
-    if (last_redo->action==MT_UNDO_FILTER_MAP_CHANGE) mt_tl_move(mt,last_redo->tc-mt->ptr_time);
+    if (last_redo->action==MT_UNDO_FILTER_MAP_CHANGE) mt_tl_move(mt,last_redo->tc);
     polymorph(mt,POLY_FX_STACK);
   }
   if (mt->poly_state!=POLY_PARAMS) mt_show_current_frame(mt, FALSE);
 
-  utxt=g_utf8_strdown((tmp=get_undo_text(last_redo->action,last_redo->extra)),-1);
-  g_free(tmp);
+  utxt=lives_utf8_strdown((tmp=get_undo_text(last_redo->action,last_redo->extra)),-1);
+  lives_free(tmp);
 
-  msg=g_strdup_printf(_("Redid %s\n"),utxt);
-  d_print(msg);
-  g_free(utxt);
-  g_free(msg);
+  d_print(_("Redid %s\n"),utxt);
+  lives_free(utxt);
 
   mt_desensitise(mt);
   mt_sensitise(mt);
@@ -15245,7 +15453,7 @@
 
 
 
-void multitrack_view_details (LiVESMenuItem *menuitem, gpointer user_data) {
+void multitrack_view_details(LiVESMenuItem *menuitem, livespointer user_data) {
   char buff[512];
   lives_clipinfo_t *filew;
   lives_mt *mt=(lives_mt *)user_data;
@@ -15254,25 +15462,24 @@
   double time=0.;
   int num_events=0;
 
-  filew = create_clip_info_window (cfile->achans,TRUE);
+  filew = create_clip_info_window(cfile->achans,TRUE);
 
   // type
-  g_snprintf(buff,512,"\n  Event List");
-  lives_text_view_set_text (LIVES_TEXT_VIEW (filew->textview24),buff, -1);
+  lives_snprintf(buff,512,"\n  Event List");
+  lives_text_view_set_text(LIVES_TEXT_VIEW(filew->textview24),buff, -1);
 
   // fps
   if (mt->fps>0) {
-      g_snprintf(buff,512,"\n  %.3f%s",mt->fps,rfile->ratio_fps?"...":"");
-  }
-  else {
-    g_snprintf(buff,512,"%s",_ ("\n (variable)"));
+    lives_snprintf(buff,512,"\n  %.3f%s",mt->fps,rfile->ratio_fps?"...":"");
+  } else {
+    lives_snprintf(buff,512,"%s",_("\n (variable)"));
   }
 
-  lives_text_view_set_text (LIVES_TEXT_VIEW (filew->textview25),buff, -1);
+  lives_text_view_set_text(LIVES_TEXT_VIEW(filew->textview25),buff, -1);
 
   // image size
-  g_snprintf(buff,512,"\n  %dx%d",rfile->hsize,rfile->vsize);
-  lives_text_view_set_text (LIVES_TEXT_VIEW (filew->textview26),buff, -1);
+  lives_snprintf(buff,512,"\n  %dx%d",rfile->hsize,rfile->vsize);
+  lives_text_view_set_text(LIVES_TEXT_VIEW(filew->textview26),buff, -1);
 
   // elist time
   if (mt->event_list!=NULL) {
@@ -15281,38 +15488,38 @@
   }
 
   // events
-  g_snprintf(buff,512,"\n  %d",num_events);
-  lives_text_view_set_text (LIVES_TEXT_VIEW (filew->textview27),buff, -1);
+  lives_snprintf(buff,512,"\n  %d",num_events);
+  lives_text_view_set_text(LIVES_TEXT_VIEW(filew->textview27),buff, -1);
 
-  g_snprintf(buff,512,"\n  %.3f sec",time);
-  lives_text_view_set_text (LIVES_TEXT_VIEW (filew->textview28),buff, -1);
+  lives_snprintf(buff,512,"\n  %.3f sec",time);
+  lives_text_view_set_text(LIVES_TEXT_VIEW(filew->textview28),buff, -1);
 
   // byte size
-  g_snprintf(buff,512,"\n  %d bytes",bsize);
-  lives_text_view_set_text (LIVES_TEXT_VIEW (filew->textview29),buff, -1);
+  lives_snprintf(buff,512,"\n  %d bytes",bsize);
+  lives_text_view_set_text(LIVES_TEXT_VIEW(filew->textview29),buff, -1);
 
   if (cfile->achans>0) {
-    g_snprintf(buff,512,"\n  %d Hz %d bit",cfile->arate,cfile->asampsize);
-    lives_text_view_set_text (LIVES_TEXT_VIEW (filew->textview_lrate),buff, -1);
+    lives_snprintf(buff,512,"\n  %d Hz %d bit",cfile->arate,cfile->asampsize);
+    lives_text_view_set_text(LIVES_TEXT_VIEW(filew->textview_lrate),buff, -1);
   }
-  
+
   if (cfile->achans>1) {
-    g_snprintf(buff,512,"\n  %d Hz %d bit",cfile->arate,cfile->asampsize);
-    lives_text_view_set_text (LIVES_TEXT_VIEW (filew->textview_rrate),buff, -1);
+    lives_snprintf(buff,512,"\n  %d Hz %d bit",cfile->arate,cfile->asampsize);
+    lives_text_view_set_text(LIVES_TEXT_VIEW(filew->textview_rrate),buff, -1);
   }
 
 }
 
 
 
-static void add_effect_inner(lives_mt *mt, int num_in_tracks, int *in_tracks, int num_out_tracks, int *out_tracks, 
-			     weed_plant_t *start_event, weed_plant_t *end_event) {
+static void add_effect_inner(lives_mt *mt, int num_in_tracks, int *in_tracks, int num_out_tracks, int *out_tracks,
+                             weed_plant_t *start_event, weed_plant_t *end_event) {
   void **init_events;
 
   weed_plant_t *event,*init_event;
   weed_plant_t *filter=get_weed_filter(mt->current_fx);
 
-  double timesecs=lives_ruler_get_value(LIVES_RULER(mt->timeline));
+  double timesecs=mt->ptr_time;
 
   weed_timecode_t start_tc=get_event_timecode(start_event);
   weed_timecode_t end_tc=get_event_timecode(end_event);
@@ -15327,7 +15534,7 @@
   register int i;
 
   if (!did_backup&&mt->idlefunc>0) {
-    g_source_remove(mt->idlefunc);
+    lives_source_remove(mt->idlefunc);
     mt->idlefunc=0;
   }
 
@@ -15335,7 +15542,7 @@
 
   // set track_index (for special widgets)
   mt->track_index=-1;
-  for (i=0;i<num_in_tracks;i++) {
+  for (i=0; i<num_in_tracks; i++) {
     if (mt->current_track==in_tracks[i]) mt->track_index=i;
   }
 
@@ -15348,17 +15555,17 @@
   insert_filter_init_event_at(mt->event_list,start_event,mt->init_event);
 
   if (pchain!=NULL) {
-    g_free(pchain);
+    lives_free(pchain);
     pchain=NULL;
   }
 
-  if (num_in_params(filter,FALSE,FALSE)>0) 
+  if (num_in_params(filter,FALSE,FALSE)>0)
     pchain=filter_init_add_pchanges(mt->event_list,filter,mt->init_event,num_in_tracks,0);
 
   // add effect map event
   init_events=get_init_events_before(start_event,mt->init_event,TRUE);
   mt->event_list=append_filter_map_event(mt->event_list,start_tc,init_events);
-  g_free(init_events);
+  lives_free(init_events);
   event=get_last_event(mt->event_list);
   unlink_event(mt->event_list,event);
   insert_filter_map_event_at(mt->event_list,start_event,event,TRUE);
@@ -15377,17 +15584,17 @@
   if (event==NULL) event=get_last_event(mt->event_list);
   else event=get_prev_event(event);
 
-  // add effect map event 
+  // add effect map event
   init_events=get_init_events_before(event,mt->init_event,FALSE); // also deletes the effect
   mt->event_list=append_filter_map_event(mt->event_list,end_tc,init_events);
-  g_free(init_events);
+  lives_free(init_events);
 
   event=get_last_event(mt->event_list);
   unlink_event(mt->event_list,event);
   insert_filter_map_event_at(mt->event_list,end_event,event,FALSE);
 
   mt->did_backup=did_backup;
-  if (mt->event_list!=NULL) lives_widget_set_sensitive (mt->clear_event_list, TRUE);
+  if (mt->event_list!=NULL) lives_widget_set_sensitive(mt->clear_event_list, TRUE);
 
   if (mt->current_fx==mt->avol_fx) return;
 
@@ -15403,26 +15610,25 @@
   // here we just check if we have any params to display
   has_params=make_param_box(NULL,rfx);
   rfx_free(rfx);
-  g_free(rfx);
+  lives_free(rfx);
 
   init_event=mt->init_event;
-  mt_tl_move(mt,start_tc/U_SEC-lives_ruler_get_value(LIVES_RULER(mt->timeline)));
+  mt_tl_move(mt,start_tc/U_SEC);
   mt->init_event=init_event;
 
   if (has_params) {
     polymorph(mt,POLY_PARAMS);
     lives_widget_set_sensitive(mt->apply_fx_button,FALSE);
-  }
-  else polymorph(mt,POLY_FX_STACK);
+  } else polymorph(mt,POLY_FX_STACK);
 
   if (!did_backup) mt->idlefunc=mt_idle_add(mt);
-  
+
 }
 
 
 
 
-weed_plant_t *add_blank_frames_up_to (weed_plant_t *event_list, weed_plant_t *start_event, weed_timecode_t end_tc, double fps) {
+weed_plant_t *add_blank_frames_up_to(weed_plant_t *event_list, weed_plant_t *start_event, weed_timecode_t end_tc, double fps) {
   // add blank frames from FRAME event (or NULL) start_event up to and including (quantised) end_tc
   // returns updated event_list
   weed_timecode_t tc;
@@ -15433,18 +15639,18 @@
   if (start_event!=NULL) tc=get_event_timecode(start_event)+tl;
   else tc=0;
 
-  for (;tc<=end_tc;tc=q_gint64(tc+tl,fps)) {
-    event_list=insert_frame_event_at (event_list,tc,1,&blank_clip,&blank_frame,&shortcut);
+  for (; tc<=end_tc; tc=q_gint64(tc+tl,fps)) {
+    event_list=insert_frame_event_at(event_list,tc,1,&blank_clip,&blank_frame,&shortcut);
   }
   weed_set_double_value(event_list,"fps",fps);
   return event_list;
 }
 
 
-void mt_add_region_effect (LiVESMenuItem *menuitem, gpointer user_data) {
+void mt_add_region_effect(LiVESMenuItem *menuitem, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
 
-  GList *llist;
+  LiVESList *llist;
 
   weed_plant_t *start_event;
   weed_plant_t *end_event;
@@ -15454,21 +15660,21 @@
   weed_timecode_t end_tc=q_gint64(mt->region_end*U_SEC-U_SEC/mt->fps,mt->fps);
   weed_timecode_t last_frame_tc=0;
 
-  gchar *filter_name;
-  gchar *text,*tname,*track_desc;
-  gchar *tmp,*tmp1;
+  char *filter_name;
+  char *tname,*track_desc;
+  char *tmp,*tmp1;
 
-  int numtracks=g_list_length(mt->selected_tracks);
+  int numtracks=lives_list_length(mt->selected_tracks);
   int tcount=0,tlast=-1000000,tsmall=-1,ctrack;
 
-  int *tracks=(int *)g_malloc(numtracks*sizint);
+  int *tracks=(int *)lives_malloc(numtracks*sizint);
 
   // sort selected tracks into ascending order
   while (tcount<numtracks) {
     tsmall=-1000000;
     llist=mt->selected_tracks;
     while (llist!=NULL) {
-      ctrack=GPOINTER_TO_INT(llist->data);
+      ctrack=LIVES_POINTER_TO_INT(llist->data);
       if ((tsmall==-1000000||ctrack<tsmall)&&ctrack>tlast) tsmall=ctrack;
       llist=llist->next;
     }
@@ -15476,10 +15682,12 @@
   }
 
   // add blank frames up to region end (if necessary)
-  if (mt->event_list!=NULL&&((last_frame_event=get_last_frame_event(mt->event_list))!=NULL)) last_frame_tc=get_event_timecode(last_frame_event);
-  if (end_tc>last_frame_tc) mt->event_list=add_blank_frames_up_to(mt->event_list,last_frame_event,end_tc-(double)(tracks[0]<0)*U_SEC/mt->fps,mt->fps);
+  if (mt->event_list!=NULL&&
+      ((last_frame_event=get_last_frame_event(mt->event_list))!=NULL)) last_frame_tc=get_event_timecode(last_frame_event);
+  if (end_tc>last_frame_tc) mt->event_list=add_blank_frames_up_to(mt->event_list,last_frame_event,end_tc-(double)(tracks[0]<0)*U_SEC/mt->fps,
+        mt->fps);
 
-  if (menuitem!=NULL) mt->current_fx=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(menuitem),"idx"));
+  if (menuitem!=NULL) mt->current_fx=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(menuitem),"idx"));
 
   start_event=get_frame_event_at(mt->event_list,start_tc,NULL,TRUE);
   end_event=get_frame_event_at(mt->event_list,end_tc,start_event,TRUE);
@@ -15487,7 +15695,7 @@
   add_effect_inner(mt,numtracks,tracks,1,&tracks[0],start_event,end_event);
 
   if (menuitem==NULL&&!mt->is_atrans) {
-    g_free(tracks);
+    lives_free(tracks);
     return;
   }
 
@@ -15499,77 +15707,78 @@
   switch (numtracks) {
   case 1:
     tname=lives_fx_cat_to_text(LIVES_FX_CAT_EFFECT,FALSE); // effect
-    track_desc=g_strdup_printf(_("track %s"),(tmp=get_track_name(mt,tracks[0],FALSE)));
-    g_free(tmp);
+    track_desc=lives_strdup_printf(_("track %s"),(tmp=get_track_name(mt,tracks[0],FALSE)));
+    lives_free(tmp);
     break;
   case 2:
     tname=lives_fx_cat_to_text(LIVES_FX_CAT_TRANSITION,FALSE); // transition
-    track_desc=g_strdup_printf(_("tracks %s and %s"),(tmp1=get_track_name(mt,tracks[0],FALSE)),(tmp=get_track_name(mt,tracks[1],FALSE)));
-    g_free(tmp);
-    g_free(tmp1);
+    track_desc=lives_strdup_printf(_("tracks %s and %s"),(tmp1=get_track_name(mt,tracks[0],FALSE)),(tmp=get_track_name(mt,tracks[1],FALSE)));
+    lives_free(tmp);
+    lives_free(tmp1);
     break;
   default:
     tname=lives_fx_cat_to_text(LIVES_FX_CAT_COMPOSITOR,FALSE); // compositor
-    track_desc=g_strdup(_("selected tracks"));
+    track_desc=lives_strdup(_("selected tracks"));
     break;
-  }  g_free(tracks);
-  text=g_strdup_printf(_("Added %s %s to %s from %.4f to %.4f\n"),tname,filter_name,track_desc,start_tc/U_SEC,q_gint64(end_tc+U_SEC/mt->fps,mt->fps)/U_SEC);
-  d_print(text);
-  g_free(text);
-  g_free(filter_name);
-  g_free(tname);
-  g_free(track_desc);
+  }
+  lives_free(tracks);
+
+  d_print(_("Added %s %s to %s from %.4f to %.4f\n"),tname,filter_name,track_desc,start_tc/U_SEC,q_gint64(end_tc+U_SEC/mt->fps,
+          mt->fps)/U_SEC);
+
+  lives_free(filter_name);
+  lives_free(tname);
+  lives_free(track_desc);
 }
 
-static boolean mt_add_region_effect_idle (gpointer user_data) {
+static boolean mt_add_region_effect_idle(livespointer user_data) {
   mt_add_region_effect(LIVES_MENU_ITEM(dummy_menuitem),user_data);
   lives_widget_destroy(dummy_menuitem);
   return FALSE;
 }
 
 
-void mt_add_block_effect (LiVESMenuItem *menuitem, gpointer user_data) {
+void mt_add_block_effect(LiVESMenuItem *menuitem, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   weed_plant_t *start_event=mt->block_selected->start_event;
   weed_plant_t *end_event=mt->block_selected->end_event;
   weed_timecode_t start_tc=get_event_timecode(start_event);
   weed_timecode_t end_tc=get_event_timecode(end_event);
-  gchar *filter_name;
-  gchar *text;
+  char *filter_name;
   int selected_track;
-  gchar *tmp;
+  char *tmp;
 
-  selected_track=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(mt->block_selected->eventbox),"layer_number"));
+  selected_track=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(mt->block_selected->eventbox),"layer_number"));
 
-  if (menuitem!=NULL) mt->current_fx=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(menuitem),"idx"));
+  if (menuitem!=NULL) mt->current_fx=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(menuitem),"idx"));
 
   mt->last_fx_type=MT_LAST_FX_BLOCK;
   add_effect_inner(mt,1,&selected_track,1,&selected_track,start_event,end_event);
 
   filter_name=weed_filter_idx_get_name(mt->current_fx);
-  text=g_strdup_printf(_("Added effect %s to track %s from %.4f to %.4f\n"),filter_name,
-		       (tmp=get_track_name(mt,selected_track,mt->aud_track_selected)),
-		       start_tc/U_SEC,q_gint64(end_tc+U_SEC/mt->fps,mt->fps)/U_SEC);
-  g_free(tmp);
-  d_print(text);
-  g_free(text);
-  g_free(filter_name);
+
+  d_print(_("Added effect %s to track %s from %.4f to %.4f\n"),filter_name,
+          (tmp=get_track_name(mt,selected_track,mt->aud_track_selected)),
+          start_tc/U_SEC,q_gint64(end_tc+U_SEC/mt->fps,mt->fps)/U_SEC);
+
+  lives_free(tmp);
+  lives_free(filter_name);
 }
-  
-static boolean mt_add_block_effect_idle (gpointer user_data) {
+
+static boolean mt_add_block_effect_idle(livespointer user_data) {
   mt_add_block_effect(LIVES_MENU_ITEM(dummy_menuitem),user_data);
   lives_widget_destroy(dummy_menuitem);
   return FALSE;
 }
 
-void on_mt_list_fx_activate (LiVESMenuItem *menuitem, gpointer user_data) {
+void on_mt_list_fx_activate(LiVESMenuItem *menuitem, livespointer user_data) {
   // list effects at current frame/track
   lives_mt *mt=(lives_mt *)user_data;
   polymorph(mt,POLY_FX_STACK);
 }
 
 
-void on_mt_delfx_activate (LiVESMenuItem *menuitem, gpointer user_data) {
+void on_mt_delfx_activate(LiVESMenuItem *menuitem, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
 
   weed_timecode_t start_tc,end_tc;
@@ -15578,9 +15787,9 @@
 
   int *tracks;
 
-  gchar *fhash,*filter_name,*text;
-  gchar *tname,*track_desc;
-  gchar *tmp,*tmp1;
+  char *fhash,*filter_name;
+  char *tname,*track_desc;
+  char *tmp,*tmp1;
 
   boolean did_backup=mt->did_backup;
   int numtracks;
@@ -15591,13 +15800,13 @@
   if (mt->is_rendering) return;
 
   if (!did_backup&&mt->idlefunc>0) {
-    g_source_remove(mt->idlefunc);
+    lives_source_remove(mt->idlefunc);
     mt->idlefunc=0;
   }
 
   fhash=weed_get_string_value(init_event,"filter",&error);
   mt->current_fx=weed_get_idx_for_hashname(fhash,TRUE);
-  weed_free(fhash);
+  lives_free(fhash);
 
   deinit_event=(weed_plant_t *)weed_get_voidptr_value(init_event,"deinit_event",&error);
   filter_name=weed_filter_idx_get_name(mt->current_fx);
@@ -15611,34 +15820,32 @@
   switch (numtracks) {
   case 1:
     tname=lives_fx_cat_to_text(LIVES_FX_CAT_EFFECT,FALSE); // effect
-    track_desc=g_strdup_printf(_("track %s"),(tmp=get_track_name(mt,tracks[0],FALSE)));
-    g_free(tmp);
+    track_desc=lives_strdup_printf(_("track %s"),(tmp=get_track_name(mt,tracks[0],FALSE)));
+    lives_free(tmp);
     break;
   case 2:
     tname=lives_fx_cat_to_text(LIVES_FX_CAT_TRANSITION,FALSE); // transition
-    track_desc=g_strdup_printf(_("tracks %s and %s"),(tmp1=get_track_name(mt,tracks[0],FALSE)),(tmp=get_track_name(mt,tracks[1],FALSE)));
-    g_free(tmp);
-    g_free(tmp1);
+    track_desc=lives_strdup_printf(_("tracks %s and %s"),(tmp1=get_track_name(mt,tracks[0],FALSE)),(tmp=get_track_name(mt,tracks[1],FALSE)));
+    lives_free(tmp);
+    lives_free(tmp1);
     break;
   default:
     tname=lives_fx_cat_to_text(LIVES_FX_CAT_COMPOSITOR,FALSE); // compositor
-    track_desc=g_strdup(_("selected tracks"));
+    track_desc=lives_strdup(_("selected tracks"));
     break;
-  }  
-
-  weed_free(tracks);
+  }
 
-  text=g_strdup_printf(_("Deleted %s %s from %s from %.4f to %.4f\n"),tname,filter_name,track_desc,start_tc/U_SEC,end_tc/U_SEC);
-  g_free(filter_name); g_free(track_desc);
+  lives_free(tracks);
 
   if (!did_backup) mt_backup(mt,MT_UNDO_DELETE_FILTER,0);
 
   remove_filter_from_event_list(mt->event_list,mt->selected_init_event);
-  remove_end_blank_frames(mt->event_list);
+  remove_end_blank_frames(mt->event_list,TRUE);
+
+  d_print(_("Deleted %s %s from %s from %.4f to %.4f\n"),tname,filter_name,track_desc,start_tc/U_SEC,end_tc/U_SEC);
+  lives_free(filter_name);
+  lives_free(track_desc);
 
-  d_print(text);
-  g_free(text);
-  
   mt->selected_init_event=NULL;
   mt->current_fx=-1;
   if (mt->poly_state==POLY_PARAMS) polymorph(mt,POLY_CLIPS);
@@ -15651,17 +15858,20 @@
 }
 
 
-static void mt_jumpto (lives_mt *mt, lives_direction_t dir) {
-  LiVESWidget *eventbox;
-  weed_timecode_t tc=q_gint64(lives_ruler_get_value(LIVES_RULER(mt->timeline))*U_SEC,mt->fps);
-  double secs=tc/U_SEC;
+static void mt_jumpto(lives_mt *mt, lives_direction_t dir) {
   track_rect *block;
+
+  weed_timecode_t tc=q_gint64(mt->ptr_time*U_SEC,mt->fps);
   weed_timecode_t start_tc,end_tc;
+
+  LiVESWidget *eventbox;
+
+  double secs=tc/U_SEC;
   double offs=1.;
 
-  if (mt->current_track>-1&&!mt->aud_track_selected) eventbox=(LiVESWidget *)g_list_nth_data(mt->video_draws,mt->current_track);
+  if (mt->current_track>-1&&!mt->aud_track_selected) eventbox=(LiVESWidget *)lives_list_nth_data(mt->video_draws,mt->current_track);
   else {
-    eventbox=(LiVESWidget *)g_list_nth_data(mt->audio_draws,mt->current_track+mt->opts.back_audio_tracks);
+    eventbox=(LiVESWidget *)lives_list_nth_data(mt->audio_draws,mt->current_track+mt->opts.back_audio_tracks);
     offs=0.;
   }
   block=get_block_from_time(eventbox,secs,mt);
@@ -15669,17 +15879,14 @@
   if (block!=NULL) {
     if (dir==DIRECTION_NEGATIVE) {
       if (tc==(start_tc=get_event_timecode(block->start_event))) {
-	secs-=1./mt->fps;
-	block=NULL;
-      }
-      else secs=start_tc/U_SEC;
-    }
-    else {
+        secs-=1./mt->fps;
+        block=NULL;
+      } else secs=start_tc/U_SEC;
+    } else {
       if (tc==q_gint64((end_tc=get_event_timecode(block->end_event))+(offs*U_SEC)/mt->fps,mt->fps)) {
-	secs+=1./mt->fps;
-	block=NULL;
-      }
-      else secs=end_tc/U_SEC+offs/mt->fps;
+        secs+=1./mt->fps;
+        block=NULL;
+      } else secs=end_tc/U_SEC+offs/mt->fps;
     }
   }
   if (block==NULL) {
@@ -15687,13 +15894,11 @@
       block=get_block_before(eventbox,secs,TRUE);
       if (block==NULL) secs=0.;
       else {
-	if (tc==q_gint64((end_tc=get_event_timecode(block->end_event))+(offs*U_SEC)/mt->fps,mt->fps)) {
-	  secs=get_event_timecode(block->start_event)/U_SEC;
-	}
-	else secs=end_tc/U_SEC+offs/mt->fps;
+        if (tc==q_gint64((end_tc=get_event_timecode(block->end_event))+(offs*U_SEC)/mt->fps,mt->fps)) {
+          secs=get_event_timecode(block->start_event)/U_SEC;
+        } else secs=end_tc/U_SEC+offs/mt->fps;
       }
-    }
-    else {
+    } else {
       block=get_block_after(eventbox,secs,FALSE);
       if (block==NULL) return;
       secs=get_event_timecode(block->start_event)/U_SEC;
@@ -15701,109 +15906,112 @@
   }
 
   if (secs<0.) secs=0.;
-  if (secs>mt->end_secs) set_timeline_end_secs (mt, secs);
+  if (secs>mt->end_secs) set_timeline_end_secs(mt, secs);
   mt->fm_edit_event=NULL;
-  mt_tl_move(mt,secs-lives_ruler_get_value(LIVES_RULER(mt->timeline)));
+  mt_tl_move(mt,secs);
 }
 
 
-void on_jumpback_activate (LiVESMenuItem *menuitem, gpointer user_data) {
+void on_jumpback_activate(LiVESMenuItem *menuitem, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   mt_jumpto(mt,DIRECTION_NEGATIVE);
 }
 
-void on_jumpnext_activate (LiVESMenuItem *menuitem, gpointer user_data) {
+void on_jumpnext_activate(LiVESMenuItem *menuitem, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   mt_jumpto(mt,DIRECTION_POSITIVE);
 }
 
 
 
-static void on_rename_track_activate (LiVESMenuItem *menuitem, gpointer user_data) {
+void on_rename_track_activate(LiVESMenuItem *menuitem, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   _entryw *rnentry;
   LiVESWidget *xeventbox;
 
-  gchar *cname;
+  char *cname;
 
   int response;
 
   if (mt->current_track<0) return;
 
-  xeventbox=(LiVESWidget *)g_list_nth_data(mt->video_draws,mt->current_track);
+  xeventbox=(LiVESWidget *)lives_list_nth_data(mt->video_draws,mt->current_track);
 
-  cname=(gchar *)g_object_get_data(G_OBJECT(xeventbox),"track_name");
+  cname=(char *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(xeventbox),"track_name");
 
   rnentry=create_rename_dialog(7);
 
   response=lives_dialog_run(LIVES_DIALOG(rnentry->dialog));
-  
+
   if (response==LIVES_RESPONSE_CANCEL) return; // destroyed and freed in a callback
 
-  g_free(cname);
+  lives_free(cname);
 
-  cname=g_strdup(lives_entry_get_text(LIVES_ENTRY(rnentry->entry)));
+  cname=lives_strdup(lives_entry_get_text(LIVES_ENTRY(rnentry->entry)));
 
   lives_widget_destroy(rnentry->dialog);
-  g_free(rnentry);
+  lives_free(rnentry);
 
-  g_object_set_data (G_OBJECT(xeventbox),"track_name",cname);
+  lives_widget_object_set_data(LIVES_WIDGET_OBJECT(xeventbox),"track_name",cname);
 
   set_track_label(LIVES_EVENT_BOX(xeventbox),mt->current_track);
 
 
-}  
+}
 
 
 
-void on_cback_audio_activate (LiVESMenuItem *menuitem, gpointer user_data) {
+void on_cback_audio_activate(LiVESMenuItem *menuitem, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   mt->current_track=-1;
   track_select(mt);
-}  
+}
 
 
 
-void on_render_activate (LiVESMenuItem *menuitem, gpointer user_data) {
+boolean on_render_activate(LiVESMenuItem *menuitem, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
 
+  char *com;
+
+  boolean had_audio=FALSE;
+  boolean post_reset_ba=FALSE;
+  boolean post_reset_ca=FALSE;
+
+  boolean retval=FALSE;
+
   // save these values, because reget_afilesize() can reset them
   int arate=cfile->arate;
   int arps=cfile->arps;
   int asampsize=cfile->asampsize;
   int achans=cfile->achans;
   int signed_endian=cfile->signed_endian;
+
   int orig_file;
-  int i;
-  gchar *com,*tmp;
-  boolean had_audio=FALSE;
-  boolean post_reset_ba=FALSE;
-  boolean post_reset_ca=FALSE;
+  register int i;
 
   if (mt->idlefunc>0) {
-    g_source_remove(mt->idlefunc);
+    lives_source_remove(mt->idlefunc);
     mt->idlefunc=0;
   }
 
   if (menuitem==NULL) {
+    // pre-render audio (not used currently)
     mt->pr_audio=TRUE;
     had_audio=mt->has_audio_file;
     if (had_audio) {
       unlink(cfile->info_file);
       mainw->error=FALSE;
       mainw->cancelled=CANCEL_NONE;
-      com=g_strdup_printf("%s backup_audio \"%s\"",prefs->backend_sync,cfile->handle);
+      com=lives_strdup_printf("%s backup_audio \"%s\"",prefs->backend_sync,cfile->handle);
       lives_system(com,FALSE);
-      g_free(com);
+      lives_free(com);
       check_backend_return(cfile);
-      if (mainw->error) return;
+      if (mainw->error) return FALSE;
     }
     mt->has_audio_file=TRUE;
-  }
-  else {
+  } else {
     mt->pr_audio=FALSE;
-    prefs->render_audio=!mt->render_audp; // mt->render_audp sense is reversed
-    prefs->normalise_audio=mt->normalise_audp; // mt->normalised_audp sense is reversed
   }
 
   mt_desensitise(mt);
@@ -15819,7 +16027,7 @@
 
   mt->pb_start_event=get_first_event(mainw->event_list);
 
-  if (prefs->normalise_audio) {
+  if (mt->opts.normalise_audp) {
     // Normalise audio (preference)
 
     // TODO - in future we could also check the pb volume levels and adjust to prevent clipping
@@ -15833,21 +16041,21 @@
 
     if (mt->opts.back_audio_tracks>=1) {
       // check backing track(s) for audio blocks
-      for (i=0;i<mt->opts.back_audio_tracks;i++) {
-	if (!is_empty_track(G_OBJECT(g_list_nth_data(mt->audio_draws,i)))) {
-	  if (get_mixer_track_vol(mt,i)==0.5) {
-	    has_backing_audio=TRUE;
-	  }
-	}
+      for (i=0; i<mt->opts.back_audio_tracks; i++) {
+        if (!is_empty_track(LIVES_WIDGET_OBJECT(lives_list_nth_data(mt->audio_draws,i)))) {
+          if (get_mixer_track_vol(mt,i)==0.5) {
+            has_backing_audio=TRUE;
+          }
+        }
       }
     }
 
-    for (i=mt->opts.back_audio_tracks;i<g_list_length(mt->audio_draws);i++) {
+    for (i=mt->opts.back_audio_tracks; i<lives_list_length(mt->audio_draws); i++) {
       // check channel track(s) for audio blocks
-      if (!is_empty_track(G_OBJECT(g_list_nth_data(mt->audio_draws,i)))) {
-	if (get_mixer_track_vol(mt,i)==0.5) {
-	  has_channel_audio=TRUE;
-	}
+      if (!is_empty_track(LIVES_WIDGET_OBJECT(lives_list_nth_data(mt->audio_draws,i)))) {
+        if (get_mixer_track_vol(mt,i)==0.5) {
+          has_channel_audio=TRUE;
+        }
       }
     }
 
@@ -15860,22 +16068,22 @@
       // ->
       // if ALL backing levels are at 0.5, set them to 1.0
 
-      for (i=0;i<mt->opts.back_audio_tracks;i++) {
-	if (!is_empty_track(G_OBJECT(g_list_nth_data(mt->audio_draws,i)))) {
-	  if (get_mixer_track_vol(mt,i)!=0.5) {
-	    has_backing_audio=FALSE;
-	    break;
-	  }
-	}
+      for (i=0; i<mt->opts.back_audio_tracks; i++) {
+        if (!is_empty_track(LIVES_WIDGET_OBJECT(lives_list_nth_data(mt->audio_draws,i)))) {
+          if (get_mixer_track_vol(mt,i)!=0.5) {
+            has_backing_audio=FALSE;
+            break;
+          }
+        }
       }
 
       if (has_backing_audio) {
-	post_reset_ba=TRUE; // reset levels after rendering
-	for (i=0;i<mt->opts.back_audio_tracks;i++) {
-	  if (!is_empty_track(G_OBJECT(g_list_nth_data(mt->audio_draws,i)))) {
-	    set_mixer_track_vol(mt,i,1.0);
-	  }
-	}
+        post_reset_ba=TRUE; // reset levels after rendering
+        for (i=0; i<mt->opts.back_audio_tracks; i++) {
+          if (!is_empty_track(LIVES_WIDGET_OBJECT(lives_list_nth_data(mt->audio_draws,i)))) {
+            set_mixer_track_vol(mt,i,1.0);
+          }
+        }
       }
     }
 
@@ -15885,24 +16093,24 @@
 
       // ->
       // if ALL channel levels are at 0.5, set them all to 1.0
-      
-      for (i=mt->opts.back_audio_tracks;i<g_list_length(mt->audio_draws);i++) {
-	// check channel track(s) for audio blocks
-	if (!is_empty_track(G_OBJECT(g_list_nth_data(mt->audio_draws,i)))) {
-	  if (get_mixer_track_vol(mt,i)!=0.5) {
-	    has_channel_audio=FALSE;
-	  }
-	}
+
+      for (i=mt->opts.back_audio_tracks; i<lives_list_length(mt->audio_draws); i++) {
+        // check channel track(s) for audio blocks
+        if (!is_empty_track(LIVES_WIDGET_OBJECT(lives_list_nth_data(mt->audio_draws,i)))) {
+          if (get_mixer_track_vol(mt,i)!=0.5) {
+            has_channel_audio=FALSE;
+          }
+        }
       }
-      
+
       if (has_channel_audio) {
-	post_reset_ca=TRUE;  // reset levels after rendering
-	for (i=mt->opts.back_audio_tracks;i<g_list_length(mt->audio_draws);i++) {
-	  if (!is_empty_track(G_OBJECT(g_list_nth_data(mt->audio_draws,i)))) {
-	    // set to 1.0
-	    set_mixer_track_vol(mt,i,1.0);
-	  }
-	}
+        post_reset_ca=TRUE;  // reset levels after rendering
+        for (i=mt->opts.back_audio_tracks; i<lives_list_length(mt->audio_draws); i++) {
+          if (!is_empty_track(LIVES_WIDGET_OBJECT(lives_list_nth_data(mt->audio_draws,i)))) {
+            // set to 1.0
+            set_mixer_track_vol(mt,i,1.0);
+          }
+        }
       }
     }
   }
@@ -15919,7 +16127,7 @@
       lives_widget_set_sensitive(mt->render_aud,TRUE);
       lives_widget_set_sensitive(mt->normalise_aud,TRUE);
       mt->idlefunc=mt_idle_add(mt);
-      return;
+      return FALSE;
     }
 #endif
 
@@ -15928,16 +16136,14 @@
     if (cfile->frames==0) {
       cfile->hsize=cfile->vsize=0;
     }
-    set_undoable (NULL,FALSE);
+    set_undoable(NULL,FALSE);
     cfile->changed=TRUE;
     add_to_clipmenu();
     mt->file_selected=orig_file=mainw->current_file;
-    d_print ((tmp=g_strdup_printf (_ ("rendered %d frames to new clip.\n"),cfile->frames)));
-    g_free(tmp);
+    d_print(_("rendered %d frames to new clip.\n"),cfile->frames);
     if (mainw->scrap_file!=-1||mainw->ascrap_file!=-1) mt->changed=FALSE;
     mt->is_rendering=FALSE;
-    prefs->render_audio=TRUE;
-    prefs->normalise_audio=TRUE;
+
     save_clip_values(orig_file);
 
     if (prefs->crash_recovery) add_to_recovery_file(cfile->handle);
@@ -15945,99 +16151,97 @@
 
     if (post_reset_ba) {
       // reset after normalising backing audio
-      for (i=0;i<mt->opts.back_audio_tracks;i++) {
-	if (!is_empty_track(G_OBJECT(g_list_nth_data(mt->audio_draws,i)))) {
-	  if (get_mixer_track_vol(mt,i)==1.0) {
-	    set_mixer_track_vol(mt,i,0.5);
-	  }
-	}
+      for (i=0; i<mt->opts.back_audio_tracks; i++) {
+        if (!is_empty_track(LIVES_WIDGET_OBJECT(lives_list_nth_data(mt->audio_draws,i)))) {
+          if (get_mixer_track_vol(mt,i)==1.0) {
+            set_mixer_track_vol(mt,i,0.5);
+          }
+        }
       }
     }
 
     if (post_reset_ca) {
       // reset after normalising channel audio
-      for (i=mt->opts.back_audio_tracks;i<g_list_length(mt->audio_draws);i++) {
-	if (!is_empty_track(G_OBJECT(g_list_nth_data(mt->audio_draws,i)))) {
-	  if (get_mixer_track_vol(mt,i)==1.0) {
-	    set_mixer_track_vol(mt,i,0.5);
-	  }
-	}
+      for (i=mt->opts.back_audio_tracks; i<lives_list_length(mt->audio_draws); i++) {
+        if (!is_empty_track(LIVES_WIDGET_OBJECT(lives_list_nth_data(mt->audio_draws,i)))) {
+          if (get_mixer_track_vol(mt,i)==1.0) {
+            set_mixer_track_vol(mt,i,0.5);
+          }
+        }
       }
     }
 
     mainw->current_file=mainw->first_free_file;
-    
+
     if (!get_new_handle(mainw->current_file,NULL)) {
       mainw->current_file=orig_file;
-      if (!multitrack_end(NULL,user_data)) switch_to_file ((mainw->current_file=0),orig_file);
+      if (!multitrack_end(NULL,user_data)) switch_to_file((mainw->current_file=0),orig_file);
       mt->idlefunc=mt_idle_add(mt);
-      return;
+      return FALSE;
     }
 
     cfile->hsize=mainw->files[orig_file]->hsize;
     cfile->vsize=mainw->files[orig_file]->vsize;
-    
+
     cfile->pb_fps=cfile->fps=mainw->files[orig_file]->fps;
     cfile->ratio_fps=mainw->files[orig_file]->ratio_fps;
-    
+
     cfile->arate=arate;
     cfile->arps=arps;
     cfile->asampsize=asampsize;
 
     cfile->achans=achans;
     cfile->signed_endian=signed_endian;
-    
+
     cfile->bpp=cfile->img_type==IMG_TYPE_JPEG?24:32;
     cfile->changed=TRUE;
     cfile->is_loaded=TRUE;
-    
+
     cfile->old_frames=cfile->frames;
-    
+
     mt->render_file=mainw->current_file;
 
     if (prefs->mt_exit_render) {
-      if (multitrack_end(menuitem,user_data)) return;
+      if (multitrack_end(menuitem,user_data)) return TRUE;
     }
 
     mt_init_clips(mt,orig_file,TRUE);
-    if (mt->idlefunc>0) g_source_remove(mt->idlefunc);
+    if (mt->idlefunc>0) lives_source_remove(mt->idlefunc);
     mt->idlefunc=0;
     lives_widget_context_update();
     mt_clip_select(mt,TRUE);
-  }
-  else {
-    boolean render_audio=prefs->render_audio;
-    gchar *curtmpdir;
+
+    retval=TRUE;
+  } else {
+    char *curtmpdir;
     // rendering failed - clean up
 
     cfile->frames=cfile->start=cfile->end=0;
     mt->is_rendering=FALSE;
-    prefs->render_audio=TRUE;
+
     mainw->event_list=NULL;
     if (mt->pr_audio) {
-      com=g_strdup_printf("%s undo_audio \"%s\"",prefs->backend_sync,cfile->handle);
+      com=lives_strdup_printf("%s undo_audio \"%s\"",prefs->backend_sync,cfile->handle);
       lives_system(com,FALSE);
-      g_free(com);
+      lives_free(com);
       mt->has_audio_file=had_audio;
-    }
-    else {
+    } else {
       // remove subdir
       do_threaded_dialog(_("Cleaning up..."),FALSE);
-      curtmpdir=g_build_filename(prefs->tmpdir,cfile->handle,NULL);
+      curtmpdir=lives_build_filename(prefs->tmpdir,cfile->handle,NULL);
 #ifndef IS_MINGW
-      com=g_strdup_printf("/bin/rm -rf \"%s/\"*",curtmpdir);
+      com=lives_strdup_printf("%s -rf \"%s/\"*",capable->rm_cmd,curtmpdir);
 #else
-      com=g_strdup_printf("DEL /q \"%s/\"*",curtmpdir);
+      com=lives_strdup_printf("DEL /q \"%s/\"*",curtmpdir);
       lives_system(com,TRUE);
-      g_free(com);
-      com=g_strdup_printf("RMDIR \"%s/\"*",curtmpdir);
+      lives_free(com);
+      com=lives_strdup_printf("RMDIR \"%s/\"*",curtmpdir);
 #endif
       lives_system(com,TRUE);
-      g_free(com);
+      lives_free(com);
       end_threaded_dialog();
     }
 
-    prefs->render_audio=render_audio;
   }
 
   // enable GUI for next rendering
@@ -16048,131 +16252,217 @@
 
   mt->idlefunc=mt_idle_add(mt);
 
+  return retval;
 }
 
 
-void on_prerender_aud_activate (LiVESMenuItem *menuitem, gpointer user_data) {
+void on_prerender_aud_activate(LiVESMenuItem *menuitem, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   on_render_activate(menuitem,user_data);
   mainw->is_rendering=mainw->internal_messaging=mt->is_rendering=FALSE;
   mt_sensitise(mt);
-  lives_widget_set_sensitive (mt->prerender_aud, FALSE);
+  lives_widget_set_sensitive(mt->prerender_aud, FALSE);
 }
 
 
-void update_filter_events(lives_mt *mt, weed_plant_t *first_event, weed_timecode_t start_tc, weed_timecode_t end_tc, 
-			  int track, weed_timecode_t new_start_tc, int new_track) {
+void update_filter_events(lives_mt *mt, weed_plant_t *first_event, weed_timecode_t start_tc, weed_timecode_t end_tc,
+                          int track, weed_timecode_t new_start_tc, int new_track) {
   // move/remove filter_inits param_change and filter_deinits after deleting/moving a block
+
+  // first_event: event just before block which is removed
+
+  // start_tc, end_tc start and end timecodes of block on track
+
+  // new_start_tc, new_track: new positions
+
+  //if block is being deleted, or moved and move_effects is FALSE, this is called during block_delete to remove effects
+
+  //if block is being moved and move_effects is TRUE, this is called after block was deleted and reinserted
+
+  // filters which do not have our deleted block as an input, and filters with >2 in channels are not affected
+
+  // filters with 1 in track (ours) are moved to the new block, if the option is set
+
+  // other filters which are affected are deleted if their init/deinit reside entirely in the old block:
+  // otherwise,
+  // if their init_event is within the old block it moves right until we hit a frame
+  // on the same track (+ the second track if applicable). If we pass the deinit_event, the filter is removed.
+
+  // then, if the deinit event is within the old block, it is moved left until we find the frames for it similarly
+
+
+  LiVESList *moved_events=NULL;
+
   weed_plant_t *event,*event_next;
-  boolean was_moved;
-  int error;
   weed_plant_t *init_event,*deinit_event;
-  GList *moved_events=NULL;
+
+  weed_timecode_t last_frame_tc=0,event_tc;
+
+  boolean was_moved;
   boolean leave_event;
-  int i;
 
+  int nins;
+  int error;
+
+  register int i;
+
+  event=get_last_frame_event(mt->event_list);
+  if (event!=NULL) last_frame_tc=get_event_timecode(event);
+
+  // find first event inside old block
   if (first_event==NULL) event=get_first_event(mt->event_list);
   else event=get_next_event(first_event);
   while (event!=NULL&&get_event_timecode(event)<start_tc) event=get_next_event(event);
 
   while (event!=NULL&&get_event_timecode(event)<=end_tc) {
+    // step through all events in old block
     event_next=get_next_event(event);
     was_moved=FALSE;
+
     if (WEED_EVENT_IS_FILTER_INIT(event)) {
+      // filter init event
       if (event==mt->avol_init_event) {
-	event=event_next;
-	continue;  // we move our audio volume effect using a separate mechanism
+        event=event_next;
+        continue;  // we move our audio volume effect using a separate mechanism
       }
       if (mt->opts.move_effects&&mt->moving_block) {
-	if (weed_plant_has_leaf(event,"deinit_event")&&weed_plant_has_leaf(event,"in_tracks")&&
-	    weed_leaf_num_elements(event,"in_tracks")==1&&weed_get_int_value(event,"in_tracks",&error)==track) {
-	  deinit_event=(weed_plant_t *)weed_get_voidptr_value(event,"deinit_event",&error);
-	  if (get_event_timecode(deinit_event)<=end_tc) {
-	    if (g_list_index(moved_events,event)==-1) {
-	      // update owners,in_tracks and out_tracks
-	      weed_set_int_value(event,"in_tracks",new_track);
-
-	      if (weed_plant_has_leaf(event,"out_tracks")) {
-		int *out_tracks=weed_get_int_array(event,"out_tracks",&error);
-		int num_tracks=weed_leaf_num_elements(event,"out_tracks");
-		for (i=0;i<num_tracks;i++) {
-		  if (out_tracks[i]==track) out_tracks[i]=new_track;
-		}
-		weed_set_int_array(event,"out_tracks",num_tracks,out_tracks);
-		weed_free(out_tracks);
-	      }
-
-	      // move to new position
-	      if (new_start_tc<start_tc) {
-		move_filter_init_event(mt->event_list,get_event_timecode(event)+new_start_tc-start_tc,event,mt->fps);
-		move_filter_deinit_event(mt->event_list,get_event_timecode(deinit_event)+new_start_tc-start_tc,
-					 deinit_event,mt->fps,TRUE);
-		if (event==first_event) first_event=NULL;
-		was_moved=TRUE;
-	      }
-	      else if (new_start_tc>start_tc) {
-		move_filter_deinit_event(mt->event_list,get_event_timecode(deinit_event)+new_start_tc-start_tc,
-					 deinit_event,mt->fps,TRUE);
-		move_filter_init_event(mt->event_list,get_event_timecode(event)+new_start_tc-start_tc,event,mt->fps);
-		if (event==first_event) first_event=NULL;
-		was_moved=TRUE;
-	      }
-	      moved_events=g_list_prepend(moved_events,event);
-	    }
-	  }
-	}
-      }
-      if (g_list_index(moved_events,event)==-1&&event!=mt->avol_init_event&&!was_moved&&
-	  !move_event_right(mt->event_list,event,TRUE,mt->fps)) {
-	was_moved=TRUE;
-	if (event==first_event) first_event=NULL;
+        // move effects
+
+        if (weed_plant_has_leaf(event,"deinit_event")&&weed_plant_has_leaf(event,"in_tracks")&&
+            weed_leaf_num_elements(event,"in_tracks")==1&&weed_get_int_value(event,"in_tracks",&error)==track) {
+          // this effect has a deinit_event, it has one in_track, which is this one
+
+          deinit_event=(weed_plant_t *)weed_get_voidptr_value(event,"deinit_event",&error);
+          if (get_event_timecode(deinit_event)<=end_tc) {
+            //if the effect also ends within the block, we will move it to the new block
+
+            if (lives_list_index(moved_events,event)==-1) {
+              // update owners,in_tracks and out_tracks
+              weed_set_int_value(event,"in_tracks",new_track); // update the in_track to the new one
+
+              if (weed_plant_has_leaf(event,"out_tracks")) {
+                int *out_tracks=weed_get_int_array(event,"out_tracks",&error);
+                int num_tracks=weed_leaf_num_elements(event,"out_tracks");
+                for (i=0; i<num_tracks; i++) {
+                  // update the out_track to the new one
+                  if (out_tracks[i]==track) out_tracks[i]=new_track;
+                }
+                weed_set_int_array(event,"out_tracks",num_tracks,out_tracks);
+                lives_free(out_tracks);
+              }
+
+              // move to new position
+              if (new_start_tc<start_tc) {
+                // if moving earlier, we need to move the init_event first, then the deinit_event
+                // this will also update the filter_maps, and param_changes
+                move_filter_init_event(mt->event_list,get_event_timecode(event)+new_start_tc-start_tc,event,mt->fps);
+                move_filter_deinit_event(mt->event_list,get_event_timecode(deinit_event)+new_start_tc-start_tc,
+                                         deinit_event,mt->fps,TRUE);
+                if (event==first_event) first_event=NULL;
+                was_moved=TRUE;
+              } else if (new_start_tc>start_tc) {
+                // if moving later, we need to move the deinit_event first, then the init_event
+                // this will also update the filter_maps, and param_changes
+                move_filter_deinit_event(mt->event_list,get_event_timecode(deinit_event)+new_start_tc-start_tc,
+                                         deinit_event,mt->fps,TRUE);
+                move_filter_init_event(mt->event_list,get_event_timecode(event)+new_start_tc-start_tc,event,mt->fps);
+                if (event==first_event) first_event=NULL;
+                was_moved=TRUE;
+              }
+              // add this effect to our list of moved_events, so we don't end up moving it multiple times
+              moved_events=lives_list_prepend(moved_events,event);
+            }
+          }
+        }
+      }
+
+      if (lives_list_index(moved_events,event)==-1&&event!=mt->avol_init_event) {
+        if (weed_plant_has_leaf(event,"deinit_event")&&weed_plant_has_leaf(event,"in_tracks")&&
+            (nins=weed_leaf_num_elements(event,"in_tracks"))<=2) {
+
+          int *in_tracks=weed_get_int_array(event,"in_tracks",&error);
+          if (in_tracks[0]==track||(nins==2&&in_tracks[1]==track)) {
+            // if the event wasnt moved (either because user chose not to, or block was deleted, or it had 2 tracks)
+            // move the init_event to the right until we find frames from all tracks. If we pass the deinit_event then
+            // the effect is removed.
+            // Effects with one in_track which is other, or effects with >2 in tracks, do not suffer this fate.
+
+            deinit_event=(weed_plant_t *)weed_get_voidptr_value(event,"deinit_event",&error);
+
+            if (get_event_timecode(deinit_event)<=end_tc) {
+              remove_filter_from_event_list(mt->event_list,event);
+              was_moved=TRUE;
+              if (event==first_event) first_event=NULL;
+            } else {
+              if (!move_event_right(mt->event_list,event,TRUE,mt->fps)) {
+                // moved event right until it hits a frame from all tracks, if it passed the deinit_event it is removed
+                // param_change events are also scaled in time
+                was_moved=TRUE;
+                if (event==first_event) first_event=NULL;
+              }
+            }
+          }
+          lives_free(in_tracks);
+        }
       }
-    }
-    else {
+    } else {
       leave_event=TRUE;
       if (WEED_EVENT_IS_FILTER_DEINIT(event)) {
-	if (mt->opts.move_effects&&mt->moving_block) {
-	  if (weed_plant_has_leaf(event,"init_event")) {
-	    init_event=(weed_plant_t *)weed_get_voidptr_value(event,"init_event",&error);
-	    if (g_list_index(moved_events,init_event)==-1&&!(weed_plant_has_leaf(event,"in_tracks")&&
-							     weed_leaf_num_elements(event,"in_tracks")==1&&
-							     weed_get_int_value(event,"in_tracks",&error)==track)&&
-		init_event!=mt->avol_init_event) {
-	      leave_event=FALSE;
-	    }
-	  }
-	}
-	if (!leave_event&&!move_event_left(mt->event_list,event,TRUE,mt->fps)) {
-	  was_moved=TRUE;
-	}
+        // check filter deinit
+        if (mt->opts.move_effects&&mt->moving_block) {
+          if (weed_plant_has_leaf(event,"init_event")) {
+            init_event=(weed_plant_t *)weed_get_voidptr_value(event,"init_event",&error);
+            event_tc=get_event_timecode(event);
+            if (init_event!=mt->avol_init_event&&
+                (event_tc>last_frame_tc||
+                 (lives_list_index(moved_events,init_event)==-1&&
+                  weed_plant_has_leaf(event,"in_tracks")&&(nins=weed_leaf_num_elements(event,"in_tracks"))<=2))) {
+              // move it if: it is not avol event, and either it is after all frames or init_event was not moved
+              // and it has one or two tracks, one of which is our track
+              if (event_tc<=last_frame_tc) {
+                int *in_tracks=weed_get_int_array(event,"in_tracks",&error);
+                if (in_tracks[0]==track||(nins==2&&in_tracks[1]==track)) {
+                  leave_event=FALSE;
+                }
+                lives_free(in_tracks);
+              } else leave_event=FALSE;
+            }
+          }
+        }
+        if (!leave_event&&!move_event_left(mt->event_list,event,TRUE,mt->fps)) {
+          // move the event left until it hits a frame from all tracks
+          // if it passes the init_event, it is removed
+          // param change events are also scaled in time
+          was_moved=TRUE;
+        }
       }
     }
     if (was_moved) {
+      // if we moved an event, re-scan from the start of the old block
       if (first_event==NULL) event=get_first_event(mt->event_list);
       else event=get_next_event(first_event);
       while (event!=NULL&&get_event_timecode(event)<start_tc) event=get_next_event(event);
-    }
-    else {
+    } else {
       event=event_next;
       if (WEED_EVENT_IS_FRAME(event)) first_event=event;
     }
   }
-  if (moved_events!=NULL) g_list_free(moved_events);
+  if (moved_events!=NULL) lives_list_free(moved_events);
 }
 
 
 
-void on_split_activate (LiVESMenuItem *menuitem, gpointer user_data) {
+void on_split_activate(LiVESMenuItem *menuitem, livespointer user_data) {
   // split current block at current time
   lives_mt *mt=(lives_mt *)user_data;
-  double timesecs=lives_ruler_get_value(LIVES_RULER(mt->timeline));
+  double timesecs=mt->ptr_time;
   boolean did_backup=mt->did_backup;
   weed_timecode_t tc;
 
   if (mt->putative_block==NULL) return;
 
   if (!did_backup&&mt->idlefunc>0) {
-    g_source_remove(mt->idlefunc);
+    lives_source_remove(mt->idlefunc);
     mt->idlefunc=0;
   }
 
@@ -16197,17 +16487,17 @@
 
 
 
-void on_split_curr_activate (LiVESMenuItem *menuitem, gpointer user_data) {
+void on_split_curr_activate(LiVESMenuItem *menuitem, livespointer user_data) {
   // split current track at current time
   lives_mt *mt=(lives_mt *)user_data;
-  double timesecs=lives_ruler_get_value(LIVES_RULER(mt->timeline));
+  double timesecs=mt->ptr_time;
   boolean did_backup=mt->did_backup;
   weed_timecode_t tc;
   LiVESWidget *eventbox;
   track_rect *block;
 
   if (mt->idlefunc>0) {
-    g_source_remove(mt->idlefunc);
+    lives_source_remove(mt->idlefunc);
     mt->idlefunc=0;
   }
 
@@ -16217,7 +16507,7 @@
 
 
   if (mt->current_track==-1) eventbox=(LiVESWidget *)mt->audio_draws->data;
-  else eventbox=(LiVESWidget *)g_list_nth_data(mt->video_draws,mt->current_track);
+  else eventbox=(LiVESWidget *)lives_list_nth_data(mt->video_draws,mt->current_track);
 
   block=get_block_from_time(eventbox,timesecs,mt);
 
@@ -16232,28 +16522,28 @@
 
 
 
-void on_split_sel_activate (LiVESMenuItem *menuitem, gpointer user_data) {
+void on_split_sel_activate(LiVESMenuItem *menuitem, livespointer user_data) {
   // split selected tracks at current time
   lives_mt *mt=(lives_mt *)user_data;
-  GList *selt=mt->selected_tracks;
+  LiVESList *selt=mt->selected_tracks;
   LiVESWidget *eventbox;
   int track;
   track_rect *block;
-  double timesecs=lives_ruler_get_value(LIVES_RULER(mt->timeline));
+  double timesecs=mt->ptr_time;
   boolean did_backup=mt->did_backup;
 
   if (mt->selected_tracks==NULL) return;
 
   if (!did_backup&&mt->idlefunc>0) {
-    g_source_remove(mt->idlefunc);
+    lives_source_remove(mt->idlefunc);
     mt->idlefunc=0;
   }
 
   if (!did_backup) mt_backup(mt,MT_UNDO_SPLIT_MULTI,0);
 
   while (selt!=NULL) {
-    track=GPOINTER_TO_INT(selt->data);
-    eventbox=(LiVESWidget *)g_list_nth_data(mt->video_draws,track);
+    track=LIVES_POINTER_TO_INT(selt->data);
+    eventbox=(LiVESWidget *)lives_list_nth_data(mt->video_draws,track);
     block=get_block_from_time(eventbox,timesecs,mt);
     if (block!=NULL) split_block(mt,block,timesecs*U_SEC,track,FALSE);
     selt=selt->next;
@@ -16266,7 +16556,7 @@
 
 
 
-void on_delblock_activate (LiVESMenuItem *menuitem, gpointer user_data) {
+static void on_delblock_activate(LiVESMenuItem *menuitem, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   track_rect *block,*blockprev,*blocknext;
   weed_plant_t *event,*prevevent;
@@ -16280,7 +16570,7 @@
   if (mt->is_rendering) return;
 
   if (!did_backup&&mt->idlefunc>0) {
-    g_source_remove(mt->idlefunc);
+    lives_source_remove(mt->idlefunc);
     mt->idlefunc=0;
   }
 
@@ -16295,10 +16585,10 @@
   block=mt->block_selected;
   eventbox=block->eventbox;
 
-  if (mt->current_track!=-1) track=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(eventbox),"layer_number"));
+  if (mt->current_track!=-1) track=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"layer_number"));
   else track=-1;
 
-  if ((aeventbox=LIVES_WIDGET(g_object_get_data(G_OBJECT(eventbox),"atrack")))!=NULL) {
+  if ((aeventbox=LIVES_WIDGET(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"atrack")))!=NULL) {
     int current_track=mt->current_track;
     mt->current_track=track;
     mt->block_selected=get_block_from_time(aeventbox,get_event_timecode(block->start_event)/U_SEC,mt);
@@ -16319,7 +16609,7 @@
 
   event=block->end_event;
 
-  if (mt->current_track!=-1&&!is_audio_eventbox(mt,eventbox)) {
+  if (mt->current_track!=-1&&!is_audio_eventbox(eventbox)) {
     // delete frames
     while (event!=NULL&&!done) {
       prevevent=get_prev_frame_event(event);
@@ -16327,8 +16617,7 @@
       remove_frame_from_event(mt->event_list,event,track);
       if (!done) event=prevevent;
     }
-  }
-  else {
+  } else {
     // update audio events
     // if last event in block turns audio off, delete it
     if (get_audio_frame_vel(block->end_event,track)==0.) {
@@ -16338,7 +16627,7 @@
     // if first event in block is the end of another block, turn audio off (velocity==0)
     if (block->prev!=NULL&&block->start_event==block->prev->end_event) {
       insert_audio_event_at(mt->event_list,block->start_event,track,1,0.,0.);
-    }						
+    }
     // else we'll delete it
     else {
       remove_audio_for_track(block->start_event,track);
@@ -16346,28 +16635,18 @@
   }
 
   if ((blockprev=block->prev)!=NULL) blockprev->next=block->next;
-  else g_object_set_data (G_OBJECT(eventbox),"blocks",(gpointer)block->next);
+  else lives_widget_object_set_data(LIVES_WIDGET_OBJECT(eventbox),"blocks",(livespointer)block->next);
   if ((blocknext=block->next)!=NULL) blocknext->prev=blockprev;
 
-  g_free(block);
+  lives_free(block);
 
-  lives_widget_queue_draw (eventbox);
+  lives_widget_queue_draw(eventbox);
   if (cfile->achans>0&&mt->audio_draws!=NULL&&mt->opts.back_audio_tracks>0&&eventbox==mt->audio_draws->data&&
-      GPOINTER_TO_INT(g_object_get_data(G_OBJECT(eventbox),"expanded"))) {
-    LiVESWidget *xeventbox=(LiVESWidget *)g_object_get_data(G_OBJECT(eventbox),"achan0");
-    if (xeventbox!=NULL) lives_widget_queue_draw (xeventbox);
-    xeventbox=(LiVESWidget *)g_object_get_data(G_OBJECT(eventbox),"achan1");
-    if (xeventbox!=NULL) lives_widget_queue_draw (xeventbox);
-  }
-
-  if (!mt->opts.move_effects||!mt->moving_block) {
-    update_filter_events(mt,first_event,start_tc,end_tc,track,start_tc,track);
-    remove_end_blank_frames(mt->event_list);
-    if (mt->block_selected==block) {
-      mt->block_selected=NULL;
-      unselect_all(mt);
-    }
-    mt_sensitise(mt);
+      LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"expanded"))) {
+    LiVESWidget *xeventbox=(LiVESWidget *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"achan0");
+    if (xeventbox!=NULL) lives_widget_queue_draw(xeventbox);
+    xeventbox=(LiVESWidget *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"achan1");
+    if (xeventbox!=NULL) lives_widget_queue_draw(xeventbox);
   }
 
   if ((mt->opts.grav_mode==GRAV_MODE_LEFT||mt->opts.grav_mode==GRAV_MODE_RIGHT)&&!mt->moving_block&&!did_backup) {
@@ -16377,35 +16656,45 @@
 
     double oldr_start=mt->region_start;
     double oldr_end=mt->region_end;
-    GList *tracks_sel=NULL;
+    LiVESList *tracks_sel=NULL;
     if (mt->current_track!=-1) {
-      tracks_sel=g_list_copy(mt->selected_tracks);
-      if (mt->selected_tracks!=NULL) g_list_free(mt->selected_tracks);
+      tracks_sel=lives_list_copy(mt->selected_tracks);
+      if (mt->selected_tracks!=NULL) lives_list_free(mt->selected_tracks);
       mt->selected_tracks=NULL;
-      mt->selected_tracks=g_list_append(mt->selected_tracks,GINT_TO_POINTER(mt->current_track));
+      mt->selected_tracks=lives_list_append(mt->selected_tracks,LIVES_INT_TO_POINTER(mt->current_track));
     }
 
     if (mt->opts.grav_mode==GRAV_MODE_LEFT) {
       mt->region_start=start_tc/U_SEC;
       mt->region_end=mt->end_secs;
-    }
-    else {
+    } else {
       mt->region_start=0.;
       mt->region_end=end_tc/U_SEC;
     }
 
     remove_first_gaps(NULL,mt);
     if (mt->current_track>-1) {
-      g_list_free(mt->selected_tracks);
-      mt->selected_tracks=g_list_copy(tracks_sel);
-      if (tracks_sel!=NULL) g_list_free(tracks_sel);
+      lives_list_free(mt->selected_tracks);
+      mt->selected_tracks=lives_list_copy(tracks_sel);
+      if (tracks_sel!=NULL) lives_list_free(tracks_sel);
     }
     mt->region_start=oldr_start;
     mt->region_end=oldr_end;
     mt_sensitise(mt);
   }
 
-  remove_end_blank_frames(mt->event_list);
+  remove_end_blank_frames(mt->event_list,FALSE); // leave filter_inits
+
+  if (!mt->opts.move_effects||!mt->moving_block) {
+    update_filter_events(mt,first_event,start_tc,end_tc,track,start_tc,track);
+    if (mt->block_selected==block) {
+      mt->block_selected=NULL;
+      unselect_all(mt);
+    }
+    mt_sensitise(mt);
+  }
+
+  remove_end_blank_frames(mt->event_list,TRUE); // remove filter inits
 
   if ((!mt->moving_block||get_first_frame_event(mt->event_list)==NULL)&&mt->avol_fx!=-1&&blocknext==NULL&&
       mt->audio_draws!=NULL&&get_first_event(mt->event_list)!=NULL) {
@@ -16416,13 +16705,15 @@
   if (!did_backup&&mt->framedraw!=NULL&&mt->current_rfx!=NULL&&mt->init_event!=NULL&&
       mt->poly_state==POLY_PARAMS&&weed_plant_has_leaf(mt->init_event,"in_tracks")) {
     weed_timecode_t tc=q_gint64(lives_spin_button_get_value(LIVES_SPIN_BUTTON(mt->node_spinbutton))*U_SEC+
-				get_event_timecode(mt->init_event),mt->fps);
+                                get_event_timecode(mt->init_event),mt->fps);
     get_track_index(mt,tc);
   }
 
-  redraw_eventbox(mt,eventbox);
-
-  if (!mt->moving_block) mt_show_current_frame(mt, FALSE);
+  if (!mt->moving_block) {
+    redraw_eventbox(mt,eventbox);
+    paint_lines(mt,mt->ptr_time,TRUE);
+    mt_show_current_frame(mt, FALSE);
+  }
 
   if (!did_backup) mt->idlefunc=mt_idle_add(mt);
 
@@ -16430,7 +16721,7 @@
 
 
 
-void on_seltrack_activate (LiVESMenuItem *menuitem, gpointer user_data) {
+void on_seltrack_activate(LiVESMenuItem *menuitem, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   LiVESWidget *eventbox;
   LiVESWidget *checkbutton;
@@ -16438,37 +16729,35 @@
 
   if (mt->current_track==-1) return;
 
-  eventbox=(LiVESWidget *)g_list_nth_data(mt->video_draws,mt->current_track);
-  checkbutton=(LiVESWidget *)g_object_get_data(G_OBJECT(eventbox),"checkbutton");
+  eventbox=(LiVESWidget *)lives_list_nth_data(mt->video_draws,mt->current_track);
+  checkbutton=(LiVESWidget *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"checkbutton");
 
   mi_state=lives_check_menu_item_get_active(LIVES_CHECK_MENU_ITEM(menuitem));
 
   if (mi_state) {
     // selected
-    if (g_list_index(mt->selected_tracks,GINT_TO_POINTER(mt->current_track))==-1) 
-      mt->selected_tracks=g_list_append(mt->selected_tracks,GINT_TO_POINTER(mt->current_track));
-  }
-  else {
+    if (lives_list_index(mt->selected_tracks,LIVES_INT_TO_POINTER(mt->current_track))==-1)
+      mt->selected_tracks=lives_list_append(mt->selected_tracks,LIVES_INT_TO_POINTER(mt->current_track));
+  } else {
     // unselected
-    if (g_list_index(mt->selected_tracks,GINT_TO_POINTER(mt->current_track))!=-1) 
-      mt->selected_tracks=g_list_remove(mt->selected_tracks,GINT_TO_POINTER(mt->current_track));
+    if (lives_list_index(mt->selected_tracks,LIVES_INT_TO_POINTER(mt->current_track))!=-1)
+      mt->selected_tracks=lives_list_remove(mt->selected_tracks,LIVES_INT_TO_POINTER(mt->current_track));
   }
 
 #ifdef ENABLE_GIW
   if (!prefs->lamp_buttons) {
 #endif
     if (lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(checkbutton))!=mi_state) {
-      lives_signal_handlers_block_by_func(checkbutton,(gpointer)on_seltrack_toggled,(gpointer)mt);
+      lives_signal_handlers_block_by_func(checkbutton,(livespointer)on_seltrack_toggled,(livespointer)mt);
       lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(checkbutton),mi_state);
-      lives_signal_handlers_unblock_by_func(checkbutton,(gpointer)on_seltrack_toggled,(gpointer)mt);
+      lives_signal_handlers_unblock_by_func(checkbutton,(livespointer)on_seltrack_toggled,(livespointer)mt);
     }
 #ifdef ENABLE_GIW
-  }
-  else {
+  } else {
     if (giw_led_get_mode(GIW_LED(checkbutton))!=mi_state) {
-      lives_signal_handlers_block_by_func(checkbutton,(gpointer)on_seltrack_toggled,(gpointer)mt);
+      lives_signal_handlers_block_by_func(checkbutton,(livespointer)on_seltrack_toggled,(livespointer)mt);
       giw_led_set_mode(GIW_LED(checkbutton),mi_state);
-      lives_signal_handlers_unblock_by_func(checkbutton,(gpointer)on_seltrack_toggled,(gpointer)mt);
+      lives_signal_handlers_unblock_by_func(checkbutton,(livespointer)on_seltrack_toggled,(livespointer)mt);
     }
   }
 #endif
@@ -16476,32 +16765,32 @@
 
   lives_widget_set_sensitive(mt->fx_region,FALSE);
   lives_widget_set_sensitive(mt->ins_gap_sel,FALSE);
-  lives_widget_set_sensitive (mt->remove_gaps, FALSE);
-  lives_widget_set_sensitive (mt->remove_first_gaps, FALSE);
+  lives_widget_set_sensitive(mt->remove_gaps, FALSE);
+  lives_widget_set_sensitive(mt->remove_first_gaps, FALSE);
   lives_widget_set_sensitive(mt->split_sel,FALSE);
   lives_widget_set_sensitive(mt->fx_region_1,FALSE);
   lives_widget_set_sensitive(mt->fx_region_1a,FALSE);
   lives_widget_set_sensitive(mt->fx_region_1v,FALSE);
   lives_widget_set_sensitive(mt->fx_region_2,FALSE);
-  
+
   if (mt->selected_tracks!=NULL&&mt->event_list!=NULL&&get_first_event(mt->event_list)!=NULL) {
     lives_widget_set_sensitive(mt->split_sel,TRUE);
     if (mt->region_start!=mt->region_end) {
       lives_widget_set_sensitive(mt->ins_gap_sel,TRUE);
-      lives_widget_set_sensitive (mt->remove_gaps, TRUE);
-      lives_widget_set_sensitive (mt->remove_first_gaps, TRUE);
+      lives_widget_set_sensitive(mt->remove_gaps, TRUE);
+      lives_widget_set_sensitive(mt->remove_first_gaps, TRUE);
       lives_widget_set_sensitive(mt->fx_region,TRUE);
-      switch (g_list_length(mt->selected_tracks)) {
+      switch (lives_list_length(mt->selected_tracks)) {
       case 1:
-	lives_widget_set_sensitive(mt->fx_region_1,TRUE);
-	lives_widget_set_sensitive(mt->fx_region_1v,TRUE);
-	if (cfile->achans>0) lives_widget_set_sensitive(mt->fx_region_1a,TRUE);
-	break;
+        lives_widget_set_sensitive(mt->fx_region_1,TRUE);
+        lives_widget_set_sensitive(mt->fx_region_1v,TRUE);
+        if (cfile->achans>0) lives_widget_set_sensitive(mt->fx_region_1a,TRUE);
+        break;
       case 2:
-	lives_widget_set_sensitive(mt->fx_region_2,TRUE);
-	break;
+        lives_widget_set_sensitive(mt->fx_region_2,TRUE);
+        break;
       default:
-	break;
+        break;
       }
     }
   }
@@ -16515,11 +16804,15 @@
 }
 
 
-void on_seltrack_toggled (LiVESWidget *checkbutton, gpointer user_data) {
-  int track=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(checkbutton),"layer_number"));
+
+void on_seltrack_toggled(LiVESWidget *checkbutton, livespointer user_data) {
+  int track=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(checkbutton),"layer_number"));
   lives_mt *mt=(lives_mt *)user_data;
 
+  if (!mainw->interactive) return;
+
   mt->current_track=track;
+
   if (track>-1) mt->aud_track_selected=FALSE;
   else mt->aud_track_selected=TRUE;
 
@@ -16533,52 +16826,52 @@
 ///////////////////////////////////////////////////////////
 
 
-void mt_desensitise (lives_mt *mt) {
+void mt_desensitise(lives_mt *mt) {
   double val;
-  lives_widget_set_sensitive (mt->clipedit,FALSE);
-  lives_widget_set_sensitive (mt->insert,FALSE);
-  lives_widget_set_sensitive (mt->audio_insert,FALSE);
-  lives_widget_set_sensitive (mt->playall,FALSE);
-  lives_widget_set_sensitive (mt->playsel,FALSE);
-  lives_widget_set_sensitive (mt->view_events,FALSE);
-  lives_widget_set_sensitive (mt->view_sel_events,FALSE);
-  lives_widget_set_sensitive (mt->render, FALSE);
-  lives_widget_set_sensitive (mt->prerender_aud, FALSE);
-  lives_widget_set_sensitive (mt->delblock, FALSE);
-  lives_widget_set_sensitive (mt->save_event_list, FALSE);
-  lives_widget_set_sensitive (mt->load_event_list, FALSE);
-  lives_widget_set_sensitive (mt->clear_event_list, FALSE);
-  lives_widget_set_sensitive (mt->remove_gaps, FALSE);
-  lives_widget_set_sensitive (mt->remove_first_gaps, FALSE);
-  lives_widget_set_sensitive (mt->undo, FALSE);
-  lives_widget_set_sensitive (mt->redo, FALSE);
-  lives_widget_set_sensitive (mt->fx_edit,FALSE);
-  lives_widget_set_sensitive (mt->fx_delete,FALSE);
-  lives_widget_set_sensitive (mt->checkbutton_avel_reverse,FALSE);
-  lives_widget_set_sensitive (mt->spinbutton_avel,FALSE);
-  lives_widget_set_sensitive (mt->avel_scale,FALSE);
-  lives_widget_set_sensitive (mt->change_vals,FALSE);
-  lives_widget_set_sensitive (mt->add_vid_behind,FALSE);
-  lives_widget_set_sensitive (mt->add_vid_front,FALSE);
-  lives_widget_set_sensitive (mt->quit,FALSE);
-  lives_widget_set_sensitive (mt->open_menu,FALSE);
-  lives_widget_set_sensitive (mt->recent_menu,FALSE);
-  lives_widget_set_sensitive (mt->load_set,FALSE);
-  lives_widget_set_sensitive (mt->save_set,FALSE);
-  lives_widget_set_sensitive (mt->close,FALSE);
-  lives_widget_set_sensitive (mt->capture,FALSE);
-  lives_widget_set_sensitive (mt->gens_submenu,FALSE);
-  lives_widget_set_sensitive (mainw->troubleshoot, FALSE);
-
-  lives_widget_set_sensitive (mt->fx_region, FALSE);
-  lives_widget_set_sensitive (mt->ins_gap_sel, FALSE);
-  lives_widget_set_sensitive (mt->ins_gap_cur, FALSE);
+  lives_widget_set_sensitive(mt->clipedit,FALSE);
+  lives_widget_set_sensitive(mt->insert,FALSE);
+  lives_widget_set_sensitive(mt->audio_insert,FALSE);
+  lives_widget_set_sensitive(mt->playall,FALSE);
+  lives_widget_set_sensitive(mt->playsel,FALSE);
+  lives_widget_set_sensitive(mt->view_events,FALSE);
+  lives_widget_set_sensitive(mt->view_sel_events,FALSE);
+  lives_widget_set_sensitive(mt->render, FALSE);
+  lives_widget_set_sensitive(mt->prerender_aud, FALSE);
+  lives_widget_set_sensitive(mt->delblock, FALSE);
+  lives_widget_set_sensitive(mt->save_event_list, FALSE);
+  lives_widget_set_sensitive(mt->load_event_list, FALSE);
+  lives_widget_set_sensitive(mt->clear_event_list, FALSE);
+  lives_widget_set_sensitive(mt->remove_gaps, FALSE);
+  lives_widget_set_sensitive(mt->remove_first_gaps, FALSE);
+  lives_widget_set_sensitive(mt->undo, FALSE);
+  lives_widget_set_sensitive(mt->redo, FALSE);
+  lives_widget_set_sensitive(mt->fx_edit,FALSE);
+  lives_widget_set_sensitive(mt->fx_delete,FALSE);
+  lives_widget_set_sensitive(mt->checkbutton_avel_reverse,FALSE);
+  lives_widget_set_sensitive(mt->spinbutton_avel,FALSE);
+  lives_widget_set_sensitive(mt->avel_scale,FALSE);
+  lives_widget_set_sensitive(mt->change_vals,FALSE);
+  lives_widget_set_sensitive(mt->add_vid_behind,FALSE);
+  lives_widget_set_sensitive(mt->add_vid_front,FALSE);
+  lives_widget_set_sensitive(mt->quit,FALSE);
+  lives_widget_set_sensitive(mt->open_menu,FALSE);
+  lives_widget_set_sensitive(mt->recent_menu,FALSE);
+  lives_widget_set_sensitive(mt->load_set,FALSE);
+  lives_widget_set_sensitive(mt->save_set,FALSE);
+  lives_widget_set_sensitive(mt->close,FALSE);
+  lives_widget_set_sensitive(mt->capture,FALSE);
+  lives_widget_set_sensitive(mt->gens_submenu,FALSE);
+  lives_widget_set_sensitive(mainw->troubleshoot, FALSE);
+
+  lives_widget_set_sensitive(mt->fx_region, FALSE);
+  lives_widget_set_sensitive(mt->ins_gap_sel, FALSE);
+  lives_widget_set_sensitive(mt->ins_gap_cur, FALSE);
 
   if (mt->poly_state==POLY_IN_OUT) {
     if (mt->block_selected!=NULL) {
       val=lives_spin_button_get_value(LIVES_SPIN_BUTTON(mt->spinbutton_in));
       lives_spin_button_set_range(LIVES_SPIN_BUTTON(mt->spinbutton_in),val,val);
-      
+
       val=lives_spin_button_get_value(LIVES_SPIN_BUTTON(mt->spinbutton_out));
       lives_spin_button_set_range(LIVES_SPIN_BUTTON(mt->spinbutton_out),val,val);
     }
@@ -16586,100 +16879,98 @@
 }
 
 
-void mt_sensitise (lives_mt *mt) {
+void mt_sensitise(lives_mt *mt) {
   LiVESWidget *eventbox=NULL;
 
   if (mt->event_list!=NULL&&get_first_event(mt->event_list)!=NULL) {
-    lives_widget_set_sensitive (mt->playall,TRUE);
-    lives_widget_set_sensitive (mainw->m_playbutton, TRUE);
-    lives_widget_set_sensitive (mt->view_events,TRUE);
-    lives_widget_set_sensitive (mt->view_sel_events,mt->region_start!=mt->region_end);
-    lives_widget_set_sensitive (mt->render, TRUE);
-    if (mt->avol_init_event!=NULL&&mt->opts.pertrack_audio&&mainw->files[mt->render_file]->achans>0) 
-      lives_widget_set_sensitive (mt->prerender_aud, TRUE);
-    lives_widget_set_sensitive (mt->save_event_list, TRUE);
+    lives_widget_set_sensitive(mt->playall,TRUE);
+    lives_widget_set_sensitive(mainw->m_playbutton, TRUE);
+    lives_widget_set_sensitive(mt->view_events,TRUE);
+    lives_widget_set_sensitive(mt->view_sel_events,mt->region_start!=mt->region_end);
+    lives_widget_set_sensitive(mt->render, TRUE);
+    if (mt->avol_init_event!=NULL&&mt->opts.pertrack_audio&&mainw->files[mt->render_file]->achans>0)
+      lives_widget_set_sensitive(mt->prerender_aud, TRUE);
+    lives_widget_set_sensitive(mt->save_event_list, TRUE);
+  } else {
+    lives_widget_set_sensitive(mt->playall,FALSE);
+    lives_widget_set_sensitive(mt->playsel,FALSE);
+    lives_widget_set_sensitive(mainw->m_playbutton, FALSE);
+    lives_widget_set_sensitive(mt->view_events,FALSE);
+    lives_widget_set_sensitive(mt->view_sel_events,FALSE);
+    lives_widget_set_sensitive(mt->render,FALSE);
+    lives_widget_set_sensitive(mt->save_event_list,FALSE);
   }
-  else {
-    lives_widget_set_sensitive (mt->playall,FALSE);
-    lives_widget_set_sensitive (mt->playsel,FALSE);
-    lives_widget_set_sensitive (mainw->m_playbutton, FALSE);
-    lives_widget_set_sensitive (mt->view_events,FALSE);
-    lives_widget_set_sensitive (mt->view_sel_events,FALSE);
-    lives_widget_set_sensitive (mt->render,FALSE);
-    lives_widget_set_sensitive (mt->save_event_list,FALSE);
-  }
-
-  if (mt->event_list!=NULL) lives_widget_set_sensitive (mt->clear_event_list, TRUE);
-
-  lives_widget_set_sensitive (mt->add_vid_behind,TRUE);
-  lives_widget_set_sensitive (mt->add_vid_front,TRUE);
-  lives_widget_set_sensitive (mt->quit,TRUE);
-  lives_widget_set_sensitive (mt->open_menu,TRUE);
-  lives_widget_set_sensitive (mt->recent_menu,TRUE);
-  lives_widget_set_sensitive (mt->capture,TRUE);
-  lives_widget_set_sensitive (mt->gens_submenu,TRUE);
-  lives_widget_set_sensitive (mainw->troubleshoot, TRUE);
 
-  lives_widget_set_sensitive (mainw->m_mutebutton, TRUE);
+  if (mt->event_list!=NULL) lives_widget_set_sensitive(mt->clear_event_list, TRUE);
 
-  lives_widget_set_sensitive (mt->load_set,!mainw->was_set);
+  lives_widget_set_sensitive(mt->add_vid_behind,TRUE);
+  lives_widget_set_sensitive(mt->add_vid_front,TRUE);
+  lives_widget_set_sensitive(mt->quit,TRUE);
+  lives_widget_set_sensitive(mt->open_menu,TRUE);
+  lives_widget_set_sensitive(mt->recent_menu,TRUE);
+  lives_widget_set_sensitive(mt->capture,TRUE);
+  lives_widget_set_sensitive(mt->gens_submenu,TRUE);
+  lives_widget_set_sensitive(mainw->troubleshoot, TRUE);
 
-  if (mt->undoable) lives_widget_set_sensitive (mt->undo, TRUE);
-  if (mt->redoable) lives_widget_set_sensitive (mt->redo, TRUE);
+  lives_widget_set_sensitive(mainw->m_mutebutton, TRUE);
+
+  lives_widget_set_sensitive(mt->load_set,!mainw->was_set);
+
+  if (mt->undoable) lives_widget_set_sensitive(mt->undo, TRUE);
+  if (mt->redoable) lives_widget_set_sensitive(mt->redo, TRUE);
   if (mt->selected_init_event!=NULL) lives_widget_set_sensitive(mt->fx_edit,TRUE);
   if (mt->selected_init_event!=NULL) lives_widget_set_sensitive(mt->fx_delete,TRUE);
-  lives_widget_set_sensitive (mt->checkbutton_avel_reverse,TRUE);
+  lives_widget_set_sensitive(mt->checkbutton_avel_reverse,TRUE);
 
   if (mt->block_selected!=NULL&&(!mt->block_selected->start_anchored||
-				 !mt->block_selected->end_anchored)&&!lives_toggle_button_get_active
+                                 !mt->block_selected->end_anchored)&&!lives_toggle_button_get_active
       (LIVES_TOGGLE_BUTTON(mt->checkbutton_avel_reverse))) {
-    lives_widget_set_sensitive (mt->spinbutton_avel,TRUE);
+    lives_widget_set_sensitive(mt->spinbutton_avel,TRUE);
     lives_widget_set_sensitive(mt->avel_scale,TRUE);
   }
 
-  lives_widget_set_sensitive (mt->load_event_list, strlen(mainw->set_name)>0);
-  lives_widget_set_sensitive (mt->clipedit,TRUE);
+  lives_widget_set_sensitive(mt->load_event_list, strlen(mainw->set_name)>0);
+  lives_widget_set_sensitive(mt->clipedit,TRUE);
   if (mt->file_selected>-1) {
-    if (mainw->files[mt->file_selected]->frames>0) lives_widget_set_sensitive (mt->insert,TRUE);
-    if (mainw->files[mt->file_selected]->achans>0&&mainw->files[mt->file_selected]->laudio_time>0.) 
-      lives_widget_set_sensitive (mt->audio_insert,TRUE);
-    lives_widget_set_sensitive (mt->save_set,TRUE);
-    lives_widget_set_sensitive (mt->close,TRUE);
-    lives_widget_set_sensitive (mt->adjust_start_end, TRUE);
+    if (mainw->files[mt->file_selected]->frames>0) lives_widget_set_sensitive(mt->insert,TRUE);
+    if (mainw->files[mt->file_selected]->achans>0&&mainw->files[mt->file_selected]->laudio_time>0.)
+      lives_widget_set_sensitive(mt->audio_insert,TRUE);
+    lives_widget_set_sensitive(mt->save_set,TRUE);
+    lives_widget_set_sensitive(mt->close,TRUE);
+    lives_widget_set_sensitive(mt->adjust_start_end, TRUE);
   }
 
-  if (mt->video_draws!=NULL&&mt->current_track>-1) eventbox=(LiVESWidget *)g_list_nth_data (mt->video_draws,mt->current_track);
+  if (mt->video_draws!=NULL&&mt->current_track>-1) eventbox=(LiVESWidget *)lives_list_nth_data(mt->video_draws,mt->current_track);
   else if (mt->audio_draws!=NULL) eventbox=(LiVESWidget *)mt->audio_draws->data;
 
   if (eventbox!=NULL) {
-    lives_widget_set_sensitive (mt->jumpback, g_object_get_data(G_OBJECT(eventbox),"blocks")!=NULL);
-    lives_widget_set_sensitive (mt->jumpnext, g_object_get_data(G_OBJECT(eventbox),"blocks")!=NULL);
+    lives_widget_set_sensitive(mt->jumpback, lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"blocks")!=NULL);
+    lives_widget_set_sensitive(mt->jumpnext, lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"blocks")!=NULL);
   }
 
-  lives_widget_set_sensitive (mt->change_vals,TRUE);
+  lives_widget_set_sensitive(mt->change_vals,TRUE);
 
   if (mt->block_selected) {
-    lives_widget_set_sensitive (mt->delblock, TRUE);
+    lives_widget_set_sensitive(mt->delblock, TRUE);
     if (mt->poly_state==POLY_IN_OUT&&mt->block_selected->ordered) {
       weed_timecode_t offset_end=mt->block_selected->offset_start+(weed_timecode_t)(U_SEC/mt->fps)+
-	(get_event_timecode(mt->block_selected->end_event)-get_event_timecode(mt->block_selected->start_event));
-      
-      lives_signal_handler_block (mt->spinbutton_out,mt->spin_out_func);
-      lives_signal_handler_block (mt->spinbutton_in,mt->spin_in_func);
+                                 (get_event_timecode(mt->block_selected->end_event)-get_event_timecode(mt->block_selected->start_event));
+
+      lives_signal_handler_block(mt->spinbutton_out,mt->spin_out_func);
+      lives_signal_handler_block(mt->spinbutton_in,mt->spin_in_func);
       set_in_out_spin_ranges(mt,mt->block_selected->offset_start,offset_end);
-      lives_signal_handler_unblock (mt->spinbutton_in,mt->spin_in_func);
-      lives_signal_handler_unblock (mt->spinbutton_out,mt->spin_out_func);
+      lives_signal_handler_unblock(mt->spinbutton_in,mt->spin_in_func);
+      lives_signal_handler_unblock(mt->spinbutton_out,mt->spin_out_func);
     }
-  }
-  else if (mt->poly_state==POLY_IN_OUT) {
+  } else if (mt->poly_state==POLY_IN_OUT) {
     int filenum=mt_file_from_clip(mt,mt->clip_selected);
-    lives_signal_handler_block (mt->spinbutton_in,mt->spin_in_func);
-    lives_signal_handler_block (mt->spinbutton_out,mt->spin_out_func);
+    lives_signal_handler_block(mt->spinbutton_in,mt->spin_in_func);
+    lives_signal_handler_block(mt->spinbutton_out,mt->spin_out_func);
     lives_spin_button_set_range(LIVES_SPIN_BUTTON(mt->spinbutton_in),1., mainw->files[filenum]->frames);
     lives_spin_button_set_range(LIVES_SPIN_BUTTON(mt->spinbutton_out),1., mainw->files[filenum]->frames);
 
-    lives_signal_handler_unblock (mt->spinbutton_in,mt->spin_in_func);
-    lives_signal_handler_unblock (mt->spinbutton_out,mt->spin_out_func);
+    lives_signal_handler_unblock(mt->spinbutton_in,mt->spin_in_func);
+    lives_signal_handler_unblock(mt->spinbutton_out,mt->spin_out_func);
   }
 
 
@@ -16687,13 +16978,13 @@
 
   if (mt->region_end>mt->region_start&&mt->event_list!=NULL&&get_first_event(mt->event_list)!=NULL) {
     if (mt->selected_tracks!=NULL) {
-      lives_widget_set_sensitive (mt->fx_region, TRUE);
-      lives_widget_set_sensitive (mt->ins_gap_sel, TRUE);
-      lives_widget_set_sensitive (mt->remove_gaps, TRUE);
-      lives_widget_set_sensitive (mt->remove_first_gaps, TRUE);
+      lives_widget_set_sensitive(mt->fx_region, TRUE);
+      lives_widget_set_sensitive(mt->ins_gap_sel, TRUE);
+      lives_widget_set_sensitive(mt->remove_gaps, TRUE);
+      lives_widget_set_sensitive(mt->remove_first_gaps, TRUE);
     }
     lives_widget_set_sensitive(mt->playsel,TRUE);
-    lives_widget_set_sensitive (mt->ins_gap_cur, TRUE);
+    lives_widget_set_sensitive(mt->ins_gap_cur, TRUE);
     lives_widget_set_sensitive(mt->view_sel_events,TRUE);
   }
 
@@ -16702,20 +16993,19 @@
 }
 
 
-void mt_swap_play_pause (lives_mt *mt, boolean put_pause) {
+void mt_swap_play_pause(lives_mt *mt, boolean put_pause) {
   LiVESWidget *tmp_img=NULL;
 
   if (put_pause) {
 #if GTK_CHECK_VERSION(2,6,0)
-    tmp_img = lives_image_new_from_stock (LIVES_STOCK_MEDIA_PAUSE, lives_toolbar_get_icon_size (LIVES_TOOLBAR (mainw->btoolbar)));
+    tmp_img = lives_image_new_from_stock(LIVES_STOCK_MEDIA_PAUSE, lives_toolbar_get_icon_size(LIVES_TOOLBAR(mainw->btoolbar)));
 #endif
     set_menu_text(mt->playall,_("_Pause"),TRUE);
     lives_widget_set_tooltip_text(mainw->m_playbutton,_("Pause (p)"));
     lives_widget_set_sensitive(mt->playall,TRUE);
     lives_widget_set_sensitive(mainw->m_playbutton,TRUE);
-  }
-  else {
-    tmp_img = lives_image_new_from_stock (LIVES_STOCK_MEDIA_PLAY, lives_toolbar_get_icon_size (LIVES_TOOLBAR (mainw->btoolbar)));
+  } else {
+    tmp_img = lives_image_new_from_stock(LIVES_STOCK_MEDIA_PLAY, lives_toolbar_get_icon_size(LIVES_TOOLBAR(mainw->btoolbar)));
     set_menu_text(mt->playall,_("_Play from Timeline Position"),TRUE);
     lives_widget_set_tooltip_text(mainw->m_playbutton,_("Play all (p)"));
   }
@@ -16729,7 +17019,7 @@
 
 
 //////////////////////////////////////////////////////////////////
-void multitrack_preview_clicked  (LiVESWidget *button, gpointer user_data) {
+void multitrack_preview_clicked(LiVESWidget *button, livespointer user_data) {
   //preview during rendering
   lives_mt *mt=(lives_mt *)user_data;
 
@@ -16752,19 +17042,18 @@
 
   if (mt->mt_frame_preview) {
     // put blank back in preview window
-    if (mt->framedraw!=NULL) lives_widget_set_bg_color (mt->fd_frame, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
-    
-  }
-  else {
+    if (mt->framedraw!=NULL) lives_widget_set_bg_color(mt->fd_frame, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+
+  } else {
     lives_object_ref(mt->play_blank);
-    lives_container_remove (LIVES_CONTAINER(mt->play_box),mt->play_blank);
+    lives_container_remove(LIVES_CONTAINER(mt->play_box),mt->play_blank);
   }
 
-  lives_widget_set_sensitive (mt->stop,TRUE);
-  lives_widget_set_sensitive (mt->rewind,FALSE);
-  lives_widget_set_sensitive (mainw->m_rewindbutton, FALSE);
+  lives_widget_set_sensitive(mt->stop,TRUE);
+  lives_widget_set_sensitive(mt->rewind,FALSE);
+  lives_widget_set_sensitive(mainw->m_rewindbutton, FALSE);
 
-  if (!mt->is_paused&&!mt->playing_sel) mt->ptr_time=lives_ruler_get_value(LIVES_RULER(mt->timeline));
+  //if (!mt->is_paused&&!mt->playing_sel) mt->ptr_time=lives_ruler_get_value(LIVES_RULER(mt->timeline));
 
   mainw->must_resize=TRUE;
 
@@ -16772,8 +17061,7 @@
     mainw->pwidth=cfile->hsize;
     mainw->pheight=cfile->vsize;
     calc_maxspect(mt->play_width,mt->play_height,&mainw->pwidth,&mainw->pheight);
-  }
-  else {
+  } else {
     mainw->pwidth=cfile->hsize;
     mainw->pheight=cfile->vsize;
   }
@@ -16792,16 +17080,23 @@
   lives_widget_show(mainw->playarea);
 
   if (mainw->cancelled!=CANCEL_USER_PAUSED&&!((mainw->cancelled==CANCEL_NONE||mainw->cancelled==CANCEL_NO_MORE_PREVIEW)&&
-					      mt->is_paused)) {
-    lives_widget_set_sensitive (mt->stop,FALSE);
-    mt_tl_move(mt,mt->ptr_time-lives_ruler_get_value(LIVES_RULER(mt->timeline)));
-  }
-  else {
+      mt->is_paused)) {
+    lives_widget_set_sensitive(mt->stop,FALSE);
+    mt_tl_move(mt,mt->pb_start_time);
+
+    if (mt->opts.follow_playback) {
+      double currtime=mt->ptr_time;
+      if (currtime>mt->tl_max||currtime<mt->tl_min) {
+        mt_zoom(mt,1.);
+      }
+    }
+
+  } else {
     double curtime;
     mt->is_paused=TRUE;
-    if ((curtime=lives_ruler_get_value(LIVES_RULER(mt->timeline)))>0.) {
-      lives_widget_set_sensitive (mt->rewind,TRUE);
-      lives_widget_set_sensitive (mainw->m_rewindbutton, TRUE);
+    if ((curtime=mt->ptr_time)>0.) {
+      lives_widget_set_sensitive(mt->rewind,TRUE);
+      lives_widget_set_sensitive(mainw->m_rewindbutton, TRUE);
     }
     mt_show_current_frame(mt, FALSE);
   }
@@ -16811,9 +17106,9 @@
   if (!mt->is_rendering) {
     if (mt->poly_state==POLY_PARAMS) {
       if (mt->init_event!=NULL) {
-	lives_spin_button_set_value(LIVES_SPIN_BUTTON(mt->node_spinbutton),
-				  (lives_ruler_get_value(LIVES_RULER(mt->timeline))-get_event_timecode(mt->init_event)/U_SEC));
-	lives_widget_set_sensitive(mt->apply_fx_button,FALSE);
+        lives_spin_button_set_value(LIVES_SPIN_BUTTON(mt->node_spinbutton),
+                                    mt->ptr_time-get_event_timecode(mt->init_event)/U_SEC);
+        lives_widget_set_sensitive(mt->apply_fx_button,FALSE);
       }
     }
     if (mt->poly_state==POLY_FX_STACK) {
@@ -16822,15 +17117,15 @@
   }
 
   if (mt->ptr_time>0.) {
-    lives_widget_set_sensitive (mt->rewind,TRUE);
-    lives_widget_set_sensitive (mainw->m_rewindbutton, TRUE);
+    lives_widget_set_sensitive(mt->rewind,TRUE);
+    lives_widget_set_sensitive(mainw->m_rewindbutton, TRUE);
   }
 
   mainw->filter_map=pb_filter_map;
   mainw->afilter_map=pb_afilter_map;
 
   if (mt->is_paused) mt->pb_loop_event=pb_loop_event;
-  lives_widget_set_sensitive (mainw->m_playbutton, TRUE);
+  lives_widget_set_sensitive(mainw->m_playbutton, TRUE);
 
 
 }
@@ -16838,18 +17133,18 @@
 
 
 
-void multitrack_playall (lives_mt *mt) {
+void multitrack_playall(lives_mt *mt) {
   LiVESWidget *old_context_scroll=mt->context_scroll;
 
   if (mainw->current_file<1) return;
 
   if (mt->idlefunc>0) {
-    g_source_remove(mt->idlefunc);
+    lives_source_remove(mt->idlefunc);
     mt->idlefunc=0;
   }
 
   lives_object_ref(mt->context_scroll); // this allows us to get our old messages back
-  lives_container_remove (LIVES_CONTAINER (mt->context_frame), mt->context_scroll);
+  lives_container_remove(LIVES_CONTAINER(mt->context_frame), mt->context_scroll);
   mt->context_scroll=NULL;
   clear_context(mt);
 
@@ -16857,7 +17152,7 @@
   add_context_label(mt,_("to make a mark on the timeline"));
 
   if (mt->opts.follow_playback) {
-    double currtime=lives_ruler_get_value(LIVES_RULER(mt->timeline));
+    double currtime=mt->ptr_time;
     if (currtime>mt->tl_max||currtime<mt->tl_min) {
       double page=mt->tl_max-mt->tl_min;
       mt->tl_min=currtime-page*.25;
@@ -16866,6 +17161,11 @@
     }
   }
 
+  if (needs_clear) {
+    set_ce_frame_from_pixbuf(LIVES_IMAGE(mainw->play_image),NULL,NULL);
+    needs_clear=FALSE;
+  }
+
   if (mt->is_rendering) {
     // preview during rendering
     boolean had_audio=mt->has_audio_file;
@@ -16873,19 +17173,18 @@
     mt->has_audio_file=TRUE;
     on_preview_clicked(LIVES_BUTTON(cfile->proc_ptr->preview_button),NULL);
     mt->has_audio_file=had_audio;
-  }
-  else {
+  } else {
     if (mt->event_list!=NULL) {
       mainw->is_rendering=TRUE;  // NOTE : mainw->is_rendering is not the same as mt->is_rendering !
       set_play_position(mt);
       if (mainw->cancelled!=CANCEL_VID_END) {
-	// otherwise jack transport set us out of range
+        // otherwise jack transport set us out of range
+
+        if (mt->playing_sel)
+          mt->pb_loop_event=get_frame_event_at(mt->event_list,q_gint64(mt->region_start*U_SEC,mt->fps),NULL,TRUE);
+        else if (mt->is_paused) mt->pb_loop_event=pb_loop_event;
 
-	if (mt->playing_sel) 
-	  mt->pb_loop_event=get_frame_event_at(mt->event_list,q_gint64(mt->region_start*U_SEC,mt->fps),NULL,TRUE);
-	else if (mt->is_paused) mt->pb_loop_event=pb_loop_event;
-	
-	on_preview_clicked (NULL,GINT_TO_POINTER(1));
+        on_preview_clicked(NULL,LIVES_INT_TO_POINTER(1));
       }
 
       mainw->is_rendering=mainw->is_processing=FALSE;
@@ -16894,10 +17193,10 @@
 
   mt_swap_play_pause(mt,FALSE);
 
-  lives_container_remove (LIVES_CONTAINER (mt->context_frame), mt->context_scroll);
+  lives_container_remove(LIVES_CONTAINER(mt->context_frame), mt->context_scroll);
 
   mt->context_scroll=old_context_scroll;
-  lives_container_add (LIVES_CONTAINER (mt->context_frame), mt->context_scroll);
+  lives_container_add(LIVES_CONTAINER(mt->context_frame), mt->context_scroll);
 
   if (mt->opts.show_ctx) lives_widget_show_all(mt->context_frame);
 
@@ -16915,16 +17214,15 @@
 
 
 
-void multitrack_play_sel (LiVESMenuItem *menuitem, gpointer user_data) {
+void multitrack_play_sel(LiVESMenuItem *menuitem, livespointer user_data) {
   // get current pointer time; if it is outside the time region jump to start
   double ptr_time;
   lives_mt *mt=(lives_mt *)user_data;
 
-  ptr_time=lives_ruler_get_value(LIVES_RULER(mt->timeline));
-  if (!mt->is_paused) mt->ptr_time=ptr_time;
+  ptr_time=mt->ptr_time;
 
   if (ptr_time<mt->region_start||ptr_time>=mt->region_end) {
-    lives_ruler_set_value(LIVES_RULER(mt->timeline),mt->region_start);
+    mt->ptr_time=lives_ruler_set_value(LIVES_RULER(mt->timeline),mt->region_start);
   }
 
   // set loop start point to region start, and pb_start to current position
@@ -16941,35 +17239,37 @@
 
 
 
-void multitrack_adj_start_end (LiVESMenuItem *menuitem, gpointer user_data) {
+void multitrack_adj_start_end(LiVESMenuItem *menuitem, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   unselect_all(mt);
-  polymorph (mt,POLY_IN_OUT);
+  polymorph(mt,POLY_IN_OUT);
 }
 
 
 
 
 
-void multitrack_insert (LiVESMenuItem *menuitem, gpointer user_data) {
+boolean multitrack_insert(LiVESMenuItem *menuitem, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   lives_clip_t *sfile=mainw->files[mt->file_selected];
-  double secs=lives_ruler_get_value(LIVES_RULER(mt->timeline));
+
+  double secs=mt->ptr_time;
+
   LiVESWidget *eventbox;
+
   weed_timecode_t ins_start=(sfile->start-1.)/sfile->fps*U_SEC;
   weed_timecode_t ins_end=(double)(sfile->end)/sfile->fps*U_SEC;
+
   boolean did_backup=mt->did_backup;
+
   track_rect *block;
 
-  if (mt->current_track==-1) {
-    multitrack_audio_insert(menuitem,user_data);
-    return;
-  }
+  if (mt->current_track<0) return multitrack_audio_insert(menuitem,user_data);
 
-  if (sfile->frames==0) return;
+  if (sfile->frames==0) return FALSE;
 
   if (!did_backup&&mt->idlefunc>0) {
-    g_source_remove(mt->idlefunc);
+    lives_source_remove(mt->idlefunc);
     mt->idlefunc=0;
   }
 
@@ -16979,8 +17279,7 @@
     mt->use_context=FALSE;
   }
 
-  eventbox=(LiVESWidget *)g_list_nth_data(mt->video_draws,mt->current_track);
-  if (!did_backup) mt_backup(mt,MT_UNDO_INSERT_BLOCK,0);
+  eventbox=(LiVESWidget *)lives_list_nth_data(mt->video_draws,mt->current_track);
 
   if (mt->opts.ign_ins_sel) {
     // ignore selection limits
@@ -16994,36 +17293,53 @@
     ins_end=mt->insert_end;
   }
 
-  insert_frames (mt->file_selected,ins_start,ins_end,secs*U_SECL,DIRECTION_POSITIVE,eventbox,mt,NULL);
+  if (mt->opts.insert_mode==INSERT_MODE_NORMAL) {
+    // first check if there is space to insert the block to, otherwise we will abort the insert
+    weed_plant_t *event=NULL;
+    weed_timecode_t tc=0,tcnow;
+    weed_timecode_t tclen=ins_end-ins_start;
+
+    while (tc<=tclen) {
+      tcnow=q_gint64(tc+secs*U_SEC,mt->fps);
+      tc+=U_SEC/mt->fps;
+      event=get_frame_event_at(mt->event_list,tcnow,event,TRUE);
+      if (event==NULL) break; // must be end of timeline
+      // is video track, if we have a non-blank frame, abort
+      if (get_frame_event_clip(event,mt->current_track)>=0) return FALSE;
+    }
+  }
+
+  if (!did_backup) mt_backup(mt,MT_UNDO_INSERT_BLOCK,0);
+
+  insert_frames(mt->file_selected,ins_start,ins_end,secs*U_SECL,DIRECTION_POSITIVE,eventbox,mt,NULL);
 
-  block=(track_rect *)g_object_get_data(G_OBJECT(eventbox),"block_last");
+  block=(track_rect *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"block_last");
 
   if (block!=NULL&&(mt->opts.grav_mode==GRAV_MODE_LEFT||(block->next!=NULL&&mt->opts.grav_mode==GRAV_MODE_RIGHT))&&
       !(did_backup||mt->moving_block)) {
     double oldr_start=mt->region_start;
     double oldr_end=mt->region_end;
-    GList *tracks_sel;
+    LiVESList *tracks_sel;
     track_rect *selblock=NULL;
     if (mt->block_selected!=block) selblock=mt->block_selected;
-    tracks_sel=g_list_copy(mt->selected_tracks);
-    if (mt->selected_tracks!=NULL) g_list_free(mt->selected_tracks);
+    tracks_sel=lives_list_copy(mt->selected_tracks);
+    if (mt->selected_tracks!=NULL) lives_list_free(mt->selected_tracks);
     mt->selected_tracks=NULL;
-    mt->selected_tracks=g_list_append(mt->selected_tracks,GINT_TO_POINTER(mt->current_track));
-    
+    mt->selected_tracks=lives_list_append(mt->selected_tracks,LIVES_INT_TO_POINTER(mt->current_track));
+
     if (mt->opts.grav_mode==GRAV_MODE_LEFT) {
       if (block->prev!=NULL) mt->region_start=get_event_timecode(block->prev->end_event)/U_SEC;
       else mt->region_start=0.;
       mt->region_end=get_event_timecode(block->start_event)/U_SEC;
-    }
-    else {
+    } else {
       mt->region_start=get_event_timecode(block->end_event)/U_SEC;
       mt->region_end=get_event_timecode(block->next->start_event)/U_SEC;
     }
-    
+
     remove_first_gaps(NULL,mt);
-    g_list_free(mt->selected_tracks);
-    mt->selected_tracks=g_list_copy(tracks_sel);
-    if (tracks_sel!=NULL) g_list_free(tracks_sel);
+    lives_list_free(mt->selected_tracks);
+    mt->selected_tracks=lives_list_copy(tracks_sel);
+    if (tracks_sel!=NULL) lives_list_free(tracks_sel);
     mt->region_start=oldr_start;
     mt->region_end=oldr_end;
     mt_sensitise(mt);
@@ -17031,16 +17347,18 @@
   }
 
   // get this again because it could have moved
-  block=(track_rect *)g_object_get_data(G_OBJECT(eventbox),"block_last");
+  block=(track_rect *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"block_last");
 
-  if (prefs->atrans_fx!=-1) mt_do_autotransition(mt, block);
+  if (!mt->moving_block&&prefs->atrans_fx!=-1) mt_do_autotransition(mt, block);
 
   mt->did_backup=did_backup;
 
   if (block!=NULL&&!resize_timeline(mt)&&!did_backup) {
-    lives_painter_surface_t *bgimage=(lives_painter_surface_t *)g_object_get_data (G_OBJECT(eventbox), "bgimg");
-    draw_block(mt,NULL,bgimage,block,0,lives_widget_get_allocation_width(eventbox));
-    lives_widget_queue_draw(eventbox);
+    lives_painter_surface_t *bgimage=(lives_painter_surface_t *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox), "bgimg");
+    if (bgimage!=NULL) {
+      draw_block(mt,NULL,bgimage,block,0,lives_widget_get_allocation_width(eventbox));
+      lives_widget_queue_draw(eventbox);
+    }
   }
 
   if (!did_backup) {
@@ -17053,34 +17371,41 @@
   if (!did_backup&&mt->framedraw!=NULL&&mt->current_rfx!=NULL&&mt->init_event!=NULL&&mt->poly_state==POLY_PARAMS&&
       weed_plant_has_leaf(mt->init_event,"in_tracks")) {
     weed_timecode_t tc=q_gint64(lives_spin_button_get_value(LIVES_SPIN_BUTTON(mt->node_spinbutton))*
-				U_SEC+get_event_timecode(mt->init_event),mt->fps);
+                                U_SEC+get_event_timecode(mt->init_event),mt->fps);
     get_track_index(mt,tc);
   }
 
-  mt_tl_move(mt,0.);
-  //mt_show_current_frame(mt, FALSE);
+  mt_tl_move_relative(mt,0.);
 
   if (!did_backup) mt->idlefunc=mt_idle_add(mt);
 
+  return TRUE;
 }
 
 
-void multitrack_audio_insert (LiVESMenuItem *menuitem, gpointer user_data) {
+boolean multitrack_audio_insert(LiVESMenuItem *menuitem, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   lives_clip_t *sfile=mainw->files[mt->file_selected];
-  double secs=lives_ruler_get_value(LIVES_RULER(mt->timeline));
+
+  double secs=mt->ptr_time;
+
   LiVESWidget *eventbox=(LiVESWidget *)mt->audio_draws->data;
+
   weed_timecode_t ins_start=q_gint64((sfile->start-1.)/sfile->fps*U_SEC,mt->fps);
   weed_timecode_t ins_end=q_gint64((double)sfile->end/sfile->fps*U_SEC,mt->fps);
+
   boolean did_backup=mt->did_backup;
+
   track_rect *block;
-  gchar *text,*tmp;
+
+  char *tmp;
+
   lives_direction_t dir;
 
-  if (mt->current_track!=-1||sfile->achans==0) return;
+  if (mt->current_track!=-1||sfile->achans==0) return FALSE;
 
   if (!did_backup&&mt->idlefunc>0) {
-    g_source_remove(mt->idlefunc);
+    lives_source_remove(mt->idlefunc);
     mt->idlefunc=0;
   }
 
@@ -17096,14 +17421,12 @@
   }
 
   if (ins_start>q_gint64(sfile->laudio_time*U_SEC,mt->fps)) {
-    return;
+    return FALSE;
   }
 
   if (ins_end>q_gint64(sfile->laudio_time*U_SEC,mt->fps)) {
     ins_end=q_gint64(sfile->laudio_time*U_SEC,mt->fps);
   }
-  
-  if (!did_backup) mt_backup(mt,MT_UNDO_INSERT_AUDIO_BLOCK,0);
 
   if (mt->insert_start!=-1) {
     ins_start=mt->insert_start;
@@ -17113,94 +17436,117 @@
   if (mt->insert_avel>0.) dir=DIRECTION_POSITIVE;
   else dir=DIRECTION_NEGATIVE;
 
-  insert_audio (mt->file_selected,ins_start,ins_end,secs*U_SECL,mt->insert_avel,dir,eventbox,mt,NULL);
+  if (mt->opts.insert_mode==INSERT_MODE_NORMAL) {
+    // first check if there is space to insert the block to, otherwise we will abort the insert
+    weed_plant_t *event=NULL;
+    weed_timecode_t tc=0,tcnow;
+    weed_timecode_t tclen=ins_end-ins_start;
+
+    //if (dir==DIRECTION_NEGATIVE) tc+=U_SEC/mt->fps; // TODO - check if we need this
+
+    while (tc<=tclen) {
+      tcnow=q_gint64(tc+secs*U_SEC,mt->fps);
+      tc+=U_SEC/mt->fps;
+      event=get_frame_event_at(mt->event_list,tcnow,event,TRUE);
+      if (event==NULL) break; // must be end of timeline
+      // is audio track, see if we are in an audio block
+      if (tc==0&&get_audio_block_start(mt->event_list,mt->current_track,tcnow,TRUE)!=NULL) return FALSE;
+      // or if one starts here
+      if (get_audio_block_start(mt->event_list,mt->current_track,tcnow,FALSE)!=NULL) return FALSE;
+    }
+  }
+
+  if (!did_backup) mt_backup(mt,MT_UNDO_INSERT_AUDIO_BLOCK,0);
+
+  insert_audio(mt->file_selected,ins_start,ins_end,secs*U_SECL,mt->insert_avel,dir,eventbox,mt,NULL);
 
-  block=(track_rect *)g_object_get_data(G_OBJECT(eventbox),"block_last");
+  block=(track_rect *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"block_last");
 
   if (block!=NULL&&(mt->opts.grav_mode==GRAV_MODE_LEFT||
-		    (mt->opts.grav_mode==GRAV_MODE_RIGHT&&block->next!=NULL))
+                    (mt->opts.grav_mode==GRAV_MODE_RIGHT&&block->next!=NULL))
       &&!(did_backup||mt->moving_block)) {
     double oldr_start=mt->region_start;
     double oldr_end=mt->region_end;
-    GList *tracks_sel;
+    LiVESList *tracks_sel;
     track_rect *selblock=NULL;
     if (mt->block_selected!=block) selblock=mt->block_selected;
-    tracks_sel=g_list_copy(mt->selected_tracks);
-    if (mt->selected_tracks!=NULL) g_list_free(mt->selected_tracks);
+    tracks_sel=lives_list_copy(mt->selected_tracks);
+    if (mt->selected_tracks!=NULL) lives_list_free(mt->selected_tracks);
     mt->selected_tracks=NULL;
     mt->current_track=-1;
-    
+
     if (mt->opts.grav_mode==GRAV_MODE_LEFT) {
       if (block->prev!=NULL) mt->region_start=get_event_timecode(block->prev->end_event)/U_SEC;
       else mt->region_start=0.;
       mt->region_end=get_event_timecode(block->start_event)/U_SEC;
-    }
-    else {
+    } else {
       mt->region_start=get_event_timecode(block->end_event)/U_SEC;
       mt->region_end=get_event_timecode(block->next->start_event)/U_SEC;
     }
-    
+
     remove_first_gaps(NULL,mt);
-    g_list_free(mt->selected_tracks);
-    mt->selected_tracks=g_list_copy(tracks_sel);
-    if (tracks_sel!=NULL) g_list_free(tracks_sel);
+    lives_list_free(mt->selected_tracks);
+    mt->selected_tracks=lives_list_copy(tracks_sel);
+    if (tracks_sel!=NULL) lives_list_free(tracks_sel);
     mt->region_start=oldr_start;
     mt->region_end=oldr_end;
     if (selblock!=NULL) mt->block_selected=selblock;
   }
 
   mt->did_backup=did_backup;
-  
-  text=g_strdup_printf(_("Inserted audio %.4f to %.4f from clip %s into backing audio from time %.4f to %.4f\n"),
-		       ins_start/U_SEC,ins_end/U_SEC,(tmp=g_path_get_basename(sfile->name)),secs,secs+(ins_end-ins_start)/U_SEC);
-  d_print(text);
-  g_free(tmp);
-  g_free(text);
+
+  d_print(_("Inserted audio %.4f to %.4f from clip %s into backing audio from time %.4f to %.4f\n"),
+          ins_start/U_SEC,ins_end/U_SEC,(tmp=lives_path_get_basename(sfile->name)),secs,secs+(ins_end-ins_start)/U_SEC);
+  lives_free(tmp);
+
 
   if (!resize_timeline(mt)&&!did_backup) {
-    lives_painter_surface_t *bgimage=(lives_painter_surface_t *)g_object_get_data (G_OBJECT(eventbox), "bgimg");
-    draw_block(mt,NULL,bgimage,block,0,lives_widget_get_allocation_width(eventbox));
-    lives_widget_queue_draw(eventbox);
-
-    if (GPOINTER_TO_INT(g_object_get_data(G_OBJECT(eventbox),"expanded"))) {
-      LiVESWidget *xeventbox=(LiVESWidget *)g_object_get_data(G_OBJECT(eventbox),"achan0");
-      if (xeventbox!=NULL) lives_widget_queue_draw (xeventbox);
-      xeventbox=(LiVESWidget *)g_object_get_data(G_OBJECT(eventbox),"achan1");
-      if (xeventbox!=NULL) lives_widget_queue_draw (xeventbox);
+    lives_painter_surface_t *bgimage=(lives_painter_surface_t *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox), "bgimg");
+    if (bgimage!=NULL) {
+      draw_block(mt,NULL,bgimage,block,0,lives_widget_get_allocation_width(eventbox));
+      lives_widget_queue_draw(eventbox);
+    }
+
+    if (LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"expanded"))) {
+      LiVESWidget *xeventbox=(LiVESWidget *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"achan0");
+      if (xeventbox!=NULL) lives_widget_queue_draw(xeventbox);
+      xeventbox=(LiVESWidget *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"achan1");
+      if (xeventbox!=NULL) lives_widget_queue_draw(xeventbox);
     }
   }
 
   // get this again because it could have moved
-  block=(track_rect *)g_object_get_data(G_OBJECT(eventbox),"block_last");
-  
+  block=(track_rect *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"block_last");
+
   if (!did_backup) {
     if (mt->avol_fx!=-1&&block!=NULL&&block->next==NULL&&get_first_event(mt->event_list)!=NULL) {
       apply_avol_filter(mt);
     }
   }
 
-  mt_tl_move(mt,0.);
+  mt_tl_move_relative(mt,0.);
 
   if (!did_backup&&mt->framedraw!=NULL&&mt->current_rfx!=NULL&&mt->init_event!=NULL&&
       mt->poly_state==POLY_PARAMS&&weed_plant_has_leaf(mt->init_event,"in_tracks")) {
     weed_timecode_t tc=q_gint64(lives_spin_button_get_value(LIVES_SPIN_BUTTON(mt->node_spinbutton))*
-				U_SEC+get_event_timecode(mt->init_event),mt->fps);
+                                U_SEC+get_event_timecode(mt->init_event),mt->fps);
     get_track_index(mt,tc);
   }
 
   if (!did_backup) mt->idlefunc=mt_idle_add(mt);
 
+  return TRUE;
 }
 
- 
-void insert_frames (int filenum, weed_timecode_t offset_start, weed_timecode_t offset_end, weed_timecode_t tc, 
-		    lives_direction_t direction, LiVESWidget *eventbox, lives_mt *mt, track_rect *in_block) {
+
+void insert_frames(int filenum, weed_timecode_t offset_start, weed_timecode_t offset_end, weed_timecode_t tc,
+                   lives_direction_t direction, LiVESWidget *eventbox, lives_mt *mt, track_rect *in_block) {
   // insert the selected frames from mainw->files[filenum] from source file filenum into mt->event_list starting at timeline timecode tc
   // if in_block is non-NULL, then we extend (existing) in_block with the new frames; otherwise we create a new block and insert it into eventbox
 
   // this is quite complex as the framerates of the sourcefile and the timeline might not match. Therefore we resample (in memory) our source file
   // After resampling, we insert resampled frames from offset_start (inclusive) to offset_end (non-inclusive) [forwards]
-  // or from offset_start (non-inclusive) to offset_end (inclusive) if going backwards 
+  // or from offset_start (non-inclusive) to offset_end (inclusive) if going backwards
 
   // if we are inserting in an existing block, we can only use this to extend the end (not shrink it)
 
@@ -17212,28 +17558,35 @@
 
   // TODO - handle case where frames are overwritten
 
-  int numframes,i;
-  int render_file=mainw->current_file;
-  boolean isfirst=TRUE;
   lives_clip_t *sfile=mainw->files[filenum];
-  int track=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(eventbox),"layer_number"));
+
   weed_timecode_t last_tc=0,offset_start_tc,start_tc,last_offset;
+  weed_timecode_t orig_st=offset_start,orig_end=offset_end;
+
   int *clips=NULL,*frames=NULL,*rep_clips,*rep_frames,error;
+
   weed_plant_t *last_frame_event=NULL;
   weed_plant_t *event,*shortcut1=NULL,*shortcut2=NULL;
-  int frame=((double)(offset_start/U_SEC)*mt->fps+1.4999);
+
   track_rect *new_block=NULL;
-  gchar *text;
-  weed_timecode_t orig_st=offset_start,orig_end=offset_end;
+
   LiVESWidget *aeventbox=NULL;
+
   double aseek;
   double end_secs;
 
+  boolean isfirst=TRUE;
+
+  int frame=((double)(offset_start/U_SEC)*mt->fps+1.4999);
+  int track=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"layer_number"));
+  int numframes,i;
+  int render_file=mainw->current_file;
+
   mt_desensitise(mt);
 
-  g_object_set_data (G_OBJECT(eventbox),"block_last",(gpointer)NULL);
-  if ((aeventbox=(LiVESWidget *)g_object_get_data(G_OBJECT(eventbox),"atrack"))!=NULL) 
-    g_object_set_data (G_OBJECT(aeventbox),"block_last",(gpointer)NULL);
+  lives_widget_object_set_data(LIVES_WIDGET_OBJECT(eventbox),"block_last",(livespointer)NULL);
+  if ((aeventbox=(LiVESWidget *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"atrack"))!=NULL)
+    lives_widget_object_set_data(LIVES_WIDGET_OBJECT(aeventbox),"block_last",(livespointer)NULL);
 
   last_offset=offset_start_tc=q_gint64(offset_start,mt->fps);
   offset_end=q_gint64(offset_end,mt->fps);
@@ -17252,55 +17605,52 @@
   if (cfile->fps!=mt->fps&&cfile->event_list==NULL) {
     // resample clip to render fps
     cfile->undo1_dbl=mt->fps;
-    on_resample_vid_ok (NULL,NULL);
+    on_resample_vid_ok(NULL,NULL);
   }
 
   mainw->current_file=render_file;
 
   while (((direction==DIRECTION_POSITIVE&&(offset_start=q_gint64(last_tc-start_tc+offset_start_tc,mt->fps))<offset_end)
-	  ||(direction==DIRECTION_NEGATIVE&&(offset_start=q_gint64(last_tc+offset_start_tc-start_tc,mt->fps))>=offset_end))) {
+          ||(direction==DIRECTION_NEGATIVE&&(offset_start=q_gint64(last_tc+offset_start_tc-start_tc,mt->fps))>=offset_end))) {
     numframes=0;
     clips=rep_clips=NULL;
     frames=rep_frames=NULL;
-    
-    if ((event=get_frame_event_at (mt->event_list,last_tc,shortcut1,TRUE))!=NULL) {
+
+    if ((event=get_frame_event_at(mt->event_list,last_tc,shortcut1,TRUE))!=NULL) {
       // TODO - memcheck
       numframes=weed_leaf_num_elements(event,"clips");
       clips=weed_get_int_array(event,"clips",&error);
       frames=weed_get_int_array(event,"frames",&error);
       shortcut1=event;
-    }
-    else if (direction==DIRECTION_POSITIVE&&mt->event_list!=NULL) {
+    } else if (direction==DIRECTION_POSITIVE&&mt->event_list!=NULL) {
       shortcut1=get_last_event(mt->event_list);
     }
 
     if (numframes<=track) {
       // TODO - memcheck
-      rep_clips=(int *)g_malloc(track*sizint+sizint);
-      rep_frames=(int *)g_malloc(track*sizint+sizint);
+      rep_clips=(int *)lives_malloc(track*sizint+sizint);
+      rep_frames=(int *)lives_malloc(track*sizint+sizint);
 
-      for (i=0;i<track;i++) {
-	if (i<numframes) {
-	  rep_clips[i]=clips[i];
-	  rep_frames[i]=frames[i];
-	}
-	else {
-	  rep_clips[i]=-1;
-	  rep_frames[i]=0;
-	}
+      for (i=0; i<track; i++) {
+        if (i<numframes) {
+          rep_clips[i]=clips[i];
+          rep_frames[i]=frames[i];
+        } else {
+          rep_clips[i]=-1;
+          rep_frames[i]=0;
+        }
       }
       numframes=track+1;
-    }
-    else {
+    } else {
       if (mt->opts.insert_mode==INSERT_MODE_NORMAL&&frames[track]>0) {
-	if (in_block==NULL&&new_block!=NULL) {
-	  if (direction==DIRECTION_POSITIVE) {
-	    shortcut1=get_prev_frame_event(shortcut1);
-	  }
-	}
-	if (clips!=NULL) weed_free(clips);
-	if (frames!=NULL) weed_free(frames);
-	break; // do not allow overwriting in this mode
+        if (in_block==NULL&&new_block!=NULL) {
+          if (direction==DIRECTION_POSITIVE) {
+            shortcut1=get_prev_frame_event(shortcut1);
+          }
+        }
+        if (clips!=NULL) lives_free(clips);
+        if (frames!=NULL) lives_free(frames);
+        break; // do not allow overwriting in this mode
       }
       rep_clips=clips;
       rep_frames=frames;
@@ -17308,10 +17658,10 @@
 
     if (sfile->event_list!=NULL) event=get_frame_event_at(sfile->event_list,offset_start,shortcut2,TRUE);
     if (sfile->event_list!=NULL&&event==NULL) {
-      if (rep_clips!=clips&&rep_clips!=NULL) g_free(rep_clips);
-      if (rep_frames!=frames&&rep_frames!=NULL) g_free(rep_frames);
-      if (clips!=NULL) weed_free(clips);
-      if (frames!=NULL) weed_free(frames);
+      if (rep_clips!=clips&&rep_clips!=NULL) lives_free(rep_clips);
+      if (rep_frames!=frames&&rep_frames!=NULL) lives_free(rep_frames);
+      if (clips!=NULL) lives_free(clips);
+      if (frames!=NULL) lives_free(frames);
       break; // insert finished: ran out of frames in resampled clip
     }
     last_offset=offset_start;
@@ -17325,80 +17675,75 @@
     rep_frames[track]=frame;
 
     // TODO - memcheck
-    mt->event_list=insert_frame_event_at (mt->event_list,last_tc,numframes,rep_clips,rep_frames,&shortcut1);
+    mt->event_list=insert_frame_event_at(mt->event_list,last_tc,numframes,rep_clips,rep_frames,&shortcut1);
 
-    if (rep_clips!=clips&&rep_clips!=NULL) g_free(rep_clips);
-    if (rep_frames!=frames&&rep_frames!=NULL) g_free(rep_frames);
+    if (rep_clips!=clips&&rep_clips!=NULL) lives_free(rep_clips);
+    if (rep_frames!=frames&&rep_frames!=NULL) lives_free(rep_frames);
 
     if (isfirst) {
       // TODO - memcheck
       if (in_block==NULL) {
-	new_block=add_block_start_point (eventbox,last_tc,filenum,offset_start,shortcut1,TRUE);
-	if (aeventbox!=NULL) {
-	  if (cfile->achans>0&&sfile->achans>0&&mt->opts.insert_audio) {
-	    // insert audio start or end
-	    if (direction==DIRECTION_POSITIVE) {
-	      aseek=(double)(frame-1.)/sfile->fps;
-
-	      insert_audio_event_at(mt->event_list,shortcut1,track,filenum,aseek,1.);
-	      add_block_start_point (aeventbox,last_tc,filenum,offset_start,shortcut1,TRUE);
-	    }
-	    else {
-	      weed_plant_t *nframe;
-	      if ((nframe=get_next_frame_event(shortcut1))==NULL) {
-		mt->event_list=insert_blank_frame_event_at(mt->event_list,q_gint64(last_tc+U_SEC/mt->fps,mt->fps),&shortcut1);
-		nframe=shortcut1;
-	      }
-	      insert_audio_event_at(mt->event_list,nframe,track,filenum,0.,0.);
-	    }
-	  }
-	}
-	isfirst=FALSE;
+        new_block=add_block_start_point(eventbox,last_tc,filenum,offset_start,shortcut1,TRUE);
+        if (aeventbox!=NULL) {
+          if (cfile->achans>0&&sfile->achans>0&&mt->opts.insert_audio) {
+            // insert audio start or end
+            if (direction==DIRECTION_POSITIVE) {
+              aseek=(double)(frame-1.)/sfile->fps;
+
+              insert_audio_event_at(mt->event_list,shortcut1,track,filenum,aseek,1.);
+              add_block_start_point(aeventbox,last_tc,filenum,offset_start,shortcut1,TRUE);
+            } else {
+              weed_plant_t *nframe;
+              if ((nframe=get_next_frame_event(shortcut1))==NULL) {
+                mt->event_list=insert_blank_frame_event_at(mt->event_list,q_gint64(last_tc+U_SEC/mt->fps,mt->fps),&shortcut1);
+                nframe=shortcut1;
+              }
+              insert_audio_event_at(mt->event_list,nframe,track,filenum,0.,0.);
+            }
+          }
+        }
+        isfirst=FALSE;
       }
     }
 
-    if (clips!=NULL) weed_free(clips);
-    if (frames!=NULL) weed_free(frames);
-    
+    if (clips!=NULL) lives_free(clips);
+    if (frames!=NULL) lives_free(frames);
+
     if (direction==DIRECTION_POSITIVE) {
       last_tc+=U_SEC/mt->fps;
       last_tc=q_gint64(last_tc,mt->fps);
-    }
-    else {
+    } else {
       if (last_tc<U_SEC/mt->fps) break;
       last_tc-=U_SEC/mt->fps;
       last_tc=q_gint64(last_tc,mt->fps);
     }
     if (sfile->event_list==NULL) if ((direction==DIRECTION_POSITIVE&&(++frame>sfile->frames))||
-				     (direction==DIRECTION_NEGATIVE&&(--frame<1))) {
-      break;
-    }
+                                       (direction==DIRECTION_NEGATIVE&&(--frame<1))) {
+        break;
+      }
   }
 
   if (!isfirst) {
     if (direction==DIRECTION_POSITIVE) {
-      if (in_block!=NULL) g_object_set_data (G_OBJECT(eventbox),"block_last",(gpointer)in_block);
+      if (in_block!=NULL) lives_widget_object_set_data(LIVES_WIDGET_OBJECT(eventbox),"block_last",(livespointer)in_block);
       add_block_end_point(eventbox,shortcut1);
 
       if (cfile->achans>0&&sfile->achans>0&&mt->opts.insert_audio&&mt->opts.pertrack_audio) {
-	weed_plant_t *shortcut2=get_next_frame_event(shortcut1);
-	if (shortcut2==NULL) {
-	  mt->event_list=insert_blank_frame_event_at(mt->event_list,last_tc,&shortcut1);
-	}
-	else shortcut1=shortcut2;
-	insert_audio_event_at(mt->event_list,shortcut1,track,filenum,0.,0.);
-	add_block_end_point(aeventbox,shortcut1);
+        weed_plant_t *shortcut2=get_next_frame_event(shortcut1);
+        if (shortcut2==NULL) {
+          mt->event_list=insert_blank_frame_event_at(mt->event_list,last_tc,&shortcut1);
+        } else shortcut1=shortcut2;
+        insert_audio_event_at(mt->event_list,shortcut1,track,filenum,0.,0.);
+        add_block_end_point(aeventbox,shortcut1);
       }
-    }
-    else if (in_block!=NULL) {
+    } else if (in_block!=NULL) {
       in_block->offset_start=last_offset;
       in_block->start_event=shortcut1;
       if (cfile->achans>0&&sfile->achans>0&&mt->opts.insert_audio&&mt->opts.pertrack_audio) {
-	weed_plant_t *shortcut2=get_next_frame_event(shortcut1);
-	if (shortcut2==NULL) {
-	  mt->event_list=insert_blank_frame_event_at(mt->event_list,last_tc,&shortcut1);
-	}
-	else shortcut1=shortcut2;
+        weed_plant_t *shortcut2=get_next_frame_event(shortcut1);
+        if (shortcut2==NULL) {
+          mt->event_list=insert_blank_frame_event_at(mt->event_list,last_tc,&shortcut1);
+        } else shortcut1=shortcut2;
       }
     }
   }
@@ -17410,15 +17755,14 @@
   }
 
   if (in_block==NULL) {
-    gchar *tmp,*tmp1;
-    text=g_strdup_printf(_("Inserted frames %d to %d from clip %s into track %s from time %.4f to %.4f\n"),
-			 sfile->start,sfile->end,(tmp1=g_path_get_basename(sfile->name)),
-			 (tmp=get_track_name(mt,mt->current_track,mt->aud_track_selected)),
-			 (orig_st+start_tc)/U_SEC,(orig_end+start_tc)/U_SEC);
-    g_free(tmp);
-    g_free(tmp1);
-    d_print(text);
-    g_free(text);
+    char *tmp,*tmp1;
+    d_print(_("Inserted frames %d to %d from clip %s into track %s from time %.4f to %.4f\n"),
+            sfile->start,sfile->end,(tmp1=lives_path_get_basename(sfile->name)),
+            (tmp=get_track_name(mt,mt->current_track,FALSE)),
+            (orig_st+start_tc)/U_SEC,(orig_end+start_tc)/U_SEC);
+    lives_free(tmp);
+    lives_free(tmp1);
+
   }
 
   end_secs=event_list_get_end_secs(mt->event_list);
@@ -17429,9 +17773,9 @@
 }
 
 
-void insert_audio (int filenum, weed_timecode_t offset_start, weed_timecode_t offset_end, weed_timecode_t tc, 
-		   double avel, lives_direction_t direction, LiVESWidget *eventbox, 
-		   lives_mt *mt, track_rect *in_block) {
+void insert_audio(int filenum, weed_timecode_t offset_start, weed_timecode_t offset_end, weed_timecode_t tc,
+                  double avel, lives_direction_t direction, LiVESWidget *eventbox,
+                  lives_mt *mt, track_rect *in_block) {
   // insert the selected audio from mainw->files[filenum] from source file filenum into mt->event_list starting at timeline timecode tc
   // if in_block is non-NULL, then we extend (existing) in_block with the new frames; otherwise we create a new block and insert it into eventbox
   weed_timecode_t start_tc=q_gint64(tc,mt->fps);
@@ -17443,7 +17787,7 @@
 
   double end_secs;
 
-  g_object_set_data (G_OBJECT(eventbox),"block_last",(gpointer)NULL);
+  lives_widget_object_set_data(LIVES_WIDGET_OBJECT(eventbox),"block_last",(livespointer)NULL);
 
   if (direction==DIRECTION_NEGATIVE) {
     weed_timecode_t tmp_tc=offset_end;
@@ -17470,21 +17814,19 @@
 
   if (direction==DIRECTION_POSITIVE) {
     insert_audio_event_at(mt->event_list,frame_event,-1,filenum,offset_start/U_SEC,avel);
-  }
-  else {
+  } else {
     insert_audio_event_at(mt->event_list,frame_event,-1,filenum,offset_end/U_SEC,avel);
     offset_start=offset_start-offset_end+offset_end*mt->insert_avel;
   }
 
-  add_block_start_point ((LiVESWidget *)mt->audio_draws->data, start_tc, filenum, offset_start, frame_event, TRUE);
+  add_block_start_point((LiVESWidget *)mt->audio_draws->data, start_tc, filenum, offset_start, frame_event, TRUE);
 
   if (block==NULL||get_event_timecode(block->start_event)>end_tc) {
     // if no blocks after end point, insert audio off at end point
     frame_event=get_frame_event_at(mt->event_list,end_tc,frame_event,TRUE);
     insert_audio_event_at(mt->event_list,frame_event,-1,filenum,0.,0.);
-    add_block_end_point ((LiVESWidget *)mt->audio_draws->data, frame_event);
-  }
-  else add_block_end_point ((LiVESWidget *)mt->audio_draws->data, block->start_event);
+    add_block_end_point((LiVESWidget *)mt->audio_draws->data, frame_event);
+  } else add_block_end_point((LiVESWidget *)mt->audio_draws->data, block->start_event);
 
   end_secs=event_list_get_end_secs(mt->event_list);
   if (end_secs>mt->end_secs) {
@@ -17496,12 +17838,12 @@
 
 
 
-void multitrack_view_events (LiVESMenuItem *menuitem, gpointer user_data) {
+void multitrack_view_events(LiVESMenuItem *menuitem, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   LiVESWidget *elist_dialog;
   if ((prefs->event_window_show_frame_events&&count_events(mt->event_list,TRUE,0,0)>1000)||
       (!prefs->event_window_show_frame_events&&((count_events(mt->event_list,TRUE,0,0)
-						 -count_events(mt->event_list,FALSE,0,0))>1000))) 
+          -count_events(mt->event_list,FALSE,0,0))>1000)))
     if (!do_event_list_warning()) return;
   elist_dialog=create_event_list_dialog(mt->event_list,0,0);
   lives_dialog_run(LIVES_DIALOG(elist_dialog));
@@ -17509,7 +17851,7 @@
 }
 
 
-void multitrack_view_sel_events (LiVESMenuItem *menuitem, gpointer user_data) {
+void multitrack_view_sel_events(LiVESMenuItem *menuitem, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   LiVESWidget *elist_dialog;
 
@@ -17518,7 +17860,7 @@
 
   if ((prefs->event_window_show_frame_events&&count_events(mt->event_list,TRUE,tc_start,tc_end)>1000)||
       (!prefs->event_window_show_frame_events&&((count_events(mt->event_list,TRUE,tc_start,tc_end)
-						 -count_events(mt->event_list,FALSE,tc_start,tc_end))>1000))) 
+          -count_events(mt->event_list,FALSE,tc_start,tc_end))>1000)))
     if (!do_event_list_warning()) return;
   elist_dialog=create_event_list_dialog(mt->event_list,tc_start,tc_end);
   lives_dialog_run(LIVES_DIALOG(elist_dialog));
@@ -17529,7 +17871,7 @@
 ////////////////////////////////////////////////////////
 // region functions
 
-void draw_region (lives_mt *mt) {
+void draw_region(lives_mt *mt) {
   lives_painter_t *cr;
 
   double start,end;
@@ -17539,8 +17881,7 @@
   if (mt->region_start<mt->region_end) {
     start=mt->region_start;
     end=mt->region_end;
-  }
-  else {
+  } else {
     start=mt->region_end;
     end=mt->region_start;
   }
@@ -17548,35 +17889,34 @@
   if (mt->region_start==mt->region_end) {
     lives_widget_set_sensitive(mt->rs_to_tc,FALSE);
     lives_widget_set_sensitive(mt->re_to_tc,FALSE);
-  }
-  else {
+  } else {
     lives_widget_set_sensitive(mt->rs_to_tc,TRUE);
     lives_widget_set_sensitive(mt->re_to_tc,TRUE);
   }
 
-  cr = lives_painter_create_from_widget (mt->timeline_reg);
+  cr = lives_painter_create_from_widget(mt->timeline_reg);
   lives_painter_set_source_rgb(cr, 0., 0., 0.); ///< opaque black
-  lives_painter_rectangle(cr,(start-mt->tl_min)*lives_widget_get_allocation_width(mt->timeline)/(mt->tl_max-mt->tl_min), 
-			  0, 
-			  (end-start)*lives_widget_get_allocation_width(mt->timeline)/(mt->tl_max-mt->tl_min), 
-			  lives_widget_get_allocation_height(mt->timeline_reg)-2);
+  lives_painter_rectangle(cr,(start-mt->tl_min)*lives_widget_get_allocation_width(mt->timeline)/(mt->tl_max-mt->tl_min),
+                          0,
+                          (end-start)*lives_widget_get_allocation_width(mt->timeline)/(mt->tl_max-mt->tl_min),
+                          lives_widget_get_allocation_height(mt->timeline_reg)-2);
   lives_painter_fill(cr);
   lives_painter_destroy(cr);
 }
 
 
 #if GTK_CHECK_VERSION(3,0,0)
-static boolean expose_timeline_reg_event (LiVESWidget *timeline, lives_painter_t *cairo, gpointer user_data) {
-  GdkEventExpose *event=NULL;
+static boolean expose_timeline_reg_event(LiVESWidget *timeline, lives_painter_t *cairo, livespointer user_data) {
+  LiVESXEventExpose *event=NULL;
 #else
-static boolean expose_timeline_reg_event (LiVESWidget *timeline, GdkEventExpose *event, gpointer user_data) {
+static boolean expose_timeline_reg_event(LiVESWidget *timeline, LiVESXEventExpose *event, livespointer user_data) {
   lives_painter_t *cairo=NULL;
 #endif
 
   lives_painter_t *cr=cairo;
 
   lives_mt *mt=(lives_mt *)user_data;
-  GList *tl_marks=mt->tl_marks;
+  LiVESList *tl_marks=mt->tl_marks;
 
   double time;
 
@@ -17585,7 +17925,7 @@
 
   if (event!=NULL&&event->count>0) return FALSE;
   if (mainw->playing_file>-1||mt->is_rendering) return FALSE;
-  draw_region (mt);
+  draw_region(mt);
 
   if (cairo==NULL) cr=lives_painter_create_from_widget(timeline);
 
@@ -17612,7 +17952,7 @@
 static float get_float_audio_val_at_time(int fnum, double secs, int chnum, int chans) {
   lives_clip_t *afile=mainw->files[fnum];
   int64_t bytes;
-  int64_t apos;
+  off_t apos;
 
   uint8_t val8;
   uint8_t val8b;
@@ -17621,7 +17961,7 @@
 
   float val;
 
-  gchar *filename;
+  char *filename;
 
   bytes=secs*afile->arate*afile->achans*afile->asampsize/8;
   if (bytes==0) return 0.;
@@ -17629,8 +17969,9 @@
   apos=((int64_t)(bytes/afile->achans/(afile->asampsize/8)))*afile->achans*(afile->asampsize/8); // quantise
 
   if (fnum!=aofile) {
+    // does not make sense to use buffer reads, as we may read very sparsely from the file
     if (afd!=-1) close(afd);
-    filename=g_build_filename(prefs->tmpdir,afile->handle,"audio",NULL);
+    filename=lives_build_filename(prefs->tmpdir,afile->handle,"audio",NULL);
     afd=open(filename,O_RDONLY);
     aofile=fnum;
   }
@@ -17655,11 +17996,10 @@
     if (!(afile->signed_endian&AFORM_UNSIGNED)) val=val8>=128?val8-256:val8;
     else val=val8-127;
     val/=127.;
-  }
-  else {
+  } else {
     // 16 bit sample size
-    lives_read(afd,&val8,1,FALSE);
-    lives_read(afd,&val8b,1,FALSE);
+    lives_read(afd,&val8,1,TRUE);
+    lives_read(afd,&val8b,1,TRUE);
     if (afile->signed_endian&AFORM_BIG_ENDIAN) val16=(uint16_t)(val8<<8)+val8b;
     else val16=(uint16_t)(val8b<<8)+val8;
     if (!(afile->signed_endian&AFORM_UNSIGNED)) val=val16>=32768?val16-65536:val16;
@@ -17677,9 +18017,9 @@
 
   lives_painter_t *cr = lives_painter_create(surf);
 
-  LiVESWidget *eventbox=(LiVESWidget *)g_object_get_data(G_OBJECT(ebox),"owner");
+  LiVESWidget *eventbox=(LiVESWidget *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(ebox),"owner");
 
-  track_rect *block=(track_rect *)g_object_get_data (G_OBJECT(eventbox), "blocks");
+  track_rect *block=(track_rect *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox), "blocks");
 
   double offset_startd,offset_endd; // time values
   double tl_span=mt->tl_max-mt->tl_min;
@@ -17690,7 +18030,7 @@
   int offset_start,offset_end;  // pixel values
   int fnum;
   int width=lives_widget_get_allocation_width(ebox);
-  int track=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(eventbox),"layer_number"));
+  int track=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"layer_number"));
 
   register int i;
 
@@ -17705,13 +18045,13 @@
 
     offset_startd=tc/U_SEC;
     if (offset_startd>mt->tl_max) {
-      if (afd!=-1) close(afd);
+      if (afd!=-1) lives_close_buffered(afd);
       return;
     }
 
     offset_start=(int)((offset_startd-mt->tl_min)/tl_span*lives_widget_get_allocation_width(ebox)+.5);
     if (width>0&&offset_start>width) {
-      if (afd!=-1) close(afd);
+      if (afd!=-1) lives_close_buffered(afd);
       return;
     }
 
@@ -17722,7 +18062,7 @@
       block=block->next;
       continue;
     }
-  
+
     fnum=get_audio_frame_clip(block->start_event,track);
     seek=get_audio_frame_seek(block->start_event,track);
     vel=get_audio_frame_vel(block->start_event,track);
@@ -17738,10 +18078,14 @@
 
     lives_painter_set_source_rgb(cr,0.5,0.5,0.5);
 
-    for (i=offset_start;i<=offset_end;i++) {
+    // open audio file here
+
+    for (i=offset_start; i<=offset_end; i++) {
       secs=((double)i/lives_widget_get_allocation_width(ebox)*tl_span+mt->tl_min-offset_startd)*vel;
       secs+=seek;
       if (secs>mainw->files[fnum]->laudio_time) break;
+
+      // seek and read
       ypos=get_float_audio_val_at_time(fnum,secs,chnum,cfile->achans)*.5;
 
       lives_painter_move_to(cr,i,(float)lives_widget_get_allocation_height(ebox)/2.);
@@ -17751,16 +18095,15 @@
     block=block->next;
 
     if (mainw->read_failed) {
-      gchar *filename=g_build_filename(prefs->tmpdir,mainw->files[fnum]->handle,"audio",NULL);
+      char *filename=lives_build_filename(prefs->tmpdir,mainw->files[fnum]->handle,"audio",NULL);
       do_read_failed_error_s(filename,NULL);
-      g_free(filename);
+      lives_free(filename);
     }
   }
 
   lives_painter_destroy(cr);
 
   if (afd!=-1) close(afd);
-
 }
 
 
@@ -17768,9 +18111,9 @@
 
 
 #if GTK_CHECK_VERSION(3,0,0)
-static boolean mt_expose_audtrack_event (LiVESWidget *ebox, lives_painter_t *cairo, gpointer user_data) {
+static boolean mt_expose_audtrack_event(LiVESWidget *ebox, lives_painter_t *cairo, livespointer user_data) {
 #else
-static boolean mt_expose_audtrack_event (LiVESWidget *ebox, GdkEventExpose *event, gpointer user_data) {
+static boolean mt_expose_audtrack_event(LiVESWidget *ebox, LiVESXEventExpose *event, livespointer user_data) {
   lives_painter_t *cairo=NULL;
 #endif
 
@@ -17778,11 +18121,6 @@
 
   lives_mt *mt=(lives_mt *)user_data;
 
-#if !GTK_CHECK_VERSION(3,0,0)
-  GdkRegion *reg;
-  GdkRectangle rect;
-#endif
-
   lives_painter_surface_t *bgimage;
 
   int startx,starty,width,height;
@@ -17792,12 +18130,10 @@
   if (mt->no_expose) return TRUE;
 
 #if !GTK_CHECK_VERSION(3,0,0)
-  reg=event->region;
-  gdk_region_get_clipbox(reg,&rect);
-  startx=rect.x;
-  starty=rect.y;
-  width=rect.width;
-  height=rect.height;
+  startx=event->area.x;
+  starty=event->area.y;
+  width=event->area.width;
+  height=event->area.height;
 
   if (event!=NULL&&event->count>0) {
     return TRUE;
@@ -17810,22 +18146,22 @@
 
   if (width==0) return FALSE;
 
-  hidden=(int)GPOINTER_TO_INT(g_object_get_data (G_OBJECT(ebox), "hidden"));
+  hidden=(int)LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(ebox), "hidden"));
   if (hidden!=0) {
     return FALSE;
   }
 
   if (width>lives_widget_get_allocation_width(ebox)-startx) width=lives_widget_get_allocation_width(ebox)-startx;
 
-  if (cairo==NULL) cr = lives_painter_create_from_widget (ebox);
-  bgimage=(lives_painter_surface_t *)g_object_get_data (G_OBJECT(ebox), "bgimg");
+  if (cairo==NULL) cr = lives_painter_create_from_widget(ebox);
+  bgimage=(lives_painter_surface_t *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(ebox), "bgimg");
 
-  if (GPOINTER_TO_INT(g_object_get_data (G_OBJECT(ebox), "drawn"))) {
+  if (LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(ebox), "drawn"))) {
 
     if (bgimage!=NULL&&lives_painter_image_surface_get_width(bgimage)>0) {
-      lives_painter_set_source_surface (cr, bgimage, startx, starty);
+      lives_painter_set_source_surface(cr, bgimage, startx, starty);
       lives_painter_rectangle(cr,startx,starty,width,height);
-      lives_painter_paint (cr);
+      lives_painter_fill(cr);
       if (cairo==NULL) lives_painter_destroy(cr);
       return TRUE;
     }
@@ -17839,24 +18175,23 @@
   if (bgimage!=NULL) lives_painter_surface_destroy(bgimage);
 
   bgimage=lives_painter_image_surface_create(LIVES_PAINTER_FORMAT_ARGB32,
-					     width,
-					     height);
+          width,
+          height);
 
-  channum=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(ebox),"channel"));
+  channum=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(ebox),"channel"));
 
   if (bgimage!=NULL&&lives_painter_image_surface_get_width(bgimage)>0) {
     draw_soundwave(ebox,bgimage,channum,mt);
-    g_object_set_data (G_OBJECT(ebox),"drawn",GINT_TO_POINTER(TRUE));
+    lives_widget_object_set_data(LIVES_WIDGET_OBJECT(ebox),"drawn",LIVES_INT_TO_POINTER(TRUE));
     lives_widget_queue_draw(ebox);
-  }
-  else if (bgimage!=NULL) {
+  } else if (bgimage!=NULL) {
     lives_painter_surface_destroy(bgimage);
     bgimage=NULL;
   }
 
-  g_object_set_data (G_OBJECT(ebox),"bgimg",bgimage);
+  lives_widget_object_set_data(LIVES_WIDGET_OBJECT(ebox),"bgimg",bgimage);
 
-  if (cairo==NULL) lives_painter_destroy (cr);
+  if (cairo==NULL) lives_painter_destroy(cr);
 
   return TRUE;
 }
@@ -17867,21 +18202,21 @@
 // functions for moving and clicking on the timeline
 
 
-boolean on_timeline_update (LiVESWidget *widget, LiVESXEventMotion *event, gpointer user_data) {
+boolean on_timeline_update(LiVESWidget *widget, LiVESXEventMotion *event, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   int x;
   double pos;
 
   if (mainw->playing_file>-1) return TRUE;
 
-  lives_widget_get_pointer((LiVESXDevice *)mainw->mgeom[prefs->gui_monitor>0?prefs->gui_monitor-1:0].mouse_device, 
-			   widget, &x, NULL);
+  lives_widget_get_pointer((LiVESXDevice *)mainw->mgeom[prefs->gui_monitor>0?prefs->gui_monitor-1:0].mouse_device,
+                           widget, &x, NULL);
   pos=get_time_from_x(mt,x);
 
   if (!mt->region_updating) {
     if (mt->tl_mouse) {
       mt->fm_edit_event=NULL;
-      mt_tl_move(mt,pos-lives_ruler_get_value(LIVES_RULER(mt->timeline)));
+      mt_tl_move(mt,pos);
     }
     return TRUE;
   }
@@ -17889,8 +18224,7 @@
   if (pos>mt->region_init) {
     mt->region_start=mt->region_init;
     mt->region_end=pos;
-  }
-  else {
+  } else {
     mt->region_start=pos;
     mt->region_end=mt->region_init;
   }
@@ -17905,7 +18239,7 @@
 
 
 
-boolean all_present (weed_plant_t *event, GList *sel) {
+boolean all_present(weed_plant_t *event, LiVESList *sel) {
   int *clips;
   int *frames;
   int error,numclips,layer;
@@ -17920,16 +18254,16 @@
   frames=weed_get_int_array(event,"frames",&error);
 
   while (sel!=NULL) {
-    layer=GPOINTER_TO_INT(sel->data);
+    layer=LIVES_POINTER_TO_INT(sel->data);
     if (layer>=numclips||clips[layer]<1||frames[layer]<1) {
-      weed_free(clips);
-      weed_free(frames);
+      lives_free(clips);
+      lives_free(frames);
       return FALSE;
     }
     sel=sel->next;
   }
-  weed_free(clips);
-  weed_free(frames);
+  lives_free(clips);
+  lives_free(frames);
   return TRUE;
 }
 
@@ -17973,10 +18307,10 @@
   }
 
   if (event==NULL) {
-     event=get_last_event(mt->event_list);
+    event=get_last_event(mt->event_list);
     if (!WEED_EVENT_IS_FRAME(event)) event=get_prev_frame_event(event);
   }
- 
+
   while (event!=NULL&&!all_present(event,mt->selected_tracks)) {
     event=get_prev_frame_event(event);
   }
@@ -17991,48 +18325,48 @@
 }
 
 
-void do_sel_context (lives_mt *mt) {
-  gchar *msg;
+void do_sel_context(lives_mt *mt) {
+  char *msg;
   if (mt->region_start==mt->region_end||mt->did_backup) return;
   clear_context(mt);
-  msg=g_strdup_printf(_("Time region %.3f to %.3f\nselected.\n"),mt->region_start,mt->region_end);
+  msg=lives_strdup_printf(_("Time region %.3f to %.3f\nselected.\n"),mt->region_start,mt->region_end);
   add_context_label(mt,msg);
-  g_free(msg);
+  lives_free(msg);
   if (mt->selected_tracks==NULL) {
-    msg=g_strdup_printf(_("select one or more tracks\nto create a region.\n"),g_list_length(mt->selected_tracks));
-  }
-  else msg=g_strdup_printf(_("%d video tracks selected.\n"),g_list_length(mt->selected_tracks));
-  add_context_label (mt,msg);
-  add_context_label (mt,_("Double click on timeline\nto deselect time region."));
-  g_free(msg);
+    msg=lives_strdup_printf(_("select one or more tracks\nto create a region.\n"),lives_list_length(mt->selected_tracks));
+  } else msg=lives_strdup_printf(_("%d video tracks selected.\n"),lives_list_length(mt->selected_tracks));
+  add_context_label(mt,msg);
+  add_context_label(mt,_("Double click on timeline\nto deselect time region."));
+  lives_free(msg);
 }
 
 
-void do_fx_list_context (lives_mt *mt, int fxcount) {
+void do_fx_list_context(lives_mt *mt, int fxcount) {
   clear_context(mt);
-  add_context_label (mt,(_("Single click on an effect\nto select it.")));
-  add_context_label (mt,(_("Double click on an effect\nto edit it.")));
-  add_context_label (mt,(_("Right click on an effect\nfor context menu.\n")));
+  add_context_label(mt,(_("Single click on an effect\nto select it.")));
+  add_context_label(mt,(_("Double click on an effect\nto edit it.")));
+  add_context_label(mt,(_("Right click on an effect\nfor context menu.\n")));
   if (fxcount>1) {
-    add_context_label (mt,(_("Effect order can be changed at\nFILTER MAPS")));
+    add_context_label(mt,(_("Effect order can be changed at\nFILTER MAPS")));
   }
 }
 
 
 void do_fx_move_context(lives_mt *mt) {
   clear_context(mt);
-  add_context_label (mt,(_("You can select an effect,\nthen use the INSERT BEFORE")));
-  add_context_label (mt,(_("or INSERT AFTER buttons to move it.")));
+  add_context_label(mt,(_("You can select an effect,\nthen use the INSERT BEFORE")));
+  add_context_label(mt,(_("or INSERT AFTER buttons to move it.")));
 }
 
 
 
-boolean
-on_timeline_release (LiVESWidget *eventbox, LiVESXEventButton *event, gpointer user_data) {
+boolean on_timeline_release(LiVESWidget *eventbox, LiVESXEventButton *event, livespointer user_data) {
   //button release
   lives_mt *mt=(lives_mt *)user_data;
   double pos=mt->region_end;
 
+  if (!mainw->interactive) return FALSE;
+
   if (mainw->playing_file>-1) return FALSE;
 
   mt->tl_mouse=FALSE;
@@ -18048,14 +18382,14 @@
     lives_widget_set_sensitive(mt->view_sel_events,FALSE);
     lives_signal_handler_block(mt->spinbutton_start,mt->spin_start_func);
     lives_signal_handler_block(mt->spinbutton_end,mt->spin_end_func);
-    lives_spin_button_set_range (LIVES_SPIN_BUTTON (mt->spinbutton_start),0.,mt->end_secs);
-    lives_spin_button_set_range (LIVES_SPIN_BUTTON (mt->spinbutton_end),0.,mt->end_secs+1./mt->fps);
-    lives_spin_button_set_value (LIVES_SPIN_BUTTON (mt->spinbutton_start),0.);
-    lives_spin_button_set_value (LIVES_SPIN_BUTTON (mt->spinbutton_end),0.);
+    lives_spin_button_set_range(LIVES_SPIN_BUTTON(mt->spinbutton_start),0.,mt->end_secs);
+    lives_spin_button_set_range(LIVES_SPIN_BUTTON(mt->spinbutton_end),0.,mt->end_secs+1./mt->fps);
+    lives_spin_button_set_value(LIVES_SPIN_BUTTON(mt->spinbutton_start),0.);
+    lives_spin_button_set_value(LIVES_SPIN_BUTTON(mt->spinbutton_end),0.);
     lives_signal_handler_unblock(mt->spinbutton_start,mt->spin_start_func);
     lives_signal_handler_unblock(mt->spinbutton_end,mt->spin_end_func);
     lives_widget_queue_draw(mt->timeline_reg);
-    gdk_window_process_updates(lives_widget_get_xwindow(mt->timeline_reg),FALSE);
+    lives_widget_process_updates(mt->timeline_reg,FALSE);
     draw_region(mt);
     no_time_selected(mt);
   }
@@ -18069,44 +18403,41 @@
     }
     if (mt->region_end>mt->region_start&&mt->event_list!=NULL&&get_first_event(mt->event_list)!=NULL) {
       if (mt->selected_tracks!=NULL) {
-	lives_widget_set_sensitive (mt->fx_region, TRUE);
-	lives_widget_set_sensitive (mt->ins_gap_sel, TRUE);
-	lives_widget_set_sensitive (mt->remove_gaps, TRUE);
-	lives_widget_set_sensitive (mt->remove_first_gaps, TRUE);
-      }
-      else {
-	lives_widget_set_sensitive (mt->fx_region, FALSE);
+        lives_widget_set_sensitive(mt->fx_region, TRUE);
+        lives_widget_set_sensitive(mt->ins_gap_sel, TRUE);
+        lives_widget_set_sensitive(mt->remove_gaps, TRUE);
+        lives_widget_set_sensitive(mt->remove_first_gaps, TRUE);
+      } else {
+        lives_widget_set_sensitive(mt->fx_region, FALSE);
       }
       lives_widget_set_sensitive(mt->playsel,TRUE);
-      lives_widget_set_sensitive (mt->ins_gap_cur, TRUE);
+      lives_widget_set_sensitive(mt->ins_gap_cur, TRUE);
       lives_widget_set_sensitive(mt->view_sel_events,TRUE);
-    }
-    else {
-      lives_widget_set_sensitive (mt->playsel,FALSE);
-      lives_widget_set_sensitive (mt->fx_region, FALSE);
-      lives_widget_set_sensitive (mt->ins_gap_cur, FALSE);
-      lives_widget_set_sensitive (mt->ins_gap_sel, FALSE);
-      lives_widget_set_sensitive (mt->remove_gaps, FALSE);
-      lives_widget_set_sensitive (mt->remove_first_gaps, FALSE);
-    }
-    if (mt->region_start==mt->region_end) lives_widget_queue_draw (mt->timeline);
-  }
-  else {
-    if (eventbox!=mt->timeline_reg) mt_tl_move(mt,pos-lives_ruler_get_value(LIVES_RULER(mt->timeline)));
-    lives_widget_set_sensitive (mt->fx_region, FALSE);
-    lives_widget_set_sensitive (mt->ins_gap_cur, FALSE);
-    lives_widget_set_sensitive (mt->ins_gap_sel, FALSE);
-    lives_widget_set_sensitive (mt->playsel,FALSE);
-    lives_widget_set_sensitive (mt->remove_gaps, FALSE);
-    lives_widget_set_sensitive (mt->remove_first_gaps, FALSE);
-    if (mt->init_event!=NULL&&mt->poly_state==POLY_PARAMS) 
+    } else {
+      lives_widget_set_sensitive(mt->playsel,FALSE);
+      lives_widget_set_sensitive(mt->fx_region, FALSE);
+      lives_widget_set_sensitive(mt->ins_gap_cur, FALSE);
+      lives_widget_set_sensitive(mt->ins_gap_sel, FALSE);
+      lives_widget_set_sensitive(mt->remove_gaps, FALSE);
+      lives_widget_set_sensitive(mt->remove_first_gaps, FALSE);
+    }
+    if (mt->region_start==mt->region_end) lives_widget_queue_draw(mt->timeline);
+  } else {
+    if (eventbox!=mt->timeline_reg) mt_tl_move(mt,pos);
+    lives_widget_set_sensitive(mt->fx_region, FALSE);
+    lives_widget_set_sensitive(mt->ins_gap_cur, FALSE);
+    lives_widget_set_sensitive(mt->ins_gap_sel, FALSE);
+    lives_widget_set_sensitive(mt->playsel,FALSE);
+    lives_widget_set_sensitive(mt->remove_gaps, FALSE);
+    lives_widget_set_sensitive(mt->remove_first_gaps, FALSE);
+    if (mt->init_event!=NULL&&mt->poly_state==POLY_PARAMS)
       lives_spin_button_set_value(LIVES_SPIN_BUTTON(mt->node_spinbutton),pos-get_event_timecode(mt->init_event)/U_SEC);
   }
 
   lives_spin_button_set_value(LIVES_SPIN_BUTTON(mt->spinbutton_start),mt->region_start);
   lives_spin_button_set_value(LIVES_SPIN_BUTTON(mt->spinbutton_end),mt->region_end);
 
-  pos=lives_ruler_get_value(LIVES_RULER(mt->timeline));
+  pos=mt->ptr_time;
   if (pos>mt->region_end-1./mt->fps) lives_widget_set_sensitive(mt->tc_to_rs,FALSE);
   else lives_widget_set_sensitive(mt->tc_to_rs,TRUE);
   if (pos<mt->region_start+1./mt->fps) lives_widget_set_sensitive(mt->tc_to_re,FALSE);
@@ -18116,9 +18447,9 @@
 
   lives_widget_set_sensitive(mt->fx_region_1,FALSE);
   lives_widget_set_sensitive(mt->fx_region_2,FALSE);
-  
+
   if (mt->selected_tracks!=NULL&&mt->region_end!=mt->region_start) {
-    switch (g_list_length(mt->selected_tracks)) {
+    switch (lives_list_length(mt->selected_tracks)) {
     case 1:
       lives_widget_set_sensitive(mt->fx_region_1,TRUE);
       lives_widget_set_sensitive(mt->fx_region_1v,TRUE);
@@ -18142,15 +18473,17 @@
 }
 
 
-boolean on_timeline_press (LiVESWidget *widget, LiVESXEventButton *event, gpointer user_data) {
+boolean on_timeline_press(LiVESWidget *widget, LiVESXEventButton *event, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   int x;
   double pos;
 
+  if (!mainw->interactive) return FALSE;
+
   if (mainw->playing_file>-1) return FALSE;
 
-  lives_widget_get_pointer((LiVESXDevice *)mainw->mgeom[prefs->gui_monitor>0?prefs->gui_monitor-1:0].mouse_device, 
-			   widget, &x, NULL);
+  lives_widget_get_pointer((LiVESXDevice *)mainw->mgeom[prefs->gui_monitor>0?prefs->gui_monitor-1:0].mouse_device,
+                           widget, &x, NULL);
   pos=get_time_from_x(mt,x);
   if (widget==mt->timeline_reg) {
     mt->region_start=mt->region_end=mt->region_init=pos;
@@ -18160,7 +18493,7 @@
 
   if (widget==mt->timeline_eb) {
     mt->fm_edit_event=NULL;
-    mt_tl_move(mt,pos-lives_ruler_get_value(LIVES_RULER(mt->timeline)));
+    mt_tl_move(mt,pos);
     mt->tl_mouse=TRUE;
   }
 
@@ -18170,7 +18503,7 @@
 }
 
 
-weed_plant_t *get_prev_fm (lives_mt *mt, int current_track, weed_plant_t *event) {
+weed_plant_t *get_prev_fm(lives_mt *mt, int current_track, weed_plant_t *event) {
   weed_plant_t *event2,*event3,*eventx;
 
   if (event==NULL) return NULL;
@@ -18190,17 +18523,16 @@
       event3=get_filter_map_before(event2,current_track,NULL);
 
       if (!compare_filter_maps(event3,eventx,current_track)) {
-	event=event2=event3;
-	break; // continue with event 3
+        event=event2=event3;
+        break; // continue with event 3
       }
       eventx=event3;
     }
-  }
-  else {
+  } else {
     if ((event2=get_prev_frame_event(event))==NULL) return NULL;
 
     event2=get_filter_map_before(event2,current_track,NULL);
-    
+
     if (event2==NULL) return NULL;
   }
 
@@ -18226,7 +18558,7 @@
 }
 
 
-weed_plant_t *get_next_fm (lives_mt *mt, int current_track, weed_plant_t *event) {
+weed_plant_t *get_next_fm(lives_mt *mt, int current_track, weed_plant_t *event) {
   weed_plant_t *event2,*event3;
 
   if (event==NULL) return NULL;
@@ -18263,14 +18595,14 @@
 static void add_mark_at(lives_mt *mt, double time) {
   lives_painter_t *cr;
 
-  gchar *tstring=g_strdup_printf("%.6f",time);
+  char *tstring=lives_strdup_printf("%.6f",time);
   int offset;
 
   lives_widget_set_sensitive(mt->clear_marks,TRUE);
-  mt->tl_marks=g_list_append(mt->tl_marks,tstring);
+  mt->tl_marks=lives_list_append(mt->tl_marks,tstring);
   offset=(time-mt->tl_min)/(mt->tl_max-mt->tl_min)*(double)lives_widget_get_allocation_width(mt->timeline);
 
-  cr = lives_painter_create_from_widget (mt->timeline_reg);
+  cr = lives_painter_create_from_widget(mt->timeline_reg);
 
   lives_painter_set_source_rgb(cr,0.,0.,1.);
 
@@ -18284,50 +18616,50 @@
 
 
 
-boolean mt_mark_callback (LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, gpointer user_data) {
+boolean mt_mark_callback(LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   double cur_time;
 
   if (mainw->playing_file==-1) return TRUE;
 
-  cur_time=lives_ruler_get_value(LIVES_RULER(mt->timeline));
+  cur_time=mt->ptr_time;
 
   add_mark_at(mt, cur_time);
   return TRUE;
 }
 
 
-void on_fx_insa_clicked  (LiVESWidget *button, gpointer user_data) {
+void on_fx_insa_clicked(LiVESWidget *button, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   mt->fx_order=FX_ORD_AFTER;
   lives_widget_set_sensitive(mt->fx_ibefore_button,FALSE);
   lives_widget_set_sensitive(mt->fx_iafter_button,FALSE);
 
   clear_context(mt);
-  add_context_label (mt,(_("Click on another effect,")));
-  add_context_label (mt,(_("and the selected one\nwill be inserted")));
-  add_context_label (mt,(_("after it.\n")));
+  add_context_label(mt,(_("Click on another effect,")));
+  add_context_label(mt,(_("and the selected one\nwill be inserted")));
+  add_context_label(mt,(_("after it.\n")));
 
 }
 
-void on_fx_insb_clicked  (LiVESWidget *button, gpointer user_data) {
+void on_fx_insb_clicked(LiVESWidget *button, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   mt->fx_order=FX_ORD_BEFORE;
   lives_widget_set_sensitive(mt->fx_ibefore_button,FALSE);
   lives_widget_set_sensitive(mt->fx_iafter_button,FALSE);
 
   clear_context(mt);
-  add_context_label (mt,(_("Click on another effect,")));
-  add_context_label (mt,(_("and the selected one\nwill be inserted")));
-  add_context_label (mt,(_("before it.\n")));
+  add_context_label(mt,(_("Click on another effect,")));
+  add_context_label(mt,(_("and the selected one\nwill be inserted")));
+  add_context_label(mt,(_("before it.\n")));
 }
 
 
 
-void on_prev_fm_clicked  (LiVESWidget *button, gpointer user_data) {
+void on_prev_fm_clicked(LiVESWidget *button, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   weed_timecode_t tc;
-  double secs=lives_ruler_get_value(LIVES_RULER(mt->timeline));
+  double secs=mt->ptr_time;
   tc=q_gint64(secs*U_SEC,mt->fps);
   weed_plant_t *event;
 
@@ -18337,15 +18669,15 @@
 
   if (event!=NULL) tc=get_event_timecode(event);
 
-  mt_tl_move(mt,tc/U_SEC-lives_ruler_get_value(LIVES_RULER(mt->timeline)));
+  mt_tl_move(mt,tc/U_SEC);
 }
 
 
-void on_next_fm_clicked  (LiVESWidget *button, gpointer user_data) {
+void on_next_fm_clicked(LiVESWidget *button, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   weed_timecode_t tc;
   weed_plant_t *event;
-  double secs=lives_ruler_get_value(LIVES_RULER(mt->timeline));
+  double secs=mt->ptr_time;
   tc=q_gint64(secs*U_SEC,mt->fps);
 
   event=get_frame_event_at(mt->event_list,tc,mt->fm_edit_event,TRUE);
@@ -18354,7 +18686,7 @@
 
   if (event!=NULL) tc=get_event_timecode(event);
 
-  mt_tl_move(mt,tc/U_SEC-lives_ruler_get_value(LIVES_RULER(mt->timeline)));
+  mt_tl_move(mt,tc/U_SEC);
 
 }
 
@@ -18369,7 +18701,7 @@
 
   if (pchain==NULL) return tc;
 
-  for (i=0;i<num_params;i++) {
+  for (i=0; i<num_params; i++) {
     event=(weed_plant_t *)pchain[i];
     while (event!=NULL&&(ev_tc=get_event_timecode(event))<tc) {
       if (ev_tc>prev_tc) prev_tc=ev_tc;
@@ -18389,9 +18721,9 @@
 
   if (pchain==NULL) return tc;
 
-  for (i=0;i<num_params;i++) {
+  for (i=0; i<num_params; i++) {
     event=(weed_plant_t *)pchain[i];
-    while (event!=NULL&&(ev_tc=get_event_timecode(event))<=tc) 
+    while (event!=NULL&&(ev_tc=get_event_timecode(event))<=tc)
       event=(weed_plant_t *)weed_get_voidptr_value(event,"next_change",&error);
     if (event!=NULL) {
       if (next_tc==-1||ev_tc<next_tc) next_tc=ev_tc;
@@ -18407,7 +18739,7 @@
   weed_plant_t *event;
   weed_timecode_t ev_tc;
 
-  for (i=0;i<num_params;i++) {
+  for (i=0; i<num_params; i++) {
     event=(weed_plant_t *)pchain[i];
     ev_tc=-1;
     while (event!=NULL&&(ev_tc=get_event_timecode(event))<tc) event=(weed_plant_t *)weed_get_voidptr_value(event,"next_change",&error);
@@ -18419,7 +18751,7 @@
 
 
 // apply the param changes and update widgets
-void on_node_spin_value_changed (LiVESSpinButton *spinbutton, gpointer user_data) {
+void on_node_spin_value_changed(LiVESSpinButton *spinbutton, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   weed_timecode_t init_tc=get_event_timecode(mt->init_event);
   weed_timecode_t otc=lives_spin_button_get_value(spinbutton)*U_SEC+init_tc;
@@ -18427,22 +18759,21 @@
   double timesecs;
   boolean auto_prev=mt->opts.fx_auto_preview;
 
-  lives_signal_handlers_block_by_func(spinbutton,(gpointer)on_node_spin_value_changed,(gpointer)mt);
+  lives_signal_handlers_block_by_func(spinbutton,(livespointer)on_node_spin_value_changed,(livespointer)mt);
 
   if (!mt->block_tl_move) {
     timesecs=otc/U_SEC;
     mt->block_node_spin=TRUE;
-    mt_tl_move(mt,timesecs-lives_ruler_get_value(LIVES_RULER(mt->timeline)));
+    mt_tl_move(mt,timesecs);
     mt->block_node_spin=FALSE;
   }
 
   if (mt->prev_fx_time==0.||tc==init_tc) {
     add_mt_param_box(mt); // sensitise/desensitise reinit params
-  }
-  else mt->prev_fx_time=mt_get_effect_time(mt);
+  } else mt->prev_fx_time=mt_get_effect_time(mt);
 
   interpolate_params((weed_plant_t *)mt->current_rfx->source,pchain,tc);
-  
+
   set_params_unchanged(mt->current_rfx);
 
   get_track_index(mt,tc);
@@ -18452,7 +18783,7 @@
   mainw->block_param_updates=TRUE;
   update_visual_params(mt->current_rfx,TRUE);
   mainw->block_param_updates=FALSE;
-  
+
   mt->opts.fx_auto_preview=auto_prev;
 
   if (get_prev_node_tc(mt,tc)>-1) lives_widget_set_sensitive(mt->prev_node_button,TRUE);
@@ -18464,18 +18795,17 @@
   if (is_node_tc(mt,tc)) {
     lives_widget_set_sensitive(mt->del_node_button,TRUE);
     lives_widget_set_sensitive(mt->apply_fx_button,FALSE);
-  }
-  else lives_widget_set_sensitive(mt->del_node_button,FALSE);
+  } else lives_widget_set_sensitive(mt->del_node_button,FALSE);
 
   if (mt->current_track>=0) {
     if (mt->opts.fx_auto_preview||mainw->play_window!=NULL) mt_show_current_frame(mt, FALSE);
   }
 
-  lives_signal_handlers_unblock_by_func(spinbutton,(gpointer)on_node_spin_value_changed,(gpointer)mt);
+  lives_signal_handlers_unblock_by_func(spinbutton,(livespointer)on_node_spin_value_changed,(livespointer)mt);
 }
 
 // node buttons
-void on_next_node_clicked  (LiVESWidget *button, gpointer user_data) {
+void on_next_node_clicked(LiVESWidget *button, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   weed_timecode_t init_tc=get_event_timecode(mt->init_event);
   weed_timecode_t tc=q_gint64(lives_spin_button_get_value(LIVES_SPIN_BUTTON(mt->node_spinbutton))*U_SEC+init_tc,mt->fps);
@@ -18486,7 +18816,7 @@
 }
 
 
-void on_prev_node_clicked  (LiVESWidget *button, gpointer user_data) {
+void on_prev_node_clicked(LiVESWidget *button, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   weed_timecode_t init_tc=get_event_timecode(mt->init_event);
   weed_timecode_t tc=q_gint64(lives_spin_button_get_value(LIVES_SPIN_BUTTON(mt->node_spinbutton))*U_SEC+init_tc,mt->fps);
@@ -18497,49 +18827,57 @@
 }
 
 
-void on_del_node_clicked  (LiVESWidget *button, gpointer user_data) {
+void on_del_node_clicked(LiVESWidget *button, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
-  int i,error;
+
+  int error;
+
+  weed_plant_t **in_params=weed_get_plantptr_array((weed_plant_t *)mt->current_rfx->source,"in_parameters",&error);
+
   weed_plant_t *event;
-  weed_timecode_t ev_tc;
-  weed_timecode_t tc=q_gint64(lives_spin_button_get_value(LIVES_SPIN_BUTTON(mt->node_spinbutton))*U_SEC+get_event_timecode(mt->init_event),mt->fps);
   weed_plant_t *prev_pchange,*next_pchange;
-  gchar *filter_name,*text;
+
+  weed_timecode_t ev_tc;
+  weed_timecode_t tc=q_gint64(lives_spin_button_get_value(LIVES_SPIN_BUTTON(mt->node_spinbutton))*U_SEC+
+                              get_event_timecode(mt->init_event),mt->fps);
+
+  char *filter_name;
+
   int num_params=num_in_params((weed_plant_t *)mt->current_rfx->source,FALSE,FALSE);
-  weed_plant_t **in_params=weed_get_plantptr_array((weed_plant_t *)mt->current_rfx->source,"in_parameters",&error);
 
-  for (i=0;i<num_params;i++) {
+  register int i;
+
+
+  for (i=0; i<num_params; i++) {
     event=(weed_plant_t *)pchain[i];
     ev_tc=-1;
-    while (event!=NULL&&(ev_tc=get_event_timecode(event))<tc) 
+    while (event!=NULL&&(ev_tc=get_event_timecode(event))<tc)
       event=(weed_plant_t *)weed_get_voidptr_value(event,"next_change",&error);
     if (ev_tc==tc) {
       prev_pchange=(weed_plant_t *)weed_get_voidptr_value(event,"prev_change",&error);
       next_pchange=(weed_plant_t *)weed_get_voidptr_value(event,"next_change",&error);
       if (event!=pchain[i]) {
-	delete_event(mt->event_list,event);
-	if (prev_pchange!=NULL) weed_set_voidptr_value(prev_pchange,"next_change",next_pchange);
-	if (next_pchange!=NULL) weed_set_voidptr_value(next_pchange,"prev_change",prev_pchange);
-      }
-      else {
-	// is initial pchange, reset to defaults, c.f. paramspecial.c
-	weed_plant_t *param=in_params[i];
-	weed_plant_t *paramtmpl=weed_get_plantptr_value(param,"template",&error);
-	if (weed_plant_has_leaf(paramtmpl,"host_default")) {
-	  weed_leaf_copy(event,"value",paramtmpl,"host_default");
-	}
-	else weed_leaf_copy(event,"value",paramtmpl,"default");
-	if (is_perchannel_multiw(param)) {
-	  int num_in_tracks=weed_leaf_num_elements(mt->init_event,"in_tracks");
-	  fill_param_vals_to(event,paramtmpl,num_in_tracks-1);
-	}
+        delete_event(mt->event_list,event);
+        if (prev_pchange!=NULL) weed_set_voidptr_value(prev_pchange,"next_change",next_pchange);
+        if (next_pchange!=NULL) weed_set_voidptr_value(next_pchange,"prev_change",prev_pchange);
+      } else {
+        // is initial pchange, reset to defaults, c.f. paramspecial.c
+        weed_plant_t *param=in_params[i];
+        weed_plant_t *paramtmpl=weed_get_plantptr_value(param,"template",&error);
+        if (weed_plant_has_leaf(paramtmpl,"host_default")) {
+          weed_leaf_copy(event,"value",paramtmpl,"host_default");
+        } else weed_leaf_copy(event,"value",paramtmpl,"default");
+        if (is_perchannel_multiw(param)) {
+          int num_in_tracks=weed_leaf_num_elements(mt->init_event,"in_tracks");
+          fill_param_vals_to(event,paramtmpl,num_in_tracks-1);
+        }
       }
     }
   }
-  weed_free(in_params);
+  lives_free(in_params);
 
   if (mt->current_fx==mt->avol_fx&&mt->avol_init_event!=NULL&&mt->aparam_view_list!=NULL) {
-    GList *slist=mt->audio_draws;
+    LiVESList *slist=mt->audio_draws;
     while (slist!=NULL) {
       lives_widget_queue_draw((LiVESWidget *)slist->data);
       slist=slist->next;
@@ -18548,12 +18886,10 @@
 
   filter_name=weed_filter_idx_get_name(mt->current_fx);
 
-  text=g_strdup_printf(_("Removed parameter values for effect %s at time %.4f\n"),filter_name,tc);
-  d_print(text);
-  g_free(text);
-  g_free(filter_name);
+  d_print(_("Removed parameter values for effect %s at time %.4f\n"),filter_name,tc);
+  lives_free(filter_name);
   mt->block_tl_move=TRUE;
-  on_node_spin_value_changed(LIVES_SPIN_BUTTON(mt->node_spinbutton),(gpointer)mt);
+  on_node_spin_value_changed(LIVES_SPIN_BUTTON(mt->node_spinbutton),(livespointer)mt);
   mt->block_tl_move=FALSE;
   lives_widget_set_sensitive(mt->del_node_button,FALSE);
   if (mt->current_track>=0) {
@@ -18566,7 +18902,7 @@
 }
 
 
-void mt_fixup_events(lives_mt * mt, weed_plant_t *old_event, weed_plant_t *new_event) {
+void mt_fixup_events(lives_mt *mt, weed_plant_t *old_event, weed_plant_t *new_event) {
   // if any "notable" events have changed, we should repoint them here
 
   if (mt==NULL) return;
@@ -18594,7 +18930,7 @@
 }
 
 
-static void combine_ign (weed_plant_t *xnew, weed_plant_t *xold) {
+static void combine_ign(weed_plant_t *xnew, weed_plant_t *xold) {
   int num,numo,*nign,*oign,i,error;
 
   // combine "ignore" values using NAND
@@ -18603,10 +18939,10 @@
   numo=weed_leaf_num_elements(xnew,"ignore");
   oign=weed_get_boolean_array(xold,"ignore",&error);
   nign=weed_get_boolean_array(xnew,"ignore",&error);
-  for (i=0;i<num;i++) if (i>=numo||oign[i]==WEED_FALSE) nign[i]=WEED_FALSE;
+  for (i=0; i<num; i++) if (i>=numo||oign[i]==WEED_FALSE) nign[i]=WEED_FALSE;
   weed_set_boolean_array(xnew,"ignore",num,nign);
-  weed_free(oign);
-  weed_free(nign);
+  lives_free(oign);
+  lives_free(nign);
 }
 
 
@@ -18629,8 +18965,7 @@
     if (event==pchain[index]) weed_leaf_delete(pchange,"ignore"); // never ignore our init pchanges
     if (weed_plant_has_leaf(pchange,"ignore")) combine_ign(pchange,event);
     delete_event(event_list,event);
-  }
-  else {
+  } else {
     weed_set_voidptr_value(pchange,"next_change",event);
     if (event!=NULL) weed_set_voidptr_value(event,"prev_change",pchange);
   }
@@ -18642,7 +18977,7 @@
     void **in_params=weed_get_voidptr_array(init_event,"in_parameters",&error);
     in_params[index]=pchain[index]=(void *)pchange;
     weed_set_voidptr_array(init_event,"in_parameters",numin,in_params);
-    weed_free(in_params);
+    lives_free(in_params);
   }
   weed_set_voidptr_value(pchange,"prev_change",last_event);
 }
@@ -18657,34 +18992,42 @@
       mainw->no_interp=FALSE;
     }
     if (mt->apply_fx_button!=NULL) lives_widget_set_sensitive(mt->apply_fx_button,TRUE);
-  }
-  else mt_show_current_frame(mt, FALSE);
+  } else mt_show_current_frame(mt, FALSE);
 }
 
 
-void on_set_pvals_clicked  (LiVESWidget *button, gpointer user_data) {
+void on_set_pvals_clicked(LiVESWidget *button, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
+
   weed_plant_t *inst=(weed_plant_t *)mt->current_rfx->source;
   weed_plant_t *param,*pchange,*at_event;
-  gchar *filter_name,*text;
-  gchar *tname,*track_desc;
-  int i,error;
-  weed_timecode_t tc=q_gint64(lives_spin_button_get_value(LIVES_SPIN_BUTTON(mt->node_spinbutton))*U_SEC+get_event_timecode(mt->init_event),mt->fps);
-  int numtracks;
+
+  int error;
+
+  weed_timecode_t tc=q_gint64(lives_spin_button_get_value(LIVES_SPIN_BUTTON(mt->node_spinbutton))*U_SEC+
+                              get_event_timecode(mt->init_event),mt->fps);
+
   int *tracks;
   int *ign;
+
+  char *tmp,*tmp2;
+  char *filter_name;
+  char *tname,*track_desc;
+
   boolean has_multi=FALSE;
   boolean was_changed=FALSE;
-  gchar *tmp,*tmp2;
+
+  int numtracks;
+  register int i;
 
   if (mt->idlefunc>0) {
-    g_source_remove(mt->idlefunc);
+    lives_source_remove(mt->idlefunc);
     mt->idlefunc=0;
   }
 
   lives_widget_set_sensitive(mt->apply_fx_button,FALSE);
 
-  for (i=0;((param=weed_inst_in_param(inst,i,FALSE,FALSE))!=NULL);i++) {
+  for (i=0; ((param=weed_inst_in_param(inst,i,FALSE,FALSE))!=NULL); i++) {
     if (!mt->current_rfx->params[i].changed) continue; // set only user changed parameters
     pchange=weed_plant_new(WEED_PLANT_EVENT);
     weed_set_int_value(pchange,"hint",WEED_EVENT_HINT_PARAM_CHANGE);
@@ -18694,23 +19037,21 @@
     if (is_perchannel_multiw(param)) {
       int num_vals,j;
       if (mt->track_index==-1) {
-	weed_plant_free(pchange);
-	continue;
+        weed_plant_free(pchange);
+        continue;
       }
       has_multi=TRUE;
       num_vals=weed_leaf_num_elements(param,"value");
-      ign=(int *)g_malloc(num_vals*sizint);
-      for (j=0;j<num_vals;j++) {
-	if (j==mt->track_index) {
-	  ign[j]=WEED_FALSE;
-	  was_changed=TRUE;
-	}
-	else ign[j]=WEED_TRUE;
+      ign=(int *)lives_malloc(num_vals*sizint);
+      for (j=0; j<num_vals; j++) {
+        if (j==mt->track_index) {
+          ign[j]=WEED_FALSE;
+          was_changed=TRUE;
+        } else ign[j]=WEED_TRUE;
       }
       weed_set_boolean_array(pchange,"ignore",num_vals,ign);
-      g_free(ign);
-    }
-    else was_changed=TRUE;
+      lives_free(ign);
+    } else was_changed=TRUE;
 
     weed_leaf_copy(pchange,"value",param,"value");
     weed_add_plant_flags(pchange,WEED_LEAF_READONLY_PLUGIN);
@@ -18733,40 +19074,38 @@
   switch (numtracks) {
   case 1:
     tname=lives_fx_cat_to_text(LIVES_FX_CAT_EFFECT,FALSE); // effect
-    track_desc=g_strdup_printf(_("track %s"),(tmp=get_track_name(mt,tracks[0],FALSE)));
-    g_free(tmp);
+    track_desc=lives_strdup_printf(_("track %s"),(tmp=get_track_name(mt,tracks[0],FALSE)));
+    lives_free(tmp);
     break;
   case 2:
     tname=lives_fx_cat_to_text(LIVES_FX_CAT_TRANSITION,FALSE); // transition
-    track_desc=g_strdup_printf(_("tracks %s and %s"),(tmp=get_track_name(mt,tracks[0],FALSE)),(tmp2=get_track_name(mt,tracks[1],FALSE)));
-    g_free(tmp);
-    g_free(tmp2);
+    track_desc=lives_strdup_printf(_("tracks %s and %s"),(tmp=get_track_name(mt,tracks[0],FALSE)),(tmp2=get_track_name(mt,tracks[1],FALSE)));
+    lives_free(tmp);
+    lives_free(tmp2);
     break;
   default:
     tname=lives_fx_cat_to_text(LIVES_FX_CAT_COMPOSITOR,FALSE); // compositor
     if (has_multi) {
-      track_desc=g_strdup_printf(_("track %s"),(tmp=get_track_name(mt,mt->current_track,mt->aud_track_selected)));
-      g_free(tmp);
-    }
-    else track_desc=g_strdup(_("selected tracks"));
+      track_desc=lives_strdup_printf(_("track %s"),(tmp=get_track_name(mt,mt->current_track,mt->aud_track_selected)));
+      lives_free(tmp);
+    } else track_desc=lives_strdup(_("selected tracks"));
     break;
   }
-  weed_free(tracks);
+  lives_free(tracks);
   if (mt->current_fx==mt->avol_fx) {
-    g_free(tname);
-    tname=g_strdup(_("audio"));
+    lives_free(tname);
+    tname=lives_strdup(_("audio"));
   }
-  text=g_strdup_printf(_("Set parameter values for %s %s on %s at time %.4f\n"),tname,filter_name,track_desc,tc/U_SEC);
-  d_print(text);
-  g_free(text);
-  g_free(filter_name);
-  g_free(tname);
-  g_free(track_desc);
+
+  d_print(_("Set parameter values for %s %s on %s at time %.4f\n"),tname,filter_name,track_desc,tc/U_SEC);
+  lives_free(filter_name);
+  lives_free(tname);
+  lives_free(track_desc);
 
   lives_widget_set_sensitive(mt->del_node_button,TRUE);
 
   if (mt->current_fx==mt->avol_fx&&mt->avol_init_event!=NULL&&mt->aparam_view_list!=NULL) {
-    GList *slist=mt->audio_draws;
+    LiVESList *slist=mt->audio_draws;
     while (slist!=NULL) {
       lives_widget_queue_draw((LiVESWidget *)slist->data);
       slist=slist->next;
@@ -18789,13 +19128,13 @@
 
 
 
-GList *load_layout_map(void) {
+LiVESList *load_layout_map(void) {
   // load in a layout "map" for the set, [create mainw->current_layouts_map]
 
   // the layout.map file maps clip "unique_id" and "handle" stored in the header.lives file and matches it with
-  // the track numbers in the any layout file (.lay) file for that set
+  // the clip numbers in each layout file (.lay) file for that set
 
-  // [thus a layout could be transferred to another set and the unique_id's/handles altered, 
+  // [thus a layout could be transferred to another set and the unique_id's/handles altered,
   // one could use a layout.map and a layout file as a template for
   // rendering many different sets]
 
@@ -18803,17 +19142,17 @@
   // this is called from recover_layout_map() in saveplay.c, where the map entries are assigned
   // to files (clips)
 
-  gchar **array;
-  GList *lmap=NULL;
+  char **array;
+  LiVESList *lmap=NULL;
   layout_map *lmap_entry;
   uint64_t unique_id;
   ssize_t bytes;
 
-  gchar *lmap_name=g_build_filename(prefs->tmpdir,mainw->set_name,"layouts","layout.map",NULL);
-  gchar *handle;
-  gchar *entry;
-  gchar *string;
-  gchar *name;
+  char *lmap_name=lives_build_filename(prefs->tmpdir,mainw->set_name,"layouts","layout.map",NULL);
+  char *handle;
+  char *entry;
+  char *string;
+  char *name;
 
   int len,nm,i;
   int fd;
@@ -18821,95 +19160,107 @@
 
   boolean err=FALSE;
 
-  if (!g_file_test(lmap_name,G_FILE_TEST_EXISTS)) {
-    g_free(lmap_name);
+  if (!lives_file_test(lmap_name,LIVES_FILE_TEST_EXISTS)) {
+    lives_free(lmap_name);
     return NULL;
   }
 
-  do { 
+  do {
     retval=0;
     fd=open(lmap_name,O_RDONLY);
     if (fd<0) {
       retval=do_read_failed_error_s_with_retry(lmap_name,NULL,NULL);
-    }
-    else {
+    } else {
       while (1) {
-	bytes=lives_read_le_buffered(fd,&len,4,TRUE);
-	if (bytes<4) {
-	  break;
-	}
-	handle=(gchar *)g_malloc(len+1);
-	bytes=lives_read_buffered(fd,handle,len,TRUE);
-	if (bytes<len) {
-	  break;
-	}
-	memset(handle+len,0,1);
-	bytes=lives_read_le_buffered(fd,&unique_id,8,TRUE);
-	if (bytes<8) {
-	  break;
-	}
-	bytes=lives_read_le_buffered(fd,&len,4,TRUE);
-	if (bytes<4) {
-	  break;
-	}
-	name=(gchar *)g_malloc(len+1);
-	bytes=lives_read_buffered(fd,name,len,TRUE);
-	if (bytes<len) {
-	  break;
-	}
-	memset(name+len,0,1);
-	bytes=lives_read_le_buffered(fd,&nm,4,TRUE);
-	if (bytes<4) {
-	  break;
-	}
-	
-	lmap_entry=(layout_map *)g_malloc(sizeof(layout_map));
-	lmap_entry->handle=handle;
-	lmap_entry->unique_id=unique_id;
-	lmap_entry->name=name;
-	lmap_entry->list=NULL;
-	
-	for (i=0;i<nm;i++) {
-	  bytes=lives_read_le_buffered(fd,&len,4,TRUE);
-	  if (bytes<sizint) {
-	    err=TRUE;
-	    break;
-	  }
-	  entry=(gchar *)g_malloc(len+1);
-	  bytes=lives_read_buffered(fd,entry,len,TRUE);
-	  if (bytes<len) {
-	    err=TRUE;
-	    break;
-	  }
-	  memset(entry+len,0,1);
-	  string=repl_tmpdir(entry,FALSE); // allow relocation of tmpdir
-	  lmap_entry->list=g_list_append(lmap_entry->list,g_strdup(string));
-	  array=g_strsplit(string,"|",-1);
-	  g_free(string);
-	  mainw->current_layouts_map=g_list_append_unique(mainw->current_layouts_map,array[0]);
-	  g_strfreev(array);
-	  g_free(entry);
-	}
-	if (err) break;
-	lmap=g_list_append(lmap,lmap_entry);
+        bytes=lives_read_le_buffered(fd,&len,4,TRUE);
+        if (bytes<4) {
+          break;
+        }
+        handle=(char *)lives_malloc(len+1);
+        bytes=lives_read_buffered(fd,handle,len,TRUE);
+        if (bytes<len) {
+          break;
+        }
+        memset(handle+len,0,1);
+        bytes=lives_read_le_buffered(fd,&unique_id,8,TRUE);
+        if (bytes<8) {
+          break;
+        }
+        bytes=lives_read_le_buffered(fd,&len,4,TRUE);
+        if (bytes<4) {
+          break;
+        }
+        name=(char *)lives_malloc(len+1);
+        bytes=lives_read_buffered(fd,name,len,TRUE);
+        if (bytes<len) {
+          break;
+        }
+        memset(name+len,0,1);
+        bytes=lives_read_le_buffered(fd,&nm,4,TRUE);
+        if (bytes<4) {
+          break;
+        }
+
+        ////////////////////////////////////////////////////////////
+        // this is one mapping entry (actually only the unique id matters)
+        lmap_entry=(layout_map *)lives_malloc(sizeof(layout_map));
+        lmap_entry->handle=handle;
+        lmap_entry->unique_id=unique_id;
+        lmap_entry->name=name;
+        lmap_entry->list=NULL;
+        ///////////////////////////////////////////
+
+        //////////////////////////////////////////////
+        // now we read in a list of layouts this clip is used in, and create mainw->current_layouts_map
+
+        // format is:
+        // layout_file_filename|clip_number|max_frame_used|clip fps|max audio time|audio rate
+
+        // here we only add layout_file_filename
+
+        for (i=0; i<nm; i++) {
+          bytes=lives_read_le_buffered(fd,&len,4,TRUE);
+          if (bytes<sizint) {
+            err=TRUE;
+            break;
+          }
+          entry=(char *)lives_malloc(len+1);
+          bytes=lives_read_buffered(fd,entry,len,TRUE);
+          if (bytes<len) {
+            err=TRUE;
+            break;
+          }
+          memset(entry+len,0,1);
+          string=repl_tmpdir(entry,FALSE); // allow relocation of tmpdir
+          lmap_entry->list=lives_list_append(lmap_entry->list,lives_strdup(string));
+          array=lives_strsplit(string,"|",-1);
+          lives_free(string);
+          mainw->current_layouts_map=lives_list_append_unique(mainw->current_layouts_map,array[0]);
+          lives_strfreev(array);
+          lives_free(entry);
+        }
+        if (err) break;
+        lmap=lives_list_append(lmap,lmap_entry);
       }
     }
 
+    ////////////////////////////////////////////////////////////////////////////
+
     if (fd>=0) lives_close_buffered(fd);
 
     if (err) {
       retval=do_read_failed_error_s_with_retry(lmap_name,NULL,NULL);
     }
-  } while (retval==LIVES_RETRY);
+  } while (retval==LIVES_RESPONSE_RETRY);
 
-  g_free(lmap_name);
+  lives_free(lmap_name);
   return lmap;
 }
 
 
 
 
-void save_layout_map (int *lmap, double *lmap_audio, const gchar *file, const gchar *dir) {
+void save_layout_map(int *lmap, double *lmap_audio, const char *file, const char *dir) {
   // in the file "layout.map", we map each clip used in the set to which layouts (if any) it is used in
   // we also record the highest frame number used and the max audio time; and the current fps of the clip
   // and audio rate;
@@ -18921,7 +19272,7 @@
   // this was knocked together very hastily, so it could probably be improved upon
 
 
-  // layout_file_file_name|clip_number|max_frame_used|clip fps|max audio time|audio rate
+  // layout_file_filename|clip_number|max_frame_used|clip fps|max audio time|audio rate
 
 
   // when we save this to a file, we use the (int32)data_length data
@@ -18937,12 +19288,16 @@
 
   // where data is simply a text dump of the above memory format
 
-  GList *map,*map_next;
 
-  gchar *new_entry;
-  gchar *map_name,*ldir;
-  gchar *string;
-  gchar *com;
+  // lmap[] and lmap_audio[] hold the highest frame numbers and highest audio time respectively
+  // when we save a layout we update these from the current layout
+
+  LiVESList *map,*map_next;
+
+  char *new_entry;
+  char *map_name,*ldir;
+  char *string;
+  char *com;
 
   uint32_t size=0;
 
@@ -18960,99 +19315,94 @@
   if (dir==NULL&&strlen(mainw->set_name)==0) return;
 
   if (file!=NULL&&(mainw->current_layouts_map==NULL||
-		   !g_list_find(mainw->current_layouts_map,file))) 
-    mainw->current_layouts_map=g_list_append(mainw->current_layouts_map,g_strdup(file));
-  if (dir==NULL) ldir=g_build_filename(prefs->tmpdir,mainw->set_name,"layouts",NULL);
-  else ldir=g_strdup(dir);
+                   !lives_list_find(mainw->current_layouts_map,file)))
+    mainw->current_layouts_map=lives_list_append(mainw->current_layouts_map,lives_strdup(file));
+  if (dir==NULL) ldir=lives_build_filename(prefs->tmpdir,mainw->set_name,"layouts",NULL);
+  else ldir=lives_strdup(dir);
 
-  map_name=g_build_filename(ldir,"layout.map",NULL);
+  map_name=lives_build_filename(ldir,"layout.map",NULL);
 
-  g_mkdir_with_parents(ldir,S_IRWXU);
+  lives_mkdir_with_parents(ldir,S_IRWXU);
 
   do {
     retval=0;
     fd=lives_creat_buffered(map_name,DEF_FILE_PERMS);
 
     if (fd==-1) {
-      retval=do_write_failed_error_s_with_retry(map_name,g_strerror(errno),NULL);
-    }
-    else {
+      retval=do_write_failed_error_s_with_retry(map_name,lives_strerror(errno),NULL);
+    } else {
       mainw->write_failed=FALSE;
 
-      for (i=1;i<=MAX_FILES;i++) {
-	// add or update
-	if (mainw->files[i]!=NULL) {
-	  
-	  if (mainw->files[i]->layout_map!=NULL) {
-	    map=mainw->files[i]->layout_map;
-	    while (map!=NULL) {
-	      map_next=map->next;
-	      if (map->data!=NULL) {
-		gchar **array=g_strsplit((gchar *)map->data,"|",-1);
-		if ((file!=NULL&&!strcmp(array[0],file))||(file==NULL&&dir==NULL&&
-							   !g_file_test(array[0],G_FILE_TEST_EXISTS))) {
-		  // remove prior entry
-		  g_free(map->data);
-		  if (map->prev!=NULL) map->prev->next=map_next;
-		  else mainw->files[i]->layout_map=map_next;
-		  if (map_next!=NULL) map_next->prev=map->prev;
-		  map->next=map->prev=NULL;
-		  g_list_free(map);
-		  break;
-		}
-		g_strfreev(array);
-	      }
-	      map=map_next;
-	    }
-	  }
-	  
-	  if (file!=NULL&&((lmap!=NULL&&lmap[i]!=0)||(lmap_audio!=NULL&&lmap_audio[i]!=0.))) {
-	    if (lmap!=NULL) max_frame=lmap[i];
-	    else max_frame=0;
-	    if (lmap_audio!=NULL) max_atime=lmap_audio[i];
-	    else max_atime=0.;
-	    
-	    new_entry=g_strdup_printf("%s|%d|%d|%.8f|%.8f|%.8f",file,i,max_frame,mainw->files[i]->fps,
-				      max_atime,(double)((int)((double)(mainw->files[i]->arps)/
-								 (double)mainw->files[i]->arate*10000.+.5))/10000.);
-	    mainw->files[i]->layout_map=g_list_prepend(mainw->files[i]->layout_map,new_entry);
-	  }
-
-	  if ((map=mainw->files[i]->layout_map)!=NULL) {
-	    written=TRUE;
-	    len=strlen(mainw->files[i]->handle);
-	    lives_write_le_buffered(fd,&len,4,TRUE);
-	    lives_write_buffered(fd,mainw->files[i]->handle,len,TRUE);
-	    lives_write_le_buffered(fd,&mainw->files[i]->unique_id,8,TRUE);
-	    len=strlen(mainw->files[i]->name);
-	    lives_write_le_buffered(fd,&len,4,TRUE);
-	    lives_write_buffered(fd,mainw->files[i]->name,len,TRUE);
-	    len=g_list_length(map);
-	    lives_write_le_buffered(fd,&len,4,TRUE);
-	    while (map!=NULL) {
-	      string=repl_tmpdir((char *)map->data,TRUE); // allow relocation of tmpdir
-	      len=strlen(string);
-	      lives_write_le_buffered(fd,&len,4,TRUE);
-	      lives_write_buffered(fd,string,len,TRUE);
-	      g_free(string);
-	      map=map->next;
-	    }
-	  }
-	}
-	if (mainw->write_failed) break;
+      for (i=1; i<=MAX_FILES; i++) {
+        // add or update
+        if (mainw->files[i]!=NULL) {
+
+          if (mainw->files[i]->layout_map!=NULL) {
+            map=mainw->files[i]->layout_map;
+            while (map!=NULL) {
+              map_next=map->next;
+              if (map->data!=NULL) {
+                char **array=lives_strsplit((char *)map->data,"|",-1);
+                if ((file!=NULL&&!strcmp(array[0],file))||(file==NULL&&dir==NULL&&
+                    !lives_file_test(array[0],LIVES_FILE_TEST_EXISTS))) {
+                  // remove prior entry
+                  lives_free((livespointer)map->data);
+                  mainw->files[i]->layout_map=lives_list_delete_link(mainw->files[i]->layout_map,map);
+                  break;
+                }
+                lives_strfreev(array);
+              }
+              map=map_next;
+            }
+          }
+
+          if (file!=NULL&&((lmap!=NULL&&lmap[i]!=0)||(lmap_audio!=NULL&&lmap_audio[i]!=0.))) {
+            if (lmap!=NULL) max_frame=lmap[i];
+            else max_frame=0;
+            if (lmap_audio!=NULL) max_atime=lmap_audio[i];
+            else max_atime=0.;
+
+            new_entry=lives_strdup_printf("%s|%d|%d|%.8f|%.8f|%.8f",file,i,max_frame,mainw->files[i]->fps,
+                                          max_atime,(double)((int)((double)(mainw->files[i]->arps)/
+                                              (double)mainw->files[i]->arate*10000.+.5))/10000.);
+            mainw->files[i]->layout_map=lives_list_prepend(mainw->files[i]->layout_map,new_entry);
+          }
+
+          if ((map=mainw->files[i]->layout_map)!=NULL) {
+            written=TRUE;
+            len=strlen(mainw->files[i]->handle);
+            lives_write_le_buffered(fd,&len,4,TRUE);
+            lives_write_buffered(fd,mainw->files[i]->handle,len,TRUE);
+            lives_write_le_buffered(fd,&mainw->files[i]->unique_id,8,TRUE);
+            len=strlen(mainw->files[i]->name);
+            lives_write_le_buffered(fd,&len,4,TRUE);
+            lives_write_buffered(fd,mainw->files[i]->name,len,TRUE);
+            len=lives_list_length(map);
+            lives_write_le_buffered(fd,&len,4,TRUE);
+            while (map!=NULL) {
+              string=repl_tmpdir((char *)map->data,TRUE); // allow relocation of tmpdir
+              len=strlen(string);
+              lives_write_le_buffered(fd,&len,4,TRUE);
+              lives_write_buffered(fd,string,len,TRUE);
+              lives_free(string);
+              map=map->next;
+            }
+          }
+        }
+        if (mainw->write_failed) break;
       }
       if (mainw->write_failed) {
-	retval=do_write_failed_error_s_with_retry(map_name,NULL,NULL);
-	mainw->write_failed=FALSE;
+        retval=do_write_failed_error_s_with_retry(map_name,NULL,NULL);
+        mainw->write_failed=FALSE;
       }
 
     }
-    if (retval==LIVES_RETRY && fd>=0) lives_close_buffered(fd);
-  } while (retval==LIVES_RETRY);
+    if (retval==LIVES_RESPONSE_RETRY && fd>=0) lives_close_buffered(fd);
+  } while (retval==LIVES_RESPONSE_RETRY);
 
-  if (retval!=LIVES_CANCEL) {
-    size=get_file_size(fd);
+  if (retval!=LIVES_RESPONSE_CANCEL) {
     lives_close_buffered(fd);
+    size=sget_file_size(map_name);
 
     if (size==0||!written) {
       LIVES_DEBUG("Removing layout map file: ");
@@ -19063,16 +19413,16 @@
     LIVES_DEBUG("Removing layout dir: ");
     LIVES_DEBUG(ldir);
 #ifndef IS_MINGW
-    com=g_strdup_printf("/bin/rmdir \"%s\" 2>/dev/null",ldir);
+    com=lives_strdup_printf("%s \"%s\" 2>/dev/null",capable->rmdir_cmd,ldir);
 #else
-    com=g_strdup_printf("rmdir.exe \"%s\" 2>NUL",ldir);
+    com=lives_strdup_printf("rmdir.exe \"%s\" 2>NUL",ldir);
 #endif
     lives_system(com,TRUE);
-    g_free(com);
+    lives_free(com);
   }
 
-  g_free(ldir);
-  g_free(map_name);
+  lives_free(ldir);
+  lives_free(map_name);
 }
 
 
@@ -19087,9 +19437,9 @@
   // other hosts are not bound to take notice of "marker" events, so these could be absent or misplaced
   // when the layout is reloaded
 
-  GList *track_blocks=NULL;
-  GList *tlist=mt->video_draws;
-  GList *blist;
+  LiVESList *track_blocks=NULL;
+  LiVESList *tlist=mt->video_draws;
+  LiVESList *blist;
   track_rect *block;
   weed_timecode_t tc;
   LiVESWidget *eventbox;
@@ -19098,8 +19448,8 @@
 
   while (tlist!=NULL) {
     eventbox=(LiVESWidget *)tlist->data;
-    block=(track_rect *)g_object_get_data (G_OBJECT(eventbox), "blocks");
-    track_blocks=g_list_append(track_blocks,(gpointer)block);
+    block=(track_rect *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox), "blocks");
+    track_blocks=lives_list_append(track_blocks,(livespointer)block);
     tlist=tlist->next;
   }
 
@@ -19111,41 +19461,86 @@
       blist=track_blocks;
       track=0;
       while (blist!=NULL) {
-	block=(track_rect *)blist->data;
-	if (block!=NULL) {
-	  if (block->prev!=NULL&&(get_event_timecode(block->prev->end_event)==
-				  q_gint64(tc-U_SEC/mt->fps,mt->fps))&&(tc==get_event_timecode(block->start_event))&&
-	      (get_frame_event_clip(block->prev->end_event,track)==get_frame_event_clip(block->start_event,track))) {
-	    insert_marker_event_at(mt->event_list,event,EVENT_MARKER_BLOCK_START,GINT_TO_POINTER(track));
-
-	    if (mt->audio_draws!=NULL&&g_list_length(mt->audio_draws)>=track+mt->opts.back_audio_tracks) {
-	      // insert in audio too
-	      insert_marker_event_at(mt->event_list,event,EVENT_MARKER_BLOCK_START,
-				     GINT_TO_POINTER(-track-mt->opts.back_audio_tracks-1));
-	    }
-	  }
-	  if (!block->ordered)  {
-	    insert_marker_event_at(mt->event_list,event,EVENT_MARKER_BLOCK_UNORDERED,GINT_TO_POINTER(track));
-	  }
-	  if (event==block->end_event) blist->data=block->next;
-	}
-	track++;
-	blist=blist->next;
+        block=(track_rect *)blist->data;
+        if (block!=NULL) {
+          if (block->prev!=NULL&&(get_event_timecode(block->prev->end_event)==
+                                  q_gint64(tc-U_SEC/mt->fps,mt->fps))&&(tc==get_event_timecode(block->start_event))&&
+              (get_frame_event_clip(block->prev->end_event,track)==get_frame_event_clip(block->start_event,track))) {
+            insert_marker_event_at(mt->event_list,event,EVENT_MARKER_BLOCK_START,LIVES_INT_TO_POINTER(track));
+
+            if (mt->audio_draws!=NULL&&lives_list_length(mt->audio_draws)>=track+mt->opts.back_audio_tracks) {
+              // insert in audio too
+              insert_marker_event_at(mt->event_list,event,EVENT_MARKER_BLOCK_START,
+                                     LIVES_INT_TO_POINTER(-track-mt->opts.back_audio_tracks-1));
+            }
+          }
+          if (!block->ordered)  {
+            insert_marker_event_at(mt->event_list,event,EVENT_MARKER_BLOCK_UNORDERED,LIVES_INT_TO_POINTER(track));
+          }
+          if (event==block->end_event) blist->data=block->next;
+        }
+        track++;
+        blist=blist->next;
       }
     }
     event=get_next_event(event);
   }
 
-  if (track_blocks!=NULL) g_list_free(track_blocks);
+  if (track_blocks!=NULL) lives_list_free(track_blocks);
 
 }
 
 
+boolean set_new_set_name(lives_mt *mt) {
+  char new_set_name[128];
+
+  char *tmp;
+
+  boolean needs_idlefunc=FALSE;
+  boolean response;
+
+  if (mt!=NULL&&mt->idlefunc>0) {
+    lives_source_remove(mt->idlefunc);
+    mt->idlefunc=0;
+    needs_idlefunc=TRUE;
+  }
+
+  do {
+    // prompt for a set name, advise user to save set
+    renamew=create_rename_dialog(4);
+    lives_widget_show(renamew->dialog);
+    response=lives_dialog_run(LIVES_DIALOG(renamew->dialog));
+    if (response==LIVES_RESPONSE_CANCEL) {
+      lives_widget_destroy(renamew->dialog);
+      lives_free(renamew);
+      mainw->cancelled=CANCEL_USER;
+      if (mt!=NULL) {
+        mt->idlefunc=0;
+        mt->idlefunc=mt_idle_add(mt);
+        mt_sensitise(mt);
+      }
+      return FALSE;
+    }
+    lives_snprintf(new_set_name,128,"%s",(tmp=U82F(lives_entry_get_text(LIVES_ENTRY(renamew->entry)))));
+    lives_widget_destroy(renamew->dialog);
+    lives_free(renamew);
+    lives_free(tmp);
+    lives_widget_context_update();
+  } while (!is_legal_set_name(new_set_name,FALSE));
+
+  lives_snprintf(mainw->set_name,128,"%s",new_set_name);
 
+  if (needs_idlefunc) {
+    mt->idlefunc=0;
+    mt->idlefunc=mt_idle_add(mt);
+    mt_sensitise(mt);
+  }
 
+  return TRUE;
+}
 
 
-void on_save_event_list_activate (LiVESMenuItem *menuitem, gpointer user_data) {
+boolean on_save_event_list_activate(LiVESMenuItem *menuitem, livespointer user_data) {
   //  here we save a layout list (*.lay) file
 
   // we dump (serialise) the event_list plant, followed by all of its events
@@ -19154,32 +19549,37 @@
 
   // loading an event list is simply the reverse of this process
 
-  int fd;
   lives_mt *mt=(lives_mt *)user_data;
-  gchar *esave_dir;
-  gchar *esave_file;
-  gchar *msg;
-  boolean response;
-  boolean retval=TRUE;
-  gchar *filt[]={"*.lay",NULL};
-  boolean was_set=mainw->was_set;
-  gchar *com;
+
+  char *filt[]= {"*.lay",NULL};
+
   int *layout_map;
-  int retval2;
+
   double *layout_map_audio;
+
   LiVESWidget *ar_checkbutton;
   LiVESWidget *hbox;
-  boolean orig_ar_layout=prefs->ar_layout,ar_layout;
+
   weed_plant_t *event_list;
-  gchar *layout_name;
-  gchar xlayout_name[PATH_MAX];
 
+  char *layout_name;
+  char *esave_dir;
+  char *esave_file;
+  char *com;
+
+  char xlayout_name[PATH_MAX];
+
+  boolean orig_ar_layout=prefs->ar_layout,ar_layout;
+  boolean was_set=mainw->was_set;
+  boolean retval=TRUE;
+
+  int retval2;
+  int fd;
 
   if (mt==NULL) {
     event_list=mainw->stored_event_list;
     layout_name=mainw->stored_layout_name;
-  }
-  else {
+  } else {
     mt_desensitise(mt);
     event_list=mt->event_list;
     layout_name=mt->layout_name;
@@ -19192,68 +19592,47 @@
   if (mainw->scrap_file!=-1&&layout_map[mainw->scrap_file]!=0) {
     // can't save if we have generated frames
     do_layout_scrap_file_error();
-    g_free(layout_map);
-    g_free(layout_map_audio);
+    lives_free(layout_map);
+    lives_free(layout_map_audio);
     mainw->cancelled=CANCEL_USER;
     if (mt!=NULL) mt_sensitise(mt);
-    return;
+    return FALSE;
   }
 
   if (mainw->ascrap_file!=-1&&layout_map[mainw->ascrap_file]!=0) {
     // can't save if we have recorded audio
     do_layout_ascrap_file_error();
-    g_free(layout_map);
-    g_free(layout_map_audio);
+    lives_free(layout_map);
+    lives_free(layout_map_audio);
     mainw->cancelled=CANCEL_USER;
     if (mt!=NULL) mt_sensitise(mt);
-    return;
+    return FALSE;
   }
 
   if (mt!=NULL&&mt->idlefunc>0) {
-    g_source_remove(mt->idlefunc);
+    lives_source_remove(mt->idlefunc);
     mt->idlefunc=0;
   }
 
   if (strlen(mainw->set_name)>0) {
-    weed_set_string_value(event_list,"needs_set",mainw->set_name);
-  }
-  else {
-    gchar new_set_name[128];
-    do {
-      // prompt for a set name, advise user to save set
-      renamew=create_rename_dialog(4);
-      lives_widget_show(renamew->dialog);
-      response=lives_dialog_run(LIVES_DIALOG(renamew->dialog));
-      if (response==LIVES_RESPONSE_CANCEL) {
-	lives_widget_destroy(renamew->dialog);
-	g_free(renamew);
-	mainw->cancelled=CANCEL_USER;
-	if (mt!=NULL) {
-	  mt->idlefunc=0;
-	  mt->idlefunc=mt_idle_add(mt);
-	  mt_sensitise(mt);
-	}
-	return;
-      }
-      g_snprintf(new_set_name,128,"%s",lives_entry_get_text (LIVES_ENTRY (renamew->entry)));
-      lives_widget_destroy(renamew->dialog);
-      g_free(renamew);
-      lives_widget_context_update();
-    } while (!is_legal_set_name(new_set_name,FALSE));
-    g_snprintf(mainw->set_name,128,"%s",new_set_name);
-  }
-  
-  esave_dir=g_build_filename(prefs->tmpdir,mainw->set_name,"layouts",G_DIR_SEPARATOR_S,NULL);
-  g_mkdir_with_parents(esave_dir,S_IRWXU);
+    char *tmp;
+    weed_set_string_value(event_list,"needs_set",(tmp=F2U8(mainw->set_name)));
+    lives_free(tmp);
+  } else if (mainw->interactive) {
+    set_new_set_name(mt);
+  } else return FALSE;
 
-  hbox = lives_hbox_new (FALSE, 0);
+  esave_dir=lives_build_filename(prefs->tmpdir,mainw->set_name,"layouts",LIVES_DIR_SEPARATOR_S,NULL);
+  lives_mkdir_with_parents(esave_dir,S_IRWXU);
 
-  ar_checkbutton = lives_standard_check_button_new (_("_Autoreload each time"),TRUE,LIVES_BOX(hbox),NULL);
+  hbox = lives_hbox_new(FALSE, 0);
+
+  ar_checkbutton = lives_standard_check_button_new(_("_Autoreload each time"),TRUE,LIVES_BOX(hbox),NULL);
 
   lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(ar_checkbutton),prefs->ar_layout);
-  lives_signal_connect (LIVES_GUI_OBJECT (ar_checkbutton), LIVES_WIDGET_TOGGLED_EVENT,
-		    LIVES_GUI_CALLBACK (on_autoreload_toggled),
-		    GINT_TO_POINTER(2));
+  lives_signal_connect(LIVES_GUI_OBJECT(ar_checkbutton), LIVES_WIDGET_TOGGLED_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_autoreload_toggled),
+                       LIVES_INT_TO_POINTER(2));
 
   lives_widget_show_all(hbox);
 
@@ -19264,33 +19643,33 @@
   prefs->ar_layout=orig_ar_layout;
 
   if (esave_file!=NULL) {
-    g_free(esave_dir);
+    lives_free(esave_dir);
     esave_dir=get_dir(esave_file);
   }
 
   if (esave_file==NULL||!check_storage_space(NULL,FALSE)) {
-    gchar *cdir;
+    char *cdir;
 #ifndef IS_MINGW
-    com=g_strdup_printf("/bin/rmdir \"%s\" 2>/dev/null",esave_dir);
+    com=lives_strdup_printf("%s \"%s\" 2>/dev/null",capable->rmdir_cmd,esave_dir);
 #else
-    com=g_strdup_printf("rmdir.exe \"%s\" 2>NUL",esave_dir);
+    com=lives_strdup_printf("rmdir.exe \"%s\" 2>NUL",esave_dir);
 #endif
     lives_system(com,TRUE);
-    g_free(com);
+    lives_free(com);
 
-    cdir=g_build_filename(prefs->tmpdir,mainw->set_name,NULL);
+    cdir=lives_build_filename(prefs->tmpdir,mainw->set_name,NULL);
 #ifndef IS_MINGW
-    com=g_strdup_printf("/bin/rmdir \"%s\" 2>/dev/null",cdir);
+    com=lives_strdup_printf("%s \"%s\" 2>/dev/null",capable->rmdir_cmd,cdir);
 #else
-    com=g_strdup_printf("rmdir.exe \"%s\" 2>NUL",cdir);
+    com=lives_strdup_printf("rmdir.exe \"%s\" 2>NUL",cdir);
 #endif
     lives_system(com,TRUE);
-    g_free(com);
+    lives_free(com);
 
-    g_free(esave_file);
-    g_free(esave_dir);
-    g_free(layout_map);
-    g_free(layout_map_audio);
+    lives_free(esave_file);
+    lives_free(esave_dir);
+    lives_free(layout_map);
+    lives_free(layout_map_audio);
     mainw->was_set=was_set;
     if (!was_set) memset(mainw->set_name,0,1);
     mainw->cancelled=CANCEL_USER;
@@ -19300,12 +19679,12 @@
       mt->idlefunc=mt_idle_add(mt);
       mt_sensitise(mt);
     }
-    return;
+    return FALSE;
   }
 
   esave_file=ensure_extension(esave_file,".lay");
 
-  g_snprintf(xlayout_name,PATH_MAX,"%s",esave_file);
+  lives_snprintf(xlayout_name,PATH_MAX,"%s",esave_file);
   get_basename(xlayout_name);
 
   if (mt!=NULL) add_markers(mt,mt->event_list);
@@ -19329,22 +19708,21 @@
     }
 
     if (!retval||fd<0) {
-      retval2=do_write_failed_error_s_with_retry(esave_file,(fd<0)?g_strerror(errno):NULL,NULL);
-      if (retval2==LIVES_CANCEL) {
-	if (mt!=NULL) {
-	  mt->idlefunc=0;
-	  mt->idlefunc=mt_idle_add(mt);
-	  mt_sensitise(mt);
-	}
-	return;
+      retval2=do_write_failed_error_s_with_retry(esave_file,(fd<0)?lives_strerror(errno):NULL,NULL);
+      if (retval2==LIVES_RESPONSE_CANCEL) {
+        if (mt!=NULL) {
+          mt->idlefunc=0;
+          mt->idlefunc=mt_idle_add(mt);
+          mt_sensitise(mt);
+        }
+        return FALSE;
       }
     }
-  } while (retval2==LIVES_RETRY);
-
-  if (retval2!=LIVES_CANCEL) {
-    msg=g_strdup_printf(_("Saved layout to %s\n"),esave_file);
-    d_print(msg);
-    g_free(msg);
+  } while (retval2==LIVES_RESPONSE_RETRY);
+
+  if (retval2!=LIVES_RESPONSE_CANCEL) {
+    lives_snprintf(mainw->recent_file,PATH_MAX,"%s",xlayout_name);
+    d_print(_("Saved layout to %s\n"),esave_file);
   }
 
   // save layout map
@@ -19356,17 +19734,16 @@
     prefs->ar_layout=FALSE;
     set_pref("ar_layout","");
     memset(prefs->ar_layout_name,0,1);
-  }
-  else {
+  } else {
     prefs->ar_layout=TRUE;
     set_pref("ar_layout",layout_name);
-    g_snprintf(prefs->ar_layout_name,PATH_MAX,"%s",xlayout_name);
+    lives_snprintf(prefs->ar_layout_name,PATH_MAX,"%s",xlayout_name);
   }
 
-  g_free(esave_file);
-  g_free(esave_dir);
-  if (layout_map!=NULL) g_free(layout_map);
-  if (layout_map_audio!=NULL) g_free(layout_map_audio);
+  lives_free(esave_file);
+  lives_free(esave_dir);
+  if (layout_map!=NULL) lives_free(layout_map);
+  if (layout_map_audio!=NULL) lives_free(layout_map_audio);
 
   if (mainw->was_set) recover_layout_cancelled(FALSE);
 
@@ -19376,41 +19753,43 @@
     mt->idlefunc=mt_idle_add(mt);
     mt_sensitise(mt);
   }
+
+  return TRUE;
 }
 
 // next functions are mainly to do with event_list manipulation
 
 
-static gchar *rec_error_add(gchar *ebuf, gchar *msg, int num, weed_timecode_t tc) {
+static char *rec_error_add(char *ebuf, char *msg, int num, weed_timecode_t tc) {
   // log an error generated during event_list rectification
 
-  gchar *tmp;
-  gchar *xnew;
+  char *tmp;
+  char *xnew;
 
   elist_errors++;
 
   threaded_dialog_spin();
-  if (tc==-1) xnew=g_strdup(msg); // missing timecode
+  if (tc==-1) xnew=lives_strdup(msg); // missing timecode
   else {
-    if (num==-1) xnew=g_strdup_printf("%s at timecode %"PRId64"\n",msg,tc);
-    else xnew=g_strdup_printf("%s %d at timecode %"PRId64"\n",msg,num,tc);
+    if (num==-1) xnew=lives_strdup_printf("%s at timecode %"PRId64"\n",msg,tc);
+    else xnew=lives_strdup_printf("%s %d at timecode %"PRId64"\n",msg,num,tc);
   }
-  tmp=g_strconcat (ebuf,xnew,NULL);
+  tmp=lives_strconcat(ebuf,xnew,NULL);
   //#define SILENT_EVENT_LIST_LOAD
 #ifndef SILENT_EVENT_LIST_LOAD
-  g_printerr("Rec error: %s",xnew);
+  lives_printerr("Rec error: %s",xnew);
 #endif
-  g_free(ebuf);
-  g_free(xnew);
+  lives_free(ebuf);
+  lives_free(xnew);
   threaded_dialog_spin();
   return tmp;
-} 
+}
 
 
 
 static int get_next_tt_key(ttable *trans_table) {
   int i;
-  for (i=free_tt_key;i<FX_KEYS_MAX-FX_KEYS_MAX_VIRTUAL;i++) {
+  for (i=free_tt_key; i<FX_KEYS_MAX-FX_KEYS_MAX_VIRTUAL; i++) {
     if (trans_table[i].in==0) return i;
   }
   return -1;
@@ -19418,7 +19797,7 @@
 
 static void *find_init_event_in_ttable(ttable *trans_table, uint64_t in, boolean normal) {
   int i;
-  for (i=0;i<FX_KEYS_MAX-FX_KEYS_MAX_VIRTUAL;i++) {
+  for (i=0; i<FX_KEYS_MAX-FX_KEYS_MAX_VIRTUAL; i++) {
     if (normal&&trans_table[i].in==in) return trans_table[i].out;
 
     /// reverse lookup for past filter_map check
@@ -19438,18 +19817,18 @@
 
   if (*num_events==1) return init_events;
 
-  for (i=0;i<*num_events;i++) if (init_events[i]==NULL) num_nulls++;
+  for (i=0; i<*num_events; i++) if (init_events[i]==NULL) num_nulls++;
   if (num_nulls==0) return init_events;
 
   *num_events-=num_nulls;
 
   if (*num_events==0) new_init_events=NULL;
 
-  else new_init_events=(void **)g_malloc((*num_events)*sizeof(void *));
-  
-  for (i=0;i<*num_events+num_nulls;i++) if (init_events[i]!=NULL) new_init_events[j++]=init_events[i];
+  else new_init_events=(void **)lives_malloc((*num_events)*sizeof(void *));
+
+  for (i=0; i<*num_events+num_nulls; i++) if (init_events[i]!=NULL) new_init_events[j++]=init_events[i];
 
-  g_free(init_events);
+  lives_free(init_events);
 
   if (*num_events==0) *num_events=1;
 
@@ -19459,8 +19838,8 @@
 
 
 
-void move_init_in_filter_map(lives_mt *mt, weed_plant_t *event_list, weed_plant_t *event, weed_plant_t *ifrom, 
-			     weed_plant_t *ito, int track, boolean after) {
+void move_init_in_filter_map(lives_mt *mt, weed_plant_t *event_list, weed_plant_t *event, weed_plant_t *ifrom,
+                             weed_plant_t *ito, int track, boolean after) {
   int error,i,j;
   weed_plant_t *deinit_event=(weed_plant_t *)weed_get_voidptr_value(ifrom,"deinit_event",&error);
   void **events_before=NULL;
@@ -19480,97 +19859,96 @@
     num_inits=weed_leaf_num_elements(event,"init_events");
     if (events_before==NULL&&events_after==NULL) {
       j=0;
-      for (i=0;i<num_inits;i++) {
-	if (init_events[i]==ifrom) continue;
-	if (init_events[i]!=ito&&!init_event_is_relevant((weed_plant_t *)init_events[i],track)) continue;
-	j++;
-	if (init_events[i]==ito) {
-	  num_before=j-1+after;
-	  j=1;
-	}
+      for (i=0; i<num_inits; i++) {
+        if (init_events[i]==ifrom) continue;
+        if (init_events[i]!=ito&&!init_event_is_relevant((weed_plant_t *)init_events[i],track)) continue;
+        j++;
+        if (init_events[i]==ito) {
+          num_before=j-1+after;
+          j=1;
+        }
       }
       num_after=j-after;
-      if (num_before>0) events_before=(void **)g_malloc(num_before*sizeof(void *));
-      if (num_after>0) events_after=(void **)g_malloc(num_after*sizeof(void *));
+      if (num_before>0) events_before=(void **)lives_malloc(num_before*sizeof(void *));
+      if (num_after>0) events_after=(void **)lives_malloc(num_after*sizeof(void *));
       j1=j2=0;
-      for (i=0;i<num_inits;i++) {
-	if (!init_event_is_relevant((weed_plant_t *)init_events[i],track)) continue;
-	if (init_events[i]==ifrom) continue;
-	if (j1<num_before) {
-	  events_before[j1]=init_events[i];
-	  j1++;
-	}
-	else {
-	  events_after[j2]=init_events[i];
-	  j2++;
-	}
+      for (i=0; i<num_inits; i++) {
+        if (!init_event_is_relevant((weed_plant_t *)init_events[i],track)) continue;
+        if (init_events[i]==ifrom) continue;
+        if (j1<num_before) {
+          events_before[j1]=init_events[i];
+          j1++;
+        } else {
+          events_after[j2]=init_events[i];
+          j2++;
+        }
       }
     }
     // check to see if we can move event without problem
     got_after=FALSE;
-    for (i=0;i<num_inits;i++) {
+    for (i=0; i<num_inits; i++) {
       if (init_events[i]==ifrom) continue;
       if (!init_event_is_relevant((weed_plant_t *)init_events[i],track)) continue;
       if (!got_after&&init_event_in_list(events_after,num_after,(weed_plant_t *)init_events[i])) got_after=TRUE;
       if (got_after&&init_event_in_list(events_before,num_before,(weed_plant_t *)init_events[i])) {
-	weed_free(init_events);
-	if (events_before!=NULL) g_free(events_before);
-	if (events_after!=NULL) g_free(events_after);
-	return; // order has changed, give up
+        lives_free(init_events);
+        if (events_before!=NULL) lives_free(events_before);
+        if (events_after!=NULL) lives_free(events_after);
+        return; // order has changed, give up
       }
     }
-    new_init_events=(void **)g_malloc(num_inits*sizeof(void *));
+    new_init_events=(void **)lives_malloc(num_inits*sizeof(void *));
     got_after=FALSE;
     j=0;
-    for (i=0;i<num_inits;i++) {
+    for (i=0; i<num_inits; i++) {
       if (init_events[i]==ifrom) continue;
       if ((init_event_in_list(events_before,num_before,(weed_plant_t *)init_events[i])||
-	   !init_event_is_relevant((weed_plant_t *)init_events[i],track))&&
-	  !init_event_is_process_last((weed_plant_t *)init_events[i])&&!init_event_is_process_last(ifrom))
-	new_init_events[j]=init_events[i];
+           !init_event_is_relevant((weed_plant_t *)init_events[i],track))&&
+          !init_event_is_process_last((weed_plant_t *)init_events[i])&&!init_event_is_process_last(ifrom))
+        new_init_events[j]=init_events[i];
       else {
-	if (!got_after) {
-	  got_after=TRUE;
-	  new_init_events[j]=ifrom;
-	  i--;
-	  j++;
-	  continue;
-	}
-	new_init_events[j]=init_events[i];
+        if (!got_after) {
+          got_after=TRUE;
+          new_init_events[j]=ifrom;
+          i--;
+          j++;
+          continue;
+        }
+        new_init_events[j]=init_events[i];
       }
       j++;
     }
     if (j<num_inits) new_init_events[j]=ifrom;
     weed_set_voidptr_array(event,"init_events",num_inits,new_init_events);
-    g_free(new_init_events);
-    weed_free(init_events);
+    lives_free(new_init_events);
+    lives_free(init_events);
     event=get_next_event(event);
   }
 
-  if (events_before!=NULL) g_free(events_before);
-  if (events_after!=NULL) g_free(events_after);
+  if (events_before!=NULL) lives_free(events_before);
+  if (events_after!=NULL) lives_free(events_after);
 
 }
 
 
 
 boolean compare_filter_maps(weed_plant_t *fm1, weed_plant_t *fm2, int ctrack) {
-  // return TRUE if the maps match exactly; if ctrack is !=-1000000, 
+  // return TRUE if the maps match exactly; if ctrack is !=-1000000,
   // then we only compare filter maps where ctrack is an in_track or out_track
   int i1,i2,error,num_events1,num_events2;
   void **inits1,**inits2;
 
   if (!weed_plant_has_leaf(fm1,"init_events")&&!weed_plant_has_leaf(fm2,"init_events")) return TRUE;
   if (ctrack==-1000000&&((!weed_plant_has_leaf(fm1,"init_events")&&
-			  weed_get_voidptr_value(fm2,"init_events",&error)!=NULL)||
-			 (!weed_plant_has_leaf(fm2,"init_events")&&
-			  weed_get_voidptr_value(fm1,"init_events",&error)!=NULL))) return FALSE;
+                          weed_get_voidptr_value(fm2,"init_events",&error)!=NULL)||
+                         (!weed_plant_has_leaf(fm2,"init_events")&&
+                          weed_get_voidptr_value(fm1,"init_events",&error)!=NULL))) return FALSE;
 
   if (ctrack==-1000000&&(weed_plant_has_leaf(fm1,"init_events"))&&weed_plant_has_leaf(fm2,"init_events")&&
       ((weed_get_voidptr_value(fm1,"init_events",&error)==NULL&&
-	weed_get_voidptr_value(fm2,"init_events",&error)!=NULL)||
+        weed_get_voidptr_value(fm2,"init_events",&error)!=NULL)||
        (weed_get_voidptr_value(fm1,"init_events",&error)!=NULL&&
-	weed_get_voidptr_value(fm2,"init_events",&error)==NULL))) return FALSE;
+        weed_get_voidptr_value(fm2,"init_events",&error)==NULL))) return FALSE;
 
   num_events1=weed_leaf_num_elements(fm1,"init_events");
   num_events2=weed_leaf_num_elements(fm2,"init_events");
@@ -19583,20 +19961,20 @@
 
   i2=0;
 
-  for (i1=0;i1<num_events1;i1++) {
+  for (i1=0; i1<num_events1; i1++) {
 
     if (i2<num_events2&&init_event_is_process_last((weed_plant_t *)inits2[i2])) {
       // for process_last we don't care about the exact order
       if (init_event_in_list(inits1,num_events1,(weed_plant_t *)inits2[i2])) {
-	i2++;
-	continue;
+        i2++;
+        continue;
       }
     }
 
     if (init_event_is_process_last((weed_plant_t *)inits1[i1])) {
       // for process_last we don't care about the exact order
       if (init_event_in_list(inits2,num_events2,(weed_plant_t *)inits1[i1])) {
-	continue;
+        continue;
       }
     }
 
@@ -19605,32 +19983,30 @@
 
       if (inits1[i1]!=NULL) {
 
-	if (init_event_is_relevant((weed_plant_t *)inits1[i1],ctrack)) {
-	  if (i2>=num_events2) {
-	    weed_free(inits1);
-	    weed_free(inits2);
-	    return FALSE;
-	  }
-	}
-	else continue;  // skip this one, it doesn't involve ctrack
+        if (init_event_is_relevant((weed_plant_t *)inits1[i1],ctrack)) {
+          if (i2>=num_events2) {
+            lives_free(inits1);
+            lives_free(inits2);
+            return FALSE;
+          }
+        } else continue; // skip this one, it doesn't involve ctrack
 
-      }
-      else continue; // skip NULLS
+      } else continue; // skip NULLS
     }
 
     if (i2<num_events2) {
       if (ctrack!=-1000000) {
-	if (inits2[i2]==NULL||!init_event_is_relevant((weed_plant_t *)inits2[i2],ctrack)) {
-	  i2++;
-	  i1--;
-	  continue; // skip this one, it doesn't involve ctrack
-	}
+        if (inits2[i2]==NULL||!init_event_is_relevant((weed_plant_t *)inits2[i2],ctrack)) {
+          i2++;
+          i1--;
+          continue; // skip this one, it doesn't involve ctrack
+        }
       }
-      
+
       if (inits1[i1]!=inits2[i2]) {
-	weed_free(inits1);
-	weed_free(inits2);
-	return FALSE;
+        lives_free(inits1);
+        lives_free(inits2);
+        return FALSE;
       }
       i2++;
     }
@@ -19638,39 +20014,39 @@
 
   if (i2<num_events2) {
     if (ctrack==-1000000) {
-      weed_free(inits1);
+      lives_free(inits1);
       return FALSE;
     }
-    for (;i2<num_events2;i2++) {
+    for (; i2<num_events2; i2++) {
       if (inits2[i2]!=NULL) {
 
-	if (init_event_is_process_last((weed_plant_t *)inits2[i2])) {
-	  // for process_last we don't care about the exact order
-	  if (init_event_in_list(inits1,num_events1,(weed_plant_t *)inits2[i2])) continue;
-	}
+        if (init_event_is_process_last((weed_plant_t *)inits2[i2])) {
+          // for process_last we don't care about the exact order
+          if (init_event_in_list(inits1,num_events1,(weed_plant_t *)inits2[i2])) continue;
+        }
 
-	if (init_event_is_relevant((weed_plant_t *)inits2[i2],ctrack)) {
-	  weed_free(inits1);
-	  weed_free(inits2);
-	  return FALSE;
-	}
+        if (init_event_is_relevant((weed_plant_t *)inits2[i2],ctrack)) {
+          lives_free(inits1);
+          lives_free(inits2);
+          return FALSE;
+        }
 
       }
     }
   }
-  if (inits1!=NULL) weed_free(inits1);
-  if (inits2!=NULL) weed_free(inits2);
+  if (inits1!=NULL) lives_free(inits1);
+  if (inits2!=NULL) lives_free(inits2);
   return TRUE;
 }
 
 
 
-static gchar *filter_map_check(ttable *trans_table,weed_plant_t *filter_map, weed_timecode_t deinit_tc, 
-			       weed_timecode_t fm_tc, gchar *ebuf) {
+static char *filter_map_check(ttable *trans_table,weed_plant_t *filter_map, weed_timecode_t deinit_tc,
+                              weed_timecode_t fm_tc, char *ebuf) {
   int num_init_events;
   void **copy_events,**pinit_events;
   int error,i;
-  uint64_t* init_events;
+  uint64_t *init_events;
 
   if (!weed_plant_has_leaf(filter_map,"init_events")) return ebuf;
   // check no deinited events are active
@@ -19679,17 +20055,16 @@
   if (weed_leaf_seed_type(filter_map,"init_events")==WEED_SEED_INT64) {
     if (num_init_events==1&&weed_get_int64_value(filter_map,"init_events",&error)==0) return ebuf;
     init_events=(uint64_t *)(weed_get_int64_array(filter_map,"init_events",&error));
-  }
-  else {
+  } else {
     if (num_init_events==1&&weed_get_voidptr_value(filter_map,"init_events",&error)==NULL) return ebuf;
     pinit_events=weed_get_voidptr_array(filter_map,"init_events",&error);
-    init_events=(uint64_t *)weed_malloc(num_init_events*sizeof(uint64_t));
-    for (i=0;i<num_init_events;i++) init_events[i]=(uint64_t)pinit_events[i];
-    weed_free(pinit_events);
+    init_events=(uint64_t *)lives_malloc(num_init_events*sizeof(uint64_t));
+    for (i=0; i<num_init_events; i++) init_events[i]=(uint64_t)pinit_events[i];
+    lives_free(pinit_events);
   }
 
-  copy_events=(void **)g_malloc(num_init_events*sizeof(weed_plant_t *));
-  for (i=0;i<num_init_events;i++) {
+  copy_events=(void **)lives_malloc(num_init_events*sizeof(weed_plant_t *));
+  for (i=0; i<num_init_events; i++) {
     if (find_init_event_in_ttable(trans_table,init_events[i],FALSE)!=NULL) copy_events[i]=(void *)init_events[i]; // !!
     else {
       copy_events[i]=NULL;
@@ -19698,22 +20073,22 @@
   }
   if (num_init_events>1) copy_events=remove_nulls_from_filter_map(copy_events,&num_init_events);
 
-  if (copy_events!=NULL) g_free(copy_events);
-  weed_free(init_events);
+  if (copy_events!=NULL) lives_free(copy_events);
+  lives_free(init_events);
   return ebuf;
 }
 
 
-static gchar *add_filter_deinits(weed_plant_t *event_list, ttable *trans_table, void ***pchains, 
-				 weed_timecode_t tc, gchar *ebuf) {
+static char *add_filter_deinits(weed_plant_t *event_list, ttable *trans_table, void ***pchains,
+                                weed_timecode_t tc, char *ebuf) {
   // add filter deinit events for any remaining active filters
   int i,j,error,num_params;
-  gchar *filter_hash;
+  char *filter_hash;
   int idx;
   weed_plant_t *filter,*init_event,*event;
   void **in_pchanges;
 
-  for (i=0;i<FX_KEYS_MAX-FX_KEYS_MAX_VIRTUAL;i++) {
+  for (i=0; i<FX_KEYS_MAX-FX_KEYS_MAX_VIRTUAL; i++) {
     if (trans_table[i].out==NULL) continue;
     if (trans_table[i].in!=0) {
       event_list=append_filter_deinit_event(event_list,tc,(init_event=(weed_plant_t *)trans_table[i].out),pchains[i]);
@@ -19721,20 +20096,20 @@
 
       filter_hash=weed_get_string_value(init_event,"filter",&error);
       if ((idx=weed_get_idx_for_hashname(filter_hash,TRUE))!=-1) {
-	filter=get_weed_filter(idx);
-	if ((num_params=num_in_params(filter,FALSE,FALSE))>0) {
-	  in_pchanges=(void **)g_malloc(num_params*sizeof(void *));
-	  for (j=0;j<num_params;j++) {
-	    if (!WEED_EVENT_IS_FILTER_INIT((weed_plant_t *)pchains[i][j])) 
-	      in_pchanges[j]=(weed_plant_t *)pchains[i][j];
-	    else in_pchanges[j]=NULL;
-	  }
-	  weed_set_voidptr_array(event,"in_parameters",num_params,in_pchanges); // set array to last param_changes
-	  g_free(in_pchanges);
-	  g_free(pchains[i]);
-	}
+        filter=get_weed_filter(idx);
+        if ((num_params=num_in_params(filter,FALSE,FALSE))>0) {
+          in_pchanges=(void **)lives_malloc(num_params*sizeof(void *));
+          for (j=0; j<num_params; j++) {
+            if (!WEED_EVENT_IS_FILTER_INIT((weed_plant_t *)pchains[i][j]))
+              in_pchanges[j]=(weed_plant_t *)pchains[i][j];
+            else in_pchanges[j]=NULL;
+          }
+          weed_set_voidptr_array(event,"in_parameters",num_params,in_pchanges); // set array to last param_changes
+          lives_free(in_pchanges);
+          lives_free(pchains[i]);
+        }
       }
-      weed_free(filter_hash);
+      lives_free(filter_hash);
       ebuf=rec_error_add(ebuf,"Added missing filter_deinit",-1,tc);
     }
   }
@@ -19742,7 +20117,7 @@
 }
 
 
-static gchar *add_null_filter_map(weed_plant_t *event_list, weed_plant_t *last_fm, weed_timecode_t tc, gchar *ebuf) {
+static char *add_null_filter_map(weed_plant_t *event_list, weed_plant_t *last_fm, weed_timecode_t tc, char *ebuf) {
   int num_events;
   int error;
 
@@ -19768,66 +20143,66 @@
   clips=weed_get_int_array(src_frame,"clips",&error);
   frames=weed_get_int_array(src_frame,"frames",&error);
 
-  event_list=insert_frame_event_at (event_list, tc, numframes, clips, frames, &src_frame);
+  event_list=insert_frame_event_at(event_list, tc, numframes, clips, frames, &src_frame);
 
-  weed_free(clips);
-  weed_free(frames);
+  lives_free(clips);
+  lives_free(frames);
   return get_frame_event_at(event_list,tc,src_frame,TRUE);
 }
 
 
 
 
-static GList *atrack_list;
+static LiVESList *atrack_list;
 
 static void add_atrack_to_list(int track, int clip) {
   // keep record of audio tracks so we can add closures if missing
-  GList *alist=atrack_list;
-  gchar *entry;
-  gchar **array;
+  LiVESList *alist=atrack_list;
+  char *entry;
+  char **array;
 
   while (alist!=NULL) {
-    entry=(gchar *)alist->data;
-    array=g_strsplit(entry,"|",-1);
+    entry=(char *)alist->data;
+    array=lives_strsplit(entry,"|",-1);
     if (atoi(array[0])==track) {
-      g_free(alist->data);
-      alist->data=g_strdup_printf("%d|%d",track,clip);
-      g_strfreev(array);
+      lives_free((livespointer)alist->data);
+      alist->data=lives_strdup_printf("%d|%d",track,clip);
+      lives_strfreev(array);
       return;
     }
-    g_strfreev(array);
+    lives_strfreev(array);
     alist=alist->next;
   }
-  atrack_list=g_list_append(atrack_list,g_strdup_printf("%d|%d",track,clip));
+  atrack_list=lives_list_append(atrack_list,lives_strdup_printf("%d|%d",track,clip));
 }
 
 
 static void remove_atrack_from_list(int track) {
   // keep record of audio tracks so we can add closures if missing
-  GList *alist=atrack_list,*alist_next;
-  gchar *entry;
-  gchar **array;
+  LiVESList *alist=atrack_list,*alist_next;
+  char *entry;
+  char **array;
 
   while (alist!=NULL) {
     alist_next=alist->next;
-    entry=(gchar *)alist->data;
-    array=g_strsplit(entry,"|",-1);
+    entry=(char *)alist->data;
+    array=lives_strsplit(entry,"|",-1);
     if (atoi(array[0])==track) {
-      atrack_list=g_list_remove(atrack_list,entry);
-      g_strfreev(array);
-      g_free(entry);
+      atrack_list=lives_list_remove(atrack_list,entry);
+      lives_strfreev(array);
+      lives_free(entry);
       return;
     }
-    g_strfreev(array);
+    lives_strfreev(array);
     alist=alist_next;
   }
 }
 
 
-static gchar *add_missing_atrack_closers(weed_plant_t *event_list, double fps, gchar *ebuf) {
-  GList *alist=atrack_list;
-  gchar *entry;
-  gchar **array;
+static char *add_missing_atrack_closers(weed_plant_t *event_list, double fps, char *ebuf) {
+  LiVESList *alist=atrack_list;
+  char *entry;
+  char **array;
   int i=0;
 
   int *aclips;
@@ -19839,10 +20214,10 @@
 
   if (atrack_list==NULL) return ebuf;
 
-  num_atracks=g_list_length(atrack_list)*2;
+  num_atracks=lives_list_length(atrack_list)*2;
 
-  aclips=(int *)g_malloc(num_atracks*sizint);
-  aseeks=(double *)g_malloc(num_atracks*sizdbl);
+  aclips=(int *)lives_malloc(num_atracks*sizint);
+  aseeks=(double *)lives_malloc(num_atracks*sizdbl);
 
   last_frame=get_last_frame_event(event_list);
   tc=get_event_timecode(last_frame);
@@ -19853,13 +20228,13 @@
   }
 
   while (alist!=NULL) {
-    entry=(gchar *)alist->data;
-    array=g_strsplit(entry,"|",-1);
+    entry=(char *)alist->data;
+    array=lives_strsplit(entry,"|",-1);
     aclips[i]=atoi(array[0]);
     aclips[i+1]=atoi(array[1]);
     aseeks[i]=0.;
     aseeks[i+1]=0.;
-    g_strfreev(array);
+    lives_strfreev(array);
     if (aclips[i]>=0) ebuf=rec_error_add(ebuf,"Added missing audio closure",aclips[i],tc);
     else ebuf=rec_error_add(ebuf,"Added missing audio closure to backing track",-aclips[i],tc);
     i+=2;
@@ -19869,11 +20244,11 @@
   weed_set_int_array(last_frame,"audio_clips",num_atracks,aclips);
   weed_set_double_array(last_frame,"audio_seeks",num_atracks,aseeks);
 
-  g_free(aclips);
-  g_free(aseeks);
+  lives_free(aclips);
+  lives_free(aseeks);
 
-  g_list_free_strings(atrack_list);
-  g_list_free(atrack_list);
+  lives_list_free_strings(atrack_list);
+  lives_list_free(atrack_list);
   atrack_list=NULL;
   return ebuf;
 }
@@ -19884,8 +20259,8 @@
 boolean event_list_rectify(lives_mt *mt, weed_plant_t *event_list) {
   // check and reassemble a newly loaded event_list
   // reassemply consists of matching init_event(s) to event_id's
-  // we also rebuild our param_change chains ("in_parameters" in filter_init and filter_deinit, 
-  // and "next_change" and "prev_change" 
+  // we also rebuild our param_change chains ("in_parameters" in filter_init and filter_deinit,
+  // and "next_change" and "prev_change"
   // in other param_change events)
 
   // The checking done is quite sophisticated, and can correct many errors in badly-formed event_lists
@@ -19906,10 +20281,10 @@
   weed_timecode_t last_filter_map_tc=-1;
   weed_timecode_t cur_tc=0;
 
-  gchar *ebuf=g_strdup("");
-  gchar *host_tag_s;
-  gchar *filter_hash;
-  gchar *bit1=g_strdup(""),*bit2=NULL,*bit3=g_strdup("."),*msg;
+  char *ebuf=lives_strdup("");
+  char *host_tag_s;
+  char *filter_hash;
+  char *bit1=lives_strdup(""),*bit2=NULL,*bit3=lives_strdup("."),*msg;
 
   int *inct,*outct;
   int *clip_index,*frame_index,*aclip_index;
@@ -19951,7 +20326,7 @@
 
   if (mt!=NULL) mt->layout_prompt=FALSE;
 
-  for (i=0;i<FX_KEYS_MAX-FX_KEYS_MAX_VIRTUAL;i++) {
+  for (i=0; i<FX_KEYS_MAX-FX_KEYS_MAX_VIRTUAL; i++) {
     trans_table[i].in=0;
     trans_table[i].out=NULL;
   }
@@ -19975,7 +20350,7 @@
 
 
     ev_count++;
-    g_snprintf(mainw->msg,256,"%d|",ev_count);
+    lives_snprintf(mainw->msg,256,"%d|",ev_count);
     if ((ev_count%100)==0) threaded_dialog_spin();
 
 
@@ -20008,644 +20383,613 @@
 #endif
       // set in table
       if (!weed_plant_has_leaf(event,"event_id")) {
-	ebuf=rec_error_add(ebuf,"Filter_init missing event_id",-1,tc);
-	delete_event(event_list,event);
-	was_deleted=TRUE;
-      }
-      else {
-	if (!weed_plant_has_leaf(event,"filter")) {
-	  ebuf=rec_error_add(ebuf,"Filter_init missing filter",-1,tc);
-	  delete_event(event_list,event);
-	  was_deleted=TRUE;
-	}
-	else {
-	  filter_hash=weed_get_string_value(event,"filter",&error);
-	  if ((filter_idx=weed_get_idx_for_hashname(filter_hash,TRUE))!=-1) {
-	    filter=get_weed_filter(filter_idx);
-	    if (weed_plant_has_leaf(filter,"in_channel_templates")) {
-	      if (!weed_plant_has_leaf(event,"in_count")) {
-		ebuf=rec_error_add(ebuf,"Filter_init missing filter",-1,tc);
-		delete_event(event_list,event);
-		was_deleted=TRUE;
-	      }
-	      else {
-		num_ctmpls=weed_leaf_num_elements(filter,"in_channel_templates");
-		num_inct=weed_leaf_num_elements(event,"in_count");
-		if (num_ctmpls!=num_inct) {
-		  ebuf=rec_error_add(ebuf,"Filter_init has invalid in_count",-1,tc);
-		  delete_event(event_list,event);
-		  was_deleted=TRUE;
-		}
-		else {
-		  inct=weed_get_int_array(event,"in_count",&error);
-		  ctmpls=weed_get_plantptr_array(filter,"in_channel_templates",&error);
-		  for (i=0;i<num_ctmpls;i++) {
-		    thisct=inct[i];
-		    if (thisct==0&&!weed_plant_has_leaf(ctmpls[i],"optional")) {
-		      ebuf=rec_error_add(ebuf,"Filter_init disables a non-optional in channel",i,tc);
-		      delete_event(event_list,event);
-		      was_deleted=TRUE;
-		    }
-		    else {
-		      if (thisct>1&&(!weed_plant_has_leaf(ctmpls[i],"max_repeats")||
-				     (weed_get_int_value(ctmpls[i],"max_repeats",&error)>0&&
-				      weed_get_int_value(ctmpls[i],"max_repeats",&error)<thisct))) {
-			ebuf=rec_error_add(ebuf,"Filter_init has too many repeats of in channel",i,tc);
-			delete_event(event_list,event);
-			was_deleted=TRUE;
-		      }
-		    }
-		  }
-
-		  weed_free(inct);
-		  weed_free(ctmpls);
-
-		  if (!was_deleted) {
-		    num_ctmpls=weed_leaf_num_elements(filter,"out_channel_templates");
-		    num_outct=weed_leaf_num_elements(event,"out_count");
-		    if (num_ctmpls!=num_outct) {
-		      ebuf=rec_error_add(ebuf,"Filter_init has invalid out_count",-1,tc);
-		      delete_event(event_list,event);
-		      was_deleted=TRUE;
-		    }
-		    else {
-		      outct=weed_get_int_array(event,"out_count",&error);
-		      ctmpls=weed_get_plantptr_array(filter,"out_channel_templates",&error);
-		      for (i=0;i<num_ctmpls;i++) {
-			thisct=outct[i];
-			if (thisct==0&&!weed_plant_has_leaf(ctmpls[i],"optional")) {
-			  ebuf=rec_error_add(ebuf,"Filter_init disables a non-optional out channel",i,tc);
-			  delete_event(event_list,event);
-			  was_deleted=TRUE;
-			}
-			else {
-			  if (thisct>1&&(!weed_plant_has_leaf(ctmpls[i],"max_repeats")||
-					 (weed_get_int_value(ctmpls[i],"max_repeats",&error)>0&&
-					  weed_get_int_value(ctmpls[i],"max_repeats",&error)<thisct))) {
-			    ebuf=rec_error_add(ebuf,"Filter_init has too many repeats of out channel",i,tc);
-			    delete_event(event_list,event);
-			    was_deleted=TRUE;
-			  }
-			  else {
-			    if (weed_plant_has_leaf(event,"in_tracks")) {
-			      int ntracks=weed_leaf_num_elements(event,"in_tracks");
-			      int *trax=weed_get_int_array(event,"in_tracks",&error);
-			      for (i=0;i<ntracks;i++) {
-				if (trax>=0&&!has_video_chans_in(filter,FALSE)) {
-				  // TODO ** inform user
-				  if (mt!=NULL&&!mt->opts.pertrack_audio) {
-				    lives_widget_set_sensitive(mt->fx_region_2a,TRUE);
-				    mt->opts.pertrack_audio=TRUE;
-				  }
-				  else force_pertrack_audio=TRUE;
-				}
-
-				if (trax[i]==-1) {
-				  // TODO ** inform user
-				  if (mt!=NULL&&mt->opts.back_audio_tracks==0) {
-				    mt->opts.back_audio_tracks=1;
-				    ebuf=rec_error_add(ebuf,"Adding backing audio",-1,tc);
-				  }
-				  else force_backing_tracks=1;
-				}
-			      }
-
-			      weed_free(trax);
-			      ntracks=weed_leaf_num_elements(event,"out_tracks");
-			      trax=weed_get_int_array(event,"out_tracks",&error);
-			      for (i=0;i<ntracks;i++) {
-				if (trax>=0&&!has_video_chans_out(filter,FALSE)) {
-				  // TODO ** inform user
-				  if (mt!=NULL&&!mt->opts.pertrack_audio) {
-				    lives_widget_set_sensitive(mt->fx_region_2a,TRUE);
-				    mt->opts.pertrack_audio=TRUE;
-				  }
-				  else force_pertrack_audio=TRUE;
-				}
-				if (trax[i]==-1) {
-				  // TODO ** inform user
-				  if (mt!=NULL&&mt->opts.back_audio_tracks==0) {
-				    mt->opts.back_audio_tracks=1;
-				  }
-				  else force_backing_tracks=1;
-				}
-			      }
-			      weed_free(trax);
-			    }
-			  }
-			  // all tests passed
-			  if (tc==0) {
-			    if (mt!=NULL&&mt->avol_fx==-1) {
-			    // check if it can be a filter delegate
-			      GList *clist=mainw->fx_candidates[FX_CANDIDATE_AUDIO_VOL].list;
-			      while (clist!=NULL) {
-				if (GPOINTER_TO_INT(clist->data)==filter_idx) {
-				  mt->avol_fx=filter_idx;
-				  mt->avol_init_event=event;
-				  break;
-				}
-				clist=clist->next;
-			      }
-			    }
-			  }
-			}
-		      }
-		      weed_free(outct);
-		      weed_free(ctmpls);
-		    }}}}}}
-	  else {
-	    g_printerr("Layout contains unknown filter %s\n",filter_hash);
-	    ebuf=rec_error_add(ebuf,"Layout contains unknown filter",-1,tc);
-	    delete_event(event_list,event);
-	    was_deleted=TRUE;
-	    if (mt!=NULL) mt->layout_prompt=TRUE;
-	  }
-	  weed_free(filter_hash);
-	  if (!was_deleted) {
-	    host_tag=get_next_tt_key(trans_table)+FX_KEYS_MAX_VIRTUAL+1;
-	    if (host_tag==-1) {
-	      ebuf=rec_error_add(ebuf,"Fatal: too many active effects",FX_KEYS_MAX-FX_KEYS_MAX_VIRTUAL,tc);
-	      end_threaded_dialog();
-	      return FALSE;
-	    }
-	    host_tag_s=g_strdup_printf("%d",host_tag);
-	    weed_set_string_value(event,"host_tag",host_tag_s);
-	    g_free(host_tag_s);
-
-	    if (weed_leaf_seed_type(event,"event_id")==WEED_SEED_INT64)
-	      event_id=(uint64_t)(weed_get_int64_value(event,"event_id",&error));
-	    else
-	      event_id=(uint64_t)((weed_plant_t *)weed_get_voidptr_value(event,"event_id",&error));
+        ebuf=rec_error_add(ebuf,"Filter_init missing event_id",-1,tc);
+        delete_event(event_list,event);
+        was_deleted=TRUE;
+      } else {
+        if (!weed_plant_has_leaf(event,"filter")) {
+          ebuf=rec_error_add(ebuf,"Filter_init missing filter",-1,tc);
+          delete_event(event_list,event);
+          was_deleted=TRUE;
+        } else {
+          filter_hash=weed_get_string_value(event,"filter",&error);
+          if ((filter_idx=weed_get_idx_for_hashname(filter_hash,TRUE))!=-1) {
+            filter=get_weed_filter(filter_idx);
+            if (weed_plant_has_leaf(filter,"in_channel_templates")) {
+              if (!weed_plant_has_leaf(event,"in_count")) {
+                ebuf=rec_error_add(ebuf,"Filter_init missing filter",-1,tc);
+                delete_event(event_list,event);
+                was_deleted=TRUE;
+              } else {
+                num_ctmpls=weed_leaf_num_elements(filter,"in_channel_templates");
+                num_inct=weed_leaf_num_elements(event,"in_count");
+                if (num_ctmpls!=num_inct) {
+                  ebuf=rec_error_add(ebuf,"Filter_init has invalid in_count",-1,tc);
+                  delete_event(event_list,event);
+                  was_deleted=TRUE;
+                } else {
+                  inct=weed_get_int_array(event,"in_count",&error);
+                  ctmpls=weed_get_plantptr_array(filter,"in_channel_templates",&error);
+                  for (i=0; i<num_ctmpls; i++) {
+                    thisct=inct[i];
+                    if (thisct==0&&!weed_plant_has_leaf(ctmpls[i],"optional")) {
+                      ebuf=rec_error_add(ebuf,"Filter_init disables a non-optional in channel",i,tc);
+                      delete_event(event_list,event);
+                      was_deleted=TRUE;
+                    } else {
+                      if (thisct>1&&(!weed_plant_has_leaf(ctmpls[i],"max_repeats")||
+                                     (weed_get_int_value(ctmpls[i],"max_repeats",&error)>0&&
+                                      weed_get_int_value(ctmpls[i],"max_repeats",&error)<thisct))) {
+                        ebuf=rec_error_add(ebuf,"Filter_init has too many repeats of in channel",i,tc);
+                        delete_event(event_list,event);
+                        was_deleted=TRUE;
+                      }
+                    }
+                  }
+
+                  lives_free(inct);
+                  lives_free(ctmpls);
+
+                  if (!was_deleted) {
+                    num_ctmpls=weed_leaf_num_elements(filter,"out_channel_templates");
+                    num_outct=weed_leaf_num_elements(event,"out_count");
+                    if (num_ctmpls!=num_outct) {
+                      ebuf=rec_error_add(ebuf,"Filter_init has invalid out_count",-1,tc);
+                      delete_event(event_list,event);
+                      was_deleted=TRUE;
+                    } else {
+                      outct=weed_get_int_array(event,"out_count",&error);
+                      ctmpls=weed_get_plantptr_array(filter,"out_channel_templates",&error);
+                      for (i=0; i<num_ctmpls; i++) {
+                        thisct=outct[i];
+                        if (thisct==0&&!weed_plant_has_leaf(ctmpls[i],"optional")) {
+                          ebuf=rec_error_add(ebuf,"Filter_init disables a non-optional out channel",i,tc);
+                          delete_event(event_list,event);
+                          was_deleted=TRUE;
+                        } else {
+                          if (thisct>1&&(!weed_plant_has_leaf(ctmpls[i],"max_repeats")||
+                                         (weed_get_int_value(ctmpls[i],"max_repeats",&error)>0&&
+                                          weed_get_int_value(ctmpls[i],"max_repeats",&error)<thisct))) {
+                            ebuf=rec_error_add(ebuf,"Filter_init has too many repeats of out channel",i,tc);
+                            delete_event(event_list,event);
+                            was_deleted=TRUE;
+                          } else {
+                            if (weed_plant_has_leaf(event,"in_tracks")) {
+                              int ntracks=weed_leaf_num_elements(event,"in_tracks");
+                              int *trax=weed_get_int_array(event,"in_tracks",&error);
+                              for (i=0; i<ntracks; i++) {
+                                if (trax>=0&&!has_video_chans_in(filter,FALSE)) {
+                                  // TODO ** inform user
+                                  if (mt!=NULL&&!mt->opts.pertrack_audio) {
+                                    lives_widget_set_sensitive(mt->fx_region_2a,TRUE);
+                                    mt->opts.pertrack_audio=TRUE;
+                                  } else force_pertrack_audio=TRUE;
+                                }
+
+                                if (trax[i]==-1) {
+                                  // TODO ** inform user
+                                  if (mt!=NULL&&mt->opts.back_audio_tracks==0) {
+                                    mt->opts.back_audio_tracks=1;
+                                    ebuf=rec_error_add(ebuf,"Adding backing audio",-1,tc);
+                                  } else force_backing_tracks=1;
+                                }
+                              }
+
+                              lives_free(trax);
+                              ntracks=weed_leaf_num_elements(event,"out_tracks");
+                              trax=weed_get_int_array(event,"out_tracks",&error);
+                              for (i=0; i<ntracks; i++) {
+                                if (trax>=0&&!has_video_chans_out(filter,FALSE)) {
+                                  // TODO ** inform user
+                                  if (mt!=NULL&&!mt->opts.pertrack_audio) {
+                                    lives_widget_set_sensitive(mt->fx_region_2a,TRUE);
+                                    mt->opts.pertrack_audio=TRUE;
+                                  } else force_pertrack_audio=TRUE;
+                                }
+                                if (trax[i]==-1) {
+                                  // TODO ** inform user
+                                  if (mt!=NULL&&mt->opts.back_audio_tracks==0) {
+                                    mt->opts.back_audio_tracks=1;
+                                  } else force_backing_tracks=1;
+                                }
+                              }
+                              lives_free(trax);
+                            }
+                          }
+                          // all tests passed
+                          if (tc==0) {
+                            if (mt!=NULL&&mt->avol_fx==-1) {
+                              // check if it can be a filter delegate
+                              LiVESList *clist=mainw->fx_candidates[FX_CANDIDATE_AUDIO_VOL].list;
+                              while (clist!=NULL) {
+                                if (LIVES_POINTER_TO_INT(clist->data)==filter_idx) {
+                                  mt->avol_fx=filter_idx;
+                                  mt->avol_init_event=event;
+                                  break;
+                                }
+                                clist=clist->next;
+                              }
+                            }
+                          }
+                        }
+                      }
+                      lives_free(outct);
+                      lives_free(ctmpls);
+                    }
+                  }
+                }
+              }
+            }
+          } else {
+            lives_printerr("Layout contains unknown filter %s\n",filter_hash);
+            ebuf=rec_error_add(ebuf,"Layout contains unknown filter",-1,tc);
+            delete_event(event_list,event);
+            was_deleted=TRUE;
+            if (mt!=NULL) mt->layout_prompt=TRUE;
+          }
+          lives_free(filter_hash);
+          if (!was_deleted) {
+            host_tag=get_next_tt_key(trans_table)+FX_KEYS_MAX_VIRTUAL+1;
+            if (host_tag==-1) {
+              ebuf=rec_error_add(ebuf,"Fatal: too many active effects",FX_KEYS_MAX-FX_KEYS_MAX_VIRTUAL,tc);
+              end_threaded_dialog();
+              return FALSE;
+            }
+            host_tag_s=lives_strdup_printf("%d",host_tag);
+            weed_set_string_value(event,"host_tag",host_tag_s);
+            lives_free(host_tag_s);
+
+            if (weed_leaf_seed_type(event,"event_id")==WEED_SEED_INT64)
+              event_id=(uint64_t)(weed_get_int64_value(event,"event_id",&error));
+            else
+              event_id=(uint64_t)((weed_plant_t *)weed_get_voidptr_value(event,"event_id",&error));
 
-	    trans_table[(idx=host_tag-FX_KEYS_MAX_VIRTUAL-1)].in=event_id;
-	    trans_table[idx].out=event;
+            trans_table[(idx=host_tag-FX_KEYS_MAX_VIRTUAL-1)].in=event_id;
+            trans_table[idx].out=event;
 #ifdef DEBUG_TTABLE
-	    g_print("adding lookup %"PRIu64" -> %p\n",event_id,event);
+            g_print("adding lookup %"PRIu64" -> %p\n",event_id,event);
 #endif
-	    
-	    // use pchain array
-	    if (weed_plant_has_leaf(event,"in_parameters")) {
-	      num_params=weed_leaf_num_elements(event,"in_parameters");
-	      pchains[idx]=(void **)g_malloc(num_params*sizeof(void *));
-	      in_pchanges=(void **)g_malloc(num_params*sizeof(void *));
-	      for (i=0;i<num_params;i++) {
-		pchains[idx][i]=event;
-		in_pchanges[i]=NULL;
-	      }
-	      // set all to NULL, we will re-fill as we go along
-	      weed_leaf_delete(event,"in_parameters");
-	      weed_set_voidptr_array(event,"in_parameters",num_params,in_pchanges);
-	      g_free(in_pchanges);
-	    }
-	  }
-	}
+
+            // use pchain array
+            if (weed_plant_has_leaf(event,"in_parameters")) {
+              num_params=weed_leaf_num_elements(event,"in_parameters");
+              pchains[idx]=(void **)lives_malloc(num_params*sizeof(void *));
+              in_pchanges=(void **)lives_malloc(num_params*sizeof(void *));
+              for (i=0; i<num_params; i++) {
+                pchains[idx][i]=event;
+                in_pchanges[i]=NULL;
+              }
+              // set all to NULL, we will re-fill as we go along
+              weed_leaf_delete(event,"in_parameters");
+              weed_set_voidptr_array(event,"in_parameters",num_params,in_pchanges);
+              lives_free(in_pchanges);
+            }
+          }
+        }
       }
       break;
     case WEED_EVENT_HINT_FILTER_DEINIT:
 
       // update "init_event" from table, remove entry; we will check filter_map at end of tc
       if (!weed_plant_has_leaf(event,"init_event")) {
-	ebuf=rec_error_add(ebuf,"Filter_deinit missing init_event",-1,tc);
-	delete_event(event_list,event);
-	was_deleted=TRUE;
-      }
-      else {
-	if (weed_leaf_seed_type(event,"init_event")==WEED_SEED_INT64)
-	  event_id=(uint64_t)(weed_get_int64_value(event,"init_event",&error));
-	else
-	  event_id=(uint64_t)((weed_plant_t *)weed_get_voidptr_value(event,"init_event",&error));
+        ebuf=rec_error_add(ebuf,"Filter_deinit missing init_event",-1,tc);
+        delete_event(event_list,event);
+        was_deleted=TRUE;
+      } else {
+        if (weed_leaf_seed_type(event,"init_event")==WEED_SEED_INT64)
+          event_id=(uint64_t)(weed_get_int64_value(event,"init_event",&error));
+        else
+          event_id=(uint64_t)((weed_plant_t *)weed_get_voidptr_value(event,"init_event",&error));
 
 #ifdef DEBUG_TTABLE
-	g_print("looking for %"PRIu64" in ttable\n",event_id);
+        g_print("looking for %"PRIu64" in ttable\n",event_id);
 #endif
-	init_event=find_init_event_in_ttable(trans_table,event_id,TRUE);
+        init_event=find_init_event_in_ttable(trans_table,event_id,TRUE);
 
-	if (init_event==NULL) {
-	  ebuf=rec_error_add(ebuf,"Filter_deinit has invalid init_event",-1,tc);
-	  delete_event(event_list,event);
-	  was_deleted=TRUE;
-	}
-	else {
-	  weed_leaf_delete((weed_plant_t *)init_event,"deinit_event");
-	  weed_set_voidptr_value((weed_plant_t *)init_event,"deinit_event",event);
-
-	  host_tag_s=weed_get_string_value((weed_plant_t *)init_event,"host_tag",&error);
-	  host_tag=atoi(host_tag_s);
-	  weed_free(host_tag_s);
-	  trans_table[(idx=host_tag-FX_KEYS_MAX_VIRTUAL-1)].in=0;
-	  if (idx<free_tt_key) free_tt_key=idx;
-	  weed_leaf_delete(event,"init_event");
-	  weed_set_voidptr_value(event,"init_event",init_event);
-	  check_filter_map=TRUE;
-	  last_deinit_tc=tc;
-
-	  filter_hash=weed_get_string_value((weed_plant_t *)init_event,"filter",&error);
-	  if ((filter_idx=weed_get_idx_for_hashname(filter_hash,TRUE))!=-1) {
-	    filter=get_weed_filter(filter_idx);
-	    if ((num_params=num_in_params(filter,FALSE,FALSE))>0) {
-	      in_pchanges=(void **)g_malloc(num_params*sizeof(void *));
-	      for (i=0;i<num_params;i++) {
-		if (!WEED_EVENT_IS_FILTER_INIT((weed_plant_t *)pchains[idx][i])) 
-		  in_pchanges[i]=(weed_plant_t *)pchains[idx][i];
-		else in_pchanges[i]=NULL;
-	      }
-	      weed_leaf_delete(event,"in_parameters");
-	      weed_set_voidptr_array(event,"in_parameters",num_params,in_pchanges); // set array to last param_changes
-	      g_free(in_pchanges);
-	      g_free(pchains[idx]);
-	    }
-	  }
-	  weed_free(filter_hash);
-	}
+        if (init_event==NULL) {
+          ebuf=rec_error_add(ebuf,"Filter_deinit has invalid init_event",-1,tc);
+          delete_event(event_list,event);
+          was_deleted=TRUE;
+        } else {
+          weed_leaf_delete((weed_plant_t *)init_event,"deinit_event");
+          weed_set_voidptr_value((weed_plant_t *)init_event,"deinit_event",event);
+
+          host_tag_s=weed_get_string_value((weed_plant_t *)init_event,"host_tag",&error);
+          host_tag=atoi(host_tag_s);
+          lives_free(host_tag_s);
+          trans_table[(idx=host_tag-FX_KEYS_MAX_VIRTUAL-1)].in=0;
+          if (idx<free_tt_key) free_tt_key=idx;
+          weed_leaf_delete(event,"init_event");
+          weed_set_voidptr_value(event,"init_event",init_event);
+          check_filter_map=TRUE;
+          last_deinit_tc=tc;
+
+          filter_hash=weed_get_string_value((weed_plant_t *)init_event,"filter",&error);
+          if ((filter_idx=weed_get_idx_for_hashname(filter_hash,TRUE))!=-1) {
+            filter=get_weed_filter(filter_idx);
+            if ((num_params=num_in_params(filter,FALSE,FALSE))>0) {
+              in_pchanges=(void **)lives_malloc(num_params*sizeof(void *));
+              for (i=0; i<num_params; i++) {
+                if (!WEED_EVENT_IS_FILTER_INIT((weed_plant_t *)pchains[idx][i]))
+                  in_pchanges[i]=(weed_plant_t *)pchains[idx][i];
+                else in_pchanges[i]=NULL;
+              }
+              weed_leaf_delete(event,"in_parameters");
+              weed_set_voidptr_array(event,"in_parameters",num_params,in_pchanges); // set array to last param_changes
+              lives_free(in_pchanges);
+              lives_free(pchains[idx]);
+            }
+          }
+          lives_free(filter_hash);
+        }
       }
       break;
     case WEED_EVENT_HINT_FILTER_MAP:
-	// update "init_events" from table
+      // update "init_events" from table
       if (weed_plant_has_leaf(event,"init_events")) {
-	num_init_events=weed_leaf_num_elements(event,"init_events");
-	if (weed_leaf_seed_type(event,"init_events")==WEED_SEED_INT64)
-	  init_events=(uint64_t *)weed_get_int64_array(event,"init_events",&error);
-	else  {
-	  void **pinit_events=weed_get_voidptr_array(event,"init_events",&error);
-	  init_events=(uint64_t *)weed_malloc(num_init_events*sizeof(uint64_t));
-	  for (i=0;i<num_init_events;i++) init_events[i]=(uint64_t)pinit_events[i];
-	  weed_free(pinit_events);
-	}
-
-	new_init_events=(void **)g_malloc(num_init_events*sizeof(void *));
-	for (i=0;i<num_init_events;i++) {
-	  event_id=(uint64_t)init_events[i];
-	  if (event_id!=0) {
+        num_init_events=weed_leaf_num_elements(event,"init_events");
+        if (weed_leaf_seed_type(event,"init_events")==WEED_SEED_INT64)
+          init_events=(uint64_t *)weed_get_int64_array(event,"init_events",&error);
+        else  {
+          void **pinit_events=weed_get_voidptr_array(event,"init_events",&error);
+          init_events=(uint64_t *)lives_malloc(num_init_events*sizeof(uint64_t));
+          for (i=0; i<num_init_events; i++) init_events[i]=(uint64_t)pinit_events[i];
+          lives_free(pinit_events);
+        }
+
+        new_init_events=(void **)lives_malloc(num_init_events*sizeof(void *));
+        for (i=0; i<num_init_events; i++) {
+          event_id=(uint64_t)init_events[i];
+          if (event_id!=0) {
 
-	    init_event=find_init_event_in_ttable(trans_table,event_id,TRUE);
+            init_event=find_init_event_in_ttable(trans_table,event_id,TRUE);
 #ifdef DEBUG_TTABLE
-	    g_print("looking for %"PRIu64" in ttable, got %p\n",event_id,init_event);
+            g_print("looking for %"PRIu64" in ttable, got %p\n",event_id,init_event);
 #endif
-	    if (init_event==NULL) {
-	      ebuf=rec_error_add(ebuf,"Filter_map has invalid init_event",-1,tc);
-	      new_init_events[i]=NULL;
-	    }
-	    else new_init_events[i]=init_event;
-	  }
-	  else new_init_events[i]=NULL;
-	}
-	new_init_events=remove_nulls_from_filter_map(new_init_events,&num_init_events);
-
-	weed_leaf_delete(event,"init_events");
-
-	if (new_init_events==NULL) weed_set_voidptr_value(event,"init_events",NULL);
-	else {
-	  weed_set_voidptr_array(event,"init_events",num_init_events,new_init_events);
-
-	  for (i=0;i<num_init_events;i++) {
-	    if (init_event_is_process_last((weed_plant_t *)new_init_events[i])) {
-	      // reposition process_last events to the end
-	      add_init_event_to_filter_map(event,(weed_plant_t *)new_init_events[i],NULL);
-	    }
-	  }
-	  g_free(new_init_events);
-	}
-	weed_free(init_events);
-      }
-      else {
-	weed_set_voidptr_value(event,"init_events",NULL);
+            if (init_event==NULL) {
+              ebuf=rec_error_add(ebuf,"Filter_map has invalid init_event",-1,tc);
+              new_init_events[i]=NULL;
+            } else new_init_events[i]=init_event;
+          } else new_init_events[i]=NULL;
+        }
+        new_init_events=remove_nulls_from_filter_map(new_init_events,&num_init_events);
+
+        weed_leaf_delete(event,"init_events");
+
+        if (new_init_events==NULL) weed_set_voidptr_value(event,"init_events",NULL);
+        else {
+          weed_set_voidptr_array(event,"init_events",num_init_events,new_init_events);
+
+          for (i=0; i<num_init_events; i++) {
+            if (init_event_is_process_last((weed_plant_t *)new_init_events[i])) {
+              // reposition process_last events to the end
+              add_init_event_to_filter_map(event,(weed_plant_t *)new_init_events[i],NULL);
+            }
+          }
+          lives_free(new_init_events);
+        }
+        lives_free(init_events);
+      } else {
+        weed_set_voidptr_value(event,"init_events",NULL);
       }
       if (last_filter_map!=NULL) {
-	if (compare_filter_maps(last_filter_map,event,-1000000)) {
-	  // filter map is identical to prior one, we can remove this one
-	  delete_event(event_list,event);
-	  was_deleted=TRUE;
-	}
-      }
-      else if (weed_leaf_num_elements(event,"init_events")==1&&weed_get_voidptr_value(event,"init_events",&error)==NULL) {
-	delete_event(event_list,event);
-	was_deleted=TRUE;
+        if (compare_filter_maps(last_filter_map,event,-1000000)) {
+          // filter map is identical to prior one, we can remove this one
+          delete_event(event_list,event);
+          was_deleted=TRUE;
+        }
+      } else if (weed_leaf_num_elements(event,"init_events")==1&&weed_get_voidptr_value(event,"init_events",&error)==NULL) {
+        delete_event(event_list,event);
+        was_deleted=TRUE;
       }
       if (!was_deleted) last_filter_map=event;
 
       break;
     case WEED_EVENT_HINT_PARAM_CHANGE:
       if (!weed_plant_has_leaf(event,"index")) {
-	ebuf=rec_error_add(ebuf,"Param_change has no index",-1,tc);
-	delete_event(event_list,event);
-	was_deleted=TRUE;
+        ebuf=rec_error_add(ebuf,"Param_change has no index",-1,tc);
+        delete_event(event_list,event);
+        was_deleted=TRUE;
+      } else {
+        if (!weed_plant_has_leaf(event,"value")) {
+          ebuf=rec_error_add(ebuf,"Param_change has no value",-1,tc);
+          delete_event(event_list,event);
+          was_deleted=TRUE;
+        } else {
+          if (!weed_plant_has_leaf(event,"init_event")) {
+            ebuf=rec_error_add(ebuf,"Param_change has no init_event",-1,tc);
+            delete_event(event_list,event);
+            was_deleted=TRUE;
+          } else {
+            if (weed_leaf_seed_type(event,"init_event")==WEED_SEED_INT64)
+              event_id=(uint64_t)(weed_get_int64_value(event,"init_event",&error));
+            else
+              event_id=(uint64_t)((weed_plant_t *)weed_get_voidptr_value(event,"init_event",&error));
+            if ((init_event=find_init_event_in_ttable(trans_table,event_id,TRUE))==NULL) {
+              ebuf=rec_error_add(ebuf,"Param_change has invalid init_event",-1,tc);
+              delete_event(event_list,event);
+              was_deleted=TRUE;
+            } else {
+              filter_hash=weed_get_string_value((weed_plant_t *)init_event,"filter",&error);
+              if ((filter_idx=weed_get_idx_for_hashname(filter_hash,TRUE))!=-1) {
+                filter=get_weed_filter(filter_idx);
+                pnum=weed_get_int_value(event,"index",&error);
+                if (pnum<0||pnum>=(num_params=num_in_params(filter,FALSE,FALSE))) {
+                  ebuf=rec_error_add(ebuf,"Param_change has invalid index",pnum,tc);
+                  delete_event(event_list,event);
+                  was_deleted=TRUE;
+                } else {
+                  ptmpls=weed_get_plantptr_array(filter,"in_parameter_templates",&error);
+                  if (!weed_plant_has_leaf(event,"value")) {
+                    ebuf=rec_error_add(ebuf,"Param_change has no value with index",pnum,tc);
+                    delete_event(event_list,event);
+                    was_deleted=TRUE;
+                  } else {
+                    if (weed_leaf_seed_type(event,"value")!=weed_leaf_seed_type(ptmpls[pnum],"default")) {
+                      ebuf=rec_error_add(ebuf,"Param_change has invalid seed type with index",pnum,tc);
+                      delete_event(event_list,event);
+                      was_deleted=TRUE;
+                    } else {
+                      pflags=weed_get_int_value(ptmpls[pnum],"flags",&error);
+                      if (pflags&WEED_PARAMETER_REINIT_ON_VALUE_CHANGE&&!
+                          is_init_pchange((weed_plant_t *)init_event,event)) {
+                        // check we are not changing a reinit param, unless we immediately follow the filter_init event
+                        ebuf=rec_error_add(ebuf,"Param_change sets a reinit parameter",pnum,tc);
+                        delete_event(event_list,event);
+                        was_deleted=TRUE;
+                      } else {
+                        // all checks passed
+                        host_tag_s=weed_get_string_value((weed_plant_t *)init_event,"host_tag",&error);
+                        host_tag=atoi(host_tag_s);
+                        lives_free(host_tag_s);
+                        idx=host_tag-FX_KEYS_MAX_VIRTUAL-1;
+
+                        if (pchains[idx][pnum]==init_event) {
+                          if (weed_leaf_seed_type((weed_plant_t *)init_event,"in_parameters")==WEED_SEED_INT64) {
+                            // leave as int64_t and we will change afterwards
+                            uint64_t *orig_pchanges=(uint64_t *)weed_get_int64_array((weed_plant_t *)init_event,
+                                                    "in_parameters",&error);
+
+                            uint64_t *pin_pchanges=(uint64_t *)lives_malloc(num_params*sizeof(uint64_t));
+
+                            for (i=0; i<num_params; i++) {
+                              if (orig_pchanges[i]==0&&i==pnum) pin_pchanges[i]=(uint64_t)event;
+                              else pin_pchanges[i]=(uint64_t)orig_pchanges[i];
+                            }
+
+                            weed_leaf_delete((weed_plant_t *)init_event,"in_parameters");
+                            weed_set_int64_array((weed_plant_t *)init_event,"in_parameters",num_params,
+                                                 (int64_t *)pin_pchanges);
+
+                            lives_free(pin_pchanges);
+                            lives_free(orig_pchanges);
+
+                          } else {
+                            void **orig_pchanges=weed_get_voidptr_array((weed_plant_t *)init_event,
+                                                 "in_parameters",&error);
+                            void **pin_pchanges=(void **)lives_malloc(num_params*sizeof(void *));
+
+                            for (i=0; i<num_params; i++) {
+                              if (orig_pchanges[i]==NULL&&i==pnum) pin_pchanges[i]=(void *)event;
+                              else pin_pchanges[i]=(void *)orig_pchanges[i];
+                            }
+                            weed_leaf_delete((weed_plant_t *)init_event,"in_parameters");
+                            weed_set_voidptr_array((weed_plant_t *)init_event,"in_parameters",num_params,pin_pchanges);
+
+                            lives_free(pin_pchanges);
+                            lives_free(orig_pchanges);
+
+                          }
+
+                          weed_leaf_delete(event,"prev_change");
+                          weed_set_voidptr_value(event,"prev_change",NULL);
+                        } else {
+                          weed_leaf_delete(event,"next_change");
+                          weed_set_voidptr_value((weed_plant_t *)pchains[idx][pnum],"next_change",event);
+                          weed_leaf_delete(event,"prev_change");
+                          weed_set_voidptr_value(event,"prev_change",pchains[idx][pnum]);
+                        }
+                        weed_leaf_delete(event,"next_change");
+                        weed_set_voidptr_value(event,"next_change",NULL);
+                        weed_leaf_delete(event,"init_event");
+                        weed_set_voidptr_value(event,"init_event",init_event);
+                        pchains[idx][pnum]=event;
+                      }
+                    }
+                  }
+                  lives_free(ptmpls);
+                }
+                lives_free(filter_hash);
+              }
+            }
+          }
+        }
       }
-      else {
-	if (!weed_plant_has_leaf(event,"value")) {
-	  ebuf=rec_error_add(ebuf,"Param_change has no value",-1,tc);
-	  delete_event(event_list,event);
-	  was_deleted=TRUE;
-	}
-	else {
-	  if (!weed_plant_has_leaf(event,"init_event")) {
-	    ebuf=rec_error_add(ebuf,"Param_change has no init_event",-1,tc);
-	    delete_event(event_list,event);
-	    was_deleted=TRUE;
-	  }
-	  else {
-	    if (weed_leaf_seed_type(event,"init_event")==WEED_SEED_INT64)
-	      event_id=(uint64_t)(weed_get_int64_value(event,"init_event",&error));
-	    else
-	      event_id=(uint64_t)((weed_plant_t *)weed_get_voidptr_value(event,"init_event",&error));
-	    if ((init_event=find_init_event_in_ttable(trans_table,event_id,TRUE))==NULL) {
-	      ebuf=rec_error_add(ebuf,"Param_change has invalid init_event",-1,tc);
-	      delete_event(event_list,event);
-	      was_deleted=TRUE;
-	    }
-	    else {
-	      filter_hash=weed_get_string_value((weed_plant_t *)init_event,"filter",&error);
-	      if ((filter_idx=weed_get_idx_for_hashname(filter_hash,TRUE))!=-1) {
-		filter=get_weed_filter(filter_idx);
-		pnum=weed_get_int_value(event,"index",&error);
-		if (pnum<0||pnum>=(num_params=num_in_params(filter,FALSE,FALSE))) {
-		  ebuf=rec_error_add(ebuf,"Param_change has invalid index",pnum,tc);
-		  delete_event(event_list,event);
-		  was_deleted=TRUE;
-		}
-		else {
-		  ptmpls=weed_get_plantptr_array(filter,"in_parameter_templates",&error);
-		  if (!weed_plant_has_leaf(event,"value")) {
-		    ebuf=rec_error_add(ebuf,"Param_change has no value with index",pnum,tc);
-		    delete_event(event_list,event);
-		    was_deleted=TRUE;
-		  }
-		  else {
-		    if (weed_leaf_seed_type(event,"value")!=weed_leaf_seed_type(ptmpls[pnum],"default")) {
-		      ebuf=rec_error_add(ebuf,"Param_change has invalid seed type with index",pnum,tc);
-		      delete_event(event_list,event);
-		      was_deleted=TRUE;
-		    }
-		    else {
-		      pflags=weed_get_int_value(ptmpls[pnum],"flags",&error);
-		      if (pflags&WEED_PARAMETER_REINIT_ON_VALUE_CHANGE&&!
-			  is_init_pchange((weed_plant_t *)init_event,event)) {
-			// check we are not changing a reinit param, unless we immediately follow the filter_init event
-			ebuf=rec_error_add(ebuf,"Param_change sets a reinit parameter",pnum,tc);
-			delete_event(event_list,event);
-			was_deleted=TRUE;
-		      }
-		      else {
-			// all checks passed
-			host_tag_s=weed_get_string_value((weed_plant_t *)init_event,"host_tag",&error);
-			host_tag=atoi(host_tag_s);
-			weed_free(host_tag_s);
-			idx=host_tag-FX_KEYS_MAX_VIRTUAL-1;
-
-			if (pchains[idx][pnum]==init_event) {
-			  if (weed_leaf_seed_type((weed_plant_t *)init_event,"in_parameters")==WEED_SEED_INT64) {
-			    // leave as int64_t and we will change afterwards
-			    uint64_t *orig_pchanges=(uint64_t *)weed_get_int64_array((weed_plant_t *)init_event,
-									   "in_parameters",&error);
-
-			    uint64_t *pin_pchanges=(uint64_t *)g_malloc(num_params*sizeof(uint64_t));
-			    
-			    for (i=0;i<num_params;i++) {
-			      if (orig_pchanges[i]==0&&i==pnum) pin_pchanges[i]=(uint64_t)event;
-			      else pin_pchanges[i]=(uint64_t)orig_pchanges[i];
-			    }
-
-			    weed_leaf_delete((weed_plant_t *)init_event,"in_parameters");
-			    weed_set_int64_array((weed_plant_t *)init_event,"in_parameters",num_params,
-						 (int64_t*)pin_pchanges);
-
-			    g_free(pin_pchanges);
-			    weed_free(orig_pchanges);
-
-			  }
-			  else {
-			    void **orig_pchanges=weed_get_voidptr_array((weed_plant_t *)init_event,
-									 "in_parameters",&error);
-			    void **pin_pchanges=(void **)g_malloc(num_params*sizeof(void *));
-			    
-			    for (i=0;i<num_params;i++) {
-			      if (orig_pchanges[i]==NULL&&i==pnum) pin_pchanges[i]=(void *)event;
-			      else pin_pchanges[i]=(void *)orig_pchanges[i];
-			    }
-			    weed_leaf_delete((weed_plant_t *)init_event,"in_parameters");
-			    weed_set_voidptr_array((weed_plant_t *)init_event,"in_parameters",num_params,pin_pchanges);
-
-			    g_free(pin_pchanges);
-			    weed_free(orig_pchanges);
-
-			  }
-
-			  weed_leaf_delete(event,"prev_change");
-			  weed_set_voidptr_value(event,"prev_change",NULL);
-			}
-			else {
-			  weed_leaf_delete(event,"next_change");
-			  weed_set_voidptr_value((weed_plant_t *)pchains[idx][pnum],"next_change",event);
-			  weed_leaf_delete(event,"prev_change");
-			  weed_set_voidptr_value(event,"prev_change",pchains[idx][pnum]);
-			}
-			weed_leaf_delete(event,"next_change");
-			weed_set_voidptr_value(event,"next_change",NULL);
-			weed_leaf_delete(event,"init_event");
-			weed_set_voidptr_value(event,"init_event",init_event);
-			pchains[idx][pnum]=event;
-		      }}}
-		  weed_free(ptmpls);
-		}
-		weed_free(filter_hash);
-	      }}}}}
       break;
     case WEED_EVENT_HINT_FRAME:
       if (tc==last_frame_tc) {
-	ebuf=rec_error_add(ebuf,"Duplicate frame event",-1,tc);
-	delete_event(event_list,event);
-	was_deleted=TRUE;
-      }
-      else {
-	if (!weed_plant_has_leaf(event,"clips")) {
-	  weed_set_int_value(event,"clips",-1);
-	  weed_set_int_value(event,"frames",0);
-	  ebuf=rec_error_add(ebuf,"Frame event missing clips at",-1,tc);
-	}
-
-	last_frame_tc=tc;
-
-	num_tracks=weed_leaf_num_elements (event,"clips");
-	clip_index=weed_get_int_array(event,"clips",&error);
-	frame_index=weed_get_int_array(event,"frames",&error);
-
-	new_clip_index=(int *)g_malloc(num_tracks*sizint);
-	new_frame_index=(int *)g_malloc(num_tracks*sizint);
-	last_valid_frame=0;
-	//	#define DEBUG_MISSING_CLIPS
+        ebuf=rec_error_add(ebuf,"Duplicate frame event",-1,tc);
+        delete_event(event_list,event);
+        was_deleted=TRUE;
+      } else {
+        if (!weed_plant_has_leaf(event,"clips")) {
+          weed_set_int_value(event,"clips",-1);
+          weed_set_int_value(event,"frames",0);
+          ebuf=rec_error_add(ebuf,"Frame event missing clips at",-1,tc);
+        }
+
+        last_frame_tc=tc;
+
+        num_tracks=weed_leaf_num_elements(event,"clips");
+        clip_index=weed_get_int_array(event,"clips",&error);
+        frame_index=weed_get_int_array(event,"frames",&error);
+
+        new_clip_index=(int *)lives_malloc(num_tracks*sizint);
+        new_frame_index=(int *)lives_malloc(num_tracks*sizint);
+        last_valid_frame=0;
+        //	#define DEBUG_MISSING_CLIPS
 #ifdef DEBUG_MISSING_CLIPS
-	//g_print("pt zzz %d\n",num_tracks);
+        //g_print("pt zzz %d\n",num_tracks);
 #endif
-	for (i=0;i<num_tracks;i++) {
-	  if (clip_index[i]>0&&(clip_index[i]>MAX_FILES||renumbered_clips[clip_index[i]]<1||
-				mainw->files[renumbered_clips[clip_index[i]]]==NULL)) {
-	    // clip has probably been closed, so we remove its frames
-
-	    new_clip_index[i]=-1;
-	    new_frame_index[i]=0;
-	    ebuf=rec_error_add(ebuf,"Invalid clip number",clip_index[i],tc);
+        for (i=0; i<num_tracks; i++) {
+          if (clip_index[i]>0&&(clip_index[i]>MAX_FILES||renumbered_clips[clip_index[i]]<1||
+                                mainw->files[renumbered_clips[clip_index[i]]]==NULL)) {
+            // clip has probably been closed, so we remove its frames
+
+            new_clip_index[i]=-1;
+            new_frame_index[i]=0;
+            ebuf=rec_error_add(ebuf,"Invalid clip number",clip_index[i],tc);
 
 #ifdef DEBUG_MISSING_CLIPS
-	    g_print("found invalid clip number %d on track %d, renumbered_clips=%d\n",clip_index[i],i,
-		    renumbered_clips[clip_index[i]]);
+            g_print("found invalid clip number %d on track %d, renumbered_clips=%d\n",clip_index[i],i,
+                    renumbered_clips[clip_index[i]]);
 #endif
-	    missing_clips=TRUE;
-	  }
-	  else {
-	    // take into account the fact that clip could have been resampled since layout was saved
-	    if (clip_index[i]>0&&frame_index[i]>0) {
-	      new_frame_index[i]=count_resampled_frames(frame_index[i],lfps[renumbered_clips[clip_index[i]]],
-							mainw->files[renumbered_clips[clip_index[i]]]->fps);
-	      if (new_frame_index[i]>mainw->files[renumbered_clips[clip_index[i]]]->frames) {
-		ebuf=rec_error_add(ebuf,"Invalid frame number",new_frame_index[i],tc);
-		new_clip_index[i]=-1;
-		new_frame_index[i]=0;
-		missing_frames=TRUE;
-	      }
-	      else {
-		new_clip_index[i]=clip_index[i];
-		new_frame_index[i]=frame_index[i];
-		last_valid_frame=i+1;
-	      }
-	    }
-	    else {
-	      new_clip_index[i]=clip_index[i];
-	      new_frame_index[i]=frame_index[i];
-	      last_valid_frame=i+1;
-	    }
-	  }
-	}
-
-	if (last_valid_frame==0) {
-	  g_free(new_clip_index);
-	  g_free(new_frame_index);
-	  new_clip_index=(int *)g_malloc(sizint);
-	  new_frame_index=(int *)g_malloc(sizint);
-	  *new_clip_index=-1;
-	  *new_frame_index=0;
-	  num_tracks=1;
-	  weed_set_int_array(event,"clips",num_tracks,new_clip_index);
-	  weed_set_int_array(event,"frames",num_tracks,new_frame_index);
-	}
-	else {
-	  if (last_valid_frame<num_tracks) {
-	    weed_free(clip_index);
-	    weed_free(frame_index);
-	    clip_index=(int *)weed_malloc(last_valid_frame*sizint);
-	    frame_index=(int *)weed_malloc(last_valid_frame*sizint);
-	    for (i=0;i<last_valid_frame;i++) {
-	      clip_index[i]=new_clip_index[i];
-	      frame_index[i]=new_frame_index[i];
-	    }
-	    num_tracks=last_valid_frame;
-	    weed_set_int_array(event,"clips",num_tracks,clip_index);
-	    weed_set_int_array(event,"frames",num_tracks,frame_index);
-	  }
-	  else {
-	    weed_set_int_array(event,"clips",num_tracks,new_clip_index);
-	    weed_set_int_array(event,"frames",num_tracks,new_frame_index);
-	  }
-	}
-
-
-	g_free(new_clip_index);
-	weed_free(clip_index);
-	g_free(new_frame_index);
-	weed_free(frame_index);
-
-	if (weed_plant_has_leaf(event,"audio_clips")) {
-	  // check audio clips
-	  num_atracks=weed_leaf_num_elements (event,"audio_clips");
-	  if (num_atracks%2!=0) {
-	    ebuf=rec_error_add(ebuf,"Invalid number of audio_clips",-1,tc);
-	    weed_leaf_delete(event,"audio_clips");
-	    weed_leaf_delete(event,"audio_seeks");
-	  }
-	  else {
-	    if (!weed_plant_has_leaf(event,"audio_seeks")||weed_leaf_num_elements(event,"audio_seeks")!=num_atracks) {
-	      ebuf=rec_error_add(ebuf,"Invalid number of audio_seeks",-1,tc);
-	      weed_leaf_delete(event,"audio_clips");
-	      weed_leaf_delete(event,"audio_seeks");
-	    }
-	    else {
-	      aclip_index=weed_get_int_array(event,"audio_clips",&error);
-	      aseek_index=weed_get_double_array(event,"audio_seeks",&error);
-	      new_aclip_index=(int *)g_malloc(num_atracks*sizint);
-	      new_aseek_index=(double *)g_malloc(num_atracks*sizdbl);
-	      j=0;
-	      for (i=0;i<num_atracks;i+=2) {
-		if (aclip_index[i+1]>0) {
-		  if ((aclip_index[i+1]>MAX_FILES||renumbered_clips[aclip_index[i+1]]<1||
-		       mainw->files[renumbered_clips[aclip_index[i+1]]]==NULL)&&aseek_index[i+1]!=0.) {
-		    // clip has probably been closed, so we remove its frames
-		    ebuf=rec_error_add(ebuf,"Invalid audio clip number",aclip_index[i+1],tc);
-		    missing_clips=TRUE;
-		  }
-		  else {
-		    new_aclip_index[j]=aclip_index[i];
-		    new_aclip_index[j+1]=aclip_index[i+1];
-		    new_aseek_index[j]=aseek_index[i];
-		    new_aseek_index[j+1]=aseek_index[i+1];
-		    if (aseek_index[j+1]!=0.) add_atrack_to_list(aclip_index[i],aclip_index[i+1]);
-		    else remove_atrack_from_list(aclip_index[i]);
-		    j+=2;
-		  }
-		}
-		if (aclip_index[i]>-1) {
-		  if (mt!=NULL&&!mt->opts.pertrack_audio) {
-		    mt->opts.pertrack_audio=TRUE;
-		    // enable audio transitions
-		    lives_widget_set_sensitive(mt->fx_region_2a,TRUE);
-		    ebuf=rec_error_add(ebuf,"Adding pertrack audio",-1,tc);
-		  }
-		  else force_pertrack_audio=TRUE;
-		  // TODO ** inform user
-		}
-		if (aclip_index[i]==-1) {
-		  if (mt!=NULL&&mt->opts.back_audio_tracks==0) {
-		    mt->opts.back_audio_tracks=1;
-		    ebuf=rec_error_add(ebuf,"Adding backing audio",-1,tc);
-		  }
-		  else force_backing_tracks=1;
-		  // TODO ** inform user
-		}
-	      }
-	      if (j==0) {
-		weed_leaf_delete(event,"audio_clips");
-		weed_leaf_delete(event,"audio_seeks");
-	      }
-	      else {
-		weed_set_int_array(event,"audio_clips",j,new_aclip_index);
-		weed_set_double_array(event,"audio_seeks",j,new_aseek_index);
-	      }
-	      weed_free(aclip_index);
-	      weed_free(aseek_index);
-	      g_free(new_aclip_index);
-	      g_free(new_aseek_index);
-	    }
-	  }
-	}
+            missing_clips=TRUE;
+          } else {
+            // take into account the fact that clip could have been resampled since layout was saved
+            if (clip_index[i]>0&&frame_index[i]>0) {
+              new_frame_index[i]=count_resampled_frames(frame_index[i],lfps[renumbered_clips[clip_index[i]]],
+                                 mainw->files[renumbered_clips[clip_index[i]]]->fps);
+              if (new_frame_index[i]>mainw->files[renumbered_clips[clip_index[i]]]->frames) {
+                ebuf=rec_error_add(ebuf,"Invalid frame number",new_frame_index[i],tc);
+                new_clip_index[i]=-1;
+                new_frame_index[i]=0;
+                missing_frames=TRUE;
+              } else {
+                new_clip_index[i]=clip_index[i];
+                new_frame_index[i]=frame_index[i];
+                last_valid_frame=i+1;
+              }
+            } else {
+              new_clip_index[i]=clip_index[i];
+              new_frame_index[i]=frame_index[i];
+              last_valid_frame=i+1;
+            }
+          }
+        }
+
+        if (last_valid_frame==0) {
+          lives_free(new_clip_index);
+          lives_free(new_frame_index);
+          new_clip_index=(int *)lives_malloc(sizint);
+          new_frame_index=(int *)lives_malloc(sizint);
+          *new_clip_index=-1;
+          *new_frame_index=0;
+          num_tracks=1;
+          weed_set_int_array(event,"clips",num_tracks,new_clip_index);
+          weed_set_int_array(event,"frames",num_tracks,new_frame_index);
+        } else {
+          if (last_valid_frame<num_tracks) {
+            lives_free(clip_index);
+            lives_free(frame_index);
+            clip_index=(int *)lives_malloc(last_valid_frame*sizint);
+            frame_index=(int *)lives_malloc(last_valid_frame*sizint);
+            for (i=0; i<last_valid_frame; i++) {
+              clip_index[i]=new_clip_index[i];
+              frame_index[i]=new_frame_index[i];
+            }
+            num_tracks=last_valid_frame;
+            weed_set_int_array(event,"clips",num_tracks,clip_index);
+            weed_set_int_array(event,"frames",num_tracks,frame_index);
+          } else {
+            weed_set_int_array(event,"clips",num_tracks,new_clip_index);
+            weed_set_int_array(event,"frames",num_tracks,new_frame_index);
+          }
+        }
+
+
+        lives_free(new_clip_index);
+        lives_free(clip_index);
+        lives_free(new_frame_index);
+        lives_free(frame_index);
+
+        if (WEED_EVENT_IS_AUDIO_FRAME(event)) {
+          // check audio clips
+          num_atracks=weed_leaf_num_elements(event,"audio_clips");
+          if (num_atracks%2!=0) {
+            ebuf=rec_error_add(ebuf,"Invalid number of audio_clips",-1,tc);
+            weed_leaf_delete(event,"audio_clips");
+            weed_leaf_delete(event,"audio_seeks");
+          } else {
+            if (!weed_plant_has_leaf(event,"audio_seeks")||weed_leaf_num_elements(event,"audio_seeks")!=num_atracks) {
+              ebuf=rec_error_add(ebuf,"Invalid number of audio_seeks",-1,tc);
+              weed_leaf_delete(event,"audio_clips");
+              weed_leaf_delete(event,"audio_seeks");
+            } else {
+              aclip_index=weed_get_int_array(event,"audio_clips",&error);
+              aseek_index=weed_get_double_array(event,"audio_seeks",&error);
+              new_aclip_index=(int *)lives_malloc(num_atracks*sizint);
+              new_aseek_index=(double *)lives_malloc(num_atracks*sizdbl);
+              j=0;
+              for (i=0; i<num_atracks; i+=2) {
+                if (aclip_index[i+1]>0) {
+                  if ((aclip_index[i+1]>MAX_FILES||renumbered_clips[aclip_index[i+1]]<1||
+                       mainw->files[renumbered_clips[aclip_index[i+1]]]==NULL)&&aseek_index[i+1]!=0.) {
+                    // clip has probably been closed, so we remove its frames
+                    ebuf=rec_error_add(ebuf,"Invalid audio clip number",aclip_index[i+1],tc);
+                    missing_clips=TRUE;
+                  } else {
+                    new_aclip_index[j]=aclip_index[i];
+                    new_aclip_index[j+1]=aclip_index[i+1];
+                    new_aseek_index[j]=aseek_index[i];
+                    new_aseek_index[j+1]=aseek_index[i+1];
+                    if (aseek_index[j+1]!=0.) add_atrack_to_list(aclip_index[i],aclip_index[i+1]);
+                    else remove_atrack_from_list(aclip_index[i]);
+                    j+=2;
+                  }
+                }
+                if (aclip_index[i]>-1) {
+                  if (mt!=NULL&&!mt->opts.pertrack_audio) {
+                    mt->opts.pertrack_audio=TRUE;
+                    // enable audio transitions
+                    lives_widget_set_sensitive(mt->fx_region_2a,TRUE);
+                    ebuf=rec_error_add(ebuf,"Adding pertrack audio",-1,tc);
+                  } else force_pertrack_audio=TRUE;
+                  // TODO ** inform user
+                }
+                if (aclip_index[i]==-1) {
+                  if (mt!=NULL&&mt->opts.back_audio_tracks==0) {
+                    mt->opts.back_audio_tracks=1;
+                    ebuf=rec_error_add(ebuf,"Adding backing audio",-1,tc);
+                  } else force_backing_tracks=1;
+                  // TODO ** inform user
+                }
+              }
+              if (j==0) {
+                weed_leaf_delete(event,"audio_clips");
+                weed_leaf_delete(event,"audio_seeks");
+              } else {
+                weed_set_int_array(event,"audio_clips",j,new_aclip_index);
+                weed_set_double_array(event,"audio_seeks",j,new_aseek_index);
+              }
+              lives_free(aclip_index);
+              lives_free(aseek_index);
+              lives_free(new_aclip_index);
+              lives_free(new_aseek_index);
+            }
+          }
+        }
       }
       break;
     case WEED_EVENT_HINT_MARKER:
       // check marker values
       if (!weed_plant_has_leaf(event,"lives_type")) {
-	ebuf=rec_error_add(ebuf,"Unknown marker type",-1,tc);
-	delete_event(event_list,event);
-	was_deleted=TRUE;
-      }
-      else {
-	marker_type=weed_get_int_value(event,"lives_type",&error);
-	if (marker_type!=EVENT_MARKER_BLOCK_START&&marker_type!=EVENT_MARKER_BLOCK_UNORDERED&&
-	    marker_type!=EVENT_MARKER_RECORD_END&&marker_type!=EVENT_MARKER_RECORD_START) {
-	  ebuf=rec_error_add(ebuf,"Unknown marker type",marker_type,tc);
-	  delete_event(event_list,event);
-	  was_deleted=TRUE;
-	}
-	if (marker_type==EVENT_MARKER_BLOCK_START&&!weed_plant_has_leaf(event,"tracks")) {
-	  ebuf=rec_error_add(ebuf,"Block start marker has no tracks",-1,tc);
-	  delete_event(event_list,event);
-	  was_deleted=TRUE;
-	}
+        ebuf=rec_error_add(ebuf,"Unknown marker type",-1,tc);
+        delete_event(event_list,event);
+        was_deleted=TRUE;
+      } else {
+        marker_type=weed_get_int_value(event,"lives_type",&error);
+        if (marker_type!=EVENT_MARKER_BLOCK_START&&marker_type!=EVENT_MARKER_BLOCK_UNORDERED&&
+            marker_type!=EVENT_MARKER_RECORD_END&&marker_type!=EVENT_MARKER_RECORD_START) {
+          ebuf=rec_error_add(ebuf,"Unknown marker type",marker_type,tc);
+          delete_event(event_list,event);
+          was_deleted=TRUE;
+        }
+        if (marker_type==EVENT_MARKER_BLOCK_START&&!weed_plant_has_leaf(event,"tracks")) {
+          ebuf=rec_error_add(ebuf,"Block start marker has no tracks",-1,tc);
+          delete_event(event_list,event);
+          was_deleted=TRUE;
+        }
       }
       break;
     default:
@@ -20654,7 +20998,7 @@
       was_deleted=TRUE;
     }
     if (!was_deleted&&check_filter_map&&last_filter_map!=NULL&&\
-	(event_next==NULL||get_event_timecode(event_next)>last_deinit_tc)) {
+        (event_next==NULL||get_event_timecode(event_next)>last_deinit_tc)) {
       // if our last filter_map refers to filter instances which were deinited, we must add another filter_map here
       ebuf=filter_map_check(trans_table,last_filter_map,last_deinit_tc,tc,ebuf);
       check_filter_map=FALSE;
@@ -20663,19 +21007,18 @@
 
     if (!was_deleted) {
       while (cur_tc<last_frame_tc) {
-	// add blank frames
-	if (!has_frame_event_at(event_list,cur_tc,&shortcut)) {
-	  if (shortcut!=NULL) {
-	    shortcut=duplicate_frame_at(event_list,shortcut,cur_tc);
-	    ebuf=rec_error_add(ebuf,"Duplicated frame at",-1,cur_tc);
-	  }
-	  else {
-	    event_list=insert_blank_frame_event_at(event_list,cur_tc,&shortcut);
-	    ebuf=rec_error_add(ebuf,"Inserted missing blank frame",-1,cur_tc);
-	  }
-	}
-	cur_tc+=U_SEC/fps;
-	cur_tc=q_gint64(cur_tc,fps);
+        // add blank frames
+        if (!has_frame_event_at(event_list,cur_tc,&shortcut)) {
+          if (shortcut!=NULL) {
+            shortcut=duplicate_frame_at(event_list,shortcut,cur_tc);
+            ebuf=rec_error_add(ebuf,"Duplicated frame at",-1,cur_tc);
+          } else {
+            event_list=insert_blank_frame_event_at(event_list,cur_tc,&shortcut);
+            ebuf=rec_error_add(ebuf,"Inserted missing blank frame",-1,cur_tc);
+          }
+        }
+        cur_tc+=U_SEC/fps;
+        cur_tc=q_gint64(cur_tc,fps);
       }
       last_tc=tc;
     }
@@ -20688,7 +21031,7 @@
   if (last_filter_map!=NULL) ebuf=add_null_filter_map(event_list,last_filter_map,last_tc,ebuf);
 
   last_event=get_last_event(event_list);
-  remove_end_blank_frames(event_list);
+  remove_end_blank_frames(event_list,TRUE);
 
   if (get_last_event(event_list)!=last_event) {
     last_event=get_last_event(event_list);
@@ -20714,34 +21057,34 @@
     case WEED_EVENT_HINT_FILTER_INIT:
       // if our in_parameters are int64, convert to void *
       if (weed_plant_has_leaf(event,"in_parameters")) {
-	uint64_t *pin_params;
-	void **nin_params;
-	num_params=weed_leaf_num_elements(event,"in_parameters");
-
-	if (weed_leaf_seed_type(event,"in_parameters")==WEED_SEED_INT64) {
-	  pin_params=(uint64_t *)weed_get_int64_array(event,"in_parameters",&error);
-	  nin_params=(void **)g_malloc(num_params*sizeof(void *));
-	  for (i=0;i<num_params;i++) {
-	    nin_params[i]=(void *)pin_params[i];
-	  }
-	  weed_free(pin_params);
-	  weed_leaf_delete(event,"in_parameters");
-	  weed_set_voidptr_array(event,"in_parameters",num_params,nin_params);
-	  g_free(nin_params);
-	}
-
-	filter_hash=weed_get_string_value(event,"filter",&error);
-	if ((filter_idx=weed_get_idx_for_hashname(filter_hash,TRUE))!=-1) {
-	  void **pchain;
-	  filter=get_weed_filter(filter_idx);
-	  // fill in any newly added params
-	  num_tracks=weed_leaf_num_elements(event,"in_tracks");
-	  pchain=filter_init_add_pchanges(event_list,filter,event,num_tracks,num_params);
-	  g_free(pchain);
-	}
+        uint64_t *pin_params;
+        void **nin_params;
+        num_params=weed_leaf_num_elements(event,"in_parameters");
+
+        if (weed_leaf_seed_type(event,"in_parameters")==WEED_SEED_INT64) {
+          pin_params=(uint64_t *)weed_get_int64_array(event,"in_parameters",&error);
+          nin_params=(void **)lives_malloc(num_params*sizeof(void *));
+          for (i=0; i<num_params; i++) {
+            nin_params[i]=(void *)pin_params[i];
+          }
+          lives_free(pin_params);
+          weed_leaf_delete(event,"in_parameters");
+          weed_set_voidptr_array(event,"in_parameters",num_params,nin_params);
+          lives_free(nin_params);
+        }
+
+        filter_hash=weed_get_string_value(event,"filter",&error);
+        if ((filter_idx=weed_get_idx_for_hashname(filter_hash,TRUE))!=-1) {
+          void **pchain;
+          filter=get_weed_filter(filter_idx);
+          // fill in any newly added params
+          num_tracks=weed_leaf_num_elements(event,"in_tracks");
+          pchain=filter_init_add_pchanges(event_list,filter,event,num_tracks,num_params);
+          lives_free(pchain);
+        }
       }
       if (mt!=NULL&&event!=mt->avol_init_event) {
-	if (!move_event_right(event_list,event,last_frame_tc!=tc,fps)) was_moved=TRUE;
+        if (!move_event_right(event_list,event,last_frame_tc!=tc,fps)) was_moved=TRUE;
       }
       break;
     case WEED_EVENT_HINT_PARAM_CHANGE:
@@ -20749,14 +21092,14 @@
       break;
     case WEED_EVENT_HINT_FILTER_DEINIT:
       if (mt!=NULL&&weed_get_voidptr_value(event,"init_event",&error)!=mt->avol_init_event) {
-	if (!move_event_left(event_list,event,last_frame_tc==tc,fps)) was_moved=TRUE;
+        if (!move_event_left(event_list,event,last_frame_tc==tc,fps)) was_moved=TRUE;
       }
       break;
     case WEED_EVENT_HINT_FILTER_MAP:
       if (last_filter_map_tc==tc) {
-	// remove last filter_map
-	ebuf=rec_error_add(ebuf,"Duplicate filter maps",-1,tc);
-	delete_event(event_list,last_filter_map);
+        // remove last filter_map
+        ebuf=rec_error_add(ebuf,"Duplicate filter maps",-1,tc);
+        delete_event(event_list,last_filter_map);
       }
       last_filter_map_tc=tc;
       last_filter_map=event;
@@ -20770,8 +21113,7 @@
     if (was_moved) {
       if (last_frame_event!=NULL) event=last_frame_event;
       else event=get_first_event(event_list);
-    }
-    else event=event_next;
+    } else event=event_next;
   }
 
   ebuf=add_missing_atrack_closers(event_list,fps,ebuf);
@@ -20780,14 +21122,12 @@
   else transient=mt->window;
 
   if (missing_clips&&missing_frames) {
-    bit2=g_strdup(_("clips and frames"));
-  }
-  else {
+    bit2=lives_strdup(_("clips and frames"));
+  } else {
     if (missing_clips) {
-      bit2=g_strdup(_("clips"));
-    }
-    else if (missing_frames) {
-      bit2=g_strdup(_("frames"));
+      bit2=lives_strdup(_("clips"));
+    } else if (missing_frames) {
+      bit2=lives_strdup(_("frames"));
     }
   }
 
@@ -20795,135 +21135,159 @@
 
   if (bit2!=NULL) {
     if (mt!=NULL&&mt->auto_reloading) {
-      g_free(bit1);
-      g_free(bit3);
-      bit1=g_strdup(_("\nAuto reload layout.\n"));
-      bit3=g_strdup_printf("\n%s",prefs->ar_layout_name);
+      lives_free(bit1);
+      lives_free(bit3);
+      bit1=lives_strdup(_("\nAuto reload layout.\n"));
+      bit3=lives_strdup_printf("\n%s",prefs->ar_layout_name);
     }
-    msg=g_strdup_printf(_("%s\nSome %s are missing from the layout%s\nTherefore it could not be loaded properly.\n"),
-			bit1,bit2,bit3);
+    msg=lives_strdup_printf(_("%s\nSome %s are missing from the layout%s\nTherefore it could not be loaded properly.\n"),
+                            bit1,bit2,bit3);
     do_error_dialog_with_check_transient(msg,TRUE,0,LIVES_WINDOW(transient));
-    g_free(msg);
-    g_free(bit2);
+    lives_free(msg);
+    lives_free(bit2);
     if (mt!=NULL) mt->layout_prompt=TRUE;
   }
-  g_free(bit1);
-  g_free(bit3);
+  lives_free(bit1);
+  lives_free(bit3);
 
 
-  g_free(ebuf); // TODO - allow option of viewing/saving this
+  lives_free(ebuf); // TODO - allow option of viewing/saving this
 
   return TRUE;
 }
 
 
 
-weed_plant_t *load_event_list(lives_mt *mt, gchar *eload_file) {
-  // load (deserialise) a serialised event_list
-  // after loading we perform sophisticated checks on it to detect
-  // and try to repair any errors in it
-  weed_plant_t *event_list=NULL;
 
-  LiVESWidget *ar_checkbutton;
+char *get_eload_filename(lives_mt *mt, boolean allow_auto_reload) {
   LiVESWidget *hbox;
+  LiVESWidget *ar_checkbutton;
 
-  gchar *filt[]={"*.lay",NULL};
-  gchar *startdir=NULL;
-  gchar *eload_dir;
-  gchar *msg;
-  gchar *com;
-  gchar *eload_name;
+  char *filt[]= {"*.lay",NULL};
 
-  boolean free_eload_file=TRUE;
-  boolean orig_ar_layout=prefs->ar_layout,ar_layout;
-  boolean retval=TRUE;
+  char *eload_dir;
+  char *eload_file;
+  char *startdir=NULL;
+  char *com;
 
-  int num_events=0;
-  int retval2;
-  int old_avol_fx=mt->avol_fx;
-  int fd;
+  boolean needs_idlefunc=FALSE;
 
-  if (mt->idlefunc>0) {
-    g_source_remove(mt->idlefunc);
-    mt->idlefunc=0;
+  if (!strlen(mainw->set_name)) {
+    LIVES_ERROR("Loading event list for unknown set");
+    return NULL;
   }
 
-  if (eload_file==NULL) {
-    if (!strlen(mainw->set_name)) {
-      LIVES_ERROR("Loading event list for unknown set");
-      mt->idlefunc=mt_idle_add(mt);
-      return NULL;
-    }
-
-    eload_dir=g_build_filename(prefs->tmpdir,mainw->set_name,"layouts",G_DIR_SEPARATOR_S,NULL);
+  eload_dir=lives_build_filename(prefs->tmpdir,mainw->set_name,"layouts",LIVES_DIR_SEPARATOR_S,NULL);
 
-    mainw->com_failed=FALSE;
-    g_mkdir_with_parents(eload_dir,S_IRWXU);
+  mainw->com_failed=FALSE;
+  lives_mkdir_with_parents(eload_dir,S_IRWXU);
 
-    if (!mainw->recoverable_layout&&!g_file_test(eload_dir,G_FILE_TEST_IS_DIR)) {
-      g_free(eload_dir);
-      mt->idlefunc=mt_idle_add(mt);
-      return NULL;
-    }
+  if (!mainw->recoverable_layout&&!lives_file_test(eload_dir,LIVES_FILE_TEST_IS_DIR)) {
+    lives_free(eload_dir);
+    return NULL;
+  }
 
-    startdir=g_strdup(eload_dir);
+  startdir=lives_strdup(eload_dir);
 
-    hbox = lives_hbox_new (FALSE, 0);
+  hbox = lives_hbox_new(FALSE, 0);
 
-    ar_checkbutton = lives_standard_check_button_new (_("_Autoreload each time"),TRUE,LIVES_BOX(hbox),NULL);
+  if (allow_auto_reload) {
+    ar_checkbutton = lives_standard_check_button_new(_("_Autoreload each time"),TRUE,LIVES_BOX(hbox),NULL);
 
-    lives_widget_show_all(hbox);
-    
     lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(ar_checkbutton),prefs->ar_layout);
-    lives_signal_connect (LIVES_GUI_OBJECT (ar_checkbutton), LIVES_WIDGET_TOGGLED_EVENT,
-		      LIVES_GUI_CALLBACK (on_autoreload_toggled),
-		      GINT_TO_POINTER(2));
-    eload_file=choose_file(startdir,NULL,filt,LIVES_FILE_CHOOSER_ACTION_OPEN,NULL,hbox);
+    lives_signal_connect(LIVES_GUI_OBJECT(ar_checkbutton), LIVES_WIDGET_TOGGLED_SIGNAL,
+                         LIVES_GUI_CALLBACK(on_autoreload_toggled),
+                         LIVES_INT_TO_POINTER(2));
+  }
 
-    g_free(startdir);
+  if (mt->idlefunc>0) {
+    lives_source_remove(mt->idlefunc);
+    mt->idlefunc=0;
+    needs_idlefunc=TRUE;
   }
-  else free_eload_file=FALSE;
 
-  ar_layout=prefs->ar_layout;
-  prefs->ar_layout=orig_ar_layout;
+  lives_widget_show_all(hbox);
+
+  eload_file=choose_file(startdir,NULL,filt,LIVES_FILE_CHOOSER_ACTION_OPEN,NULL,hbox);
+
+  lives_free(startdir);
 
   if (eload_file==NULL) {
     // if the user cancelled see if we can clear the directories
     // this will fail if there are any files in the directories
 
-    gchar *cdir;
+    char *cdir;
 #ifndef IS_MINGW
-    com=g_strdup_printf("/bin/rmdir \"%s\" 2>/dev/null",eload_dir);
+    com=lives_strdup_printf("%s \"%s\" 2>/dev/null",capable->rmdir_cmd,eload_dir);
 #else
-    com=g_strdup_printf("rmdir.exe \"%s\" 2>NUL",eload_dir);
+    com=lives_strdup_printf("rmdir.exe \"%s\" 2>NUL",eload_dir);
 #endif
     lives_system(com,TRUE);
-    g_free(com);
+    lives_free(com);
 
-    cdir=g_build_filename(prefs->tmpdir,mainw->set_name,NULL);
+    cdir=lives_build_filename(prefs->tmpdir,mainw->set_name,NULL);
 #ifndef IS_MINGW
-    com=g_strdup_printf("/bin/rmdir \"%s\" 2>/dev/null",cdir);
+    com=lives_strdup_printf("%s \"%s\" 2>/dev/null",capable->rmdir_cmd,cdir);
 #else
-    com=g_strdup_printf("rmdir.exe \"%s\" 2>NUL",cdir);
+    com=lives_strdup_printf("rmdir.exe \"%s\" 2>NUL",cdir);
 #endif
     lives_system(com,TRUE);
-    g_free(com);
+    lives_free(com);
+  }
 
-    g_free(eload_dir);
+  lives_free(eload_dir);
+
+  if (needs_idlefunc)
     mt->idlefunc=mt_idle_add(mt);
-    return NULL;
+
+  return eload_file;
+}
+
+
+
+
+weed_plant_t *load_event_list(lives_mt *mt, char *eload_file) {
+  // load (deserialise) a serialised event_list
+  // after loading we perform sophisticated checks on it to detect
+  // and try to repair any errors in it
+  weed_plant_t *event_list=NULL;
+
+  char *msg;
+  char *eload_name;
+
+  boolean free_eload_file=TRUE;
+  boolean orig_ar_layout=prefs->ar_layout,ar_layout;
+  boolean retval=TRUE;
+
+  int num_events=0;
+  int retval2;
+  int old_avol_fx=mt->avol_fx;
+  int fd;
+
+  if (mt->idlefunc>0) {
+    lives_source_remove(mt->idlefunc);
+    mt->idlefunc=0;
   }
 
-  if (free_eload_file) g_free(eload_dir);
+  if (eload_file==NULL) {
+    eload_file=get_eload_filename(mt,TRUE);
+    if (eload_file==NULL) {
+      mt->idlefunc=mt_idle_add(mt);
+      return NULL;
+    }
+  } else free_eload_file=FALSE;
+
+  ar_layout=prefs->ar_layout;
+  prefs->ar_layout=orig_ar_layout;
 
-  if (!mainw->recoverable_layout) eload_name=g_strdup(eload_file);
-  else eload_name=g_strdup(_("auto backup"));
+  if (!mainw->recoverable_layout) eload_name=lives_strdup(eload_file);
+  else eload_name=lives_strdup(_("auto backup"));
 
   if ((fd=lives_open_buffered_rdonly(eload_file))<0) {
-    msg=g_strdup_printf(_("\nUnable to load layout file %s\n"),eload_name);
+    msg=lives_strdup_printf(_("\nUnable to load layout file %s\n"),eload_name);
     do_error_dialog_with_check_transient(msg,TRUE,0,LIVES_WINDOW(mt->window));
-    g_free(msg);
-    g_free(eload_name);
+    lives_free(msg);
+    lives_free(eload_name);
     mt->idlefunc=mt_idle_add(mt);
     return NULL;
   }
@@ -20932,7 +21296,6 @@
   setmode(fd, O_BINARY);
 #endif
 
-
   event_list_free_undos(mt);
 
   if (mainw->event_list!=NULL) {
@@ -20941,11 +21304,9 @@
     mt_clear_timeline(mt);
   }
 
-  msg=g_strdup_printf(_("Loading layout from %s..."),eload_name);
   mainw->no_switch_dprint=TRUE;
-  d_print(msg);
+  d_print(_("Loading layout from %s..."),eload_name);
   mainw->no_switch_dprint=FALSE;
-  g_free(msg);
 
   mt_desensitise(mt);
 
@@ -20955,29 +21316,26 @@
     retval=0;
     if ((event_list=load_event_list_inner(mt,fd,TRUE,&num_events,NULL,NULL))==NULL) {
       lives_close_buffered(fd);
-      
+
       if (mainw->read_failed) {
-	retval=do_read_failed_error_s_with_retry(eload_name,NULL,NULL);
-	mainw->read_failed=FALSE;
+        retval=do_read_failed_error_s_with_retry(eload_name,NULL,NULL);
+        mainw->read_failed=FALSE;
       }
-      
-      if (retval!=LIVES_RETRY) {
-	if (mt->is_ready) mt_sensitise(mt);
-	g_free(eload_name);
-	mt->idlefunc=mt_idle_add(mt);
-	return NULL;
+
+      if (retval!=LIVES_RESPONSE_RETRY) {
+        if (mt->is_ready) mt_sensitise(mt);
+        lives_free(eload_name);
+        mt->idlefunc=mt_idle_add(mt);
+        return NULL;
       }
-    }
-    else lives_close_buffered(fd);
-  } while (retval==LIVES_RETRY);
+    } else lives_close_buffered(fd);
+  } while (retval==LIVES_RESPONSE_RETRY);
 
-  g_free(eload_name);
+  lives_free(eload_name);
 
   d_print_done();
 
-  msg=g_strdup_printf(_("Got %d events...processing..."),num_events);
-  d_print(msg);
-  g_free(msg);
+  d_print(_("Got %d events...processing..."),num_events);
 
   mt->auto_changed=mt->changed=mainw->recoverable_layout;
 
@@ -20986,7 +21344,7 @@
   cfile->progress_start=1;
   cfile->progress_end=num_events;
 
-  // event list loaded, now we set the pointers for filter_map (init_events), param_change (init_events and param chains), 
+  // event list loaded, now we set the pointers for filter_map (init_events), param_change (init_events and param chains),
   // filter_deinit (init_events)
   do_threaded_dialog(_("Checking and rebuilding event list"),FALSE);
 
@@ -20995,8 +21353,7 @@
   if (!mainw->recoverable_layout) {
     // re-map clips so our loaded event_list refers to the correct clips and frames
     rerenumber_clips(eload_file);
-  }
-  else {
+  } else {
     renumber_from_backup_layout_numbering(mt);
   }
 
@@ -21014,60 +21371,57 @@
   }
 
   if (event_list!=NULL) {
-    msg=g_strdup_printf(_("%d errors detected.\n"),elist_errors);
-    d_print(msg);
-    g_free(msg);
+    d_print(_("%d errors detected.\n"),elist_errors);
     if (!mt->auto_reloading) {
       if (!mt->layout_prompt||do_mt_rect_prompt()) {
 
-	do {
-	  retval2=0;
-	  retval=TRUE;
-
-	  // resave with corrections/updates
-	  fd=lives_creat_buffered(eload_file,DEF_FILE_PERMS);
-	  if (fd>=0) {
+        do {
+          retval2=0;
+          retval=TRUE;
+
+          // resave with corrections/updates
+          fd=lives_creat_buffered(eload_file,DEF_FILE_PERMS);
+          if (fd>=0) {
 #ifdef IS_MINGW
-	    setmode(fd,O_BINARY);
+            setmode(fd,O_BINARY);
 #endif
-	    retval=save_event_list_inner(NULL,fd,event_list,NULL);
-	    lives_close_buffered(fd);
-	  }
+            retval=save_event_list_inner(NULL,fd,event_list,NULL);
+            lives_close_buffered(fd);
+          }
 
-	  if (fd<0||!retval) {
-	    retval2=do_write_failed_error_s_with_retry(eload_file,(fd<0)?g_strerror(errno):NULL,NULL);
-	    if (retval2==LIVES_CANCEL) d_print_file_error_failed();
-	  }
-	} while (retval2==LIVES_RETRY);
+          if (fd<0||!retval) {
+            retval2=do_write_failed_error_s_with_retry(eload_file,(fd<0)?lives_strerror(errno):NULL,NULL);
+            if (retval2==LIVES_RESPONSE_CANCEL) d_print_file_error_failed();
+          }
+        } while (retval2==LIVES_RESPONSE_RETRY);
       }
     }
-  }
-  else d_print_failed();
+  } else d_print_failed();
 
   mt->layout_prompt=FALSE;
 
   if (mt->avol_fx==-1&&mainw->fx_candidates[FX_CANDIDATE_AUDIO_VOL].delegate!=-1) {
     // user (or system) has delegated an audio volume filter from the candidates
-    mt->avol_fx=GPOINTER_TO_INT(g_list_nth_data(mainw->fx_candidates[FX_CANDIDATE_AUDIO_VOL].list,
-						mainw->fx_candidates[FX_CANDIDATE_AUDIO_VOL].delegate));
+    mt->avol_fx=LIVES_POINTER_TO_INT(lives_list_nth_data(mainw->fx_candidates[FX_CANDIDATE_AUDIO_VOL].list,
+                                     mainw->fx_candidates[FX_CANDIDATE_AUDIO_VOL].delegate));
   }
 
   if (mt->avol_fx!=old_avol_fx&&mt->aparam_view_list!=NULL) {
     // audio volume effect changed, so we reset which parameters are viewed
-    g_list_free(mt->aparam_view_list);
+    lives_list_free(mt->aparam_view_list);
     mt->aparam_view_list=NULL;
   }
 
   if (event_list!=NULL) {
     if (!mainw->recoverable_layout) {
-      g_snprintf(mt->layout_name,PATH_MAX,"%s",eload_file);
+      lives_snprintf(mt->layout_name,PATH_MAX,"%s",eload_file);
       get_basename(mt->layout_name);
     }
 
     if (mt->layout_set_properties) msg=mt_set_vals_string();
-    else msg=g_strdup_printf(_("Multitrack fps set to %.3f\n"),cfile->fps);
+    else msg=lives_strdup_printf(_("Multitrack fps set to %.3f\n"),cfile->fps);
     d_print(msg);
-    g_free(msg);
+    lives_free(msg);
 
     set_mt_title(mt);
 
@@ -21075,12 +21429,11 @@
       prefs->ar_layout=FALSE;
       set_pref("ar_layout","");
       memset(prefs->ar_layout_name,0,1);
-    }
-    else {
+    } else {
       if (!mainw->recoverable_layout) {
-	prefs->ar_layout=TRUE;
-	set_pref("ar_layout",mt->layout_name);
-	g_snprintf(prefs->ar_layout_name,128,"%s",mt->layout_name);
+        prefs->ar_layout=TRUE;
+        set_pref("ar_layout",mt->layout_name);
+        lives_snprintf(prefs->ar_layout_name,128,"%s",mt->layout_name);
       }
     }
 
@@ -21092,7 +21445,7 @@
     lives_widget_show(mt->view_audio);
   }
 
-  if (free_eload_file) g_free(eload_file);
+  if (free_eload_file) lives_free(eload_file);
 
   if (!mainw->recoverable_layout) mt->idlefunc=mt_idle_add(mt);
 
@@ -21112,7 +21465,7 @@
     if (WEED_EVENT_IS_MARKER(event)) {
       marker_type=weed_get_int_value(event,"lives_type",&error);
       if (marker_type==EVENT_MARKER_BLOCK_START||marker_type==EVENT_MARKER_BLOCK_UNORDERED) {
-	delete_event(event_list,event);
+        delete_event(event_list,event);
       }
     }
     event=event_next;
@@ -21125,12 +21478,12 @@
 
   mt_desensitise(mt);
 
- if (mt->idlefunc>0) {
-    g_source_remove(mt->idlefunc);
+  if (mt->idlefunc>0) {
+    lives_source_remove(mt->idlefunc);
     mt->idlefunc=0;
   }
 
-  d_print(_("Layout was wiped.\n"));
+  print_layout_wiped();
 
   close_scrap_file();
   close_ascrap_file();
@@ -21142,7 +21495,7 @@
     memset(prefs->ar_layout_name,0,1);
     prefs->ar_layout=FALSE;
   }
-  
+
   event_list_free(mt->event_list);
   mt->event_list=NULL;
 
@@ -21158,16 +21511,16 @@
 
 
 
-void on_clear_event_list_activate (LiVESMenuItem *menuitem, gpointer user_data) {
+void on_clear_event_list_activate(LiVESMenuItem *menuitem, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   _entryw *cdsw;
 
   int resp=2;
-  
-  boolean rev_resp=FALSE; // if TRUE, response values 1 and 2 are reversed; otherwise
+
+  boolean rev_resp=FALSE; // if TRUE, a return value of 2 means save, otherwise it means delete
 
   if (mt->idlefunc>0) {
-    g_source_remove(mt->idlefunc);
+    lives_source_remove(mt->idlefunc);
     mt->idlefunc=0;
   }
 
@@ -21176,8 +21529,7 @@
     // wipe : 1
     cdsw=create_cds_dialog(2);
     rev_resp=FALSE;
-  }
-  else {
+  } else {
     // save: 2
     // wipe: 1
     cdsw=create_cds_dialog(3);
@@ -21198,34 +21550,33 @@
   } while (resp==2&&rev_resp);
 
   lives_widget_destroy(cdsw->dialog);
-  g_free(cdsw);
+  lives_free(cdsw);
 
-  if (resp==0) {
+  if (resp==LIVES_RESPONSE_CANCEL) {
     mt->idlefunc=mt_idle_add(mt);
     return; // cancel
   }
 
   if (resp==2&&!rev_resp) {
     // delete from disk
-    GList *layout_map=NULL;
-    gchar *lmap_file;
+    LiVESList *layout_map=NULL;
+    char *lmap_file;
     if (!do_yesno_dialog("\nLayout will be deleted from the disk.\nAre you sure ?\n")) {
       mt->idlefunc=mt_idle_add(mt);
       return;
     }
 
-    lmap_file=g_build_filename("tmpdir",mainw->set_name,"layouts",mt->layout_name,NULL);
-    layout_map=g_list_append(layout_map,lmap_file);
+    lmap_file=lives_build_filename("tmpdir",mainw->set_name,"layouts",mt->layout_name,NULL);
+    layout_map=lives_list_append(layout_map,lmap_file);
     remove_layout_files(layout_map);
-    g_free(lmap_file);
-  }
-  else {
+    lives_free(lmap_file);
+  } else {
     // wipe
     if (mt->changed) {
       if (!do_yesno_dialog_with_check(_("The current layout has changes which have not been saved.\nAre you sure you wish to wipe it ?\n"),
-				      WARN_MASK_LAYOUT_WIPE)) {
-	mt->idlefunc=mt_idle_add(mt);
-	return;
+                                      WARN_MASK_LAYOUT_WIPE)) {
+        mt->idlefunc=mt_idle_add(mt);
+        return;
       }
     }
   }
@@ -21238,28 +21589,27 @@
 
 
 
-void on_load_event_list_activate (LiVESMenuItem *menuitem, gpointer user_data) {
+boolean on_load_event_list_activate(LiVESMenuItem *menuitem, livespointer user_data) {
   int i;
   lives_mt *mt=(lives_mt *)user_data;
   weed_plant_t *new_event_list;
-  gchar *eload_file=NULL;
 
-  if (!check_for_layout_del(mt,FALSE)) return;
+  if (mainw->interactive)
+    if (!check_for_layout_del(mt,FALSE)) return FALSE;
 
   if (mt->idlefunc>0) {
-    g_source_remove(mt->idlefunc);
+    lives_source_remove(mt->idlefunc);
     mt->idlefunc=0;
   }
 
-  new_event_list=load_event_list(mt,eload_file);
-  if (eload_file!=NULL) g_free(eload_file);
+  new_event_list=load_event_list(mt,mt->force_load_name);
 
   if (mainw->was_set) recover_layout_cancelled(FALSE);
 
   if (new_event_list==NULL) {
     mt_sensitise(mt);
     mt->idlefunc=mt_idle_add(mt);
-    return;
+    return FALSE;
   }
 
   if (mt->event_list!=NULL) event_list_free(mt->event_list);
@@ -21267,15 +21617,15 @@
 
   mt->undo_buffer_used=0;
   mt->undo_offset=0;
-  g_list_free(mt->undos);
+  lives_list_free(mt->undos);
   mt->undos=NULL;
   mt_set_undoable(mt,MT_UNDO_NONE,NULL,FALSE);
   mt_set_redoable(mt,MT_UNDO_NONE,NULL,FALSE);
 
-  for (i=0;i<mt->num_video_tracks;i++) {
+  for (i=0; i<mt->num_video_tracks; i++) {
     delete_video_track(mt,i,FALSE);
   }
-  g_list_free(mt->video_draws);
+  lives_list_free(mt->video_draws);
   mt->video_draws=NULL;
   mt->num_video_tracks=0;
 
@@ -21284,12 +21634,12 @@
   delete_audio_tracks(mt,mt->audio_draws,FALSE);
   mt->audio_draws=NULL;
 
-  if (mt->audio_vols!=NULL) g_list_free(mt->audio_vols);
+  if (mt->audio_vols!=NULL) lives_list_free(mt->audio_vols);
   mt->audio_vols=NULL;
 
   mt->event_list=new_event_list;
 
-  if (mt->selected_tracks!=NULL) g_list_free(mt->selected_tracks);
+  if (mt->selected_tracks!=NULL) lives_list_free(mt->selected_tracks);
   mt->selected_tracks=NULL;
 
   mt_init_tracks(mt,TRUE);
@@ -21304,11 +21654,13 @@
   mt_show_current_frame(mt, FALSE);
 
   mt->idlefunc=mt_idle_add(mt);
+
+  return TRUE;
 }
 
 
 
-void migrate_layouts (const gchar *old_set_name, const gchar *new_set_name) {
+void migrate_layouts(const char *old_set_name, const char *new_set_name) {
   // if we change the name of a set, we must also update the layouts - at the very least 2 things need to happen
   // 1) the "needs_set" leaf in each layout must be updated
   // 2) the layouts will be physically moved, so if appending we check for name collisions
@@ -21323,167 +21675,167 @@
 
 
 
-  // load each event_list in mainw->layout_map_list
-  GList *map=mainw->current_layouts_map;
+  // load each event_list in mainw->current_layouts_map
+  LiVESList *map=mainw->current_layouts_map;
   int fd;
   int i;
   int retval2=0;
   weed_plant_t *event_list;
-  gchar *tmp;
+  char *tmp;
   boolean retval=TRUE;
 
-  gchar *changefrom=NULL;
+  char *changefrom=NULL;
   size_t chlen;
 
   // TODO - dirsep
 
   if (old_set_name!=NULL) {
-    changefrom=g_build_filename(prefs->tmpdir,old_set_name,"layouts/",NULL);
+    changefrom=lives_build_filename(prefs->tmpdir,old_set_name,"layouts/",NULL);
     chlen=strlen(changefrom);
-  }
-  else chlen=0;
+  } else chlen=0;
 
   while (map!=NULL) {
     if (old_set_name!=NULL) {
       // load and save each layout, updating the "needs_set" leaf
       do {
-	retval2=0;
-	if ((fd=lives_open_buffered_rdonly((gchar *)map->data))>-1) {
-	  if ((event_list=load_event_list_inner(NULL,fd,FALSE,NULL,NULL,NULL))!=NULL) {
-	    lives_close_buffered (fd);
-	    // adjust the value of "needs_set" to new_set_name
-	    weed_set_string_value(event_list,"needs_set",new_set_name);
-	    // save the event_list with the same name
-	    unlink((char *)map->data);
-	    
-	    do {
-	      retval2=0;
-	      fd=lives_creat_buffered((char *)map->data,DEF_FILE_PERMS);
-	      if (fd>=0) {
+        retval2=0;
+        if ((fd=lives_open_buffered_rdonly((char *)map->data))>-1) {
+          if ((event_list=load_event_list_inner(NULL,fd,FALSE,NULL,NULL,NULL))!=NULL) {
+            lives_close_buffered(fd);
+            // adjust the value of "needs_set" to new_set_name
+            weed_set_string_value(event_list,"needs_set",(tmp=F2U8(new_set_name)));
+            lives_free(tmp);
+            // save the event_list with the same name
+            unlink((char *)map->data);
+
+            do {
+              retval2=0;
+              fd=lives_creat_buffered((char *)map->data,DEF_FILE_PERMS);
+              if (fd>=0) {
 #ifdef IS_MINGW
-		setmode(fd,O_BINARY);
+                setmode(fd,O_BINARY);
 #endif
-		retval=save_event_list_inner(NULL,fd,event_list,NULL);
-	      }
-	      if (fd<0||!retval) {
-		if (fd>0) lives_close_buffered(fd);
-		retval2=do_write_failed_error_s_with_retry((char *)map->data,(fd<0)?g_strerror(errno):NULL,NULL);
-	      }
-	    } while (retval2==LIVES_RETRY);
-	    
-	    event_list_free(event_list);
-	  }
-	  if (retval2==0) lives_close_buffered(fd);
-	}
-	else {
-	  retval2=do_read_failed_error_s_with_retry((char *)map->data,NULL,NULL);
-	}
-	
-      } while (retval2==LIVES_RETRY);
+                retval=save_event_list_inner(NULL,fd,event_list,NULL);
+              }
+              if (fd<0||!retval) {
+                if (fd>0) lives_close_buffered(fd);
+                retval2=do_write_failed_error_s_with_retry((char *)map->data,(fd<0)?lives_strerror(errno):NULL,NULL);
+              }
+            } while (retval2==LIVES_RESPONSE_RETRY);
+
+            event_list_free(event_list);
+          }
+          if (retval2==0) lives_close_buffered(fd);
+        } else {
+          retval2=do_read_failed_error_s_with_retry((char *)map->data,NULL,NULL);
+        }
+
+      } while (retval2==LIVES_RESPONSE_RETRY);
     }
 
     if (old_set_name!=NULL&&!strncmp((char *)map->data,changefrom,chlen)) {
       // update entries in mainw->current_layouts_map
-      tmp=g_build_filename(prefs->tmpdir,new_set_name,"layouts",(char *)map->data+chlen,NULL);
-      if (g_file_test(tmp,G_FILE_TEST_EXISTS)) {
-	gchar *com;
-	// prevent duplication of layouts
-	g_free(tmp);
+      tmp=lives_build_filename(prefs->tmpdir,new_set_name,"layouts",(char *)map->data+chlen,NULL);
+      if (lives_file_test(tmp,LIVES_FILE_TEST_EXISTS)) {
+        char *com;
+        // prevent duplication of layouts
+        lives_free(tmp);
 #ifndef IS_MINGW
-	tmp=g_strdup_printf("%s/%s/layouts/%s-%s",prefs->tmpdir,new_set_name,old_set_name,(char *)map->data+chlen);
-	com=g_strdup_printf("/bin/mv \"%s\" \"%s\"",(gchar *)map->data,tmp);
+        tmp=lives_strdup_printf("%s/%s/layouts/%s-%s",prefs->tmpdir,new_set_name,old_set_name,(char *)map->data+chlen);
+        com=lives_strdup_printf("%s \"%s\" \"%s\"",capable->mv_cmd,(char *)map->data,tmp);
 #else
-	tmp=g_strdup_printf("%s\\%s\\layouts\\%s-%s",prefs->tmpdir,new_set_name,old_set_name,(char *)map->data+chlen);
-	com=g_strdup_printf("mv.exe \"%s\" \"%s\"",(gchar *)map->data,tmp);
+        tmp=lives_strdup_printf("%s\\%s\\layouts\\%s-%s",prefs->tmpdir,new_set_name,old_set_name,(char *)map->data+chlen);
+        com=lives_strdup_printf("mv.exe \"%s\" \"%s\"",(char *)map->data,tmp);
 #endif
-	lives_system(com,FALSE);
-	g_free(com);
+        lives_system(com,FALSE);
+        lives_free(com);
       }
-      g_free(map->data);
+      lives_free((livespointer)map->data);
       map->data=tmp;
     }
     map=map->next;
   }
 
   // update layout_map's in mainw->files
-  for (i=1;i<=MAX_FILES;i++) {
+  for (i=1; i<=MAX_FILES; i++) {
     if (mainw->files[i]!=NULL) {
       if (mainw->files[i]->layout_map!=NULL) {
-	map=mainw->files[i]->layout_map;
-	while (map!=NULL) {
-	  if (map->data!=NULL) {
-	    if ((old_set_name!=NULL&&!strncmp((char *)map->data,changefrom,chlen))||
-		(old_set_name==NULL&&(strstr((char *)map->data,new_set_name)==NULL))) {
-
-	      gchar **array=g_strsplit((gchar *)map->data,"|",-1);
-	      size_t origlen=strlen(array[0]);
-	      gchar *tmp2=g_build_filename(prefs->tmpdir,new_set_name,"layouts",array[0]+chlen,NULL);
-	      if (g_file_test(tmp2,G_FILE_TEST_EXISTS)) {
-		tmp2=g_strdup_printf("%s/%s/layouts/%s-%s",prefs->tmpdir,new_set_name,old_set_name,array[0]+chlen);
-	      }
-	      tmp=g_strdup_printf("%s%s",tmp2,(gchar *)map->data+origlen);
-	      g_free(tmp2);
-	      g_strfreev(array);
-
-
-	      g_free(map->data);
-	      map->data=tmp;
-	    }
-	    map=map->next;
-	  }
-	}
+        map=mainw->files[i]->layout_map;
+        while (map!=NULL) {
+          if (map->data!=NULL) {
+            if ((old_set_name!=NULL&&!strncmp((char *)map->data,changefrom,chlen))||
+                (old_set_name==NULL&&(strstr((char *)map->data,new_set_name)==NULL))) {
+
+              char **array=lives_strsplit((char *)map->data,"|",-1);
+              size_t origlen=strlen(array[0]);
+              char *tmp2=lives_build_filename(prefs->tmpdir,new_set_name,"layouts",array[0]+chlen,NULL);
+              if (lives_file_test(tmp2,LIVES_FILE_TEST_EXISTS)) {
+                tmp2=lives_strdup_printf("%s/%s/layouts/%s-%s",prefs->tmpdir,new_set_name,old_set_name,array[0]+chlen);
+              }
+              tmp=lives_strdup_printf("%s%s",tmp2,(char *)map->data+origlen);
+              lives_free(tmp2);
+              lives_strfreev(array);
+
+
+              lives_free((livespointer)map->data);
+              map->data=tmp;
+            }
+            map=map->next;
+          }
+        }
       }
     }
   }
 
   // update mainw->affected_layouts_map
-  map=mainw->affected_layouts_map; 
+  map=mainw->affected_layouts_map;
   while (map!=NULL) {
     if ((old_set_name!=NULL&&!strncmp((char *)map->data,changefrom,chlen))||
-	(old_set_name==NULL&&(strstr((char *)map->data,new_set_name)==NULL))) {
+        (old_set_name==NULL&&(strstr((char *)map->data,new_set_name)==NULL))) {
       if (strcmp(mainw->string_constants[LIVES_STRING_CONSTANT_CL],(char *)map->data+chlen)) {
-	tmp=g_build_filename(prefs->tmpdir,new_set_name,"layouts",(char *)map->data+chlen,NULL);
-	if (g_file_test(tmp,G_FILE_TEST_EXISTS)) {
-	  g_free(tmp);
-	  tmp=g_strdup_printf("%s/%s/layouts/%s-%s",prefs->tmpdir,new_set_name,old_set_name,(char *)map->data+chlen);
-	}
-	g_free(map->data);
-	map->data=tmp;
+        tmp=lives_build_filename(prefs->tmpdir,new_set_name,"layouts",(char *)map->data+chlen,NULL);
+        if (lives_file_test(tmp,LIVES_FILE_TEST_EXISTS)) {
+          lives_free(tmp);
+          tmp=lives_strdup_printf("%s/%s/layouts/%s-%s",prefs->tmpdir,new_set_name,old_set_name,(char *)map->data+chlen);
+        }
+        lives_free((livespointer)map->data);
+        map->data=tmp;
       }
     }
     map=map->next;
   }
-  if (changefrom!=NULL) g_free(changefrom);
+  if (changefrom!=NULL) lives_free(changefrom);
 }
 
 
 
-GList *layout_frame_is_affected(int clipno, int frame) {
+LiVESList *layout_frame_is_affected(int clipno, int frame) {
   // return list of names of layouts which are affected, or NULL
   // list and list->data should be freed after use
 
-  gchar **array;
-  GList *lmap=mainw->files[clipno]->layout_map;
+  char **array;
+  LiVESList *lmap=mainw->files[clipno]->layout_map;
   double orig_fps;
   int resampled_frame;
 
   if (mainw->stored_event_list!=NULL&&mainw->files[clipno]->stored_layout_frame!=0) {
     // see if it affects the current layout
-    resampled_frame=count_resampled_frames(mainw->files[clipno]->stored_layout_frame,mainw->files[clipno]->stored_layout_fps,mainw->files[clipno]->fps);
-    if (frame<=resampled_frame) mainw->xlays=g_list_append_unique(mainw->xlays,mainw->string_constants[LIVES_STRING_CONSTANT_CL]);
+    resampled_frame=count_resampled_frames(mainw->files[clipno]->stored_layout_frame,mainw->files[clipno]->stored_layout_fps,
+                                           mainw->files[clipno]->fps);
+    if (frame<=resampled_frame) mainw->xlays=lives_list_append_unique(mainw->xlays,mainw->string_constants[LIVES_STRING_CONSTANT_CL]);
   }
 
   while (lmap!=NULL) {
-    array=g_strsplit((char *)lmap->data,"|",-1);
+    array=lives_strsplit((char *)lmap->data,"|",-1);
     if (atoi(array[2])!=0) {
       orig_fps=strtod(array[3],NULL);
       resampled_frame=count_resampled_frames(atoi(array[2]),orig_fps,mainw->files[clipno]->fps);
       if (array[2]==0) resampled_frame=0;
       if (frame<=resampled_frame) {
-	mainw->xlays=g_list_append_unique(mainw->xlays,array[0]);
+        mainw->xlays=lives_list_append_unique(mainw->xlays,array[0]);
       }
     }
-    g_strfreev(array);
+    lives_strfreev(array);
     lmap=lmap->next;
   }
 
@@ -21492,9 +21844,9 @@
 
 
 
-GList *layout_audio_is_affected(int clipno, double time) {
-  gchar **array;
-  GList *lmap=mainw->files[clipno]->layout_map;
+LiVESList *layout_audio_is_affected(int clipno, double time) {
+  char **array;
+  LiVESList *lmap=mainw->files[clipno]->layout_map;
   double max_time;
 
   if (mainw->files[clipno]->arate==0) return mainw->xlays;
@@ -21504,18 +21856,18 @@
 
   if (mainw->stored_event_list!=NULL) {
     // see if it affects the current layout
-    if (mainw->files[clipno]->stored_layout_audio>0.&&time<=mainw->files[clipno]->stored_layout_audio) 
-      mainw->xlays=g_list_append_unique(mainw->xlays,mainw->string_constants[LIVES_STRING_CONSTANT_CL]);
+    if (mainw->files[clipno]->stored_layout_audio>0.&&time<=mainw->files[clipno]->stored_layout_audio)
+      mainw->xlays=lives_list_append_unique(mainw->xlays,mainw->string_constants[LIVES_STRING_CONSTANT_CL]);
   }
 
   while (lmap!=NULL) {
     if (get_token_count((char *)lmap->data,'|')<5) continue;
-    array=g_strsplit((char *)lmap->data,"|",-1);
+    array=lives_strsplit((char *)lmap->data,"|",-1);
     max_time=strtod(array[4],NULL);
     if (max_time>0.&&time<=max_time) {
-      mainw->xlays=g_list_append_unique(mainw->xlays,array[0]);
+      mainw->xlays=lives_list_append_unique(mainw->xlays,array[0]);
     }
-    g_strfreev(array);
+    lives_strfreev(array);
     lmap=lmap->next;
   }
 
@@ -21523,7 +21875,7 @@
 }
 
 
-void mt_change_disp_tracks_ok (LiVESButton *button, gpointer user_data) {
+void mt_change_disp_tracks_ok(LiVESButton *button, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   lives_general_button_clicked(button,NULL);
   mt->max_disp_vtracks=mainw->fx1_val;
@@ -21534,11 +21886,11 @@
 
 ///////////////////////////////////////////////
 
-void show_frame_events_activate (LiVESMenuItem *menuitem, gpointer user_data) {
+void show_frame_events_activate(LiVESMenuItem *menuitem, livespointer user_data) {
   prefs->event_window_show_frame_events=!prefs->event_window_show_frame_events;
 }
 
-void mt_change_max_disp_tracks (LiVESMenuItem *menuitem, gpointer user_data) {
+void mt_change_max_disp_tracks(LiVESMenuItem *menuitem, livespointer user_data) {
   LiVESWidget *dialog;
   lives_mt *mt=(lives_mt *)user_data;
 
@@ -21548,21 +21900,21 @@
 
 }
 
-void mt_load_vals_toggled (LiVESMenuItem *menuitem, gpointer user_data) {
+void mt_load_vals_toggled(LiVESMenuItem *menuitem, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   mt->ignore_load_vals=!mt->ignore_load_vals;
 }
 
 
-static void mt_ac_audio_toggled (LiVESMenuItem *menuitem, gpointer user_data) {
+static void mt_ac_audio_toggled(LiVESMenuItem *menuitem, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   mt->opts.autocross_audio=!mt->opts.autocross_audio;
 }
 
-void mt_change_vals_activate (LiVESMenuItem *menuitem, gpointer user_data) {
+void mt_change_vals_activate(LiVESMenuItem *menuitem, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   boolean response;
-  gchar *msg;
+  char *msg;
 
   rdet=create_render_details(4);  // WARNING !! - rdet is global in events.h
   lives_widget_show_all(rdet->always_hbox);
@@ -21571,50 +21923,49 @@
     rdet->suggestion_followed=FALSE;
     if ((response=lives_dialog_run(LIVES_DIALOG(rdet->dialog)))==LIVES_RESPONSE_OK) {
       if (rdet->enc_changed) {
-	check_encoder_restrictions(FALSE,FALSE,TRUE);
+        check_encoder_restrictions(FALSE,FALSE,TRUE);
       }
     }
   } while (rdet->suggestion_followed);
-  
-  xarate=(int)atoi (lives_entry_get_text(LIVES_ENTRY(resaudw->entry_arate)));
-  xachans=(int)atoi (lives_entry_get_text(LIVES_ENTRY(resaudw->entry_achans)));
-  xasamps=(int)atoi (lives_entry_get_text(LIVES_ENTRY(resaudw->entry_asamps)));
-  
+
+  xarate=(int)atoi(lives_entry_get_text(LIVES_ENTRY(resaudw->entry_arate)));
+  xachans=(int)atoi(lives_entry_get_text(LIVES_ENTRY(resaudw->entry_achans)));
+  xasamps=(int)atoi(lives_entry_get_text(LIVES_ENTRY(resaudw->entry_asamps)));
+
   if (lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(resaudw->rb_unsigned))) {
     xse=AFORM_UNSIGNED;;
-  }
-  else cfile->signed_endian=0;
+  } else cfile->signed_endian=0;
   if (lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(resaudw->rb_bigend))) {
     xse|=AFORM_BIG_ENDIAN;
   }
-  
+
   if (!lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(resaudw->aud_checkbutton))) {
     xachans=0;
   }
 
-  
+
   if (response==LIVES_RESPONSE_CANCEL) {
-    lives_widget_destroy (rdet->dialog); 
-    g_free(rdet->encoder_name);
-    g_free(rdet);
+    lives_widget_destroy(rdet->dialog);
+    lives_free(rdet->encoder_name);
+    lives_free(rdet);
     rdet=NULL;
-    if (resaudw!=NULL) g_free(resaudw);
+    if (resaudw!=NULL) lives_free(resaudw);
     resaudw=NULL;
     return;
   }
 
   if (xachans==0&&mt->audio_draws!=NULL) {
-    GList *slist=mt->audio_draws;
+    LiVESList *slist=mt->audio_draws;
     while (slist!=NULL) {
-      if (g_object_get_data(G_OBJECT(slist->data),"blocks")!=NULL) {
-	do_mt_no_audchan_error();
-	lives_widget_destroy (rdet->dialog); 
-	g_free(rdet->encoder_name);
-	g_free(rdet);
-	rdet=NULL;
-	if (resaudw!=NULL) g_free(resaudw);
-	resaudw=NULL;
-	return;
+      if (lives_widget_object_get_data(LIVES_WIDGET_OBJECT(slist->data),"blocks")!=NULL) {
+        do_mt_no_audchan_error();
+        lives_widget_destroy(rdet->dialog);
+        lives_free(rdet->encoder_name);
+        lives_free(rdet);
+        rdet=NULL;
+        if (resaudw!=NULL) lives_free(resaudw);
+        resaudw=NULL;
+        return;
       }
       slist=slist->next;
     }
@@ -21641,15 +21992,14 @@
     set_boolean_pref("mt_pertrack_audio",prefs->mt_pertrack_audio);
     prefs->mt_backaudio=btaud;
     set_int_pref("mt_backaudio",prefs->mt_backaudio);
-  }
-  else {
+  } else {
     if (!prefs->mt_enter_prompt) {
       prefs->mt_enter_prompt=TRUE;
       set_boolean_pref("mt_enter_prompt",prefs->mt_enter_prompt);
     }
   }
 
-  lives_widget_destroy (rdet->dialog); 
+  lives_widget_destroy(rdet->dialog);
 
   mt->user_width=rdet->width;
   mt->user_height=rdet->height;
@@ -21658,18 +22008,18 @@
   mt->user_achans=xachans;
   mt->user_asamps=xasamps;
   mt->user_signed_endian=xse;
-  
 
-  g_free(rdet->encoder_name);
-  g_free(rdet);
+
+  lives_free(rdet->encoder_name);
+  lives_free(rdet);
   rdet=NULL;
-  if (resaudw!=NULL) g_free(resaudw);
+  if (resaudw!=NULL) lives_free(resaudw);
   resaudw=NULL;
 
   msg=set_values_from_defs(mt,FALSE);
   if (msg!=NULL) {
     d_print(msg);
-    g_free(msg);
+    lives_free(msg);
 
     set_mt_title(mt);
   }
@@ -21685,10 +22035,9 @@
 
     if (mt->amixer!=NULL) on_amixer_close_clicked(NULL,mt);
 
-    if (mt->audio_vols!=NULL) g_list_free(mt->audio_vols);
+    if (mt->audio_vols!=NULL) lives_list_free(mt->audio_vols);
     mt->audio_vols=NULL;
-  }
-  else {
+  } else {
     lives_widget_show(mt->render_sep);
     lives_widget_show(mt->render_vid);
     lives_widget_show(mt->render_aud);
@@ -21704,7 +22053,7 @@
   int i,j;
   uint32_t tot=0;
   weed_plant_t *event=get_first_event(event_list);
-  gchar **leaves;
+  char **leaves;
   int ne;
   int tot_events=0;
 
@@ -21712,53 +22061,54 @@
   save_event_list_inner(mt,-1,event_list,NULL);
 
   while (event!=NULL) {
-    if (WEED_EVENT_IS_FILTER_INIT(event)) weed_set_voidptr_value(event,"event_id",(void *)event);
+    if (WEED_EVENT_IS_FILTER_INIT(event)) weed_set_int64_value(event,"event_id",(uint64_t)((void *)event));
     tot_events++;
     leaves=weed_plant_list_leaves(event);
     tot+=sizint; //number of leaves
-    for (i=0;leaves[i]!=NULL;i++) {
+    for (i=0; leaves[i]!=NULL; i++) {
       tot+=sizint*3+strlen(leaves[i]); // key_length, seed_type, num_elements
       ne=weed_leaf_num_elements(event,leaves[i]);
       // sum data_len + data
-      for (j=0;j<ne;j++) tot+=sizint+weed_leaf_element_size(event,leaves[i],j);
-      weed_free(leaves[i]);
+      for (j=0; j<ne; j++) tot+=sizint+weed_leaf_element_size(event,leaves[i],j);
+      lives_free(leaves[i]);
     }
-    weed_free(leaves);
+    lives_free(leaves);
     event=get_next_event(event);
   }
 
   event=event_list;
   leaves=weed_plant_list_leaves(event);
   tot+=sizint;
-  for (i=0;leaves[i]!=NULL;i++) {
+  for (i=0; leaves[i]!=NULL; i++) {
     tot+=sizint*3+strlen(leaves[i]);
     ne=weed_leaf_num_elements(event,leaves[i]);
     // sum data_len + data
-    for (j=0;j<ne;j++) tot+=sizint+weed_leaf_element_size(event,leaves[i],j);
-    weed_free(leaves[i]);
+    for (j=0; j<ne; j++) tot+=sizint+weed_leaf_element_size(event,leaves[i],j);
+    lives_free(leaves[i]);
   }
-  weed_free(leaves);
+  lives_free(leaves);
 
   if (num_events!=NULL) *num_events=tot_events;
   return tot;
 }
 
 
-void on_amixer_close_clicked (LiVESButton *button, lives_mt *mt) {
+void on_amixer_close_clicked(LiVESButton *button, lives_mt *mt) {
   lives_amixer_t *amixer=mt->amixer;
   int i;
   double val;
 
+  if (!mainw->interactive) return;
+
   mt->opts.gang_audio=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(amixer->gang_checkbutton));
 
   // set vols from slider vals
 
-  for (i=0;i<amixer->nchans;i++) {
+  for (i=0; i<amixer->nchans; i++) {
 #if ENABLE_GIW
     if (prefs->lamp_buttons) {
       val=giw_vslider_get_value(GIW_VSLIDER(amixer->ch_sliders[i]));
-    }
-    else {
+    } else {
 #endif
       val=lives_range_get_value(LIVES_RANGE(amixer->ch_sliders[i]));
 #if ENABLE_GIW
@@ -21768,39 +22118,40 @@
   }
 
   lives_general_button_clicked(button,NULL);
-  g_free(amixer->ch_sliders);
-  g_free(amixer->ch_slider_fns);
-  g_free(amixer);
+  lives_free(amixer->ch_sliders);
+  lives_free(amixer->ch_slider_fns);
+  lives_free(amixer);
   mt->amixer=NULL;
-  if (mt->audio_vols_back!=NULL) g_list_free(mt->audio_vols_back);
+  if (mt->audio_vols_back!=NULL) lives_list_free(mt->audio_vols_back);
   //lives_widget_set_sensitive(mt->prerender_aud,TRUE);
 
 }
 
 
-static void on_amixer_reset_clicked (LiVESButton *button, lives_mt *mt) {
+static void on_amixer_reset_clicked(LiVESButton *button, lives_mt *mt) {
   lives_amixer_t *amixer=mt->amixer;
   int i;
 
+  if (!mainw->interactive) return;
+
   lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(amixer->inv_checkbutton),FALSE);
   lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(amixer->gang_checkbutton),mt->opts.gang_audio);
 
   // copy vols to slider vals
 
-  for (i=0;i<amixer->nchans;i++) {
+  for (i=0; i<amixer->nchans; i++) {
 
 #if ENABLE_GIW
     if (prefs->lamp_buttons) {
       lives_signal_handler_block(giw_vslider_get_adjustment(GIW_VSLIDER(amixer->ch_sliders[i])),amixer->ch_slider_fns[i]);
-      giw_vslider_set_value(GIW_VSLIDER(amixer->ch_sliders[i]),(double)GPOINTER_TO_INT
-			    (g_list_nth_data(mt->audio_vols_back,i))/LIVES_AVOL_SCALE);
+      giw_vslider_set_value(GIW_VSLIDER(amixer->ch_sliders[i]),(double)LIVES_POINTER_TO_INT
+                            (lives_list_nth_data(mt->audio_vols_back,i))/LIVES_AVOL_SCALE);
       lives_signal_handler_unblock(giw_vslider_get_adjustment(GIW_VSLIDER(amixer->ch_sliders[i])),amixer->ch_slider_fns[i]);
-    }
-    else {
+    } else {
 #endif
       lives_signal_handler_block(lives_range_get_adjustment(LIVES_RANGE(amixer->ch_sliders[i])),amixer->ch_slider_fns[i]);
-      lives_range_set_value(LIVES_RANGE(amixer->ch_sliders[i]),(double)GPOINTER_TO_INT
-			  (g_list_nth_data(mt->audio_vols_back,i))/LIVES_AVOL_SCALE);
+      lives_range_set_value(LIVES_RANGE(amixer->ch_sliders[i]),(double)LIVES_POINTER_TO_INT
+                            (lives_list_nth_data(mt->audio_vols_back,i))/LIVES_AVOL_SCALE);
       lives_signal_handler_unblock(lives_range_get_adjustment(LIVES_RANGE(amixer->ch_sliders[i])),amixer->ch_slider_fns[i]);
 #if ENABLE_GIW
     }
@@ -21810,26 +22161,28 @@
 }
 
 
-static void after_amixer_gang_toggled (LiVESToggleButton *toggle, lives_amixer_t *amixer) {
+static void after_amixer_gang_toggled(LiVESToggleButton *toggle, lives_amixer_t *amixer) {
   lives_widget_set_sensitive(amixer->inv_checkbutton,(lives_toggle_button_get_active(toggle)));
   if (prefs->lamp_buttons) {
-    if (lives_toggle_button_get_active(toggle)) lives_widget_set_bg_color(LIVES_WIDGET(toggle), LIVES_WIDGET_STATE_PRELIGHT, &palette->light_green);
+    if (lives_toggle_button_get_active(toggle))
+      lives_widget_set_bg_color(LIVES_WIDGET(toggle), LIVES_WIDGET_STATE_PRELIGHT, &palette->light_green);
     else lives_widget_set_bg_color(LIVES_WIDGET(toggle), LIVES_WIDGET_STATE_PRELIGHT, &palette->dark_red);
   }
 }
 
 
-static void after_amixer_inv_toggled (LiVESToggleButton *toggle, lives_amixer_t *amixer) {
+static void after_amixer_inv_toggled(LiVESToggleButton *toggle, lives_amixer_t *amixer) {
   if (prefs->lamp_buttons) {
-    if (lives_toggle_button_get_active(toggle)) lives_widget_set_bg_color(LIVES_WIDGET(toggle), LIVES_WIDGET_STATE_PRELIGHT, &palette->light_green);
+    if (lives_toggle_button_get_active(toggle))
+      lives_widget_set_bg_color(LIVES_WIDGET(toggle), LIVES_WIDGET_STATE_PRELIGHT, &palette->light_green);
     else lives_widget_set_bg_color(LIVES_WIDGET(toggle), LIVES_WIDGET_STATE_PRELIGHT, &palette->dark_red);
   }
 }
 
 
-void on_amixer_slider_changed (LiVESAdjustment *adj, lives_mt *mt) {
+void on_amixer_slider_changed(LiVESAdjustment *adj, lives_mt *mt) {
   lives_amixer_t *amixer=mt->amixer;
-  int layer=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(adj),"layer"));
+  int layer=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(adj),"layer"));
   boolean gang=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(amixer->gang_checkbutton));
   boolean inv=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(amixer->inv_checkbutton));
   double val;
@@ -21839,8 +22192,7 @@
   if (prefs->lamp_buttons) {
     GiwVSlider *slider=GIW_VSLIDER(amixer->ch_sliders[layer]);
     val=giw_vslider_get_value(slider);
-  }
-  else {
+  } else {
 #endif
     if (TRUE) {
       LiVESRange *range=LIVES_RANGE(amixer->ch_sliders[layer]);
@@ -21852,58 +22204,54 @@
 
   if (gang) {
     if (layer>0) {
-      for (i=mt->opts.back_audio_tracks;i<amixer->nchans;i++) {
+      for (i=mt->opts.back_audio_tracks; i<amixer->nchans; i++) {
 #if ENABLE_GIW
-	if (prefs->lamp_buttons) {
-	  lives_signal_handler_block(giw_vslider_get_adjustment(GIW_VSLIDER(amixer->ch_sliders[i])),amixer->ch_slider_fns[i]);
-	  giw_vslider_set_value(GIW_VSLIDER(amixer->ch_sliders[i]),val);
-	  lives_signal_handler_unblock(giw_vslider_get_adjustment(GIW_VSLIDER(amixer->ch_sliders[i])),amixer->ch_slider_fns[i]);
-	}
-	else {
-#endif
-	  lives_signal_handler_block(lives_range_get_adjustment(LIVES_RANGE(amixer->ch_sliders[i])),amixer->ch_slider_fns[i]);
-	  lives_range_set_value(LIVES_RANGE(amixer->ch_sliders[i]),val);
-	  lives_signal_handler_unblock(lives_range_get_adjustment(LIVES_RANGE(amixer->ch_sliders[i])),amixer->ch_slider_fns[i]);
+        if (prefs->lamp_buttons) {
+          lives_signal_handler_block(giw_vslider_get_adjustment(GIW_VSLIDER(amixer->ch_sliders[i])),amixer->ch_slider_fns[i]);
+          giw_vslider_set_value(GIW_VSLIDER(amixer->ch_sliders[i]),val);
+          lives_signal_handler_unblock(giw_vslider_get_adjustment(GIW_VSLIDER(amixer->ch_sliders[i])),amixer->ch_slider_fns[i]);
+        } else {
+#endif
+          lives_signal_handler_block(lives_range_get_adjustment(LIVES_RANGE(amixer->ch_sliders[i])),amixer->ch_slider_fns[i]);
+          lives_range_set_value(LIVES_RANGE(amixer->ch_sliders[i]),val);
+          lives_signal_handler_unblock(lives_range_get_adjustment(LIVES_RANGE(amixer->ch_sliders[i])),amixer->ch_slider_fns[i]);
 #if ENABLE_GIW
-	}
+        }
 #endif
       }
       if (inv&&mt->opts.back_audio_tracks>0) {
 #if ENABLE_GIW
-	if (prefs->lamp_buttons) {
-	  lives_signal_handler_block(giw_vslider_get_adjustment(GIW_VSLIDER(amixer->ch_sliders[0])),amixer->ch_slider_fns[0]);
-	  giw_vslider_set_value(GIW_VSLIDER(amixer->ch_sliders[0]),1.-val<0.?0.:1.-val);
-	  lives_signal_handler_unblock(giw_vslider_get_adjustment(GIW_VSLIDER(amixer->ch_sliders[0])),amixer->ch_slider_fns[0]);
-	}
-	else {
-#endif
-	  lives_signal_handler_block(lives_range_get_adjustment(LIVES_RANGE(amixer->ch_sliders[0])),amixer->ch_slider_fns[0]);
-	  lives_range_set_value(LIVES_RANGE(amixer->ch_sliders[0]),1.-val);
-	  lives_signal_handler_unblock(lives_range_get_adjustment(LIVES_RANGE(amixer->ch_sliders[0])),amixer->ch_slider_fns[0]);
+        if (prefs->lamp_buttons) {
+          lives_signal_handler_block(giw_vslider_get_adjustment(GIW_VSLIDER(amixer->ch_sliders[0])),amixer->ch_slider_fns[0]);
+          giw_vslider_set_value(GIW_VSLIDER(amixer->ch_sliders[0]),1.-val<0.?0.:1.-val);
+          lives_signal_handler_unblock(giw_vslider_get_adjustment(GIW_VSLIDER(amixer->ch_sliders[0])),amixer->ch_slider_fns[0]);
+        } else {
+#endif
+          lives_signal_handler_block(lives_range_get_adjustment(LIVES_RANGE(amixer->ch_sliders[0])),amixer->ch_slider_fns[0]);
+          lives_range_set_value(LIVES_RANGE(amixer->ch_sliders[0]),1.-val);
+          lives_signal_handler_unblock(lives_range_get_adjustment(LIVES_RANGE(amixer->ch_sliders[0])),amixer->ch_slider_fns[0]);
 #if ENABLE_GIW
-	}
+        }
 #endif
       }
-    }
-    else {
+    } else {
       if (inv) {
-	for (i=1;i<amixer->nchans;i++) {
+        for (i=1; i<amixer->nchans; i++) {
 #if ENABLE_GIW
-	  if (prefs->lamp_buttons) {
-	    lives_signal_handler_block(giw_vslider_get_adjustment(GIW_VSLIDER(amixer->ch_sliders[i])),amixer->ch_slider_fns[i]);
-	    giw_vslider_set_value(GIW_VSLIDER(amixer->ch_sliders[i]),1.-val<0.?0.:1.-val);
-	    lives_signal_handler_unblock(giw_vslider_get_adjustment(GIW_VSLIDER(amixer->ch_sliders[i])),amixer->ch_slider_fns[i]);
-	  }
-	  else {
-#endif
-	    lives_signal_handler_block(lives_range_get_adjustment(LIVES_RANGE(amixer->ch_sliders[i])),amixer->ch_slider_fns[i]);
-	    lives_range_set_value(LIVES_RANGE(amixer->ch_sliders[i]),1.-val);
-	    lives_signal_handler_unblock(lives_range_get_adjustment(LIVES_RANGE(amixer->ch_sliders[i])),amixer->ch_slider_fns[i]);
+          if (prefs->lamp_buttons) {
+            lives_signal_handler_block(giw_vslider_get_adjustment(GIW_VSLIDER(amixer->ch_sliders[i])),amixer->ch_slider_fns[i]);
+            giw_vslider_set_value(GIW_VSLIDER(amixer->ch_sliders[i]),1.-val<0.?0.:1.-val);
+            lives_signal_handler_unblock(giw_vslider_get_adjustment(GIW_VSLIDER(amixer->ch_sliders[i])),amixer->ch_slider_fns[i]);
+          } else {
+#endif
+            lives_signal_handler_block(lives_range_get_adjustment(LIVES_RANGE(amixer->ch_sliders[i])),amixer->ch_slider_fns[i]);
+            lives_range_set_value(LIVES_RANGE(amixer->ch_sliders[i]),1.-val);
+            lives_signal_handler_unblock(lives_range_get_adjustment(LIVES_RANGE(amixer->ch_sliders[i])),amixer->ch_slider_fns[i]);
 #if ENABLE_GIW
-	  }
+          }
 #endif
-	  
-	}
+
+        }
       }
     }
   }
@@ -21919,8 +22267,8 @@
 
 
 
-LiVESWidget * amixer_add_channel_slider (lives_mt *mt, int i) {
-  // add a slider to audio mixer for layer i; i<0 are backing audio tracks 
+LiVESWidget *amixer_add_channel_slider(lives_mt *mt, int i) {
+  // add a slider to audio mixer for layer i; i<0 are backing audio tracks
   // automatically sets the track name and layer number
 
   LiVESObject *adj;
@@ -21928,13 +22276,13 @@
   LiVESWidget *label;
   LiVESWidget *vbox;
   lives_amixer_t *amixer=mt->amixer;
-  gchar *tname;
+  char *tname;
 
   i+=mt->opts.back_audio_tracks;
 
-  adj = (LiVESObject *)lives_adjustment_new (0.5, 0., 4., 0.01, 0.1, 0.);
-    
-  spinbutton = lives_spin_button_new (LIVES_ADJUSTMENT (adj), 0.1, 3);
+  adj = (LiVESObject *)lives_adjustment_new(0.5, 0., 4., 0.01, 0.1, 0.);
+
+  spinbutton = lives_spin_button_new(LIVES_ADJUSTMENT(adj), 0.1, 3);
 
 #if ENABLE_GIW
   if (prefs->lamp_buttons) {
@@ -21945,38 +22293,37 @@
     if (palette->style&STYLE_1) {
       lives_widget_set_bg_color(amixer->ch_sliders[i], LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
     }
-  }
-  else {
+  } else {
 #endif
     amixer->ch_sliders[i]=lives_vscale_new(LIVES_ADJUSTMENT(adj));
     lives_range_set_inverted(LIVES_RANGE(amixer->ch_sliders[i]),TRUE);
-    gtk_scale_set_digits(GTK_SCALE(amixer->ch_sliders[i]),2);
-    gtk_scale_set_value_pos(GTK_SCALE(amixer->ch_sliders[i]),GTK_POS_BOTTOM);
+    lives_scale_set_digits(LIVES_SCALE(amixer->ch_sliders[i]),2);
+    lives_scale_set_value_pos(LIVES_SCALE(amixer->ch_sliders[i]),LIVES_POS_BOTTOM);
 #if ENABLE_GIW
   }
 #endif
-  
-  g_object_set_data(G_OBJECT(amixer->ch_sliders[i]),"adj",adj);
-  g_object_set_data(G_OBJECT(adj),"layer",GINT_TO_POINTER(i));
-    
-  amixer->ch_slider_fns[i]=lives_signal_connect_after (LIVES_GUI_OBJECT (adj), "value_changed",
-						   LIVES_GUI_CALLBACK (on_amixer_slider_changed),
-						   (gpointer)mt);
-  
+
+  lives_widget_object_set_data(LIVES_WIDGET_OBJECT(amixer->ch_sliders[i]),"adj",adj);
+  lives_widget_object_set_data(LIVES_WIDGET_OBJECT(adj),"layer",LIVES_INT_TO_POINTER(i));
+
+  amixer->ch_slider_fns[i]=lives_signal_connect_after(LIVES_GUI_OBJECT(adj), LIVES_WIDGET_VALUE_CHANGED_SIGNAL,
+                           LIVES_GUI_CALLBACK(on_amixer_slider_changed),
+                           (livespointer)mt);
+
   if (palette->style&STYLE_1) {
     lives_widget_set_fg_color(amixer->ch_sliders[i], LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
   }
-  
+
   tname=get_track_name(mt,i-mt->opts.back_audio_tracks,TRUE);
   label=lives_standard_label_new(tname);
-  g_free(tname);
+  lives_free(tname);
+
+  lives_widget_object_set_data(LIVES_WIDGET_OBJECT(amixer->ch_sliders[i]),"label",label);
 
-  g_object_set_data(G_OBJECT(amixer->ch_sliders[i]),"label",label);
-  
-  vbox = lives_vbox_new (FALSE, widget_opts.packing_height*1.5);
-  lives_box_pack_start (LIVES_BOX (vbox), label, FALSE, FALSE, widget_opts.packing_height);
-  lives_box_pack_start (LIVES_BOX (vbox), amixer->ch_sliders[i], TRUE, TRUE, widget_opts.packing_height*5);
-  lives_box_pack_start (LIVES_BOX (vbox), spinbutton, FALSE, FALSE, widget_opts.packing_height);
+  vbox = lives_vbox_new(FALSE, widget_opts.packing_height*1.5);
+  lives_box_pack_start(LIVES_BOX(vbox), label, FALSE, FALSE, widget_opts.packing_height);
+  lives_box_pack_start(LIVES_BOX(vbox), amixer->ch_sliders[i], TRUE, TRUE, widget_opts.packing_height*5);
+  lives_box_pack_start(LIVES_BOX(vbox), spinbutton, FALSE, FALSE, widget_opts.packing_height);
 
   amixer->nchans++;
 
@@ -21986,18 +22333,7 @@
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-void amixer_show (LiVESButton *button, gpointer user_data) {
+void amixer_show(LiVESButton *button, livespointer user_data) {
   lives_mt *mt=(lives_mt *)user_data;
   LiVESWidget *amixerw;
   LiVESWidget *top_vbox;
@@ -22010,9 +22346,9 @@
   LiVESWidget *eventbox;
   LiVESWidget *close_button;
   LiVESWidget *reset_button;
-  LiVESAccelGroup *accel_group=LIVES_ACCEL_GROUP(lives_accel_group_new ());
+  LiVESAccelGroup *accel_group=LIVES_ACCEL_GROUP(lives_accel_group_new());
 
-  int nachans=g_list_length(mt->audio_draws);
+  int nachans=lives_list_length(mt->audio_draws);
 
   int winsize_h,scr_width=mainw->scr_width;
   int winsize_v,scr_height=mainw->scr_height;
@@ -22021,15 +22357,17 @@
 
   lives_amixer_t *amixer;
 
+  if (!mainw->interactive) return;
+
   if (nachans==0) return;
 
-  mt->audio_vols_back=g_list_copy(mt->audio_vols);
+  mt->audio_vols_back=lives_list_copy(mt->audio_vols);
 
-  amixer=mt->amixer=(lives_amixer_t *)g_malloc(sizeof(lives_amixer_t));
+  amixer=mt->amixer=(lives_amixer_t *)lives_malloc(sizeof(lives_amixer_t));
   amixer->nchans=0;
 
-  amixer->ch_sliders=(LiVESWidget **)g_malloc(nachans*sizeof(LiVESWidget *));
-  amixer->ch_slider_fns=(gulong *)g_malloc(nachans*sizeof(gulong));
+  amixer->ch_sliders=(LiVESWidget **)lives_malloc(nachans*sizeof(LiVESWidget *));
+  amixer->ch_slider_fns=(ulong *)lives_malloc(nachans*sizeof(ulong));
 
   if (prefs->gui_monitor!=0) {
     scr_width=mainw->mgeom[prefs->gui_monitor-1].width;
@@ -22039,195 +22377,192 @@
   winsize_h=scr_width*2/3;
   winsize_v=scr_height*2/3;
 
-  amixerw = lives_window_new (LIVES_WINDOW_TOPLEVEL);
+  amixerw = lives_window_new(LIVES_WINDOW_TOPLEVEL);
   if (palette->style&STYLE_1) {
     lives_widget_set_bg_color(amixerw, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
     lives_widget_set_fg_color(amixerw, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars_fore);
   }
-  lives_window_set_title (LIVES_WINDOW (amixerw), _("LiVES: Multitrack audio mixer"));
+  lives_window_set_title(LIVES_WINDOW(amixerw), _("LiVES: Multitrack audio mixer"));
+
+  top_vbox = lives_vbox_new(FALSE, 0);
 
-  top_vbox = lives_vbox_new (FALSE, 0);
+  amixer->main_hbox = lives_hbox_new(FALSE, widget_opts.packing_width*2);
 
-  amixer->main_hbox = lives_hbox_new (FALSE, widget_opts.packing_width*2);
+  scrolledwindow = lives_standard_scrolled_window_new(winsize_h, winsize_v, amixer->main_hbox);
 
-  scrolledwindow = lives_standard_scrolled_window_new (winsize_h, winsize_v, amixer->main_hbox);
-  
   if (prefs->gui_monitor!=0) {
     int xcen=mainw->mgeom[prefs->gui_monitor-1].x+(mainw->mgeom[prefs->gui_monitor-1].width-
-						    lives_widget_get_allocation_width(amixerw))/2;
+             lives_widget_get_allocation_width(amixerw))/2;
     int ycen=mainw->mgeom[prefs->gui_monitor-1].y+(mainw->mgeom[prefs->gui_monitor-1].height-
-						    lives_widget_get_allocation_height(amixerw))/2;
+             lives_widget_get_allocation_height(amixerw))/2;
     lives_window_set_screen(LIVES_WINDOW(amixerw),mainw->mgeom[prefs->gui_monitor-1].screen);
     lives_window_move(LIVES_WINDOW(amixerw),xcen,ycen);
   }
 
   if (prefs->open_maximised) {
-    lives_window_maximize (LIVES_WINDOW(amixerw));
-  }
-  else lives_window_set_default_size (LIVES_WINDOW (amixerw), winsize_h, winsize_v);
+    lives_window_maximize(LIVES_WINDOW(amixerw));
+  } else lives_window_set_default_size(LIVES_WINDOW(amixerw), winsize_h, winsize_v);
 
-  lives_box_pack_start (LIVES_BOX (top_vbox), scrolledwindow, TRUE, TRUE, widget_opts.packing_height);
-  lives_container_add (LIVES_CONTAINER (amixerw), top_vbox);
+  lives_box_pack_start(LIVES_BOX(top_vbox), scrolledwindow, TRUE, TRUE, widget_opts.packing_height);
+  lives_container_add(LIVES_CONTAINER(amixerw), top_vbox);
 
-  hbuttonbox = lives_hbutton_box_new ();
-  lives_box_pack_start (LIVES_BOX (top_vbox), hbuttonbox, FALSE, TRUE, widget_opts.packing_height*2);
+  hbuttonbox = lives_hbutton_box_new();
+  lives_box_pack_start(LIVES_BOX(top_vbox), hbuttonbox, FALSE, TRUE, widget_opts.packing_height*2);
 
-  lives_button_box_set_layout (LIVES_BUTTON_BOX (hbuttonbox), LIVES_BUTTONBOX_SPREAD);
+  lives_button_box_set_layout(LIVES_BUTTON_BOX(hbuttonbox), LIVES_BUTTONBOX_SPREAD);
 
-  reset_button = lives_button_new_with_mnemonic (_("_Reset values"));
-  lives_container_add (LIVES_CONTAINER (hbuttonbox), reset_button);
-  lives_widget_set_can_focus_and_default (reset_button);
+  reset_button = lives_button_new_with_mnemonic(_("_Reset values"));
+  lives_container_add(LIVES_CONTAINER(hbuttonbox), reset_button);
+  lives_widget_set_can_focus_and_default(reset_button);
 
-  close_button = lives_button_new_with_mnemonic (_("_Close mixer"));
-  lives_container_add (LIVES_CONTAINER (hbuttonbox), close_button);
-  lives_widget_set_can_focus_and_default (close_button);
+  close_button = lives_button_new_with_mnemonic(_("_Close mixer"));
+  lives_container_add(LIVES_CONTAINER(hbuttonbox), close_button);
+  lives_widget_set_can_focus_and_default(close_button);
 
-  lives_button_box_set_button_width (LIVES_BUTTON_BOX (hbuttonbox), reset_button, DEF_BUTTON_WIDTH*4);
-  lives_button_box_set_button_width (LIVES_BUTTON_BOX (hbuttonbox), close_button, DEF_BUTTON_WIDTH*4);
+  lives_button_box_set_button_width(LIVES_BUTTON_BOX(hbuttonbox), reset_button, DEF_BUTTON_WIDTH*4);
+  lives_button_box_set_button_width(LIVES_BUTTON_BOX(hbuttonbox), close_button, DEF_BUTTON_WIDTH*4);
 
-  lives_widget_add_accelerator (close_button, LIVES_WIDGET_CLICKED_EVENT, accel_group,
-                              LIVES_KEY_m, LIVES_CONTROL_MASK,
-                              (LiVESAccelFlags)0);
+  lives_widget_add_accelerator(close_button, LIVES_WIDGET_CLICKED_SIGNAL, accel_group,
+                               LIVES_KEY_m, LIVES_CONTROL_MASK,
+                               (LiVESAccelFlags)0);
 
-  lives_window_add_accel_group (LIVES_WINDOW (amixerw), accel_group);
+  lives_window_add_accel_group(LIVES_WINDOW(amixerw), accel_group);
 
   if (mt->opts.back_audio_tracks>0) {
     vbox=amixer_add_channel_slider(mt,-1);
-    lives_box_pack_start (LIVES_BOX (amixer->main_hbox), vbox, FALSE, FALSE, widget_opts.packing_width);
+    lives_box_pack_start(LIVES_BOX(amixer->main_hbox), vbox, FALSE, FALSE, widget_opts.packing_width);
   }
 
-  vbox2 = lives_vbox_new (FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (amixer->main_hbox), vbox2, FALSE, FALSE, widget_opts.packing_width);
+  vbox2 = lives_vbox_new(FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(amixer->main_hbox), vbox2, FALSE, FALSE, widget_opts.packing_width);
 
   add_fill_to_box(LIVES_BOX(vbox2));
 
-  vbox = lives_vbox_new (FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (vbox2), vbox, TRUE, TRUE, widget_opts.packing_height);
-  
-    
+  vbox = lives_vbox_new(FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(vbox2), vbox, TRUE, TRUE, widget_opts.packing_height);
+
+
   if (prefs->lamp_buttons) {
-    amixer->inv_checkbutton = lives_check_button_new_with_label (" ");
-    gtk_toggle_button_set_mode(LIVES_TOGGLE_BUTTON(amixer->inv_checkbutton),FALSE);
+    amixer->inv_checkbutton = lives_check_button_new_with_label(" ");
+    lives_toggle_button_set_mode(LIVES_TOGGLE_BUTTON(amixer->inv_checkbutton),FALSE);
 #if GTK_CHECK_VERSION(3,0,0)
-  lives_signal_connect (LIVES_GUI_OBJECT (amixer->inv_checkbutton), LIVES_WIDGET_EXPOSE_EVENT,
-		    LIVES_GUI_CALLBACK (draw_cool_toggle),
-		    NULL);
+    lives_signal_connect(LIVES_GUI_OBJECT(amixer->inv_checkbutton), LIVES_WIDGET_EXPOSE_EVENT,
+                         LIVES_GUI_CALLBACK(draw_cool_toggle),
+                         NULL);
 #endif
     lives_widget_set_bg_color(amixer->inv_checkbutton, LIVES_WIDGET_STATE_ACTIVE, &palette->light_green);
     lives_widget_set_bg_color(amixer->inv_checkbutton, LIVES_WIDGET_STATE_NORMAL, &palette->dark_red);
 
-    lives_signal_connect_after (LIVES_GUI_OBJECT (amixer->inv_checkbutton), LIVES_WIDGET_TOGGLED_EVENT,
-			    LIVES_GUI_CALLBACK (after_amixer_inv_toggled),
-			    (gpointer)amixer);
+    lives_signal_connect_after(LIVES_GUI_OBJECT(amixer->inv_checkbutton), LIVES_WIDGET_TOGGLED_SIGNAL,
+                               LIVES_GUI_CALLBACK(after_amixer_inv_toggled),
+                               (livespointer)amixer);
 
     after_amixer_inv_toggled(LIVES_TOGGLE_BUTTON(amixer->inv_checkbutton),amixer);
 
-  }
-  else amixer->inv_checkbutton = lives_check_button_new ();
+  } else amixer->inv_checkbutton = lives_check_button_new();
 
 
   if (mt->opts.back_audio_tracks>0&&mt->opts.pertrack_audio) {
     label=lives_standard_label_new_with_mnemonic(_("_Invert backing audio\nand layer volumes"),amixer->inv_checkbutton);
-    
+
     lives_widget_set_tooltip_text(amixer->inv_checkbutton, _("Adjust backing and layer audio values so that they sum to 1.0"));
     eventbox=lives_event_box_new();
     lives_tooltips_copy(eventbox,amixer->inv_checkbutton);
-    lives_label_set_mnemonic_widget (LIVES_LABEL (label),amixer->inv_checkbutton);
-    
+    lives_label_set_mnemonic_widget(LIVES_LABEL(label),amixer->inv_checkbutton);
+
     lives_container_add(LIVES_CONTAINER(eventbox),label);
-    lives_signal_connect (LIVES_GUI_OBJECT (eventbox), "button_press_event",
-		      LIVES_GUI_CALLBACK (label_act_toggle),
-		      amixer->inv_checkbutton);
-    
+    lives_signal_connect(LIVES_GUI_OBJECT(eventbox), LIVES_WIDGET_BUTTON_PRESS_EVENT,
+                         LIVES_GUI_CALLBACK(label_act_toggle),
+                         amixer->inv_checkbutton);
+
     if (palette->style&STYLE_1) {
       lives_widget_set_fg_color(eventbox, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
-      lives_widget_set_bg_color (eventbox, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+      lives_widget_set_bg_color(eventbox, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
     }
-    
-    lives_box_pack_start (LIVES_BOX (vbox), eventbox, FALSE, FALSE, widget_opts.packing_height);
-    
-    hbox = lives_hbox_new (FALSE, 0);
-    lives_box_pack_start (LIVES_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
+
+    lives_box_pack_start(LIVES_BOX(vbox), eventbox, FALSE, FALSE, widget_opts.packing_height);
+
+    hbox = lives_hbox_new(FALSE, 0);
+    lives_box_pack_start(LIVES_BOX(vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
     add_fill_to_box(LIVES_BOX(hbox));
-    
-    lives_box_pack_start (LIVES_BOX (hbox), amixer->inv_checkbutton, FALSE, FALSE, 0);
-    lives_widget_set_can_focus_and_default (amixer->inv_checkbutton);
+
+    lives_box_pack_start(LIVES_BOX(hbox), amixer->inv_checkbutton, FALSE, FALSE, 0);
+    lives_widget_set_can_focus_and_default(amixer->inv_checkbutton);
 
     add_fill_to_box(LIVES_BOX(hbox));
   }
 
 
   if (prefs->lamp_buttons) {
-    amixer->gang_checkbutton = lives_check_button_new_with_label (" ");
-    gtk_toggle_button_set_mode(LIVES_TOGGLE_BUTTON(amixer->gang_checkbutton),FALSE);
+    amixer->gang_checkbutton = lives_check_button_new_with_label(" ");
+    lives_toggle_button_set_mode(LIVES_TOGGLE_BUTTON(amixer->gang_checkbutton),FALSE);
 #if GTK_CHECK_VERSION(3,0,0)
-  lives_signal_connect (LIVES_GUI_OBJECT (amixer->gang_checkbutton), LIVES_WIDGET_EXPOSE_EVENT,
-		    LIVES_GUI_CALLBACK (draw_cool_toggle),
-		    NULL);
+    lives_signal_connect(LIVES_GUI_OBJECT(amixer->gang_checkbutton), LIVES_WIDGET_EXPOSE_EVENT,
+                         LIVES_GUI_CALLBACK(draw_cool_toggle),
+                         NULL);
 #endif
     lives_widget_set_bg_color(amixer->gang_checkbutton, LIVES_WIDGET_STATE_ACTIVE, &palette->light_green);
     lives_widget_set_bg_color(amixer->gang_checkbutton, LIVES_WIDGET_STATE_NORMAL, &palette->dark_red);
-  }
-  else amixer->gang_checkbutton = lives_check_button_new ();
+  } else amixer->gang_checkbutton = lives_check_button_new();
 
 
   if (mt->opts.pertrack_audio) {
     label=lives_standard_label_new_with_mnemonic(_("_Gang layer audio"),amixer->gang_checkbutton);
-    
-    lives_widget_set_tooltip_text( amixer->gang_checkbutton, _("Adjust all layer audio values to the same value"));
+
+    lives_widget_set_tooltip_text(amixer->gang_checkbutton, _("Adjust all layer audio values to the same value"));
     eventbox=lives_event_box_new();
     lives_tooltips_copy(eventbox,amixer->gang_checkbutton);
-    
+
     lives_container_add(LIVES_CONTAINER(eventbox),label);
-    lives_signal_connect (LIVES_GUI_OBJECT (eventbox), "button_press_event",
-		      LIVES_GUI_CALLBACK (label_act_toggle),
-		      amixer->gang_checkbutton);
-    
+    lives_signal_connect(LIVES_GUI_OBJECT(eventbox), LIVES_WIDGET_BUTTON_PRESS_EVENT,
+                         LIVES_GUI_CALLBACK(label_act_toggle),
+                         amixer->gang_checkbutton);
+
     lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(amixer->gang_checkbutton),mt->opts.gang_audio);
-    
+
     if (palette->style&STYLE_1) {
       lives_widget_set_fg_color(eventbox, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
-      lives_widget_set_bg_color (eventbox, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+      lives_widget_set_bg_color(eventbox, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
     }
-    
-    hbox = lives_hbox_new (FALSE, 0);
-    lives_box_pack_end (LIVES_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
+
+    hbox = lives_hbox_new(FALSE, 0);
+    lives_box_pack_end(LIVES_BOX(vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
     add_fill_to_box(LIVES_BOX(hbox));
-    
-    lives_box_pack_start (LIVES_BOX (hbox), amixer->gang_checkbutton, FALSE, FALSE, widget_opts.packing_width);
+
+    lives_box_pack_start(LIVES_BOX(hbox), amixer->gang_checkbutton, FALSE, FALSE, widget_opts.packing_width);
     add_fill_to_box(LIVES_BOX(hbox));
 
-    lives_box_pack_end (LIVES_BOX (vbox), eventbox, FALSE, FALSE, widget_opts.packing_height);
-    lives_widget_set_can_focus_and_default (amixer->gang_checkbutton);
+    lives_box_pack_end(LIVES_BOX(vbox), eventbox, FALSE, FALSE, widget_opts.packing_height);
+    lives_widget_set_can_focus_and_default(amixer->gang_checkbutton);
   }
 
   add_fill_to_box(LIVES_BOX(vbox2));
 
-  for (i=0;i<nachans-mt->opts.back_audio_tracks;i++) {
+  for (i=0; i<nachans-mt->opts.back_audio_tracks; i++) {
     vbox=amixer_add_channel_slider(mt,i);
-    lives_box_pack_start (LIVES_BOX (amixer->main_hbox), vbox, FALSE, FALSE, widget_opts.packing_width);
+    lives_box_pack_start(LIVES_BOX(amixer->main_hbox), vbox, FALSE, FALSE, widget_opts.packing_width);
   }
 
-  lives_signal_connect (LIVES_GUI_OBJECT (close_button), LIVES_WIDGET_CLICKED_EVENT,
-		    LIVES_GUI_CALLBACK (on_amixer_close_clicked),
-		    (gpointer)mt);
+  lives_signal_connect(LIVES_GUI_OBJECT(close_button), LIVES_WIDGET_CLICKED_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_amixer_close_clicked),
+                       (livespointer)mt);
 
-  lives_signal_connect (LIVES_GUI_OBJECT (reset_button), LIVES_WIDGET_CLICKED_EVENT,
-		    LIVES_GUI_CALLBACK (on_amixer_reset_clicked),
-		    (gpointer)mt);
+  lives_signal_connect(LIVES_GUI_OBJECT(reset_button), LIVES_WIDGET_CLICKED_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_amixer_reset_clicked),
+                       (livespointer)mt);
 
-  lives_widget_add_accelerator (close_button, LIVES_WIDGET_CLICKED_EVENT, accel_group,
-                              LIVES_KEY_Escape, (LiVESXModifierType)0, (LiVESAccelFlags)0);
+  lives_widget_add_accelerator(close_button, LIVES_WIDGET_CLICKED_SIGNAL, accel_group,
+                               LIVES_KEY_Escape, (LiVESXModifierType)0, (LiVESAccelFlags)0);
 
 
 
-  lives_signal_connect_after (LIVES_GUI_OBJECT (amixer->gang_checkbutton), LIVES_WIDGET_TOGGLED_EVENT,
-			  LIVES_GUI_CALLBACK (after_amixer_gang_toggled),
-			  (gpointer)amixer);
+  lives_signal_connect_after(LIVES_GUI_OBJECT(amixer->gang_checkbutton), LIVES_WIDGET_TOGGLED_SIGNAL,
+                             LIVES_GUI_CALLBACK(after_amixer_gang_toggled),
+                             (livespointer)amixer);
 
   after_amixer_gang_toggled(LIVES_TOGGLE_BUTTON(amixer->gang_checkbutton),amixer);
 
-  lives_widget_grab_focus (close_button);
+  lives_widget_grab_focus(close_button);
 
   on_amixer_reset_clicked(NULL,mt);
 
@@ -22236,19 +22571,20 @@
 }
 
 
-void on_mt_showkeys_activate (LiVESMenuItem *menuitem, gpointer user_data) {
+void on_mt_showkeys_activate(LiVESMenuItem *menuitem, livespointer user_data) {
   do_mt_keys_window();
 }
 
-static LiVESWidget *get_eventbox_for_track(lives_mt *mt, int ntrack) {
-  LiVESWidget *eventbox;
-  if (mt_track_is_video(mt,ntrack)) {
-    eventbox=(LiVESWidget *)g_list_nth_data(mt->video_draws, ntrack);
-  }
-  else if (mt_track_is_audio(mt,ntrack)) {
-    eventbox=(LiVESWidget *)g_list_nth_data(mt->audio_draws, 1-ntrack);
+
+LiVESWidget *get_eventbox_for_track(lives_mt *mt, int ntrack) {
+  LiVESWidget *eventbox=NULL;
+  if (mt!=NULL) {
+    if (mt_track_is_video(mt,ntrack)) {
+      eventbox=(LiVESWidget *)lives_list_nth_data(mt->video_draws, ntrack);
+    } else if (mt_track_is_audio(mt,ntrack)) {
+      eventbox=(LiVESWidget *)lives_list_nth_data(mt->audio_draws, 1-ntrack);
+    }
   }
-  else return NULL;
   return eventbox;
 }
 
@@ -22258,8 +22594,8 @@
   track_rect *block;
   LiVESWidget *eventbox=get_eventbox_for_track(mt,itrack);
   if (eventbox==NULL) return NULL; //<invalid track
-  block=(track_rect *)g_object_get_data (G_OBJECT(eventbox), "blocks");
-  while(block!=NULL) {
+  block=(track_rect *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox), "blocks");
+  while (block!=NULL) {
     if (count==iblock) return block;
     block=block->next;
     count++;
@@ -22270,40 +22606,61 @@
 
 
 
+
 // remote API helpers
 
+
+track_rect *find_block_by_uid(lives_mt *mt, ulong uid) {
+  LiVESList *list;
+  track_rect *block;
+
+  if (mt == NULL || uid==0l) return NULL;
+
+  list = mt->video_draws;
+
+  while (list!=NULL) {
+    block=(track_rect *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(list->data), "blocks");
+    while (block!=NULL) {
+      if (block->uid==uid) return block;
+      block=block->next;
+    }
+  }
+
+  list = mt->audio_draws;
+
+  while (list!=NULL) {
+    block=(track_rect *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(list->data), "blocks");
+    while (block!=NULL) {
+      if (block->uid==uid) return block;
+      block=block->next;
+    }
+  }
+
+  return NULL;
+
+}
+
+
 boolean mt_track_is_video(lives_mt *mt, int ntrack) {
-  if (ntrack>=0&&mt->video_draws!=NULL&&ntrack<g_list_length(mt->video_draws)) return TRUE;
+  if (ntrack>=0&&mt->video_draws!=NULL&&ntrack<lives_list_length(mt->video_draws)) return TRUE;
   return FALSE;
 }
 
 
 boolean mt_track_is_audio(lives_mt *mt, int ntrack) {
-  if (ntrack<=0&&mt->audio_draws!=NULL&&ntrack>=-(g_list_length(mt->audio_draws))) return TRUE;
+  if (ntrack<=0&&mt->audio_draws!=NULL&&ntrack>=-(lives_list_length(mt->audio_draws))) return TRUE;
   return FALSE;
 }
 
-/*
-boolean mt_track_is_valid(lives_mt *mt, int itrack) {
-  if (!mt_track_is_video(itrack)&&!mt_track_is_audio(itrack)) return FALSE;
-  return TRUE;
-  }*/
-
-int mt_get_last_block_number(lives_mt *mt, int ntrack) {
-  int count=0;
-  track_rect *block,*lastblock;
-  LiVESWidget *eventbox=get_eventbox_for_track(mt,ntrack);
-  if (eventbox==NULL) return -1; //<invalid track
-  lastblock=(track_rect *)g_object_get_data (G_OBJECT(eventbox),"block_last");
-  if (lastblock==NULL) return -1; ///< no blocks in track
-  block=(track_rect *)g_object_get_data (G_OBJECT(eventbox), "blocks");
-  while(block!=NULL) {
-    if (block==lastblock) break;
-    block=block->next;
-    count++;
-  }
 
-  return count;
+ulong mt_get_last_block_uid(lives_mt *mt) {
+  int track=mt->current_track;
+  track_rect *lastblock;
+  LiVESWidget *eventbox=get_eventbox_for_track(mt,track);
+  if (eventbox==NULL) return 0l; //<invalid track
+  lastblock=(track_rect *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"block_last");
+  if (lastblock==NULL) return 0l; ///< no blocks in track
+  return lastblock->uid;
 }
 
 
@@ -22313,10 +22670,10 @@
   track_rect *block,*lastblock;
   LiVESWidget *eventbox=get_eventbox_for_track(mt,ntrack);
   if (eventbox==NULL) return -1; //<invalid track
-  lastblock=(track_rect *)g_object_get_data (G_OBJECT(eventbox),"block_last");
+  lastblock=(track_rect *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox),"block_last");
   if (lastblock==NULL) return -1; ///< no blocks in track
-  block=(track_rect *)g_object_get_data (G_OBJECT(eventbox), "blocks");
-  while(block!=NULL) {
+  block=(track_rect *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(eventbox), "blocks");
+  while (block!=NULL) {
     if (block==lastblock) break;
     block=block->next;
     count++;
@@ -22343,6 +22700,25 @@
 
 
 
+track_rect *get_block_from_track_and_time(lives_mt *mt, int track, double time) {
+  LiVESWidget *ebox;
+  if (mt==NULL) return NULL;
+  ebox=get_eventbox_for_track(mt,track);
+  return get_block_from_time(ebox, time, mt);
+}
+
+
+int get_clip_for_block(track_rect *block) {
+  int track;
+  if (block==NULL) return -1;
+  track=get_track_for_block(block);
+  return get_frame_event_clip(block->start_event, track);
+}
+
+
+
+
+
 ////////////////////////////////////
 // autotransitions
 //
@@ -22363,7 +22739,7 @@
   weed_plant_t *ptm;
   weed_plant_t *old_mt_init=mt->init_event;
 
-  GList *slist;
+  LiVESList *slist;
 
   double region_start=mt->region_start;
   double region_end=mt->region_end;
@@ -22371,7 +22747,7 @@
   boolean did_backup=FALSE;
   boolean needs_idle=FALSE;
 
-  int nvids=g_list_length(mt->video_draws);
+  int nvids=lives_list_length(mt->video_draws);
   int current_fx=mt->current_fx;
 
   int error;
@@ -22402,30 +22778,29 @@
 
   // part 1 - transition in
 
-  slist=g_list_copy(mt->selected_tracks);
-  
+  slist=lives_list_copy(mt->selected_tracks);
+
   if (mt->selected_tracks!=NULL) {
-    g_list_free(mt->selected_tracks);
+    lives_list_free(mt->selected_tracks);
     mt->selected_tracks=NULL;
   }
 
-  for (i=0;i<nvids;i++) {
+  for (i=0; i<nvids; i++) {
     if (i==track) continue; ///< cannot transition with self !
-    oblock=get_block_from_time((LiVESWidget *)g_list_nth_data(mt->video_draws,i),
-			       (double)sttc/U_SEC+0.5/mt->fps,mt);
-    
+    oblock=get_block_from_time((LiVESWidget *)lives_list_nth_data(mt->video_draws,i),
+                               (double)sttc/U_SEC+0.5/mt->fps,mt);
+
     if (oblock!=NULL) {
       if (get_event_timecode(oblock->end_event)<=get_event_timecode(block->end_event)) {
-	endtc=q_gint64(get_event_timecode(oblock->end_event)+U_SEC/mt->fps,mt->fps);
-	break;
-      }
-      else oblock=NULL;
+        endtc=q_gint64(get_event_timecode(oblock->end_event)+U_SEC/mt->fps,mt->fps);
+        break;
+      } else oblock=NULL;
     }
   }
 
   if (!mt->did_backup&&mt->idlefunc>0) {
     // freeze auto backups
-    g_source_remove(mt->idlefunc);
+    lives_source_remove(mt->idlefunc);
     mt->idlefunc=0;
     needs_idle=TRUE;
   }
@@ -22433,19 +22808,19 @@
   mt->is_atrans=TRUE; ///< force some visual changes
 
   if (oblock!=NULL) {
-    mt->selected_tracks=g_list_append(mt->selected_tracks,GINT_TO_POINTER(track));
-    mt->selected_tracks=g_list_append(mt->selected_tracks,GINT_TO_POINTER(i));
+    mt->selected_tracks=lives_list_append(mt->selected_tracks,LIVES_INT_TO_POINTER(track));
+    mt->selected_tracks=lives_list_append(mt->selected_tracks,LIVES_INT_TO_POINTER(i));
 
     mt_backup(mt,MT_UNDO_APPLY_FILTER,0);
     did_backup=mt->did_backup=TRUE;
     mt->region_start=sttc/U_SEC;
     mt->region_end=endtc/U_SEC;
     mt_add_region_effect(NULL, mt);
-    
+
     nparams=weed_leaf_num_elements(mt->init_event,"in_parameters");
     oparams=(weed_plant_t **)weed_get_voidptr_array(mt->init_event,"in_parameters",&error);
 
-    for (i=0;i<nparams;i++) {
+    for (i=0; i<nparams; i++) {
       if (weed_get_int_value(oparams[i],"index",&error)==tparam) break;
     }
 
@@ -22455,7 +22830,7 @@
     weed_set_int_value(enevent,"hint",WEED_EVENT_HINT_PARAM_CHANGE);
     weed_set_int64_value(enevent,"timecode",endtc);
     weed_set_int_value(enevent,"index",tparam);
-  
+
     weed_set_voidptr_value(enevent,"init_event",mt->init_event);
     weed_set_voidptr_value(enevent,"next_change",NULL);
     weed_set_voidptr_value(enevent,"prev_change",stevent);
@@ -22468,8 +22843,7 @@
       int max=weed_get_int_value(ptm,"max",&error);
       weed_set_int_value(stevent,"value",i<track?min:max);
       weed_set_int_value(enevent,"value",i<track?max:min);
-    }
-    else {
+    } else {
       double min=weed_get_double_value(ptm,"min",&error);
       double max=weed_get_double_value(ptm,"max",&error);
       weed_set_double_value(stevent,"value",i<track?min:max);
@@ -22477,7 +22851,7 @@
     }
 
     insert_param_change_event_at(mt->event_list,oblock->end_event,enevent);
-    weed_free(oparams);
+    lives_free(oparams);
 
   }
 
@@ -22487,14 +22861,14 @@
   endtc=q_gint64(get_event_timecode(block->end_event)+U_SEC/mt->fps,mt->fps);
 
   if (mt->selected_tracks!=NULL) {
-    g_list_free(mt->selected_tracks);
+    lives_list_free(mt->selected_tracks);
     mt->selected_tracks=NULL;
   }
 
-  for (i=0;i<nvids;i++) {
+  for (i=0; i<nvids; i++) {
     if (i==track) continue; ///< cannot transition with self !
-    oblock=get_block_from_time((LiVESWidget *)g_list_nth_data(mt->video_draws,i),
-			       (double)endtc/U_SEC+0.5/mt->fps,mt);
+    oblock=get_block_from_time((LiVESWidget *)lives_list_nth_data(mt->video_draws,i),
+                               (double)endtc/U_SEC+0.5/mt->fps,mt);
 
     if (oblock!=NULL) {
       sttc=get_event_timecode(oblock->start_event);
@@ -22505,8 +22879,8 @@
 
 
   if (oblock!=NULL) {
-    mt->selected_tracks=g_list_append(mt->selected_tracks,GINT_TO_POINTER(track));
-    mt->selected_tracks=g_list_append(mt->selected_tracks,GINT_TO_POINTER(i));
+    mt->selected_tracks=lives_list_append(mt->selected_tracks,LIVES_INT_TO_POINTER(track));
+    mt->selected_tracks=lives_list_append(mt->selected_tracks,LIVES_INT_TO_POINTER(i));
 
     if (!did_backup) mt_backup(mt,MT_UNDO_APPLY_FILTER,0);
     did_backup=mt->did_backup=TRUE;
@@ -22517,7 +22891,7 @@
     nparams=weed_leaf_num_elements(mt->init_event,"in_parameters");
     oparams=(weed_plant_t **)weed_get_voidptr_array(mt->init_event,"in_parameters",&error);
 
-    for (i=0;i<nparams;i++) {
+    for (i=0; i<nparams; i++) {
       if (weed_get_int_value(oparams[i],"index",&error)==tparam) break;
     }
 
@@ -22527,7 +22901,7 @@
     weed_set_int_value(enevent,"hint",WEED_EVENT_HINT_PARAM_CHANGE);
     weed_set_int64_value(enevent,"timecode",get_event_timecode(block->end_event));
     weed_set_int_value(enevent,"index",tparam);
-  
+
     weed_set_voidptr_value(enevent,"init_event",mt->init_event);
     weed_set_voidptr_value(enevent,"next_change",NULL);
     weed_set_voidptr_value(enevent,"prev_change",stevent);
@@ -22540,8 +22914,7 @@
       int max=weed_get_int_value(ptm,"max",&error);
       weed_set_int_value(stevent,"value",i<track?max:min);
       weed_set_int_value(enevent,"value",i<track?min:max);
-    }
-    else {
+    } else {
       double min=weed_get_double_value(ptm,"min",&error);
       double max=weed_get_double_value(ptm,"max",&error);
       weed_set_double_value(stevent,"value",i<track?max:min);
@@ -22549,7 +22922,7 @@
     }
 
     insert_param_change_event_at(mt->event_list,block->end_event,enevent);
-    weed_free(oparams);
+    lives_free(oparams);
   }
 
   // crossfade audio
@@ -22559,13 +22932,13 @@
   mt->is_atrans=FALSE;
   mt->region_start=region_start;
   mt->region_end=region_end;
-  g_list_free(mt->selected_tracks);
-  mt->selected_tracks=g_list_copy(slist);
-  if (slist!=NULL) g_list_free(slist);
+  lives_list_free(mt->selected_tracks);
+  mt->selected_tracks=lives_list_copy(slist);
+  if (slist!=NULL) lives_list_free(slist);
   mt->current_fx=current_fx;
   mt->init_event=old_mt_init;
 
-  weed_free(ptmpls);
+  lives_free(ptmpls);
 
   if (needs_idle) mt->idlefunc=mt_idle_add(mt);

LiVES-2.2.8.tar.bz2/src/multitrack.h -> LiVES-2.4.1.tar.bz2/src/multitrack.h Changed

@@ -66,9 +66,8 @@
 
   // not implemented yet
   INSERT_MODE_OVERWRITE, ///< overwite existing blocks
-  INSERT_MODE_EXPAND, ///< repeat to fill gap
-  INSERT_MODE_FILL_START, ///< insert enough to fill gap (from selection start)
-  INSERT_MODE_FILL_END ///< insert enough to fill gap (to selection end)
+  INSERT_MODE_FLEX, ///< stretch first gap to fit block
+  INSERT_MODE_FILL, ///< insert enough to fill gap (from selection start or end depending on gravity)
 } lives_mt_insert_mode_t;
 
 
@@ -80,20 +79,20 @@
 
 
 typedef enum {
-// undo actions
-/// no event_list
+  // undo actions
+  /// no event_list
   MT_UNDO_NONE=0,
   MT_UNDO_INSERT_BLOCK=1,
   MT_UNDO_INSERT_AUDIO_BLOCK=2,
 
-// minimal event_list
+  // minimal event_list
   MT_UNDO_APPLY_FILTER=512,
   MT_UNDO_DELETE_FILTER=513,
   MT_UNDO_SPLIT=514,
   MT_UNDO_SPLIT_MULTI=515,
   MT_UNDO_FILTER_MAP_CHANGE=516,
 
-// full backups of event_list
+  // full backups of event_list
   MT_UNDO_DELETE_BLOCK=1024,
   MT_UNDO_MOVE_BLOCK=1025,
   MT_UNDO_REMOVE_GAPS=1026,
@@ -111,7 +110,7 @@
   NB_ERROR_NOCOMP,
   NB_ERROR_NOCLIP
 } lives_mt_nb_error_t;
-  
+
 
 
 typedef enum {
@@ -148,7 +147,7 @@
 
 
 typedef enum {
-// block state
+  // block state
   BLOCK_UNSELECTED=0,
   BLOCK_SELECTED
 } lives_mt_block_state_t;
@@ -173,12 +172,16 @@
   boolean gang_audio; ///< gang layer audio volume levels
   boolean autocross_audio; ///< crossfade audio with autotransitions
   int back_audio_tracks; ///< number of backing audio tracks (currently 0 or 1)
+  boolean render_vidp; ///< render video
+  boolean render_audp; ///< render audio
+  boolean normalise_audp; ///< normalise audio
 };
 
 
 struct _mt {
   // widgets
   LiVESWidget *window;
+  LiVESWidget *menubar;
   LiVESWidget *top_vbox;
   LiVESWidget *hbox;
   LiVESWidget *play_blank;
@@ -330,12 +333,16 @@
   LiVESWidget *amixer_button;
   LiVESWidget *view_sel_events;
   LiVESWidget *adjust_start_end;
-  LiVESWidget *start_in_label;
-  LiVESWidget *end_out_label;
   LiVESWidget *context_frame;
   LiVESWidget *nb;
   LiVESWidget *nb_label;
 
+  LiVESWidget *btoolbar;
+  LiVESWidget *btoolbar2;
+  LiVESWidget *btoolbar3;
+
+  LiVESWidget *menu_hbox;
+
   LiVESWidget *open_menu;
   LiVESWidget *recent_menu;
   LiVESWidget *recent1;
@@ -365,44 +372,46 @@
   LiVESObject *hadjustment;
   LiVESObject *node_adj;
 
-  GList *audio_draws; ///< list of audio boxes, 0 == backing audio, 1 == track 0 audio, etc.
+  LiVESList *audio_draws; ///< list of audio boxes, 0 == backing audio, 1 == track 0 audio, etc.
 
-  GList *audio_vols; ///< layer volume levels (coarse control) - set in mixer
-  GList *audio_vols_back; ///< layer volume levels (coarse control) - reset levels
+  LiVESList *audio_vols; ///< layer volume levels (coarse control) - set in mixer
+  LiVESList *audio_vols_back; ///< layer volume levels (coarse control) - reset levels
 
   LiVESAccelGroup *accel_group;
-  GList *video_draws; ///< list of video timeline eventboxes, in layer order
+  LiVESList *video_draws; ///< list of video timeline eventboxes, in layer order
   LiVESObject *vadjustment;
 
-  GdkDisplay *display;
+  LiVESXDisplay *display;
 
-  GList *aparam_view_list;
+  LiVESList *aparam_view_list;
 
   LiVESPixbuf *frame_pixbuf;
 
-  gulong spin_in_func;
-  gulong spin_out_func;
-  gulong spin_avel_func;
-  gulong check_start_func;
-  gulong check_end_func;
-  gulong check_avel_rev_func;
+  LiVESList *cb_list;
 
-  gulong mm_move_func;
-  gulong mm_select_func;
+  ulong spin_in_func;
+  ulong spin_out_func;
+  ulong spin_avel_func;
+  ulong check_start_func;
+  ulong check_end_func;
+  ulong check_avel_rev_func;
 
-  gulong ins_normal_func;
+  ulong mm_move_func;
+  ulong mm_select_func;
 
-  gulong grav_normal_func;
-  gulong grav_left_func;
-  gulong grav_right_func;
-  
-  gulong sepwin_func;
-  gulong mute_audio_func;
-  gulong loop_cont_func;
+  ulong ins_normal_func;
 
-  gulong seltrack_func;
+  ulong grav_normal_func;
+  ulong grav_left_func;
+  ulong grav_right_func;
 
-  gulong tc_func;
+  ulong sepwin_func;
+  ulong mute_audio_func;
+  ulong loop_cont_func;
+
+  ulong seltrack_func;
+
+  ulong tc_func;
 
   weed_plant_t *event_list;
 
@@ -420,7 +429,7 @@
   int file_selected; ///< actual LiVES file struct number which clip_selected matches
   int current_track; ///< starts at 0
 
-  GList *selected_tracks;
+  LiVESList *selected_tracks;
 
   lives_mt_poly_state_t poly_state;  ///< state of polymorph window
 
@@ -452,7 +461,7 @@
 
   lives_rfx_t *current_rfx;
 
-  gchar layout_name[PATH_MAX];
+  char layout_name[PATH_MAX];
 
   // cursor warping for mouse move mode
   double hotspot_x;
@@ -460,13 +469,15 @@
 
   boolean moving_block; ///< moving block flag
 
+  double pb_start_time; ///< playback start time in seconds. If play is stopped (not paused) we return to here.
+
   //////////////////////////////
 
   int sel_x;
   int sel_y;
 
-  gulong mouse_mot1;
-  gulong mouse_mot2;
+  ulong mouse_mot1;
+  ulong mouse_mot2;
 
   boolean tl_selecting; ///< for mouse select mode
 
@@ -477,14 +488,14 @@
   /// override for avel used during audio insert
   double insert_avel;
 
-  GList *undos;
+  LiVESList *undos;
   size_t undo_buffer_used;
   uint8_t *undo_mem;
   int undo_offset;
   boolean did_backup;
 
-  gchar undo_text[32];
-  gchar redo_text[32];
+  char undo_text[32];
+  char redo_text[32];
 
   boolean undoable;
   boolean redoable;
@@ -516,8 +527,8 @@
   int avol_fx; ///< index of audio volume filter, delegated by user from audio volume candidates
   weed_plant_t *avol_init_event;
 
-  gulong spin_start_func;
-  gulong spin_end_func;
+  ulong spin_start_func;
+  ulong spin_end_func;
 
   boolean layout_prompt; ///< on occasion, prompt user if they want to correct layout on disk or not
   boolean layout_set_properties;
@@ -531,14 +542,10 @@
   int user_asamps;
   int user_signed_endian;
 
-  boolean render_vidp;
-  boolean render_audp;
-  boolean normalise_audp;
-
   int exact_preview;
 
 
-  GList *tl_marks;
+  LiVESList *tl_marks;
 
   weed_plant_t *pb_start_event; ///< FRAME event from which we start playback
   weed_plant_t *pb_loop_event; ///< FRAME event to loop back to (can be different from pb_start_event if we are paused)
@@ -580,9 +587,9 @@
 
   boolean playing_sel; ///< are we playing just the time selection ?
 
-  uint32_t idlefunc; ///< autobackup function 
+  uint32_t idlefunc; ///< autobackup function
 
-  GList *clip_labels;
+  LiVESList *clip_labels;
 
   lives_amixer_t *amixer;
 
@@ -593,6 +600,9 @@
 
   boolean is_atrans; /// < force some visual changes when applying autotrans
 
+  char *force_load_name; ///< pointer to a string which contains a filename to be force loaded when load_event_list_activate() is called.
+  ///< Normally NULL except when called from language bindings.
+
 };  // lives_mt
 
 
@@ -611,7 +621,7 @@
   LiVESWidget **ch_sliders;
   LiVESWidget *gang_checkbutton;
   LiVESWidget *inv_checkbutton;
-  gulong *ch_slider_fns;
+  ulong *ch_slider_fns;
   int nchans;
   lives_mt *mt;
 };
@@ -626,6 +636,8 @@
 ///
 /// start and end events MUST be FRAME events
 struct _track_rect {
+  ulong uid;
+
   track_rect *next;
   track_rect *prev;
   weed_plant_t *start_event;
@@ -637,8 +649,9 @@
   boolean start_anchored;
   boolean end_anchored;
   boolean ordered; ///< are frames in sequential order ?
-  
-  LiVESWidget *eventbox; ///< pointer to eventbox widget which contains this block; we can use its "layer_number" to get the track/layer number
+
+  LiVESWidget
+  *eventbox; ///< pointer to eventbox widget which contains this block; we can use its "layer_number" to get the track/layer number
 
 };
 
@@ -652,10 +665,10 @@
 
 /* clip->layout use mapping, from layout.map lives_clip_t */
 typedef struct {
-  gchar *handle;
+  char *handle;
   int64_t unique_id;
-  gchar *name;
-  GList *list;
+  char *name;
+  LiVESList *list;
 } layout_map;
 
 
@@ -666,124 +679,149 @@
 
 // setup functions
 
-lives_mt *multitrack (weed_plant_t *, int orig_file, double fps); ///< create and return lives_mt struct
-void mt_init_tracks (lives_mt *, boolean set_min_max);  ///< add basic tracks, or set tracks from mt->event_list
-boolean on_multitrack_activate (LiVESMenuItem *menuitem, weed_plant_t *event_list); ///< menuitem callback
+lives_mt *multitrack(weed_plant_t *, int orig_file, double fps);  ///< create and return lives_mt struct
+void mt_init_tracks(lives_mt *, boolean set_min_max);   ///< add basic tracks, or set tracks from mt->event_list
+boolean on_multitrack_activate(LiVESMenuItem *menuitem, weed_plant_t *event_list);  ///< menuitem callback
 
 // delete function
-boolean multitrack_delete (lives_mt *, boolean save);
+boolean multitrack_delete(lives_mt *, boolean save);
 
 // morph the poly window
-void polymorph (lives_mt *, lives_mt_poly_state_t poly);
+void polymorph(lives_mt *, lives_mt_poly_state_t poly);
 
 // sens/desens
-void mt_desensitise (lives_mt *);
-void mt_sensitise (lives_mt *);
+void mt_desensitise(lives_mt *);
+void mt_sensitise(lives_mt *);
 
 // external control callbacks
-void insert_here_cb (LiVESMenuItem *, gpointer mt);
-void insert_audio_here_cb (LiVESMenuItem *, gpointer mt);
-void insert_at_ctx_cb (LiVESMenuItem *, gpointer mt);
-void insert_audio_at_ctx_cb (LiVESMenuItem *, gpointer mt);
-void multitrack_end_cb (LiVESMenuItem *, gpointer mt);
-void delete_block_cb (LiVESMenuItem *, gpointer mt);
-void selblock_cb (LiVESMenuItem *, gpointer mt);
-void list_fx_here_cb (LiVESMenuItem *, gpointer mt);
-void edit_start_end_cb (LiVESMenuItem *, gpointer mt);
-void close_clip_cb (LiVESMenuItem *, gpointer mt);
-void show_clipinfo_cb (LiVESMenuItem *, gpointer mt);
-
-void multitrack_insert (LiVESMenuItem *, gpointer mt);
+void insert_here_cb(LiVESMenuItem *, livespointer mt);
+void insert_audio_here_cb(LiVESMenuItem *, livespointer mt);
+void insert_at_ctx_cb(LiVESMenuItem *, livespointer mt);
+void insert_audio_at_ctx_cb(LiVESMenuItem *, livespointer mt);
+void multitrack_end_cb(LiVESMenuItem *, livespointer mt);
+void delete_block_cb(LiVESMenuItem *, livespointer mt);
+void selblock_cb(LiVESMenuItem *, livespointer mt);
+void list_fx_here_cb(LiVESMenuItem *, livespointer mt);
+void edit_start_end_cb(LiVESMenuItem *, livespointer mt);
+void close_clip_cb(LiVESMenuItem *, livespointer mt);
+void show_clipinfo_cb(LiVESMenuItem *, livespointer mt);
+
+boolean multitrack_insert(LiVESMenuItem *, livespointer mt);
+track_rect *move_block(lives_mt *, track_rect *block, double timesecs, int old_track, int new_track);
+
+void update_grav_mode(lives_mt *);
+void update_insert_mode(lives_mt *);
+
+
+boolean on_render_activate(LiVESMenuItem *, livespointer mt);
+
+void mt_set_autotrans(int idx);
+
 
 // event_list functions
-weed_plant_t *add_blank_frames_up_to (weed_plant_t *event_list, weed_plant_t *start_event, weed_timecode_t end_tc, double fps);
+weed_plant_t *add_blank_frames_up_to(weed_plant_t *event_list, weed_plant_t *start_event, weed_timecode_t end_tc, double fps);
 
 // track functions
-void on_cback_audio_activate (LiVESMenuItem *, gpointer mt);
-LiVESWidget *add_audio_track (lives_mt *, int trackno, boolean behind);
-void add_video_track_behind (LiVESMenuItem *, gpointer mt);
-void add_video_track_front (LiVESMenuItem *, gpointer mt);
+void on_cback_audio_activate(LiVESMenuItem *, livespointer mt);
+LiVESWidget *add_audio_track(lives_mt *, int trackno, boolean behind);
+int add_video_track_behind(LiVESMenuItem *, livespointer mt);
+int add_video_track_front(LiVESMenuItem *, livespointer mt);
 void delete_video_track(lives_mt *, int layer, boolean full);
 void delete_audio_track(lives_mt *, LiVESWidget *eventbox, boolean full);
-void delete_audio_tracks(lives_mt *, GList *list, boolean full);
-void remove_gaps (LiVESMenuItem *, gpointer mt);
-void remove_first_gaps (LiVESMenuItem *, gpointer mt);
-void on_insgap_sel_activate (LiVESMenuItem *, gpointer mt);
-void on_insgap_cur_activate (LiVESMenuItem *, gpointer mt);
-void on_split_activate (LiVESMenuItem *, gpointer mt);
-void scroll_tracks (lives_mt *, int top_track, boolean set_value);
-boolean track_arrow_pressed (LiVESWidget *ahbox, LiVESXEventButton *, gpointer mt);
-void track_select (lives_mt *); ///< must call after setting mt->current_track
+void delete_audio_tracks(lives_mt *, LiVESList *list, boolean full);
+void remove_gaps(LiVESMenuItem *, livespointer mt);
+void remove_first_gaps(LiVESMenuItem *, livespointer mt);
+void on_insgap_sel_activate(LiVESMenuItem *, livespointer mt);
+void on_insgap_cur_activate(LiVESMenuItem *, livespointer mt);
+void on_split_activate(LiVESMenuItem *, livespointer mt);
+void scroll_tracks(lives_mt *, int top_track, boolean set_value);
+boolean track_arrow_pressed(LiVESWidget *ahbox, LiVESXEventButton *, livespointer mt);
+void track_select(lives_mt *);  ///< must call after setting mt->current_track
 boolean mt_track_is_audio(lives_mt *, int ntrack); ///< return TRUE if ntrack is a valid backing audio track
 boolean mt_track_is_video(lives_mt *, int ntrack); ///< return TRUE if ntrack is a valid video track
+char *get_track_name(lives_mt *mt, int track_num, boolean is_audio);
 
 void mt_do_autotransition(lives_mt *, track_rect *block); ///< call this on a block to apply autotransition on it
 
+void set_track_label_string(lives_mt *mt, int track, const char *label);
+
+LiVESWidget *get_eventbox_for_track(lives_mt *mt, int ntrack);
+void on_rename_track_activate(LiVESMenuItem *menuitem, livespointer mt);
+
 
 // track mouse movement
-boolean on_track_click (LiVESWidget *eventbox, LiVESXEventButton *, gpointer mt);
-boolean on_atrack_click (LiVESWidget *eventbox, LiVESXEventButton *, gpointer mt);
-boolean on_track_header_click (LiVESWidget *eventbox, LiVESXEventButton *, gpointer mt);
-boolean on_track_between_click (LiVESWidget *eventbox, LiVESXEventButton *, gpointer mt);
-boolean on_track_release (LiVESWidget *eventbox, LiVESXEventButton *event, gpointer mt);
-boolean on_atrack_release (LiVESWidget *eventbox, LiVESXEventButton *event, gpointer mt);
-boolean on_track_header_release (LiVESWidget *eventbox, LiVESXEventButton *, gpointer mt);
-boolean on_track_between_release (LiVESWidget *eventbox, LiVESXEventButton *, gpointer mt);
-boolean on_track_move (LiVESWidget *widget, LiVESXEventMotion *event, gpointer mt);
-boolean on_track_header_move (LiVESWidget *widget, LiVESXEventMotion *event, gpointer mt);
-
-void unselect_all (lives_mt *); ///< unselect all blocks
-void insert_frames (int filenum, weed_timecode_t offset_start, weed_timecode_t offset_end, weed_timecode_t tc, lives_direction_t direction, LiVESWidget *eventbox, lives_mt *, track_rect *in_block);
-void insert_audio (int filenum, weed_timecode_t offset_start, weed_timecode_t offset_end, weed_timecode_t tc, double avel, lives_direction_t direction, LiVESWidget *eventbox, lives_mt *, track_rect *in_block);
-void on_seltrack_toggled (LiVESWidget *, gpointer mt);
-void scroll_track_by_scrollbar (LiVESScrollbar *sbar, gpointer mt);
+boolean on_track_click(LiVESWidget *eventbox, LiVESXEventButton *, livespointer mt);
+boolean on_atrack_click(LiVESWidget *eventbox, LiVESXEventButton *, livespointer mt);
+boolean on_track_header_click(LiVESWidget *eventbox, LiVESXEventButton *, livespointer mt);
+boolean on_track_between_click(LiVESWidget *eventbox, LiVESXEventButton *, livespointer mt);
+boolean on_track_release(LiVESWidget *eventbox, LiVESXEventButton *event, livespointer mt);
+boolean on_atrack_release(LiVESWidget *eventbox, LiVESXEventButton *event, livespointer mt);
+boolean on_track_header_release(LiVESWidget *eventbox, LiVESXEventButton *, livespointer mt);
+boolean on_track_between_release(LiVESWidget *eventbox, LiVESXEventButton *, livespointer mt);
+boolean on_track_move(LiVESWidget *widget, LiVESXEventMotion *event, livespointer mt);
+boolean on_track_header_move(LiVESWidget *widget, LiVESXEventMotion *event, livespointer mt);
+
+void unselect_all(lives_mt *);  ///< unselect all blocks
+void insert_frames(int filenum, weed_timecode_t offset_start, weed_timecode_t offset_end, weed_timecode_t tc,
+                   lives_direction_t direction, LiVESWidget *eventbox, lives_mt *, track_rect *in_block);
+void insert_audio(int filenum, weed_timecode_t offset_start, weed_timecode_t offset_end, weed_timecode_t tc,
+                  double avel, lives_direction_t direction, LiVESWidget *eventbox, lives_mt *, track_rect *in_block);
+void on_seltrack_toggled(LiVESWidget *, livespointer mt);
+void scroll_track_by_scrollbar(LiVESScrollbar *sbar, livespointer mt);
 
 // block functions
-void in_out_start_changed (LiVESWidget *, gpointer mt);
-void in_out_end_changed (LiVESWidget *, gpointer mt);
-void in_anchor_toggled (LiVESToggleButton *, gpointer mt);
-void out_anchor_toggled (LiVESToggleButton *, gpointer mt);
-void avel_reverse_toggled (LiVESToggleButton *, gpointer mt);
-void avel_spin_changed (LiVESSpinButton *, gpointer mt);
+void in_out_start_changed(LiVESWidget *, livespointer mt);
+void in_out_end_changed(LiVESWidget *, livespointer mt);
+void in_anchor_toggled(LiVESToggleButton *, livespointer mt);
+void out_anchor_toggled(LiVESToggleButton *, livespointer mt);
+void avel_reverse_toggled(LiVESToggleButton *, livespointer mt);
+void avel_spin_changed(LiVESSpinButton *, livespointer mt);
 
 // block API functions
-int mt_get_last_block_number(lives_mt *, int ntrack); ///< get index of last inserted (wallclock time) block for track
+track_rect *find_block_by_uid(lives_mt *mt, ulong uid);
+ulong mt_get_last_block_uid(lives_mt *mt); ///< get index of last inserted (wallclock time) block for track
 int mt_get_block_count(lives_mt *, int ntrack); ///< count blocks in track
 double mt_get_block_sttime(lives_mt *, int ntrack, int iblock); /// get timeline start time of block
 double mt_get_block_entime(lives_mt *, int ntrack, int iblock); /// get timeline end time of block
 
+track_rect *get_block_from_track_and_time(lives_mt *mt, int track, double time);
+
+int get_track_for_block(track_rect *block);
+int get_clip_for_block(track_rect *block);
+
 
 // timeline functions
-void mt_tl_move(lives_mt *, double pos_rel);
-void set_timeline_end_secs (lives_mt *, double secs);
-boolean on_timeline_press (LiVESWidget *, LiVESXEventButton *, gpointer mt);
-boolean on_timeline_release (LiVESWidget *, LiVESXEventButton *, gpointer mt);
-boolean on_timeline_update (LiVESWidget *, LiVESXEventMotion *, gpointer mt);
-void draw_region (lives_mt *mt);
-void tc_to_rs (LiVESMenuItem *, gpointer mt);
-void tc_to_re (LiVESMenuItem *, gpointer mt);
-void rs_to_tc (LiVESMenuItem *, gpointer mt);
-void re_to_tc (LiVESMenuItem *, gpointer mt);
-
-boolean mt_mark_callback (LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, gpointer user_data);
-
-void multitrack_clear_marks (LiVESMenuItem *, gpointer mt);
+void mt_tl_move_relative(lives_mt *, double pos_rel);
+void mt_tl_move(lives_mt *, double pos_abs);
+void set_timeline_end_secs(lives_mt *, double secs);
+boolean on_timeline_press(LiVESWidget *, LiVESXEventButton *, livespointer mt);
+boolean on_timeline_release(LiVESWidget *, LiVESXEventButton *, livespointer mt);
+boolean on_timeline_update(LiVESWidget *, LiVESXEventMotion *, livespointer mt);
+void draw_region(lives_mt *mt);
+void tc_to_rs(LiVESMenuItem *, livespointer mt);
+void tc_to_re(LiVESMenuItem *, livespointer mt);
+void rs_to_tc(LiVESMenuItem *, livespointer mt);
+void re_to_tc(LiVESMenuItem *, livespointer mt);
+
+boolean mt_mark_callback(LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, livespointer user_data);
+
+void multitrack_clear_marks(LiVESMenuItem *, livespointer mt);
 void mt_show_current_frame(lives_mt *, boolean return_layer);  ///< preview the current frame
 void mt_clear_timeline(lives_mt *mt);
 
 
 // context box text
-void clear_context (lives_mt *);
-void add_context_label (lives_mt *, const gchar *text);
+void clear_context(lives_mt *);
+void add_context_label(lives_mt *, const char *text);
 void mouse_mode_context(lives_mt *);
-void do_sel_context (lives_mt *);
-void do_fx_list_context (lives_mt *, int fxcount);
+void do_sel_context(lives_mt *);
+void do_fx_list_context(lives_mt *, int fxcount);
 void do_fx_move_context(lives_mt *mt);
 
 // playback / animation
-void multitrack_playall (lives_mt *);
-void multitrack_play_sel (LiVESMenuItem *, gpointer mt);
-void animate_multitrack (lives_mt *);
+void multitrack_playall(lives_mt *);
+void multitrack_play_sel(LiVESMenuItem *, livespointer mt);
+void animate_multitrack(lives_mt *);
 void unpaint_line(lives_mt *, LiVESWidget *eventbox);
 void unpaint_lines(lives_mt *);
 
@@ -792,59 +830,69 @@
 
 
 // effect node controls
-void on_next_node_clicked  (LiVESWidget *, gpointer mt);
-void on_prev_node_clicked  (LiVESWidget *, gpointer mt);
-void on_del_node_clicked  (LiVESWidget *, gpointer mt);
-void on_node_spin_value_changed (LiVESSpinButton *, gpointer mt);
+void on_next_node_clicked(LiVESWidget *, livespointer mt);
+void on_prev_node_clicked(LiVESWidget *, livespointer mt);
+void on_del_node_clicked(LiVESWidget *, livespointer mt);
+void on_node_spin_value_changed(LiVESSpinButton *, livespointer mt);
 double mt_get_effect_time(lives_mt *);
 
-void on_frame_preview_clicked (LiVESButton *, gpointer mt);
-void show_preview (lives_mt *, weed_timecode_t tc);
+void on_frame_preview_clicked(LiVESButton *, livespointer mt);
+void show_preview(lives_mt *, weed_timecode_t tc);
 
 boolean add_mt_param_box(lives_mt *);
 
 // filter list controls
-weed_plant_t *get_prev_fm (lives_mt *, int current_track, weed_plant_t *frame);
-weed_plant_t *get_next_fm (lives_mt *, int current_track, weed_plant_t *frame);
+weed_plant_t *get_prev_fm(lives_mt *, int current_track, weed_plant_t *frame);
+weed_plant_t *get_next_fm(lives_mt *, int current_track, weed_plant_t *frame);
 
-void on_prev_fm_clicked  (LiVESWidget *button, gpointer mt);
-void on_next_fm_clicked  (LiVESWidget *button, gpointer mt);
-void on_fx_insb_clicked  (LiVESWidget *button, gpointer mt);
-void on_fx_insa_clicked  (LiVESWidget *button, gpointer mt);
+void on_prev_fm_clicked(LiVESWidget *button, livespointer mt);
+void on_next_fm_clicked(LiVESWidget *button, livespointer mt);
+void on_fx_insb_clicked(LiVESWidget *button, livespointer mt);
+void on_fx_insa_clicked(LiVESWidget *button, livespointer mt);
 
 // utils
 uint32_t event_list_get_byte_size(lives_mt *, weed_plant_t *event_list, int *num_events);  ///< returns bytes and sets num_events
 boolean event_list_rectify(lives_mt *, weed_plant_t *event_listy);
-boolean make_backup_space (lives_mt *, size_t space_needed);
+boolean make_backup_space(lives_mt *, size_t space_needed);
 void activate_mt_preview(lives_mt *); ///< sensitize Show Preview and Apply buttons
 void **mt_get_pchain(void);
 void event_list_free_undos(lives_mt *);
 boolean used_in_current_layout(lives_mt *, int file);
 
+boolean set_new_set_name(lives_mt *);
+
+
 // event_list utilities
-boolean compare_filter_maps(weed_plant_t *fm1, weed_plant_t *fm2, int ctrack); ///< ctrack can be -1 to compare all events, else we cf for ctrack
-void move_init_in_filter_map(lives_mt *, weed_plant_t *event_list, weed_plant_t *fmap, weed_plant_t *ifrom, weed_plant_t *ito, int track, boolean after);
-void update_filter_events(lives_mt *, weed_plant_t *first_event, weed_timecode_t start_tc, weed_timecode_t end_tc, int track, weed_timecode_t new_start_tc, int new_track);
+boolean compare_filter_maps(weed_plant_t *fm1, weed_plant_t *fm2,
+                            int ctrack); ///< ctrack can be -1 to compare all events, else we cf for ctrack
+void move_init_in_filter_map(lives_mt *, weed_plant_t *event_list, weed_plant_t *fmap, weed_plant_t *ifrom,
+                             weed_plant_t *ito, int track, boolean after);
+void update_filter_events(lives_mt *, weed_plant_t *first_event, weed_timecode_t start_tc, weed_timecode_t end_tc,
+                          int track, weed_timecode_t new_start_tc, int new_track);
 void mt_fixup_events(lives_mt *, weed_plant_t *old_event, weed_plant_t *new_event);
 
 // event_list load/save
-weed_plant_t *load_event_list(lives_mt *, gchar *eload_file);
+char *get_eload_filename(lives_mt *mt, boolean allow_auto_reload);
+weed_plant_t *load_event_list(lives_mt *, char *eload_file);
+boolean on_save_event_list_activate(LiVESMenuItem *, livespointer mt);
 
 
 // layouts and layout maps
-GList *load_layout_map(void);
+LiVESList *load_layout_map(void);
 void add_markers(lives_mt *, weed_plant_t *event_list);
 void remove_markers(weed_plant_t *event_list);
-void save_layout_map (int *lmap, double *lmap_audio, const gchar *file, const gchar *dir);
+void save_layout_map(int *lmap, double *lmap_audio, const char *file, const char *dir);
 
 void wipe_layout(lives_mt *);
 
-void migrate_layouts (const gchar *old_set_name, const gchar *new_set_name);
+void migrate_layouts(const char *old_set_name, const char *new_set_name);
+
+LiVESList *layout_frame_is_affected(int clipno, int frame);
+LiVESList *layout_audio_is_affected(int clipno, double time);
 
-GList *layout_frame_is_affected(int clipno, int frame);
-GList *layout_audio_is_affected(int clipno, double time);
+boolean check_for_layout_del(lives_mt *, boolean exiting);
 
-boolean check_for_layout_del (lives_mt *, boolean exiting);
+boolean on_load_event_list_activate(LiVESMenuItem *, livespointer mt);
 
 void stored_event_list_free_all(boolean wiped);
 void stored_event_list_free_undos(void);
@@ -859,25 +907,25 @@
 
 
 // amixer funcs
-void amixer_show (LiVESButton *, gpointer mt);
-void on_amixer_close_clicked (LiVESButton *, lives_mt *mt);
-LiVESWidget * amixer_add_channel_slider (lives_mt *, int i);
+void amixer_show(LiVESButton *, livespointer mt);
+void on_amixer_close_clicked(LiVESButton *, lives_mt *mt);
+LiVESWidget *amixer_add_channel_slider(lives_mt *, int i);
 
 
 // misc
-void mt_change_disp_tracks_ok (LiVESButton *, gpointer mt);
-void mt_swap_play_pause (lives_mt *, boolean put_pause);
-gchar *set_values_from_defs(lives_mt *, boolean from_prefs);
+void mt_change_disp_tracks_ok(LiVESButton *, livespointer mt);
+void mt_swap_play_pause(lives_mt *, boolean put_pause);
+char *set_values_from_defs(lives_mt *, boolean from_prefs);
 
 
 // clip boxes
-void mt_clip_select (lives_mt *, boolean scroll);
+void mt_clip_select(lives_mt *, boolean scroll);
 void mt_delete_clips(lives_mt *, int file);
-void mt_init_clips (lives_mt *, int orig_file, boolean add);
+void mt_init_clips(lives_mt *, int orig_file, boolean add);
 
 // key shortcuts
-boolean mt_prevclip (LiVESAccelGroup *, LiVESObject *, uint32_t keyval, LiVESXModifierType mod, gpointer);
-boolean mt_nextclip (LiVESAccelGroup *, LiVESObject *, uint32_t keyval, LiVESXModifierType mod, gpointer);
+boolean mt_prevclip(LiVESAccelGroup *, LiVESObject *, uint32_t keyval, LiVESXModifierType mod, livespointer);
+boolean mt_nextclip(LiVESAccelGroup *, LiVESObject *, uint32_t keyval, LiVESXModifierType mod, livespointer);
 
 typedef enum {
   /* default to warn about */

LiVES-2.2.8.tar.bz2/src/omc-learn.c -> LiVES-2.4.1.tar.bz2/src/omc-learn.c Changed

@@ -1,6 +1,6 @@
 // omc-learn.c
 // LiVES (lives-exe)
-// (c) G. Finch 2008 - 2013
+// (c) G. Finch 2008 - 2015
 // Released under the GPL 3 or later
 // see file ../COPYING for licensing details
 
@@ -19,7 +19,6 @@
 #include "../libweed/weed-effects.h"
 #endif
 
-#include "support.h"
 #include "main.h"
 #include "paramwindow.h"
 #include "effects.h"
@@ -61,9 +60,9 @@
 
 
 static OSCbuf obuf;
-static gchar byarr[OSC_BUF_SIZE];
+static char byarr[OSC_BUF_SIZE];
 static lives_omc_macro_t omc_macros[N_OMC_MACROS];
-static GSList *omc_node_list;
+static LiVESSList *omc_node_list;
 static boolean omc_macros_inited=FALSE;
 
 //////////////////////////////////////////////////////////////
@@ -72,22 +71,22 @@
 static void omc_match_node_free(lives_omc_match_node_t *mnode) {
 
   if (mnode->nvars>0) {
-    g_free(mnode->offs0);
-    g_free(mnode->scale);
-    g_free(mnode->offs1);
-    g_free(mnode->min);
-    g_free(mnode->max);
-    g_free(mnode->matchp);
-    g_free(mnode->matchi);
+    lives_free(mnode->offs0);
+    lives_free(mnode->scale);
+    lives_free(mnode->offs1);
+    lives_free(mnode->min);
+    lives_free(mnode->max);
+    lives_free(mnode->matchp);
+    lives_free(mnode->matchi);
   }
 
-  if (mnode->map!=NULL) g_free(mnode->map);
-  if (mnode->fvali!=NULL) g_free(mnode->fvali);
-  if (mnode->fvald!=NULL) g_free(mnode->fvald);
+  if (mnode->map!=NULL) lives_free(mnode->map);
+  if (mnode->fvali!=NULL) lives_free(mnode->fvali);
+  if (mnode->fvald!=NULL) lives_free(mnode->fvald);
 
-  g_free(mnode->srch);
+  lives_free(mnode->srch);
 
-  g_free(mnode);
+  lives_free(mnode);
 
 }
 
@@ -95,20 +94,19 @@
 
 static void remove_all_nodes(boolean every, omclearn_w *omclw) {
   lives_omc_match_node_t *mnode;
-  GSList *slist_last=NULL,*slist_next;
-  GSList *slist=omc_node_list;
+  LiVESSList *slist_last=NULL,*slist_next;
+  LiVESSList *slist=omc_node_list;
 
   while (slist!=NULL) {
     slist_next=slist->next;
-    
+
     mnode=(lives_omc_match_node_t *)slist->data;
-    
+
     if (every||mnode->macro==-1) {
       if (slist_last!=NULL) slist_last->next=slist->next;
       else omc_node_list=slist->next;
       omc_match_node_free(mnode);
-    }
-    else slist_last=slist;
+    } else slist_last=slist;
     slist=slist_next;
   }
 
@@ -118,24 +116,24 @@
 }
 
 
-static LIVES_INLINE int js_index(const gchar *string) {
+static LIVES_INLINE int js_index(const char *string) {
   // js index, or midi channel number
-  gchar **array=g_strsplit(string," ",-1);
+  char **array=lives_strsplit(string," ",-1);
   int res=atoi(array[1]);
-  g_strfreev(array);
+  lives_strfreev(array);
   return res;
 }
 
 
-static LIVES_INLINE int midi_index(const gchar *string) {
+static LIVES_INLINE int midi_index(const char *string) {
   // midi controller number
-  gchar **array;
+  char **array;
   int res;
   if (get_token_count(string,' ')<3) return -1;
 
-  array=g_strsplit(string," ",-1);
+  array=lives_strsplit(string," ",-1);
   res=atoi(array[2]);
-  g_strfreev(array);
+  lives_strfreev(array);
   return res;
 }
 
@@ -149,23 +147,23 @@
 
 
 #ifndef IS_MINGW
-const gchar * get_js_filename(void) {
-  gchar *js_fname;
+const char *get_js_filename(void) {
+  char *js_fname;
 
   // OPEN DEVICE FILE
   // first try to open /dev/input/js
-  js_fname = "/dev/input/js"; 
+  js_fname = "/dev/input/js";
   js_fd = open(js_fname, O_RDONLY|O_NONBLOCK);
   if (js_fd < 0) {
     // if it doesn't open, try to open /dev/input/js0
-    js_fname = "/dev/input/js0"; 
+    js_fname = "/dev/input/js0";
     js_fd = open(js_fname, O_RDONLY|O_NONBLOCK);
     if (js_fd < 0) {
       js_fname = "/dev/js0";
       js_fd = open(js_fname, O_RDONLY|O_NONBLOCK);
       // if no device is found
       if (js_fd < 0) {
-	return NULL;
+        return NULL;
       }
     }
   }
@@ -175,26 +173,22 @@
 
 
 boolean js_open(void) {
-  gchar *msg;
 
   if (!(prefs->omc_dev_opts&OMC_DEV_JS)) return TRUE;
 
   if (prefs->omc_js_fname!=NULL) {
     js_fd = open(prefs->omc_js_fname, O_RDONLY|O_NONBLOCK);
     if (js_fd < 0) return FALSE;
-  }
-  else {
-    const gchar *tmp=get_js_filename();
+  } else {
+    const char *tmp=get_js_filename();
     if (tmp!=NULL) {
-      g_snprintf(prefs->omc_js_fname,256,"%s",tmp);
+      lives_snprintf(prefs->omc_js_fname,256,"%s",tmp);
     }
   }
   if (prefs->omc_js_fname==NULL) return FALSE;
 
   mainw->ext_cntl[EXT_CNTL_JS]=TRUE;
-  msg=g_strdup_printf(_("Responding to joystick events from %s\n"),prefs->omc_js_fname);
-  d_print(msg);
-  g_free(msg);
+  d_print(_("Responding to joystick events from %s\n"),prefs->omc_js_fname);
 
   return TRUE;
 }
@@ -203,17 +197,17 @@
 
 void js_close(void) {
   if (mainw->ext_cntl[EXT_CNTL_JS]) {
-    close (js_fd);
+    close(js_fd);
     mainw->ext_cntl[EXT_CNTL_JS]=FALSE;
   }
 }
 
 
-gchar *js_mangle(void) {
+char *js_mangle(void) {
   // get js event and process it
   struct js_event jse;
   size_t bytes;
-  gchar *ret;
+  char *ret;
   int type=0;
 
   bytes = read(js_fd, &jse, sizeof(jse));
@@ -229,14 +223,14 @@
     type=OMC_JS_BUTTON;
   }
 
-  ret=g_strdup_printf("%d %d %d",type,jse.number,jse.value);
+  ret=lives_strdup_printf("%d %d %d",type,jse.number,jse.value);
 
   return ret;
 
 }
 
 
-static LIVES_INLINE int js_msg_type(const gchar *string) {
+static LIVES_INLINE int js_msg_type(const char *string) {
   return atoi(string);
 }
 
@@ -252,8 +246,8 @@
 #ifndef IS_MINGW
 
 
-const gchar *get_midi_filename(void) {
-gchar *midi_fname;
+const char *get_midi_filename(void) {
+  char *midi_fname;
 
   // OPEN DEVICE FILE
   midi_fname = "/dev/midi";
@@ -265,7 +259,7 @@
       midi_fname = "/dev/midi1";
       midi_fd = open(midi_fname, O_RDONLY|O_NONBLOCK);
       if (midi_fd < 0) {
-	return NULL;
+        return NULL;
       }
     }
   }
@@ -277,10 +271,6 @@
 
 boolean midi_open(void) {
 
-#ifndef IS_MINGW  
-  gchar *msg;
-#endif
-
   if (!(prefs->omc_dev_opts&OMC_DEV_MIDI)) return TRUE;
 
 #ifdef ALSA_MIDI
@@ -293,38 +283,34 @@
       d_print_failed();
       return FALSE;
     }
-    
+
     snd_seq_set_client_name(mainw->seq_handle, "LiVES");
     if ((mainw->alsa_midi_port = snd_seq_create_simple_port(mainw->seq_handle, "LiVES",
-							    SND_SEQ_PORT_CAP_WRITE|SND_SEQ_PORT_CAP_SUBS_WRITE,
-							    SND_SEQ_PORT_TYPE_APPLICATION|SND_SEQ_PORT_TYPE_PORT|SND_SEQ_PORT_TYPE_SOFTWARE)) < 0) {
-      
+                                 SND_SEQ_PORT_CAP_WRITE|SND_SEQ_PORT_CAP_SUBS_WRITE,
+                                 SND_SEQ_PORT_TYPE_APPLICATION|SND_SEQ_PORT_TYPE_PORT|SND_SEQ_PORT_TYPE_SOFTWARE)) < 0) {
+
       d_print_failed();
       return FALSE;
     }
-    
+
     d_print_done();
-  }
-  else {
+  } else {
 
 #endif
 
-#ifndef IS_MINGW  
-  if (prefs->omc_midi_fname!=NULL) {
-    midi_fd = open(prefs->omc_midi_fname, O_RDONLY|O_NONBLOCK);
-    if (midi_fd < 0) return FALSE;
-  }
-  else {
-    const gchar *tmp=get_midi_filename();
-    if (tmp!=NULL) {
-      g_snprintf(prefs->omc_midi_fname,256,"%s",tmp);
+#ifndef IS_MINGW
+    if (prefs->omc_midi_fname!=NULL) {
+      midi_fd = open(prefs->omc_midi_fname, O_RDONLY|O_NONBLOCK);
+      if (midi_fd < 0) return FALSE;
+    } else {
+      const char *tmp=get_midi_filename();
+      if (tmp!=NULL) {
+        lives_snprintf(prefs->omc_midi_fname,256,"%s",tmp);
+      }
     }
-  }
-  if (prefs->omc_midi_fname==NULL) return FALSE;
+    if (prefs->omc_midi_fname==NULL) return FALSE;
 
-  msg=g_strdup_printf(_("Responding to MIDI events from %s\n"),prefs->omc_midi_fname);
-  d_print(msg);
-  g_free(msg);
+    d_print(_("Responding to MIDI events from %s\n"),prefs->omc_midi_fname);
 #endif
 
 #ifdef ALSA_MIDI
@@ -347,12 +333,11 @@
       snd_seq_delete_simple_port(mainw->seq_handle,mainw->alsa_midi_port);
       snd_seq_close(mainw->seq_handle);
       mainw->seq_handle=NULL;
-    }
-    else {
+    } else {
 
 #endif
 
-    close (midi_fd);
+      close(midi_fd);
 
 #ifdef ALSA_MIDI
     }
@@ -378,7 +363,7 @@
 }
 
 
-static int midi_msg_type(const gchar *string) {
+static int midi_msg_type(const char *string) {
   int type=atoi(string);
 
   if ((type&0XF0)==0X90) return OMC_MIDI_NOTE;
@@ -403,15 +388,15 @@
 
 
 
-gchar *midi_mangle(void) {
+char *midi_mangle(void) {
   // get MIDI event and process it
-  gchar *string=NULL;
+  char *string=NULL;
 
   ssize_t bytes,tot=0,allowed=prefs->midi_rpt;
   unsigned char midbuf[4],xbuf[4];
   int target=1,mtype=0,idx;
   boolean got_target=FALSE;
-  gchar *str;
+  char *str;
 
 #ifdef ALSA_MIDI
   int npfd=0;
@@ -425,103 +410,104 @@
     if (snd_seq_event_input_pending(mainw->seq_handle, 0)==0) {
       // returns number of poll descriptors
       npfd = snd_seq_poll_descriptors_count(mainw->seq_handle, POLLIN);
-      
+
       if (npfd<1) return NULL;
-      
-      pfd = (struct pollfd *)g_malloc(npfd * sizeof(struct pollfd));
-      
+
+      pfd = (struct pollfd *)lives_malloc(npfd * sizeof(struct pollfd));
+
       // fill our poll descriptors
       snd_seq_poll_descriptors(mainw->seq_handle, pfd, npfd, POLLIN);
-    }
-    else hasmore=TRUE; // events remaining from the last call to this function
+    } else hasmore=TRUE; // events remaining from the last call to this function
 
     if (hasmore || poll(pfd, npfd, 0) > 0) {
-      
+
       do {
 
-	if (snd_seq_event_input(mainw->seq_handle, &ev)<0) {
-	  break; // an error occured reading from the port
-	}
-
-	switch (ev->type) {
-	case SND_SEQ_EVENT_CONTROLLER:   
-	  typeNumber=176;
-	  string=g_strdup_printf("%d %d %u %d",typeNumber+ev->data.control.channel, ev->data.control.channel, ev->data.control.param,ev->data.control.value);
-	  
-	  break;
-	case SND_SEQ_EVENT_PITCHBEND:
-	  typeNumber=224;
-	  string=g_strdup_printf("%d %d %d",typeNumber+ev->data.control.channel,ev->data.control.channel, ev->data.control.value);
-	  break;
-
-	case SND_SEQ_EVENT_NOTEON:
-	  typeNumber=144;
-	  string=g_strdup_printf("%d %d %d %d",typeNumber+ev->data.note.channel, ev->data.note.channel, ev->data.note.note,ev->data.note.velocity);
-	  
-	  break;        
-	case SND_SEQ_EVENT_NOTEOFF:       
-	  typeNumber=128;
-	  string=g_strdup_printf("%d %d %d %d",typeNumber+ev->data.note.channel, ev->data.note.channel, ev->data.note.note,ev->data.note.off_velocity);
-	  
-	  break;        
-	case SND_SEQ_EVENT_PGMCHANGE:       
-	  typeNumber=192;
-	  string=g_strdup_printf("%d %d %d",typeNumber+ev->data.note.channel, ev->data.note.channel, ev->data.control.value);
-	  
-	  break;        
-	  
-	}
-	snd_seq_free_event(ev);
-	
+        if (snd_seq_event_input(mainw->seq_handle, &ev)<0) {
+          break; // an error occured reading from the port
+        }
+
+        switch (ev->type) {
+        case SND_SEQ_EVENT_CONTROLLER:
+          typeNumber=176;
+          string=lives_strdup_printf("%d %d %u %d",typeNumber+ev->data.control.channel, ev->data.control.channel, ev->data.control.param,
+                                     ev->data.control.value);
+
+          break;
+        case SND_SEQ_EVENT_PITCHBEND:
+          typeNumber=224;
+          string=lives_strdup_printf("%d %d %d",typeNumber+ev->data.control.channel,ev->data.control.channel, ev->data.control.value);
+          break;
+
+        case SND_SEQ_EVENT_NOTEON:
+          typeNumber=144;
+          string=lives_strdup_printf("%d %d %d %d",typeNumber+ev->data.note.channel, ev->data.note.channel, ev->data.note.note,
+                                     ev->data.note.velocity);
+
+          break;
+        case SND_SEQ_EVENT_NOTEOFF:
+          typeNumber=128;
+          string=lives_strdup_printf("%d %d %d %d",typeNumber+ev->data.note.channel, ev->data.note.channel, ev->data.note.note,
+                                     ev->data.note.off_velocity);
+
+          break;
+        case SND_SEQ_EVENT_PGMCHANGE:
+          typeNumber=192;
+          string=lives_strdup_printf("%d %d %d",typeNumber+ev->data.note.channel, ev->data.note.channel, ev->data.control.value);
+
+          break;
+
+        }
+        snd_seq_free_event(ev);
+
       } while (snd_seq_event_input_pending(mainw->seq_handle, 0) > 0 && string==NULL);
-      
+
     }
-    
-    if (pfd!=NULL) g_free(pfd);
 
-  }
-  else {
+    if (pfd!=NULL) lives_free(pfd);
+
+  } else {
 
 #endif
 
-  if (midi_fd==-1) return NULL;
+    if (midi_fd==-1) return NULL;
 
-  while (tot<target) {
-    bytes = read(midi_fd, xbuf, target-tot);
-    
-    if (bytes<1) {
-      if (--allowed<0) return NULL;
-      continue;
-    }
-    
-    str=g_strdup_printf("%d",xbuf[0]);
+    while (tot<target) {
+      bytes = read(midi_fd, xbuf, target-tot);
 
-    if (!got_target) {
-      target=get_midi_len((mtype=midi_msg_type(str)));
-      got_target=TRUE;
-    }
-    
-    g_free(str);
+      if (bytes<1) {
+        if (--allowed<0) return NULL;
+        continue;
+      }
 
-    //g_print("midi pip %d %02X , tg=%d\n",bytes,xbuf[0],target);
+      str=lives_strdup_printf("%d",xbuf[0]);
 
-    memcpy(midbuf+tot,xbuf,bytes);
+      if (!got_target) {
+        target=get_midi_len((mtype=midi_msg_type(str)));
+        got_target=TRUE;
+      }
 
-    tot+=bytes;
+      lives_free(str);
 
-  }
+      //g_print("midi pip %d %02X , tg=%d\n",bytes,xbuf[0],target);
 
-  if (mtype==0) return NULL;
+      memcpy(midbuf+tot,xbuf,bytes);
 
-  idx=(midbuf[0]&0x0F);
+      tot+=bytes;
 
-  if (target==2) string=g_strdup_printf("%u %u %u",midbuf[0],idx,midbuf[1]);
-  else if (target==3) string=g_strdup_printf("%u %u %u %u",midbuf[0],idx,midbuf[1],midbuf[2]);
-  else string=g_strdup_printf("%u %u %u %u %u",midbuf[0],idx,midbuf[1],midbuf[2],midbuf[3]);
+    }
+
+    if (mtype==0) return NULL;
+
+    idx=(midbuf[0]&0x0F);
+
+    if (target==2) string=lives_strdup_printf("%u %u %u",midbuf[0],idx,midbuf[1]);
+    else if (target==3) string=lives_strdup_printf("%u %u %u %u",midbuf[0],idx,midbuf[1],midbuf[2]);
+    else string=lives_strdup_printf("%u %u %u %u %u",midbuf[0],idx,midbuf[1],midbuf[2],midbuf[3]);
 
 
 #ifdef ALSA_MIDI
-    }
+  }
 #endif
 
   //g_print("got %s\n",string);
@@ -534,20 +520,20 @@
 
 
 
-static LIVES_INLINE gchar *cut_string_elems(const gchar *string, int nelems) {
+static LIVES_INLINE char *cut_string_elems(const char *string, int nelems) {
   // remove elements after nelems
 
-  gchar *retval=g_strdup(string);
+  char *retval=lives_strdup(string);
   register int i;
   size_t slen=strlen(string);
 
   if (nelems<0) return retval;
 
-  for (i=0;i<slen;i++) {
+  for (i=0; i<slen; i++) {
     if (!strncmp((string+i)," ",1)) {
       if (--nelems==0) {
-	memset(retval+i,0,1);
-	return retval;
+        memset(retval+i,0,1);
+        return retval;
       }
     }
   }
@@ -560,27 +546,27 @@
 
 
 
-static gchar *omc_learn_get_pname(int type, int idx) {
+static char *omc_learn_get_pname(int type, int idx) {
   switch (type) {
   case OMC_MIDI_CONTROLLER:
   case OMC_MIDI_PITCH_BEND:
   case OMC_MIDI_PGM_CHANGE:
-    return g_strdup(_("data"));
+    return lives_strdup(_("data"));
   case OMC_MIDI_NOTE:
   case OMC_MIDI_NOTE_OFF:
-    if (idx==1) return g_strdup(_("velocity"));
-    return g_strdup(_("note"));
+    if (idx==1) return lives_strdup(_("velocity"));
+    return lives_strdup(_("note"));
   case OMC_JS_AXIS:
-    return g_strdup(_("value"));
+    return lives_strdup(_("value"));
   default:
-    return g_strdup(_("state"));
+    return lives_strdup(_("state"));
   }
 }
 
 
 
-static int omc_learn_get_pvalue(int type, int idx, const gchar *string) {
-  gchar **array=g_strsplit(string," ",-1);
+static int omc_learn_get_pvalue(int type, int idx, const char *string) {
+  char **array=lives_strsplit(string," ",-1);
   int res;
 
   switch (type) {
@@ -592,13 +578,13 @@
     break;
   }
 
-  g_strfreev(array);
+  lives_strfreev(array);
   return res;
 }
 
 
 
-static void cell1_edited_callback (LiVESCellRenderer *spinbutton, const gchar *path_string, const gchar *new_text, gpointer user_data) {
+static void cell1_edited_callback(LiVESCellRenderer *spinbutton, const char *path_string, const char *new_text, livespointer user_data) {
   lives_omc_match_node_t *mnode=(lives_omc_match_node_t *)user_data;
 
   lives_omc_macro_t omacro=omc_macros[mnode->macro];
@@ -637,13 +623,13 @@
     mnode->fvali[row]=vali;
     break;
   case OMC_PARAM_DOUBLE:
-    vald=g_strtod (new_text,NULL);
+    vald=lives_strtod(new_text,NULL);
     mnode->fvald[row]=vald;
     break;
   }
-  
+
   lives_tree_store_set(mnode->gtkstore2,&iter,VALUE2_COLUMN,new_text,-1);
-  
+
 }
 
 
@@ -653,103 +639,105 @@
 
   LiVESCellRenderer *renderer;
   LiVESTreeViewColumn *column;
-  
+
   LiVESTreeIter iter1,iter2;
 
   LiVESObject *spinadj;
 
-  gchar *strval=NULL,*vname;
-  gchar *oldval=NULL,*final=NULL;
+  char *strval=NULL,*vname;
+  char *oldval=NULL,*final=NULL;
 
   int mfrom;
   register int i;
-  
 
-  mnode->gtkstore2 = lives_tree_store_new (NUM2_COLUMNS, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
+
+  mnode->gtkstore2 = lives_tree_store_new(NUM2_COLUMNS, LIVES_COL_TYPE_STRING, LIVES_COL_TYPE_STRING, LIVES_COL_TYPE_STRING);
 
   if (macro.nparams==0) return;
 
-  lives_tree_store_append (mnode->gtkstore2, &iter1, NULL);  /* Acquire an iterator */
-  lives_tree_store_set (mnode->gtkstore2, &iter1, TITLE2_COLUMN, (_("Params.")), -1);
+  lives_tree_store_append(mnode->gtkstore2, &iter1, NULL);   /* Acquire an iterator */
+  lives_tree_store_set(mnode->gtkstore2, &iter1, TITLE2_COLUMN, (_("Params.")), -1);
+
+  for (i=0; i<macro.nparams; i++) {
+    lives_tree_store_append(mnode->gtkstore2, &iter2, &iter1);   /* Acquire a child iterator */
 
-  for (i=0;i<macro.nparams;i++) {
-    lives_tree_store_append (mnode->gtkstore2, &iter2, &iter1);  /* Acquire a child iterator */
-       
     if (oldval!=NULL) {
-      g_free(oldval);
+      lives_free(oldval);
       oldval=NULL;
     }
-       
+
     if (final!=NULL) {
-      g_free(final);
+      lives_free(final);
       final=NULL;
     }
 
-    if ((mfrom=mnode->map[i])!=-1) strval=g_strdup(_("variable"));
+    if ((mfrom=mnode->map[i])!=-1) strval=lives_strdup(_("variable"));
     else {
       switch (macro.ptypes[i]) {
       case OMC_PARAM_INT:
-	strval=g_strdup_printf("%d",mnode->fvali[i]);
-	break;
+        strval=lives_strdup_printf("%d",mnode->fvali[i]);
+        break;
       case OMC_PARAM_DOUBLE:
-	strval=g_strdup_printf("%.*f",OMC_FP_FIX,mnode->fvald[i]);
-	break;
-	
+        strval=lives_strdup_printf("%.*f",OMC_FP_FIX,mnode->fvald[i]);
+        break;
+
       }
     }
 
     vname=macro.pname[i];
 
-    lives_tree_store_set (mnode->gtkstore2, &iter2, TITLE2_COLUMN, vname, VALUE2_COLUMN, strval, -1);
+    lives_tree_store_set(mnode->gtkstore2, &iter2, TITLE2_COLUMN, vname, VALUE2_COLUMN, strval, -1);
   }
 
-  g_free (strval);
+  lives_free(strval);
 
-  mnode->treev2 = lives_tree_view_new_with_model (LIVES_TREE_MODEL (mnode->gtkstore2));
+  mnode->treev2 = lives_tree_view_new_with_model(LIVES_TREE_MODEL(mnode->gtkstore2));
 
   if (palette->style&STYLE_1) {
     lives_widget_set_base_color(mnode->treev2, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
     lives_widget_set_text_color(mnode->treev2, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars_fore);
   }
 
-  renderer = lives_cell_renderer_text_new ();
-  column = lives_tree_view_column_new_with_attributes (NULL,
-						     renderer,
-						     "text", TITLE2_COLUMN,
-						     NULL);
-  
-  lives_tree_view_append_column (LIVES_TREE_VIEW (mnode->treev2), column);
-  
-  renderer = lives_cell_renderer_spin_new ();
-  
-  spinadj=(LiVESObject *)lives_adjustment_new (0., -100000., 100000., 1., 10., 0);
-  
+  renderer = lives_cell_renderer_text_new();
+  column = lives_tree_view_column_new_with_attributes(NULL,
+           renderer,
+           "text", TITLE2_COLUMN,
+           NULL);
+
+  lives_tree_view_append_column(LIVES_TREE_VIEW(mnode->treev2), column);
+
+  renderer = lives_cell_renderer_spin_new();
+
+  spinadj=(LiVESObject *)lives_adjustment_new(0., -100000., 100000., 1., 10., 0);
+
 #ifdef GUI_GTK
-  g_object_set (renderer, "width-chars", 7, "mode", GTK_CELL_RENDERER_MODE_EDITABLE,
-		"editable", TRUE, "xalign", 1.0, "adjustment", spinadj, NULL);
-#endif  
+  g_object_set(renderer, "width-chars", 7, "mode", GTK_CELL_RENDERER_MODE_EDITABLE,
+               "editable", TRUE, "xalign", 1.0, "adjustment", spinadj, NULL);
+
+#endif
+
+  lives_signal_connect(renderer, LIVES_WIDGET_EDITED_SIGNAL, LIVES_GUI_CALLBACK(cell1_edited_callback), mnode);
+
+
 
-  lives_signal_connect(renderer, "edited", (GCallback) cell1_edited_callback, mnode);
-  
-  
   //  renderer = lives_cell_renderer_text_new ();
-  column = lives_tree_view_column_new_with_attributes (_("value"),
-						     renderer,
-						     "text", VALUE2_COLUMN,
-						     NULL);
-  lives_tree_view_append_column (LIVES_TREE_VIEW (mnode->treev2), column);
+  column = lives_tree_view_column_new_with_attributes(_("value"),
+           renderer,
+           "text", VALUE2_COLUMN,
+           NULL);
+  lives_tree_view_append_column(LIVES_TREE_VIEW(mnode->treev2), column);
+
 
 
 
 
 
+  lives_widget_show(mnode->treev2);
+
+  lives_table_attach(LIVES_TABLE(omclw->table), mnode->treev2, 3, 4, row, row+1,
+                     (LiVESAttachOptions)(LIVES_FILL|LIVES_EXPAND),
+                     (LiVESAttachOptions)(0), 0, 0);
 
-  lives_widget_show (mnode->treev2);
-  
-  lives_table_attach (LIVES_TABLE (omclw->table), mnode->treev2, 3, 4, row, row+1,
-		    (LiVESAttachOptions) (LIVES_FILL|LIVES_EXPAND),
-		    (LiVESAttachOptions) (0), 0, 0);
-  
 
 
 }
@@ -762,29 +750,28 @@
   int mps=omc_macro.nparams-1;
   int lps=mnode->nvars-1;
   int i;
-  
-  if (mnode->map!=NULL) g_free(mnode->map);
-  if (mnode->fvali!=NULL) g_free(mnode->fvali);
-  if (mnode->fvald!=NULL) g_free(mnode->fvald);
 
-  mnode->map=(int *)g_malloc(omc_macro.nparams*sizint);
-  mnode->fvali=(int *)g_malloc(omc_macro.nparams*sizint);
-  mnode->fvald=(double *)g_malloc(omc_macro.nparams*sizdbl);
+  if (mnode->map!=NULL) lives_free(mnode->map);
+  if (mnode->fvali!=NULL) lives_free(mnode->fvali);
+  if (mnode->fvald!=NULL) lives_free(mnode->fvald);
+
+  mnode->map=(int *)lives_malloc(omc_macro.nparams*sizint);
+  mnode->fvali=(int *)lives_malloc(omc_macro.nparams*sizint);
+  mnode->fvald=(double *)lives_malloc(omc_macro.nparams*sizdbl);
 
   if (lps>mps) lps=mps;
 
-  for (i=mps;i>=0;i--) {
+  for (i=mps; i>=0; i--) {
     if (mnode->matchp[lps]) lps++; // variable is filtered for
   }
 
-  for (i=mps;i>=0;i--) {
+  for (i=mps; i>=0; i--) {
     if (lps<0||lps>=mnode->nvars) {
       //g_print("fixed !\n");
       mnode->map[i]=-1;
       if (omc_macro.ptypes[i]==OMC_PARAM_INT) mnode->fvali[i]=omc_macro.vali[i];
       else mnode->fvald[i]=omc_macro.vald[i];
-    }
-    else {
+    } else {
       //      g_print("varied !\n");
       if (!mnode->matchp[lps]) mnode->map[i]=lps;
       else i++;
@@ -802,15 +789,15 @@
 
 
 
-static void on_omc_combo_entry_changed (LiVESCombo *combo, gpointer ptr) {
+static void on_omc_combo_entry_changed(LiVESCombo *combo, livespointer ptr) {
   char *macro_text;
 
   int i;
-    
+
   lives_omc_match_node_t *mnode=(lives_omc_match_node_t *)ptr;
 
-  int row=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(combo),"row"));
-  omclearn_w *omclw=(omclearn_w *)g_object_get_data(G_OBJECT(combo),"omclw");
+  int row=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(combo),"row"));
+  omclearn_w *omclw=(omclearn_w *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(combo),"omclw");
 
   macro_text=lives_combo_get_active_text(LIVES_COMBO(combo));
 
@@ -818,12 +805,12 @@
     // remove old mapping
     lives_widget_destroy(mnode->treev2);
     mnode->treev2=NULL;
-    
+
     mnode->macro=-1;
 
-    g_free(mnode->map);
-    g_free(mnode->fvali);
-    g_free(mnode->fvald);
+    lives_free(mnode->map);
+    lives_free(mnode->fvali);
+    lives_free(mnode->fvald);
 
     mnode->map=mnode->fvali=NULL;
     mnode->fvald=NULL;
@@ -831,15 +818,15 @@
   }
 
   if (!strcmp(macro_text,mainw->string_constants[LIVES_STRING_CONSTANT_NONE])) {
-    g_free(macro_text);
+    lives_free(macro_text);
     return;
   }
 
-  for (i=0;i<=N_OMC_MACROS;i++) {
+  for (i=0; i<=N_OMC_MACROS; i++) {
     if (!strcmp(macro_text,omc_macros[i].macro_text)) break;
   }
 
-  g_free(macro_text);
+  lives_free(macro_text);
 
   mnode->macro=i;
   omc_learn_link_params(mnode);
@@ -850,11 +837,11 @@
 
 
 
-static void cell_toggled_callback (LiVESCellRenderer *toggle, const gchar *path_string, gpointer user_data) {
+static void cell_toggled_callback(LiVESCellRenderer *toggle, const char *path_string, livespointer user_data) {
   lives_omc_match_node_t *mnode=(lives_omc_match_node_t *)user_data;
   int row;
 
-  gchar *txt;
+  char *txt;
 
   int *indices;
 
@@ -877,11 +864,11 @@
   lives_tree_model_get(LIVES_TREE_MODEL(mnode->gtkstore),&iter,VALUE_COLUMN,&txt,-1);
 
   if (!strcmp(txt,"-")) {
-    g_free(txt);
+    lives_free(txt);
     return;
   }
 
-  g_free(txt);
+  lives_free(txt);
 
   mnode->matchp[row]=!(mnode->matchp[row]);
 
@@ -893,10 +880,10 @@
 
 
 
-static void cell_edited_callback (LiVESCellRenderer *spinbutton, const gchar *path_string, const gchar *new_text, gpointer user_data) {
+static void cell_edited_callback(LiVESCellRenderer *spinbutton, const char *path_string, const char *new_text, livespointer user_data) {
   lives_omc_match_node_t *mnode=(lives_omc_match_node_t *)user_data;
 
-  int col=GPOINTER_TO_INT(g_object_get_data(G_OBJECT(spinbutton),"colnum"));
+  int col=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(spinbutton),"colnum"));
 
   int vali;
   double vald;
@@ -925,19 +912,19 @@
   case OFFS1_COLUMN:
     vali=atoi(new_text);
     mnode->offs0[row]=vali;
-   break;
+    break;
   case OFFS2_COLUMN:
     vali=atoi(new_text);
     mnode->offs1[row]=vali;
     break;
   case SCALE_COLUMN:
-    vald=g_strtod (new_text,NULL);
+    vald=lives_strtod(new_text,NULL);
     mnode->scale[row]=vald;
     break;
   }
 
   lives_tree_store_set(mnode->gtkstore,&iter,col,new_text,-1);
- 
+
 }
 
 
@@ -951,10 +938,10 @@
   int i;
 
   LiVESWidget *combo;
-  
+
   combo=lives_combo_new();
-  
-  for (i=0;i<N_OMC_MACROS;i++) {
+
+  for (i=0; i<N_OMC_MACROS; i++) {
     if (omc_macros[i].msg==NULL) break;
 
     lives_combo_append_text(LIVES_COMBO(combo),omc_macros[i].macro_text);
@@ -962,295 +949,298 @@
   }
 
   if (mnode->macro!=-1) {
-    lives_combo_set_active_index (LIVES_COMBO(combo),mnode->macro);
+    lives_combo_set_active_index(LIVES_COMBO(combo),mnode->macro);
   }
 
-  lives_signal_connect_after (G_OBJECT (combo), LIVES_WIDGET_CHANGED_EVENT, LIVES_GUI_CALLBACK (on_omc_combo_entry_changed), mnode);
+  lives_signal_connect_after(LIVES_WIDGET_OBJECT(combo), LIVES_WIDGET_CHANGED_SIGNAL, LIVES_GUI_CALLBACK(on_omc_combo_entry_changed), mnode);
 
-  g_object_set_data(G_OBJECT(combo),"row",GINT_TO_POINTER(row));
-  g_object_set_data(G_OBJECT(combo),"omclw",(gpointer)omclw);
+  lives_widget_object_set_data(LIVES_WIDGET_OBJECT(combo),"row",LIVES_INT_TO_POINTER(row));
+  lives_widget_object_set_data(LIVES_WIDGET_OBJECT(combo),"omclw",(livespointer)omclw);
 
   return combo;
 }
 
 
 
-static void omc_learner_add_row(int type, int detail, lives_omc_match_node_t *mnode, const gchar *string, omclearn_w *omclw) {
-   LiVESWidget *label,*combo;
-   LiVESObject *spinadj;
-
-   LiVESCellRenderer *renderer;
-   LiVESTreeViewColumn *column;
-  
-   LiVESTreeIter iter1,iter2;
-
-   gchar *strval,*strval2,*strval3,*strval4,*vname,*valstr;
-   gchar *oldval=NULL,*final=NULL;
-   gchar *labelt=NULL;
-
-   int chan,val;
-   register int i;
-
-   omclw->tbl_rows++;
-   lives_table_resize(LIVES_TABLE(omclw->table),omclw->tbl_rows,6);
-			
-   mnode->gtkstore = lives_tree_store_new (NUM_COLUMNS, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_BOOLEAN, G_TYPE_STRING, 
-					 G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
-
-   lives_tree_store_append (mnode->gtkstore, &iter1, NULL);  /* Acquire an iterator */
-   lives_tree_store_set (mnode->gtkstore, &iter1, TITLE_COLUMN, (_("Vars.")), -1);
-
-   for (i=0;i<mnode->nvars;i++) {
-     lives_tree_store_append (mnode->gtkstore, &iter2, &iter1);  /* Acquire a child iterator */
-       
-     if (oldval!=NULL) {
-       g_free(oldval);
-       oldval=NULL;
-     }
-       
-     if (final!=NULL) {
-       g_free(final);
-       final=NULL;
-     }
-
-     strval=g_strdup_printf("%d - %d",mnode->min[i],mnode->max[i]);
-     strval2=g_strdup_printf("%d",mnode->offs0[i]);
-     strval3=g_strdup_printf("%.*f",OMC_FP_FIX,mnode->scale[i]);
-     strval4=g_strdup_printf("%d",mnode->offs1[i]);
-
-     if (type>0) {
-       vname=omc_learn_get_pname(type,i);
-       val=omc_learn_get_pvalue(type,i,string);
-
-       valstr=g_strdup_printf("%d",val);
-       if (!mnode->matchp[i]) {
-	 mnode->matchi[i]=val;
-       }
-     }
-     else {
-       vname=omc_learn_get_pname(-type,i);
-       if (mnode->matchp[i]) valstr=g_strdup_printf("%d",mnode->matchi[i]);
-       else valstr=g_strdup("-");
-     }
-
-     lives_tree_store_set (mnode->gtkstore, &iter2, TITLE_COLUMN, vname, VALUE_COLUMN, valstr, FILTER_COLUMN, mnode->matchp[i], 
-			 RANGE_COLUMN, strval, OFFS1_COLUMN, strval2, SCALE_COLUMN, strval3, OFFS2_COLUMN, strval4, -1);
-
-     g_free (strval);
-     g_free (strval2);
-     g_free (strval3);
-     g_free (strval4);
-     g_free(valstr);
-     g_free(vname);
-   }
-
-   mnode->treev1 = lives_tree_view_new_with_model (LIVES_TREE_MODEL (mnode->gtkstore));
-
-   if (type<0) type=-type;
-
-   switch (type) {
-   case OMC_MIDI_NOTE:
-     chan=js_index(string);
-     labelt=g_strdup_printf(_("MIDI ch %d note on"),chan);
-     break;
-   case OMC_MIDI_NOTE_OFF:
-     chan=js_index(string);
-     labelt=g_strdup_printf(_("MIDI ch %d note off"),chan);
-     break;
-   case OMC_MIDI_CONTROLLER:
-     chan=js_index(string);
-     labelt=g_strdup_printf(_("MIDI ch %d controller %d"),chan,detail);
-     break;
-   case OMC_MIDI_PITCH_BEND:
-     chan=js_index(string);
-     labelt=g_strdup_printf(_("MIDI ch %d pitch bend"),chan,detail);
-     break;
-   case OMC_MIDI_PGM_CHANGE:
-     chan=js_index(string);
-     labelt=g_strdup_printf(_("MIDI ch %d pgm change"),chan);
-     break;
-   case OMC_JS_BUTTON:
-     labelt=g_strdup_printf(_("Joystick button %d"),detail);
-     break;
-   case OMC_JS_AXIS:
-     labelt=g_strdup_printf(_("Joystick axis %d"),detail);
-     break;
-   }
-
-   label = lives_standard_label_new (labelt);
-   lives_widget_show (label);
-   
-   if (labelt!=NULL) g_free(labelt);
-     
-   omclw->tbl_currow++;
-   lives_table_attach (LIVES_TABLE (omclw->table), label, 0, 1, omclw->tbl_currow, omclw->tbl_currow+1,
-		     (LiVESAttachOptions) (0),
-		     (LiVESAttachOptions) (0), 0, 0);
-
-   // properties
+static void omc_learner_add_row(int type, int detail, lives_omc_match_node_t *mnode, const char *string, omclearn_w *omclw) {
+  LiVESWidget *label,*combo;
+  LiVESObject *spinadj;
+
+  LiVESCellRenderer *renderer;
+  LiVESTreeViewColumn *column;
+
+  LiVESTreeIter iter1,iter2;
+
+  char *strval,*strval2,*strval3,*strval4,*vname,*valstr;
+  char *oldval=NULL,*final=NULL;
+  char *labelt=NULL;
+
+  int chan,val;
+  register int i;
+
+  omclw->tbl_rows++;
+  lives_table_resize(LIVES_TABLE(omclw->table),omclw->tbl_rows,6);
+
+  mnode->gtkstore = lives_tree_store_new(NUM_COLUMNS, LIVES_COL_TYPE_STRING, LIVES_COL_TYPE_STRING, LIVES_COL_TYPE_BOOLEAN,
+                                         LIVES_COL_TYPE_STRING,
+                                         LIVES_COL_TYPE_STRING, LIVES_COL_TYPE_STRING, LIVES_COL_TYPE_STRING);
+
+  lives_tree_store_append(mnode->gtkstore, &iter1, NULL);   /* Acquire an iterator */
+  lives_tree_store_set(mnode->gtkstore, &iter1, TITLE_COLUMN, (_("Vars.")), -1);
+
+  for (i=0; i<mnode->nvars; i++) {
+    lives_tree_store_append(mnode->gtkstore, &iter2, &iter1);   /* Acquire a child iterator */
+
+    if (oldval!=NULL) {
+      lives_free(oldval);
+      oldval=NULL;
+    }
+
+    if (final!=NULL) {
+      lives_free(final);
+      final=NULL;
+    }
+
+    strval=lives_strdup_printf("%d - %d",mnode->min[i],mnode->max[i]);
+    strval2=lives_strdup_printf("%d",mnode->offs0[i]);
+    strval3=lives_strdup_printf("%.*f",OMC_FP_FIX,mnode->scale[i]);
+    strval4=lives_strdup_printf("%d",mnode->offs1[i]);
+
+    if (type>0) {
+      vname=omc_learn_get_pname(type,i);
+      val=omc_learn_get_pvalue(type,i,string);
+
+      valstr=lives_strdup_printf("%d",val);
+      if (!mnode->matchp[i]) {
+        mnode->matchi[i]=val;
+      }
+    } else {
+      vname=omc_learn_get_pname(-type,i);
+      if (mnode->matchp[i]) valstr=lives_strdup_printf("%d",mnode->matchi[i]);
+      else valstr=lives_strdup("-");
+    }
+
+    lives_tree_store_set(mnode->gtkstore, &iter2, TITLE_COLUMN, vname, VALUE_COLUMN, valstr, FILTER_COLUMN, mnode->matchp[i],
+                         RANGE_COLUMN, strval, OFFS1_COLUMN, strval2, SCALE_COLUMN, strval3, OFFS2_COLUMN, strval4, -1);
+
+    lives_free(strval);
+    lives_free(strval2);
+    lives_free(strval3);
+    lives_free(strval4);
+    lives_free(valstr);
+    lives_free(vname);
+  }
+
+  mnode->treev1 = lives_tree_view_new_with_model(LIVES_TREE_MODEL(mnode->gtkstore));
+
+  if (type<0) type=-type;
+
+  switch (type) {
+  case OMC_MIDI_NOTE:
+    chan=js_index(string);
+    labelt=lives_strdup_printf(_("MIDI ch %d note on"),chan);
+    break;
+  case OMC_MIDI_NOTE_OFF:
+    chan=js_index(string);
+    labelt=lives_strdup_printf(_("MIDI ch %d note off"),chan);
+    break;
+  case OMC_MIDI_CONTROLLER:
+    chan=js_index(string);
+    labelt=lives_strdup_printf(_("MIDI ch %d controller %d"),chan,detail);
+    break;
+  case OMC_MIDI_PITCH_BEND:
+    chan=js_index(string);
+    labelt=lives_strdup_printf(_("MIDI ch %d pitch bend"),chan,detail);
+    break;
+  case OMC_MIDI_PGM_CHANGE:
+    chan=js_index(string);
+    labelt=lives_strdup_printf(_("MIDI ch %d pgm change"),chan);
+    break;
+  case OMC_JS_BUTTON:
+    labelt=lives_strdup_printf(_("Joystick button %d"),detail);
+    break;
+  case OMC_JS_AXIS:
+    labelt=lives_strdup_printf(_("Joystick axis %d"),detail);
+    break;
+  }
+
+  label = lives_standard_label_new(labelt);
+  lives_widget_show(label);
+
+  if (labelt!=NULL) lives_free(labelt);
+
+  omclw->tbl_currow++;
+  lives_table_attach(LIVES_TABLE(omclw->table), label, 0, 1, omclw->tbl_currow, omclw->tbl_currow+1,
+                     (LiVESAttachOptions)(0),
+                     (LiVESAttachOptions)(0), 0, 0);
+
+  // properties
   if (palette->style&STYLE_1) {
     lives_widget_set_base_color(mnode->treev1, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
     lives_widget_set_text_color(mnode->treev1, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars_fore);
   }
 
-   renderer = lives_cell_renderer_text_new ();
-   column = lives_tree_view_column_new_with_attributes (NULL,
-						      renderer,
-						      "text", TITLE_COLUMN,
-						      NULL);
-  
-   lives_tree_view_append_column (LIVES_TREE_VIEW (mnode->treev1), column);
-  
-   renderer = lives_cell_renderer_text_new ();
-   column = lives_tree_view_column_new_with_attributes (_("value"),
-						      renderer,
-						      "text", VALUE_COLUMN,
-						      NULL);
-   lives_tree_view_append_column (LIVES_TREE_VIEW (mnode->treev1), column);
-  
-  
-   renderer = lives_cell_renderer_toggle_new ();
-   column = lives_tree_view_column_new_with_attributes (_("x"),
-						      renderer,
-						      "active", FILTER_COLUMN,
-						      NULL);
-   lives_tree_view_append_column (LIVES_TREE_VIEW (mnode->treev1), column);
-
-   lives_signal_connect(renderer, LIVES_WIDGET_TOGGLED_EVENT, (GCallback) cell_toggled_callback, mnode);
-
-   renderer = lives_cell_renderer_text_new ();
-   column = lives_tree_view_column_new_with_attributes (_("range"),
-						      renderer,
-						      "text", RANGE_COLUMN,
-						      NULL);
-   lives_tree_view_append_column (LIVES_TREE_VIEW (mnode->treev1), column);
-
-
-   renderer = lives_cell_renderer_spin_new ();
-   g_object_set_data(G_OBJECT(renderer), "colnum", GUINT_TO_POINTER(OFFS1_COLUMN));
-
-   spinadj=(LiVESObject *)lives_adjustment_new (0., -100000., 100000., 1., 10., 0);
+  renderer = lives_cell_renderer_text_new();
+  column = lives_tree_view_column_new_with_attributes(NULL,
+           renderer,
+           "text", TITLE_COLUMN,
+           NULL);
+
+  lives_tree_view_append_column(LIVES_TREE_VIEW(mnode->treev1), column);
+
+  renderer = lives_cell_renderer_text_new();
+  column = lives_tree_view_column_new_with_attributes(_("value"),
+           renderer,
+           "text", VALUE_COLUMN,
+           NULL);
+  lives_tree_view_append_column(LIVES_TREE_VIEW(mnode->treev1), column);
+
+
+  renderer = lives_cell_renderer_toggle_new();
+  column = lives_tree_view_column_new_with_attributes(_("x"),
+           renderer,
+           "active", FILTER_COLUMN,
+           NULL);
+  lives_tree_view_append_column(LIVES_TREE_VIEW(mnode->treev1), column);
+
+  lives_signal_connect(renderer, LIVES_WIDGET_TOGGLED_SIGNAL, LIVES_GUI_CALLBACK(cell_toggled_callback), mnode);
+
+  renderer = lives_cell_renderer_text_new();
+  column = lives_tree_view_column_new_with_attributes(_("range"),
+           renderer,
+           "text", RANGE_COLUMN,
+           NULL);
+  lives_tree_view_append_column(LIVES_TREE_VIEW(mnode->treev1), column);
+
+
+  renderer = lives_cell_renderer_spin_new();
+  lives_widget_object_set_data(LIVES_WIDGET_OBJECT(renderer), "colnum", LIVES_UINT_TO_POINTER(OFFS1_COLUMN));
+
+  spinadj=(LiVESObject *)lives_adjustment_new(0., -100000., 100000., 1., 10., 0);
 
 #ifdef GUI_GTK
-   g_object_set (renderer, "width-chars", 7, "mode", GTK_CELL_RENDERER_MODE_EDITABLE,
-		 "editable", TRUE, "xalign", 1.0, "adjustment", spinadj, NULL);
+  g_object_set(renderer, "width-chars", 7, "mode", GTK_CELL_RENDERER_MODE_EDITABLE,
+               "editable", TRUE, "xalign", 1.0, "adjustment", spinadj, NULL);
 #endif
 
-   lives_signal_connect(renderer, "edited", (GCallback) cell_edited_callback, mnode);
+  lives_signal_connect(renderer, LIVES_WIDGET_EDITED_SIGNAL, LIVES_GUI_CALLBACK(cell_edited_callback), mnode);
 
 
 
-   column = lives_tree_view_column_new_with_attributes (_("+ offset1"),
-						      renderer,
-						       "text", OFFS1_COLUMN,
-						      NULL);
-   lives_tree_view_append_column (LIVES_TREE_VIEW (mnode->treev1), column);
+  column = lives_tree_view_column_new_with_attributes(_("+ offset1"),
+           renderer,
+           "text", OFFS1_COLUMN,
+           NULL);
+  lives_tree_view_append_column(LIVES_TREE_VIEW(mnode->treev1), column);
 
-   renderer = lives_cell_renderer_spin_new ();
+  renderer = lives_cell_renderer_spin_new();
 
-   spinadj=(LiVESObject *)lives_adjustment_new (1., -100000., 100000., 1., 10., 0);
+  spinadj=(LiVESObject *)lives_adjustment_new(1., -100000., 100000., 1., 10., 0);
+
+#ifdef GUI_GTK
+  g_object_set(renderer, "width-chars", 12, "mode", GTK_CELL_RENDERER_MODE_EDITABLE,
+               "editable", TRUE, "xalign", 1.0, "adjustment", spinadj,
+               "digits", OMC_FP_FIX, NULL);
+#endif
+
+  lives_widget_object_set_data(LIVES_WIDGET_OBJECT(renderer), "colnum", LIVES_UINT_TO_POINTER(SCALE_COLUMN));
+  lives_signal_connect(renderer, LIVES_WIDGET_EDITED_SIGNAL, LIVES_GUI_CALLBACK(cell_edited_callback), mnode);
 
-   g_object_set (renderer, "width-chars", 12, "mode", GTK_CELL_RENDERER_MODE_EDITABLE,
-		 "editable", TRUE, "xalign", 1.0, "adjustment", spinadj, 
-		 "digits", OMC_FP_FIX, NULL);
 
-   g_object_set_data(G_OBJECT(renderer), "colnum", GUINT_TO_POINTER(SCALE_COLUMN));
-   lives_signal_connect(renderer, "edited", (GCallback) cell_edited_callback, mnode);
+  column = lives_tree_view_column_new_with_attributes(_("* scale"),
+           renderer,
+           "text", SCALE_COLUMN,
+           NULL);
+  lives_tree_view_append_column(LIVES_TREE_VIEW(mnode->treev1), column);
 
+  renderer = lives_cell_renderer_spin_new();
 
-   column = lives_tree_view_column_new_with_attributes (_("* scale"),
-						      renderer,
-						      "text", SCALE_COLUMN,
-						      NULL);
-   lives_tree_view_append_column (LIVES_TREE_VIEW (mnode->treev1), column);
 
-   renderer = lives_cell_renderer_spin_new ();
+  spinadj=(LiVESObject *)lives_adjustment_new(0., -100000., 100000., 1., 10., 0);
 
+#ifdef GUI_GTK
+  g_object_set(renderer, "width-chars", 7, "mode", GTK_CELL_RENDERER_MODE_EDITABLE,
+               "editable", TRUE, "xalign", 1.0, "adjustment", spinadj, NULL);
+#endif
 
-   spinadj=(LiVESObject *)lives_adjustment_new (0., -100000., 100000., 1., 10., 0);
+  lives_widget_object_set_data(LIVES_WIDGET_OBJECT(renderer), "colnum", LIVES_UINT_TO_POINTER(OFFS2_COLUMN));
+  lives_signal_connect(renderer, LIVES_WIDGET_EDITED_SIGNAL, LIVES_GUI_CALLBACK(cell_edited_callback), mnode);
 
-   g_object_set (renderer, "width-chars", 7, "mode", GTK_CELL_RENDERER_MODE_EDITABLE,
-		 "editable", TRUE, "xalign", 1.0, "adjustment", spinadj, NULL);
 
-   g_object_set_data(G_OBJECT(renderer), "colnum", GUINT_TO_POINTER(OFFS2_COLUMN));
-   lives_signal_connect(renderer, "edited", (GCallback) cell_edited_callback, mnode);
+  column = lives_tree_view_column_new_with_attributes(_("+ offset2"),
+           renderer,
+           "text", OFFS2_COLUMN,
+           NULL);
+  lives_tree_view_append_column(LIVES_TREE_VIEW(mnode->treev1), column);
 
+  lives_widget_show(mnode->treev1);
 
-   column = lives_tree_view_column_new_with_attributes (_("+ offset2"),
-						      renderer,
-						      "text", OFFS2_COLUMN,
-						      NULL);
-   lives_tree_view_append_column (LIVES_TREE_VIEW (mnode->treev1), column);
+  lives_table_attach(LIVES_TABLE(omclw->table), mnode->treev1, 1, 2, omclw->tbl_currow, omclw->tbl_currow+1,
+                     (LiVESAttachOptions)(0),
+                     (LiVESAttachOptions)(0), 0, 0);
 
-   lives_widget_show (mnode->treev1);
-  
-   lives_table_attach (LIVES_TABLE (omclw->table), mnode->treev1, 1, 2, omclw->tbl_currow, omclw->tbl_currow+1,
-		     (LiVESAttachOptions) (0),
-		     (LiVESAttachOptions) (0), 0, 0);
+  combo=create_omc_macro_combo(mnode,omclw->tbl_currow,omclw);
 
-   combo=create_omc_macro_combo(mnode,omclw->tbl_currow,omclw);
+  lives_widget_show(combo);
 
-   lives_widget_show (combo);
-  
-   lives_table_attach (LIVES_TABLE (omclw->table), combo, 2, 3, omclw->tbl_currow, omclw->tbl_currow+1,
-		     (LiVESAttachOptions) 0,
-		     (LiVESAttachOptions) (0), 0, 0);
+  lives_table_attach(LIVES_TABLE(omclw->table), combo, 2, 3, omclw->tbl_currow, omclw->tbl_currow+1,
+                     (LiVESAttachOptions) 0,
+                     (LiVESAttachOptions)(0), 0, 0);
 
 
   if (mnode->macro==-1) lives_widget_set_sensitive(omclw->clear_button,TRUE);
   lives_widget_set_sensitive(omclw->del_all_button,TRUE);
 
 }
-   
 
 
 
 
-static void killit(LiVESWidget *widget, gpointer user_data) {
+
+static void killit(LiVESWidget *widget, livespointer user_data) {
   lives_widget_destroy(widget);
 }
 
 
 static void show_existing(omclearn_w *omclw) {
-  GSList *slist=omc_node_list;
+  LiVESSList *slist=omc_node_list;
   lives_omc_match_node_t *mnode;
   int type,supertype;
-  gchar **array,*srch;
+  char **array,*srch;
   int idx;
 
   while (slist!=NULL) {
     mnode=(lives_omc_match_node_t *)slist->data;
 
-    srch=g_strdup(mnode->srch);
-    array=g_strsplit(srch," ",-1);
+    srch=lives_strdup(mnode->srch);
+    array=lives_strsplit(srch," ",-1);
 
     supertype=atoi(array[0]);
 #ifdef OMC_MIDI_IMPL
     if (supertype==OMC_MIDI) {
       size_t blen;
-      gchar *tmp;
+      char *tmp;
 
       type=midi_msg_type(array[1]);
       if (get_token_count(srch,' ')>3) idx=atoi(array[3]);
       else idx=-1;
-      srch=g_strdup(mnode->srch);
+      srch=lives_strdup(mnode->srch);
       tmp=cut_string_elems(srch,1);
       blen=strlen(tmp);
-      tmp=g_strdup(srch+blen+1);
-      g_free(srch);
+      tmp=lives_strdup(srch+blen+1);
+      lives_free(srch);
       srch=tmp;
-    }
-    else {
+    } else {
 #endif
       type=supertype;
       idx=atoi(array[1]);
 #ifdef OMC_MIDI_IMPL
     }
 #endif
-    g_strfreev(array);
+    lives_strfreev(array);
 
     omc_learner_add_row(-type,idx,mnode,srch,omclw);
-    g_free(srch);
+    lives_free(srch);
 
     omc_macro_row_add_params(mnode,omclw->tbl_currow,omclw);
 
@@ -1260,11 +1250,11 @@
 
 
 
-static void clear_unmatched (LiVESButton *button, gpointer user_data) {
+static void clear_unmatched(LiVESButton *button, livespointer user_data) {
   omclearn_w *omclw=(omclearn_w *)user_data;
 
   // destroy everything in table
-  
+
   lives_container_foreach(LIVES_CONTAINER(omclw->table),killit,NULL);
 
   remove_all_nodes(FALSE,omclw);
@@ -1274,13 +1264,13 @@
 }
 
 
-static void del_all (LiVESButton *button, gpointer user_data) {
+static void del_all(LiVESButton *button, livespointer user_data) {
   omclearn_w *omclw=(omclearn_w *)user_data;
 
   if (!do_warning_dialog(_("\nClick OK to delete all entries\n"))) return;
 
   // destroy everything in table
-  
+
   lives_container_foreach(LIVES_CONTAINER(omclw->table),killit,NULL);
 
   remove_all_nodes(TRUE,omclw);
@@ -1289,7 +1279,7 @@
 
 
 
-static void close_learner_dialog (LiVESButton *button, gpointer user_data) {
+static void close_learner_dialog(LiVESButton *button, livespointer user_data) {
   mainw->cancelled=CANCEL_USER;
 }
 
@@ -1301,8 +1291,8 @@
   LiVESWidget *scrolledwindow;
   int winsize_h,scr_width=mainw->scr_width;
   int winsize_v,scr_height=mainw->scr_height;
-  
-  omclearn_w *omclw=(omclearn_w *)g_malloc(sizeof(omclearn_w));
+
+  omclearn_w *omclw=(omclearn_w *)lives_malloc(sizeof(omclearn_w));
 
   omclw->tbl_rows=4;
   omclw->tbl_currow=-1;
@@ -1311,84 +1301,84 @@
     scr_width=mainw->mgeom[prefs->gui_monitor-1].width;
     scr_height=mainw->mgeom[prefs->gui_monitor-1].height;
   }
-  
+
   winsize_h=scr_width-SCR_WIDTH_SAFETY;
-  winsize_v=scr_height-SCR_HEIGHT_SAFETY*2;
-  
-  omclw->dialog = lives_standard_dialog_new (_("LiVES: OMC learner"),FALSE);
-  
+  winsize_v=scr_height-SCR_HEIGHT_SAFETY;
+
+  omclw->dialog = lives_standard_dialog_new(_("LiVES: OMC learner"),FALSE,winsize_h,winsize_v);
+
   omclw->top_vbox = lives_dialog_get_content_area(LIVES_DIALOG(omclw->dialog));
 
-  omclw->table = lives_table_new (omclw->tbl_rows, 4, FALSE);
+  omclw->table = lives_table_new(omclw->tbl_rows, 4, FALSE);
 
   lives_table_set_col_spacings(LIVES_TABLE(omclw->table),widget_opts.packing_width*2);
 
-  scrolledwindow = lives_standard_scrolled_window_new (winsize_h, winsize_v, omclw->table);
+  scrolledwindow = lives_standard_scrolled_window_new(winsize_h, winsize_v-SCR_HEIGHT_SAFETY, omclw->table);
 
-  lives_box_pack_start (LIVES_BOX (omclw->top_vbox), scrolledwindow, TRUE, TRUE, 0);
+  lives_box_pack_start(LIVES_BOX(omclw->top_vbox), scrolledwindow, TRUE, TRUE, 0);
 
 
 
   hbuttonbox = lives_dialog_get_action_area(LIVES_DIALOG(omclw->dialog));
-  
-  omclw->clear_button = lives_button_new_with_mnemonic (_("Clear _unmatched"));
 
-  lives_container_add (LIVES_CONTAINER (hbuttonbox), omclw->clear_button);
-  
+  omclw->clear_button = lives_button_new_with_mnemonic(_("Clear _unmatched"));
+
+  lives_container_add(LIVES_CONTAINER(hbuttonbox), omclw->clear_button);
 
-  lives_signal_connect (LIVES_GUI_OBJECT (omclw->clear_button), LIVES_WIDGET_CLICKED_EVENT,
-		    LIVES_GUI_CALLBACK (clear_unmatched),
-		    (gpointer)omclw);
+
+  lives_signal_connect(LIVES_GUI_OBJECT(omclw->clear_button), LIVES_WIDGET_CLICKED_SIGNAL,
+                       LIVES_GUI_CALLBACK(clear_unmatched),
+                       (livespointer)omclw);
 
   lives_widget_set_sensitive(omclw->clear_button,FALSE);
 
-  omclw->del_all_button = lives_button_new_with_mnemonic (_("_Delete all"));
+  omclw->del_all_button = lives_button_new_with_mnemonic(_("_Delete all"));
+
+  lives_container_add(LIVES_CONTAINER(hbuttonbox), omclw->del_all_button);
 
-  lives_container_add (LIVES_CONTAINER (hbuttonbox), omclw->del_all_button);
-  
 
-  lives_signal_connect (LIVES_GUI_OBJECT (omclw->del_all_button), LIVES_WIDGET_CLICKED_EVENT,
-		    LIVES_GUI_CALLBACK (del_all),
-		    (gpointer)omclw);
+  lives_signal_connect(LIVES_GUI_OBJECT(omclw->del_all_button), LIVES_WIDGET_CLICKED_SIGNAL,
+                       LIVES_GUI_CALLBACK(del_all),
+                       (livespointer)omclw);
 
   lives_widget_set_sensitive(omclw->del_all_button,FALSE);
 
 
-  ok_button = lives_button_new_with_mnemonic (_("Close _window"));
+  ok_button = lives_button_new_with_mnemonic(_("Close _window"));
+
+  lives_container_add(LIVES_CONTAINER(hbuttonbox), ok_button);
 
-  lives_container_add (LIVES_CONTAINER (hbuttonbox), ok_button);
-  
-  lives_widget_set_can_focus_and_default (ok_button);
+  lives_widget_set_can_focus_and_default(ok_button);
 
-  lives_widget_grab_default (ok_button);
+  lives_widget_grab_default(ok_button);
 
-  lives_button_box_set_button_width (LIVES_BUTTON_BOX (hbuttonbox), ok_button, DEF_BUTTON_WIDTH*4);
-  lives_button_box_set_button_width (LIVES_BUTTON_BOX (hbuttonbox), omclw->clear_button, DEF_BUTTON_WIDTH*4);
-  lives_button_box_set_button_width (LIVES_BUTTON_BOX (hbuttonbox), omclw->del_all_button, DEF_BUTTON_WIDTH*4);
+  lives_button_box_set_button_width(LIVES_BUTTON_BOX(hbuttonbox), ok_button, DEF_BUTTON_WIDTH*4);
+  lives_button_box_set_button_width(LIVES_BUTTON_BOX(hbuttonbox), omclw->clear_button, DEF_BUTTON_WIDTH*4);
+  lives_button_box_set_button_width(LIVES_BUTTON_BOX(hbuttonbox), omclw->del_all_button, DEF_BUTTON_WIDTH*4);
+
+  lives_button_box_set_layout(LIVES_BUTTON_BOX(hbuttonbox), LIVES_BUTTONBOX_SPREAD);
+
+
+  lives_signal_connect(LIVES_GUI_OBJECT(ok_button), LIVES_WIDGET_CLICKED_SIGNAL,
+                       LIVES_GUI_CALLBACK(close_learner_dialog),
+                       NULL);
 
-  lives_button_box_set_layout (LIVES_BUTTON_BOX (hbuttonbox), LIVES_BUTTONBOX_SPREAD);
-  
-  
-  lives_signal_connect (LIVES_GUI_OBJECT (ok_button), LIVES_WIDGET_CLICKED_EVENT,
-		    LIVES_GUI_CALLBACK (close_learner_dialog),
-		    NULL);
-  
   if (prefs->gui_monitor!=0) {
     int xcen=mainw->mgeom[prefs->gui_monitor-1].x+(mainw->mgeom[prefs->gui_monitor-1].width
-						    -lives_widget_get_allocation_width(omclw->dialog))/2;
+             -lives_widget_get_allocation_width(omclw->dialog))/2;
     int ycen=mainw->mgeom[prefs->gui_monitor-1].y+(mainw->mgeom[prefs->gui_monitor-1].height
-						    -lives_widget_get_allocation_height(omclw->dialog))/2;
+             -lives_widget_get_allocation_height(omclw->dialog))/2;
     lives_window_set_screen(LIVES_WINDOW(omclw->dialog),mainw->mgeom[prefs->gui_monitor-1].screen);
     lives_window_move(LIVES_WINDOW(omclw->dialog),xcen,ycen);
   }
-  
+
   if (prefs->open_maximised) {
-    lives_window_maximize (LIVES_WINDOW(omclw->dialog));
+    lives_window_maximize(LIVES_WINDOW(omclw->dialog));
   }
 
   if (prefs->show_gui)
     lives_widget_show_all(omclw->dialog);
-  
+
   return omclw;
 }
 
@@ -1399,7 +1389,7 @@
 static void init_omc_macros(void) {
   int i;
 
-  for (i=0;i<N_OMC_MACROS;i++) {
+  for (i=0; i<N_OMC_MACROS; i++) {
     omc_macros[i].macro_text=NULL;
     omc_macros[i].info_text=NULL;
     omc_macros[i].msg=NULL;
@@ -1407,121 +1397,121 @@
     omc_macros[i].pname=NULL;
   }
 
-  omc_macros[0].msg=g_strdup("/video/play");
-  omc_macros[0].macro_text=g_strdup(_("Start video playback"));
+  omc_macros[0].msg=lives_strdup("/video/play");
+  omc_macros[0].macro_text=lives_strdup(_("Start video playback"));
 
-  omc_macros[1].msg=g_strdup("/video/stop");
-  omc_macros[1].macro_text=g_strdup(_("Stop video playback"));
+  omc_macros[1].msg=lives_strdup("/video/stop");
+  omc_macros[1].macro_text=lives_strdup(_("Stop video playback"));
 
 
-  omc_macros[2].msg=g_strdup("/clip/foreground/select");
-  omc_macros[2].macro_text=g_strdup(_("Clip select <clipnum>"));
-  omc_macros[2].info_text=g_strdup(_("Switch foreground clip to the nth valid clip"));
+  omc_macros[2].msg=lives_strdup("/clip/foreground/select");
+  omc_macros[2].macro_text=lives_strdup(_("Clip select <clipnum>"));
+  omc_macros[2].info_text=lives_strdup(_("Switch foreground clip to the nth valid clip"));
   omc_macros[2].nparams=1;
 
-  omc_macros[3].msg=g_strdup("/video/play/forwards");
-  omc_macros[3].macro_text=g_strdup(_("Play forwards"));
-  omc_macros[3].info_text=g_strdup(_("Play video in a forwards direction"));
+  omc_macros[3].msg=lives_strdup("/video/play/forwards");
+  omc_macros[3].macro_text=lives_strdup(_("Play forwards"));
+  omc_macros[3].info_text=lives_strdup(_("Play video in a forwards direction"));
 
-  omc_macros[4].msg=g_strdup("/video/play/backwards");
-  omc_macros[4].macro_text=g_strdup(_("Play backwards"));
-  omc_macros[4].info_text=g_strdup(_("Play video in a backwards direction"));
+  omc_macros[4].msg=lives_strdup("/video/play/backwards");
+  omc_macros[4].macro_text=lives_strdup(_("Play backwards"));
+  omc_macros[4].info_text=lives_strdup(_("Play video in a backwards direction"));
 
-  omc_macros[5].msg=g_strdup("/video/play/reverse");
-  omc_macros[5].macro_text=g_strdup(_("Reverse playback direction"));
-  omc_macros[5].info_text=g_strdup(_("Reverse direction of video playback"));
+  omc_macros[5].msg=lives_strdup("/video/play/reverse");
+  omc_macros[5].macro_text=lives_strdup(_("Reverse playback direction"));
+  omc_macros[5].info_text=lives_strdup(_("Reverse direction of video playback"));
 
-  omc_macros[6].msg=g_strdup("/video/play/faster");
-  omc_macros[6].macro_text=g_strdup(_("Play video faster"));
-  omc_macros[6].info_text=g_strdup(_("Play video at a slightly faster rate"));
+  omc_macros[6].msg=lives_strdup("/video/play/faster");
+  omc_macros[6].macro_text=lives_strdup(_("Play video faster"));
+  omc_macros[6].info_text=lives_strdup(_("Play video at a slightly faster rate"));
 
-  omc_macros[7].msg=g_strdup("/video/play/slower");
-  omc_macros[7].macro_text=g_strdup(_("Play video slower"));
-  omc_macros[7].info_text=g_strdup(_("Play video at a slightly slower rate"));
+  omc_macros[7].msg=lives_strdup("/video/play/slower");
+  omc_macros[7].macro_text=lives_strdup(_("Play video slower"));
+  omc_macros[7].info_text=lives_strdup(_("Play video at a slightly slower rate"));
 
-  omc_macros[8].msg=g_strdup("/video/freeze/toggle");
-  omc_macros[8].macro_text=g_strdup(_("Toggle video freeze"));
-  omc_macros[8].info_text=g_strdup(_("Freeze video, or if already frozen, unfreeze it"));
+  omc_macros[8].msg=lives_strdup("/video/freeze/toggle");
+  omc_macros[8].macro_text=lives_strdup(_("Toggle video freeze"));
+  omc_macros[8].info_text=lives_strdup(_("Freeze video, or if already frozen, unfreeze it"));
 
-  omc_macros[9].msg=g_strdup("/video/fps/set");
-  omc_macros[9].macro_text=g_strdup(_("Set video framerate to <fps>"));
-  omc_macros[9].info_text=g_strdup(_("Set framerate of foreground clip to <float fps>"));
+  omc_macros[9].msg=lives_strdup("/video/fps/set");
+  omc_macros[9].macro_text=lives_strdup(_("Set video framerate to <fps>"));
+  omc_macros[9].info_text=lives_strdup(_("Set framerate of foreground clip to <float fps>"));
   omc_macros[9].nparams=1;
-  
-  omc_macros[10].msg=g_strdup("/record/enable");
-  omc_macros[10].macro_text=g_strdup(_("Start recording"));
 
-  omc_macros[11].msg=g_strdup("/record/disable");
-  omc_macros[11].macro_text=g_strdup(_("Stop recording"));
+  omc_macros[10].msg=lives_strdup("/record/enable");
+  omc_macros[10].macro_text=lives_strdup(_("Start recording"));
+
+  omc_macros[11].msg=lives_strdup("/record/disable");
+  omc_macros[11].macro_text=lives_strdup(_("Stop recording"));
 
-  omc_macros[12].msg=g_strdup("/record/toggle");
-  omc_macros[12].macro_text=g_strdup(_("Toggle recording state"));
+  omc_macros[12].msg=lives_strdup("/record/toggle");
+  omc_macros[12].macro_text=lives_strdup(_("Toggle recording state"));
 
-  omc_macros[13].msg=g_strdup("/clip/foreground/background/swap");
-  omc_macros[13].macro_text=g_strdup(_("Swap foreground and background clips"));
-  omc_macros[14].msg=g_strdup("/effect_key/reset");
-  omc_macros[14].macro_text=g_strdup(_("Reset effect keys"));
-  omc_macros[14].info_text=g_strdup(_("Switch all effects off."));
+  omc_macros[13].msg=lives_strdup("/clip/foreground/background/swap");
+  omc_macros[13].macro_text=lives_strdup(_("Swap foreground and background clips"));
+  omc_macros[14].msg=lives_strdup("/effect_key/reset");
+  omc_macros[14].macro_text=lives_strdup(_("Reset effect keys"));
+  omc_macros[14].info_text=lives_strdup(_("Switch all effects off."));
 
-  omc_macros[15].msg=g_strdup("/effect_key/enable");
-  omc_macros[15].macro_text=g_strdup(_("Enable effect key <key>"));
+  omc_macros[15].msg=lives_strdup("/effect_key/enable");
+  omc_macros[15].macro_text=lives_strdup(_("Enable effect key <key>"));
   omc_macros[15].nparams=1;
 
-  omc_macros[16].msg=g_strdup("/effect_key/disable");
-  omc_macros[16].macro_text=g_strdup(_("Disable effect key <key>"));
+  omc_macros[16].msg=lives_strdup("/effect_key/disable");
+  omc_macros[16].macro_text=lives_strdup(_("Disable effect key <key>"));
   omc_macros[16].nparams=1;
 
-  omc_macros[17].msg=g_strdup("/effect_key/toggle");
-  omc_macros[17].macro_text=g_strdup(_("Toggle effect key <key>"));
+  omc_macros[17].msg=lives_strdup("/effect_key/toggle");
+  omc_macros[17].macro_text=lives_strdup(_("Toggle effect key <key>"));
   omc_macros[17].nparams=1;
 
-  omc_macros[18].msg=g_strdup("/effect_key/nparameter/value/set");
-  omc_macros[18].macro_text=g_strdup(_("Set parameter value <key> <pnum> = <value>"));
-  omc_macros[18].info_text=g_strdup(_("Set <value> of pth (numerical) parameter for effect key <key>."));
+  omc_macros[18].msg=lives_strdup("/effect_key/nparameter/value/set");
+  omc_macros[18].macro_text=lives_strdup(_("Set parameter value <key> <pnum> = <value>"));
+  omc_macros[18].info_text=lives_strdup(_("Set <value> of pth (numerical) parameter for effect key <key>."));
   omc_macros[18].nparams=3;
 
-  omc_macros[19].msg=g_strdup("/clip/select/next");
-  omc_macros[19].macro_text=g_strdup(_("Switch foreground to next clip"));
+  omc_macros[19].msg=lives_strdup("/clip/select/next");
+  omc_macros[19].macro_text=lives_strdup(_("Switch foreground to next clip"));
 
-  omc_macros[20].msg=g_strdup("/clip/select/previous");
-  omc_macros[20].macro_text=g_strdup(_("Switch foreground to previous clip"));
+  omc_macros[20].msg=lives_strdup("/clip/select/previous");
+  omc_macros[20].macro_text=lives_strdup(_("Switch foreground to previous clip"));
 
-  omc_macros[21].msg=g_strdup("/video/fps/ratio/set");
-  omc_macros[21].macro_text=g_strdup(_("Set video framerate to ratio <fps_ratio>"));
-  omc_macros[21].info_text=g_strdup(_("Set framerate ratio of foreground clip to <float fps_ratio>"));
+  omc_macros[21].msg=lives_strdup("/video/fps/ratio/set");
+  omc_macros[21].macro_text=lives_strdup(_("Set video framerate to ratio <fps_ratio>"));
+  omc_macros[21].info_text=lives_strdup(_("Set framerate ratio of foreground clip to <float fps_ratio>"));
   omc_macros[21].nparams=1;
-  
-  omc_macros[22].msg=g_strdup("/clip/foreground/retrigger");
-  omc_macros[22].macro_text=g_strdup(_("Retrigger clip <clipnum>"));
-  omc_macros[22].info_text=g_strdup(_("Switch foreground clip to the nth valid clip, and reset the frame number"));
+
+  omc_macros[22].msg=lives_strdup("/clip/foreground/retrigger");
+  omc_macros[22].macro_text=lives_strdup(_("Retrigger clip <clipnum>"));
+  omc_macros[22].info_text=lives_strdup(_("Switch foreground clip to the nth valid clip, and reset the frame number"));
   omc_macros[22].nparams=1;
 
-  omc_macros[23].msg=g_strdup("/effect_key/mode/next");
-  omc_macros[23].macro_text=g_strdup(_("Cycle to next mode for effect key <key>"));
+  omc_macros[23].msg=lives_strdup("/effect_key/mode/next");
+  omc_macros[23].macro_text=lives_strdup(_("Cycle to next mode for effect key <key>"));
   omc_macros[23].nparams=1;
 
-  omc_macros[24].msg=g_strdup("/effect_key/mode/previous");
-  omc_macros[24].macro_text=g_strdup(_("Cycle to previous mode for effect key <key>"));
+  omc_macros[24].msg=lives_strdup("/effect_key/mode/previous");
+  omc_macros[24].macro_text=lives_strdup(_("Cycle to previous mode for effect key <key>"));
   omc_macros[24].nparams=1;
 
-  omc_macros[25].msg=g_strdup("/video/play/parameter/value/set");
-  omc_macros[25].macro_text=g_strdup(_("Set playback plugin parameter value <pnum> = <value>"));
-  omc_macros[25].info_text=g_strdup(_("Set <value> of pth parameter for the playback plugin."));
+  omc_macros[25].msg=lives_strdup("/video/play/parameter/value/set");
+  omc_macros[25].macro_text=lives_strdup(_("Set playback plugin parameter value <pnum> = <value>"));
+  omc_macros[25].info_text=lives_strdup(_("Set <value> of pth parameter for the playback plugin."));
   omc_macros[25].nparams=2;
 
 
-  for (i=0;i<N_OMC_MACROS;i++) {
+  for (i=0; i<N_OMC_MACROS; i++) {
     if (omc_macros[i].msg!=NULL) {
       if (omc_macros[i].nparams>0) {
-	omc_macros[i].ptypes=(int *)g_malloc(omc_macros[i].nparams*sizint);
-	omc_macros[i].mini=(int *)g_malloc(omc_macros[i].nparams*sizint);
-	omc_macros[i].maxi=(int *)g_malloc(omc_macros[i].nparams*sizint);
-	omc_macros[i].vali=(int *)g_malloc(omc_macros[i].nparams*sizint);
+        omc_macros[i].ptypes=(int *)lives_malloc(omc_macros[i].nparams*sizint);
+        omc_macros[i].mini=(int *)lives_malloc(omc_macros[i].nparams*sizint);
+        omc_macros[i].maxi=(int *)lives_malloc(omc_macros[i].nparams*sizint);
+        omc_macros[i].vali=(int *)lives_malloc(omc_macros[i].nparams*sizint);
 
-	omc_macros[i].mind=(double *)g_malloc(omc_macros[i].nparams*sizdbl);
-	omc_macros[i].maxd=(double *)g_malloc(omc_macros[i].nparams*sizdbl);
-	omc_macros[i].vald=(double *)g_malloc(omc_macros[i].nparams*sizdbl);
-	omc_macros[i].pname=(gchar **)g_malloc(omc_macros[i].nparams*sizeof(gchar *));
+        omc_macros[i].mind=(double *)lives_malloc(omc_macros[i].nparams*sizdbl);
+        omc_macros[i].maxd=(double *)lives_malloc(omc_macros[i].nparams*sizdbl);
+        omc_macros[i].vald=(double *)lives_malloc(omc_macros[i].nparams*sizdbl);
+        omc_macros[i].pname=(char **)lives_malloc(omc_macros[i].nparams*sizeof(char *));
 
       }
     }
@@ -1533,7 +1523,7 @@
   omc_macros[2].mini[0]=omc_macros[2].vali[0]=1;
   omc_macros[2].maxi[0]=100000;
   // TRANSLATORS: short form of "clip number"
-  omc_macros[2].pname[0]=g_strdup(_("clipnum"));
+  omc_macros[2].pname[0]=lives_strdup(_("clipnum"));
 
 
   // set fps (will be handled to avoid 0.)
@@ -1542,7 +1532,7 @@
   omc_macros[9].vald[0]=25.;
   omc_macros[9].maxd[0]=200.;
   // TRANSLATORS: short form of "frames per second"
-  omc_macros[9].pname[0]=g_strdup(_("fps"));
+  omc_macros[9].pname[0]=lives_strdup(_("fps"));
 
   // effect_key enable,disable, toggle
   omc_macros[15].ptypes[0]=OMC_PARAM_INT;
@@ -1550,21 +1540,21 @@
   omc_macros[15].vali[0]=1;
   omc_macros[15].maxi[0]=prefs->rte_keys_virtual;
   // TRANSLATORS: as in keyboard key
-  omc_macros[15].pname[0]=g_strdup(_("key"));
+  omc_macros[15].pname[0]=lives_strdup(_("key"));
 
   omc_macros[16].ptypes[0]=OMC_PARAM_INT;
   omc_macros[16].mini[0]=1;
   omc_macros[16].vali[0]=1;
   omc_macros[16].maxi[0]=prefs->rte_keys_virtual;
   // TRANSLATORS: as in keyboard key
-  omc_macros[16].pname[0]=g_strdup(_("key"));
+  omc_macros[16].pname[0]=lives_strdup(_("key"));
 
   omc_macros[17].ptypes[0]=OMC_PARAM_INT;
   omc_macros[17].mini[0]=1;
   omc_macros[17].vali[0]=1;
   omc_macros[17].maxi[0]=prefs->rte_keys_virtual;
   // TRANSLATORS: as in keyboard key
-  omc_macros[17].pname[0]=g_strdup(_("key"));
+  omc_macros[17].pname[0]=lives_strdup(_("key"));
 
   // key
   omc_macros[18].ptypes[0]=OMC_PARAM_INT;
@@ -1572,7 +1562,7 @@
   omc_macros[18].vali[0]=1;
   omc_macros[18].maxi[0]=prefs->rte_keys_virtual;
   // TRANSLATORS: as in keyboard key
-  omc_macros[18].pname[0]=g_strdup(_("key"));
+  omc_macros[18].pname[0]=lives_strdup(_("key"));
 
   // param (this will be matched with numeric params)
   omc_macros[18].ptypes[1]=OMC_PARAM_INT;
@@ -1580,7 +1570,7 @@
   omc_macros[18].maxi[1]=32;
   omc_macros[18].vali[1]=0;
   // TRANSLATORS: short form of "parameter number"
-  omc_macros[18].pname[1]=g_strdup(_("pnum"));
+  omc_macros[18].pname[1]=lives_strdup(_("pnum"));
 
   // value (this will get special handling)
   // type conversion and auto offset/scaling will be done
@@ -1588,7 +1578,7 @@
   omc_macros[18].mind[2]=0.;
   omc_macros[18].maxd[2]=0.;
   omc_macros[18].vald[2]=0.;
-  omc_macros[18].pname[2]=g_strdup(_("value"));
+  omc_macros[18].pname[2]=lives_strdup(_("value"));
 
   // set ratio fps (will be handled to avoid 0.)
   omc_macros[21].ptypes[0]=OMC_PARAM_DOUBLE;
@@ -1596,15 +1586,15 @@
   omc_macros[21].vald[0]=1.;
   omc_macros[21].maxd[0]=10.;
   // TRANSLATORS: short form of "frames per second"
-  omc_macros[21].pname[0]=g_strdup(_("fps_ratio"));
+  omc_macros[21].pname[0]=lives_strdup(_("fps_ratio"));
 
 
-  // clip retrigger 
+  // clip retrigger
   omc_macros[22].ptypes[0]=OMC_PARAM_INT;
   omc_macros[22].mini[0]=omc_macros[22].vali[0]=1;
   omc_macros[22].maxi[0]=100000;
   // TRANSLATORS: short form of "clip number"
-  omc_macros[22].pname[0]=g_strdup(_("clipnum"));
+  omc_macros[22].pname[0]=lives_strdup(_("clipnum"));
 
   // key
   omc_macros[23].ptypes[0]=OMC_PARAM_INT;
@@ -1612,7 +1602,7 @@
   omc_macros[23].vali[0]=1;
   omc_macros[23].maxi[0]=prefs->rte_keys_virtual;
   // TRANSLATORS: as in keyboard key
-  omc_macros[23].pname[0]=g_strdup(_("key"));
+  omc_macros[23].pname[0]=lives_strdup(_("key"));
 
   // key
   omc_macros[24].ptypes[0]=OMC_PARAM_INT;
@@ -1620,7 +1610,7 @@
   omc_macros[24].vali[0]=1;
   omc_macros[24].maxi[0]=prefs->rte_keys_virtual;
   // TRANSLATORS: as in keyboard key
-  omc_macros[24].pname[0]=g_strdup(_("key"));
+  omc_macros[24].pname[0]=lives_strdup(_("key"));
 
 
   // param
@@ -1629,7 +1619,7 @@
   omc_macros[25].maxi[0]=128;
   omc_macros[25].vali[0]=0;
   // TRANSLATORS: short form of "parameter number"
-  omc_macros[25].pname[0]=g_strdup(_("pnum"));
+  omc_macros[25].pname[0]=lives_strdup(_("pnum"));
 
   // value (this will get special handling)
   // type conversion and auto offset/scaling will be done
@@ -1637,12 +1627,12 @@
   omc_macros[25].mind[1]=0.;
   omc_macros[25].maxd[1]=0.;
   omc_macros[25].vald[1]=0.;
-  omc_macros[25].pname[1]=g_strdup(_("value"));
+  omc_macros[25].pname[1]=lives_strdup(_("value"));
 
 }
 
 
-static int get_nfixed(int type, const gchar *string) {
+static int get_nfixed(int type, const char *string) {
   int nfixed=0;
 
   switch (type) {
@@ -1672,80 +1662,79 @@
 
 
 
-static boolean match_filtered_params(lives_omc_match_node_t *mnode, const gchar *sig, int nfixed) {
+static boolean match_filtered_params(lives_omc_match_node_t *mnode, const char *sig, int nfixed) {
   int i;
-  gchar **array=g_strsplit(sig," ",-1);
+  char **array=lives_strsplit(sig," ",-1);
 
-  for (i=0;i<mnode->nvars;i++) {
+  for (i=0; i<mnode->nvars; i++) {
     if (mnode->matchp[i]) {
       if (mnode->matchi[i]!=atoi(array[nfixed+i])) {
-	//g_print("data mismatch %d %d %d\n",mnode->matchi[i],atoi(array[nfixed+i]),nfixed);
-	g_strfreev(array);
-	return FALSE;
+        //g_print("data mismatch %d %d %d\n",mnode->matchi[i],atoi(array[nfixed+i]),nfixed);
+        lives_strfreev(array);
+        return FALSE;
       }
     }
   }
   //g_print("data match\n");
-  g_strfreev(array);
+  lives_strfreev(array);
   return TRUE;
 }
 
 
 
 
-static lives_omc_match_node_t *omc_match_sig(int type, int index, const gchar *sig) {
-  GSList *nlist=omc_node_list;
-  gchar *srch,*cnodex;
+static lives_omc_match_node_t *omc_match_sig(int type, int index, const char *sig) {
+  LiVESSList *nlist=omc_node_list;
+  char *srch,*cnodex;
   lives_omc_match_node_t *cnode;
   int nfixed;
 
   if (type==OMC_MIDI) {
-    if (index==-1) srch=g_strdup_printf("%d %s ",type,sig);
-    else srch=g_strdup_printf("%d %d %s ",type,index,sig);
-  }
-  else srch=g_strdup_printf("%s ",sig);
+    if (index==-1) srch=lives_strdup_printf("%d %s ",type,sig);
+    else srch=lives_strdup_printf("%d %d %s ",type,index,sig);
+  } else srch=lives_strdup_printf("%s ",sig);
 
   nfixed=get_nfixed(type,sig);
 
   while (nlist!=NULL) {
     cnode=(lives_omc_match_node_t *)nlist->data;
-    cnodex=g_strdup_printf("%s ",cnode->srch);
+    cnodex=lives_strdup_printf("%s ",cnode->srch);
     //g_print("cf %s and %s\n",cnode->srch,srch);
     if (!strncmp(cnodex,srch,strlen(cnodex))) {
       // got a possible match
       // now check the data
       if (match_filtered_params(cnode,sig,nfixed)) {
-	g_free(srch);
-	g_free(cnodex);
-	return cnode;
+        lives_free(srch);
+        lives_free(cnodex);
+        return cnode;
       }
     }
     nlist=nlist->next;
-    g_free(cnodex);
+    lives_free(cnodex);
   }
-  g_free(srch);
+  lives_free(srch);
   return NULL;
 }
 
 
 /* not used yet */
-/*static gchar *omclearn_request_min(int type) {
-  gchar *msg=NULL;
+/*static char *omclearn_request_min(int type) {
+  char *msg=NULL;
 
   switch (type) {
   case OMC_JS_AXIS:
-    msg=g_strdup(_("\n\nNow move the stick to the opposite position and click OK\n\n"));
+    msg=lives_strdup(_("\n\nNow move the stick to the opposite position and click OK\n\n"));
     break;
   case OMC_MIDI_CONTROLLER:
-    msg=g_strdup(_("\n\nPlease set the control to its minimum value and click OK\n\n"));
+    msg=lives_strdup(_("\n\nPlease set the control to its minimum value and click OK\n\n"));
     break;
   case OMC_MIDI_NOTE:
-    msg=g_strdup(_("\n\nPlease release the note\n\n"));
+    msg=lives_strdup(_("\n\nPlease release the note\n\n"));
     break;
   }
-  
+
   do_blocking_error_dialog(msg);
-  if (msg!=NULL) g_free(msg);
+  if (msg!=NULL) lives_free(msg);
 
 
   return NULL;
@@ -1753,7 +1742,7 @@
 
 
 
-static LIVES_INLINE int omclearn_get_fixed_elems(const gchar *string1, const gchar *string2) {
+static LIVES_INLINE int omclearn_get_fixed_elems(const char *string1, const char *string2) {
   // count how many (non-space) elements match
   // e.g "a b c" and "a b d" returns 2
 
@@ -1764,7 +1753,7 @@
   int match=0;
   int stlen=MIN(strlen(string1),strlen(string2));
 
-  for (i=0;i<stlen;i++) {
+  for (i=0; i<stlen; i++) {
     if (strcmp((string1+i),(string2+i))) return match;
     if (!strcmp((string1+i)," ")) match++;
   }
@@ -1775,10 +1764,10 @@
 
 
 
-static LIVES_INLINE int get_nth_elem(const gchar *string, int idx) {
-  gchar **array=g_strsplit(string," ",-1);
+static LIVES_INLINE int get_nth_elem(const char *string, int idx) {
+  char **array=lives_strsplit(string," ",-1);
   int retval=atoi(array[idx]);
-  g_strfreev(array);
+  lives_strfreev(array);
   return retval;
 }
 
@@ -1786,19 +1775,18 @@
 
 
 
-static lives_omc_match_node_t *lives_omc_match_node_new(int str_type, int index, const gchar *string, int nfixed) {
+static lives_omc_match_node_t *lives_omc_match_node_new(int str_type, int index, const char *string, int nfixed) {
   int i;
-  gchar *tmp;
-  gchar *srch_str;
-  lives_omc_match_node_t *mnode=(lives_omc_match_node_t *)g_malloc(sizeof(lives_omc_match_node_t));
+  char *tmp;
+  char *srch_str;
+  lives_omc_match_node_t *mnode=(lives_omc_match_node_t *)lives_malloc(sizeof(lives_omc_match_node_t));
 
   if (str_type==OMC_MIDI) {
-    if (index>-1) srch_str=g_strdup_printf("%d %d %s",str_type,index,(tmp=cut_string_elems(string,nfixed<0?-1:nfixed)));
-    else srch_str=g_strdup_printf("%d %s",str_type,(tmp=cut_string_elems(string,nfixed<0?-1:nfixed)));
+    if (index>-1) srch_str=lives_strdup_printf("%d %d %s",str_type,index,(tmp=cut_string_elems(string,nfixed<0?-1:nfixed)));
+    else srch_str=lives_strdup_printf("%d %s",str_type,(tmp=cut_string_elems(string,nfixed<0?-1:nfixed)));
 
-    g_free(tmp);
-  }
-  else srch_str=g_strdup(string);
+    lives_free(tmp);
+  } else srch_str=lives_strdup(string);
 
   mnode->srch=srch_str;
   mnode->macro=-1;
@@ -1807,16 +1795,16 @@
   else mnode->nvars=get_token_count(string,' ')-nfixed;
 
   if (mnode->nvars>0) {
-    mnode->offs0=(int *)g_malloc(mnode->nvars*sizint);
-    mnode->scale=(double *)g_malloc(mnode->nvars*sizdbl);
-    mnode->offs1=(int *)g_malloc(mnode->nvars*sizint);
-    mnode->min=(int *)g_malloc(mnode->nvars*sizint);
-    mnode->max=(int *)g_malloc(mnode->nvars*sizint);
-    mnode->matchp=(boolean *)g_malloc(mnode->nvars*sizeof(boolean));
-    mnode->matchi=(int *)g_malloc(mnode->nvars*sizint);
+    mnode->offs0=(int *)lives_malloc(mnode->nvars*sizint);
+    mnode->scale=(double *)lives_malloc(mnode->nvars*sizdbl);
+    mnode->offs1=(int *)lives_malloc(mnode->nvars*sizint);
+    mnode->min=(int *)lives_malloc(mnode->nvars*sizint);
+    mnode->max=(int *)lives_malloc(mnode->nvars*sizint);
+    mnode->matchp=(boolean *)lives_malloc(mnode->nvars*sizeof(boolean));
+    mnode->matchi=(int *)lives_malloc(mnode->nvars*sizint);
   }
 
-  for (i=0;i<mnode->nvars;i++) {
+  for (i=0; i<mnode->nvars; i++) {
     mnode->offs0[i]=mnode->offs1[i]=0;
     mnode->scale[i]=1.;
     mnode->matchp[i]=FALSE;
@@ -1834,7 +1822,7 @@
 
 
 
-static int *omclearn_get_values(const gchar *string, int nfixed) {
+static int *omclearn_get_values(const char *string, int nfixed) {
   register int i,j;
   size_t slen,tslen;
   int *retvals,count=0,nvars;
@@ -1843,27 +1831,27 @@
 
   nvars=get_token_count(string,' ')-nfixed;
 
-  retvals=(int *)g_malloc(nvars*sizint);
+  retvals=(int *)lives_malloc(nvars*sizint);
 
-  for (i=0;i<slen;i++) {
+  for (i=0; i<slen; i++) {
     if (!strncmp((string+i)," ",1)) {
       if (--nfixed<=0) {
-	gchar *tmp=g_strdup(string+i+1);
-	tslen=strlen(tmp);
-	for (j=0;j<tslen;j++) {
-	  if (!strncmp((tmp+j)," ",1)) {
-	    memset(tmp+j,0,1);
-	    retvals[count++]=atoi(tmp);
-	    g_free(tmp);
-	    break;
-	  }
-	}
-	if (j==tslen) {
-	  retvals[count++]=atoi(tmp);
-	  g_free(tmp);
-	  return retvals;
-	}
-	i+=j;
+        char *tmp=lives_strdup(string+i+1);
+        tslen=strlen(tmp);
+        for (j=0; j<tslen; j++) {
+          if (!strncmp((tmp+j)," ",1)) {
+            memset(tmp+j,0,1);
+            retvals[count++]=atoi(tmp);
+            lives_free(tmp);
+            break;
+          }
+        }
+        if (j==tslen) {
+          retvals[count++]=atoi(tmp);
+          lives_free(tmp);
+          return retvals;
+        }
+        i+=j;
       }
     }
   }
@@ -1875,7 +1863,7 @@
 
 
 
-void omclearn_match_control (lives_omc_match_node_t *mnode, int str_type, int index, const gchar *string, int nfixed, omclearn_w *omclw) {
+void omclearn_match_control(lives_omc_match_node_t *mnode, int str_type, int index, const char *string, int nfixed, omclearn_w *omclw) {
 
   if (nfixed==-1) {
     // already there : allow user to update
@@ -1898,7 +1886,7 @@
 
 
 
-lives_omc_match_node_t *omc_learn(const gchar *string, int str_type, int idx, omclearn_w *omclw) {
+lives_omc_match_node_t *omc_learn(const char *string, int str_type, int idx, omclearn_w *omclw) {
   // here we come with a string, which must be a sequence of integers
   // separated by single spaces
 
@@ -1911,7 +1899,7 @@
 
   // next, we check if signifier is already matched to a macro
 
-  // if not we allow the user to match it to any macro that has n or less parameters, where n is the number of variables in string 
+  // if not we allow the user to match it to any macro that has n or less parameters, where n is the number of variables in string
 
 
   lives_omc_match_node_t *mnode;
@@ -1923,10 +1911,10 @@
   case OMC_MIDI_CONTROLLER:
     // display controller and allow it to be matched
     // then request min
-    
+
     mnode=omc_match_sig(OMC_MIDI,idx,string);
     //g_print("autoscale !\n");
-    
+
     if (mnode==NULL||mnode->macro==-1) {
       mnode=lives_omc_match_node_new(OMC_MIDI,idx,string,nfixed);
       mnode->max[0]=127;
@@ -1938,10 +1926,10 @@
     break;
   case OMC_MIDI_PGM_CHANGE:
     // display controller and allow it to be matched
-    
+
     mnode=omc_match_sig(OMC_MIDI,idx,string);
     //g_print("autoscale !\n");
-    
+
     if (mnode==NULL||mnode->macro==-1) {
       mnode=lives_omc_match_node_new(OMC_MIDI,idx,string,nfixed);
       mnode->max[0]=127;
@@ -1954,10 +1942,10 @@
   case OMC_MIDI_PITCH_BEND:
     // display controller and allow it to be matched
     // then request min
-    
+
     mnode=omc_match_sig(OMC_MIDI,idx,string);
     //g_print("autoscale !\n");
-    
+
     if (mnode==NULL||mnode->macro==-1) {
       mnode=lives_omc_match_node_new(OMC_MIDI,idx,string,nfixed);
       mnode->max[0]=8192;
@@ -1970,7 +1958,7 @@
   case OMC_MIDI_NOTE_OFF:
     // display note and allow it to be matched
     mnode=omc_match_sig(OMC_MIDI,idx,string);
-    
+
     if (mnode==NULL||mnode->macro==-1) {
       mnode=lives_omc_match_node_new(OMC_MIDI,idx,string,nfixed);
 
@@ -1988,9 +1976,9 @@
   case OMC_JS_AXIS:
     // display axis and allow it to be matched
     // then request min
-    
+
     mnode=omc_match_sig(str_type,idx,string);
-    
+
     if (mnode==NULL||mnode->macro==-1) {
       mnode=lives_omc_match_node_new(str_type,idx,string,nfixed);
 
@@ -2004,7 +1992,7 @@
   case OMC_JS_BUTTON:
     // display note and allow it to be matched
     mnode=omc_match_sig(str_type,idx,string);
-     
+
     if (mnode==NULL||mnode->macro==-1) {
       mnode=lives_omc_match_node_new(str_type,idx,string,nfixed);
       omclearn_match_control(mnode,str_type,idx,string,nfixed,omclw);
@@ -2013,7 +2001,7 @@
     break;
   default:
     // hmmm....
-    
+
     break;
   }
   return NULL;
@@ -2028,9 +2016,9 @@
 
 // in playback mode, we match the string with our database, and then convert/append the variables
 
-boolean omc_process_string(int supertype, const gchar *string, boolean learn, omclearn_w *omclw) {
+boolean omc_process_string(int supertype, const char *string, boolean learn, omclearn_w *omclw) {
   // only need to set omclw if learn is TRUE
-  
+
   // returns TRUE if we learn new, or if we carry out an action
   // retruns FALSE otherwise
 
@@ -2059,11 +2047,10 @@
       // pass to learner
       mnode=omc_learn(string,type,idx,omclw);
       if (mnode!=NULL) {
-	ret=TRUE;
-	omc_node_list=g_slist_append(omc_node_list,mnode);
+        ret=TRUE;
+        omc_node_list=lives_slist_append(omc_node_list,mnode);
       }
-    }
-    else {
+    } else {
       OSCbuf *oscbuf=omc_learner_decode(supertype,idx,string);
 
       // if not playing, the only commands we allow are:
@@ -2077,15 +2064,15 @@
       // further checks are performed when enabling/toggling an effect to see whether it is a generator
 
       if (oscbuf!=NULL) {
-	if (mainw->playing_file==-1
-	    &&strcmp(oscbuf->buffer,"/video/play")
-	    &&strcmp(oscbuf->buffer,"/clip/foreground/retrigger")
-	    &&strcmp(oscbuf->buffer,"/effect_key/enable")
-	    &&strcmp(oscbuf->buffer,"/effect_key/toggle")
-	    ) return FALSE;
-	
-	lives_osc_act(oscbuf);
-	ret=TRUE;
+        if (mainw->playing_file==-1
+            &&strcmp(oscbuf->buffer,"/video/play")
+            &&strcmp(oscbuf->buffer,"/clip/foreground/retrigger")
+            &&strcmp(oscbuf->buffer,"/effect_key/enable")
+            &&strcmp(oscbuf->buffer,"/effect_key/toggle")
+           ) return FALSE;
+
+        lives_osc_act(oscbuf);
+        ret=TRUE;
       }
     }
   }
@@ -2096,9 +2083,9 @@
 
 
 
-void on_midi_learn_activate (LiVESMenuItem *menuitem, gpointer user_data) {
+void on_midi_learn_activate(LiVESMenuItem *menuitem, livespointer user_data) {
   omclearn_w *omclw=create_omclearn_dialog();
-  gchar *string=NULL;
+  char *string=NULL;
 
   if (!omc_macros_inited) {
     init_omc_macros();
@@ -2128,30 +2115,29 @@
     if (mainw->ext_cntl[EXT_CNTL_JS]) string=js_mangle();
     if (string!=NULL) {
       omc_process_string(OMC_JS,string,TRUE,omclw);
-      g_free(string);
+      lives_free(string);
       string=NULL;
-    }
-    else {
+    } else {
 #endif
 
 #ifdef OMC_MIDI_IMPL
       if (mainw->ext_cntl[EXT_CNTL_MIDI]) string=midi_mangle();
       //#define TEST_OMC_LEARN
 #ifdef TEST_OMC_LEARN
-      string=g_strdup("176 10 0 1");
+      string=lives_strdup("176 10 0 1");
 #endif
       if (string!=NULL) {
-	omc_process_string(OMC_MIDI,string,TRUE,omclw);
-	g_free(string);
-	string=NULL;
+        omc_process_string(OMC_MIDI,string,TRUE,omclw);
+        lives_free(string);
+        string=NULL;
       }
 #endif
 
 #ifdef OMC_JS_IMPL
-  }
+    }
 #endif
 
-    g_usleep(prefs->sleep_time);
+    lives_usleep(prefs->sleep_time);
 
     lives_widget_context_update();
   }
@@ -2162,7 +2148,7 @@
 
   mainw->cancelled=CANCEL_NONE;
 
-  g_free(omclw);
+  lives_free(omclw);
 
 }
 
@@ -2170,72 +2156,69 @@
 
 
 
-static void write_fx_tag(const gchar *string, int nfixed, lives_omc_match_node_t *mnode, lives_omc_macro_t *omacro, gchar *typetags) {
+static void write_fx_tag(const char *string, int nfixed, lives_omc_match_node_t *mnode, lives_omc_macro_t *omacro, char *typetags) {
   // get typetag for a filter parameter
 
   int i,j,k;
   int *vals=omclearn_get_values(string,nfixed);
   int oval0=1,oval1=0;
 
-  for (i=0;i<omacro->nparams;i++) {
+  for (i=0; i<omacro->nparams; i++) {
     // get fixed val or map from
     j=mnode->map[i];
 
     if (j>-1) {
       if (i==2) {
-	// auto scale for fx param
-	int error,ntmpls,hint,flags;
-	int mode=rte_key_getmode(oval0);
-	weed_plant_t *filter;
-	weed_plant_t **ptmpls;
-	weed_plant_t *ptmpl;
-	
-	if (mode==-1) return;
-	
-	filter=rte_keymode_get_filter(oval0,mode);
-	
-	ntmpls=weed_leaf_num_elements(filter,"in_parameter_templates");
-
-	ptmpls=weed_get_plantptr_array(filter,"in_parameter_templates",&error);
-	for (k=0;k<ntmpls;k++) {
-	  ptmpl=ptmpls[k];
-	  if (weed_plant_has_leaf(ptmpl,"host_internal_connection")) continue;
-	  hint=weed_get_int_value(ptmpl,"hint",&error);
-	  flags=weed_get_int_value(ptmpl,"flags",&error);
-	  if (flags&WEED_PARAMETER_VARIABLE_ELEMENTS) flags^=WEED_PARAMETER_VARIABLE_ELEMENTS;
-	  if ((hint==WEED_HINT_INTEGER||hint==WEED_HINT_FLOAT)&&flags==0&&weed_leaf_num_elements(ptmpl,"default")==1) {
-	    if (oval1==0) {
-	      if (hint==WEED_HINT_INTEGER) {
-		// **int
-		g_strappend(typetags,OSC_MAX_TYPETAGS,"i");
-	      }
-	      else {
-		// float
-		g_strappend(typetags,OSC_MAX_TYPETAGS,"f");
-	      }
-	    }
-	    oval1--;
-	  }
-	}
-	weed_free(ptmpls);
-      }
-      else {
-	// playback plugin params
-	if (omacro->ptypes[i]==OMC_PARAM_INT) {
-	  int oval=myround((double)(vals[j]+mnode->offs0[j])*mnode->scale[j])+mnode->offs1[j];
-	  if (i==0) oval0=oval;
-	  if (i==1) oval1=oval;
-	}
+        // auto scale for fx param
+        int error,ntmpls,hint,flags;
+        int mode=rte_key_getmode(oval0);
+        weed_plant_t *filter;
+        weed_plant_t **ptmpls;
+        weed_plant_t *ptmpl;
+
+        if (mode==-1) return;
+
+        filter=rte_keymode_get_filter(oval0,mode);
+
+        ntmpls=weed_leaf_num_elements(filter,"in_parameter_templates");
+
+        ptmpls=weed_get_plantptr_array(filter,"in_parameter_templates",&error);
+        for (k=0; k<ntmpls; k++) {
+          ptmpl=ptmpls[k];
+          if (weed_plant_has_leaf(ptmpl,"host_internal_connection")) continue;
+          hint=weed_get_int_value(ptmpl,"hint",&error);
+          flags=weed_get_int_value(ptmpl,"flags",&error);
+          if (flags&WEED_PARAMETER_VARIABLE_ELEMENTS) flags^=WEED_PARAMETER_VARIABLE_ELEMENTS;
+          if ((hint==WEED_HINT_INTEGER||hint==WEED_HINT_FLOAT)&&flags==0&&weed_leaf_num_elements(ptmpl,"default")==1) {
+            if (oval1==0) {
+              if (hint==WEED_HINT_INTEGER) {
+                // **int
+                lives_strappend(typetags,OSC_MAX_TYPETAGS,"i");
+              } else {
+                // float
+                lives_strappend(typetags,OSC_MAX_TYPETAGS,"f");
+              }
+            }
+            oval1--;
+          }
+        }
+        lives_free(ptmpls);
+      } else {
+        // playback plugin params
+        if (omacro->ptypes[i]==OMC_PARAM_INT) {
+          int oval=myround((double)(vals[j]+mnode->offs0[j])*mnode->scale[j])+mnode->offs1[j];
+          if (i==0) oval0=oval;
+          if (i==1) oval1=oval;
+        }
       }
-    }
-    else {
+    } else {
       if (omacro->ptypes[i]==OMC_PARAM_INT) {
-	if (i==0) oval0=mnode->fvali[i];
-	if (i==1) oval1=mnode->fvali[i];
+        if (i==0) oval0=mnode->fvali[i];
+        if (i==1) oval1=mnode->fvali[i];
       }
     }
   }
-  g_free(vals);
+  lives_free(vals);
 }
 
 
@@ -2247,7 +2230,7 @@
 
 
 
-OSCbuf *omc_learner_decode(int type, int idx, const gchar *string) {
+OSCbuf *omc_learner_decode(int type, int idx, const char *string) {
   int macro,nfixed;
   lives_omc_match_node_t *mnode;
   lives_omc_macro_t omacro;
@@ -2258,7 +2241,7 @@
 
   int *vals;
 
-  gchar typetags[OSC_MAX_TYPETAGS];
+  char typetags[OSC_MAX_TYPETAGS];
 
   mnode=omc_match_sig(type,idx,string);
 
@@ -2274,18 +2257,17 @@
 
   OSC_resetBuffer(&obuf);
 
-  g_snprintf(typetags,OSC_MAX_TYPETAGS,",");
+  lives_snprintf(typetags,OSC_MAX_TYPETAGS,",");
 
   nfixed=get_token_count(string,' ')-mnode->nvars;
 
   // get typetags
-  for (i=0;i<omacro.nparams;i++) {
+  for (i=0; i<omacro.nparams; i++) {
     if (omacro.ptypes[i]==OMC_PARAM_SPECIAL) {
       write_fx_tag(string,nfixed,mnode,&omacro,typetags);
-    }
-    else {
-      if (omacro.ptypes[i]==OMC_PARAM_INT) g_strappend(typetags,OSC_MAX_TYPETAGS,"i");
-      else g_strappend(typetags,OSC_MAX_TYPETAGS,"f");
+    } else {
+      if (omacro.ptypes[i]==OMC_PARAM_INT) lives_strappend(typetags,OSC_MAX_TYPETAGS,"i");
+      else lives_strappend(typetags,OSC_MAX_TYPETAGS,"f");
     }
   }
 
@@ -2296,112 +2278,105 @@
 
     vals=omclearn_get_values(string,nfixed);
 
-    for (i=0;i<omacro.nparams;i++) {
+    for (i=0; i<omacro.nparams; i++) {
       // get fixed val or map from
       j=mnode->map[i];
 
       if (j>-1) {
 
-	if (macro==25 && i==1 && mainw->vpp!=NULL && mainw->vpp->play_params!=NULL && oval0<mainw->vpp->num_play_params) {
-	  // auto scale for playback plugin params
-
-	  weed_plant_t *ptmpl=weed_get_plantptr_value((weed_plant_t *)pp_get_param(mainw->vpp->play_params,oval0),"template",&error);
-	  hint=weed_get_int_value(ptmpl,"hint",&error);
-	  if ((hint==WEED_HINT_INTEGER||hint==WEED_HINT_FLOAT)&&weed_leaf_num_elements(ptmpl,"default")==1) {
-	    if (hint==WEED_HINT_INTEGER) {
-	      int omin=mnode->min[j];
-	      int omax=mnode->max[j];
-	      int mini=weed_get_int_value(ptmpl,"min",&error);
-	      int maxi=weed_get_int_value(ptmpl,"max",&error);
-	      
-	      int oval=(int)((double)(vals[j]-omin)/(double)(omax-omin)*(double)(maxi-mini))+mini;
-	      OSC_writeIntArg(&obuf,oval);
-	    }
-	    else {
-	      // float
-	      int omin=mnode->min[j];
-	      int omax=mnode->max[j];
-	      double minf=weed_get_double_value(ptmpl,"min",&error);
-	      double maxf=weed_get_double_value(ptmpl,"max",&error);
-	      
-	      double oval=(double)(vals[j]-omin)/(double)(omax-omin)*(maxf-minf)+minf;
-	      OSC_writeFloatArg(&obuf,(float)oval);
-	    } // end float
-	  }
-	}
-	else { 
-	  if (macro==18&&i==2) {
-	    // auto scale for fx param
-	    int mode=rte_key_getmode(oval0);
-	    weed_plant_t *filter;
-	    weed_plant_t **ptmpls;
-	    weed_plant_t *ptmpl;
-
-	    if (mode==-1) return NULL;
-
-	    filter=rte_keymode_get_filter(oval0,mode);
-
-	    ntmpls=weed_leaf_num_elements(filter,"in_parameter_templates");
-
-	    ptmpls=weed_get_plantptr_array(filter,"in_parameter_templates",&error);
-	    for (k=0;k<ntmpls;k++) {
-	      ptmpl=ptmpls[k];
-	      if (weed_plant_has_leaf(ptmpl,"host_internal_connection")) continue;
-	      hint=weed_get_int_value(ptmpl,"hint",&error);
-	      flags=weed_get_int_value(ptmpl,"flags",&error);
-	      if ((hint==WEED_HINT_INTEGER||hint==WEED_HINT_FLOAT)&&flags==0&&weed_leaf_num_elements(ptmpl,"default")==1) {
-		if (oval1==0) {
-		  if (hint==WEED_HINT_INTEGER) {
-		    int omin=mnode->min[j];
-		    int omax=mnode->max[j];
-		    int mini=weed_get_int_value(ptmpl,"min",&error);
-		    int maxi=weed_get_int_value(ptmpl,"max",&error);
-
-		    int oval=(int)((double)(vals[j]-omin)/(double)(omax-omin)*(double)(maxi-mini))+mini;
-		    OSC_writeIntArg(&obuf,oval);
-		  }
-		  else {
-		    // float
-		    int omin=mnode->min[j];
-		    int omax=mnode->max[j];
-		    double minf=weed_get_double_value(ptmpl,"min",&error);
-		    double maxf=weed_get_double_value(ptmpl,"max",&error);
-
-		    double oval=(double)(vals[j]-omin)/(double)(omax-omin)*(maxf-minf)+minf;
-		    OSC_writeFloatArg(&obuf,(float)oval);
-		  } // end float
-		}
-		oval1--;
-	      }
-	    }
-	    weed_free(ptmpls);
-	  }
-	  else {
-	    if (omacro.ptypes[i]==OMC_PARAM_INT) {
-	      int oval=myround((double)(vals[j]+mnode->offs0[j])*mnode->scale[j])+mnode->offs1[j];
-	      if (i==0) oval0=oval;
-	      if (i==1) oval1=oval;
-	      OSC_writeIntArg(&obuf,oval);
-	    }
-	    else {
-	      double oval=(double)(vals[j]+mnode->offs0[j])*mnode->scale[j]+(double)mnode->offs1[j];
-	      OSC_writeFloatArg(&obuf,oval);
-	    }
-	  }
-	}
-      }
-      else {
-	if (omacro.ptypes[i]==OMC_PARAM_INT) {
-	  OSC_writeIntArg(&obuf,mnode->fvali[i]);
-	  if (i==0) oval0=mnode->fvali[i];
-	  if (i==1) oval1=mnode->fvali[i];
-	}
-	else {
-	  OSC_writeFloatArg(&obuf,(float)mnode->fvald[i]);
-	}
+        if (macro==25 && i==1 && mainw->vpp!=NULL && mainw->vpp->play_params!=NULL && oval0<mainw->vpp->num_play_params) {
+          // auto scale for playback plugin params
+
+          weed_plant_t *ptmpl=weed_get_plantptr_value((weed_plant_t *)pp_get_param(mainw->vpp->play_params,oval0),"template",&error);
+          hint=weed_get_int_value(ptmpl,"hint",&error);
+          if ((hint==WEED_HINT_INTEGER||hint==WEED_HINT_FLOAT)&&weed_leaf_num_elements(ptmpl,"default")==1) {
+            if (hint==WEED_HINT_INTEGER) {
+              int omin=mnode->min[j];
+              int omax=mnode->max[j];
+              int mini=weed_get_int_value(ptmpl,"min",&error);
+              int maxi=weed_get_int_value(ptmpl,"max",&error);
+
+              int oval=(int)((double)(vals[j]-omin)/(double)(omax-omin)*(double)(maxi-mini))+mini;
+              OSC_writeIntArg(&obuf,oval);
+            } else {
+              // float
+              int omin=mnode->min[j];
+              int omax=mnode->max[j];
+              double minf=weed_get_double_value(ptmpl,"min",&error);
+              double maxf=weed_get_double_value(ptmpl,"max",&error);
+
+              double oval=(double)(vals[j]-omin)/(double)(omax-omin)*(maxf-minf)+minf;
+              OSC_writeFloatArg(&obuf,(float)oval);
+            } // end float
+          }
+        } else {
+          if (macro==18&&i==2) {
+            // auto scale for fx param
+            int mode=rte_key_getmode(oval0);
+            weed_plant_t *filter;
+            weed_plant_t **ptmpls;
+            weed_plant_t *ptmpl;
+
+            if (mode==-1) return NULL;
+
+            filter=rte_keymode_get_filter(oval0,mode);
+
+            ntmpls=weed_leaf_num_elements(filter,"in_parameter_templates");
+
+            ptmpls=weed_get_plantptr_array(filter,"in_parameter_templates",&error);
+            for (k=0; k<ntmpls; k++) {
+              ptmpl=ptmpls[k];
+              if (weed_plant_has_leaf(ptmpl,"host_internal_connection")) continue;
+              hint=weed_get_int_value(ptmpl,"hint",&error);
+              flags=weed_get_int_value(ptmpl,"flags",&error);
+              if ((hint==WEED_HINT_INTEGER||hint==WEED_HINT_FLOAT)&&flags==0&&weed_leaf_num_elements(ptmpl,"default")==1) {
+                if (oval1==0) {
+                  if (hint==WEED_HINT_INTEGER) {
+                    int omin=mnode->min[j];
+                    int omax=mnode->max[j];
+                    int mini=weed_get_int_value(ptmpl,"min",&error);
+                    int maxi=weed_get_int_value(ptmpl,"max",&error);
+
+                    int oval=(int)((double)(vals[j]-omin)/(double)(omax-omin)*(double)(maxi-mini))+mini;
+                    OSC_writeIntArg(&obuf,oval);
+                  } else {
+                    // float
+                    int omin=mnode->min[j];
+                    int omax=mnode->max[j];
+                    double minf=weed_get_double_value(ptmpl,"min",&error);
+                    double maxf=weed_get_double_value(ptmpl,"max",&error);
+
+                    double oval=(double)(vals[j]-omin)/(double)(omax-omin)*(maxf-minf)+minf;
+                    OSC_writeFloatArg(&obuf,(float)oval);
+                  } // end float
+                }
+                oval1--;
+              }
+            }
+            lives_free(ptmpls);
+          } else {
+            if (omacro.ptypes[i]==OMC_PARAM_INT) {
+              int oval=myround((double)(vals[j]+mnode->offs0[j])*mnode->scale[j])+mnode->offs1[j];
+              if (i==0) oval0=oval;
+              if (i==1) oval1=oval;
+              OSC_writeIntArg(&obuf,oval);
+            } else {
+              double oval=(double)(vals[j]+mnode->offs0[j])*mnode->scale[j]+(double)mnode->offs1[j];
+              OSC_writeFloatArg(&obuf,oval);
+            }
+          }
+        }
+      } else {
+        if (omacro.ptypes[i]==OMC_PARAM_INT) {
+          OSC_writeIntArg(&obuf,mnode->fvali[i]);
+          if (i==0) oval0=mnode->fvali[i];
+          if (i==1) oval1=mnode->fvali[i];
+        } else {
+          OSC_writeFloatArg(&obuf,(float)mnode->fvald[i]);
+        }
       }
     }
-    g_free(vals);
+    lives_free(vals);
   }
 
   return &obuf;
@@ -2418,16 +2393,15 @@
  */
 
 
-void on_midi_save_activate (LiVESMenuItem *menuitem, gpointer user_data) {
-  GSList *slist=omc_node_list;
+void on_midi_save_activate(LiVESMenuItem *menuitem, livespointer user_data) {
+  LiVESSList *slist=omc_node_list;
 
   size_t srchlen;
 
   lives_omc_match_node_t *mnode;
   lives_omc_macro_t omacro;
 
-  gchar *msg;
-  gchar *save_file;
+  char *save_file;
 
   int nnodes;
   int retval;
@@ -2440,117 +2414,113 @@
 
   if (save_file==NULL||!strlen(save_file)) return;
 
-  msg=g_strdup_printf(_("Saving device mapping to file %s..."),save_file);
-  d_print(msg);
-  g_free(msg);
+  d_print(_("Saving device mapping to file %s..."),save_file);
 
   do {
     retval=0;
     if ((fd=open(save_file,O_WRONLY|O_CREAT|O_TRUNC,S_IRUSR|S_IWUSR))<0) {
-      retval=do_write_failed_error_s_with_retry (save_file,g_strerror(errno),NULL);
-      if (retval==LIVES_CANCEL) {
-	g_free (save_file);
-	d_print_failed();
-	return;
+      retval=do_write_failed_error_s_with_retry(save_file,lives_strerror(errno),NULL);
+      if (retval==LIVES_RESPONSE_CANCEL) {
+        lives_free(save_file);
+        d_print_failed();
+        return;
       }
-    }
-    else {
+    } else {
       mainw->write_failed=FALSE;
-    
+
       lives_write(fd,OMC_FILE_VSTRING,strlen(OMC_FILE_VSTRING),TRUE);
-      
-      nnodes=g_slist_length(omc_node_list);
+
+      nnodes=lives_slist_length(omc_node_list);
       lives_write_le(fd,&nnodes,4,TRUE);
-      
+
       while (slist!=NULL) {
-	if (mainw->write_failed) break;
-	mnode=(lives_omc_match_node_t *)slist->data;
-	srchlen=strlen(mnode->srch);
-	
-	lives_write_le(fd,&srchlen,4,TRUE);
-	lives_write(fd,mnode->srch,srchlen,TRUE);
-	
-	lives_write_le(fd,&mnode->macro,4,TRUE);
-	lives_write_le(fd,&mnode->nvars,4,TRUE);
-	
-	for (i=0;i<mnode->nvars;i++) {
-	  if (mainw->write_failed) break;
-	  lives_write_le(fd,&mnode->offs0[i],4,TRUE);
-	  lives_write_le(fd,&mnode->scale[i],8,TRUE);
-	  lives_write_le(fd,&mnode->offs1[i],4,TRUE);
-	  
-	  lives_write_le(fd,&mnode->min[i],4,TRUE);
-	  lives_write_le(fd,&mnode->max[i],4,TRUE);
-	  
-	  lives_write_le(fd,&mnode->matchp[i],4,TRUE);
-	  lives_write_le(fd,&mnode->matchi[i],4,TRUE);
-	}
-	
-	omacro=omc_macros[mnode->macro];
-	
-	for (i=0;i<omacro.nparams;i++) {
-	  if (mainw->write_failed) break;
-	  lives_write_le(fd,&mnode->map[i],4,TRUE);
-	  lives_write_le(fd,&mnode->fvali[i],4,TRUE);
-	  lives_write_le(fd,&mnode->fvald[i],8,TRUE);
-	}
-	slist=slist->next;
+        if (mainw->write_failed) break;
+        mnode=(lives_omc_match_node_t *)slist->data;
+        srchlen=strlen(mnode->srch);
+
+        lives_write_le(fd,&srchlen,4,TRUE);
+        lives_write(fd,mnode->srch,srchlen,TRUE);
+
+        lives_write_le(fd,&mnode->macro,4,TRUE);
+        lives_write_le(fd,&mnode->nvars,4,TRUE);
+
+        for (i=0; i<mnode->nvars; i++) {
+          if (mainw->write_failed) break;
+          lives_write_le(fd,&mnode->offs0[i],4,TRUE);
+          lives_write_le(fd,&mnode->scale[i],8,TRUE);
+          lives_write_le(fd,&mnode->offs1[i],4,TRUE);
+
+          lives_write_le(fd,&mnode->min[i],4,TRUE);
+          lives_write_le(fd,&mnode->max[i],4,TRUE);
+
+          lives_write_le(fd,&mnode->matchp[i],4,TRUE);
+          lives_write_le(fd,&mnode->matchi[i],4,TRUE);
+        }
+
+        omacro=omc_macros[mnode->macro];
+
+        for (i=0; i<omacro.nparams; i++) {
+          if (mainw->write_failed) break;
+          lives_write_le(fd,&mnode->map[i],4,TRUE);
+          lives_write_le(fd,&mnode->fvali[i],4,TRUE);
+          lives_write_le(fd,&mnode->fvald[i],8,TRUE);
+        }
+        slist=slist->next;
       }
-      
-      close (fd);
+
+      close(fd);
 
       if (mainw->write_failed) {
-	retval=do_write_failed_error_s_with_retry(save_file,NULL,NULL);
-	if (retval==LIVES_CANCEL) d_print_file_error_failed();
+        retval=do_write_failed_error_s_with_retry(save_file,NULL,NULL);
+        if (retval==LIVES_RESPONSE_CANCEL) d_print_file_error_failed();
       }
     }
-  } while (retval==LIVES_RETRY);
+  } while (retval==LIVES_RESPONSE_RETRY);
 
-  if (retval!=LIVES_CANCEL) d_print_done();
+  if (retval!=LIVES_RESPONSE_CANCEL) d_print_done();
 
-  g_free (save_file);
+  lives_free(save_file);
 
 }
 
 
-static void omc_node_list_free(GSList *slist) {
+static void omc_node_list_free(LiVESSList *slist) {
   while (slist!=NULL) {
     omc_match_node_free((lives_omc_match_node_t *)slist->data);
     slist=slist->next;
   }
-  g_slist_free(slist);
+  lives_slist_free(slist);
   slist=NULL;
 }
 
 
-static void do_midi_load_error(const gchar *fname) {
-  gchar *msg=g_strdup_printf (_("\n\nError parsing file\n%s\n"),fname);
-  do_blocking_error_dialog (msg);
-  g_free (msg);
+static void do_midi_load_error(const char *fname) {
+  char *msg=lives_strdup_printf(_("\n\nError parsing file\n%s\n"),fname);
+  do_blocking_error_dialog(msg);
+  lives_free(msg);
   d_print_failed();
 }
 
-static void do_midi_version_error(const gchar *fname) {
-  gchar *msg=g_strdup_printf (_("\n\nInvalid version in file\n%s\n"),fname);
-  do_blocking_error_dialog (msg);
-  g_free (msg);
+static void do_midi_version_error(const char *fname) {
+  char *msg=lives_strdup_printf(_("\n\nInvalid version in file\n%s\n"),fname);
+  do_blocking_error_dialog(msg);
+  lives_free(msg);
   d_print_failed();
 }
 
 
 
 
-void on_midi_load_activate (LiVESMenuItem *menuitem, gpointer user_data) {
+void on_midi_load_activate(LiVESMenuItem *menuitem, livespointer user_data) {
   lives_omc_match_node_t *mnode;
   lives_omc_macro_t omacro;
 
   ssize_t bytes;
 
-  gchar tstring[512];
+  char tstring[512];
 
-  gchar *load_file=NULL;
-  gchar *srch;
-  gchar *msg;
+  char *load_file=NULL;
+  char *srch;
 
   uint32_t srchlen,nnodes,macro,nvars,supertype;
   int idx=-1;
@@ -2560,23 +2530,21 @@
 
 #ifdef OMC_MIDI_IMPL
   size_t blen;
-  gchar *tmp;
-#endif 
+  char *tmp;
+#endif
 
   if (user_data==NULL) load_file=choose_file(NULL,NULL,NULL,LIVES_FILE_CHOOSER_ACTION_OPEN,NULL,NULL);
-  else load_file=g_strdup((gchar *)user_data);
+  else load_file=lives_strdup((char *)user_data);
 
   if (load_file==NULL||!strlen(load_file)) return;
 
-  msg=g_strdup_printf(_("Loading device mapping from file %s..."),load_file);
-  d_print(msg);
-  g_free(msg);
+  d_print(_("Loading device mapping from file %s..."),load_file);
 
   if ((fd=open(load_file,O_RDONLY))<0) {
-    msg=g_strdup_printf (_("\n\nUnable to open file\n%s\nError code %d\n"),load_file,errno);
-    do_blocking_error_dialog (msg);
-    g_free (msg);
-    g_free (load_file);
+    char *msg=lives_strdup_printf(_("\n\nUnable to open file\n%s\nError code %d\n"),load_file,errno);
+    do_blocking_error_dialog(msg);
+    lives_free(msg);
+    lives_free(load_file);
     d_print_failed();
     return;
   }
@@ -2590,14 +2558,14 @@
   bytes=read(fd,tstring,strlen(OMC_FILE_VSTRING));
   if (bytes<strlen(OMC_FILE_VSTRING)) {
     do_midi_load_error(load_file);
-    g_free (load_file);
+    lives_free(load_file);
     close(fd);
     return;
   }
 
   if (strncmp(tstring,OMC_FILE_VSTRING,strlen(OMC_FILE_VSTRING))) {
     do_midi_version_error(load_file);
-    g_free (load_file);
+    lives_free(load_file);
     close(fd);
     return;
   }
@@ -2605,7 +2573,7 @@
   bytes=lives_read_le(fd,&nnodes,4,TRUE);
   if (bytes<4) {
     do_midi_load_error(load_file);
-    g_free (load_file);
+    lives_free(load_file);
     close(fd);
     return;
   }
@@ -2615,22 +2583,22 @@
     omc_node_list=NULL;
   }
 
-  for (i=0;i<nnodes;i++) {
+  for (i=0; i<nnodes; i++) {
 
     bytes=lives_read_le(fd,&srchlen,4,TRUE);
     if (bytes<4) {
       do_midi_load_error(load_file);
-      g_free (load_file);
+      lives_free(load_file);
       close(fd);
       return;
     }
-    
-    srch=(gchar *)g_malloc(srchlen+1);
+
+    srch=(char *)lives_malloc(srchlen+1);
 
     bytes=read(fd,srch,srchlen);
     if (bytes<srchlen) {
       do_midi_load_error(load_file);
-      g_free (load_file);
+      lives_free(load_file);
       close(fd);
       return;
     }
@@ -2640,23 +2608,23 @@
     bytes=lives_read_le(fd,&macro,4,TRUE);
     if (bytes<sizint) {
       do_midi_load_error(load_file);
-      g_free (load_file);
-      g_free(srch);
+      lives_free(load_file);
+      lives_free(srch);
       close(fd);
       return;
     }
-    
+
     bytes=lives_read_le(fd,&nvars,4,TRUE);
     if (bytes<4) {
       do_midi_load_error(load_file);
-      g_free (load_file);
-      g_free(srch);
+      lives_free(load_file);
+      lives_free(srch);
       close(fd);
       return;
     }
-    
+
     supertype=atoi(srch);
-    
+
     switch (supertype) {
 #ifdef OMC_JS_IMPL
     case OMC_JS:
@@ -2673,8 +2641,8 @@
       // cut first value (supertype) as we will be added back in match_node_new
       tmp=cut_string_elems(srch,1);
       blen=strlen(tmp);
-      tmp=g_strdup(srch+blen+1);
-      g_free(srch);
+      tmp=lives_strdup(srch+blen+1);
+      lives_free(srch);
       srch=tmp;
 
       break;
@@ -2684,97 +2652,97 @@
     }
 
     mnode=lives_omc_match_node_new(supertype,idx,srch,-(nvars+1));
-    g_free(srch);
+    lives_free(srch);
 
     mnode->macro=macro;
 
-    for (j=0;j<nvars;j++) {
+    for (j=0; j<nvars; j++) {
       bytes=lives_read_le(fd,&mnode->offs0[j],4,TRUE);
       if (bytes<4) {
-	do_midi_load_error(load_file);
-	g_free (load_file);
-	close(fd);
-	return;
+        do_midi_load_error(load_file);
+        lives_free(load_file);
+        close(fd);
+        return;
       }
       bytes=lives_read_le(fd,&mnode->scale[j],8,TRUE);
       if (bytes<8) {
-	do_midi_load_error(load_file);
-	g_free (load_file);
-	close(fd);
-	return;
+        do_midi_load_error(load_file);
+        lives_free(load_file);
+        close(fd);
+        return;
       }
       bytes=lives_read_le(fd,&mnode->offs1[j],4,TRUE);
       if (bytes<4) {
-	do_midi_load_error(load_file);
-	g_free (load_file);
-	close(fd);
-	return;
+        do_midi_load_error(load_file);
+        lives_free(load_file);
+        close(fd);
+        return;
       }
-      
+
       bytes=lives_read_le(fd,&mnode->min[j],4,TRUE);
       if (bytes<4) {
-	do_midi_load_error(load_file);
-	g_free (load_file);
-	close(fd);
-	return;
+        do_midi_load_error(load_file);
+        lives_free(load_file);
+        close(fd);
+        return;
       }
       bytes=lives_read_le(fd,&mnode->max[j],4,TRUE);
       if (bytes<4) {
-	do_midi_load_error(load_file);
-	g_free (load_file);
-	close(fd);
-	return;
+        do_midi_load_error(load_file);
+        lives_free(load_file);
+        close(fd);
+        return;
       }
-      
+
       bytes=lives_read_le(fd,&mnode->matchp[j],4,TRUE);
       if (bytes<4) {
-	do_midi_load_error(load_file);
-	g_free (load_file);
-	close(fd);
-	return;
+        do_midi_load_error(load_file);
+        lives_free(load_file);
+        close(fd);
+        return;
       }
       bytes=lives_read_le(fd,&mnode->matchi[j],4,TRUE);
       if (bytes<4) {
-	do_midi_load_error(load_file);
-	g_free (load_file);
-	close(fd);
-	return;
+        do_midi_load_error(load_file);
+        lives_free(load_file);
+        close(fd);
+        return;
       }
     }
 
     omacro=omc_macros[macro];
 
-    mnode->map=(int *)g_malloc(omacro.nparams*sizint);
-    mnode->fvali=(int *)g_malloc(omacro.nparams*sizint);
-    mnode->fvald=(double *)g_malloc(omacro.nparams*sizdbl);
+    mnode->map=(int *)lives_malloc(omacro.nparams*sizint);
+    mnode->fvali=(int *)lives_malloc(omacro.nparams*sizint);
+    mnode->fvald=(double *)lives_malloc(omacro.nparams*sizdbl);
 
-    for (j=0;j<omacro.nparams;j++) {
+    for (j=0; j<omacro.nparams; j++) {
       bytes=lives_read_le(fd,&mnode->map[j],4,TRUE);
       if (bytes<4) {
-	do_midi_load_error(load_file);
-	g_free (load_file);
-	close(fd);
-	return;
+        do_midi_load_error(load_file);
+        lives_free(load_file);
+        close(fd);
+        return;
       }
       bytes=lives_read_le(fd,&mnode->fvali[j],4,TRUE);
       if (bytes<4) {
-	do_midi_load_error(load_file);
-	g_free (load_file);
-	close(fd);
-	return;
+        do_midi_load_error(load_file);
+        lives_free(load_file);
+        close(fd);
+        return;
       }
       bytes=read(fd,&mnode->fvald[j],8);
       if (bytes<8) {
-	do_midi_load_error(load_file);
-	g_free (load_file);
-	close(fd);
-	return;
+        do_midi_load_error(load_file);
+        lives_free(load_file);
+        close(fd);
+        return;
       }
     }
-    omc_node_list=g_slist_append(omc_node_list,(gpointer)mnode);
+    omc_node_list=lives_slist_append(omc_node_list,(livespointer)mnode);
   }
 
-  close (fd);
+  close(fd);
   d_print_done();

LiVES-2.2.8.tar.bz2/src/omc-learn.h -> LiVES-2.4.1.tar.bz2/src/omc-learn.h Changed

@@ -23,15 +23,15 @@
 
 
 #ifdef OMC_JS_IMPL
-gchar *js_mangle(void);
+char *js_mangle(void);
 boolean js_open(void);
 void js_close(void);
-const gchar *get_js_filename(void);
+const char *get_js_filename(void);
 #endif
 
 #ifdef OMC_MIDI_IMPL
-gchar *midi_mangle(void);
-const gchar *get_midi_filename(void);
+char *midi_mangle(void);
+const char *get_midi_filename(void);
 boolean midi_open(void);
 void midi_close(void);
 #endif
@@ -42,14 +42,14 @@
 #define OMC_PARAM_SPECIAL 128 ///< can be int or double, depending on effect type
 
 typedef struct {
-  gchar *msg;   ///< OSC message
-  gchar *macro_text;  ///< macro text
-  gchar *info_text;  ///< descriptive text
-  gchar *stype_tags;   ///< setter type tags
+  char *msg;   ///< OSC message
+  char *macro_text;  ///< macro text
+  char *info_text;  ///< descriptive text
+  char *stype_tags;   ///< setter type tags
 
   int nparams;
 
-  gchar **pname;
+  char **pname;
 
   int *ptypes;
 
@@ -68,7 +68,7 @@
 
 
 typedef struct {
-  gchar *srch; ///< string to match
+  char *srch; ///< string to match
   int macro; ///< macro number this is linked to (or -1)
 
   int nvars; ///< number of params
@@ -125,7 +125,7 @@
   OFFS2_COLUMN,
   NUM_COLUMNS
 };
- 
+
 
 enum {
   TITLE2_COLUMN,
@@ -147,28 +147,28 @@
 #define OMC_MIDI_PGM_CHANGE 133
 
 /// start learning MIDI inputs
-void on_midi_learn_activate (LiVESMenuItem *, gpointer);
+void on_midi_learn_activate(LiVESMenuItem *, livespointer);
 
 /// process a string (i.e. convert to an OSC message and pass to OSC subsys)
 /// only need to set omclw if learn is TRUE
-boolean omc_process_string(int supertype, const gchar *string, boolean learn, omclearn_w *omclw);
+boolean omc_process_string(int supertype, const char *string, boolean learn, omclearn_w *omclw);
 
 
 
 #define OMC_FILE_VSTRING "LiVES OMC map version 1.0"
 
-void on_midi_save_activate (LiVESMenuItem *, gpointer);
-void on_midi_load_activate (LiVESMenuItem *, gpointer);
+void on_midi_save_activate(LiVESMenuItem *, livespointer);
+void on_midi_load_activate(LiVESMenuItem *, livespointer);
 
 
 #include "osc.h"
 
 
 #define OSC_BUF_SIZE 1024
-#define OSC_MAX_TYPETAGS 64 
+#define OSC_MAX_TYPETAGS 64
 
 /// decode learnt behaviours
-OSCbuf *omc_learner_decode(int type, int index, const gchar *string);
+OSCbuf *omc_learner_decode(int type, int index, const char *string);
 
 
 #endif // HAS_LIVES_OMC_LEARN_H

LiVES-2.2.8.tar.bz2/src/osc.c -> LiVES-2.4.1.tar.bz2/src/osc.c Changed

@@ -1,7 +1,6 @@
-
 // osc.c
 // LiVES (lives-exe)
-// (c) G. Finch 2004 - 2013 <salsaman@gmail.com>
+// (c) G. Finch 2004 - 2015 <salsaman@gmail.com>
 // Released under the GPL 3 or later
 // see file ../COPYING for licensing details
 
@@ -35,6 +34,7 @@
 #include "resample.h"
 #include "paramwindow.h"
 #include "ce_thumbs.h"
+#include "lbindings.h"
 
 void *status_socket;
 void *notify_socket;
@@ -52,31 +52,34 @@
 #define FX_MAX FX_KEYS_MAX_VIRTUAL-1
 
 
+static boolean osc_playall(livespointer data) {
+  on_playall_activate(NULL,NULL);
+  return FALSE;
+}
+
+static boolean osc_init_generator(livespointer data) {
+  // do this via an idle function, as it will trigger playback and hang
+  rte_on_off_callback_hook(NULL,data);
+  return FALSE;
+}
+
 
 /* convert a big endian 32 bit string to an int for internal use */
 
-static int toInt(const char* b) {
+static int toInt(const char *b) {
   if (capable->byte_order==LIVES_LITTLE_ENDIAN) {
-    return (( (int) b[3] ) & 0xff ) + ((((int) b[2]) & 0xff) << 8) + ((((int) b[1]) & 0xff) << 16) +
-      ((((int) b[0] ) & 0xff) << 24);
+    return (((int) b[3]) & 0xff) + ((((int) b[2]) & 0xff) << 8) + ((((int) b[1]) & 0xff) << 16) +
+           ((((int) b[0]) & 0xff) << 24);
   }
-  return (( (int) b[0] ) & 0xff ) + ((((int) b[1]) & 0xff) << 8) + ((((int) b[2]) & 0xff) << 16) +
-    ((((int) b[3] ) & 0xff) << 24);
+  return (((int) b[0]) & 0xff) + ((((int) b[1]) & 0xff) << 8) + ((((int) b[2]) & 0xff) << 16) +
+         ((((int) b[3]) & 0xff) << 24);
 }
 
 
-// wrapper for correct typing
-static LIVES_INLINE void *lives_size_malloc(int size) {
-  return lives_malloc((size_t)size);
-}
-
 static boolean using_types;
 static int osc_header_len;
 static int offset;
 
-static LIVES_INLINE G_GNUC_CONST int pad4(int val) {
-  return (int)((val+4)/4)*4;
-}
 
 static int lives_osc_get_num_arguments(const void *vargs) {
   // check if using type tags and get num_arguments
@@ -102,7 +105,7 @@
   header_len=pad4(strlen(check_pattern)+1);
 
   if (arglen<header_len) return FALSE;
-  if (!strncmp (check_pattern,++args,strlen (check_pattern))) {
+  if (!strncmp(check_pattern,++args,strlen(check_pattern))) {
     if (calc_header_len) osc_header_len=header_len;
     return TRUE;
   }
@@ -120,26 +123,23 @@
 
 
 
-static void lives_osc_parse_string_argument(const void *vargs, char *dst)
-{
-  const char *args = (char*)vargs;
-  g_snprintf(dst, OSC_STRING_SIZE, "%s", args+osc_header_len+offset);
-  offset+=pad4(strlen (dst));
+static void lives_osc_parse_string_argument(const void *vargs, char *dst) {
+  const char *args = (char *)vargs;
+  lives_snprintf(dst, OSC_STRING_SIZE, "%s", args+osc_header_len+offset);
+  offset+=pad4(strlen(dst));
 }
 
 
 
-static void lives_osc_parse_int_argument(const void *vargs, int *arguments)
-{
-  const char *args = (char*)vargs;
-  arguments[0] = toInt( args + osc_header_len + offset );
+static void lives_osc_parse_int_argument(const void *vargs, int *arguments) {
+  const char *args = (char *)vargs;
+  arguments[0] = toInt(args + osc_header_len + offset);
   offset+=4;
 }
 
-static void lives_osc_parse_float_argument(const void *vargs, float *arguments)
-{
-  const char *args = (char*)vargs;
-  arguments[0] = LEFloat_to_BEFloat( *((float*)(args + osc_header_len + offset)) );
+static void lives_osc_parse_float_argument(const void *vargs, float *arguments) {
+  const char *args = (char *)vargs;
+  arguments[0] = LEFloat_to_BEFloat(*((float *)(args + osc_header_len + offset)));
   offset+=4;
 }
 
@@ -149,55 +149,50 @@
 
 
 /* memory allocation functions of libOMC_dirty (OSC) */
-
-
-void *_lives_osc_time_malloc(int num_bytes) {
-  return g_malloc( num_bytes );
-}
-
-void *_lives_osc_rt_malloc(int num_bytes) {
-  return g_malloc( num_bytes );
+void *lives_osc_malloc(int num_bytes) {
+  return _lives_malloc(num_bytes);
 }
 
 
 // status returns
 
-boolean lives_status_send (const char *msgstring) {
+boolean lives_status_send(const char *msg) {
   if (status_socket==NULL) return FALSE;
   else {
-    char *msg=g_strdup_printf("%s\n",msgstring);
-    boolean retval = lives_stream_out (status_socket,strlen (msg)+1,(void *)msg);
-    g_free(msg);
+    // note we send the terminating \nul
+    boolean retval = lives_stream_out(status_socket,strlen(msg)+1,(void *)msg);
     return retval;
   }
 }
 
 
-boolean lives_osc_notify (int msgnumber,const char *msgstring) {
+
+boolean lives_osc_notify(int msgnumber,const char *msgstring) {
   if (notify_socket==NULL) return FALSE;
   if (!prefs->omc_events&&(msgnumber!=LIVES_OSC_NOTIFY_SUCCESS
-			   &&msgnumber!=LIVES_OSC_NOTIFY_FAILED)) return FALSE;
+                           &&msgnumber!=LIVES_OSC_NOTIFY_FAILED)) return FALSE;
   else {
     char *msg;
     boolean retval;
     if (msgstring!=NULL) {
-      msg=g_strdup_printf("%d|%s\n",msgnumber,msgstring);
-    }
-    else msg=g_strdup_printf("%d\n",msgnumber);
-    retval = lives_stream_out (notify_socket,strlen (msg)+1,(void *)msg);
-    g_free(msg);
+      msg=lives_strdup_printf("%d|%s\n",msgnumber,msgstring);
+    } else msg=lives_strdup_printf("%d\n",msgnumber);
+    retval = lives_stream_out(notify_socket,strlen(msg)+1,(void *)msg);
+    lives_free(msg);
     return retval;
   }
 }
 
-void lives_osc_notify_success (const char *msg) {
+boolean lives_osc_notify_success(const char *msg) {
   if (prefs->omc_noisy)
     lives_osc_notify(LIVES_OSC_NOTIFY_SUCCESS,msg);
+  return TRUE;
 }
 
-void lives_osc_notify_failure (void) {
+boolean lives_osc_notify_failure(void) {
   if (prefs->omc_noisy)
     lives_osc_notify(LIVES_OSC_NOTIFY_FAILED,NULL);
+  return FALSE;
 }
 
 /* unused */
@@ -209,13 +204,13 @@
 
 
 
-void lives_osc_close_status_socket (void) {
-  if (status_socket!=NULL) CloseHTMSocket (status_socket);
+void lives_osc_close_status_socket(void) {
+  if (status_socket!=NULL) CloseHTMSocket(status_socket);
   status_socket=NULL;
 }
 
-void lives_osc_close_notify_socket (void) {
-  if (notify_socket!=NULL) CloseHTMSocket (notify_socket);
+void lives_osc_close_notify_socket(void) {
+  if (notify_socket!=NULL) CloseHTMSocket(notify_socket);
   notify_socket=NULL;
 }
 
@@ -233,34 +228,41 @@
 static const char *get_omc_const(const char *cname) {
 
   // looping modes
-  if (!strcmp(cname,"LIVES_LOOP_NONE")) return "0";
-  if (!strcmp(cname,"LIVES_LOOP_FIT")) return "2";
-  if (!strcmp(cname,"LIVES_LOOP_CONT")) return "1";
+  if (!strcmp(cname,"LIVES_LOOP_MODE_NONE")) return "0";
+  if (!strcmp(cname,"LIVES_LOOP_MODE_CONTINUOUS")) return "1";
+  if (!strcmp(cname,"LIVES_LOOP_MODE_FIT_AUDIO")) return "2";
 
   // interface modes
-  if (!strcmp(cname,"LIVES_MODE_CLIPEDIT")) return "0";
-  if (!strcmp(cname,"LIVES_MODE_MULTITRACK")) return "1";
+  if (!strcmp(cname,"LIVES_INTERFACE_MODE_CLIPEDIT")) return "0";
+  if (!strcmp(cname,"LIVES_INTERFACE_MODE_MULTITRACK")) return "1";
+
+  // status
+  if (!strcmp(cname,"LIVES_STATUS_NOTREADY")) return "0";
+  if (!strcmp(cname,"LIVES_STATUS_READY")) return "1";
+  if (!strcmp(cname,"LIVES_STATUS_PLAYING")) return "2";
+  if (!strcmp(cname,"LIVES_STATUS_PROCESSING")) return "3";
+  if (!strcmp(cname,"LIVES_STATUS_PREVIEW")) return "4";
 
   // parameter types
-  if (!strcmp(cname,"LIVES_PARAM_TYPE_INTEGER")) 
+  if (!strcmp(cname,"LIVES_PARAM_TYPE_INTEGER"))
     return get_value_of((const int)WEED_HINT_INTEGER);
-  if (!strcmp(cname,"LIVES_PARAM_TYPE_FLOAT")) 
+  if (!strcmp(cname,"LIVES_PARAM_TYPE_FLOAT"))
     return get_value_of((const int)WEED_HINT_FLOAT);
-  if (!strcmp(cname,"LIVES_PARAM_TYPE_BOOL")) 
+  if (!strcmp(cname,"LIVES_PARAM_TYPE_BOOL"))
     return get_value_of((const int)WEED_HINT_SWITCH);
-  if (!strcmp(cname,"LIVES_PARAM_TYPE_STRING")) 
+  if (!strcmp(cname,"LIVES_PARAM_TYPE_STRING"))
     return get_value_of((const int)WEED_HINT_TEXT);
-  if (!strcmp(cname,"LIVES_PARAM_TYPE_COLOR")) 
+  if (!strcmp(cname,"LIVES_PARAM_TYPE_COLOR"))
     return get_value_of((const int)WEED_HINT_COLOR);
 
   // colorspaces
-  if (!strcmp(cname,"LIVES_COLORSPACE_RGB_INT")) 
+  if (!strcmp(cname,"LIVES_COLORSPACE_RGB_INT"))
     return "1";
-  if (!strcmp(cname,"LIVES_COLORSPACE_RGBA_INT")) 
+  if (!strcmp(cname,"LIVES_COLORSPACE_RGBA_INT"))
     return "2";
-  if (!strcmp(cname,"LIVES_COLORSPACE_RGB_FLOAT")) 
+  if (!strcmp(cname,"LIVES_COLORSPACE_RGB_FLOAT"))
     return "3";
-  if (!strcmp(cname,"LIVES_COLORSPACE_RGBA_FLOAT")) 
+  if (!strcmp(cname,"LIVES_COLORSPACE_RGBA_FLOAT"))
     return "4";
 
   // boolean values
@@ -268,7 +270,7 @@
   if (!strcmp(cname,"LIVES_FALSE")) return "0";
 
   // parameter flags
-  if (!strcmp(cname,"LIVES_PARAM_FLAGS_REINIT_ON_VALUE_CHANGE")) 
+  if (!strcmp(cname,"LIVES_PARAM_FLAGS_REINIT_ON_VALUE_CHANGE"))
     return get_value_of((const int)WEED_PARAMETER_REINIT_ON_VALUE_CHANGE);
   if (!strcmp(cname,"LIVES_PARAM_FLAGS_VARIABLE_ELEMENTS"))
     return get_value_of((const int)WEED_PARAMETER_VARIABLE_ELEMENTS);
@@ -276,15 +278,15 @@
     return get_value_of((const int)WEED_PARAMETER_ELEMENT_PER_CHANNEL);
 
   // notification types
-  if (!strcmp(cname,"LIVES_OSC_NOTIFY_SUCCESS")) 
+  if (!strcmp(cname,"LIVES_OSC_NOTIFY_SUCCESS"))
     return get_value_of((const int)LIVES_OSC_NOTIFY_SUCCESS);
-  if (!strcmp(cname,"LIVES_OSC_NOTIFY_FAILED")) 
+  if (!strcmp(cname,"LIVES_OSC_NOTIFY_FAILED"))
     return get_value_of((const int)LIVES_OSC_NOTIFY_FAILED);
 
   // notification events
-  if (!strcmp(cname,"LIVES_OSC_NOTIFY_FRAME_SYNCH")) 
+  if (!strcmp(cname,"LIVES_OSC_NOTIFY_FRAME_SYNCH"))
     return get_value_of((const int)LIVES_OSC_NOTIFY_FRAME_SYNCH);
-  if (!strcmp(cname,"LIVES_OSC_NOTIFY_PLAYBACK_STARTED")) 
+  if (!strcmp(cname,"LIVES_OSC_NOTIFY_PLAYBACK_STARTED"))
     return get_value_of((const int)LIVES_OSC_NOTIFY_PLAYBACK_STARTED);
   if (!strcmp(cname,"LIVES_OSC_NOTIFY_PLAYBACK_STOPPED"))
     return get_value_of((const int)LIVES_OSC_NOTIFY_PLAYBACK_STOPPED);
@@ -296,7 +298,7 @@
     return get_value_of((const int)LIVES_OSC_NOTIFY_RECORD_STOPPED);
   if (!strcmp(cname,"LIVES_OSC_NOTIFY_QUIT"))
     return get_value_of((const int)LIVES_OSC_NOTIFY_QUIT);
-  if (!strcmp(cname,"LIVES_OSC_NOTIFY_CLIP_OPENED")) 
+  if (!strcmp(cname,"LIVES_OSC_NOTIFY_CLIP_OPENED"))
     return get_value_of((const int)LIVES_OSC_NOTIFY_CLIP_OPENED);
   if (!strcmp(cname,"LIVES_OSC_NOTIFY_CLIP_CLOSED"))
     return get_value_of((const int)LIVES_OSC_NOTIFY_CLIP_CLOSED);
@@ -314,10 +316,10 @@
     return get_value_of((const int)LIVES_OSC_NOTIFY_MODE_CHANGED);
 
   // generic constants
-  if (!strcmp(cname,"LIVES_FPS_MAX")) 
+  if (!strcmp(cname,"LIVES_FPS_MAX"))
     return get_value_of((const int)FPS_MAX);
 
-  if (!strcmp(cname,"LIVES_DEFAULT_OVERRIDDEN")) 
+  if (!strcmp(cname,"LIVES_DEFAULT_OVERRIDDEN"))
     return "2";
 
   lives_osc_notify_failure();
@@ -334,73 +336,69 @@
 
   if (end==-1) end=weed_leaf_num_elements(plant,key);
 
-  if (end<=st) return g_strdup("");
+  if (end<=st) return lives_strdup("");
 
   stype=weed_leaf_seed_type(plant,key);
 
   switch (stype) {
-  case WEED_SEED_INT:
-    {
-      int *vals=weed_get_int_array(plant,key,&error);
-      for (i=st;i<end;i++) {
-	if (retval==NULL) tmp=g_strdup_printf("%d",vals[i]);
-	else {
-	  tmp=g_strdup_printf("%s,%d",retval,vals[i]);
-	  g_free(retval);
-	}
-	retval=tmp;
+  case WEED_SEED_INT: {
+    int *vals=weed_get_int_array(plant,key,&error);
+    for (i=st; i<end; i++) {
+      if (retval==NULL) tmp=lives_strdup_printf("%d",vals[i]);
+      else {
+        tmp=lives_strdup_printf("%s,%d",retval,vals[i]);
+        lives_free(retval);
       }
-      weed_free(vals);
-      break;
+      retval=tmp;
     }
+    lives_free(vals);
+    break;
+  }
 
-  case WEED_SEED_DOUBLE:
-    {
-      double *vals=weed_get_double_array(plant,key,&error);
-      for (i=st;i<end;i++) {
-	if (retval==NULL) tmp=g_strdup_printf("%f",vals[i]);
-	else {
-	  tmp=g_strdup_printf("%s,%f",retval,vals[i]);
-	  g_free(retval);
-	}
-	retval=tmp;
+  case WEED_SEED_DOUBLE: {
+    double *vals=weed_get_double_array(plant,key,&error);
+    for (i=st; i<end; i++) {
+      if (retval==NULL) tmp=lives_strdup_printf("%f",vals[i]);
+      else {
+        tmp=lives_strdup_printf("%s,%f",retval,vals[i]);
+        lives_free(retval);
       }
-      weed_free(vals);
-      break;
+      retval=tmp;
     }
+    lives_free(vals);
+    break;
+  }
 
-  case WEED_SEED_BOOLEAN:
-    {
-      int *vals=weed_get_boolean_array(plant,key,&error);
-      for (i=st;i<end;i++) {
-	if (retval==NULL) tmp=g_strdup_printf("%d",vals[i]==WEED_TRUE);
-	else {
-	  tmp=g_strdup_printf("%s,%d",retval,vals[i]==WEED_TRUE);
-	  g_free(retval);
-	}
-	retval=tmp;
+  case WEED_SEED_BOOLEAN: {
+    int *vals=weed_get_boolean_array(plant,key,&error);
+    for (i=st; i<end; i++) {
+      if (retval==NULL) tmp=lives_strdup_printf("%d",vals[i]==WEED_TRUE);
+      else {
+        tmp=lives_strdup_printf("%s,%d",retval,vals[i]==WEED_TRUE);
+        lives_free(retval);
       }
-      weed_free(vals);
-      break;
+      retval=tmp;
     }
+    lives_free(vals);
+    break;
+  }
 
-  case WEED_SEED_STRING:
-    {
-      char **vals=weed_get_string_array(plant,key,&error);
-      char *tmp2;
-      for (i=st;i<end;i++) {
-	if (retval==NULL) tmp=g_strdup_printf("\"%s\"",(tmp2=subst(vals[i],"\"","\\\"")));
-	else {
-	  tmp=g_strdup_printf("%s,\"%s\"",retval,(tmp2=subst(vals[i],"\"","\\\"")));
-	  g_free(retval);
-	}
-	g_free(tmp2);
-	retval=tmp;
-	weed_free(vals[i]);
+  case WEED_SEED_STRING: {
+    char **vals=weed_get_string_array(plant,key,&error);
+    char *tmp2;
+    for (i=st; i<end; i++) {
+      if (retval==NULL) tmp=lives_strdup_printf("\"%s\"",(tmp2=subst(vals[i],"\"","\\\"")));
+      else {
+        tmp=lives_strdup_printf("%s,\"%s\"",retval,(tmp2=subst(vals[i],"\"","\\\"")));
+        lives_free(retval);
       }
-      weed_free(vals);
-      break;
+      lives_free(tmp2);
+      retval=tmp;
+      lives_free(vals[i]);
     }
+    lives_free(vals);
+    break;
+  }
   }
   return retval;
 }
@@ -415,136 +413,124 @@
 ///////////////////////////////////// CALLBACKS FOR OSC ////////////////////////////////////////
 // TODO - handle clipboard playback
 
-void lives_osc_cb_test(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
-  int val=lives_osc_get_num_arguments (vargs);
-  g_printerr("got %d\n",val);
+boolean lives_osc_cb_test(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+  int val=lives_osc_get_num_arguments(vargs);
+  lives_printerr("got %d\n",val);
+  return TRUE;
 }
 
 /* /video/play */
-void lives_osc_cb_play (void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_play(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   float ent, stt;
   double entd,sttd;
 
   if (mainw->go_away) return lives_osc_notify_failure();
-  mainw->osc_auto=TRUE; ///< request early notifiction of success
+  mainw->osc_auto=1; ///< request early notifiction of success
 
   if (mainw->current_file<=0||mainw->playing_file!=-1) return lives_osc_notify_failure();
 
   mainw->play_start=calc_frame_from_time(mainw->current_file,
-					 cfile->pointer_time);
+                                         cfile->pointer_time);
   mainw->play_end=cfile->frames;
 
-  if (!lives_osc_check_arguments (arglen,vargs,"ff",FALSE)) {
-    if (!lives_osc_check_arguments (arglen,vargs,"f",FALSE)) {
-      if (!lives_osc_check_arguments (arglen,vargs,"",FALSE)) {
-	return lives_osc_notify_failure();
+  if (!lives_osc_check_arguments(arglen,vargs,"ff",FALSE)) {
+    if (!lives_osc_check_arguments(arglen,vargs,"f",FALSE)) {
+      if (!lives_osc_check_arguments(arglen,vargs,"",FALSE)) {
+        return lives_osc_notify_failure();
       }
-    }
-    else {
-      lives_osc_check_arguments (arglen,vargs,"f",TRUE);
+    } else {
+      lives_osc_check_arguments(arglen,vargs,"f",TRUE);
       lives_osc_parse_float_argument(vargs,&stt);
       sttd=(double)stt;
       mainw->play_start=calc_frame_from_time(mainw->current_file,
-					     sttd);
+                                             sttd);
     }
-  }
-  else{
-    lives_osc_check_arguments (arglen,vargs,"ff",TRUE);
+  } else {
+    lives_osc_check_arguments(arglen,vargs,"ff",TRUE);
     lives_osc_parse_float_argument(vargs,&stt);
     lives_osc_parse_float_argument(vargs,&ent);
     sttd=(double)stt;
     entd=(double)ent;
     mainw->play_end=calc_frame_from_time(mainw->current_file,
-					 entd);
+                                         entd);
     mainw->play_start=calc_frame_from_time(mainw->current_file,
-					   sttd);
+                                           sttd);
 
 
   }
 
-  // re - add the timer, as we will hang here, and we want to receive messages still during playback
-  lives_timer_remove (mainw->kb_timer);
-  mainw->kb_timer=lives_timer_add(KEY_RPT_INTERVAL,&ext_triggers_poll,NULL);
-  on_playall_activate(NULL,NULL);
-  mainw->kb_timer_end=TRUE;
+  lives_idle_add(osc_playall,NULL);
 
-  mainw->osc_auto=FALSE;
+  return lives_osc_notify_success(NULL);
 }
 
-void lives_osc_cb_playsel (void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_playsel(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   if (mainw->go_away) return lives_osc_notify_failure();
   if (mainw->playing_file==-1&&mainw->current_file>0) {
-    mainw->osc_auto=TRUE; ///< request early notifiction of success
+    mainw->osc_auto=1; ///< request early notifiction of success
 
     // re - add the timer, as we will hang here, and we want to receive messages still during playback
-    lives_timer_remove (mainw->kb_timer);
+    lives_timer_remove(mainw->kb_timer);
     mainw->kb_timer=lives_timer_add(KEY_RPT_INTERVAL,&ext_triggers_poll,NULL);
 
     if (mainw->multitrack==NULL) on_playsel_activate(NULL,NULL);
     else multitrack_play_sel(NULL, mainw->multitrack);
     mainw->kb_timer_end=TRUE;
-    mainw->osc_auto=FALSE; ///< request early notifiction of success
+    mainw->osc_auto=0; ///< request early notifiction of success
   }
+  return TRUE;
 }
 
-void lives_osc_cb_play_reverse(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_play_reverse(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
 
   if (mainw->multitrack!=NULL) return lives_osc_notify_failure();
-  if (mainw->current_file<0||((cfile->clip_type!=CLIP_TYPE_DISK&&cfile->clip_type!=CLIP_TYPE_FILE)||mainw->playing_file==-1)) 
+  if (mainw->current_file<0||((cfile->clip_type!=CLIP_TYPE_DISK&&cfile->clip_type!=CLIP_TYPE_FILE)||mainw->playing_file==-1))
     if (mainw->playing_file==-1) lives_osc_notify_failure();
   dirchange_callback(NULL,NULL,0,(LiVESXModifierType)0,LIVES_INT_TO_POINTER(TRUE));
-  lives_osc_notify_success(NULL);
+  return lives_osc_notify_success(NULL);
 
 }
 
 
-void lives_osc_cb_bgplay_reverse(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_bgplay_reverse(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
 
   if (mainw->multitrack!=NULL) return lives_osc_notify_failure();
-  if (mainw->blend_file<1||mainw->files[mainw->blend_file]==NULL||mainw->blend_file==mainw->current_file||mainw->playing_file==-1) 
+  if (mainw->blend_file<1||mainw->files[mainw->blend_file]==NULL||mainw->blend_file==mainw->current_file||mainw->playing_file==-1)
     if (mainw->playing_file==-1) lives_osc_notify_failure();
 
   if (mainw->current_file<0||(mainw->files[mainw->blend_file]->clip_type!=CLIP_TYPE_DISK&&
-			      mainw->files[mainw->blend_file]->clip_type!=CLIP_TYPE_FILE)) 
+                              mainw->files[mainw->blend_file]->clip_type!=CLIP_TYPE_FILE))
     if (mainw->playing_file==-1) lives_osc_notify_failure();
 
   mainw->files[mainw->blend_file]->pb_fps=-mainw->files[mainw->blend_file]->pb_fps;
-                                                                                                                          
-  lives_osc_notify_success(NULL);
-                                                                                             
+
+  return lives_osc_notify_success(NULL);
+
 }
 
 
-void lives_osc_cb_play_forward (void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_play_forward(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   if (mainw->go_away) lives_osc_notify_failure(); // not ready to play yet
 
-  if (mainw->current_file<0||(cfile->clip_type!=CLIP_TYPE_DISK&&cfile->clip_type!=CLIP_TYPE_FILE)) 
+  if (mainw->current_file<0||(cfile->clip_type!=CLIP_TYPE_DISK&&cfile->clip_type!=CLIP_TYPE_FILE))
     if (mainw->playing_file==1) lives_osc_notify_failure();
 
   if (mainw->playing_file==-1&&mainw->current_file>0) {
-    mainw->osc_auto=TRUE; ///< request early notifiction of success
-
-    // re - add the timer, as we will hang here, and we want to receive messages still during playback
-    lives_timer_remove (mainw->kb_timer);
-    mainw->kb_timer=lives_timer_add(KEY_RPT_INTERVAL,&ext_triggers_poll,NULL);
-
-    on_playall_activate(NULL,NULL);
-
-    mainw->kb_timer_end=TRUE;
-    mainw->osc_auto=FALSE;
-  }
-  else if (mainw->current_file>0) {
-    if (cfile->pb_fps<0||(cfile->play_paused&&cfile->freeze_fps<0)) 
+    lives_idle_add(osc_playall,NULL);
+    return lives_osc_notify_success(NULL);
+  } else if (mainw->current_file>0) {
+    if (cfile->pb_fps<0||(cfile->play_paused&&cfile->freeze_fps<0))
       dirchange_callback(NULL,NULL,0,(LiVESXModifierType)0,LIVES_INT_TO_POINTER(TRUE));
     if (cfile->play_paused) freeze_callback(NULL,NULL,0,(LiVESXModifierType)0,NULL);
-    lives_osc_notify_success(NULL);
+    return lives_osc_notify_success(NULL);
   }
-  else lives_osc_notify_failure();
+
+  return lives_osc_notify_failure();
 
 }
 
 
-void lives_osc_cb_play_backward (void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_play_backward(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   if (mainw->go_away) lives_osc_notify_failure();
   if (mainw->multitrack!=NULL) return lives_osc_notify_failure();
 
@@ -552,41 +538,32 @@
 
   if (mainw->playing_file==-1&&mainw->current_file>0) {
     mainw->reverse_pb=TRUE;
-
-    // re - add the timer, as we will hang here, and we want to receive messages still during playback
-    lives_timer_remove (mainw->kb_timer);
-    mainw->kb_timer=lives_timer_add(KEY_RPT_INTERVAL,&ext_triggers_poll,NULL);
-
-    mainw->osc_auto=TRUE; ///< request early notifiction of success
-
-    on_playall_activate(NULL,NULL);
-
-    mainw->kb_timer_end=TRUE;
-    mainw->osc_auto=FALSE;
-  }
-  else if (mainw->current_file>0) {
-    if (cfile->pb_fps>0||(cfile->play_paused&&cfile->freeze_fps>0)) 
+    lives_idle_add(osc_playall,NULL);
+    return lives_osc_notify_success(NULL);
+  } else if (mainw->current_file>0) {
+    if (cfile->pb_fps>0||(cfile->play_paused&&cfile->freeze_fps>0))
       dirchange_callback(NULL,NULL,0,(LiVESXModifierType)0,LIVES_INT_TO_POINTER(TRUE));
     if (cfile->play_paused) freeze_callback(NULL,NULL,0,(LiVESXModifierType)0,NULL);
-    lives_osc_notify_success(NULL);
+    return lives_osc_notify_success(NULL);
   }
-  else lives_osc_notify_failure();
+
+  return lives_osc_notify_failure();
 
 }
 
 
-void lives_osc_cb_play_faster (void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_play_faster(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
 
   if (mainw->multitrack!=NULL) return lives_osc_notify_failure();
   if (mainw->playing_file==-1) return lives_osc_notify_failure();
 
   on_faster_pressed(NULL,LIVES_INT_TO_POINTER(1));
-  lives_osc_notify_success(NULL);
+  return lives_osc_notify_success(NULL);
 
 }
 
 
-void lives_osc_cb_bgplay_faster (void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_bgplay_faster(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
 
   if (mainw->multitrack!=NULL) return lives_osc_notify_failure();
   if (mainw->playing_file==-1) return lives_osc_notify_failure();
@@ -594,23 +571,23 @@
   if (mainw->blend_file<1||mainw->files[mainw->blend_file]==NULL||mainw->blend_file==mainw->current_file) return lives_osc_notify_failure();
 
   on_faster_pressed(NULL,LIVES_INT_TO_POINTER(2));
-  lives_osc_notify_success(NULL);
+  return lives_osc_notify_success(NULL);
 
 }
 
 
-void lives_osc_cb_play_slower (void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_play_slower(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
 
   if (mainw->multitrack!=NULL) return lives_osc_notify_failure();
   if (mainw->playing_file==-1) return lives_osc_notify_failure();
 
   on_slower_pressed(NULL,LIVES_INT_TO_POINTER(1));
-  lives_osc_notify_success(NULL);
+  return lives_osc_notify_success(NULL);
 
 }
 
 
-void lives_osc_cb_bgplay_slower (void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_bgplay_slower(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
 
   if (mainw->multitrack!=NULL) return lives_osc_notify_failure();
   if (mainw->playing_file==-1) return lives_osc_notify_failure();
@@ -618,27 +595,28 @@
   if (mainw->blend_file<1||mainw->files[mainw->blend_file]==NULL||mainw->blend_file==mainw->current_file) return lives_osc_notify_failure();
 
   on_slower_pressed(NULL,LIVES_INT_TO_POINTER(2));
-  lives_osc_notify_success(NULL);
+  return lives_osc_notify_success(NULL);
 
 }
 
 
 
-void lives_osc_cb_play_reset (void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_play_reset(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
 
   if (mainw->multitrack!=NULL) return lives_osc_notify_failure();
   if (mainw->playing_file==-1) return lives_osc_notify_failure();
 
   fps_reset_callback(NULL,NULL,0,(LiVESXModifierType)0,NULL);
-  if (cfile->pb_fps<0||(cfile->play_paused&&cfile->freeze_fps<0)) dirchange_callback(NULL,NULL,0,(LiVESXModifierType)0,LIVES_INT_TO_POINTER(TRUE));
+  if (cfile->pb_fps<0||(cfile->play_paused&&
+                        cfile->freeze_fps<0)) dirchange_callback(NULL,NULL,0,(LiVESXModifierType)0,LIVES_INT_TO_POINTER(TRUE));
   if (cfile->play_paused) freeze_callback(NULL,NULL,0,(LiVESXModifierType)0,NULL);
 
-  lives_osc_notify_success(NULL);
+  return lives_osc_notify_success(NULL);
 
 }
 
 
-void lives_osc_cb_bgplay_reset (void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_bgplay_reset(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
 
   if (mainw->multitrack!=NULL) return lives_osc_notify_failure();
   if (mainw->playing_file==-1) return lives_osc_notify_failure();
@@ -651,7 +629,7 @@
 
   if (mainw->files[mainw->blend_file]->pb_fps>=0.) mainw->files[mainw->blend_file]->pb_fps=mainw->files[mainw->blend_file]->fps;
   else mainw->files[mainw->blend_file]->pb_fps=-mainw->files[mainw->blend_file]->fps;
-  lives_osc_notify_success(NULL);
+  return lives_osc_notify_success(NULL);
 
 }
 
@@ -659,257 +637,262 @@
 
 
 /* /video/stop */
-void lives_osc_cb_stop(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_stop(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   if (mainw->playing_file>-1) {
     on_stop_activate(NULL,NULL); // should send play stop event
-    lives_osc_notify_success(NULL);
-  }
-  else lives_osc_notify_failure();
+    return lives_osc_notify_success(NULL);
+  } else return lives_osc_notify_failure();
 }
 
 
 
-void lives_osc_cb_set_loop(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_set_loop(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   int lmode;
 
-  if (lives_osc_check_arguments (arglen,vargs,"i",FALSE)) {
-    lives_osc_check_arguments (arglen,vargs,"i",TRUE);
+  if (lives_osc_check_arguments(arglen,vargs,"i",FALSE)) {
+    lives_osc_check_arguments(arglen,vargs,"i",TRUE);
     lives_osc_parse_int_argument(vargs,&lmode);
-  }
-  else return lives_osc_notify_failure();
-
-  if (lmode==atoi(get_omc_const("LIVES_LOOP_NONE"))) {
-    if (mainw->loop_cont) on_loop_cont_activate(NULL,NULL);
-    if (mainw->loop) on_loop_video_activate(NULL,NULL);
-  }
-  else {
-    if (lmode & atoi(get_omc_const("LIVES_LOOP_CONT"))) {
-      if (!mainw->loop_cont) on_loop_cont_activate(NULL,NULL);
-    }
-    else if (mainw->loop_cont) on_loop_cont_activate(NULL,NULL);
+  } else return lives_osc_notify_failure();
 
-    if (lmode & atoi(get_omc_const("LIVES_LOOP_FIT"))) {
-      if (mainw->loop) on_loop_video_activate(NULL,NULL);
-    }
-    else if (!mainw->loop) on_loop_video_activate(NULL,NULL);
+  if (lmode==atoi(get_omc_const("LIVES_LOOP_MODE_NONE"))) {
+    if (mainw->loop_cont) on_loop_button_activate(NULL,NULL);
+    if (mainw->loop) lives_check_menu_item_set_active(LIVES_CHECK_MENU_ITEM(mainw->loop_video),!mainw->loop);
+  } else {
+    if (lmode & atoi(get_omc_const("LIVES_LOOP_MODE_CONTINUOUS"))) {
+      if (!mainw->loop_cont) on_loop_button_activate(NULL,NULL);
+    } else if (mainw->loop_cont) on_loop_button_activate(NULL,NULL);
+
+    if (lmode & atoi(get_omc_const("LIVES_LOOP_MODE_FIT_AUDIO"))) {
+      if (mainw->loop) lives_check_menu_item_set_active(LIVES_CHECK_MENU_ITEM(mainw->loop_video),!mainw->loop);
+    } else if (!mainw->loop) lives_check_menu_item_set_active(LIVES_CHECK_MENU_ITEM(mainw->loop_video),!mainw->loop);
   }
 
-  lives_osc_notify_success(NULL);
+  return lives_osc_notify_success(NULL);
 
 }
 
 
 
 
-void lives_osc_cb_get_loop(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_get_loop(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   int lmode=0;
   char *lmodes;
 
-  if (mainw->loop) lmode|=atoi(get_omc_const("LIVES_LOOP_FIT"));
-  if (mainw->loop_cont) lmode|=atoi(get_omc_const("LIVES_LOOP_CONT"));
+  if (mainw->loop) lmode|=atoi(get_omc_const("LIVES_LOOP_MODE_FIT_AUDIO"));
+  if (mainw->loop_cont) lmode|=atoi(get_omc_const("LIVES_LOOP_MODE_CONTINUOUS"));
 
-  lmodes=g_strdup_printf("%d",lmode);
+  lmodes=lives_strdup_printf("%d",lmode);
   lives_status_send(lmodes);
-  g_free(lmodes);
-
+  lives_free(lmodes);
+  return TRUE;
 }
 
 
-void lives_osc_cb_set_pingpong(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_set_pingpong(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   int lmode;
 
-  if (lives_osc_check_arguments (arglen,vargs,"i",FALSE)) {
-    lives_osc_check_arguments (arglen,vargs,"i",TRUE);
+  if (lives_osc_check_arguments(arglen,vargs,"i",FALSE)) {
+    lives_osc_check_arguments(arglen,vargs,"i",TRUE);
     lives_osc_parse_int_argument(vargs,&lmode);
-  }
-  else return lives_osc_notify_failure();
+  } else return lives_osc_notify_failure();
 
-  if ((lmode && !mainw->ping_pong) || (!lmode && mainw->ping_pong)) on_ping_pong_activate(NULL,NULL);
+  if ((lmode && !mainw->ping_pong) || (!lmode && mainw->ping_pong))
+    lives_check_menu_item_set_active(LIVES_CHECK_MENU_ITEM(mainw->loop_ping_pong),!mainw->ping_pong);
 
-  lives_osc_notify_success(NULL);
+  return lives_osc_notify_success(NULL);
 }
 
 
 
-void lives_osc_cb_get_pingpong(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_get_pingpong(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   if (mainw->ping_pong) lives_status_send(get_omc_const("LIVES_TRUE"));
   else lives_status_send(get_omc_const("LIVES_FALSE"));
+  return TRUE;
 }
 
 
 
 
-void lives_osc_cb_set_fps(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_set_fps(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   int fpsi;
   float fps;
   if (mainw->multitrack!=NULL) return lives_osc_notify_failure();
-  if (lives_osc_check_arguments (arglen,vargs,"i",FALSE)) {
-    lives_osc_check_arguments (arglen,vargs,"i",TRUE);
+  if (lives_osc_check_arguments(arglen,vargs,"i",FALSE)) {
+    lives_osc_check_arguments(arglen,vargs,"i",TRUE);
     lives_osc_parse_int_argument(vargs,&fpsi);
     fps=(float)fpsi;
-  }
-  else {
-    if (!lives_osc_check_arguments (arglen,vargs,"f",TRUE)) return lives_osc_notify_failure();
+  } else {
+    if (!lives_osc_check_arguments(arglen,vargs,"f",TRUE)) return lives_osc_notify_failure();
     lives_osc_parse_float_argument(vargs,&fps);
   }
 
   if (mainw->playing_file>-1) lives_spin_button_set_value(LIVES_SPIN_BUTTON(mainw->spinbutton_pb_fps),(double)(fps));
-  lives_osc_notify_success(NULL);
+  return lives_osc_notify_success(NULL);
 
 }
 
 
-void lives_osc_cb_bgset_fps(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_bgset_fps(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   int fpsi;
   float fps;
 
   if (mainw->multitrack!=NULL) return lives_osc_notify_failure();
   if (mainw->blend_file<1||mainw->files[mainw->blend_file]==NULL||mainw->blend_file==mainw->current_file) return lives_osc_notify_failure();
 
-  if (lives_osc_check_arguments (arglen,vargs,"i",FALSE)) {
-    lives_osc_check_arguments (arglen,vargs,"i",TRUE);
+  if (lives_osc_check_arguments(arglen,vargs,"i",FALSE)) {
+    lives_osc_check_arguments(arglen,vargs,"i",TRUE);
     lives_osc_parse_int_argument(vargs,&fpsi);
     fps=(float)fpsi;
-  }
-  else {
-    if (!lives_osc_check_arguments (arglen,vargs,"f",TRUE)) return lives_osc_notify_failure();
+  } else {
+    if (!lives_osc_check_arguments(arglen,vargs,"f",TRUE)) return lives_osc_notify_failure();
     lives_osc_parse_float_argument(vargs,&fps);
   }
 
   mainw->files[mainw->blend_file]->pb_fps=(double)fps;
-  lives_osc_notify_success(NULL);
+  return lives_osc_notify_success(NULL);
 }
 
 
 
-void lives_osc_cb_set_fps_ratio(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_set_fps_ratio(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   int fpsi;
   float fps;
   if (mainw->multitrack!=NULL) return lives_osc_notify_failure();
-  if (lives_osc_check_arguments (arglen,vargs,"i",FALSE)) {
-    lives_osc_check_arguments (arglen,vargs,"i",TRUE);
+  if (lives_osc_check_arguments(arglen,vargs,"i",FALSE)) {
+    lives_osc_check_arguments(arglen,vargs,"i",TRUE);
     lives_osc_parse_int_argument(vargs,&fpsi);
     fps=(float)fpsi;
-  }
-  else {
-    if (!lives_osc_check_arguments (arglen,vargs,"f",TRUE)) return lives_osc_notify_failure();
+  } else {
+    if (!lives_osc_check_arguments(arglen,vargs,"f",TRUE)) return lives_osc_notify_failure();
     lives_osc_parse_float_argument(vargs,&fps);
   }
 
   if (mainw->playing_file>-1) lives_spin_button_set_value(LIVES_SPIN_BUTTON(mainw->spinbutton_pb_fps),
-							  (double)(fps)*mainw->files[mainw->playing_file]->fps);
-  lives_osc_notify_success(NULL);
+        (double)(fps)*mainw->files[mainw->playing_file]->fps);
+  return lives_osc_notify_success(NULL);
 
 }
 
 
-void lives_osc_cb_bgset_fps_ratio(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_bgset_fps_ratio(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   int fpsi;
   float fps;
   if (mainw->multitrack!=NULL) return lives_osc_notify_failure();
 
-  if (mainw->blend_file<1||mainw->files[mainw->blend_file]==NULL||mainw->blend_file==mainw->current_file) 
+  if (mainw->blend_file<1||mainw->files[mainw->blend_file]==NULL||mainw->blend_file==mainw->current_file)
     return lives_osc_notify_failure();
 
-  if (lives_osc_check_arguments (arglen,vargs,"i",FALSE)) {
-    lives_osc_check_arguments (arglen,vargs,"i",TRUE);
+  if (lives_osc_check_arguments(arglen,vargs,"i",FALSE)) {
+    lives_osc_check_arguments(arglen,vargs,"i",TRUE);
     lives_osc_parse_int_argument(vargs,&fpsi);
     fps=(float)fpsi;
-  }
-  else {
-    if (!lives_osc_check_arguments (arglen,vargs,"f",TRUE)) return lives_osc_notify_failure();
+  } else {
+    if (!lives_osc_check_arguments(arglen,vargs,"f",TRUE)) return lives_osc_notify_failure();
     lives_osc_parse_float_argument(vargs,&fps);
   }
 
   mainw->files[mainw->blend_file]->pb_fps=mainw->files[mainw->blend_file]->fps*(double)fps;
-
+  return lives_osc_notify_success(NULL);
 }
 
 
-void lives_osc_cb_fx_reset(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_fx_reset(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
 
   if (!mainw->osc_block) rte_on_off_callback_hook(NULL,LIVES_INT_TO_POINTER(0));
-  if (prefs->omc_noisy) lives_osc_notify_success(NULL);
-
+  return lives_osc_notify_success(NULL);
 }
 
 
-void lives_osc_cb_fx_map_clear(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_fx_map_clear(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   if (!mainw->osc_block) on_clear_all_clicked(NULL,NULL);
-  if (prefs->omc_noisy) lives_osc_notify_success(NULL);
+  return lives_osc_notify_success(NULL);
 }
 
 
-void lives_osc_cb_fx_map(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_fx_map(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   int effect_key;
   char effect_name[OSC_STRING_SIZE];
 
-  if (!lives_osc_check_arguments (arglen,vargs,"is",TRUE)) return lives_osc_notify_failure();
+  if (!lives_osc_check_arguments(arglen,vargs,"is",TRUE)) return lives_osc_notify_failure();
   lives_osc_parse_int_argument(vargs,&effect_key);
   lives_osc_parse_string_argument(vargs,effect_name);
-  if (!mainw->osc_block) weed_add_effectkey(effect_key,effect_name,FALSE); // allow partial matches
-  if (prefs->omc_noisy) lives_osc_notify_success(NULL);
+  if (!mainw->osc_block) {
+    weed_add_effectkey(effect_key,effect_name,FALSE); // allow partial matches
+    return lives_osc_notify_success(NULL);
+  }
+  return lives_osc_notify_failure();
+}
+
+
+boolean lives_osc_cb_fx_unmap(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+  int effect_key;
+  int mode;
+
+  if (!lives_osc_check_arguments(arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
+  lives_osc_parse_int_argument(vargs,&effect_key);
+  lives_osc_parse_int_argument(vargs,&mode);
+  mode--;
+  if (!mainw->osc_block && rte_keymode_valid(effect_key,mode,TRUE)) {
+    int idx=effect_key*rte_getmodespk()+mode;
+    on_clear_clicked(NULL,LIVES_INT_TO_POINTER(idx));
+    return lives_osc_notify_success(NULL);
+  }
+  return lives_osc_notify_failure();
 }
 
 
-void lives_osc_cb_fx_enable(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+
+boolean lives_osc_cb_fx_enable(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   // if via_shortcut and not playing, we ignore unless a generator starts (which starts playback)
-  boolean new_timer_added=FALSE;
   int count;
   int effect_key;
-  int grab=mainw->last_grabable_effect;
+  int grab=mainw->last_grabbable_effect;
 
   if (mainw->multitrack!=NULL) return lives_osc_notify_failure();
-  if (!lives_osc_check_arguments (arglen,vargs,"i",TRUE)) return lives_osc_notify_failure();
+  if (!lives_osc_check_arguments(arglen,vargs,"i",TRUE)) return lives_osc_notify_failure();
   lives_osc_parse_int_argument(vargs,&effect_key);
 
-  if (!(mainw->rte&(GU641<<(effect_key-1)))) {
-    weed_plant_t *filter=rte_keymode_get_filter(effect_key,rte_key_getmode(effect_key));
-    if (filter==NULL) return lives_osc_notify_failure();
-    count=enabled_in_channels(filter, FALSE);
-    if (mainw->playing_file==-1&&via_shortcut&&count!=0) return lives_osc_notify_failure(); // is no generator
-    
-    if (!mainw->osc_block) {
+  if (!mainw->osc_block) {
+    if (!(mainw->rte&(GU641<<(effect_key-1)))) {
+      weed_plant_t *filter=rte_keymode_get_filter(effect_key,rte_key_getmode(effect_key));
+      if (filter==NULL) return lives_osc_notify_failure();
+      count=enabled_in_channels(filter, FALSE);
+      if (mainw->playing_file==-1&&via_shortcut&&count!=0) return lives_osc_notify_failure(); // is no generator
+
       if (mainw->playing_file==-1&&count==0) {
-	// re - add the timer, as we hang here if a generator is started, and we want to receive messages still during playback
-	lives_timer_remove (mainw->kb_timer);
-	mainw->kb_timer=lives_timer_add(KEY_RPT_INTERVAL,&ext_triggers_poll,NULL);
-	new_timer_added=TRUE;
+        mainw->error=FALSE;
+        lives_idle_add(osc_init_generator,LIVES_INT_TO_POINTER(effect_key));
+      } else {
+        rte_on_off_callback_hook(NULL,LIVES_INT_TO_POINTER(effect_key));
+        mainw->last_grabbable_effect=grab;
       }
-      // TODO ***
-      //mainw->osc_auto=TRUE; ///< request early notifiction of success
-      rte_on_off_callback_hook(NULL,LIVES_INT_TO_POINTER(effect_key));
-      mainw->osc_auto=FALSE;
-      if (new_timer_added)
-	mainw->kb_timer_end=TRUE;
     }
-  }
-  mainw->last_grabable_effect=grab;
+  } else return lives_osc_notify_failure();
 
-  if (prefs->omc_noisy) lives_osc_notify_success(NULL);
+  return lives_osc_notify_success(NULL);
 }
 
 
-void lives_osc_cb_fx_disable(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_fx_disable(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
 
   int effect_key;
   if (mainw->multitrack!=NULL) return lives_osc_notify_failure();
-  if (!lives_osc_check_arguments (arglen,vargs,"i",TRUE)) return lives_osc_notify_failure();
+  if (!lives_osc_check_arguments(arglen,vargs,"i",TRUE)) return lives_osc_notify_failure();
   lives_osc_parse_int_argument(vargs,&effect_key);
   if (mainw->rte&(GU641<<(effect_key-1))) {
     if (!mainw->osc_block) rte_on_off_callback_hook(NULL,LIVES_INT_TO_POINTER(effect_key));
   }
-  if (prefs->omc_noisy) lives_osc_notify_success(NULL);
+  return lives_osc_notify_success(NULL);
 }
 
 
-void lives_osc_cb_fx_toggle(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_fx_toggle(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   // if not playing and via_shortcut, see if fx key points to generator
 
   int count=0;
   int effect_key;
   if (mainw->multitrack!=NULL) return lives_osc_notify_failure();
-  if (!lives_osc_check_arguments (arglen,vargs,"i",TRUE)) return lives_osc_notify_failure();
+  if (!lives_osc_check_arguments(arglen,vargs,"i",TRUE)) return lives_osc_notify_failure();
   lives_osc_parse_int_argument(vargs,&effect_key);
 
   if (!(mainw->rte&(GU641<<(effect_key-1)))&&mainw->playing_file==-1) {
@@ -921,77 +904,76 @@
   if (!mainw->osc_block) {
     if (!(mainw->rte&(GU641<<(effect_key-1)))&&mainw->playing_file==-1&&count==0&&via_shortcut) {
       // re - add the timer, as we hang here if a generator is started, and we want to receive messages still during playback
-      lives_timer_remove (mainw->kb_timer);
+      lives_timer_remove(mainw->kb_timer);
       mainw->kb_timer=lives_timer_add(KEY_RPT_INTERVAL,&ext_triggers_poll,NULL);
     }
     // TODO ***
-    //mainw->osc_auto=TRUE; ///< request early notifiction of success
+    //mainw->osc_auto=1; ///< request early notifiction of success
     rte_on_off_callback_hook(NULL,LIVES_INT_TO_POINTER(effect_key));
     mainw->kb_timer_end=TRUE;
   }
-  if (prefs->omc_noisy) lives_osc_notify_success(NULL);
+  return lives_osc_notify_success(NULL);
 }
 
 // *_set will allow setting of invalid clips - in this case nothing happens
 //*_select will index only valid clips
 
 
-void lives_osc_cb_fgclip_set(void *context, int arglen, const void *vargs, OSCTimeTag when,	NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_fgclip_set(void *context, int arglen, const void *vargs, OSCTimeTag when,	NetworkReturnAddressPtr ra) {
   // switch fg clip
 
   int clip;
-  if (mainw->current_file<1||mainw->preview||mainw->is_processing||mainw->multitrack!=NULL) return lives_osc_notify_failure();
+  if (mainw->current_file<1||(mainw->preview||(mainw->multitrack==NULL&&mainw->event_list!=NULL))||mainw->is_processing||
+      mainw->multitrack!=NULL) return lives_osc_notify_failure();
 
-  if (!lives_osc_check_arguments (arglen,vargs,"i",TRUE)) return lives_osc_notify_failure();
+  if (!lives_osc_check_arguments(arglen,vargs,"i",TRUE)) return lives_osc_notify_failure();
   lives_osc_parse_int_argument(vargs,&clip);
 
   if (clip>0&&clip<MAX_FILES-1) {
     if (mainw->files[clip]!=NULL&&(mainw->files[clip]->clip_type==CLIP_TYPE_DISK||mainw->files[clip]->clip_type==CLIP_TYPE_FILE)) {
       if (mainw->playing_file!=0) {
-	switch_clip(1,clip);
-	if (prefs->omc_noisy) {
-	  char *msg=g_strdup_printf("%d",clip);
-	  lives_osc_notify_success(msg);
-	  g_free(msg);
-	}
-	return;
+        char *msg=lives_strdup_printf("%d",clip);
+        switch_clip(1,clip);
+        lives_osc_notify_success(msg);
+        lives_free(msg);
+        return TRUE;
       }
     }
   }
-  lives_osc_notify_failure();
+  return lives_osc_notify_failure();
 }
 
 
-void lives_osc_cb_bgclip_set(void *context, int arglen, const void *vargs, OSCTimeTag when,	NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_bgclip_set(void *context, int arglen, const void *vargs, OSCTimeTag when,	NetworkReturnAddressPtr ra) {
   // switch bg clip
 
   int clip;
-  if (mainw->current_file<1||mainw->preview||mainw->is_processing||mainw->multitrack!=NULL) return lives_osc_notify_failure();
+  if (mainw->current_file<1||(mainw->preview||(mainw->multitrack==NULL&&mainw->event_list!=NULL))||mainw->is_processing||
+      mainw->multitrack!=NULL) return lives_osc_notify_failure();
 
-  if (!lives_osc_check_arguments (arglen,vargs,"i",TRUE)) return lives_osc_notify_failure();
+  if (!lives_osc_check_arguments(arglen,vargs,"i",TRUE)) return lives_osc_notify_failure();
   lives_osc_parse_int_argument(vargs,&clip);
 
   if (clip>0&&clip<MAX_FILES-1) {
     if (mainw->files[clip]!=NULL&&(mainw->files[clip]->clip_type==CLIP_TYPE_DISK||mainw->files[clip]->clip_type==CLIP_TYPE_FILE)) {
+      char *msg=lives_strdup_printf("%d",clip);
       switch_clip(2,clip);
-      if (prefs->omc_noisy) {
-	char *msg=g_strdup_printf("%d",clip);
-	lives_osc_notify_success(msg);
-	g_free(msg);
-      }
-      return;
+      lives_osc_notify_success(msg);
+      lives_free(msg);
+      return TRUE;
     }
   }
-  lives_osc_notify_failure();
+  return lives_osc_notify_failure();
 }
 
 
-void lives_osc_cb_fgclip_select(void *context, int arglen, const void *vargs, OSCTimeTag when,	NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_fgclip_select(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   // switch fg clip
   int clip,i;
-  if (mainw->current_file<1||mainw->preview||mainw->is_processing||mainw->multitrack!=NULL) return lives_osc_notify_failure();
+  if (mainw->current_file<1||(mainw->preview||(mainw->multitrack==NULL&&mainw->event_list!=NULL))||mainw->is_processing||
+      mainw->multitrack!=NULL) return lives_osc_notify_failure();
 
-  if (!lives_osc_check_arguments (arglen,vargs,"i",TRUE)) return lives_osc_notify_failure();
+  if (!lives_osc_check_arguments(arglen,vargs,"i",TRUE)) return lives_osc_notify_failure();
   lives_osc_parse_int_argument(vargs,&clip);
 
   if (clip<1||mainw->cliplist==NULL) return lives_osc_notify_failure();
@@ -999,32 +981,33 @@
   if (mainw->scrap_file!=-1&&clip>=mainw->scrap_file) clip++;
   if (mainw->ascrap_file!=-1&&clip>=mainw->ascrap_file) clip++;
 
-  if (clip>g_list_length(mainw->cliplist)) return lives_osc_notify_failure();
+  if (clip>lives_list_length(mainw->cliplist)) return lives_osc_notify_failure();
+
+  i=LIVES_POINTER_TO_INT(lives_list_nth_data(mainw->cliplist,clip-1));
 
-  i=GPOINTER_TO_INT(g_list_nth_data(mainw->cliplist,clip-1));
-    
   if (i==mainw->current_file) return lives_osc_notify_failure();
   if (mainw->playing_file!=0) {
+    char *msg;
     switch_clip(1,i);
-    if (prefs->omc_noisy) {
-      char *msg=g_strdup_printf("%d",i);
-      lives_osc_notify_success(msg);
-      g_free(msg);
-      return;
-    }
+    msg=lives_strdup_printf("%d",i);
+    lives_osc_notify_success(msg);
+    lives_free(msg);
+    return TRUE;
   }
-  lives_osc_notify_failure();
+  return lives_osc_notify_failure();
 }
 
 
 
 
-void lives_osc_cb_bgclip_select(void *context, int arglen, const void *vargs, OSCTimeTag when,	NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_bgclip_select(void *context, int arglen, const void *vargs, OSCTimeTag when,	NetworkReturnAddressPtr ra) {
   // switch bg clip
+  char *msg;
   int clip,i;
-  if (mainw->current_file<1||mainw->preview||mainw->is_processing||mainw->multitrack!=NULL) return lives_osc_notify_failure(); // etc
+  if (mainw->current_file<1||(mainw->preview||(mainw->multitrack==NULL&&mainw->event_list!=NULL))||mainw->is_processing||
+      mainw->multitrack!=NULL) return lives_osc_notify_failure(); // etc
 
-  if (!lives_osc_check_arguments (arglen,vargs,"i",TRUE)) return lives_osc_notify_failure();
+  if (!lives_osc_check_arguments(arglen,vargs,"i",TRUE)) return lives_osc_notify_failure();
   lives_osc_parse_int_argument(vargs,&clip);
 
   if (clip<1||mainw->cliplist==NULL) return lives_osc_notify_failure();
@@ -1032,48 +1015,46 @@
   if (mainw->scrap_file!=-1&&clip>=mainw->scrap_file) clip++;
   if (mainw->ascrap_file!=-1&&clip>=mainw->ascrap_file) clip++;
 
-  if (clip>g_list_length(mainw->cliplist)) return lives_osc_notify_failure();
+  if (clip>lives_list_length(mainw->cliplist)) return lives_osc_notify_failure();
 
   if (mainw->num_tr_applied<1) return lives_osc_notify_failure();
 
-  i=GPOINTER_TO_INT(g_list_nth_data(mainw->cliplist,clip-1));
-    
+  i=LIVES_POINTER_TO_INT(lives_list_nth_data(mainw->cliplist,clip-1));
+
   if (i==mainw->blend_file) return lives_osc_notify_failure();
 
   switch_clip(2,i);
 
-  if (prefs->omc_noisy) {
-    char *msg=g_strdup_printf("%d",i);
-    lives_osc_notify_success(msg);
-    g_free(msg);
-    return;
-  }
+  msg=lives_strdup_printf("%d",i);
+  lives_osc_notify_success(msg);
+  lives_free(msg);
+  return TRUE;
 
 }
 
 
-void lives_osc_cb_clip_resample(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_clip_resample(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   int fps;
   float fpsf;
   double fpsd;
 
   if (mainw->playing_file>-1) return lives_osc_notify_failure();
 
-  if (mainw->current_file<1||mainw->preview||mainw->is_processing||mainw->multitrack!=NULL) return lives_osc_notify_failure();
+  if (mainw->current_file<1||(mainw->preview||(mainw->multitrack==NULL&&mainw->event_list!=NULL))||mainw->is_processing||
+      mainw->multitrack!=NULL) return lives_osc_notify_failure();
 
-  if (!lives_osc_check_arguments (arglen,vargs,"f",FALSE)) {
-    if (!lives_osc_check_arguments (arglen,vargs,"i",TRUE)) return lives_osc_notify_failure();
+  if (!lives_osc_check_arguments(arglen,vargs,"f",FALSE)) {
+    if (!lives_osc_check_arguments(arglen,vargs,"i",TRUE)) return lives_osc_notify_failure();
     lives_osc_parse_int_argument(vargs,&fps);
     fpsd=(double)(fps*1.);
-  }
-  else {
-    lives_osc_check_arguments (arglen,vargs,"f",TRUE);
+  } else {
+    lives_osc_check_arguments(arglen,vargs,"f",TRUE);
     lives_osc_parse_float_argument(vargs,&fpsf);
     fpsd=(double)fpsf;
   }
 
   if (fpsd<1.&&fpsd>FPS_MAX) return lives_osc_notify_failure();
-  
+
   cfile->undo1_dbl=fpsd;
 
   on_resample_vid_ok(NULL,NULL);
@@ -1083,24 +1064,24 @@
 
 
 
-void lives_osc_cb_clip_close(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_clip_close(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   int noaudio=0;
   int clipno=mainw->current_file;
   int current_file=clipno;
 
   if (mainw->playing_file>-1) return lives_osc_notify_failure();
 
-  if (mainw->current_file<1||mainw->preview||mainw->is_processing) return lives_osc_notify_failure();
+  if (mainw->current_file<1||(mainw->preview||(mainw->multitrack==NULL&&mainw->event_list!=NULL))||
+      mainw->is_processing) return lives_osc_notify_failure();
 
-  if (lives_osc_check_arguments (arglen,vargs,"i",FALSE)) { 
-    lives_osc_check_arguments (arglen,vargs,"i",TRUE);
+  if (lives_osc_check_arguments(arglen,vargs,"i",FALSE)) {
+    lives_osc_check_arguments(arglen,vargs,"i",TRUE);
     lives_osc_parse_int_argument(vargs,&noaudio);
-  }
-  else if (mainw->multitrack!=NULL||!lives_osc_check_arguments (arglen,vargs,"",TRUE)) {
+  } else if (mainw->multitrack!=NULL||!lives_osc_check_arguments(arglen,vargs,"",TRUE)) {
     return lives_osc_notify_failure();
   }
 
-  if (clipno<1||clipno>MAX_FILES||mainw->files[clipno]==NULL||(mainw->multitrack!=NULL&&clipno==mainw->multitrack->render_file)) 
+  if (clipno<1||clipno>MAX_FILES||mainw->files[clipno]==NULL||(mainw->multitrack!=NULL&&clipno==mainw->multitrack->render_file))
     return lives_osc_notify_failure();
 
   if (clipno==current_file) current_file=-1;
@@ -1113,26 +1094,26 @@
 
 
 
-void lives_osc_cb_clip_undo(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_clip_undo(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   int clipno=mainw->current_file;
   int current_file=clipno;
 
   if (mainw->playing_file>-1) return lives_osc_notify_failure();
 
-  if (mainw->current_file<1||mainw->preview||mainw->is_processing||mainw->multitrack!=NULL) return lives_osc_notify_failure();
+  if (mainw->current_file<1||(mainw->preview||(mainw->multitrack==NULL&&mainw->event_list!=NULL))||mainw->is_processing||
+      mainw->multitrack!=NULL) return lives_osc_notify_failure();
 
-  if (lives_osc_check_arguments (arglen,vargs,"i",FALSE)) { 
-    lives_osc_check_arguments (arglen,vargs,"i",TRUE);
+  if (lives_osc_check_arguments(arglen,vargs,"i",FALSE)) {
+    lives_osc_check_arguments(arglen,vargs,"i",TRUE);
     lives_osc_parse_int_argument(vargs,&clipno);
-  }
-  else if (!lives_osc_check_arguments (arglen,vargs,"",TRUE)) {
+  } else if (!lives_osc_check_arguments(arglen,vargs,"",TRUE)) {
     return lives_osc_notify_failure();
   }
 
   if (clipno<1||clipno>MAX_FILES||mainw->files[clipno]==NULL)
     return lives_osc_notify_failure();
 
-  if (!mainw->files[clipno]->undoable) return lives_osc_notify_failure(); 
+  if (!mainw->files[clipno]->undoable) return lives_osc_notify_failure();
 
   mainw->current_file=clipno;
 
@@ -1145,26 +1126,26 @@
 
 
 
-void lives_osc_cb_clip_redo(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_clip_redo(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   int clipno=mainw->current_file;
   int current_file=clipno;
 
   if (mainw->playing_file>-1) return lives_osc_notify_failure();
 
-  if (mainw->current_file<1||mainw->preview||mainw->is_processing||mainw->multitrack!=NULL) return lives_osc_notify_failure();
+  if (mainw->current_file<1||(mainw->preview||(mainw->multitrack==NULL&&mainw->event_list!=NULL))||mainw->is_processing||
+      mainw->multitrack!=NULL) return lives_osc_notify_failure();
 
-  if (lives_osc_check_arguments (arglen,vargs,"i",FALSE)) { 
-    lives_osc_check_arguments (arglen,vargs,"i",TRUE);
+  if (lives_osc_check_arguments(arglen,vargs,"i",FALSE)) {
+    lives_osc_check_arguments(arglen,vargs,"i",TRUE);
     lives_osc_parse_int_argument(vargs,&clipno);
-  }
-  else if (!lives_osc_check_arguments (arglen,vargs,"",TRUE)) {
+  } else if (!lives_osc_check_arguments(arglen,vargs,"",TRUE)) {
     return lives_osc_notify_failure();
   }
 
   if (clipno<1||clipno>MAX_FILES||mainw->files[clipno]==NULL)
     return lives_osc_notify_failure();
 
-  if (!mainw->files[clipno]->redoable) return lives_osc_notify_failure(); 
+  if (!mainw->files[clipno]->redoable) return lives_osc_notify_failure();
 
   mainw->current_file=clipno;
 
@@ -1179,7 +1160,7 @@
 
 
 
-void lives_osc_cb_fgclip_copy(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_fgclip_copy(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   int noaudio=0;
   int clipno=mainw->current_file;
   int start,end,current_file=clipno;
@@ -1187,23 +1168,22 @@
 
   if (mainw->playing_file>-1||mainw->multitrack!=NULL) return lives_osc_notify_failure();
 
-  if (mainw->current_file<1||mainw->preview||mainw->is_processing) return lives_osc_notify_failure();
+  if (mainw->current_file<1||(mainw->preview||(mainw->multitrack==NULL&&mainw->event_list!=NULL))||
+      mainw->is_processing) return lives_osc_notify_failure();
 
-  if (lives_osc_check_arguments (arglen,vargs,"ii",FALSE)) { 
-    lives_osc_check_arguments (arglen,vargs,"ii",TRUE);
+  if (lives_osc_check_arguments(arglen,vargs,"ii",FALSE)) {
+    lives_osc_check_arguments(arglen,vargs,"ii",TRUE);
     lives_osc_parse_int_argument(vargs,&noaudio);
     lives_osc_parse_int_argument(vargs,&clipno);
-  }
-  else if (lives_osc_check_arguments (arglen,vargs,"i",FALSE)) { 
-    lives_osc_check_arguments (arglen,vargs,"i",TRUE);
+  } else if (lives_osc_check_arguments(arglen,vargs,"i",FALSE)) {
+    lives_osc_check_arguments(arglen,vargs,"i",TRUE);
     lives_osc_parse_int_argument(vargs,&noaudio);
-  }
-  else if (!lives_osc_check_arguments (arglen,vargs,"",TRUE)) {
+  } else if (!lives_osc_check_arguments(arglen,vargs,"",TRUE)) {
     return lives_osc_notify_failure();
   }
 
   if (clipno<1||clipno>MAX_FILES||mainw->files[clipno]==NULL||(mainw->files[clipno]->clip_type!=CLIP_TYPE_DISK&&
-							       mainw->files[clipno]->clip_type!=CLIP_TYPE_FILE)) return lives_osc_notify_failure();
+      mainw->files[clipno]->clip_type!=CLIP_TYPE_FILE)) return lives_osc_notify_failure();
 
   mainw->current_file=clipno;
   start=cfile->start;
@@ -1225,30 +1205,30 @@
 
   mainw->current_file=current_file;
 
-  lives_osc_notify_success(NULL);
+  return lives_osc_notify_success(NULL);
 
 }
 
 
 
-void lives_osc_cb_fgclipsel_rteapply(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_fgclipsel_rteapply(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   int clipno=mainw->current_file;
   int current_file=clipno;
 
   if (mainw->playing_file>-1||mainw->multitrack!=NULL) return lives_osc_notify_failure();
 
-  if (mainw->current_file<1||mainw->preview||mainw->is_processing) return lives_osc_notify_failure();
+  if (mainw->current_file<1||(mainw->preview||(mainw->multitrack==NULL&&mainw->event_list!=NULL))||
+      mainw->is_processing) return lives_osc_notify_failure();
 
-  if (lives_osc_check_arguments (arglen,vargs,"i",FALSE)) { 
-    lives_osc_check_arguments (arglen,vargs,"i",TRUE);
+  if (lives_osc_check_arguments(arglen,vargs,"i",FALSE)) {
+    lives_osc_check_arguments(arglen,vargs,"i",TRUE);
     lives_osc_parse_int_argument(vargs,&clipno);
-  }
-  else if (!lives_osc_check_arguments (arglen,vargs,"",TRUE)) {
+  } else if (!lives_osc_check_arguments(arglen,vargs,"",TRUE)) {
     return lives_osc_notify_failure();
   }
 
   if (clipno<1||clipno>MAX_FILES||mainw->files[clipno]==NULL||(mainw->files[clipno]->clip_type!=CLIP_TYPE_DISK&&
-							       mainw->files[clipno]->clip_type!=CLIP_TYPE_FILE)) return lives_osc_notify_failure();
+      mainw->files[clipno]->clip_type!=CLIP_TYPE_FILE)) return lives_osc_notify_failure();
 
   mainw->current_file=clipno;
 
@@ -1256,13 +1236,13 @@
 
   mainw->current_file=current_file;
 
-  lives_osc_notify_success(NULL);
+  return lives_osc_notify_success(NULL);
 }
 
 
 
 
-void lives_osc_cb_fgclipsel_copy(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_fgclipsel_copy(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
 
   int noaudio=0;
   int clipno=mainw->current_file;
@@ -1271,23 +1251,22 @@
 
   if (mainw->playing_file>-1||mainw->multitrack!=NULL) return lives_osc_notify_failure();
 
-  if (mainw->current_file<1||mainw->preview||mainw->is_processing) return lives_osc_notify_failure();
+  if (mainw->current_file<1||(mainw->preview||(mainw->multitrack==NULL&&mainw->event_list!=NULL))||
+      mainw->is_processing) return lives_osc_notify_failure();
 
-  if (lives_osc_check_arguments (arglen,vargs,"ii",FALSE)) { 
-    lives_osc_check_arguments (arglen,vargs,"ii",TRUE);
+  if (lives_osc_check_arguments(arglen,vargs,"ii",FALSE)) {
+    lives_osc_check_arguments(arglen,vargs,"ii",TRUE);
     lives_osc_parse_int_argument(vargs,&noaudio);
     lives_osc_parse_int_argument(vargs,&clipno);
-  }
-  else if (lives_osc_check_arguments (arglen,vargs,"i",FALSE)) { 
-    lives_osc_check_arguments (arglen,vargs,"i",TRUE);
+  } else if (lives_osc_check_arguments(arglen,vargs,"i",FALSE)) {
+    lives_osc_check_arguments(arglen,vargs,"i",TRUE);
     lives_osc_parse_int_argument(vargs,&noaudio);
-  }
-  else if (!lives_osc_check_arguments (arglen,vargs,"",TRUE)) {
+  } else if (!lives_osc_check_arguments(arglen,vargs,"",TRUE)) {
     return lives_osc_notify_failure();
   }
 
   if (clipno<1||clipno>MAX_FILES||mainw->files[clipno]==NULL||(mainw->files[clipno]->clip_type!=CLIP_TYPE_DISK&&
-							       mainw->files[clipno]->clip_type!=CLIP_TYPE_FILE)) return lives_osc_notify_failure();
+      mainw->files[clipno]->clip_type!=CLIP_TYPE_FILE)) return lives_osc_notify_failure();
 
   mainw->current_file=clipno;
 
@@ -1301,13 +1280,13 @@
 
   mainw->current_file=current_file;
 
-  lives_osc_notify_success(NULL);
+  return lives_osc_notify_success(NULL);
 }
 
 
 
 
-void lives_osc_cb_fgclipsel_cut(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_fgclipsel_cut(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
 
   int noaudio=0;
   int clipno=mainw->current_file;
@@ -1317,23 +1296,22 @@
   if (mainw->playing_file>-1) return lives_osc_notify_failure();
   if (mainw->multitrack!=NULL) return lives_osc_notify_failure();
 
-  if (mainw->current_file<1||mainw->preview||mainw->is_processing) return lives_osc_notify_failure();
+  if (mainw->current_file<1||(mainw->preview||(mainw->multitrack==NULL&&mainw->event_list!=NULL))||
+      mainw->is_processing) return lives_osc_notify_failure();
 
-  if (lives_osc_check_arguments (arglen,vargs,"ii",FALSE)) { 
-    lives_osc_check_arguments (arglen,vargs,"ii",TRUE);
+  if (lives_osc_check_arguments(arglen,vargs,"ii",FALSE)) {
+    lives_osc_check_arguments(arglen,vargs,"ii",TRUE);
     lives_osc_parse_int_argument(vargs,&noaudio);
     lives_osc_parse_int_argument(vargs,&clipno);
-  }
-  else if (lives_osc_check_arguments (arglen,vargs,"i",FALSE)) { 
-    lives_osc_check_arguments (arglen,vargs,"i",TRUE);
+  } else if (lives_osc_check_arguments(arglen,vargs,"i",FALSE)) {
+    lives_osc_check_arguments(arglen,vargs,"i",TRUE);
     lives_osc_parse_int_argument(vargs,&noaudio);
-  }
-  else if (!lives_osc_check_arguments (arglen,vargs,"",TRUE)) {
+  } else if (!lives_osc_check_arguments(arglen,vargs,"",TRUE)) {
     return lives_osc_notify_failure();
   }
 
   if (clipno<1||clipno>MAX_FILES||mainw->files[clipno]==NULL||(mainw->files[clipno]->clip_type!=CLIP_TYPE_DISK&&
-							       mainw->files[clipno]->clip_type!=CLIP_TYPE_FILE)) return lives_osc_notify_failure();
+      mainw->files[clipno]->clip_type!=CLIP_TYPE_FILE)) return lives_osc_notify_failure();
 
   mainw->current_file=clipno;
 
@@ -1341,23 +1319,22 @@
 
   mainw->ccpd_with_sound=!noaudio;
 
-  mainw->osc_auto=TRUE;
+  mainw->osc_auto=1;
   on_cut_activate(NULL,NULL);
-  mainw->osc_auto=FALSE;
+  mainw->osc_auto=0;
 
   mainw->ccpd_with_sound=ccpd;
 
   mainw->current_file=current_file;
 
-  if (prefs->omc_noisy) {
-    lives_osc_notify_success(NULL);
-  }
+  return lives_osc_notify_success(NULL);
+
 }
 
 
 
 
-void lives_osc_cb_fgclipsel_delete(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_fgclipsel_delete(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
 
   int noaudio=0;
   int clipno=mainw->current_file;
@@ -1367,23 +1344,22 @@
   if (mainw->playing_file>-1) return lives_osc_notify_failure();
   if (mainw->multitrack!=NULL) return lives_osc_notify_failure();
 
-  if (mainw->current_file<1||mainw->preview||mainw->is_processing) return lives_osc_notify_failure();
+  if (mainw->current_file<1||(mainw->preview||(mainw->multitrack==NULL&&mainw->event_list!=NULL))||
+      mainw->is_processing) return lives_osc_notify_failure();
 
-  if (lives_osc_check_arguments (arglen,vargs,"ii",FALSE)) { 
-    lives_osc_check_arguments (arglen,vargs,"ii",TRUE);
+  if (lives_osc_check_arguments(arglen,vargs,"ii",FALSE)) {
+    lives_osc_check_arguments(arglen,vargs,"ii",TRUE);
     lives_osc_parse_int_argument(vargs,&noaudio);
     lives_osc_parse_int_argument(vargs,&clipno);
-  }
-  else if (lives_osc_check_arguments (arglen,vargs,"i",FALSE)) { 
-    lives_osc_check_arguments (arglen,vargs,"i",TRUE);
+  } else if (lives_osc_check_arguments(arglen,vargs,"i",FALSE)) {
+    lives_osc_check_arguments(arglen,vargs,"i",TRUE);
     lives_osc_parse_int_argument(vargs,&noaudio);
-  }
-  else if (!lives_osc_check_arguments (arglen,vargs,"",TRUE)) {
+  } else if (!lives_osc_check_arguments(arglen,vargs,"",TRUE)) {
     return lives_osc_notify_failure();
   }
 
   if (clipno<1||clipno>MAX_FILES||mainw->files[clipno]==NULL||(mainw->files[clipno]->clip_type!=CLIP_TYPE_DISK&&
-							       mainw->files[clipno]->clip_type!=CLIP_TYPE_FILE)) return lives_osc_notify_failure();
+      mainw->files[clipno]->clip_type!=CLIP_TYPE_FILE)) return lives_osc_notify_failure();
 
   mainw->current_file=clipno;
 
@@ -1391,23 +1367,21 @@
 
   mainw->ccpd_with_sound=!noaudio;
 
-  mainw->osc_auto=TRUE;
+  mainw->osc_auto=1;
   on_delete_activate(NULL,NULL);
-  mainw->osc_auto=FALSE;
+  mainw->osc_auto=0;
 
   mainw->ccpd_with_sound=ccpd;
 
   mainw->current_file=current_file;
 
-  if (prefs->omc_noisy) {
-    lives_osc_notify_success(NULL);
-  }
+  return lives_osc_notify_success(NULL);
 }
 
 
 
 
-void lives_osc_cb_clipbd_paste(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_clipbd_paste(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   int noaudio=0;
   boolean ccpd;
 
@@ -1416,13 +1390,13 @@
 
   if (clipboard==NULL) return lives_osc_notify_failure();
 
-  if (mainw->current_file<1||mainw->preview||mainw->is_processing) return lives_osc_notify_failure();
+  if (mainw->current_file<1||(mainw->preview||(mainw->multitrack==NULL&&mainw->event_list!=NULL))||
+      mainw->is_processing) return lives_osc_notify_failure();
 
-  if (lives_osc_check_arguments (arglen,vargs,"i",FALSE)) { 
-    lives_osc_check_arguments (arglen,vargs,"i",TRUE);
+  if (lives_osc_check_arguments(arglen,vargs,"i",FALSE)) {
+    lives_osc_check_arguments(arglen,vargs,"i",TRUE);
     lives_osc_parse_int_argument(vargs,&noaudio);
-  }
-  else if (!lives_osc_check_arguments (arglen,vargs,"",TRUE)) {
+  } else if (!lives_osc_check_arguments(arglen,vargs,"",TRUE)) {
     return lives_osc_notify_failure();
   }
 
@@ -1434,16 +1408,14 @@
 
   mainw->ccpd_with_sound=ccpd;
 
-  if (prefs->omc_noisy) {
-    lives_osc_notify_success(NULL);
-  }
+  return lives_osc_notify_success(NULL);
 
 }
 
 
 
 
-void lives_osc_cb_clipbd_insertb(void *context, int arglen, const void *vargs, OSCTimeTag when,	NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_clipbd_insertb(void *context, int arglen, const void *vargs, OSCTimeTag when,	NetworkReturnAddressPtr ra) {
 
   int noaudio=0;
   int times=1;
@@ -1454,29 +1426,27 @@
   if (mainw->playing_file>-1) return lives_osc_notify_failure();
   if (mainw->multitrack!=NULL) return lives_osc_notify_failure();
 
-  if (mainw->current_file<1||mainw->preview||mainw->is_processing) return lives_osc_notify_failure();
+  if (mainw->current_file<1||(mainw->preview||(mainw->multitrack==NULL&&mainw->event_list!=NULL))||
+      mainw->is_processing) return lives_osc_notify_failure();
 
-  if (lives_osc_check_arguments (arglen,vargs,"iii",FALSE)) { 
-    lives_osc_check_arguments (arglen,vargs,"iii",TRUE);
+  if (lives_osc_check_arguments(arglen,vargs,"iii",FALSE)) {
+    lives_osc_check_arguments(arglen,vargs,"iii",TRUE);
     lives_osc_parse_int_argument(vargs,&noaudio);
     lives_osc_parse_int_argument(vargs,&times);
     lives_osc_parse_int_argument(vargs,&clipno);
-  }
-  else if (lives_osc_check_arguments (arglen,vargs,"ii",FALSE)) { 
-    lives_osc_check_arguments (arglen,vargs,"ii",TRUE);
+  } else if (lives_osc_check_arguments(arglen,vargs,"ii",FALSE)) {
+    lives_osc_check_arguments(arglen,vargs,"ii",TRUE);
     lives_osc_parse_int_argument(vargs,&noaudio);
     lives_osc_parse_int_argument(vargs,&times);
-  }
-  else if (lives_osc_check_arguments (arglen,vargs,"i",FALSE)) { 
-    lives_osc_check_arguments (arglen,vargs,"i",TRUE);
+  } else if (lives_osc_check_arguments(arglen,vargs,"i",FALSE)) {
+    lives_osc_check_arguments(arglen,vargs,"i",TRUE);
     lives_osc_parse_int_argument(vargs,&noaudio);
-  }
-  else if (!lives_osc_check_arguments (arglen,vargs,"",TRUE)) {
+  } else if (!lives_osc_check_arguments(arglen,vargs,"",TRUE)) {
     return lives_osc_notify_failure();
   }
 
   if (clipno<1||clipno>MAX_FILES||mainw->files[clipno]==NULL||(mainw->files[clipno]->clip_type!=CLIP_TYPE_DISK&&
-							       mainw->files[clipno]->clip_type!=CLIP_TYPE_FILE)) return lives_osc_notify_failure();
+      mainw->files[clipno]->clip_type!=CLIP_TYPE_FILE)) return lives_osc_notify_failure();
 
   if (times==0||times<-1) return lives_osc_notify_failure();
 
@@ -1493,17 +1463,15 @@
   on_insert_activate(NULL,NULL);
 
   mainw->current_file=current_file;
+  return lives_osc_notify_success(NULL);
 
-  if (prefs->omc_noisy) {
-    lives_osc_notify_success(NULL);
-  }
 }
 
 
 
 
 
-void lives_osc_cb_clipbd_inserta(void *context, int arglen, const void *vargs, OSCTimeTag when,	NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_clipbd_inserta(void *context, int arglen, const void *vargs, OSCTimeTag when,	NetworkReturnAddressPtr ra) {
 
   int noaudio=0;
   int times=1;
@@ -1514,29 +1482,27 @@
   if (mainw->playing_file>-1) return lives_osc_notify_failure();
   if (mainw->multitrack!=NULL) return lives_osc_notify_failure();
 
-  if (mainw->current_file<1||mainw->preview||mainw->is_processing) return lives_osc_notify_failure();
+  if (mainw->current_file<1||(mainw->preview||(mainw->multitrack==NULL&&mainw->event_list!=NULL))||
+      mainw->is_processing) return lives_osc_notify_failure();
 
-  if (lives_osc_check_arguments (arglen,vargs,"iii",FALSE)) { 
-    lives_osc_check_arguments (arglen,vargs,"iii",TRUE);
+  if (lives_osc_check_arguments(arglen,vargs,"iii",FALSE)) {
+    lives_osc_check_arguments(arglen,vargs,"iii",TRUE);
     lives_osc_parse_int_argument(vargs,&noaudio);
     lives_osc_parse_int_argument(vargs,&times);
     lives_osc_parse_int_argument(vargs,&clipno);
-  }
-  else if (lives_osc_check_arguments (arglen,vargs,"ii",FALSE)) { 
-    lives_osc_check_arguments (arglen,vargs,"ii",TRUE);
+  } else if (lives_osc_check_arguments(arglen,vargs,"ii",FALSE)) {
+    lives_osc_check_arguments(arglen,vargs,"ii",TRUE);
     lives_osc_parse_int_argument(vargs,&noaudio);
     lives_osc_parse_int_argument(vargs,&times);
-  }
-  else if (lives_osc_check_arguments (arglen,vargs,"i",FALSE)) { 
-    lives_osc_check_arguments (arglen,vargs,"i",TRUE);
+  } else if (lives_osc_check_arguments(arglen,vargs,"i",FALSE)) {
+    lives_osc_check_arguments(arglen,vargs,"i",TRUE);
     lives_osc_parse_int_argument(vargs,&noaudio);
-  }
-  else if (!lives_osc_check_arguments (arglen,vargs,"",TRUE)) {
+  } else if (!lives_osc_check_arguments(arglen,vargs,"",TRUE)) {
     return lives_osc_notify_failure();
   }
 
   if (clipno<1||clipno>MAX_FILES||mainw->files[clipno]==NULL||(mainw->files[clipno]->clip_type!=CLIP_TYPE_DISK&&
-							       mainw->files[clipno]->clip_type!=CLIP_TYPE_FILE)) return lives_osc_notify_failure();
+      mainw->files[clipno]->clip_type!=CLIP_TYPE_FILE)) return lives_osc_notify_failure();
 
   if (times==0||times<-1) return lives_osc_notify_failure();
 
@@ -1557,20 +1523,20 @@
 
   mainw->current_file=current_file;
 
-  if (prefs->omc_noisy) {
-    lives_osc_notify_success(NULL);
-  }
+  return lives_osc_notify_success(NULL);
+
 }
 
 
 
 
-void lives_osc_cb_fgclip_retrigger (void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_fgclip_retrigger(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   // switch fg clip and reset framenumber
 
-  if (mainw->playing_file<1||mainw->preview||mainw->is_processing) return lives_osc_notify_failure();
+  if (mainw->playing_file<1||(mainw->preview||(mainw->multitrack==NULL&&mainw->event_list!=NULL))||
+      mainw->is_processing) return lives_osc_notify_failure();
   if (mainw->multitrack!=NULL) return lives_osc_notify_failure();
-  if (!lives_osc_check_arguments (arglen,vargs,"i",TRUE)) return lives_osc_notify_failure();
+  if (!lives_osc_check_arguments(arglen,vargs,"i",TRUE)) return lives_osc_notify_failure();
 
   lives_osc_cb_fgclip_select(context,arglen,vargs,when,ra);
 
@@ -1582,99 +1548,111 @@
     resync_audio(cfile->frameno);
   }
 #endif
+  return lives_osc_notify_success(NULL);
 }
 
 
 
-void lives_osc_cb_bgclip_retrigger (void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_bgclip_retrigger(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   // switch bg clip and reset framenumber
 
-  if (mainw->playing_file<1||mainw->preview||mainw->is_processing) return lives_osc_notify_failure();
+  if (mainw->playing_file<1||(mainw->preview||(mainw->multitrack==NULL&&mainw->event_list!=NULL))||
+      mainw->is_processing) return lives_osc_notify_failure();
   if (mainw->multitrack!=NULL) return lives_osc_notify_failure();
-  if (!lives_osc_check_arguments (arglen,vargs,"i",TRUE)) return lives_osc_notify_failure();
+  if (!lives_osc_check_arguments(arglen,vargs,"i",TRUE)) return lives_osc_notify_failure();
 
   lives_osc_cb_bgclip_select(context,arglen,vargs,when,ra);
 
   if (mainw->blend_file<1||mainw->files[mainw->blend_file]==NULL||mainw->blend_file==mainw->current_file) return lives_osc_notify_failure();
 
-  if (mainw->files[mainw->blend_file]->pb_fps>0.||(mainw->files[mainw->blend_file]->play_paused&&mainw->files[mainw->blend_file]->freeze_fps>0.)) 
+  if (mainw->files[mainw->blend_file]->pb_fps>0.||(mainw->files[mainw->blend_file]->play_paused&&
+      mainw->files[mainw->blend_file]->freeze_fps>0.))
     mainw->files[mainw->blend_file]->frameno=mainw->files[mainw->blend_file]->last_frameno=1;
   else mainw->files[mainw->blend_file]->frameno=mainw->files[mainw->blend_file]->last_frameno=mainw->files[mainw->blend_file]->frames;
-  lives_osc_notify_success(NULL);
+  return lives_osc_notify_success(NULL);
 }
 
 
 
 
-void lives_osc_cb_fgclip_select_next(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_fgclip_select_next(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   // switch fg clip
 
-  if (mainw->current_file<1||mainw->preview||mainw->is_processing) return lives_osc_notify_failure(); // TODO
+  if (mainw->current_file<1||(mainw->preview||(mainw->multitrack==NULL&&mainw->event_list!=NULL))||
+      mainw->is_processing) return lives_osc_notify_failure(); // TODO
   if (mainw->multitrack!=NULL) return lives_osc_notify_failure();
 
   nextclip_callback(NULL,NULL,0,(LiVESXModifierType)0,LIVES_INT_TO_POINTER(1));
 
   if (mainw->playing_file==-1&&prefs->omc_noisy) {
-    char *msg=g_strdup_printf("%d",mainw->current_file);
+    char *msg=lives_strdup_printf("%d",mainw->current_file);
     lives_osc_notify_success(msg);
-    g_free(msg);
+    lives_free(msg);
+    return TRUE;
   }
+  return lives_osc_notify_failure();
 
 }
 
 
-void lives_osc_cb_bgclip_select_next(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_bgclip_select_next(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   // switch bg clip
 
-  if (mainw->current_file<1||mainw->preview||mainw->is_processing) return lives_osc_notify_failure(); // TODO
+  if (mainw->current_file<1||(mainw->preview||(mainw->multitrack==NULL&&mainw->event_list!=NULL))||
+      mainw->is_processing) return lives_osc_notify_failure(); // TODO
   if (mainw->blend_file<1||mainw->files[mainw->blend_file]==NULL) return lives_osc_notify_failure();
   if (mainw->multitrack!=NULL) return lives_osc_notify_failure();
 
   nextclip_callback(NULL,NULL,0,(LiVESXModifierType)0,LIVES_INT_TO_POINTER(2));
 
   if (mainw->playing_file==-1&&prefs->omc_noisy) {
-    char *msg=g_strdup_printf("%d",mainw->blend_file);
+    char *msg=lives_strdup_printf("%d",mainw->blend_file);
     lives_osc_notify_success(msg);
-    g_free(msg);
+    lives_free(msg);
+    return TRUE;
   }
-
+  return lives_osc_notify_failure();
 }
 
 
 
-void lives_osc_cb_fgclip_select_previous(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_fgclip_select_previous(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   // switch fg clip
 
-  if (mainw->current_file<1||mainw->preview||mainw->is_processing) return lives_osc_notify_failure(); // TODO
+  if (mainw->current_file<1||(mainw->preview||(mainw->multitrack==NULL&&mainw->event_list!=NULL))||
+      mainw->is_processing) return lives_osc_notify_failure(); // TODO
   if (mainw->multitrack!=NULL) return lives_osc_notify_failure();
-  
+
   prevclip_callback(NULL,NULL,0,(LiVESXModifierType)0,LIVES_INT_TO_POINTER(1));
 
   if (mainw->playing_file==-1&&prefs->omc_noisy) {
-    char *msg=g_strdup_printf("%d",mainw->current_file);
+    char *msg=lives_strdup_printf("%d",mainw->current_file);
     lives_osc_notify_success(msg);
-    g_free(msg);
+    lives_free(msg);
+    return TRUE;
   }
-
-
+  return lives_osc_notify_failure();
 }
 
 
-void lives_osc_cb_bgclip_select_previous(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_bgclip_select_previous(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   // switch bg clip
 
-  if (mainw->current_file<1||mainw->preview||mainw->is_processing) return lives_osc_notify_failure(); // TODO
+  if (mainw->current_file<1||(mainw->preview||(mainw->multitrack==NULL&&mainw->event_list!=NULL))||
+      mainw->is_processing) return lives_osc_notify_failure(); // TODO
   if (mainw->multitrack!=NULL) return lives_osc_notify_failure();
 
   if (mainw->blend_file<1||mainw->files[mainw->blend_file]==NULL) return lives_osc_notify_failure();
 
   prevclip_callback(NULL,NULL,0,(LiVESXModifierType)0,LIVES_INT_TO_POINTER(2));
 
-  if (mainw->playing_file==-1&&prefs->omc_noisy) {
-    char *msg=g_strdup_printf("%d",mainw->blend_file);
+  if (mainw->playing_file==-1) {
+    char *msg=lives_strdup_printf("%d",mainw->blend_file);
     lives_osc_notify_success(msg);
-    g_free(msg);
+    lives_free(msg);
+    return TRUE;
   }
+  return lives_osc_notify_failure();
 }
 
 
@@ -1683,55 +1661,61 @@
 
 
 
-void lives_osc_cb_quit(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
-
-  if (mainw->playing_file>-1) return lives_osc_notify_failure();
+boolean lives_osc_cb_quit(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
 
   mainw->only_close=mainw->no_exit=FALSE;
   mainw->leave_recovery=FALSE;
 
   if (mainw->was_set) {
     on_save_set_activate(NULL,mainw->set_name);
-  }
-  else mainw->leave_files=FALSE;
-  lives_exit();
-
+  } else mainw->leave_files=FALSE;
+  lives_exit(0);
+  return TRUE;
 }
 
-void lives_osc_cb_getname(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
-  if (status_socket==NULL) return;
-  lives_status_send (PACKAGE_NAME);
+boolean lives_osc_cb_getname(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+  lives_status_send(PACKAGE_NAME);
+  return TRUE;
 }
 
 
-void lives_osc_cb_getversion(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
-  if (status_socket==NULL) return;
-  lives_status_send (VERSION);
+boolean lives_osc_cb_getversion(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+  lives_status_send(VERSION);
+  return TRUE;
+}
+
+boolean lives_osc_cb_getstatus(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+  if (mainw->go_away) lives_status_send(get_omc_const("LIVES_STATUS_NOTREADY"));
+  if (mainw->playing_file > -1) lives_status_send(get_omc_const("LIVES_STATUS_PLAYING"));
+  if (mainw->is_processing) lives_status_send(get_omc_const("LIVES_STATUS_PROCESSING"));
+  if ((mainw->preview||(mainw->multitrack==NULL&&mainw->event_list!=NULL))) lives_status_send(get_omc_const("LIVES_STATUS_PREVIEW"));
+  lives_status_send(get_omc_const("LIVES_STATUS_READY"));
+  return TRUE;
 }
 
 
-void lives_osc_cb_getconst(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_getconst(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   const char *retval;
   char cname[OSC_STRING_SIZE];
 
-  if (!lives_osc_check_arguments (arglen,vargs,"s",TRUE)) return lives_osc_notify_failure();
+  if (!lives_osc_check_arguments(arglen,vargs,"s",TRUE)) return lives_osc_notify_failure();
   lives_osc_parse_string_argument(vargs,cname);
   retval=get_omc_const(cname);
-  lives_status_send (retval);
+  lives_status_send(retval);
+  return TRUE;
 }
 
 
 
-void lives_osc_cb_open_status_socket(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_open_status_socket(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   char host[OSC_STRING_SIZE];
   int port;
 
-  if (!lives_osc_check_arguments (arglen,vargs,"si",FALSE)) {
-    if (!lives_osc_check_arguments (arglen,vargs,"i",TRUE)) return lives_osc_notify_failure();
-    g_snprintf (host,OSC_STRING_SIZE,"localhost");
-  }
-  else {
-    lives_osc_check_arguments (arglen,vargs,"si",TRUE);
+  if (!lives_osc_check_arguments(arglen,vargs,"si",FALSE)) {
+    if (!lives_osc_check_arguments(arglen,vargs,"i",TRUE)) return lives_osc_notify_failure();
+    lives_snprintf(host,OSC_STRING_SIZE,"localhost");
+  } else {
+    lives_osc_check_arguments(arglen,vargs,"si",TRUE);
     lives_osc_parse_string_argument(vargs,host);
   }
   lives_osc_parse_int_argument(vargs,&port);
@@ -1741,84 +1725,89 @@
     return lives_osc_notify_failure();
   }
 
-  if (!(status_socket=OpenHTMSocket (host,port,TRUE))) LIVES_WARN ("Unable to open status socket !");
-  else if (prefs->omc_noisy) {
-    lives_osc_notify_success(NULL);
+  if (!(status_socket=OpenHTMSocket(host,port,TRUE))) {
+    LIVES_WARN("Unable to open status socket !");
+    return lives_osc_notify_failure();
   }
 
+  return lives_osc_notify_success(NULL);
+
+
 }
 
-void lives_osc_cb_open_notify_socket(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_open_notify_socket(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   char host[OSC_STRING_SIZE];
   int port;
 
-  if (!lives_osc_check_arguments (arglen,vargs,"si",FALSE)) {
-    if (!lives_osc_check_arguments (arglen,vargs,"i",TRUE)) return;
-    g_snprintf (host,OSC_STRING_SIZE,"localhost");
-  }
-  else {
-    lives_osc_check_arguments (arglen,vargs,"si",TRUE);
+  if (!lives_osc_check_arguments(arglen,vargs,"si",FALSE)) {
+    if (!lives_osc_check_arguments(arglen,vargs,"i",TRUE)) return lives_osc_notify_failure();
+    lives_snprintf(host,OSC_STRING_SIZE,"localhost");
+  } else {
+    lives_osc_check_arguments(arglen,vargs,"si",TRUE);
     lives_osc_parse_string_argument(vargs,host);
   }
   lives_osc_parse_int_argument(vargs,&port);
 
   if (notify_socket!=NULL) {
     LIVES_INFO("OMC notify socket already opened");
-    return;
+    return lives_osc_notify_failure();
   }
 
-  if (!(notify_socket=OpenHTMSocket (host,port,TRUE))) LIVES_WARN ("Unable to open notify socket !");
   prefs->omc_noisy=FALSE; // default for confirms is OFF
+  if (!(notify_socket=OpenHTMSocket(host,port,TRUE))) {
+    LIVES_WARN("Unable to open notify socket !");
+    return lives_osc_notify_failure();
+  }
+  return lives_osc_notify_success(NULL);
 
 }
 
-void lives_osc_cb_close_status_socket(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_close_status_socket(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   lives_osc_close_status_socket();
-  lives_osc_notify_success(NULL);
+  return lives_osc_notify_success(NULL);
 }
 
 
-void lives_osc_cb_notify_c(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_notify_c(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   int state;
-  if (!lives_osc_check_arguments (arglen,vargs,"i",TRUE)) return lives_osc_notify_failure();
+  if (!lives_osc_check_arguments(arglen,vargs,"i",TRUE)) return lives_osc_notify_failure();
   lives_osc_parse_int_argument(vargs,&state);
   if (state>0) {
     prefs->omc_noisy=TRUE;
-    lives_osc_notify_success(NULL);
-  }
-  else prefs->omc_noisy=FALSE;
+  } else prefs->omc_noisy=FALSE;
+  return lives_osc_notify_success(NULL);
 }
 
 
-void lives_osc_cb_notify_e(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_notify_e(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   int state;
-  if (!lives_osc_check_arguments (arglen,vargs,"i",TRUE)) return lives_osc_notify_failure();
+  if (!lives_osc_check_arguments(arglen,vargs,"i",TRUE)) return lives_osc_notify_failure();
   lives_osc_parse_int_argument(vargs,&state);
   if (state>0) {
     prefs->omc_events=TRUE;
-  }
-  else prefs->omc_events=FALSE;
-  lives_osc_notify_success(NULL);
+  } else prefs->omc_events=FALSE;
+  return lives_osc_notify_success(NULL);
 }
 
 
 
-void lives_osc_cb_clip_count(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_clip_count(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   char *tmp;
 
-  if (status_socket==NULL) return;
-  lives_status_send ((tmp=g_strdup_printf ("%d",mainw->clips_available)));
-  g_free(tmp);
-
+  lives_status_send((tmp=lives_strdup_printf("%d",mainw->clips_available)));
+  lives_free(tmp);
+  return TRUE;
 }
 
-void lives_osc_cb_clip_goto(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+
+boolean lives_osc_cb_clip_goto(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
 
   int frame;
-  if (mainw->current_file<1||mainw->preview||mainw->playing_file<1) return lives_osc_notify_failure();
+  if (mainw->current_file<1||(mainw->preview||(mainw->multitrack==NULL&&mainw->event_list!=NULL))||mainw->playing_file<1||
+      mainw->is_processing) return lives_osc_notify_failure();
   if (mainw->multitrack!=NULL) return lives_osc_notify_failure();
 
-  if (!lives_osc_check_arguments (arglen,vargs,"i",TRUE)) return lives_osc_notify_failure();
+  if (!lives_osc_check_arguments(arglen,vargs,"i",TRUE)) return lives_osc_notify_failure();
   lives_osc_parse_int_argument(vargs,&frame);
 
   if (frame<1||frame>cfile->frames||(cfile->clip_type!=CLIP_TYPE_DISK&&cfile->clip_type!=CLIP_TYPE_FILE)) return lives_osc_notify_failure();
@@ -1830,120 +1819,133 @@
     resync_audio(frame);
   }
 #endif
-  lives_osc_notify_success(NULL);
+  return lives_osc_notify_success(NULL);
 }
 
 
-void lives_osc_cb_clip_getframe(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_clip_getframe(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   char *tmp;
-  if (status_socket==NULL) return;
-  if (mainw->current_file<1||mainw->preview||mainw->playing_file<1) lives_status_send ("0");
+  if (mainw->current_file<1||(mainw->preview||(mainw->multitrack==NULL&&mainw->event_list!=NULL))||
+      mainw->playing_file<1) lives_status_send("0");
   else {
-    lives_status_send ((tmp=g_strdup_printf ("%d",mainw->actual_frame)));
-    g_free(tmp);
+    lives_status_send((tmp=lives_strdup_printf("%d",mainw->actual_frame)));
+    lives_free(tmp);
   }
+  return TRUE;
 }
 
 
-void lives_osc_cb_clip_getfps(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_clip_getfps(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   char *tmp;
 
   if (mainw->current_file<1) return lives_osc_notify_failure();
 
-  if (mainw->current_file<0) lives_status_send ((tmp=g_strdup_printf ("%.3f",0.)));
-  else if (mainw->preview||mainw->playing_file<1) lives_status_send ((tmp=g_strdup_printf ("%.3f",cfile->fps)));
-  else lives_status_send ((tmp=g_strdup_printf ("%.3f",cfile->pb_fps)));
-  g_free(tmp);
+  if (mainw->current_file<0) lives_status_send((tmp=lives_strdup_printf("%.3f",0.)));
+  else if ((mainw->preview||(mainw->multitrack==NULL&&mainw->event_list!=NULL))||
+           mainw->playing_file<1) lives_status_send((tmp=lives_strdup_printf("%.3f",cfile->fps)));
+  else lives_status_send((tmp=lives_strdup_printf("%.3f",cfile->pb_fps)));
+  lives_free(tmp);
+  return TRUE;
 }
 
 
-void lives_osc_cb_clip_get_ifps(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_clip_get_ifps(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   char *tmp;
   lives_clip_t *sfile;
   int clip=mainw->current_file;
 
-  if (lives_osc_check_arguments (arglen,vargs,"i",FALSE)) { 
-    lives_osc_check_arguments (arglen,vargs,"i",TRUE);
+  if (lives_osc_check_arguments(arglen,vargs,"i",FALSE)) {
+    lives_osc_check_arguments(arglen,vargs,"i",TRUE);
     lives_osc_parse_int_argument(vargs,&clip);
   }
 
   if (clip<1||clip>MAX_FILES||mainw->files[clip]==NULL) return lives_osc_notify_failure();
 
   sfile=mainw->files[clip];
-  if (mainw->preview||mainw->playing_file<1) lives_status_send ((tmp=g_strdup_printf ("%.3f",sfile->fps)));
-  else lives_status_send ((tmp=g_strdup_printf ("%.3f",sfile->pb_fps)));
-  g_free(tmp);
+  if ((mainw->preview||(mainw->multitrack==NULL&&mainw->event_list!=NULL))||
+      mainw->playing_file<1) lives_status_send((tmp=lives_strdup_printf("%.3f",sfile->fps)));
+  else lives_status_send((tmp=lives_strdup_printf("%.3f",sfile->pb_fps)));
+  lives_free(tmp);
+  return TRUE;
 }
 
 
-void lives_osc_cb_get_fps_ratio(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_get_fps_ratio(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   char *tmp;
 
   if (mainw->current_file<1) return lives_osc_notify_failure();
 
-  if (mainw->current_file<0) lives_status_send ((tmp=g_strdup_printf ("%.4f",0.)));
-  else if (mainw->preview||mainw->playing_file<1) lives_status_send ((tmp=g_strdup_printf ("%.4f",1.)));
-  else lives_status_send ((tmp=g_strdup_printf ("%.4f",cfile->pb_fps/cfile->fps)));
-  g_free(tmp);
+  if (mainw->current_file<0) lives_status_send((tmp=lives_strdup_printf("%.4f",0.)));
+  else if ((mainw->preview||(mainw->multitrack==NULL&&mainw->event_list!=NULL))||
+           mainw->playing_file<1) lives_status_send((tmp=lives_strdup_printf("%.4f",1.)));
+  else lives_status_send((tmp=lives_strdup_printf("%.4f",cfile->pb_fps/cfile->fps)));
+  lives_free(tmp);
+  return TRUE;
 }
 
 
-void lives_osc_cb_bgget_fps_ratio(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_bgget_fps_ratio(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   char *tmp;
 
   if (mainw->current_file<1) return lives_osc_notify_failure();
 
-  if (mainw->current_file<0||mainw->blend_file<0||mainw->files[mainw->blend_file]==NULL) 
-    lives_status_send ((tmp=g_strdup_printf ("%.4f",0.)));
-  else if (mainw->preview||mainw->playing_file<1) lives_status_send ((tmp=g_strdup_printf ("%.4f",1.)));
-  else lives_status_send ((tmp=g_strdup_printf ("%.4f",mainw->files[mainw->blend_file]->pb_fps/
-						mainw->files[mainw->blend_file]->fps)));
-  g_free(tmp);
+  if (mainw->current_file<0||mainw->blend_file<0||mainw->files[mainw->blend_file]==NULL)
+    lives_status_send((tmp=lives_strdup_printf("%.4f",0.)));
+  else if ((mainw->preview||(mainw->multitrack==NULL&&mainw->event_list!=NULL))||
+           mainw->playing_file<1) lives_status_send((tmp=lives_strdup_printf("%.4f",1.)));
+  else lives_status_send((tmp=lives_strdup_printf("%.4f",mainw->files[mainw->blend_file]->pb_fps/
+                                mainw->files[mainw->blend_file]->fps)));
+  lives_free(tmp);
+  return TRUE;
 }
 
 
-void lives_osc_cb_bgclip_getframe(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_bgclip_getframe(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   char *tmp;
 
-  if (mainw->current_file<1||mainw->preview||mainw->playing_file<1||mainw->blend_file<0||
-      mainw->files[mainw->blend_file]==NULL) lives_status_send ("0");
+  if (mainw->current_file<1||(mainw->preview||(mainw->multitrack==NULL&&mainw->event_list!=NULL))||mainw->playing_file<1||
+      mainw->blend_file<0||
+      mainw->files[mainw->blend_file]==NULL) lives_status_send("0");
   else {
-    lives_status_send ((tmp=g_strdup_printf ("%d",mainw->files[mainw->blend_file]->frameno)));
-    g_free(tmp);
+    lives_status_send((tmp=lives_strdup_printf("%d",mainw->files[mainw->blend_file]->frameno)));
+    lives_free(tmp);
   }
+  return TRUE;
 }
 
 
-void lives_osc_cb_bgclip_getfps(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_bgclip_getfps(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   char *tmp;
 
   if (mainw->current_file<1) return lives_osc_notify_failure();
-  if (mainw->blend_file<0||mainw->files[mainw->blend_file]==NULL) lives_status_send ((tmp=g_strdup_printf ("%.3f",0.)));
-  else if (mainw->preview||mainw->playing_file<1) lives_status_send ((tmp=g_strdup_printf ("%.3f",mainw->files[mainw->blend_file]->fps)));
-  else lives_status_send ((tmp=g_strdup_printf ("%.3f",mainw->files[mainw->blend_file]->pb_fps)));
-  g_free(tmp);
+  if (mainw->blend_file<0||mainw->files[mainw->blend_file]==NULL) lives_status_send((tmp=lives_strdup_printf("%.3f",0.)));
+  else if ((mainw->preview||(mainw->multitrack==NULL&&mainw->event_list!=NULL))||
+           mainw->playing_file<1) lives_status_send((tmp=lives_strdup_printf("%.3f",mainw->files[mainw->blend_file]->fps)));
+  else lives_status_send((tmp=lives_strdup_printf("%.3f",mainw->files[mainw->blend_file]->pb_fps)));
+  lives_free(tmp);
+  return TRUE;
 }
 
 
-void lives_osc_cb_getmode(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
-  if (status_socket==NULL) return;
-
+boolean lives_osc_cb_getmode(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   if (mainw->multitrack!=NULL) lives_status_send(get_omc_const("LIVES_MODE_MULTITRACK"));
   else lives_status_send(get_omc_const("LIVES_MODE_CLIPEDIT"));
+  return TRUE;
 }
 
 
 
 
-void lives_osc_cb_setmode(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_setmode(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   char *modes;
   int mode;
   int cliped=atoi(get_omc_const("LIVES_MODE_CLIPEDIT")); // 0
   int mt=atoi(get_omc_const("LIVES_MODE_MULTITRACK")); // 1
 
-  if (mainw->preview||mainw->is_processing||mainw->playing_file>-1) return lives_osc_notify_failure();
+  if ((mainw->preview||(mainw->multitrack==NULL&&mainw->event_list!=NULL))||mainw->is_processing||
+      mainw->playing_file>-1) return lives_osc_notify_failure();
 
-  if (!lives_osc_check_arguments (arglen,vargs,"i",TRUE)) return lives_osc_notify_failure();
+  if (!lives_osc_check_arguments(arglen,vargs,"i",TRUE)) return lives_osc_notify_failure();
 
   lives_osc_parse_int_argument(vargs,&mode);
 
@@ -1953,220 +1955,241 @@
   if (mode==mt && mainw->multitrack==NULL) on_multitrack_activate(NULL,NULL);
   else if (mode==cliped && mainw->multitrack!=NULL) multitrack_delete(mainw->multitrack,FALSE);
 
-  modes=g_strdup_printf("%d",mode);
+  modes=lives_strdup_printf("%d",mode);
   lives_osc_notify_success(modes);
-  g_free(modes);
+  lives_free(modes);
+  return TRUE;
 }
 
 
-void lives_osc_cb_clearlay(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
-  if (mainw->playing_file>-1||mainw->preview||mainw->is_processing||mainw->multitrack==NULL) return lives_osc_notify_failure();
+boolean lives_osc_cb_clearlay(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+  if (mainw->playing_file>-1||(mainw->preview||(mainw->multitrack==NULL&&mainw->event_list!=NULL))||mainw->is_processing||
+      mainw->multitrack==NULL) return lives_osc_notify_failure();
   wipe_layout(mainw->multitrack);
   return lives_osc_notify_success(NULL);
 }
 
 
-void lives_osc_cb_blockcount(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_blockcount(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   char *tmp;
   int nblocks;
   int track;
   if (mainw->multitrack==NULL) return lives_osc_notify_failure();
 
-  if (lives_osc_check_arguments (arglen,vargs,"i",FALSE)) {
-    lives_osc_check_arguments (arglen,vargs,"i",TRUE);
+  if (lives_osc_check_arguments(arglen,vargs,"i",FALSE)) {
+    lives_osc_check_arguments(arglen,vargs,"i",TRUE);
     lives_osc_parse_int_argument(vargs,&track);
-  }
-  else if (lives_osc_check_arguments (arglen,vargs,"",TRUE)) {
+  } else if (lives_osc_check_arguments(arglen,vargs,"",TRUE)) {
     track=mainw->multitrack->current_track;
   } else return lives_osc_notify_failure();
 
   nblocks=mt_get_block_count(mainw->multitrack,track);
 
-  tmp=g_strdup_printf("%d",nblocks);
+  tmp=lives_strdup_printf("%d",nblocks);
   lives_status_send(tmp);
-  g_free(tmp);
+  lives_free(tmp);
+  return TRUE;
 
 }
 
 
-void lives_osc_cb_blockinsert(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_blockinsert(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+  boolean ins_audio,oins_audio;
+  boolean ign_ins_sel,oign_ins_sel;
+
   int clip;
-  int opt;
 
   char *tmp;
 
-  if (mainw->playing_file>-1||mainw->preview||mainw->is_processing||mainw->multitrack==NULL) return lives_osc_notify_failure();
+  if (mainw->playing_file>-1||(mainw->preview||(mainw->multitrack==NULL&&mainw->event_list!=NULL))||mainw->is_processing||
+      mainw->multitrack==NULL) return lives_osc_notify_failure();
+
+  oins_audio=ins_audio=mainw->multitrack->opts.insert_audio;
+  oign_ins_sel=ign_ins_sel=mainw->multitrack->opts.ign_ins_sel;
 
-  if (lives_osc_check_arguments (arglen,vargs,"ii",FALSE)) { 
-    lives_osc_check_arguments (arglen,vargs,"ii",TRUE);
+  if (lives_osc_check_arguments(arglen,vargs,"iii",FALSE)) {
+    lives_osc_check_arguments(arglen,vargs,"iii",TRUE);
     lives_osc_parse_int_argument(vargs,&clip);
-    lives_osc_parse_int_argument(vargs,&opt);
+    lives_osc_parse_int_argument(vargs,&ign_ins_sel);
+    lives_osc_parse_int_argument(vargs,&ins_audio);
   }
-  else if (lives_osc_check_arguments (arglen,vargs,"i",TRUE)) { 
+  if (lives_osc_check_arguments(arglen,vargs,"ii",FALSE)) {
+    lives_osc_check_arguments(arglen,vargs,"ii",TRUE);
     lives_osc_parse_int_argument(vargs,&clip);
-  }
-  else return lives_osc_notify_failure();
+    lives_osc_parse_int_argument(vargs,&ign_ins_sel);
+  } else if (lives_osc_check_arguments(arglen,vargs,"i",TRUE)) {
+    lives_osc_parse_int_argument(vargs,&clip);
+  } else return lives_osc_notify_failure();
 
-  if (clip<1||mainw->files[clip]==NULL||clip==mainw->current_file||clip==mainw->scrap_file||clip==mainw->ascrap_file) 
+  if (clip<1||mainw->files[clip]==NULL||clip==mainw->current_file||clip==mainw->scrap_file||clip==mainw->ascrap_file)
     return lives_osc_notify_failure();
 
   mainw->multitrack->clip_selected=clip-1;
   mt_clip_select(mainw->multitrack,TRUE);
+
+  mainw->multitrack->opts.insert_audio=ins_audio;
+  mainw->multitrack->opts.ign_ins_sel=ign_ins_sel;
+
   multitrack_insert(NULL,mainw->multitrack);
 
-  tmp=g_strdup_printf("%d|%d",mainw->multitrack->current_track, 
-		      mt_get_last_block_number(mainw->multitrack, mainw->multitrack->current_track));
+  mainw->multitrack->opts.insert_audio=oins_audio;
+  mainw->multitrack->opts.ign_ins_sel=oign_ins_sel;
+
+  tmp=lives_strdup_printf("%lu",mt_get_last_block_uid(mainw->multitrack));
 
   lives_osc_notify_success(tmp);
-  g_free(tmp);
+  lives_free(tmp);
+  return TRUE;
 
 }
 
-void lives_osc_cb_mtctimeset(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_mtctimeset(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   float time;
   char *msg;
 
-  if (mainw->playing_file>-1||mainw->preview||mainw->is_processing||mainw->multitrack==NULL) return lives_osc_notify_failure();
+  if (mainw->playing_file>-1||(mainw->preview||(mainw->multitrack==NULL&&mainw->event_list!=NULL))||mainw->is_processing||
+      mainw->multitrack==NULL) return lives_osc_notify_failure();
 
-  if (lives_osc_check_arguments (arglen,vargs,"f",TRUE)) { 
+  if (lives_osc_check_arguments(arglen,vargs,"f",TRUE)) {
     lives_osc_parse_float_argument(vargs,&time);
-  }
-  else return lives_osc_notify_failure();
+  } else return lives_osc_notify_failure();
 
   if (time<0.) return lives_osc_notify_failure();
 
   time=q_dbl(time,mainw->multitrack->fps)/U_SEC;
-  mt_tl_move(mainw->multitrack,time-lives_ruler_get_value(LIVES_RULER(mainw->multitrack->timeline)));
+  mt_tl_move(mainw->multitrack,time);
 
-  msg=g_strdup_printf("%.8f",lives_ruler_get_value(LIVES_RULER(mainw->multitrack->timeline)));
+  msg=lives_strdup_printf("%.8f",lives_ruler_get_value(LIVES_RULER(mainw->multitrack->timeline)));
   lives_osc_notify_success(msg);
-  g_free(msg);
+  lives_free(msg);
+  return TRUE;
 }
 
-void lives_osc_cb_mtctimeget(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_mtctimeget(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   char *msg;
 
   if (mainw->multitrack==NULL) return lives_osc_notify_failure();
 
-  msg=g_strdup_printf("%.8f",lives_ruler_get_value(LIVES_RULER(mainw->multitrack->timeline)));
+  msg=lives_strdup_printf("%.8f",lives_ruler_get_value(LIVES_RULER(mainw->multitrack->timeline)));
   lives_status_send(msg);
-  g_free(msg);
+  lives_free(msg);
+  return TRUE;
 }
 
-void lives_osc_cb_mtctrackset(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_mtctrackset(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   int track;
   char *msg;
 
-  if (mainw->playing_file>-1||mainw->preview||mainw->is_processing||mainw->multitrack==NULL) return lives_osc_notify_failure();
+  if (mainw->playing_file>-1||(mainw->preview||(mainw->multitrack==NULL&&mainw->event_list!=NULL))||mainw->is_processing||
+      mainw->multitrack==NULL) return lives_osc_notify_failure();
 
-  if (lives_osc_check_arguments (arglen,vargs,"i",TRUE)) { 
+  if (lives_osc_check_arguments(arglen,vargs,"i",TRUE)) {
     lives_osc_parse_int_argument(vargs,&track);
-  }
-  else return lives_osc_notify_failure();
+  } else return lives_osc_notify_failure();
 
   if (mt_track_is_video(mainw->multitrack,track)||mt_track_is_audio(mainw->multitrack,track)) {
     mainw->multitrack->current_track=track;
     track_select(mainw->multitrack);
-    msg=g_strdup_printf("%d",track);
+    msg=lives_strdup_printf("%d",track);
     lives_osc_notify_success(msg);
-    g_free(msg);
-  }
-  else return lives_osc_notify_failure();
+    lives_free(msg);
+    return TRUE;
+  } else return lives_osc_notify_failure();
 }
 
 
-void lives_osc_cb_mtctrackget(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_mtctrackget(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   char *msg;
   if (mainw->multitrack==NULL) return lives_osc_notify_failure();
-  
-  msg=g_strdup_printf("%d",mainw->multitrack->current_track);
+
+  msg=lives_strdup_printf("%d",mainw->multitrack->current_track);
   lives_status_send(msg);
-  g_free(msg);
+  lives_free(msg);
+  return TRUE;
 
 }
 
 
 
-void lives_osc_cb_blockstget(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_blockstget(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   int track;
   int nblock;
   double sttime;
   char *tmp;
   if (mainw->multitrack==NULL) return lives_osc_notify_failure();
 
-  if (lives_osc_check_arguments (arglen,vargs,"ii",FALSE)) { 
-    lives_osc_check_arguments (arglen,vargs,"ii",TRUE);
+  if (lives_osc_check_arguments(arglen,vargs,"ii",FALSE)) {
+    lives_osc_check_arguments(arglen,vargs,"ii",TRUE);
     lives_osc_parse_int_argument(vargs,&track);
     lives_osc_parse_int_argument(vargs,&nblock);
-  }
-  else if (lives_osc_check_arguments (arglen,vargs,"i",TRUE)) { 
+  } else if (lives_osc_check_arguments(arglen,vargs,"i",TRUE)) {
     track=mainw->multitrack->current_track;
     lives_osc_parse_int_argument(vargs,&nblock);
-  }
-  else return lives_osc_notify_failure();
+  } else return lives_osc_notify_failure();
 
   if (mt_track_is_video(mainw->multitrack,track)||mt_track_is_audio(mainw->multitrack,track)) {
     sttime=mt_get_block_sttime(mainw->multitrack,track,nblock);
     if (sttime<0.) return lives_osc_notify_failure();
-    tmp=g_strdup_printf("%.8f",sttime);
+    tmp=lives_strdup_printf("%.8f",sttime);
     lives_status_send(tmp);
-    g_free(tmp);
-    return;
+    lives_free(tmp);
+    return TRUE;
   }
   return lives_osc_notify_failure(); ///< invalid track
 }
 
 
-void lives_osc_cb_blockenget(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_blockenget(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   int track;
   int nblock;
   double entime;
   char *tmp;
   if (mainw->multitrack==NULL) return lives_osc_notify_failure();
 
-  if (lives_osc_check_arguments (arglen,vargs,"ii",FALSE)) { 
-    lives_osc_check_arguments (arglen,vargs,"ii",TRUE);
+  if (lives_osc_check_arguments(arglen,vargs,"ii",FALSE)) {
+    lives_osc_check_arguments(arglen,vargs,"ii",TRUE);
     lives_osc_parse_int_argument(vargs,&track);
     lives_osc_parse_int_argument(vargs,&nblock);
-  }
-  else if (lives_osc_check_arguments (arglen,vargs,"i",TRUE)) { 
+  } else if (lives_osc_check_arguments(arglen,vargs,"i",TRUE)) {
     track=mainw->multitrack->current_track;
     lives_osc_parse_int_argument(vargs,&nblock);
-  }
-  else return lives_osc_notify_failure();
+  } else return lives_osc_notify_failure();
 
   if (mt_track_is_video(mainw->multitrack,track)||mt_track_is_audio(mainw->multitrack,track)) {
     entime=mt_get_block_entime(mainw->multitrack,track,nblock);
     if (entime<0.) return lives_osc_notify_failure();
-    tmp=g_strdup_printf("%.8f",entime);
+    tmp=lives_strdup_printf("%.8f",entime);
     lives_status_send(tmp);
-    g_free(tmp);
-    return;
+    lives_free(tmp);
+    return TRUE;
   }
   return lives_osc_notify_failure(); ///< invalid track
 }
 
 
 
-void lives_osc_cb_get_playtime(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_get_playtime(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   char *tmp;
 
-  if (mainw->current_file<1||mainw->preview||mainw->playing_file<1) return lives_osc_notify_failure();
+  if (mainw->current_file<1||(mainw->preview||(mainw->multitrack==NULL&&mainw->event_list!=NULL))||
+      mainw->playing_file<1) return lives_osc_notify_failure();
 
-  lives_status_send ((tmp=g_strdup_printf ("%.8f",(double)mainw->currticks/U_SEC)));
-  g_free(tmp);
+  lives_status_send((tmp=lives_strdup_printf("%.8f",(double)mainw->currticks/U_SEC)));
+  lives_free(tmp);
+  return TRUE;
 }
 
 
-void lives_osc_cb_bgclip_goto(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_bgclip_goto(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
 
   int frame;
-  if (mainw->current_file<1||mainw->preview||mainw->playing_file<1) return lives_osc_notify_failure();
+  if (mainw->current_file<1||(mainw->preview||(mainw->multitrack==NULL&&mainw->event_list!=NULL))||mainw->playing_file<1||
+      mainw->is_processing) return lives_osc_notify_failure();
   if (mainw->multitrack!=NULL) return lives_osc_notify_failure();
 
   if (mainw->blend_file<1||mainw->files[mainw->blend_file]==NULL||mainw->blend_file==mainw->current_file) return lives_osc_notify_failure();
 
-  if (!lives_osc_check_arguments (arglen,vargs,"i",TRUE)) return lives_osc_notify_failure();
+  if (!lives_osc_check_arguments(arglen,vargs,"i",TRUE)) return lives_osc_notify_failure();
   lives_osc_parse_int_argument(vargs,&frame);
 
   if (frame<1||frame>mainw->files[mainw->blend_file]->frames||
@@ -2174,50 +2197,54 @@
        mainw->files[mainw->blend_file]->clip_type!=CLIP_TYPE_FILE)) return lives_osc_notify_failure();
 
   mainw->files[mainw->blend_file]->last_frameno=mainw->files[mainw->blend_file]->frameno=frame;
+  return lives_osc_notify_success(NULL);
 
 }
 
 
-void lives_osc_cb_clip_get_current(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_clip_get_current(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   char *tmp;
-
-  if (status_socket==NULL) return;
-  lives_status_send ((tmp=g_strdup_printf ("%d",mainw->current_file<0?0:mainw->current_file)));
-  g_free(tmp);
+  lives_status_send((tmp=lives_strdup_printf("%d",mainw->current_file<0?0:mainw->current_file)));
+  lives_free(tmp);
+  return TRUE;
 
 }
 
 
-void lives_osc_cb_bgclip_get_current(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_bgclip_get_current(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   char *tmp;
 
   if (mainw->multitrack!=NULL) return lives_osc_notify_failure();
-  lives_status_send ((tmp=g_strdup_printf ("%d",mainw->blend_file<0?0:mainw->blend_file)));
-  g_free(tmp);
-
+  lives_status_send((tmp=lives_strdup_printf("%d",mainw->blend_file<0?0:mainw->blend_file)));
+  lives_free(tmp);
+  return TRUE;
 }
 
 
 
-void lives_osc_cb_clip_set_start(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_clip_set_start(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+  char *msg;
+
   int current_file=mainw->current_file;
   int clip=current_file;
   int frame;
 
+  boolean selwidth_locked=mainw->selwidth_locked;
+
   lives_clip_t *sfile;
 
-  if (mainw->current_file<1||mainw->preview||mainw->is_processing) return lives_osc_notify_failure();
+
+  if (mainw->current_file<1||(mainw->preview||(mainw->multitrack==NULL&&mainw->event_list!=NULL))||
+      mainw->is_processing) return lives_osc_notify_failure();
   if (mainw->multitrack!=NULL) return lives_osc_notify_failure();
 
-  if (lives_osc_check_arguments (arglen,vargs,"ii",FALSE)) { 
-    lives_osc_check_arguments (arglen,vargs,"ii",TRUE);
+  if (lives_osc_check_arguments(arglen,vargs,"ii",FALSE)) {
+    lives_osc_check_arguments(arglen,vargs,"ii",TRUE);
     lives_osc_parse_int_argument(vargs,&frame);
     lives_osc_parse_int_argument(vargs,&clip);
-  }
-  else if (lives_osc_check_arguments (arglen,vargs,"i",TRUE)) { 
+  } else if (lives_osc_check_arguments(arglen,vargs,"i",TRUE)) {
     lives_osc_parse_int_argument(vargs,&frame);
-  }
-  else return lives_osc_notify_failure();
+  } else return lives_osc_notify_failure();
 
   if (clip<1||clip>MAX_FILES||mainw->files[clip]==NULL) return lives_osc_notify_failure();
 
@@ -2227,19 +2254,24 @@
 
   if (frame>sfile->frames) frame=sfile->frames;
 
+  mainw->selwidth_locked=FALSE;
   if (clip==mainw->current_file) lives_spin_button_set_value(LIVES_SPIN_BUTTON(mainw->spinbutton_start),frame);
-  else sfile->start=frame;
-
-  if (prefs->omc_noisy) {
-    char *msg=g_strdup_printf("%d",frame);
-    lives_osc_notify_success(msg);
-    g_free(msg);
+  else {
+    if (sfile->end<frame) sfile->end=frame;
+    sfile->start=frame;
   }
+  mainw->selwidth_locked=selwidth_locked;
+
+  msg=lives_strdup_printf("%d",frame);
+  lives_osc_notify_success(msg);
+  lives_free(msg);
+
+  return TRUE;
 }
 
 
 
-void lives_osc_cb_clip_get_start(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_clip_get_start(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   int current_file=mainw->current_file;
   int clip=current_file;
   char *tmp;
@@ -2249,8 +2281,8 @@
   if (mainw->current_file<1) return lives_osc_notify_failure();
   if (mainw->multitrack!=NULL) return lives_osc_notify_failure();
 
-  if (lives_osc_check_arguments (arglen,vargs,"i",FALSE)) { 
-    lives_osc_check_arguments (arglen,vargs,"i",TRUE);
+  if (lives_osc_check_arguments(arglen,vargs,"i",FALSE)) {
+    lives_osc_check_arguments(arglen,vargs,"i",TRUE);
     lives_osc_parse_int_argument(vargs,&clip);
   }
 
@@ -2258,30 +2290,34 @@
 
   sfile=mainw->files[clip];
 
-  lives_status_send ((tmp=g_strdup_printf ("%d",sfile->start)));
-  g_free(tmp);
+  lives_status_send((tmp=lives_strdup_printf("%d",sfile->start)));
+  lives_free(tmp);
+  return TRUE;
 }
 
 
-void lives_osc_cb_clip_set_end(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_clip_set_end(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+  char *msg;
+
   int current_file=mainw->current_file;
   int clip=current_file;
   int frame;
 
+  boolean selwidth_locked=mainw->selwidth_locked;
+
   lives_clip_t *sfile;
 
-  if (mainw->current_file<1||mainw->preview||mainw->is_processing) return lives_osc_notify_failure();
+  if (mainw->current_file<1||(mainw->preview||(mainw->multitrack==NULL&&mainw->event_list!=NULL))||
+      mainw->is_processing) return lives_osc_notify_failure();
   if (mainw->multitrack!=NULL) return lives_osc_notify_failure();
 
-  if (lives_osc_check_arguments (arglen,vargs,"ii",FALSE)) { 
-    lives_osc_check_arguments (arglen,vargs,"ii",TRUE);
+  if (lives_osc_check_arguments(arglen,vargs,"ii",FALSE)) {
+    lives_osc_check_arguments(arglen,vargs,"ii",TRUE);
     lives_osc_parse_int_argument(vargs,&frame);
     lives_osc_parse_int_argument(vargs,&clip);
-  }
-  else if (lives_osc_check_arguments (arglen,vargs,"i",TRUE)) { 
+  } else if (lives_osc_check_arguments(arglen,vargs,"i",TRUE)) {
     lives_osc_parse_int_argument(vargs,&frame);
-  }
-  else return lives_osc_notify_failure();
+  } else return lives_osc_notify_failure();
 
   if (clip<1||clip>MAX_FILES||mainw->files[clip]==NULL) return lives_osc_notify_failure();
 
@@ -2291,17 +2327,23 @@
 
   if (frame>sfile->frames) frame=sfile->frames;
 
+  mainw->selwidth_locked=FALSE;
   if (clip==mainw->current_file) lives_spin_button_set_value(LIVES_SPIN_BUTTON(mainw->spinbutton_end),frame);
-  else sfile->end=frame;
-
-  if (prefs->omc_noisy) {
-    char *msg=g_strdup_printf("%d",frame);
-    lives_osc_notify_success(msg);
-    g_free(msg);
+  else {
+    if (sfile->start>frame) sfile->start=frame;
+    sfile->end=frame;
   }
+  mainw->selwidth_locked=selwidth_locked;
+
+  msg=lives_strdup_printf("%d",frame);
+  lives_osc_notify_success(msg);
+  lives_free(msg);
+
+  return TRUE;
 }
 
-void lives_osc_cb_clip_get_end(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+
+boolean lives_osc_cb_clip_get_end(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   int current_file=mainw->current_file;
   int clip=current_file;
   char *tmp;
@@ -2311,8 +2353,8 @@
   if (mainw->current_file<1) return lives_osc_notify_failure();
   if (mainw->multitrack!=NULL) return lives_osc_notify_failure();
 
-  if (lives_osc_check_arguments (arglen,vargs,"i",FALSE)) { 
-    lives_osc_check_arguments (arglen,vargs,"i",TRUE);
+  if (lives_osc_check_arguments(arglen,vargs,"i",FALSE)) {
+    lives_osc_check_arguments(arglen,vargs,"i",TRUE);
     lives_osc_parse_int_argument(vargs,&clip);
   }
 
@@ -2320,11 +2362,12 @@
 
   sfile=mainw->files[clip];
 
-  lives_status_send ((tmp=g_strdup_printf ("%d",sfile->end)));
-  g_free(tmp);
+  lives_status_send((tmp=lives_strdup_printf("%d",sfile->end)));
+  lives_free(tmp);
+  return TRUE;
 }
 
-void lives_osc_cb_clip_get_size(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_clip_get_size(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   int current_file=mainw->current_file;
   int clip=current_file;
   char *tmp;
@@ -2333,8 +2376,8 @@
 
   if (mainw->current_file<1) return lives_osc_notify_failure();
 
-  if (lives_osc_check_arguments (arglen,vargs,"i",FALSE)) { 
-    lives_osc_check_arguments (arglen,vargs,"i",TRUE);
+  if (lives_osc_check_arguments(arglen,vargs,"i",FALSE)) {
+    lives_osc_check_arguments(arglen,vargs,"i",TRUE);
     lives_osc_parse_int_argument(vargs,&clip);
   }
 
@@ -2342,11 +2385,12 @@
 
   sfile=mainw->files[clip];
 
-  lives_status_send ((tmp=g_strdup_printf ("%d|%d",sfile->hsize,sfile->vsize)));
-  g_free(tmp);
+  lives_status_send((tmp=lives_strdup_printf("%d|%d",sfile->hsize,sfile->vsize)));
+  lives_free(tmp);
+  return TRUE;
 }
 
-void lives_osc_cb_clip_get_name(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_clip_get_name(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   int current_file=mainw->current_file;
   int clip=current_file;
 
@@ -2354,57 +2398,54 @@
 
   if (mainw->current_file<1) return lives_osc_notify_failure();
 
-  if (lives_osc_check_arguments (arglen,vargs,"i",FALSE)) { 
-    lives_osc_check_arguments (arglen,vargs,"i",TRUE);
+  if (lives_osc_check_arguments(arglen,vargs,"i",FALSE)) {
+    lives_osc_check_arguments(arglen,vargs,"i",TRUE);
     lives_osc_parse_int_argument(vargs,&clip);
-  }
-  else if (mainw->multitrack!=NULL) return lives_osc_notify_failure();
+  } else if (mainw->multitrack!=NULL) return lives_osc_notify_failure();
 
 
   if (clip<1||clip>MAX_FILES||mainw->files[clip]==NULL) return lives_osc_notify_failure();
 
   sfile=mainw->files[clip];
 
-  lives_status_send (sfile->name);
+  lives_status_send(sfile->name);
+  return TRUE;
 }
 
 
 
-void lives_osc_cb_clip_set_name(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_clip_set_name(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   int current_file=mainw->current_file;
   int clip=current_file;
   char name[OSC_STRING_SIZE];
 
-  if (mainw->current_file<1||mainw->preview||mainw->is_processing) return lives_osc_notify_failure();
+  if (mainw->current_file<1||(mainw->preview||(mainw->multitrack==NULL&&mainw->event_list!=NULL))||
+      mainw->is_processing) return lives_osc_notify_failure();
 
-  if (lives_osc_check_arguments (arglen,vargs,"si",FALSE)) { 
-    lives_osc_check_arguments (arglen,vargs,"si",TRUE);
+  if (lives_osc_check_arguments(arglen,vargs,"si",FALSE)) {
+    lives_osc_check_arguments(arglen,vargs,"si",TRUE);
     lives_osc_parse_string_argument(vargs,name);
     lives_osc_parse_int_argument(vargs,&clip);
-  }
-  else if (lives_osc_check_arguments (arglen,vargs,"s",TRUE)) { 
+  } else if (lives_osc_check_arguments(arglen,vargs,"s",TRUE)) {
     if (mainw->multitrack!=NULL) return lives_osc_notify_failure();
     lives_osc_parse_string_argument(vargs,name);
-  }
-  else return lives_osc_notify_failure();
+  } else return lives_osc_notify_failure();
 
   if (clip<1||clip>MAX_FILES||mainw->files[clip]==NULL) return lives_osc_notify_failure();
 
   mainw->current_file=clip;
-  on_rename_set_name(NULL,(gpointer)name);
+  on_rename_set_name(NULL,(livespointer)name);
 
   if (clip==current_file) set_main_title(name,0);
   else mainw->current_file=current_file;
 
-  if (prefs->omc_noisy) {
-    lives_osc_notify_success(name);
-  }
+  return lives_osc_notify_success(name);
 
 }
 
 
 
-void lives_osc_cb_clip_get_frames(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_clip_get_frames(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   int current_file=mainw->current_file;
   int clip=current_file;
   char *tmp;
@@ -2413,23 +2454,23 @@
 
   if (mainw->current_file<1) return lives_osc_notify_failure();
 
-  if (lives_osc_check_arguments (arglen,vargs,"i",FALSE)) { 
-    lives_osc_check_arguments (arglen,vargs,"i",TRUE);
+  if (lives_osc_check_arguments(arglen,vargs,"i",FALSE)) {
+    lives_osc_check_arguments(arglen,vargs,"i",TRUE);
     lives_osc_parse_int_argument(vargs,&clip);
-  }
-  else if (mainw->multitrack!=NULL) return lives_osc_notify_failure();
+  } else if (mainw->multitrack!=NULL) return lives_osc_notify_failure();
 
 
   if (clip<1||clip>MAX_FILES||mainw->files[clip]==NULL) return lives_osc_notify_failure();
 
   sfile=mainw->files[clip];
 
-  lives_status_send ((tmp=g_strdup_printf ("%d",sfile->frames)));
-  g_free(tmp);
+  lives_status_send((tmp=lives_strdup_printf("%d",sfile->frames)));
+  lives_free(tmp);
+  return TRUE;
 }
 
 
-void lives_osc_cb_clip_save_frame(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_clip_save_frame(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   int current_file=mainw->current_file;
   int clip=current_file;
   int frame,width=-1,height=-1;
@@ -2441,37 +2482,34 @@
   if (mainw->current_file<1) return lives_osc_notify_failure();
   if (mainw->multitrack!=NULL) return lives_osc_notify_failure();
 
-  if (!lives_osc_check_arguments (arglen,vargs,"is",FALSE)) {
-    if (!lives_osc_check_arguments (arglen,vargs,"iis",FALSE)) {
-      if (!lives_osc_check_arguments (arglen,vargs,"isii",FALSE)) {
-	if (!lives_osc_check_arguments (arglen,vargs,"iisii",TRUE)) {
-	  return lives_osc_notify_failure();
-	}
-	lives_osc_parse_int_argument(vargs,&frame);
-	lives_osc_parse_int_argument(vargs,&clip);
-	lives_osc_parse_string_argument(vargs,fname);
-	lives_osc_parse_int_argument(vargs,&width);
-	lives_osc_parse_int_argument(vargs,&height);
-      }
-      else {
-	lives_osc_check_arguments (arglen,vargs,"isii",TRUE);
-	if (mainw->multitrack!=NULL) return lives_osc_notify_failure();
-	lives_osc_parse_int_argument(vargs,&frame);
-	lives_osc_parse_string_argument(vargs,fname);
-	lives_osc_parse_int_argument(vargs,&width);
-	lives_osc_parse_int_argument(vargs,&height);
+  if (!lives_osc_check_arguments(arglen,vargs,"is",FALSE)) {
+    if (!lives_osc_check_arguments(arglen,vargs,"iis",FALSE)) {
+      if (!lives_osc_check_arguments(arglen,vargs,"isii",FALSE)) {
+        if (!lives_osc_check_arguments(arglen,vargs,"iisii",TRUE)) {
+          return lives_osc_notify_failure();
+        }
+        lives_osc_parse_int_argument(vargs,&frame);
+        lives_osc_parse_int_argument(vargs,&clip);
+        lives_osc_parse_string_argument(vargs,fname);
+        lives_osc_parse_int_argument(vargs,&width);
+        lives_osc_parse_int_argument(vargs,&height);
+      } else {
+        lives_osc_check_arguments(arglen,vargs,"isii",TRUE);
+        if (mainw->multitrack!=NULL) return lives_osc_notify_failure();
+        lives_osc_parse_int_argument(vargs,&frame);
+        lives_osc_parse_string_argument(vargs,fname);
+        lives_osc_parse_int_argument(vargs,&width);
+        lives_osc_parse_int_argument(vargs,&height);
       }
-    }
-    else {
-      lives_osc_check_arguments (arglen,vargs,"iis",TRUE);
+    } else {
+      lives_osc_check_arguments(arglen,vargs,"iis",TRUE);
       lives_osc_parse_int_argument(vargs,&frame);
       lives_osc_parse_int_argument(vargs,&clip);
       lives_osc_parse_string_argument(vargs,fname);
     }
-  }
-  else {
+  } else {
     if (mainw->multitrack!=NULL) return lives_osc_notify_failure();
-    lives_osc_check_arguments (arglen,vargs,"is",TRUE);
+    lives_osc_check_arguments(arglen,vargs,"is",TRUE);
     lives_osc_parse_int_argument(vargs,&frame);
     lives_osc_parse_string_argument(vargs,fname);
   }
@@ -2479,201 +2517,186 @@
   if (clip<1||clip>MAX_FILES||mainw->files[clip]==NULL) return lives_osc_notify_failure();
   sfile=mainw->files[clip];
 
-  if (frame<1||frame>sfile->frames||(sfile->clip_type!=CLIP_TYPE_DISK&&sfile->clip_type!=CLIP_TYPE_FILE)) 
+  if (frame<1||frame>sfile->frames||(sfile->clip_type!=CLIP_TYPE_DISK&&sfile->clip_type!=CLIP_TYPE_FILE))
     return lives_osc_notify_failure();
 
   retval=save_frame_inner(clip,frame,fname,width,height,TRUE);
 
-  if (retval) lives_osc_notify_success(NULL);
-  else lives_osc_notify_failure();
+  if (retval) return lives_osc_notify_success(NULL);
+  else return lives_osc_notify_failure();
 
 }
 
 
-void lives_osc_cb_clip_select_all(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_clip_select_all(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+  boolean selwidth_locked=mainw->selwidth_locked;
 
-  if (mainw->current_file<1||mainw->preview||mainw->is_processing) return lives_osc_notify_failure();
+  if (mainw->current_file<1||(mainw->preview||(mainw->multitrack==NULL&&mainw->event_list!=NULL))||
+      mainw->is_processing) return lives_osc_notify_failure();
   if ((cfile->clip_type!=CLIP_TYPE_DISK&&cfile->clip_type!=CLIP_TYPE_FILE)||!cfile->frames) return lives_osc_notify_failure();
 
-  on_select_all_activate (NULL,NULL);
+  mainw->selwidth_locked=FALSE;
+  on_select_all_activate(NULL,NULL);
+  mainw->selwidth_locked=selwidth_locked;
 
-  if (prefs->omc_noisy) {
-    lives_osc_notify_success(NULL);
-  }
+  return lives_osc_notify_success(NULL);
 }
 
-void lives_osc_cb_clip_isvalid(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_clip_isvalid(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
 
   int clip;
 
-  if (!lives_osc_check_arguments (arglen,vargs,"i",TRUE)) return lives_osc_notify_failure();
+  if (!lives_osc_check_arguments(arglen,vargs,"i",TRUE)) return lives_osc_notify_failure();
   lives_osc_parse_int_argument(vargs,&clip);
 
-  if (clip>0&&clip<MAX_FILES&&mainw->files[clip]!=NULL&&!(mainw->multitrack!=NULL&&clip==mainw->multitrack->render_file)&&clip!=mainw->scrap_file) 
-    lives_status_send (get_omc_const("LIVES_TRUE"));
-  else lives_status_send (get_omc_const("LIVES_FALSE"));
-
+  if (clip>0&&clip<MAX_FILES&&mainw->files[clip]!=NULL&&!(mainw->multitrack!=NULL&&clip==mainw->multitrack->render_file)&&
+      clip!=mainw->scrap_file)
+    lives_status_send(get_omc_const("LIVES_TRUE"));
+  else lives_status_send(get_omc_const("LIVES_FALSE"));
+  return TRUE;
 }
 
-void lives_osc_cb_rte_count(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_rte_count(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   // count realtime effects - (only those assigned to keys for now)
   char *tmp;
-  if (status_socket==NULL) return;
-
-  lives_status_send ((tmp=g_strdup_printf ("%d",prefs->rte_keys_virtual)));
-  g_free(tmp);
-
+  lives_status_send((tmp=lives_strdup_printf("%d",prefs->rte_keys_virtual)));
+  lives_free(tmp);
+  return TRUE;
 }
 
-void lives_osc_cb_rteuser_count(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_rteuser_count(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   // count realtime effects
   char *tmp;
-  if (status_socket==NULL) return;
-
-  lives_status_send ((tmp=g_strdup_printf ("%d",FX_MAX)));
-  g_free(tmp);
-
+  lives_status_send((tmp=lives_strdup_printf("%d",FX_MAX)));
+  lives_free(tmp);
+  return TRUE;
 }
 
 
-void lives_osc_cb_fssepwin_enable(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_fssepwin_enable(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   if (!mainw->sep_win) {
-    on_sepwin_pressed (NULL,NULL);
+    on_sepwin_pressed(NULL,NULL);
   }
 
   if (!mainw->fs) {
-    on_full_screen_pressed (NULL,NULL);
-  }
-  if (prefs->omc_noisy) {
-    lives_osc_notify_success(NULL);
+    on_full_screen_pressed(NULL,NULL);
   }
+  return lives_osc_notify_success(NULL);
 }
 
 
-void lives_osc_cb_fssepwin_disable(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_fssepwin_disable(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
 
   if (mainw->fs) {
-    on_full_screen_pressed (NULL,NULL);
+    on_full_screen_pressed(NULL,NULL);
   }
   if (mainw->sep_win) {
-    on_sepwin_pressed (NULL,NULL);
-  }
-  if (prefs->omc_noisy) {
-    lives_osc_notify_success(NULL);
+    on_sepwin_pressed(NULL,NULL);
   }
+  return lives_osc_notify_success(NULL);
 }
 
-void lives_osc_cb_op_fps_set(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_op_fps_set(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   int fps;
   float fpsf;
   double fpsd;
-  char *tmp;
 
   if (mainw->fixed_fpsd>0.) return lives_osc_notify_failure();
-  if (!lives_osc_check_arguments (arglen,vargs,"f",FALSE)) {
-    if (!lives_osc_check_arguments (arglen,vargs,"i",TRUE)) return lives_osc_notify_failure();
+  if (!lives_osc_check_arguments(arglen,vargs,"f",FALSE)) {
+    if (!lives_osc_check_arguments(arglen,vargs,"i",TRUE)) return lives_osc_notify_failure();
     lives_osc_parse_int_argument(vargs,&fps);
     fpsd=(double)(fps*1.);
-  }
-  else {
-    lives_osc_check_arguments (arglen,vargs,"f",TRUE);
+  } else {
+    lives_osc_check_arguments(arglen,vargs,"f",TRUE);
     lives_osc_parse_float_argument(vargs,&fpsf);
     fpsd=(double)fpsf;
   }
   if (fpsd>0.&&fpsd<=FPS_MAX) {
     mainw->fixed_fpsd=fpsd;
-    d_print ((tmp=g_strdup_printf (_("Syncing to external framerate of %.8f frames per second.\n"),fpsd)));
-    g_free(tmp);
-  }
-  else if (fpsd==0.) mainw->fixed_fpsd=-1.; ///< 0. to release
+    d_print(_("Syncing to external framerate of %.8f frames per second.\n"),fpsd);
+  } else if (fpsd==0.) mainw->fixed_fpsd=-1.; ///< 0. to release
   else lives_osc_notify_failure();
-  if (prefs->omc_noisy) {
-    char *msg=g_strdup_printf("%.3f",fpsd);
+  {
+    char *msg=lives_strdup_printf("%.3f",fpsd);
     lives_osc_notify_success(msg);
-    g_free(msg);
+    lives_free(msg);
+    return TRUE;
   }
 }
 
 
-void lives_osc_cb_freeze(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_freeze(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   if (mainw->playing_file<1) return lives_osc_notify_failure();
 
   if (!mainw->osc_block) {
     freeze_callback(NULL,NULL,0,(LiVESXModifierType)0,NULL);
   }
-  if (prefs->omc_noisy) {
-    lives_osc_notify_success(NULL);
-  }
+  return lives_osc_notify_success(NULL);
 }
 
-void lives_osc_cb_op_nodrope(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
-  
-  mainw->noframedrop=TRUE;
+boolean lives_osc_cb_op_nodrope(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
 
-  if (prefs->omc_noisy) {
-    lives_osc_notify_success(NULL);
-  }
+  mainw->noframedrop=TRUE;
+  return lives_osc_notify_success(NULL);
 }
 
 
-void lives_osc_cb_op_nodropd(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
-  
+boolean lives_osc_cb_op_nodropd(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+
   mainw->noframedrop=FALSE;
-  if (prefs->omc_noisy) {
-    lives_osc_notify_success(NULL);
-  }
+  return lives_osc_notify_success(NULL);
 
 }
 
-void lives_osc_cb_fx_getname(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_fx_getname(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   char *retval;
   int fidx;
 
-  if (lives_osc_check_arguments (arglen,vargs,"i",FALSE)) {
-    lives_osc_check_arguments (arglen,vargs,"i",TRUE);
+  if (lives_osc_check_arguments(arglen,vargs,"i",FALSE)) {
+    lives_osc_check_arguments(arglen,vargs,"i",TRUE);
     lives_osc_parse_int_argument(vargs,&fidx);
-  }
-  else return lives_osc_notify_failure();
+  } else return lives_osc_notify_failure();
 
   retval=make_weed_hashname(fidx, FALSE, FALSE);
 
   lives_status_send(retval);
 
-  g_free(retval);
+  lives_free(retval);
+
+  return TRUE;
 }
 
-void lives_osc_cb_clip_encodeas(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_clip_encodeas(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   char fname[OSC_STRING_SIZE];
 
   if (mainw->playing_file>-1||mainw->current_file<1) return lives_osc_notify_failure();
 
-  if (mainw->preview||mainw->is_processing||mainw->multitrack!=NULL) return lives_osc_notify_failure();
+  if ((mainw->preview||(mainw->multitrack==NULL&&mainw->event_list!=NULL))||mainw->is_processing||
+      mainw->multitrack!=NULL) return lives_osc_notify_failure();
 
   if (cfile==NULL || cfile->opening) return lives_osc_notify_failure();
 
   mainw->osc_enc_width=mainw->osc_enc_height=0;
   mainw->osc_enc_fps=0.;
 
-  if (!lives_osc_check_arguments (arglen,vargs,"siif",FALSE)) { 
-    if (!lives_osc_check_arguments (arglen,vargs,"sii",FALSE)) { 
-      if (!lives_osc_check_arguments (arglen,vargs,"sf",FALSE)) { 
-	if (!lives_osc_check_arguments (arglen,vargs,"s",TRUE)) 
-	  return lives_osc_notify_failure();
-	lives_osc_parse_string_argument(vargs,fname);
+  if (!lives_osc_check_arguments(arglen,vargs,"siif",FALSE)) {
+    if (!lives_osc_check_arguments(arglen,vargs,"sii",FALSE)) {
+      if (!lives_osc_check_arguments(arglen,vargs,"sf",FALSE)) {
+        if (!lives_osc_check_arguments(arglen,vargs,"s",TRUE))
+          return lives_osc_notify_failure();
+        lives_osc_parse_string_argument(vargs,fname);
       }
-      lives_osc_check_arguments (arglen,vargs,"sf",TRUE);
+      lives_osc_check_arguments(arglen,vargs,"sf",TRUE);
       lives_osc_parse_string_argument(vargs,fname);
       lives_osc_parse_float_argument(vargs,&mainw->osc_enc_fps);
-    }
-    else {
-      lives_osc_check_arguments (arglen,vargs,"sii",TRUE);
+    } else {
+      lives_osc_check_arguments(arglen,vargs,"sii",TRUE);
       lives_osc_parse_string_argument(vargs,fname);
       lives_osc_parse_int_argument(vargs,&mainw->osc_enc_width);
       lives_osc_parse_int_argument(vargs,&mainw->osc_enc_height);
     }
-  }
-  else {
-    lives_osc_check_arguments (arglen,vargs,"siif",TRUE);
+  } else {
+    lives_osc_check_arguments(arglen,vargs,"siif",TRUE);
     lives_osc_parse_string_argument(vargs,fname);
     lives_osc_parse_int_argument(vargs,&mainw->osc_enc_width);
     lives_osc_parse_int_argument(vargs,&mainw->osc_enc_height);
@@ -2682,63 +2705,62 @@
 
   if (cfile->frames==0) {
     // TODO
-    on_export_audio_activate (NULL,NULL);
-    lives_osc_notify_success(NULL);
-    return;
+    on_export_audio_activate(NULL,NULL);
+    return lives_osc_notify_success(NULL);
   }
 
-  mainw->osc_auto=TRUE;
+  mainw->osc_auto=1;
   save_file(mainw->current_file,1,cfile->frames,fname);
-  lives_osc_notify_success(NULL);
-  mainw->osc_auto=FALSE;
+  mainw->osc_auto=0;
+  return lives_osc_notify_success(NULL);
 
 }
 
 
 
-void lives_osc_cb_rte_setmode(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_rte_setmode(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   int effect_key;
   int mode;
 
-  if (!lives_osc_check_arguments (arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
+  if (!lives_osc_check_arguments(arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
   lives_osc_parse_int_argument(vargs,&effect_key);
   lives_osc_parse_int_argument(vargs,&mode);
   if (effect_key<1||effect_key>=FX_KEYS_MAX_VIRTUAL||mode<1||mode>rte_getmodespk()) return lives_osc_notify_failure();
-  if (!mainw->osc_block) rte_key_setmode (effect_key,mode-1);
+  if (!mainw->osc_block) rte_key_setmode(effect_key,mode-1);
 
-  lives_osc_notify_success(NULL);
+  return lives_osc_notify_success(NULL);
 }
 
 
 
-void lives_osc_cb_rte_nextmode(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_rte_nextmode(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   int effect_key;
 
-  if (!lives_osc_check_arguments (arglen,vargs,"i",TRUE)) return lives_osc_notify_failure();
+  if (!lives_osc_check_arguments(arglen,vargs,"i",TRUE)) return lives_osc_notify_failure();
   lives_osc_parse_int_argument(vargs,&effect_key);
   if (effect_key<1||effect_key>=FX_KEYS_MAX_VIRTUAL) return lives_osc_notify_failure();
-  if (!mainw->osc_block) rte_key_setmode (effect_key,-1);
+  if (!mainw->osc_block) rte_key_setmode(effect_key,-1);
 
-  lives_osc_notify_success(NULL);
+  return lives_osc_notify_success(NULL);
 }
 
 
-void lives_osc_cb_rte_prevmode(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_rte_prevmode(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   int effect_key;
 
-  if (!lives_osc_check_arguments (arglen,vargs,"i",TRUE)) return lives_osc_notify_failure();
+  if (!lives_osc_check_arguments(arglen,vargs,"i",TRUE)) return lives_osc_notify_failure();
   lives_osc_parse_int_argument(vargs,&effect_key);
   if (effect_key<1||effect_key>=FX_KEYS_MAX_VIRTUAL) return lives_osc_notify_failure();
-  if (!mainw->osc_block) rte_key_setmode (effect_key,-2);
+  if (!mainw->osc_block) rte_key_setmode(effect_key,-2);
 
-  lives_osc_notify_success(NULL);
+  return lives_osc_notify_success(NULL);
 }
 
 
 ///////////////////////////////////////////////////////////////
 
 
-static boolean setfx (weed_plant_t *plant, weed_plant_t *tparam, int pnum, int nargs, const void *vargs, int skip) {
+static boolean setfx(weed_plant_t *plant, weed_plant_t *tparam, int pnum, int nargs, const void *vargs, int skip) {
   // set value of "value" leaf for tparam, or "host_default" for a template
   // set it to vargs (length nargs)
 
@@ -2764,8 +2786,7 @@
 
   if (WEED_PLANT_IS_FILTER_CLASS(plant)) {
     ptmpl=tparam;
-  }
-  else {
+  } else {
     ptmpl=weed_get_plantptr_value(tparam,"template",&error);
     inst=plant;
     if (weed_plant_has_leaf(inst,"host_key")) key=weed_get_int_value(inst,"host_key",&error);
@@ -2777,290 +2798,274 @@
   if (!(weed_parameter_has_variable_elements_strict(inst,ptmpl))) {
     if (nargs>(defargs=weed_leaf_num_elements(ptmpl,"default"))) {
       if (!(hint==WEED_HINT_COLOR&&defargs==1&&((cspace==WEED_COLORSPACE_RGB&&(nargs%3==0))||(cspace==WEED_COLORSPACE_RGBA&&(nargs%4==0)))))
-	// error: parameter does not have variable elements, and the user sent too many values
-	return FALSE;
+        // error: parameter does not have variable elements, and the user sent too many values
+        return FALSE;
     }
   }
 
   pattern=(char *)vargs+skip; // skip comma,int,(int)
 
   switch (hint) {
-  case WEED_HINT_INTEGER:
-    {
-      int *valuesi=(int *)g_malloc(nargs*sizint);
+  case WEED_HINT_INTEGER: {
+    int *valuesi=(int *)lives_malloc(nargs*sizint);
 
-      while (pattern[x]!=0) {
-	if (pattern[x]=='f') {
-	  // we wanted an int but we got a float
-	  //so we will round to the nearest value
-	  lives_osc_parse_float_argument(vargs,&valuef);
-	  valuesi[x]=myround(valuef);
-	}
-	else if (pattern[x]=='i') {
-	  lives_osc_parse_int_argument(vargs,&valuesi[x]);
-	}
-	else {
-	  g_free(valuesi);
-	  return FALSE;
-	}
-	mini=weed_get_int_value(ptmpl,"min",&error);
-	maxi=weed_get_int_value(ptmpl,"max",&error);
-      
-	if (valuesi[x]<mini) valuesi[x]=mini;
-	if (valuesi[x]>maxi) valuesi[x]=maxi;
-	x++;
+    while (pattern[x]!=0) {
+      if (pattern[x]=='f') {
+        // we wanted an int but we got a float
+        //so we will round to the nearest value
+        lives_osc_parse_float_argument(vargs,&valuef);
+        valuesi[x]=myround(valuef);
+      } else if (pattern[x]=='i') {
+        lives_osc_parse_int_argument(vargs,&valuesi[x]);
+      } else {
+        lives_free(valuesi);
+        return FALSE;
       }
+      mini=weed_get_int_value(ptmpl,"min",&error);
+      maxi=weed_get_int_value(ptmpl,"max",&error);
+
+      if (valuesi[x]<mini) valuesi[x]=mini;
+      if (valuesi[x]>maxi) valuesi[x]=maxi;
+      x++;
+    }
 
-      if (inst!=NULL) {
-	copyto=set_copy_to(inst,pnum,FALSE);
-	if (mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
-	  // if we are recording, add this change to our event_list
-	  rec_param_change(inst,pnum);
-	  if (copyto!=-1) rec_param_change(inst,copyto);
-	}
-	filter_mutex_lock(key);
-	weed_set_int_array(tparam,"value",nargs,valuesi);
-	filter_mutex_unlock(key);
-
-	set_copy_to(inst,pnum,TRUE);
-
-	if (mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
-	  // if we are recording, add this change to our event_list
-	  rec_param_change(inst,pnum);
-	  if (copyto!=-1) rec_param_change(inst,copyto);
-	}
+    if (inst!=NULL) {
+      copyto=set_copy_to(inst,pnum,FALSE);
+      if (mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
+        // if we are recording, add this change to our event_list
+        rec_param_change(inst,pnum);
+        if (copyto!=-1) rec_param_change(inst,copyto);
       }
-      else {
-	weed_set_int_array(tparam,"host_default",nargs,valuesi);
+      filter_mutex_lock(key);
+      weed_set_int_array(tparam,"value",nargs,valuesi);
+      filter_mutex_unlock(key);
+
+      set_copy_to(inst,pnum,TRUE);
+
+      if (mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
+        // if we are recording, add this change to our event_list
+        rec_param_change(inst,pnum);
+        if (copyto!=-1) rec_param_change(inst,copyto);
       }
+    } else {
+      weed_set_int_array(tparam,"host_default",nargs,valuesi);
+    }
 
-      g_free(valuesi);
+    lives_free(valuesi);
 
-      break;
-    }
+    break;
+  }
 
-  case WEED_HINT_SWITCH:
-    {
-      int group=0;
-      int *valuesb=(int *)g_malloc(nargs*sizint);
-
-      while (pattern[x]!=0) {
-	if (pattern[x]=='i') {
-	  lives_osc_parse_int_argument(vargs,&valuesb[x]);
-	}
-	else {
-	  g_free(valuesb);
-	  return FALSE;
-	}
-	valuesb[x]=!!valuesb[x];
-	x++;
+  case WEED_HINT_SWITCH: {
+    int group=0;
+    int *valuesb=(int *)lives_malloc(nargs*sizint);
+
+    while (pattern[x]!=0) {
+      if (pattern[x]=='i') {
+        lives_osc_parse_int_argument(vargs,&valuesb[x]);
+      } else {
+        lives_free(valuesb);
+        return FALSE;
       }
+      valuesb[x]=!!valuesb[x];
+      x++;
+    }
 
-      if (weed_plant_has_leaf(ptmpl,"group")) 
-	group=weed_get_int_value(ptmpl,"group",&error);
+    if (weed_plant_has_leaf(ptmpl,"group"))
+      group=weed_get_int_value(ptmpl,"group",&error);
 
-      if (group!=0&&valuesb[0]==WEED_FALSE) goto grpinvalid;
+    if (group!=0&&valuesb[0]==WEED_FALSE) goto grpinvalid;
 
-      if (inst!=NULL) {
-	filter_mutex_lock(key);
-	weed_set_boolean_array(tparam,"value",nargs,valuesb);
-	filter_mutex_unlock(key);
-
-	copyto=set_copy_to(inst,pnum,TRUE);
-
-	if (mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
-	  // if we are recording, add this change to our event_list
-	  rec_param_change(inst,pnum);
-	  if (copyto!=-1) rec_param_change(inst,copyto);
-	}
-
-	if (group!=0) {
-	  // set all other values in group to WEED_FALSE
-	  weed_plant_t *filter=weed_instance_get_filter(inst,FALSE),*xtparam;
-	  int nparams=num_in_params(filter,FALSE,TRUE);
-
-	  for (pnum=0;pnum<nparams;pnum++) {
-	    xtparam=weed_inst_in_param(inst,pnum,FALSE,TRUE);
-
-	    if (xtparam!=tparam) {
-	      ptmpl=weed_get_plantptr_value(xtparam,"template",&error);
-	      hint=weed_get_int_value(ptmpl,"hint",&error);
-	      if (hint==WEED_HINT_SWITCH) {
-		int xgroup=0;
-
-		if (weed_plant_has_leaf(ptmpl,"group")) 
-		  xgroup=weed_get_int_value(ptmpl,"group",&error);
-
-		if (xgroup==group) {
-		  filter_mutex_lock(key);
-		  weed_set_boolean_value(xtparam,"value",WEED_FALSE);
-		  filter_mutex_unlock(key);
-		  
-		  copyto=set_copy_to(inst,pnum,TRUE);
-		  
-		  if (mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
-		    // if we are recording, add this change to our event_list
-		    rec_param_change(inst,pnum);
-		    if (copyto!=-1) rec_param_change(inst,copyto);
-		  }
-		}
-	      }
-	    }
-	  }
-	}
+    if (inst!=NULL) {
+      filter_mutex_lock(key);
+      weed_set_boolean_array(tparam,"value",nargs,valuesb);
+      filter_mutex_unlock(key);
+
+      copyto=set_copy_to(inst,pnum,TRUE);
+
+      if (mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
+        // if we are recording, add this change to our event_list
+        rec_param_change(inst,pnum);
+        if (copyto!=-1) rec_param_change(inst,copyto);
       }
-      else {
-	weed_set_boolean_array(tparam,"host_default",nargs,valuesb);
 
-	if (group!=0) {
-	  // set all other values in group to WEED_FALSE
-	  weed_plant_t *filter=plant,*xtparam;
-	  int nparams=num_in_params(filter,FALSE,TRUE);
-
-	  for (pnum=0;pnum<nparams;pnum++) {
-	    xtparam=weed_filter_in_paramtmpl(inst,pnum,TRUE);
-
-	    if (xtparam!=tparam) {
-	      hint=weed_get_int_value(xtparam,"hint",&error);
-	      if (hint==WEED_HINT_SWITCH) {
-		int xgroup=0;
-
-		if (weed_plant_has_leaf(ptmpl,"group")) 
-		  xgroup=weed_get_int_value(ptmpl,"group",&error);
-
-		if (xgroup==group) {
-		  weed_set_boolean_value(tparam,"host_default",WEED_FALSE);
-		}
-	      }
-	    }
-	  }
-	}
+      if (group!=0) {
+        // set all other values in group to WEED_FALSE
+        weed_plant_t *filter=weed_instance_get_filter(inst,FALSE),*xtparam;
+        int nparams=num_in_params(filter,FALSE,TRUE);
+
+        for (pnum=0; pnum<nparams; pnum++) {
+          xtparam=weed_inst_in_param(inst,pnum,FALSE,TRUE);
+
+          if (xtparam!=tparam) {
+            ptmpl=weed_get_plantptr_value(xtparam,"template",&error);
+            hint=weed_get_int_value(ptmpl,"hint",&error);
+            if (hint==WEED_HINT_SWITCH) {
+              int xgroup=0;
+
+              if (weed_plant_has_leaf(ptmpl,"group"))
+                xgroup=weed_get_int_value(ptmpl,"group",&error);
+
+              if (xgroup==group) {
+                filter_mutex_lock(key);
+                weed_set_boolean_value(xtparam,"value",WEED_FALSE);
+                filter_mutex_unlock(key);
+
+                copyto=set_copy_to(inst,pnum,TRUE);
+
+                if (mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
+                  // if we are recording, add this change to our event_list
+                  rec_param_change(inst,pnum);
+                  if (copyto!=-1) rec_param_change(inst,copyto);
+                }
+              }
+            }
+          }
+        }
       }
+    } else {
+      weed_set_boolean_array(tparam,"host_default",nargs,valuesb);
 
-    grpinvalid:
-
-      g_free(valuesb);
+      if (group!=0) {
+        // set all other values in group to WEED_FALSE
+        weed_plant_t *filter=plant,*xtparam;
+        int nparams=num_in_params(filter,FALSE,TRUE);
+
+        for (pnum=0; pnum<nparams; pnum++) {
+          xtparam=weed_filter_in_paramtmpl(inst,pnum,TRUE);
+
+          if (xtparam!=tparam) {
+            hint=weed_get_int_value(xtparam,"hint",&error);
+            if (hint==WEED_HINT_SWITCH) {
+              int xgroup=0;
+
+              if (weed_plant_has_leaf(ptmpl,"group"))
+                xgroup=weed_get_int_value(ptmpl,"group",&error);
+
+              if (xgroup==group) {
+                weed_set_boolean_value(tparam,"host_default",WEED_FALSE);
+              }
+            }
+          }
+        }
+      }
+    }
 
-      break;
+grpinvalid:
 
-    }
-    
-  case WEED_HINT_FLOAT:
-    {
-      double *valuesd=(double *)g_malloc(nargs*sizdbl);
+    lives_free(valuesb);
 
-      while (pattern[x]!=0) {
-	if (pattern[x]=='i') {
-	  // we wanted an float but we got an int
-	  //so we will convert
-	  lives_osc_parse_int_argument(vargs,&valuei);
-	  valuesd[x]=(double)(valuei);
-	}
-	else if (pattern[x]=='f') {
-	  lives_osc_parse_float_argument(vargs,&valuef);
-	  valuesd[x]=(double)(valuef);
-	}
-	else {
-	  g_free(valuesd);
-	  return FALSE;
-	}
-	mind=weed_get_double_value(ptmpl,"min",&error);
-	maxd=weed_get_double_value(ptmpl,"max",&error);
-      
-	if (valuesd[x]<mind) valuesd[x]=mind;
-	if (valuesd[x]>maxd) valuesd[x]=maxd;
-	x++;
-      }
+    break;
 
+  }
 
-      if (inst!=NULL) {
-	copyto=set_copy_to(inst,pnum,FALSE);
+  case WEED_HINT_FLOAT: {
+    double *valuesd=(double *)lives_malloc(nargs*sizdbl);
 
-	if (mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
-	  // if we are recording, add this change to our event_list
-	  rec_param_change(inst,pnum);
-	  if (copyto!=-1) rec_param_change(inst,copyto);
-	}
-	filter_mutex_lock(key);
-	weed_set_double_array(tparam,"value",nargs,valuesd);
-	filter_mutex_unlock(key);
-
-	set_copy_to(inst,pnum,TRUE);
-
-	if (mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
-	  // if we are recording, add this change to our event_list
-	  rec_param_change(inst,pnum);
-	  if (copyto!=-1) rec_param_change(inst,copyto);
-	}
-      }
-      else {
-	weed_set_double_array(tparam,"host_default",nargs,valuesd);
+    while (pattern[x]!=0) {
+      if (pattern[x]=='i') {
+        // we wanted an float but we got an int
+        //so we will convert
+        lives_osc_parse_int_argument(vargs,&valuei);
+        valuesd[x]=(double)(valuei);
+      } else if (pattern[x]=='f') {
+        lives_osc_parse_float_argument(vargs,&valuef);
+        valuesd[x]=(double)(valuef);
+      } else {
+        lives_free(valuesd);
+        return FALSE;
       }
+      mind=weed_get_double_value(ptmpl,"min",&error);
+      maxd=weed_get_double_value(ptmpl,"max",&error);
+
+      if (valuesd[x]<mind) valuesd[x]=mind;
+      if (valuesd[x]>maxd) valuesd[x]=maxd;
+      x++;
+    }
 
-      g_free(valuesd);
 
-      break;
+    if (inst!=NULL) {
+      copyto=set_copy_to(inst,pnum,FALSE);
 
+      if (mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
+        // if we are recording, add this change to our event_list
+        rec_param_change(inst,pnum);
+        if (copyto!=-1) rec_param_change(inst,copyto);
+      }
+      filter_mutex_lock(key);
+      weed_set_double_array(tparam,"value",nargs,valuesd);
+      filter_mutex_unlock(key);
+
+      set_copy_to(inst,pnum,TRUE);
+
+      if (mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
+        // if we are recording, add this change to our event_list
+        rec_param_change(inst,pnum);
+        if (copyto!=-1) rec_param_change(inst,copyto);
+      }
+    } else {
+      weed_set_double_array(tparam,"host_default",nargs,valuesd);
     }
 
+    lives_free(valuesd);
 
-  case WEED_HINT_TEXT:
-    {
-      char **valuess=(char **)g_malloc(nargs*sizeof(char *));
+    break;
+
+  }
 
-      while (pattern[x]!=0) {
-	if (pattern[x]=='i') {
-	  // we wanted a string but we got an int
-	  //so we will convert
-	  lives_osc_parse_int_argument(vargs,&valuei);
-	  valuess[x]=g_strdup_printf("%d",valuei);
-	}
-	else if (pattern[x]=='f') {
-	  // we wanted a string but we got a float
-	  //so we will convert
-	  lives_osc_parse_float_argument(vargs,&valuef);
-	  valuess[x]=g_strdup_printf("%f",valuef);
-	}
-	else if (pattern[x]=='s') {
-	  lives_osc_parse_string_argument(vargs,values);
-	  valuess[x]=g_strdup(values);
-	}
-	else {
-	  for (i=0;i<x;i++) g_free(valuess[i]);
-	  g_free(valuess);
-	  return FALSE;
-	}
 
-	x++;
+  case WEED_HINT_TEXT: {
+    char **valuess=(char **)lives_malloc(nargs*sizeof(char *));
+
+    while (pattern[x]!=0) {
+      if (pattern[x]=='i') {
+        // we wanted a string but we got an int
+        //so we will convert
+        lives_osc_parse_int_argument(vargs,&valuei);
+        valuess[x]=lives_strdup_printf("%d",valuei);
+      } else if (pattern[x]=='f') {
+        // we wanted a string but we got a float
+        //so we will convert
+        lives_osc_parse_float_argument(vargs,&valuef);
+        valuess[x]=lives_strdup_printf("%f",valuef);
+      } else if (pattern[x]=='s') {
+        lives_osc_parse_string_argument(vargs,values);
+        valuess[x]=lives_strdup(values);
+      } else {
+        for (i=0; i<x; i++) lives_free(valuess[i]);
+        lives_free(valuess);
+        return FALSE;
       }
 
+      x++;
+    }
 
-      if (inst!=NULL) {
-	filter_mutex_lock(key);
-	weed_set_string_array(tparam,"value",nargs,valuess);
-	filter_mutex_unlock(key);
-
-	copyto=set_copy_to(inst,pnum,TRUE);
-	
-	if (mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
-	  // if we are recording, add this change to our event_list
-	  rec_param_change(inst,pnum);
-	  if (copyto!=-1) rec_param_change(inst,copyto);
-	}
-      }
-      else {
-	weed_set_string_array(tparam,"host_default",nargs,valuess);
+
+    if (inst!=NULL) {
+      filter_mutex_lock(key);
+      weed_set_string_array(tparam,"value",nargs,valuess);
+      filter_mutex_unlock(key);
+
+      copyto=set_copy_to(inst,pnum,TRUE);
+
+      if (mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
+        // if we are recording, add this change to our event_list
+        rec_param_change(inst,pnum);
+        if (copyto!=-1) rec_param_change(inst,copyto);
       }
+    } else {
+      weed_set_string_array(tparam,"host_default",nargs,valuess);
+    }
 
-      for (i=0;i<x;i++) g_free(valuess[i]);
-      g_free(valuess);
+    for (i=0; i<x; i++) lives_free(valuess[i]);
+    lives_free(valuess);
 
-      break;
+    break;
 
-    }
+  }
 
-    // COLOR is the most complicated, as we can have 3-values (RGB) or 4-values (RGBA), and we can have 
-    // an int or a float type. Also min and max can have 1,n or N values.
+  // COLOR is the most complicated, as we can have 3-values (RGB) or 4-values (RGBA), and we can have
+  // an int or a float type. Also min and max can have 1,n or N values.
 
   case WEED_HINT_COLOR:
     switch (cspace) {
@@ -3068,212 +3073,199 @@
       if (nargs%3 != 0) return FALSE; //nargs must be a multiple of 3
 
       if (weed_leaf_seed_type(ptmpl,"default")==WEED_SEED_INT) {
-	// RGB, int type
-	int *valuesi=(int *)g_malloc(nargs*sizint);
-	int nmins=weed_leaf_num_elements(ptmpl,"min");
-	int nmaxs=weed_leaf_num_elements(ptmpl,"max");
-	int *minis=NULL,*maxis=NULL;
-
-	// get min and max values - 3 possibilities: 1 value, 3 values or N values
-
-	if (nmins==1) {
-	  mini_r=mini_g=mini_b=weed_get_int_value(ptmpl,"min",&error);
-	}
-	else {
-	  minis=weed_get_int_array(ptmpl,"min",&error);
-	  if (nmins==3) {
-	    mini_r=minis[0];
-	    mini_g=minis[1];
-	    mini_b=minis[2];
-	    weed_free(minis);
-	  }
-	}
-
-	if (nmaxs==1) {
-	  maxi_r=maxi_g=maxi_b=weed_get_int_value(ptmpl,"max",&error);
-	}
-	else {
-	  maxis=weed_get_int_array(ptmpl,"max",&error);
-	  if (nmaxs==3) {
-	    maxi_r=maxis[0];
-	    maxi_g=maxis[1];
-	    maxi_b=maxis[2];
-	    weed_free(maxis);
-	  }
-	}
-
-	// read vals from OSC message
-	while (pattern[x]!=0) {
-
-	  // get next 3 values
-	  for (i=0;i<3;i++) {
-	    if (pattern[x+i]=='f') {
-	      // we wanted int but we got floats
-	      lives_osc_parse_float_argument(vargs,&valuef);
-	      valuesi[x+i]=myround(valuef);
-	    }
-	    else { 
-	      lives_osc_parse_int_argument(vargs,&valuesi[x+i]);
-	    } 
-	  }
-
-	  if (nmins<=3) {
-	    if (valuesi[x]<mini_r) valuesi[x]=mini_r;
-	    if (valuesi[x+1]<mini_g) valuesi[x+1]=mini_g;
-	    if (valuesi[x+2]<mini_b) valuesi[x+2]=mini_b;
-	  }
-	  else {
-	    if (valuesi[x]<minis[x])   valuesi[x]=minis[x];
-	    if (valuesi[x+1]<minis[x+1]) valuesi[x+1]=minis[x+1];
-	    if (valuesi[x+2]<minis[x+2]) valuesi[x+2]=minis[x+2];
-	  }
-
-	  if (nmaxs<=3) {
-	    if (valuesi[x]>maxi_r) valuesi[x]=maxi_r;
-	    if (valuesi[x+1]>maxi_g) valuesi[x+1]=maxi_g;
-	    if (valuesi[x+2]>maxi_b) valuesi[x+2]=maxi_b;
-	  }
-	  else {
-	    if (valuesi[x]>maxis[x+i])   valuesi[x]=maxis[x+i];
-	    if (valuesi[x+1]>maxis[x+1]) valuesi[x+1]=maxis[x+1];
-	    if (valuesi[x+2]>maxis[x+2]) valuesi[x+2]=maxis[x+2];
-	  }
-	  x+=3;
-	}
-
-	if (inst!=NULL) {
-	  copyto=set_copy_to(inst,pnum,FALSE);
-
-	  if (mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
-	    // if we are recording, add this change to our event_list
-	    rec_param_change(inst,pnum);
-	    if (copyto!=-1) rec_param_change(inst,copyto);
-	  }
-	
-	  filter_mutex_lock(key);
-	  weed_set_int_array(tparam,"value",nargs,valuesi);
-	  filter_mutex_unlock(key);
-	
-	  set_copy_to(inst,pnum,TRUE);
-
-	  if (mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
-	    // if we are recording, add this change to our event_list
-	    rec_param_change(inst,pnum);
-	    if (copyto!=-1) rec_param_change(inst,copyto);
-	  }
-	}
-	else {
-	  weed_set_int_array(tparam,"host_default",nargs,valuesi);
-	}
+        // RGB, int type
+        int *valuesi=(int *)lives_malloc(nargs*sizint);
+        int nmins=weed_leaf_num_elements(ptmpl,"min");
+        int nmaxs=weed_leaf_num_elements(ptmpl,"max");
+        int *minis=NULL,*maxis=NULL;
+
+        // get min and max values - 3 possibilities: 1 value, 3 values or N values
+
+        if (nmins==1) {
+          mini_r=mini_g=mini_b=weed_get_int_value(ptmpl,"min",&error);
+        } else {
+          minis=weed_get_int_array(ptmpl,"min",&error);
+          if (nmins==3) {
+            mini_r=minis[0];
+            mini_g=minis[1];
+            mini_b=minis[2];
+            lives_free(minis);
+          }
+        }
+
+        if (nmaxs==1) {
+          maxi_r=maxi_g=maxi_b=weed_get_int_value(ptmpl,"max",&error);
+        } else {
+          maxis=weed_get_int_array(ptmpl,"max",&error);
+          if (nmaxs==3) {
+            maxi_r=maxis[0];
+            maxi_g=maxis[1];
+            maxi_b=maxis[2];
+            lives_free(maxis);
+          }
+        }
+
+        // read vals from OSC message
+        while (pattern[x]!=0) {
+
+          // get next 3 values
+          for (i=0; i<3; i++) {
+            if (pattern[x+i]=='f') {
+              // we wanted int but we got floats
+              lives_osc_parse_float_argument(vargs,&valuef);
+              valuesi[x+i]=myround(valuef);
+            } else {
+              lives_osc_parse_int_argument(vargs,&valuesi[x+i]);
+            }
+          }
+
+          if (nmins<=3) {
+            if (valuesi[x]<mini_r) valuesi[x]=mini_r;
+            if (valuesi[x+1]<mini_g) valuesi[x+1]=mini_g;
+            if (valuesi[x+2]<mini_b) valuesi[x+2]=mini_b;
+          } else {
+            if (valuesi[x]<minis[x])   valuesi[x]=minis[x];
+            if (valuesi[x+1]<minis[x+1]) valuesi[x+1]=minis[x+1];
+            if (valuesi[x+2]<minis[x+2]) valuesi[x+2]=minis[x+2];
+          }
+
+          if (nmaxs<=3) {
+            if (valuesi[x]>maxi_r) valuesi[x]=maxi_r;
+            if (valuesi[x+1]>maxi_g) valuesi[x+1]=maxi_g;
+            if (valuesi[x+2]>maxi_b) valuesi[x+2]=maxi_b;
+          } else {
+            if (valuesi[x]>maxis[x+i])   valuesi[x]=maxis[x+i];
+            if (valuesi[x+1]>maxis[x+1]) valuesi[x+1]=maxis[x+1];
+            if (valuesi[x+2]>maxis[x+2]) valuesi[x+2]=maxis[x+2];
+          }
+          x+=3;
+        }
+
+        if (inst!=NULL) {
+          copyto=set_copy_to(inst,pnum,FALSE);
+
+          if (mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
+            // if we are recording, add this change to our event_list
+            rec_param_change(inst,pnum);
+            if (copyto!=-1) rec_param_change(inst,copyto);
+          }
+
+          filter_mutex_lock(key);
+          weed_set_int_array(tparam,"value",nargs,valuesi);
+          filter_mutex_unlock(key);
+
+          set_copy_to(inst,pnum,TRUE);
+
+          if (mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
+            // if we are recording, add this change to our event_list
+            rec_param_change(inst,pnum);
+            if (copyto!=-1) rec_param_change(inst,copyto);
+          }
+        } else {
+          weed_set_int_array(tparam,"host_default",nargs,valuesi);
+        }
+
+        lives_free(valuesi);
+
+        if (nmins>3) lives_free(minis);
+        if (nmaxs>3) lives_free(maxis);
+      } else {
+        // RGB, float type
+        double *valuesd=(double *)lives_malloc(nargs*sizeof(double));
+        int nmins=weed_leaf_num_elements(ptmpl,"min");
+        int nmaxs=weed_leaf_num_elements(ptmpl,"max");
+        double *minds=NULL,*maxds=NULL;
+        // get min and max values - 3 possibilities: 1 value, 3 values or N values
+
+        if (nmins==1) {
+          mind_r=mind_g=mind_b=weed_get_double_value(ptmpl,"min",&error);
+        } else {
+          minds=weed_get_double_array(ptmpl,"min",&error);
+          if (nmins==3) {
+            mind_r=minds[0];
+            mind_g=minds[1];
+            mind_b=minds[2];
+            lives_free(minds);
+          }
+        }
+
+        if (nmaxs==1) {
+          maxd_r=maxd_g=maxd_b=weed_get_double_value(ptmpl,"max",&error);
+        } else {
+          maxds=weed_get_double_array(ptmpl,"max",&error);
+          if (nmaxs==3) {
+            maxd_r=maxds[0];
+            maxd_g=maxds[1];
+            maxd_b=maxds[2];
+            lives_free(maxds);
+          }
+        }
+
+        // read vals from OSC message
+        while (pattern[x]!=0) {
+
+          // get next 3 values
+          for (i=0; i<3; i++) {
+            if (pattern[x+i]=='i') {
+              // we wanted float but we got floats
+              lives_osc_parse_int_argument(vargs,&valuei);
+              valuesd[x+i]=(double)valuei;
+            } else {
+              lives_osc_parse_float_argument(vargs,&valuef);
+              valuesd[x+i]=(double)valuef;
+            }
+          }
+
+          if (nmins<=3) {
+            if (valuesd[x]<mind_r) valuesd[x]=mind_r;
+            if (valuesd[x+1]<mind_g) valuesd[x+1]=mind_g;
+            if (valuesd[x+2]<mind_b) valuesd[x+2]=mind_b;
+          } else {
+            if (valuesd[x]<minds[x])   valuesd[x]=minds[x];
+            if (valuesd[x+1]<minds[x+1]) valuesd[x+1]=minds[x+1];
+            if (valuesd[x+2]<minds[x+2]) valuesd[x+2]=minds[x+2];
+          }
+
+          if (nmaxs<=3) {
+            if (valuesd[x]>maxd_r) valuesd[x]=maxd_r;
+            if (valuesd[x+1]>maxd_g) valuesd[x+1]=maxd_g;
+            if (valuesd[x+2]>maxd_b) valuesd[x+2]=maxd_b;
+          } else {
+            if (valuesd[x]>maxds[x])   valuesd[x]=maxds[x];
+            if (valuesd[x+1]>maxds[x+1]) valuesd[x+1]=maxds[x+1];
+            if (valuesd[x+2]>maxds[x+2]) valuesd[x+2]=maxds[x+2];
+          }
+          x+=3;
+        }
+
+        if (inst!=NULL) {
+          copyto=set_copy_to(inst,pnum,FALSE);
+
+          if (mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
+            // if we are recording, add this change to our event_list
+            rec_param_change(inst,pnum);
+            if (copyto!=-1) rec_param_change(inst,copyto);
+          }
+
+          filter_mutex_lock(key);
+          weed_set_double_array(tparam,"value",nargs,valuesd);
+          filter_mutex_unlock(key);
+
+          set_copy_to(inst,pnum,TRUE);
+
+          if (mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
+            // if we are recording, add this change to our event_list
+            rec_param_change(inst,pnum);
+            if (copyto!=-1) rec_param_change(inst,copyto);
+          }
+        } else {
+          weed_set_double_array(tparam,"host_default",nargs,valuesd);
+        }
 
-	g_free(valuesi);
+        lives_free(valuesd);
 
-	if (nmins>3) g_free(minis);
-	if (nmaxs>3) g_free(maxis);
-      }
-      else {
-	// RGB, float type
-	double *valuesd=(double *)g_malloc(nargs*sizeof(double));
-	int nmins=weed_leaf_num_elements(ptmpl,"min");
-	int nmaxs=weed_leaf_num_elements(ptmpl,"max");
-	double *minds=NULL,*maxds=NULL;
-	// get min and max values - 3 possibilities: 1 value, 3 values or N values
-
-	if (nmins==1) {
-	  mind_r=mind_g=mind_b=weed_get_double_value(ptmpl,"min",&error);
-	}
-	else {
-	  minds=weed_get_double_array(ptmpl,"min",&error);
-	  if (nmins==3) {
-	    mind_r=minds[0];
-	    mind_g=minds[1];
-	    mind_b=minds[2];
-	    weed_free(minds);
-	  }
-	}
-
-	if (nmaxs==1) {
-	  maxd_r=maxd_g=maxd_b=weed_get_double_value(ptmpl,"max",&error);
-	}
-	else {
-	  maxds=weed_get_double_array(ptmpl,"max",&error);
-	  if (nmaxs==3) {
-	    maxd_r=maxds[0];
-	    maxd_g=maxds[1];
-	    maxd_b=maxds[2];
-	    weed_free(maxds);
-	  }
-	}
-
-	// read vals from OSC message
-	while (pattern[x]!=0) {
-
-	  // get next 3 values
-	  for (i=0;i<3;i++) {
-	    if (pattern[x+i]=='i') {
-	      // we wanted float but we got floats
-	      lives_osc_parse_int_argument(vargs,&valuei);
-	      valuesd[x+i]=(double)valuei;
-	    }
-	    else { 
-	      lives_osc_parse_float_argument(vargs,&valuef);
-	      valuesd[x+i]=(double)valuef;
-	    } 
-	  }
-
-	  if (nmins<=3) {
-	    if (valuesd[x]<mind_r) valuesd[x]=mind_r;
-	    if (valuesd[x+1]<mind_g) valuesd[x+1]=mind_g;
-	    if (valuesd[x+2]<mind_b) valuesd[x+2]=mind_b;
-	  }
-	  else {
-	    if (valuesd[x]<minds[x])   valuesd[x]=minds[x];
-	    if (valuesd[x+1]<minds[x+1]) valuesd[x+1]=minds[x+1];
-	    if (valuesd[x+2]<minds[x+2]) valuesd[x+2]=minds[x+2];
-	  }
-
-	  if (nmaxs<=3) {
-	    if (valuesd[x]>maxd_r) valuesd[x]=maxd_r;
-	    if (valuesd[x+1]>maxd_g) valuesd[x+1]=maxd_g;
-	    if (valuesd[x+2]>maxd_b) valuesd[x+2]=maxd_b;
-	  }
-	  else {
-	    if (valuesd[x]>maxds[x])   valuesd[x]=maxds[x];
-	    if (valuesd[x+1]>maxds[x+1]) valuesd[x+1]=maxds[x+1];
-	    if (valuesd[x+2]>maxds[x+2]) valuesd[x+2]=maxds[x+2];
-	  }
-	  x+=3;
-	}
-
-	if (inst!=NULL) {
-	  copyto=set_copy_to(inst,pnum,FALSE);
-
-	  if (mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
-	    // if we are recording, add this change to our event_list
-	    rec_param_change(inst,pnum);
-	    if (copyto!=-1) rec_param_change(inst,copyto);
-	  }
-
-	  filter_mutex_lock(key);
-	  weed_set_double_array(tparam,"value",nargs,valuesd);
-	  filter_mutex_unlock(key);
-	
-	  set_copy_to(inst,pnum,TRUE);
-
-	  if (mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
-	    // if we are recording, add this change to our event_list
-	    rec_param_change(inst,pnum);
-	    if (copyto!=-1) rec_param_change(inst,copyto);
-	  }
-	}
-	else {
-	  weed_set_double_array(tparam,"host_default",nargs,valuesd);
-	}
-
-	g_free(valuesd);
-
-	if (nmins>3) g_free(minds);
-	if (nmaxs>3) g_free(maxds);
+        if (nmins>3) lives_free(minds);
+        if (nmaxs>3) lives_free(maxds);
 
       }
 
@@ -3286,226 +3278,213 @@
       if (nargs%4 != 0) return FALSE; //nargs must be a multiple of 4
 
       if (weed_leaf_seed_type(ptmpl,"default")==WEED_SEED_INT) {
-	// RGBA, int type
-	int *valuesi=(int *)g_malloc(nargs*sizint);
-	int nmins=weed_leaf_num_elements(ptmpl,"min");
-	int nmaxs=weed_leaf_num_elements(ptmpl,"max");
-	int *minis=NULL,*maxis=NULL;
-
-	// get min and max values - 3 possibilities: 1 value, 4 values or N values
-
-	if (nmins==1) {
-	  mini_r=mini_g=mini_b=mini_a=weed_get_int_value(ptmpl,"min",&error);
-	}
-	else {
-	  minis=weed_get_int_array(ptmpl,"min",&error);
-	  if (nmins==4) {
-	    mini_r=minis[0];
-	    mini_g=minis[1];
-	    mini_b=minis[2];
-	    mini_a=minis[3];
-	    weed_free(minis);
-	  }
-	}
-
-	if (nmaxs==1) {
-	  maxi_r=maxi_g=maxi_b=maxi_a=weed_get_int_value(ptmpl,"max",&error);
-	}
-	else {
-	  maxis=weed_get_int_array(ptmpl,"max",&error);
-	  if (nmaxs==4) {
-	    maxi_r=maxis[0];
-	    maxi_g=maxis[1];
-	    maxi_b=maxis[2];
-	    maxi_a=maxis[3];
-	    weed_free(maxis);
-	  }
-	}
-
-	// read vals from OSC message
-	while (pattern[x]!=0) {
-
-	  // get next 4 values
-	  for (i=0;i<4;i++) {
-	    if (pattern[x]=='f') {
-	      // we wanted int but we got floats
-	      lives_osc_parse_float_argument(vargs,&valuef);
-	      valuesi[x+i]=myround(valuef);
-	    }
-	    else { 
-	      lives_osc_parse_int_argument(vargs,&valuesi[x+i]);
-	    } 
-	  }
-
-	  if (nmins<=3) {
-	    if (valuesi[x]<mini_r) valuesi[x]=mini_r;
-	    if (valuesi[x+1]<mini_g) valuesi[x+1]=mini_g;
-	    if (valuesi[x+2]<mini_b) valuesi[x+2]=mini_b;
-	    if (valuesi[x+3]<mini_a) valuesi[x+3]=mini_a;
-	  }
-	  else {
-	    if (valuesi[x]<minis[x])   valuesi[x]=minis[x];
-	    if (valuesi[x+1]<minis[x+1]) valuesi[x+1]=minis[x+1];
-	    if (valuesi[x+2]<minis[x+2]) valuesi[x+2]=minis[x+2];
-	    if (valuesi[x+3]<minis[x+3]) valuesi[x+3]=minis[x+3];
-	  }
-
-	  if (nmaxs<=4) {
-	    if (valuesi[x]>maxi_r) valuesi[x]=maxi_r;
-	    if (valuesi[x+1]>maxi_g) valuesi[x+1]=maxi_g;
-	    if (valuesi[x+2]>maxi_b) valuesi[x+2]=maxi_b;
-	    if (valuesi[x+3]>maxi_a) valuesi[x+3]=maxi_a;
-	  }
-	  else {
-	    if (valuesi[x]>maxis[x])   valuesi[x]=maxis[x];
-	    if (valuesi[x+1]>maxis[x+1]) valuesi[x+1]=maxis[x+1];
-	    if (valuesi[x+2]>maxis[x+2]) valuesi[x+2]=maxis[x+2];
-	    if (valuesi[x+3]>maxis[x+3]) valuesi[x+3]=maxis[x+3];
-	  }
-	  x+=4;
-	}
-
-	if (inst!=NULL) {
-	  copyto=set_copy_to(inst,pnum,FALSE);
-
-	  if (mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
-	    // if we are recording, add this change to our event_list
-	    rec_param_change(inst,pnum);
-	    if (copyto!=-1) rec_param_change(inst,copyto);
-	  }
-	
-	  filter_mutex_lock(key);
-	  weed_set_int_array(tparam,"value",nargs,valuesi);
-	  filter_mutex_unlock(key);
-	  
-	  set_copy_to(inst,pnum,TRUE);
-	  
-	  if (mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
-	    // if we are recording, add this change to our event_list
-	    rec_param_change(inst,pnum);
-	    if (copyto!=-1) rec_param_change(inst,copyto);
-	  }
-	}
-	else {
-	  weed_set_int_array(tparam,"host_default",nargs,valuesi);
-	}
-
-	g_free(valuesi);
-	
-	if (nmins>4) g_free(minis);
-	if (nmaxs>4) g_free(maxis);
-	  
-      }
-      else {
-	// RGBA, float type
-	double *valuesd=(double *)g_malloc(nargs*sizdbl);
-	int nmins=weed_leaf_num_elements(ptmpl,"min");
-	int nmaxs=weed_leaf_num_elements(ptmpl,"max");
-	double *minds=NULL,*maxds=NULL;
-
-	// get min and max values - 3 possibilities: 1 value, 3 values or N values
-
-	if (nmins==1) {
-	  mind_r=mind_g=mind_b=mind_a=weed_get_double_value(ptmpl,"min",&error);
-	}
-	else {
-	  minds=weed_get_double_array(ptmpl,"min",&error);
-	  if (nmins==4) {
-	    mind_r=minds[0];
-	    mind_g=minds[1];
-	    mind_b=minds[2];
-	    mind_a=minds[3];
-	    weed_free(minds);
-	  }
-	}
-
-	if (nmaxs==1) {
-	  maxd_r=maxd_g=maxd_b=mind_a=weed_get_double_value(ptmpl,"max",&error);
-	}
-	else {
-	  maxds=weed_get_double_array(ptmpl,"max",&error);
-	  if (nmaxs==4) {
-	    maxd_r=maxds[0];
-	    maxd_g=maxds[1];
-	    maxd_b=maxds[2];
-	    maxd_a=maxds[3];
-	    weed_free(maxds);
-	  }
-	}
-
-	// read vals from OSC message
-	while (pattern[x]!=0) {
-
-	  // get next 4 values
-	  for (i=0;i<4;i++) {
-	    if (pattern[x]=='i') {
-	      // we wanted float but we got floats
-	      lives_osc_parse_int_argument(vargs,&valuei);
-	      valuesd[x+i]=(double)valuei;
-	    }
-	    else { 
-	      lives_osc_parse_float_argument(vargs,&valuef);
-	      valuesd[x+i]=(double)valuef;
-	    } 
-	  }
-
-	  if (nmins<=4) {
-	    if (valuesd[x]<mind_r) valuesd[x]=mind_r;
-	    if (valuesd[x+1]<mind_g) valuesd[x+1]=mind_g;
-	    if (valuesd[x+2]<mind_b) valuesd[x+2]=mind_b;
-	    if (valuesd[x+3]<mind_a) valuesd[x+3]=mind_a;
-	  }
-	  else {
-	    if (valuesd[x]<minds[x])   valuesd[x]=minds[x];
-	    if (valuesd[x+1]<minds[x+1]) valuesd[x+1]=minds[x+1];
-	    if (valuesd[x+2]<minds[x+2]) valuesd[x+2]=minds[x+2];
-	    if (valuesd[x+3]<minds[x+3]) valuesd[x+3]=minds[x+3];
-	  }
-
-	  if (nmaxs<=4) {
-	    if (valuesd[x]>maxd_r) valuesd[x]=maxd_r;
-	    if (valuesd[x+1]>maxd_g) valuesd[x+1]=maxd_g;
-	    if (valuesd[x+2]>maxd_b) valuesd[x+2]=maxd_b;
-	    if (valuesd[x+3]>maxd_a) valuesd[x+3]=maxd_a;
-	  }
-	  else {
-	    if (valuesd[x]>maxds[x])   valuesd[x]=maxds[x];
-	    if (valuesd[x+1]>maxds[x+1]) valuesd[x+1]=maxds[x+1];
-	    if (valuesd[x+2]>maxds[x+2]) valuesd[x+2]=maxds[x+2];
-	    if (valuesd[x+3]>maxds[x+3]) valuesd[x+3]=maxds[x+3];
-	  }
-	  x+=4;
-	}
-
-	if (inst!=NULL) {
-	  copyto=set_copy_to(inst,pnum,FALSE);
-
-	  if (mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
-	    // if we are recording, add this change to our event_list
-	    rec_param_change(inst,pnum);
-	    if (copyto!=-1) rec_param_change(inst,copyto);
-	  }
-	    
-	  filter_mutex_lock(key);
-	  weed_set_double_array(tparam,"value",nargs,valuesd);
-	  filter_mutex_unlock(key);
-	    
-	  set_copy_to(inst,pnum,TRUE);
-
-	  if (mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
-	    // if we are recording, add this change to our event_list
-	    rec_param_change(inst,pnum);
-	    if (copyto!=-1) rec_param_change(inst,copyto);
-	  }
-	}
-	else {
-	  weed_set_double_array(tparam,"host_default",nargs,valuesd);
-	}
+        // RGBA, int type
+        int *valuesi=(int *)lives_malloc(nargs*sizint);
+        int nmins=weed_leaf_num_elements(ptmpl,"min");
+        int nmaxs=weed_leaf_num_elements(ptmpl,"max");
+        int *minis=NULL,*maxis=NULL;
+
+        // get min and max values - 3 possibilities: 1 value, 4 values or N values
+
+        if (nmins==1) {
+          mini_r=mini_g=mini_b=mini_a=weed_get_int_value(ptmpl,"min",&error);
+        } else {
+          minis=weed_get_int_array(ptmpl,"min",&error);
+          if (nmins==4) {
+            mini_r=minis[0];
+            mini_g=minis[1];
+            mini_b=minis[2];
+            mini_a=minis[3];
+            lives_free(minis);
+          }
+        }
+
+        if (nmaxs==1) {
+          maxi_r=maxi_g=maxi_b=maxi_a=weed_get_int_value(ptmpl,"max",&error);
+        } else {
+          maxis=weed_get_int_array(ptmpl,"max",&error);
+          if (nmaxs==4) {
+            maxi_r=maxis[0];
+            maxi_g=maxis[1];
+            maxi_b=maxis[2];
+            maxi_a=maxis[3];
+            lives_free(maxis);
+          }
+        }
+
+        // read vals from OSC message
+        while (pattern[x]!=0) {
+
+          // get next 4 values
+          for (i=0; i<4; i++) {
+            if (pattern[x]=='f') {
+              // we wanted int but we got floats
+              lives_osc_parse_float_argument(vargs,&valuef);
+              valuesi[x+i]=myround(valuef);
+            } else {
+              lives_osc_parse_int_argument(vargs,&valuesi[x+i]);
+            }
+          }
+
+          if (nmins<=3) {
+            if (valuesi[x]<mini_r) valuesi[x]=mini_r;
+            if (valuesi[x+1]<mini_g) valuesi[x+1]=mini_g;
+            if (valuesi[x+2]<mini_b) valuesi[x+2]=mini_b;
+            if (valuesi[x+3]<mini_a) valuesi[x+3]=mini_a;
+          } else {
+            if (valuesi[x]<minis[x])   valuesi[x]=minis[x];
+            if (valuesi[x+1]<minis[x+1]) valuesi[x+1]=minis[x+1];
+            if (valuesi[x+2]<minis[x+2]) valuesi[x+2]=minis[x+2];
+            if (valuesi[x+3]<minis[x+3]) valuesi[x+3]=minis[x+3];
+          }
+
+          if (nmaxs<=4) {
+            if (valuesi[x]>maxi_r) valuesi[x]=maxi_r;
+            if (valuesi[x+1]>maxi_g) valuesi[x+1]=maxi_g;
+            if (valuesi[x+2]>maxi_b) valuesi[x+2]=maxi_b;
+            if (valuesi[x+3]>maxi_a) valuesi[x+3]=maxi_a;
+          } else {
+            if (valuesi[x]>maxis[x])   valuesi[x]=maxis[x];
+            if (valuesi[x+1]>maxis[x+1]) valuesi[x+1]=maxis[x+1];
+            if (valuesi[x+2]>maxis[x+2]) valuesi[x+2]=maxis[x+2];
+            if (valuesi[x+3]>maxis[x+3]) valuesi[x+3]=maxis[x+3];
+          }
+          x+=4;
+        }
+
+        if (inst!=NULL) {
+          copyto=set_copy_to(inst,pnum,FALSE);
+
+          if (mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
+            // if we are recording, add this change to our event_list
+            rec_param_change(inst,pnum);
+            if (copyto!=-1) rec_param_change(inst,copyto);
+          }
+
+          filter_mutex_lock(key);
+          weed_set_int_array(tparam,"value",nargs,valuesi);
+          filter_mutex_unlock(key);
+
+          set_copy_to(inst,pnum,TRUE);
+
+          if (mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
+            // if we are recording, add this change to our event_list
+            rec_param_change(inst,pnum);
+            if (copyto!=-1) rec_param_change(inst,copyto);
+          }
+        } else {
+          weed_set_int_array(tparam,"host_default",nargs,valuesi);
+        }
+
+        lives_free(valuesi);
+
+        if (nmins>4) lives_free(minis);
+        if (nmaxs>4) lives_free(maxis);
+
+      } else {
+        // RGBA, float type
+        double *valuesd=(double *)lives_malloc(nargs*sizdbl);
+        int nmins=weed_leaf_num_elements(ptmpl,"min");
+        int nmaxs=weed_leaf_num_elements(ptmpl,"max");
+        double *minds=NULL,*maxds=NULL;
+
+        // get min and max values - 3 possibilities: 1 value, 3 values or N values
+
+        if (nmins==1) {
+          mind_r=mind_g=mind_b=mind_a=weed_get_double_value(ptmpl,"min",&error);
+        } else {
+          minds=weed_get_double_array(ptmpl,"min",&error);
+          if (nmins==4) {
+            mind_r=minds[0];
+            mind_g=minds[1];
+            mind_b=minds[2];
+            mind_a=minds[3];
+            lives_free(minds);
+          }
+        }
+
+        if (nmaxs==1) {
+          maxd_r=maxd_g=maxd_b=mind_a=weed_get_double_value(ptmpl,"max",&error);
+        } else {
+          maxds=weed_get_double_array(ptmpl,"max",&error);
+          if (nmaxs==4) {
+            maxd_r=maxds[0];
+            maxd_g=maxds[1];
+            maxd_b=maxds[2];
+            maxd_a=maxds[3];
+            lives_free(maxds);
+          }
+        }
+
+        // read vals from OSC message
+        while (pattern[x]!=0) {
+
+          // get next 4 values
+          for (i=0; i<4; i++) {
+            if (pattern[x]=='i') {
+              // we wanted float but we got floats
+              lives_osc_parse_int_argument(vargs,&valuei);
+              valuesd[x+i]=(double)valuei;
+            } else {
+              lives_osc_parse_float_argument(vargs,&valuef);
+              valuesd[x+i]=(double)valuef;
+            }
+          }
+
+          if (nmins<=4) {
+            if (valuesd[x]<mind_r) valuesd[x]=mind_r;
+            if (valuesd[x+1]<mind_g) valuesd[x+1]=mind_g;
+            if (valuesd[x+2]<mind_b) valuesd[x+2]=mind_b;
+            if (valuesd[x+3]<mind_a) valuesd[x+3]=mind_a;
+          } else {
+            if (valuesd[x]<minds[x])   valuesd[x]=minds[x];
+            if (valuesd[x+1]<minds[x+1]) valuesd[x+1]=minds[x+1];
+            if (valuesd[x+2]<minds[x+2]) valuesd[x+2]=minds[x+2];
+            if (valuesd[x+3]<minds[x+3]) valuesd[x+3]=minds[x+3];
+          }
+
+          if (nmaxs<=4) {
+            if (valuesd[x]>maxd_r) valuesd[x]=maxd_r;
+            if (valuesd[x+1]>maxd_g) valuesd[x+1]=maxd_g;
+            if (valuesd[x+2]>maxd_b) valuesd[x+2]=maxd_b;
+            if (valuesd[x+3]>maxd_a) valuesd[x+3]=maxd_a;
+          } else {
+            if (valuesd[x]>maxds[x])   valuesd[x]=maxds[x];
+            if (valuesd[x+1]>maxds[x+1]) valuesd[x+1]=maxds[x+1];
+            if (valuesd[x+2]>maxds[x+2]) valuesd[x+2]=maxds[x+2];
+            if (valuesd[x+3]>maxds[x+3]) valuesd[x+3]=maxds[x+3];
+          }
+          x+=4;
+        }
+
+        if (inst!=NULL) {
+          copyto=set_copy_to(inst,pnum,FALSE);
+
+          if (mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
+            // if we are recording, add this change to our event_list
+            rec_param_change(inst,pnum);
+            if (copyto!=-1) rec_param_change(inst,copyto);
+          }
+
+          filter_mutex_lock(key);
+          weed_set_double_array(tparam,"value",nargs,valuesd);
+          filter_mutex_unlock(key);
+
+          set_copy_to(inst,pnum,TRUE);
+
+          if (mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
+            // if we are recording, add this change to our event_list
+            rec_param_change(inst,pnum);
+            if (copyto!=-1) rec_param_change(inst,copyto);
+          }
+        } else {
+          weed_set_double_array(tparam,"host_default",nargs,valuesd);
+        }
 
-	g_free(valuesd);
+        lives_free(valuesd);
 
-	if (nmins>4) g_free(minds);
-	if (nmaxs>4) g_free(maxds);
+        if (nmins>4) lives_free(minds);
+        if (nmaxs>4) lives_free(maxds);
 
       }
 
@@ -3514,9 +3493,9 @@
     default:
       // invalid colorspace
       return FALSE;
-      
+
     }
-    
+
   default:
     // invalid param hint
     return FALSE;
@@ -3528,8 +3507,8 @@
 
 
 
-void lives_osc_cb_rte_getparamtype(void *context, int arglen, const void *vargs, OSCTimeTag when, 
-				   NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_rte_getparamtype(void *context, int arglen, const void *vargs, OSCTimeTag when,
+                                      NetworkReturnAddressPtr ra) {
   weed_plant_t *filter;
   weed_plant_t *ptmpl;
   int hint,error;
@@ -3543,21 +3522,20 @@
   // TODO - handle compound fx
 
 
-  if (!lives_osc_check_arguments (arglen,vargs,"iii",FALSE)) {
-    if (!lives_osc_check_arguments (arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
+  if (!lives_osc_check_arguments(arglen,vargs,"iii",FALSE)) {
+    if (!lives_osc_check_arguments(arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
     lives_osc_parse_int_argument(vargs,&effect_key);
     lives_osc_parse_int_argument(vargs,&pnum);
     mode=rte_key_getmode(effect_key);
-  }
-  else {
-    lives_osc_check_arguments (arglen,vargs,"iii",TRUE);
+  } else {
+    lives_osc_check_arguments(arglen,vargs,"iii",TRUE);
     lives_osc_parse_int_argument(vargs,&effect_key);
     lives_osc_parse_int_argument(vargs,&mode);
     lives_osc_parse_int_argument(vargs,&pnum);
     if (mode<1||mode>rte_key_getmaxmode(effect_key)+1) return lives_osc_notify_failure();
     mode--;
   }
-  
+
   if (effect_key<1||effect_key>FX_MAX) return lives_osc_notify_failure();
   //g_print("key %d pnum %d",effect_key,pnum);
 
@@ -3567,26 +3545,38 @@
   nparams=num_in_params(filter,FALSE,TRUE);
   if (nparams==0) return lives_osc_notify_failure();
   if (pnum<0||pnum>=nparams) return lives_osc_notify_failure();
-  
+
   ptmpl=weed_filter_in_paramtmpl(filter,pnum,TRUE);
-  
+
   hint=weed_get_int_value(ptmpl,"hint",&error);
 
   switch (hint) {
-  case WEED_HINT_INTEGER: retval=get_omc_const("LIVES_PARAM_TYPE_INT"); break;
-  case WEED_HINT_FLOAT: retval=get_omc_const("LIVES_PARAM_TYPE_FLOAT"); break;
-  case WEED_HINT_TEXT: retval=get_omc_const("LIVES_PARAM_TYPE_STRING"); break;
-  case WEED_HINT_SWITCH: retval=get_omc_const("LIVES_PARAM_TYPE_BOOL"); break;
-  case WEED_HINT_COLOR: retval=get_omc_const("LIVES_PARAM_TYPE_COLOR"); break;
-  default: return lives_osc_notify_failure();
+  case WEED_HINT_INTEGER:
+    retval=get_omc_const("LIVES_PARAM_TYPE_INT");
+    break;
+  case WEED_HINT_FLOAT:
+    retval=get_omc_const("LIVES_PARAM_TYPE_FLOAT");
+    break;
+  case WEED_HINT_TEXT:
+    retval=get_omc_const("LIVES_PARAM_TYPE_STRING");
+    break;
+  case WEED_HINT_SWITCH:
+    retval=get_omc_const("LIVES_PARAM_TYPE_BOOL");
+    break;
+  case WEED_HINT_COLOR:
+    retval=get_omc_const("LIVES_PARAM_TYPE_COLOR");
+    break;
+  default:
+    return lives_osc_notify_failure();
   }
 
-  lives_status_send (retval);
+  lives_status_send(retval);
+  return TRUE;
 }
 
 
-void lives_osc_cb_rte_getoparamtype(void *context, int arglen, const void *vargs, OSCTimeTag when, 
-				    NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_rte_getoparamtype(void *context, int arglen, const void *vargs, OSCTimeTag when,
+                                       NetworkReturnAddressPtr ra) {
   weed_plant_t *filter;
   weed_plant_t **out_ptmpls;
   weed_plant_t *ptmpl;
@@ -3598,21 +3588,20 @@
 
   const char *retval;
 
-  if (!lives_osc_check_arguments (arglen,vargs,"iii",FALSE)) {
-    if (!lives_osc_check_arguments (arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
+  if (!lives_osc_check_arguments(arglen,vargs,"iii",FALSE)) {
+    if (!lives_osc_check_arguments(arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
     lives_osc_parse_int_argument(vargs,&effect_key);
     lives_osc_parse_int_argument(vargs,&pnum);
     mode=rte_key_getmode(effect_key);
-  }
-  else {
-    lives_osc_check_arguments (arglen,vargs,"iii",TRUE);
+  } else {
+    lives_osc_check_arguments(arglen,vargs,"iii",TRUE);
     lives_osc_parse_int_argument(vargs,&effect_key);
     lives_osc_parse_int_argument(vargs,&mode);
     lives_osc_parse_int_argument(vargs,&pnum);
     if (mode<1||mode>rte_key_getmaxmode(effect_key)+1) return lives_osc_notify_failure();
     mode--;
   }
-  
+
   if (effect_key<1||effect_key>FX_MAX) return lives_osc_notify_failure();
   //g_print("key %d pnum %d",effect_key,pnum);
 
@@ -3622,29 +3611,41 @@
   if (!weed_plant_has_leaf(filter,"out_parameter_templates")) return lives_osc_notify_failure();
   nparams=weed_leaf_num_elements(filter,"out_parameter_templates");
   if (pnum<0||pnum>=nparams) return lives_osc_notify_failure();
-  
+
   out_ptmpls=weed_get_plantptr_array(filter,"out_parameter_templates",&error);
-  
+
   ptmpl=out_ptmpls[pnum];
   hint=weed_get_int_value(ptmpl,"hint",&error);
-  weed_free(out_ptmpls);
+  lives_free(out_ptmpls);
 
   switch (hint) {
-  case WEED_HINT_INTEGER: retval=get_omc_const("LIVES_PARAM_TYPE_INT"); break;
-  case WEED_HINT_FLOAT: retval=get_omc_const("LIVES_PARAM_TYPE_FLOAT"); break;
-  case WEED_HINT_TEXT: retval=get_omc_const("LIVES_PARAM_TYPE_STRING"); break;
-  case WEED_HINT_SWITCH: retval=get_omc_const("LIVES_PARAM_TYPE_BOOL"); break;
-  case WEED_HINT_COLOR: retval=get_omc_const("LIVES_PARAM_TYPE_COLOR"); break;
-  default: return lives_osc_notify_failure();
+  case WEED_HINT_INTEGER:
+    retval=get_omc_const("LIVES_PARAM_TYPE_INT");
+    break;
+  case WEED_HINT_FLOAT:
+    retval=get_omc_const("LIVES_PARAM_TYPE_FLOAT");
+    break;
+  case WEED_HINT_TEXT:
+    retval=get_omc_const("LIVES_PARAM_TYPE_STRING");
+    break;
+  case WEED_HINT_SWITCH:
+    retval=get_omc_const("LIVES_PARAM_TYPE_BOOL");
+    break;
+  case WEED_HINT_COLOR:
+    retval=get_omc_const("LIVES_PARAM_TYPE_COLOR");
+    break;
+  default:
+    return lives_osc_notify_failure();
   }
 
-  lives_status_send (retval);
+  lives_status_send(retval);
+  return TRUE;
 }
 
 
 
-void lives_osc_cb_rte_getpparamtype(void *context, int arglen, const void *vargs, OSCTimeTag when, 
-				    NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_rte_getpparamtype(void *context, int arglen, const void *vargs, OSCTimeTag when,
+                                       NetworkReturnAddressPtr ra) {
   // playback plugin params
   weed_plant_t *ptmpl,*param;
   int hint,error;
@@ -3654,7 +3655,7 @@
 
   if (mainw->vpp==NULL||mainw->vpp->num_play_params==0) return lives_osc_notify_failure();
 
-  if (!lives_osc_check_arguments (arglen,vargs,"i",TRUE)) return lives_osc_notify_failure();
+  if (!lives_osc_check_arguments(arglen,vargs,"i",TRUE)) return lives_osc_notify_failure();
 
   lives_osc_parse_int_argument(vargs,&pnum);
 
@@ -3667,21 +3668,33 @@
   hint=weed_get_int_value(ptmpl,"hint",&error);
 
   switch (hint) {
-  case WEED_HINT_INTEGER: retval=get_omc_const("LIVES_PARAM_TYPE_INT"); break;
-  case WEED_HINT_FLOAT: retval=get_omc_const("LIVES_PARAM_TYPE_FLOAT"); break;
-  case WEED_HINT_TEXT: retval=get_omc_const("LIVES_PARAM_TYPE_STRING"); break;
-  case WEED_HINT_SWITCH: retval=get_omc_const("LIVES_PARAM_TYPE_BOOL"); break;
-  case WEED_HINT_COLOR: retval=get_omc_const("LIVES_PARAM_TYPE_COLOR"); break;
-  default: return lives_osc_notify_failure();
+  case WEED_HINT_INTEGER:
+    retval=get_omc_const("LIVES_PARAM_TYPE_INT");
+    break;
+  case WEED_HINT_FLOAT:
+    retval=get_omc_const("LIVES_PARAM_TYPE_FLOAT");
+    break;
+  case WEED_HINT_TEXT:
+    retval=get_omc_const("LIVES_PARAM_TYPE_STRING");
+    break;
+  case WEED_HINT_SWITCH:
+    retval=get_omc_const("LIVES_PARAM_TYPE_BOOL");
+    break;
+  case WEED_HINT_COLOR:
+    retval=get_omc_const("LIVES_PARAM_TYPE_COLOR");
+    break;
+  default:
+    return lives_osc_notify_failure();
   }
 
-  lives_status_send (retval);
+  lives_status_send(retval);
+  return TRUE;
 }
 
 
 
-void lives_osc_cb_rte_getnparamtype(void *context, int arglen, const void *vargs, OSCTimeTag when, 
-				    NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_rte_getnparamtype(void *context, int arglen, const void *vargs, OSCTimeTag when,
+                                       NetworkReturnAddressPtr ra) {
   weed_plant_t *filter;
   weed_plant_t **in_ptmpls;
   weed_plant_t *ptmpl;
@@ -3691,7 +3704,7 @@
 
   const char *retval;
 
-  if (!lives_osc_check_arguments (arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
+  if (!lives_osc_check_arguments(arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
 
   lives_osc_parse_int_argument(vargs,&effect_key);
   lives_osc_parse_int_argument(vargs,&pnum);
@@ -3708,21 +3721,27 @@
   ptmpl=in_ptmpls[i];
 
   hint=weed_get_int_value(ptmpl,"hint",&error);
-  weed_free(in_ptmpls);
+  lives_free(in_ptmpls);
 
   switch (hint) {
-  case WEED_HINT_INTEGER: retval=get_omc_const("LIVES_PARAM_TYPE_INT"); break;
-  case WEED_HINT_FLOAT: retval=get_omc_const("LIVES_PARAM_TYPE_FLOAT"); break;
-  default: return lives_osc_notify_failure();
+  case WEED_HINT_INTEGER:
+    retval=get_omc_const("LIVES_PARAM_TYPE_INT");
+    break;
+  case WEED_HINT_FLOAT:
+    retval=get_omc_const("LIVES_PARAM_TYPE_FLOAT");
+    break;
+  default:
+    return lives_osc_notify_failure();
   }
 
-  lives_status_send (retval);
+  lives_status_send(retval);
+  return TRUE;
 }
 
 
 
-void lives_osc_cb_rte_getparamcspace(void *context, int arglen, const void *vargs, OSCTimeTag when, 
-				     NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_rte_getparamcspace(void *context, int arglen, const void *vargs, OSCTimeTag when,
+                                        NetworkReturnAddressPtr ra) {
   weed_plant_t *filter;
   weed_plant_t *ptmpl;
   int hint,error;
@@ -3734,14 +3753,13 @@
 
   const char *retval;
 
-  if (!lives_osc_check_arguments (arglen,vargs,"iii",FALSE)) {
-    if (!lives_osc_check_arguments (arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
+  if (!lives_osc_check_arguments(arglen,vargs,"iii",FALSE)) {
+    if (!lives_osc_check_arguments(arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
     lives_osc_parse_int_argument(vargs,&effect_key);
     lives_osc_parse_int_argument(vargs,&pnum);
     mode=rte_key_getmode(effect_key);
-  }
-  else {
-    lives_osc_check_arguments (arglen,vargs,"iii",TRUE);
+  } else {
+    lives_osc_check_arguments(arglen,vargs,"iii",TRUE);
     lives_osc_parse_int_argument(vargs,&effect_key);
     lives_osc_parse_int_argument(vargs,&mode);
     lives_osc_parse_int_argument(vargs,&pnum);
@@ -3758,7 +3776,7 @@
   nparams=num_in_params(filter,FALSE,TRUE);
   if (nparams==0) return lives_osc_notify_failure();
   if (pnum<0||pnum>=nparams) return lives_osc_notify_failure();
-  
+
   ptmpl=weed_filter_in_paramtmpl(filter,pnum,TRUE);
 
   hint=weed_get_int_value(ptmpl,"hint",&error);
@@ -3773,19 +3791,19 @@
   if (cspace==WEED_COLORSPACE_RGB) {
     if (stype==WEED_SEED_INT) retval=get_omc_const("LIVES_COLORSPACE_RGB_INT");
     else retval=get_omc_const("LIVES_COLORSPACE_RGB_FLOAT");
-  }
-  else {
+  } else {
     if (stype==WEED_SEED_INT) retval=get_omc_const("LIVES_COLORSPACE_RGBA_INT");
     else retval=get_omc_const("LIVES_COLORSPACE_RGBA_FLOAT");
   }
 
-  lives_status_send (retval);
+  lives_status_send(retval);
+  return TRUE;
 
 }
 
 
-void lives_osc_cb_rte_getparamgrp(void *context, int arglen, const void *vargs, OSCTimeTag when, 
-				     NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_rte_getparamgrp(void *context, int arglen, const void *vargs, OSCTimeTag when,
+                                     NetworkReturnAddressPtr ra) {
   weed_plant_t *filter;
   weed_plant_t *ptmpl;
   int hint,error;
@@ -3796,14 +3814,13 @@
 
   const char *retval;
 
-  if (!lives_osc_check_arguments (arglen,vargs,"iii",FALSE)) {
-    if (!lives_osc_check_arguments (arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
+  if (!lives_osc_check_arguments(arglen,vargs,"iii",FALSE)) {
+    if (!lives_osc_check_arguments(arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
     lives_osc_parse_int_argument(vargs,&effect_key);
     lives_osc_parse_int_argument(vargs,&pnum);
     mode=rte_key_getmode(effect_key);
-  }
-  else {
-    lives_osc_check_arguments (arglen,vargs,"iii",TRUE);
+  } else {
+    lives_osc_check_arguments(arglen,vargs,"iii",TRUE);
     lives_osc_parse_int_argument(vargs,&effect_key);
     lives_osc_parse_int_argument(vargs,&mode);
     lives_osc_parse_int_argument(vargs,&pnum);
@@ -3820,7 +3837,7 @@
   nparams=num_in_params(filter,FALSE,TRUE);
   if (nparams==0) return lives_osc_notify_failure();
   if (pnum<0||pnum>=nparams) return lives_osc_notify_failure();
-  
+
   ptmpl=weed_filter_in_paramtmpl(filter,pnum,TRUE);
 
   hint=weed_get_int_value(ptmpl,"hint",&error);
@@ -3830,15 +3847,16 @@
   }
   grp=weed_get_int_value(ptmpl,"group",&error);
 
-  retval=g_strdup_printf("%d",grp);
+  retval=lives_strdup_printf("%d",grp);
 
-  lives_status_send (retval);
+  lives_status_send(retval);
+  return TRUE;
 
 }
 
 
-void lives_osc_cb_rte_getoparamcspace(void *context, int arglen, const void *vargs, OSCTimeTag when, 
-				     NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_rte_getoparamcspace(void *context, int arglen, const void *vargs, OSCTimeTag when,
+    NetworkReturnAddressPtr ra) {
   weed_plant_t *filter;
   weed_plant_t **out_ptmpls;
   weed_plant_t *ptmpl;
@@ -3851,14 +3869,13 @@
 
   const char *retval;
 
-  if (!lives_osc_check_arguments (arglen,vargs,"iii",FALSE)) {
-    if (!lives_osc_check_arguments (arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
+  if (!lives_osc_check_arguments(arglen,vargs,"iii",FALSE)) {
+    if (!lives_osc_check_arguments(arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
     lives_osc_parse_int_argument(vargs,&effect_key);
     lives_osc_parse_int_argument(vargs,&pnum);
     mode=rte_key_getmode(effect_key);
-  }
-  else {
-    lives_osc_check_arguments (arglen,vargs,"iii",TRUE);
+  } else {
+    lives_osc_check_arguments(arglen,vargs,"iii",TRUE);
     lives_osc_parse_int_argument(vargs,&effect_key);
     lives_osc_parse_int_argument(vargs,&mode);
     lives_osc_parse_int_argument(vargs,&pnum);
@@ -3882,7 +3899,7 @@
   hint=weed_get_int_value(ptmpl,"hint",&error);
 
   if (hint!=WEED_HINT_COLOR) {
-    weed_free(out_ptmpls);
+    lives_free(out_ptmpls);
     return lives_osc_notify_failure();
   }
   cspace=weed_get_int_value(ptmpl,"colorspace",&error);
@@ -3892,22 +3909,22 @@
   if (cspace==WEED_COLORSPACE_RGB) {
     if (stype==WEED_SEED_INT) retval=get_omc_const("LIVES_COLORSPACE_RGB_INT");
     else retval=get_omc_const("LIVES_COLORSPACE_RGB_FLOAT");
-  }
-  else {
+  } else {
     if (stype==WEED_SEED_INT) retval=get_omc_const("LIVES_COLORSPACE_RGBA_INT");
     else retval=get_omc_const("LIVES_COLORSPACE_RGBA_FLOAT");
   }
 
-  lives_status_send (retval);
-  weed_free(out_ptmpls);
+  lives_status_send(retval);
+  lives_free(out_ptmpls);
+  return TRUE;
 
 }
 
 
 
 
-void lives_osc_cb_rte_getpparamcspace(void *context, int arglen, const void *vargs, OSCTimeTag when, 
-				      NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_rte_getpparamcspace(void *context, int arglen, const void *vargs, OSCTimeTag when,
+    NetworkReturnAddressPtr ra) {
   // playback plugin params
   weed_plant_t *ptmpl,*param;
   int hint,error;
@@ -3918,7 +3935,7 @@
 
   if (mainw->vpp==NULL||mainw->vpp->num_play_params==0) return lives_osc_notify_failure();
 
-  if (!lives_osc_check_arguments (arglen,vargs,"i",TRUE)) return lives_osc_notify_failure();
+  if (!lives_osc_check_arguments(arglen,vargs,"i",TRUE)) return lives_osc_notify_failure();
   lives_osc_parse_int_argument(vargs,&pnum);
 
   if (pnum<0||pnum>=mainw->vpp->num_play_params) return lives_osc_notify_failure();
@@ -3939,20 +3956,20 @@
   if (cspace==WEED_COLORSPACE_RGB) {
     if (stype==WEED_SEED_INT) retval=get_omc_const("LIVES_COLORSPACE_RGB_INT");
     else retval=get_omc_const("LIVES_COLORSPACE_RGB_FLOAT");
-  }
-  else {
+  } else {
     if (stype==WEED_SEED_INT) retval=get_omc_const("LIVES_COLORSPACE_RGBA_INT");
     else retval=get_omc_const("LIVES_COLORSPACE_RGBA_FLOAT");
   }
 
-  lives_status_send (retval);
+  lives_status_send(retval);
+  return TRUE;
 
 }
 
 
 
-void lives_osc_cb_rte_getparamflags(void *context, int arglen, const void *vargs, OSCTimeTag when, 
-				    NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_rte_getparamflags(void *context, int arglen, const void *vargs, OSCTimeTag when,
+                                       NetworkReturnAddressPtr ra) {
   weed_plant_t *filter;
   weed_plant_t *ptmpl;
   int error;
@@ -3963,14 +3980,13 @@
 
   char *retval;
 
-  if (!lives_osc_check_arguments (arglen,vargs,"iii",FALSE)) {
-    if (!lives_osc_check_arguments (arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
+  if (!lives_osc_check_arguments(arglen,vargs,"iii",FALSE)) {
+    if (!lives_osc_check_arguments(arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
     lives_osc_parse_int_argument(vargs,&effect_key);
     lives_osc_parse_int_argument(vargs,&pnum);
     mode=rte_key_getmode(effect_key);
-  }
-  else {
-    lives_osc_check_arguments (arglen,vargs,"iii",TRUE);
+  } else {
+    lives_osc_check_arguments(arglen,vargs,"iii",TRUE);
     lives_osc_parse_int_argument(vargs,&effect_key);
     lives_osc_parse_int_argument(vargs,&mode);
     lives_osc_parse_int_argument(vargs,&pnum);
@@ -3987,21 +4003,22 @@
   nparams=num_in_params(filter,FALSE,TRUE);
   if (nparams==0) return lives_osc_notify_failure();
   if (pnum<0||pnum>=nparams) return lives_osc_notify_failure();
-  
+
   ptmpl=weed_filter_in_paramtmpl(filter,pnum,TRUE);
 
   if (weed_plant_has_leaf(ptmpl,"flags"))
     flags=weed_get_int_value(ptmpl,"flags",&error);
 
-  retval=g_strdup_printf("%d",flags);
-  lives_status_send (retval);
-  g_free(retval);
+  retval=lives_strdup_printf("%d",flags);
+  lives_status_send(retval);
+  lives_free(retval);
+  return TRUE;
 }
 
 
 
-void lives_osc_cb_rte_getpparamflags(void *context, int arglen, const void *vargs, OSCTimeTag when, 
-				     NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_rte_getpparamflags(void *context, int arglen, const void *vargs, OSCTimeTag when,
+                                        NetworkReturnAddressPtr ra) {
   weed_plant_t *ptmpl,*param;
   int error;
   int pnum,flags=0;
@@ -4010,7 +4027,7 @@
 
   if (!mainw->ext_playback||mainw->vpp->play_params==NULL) return lives_osc_notify_failure();
 
-  if (!lives_osc_check_arguments (arglen,vargs,"i",TRUE)) return lives_osc_notify_failure();
+  if (!lives_osc_check_arguments(arglen,vargs,"i",TRUE)) return lives_osc_notify_failure();
 
   lives_osc_parse_int_argument(vargs,&pnum);
 
@@ -4023,14 +4040,15 @@
   if (weed_plant_has_leaf(ptmpl,"flags"))
     flags=weed_get_int_value(ptmpl,"flags",&error);
 
-  retval=g_strdup_printf("%d",flags);
-  lives_status_send (retval);
-  g_free(retval);
+  retval=lives_strdup_printf("%d",flags);
+  lives_status_send(retval);
+  lives_free(retval);
+  return TRUE;
 }
 
 
-void lives_osc_cb_rte_getparamname(void *context, int arglen, const void *vargs, OSCTimeTag when, 
-				   NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_rte_getparamname(void *context, int arglen, const void *vargs, OSCTimeTag when,
+                                      NetworkReturnAddressPtr ra) {
   weed_plant_t *filter;
   weed_plant_t *ptmpl;
   int error;
@@ -4041,14 +4059,13 @@
 
   char *retval;
 
-  if (!lives_osc_check_arguments (arglen,vargs,"iii",FALSE)) {
-    if (!lives_osc_check_arguments (arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
+  if (!lives_osc_check_arguments(arglen,vargs,"iii",FALSE)) {
+    if (!lives_osc_check_arguments(arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
     lives_osc_parse_int_argument(vargs,&effect_key);
     lives_osc_parse_int_argument(vargs,&pnum);
     mode=rte_key_getmode(effect_key);
-  }
-  else {
-    lives_osc_check_arguments (arglen,vargs,"iii",TRUE);
+  } else {
+    lives_osc_check_arguments(arglen,vargs,"iii",TRUE);
     lives_osc_parse_int_argument(vargs,&effect_key);
     lives_osc_parse_int_argument(vargs,&mode);
     lives_osc_parse_int_argument(vargs,&pnum);
@@ -4065,20 +4082,146 @@
   nparams=num_in_params(filter,FALSE,TRUE);
   if (nparams==0) return lives_osc_notify_failure();
   if (pnum<0||pnum>=nparams) return lives_osc_notify_failure();
-  
+
   ptmpl=weed_filter_in_paramtmpl(filter,pnum,TRUE);
 
   retval=weed_get_string_value(ptmpl,"name",&error);
 
-  lives_status_send (retval);
+  lives_status_send(retval);
 
-  weed_free(retval);
+  lives_free(retval);
+  return TRUE;
 
 }
 
 
-void lives_osc_cb_rte_getoparamname(void *context, int arglen, const void *vargs, OSCTimeTag when, 
-				   NetworkReturnAddressPtr ra) {
+
+boolean lives_osc_cb_pgui_countchoices(void *context, int arglen, const void *vargs, OSCTimeTag when,
+                                       NetworkReturnAddressPtr ra) {
+
+  weed_plant_t *filter;
+  weed_plant_t *ptmpl;
+
+  int nparams;
+  int effect_key;
+  int mode;
+  int pnum;
+  int val=0;
+
+  char *retval;
+
+  if (!lives_osc_check_arguments(arglen,vargs,"iii",FALSE)) {
+    if (!lives_osc_check_arguments(arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
+    lives_osc_parse_int_argument(vargs,&effect_key);
+    lives_osc_parse_int_argument(vargs,&pnum);
+    mode=rte_key_getmode(effect_key);
+  } else {
+    lives_osc_check_arguments(arglen,vargs,"iii",TRUE);
+    lives_osc_parse_int_argument(vargs,&effect_key);
+    lives_osc_parse_int_argument(vargs,&mode);
+    lives_osc_parse_int_argument(vargs,&pnum);
+    if (mode<1||mode>rte_key_getmaxmode(effect_key)+1) return lives_osc_notify_failure();
+    mode--;
+  }
+
+  if (effect_key<1||effect_key>FX_MAX) return lives_osc_notify_failure();
+  //g_print("key %d pnum %d",effect_key,pnum);
+
+  filter=rte_keymode_get_filter(effect_key,mode);
+  if (filter==NULL) return lives_osc_notify_failure();
+
+  nparams=num_in_params(filter,FALSE,TRUE);
+  if (nparams==0) return lives_osc_notify_failure();
+  if (pnum<0||pnum>=nparams) return lives_osc_notify_failure();
+
+  ptmpl=weed_filter_in_paramtmpl(filter,pnum,TRUE);
+
+  if (weed_plant_has_leaf(ptmpl,"choices")) val=weed_leaf_num_elements(ptmpl,"choices");
+
+  retval=lives_strdup_printf("%d",val);
+
+  lives_status_send(retval);
+
+  lives_free(retval);
+  return TRUE;
+
+}
+
+
+
+boolean lives_osc_cb_pgui_getchoice(void *context, int arglen, const void *vargs, OSCTimeTag when,
+                                    NetworkReturnAddressPtr ra) {
+
+
+  weed_plant_t *filter;
+  weed_plant_t *ptmpl;
+
+  boolean ret=FALSE;
+
+  int error;
+  int nparams;
+  int effect_key;
+  int mode;
+  int pnum;
+  int cc;
+
+  char *retval=lives_strdup("");
+
+  if (!lives_osc_check_arguments(arglen,vargs,"iiii",FALSE)) {
+    if (!lives_osc_check_arguments(arglen,vargs,"iii",TRUE)) return lives_osc_notify_failure();
+    lives_osc_parse_int_argument(vargs,&effect_key);
+    lives_osc_parse_int_argument(vargs,&pnum);
+    lives_osc_parse_int_argument(vargs,&cc);
+    mode=rte_key_getmode(effect_key);
+  } else {
+    lives_osc_check_arguments(arglen,vargs,"iiii",TRUE);
+    lives_osc_parse_int_argument(vargs,&effect_key);
+    lives_osc_parse_int_argument(vargs,&mode);
+    lives_osc_parse_int_argument(vargs,&pnum);
+    lives_osc_parse_int_argument(vargs,&cc);
+    if (mode<1||mode>rte_key_getmaxmode(effect_key)+1) return lives_osc_notify_failure();
+    mode--;
+  }
+
+  if (effect_key<1||effect_key>FX_MAX) return lives_osc_notify_failure();
+  //g_print("key %d pnum %d",effect_key,pnum);
+
+  filter=rte_keymode_get_filter(effect_key,mode);
+  if (filter==NULL) return lives_osc_notify_failure();
+
+  nparams=num_in_params(filter,FALSE,TRUE);
+  if (nparams==0) return lives_osc_notify_failure();
+  if (pnum<0||pnum>=nparams) return lives_osc_notify_failure();
+
+  ptmpl=weed_filter_in_paramtmpl(filter,pnum,TRUE);
+
+  if (weed_plant_has_leaf(ptmpl,"choices")) {
+    int nc=weed_leaf_num_elements(ptmpl,"choices");
+    if (cc<nc) {
+      char **choices=weed_get_string_array(ptmpl,"choices",&error);
+      register int i;
+      for (i=0; i<nc; i++) {
+        if (i==cc) {
+          lives_free(retval);
+          retval=choices[i];
+          ret=TRUE;
+        } else lives_free(choices[i]);
+      }
+      lives_free(choices);
+    }
+  }
+
+  lives_status_send(retval);
+  lives_free(retval);
+
+  return ret;
+}
+
+
+
+
+boolean lives_osc_cb_rte_getoparamname(void *context, int arglen, const void *vargs, OSCTimeTag when,
+                                       NetworkReturnAddressPtr ra) {
   weed_plant_t *filter;
   weed_plant_t **out_ptmpls;
   weed_plant_t *ptmpl;
@@ -4090,14 +4233,13 @@
 
   char *retval;
 
-  if (!lives_osc_check_arguments (arglen,vargs,"iii",FALSE)) {
-    if (!lives_osc_check_arguments (arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
+  if (!lives_osc_check_arguments(arglen,vargs,"iii",FALSE)) {
+    if (!lives_osc_check_arguments(arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
     lives_osc_parse_int_argument(vargs,&effect_key);
     lives_osc_parse_int_argument(vargs,&pnum);
     mode=rte_key_getmode(effect_key);
-  }
-  else {
-    lives_osc_check_arguments (arglen,vargs,"iii",TRUE);
+  } else {
+    lives_osc_check_arguments(arglen,vargs,"iii",TRUE);
     lives_osc_parse_int_argument(vargs,&effect_key);
     lives_osc_parse_int_argument(vargs,&mode);
     lives_osc_parse_int_argument(vargs,&pnum);
@@ -4120,17 +4262,18 @@
 
   retval=weed_get_string_value(ptmpl,"name",&error);
 
-  lives_status_send (retval);
+  lives_status_send(retval);
 
-  weed_free(retval);
-  weed_free(out_ptmpls);
+  lives_free(retval);
+  lives_free(out_ptmpls);
+  return TRUE;
 
 }
 
 
 
-void lives_osc_cb_rte_getpparamname(void *context, int arglen, const void *vargs, OSCTimeTag when, 
-				    NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_rte_getpparamname(void *context, int arglen, const void *vargs, OSCTimeTag when,
+                                       NetworkReturnAddressPtr ra) {
   weed_plant_t *ptmpl,*param;
   int error;
   int pnum;
@@ -4139,7 +4282,7 @@
 
   if (!mainw->ext_playback||mainw->vpp->play_params==NULL) return lives_osc_notify_failure();
 
-  if (!lives_osc_check_arguments (arglen,vargs,"i",TRUE)) return lives_osc_notify_failure();
+  if (!lives_osc_check_arguments(arglen,vargs,"i",TRUE)) return lives_osc_notify_failure();
 
   lives_osc_parse_int_argument(vargs,&pnum);
 
@@ -4151,16 +4294,17 @@
 
   retval=weed_get_string_value(ptmpl,"name",&error);
 
-  lives_status_send (retval);
+  lives_status_send(retval);
 
-  weed_free(retval);
+  lives_free(retval);
+  return TRUE;
 
 }
 
 
 
-void lives_osc_cb_rte_getnparamname(void *context, int arglen, const void *vargs, OSCTimeTag when, 
-				    NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_rte_getnparamname(void *context, int arglen, const void *vargs, OSCTimeTag when,
+                                       NetworkReturnAddressPtr ra) {
   weed_plant_t *filter;
   weed_plant_t **in_ptmpls;
   weed_plant_t *ptmpl;
@@ -4170,7 +4314,7 @@
 
   char *retval;
 
-  if (!lives_osc_check_arguments (arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
+  if (!lives_osc_check_arguments(arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
 
   lives_osc_parse_int_argument(vargs,&effect_key);
   lives_osc_parse_int_argument(vargs,&pnum);
@@ -4190,17 +4334,18 @@
 
   retval=weed_get_string_value(ptmpl,"name",&error);
 
-  lives_status_send (retval);
+  lives_status_send(retval);
 
-  weed_free(in_ptmpls);
-  weed_free(retval);
+  lives_free(in_ptmpls);
+  lives_free(retval);
+  return TRUE;
 }
 
 
 
 
-void lives_osc_cb_rte_setparam(void *context, int arglen, const void *vargs, OSCTimeTag when, 
-			       NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_rte_setparam(void *context, int arglen, const void *vargs, OSCTimeTag when,
+                                  NetworkReturnAddressPtr ra) {
 
   weed_plant_t *inst,*filter;
   weed_plant_t *tparam;
@@ -4209,7 +4354,7 @@
   int effect_key;
   int pnum,nargs;
 
-  if (!lives_osc_check_arguments (arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
+  if (!lives_osc_check_arguments(arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
 
   nargs=lives_osc_get_num_arguments(vargs);
   if (nargs<3) return lives_osc_notify_failure();
@@ -4230,37 +4375,36 @@
   nparams=num_in_params(filter,FALSE,TRUE);
   if (nparams==0) return lives_osc_notify_failure();
   if (pnum<0||pnum>=nparams) return lives_osc_notify_failure();
-  
+
   tparam=weed_inst_in_param(inst,pnum,FALSE,TRUE);
 
   if (!mainw->osc_block) {
     if (!setfx(inst,tparam,pnum,nargs-2,vargs,3)) {
       return lives_osc_notify_failure();
     }
-  }
-  else {
+  } else {
     return lives_osc_notify_failure();
   }
 
   if (fx_dialog[1]!=NULL) {
-    lives_rfx_t *rfx=(lives_rfx_t *)g_object_get_data(G_OBJECT(fx_dialog[1]),"rfx");
+    lives_rfx_t *rfx=(lives_rfx_t *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(fx_dialog[1]),"rfx");
     if (!rfx->is_template) {
-      int keyw=GPOINTER_TO_INT (g_object_get_data (G_OBJECT (fx_dialog[1]),"key"));
-      int modew=GPOINTER_TO_INT (g_object_get_data (G_OBJECT (fx_dialog[1]),"mode"));
+      int keyw=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(fx_dialog[1]),"key"));
+      int modew=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(fx_dialog[1]),"mode"));
       if (keyw==effect_key&&modew==rte_key_getmode(effect_key))
-	mainw->vrfx_update=rfx;
+        mainw->vrfx_update=rfx;
     }
   }
 
   if (mainw->ce_thumbs) ce_thumbs_register_rfx_change(effect_key,rte_key_getmode(effect_key));
 
-  lives_osc_notify_success(NULL);
+  return lives_osc_notify_success(NULL);
 
 }
 
 
-void lives_osc_cb_rte_setparamdef(void *context, int arglen, const void *vargs, OSCTimeTag when, 
-				  NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_rte_setparamdef(void *context, int arglen, const void *vargs, OSCTimeTag when,
+                                     NetworkReturnAddressPtr ra) {
 
   weed_plant_t *filter;
   weed_plant_t *tptmpl;
@@ -4272,18 +4416,17 @@
 
   nargs=lives_osc_get_num_arguments(vargs);
 
-  if (!lives_osc_check_arguments (arglen,vargs,"iii",FALSE)) {
-    if (!lives_osc_check_arguments (arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
+  if (!lives_osc_check_arguments(arglen,vargs,"iii",FALSE)) {
+    if (!lives_osc_check_arguments(arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
     if (nargs<3) return lives_osc_notify_failure();
     osc_header_len=pad4(nargs+1); // add comma
     lives_osc_parse_int_argument(vargs,&effect_key);
     lives_osc_parse_int_argument(vargs,&pnum);
     mode=rte_key_getmode(effect_key);
     skip=3;
-  }
-  else {
+  } else {
     if (nargs<4) return lives_osc_notify_failure();
-    lives_osc_check_arguments (arglen,vargs,"iii",TRUE);
+    lives_osc_check_arguments(arglen,vargs,"iii",TRUE);
     osc_header_len=pad4(nargs+1); // add comma
     lives_osc_parse_int_argument(vargs,&effect_key);
     lives_osc_parse_int_argument(vargs,&mode);
@@ -4303,28 +4446,28 @@
   nparams=num_in_params(filter,FALSE,TRUE);
   if (nparams==0) return lives_osc_notify_failure();
   if (pnum<0||pnum>=nparams) return lives_osc_notify_failure();
-  
+
   tptmpl=weed_filter_in_paramtmpl(filter,pnum,TRUE);
 
   if (!setfx(filter,tptmpl,pnum,nargs-2,vargs,skip)) {
     return lives_osc_notify_failure();
   }
 
-  lives_osc_notify_success(NULL);
+  return lives_osc_notify_success(NULL);
 
 }
 
 
 
-void lives_osc_cb_rte_setpparam(void *context, int arglen, const void *vargs, OSCTimeTag when, 
-				NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_rte_setpparam(void *context, int arglen, const void *vargs, OSCTimeTag when,
+                                   NetworkReturnAddressPtr ra) {
   // set playback plugin param
   weed_plant_t *param;
   int pnum,nargs;
 
   if (!mainw->ext_playback||mainw->vpp->play_params==NULL) return lives_osc_notify_failure();
 
-  if (!lives_osc_check_arguments (arglen,vargs,"i",TRUE)) return lives_osc_notify_failure();
+  if (!lives_osc_check_arguments(arglen,vargs,"i",TRUE)) return lives_osc_notify_failure();
 
   nargs=lives_osc_get_num_arguments(vargs);
   if (nargs<2) return lives_osc_notify_failure();
@@ -4339,16 +4482,15 @@
 
   if (!mainw->osc_block) {
     if (!setfx(NULL,param,pnum,nargs-1,vargs,2)) return lives_osc_notify_failure();
-  }
-  else return lives_osc_notify_failure();
-  
-  lives_osc_notify_success(NULL);
+  } else return lives_osc_notify_failure();
+
+  return lives_osc_notify_success(NULL);
 }
 
 
 
-void lives_osc_cb_rte_setnparam(void *context, int arglen, const void *vargs, OSCTimeTag when, 
-				NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_rte_setnparam(void *context, int arglen, const void *vargs, OSCTimeTag when,
+                                   NetworkReturnAddressPtr ra) {
 
   int effect_key;
   int pnum,i,nargs;
@@ -4359,8 +4501,8 @@
 
   weed_plant_t *inst,*param;
   weed_plant_t **in_params;
-  
-  if (!lives_osc_check_arguments (arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
+
+  if (!lives_osc_check_arguments(arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
 
   nargs=lives_osc_get_num_arguments(vargs);
   if (nargs<3) return lives_osc_notify_failure();
@@ -4384,18 +4526,17 @@
 
   if (i!=-1 && !mainw->osc_block) {
     if (!setfx(inst,param,pnum,nargs-2,vargs,3)) return lives_osc_notify_failure();
-  }
-  else lives_osc_notify_failure();
+  } else lives_osc_notify_failure();
 
-  lives_osc_notify_success(NULL);
+  return lives_osc_notify_success(NULL);
 
 }
 
 
 
 
-void lives_osc_cb_rte_setnparamdef(void *context, int arglen, const void *vargs, OSCTimeTag when, 
-				  NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_rte_setnparamdef(void *context, int arglen, const void *vargs, OSCTimeTag when,
+                                      NetworkReturnAddressPtr ra) {
 
   weed_plant_t *filter;
   weed_plant_t *tptmpl;
@@ -4407,18 +4548,17 @@
 
   nargs=lives_osc_get_num_arguments(vargs);
 
-  if (!lives_osc_check_arguments (arglen,vargs,"iii",FALSE)) {
-    if (!lives_osc_check_arguments (arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
+  if (!lives_osc_check_arguments(arglen,vargs,"iii",FALSE)) {
+    if (!lives_osc_check_arguments(arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
     if (nargs<3) return lives_osc_notify_failure();
     osc_header_len=pad4(nargs+1); // add comma
     lives_osc_parse_int_argument(vargs,&effect_key);
     lives_osc_parse_int_argument(vargs,&pnum);
     mode=rte_key_getmode(effect_key);
     skip=3;
-  }
-  else {
+  } else {
     if (nargs<4) return lives_osc_notify_failure();
-    lives_osc_check_arguments (arglen,vargs,"iii",TRUE);
+    lives_osc_check_arguments(arglen,vargs,"iii",TRUE);
     osc_header_len=pad4(nargs+1); // add comma
     lives_osc_parse_int_argument(vargs,&effect_key);
     lives_osc_parse_int_argument(vargs,&mode);
@@ -4438,34 +4578,33 @@
   nparams=num_in_params(filter,FALSE,TRUE);
   if (nparams==0) return lives_osc_notify_failure();
   if (pnum<0||pnum>=nparams) return lives_osc_notify_failure();
-  
+
   tptmpl=weed_filter_in_paramtmpl(filter,pnum,TRUE);
 
   if (!setfx(filter,tptmpl,pnum,nargs-2,vargs,skip)) {
     return lives_osc_notify_failure();
   }
 
-  lives_osc_notify_success(NULL);
+  return lives_osc_notify_success(NULL);
 
 }
 
 
 
-void lives_osc_cb_rte_paramcount(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_rte_paramcount(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
 
   int effect_key,mode;
-    
+
   int count=0;
   weed_plant_t *filter;
   char *msg;
-  
-  if (!lives_osc_check_arguments (arglen,vargs,"ii",FALSE)) {
-    if (!lives_osc_check_arguments (arglen,vargs,"i",TRUE)) return lives_osc_notify_failure();
+
+  if (!lives_osc_check_arguments(arglen,vargs,"ii",FALSE)) {
+    if (!lives_osc_check_arguments(arglen,vargs,"i",TRUE)) return lives_osc_notify_failure();
     lives_osc_parse_int_argument(vargs,&effect_key);
     mode=rte_key_getmode(effect_key);
-  }
-  else {
-    lives_osc_check_arguments (arglen,vargs,"ii",TRUE);
+  } else {
+    lives_osc_check_arguments(arglen,vargs,"ii",TRUE);
     lives_osc_parse_int_argument(vargs,&effect_key);
     lives_osc_parse_int_argument(vargs,&mode);
     if (mode<1||mode>rte_key_getmaxmode(effect_key)+1) return lives_osc_notify_failure();
@@ -4481,26 +4620,26 @@
 
   count=num_in_params(filter,FALSE,TRUE);
 
-  msg=g_strdup_printf("%d",count);
+  msg=lives_strdup_printf("%d",count);
   lives_status_send(msg);
-  g_free(msg);
+  lives_free(msg);
+  return TRUE;
 }
 
 
-void lives_osc_cb_rte_oparamcount(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_rte_oparamcount(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
 
   int effect_key,mode;
   int count=0;
   weed_plant_t *filter;
   char *msg;
-  
-  if (!lives_osc_check_arguments (arglen,vargs,"ii",FALSE)) {
-    if (!lives_osc_check_arguments (arglen,vargs,"i",TRUE)) return lives_osc_notify_failure();
+
+  if (!lives_osc_check_arguments(arglen,vargs,"ii",FALSE)) {
+    if (!lives_osc_check_arguments(arglen,vargs,"i",TRUE)) return lives_osc_notify_failure();
     lives_osc_parse_int_argument(vargs,&effect_key);
     mode=rte_key_getmode(effect_key);
-  }
-  else {
-    lives_osc_check_arguments (arglen,vargs,"ii",TRUE);
+  } else {
+    lives_osc_check_arguments(arglen,vargs,"ii",TRUE);
     lives_osc_parse_int_argument(vargs,&effect_key);
     lives_osc_parse_int_argument(vargs,&mode);
     if (mode<1||mode>rte_key_getmaxmode(effect_key)+1) return lives_osc_notify_failure();
@@ -4517,28 +4656,28 @@
     count=weed_leaf_num_elements(filter,"out_parameter_templates");
   }
 
-  msg=g_strdup_printf("%d",count);
+  msg=lives_strdup_printf("%d",count);
   lives_status_send(msg);
-  g_free(msg);
+  lives_free(msg);
+  return TRUE;
 }
 
 
 
-void lives_osc_cb_rte_getinpal(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_rte_getinpal(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
 
   int effect_key,mode,cnum,count,error;
   weed_plant_t **ctmpls;
   weed_plant_t *filter,*inst,*ctmpl,*chan=NULL;
   char *msg;
-  
-  if (!lives_osc_check_arguments (arglen,vargs,"iii",FALSE)) {
-    if (!lives_osc_check_arguments (arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
+
+  if (!lives_osc_check_arguments(arglen,vargs,"iii",FALSE)) {
+    if (!lives_osc_check_arguments(arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
     lives_osc_parse_int_argument(vargs,&effect_key);
     lives_osc_parse_int_argument(vargs,&cnum);
     mode=rte_key_getmode(effect_key);
-  }
-  else {
-    lives_osc_check_arguments (arglen,vargs,"iii",TRUE);
+  } else {
+    lives_osc_check_arguments(arglen,vargs,"iii",TRUE);
     lives_osc_parse_int_argument(vargs,&effect_key);
     lives_osc_parse_int_argument(vargs,&mode);
     if (mode<1||mode>rte_key_getmaxmode(effect_key)+1) return lives_osc_notify_failure();
@@ -4554,8 +4693,7 @@
   if (inst!=NULL) {
     chan=get_enabled_channel(inst,cnum,TRUE);
     ctmpl=weed_get_plantptr_value(chan,"template",&error);
-  }
-  else {
+  } else {
     filter=rte_keymode_get_filter(effect_key,mode);
     if (filter==NULL) return lives_osc_notify_failure();
 
@@ -4564,45 +4702,45 @@
     if (cnum>=count) return lives_osc_notify_failure();
     ctmpls=weed_get_plantptr_array(filter,"in_channel_templates",&error);
     ctmpl=ctmpls[cnum];
-    weed_free(ctmpls);
+    lives_free(ctmpls);
   }
 
   if (weed_plant_has_leaf(ctmpl,"is_audio")) {
-      msg=g_strdup_printf("%d",WEED_PALETTE_END);
-      lives_status_send(msg);
-      g_free(msg);
-      return;
+    msg=lives_strdup_printf("%d",WEED_PALETTE_END);
+    lives_status_send(msg);
+    lives_free(msg);
+    return TRUE;
   }
 
   if (inst!=NULL) {
-    msg=g_strdup_printf("%d",weed_get_int_value(chan,"current_palette",&error));
+    msg=lives_strdup_printf("%d",weed_get_int_value(chan,"current_palette",&error));
     lives_status_send(msg);
-    g_free(msg);
-    return;
+    lives_free(msg);
+    return TRUE;
   }
 
   msg=lives_osc_format_result(ctmpl,"palette_list",0,-1);
   lives_status_send(msg);
-  g_free(msg);
+  lives_free(msg);
+  return TRUE;
 
 }
 
 
-void lives_osc_cb_rte_getoutpal(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_rte_getoutpal(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
 
   int effect_key,mode,cnum,count,error;
   weed_plant_t **ctmpls;
   weed_plant_t *filter,*inst,*ctmpl,*chan=NULL;
   char *msg;
-  
-  if (!lives_osc_check_arguments (arglen,vargs,"iii",FALSE)) {
-    if (!lives_osc_check_arguments (arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
+
+  if (!lives_osc_check_arguments(arglen,vargs,"iii",FALSE)) {
+    if (!lives_osc_check_arguments(arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
     lives_osc_parse_int_argument(vargs,&effect_key);
     lives_osc_parse_int_argument(vargs,&cnum);
     mode=rte_key_getmode(effect_key);
-  }
-  else {
-    lives_osc_check_arguments (arglen,vargs,"iii",TRUE);
+  } else {
+    lives_osc_check_arguments(arglen,vargs,"iii",TRUE);
     lives_osc_parse_int_argument(vargs,&effect_key);
     lives_osc_parse_int_argument(vargs,&mode);
     if (mode<1||mode>rte_key_getmaxmode(effect_key)+1) return lives_osc_notify_failure();
@@ -4618,8 +4756,7 @@
   if (inst!=NULL) {
     chan=get_enabled_channel(inst,cnum,FALSE);
     ctmpl=weed_get_plantptr_value(chan,"template",&error);
-  }
-  else {
+  } else {
     filter=rte_keymode_get_filter(effect_key,mode);
     if (filter==NULL) return lives_osc_notify_failure();
 
@@ -4628,53 +4765,55 @@
     if (cnum>=count) return lives_osc_notify_failure();
     ctmpls=weed_get_plantptr_array(filter,"out_channel_templates",&error);
     ctmpl=ctmpls[cnum];
-    weed_free(ctmpls);
+    lives_free(ctmpls);
   }
 
   if (weed_plant_has_leaf(ctmpl,"is_audio")) {
-      msg=g_strdup_printf("%d",WEED_PALETTE_END);
-      lives_status_send(msg);
-      g_free(msg);
-      return;
+    msg=lives_strdup_printf("%d",WEED_PALETTE_END);
+    lives_status_send(msg);
+    lives_free(msg);
+    return TRUE;
   }
 
   if (inst!=NULL) {
-    msg=g_strdup_printf("%d",weed_get_int_value(chan,"current_palette",&error));
+    msg=lives_strdup_printf("%d",weed_get_int_value(chan,"current_palette",&error));
     lives_status_send(msg);
-    g_free(msg);
-    return;
+    lives_free(msg);
+    return TRUE;
   }
 
   msg=lives_osc_format_result(ctmpl,"palette_list",0,-1);
   lives_status_send(msg);
-  g_free(msg);
+  lives_free(msg);
+  return TRUE;
 
 }
 
 
 
-void lives_osc_cb_rte_pparamcount(void *context, int arglen, const void *vargs, OSCTimeTag when,
-				  NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_rte_pparamcount(void *context, int arglen, const void *vargs, OSCTimeTag when,
+                                     NetworkReturnAddressPtr ra) {
   // return num playback plugin params
   int count=0;
   char *msg;
 
   if (mainw->vpp==NULL) {
     lives_status_send("0");
-    return;
+    return TRUE;
   }
 
   count=mainw->vpp->num_play_params;
 
-  msg=g_strdup_printf("%d",count);
+  msg=lives_strdup_printf("%d",count);
   lives_status_send(msg);
-  g_free(msg);
+  lives_free(msg);
+  return TRUE;
 }
 
 
 
-void lives_osc_cb_rte_nparamcount(void *context, int arglen, const void *vargs, OSCTimeTag when, 
-				  NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_rte_nparamcount(void *context, int arglen, const void *vargs, OSCTimeTag when,
+                                     NetworkReturnAddressPtr ra) {
 
   int effect_key;
   int count=-1,i;
@@ -4685,8 +4824,8 @@
   weed_plant_t *filter;
 
   char *msg;
-  
-  if (!lives_osc_check_arguments (arglen,vargs,"i",TRUE)) return lives_osc_notify_failure();
+
+  if (!lives_osc_check_arguments(arglen,vargs,"i",TRUE)) return lives_osc_notify_failure();
   lives_osc_parse_int_argument(vargs,&effect_key);
 
   if (effect_key<1||effect_key>FX_MAX) return lives_osc_notify_failure();
@@ -4699,14 +4838,15 @@
     i=get_nth_simple_param(filter,++count);
   } while (i!=-1);
 
-  msg=g_strdup_printf("%d",count);
+  msg=lives_strdup_printf("%d",count);
   lives_status_send(msg);
-  g_free(msg);
+  lives_free(msg);
+  return TRUE;
 }
 
 
-void lives_osc_cb_rte_getnchannels(void *context, int arglen, const void *vargs, OSCTimeTag when, 
-				   NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_rte_getnchannels(void *context, int arglen, const void *vargs, OSCTimeTag when,
+                                      NetworkReturnAddressPtr ra) {
 
   int effect_key,mode;
   int count;
@@ -4714,17 +4854,16 @@
   weed_plant_t *plant;
 
   char *msg;
-  
- if (!lives_osc_check_arguments (arglen,vargs,"ii",FALSE)) {
-    if (!lives_osc_check_arguments (arglen,vargs,"i",TRUE)) return lives_osc_notify_failure();
+
+  if (!lives_osc_check_arguments(arglen,vargs,"ii",FALSE)) {
+    if (!lives_osc_check_arguments(arglen,vargs,"i",TRUE)) return lives_osc_notify_failure();
     lives_osc_parse_int_argument(vargs,&effect_key);
     mode=rte_key_getmode(effect_key);
-  }
-  else {
-    lives_osc_check_arguments (arglen,vargs,"ii",TRUE);
+  } else {
+    lives_osc_check_arguments(arglen,vargs,"ii",TRUE);
     lives_osc_parse_int_argument(vargs,&effect_key);
     lives_osc_parse_int_argument(vargs,&mode);
-    if (mode<1||mode>rte_key_getmaxmode(effect_key)+1) return lives_osc_notify_failure();
+    if (mode<0||mode>rte_key_getmaxmode(effect_key)+1) return lives_osc_notify_failure();
     mode--;
   }
 
@@ -4735,14 +4874,15 @@
 
   count=enabled_in_channels(plant, FALSE);
 
-  msg=g_strdup_printf("%d",count);
+  msg=lives_strdup_printf("%d",count);
   lives_status_send(msg);
-  g_free(msg);
+  lives_free(msg);
+  return TRUE;
 }
 
 
-void lives_osc_cb_rte_getnochannels(void *context, int arglen, const void *vargs, OSCTimeTag when, 
-				    NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_rte_getnochannels(void *context, int arglen, const void *vargs, OSCTimeTag when,
+                                       NetworkReturnAddressPtr ra) {
 
   int effect_key;
   int count;
@@ -4751,8 +4891,8 @@
   weed_plant_t *plant;
 
   char *msg;
-  
-  if (!lives_osc_check_arguments (arglen,vargs,"i",TRUE)) return lives_osc_notify_failure();
+
+  if (!lives_osc_check_arguments(arglen,vargs,"i",TRUE)) return lives_osc_notify_failure();
   lives_osc_parse_int_argument(vargs,&effect_key);
 
   if (effect_key<1||effect_key>FX_MAX) return lives_osc_notify_failure();
@@ -4766,15 +4906,16 @@
 
   count=enabled_out_channels(plant, FALSE);
 
-  msg=g_strdup_printf("%d",count);
+  msg=lives_strdup_printf("%d",count);
   lives_status_send(msg);
-  g_free(msg);
+  lives_free(msg);
+  return TRUE;
 }
 
 
 
-void lives_osc_cb_rte_getparammin(void *context, int arglen, const void *vargs, OSCTimeTag when, 
-				  NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_rte_getparammin(void *context, int arglen, const void *vargs, OSCTimeTag when,
+                                     NetworkReturnAddressPtr ra) {
 
   int effect_key;
   int mode;
@@ -4786,14 +4927,13 @@
 
   char *msg;
 
-  if (!lives_osc_check_arguments (arglen,vargs,"iii",FALSE)) {
-    if (!lives_osc_check_arguments (arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
+  if (!lives_osc_check_arguments(arglen,vargs,"iii",FALSE)) {
+    if (!lives_osc_check_arguments(arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
     lives_osc_parse_int_argument(vargs,&effect_key);
     lives_osc_parse_int_argument(vargs,&pnum);
     mode=rte_key_getmode(effect_key);
-  }
-  else {
-    lives_osc_check_arguments (arglen,vargs,"iii",TRUE);
+  } else {
+    lives_osc_check_arguments(arglen,vargs,"iii",TRUE);
     lives_osc_parse_int_argument(vargs,&effect_key);
     lives_osc_parse_int_argument(vargs,&mode);
     lives_osc_parse_int_argument(vargs,&pnum);
@@ -4810,7 +4950,7 @@
   nparams=num_in_params(filter,FALSE,TRUE);
   if (nparams==0) return lives_osc_notify_failure();
   if (pnum<0||pnum>=nparams) return lives_osc_notify_failure();
-  
+
   ptmpl=weed_filter_in_paramtmpl(filter,pnum,TRUE);
 
   if (!weed_plant_has_leaf(ptmpl,"min")) {
@@ -4820,13 +4960,14 @@
   msg=lives_osc_format_result(ptmpl,"min",0,-1);
 
   lives_status_send(msg);
-  g_free(msg);
+  lives_free(msg);
+  return TRUE;
 
 }
 
 
-void lives_osc_cb_rte_getoparammin(void *context, int arglen, const void *vargs, OSCTimeTag when, 
-				   NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_rte_getoparammin(void *context, int arglen, const void *vargs, OSCTimeTag when,
+                                      NetworkReturnAddressPtr ra) {
 
   int effect_key;
   int mode;
@@ -4839,14 +4980,13 @@
 
   char *msg;
 
-  if (!lives_osc_check_arguments (arglen,vargs,"iii",FALSE)) {
-    if (!lives_osc_check_arguments (arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
+  if (!lives_osc_check_arguments(arglen,vargs,"iii",FALSE)) {
+    if (!lives_osc_check_arguments(arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
     lives_osc_parse_int_argument(vargs,&effect_key);
     lives_osc_parse_int_argument(vargs,&pnum);
     mode=rte_key_getmode(effect_key);
-  }
-  else {
-    lives_osc_check_arguments (arglen,vargs,"iii",TRUE);
+  } else {
+    lives_osc_check_arguments(arglen,vargs,"iii",TRUE);
     lives_osc_parse_int_argument(vargs,&effect_key);
     lives_osc_parse_int_argument(vargs,&mode);
     lives_osc_parse_int_argument(vargs,&pnum);
@@ -4870,21 +5010,22 @@
   ptmpl=out_ptmpls[pnum];
 
   if (!weed_plant_has_leaf(ptmpl,"min")) {
-    weed_free(out_ptmpls);
+    lives_free(out_ptmpls);
     return lives_osc_notify_failure();
   }
 
   msg=lives_osc_format_result(ptmpl,"min",0,-1);
 
   lives_status_send(msg);
-  g_free(msg);
-  weed_free(out_ptmpls);
+  lives_free(msg);
+  lives_free(out_ptmpls);
+  return TRUE;
 
 }
 
 
-void lives_osc_cb_rte_getohasparammin(void *context, int arglen, const void *vargs, OSCTimeTag when, 
-				      NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_rte_getohasparammin(void *context, int arglen, const void *vargs, OSCTimeTag when,
+    NetworkReturnAddressPtr ra) {
 
   int effect_key;
   int mode;
@@ -4895,14 +5036,13 @@
   weed_plant_t **out_ptmpls;
   weed_plant_t *ptmpl;
 
-  if (!lives_osc_check_arguments (arglen,vargs,"iii",FALSE)) {
-    if (!lives_osc_check_arguments (arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
+  if (!lives_osc_check_arguments(arglen,vargs,"iii",FALSE)) {
+    if (!lives_osc_check_arguments(arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
     lives_osc_parse_int_argument(vargs,&effect_key);
     lives_osc_parse_int_argument(vargs,&pnum);
     mode=rte_key_getmode(effect_key);
-  }
-  else {
-    lives_osc_check_arguments (arglen,vargs,"iii",TRUE);
+  } else {
+    lives_osc_check_arguments(arglen,vargs,"iii",TRUE);
     lives_osc_parse_int_argument(vargs,&effect_key);
     lives_osc_parse_int_argument(vargs,&mode);
     lives_osc_parse_int_argument(vargs,&pnum);
@@ -4924,16 +5064,17 @@
   out_ptmpls=weed_get_plantptr_array(filter,"out_parameter_templates",&error);
 
   ptmpl=out_ptmpls[pnum];
-  weed_free(out_ptmpls);
+  lives_free(out_ptmpls);
 
   if (!weed_plant_has_leaf(ptmpl,"min")) lives_status_send(get_omc_const("LIVES_FALSE"));
   else lives_status_send(get_omc_const("LIVES_TRUE"));
 
+  return TRUE;
 }
 
 
-void lives_osc_cb_rte_getpparammin(void *context, int arglen, const void *vargs, OSCTimeTag when, 
-				   NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_rte_getpparammin(void *context, int arglen, const void *vargs, OSCTimeTag when,
+                                      NetworkReturnAddressPtr ra) {
 
   int pnum;
 
@@ -4944,7 +5085,7 @@
 
   if (!mainw->ext_playback||mainw->vpp->play_params==NULL) return lives_osc_notify_failure();
 
-  if (!lives_osc_check_arguments (arglen,vargs,"i",TRUE)) return lives_osc_notify_failure();
+  if (!lives_osc_check_arguments(arglen,vargs,"i",TRUE)) return lives_osc_notify_failure();
   lives_osc_parse_int_argument(vargs,&pnum);
 
   if (pnum<0||pnum>=mainw->vpp->num_play_params) return lives_osc_notify_failure();
@@ -4960,11 +5101,12 @@
   msg=lives_osc_format_result(ptmpl,"min",0,-1);
 
   lives_status_send(msg);
-  g_free(msg);
+  lives_free(msg);
+  return TRUE;
 }
 
 
-void lives_osc_cb_rte_getparammax(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_rte_getparammax(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
 
   int effect_key;
   int mode;
@@ -4975,15 +5117,14 @@
   weed_plant_t *ptmpl;
 
   char *msg;
-  
-  if (!lives_osc_check_arguments (arglen,vargs,"iii",FALSE)) {
-    if (!lives_osc_check_arguments (arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
+
+  if (!lives_osc_check_arguments(arglen,vargs,"iii",FALSE)) {
+    if (!lives_osc_check_arguments(arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
     lives_osc_parse_int_argument(vargs,&effect_key);
     lives_osc_parse_int_argument(vargs,&pnum);
     mode=rte_key_getmode(effect_key);
-  }
-  else {
-    lives_osc_check_arguments (arglen,vargs,"iii",TRUE);
+  } else {
+    lives_osc_check_arguments(arglen,vargs,"iii",TRUE);
     lives_osc_parse_int_argument(vargs,&effect_key);
     lives_osc_parse_int_argument(vargs,&mode);
     lives_osc_parse_int_argument(vargs,&pnum);
@@ -5000,7 +5141,7 @@
   nparams=num_in_params(filter,FALSE,TRUE);
   if (nparams==0) return lives_osc_notify_failure();
   if (pnum<0||pnum>=nparams) return lives_osc_notify_failure();
-  
+
   ptmpl=weed_filter_in_paramtmpl(filter,pnum,TRUE);
 
   if (!weed_plant_has_leaf(ptmpl,"max")) {
@@ -5010,12 +5151,13 @@
   msg=lives_osc_format_result(ptmpl,"max",0,-1);
 
   lives_status_send(msg);
-  g_free(msg);
+  lives_free(msg);
+  return TRUE;
 
 }
 
 
-void lives_osc_cb_rte_getoparammax(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_rte_getoparammax(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
 
   int effect_key;
   int mode;
@@ -5027,15 +5169,14 @@
   weed_plant_t *ptmpl;
 
   char *msg;
-  
-  if (!lives_osc_check_arguments (arglen,vargs,"iii",FALSE)) {
-    if (!lives_osc_check_arguments (arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
+
+  if (!lives_osc_check_arguments(arglen,vargs,"iii",FALSE)) {
+    if (!lives_osc_check_arguments(arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
     lives_osc_parse_int_argument(vargs,&effect_key);
     lives_osc_parse_int_argument(vargs,&pnum);
     mode=rte_key_getmode(effect_key);
-  }
-  else {
-    lives_osc_check_arguments (arglen,vargs,"iii",TRUE);
+  } else {
+    lives_osc_check_arguments(arglen,vargs,"iii",TRUE);
     lives_osc_parse_int_argument(vargs,&effect_key);
     lives_osc_parse_int_argument(vargs,&mode);
     lives_osc_parse_int_argument(vargs,&pnum);
@@ -5058,20 +5199,21 @@
   ptmpl=out_ptmpls[pnum];
 
   if (!weed_plant_has_leaf(ptmpl,"max")) {
-    weed_free(out_ptmpls);
+    lives_free(out_ptmpls);
     return lives_osc_notify_failure();
   }
 
   msg=lives_osc_format_result(ptmpl,"max",0,-1);
 
   lives_status_send(msg);
-  g_free(msg);
-  weed_free(out_ptmpls);
+  lives_free(msg);
+  lives_free(out_ptmpls);
+  return TRUE;
 
 }
 
 
-void lives_osc_cb_rte_getohasparammax(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_rte_getohasparammax(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
 
   int effect_key;
   int mode;
@@ -5082,14 +5224,13 @@
   weed_plant_t **out_ptmpls;
   weed_plant_t *ptmpl;
 
-  if (!lives_osc_check_arguments (arglen,vargs,"iii",FALSE)) {
-    if (!lives_osc_check_arguments (arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
+  if (!lives_osc_check_arguments(arglen,vargs,"iii",FALSE)) {
+    if (!lives_osc_check_arguments(arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
     lives_osc_parse_int_argument(vargs,&effect_key);
     lives_osc_parse_int_argument(vargs,&pnum);
     mode=rte_key_getmode(effect_key);
-  }
-  else {
-    lives_osc_check_arguments (arglen,vargs,"iii",TRUE);
+  } else {
+    lives_osc_check_arguments(arglen,vargs,"iii",TRUE);
     lives_osc_parse_int_argument(vargs,&effect_key);
     lives_osc_parse_int_argument(vargs,&mode);
     lives_osc_parse_int_argument(vargs,&pnum);
@@ -5110,17 +5251,18 @@
   out_ptmpls=weed_get_plantptr_array(filter,"out_parameter_templates",&error);
 
   ptmpl=out_ptmpls[pnum];
-  weed_free(out_ptmpls);
+  lives_free(out_ptmpls);
 
   if (!weed_plant_has_leaf(ptmpl,"max")) lives_status_send(get_omc_const("LIVES_FALSE"));
   else lives_status_send(get_omc_const("LIVES_TRUE"));
 
+  return TRUE;
 }
 
 
 
-void lives_osc_cb_rte_getpparammax(void *context, int arglen, const void *vargs, OSCTimeTag when, 
-				   NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_rte_getpparammax(void *context, int arglen, const void *vargs, OSCTimeTag when,
+                                      NetworkReturnAddressPtr ra) {
   // playback plugin param max
 
   int pnum;
@@ -5132,7 +5274,7 @@
 
   if (!mainw->ext_playback||mainw->vpp->play_params==NULL) return lives_osc_notify_failure();
 
-  if (!lives_osc_check_arguments (arglen,vargs,"i",TRUE)) return lives_osc_notify_failure();
+  if (!lives_osc_check_arguments(arglen,vargs,"i",TRUE)) return lives_osc_notify_failure();
   lives_osc_parse_int_argument(vargs,&pnum);
 
   if (pnum<0||pnum>=mainw->vpp->num_play_params) return lives_osc_notify_failure();
@@ -5148,13 +5290,14 @@
   msg=lives_osc_format_result(ptmpl,"max",0,-1);
 
   lives_status_send(msg);
-  g_free(msg);
+  lives_free(msg);
 
+  return TRUE;
 }
 
 
-void lives_osc_cb_rte_getparamdef(void *context, int arglen, const void *vargs, OSCTimeTag when, 
-				  NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_rte_getparamdef(void *context, int arglen, const void *vargs, OSCTimeTag when,
+                                     NetworkReturnAddressPtr ra) {
 
   int effect_key;
   int mode;
@@ -5165,15 +5308,14 @@
   weed_plant_t *ptmpl;
 
   char *msg;
-  
-  if (!lives_osc_check_arguments (arglen,vargs,"iii",FALSE)) {
-    if (!lives_osc_check_arguments (arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
+
+  if (!lives_osc_check_arguments(arglen,vargs,"iii",FALSE)) {
+    if (!lives_osc_check_arguments(arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
     lives_osc_parse_int_argument(vargs,&effect_key);
     lives_osc_parse_int_argument(vargs,&pnum);
     mode=rte_key_getmode(effect_key);
-  }
-  else {
-    lives_osc_check_arguments (arglen,vargs,"iii",TRUE);
+  } else {
+    lives_osc_check_arguments(arglen,vargs,"iii",TRUE);
     lives_osc_parse_int_argument(vargs,&effect_key);
     lives_osc_parse_int_argument(vargs,&mode);
     lives_osc_parse_int_argument(vargs,&pnum);
@@ -5190,13 +5332,12 @@
   nparams=num_in_params(filter,FALSE,TRUE);
   if (nparams==0) return lives_osc_notify_failure();
   if (pnum<0||pnum>=nparams) return lives_osc_notify_failure();
-  
+
   ptmpl=weed_filter_in_paramtmpl(filter,pnum,TRUE);
 
   if (weed_plant_has_leaf(ptmpl,"host_default")) {
     msg=lives_osc_format_result(ptmpl,"host_default",0,-1);
-  }
-  else {
+  } else {
     nvals=weed_leaf_num_elements(ptmpl,"default");
     if (nvals>0)
       msg=lives_osc_format_result(ptmpl,"default",0,nvals);
@@ -5207,13 +5348,14 @@
   }
 
   lives_status_send(msg);
-  g_free(msg);
+  lives_free(msg);
 
+  return TRUE;
 }
 
 
-void lives_osc_cb_rte_getoparamdef(void *context, int arglen, const void *vargs, OSCTimeTag when, 
-				   NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_rte_getoparamdef(void *context, int arglen, const void *vargs, OSCTimeTag when,
+                                      NetworkReturnAddressPtr ra) {
 
   int effect_key;
   int mode;
@@ -5225,15 +5367,14 @@
   weed_plant_t *ptmpl;
 
   char *msg;
-  
-  if (!lives_osc_check_arguments (arglen,vargs,"iii",FALSE)) {
-    if (!lives_osc_check_arguments (arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
+
+  if (!lives_osc_check_arguments(arglen,vargs,"iii",FALSE)) {
+    if (!lives_osc_check_arguments(arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
     lives_osc_parse_int_argument(vargs,&effect_key);
     lives_osc_parse_int_argument(vargs,&pnum);
     mode=rte_key_getmode(effect_key);
-  }
-  else {
-    lives_osc_check_arguments (arglen,vargs,"iii",TRUE);
+  } else {
+    lives_osc_check_arguments(arglen,vargs,"iii",TRUE);
     lives_osc_parse_int_argument(vargs,&effect_key);
     lives_osc_parse_int_argument(vargs,&mode);
     lives_osc_parse_int_argument(vargs,&pnum);
@@ -5257,10 +5398,9 @@
 
   if (weed_plant_has_leaf(ptmpl,"host_default")) {
     msg=lives_osc_format_result(ptmpl,"host_default",0,-1);
-  }
-  else {
+  } else {
     if (!weed_plant_has_leaf(ptmpl,"default")) {
-      weed_free(out_ptmpls);
+      lives_free(out_ptmpls);
       return lives_osc_notify_failure();
     }
 
@@ -5274,14 +5414,15 @@
   }
 
   lives_status_send(msg);
-  g_free(msg);
-  weed_free(out_ptmpls);
+  lives_free(msg);
+  lives_free(out_ptmpls);
 
+  return TRUE;
 }
 
 
-void lives_osc_cb_rte_gethasparamdef(void *context, int arglen, const void *vargs, OSCTimeTag when, 
-				      NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_rte_gethasparamdef(void *context, int arglen, const void *vargs, OSCTimeTag when,
+                                        NetworkReturnAddressPtr ra) {
 
   int effect_key;
   int mode;
@@ -5291,14 +5432,13 @@
   weed_plant_t *filter;
   weed_plant_t *ptmpl;
 
-  if (!lives_osc_check_arguments (arglen,vargs,"iii",FALSE)) {
-    if (!lives_osc_check_arguments (arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
+  if (!lives_osc_check_arguments(arglen,vargs,"iii",FALSE)) {
+    if (!lives_osc_check_arguments(arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
     lives_osc_parse_int_argument(vargs,&effect_key);
     lives_osc_parse_int_argument(vargs,&pnum);
     mode=rte_key_getmode(effect_key);
-  }
-  else {
-    lives_osc_check_arguments (arglen,vargs,"iii",TRUE);
+  } else {
+    lives_osc_check_arguments(arglen,vargs,"iii",TRUE);
     lives_osc_parse_int_argument(vargs,&effect_key);
     lives_osc_parse_int_argument(vargs,&mode);
     lives_osc_parse_int_argument(vargs,&pnum);
@@ -5315,22 +5455,23 @@
   nparams=num_in_params(filter,FALSE,TRUE);
   if (nparams==0) return lives_osc_notify_failure();
   if (pnum<0||pnum>=nparams) return lives_osc_notify_failure();
-  
+
   ptmpl=weed_filter_in_paramtmpl(filter,pnum,TRUE);
 
   if (weed_plant_has_leaf(ptmpl,"host_default")) {
     if (weed_leaf_num_elements(ptmpl,"host_default")==0) lives_status_send(get_omc_const("LIVES_FALSE"));
     lives_status_send(get_omc_const("LIVES_DEFAULT_OVERRIDDEN"));
-    return;
+    return TRUE;
   }
   if (!weed_plant_has_leaf(ptmpl,"default")||weed_leaf_num_elements(ptmpl,"default")==0) lives_status_send(get_omc_const("LIVES_FALSE"));
   else lives_status_send(get_omc_const("LIVES_TRUE"));
 
+  return TRUE;
 }
 
 
-void lives_osc_cb_rte_getohasparamdef(void *context, int arglen, const void *vargs, OSCTimeTag when, 
-				      NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_rte_getohasparamdef(void *context, int arglen, const void *vargs, OSCTimeTag when,
+    NetworkReturnAddressPtr ra) {
 
   int effect_key;
   int mode;
@@ -5341,14 +5482,13 @@
   weed_plant_t **out_ptmpls;
   weed_plant_t *ptmpl;
 
-  if (!lives_osc_check_arguments (arglen,vargs,"iii",FALSE)) {
-    if (!lives_osc_check_arguments (arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
+  if (!lives_osc_check_arguments(arglen,vargs,"iii",FALSE)) {
+    if (!lives_osc_check_arguments(arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
     lives_osc_parse_int_argument(vargs,&effect_key);
     lives_osc_parse_int_argument(vargs,&pnum);
     mode=rte_key_getmode(effect_key);
-  }
-  else {
-    lives_osc_check_arguments (arglen,vargs,"iii",TRUE);
+  } else {
+    lives_osc_check_arguments(arglen,vargs,"iii",TRUE);
     lives_osc_parse_int_argument(vargs,&effect_key);
     lives_osc_parse_int_argument(vargs,&mode);
     lives_osc_parse_int_argument(vargs,&pnum);
@@ -5369,18 +5509,19 @@
   out_ptmpls=weed_get_plantptr_array(filter,"out_parameter_templates",&error);
 
   ptmpl=out_ptmpls[pnum];
-  weed_free(out_ptmpls);
+  lives_free(out_ptmpls);
 
   if (!weed_plant_has_leaf(ptmpl,"host_default")&&!weed_plant_has_leaf(ptmpl,"default")) lives_status_send(get_omc_const("LIVES_FALSE"));
   else lives_status_send(get_omc_const("LIVES_TRUE"));
 
+  return TRUE;
 }
 
 
 
 
-void lives_osc_cb_rte_getpparamdef(void *context, int arglen, const void *vargs, OSCTimeTag when, 
-				   NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_rte_getpparamdef(void *context, int arglen, const void *vargs, OSCTimeTag when,
+                                      NetworkReturnAddressPtr ra) {
   // default for playback plugin param
 
   int pnum,nvals;
@@ -5392,8 +5533,8 @@
   char *msg;
 
   if (!mainw->ext_playback||mainw->vpp->play_params==NULL) return lives_osc_notify_failure();
-  
-  if (!lives_osc_check_arguments (arglen,vargs,"i",TRUE)) return lives_osc_notify_failure();
+
+  if (!lives_osc_check_arguments(arglen,vargs,"i",TRUE)) return lives_osc_notify_failure();
 
   lives_osc_parse_int_argument(vargs,&pnum);
 
@@ -5413,15 +5554,16 @@
   }
 
   lives_status_send(msg);
-  g_free(msg);
+  lives_free(msg);
 
+  return TRUE;
 }
 
 
 
 
-void lives_osc_cb_rte_getparamval(void *context, int arglen, const void *vargs, OSCTimeTag when, 
-				  NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_rte_getparamval(void *context, int arglen, const void *vargs, OSCTimeTag when,
+                                     NetworkReturnAddressPtr ra) {
 
   int effect_key;
   int pnum,st=0,end=1,hint,cspace;
@@ -5430,14 +5572,13 @@
   weed_plant_t *inst,*filter;
   weed_plant_t *param,*ptmpl;
   char *msg;
-  
-  if (lives_osc_check_arguments (arglen,vargs,"ii",FALSE)) {
-    lives_osc_check_arguments (arglen,vargs,"ii",TRUE);
+
+  if (lives_osc_check_arguments(arglen,vargs,"ii",FALSE)) {
+    lives_osc_check_arguments(arglen,vargs,"ii",TRUE);
     lives_osc_parse_int_argument(vargs,&effect_key);
     lives_osc_parse_int_argument(vargs,&pnum);
-  }
-  else {
-    if (!lives_osc_check_arguments (arglen,vargs,"iii",TRUE)) return lives_osc_notify_failure();
+  } else {
+    if (!lives_osc_check_arguments(arglen,vargs,"iii",TRUE)) return lives_osc_notify_failure();
     lives_osc_parse_int_argument(vargs,&effect_key);
     lives_osc_parse_int_argument(vargs,&pnum);
     lives_osc_parse_int_argument(vargs,&st);
@@ -5449,7 +5590,7 @@
 
   filter=rte_keymode_get_filter(effect_key,rte_key_getmode(effect_key));
   if (filter==NULL) return lives_osc_notify_failure();
-  
+
   filter=rte_keymode_get_filter(effect_key,rte_key_getmode(effect_key));
   inst=rte_keymode_get_instance(effect_key,rte_key_getmode(effect_key));
 
@@ -5458,7 +5599,7 @@
   nparams=num_in_params(filter,FALSE,TRUE);
   if (nparams==0) return lives_osc_notify_failure();
   if (pnum<0||pnum>=nparams) return lives_osc_notify_failure();
-  
+
   param=weed_inst_in_param(inst,pnum,FALSE,TRUE);
   ptmpl=weed_get_plantptr_value(param,"template",&error);
 
@@ -5476,13 +5617,14 @@
   msg=lives_osc_format_result(param,"value",st,end);
 
   lives_status_send(msg);
-  g_free(msg);
+  lives_free(msg);
 
+  return TRUE;
 }
 
 
-void lives_osc_cb_rte_getoparamval(void *context, int arglen, const void *vargs, OSCTimeTag when, 
-				   NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_rte_getoparamval(void *context, int arglen, const void *vargs, OSCTimeTag when,
+                                      NetworkReturnAddressPtr ra) {
 
   int effect_key;
   int pnum,st=0,end=1,hint,cspace;
@@ -5492,14 +5634,13 @@
   weed_plant_t **out_params,**out_ptmpls;
   weed_plant_t *param,*ptmpl;
   char *msg;
-  
-  if (lives_osc_check_arguments (arglen,vargs,"ii",FALSE)) {
-    lives_osc_check_arguments (arglen,vargs,"ii",TRUE);
+
+  if (lives_osc_check_arguments(arglen,vargs,"ii",FALSE)) {
+    lives_osc_check_arguments(arglen,vargs,"ii",TRUE);
     lives_osc_parse_int_argument(vargs,&effect_key);
     lives_osc_parse_int_argument(vargs,&pnum);
-  }
-  else {
-    if (!lives_osc_check_arguments (arglen,vargs,"iii",TRUE)) return lives_osc_notify_failure();
+  } else {
+    if (!lives_osc_check_arguments(arglen,vargs,"iii",TRUE)) return lives_osc_notify_failure();
     lives_osc_parse_int_argument(vargs,&effect_key);
     lives_osc_parse_int_argument(vargs,&pnum);
     lives_osc_parse_int_argument(vargs,&st);
@@ -5527,8 +5668,8 @@
 
   param=out_params[pnum];
 
-  weed_free(out_ptmpls);
-  weed_free(out_params);
+  lives_free(out_ptmpls);
+  lives_free(out_params);
 
   hint=weed_get_int_value(ptmpl,"hint",&error);
   if (hint==WEED_HINT_COLOR) {
@@ -5544,14 +5685,15 @@
   msg=lives_osc_format_result(param,"value",st,end);
 
   lives_status_send(msg);
-  g_free(msg);
+  lives_free(msg);
 
+  return TRUE;
 }
 
 
 
-void lives_osc_cb_rte_getpparamval(void *context, int arglen, const void *vargs, OSCTimeTag when, 
-				   NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_rte_getpparamval(void *context, int arglen, const void *vargs, OSCTimeTag when,
+                                      NetworkReturnAddressPtr ra) {
   // playback plugin param value
   int pnum,st=0,end=1,hint,cspace;
 
@@ -5560,13 +5702,12 @@
   char *msg;
 
   if (!mainw->ext_playback||mainw->vpp->play_params==NULL) return lives_osc_notify_failure();
-  
-  if (lives_osc_check_arguments (arglen,vargs,"i",FALSE)) {
-    lives_osc_check_arguments (arglen,vargs,"i",TRUE);
+
+  if (lives_osc_check_arguments(arglen,vargs,"i",FALSE)) {
+    lives_osc_check_arguments(arglen,vargs,"i",TRUE);
     lives_osc_parse_int_argument(vargs,&pnum);
-  }
-  else {
-    if (!lives_osc_check_arguments (arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
+  } else {
+    if (!lives_osc_check_arguments(arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
     lives_osc_parse_int_argument(vargs,&pnum);
     lives_osc_parse_int_argument(vargs,&st);
     end=st+1;
@@ -5590,12 +5731,13 @@
   msg=lives_osc_format_result(param,"value",st,end);
 
   lives_status_send(msg);
-  g_free(msg);
+  lives_free(msg);
 
+  return TRUE;
 }
 
 
-void lives_osc_cb_rte_getnparam(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_rte_getnparam(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
 
   int effect_key;
   int pnum,i;
@@ -5613,8 +5755,8 @@
   double vald;
 
   char *msg;
-  
-  if (!lives_osc_check_arguments (arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
+
+  if (!lives_osc_check_arguments(arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
 
   lives_osc_parse_int_argument(vargs,&effect_key);
   lives_osc_parse_int_argument(vargs,&pnum);
@@ -5636,21 +5778,21 @@
 
   if (hint==WEED_HINT_INTEGER) {
     vali=weed_get_int_value(ptmpl,"value",&error);
-    msg=g_strdup_printf("%d",vali);
-  }
-  else {
+    msg=lives_strdup_printf("%d",vali);
+  } else {
     vald=weed_get_double_value(ptmpl,"value",&error);
-    msg=g_strdup_printf("%f",vald);
+    msg=lives_strdup_printf("%f",vald);
   }
   lives_status_send(msg);
-  g_free(msg);
-  weed_free(in_ptmpls);
+  lives_free(msg);
+  lives_free(in_ptmpls);
 
+  return TRUE;
 }
 
 
 
-void lives_osc_cb_rte_getnparammin(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_rte_getnparammin(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
 
   int effect_key;
   int pnum,i;
@@ -5668,8 +5810,8 @@
   double vald;
 
   char *msg;
-  
-  if (!lives_osc_check_arguments (arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
+
+  if (!lives_osc_check_arguments(arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
 
   lives_osc_parse_int_argument(vargs,&effect_key);
   lives_osc_parse_int_argument(vargs,&pnum);
@@ -5691,21 +5833,21 @@
 
   if (hint==WEED_HINT_INTEGER) {
     vali=weed_get_int_value(ptmpl,"min",&error);
-    msg=g_strdup_printf("%d",vali);
-  }
-  else {
+    msg=lives_strdup_printf("%d",vali);
+  } else {
     vald=weed_get_double_value(ptmpl,"min",&error);
-    msg=g_strdup_printf("%f",vald);
+    msg=lives_strdup_printf("%f",vald);
   }
   lives_status_send(msg);
-  g_free(msg);
-  weed_free(in_ptmpls);
+  lives_free(msg);
+  lives_free(in_ptmpls);
 
+  return TRUE;
 }
 
 
 
-void lives_osc_cb_rte_getnparammax(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_rte_getnparammax(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
 
   int effect_key;
   int pnum,i;
@@ -5723,8 +5865,8 @@
   double vald;
 
   char *msg;
-  
-  if (!lives_osc_check_arguments (arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
+
+  if (!lives_osc_check_arguments(arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
 
   lives_osc_parse_int_argument(vargs,&effect_key);
   lives_osc_parse_int_argument(vargs,&pnum);
@@ -5746,19 +5888,19 @@
 
   if (hint==WEED_HINT_INTEGER) {
     vali=weed_get_int_value(ptmpl,"max",&error);
-    msg=g_strdup_printf("%d",vali);
-  }
-  else {
+    msg=lives_strdup_printf("%d",vali);
+  } else {
     vald=weed_get_double_value(ptmpl,"max",&error);
-    msg=g_strdup_printf("%f",vald);
+    msg=lives_strdup_printf("%f",vald);
   }
   lives_status_send(msg);
-  g_free(msg);
-  weed_free(in_ptmpls);
+  lives_free(msg);
+  lives_free(in_ptmpls);
+  return TRUE;
 }
 
 
-void lives_osc_cb_rte_getnparamdef(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_rte_getnparamdef(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
 
   int effect_key;
   int pnum,i;
@@ -5776,8 +5918,8 @@
   double vald;
 
   char *msg;
-  
-  if (!lives_osc_check_arguments (arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
+
+  if (!lives_osc_check_arguments(arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
 
   lives_osc_parse_int_argument(vargs,&effect_key);
   lives_osc_parse_int_argument(vargs,&pnum);
@@ -5800,21 +5942,21 @@
   if (hint==WEED_HINT_INTEGER) {
     if (!weed_plant_has_leaf(ptmpl,"host_default")) vali=weed_get_int_value(ptmpl,"default",&error);
     else vali=weed_get_int_value(ptmpl,"host_default",&error);
-    msg=g_strdup_printf("%d",vali);
-  }
-  else {
+    msg=lives_strdup_printf("%d",vali);
+  } else {
     if (!weed_plant_has_leaf(ptmpl,"host_default")) vald=weed_get_double_value(ptmpl,"default",&error);
     else vald=weed_get_double_value(ptmpl,"host_default",&error);
-    msg=g_strdup_printf("%f",vald);
+    msg=lives_strdup_printf("%f",vald);
   }
 
   lives_status_send(msg);
-  g_free(msg);
-  weed_free(in_ptmpls);
+  lives_free(msg);
+  lives_free(in_ptmpls);
+  return TRUE;
 }
 
 
-void lives_osc_cb_rte_getnparamtrans(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_rte_getnparamtrans(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
 
   int effect_key;
   int pnum;
@@ -5828,8 +5970,8 @@
   boolean res=FALSE;
 
   char *msg;
-  
-  if (!lives_osc_check_arguments (arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
+
+  if (!lives_osc_check_arguments(arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
 
   lives_osc_parse_int_argument(vargs,&effect_key);
   lives_osc_parse_int_argument(vargs,&pnum);
@@ -5845,16 +5987,17 @@
 
   if (pnum==get_transition_param(filter,TRUE)) res=TRUE;
 
-  msg=g_strdup_printf("%d",res);
+  msg=lives_strdup_printf("%d",res);
   lives_status_send(msg);
-  g_free(msg);
-  
+  lives_free(msg);
+
+  return TRUE;
 
 }
 
 
 
-void lives_osc_cb_rte_getparamtrans(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_rte_getparamtrans(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
 
   int effect_key;
   int mode;
@@ -5868,15 +6011,14 @@
   boolean res=FALSE;
 
   char *msg;
-  
-  if (!lives_osc_check_arguments (arglen,vargs,"iii",FALSE)) {
-    if (!lives_osc_check_arguments (arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
+
+  if (!lives_osc_check_arguments(arglen,vargs,"iii",FALSE)) {
+    if (!lives_osc_check_arguments(arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
     lives_osc_parse_int_argument(vargs,&effect_key);
     lives_osc_parse_int_argument(vargs,&pnum);
     mode=rte_key_getmode(effect_key);
-  }
-  else {
-    lives_osc_check_arguments (arglen,vargs,"iii",TRUE);
+  } else {
+    lives_osc_check_arguments(arglen,vargs,"iii",TRUE);
     lives_osc_parse_int_argument(vargs,&effect_key);
     lives_osc_parse_int_argument(vargs,&mode);
     lives_osc_parse_int_argument(vargs,&pnum);
@@ -5893,102 +6035,108 @@
   nparams=num_in_params(filter,FALSE,TRUE);
   if (nparams==0) return lives_osc_notify_failure();
   if (pnum<0||pnum>=nparams) return lives_osc_notify_failure();
-  
+
   ptmpl=weed_filter_in_paramtmpl(filter,pnum,TRUE);
 
   if (weed_plant_has_leaf(ptmpl,"transition")&&weed_get_boolean_value(ptmpl,"transition",&error)==WEED_TRUE) res=TRUE;
-  msg=g_strdup_printf("%d",res);
+  msg=lives_strdup_printf("%d",res);
   lives_status_send(msg);
-  g_free(msg);
+  lives_free(msg);
 
+  return TRUE;
 }
 
 
-void lives_osc_cb_rte_getmode(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_rte_getmode(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   char *tmp;
 
   int effect_key;
 
-  if (!lives_osc_check_arguments (arglen,vargs,"i",TRUE)) return lives_osc_notify_failure();
+  if (!lives_osc_check_arguments(arglen,vargs,"i",TRUE)) return lives_osc_notify_failure();
   lives_osc_parse_int_argument(vargs,&effect_key);
 
   if (effect_key<1||effect_key>FX_MAX) {
-    lives_status_send ("0");
-    return;
+    lives_status_send("0");
+    return TRUE;
   }
 
-  lives_status_send ((tmp=g_strdup_printf ("%d",rte_key_getmode (effect_key)+1)));
-  g_free(tmp);
+  lives_status_send((tmp=lives_strdup_printf("%d",rte_key_getmode(effect_key)+1)));
+  lives_free(tmp);
+  return TRUE;
 
 }
 
 
-void lives_osc_cb_rte_getstate(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_rte_getstate(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   int effect_key;
 
-  if (!lives_osc_check_arguments (arglen,vargs,"i",TRUE)) return lives_osc_notify_failure();
+  if (!lives_osc_check_arguments(arglen,vargs,"i",TRUE)) return lives_osc_notify_failure();
   lives_osc_parse_int_argument(vargs,&effect_key);
 
   if (effect_key<1||effect_key>FX_KEYS_MAX_VIRTUAL) {
-    lives_status_send (get_omc_const("LIVES_FALSE"));
-    return;
+    lives_status_send(get_omc_const("LIVES_FALSE"));
+    return TRUE;
   }
   if (rte_keymode_get_instance(effect_key,rte_key_getmode(effect_key))==NULL) lives_status_send(get_omc_const("LIVES_FALSE"));
   else lives_status_send(get_omc_const("LIVES_TRUE"));
+  return TRUE;
 }
 
 
 
-void lives_osc_cb_rte_get_keyfxname(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_rte_get_keyfxname(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   int effect_key;
   int mode;
   char *tmp;
 
-  if (!lives_osc_check_arguments (arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
+  if (!lives_osc_check_arguments(arglen,vargs,"ii",TRUE)) return lives_osc_notify_failure();
   lives_osc_parse_int_argument(vargs,&effect_key);
   lives_osc_parse_int_argument(vargs,&mode);
   if (effect_key<1||effect_key>FX_MAX||mode<1||mode>rte_getmodespk()) return lives_osc_notify_failure();
-  lives_status_send ((tmp=g_strdup_printf ("%s",rte_keymode_get_filter_name (effect_key,mode-1))));
-  g_free(tmp);
+  lives_status_send((tmp=lives_strdup_printf("%s",rte_keymode_get_filter_name(effect_key,mode-1))));
+  lives_free(tmp);
+  return TRUE;
 }
 
 
-void lives_osc_cb_rte_getmodespk(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_rte_getmodespk(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
 
   int effect_key;
   char *tmp;
 
-  if (!lives_osc_check_arguments (arglen,vargs,"i",FALSE)) {
-    if (lives_osc_check_arguments (arglen,vargs,"",TRUE)) {
-      lives_status_send ((tmp=g_strdup_printf ("%d",rte_getmodespk ())));
-      g_free(tmp);
+  if (!lives_osc_check_arguments(arglen,vargs,"i",FALSE)) {
+    if (lives_osc_check_arguments(arglen,vargs,"",TRUE)) {
+      lives_status_send((tmp=lives_strdup_printf("%d",rte_getmodespk())));
+      lives_free(tmp);
+      return TRUE;
     }
-    return;
+    return lives_osc_notify_failure();
   }
 
-  lives_osc_check_arguments (arglen,vargs,"i",TRUE);
+  lives_osc_check_arguments(arglen,vargs,"i",TRUE);
   lives_osc_parse_int_argument(vargs,&effect_key);
 
   if (effect_key>FX_KEYS_MAX_VIRTUAL||effect_key<1) {
-    lives_status_send ("0");
-    return;
+    lives_status_send("0");
+    return TRUE;
   }
 
-  lives_status_send ((tmp=g_strdup_printf ("%d",rte_key_getmaxmode (effect_key)+1)));
-  g_free(tmp);
+  lives_status_send((tmp=lives_strdup_printf("%d",rte_key_getmaxmode(effect_key)+1)));
+  lives_free(tmp);
 
+  return TRUE;
 }
 
 
 
-void lives_osc_cb_rte_addpconnection(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_rte_addpconnection(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   weed_plant_t *ofilter,*ifilter;
 
   int key0,mode0,pnum0;
   int key1,mode1,pnum1;
   int autoscale;
 
-  if (!lives_osc_check_arguments (arglen,vargs,"iiiiiii",TRUE)) return lives_osc_notify_failure();
+  if (!lives_osc_check_arguments(arglen,vargs,"iiiiiii",TRUE)) return lives_osc_notify_failure();
   lives_osc_parse_int_argument(vargs,&key0);
   lives_osc_parse_int_argument(vargs,&mode0);
   lives_osc_parse_int_argument(vargs,&pnum0);
@@ -6018,15 +6166,13 @@
   if (key1==-1) {
     // connecting to the playback plugin
     if (mode1>1||mainw->vpp==NULL||pnum1>=mainw->vpp->num_play_params) return lives_osc_notify_failure();
-  }
-  else if (key1==-2) {
+  } else if (key1==-2) {
     // connecting to subtitler
     if (mode1>1||pnum1>0) return lives_osc_notify_failure();
-  }
-  else {
+  } else {
     ifilter=rte_keymode_get_filter(key1,mode1);
     if (ifilter==NULL) return lives_osc_notify_failure();
-    
+
     if (pnum1>=num_in_params(ifilter,FALSE,TRUE)) return lives_osc_notify_failure();
   }
 
@@ -6038,14 +6184,14 @@
   key1--;
 
   pconx_add_connection(key0,mode0,pnum0,key1,mode1,pnum1,autoscale);
-  lives_osc_notify_success(NULL);
+  return lives_osc_notify_success(NULL);
 }
 
-void lives_osc_cb_rte_delpconnection(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_rte_delpconnection(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   int key0,mode0,pnum0;
   int key1,mode1,pnum1;
 
-  if (!lives_osc_check_arguments (arglen,vargs,"iiiiii",TRUE)) return lives_osc_notify_failure();
+  if (!lives_osc_check_arguments(arglen,vargs,"iiiiii",TRUE)) return lives_osc_notify_failure();
   lives_osc_parse_int_argument(vargs,&key0);
   lives_osc_parse_int_argument(vargs,&mode0);
   lives_osc_parse_int_argument(vargs,&pnum0);
@@ -6059,15 +6205,15 @@
   if (pnum0<-EXTRA_PARAMS_OUT||pnum1<-EXTRA_PARAMS_IN) return lives_osc_notify_failure();
 
   pconx_delete(key0==0?FX_DATA_WILDCARD:--key0,--mode0,pnum0,key1==0?FX_DATA_WILDCARD:--key1,--mode1,pnum1);
-  lives_osc_notify_success(NULL);
+  return lives_osc_notify_success(NULL);
 
 }
 
-void lives_osc_cb_rte_listpconnection(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_rte_listpconnection(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   int okey,omode,opnum;
   char *msg;
- 
-  if (!lives_osc_check_arguments (arglen,vargs,"iii",TRUE)) return lives_osc_notify_failure();
+
+  if (!lives_osc_check_arguments(arglen,vargs,"iii",TRUE)) return lives_osc_notify_failure();
   lives_osc_parse_int_argument(vargs,&okey);
   lives_osc_parse_int_argument(vargs,&omode);
   lives_osc_parse_int_argument(vargs,&opnum);
@@ -6077,21 +6223,22 @@
   msg=pconx_list(okey,omode,opnum);
 
   if (strlen(msg)==0) {
-    g_free(msg);
-    msg=g_strdup("0 0 0 0");
+    lives_free(msg);
+    msg=lives_strdup("0 0 0 0");
   }
 
   lives_status_send(msg);
-  g_free(msg);
+  lives_free(msg);
+  return TRUE;
 
 }
 
-void lives_osc_cb_rte_addcconnection(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_rte_addcconnection(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   int key0,mode0,cnum0;
   int key1,mode1,cnum1;
   weed_plant_t *filter;
 
-  if (!lives_osc_check_arguments (arglen,vargs,"iiiiii",TRUE)) return lives_osc_notify_failure();
+  if (!lives_osc_check_arguments(arglen,vargs,"iiiiii",TRUE)) return lives_osc_notify_failure();
   lives_osc_parse_int_argument(vargs,&key0);
   lives_osc_parse_int_argument(vargs,&mode0);
   lives_osc_parse_int_argument(vargs,&cnum0);
@@ -6115,8 +6262,7 @@
   if (key1==-1) {
     // connecting to the playback plugin
     if (mode1>1||mainw->vpp==NULL||cnum1>=mainw->vpp->num_alpha_chans) return lives_osc_notify_failure();
-  }
-  else {
+  } else {
     filter=rte_keymode_get_filter(key1,mode1);
     if (filter==NULL) return lives_osc_notify_failure();
 
@@ -6129,15 +6275,15 @@
   key1--;
 
   cconx_add_connection(key0,mode0,cnum0,key1,mode1,cnum1);
-  lives_osc_notify_success(NULL);
+  return lives_osc_notify_success(NULL);
 
 }
 
-void lives_osc_cb_rte_delcconnection(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_rte_delcconnection(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   int key0,mode0,cnum0;
   int key1,mode1,cnum1;
 
-  if (!lives_osc_check_arguments (arglen,vargs,"iiiiii",TRUE)) return lives_osc_notify_failure();
+  if (!lives_osc_check_arguments(arglen,vargs,"iiiiii",TRUE)) return lives_osc_notify_failure();
   lives_osc_parse_int_argument(vargs,&key0);
   lives_osc_parse_int_argument(vargs,&mode0);
   lives_osc_parse_int_argument(vargs,&cnum0);
@@ -6150,14 +6296,14 @@
 
   cconx_delete(key0==0?FX_DATA_WILDCARD:--key0,--mode0,cnum0,key1==0?FX_DATA_WILDCARD:--key1,--mode1,cnum1);
 
-  lives_osc_notify_success(NULL);
+  return lives_osc_notify_success(NULL);
 }
 
-void lives_osc_cb_rte_listcconnection(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_rte_listcconnection(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   int okey,omode,ocnum;
   char *msg;
 
-  if (!lives_osc_check_arguments (arglen,vargs,"iii",TRUE)) return lives_osc_notify_failure();
+  if (!lives_osc_check_arguments(arglen,vargs,"iii",TRUE)) return lives_osc_notify_failure();
   lives_osc_parse_int_argument(vargs,&okey);
   lives_osc_parse_int_argument(vargs,&omode);
   lives_osc_parse_int_argument(vargs,&ocnum);
@@ -6167,69 +6313,75 @@
   msg=cconx_list(okey,omode,ocnum);
 
   if (strlen(msg)==0) {
-    g_free(msg);
-    msg=g_strdup("0 0 0");
+    lives_free(msg);
+    msg=lives_strdup("0 0 0");
   }
 
   lives_status_send(msg);
-  g_free(msg);
+  lives_free(msg);
+  return TRUE;
 }
 
 
-void lives_osc_cb_swap(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_swap(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   if (mainw->multitrack!=NULL) return lives_osc_notify_failure();
-  swap_fg_bg_callback (NULL,NULL,0,(LiVESXModifierType)0,NULL);
-  lives_osc_notify_success(NULL);
+  swap_fg_bg_callback(NULL,NULL,0,(LiVESXModifierType)0,NULL);
+  return lives_osc_notify_success(NULL);
 }
 
 
-void lives_osc_record_start(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_record_start(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   if (mainw->multitrack!=NULL) return lives_osc_notify_failure();
-  record_toggle_callback (NULL,NULL,0,(LiVESXModifierType)0,LIVES_INT_TO_POINTER((int)TRUE));
-  lives_osc_notify_success(NULL);
+  record_toggle_callback(NULL,NULL,0,(LiVESXModifierType)0,LIVES_INT_TO_POINTER((int)TRUE));
+  return lives_osc_notify_success(NULL);
   // TODO - send record start and record stop events
 }
 
 
-void lives_osc_record_stop(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_record_stop(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   if (mainw->multitrack!=NULL) return lives_osc_notify_failure();
-  record_toggle_callback (NULL,NULL,0,(LiVESXModifierType)0,LIVES_INT_TO_POINTER((int)FALSE));
-  lives_osc_notify_success(NULL);
+  record_toggle_callback(NULL,NULL,0,(LiVESXModifierType)0,LIVES_INT_TO_POINTER((int)FALSE));
+  return lives_osc_notify_success(NULL);
 }
 
-void lives_osc_record_toggle(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_record_toggle(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   if (mainw->multitrack!=NULL) return lives_osc_notify_failure();
-  record_toggle_callback (NULL,NULL,0,(LiVESXModifierType)0,LIVES_INT_TO_POINTER(!mainw->record));
-  lives_osc_notify_success(NULL);
+  record_toggle_callback(NULL,NULL,0,(LiVESXModifierType)0,LIVES_INT_TO_POINTER(!mainw->record));
+  return lives_osc_notify_success(NULL);
 }
 
 
-void lives_osc_cb_ping(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
-  if (status_socket==NULL) return;
-  lives_status_send ("pong");
+boolean lives_osc_cb_ping(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+  lives_status_send("pong");
+  return TRUE;
 }
 
 
-void lives_osc_cb_open_file(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_getsetname(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+  lives_status_send(get_set_name());
+  return TRUE;
+}
+
+
+boolean lives_osc_cb_open_file(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   char filename[OSC_STRING_SIZE];
   float starttime=0.;
   int numframes=0; // all frames by default
 
   int type=0;
 
-  if (mainw->preview||mainw->is_processing||mainw->multitrack!=NULL) return lives_osc_notify_failure();
+  if ((mainw->preview||(mainw->multitrack==NULL&&mainw->event_list!=NULL))||mainw->is_processing||
+      mainw->multitrack!=NULL) return lives_osc_notify_failure();
 
   if (mainw->playing_file>-1) return lives_osc_notify_failure();
 
-  if (!lives_osc_check_arguments (arglen,vargs,"sfi",FALSE)) {
+  if (!lives_osc_check_arguments(arglen,vargs,"sfi",FALSE)) {
     type++;
-    if (!lives_osc_check_arguments (arglen,vargs,"sf",FALSE)) {
+    if (!lives_osc_check_arguments(arglen,vargs,"sf",FALSE)) {
       type++;
-      if (!lives_osc_check_arguments (arglen,vargs,"s",TRUE)) return lives_osc_notify_failure();
-    }
-    else lives_osc_check_arguments (arglen,vargs,"sf",TRUE);
-  }
-  else lives_osc_check_arguments (arglen,vargs,"sfi",TRUE);
+      if (!lives_osc_check_arguments(arglen,vargs,"s",TRUE)) return lives_osc_notify_failure();
+    } else lives_osc_check_arguments(arglen,vargs,"sf",TRUE);
+  } else lives_osc_check_arguments(arglen,vargs,"sfi",TRUE);
 
   lives_osc_parse_string_argument(vargs,filename);
   if (type<2) {
@@ -6239,461 +6391,502 @@
     }
   }
   deduce_file(filename,starttime,numframes);
-  lives_osc_notify_success(NULL);
+  return lives_osc_notify_success(NULL);
 
 }
 
 
-void lives_osc_cb_new_audio(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_new_audio(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   char filename[OSC_STRING_SIZE];
 
-  if (mainw->preview||mainw->is_processing||mainw->multitrack!=NULL) return lives_osc_notify_failure();
+  if ((mainw->preview||(mainw->multitrack==NULL&&mainw->event_list!=NULL))||mainw->is_processing||
+      mainw->multitrack!=NULL) return lives_osc_notify_failure();
 
   if (mainw->playing_file>-1) return lives_osc_notify_failure();
 
   if (mainw->current_file<1 || cfile==NULL || cfile->opening || cfile->frames==0) return lives_osc_notify_failure();
 
-  if (!lives_osc_check_arguments (arglen,vargs,"s",TRUE)) return lives_osc_notify_failure();
+  if (!lives_osc_check_arguments(arglen,vargs,"s",TRUE)) return lives_osc_notify_failure();
 
   lives_osc_parse_string_argument(vargs,filename);
   on_open_new_audio_clicked(NULL,filename);
-  lives_osc_notify_success(NULL);
+  return lives_osc_notify_success(NULL);
 
 }
 
 
-void lives_osc_cb_loadset(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_loadset(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
   char setname[OSC_STRING_SIZE];
 
-  if (mainw->preview||mainw->is_processing||mainw->multitrack!=NULL) return lives_osc_notify_failure();
+  char *tmp;
+
+  if ((mainw->preview||(mainw->multitrack==NULL&&mainw->event_list!=NULL))||mainw->is_processing||
+      mainw->multitrack!=NULL) return lives_osc_notify_failure();
 
   if (mainw->playing_file>-1) return lives_osc_notify_failure();
 
   if (strlen(mainw->set_name)>0) return lives_osc_notify_failure();
 
-  if (!lives_osc_check_arguments (arglen,vargs,"s",TRUE)) {
+  if (!lives_osc_check_arguments(arglen,vargs,"s",TRUE)) {
     return lives_osc_notify_failure();
   }
   lives_osc_parse_string_argument(vargs,setname);
 
-  mainw->osc_auto=TRUE;
-  if (!is_legal_set_name(setname,TRUE)) {
-    mainw->osc_auto=FALSE;
+  mainw->osc_auto=1;
+  if (!is_legal_set_name((tmp=U82F(setname)),TRUE)) {
+    mainw->osc_auto=0;
+    lives_free(tmp);
     return lives_osc_notify_failure();
   }
-  mainw->osc_auto=FALSE;
+  mainw->osc_auto=0;
 
-  g_snprintf(mainw->set_name,128,"%s",setname);
+  lives_free(tmp);
 
-  on_load_set_ok(NULL,LIVES_INT_TO_POINTER((int)FALSE));
-  lives_osc_notify_success(NULL);
+  reload_set(setname);
+  return lives_osc_notify_success(NULL);
 
 }
 
 
-void lives_osc_cb_saveset(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+boolean lives_osc_cb_saveset(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra) {
+  boolean ret;
+  int force_append=0;
   char setname[OSC_STRING_SIZE];
 
-  if (mainw->preview||mainw->is_processing||mainw->multitrack!=NULL) return lives_osc_notify_failure();
+  char *tmp;
+
+  // setname should be in filesystem encoding
+
+  lives_memset(setname,0,1);
+
+  if ((mainw->preview||(mainw->multitrack==NULL&&mainw->event_list!=NULL))||mainw->is_processing||
+      mainw->multitrack!=NULL) return lives_osc_notify_failure();
 
   if (mainw->playing_file>-1) return lives_osc_notify_failure();
 
-  if (!lives_osc_check_arguments (arglen,vargs,"s",TRUE)) {
-    return lives_osc_notify_failure();
+  if (!lives_osc_check_arguments(arglen,vargs,"s",TRUE)) {
+    if (!lives_osc_check_arguments(arglen,vargs,"si",TRUE)) {
+      if (!lives_osc_check_arguments(arglen,vargs,"",TRUE)) {
+        return lives_osc_notify_failure();
+      }
+    } else {
+      lives_osc_parse_string_argument(vargs,setname);
+      lives_osc_parse_int_argument(vargs,&force_append);
+    }
+  } else {
+    lives_osc_parse_string_argument(vargs,setname);
   }
 
-  lives_osc_parse_string_argument(vargs,setname);
-  if (is_legal_set_name(setname,TRUE)) {
+  if (strlen(setname)==0) {
     mainw->only_close=TRUE;
-    on_save_set_activate(NULL,setname);
+    ret=on_save_set_activate((void *)1,NULL);
     mainw->only_close=FALSE;
+    if (ret) return lives_osc_notify_success(NULL);
+    else return lives_osc_notify_failure();
   }
-  lives_osc_notify_success(NULL);
 
-}
+  if (is_legal_set_name((tmp=U82F(setname)),TRUE)) {
+    mainw->only_close=TRUE;
+    if (force_append) mainw->osc_auto=2;
+    else mainw->osc_auto=1;
+    ret=on_save_set_activate(NULL,setname);
+    mainw->osc_auto=0;
+    mainw->only_close=FALSE;
+    lives_free(tmp);
+    if (ret) return lives_osc_notify_success(NULL);
+    else return lives_osc_notify_failure();
+  }
 
+  lives_free(tmp);
 
+  return lives_osc_notify_failure();
 
+}
 
-static struct 
-{
+
+typedef void (*osc_cb)(void *context, int arglen, const void *vargs, OSCTimeTag when, NetworkReturnAddressPtr ra);
+
+static struct {
   char	 *descr;
   char	 *name;
-  void	 (*cb)(void *ctx, int len, const void *vargs, OSCTimeTag when,	NetworkReturnAddressPtr ra);
+  void (*cb)(void *ctx, int len, const void *vargs, OSCTimeTag when,	NetworkReturnAddressPtr ra);
   int		 leave; // leaf
-} osc_methods[] = 
-  {
-    { "/record/enable",		"enable",		lives_osc_record_start,			3	},	
-    { "/record/disable",	"disable",		lives_osc_record_stop,			3	},	
-    { "/record/toggle",	        "toggle",		lives_osc_record_toggle,			3	},	
-    { "/video/play",		"play",		lives_osc_cb_play,			5	},	
-    { "/video/selection/play",		"play",		lives_osc_cb_playsel,			46	},	
-    { "/video/play/forwards",		"forwards",		lives_osc_cb_play_forward,			36	},	
-    { "/video/play/backwards",		"backwards",		lives_osc_cb_play_backward,			36	},	
-    { "/video/play/faster",		"faster",		lives_osc_cb_play_faster,			36	},	
-    { "/clip/foreground/fps/faster",		"faster",		lives_osc_cb_play_faster,			61	},	
-    { "/clip/foreground/fps/get",		"get",		lives_osc_cb_clip_getfps,			61	},	
-    { "/clip/background/fps/faster",		"faster",		lives_osc_cb_bgplay_faster,			63	},	
-    { "/clip/background/fps/get",		"get",		lives_osc_cb_bgclip_getfps,			63	},	
-    { "/video/play/slower",		"slower",		lives_osc_cb_play_slower,			36	},	
-    { "/clip/foreground/fps/slower",		"slower",		lives_osc_cb_play_slower,			61	},	
-    { "/clip/background/fps/slower",		"slower",		lives_osc_cb_bgplay_slower,			63	},	
-    { "/video/play/reset",		"reset",		lives_osc_cb_play_reset,			36	},	
-    { "/video/play/parameter/count",		"set",		lives_osc_cb_rte_pparamcount,			140	},
-    { "/video/play/parameter/value/set",		"set",		lives_osc_cb_rte_setpparam,			140	},
-    { "/video/play/parameter/flags/get",		"get",	lives_osc_cb_rte_getpparamflags,        141	},
-    { "/video/play/parameter/min/get",		"get",	lives_osc_cb_rte_getpparammin,		        142	},
-    { "/video/play/parameter/max/get",		"get",	lives_osc_cb_rte_getpparammax,		        143	},
-    { "/video/play/parameter/type/get",		"get",	lives_osc_cb_rte_getpparamtype,		        144	},
-    { "/video/play/parameter/name/get",		"get",	lives_osc_cb_rte_getpparamname,		        145	},
-    { "/video/play/parameter/colorspace/get",		"get",	lives_osc_cb_rte_getpparamcspace,      	        146	},
-    { "/video/play/parameter/default/get",		"get",	lives_osc_cb_rte_getpparamdef,		        147	},
-    { "/video/play/parameter/value/get",		"get",	lives_osc_cb_rte_getpparamval,		        140	},
-    { "/clip/foreground/fps/reset",		"reset",		lives_osc_cb_play_reset,			61	},	
-    { "/clip/background/fps/reset",		"reset",		lives_osc_cb_bgplay_reset,			63	},	
-    { "/video/stop",		"stop",	        lives_osc_cb_stop,				5	},
-    { "/video/fps/set",	       "set",	lives_osc_cb_set_fps,			40	},
-    { "/video/fps/get",	       "get",	lives_osc_cb_clip_getfps,			40	},
-    { "/video/loop/set",	       "set",	lives_osc_cb_set_loop,			38	},
-    { "/video/loop/get",	       "get",	lives_osc_cb_get_loop,			38	},
-    { "/video/pingpong/set",	       "set",	lives_osc_cb_set_pingpong,			39	},
-    { "/video/pingpong/get",	       "get",	lives_osc_cb_get_pingpong,			39	},
-    { "/lives/mode/set",	       "set",	lives_osc_cb_setmode,			103	},
-    { "/lives/mode/get",	       "get",	lives_osc_cb_getmode,			103	},
-    { "/video/fps/ratio/set",	       "set",	lives_osc_cb_set_fps_ratio,			65	},
-    { "/video/fps/ratio/get",	       "get",	lives_osc_cb_get_fps_ratio,			65	},
-    { "/video/play/time/get",	       "get",	lives_osc_cb_get_playtime,			67	},
-    { "/clip/foreground/fps/set",	"set",	lives_osc_cb_set_fps,			61	},
-    { "/clip/background/fps/set",	"set",	lives_osc_cb_bgset_fps,			63	},
-    { "/clip/foreground/fps/ratio/set",	"set",	lives_osc_cb_set_fps_ratio,			64	},
-    { "/clip/foreground/fps/ratio/get",	"get",	lives_osc_cb_get_fps_ratio,			64	},
-    { "/clip/background/fps/ratio/set",	"set",	lives_osc_cb_bgset_fps_ratio,			66	},
-    { "/clip/background/fps/ratio/get",	"get",	lives_osc_cb_bgget_fps_ratio,			66	},
-    { "/video/play/reverse",		"reverse",	lives_osc_cb_play_reverse,		36	},
-    { "/clip/foreground/fps/reverse",	"reverse",	lives_osc_cb_play_reverse,		61	},
-    { "/clip/background/fps/reverse",	"reverse",	lives_osc_cb_bgplay_reverse,		63	},
-    { "/video/freeze/toggle",		"toggle", lives_osc_cb_freeze,		37	},
-    { "/effects/realtime/name/get",		"get",	lives_osc_cb_fx_getname,			115	},
-    { "/effect_key/map",		"map",	lives_osc_cb_fx_map,			25	},
-    { "/effect_key/map/clear",		"clear",	lives_osc_cb_fx_map_clear,			32	},
-    { "/effect_key/reset",		"reset",	lives_osc_cb_fx_reset,			25	},
-    { "/effect_key/enable",		"enable",	lives_osc_cb_fx_enable,		        25	},
-    { "/effect_key/disable",		"disable",	lives_osc_cb_fx_disable,		        25	},
-    { "/effect_key/toggle",		"toggle",	lives_osc_cb_fx_toggle,		        25	},
-    { "/effect_key/count",		"count",	lives_osc_cb_rte_count,		        25	},
-    { "/effect_key/parameter/value/set",		"set",	lives_osc_cb_rte_setparam,		        42	},
-    { "/effect_key/parameter/type/get",		"get",	lives_osc_cb_rte_getparamtype,		        68	},
-    { "/effect_key/outparameter/type/get",		"get",	lives_osc_cb_rte_getoparamtype,		        153	},
-    { "/effect_key/nparameter/type/get",		"get",	lives_osc_cb_rte_getnparamtype,		        116	},
-    { "/effect_key/parameter/name/get",		"get",	lives_osc_cb_rte_getparamname,		        71	},
-    { "/effect_key/outparameter/name/get",		"get",	lives_osc_cb_rte_getoparamname,		        152	},
-    { "/effect_key/nparameter/name/get",		"get",	lives_osc_cb_rte_getnparamname,		        72	},
-    { "/effect_key/parameter/colorspace/get",		"get",	lives_osc_cb_rte_getparamcspace,		        73	},
-    { "/effect_key/outparameter/colorspace/get",		"get",	lives_osc_cb_rte_getoparamcspace,		        154	},
-    { "/effect_key/parameter/flags/get",		"get",	lives_osc_cb_rte_getparamflags,		        74	},
-    { "/effect_key/parameter/min/get",		"get",	lives_osc_cb_rte_getparammin,		        75	},
-    { "/effect_key/parameter/max/get",		"get",	lives_osc_cb_rte_getparammax,		        76	},
-    { "/effect_key/parameter/default/get",		"get",	lives_osc_cb_rte_getparamdef,		        77	},
-    { "/effect_key/parameter/default/set",		"set",	lives_osc_cb_rte_setparamdef,		        77	},
-    { "/effect_key/parameter/group/get",		"get",	lives_osc_cb_rte_getparamgrp,		        78	},
-    { "/effect_key/outparameter/min/get",		"get",	lives_osc_cb_rte_getoparammin,		        156	},
-    { "/effect_key/outparameter/max/get",		"get",	lives_osc_cb_rte_getoparammax,		        157	},
-    { "/effect_key/outparameter/default/get",		"get",	lives_osc_cb_rte_getoparamdef,		        158	},
-    { "/effect_key/outparameter/has_min",		"has_min",	lives_osc_cb_rte_getohasparammin,		        150	},
-    { "/effect_key/outparameter/has_max",		"has_max",	lives_osc_cb_rte_getohasparammax,		        150	},
-    { "/effect_key/outparameter/has_default",		"has_default",	lives_osc_cb_rte_getohasparamdef,		        150	},
-    { "/effect_key/parameter/has_default",		"has_default",	lives_osc_cb_rte_gethasparamdef,		        41	},
-    { "/effect_key/parameter/value/get",		"get",	lives_osc_cb_rte_getparamval,		        42	},
-    { "/effect_key/outparameter/value/get",		"get",	lives_osc_cb_rte_getoparamval,		        155	},
-    { "/effect_key/nparameter/count",		"count",	lives_osc_cb_rte_nparamcount,		        91	},
-    { "/effect_key/parameter/count",		"count",	lives_osc_cb_rte_paramcount,		        41	},
-    { "/effect_key/outparameter/count",		"count",	lives_osc_cb_rte_oparamcount,		        150	},
-    { "/effect_key/nparameter/value/set",		"set",	lives_osc_cb_rte_setnparam,		        92	},
-    { "/effect_key/nparameter/value/get",		"get",	lives_osc_cb_rte_getnparam,		        92	},
-    { "/effect_key/nparameter/min/get",		"get",	lives_osc_cb_rte_getnparammin,		        93	},
-    { "/effect_key/nparameter/max/get",		"get",	lives_osc_cb_rte_getnparammax,		        94	},
-    { "/effect_key/nparameter/default/get",		"get",	lives_osc_cb_rte_getnparamdef,		        95	},
-    { "/effect_key/nparameter/default/set",		"set",	lives_osc_cb_rte_setnparamdef,		        95	},
-    { "/effect_key/nparameter/is_transition",		"is_transition",	lives_osc_cb_rte_getnparamtrans,		        91	},
-    { "/effect_key/parameter/is_transition",		"is_transition",	lives_osc_cb_rte_getparamtrans,		        41	},
-    { "/effect_key/inchannel/active/count",		"count",	lives_osc_cb_rte_getnchannels,		        131	},
-    { "/effect_key/inchannel/palette/get",		"get",	lives_osc_cb_rte_getinpal,		        132	},
-    { "/effect_key/outchannel/active/count",		"count",	lives_osc_cb_rte_getnochannels,		        171	},
-    { "/effect_key/outchannel/palette/get",		"get",	lives_osc_cb_rte_getoutpal,		        162	},
-    { "/effect_key/mode/set",		"set",	lives_osc_cb_rte_setmode,		        43	},
-    { "/effect_key/mode/get",		"get",	lives_osc_cb_rte_getmode,		        43	},
-    { "/effect_key/mode/next",		"next",	lives_osc_cb_rte_nextmode,		        43	},
-    { "/effect_key/mode/previous",		"previous",	lives_osc_cb_rte_prevmode,		        43	},
-    { "/effect_key/name/get",		"get",	lives_osc_cb_rte_get_keyfxname,		        44	},
-    { "/effect_key/maxmode/get",		"get",	lives_osc_cb_rte_getmodespk,		        45	},
-    { "/effect_key/state/get",		"get",	lives_osc_cb_rte_getstate,		        56	},
-    { "/effect_key/outparameter/connection/add",		"add",	lives_osc_cb_rte_addpconnection,		        151	},
-    { "/effect_key/outparameter/connection/delete",		"delete",	lives_osc_cb_rte_delpconnection,		        151	},
-    { "/effect_key/outparameter/connection/list",		"list",	lives_osc_cb_rte_listpconnection,		        151	},
-    { "/effect_key/outchannel/connection/add",		        "add",	lives_osc_cb_rte_addcconnection,		        161	},
-    { "/effect_key/outchannel/connection/delete",		"delete",	lives_osc_cb_rte_delcconnection,		        161	},
-    { "/effect_key/outchannel/connection/list",		"list",	lives_osc_cb_rte_listcconnection,		        161	},
-    { "/clip/encode_as",		"encode_as",	lives_osc_cb_clip_encodeas,			1	},
-    { "/clip/select",		"select",	lives_osc_cb_fgclip_select,			1	},
-    { "/clip/close",		"close",	lives_osc_cb_clip_close,	  		        1	},
-    { "/clip/copy",		"copy",	lives_osc_cb_fgclip_copy,	  		        1	},
-    { "/clip/undo",		"undo",	lives_osc_cb_clip_undo,	  		        1	},
-    { "/clip/redo",		"redo",	lives_osc_cb_clip_redo,	  		        1	},
-    { "/clip/selection/copy",		"copy",	lives_osc_cb_fgclipsel_copy,	  		        55	},
-    { "/clip/selection/cut",		"cut",	lives_osc_cb_fgclipsel_cut,	  		        55	},
-    { "/clip/selection/delete",		"delete",	lives_osc_cb_fgclipsel_delete,	  		        55	},
-    { "/clip/selection/rte_apply",		"rte_apply",	lives_osc_cb_fgclipsel_rteapply,	  		        55	},
-    { "/clipboard/paste",		"paste",	lives_osc_cb_clipbd_paste,			70	},
-    { "/clipboard/insert_before",		"insert_before",	lives_osc_cb_clipbd_insertb,			70	},
-    { "/clipboard/insert_after",		"insert_after",	lives_osc_cb_clipbd_inserta,			70	},
-    { "/clip/retrigger",		"retrigger",	lives_osc_cb_fgclip_retrigger,			1	},
-    { "/clip/resample",		        "resample",	lives_osc_cb_clip_resample,			1	},
-    { "/clip/select/next",		"next",	lives_osc_cb_fgclip_select_next,			54	},
-    { "/clip/select/previous",		"previous",	lives_osc_cb_fgclip_select_previous,			54	},
-    { "/clip/foreground/select",		"select",	lives_osc_cb_fgclip_select,			47	},
-    { "/clip/background/select",		"select",	lives_osc_cb_bgclip_select,			48	},
-    { "/clip/foreground/retrigger",		"retrigger",	lives_osc_cb_fgclip_retrigger,			47	},
-    { "/clip/background/retrigger",		"retrigger",	lives_osc_cb_bgclip_retrigger,			48	},
-    { "/clip/foreground/set",		"set",	lives_osc_cb_fgclip_set,			47	},
-    { "/clip/background/set",		"set",	lives_osc_cb_bgclip_set,			48	},
-    { "/clip/foreground/get",		"get",	lives_osc_cb_clip_get_current,			47	},
-    { "/clip/background/get",		"get",	lives_osc_cb_bgclip_get_current,			48	},
-    { "/clip/foreground/next",		"next",	lives_osc_cb_fgclip_select_next,			47	},
-    { "/clip/background/next",		"next",	lives_osc_cb_bgclip_select_next,			48	},
-    { "/clip/foreground/previous",		"previous",	lives_osc_cb_fgclip_select_previous,			47	},
-    { "/clip/background/previous",		"previous",	lives_osc_cb_bgclip_select_previous,			48	},
-    { "/lives/quit",	         "quit",	        lives_osc_cb_quit,			21	},
-    { "/lives/version/get",	         "get",	        lives_osc_cb_getversion,			24	},
-    { "/lives/constant/value/get",	         "get",	        lives_osc_cb_getconst,			121	},
-    { "/app/quit",	         "quit",	           lives_osc_cb_quit,			22	},
-    { "/app/name",	         "name",	           lives_osc_cb_getname,			22	},
-    { "/app/name/get",	         "get",	           lives_osc_cb_getname,			23	},
-    { "/app/version/get",	         "get",	           lives_osc_cb_getversion,			125	},
-    { "/quit",	         "quit",	        lives_osc_cb_quit,			2	},
-    { "/reply_to",	         "reply_to",	 lives_osc_cb_open_status_socket,			2	},
-    { "/lives/open_status_socket",	         "open_status_socket",	        lives_osc_cb_open_status_socket,			21	},
-    { "/app/open_status_socket",	         "open_status_socket",	        lives_osc_cb_open_status_socket,			22	},
-    { "/app/ping",	         "ping",	           lives_osc_cb_ping,			22	},
-    { "/lives/ping",	         "ping",	           lives_osc_cb_ping,			21	},
-    { "/ping",	         "ping",	           lives_osc_cb_ping,			2	},
-    { "/notify_to",	         "notify_to",	   lives_osc_cb_open_notify_socket,			2	},
-    { "/lives/open_notify_socket",	         "open_notify_socket",	        lives_osc_cb_open_notify_socket,			21	},
-    { "/notify/confirmations/set",	         "set",	        lives_osc_cb_notify_c,			101	},
-    { "/notify/events/set",	         "set",	        lives_osc_cb_notify_e,			102	},
-    { "/clip/count",	         "count",	        lives_osc_cb_clip_count,			1  },
-    { "/clip/goto",	         "goto",	        lives_osc_cb_clip_goto,			1	},
-    { "/clip/foreground/frame/set",	         "set",	        lives_osc_cb_clip_goto,			60	},
-    { "/clip/foreground/frame/get",	         "get",	        lives_osc_cb_clip_getframe,			60	},
-    { "/clip/background/frame/set",	         "set",	        lives_osc_cb_bgclip_goto,			62	},
-    { "/clip/background/frame/get",	         "get",	        lives_osc_cb_bgclip_getframe,			62	},
-    { "/clip/is_valid/get",	         "get",	        lives_osc_cb_clip_isvalid,			49	},
-    { "/clip/frame/count",	         "count",	        lives_osc_cb_clip_get_frames,			57	},
-    { "/clip/frame/save_as_image",	         "save_as_image",	        lives_osc_cb_clip_save_frame,			57	},
-    { "/clip/select_all",	         "select_all",	        lives_osc_cb_clip_select_all,			1	},
-    { "/clip/start/set",	 "set",	        lives_osc_cb_clip_set_start,			50	},
-    { "/clip/start/get",	 "get",	        lives_osc_cb_clip_get_start,			50	},
-    { "/clip/end/set",	 "set",	        lives_osc_cb_clip_set_end,			51	},
-    { "/clip/end/get",	 "get",	        lives_osc_cb_clip_get_end,			51	},
-    { "/clip/size/get",	 "get",	        lives_osc_cb_clip_get_size,			58	},
-    { "/clip/name/get",	 "get",	        lives_osc_cb_clip_get_name,			59	},
-    { "/clip/name/set",	 "set",	        lives_osc_cb_clip_set_name,			59	},
-    { "/clip/fps/get",	 "get",	        lives_osc_cb_clip_get_ifps,			113	},
-    { "/clip/open/file",	 "file",	        lives_osc_cb_open_file,			33	},
-    { "/clip/audio/new",	 "new", 	        lives_osc_cb_new_audio,			108	},
-    { "/output/fullscreen/enable",		"enable",	lives_osc_cb_fssepwin_enable,		28	},
-    { "/output/fullscreen/disable",		"disable",	lives_osc_cb_fssepwin_disable,       	28	},
-    { "/output/fps/set",		"set",	lives_osc_cb_op_fps_set,       	52	},
-    { "/output/nodrop/enable",		"enable",	lives_osc_cb_op_nodrope,       	30	},
-    { "/output/nodrop/disable",		"disable",	lives_osc_cb_op_nodropd,       	30	},
-    { "/clip/foreground/background/swap",		"swap",	lives_osc_cb_swap,       	53	},
-    { "/clipset/load",		"load",	lives_osc_cb_loadset,       	35	},
-    { "/clipset/save",		"save",	lives_osc_cb_saveset,       	35	},
-    { "/layout/clear",		"clear",	lives_osc_cb_clearlay,       	104	},
-    { "/block/count",		"count",	lives_osc_cb_blockcount,       	105	},
-    { "/block/insert",		"insert",	lives_osc_cb_blockinsert,       	105	},
-    { "/block/start/time/get",		"get",	lives_osc_cb_blockstget,       	111	},
-    { "/block/end/time/get",		"get",	lives_osc_cb_blockenget,       	112	},
-    { "/mt/time/get",		"get",	lives_osc_cb_mtctimeget,       	201	},
-    { "/mt/time/set",		"set",	lives_osc_cb_mtctimeset,       	201	},
-    { "/mt/ctrack/get",		"get",	lives_osc_cb_mtctrackget,       	201	},
-    { "/mt/ctrack/set",		"set",	lives_osc_cb_mtctrackset,       	201	},
-    { "/test",		"",	lives_osc_cb_test,       	500	},
-    
-    { NULL,					NULL,		NULL,							0	},
-  };
+} osc_methods[] = {
+  { "/record/enable",		"enable",	(osc_cb)lives_osc_record_start,			3	},
+  { "/record/disable",	"disable",	(osc_cb)lives_osc_record_stop,			3	},
+  { "/record/toggle",	        "toggle",	(osc_cb)lives_osc_record_toggle,			3	},
+  { "/video/play",		"play",	(osc_cb)lives_osc_cb_play,			5	},
+  { "/video/selection/play",		"play",	(osc_cb)lives_osc_cb_playsel,			46	},
+  { "/video/play/forwards",		"forwards",	(osc_cb)lives_osc_cb_play_forward,			36	},
+  { "/video/play/backwards",		"backwards",	(osc_cb)lives_osc_cb_play_backward,			36	},
+  { "/video/play/faster",		"faster",	(osc_cb)lives_osc_cb_play_faster,			36	},
+  { "/clip/foreground/fps/faster",		"faster",	(osc_cb)lives_osc_cb_play_faster,			61	},
+  { "/clip/foreground/fps/get",		"get",	(osc_cb)lives_osc_cb_clip_getfps,			61	},
+  { "/clip/background/fps/faster",		"faster",	(osc_cb)lives_osc_cb_bgplay_faster,			63	},
+  { "/clip/background/fps/get",		"get",	(osc_cb)lives_osc_cb_bgclip_getfps,			63	},
+  { "/video/play/slower",		"slower",	(osc_cb)lives_osc_cb_play_slower,			36	},
+  { "/clip/foreground/fps/slower",		"slower",	(osc_cb)lives_osc_cb_play_slower,			61	},
+  { "/clip/background/fps/slower",		"slower",	(osc_cb)lives_osc_cb_bgplay_slower,			63	},
+  { "/video/play/reset",		"reset",	(osc_cb)lives_osc_cb_play_reset,			36	},
+  { "/video/play/parameter/count",		"set",	(osc_cb)lives_osc_cb_rte_pparamcount,			140	},
+  { "/video/play/parameter/value/set",		"set",	(osc_cb)lives_osc_cb_rte_setpparam,			140	},
+  { "/video/play/parameter/flags/get",		"get",	(osc_cb)lives_osc_cb_rte_getpparamflags,        141	},
+  { "/video/play/parameter/min/get",		"get",	(osc_cb)lives_osc_cb_rte_getpparammin,		        142	},
+  { "/video/play/parameter/max/get",		"get",	(osc_cb)lives_osc_cb_rte_getpparammax,		        143	},
+  { "/video/play/parameter/type/get",		"get",	(osc_cb)lives_osc_cb_rte_getpparamtype,		        144	},
+  { "/video/play/parameter/name/get",		"get",	(osc_cb)lives_osc_cb_rte_getpparamname,		        145	},
+  { "/video/play/parameter/colorspace/get",		"get",	(osc_cb)lives_osc_cb_rte_getpparamcspace,      	        146	},
+  { "/video/play/parameter/default/get",		"get",	(osc_cb)lives_osc_cb_rte_getpparamdef,		        147	},
+  { "/video/play/parameter/value/get",		"get",	(osc_cb)lives_osc_cb_rte_getpparamval,		        140	},
+  { "/clip/foreground/fps/reset",		"reset",	(osc_cb)lives_osc_cb_play_reset,			61	},
+  { "/clip/background/fps/reset",		"reset",	(osc_cb)lives_osc_cb_bgplay_reset,			63	},
+  { "/video/stop",		"stop", (osc_cb)lives_osc_cb_stop,				5	},
+  { "/video/fps/set",	       "set",	(osc_cb)lives_osc_cb_set_fps,			40	},
+  { "/video/fps/get",	       "get",	(osc_cb)lives_osc_cb_clip_getfps,			40	},
+  { "/video/loop/set",	       "set",	(osc_cb)lives_osc_cb_set_loop,			38	},
+  { "/video/loop/get",	       "get",	(osc_cb)lives_osc_cb_get_loop,			38	},
+  { "/video/pingpong/set",	       "set",	(osc_cb)lives_osc_cb_set_pingpong,			39	},
+  { "/video/pingpong/get",	       "get",	(osc_cb)lives_osc_cb_get_pingpong,			39	},
+  { "/lives/mode/set",	       "set",	(osc_cb)lives_osc_cb_setmode,			103	},
+  { "/lives/mode/get",	       "get",	(osc_cb)lives_osc_cb_getmode,			103	},
+  { "/video/fps/ratio/set",	       "set",	(osc_cb)lives_osc_cb_set_fps_ratio,			65	},
+  { "/video/fps/ratio/get",	       "get",	(osc_cb)lives_osc_cb_get_fps_ratio,			65	},
+  { "/video/play/time/get",	       "get",	(osc_cb)lives_osc_cb_get_playtime,			67	},
+  { "/clip/foreground/fps/set",	"set",	(osc_cb)lives_osc_cb_set_fps,			61	},
+  { "/clip/background/fps/set",	"set",	(osc_cb)lives_osc_cb_bgset_fps,			63	},
+  { "/clip/foreground/fps/ratio/set",	"set",	(osc_cb)lives_osc_cb_set_fps_ratio,			64	},
+  { "/clip/foreground/fps/ratio/get",	"get",	(osc_cb)lives_osc_cb_get_fps_ratio,			64	},
+  { "/clip/background/fps/ratio/set",	"set",	(osc_cb)lives_osc_cb_bgset_fps_ratio,			66	},
+  { "/clip/background/fps/ratio/get",	"get",	(osc_cb)lives_osc_cb_bgget_fps_ratio,			66	},
+  { "/video/play/reverse",		"reverse",	(osc_cb)lives_osc_cb_play_reverse,		36	},
+  { "/clip/foreground/fps/reverse",	"reverse",	(osc_cb)lives_osc_cb_play_reverse,		61	},
+  { "/clip/background/fps/reverse",	"reverse",	(osc_cb)lives_osc_cb_bgplay_reverse,		63	},
+  { "/video/freeze/toggle",		"toggle", (osc_cb)lives_osc_cb_freeze,		37	},
+  { "/effects/realtime/name/get",		"get",	(osc_cb)lives_osc_cb_fx_getname,			115	},
+  { "/effect_key/map",		"map",	(osc_cb)lives_osc_cb_fx_map,			25	},
+  { "/effect_key/unmap",		"unmap",	(osc_cb)lives_osc_cb_fx_unmap,			25	},
+  { "/effect_key/map/clear",		"clear",	(osc_cb)lives_osc_cb_fx_map_clear,			32	},
+  { "/effect_key/reset",		"reset",	(osc_cb)lives_osc_cb_fx_reset,			25	},
+  { "/effect_key/enable",		"enable",	(osc_cb)lives_osc_cb_fx_enable,		        25	},
+  { "/effect_key/disable",		"disable",	(osc_cb)lives_osc_cb_fx_disable,		        25	},
+  { "/effect_key/toggle",		"toggle",	(osc_cb)lives_osc_cb_fx_toggle,		        25	},
+  { "/effect_key/count",		"count",	(osc_cb)lives_osc_cb_rte_count,		        25	},
+  { "/effect_key/parameter/value/set",		"set",	(osc_cb)lives_osc_cb_rte_setparam,		        42	},
+  { "/effect_key/parameter/type/get",		"get",	(osc_cb)lives_osc_cb_rte_getparamtype,		        68	},
+  { "/effect_key/outparameter/type/get",		"get",	(osc_cb)lives_osc_cb_rte_getoparamtype,		        153	},
+  { "/effect_key/nparameter/type/get",		"get",	(osc_cb)lives_osc_cb_rte_getnparamtype,		        116	},
+  { "/effect_key/parameter/name/get",		"get",	(osc_cb)lives_osc_cb_rte_getparamname,		        71	},
+  { "/effect_key/outparameter/name/get",		"get",	(osc_cb)lives_osc_cb_rte_getoparamname,		        152	},
+  { "/effect_key/nparameter/name/get",		"get",	(osc_cb)lives_osc_cb_rte_getnparamname,		        72	},
+  { "/effect_key/parameter/colorspace/get",		"get",	(osc_cb)lives_osc_cb_rte_getparamcspace,		        73	},
+  { "/effect_key/outparameter/colorspace/get",		"get",	(osc_cb)lives_osc_cb_rte_getoparamcspace,		        154	},
+  { "/effect_key/parameter/flags/get",		"get",	(osc_cb)lives_osc_cb_rte_getparamflags,		        74	},
+  { "/effect_key/parameter/min/get",		"get",	(osc_cb)lives_osc_cb_rte_getparammin,		        75	},
+  { "/effect_key/parameter/max/get",		"get",	(osc_cb)lives_osc_cb_rte_getparammax,		        76	},
+  { "/effect_key/parameter/default/get",		"get",	(osc_cb)lives_osc_cb_rte_getparamdef,		        77	},
+  { "/effect_key/parameter/default/set",		"set",	(osc_cb)lives_osc_cb_rte_setparamdef,		        77	},
+  { "/effect_key/parameter/group/get",		"get",	(osc_cb)lives_osc_cb_rte_getparamgrp,		        78	},
+  { "/effect_key/parameter/gui/choices/count",	"count",	(osc_cb)lives_osc_cb_pgui_countchoices,		        181	},
+  { "/effect_key/parameter/gui/choices/get",	"get", (osc_cb)lives_osc_cb_pgui_getchoice,		        181	},
+  { "/effect_key/outparameter/min/get",		"get",	(osc_cb)lives_osc_cb_rte_getoparammin,		        156	},
+  { "/effect_key/outparameter/max/get",		"get",	(osc_cb)lives_osc_cb_rte_getoparammax,		        157	},
+  { "/effect_key/outparameter/default/get",		"get",	(osc_cb)lives_osc_cb_rte_getoparamdef,		        158	},
+  { "/effect_key/outparameter/has_min",		"has_min",	(osc_cb)lives_osc_cb_rte_getohasparammin,		        150	},
+  { "/effect_key/outparameter/has_max",		"has_max",	(osc_cb)lives_osc_cb_rte_getohasparammax,		        150	},
+  { "/effect_key/outparameter/has_default",		"has_default",	(osc_cb)lives_osc_cb_rte_getohasparamdef,		        150	},
+  { "/effect_key/parameter/has_default",		"has_default",	(osc_cb)lives_osc_cb_rte_gethasparamdef,		        41	},
+  { "/effect_key/parameter/value/get",		"get",	(osc_cb)lives_osc_cb_rte_getparamval,		        42	},
+  { "/effect_key/outparameter/value/get",		"get",	(osc_cb)lives_osc_cb_rte_getoparamval,		        155	},
+  { "/effect_key/nparameter/count",		"count",	(osc_cb)lives_osc_cb_rte_nparamcount,		        91	},
+  { "/effect_key/parameter/count",		"count",	(osc_cb)lives_osc_cb_rte_paramcount,		        41	},
+  { "/effect_key/outparameter/count",		"count",	(osc_cb)lives_osc_cb_rte_oparamcount,		        150	},
+  { "/effect_key/nparameter/value/set",		"set",	(osc_cb)lives_osc_cb_rte_setnparam,		        92	},
+  { "/effect_key/nparameter/value/get",		"get",	(osc_cb)lives_osc_cb_rte_getnparam,		        92	},
+  { "/effect_key/nparameter/min/get",		"get",	(osc_cb)lives_osc_cb_rte_getnparammin,		        93	},
+  { "/effect_key/nparameter/max/get",		"get",	(osc_cb)lives_osc_cb_rte_getnparammax,		        94	},
+  { "/effect_key/nparameter/default/get",		"get",	(osc_cb)lives_osc_cb_rte_getnparamdef,		        95	},
+  { "/effect_key/nparameter/default/set",		"set",	(osc_cb)lives_osc_cb_rte_setnparamdef,		        95	},
+  { "/effect_key/nparameter/is_transition",		"is_transition",	(osc_cb)lives_osc_cb_rte_getnparamtrans,		        91	},
+  { "/effect_key/parameter/is_transition",		"is_transition",	(osc_cb)lives_osc_cb_rte_getparamtrans,		        41	},
+  { "/effect_key/inchannel/active/count",		"count",	(osc_cb)lives_osc_cb_rte_getnchannels,		        131	},
+  { "/effect_key/inchannel/palette/get",		"get",	(osc_cb)lives_osc_cb_rte_getinpal,		        132	},
+  { "/effect_key/outchannel/active/count",		"count",	(osc_cb)lives_osc_cb_rte_getnochannels,		        171	},
+  { "/effect_key/outchannel/palette/get",		"get",	(osc_cb)lives_osc_cb_rte_getoutpal,		        162	},
+  { "/effect_key/mode/set",		"set",	(osc_cb)lives_osc_cb_rte_setmode,		        43	},
+  { "/effect_key/mode/get",		"get",	(osc_cb)lives_osc_cb_rte_getmode,		        43	},
+  { "/effect_key/mode/next",		"next",	(osc_cb)lives_osc_cb_rte_nextmode,		        43	},
+  { "/effect_key/mode/previous",		"previous",	(osc_cb)lives_osc_cb_rte_prevmode,		        43	},
+  { "/effect_key/name/get",		"get",	(osc_cb)lives_osc_cb_rte_get_keyfxname,		        44	},
+  { "/effect_key/maxmode/get",		"get",	(osc_cb)lives_osc_cb_rte_getmodespk,		        45	},
+  { "/effect_key/state/get",		"get",	(osc_cb)lives_osc_cb_rte_getstate,		        56	},
+  { "/effect_key/outparameter/connection/add",		"add",	(osc_cb)lives_osc_cb_rte_addpconnection,		        151	},
+  { "/effect_key/outparameter/connection/delete",		"delete",	(osc_cb)lives_osc_cb_rte_delpconnection,		        151	},
+  { "/effect_key/outparameter/connection/list",		"list",	(osc_cb)lives_osc_cb_rte_listpconnection,		        151	},
+  { "/effect_key/outchannel/connection/add",		        "add",	(osc_cb)lives_osc_cb_rte_addcconnection,		        161	},
+  { "/effect_key/outchannel/connection/delete",		"delete",	(osc_cb)lives_osc_cb_rte_delcconnection,		        161	},
+  { "/effect_key/outchannel/connection/list",		"list",	(osc_cb)lives_osc_cb_rte_listcconnection,		        161	},
+  { "/clip/encode_as",		"encode_as",	(osc_cb)lives_osc_cb_clip_encodeas,			1	},
+  { "/clip/select",		"select",	(osc_cb)lives_osc_cb_fgclip_select,			1	},
+  { "/clip/close",		"close",	(osc_cb)lives_osc_cb_clip_close,	  		        1	},
+  { "/clip/copy",		"copy",	(osc_cb)lives_osc_cb_fgclip_copy,	  		        1	},
+  { "/clip/undo",		"undo",	(osc_cb)lives_osc_cb_clip_undo,	  		        1	},
+  { "/clip/redo",		"redo",	(osc_cb)lives_osc_cb_clip_redo,	  		        1	},
+  { "/clip/selection/copy",		"copy",	(osc_cb)lives_osc_cb_fgclipsel_copy,	  		        55	},
+  { "/clip/selection/cut",		"cut",	(osc_cb)lives_osc_cb_fgclipsel_cut,	  		        55	},
+  { "/clip/selection/delete",		"delete",	(osc_cb)lives_osc_cb_fgclipsel_delete,	  		        55	},
+  { "/clip/selection/rte_apply",		"rte_apply",	(osc_cb)lives_osc_cb_fgclipsel_rteapply,	  		        55	},
+  { "/clipboard/paste",		"paste",	(osc_cb)lives_osc_cb_clipbd_paste,			70	},
+  { "/clipboard/insert_before",		"insert_before",	(osc_cb)lives_osc_cb_clipbd_insertb,			70	},
+  { "/clipboard/insert_after",		"insert_after",	(osc_cb)lives_osc_cb_clipbd_inserta,			70	},
+  { "/clip/retrigger",		"retrigger",	(osc_cb)lives_osc_cb_fgclip_retrigger,			1	},
+  { "/clip/resample",		        "resample",	(osc_cb)lives_osc_cb_clip_resample,			1	},
+  { "/clip/select/next",		"next",	(osc_cb)lives_osc_cb_fgclip_select_next,			54	},
+  { "/clip/select/previous",		"previous",	(osc_cb)lives_osc_cb_fgclip_select_previous,			54	},
+  { "/clip/foreground/select",		"select",	(osc_cb)lives_osc_cb_fgclip_select,			47	},
+  { "/clip/background/select",		"select",	(osc_cb)lives_osc_cb_bgclip_select,			48	},
+  { "/clip/foreground/retrigger",		"retrigger",	(osc_cb)lives_osc_cb_fgclip_retrigger,			47	},
+  { "/clip/background/retrigger",		"retrigger",	(osc_cb)lives_osc_cb_bgclip_retrigger,			48	},
+  { "/clip/foreground/set",		"set",	(osc_cb)lives_osc_cb_fgclip_set,			47	},
+  { "/clip/background/set",		"set",	(osc_cb)lives_osc_cb_bgclip_set,			48	},
+  { "/clip/foreground/get",		"get",	(osc_cb)lives_osc_cb_clip_get_current,			47	},
+  { "/clip/background/get",		"get",	(osc_cb)lives_osc_cb_bgclip_get_current,			48	},
+  { "/clip/foreground/next",		"next",	(osc_cb)lives_osc_cb_fgclip_select_next,			47	},
+  { "/clip/background/next",		"next",	(osc_cb)lives_osc_cb_bgclip_select_next,			48	},
+  { "/clip/foreground/previous",		"previous",	(osc_cb)lives_osc_cb_fgclip_select_previous,			47	},
+  { "/clip/background/previous",		"previous",	(osc_cb)lives_osc_cb_bgclip_select_previous,			48	},
+  { "/lives/quit",	         "quit", (osc_cb)lives_osc_cb_quit,			21	},
+  { "/lives/version/get",	         "get", (osc_cb)lives_osc_cb_getversion,			24	},
+  { "/lives/status/get",	         "get", (osc_cb)lives_osc_cb_getstatus,			122	},
+  { "/lives/constant/value/get",	         "get", (osc_cb)lives_osc_cb_getconst,			121	},
+  { "/app/quit",	         "quit", (osc_cb)lives_osc_cb_quit,			22	},
+  { "/app/name",	         "name", (osc_cb)lives_osc_cb_getname,			22	},
+  { "/app/name/get",	         "get", (osc_cb)lives_osc_cb_getname,			23	},
+  { "/app/version/get",	         "get", (osc_cb)lives_osc_cb_getversion,			125	},
+  { "/quit",	         "quit", (osc_cb)lives_osc_cb_quit,			2	},
+  { "/reply_to",	         "reply_to", (osc_cb)lives_osc_cb_open_status_socket,			2	},
+  { "/lives/open_status_socket",	         "open_status_socket", (osc_cb)lives_osc_cb_open_status_socket,			21	},
+  { "/app/open_status_socket",	         "open_status_socket", (osc_cb)lives_osc_cb_open_status_socket,			22	},
+  { "/app/ping",	         "ping", (osc_cb)lives_osc_cb_ping,			22	},
+  { "/lives/ping",	         "ping", (osc_cb)lives_osc_cb_ping,			21	},
+  { "/ping",	         "ping", (osc_cb)lives_osc_cb_ping,			2	},
+  { "/notify_to",	         "notify_to", (osc_cb)lives_osc_cb_open_notify_socket,			2	},
+  { "/lives/open_notify_socket",	         "open_notify_socket", (osc_cb)lives_osc_cb_open_notify_socket,			21	},
+  { "/notify/confirmations/set",	         "set", (osc_cb)lives_osc_cb_notify_c,			101	},
+  { "/notify/events/set",	         "set", (osc_cb)lives_osc_cb_notify_e,			102	},
+  { "/clip/count",	         "count", (osc_cb)lives_osc_cb_clip_count,			1  },
+  { "/clip/goto",	         "goto", (osc_cb)lives_osc_cb_clip_goto,			1	},
+  { "/clip/foreground/frame/set",	         "set", (osc_cb)lives_osc_cb_clip_goto,			60	},
+  { "/clip/foreground/frame/get",	         "get", (osc_cb)lives_osc_cb_clip_getframe,			60	},
+  { "/clip/background/frame/set",	         "set", (osc_cb)lives_osc_cb_bgclip_goto,			62	},
+  { "/clip/background/frame/get",	         "get", (osc_cb)lives_osc_cb_bgclip_getframe,			62	},
+  { "/clip/is_valid/get",	         "get", (osc_cb)lives_osc_cb_clip_isvalid,			49	},
+  { "/clip/frame/count",	         "count", (osc_cb)lives_osc_cb_clip_get_frames,			57	},
+  { "/clip/frame/save_as_image",	         "save_as_image", (osc_cb)lives_osc_cb_clip_save_frame,			57	},
+  { "/clip/select_all",	         "select_all", (osc_cb)lives_osc_cb_clip_select_all,			1	},
+  { "/clip/start/set",	 "set", (osc_cb)lives_osc_cb_clip_set_start,			50	},
+  { "/clip/start/get",	 "get", (osc_cb)lives_osc_cb_clip_get_start,			50	},
+  { "/clip/end/set",	 "set", (osc_cb)lives_osc_cb_clip_set_end,			51	},
+  { "/clip/end/get",	 "get", (osc_cb)lives_osc_cb_clip_get_end,			51	},
+  { "/clip/size/get",	 "get", (osc_cb)lives_osc_cb_clip_get_size,			58	},
+  { "/clip/name/get",	 "get", (osc_cb)lives_osc_cb_clip_get_name,			59	},
+  { "/clip/name/set",	 "set", (osc_cb)lives_osc_cb_clip_set_name,			59	},
+  { "/clip/fps/get",	 "get", (osc_cb)lives_osc_cb_clip_get_ifps,			113	},
+  { "/clip/open/file",	 "file", (osc_cb)lives_osc_cb_open_file,			33	},
+  { "/clip/audio/new",	 "new", (osc_cb)lives_osc_cb_new_audio,			108	},
+  { "/output/fullscreen/enable",		"enable",	(osc_cb)lives_osc_cb_fssepwin_enable,		28	},
+  { "/output/fullscreen/disable",		"disable",	(osc_cb)lives_osc_cb_fssepwin_disable,       	28	},
+  { "/output/fps/set",		"set",	(osc_cb)lives_osc_cb_op_fps_set,       	52	},
+  { "/output/nodrop/enable",		"enable",	(osc_cb)lives_osc_cb_op_nodrope,       	30	},
+  { "/output/nodrop/disable",		"disable",	(osc_cb)lives_osc_cb_op_nodropd,       	30	},
+  { "/clip/foreground/background/swap",		"swap",	(osc_cb)lives_osc_cb_swap,       	53	},
+  { "/clipset/load",		"load",	(osc_cb)lives_osc_cb_loadset,       	35	},
+  { "/clipset/save",		"save",	(osc_cb)lives_osc_cb_saveset,       	35	},
+  { "/clipset/name/get",		"get",	(osc_cb)lives_osc_cb_getsetname,       	135	},
+  { "/layout/clear",		"clear",	(osc_cb)lives_osc_cb_clearlay,       	104	},
+  { "/block/count",		"count",	(osc_cb)lives_osc_cb_blockcount,       	105	},
+  { "/block/insert",		"insert",	(osc_cb)lives_osc_cb_blockinsert,       	105	},
+  { "/block/start/time/get",		"get",	(osc_cb)lives_osc_cb_blockstget,       	111	},
+  { "/block/end/time/get",		"get",	(osc_cb)lives_osc_cb_blockenget,       	112	},
+  { "/mt/time/get",		"get",	(osc_cb)lives_osc_cb_mtctimeget,       	201	},
+  { "/mt/time/set",		"set",	(osc_cb)lives_osc_cb_mtctimeset,       	201	},
+  { "/mt/ctrack/get",		"get",	(osc_cb)lives_osc_cb_mtctrackget,       	201	},
+  { "/mt/ctrack/set",		"set",	(osc_cb)lives_osc_cb_mtctrackset,       	201	},
+  { "/test",		"",	(osc_cb)lives_osc_cb_test,       	500	},
 
+  { NULL,					NULL,		NULL,							0	},
+};
 
-static struct
-{
+
+static struct {
   char *comment; // leaf comment
   char *name;  // leaf name
   int  leave; // leaf number
   int  att;  // attached to parent number
   int  it; // ???
-} osc_cont[] = 
-  {
-    {	"/",	 	"",	                 2, -1,0   	},
-    {	"/video/",	 	"video",	 5, -1,0   	},
-    {	"/video/selection/",	 	"selection",	 46, 5,0   	},
-    {	"/video/fps/",	 	"fps",	 40, 5,0   	},
-    {	"/video/fps/ratio/",	 	"ratio",	 65, 40,0   	},
-    {	"/video/play/ start video playback",	 	"play",	         36, 5,0   	},
-    {	"/video/play/time",	 	"time",	         67, 36,0   	},
-    {	"/video/play/parameter",	 	"parameter",	         69, 36,0   	},
-    {	"/video/play/parameter/value",	 	"value",	         140, 69,0   	},
-    {	"/video/play/parameter/flags",	 	"flags",	         141, 69,0   	},
-    {	"/video/play/parameter/min",	 	"min",	         142, 69,0   	},
-    {	"/video/play/parameter/max",	 	"max",	         143, 69,0   	},
-    {	"/video/play/parameter/type",	 	"type",	         144, 69,0   	},
-    {	"/video/play/parameter/name",	 	"name",	         145, 69,0   	},
-    {	"/video/play/parameter/colorspace",	 	"colorspace",	 146, 69,0   	},
-    {	"/video/play/parameter/default",	"default",	 147, 69,0   	},
-    {	"/video/freeze/",	"freeze",        37, 5,0   	},
-    {	"/video/loop/",	"loop",        38, 5,0   	},
-    {	"/video/pingpong/",	"pingpong",        39, 5,0   	},
-    {	"/clip/", 		"clip",		 1, -1,0	},
-    {	"/clip/fps/", 		"fps",		 113, 1,0	},
-    {	"/clip/foreground/", 	"foreground",    47, 1,0	},
-    {	"/clip/foreground/valid/", 	"valid",    80, 1,0	},
-    {	"/clip/foreground/background/",  "background",    53, 47,0	},
-    {	"/clip/foreground/frame/",  "frame",    60, 47,0	},
-    {	"/clip/foreground/fps/",  "fps",    61, 47,0	},
-    {	"/clip/foreground/fps/ratio/",  "ratio",    64, 61,0	},
-    {	"/clip/background/", 	"background",    48, 1,0	},
-    {	"/clip/background/valid/", 	"valid",    81, 1,0	},
-    {	"/clip/background/frame/",  "frame",    62, 48,0	},
-    {	"/clip/background/fps/",  "fps",    63, 48,0	},
-    {	"/clip/background/fps/ratio/",  "ratio",    66, 63,0	},
-    {	"/clip/is_valid/", 	"is_valid",      49, 1,0	},
-    {	"/clip/frame/", 	"frame",      57, 1,0	},
-    {	"/clip/start/", 	"start",         50, 1,0	},
-    {	"/clip/end/", 	        "end",           51, 1,0	},
-    {	"/clip/select/", 	        "select",           54, 1,0	},
-    {	"/clip/selection/", 	        "selection",           55, 1,0	},
-    {	"/clip/size/", 	        "size",           58, 1,0	},
-    {	"/clip/name/", 	        "name",           59, 1,0	},
-    {	"/clip/audio/", 	"audio",           108, 1,0	},
-    {	"/clipboard/", 		"clipboard",		 70, -1,0	},
-    {	"/record/", 		"record",	 3, -1,0	},
-    {	"/effect/" , 		"effects",	 4, -1,0	},
-    {	"/effect/realtime/" , 		"realtime",	 114, 4,0	},
-    {	"/effect/realtime/name/" , 		"name",	 115, 114,0	},
-    {	"/effect_key/" , 		"effect_key",	 25, -1,0	},
-    {	"/effect_key/inchannel/" , 	"inchannel",	 130, 25,0	},
-    {	"/effect_key/inchannel/active/" , 	"active",	 131, 130,0	},
-    {	"/effect_key/inchannel/palette/" , 	"palette",	 132, 130,0	},
-    {	"/effect_key/parameter/" , 	"parameter",	 41, 25,0	},
-    {	"/effect_key/parameter/value/" ,"value",	 42, 41,0	},
-    {	"/effect_key/parameter/type/" ,"type",	 68, 41,0	},
-    {	"/effect_key/parameter/name/" ,"name",	 71, 41,0	},
-    {	"/effect_key/parameter/colorspace/" ,"colorspace",	 73, 41,0	},
-    {	"/effect_key/parameter/flags/" ,"flags",	 74, 41,0	},
-    {	"/effect_key/parameter/min/" ,"min",	 75, 41,0	},
-    {	"/effect_key/parameter/max/" ,"max",	 76, 41,0	},
-    {	"/effect_key/parameter/default/" ,"default",	 77, 41,0	},
-    {	"/effect_key/parameter/group/" ,"group",	 78, 41,0	},
-    {	"/effect_key/nparameter/" , 	"nparameter",	 91, 25,0	},
-    {	"/effect_key/nparameter/name/" ,"name",	 72, 91,0	},
-    {	"/effect_key/nparameter/value/" ,"value",	 92, 91,0	},
-    {	"/effect_key/nparameter/type/" ,"type",	 116, 91,0	},
-    {	"/effect_key/nparameter/min/" ,"min",	 93, 91,0	},
-    {	"/effect_key/nparameter/max/" ,"max",	 94, 91,0	},
-    {	"/effect_key/nparameter/default/" ,"default",	 95, 91,0	},
-    {	"/effect_key/map/" , 		"map",	 32, 25,0	},
-    {	"/effect_key/mode/" , 		"mode",	 43, 25,0	},
-    {	"/effect_key/name/" , 		"name",	 44, 25,0	},
-    {	"/effect_key/maxmode/" , 	"maxmode",	 45, 25,0	},
-    {	"/effect_key/state/" , 	"state",	 56, 25,0	},
-    {	"/effect_key/outchannel/" , 	"outchannel",	 160, 25,0	},
-    {	"/effect_key/outchannel/connection/" , 	"connection",	 161, 160,0	},
-    {	"/effect_key/outchannel/palette/" , 	"palette",	 162, 160,0	},
-    {	"/effect_key/outchannel/active/" , 	"active",	 171, 160,0	},
-    {	"/effect_key/outparameter/" , 	"outparameter",	 150, 25,0	},
-    {	"/effect_key/outparameter/connection/" , 	"connection",	 151, 150,0	},
-    {	"/effect_key/outparameter/name/" , 	"name",	 152, 150,0	},
-    {	"/effect_key/outparameter/type/" , 	"type",	 153, 150,0	},
-    {	"/effect_key/outparameter/colorspace/" , 	"colorspace",	 154, 150,0	},
-    {	"/effect_key/outparameter/value/" , 	"value",	 155, 150,0	},
-    {	"/effect_key/outparameter/min/" , 	"min",	 156, 150,0	},
-    {	"/effect_key/outparameter/max/" , 	"max",	 157, 150,0	},
-    {	"/effect_key/outparameter/default/" , 	"default",	 158, 150,0	},
-    {	"/lives/" , 		"lives",	 21, -1,0	},
-    {	"/lives/version/" , 		"version",	 24, 21,0	},
-    {	"/lives/mode/" , 		"mode",	 103, 21,0	},
-    {	"/lives/constant/" , 		"constant",	 120, 21,0	},
-    {	"/lives/constant/value/" , 		"value",	 121, 120,0	},
-    {	"/clipset/" , 		"clipset",	 35, -1,0	},
-    {	"/app/" , 		"app",	         22, -1,0	},
-    {	"/app/name/" , 		"name",	         23, 22,0	},
-    {	"/app/version/" , 		"version",	         125, 22,0	},
-    {	"/output/" , 	"output",	 27, -1,0	},
-    {	"/output/fullscreen/" , 	"fullscreen",	 28, 27,0	},
-    {	"/output/fps/" , 	        "fps",	 52, 27,0	},
-    {	"/output/nodrop/" , 	"nodrop",	 30, 27 ,0	},
-    {	"/clip/open/",   		"open",		 33, 1,0	},
-    {	"/notify/",   		"notify",		 100, -1,0	},
-    {	"/notify/confirmations/",   		"confirmations",		 101, 100,0	},
-    {	"/notify/events/",   		"events",		 102, 100,0	},
-    {	"/layout/",   		"layout",		 104, -1,0	},
-    {	"/block/",   		"block",		 105, -1,0	},
-    {	"/block/start/",   		"start",		 106, 105,0	},
-    {	"/block/start/time/",   		"time",		 111, 106,0	},
-    {	"/block/end/",   		"end",		 107, 105,0	},
-    {	"/block/end/time/",   		"time",		 112, 107,0	},
-    {	"/mt/",   		"mt",		 200, -1,0	},
-    {	"/mt/ctime/",   		"ctime",		 201, 200,0	},
-    {	"/mt/ctrack/",   		"ctrack",		 202, 200,0	},
-    {	"/test/",   		"test",		 500, -1,0	},
-    {	NULL,			NULL,		0, -1,0		},
-  };
+} osc_cont[] = {
+  {	"/",	 	"",	                 2, -1,0   	},
+  {	"/video/",	 	"video",	 5, -1,0   	},
+  {	"/video/selection/",	 	"selection",	 46, 5,0   	},
+  {	"/video/fps/",	 	"fps",	 40, 5,0   	},
+  {	"/video/fps/ratio/",	 	"ratio",	 65, 40,0   	},
+  {	"/video/play/ start video playback",	 	"play",	         36, 5,0   	},
+  {	"/video/play/time",	 	"time",	         67, 36,0   	},
+  {	"/video/play/parameter",	 	"parameter",	         69, 36,0   	},
+  {	"/video/play/parameter/value",	 	"value",	         140, 69,0   	},
+  {	"/video/play/parameter/flags",	 	"flags",	         141, 69,0   	},
+  {	"/video/play/parameter/min",	 	"min",	         142, 69,0   	},
+  {	"/video/play/parameter/max",	 	"max",	         143, 69,0   	},
+  {	"/video/play/parameter/type",	 	"type",	         144, 69,0   	},
+  {	"/video/play/parameter/name",	 	"name",	         145, 69,0   	},
+  {	"/video/play/parameter/colorspace",	 	"colorspace",	 146, 69,0   	},
+  {	"/video/play/parameter/default",	"default",	 147, 69,0   	},
+  {	"/video/freeze/",	"freeze",        37, 5,0   	},
+  {	"/video/loop/",	"loop",        38, 5,0   	},
+  {	"/video/pingpong/",	"pingpong",        39, 5,0   	},
+  {	"/clip/", 		"clip",		 1, -1,0	},
+  {	"/clip/fps/", 		"fps",		 113, 1,0	},
+  {	"/clip/foreground/", 	"foreground",    47, 1,0	},
+  {	"/clip/foreground/valid/", 	"valid",    80, 1,0	},
+  {	"/clip/foreground/background/",  "background",    53, 47,0	},
+  {	"/clip/foreground/frame/",  "frame",    60, 47,0	},
+  {	"/clip/foreground/fps/",  "fps",    61, 47,0	},
+  {	"/clip/foreground/fps/ratio/",  "ratio",    64, 61,0	},
+  {	"/clip/background/", 	"background",    48, 1,0	},
+  {	"/clip/background/valid/", 	"valid",    81, 1,0	},
+  {	"/clip/background/frame/",  "frame",    62, 48,0	},
+  {	"/clip/background/fps/",  "fps",    63, 48,0	},
+  {	"/clip/background/fps/ratio/",  "ratio",    66, 63,0	},
+  {	"/clip/is_valid/", 	"is_valid",      49, 1,0	},
+  {	"/clip/frame/", 	"frame",      57, 1,0	},
+  {	"/clip/start/", 	"start",         50, 1,0	},
+  {	"/clip/end/", 	        "end",           51, 1,0	},
+  {	"/clip/select/", 	        "select",           54, 1,0	},
+  {	"/clip/selection/", 	        "selection",           55, 1,0	},
+  {	"/clip/size/", 	        "size",           58, 1,0	},
+  {	"/clip/name/", 	        "name",           59, 1,0	},
+  {	"/clip/audio/", 	"audio",           108, 1,0	},
+  {	"/clipboard/", 		"clipboard",		 70, -1,0	},
+  {	"/record/", 		"record",	 3, -1,0	},
+  {	"/effect/" , 		"effects",	 4, -1,0	},
+  {	"/effect/realtime/" , 		"realtime",	 114, 4,0	},
+  {	"/effect/realtime/name/" , 		"name",	 115, 114,0	},
+  {	"/effect_key/" , 		"effect_key",	 25, -1,0	},
+  {	"/effect_key/inchannel/" , 	"inchannel",	 130, 25,0	},
+  {	"/effect_key/inchannel/active/" , 	"active",	 131, 130,0	},
+  {	"/effect_key/inchannel/palette/" , 	"palette",	 132, 130,0	},
+  {	"/effect_key/parameter/" , 	"parameter",	 41, 25,0	},
+  {	"/effect_key/parameter/value/" ,"value",	 42, 41,0	},
+  {	"/effect_key/parameter/type/" ,"type",	 68, 41,0	},
+  {	"/effect_key/parameter/name/" ,"name",	 71, 41,0	},
+  {	"/effect_key/parameter/colorspace/" ,"colorspace",	 73, 41,0	},
+  {	"/effect_key/parameter/flags/" ,"flags",	 74, 41,0	},
+  {	"/effect_key/parameter/min/" ,"min",	 75, 41,0	},
+  {	"/effect_key/parameter/max/" ,"max",	 76, 41,0	},
+  {	"/effect_key/parameter/default/" ,"default",	 77, 41,0	},
+  {	"/effect_key/parameter/group/" ,"group",	 78, 41,0	},
+  {	"/effect_key/parameter/gui/" ,"gui",	 180, 41,0	},
+  {	"/effect_key/parameter/gui/choices" ,"choices",	 181, 180,0	},
+  {	"/effect_key/nparameter/" , 	"nparameter",	 91, 25,0	},
+  {	"/effect_key/nparameter/name/" ,"name",	 72, 91,0	},
+  {	"/effect_key/nparameter/value/" ,"value",	 92, 91,0	},
+  {	"/effect_key/nparameter/type/" ,"type",	 116, 91,0	},
+  {	"/effect_key/nparameter/min/" ,"min",	 93, 91,0	},
+  {	"/effect_key/nparameter/max/" ,"max",	 94, 91,0	},
+  {	"/effect_key/nparameter/default/" ,"default",	 95, 91,0	},
+  {	"/effect_key/map/" , 		"map",	 32, 25,0	},
+  {	"/effect_key/mode/" , 		"mode",	 43, 25,0	},
+  {	"/effect_key/name/" , 		"name",	 44, 25,0	},
+  {	"/effect_key/maxmode/" , 	"maxmode",	 45, 25,0	},
+  {	"/effect_key/state/" , 	"state",	 56, 25,0	},
+  {	"/effect_key/outchannel/" , 	"outchannel",	 160, 25,0	},
+  {	"/effect_key/outchannel/connection/" , 	"connection",	 161, 160,0	},
+  {	"/effect_key/outchannel/palette/" , 	"palette",	 162, 160,0	},
+  {	"/effect_key/outchannel/active/" , 	"active",	 171, 160,0	},
+  {	"/effect_key/outparameter/" , 	"outparameter",	 150, 25,0	},
+  {	"/effect_key/outparameter/connection/" , 	"connection",	 151, 150,0	},
+  {	"/effect_key/outparameter/name/" , 	"name",	 152, 150,0	},
+  {	"/effect_key/outparameter/type/" , 	"type",	 153, 150,0	},
+  {	"/effect_key/outparameter/colorspace/" , 	"colorspace",	 154, 150,0	},
+  {	"/effect_key/outparameter/value/" , 	"value",	 155, 150,0	},
+  {	"/effect_key/outparameter/min/" , 	"min",	 156, 150,0	},
+  {	"/effect_key/outparameter/max/" , 	"max",	 157, 150,0	},
+  {	"/effect_key/outparameter/default/" , 	"default",	 158, 150,0	},
+  {	"/lives/" , 		"lives",	 21, -1,0	},
+  {	"/lives/version/" , 		"version",	 24, 21,0	},
+  {	"/lives/mode/" , 		"mode",	 103, 21,0	},
+  {	"/lives/status/" , 		"status",	 122, 21,0	},
+  {	"/lives/constant/" , 		"constant",	 120, 21,0	},
+  {	"/lives/constant/value/" , 		"value",	 121, 120,0	},
+  {	"/clipset/" , 		"clipset",	 35, -1,0	},
+  {	"/clipset/name/" , 		"name",	 135, 35,0	},
+  {	"/app/" , 		"app",	         22, -1,0	},
+  {	"/app/name/" , 		"name",	         23, 22,0	},
+  {	"/app/version/" , 		"version",	         125, 22,0	},
+  {	"/output/" , 	"output",	 27, -1,0	},
+  {	"/output/fullscreen/" , 	"fullscreen",	 28, 27,0	},
+  {	"/output/fps/" , 	        "fps",	 52, 27,0	},
+  {	"/output/nodrop/" , 	"nodrop",	 30, 27 ,0	},
+  {	"/clip/open/",   		"open",		 33, 1,0	},
+  {	"/notify/",   		"notify",		 100, -1,0	},
+  {	"/notify/confirmations/",   		"confirmations",		 101, 100,0	},
+  {	"/notify/events/",   		"events",		 102, 100,0	},
+  {	"/layout/",   		"layout",		 104, -1,0	},
+  {	"/block/",   		"block",		 105, -1,0	},
+  {	"/block/start/",   		"start",		 106, 105,0	},
+  {	"/block/start/time/",   		"time",		 111, 106,0	},
+  {	"/block/end/",   		"end",		 107, 105,0	},
+  {	"/block/end/time/",   		"time",		 112, 107,0	},
+  {	"/mt/",   		"mt",		 200, -1,0	},
+  {	"/mt/ctime/",   		"ctime",		 201, 200,0	},
+  {	"/mt/ctrack/",   		"ctrack",		 202, 200,0	},
+  {	"/test/",   		"test",		 500, -1,0	},
+  {	NULL,			NULL,		0, -1,0		},
+};
 
 
-int lives_osc_build_cont(lives_osc *o) { 
+int lives_osc_build_cont(lives_osc *o) {
   /* Create containers /video , /clip, /chain and /tag */
   register int i;
   for (i = 0; osc_cont[i].name != NULL ; i ++) {
     if (osc_cont[i].it == 0) {
       o->cqinfo.comment = osc_cont[i].comment;
-	  
+
       // add a container to a leaf
       if ((o->leaves[ osc_cont[i].leave ] =
-	   OSCNewContainer( osc_cont[i].name,
-			    (osc_cont[i].att == -1 ? o->container : o->leaves[ osc_cont[i].att ]),
-			    &(o->cqinfo) ) ) == 0)
-	{
-	  if (osc_cont[i].att == - 1) {
-	    g_printerr("Cannot create container %d (%s) \n",
-		       i, osc_cont[i].name);
-	    return 0;
-	  }
-	  else {
-	    g_printerr("Cannot add branch %s to  container %d)\n",
-		       osc_cont[i].name, osc_cont[i].att);  
-	    return 0;
-	  }
-	}
-    }
-    else {
+             OSCNewContainer(osc_cont[i].name,
+                             (osc_cont[i].att == -1 ? o->container : o->leaves[ osc_cont[i].att ]),
+                             &(o->cqinfo))) == 0) {
+        if (osc_cont[i].att == - 1) {
+          lives_printerr("Cannot create container %d (%s) \n",
+                         i, osc_cont[i].name);
+          return 0;
+        } else {
+          lives_printerr("Cannot add branch %s to  container %d)\n",
+                         osc_cont[i].name, osc_cont[i].att);
+          return 0;
+        }
+      }
+    } else {
       char name[50];
       char comment[50];
       int n = osc_cont[i].it;
       int base = osc_cont[i].leave;
       register int j;
-	  
-      for ( j = 0; j < n ; j ++ ) {
-	sprintf(name, "N%d", j);	
-	sprintf(comment, "<%d>", j);
-	g_printerr("Try cont.%d  '%s', %d %d\n", j, name,
-		   base + j, base);	
-	o->cqinfo.comment = comment;
-	if ((o->leaves[ base + j ] = OSCNewContainer(name,
-						     o->leaves[ osc_cont[i].att ],
-						     &(o->cqinfo) ) ) == 0) {
-	  g_printerr("Cannot auto numerate container %s \n",
-		     osc_cont[i].name);
-	  return 0;
-		  
-	}
+
+      for (j = 0; j < n ; j ++) {
+        sprintf(name, "N%d", j);
+        sprintf(comment, "<%d>", j);
+        lives_printerr("Try cont.%d  '%s', %d %d\n", j, name,
+                       base + j, base);
+        o->cqinfo.comment = comment;
+        if ((o->leaves[ base + j ] = OSCNewContainer(name,
+                                     o->leaves[ osc_cont[i].att ],
+                                     &(o->cqinfo))) == 0) {
+          lives_printerr("Cannot auto numerate container %s \n",
+                         osc_cont[i].name);
+          return 0;
+
+        }
       }
     }
   }
@@ -6701,84 +6894,78 @@
 }
 
 
-int lives_osc_attach_methods( lives_osc *o ) {
+int lives_osc_attach_methods(lives_osc *o) {
   int i;
 
-  for( i = 0; osc_methods[i].name != NULL ; i ++ ) {
+  for (i = 0; osc_methods[i].name != NULL ; i ++) {
     o->ris.description = osc_methods[i].descr;
-    OSCNewMethod( osc_methods[i].name, 
-		  o->leaves[ osc_methods[i].leave ],
-		  osc_methods[i].cb , 
-		  NULL, // this is the context which is reurned but it seems to be unused
-		  &(o->ris));
-    
-    
+    OSCNewMethod(osc_methods[i].name,
+                 o->leaves[ osc_methods[i].leave ],
+                 osc_methods[i].cb ,
+                 NULL, // this is the context which is reurned but it seems to be unused
+                 &(o->ris));
+
+
   }
   return 1;
-}	
+}
 
 
 
 
 
 /* initialization, setup a UDP socket and invoke OSC magic */
-lives_osc* lives_osc_allocate(int port_id) {
+lives_osc *lives_osc_allocate(int port_id) {
   lives_osc *o;
-  char *tmp;
 
   if (livesOSC==NULL) {
-    o = (lives_osc*)g_malloc(sizeof(lives_osc));
-    //o->osc_args = (osc_arg*)g_malloc(50 * sizeof(*o->osc_args));
+    o = (lives_osc *)lives_malloc(sizeof(lives_osc));
+    //o->osc_args = (osc_arg*)lives_malloc(50 * sizeof(*o->osc_args));
     o->osc_args=NULL;
-    o->rt.InitTimeMemoryAllocator = _lives_osc_time_malloc;
-    o->rt.RealTimeMemoryAllocator = _lives_osc_rt_malloc;
+    o->rt.InitTimeMemoryAllocator = lives_osc_malloc;
+    o->rt.RealTimeMemoryAllocator = lives_osc_malloc;
     o->rt.receiveBufferSize = 1024;
     o->rt.numReceiveBuffers = 100;
     o->rt.numQueuedObjects = 100;
     o->rt.numCallbackListNodes = 200;
-    o->leaves = (OSCcontainer*) g_malloc(sizeof(OSCcontainer) * 1000);
+    o->leaves = (OSCcontainer *) lives_malloc(sizeof(OSCcontainer) * 1000);
     o->t.initNumContainers = 1000;
     o->t.initNumMethods = 2000;
-    o->t.InitTimeMemoryAllocator = lives_size_malloc;
-    o->t.RealTimeMemoryAllocator = lives_size_malloc;
-    
-    if(!OSCInitReceive( &(o->rt))) {
-      d_print( _ ("Cannot initialize OSC receiver\n"));
+    o->t.InitTimeMemoryAllocator = lives_osc_malloc;
+    o->t.RealTimeMemoryAllocator = lives_osc_malloc;
+
+    if (!OSCInitReceive(&(o->rt))) {
+      d_print(_("Cannot initialize OSC receiver\n"));
       return NULL;
-    } 
+    }
     o->packet = OSCAllocPacketBuffer();
 
     /* Top level container / */
     o->container = OSCInitAddressSpace(&(o->t));
-    
-    OSCInitContainerQueryResponseInfo( &(o->cqinfo) );
+
+    OSCInitContainerQueryResponseInfo(&(o->cqinfo));
     o->cqinfo.comment = "Video commands";
-    
-    if( !lives_osc_build_cont( o ))
+
+    if (!lives_osc_build_cont(o))
       return NULL;
-    
-    OSCInitMethodQueryResponseInfo( &(o->ris));
-    
-    
-    if( !lives_osc_attach_methods( o ))
+
+    OSCInitMethodQueryResponseInfo(&(o->ris));
+
+
+    if (!lives_osc_attach_methods(o))
       return NULL;
-  }
-  else o=livesOSC;
+  } else o=livesOSC;
 
   if (port_id>0) {
-    if(NetworkStartUDPServer( o->packet, port_id) != TRUE) {
-      tmp=g_strdup_printf (_ ("WARNING: Cannot start OSC server at UDP port %d\n"),port_id);
-      d_print( tmp);
-      g_free(tmp);
-    }
-    else {
-      d_print( (tmp=g_strdup_printf (_ ("Started OSC server at UDP port %d\n"),port_id)));
-      g_free(tmp);
+    if (NetworkStartUDPServer(o->packet, port_id) != TRUE) {
+      d_print(_("WARNING: Cannot start OSC server at UDP port %d\n"),port_id);
+    } else {
+      d_print(_("Started OSC server at UDP port %d\n"),port_id);
     }
   }
-  
+
   return o;
-}	
+}
 
 
 
@@ -6790,7 +6977,7 @@
   OSCPrintWholeAddressSpace();
 }
 
- 
+
 
 
 // CALL THIS PERIODICALLY, will read all queued messages and call callbacks
@@ -6799,13 +6986,13 @@
 /* get a packet */
 static int lives_osc_get_packet(lives_osc *o) {
   //OSCTimeTag tag;
-  
+
   /* see if there is something to read , this is effectivly NetworkPacketWaiting */
   // if(ioctl( o->sockfd, FIONREAD, &bytes,0 ) == -1) return 0;
   // if(bytes==0) return 0;
-  if(NetworkPacketWaiting(o->packet)) {
+  if (NetworkPacketWaiting(o->packet)) {
     /* yes, receive packet from UDP */
-    if(NetworkReceivePacket(o->packet)) {
+    if (NetworkReceivePacket(o->packet)) {
       /* OSC must accept this packet (OSC will auto-invoke it, see source !) */
       OSCAcceptPacket(o->packet);
 
@@ -6815,8 +7002,8 @@
       /* Is this really productive ? */
       OSCBeProductiveWhileWaiting();
       // here we call the callbacks
-      
-      /* tell caller we had 1 packet */	
+
+      /* tell caller we had 1 packet */
       return 1;
     }
   }
@@ -6849,7 +7036,7 @@
   packet=livesOSC->packet;
 
   oscbuf_to_packet(obuf,packet);
-  
+
   OSCAcceptPacket(packet);
 
   via_shortcut=TRUE;
@@ -6864,9 +7051,9 @@
 
 
 void lives_osc_free(lives_osc *c) {
-  if(c==NULL) return;
-  if(c->leaves) free(c->leaves);
-  if(c) free(c);
+  if (c==NULL) return;
+  if (c->leaves) free(c->leaves);
+  if (c) free(c);
   c = NULL;
 }
 
@@ -6878,20 +7065,17 @@
 
 
 boolean lives_osc_init(uint32_t udp_port) {
-  char *tmp;
 
   if (livesOSC!=NULL&&udp_port!=0) {
     /*  OSCPacketBuffer packet=livesOSC->packet;
-	if (shutdown (packet->returnAddr->sockfd,SHUT_RDWR)) {
-	d_print( g_strdup_printf (_ ("Cannot shut down OSC/UDP server\n"));
-	}
+    if (shutdown (packet->returnAddr->sockfd,SHUT_RDWR)) {
+    d_print( lives_strdup_printf (_("Cannot shut down OSC/UDP server\n"));
+    }
     */
-    if (NetworkStartUDPServer( livesOSC->packet, udp_port) != TRUE) {
-      d_print( (tmp=g_strdup_printf (_ ("Cannot start OSC/UDP server at port %d \n"),udp_port)));
-      g_free(tmp);
+    if (NetworkStartUDPServer(livesOSC->packet, udp_port) != TRUE) {
+      d_print(_("Cannot start OSC/UDP server at port %d \n"),udp_port);
     }
-  }
-  else { 
+  } else {
     livesOSC=lives_osc_allocate(udp_port);
     if (livesOSC==NULL) return FALSE;
     status_socket=NULL;
@@ -6901,7 +7085,7 @@
 }
 
 
-boolean lives_osc_poll(gpointer data) {
+boolean lives_osc_poll(livespointer data) {
   // data is always NULL
   // must return TRUE
   if (!mainw->osc_block&&livesOSC!=NULL) lives_osc_get_packet(livesOSC);
@@ -6910,7 +7094,7 @@
 
 void lives_osc_end(void) {
   if (notify_socket!=NULL) {
-    lives_osc_notify (LIVES_OSC_NOTIFY_QUIT,"");
+    lives_osc_notify(LIVES_OSC_NOTIFY_QUIT,"");
     lives_osc_close_notify_socket();
   }
   if (status_socket!=NULL) {

LiVES-2.2.8.tar.bz2/src/osc.h -> LiVES-2.4.1.tar.bz2/src/osc.h Changed

LiVES-2.2.8.tar.bz2/src/osc_notify.h -> LiVES-2.4.1.tar.bz2/src/osc_notify.h Changed

@@ -12,40 +12,52 @@
 //   sendOSC -host localhost 49999 /lives/open_notify_socket,49997
 //
 // LiVES will then send messages of the form:
-//   msg_number|msg_string 
+//   msg_number|msg_string
 // (msg_string may be of 0 length. The message is terminated with \n\0).
-// when various events happen. The event types are enumerated below. 
+// when various events happen. The event types are enumerated below.
 //
 
 #ifndef HAS_LIVES_OSC_NOTIFY_H
 #define HAS_LIVES_OSC_NOTIFY_H
 
+/** \file osc_notify.h
+ */
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define LIVES_OSC_NOTIFY_FRAME_SYNCH 1 ///< sent when a frame is displayed
 #define LIVES_OSC_NOTIFY_PLAYBACK_STARTED 2 ///< sent when a/v playback starts or clip is switched
 #define LIVES_OSC_NOTIFY_PLAYBACK_STOPPED 3 ///< sent when a/v playback ends
 
-/// sent when a/v playback ends and there is recorded data for 
+/// sent when a/v playback ends and there is recorded data for
 /// rendering/previewing
 #define LIVES_OSC_NOTIFY_PLAYBACK_STOPPED_RD 4
 
-
 #define LIVES_OSC_NOTIFY_RECORD_STARTED 32 ///< sent when record starts (TODO)
 #define LIVES_OSC_NOTIFY_RECORD_STOPPED 33 ///< sent when record stops (TODO)
 
 #define LIVES_OSC_NOTIFY_QUIT 64 ///< sent when app quits
 
-#define LIVES_OSC_NOTIFY_CLIP_OPENED 128  ///< msg_string starts with new clip number
-#define LIVES_OSC_NOTIFY_CLIP_CLOSED 129
+#define LIVES_OSC_NOTIFY_CLIP_OPENED 128  ///< sent after a clip is opened
+#define LIVES_OSC_NOTIFY_CLIP_CLOSED 129 ///< sent after a clip is closed
 
+#define LIVES_OSC_NOTIFY_CLIPSET_OPENED 256 ///< sent after a clip set is opened
+#define LIVES_OSC_NOTIFY_CLIPSET_SAVED 257 ///< sent after a clip set is closed
 
-#define LIVES_OSC_NOTIFY_CLIPSET_OPENED 256 ///< msg_string starts with setname
-#define LIVES_OSC_NOTIFY_CLIPSET_SAVED 257
+#define LIVES_OSC_NOTIFY_SUCCESS 512  ///< for OSC only (not for C++)
+#define LIVES_OSC_NOTIFY_FAILED 1024  ///< for OSC only (not for C++)
+#define LIVES_OSC_NOTIFY_CANCELLED 2048 ///< for OSC only (not for C++)
 
+#define LIVES_OSC_NOTIFY_MODE_CHANGED 4096 ///< mode changed to clip editor or to multitrack
 
-#define LIVES_OSC_NOTIFY_SUCCESS 512
-#define LIVES_OSC_NOTIFY_FAILED 1024
-#define LIVES_OSC_NOTIFY_CANCELLED 2048
+// >= 65536 reserved for custom
 
-#define LIVES_OSC_NOTIFY_MODE_CHANGED 4096 ///< mode changed to clip editor or to multitrack
+
+#ifdef __cplusplus
+}
+#endif
 
 #endif

LiVES-2.2.8.tar.bz2/src/pangotext.c -> LiVES-2.4.1.tar.bz2/src/pangotext.c Changed

@@ -1,7 +1,7 @@
 // pangotext.c
 // text handling code
 // (c) A. Penkov 2010
-// (c) G. Finch 2010 - 2013
+// (c) G. Finch 2010 - 2015
 // pieces of code taken and modified from scribbler.c
 // released under the GNU GPL 3 or later
 // see file COPYING or www.gnu.org for details
@@ -9,8 +9,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <pango/pangocairo.h>
-
 #ifdef HAVE_SYSTEM_WEED
 #include <weed/weed.h>
 #include <weed/weed-palettes.h>
@@ -23,45 +21,51 @@
 #include "../libweed/weed-host.h"
 #endif
 
-#include "support.h"
 #include "main.h"
 #include "pangotext.h"
 
+#ifdef GUI_GTK
+#include <pango/pangocairo.h>
+static int font_cmp(const void *p1, const void *p2);
+#endif
 
-static int font_cmp(const void *p1, const void *p2); 
 
 //
 // code things from scribbler.c
 //
-static void getxypos(PangoLayout *layout, double *px, double *py, int width, int height, int cent, double *pw, double *ph)
-{
+static void getxypos(LingoLayout *layout, double *px, double *py, int width, int height, boolean cent, double *pw, double *ph) {
+  // calc coords of text, text will fit so it goes to bottom. Set cent to center text.
+
+  // width and height are frame width / height in pixels
+  // py, px : return locations for x,y
+  // pw, ph : return locations for pango width, height
+
   int w_, h_;
   double d;
 
   // get size of layout
-  pango_layout_get_size(layout, &w_, &h_);
+  lingo_layout_get_size(layout, &w_, &h_, width, height);
 
   // scale width, height to pixels
-  if(pw)
-    *pw = ((double)w_)/PANGO_SCALE;
-  if(ph)
-    *ph = ((double)h_)/PANGO_SCALE;
+  if (pw)
+    *pw = ((double)w_)/LINGO_SCALE;
+  if (ph)
+    *ph = ((double)h_)/LINGO_SCALE;
 
   // xpos (left or centered)
 
-  if(cent) {
-    d = ((double)w_)/PANGO_SCALE;
+  if (cent) {
+    d = ((double)w_)/LINGO_SCALE;
     d /= 2.0;
     d = (width>>1) - d;
-  }
-  else d = 0.0;
+  } else d = 0.0;
 
   if (px) *px = d;
-  
+
 
   // ypos (adjusted so text goes to bottom)
 
-  d = ((double)h_)/PANGO_SCALE;
+  d = ((double)h_)/LINGO_SCALE;
   d = height - d;
 
   if (py) *py = d;
@@ -76,52 +80,64 @@
 
 
 char **get_font_list(void) {
+  register int i;
   char **font_list = NULL;
+#ifdef GUI_GTK
   PangoContext *ctx;
   ctx = gdk_pango_context_get();
-  if(ctx) {
+  if (ctx) {
     PangoFontMap *pfm;
     pfm = pango_context_get_font_map(ctx);
-    if(pfm) {
+    if (pfm) {
       int num = 0;
       PangoFontFamily **pff = NULL;
       pango_font_map_list_families(pfm, &pff, &num);
-      if(num > 0) {
-        font_list = (char **)g_malloc((num+1)*sizeof(char*));
-        if(font_list) {
-          int i;
-          for(i = 0; i < num; ++i)
+      if (num > 0) {
+        font_list = (char **)lives_malloc((num+1)*sizeof(char *));
+        if (font_list) {
+          for (i = 0; i < num; ++i)
             font_list[i] = strdup(pango_font_family_get_name(pff[i]));
           font_list[num] = NULL;
           qsort(font_list, num, sizeof(char *), font_cmp);
         }
       }
-      g_free(pff);
+      lives_free(pff);
     }
   }
+#endif
+
+#ifdef GUI_QT
+  QFontDatabase qfd;
+  QStringList qsl = qfd.families();
+  font_list = (char **)lives_malloc((qsl.size() + 1) * sizeof(char *));
+  for (i = 0; i < qsl.size(); i++) {
+    font_list[i] = strdup(qsl.at(i).toUtf8().constData());
+  }
+#endif
+
   return font_list;
 }
 
-static int font_cmp(const void *p1, const void *p2) {  
+
+
+#ifdef GUI_GTK
+static int font_cmp(const void *p1, const void *p2) {
   const char *s1 = (const char *)(*(char **)p1);
   const char *s2 = (const char *)(*(char **)p2);
   char *u1 = g_utf8_casefold(s1, -1);
   char *u2 = g_utf8_casefold(s2, -1);
   int ret = strcmp(u1, u2);
-  g_free(u1);
-  g_free(u2);
+  lives_free(u1);
+  lives_free(u2);
   return ret;
 }
+#endif
 
 
 
-
-
-  
-
-PangoLayout *render_text_to_cr (lives_painter_t *cr, const char *text, const char *fontname,
-				double size, lives_text_mode_t mode, lives_colRGBA32_t *fg, lives_colRGBA32_t *bg,
-				boolean center, boolean rising, double top, int offs_x, int width, int height) {
+LingoLayout *render_text_to_cr(lives_painter_t *cr, const char *text, const char *fontname,
+                               double size, lives_text_mode_t mode, lives_colRGBA32_t *fg, lives_colRGBA32_t *bg,
+                               boolean center, boolean rising, double top, int offs_x, int width, int height) {
 
   // fontname may be eg. "Sans"
 
@@ -130,12 +146,13 @@
   // if "rising" is FALSE,  "top" (0.0 -> 1.0) is used
 
   // xpos:
-  // aligned to left, unless "center" is TRUE
-
+  // aligned to left (offs_x), unless "center" is TRUE
 
+#ifdef GUI_GTK
   PangoFontDescription *font;
+#endif
 
-  PangoLayout *layout;
+  LingoLayout *layout;
 
   double x_pos, y_pos;
   double x_text, y_text;
@@ -144,42 +161,46 @@
   double b_alpha=1.;
   double f_alpha=1.;
 
-
   if (bg!=NULL) b_alpha=(double)bg->alpha/65535.;
   if (fg!=NULL) f_alpha=(double)fg->alpha/65535.;
 
   if (cr==NULL) return NULL;
 
+#ifdef GUI_GTK
   layout = pango_cairo_create_layout(cr);
-  
   if (layout==NULL) return NULL;
 
   font = pango_font_description_new();
   pango_font_description_set_family(font, fontname);
   pango_font_description_set_absolute_size(font, size*PANGO_SCALE);
-    
+
   pango_layout_set_font_description(layout, font);
   pango_layout_set_text(layout, text, -1);
+#endif
+
+#ifdef GUI_QT
+  layout = new LingoLayout(text, fontname, size);
+#endif
 
   getxypos(layout, &x_pos, &y_pos, width, height, center, &dwidth, &dheight);
-    
+
   if (!rising) y_pos = y_text = height*top;
 
   if (!center) x_pos+=offs_x;
-    
+
   x_text = x_pos;
   y_text = y_pos;
-    
-  if (center) pango_layout_set_alignment(layout, PANGO_ALIGN_CENTER);
-  else pango_layout_set_alignment(layout, PANGO_ALIGN_LEFT);
 
-  lives_painter_new_path(cr);
+  /*  lives_painter_new_path(cr);
   lives_painter_rectangle(cr,offs_x,0,width,height);
-  lives_painter_clip(cr);
-    
-  switch(mode) {
+  lives_painter_clip(cr);*/
+
+  if (center) lingo_layout_set_alignment(layout, LINGO_ALIGN_CENTER);
+  else lingo_layout_set_alignment(layout, LINGO_ALIGN_LEFT);
+
+  switch (mode) {
   case LIVES_TEXT_MODE_BACKGROUND_ONLY:
-    pango_layout_set_text(layout, "", -1);
+    lingo_layout_set_text(layout, "", -1);
   case LIVES_TEXT_MODE_FOREGROUND_AND_BACKGROUND:
     lives_painter_set_source_rgba(cr,bg->red/66535., bg->green/66535., bg->blue/66535., b_alpha);
     fill_bckg(cr, x_pos, y_pos, dwidth, dheight);
@@ -191,7 +212,14 @@
   lives_painter_new_path(cr);
   lives_painter_move_to(cr, x_text, y_text);
   lives_painter_set_source_rgba(cr,fg->red/66535., fg->green/66535., fg->blue/66535., f_alpha);
+
+#ifdef GUI_QT
+  lingo_layout_set_coords(layout, x_pos, y_pos, dwidth, dheight);
+#endif
+
+#ifdef GUI_GTK
   pango_font_description_free(font);
+#endif
 
   return layout;
 }
@@ -201,8 +229,8 @@
 
 
 weed_plant_t *render_text_to_layer(weed_plant_t *layer, const char *text, const char *fontname,
-  double size, lives_text_mode_t mode, lives_colRGBA32_t *fg_col, lives_colRGBA32_t *bg_col,
-  boolean center, boolean rising, double top) {
+                                   double size, lives_text_mode_t mode, lives_colRGBA32_t *fg_col, lives_colRGBA32_t *bg_col,
+                                   boolean center, boolean rising, double top) {
   // render text to layer and return a new layer, which may have a new "rowstrides", "width" and/or "current_palette"
   // original layer is freed in the process and should not be used
 
@@ -212,20 +240,22 @@
 
   void *src;
 
-  PangoLayout *layout;
+  LingoLayout *layout;
 
   int width, height, error;
 
   width=weed_get_int_value(layer,"width",&error);
   height=weed_get_int_value(layer,"height",&error);
- 
+
   // do cairo and pango things
 
   cr=layer_to_lives_painter(layer);
   if (cr==NULL) return layer; ///< error occured
 
   layout = render_text_to_cr(cr,text,fontname,size,mode,fg_col,bg_col,center,rising,top,0,width,height);
-  pango_cairo_show_layout(cr, layout);
+
+  lingo_painter_show_layout(cr, layout);
+
   // do not !!
   //lives_painter_paint(cr);
 
@@ -234,8 +264,8 @@
   if (layout) lives_object_unref(layout);
 
   surface=lives_painter_get_target(cr);
-  src=lives_painter_image_surface_get_data (surface);
-  g_free(src);
+  src=lives_painter_image_surface_get_data(surface);
+  lives_free(src);
   lives_painter_destroy(cr);
   return layer;
 }
@@ -259,43 +289,42 @@
 
   int64_t curpos;
 
-  if(!pf || !title)
-    return(FALSE);
+  if (!pf || !title)
+    return NULL;
 
   curpos=ftell(pf);
 
-  if(fseek(pf, title->textpos, SEEK_SET) == -1)
-    return(FALSE);
+  if (fseek(pf, title->textpos, SEEK_SET) == -1)
+    return NULL;
 
-  while(fgets(data, sizeof(data)-1, pf)) {
+  while (fgets(data, sizeof(data)-1, pf)) {
     // remove \n \r
     poslf = strstr(data, lf_str);
-    if(poslf)
+    if (poslf)
       *poslf = '\0';
     poscr = strstr(data, cr_str);
-    if(poscr)
+    if (poscr)
       *poscr = '\0';
     curlen = strlen(data);
-    if(!curlen)
+    if (!curlen)
       break;
     strcat(data,"\n");
     curlen = strlen(data);
-    if(!ret) {
-      ret = (char *)g_malloc(curlen+1);
-      if(ret)
+    if (!ret) {
+      ret = (char *)lives_malloc(curlen+1);
+      if (ret)
         strcpy(ret, data);
       else {
-	fseek(pf, curpos, SEEK_SET);
-        return(FALSE);
+        fseek(pf, curpos, SEEK_SET);
+        return NULL;
       }
-    }
-    else {
-      ret = (char *)g_realloc(ret, curlen+1+strlen(ret));
-      if(ret)
+    } else {
+      ret = (char *)lives_realloc(ret, curlen+1+strlen(ret));
+      if (ret)
         strcat(ret, data);
       else {
-	fseek(pf, curpos, SEEK_SET);
-        return(FALSE);
+        fseek(pf, curpos, SEEK_SET);
+        return NULL;
       }
     }
   }
@@ -315,48 +344,47 @@
 
   int64_t curpos;
 
-  if(!pf || !title)
-    return(FALSE);
+  if (!pf || !title)
+    return NULL;
 
   curpos=ftell(pf);
 
-  if(fseek(pf, title->textpos, SEEK_SET) == -1)
-    return(FALSE);
+  if (fseek(pf, title->textpos, SEEK_SET) == -1)
+    return NULL;
 
-  while(fgets(data, sizeof(data)-1, pf)) {
+  while (fgets(data, sizeof(data)-1, pf)) {
     // remove \n \r
     poslf = strstr(data, lf_str);
-    if(poslf)
+    if (poslf)
       *poslf = '\0';
     poscr = strstr(data, cr_str);
-    if(poscr)
+    if (poscr)
       *poscr = '\0';
     curlen = strlen(data);
-    if(!curlen)
+    if (!curlen)
       break;
     strcat(data,"\n");
-    if(!ret) {
+    if (!ret) {
       ret = subst(data,"[br]","\n");
-      if(!ret) {
-	fseek(pf, curpos, SEEK_SET);
-        return(FALSE);
+      if (!ret) {
+        fseek(pf, curpos, SEEK_SET);
+        return NULL;
       }
-    }
-    else {
+    } else {
       retmore = subst(data,"[br]","\n");
-      if(!retmore) {
-	fseek(pf, curpos, SEEK_SET);
-        return(FALSE);
+      if (!retmore) {
+        fseek(pf, curpos, SEEK_SET);
+        return NULL;
       }
-      ret = (char *)g_realloc(ret, strlen(retmore)+1+strlen(ret));
-      if(ret)
+      ret = (char *)lives_realloc(ret, strlen(retmore)+1+strlen(ret));
+      if (ret)
         strcat(ret, retmore);
       else {
-	fseek(pf, curpos, SEEK_SET);
-        g_free(retmore);
-        return(FALSE);
+        fseek(pf, curpos, SEEK_SET);
+        lives_free(retmore);
+        return NULL;
       }
-      g_free(retmore);
+      lives_free(retmore);
     }
   }
 
@@ -389,41 +417,41 @@
   FILE *pf = NULL;
   char data[32768];
 
-  if(!sfile)
-    return (FALSE);
+  if (!sfile)
+    return  FALSE;
 
-  if(!sfile->subt)
-    return (FALSE);
+  if (!sfile->subt)
+    return  FALSE;
 
   curr = sfile->subt->current;
 
-  if(curr && (curr->start_time <= xtime) && (curr->end_time >= xtime))
+  if (curr && (curr->start_time <= xtime) && (curr->end_time >= xtime))
     return (TRUE);
 
   if (sfile->subt->last_time!=-1. && xtime>sfile->subt->last_time) {
     // past end of subtitles
-    if (sfile->subt->text!=NULL) g_free(sfile->subt->text);
+    if (sfile->subt->text!=NULL) lives_free(sfile->subt->text);
     sfile->subt->text=NULL;
     sfile->subt->current=NULL;
     return TRUE;
   }
 
 
-  if(curr && (curr->start_time <= xtime))
+  if (curr && (curr->start_time <= xtime))
     index_ptr = index_prev = index = curr;
   else
     index_ptr = index_prev = index = sfile->subt->index;
 
-  while(index_ptr) {
-    if(index_ptr->start_time > xtime) {
-      if (sfile->subt->text!=NULL) g_free(sfile->subt->text);
+  while (index_ptr) {
+    if (index_ptr->start_time > xtime) {
+      if (sfile->subt->text!=NULL) lives_free(sfile->subt->text);
       sfile->subt->text=NULL;
       sfile->subt->current = NULL;
       return (TRUE);
     }
-    if(index_ptr->end_time >= xtime) {
+    if (index_ptr->end_time >= xtime) {
       sfile->subt->current = index_ptr;
-      if (sfile->subt->text!=NULL) g_free(sfile->subt->text);
+      if (sfile->subt->text!=NULL) lives_free(sfile->subt->text);
       sfile->subt->text=srt_read_text(sfile->subt->tfile,sfile->subt->current);
       return (TRUE);
     }
@@ -433,7 +461,7 @@
 
   pf = sfile->subt->tfile;
 
-  while(fgets(data,sizeof(data), pf)) {
+  while (fgets(data,sizeof(data), pf)) {
     char *poslf = NULL, *poscr = NULL;
     int hstart, mstart, sstart, fstart;
     int hend, mend, send, fend;
@@ -444,76 +472,75 @@
     // data contains subtitle number
     //
 
-    if(!fgets(data,sizeof(data), pf)) {
+    if (!fgets(data,sizeof(data), pf)) {
       // EOF
-      if (sfile->subt->text!=NULL) g_free(sfile->subt->text);
+      if (sfile->subt->text!=NULL) lives_free(sfile->subt->text);
       sfile->subt->text=NULL;
       sfile->subt->current=NULL;
       sub_get_last_time(sfile->subt);
-      return(FALSE);
+      return FALSE;
     }
     //
     // data contains time range
     //
     // remove \n \r
     poslf = strstr(data, lf_str);
-    if(poslf)
+    if (poslf)
       *poslf = '\0';
     poscr = strstr(data, cr_str);
-    if(poscr)
+    if (poscr)
       *poscr = '\0';
 
     // try to parse it (time range)
     i = sscanf(data,"%d:%d:%d,%d --> %d:%d:%d,%d",\
                &hstart, &mstart, &sstart, &fstart,\
                &hend, &mend, &send, &fend);
-    if(i == 8) {
+    if (i == 8) {
       // parsing ok
-        starttime = hstart*3600 + mstart*60 + sstart + fstart/1000.;
-        endtime = hend*3600 + mend*60 + send + fend/1000.;
-        node = (lives_subtitle_t *)g_malloc(sizeof(lives_subtitle_t));
-        if(node) {
-          node->start_time = starttime;
-          node->end_time = endtime;
-          node->style = NULL;
-          node->next = NULL;
-          node->prev = (lives_subtitle_t *)index_prev;
-	  node->textpos=ftell(pf);
-          if(index_prev)
-            index_prev->next = (lives_subtitle_t *)node;
-          else
-            sfile->subt->index = node;
-          index_prev = (lives_subtitle_t *)node;
-        }
-        while(fgets(data, sizeof(data), pf)) {
-          // read the text and final empty line
-          // remove \n \r
-          poslf = strstr(data, lf_str);
-          if(poslf)
+      starttime = hstart*3600 + mstart*60 + sstart + fstart/1000.;
+      endtime = hend*3600 + mend*60 + send + fend/1000.;
+      node = (lives_subtitle_t *)lives_malloc(sizeof(lives_subtitle_t));
+      if (node) {
+        node->start_time = starttime;
+        node->end_time = endtime;
+        node->style = NULL;
+        node->next = NULL;
+        node->prev = (lives_subtitle_t *)index_prev;
+        node->textpos=ftell(pf);
+        if (index_prev)
+          index_prev->next = (lives_subtitle_t *)node;
+        else
+          sfile->subt->index = node;
+        index_prev = (lives_subtitle_t *)node;
+      }
+      while (fgets(data, sizeof(data), pf)) {
+        // read the text and final empty line
+        // remove \n \r
+        poslf = strstr(data, lf_str);
+        if (poslf)
           *poslf = '\0';
-          poscr = strstr(data, cr_str);
-          if(poscr)
-           *poscr = '\0';
-
-          if (!strlen(data)) break;
-	} // end while
-
-       if(node) {
-         if(node->start_time > xtime) {
-	   if (sfile->subt->text!=NULL) g_free(sfile->subt->text);
-	   sfile->subt->text=NULL;
-           sfile->subt->current = NULL;
-	   return TRUE;
-	 }
-         if(node->end_time >= xtime) {
-	   if (sfile->subt->text!=NULL) g_free(sfile->subt->text);
-           sfile->subt->current = node;
-	   sfile->subt->text=srt_read_text(sfile->subt->tfile,sfile->subt->current);
-	   return TRUE;
-	 }
-       }
-    }
-    else {
+        poscr = strstr(data, cr_str);
+        if (poscr)
+          *poscr = '\0';
+
+        if (!strlen(data)) break;
+      } // end while
+
+      if (node) {
+        if (node->start_time > xtime) {
+          if (sfile->subt->text!=NULL) lives_free(sfile->subt->text);
+          sfile->subt->text=NULL;
+          sfile->subt->current = NULL;
+          return TRUE;
+        }
+        if (node->end_time >= xtime) {
+          if (sfile->subt->text!=NULL) lives_free(sfile->subt->text);
+          sfile->subt->current = node;
+          sfile->subt->text=srt_read_text(sfile->subt->tfile,sfile->subt->current);
+          return TRUE;
+        }
+      }
+    } else {
       // What to do here ? Probably wrong format
       continue;
     }
@@ -521,10 +548,10 @@
 
   // EOF
   sfile->subt->current=NULL;
-  if (sfile->subt->text!=NULL) g_free(sfile->subt->text);
+  if (sfile->subt->text!=NULL) lives_free(sfile->subt->text);
   sfile->subt->text=NULL;
   sub_get_last_time(sfile->subt);
-  return (FALSE);
+  return FALSE;
 }
 
 
@@ -540,41 +567,41 @@
   char data[32768];
   boolean starttext;
 
-  if(!sfile)
-    return (FALSE);
+  if (!sfile)
+    return  FALSE;
 
-  if(!sfile->subt)
-    return (FALSE);
+  if (!sfile->subt)
+    return  FALSE;
 
   curr = sfile->subt->current;
 
-  if(curr && (curr->start_time <= xtime) && (curr->end_time >= xtime))
+  if (curr && (curr->start_time <= xtime) && (curr->end_time >= xtime))
     return (TRUE);
 
   if (sfile->subt->last_time!=-1. && xtime>sfile->subt->last_time) {
     // past end of subtitles
-    if (sfile->subt->text!=NULL) g_free(sfile->subt->text);
+    if (sfile->subt->text!=NULL) lives_free(sfile->subt->text);
     sfile->subt->text=NULL;
     sfile->subt->current=NULL;
     return TRUE;
   }
 
 
-  if(curr && (curr->start_time <= xtime))
+  if (curr && (curr->start_time <= xtime))
     index_ptr = index_prev = index = curr;
   else
     index_ptr = index_prev = index = sfile->subt->index;
 
-  while(index_ptr) {
-    if(index_ptr->start_time > xtime) {
-      if (sfile->subt->text!=NULL) g_free(sfile->subt->text);
+  while (index_ptr) {
+    if (index_ptr->start_time > xtime) {
+      if (sfile->subt->text!=NULL) lives_free(sfile->subt->text);
       sfile->subt->text=NULL;
       sfile->subt->current = NULL;
       return (TRUE);
     }
-    if(index_ptr->end_time >= xtime) {
+    if (index_ptr->end_time >= xtime) {
       sfile->subt->current = index_ptr;
-      if (sfile->subt->text!=NULL) g_free(sfile->subt->text);
+      if (sfile->subt->text!=NULL) lives_free(sfile->subt->text);
       sfile->subt->text=sub_read_text(sfile->subt->tfile,sfile->subt->current);
       return (TRUE);
     }
@@ -586,20 +613,20 @@
 
   starttext = (sfile->subt->index!=NULL);
 
-  while(fgets(data,sizeof(data), pf)) {
+  while (fgets(data,sizeof(data), pf)) {
     char *poslf = NULL, *poscr = NULL;
     int hstart, mstart, sstart, fstart;
     int hend, mend, send, fend;
     int i;
     double starttime, endtime;
 
-    if(!strncmp(data, "[SUBTITLE]", 10)) {
+    if (!strncmp(data, "[SUBTITLE]", 10)) {
       starttext = TRUE;
     }
 
-    if(!starttext) {
-      if(!strncmp(data,"[DELAY]",7)) {
-	sfile->subt->offset=atoi(data+7);
+    if (!starttext) {
+      if (!strncmp(data,"[DELAY]",7)) {
+        sfile->subt->offset=atoi(data+7);
       }
       continue;
     }
@@ -609,73 +636,72 @@
     //
     // remove \n \r
     poslf = strstr(data, lf_str);
-    if(poslf)
+    if (poslf)
       *poslf = '\0';
     poscr = strstr(data, cr_str);
-    if(poscr)
+    if (poscr)
       *poscr = '\0';
 
     // try to parse it (time range)
     i = sscanf(data,"%d:%d:%d.%d,%d:%d:%d.%d",\
                &hstart, &mstart, &sstart, &fstart,\
                &hend, &mend, &send, &fend);
-    if(i == 8) {
+    if (i == 8) {
       // parsing ok
-        starttime = hstart*3600 + mstart*60 + sstart + fstart/100.;
-        endtime = hend*3600 + mend*60 + send + fend/100.;
-        node = (lives_subtitle_t *)g_malloc(sizeof(lives_subtitle_t));
-        if(node) {
-          node->start_time = starttime;
-          node->end_time = endtime;
-          node->style = NULL;
-          node->next = NULL;
-          node->prev = (lives_subtitle_t *)index_prev;
-	  node->textpos=ftell(pf);
-          if(index_prev)
-            index_prev->next = (lives_subtitle_t *)node;
-          else
-            sfile->subt->index = node;
-          index_prev = (lives_subtitle_t *)node;
-        }
-        while(fgets(data, sizeof(data), pf)) {
-          // read the text and final empty line
-          // remove \n \r
-          poslf = strstr(data, lf_str);
-          if(poslf)
+      starttime = hstart*3600 + mstart*60 + sstart + fstart/100.;
+      endtime = hend*3600 + mend*60 + send + fend/100.;
+      node = (lives_subtitle_t *)lives_malloc(sizeof(lives_subtitle_t));
+      if (node) {
+        node->start_time = starttime;
+        node->end_time = endtime;
+        node->style = NULL;
+        node->next = NULL;
+        node->prev = (lives_subtitle_t *)index_prev;
+        node->textpos=ftell(pf);
+        if (index_prev)
+          index_prev->next = (lives_subtitle_t *)node;
+        else
+          sfile->subt->index = node;
+        index_prev = (lives_subtitle_t *)node;
+      }
+      while (fgets(data, sizeof(data), pf)) {
+        // read the text and final empty line
+        // remove \n \r
+        poslf = strstr(data, lf_str);
+        if (poslf)
           *poslf = '\0';
-          poscr = strstr(data, cr_str);
-          if(poscr)
-           *poscr = '\0';
-
-          if (!strlen(data)) break;
-	} // end while
-
-       if(node) {
-         if(node->start_time > xtime) {
-	   if (sfile->subt->text!=NULL) g_free(sfile->subt->text);
-	   sfile->subt->text=NULL;
-           sfile->subt->current = NULL;
-	   return TRUE;
-	 }
-         if(node->end_time >= xtime) {
-	   if (sfile->subt->text!=NULL) g_free(sfile->subt->text);
-           sfile->subt->current = node;
-	   sfile->subt->text=sub_read_text(sfile->subt->tfile,sfile->subt->current);
-	   return TRUE;
-	 }
-       }
-    }
-    else {
+        poscr = strstr(data, cr_str);
+        if (poscr)
+          *poscr = '\0';
+
+        if (!strlen(data)) break;
+      } // end while
+
+      if (node) {
+        if (node->start_time > xtime) {
+          if (sfile->subt->text!=NULL) lives_free(sfile->subt->text);
+          sfile->subt->text=NULL;
+          sfile->subt->current = NULL;
+          return TRUE;
+        }
+        if (node->end_time >= xtime) {
+          if (sfile->subt->text!=NULL) lives_free(sfile->subt->text);
+          sfile->subt->current = node;
+          sfile->subt->text=sub_read_text(sfile->subt->tfile,sfile->subt->current);
+          return TRUE;
+        }
+      }
+    } else {
       continue;
     }
   }
 
   // EOF
   sfile->subt->current=NULL;
-  if (sfile->subt->text!=NULL) g_free(sfile->subt->text);
+  if (sfile->subt->text!=NULL) lives_free(sfile->subt->text);
   sfile->subt->text=NULL;
   sub_get_last_time(sfile->subt);
-  return (FALSE);
+  return TRUE;
 }
 
 ///
@@ -685,25 +711,25 @@
   if (sfile->subt==NULL) return;
 
   if (sfile->subt->tfile!=NULL) fclose(sfile->subt->tfile);
- 
+
   // remove subt->index entries
-  while(sfile->subt->index) {
+  while (sfile->subt->index) {
     lives_subtitle_t *to_delete = sfile->subt->index;
 
     sfile->subt->index = (lives_subtitle_t *)sfile->subt->index->next;
 
-    if(to_delete->style != NULL) g_free(to_delete->style);
-    g_free(to_delete);    
-  } 
+    if (to_delete->style != NULL) lives_free(to_delete->style);
+    lives_free(to_delete);
+  }
 
-  if (sfile->subt->text!=NULL) g_free(sfile->subt->text);
+  if (sfile->subt->text!=NULL) lives_free(sfile->subt->text);
 
-  g_free (sfile->subt);
+  lives_free(sfile->subt);
   sfile->subt=NULL;
 }
 
 
-boolean subtitles_init(lives_clip_t *sfile, char * fname, lives_subtitle_type_t subtype) {
+boolean subtitles_init(lives_clip_t *sfile, char *fname, lives_subtitle_type_t subtype) {
   // fname is the name of the subtitle file
   FILE *tfile;
 
@@ -715,7 +741,7 @@
 
   if ((tfile=fopen(fname,"r"))==NULL) return FALSE;
 
-  sfile->subt=(lives_subtitles_t *)g_malloc(sizeof(lives_subtitles_t));
+  sfile->subt=(lives_subtitles_t *)lives_malloc(sizeof(lives_subtitles_t));
 
   sfile->subt->tfile=tfile;
 
@@ -741,13 +767,13 @@
   s = (ntim-h*3600-m*60);
   if (fix==3) ms = (int)((tim-ntim)*1000.0+.5);
   else ms = (int)((tim-ntim)*100.0+.5); // hundredths
-  if(ph)
+  if (ph)
     *ph = h;
-  if(pmin)
+  if (pmin)
     *pmin = m;
-  if(psec)
+  if (psec)
     *psec = s;
-  if(pmsec)
+  if (pmsec)
     *pmsec = ms;
 }
 
@@ -757,36 +783,36 @@
   FILE *pf;
   int num_saves;
   lives_subtitle_t *ptr = NULL;
- 
-  if(!sfile)
-    return(FALSE);
+
+  if (!sfile)
+    return FALSE;
   subt = sfile->subt;
-  if(!subt)
-    return(FALSE);
-  if(subt->last_time <= -1.)
+  if (!subt)
+    return FALSE;
+  if (subt->last_time <= -1.)
     get_srt_text(sfile, end_time);
-  if(subt->last_time <= -1.)
+  if (subt->last_time <= -1.)
     savepos = ftell(subt->tfile);
 
   // save the contents
   pf = fopen(filename, "w");
-  if(!pf)
-    return(FALSE);
+  if (!pf)
+    return FALSE;
   num_saves = 0;
   ptr = subt->index;
-  while(ptr) {
+  while (ptr) {
     char *text = NULL;
-    if(ptr->start_time < end_time && ptr->end_time >= start_time) {
+    if (ptr->start_time < end_time && ptr->end_time >= start_time) {
       text = srt_read_text(subt->tfile, ptr);
-      if(text) {
+      if (text) {
         int h, m, s, ms;
         double dtim;
 
-	if (num_saves>0) fprintf(pf,"\n");
+        if (num_saves>0) fprintf(pf,"\n");
 
         fprintf(pf, "%d\n", ++num_saves);
 
-	dtim = ptr->start_time;
+        dtim = ptr->start_time;
         if (dtim < start_time) dtim=start_time;
         dtim += offset_time;
 
@@ -801,21 +827,20 @@
         fprintf(pf, "%02d:%02d:%02d,%03d\n", h, m, s, ms);
 
         fprintf(pf, "%s", text);
-        g_free(text);
+        lives_free(text);
       }
-    }
-    else if (ptr->start_time>=end_time) break;
+    } else if (ptr->start_time>=end_time) break;
     ptr = (lives_subtitle_t *)ptr->next;
   }
 
   fclose(pf);
-  if(!num_saves) // don't keep the empty file
+  if (!num_saves) // don't keep the empty file
     unlink(filename);
 
-  if(subt->last_time <= -1.)
+  if (subt->last_time <= -1.)
     fseek(subt->tfile, savepos, SEEK_SET);
 
-  return(TRUE);
+  return TRUE;
 }
 
 boolean save_sub_subtitles(lives_clip_t *sfile, double start_time, double end_time, double offset_time, const char *filename) {
@@ -824,21 +849,21 @@
   FILE *pf;
   int num_saves;
   lives_subtitle_t *ptr = NULL;
- 
-  if(!sfile)
-    return(FALSE);
+
+  if (!sfile)
+    return FALSE;
   subt = sfile->subt;
-  if(!subt)
-    return(FALSE);
-  if(subt->last_time <= -1.)
+  if (!subt)
+    return FALSE;
+  if (subt->last_time <= -1.)
     get_sub_text(sfile, end_time);
-  if(subt->last_time <= -1.)
+  if (subt->last_time <= -1.)
     savepos = ftell(subt->tfile);
 
   // save the contents
   pf = fopen(filename, "w");
-  if(!pf)
-    return(FALSE);
+  if (!pf)
+    return FALSE;
   num_saves = 0;
   ptr = subt->index;
 
@@ -853,53 +878,52 @@
   fprintf(pf, "[SUBTITLE]\n");
 
 
-  while(ptr) {
+  while (ptr) {
     char *text = NULL;
     char *br_text = NULL;
-    if(ptr->start_time < end_time && ptr->end_time >= start_time) {
+    if (ptr->start_time < end_time && ptr->end_time >= start_time) {
       text = sub_read_text(subt->tfile, ptr);
-      if(text) {
+      if (text) {
         int h, m, s, ms;
         double dtim;
 
-	if (!strncmp(text+strlen(text)-1,"\n",1)) memset(text+strlen(text)-1,0,1);
+        if (!strncmp(text+strlen(text)-1,"\n",1)) memset(text+strlen(text)-1,0,1);
 
         br_text = subst(text, "\n", "[br]");
-        if(br_text) {
-	  if (num_saves>0) fprintf(pf,"\n");
+        if (br_text) {
+          if (num_saves>0) fprintf(pf,"\n");
 
-	  dtim = ptr->start_time;
-	  if (dtim < start_time) dtim=start_time;
-	  dtim += offset_time;
+          dtim = ptr->start_time;
+          if (dtim < start_time) dtim=start_time;
+          dtim += offset_time;
 
           parse_double_time(dtim, &h, &m, &s, &ms, 2);
           fprintf(pf, "%02d:%02d:%02d.%02d,", h, m, s, ms);
 
-	  dtim = ptr->end_time;
-	  if (dtim > end_time) dtim=end_time;
-	  dtim += offset_time;
+          dtim = ptr->end_time;
+          if (dtim > end_time) dtim=end_time;
+          dtim += offset_time;
 
           parse_double_time(dtim, &h, &m, &s, &ms, 2);
           fprintf(pf, "%02d:%02d:%02d.%02d\n", h, m, s, ms);
           fprintf(pf, "%s\n", br_text);
-          g_free(br_text);
+          lives_free(br_text);
           num_saves++;
         }
-        g_free(text);
+        lives_free(text);
       }
-    }
-    else if (ptr->start_time>=end_time) break;
+    } else if (ptr->start_time>=end_time) break;
     ptr = (lives_subtitle_t *)ptr->next;
   }
 
   fclose(pf);
-  if(!num_saves) // don't keep the empty file
+  if (!num_saves) // don't keep the empty file
     unlink(filename);
 
-  if(subt->last_time <= -1.)
+  if (subt->last_time <= -1.)
     fseek(subt->tfile, savepos, SEEK_SET);
 
-  return(TRUE);
+  return TRUE;
 
 }

LiVES-2.2.8.tar.bz2/src/pangotext.h -> LiVES-2.4.1.tar.bz2/src/pangotext.h Changed

@@ -5,7 +5,7 @@
 // released under the GNU GPL 3 or later
 // see file COPYING or www.gnu.org for details
 
-// (c) G. Finch 2002 - 2013
+// (c) G. Finch 2002 - 2015
 
 #ifndef LIVES_PANGOTEXT_H
 #define LIVES_PANGOTEXT_H
@@ -57,12 +57,12 @@
 char **get_font_list(void);
 
 weed_plant_t *render_text_to_layer(weed_plant_t *layer, const char *text, const char *fontname,
-				   double size, lives_text_mode_t mode, lives_colRGBA32_t *fg_col, 
-				   lives_colRGBA32_t *bg_col, boolean center, boolean rising, double top);
+                                   double size, lives_text_mode_t mode, lives_colRGBA32_t *fg_col,
+                                   lives_colRGBA32_t *bg_col, boolean center, boolean rising, double top);
 
-PangoLayout *render_text_to_cr (lives_painter_t *, const char *text, const char *fontname,
-				double size, lives_text_mode_t mode, lives_colRGBA32_t *fg_col, lives_colRGBA32_t *bg_col,
-				boolean center, boolean rising, double top, int start, int width, int height);
+LingoLayout *render_text_to_cr(lives_painter_t *, const char *text, const char *fontname,
+                               double size, lives_text_mode_t mode, lives_colRGBA32_t *fg_col, lives_colRGBA32_t *bg_col,
+                               boolean center, boolean rising, double top, int start, int width, int height);
 
 #endif

LiVES-2.2.8.tar.bz2/src/paramspecial.c -> LiVES-2.4.1.tar.bz2/src/paramspecial.c Changed

@@ -7,6 +7,7 @@
 // dynamic window generation from parameter arrays :-)
 // special widgets
 
+
 #ifdef HAVE_SYSTEM_WEED
 #include <weed/weed.h>
 #include <weed/weed-palettes.h>
@@ -26,11 +27,11 @@
 
 static lives_special_aspect_t aspect;
 static lives_special_framedraw_rect_t framedraw;
-static GList *fileread;
-static GList *passwd_widgets;
+static LiVESList *fileread;
+static LiVESList *passwd_widgets;
 
 
-void init_special (void) {
+void init_special(void) {
   framedraw.type=LIVES_PARAM_SPECIAL_TYPE_NONE;
   aspect.width_param=aspect.height_param=NULL;
   aspect.checkbutton=NULL;
@@ -48,8 +49,8 @@
 
 
 
-void add_to_special (const gchar *sp_string, lives_rfx_t *rfx) {
-  gchar **array=g_strsplit (sp_string,"|",-1);
+void add_to_special(const char *sp_string, lives_rfx_t *rfx) {
+  char **array=lives_strsplit(sp_string,"|",-1);
   int num_widgets=get_token_count(sp_string,'|')-2;
   int pnum;
 
@@ -58,103 +59,96 @@
   // TODO - assert only one of each of these
 
 
-  if (!strcmp (array[0],"aspect")) {
+  if (!strcmp(array[0],"aspect")) {
     aspect.width_param=&rfx->params[atoi(array[1])];
     aspect.height_param=&rfx->params[atoi(array[2])];
-  }
-  else if (!strcmp (array[0],"mergealign")) {
+  } else if (!strcmp(array[0],"mergealign")) {
     // align start/end
     /*    if (fx_dialog[1]!=NULL) {
-      g_strfreev(array);
+      lives_strfreev(array);
       return;
       }*/
     mergealign.start_param=&rfx->params[atoi(array[1])];
     mergealign.end_param=&rfx->params[atoi(array[2])];
     mergealign.rfx=rfx;
-  }
-  else if (!strcmp (array[0],"framedraw")) {
+  } else if (!strcmp(array[0],"framedraw")) {
     if (fx_dialog[1]!=NULL) {
-      g_strfreev(array);
+      lives_strfreev(array);
       return;
     }
     framedraw.rfx=rfx;
-    if (!strcmp (array[1],"rectdemask")) {
+    if (!strcmp(array[1],"rectdemask")) {
       framedraw.type=LIVES_PARAM_SPECIAL_TYPE_RECT_DEMASK;
-      framedraw.xstart_param=&rfx->params[atoi (array[2])];
-      framedraw.ystart_param=&rfx->params[atoi (array[3])];
-      framedraw.xend_param=&rfx->params[atoi (array[4])];
-      framedraw.yend_param=&rfx->params[atoi (array[5])];
+      framedraw.xstart_param=&rfx->params[atoi(array[2])];
+      framedraw.ystart_param=&rfx->params[atoi(array[3])];
+      framedraw.xend_param=&rfx->params[atoi(array[4])];
+      framedraw.yend_param=&rfx->params[atoi(array[5])];
       framedraw.stdwidgets=4;
-    }
-    else if (!strcmp (array[1],"multrect")) {
+    } else if (!strcmp(array[1],"multrect")) {
       framedraw.type=LIVES_PARAM_SPECIAL_TYPE_RECT_MULTRECT;
-      framedraw.xstart_param=&rfx->params[atoi (array[2])];
-      framedraw.ystart_param=&rfx->params[atoi (array[3])];
-      framedraw.xend_param=&rfx->params[atoi (array[4])];
-      framedraw.yend_param=&rfx->params[atoi (array[5])];
+      framedraw.xstart_param=&rfx->params[atoi(array[2])];
+      framedraw.ystart_param=&rfx->params[atoi(array[3])];
+      framedraw.xend_param=&rfx->params[atoi(array[4])];
+      framedraw.yend_param=&rfx->params[atoi(array[5])];
       framedraw.stdwidgets=4;
-    }
-    else if (!strcmp (array[1],"multirect")) {
+    } else if (!strcmp(array[1],"multirect")) {
       framedraw.type=LIVES_PARAM_SPECIAL_TYPE_RECT_MULTIRECT;
-      framedraw.xstart_param=&rfx->params[atoi (array[2])];
-      framedraw.ystart_param=&rfx->params[atoi (array[3])];
-      framedraw.xend_param=&rfx->params[atoi (array[4])];
-      framedraw.yend_param=&rfx->params[atoi (array[5])];
+      framedraw.xstart_param=&rfx->params[atoi(array[2])];
+      framedraw.ystart_param=&rfx->params[atoi(array[3])];
+      framedraw.xend_param=&rfx->params[atoi(array[4])];
+      framedraw.yend_param=&rfx->params[atoi(array[5])];
       framedraw.stdwidgets=4;
-    }
-    else if (!strcmp (array[1],"singlepoint")) {
+    } else if (!strcmp(array[1],"singlepoint")) {
       framedraw.type=LIVES_PARAM_SPECIAL_TYPE_SINGLEPOINT;
-      framedraw.xstart_param=&rfx->params[atoi (array[2])];
-      framedraw.ystart_param=&rfx->params[atoi (array[3])];
+      framedraw.xstart_param=&rfx->params[atoi(array[2])];
+      framedraw.ystart_param=&rfx->params[atoi(array[3])];
       framedraw.stdwidgets=2;
     }
 
     if (num_widgets>framedraw.stdwidgets) framedraw.extra_params=
-				  (int *)g_malloc(((framedraw.num_extra=(num_widgets-framedraw.stdwidgets)))*sizint);
+        (int *)lives_malloc(((framedraw.num_extra=(num_widgets-framedraw.stdwidgets)))*sizint);
 
-    for (i=0;i<num_widgets;i++) {
+    for (i=0; i<num_widgets; i++) {
       pnum=atoi(array[i+2]);
       if (rfx->status==RFX_STATUS_WEED) {
-	if (mainw->multitrack!=NULL) {
-	  if (rfx->params[pnum].multi==PVAL_MULTI_PER_CHANNEL) {
-	    if ((rfx->params[pnum].hidden&HIDDEN_MULTI)==HIDDEN_MULTI) {
-	      if (mainw->multitrack->track_index!=-1) {
-		rfx->params[pnum].hidden^=HIDDEN_MULTI; // multivalues allowed
-	      }
-	      else {
-		rfx->params[pnum].hidden|=HIDDEN_MULTI; // multivalues hidden
-	      }
-	    }
-	  }
-	}
+        if (mainw->multitrack!=NULL) {
+          if (rfx->params[pnum].multi==PVAL_MULTI_PER_CHANNEL) {
+            if ((rfx->params[pnum].hidden&HIDDEN_MULTI)==HIDDEN_MULTI) {
+              if (mainw->multitrack->track_index!=-1) {
+                rfx->params[pnum].hidden^=HIDDEN_MULTI; // multivalues allowed
+              } else {
+                rfx->params[pnum].hidden|=HIDDEN_MULTI; // multivalues hidden
+              }
+            }
+          }
+        }
       }
       if (i>=framedraw.stdwidgets) framedraw.extra_params[i-framedraw.stdwidgets]=pnum;
     }
 
     if (mainw->multitrack!=NULL) {
       mainw->multitrack->framedraw=&framedraw;
-      lives_widget_set_bg_color (mainw->multitrack->fd_frame, LIVES_WIDGET_STATE_NORMAL, &palette->light_red);
+      lives_widget_set_bg_color(mainw->multitrack->fd_frame, LIVES_WIDGET_STATE_NORMAL, &palette->light_red);
     }
   }
 
   // can be multiple of each of these
 
-  else if (!strcmp (array[0],"fileread")) {
+  else if (!strcmp(array[0],"fileread")) {
     int idx=atoi(array[1]);
-    fileread=g_list_append(fileread,(gpointer)&rfx->params[idx]);
+    fileread=lives_list_append(fileread,(livespointer)&rfx->params[idx]);
 
     // ensure we get an entry and not a text_view
     if ((int)rfx->params[idx].max>RFX_TEXT_MAGIC) rfx->params[idx].max=(double)RFX_TEXT_MAGIC;
-  }
-  else if (!strcmp (array[0],"password")) {
+  } else if (!strcmp(array[0],"password")) {
     int idx=atoi(array[1]);
-    passwd_widgets=g_list_append(passwd_widgets,(gpointer)&rfx->params[idx]);
+    passwd_widgets=lives_list_append(passwd_widgets,(livespointer)&rfx->params[idx]);
 
     // ensure we get an entry and not a text_view
     if ((int)rfx->params[idx].max>RFX_TEXT_MAGIC) rfx->params[idx].max=(double)RFX_TEXT_MAGIC;
   }
 
-  g_strfreev (array);
+  lives_strfreev(array);
 }
 
 
@@ -175,20 +169,20 @@
 }
 
 
-static void passwd_toggle_vis(LiVESToggleButton *b, gpointer entry) {
+static void passwd_toggle_vis(LiVESToggleButton *b, livespointer entry) {
   lives_entry_set_visibility(LIVES_ENTRY(entry),lives_toggle_button_get_active(b));
 }
 
 
-void check_for_special (lives_rfx_t *rfx, lives_param_t *param, LiVESBox *pbox) {
+void check_for_special(lives_rfx_t *rfx, lives_param_t *param, LiVESBox *pbox) {
   LiVESWidget *checkbutton;
   LiVESWidget *hbox;
   LiVESWidget *box;
   LiVESWidget *buttond;
-  GList *slist;
+  LiVESList *slist;
 
 
-  gchar *tmp,*tmp2;
+  char *tmp,*tmp2;
 
   // check if this parameter is part of a special window
   // as we are drawing the paramwindow
@@ -197,76 +191,76 @@
     param->special_type=framedraw.type;
     param->special_type_index=0;
     if (framedraw.type==LIVES_PARAM_SPECIAL_TYPE_RECT_DEMASK)
-      lives_spin_button_set_value (LIVES_SPIN_BUTTON (param->widgets[0]),0.);
-    lives_signal_connect_after (LIVES_GUI_OBJECT (param->widgets[0]), "value_changed", 
-				LIVES_GUI_CALLBACK (after_framedraw_widget_changed), &framedraw);
+      lives_spin_button_set_value(LIVES_SPIN_BUTTON(param->widgets[0]),0.);
+    lives_signal_connect_after(LIVES_GUI_OBJECT(param->widgets[0]), LIVES_WIDGET_VALUE_CHANGED_SIGNAL,
+                               LIVES_GUI_CALLBACK(after_framedraw_widget_changed), &framedraw);
   }
   if (param==framedraw.ystart_param) {
     param->special_type=framedraw.type;
     param->special_type_index=1;
     if (framedraw.type==LIVES_PARAM_SPECIAL_TYPE_RECT_DEMASK)
-      lives_spin_button_set_value (LIVES_SPIN_BUTTON (param->widgets[0]),0.);
-    lives_signal_connect_after (LIVES_GUI_OBJECT (param->widgets[0]), "value_changed", 
-				LIVES_GUI_CALLBACK (after_framedraw_widget_changed), &framedraw);
+      lives_spin_button_set_value(LIVES_SPIN_BUTTON(param->widgets[0]),0.);
+    lives_signal_connect_after(LIVES_GUI_OBJECT(param->widgets[0]), LIVES_WIDGET_VALUE_CHANGED_SIGNAL,
+                               LIVES_GUI_CALLBACK(after_framedraw_widget_changed), &framedraw);
   }
   if (mainw->current_file>-1) {
     if (param==framedraw.xend_param) {
       param->special_type=framedraw.type;
       param->special_type_index=2;
       if (framedraw.type==LIVES_PARAM_SPECIAL_TYPE_RECT_DEMASK)
-	lives_spin_button_set_value (LIVES_SPIN_BUTTON (param->widgets[0]),(double)cfile->hsize);
-      lives_signal_connect_after (LIVES_GUI_OBJECT (param->widgets[0]), "value_changed", 
-				  LIVES_GUI_CALLBACK (after_framedraw_widget_changed), &framedraw);
+        lives_spin_button_set_value(LIVES_SPIN_BUTTON(param->widgets[0]),(double)cfile->hsize);
+      lives_signal_connect_after(LIVES_GUI_OBJECT(param->widgets[0]), LIVES_WIDGET_VALUE_CHANGED_SIGNAL,
+                                 LIVES_GUI_CALLBACK(after_framedraw_widget_changed), &framedraw);
     }
     if (param==framedraw.yend_param) {
       param->special_type=framedraw.type;
       param->special_type_index=3;
       if (framedraw.type==LIVES_PARAM_SPECIAL_TYPE_RECT_DEMASK)
-	lives_spin_button_set_value (LIVES_SPIN_BUTTON (param->widgets[0]),(double)cfile->vsize);
-      lives_signal_connect_after (LIVES_GUI_OBJECT (param->widgets[0]), "value_changed", 
-				  LIVES_GUI_CALLBACK (after_framedraw_widget_changed), &framedraw);
+        lives_spin_button_set_value(LIVES_SPIN_BUTTON(param->widgets[0]),(double)cfile->vsize);
+      lives_signal_connect_after(LIVES_GUI_OBJECT(param->widgets[0]), LIVES_WIDGET_VALUE_CHANGED_SIGNAL,
+                                 LIVES_GUI_CALLBACK(after_framedraw_widget_changed), &framedraw);
     }
 
 
     if (framedraw.stdwidgets>0&&!framedraw.added) {
       if (framedraw.xstart_param!=NULL&&framedraw.xstart_param->widgets[0]!=NULL&&
-	  framedraw.ystart_param!=NULL&&framedraw.ystart_param->widgets[0]!=NULL) {
-	if (framedraw.stdwidgets==2||(framedraw.xend_param!=NULL&&framedraw.xend_param->widgets[0]!=NULL&&
-			    framedraw.yend_param!=NULL&&framedraw.yend_param->widgets[0]!=NULL)) {
-	  if (mainw->multitrack==NULL) {
-	    framedraw_connect(&framedraw,cfile->hsize,cfile->vsize,rfx); // turn passive preview->active
-	    framedraw_add_reset(LIVES_VBOX(LIVES_WIDGET(pbox)),&framedraw);
-	  }
-	  else {
-	    mainw->framedraw=mainw->play_image;
-	  }
-	  framedraw.added=TRUE;
-	}
+          framedraw.ystart_param!=NULL&&framedraw.ystart_param->widgets[0]!=NULL) {
+        if (framedraw.stdwidgets==2||(framedraw.xend_param!=NULL&&framedraw.xend_param->widgets[0]!=NULL&&
+                                      framedraw.yend_param!=NULL&&framedraw.yend_param->widgets[0]!=NULL)) {
+          if (mainw->multitrack==NULL) {
+            framedraw_connect(&framedraw,cfile->hsize,cfile->vsize,rfx); // turn passive preview->active
+            framedraw_add_reset(LIVES_VBOX(LIVES_WIDGET(pbox)),&framedraw);
+          } else {
+            mainw->framedraw=mainw->play_image;
+          }
+          framedraw.added=TRUE;
+        }
       }
     }
-    
+
     if (param==aspect.width_param) {
-      lives_spin_button_set_value (LIVES_SPIN_BUTTON (param->widgets[0]),(double)cfile->hsize);
-      aspect.width_func=lives_signal_connect_after (LIVES_GUI_OBJECT (param->widgets[0]), "value_changed",
-						LIVES_GUI_CALLBACK (after_aspect_width_changed),
-						NULL);
+      lives_spin_button_set_value(LIVES_SPIN_BUTTON(param->widgets[0]),(double)cfile->hsize);
+      aspect.width_func=lives_signal_connect_after(LIVES_GUI_OBJECT(param->widgets[0]), LIVES_WIDGET_VALUE_CHANGED_SIGNAL,
+                        LIVES_GUI_CALLBACK(after_aspect_width_changed),
+                        NULL);
     }
     if (param==aspect.height_param) {
-      lives_spin_button_set_value (LIVES_SPIN_BUTTON (param->widgets[0]),(double)cfile->vsize);
-      aspect.height_func=lives_signal_connect_after (LIVES_GUI_OBJECT (param->widgets[0]), "value_changed",
-						 LIVES_GUI_CALLBACK (after_aspect_height_changed),
-						 NULL);
-      
-      box = lives_hbox_new (FALSE, 0);
-      lives_box_pack_start (LIVES_BOX (LIVES_WIDGET (pbox)), box, FALSE, FALSE, widget_opts.packing_height*2);
-      
-      
+      lives_spin_button_set_value(LIVES_SPIN_BUTTON(param->widgets[0]),(double)cfile->vsize);
+      aspect.height_func=lives_signal_connect_after(LIVES_GUI_OBJECT(param->widgets[0]), LIVES_WIDGET_VALUE_CHANGED_SIGNAL,
+                         LIVES_GUI_CALLBACK(after_aspect_height_changed),
+                         NULL);
+
+      box = lives_hbox_new(FALSE, 0);
+      lives_box_pack_start(LIVES_BOX(LIVES_WIDGET(pbox)), box, FALSE, FALSE, widget_opts.packing_height*2);
+
+
       add_fill_to_box(LIVES_BOX(box));
-      
-      checkbutton = lives_standard_check_button_new ((tmp=g_strdup(_("Maintain _Aspect Ratio"))),TRUE,
-						     LIVES_BOX(box),(tmp2=g_strdup(_("Maintain aspect ratio of original frame"))));
 
-      g_free(tmp); g_free(tmp2);
+      checkbutton = lives_standard_check_button_new((tmp=lives_strdup(_("Maintain _Aspect Ratio"))),TRUE,
+                    LIVES_BOX(box),(tmp2=lives_strdup(_("Maintain aspect ratio of original frame"))));
+
+      lives_free(tmp);
+      lives_free(tmp2);
 
       add_fill_to_box(LIVES_BOX(box));
 
@@ -279,7 +273,7 @@
   slist=fileread;
   while (slist!=NULL) {
     if (param==(lives_param_t *)(slist->data)) {
-      GList *clist;
+      LiVESList *clist;
       int epos;
 
       param->special_type=LIVES_PARAM_SPECIAL_TYPE_FILEREAD;
@@ -289,29 +283,29 @@
       box=lives_widget_get_parent(param->widgets[0]);
 
       while (box!=NULL&&!LIVES_IS_HBOX(box)) {
-	box=lives_widget_get_parent(box);
+        box=lives_widget_get_parent(box);
       }
 
       if (box==NULL) return;
 
       clist=lives_container_get_children(LIVES_CONTAINER(box));
-      epos=g_list_index(clist,param->widgets[0]);
-      g_list_free(clist);
+      epos=lives_list_index(clist,param->widgets[0]);
+      lives_list_free(clist);
 
-      buttond = lives_standard_file_button_new (FALSE,g_get_current_dir());
+      buttond = lives_standard_file_button_new(FALSE,lives_get_current_dir());
       lives_box_pack_start(LIVES_BOX(box),buttond,FALSE,FALSE,widget_opts.packing_width);
       lives_box_reorder_child(LIVES_BOX(box),buttond,epos); // insert after label, before textbox
-      lives_signal_connect(buttond, LIVES_WIDGET_CLICKED_EVENT, LIVES_GUI_CALLBACK (on_filesel_button_clicked), (gpointer)param->widgets[0]);
+      lives_signal_connect(buttond, LIVES_WIDGET_CLICKED_SIGNAL, LIVES_GUI_CALLBACK(on_filesel_button_clicked), (livespointer)param->widgets[0]);
 
       if (!lives_widget_is_sensitive(param->widgets[0])) lives_widget_set_sensitive(buttond,FALSE);
 
       if (LIVES_IS_ENTRY(param->widgets[0])) {
-	lives_entry_set_editable(LIVES_ENTRY(param->widgets[0]),FALSE);
-	if (param->widgets[1]!=NULL&&
-	    LIVES_IS_LABEL(param->widgets[1])&&
-	    lives_label_get_mnemonic_widget(LIVES_LABEL(param->widgets[1]))!=NULL) 
-	  lives_label_set_mnemonic_widget (LIVES_LABEL(param->widgets[1]),buttond);
-	lives_entry_set_max_length(LIVES_ENTRY (param->widgets[0]),PATH_MAX);
+        lives_entry_set_editable(LIVES_ENTRY(param->widgets[0]),FALSE);
+        if (param->widgets[1]!=NULL&&
+            LIVES_IS_LABEL(param->widgets[1])&&
+            lives_label_get_mnemonic_widget(LIVES_LABEL(param->widgets[1]))!=NULL)
+          lives_label_set_mnemonic_widget(LIVES_LABEL(param->widgets[1]),buttond);
+        lives_entry_set_max_length(LIVES_ENTRY(param->widgets[0]),PATH_MAX);
       }
     }
 
@@ -331,23 +325,23 @@
       param->special_type=LIVES_PARAM_SPECIAL_TYPE_PASSWORD;
 
       while (!LIVES_IS_VBOX(box)) {
-	box=lives_widget_get_parent(box);
-	if (box==NULL) continue;
+        box=lives_widget_get_parent(box);
+        if (box==NULL) continue;
       }
 
-      hbox = lives_hbox_new (FALSE, 0);
-      lives_box_pack_start (LIVES_BOX (LIVES_WIDGET (box)), hbox, FALSE, FALSE, widget_opts.packing_height);
-      
-      checkbutton = lives_standard_check_button_new (_("Display Password"),FALSE,LIVES_BOX(hbox),NULL);
+      hbox = lives_hbox_new(FALSE, 0);
+      lives_box_pack_start(LIVES_BOX(LIVES_WIDGET(box)), hbox, FALSE, FALSE, widget_opts.packing_height);
 
-      lives_button_set_focus_on_click (LIVES_BUTTON(checkbutton),FALSE);
+      checkbutton = lives_standard_check_button_new(_("Display Password"),FALSE,LIVES_BOX(hbox),NULL);
+
+      lives_button_set_focus_on_click(LIVES_BUTTON(checkbutton),FALSE);
 
       if (!lives_widget_is_sensitive(param->widgets[0])) lives_widget_set_sensitive(checkbutton,FALSE);
       lives_widget_show_all(hbox);
 
-      lives_signal_connect_after (LIVES_GUI_OBJECT (checkbutton), LIVES_WIDGET_TOGGLED_EVENT,
-			      LIVES_GUI_CALLBACK (passwd_toggle_vis),
-			      (gpointer)param->widgets[0]);
+      lives_signal_connect_after(LIVES_GUI_OBJECT(checkbutton), LIVES_WIDGET_TOGGLED_SIGNAL,
+                                 LIVES_GUI_CALLBACK(passwd_toggle_vis),
+                                 (livespointer)param->widgets[0]);
 
 
 
@@ -360,12 +354,12 @@
 
 
 
-void after_aspect_width_changed (LiVESSpinButton *spinbutton, gpointer user_data) {
-  if (lives_toggle_button_get_active (LIVES_TOGGLE_BUTTON (aspect.checkbutton))) {
+void after_aspect_width_changed(LiVESSpinButton *spinbutton, livespointer user_data) {
+  if (lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(aspect.checkbutton))) {
     boolean keepeven=FALSE;
-    int width=lives_spin_button_get_value_as_int (spinbutton);
-    int height=lives_spin_button_get_value_as_int (LIVES_SPIN_BUTTON (aspect.height_param->widgets[0]));
-    lives_signal_handler_block (aspect.height_param->widgets[0],aspect.height_func);
+    int width=lives_spin_button_get_value_as_int(spinbutton);
+    int height=lives_spin_button_get_value_as_int(LIVES_SPIN_BUTTON(aspect.height_param->widgets[0]));
+    lives_signal_handler_block(aspect.height_param->widgets[0],aspect.height_func);
 
     if (((cfile->hsize>>1)<<1)==cfile->hsize&&((cfile->vsize>>1)<<1)==cfile->vsize) {
       // try to keep even
@@ -378,24 +372,24 @@
       height--;
       width=(int)(height*cfile->hsize/cfile->vsize+.5);
       if (width!=owidth) {
-	height+=2;
-	width=owidth;
+        height+=2;
+        width=owidth;
       }
     }
 
-    lives_spin_button_set_value (LIVES_SPIN_BUTTON (aspect.height_param->widgets[0]), (double)height);
-    lives_signal_handler_unblock (aspect.height_param->widgets[0],aspect.height_func);
+    lives_spin_button_set_value(LIVES_SPIN_BUTTON(aspect.height_param->widgets[0]), (double)height);
+    lives_signal_handler_unblock(aspect.height_param->widgets[0],aspect.height_func);
   }
 }
 
 
-void after_aspect_height_changed (LiVESToggleButton *spinbutton, gpointer user_data){
-  if (lives_toggle_button_get_active (LIVES_TOGGLE_BUTTON (aspect.checkbutton))) {
+void after_aspect_height_changed(LiVESToggleButton *spinbutton, livespointer user_data) {
+  if (lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(aspect.checkbutton))) {
     boolean keepeven=FALSE;
-    int height=lives_spin_button_get_value_as_int (LIVES_SPIN_BUTTON (spinbutton));
-    int width=lives_spin_button_get_value_as_int (LIVES_SPIN_BUTTON (aspect.width_param->widgets[0]));
+    int height=lives_spin_button_get_value_as_int(LIVES_SPIN_BUTTON(spinbutton));
+    int width=lives_spin_button_get_value_as_int(LIVES_SPIN_BUTTON(aspect.width_param->widgets[0]));
 
-    lives_signal_handler_block (aspect.width_param->widgets[0],aspect.width_func);
+    lives_signal_handler_block(aspect.width_param->widgets[0],aspect.width_func);
 
     if (((cfile->hsize>>1)<<1)==cfile->hsize&&((cfile->vsize>>1)<<1)==cfile->vsize) {
       // try to keep even
@@ -409,18 +403,18 @@
       width--;
       height=(int)(width*cfile->vsize/cfile->hsize+.5);
       if (height!=oheight) {
-	width+=2;
-	height=oheight;
+        width+=2;
+        height=oheight;
       }
     }
 
-    lives_spin_button_set_value (LIVES_SPIN_BUTTON (aspect.width_param->widgets[0]), (double)width);
-    lives_signal_handler_unblock (aspect.width_param->widgets[0],aspect.width_func);
+    lives_spin_button_set_value(LIVES_SPIN_BUTTON(aspect.width_param->widgets[0]), (double)width);
+    lives_signal_handler_unblock(aspect.width_param->widgets[0],aspect.width_func);
   }
 }
 
 
-void special_cleanup (void) {
+void special_cleanup(void) {
   // free some memory now
 
   mainw->framedraw=mainw->framedraw_reset=NULL;
@@ -435,22 +429,22 @@
 
   mainw->framedraw_preview=NULL;
 
-  if (framedraw.extra_params!=NULL) g_free(framedraw.extra_params);
+  if (framedraw.extra_params!=NULL) lives_free(framedraw.extra_params);
 
-  if (fileread!=NULL) g_list_free(fileread);
-  if (passwd_widgets!=NULL) g_list_free(passwd_widgets);
+  if (fileread!=NULL) lives_list_free(fileread);
+  if (passwd_widgets!=NULL) lives_list_free(passwd_widgets);
 
   framedraw.added=FALSE;
 }
 
 
-void set_aspect_ratio_widgets (lives_param_t *w, lives_param_t *h) {
+void set_aspect_ratio_widgets(lives_param_t *w, lives_param_t *h) {
   aspect.width_param=w;
   aspect.height_param=h;
 }
 
 
-void setmergealign (void) {
+void setmergealign(void) {
   lives_param_t *param;
   int cb_frames=clipboard->frames;
 
@@ -459,49 +453,45 @@
   }
 
   if (cfile->end-cfile->start+1>(cb_frames*((merge_opts!=NULL&&merge_opts->spinbutton_loops!=NULL)?
-					    lives_spin_button_get_value_as_int(LIVES_SPIN_BUTTON (merge_opts->spinbutton_loops)):1))
+                                 lives_spin_button_get_value_as_int(LIVES_SPIN_BUTTON(merge_opts->spinbutton_loops)):1))
       &&!merge_opts->loop_to_fit) {
     // set special transalign widgets to their default values
     if (mergealign.start_param!=NULL&&mergealign.start_param->widgets[0]!=NULL&&LIVES_IS_SPIN_BUTTON
-	(mergealign.start_param->widgets[0])&&(param=mergealign.start_param)->type==LIVES_PARAM_NUM) {
+        (mergealign.start_param->widgets[0])&&(param=mergealign.start_param)->type==LIVES_PARAM_NUM) {
       if (param->dp) {
-	lives_spin_button_set_value (LIVES_SPIN_BUTTON (param->widgets[0]),get_double_param (param->def));
-      }
-      else {
-	lives_spin_button_set_value (LIVES_SPIN_BUTTON (param->widgets[0]),(double)get_int_param (param->def));
+        lives_spin_button_set_value(LIVES_SPIN_BUTTON(param->widgets[0]),get_double_param(param->def));
+      } else {
+        lives_spin_button_set_value(LIVES_SPIN_BUTTON(param->widgets[0]),(double)get_int_param(param->def));
       }
     }
-    if (mergealign.end_param!=NULL&&mergealign.end_param->widgets[0]!=NULL&&LIVES_IS_SPIN_BUTTON 
-	(mergealign.end_param->widgets[0])&&(param=mergealign.end_param)->type==LIVES_PARAM_NUM) {
+    if (mergealign.end_param!=NULL&&mergealign.end_param->widgets[0]!=NULL&&LIVES_IS_SPIN_BUTTON
+        (mergealign.end_param->widgets[0])&&(param=mergealign.end_param)->type==LIVES_PARAM_NUM) {
       if (param->dp) {
-	lives_spin_button_set_value (LIVES_SPIN_BUTTON (param->widgets[0]),get_double_param (param->def));
-      }
-      else {
-	lives_spin_button_set_value (LIVES_SPIN_BUTTON (param->widgets[0]),(double)get_int_param (param->def));
+        lives_spin_button_set_value(LIVES_SPIN_BUTTON(param->widgets[0]),get_double_param(param->def));
+      } else {
+        lives_spin_button_set_value(LIVES_SPIN_BUTTON(param->widgets[0]),(double)get_int_param(param->def));
       }
     }
-  }
-  else {
+  } else {
     if (merge_opts->align_start) {
       // set special transalign widgets to min/max values
-      if (mergealign.start_param!=NULL&&mergealign.start_param->widgets[0]!=NULL&&LIVES_IS_SPIN_BUTTON 
-	  (mergealign.start_param->widgets[0])&&(param=mergealign.start_param)->type==LIVES_PARAM_NUM) {
-	lives_spin_button_set_value (LIVES_SPIN_BUTTON (param->widgets[0]),(double)param->min);
+      if (mergealign.start_param!=NULL&&mergealign.start_param->widgets[0]!=NULL&&LIVES_IS_SPIN_BUTTON
+          (mergealign.start_param->widgets[0])&&(param=mergealign.start_param)->type==LIVES_PARAM_NUM) {
+        lives_spin_button_set_value(LIVES_SPIN_BUTTON(param->widgets[0]),(double)param->min);
       }
-      if (mergealign.end_param!=NULL&&mergealign.end_param->widgets[0]!=NULL&&LIVES_IS_SPIN_BUTTON 
-	  (mergealign.end_param->widgets[0])&&(param=mergealign.end_param)->type==LIVES_PARAM_NUM) {
-	lives_spin_button_set_value (LIVES_SPIN_BUTTON (param->widgets[0]),(double)param->max);
+      if (mergealign.end_param!=NULL&&mergealign.end_param->widgets[0]!=NULL&&LIVES_IS_SPIN_BUTTON
+          (mergealign.end_param->widgets[0])&&(param=mergealign.end_param)->type==LIVES_PARAM_NUM) {
+        lives_spin_button_set_value(LIVES_SPIN_BUTTON(param->widgets[0]),(double)param->max);
       }
-    }
-    else {
+    } else {
       // set special transalign widgets to max/min values
-      if (mergealign.start_param!=NULL&&mergealign.start_param->widgets[0]!=NULL&&LIVES_IS_SPIN_BUTTON 
-	  (mergealign.start_param->widgets[0])&&(param=mergealign.start_param)->type==LIVES_PARAM_NUM) {
-	lives_spin_button_set_value (LIVES_SPIN_BUTTON (param->widgets[0]),(double)param->max);
+      if (mergealign.start_param!=NULL&&mergealign.start_param->widgets[0]!=NULL&&LIVES_IS_SPIN_BUTTON
+          (mergealign.start_param->widgets[0])&&(param=mergealign.start_param)->type==LIVES_PARAM_NUM) {
+        lives_spin_button_set_value(LIVES_SPIN_BUTTON(param->widgets[0]),(double)param->max);
       }
-      if (mergealign.end_param!=NULL&&mergealign.end_param->widgets[0]!=NULL&&LIVES_IS_SPIN_BUTTON 
-	  (mergealign.end_param->widgets[0])&&(param=mergealign.end_param)->type==LIVES_PARAM_NUM) {
-	lives_spin_button_set_value (LIVES_SPIN_BUTTON (param->widgets[0]),(double)param->min);
+      if (mergealign.end_param!=NULL&&mergealign.end_param->widgets[0]!=NULL&&LIVES_IS_SPIN_BUTTON
+          (mergealign.end_param->widgets[0])&&(param=mergealign.end_param)->type==LIVES_PARAM_NUM) {
+        lives_spin_button_set_value(LIVES_SPIN_BUTTON(param->widgets[0]),(double)param->min);
       }
     }
   }
@@ -514,10 +504,9 @@
     case LIVES_PARAM_SPECIAL_TYPE_RECT_MULTRECT:
     case LIVES_PARAM_SPECIAL_TYPE_RECT_MULTIRECT:
       if (mt->track_index==-1) {
-	// TODO - hide widgets
-      }
-      else {
-	//
+        // TODO - hide widgets
+      } else {
+        //
       }
       break;

LiVES-2.2.8.tar.bz2/src/paramspecial.h -> LiVES-2.4.1.tar.bz2/src/paramspecial.h Changed

@@ -34,8 +34,8 @@
   lives_param_t *height_param;
   lives_param_t *width_param;
   LiVESWidget *checkbutton;
-  gulong width_func;
-  gulong height_func;
+  ulong width_func;
+  ulong height_func;
 } lives_special_aspect_t;
 
 
@@ -46,25 +46,25 @@
 } lives_special_mergealign_t;
 ////////////////////////////////
 
-void init_special (void);
+void init_special(void);
 
-void add_to_special (const gchar *special_string, lives_rfx_t *);
+void add_to_special(const char *special_string, lives_rfx_t *);
 
-void check_for_special (lives_rfx_t *, lives_param_t *param, LiVESBox *);
+void check_for_special(lives_rfx_t *, lives_param_t *param, LiVESBox *);
 
 void fd_connect_spinbutton(lives_rfx_t *);
 
 void fd_tweak(lives_rfx_t *);
 
-void after_aspect_width_changed (LiVESSpinButton *, gpointer);
+void after_aspect_width_changed(LiVESSpinButton *, livespointer);
 
-void after_aspect_height_changed (LiVESToggleButton *, gpointer);
+void after_aspect_height_changed(LiVESToggleButton *, livespointer);
 
-void special_cleanup (void);
+void special_cleanup(void);
 
-void setmergealign (void);
+void setmergealign(void);
 
-void set_aspect_ratio_widgets (lives_param_t *w, lives_param_t *h);
+void set_aspect_ratio_widgets(lives_param_t *w, lives_param_t *h);
 
 boolean is_perchannel_multi(lives_rfx_t *rfx, int pnum);

LiVES-2.2.8.tar.bz2/src/paramwindow.c -> LiVES-2.4.1.tar.bz2/src/paramwindow.c Changed

@@ -8,7 +8,7 @@
 
 
 
-// NOTE: this is now the "house style" for all LiVES widgets, there should be a consistent look across all 
+// NOTE: this is now the "house style" for all LiVES widgets, there should be a consistent look across all
 // windows.
 
 #ifdef HAVE_SYSTEM_WEED
@@ -39,11 +39,11 @@
 #include "giw/giwknob.h"
 #endif
 
-extern boolean do_effect (lives_rfx_t *, boolean is_preview); //effects.c in LiVES
-extern void on_realfx_activate (LiVESMenuItem *, gpointer rfx); // effects.c in LiVES
+extern boolean do_effect(lives_rfx_t *, boolean is_preview);  //effects.c in LiVES
+extern void on_realfx_activate(LiVESMenuItem *, livespointer rfx);  // effects.c in LiVES
 
 
-static void after_param_text_buffer_changed (LiVESTextBuffer *textbuffer, lives_rfx_t *rfx);
+static void after_param_text_buffer_changed(LiVESTextBuffer *textbuffer, lives_rfx_t *rfx);
 
 
 LiVESWidget *fx_dialog[2];
@@ -51,13 +51,13 @@
 // TODO -
 // use list of these in case we have multiple windows open
 // right now this is single threaded because of this
-static GSList *usrgrp_to_livesgrp[2]={NULL,NULL}; // ordered list of lives_widget_group_t
+static LiVESSList *usrgrp_to_livesgrp[2]= {NULL,NULL}; // ordered list of lives_widget_group_t
 
-GList *do_onchange_init(lives_rfx_t *rfx) {
-  GList *onchange=NULL;
-  GList *retvals=NULL;
-  gchar **array;
-  gchar *type;
+LiVESList *do_onchange_init(lives_rfx_t *rfx) {
+  LiVESList *onchange=NULL;
+  LiVESList *retvals=NULL;
+  char **array;
+  char *type;
 
   register int i;
 
@@ -65,61 +65,61 @@
 
   switch (rfx->status) {
   case RFX_STATUS_BUILTIN:
-    type=g_strdup(PLUGIN_RENDERED_EFFECTS_BUILTIN);
+    type=lives_strdup(PLUGIN_RENDERED_EFFECTS_BUILTIN);
     break;
   case RFX_STATUS_CUSTOM:
-    type=g_strdup(PLUGIN_RENDERED_EFFECTS_CUSTOM);
+    type=lives_strdup(PLUGIN_RENDERED_EFFECTS_CUSTOM);
     break;
   default:
-    type=g_strdup_printf(PLUGIN_RENDERED_EFFECTS_TEST);
+    type=lives_strdup_printf(PLUGIN_RENDERED_EFFECTS_TEST);
     break;
   }
-  if ((onchange=plugin_request_by_line (type,rfx->name,"get_onchange"))!=NULL) {
-    for (i=0;i<g_list_length (onchange);i++) {
-      array=g_strsplit ((gchar *)g_list_nth_data (onchange,i),rfx->delim,-1);
-      if (!strcmp (array[0],"init")) {
-	// onchange is init
-	// create dummy object with data
-	LiVESWidget *dummy_widget=lives_label_new(NULL);
-	g_object_set_data (G_OBJECT (dummy_widget),"param_number",LIVES_INT_TO_POINTER (-1));
-	retvals=do_onchange (G_OBJECT (dummy_widget),rfx);
-	lives_widget_destroy (dummy_widget);
-	g_strfreev (array);
-	break;
+  if ((onchange=plugin_request_by_line(type,rfx->name,"get_onchange"))!=NULL) {
+    for (i=0; i<lives_list_length(onchange); i++) {
+      array=lives_strsplit((char *)lives_list_nth_data(onchange,i),rfx->delim,-1);
+      if (!strcmp(array[0],"init")) {
+        // onchange is init
+        // create dummy object with data
+        LiVESWidget *dummy_widget=lives_label_new(NULL);
+        lives_widget_object_set_data(LIVES_WIDGET_OBJECT(dummy_widget),"param_number",LIVES_INT_TO_POINTER(-1));
+        retvals=do_onchange(LIVES_WIDGET_OBJECT(dummy_widget),rfx);
+        lives_widget_destroy(dummy_widget);
+        lives_strfreev(array);
+        break;
       }
-      g_strfreev (array);
+      lives_strfreev(array);
     }
-    g_list_free_strings (onchange);
-    g_list_free (onchange);
+    lives_list_free_strings(onchange);
+    lives_list_free(onchange);
   }
-  g_free (type);
+  lives_free(type);
 
   return retvals;
 }
 
 
-void on_paramwindow_ok_clicked (LiVESButton *button, lives_rfx_t *rfx) {
+void on_paramwindow_ok_clicked(LiVESButton *button, lives_rfx_t *rfx) {
   register int i;
 
   if (rfx!=NULL&&rfx->status!=RFX_STATUS_SCRAP) mainw->keep_pre=mainw->did_rfx_preview;
 
   if (mainw->textwidget_focus!=NULL) {
-    LiVESWidget *textwidget=(LiVESWidget *)g_object_get_data (G_OBJECT (mainw->textwidget_focus),"textwidget");
+    LiVESWidget *textwidget=(LiVESWidget *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(mainw->textwidget_focus),"textwidget");
     after_param_text_changed(textwidget,rfx);
   }
 
   if (mainw->did_rfx_preview) {
-    for (i=0;i<rfx->num_params;i++) {
+    for (i=0; i<rfx->num_params; i++) {
       if (rfx->params[i].changed) {
-	mainw->keep_pre=FALSE;
-	break;
+        mainw->keep_pre=FALSE;
+        break;
       }
     }
 
     if (!mainw->keep_pre) {
-      gchar *com;
+      char *com;
 #ifndef IS_MINGW
-      com=g_strdup_printf("%s stopsubsub \"%s\" 2>/dev/null",prefs->backend_sync,cfile->handle);
+      com=lives_strdup_printf("%s stopsubsub \"%s\" 2>/dev/null",prefs->backend_sync,cfile->handle);
       lives_system(com,TRUE); // try to stop any current previews / processing
 #else
       // get pid from backend
@@ -127,20 +127,20 @@
       ssize_t rlen;
       char val[16];
       int pid;
-      com=g_strdup_printf("%s get_pid_for_handle \"%s\"",prefs->backend_sync,cfile->handle);
+      com=lives_strdup_printf("%s get_pid_for_handle \"%s\"",prefs->backend_sync,cfile->handle);
       rfile=popen(com,"r");
       rlen=fread(val,1,16,rfile);
       pclose(rfile);
       memset(val+rlen,0,1);
       pid=atoi(val);
-      
+
       lives_win32_kill_subprocesses(pid,TRUE);
 #endif
-      g_free(com);
-      
+      lives_free(com);
+
       if (cfile->start==0) {
-	cfile->start=1;
-	cfile->end=cfile->frames;
+        cfile->start=1;
+        cfile->end=cfile->frames;
       }
 
       do_rfx_cleanup(rfx);
@@ -153,7 +153,7 @@
     lives_general_button_clicked(button,NULL);
   }
 
-  if (usrgrp_to_livesgrp[0]!=NULL) g_slist_free (usrgrp_to_livesgrp[0]);
+  if (usrgrp_to_livesgrp[0]!=NULL) lives_slist_free(usrgrp_to_livesgrp[0]);
   usrgrp_to_livesgrp[0]=NULL;
   if (fx_dialog[1]==NULL) special_cleanup();
   if (mainw->invis!=NULL) {
@@ -164,7 +164,7 @@
   if (rfx!=NULL&&rfx->status==RFX_STATUS_SCRAP) return;
 
   if (rfx->status==RFX_STATUS_WEED) on_realfx_activate(NULL,rfx);
-  else on_render_fx_activate (NULL,rfx);
+  else on_render_fx_activate(NULL,rfx);
 
   mainw->keep_pre=FALSE;
   mainw->is_generating=FALSE;
@@ -180,7 +180,7 @@
 
 
 
-void on_paramwindow_cancel_clicked2 (LiVESButton *button, lives_rfx_t *rfx) {
+void on_paramwindow_cancel_clicked2(LiVESButton *button, lives_rfx_t *rfx) {
   // close from rte window
 
   on_paramwindow_cancel_clicked(button,rfx);
@@ -191,12 +191,12 @@
   }
 }
 
-void on_paramwindow_cancel_clicked (LiVESButton *button, lives_rfx_t *rfx) {
+void on_paramwindow_cancel_clicked(LiVESButton *button, lives_rfx_t *rfx) {
   mainw->block_param_updates=TRUE;
   if (mainw->did_rfx_preview) {
-    gchar *com;
+    char *com;
 #ifndef IS_MINGW
-    com=g_strdup_printf("%s stopsubsub \"%s\" 2>/dev/null",prefs->backend_sync,cfile->handle);
+    com=lives_strdup_printf("%s stopsubsub \"%s\" 2>/dev/null",prefs->backend_sync,cfile->handle);
     lives_system(com,TRUE); // try to stop processing
 #else
     // get pid from backend
@@ -204,16 +204,16 @@
     ssize_t rlen;
     char val[16];
     int pid;
-    com=g_strdup_printf("%s get_pid_for_handle \"%s\"",prefs->backend_sync,cfile->handle);
+    com=lives_strdup_printf("%s get_pid_for_handle \"%s\"",prefs->backend_sync,cfile->handle);
     rfile=popen(com,"r");
     rlen=fread(val,1,16,rfile);
     pclose(rfile);
     memset(val+rlen,0,1);
     pid=atoi(val);
-    
+
     lives_win32_kill_subprocesses(pid,TRUE);
 #endif
-    g_free(com);
+    lives_free(com);
     mainw->did_rfx_preview=FALSE;
     mainw->show_procd=TRUE;
 
@@ -227,7 +227,7 @@
 
   if (rfx!=NULL&&rfx->name!=NULL&&rfx->status!=RFX_STATUS_WEED&&rfx->status!=RFX_STATUS_SCRAP&&
       rfx->num_in_channels==0&&rfx->min_frames>=0&&!rfx->is_template) {
-    // for a generator, we silently close the (now) temporary file we would have generated frames into 
+    // for a generator, we silently close the (now) temporary file we would have generated frames into
     mainw->suppress_dprint=TRUE;
     close_current_file(mainw->pre_src_file);
     mainw->suppress_dprint=FALSE;
@@ -239,15 +239,14 @@
     lives_general_button_clicked(button,NULL);
   }
   if (rfx==NULL) {
-    if (usrgrp_to_livesgrp[1]!=NULL) g_slist_free (usrgrp_to_livesgrp[1]);
+    if (usrgrp_to_livesgrp[1]!=NULL) lives_slist_free(usrgrp_to_livesgrp[1]);
     usrgrp_to_livesgrp[1]=NULL;
-  }
-  else {
-    if (usrgrp_to_livesgrp[0]!=NULL) g_slist_free (usrgrp_to_livesgrp[0]);
+  } else {
+    if (usrgrp_to_livesgrp[0]!=NULL) lives_slist_free(usrgrp_to_livesgrp[0]);
     usrgrp_to_livesgrp[0]=NULL;
     if (rfx->status==RFX_STATUS_WEED&&rfx!=mainw->fx_candidates[FX_CANDIDATE_RESIZER].rfx) {
       rfx_free(rfx);
-      g_free(rfx);
+      lives_free(rfx);
     }
   }
   if (fx_dialog[1]==NULL) special_cleanup();
@@ -262,46 +261,45 @@
 }
 
 /**
-   get a (radiobutton) list from an index 
+   get a (radiobutton) list from an index
 */
 static lives_widget_group_t *get_group(lives_rfx_t *rfx, lives_param_t *param) {
 
 
   if (rfx->status==RFX_STATUS_WEED) {
-    return livesgrp_from_usrgrp (usrgrp_to_livesgrp[1], param->group);
-  }
-  else {
-    return livesgrp_from_usrgrp (usrgrp_to_livesgrp[0], param->group);
+    return livesgrp_from_usrgrp(usrgrp_to_livesgrp[1], param->group);
+  } else {
+    return livesgrp_from_usrgrp(usrgrp_to_livesgrp[0], param->group);
   }
   return NULL;
 }
 
 
-void on_render_fx_activate (LiVESMenuItem *menuitem, lives_rfx_t *rfx) {
+void on_render_fx_activate(LiVESMenuItem *menuitem, lives_rfx_t *rfx) {
   boolean has_lmap_error=FALSE;
 
   if (menuitem!=NULL&&!(prefs->warning_mask&WARN_MASK_LAYOUT_ALTER_FRAMES)&&rfx->num_in_channels>0&&
       (mainw->xlays=layout_frame_is_affected(mainw->current_file,1))!=NULL) {
     if (!do_layout_alter_frames_warning()) {
-      g_list_free_strings(mainw->xlays);
-      g_list_free(mainw->xlays);
+      lives_list_free_strings(mainw->xlays);
+      lives_list_free(mainw->xlays);
       mainw->xlays=NULL;
       return;
     }
-    add_lmap_error(LMAP_ERROR_ALTER_FRAMES,cfile->name,(gpointer)cfile->layout_map,mainw->current_file,
-		   0,0.,cfile->stored_layout_frame>0);
+    add_lmap_error(LMAP_ERROR_ALTER_FRAMES,cfile->name,(livespointer)cfile->layout_map,mainw->current_file,
+                   0,0.,cfile->stored_layout_frame>0);
     has_lmap_error=TRUE;
-    g_list_free_strings(mainw->xlays);
-    g_list_free(mainw->xlays);
+    lives_list_free_strings(mainw->xlays);
+    lives_list_free(mainw->xlays);
     mainw->xlays=NULL;
   }
 
   // do onchange|init
   if (menuitem!=NULL) {
-    GList *retvals=do_onchange_init(rfx);
+    LiVESList *retvals=do_onchange_init(rfx);
     if (retvals!=NULL) {
-      g_list_free_strings (retvals);
-      g_list_free (retvals);
+      lives_list_free_strings(retvals);
+      lives_list_free(retvals);
     }
   }
   if (rfx->min_frames>-1) {
@@ -312,7 +310,7 @@
 }
 
 
-static void gen_width_changed (LiVESSpinButton *spin, gpointer user_data) {
+static void gen_width_changed(LiVESSpinButton *spin, livespointer user_data) {
   weed_plant_t *ctmpl=(weed_plant_t *)user_data;
   int val=lives_spin_button_get_value_as_int(spin);
   int error,old_val=0;
@@ -330,7 +328,7 @@
 }
 
 
-static void gen_height_changed (LiVESSpinButton *spin, gpointer user_data) {
+static void gen_height_changed(LiVESSpinButton *spin, livespointer user_data) {
   weed_plant_t *ctmpl=(weed_plant_t *)user_data;
   int val=lives_spin_button_get_value_as_int(spin);
   int error,old_val=0;
@@ -348,7 +346,7 @@
 }
 
 
-static void gen_fps_changed (LiVESSpinButton *spin, gpointer user_data) {
+static void gen_fps_changed(LiVESSpinButton *spin, livespointer user_data) {
   weed_plant_t *filter=(weed_plant_t *)user_data;
   double val=lives_spin_button_get_value(spin);
   weed_set_double_value(filter,"host_fps",val);
@@ -390,43 +388,42 @@
   if (hint==WEED_HINT_INTEGER) {
     if (in) weed_set_int_value(tparam,"value",weed_get_int_value(tparamtmpl,"min",&error));
     else weed_set_int_value(tparam,"value",weed_get_int_value(tparamtmpl,"max",&error));
-  }
-  else {
+  } else {
     if (in) weed_set_double_value(tparam,"value",weed_get_double_value(tparamtmpl,"min",&error));
     else weed_set_double_value(tparam,"value",weed_get_double_value(tparamtmpl,"max",&error));
   }
   filter_mutex_unlock(key);
   set_copy_to(inst,trans,TRUE);
   update_visual_params(rfx,FALSE);
-  weed_free(in_params);
+  lives_free(in_params);
 
   if (mainw->multitrack!=NULL) {
     // force parameter update in multitrack
     set_int_param(rfx->params[trans].value,old_val);
-    after_param_value_changed (LIVES_SPIN_BUTTON(rfx->params[trans].widgets[0]), rfx);
+    after_param_value_changed(LIVES_SPIN_BUTTON(rfx->params[trans].widgets[0]), rfx);
   }
 
 }
 
 
-static void transition_in_pressed(LiVESToggleButton *tbut, gpointer rfx) {
+static void transition_in_pressed(LiVESToggleButton *tbut, livespointer rfx) {
   trans_in_out_pressed((lives_rfx_t *)rfx,TRUE);
 }
 
-static void transition_out_pressed(LiVESToggleButton *tbut, gpointer rfx) {
+static void transition_out_pressed(LiVESToggleButton *tbut, livespointer rfx) {
   trans_in_out_pressed((lives_rfx_t *)rfx,FALSE);
 }
 
-static void after_transaudio_toggled(LiVESToggleButton *togglebutton, gpointer rfx) {
+static void after_transaudio_toggled(LiVESToggleButton *togglebutton, livespointer rfx) {
   weed_plant_t *init_event=mainw->multitrack->init_event;
 
-  if (lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(togglebutton))) 
+  if (lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(togglebutton)))
     weed_set_boolean_value(init_event,"host_audio_transition",WEED_TRUE);
   else weed_set_boolean_value(init_event,"host_audio_transition",WEED_FALSE);
 
 }
 
-static void gen_cb_toggled(LiVESToggleButton *tbut, gpointer rfx) {
+static void gen_cb_toggled(LiVESToggleButton *tbut, livespointer rfx) {
   mainw->gen_to_clipboard=!mainw->gen_to_clipboard;
 }
 
@@ -440,23 +437,24 @@
   LiVESWidget *hbox,*hbox2;
   LiVESWidget *hseparator;
 
-  GSList *radiobutton_group = NULL;
-
-  gchar *tmp,*tmp2;
-
-  hbox = lives_hbox_new (FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_width);
+  LiVESSList *radiobutton_group = NULL;
 
-  radiobutton_in=lives_standard_radio_button_new((tmp=g_strdup(_ ("Transition _In"))),TRUE,
-						 radiobutton_group,LIVES_BOX(hbox),
-						 (tmp2=g_strdup(_("Click to set the transition parameter to show only the front frame"))));
-  g_free(tmp); g_free(tmp2);
+  char *tmp,*tmp2;
 
-  radiobutton_group = lives_radio_button_get_group (LIVES_RADIO_BUTTON (radiobutton_in));
+  hbox = lives_hbox_new(FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(vbox), hbox, FALSE, FALSE, widget_opts.packing_width);
 
-  lives_signal_connect_after (LIVES_GUI_OBJECT (radiobutton_in), LIVES_WIDGET_TOGGLED_EVENT,
-			  LIVES_GUI_CALLBACK (transition_in_pressed),
-			  (gpointer)rfx);
+  radiobutton_in=lives_standard_radio_button_new((tmp=lives_strdup(_("Transition _In"))),TRUE,
+                 radiobutton_group,LIVES_BOX(hbox),
+                 (tmp2=lives_strdup(_("Click to set the transition parameter to show only the front frame"))));
+  lives_free(tmp);
+  lives_free(tmp2);
+
+  radiobutton_group = lives_radio_button_get_group(LIVES_RADIO_BUTTON(radiobutton_in));
+
+  lives_signal_connect_after(LIVES_GUI_OBJECT(radiobutton_in), LIVES_WIDGET_TOGGLED_SIGNAL,
+                             LIVES_GUI_CALLBACK(transition_in_pressed),
+                             (livespointer)rfx);
 
 
 
@@ -466,48 +464,50 @@
 
     LiVESWidget *checkbutton;
 
-    hbox2 = lives_hbox_new (FALSE, 0);
+    hbox2 = lives_hbox_new(FALSE, 0);
 
-    if (has_video_chans_in(filter,FALSE)) 
-      lives_box_pack_start (LIVES_BOX (hbox), hbox2, FALSE, FALSE, widget_opts.packing_width);
+    if (has_video_chans_in(filter,FALSE))
+      lives_box_pack_start(LIVES_BOX(hbox), hbox2, FALSE, FALSE, widget_opts.packing_width);
 
-    checkbutton = lives_standard_check_button_new ((tmp=g_strdup(_("Crossfade audio"))),FALSE,LIVES_BOX(hbox2),
-						   (tmp2=g_strdup(_("Check the box to make audio transition with the video"))));
+    checkbutton = lives_standard_check_button_new((tmp=lives_strdup(_("Crossfade audio"))),FALSE,LIVES_BOX(hbox2),
+                  (tmp2=lives_strdup(_("Check the box to make audio transition with the video"))));
 
-    g_free(tmp); g_free(tmp2);
+    lives_free(tmp);
+    lives_free(tmp2);
 
     if (!weed_plant_has_leaf(mainw->multitrack->init_event,"host_audio_transition")||
-	weed_get_boolean_value(mainw->multitrack->init_event,"host_audio_transition",&error)==WEED_FALSE) 
+        weed_get_boolean_value(mainw->multitrack->init_event,"host_audio_transition",&error)==WEED_FALSE)
       lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(checkbutton),FALSE);
-    else lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (checkbutton), TRUE);
+    else lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(checkbutton), TRUE);
 
-    lives_signal_connect_after (LIVES_GUI_OBJECT (checkbutton), LIVES_WIDGET_TOGGLED_EVENT,
-			    LIVES_GUI_CALLBACK (after_transaudio_toggled),
-			    (gpointer)rfx);
+    lives_signal_connect_after(LIVES_GUI_OBJECT(checkbutton), LIVES_WIDGET_TOGGLED_SIGNAL,
+                               LIVES_GUI_CALLBACK(after_transaudio_toggled),
+                               (livespointer)rfx);
+
+    after_transaudio_toggled(LIVES_TOGGLE_BUTTON(checkbutton),(livespointer)rfx);
 
-    after_transaudio_toggled(LIVES_TOGGLE_BUTTON(checkbutton),(gpointer)rfx);
-    
   }
 
   widget_opts.pack_end=TRUE;
-  radiobutton_out=lives_standard_radio_button_new((tmp=g_strdup(_ ("Transition _Out"))),TRUE,
-						  radiobutton_group,LIVES_BOX(hbox),
-						  (tmp2=g_strdup(_("Click to set the transition parameter to show only the rear frame"))));
+  radiobutton_out=lives_standard_radio_button_new((tmp=lives_strdup(_("Transition _Out"))),TRUE,
+                  radiobutton_group,LIVES_BOX(hbox),
+                  (tmp2=lives_strdup(_("Click to set the transition parameter to show only the rear frame"))));
 
-  g_free(tmp); g_free(tmp2);
+  lives_free(tmp);
+  lives_free(tmp2);
 
   widget_opts.pack_end=FALSE;
-  
-  lives_signal_connect_after (LIVES_GUI_OBJECT (radiobutton_out), LIVES_WIDGET_TOGGLED_EVENT,
-			  LIVES_GUI_CALLBACK (transition_out_pressed),
-			  (gpointer)rfx);
-  
+
+  lives_signal_connect_after(LIVES_GUI_OBJECT(radiobutton_out), LIVES_WIDGET_TOGGLED_SIGNAL,
+                             LIVES_GUI_CALLBACK(transition_out_pressed),
+                             (livespointer)rfx);
+
   if (palette->style&STYLE_1) {
     lives_widget_set_fg_color(hbox, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
   }
 
-  hseparator = lives_hseparator_new ();
-  lives_box_pack_start (vbox, hseparator, FALSE, FALSE, 0);
+  hseparator = lives_hseparator_new();
+  lives_box_pack_start(vbox, hseparator, FALSE, FALSE, 0);
 
 }
 
@@ -532,7 +532,7 @@
 
   double def_fps=0.;
 
-  gchar *cname,*ltxt;
+  char *cname,*ltxt;
 
   boolean added=add_fps;
   boolean chk_params=(vbox==NULL);
@@ -546,7 +546,7 @@
 
 
   if (!has_param) {
-    lives_widget_set_size_request (LIVES_WIDGET(vbox), RFX_WINSIZE_H, RFX_WINSIZE_V);
+    lives_widget_set_size_request(LIVES_WIDGET(vbox), RFX_WINSIZE_H, RFX_WINSIZE_V);
   }
 
   // add fps
@@ -557,53 +557,52 @@
     if (has_param)
       add_hsep_to_box(vbox);
 
-    hbox = lives_hbox_new (FALSE, 0);
-    lives_box_pack_start (LIVES_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height*2);
-    
+    hbox = lives_hbox_new(FALSE, 0);
+    lives_box_pack_start(LIVES_BOX(vbox), hbox, FALSE, FALSE, widget_opts.packing_height*2);
+
     add_fill_to_box(LIVES_BOX(hbox));
-    
+
     if (weed_plant_has_leaf(filter,"host_fps")) def_fps=weed_get_double_value(filter,"host_fps",&error);
     else if (weed_plant_has_leaf(filter,"target_fps")) def_fps=weed_get_double_value(filter,"target_fps",&error);
-    
+
     if (def_fps==0.) def_fps=prefs->default_fps;
 
-    spinbuttonf = lives_standard_spin_button_new (_("Target _FPS (plugin may override this)"),TRUE,
-						  def_fps,1.,FPS_MAX,1.,10.,3,LIVES_BOX(hbox),NULL);
-    
-    lives_signal_connect_after (LIVES_GUI_OBJECT (spinbuttonf), "value_changed",
-			    LIVES_GUI_CALLBACK (gen_fps_changed),
-			    filter);
-    
+    spinbuttonf = lives_standard_spin_button_new(_("Target _FPS (plugin may override this)"),TRUE,
+                  def_fps,1.,FPS_MAX,1.,10.,3,LIVES_BOX(hbox),NULL);
+
+    lives_signal_connect_after(LIVES_GUI_OBJECT(spinbuttonf), LIVES_WIDGET_VALUE_CHANGED_SIGNAL,
+                               LIVES_GUI_CALLBACK(gen_fps_changed),
+                               filter);
+
     add_fill_to_box(LIVES_BOX(hbox));
   }
-  
-  for (i=0;i<num_chans;i++) {
+
+  for (i=0; i<num_chans; i++) {
     tmpl=ctmpls[i];
 
     // TODO *** - "host_disabled" should be for inst, not template !
     if (weed_plant_has_leaf(tmpl,"host_disabled")&&weed_get_boolean_value(tmpl,"host_disabled",&error)==WEED_TRUE) continue;
     if (weed_plant_has_leaf(tmpl,"width")&&weed_get_int_value(tmpl,"width",&error)!=0) continue;
     if (weed_plant_has_leaf(tmpl,"height")&&weed_get_int_value(tmpl,"height",&error)!=0) continue;
-   
+
     added=TRUE;
- 
+
     if (chk_params) continue;
 
     if (rfx->is_template) {
       cname=weed_get_string_value(tmpl,"name",&error);
-      ltxt=g_strdup_printf(_("%s : size"),cname);
-      weed_free(cname);
-    }
-    else {
-      ltxt=g_strdup(_("New size (pixels)"));
+      ltxt=lives_strdup_printf(_("%s : size"),cname);
+      lives_free(cname);
+    } else {
+      ltxt=lives_strdup(_("New size (pixels)"));
     }
 
     label=lives_standard_label_new(ltxt);
-    g_free(ltxt);
+    lives_free(ltxt);
 
-    hbox = lives_hbox_new (FALSE, 0);
-    lives_box_pack_start (LIVES_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
-    lives_box_pack_start (LIVES_BOX (hbox), label, FALSE, FALSE, widget_opts.packing_width);
+    hbox = lives_hbox_new(FALSE, 0);
+    lives_box_pack_start(LIVES_BOX(vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
+    lives_box_pack_start(LIVES_BOX(hbox), label, FALSE, FALSE, widget_opts.packing_width);
 
 
     if (weed_plant_has_leaf(tmpl,"host_width")) def_width=weed_get_int_value(tmpl,"host_width",&error);
@@ -614,13 +613,13 @@
     width_step=1;
     if (weed_plant_has_leaf(tmpl,"hstep")) width_step=weed_get_int_value(tmpl,"hstep",&error);
 
-    spinbuttonw = lives_standard_spin_button_new (_("_Width"),TRUE,def_width,4.,max_width,width_step==1?4:width_step,
-						  width_step==1?16:width_step*4,0,
-						  LIVES_BOX(hbox),NULL);
-
-    lives_signal_connect_after (LIVES_GUI_OBJECT (spinbuttonw), "value_changed",
-			    LIVES_GUI_CALLBACK (gen_width_changed),
-			    tmpl);
+    spinbuttonw = lives_standard_spin_button_new(_("_Width"),TRUE,def_width,4.,max_width,width_step==1?4:width_step,
+                  width_step==1?16:width_step*4,0,
+                  LIVES_BOX(hbox),NULL);
+
+    lives_signal_connect_after(LIVES_GUI_OBJECT(spinbuttonw), LIVES_WIDGET_VALUE_CHANGED_SIGNAL,
+                               LIVES_GUI_CALLBACK(gen_width_changed),
+                               tmpl);
     weed_leaf_delete(tmpl,"host_width"); // force a reset
     gen_width_changed(LIVES_SPIN_BUTTON(spinbuttonw),tmpl);
 
@@ -633,13 +632,13 @@
     if (weed_plant_has_leaf(tmpl,"vstep")) height_step=weed_get_int_value(tmpl,"vstep",&error);
 
 
-    spinbuttonh = lives_standard_spin_button_new (_("_Height"),TRUE,def_height,4.,max_height,height_step==1?4:height_step,
-						  height_step==1?16:height_step*4,0,
-						  LIVES_BOX(hbox),NULL);
-
-    lives_signal_connect_after (LIVES_GUI_OBJECT (spinbuttonh), "value_changed",
-			    LIVES_GUI_CALLBACK (gen_height_changed),
-			    tmpl);
+    spinbuttonh = lives_standard_spin_button_new(_("_Height"),TRUE,def_height,4.,max_height,height_step==1?4:height_step,
+                  height_step==1?16:height_step*4,0,
+                  LIVES_BOX(hbox),NULL);
+
+    lives_signal_connect_after(LIVES_GUI_OBJECT(spinbuttonh), LIVES_WIDGET_VALUE_CHANGED_SIGNAL,
+                               LIVES_GUI_CALLBACK(gen_height_changed),
+                               tmpl);
     weed_leaf_delete(tmpl,"host_height"); // force a reset
     gen_height_changed(LIVES_SPIN_BUTTON(spinbuttonh),tmpl);
 
@@ -655,8 +654,8 @@
       aspect_height.widgets[0]=spinbuttonh;
 
       set_aspect_ratio_widgets(&aspect_width,&aspect_height);
-      check_for_special (rfx,&aspect_width,vbox);
-      check_for_special (rfx,&aspect_height,vbox);
+      check_for_special(rfx,&aspect_width,vbox);
+      check_for_special(rfx,&aspect_height,vbox);
     }
 
   }
@@ -675,48 +674,50 @@
   LiVESWidget *radiobutton;
   LiVESWidget *hseparator;
 
-  LiVESWidget *hbox = lives_hbox_new (FALSE, 0);
+  LiVESWidget *hbox = lives_hbox_new(FALSE, 0);
+
+  char *tmp,*tmp2;
 
-  gchar *tmp,*tmp2;
+  lives_box_pack_start(LIVES_BOX(vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
 
-  lives_box_pack_start (LIVES_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
-  
-  radiobutton = lives_standard_radio_button_new ((tmp=g_strdup(_ ("Generate to _Clipboard"))),
-						 TRUE,radiobutton_group,LIVES_BOX(hbox),
-						 (tmp2=g_strdup(_("Generate frames to the clipboard"))));
+  radiobutton = lives_standard_radio_button_new((tmp=lives_strdup(_("Generate to _Clipboard"))),
+                TRUE,radiobutton_group,LIVES_BOX(hbox),
+                (tmp2=lives_strdup(_("Generate frames to the clipboard"))));
 
-  g_free(tmp); g_free(tmp2);
+  lives_free(tmp);
+  lives_free(tmp2);
+
+  radiobutton_group = lives_radio_button_get_group(LIVES_RADIO_BUTTON(radiobutton));
 
-  radiobutton_group = lives_radio_button_get_group (LIVES_RADIO_BUTTON (radiobutton));
-  
   widget_opts.pack_end=TRUE;
-  radiobutton=lives_standard_radio_button_new((tmp=g_strdup(_("Generate to _New Clip"))),
-					      TRUE,radiobutton_group,LIVES_BOX(hbox),
-					      (tmp2=g_strdup(_("Generate frames to a new clip"))));
+  radiobutton=lives_standard_radio_button_new((tmp=lives_strdup(_("Generate to _New Clip"))),
+              TRUE,radiobutton_group,LIVES_BOX(hbox),
+              (tmp2=lives_strdup(_("Generate frames to a new clip"))));
   widget_opts.pack_end=FALSE;
 
-  g_free(tmp); g_free(tmp2);
+  lives_free(tmp);
+  lives_free(tmp2);
 
-  hseparator = lives_hseparator_new ();
-  lives_box_pack_start (vbox, hseparator, FALSE, FALSE, 0);
+  hseparator = lives_hseparator_new();
+  lives_box_pack_start(vbox, hseparator, FALSE, FALSE, 0);
 
-  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (radiobutton), !mainw->gen_to_clipboard);
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(radiobutton), !mainw->gen_to_clipboard);
 
-  lives_signal_connect_after (LIVES_GUI_OBJECT (radiobutton), LIVES_WIDGET_TOGGLED_EVENT,
-			  LIVES_GUI_CALLBACK (gen_cb_toggled),
-			  (gpointer)rfx);
+  lives_signal_connect_after(LIVES_GUI_OBJECT(radiobutton), LIVES_WIDGET_TOGGLED_SIGNAL,
+                             LIVES_GUI_CALLBACK(gen_cb_toggled),
+                             (livespointer)rfx);
 
 }
 
 
 
 
-void on_render_fx_pre_activate (LiVESMenuItem *menuitem, lives_rfx_t *rfx) {
+void on_render_fx_pre_activate(LiVESMenuItem *menuitem, lives_rfx_t *rfx) {
   on_fx_pre_activate(rfx,0,NULL);
 }
 
 
-void on_fx_pre_activate (lives_rfx_t *rfx, int didx, LiVESWidget *pbox) {
+void on_fx_pre_activate(lives_rfx_t *rfx, int didx, LiVESWidget *pbox) {
   // didx:
   // 0 == rendered fx
   // 1 == pbox==NULL : standalone window for mapper
@@ -730,9 +731,9 @@
 
   LiVESAccelGroup *fxw_accel_group;
 
-  GList *retvals=NULL;
+  LiVESList *retvals=NULL;
 
-  gchar *txt;
+  char *txt;
 
   boolean no_process=FALSE;
 
@@ -743,25 +744,27 @@
 
   boolean has_param;
 
+  int scrw,scrh;
+
   if (didx==0&&!check_storage_space((mainw->current_file>-1)?cfile:NULL,FALSE)) return;
 
   // TODO - remove this and check in rfx / realfx activate
 
   if (rfx->num_in_channels>0) {
     if (didx==0&&!(prefs->warning_mask&WARN_MASK_LAYOUT_ALTER_FRAMES)&&
-	(mainw->xlays=layout_frame_is_affected(mainw->current_file,1))!=NULL) {
+        (mainw->xlays=layout_frame_is_affected(mainw->current_file,1))!=NULL) {
       if (!do_layout_alter_frames_warning()) {
-	g_list_free_strings(mainw->xlays);
-	g_list_free(mainw->xlays);
-	
-	mainw->xlays=NULL;
+        lives_list_free_strings(mainw->xlays);
+        lives_list_free(mainw->xlays);
+
+        mainw->xlays=NULL;
       }
     }
   }
 
   if (mainw->multitrack!=NULL) {
     if (mainw->multitrack->idlefunc>0) {
-      g_source_remove(mainw->multitrack->idlefunc);
+      lives_source_remove(mainw->multitrack->idlefunc);
       mainw->multitrack->idlefunc=0;
     }
     mt_desensitise(mainw->multitrack);
@@ -770,8 +773,7 @@
   if (didx==1) {
     no_process=TRUE;
     is_realtime=TRUE;
-  }
-  else if (rfx->status!=RFX_STATUS_WEED) {
+  } else if (rfx->status!=RFX_STATUS_WEED) {
     retvals=do_onchange_init(rfx);
   }
 
@@ -785,18 +787,18 @@
     if (!get_new_handle((new_file=mainw->first_free_file),NULL)) {
 
       if (mainw->multitrack!=NULL) {
-	mt_sensitise(mainw->multitrack);
-	mainw->multitrack->idlefunc=mt_idle_add(mainw->multitrack);
+        mt_sensitise(mainw->multitrack);
+        mainw->multitrack->idlefunc=mt_idle_add(mainw->multitrack);
       }
 
       if (retvals!=NULL) {
-	g_list_free_strings (retvals);
-	g_list_free (retvals);
+        lives_list_free_strings(retvals);
+        lives_list_free(retvals);
       }
 
       return;
     }
-    
+
     mainw->is_generating=TRUE;
     mainw->current_file=new_file;
 
@@ -809,26 +811,26 @@
     // check we have a real clip open
     if (mainw->current_file<=0) {
       if (retvals!=NULL) {
-	g_list_free_strings (retvals);
-	g_list_free (retvals);
+        lives_list_free_strings(retvals);
+        lives_list_free(retvals);
       }
       return;
     }
     if (cfile->end-cfile->start+1<rfx->min_frames) {
       if (retvals!=NULL) {
-	g_list_free_strings (retvals);
-	g_list_free (retvals);
+        lives_list_free_strings(retvals);
+        lives_list_free(retvals);
       }
-      txt=g_strdup_printf (_("\nYou must select at least %d frames to use this effect.\n\n"),rfx->min_frames);
-      do_blocking_error_dialog (txt);
-      g_free (txt);
+      txt=lives_strdup_printf(_("\nYou must select at least %d frames to use this effect.\n\n"),rfx->min_frames);
+      do_blocking_error_dialog(txt);
+      lives_free(txt);
       return;
     }
-    
+
     // here we invalidate cfile->ohsize, cfile->ovsize
     cfile->ohsize=cfile->hsize;
     cfile->ovsize=cfile->vsize;
-    
+
     if (cfile->undo_action==UNDO_RESIZABLE) {
       set_undoable(NULL,FALSE);
     }
@@ -836,11 +838,25 @@
 
 
   if (pbox==NULL) {
-    txt=g_strdup_printf ("LiVES: - %s",_(rfx->menu_text));
+
+    if (prefs->gui_monitor!=0) {
+      scrw=mainw->mgeom[prefs->gui_monitor-1].width;
+      scrh=mainw->mgeom[prefs->gui_monitor-1].height;
+    } else {
+      scrw=mainw->scr_width;
+      scrh=mainw->scr_height;
+    }
+
+    scrh-=SCR_HEIGHT_SAFETY;
+    scrw-=SCR_WIDTH_SAFETY;
+
+    if (rfx->status==RFX_STATUS_WEED||no_process||(rfx->num_in_channels==0&&rfx->props&RFX_PROPS_BATCHG)) scrw=RFX_WINSIZE_H;
+
+    txt=lives_strdup_printf("LiVES: - %s",_(rfx->menu_text));
     widget_opts.non_modal=TRUE;
-    fx_dialog[didx] = lives_standard_dialog_new (txt,FALSE);
+    fx_dialog[didx] = lives_standard_dialog_new(txt,FALSE,scrw,RFX_WINSIZE_V);
     widget_opts.non_modal=FALSE;
-    g_free (txt);
+    lives_free(txt);
   }
 
   if (rfx->status==RFX_STATUS_WEED&&rfx->is_template) is_defaults=TRUE;
@@ -855,8 +871,8 @@
 
   if (pbox==NULL) {
     pbox = top_dialog_vbox = lives_dialog_get_content_area(LIVES_DIALOG(fx_dialog[didx]));
-    g_object_set_data(G_OBJECT(fx_dialog[didx]),"rfx",rfx);
-    
+    lives_widget_object_set_data(LIVES_WIDGET_OBJECT(fx_dialog[didx]),"rfx",rfx);
+
     lives_widget_set_hexpand(pbox,TRUE);
     lives_widget_set_vexpand(pbox,TRUE);
   }
@@ -865,29 +881,27 @@
   if (rfx->status!=RFX_STATUS_WEED&&!no_process) {
     // rendered fx preview
 
-    LiVESWidget *hbox = lives_hbox_new (FALSE, 0);
-    lives_box_pack_start (LIVES_BOX (top_dialog_vbox), hbox, FALSE, FALSE, 0);
+    LiVESWidget *hbox = lives_hbox_new(FALSE, 0);
+    lives_box_pack_start(LIVES_BOX(top_dialog_vbox), hbox, FALSE, FALSE, 0);
 
     lives_widget_set_hexpand(hbox,TRUE);
     lives_widget_set_vexpand(hbox,TRUE);
 
-
-    pbox = lives_vbox_new (FALSE, 0);
-    lives_box_pack_start (LIVES_BOX (hbox), pbox, FALSE, FALSE, 0);
+    pbox = lives_vbox_new(FALSE, 0);
+    lives_box_pack_start(LIVES_BOX(hbox), pbox, TRUE, TRUE, 0);
 
     lives_widget_set_hexpand(pbox,TRUE);
     lives_widget_set_vexpand(pbox,TRUE);
-    
+
     // add preview window
     if (rfx->num_in_channels>0) {
       mainw->framedraw_frame=cfile->start;
       widget_add_framedraw(LIVES_VBOX(pbox),cfile->start,cfile->end,!(rfx->props&RFX_PROPS_MAY_RESIZE),
-			   cfile->hsize,cfile->vsize);
-    }
-    else {
+                           cfile->hsize,cfile->vsize);
+    } else {
       if (!(rfx->props&RFX_PROPS_BATCHG)) {
-	mainw->framedraw_frame=0;
-	widget_add_framedraw(LIVES_VBOX(pbox),1,1,TRUE,MAX_PRE_X,MAX_PRE_Y);
+        mainw->framedraw_frame=0;
+        widget_add_framedraw(LIVES_VBOX(pbox),1,1,TRUE,MAX_PRE_X,MAX_PRE_Y);
       }
     }
 
@@ -897,129 +911,124 @@
     }
   }
 
-  has_param=make_param_box(LIVES_VBOX (pbox), rfx);
+  has_param=make_param_box(LIVES_VBOX(pbox), rfx);
 
   // update widgets from onchange_init here
 
   if (top_dialog_vbox!=NULL) {
 
-    cancelbutton = lives_button_new_from_stock (LIVES_STOCK_CANCEL);
-    
-    fxw_accel_group = LIVES_ACCEL_GROUP(lives_accel_group_new ());
-    lives_window_add_accel_group (LIVES_WINDOW (fx_dialog[didx]), fxw_accel_group);
+    cancelbutton = lives_button_new_from_stock(LIVES_STOCK_CANCEL);
+
+    fxw_accel_group = LIVES_ACCEL_GROUP(lives_accel_group_new());
+    lives_window_add_accel_group(LIVES_WINDOW(fx_dialog[didx]), fxw_accel_group);
 
-    dialog_action_area = lives_dialog_get_action_area(LIVES_DIALOG (fx_dialog[didx]));
+    dialog_action_area = lives_dialog_get_action_area(LIVES_DIALOG(fx_dialog[didx]));
 
     if (!no_process||is_defaults||rfx->status==RFX_STATUS_SCRAP) {
-      lives_button_box_set_layout (LIVES_BUTTON_BOX (dialog_action_area), LIVES_BUTTONBOX_END);
-      lives_dialog_add_action_widget (LIVES_DIALOG (fx_dialog[didx]), cancelbutton, LIVES_RESPONSE_CANCEL);
-      lives_widget_add_accelerator (cancelbutton, LIVES_WIDGET_CLICKED_EVENT, fxw_accel_group,
-				    LIVES_KEY_Escape, (LiVESXModifierType)0, (LiVESAccelFlags)0);
+      lives_button_box_set_layout(LIVES_BUTTON_BOX(dialog_action_area), LIVES_BUTTONBOX_END);
+      lives_dialog_add_action_widget(LIVES_DIALOG(fx_dialog[didx]), cancelbutton, LIVES_RESPONSE_CANCEL);
+      lives_widget_add_accelerator(cancelbutton, LIVES_WIDGET_CLICKED_SIGNAL, fxw_accel_group,
+                                   LIVES_KEY_Escape, (LiVESXModifierType)0, (LiVESAccelFlags)0);
 
       if (is_defaults) {
-	okbutton = lives_button_new_with_mnemonic (_("Set as default"));
-	if (!has_param) lives_widget_set_sensitive(okbutton,FALSE);
-	resetbutton = lives_button_new_with_mnemonic (_("Reset"));
-	if (!has_param) lives_widget_set_sensitive(resetbutton,FALSE);
-	lives_dialog_add_action_widget (LIVES_DIALOG (fx_dialog[didx]), resetbutton, LIVES_RESET);
-      }
-      else okbutton = lives_button_new_from_stock (LIVES_STOCK_OK);
-      lives_dialog_add_action_widget (LIVES_DIALOG (fx_dialog[didx]), okbutton, LIVES_RESPONSE_OK);
-    }
-    else {
-      okbutton = lives_button_new_with_mnemonic (_("Set as default"));
+        okbutton = lives_button_new_with_mnemonic(_("Set as default"));
+        if (!has_param) lives_widget_set_sensitive(okbutton,FALSE);
+        resetbutton = lives_button_new_with_mnemonic(_("Reset"));
+        if (!has_param) lives_widget_set_sensitive(resetbutton,FALSE);
+        lives_dialog_add_action_widget(LIVES_DIALOG(fx_dialog[didx]), resetbutton, LIVES_RESPONSE_RESET);
+      } else okbutton = lives_button_new_from_stock(LIVES_STOCK_OK);
+      lives_dialog_add_action_widget(LIVES_DIALOG(fx_dialog[didx]), okbutton, LIVES_RESPONSE_OK);
+    } else {
+      okbutton = lives_button_new_with_mnemonic(_("Set as default"));
       if (!has_param) lives_widget_set_sensitive(okbutton,FALSE);
-      cancelbutton = lives_button_new_with_mnemonic (_("Close _window"));
+      cancelbutton = lives_button_new_with_mnemonic(_("Close _window"));
       if (no_process) {
-	LiVESWidget *dialog_action_area = lives_dialog_get_action_area(LIVES_DIALOG (fx_dialog[didx]));
-	lives_button_box_set_button_width (LIVES_BUTTON_BOX (dialog_action_area), okbutton, DEF_BUTTON_WIDTH*4);
+        LiVESWidget *dialog_action_area = lives_dialog_get_action_area(LIVES_DIALOG(fx_dialog[didx]));
+        lives_button_box_set_button_width(LIVES_BUTTON_BOX(dialog_action_area), okbutton, DEF_BUTTON_WIDTH*4);
       }
       if (rfx->status==RFX_STATUS_WEED) {
-	resetbutton = lives_button_new_with_mnemonic (_("Reset"));
-	lives_dialog_add_action_widget (LIVES_DIALOG (fx_dialog[didx]), resetbutton, LIVES_RESET);
-	lives_dialog_add_action_widget (LIVES_DIALOG (fx_dialog[didx]), okbutton, LIVES_RESPONSE_OK);
+        resetbutton = lives_button_new_with_mnemonic(_("Reset"));
+        lives_dialog_add_action_widget(LIVES_DIALOG(fx_dialog[didx]), resetbutton, LIVES_RESPONSE_RESET);
+        lives_dialog_add_action_widget(LIVES_DIALOG(fx_dialog[didx]), okbutton, LIVES_RESPONSE_OK);
       }
-      lives_dialog_add_action_widget (LIVES_DIALOG (fx_dialog[didx]), cancelbutton, LIVES_RESPONSE_CANCEL);
-      lives_widget_add_accelerator (cancelbutton, LIVES_WIDGET_CLICKED_EVENT, fxw_accel_group,
-				    LIVES_KEY_Escape, (LiVESXModifierType)0, (LiVESAccelFlags)0);
+      lives_dialog_add_action_widget(LIVES_DIALOG(fx_dialog[didx]), cancelbutton, LIVES_RESPONSE_CANCEL);
+      lives_widget_add_accelerator(cancelbutton, LIVES_WIDGET_CLICKED_SIGNAL, fxw_accel_group,
+                                   LIVES_KEY_Escape, (LiVESXModifierType)0, (LiVESAccelFlags)0);
 
     }
 
-    lives_widget_set_can_focus (cancelbutton,TRUE);
+    lives_widget_set_can_focus(cancelbutton,TRUE);
 
     if (lives_widget_get_parent(okbutton)!=NULL) {
-      lives_widget_set_can_focus_and_default (okbutton);
-      lives_widget_grab_default (okbutton);
+      lives_widget_set_can_focus_and_default(okbutton);
+      lives_widget_grab_default(okbutton);
     }
 
-    lives_widget_show_all (fx_dialog[didx]);
+    lives_widget_show_all(fx_dialog[didx]);
 
     if (no_process&&!is_defaults) {
       if (!is_realtime) {
-	if (lives_widget_get_parent(okbutton)!=NULL)
-	  lives_signal_connect (LIVES_GUI_OBJECT (okbutton), LIVES_WIDGET_CLICKED_EVENT,
-			    LIVES_GUI_CALLBACK (on_paramwindow_cancel_clicked),
-			    rfx);
-	lives_signal_connect (LIVES_GUI_OBJECT (cancelbutton), LIVES_WIDGET_CLICKED_EVENT,
-			  LIVES_GUI_CALLBACK (on_paramwindow_cancel_clicked),
-			  rfx);
-	lives_signal_connect (LIVES_GUI_OBJECT (fx_dialog[didx]), "delete_event",
-			  LIVES_GUI_CALLBACK (on_paramwindow_cancel_clicked),
-			  rfx);
-      }
-      else {
-	lives_signal_connect (LIVES_GUI_OBJECT (cancelbutton), LIVES_WIDGET_CLICKED_EVENT,
-			  LIVES_GUI_CALLBACK (on_paramwindow_cancel_clicked2),
-			  rfx);
-	if (rfx->status==RFX_STATUS_SCRAP)
-	  lives_signal_connect (LIVES_GUI_OBJECT (okbutton), LIVES_WIDGET_CLICKED_EVENT,
-			    LIVES_GUI_CALLBACK (on_paramwindow_cancel_clicked2),
-			    rfx);
-	else {
-	  lives_signal_connect (LIVES_GUI_OBJECT (okbutton), LIVES_WIDGET_CLICKED_EVENT,
-			    LIVES_GUI_CALLBACK (rte_set_key_defs),
-			    rfx);
-	  if (resetbutton!=NULL) {
-	    lives_signal_connect_after (LIVES_GUI_OBJECT (resetbutton), LIVES_WIDGET_CLICKED_EVENT,
-				    LIVES_GUI_CALLBACK (rte_reset_defs_clicked),
-				    rfx);
-	  }
-	}
-	lives_signal_connect (LIVES_GUI_OBJECT (fx_dialog[didx]), "delete_event",
-			  LIVES_GUI_CALLBACK (on_paramwindow_cancel_clicked2),
-			  rfx);
+        if (lives_widget_get_parent(okbutton)!=NULL)
+          lives_signal_connect(LIVES_GUI_OBJECT(okbutton), LIVES_WIDGET_CLICKED_SIGNAL,
+                               LIVES_GUI_CALLBACK(on_paramwindow_cancel_clicked),
+                               rfx);
+        lives_signal_connect(LIVES_GUI_OBJECT(cancelbutton), LIVES_WIDGET_CLICKED_SIGNAL,
+                             LIVES_GUI_CALLBACK(on_paramwindow_cancel_clicked),
+                             rfx);
+        lives_signal_connect(LIVES_GUI_OBJECT(fx_dialog[didx]), LIVES_WIDGET_DELETE_EVENT,
+                             LIVES_GUI_CALLBACK(on_paramwindow_cancel_clicked),
+                             rfx);
+      } else {
+        lives_signal_connect(LIVES_GUI_OBJECT(cancelbutton), LIVES_WIDGET_CLICKED_SIGNAL,
+                             LIVES_GUI_CALLBACK(on_paramwindow_cancel_clicked2),
+                             rfx);
+        if (rfx->status==RFX_STATUS_SCRAP)
+          lives_signal_connect(LIVES_GUI_OBJECT(okbutton), LIVES_WIDGET_CLICKED_SIGNAL,
+                               LIVES_GUI_CALLBACK(on_paramwindow_cancel_clicked2),
+                               rfx);
+        else {
+          lives_signal_connect(LIVES_GUI_OBJECT(okbutton), LIVES_WIDGET_CLICKED_SIGNAL,
+                               LIVES_GUI_CALLBACK(rte_set_key_defs),
+                               rfx);
+          if (resetbutton!=NULL) {
+            lives_signal_connect_after(LIVES_GUI_OBJECT(resetbutton), LIVES_WIDGET_CLICKED_SIGNAL,
+                                       LIVES_GUI_CALLBACK(rte_reset_defs_clicked),
+                                       rfx);
+          }
+        }
+        lives_signal_connect(LIVES_GUI_OBJECT(fx_dialog[didx]), LIVES_WIDGET_DELETE_EVENT,
+                             LIVES_GUI_CALLBACK(on_paramwindow_cancel_clicked2),
+                             rfx);
       }
-    }
-    else {
+    } else {
       if (!is_defaults) {
-	lives_signal_connect (LIVES_GUI_OBJECT (okbutton), LIVES_WIDGET_CLICKED_EVENT,
-			  LIVES_GUI_CALLBACK (on_paramwindow_ok_clicked),
-			  (gpointer)rfx);
-	lives_signal_connect (LIVES_GUI_OBJECT (cancelbutton), LIVES_WIDGET_CLICKED_EVENT,
-			  LIVES_GUI_CALLBACK (on_paramwindow_cancel_clicked),
-			  (gpointer)rfx);
-	lives_signal_connect (LIVES_GUI_OBJECT (fx_dialog[didx]), "delete_event",
-			  LIVES_GUI_CALLBACK (on_paramwindow_cancel_clicked),
-			  (gpointer)rfx);
-
-      }
-      else {
-	lives_signal_connect_after (LIVES_GUI_OBJECT (okbutton), LIVES_WIDGET_CLICKED_EVENT,
-				LIVES_GUI_CALLBACK (rte_set_defs_ok),
-				rfx);
-	if (resetbutton!=NULL) {
-	  lives_signal_connect_after (LIVES_GUI_OBJECT (resetbutton), LIVES_WIDGET_CLICKED_EVENT,
-				  LIVES_GUI_CALLBACK (rte_reset_defs_clicked),
-				  rfx);
-	  g_object_set_data(G_OBJECT(resetbutton),"cancelbutton",(gpointer)cancelbutton);
-
-	}
-	lives_signal_connect (LIVES_GUI_OBJECT (cancelbutton), LIVES_WIDGET_CLICKED_EVENT,
-			  LIVES_GUI_CALLBACK (rte_set_defs_cancel),
-			  rfx);
-	lives_signal_connect (LIVES_GUI_OBJECT (fx_dialog[didx]), "delete_event",
-			  LIVES_GUI_CALLBACK (rte_set_defs_cancel),
-			  rfx);
+        lives_signal_connect(LIVES_GUI_OBJECT(okbutton), LIVES_WIDGET_CLICKED_SIGNAL,
+                             LIVES_GUI_CALLBACK(on_paramwindow_ok_clicked),
+                             (livespointer)rfx);
+        lives_signal_connect(LIVES_GUI_OBJECT(cancelbutton), LIVES_WIDGET_CLICKED_SIGNAL,
+                             LIVES_GUI_CALLBACK(on_paramwindow_cancel_clicked),
+                             (livespointer)rfx);
+        lives_signal_connect(LIVES_GUI_OBJECT(fx_dialog[didx]), LIVES_WIDGET_DELETE_EVENT,
+                             LIVES_GUI_CALLBACK(on_paramwindow_cancel_clicked),
+                             (livespointer)rfx);
+
+      } else {
+        lives_signal_connect_after(LIVES_GUI_OBJECT(okbutton), LIVES_WIDGET_CLICKED_SIGNAL,
+                                   LIVES_GUI_CALLBACK(rte_set_defs_ok),
+                                   rfx);
+        if (resetbutton!=NULL) {
+          lives_signal_connect_after(LIVES_GUI_OBJECT(resetbutton), LIVES_WIDGET_CLICKED_SIGNAL,
+                                     LIVES_GUI_CALLBACK(rte_reset_defs_clicked),
+                                     rfx);
+          lives_widget_object_set_data(LIVES_WIDGET_OBJECT(resetbutton),"cancelbutton",(livespointer)cancelbutton);
+
+        }
+        lives_signal_connect(LIVES_GUI_OBJECT(cancelbutton), LIVES_WIDGET_CLICKED_SIGNAL,
+                             LIVES_GUI_CALLBACK(rte_set_defs_cancel),
+                             rfx);
+        lives_signal_connect(LIVES_GUI_OBJECT(fx_dialog[didx]), LIVES_WIDGET_DELETE_EVENT,
+                             LIVES_GUI_CALLBACK(rte_set_defs_cancel),
+                             rfx);
       }
     }
   }
@@ -1029,26 +1038,25 @@
 
   if (retvals!=NULL) {
     // now apply visually anything we got from onchange_init
-    param_demarshall (rfx,retvals,TRUE,TRUE);
-    g_list_free_strings (retvals);
-    g_list_free (retvals);
+    param_demarshall(rfx,retvals,TRUE,TRUE);
+    lives_list_free_strings(retvals);
+    lives_list_free(retvals);
   }
 
 
 }
 
-  
+
 static void check_hidden_gui(weed_plant_t *inst, lives_param_t *param) {
   int error;
   weed_plant_t *wtmpl,*gui;
 
   if (param->reinit&&(weed_get_int_value(inst,"host_refs",&error)==2||
-		      (mainw->multitrack!=NULL&&mainw->multitrack->fx_box!=NULL&&
-		       mt_get_effect_time(mainw->multitrack)>0.))) {
+                      (mainw->multitrack!=NULL&&mainw->multitrack->fx_box!=NULL&&
+                       mt_get_effect_time(mainw->multitrack)>0.))) {
     // effect is running and user is editing the params (or in multitrack at not at fx time 0.)
     param->hidden|=HIDDEN_NEEDS_REINIT;
-  }
-  else if (param->hidden&HIDDEN_NEEDS_REINIT) param->hidden^=HIDDEN_NEEDS_REINIT;
+  } else if (param->hidden&HIDDEN_NEEDS_REINIT) param->hidden^=HIDDEN_NEEDS_REINIT;
 
   if ((wtmpl=(weed_plant_t *)param->source)==NULL) return;
 
@@ -1088,15 +1096,15 @@
   // put whole thing in scrolled window
   LiVESWidget *scrolledwindow;
 
-  GList *hints=NULL;
-  GList *onchange=NULL;
-  GList *layout=NULL;
+  LiVESList *hints=NULL;
+  LiVESList *onchange=NULL;
+  LiVESList *layout=NULL;
 
-  gchar **array;
-  gchar label_text[256]; // max length of a label in layout hints
+  char **array;
+  char label_text[256]; // max length of a label in layout hints
 
-  gchar *line;
-  gchar *type=NULL;
+  char *line;
+  char *type=NULL;
 
   boolean used[rfx->num_params];
   boolean has_box=FALSE;
@@ -1117,45 +1125,44 @@
   if (top_vbox==NULL) {
     // just check how many non-hidden params without displaying
     chk_params=TRUE;
-  }
-  else {
+  } else {
     mainw->textwidget_focus=NULL;
 
     // initialise special widgets
     init_special();
-    
+
     if (rfx->status==RFX_STATUS_WEED) usrgrp_to_livesgrp[1]=NULL;
     else usrgrp_to_livesgrp[0]=NULL;
 
     // paramwindow start, everything goes in top_hbox
-    
-    top_hbox = lives_hbox_new (FALSE, widget_opts.packing_width);
-    
+
+    top_hbox = lives_hbox_new(FALSE, widget_opts.packing_width);
+
     // param_vbox holds the dynamic parameters
-    param_vbox = lives_vbox_new (FALSE, widget_opts.packing_height);
+    param_vbox = lives_vbox_new(FALSE, widget_opts.packing_height);
 
-    lives_box_pack_start (LIVES_BOX (top_hbox), param_vbox, TRUE, TRUE, widget_opts.packing_width);
-    lives_box_set_spacing (LIVES_BOX (param_vbox), widget_opts.packing_height/2);
+    lives_box_pack_start(LIVES_BOX(top_hbox), param_vbox, TRUE, TRUE, widget_opts.packing_width);
+    lives_box_set_spacing(LIVES_BOX(param_vbox), widget_opts.packing_height/2);
   }
 
   switch (rfx->status) {
   case RFX_STATUS_BUILTIN:
-    type=g_strdup(PLUGIN_RENDERED_EFFECTS_BUILTIN);
+    type=lives_strdup(PLUGIN_RENDERED_EFFECTS_BUILTIN);
     break;
   case RFX_STATUS_CUSTOM:
-    type=g_strdup(PLUGIN_RENDERED_EFFECTS_CUSTOM);
+    type=lives_strdup(PLUGIN_RENDERED_EFFECTS_CUSTOM);
     break;
   case RFX_STATUS_SCRAP:
-      type=g_strdup(PLUGIN_RFX_SCRAP);
-      break;
+    type=lives_strdup(PLUGIN_RFX_SCRAP);
+    break;
   case RFX_STATUS_WEED:
-      internal=TRUE;
-      break;
+    internal=TRUE;
+    break;
   default:
-    type=g_strdup(PLUGIN_RENDERED_EFFECTS_TEST);
+    type=lives_strdup(PLUGIN_RENDERED_EFFECTS_TEST);
     break;
   }
-  
+
   // extras for multitrack
   if (mainw->multitrack!=NULL&&rfx->status==RFX_STATUS_WEED&&!chk_params) {
     weed_plant_t *filter=weed_instance_get_filter((weed_plant_t *)rfx->source,TRUE);
@@ -1178,137 +1185,133 @@
 
   if (!internal&&!chk_params) {
     // do onchange|init
-    if ((onchange=plugin_request_by_line (type,rfx->name,"get_onchange"))!=NULL) {
-      for (i=0;i<g_list_length (onchange);i++) {
-	array=g_strsplit ((gchar *)g_list_nth_data (onchange,i),rfx->delim,-1);
-	if (strcmp (array[0],"init")) {
-	  // note other onchanges so we don't have to keep parsing the list
-	  int which=atoi (array[0]);
-	  if (which>=0&&which<rfx->num_params) {
-	    rfx->params[which].onchange=TRUE;
-	  }
-	}
-	g_strfreev (array);
-      }
-      g_list_free_strings (onchange);
-      g_list_free (onchange);
-    }
-    hints=plugin_request_by_line (type,rfx->name,"get_param_window");
-    g_free(type);
-  }
-  else if (!chk_params) hints=get_external_window_hints(rfx);
+    if ((onchange=plugin_request_by_line(type,rfx->name,"get_onchange"))!=NULL) {
+      for (i=0; i<lives_list_length(onchange); i++) {
+        array=lives_strsplit((char *)lives_list_nth_data(onchange,i),rfx->delim,-1);
+        if (strcmp(array[0],"init")) {
+          // note other onchanges so we don't have to keep parsing the list
+          int which=atoi(array[0]);
+          if (which>=0&&which<rfx->num_params) {
+            rfx->params[which].onchange=TRUE;
+          }
+        }
+        lives_strfreev(array);
+      }
+      lives_list_free_strings(onchange);
+      lives_list_free(onchange);
+    }
+    hints=plugin_request_by_line(type,rfx->name,"get_param_window");
+    lives_free(type);
+  } else if (!chk_params) hints=get_external_window_hints(rfx);
 
   // do param window hints
   if (hints!=NULL) {
-    gchar *lstring=g_strconcat("layout",rfx->delim,NULL);
-    gchar *sstring=g_strconcat("special",rfx->delim,NULL);
-    gchar *istring=g_strconcat("internal",rfx->delim,NULL);
-    for (i=0;i<g_list_length (hints);i++) {
-      if (!strncmp ((gchar *)g_list_nth_data (hints,i),lstring,7)) {
-	layout=g_list_append (layout,g_strdup((gchar *)g_list_nth_data (hints,i)+7));
-      }
-      else if (!strncmp ((gchar *)g_list_nth_data (hints,i),istring,9)) {
-	layout=g_list_append (layout,g_strdup((gchar *)g_list_nth_data (hints,i)+9));
-      }
-      else if (!strncmp ((gchar *)g_list_nth_data (hints,i),sstring,8)) {
-	add_to_special((gchar *)g_list_nth_data (hints,i)+8,rfx);
-      }
-    }
-    g_list_free_strings (hints);
-    g_list_free (hints);  // no longer needed
-    g_free(lstring);
-    g_free(sstring);
+    char *lstring=lives_strconcat("layout",rfx->delim,NULL);
+    char *sstring=lives_strconcat("special",rfx->delim,NULL);
+    char *istring=lives_strconcat("internal",rfx->delim,NULL);
+    for (i=0; i<lives_list_length(hints); i++) {
+      if (!strncmp((char *)lives_list_nth_data(hints,i),lstring,7)) {
+        layout=lives_list_append(layout,lives_strdup((char *)lives_list_nth_data(hints,i)+7));
+      } else if (!strncmp((char *)lives_list_nth_data(hints,i),istring,9)) {
+        layout=lives_list_append(layout,lives_strdup((char *)lives_list_nth_data(hints,i)+9));
+      } else if (!strncmp((char *)lives_list_nth_data(hints,i),sstring,8)) {
+        add_to_special((char *)lives_list_nth_data(hints,i)+8,rfx);
+      }
+    }
+    lives_list_free_strings(hints);
+    lives_list_free(hints);   // no longer needed
+    lives_free(lstring);
+    lives_free(sstring);
   }
 
-  for (i=0;i<rfx->num_params;i++) {
+  for (i=0; i<rfx->num_params; i++) {
     used[i]=FALSE;
-    for (j=0;j<MAX_PARAM_WIDGETS;rfx->params[i].widgets[j++]=NULL);
+    for (j=0; j<MAX_PARAM_WIDGETS; rfx->params[i].widgets[j++]=NULL);
   }
 
   mainw->block_param_updates=TRUE; // block framedraw updates until all parameter widgets have been created
 
   // use layout hints to build as much as we can
-  for (i=0;i<g_list_length (layout);i++) {
+  for (i=0; i<lives_list_length(layout); i++) {
     has_box=FALSE;
     noslid=FALSE;
-    line=(gchar *)g_list_nth_data (layout,i);
-    num_tok=get_token_count (line,(unsigned int)rfx->delim[0]);
+    line=(char *)lives_list_nth_data(layout,i);
+    num_tok=get_token_count(line,(unsigned int)rfx->delim[0]);
     // ignore | inside strings
-    array=g_strsplit (line,rfx->delim,num_tok);
+    array=lives_strsplit(line,rfx->delim,num_tok);
     if (!strlen(array[num_tok-1])) num_tok--;
-    for (j=0;j<num_tok;j++) {
+    for (j=0; j<num_tok; j++) {
       if (!strcmp(array[j],"nextfilter")) {
-	// handling for compound fx - add an offset to the param number
-	poffset+=num_in_params_for_nth_instance((weed_plant_t *)rfx->source,inum);
-	inum++;
-	continue;
-      }
-
-      if (!strncmp (array[j],"p",1)&&(pnum=atoi ((gchar *)(array[j]+1)))>=0&&(pnum=pnum+poffset)<rfx->num_params&&!used[pnum]) {
-	param=&rfx->params[pnum];
-	if (rfx->source_type==LIVES_RFX_SOURCE_WEED) check_hidden_gui((weed_plant_t *)rfx->source,param);
-	if ((param->hidden&&param->hidden!=HIDDEN_NEEDS_REINIT)||
-	    param->type==LIVES_PARAM_UNDISPLAYABLE) continue;
-	// parameter, eg. p1
-	if (!has_box) {
-	  hbox = lives_hbox_new (FALSE, 0);
-	  lives_box_pack_start (LIVES_BOX (param_vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
-	  has_box=TRUE;
-	  has_param=TRUE;
-	}
-	if (add_param_to_box (LIVES_BOX (hbox),rfx,pnum,(j==(num_tok-1))&&!noslid)) noslid=TRUE;
-	used[pnum]=TRUE;
-	has_param=TRUE;
-      }
-      else if (!j&&!strcmp (array[j],"hseparator")&&has_param) {
-	add_hsep_to_box (LIVES_BOX (param_vbox));
-	j=num_tok;  // ignore anything after hseparator
-      }
-      else if (!strncmp (array[j],"fill",4)) {
-	// can be filln
-	if (strlen (array[j])==4||!(length=atoi (array[j]+4))) length=1;
-	if (!has_box) {
-	  hbox = lives_hbox_new (FALSE, 0);
-	  lives_box_pack_start (LIVES_BOX (param_vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
-	  has_box=TRUE;
-	}
-	for (k=0;k<length;k++) {
-	  add_fill_to_box (LIVES_BOX (hbox));
-	}
-      }
-      else if (!strncmp (array[j],"\"",1)) {
-	// label
-	if (!has_box) {
-	  hbox = lives_hbox_new (FALSE, 0);
-	  lives_box_pack_start (LIVES_BOX (param_vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
-	  has_box=TRUE;
-	}
-	g_snprintf (label_text,256,"%s",array[j]+1);
-	while (strcmp (array[j]+strlen (array[j])-1,"\"")&&j<num_tok-1) {
-	  g_strappend (label_text,256,array[++j]);
-	}
-	if (strlen (label_text)>1) {
-	  if (!strcmp (label_text+strlen (label_text)-1,"\"")) {
-	    memset (label_text+strlen (label_text)-1,0,1);
-	  }
-	  add_param_label_to_box (LIVES_BOX (hbox),TRUE,label_text);
-	}}}
-    g_strfreev (array);
+        // handling for compound fx - add an offset to the param number
+        poffset+=num_in_params_for_nth_instance((weed_plant_t *)rfx->source,inum);
+        inum++;
+        continue;
+      }
+
+      if (!strncmp(array[j],"p",1)&&(pnum=atoi((char *)(array[j]+1)))>=0&&(pnum=pnum+poffset)<rfx->num_params&&!used[pnum]) {
+        param=&rfx->params[pnum];
+        if (rfx->source_type==LIVES_RFX_SOURCE_WEED) check_hidden_gui((weed_plant_t *)rfx->source,param);
+        if ((param->hidden&&param->hidden!=HIDDEN_NEEDS_REINIT)||
+            param->type==LIVES_PARAM_UNDISPLAYABLE) continue;
+        // parameter, eg. p1
+        if (!has_box) {
+          hbox = lives_hbox_new(FALSE, 0);
+          lives_box_pack_start(LIVES_BOX(param_vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
+          has_box=TRUE;
+          has_param=TRUE;
+        }
+        if (add_param_to_box(LIVES_BOX(hbox),rfx,pnum,(j==(num_tok-1))&&!noslid)) noslid=TRUE;
+        used[pnum]=TRUE;
+        has_param=TRUE;
+      } else if (!j&&!strcmp(array[j],"hseparator")&&has_param) {
+        add_hsep_to_box(LIVES_BOX(param_vbox));
+        j=num_tok;  // ignore anything after hseparator
+      } else if (!strncmp(array[j],"fill",4)) {
+        // can be filln
+        if (strlen(array[j])==4||!(length=atoi(array[j]+4))) length=1;
+        if (!has_box) {
+          hbox = lives_hbox_new(FALSE, 0);
+          lives_box_pack_start(LIVES_BOX(param_vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
+          has_box=TRUE;
+        }
+        for (k=0; k<length; k++) {
+          add_fill_to_box(LIVES_BOX(hbox));
+        }
+      } else if (!strncmp(array[j],"\"",1)) {
+        // label
+        if (!has_box) {
+          hbox = lives_hbox_new(FALSE, 0);
+          lives_box_pack_start(LIVES_BOX(param_vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
+          has_box=TRUE;
+        }
+        lives_snprintf(label_text,256,"%s",array[j]+1);
+        while (strcmp(array[j]+strlen(array[j])-1,"\"")&&j<num_tok-1) {
+          lives_strappend(label_text,256,array[++j]);
+        }
+        if (strlen(label_text)>1) {
+          if (!strcmp(label_text+strlen(label_text)-1,"\"")) {
+            memset(label_text+strlen(label_text)-1,0,1);
+          }
+          add_param_label_to_box(LIVES_BOX(hbox),TRUE,label_text);
+        }
+      }
+    }
+    lives_strfreev(array);
   }
   if (layout!=NULL) {
-    g_list_free_strings (layout);
-    g_list_free (layout);
+    lives_list_free_strings(layout);
+    lives_list_free(layout);
   }
 
   // add any unused parameters
-  for (i=0;i<rfx->num_params;i++) {
+  for (i=0; i<rfx->num_params; i++) {
     rfx->params[i].changed=FALSE;
     if (rfx->source_type==LIVES_RFX_SOURCE_WEED) check_hidden_gui((weed_plant_t *)rfx->source,&rfx->params[i]);
     if ((rfx->params[i].hidden&&rfx->params[i].hidden!=HIDDEN_NEEDS_REINIT)||
-	rfx->params[i].type==LIVES_PARAM_UNDISPLAYABLE) continue;
+        rfx->params[i].type==LIVES_PARAM_UNDISPLAYABLE) continue;
     if (!used[i]) {
       if (!chk_params) {
-	add_param_to_box (LIVES_BOX (param_vbox),rfx,i,TRUE);
+        add_param_to_box(LIVES_BOX(param_vbox),rfx,i,TRUE);
       }
       has_param=TRUE;
     }
@@ -1321,8 +1324,8 @@
     if (enabled_in_channels(filter,FALSE)==0&&enabled_out_channels(filter,FALSE)>0&&has_video_chans_out(filter,TRUE)) {
       // out channel size(s) and target_fps for generators
       if (!chk_params) {
-	needs_sizes=TRUE;
-	if (mainw->overflow_height<900) mainw->overflow_height=900;
+        needs_sizes=TRUE;
+        if (mainw->overflow_height<900) mainw->overflow_height=900;
       }
       chk_params=TRUE;
     }
@@ -1331,23 +1334,22 @@
 
   if (!chk_params) {
     if (!has_param) {
-      hbox = lives_hbox_new (FALSE, 0);
-      lives_box_pack_start (LIVES_BOX (param_vbox), hbox, FALSE, FALSE, widget_opts.packing_height*2);
+      hbox = lives_hbox_new(FALSE, 0);
+      lives_box_pack_start(LIVES_BOX(param_vbox), hbox, FALSE, FALSE, widget_opts.packing_height*2);
       add_fill_to_box(LIVES_BOX(hbox));
       add_param_label_to_box(LIVES_BOX(hbox),FALSE,_("No parameters"));
       add_fill_to_box(LIVES_BOX(hbox));
     }
-    
+
     if (mainw->multitrack==NULL||rfx->status!=RFX_STATUS_WEED) {
       if (mainw->scr_height>=mainw->overflow_height)
-	scrolledwindow=lives_standard_scrolled_window_new(RFX_WINSIZE_H,RFX_WINSIZE_V,top_hbox);
-      else 
-	scrolledwindow=lives_standard_scrolled_window_new(RFX_WINSIZE_H,RFX_WINSIZE_V>>1,top_hbox);
-    }
-    else 
+        scrolledwindow=lives_standard_scrolled_window_new(RFX_WINSIZE_H,RFX_WINSIZE_V,top_hbox);
+      else
+        scrolledwindow=lives_standard_scrolled_window_new(RFX_WINSIZE_H,RFX_WINSIZE_V>>1,top_hbox);
+    } else
       scrolledwindow=lives_standard_scrolled_window_new(-1,-1,top_hbox);
 
-    lives_box_pack_start (LIVES_BOX (top_vbox), scrolledwindow, TRUE, TRUE, 0);
+    lives_box_pack_start(LIVES_BOX(top_vbox), scrolledwindow, TRUE, TRUE, 0);
 
   }
 
@@ -1371,7 +1373,7 @@
 
 
 
-boolean add_param_to_box (LiVESBox *box, lives_rfx_t *rfx, int pnum, boolean add_slider) {
+boolean add_param_to_box(LiVESBox *box, lives_rfx_t *rfx, int pnum, boolean add_slider) {
   // box here is vbox inside top_hbox inside top_dialog
 
   // add paramter pnum for rfx to box
@@ -1381,7 +1383,10 @@
   LiVESWidget *checkbutton;
   LiVESWidget *radiobutton;
   LiVESWidget *spinbutton;
-  LiVESWidget *scale=NULL,*scale2;
+  LiVESWidget *scale=NULL;
+#ifdef ENABLE_GIW
+  LiVESWidget *scale2;
+#endif
   LiVESWidget *spinbutton_red;
   LiVESWidget *spinbutton_green;
   LiVESWidget *spinbutton_blue;
@@ -1399,13 +1404,13 @@
 
   lives_param_t *param;
   lives_widget_group_t *group;
-  GSList *rbgroup;
+  LiVESSList *rbgroup;
 
   lives_colRGB24_t rgb;
   LiVESWidgetColor colr;
 
-  gchar *name;
-  gchar *txt,*tmp,*tmp2;
+  char *name;
+  char *txt,*tmp,*tmp2;
   char *disp_string;
 
   boolean use_mnemonic;
@@ -1416,13 +1421,13 @@
   int def_packing_width=widget_opts.packing_width;
 
   if (pnum>=rfx->num_params) {
-    add_param_label_to_box (box,FALSE,(_("Invalid parameter")));
+    add_param_label_to_box(box,FALSE,(_("Invalid parameter")));
     return FALSE;
   }
 
   param=&rfx->params[pnum];
 
-  name=g_strdup_printf ("%s",param->label);
+  name=lives_strdup_printf("%s",param->label);
   use_mnemonic=param->use_mnemonic;
 
   // reinit can cause the window to be redrawn, which invalidates the slider adjustment...and bang !
@@ -1431,45 +1436,43 @@
 
   if (LIVES_IS_HBOX(LIVES_WIDGET(box))) {
     hbox=LIVES_WIDGET(box);
-  }
-  else {
-    hbox = lives_hbox_new (FALSE, 0);
-    lives_box_pack_start (LIVES_BOX (box), hbox, FALSE, FALSE, widget_opts.packing_height);
+  } else {
+    hbox = lives_hbox_new(FALSE, 0);
+    lives_box_pack_start(LIVES_BOX(box), hbox, FALSE, FALSE, widget_opts.packing_height);
   }
 
   switch (param->type) {
   case LIVES_PARAM_BOOL :
     if (!param->group) {
-      
+
       if (rfx->status==RFX_STATUS_WEED&&(disp_string=get_weed_display_string((weed_plant_t *)rfx->source,pnum))!=NULL) {
-	dlabel=lives_standard_label_new ((tmp=g_strdup_printf("(%s)",_ (disp_string))));
-	g_free(tmp);
-	weed_free(disp_string);
-	lives_box_pack_start (LIVES_BOX (hbox), dlabel, FALSE, FALSE, widget_opts.packing_width);
-	param->widgets[1]=dlabel;
+        dlabel=lives_standard_label_new((tmp=lives_strdup_printf("(%s)",_(disp_string))));
+        lives_free(tmp);
+        lives_free(disp_string);
+        lives_box_pack_start(LIVES_BOX(hbox), dlabel, FALSE, FALSE, widget_opts.packing_width);
+        param->widgets[1]=dlabel;
       }
 
 
       checkbutton=lives_standard_check_button_new(name,use_mnemonic,(LiVESBox *)hbox,param->desc);
-      lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (checkbutton), get_bool_param(param->value));
-      lives_signal_connect_after (LIVES_GUI_OBJECT (checkbutton), LIVES_WIDGET_TOGGLED_EVENT,
-			      LIVES_GUI_CALLBACK (after_boolean_param_toggled),
-			      (gpointer)rfx);
-      
+      lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(checkbutton), get_bool_param(param->value));
+      lives_signal_connect_after(LIVES_GUI_OBJECT(checkbutton), LIVES_WIDGET_TOGGLED_SIGNAL,
+                                 LIVES_GUI_CALLBACK(after_boolean_param_toggled),
+                                 (livespointer)rfx);
+
       // store parameter so we know whose trigger to use
-      g_object_set_data (G_OBJECT (checkbutton),"param_number",LIVES_INT_TO_POINTER (pnum));
+      lives_widget_object_set_data(LIVES_WIDGET_OBJECT(checkbutton),"param_number",LIVES_INT_TO_POINTER(pnum));
       param->widgets[0]=checkbutton;
       if (param->hidden) lives_widget_set_sensitive(checkbutton,FALSE);
-    }
-    else {
+    } else {
       group=get_group(rfx,param);
-      
+
       if (rfx->status==RFX_STATUS_WEED&&(disp_string=get_weed_display_string((weed_plant_t *)rfx->source,pnum))!=NULL) {
-	dlabel=lives_standard_label_new ((tmp=g_strdup_printf("(%s)",_ (disp_string))));
-	g_free(tmp);
-	weed_free(disp_string);
-	lives_box_pack_start (LIVES_BOX (hbox), dlabel, FALSE, FALSE, widget_opts.packing_width);
-	param->widgets[1]=dlabel;
+        dlabel=lives_standard_label_new((tmp=lives_strdup_printf("(%s)",_(disp_string))));
+        lives_free(tmp);
+        lives_free(disp_string);
+        lives_box_pack_start(LIVES_BOX(hbox), dlabel, FALSE, FALSE, widget_opts.packing_width);
+        param->widgets[1]=dlabel;
       }
 
       if (group!=NULL) rbgroup=group->rbgroup;
@@ -1478,36 +1481,34 @@
       radiobutton=lives_standard_radio_button_new(name,use_mnemonic,rbgroup,LIVES_BOX(hbox),param->desc);
 
       if (group==NULL) {
-	if (rfx->status==RFX_STATUS_WEED) {
-	  usrgrp_to_livesgrp[1]=add_usrgrp_to_livesgrp (usrgrp_to_livesgrp[1], 
-							lives_radio_button_get_group (LIVES_RADIO_BUTTON (radiobutton)), 
-							param->group);
-	}
-	else {
-	  usrgrp_to_livesgrp[0]=add_usrgrp_to_livesgrp (usrgrp_to_livesgrp[0], 
-							lives_radio_button_get_group (LIVES_RADIO_BUTTON (radiobutton)), 
-							param->group);
-	}
+        if (rfx->status==RFX_STATUS_WEED) {
+          usrgrp_to_livesgrp[1]=add_usrgrp_to_livesgrp(usrgrp_to_livesgrp[1],
+                                lives_radio_button_get_group(LIVES_RADIO_BUTTON(radiobutton)),
+                                param->group);
+        } else {
+          usrgrp_to_livesgrp[0]=add_usrgrp_to_livesgrp(usrgrp_to_livesgrp[0],
+                                lives_radio_button_get_group(LIVES_RADIO_BUTTON(radiobutton)),
+                                param->group);
+        }
       }
 
       group=get_group(rfx,param);
 
       if (group!=NULL) {
-	group->rbgroup=lives_radio_button_get_group (LIVES_RADIO_BUTTON (radiobutton));
-	if (get_bool_param(param->value)) {
-	  group->active_param=pnum+1;
-	}
-      }
-      else LIVES_WARN("Button group was NULL");
-
-      lives_signal_connect_after (LIVES_GUI_OBJECT (radiobutton), LIVES_WIDGET_TOGGLED_EVENT,
-			      LIVES_GUI_CALLBACK (after_boolean_param_toggled),
-			      (gpointer)rfx);
+        group->rbgroup=lives_radio_button_get_group(LIVES_RADIO_BUTTON(radiobutton));
+        if (get_bool_param(param->value)) {
+          group->active_param=pnum+1;
+        }
+      } else LIVES_WARN("Button group was NULL");
+
+      lives_signal_connect_after(LIVES_GUI_OBJECT(radiobutton), LIVES_WIDGET_TOGGLED_SIGNAL,
+                                 LIVES_GUI_CALLBACK(after_boolean_param_toggled),
+                                 (livespointer)rfx);
 
-      lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (radiobutton), get_bool_param(param->value));
+      lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(radiobutton), get_bool_param(param->value));
 
       // store parameter so we know whose trigger to use
-      g_object_set_data (G_OBJECT (radiobutton),"param_number",LIVES_INT_TO_POINTER (pnum));
+      lives_widget_object_set_data(LIVES_WIDGET_OBJECT(radiobutton),"param_number",LIVES_INT_TO_POINTER(pnum));
       param->widgets[0]=radiobutton;
       if (param->hidden) lives_widget_set_sensitive(radiobutton,FALSE);
     }
@@ -1516,35 +1517,34 @@
     was_num=TRUE;
 
     if (rfx->status==RFX_STATUS_WEED&&(disp_string=get_weed_display_string((weed_plant_t *)rfx->source,pnum))!=NULL) {
-      dlabel=lives_standard_label_new ((tmp=g_strdup_printf("%s",_ (disp_string))));
-      g_free(tmp);
-      weed_free(disp_string);
-      lives_box_pack_start (LIVES_BOX (hbox), dlabel, FALSE, FALSE, widget_opts.packing_width);
+      dlabel=lives_standard_label_new((tmp=lives_strdup_printf("%s",_(disp_string))));
+      lives_free(tmp);
+      lives_free(disp_string);
+      lives_box_pack_start(LIVES_BOX(hbox), dlabel, FALSE, FALSE, widget_opts.packing_width);
       param->widgets[1]=dlabel;
     }
 
     if (param->dp) {
-      spinbutton=lives_standard_spin_button_new(name, use_mnemonic, get_double_param(param->value), param->min, 
-						param->max, param->step_size, param->step_size, param->dp, 
-						(LiVESBox *)hbox, param->desc);
-    }
-    else {
-      spinbutton=lives_standard_spin_button_new(name, use_mnemonic, (double)get_int_param(param->value), param->min, 
-						param->max, param->step_size, param->step_size, param->dp, 
-						(LiVESBox *)hbox, param->desc);
+      spinbutton=lives_standard_spin_button_new(name, use_mnemonic, get_double_param(param->value), param->min,
+                 param->max, param->step_size, param->step_size, param->dp,
+                 (LiVESBox *)hbox, param->desc);
+    } else {
+      spinbutton=lives_standard_spin_button_new(name, use_mnemonic, (double)get_int_param(param->value), param->min,
+                 param->max, param->step_size, param->step_size, param->dp,
+                 (LiVESBox *)hbox, param->desc);
     }
 
 
     lives_spin_button_set_wrap(LIVES_SPIN_BUTTON(spinbutton),param->wrap);
 
-    lives_signal_connect_after (LIVES_GUI_OBJECT (spinbutton), "value_changed",
-			    LIVES_GUI_CALLBACK (after_param_value_changed),
-			    (gpointer)rfx);
-    
+    lives_signal_connect_after(LIVES_GUI_OBJECT(spinbutton), LIVES_WIDGET_VALUE_CHANGED_SIGNAL,
+                               LIVES_GUI_CALLBACK(after_param_value_changed),
+                               (livespointer)rfx);
+
     // store parameter so we know whose trigger to use
-    g_object_set_data (G_OBJECT (spinbutton),"param_number",LIVES_INT_TO_POINTER (pnum));
+    lives_widget_object_set_data(LIVES_WIDGET_OBJECT(spinbutton),"param_number",LIVES_INT_TO_POINTER(pnum));
     param->widgets[0]=spinbutton;
-    g_object_set_data (G_OBJECT (param->widgets[0]),"rfx",rfx);
+    lives_widget_object_set_data(LIVES_WIDGET_OBJECT(param->widgets[0]),"rfx",rfx);
     if (param->hidden) lives_widget_set_sensitive(spinbutton,FALSE);
 
 
@@ -1553,46 +1553,45 @@
 #ifdef ENABLE_GIW
       if (!prefs->lamp_buttons) {
 #endif
-	if (add_slider) {
-	  scale=lives_hscale_new(LIVES_ADJUSTMENT(spinbutton_adj));
-	  gtk_scale_set_draw_value(GTK_SCALE(scale),FALSE);
-	  lives_box_pack_start (LIVES_BOX (hbox), scale, TRUE, TRUE, 0);
-	}
+        if (add_slider) {
+          scale=lives_hscale_new(LIVES_ADJUSTMENT(spinbutton_adj));
+          lives_scale_set_draw_value(LIVES_SCALE(scale),FALSE);
+          lives_box_pack_start(LIVES_BOX(hbox), scale, TRUE, TRUE, 0);
+        }
 #ifdef ENABLE_GIW
-      }
-      else {
-	scale=giw_knob_new(LIVES_ADJUSTMENT(spinbutton_adj));
-	lives_widget_set_size_request(scale,GIW_KNOB_WIDTH,GIW_KNOB_HEIGHT);
-	giw_knob_set_legends_digits(GIW_KNOB(scale),0);
-	lives_box_pack_start (LIVES_BOX (hbox), scale, FALSE, FALSE, 0);
-	add_fill_to_box(LIVES_BOX(hbox));
-	lives_widget_set_fg_color(scale,LIVES_WIDGET_STATE_NORMAL,&palette->black);
-	lives_widget_set_fg_color(scale,LIVES_WIDGET_STATE_PRELIGHT,&palette->dark_orange);
-	if (add_slider) {
-	  scale2=lives_hscale_new(LIVES_ADJUSTMENT(spinbutton_adj));
-	  gtk_scale_set_draw_value(GTK_SCALE(scale2),FALSE);
-	  lives_box_pack_start (LIVES_BOX (hbox), scale2, TRUE, TRUE, 0);
-	  if (!LIVES_IS_HBOX(LIVES_WIDGET(box))) add_fill_to_box (LIVES_BOX (hbox));
-
-	  if (palette->style&STYLE_1) {
-	    lives_widget_set_bg_color (scale2, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
-	    lives_widget_set_text_color(scale2, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
-	    lives_widget_set_fg_color(scale2, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
-	  }
-	  if (param->desc!=NULL) lives_widget_set_tooltip_text(scale2, param->desc);
-	}
+      } else {
+        scale=giw_knob_new(LIVES_ADJUSTMENT(spinbutton_adj));
+        lives_widget_set_size_request(scale,GIW_KNOB_WIDTH,GIW_KNOB_HEIGHT);
+        giw_knob_set_legends_digits(GIW_KNOB(scale),0);
+        lives_box_pack_start(LIVES_BOX(hbox), scale, FALSE, FALSE, 0);
+        add_fill_to_box(LIVES_BOX(hbox));
+        lives_widget_set_fg_color(scale,LIVES_WIDGET_STATE_NORMAL,&palette->black);
+        lives_widget_set_fg_color(scale,LIVES_WIDGET_STATE_PRELIGHT,&palette->dark_orange);
+        if (add_slider) {
+          scale2=lives_hscale_new(LIVES_ADJUSTMENT(spinbutton_adj));
+          lives_scale_set_draw_value(LIVES_SCALE(scale2),FALSE);
+          lives_box_pack_start(LIVES_BOX(hbox), scale2, TRUE, TRUE, 0);
+          if (!LIVES_IS_HBOX(LIVES_WIDGET(box))) add_fill_to_box(LIVES_BOX(hbox));
+
+          if (palette->style&STYLE_1) {
+            lives_widget_set_bg_color(scale2, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+            lives_widget_set_text_color(scale2, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+            lives_widget_set_fg_color(scale2, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
+          }
+          if (param->desc!=NULL) lives_widget_set_tooltip_text(scale2, param->desc);
+        }
       }
 #endif
       if (palette->style&STYLE_1&&scale!=NULL) {
-	lives_widget_set_bg_color (scale, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
-	lives_widget_set_text_color(scale, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
-	lives_widget_set_fg_color(scale, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
+        lives_widget_set_bg_color(scale, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+        lives_widget_set_text_color(scale, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+        lives_widget_set_fg_color(scale, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
       }
 
       if (param->desc!=NULL) lives_widget_set_tooltip_text(scale, param->desc);
     }
     break;
-    
+
   case LIVES_PARAM_COLRGB24 :
     get_colRGB24_param(param->value,&rgb);
 
@@ -1608,59 +1607,58 @@
 
     cbutton = lives_color_button_new_with_color(&colr);
     lives_color_button_set_use_alpha(LIVES_COLOR_BUTTON(cbutton),FALSE);
-    lives_color_button_set_title (LIVES_COLOR_BUTTON(cbutton),_("LiVES: - Select Colour"));
+    lives_color_button_set_title(LIVES_COLOR_BUTTON(cbutton),_("LiVES: - Select Colour"));
     lives_color_button_set_color(LIVES_COLOR_BUTTON(cbutton),&colr);
 
-    g_object_set_data (G_OBJECT (cbutton),"param_number",LIVES_INT_TO_POINTER (pnum));
-    if (param->desc!=NULL) lives_widget_set_tooltip_text( cbutton, param->desc);
-    else lives_widget_set_tooltip_text( cbutton, (_("Click to set the colour")));
+    lives_widget_object_set_data(LIVES_WIDGET_OBJECT(cbutton),"param_number",LIVES_INT_TO_POINTER(pnum));
+    if (param->desc!=NULL) lives_widget_set_tooltip_text(cbutton, param->desc);
+    else lives_widget_set_tooltip_text(cbutton, (_("Click to set the colour")));
 
     if (use_mnemonic) {
-      labelcname=lives_standard_label_new_with_mnemonic (_(name),cbutton);
-    }
-    else labelcname=lives_standard_label_new (_(name));
+      labelcname=lives_standard_label_new_with_mnemonic(_(name),cbutton);
+    } else labelcname=lives_standard_label_new(_(name));
     if (param->desc!=NULL) lives_widget_set_tooltip_text(labelcname, param->desc);
 
-    lives_box_pack_start (LIVES_BOX (hbox), labelcname, FALSE, FALSE, widget_opts.packing_width);
+    lives_box_pack_start(LIVES_BOX(hbox), labelcname, FALSE, FALSE, widget_opts.packing_width);
 
     widget_opts.packing_width=4;
 
-    spinbutton_red = lives_standard_spin_button_new((tmp=g_strdup(_("_Red"))), TRUE, rgb.red, 0., 255., 1., 1., 0, 
-						    (LiVESBox *)hbox, (tmp2=g_strdup(_("The red value (0 - 255)"))));
-    g_free(tmp);
-    g_free(tmp2);
-    spinbutton_green = lives_standard_spin_button_new((tmp=g_strdup(_("_Green"))), TRUE, rgb.green, 0., 255., 1., 1., 0, 
-						      (LiVESBox *)hbox, (tmp2=g_strdup(_("The green value (0 - 255)"))));
-    g_free(tmp);
-    g_free(tmp2);
-    spinbutton_blue = lives_standard_spin_button_new((tmp=g_strdup(_("_Blue"))), TRUE, rgb.blue, 0., 255., 1., 1., 0, 
-						     (LiVESBox *)hbox, (tmp2=g_strdup(_("The blue value (0 - 255)"))));
-    g_free(tmp);
-    g_free(tmp2);
+    spinbutton_red = lives_standard_spin_button_new((tmp=lives_strdup(_("_Red"))), TRUE, rgb.red, 0., 255., 1., 1., 0,
+                     (LiVESBox *)hbox, (tmp2=lives_strdup(_("The red value (0 - 255)"))));
+    lives_free(tmp);
+    lives_free(tmp2);
+    spinbutton_green = lives_standard_spin_button_new((tmp=lives_strdup(_("_Green"))), TRUE, rgb.green, 0., 255., 1., 1., 0,
+                       (LiVESBox *)hbox, (tmp2=lives_strdup(_("The green value (0 - 255)"))));
+    lives_free(tmp);
+    lives_free(tmp2);
+    spinbutton_blue = lives_standard_spin_button_new((tmp=lives_strdup(_("_Blue"))), TRUE, rgb.blue, 0., 255., 1., 1., 0,
+                      (LiVESBox *)hbox, (tmp2=lives_strdup(_("The blue value (0 - 255)"))));
+    lives_free(tmp);
+    lives_free(tmp2);
 
     widget_opts.packing_width=def_packing_width;
 
-    lives_box_pack_start (LIVES_BOX (hbox), cbutton, TRUE, TRUE, widget_opts.packing_width);
+    lives_box_pack_start(LIVES_BOX(hbox), cbutton, TRUE, TRUE, widget_opts.packing_width);
+
+    lives_signal_connect(LIVES_GUI_OBJECT(cbutton), LIVES_WIDGET_COLOR_SET_SIGNAL,
+                         LIVES_GUI_CALLBACK(on_pwcolsel),
+                         (livespointer)rfx);
+
+    lives_signal_connect_after(LIVES_GUI_OBJECT(spinbutton_red), LIVES_WIDGET_VALUE_CHANGED_SIGNAL,
+                               LIVES_GUI_CALLBACK(after_param_red_changed),
+                               (livespointer)rfx);
+    lives_signal_connect_after(LIVES_GUI_OBJECT(spinbutton_green), LIVES_WIDGET_VALUE_CHANGED_SIGNAL,
+                               LIVES_GUI_CALLBACK(after_param_green_changed),
+                               (livespointer)rfx);
+    lives_signal_connect_after(LIVES_GUI_OBJECT(spinbutton_blue), LIVES_WIDGET_VALUE_CHANGED_SIGNAL,
+                               LIVES_GUI_CALLBACK(after_param_blue_changed),
+                               (livespointer)rfx);
 
-    lives_signal_connect (LIVES_GUI_OBJECT (cbutton), "color-set",
-		      LIVES_GUI_CALLBACK (on_pwcolsel),
-		      (gpointer)rfx);
-    
-    lives_signal_connect_after (LIVES_GUI_OBJECT (spinbutton_red), "value_changed",
-			    LIVES_GUI_CALLBACK (after_param_red_changed),
-			    (gpointer)rfx);
-    lives_signal_connect_after (LIVES_GUI_OBJECT (spinbutton_green), "value_changed",
-			    LIVES_GUI_CALLBACK (after_param_green_changed),
-			    (gpointer)rfx);
-    lives_signal_connect_after (LIVES_GUI_OBJECT (spinbutton_blue), "value_changed",
-			    LIVES_GUI_CALLBACK (after_param_blue_changed),
-			    (gpointer)rfx);
-    
     // store parameter so we know whose trigger to use
-    g_object_set_data (G_OBJECT (spinbutton_red),"param_number",LIVES_INT_TO_POINTER (pnum));
-    g_object_set_data (G_OBJECT (spinbutton_green),"param_number",LIVES_INT_TO_POINTER (pnum));
-    g_object_set_data (G_OBJECT (spinbutton_blue),"param_number",LIVES_INT_TO_POINTER (pnum));
-    
+    lives_widget_object_set_data(LIVES_WIDGET_OBJECT(spinbutton_red),"param_number",LIVES_INT_TO_POINTER(pnum));
+    lives_widget_object_set_data(LIVES_WIDGET_OBJECT(spinbutton_green),"param_number",LIVES_INT_TO_POINTER(pnum));
+    lives_widget_object_set_data(LIVES_WIDGET_OBJECT(spinbutton_blue),"param_number",LIVES_INT_TO_POINTER(pnum));
+
     param->widgets[0]=spinbutton_red;
     param->widgets[1]=spinbutton_green;
     param->widgets[2]=spinbutton_blue;
@@ -1681,92 +1679,92 @@
   case LIVES_PARAM_STRING:
 
     if (rfx->status==RFX_STATUS_WEED&&(disp_string=get_weed_display_string((weed_plant_t *)rfx->source,pnum))!=NULL) {
-      if (param->max==0.) txt=g_strdup (disp_string);
-      else txt=g_strndup (disp_string,(int)param->max);
-      weed_free(disp_string);
-    }
-    else {
-      if (param->max==0.) txt=g_strdup ((gchar *)param->value);
-      else txt=g_strndup ((gchar *)param->value,(int)param->max);
+      if (param->max==0.) txt=lives_strdup(disp_string);
+      else txt=lives_strndup(disp_string,(int)param->max);
+      lives_free(disp_string);
+    } else {
+      if (param->max==0.) txt=lives_strdup((char *)param->value);
+      else txt=lives_strndup((char *)param->value,(int)param->max);
     }
 
 
 
     if (((int)param->max>RFX_TEXT_MAGIC||param->max==0.)&&
-	param->special_type!=LIVES_PARAM_SPECIAL_TYPE_FILEREAD) {
+        param->special_type!=LIVES_PARAM_SPECIAL_TYPE_FILEREAD) {
       LiVESWidget *vbox;
 
       boolean woat;
 
       widget_opts.justify=LIVES_JUSTIFY_CENTER;
-      if (use_mnemonic) label = lives_standard_label_new_with_mnemonic (_(name),NULL);
-      else label = lives_standard_label_new (_(name));
+      if (use_mnemonic) label = lives_standard_label_new_with_mnemonic(_(name),NULL);
+      else label = lives_standard_label_new(_(name));
       widget_opts.justify=LIVES_JUSTIFY_DEFAULT;
 
       vbox=lives_vbox_new(FALSE,0);
-      lives_box_pack_start (LIVES_BOX (hbox), vbox, TRUE, TRUE, widget_opts.packing_width);
-      lives_box_pack_start (LIVES_BOX (vbox), label, FALSE, FALSE, widget_opts.packing_height>>1);
+      lives_box_pack_start(LIVES_BOX(hbox), vbox, TRUE, TRUE, widget_opts.packing_width);
+      lives_box_pack_start(LIVES_BOX(vbox), label, FALSE, FALSE, widget_opts.packing_height>>1);
 
       hbox=lives_hbox_new(FALSE,0);
-      lives_box_pack_start (LIVES_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height>>1);
+      lives_box_pack_start(LIVES_BOX(vbox), hbox, FALSE, FALSE, widget_opts.packing_height>>1);
 
-      param->widgets[0] = textview = lives_text_view_new ();
-      if (param->desc!=NULL) lives_widget_set_tooltip_text( textview, param->desc);
-      textbuffer=lives_text_view_get_buffer (LIVES_TEXT_VIEW (textview));
+      param->widgets[0] = textview = lives_text_view_new();
+      if (param->desc!=NULL) lives_widget_set_tooltip_text(textview, param->desc);
+      textbuffer=lives_text_view_get_buffer(LIVES_TEXT_VIEW(textview));
 
-      lives_signal_connect_after (G_OBJECT (textbuffer), LIVES_WIDGET_CHANGED_EVENT, LIVES_GUI_CALLBACK (after_param_text_buffer_changed), 
-			      (gpointer) rfx);
+      lives_signal_connect_after(LIVES_WIDGET_OBJECT(textbuffer), LIVES_WIDGET_CHANGED_SIGNAL,
+                                 LIVES_GUI_CALLBACK(after_param_text_buffer_changed),
+                                 (livespointer) rfx);
 
-      lives_text_view_set_editable (LIVES_TEXT_VIEW (textview), TRUE);
-      lives_text_view_set_wrap_mode (LIVES_TEXT_VIEW (textview), LIVES_WRAP_WORD);
-      lives_text_view_set_cursor_visible (LIVES_TEXT_VIEW (textview), TRUE);
+      lives_text_view_set_editable(LIVES_TEXT_VIEW(textview), TRUE);
+      lives_text_view_set_wrap_mode(LIVES_TEXT_VIEW(textview), LIVES_WRAP_WORD);
+      lives_text_view_set_cursor_visible(LIVES_TEXT_VIEW(textview), TRUE);
 
-      lives_text_buffer_set_text (textbuffer, txt, -1);
+      lives_text_buffer_set_text(textbuffer, txt, -1);
 
       woat=widget_opts.apply_theme;
       widget_opts.apply_theme=FALSE;
       widget_opts.expand=LIVES_EXPAND_NONE;
-      scrolledwindow = lives_standard_scrolled_window_new (-1, RFX_TEXT_SCROLL_HEIGHT, textview);
+      scrolledwindow = lives_standard_scrolled_window_new(-1, RFX_TEXT_SCROLL_HEIGHT, textview);
       widget_opts.expand=LIVES_EXPAND_DEFAULT;
       widget_opts.apply_theme=woat;
 
       if (palette->style&STYLE_1) {
-	lives_widget_set_base_color(textview, LIVES_WIDGET_STATE_NORMAL, &palette->white);
-	lives_widget_set_text_color(textview, LIVES_WIDGET_STATE_NORMAL, &palette->black);
+        lives_widget_set_base_color(textview, LIVES_WIDGET_STATE_NORMAL, &palette->white);
+        lives_widget_set_text_color(textview, LIVES_WIDGET_STATE_NORMAL, &palette->black);
       }
 
-      lives_box_pack_start (LIVES_BOX (hbox), scrolledwindow, TRUE, TRUE, 0);
+      lives_box_pack_start(LIVES_BOX(hbox), scrolledwindow, TRUE, TRUE, 0);
 
-      g_object_set_data(G_OBJECT(textbuffer),"textview",textview);
+      lives_widget_object_set_data(LIVES_WIDGET_OBJECT(textbuffer),"textview",textview);
 
-    }
-    else {
-      if (use_mnemonic) label = lives_standard_label_new_with_mnemonic (_(name),NULL);
-      else label = lives_standard_label_new (_(name));
+    } else {
+      if (use_mnemonic) label = lives_standard_label_new_with_mnemonic(_(name),NULL);
+      else label = lives_standard_label_new(_(name));
 
-      lives_box_pack_start (LIVES_BOX (hbox), label, FALSE, FALSE, widget_opts.packing_width);
+      lives_box_pack_start(LIVES_BOX(hbox), label, FALSE, FALSE, widget_opts.packing_width);
       param->widgets[0]=entry=lives_standard_entry_new(NULL,FALSE,txt,(int)param->max,(int)param->max,LIVES_BOX(hbox),param->desc);
 
       if (rfx->status==RFX_STATUS_WEED&&param->special_type!=LIVES_PARAM_SPECIAL_TYPE_FILEREAD) {
-	lives_signal_connect_after (G_OBJECT (entry), LIVES_WIDGET_CHANGED_EVENT, LIVES_GUI_CALLBACK (after_param_text_changed), 
-				(gpointer) rfx);
+        lives_signal_connect_after(LIVES_WIDGET_OBJECT(entry), LIVES_WIDGET_CHANGED_SIGNAL, LIVES_GUI_CALLBACK(after_param_text_changed),
+                                   (livespointer) rfx);
       }
 
     }
 
     if (param->desc!=NULL) lives_widget_set_tooltip_text(label, param->desc);
 
-    lives_signal_connect_after (G_OBJECT (hbox), "set-focus-child", LIVES_GUI_CALLBACK (after_param_text_focus_changed), 
-			    (gpointer) rfx);
+    lives_signal_connect_after(LIVES_WIDGET_OBJECT(hbox), LIVES_WIDGET_SET_FOCUS_CHILD_SIGNAL,
+                               LIVES_GUI_CALLBACK(after_param_text_focus_changed),
+                               (livespointer) rfx);
 
     if (param->hidden) lives_widget_set_sensitive(param->widgets[0],FALSE);
-    if (use_mnemonic) lives_label_set_mnemonic_widget (LIVES_LABEL (label),param->widgets[0]);
+    if (use_mnemonic) lives_label_set_mnemonic_widget(LIVES_LABEL(label),param->widgets[0]);
 
-    g_free (txt);
+    lives_free(txt);
 
-    g_object_set_data(G_OBJECT(hbox),"textwidget",(gpointer)param->widgets[0]);
-    g_object_set_data (G_OBJECT (param->widgets[0]),"param_number",LIVES_INT_TO_POINTER (pnum));
-    g_object_set_data (G_OBJECT (param->widgets[0]),"rfx",rfx);
+    lives_widget_object_set_data(LIVES_WIDGET_OBJECT(hbox),"textwidget",(livespointer)param->widgets[0]);
+    lives_widget_object_set_data(LIVES_WIDGET_OBJECT(param->widgets[0]),"param_number",LIVES_INT_TO_POINTER(pnum));
+    lives_widget_object_set_data(LIVES_WIDGET_OBJECT(param->widgets[0]),"rfx",rfx);
 
     param->widgets[1]=label;
 
@@ -1779,19 +1777,18 @@
     widget_opts.expand=LIVES_EXPAND_DEFAULT;
 
     if (rfx->status==RFX_STATUS_WEED&&(disp_string=get_weed_display_string((weed_plant_t *)rfx->source,pnum))!=NULL) {
-      lives_combo_set_active_string (LIVES_COMBO(combo),disp_string);
-      weed_free(disp_string);
-    }
-    else if (param->list!=NULL) {
-      lives_combo_set_active_string (LIVES_COMBO(combo), 
-				     (gchar *)g_list_nth_data (param->list,get_int_param (param->value)));
+      lives_combo_set_active_string(LIVES_COMBO(combo),disp_string);
+      lives_free(disp_string);
+    } else if (param->list!=NULL) {
+      lives_combo_set_active_string(LIVES_COMBO(combo),
+                                    (char *)lives_list_nth_data(param->list,get_int_param(param->value)));
     }
 
-    lives_signal_connect_after (G_OBJECT (combo), LIVES_WIDGET_CHANGED_EVENT, 
-			    LIVES_GUI_CALLBACK (after_string_list_changed), (gpointer) rfx);
+    lives_signal_connect_after(LIVES_WIDGET_OBJECT(combo), LIVES_WIDGET_CHANGED_SIGNAL,
+                               LIVES_GUI_CALLBACK(after_string_list_changed), (livespointer) rfx);
 
     // store parameter so we know whose trigger to use
-    g_object_set_data (G_OBJECT (combo),"param_number",LIVES_INT_TO_POINTER (pnum));
+    lives_widget_object_set_data(LIVES_WIDGET_OBJECT(combo),"param_number",LIVES_INT_TO_POINTER(pnum));
     param->widgets[0]=combo;
     if (param->hidden) lives_widget_set_sensitive(combo,FALSE);
     break;
@@ -1801,54 +1798,59 @@
 
   }
 
-  
+
   // see if there were any 'special' hints
-  check_for_special (rfx,param,LIVES_BOX(lives_widget_get_parent(LIVES_WIDGET(box))));
+  check_for_special(rfx,param,LIVES_BOX(lives_widget_get_parent(LIVES_WIDGET(box))));
 
-  g_free (name);
+  lives_free(name);
   return was_num;
 }
 
 
-void add_param_label_to_box (LiVESBox *box, boolean do_trans, const gchar *text) {
+void add_param_label_to_box(LiVESBox *box, boolean do_trans, const char *text) {
   LiVESWidget *label;
 
   lives_box_set_homogeneous(LIVES_BOX(box),FALSE);
 
   if (do_trans) {
     char *markup;
+#ifdef GUI_GTK
     markup=g_markup_printf_escaped("<span weight=\"bold\" style=\"italic\"> %s </span>",_(text));
+#endif
+#ifdef GUI_QT
+    QString qs = QString("<span weight=\"bold\" style=\"italic\"> %s </span>").arg(_(text));
+    markup=strdup((const char *)qs.toHtmlEscaped().constData());
+#endif
     label = lives_standard_label_new(NULL);
-    lives_label_set_markup_with_mnemonic (LIVES_LABEL(label),markup);
-    g_free(markup);
-  }
-  else label = lives_standard_label_new_with_mnemonic (text,NULL);
+    lives_label_set_markup_with_mnemonic(LIVES_LABEL(label),markup);
+    lives_free(markup);
+  } else label = lives_standard_label_new_with_mnemonic(text,NULL);
 
   if (LIVES_IS_HBOX(LIVES_WIDGET(box)))
-    lives_box_pack_start (box, label, FALSE, FALSE, widget_opts.packing_width);
+    lives_box_pack_start(box, label, FALSE, FALSE, widget_opts.packing_width);
   else
-    lives_box_pack_start (box, label, FALSE, FALSE, widget_opts.packing_height);
+    lives_box_pack_start(box, label, FALSE, FALSE, widget_opts.packing_height);
   lives_widget_show(label);
 }
 
-GSList *add_usrgrp_to_livesgrp (GSList *u2l, GSList *rbgroup, int usr_number) {
-  lives_widget_group_t *wgroup=(lives_widget_group_t *)g_malloc (sizeof(lives_widget_group_t));
+LiVESSList *add_usrgrp_to_livesgrp(LiVESSList *u2l, LiVESSList *rbgroup, int usr_number) {
+  lives_widget_group_t *wgroup=(lives_widget_group_t *)lives_malloc(sizeof(lives_widget_group_t));
   wgroup->usr_number=usr_number;
   wgroup->rbgroup=rbgroup;
   wgroup->active_param=0;
-  u2l=g_slist_append (u2l, (gpointer)wgroup);
+  u2l=lives_slist_append(u2l, (livespointer)wgroup);
   return u2l;
 }
 
 
 
 
-lives_widget_group_t *livesgrp_from_usrgrp (GSList *u2l, int usrgrp) {
+lives_widget_group_t *livesgrp_from_usrgrp(LiVESSList *u2l, int usrgrp) {
   int i;
   lives_widget_group_t *group;
 
-  for (i=0;i<g_slist_length (u2l);i++) {
-    group=(lives_widget_group_t *)g_slist_nth_data (u2l,i);
+  for (i=0; i<lives_slist_length(u2l); i++) {
+    group=(lives_widget_group_t *)lives_slist_nth_data(u2l,i);
     if (group->usr_number==usrgrp) return group;
   }
   return NULL;
@@ -1861,10 +1863,10 @@
 
 
 
-void after_boolean_param_toggled (LiVESToggleButton *togglebutton, lives_rfx_t *rfx) {
-  int param_number=GPOINTER_TO_INT (g_object_get_data (G_OBJECT (togglebutton),"param_number"));
+void after_boolean_param_toggled(LiVESToggleButton *togglebutton, lives_rfx_t *rfx) {
+  int param_number=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(togglebutton),"param_number"));
 
-  GList *retvals=NULL;
+  LiVESList *retvals=NULL;
 
   lives_param_t *param=&rfx->params[param_number];
 
@@ -1874,7 +1876,7 @@
   int copyto=-1;
 
   if (mainw->block_param_updates) return; // updates are blocked until all params are ready
-  new_bool=lives_toggle_button_get_active (togglebutton);
+  new_bool=lives_toggle_button_get_active(togglebutton);
 
   if (old_bool==new_bool) return;
 
@@ -1893,14 +1895,14 @@
       int *valis;
 
       if (mainw->multitrack!=NULL&&is_perchannel_multi(rfx,param_number)) {
-	index=mainw->multitrack->track_index;
+        index=mainw->multitrack->track_index;
       }
       numvals=weed_leaf_num_elements(wparam,"value");
 
       if (index>=numvals) {
-	weed_plant_t *paramtmpl=weed_get_plantptr_value(wparam,"template",&error);
-	fill_param_vals_to(wparam,paramtmpl,index);
-	numvals=index+1;
+        weed_plant_t *paramtmpl=weed_get_plantptr_value(wparam,"template",&error);
+        fill_param_vals_to(wparam,paramtmpl,index);
+        numvals=index+1;
       }
 
       valis=weed_get_boolean_array(wparam,"value",&error);
@@ -1911,22 +1913,22 @@
       filter_mutex_unlock(key);
       copyto=set_copy_to(inst,param_number,TRUE);
 
-      weed_free(valis);
+      lives_free(valis);
 
       if (mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
-	// if we are recording, add this change to our event_list
-	rec_param_change(inst,param_number);
-	if (copyto!=-1) rec_param_change(inst,copyto);
+        // if we are recording, add this change to our event_list
+        rec_param_change(inst,param_number);
+        if (copyto!=-1) rec_param_change(inst,copyto);
       }
 
       disp_string=get_weed_display_string(inst,param_number);
       if (disp_string!=NULL) {
-	lives_label_set_text(LIVES_LABEL(param->widgets[1]),disp_string);
-	weed_free(disp_string);
+        lives_label_set_text(LIVES_LABEL(param->widgets[1]),disp_string);
+        lives_free(disp_string);
       }
       if (param->reinit||(copyto!=-1&&rfx->params[copyto].reinit)) {
-	weed_reinit_effect(inst,FALSE);
-	was_reinited=TRUE;
+        weed_reinit_effect(inst,FALSE);
+        was_reinited=TRUE;
       }
 
     }
@@ -1935,10 +1937,10 @@
   }
   if (get_bool_param(param->value)!=old_bool&&param->onchange) {
     param->change_blocked=TRUE;
-    retvals=do_onchange (G_OBJECT (togglebutton), rfx);
+    retvals=do_onchange(LIVES_WIDGET_OBJECT(togglebutton), rfx);
     if (retvals!=NULL) {
-      g_list_free_strings (retvals);
-      g_list_free (retvals);
+      lives_list_free_strings(retvals);
+      lives_list_free(retvals);
     }
     lives_widget_context_update();
     param->change_blocked=FALSE;
@@ -1952,11 +1954,11 @@
 
 
 
-void after_param_value_changed (LiVESSpinButton *spinbutton, lives_rfx_t *rfx) {
-  int param_number=GPOINTER_TO_INT (g_object_get_data (G_OBJECT (spinbutton),"param_number"));
+void after_param_value_changed(LiVESSpinButton *spinbutton, lives_rfx_t *rfx) {
+  int param_number=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(spinbutton),"param_number"));
   lives_param_t *param=&rfx->params[param_number];
 
-  GList *retvals=NULL;
+  LiVESList *retvals=NULL;
 
   double new_double=0.,old_double=0.;
 
@@ -1983,8 +1985,7 @@
     new_double=lives_spin_button_get_value(LIVES_SPIN_BUTTON(spinbutton));
     if (old_double==new_double) return;
     set_double_param(param->value,new_double);
-  }
-  else {
+  } else {
     old_int=get_int_param(param->value);
     new_int=lives_spin_button_get_value_as_int(LIVES_SPIN_BUTTON(spinbutton));
     if (old_int==new_int) return;
@@ -2004,64 +2005,63 @@
       int *valis;
 
       if (mainw->multitrack!=NULL&&is_perchannel_multi(rfx,param_number)) {
-	index=mainw->multitrack->track_index;
+        index=mainw->multitrack->track_index;
       }
       numvals=weed_leaf_num_elements(wparam,"value");
       if (index>=numvals) {
-	weed_plant_t *paramtmpl=weed_get_plantptr_value(wparam,"template",&error);
-	fill_param_vals_to(wparam,paramtmpl,index);
-	numvals=index+1;
+        weed_plant_t *paramtmpl=weed_get_plantptr_value(wparam,"template",&error);
+        fill_param_vals_to(wparam,paramtmpl,index);
+        numvals=index+1;
       }
 
       if (weed_plant_has_leaf(inst,"host_key")) key=weed_get_int_value(inst,"host_key",&error);
 
       if (weed_leaf_seed_type(wparam,"value")==WEED_SEED_DOUBLE) {
-	valds=weed_get_double_array(wparam,"value",&error);
-	if (param->dp>0) valds[index]=new_double;
-	else valds[index]=(double)new_int;
-	filter_mutex_lock(key);
-	weed_set_double_array(wparam,"value",numvals,valds);
-	filter_mutex_unlock(key);
-	copyto=set_copy_to(inst,param_number,TRUE);
-	weed_free(valds);
-      }
-      else {
-	valis=weed_get_int_array(wparam,"value",&error);
-	valis[index]=new_int;
-	filter_mutex_lock(key);
-	weed_set_int_array(wparam,"value",numvals,valis);
-	filter_mutex_unlock(key);
-	copyto=set_copy_to(inst,param_number,TRUE);
-	weed_free(valis);
+        valds=weed_get_double_array(wparam,"value",&error);
+        if (param->dp>0) valds[index]=new_double;
+        else valds[index]=(double)new_int;
+        filter_mutex_lock(key);
+        weed_set_double_array(wparam,"value",numvals,valds);
+        filter_mutex_unlock(key);
+        copyto=set_copy_to(inst,param_number,TRUE);
+        lives_free(valds);
+      } else {
+        valis=weed_get_int_array(wparam,"value",&error);
+        valis[index]=new_int;
+        filter_mutex_lock(key);
+        weed_set_int_array(wparam,"value",numvals,valis);
+        filter_mutex_unlock(key);
+        copyto=set_copy_to(inst,param_number,TRUE);
+        lives_free(valis);
       }
 
       if (mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
-	// if we are recording, add this change to our event_list
-	rec_param_change(inst,param_number);
-	if (copyto!=-1) rec_param_change(inst,copyto);
+        // if we are recording, add this change to our event_list
+        rec_param_change(inst,param_number);
+        if (copyto!=-1) rec_param_change(inst,copyto);
       }
 
       disp_string=get_weed_display_string(inst,param_number);
       if (disp_string!=NULL) {
-	lives_label_set_text(LIVES_LABEL(param->widgets[1]),disp_string);
-	weed_free(disp_string);
+        lives_label_set_text(LIVES_LABEL(param->widgets[1]),disp_string);
+        lives_free(disp_string);
       }
       if (param->reinit||(copyto!=-1&&rfx->params[copyto].reinit)) {
-	weed_reinit_effect(inst,FALSE);
-	was_reinited=TRUE;
+        weed_reinit_effect(inst,FALSE);
+        was_reinited=TRUE;
       }
 
     }
   }
 
   if (((param->dp>0&&(get_double_param(param->value)!=old_double))||(param->dp==0&&
-								     (get_int_param(param->value)!=old_int)))&&
+       (get_int_param(param->value)!=old_int)))&&
       param->onchange) {
     param->change_blocked=TRUE;
-    retvals=do_onchange (G_OBJECT (spinbutton), rfx);
+    retvals=do_onchange(LIVES_WIDGET_OBJECT(spinbutton), rfx);
     if (retvals!=NULL) {
-      g_list_free_strings (retvals);
-      g_list_free (retvals);
+      lives_list_free_strings(retvals);
+      lives_list_free(retvals);
     }
     lives_widget_context_update();
     param->change_blocked=FALSE;
@@ -2070,9 +2070,9 @@
 
   if (fx_dialog[1]!=NULL) {
     // transfer param changes from rte_window to ce_thumbs window, and vice-versa
-    lives_rfx_t *rte_rfx=(lives_rfx_t *)g_object_get_data (G_OBJECT (fx_dialog[1]),"rfx");
-    int key=GPOINTER_TO_INT (g_object_get_data (G_OBJECT (fx_dialog[1]),"key"));
-    int mode=GPOINTER_TO_INT (g_object_get_data (G_OBJECT (fx_dialog[1]),"mode"));
+    lives_rfx_t *rte_rfx=(lives_rfx_t *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(fx_dialog[1]),"rfx");
+    int key=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(fx_dialog[1]),"key"));
+    int mode=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(fx_dialog[1]),"mode"));
     mainw->block_param_updates=TRUE;
     if (rfx==rte_rfx&&mainw->ce_thumbs) ce_thumbs_update_visual_params(key);
     else if (mode==rte_key_getmode(key+1)) ce_thumbs_check_for_rte(rfx,rte_rfx,key);
@@ -2092,7 +2092,7 @@
   weed_plant_t *param=NULL;
 
   int *maxs=NULL,*mins=NULL;
-  int cols[4]={c1,c2,c3,c4};
+  int cols[4]= {c1,c2,c3,c4};
   int cspace;
   int rmax,rmin,gmax,gmin,bmax,bmin;
   int error;
@@ -2107,8 +2107,7 @@
   if (!is_default) {
     param=weed_inst_in_param(plant,pnum,FALSE,FALSE);
     ptmpl=weed_get_plantptr_value(param,"template",&error);
-  }
-  else {
+  } else {
     // called only from rte_set_defs_ok
     ptmpl=weed_filter_in_paramtmpl(plant,pnum,FALSE);
   }
@@ -2123,95 +2122,88 @@
   case WEED_COLORSPACE_RGB:
     if (is_int) {
       if (weed_leaf_num_elements(ptmpl,"max")==3) {
-	maxs=weed_get_int_array(ptmpl,"max",&error);
-	rmax=maxs[0];
-	gmax=maxs[1];
-	bmax=maxs[2];
-	weed_free(maxs);
-      }
-      else rmax=gmax=bmax=weed_get_int_value(ptmpl,"max",&error);
+        maxs=weed_get_int_array(ptmpl,"max",&error);
+        rmax=maxs[0];
+        gmax=maxs[1];
+        bmax=maxs[2];
+        lives_free(maxs);
+      } else rmax=gmax=bmax=weed_get_int_value(ptmpl,"max",&error);
       if (weed_leaf_num_elements(ptmpl,"min")==3) {
-	mins=weed_get_int_array(ptmpl,"min",&error);
-	rmin=mins[0];
-	gmin=mins[1];
-	bmin=mins[2];
-	weed_free(mins);
-      }
-      else rmin=gmin=bmin=weed_get_int_value(ptmpl,"min",&error);
+        mins=weed_get_int_array(ptmpl,"min",&error);
+        rmin=mins[0];
+        gmin=mins[1];
+        bmin=mins[2];
+        lives_free(mins);
+      } else rmin=gmin=bmin=weed_get_int_value(ptmpl,"min",&error);
 
       cols[0]=rmin+(int)((double)cols[0]/255.*(double)(rmax-rmin));
       cols[1]=gmin+(int)((double)cols[1]/255.*(double)(gmax-gmin));
       cols[2]=bmin+(int)((double)cols[2]/255.*(double)(bmax-bmin));
       if (is_default) {
-	weed_set_int_array(ptmpl,"host_default",3,cols);
-      }
-      else {
-	int index=0,numvals;
-	int *valis;
-	
-	if (mainw->multitrack!=NULL&&is_perchannel_multiw(ptmpl)) {
-	  index=mainw->multitrack->track_index;
-	}
-	numvals=weed_leaf_num_elements(param,"value");
-	if (index*3>=numvals) {
-	  weed_plant_t *paramtmpl=weed_get_plantptr_value(param,"template",&error);
-	  fill_param_vals_to(param,paramtmpl,index);
-	  numvals=(index+1)*3;
-	}
-	
-	valis=weed_get_int_array(param,"value",&error);
-	valis[index*3]=cols[0];
-	valis[index*3+1]=cols[1];
-	valis[index*3+2]=cols[2];
-	weed_set_int_array(param,"value",numvals,valis);
-	weed_free(valis);
+        weed_set_int_array(ptmpl,"host_default",3,cols);
+      } else {
+        int index=0,numvals;
+        int *valis;
+
+        if (mainw->multitrack!=NULL&&is_perchannel_multiw(ptmpl)) {
+          index=mainw->multitrack->track_index;
+        }
+        numvals=weed_leaf_num_elements(param,"value");
+        if (index*3>=numvals) {
+          weed_plant_t *paramtmpl=weed_get_plantptr_value(param,"template",&error);
+          fill_param_vals_to(param,paramtmpl,index);
+          numvals=(index+1)*3;
+        }
+
+        valis=weed_get_int_array(param,"value",&error);
+        valis[index*3]=cols[0];
+        valis[index*3+1]=cols[1];
+        valis[index*3+2]=cols[2];
+        weed_set_int_array(param,"value",numvals,valis);
+        lives_free(valis);
       }
       break;
-    }
-    else {
+    } else {
       // double
       if (weed_leaf_num_elements(ptmpl,"max")==3) {
-	maxds=weed_get_double_array(ptmpl,"max",&error);
-	rmaxd=maxds[0];
-	gmaxd=maxds[1];
-	bmaxd=maxds[2];
-	weed_free(maxds);
-      }
-      else rmaxd=gmaxd=bmaxd=weed_get_double_value(ptmpl,"max",&error);
+        maxds=weed_get_double_array(ptmpl,"max",&error);
+        rmaxd=maxds[0];
+        gmaxd=maxds[1];
+        bmaxd=maxds[2];
+        lives_free(maxds);
+      } else rmaxd=gmaxd=bmaxd=weed_get_double_value(ptmpl,"max",&error);
       if (weed_leaf_num_elements(ptmpl,"min")==3) {
-	minds=weed_get_double_array(ptmpl,"min",&error);
-	rmind=minds[0];
-	gmind=minds[1];
-	bmind=minds[2];
-	weed_free(minds);
-      }
-      else rmind=gmind=bmind=weed_get_double_value(ptmpl,"min",&error);
+        minds=weed_get_double_array(ptmpl,"min",&error);
+        rmind=minds[0];
+        gmind=minds[1];
+        bmind=minds[2];
+        lives_free(minds);
+      } else rmind=gmind=bmind=weed_get_double_value(ptmpl,"min",&error);
       colds[0]=rmind+(double)cols[0]/255.*(rmaxd-rmind);
       colds[1]=gmind+(double)cols[1]/255.*(gmaxd-gmind);
       colds[2]=bmind+(double)cols[2]/255.*(bmaxd-bmind);
       if (is_default) {
-	weed_set_double_array(ptmpl,"host_default",3,colds);
-      }
-      else {
-	int index=0,numvals;
-	double *valds;
-	
-	if (mainw->multitrack!=NULL&&is_perchannel_multiw(ptmpl)) {
-	  index=mainw->multitrack->track_index;
-	}
-	numvals=weed_leaf_num_elements(param,"value");
-	if (index*3>=numvals) {
-	  weed_plant_t *paramtmpl=weed_get_plantptr_value(param,"template",&error);
-	  fill_param_vals_to(param,paramtmpl,index);
-	  numvals=(index+1)*3;
-	}
-	
-	valds=weed_get_double_array(param,"value",&error);
-	valds[index*3]=colds[0];
-	valds[index*3+1]=colds[1];
-	valds[index*3+2]=colds[2];
-	weed_set_double_array(param,"value",numvals,valds);
-	weed_free(valds);
+        weed_set_double_array(ptmpl,"host_default",3,colds);
+      } else {
+        int index=0,numvals;
+        double *valds;
+
+        if (mainw->multitrack!=NULL&&is_perchannel_multiw(ptmpl)) {
+          index=mainw->multitrack->track_index;
+        }
+        numvals=weed_leaf_num_elements(param,"value");
+        if (index*3>=numvals) {
+          weed_plant_t *paramtmpl=weed_get_plantptr_value(param,"template",&error);
+          fill_param_vals_to(param,paramtmpl,index);
+          numvals=(index+1)*3;
+        }
+
+        valds=weed_get_double_array(param,"value",&error);
+        valds[index*3]=colds[0];
+        valds[index*3+1]=colds[1];
+        valds[index*3+2]=colds[2];
+        weed_set_double_array(param,"value",numvals,valds);
+        lives_free(valds);
       }
     }
     break;
@@ -2220,8 +2212,8 @@
 }
 
 
-void after_param_red_changed (LiVESSpinButton *spinbutton, lives_rfx_t *rfx) {
-  GList *retvals=NULL;
+void after_param_red_changed(LiVESSpinButton *spinbutton, lives_rfx_t *rfx) {
+  LiVESList *retvals=NULL;
 
   lives_colRGB24_t old_value;
 
@@ -2229,7 +2221,7 @@
 
   LiVESWidget *cbutton;
 
-  int param_number=GPOINTER_TO_INT (g_object_get_data (G_OBJECT (spinbutton),"param_number"));
+  int param_number=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(spinbutton),"param_number"));
   int new_red;
   int copyto=-1;
 
@@ -2270,28 +2262,28 @@
 
     if (inst!=NULL&&weed_get_int_value(inst,"type",&error)==WEED_PLANT_FILTER_INSTANCE)  {
       update_weed_color_value(inst,param_number,
-			      new_red,old_value.green,old_value.blue,0);
+                              new_red,old_value.green,old_value.blue,0);
       copyto=set_copy_to(inst,param_number,TRUE);
 
       if (mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
-	// if we are recording, add this change to our event_list
-	rec_param_change(inst,param_number);
-	if (copyto!=-1) rec_param_change(inst,copyto);
+        // if we are recording, add this change to our event_list
+        rec_param_change(inst,param_number);
+        if (copyto!=-1) rec_param_change(inst,copyto);
       }
-      
+
       if (param->reinit||(copyto!=-1&&rfx->params[copyto].reinit)) {
-	weed_reinit_effect(inst,FALSE);
-	was_reinited=TRUE;
+        weed_reinit_effect(inst,FALSE);
+        was_reinited=TRUE;
       }
     }
   }
 
   if (new_red!=old_value.red&&param->onchange) {
     param->change_blocked=TRUE;
-    retvals=do_onchange (G_OBJECT (spinbutton), rfx);
+    retvals=do_onchange(LIVES_WIDGET_OBJECT(spinbutton), rfx);
     if (retvals!=NULL) {
-      g_list_free_strings (retvals);
-      g_list_free (retvals);
+      lives_list_free_strings(retvals);
+      lives_list_free(retvals);
     }
     lives_widget_context_update();
     param->change_blocked=FALSE;
@@ -2304,8 +2296,8 @@
 }
 
 
-void after_param_green_changed (LiVESSpinButton *spinbutton, lives_rfx_t *rfx) {
-  GList *retvals=NULL;
+void after_param_green_changed(LiVESSpinButton *spinbutton, lives_rfx_t *rfx) {
+  LiVESList *retvals=NULL;
 
   lives_colRGB24_t old_value;
 
@@ -2316,7 +2308,7 @@
   int new_green;
   int copyto=-1;
 
-  int param_number=GPOINTER_TO_INT (g_object_get_data (G_OBJECT (spinbutton),"param_number"));
+  int param_number=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(spinbutton),"param_number"));
 
   boolean was_reinited=FALSE;
 
@@ -2358,24 +2350,24 @@
       copyto=set_copy_to(inst,param_number,TRUE);
 
       if (mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
-	// if we are recording, add this change to our event_list
-	rec_param_change(inst,param_number);
-	if (copyto!=-1) rec_param_change(inst,copyto);
+        // if we are recording, add this change to our event_list
+        rec_param_change(inst,param_number);
+        if (copyto!=-1) rec_param_change(inst,copyto);
       }
-      
+
       if (param->reinit||(copyto!=-1&&rfx->params[copyto].reinit)) {
-	weed_reinit_effect(inst,FALSE);
-	was_reinited=TRUE;
+        weed_reinit_effect(inst,FALSE);
+        was_reinited=TRUE;
       }
     }
   }
 
   if (new_green!=old_value.green&&param->onchange) {
     param->change_blocked=TRUE;
-    retvals=do_onchange (G_OBJECT (spinbutton), rfx);
+    retvals=do_onchange(LIVES_WIDGET_OBJECT(spinbutton), rfx);
     if (retvals!=NULL) {
-      g_list_free_strings (retvals);
-      g_list_free (retvals);
+      lives_list_free_strings(retvals);
+      lives_list_free(retvals);
     }
     lives_widget_context_update();
     param->change_blocked=FALSE;
@@ -2388,8 +2380,8 @@
 }
 
 
-void after_param_blue_changed (LiVESSpinButton *spinbutton, lives_rfx_t *rfx) {
-  GList *retvals=NULL;
+void after_param_blue_changed(LiVESSpinButton *spinbutton, lives_rfx_t *rfx) {
+  LiVESList *retvals=NULL;
 
   lives_colRGB24_t old_value;
 
@@ -2399,7 +2391,7 @@
 
   int new_blue;
   int copyto=-1;
-  int param_number=GPOINTER_TO_INT (g_object_get_data (G_OBJECT (spinbutton),"param_number"));
+  int param_number=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(spinbutton),"param_number"));
 
   boolean was_reinited=FALSE;
 
@@ -2440,24 +2432,24 @@
       copyto=set_copy_to(inst,param_number,TRUE);
 
       if (mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
-	// if we are recording, add this change to our event_list
-	rec_param_change(inst,param_number);
-	if (copyto!=-1) rec_param_change(inst,copyto);
+        // if we are recording, add this change to our event_list
+        rec_param_change(inst,param_number);
+        if (copyto!=-1) rec_param_change(inst,copyto);
       }
-      
+
       if (param->reinit||(copyto!=-1&&rfx->params[copyto].reinit)) {
-	weed_reinit_effect(inst,FALSE);
-	was_reinited=TRUE;
+        weed_reinit_effect(inst,FALSE);
+        was_reinited=TRUE;
       }
     }
   }
 
   if (new_blue!=old_value.blue&&param->onchange) {
     param->change_blocked=TRUE;
-    retvals=do_onchange (G_OBJECT (spinbutton), rfx);
+    retvals=do_onchange(LIVES_WIDGET_OBJECT(spinbutton), rfx);
     if (retvals!=NULL) {
-      g_list_free_strings (retvals);
-      g_list_free (retvals);
+      lives_list_free_strings(retvals);
+      lives_list_free(retvals);
     }
     lives_widget_context_update();
     param->change_blocked=FALSE;
@@ -2470,10 +2462,10 @@
 }
 
 
-void after_param_alpha_changed (LiVESSpinButton *spinbutton, lives_rfx_t *rfx) {
+void after_param_alpha_changed(LiVESSpinButton *spinbutton, lives_rfx_t *rfx) {
   // not used yet
-  int param_number=GPOINTER_TO_INT (g_object_get_data (G_OBJECT (spinbutton),"param_number"));
-  GList *retvals=NULL;
+  int param_number=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(spinbutton),"param_number"));
+  LiVESList *retvals=NULL;
   lives_param_t *param=&rfx->params[param_number];
   lives_colRGBA32_t old_value;
   int new_alpha=lives_spin_button_get_value_as_int(LIVES_SPIN_BUTTON(spinbutton));
@@ -2491,7 +2483,7 @@
   }
 
   get_colRGBA32_param(param->value,&old_value);
-  
+
   if (mainw->framedraw_preview!=NULL) lives_widget_set_sensitive(mainw->framedraw_preview,TRUE);
 
 
@@ -2507,10 +2499,10 @@
 
   if (new_alpha!=old_value.alpha&&param->onchange) {
     param->change_blocked=TRUE;
-    retvals=do_onchange (G_OBJECT (spinbutton), rfx);
+    retvals=do_onchange(LIVES_WIDGET_OBJECT(spinbutton), rfx);
     if (retvals!=NULL) {
-      g_list_free_strings (retvals);
-      g_list_free (retvals);
+      lives_list_free_strings(retvals);
+      lives_list_free(retvals);
     }
     lives_widget_context_update();
     param->change_blocked=FALSE;
@@ -2522,7 +2514,7 @@
 }
 
 
-boolean after_param_text_focus_changed (LiVESWidget *hbox, LiVESWidget *child, lives_rfx_t *rfx) {
+boolean after_param_text_focus_changed(LiVESWidget *hbox, LiVESWidget *child, lives_rfx_t *rfx) {
   // for non realtime effects
   // we don't usually want to run the trigger every single time the user presses a key in a text widget
   // so we only update when the user clicks OK or focusses out of the widget
@@ -2538,9 +2530,9 @@
       lives_window_add_accel_group(LIVES_WINDOW(mainw->multitrack->window),mainw->multitrack->accel_group);
 
   }
-  
+
   if (mainw->textwidget_focus!=NULL) {
-    textwidget=(LiVESWidget *)g_object_get_data (G_OBJECT (mainw->textwidget_focus),"textwidget");
+    textwidget=(LiVESWidget *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(mainw->textwidget_focus),"textwidget");
     after_param_text_changed(textwidget,rfx);
   }
 
@@ -2552,15 +2544,15 @@
 }
 
 
-void after_param_text_changed (LiVESWidget *textwidget, lives_rfx_t *rfx) {
+void after_param_text_changed(LiVESWidget *textwidget, lives_rfx_t *rfx) {
   LiVESTextBuffer *textbuffer=NULL;
 
-  GList *retvals=NULL;
+  LiVESList *retvals=NULL;
 
   lives_param_t *param;
 
-  gchar *old_text;
-  const gchar *new_text;
+  char *old_text;
+  const char *new_text;
 
   boolean was_reinited=FALSE;
 
@@ -2570,23 +2562,22 @@
 
   if (rfx==NULL||rfx->params==NULL||textwidget==NULL) return;
 
-  param_number=GPOINTER_TO_INT (g_object_get_data (G_OBJECT (textwidget),"param_number"));
+  param_number=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(textwidget),"param_number"));
 
   param=&rfx->params[param_number];
 
-  old_text=(gchar *)param->value;
+  old_text=(char *)param->value;
 
   if (mainw->block_param_updates) return; // updates are blocked until all params are ready
 
   if (LIVES_IS_TEXT_VIEW(textwidget)) {
-    new_text=lives_text_view_get_text (LIVES_TEXT_VIEW(textwidget));
+    new_text=lives_text_view_get_text(LIVES_TEXT_VIEW(textwidget));
     if (!strcmp(new_text,old_text)) return;
-    param->value=g_strdup(new_text);
-  }
-  else {
-    new_text=lives_entry_get_text (LIVES_ENTRY(textwidget));
+    param->value=lives_strdup(new_text);
+  } else {
+    new_text=lives_entry_get_text(LIVES_ENTRY(textwidget));
     if (!strcmp(new_text,old_text)) return;
-    param->value=g_strdup(new_text);
+    param->value=lives_strdup(new_text);
   }
 
   if (mainw->framedraw_preview!=NULL) lives_widget_set_sensitive(mainw->framedraw_preview,TRUE);
@@ -2602,60 +2593,59 @@
       char **valss;
 
       if (mainw->multitrack!=NULL&&is_perchannel_multi(rfx,param_number)) {
-	index=mainw->multitrack->track_index;
+        index=mainw->multitrack->track_index;
       }
       numvals=weed_leaf_num_elements(wparam,"value");
       if (index>=numvals) {
-	weed_plant_t *paramtmpl=weed_get_plantptr_value(wparam,"template",&error);
-	fill_param_vals_to(wparam,paramtmpl,index);
-	numvals=index+1;
+        weed_plant_t *paramtmpl=weed_get_plantptr_value(wparam,"template",&error);
+        fill_param_vals_to(wparam,paramtmpl,index);
+        numvals=index+1;
       }
-      
+
       valss=weed_get_string_array(wparam,"value",&error);
-      valss[index]=g_strdup((gchar *)param->value);
+      valss[index]=lives_strdup((char *)param->value);
       if (weed_plant_has_leaf(inst,"host_key")) key=weed_get_int_value(inst,"host_key",&error);
       filter_mutex_lock(key);
       weed_set_string_array(wparam,"value",numvals,valss);
       filter_mutex_unlock(key);
       copyto=set_copy_to(inst,param_number,TRUE);
-      for (i=0;i<numvals;i++) weed_free(valss[i]);
-      weed_free(valss);
+      for (i=0; i<numvals; i++) lives_free(valss[i]);
+      lives_free(valss);
 
       if (mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
-	// if we are recording, add this change to our event_list
-	rec_param_change(inst,param_number);
-	if (copyto!=-1) rec_param_change(inst,copyto);
+        // if we are recording, add this change to our event_list
+        rec_param_change(inst,param_number);
+        if (copyto!=-1) rec_param_change(inst,copyto);
       }
 
       if (disp_string!=NULL) {
-	if ((int)param->max>RFX_TEXT_MAGIC||param->max==0.) {
-	  lives_text_buffer_set_text (LIVES_TEXT_BUFFER (textbuffer), (gchar *)param->value, -1);
-	}
-	else {
-	  lives_entry_set_text(LIVES_ENTRY(textwidget),disp_string);
-	}
-	weed_free(disp_string);
+        if ((int)param->max>RFX_TEXT_MAGIC||param->max==0.) {
+          lives_text_buffer_set_text(LIVES_TEXT_BUFFER(textbuffer), (char *)param->value, -1);
+        } else {
+          lives_entry_set_text(LIVES_ENTRY(textwidget),disp_string);
+        }
+        lives_free(disp_string);
       }
 
       if (param->reinit||(copyto!=-1&&rfx->params[copyto].reinit)) {
-	weed_reinit_effect(inst,FALSE);
-	was_reinited=TRUE;
+        weed_reinit_effect(inst,FALSE);
+        was_reinited=TRUE;
       }
 
     }
   }
 
-  if (strcmp (old_text,(gchar *)param->value)&&param->onchange) {
+  if (strcmp(old_text,(char *)param->value)&&param->onchange) {
     param->change_blocked=TRUE;
-    retvals=do_onchange (G_OBJECT (textwidget), rfx);
+    retvals=do_onchange(LIVES_WIDGET_OBJECT(textwidget), rfx);
     if (retvals!=NULL) {
-      g_list_free_strings (retvals);
-      g_list_free (retvals);
+      lives_list_free_strings(retvals);
+      lives_list_free(retvals);
     }
     lives_widget_context_update();
     param->change_blocked=FALSE;
   }
-  g_free (old_text);
+  lives_free(old_text);
   if (!was_reinited&&copyto!=-1) update_visual_params(rfx,FALSE);
   if (mainw->multitrack!=NULL&&rfx->status==RFX_STATUS_WEED) {
     activate_mt_preview(mainw->multitrack);
@@ -2664,16 +2654,16 @@
 
 }
 
-static void after_param_text_buffer_changed (LiVESTextBuffer *textbuffer, lives_rfx_t *rfx) {
-  LiVESWidget *textview=(LiVESWidget *)g_object_get_data(G_OBJECT(textbuffer),"textview");
+static void after_param_text_buffer_changed(LiVESTextBuffer *textbuffer, lives_rfx_t *rfx) {
+  LiVESWidget *textview=(LiVESWidget *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(textbuffer),"textview");
   after_param_text_changed(textview,rfx);
 }
 
 
-void after_string_list_changed (LiVESCombo *combo, lives_rfx_t *rfx) {
-  int param_number=GPOINTER_TO_INT (g_object_get_data (G_OBJECT (combo),"param_number"));
+void after_string_list_changed(LiVESCombo *combo, lives_rfx_t *rfx) {
+  int param_number=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(combo),"param_number"));
 
-  GList *retvals=NULL;
+  LiVESList *retvals=NULL;
 
   lives_param_t *param=&rfx->params[param_number];
 
@@ -2682,10 +2672,10 @@
   boolean was_reinited=FALSE;
 
   int old_index=get_int_param(param->value);
-  int new_index=lives_list_index(param->list,txt);
+  int new_index=lives_list_strcmp_index(param->list,txt);
   int copyto=-1;
 
-  g_free(txt);
+  lives_free(txt);
 
   if (mainw->block_param_updates) return; // updates are blocked until all params are ready
 
@@ -2708,15 +2698,15 @@
       int *valis;
 
       if (mainw->multitrack!=NULL&&is_perchannel_multi(rfx,param_number)) {
-	index=mainw->multitrack->track_index;
+        index=mainw->multitrack->track_index;
       }
       numvals=weed_leaf_num_elements(wparam,"value");
       if (index>=numvals) {
-	weed_plant_t *paramtmpl=weed_get_plantptr_value(wparam,"template",&error);
-	fill_param_vals_to(wparam,paramtmpl,index);
-	numvals=index+1;
+        weed_plant_t *paramtmpl=weed_get_plantptr_value(wparam,"template",&error);
+        fill_param_vals_to(wparam,paramtmpl,index);
+        numvals=index+1;
       }
-      
+
       valis=weed_get_int_array(wparam,"value",&error);
       valis[index]=new_index;
       if (weed_plant_has_leaf(inst,"host_key")) key=weed_get_int_value(inst,"host_key",&error);
@@ -2724,24 +2714,24 @@
       weed_set_int_array(wparam,"value",numvals,valis);
       filter_mutex_unlock(key);
       copyto=set_copy_to(inst,param_number,TRUE);
-      weed_free(valis);
+      lives_free(valis);
 
-     if (mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
-      // if we are recording, add this change to our event_list
-	rec_param_change(inst,param_number);
-	if (copyto!=-1) rec_param_change(inst,copyto);
+      if (mainw->record&&!mainw->record_paused&&mainw->playing_file>-1&&(prefs->rec_opts&REC_EFFECTS)) {
+        // if we are recording, add this change to our event_list
+        rec_param_change(inst,param_number);
+        if (copyto!=-1) rec_param_change(inst,copyto);
       }
-    
+
       if (disp_string!=NULL) {
-	lives_signal_handlers_block_by_func(combo,(gpointer)after_string_list_changed,(gpointer)rfx);
-	lives_combo_set_active_string (LIVES_COMBO(combo),disp_string);
-	lives_signal_handlers_unblock_by_func(combo,(gpointer)after_string_list_changed,(gpointer)rfx);
-	weed_free(disp_string);
-      } 
-      
+        lives_signal_handlers_block_by_func(combo,(livespointer)after_string_list_changed,(livespointer)rfx);
+        lives_combo_set_active_string(LIVES_COMBO(combo),disp_string);
+        lives_signal_handlers_unblock_by_func(combo,(livespointer)after_string_list_changed,(livespointer)rfx);
+        lives_free(disp_string);
+      }
+
       if (param->reinit||(copyto!=-1&&rfx->params[copyto].reinit)) {
-	weed_reinit_effect(inst,FALSE);
-	was_reinited=TRUE;
+        weed_reinit_effect(inst,FALSE);
+        was_reinited=TRUE;
       }
 
     }
@@ -2749,10 +2739,10 @@
 
   if (old_index!=new_index&&param->onchange) {
     param->change_blocked=TRUE;
-    retvals=do_onchange(G_OBJECT(combo), rfx);
+    retvals=do_onchange(LIVES_WIDGET_OBJECT(combo), rfx);
     if (retvals!=NULL) {
-      g_list_free_strings (retvals);
-      g_list_free (retvals);
+      lives_list_free_strings(retvals);
+      lives_list_free(retvals);
     }
     lives_widget_context_update();
     param->change_blocked=FALSE;
@@ -2766,46 +2756,45 @@
 
 
 
-gchar **param_marshall_to_argv (lives_rfx_t *rfx) {
+char **param_marshall_to_argv(lives_rfx_t *rfx) {
   // this function will marshall all parameters into a argv array
   // last array element will be NULL
 
-  // the returned **argv should be g_free()'ed after use
+  // the returned **argv should be lives_free()'ed after use
 
   lives_colRGB24_t rgb;
 
-  gchar **argv=(gchar **)g_malloc((rfx->num_params+1)*(sizeof(gchar *)));
+  char **argv=(char **)lives_malloc((rfx->num_params+1)*(sizeof(char *)));
 
-  gchar *tmp;
+  char *tmp;
 
   register int i;
- 
-  for (i=0;i<rfx->num_params;i++) {
+
+  for (i=0; i<rfx->num_params; i++) {
     switch (rfx->params[i].type) {
     case LIVES_PARAM_COLRGB24:
       get_colRGB24_param(rfx->params[i].value,&rgb);
-      argv[i]=g_strdup_printf("%u",(((rgb.red<<8)+rgb.green)<<8)+rgb.blue);
+      argv[i]=lives_strdup_printf("%u",(((rgb.red<<8)+rgb.green)<<8)+rgb.blue);
       break;
 
     case LIVES_PARAM_STRING:
       // escape strings
-      argv[i]=g_strdup_printf ("%s",(tmp=U82L ((gchar *)rfx->params[i].value)));
-      g_free(tmp);
+      argv[i]=lives_strdup_printf("%s",(tmp=U82L((char *)rfx->params[i].value)));
+      lives_free(tmp);
       break;
 
     case LIVES_PARAM_STRING_LIST:
       // escape strings
-      argv[i]=g_strdup_printf ("%d",get_int_param(rfx->params[i].value));
+      argv[i]=lives_strdup_printf("%d",get_int_param(rfx->params[i].value));
       break;
-      
+
     default:
       if (rfx->params[i].dp) {
-	gchar *return_pattern=g_strdup_printf ("%%.%df",rfx->params[i].dp);
-	argv[i]=g_strdup_printf (return_pattern,get_double_param(rfx->params[i].value));
-	g_free(return_pattern);
-      }
-      else {
-	argv[i]=g_strdup_printf ("%d",get_int_param(rfx->params[i].value));
+        char *return_pattern=lives_strdup_printf("%%.%df",rfx->params[i].dp);
+        argv[i]=lives_strdup_printf(return_pattern,get_double_param(rfx->params[i].value));
+        lives_free(return_pattern);
+      } else {
+        argv[i]=lives_strdup_printf("%d",get_int_param(rfx->params[i].value));
       }
     }
   }
@@ -2819,193 +2808,188 @@
 
 
 
-gchar *param_marshall (lives_rfx_t *rfx, boolean with_min_max) {
+char *param_marshall(lives_rfx_t *rfx, boolean with_min_max) {
   // this function will marshall all parameters into a space separated string
-  // in case of string parameters, these will be surrounded by " and all 
+  // in case of string parameters, these will be surrounded by " and all
   // quotes will be escaped \"
 
-  // the returned string should be g_free()'ed after use
+  // the returned string should be lives_free()'ed after use
   lives_colRGB24_t rgb;
 
-  gchar *new_return=g_strdup ("");
-  gchar *old_return=new_return;
-  gchar *return_pattern;
-  gchar *tmp,*mysubst,*mysubst2;
+  char *new_return=lives_strdup("");
+  char *old_return=new_return;
+  char *return_pattern;
+  char *tmp,*mysubst,*mysubst2;
 
   register int i;
- 
 
-  for (i=0;i<rfx->num_params;i++) {
+
+  for (i=0; i<rfx->num_params; i++) {
     switch (rfx->params[i].type) {
     case LIVES_PARAM_COLRGB24:
       get_colRGB24_param(rfx->params[i].value,&rgb);
       if (!with_min_max) {
-	new_return=g_strdup_printf ("%s %u",old_return,(((rgb.red<<8)+rgb.green)<<8)+rgb.blue);
-      }
-      else {
-	new_return=g_strdup_printf ("%s %d %d %d",old_return,rgb.red,rgb.green,rgb.blue);
+        new_return=lives_strdup_printf("%s %u",old_return,(((rgb.red<<8)+rgb.green)<<8)+rgb.blue);
+      } else {
+        new_return=lives_strdup_printf("%s %d %d %d",old_return,rgb.red,rgb.green,rgb.blue);
       }
-      g_free (old_return);
+      lives_free(old_return);
       old_return=new_return;
       break;
 
     case LIVES_PARAM_STRING:
-      // we need to doubly escape strings 
-      mysubst=subst((gchar *)rfx->params[i].value,"\\","\\\\\\\\");
+      // we need to doubly escape strings
+      mysubst=subst((char *)rfx->params[i].value,"\\","\\\\\\\\");
       mysubst2=subst(mysubst,"\"","\\\\\\\"");
-      g_free(mysubst);
+      lives_free(mysubst);
       mysubst=subst(mysubst2,"`","\\`");
-      g_free(mysubst2);
+      lives_free(mysubst2);
       mysubst2=subst(mysubst,"'","\\`");
-      g_free(mysubst);
-      new_return=g_strdup_printf ("%s \"%s\"",old_return,(tmp=U82L (mysubst2)));
-      g_free(tmp);
-      g_free(mysubst2);
-      g_free (old_return);
+      lives_free(mysubst);
+      new_return=lives_strdup_printf("%s \"%s\"",old_return,(tmp=U82L(mysubst2)));
+      lives_free(tmp);
+      lives_free(mysubst2);
+      lives_free(old_return);
       old_return=new_return;
       break;
 
     case LIVES_PARAM_STRING_LIST:
-      new_return=g_strdup_printf ("%s %d",old_return,get_int_param(rfx->params[i].value));
-      g_free (old_return);
+      new_return=lives_strdup_printf("%s %d",old_return,get_int_param(rfx->params[i].value));
+      lives_free(old_return);
       old_return=new_return;
       break;
-      
+
     default:
       if (rfx->params[i].dp) {
-	return_pattern=g_strdup_printf ("%%s %%.%df",rfx->params[i].dp);
-	new_return=g_strdup_printf (return_pattern,old_return,get_double_param(rfx->params[i].value));
-	if (with_min_max) {
-	  g_free (old_return);
-	  old_return=new_return;
-	  new_return=g_strdup_printf (return_pattern,old_return,rfx->params[i].min);
-	  g_free (old_return);
-	  old_return=new_return;
-	  new_return=g_strdup_printf (return_pattern,old_return,rfx->params[i].max);
-	}
-	g_free (return_pattern);
-      }
-      else {
-	new_return=g_strdup_printf ("%s %d",old_return,get_int_param(rfx->params[i].value));
-	if (with_min_max&&rfx->params[i].type!=LIVES_PARAM_BOOL) {
-	  g_free (old_return);
-	  old_return=new_return;
-	  new_return=g_strdup_printf ("%s %d",old_return,(int)rfx->params[i].min);
-	  g_free (old_return);
-	  old_return=new_return;
-	  new_return=g_strdup_printf ("%s %d",old_return,(int)rfx->params[i].max);
-	}
+        return_pattern=lives_strdup_printf("%%s %%.%df",rfx->params[i].dp);
+        new_return=lives_strdup_printf(return_pattern,old_return,get_double_param(rfx->params[i].value));
+        if (with_min_max) {
+          lives_free(old_return);
+          old_return=new_return;
+          new_return=lives_strdup_printf(return_pattern,old_return,rfx->params[i].min);
+          lives_free(old_return);
+          old_return=new_return;
+          new_return=lives_strdup_printf(return_pattern,old_return,rfx->params[i].max);
+        }
+        lives_free(return_pattern);
+      } else {
+        new_return=lives_strdup_printf("%s %d",old_return,get_int_param(rfx->params[i].value));
+        if (with_min_max&&rfx->params[i].type!=LIVES_PARAM_BOOL) {
+          lives_free(old_return);
+          old_return=new_return;
+          new_return=lives_strdup_printf("%s %d",old_return,(int)rfx->params[i].min);
+          lives_free(old_return);
+          old_return=new_return;
+          new_return=lives_strdup_printf("%s %d",old_return,(int)rfx->params[i].max);
+        }
       }
-      g_free (old_return);
+      lives_free(old_return);
       old_return=new_return;
     }
   }
   if (mainw->current_file>0&&with_min_max) {
     if (rfx->num_in_channels<2) {
-      new_return=g_strdup_printf ("%s %d %d %d %d %d",old_return,cfile->hsize,cfile->vsize,cfile->start,
-				  cfile->end,cfile->frames);
-    }
-    else {
+      new_return=lives_strdup_printf("%s %d %d %d %d %d",old_return,cfile->hsize,cfile->vsize,cfile->start,
+                                     cfile->end,cfile->frames);
+    } else {
       // for transitions, change the end to indicate the merge section
       // this is better for length calculations
       int cb_frames=clipboard->frames;
       int start=cfile->start,end=cfile->end,ttl;
 
       if (prefs->ins_resample&&clipboard->fps!=cfile->fps) {
-	cb_frames=count_resampled_frames(clipboard->frames,clipboard->fps,cfile->fps);
+        cb_frames=count_resampled_frames(clipboard->frames,clipboard->fps,cfile->fps);
       }
 
       if (merge_opts->spinbutton_loops!=NULL&&
-	  cfile->end-cfile->start+1>(cb_frames*(ttl=lives_spin_button_get_value_as_int
-						(LIVES_SPIN_BUTTON (merge_opts->spinbutton_loops))))&&
-	  !merge_opts->loop_to_fit) {
-	end=cb_frames*ttl;
-	if (!merge_opts->align_start) {
-	  start=cfile->end-end+1;
-	  end=cfile->end;
-	}
-	else {
-	  start=cfile->start;
-	  end+=start-1;
-	}
+          cfile->end-cfile->start+1>(cb_frames*(ttl=lives_spin_button_get_value_as_int
+                                     (LIVES_SPIN_BUTTON(merge_opts->spinbutton_loops))))&&
+          !merge_opts->loop_to_fit) {
+        end=cb_frames*ttl;
+        if (!merge_opts->align_start) {
+          start=cfile->end-end+1;
+          end=cfile->end;
+        } else {
+          start=cfile->start;
+          end+=start-1;
+        }
       }
-      new_return=g_strdup_printf ("%s %d %d %d %d %d %d %d",old_return,cfile->hsize,cfile->vsize,start,end,
-				  cfile->frames,clipboard->hsize,clipboard->vsize);
+      new_return=lives_strdup_printf("%s %d %d %d %d %d %d %d",old_return,cfile->hsize,cfile->vsize,start,end,
+                                     cfile->frames,clipboard->hsize,clipboard->vsize);
     }
+  } else {
+    new_return=lives_strdup(old_return);
   }
-  else {
-    new_return=g_strdup (old_return);
-  }
-  g_free (old_return);
+  lives_free(old_return);
 
   return new_return;
 }
 
 
-gchar *reconstruct_string (GList *plist, int start, int *offs) {
+char *reconstruct_string(LiVESList *plist, int start, int *offs) {
   // convert each piece from locale to utf8
   // concat list entries to get reconstruct
   // replace \" with "
 
-  gchar *word=NULL;
-  gchar *ret=g_strdup (""),*ret2;
-  gchar *tmp;
+  char *word=NULL;
+  char *ret=lives_strdup(""),*ret2;
+  char *tmp;
 
   boolean lastword=FALSE;
 
   register int i;
 
-  word=L2U8 ((gchar *)g_list_nth_data (plist,start));
+  word=L2U8((char *)lives_list_nth_data(plist,start));
 
-  if (word==NULL||!strlen (word)||word[0]!='\"') {
-    if (word!=NULL) g_free (word);
+  if (word==NULL||!strlen(word)||word[0]!='\"') {
+    if (word!=NULL) lives_free(word);
     return 0;
   }
 
   word++;
 
-  for (i=start;i<g_list_length (plist);i++) {
-    if (strlen (word)) {
-      if ((word[strlen (word)-1]=='\"')&&(strlen (word)==1||word[strlen (word)-2]!='\\')) {
-	lastword=TRUE;
-	memset (word+strlen (word)-1,0,1);
+  for (i=start; i<lives_list_length(plist); i++) {
+    if (strlen(word)) {
+      if ((word[strlen(word)-1]=='\"')&&(strlen(word)==1||word[strlen(word)-2]!='\\')) {
+        lastword=TRUE;
+        memset(word+strlen(word)-1,0,1);
       }
     }
 
-    ret2=g_strconcat (ret,(tmp=subst (word,"\\\"","\""))," ",NULL);
-    g_free(tmp);
-    if (ret2!=ret) g_free (ret);
+    ret2=lives_strconcat(ret,(tmp=subst(word,"\\\"","\""))," ",NULL);
+    lives_free(tmp);
+    if (ret2!=ret) lives_free(ret);
     ret=ret2;
 
     if (i==start) word--;
-    g_free (word);
+    lives_free(word);
 
     if (lastword) break;
 
-    if (i<g_list_length (plist)-1) word=L2U8 ((gchar *)g_list_nth_data (plist,i+1));
+    if (i<lives_list_length(plist)-1) word=L2U8((char *)lives_list_nth_data(plist,i+1));
   }
 
-  set_int_param (offs,i-start+1);
+  set_int_param(offs,i-start+1);
 
   // remove trailing space
-  memset (ret+strlen (ret)-1,0,1);
+  memset(ret+strlen(ret)-1,0,1);
   return ret;
 
 }
 
 
-void param_demarshall (lives_rfx_t *rfx, GList *plist, boolean with_min_max, boolean upd) {
+void param_demarshall(lives_rfx_t *rfx, LiVESList *plist, boolean with_min_max, boolean upd) {
   int i;
   int pnum=0;
   lives_param_t *param;
 
-  // here we take a GList * of param values, set them in rfx, and if upd is TRUE we also update their visual appearance
+  // here we take a LiVESList * of param values, set them in rfx, and if upd is TRUE we also update their visual appearance
 
   // param->widgets[n] are only valid if upd==TRUE
 
   if (plist==NULL) return;
 
-  for (i=0;i<rfx->num_params;i++) {
+  for (i=0; i<rfx->num_params; i++) {
     param=&rfx->params[i];
     pnum=set_param_from_list(plist,param,pnum,with_min_max,upd);
   }
@@ -3013,24 +2997,23 @@
 
 
 
-GList *argv_to_marshalled_list (lives_rfx_t *rfx, int argc, char **argv) {
-  GList *plist=NULL;
+LiVESList *argv_to_marshalled_list(lives_rfx_t *rfx, int argc, char **argv) {
+  LiVESList *plist=NULL;
 
-  gchar *tmp,*tmp2,*tmp3;
+  char *tmp,*tmp2,*tmp3;
 
   register int i;
 
   if (argc==0) return plist;
 
-  for (i=0;i<=argc&&argv[i]!=NULL;i++) {
+  for (i=0; i<=argc&&argv[i]!=NULL; i++) {
     if (rfx->params[i].type==LIVES_PARAM_STRING) {
-      tmp=g_strdup_printf ("\"%s\"",(tmp2=U82L (tmp3=subst (argv[i],"\"","\\\""))));
-      plist=g_list_append(plist,tmp);
-      g_free(tmp2);
-      g_free(tmp3);
-    }
-    else {
-      plist=g_list_append(plist,g_strdup(argv[i]));
+      tmp=lives_strdup_printf("\"%s\"",(tmp2=U82L(tmp3=subst(argv[i],"\"","\\\""))));
+      plist=lives_list_append(plist,tmp);
+      lives_free(tmp2);
+      lives_free(tmp3);
+    } else {
+      plist=lives_list_append(plist,lives_strdup(argv[i]));
     }
   }
   return plist;
@@ -3040,7 +3023,7 @@
 
 
 
-int set_param_from_list(GList *plist, lives_param_t *param, int pnum, boolean with_min_max, boolean upd) {
+int set_param_from_list(LiVESList *plist, lives_param_t *param, int pnum, boolean with_min_max, boolean upd) {
   // update values for param using values in plist
   // if upd is TRUE, the widgets for that param also are updated;
   // otherwise, we do not update the widgets, but we do update the default
@@ -3051,7 +3034,7 @@
 
   int red,green,blue;
   int offs=0;
-  int maxlen=g_list_length(plist)-1;
+  int maxlen=lives_list_length(plist)-1;
 
   if (ABS(pnum)>maxlen) return 0;
 
@@ -3061,15 +3044,14 @@
       pnum++;
       break;
     }
-    tmp=g_strdup((gchar *)g_list_nth_data (plist,pnum++));
-    set_bool_param(param->value,(atoi (tmp)));
+    tmp=lives_strdup((char *)lives_list_nth_data(plist,pnum++));
+    set_bool_param(param->value,(atoi(tmp)));
     if (upd) {
-      if (param->widgets[0]&&LIVES_IS_TOGGLE_BUTTON (param->widgets[0])) {
-	lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (param->widgets[0]),get_bool_param(param->value));
+      if (param->widgets[0]&&LIVES_IS_TOGGLE_BUTTON(param->widgets[0])) {
+        lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(param->widgets[0]),get_bool_param(param->value));
       }
-    }
-    else set_bool_param(param->def,(atoi (tmp)));
-    g_free(tmp);
+    } else set_bool_param(param->def,(atoi(tmp)));
+    lives_free(tmp);
     break;
   case LIVES_PARAM_NUM:
     if (param->change_blocked) {
@@ -3079,131 +3061,124 @@
     }
     if (param->dp) {
       double double_val;
-      tmp=g_strdup((gchar *)g_list_nth_data (plist,pnum++));
-      double_val=g_strtod (tmp,NULL);
-      g_free(tmp);
+      tmp=lives_strdup((char *)lives_list_nth_data(plist,pnum++));
+      double_val=lives_strtod(tmp,NULL);
+      lives_free(tmp);
       if (with_min_max) {
-	if (ABS(pnum)>maxlen) return 1;
-	tmp=g_strdup((gchar *)g_list_nth_data (plist,pnum++));
-	param->min=g_strtod (tmp,NULL);
-	g_free(tmp);
-	if (ABS(pnum)>maxlen) return 2;
-	tmp=g_strdup((gchar *)g_list_nth_data (plist,pnum++));
-	param->max=g_strtod (tmp,NULL);
-	g_free(tmp);
-	if (double_val<param->min) double_val=param->min;
-	if (double_val>param->max) double_val=param->max;
+        if (ABS(pnum)>maxlen) return 1;
+        tmp=lives_strdup((char *)lives_list_nth_data(plist,pnum++));
+        param->min=lives_strtod(tmp,NULL);
+        lives_free(tmp);
+        if (ABS(pnum)>maxlen) return 2;
+        tmp=lives_strdup((char *)lives_list_nth_data(plist,pnum++));
+        param->max=lives_strtod(tmp,NULL);
+        lives_free(tmp);
+        if (double_val<param->min) double_val=param->min;
+        if (double_val>param->max) double_val=param->max;
       }
       set_double_param(param->value,double_val);
       if (upd) {
-	if (param->widgets[0]&&LIVES_IS_SPIN_BUTTON (param->widgets[0])) {
-	  lives_rfx_t *rfx=(lives_rfx_t *)g_object_get_data(G_OBJECT(param->widgets[0]),"rfx");
-	  lives_signal_handlers_block_by_func(param->widgets[0],(gpointer)after_param_value_changed,(gpointer)rfx);
-	  lives_spin_button_set_range (LIVES_SPIN_BUTTON (param->widgets[0]),(double)param->min,(double)param->max);
-	  lives_spin_button_update(LIVES_SPIN_BUTTON(param->widgets[0]));
-	  lives_signal_handlers_unblock_by_func(param->widgets[0],(gpointer)after_param_value_changed,(gpointer)rfx);
-	  lives_spin_button_set_value (LIVES_SPIN_BUTTON (param->widgets[0]),get_double_param(param->value));
-	  lives_spin_button_update(LIVES_SPIN_BUTTON(param->widgets[0]));
-	}
-      }
-      else set_double_param(param->def,double_val);
-    }
-    else {
+        if (param->widgets[0]&&LIVES_IS_SPIN_BUTTON(param->widgets[0])) {
+          lives_rfx_t *rfx=(lives_rfx_t *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(param->widgets[0]),"rfx");
+          lives_signal_handlers_block_by_func(param->widgets[0],(livespointer)after_param_value_changed,(livespointer)rfx);
+          lives_spin_button_set_range(LIVES_SPIN_BUTTON(param->widgets[0]),(double)param->min,(double)param->max);
+          lives_spin_button_update(LIVES_SPIN_BUTTON(param->widgets[0]));
+          lives_signal_handlers_unblock_by_func(param->widgets[0],(livespointer)after_param_value_changed,(livespointer)rfx);
+          lives_spin_button_set_value(LIVES_SPIN_BUTTON(param->widgets[0]),get_double_param(param->value));
+          lives_spin_button_update(LIVES_SPIN_BUTTON(param->widgets[0]));
+        }
+      } else set_double_param(param->def,double_val);
+    } else {
       int int_value;
-      tmp=g_strdup((gchar *)g_list_nth_data (plist,pnum++));
-      int_value=atoi (tmp);
-      g_free(tmp);
+      tmp=lives_strdup((char *)lives_list_nth_data(plist,pnum++));
+      int_value=atoi(tmp);
+      lives_free(tmp);
       if (with_min_max) {
-	int int_min,int_max;
-	if (ABS(pnum)>maxlen) return 1;
-	tmp=g_strdup((gchar *)g_list_nth_data (plist,pnum++));
-	int_min=atoi (tmp);
-	g_free(tmp);
-	if (ABS(pnum)>maxlen) return 2;
-	tmp=g_strdup((gchar *)g_list_nth_data (plist,pnum++));
-	int_max=atoi (tmp);
-	g_free(tmp);
-	if (int_value<int_min) int_value=int_min;
-	if (int_value>int_max) int_value=int_max;
-	param->min=(double)int_min;
-	param->max=(double)int_max;
+        int int_min,int_max;
+        if (ABS(pnum)>maxlen) return 1;
+        tmp=lives_strdup((char *)lives_list_nth_data(plist,pnum++));
+        int_min=atoi(tmp);
+        lives_free(tmp);
+        if (ABS(pnum)>maxlen) return 2;
+        tmp=lives_strdup((char *)lives_list_nth_data(plist,pnum++));
+        int_max=atoi(tmp);
+        lives_free(tmp);
+        if (int_value<int_min) int_value=int_min;
+        if (int_value>int_max) int_value=int_max;
+        param->min=(double)int_min;
+        param->max=(double)int_max;
       }
       set_int_param(param->value,int_value);
-      
+
       if (upd) {
-	if (param->widgets[0]&&LIVES_IS_SPIN_BUTTON (param->widgets[0])) {
-	  lives_rfx_t *rfx=(lives_rfx_t *)g_object_get_data(G_OBJECT(param->widgets[0]),"rfx");
-	  lives_signal_handlers_block_by_func(param->widgets[0],(gpointer)after_param_value_changed,(gpointer)rfx);
-	  lives_spin_button_set_range (LIVES_SPIN_BUTTON (param->widgets[0]),(double)param->min,(double)param->max);
-	  lives_spin_button_update(LIVES_SPIN_BUTTON(param->widgets[0]));
-	  lives_signal_handlers_unblock_by_func(param->widgets[0],(gpointer)after_param_value_changed,(gpointer)rfx);
-	  lives_spin_button_set_value (LIVES_SPIN_BUTTON (param->widgets[0]),(double)get_int_param(param->value));
-	  lives_spin_button_update(LIVES_SPIN_BUTTON(param->widgets[0]));
-	}
-      }
-      else set_int_param(param->def,int_value);
+        if (param->widgets[0]&&LIVES_IS_SPIN_BUTTON(param->widgets[0])) {
+          lives_rfx_t *rfx=(lives_rfx_t *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(param->widgets[0]),"rfx");
+          lives_signal_handlers_block_by_func(param->widgets[0],(livespointer)after_param_value_changed,(livespointer)rfx);
+          lives_spin_button_set_range(LIVES_SPIN_BUTTON(param->widgets[0]),(double)param->min,(double)param->max);
+          lives_spin_button_update(LIVES_SPIN_BUTTON(param->widgets[0]));
+          lives_signal_handlers_unblock_by_func(param->widgets[0],(livespointer)after_param_value_changed,(livespointer)rfx);
+          lives_spin_button_set_value(LIVES_SPIN_BUTTON(param->widgets[0]),(double)get_int_param(param->value));
+          lives_spin_button_update(LIVES_SPIN_BUTTON(param->widgets[0]));
+        }
+      } else set_int_param(param->def,int_value);
     }
     break;
   case LIVES_PARAM_COLRGB24:
-    tmp=g_strdup((gchar *)g_list_nth_data (plist,pnum++));
-    red=atoi (tmp);
-    g_free(tmp);
+    tmp=lives_strdup((char *)lives_list_nth_data(plist,pnum++));
+    red=atoi(tmp);
+    lives_free(tmp);
     if (ABS(pnum)>maxlen) return 1;
-    tmp=g_strdup((gchar *)g_list_nth_data (plist,pnum++));
-    green=atoi (tmp);
-    g_free(tmp);
+    tmp=lives_strdup((char *)lives_list_nth_data(plist,pnum++));
+    green=atoi(tmp);
+    lives_free(tmp);
     if (ABS(pnum)>maxlen) return 2;
-    tmp=g_strdup((gchar *)g_list_nth_data (plist,pnum++));
-    blue=atoi (tmp);
-    g_free(tmp);
+    tmp=lives_strdup((char *)lives_list_nth_data(plist,pnum++));
+    blue=atoi(tmp);
+    lives_free(tmp);
     if (param->change_blocked) break;
     set_colRGB24_param(param->value,red,green,blue);
 
     if (upd) {
-      if (param->widgets[0]&&LIVES_IS_SPIN_BUTTON (param->widgets[0])) {
-	lives_spin_button_set_value (LIVES_SPIN_BUTTON (param->widgets[0]),(double)red);
+      if (param->widgets[0]&&LIVES_IS_SPIN_BUTTON(param->widgets[0])) {
+        lives_spin_button_set_value(LIVES_SPIN_BUTTON(param->widgets[0]),(double)red);
       }
-      if (param->widgets[1]&&LIVES_IS_SPIN_BUTTON (param->widgets[1])) {
-	lives_spin_button_set_value (LIVES_SPIN_BUTTON (param->widgets[1]),(double)green);
+      if (param->widgets[1]&&LIVES_IS_SPIN_BUTTON(param->widgets[1])) {
+        lives_spin_button_set_value(LIVES_SPIN_BUTTON(param->widgets[1]),(double)green);
       }
-      if (param->widgets[2]&&LIVES_IS_SPIN_BUTTON (param->widgets[2])) {
-	lives_spin_button_set_value (LIVES_SPIN_BUTTON (param->widgets[2]),(double)blue);
+      if (param->widgets[2]&&LIVES_IS_SPIN_BUTTON(param->widgets[2])) {
+        lives_spin_button_set_value(LIVES_SPIN_BUTTON(param->widgets[2]),(double)blue);
       }
-    }
-    else set_colRGB24_param(param->def,red,green,blue);
+    } else set_colRGB24_param(param->def,red,green,blue);
     break;
   case LIVES_PARAM_STRING:
-    if (param->value!=NULL) g_free(param->value);
-    param->value=reconstruct_string (plist,pnum,&offs);
+    if (param->value!=NULL) lives_free(param->value);
+    param->value=reconstruct_string(plist,pnum,&offs);
     if (upd) {
       if (param->widgets[0]!=NULL) {
-	if (LIVES_IS_TEXT_VIEW(param->widgets[0])) {
-	  gchar *string=g_strdup((gchar *)param->value); // work around bug in glib ???
-	  lives_text_view_set_text (LIVES_TEXT_VIEW(param->widgets[0]), string, -1);
-	  g_free(string);
-	}
-	else {
-	  lives_entry_set_text (LIVES_ENTRY (param->widgets[0]),(gchar *)param->value);
-	}
+        if (LIVES_IS_TEXT_VIEW(param->widgets[0])) {
+          char *string=lives_strdup((char *)param->value); // work around bug in glib ???
+          lives_text_view_set_text(LIVES_TEXT_VIEW(param->widgets[0]), string, -1);
+          lives_free(string);
+        } else {
+          lives_entry_set_text(LIVES_ENTRY(param->widgets[0]),(char *)param->value);
+        }
       }
-    }
-    else param->def=(void *)g_strdup((gchar *)param->value);
+    } else param->def=(void *)lives_strdup((char *)param->value);
     pnum+=offs;
     break;
-  case LIVES_PARAM_STRING_LIST:
-    {
-      int int_value;
-      tmp=g_strdup((gchar *)g_list_nth_data (plist,pnum++));
-      int_value=atoi (tmp);
-      g_free(tmp);
-      if (param->change_blocked) break;
-      set_int_param(param->value,int_value);
-      if (upd&&param->widgets[0]!=NULL&&LIVES_IS_COMBO(param->widgets[0])&&int_value<g_list_length(param->list))
-	lives_combo_set_active_string(LIVES_COMBO(param->widgets[0]),(gchar *)g_list_nth_data(param->list,int_value));
-      if (!upd) set_int_param(param->def,int_value);
+  case LIVES_PARAM_STRING_LIST: {
+    int int_value;
+    tmp=lives_strdup((char *)lives_list_nth_data(plist,pnum++));
+    int_value=atoi(tmp);
+    lives_free(tmp);
+    if (param->change_blocked) break;
+    set_int_param(param->value,int_value);
+    if (upd&&param->widgets[0]!=NULL&&LIVES_IS_COMBO(param->widgets[0])&&int_value<lives_list_length(param->list))
+      lives_combo_set_active_string(LIVES_COMBO(param->widgets[0]),(char *)lives_list_nth_data(param->list,int_value));
+    if (!upd) set_int_param(param->def,int_value);
 
-      break;
-    }
+    break;
+  }
   default:
     break;
   }
@@ -3211,16 +3186,16 @@
 }
 
 
-GList *do_onchange (LiVESObject *object, lives_rfx_t *rfx) {
-  GList *retvals;
+LiVESList *do_onchange(LiVESObject *object, lives_rfx_t *rfx) {
+  LiVESList *retvals;
 
-  int which=GPOINTER_TO_INT (g_object_get_data (object,"param_number"));
+  int which=LIVES_POINTER_TO_INT(lives_widget_object_get_data(object,"param_number"));
   int width=0,height=0;
 
-  const gchar *handle="";
+  const char *handle="";
 
-  gchar *plugdir;
-  gchar *com,*tmp;
+  char *plugdir;
+  char *com,*tmp;
 
   // weed plugins do not have triggers
   if (rfx->status==RFX_STATUS_WEED) return NULL;
@@ -3229,16 +3204,16 @@
     // init
     switch (rfx->status) {
     case RFX_STATUS_BUILTIN:
-      plugdir=g_build_filename (prefs->lib_dir,PLUGIN_EXEC_DIR,PLUGIN_RENDERED_EFFECTS_BUILTIN,NULL);
+      plugdir=lives_build_filename(prefs->lib_dir,PLUGIN_EXEC_DIR,PLUGIN_RENDERED_EFFECTS_BUILTIN,NULL);
       break;
     case RFX_STATUS_CUSTOM:
-      plugdir=g_build_filename (capable->home_dir,LIVES_CONFIG_DIR,PLUGIN_RENDERED_EFFECTS_CUSTOM,NULL);
+      plugdir=lives_build_filename(capable->home_dir,LIVES_CONFIG_DIR,PLUGIN_RENDERED_EFFECTS_CUSTOM,NULL);
       break;
     case RFX_STATUS_TEST:
-      plugdir=g_build_filename (capable->home_dir,LIVES_CONFIG_DIR,PLUGIN_RENDERED_EFFECTS_TEST,NULL);
+      plugdir=lives_build_filename(capable->home_dir,LIVES_CONFIG_DIR,PLUGIN_RENDERED_EFFECTS_TEST,NULL);
       break;
     default:
-      plugdir=g_strdup_printf ("%s",prefs->tmpdir);
+      plugdir=lives_strdup_printf("%s",prefs->tmpdir);
     }
 
     if (mainw->current_file>0) {
@@ -3247,40 +3222,38 @@
       handle=cfile->handle;
     }
 
-    com=g_strdup_printf ("%s \"fxinit_%s\" \"%s\" \"%s\" %d %d %s",prefs->backend_sync,rfx->name,handle,plugdir,
-			 width,height,(tmp=param_marshall (rfx,TRUE)));
-    retvals=plugin_request_by_space (NULL,NULL,com);
-
-    g_free(tmp);
-    g_free(plugdir);
-  }
-  else {
-    com=g_strdup_printf ("onchange_%d%s",which,param_marshall (rfx,TRUE));
+    com=lives_strdup_printf("%s \"fxinit_%s\" \"%s\" \"%s\" %d %d %s",prefs->backend_sync,rfx->name,handle,plugdir,
+                            width,height,(tmp=param_marshall(rfx,TRUE)));
+    retvals=plugin_request_by_space(NULL,NULL,com);
+
+    lives_free(tmp);
+    lives_free(plugdir);
+  } else {
+    com=lives_strdup_printf("onchange_%d%s",which,param_marshall(rfx,TRUE));
     switch (rfx->status) {
     case RFX_STATUS_BUILTIN:
-      retvals=plugin_request_by_space (PLUGIN_RENDERED_EFFECTS_BUILTIN,rfx->name,com);
+      retvals=plugin_request_by_space(PLUGIN_RENDERED_EFFECTS_BUILTIN,rfx->name,com);
       break;
     case RFX_STATUS_CUSTOM:
-      retvals=plugin_request_by_space (PLUGIN_RENDERED_EFFECTS_CUSTOM,rfx->name,com);
+      retvals=plugin_request_by_space(PLUGIN_RENDERED_EFFECTS_CUSTOM,rfx->name,com);
       break;
     case RFX_STATUS_TEST:
-      retvals=plugin_request_by_space (PLUGIN_RENDERED_EFFECTS_TEST,rfx->name,com);
+      retvals=plugin_request_by_space(PLUGIN_RENDERED_EFFECTS_TEST,rfx->name,com);
       break;
     default:
-      retvals=plugin_request_by_space (PLUGIN_RFX_SCRAP,rfx->name,com);
+      retvals=plugin_request_by_space(PLUGIN_RFX_SCRAP,rfx->name,com);
     }
   }
 
   if (retvals!=NULL) {
-    param_demarshall (rfx,retvals,TRUE,which>=0);
-  }
-  else {
+    param_demarshall(rfx,retvals,TRUE,which>=0);
+  } else {
     if (which<=0&&mainw->error) {
       mainw->error=FALSE;
-      do_blocking_error_dialog (g_strdup_printf ("\n\n%s\n\n",mainw->msg));
+      do_blocking_error_dialog(lives_strdup_printf("\n\n%s\n\n",mainw->msg));
     }
   }
-  g_free (com);
+  lives_free(com);
 
   return retvals;
 
@@ -3288,10 +3261,10 @@
 
 
 
-void on_pwcolsel (LiVESButton *button, lives_rfx_t *rfx) {
+void on_pwcolsel(LiVESButton *button, lives_rfx_t *rfx) {
   LiVESWidgetColor selected;
 
-  int pnum=GPOINTER_TO_INT (g_object_get_data (G_OBJECT (button),"param_number"));
+  int pnum=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(button),"param_number"));
   int r,g,b;
 
   lives_param_t *param=&rfx->params[pnum];
@@ -3316,7 +3289,7 @@
 
 void update_visual_params(lives_rfx_t *rfx, boolean update_hidden) {
   // update parameters visually from an rfx object
-  GList *list;
+  LiVESList *list;
 
   weed_plant_t **in_params,*in_param;
   weed_plant_t *inst=(weed_plant_t *)rfx->source;
@@ -3332,10 +3305,10 @@
   double red_mind,green_mind,blue_mind;
   double vald,mind,maxd;
 
-  gchar **valss;
+  char **valss;
 
-  gchar *vals,*pattern;
-  gchar *tmp,*tmp2;
+  char *vals,*pattern;
+  char *tmp,*tmp2;
 
   int cspace;
   int error;
@@ -3350,14 +3323,14 @@
   int key=-1;
 
   register int i,j;
-    
+
   if (weed_plant_has_leaf(inst,"in_parameters")) num_params=weed_leaf_num_elements(inst,"in_parameters");
   if (num_params==0) return;
 
   if (weed_plant_has_leaf(inst,"host_key")) key=weed_get_int_value(inst,"host_key",&error);
 
   in_params=weed_get_plantptr_array(inst,"in_parameters",&error);
-  for (i=0;i<num_params;i++) {
+  for (i=0; i<num_params; i++) {
     if (!is_hidden_param(inst,i)||update_hidden) {
       // by default we dont update hidden or reinit params
 
@@ -3371,7 +3344,7 @@
       index=0;
 
       if (mainw->multitrack!=NULL&&is_perchannel_multi(rfx,i)) {
-	index=mainw->multitrack->track_index;
+        index=mainw->multitrack->track_index;
       }
 
       filter_mutex_lock(key);
@@ -3379,187 +3352,182 @@
       numvals=weed_leaf_num_elements(in_param,"value");
 
       if (param_hint!=WEED_HINT_COLOR&&index>=numvals) {
-	fill_param_vals_to(in_param,paramtmpl,index);
-	numvals=index+1;
+        fill_param_vals_to(in_param,paramtmpl,index);
+        numvals=index+1;
       }
 
       switch (param_hint) {
       case WEED_HINT_INTEGER:
-	valis=weed_get_int_array(in_param,"value",&error);
-	vali=valis[index];
-	weed_free(valis);
-
-	mini=weed_get_int_value(paramtmpl,"min",&error);
-	maxi=weed_get_int_value(paramtmpl,"max",&error);
-	
-	list=g_list_append(list,g_strdup_printf("%d",vali));
-	list=g_list_append(list,g_strdup_printf("%d",mini));
-	list=g_list_append(list,g_strdup_printf("%d",maxi));
-	set_param_from_list(list,&rfx->params[i],0,TRUE,TRUE);
-	g_list_free_strings(list);
-	g_list_free(list);
-	
-	break;
+        valis=weed_get_int_array(in_param,"value",&error);
+        vali=valis[index];
+        lives_free(valis);
+
+        mini=weed_get_int_value(paramtmpl,"min",&error);
+        maxi=weed_get_int_value(paramtmpl,"max",&error);
+
+        list=lives_list_append(list,lives_strdup_printf("%d",vali));
+        list=lives_list_append(list,lives_strdup_printf("%d",mini));
+        list=lives_list_append(list,lives_strdup_printf("%d",maxi));
+        set_param_from_list(list,&rfx->params[i],0,TRUE,TRUE);
+        lives_list_free_strings(list);
+        lives_list_free(list);
+
+        break;
       case WEED_HINT_FLOAT:
-	valds=weed_get_double_array(in_param,"value",&error);
-	vald=valds[index];
-	weed_free(valds);
-
-	mind=weed_get_double_value(paramtmpl,"min",&error);
-	maxd=weed_get_double_value(paramtmpl,"max",&error);
-
-	pattern=g_strdup("%.2f");
-
-	if (weed_plant_has_leaf(paramtmpl,"gui")) {
-	  weed_plant_t *gui=weed_get_plantptr_value(paramtmpl,"gui",&error);
-	  if (weed_plant_has_leaf(gui,"decimals")) {
-	    int dp=weed_get_int_value(gui,"decimals",&error);
-	    g_free(pattern);
-	    pattern=g_strdup_printf("%%.%df",dp);
-	  }
-	}
-
-	list=g_list_append(list,g_strdup_printf(pattern,vald));
-	list=g_list_append(list,g_strdup_printf(pattern,mind));
-	list=g_list_append(list,g_strdup_printf(pattern,maxd));
-
-	g_free(pattern);
-
-	set_param_from_list(list,&rfx->params[i],0,TRUE,TRUE);
-	g_list_free_strings(list);
-	g_list_free(list);
+        valds=weed_get_double_array(in_param,"value",&error);
+        vald=valds[index];
+        lives_free(valds);
+
+        mind=weed_get_double_value(paramtmpl,"min",&error);
+        maxd=weed_get_double_value(paramtmpl,"max",&error);
+
+        pattern=lives_strdup("%.2f");
+
+        if (weed_plant_has_leaf(paramtmpl,"gui")) {
+          weed_plant_t *gui=weed_get_plantptr_value(paramtmpl,"gui",&error);
+          if (weed_plant_has_leaf(gui,"decimals")) {
+            int dp=weed_get_int_value(gui,"decimals",&error);
+            lives_free(pattern);
+            pattern=lives_strdup_printf("%%.%df",dp);
+          }
+        }
+
+        list=lives_list_append(list,lives_strdup_printf(pattern,vald));
+        list=lives_list_append(list,lives_strdup_printf(pattern,mind));
+        list=lives_list_append(list,lives_strdup_printf(pattern,maxd));
+
+        lives_free(pattern);
+
+        set_param_from_list(list,&rfx->params[i],0,TRUE,TRUE);
+        lives_list_free_strings(list);
+        lives_list_free(list);
 
-	break;
+        break;
       case WEED_HINT_SWITCH:
-	valis=weed_get_boolean_array(in_param,"value",&error);
-	vali=valis[index];
-	weed_free(valis);
-
-	list=g_list_append(list,g_strdup_printf("%d",vali));
-	set_param_from_list(list,&rfx->params[i],0,FALSE,TRUE);
-	g_list_free_strings(list);
-	g_list_free(list);
+        valis=weed_get_boolean_array(in_param,"value",&error);
+        vali=valis[index];
+        lives_free(valis);
+
+        list=lives_list_append(list,lives_strdup_printf("%d",vali));
+        set_param_from_list(list,&rfx->params[i],0,FALSE,TRUE);
+        lives_list_free_strings(list);
+        lives_list_free(list);
 
-	break;
+        break;
       case WEED_HINT_TEXT:
-	valss=weed_get_string_array(in_param,"value",&error);
-	vals=valss[index];
+        valss=weed_get_string_array(in_param,"value",&error);
+        vals=valss[index];
 
-	list=g_list_append(list,g_strdup_printf ("\"%s\"",(tmp=U82L (tmp2=subst (vals,"\"","\\\"")))));
-	g_free(tmp);
-	g_free(tmp2);
-	set_param_from_list(list,&rfx->params[i],0,FALSE,TRUE);
-	for (j=0;j<numvals;j++) {
-	  weed_free(valss[j]);
-	}
-	weed_free(valss);
-	g_list_free_strings(list);
-	g_list_free(list);
-	break;
+        list=lives_list_append(list,lives_strdup_printf("\"%s\"",(tmp=U82L(tmp2=subst(vals,"\"","\\\"")))));
+        lives_free(tmp);
+        lives_free(tmp2);
+        set_param_from_list(list,&rfx->params[i],0,FALSE,TRUE);
+        for (j=0; j<numvals; j++) {
+          lives_free(valss[j]);
+        }
+        lives_free(valss);
+        lives_list_free_strings(list);
+        lives_list_free(list);
+        break;
       case WEED_HINT_COLOR:
-	cspace=weed_get_int_value(paramtmpl,"colorspace",&error);
-	switch (cspace) {
-	case WEED_COLORSPACE_RGB:
-	  numvals=weed_leaf_num_elements(in_param,"value");
-	  if (index*3>=numvals) fill_param_vals_to(in_param,paramtmpl,index);
-
-	  if (weed_leaf_seed_type(paramtmpl,"default")==WEED_SEED_INT) {
-	    colsis=weed_get_int_array(in_param,"value",&error);
-	    colsi=&colsis[3*index];
-
-	    if (weed_leaf_num_elements(paramtmpl,"max")==1) {
-	      red_max=green_max=blue_max=weed_get_int_value(paramtmpl,"max",&error);
-	    }
-	    else {
-	      maxis=weed_get_int_array(paramtmpl,"max",&error);
-	      red_max=maxis[0];
-	      green_max=maxis[1];
-	      blue_max=maxis[2];
-	    }
-	    if (weed_leaf_num_elements(paramtmpl,"min")==1) {
-	      red_min=green_min=blue_min=weed_get_int_value(paramtmpl,"min",&error);
-	    }
-	    else {
-	      minis=weed_get_int_array(paramtmpl,"min",&error);
-	      red_min=minis[0];
-	      green_min=minis[1];
-	      blue_min=minis[2];
-	    }
-
-	    colsi[0]=(int)((double)(colsi[0]-red_min)/(double)(red_max-red_min)*255.+.5);
-	    colsi[1]=(int)((double)(colsi[1]-green_min)/(double)(green_max-green_min)*255.+.5);
-	    colsi[2]=(int)((double)(colsi[2]-blue_min)/(double)(blue_max-blue_min)*255.+.5);
-
-	    if (colsi[0]<red_min) colsi[0]=red_min;
-	    if (colsi[1]<green_min) colsi[1]=green_min;
-	    if (colsi[2]<blue_min) colsi[2]=blue_min;
-	    if (colsi[0]>red_max) colsi[0]=red_max;
-	    if (colsi[1]>green_max) colsi[1]=green_max;
-	    if (colsi[2]>blue_max) colsi[2]=blue_max;
-
-	    list=g_list_append(list,g_strdup_printf("%d",colsi[0]));
-	    list=g_list_append(list,g_strdup_printf("%d",colsi[1]));
-	    list=g_list_append(list,g_strdup_printf("%d",colsi[2]));
-
-	    set_param_from_list(list,&rfx->params[i],0,FALSE,TRUE);
-
-	    g_list_free_strings(list);
-	    g_list_free(list);
-	    weed_free(colsis);
-	    if (maxis!=NULL) weed_free(maxis);
-	    if (minis!=NULL) weed_free(minis);
-	  }
-	  else {
-	    colsds=weed_get_double_array(in_param,"value",&error);
-	    colsd=&colsds[3*index];
-	    if (weed_leaf_num_elements(paramtmpl,"max")==1) {
-	      red_maxd=green_maxd=blue_maxd=weed_get_double_value(paramtmpl,"max",&error);
-	    }
-	    else {
-	      maxds=weed_get_double_array(paramtmpl,"max",&error);
-	      red_maxd=maxds[0];
-	      green_maxd=maxds[1];
-	      blue_maxd=maxds[2];
-	    }
-	    if (weed_leaf_num_elements(paramtmpl,"min")==1) {
-	      red_mind=green_mind=blue_mind=weed_get_double_value(paramtmpl,"min",&error);
-	    }
-	    else {
-	      minds=weed_get_double_array(paramtmpl,"min",&error);
-	      red_mind=minds[0];
-	      green_mind=minds[1];
-	      blue_mind=minds[2];
-	    }
-	    colsd[0]=(colsd[0]-red_mind)/(red_maxd-red_mind)*255.+.5;
-	    colsd[1]=(colsd[1]-green_mind)/(green_maxd-green_mind)*255.+.5;
-	    colsd[2]=(colsd[2]-blue_mind)/(blue_maxd-blue_mind)*255.+.5;
-
-	    if (colsd[0]<red_mind) colsd[0]=red_mind;
-	    if (colsd[1]<green_mind) colsd[1]=green_mind;
-	    if (colsd[2]<blue_mind) colsd[2]=blue_mind;
-	    if (colsd[0]>red_maxd) colsd[0]=red_maxd;
-	    if (colsd[1]>green_maxd) colsd[1]=green_maxd;
-	    if (colsd[2]>blue_maxd) colsd[2]=blue_maxd;
-	    
-	    list=g_list_append(list,g_strdup_printf("%.2f",colsd[0]));
-	    list=g_list_append(list,g_strdup_printf("%.2f",colsd[1]));
-	    list=g_list_append(list,g_strdup_printf("%.2f",colsd[2]));
-	    set_param_from_list(list,&rfx->params[i],0,FALSE,TRUE);
-
-	    g_list_free_strings(list);
-	    g_list_free(list);
-	    weed_free(colsds);
-	    if (maxds!=NULL) weed_free(maxds);
-	    if (minds!=NULL) weed_free(minds);
-	  }
-	  break;
-	  // TODO - other color spaces, e.g. RGBA24
-	}
-	break;
+        cspace=weed_get_int_value(paramtmpl,"colorspace",&error);
+        switch (cspace) {
+        case WEED_COLORSPACE_RGB:
+          numvals=weed_leaf_num_elements(in_param,"value");
+          if (index*3>=numvals) fill_param_vals_to(in_param,paramtmpl,index);
+
+          if (weed_leaf_seed_type(paramtmpl,"default")==WEED_SEED_INT) {
+            colsis=weed_get_int_array(in_param,"value",&error);
+            colsi=&colsis[3*index];
+
+            if (weed_leaf_num_elements(paramtmpl,"max")==1) {
+              red_max=green_max=blue_max=weed_get_int_value(paramtmpl,"max",&error);
+            } else {
+              maxis=weed_get_int_array(paramtmpl,"max",&error);
+              red_max=maxis[0];
+              green_max=maxis[1];
+              blue_max=maxis[2];
+            }
+            if (weed_leaf_num_elements(paramtmpl,"min")==1) {
+              red_min=green_min=blue_min=weed_get_int_value(paramtmpl,"min",&error);
+            } else {
+              minis=weed_get_int_array(paramtmpl,"min",&error);
+              red_min=minis[0];
+              green_min=minis[1];
+              blue_min=minis[2];
+            }
+
+            colsi[0]=(int)((double)(colsi[0]-red_min)/(double)(red_max-red_min)*255.+.5);
+            colsi[1]=(int)((double)(colsi[1]-green_min)/(double)(green_max-green_min)*255.+.5);
+            colsi[2]=(int)((double)(colsi[2]-blue_min)/(double)(blue_max-blue_min)*255.+.5);
+
+            if (colsi[0]<red_min) colsi[0]=red_min;
+            if (colsi[1]<green_min) colsi[1]=green_min;
+            if (colsi[2]<blue_min) colsi[2]=blue_min;
+            if (colsi[0]>red_max) colsi[0]=red_max;
+            if (colsi[1]>green_max) colsi[1]=green_max;
+            if (colsi[2]>blue_max) colsi[2]=blue_max;
+
+            list=lives_list_append(list,lives_strdup_printf("%d",colsi[0]));
+            list=lives_list_append(list,lives_strdup_printf("%d",colsi[1]));
+            list=lives_list_append(list,lives_strdup_printf("%d",colsi[2]));
+
+            set_param_from_list(list,&rfx->params[i],0,FALSE,TRUE);
+
+            lives_list_free_strings(list);
+            lives_list_free(list);
+            lives_free(colsis);
+            if (maxis!=NULL) lives_free(maxis);
+            if (minis!=NULL) lives_free(minis);
+          } else {
+            colsds=weed_get_double_array(in_param,"value",&error);
+            colsd=&colsds[3*index];
+            if (weed_leaf_num_elements(paramtmpl,"max")==1) {
+              red_maxd=green_maxd=blue_maxd=weed_get_double_value(paramtmpl,"max",&error);
+            } else {
+              maxds=weed_get_double_array(paramtmpl,"max",&error);
+              red_maxd=maxds[0];
+              green_maxd=maxds[1];
+              blue_maxd=maxds[2];
+            }
+            if (weed_leaf_num_elements(paramtmpl,"min")==1) {
+              red_mind=green_mind=blue_mind=weed_get_double_value(paramtmpl,"min",&error);
+            } else {
+              minds=weed_get_double_array(paramtmpl,"min",&error);
+              red_mind=minds[0];
+              green_mind=minds[1];
+              blue_mind=minds[2];
+            }
+            colsd[0]=(colsd[0]-red_mind)/(red_maxd-red_mind)*255.+.5;
+            colsd[1]=(colsd[1]-green_mind)/(green_maxd-green_mind)*255.+.5;
+            colsd[2]=(colsd[2]-blue_mind)/(blue_maxd-blue_mind)*255.+.5;
+
+            if (colsd[0]<red_mind) colsd[0]=red_mind;
+            if (colsd[1]<green_mind) colsd[1]=green_mind;
+            if (colsd[2]<blue_mind) colsd[2]=blue_mind;
+            if (colsd[0]>red_maxd) colsd[0]=red_maxd;
+            if (colsd[1]>green_maxd) colsd[1]=green_maxd;
+            if (colsd[2]>blue_maxd) colsd[2]=blue_maxd;
+
+            list=lives_list_append(list,lives_strdup_printf("%.2f",colsd[0]));
+            list=lives_list_append(list,lives_strdup_printf("%.2f",colsd[1]));
+            list=lives_list_append(list,lives_strdup_printf("%.2f",colsd[2]));
+            set_param_from_list(list,&rfx->params[i],0,FALSE,TRUE);
+
+            lives_list_free_strings(list);
+            lives_list_free(list);
+            lives_free(colsds);
+            if (maxds!=NULL) lives_free(maxds);
+            if (minds!=NULL) lives_free(minds);
+          }
+          break;
+          // TODO - other color spaces, e.g. RGBA24
+        }
+        break;
       } // hint
     }
     filter_mutex_unlock(key);
   }
-  weed_free(in_params);
+  lives_free(in_params);
 }

LiVES-2.2.8.tar.bz2/src/paramwindow.h -> LiVES-2.4.1.tar.bz2/src/paramwindow.h Changed

@@ -9,7 +9,7 @@
 
 typedef struct {
   int usr_number;
-  GSList *rbgroup;
+  LiVESSList *rbgroup;
   int active_param;
 } lives_widget_group_t;
 
@@ -18,46 +18,46 @@
 #define RFX_DEF_NUM_MAX 1000000. ///< default param max when not defined
 
 
-void on_paramwindow_ok_clicked (LiVESButton *, lives_rfx_t *);
-void on_paramwindow_cancel_clicked (LiVESButton *, lives_rfx_t *);
-void on_paramwindow_cancel_clicked2 (LiVESButton *, lives_rfx_t *);
+void on_paramwindow_ok_clicked(LiVESButton *, lives_rfx_t *);
+void on_paramwindow_cancel_clicked(LiVESButton *, lives_rfx_t *);
+void on_paramwindow_cancel_clicked2(LiVESButton *, lives_rfx_t *);
 
-void on_render_fx_pre_activate (LiVESMenuItem *, lives_rfx_t *);
-void on_render_fx_activate (LiVESMenuItem *, lives_rfx_t *);
+void on_render_fx_pre_activate(LiVESMenuItem *, lives_rfx_t *);
+void on_render_fx_activate(LiVESMenuItem *, lives_rfx_t *);
 
-void on_fx_pre_activate (lives_rfx_t *, int didx, LiVESWidget *pbox);
+void on_fx_pre_activate(lives_rfx_t *, int didx, LiVESWidget *pbox);
 
 boolean make_param_box(LiVESVBox *, lives_rfx_t *);
 
-boolean add_param_to_box (LiVESBox *, lives_rfx_t *, int param_number, boolean add_slider);
-void add_param_label_to_box (LiVESBox *, boolean do_trans, const gchar *text);
+boolean add_param_to_box(LiVESBox *, lives_rfx_t *, int param_number, boolean add_slider);
+void add_param_label_to_box(LiVESBox *, boolean do_trans, const char *text);
 
-GSList *add_usrgrp_to_livesgrp (GSList *u2l, GSList *rbgroup, int usr_number);
-lives_widget_group_t *livesgrp_from_usrgrp (GSList *u2l, int usrgrp);
+LiVESSList *add_usrgrp_to_livesgrp(LiVESSList *u2l, LiVESSList *rbgroup, int usr_number);
+lives_widget_group_t *livesgrp_from_usrgrp(LiVESSList *u2l, int usrgrp);
 
-void after_boolean_param_toggled (LiVESToggleButton *, lives_rfx_t *);
-void after_param_value_changed (LiVESSpinButton *, lives_rfx_t *);
-void after_param_red_changed (LiVESSpinButton *, lives_rfx_t *);
-void after_param_green_changed (LiVESSpinButton *, lives_rfx_t *);
-void after_param_blue_changed (LiVESSpinButton *, lives_rfx_t *);
-void after_param_alpha_changed (LiVESSpinButton *, lives_rfx_t *);
-boolean after_param_text_focus_changed (LiVESWidget *, LiVESWidget *, lives_rfx_t *);
-void after_param_text_changed (LiVESWidget *, lives_rfx_t *);
-void after_string_list_changed (LiVESCombo *, lives_rfx_t *);
+void after_boolean_param_toggled(LiVESToggleButton *, lives_rfx_t *);
+void after_param_value_changed(LiVESSpinButton *, lives_rfx_t *);
+void after_param_red_changed(LiVESSpinButton *, lives_rfx_t *);
+void after_param_green_changed(LiVESSpinButton *, lives_rfx_t *);
+void after_param_blue_changed(LiVESSpinButton *, lives_rfx_t *);
+void after_param_alpha_changed(LiVESSpinButton *, lives_rfx_t *);
+boolean after_param_text_focus_changed(LiVESWidget *, LiVESWidget *, lives_rfx_t *);
+void after_param_text_changed(LiVESWidget *, lives_rfx_t *);
+void after_string_list_changed(LiVESCombo *, lives_rfx_t *);
 
-void on_pwcolsel (LiVESButton *, lives_rfx_t *);
+void on_pwcolsel(LiVESButton *, lives_rfx_t *);
 
-char *param_marshall (lives_rfx_t *, boolean with_min_max);
-char **param_marshall_to_argv (lives_rfx_t *);
-void param_demarshall (lives_rfx_t *, GList *plist, boolean with_min_max, boolean update_widgets);
-int set_param_from_list(GList *plist, lives_param_t *param, int pnum, boolean with_min_max, boolean upd);
-GList *argv_to_marshalled_list (lives_rfx_t *, int argc, char **argv);
+char *param_marshall(lives_rfx_t *, boolean with_min_max);
+char **param_marshall_to_argv(lives_rfx_t *);
+void param_demarshall(lives_rfx_t *, LiVESList *plist, boolean with_min_max, boolean update_widgets);
+int set_param_from_list(LiVESList *plist, lives_param_t *param, int pnum, boolean with_min_max, boolean upd);
+LiVESList *argv_to_marshalled_list(lives_rfx_t *, int argc, char **argv);
 
 /// object should have g_set_object_data "param_number" set to parameter number
 ///
 /// (0 based, -ve for init onchanges)
-GList *do_onchange (LiVESObject *object, lives_rfx_t *) WARN_UNUSED;
-GList *do_onchange_init(lives_rfx_t *) WARN_UNUSED;
+LiVESList *do_onchange(LiVESObject *object, lives_rfx_t *) WARN_UNUSED;
+LiVESList *do_onchange_init(lives_rfx_t *) WARN_UNUSED;

LiVES-2.2.8.tar.bz2/src/plugins.c -> LiVES-2.4.1.tar.bz2/src/plugins.c Changed

@@ -7,6 +7,7 @@
 #include <dlfcn.h>
 #include <errno.h>
 
+
 #ifdef HAVE_SYSTEM_WEED
 #include <weed/weed.h>
 #include <weed/weed-palettes.h>
@@ -29,7 +30,7 @@
 #include "rfx-builder.h"
 #include "paramwindow.h"
 
-const char *anames[AUDIO_CODEC_MAX]={"mp3","pcm","mp2","vorbis","AC3","AAC","AMR_NB","raw","wma2",""};
+const char *anames[AUDIO_CODEC_MAX]= {"mp3","pcm","mp2","vorbis","AC3","AAC","AMR_NB","raw","wma2",""};
 
 static boolean list_plugins;
 
@@ -38,10 +39,10 @@
 // command-line plugins
 
 
-static GList *get_plugin_result (const gchar *command, const gchar *delim, boolean allow_blanks) {
+static LiVESList *get_plugin_result(const char *command, const char *delim, boolean allow_blanks) {
 
-  GList *list=NULL;
-  gchar **array;
+  LiVESList *list=NULL;
+  char **array;
   ssize_t bytes=0;
   int pieces;
   int outfile_fd,i;
@@ -50,59 +51,58 @@
   int error;
   boolean timeout;
 
-  gchar *msg,*buf;
+  char *msg,*buf;
 
-  gchar *outfile;
-  gchar *com;
-  gchar buffer[65536];
+  char *outfile;
+  char *com;
+  char buffer[65536];
 
   threaded_dialog_spin();
 
 #ifndef IS_MINGW
-  outfile=g_strdup_printf ("%s/.smogplugin.%d",prefs->tmpdir,capable->mainpid);
+  outfile=lives_strdup_printf("%s/.smogplugin.%d",prefs->tmpdir,capable->mainpid);
 #else
-  outfile=g_strdup_printf ("%s/smogplugin.%d",prefs->tmpdir,capable->mainpid);
+  outfile=lives_strdup_printf("%s/smogplugin.%d",prefs->tmpdir,capable->mainpid);
 #endif
 
   unlink(outfile);
 
-  com=g_strconcat (command," > \"",outfile,"\"",NULL);
+  com=lives_strconcat(command," > \"",outfile,"\"",NULL);
 
   mainw->error=FALSE;
 
-  if ((error=system (com))!=0&&error!=126*256&&error!=256) {
+  if ((error=system(com))!=0&&error!=126*256&&error!=256) {
     if (!list_plugins) {
-      gchar *msg2;
-      g_free (com);
+      char *msg2;
+      lives_free(com);
       if (mainw->is_ready) {
-	if ((outfile_fd=open(outfile,O_RDONLY))>-1) {
-	  bytes=read (outfile_fd,&buffer,65535);
-	  if (bytes<0) bytes=0;
-	  close (outfile_fd);
-	  unlink (outfile);
-	  memset (buffer+bytes,0,1);
-	}
-	msg=g_strdup_printf (_("\nPlugin error: %s failed with code %d"),command,error/256);
-	if (bytes) {
-	  msg2=g_strconcat (msg,g_strdup_printf (_ (" : message was %s\n"),buffer),NULL);
-	  g_snprintf(mainw->msg,512,"%s",buffer);
-	}
-	else {
-	  msg2=g_strconcat (msg,"\n",NULL);
-	}
-	d_print (msg2);
-	g_free (msg2);
-	g_free (msg);
+        if ((outfile_fd=open(outfile,O_RDONLY))>-1) {
+          bytes=read(outfile_fd,&buffer,65535);
+          if (bytes<0) bytes=0;
+          close(outfile_fd);
+          unlink(outfile);
+          memset(buffer+bytes,0,1);
+        }
+        msg=lives_strdup_printf(_("\nPlugin error: %s failed with code %d"),command,error/256);
+        if (bytes) {
+          msg2=lives_strconcat(msg,lives_strdup_printf(_(" : message was %s\n"),buffer),NULL);
+          lives_snprintf(mainw->msg,512,"%s",buffer);
+        } else {
+          msg2=lives_strconcat(msg,"\n",NULL);
+        }
+        d_print(msg2);
+        lives_free(msg2);
+        lives_free(msg);
       }
     }
-    g_free (outfile);
+    lives_free(outfile);
     threaded_dialog_spin();
     unlink(outfile);
     return list;
   }
-  g_free (com);
-  if (!g_file_test (outfile, G_FILE_TEST_EXISTS)) {
-    g_free (outfile);
+  lives_free(com);
+  if (!lives_file_test(outfile, LIVES_FILE_TEST_EXISTS)) {
+    lives_free(outfile);
     threaded_dialog_spin();
     return NULL;
   }
@@ -117,100 +117,97 @@
     alarm_handle=lives_alarm_set(LIVES_PLUGIN_TIMEOUT);
 
     while ((outfile_fd=open(outfile,O_RDONLY))==-1&&!(timeout=lives_alarm_get(alarm_handle))) {
-      g_usleep (prefs->sleep_time);
+      lives_usleep(prefs->sleep_time);
     }
 
     lives_alarm_clear(alarm_handle);
 
     if (timeout) {
-      msg=g_strdup_printf(("Plugin timed out on message %s"),command);
+      msg=lives_strdup_printf(("Plugin timed out on message %s"),command);
       LIVES_ERROR(msg);
-      g_free(msg);
+      lives_free(msg);
       retval=do_read_failed_error_s_with_retry(outfile,NULL,NULL);
-    }
-    else {
-      bytes=read (outfile_fd,&buffer,65535);
-      close (outfile_fd);
-      unlink (outfile);
+    } else {
+      bytes=read(outfile_fd,&buffer,65535);
+      close(outfile_fd);
+      unlink(outfile);
 
       if (bytes<0) {
-	retval=do_read_failed_error_s_with_retry(outfile,NULL,NULL);
-      }
-      else {
-	threaded_dialog_spin();
-	memset (buffer+bytes,0,1);
+        retval=do_read_failed_error_s_with_retry(outfile,NULL,NULL);
+      } else {
+        threaded_dialog_spin();
+        memset(buffer+bytes,0,1);
       }
     }
-  } while (retval==LIVES_RETRY);
+  } while (retval==LIVES_RESPONSE_RETRY);
 
-  unlink (outfile);
-  g_free (outfile);
+  unlink(outfile);
+  lives_free(outfile);
 
-  if (retval==LIVES_CANCEL) {
+  if (retval==LIVES_RESPONSE_CANCEL) {
     threaded_dialog_spin();
     return list;
   }
 
 #ifdef DEBUG_PLUGINS
-  g_printerr("plugin msg: %s %d\n",buffer,error);
+  lives_printerr("plugin msg: %s %d\n",buffer,error);
 #endif
-  
+
   if (error==256) {
     mainw->error=TRUE;
-    g_snprintf (mainw->msg,512,"%s",buffer);
+    lives_snprintf(mainw->msg,512,"%s",buffer);
     return list;
   }
-  
-  pieces=get_token_count (buffer,delim[0]);
-  array=g_strsplit(buffer,delim,pieces);
-  for (i=0;i<pieces;i++) {
+
+  pieces=get_token_count(buffer,delim[0]);
+  array=lives_strsplit(buffer,delim,pieces);
+  for (i=0; i<pieces; i++) {
     if (array[i]!=NULL) {
-      buf=g_strdup(g_strstrip(array[i]));
-      if (strlen (buf)||allow_blanks) {
-	list=g_list_append (list, buf);
-      }
-      else g_free(buf);
+      buf=lives_strdup(lives_strstrip(array[i]));
+      if (strlen(buf)||allow_blanks) {
+        list=lives_list_append(list, buf);
+      } else lives_free(buf);
     }
   }
-  g_strfreev (array);
+  lives_strfreev(array);
   threaded_dialog_spin();
   return list;
 }
 
 
-GList * plugin_request_with_blanks (const gchar *plugin_type, const gchar *plugin_name, const gchar *request) {
+LiVESList *plugin_request_with_blanks(const char *plugin_type, const char *plugin_name, const char *request) {
   // allow blanks in a list
   return plugin_request_common(plugin_type, plugin_name, request, "|", TRUE);
 }
 
-GList * plugin_request (const gchar *plugin_type, const gchar *plugin_name, const gchar *request) {
+LiVESList *plugin_request(const char *plugin_type, const char *plugin_name, const char *request) {
   return plugin_request_common(plugin_type, plugin_name, request, "|", FALSE);
 }
 
-GList * plugin_request_by_line (const gchar *plugin_type, const gchar *plugin_name, const gchar *request) {
+LiVESList *plugin_request_by_line(const char *plugin_type, const char *plugin_name, const char *request) {
   return plugin_request_common(plugin_type, plugin_name, request, "\n", FALSE);
 }
 
-GList * plugin_request_by_space (const gchar *plugin_type, const gchar *plugin_name, const gchar *request) {
+LiVESList *plugin_request_by_space(const char *plugin_type, const char *plugin_name, const char *request) {
   return plugin_request_common(plugin_type, plugin_name, request, " ", FALSE);
 }
 
 
 
-GList * plugin_request_common (const gchar *plugin_type, const gchar *plugin_name, const gchar *request, 
-			       const gchar *delim, boolean allow_blanks) {
-  // returns a GList of responses to -request, or NULL on error
+LiVESList *plugin_request_common(const char *plugin_type, const char *plugin_name, const char *request,
+                                 const char *delim, boolean allow_blanks) {
+  // returns a LiVESList of responses to -request, or NULL on error
   // by_line says whether we split on '\n' or on '|'
 
   // NOTE: request must not be quoted here, since it contains a list of parameters
   // instead, caller should ensure that any strings in *request are suitably escaped and quoted
   // e.g. by calling param_marshall()
 
-  GList *reslist=NULL;
-  gchar *com,*comfile;
+  LiVESList *reslist=NULL;
+  char *com,*comfile;
 
 #ifdef IS_MINGW
-  gchar *ext,*cmd;
+  char *ext,*cmd;
 #endif
 
   if (plugin_type!=NULL) {
@@ -220,24 +217,22 @@
     }
 
     // some types live in home directory...
-    if (!strcmp (plugin_type,PLUGIN_RENDERED_EFFECTS_CUSTOM)||!strcmp (plugin_type,PLUGIN_RENDERED_EFFECTS_TEST)) {
-      comfile=g_build_filename(capable->home_dir,LIVES_CONFIG_DIR,plugin_type,plugin_name,NULL);
-    }
-    else if (!strcmp(plugin_type,PLUGIN_RFX_SCRAP)) {
+    if (!strcmp(plugin_type,PLUGIN_RENDERED_EFFECTS_CUSTOM)||!strcmp(plugin_type,PLUGIN_RENDERED_EFFECTS_TEST)) {
+      comfile=lives_build_filename(capable->home_dir,LIVES_CONFIG_DIR,plugin_type,plugin_name,NULL);
+    } else if (!strcmp(plugin_type,PLUGIN_RFX_SCRAP)) {
       // scraps are in the tmpdir
-      comfile=g_build_filename(prefs->tmpdir,plugin_name,NULL);
-    }
-    else {
-      comfile=g_build_filename (prefs->lib_dir,PLUGIN_EXEC_DIR,plugin_type,plugin_name,NULL);
+      comfile=lives_build_filename(prefs->tmpdir,plugin_name,NULL);
+    } else {
+      comfile=lives_build_filename(prefs->lib_dir,PLUGIN_EXEC_DIR,plugin_type,plugin_name,NULL);
     }
 
 #ifndef IS_MINGW
     //#define DEBUG_PLUGINS
 #ifdef DEBUG_PLUGINS
-    com=g_strdup_printf ("\"%s\" %s",comfile,request);
-    g_printerr("will run: %s\n",com);
+    com=lives_strdup_printf("\"%s\" %s",comfile,request);
+    lives_printerr("will run: %s\n",com);
 #else
-    com=g_strdup_printf ("\"%s\" %s 2>/dev/null",comfile,request);
+    com=lives_strdup_printf("\"%s\" %s 2>/dev/null",comfile,request);
 #endif
 
 #else
@@ -246,34 +241,33 @@
     ext=get_extension(comfile);
     if (!strcmp(ext,"py")) {
       if (!capable->has_python) {
-	g_free(ext);
-	g_free(comfile);
-	return reslist;
+        lives_free(ext);
+        lives_free(comfile);
+        return reslist;
       }
-      cmd=g_strdup("python");
+      cmd=lives_strdup("python");
     }
 
-    else cmd=g_strdup("perl");
+    else cmd=lives_strdup("perl");
 
     //#define DEBUG_PLUGINS
 #ifdef DEBUG_PLUGINS
-    com=g_strdup_printf ("%s \"%s\" %s",cmd,comfile,request);
-    g_printerr("will run: %s\n",com);
+    com=lives_strdup_printf("%s \"%s\" %s",cmd,comfile,request);
+    lives_printerr("will run: %s\n",com);
 #else
-    com=g_strdup_printf ("%s \"%s\" %s 2>NUL",cmd,comfile,request);
+    com=lives_strdup_printf("%s \"%s\" %s 2>NUL",cmd,comfile,request);
 #endif
 
-    g_free(ext);
-    g_free(cmd);
+    lives_free(ext);
+    lives_free(cmd);
 
 #endif
 
-    g_free(comfile);
-  }
-  else com=g_strdup (request);
+    lives_free(comfile);
+  } else com=lives_strdup(request);
   list_plugins=FALSE;
-  reslist=get_plugin_result (com,delim,allow_blanks);
-  g_free(com);
+  reslist=get_plugin_result(com,delim,allow_blanks);
+  lives_free(com);
   threaded_dialog_spin();
   return reslist;
 }
@@ -282,8 +276,8 @@
 //////////////////
 // get list of plugins of various types
 
-GList *get_plugin_list (const gchar *plugin_type, boolean allow_nonex, const gchar *plugdir, const gchar *filter_ext) {
-  // returns a GList * of plugins of type plugin_type
+LiVESList *get_plugin_list(const char *plugin_type, boolean allow_nonex, const char *plugdir, const char *filter_ext) {
+  // returns a LiVESList * of plugins of type plugin_type
   // returns empty list if there are no plugins of that type
 
   // allow_nonex to allow non-executable files (e.g. libs)
@@ -291,52 +285,46 @@
 
   // TODO - use enum for plugin_type
 
-  gchar *com,*tmp;
-  GList *pluglist;
+  char *com,*tmp;
+  LiVESList *pluglist;
 
-  const gchar *ext=(filter_ext==NULL)?"":filter_ext;
+  const char *ext=(filter_ext==NULL)?"":filter_ext;
 
   if (!strcmp(plugin_type,PLUGIN_THEMES)) {
-    com=g_strdup_printf ("%s list_plugins 0 1 \"%s%s\" \"\"",prefs->backend_sync,prefs->prefix_dir,THEME_DIR);
-  }
-  else if (!strcmp (plugin_type,PLUGIN_RENDERED_EFFECTS_CUSTOM_SCRIPTS)||
-	   !strcmp (plugin_type,PLUGIN_RENDERED_EFFECTS_TEST_SCRIPTS)||
-	   !strcmp (plugin_type,PLUGIN_RENDERED_EFFECTS_CUSTOM)||
-	   !strcmp (plugin_type,PLUGIN_RENDERED_EFFECTS_TEST)||
-	   !strcmp (plugin_type,PLUGIN_COMPOUND_EFFECTS_CUSTOM)
-	   ) {
+    com=lives_strdup_printf("%s list_plugins 0 1 \"%s%s\" \"\"",prefs->backend_sync,prefs->prefix_dir,THEME_DIR);
+  } else if (!strcmp(plugin_type,PLUGIN_RENDERED_EFFECTS_CUSTOM_SCRIPTS)||
+             !strcmp(plugin_type,PLUGIN_RENDERED_EFFECTS_TEST_SCRIPTS)||
+             !strcmp(plugin_type,PLUGIN_RENDERED_EFFECTS_CUSTOM)||
+             !strcmp(plugin_type,PLUGIN_RENDERED_EFFECTS_TEST)||
+             !strcmp(plugin_type,PLUGIN_COMPOUND_EFFECTS_CUSTOM)
+            ) {
     // look in home
-    com=g_strdup_printf ("%s list_plugins %d 0 \"%s/%s%s\" \"%s\"",prefs->backend_sync,allow_nonex,capable->home_dir,
-			 LIVES_CONFIG_DIR,plugin_type,ext);
-  }
-  else if (!strcmp(plugin_type,PLUGIN_EFFECTS_WEED)) {
-    com=g_strdup_printf ("%s list_plugins 1 1 \"%s\" \"%s\"",prefs->backend_sync,
-			 (tmp=g_filename_from_utf8(plugdir,-1,NULL,NULL,NULL)),ext);
-    g_free(tmp);
-  }
-  else if (!strcmp(plugin_type,PLUGIN_DECODERS)) {
-    com=g_strdup_printf ("%s list_plugins 1 0 \"%s\" \"%s\"",prefs->backend_sync,
-			 (tmp=g_filename_from_utf8(plugdir,-1,NULL,NULL,NULL)),ext);
-    g_free(tmp);
-  }
-  else if (!strcmp(plugin_type,PLUGIN_RENDERED_EFFECTS_BUILTIN_SCRIPTS)) {
-    com=g_strdup_printf ("%s list_plugins %d 0 \"%s%s%s\" \"%s\"",prefs->backend_sync,allow_nonex,prefs->prefix_dir,
-			 PLUGIN_SCRIPTS_DIR,plugin_type,ext);
-  }
-  else if (!strcmp(plugin_type,PLUGIN_COMPOUND_EFFECTS_BUILTIN)) {
-    com=g_strdup_printf ("%s list_plugins %d 0 \"%s%s%s\" \"%s\"",prefs->backend_sync,allow_nonex,prefs->prefix_dir,
-			 PLUGIN_COMPOUND_DIR,plugin_type,ext);
-  }
-  else {
-    com=g_strdup_printf ("%s list_plugins %d 0 \"%s%s%s\" \"%s\"",prefs->backend_sync,allow_nonex,prefs->lib_dir,
-			 PLUGIN_EXEC_DIR,plugin_type,ext);
+    com=lives_strdup_printf("%s list_plugins %d 0 \"%s/%s%s\" \"%s\"",prefs->backend_sync,allow_nonex,capable->home_dir,
+                            LIVES_CONFIG_DIR,plugin_type,ext);
+  } else if (!strcmp(plugin_type,PLUGIN_EFFECTS_WEED)) {
+    com=lives_strdup_printf("%s list_plugins 1 1 \"%s\" \"%s\"",prefs->backend_sync,
+                            (tmp=lives_filename_from_utf8((char *)plugdir,-1,NULL,NULL,NULL)),ext);
+    lives_free(tmp);
+  } else if (!strcmp(plugin_type,PLUGIN_DECODERS)) {
+    com=lives_strdup_printf("%s list_plugins 1 0 \"%s\" \"%s\"",prefs->backend_sync,
+                            (tmp=lives_filename_from_utf8((char *)plugdir,-1,NULL,NULL,NULL)),ext);
+    lives_free(tmp);
+  } else if (!strcmp(plugin_type,PLUGIN_RENDERED_EFFECTS_BUILTIN_SCRIPTS)) {
+    com=lives_strdup_printf("%s list_plugins %d 0 \"%s%s%s\" \"%s\"",prefs->backend_sync,allow_nonex,prefs->prefix_dir,
+                            PLUGIN_SCRIPTS_DIR,plugin_type,ext);
+  } else if (!strcmp(plugin_type,PLUGIN_COMPOUND_EFFECTS_BUILTIN)) {
+    com=lives_strdup_printf("%s list_plugins %d 0 \"%s%s%s\" \"%s\"",prefs->backend_sync,allow_nonex,prefs->prefix_dir,
+                            PLUGIN_COMPOUND_DIR,plugin_type,ext);
+  } else {
+    com=lives_strdup_printf("%s list_plugins %d 0 \"%s%s%s\" \"%s\"",prefs->backend_sync,allow_nonex,prefs->lib_dir,
+                            PLUGIN_EXEC_DIR,plugin_type,ext);
   }
   list_plugins=TRUE;
 
   //g_print("\n\n\nLIST CMD: %s\n",com);
 
-  pluglist=get_plugin_result (com,"|",FALSE);
-  g_free(com);
+  pluglist=get_plugin_result(com,"|",FALSE);
+  lives_free(com);
   threaded_dialog_spin();
   return pluglist;
 }
@@ -347,7 +335,7 @@
 // video plugins
 
 
-void save_vpp_defaults(_vid_playback_plugin *vpp, gchar *vpp_file) {
+void save_vpp_defaults(_vid_playback_plugin *vpp, char *vpp_file) {
   // format is:
   // nbytes (string) : LiVES vpp defaults file version 2\n
   // for each video playback plugin:
@@ -372,9 +360,9 @@
 
   int fd;
   int32_t len;
-  const gchar *version;
+  const char *version;
   int i;
-  gchar *msg;
+  char *msg;
   int intzero=0;
   double dblzero=0.;
 
@@ -384,9 +372,9 @@
   }
 
   if ((fd=open(vpp_file,O_WRONLY|O_CREAT|O_TRUNC,S_IRUSR|S_IWUSR))==-1) {
-    msg=g_strdup_printf (_("\n\nUnable to write video playback plugin defaults file\n%s\nError code %d\n"),vpp_file,errno);
-    LIVES_ERROR (msg);
-    g_free (msg);
+    msg=lives_strdup_printf(_("\n\nUnable to write video playback plugin defaults file\n%s\nError code %d\n"),vpp_file,errno);
+    LIVES_ERROR(msg);
+    lives_free(msg);
     return;
   }
 
@@ -394,13 +382,13 @@
   setmode(fd, O_BINARY);
 #endif
 
-  msg=g_strdup_printf(_("Updating video playback plugin defaults in %s\n"),vpp_file);
+  msg=lives_strdup_printf(_("Updating video playback plugin defaults in %s\n"),vpp_file);
   LIVES_INFO(msg);
-  g_free(msg);
+  lives_free(msg);
 
-  msg=g_strdup("LiVES vpp defaults file version 2\n");
+  msg=lives_strdup("LiVES vpp defaults file version 2\n");
   if (!lives_write(fd,msg,strlen(msg),FALSE)) return;
-  g_free(msg);
+  lives_free(msg);
 
   len=strlen(mainw->vpp->name);
   if (lives_write_le(fd,&len,4,FALSE)<4) return;
@@ -425,7 +413,7 @@
 
   if (lives_write_le(fd,&(mainw->vpp->extra_argc),4,FALSE)<4) return;
 
-  for (i=0;i<mainw->vpp->extra_argc;i++) {
+  for (i=0; i<mainw->vpp->extra_argc; i++) {
     len=strlen(mainw->vpp->extra_argv[i]);
     if (lives_write_le(fd,&len,4,FALSE)<4) return;
     if (lives_write(fd,mainw->vpp->extra_argv[i],len,FALSE)<len) return;
@@ -436,150 +424,153 @@
 }
 
 
-void load_vpp_defaults(_vid_playback_plugin *vpp, gchar *vpp_file) {
-  int fd;
+void load_vpp_defaults(_vid_playback_plugin *vpp, char *vpp_file) {
   ssize_t len;
-  const gchar *version;
-  gchar buf[512];
-  int i;
+  const char *version;
+
+  char buf[512];
+
+  char *msg;
+
   int retval;
-  gchar *msg;
+  int fd;
 
-  if (!g_file_test(vpp_file,G_FILE_TEST_EXISTS)) {
+  register int i;
+
+  if (!lives_file_test(vpp_file,LIVES_FILE_TEST_EXISTS)) {
     return;
   }
 
-  msg=g_strdup_printf(_("Loading video playback plugin defaults from %s..."),vpp_file);
-  d_print(msg);
-  g_free(msg);
+  d_print(_("Loading video playback plugin defaults from %s..."),vpp_file);
 
   do {
     retval=0;
     if ((fd=open(vpp_file,O_RDONLY))==-1) {
-      retval=do_read_failed_error_s_with_retry(vpp_file,g_strerror(errno),NULL);
-      if (retval==LIVES_CANCEL) {
-	mainw->vpp=NULL;
-	return;
+      retval=do_read_failed_error_s_with_retry(vpp_file,lives_strerror(errno),NULL);
+      if (retval==LIVES_RESPONSE_CANCEL) {
+        mainw->vpp=NULL;
+        return;
       }
-    }
-    else {
+    } else {
       do {
 
 #ifdef IS_MINGW
-  setmode(fd, O_BINARY);
+        setmode(fd, O_BINARY);
 #endif
 
-	mainw->read_failed=FALSE;
-	msg=g_strdup("LiVES vpp defaults file version 2\n");
-	len=lives_read(fd,buf,strlen(msg),FALSE);
-	if (len<0) len=0;
-	memset(buf+len,0,1);
-  
-	if (mainw->read_failed) break;
-
-	// identifier string
-	if (strcmp(msg,buf)) {
-	  g_free(msg);
-	  d_print_file_error_failed();
-	  close(fd);
-	  return;
-	}
-	g_free(msg);
-
-	// plugin name
-	lives_read_le(fd,&len,4,FALSE);
-	if (mainw->read_failed) break;
-	lives_read(fd,buf,len,FALSE);
-	memset(buf+len,0,1);
-	
-	if (mainw->read_failed) break;
-
-	if (strcmp(buf,mainw->vpp->name)) {
-	  d_print_file_error_failed();
-	  close(fd);
-	  return;
-	}
-
-
-	// version string
-	version=(*mainw->vpp->version)();
-	lives_read_le(fd,&len,4,FALSE);
-	if (mainw->read_failed) break;
-	lives_read(fd,buf,len,FALSE);
-
-	if (mainw->read_failed) break;
-
-	memset(buf+len,0,1);
-
-	if (strcmp(buf,version)) {
-	  msg=g_strdup_printf(_("\nThe %s video playback plugin has been updated.\nPlease check your settings in\n Tools|Preferences|Playback|Playback Plugins Advanced\n\n"),mainw->vpp->name);
-	  do_error_dialog(msg);
-	  g_free(msg);
-	  unlink(vpp_file);
-	  d_print_failed();
-	  close(fd);
-	  return;
-	}
-
-	
-	lives_read_le(fd,&(mainw->vpp->palette),4,FALSE);
-	lives_read_le(fd,&(mainw->vpp->YUV_sampling),4,FALSE);
-	lives_read_le(fd,&(mainw->vpp->YUV_clamping),4,FALSE);
-	lives_read_le(fd,&(mainw->vpp->YUV_subspace),4,FALSE);
-	lives_read_le(fd,&(mainw->vpp->fwidth),4,FALSE);
-	lives_read_le(fd,&(mainw->vpp->fheight),4,FALSE);
-	lives_read_le(fd,&(mainw->vpp->fixed_fpsd),8,FALSE);
-	lives_read_le(fd,&(mainw->vpp->fixed_fps_numer),4,FALSE);
-	lives_read_le(fd,&(mainw->vpp->fixed_fps_denom),4,FALSE);
-	
-	if (mainw->read_failed) break;
-
-	lives_read_le(fd,&(mainw->vpp->extra_argc),4,FALSE);
-	
-	if (mainw->read_failed) break;
-
-	if (vpp->extra_argv!=NULL) {
-	  for (i=0;vpp->extra_argv[i]!=NULL;i++) {
-	    g_free(vpp->extra_argv[i]);
-	  }
-	  g_free(vpp->extra_argv);
-	}
-	
-	mainw->vpp->extra_argv=(char **)g_malloc((mainw->vpp->extra_argc+1)*(sizeof(gchar *)));
-	
-	for (i=0;i<mainw->vpp->extra_argc;i++) {
-	  lives_read_le(fd,&len,4,FALSE);
-	  if (mainw->read_failed) break;
-	  mainw->vpp->extra_argv[i]=(gchar *)g_malloc(len+1);
-	  lives_read(fd,mainw->vpp->extra_argv[i],len,FALSE);
-	  if (mainw->read_failed) break;
-	  memset((mainw->vpp->extra_argv[i])+len,0,1);
-	}
-	
-	mainw->vpp->extra_argv[i]=NULL;
+        mainw->read_failed=FALSE;
+        msg=lives_strdup("LiVES vpp defaults file version 2\n");
+        len=lives_read(fd,buf,strlen(msg),FALSE);
+        if (len<0) len=0;
+        memset(buf+len,0,1);
+
+        if (mainw->read_failed) break;
+
+        // identifier string
+        if (strcmp(msg,buf)) {
+          lives_free(msg);
+          d_print_file_error_failed();
+          close(fd);
+          return;
+        }
+        lives_free(msg);
+
+        // plugin name
+        lives_read_le(fd,&len,4,FALSE);
+        if (mainw->read_failed) break;
+        lives_read(fd,buf,len,FALSE);
+        memset(buf+len,0,1);
+
+        if (mainw->read_failed) break;
+
+        if (strcmp(buf,mainw->vpp->name)) {
+          d_print_file_error_failed();
+          close(fd);
+          return;
+        }
+
+
+        // version string
+        version=(*mainw->vpp->version)();
+        lives_read_le(fd,&len,4,FALSE);
+        if (mainw->read_failed) break;
+        lives_read(fd,buf,len,FALSE);
+
+        if (mainw->read_failed) break;
+
+        memset(buf+len,0,1);
+
+        if (strcmp(buf,version)) {
+          msg=lives_strdup_printf(
+                _("\nThe %s video playback plugin has been updated.\nPlease check your settings in\n Tools|Preferences|Playback|Playback Plugins Advanced\n\n"),
+                mainw->vpp->name);
+          do_error_dialog(msg);
+          lives_free(msg);
+          unlink(vpp_file);
+          d_print_failed();
+          close(fd);
+          return;
+        }
+
+
+        lives_read_le(fd,&(mainw->vpp->palette),4,FALSE);
+        lives_read_le(fd,&(mainw->vpp->YUV_sampling),4,FALSE);
+        lives_read_le(fd,&(mainw->vpp->YUV_clamping),4,FALSE);
+        lives_read_le(fd,&(mainw->vpp->YUV_subspace),4,FALSE);
+        lives_read_le(fd,&(mainw->vpp->fwidth),4,FALSE);
+        lives_read_le(fd,&(mainw->vpp->fheight),4,FALSE);
+        lives_read_le(fd,&(mainw->vpp->fixed_fpsd),8,FALSE);
+        lives_read_le(fd,&(mainw->vpp->fixed_fps_numer),4,FALSE);
+        lives_read_le(fd,&(mainw->vpp->fixed_fps_denom),4,FALSE);
+
+        if (mainw->read_failed) break;
+
+        lives_read_le(fd,&(mainw->vpp->extra_argc),4,FALSE);
+
+        if (mainw->read_failed) break;
+
+        if (vpp->extra_argv!=NULL) {
+          for (i=0; vpp->extra_argv[i]!=NULL; i++) {
+            lives_free(vpp->extra_argv[i]);
+          }
+          lives_free(vpp->extra_argv);
+        }
+
+        mainw->vpp->extra_argv=(char **)lives_malloc((mainw->vpp->extra_argc+1)*(sizeof(char *)));
+
+        for (i=0; i<mainw->vpp->extra_argc; i++) {
+          lives_read_le(fd,&len,4,FALSE);
+          if (mainw->read_failed) break;
+          mainw->vpp->extra_argv[i]=(char *)lives_malloc(len+1);
+          lives_read(fd,mainw->vpp->extra_argv[i],len,FALSE);
+          if (mainw->read_failed) break;
+          memset((mainw->vpp->extra_argv[i])+len,0,1);
+        }
 
-	close(fd);
+        mainw->vpp->extra_argv[i]=NULL;
+
+        close(fd);
       } while (FALSE);
 
       if (mainw->read_failed) {
-	close(fd);
-	retval=do_read_failed_error_s_with_retry(vpp_file,NULL,NULL);
-	if (retval==LIVES_CANCEL) {
-	  mainw->read_failed=FALSE;
-	  mainw->vpp=NULL;
-	  d_print_file_error_failed();
-	  return;
-	}
+        close(fd);
+        retval=do_read_failed_error_s_with_retry(vpp_file,NULL,NULL);
+        if (retval==LIVES_RESPONSE_CANCEL) {
+          mainw->read_failed=FALSE;
+          mainw->vpp=NULL;
+          d_print_file_error_failed();
+          return;
+        }
       }
     }
-  } while (retval==LIVES_RETRY);
+  } while (retval==LIVES_RESPONSE_RETRY);
 
   d_print_done();
-    
+
 }
 
 
-void on_vppa_cancel_clicked (LiVESButton *button, gpointer user_data) {
+void on_vppa_cancel_clicked(LiVESButton *button, livespointer user_data) {
   _vppaw *vppw=(_vppaw *)user_data;
   _vid_playback_plugin *vpp=vppw->plugin;
 
@@ -592,10 +583,10 @@
 
   if (vppw->rfx!=NULL) {
     rfx_free(vppw->rfx);
-    g_free(vppw->rfx);
+    lives_free(vppw->rfx);
   }
 
-  g_free(vppw);
+  lives_free(vppw);
 
   if (prefsw!=NULL) {
     lives_window_present(LIVES_WINDOW(prefsw->prefs_dialog));
@@ -604,11 +595,11 @@
 }
 
 
-void on_vppa_ok_clicked (LiVESButton *button, gpointer user_data) {
+void on_vppa_ok_clicked(LiVESButton *button, livespointer user_data) {
   _vppaw *vppw=(_vppaw *)user_data;
-  const gchar *fixed_fps=NULL;
-  gchar *cur_pal=NULL;
-  const gchar *tmp;
+  const char *fixed_fps=NULL;
+  char *cur_pal=NULL;
+  const char *tmp;
   int *pal_list,i=0;
 
   uint64_t xwinid=0;
@@ -620,54 +611,51 @@
     if (vppw->spinbuttonh!=NULL) mainw->vpp->fheight=lives_spin_button_get_value_as_int(LIVES_SPIN_BUTTON(vppw->spinbuttonh));
     if (vppw->fps_entry!=NULL) fixed_fps=lives_entry_get_text(LIVES_ENTRY(vppw->fps_entry));
     if (vppw->pal_entry!=NULL) {
-      cur_pal=g_strdup(lives_entry_get_text(LIVES_ENTRY(vppw->pal_entry)));
+      cur_pal=lives_strdup(lives_entry_get_text(LIVES_ENTRY(vppw->pal_entry)));
 
       if (get_token_count(cur_pal,' ')>1) {
-	gchar **array=g_strsplit(cur_pal," ",2);
-	gchar *clamping=g_strdup(array[1]+1);
-	g_free(cur_pal);
-	cur_pal=g_strdup(array[0]);
-	memset(clamping+strlen(clamping)-1,0,1);
-	do {
-	  tmp=weed_yuv_clamping_get_name(i);
-	  if (tmp!=NULL&&!strcmp(clamping,tmp)) {
-	    vpp->YUV_clamping=i;
-	    break;
-	  }
-	  i++;
-	} while (tmp!=NULL);
-	g_strfreev(array);
-	g_free(clamping);
+        char **array=lives_strsplit(cur_pal," ",2);
+        char *clamping=lives_strdup(array[1]+1);
+        lives_free(cur_pal);
+        cur_pal=lives_strdup(array[0]);
+        memset(clamping+strlen(clamping)-1,0,1);
+        do {
+          tmp=weed_yuv_clamping_get_name(i);
+          if (tmp!=NULL&&!strcmp(clamping,tmp)) {
+            vpp->YUV_clamping=i;
+            break;
+          }
+          i++;
+        } while (tmp!=NULL);
+        lives_strfreev(array);
+        lives_free(clamping);
       }
     }
 
     if (vppw->fps_entry!=NULL) {
       if (!strlen(fixed_fps)) {
-	mainw->vpp->fixed_fpsd=-1.;
-	mainw->vpp->fixed_fps_numer=0;
-      }
-      else {
-	if (get_token_count ((gchar *)fixed_fps,':')>1) {
-	  gchar **array=g_strsplit(fixed_fps,":",2);
-	  mainw->vpp->fixed_fps_numer=atoi(array[0]);
-	  mainw->vpp->fixed_fps_denom=atoi(array[1]);
-	  g_strfreev(array);
-	  mainw->vpp->fixed_fpsd=get_ratio_fps((gchar *)fixed_fps);
-	}
-	else {
-	  mainw->vpp->fixed_fpsd=g_strtod(fixed_fps,NULL);
-	  mainw->vpp->fixed_fps_numer=0;
-	}
+        mainw->vpp->fixed_fpsd=-1.;
+        mainw->vpp->fixed_fps_numer=0;
+      } else {
+        if (get_token_count((char *)fixed_fps,':')>1) {
+          char **array=lives_strsplit(fixed_fps,":",2);
+          mainw->vpp->fixed_fps_numer=atoi(array[0]);
+          mainw->vpp->fixed_fps_denom=atoi(array[1]);
+          lives_strfreev(array);
+          mainw->vpp->fixed_fpsd=get_ratio_fps((char *)fixed_fps);
+        } else {
+          mainw->vpp->fixed_fpsd=lives_strtod(fixed_fps,NULL);
+          mainw->vpp->fixed_fps_numer=0;
+        }
       }
-    }
-    else {
+    } else {
       mainw->vpp->fixed_fpsd=-1.;
       mainw->vpp->fixed_fps_numer=0;
     }
 
     if (mainw->vpp->fixed_fpsd>0.&&(mainw->fixed_fpsd>0.||
-				    (mainw->vpp->set_fps!=NULL&&
-				     !((*mainw->vpp->set_fps) (mainw->vpp->fixed_fpsd))))) {
+                                    (mainw->vpp->set_fps!=NULL&&
+                                     !((*mainw->vpp->set_fps)(mainw->vpp->fixed_fpsd))))) {
       do_vpp_fps_error();
       mainw->error=TRUE;
       mainw->vpp->fixed_fpsd=-1.;
@@ -676,142 +664,137 @@
 
     if (vppw->pal_entry!=NULL) {
       if (vpp->get_palette_list!=NULL&&(pal_list=(*vpp->get_palette_list)())!=NULL) {
-	for (i=0;pal_list[i]!=WEED_PALETTE_END;i++) {
-	  if (!strcmp(cur_pal,weed_palette_get_name(pal_list[i]))) {
-	    vpp->palette=pal_list[i];
-	    if (mainw->ext_playback) {
-	      mainw->ext_keyboard=FALSE;
-	      if (mainw->vpp->exit_screen!=NULL) {
-		(*mainw->vpp->exit_screen)(mainw->ptr_x,mainw->ptr_y);
-	      }
+        for (i=0; pal_list[i]!=WEED_PALETTE_END; i++) {
+          if (!strcmp(cur_pal,weed_palette_get_name(pal_list[i]))) {
+            vpp->palette=pal_list[i];
+            if (mainw->ext_playback) {
+              mainw->ext_keyboard=FALSE;
+              if (mainw->vpp->exit_screen!=NULL) {
+                (*mainw->vpp->exit_screen)(mainw->ptr_x,mainw->ptr_y);
+              }
 
 #ifdef RT_AUDIO
-	      stop_audio_stream();
+              stop_audio_stream();
 #endif
-	      mainw->stream_ticks=-1;
-	      mainw->vpp->palette=pal_list[i];
-	      if (!(*vpp->set_palette)(vpp->palette)) {
-		do_vpp_palette_error();
-		mainw->error=TRUE;
-
-	      }
-
-
-	      if (prefs->play_monitor!=0) {
-		if (mainw->play_window!=NULL) {
-		  xwinid=lives_widget_get_xwinid(mainw->play_window,"Unsupported display type for playback plugin");
-		  if (xwinid==-1) return;
-		}
-	      }
+              mainw->stream_ticks=-1;
+              mainw->vpp->palette=pal_list[i];
+              if (!(*vpp->set_palette)(vpp->palette)) {
+                do_vpp_palette_error();
+                mainw->error=TRUE;
+
+              }
+
+
+              if (prefs->play_monitor!=0) {
+                if (mainw->play_window!=NULL) {
+                  xwinid=lives_widget_get_xwinid(mainw->play_window,"Unsupported display type for playback plugin");
+                  if (xwinid==-1) return;
+                }
+              }
 
 #ifdef RT_AUDIO
-	      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->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();
+              }
 
 #endif
 
-	      
-	      if (vpp->init_screen!=NULL) {
-		(*vpp->init_screen)(mainw->pwidth,mainw->pheight,TRUE,xwinid,vpp->extra_argc,vpp->extra_argv);
-	      }
-	      if (mainw->vpp->capabilities&VPP_LOCAL_DISPLAY&&prefs->play_monitor==0) {
-		lives_window_set_keep_below(LIVES_WINDOW(mainw->play_window),TRUE);
-		mainw->ext_keyboard=TRUE;
-	      }
-	    }
-	    else {
-	      mainw->vpp->palette=pal_list[i];
-	      if (!(*vpp->set_palette)(vpp->palette)) {
-		do_vpp_palette_error();
-		mainw->error=TRUE;
-	      }
-	      if (vpp->set_yuv_palette_clamping!=NULL) (*vpp->set_yuv_palette_clamping)(vpp->YUV_clamping);
-	    }
-	    break;
-	  }
-	}
+
+              if (vpp->init_screen!=NULL) {
+                (*vpp->init_screen)(mainw->pwidth,mainw->pheight,TRUE,xwinid,vpp->extra_argc,vpp->extra_argv);
+              }
+              if (mainw->vpp->capabilities&VPP_LOCAL_DISPLAY&&prefs->play_monitor==0) {
+                lives_window_set_keep_below(LIVES_WINDOW(mainw->play_window),TRUE);
+                mainw->ext_keyboard=TRUE;
+              }
+            } else {
+              mainw->vpp->palette=pal_list[i];
+              if (!(*vpp->set_palette)(vpp->palette)) {
+                do_vpp_palette_error();
+                mainw->error=TRUE;
+              }
+              if (vpp->set_yuv_palette_clamping!=NULL)(*vpp->set_yuv_palette_clamping)(vpp->YUV_clamping);
+            }
+            break;
+          }
+        }
       }
-      g_free(cur_pal);
+      lives_free(cur_pal);
     }
     if (vpp->extra_argv!=NULL) {
-      for (i=0;vpp->extra_argv[i]!=NULL;i++) g_free(vpp->extra_argv[i]);
-      g_free(vpp->extra_argv);
+      for (i=0; vpp->extra_argv[i]!=NULL; i++) lives_free(vpp->extra_argv[i]);
+      lives_free(vpp->extra_argv);
       vpp->extra_argv=NULL;
     }
     vpp->extra_argc=0;
     if (vppw->rfx!=NULL) {
       vpp->extra_argv=param_marshall_to_argv(vppw->rfx);
-      for (i=0;vpp->extra_argv[i]!=NULL;vpp->extra_argc=++i);
+      for (i=0; vpp->extra_argv[i]!=NULL; vpp->extra_argc=++i);
     }
     mainw->write_vpp_file=TRUE;
-  }
-  else {
-    if (vppw->spinbuttonw!=NULL) 
+  } else {
+    if (vppw->spinbuttonw!=NULL)
       future_prefs->vpp_fwidth=lives_spin_button_get_value_as_int(LIVES_SPIN_BUTTON(vppw->spinbuttonw));
     else future_prefs->vpp_fwidth=-1;
-    if (vppw->spinbuttonh!=NULL) 
+    if (vppw->spinbuttonh!=NULL)
       future_prefs->vpp_fheight=lives_spin_button_get_value_as_int(LIVES_SPIN_BUTTON(vppw->spinbuttonh));
     else future_prefs->vpp_fheight=-1;
     if (vppw->fps_entry!=NULL) fixed_fps=lives_entry_get_text(LIVES_ENTRY(vppw->fps_entry));
     if (vppw->pal_entry!=NULL) {
-      cur_pal=g_strdup(lives_entry_get_text(LIVES_ENTRY(vppw->pal_entry)));
+      cur_pal=lives_strdup(lives_entry_get_text(LIVES_ENTRY(vppw->pal_entry)));
 
       if (get_token_count(cur_pal,' ')>1) {
-	gchar **array=g_strsplit(cur_pal," ",2);
-	gchar *clamping=g_strdup(array[1]+1);
-	g_free(cur_pal);
-	cur_pal=g_strdup(array[0]);
-	memset(clamping+strlen(clamping)-1,0,1);
-	do {
-	  tmp=weed_yuv_clamping_get_name(i);
-	  if (tmp!=NULL&&!strcmp(clamping,tmp)) {
-	    future_prefs->vpp_YUV_clamping=i;
-	    break;
-	  }
-	  i++;
-	} while (tmp!=NULL);
-	g_strfreev(array);
-	g_free(clamping);
+        char **array=lives_strsplit(cur_pal," ",2);
+        char *clamping=lives_strdup(array[1]+1);
+        lives_free(cur_pal);
+        cur_pal=lives_strdup(array[0]);
+        memset(clamping+strlen(clamping)-1,0,1);
+        do {
+          tmp=weed_yuv_clamping_get_name(i);
+          if (tmp!=NULL&&!strcmp(clamping,tmp)) {
+            future_prefs->vpp_YUV_clamping=i;
+            break;
+          }
+          i++;
+        } while (tmp!=NULL);
+        lives_strfreev(array);
+        lives_free(clamping);
       }
     }
 
     if (fixed_fps!=NULL) {
-      if (get_token_count ((gchar *)fixed_fps,':')>1) {
-	gchar **array=g_strsplit(fixed_fps,":",2);
-	future_prefs->vpp_fixed_fps_numer=atoi(array[0]);
-	future_prefs->vpp_fixed_fps_denom=atoi(array[1]);
-	g_strfreev(array);
-	future_prefs->vpp_fixed_fpsd=get_ratio_fps((gchar *)fixed_fps);
-      }
-      else {
-	future_prefs->vpp_fixed_fpsd=g_strtod(fixed_fps,NULL);
-	future_prefs->vpp_fixed_fps_numer=0;
+      if (get_token_count((char *)fixed_fps,':')>1) {
+        char **array=lives_strsplit(fixed_fps,":",2);
+        future_prefs->vpp_fixed_fps_numer=atoi(array[0]);
+        future_prefs->vpp_fixed_fps_denom=atoi(array[1]);
+        lives_strfreev(array);
+        future_prefs->vpp_fixed_fpsd=get_ratio_fps((char *)fixed_fps);
+      } else {
+        future_prefs->vpp_fixed_fpsd=lives_strtod(fixed_fps,NULL);
+        future_prefs->vpp_fixed_fps_numer=0;
       }
-    }
-    else {
+    } else {
       future_prefs->vpp_fixed_fpsd=-1.;
       future_prefs->vpp_fixed_fps_numer=0;
     }
 
     if (cur_pal!=NULL) {
       if (vpp->get_palette_list!=NULL&&(pal_list=(*vpp->get_palette_list)())!=NULL) {
-	for (i=0;pal_list[i]!=WEED_PALETTE_END;i++) {
-	  if (!strcmp(cur_pal,weed_palette_get_name(pal_list[i]))) {
-	    future_prefs->vpp_palette=pal_list[i];
-	    break;
-	  }
-	}
+        for (i=0; pal_list[i]!=WEED_PALETTE_END; i++) {
+          if (!strcmp(cur_pal,weed_palette_get_name(pal_list[i]))) {
+            future_prefs->vpp_palette=pal_list[i];
+            break;
+          }
+        }
       }
-      g_free(cur_pal);
-    }
-    else future_prefs->vpp_palette=WEED_PALETTE_END;
+      lives_free(cur_pal);
+    } else future_prefs->vpp_palette=WEED_PALETTE_END;
 
     if (future_prefs->vpp_argv!=NULL) {
-      for (i=0;future_prefs->vpp_argv[i]!=NULL;i++) g_free(future_prefs->vpp_argv[i]);
-      g_free(future_prefs->vpp_argv);
+      for (i=0; future_prefs->vpp_argv[i]!=NULL; i++) lives_free(future_prefs->vpp_argv[i]);
+      lives_free(future_prefs->vpp_argv);
       future_prefs->vpp_argv=NULL;
     }
 
@@ -819,10 +802,9 @@
     if (vppw->rfx!=NULL) {
       future_prefs->vpp_argv=param_marshall_to_argv(vppw->rfx);
       if (future_prefs->vpp_argv!=NULL) {
-	for (i=0;future_prefs->vpp_argv[i]!=NULL;future_prefs->vpp_argc=++i);
+        for (i=0; future_prefs->vpp_argv[i]!=NULL; future_prefs->vpp_argc=++i);
       }
-    }
-    else {
+    } else {
       future_prefs->vpp_argv=vpp->extra_argv;
       vpp->extra_argv=NULL;
       vpp->extra_argc=0;
@@ -833,11 +815,10 @@
 }
 
 
-void on_vppa_save_clicked (LiVESButton *button, gpointer user_data) {
+void on_vppa_save_clicked(LiVESButton *button, livespointer user_data) {
   _vppaw *vppw=(_vppaw *)user_data;
   _vid_playback_plugin *vpp=vppw->plugin;
-  gchar *save_file;
-  gchar *msg;
+  char *save_file;
 
   // apply
   mainw->error=FALSE;
@@ -852,12 +833,10 @@
   if (save_file==NULL) return;
 
   // save
-  msg=g_strdup_printf(_("Saving playback plugin defaults to %s..."),save_file);
-  d_print(msg);
-  g_free(msg);
+  d_print(_("Saving playback plugin defaults to %s..."),save_file);
   save_vpp_defaults(vpp, save_file);
   d_print_done();
-  g_free(save_file);
+  lives_free(save_file);
 
 }
 
@@ -865,7 +844,7 @@
 
 
 
-_vppaw *on_vpp_advanced_clicked (LiVESButton *button, gpointer user_data) {
+_vppaw *on_vpp_advanced_clicked(LiVESButton *button, livespointer user_data) {
   LiVESWidget *dialog_vbox;
   LiVESWidget *hbox;
   LiVESWidget *label;
@@ -882,32 +861,31 @@
 
   int *pal_list;
 
-  GList *fps_list_strings=NULL;
-  GList *pal_list_strings=NULL;
+  LiVESList *fps_list_strings=NULL;
+  LiVESList *pal_list_strings=NULL;
 
-  const gchar *string;
-  const gchar *pversion;
-  const gchar *desc;
+  const char *string;
+  const char *pversion;
+  const char *desc;
   const char *fps_list;
 
-  gchar *title;
-  gchar *tmp,*tmp2;
+  char *title;
+  char *tmp,*tmp2;
+
+  char *ctext=NULL;
 
-  gchar *ctext=NULL;
+  char *com;
 
-  gchar *com;
-  
   // TODO - set default values from tmpvpp
 
   if (strlen(future_prefs->vpp_name)) {
-    if ((tmpvpp=open_vid_playback_plugin (future_prefs->vpp_name, FALSE))==NULL) return NULL;
-  }
-  else {
+    if ((tmpvpp=open_vid_playback_plugin(future_prefs->vpp_name, FALSE))==NULL) return NULL;
+  } else {
     if (mainw->vpp==NULL) return NULL;
     tmpvpp=mainw->vpp;
   }
 
-  vppa=(_vppaw*)(g_malloc(sizeof(_vppaw)));
+  vppa=(_vppaw *)(lives_malloc(sizeof(_vppaw)));
 
   vppa->plugin=tmpvpp;
 
@@ -916,13 +894,13 @@
 
   pversion=(tmpvpp->version)();
 
-  title=g_strdup_printf("LiVES: - %s",pversion);
+  title=lives_strdup_printf("LiVES: - %s",pversion);
 
-  vppa->dialog = lives_standard_dialog_new (title,FALSE);
-  g_free(title);
+  vppa->dialog = lives_standard_dialog_new(title,FALSE,DEF_DIALOG_WIDTH,DEF_DIALOG_HEIGHT);
+  lives_free(title);
 
-  accel_group = LIVES_ACCEL_GROUP(lives_accel_group_new ());
-  lives_window_add_accel_group (LIVES_WINDOW (vppa->dialog), accel_group);
+  accel_group = LIVES_ACCEL_GROUP(lives_accel_group_new());
+  lives_window_add_accel_group(LIVES_WINDOW(vppa->dialog), accel_group);
 
   if (prefs->show_gui) {
     if (prefsw!=NULL) lives_window_set_transient_for(LIVES_WINDOW(vppa->dialog),LIVES_WINDOW(prefsw->prefs_dialog));
@@ -938,50 +916,48 @@
   if (tmpvpp->get_description!=NULL) {
     desc=(tmpvpp->get_description)();
     if (desc!=NULL) {
-      label = lives_standard_label_new (desc);
-      lives_box_pack_start (LIVES_BOX (dialog_vbox), label, FALSE, FALSE, widget_opts.packing_height);
+      label = lives_standard_label_new(desc);
+      lives_box_pack_start(LIVES_BOX(dialog_vbox), label, FALSE, FALSE, widget_opts.packing_height);
     }
   }
 
 
   if (tmpvpp->get_fps_list!=NULL&&(fps_list=(*tmpvpp->get_fps_list)(tmpvpp->palette))!=NULL) {
     int nfps,i;
-    gchar **array=g_strsplit (fps_list,"|",-1);
+    char **array=lives_strsplit(fps_list,"|",-1);
 
-    nfps=get_token_count((gchar *)fps_list,'|');
-    for (i=0;i<nfps;i++) {
+    nfps=get_token_count((char *)fps_list,'|');
+    for (i=0; i<nfps; i++) {
       if (strlen(array[i])&&strcmp(array[i],"\n")) {
-	if (get_token_count(array[i],':')==0) {
-	  fps_list_strings=g_list_append (fps_list_strings, remove_trailing_zeroes(g_strtod(array[i],NULL)));
-	}
-	else fps_list_strings=g_list_append (fps_list_strings,g_strdup(array[i]));
+        if (get_token_count(array[i],':')==0) {
+          fps_list_strings=lives_list_append(fps_list_strings, remove_trailing_zeroes(lives_strtod(array[i],NULL)));
+        } else fps_list_strings=lives_list_append(fps_list_strings,lives_strdup(array[i]));
       }
     }
 
     // fps
-    combo = lives_standard_combo_new ((tmp=g_strdup(_("_FPS"))),TRUE,fps_list_strings,
-				      LIVES_BOX(dialog_vbox),(tmp2=g_strdup(_("Fixed framerate for plugin.\n"))));
+    combo = lives_standard_combo_new((tmp=lives_strdup(_("_FPS"))),TRUE,fps_list_strings,
+                                     LIVES_BOX(dialog_vbox),(tmp2=lives_strdup(_("Fixed framerate for plugin.\n"))));
 
-    g_free(tmp);
-    g_free(tmp2);
+    lives_free(tmp);
+    lives_free(tmp2);
     vppa->fps_entry=lives_combo_get_entry(LIVES_COMBO(combo));
-    lives_entry_set_width_chars (LIVES_ENTRY (lives_combo_get_entry(LIVES_COMBO(combo))), 14);
+    lives_entry_set_width_chars(LIVES_ENTRY(lives_combo_get_entry(LIVES_COMBO(combo))), 14);
 
 
-    g_list_free_strings(fps_list_strings);
-    g_list_free(fps_list_strings);
+    lives_list_free_strings(fps_list_strings);
+    lives_list_free(fps_list_strings);
     fps_list_strings=NULL;
-    g_strfreev (array);
+    lives_strfreev(array);
 
     if (tmpvpp->fixed_fps_numer>0) {
-      gchar *tmp=g_strdup_printf("%d:%d",tmpvpp->fixed_fps_numer,tmpvpp->fixed_fps_denom);
+      char *tmp=lives_strdup_printf("%d:%d",tmpvpp->fixed_fps_numer,tmpvpp->fixed_fps_denom);
       lives_entry_set_text(LIVES_ENTRY(vppa->fps_entry),tmp);
-      g_free(tmp);
-    }
-    else {
-      gchar *tmp=remove_trailing_zeroes(tmpvpp->fixed_fpsd);
+      lives_free(tmp);
+    } else {
+      char *tmp=remove_trailing_zeroes(tmpvpp->fixed_fpsd);
       lives_entry_set_text(LIVES_ENTRY(vppa->fps_entry),tmp);
-      g_free(tmp);
+      lives_free(tmp);
     }
   }
 
@@ -989,125 +965,125 @@
   // frame size
 
   if (!(tmpvpp->capabilities&VPP_LOCAL_DISPLAY)) {
-    hbox = lives_hbox_new (FALSE, 0);
-    lives_box_pack_start (LIVES_BOX (dialog_vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
-    
+    hbox = lives_hbox_new(FALSE, 0);
+    lives_box_pack_start(LIVES_BOX(dialog_vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
+
     add_fill_to_box(LIVES_BOX(hbox));
 
-    vppa->spinbuttonw = lives_standard_spin_button_new (_("_Width"),TRUE,
-							tmpvpp->fwidth>0?tmpvpp->fwidth:DEF_VPP_HSIZE, 
-							4., MAX_FRAME_WIDTH, 4., 4., 0, LIVES_BOX(hbox),NULL);
+    vppa->spinbuttonw = lives_standard_spin_button_new(_("_Width"),TRUE,
+                        tmpvpp->fwidth>0?tmpvpp->fwidth:DEF_VPP_HSIZE,
+                        4., MAX_FRAME_WIDTH, 4., 4., 0, LIVES_BOX(hbox),NULL);
 
     add_fill_to_box(LIVES_BOX(hbox));
-    
-    vppa->spinbuttonh = lives_standard_spin_button_new (_("_Height"),TRUE,
-							tmpvpp->fheight>0?tmpvpp->fheight:DEF_VPP_VSIZE, 
-							4., MAX_FRAME_HEIGHT, 4., 4., 0, LIVES_BOX(hbox),NULL);
+
+    vppa->spinbuttonh = lives_standard_spin_button_new(_("_Height"),TRUE,
+                        tmpvpp->fheight>0?tmpvpp->fheight:DEF_VPP_VSIZE,
+                        4., MAX_FRAME_HEIGHT, 4., 4., 0, LIVES_BOX(hbox),NULL);
 
     add_fill_to_box(LIVES_BOX(hbox));
   }
 
-  
+
   // palette
 
   if (tmpvpp->get_palette_list!=NULL&&(pal_list=(*tmpvpp->get_palette_list)())!=NULL) {
     int i;
-    
-    for (i=0;pal_list[i]!=WEED_PALETTE_END;i++) {
+
+    for (i=0; pal_list[i]!=WEED_PALETTE_END; i++) {
       int j=0;
       string=weed_palette_get_name(pal_list[i]);
       if (weed_palette_is_yuv_palette(pal_list[i])&&tmpvpp->get_yuv_palette_clamping!=NULL) {
-       	int *clampings=(*tmpvpp->get_yuv_palette_clamping)(pal_list[i]);
-	while (clampings[j]!=-1) {
-	  gchar *string2=g_strdup_printf("%s (%s)",string,weed_yuv_clamping_get_name(clampings[j]));
-	  pal_list_strings=g_list_append (pal_list_strings, string2);
-	  j++;
-	}
+        int *clampings=(*tmpvpp->get_yuv_palette_clamping)(pal_list[i]);
+        while (clampings[j]!=-1) {
+          char *string2=lives_strdup_printf("%s (%s)",string,weed_yuv_clamping_get_name(clampings[j]));
+          pal_list_strings=lives_list_append(pal_list_strings, string2);
+          j++;
+        }
       }
       if (j==0) {
-	pal_list_strings=g_list_append (pal_list_strings, g_strdup(string));
+        pal_list_strings=lives_list_append(pal_list_strings, lives_strdup(string));
       }
     }
 
-    combo = lives_standard_combo_new ((tmp=g_strdup(_("_Colourspace"))),TRUE,pal_list_strings,
-				      LIVES_BOX(dialog_vbox),tmp2=g_strdup(_("Colourspace input to the plugin.\n")));
-    g_free(tmp);
-    g_free(tmp2);
+    combo = lives_standard_combo_new((tmp=lives_strdup(_("_Colourspace"))),TRUE,pal_list_strings,
+                                     LIVES_BOX(dialog_vbox),tmp2=lives_strdup(_("Colourspace input to the plugin.\n")));
+    lives_free(tmp);
+    lives_free(tmp2);
     vppa->pal_entry=lives_combo_get_entry(LIVES_COMBO(combo));
 
     if (tmpvpp->get_yuv_palette_clamping!=NULL&&weed_palette_is_yuv_palette(tmpvpp->palette)) {
       int *clampings=tmpvpp->get_yuv_palette_clamping(tmpvpp->palette);
-      if (clampings[0]!=-1) 
-	ctext=g_strdup_printf("%s (%s)",weed_palette_get_name(tmpvpp->palette),
-			      weed_yuv_clamping_get_name(tmpvpp->YUV_clamping));
+      if (clampings[0]!=-1)
+        ctext=lives_strdup_printf("%s (%s)",weed_palette_get_name(tmpvpp->palette),
+                                  weed_yuv_clamping_get_name(tmpvpp->YUV_clamping));
     }
-    if (ctext==NULL) ctext=g_strdup(weed_palette_get_name(tmpvpp->palette));
+    if (ctext==NULL) ctext=lives_strdup(weed_palette_get_name(tmpvpp->palette));
     lives_entry_set_text(LIVES_ENTRY(vppa->pal_entry),ctext);
-    g_free(ctext);
-    g_list_free_strings(pal_list_strings);
-    g_list_free(pal_list_strings);
+    lives_free(ctext);
+    lives_list_free_strings(pal_list_strings);
+    lives_list_free(pal_list_strings);
   }
 
   // extra params
 
   if (tmpvpp->get_init_rfx!=NULL) {
-    LiVESWidget *vbox=lives_vbox_new (FALSE, 0);
-    LiVESWidget *scrolledwindow = lives_standard_scrolled_window_new (RFX_WINSIZE_H, RFX_WINSIZE_V/2, vbox);
-    lives_box_pack_start (LIVES_BOX (dialog_vbox), scrolledwindow, TRUE, TRUE, 0);
+    LiVESWidget *vbox=lives_vbox_new(FALSE, 0);
+    LiVESWidget *scrolledwindow = lives_standard_scrolled_window_new(RFX_WINSIZE_H, RFX_WINSIZE_V/2, vbox);
+    lives_box_pack_start(LIVES_BOX(dialog_vbox), scrolledwindow, TRUE, TRUE, 0);
 
 #ifndef IS_MINGW
-    com=g_strdup_printf("/bin/echo -e \"%s\"",(*tmpvpp->get_init_rfx)());
+    com=lives_strdup_printf("%s -e \"%s\"",capable->echo_cmd,(*tmpvpp->get_init_rfx)());
 #else
-    com=g_strdup_printf("echo.exe -e \"%s\"",(*tmpvpp->get_init_rfx)());
+    com=lives_strdup_printf("echo.exe -e \"%s\"",(*tmpvpp->get_init_rfx)());
 #endif
     plugin_run_param_window(com,LIVES_VBOX(vbox),&(vppa->rfx));
-    g_free(com);
+    lives_free(com);
     if (tmpvpp->extra_argv!=NULL&&tmpvpp->extra_argc>0) {
       // update with defaults
-      GList *plist=argv_to_marshalled_list(vppa->rfx,tmpvpp->extra_argc,tmpvpp->extra_argv);
-      param_demarshall(vppa->rfx,plist,FALSE,TRUE);
-      g_list_free_strings(plist);
-      g_list_free(plist);
+      LiVESList *plist=argv_to_marshalled_list(vppa->rfx,tmpvpp->extra_argc,tmpvpp->extra_argv);
+      param_demarshall(vppa->rfx,plist,FALSE,FALSE); // set defaults
+      param_demarshall(vppa->rfx,plist,FALSE,TRUE); // update widgets
+      lives_list_free_strings(plist);
+      lives_list_free(plist);
     }
-  }
-  else {
+  } else {
     vppa->rfx=NULL;
   }
 
 
-  cancelbutton = lives_button_new_from_stock (LIVES_STOCK_CANCEL);
-  lives_dialog_add_action_widget (LIVES_DIALOG (vppa->dialog), cancelbutton, LIVES_RESPONSE_CANCEL);
-  lives_widget_set_can_focus (cancelbutton,TRUE);
-
-  lives_widget_add_accelerator (cancelbutton, LIVES_WIDGET_CLICKED_EVENT, accel_group,
-                              LIVES_KEY_Escape, (LiVESXModifierType)0, (LiVESAccelFlags)0);
-
-
-  savebutton = lives_button_new_from_stock (LIVES_STOCK_SAVE_AS);
-  lives_dialog_add_action_widget (LIVES_DIALOG (vppa->dialog), savebutton, 1);
-  lives_widget_set_can_focus (savebutton,TRUE);
-  lives_widget_set_tooltip_text( savebutton, _("Save settings to an alternate file.\n"));
-
-  okbutton = lives_button_new_from_stock (LIVES_STOCK_OK);
-  lives_dialog_add_action_widget (LIVES_DIALOG (vppa->dialog), okbutton, LIVES_RESPONSE_OK);
-  lives_widget_set_can_focus_and_default (okbutton);
-
-  lives_signal_connect (LIVES_GUI_OBJECT (cancelbutton), LIVES_WIDGET_CLICKED_EVENT,
-		    LIVES_GUI_CALLBACK (on_vppa_cancel_clicked),
-		    vppa);
-
-  lives_signal_connect (LIVES_GUI_OBJECT (savebutton), LIVES_WIDGET_CLICKED_EVENT,
-		    LIVES_GUI_CALLBACK (on_vppa_save_clicked),
-		    vppa);
-
-  lives_signal_connect (LIVES_GUI_OBJECT (okbutton), LIVES_WIDGET_CLICKED_EVENT,
-		    LIVES_GUI_CALLBACK (on_vppa_ok_clicked),
-		    vppa);
+  cancelbutton = lives_button_new_from_stock(LIVES_STOCK_CANCEL);
+  lives_dialog_add_action_widget(LIVES_DIALOG(vppa->dialog), cancelbutton, LIVES_RESPONSE_CANCEL);
+  lives_widget_set_can_focus(cancelbutton,TRUE);
+
+  lives_widget_add_accelerator(cancelbutton, LIVES_WIDGET_CLICKED_SIGNAL, accel_group,
+                               LIVES_KEY_Escape, (LiVESXModifierType)0, (LiVESAccelFlags)0);
+
+
+  savebutton = lives_button_new_from_stock(LIVES_STOCK_SAVE_AS);
+  lives_dialog_add_action_widget(LIVES_DIALOG(vppa->dialog), savebutton, 1);
+  lives_widget_set_can_focus(savebutton,TRUE);
+  lives_widget_set_tooltip_text(savebutton, _("Save settings to an alternate file.\n"));
+
+  okbutton = lives_button_new_from_stock(LIVES_STOCK_OK);
+  lives_dialog_add_action_widget(LIVES_DIALOG(vppa->dialog), okbutton, LIVES_RESPONSE_OK);
+  lives_widget_set_can_focus_and_default(okbutton);
+
+  lives_signal_connect(LIVES_GUI_OBJECT(cancelbutton), LIVES_WIDGET_CLICKED_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_vppa_cancel_clicked),
+                       vppa);
+
+  lives_signal_connect(LIVES_GUI_OBJECT(savebutton), LIVES_WIDGET_CLICKED_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_vppa_save_clicked),
+                       vppa);
+
+  lives_signal_connect(LIVES_GUI_OBJECT(okbutton), LIVES_WIDGET_CLICKED_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_vppa_ok_clicked),
+                       vppa);
 
 
 
   lives_widget_show_all(vppa->dialog);
-  lives_window_present (LIVES_WINDOW (vppa->dialog));
+  lives_window_present(LIVES_WINDOW(vppa->dialog));
   lives_xwindow_raise(lives_widget_get_xwindow(vppa->dialog));
 
   return vppa;
@@ -1121,35 +1097,35 @@
     if (vpp==mainw->vpp) {
       mainw->ext_keyboard=FALSE;
       if (mainw->ext_playback) {
-	if (mainw->vpp->exit_screen!=NULL) 
-	  (*mainw->vpp->exit_screen)(mainw->ptr_x,mainw->ptr_y);
+        if (mainw->vpp->exit_screen!=NULL)
+          (*mainw->vpp->exit_screen)(mainw->ptr_x,mainw->ptr_y);
 #ifdef RT_AUDIO
-	stop_audio_stream();
+        stop_audio_stream();
 #endif
-	if (mainw->vpp->capabilities&VPP_LOCAL_DISPLAY) 
-	  if (mainw->play_window!=NULL&&prefs->play_monitor==0)
-	    lives_window_set_keep_below(LIVES_WINDOW(mainw->play_window),FALSE);
+        if (mainw->vpp->capabilities&VPP_LOCAL_DISPLAY)
+          if (mainw->play_window!=NULL&&prefs->play_monitor==0)
+            lives_window_set_keep_below(LIVES_WINDOW(mainw->play_window),FALSE);
       }
       mainw->stream_ticks=-1;
       mainw->vpp=NULL;
     }
-    if (vpp->module_unload!=NULL) (vpp->module_unload)();
-    dlclose (vpp->handle);
+    if (vpp->module_unload!=NULL)(vpp->module_unload)();
+    dlclose(vpp->handle);
 
     if (vpp->extra_argv!=NULL) {
-      for (i=0;vpp->extra_argv[i]!=NULL;i++) {
-	g_free(vpp->extra_argv[i]);
+      for (i=0; vpp->extra_argv[i]!=NULL; i++) {
+        lives_free(vpp->extra_argv[i]);
       }
-      g_free(vpp->extra_argv);
+      lives_free(vpp->extra_argv);
     }
 
-    for (i=0;i<vpp->num_play_params+vpp->num_alpha_chans;i++) {
+    for (i=0; i<vpp->num_play_params+vpp->num_alpha_chans; i++) {
       weed_plant_free(vpp->play_params[i]);
     }
 
-    if (vpp->play_params!=NULL) g_free(vpp->play_params);
+    if (vpp->play_params!=NULL) lives_free(vpp->play_params);
 
-    g_free (vpp);
+    lives_free(vpp);
   }
 }
 
@@ -1179,7 +1155,7 @@
 
 
 
-_vid_playback_plugin *open_vid_playback_plugin (const gchar *name, boolean in_use) {
+_vid_playback_plugin *open_vid_playback_plugin(const char *name, boolean in_use) {
   // this is called on startup or when the user selects a new playback plugin
 
   // if in_use is TRUE, it is our active vpp
@@ -1188,32 +1164,32 @@
   // TODO - dirsep
 
 #ifndef IS_MINGW
-  gchar *plugname=g_strdup_printf ("%s%s%s/%s.so",prefs->lib_dir,PLUGIN_EXEC_DIR,PLUGIN_VID_PLAYBACK,name);
+  char *plugname=lives_strdup_printf("%s%s%s/%s.so",prefs->lib_dir,PLUGIN_EXEC_DIR,PLUGIN_VID_PLAYBACK,name);
 #else
-  gchar *plugname=g_strdup_printf ("%s%s%s/%s.dll",prefs->lib_dir,PLUGIN_EXEC_DIR,PLUGIN_VID_PLAYBACK,name);
+  char *plugname=lives_strdup_printf("%s%s%s/%s.dll",prefs->lib_dir,PLUGIN_EXEC_DIR,PLUGIN_VID_PLAYBACK,name);
 #endif
   void *handle=dlopen(plugname,RTLD_LAZY);
   boolean OK=TRUE;
-  gchar *msg,*tmp;
-  gchar **array;
-  const gchar *fps_list;
-  const gchar *pl_error;
+  char *msg,*tmp;
+  char **array;
+  const char *fps_list;
+  const char *pl_error;
   int i;
   int *palette_list;
   _vid_playback_plugin *vpp;
 
   if (handle==NULL) {
-    gchar *msg=g_strdup_printf (_("\n\nFailed to open playback plugin %s\nError was %s\n"),plugname,dlerror());
+    char *msg=lives_strdup_printf(_("\n\nFailed to open playback plugin %s\nError was %s\n"),plugname,dlerror());
     if (prefsw!=NULL) do_error_dialog_with_check_transient(msg,TRUE,0,prefsw!=NULL?LIVES_WINDOW(prefsw->prefs_dialog):
-							   LIVES_WINDOW(mainw->LiVES));
+          LIVES_WINDOW(mainw->LiVES));
     else do_error_dialog(msg);
-    g_free (msg);
-    g_free(plugname);
+    lives_free(msg);
+    lives_free(plugname);
     return NULL;
   }
 
 
-  vpp=(_vid_playback_plugin *) g_malloc (sizeof(_vid_playback_plugin));
+  vpp=(_vid_playback_plugin *) lives_malloc(sizeof(_vid_playback_plugin));
 
   vpp->play_paramtmpls=NULL;
   vpp->play_params=NULL;
@@ -1221,71 +1197,71 @@
   vpp->num_play_params=vpp->num_alpha_chans=0;
   vpp->extra_argv=NULL;
 
-  if ((vpp->module_check_init=(const char* (*)())dlsym (handle,"module_check_init"))==NULL) {
+  if ((vpp->module_check_init=(const char* ( *)())dlsym(handle,"module_check_init"))==NULL) {
     OK=FALSE;
   }
-  if ((vpp->version=(const char* (*)())dlsym (handle,"version"))==NULL) {
+  if ((vpp->version=(const char* ( *)())dlsym(handle,"version"))==NULL) {
     OK=FALSE;
   }
-  if ((vpp->get_palette_list=(int* (*)())dlsym (handle,"get_palette_list"))==NULL) {
+  if ((vpp->get_palette_list=(int* ( *)())dlsym(handle,"get_palette_list"))==NULL) {
     OK=FALSE;
   }
-  if ((vpp->set_palette=(boolean (*)(int))dlsym (handle,"set_palette"))==NULL) {
+  if ((vpp->set_palette=(boolean( *)(int))dlsym(handle,"set_palette"))==NULL) {
     OK=FALSE;
   }
-  if ((vpp->get_capabilities=(uint64_t (*)(int))dlsym (handle,"get_capabilities"))==NULL) {
+  if ((vpp->get_capabilities=(uint64_t ( *)(int))dlsym(handle,"get_capabilities"))==NULL) {
     OK=FALSE;
   }
-  if ((vpp->render_frame=(boolean (*)(int, int, int64_t, void**, void**, weed_plant_t **)) 
-       dlsym (handle,"render_frame"))==NULL) {
+  if ((vpp->render_frame=(boolean( *)(int, int, int64_t, void **, void **, weed_plant_t **))
+                         dlsym(handle,"render_frame"))==NULL) {
     OK=FALSE;
   }
-  if ((vpp->get_fps_list=(const gchar* (*)(int))dlsym (handle,"get_fps_list"))!=NULL) {
-    if ((vpp->set_fps=(boolean (*)(double))dlsym (handle,"set_fps"))==NULL) {
+  if ((vpp->get_fps_list=(const char* ( *)(int))dlsym(handle,"get_fps_list"))!=NULL) {
+    if ((vpp->set_fps=(boolean( *)(double))dlsym(handle,"set_fps"))==NULL) {
       OK=FALSE;
     }
   }
 
 
   if (!OK) {
-    gchar *msg=g_strdup_printf 
-      (_("\n\nPlayback module %s\nis missing a mandatory function.\nUnable to use it.\n"),plugname);
-    set_pref ("vid_playback_plugin","none");
+    char *msg=lives_strdup_printf
+              (_("\n\nPlayback module %s\nis missing a mandatory function.\nUnable to use it.\n"),plugname);
+    set_pref("vid_playback_plugin","none");
     do_error_dialog_with_check_transient(msg,TRUE,0,prefsw!=NULL?LIVES_WINDOW(prefsw->prefs_dialog):
-					 LIVES_WINDOW(mainw->LiVES));
-    g_free (msg);
-    dlclose (handle);
-    g_free (vpp);
+                                         LIVES_WINDOW(mainw->LiVES));
+    lives_free(msg);
+    dlclose(handle);
+    lives_free(vpp);
     vpp=NULL;
-    g_free(plugname);
+    lives_free(plugname);
     return NULL;
   }
 
   if ((pl_error=(*vpp->module_check_init)())!=NULL) {
-    msg=g_strdup_printf(_("Video playback plugin failed to initialise.\nError was: %s\n"),pl_error);
+    msg=lives_strdup_printf(_("Video playback plugin failed to initialise.\nError was: %s\n"),pl_error);
     do_error_dialog_with_check_transient(msg,TRUE,0,prefsw!=NULL?LIVES_WINDOW(prefsw->prefs_dialog):
-					 LIVES_WINDOW(mainw->LiVES));
-    g_free(msg);
-    dlclose (handle);
-    g_free (vpp);
+                                         LIVES_WINDOW(mainw->LiVES));
+    lives_free(msg);
+    dlclose(handle);
+    lives_free(vpp);
     vpp=NULL;
-    g_free(plugname);
+    lives_free(plugname);
     return NULL;
   }
 
   // now check for optional functions
-  vpp->get_description=(const char* (*)())dlsym (handle,"get_description");
-  vpp->get_init_rfx=(const char* (*)())dlsym (handle,"get_init_rfx");
+  vpp->get_description=(const char* ( *)())dlsym(handle,"get_description");
+  vpp->get_init_rfx=(const char* ( *)())dlsym(handle,"get_init_rfx");
 
-  vpp->get_play_params=(const weed_plant_t ** (*)(weed_bootstrap_f))dlsym (handle,"get_play_params");
+  vpp->get_play_params=(const weed_plant_t **( *)(weed_bootstrap_f))dlsym(handle,"get_play_params");
 
-  vpp->get_yuv_palette_clamping=(int* (*)(int))dlsym (handle,"get_yuv_palette_clamping");
-  vpp->set_yuv_palette_clamping=(int (*)(int))dlsym (handle,"set_yuv_palette_clamping");
-  vpp->send_keycodes=(boolean (*)(plugin_keyfunc))dlsym (handle,"send_keycodes");
-  vpp->get_audio_fmts=(int* (*)())dlsym (handle,"get_audio_fmts");
-  vpp->init_screen=(boolean (*)(int, int, boolean, uint64_t, int, gchar**))dlsym (handle,"init_screen");
-  vpp->exit_screen=(void (*)(uint16_t, uint16_t))dlsym (handle,"exit_screen");
-  vpp->module_unload=(void (*)())dlsym (handle,"module_unload");
+  vpp->get_yuv_palette_clamping=(int* ( *)(int))dlsym(handle,"get_yuv_palette_clamping");
+  vpp->set_yuv_palette_clamping=(int ( *)(int))dlsym(handle,"set_yuv_palette_clamping");
+  vpp->send_keycodes=(boolean( *)(plugin_keyfunc))dlsym(handle,"send_keycodes");
+  vpp->get_audio_fmts=(int* ( *)())dlsym(handle,"get_audio_fmts");
+  vpp->init_screen=(boolean( *)(int, int, boolean, uint64_t, int, char **))dlsym(handle,"init_screen");
+  vpp->exit_screen=(void ( *)(uint16_t, uint16_t))dlsym(handle,"exit_screen");
+  vpp->module_unload=(void ( *)())dlsym(handle,"module_unload");
 
   vpp->YUV_sampling=0;
   vpp->YUV_subspace=0;
@@ -1295,13 +1271,11 @@
   if (future_prefs->vpp_argv!=NULL) {
     vpp->palette=future_prefs->vpp_palette;
     vpp->YUV_clamping=future_prefs->vpp_YUV_clamping;
-  }
-  else {
+  } else {
     if (!in_use&&mainw->vpp!=NULL&&!(strcmp(name,mainw->vpp->name))) {
       vpp->palette=mainw->vpp->palette;
       vpp->YUV_clamping=mainw->vpp->YUV_clamping;
-    }
-    else {
+    } else {
       vpp->palette=palette_list[0];
       vpp->YUV_clamping=-1;
     }
@@ -1312,15 +1286,13 @@
 
   if (vpp->capabilities&VPP_CAN_RESIZE) {
     vpp->fwidth=vpp->fheight=-1;
-  }
-  else {
+  } else {
     vpp->fwidth=vpp->fheight=0;
   }
   if (future_prefs->vpp_argv!=NULL) {
     vpp->fwidth=future_prefs->vpp_fwidth;
     vpp->fheight=future_prefs->vpp_fheight;
-  }
-  else if (!in_use&&mainw->vpp!=NULL&&!(strcmp(name,mainw->vpp->name))) {
+  } else if (!in_use&&mainw->vpp!=NULL&&!(strcmp(name,mainw->vpp->name))) {
     vpp->fwidth=mainw->vpp->fwidth;
     vpp->fheight=mainw->vpp->fheight;
   }
@@ -1332,30 +1304,27 @@
     vpp->fixed_fpsd=future_prefs->vpp_fixed_fpsd;
     vpp->fixed_fps_numer=future_prefs->vpp_fixed_fps_numer;
     vpp->fixed_fps_denom=future_prefs->vpp_fixed_fps_denom;
-  }
-  else if (!in_use&&mainw->vpp!=NULL&&!(strcmp(name,mainw->vpp->name))) {
+  } else if (!in_use&&mainw->vpp!=NULL&&!(strcmp(name,mainw->vpp->name))) {
     vpp->fixed_fpsd=mainw->vpp->fixed_fpsd;
     vpp->fixed_fps_numer=mainw->vpp->fixed_fps_numer;
     vpp->fixed_fps_denom=mainw->vpp->fixed_fps_denom;
   }
 
   vpp->handle=handle;
-  g_snprintf (vpp->name,256,"%s",name);
+  lives_snprintf(vpp->name,256,"%s",name);
 
   if (future_prefs->vpp_argv!=NULL) {
     vpp->extra_argc=future_prefs->vpp_argc;
-    vpp->extra_argv=(gchar **)g_malloc((vpp->extra_argc+1)*(sizeof(gchar *)));
-    for (i=0;i<=vpp->extra_argc;i++) vpp->extra_argv[i]=g_strdup(future_prefs->vpp_argv[i]);
-  }
-  else {
+    vpp->extra_argv=(char **)lives_malloc((vpp->extra_argc+1)*(sizeof(char *)));
+    for (i=0; i<=vpp->extra_argc; i++) vpp->extra_argv[i]=lives_strdup(future_prefs->vpp_argv[i]);
+  } else {
     if (!in_use&&mainw->vpp!=NULL&&!(strcmp(name,mainw->vpp->name))) {
-    vpp->extra_argc=mainw->vpp->extra_argc;
-    vpp->extra_argv=(gchar **)g_malloc((mainw->vpp->extra_argc+1)*(sizeof(gchar *)));
-    for (i=0;i<=vpp->extra_argc;i++) vpp->extra_argv[i]=g_strdup(mainw->vpp->extra_argv[i]);
-    }
-    else {
+      vpp->extra_argc=mainw->vpp->extra_argc;
+      vpp->extra_argv=(char **)lives_malloc((mainw->vpp->extra_argc+1)*(sizeof(char *)));
+      for (i=0; i<=vpp->extra_argc; i++) vpp->extra_argv[i]=lives_strdup(mainw->vpp->extra_argv[i]);
+    } else {
       vpp->extra_argc=0;
-      vpp->extra_argv=(gchar **)g_malloc(sizeof(gchar *));
+      vpp->extra_argv=(char **)lives_malloc(sizeof(char *));
       vpp->extra_argv[0]=NULL;
     }
   }
@@ -1365,26 +1334,25 @@
     // fixed fps
 
     if ((fps_list=(*vpp->get_fps_list)(vpp->palette))!=NULL) {
-      array=g_strsplit (fps_list,"|",-1);
-      if (get_token_count (array[0],':')>1) {
-	gchar **array2=g_strsplit(array[0],":",2);
-	vpp->fixed_fps_numer=atoi(array2[0]);
-	vpp->fixed_fps_denom=atoi(array2[1]);
-	g_strfreev(array2);
-	vpp->fixed_fpsd=get_ratio_fps(array[0]);
-      }
-      else {
-	vpp->fixed_fpsd=g_strtod(array[0],NULL);
-	vpp->fixed_fps_numer=0;
+      array=lives_strsplit(fps_list,"|",-1);
+      if (get_token_count(array[0],':')>1) {
+        char **array2=lives_strsplit(array[0],":",2);
+        vpp->fixed_fps_numer=atoi(array2[0]);
+        vpp->fixed_fps_denom=atoi(array2[1]);
+        lives_strfreev(array2);
+        vpp->fixed_fpsd=get_ratio_fps(array[0]);
+      } else {
+        vpp->fixed_fpsd=lives_strtod(array[0],NULL);
+        vpp->fixed_fps_numer=0;
       }
-      g_strfreev(array);
+      lives_strfreev(array);
     }
   }
 
 
   if (vpp->YUV_clamping==-1) {
     vpp->YUV_clamping=WEED_YUV_CLAMPING_CLAMPED;
-    
+
     if (vpp->get_yuv_palette_clamping!=NULL&&weed_palette_is_yuv_palette(vpp->palette)) {
       int *yuv_clamping_types=(*vpp->get_yuv_palette_clamping)(vpp->palette);
       if (yuv_clamping_types[0]!=-1) vpp->YUV_clamping=yuv_clamping_types[0];
@@ -1414,15 +1382,15 @@
   if (!(*vpp->set_palette)(vpp->palette)) {
     do_vpp_palette_error();
     close_vid_playback_plugin(vpp);
-    g_free(plugname);
+    lives_free(plugname);
     return NULL;
   }
-    
-  if (vpp->set_yuv_palette_clamping!=NULL) (*vpp->set_yuv_palette_clamping)(vpp->YUV_clamping);
+
+  if (vpp->set_yuv_palette_clamping!=NULL)(*vpp->set_yuv_palette_clamping)(vpp->YUV_clamping);
 
   if (vpp->get_fps_list!=NULL) {
     if (mainw->fixed_fpsd>0.||(vpp->fixed_fpsd>0.&&vpp->set_fps!=NULL&&
-			       !((*vpp->set_fps) (vpp->fixed_fpsd)))) {
+                               !((*vpp->set_fps)(vpp->fixed_fpsd)))) {
       do_vpp_fps_error();
       vpp->fixed_fpsd=-1.;
       vpp->fixed_fps_numer=0;
@@ -1437,20 +1405,19 @@
   // create vpp->play_params
   if (vpp->play_paramtmpls!=NULL) {
     weed_plant_t *ptmpl;
-    for (i=0;(ptmpl=(weed_plant_t *)vpp->play_paramtmpls[i])!=NULL;i++) {
-      vpp->play_params=(weed_plant_t **)g_realloc(vpp->play_params,(i+2)*sizeof(weed_plant_t *));
+    for (i=0; (ptmpl=(weed_plant_t *)vpp->play_paramtmpls[i])!=NULL; i++) {
+      vpp->play_params=(weed_plant_t **)lives_realloc(vpp->play_params,(i+2)*sizeof(weed_plant_t *));
       if (WEED_PLANT_IS_PARAMETER_TEMPLATE(ptmpl)) {
-	// is param template, create a param
-	vpp->play_params[i]=weed_plant_new(WEED_PLANT_PARAMETER);
-	weed_leaf_copy(vpp->play_params[i],"value",ptmpl,"default");
-	weed_set_plantptr_value(vpp->play_params[i],"template",ptmpl);
-	vpp->num_play_params++;
-      }
-      else {
-	// must be an alpha channel
-	vpp->play_params[i]=weed_plant_new(WEED_PLANT_CHANNEL);
-	weed_set_plantptr_value(vpp->play_params[i],"template",ptmpl);
-	vpp->num_alpha_chans++;
+        // is param template, create a param
+        vpp->play_params[i]=weed_plant_new(WEED_PLANT_PARAMETER);
+        weed_leaf_copy(vpp->play_params[i],"value",ptmpl,"default");
+        weed_set_plantptr_value(vpp->play_params[i],"template",ptmpl);
+        vpp->num_play_params++;
+      } else {
+        // must be an alpha channel
+        vpp->play_params[i]=weed_plant_new(WEED_PLANT_CHANNEL);
+        weed_set_plantptr_value(vpp->play_params[i],"template",ptmpl);
+        vpp->num_alpha_chans++;
       }
     }
     vpp->play_params[i]=NULL;
@@ -1458,48 +1425,47 @@
 
   if (vpp->send_keycodes==NULL&&vpp->capabilities&VPP_LOCAL_DISPLAY) {
     d_print
-      (_("\nWarning ! Video playback plugin will not send key presses. Keyboard may be disabled during plugin use !\n"));
+    (_("\nWarning ! Video playback plugin will not send key presses. Keyboard may be disabled during plugin use !\n"));
   }
 
   cached_key=cached_mod=0;
-  msg=g_strdup_printf(_("*** Using %s plugin for fs playback, agreed to use palette type %d ( %s ). ***\n"),name,
-		      vpp->palette,(tmp=weed_palette_get_name_full(vpp->palette,vpp->YUV_clamping,
-								   WEED_YUV_SUBSPACE_YCBCR)));
-  g_free(tmp);
-  d_print (msg);
-  g_free (msg);
-  g_free(plugname);
+
+  d_print(_("*** Using %s plugin for fs playback, agreed to use palette type %d ( %s ). ***\n"),name,
+          vpp->palette,(tmp=weed_palette_get_name_full(vpp->palette,vpp->YUV_clamping,
+                            WEED_YUV_SUBSPACE_YCBCR)));
+  lives_free(tmp);
+  lives_free(plugname);
 
   while (mainw->noswitch) {
-    g_usleep(prefs->sleep_time);
+    lives_usleep(prefs->sleep_time);
   }
 
   if (mainw->is_ready&&in_use&&mainw->vpp!=NULL) {
     close_vid_playback_plugin(mainw->vpp);
   }
-  
+
   return vpp;
 }
 
 
-void vid_playback_plugin_exit (void) {
+void vid_playback_plugin_exit(void) {
   // external plugin
   if (mainw->ext_playback) {
     mainw->ext_keyboard=FALSE;
-    if (mainw->vpp->exit_screen!=NULL) (*mainw->vpp->exit_screen)(mainw->ptr_x,mainw->ptr_y);
+    if (mainw->vpp->exit_screen!=NULL)(*mainw->vpp->exit_screen)(mainw->ptr_x,mainw->ptr_y);
 #ifdef RT_AUDIO
     stop_audio_stream();
 #endif
     mainw->ext_playback=FALSE;
-    if (mainw->vpp->capabilities&VPP_LOCAL_DISPLAY) 
+    if (mainw->vpp->capabilities&VPP_LOCAL_DISPLAY)
       if (mainw->play_window!=NULL&&prefs->play_monitor==0)
-	lives_window_set_keep_below(LIVES_WINDOW(mainw->play_window),FALSE);
+        lives_window_set_keep_below(LIVES_WINDOW(mainw->play_window),FALSE);
   }
   mainw->stream_ticks=-1;
 
   if (mainw->playing_file>-1&&mainw->fs&&mainw->sep_win) lives_window_fullscreen(LIVES_WINDOW(mainw->play_window));
-  if (mainw->play_window!=NULL) 
-    lives_window_set_title (LIVES_WINDOW (mainw->play_window),_("LiVES: - Play Window"));
+  if (mainw->play_window!=NULL)
+    lives_window_set_title(LIVES_WINDOW(mainw->play_window),_("LiVES: - Play Window"));
 }
 
 
@@ -1512,92 +1478,88 @@
   int ret=AUDIO_CODEC_NONE;
   int i,j=0,nfmts;
   size_t rlen;
-  gchar *astreamer,*com,*msg;
-  gchar buf[1024];
-  gchar **array;
+  char *astreamer,*com;
+  char buf[1024];
+  char **array;
   FILE *rfile;
 
   if (vpp!=NULL&&vpp->get_audio_fmts!=NULL) {
     fmts=(*vpp->get_audio_fmts)(); // const, so do not free()
 
     // make audiostream plugin name
-    astreamer=g_build_filename(prefs->lib_dir,PLUGIN_EXEC_DIR,PLUGIN_AUDIO_STREAM,"audiostreamer.pl",NULL);
+    astreamer=lives_build_filename(prefs->lib_dir,PLUGIN_EXEC_DIR,PLUGIN_AUDIO_STREAM,"audiostreamer.pl",NULL);
 
     // create sfmts array and nfmts
 
-    com=g_strdup_printf("\"%s\" get_formats",astreamer);
+    com=lives_strdup_printf("\"%s\" get_formats",astreamer);
 
     rfile=popen(com,"r");
     rlen=fread(buf,1,1023,rfile);
     pclose(rfile);
     memset(buf+rlen,0,1);
-    g_free(com);
+    lives_free(com);
 
     nfmts=get_token_count(buf,'|');
-    array=g_strsplit(buf,"|",nfmts);
-    sfmts=(int *)g_malloc(nfmts*sizint);
+    array=lives_strsplit(buf,"|",nfmts);
+    sfmts=(int *)lives_malloc(nfmts*sizint);
 
-    for (i=0;i<nfmts;i++) {
+    for (i=0; i<nfmts; i++) {
       if (array[i]!=NULL&&strlen(array[i])>0) sfmts[j++]=atoi(array[i]);
     }
 
     nfmts=j;
-    g_strfreev(array);
+    lives_strfreev(array);
 
-    for (i=0;fmts[i]!=-1;i++) {
+    for (i=0; fmts[i]!=-1; i++) {
       // traverse video list and see if audiostreamer supports each one
       if (int_array_contains_value(sfmts,nfmts,fmts[i])) {
 
-	com=g_strdup_printf("\"%s\" check %d",astreamer,fmts[i]);
+        com=lives_strdup_printf("\"%s\" check %d",astreamer,fmts[i]);
 
-	rfile=popen(com,"r");
-	if (!rfile) {
-	  // command failed
-	  do_system_failed_error(com,0,NULL);
-	  g_free(astreamer);
-	  g_free(com);
-	  g_free(sfmts);
-	  return ret;
-	}
-	rlen=fread(buf,1,1023,rfile);
-	pclose(rfile);
-	memset(buf+rlen,0,1);
-	g_free(com);
-
-	if (strlen(buf)>0) {
-	  if (i==0&&prefsw!=NULL) { 
-	    do_error_dialog_with_check_transient 
-	      (buf,TRUE,0,LIVES_WINDOW(prefsw->prefs_dialog));
-	    msg=g_strdup_printf(_("Audio stream unable to use preferred format '%s'\n"),anames[fmts[i]]);
-	    d_print(msg);
-	    g_free(msg);
-	  }
-	  continue;
-	}
-
-	if (i>0&&prefsw!=NULL) { 
-	  msg=g_strdup_printf(_("Using format '%s' instead.\n"),anames[fmts[i]]);
-	  d_print(msg);
-	  g_free(msg);
-	}
-	ret=fmts[i];
-	break;
+        rfile=popen(com,"r");
+        if (!rfile) {
+          // command failed
+          do_system_failed_error(com,0,NULL);
+          lives_free(astreamer);
+          lives_free(com);
+          lives_free(sfmts);
+          return ret;
+        }
+        rlen=fread(buf,1,1023,rfile);
+        pclose(rfile);
+        memset(buf+rlen,0,1);
+        lives_free(com);
+
+        if (strlen(buf)>0) {
+          if (i==0&&prefsw!=NULL) {
+            do_error_dialog_with_check_transient
+            (buf,TRUE,0,LIVES_WINDOW(prefsw->prefs_dialog));
+            d_print(_("Audio stream unable to use preferred format '%s'\n"),anames[fmts[i]]);
+          }
+          continue;
+        }
+
+        if (i>0&&prefsw!=NULL) {
+          d_print(_("Using format '%s' instead.\n"),anames[fmts[i]]);
+        }
+        ret=fmts[i];
+        break;
       }
     }
 
     if (fmts[i]==-1) {
       //none suitable, stick with first
-      for (i=0;fmts[i]!=-1;i++) {
-	// traverse video list and see if audiostreamer supports each one
-	if (int_array_contains_value(sfmts,nfmts,fmts[i])) {
-	  ret=fmts[i];
-	  break;
-	}
+      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);
-    g_free(astreamer);
+    lives_free(sfmts);
+    lives_free(astreamer);
   }
 
   return ret;
@@ -1609,34 +1571,38 @@
 
 
 
-void do_plugin_encoder_error(const gchar *plugin_name) {
-  gchar *msg,*tmp;
+void do_plugin_encoder_error(const char *plugin_name) {
+  char *msg,*tmp;
 
   if (plugin_name==NULL) {
-    msg=g_strdup_printf(_("LiVES was unable to find its encoder plugins. Please make sure you have the plugins installed in\n%s%s%s\nor change the value of <lib_dir> in %s\n"),prefs->lib_dir,PLUGIN_EXEC_DIR,PLUGIN_ENCODERS,(tmp=g_filename_to_utf8(capable->rcfile,-1,NULL,NULL,NULL)));
-    g_free(tmp);
+    msg=lives_strdup_printf(
+          _("LiVES was unable to find its encoder plugins. Please make sure you have the plugins installed in\n%s%s%s\nor change the value of <lib_dir> in %s\n"),
+          prefs->lib_dir,PLUGIN_EXEC_DIR,PLUGIN_ENCODERS,(tmp=lives_filename_to_utf8(capable->rcfile,-1,NULL,NULL,NULL)));
+    lives_free(tmp);
     if (rdet!=NULL) do_error_dialog_with_check_transient(msg,FALSE,0,LIVES_WINDOW(rdet->dialog));
     else do_error_dialog(msg);
-    g_free(msg);
+    lives_free(msg);
     return;
   }
 
-  msg=g_strdup_printf(_("LiVES did not receive a response from the encoder plugin called '%s'.\nPlease make sure you have that plugin installed correctly in\n%s%s%s\nor switch to another plugin using Tools|Preferences|Encoding\n"),plugin_name,prefs->lib_dir,PLUGIN_EXEC_DIR,PLUGIN_ENCODERS);
+  msg=lives_strdup_printf(
+        _("LiVES did not receive a response from the encoder plugin called '%s'.\nPlease make sure you have that plugin installed correctly in\n%s%s%s\nor switch to another plugin using Tools|Preferences|Encoding\n"),
+        plugin_name,prefs->lib_dir,PLUGIN_EXEC_DIR,PLUGIN_ENCODERS);
   do_blocking_error_dialog(msg);
-  g_free(msg);
+  lives_free(msg);
 }
 
 
-boolean check_encoder_restrictions (boolean get_extension, boolean user_audio, boolean save_all) {
-  gchar **checks;
-  gchar **array=NULL;
-  gchar **array2;
+boolean check_encoder_restrictions(boolean get_extension, boolean user_audio, boolean save_all) {
+  char **checks;
+  char **array=NULL;
+  char **array2;
   int pieces,numtok;
   boolean calc_aspect=FALSE;
-  gchar aspect_buffer[512];
+  char aspect_buffer[512];
   int hblock=2,vblock=2;
   int i,r,val;
-  GList *ofmt_all=NULL;
+  LiVESList *ofmt_all=NULL;
   boolean sizer=FALSE;
 
   // for auto resizing/resampling
@@ -1659,8 +1625,7 @@
     width=owidth=cfile->hsize;
     height=oheight=cfile->vsize;
     fps=cfile->fps;
-  }
-  else {
+  } else {
     width=owidth=rdet->width;
     height=oheight=rdet->height;
     fps=rdet->fps;
@@ -1676,32 +1641,30 @@
   }
 
   // TODO - allow lists for size
-  g_snprintf (prefs->encoder.of_restrict,5,"none");
+  lives_snprintf(prefs->encoder.of_restrict,5,"none");
   if (!((ofmt_all=plugin_request_by_line(PLUGIN_ENCODERS,prefs->encoder.name,"get_formats"))==NULL)) {
     // get any restrictions for the current format
-    for (i=0;i<g_list_length(ofmt_all);i++) {
-      if ((numtok=get_token_count ((gchar *)g_list_nth_data (ofmt_all,i),'|'))>2) {
-	array=g_strsplit ((gchar *)g_list_nth_data (ofmt_all,i),"|",-1);
-	if (!strcmp(array[0],prefs->encoder.of_name)) {
-	  if (numtok>4) {
-	    g_snprintf(prefs->encoder.of_def_ext,16,"%s",array[4]);
-	  }
-	  else {
-	    memset (prefs->encoder.of_def_ext,0,1);
-	  }
-	  if (numtok>3) {
-	    g_snprintf(prefs->encoder.of_restrict,128,"%s",array[3]);
-	  }
-	  else {
-	    g_snprintf(prefs->encoder.of_restrict,128,"none");
-	  }
-	  prefs->encoder.of_allowed_acodecs=atoi (array[2]);
-	  g_list_free_strings (ofmt_all);
-	  g_list_free (ofmt_all);
-	  g_strfreev(array);
-	  break;
-	}
-	g_strfreev(array);
+    for (i=0; i<lives_list_length(ofmt_all); i++) {
+      if ((numtok=get_token_count((char *)lives_list_nth_data(ofmt_all,i),'|'))>2) {
+        array=lives_strsplit((char *)lives_list_nth_data(ofmt_all,i),"|",-1);
+        if (!strcmp(array[0],prefs->encoder.of_name)) {
+          if (numtok>4) {
+            lives_snprintf(prefs->encoder.of_def_ext,16,"%s",array[4]);
+          } else {
+            memset(prefs->encoder.of_def_ext,0,1);
+          }
+          if (numtok>3) {
+            lives_snprintf(prefs->encoder.of_restrict,128,"%s",array[3]);
+          } else {
+            lives_snprintf(prefs->encoder.of_restrict,128,"none");
+          }
+          prefs->encoder.of_allowed_acodecs=atoi(array[2]);
+          lives_list_free_strings(ofmt_all);
+          lives_list_free(ofmt_all);
+          lives_strfreev(array);
+          break;
+        }
+        lives_strfreev(array);
       }
     }
   }
@@ -1727,8 +1690,7 @@
     arate=cfile->arate;
     achans=cfile->achans;
     asampsize=cfile->asampsize;
-  }
-  else {
+  } else {
     arate=rdet->arate;
     achans=rdet->achans;
     asampsize=rdet->asamps;
@@ -1736,13 +1698,12 @@
 
   // audio endianness check - what should we do for big-endian machines ?
   if (((mainw->save_with_sound||rdet!=NULL)&&(resaudw==NULL||resaudw->aud_checkbutton==NULL||
-					      lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(resaudw->aud_checkbutton))))
+       lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(resaudw->aud_checkbutton))))
       &&prefs->encoder.audio_codec!=AUDIO_CODEC_NONE&&(arate*achans*asampsize)) {
     if (rdet!=NULL&&!rdet->is_encoding) {
-      if (mainw->endian!=AFORM_BIG_ENDIAN && (lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(resaudw->rb_bigend)))) 
-	swap_endian=TRUE;
-    }
-    else {
+      if (mainw->endian!=AFORM_BIG_ENDIAN && (lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(resaudw->rb_bigend))))
+        swap_endian=TRUE;
+    } else {
       if (mainw->endian!=AFORM_BIG_ENDIAN && (cfile->signed_endian&AFORM_BIG_ENDIAN)) swap_endian=TRUE;
       //if (mainw->endian==AFORM_BIG_ENDIAN && (cfile->signed_endian&AFORM_BIG_ENDIAN)) swap_endian=TRUE; // needs test
     }
@@ -1751,259 +1712,254 @@
 
   if (strlen(prefs->encoder.of_restrict)>0) {
 
-    pieces=get_token_count (prefs->encoder.of_restrict,',');
-    checks=g_strsplit(prefs->encoder.of_restrict,",",pieces);
-    
+    pieces=get_token_count(prefs->encoder.of_restrict,',');
+    checks=lives_strsplit(prefs->encoder.of_restrict,",",pieces);
 
-    for (r=0;r<pieces;r++) {
+
+    for (r=0; r<pieces; r++) {
       // check each restriction in turn
-      
-      if (!strncmp (checks[r],"fps=",4)) {
-	double allowed_fps;
-	int mbest_num=0,mbest_denom=0;
-	int numparts;
-	gchar *fixer;
-	
-	best_fps_delta=1000000000.;
-	array=g_strsplit(checks[r],"=",2);
-	numtok=get_token_count (array[1],';');
-	array2=g_strsplit(array[1],";",numtok);
-	for (i=0;i<numtok;i++) {
-	  mbest_num=mbest_denom=0;
-	  if ((numparts=get_token_count (array2[i],':'))>1) {
-	    gchar **array3=g_strsplit(array2[i],":",2);
-	    mbest_num=atoi (array3[0]);
-	    mbest_denom=atoi (array3[1]);
-	    g_strfreev (array3);
-	    if (mbest_denom==0) continue;
-	    allowed_fps=(mbest_num*1.)/(mbest_denom*1.);
-	  }
-	  else allowed_fps=g_strtod (array2[i],NULL);
-	  
-	  // convert to 8dp
-	  fixer=g_strdup_printf ("%.8f %.8f",allowed_fps,fps);
-	  g_free (fixer);
-	  
-	  if (allowed_fps>=fps) {
-	    if (allowed_fps-fps<best_fps_delta) {
-	      best_fps_delta=allowed_fps-fps;
-	      if (mbest_denom>0) {
-		best_fps_num=mbest_num;
-		best_fps_denom=mbest_denom;
-		best_fps=0.;
-		if (rdet==NULL) cfile->ratio_fps=TRUE;
-		else rdet->ratio_fps=TRUE;
-	      }
-	      else {
-		best_fps_num=best_fps_denom=0;
-		best_fps=allowed_fps;
-		if (rdet==NULL) cfile->ratio_fps=FALSE;
-		else rdet->ratio_fps=FALSE;
-	      }
-	    }
-	  }
-	  else if ((best_fps_denom==0&&allowed_fps>best_fps)||(best_fps_denom>0&&allowed_fps>(best_fps_num*1.)/
-							       (best_fps_denom*1.))) {
-	    best_fps_delta=fps-allowed_fps;
-	    if (mbest_denom>0) {
-	      best_fps_num=mbest_num;
-	      best_fps_denom=mbest_denom;
-	      best_fps=0.;
-	      if (rdet==NULL) cfile->ratio_fps=TRUE;
-	      else rdet->ratio_fps=TRUE;
-	    }
-	    else {
-	      best_fps=allowed_fps;
-	      best_fps_num=best_fps_denom=0;
-	      if (rdet==NULL) cfile->ratio_fps=FALSE;
-	      else rdet->ratio_fps=FALSE;
-	    }
-	  }
-	  if (best_fps_delta<(.0005*prefs->ignore_tiny_fps_diffs)) {
-	    best_fps_delta=0.;
-	    best_fps_denom=best_fps_num=0;
-	  }
-	  if (best_fps_delta==0.) break;
-	}
-	g_strfreev(array);
-	g_strfreev(array2);
-	continue;
-      }
-      
-      if (!strncmp (checks[r],"size=",5)) {
-	// TODO - allow list for size
-	array=g_strsplit(checks[r],"=",2);
-	array2=g_strsplit(array[1],"x",2);
-	width=atoi (array2[0]);
-	height=atoi (array2[1]);
-	g_strfreev(array2);
-	g_strfreev(array);
-	sizer=TRUE;
-	continue;
-      }
-      
-      if (!strncmp (checks[r],"minw=",5)) {
-	array=g_strsplit(checks[r],"=",2);
-	val=atoi(array[1]);
-	if (width<val) width=val;
-	g_strfreev(array);
-	continue;
-      }
-
-      if (!strncmp (checks[r],"minh=",5)) {
-	array=g_strsplit(checks[r],"=",2);
-	val=atoi(array[1]);
-	if (height<val) height=val;
-	g_strfreev(array);
-	continue;
-      }
-
-      if (!strncmp (checks[r],"maxh=",5)) {
-	array=g_strsplit(checks[r],"=",2);
-	val=atoi(array[1]);
-	if (height>val) height=val;
-	g_strfreev(array);
-	continue;
-      }
-
-      if (!strncmp (checks[r],"maxw=",5)) {
-	array=g_strsplit(checks[r],"=",2);
-	val=atoi(array[1]);
-	if (width>val) width=val;
-	g_strfreev(array);
-	continue;
-      }
-
-      
-      if (!strncmp (checks[r],"asigned=",8)&&
-	  ((mainw->save_with_sound||rdet!=NULL)&&(resaudw==NULL||
-						  resaudw->aud_checkbutton==NULL||
-						  lives_toggle_button_get_active
-						  (LIVES_TOGGLE_BUTTON(resaudw->aud_checkbutton))))&&
-	  prefs->encoder.audio_codec!=AUDIO_CODEC_NONE
-	  &&(arate*achans*asampsize)) {
-	array=g_strsplit(checks[r],"=",2);
-	if (!strcmp(array[1],"signed")) {
-	  asigned=1;
-	}
-	
-	if (!strcmp(array[1],"unsigned")) {
-	  asigned=2;
-	}
-	
-	g_strfreev(array);
-      
-	if (asigned!=0&&!capable->has_sox_sox) {
-	  do_encoder_sox_error();
-	  g_strfreev(checks);
-	  return FALSE;
-	}
-	continue;
-      }
-      
-      
-      if (!strncmp (checks[r],"arate=",6)&&((mainw->save_with_sound||rdet!=NULL)&&(resaudw==NULL||
-										   resaudw->aud_checkbutton==NULL||
-										   lives_toggle_button_get_active
-										   (LIVES_TOGGLE_BUTTON
-										    (resaudw->aud_checkbutton))))&&
-	  prefs->encoder.audio_codec!=AUDIO_CODEC_NONE&&(arate*achans*asampsize)) {
-	// we only perform this test if we are encoding with audio
-	// find next highest allowed rate from list,
-	// if none are higher, use the highest
-	int allowed_arate;
-	best_arate_delta=1000000000;
-	
-	array=g_strsplit(checks[r],"=",2);
-	numtok=get_token_count (array[1],';');
-	array2=g_strsplit(array[1],";",numtok);
-	for (i=0;i<numtok;i++) {
-	  allowed_arate=atoi (array2[i]);
-	  if (allowed_arate>=arate) {
-	    if (allowed_arate-arate<best_arate_delta) {
-	      best_arate_delta=allowed_arate-arate;
-	      best_arate=allowed_arate;
-	    }
-	  }
-	  else if (allowed_arate>best_arate) best_arate=allowed_arate;
-	}
-	g_strfreev(array2);
-	g_strfreev(array);
-	
-	if (!capable->has_sox_sox) {
-	  do_encoder_sox_error();
-	  g_strfreev(checks);
-	  return FALSE;
-	}
-	continue;
-      }
-      
-      if (!strncmp (checks[r],"hblock=",7)) {
-	// width must be a multiple of this
-	array=g_strsplit(checks[r],"=",2);
-	hblock=atoi (array[1]);
-	width=(int)(width/hblock+.5)*hblock;
-	g_strfreev(array);
-	continue;
-      }
-      
-      if (!strncmp (checks[r],"vblock=",7)) {
-	// height must be a multiple of this
-	array=g_strsplit(checks[r],"=",2);
-	vblock=atoi (array[1]);
-	height=(int)(height/vblock+.5)*vblock;
-	g_strfreev(array);
-	continue;
-      }
-      
-      if (!strncmp (checks[r],"aspect=",7)) {
-	// we calculate the nearest smaller frame size using aspect, 
-	// hblock and vblock
-	calc_aspect=TRUE;
-	array=g_strsplit(checks[r],"=",2);
-	g_snprintf (aspect_buffer,512,"%s",array[1]);
-	g_strfreev(array);
-	continue;
+
+      if (!strncmp(checks[r],"fps=",4)) {
+        double allowed_fps;
+        int mbest_num=0,mbest_denom=0;
+        int numparts;
+        char *fixer;
+
+        best_fps_delta=1000000000.;
+        array=lives_strsplit(checks[r],"=",2);
+        numtok=get_token_count(array[1],';');
+        array2=lives_strsplit(array[1],";",numtok);
+        for (i=0; i<numtok; i++) {
+          mbest_num=mbest_denom=0;
+          if ((numparts=get_token_count(array2[i],':'))>1) {
+            char **array3=lives_strsplit(array2[i],":",2);
+            mbest_num=atoi(array3[0]);
+            mbest_denom=atoi(array3[1]);
+            lives_strfreev(array3);
+            if (mbest_denom==0) continue;
+            allowed_fps=(mbest_num*1.)/(mbest_denom*1.);
+          } else allowed_fps=lives_strtod(array2[i],NULL);
+
+          // convert to 8dp
+          fixer=lives_strdup_printf("%.8f %.8f",allowed_fps,fps);
+          lives_free(fixer);
+
+          if (allowed_fps>=fps) {
+            if (allowed_fps-fps<best_fps_delta) {
+              best_fps_delta=allowed_fps-fps;
+              if (mbest_denom>0) {
+                best_fps_num=mbest_num;
+                best_fps_denom=mbest_denom;
+                best_fps=0.;
+                if (rdet==NULL) cfile->ratio_fps=TRUE;
+                else rdet->ratio_fps=TRUE;
+              } else {
+                best_fps_num=best_fps_denom=0;
+                best_fps=allowed_fps;
+                if (rdet==NULL) cfile->ratio_fps=FALSE;
+                else rdet->ratio_fps=FALSE;
+              }
+            }
+          } else if ((best_fps_denom==0&&allowed_fps>best_fps)||(best_fps_denom>0&&allowed_fps>(best_fps_num*1.)/
+                     (best_fps_denom*1.))) {
+            best_fps_delta=fps-allowed_fps;
+            if (mbest_denom>0) {
+              best_fps_num=mbest_num;
+              best_fps_denom=mbest_denom;
+              best_fps=0.;
+              if (rdet==NULL) cfile->ratio_fps=TRUE;
+              else rdet->ratio_fps=TRUE;
+            } else {
+              best_fps=allowed_fps;
+              best_fps_num=best_fps_denom=0;
+              if (rdet==NULL) cfile->ratio_fps=FALSE;
+              else rdet->ratio_fps=FALSE;
+            }
+          }
+          if (best_fps_delta<(.0005*prefs->ignore_tiny_fps_diffs)) {
+            best_fps_delta=0.;
+            best_fps_denom=best_fps_num=0;
+          }
+          if (best_fps_delta==0.) break;
+        }
+        lives_strfreev(array);
+        lives_strfreev(array2);
+        continue;
+      }
+
+      if (!strncmp(checks[r],"size=",5)) {
+        // TODO - allow list for size
+        array=lives_strsplit(checks[r],"=",2);
+        array2=lives_strsplit(array[1],"x",2);
+        width=atoi(array2[0]);
+        height=atoi(array2[1]);
+        lives_strfreev(array2);
+        lives_strfreev(array);
+        sizer=TRUE;
+        continue;
+      }
+
+      if (!strncmp(checks[r],"minw=",5)) {
+        array=lives_strsplit(checks[r],"=",2);
+        val=atoi(array[1]);
+        if (width<val) width=val;
+        lives_strfreev(array);
+        continue;
+      }
+
+      if (!strncmp(checks[r],"minh=",5)) {
+        array=lives_strsplit(checks[r],"=",2);
+        val=atoi(array[1]);
+        if (height<val) height=val;
+        lives_strfreev(array);
+        continue;
+      }
+
+      if (!strncmp(checks[r],"maxh=",5)) {
+        array=lives_strsplit(checks[r],"=",2);
+        val=atoi(array[1]);
+        if (height>val) height=val;
+        lives_strfreev(array);
+        continue;
+      }
+
+      if (!strncmp(checks[r],"maxw=",5)) {
+        array=lives_strsplit(checks[r],"=",2);
+        val=atoi(array[1]);
+        if (width>val) width=val;
+        lives_strfreev(array);
+        continue;
+      }
+
+
+      if (!strncmp(checks[r],"asigned=",8)&&
+          ((mainw->save_with_sound||rdet!=NULL)&&(resaudw==NULL||
+              resaudw->aud_checkbutton==NULL||
+              lives_toggle_button_get_active
+              (LIVES_TOGGLE_BUTTON(resaudw->aud_checkbutton))))&&
+          prefs->encoder.audio_codec!=AUDIO_CODEC_NONE
+          &&(arate*achans*asampsize)) {
+        array=lives_strsplit(checks[r],"=",2);
+        if (!strcmp(array[1],"signed")) {
+          asigned=1;
+        }
+
+        if (!strcmp(array[1],"unsigned")) {
+          asigned=2;
+        }
+
+        lives_strfreev(array);
+
+        if (asigned!=0&&!capable->has_sox_sox) {
+          do_encoder_sox_error();
+          lives_strfreev(checks);
+          return FALSE;
+        }
+        continue;
+      }
+
+
+      if (!strncmp(checks[r],"arate=",6)&&((mainw->save_with_sound||rdet!=NULL)&&(resaudw==NULL||
+                                           resaudw->aud_checkbutton==NULL||
+                                           lives_toggle_button_get_active
+                                           (LIVES_TOGGLE_BUTTON
+                                            (resaudw->aud_checkbutton))))&&
+          prefs->encoder.audio_codec!=AUDIO_CODEC_NONE&&(arate*achans*asampsize)) {
+        // we only perform this test if we are encoding with audio
+        // find next highest allowed rate from list,
+        // if none are higher, use the highest
+        int allowed_arate;
+        best_arate_delta=1000000000;
+
+        array=lives_strsplit(checks[r],"=",2);
+        numtok=get_token_count(array[1],';');
+        array2=lives_strsplit(array[1],";",numtok);
+        for (i=0; i<numtok; i++) {
+          allowed_arate=atoi(array2[i]);
+          if (allowed_arate>=arate) {
+            if (allowed_arate-arate<best_arate_delta) {
+              best_arate_delta=allowed_arate-arate;
+              best_arate=allowed_arate;
+            }
+          } else if (allowed_arate>best_arate) best_arate=allowed_arate;
+        }
+        lives_strfreev(array2);
+        lives_strfreev(array);
+
+        if (!capable->has_sox_sox) {
+          do_encoder_sox_error();
+          lives_strfreev(checks);
+          return FALSE;
+        }
+        continue;
+      }
+
+      if (!strncmp(checks[r],"hblock=",7)) {
+        // width must be a multiple of this
+        array=lives_strsplit(checks[r],"=",2);
+        hblock=atoi(array[1]);
+        width=(int)(width/hblock+.5)*hblock;
+        lives_strfreev(array);
+        continue;
+      }
+
+      if (!strncmp(checks[r],"vblock=",7)) {
+        // height must be a multiple of this
+        array=lives_strsplit(checks[r],"=",2);
+        vblock=atoi(array[1]);
+        height=(int)(height/vblock+.5)*vblock;
+        lives_strfreev(array);
+        continue;
+      }
+
+      if (!strncmp(checks[r],"aspect=",7)) {
+        // we calculate the nearest smaller frame size using aspect,
+        // hblock and vblock
+        calc_aspect=TRUE;
+        array=lives_strsplit(checks[r],"=",2);
+        lives_snprintf(aspect_buffer,512,"%s",array[1]);
+        lives_strfreev(array);
+        continue;
       }
     }
-    
+
     /// end restrictions
-    g_strfreev(checks);
-    
+    lives_strfreev(checks);
+
     if (!mainw->osc_auto&&calc_aspect&&!sizer) {
       // we calculate this last, after getting hblock and vblock sizes
-      gchar **array3;
+      char **array3;
       double allowed_aspect;
       int xwidth=width;
       int xheight=height;
-      
+
       width=height=1000000;
-      
-      numtok=get_token_count (aspect_buffer,';');
-      array2=g_strsplit(aspect_buffer,";",numtok);
-    
-      // see if we can get a width:height which is nearer an aspect than 
+
+      numtok=get_token_count(aspect_buffer,';');
+      array2=lives_strsplit(aspect_buffer,";",numtok);
+
+      // see if we can get a width:height which is nearer an aspect than
       // current width:height
-      
-      for (i=0;i<numtok;i++) {
-	array3=g_strsplit(array2[i],":",2);
-	allowed_aspect=g_strtod(array3[0],NULL)/g_strtod(array3[1],NULL);
-	g_strfreev(array3);
-	minimise_aspect_delta (allowed_aspect,hblock,vblock,xwidth,xheight,&width,&height);
+
+      for (i=0; i<numtok; i++) {
+        array3=lives_strsplit(array2[i],":",2);
+        allowed_aspect=lives_strtod(array3[0],NULL)/lives_strtod(array3[1],NULL);
+        lives_strfreev(array3);
+        minimise_aspect_delta(allowed_aspect,hblock,vblock,xwidth,xheight,&width,&height);
       }
-      g_strfreev(array2);
-      
+      lives_strfreev(array2);
+
       // allow override if current width and height are integer multiples of blocks
       if (owidth%hblock==0&&oheight%vblock==0) allow_aspect_override=TRUE;
-      
+
       // end recheck
     }
-    
+
     // fps can't be altered if we have a multitrack event_list
     if (mainw->multitrack!=NULL&&mainw->multitrack->event_list!=NULL) best_fps_delta=0.;
-    
+
     if (sizer) allow_aspect_override=FALSE;
-    
+
   }
 
 
@@ -2024,77 +1980,74 @@
     mainw->fx1_bool=FALSE;
     if ((width!=owidth||height!=oheight)&&width*height>0) {
       if (!capable->has_convert&&rdet==NULL&&mainw->fx_candidates[FX_CANDIDATE_RESIZER].delegate==-1) {
-	if (allow_aspect_override) {
-	  width=owidth;
-	  height=oheight;
-	}
-	else {
-	  do_error_dialog (_ ("Unable to resize, please install imageMagick\n"));
-	  return FALSE;
-	}
+        if (allow_aspect_override) {
+          width=owidth;
+          height=oheight;
+        } else {
+          do_error_dialog(_("Unable to resize, please install imageMagick\n"));
+          return FALSE;
+        }
       }
     }
     if (rdet!=NULL&&!rdet->is_encoding) {
-      rdet->arate=(int)atoi (lives_entry_get_text(LIVES_ENTRY(resaudw->entry_arate)));
-      rdet->achans=(int)atoi (lives_entry_get_text(LIVES_ENTRY(resaudw->entry_achans)));
-      rdet->asamps=(int)atoi (lives_entry_get_text(LIVES_ENTRY(resaudw->entry_asamps)));
+      rdet->arate=(int)atoi(lives_entry_get_text(LIVES_ENTRY(resaudw->entry_arate)));
+      rdet->achans=(int)atoi(lives_entry_get_text(LIVES_ENTRY(resaudw->entry_achans)));
+      rdet->asamps=(int)atoi(lives_entry_get_text(LIVES_ENTRY(resaudw->entry_asamps)));
       rdet->aendian=get_signed_endian(lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(resaudw->rb_unsigned)),
-				      lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(resaudw->rb_littleend)));
+                                      lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(resaudw->rb_littleend)));
 
       if (swap_endian||width!=rdet->width||height!=rdet->height||best_fps_delta!=0.||best_arate!=rdet->arate||
-	  ((asigned==1&&(rdet->aendian&AFORM_UNSIGNED))||(asigned==2&&!(rdet->aendian&AFORM_SIGNED)))) {
-      
-	if (rdet_suggest_values(width,height,best_fps,best_fps_num,best_fps_denom,best_arate,asigned,swap_endian,
-				allow_aspect_override,(best_fps_delta==0.))) {
-	  gchar *arate_string;
-	  rdet->width=width;
-	  rdet->height=height;
-	  if (best_arate!=-1) rdet->arate=best_arate;
-	  else lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(resaudw->aud_checkbutton),FALSE);
-
-	  if (asigned==1) lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(resaudw->rb_signed),TRUE);
-	  else if (asigned==2) lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(resaudw->rb_unsigned),TRUE);
-
-	  if (swap_endian) {
-	    if (!lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(resaudw->rb_bigend))) 
-	      lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(resaudw->rb_bigend),TRUE);
-	    else lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(resaudw->rb_littleend),TRUE);
-	  }
-
-	  if (best_fps_delta>0.) {
-	    if (best_fps_denom>0) {
-	      rdet->fps=(best_fps_num*1.)/(best_fps_denom*1.);
-	    }
-	    else rdet->fps=best_fps;
-	    lives_spin_button_set_value(LIVES_SPIN_BUTTON(rdet->spinbutton_fps),rdet->fps);
-	  }
-	  lives_spin_button_set_value(LIVES_SPIN_BUTTON(rdet->spinbutton_width),rdet->width);
-	  lives_spin_button_set_value(LIVES_SPIN_BUTTON(rdet->spinbutton_height),rdet->height);
-	  if (best_arate!=-1) {
-	    arate_string=g_strdup_printf("%d",best_arate);
-	    lives_entry_set_text (LIVES_ENTRY (resaudw->entry_arate),arate_string);
-	    g_free(arate_string);
-	  }
-	  rdet->suggestion_followed=TRUE;
-	  return TRUE;
-	}
+          ((asigned==1&&(rdet->aendian&AFORM_UNSIGNED))||(asigned==2&&!(rdet->aendian&AFORM_SIGNED)))) {
+
+        if (rdet_suggest_values(width,height,best_fps,best_fps_num,best_fps_denom,best_arate,asigned,swap_endian,
+                                allow_aspect_override,(best_fps_delta==0.))) {
+          char *arate_string;
+          rdet->width=width;
+          rdet->height=height;
+          if (best_arate!=-1) rdet->arate=best_arate;
+          else lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(resaudw->aud_checkbutton),FALSE);
+
+          if (asigned==1) lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(resaudw->rb_signed),TRUE);
+          else if (asigned==2) lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(resaudw->rb_unsigned),TRUE);
+
+          if (swap_endian) {
+            if (!lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(resaudw->rb_bigend)))
+              lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(resaudw->rb_bigend),TRUE);
+            else lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(resaudw->rb_littleend),TRUE);
+          }
+
+          if (best_fps_delta>0.) {
+            if (best_fps_denom>0) {
+              rdet->fps=(best_fps_num*1.)/(best_fps_denom*1.);
+            } else rdet->fps=best_fps;
+            lives_spin_button_set_value(LIVES_SPIN_BUTTON(rdet->spinbutton_fps),rdet->fps);
+          }
+          lives_spin_button_set_value(LIVES_SPIN_BUTTON(rdet->spinbutton_width),rdet->width);
+          lives_spin_button_set_value(LIVES_SPIN_BUTTON(rdet->spinbutton_height),rdet->height);
+          if (best_arate!=-1) {
+            arate_string=lives_strdup_printf("%d",best_arate);
+            lives_entry_set_text(LIVES_ENTRY(resaudw->entry_arate),arate_string);
+            lives_free(arate_string);
+          }
+          rdet->suggestion_followed=TRUE;
+          return TRUE;
+        }
       }
       return FALSE;
     }
 
-    if (mainw->osc_auto||do_encoder_restrict_dialog (width,height,best_fps,best_fps_num,best_fps_denom,best_arate,
-						     asigned,swap_endian,allow_aspect_override,save_all)) {
+    if (mainw->osc_auto||do_encoder_restrict_dialog(width,height,best_fps,best_fps_num,best_fps_denom,best_arate,
+        asigned,swap_endian,allow_aspect_override,save_all)) {
       if (!mainw->fx1_bool&&mainw->osc_enc_width==0) {
-	width=owidth;
-	height=oheight;
+        width=owidth;
+        height=oheight;
       }
 
-      if (!auto_resample_resize (width,height,best_fps,best_fps_num,best_fps_denom,best_arate,asigned,swap_endian)) {
-	mainw->fx1_bool=ofx1_bool;
-	return FALSE;
+      if (!auto_resample_resize(width,height,best_fps,best_fps_num,best_fps_denom,best_arate,asigned,swap_endian)) {
+        mainw->fx1_bool=ofx1_bool;
+        return FALSE;
       }
-    }
-    else {
+    } else {
       mainw->fx1_bool=ofx1_bool;
       return FALSE;
     }
@@ -2105,20 +2058,20 @@
 
 
 
-GList *filter_encoders_by_img_ext(GList *encoders, const gchar *img_ext) {
-  GList *encoder_capabilities=NULL;
-  GList *list=encoders,*listnext;
+LiVESList *filter_encoders_by_img_ext(LiVESList *encoders, const char *img_ext) {
+  LiVESList *encoder_capabilities=NULL;
+  LiVESList *list=encoders,*listnext;
   int caps;
 
   register int i;
 
-  char *blacklist[]={
+  char *blacklist[]= {
     NULL,
     NULL
   };
 
   // something broke as of python 2.7.2, and python 3 files now just hang
-  if (capable->python_version<3000000) blacklist[0]=g_strdup("multi_encoder3");
+  if (capable->python_version<3000000) blacklist[0]=lives_strdup("multi_encoder3");
 
   while (list!=NULL) {
     boolean skip=FALSE;
@@ -2128,11 +2081,11 @@
 
     while (blacklist[i]!=NULL) {
       if (strlen((char *)list->data)==strlen(blacklist[i])&&!strcmp((char *)list->data,blacklist[i])) {
-	// skip blacklisted encoders
-	g_free(list->data);
-	encoders=g_list_delete_link(encoders,list);
-	skip=TRUE;
-	break;
+        // skip blacklisted encoders
+        lives_free((livespointer)list->data);
+        encoders=lives_list_delete_link(encoders,list);
+        skip=TRUE;
+        break;
       }
       i++;
     }
@@ -2146,26 +2099,25 @@
       continue;
     }
 
-    if ((encoder_capabilities=plugin_request(PLUGIN_ENCODERS,(gchar *)list->data,"get_capabilities"))==NULL) {
-      g_free(list->data);
-      encoders=g_list_delete_link(encoders,list);
-    }
-    else {
-      caps=atoi ((char *)g_list_nth_data (encoder_capabilities,0));
+    if ((encoder_capabilities=plugin_request(PLUGIN_ENCODERS,(char *)list->data,"get_capabilities"))==NULL) {
+      lives_free((livespointer)list->data);
+      encoders=lives_list_delete_link(encoders,list);
+    } else {
+      caps=atoi((char *)lives_list_nth_data(encoder_capabilities,0));
       if (!(caps&CAN_ENCODE_PNG)&&!strcmp(img_ext,"png")) {
-	g_free(list->data);
-	encoders=g_list_delete_link(encoders,list);
+        lives_free((livespointer)list->data);
+        encoders=lives_list_delete_link(encoders,list);
       }
 
-      g_list_free_strings (encoder_capabilities);
-      g_list_free (encoder_capabilities);
+      lives_list_free_strings(encoder_capabilities);
+      lives_list_free(encoder_capabilities);
 
     }
 
     list=listnext;
   }
 
-  for (i=0;blacklist[i]!=NULL;i++) g_free(blacklist[i]);
+  for (i=0; blacklist[i]!=NULL; i++) lives_free(blacklist[i]);
 
   return encoders;
 
@@ -2177,7 +2129,7 @@
 // decoder plugins
 
 
-LIVES_INLINE boolean decplugin_supports_palette (const lives_decoder_t *dplug, int palette) {
+LIVES_INLINE boolean decplugin_supports_palette(const lives_decoder_t *dplug, int palette) {
   register int i=0;
   int cpal;
   while ((cpal=dplug->cdata->palettes[i++])!=WEED_PALETTE_END) if (cpal==palette) return TRUE;
@@ -2186,18 +2138,18 @@
 
 
 
-static GList *load_decoders(void) {
+static LiVESList *load_decoders(void) {
   lives_decoder_sys_t *dplug;
-  gchar *decplugdir=g_strdup_printf("%s%s%s",prefs->lib_dir,PLUGIN_EXEC_DIR,PLUGIN_DECODERS);
-  GList *dlist=NULL;
+  char *decplugdir=lives_strdup_printf("%s%s%s",prefs->lib_dir,PLUGIN_EXEC_DIR,PLUGIN_DECODERS);
+  LiVESList *dlist=NULL;
 #ifndef IS_MINGW
-  GList *decoder_plugins_o=get_plugin_list (PLUGIN_DECODERS,TRUE,decplugdir,"-so");
+  LiVESList *decoder_plugins_o=get_plugin_list(PLUGIN_DECODERS,TRUE,decplugdir,"-so");
 #else
-  GList *decoder_plugins_o=get_plugin_list (PLUGIN_DECODERS,TRUE,decplugdir,"-dll");
+  LiVESList *decoder_plugins_o=get_plugin_list(PLUGIN_DECODERS,TRUE,decplugdir,"-dll");
 #endif
-  GList *decoder_plugins=decoder_plugins_o;
+  LiVESList *decoder_plugins=decoder_plugins_o;
 
-  char *blacklist[2]={
+  char *blacklist[2]= {
     "zyavformat_decoder",
     NULL
   };
@@ -2210,31 +2162,31 @@
   while (decoder_plugins!=NULL) {
     skip=FALSE;
     dplugname=(char *)decoder_plugins->data;
-    for (i=0;blacklist[i]!=NULL;i++) {
+    for (i=0; blacklist[i]!=NULL; i++) {
       if (!strcmp(dplugname,blacklist[i])) {
-	// skip blacklisted decoders
-	skip=TRUE;
-	break;
+        // skip blacklisted decoders
+        skip=TRUE;
+        break;
       }
     }
     if (!skip) {
-      dplug=open_decoder_plugin((gchar *)decoder_plugins->data);
-      if (dplug!=NULL) dlist=g_list_append(dlist,(gpointer)dplug);
+      dplug=open_decoder_plugin((char *)decoder_plugins->data);
+      if (dplug!=NULL) dlist=lives_list_append(dlist,(livespointer)dplug);
     }
-    g_free(decoder_plugins->data);
+    lives_free((livespointer)decoder_plugins->data);
     decoder_plugins=decoder_plugins->next;
   }
 
-  g_list_free(decoder_plugins_o);
+  lives_list_free(decoder_plugins_o);
 
   if (dlist==NULL) {
-    gchar *msg=g_strdup_printf(_("\n\nNo decoders found in %s !\n"),decplugdir);
+    char *msg=lives_strdup_printf(_("\n\nNo decoders found in %s !\n"),decplugdir);
     LIVES_WARN(msg);
     d_print(msg);
-    g_free(msg);
+    lives_free(msg);
   }
 
-  g_free(decplugdir);
+  lives_free(decplugdir);
   return dlist;
 }
 
@@ -2245,6 +2197,9 @@
     return FALSE;
   }
 
+  // no usable palettes found
+  if (cdata->palettes[0]==WEED_PALETTE_END) return FALSE;
+
   // all checks passed - OK
   return TRUE;
 
@@ -2252,7 +2207,7 @@
 
 
 typedef struct {
-  GList *disabled;
+  LiVESList *disabled;
   lives_decoder_t *dplug;
   lives_clip_t *sfile;
 } tdp_data;
@@ -2266,11 +2221,11 @@
   if (mainw->files[fileno]==NULL||mainw->files[fileno]->ext_src==NULL) return NULL;
 
   cdata=((lives_decoder_sys_t *)((lives_decoder_t *)mainw->files[fileno]->ext_src)->decoder)->get_clip_data
-    (NULL,((lives_decoder_t *)mainw->files[fileno]->ext_src)->cdata);
+        (NULL,((lives_decoder_t *)mainw->files[fileno]->ext_src)->cdata);
 
   if (cdata==NULL) return NULL;
 
-  dplug=(lives_decoder_t *)g_malloc(sizeof(lives_decoder_t));
+  dplug=(lives_decoder_t *)lives_malloc(sizeof(lives_decoder_t));
 
   dpsys=((lives_decoder_t *)mainw->files[fileno]->ext_src)->decoder;
 
@@ -2281,14 +2236,14 @@
 }
 
 
-static lives_decoder_t *try_decoder_plugins(char *file_name, GList *disabled, const lives_clip_data_t *fake_cdata) {
-  lives_decoder_t *dplug=(lives_decoder_t *)g_malloc(sizeof(lives_decoder_t));
-  GList *decoder_plugin=mainw->decoder_list;
+static lives_decoder_t *try_decoder_plugins(char *file_name, LiVESList *disabled, const lives_clip_data_t *fake_cdata) {
+  lives_decoder_t *dplug=(lives_decoder_t *)lives_malloc(sizeof(lives_decoder_t));
+  LiVESList *decoder_plugin=mainw->decoder_list;
 
   while (decoder_plugin!=NULL) {
     lives_decoder_sys_t *dpsys=(lives_decoder_sys_t *)decoder_plugin->data;
 
-    if (lives_list_index(disabled,dpsys->name)!=-1) {
+    if (lives_list_strcmp_index(disabled,dpsys->name)!=-1) {
       // check if (user) disabled this decoder
       decoder_plugin=decoder_plugin->next;
       continue;
@@ -2305,8 +2260,8 @@
       // check for sanity
 
       if (!sanity_check_cdata(dplug->cdata)) {
-	decoder_plugin=decoder_plugin->next;
-	continue;
+        decoder_plugin=decoder_plugin->next;
+        continue;
       }
 
       //////////////////////
@@ -2314,17 +2269,17 @@
       dplug->decoder=dpsys;
 
       if (strncmp(dpsys->name,"zz",2)) {
-	mainw->decoder_list=lives_list_move_to_first(mainw->decoder_list, decoder_plugin);
+        mainw->decoder_list=lives_list_move_to_first(mainw->decoder_list, decoder_plugin);
       }
       break;
     }
     decoder_plugin=decoder_plugin->next;
   }
   if (decoder_plugin==NULL) {
-    g_free(dplug);
+    lives_free(dplug);
     dplug=NULL;
   }
-  
+
   return dplug;
 }
 
@@ -2332,7 +2287,7 @@
 
 
 
-const lives_clip_data_t *get_decoder_cdata(int fileno, GList *disabled, const lives_clip_data_t *fake_cdata) {
+const lives_clip_data_t *get_decoder_cdata(int fileno, LiVESList *disabled, const lives_clip_data_t *fake_cdata) {
   // pass file to each decoder (demuxer) plugin in turn, until we find one that can parse
   // the file
   // NULL is returned if no decoder plugin recognises the file - then we
@@ -2346,23 +2301,22 @@
 
   lives_decoder_t *dplug;
 
-  GList *dlist=NULL,*xdisabled;
+  LiVESList *dlist=NULL,*xdisabled;
 
   lives_clip_t *sfile=mainw->files[fileno];
 
   char decplugname[PATH_MAX];
-  char *msg;
 
   mainw->error=FALSE;
 
-  if (!g_file_test (sfile->file_name, G_FILE_TEST_EXISTS)) {
+  if (!lives_file_test(sfile->file_name, LIVES_FILE_TEST_EXISTS)) {
     mainw->error=TRUE;
     return NULL;
   }
 
   memset(decplugname,0,1);
 
-  // check sfile->file_name against each decoder plugin, 
+  // check sfile->file_name against each decoder plugin,
   // until we get non-NULL cdata
 
   sfile->ext_src=NULL;
@@ -2374,27 +2328,27 @@
     mainw->decoders_loaded=TRUE;
   }
 
-  xdisabled=g_list_copy(disabled);
+  xdisabled=lives_list_copy(disabled);
 
   if (fake_cdata!=NULL) {
     get_clip_value(fileno,CLIP_DETAILS_DECODER_NAME,decplugname,PATH_MAX);
 
     if (strlen(decplugname)) {
-      GList *decoder_plugin=mainw->decoder_list;
+      LiVESList *decoder_plugin=mainw->decoder_list;
       if (!strncmp(decplugname,"zz",2)) {
-	dlist=g_list_copy(mainw->decoder_list);
+        dlist=lives_list_copy(mainw->decoder_list);
       }
-      
+
       while (decoder_plugin!=NULL) {
-	lives_decoder_sys_t *dpsys=(lives_decoder_sys_t *)decoder_plugin->data;
-	if (!strcmp(dpsys->name,decplugname)) {
-	  mainw->decoder_list=lives_list_move_to_first(mainw->decoder_list, decoder_plugin);
-	  break;
-	}
-	decoder_plugin=decoder_plugin->next;
+        lives_decoder_sys_t *dpsys=(lives_decoder_sys_t *)decoder_plugin->data;
+        if (!strcmp(dpsys->name,decplugname)) {
+          mainw->decoder_list=lives_list_move_to_first(mainw->decoder_list, decoder_plugin);
+          break;
+        }
+        decoder_plugin=decoder_plugin->next;
       }
 
-      xdisabled=g_list_remove(disabled,decplugname);
+      xdisabled=lives_list_remove(disabled,decplugname);
     }
   }
 
@@ -2402,19 +2356,17 @@
 
   if (strlen(decplugname)) {
     if (!strncmp(decplugname,"zz",2)) {
-      if (mainw->decoder_list!=NULL) g_list_free(mainw->decoder_list);
+      if (mainw->decoder_list!=NULL) lives_list_free(mainw->decoder_list);
       mainw->decoder_list=dlist;
     }
   }
 
-  if (xdisabled!=NULL) g_list_free(xdisabled);
+  if (xdisabled!=NULL) lives_list_free(xdisabled);
 
   lives_set_cursor_style(LIVES_CURSOR_NORMAL,NULL);
 
   if (dplug!=NULL) {
-    msg=g_strdup_printf(_(" using %s"),dplug->decoder->version());
-    d_print(msg);
-    g_free(msg);
+    d_print(_(" using %s"),dplug->decoder->version());
     sfile->ext_src=dplug;
     return dplug->cdata;
   }
@@ -2429,158 +2381,153 @@
 
 
 // close one instance of dplug
-void close_decoder_plugin (lives_decoder_t *dplug) {
+void close_decoder_plugin(lives_decoder_t *dplug) {
   lives_clip_data_t *cdata;
 
   if (dplug==NULL) return;
 
   cdata=dplug->cdata;
 
-  if (cdata!=NULL) (*dplug->decoder->clip_data_free)(cdata);
+  if (cdata!=NULL)(*dplug->decoder->clip_data_free)(cdata);
 
-  g_free(dplug);
+  lives_free(dplug);
 
 }
 
 
 static void unload_decoder_plugin(lives_decoder_sys_t *dplug) {
-  if (dplug->module_unload!=NULL) (*dplug->module_unload)();
+  if (dplug->module_unload!=NULL)(*dplug->module_unload)();
 
   if (dplug->name!=NULL) {
-    g_free(dplug->name);
+    lives_free(dplug->name);
   }
 
   dlclose(dplug->handle);
-  g_free(dplug);
+  lives_free(dplug);
 }
 
 
 void unload_decoder_plugins(void) {
-  GList *dplugs=mainw->decoder_list;
+  LiVESList *dplugs=mainw->decoder_list;
 
   while (dplugs!=NULL) {
     unload_decoder_plugin((lives_decoder_sys_t *)dplugs->data);
     dplugs=dplugs->next;
   }
 
-  g_list_free(mainw->decoder_list);
+  lives_list_free(mainw->decoder_list);
   mainw->decoder_list=NULL;
   mainw->decoders_loaded=FALSE;
 }
 
 
 
-lives_decoder_sys_t *open_decoder_plugin(const gchar *plname) {
+lives_decoder_sys_t *open_decoder_plugin(const char *plname) {
   lives_decoder_sys_t *dplug;
 
-  gchar *plugname;
+  char *plugname;
   boolean OK=TRUE;
-  const gchar *err;
+  const char *err;
 
   if (!strcmp(plname,"ogg_theora_decoder")) {
     // no longer compatible
     return NULL;
   }
 
-  dplug=(lives_decoder_sys_t *)g_malloc(sizeof(lives_decoder_sys_t));
+  dplug=(lives_decoder_sys_t *)lives_malloc(sizeof(lives_decoder_sys_t));
 
   dplug->name=NULL;
 
 #ifndef IS_MINGW
-  plugname=g_strdup_printf ("%s%s%s/%s.so",prefs->lib_dir,PLUGIN_EXEC_DIR,PLUGIN_DECODERS,plname);
+  plugname=lives_strdup_printf("%s%s%s/%s.so",prefs->lib_dir,PLUGIN_EXEC_DIR,PLUGIN_DECODERS,plname);
 #else
-  plugname=g_strdup_printf ("%s%s%s/%s.dll",prefs->lib_dir,PLUGIN_EXEC_DIR,PLUGIN_DECODERS,plname);
+  plugname=lives_strdup_printf("%s%s%s/%s.dll",prefs->lib_dir,PLUGIN_EXEC_DIR,PLUGIN_DECODERS,plname);
 #endif
 
   dplug->handle=dlopen(plugname,RTLD_LAZY);
-  g_free (plugname);
+  lives_free(plugname);
 
   if (dplug->handle==NULL) {
-    gchar *msg=g_strdup_printf (_("\n\nFailed to open decoder plugin %s\nError was %s\n"),plname,dlerror());
-    d_print(msg);
-    g_free (msg);
-    g_free (dplug);
+    d_print(_("\n\nFailed to open decoder plugin %s\nError was %s\n"),plname,dlerror());
+    lives_free(dplug);
     return NULL;
   }
 
-  if ((dplug->version=(const char* (*)())dlsym (dplug->handle,"version"))==NULL) {
+  if ((dplug->version=(const char* ( *)())dlsym(dplug->handle,"version"))==NULL) {
     OK=FALSE;
   }
-  if ((dplug->get_clip_data=(lives_clip_data_t* (*)(char*, const lives_clip_data_t*)) 
-       dlsym (dplug->handle,"get_clip_data"))==NULL) {
+  if ((dplug->get_clip_data=(lives_clip_data_t* ( *)(char *, const lives_clip_data_t *))
+                            dlsym(dplug->handle,"get_clip_data"))==NULL) {
     OK=FALSE;
   }
-  if ((dplug->get_frame=(boolean (*)(const lives_clip_data_t*, int64_t, int*, int, void**))
-       dlsym (dplug->handle,"get_frame"))==NULL) {
+  if ((dplug->get_frame=(boolean( *)(const lives_clip_data_t *, int64_t, int *, int, void **))
+                        dlsym(dplug->handle,"get_frame"))==NULL) {
     OK=FALSE;
   }
-  if ((dplug->clip_data_free=(void (*)(lives_clip_data_t*))dlsym (dplug->handle,"clip_data_free"))==NULL) {
+  if ((dplug->clip_data_free=(void ( *)(lives_clip_data_t *))dlsym(dplug->handle,"clip_data_free"))==NULL) {
     OK=FALSE;
   }
 
   if (!OK) {
-    gchar *msg=g_strdup_printf (_("\n\nDecoder plugin %s\nis missing a mandatory function.\nUnable to use it.\n"),plname);
-    d_print(msg);
-    g_free (msg);
+    d_print(_("\n\nDecoder plugin %s\nis missing a mandatory function.\nUnable to use it.\n"),plname);
     unload_decoder_plugin(dplug);
-    g_free(dplug);
+    lives_free(dplug);
     return NULL;
   }
 
   // optional
-  dplug->module_check_init=(const char* (*)())dlsym (dplug->handle,"module_check_init");
-  dplug->set_palette=(boolean (*)(lives_clip_data_t *))dlsym (dplug->handle,"set_palette");
-  dplug->module_unload=(void (*)())dlsym (dplug->handle,"module_unload");
-  dplug->rip_audio=(int64_t (*)(const lives_clip_data_t*, const char*, int64_t, int64_t, unsigned char**))
-    dlsym (dplug->handle,"rip_audio");
-  dplug->rip_audio_cleanup=(void (*)(const lives_clip_data_t*))dlsym (dplug->handle,"rip_audio_cleanup");
+  dplug->module_check_init=(const char* ( *)())dlsym(dplug->handle,"module_check_init");
+  dplug->set_palette=(boolean( *)(lives_clip_data_t *))dlsym(dplug->handle,"set_palette");
+  dplug->module_unload=(void ( *)())dlsym(dplug->handle,"module_unload");
+  dplug->rip_audio=(int64_t ( *)(const lives_clip_data_t *, const char *, int64_t, int64_t, unsigned char **))
+                   dlsym(dplug->handle,"rip_audio");
+  dplug->rip_audio_cleanup=(void ( *)(const lives_clip_data_t *))dlsym(dplug->handle,"rip_audio_cleanup");
 
   if (dplug->module_check_init!=NULL) {
     err=(*dplug->module_check_init)();
-    
+
     if (err!=NULL) {
-      g_snprintf(mainw->msg,512,"%s",err);
+      lives_snprintf(mainw->msg,512,"%s",err);
       unload_decoder_plugin(dplug);
-      g_free(dplug);
+      lives_free(dplug);
       return NULL;
     }
   }
 
-  dplug->name=g_strdup(plname);
+  dplug->name=lives_strdup(plname);
   return dplug;
 }
 
 
 
 
-void get_mime_type(gchar *text, int maxlen, const lives_clip_data_t *cdata) {
-  gchar *audname;
-  
-  if (cdata->container_name==NULL||!strlen(cdata->container_name)) g_snprintf(text,40,"%s",_("unknown"));
-  else g_snprintf(text,40,"%s",cdata->container_name);
+void get_mime_type(char *text, int maxlen, const lives_clip_data_t *cdata) {
+  char *audname;
+
+  if (cdata->container_name==NULL||!strlen(cdata->container_name)) lives_snprintf(text,40,"%s",_("unknown"));
+  else lives_snprintf(text,40,"%s",cdata->container_name);
 
   if ((cdata->video_name==NULL||!strlen(cdata->video_name))&&(cdata->audio_name==NULL||!strlen(cdata->audio_name))) return;
 
-  if (cdata->video_name==NULL) g_strappend(text,40,_("/unknown"));
+  if (cdata->video_name==NULL) lives_strappend(text,40,_("/unknown"));
   else {
-    gchar *vidname=g_strdup_printf("/%s",cdata->video_name);
-    g_strappend(text,40,vidname);
-    g_free(vidname);
+    char *vidname=lives_strdup_printf("/%s",cdata->video_name);
+    lives_strappend(text,40,vidname);
+    lives_free(vidname);
   }
 
   if (cdata->audio_name==NULL||!strlen(cdata->audio_name)) {
     if (cfile->achans==0) return;
-    audname=g_strdup_printf("/%s",_("unknown"));
-  }
-  else 
-    audname=g_strdup_printf("/%s",cdata->audio_name);
-  g_strappend(text,40,audname);
-  g_free(audname);
+    audname=lives_strdup_printf("/%s",_("unknown"));
+  } else
+    audname=lives_strdup_printf("/%s",cdata->audio_name);
+  lives_strappend(text,40,audname);
+  lives_free(audname);
 }
 
 
 
-static void dpa_ok_clicked (LiVESButton *button, gpointer user_data) {
+static void dpa_ok_clicked(LiVESButton *button, livespointer user_data) {
   lives_general_button_clicked(button,NULL);
 
   if (prefsw!=NULL) {
@@ -2591,8 +2538,8 @@
   }
 
   if (future_prefs->disabled_decoders!=NULL) {
-    g_list_free_strings(future_prefs->disabled_decoders);
-    g_list_free(future_prefs->disabled_decoders);
+    lives_list_free_strings(future_prefs->disabled_decoders);
+    lives_list_free(future_prefs->disabled_decoders);
   }
 
   future_prefs->disabled_decoders=future_prefs->disabled_decoders_new;
@@ -2600,7 +2547,7 @@
 }
 
 
-static void dpa_cancel_clicked (LiVESButton *button, gpointer user_data) {
+static void dpa_cancel_clicked(LiVESButton *button, livespointer user_data) {
   lives_general_button_clicked(button,NULL);
 
   if (prefsw!=NULL) {
@@ -2609,24 +2556,24 @@
   }
 
   if (future_prefs->disabled_decoders_new!=NULL) {
-    g_list_free_strings(future_prefs->disabled_decoders_new);
-    g_list_free(future_prefs->disabled_decoders_new);
+    lives_list_free_strings(future_prefs->disabled_decoders_new);
+    lives_list_free(future_prefs->disabled_decoders_new);
   }
 
 
 }
 
-static void on_dpa_cb_toggled(LiVESToggleButton *button, gchar *decname) {
+static void on_dpa_cb_toggled(LiVESToggleButton *button, char *decname) {
   if (!lives_toggle_button_get_active(button))
     // unchecked is disabled
-    future_prefs->disabled_decoders_new=g_list_append(future_prefs->disabled_decoders_new,g_strdup(decname));
-  else 
-    future_prefs->disabled_decoders_new=g_list_delete_string(future_prefs->disabled_decoders_new,decname);
+    future_prefs->disabled_decoders_new=lives_list_append(future_prefs->disabled_decoders_new,lives_strdup(decname));
+  else
+    future_prefs->disabled_decoders_new=lives_list_delete_string(future_prefs->disabled_decoders_new,decname);
 }
 
 
-void on_decplug_advanced_clicked (LiVESButton *button, gpointer user_data) {
-  GList *decoder_plugin;
+void on_decplug_advanced_clicked(LiVESButton *button, livespointer user_data) {
+  LiVESList *decoder_plugin;
 
   LiVESWidget *hbox;
   LiVESWidget *vbox;
@@ -2638,8 +2585,8 @@
   LiVESWidget *cancelbutton;
   LiVESWidget *okbutton;
 
-  gchar *ltext;
-  gchar *decplugdir=g_strdup_printf("%s%s%s",prefs->lib_dir,PLUGIN_EXEC_DIR,PLUGIN_DECODERS);
+  char *ltext;
+  char *decplugdir=lives_strdup_printf("%s%s%s",prefs->lib_dir,PLUGIN_EXEC_DIR,PLUGIN_DECODERS);
 
   if (!mainw->decoders_loaded) {
     mainw->decoder_list=load_decoders();
@@ -2648,7 +2595,7 @@
 
   decoder_plugin=mainw->decoder_list;
 
-  dialog = lives_standard_dialog_new (_("LiVES: - Decoder Plugins"),FALSE);
+  dialog = lives_standard_dialog_new(_("LiVES: - Decoder Plugins"),FALSE,DEF_DIALOG_WIDTH,DEF_DIALOG_HEIGHT);
 
   if (prefs->show_gui) {
     if (prefsw!=NULL) lives_window_set_transient_for(LIVES_WINDOW(dialog),LIVES_WINDOW(prefsw->prefs_dialog));
@@ -2660,58 +2607,58 @@
 
   dialog_vbox = lives_dialog_get_content_area(LIVES_DIALOG(dialog));
 
-  vbox = lives_vbox_new (FALSE, 0);
+  vbox = lives_vbox_new(FALSE, 0);
 
-  scrolledwindow = lives_standard_scrolled_window_new (RFX_WINSIZE_H, RFX_WINSIZE_V, vbox);
+  scrolledwindow = lives_standard_scrolled_window_new(RFX_WINSIZE_H, RFX_WINSIZE_V, vbox);
 
-  lives_container_add (LIVES_CONTAINER(dialog_vbox), scrolledwindow);
+  lives_container_add(LIVES_CONTAINER(dialog_vbox), scrolledwindow);
 
   label=lives_standard_label_new(_("Enabled Video Decoders (uncheck to disable)"));
-  lives_box_pack_start (LIVES_BOX (vbox), label, FALSE, FALSE, widget_opts.packing_height);
+  lives_box_pack_start(LIVES_BOX(vbox), label, FALSE, FALSE, widget_opts.packing_height);
 
   while (decoder_plugin!=NULL) {
     lives_decoder_sys_t *dpsys=(lives_decoder_sys_t *)decoder_plugin->data;
-    hbox = lives_hbox_new (FALSE, 0);
-    lives_box_pack_start (LIVES_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
-    ltext=g_strdup_printf("%s   (%s)",dpsys->name,(*dpsys->version)());
+    hbox = lives_hbox_new(FALSE, 0);
+    lives_box_pack_start(LIVES_BOX(vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
+    ltext=lives_strdup_printf("%s   (%s)",dpsys->name,(*dpsys->version)());
 
     checkbutton=lives_standard_check_button_new(ltext,FALSE,LIVES_BOX(hbox),NULL);
 
-    g_free(ltext);
+    lives_free(ltext);
 
     lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(checkbutton),
-				 lives_list_index(future_prefs->disabled_decoders,dpsys->name)==-1);
+                                   lives_list_strcmp_index(future_prefs->disabled_decoders,dpsys->name)==-1);
 
-    lives_signal_connect_after (LIVES_GUI_OBJECT (checkbutton), LIVES_WIDGET_TOGGLED_EVENT,
-			    LIVES_GUI_CALLBACK (on_dpa_cb_toggled),
-			    dpsys->name);
+    lives_signal_connect_after(LIVES_GUI_OBJECT(checkbutton), LIVES_WIDGET_TOGGLED_SIGNAL,
+                               LIVES_GUI_CALLBACK(on_dpa_cb_toggled),
+                               dpsys->name);
 
     decoder_plugin=decoder_plugin->next;
   }
 
 
-  cancelbutton = lives_button_new_from_stock (LIVES_STOCK_CANCEL);
-  lives_dialog_add_action_widget (LIVES_DIALOG (dialog), cancelbutton, LIVES_RESPONSE_CANCEL);
+  cancelbutton = lives_button_new_from_stock(LIVES_STOCK_CANCEL);
+  lives_dialog_add_action_widget(LIVES_DIALOG(dialog), cancelbutton, LIVES_RESPONSE_CANCEL);
 
-  okbutton = lives_button_new_from_stock (LIVES_STOCK_OK);
-  lives_dialog_add_action_widget (LIVES_DIALOG (dialog), okbutton, LIVES_RESPONSE_OK);
-  lives_widget_set_can_focus_and_default (okbutton);
-
-  lives_signal_connect (LIVES_GUI_OBJECT (cancelbutton), LIVES_WIDGET_CLICKED_EVENT,
-		    LIVES_GUI_CALLBACK (dpa_cancel_clicked),
-		    NULL);
-
-  lives_signal_connect (LIVES_GUI_OBJECT (okbutton), LIVES_WIDGET_CLICKED_EVENT,
-		    LIVES_GUI_CALLBACK (dpa_ok_clicked),
-		    NULL);
+  okbutton = lives_button_new_from_stock(LIVES_STOCK_OK);
+  lives_dialog_add_action_widget(LIVES_DIALOG(dialog), okbutton, LIVES_RESPONSE_OK);
+  lives_widget_set_can_focus_and_default(okbutton);
+
+  lives_signal_connect(LIVES_GUI_OBJECT(cancelbutton), LIVES_WIDGET_CLICKED_SIGNAL,
+                       LIVES_GUI_CALLBACK(dpa_cancel_clicked),
+                       NULL);
+
+  lives_signal_connect(LIVES_GUI_OBJECT(okbutton), LIVES_WIDGET_CLICKED_SIGNAL,
+                       LIVES_GUI_CALLBACK(dpa_ok_clicked),
+                       NULL);
 
   lives_widget_show_all(dialog);
-  lives_window_present (LIVES_WINDOW (dialog));
+  lives_window_present(LIVES_WINDOW(dialog));
   lives_xwindow_raise(lives_widget_get_xwindow(dialog));
 
-  future_prefs->disabled_decoders_new=g_list_copy_strings(future_prefs->disabled_decoders);
+  future_prefs->disabled_decoders_new=lives_list_copy_strings(future_prefs->disabled_decoders);
 
-  g_free(decplugdir);
+  lives_free(decplugdir);
 }
 
 ///////////////////////////////////////////////////////
@@ -2719,78 +2666,76 @@
 
 
 
-boolean check_rfx_for_lives (lives_rfx_t *rfx) {
+boolean check_rfx_for_lives(lives_rfx_t *rfx) {
   // check that an RFX is suitable for loading (cf. check_for_lives in effects-weed.c)
   if (rfx->num_in_channels==2&&rfx->props&RFX_PROPS_MAY_RESIZE) {
-    gchar *tmp;
-    d_print ((tmp=g_strdup_printf (_ ("Failed to load %s, transitions may not resize.\n"),rfx->name)));
-    g_free(tmp);
+    d_print(_("Failed to load %s, transitions may not resize.\n"),rfx->name);
     return FALSE;
   }
   return TRUE;
 }
 
 void do_rfx_cleanup(lives_rfx_t *rfx) {
-  gchar *com;
-  gchar *dir=NULL;
+  char *com;
+  char *dir=NULL;
 
   if (rfx==&mainw->rendered_fx[0]) return;
 
   switch (rfx->status) {
   case RFX_STATUS_BUILTIN:
-    dir=g_build_filename(prefs->lib_dir,PLUGIN_EXEC_DIR,NULL);
-    com=g_strdup_printf("%s plugin_clear \"%s\" %d %d \"%s\" \"%s\" \"%s\"",prefs->backend_sync,
-			cfile->handle,cfile->start,cfile->end,dir,
-			PLUGIN_RENDERED_EFFECTS_BUILTIN,rfx->name);
+    dir=lives_build_filename(prefs->lib_dir,PLUGIN_EXEC_DIR,NULL);
+    com=lives_strdup_printf("%s plugin_clear \"%s\" %d %d \"%s\" \"%s\" \"%s\"",prefs->backend_sync,
+                            cfile->handle,cfile->start,cfile->end,dir,
+                            PLUGIN_RENDERED_EFFECTS_BUILTIN,rfx->name);
     break;
   case RFX_STATUS_CUSTOM:
-    dir=g_build_filename(capable->home_dir,LIVES_CONFIG_DIR,NULL);
-    com=g_strdup_printf("%s plugin_clear \"%s\" %d %d \"%s\" \"%s\" \"%s\"",prefs->backend_sync,
-			cfile->handle,cfile->start,cfile->end,dir,
-			PLUGIN_RENDERED_EFFECTS_CUSTOM,rfx->name);
+    dir=lives_build_filename(capable->home_dir,LIVES_CONFIG_DIR,NULL);
+    com=lives_strdup_printf("%s plugin_clear \"%s\" %d %d \"%s\" \"%s\" \"%s\"",prefs->backend_sync,
+                            cfile->handle,cfile->start,cfile->end,dir,
+                            PLUGIN_RENDERED_EFFECTS_CUSTOM,rfx->name);
     break;
   case RFX_STATUS_TEST:
-    dir=g_build_filename(capable->home_dir,LIVES_CONFIG_DIR,NULL);
-    com=g_strdup_printf("%s plugin_clear \"%s\" %d %d \"%s\" \"%s\" \"%s\"",prefs->backend_sync,
-			cfile->handle,cfile->start,cfile->end,dir,
-			PLUGIN_RENDERED_EFFECTS_TEST,rfx->name);
+    dir=lives_build_filename(capable->home_dir,LIVES_CONFIG_DIR,NULL);
+    com=lives_strdup_printf("%s plugin_clear \"%s\" %d %d \"%s\" \"%s\" \"%s\"",prefs->backend_sync,
+                            cfile->handle,cfile->start,cfile->end,dir,
+                            PLUGIN_RENDERED_EFFECTS_TEST,rfx->name);
     break;
   default:
     return;
   }
 
-  if (dir!=NULL) g_free(dir);
+  if (dir!=NULL) lives_free(dir);
 
   // if the command fails we just give a warning
   lives_system(com,FALSE);
 
-  g_free(com);
+  lives_free(com);
 }
 
 
 
 
-void render_fx_get_params (lives_rfx_t *rfx, const gchar *plugin_name, short status) {
+void render_fx_get_params(lives_rfx_t *rfx, const char *plugin_name, short status) {
   // create lives_param_t array from plugin supplied values
-  GList *parameter_list;
+  LiVESList *parameter_list;
   int param_idx,i;
   lives_param_t *cparam;
-  gchar **param_array;
-  gchar *line;
+  char **param_array;
+  char *line;
   int len;
 
   switch (status) {
   case RFX_STATUS_BUILTIN:
-    parameter_list=plugin_request_by_line (PLUGIN_RENDERED_EFFECTS_BUILTIN,plugin_name,"get_parameters");
+    parameter_list=plugin_request_by_line(PLUGIN_RENDERED_EFFECTS_BUILTIN,plugin_name,"get_parameters");
     break;
   case RFX_STATUS_CUSTOM:
-    parameter_list=plugin_request_by_line (PLUGIN_RENDERED_EFFECTS_CUSTOM,plugin_name,"get_parameters");
+    parameter_list=plugin_request_by_line(PLUGIN_RENDERED_EFFECTS_CUSTOM,plugin_name,"get_parameters");
     break;
   case RFX_STATUS_SCRAP:
-    parameter_list=plugin_request_by_line (PLUGIN_RFX_SCRAP,plugin_name,"get_parameters");
+    parameter_list=plugin_request_by_line(PLUGIN_RFX_SCRAP,plugin_name,"get_parameters");
     break;
   default:
-    parameter_list=plugin_request_by_line (PLUGIN_RENDERED_EFFECTS_TEST,plugin_name,"get_parameters");
+    parameter_list=plugin_request_by_line(PLUGIN_RENDERED_EFFECTS_TEST,plugin_name,"get_parameters");
     break;
   }
 
@@ -2801,22 +2746,22 @@
   }
 
   threaded_dialog_spin();
-  rfx->num_params=g_list_length (parameter_list);
-  rfx->params=(lives_param_t *)g_malloc (rfx->num_params*sizeof(lives_param_t));
-  
-  for (param_idx=0;param_idx<rfx->num_params;param_idx++) {
- 
-    line=(gchar *)g_list_nth_data(parameter_list,param_idx);
+  rfx->num_params=lives_list_length(parameter_list);
+  rfx->params=(lives_param_t *)lives_malloc(rfx->num_params*sizeof(lives_param_t));
+
+  for (param_idx=0; param_idx<rfx->num_params; param_idx++) {
 
-    len=get_token_count (line,(unsigned int)rfx->delim[0]);
+    line=(char *)lives_list_nth_data(parameter_list,param_idx);
+
+    len=get_token_count(line,(unsigned int)rfx->delim[0]);
 
     if (len<3) continue;
 
-    param_array=g_strsplit(line,rfx->delim,-1);
+    param_array=lives_strsplit(line,rfx->delim,-1);
 
     cparam=&rfx->params[param_idx];
-    cparam->name=g_strdup (param_array[0]);
-    cparam->label=g_strdup (param_array[1]);
+    cparam->name=lives_strdup(param_array[0]);
+    cparam->label=lives_strdup(param_array[1]);
     cparam->desc=NULL;
     cparam->use_mnemonic=TRUE;
     cparam->interp_func=NULL;
@@ -2836,138 +2781,126 @@
     cparam->special_type_index=0;
 
 #ifdef DEBUG_RENDER_FX_P
-    g_printerr("Got parameter %s\n",cparam->name);
+    lives_printerr("Got parameter %s\n",cparam->name);
 #endif
     cparam->dp=0;
     cparam->list=NULL;
-    
-    if (!strncmp (param_array[2],"num",3)) {
-      cparam->dp=atoi (param_array[2]+3);
+
+    if (!strncmp(param_array[2],"num",3)) {
+      cparam->dp=atoi(param_array[2]+3);
       cparam->type=LIVES_PARAM_NUM;
-    }
-    else if (!strncmp (param_array[2],"bool",4)) {
+    } else if (!strncmp(param_array[2],"bool",4)) {
       cparam->type=LIVES_PARAM_BOOL;
-    }
-    else if (!strncmp (param_array[2],"colRGB24",8)) {
+    } else if (!strncmp(param_array[2],"colRGB24",8)) {
       cparam->type=LIVES_PARAM_COLRGB24;
-    }
-    else if (!strncmp (param_array[2],"string",8)) {
+    } else if (!strncmp(param_array[2],"string",8)) {
       cparam->type=LIVES_PARAM_STRING;
-    }
-    else if (!strncmp (param_array[2],"string_list",8)) {
+    } else if (!strncmp(param_array[2],"string_list",8)) {
       cparam->type=LIVES_PARAM_STRING_LIST;
-    }
-    else continue;
-    
+    } else continue;
+
     if (cparam->dp) {
       double val;
       if (len<6) continue;
-      val=g_strtod (param_array[3],NULL);
-      cparam->value=g_malloc(sizdbl);
-      cparam->def=g_malloc(sizdbl);
+      val=lives_strtod(param_array[3],NULL);
+      cparam->value=lives_malloc(sizdbl);
+      cparam->def=lives_malloc(sizdbl);
       set_double_param(cparam->def,val);
       set_double_param(cparam->value,val);
-      cparam->min=g_strtod (param_array[4],NULL);
-      cparam->max=g_strtod (param_array[5],NULL);
+      cparam->min=lives_strtod(param_array[4],NULL);
+      cparam->max=lives_strtod(param_array[5],NULL);
       if (len>6) {
-	cparam->step_size=g_strtod(param_array[6],NULL);
-	if (cparam->step_size==0.) cparam->step_size=1./(double)lives_10pow(cparam->dp);
-	else if (cparam->step_size<0.) {
-	  cparam->step_size=-cparam->step_size;
-	  cparam->wrap=TRUE;
-	}
+        cparam->step_size=lives_strtod(param_array[6],NULL);
+        if (cparam->step_size==0.) cparam->step_size=1./(double)lives_10pow(cparam->dp);
+        else if (cparam->step_size<0.) {
+          cparam->step_size=-cparam->step_size;
+          cparam->wrap=TRUE;
+        }
       }
-    }
-    else if (cparam->type==LIVES_PARAM_COLRGB24) {
+    } else if (cparam->type==LIVES_PARAM_COLRGB24) {
       short red;
       short green;
       short blue;
       if (len<6) continue;
-      red=(short)atoi (param_array[3]);
-      green=(short)atoi (param_array[4]);
-      blue=(short)atoi (param_array[5]);
-      cparam->value=g_malloc(sizeof(lives_colRGB24_t));
-      cparam->def=g_malloc(sizeof(lives_colRGB24_t));
+      red=(short)atoi(param_array[3]);
+      green=(short)atoi(param_array[4]);
+      blue=(short)atoi(param_array[5]);
+      cparam->value=lives_malloc(sizeof(lives_colRGB24_t));
+      cparam->def=lives_malloc(sizeof(lives_colRGB24_t));
       set_colRGB24_param(cparam->def,red,green,blue);
       set_colRGB24_param(cparam->value,red,green,blue);
-    }
-    else if (cparam->type==LIVES_PARAM_STRING) {
+    } else if (cparam->type==LIVES_PARAM_STRING) {
       if (len<4) continue;
-      cparam->value=g_strdup(_ (param_array[3]));
-      cparam->def=g_strdup(_ (param_array[3]));
-      if (len>4) cparam->max=(double)atoi (param_array[4]);
+      cparam->value=lives_strdup(_(param_array[3]));
+      cparam->def=lives_strdup(_(param_array[3]));
+      if (len>4) cparam->max=(double)atoi(param_array[4]);
       if (cparam->max==0.||cparam->max>RFX_MAXSTRINGLEN) cparam->max=RFX_MAXSTRINGLEN;
-    }
-    else if (cparam->type==LIVES_PARAM_STRING_LIST) {
+    } else if (cparam->type==LIVES_PARAM_STRING_LIST) {
       if (len<4) continue;
-      cparam->value=g_malloc(sizint);
-      cparam->def=g_malloc(sizint);
-      *(int *)cparam->def=atoi (param_array[3]);
+      cparam->value=lives_malloc(sizint);
+      cparam->def=lives_malloc(sizint);
+      *(int *)cparam->def=atoi(param_array[3]);
       if (len>4) {
-	cparam->list=array_to_string_list (param_array,3,len);
+        cparam->list=array_to_string_list(param_array,3,len);
+      } else {
+        set_int_param(cparam->def,0);
       }
-      else {
-	set_int_param (cparam->def,0);
-      }
-      set_int_param (cparam->value,get_int_param (cparam->def));
-    }
-    else {
+      set_int_param(cparam->value,get_int_param(cparam->def));
+    } else {
       // int or bool
       int val;
       if (len<4) continue;
-      val=atoi (param_array[3]);
-      cparam->value=g_malloc(sizint);
-      cparam->def=g_malloc(sizint);
+      val=atoi(param_array[3]);
+      cparam->value=lives_malloc(sizint);
+      cparam->def=lives_malloc(sizint);
       set_int_param(cparam->def,val);
       set_int_param(cparam->value,val);
       if (cparam->type==LIVES_PARAM_BOOL) {
-	cparam->min=0;
-	cparam->max=1;
-	if (len>4) cparam->group=atoi (param_array[4]);
-      }
-      else {
-	if (len<6) continue;
-	cparam->min=(double)atoi (param_array[4]);
-	cparam->max=(double)atoi (param_array[5]);
-	if (len>6) {
-	  cparam->step_size=(double)atoi(param_array[6]);
-	  if (cparam->step_size==0.) cparam->step_size=1.;
-	  else if (cparam->step_size<0.) {
-	    cparam->step_size=-cparam->step_size;
-	    cparam->wrap=TRUE;
-	  }
-	}
+        cparam->min=0;
+        cparam->max=1;
+        if (len>4) cparam->group=atoi(param_array[4]);
+      } else {
+        if (len<6) continue;
+        cparam->min=(double)atoi(param_array[4]);
+        cparam->max=(double)atoi(param_array[5]);
+        if (len>6) {
+          cparam->step_size=(double)atoi(param_array[6]);
+          if (cparam->step_size==0.) cparam->step_size=1.;
+          else if (cparam->step_size<0.) {
+            cparam->step_size=-cparam->step_size;
+            cparam->wrap=TRUE;
+          }
+        }
       }
     }
-    
-    for (i=0;i<MAX_PARAM_WIDGETS;i++) {
+
+    for (i=0; i<MAX_PARAM_WIDGETS; i++) {
       cparam->widgets[i]=NULL;
     }
     cparam->onchange=FALSE;
-    g_strfreev (param_array);
+    lives_strfreev(param_array);
   }
-  g_list_free_strings (parameter_list);
-  g_list_free (parameter_list);
+  lives_list_free_strings(parameter_list);
+  lives_list_free(parameter_list);
   threaded_dialog_spin();
 }
 
 
-GList *array_to_string_list (gchar **array, int offset, int len) {
-  // build a GList from an array.
+LiVESList *array_to_string_list(char **array, int offset, int len) {
+  // build a LiVESList from an array.
   int i;
 
-  gchar *string,*tmp;
-  GList *slist=NULL;
+  char *string,*tmp;
+  LiVESList *slist=NULL;
 
-  for (i=offset+1;i<len;i++) {
-    string=subst ((tmp=L2U8(array[i])),"\\n","\n");
-    g_free(tmp);
+  for (i=offset+1; i<len; i++) {
+    string=subst((tmp=L2U8(array[i])),"\\n","\n");
+    lives_free(tmp);
 
     // omit a last empty string
-    if (i<len-1||strlen (string)) {
-      slist=g_list_append (slist, string);
-    }
-    else g_free(string);
+    if (i<len-1||strlen(string)) {
+      slist=lives_list_append(slist, string);
+    } else lives_free(string);
   }
 
   return slist;
@@ -2975,25 +2908,35 @@
 
 
 
-void sort_rfx_array (lives_rfx_t *in, int num) {
+void sort_rfx_array(lives_rfx_t *in, int num) {
   // sort rfx array into UTF-8 order by menu entry
-  register int i;
-  int start=1,min_val=0;
+#ifdef GUI_QT
+  QString min_string, str;
+#endif
+
+  lives_rfx_t *rfx;
+
+#ifdef GUI_GTK
+  char *min_string=NULL;
+#endif
+  char *tmp=NULL;
+
   boolean used[num];
+
+  int start=1,min_val=0;
   int sorted=1;
-  gchar *min_string=NULL;
-  lives_rfx_t *rfx;
-  gchar *tmp;
 
-  for (i=0;i<num;i++) {
+  register int i;
+
+  for (i=0; i<num; i++) {
     used[i]=FALSE;
   }
 
-  rfx=mainw->rendered_fx=(lives_rfx_t *)g_malloc ((num+1)*sizeof(lives_rfx_t));
+  rfx=mainw->rendered_fx=(lives_rfx_t *)lives_malloc((num+1)*sizeof(lives_rfx_t));
 
-  rfx->name=g_strdup (in[0].name);
-  rfx->menu_text=g_strdup (in[0].menu_text);
-  rfx->action_desc=g_strdup (in[0].action_desc);
+  rfx->name=lives_strdup(in[0].name);
+  rfx->menu_text=lives_strdup(in[0].menu_text);
+  rfx->action_desc=lives_strdup(in[0].action_desc);
   rfx->props=in[0].props;
   rfx->num_params=0;
   rfx->min_frames=1;
@@ -3004,904 +2947,900 @@
   rfx->extra=NULL;
 
   while (sorted<=num) {
-    for (i=start;i<=num;i++) {
+    for (i=start; i<=num; i++) {
       if (!used[i-1]) {
-	if (min_string==NULL) {
-	  min_string=g_utf8_collate_key (in[i].menu_text,-1);
-	  min_val=i;
-	}
-	else {
-	  if (strcmp (min_string,(tmp=g_utf8_collate_key(in[i].menu_text,-1)))==1) {
-	    g_free (min_string);
-	    min_string=g_utf8_collate_key (in[i].menu_text,-1);
-	    min_val=i;
-	  }
-	  g_free(tmp);
-	}
-      }
-    }
-    rfx_copy (&in[min_val],&mainw->rendered_fx[sorted++],FALSE);
-    used[min_val-1]=TRUE;
-    if (min_string!=NULL) g_free (min_string);
-    min_string=NULL;
-  }
-  for (i=0;i<=num;i++) {
-    rfx_free(&in[i]);
-  }
-}
-
-
-void rfx_copy (lives_rfx_t *src, lives_rfx_t *dest, boolean full) {
-  // Warning, does not copy all fields (full will do that)
-  dest->name=g_strdup (src->name);
-  dest->menu_text=g_strdup (src->menu_text);
-  dest->action_desc=g_strdup (src->action_desc);
-  dest->min_frames=src->min_frames;
-  dest->num_in_channels=src->num_in_channels;
-  dest->status=src->status;
-  dest->props=src->props;
-  dest->source_type=src->source_type;
-  dest->source=src->source;
-  dest->is_template=src->is_template;
-  lives_memcpy(dest->delim,src->delim,2);
-  if (!full) return;
-}
-
+        if (min_string==NULL) {
+#ifdef GUI_GTK
+          min_string=g_utf8_collate_key(in[i].menu_text,-1);
+#endif
+#ifdef GUI_QT
+          min_string = QString::fromUtf8(in[i].menu_text);
+#endif
+          min_val=i;
+        } else {
+#ifdef GUI_GTK
+          if (strcmp(min_string,(tmp=g_utf8_collate_key(in[i].menu_text,-1)))==1) {
+            lives_free(min_string);
+            min_string=g_utf8_collate_key(in[i].menu_text,-1);
+#endif
+#ifdef GUI_QT
+            str = QString::fromUtf8(in[i].menu_text);
+            if (str.compare(min_string) < 0) {
+              min_string = str;
+#endif
+              min_val=i;
+            }
+            if (tmp!=NULL) lives_free(tmp);
+          }
+        }
+      }
+      rfx_copy(&in[min_val],&mainw->rendered_fx[sorted++],FALSE);
+      used[min_val-1]=TRUE;
+#ifdef GUI_GTK
+      if (min_string!=NULL) lives_free(min_string);
+      min_string=NULL;
+#endif
+    }
 
-void rfx_params_free(lives_rfx_t *rfx) {
-  register int i;
-  for (i=0;i<rfx->num_params;i++) {
-    if (rfx->params[i].type==LIVES_PARAM_UNDISPLAYABLE) continue;
-    g_free(rfx->params[i].name);
-    if (rfx->params[i].def!=NULL) g_free(rfx->params[i].def);
-    if (rfx->params[i].value!=NULL) g_free(rfx->params[i].value);
-    if (rfx->params[i].label!=NULL) g_free(rfx->params[i].label);
-    if (rfx->params[i].desc!=NULL) g_free(rfx->params[i].desc);
-    if (rfx->params[i].list!=NULL) {
-      g_list_free_strings(rfx->params[i].list);
-      g_list_free(rfx->params[i].list);
+    for (i=0; i<=num; i++) {
+      rfx_free(&in[i]);
     }
   }
-}
-
 
 
-void rfx_free(lives_rfx_t *rfx) {
-  if (mainw->vrfx_update==rfx) mainw->vrfx_update=NULL;
+  void rfx_copy(lives_rfx_t *src, lives_rfx_t *dest, boolean full) {
+    // Warning, does not copy all fields (full will do that)
+    dest->name=lives_strdup(src->name);
+    dest->menu_text=lives_strdup(src->menu_text);
+    dest->action_desc=lives_strdup(src->action_desc);
+    dest->min_frames=src->min_frames;
+    dest->num_in_channels=src->num_in_channels;
+    dest->status=src->status;
+    dest->props=src->props;
+    dest->source_type=src->source_type;
+    dest->source=src->source;
+    dest->is_template=src->is_template;
+    lives_memcpy(dest->delim,src->delim,2);
+    if (!full) return;
+  }
 
-  if (rfx->name!=NULL) g_free(rfx->name);
-  if (rfx->menu_text!=NULL) g_free(rfx->menu_text);
-  if (rfx->action_desc!=NULL) g_free(rfx->action_desc);
 
-  if (rfx->params!=NULL) {
-    rfx_params_free(rfx);
-    g_free(rfx->params);
-  }
-  if (rfx->extra!=NULL) {
-    free(rfx->extra);
-  }
-  if (rfx->source_type==LIVES_RFX_SOURCE_WEED&&rfx->source!=NULL) {
-    weed_instance_unref((weed_plant_t *)rfx->source);
+  void rfx_params_free(lives_rfx_t *rfx) {
+    register int i;
+    for (i=0; i<rfx->num_params; i++) {
+      if (rfx->params[i].type==LIVES_PARAM_UNDISPLAYABLE) continue;
+      lives_free(rfx->params[i].name);
+      if (rfx->params[i].def!=NULL) lives_free(rfx->params[i].def);
+      if (rfx->params[i].value!=NULL) lives_free(rfx->params[i].value);
+      if (rfx->params[i].label!=NULL) lives_free(rfx->params[i].label);
+      if (rfx->params[i].desc!=NULL) lives_free(rfx->params[i].desc);
+      if (rfx->params[i].list!=NULL) {
+        lives_list_free_strings(rfx->params[i].list);
+        lives_list_free(rfx->params[i].list);
+      }
+    }
   }
-}
 
 
-void rfx_free_all (void) {
-  register int i;
-  for (i=0;i<=mainw->num_rendered_effects_builtin+mainw->num_rendered_effects_custom+mainw->num_rendered_effects_test;i++) {
-    rfx_free(&mainw->rendered_fx[i]);
-  }
-  g_free(mainw->rendered_fx);
-  mainw->rendered_fx=NULL;
-}
 
+  void rfx_free(lives_rfx_t *rfx) {
+    if (mainw->vrfx_update==rfx) mainw->vrfx_update=NULL;
 
-void param_copy (lives_param_t *src, lives_param_t *dest, boolean full) {
-  // rfxbuilder.c uses this to copy params to a temporary copy and back again
-
-  dest->name=g_strdup (src->name);
-  dest->label=g_strdup (src->label);
-  dest->group=src->group;
-  dest->onchange=src->onchange;
-  dest->type=src->type;
-  dest->dp=src->dp;
-  dest->min=src->min;
-  dest->max=src->max;
-  dest->step_size=src->step_size;
-  dest->wrap=src->wrap;
-  dest->source=src->source;
-  dest->reinit=src->reinit;
-  dest->source_type=src->source_type;
-  dest->list=NULL;
-
-  switch (dest->type) {
-  case LIVES_PARAM_BOOL:
-    dest->dp=0;
-  case LIVES_PARAM_NUM:
-    if (!dest->dp) {
-      dest->def=g_malloc (sizint);
-      lives_memcpy (dest->def,src->def,sizint);
+    if (rfx->name!=NULL) lives_free(rfx->name);
+    if (rfx->menu_text!=NULL) lives_free(rfx->menu_text);
+    if (rfx->action_desc!=NULL) lives_free(rfx->action_desc);
+
+    if (rfx->params!=NULL) {
+      rfx_params_free(rfx);
+      lives_free(rfx->params);
     }
-    else {
-      dest->def=g_malloc (sizdbl);
-      lives_memcpy (dest->def,src->def,sizdbl);
+    if (rfx->extra!=NULL) {
+      free(rfx->extra);
+    }
+    if (rfx->source_type==LIVES_RFX_SOURCE_WEED&&rfx->source!=NULL) {
+      weed_instance_unref((weed_plant_t *)rfx->source);
     }
-    break;
-  case LIVES_PARAM_COLRGB24:
-    dest->def=g_malloc (sizeof(lives_colRGB24_t));
-    lives_memcpy (dest->def,src->def,sizeof(lives_colRGB24_t));
-    break;
-  case LIVES_PARAM_STRING:
-    dest->def=g_strdup ((gchar *)src->def);
-    break;
-  case LIVES_PARAM_STRING_LIST:
-    dest->def=g_malloc (sizint);
-    set_int_param (dest->def,get_int_param (src->def));
-    if (src->list!=NULL) dest->list=g_list_copy (src->list);
-    break;
-  default:
-    break;
   }
-  if (!full) return;
-  // TODO - copy value, copy widgets
 
-}
-
-boolean get_bool_param(void *value) {
-  boolean ret;
-  lives_memcpy(&ret,value,4);
-  return ret;
-}
-
-int get_int_param(void *value) {
-  int ret;
-  lives_memcpy(&ret,value,sizint);
-  return ret;
-}
-
-double get_double_param(void *value) {
-  double ret;
-  lives_memcpy(&ret,value,sizdbl);
-  return ret;
-}
 
-void get_colRGB24_param(void *value, lives_colRGB24_t *rgb) {
-  lives_memcpy(rgb,value,sizeof(lives_colRGB24_t));
-}
-
-void get_colRGBA32_param(void *value, lives_colRGBA32_t *rgba) {
-  lives_memcpy(rgba,value,sizeof(lives_colRGBA32_t));
-}
+  void rfx_free_all(void) {
+    register int i;
+    for (i=0; i<=mainw->num_rendered_effects_builtin+mainw->num_rendered_effects_custom+mainw->num_rendered_effects_test; i++) {
+      rfx_free(&mainw->rendered_fx[i]);
+    }
+    lives_free(mainw->rendered_fx);
+    mainw->rendered_fx=NULL;
+  }
 
-void set_bool_param(void *value, boolean _const) {
-  set_int_param(value,!!_const);
-}
 
-void set_int_param(void *value, int _const) {
-  lives_memcpy(value,&_const,sizint);
-}
-void set_double_param(void *value, double _const) {
-  lives_memcpy(value,&_const,sizdbl);
+  void param_copy(lives_param_t *src, lives_param_t *dest, boolean full) {
+    // rfxbuilder.c uses this to copy params to a temporary copy and back again
+
+    dest->name=lives_strdup(src->name);
+    dest->label=lives_strdup(src->label);
+    dest->group=src->group;
+    dest->onchange=src->onchange;
+    dest->type=src->type;
+    dest->dp=src->dp;
+    dest->min=src->min;
+    dest->max=src->max;
+    dest->step_size=src->step_size;
+    dest->wrap=src->wrap;
+    dest->source=src->source;
+    dest->reinit=src->reinit;
+    dest->source_type=src->source_type;
+    dest->list=NULL;
+
+    switch (dest->type) {
+    case LIVES_PARAM_BOOL:
+      dest->dp=0;
+    case LIVES_PARAM_NUM:
+      if (!dest->dp) {
+        dest->def=lives_malloc(sizint);
+        lives_memcpy(dest->def,src->def,sizint);
+      } else {
+        dest->def=lives_malloc(sizdbl);
+        lives_memcpy(dest->def,src->def,sizdbl);
+      }
+      break;
+    case LIVES_PARAM_COLRGB24:
+      dest->def=lives_malloc(sizeof(lives_colRGB24_t));
+      lives_memcpy(dest->def,src->def,sizeof(lives_colRGB24_t));
+      break;
+    case LIVES_PARAM_STRING:
+      dest->def=lives_strdup((char *)src->def);
+      break;
+    case LIVES_PARAM_STRING_LIST:
+      dest->def=lives_malloc(sizint);
+      set_int_param(dest->def,get_int_param(src->def));
+      if (src->list!=NULL) dest->list=lives_list_copy(src->list);
+      break;
+    default:
+      break;
+    }
+    if (!full) return;
+    // TODO - copy value, copy widgets
 
-}
+  }
 
-void set_colRGB24_param(void *value, short red, short green, short blue) {
-  lives_colRGB24_t *rgbp=(lives_colRGB24_t *)value;
+  boolean get_bool_param(void *value) {
+    boolean ret;
+    lives_memcpy(&ret,value,4);
+    return ret;
+  }
 
-  if (red<0) red=0;
-  if (red>255) red=255;
-  if (green<0) green=0;
-  if (green>255) green=255;
-  if (blue<0) blue=0;
-  if (blue>255) blue=255;
+  int get_int_param(void *value) {
+    int ret;
+    lives_memcpy(&ret,value,sizint);
+    return ret;
+  }
 
-  rgbp->red=red;
-  rgbp->green=green;
-  rgbp->blue=blue;
+  double get_double_param(void *value) {
+    double ret;
+    lives_memcpy(&ret,value,sizdbl);
+    return ret;
+  }
 
-}
+  void get_colRGB24_param(void *value, lives_colRGB24_t *rgb) {
+    lives_memcpy(rgb,value,sizeof(lives_colRGB24_t));
+  }
 
-void set_colRGBA32_param(void *value, short red, short green, short blue, short alpha) {
-  lives_colRGBA32_t *rgbap=(lives_colRGBA32_t *)value;
-  rgbap->red=red;
-  rgbap->green=green;
-  rgbap->blue=blue;
-  rgbap->alpha=alpha;
-}
+  void get_colRGBA32_param(void *value, lives_colRGBA32_t *rgba) {
+    lives_memcpy(rgba,value,sizeof(lives_colRGBA32_t));
+  }
 
+  void set_bool_param(void *value, boolean _const) {
+    set_int_param(value,!!_const);
+  }
 
+  void set_int_param(void *value, int _const) {
+    lives_memcpy(value,&_const,sizint);
+  }
+  void set_double_param(void *value, double _const) {
+    lives_memcpy(value,&_const,sizdbl);
 
+  }
 
-///////////////////////////////////////////////////////////////
+  void set_colRGB24_param(void *value, short red, short green, short blue) {
+    lives_colRGB24_t *rgbp=(lives_colRGB24_t *)value;
 
+    if (red<0) red=0;
+    if (red>255) red=255;
+    if (green<0) green=0;
+    if (green>255) green=255;
+    if (blue<0) blue=0;
+    if (blue>255) blue=255;
 
+    rgbp->red=red;
+    rgbp->green=green;
+    rgbp->blue=blue;
 
-int find_rfx_plugin_by_name (const gchar *name, short status) {
-  int i;
-  for (i=1;i<mainw->num_rendered_effects_builtin+mainw->num_rendered_effects_custom+
-	 mainw->num_rendered_effects_test;i++) {
-    if (mainw->rendered_fx[i].name!=NULL&&!strcmp (mainw->rendered_fx[i].name,name)
-	&&mainw->rendered_fx[i].status==status) 
-      return (int)i;
   }
-  return -1;
-}
-
 
+  void set_colRGBA32_param(void *value, short red, short green, short blue, short alpha) {
+    lives_colRGBA32_t *rgbap=(lives_colRGBA32_t *)value;
+    rgbap->red=red;
+    rgbap->green=green;
+    rgbap->blue=blue;
+    rgbap->alpha=alpha;
+  }
 
-lives_param_t *weed_params_to_rfx(int npar, weed_plant_t *inst, boolean show_reinits) {
-  int i,j;
-  lives_param_t *rpar=(lives_param_t *)g_malloc(npar*sizeof(lives_param_t));
-  int param_hint;
-  char **list;
-  GList *gtk_list=NULL;
-  gchar *string;
-  int error;
-  int vali;
-  double vald;
-  weed_plant_t *gui=NULL;
-  int listlen;
-  int cspace,*cols=NULL,red_min=0,red_max=255,green_min=0,green_max=255,blue_min=0,blue_max=255,*maxi=NULL,*mini=NULL;
-  double *colsd;
-  double red_mind=0.,red_maxd=1.,green_mind=0.,green_maxd=1.,blue_mind=0.,blue_maxd=1.,*maxd=NULL,*mind=NULL;
-  int flags=0;
-  int nwpars=0,poffset=0;
-  boolean col_int;
-
-  weed_plant_t *wtmpl;
-  weed_plant_t **wpars=NULL,*wpar=NULL;
-
-  weed_plant_t *chann,*ctmpl;
-
-  if (weed_plant_has_leaf(inst,"in_parameters")) nwpars=weed_leaf_num_elements(inst,"in_parameters");
-  if (nwpars>0) wpars=weed_get_plantptr_array(inst,"in_parameters",&error);
-
-  for (i=0;i<npar;i++) {
-    if (i-poffset>=nwpars) {
-      // handling for compound fx
-      poffset+=nwpars;
-      if (wpars!=NULL) weed_free(wpars);
-      inst=weed_get_plantptr_value(inst,"host_next_instance",&error);
-      if (weed_plant_has_leaf(inst,"in_parameters")) nwpars=weed_leaf_num_elements(inst,"in_parameters");
-      else nwpars=0;
-      if (nwpars>0) wpars=weed_get_plantptr_array(inst,"in_parameters",&error);
-      else wpars=NULL;
-      i--;
-      continue;
-    }
 
-    wpar=wpars[i-poffset];
-    wtmpl=weed_get_plantptr_value(wpar,"template",&error);
 
-    if (weed_plant_has_leaf(wtmpl,"flags")) flags=weed_get_int_value(wtmpl,"flags",&error);
-    else flags=0;
 
-    rpar[i].flags=flags;
+  ///////////////////////////////////////////////////////////////
 
-    gui=NULL;
 
-    if (weed_plant_has_leaf(wtmpl,"gui")) gui=weed_get_plantptr_value(wtmpl,"gui",&error);
 
-    rpar[i].group=0;
+  int find_rfx_plugin_by_name(const char *name, short status) {
+    int i;
+    for (i=1; i<mainw->num_rendered_effects_builtin+mainw->num_rendered_effects_custom+
+         mainw->num_rendered_effects_test; i++) {
+      if (mainw->rendered_fx[i].name!=NULL&&!strcmp(mainw->rendered_fx[i].name,name)
+          &&mainw->rendered_fx[i].status==status)
+        return (int)i;
+    }
+    return -1;
+  }
+
+
+
+  lives_param_t *weed_params_to_rfx(int npar, weed_plant_t *inst, boolean show_reinits) {
+    int i,j;
+    lives_param_t *rpar=(lives_param_t *)lives_malloc(npar*sizeof(lives_param_t));
+    int param_hint;
+    char **list;
+    LiVESList *gtk_list=NULL;
+    char *string;
+    int error;
+    int vali;
+    double vald;
+    weed_plant_t *gui=NULL;
+    int listlen;
+    int cspace,*cols=NULL,red_min=0,red_max=255,green_min=0,green_max=255,blue_min=0,blue_max=255,*maxi=NULL,*mini=NULL;
+    double *colsd;
+    double red_mind=0.,red_maxd=1.,green_mind=0.,green_maxd=1.,blue_mind=0.,blue_maxd=1.,*maxd=NULL,*mind=NULL;
+    int flags=0;
+    int nwpars=0,poffset=0;
+    boolean col_int;
+
+    weed_plant_t *wtmpl;
+    weed_plant_t **wpars=NULL,*wpar=NULL;
+
+    weed_plant_t *chann,*ctmpl;
+
+    if (weed_plant_has_leaf(inst,"in_parameters")) nwpars=weed_leaf_num_elements(inst,"in_parameters");
+    if (nwpars>0) wpars=weed_get_plantptr_array(inst,"in_parameters",&error);
+
+    for (i=0; i<npar; i++) {
+      if (i-poffset>=nwpars) {
+        // handling for compound fx
+        poffset+=nwpars;
+        if (wpars!=NULL) lives_free(wpars);
+        inst=weed_get_plantptr_value(inst,"host_next_instance",&error);
+        if (weed_plant_has_leaf(inst,"in_parameters")) nwpars=weed_leaf_num_elements(inst,"in_parameters");
+        else nwpars=0;
+        if (nwpars>0) wpars=weed_get_plantptr_array(inst,"in_parameters",&error);
+        else wpars=NULL;
+        i--;
+        continue;
+      }
+
+      wpar=wpars[i-poffset];
+      wtmpl=weed_get_plantptr_value(wpar,"template",&error);
+
+      if (weed_plant_has_leaf(wtmpl,"flags")) flags=weed_get_int_value(wtmpl,"flags",&error);
+      else flags=0;
+
+      rpar[i].flags=flags;
 
-    rpar[i].use_mnemonic=FALSE;
-    rpar[i].interp_func=rpar[i].display_func=NULL;
-    rpar[i].hidden=0;
-    rpar[i].step_size=1.;
-    rpar[i].transition=FALSE;
-    rpar[i].wrap=FALSE;
-    rpar[i].reinit=FALSE;
-    rpar[i].change_blocked=FALSE;
-    rpar[i].source=wtmpl;
-    rpar[i].source_type=LIVES_RFX_SOURCE_WEED;
-    rpar[i].special_type=LIVES_PARAM_SPECIAL_TYPE_NONE;
-    rpar[i].special_type_index=0;
+      gui=NULL;
 
-    if (flags&WEED_PARAMETER_VARIABLE_ELEMENTS&&!(flags&WEED_PARAMETER_ELEMENT_PER_CHANNEL)) {
-      rpar[i].hidden|=HIDDEN_MULTI;
-      rpar[i].multi=PVAL_MULTI_ANY;
-    }
-    else if (flags&WEED_PARAMETER_ELEMENT_PER_CHANNEL) {
-      rpar[i].hidden|=HIDDEN_MULTI;
-      rpar[i].multi=PVAL_MULTI_PER_CHANNEL;
-    }
-    else rpar[i].multi=PVAL_MULTI_NONE;
+      if (weed_plant_has_leaf(wtmpl,"gui")) gui=weed_get_plantptr_value(wtmpl,"gui",&error);
 
-    chann=get_enabled_channel(inst,0,TRUE);
-    ctmpl=weed_get_plantptr_value(chann,"template",&error);
+      rpar[i].group=0;
 
-    if (weed_plant_has_leaf(ctmpl,"is_audio")&&weed_get_boolean_value(ctmpl,"is_audio",&error)==WEED_TRUE) {
-      // dont hide multivalued params for audio effects
+      rpar[i].use_mnemonic=FALSE;
+      rpar[i].interp_func=rpar[i].display_func=NULL;
       rpar[i].hidden=0;
-    }
-
-    rpar[i].dp=0;
-    rpar[i].min=0.;
-    rpar[i].max=0.;
-    rpar[i].list=NULL;
-
-    if (flags&WEED_PARAMETER_REINIT_ON_VALUE_CHANGE) {
-      rpar[i].reinit=TRUE;
-      if (!show_reinits) rpar[i].hidden|=HIDDEN_NEEDS_REINIT;
-    }
-    else rpar[i].reinit=FALSE;
-
-    // hide internally connected params for compound fx
-    if (weed_plant_has_leaf(wpar,"host_internal_connection")) rpar[i].hidden|=HIDDEN_COMPOUND_INTERNAL;
-
-    ///////////////////////////////
-    param_hint=weed_get_int_value(wtmpl,"hint",&error);
-
-    switch (param_hint) {
-    case WEED_HINT_SWITCH:
-      if (weed_plant_has_leaf(wtmpl,"default")&&weed_leaf_num_elements(wtmpl,"default")>1) {
-	rpar[i].hidden|=HIDDEN_MULTI;
-      }
-      rpar[i].type=LIVES_PARAM_BOOL;
-      rpar[i].value=g_malloc(sizint);
-      rpar[i].def=g_malloc(sizint);
-      if (weed_plant_has_leaf(wtmpl,"host_default")) vali=weed_get_boolean_value(wtmpl,"host_default",&error); 
-      else if (weed_leaf_num_elements(wtmpl,"default")>0) vali=weed_get_boolean_value(wtmpl,"default",&error);
-      else vali=weed_get_boolean_value(wtmpl,"new_default",&error);
-      set_int_param(rpar[i].def,vali);
-      vali=weed_get_boolean_value(wpar,"value",&error);
-      set_int_param(rpar[i].value,vali);
-      if (weed_plant_has_leaf(wtmpl,"group")) rpar[i].group=weed_get_int_value(wtmpl,"group",&error);
-      break;
-    case WEED_HINT_INTEGER:
-      if (weed_plant_has_leaf(wtmpl,"default")&&weed_leaf_num_elements(wtmpl,"default")>1) {
-	rpar[i].hidden|=HIDDEN_MULTI;
-      }
-      rpar[i].type=LIVES_PARAM_NUM;
-      rpar[i].value=g_malloc(sizint);
-      rpar[i].def=g_malloc(sizint);
-      if (weed_plant_has_leaf(wtmpl,"host_default")) {
-	vali=weed_get_int_value(wtmpl,"host_default",&error);
-      }
-      else if (weed_leaf_num_elements(wtmpl,"default")>0) vali=weed_get_int_value(wtmpl,"default",&error);
-      else vali=weed_get_int_value(wtmpl,"new_default",&error);
-      set_int_param(rpar[i].def,vali);
-      vali=weed_get_int_value(wpar,"value",&error);
-      set_int_param(rpar[i].value,vali);
-      rpar[i].min=(double)weed_get_int_value(wtmpl,"min",&error);
-      rpar[i].max=(double)weed_get_int_value(wtmpl,"max",&error);
-      if (weed_plant_has_leaf(wtmpl,"wrap")&&weed_get_boolean_value(wtmpl,"wrap",&error)==WEED_TRUE) rpar[i].wrap=TRUE;
-      if (gui!=NULL) {
-	if (weed_plant_has_leaf(gui,"choices")) {
-	  listlen=weed_leaf_num_elements(gui,"choices");
-	  list=weed_get_string_array(gui,"choices",&error);
-	  for (j=0;j<listlen;j++) {
-	    gtk_list=g_list_append(gtk_list,g_strdup(list[j]));
-	    weed_free(list[j]);
-	  }
-	  weed_free(list);
-	  rpar[i].list=g_list_copy(gtk_list);
-	  g_list_free(gtk_list);
-	  gtk_list=NULL;
-	  rpar[i].type=LIVES_PARAM_STRING_LIST;
-	  rpar[i].max=listlen;
-	}
-	else if (weed_plant_has_leaf(gui,"step_size")) 
-	  rpar[i].step_size=(double)weed_get_int_value(gui,"step_size",&error);
-	if (rpar[i].step_size==0.) rpar[i].step_size=1.;
+      rpar[i].step_size=1.;
+      rpar[i].transition=FALSE;
+      rpar[i].wrap=FALSE;
+      rpar[i].reinit=FALSE;
+      rpar[i].change_blocked=FALSE;
+      rpar[i].source=wtmpl;
+      rpar[i].source_type=LIVES_RFX_SOURCE_WEED;
+      rpar[i].special_type=LIVES_PARAM_SPECIAL_TYPE_NONE;
+      rpar[i].special_type_index=0;
+
+      if (flags&WEED_PARAMETER_VARIABLE_ELEMENTS&&!(flags&WEED_PARAMETER_ELEMENT_PER_CHANNEL)) {
+        rpar[i].hidden|=HIDDEN_MULTI;
+        rpar[i].multi=PVAL_MULTI_ANY;
+      } else if (flags&WEED_PARAMETER_ELEMENT_PER_CHANNEL) {
+        rpar[i].hidden|=HIDDEN_MULTI;
+        rpar[i].multi=PVAL_MULTI_PER_CHANNEL;
+      } else rpar[i].multi=PVAL_MULTI_NONE;
+
+      chann=get_enabled_channel(inst,0,TRUE);
+      ctmpl=weed_get_plantptr_value(chann,"template",&error);
+
+      if (weed_plant_has_leaf(ctmpl,"is_audio")&&weed_get_boolean_value(ctmpl,"is_audio",&error)==WEED_TRUE) {
+        // dont hide multivalued params for audio effects
+        rpar[i].hidden=0;
       }
-      break;
-    case WEED_HINT_FLOAT:
-      if (weed_plant_has_leaf(wtmpl,"default")&&weed_leaf_num_elements(wtmpl,"default")>1) {
-	rpar[i].hidden|=HIDDEN_MULTI;
-      }
-      rpar[i].type=LIVES_PARAM_NUM;
-      rpar[i].value=g_malloc(sizdbl);
-      rpar[i].def=g_malloc(sizdbl);
-      if (weed_plant_has_leaf(wtmpl,"host_default")) vald=weed_get_double_value(wtmpl,"host_default",&error); 
-      else if (weed_leaf_num_elements(wtmpl,"default")>0) vald=weed_get_double_value(wtmpl,"default",&error);
-      else vald=weed_get_double_value(wtmpl,"new_default",&error);
-      set_double_param(rpar[i].def,vald);
-      vald=weed_get_double_value(wpar,"value",&error);
-      set_double_param(rpar[i].value,vald);
-      rpar[i].min=weed_get_double_value(wtmpl,"min",&error);
-      rpar[i].max=weed_get_double_value(wtmpl,"max",&error);
-      if (weed_plant_has_leaf(wtmpl,"wrap")&&weed_get_boolean_value(wtmpl,"wrap",&error)==WEED_TRUE) rpar[i].wrap=TRUE;
-      rpar[i].step_size=0.;
-      rpar[i].dp=2;
-      if (gui!=NULL) {
-	if (weed_plant_has_leaf(gui,"step_size")) rpar[i].step_size=weed_get_double_value(gui,"step_size",&error);
-	if (weed_plant_has_leaf(gui,"decimals")) rpar[i].dp=weed_get_int_value(gui,"decimals",&error);
-      }
-      if (rpar[i].step_size==0.) {
-	if (rpar[i].max-rpar[i].min>1.) rpar[i].step_size=1.;
-	else rpar[i].step_size=1./(double)lives_10pow(rpar[i].dp);
-      }
-      break;
-    case WEED_HINT_TEXT:
-      if (weed_plant_has_leaf(wtmpl,"default")&&weed_leaf_num_elements(wtmpl,"default")>1) {
-	rpar[i].hidden|=HIDDEN_MULTI;
-      }
-      rpar[i].type=LIVES_PARAM_STRING;
-      if (weed_plant_has_leaf(wtmpl,"host_default")) string=weed_get_string_value(wtmpl,"host_default",&error); 
-      else if (weed_leaf_num_elements(wtmpl,"default")>0) string=weed_get_string_value(wtmpl,"default",&error);
-      else string=weed_get_string_value(wtmpl,"new_default",&error);
-      rpar[i].def=g_strdup(string);
-      weed_free(string);
-      string=weed_get_string_value(wpar,"value",&error);
-      rpar[i].value=g_strdup(string);
-      weed_free(string);
+
+      rpar[i].dp=0;
+      rpar[i].min=0.;
       rpar[i].max=0.;
-      if (gui!=NULL&&weed_plant_has_leaf(gui,"maxchars")) {
-	rpar[i].max=(double)weed_get_int_value(gui,"maxchars",&error);
-	if (rpar[i].max<0.) rpar[i].max=0.;
-      }
-      break;
-    case WEED_HINT_COLOR:
-      cspace=weed_get_int_value(wtmpl,"colorspace",&error);
-      switch (cspace) {
-      case WEED_COLORSPACE_RGB:
-	if (weed_leaf_num_elements(wtmpl,"default")>3) {
-	  rpar[i].hidden|=HIDDEN_MULTI;
-	}
-	rpar[i].type=LIVES_PARAM_COLRGB24;
-	rpar[i].value=g_malloc(3*sizint);
-	rpar[i].def=g_malloc(3*sizint);
-
-	if (weed_leaf_seed_type(wtmpl,"default")==WEED_SEED_INT) {
-	  if (weed_plant_has_leaf(wtmpl,"host_default")) {
-	    cols=weed_get_int_array(wtmpl,"host_default",&error);
-	  }
-	  else if (weed_leaf_num_elements(wtmpl,"default")>0) cols=weed_get_int_array(wtmpl,"default",&error);
-	  else cols=weed_get_int_array(wtmpl,"new_default",&error);
-	  if (weed_leaf_num_elements(wtmpl,"max")==1) {
-	    red_max=green_max=blue_max=weed_get_int_value(wtmpl,"max",&error);
-	  }
-	  else {
-	    maxi=weed_get_int_array(wtmpl,"max",&error);
-	    red_max=maxi[0];
-	    green_max=maxi[1];
-	    blue_max=maxi[2];
-	  }
-	  if (weed_leaf_num_elements(wtmpl,"min")==1) {
-	    red_min=green_min=blue_min=weed_get_int_value(wtmpl,"min",&error);
-	  }
-	  else {
-	    mini=weed_get_int_array(wtmpl,"min",&error);
-	    red_min=mini[0];
-	    green_min=mini[1];
-	    blue_min=mini[2];
-	  }
-	  if (cols[0]<red_min) cols[0]=red_min;
-	  if (cols[1]<green_min) cols[1]=green_min;
-	  if (cols[2]<blue_min) cols[2]=blue_min;
-	  if (cols[0]>red_max) cols[0]=red_max;
-	  if (cols[1]>green_max) cols[1]=green_max;
-	  if (cols[2]>blue_max) cols[2]=blue_max;
-	  cols[0]=(double)(cols[0]-red_min)/(double)(red_max-red_min)*255.+.49999;
-	  cols[1]=(double)(cols[1]-green_min)/(double)(green_max-green_min)*255.+.49999;
-	  cols[2]=(double)(cols[2]-blue_min)/(double)(blue_max-blue_min)*255.+.49999;
-	  col_int=TRUE;
-	}
-	else {
-	  if (weed_plant_has_leaf(wtmpl,"host_default")) colsd=weed_get_double_array(wtmpl,"host_default",&error); 
-	  else if (weed_leaf_num_elements(wtmpl,"default")>0) colsd=weed_get_double_array(wtmpl,"default",&error);
-	  else colsd=weed_get_double_array(wtmpl,"default",&error);
-	  if (weed_leaf_num_elements(wtmpl,"max")==1) {
-	    red_maxd=green_maxd=blue_maxd=weed_get_double_value(wtmpl,"max",&error);
-	  }
-	  else {
-	    maxd=weed_get_double_array(wtmpl,"max",&error);
-	    red_maxd=maxd[0];
-	    green_maxd=maxd[1];
-	    blue_maxd=maxd[2];
-	  }
-	  if (weed_leaf_num_elements(wtmpl,"min")==1) {
-	    red_mind=green_mind=blue_mind=weed_get_double_value(wtmpl,"min",&error);
-	  }
-	  else {
-	    mind=weed_get_double_array(wtmpl,"min",&error);
-	    red_mind=mind[0];
-	    green_mind=mind[1];
-	    blue_mind=mind[2];
-	  }
-	  if (colsd[0]<red_mind) colsd[0]=red_mind;
-	  if (colsd[1]<green_mind) colsd[1]=green_mind;
-	  if (colsd[2]<blue_mind) colsd[2]=blue_mind;
-	  if (colsd[0]>red_maxd) colsd[0]=red_maxd;
-	  if (colsd[1]>green_maxd) colsd[1]=green_maxd;
-	  if (colsd[2]>blue_maxd) colsd[2]=blue_maxd;
-	  cols=(int *)weed_malloc(3*sizshrt);
-	  cols[0]=(colsd[0]-red_mind)/(red_maxd-red_mind)*255.+.49999;
-	  cols[1]=(colsd[1]-green_mind)/(green_maxd-green_mind)*255.+.49999;
-	  cols[2]=(colsd[2]-blue_mind)/(blue_maxd-blue_mind)*255.+.49999;
-	  col_int=FALSE;
-	}
-	set_colRGB24_param(rpar[i].def,cols[0],cols[1],cols[2]);
-
-	if (col_int) {
-	  weed_free(cols);
-	  cols=weed_get_int_array(wpar,"value",&error);
-	  if (cols[0]<red_min) cols[0]=red_min;
-	  if (cols[1]<green_min) cols[1]=green_min;
-	  if (cols[2]<blue_min) cols[2]=blue_min;
-	  if (cols[0]>red_max) cols[0]=red_max;
-	  if (cols[1]>green_max) cols[1]=green_max;
-	  if (cols[2]>blue_max) cols[2]=blue_max;
-	  cols[0]=(double)(cols[0]-red_min)/(double)(red_max-red_min)*255.+.49999;
-	  cols[1]=(double)(cols[1]-green_min)/(double)(green_max-green_min)*255.+.49999;
-	  cols[2]=(double)(cols[2]-blue_min)/(double)(blue_max-blue_min)*255.+.49999;
-	}
-	else {
-	  colsd=weed_get_double_array(wpar,"value",&error);
-	  if (colsd[0]<red_mind) colsd[0]=red_mind;
-	  if (colsd[1]<green_mind) colsd[1]=green_mind;
-	  if (colsd[2]<blue_mind) colsd[2]=blue_mind;
-	  if (colsd[0]>red_maxd) colsd[0]=red_maxd;
-	  if (colsd[1]>green_maxd) colsd[1]=green_maxd;
-	  if (colsd[2]>blue_maxd) colsd[2]=blue_maxd;
-	  cols[0]=(colsd[0]-red_mind)/(red_maxd-red_mind)*255.+.49999;
-	  cols[1]=(colsd[1]-green_mind)/(green_maxd-green_mind)*255.+.49999;
-	  cols[2]=(colsd[2]-blue_mind)/(blue_maxd-blue_mind)*255.+.49999;
-	}
-	set_colRGB24_param(rpar[i].value,(short)cols[0],(short)cols[1],(short)cols[2]);
-	weed_free(cols);
-
-	if (maxi!=NULL) weed_free(maxi);
-	if (mini!=NULL) weed_free(mini);
-	if (maxd!=NULL) weed_free(maxd);
-	if (mind!=NULL) weed_free(mind);
-	break;
-      }
-      break;
+      rpar[i].list=NULL;
 
-    default:
-      rpar[i].type=LIVES_PARAM_UNKNOWN; // TODO - try to get default
-    }
+      if (flags&WEED_PARAMETER_REINIT_ON_VALUE_CHANGE) {
+        rpar[i].reinit=TRUE;
+        if (!show_reinits) rpar[i].hidden|=HIDDEN_NEEDS_REINIT;
+      } else rpar[i].reinit=FALSE;
+
+      // hide internally connected params for compound fx
+      if (weed_plant_has_leaf(wpar,"host_internal_connection")) rpar[i].hidden|=HIDDEN_COMPOUND_INTERNAL;
+
+      ///////////////////////////////
+      param_hint=weed_get_int_value(wtmpl,"hint",&error);
+
+      switch (param_hint) {
+      case WEED_HINT_SWITCH:
+        if (weed_plant_has_leaf(wtmpl,"default")&&weed_leaf_num_elements(wtmpl,"default")>1) {
+          rpar[i].hidden|=HIDDEN_MULTI;
+        }
+        rpar[i].type=LIVES_PARAM_BOOL;
+        rpar[i].value=lives_malloc(sizint);
+        rpar[i].def=lives_malloc(sizint);
+        if (weed_plant_has_leaf(wtmpl,"host_default")) vali=weed_get_boolean_value(wtmpl,"host_default",&error);
+        else if (weed_leaf_num_elements(wtmpl,"default")>0) vali=weed_get_boolean_value(wtmpl,"default",&error);
+        else vali=weed_get_boolean_value(wtmpl,"new_default",&error);
+        set_int_param(rpar[i].def,vali);
+        vali=weed_get_boolean_value(wpar,"value",&error);
+        set_int_param(rpar[i].value,vali);
+        if (weed_plant_has_leaf(wtmpl,"group")) rpar[i].group=weed_get_int_value(wtmpl,"group",&error);
+        break;
+      case WEED_HINT_INTEGER:
+        if (weed_plant_has_leaf(wtmpl,"default")&&weed_leaf_num_elements(wtmpl,"default")>1) {
+          rpar[i].hidden|=HIDDEN_MULTI;
+        }
+        rpar[i].type=LIVES_PARAM_NUM;
+        rpar[i].value=lives_malloc(sizint);
+        rpar[i].def=lives_malloc(sizint);
+        if (weed_plant_has_leaf(wtmpl,"host_default")) {
+          vali=weed_get_int_value(wtmpl,"host_default",&error);
+        } else if (weed_leaf_num_elements(wtmpl,"default")>0) vali=weed_get_int_value(wtmpl,"default",&error);
+        else vali=weed_get_int_value(wtmpl,"new_default",&error);
+        set_int_param(rpar[i].def,vali);
+        vali=weed_get_int_value(wpar,"value",&error);
+        set_int_param(rpar[i].value,vali);
+        rpar[i].min=(double)weed_get_int_value(wtmpl,"min",&error);
+        rpar[i].max=(double)weed_get_int_value(wtmpl,"max",&error);
+        if (weed_plant_has_leaf(wtmpl,"wrap")&&weed_get_boolean_value(wtmpl,"wrap",&error)==WEED_TRUE) rpar[i].wrap=TRUE;
+        if (gui!=NULL) {
+          if (weed_plant_has_leaf(gui,"choices")) {
+            listlen=weed_leaf_num_elements(gui,"choices");
+            list=weed_get_string_array(gui,"choices",&error);
+            for (j=0; j<listlen; j++) {
+              gtk_list=lives_list_append(gtk_list,lives_strdup(list[j]));
+              lives_free(list[j]);
+            }
+            lives_free(list);
+            rpar[i].list=lives_list_copy(gtk_list);
+            lives_list_free(gtk_list);
+            gtk_list=NULL;
+            rpar[i].type=LIVES_PARAM_STRING_LIST;
+            rpar[i].max=listlen;
+          } else if (weed_plant_has_leaf(gui,"step_size"))
+            rpar[i].step_size=(double)weed_get_int_value(gui,"step_size",&error);
+          if (rpar[i].step_size==0.) rpar[i].step_size=1.;
+        }
+        break;
+      case WEED_HINT_FLOAT:
+        if (weed_plant_has_leaf(wtmpl,"default")&&weed_leaf_num_elements(wtmpl,"default")>1) {
+          rpar[i].hidden|=HIDDEN_MULTI;
+        }
+        rpar[i].type=LIVES_PARAM_NUM;
+        rpar[i].value=lives_malloc(sizdbl);
+        rpar[i].def=lives_malloc(sizdbl);
+        if (weed_plant_has_leaf(wtmpl,"host_default")) vald=weed_get_double_value(wtmpl,"host_default",&error);
+        else if (weed_leaf_num_elements(wtmpl,"default")>0) vald=weed_get_double_value(wtmpl,"default",&error);
+        else vald=weed_get_double_value(wtmpl,"new_default",&error);
+        set_double_param(rpar[i].def,vald);
+        vald=weed_get_double_value(wpar,"value",&error);
+        set_double_param(rpar[i].value,vald);
+        rpar[i].min=weed_get_double_value(wtmpl,"min",&error);
+        rpar[i].max=weed_get_double_value(wtmpl,"max",&error);
+        if (weed_plant_has_leaf(wtmpl,"wrap")&&weed_get_boolean_value(wtmpl,"wrap",&error)==WEED_TRUE) rpar[i].wrap=TRUE;
+        rpar[i].step_size=0.;
+        rpar[i].dp=2;
+        if (gui!=NULL) {
+          if (weed_plant_has_leaf(gui,"step_size")) rpar[i].step_size=weed_get_double_value(gui,"step_size",&error);
+          if (weed_plant_has_leaf(gui,"decimals")) rpar[i].dp=weed_get_int_value(gui,"decimals",&error);
+        }
+        if (rpar[i].step_size==0.) {
+          if (rpar[i].max-rpar[i].min>1.) rpar[i].step_size=1.;
+          else rpar[i].step_size=1./(double)lives_10pow(rpar[i].dp);
+        }
+        break;
+      case WEED_HINT_TEXT:
+        if (weed_plant_has_leaf(wtmpl,"default")&&weed_leaf_num_elements(wtmpl,"default")>1) {
+          rpar[i].hidden|=HIDDEN_MULTI;
+        }
+        rpar[i].type=LIVES_PARAM_STRING;
+        if (weed_plant_has_leaf(wtmpl,"host_default")) string=weed_get_string_value(wtmpl,"host_default",&error);
+        else if (weed_leaf_num_elements(wtmpl,"default")>0) string=weed_get_string_value(wtmpl,"default",&error);
+        else string=weed_get_string_value(wtmpl,"new_default",&error);
+        rpar[i].def=lives_strdup(string);
+        lives_free(string);
+        string=weed_get_string_value(wpar,"value",&error);
+        rpar[i].value=lives_strdup(string);
+        lives_free(string);
+        rpar[i].max=0.;
+        if (gui!=NULL&&weed_plant_has_leaf(gui,"maxchars")) {
+          rpar[i].max=(double)weed_get_int_value(gui,"maxchars",&error);
+          if (rpar[i].max<0.) rpar[i].max=0.;
+        }
+        break;
+      case WEED_HINT_COLOR:
+        cspace=weed_get_int_value(wtmpl,"colorspace",&error);
+        switch (cspace) {
+        case WEED_COLORSPACE_RGB:
+          if (weed_leaf_num_elements(wtmpl,"default")>3) {
+            rpar[i].hidden|=HIDDEN_MULTI;
+          }
+          rpar[i].type=LIVES_PARAM_COLRGB24;
+          rpar[i].value=lives_malloc(3*sizint);
+          rpar[i].def=lives_malloc(3*sizint);
+
+          if (weed_leaf_seed_type(wtmpl,"default")==WEED_SEED_INT) {
+            if (weed_plant_has_leaf(wtmpl,"host_default")) {
+              cols=weed_get_int_array(wtmpl,"host_default",&error);
+            } else if (weed_leaf_num_elements(wtmpl,"default")>0) cols=weed_get_int_array(wtmpl,"default",&error);
+            else cols=weed_get_int_array(wtmpl,"new_default",&error);
+            if (weed_leaf_num_elements(wtmpl,"max")==1) {
+              red_max=green_max=blue_max=weed_get_int_value(wtmpl,"max",&error);
+            } else {
+              maxi=weed_get_int_array(wtmpl,"max",&error);
+              red_max=maxi[0];
+              green_max=maxi[1];
+              blue_max=maxi[2];
+            }
+            if (weed_leaf_num_elements(wtmpl,"min")==1) {
+              red_min=green_min=blue_min=weed_get_int_value(wtmpl,"min",&error);
+            } else {
+              mini=weed_get_int_array(wtmpl,"min",&error);
+              red_min=mini[0];
+              green_min=mini[1];
+              blue_min=mini[2];
+            }
+            if (cols[0]<red_min) cols[0]=red_min;
+            if (cols[1]<green_min) cols[1]=green_min;
+            if (cols[2]<blue_min) cols[2]=blue_min;
+            if (cols[0]>red_max) cols[0]=red_max;
+            if (cols[1]>green_max) cols[1]=green_max;
+            if (cols[2]>blue_max) cols[2]=blue_max;
+            cols[0]=(double)(cols[0]-red_min)/(double)(red_max-red_min)*255.+.49999;
+            cols[1]=(double)(cols[1]-green_min)/(double)(green_max-green_min)*255.+.49999;
+            cols[2]=(double)(cols[2]-blue_min)/(double)(blue_max-blue_min)*255.+.49999;
+            col_int=TRUE;
+          } else {
+            if (weed_plant_has_leaf(wtmpl,"host_default")) colsd=weed_get_double_array(wtmpl,"host_default",&error);
+            else if (weed_leaf_num_elements(wtmpl,"default")>0) colsd=weed_get_double_array(wtmpl,"default",&error);
+            else colsd=weed_get_double_array(wtmpl,"default",&error);
+            if (weed_leaf_num_elements(wtmpl,"max")==1) {
+              red_maxd=green_maxd=blue_maxd=weed_get_double_value(wtmpl,"max",&error);
+            } else {
+              maxd=weed_get_double_array(wtmpl,"max",&error);
+              red_maxd=maxd[0];
+              green_maxd=maxd[1];
+              blue_maxd=maxd[2];
+            }
+            if (weed_leaf_num_elements(wtmpl,"min")==1) {
+              red_mind=green_mind=blue_mind=weed_get_double_value(wtmpl,"min",&error);
+            } else {
+              mind=weed_get_double_array(wtmpl,"min",&error);
+              red_mind=mind[0];
+              green_mind=mind[1];
+              blue_mind=mind[2];
+            }
+            if (colsd[0]<red_mind) colsd[0]=red_mind;
+            if (colsd[1]<green_mind) colsd[1]=green_mind;
+            if (colsd[2]<blue_mind) colsd[2]=blue_mind;
+            if (colsd[0]>red_maxd) colsd[0]=red_maxd;
+            if (colsd[1]>green_maxd) colsd[1]=green_maxd;
+            if (colsd[2]>blue_maxd) colsd[2]=blue_maxd;
+            cols=(int *)lives_malloc(3*sizshrt);
+            cols[0]=(colsd[0]-red_mind)/(red_maxd-red_mind)*255.+.49999;
+            cols[1]=(colsd[1]-green_mind)/(green_maxd-green_mind)*255.+.49999;
+            cols[2]=(colsd[2]-blue_mind)/(blue_maxd-blue_mind)*255.+.49999;
+            col_int=FALSE;
+          }
+          set_colRGB24_param(rpar[i].def,cols[0],cols[1],cols[2]);
+
+          if (col_int) {
+            lives_free(cols);
+            cols=weed_get_int_array(wpar,"value",&error);
+            if (cols[0]<red_min) cols[0]=red_min;
+            if (cols[1]<green_min) cols[1]=green_min;
+            if (cols[2]<blue_min) cols[2]=blue_min;
+            if (cols[0]>red_max) cols[0]=red_max;
+            if (cols[1]>green_max) cols[1]=green_max;
+            if (cols[2]>blue_max) cols[2]=blue_max;
+            cols[0]=(double)(cols[0]-red_min)/(double)(red_max-red_min)*255.+.49999;
+            cols[1]=(double)(cols[1]-green_min)/(double)(green_max-green_min)*255.+.49999;
+            cols[2]=(double)(cols[2]-blue_min)/(double)(blue_max-blue_min)*255.+.49999;
+          } else {
+            colsd=weed_get_double_array(wpar,"value",&error);
+            if (colsd[0]<red_mind) colsd[0]=red_mind;
+            if (colsd[1]<green_mind) colsd[1]=green_mind;
+            if (colsd[2]<blue_mind) colsd[2]=blue_mind;
+            if (colsd[0]>red_maxd) colsd[0]=red_maxd;
+            if (colsd[1]>green_maxd) colsd[1]=green_maxd;
+            if (colsd[2]>blue_maxd) colsd[2]=blue_maxd;
+            cols[0]=(colsd[0]-red_mind)/(red_maxd-red_mind)*255.+.49999;
+            cols[1]=(colsd[1]-green_mind)/(green_maxd-green_mind)*255.+.49999;
+            cols[2]=(colsd[2]-blue_mind)/(blue_maxd-blue_mind)*255.+.49999;
+          }
+          set_colRGB24_param(rpar[i].value,(short)cols[0],(short)cols[1],(short)cols[2]);
+          lives_free(cols);
+
+          if (maxi!=NULL) lives_free(maxi);
+          if (mini!=NULL) lives_free(mini);
+          if (maxd!=NULL) lives_free(maxd);
+          if (mind!=NULL) lives_free(mind);
+          break;
+        }
+        break;
+
+      default:
+        rpar[i].type=LIVES_PARAM_UNKNOWN; // TODO - try to get default
+      }
+
+      string=weed_get_string_value(wtmpl,"name",&error);
+      rpar[i].name=lives_strdup(string);
+      rpar[i].label=lives_strdup(string);
+      lives_free(string);
+
+      if (weed_plant_has_leaf(wtmpl,"description")) {
+        string=weed_get_string_value(wtmpl,"description",&error);
+        rpar[i].desc=lives_strdup(string);
+        lives_free(string);
+      } else rpar[i].desc=NULL;
 
-    string=weed_get_string_value(wtmpl,"name",&error);
-    rpar[i].name=g_strdup(string);
-    rpar[i].label=g_strdup(string);
-    weed_free(string);
+      // gui part /////////////////////
 
-    if (weed_plant_has_leaf(wtmpl,"description")) {
-      string=weed_get_string_value(wtmpl,"description",&error);
-      rpar[i].desc=g_strdup(string);
-      weed_free(string);
-    }
-    else rpar[i].desc=NULL;
+      if (gui!=NULL) {
+        if (weed_plant_has_leaf(gui,"label")) {
+          string=weed_get_string_value(gui,"label",&error);
+          lives_free(rpar[i].label);
+          rpar[i].label=lives_strdup(string);
+          lives_free(string);
+        }
+        if (weed_plant_has_leaf(gui,"use_mnemonic")) rpar[i].use_mnemonic=weed_get_boolean_value(gui,"use_mnemonic",&error);
+        if (weed_plant_has_leaf(gui,"hidden"))
+          rpar[i].hidden|=((weed_get_boolean_value(gui,"hidden",&error)==WEED_TRUE)*HIDDEN_GUI);
+        if (weed_plant_has_leaf(gui,"display_func")) {
+          weed_display_f *display_func_ptr_ptr;
+          weed_display_f display_func;
+          weed_leaf_get(gui,"display_func",0,(void *)&display_func_ptr_ptr);
+          display_func=*display_func_ptr_ptr;
+          rpar[i].display_func=(fn_ptr)display_func;
+        }
+        if (weed_plant_has_leaf(gui,"interpolate_func")) {
+          weed_interpolate_f *interp_func_ptr_ptr;
+          weed_interpolate_f interp_func;
+          weed_leaf_get(gui,"interpolate_func",0,(void *)&interp_func_ptr_ptr);
+          interp_func=*interp_func_ptr_ptr;
+          rpar[i].interp_func=(fn_ptr)interp_func;
+        }
+      }
+
+      for (j=0; j<MAX_PARAM_WIDGETS; j++) {
+        rpar[i].widgets[j]=NULL;
+      }
+      rpar[i].onchange=FALSE;
+    }
+
+    lives_free(wpars);
+
+    return rpar;
+  }
 
-    // gui part /////////////////////
 
-    if (gui!=NULL) {
-      if (weed_plant_has_leaf(gui,"label")) {
-	string=weed_get_string_value(gui,"label",&error);
-	g_free(rpar[i].label);
-	rpar[i].label=g_strdup(string);
-	weed_free(string);
-      }
-      if (weed_plant_has_leaf(gui,"use_mnemonic")) rpar[i].use_mnemonic=weed_get_boolean_value(gui,"use_mnemonic",&error);
-      if (weed_plant_has_leaf(gui,"hidden")) 
-	rpar[i].hidden|=((weed_get_boolean_value(gui,"hidden",&error)==WEED_TRUE)*HIDDEN_GUI);
-      if (weed_plant_has_leaf(gui,"display_func")) {
-	weed_display_f *display_func_ptr_ptr;
-	weed_display_f display_func;
-	weed_leaf_get(gui,"display_func",0,(void *)&display_func_ptr_ptr);
-	display_func=*display_func_ptr_ptr;
-	rpar[i].display_func=(fn_ptr)display_func;
-      }
-      if (weed_plant_has_leaf(gui,"interpolate_func")) {
-	weed_interpolate_f *interp_func_ptr_ptr;
-	weed_interpolate_f interp_func;
-	weed_leaf_get(gui,"interpolate_func",0,(void *)&interp_func_ptr_ptr);
-	interp_func=*interp_func_ptr_ptr;
-	rpar[i].interp_func=(fn_ptr)interp_func;
-      }
-    }
 
-    for (j=0;j<MAX_PARAM_WIDGETS;j++) {
-      rpar[i].widgets[j]=NULL;
-    }
-    rpar[i].onchange=FALSE;
+  lives_rfx_t *weed_to_rfx(weed_plant_t *plant, boolean show_reinits) {
+    // return an RFX for a weed effect; set rfx->source to an INSTANCE of the filter (first instance for compound fx)
+    int error;
+    weed_plant_t *filter,*inst;
+
+    char *string;
+    lives_rfx_t *rfx=(lives_rfx_t *)lives_malloc(sizeof(lives_rfx_t));
+    rfx->is_template=FALSE;
+    if (weed_get_int_value(plant,"type",&error)==WEED_PLANT_FILTER_INSTANCE) {
+      filter=weed_instance_get_filter(plant,TRUE);
+      inst=plant;
+    } else {
+      filter=plant;
+      inst=weed_instance_from_filter(filter);
+      // init and deinit the effect to allow the plugin to hide parameters, etc.
+      weed_reinit_effect(inst,TRUE);
+      rfx->is_template=TRUE;
+    }
+
+    string=weed_get_string_value(filter,"name",&error);
+    rfx->name=lives_strdup(string);
+    rfx->menu_text=lives_strdup(string);
+    lives_free(string);
+    rfx->action_desc=lives_strdup("no action");
+    rfx->min_frames=-1;
+    rfx->num_in_channels=enabled_in_channels(filter,FALSE);
+    rfx->status=RFX_STATUS_WEED;
+    rfx->props=0;
+    rfx->menuitem=NULL;
+    if (!weed_plant_has_leaf(filter,"in_parameter_templates")||
+        weed_get_plantptr_value(filter,"in_parameter_templates",&error)==NULL) rfx->num_params=0;
+    else rfx->num_params=weed_leaf_num_elements(filter,"in_parameter_templates");
+    if (rfx->num_params>0) rfx->params=weed_params_to_rfx(rfx->num_params,inst,show_reinits);
+    else rfx->params=NULL;
+    rfx->source=(void *)inst;
+    rfx->source_type=LIVES_RFX_SOURCE_WEED;
+    rfx->extra=NULL;
+    return rfx;
   }
 
-  weed_free(wpars);
 
-  return rpar;
-}
 
+  LiVESList *get_external_window_hints(lives_rfx_t *rfx) {
+    LiVESList *hints=NULL;
 
+    if (rfx->status==RFX_STATUS_WEED) {
+      int nfilters,error;
+      int num_hints;
+      weed_plant_t *gui;
+      weed_plant_t *inst=(weed_plant_t *)rfx->source;
+      weed_plant_t *filter=weed_instance_get_filter(inst,TRUE);
+      int *filters=NULL;
+      char *string,**rfx_strings,*delim;
 
-lives_rfx_t *weed_to_rfx (weed_plant_t *plant, boolean show_reinits) {
-  // return an RFX for a weed effect; set rfx->source to an INSTANCE of the filter (first instance for compound fx)
-  int error;
-  weed_plant_t *filter,*inst;
+      register int i;
 
-  gchar *string;
-  lives_rfx_t *rfx=(lives_rfx_t *)g_malloc(sizeof(lives_rfx_t));
-  rfx->is_template=FALSE;
-  if (weed_get_int_value(plant,"type",&error)==WEED_PLANT_FILTER_INSTANCE) {
-    filter=weed_instance_get_filter(plant,TRUE);
-    inst=plant;
-  }
-  else {
-    filter=plant;
-    inst=weed_instance_from_filter(filter);
-    // init and deinit the effect to allow the plugin to hide parameters, etc.
-    weed_reinit_effect(inst,TRUE);
-    rfx->is_template=TRUE;
-  }
-
-  string=weed_get_string_value(filter,"name",&error);
-  rfx->name=g_strdup(string);
-  rfx->menu_text=g_strdup(string);
-  weed_free(string);
-  rfx->action_desc=g_strdup("no action");
-  rfx->min_frames=-1;
-  rfx->num_in_channels=enabled_in_channels(filter,FALSE);
-  rfx->status=RFX_STATUS_WEED;
-  rfx->props=0;
-  rfx->menuitem=NULL;
-  if (!weed_plant_has_leaf(filter,"in_parameter_templates")||
-      weed_get_plantptr_value(filter,"in_parameter_templates",&error)==NULL) rfx->num_params=0;
-  else rfx->num_params=weed_leaf_num_elements(filter,"in_parameter_templates");
-  if (rfx->num_params>0) rfx->params=weed_params_to_rfx(rfx->num_params,inst,show_reinits);
-  else rfx->params=NULL;
-  rfx->source=(void *)inst;
-  rfx->source_type=LIVES_RFX_SOURCE_WEED;
-  rfx->extra=NULL;
-  return rfx;
-}
+      if ((nfilters=num_compound_fx(filter))>1) {
+        // handle compound fx
+        filters=weed_get_int_array(filter,"host_filter_list",&error);
+      }
 
+      for (i=0; i<nfilters; i++) {
 
+        if (filters!=NULL) {
+          filter=get_weed_filter(filters[i]);
+        }
 
-GList *get_external_window_hints(lives_rfx_t *rfx) {
-  GList *hints=NULL;
+        if (!weed_plant_has_leaf(filter,"gui")) continue;
+        gui=weed_get_plantptr_value(filter,"gui",&error);
 
-  if (rfx->status==RFX_STATUS_WEED) {
-    int nfilters,error;
-    int num_hints;
-    weed_plant_t *gui;
-    weed_plant_t *inst=(weed_plant_t *)rfx->source;
-    weed_plant_t *filter=weed_instance_get_filter(inst,TRUE);
-    int *filters=NULL;
-    char *string,**rfx_strings,*delim;
+        if (!weed_plant_has_leaf(gui,"layout_scheme")) continue;
 
-    register int i;
+        string=weed_get_string_value(gui,"layout_scheme",&error);
+        if (strcmp(string,"RFX")) {
+          lives_free(string);
+          continue;
+        }
+        lives_free(string);
 
-    if ((nfilters=num_compound_fx(filter))>1) {
-      // handle compound fx
-      filters=weed_get_int_array(filter,"host_filter_list",&error);
-    }
+        if (!weed_plant_has_leaf(gui,"rfx_delim")) continue;
+        delim=weed_get_string_value(gui,"rfx_delim",&error);
+        lives_snprintf(rfx->delim,2,"%s",delim);
+        lives_free(delim);
 
-    for (i=0;i<nfilters;i++) {
+        if (!weed_plant_has_leaf(gui,"rfx_strings")) continue;
 
-      if (filters!=NULL) {
-	filter=get_weed_filter(filters[i]);
-      }
+        num_hints=weed_leaf_num_elements(gui,"rfx_strings");
 
-      if (!weed_plant_has_leaf(filter,"gui")) continue;
-      gui=weed_get_plantptr_value(filter,"gui",&error);
+        if (num_hints==0) continue;
+        rfx_strings=weed_get_string_array(gui,"rfx_strings",&error);
 
-      if (!weed_plant_has_leaf(gui,"layout_scheme")) continue;
+        for (i=0; i<num_hints; i++) {
+          hints=lives_list_append(hints,lives_strdup(rfx_strings[i]));
+          lives_free(rfx_strings[i]);
+        }
+        lives_free(rfx_strings);
 
-      string=weed_get_string_value(gui,"layout_scheme",&error);
-      if (strcmp(string,"RFX")) {
-	weed_free(string);
-	continue;
-      }
-      weed_free(string);
+        if (filters!=NULL) hints=lives_list_append(hints,lives_strdup("internal|nextfilter"));
 
-      if (!weed_plant_has_leaf(gui,"rfx_delim")) continue;
-      delim=weed_get_string_value(gui,"rfx_delim",&error);
-      g_snprintf(rfx->delim,2,"%s",delim);
-      weed_free(delim);
-      
-      if (!weed_plant_has_leaf(gui,"rfx_strings")) continue;
-      
-      num_hints=weed_leaf_num_elements(gui,"rfx_strings");
-      
-      if (num_hints==0) continue;
-      rfx_strings=weed_get_string_array(gui,"rfx_strings",&error);
-      
-      for (i=0;i<num_hints;i++) {
-	hints=g_list_append(hints,g_strdup(rfx_strings[i]));
-	weed_free(rfx_strings[i]);
       }
-      weed_free(rfx_strings);
 
-      if (filters!=NULL) hints=g_list_append(hints,g_strdup("internal|nextfilter"));
+      if (filters!=NULL) lives_free(filters);
 
     }
 
-    if (filters!=NULL) weed_free(filters);
-
+    return hints;
   }
 
-  return hints;
-}
 
 
 
 
 
+  char *plugin_run_param_window(const char *get_com, LiVESVBox *vbox, lives_rfx_t **ret_rfx) {
 
-gchar *plugin_run_param_window(const gchar *get_com, LiVESVBox *vbox, lives_rfx_t **ret_rfx) {
+    // here we create an rfx script from some fixed values and values from the plugin;
+    // we will then compile the script to an rfx scrap and use the scrap to get info
+    // about additional parameters, and create the parameter window
 
-  // here we create an rfx script from some fixed values and values from the plugin; 
-  // we will then compile the script to an rfx scrap and use the scrap to get info
-  // about additional parameters, and create the parameter window
-  
-  // this is done like so to allow use of plugins written in any language; 
-  // they need only output an RFX scriptlet on stdout when called from the commandline
+    // this is done like so to allow use of plugins written in any language;
+    // they need only output an RFX scriptlet on stdout when called from the commandline
 
 
-  // the param window is run, and the marshalled values are returned
+    // the param window is run, and the marshalled values are returned
 
-  // if the user closes the window with Cancel, NULL is returned instead
+    // if the user closes the window with Cancel, NULL is returned instead
 
-  // in parameters: get_com - command to be run to produce rfx output on stdout
-  //              : vbox - a vbox where we will display the parameters
-  // out parameters: ret_rfx - the value is set to point to an rfx_t effect
+    // in parameters: get_com - command to be run to produce rfx output on stdout
+    //              : vbox - a vbox where we will display the parameters
+    // out parameters: ret_rfx - the value is set to point to an rfx_t effect
 
-  // the string which is returned is the marshalled values of the parameters
+    // the string which is returned is the marshalled values of the parameters
 
 
-  FILE *sfile;
-  lives_rfx_t *rfx=(lives_rfx_t *)g_malloc(sizeof(lives_rfx_t));
-  gchar *string;
-  gchar *rfx_scrapname=g_strdup_printf("rfx.%d",capable->mainpid);
-  gchar *rfxfile=g_strdup_printf ("%s/.%s.script",prefs->tmpdir,rfx_scrapname);
-  int res;
-  gchar *com;
-  gchar *fnamex;
-  gchar *res_string=NULL;
-  gchar buff[32];
-  int retval;
+    FILE *sfile;
 
-  string=g_strdup_printf("<name>\n%s\n</name>\n",rfx_scrapname);
-
-  do {
-    retval=0;
-    sfile=fopen(rfxfile,"w");
-    if (sfile==NULL) {
-      retval=do_write_failed_error_s_with_retry(rfxfile,g_strerror(errno),NULL);
-      if (retval==LIVES_CANCEL) {
-	g_free(string);
-	return NULL;
-      }
-    }
-    else {
-      mainw->write_failed=FALSE;
-      lives_fputs(string,sfile);
-      fclose(sfile);
-      g_free(string);
-      if (mainw->write_failed) {
-	retval=do_write_failed_error_s_with_retry(rfxfile,NULL,NULL);
-	if (retval==LIVES_CANCEL) return NULL;
-      }
-    }
-  } while (retval==LIVES_RETRY);
+    lives_rfx_t *rfx=(lives_rfx_t *)lives_malloc(sizeof(lives_rfx_t));
 
+    char *string;
+    char *rfx_scrapname=lives_strdup_printf("rfx.%d",capable->mainpid);
+    char *rfxfile=lives_strdup_printf("%s/.%s.script",prefs->tmpdir,rfx_scrapname);
+    char *com;
+    char *fnamex;
+    char *res_string=NULL;
+    char buff[32];
 
+    int res;
+    int retval;
 
-  com=g_strdup_printf("%s >> \"%s\"", get_com, rfxfile);
-  retval=lives_system(com,FALSE);
-  g_free(com);
+    string=lives_strdup_printf("<name>\n%s\n</name>\n",rfx_scrapname);
 
-  // command failed
-  if (retval) return NULL;
+    do {
+      retval=0;
+      sfile=fopen(rfxfile,"w");
+      if (sfile==NULL) {
+        retval=do_write_failed_error_s_with_retry(rfxfile,lives_strerror(errno),NULL);
+        if (retval==LIVES_RESPONSE_CANCEL) {
+          lives_free(string);
+          return NULL;
+        }
+      } else {
+        mainw->write_failed=FALSE;
+        lives_fputs(string,sfile);
+        fclose(sfile);
+        lives_free(string);
+        if (mainw->write_failed) {
+          retval=do_write_failed_error_s_with_retry(rfxfile,NULL,NULL);
+          if (retval==LIVES_RESPONSE_CANCEL) return NULL;
+        }
+      }
+    } while (retval==LIVES_RESPONSE_RETRY);
 
-  // OK, we should now have an RFX fragment in a file, we can compile it, then build a parameter window from it
-    
-  // call RFX_BUILDER program to compile the script, passing parameters input_filename and output_directory
-#ifndef IS_MINGW
-  com=g_strdup_printf("\"%s\" \"%s\" \"%s\" >/dev/null",RFX_BUILDER,rfxfile,prefs->tmpdir);
-#else
-  com=g_strdup_printf("\"%s\" \"%s\" \"%s\" >NUL",RFX_BUILDER,rfxfile,prefs->tmpdir);
-#endif
-  res=system(com);
-  g_free(com);
-    
-  unlink(rfxfile);
-  g_free(rfxfile);
-
-  if (res==0) {
-    // the script compiled correctly
-
-    // now we pop up the parameter window, get the values of our parameters, and marshall them as extra_params
-      
-    // first create a lives_rfx_t from the scrap
-    rfx->name=g_strdup(rfx_scrapname);
-    rfx->action_desc=NULL;
-    rfx->extra=NULL;
-    rfx->status=RFX_STATUS_SCRAP;
 
-    rfx->num_in_channels=0;
-    rfx->min_frames=-1;
 
-    // get the delimiter
-    rfxfile=g_strdup_printf("%ssmdef.%d",prefs->tmpdir,capable->mainpid);
-    fnamex=g_build_filename(prefs->tmpdir,rfx_scrapname,NULL);
-    com=g_strdup_printf("\"%s\" get_define > \"%s\"",fnamex,rfxfile);
-    g_free(fnamex);
+    com=lives_strdup_printf("%s >> \"%s\"", get_com, rfxfile);
     retval=lives_system(com,FALSE);
-    g_free(com);
+    lives_free(com);
 
-    // command to get_define failed
+    // command failed
     if (retval) return NULL;
 
-    do {
-      retval=0;
-      sfile=fopen(rfxfile,"r");
-      if (!sfile) {
-	retval=do_read_failed_error_s_with_retry(rfxfile,g_strerror(errno),NULL);
-      }
-      else {
-	mainw->read_failed=FALSE;
-	lives_fgets(buff,32,sfile);
-	fclose(sfile);
-      }
-      if (mainw->read_failed) {
-	retval=do_read_failed_error_s_with_retry(rfxfile,NULL,NULL);
-      }
+    // OK, we should now have an RFX fragment in a file, we can compile it, then build a parameter window from it
 
-    } while (retval==LIVES_RETRY);
+    // call RFX_BUILDER program to compile the script, passing parameters input_filename and output_directory
+#ifndef IS_MINGW
+    com=lives_strdup_printf("\"%s\" \"%s\" \"%s\" >/dev/null",RFX_BUILDER,rfxfile,prefs->tmpdir);
+#else
+    com=lives_strdup_printf("\"%s\" \"%s\" \"%s\" >NUL",RFX_BUILDER,rfxfile,prefs->tmpdir);
+#endif
+    res=system(com);
+    lives_free(com);
 
     unlink(rfxfile);
-    g_free(rfxfile);
+    lives_free(rfxfile);
 
-    if (retval==LIVES_CANCEL) return NULL;
+    if (res==0) {
+      // the script compiled correctly
 
-    g_snprintf(rfx->delim,2,"%s",buff);
+      // now we pop up the parameter window, get the values of our parameters, and marshall them as extra_params
 
-    // ok, this might need adjusting afterwards
-    rfx->menu_text=(vbox==NULL?g_strdup_printf(_("%s advanced settings"),prefs->encoder.of_desc):g_strdup(""));
-    rfx->is_template=FALSE;
+      // first create a lives_rfx_t from the scrap
+      rfx->name=lives_strdup(rfx_scrapname);
+      rfx->action_desc=NULL;
+      rfx->extra=NULL;
+      rfx->status=RFX_STATUS_SCRAP;
+
+      rfx->num_in_channels=0;
+      rfx->min_frames=-1;
+
+      // get the delimiter
+      rfxfile=lives_strdup_printf("%ssmdef.%d",prefs->tmpdir,capable->mainpid);
+      fnamex=lives_build_filename(prefs->tmpdir,rfx_scrapname,NULL);
+      com=lives_strdup_printf("\"%s\" get_define > \"%s\"",fnamex,rfxfile);
+      lives_free(fnamex);
+      retval=lives_system(com,FALSE);
+      lives_free(com);
+
+      // command to get_define failed
+      if (retval) return NULL;
 
-    rfx->source=NULL;
-    rfx->source_type=LIVES_RFX_SOURCE_RFX;
-      
-    render_fx_get_params(rfx,rfx_scrapname,RFX_STATUS_SCRAP);
-
-    // now we build our window and get param values
-    if (vbox==NULL) {
-      on_fx_pre_activate(rfx,1,NULL);
-
-      if (prefs->show_gui) {
-	if (mainw->multitrack==NULL) lives_window_set_transient_for(LIVES_WINDOW(fx_dialog[1]),LIVES_WINDOW(mainw->LiVES));
-	else lives_window_set_transient_for(LIVES_WINDOW(fx_dialog[1]),LIVES_WINDOW(mainw->multitrack->window));
-      }
-      lives_window_set_modal (LIVES_WINDOW (fx_dialog[1]), TRUE);
-      
-      if (lives_dialog_run(LIVES_DIALOG(fx_dialog[1]))==LIVES_RESPONSE_OK) {
-	// marshall our params for passing to the plugin
-	res_string=param_marshall(rfx,FALSE);
+      do {
+        retval=0;
+        sfile=fopen(rfxfile,"r");
+        if (!sfile) {
+          retval=do_read_failed_error_s_with_retry(rfxfile,lives_strerror(errno),NULL);
+        } else {
+          mainw->read_failed=FALSE;
+          lives_fgets(buff,32,sfile);
+          fclose(sfile);
+        }
+        if (mainw->read_failed) {
+          retval=do_read_failed_error_s_with_retry(rfxfile,NULL,NULL);
+        }
+
+      } while (retval==LIVES_RESPONSE_RETRY);
+
+      unlink(rfxfile);
+      lives_free(rfxfile);
+
+      if (retval==LIVES_RESPONSE_CANCEL) return NULL;
+
+      lives_snprintf(rfx->delim,2,"%s",buff);
+
+      // ok, this might need adjusting afterwards
+      rfx->menu_text=(vbox==NULL?lives_strdup_printf(_("%s advanced settings"),prefs->encoder.of_desc):lives_strdup(""));
+      rfx->is_template=FALSE;
+
+      rfx->source=NULL;
+      rfx->source_type=LIVES_RFX_SOURCE_RFX;
+
+      render_fx_get_params(rfx,rfx_scrapname,RFX_STATUS_SCRAP);
+
+      // now we build our window and get param values
+      if (vbox==NULL) {
+        on_fx_pre_activate(rfx,1,NULL);
+
+        if (prefs->show_gui) {
+          if (mainw->multitrack==NULL) lives_window_set_transient_for(LIVES_WINDOW(fx_dialog[1]),LIVES_WINDOW(mainw->LiVES));
+          else lives_window_set_transient_for(LIVES_WINDOW(fx_dialog[1]),LIVES_WINDOW(mainw->multitrack->window));
+        }
+        lives_window_set_modal(LIVES_WINDOW(fx_dialog[1]), TRUE);
+
+        if (lives_dialog_run(LIVES_DIALOG(fx_dialog[1]))==LIVES_RESPONSE_OK) {
+          // marshall our params for passing to the plugin
+          res_string=param_marshall(rfx,FALSE);
+        }
+      } else {
+        make_param_box(vbox,rfx);
+      }
+
+      rfxfile=lives_build_filename(prefs->tmpdir,rfx_scrapname,NULL);
+      unlink(rfxfile);
+      lives_free(rfxfile);
+
+      if (ret_rfx!=NULL) {
+        *ret_rfx=rfx;
+      } else {
+        rfx_free(rfx);
+        lives_free(rfx);
+      }
+    } else {
+      if (ret_rfx!=NULL) {
+        *ret_rfx=NULL;
+      } else {
+        res_string=lives_strdup("");
+      }
+      if (rfx!=NULL) {
+        lives_free(rfx);
       }
     }
-    else {
-      make_param_box(vbox,rfx);
-    }
-      
-    rfxfile=g_build_filename (prefs->tmpdir,rfx_scrapname,NULL);
-    unlink(rfxfile);
-    g_free(rfxfile);
 
-    if (ret_rfx!=NULL) {
-      *ret_rfx=rfx;
-    }
-    else {
-      rfx_free(rfx);
-      g_free(rfx);
-    }
+    lives_free(rfx_scrapname);
+    return res_string;
   }
-  else {
-    if (ret_rfx!=NULL) {
-      *ret_rfx=NULL;
-    }
-    else {
-      res_string=g_strdup("");
-    }
-    if (rfx!=NULL) {
-      g_free(rfx);
-    }
-  }
-
-  g_free(rfx_scrapname);
-  return res_string;
-}

LiVES-2.2.8.tar.bz2/src/plugins.h -> LiVES-2.4.1.tar.bz2/src/plugins.h Changed

@@ -19,7 +19,7 @@
 
 // generic plugins
 
-GList *get_plugin_list (const gchar *plugin_type, boolean allow_nonex, const gchar *plugdir, const gchar *filter_ext);
+LiVESList *get_plugin_list(const char *plugin_type, boolean allow_nonex, const char *plugdir, const char *filter_ext);
 #define PLUGIN_ENCODERS "encoders"
 #define PLUGIN_DECODERS "decoders"
 #define PLUGIN_VID_PLAYBACK "playback/video"
@@ -33,65 +33,66 @@
 #define PLUGIN_WEED_FX_BUILTIN "effects/realtime/weed"
 
 
-GList *plugin_request (const gchar *plugin_type, const gchar *plugin_name, const gchar *request);
-GList *plugin_request_with_blanks (const gchar *plugin_type, const gchar *plugin_name, const gchar *request);
-GList *plugin_request_by_line (const gchar *plugin_type, const gchar *plugin_name, const gchar *request);
-GList *plugin_request_by_space (const gchar *plugin_type, const gchar *plugin_name, const gchar *request);
-GList *plugin_request_common (const gchar *plugin_type, const gchar *plugin_name, const gchar *request, const gchar *delim, boolean allow_blanks);
+LiVESList *plugin_request(const char *plugin_type, const char *plugin_name, const char *request);
+LiVESList *plugin_request_with_blanks(const char *plugin_type, const char *plugin_name, const char *request);
+LiVESList *plugin_request_by_line(const char *plugin_type, const char *plugin_name, const char *request);
+LiVESList *plugin_request_by_space(const char *plugin_type, const char *plugin_name, const char *request);
+LiVESList *plugin_request_common(const char *plugin_type, const char *plugin_name, const char *request, const char *delim,
+                                 boolean allow_blanks);
 
 #ifndef  __WEED_EFFECTS_H__
-typedef weed_plant_t *(*weed_bootstrap_f) (weed_default_getter_f *value, int num_versions, int *plugin_versions);
+typedef weed_plant_t *(*weed_bootstrap_f)(weed_default_getter_f *value, int num_versions, int *plugin_versions);
 #endif
 
 /// video playback plugins
-typedef boolean (*plugin_keyfunc) (boolean down, uint16_t unicode, uint16_t keymod);
+typedef boolean(*plugin_keyfunc)(boolean down, uint16_t unicode, uint16_t keymod);
 
 
 typedef struct {
   // playback
-  gchar name[64];
+  char name[64];
   void *handle;
 
   // mandatory
   const char *(*module_check_init)(void);
-  const char *(*version) (void);
-  const char *(*get_description) (void);
+  const char *(*version)(void);
+  const char *(*get_description)(void);
 
-  int *(*get_palette_list) (void);
-  boolean (*set_palette) (int palette);
-  uint64_t (*get_capabilities) (int palette);
+  int *(*get_palette_list)(void);
+  boolean(*set_palette)(int palette);
+  uint64_t (*get_capabilities)(int palette);
 
-  boolean (*render_frame) (int hsize, int vsize, int64_t timecode, void **pixel_data, void **return_data,
-			    weed_plant_t **play_params);
+  boolean(*render_frame)(int hsize, int vsize, int64_t timecode, void **pixel_data, void **return_data,
+                         weed_plant_t **play_params);
 
   // optional
-  boolean (*init_screen) (int width, int height, boolean fullscreen, uint64_t window_id, int argc, gchar **argv);
-  void (*exit_screen) (uint16_t mouse_x, uint16_t mouse_y);
-  void (*module_unload) (void);
-  const gchar *(*get_fps_list) (int palette);
-  boolean (*set_fps) (double fps);
-  
-  const char *(*get_init_rfx) (void);
+  boolean(*init_screen)(int width, int height, boolean fullscreen, uint64_t window_id, int argc, char **argv);
+  void (*exit_screen)(uint16_t mouse_x, uint16_t mouse_y);
+  void (*module_unload)(void);
+  const char *(*get_fps_list)(int palette);
+  boolean(*set_fps)(double fps);
+
+  const char *(*get_init_rfx)(void);
 
   ///< optional (but should return a weed plantptr array of paramtmpl and chantmpl, NULL terminated)
-  const weed_plant_t **(*get_play_params) (weed_bootstrap_f f); 
-  
+  const weed_plant_t **(*get_play_params)(weed_bootstrap_f f);
+
   // only for display plugins
-  boolean (*send_keycodes) (plugin_keyfunc);
+  boolean(*send_keycodes)(plugin_keyfunc);
 
   // optional for YUV palettes
-  int *(*get_yuv_palette_sampling) (int palette);
-  int *(*get_yuv_palette_clamping) (int palette);
-  int *(*get_yuv_palette_subspace) (int palette);
-  int (*set_yuv_palette_sampling) (int palette);
-  int (*set_yuv_palette_clamping) (int palette);
-  int (*set_yuv_palette_subspace) (int palette);
+  int *(*get_yuv_palette_sampling)(int palette);
+  int *(*get_yuv_palette_clamping)(int palette);
+  int *(*get_yuv_palette_subspace)(int palette);
+  int (*set_yuv_palette_sampling)(int palette);
+  int (*set_yuv_palette_clamping)(int palette);
+  int (*set_yuv_palette_subspace)(int palette);
 
   // audio streaming
   int *(*get_audio_fmts)(void);
 
   uint32_t audio_codec;
-  // must match with the "acodec" GList in interface.c
+  // must match with the "acodec" LiVESList in interface.c
   // and bitmaps in the encder plugins, with this one addition:
 
   uint64_t capabilities;
@@ -112,7 +113,7 @@
   double fixed_fpsd;
 
   int extra_argc;
-  gchar **extra_argv;
+  char **extra_argv;
 
   const weed_plant_t **play_paramtmpls;
   weed_plant_t **play_params;
@@ -126,12 +127,12 @@
 #define DEF_VPP_HSIZE 320.
 #define DEF_VPP_VSIZE 240.
 
-_vid_playback_plugin *open_vid_playback_plugin (const gchar *name, boolean in_use);
-void vid_playback_plugin_exit (void);
+_vid_playback_plugin *open_vid_playback_plugin(const char *name, boolean in_use);
+void vid_playback_plugin_exit(void);
 void close_vid_playback_plugin(_vid_playback_plugin *);
 int64_t get_best_audio(_vid_playback_plugin *);
-void save_vpp_defaults(_vid_playback_plugin *, gchar *file);
-void load_vpp_defaults(_vid_playback_plugin *, gchar *file);
+void save_vpp_defaults(_vid_playback_plugin *, char *file);
+void load_vpp_defaults(_vid_playback_plugin *, char *file);
 
 
 const weed_plant_t *pp_get_param(weed_plant_t **pparams, int idx);
@@ -139,12 +140,12 @@
 
 // encoder plugins
 
-void do_plugin_encoder_error(const gchar *plugin_name_or_null);
+void do_plugin_encoder_error(const char *plugin_name_or_null);
 
-GList *filter_encoders_by_img_ext(GList *encoders, const gchar *img_ext);
+LiVESList *filter_encoders_by_img_ext(LiVESList *encoders, const char *img_ext);
 
 typedef struct {
-  gchar name[51];
+  char name[51];
   uint32_t audio_codec;
   // match with bitmaps in the encoder plugins
   // and also anames array in plugins.c (see below)
@@ -174,11 +175,11 @@
 #define ENCODER_NON_NATIVE 1<<3
 
   // current output format
-  gchar of_name[51];
-  gchar of_desc[128];
+  char of_name[51];
+  char of_desc[128];
   int of_allowed_acodecs;
-  gchar of_restrict[1024];
-  gchar of_def_ext[16];
+  char of_restrict[1024];
+  char of_def_ext[16];
 }
 _encoder;
 
@@ -191,10 +192,10 @@
 
 // seek_flags is a bitmap
 
-  /// good
+/// good
 #define LIVES_SEEK_FAST (1<<0)
 
-  /// not so good
+/// not so good
 #define LIVES_SEEK_NEEDS_CALCULATION (1<<1)
 #define LIVES_SEEK_QUALITY_LOSS (1<<2)
 
@@ -202,10 +203,10 @@
 // must be exactly the same as in decplugin.h
 
 typedef struct {
-  gchar *URI; ///< the URI of this cdata
+  char *URI; ///< the URI of this cdata
 
   int nclips; ///< number of clips (titles) in container
-  gchar container_name[512]; ///< name of container, e.g. "ogg" or NULL
+  char container_name[512]; ///< name of container, e.g. "ogg" or NULL
 
   char title[256];
   char author[256];
@@ -237,11 +238,11 @@
 
   /// plugin should init this to palettes[0] if URI changes
   int current_palette;  ///< current palette [rw host]; must be contained in palettes
-  
+
   int YUV_sampling;
   int YUV_clamping;
   int YUV_subspace;
-  gchar video_name[512]; ///< name of video codec, e.g. "theora" or NULL
+  char video_name[512]; ///< name of video codec, e.g. "theora" or NULL
 
   /* audio data */
   int arate;
@@ -249,7 +250,7 @@
   int asamps;
   boolean asigned;
   boolean ainterleaf;
-  gchar audio_name[512]; ///< name of audio codec, e.g. "vorbis" or NULL
+  char audio_name[512]; ///< name of audio codec, e.g. "vorbis" or NULL
 
   int seek_flag;
 
@@ -272,11 +273,11 @@
 
 typedef struct {
   // playback
-  gchar *name; ///< plugin name
+  char *name; ///< plugin name
   void *handle; ///< may be shared between several instances
 
   // mandatory
-  const char *(*version) (void);
+  const char *(*version)(void);
 
   /// call first time with NULL cdata
   /// subsequent calls should re-use cdata
@@ -290,17 +291,17 @@
   lives_clip_data_t *(*get_clip_data)(char *URI, const lives_clip_data_t *cdata);
 
   /// frame starts at 0 in these functions; height is height of primary plane
-  boolean (*get_frame)(const lives_clip_data_t *, int64_t frame, int *rowstrides, int height, void **pixel_data);
+  boolean(*get_frame)(const lives_clip_data_t *, int64_t frame, int *rowstrides, int height, void **pixel_data);
 
   /// call this for each cdata before unloading the module
   void (*clip_data_free)(lives_clip_data_t *);
 
   // optional
   const char *(*module_check_init)(void);
-  boolean (*set_palette)(lives_clip_data_t *);
-  int64_t (*rip_audio) (const lives_clip_data_t *, const char *fname, int64_t stframe, int64_t nframes, 
-			unsigned char **abuff);
-  void (*rip_audio_cleanup) (const lives_clip_data_t *cdata);
+  boolean(*set_palette)(lives_clip_data_t *);
+  int64_t (*rip_audio)(const lives_clip_data_t *, const char *fname, int64_t stframe, int64_t nframes,
+                       unsigned char **abuff);
+  void (*rip_audio_cleanup)(const lives_clip_data_t *cdata);
   void (*module_unload)(void);
 
 } lives_decoder_sys_t;
@@ -317,13 +318,13 @@
 
 
 
-const lives_clip_data_t *get_decoder_cdata(int fileno, GList *disabled, const lives_clip_data_t *fake_cdata);
-void close_decoder_plugin (lives_decoder_t *);
-lives_decoder_sys_t *open_decoder_plugin(const gchar *plname);
-void get_mime_type(gchar *text, int maxlen, const lives_clip_data_t *);
+const lives_clip_data_t *get_decoder_cdata(int fileno, LiVESList *disabled, const lives_clip_data_t *fake_cdata);
+void close_decoder_plugin(lives_decoder_t *);
+lives_decoder_sys_t *open_decoder_plugin(const char *plname);
+void get_mime_type(char *text, int maxlen, const lives_clip_data_t *);
 void unload_decoder_plugins(void);
 
-boolean decplugin_supports_palette (const lives_decoder_t *dplug, int palette);
+boolean decplugin_supports_palette(const lives_decoder_t *dplug, int palette);
 
 lives_decoder_t *clone_decoder(int fileno);
 
@@ -367,7 +368,7 @@
   LIVES_PARAM_COLRGBA32,
 
   LIVES_PARAM_UNDISPLAYABLE=65536
-  
+
 } lives_param_type_t;
 
 
@@ -399,10 +400,10 @@
 
 typedef struct {
   // weed style part
-  gchar *name;
-  gchar *desc;
+  char *name;
+  char *desc;
 
-  gchar *label;
+  char *label;
   int flags;
   boolean use_mnemonic;
   fn_ptr interp_func;
@@ -431,7 +432,7 @@
   double max; ///< for string this is max characters
 
   void *def; ///< default values
-  GList *list; ///< for string list (choices)
+  LiVESList *list; ///< for string list (choices)
 
   /// multivalue type - single value, multi value, or per channel
   short multi;
@@ -478,9 +479,9 @@
 
 
 typedef struct {
-  gchar *name;  ///< the name of the executable (so we can run it !)
-  gchar *menu_text; ///< for Weed, this is the filter_class "name"
-  gchar *action_desc; ///< for Weed "Applying $s"
+  char *name;  ///< the name of the executable (so we can run it !)
+  char *menu_text; ///< for Weed, this is the filter_class "name"
+  char *action_desc; ///< for Weed "Applying $s"
   int min_frames; ///< for Weed, 1
   int num_in_channels;
   lives_rfx_status_t status;
@@ -503,37 +504,37 @@
   lives_rfx_source_t source_type;
   void *source;  ///< points to the source (e.g. a weed_plant_t)
   void *extra;  ///< for future use
-  gchar delim[2];
+  char delim[2];
   boolean is_template;
 
 } lives_rfx_t;
 
 
-boolean check_rfx_for_lives (lives_rfx_t *);
+boolean check_rfx_for_lives(lives_rfx_t *);
 
 void do_rfx_cleanup(lives_rfx_t *);
 
-void render_fx_get_params (lives_rfx_t *, const gchar *plugin_name, short status);
+void render_fx_get_params(lives_rfx_t *, const char *plugin_name, short status);
 
-void sort_rfx_array (lives_rfx_t *in_array, int num_elements);
+void sort_rfx_array(lives_rfx_t *in_array, int num_elements);
 
-int find_rfx_plugin_by_name (const gchar *name, short status);
+int find_rfx_plugin_by_name(const char *name, short status);
 
-void rfx_copy (lives_rfx_t *src, lives_rfx_t *dest, boolean full);
+void rfx_copy(lives_rfx_t *src, lives_rfx_t *dest, boolean full);
 
 void rfx_params_free(lives_rfx_t *rfx);
 
 void rfx_free(lives_rfx_t *rfx);
 
-void rfx_free_all (void);
+void rfx_free_all(void);
 
-void param_copy (lives_param_t *src, lives_param_t *dest, boolean full);
+void param_copy(lives_param_t *src, lives_param_t *dest, boolean full);
 
 
 typedef struct {
-  GList *list; ///< list of filter_idx from which user can delegate
+  LiVESList *list; ///< list of filter_idx from which user can delegate
   int delegate; ///< offset in list of current delegate
-  gulong func; ///< menuitem activation function for current delegate
+  ulong func; ///< menuitem activation function for current delegate
   lives_rfx_t *rfx; ///< pointer to rfx for current delegate (or NULL)
 } lives_fx_candidate_t;
 
@@ -554,23 +555,23 @@
 void get_colRGB24_param(void *value, lives_colRGB24_t *rgb);
 void get_colRGBA32_param(void *value, lives_colRGBA32_t *rgba);
 
-void set_bool_param(void *value, boolean );
-void set_int_param(void *value, int );
-void set_double_param(void *value, double );
+void set_bool_param(void *value, boolean);
+void set_int_param(void *value, int);
+void set_double_param(void *value, double);
 void set_colRGB24_param(void *value, short red, short green, short blue);
 void set_colRGBA32_param(void *value, short red, short green, short blue, short alpha);
 
 /// return an array of parameter values
-void **store_rfx_params (lives_rfx_t *);
-void set_rfx_params_from_store (lives_rfx_t *rfx, void **store);
-void rfx_params_store_free (lives_rfx_t *, void **store);
+void **store_rfx_params(lives_rfx_t *);
+void set_rfx_params_from_store(lives_rfx_t *rfx, void **store);
+void rfx_params_store_free(lives_rfx_t *, void **store);
 
-GList *array_to_string_list (gchar **array, int offset, int len);
+LiVESList *array_to_string_list(char **array, int offset, int len);
 
-lives_rfx_t *weed_to_rfx (weed_plant_t *plant, boolean show_reinits);
+lives_rfx_t *weed_to_rfx(weed_plant_t *plant, boolean show_reinits);
 lives_param_t *weed_params_to_rfx(int npar, weed_plant_t *instance, boolean show_reinits);
 
-gchar *plugin_run_param_window(const gchar *get_com, LiVESVBox *vbox, lives_rfx_t **ret_rfx);
+char *plugin_run_param_window(const char *get_com, LiVESVBox *vbox, lives_rfx_t **ret_rfx);
 
 //////////////////////////////////////////////////////////////////////////////////////////
 /// video playback plugin window - fixed part
@@ -584,8 +585,8 @@
   lives_rfx_t *rfx;
 } _vppaw;
 
-_vppaw *on_vpp_advanced_clicked (LiVESButton *, gpointer);
-void on_decplug_advanced_clicked (LiVESButton *button, gpointer user_data);
+_vppaw *on_vpp_advanced_clicked(LiVESButton *, livespointer);
+void on_decplug_advanced_clicked(LiVESButton *button, livespointer user_data);
 
 
 /// for realtime effects, see effects-weed.h

LiVES-2.2.8.tar.bz2/src/preferences.c -> LiVES-2.4.1.tar.bz2/src/preferences.c Changed

@@ -32,22 +32,22 @@
 static void select_pref_list_row(uint32_t selected_idx);
 
 #ifdef ENABLE_OSC
-static void on_osc_enable_toggled (LiVESToggleButton *t1, gpointer t2) {
+static void on_osc_enable_toggled(LiVESToggleButton *t1, livespointer t2) {
   if (prefs->osc_udp_started) return;
-  lives_widget_set_sensitive (prefsw->spinbutton_osc_udp,lives_toggle_button_get_active (t1)||
-			    lives_toggle_button_get_active (LIVES_TOGGLE_BUTTON (t2)));
+  lives_widget_set_sensitive(prefsw->spinbutton_osc_udp,lives_toggle_button_get_active(t1)||
+                             lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(t2)));
 }
 #endif
 
-static void instopen_toggled (LiVESToggleButton *t1, LiVESWidget *button) {
-  lives_widget_set_sensitive (button,lives_toggle_button_get_active (t1));
+static void instopen_toggled(LiVESToggleButton *t1, LiVESWidget *button) {
+  lives_widget_set_sensitive(button,lives_toggle_button_get_active(t1));
 }
 
 
-void get_pref(const gchar *key, gchar *val, int maxlen) {
+void get_pref(const char *key, char *val, int maxlen) {
   FILE *valfile;
-  gchar *vfile;
-  gchar *com;
+  char *vfile;
+  char *com;
   int retval;
   int alarm_handle;
   boolean timeout;
@@ -55,26 +55,26 @@
   memset(val,0,maxlen);
 
   if (mainw->cached_list!=NULL) {
-    gchar *prefval=get_val_from_cached_list(key,maxlen);
+    char *prefval=get_val_from_cached_list(key,maxlen);
     if (prefval!=NULL) {
-      g_snprintf(val,maxlen,"%s",prefval);
-      g_free(prefval);
+      lives_snprintf(val,maxlen,"%s",prefval);
+      lives_free(prefval);
     }
     return;
   }
 
-  com=g_strdup_printf("%s get_pref \"%s\" %d %d",prefs->backend_sync,key,lives_getuid(),capable->mainpid);
+  com=lives_strdup_printf("%s get_pref \"%s\" %d %d",prefs->backend_sync,key,lives_getuid(),capable->mainpid);
 
   if (system(com)) {
     tempdir_warning();
-    g_free(com);
+    lives_free(com);
     return;
   }
 
 #ifndef IS_MINGW
-  vfile=g_strdup_printf("%s/.smogval.%d.%d",prefs->tmpdir,lives_getuid(),capable->mainpid);
+  vfile=lives_strdup_printf("%s/.smogval.%d.%d",prefs->tmpdir,lives_getuid(),capable->mainpid);
 #else
-  vfile=g_strdup_printf("%s/smogval.%d.%d",prefs->tmpdir,lives_getuid(),capable->mainpid);
+  vfile=lives_strdup_printf("%s/smogval.%d.%d",prefs->tmpdir,lives_getuid(),capable->mainpid);
 #endif
 
   do {
@@ -86,71 +86,68 @@
     do {
 
       if (!((valfile=fopen(vfile,"r")) || (timeout=lives_alarm_get(alarm_handle)))) {
-	if (!timeout) {
-	  if (!(mainw==NULL)) {
-	    weed_plant_t *frame_layer=mainw->frame_layer;
-	    mainw->frame_layer=NULL;
-	    lives_widget_context_update();
-	    mainw->frame_layer=frame_layer;
-	  }
-	  g_usleep(prefs->sleep_time);
-	}
-	else break;
-      }
-      else break;
+        if (!timeout) {
+          if (!(mainw==NULL)) {
+            weed_plant_t *frame_layer=mainw->frame_layer;
+            mainw->frame_layer=NULL;
+            lives_widget_context_update();
+            mainw->frame_layer=frame_layer;
+          }
+          lives_usleep(prefs->sleep_time);
+        } else break;
+      } else break;
     } while (!valfile);
 
     lives_alarm_clear(alarm_handle);
 
     if (timeout) {
       retval=do_read_failed_error_s_with_retry(vfile,NULL,NULL);
-    }
-    else {
+    } else {
       mainw->read_failed=FALSE;
       lives_fgets(val,maxlen,valfile);
       fclose(valfile);
       unlink(vfile);
       if (mainw->read_failed) {
-	retval=do_read_failed_error_s_with_retry(vfile,NULL,NULL);
+        retval=do_read_failed_error_s_with_retry(vfile,NULL,NULL);
       }
     }
-  } while (retval==LIVES_RETRY);
+  } while (retval==LIVES_RESPONSE_RETRY);
 
-  g_free(vfile);
-  g_free(com);
+  lives_free(vfile);
+  lives_free(com);
 }
 
 
 
-void get_pref_utf8(const gchar *key, gchar *val, int maxlen) {
+void get_pref_utf8(const char *key, char *val, int maxlen) {
   // get a pref in locale encoding, then convert it to utf8
-  gchar *tmp;
+  char *tmp;
   get_pref(key,val,maxlen);
-  tmp=g_filename_to_utf8(val,-1,NULL,NULL,NULL);
-  g_snprintf(val,maxlen,"%s",tmp);
-  g_free(tmp);
+  tmp=lives_filename_to_utf8(val,-1,NULL,NULL,NULL);
+  lives_snprintf(val,maxlen,"%s",tmp);
+  lives_free(tmp);
 }
 
 
 
-GList *get_list_pref(const gchar *key) {
+LiVESList *get_list_pref(const char *key) {
   // get a list of values from a preference
-  gchar **array;
-  gchar buf[65536];
+  char **array;
+  char buf[65536];
   int nvals,i;
 
-  GList *retlist=NULL;
+  LiVESList *retlist=NULL;
 
   get_pref(key,buf,65535);
   if (!strlen(buf)) return NULL;
 
   nvals=get_token_count(buf,'\n');
-  array=g_strsplit(buf,"\n",-1);
-  for (i=0;i<nvals;i++) {
-    retlist=g_list_append(retlist,g_strdup(array[i]));
+  array=lives_strsplit(buf,"\n",-1);
+  for (i=0; i<nvals; i++) {
+    retlist=lives_list_append(retlist,lives_strdup(array[i]));
   }
 
-  g_strfreev(array);
+  lives_strfreev(array);
 
   return retlist;
 }
@@ -159,10 +156,10 @@
 
 
 
-void get_pref_default(const gchar *key, gchar *val, int maxlen) {
+void get_pref_default(const char *key, char *val, int maxlen) {
   FILE *valfile;
-  gchar *vfile;
-  gchar *com=g_strdup_printf("%s get_pref_default \"%s\"",prefs->backend_sync,key);
+  char *vfile;
+  char *com=lives_strdup_printf("%s get_pref_default \"%s\"",prefs->backend_sync,key);
 
   int retval;
   int alarm_handle;
@@ -172,14 +169,14 @@
 
   if (system(com)) {
     tempdir_warning();
-    g_free(com);
+    lives_free(com);
     return;
   }
 
 #ifndef IS_MINGW
-  vfile=g_strdup_printf("%s/.smogval.%d.%d",prefs->tmpdir,lives_getuid(),capable->mainpid);
+  vfile=lives_strdup_printf("%s/.smogval.%d.%d",prefs->tmpdir,lives_getuid(),capable->mainpid);
 #else
-  vfile=g_strdup_printf("%s/smogval.%d.%d",prefs->tmpdir,lives_getuid(),capable->mainpid);
+  vfile=lives_strdup_printf("%s/smogval.%d.%d",prefs->tmpdir,lives_getuid(),capable->mainpid);
 #endif
 
   do {
@@ -191,145 +188,141 @@
 
     do {
       if (!((valfile=fopen(vfile,"r")) || (timeout=lives_alarm_get(alarm_handle)))) {
-	if (!timeout) {
-	  if (!(mainw==NULL)) {
-	    weed_plant_t *frame_layer=mainw->frame_layer;
-	    mainw->frame_layer=NULL;
-	    lives_widget_context_update();
-	    mainw->frame_layer=frame_layer;
-	  }
-	  g_usleep(prefs->sleep_time);
-	}
-	else break;
-      }
-      else break;
+        if (!timeout) {
+          if (!(mainw==NULL)) {
+            weed_plant_t *frame_layer=mainw->frame_layer;
+            mainw->frame_layer=NULL;
+            lives_widget_context_update();
+            mainw->frame_layer=frame_layer;
+          }
+          lives_usleep(prefs->sleep_time);
+        } else break;
+      } else break;
     } while (!valfile);
 
     lives_alarm_clear(alarm_handle);
 
     if (timeout) {
       retval=do_read_failed_error_s_with_retry(vfile,NULL,NULL);
-    }
-    else {
+    } else {
       mainw->read_failed=FALSE;
       lives_fgets(val,maxlen,valfile);
       fclose(valfile);
       unlink(vfile);
       if (mainw->read_failed) {
-	retval=do_read_failed_error_s_with_retry(vfile,NULL,NULL);
+        retval=do_read_failed_error_s_with_retry(vfile,NULL,NULL);
       }
     }
-  } while (retval==LIVES_RETRY);
+  } while (retval==LIVES_RESPONSE_RETRY);
 
   if (!strcmp(val,"NULL")) memset(val,0,1);
 
-  g_free(vfile);
-  g_free(com);
+  lives_free(vfile);
+  lives_free(com);
 }
 
 
-boolean get_boolean_pref(const gchar *key) {
-  gchar buffer[16];
+boolean get_boolean_pref(const char *key) {
+  char buffer[16];
   get_pref(key,buffer,16);
   if (!strcmp(buffer,"true")) return TRUE;
   return FALSE;
 }
 
-int get_int_pref(const gchar *key) {
-  gchar buffer[64];
+int get_int_pref(const char *key) {
+  char buffer[64];
   get_pref(key,buffer,64);
   if (strlen(buffer)==0) return 0;
   return atoi(buffer);
 }
 
-double get_double_pref(const gchar *key) {
-  gchar buffer[64];
+double get_double_pref(const char *key) {
+  char buffer[64];
   get_pref(key,buffer,64);
   if (strlen(buffer)==0) return 0.;
   return strtod(buffer,NULL);
 }
 
-void delete_pref(const gchar *key) {
-  gchar *com=g_strdup_printf("%s delete_pref \"%s\"",prefs->backend_sync,key);
+void delete_pref(const char *key) {
+  char *com=lives_strdup_printf("%s delete_pref \"%s\"",prefs->backend_sync,key);
   if (system(com)) {
     tempdir_warning();
   }
-  g_free(com);
+  lives_free(com);
 }
 
-void set_pref(const gchar *key, const gchar *value) {
-  gchar *com=g_strdup_printf("%s set_pref \"%s\" \"%s\"",prefs->backend_sync,key,value);
+void set_pref(const char *key, const char *value) {
+  char *com=lives_strdup_printf("%s set_pref \"%s\" \"%s\"",prefs->backend_sync,key,value);
   if (system(com)) {
     tempdir_warning();
   }
-  g_free(com);
+  lives_free(com);
 }
 
 
-void set_int_pref(const gchar *key, int value) {
-  gchar *com=g_strdup_printf("%s set_pref \"%s\" %d",prefs->backend_sync,key,value);
+void set_int_pref(const char *key, int value) {
+  char *com=lives_strdup_printf("%s set_pref \"%s\" %d",prefs->backend_sync,key,value);
   if (system(com)) {
     tempdir_warning();
   }
-  g_free(com);
+  lives_free(com);
 }
 
 
-void set_int64_pref(const gchar *key, int64_t value) {
-  gchar *com=g_strdup_printf("%s set_pref \"%s\" %"PRId64,prefs->backend_sync,key,value);
+void set_int64_pref(const char *key, int64_t value) {
+  char *com=lives_strdup_printf("%s set_pref \"%s\" %"PRId64,prefs->backend_sync,key,value);
   if (system(com)) {
     tempdir_warning();
   }
-  g_free(com);
+  lives_free(com);
 }
 
 
-void set_double_pref(const gchar *key, double value) {
-  gchar *com=g_strdup_printf("%s set_pref \"%s\" %.3f",prefs->backend_sync,key,value);
+void set_double_pref(const char *key, double value) {
+  char *com=lives_strdup_printf("%s set_pref \"%s\" %.3f",prefs->backend_sync,key,value);
   if (system(com)) {
     tempdir_warning();
   }
-  g_free(com);
+  lives_free(com);
 }
 
 
-void set_boolean_pref(const gchar *key, boolean value) {
-  gchar *com;
+void set_boolean_pref(const char *key, boolean value) {
+  char *com;
 
   if (value) {
-    com=g_strdup_printf("%s set_pref \"%s\" true",prefs->backend_sync,key);
-  }
-  else {
-    com=g_strdup_printf("%s set_pref \"%s\" false",prefs->backend_sync,key);
+    com=lives_strdup_printf("%s set_pref \"%s\" true",prefs->backend_sync,key);
+  } else {
+    com=lives_strdup_printf("%s set_pref \"%s\" false",prefs->backend_sync,key);
   }
   if (system(com)) {
     tempdir_warning();
   }
-  g_free(com);
+  lives_free(com);
 }
 
 
 
-void set_list_pref(const char *key, GList *values) {
+void set_list_pref(const char *key, LiVESList *values) {
   // set pref from a list of values
-  GList *xlist=values;
-  gchar *string=NULL,*tmp;
+  LiVESList *xlist=values;
+  char *string=NULL,*tmp;
 
   while (xlist!=NULL) {
-    if (string==NULL) string=g_strdup((gchar *)xlist->data);
+    if (string==NULL) string=lives_strdup((char *)xlist->data);
     else {
-      tmp=g_strdup_printf("%s\n%s",string,(gchar *)xlist->data);
-      g_free(string);
+      tmp=lives_strdup_printf("%s\n%s",string,(char *)xlist->data);
+      lives_free(string);
       string=tmp;
     }
     xlist=xlist->next;
   }
 
-  if (string==NULL) string=g_strdup("");
+  if (string==NULL) string=lives_strdup("");
 
   set_pref(key,string);
 
-  g_free(string);
+  lives_free(string);
 }
 
 
@@ -339,26 +332,25 @@
 void set_vpp(boolean set_in_prefs) {
   // Video Playback Plugin
 
-  if (strlen (future_prefs->vpp_name)) {
-    if (!g_ascii_strcasecmp(future_prefs->vpp_name,mainw->string_constants[LIVES_STRING_CONSTANT_NONE])) {
+  if (strlen(future_prefs->vpp_name)) {
+    if (!lives_ascii_strcasecmp(future_prefs->vpp_name,mainw->string_constants[LIVES_STRING_CONSTANT_NONE])) {
       if (mainw->vpp!=NULL) {
-	if (mainw->ext_playback) vid_playback_plugin_exit();
-	close_vid_playback_plugin(mainw->vpp);
-	mainw->vpp=NULL;
-	if (set_in_prefs) set_pref ("vid_playback_plugin","none");
+        if (mainw->ext_playback) vid_playback_plugin_exit();
+        close_vid_playback_plugin(mainw->vpp);
+        mainw->vpp=NULL;
+        if (set_in_prefs) set_pref("vid_playback_plugin","none");
       }
-    }
-    else {
+    } else {
       _vid_playback_plugin *vpp;
-      if ((vpp=open_vid_playback_plugin (future_prefs->vpp_name,TRUE))!=NULL) {
-	mainw->vpp=vpp;
-	if (set_in_prefs) {
-	  set_pref ("vid_playback_plugin",mainw->vpp->name);
-	  if (!mainw->ext_playback) 
-	    do_error_dialog_with_check_transient 
-	      (_ ("\n\nVideo playback plugins are only activated in\nfull screen, separate window (fs) mode\n"),
-	       TRUE,0,prefsw!=NULL?LIVES_WINDOW(prefsw->prefs_dialog):LIVES_WINDOW(mainw->LiVES));
-	}
+      if ((vpp=open_vid_playback_plugin(future_prefs->vpp_name,TRUE))!=NULL) {
+        mainw->vpp=vpp;
+        if (set_in_prefs) {
+          set_pref("vid_playback_plugin",mainw->vpp->name);
+          if (!mainw->ext_playback)
+            do_error_dialog_with_check_transient
+            (_("\n\nVideo playback plugins are only activated in\nfull screen, separate window (fs) mode\n"),
+             TRUE,0,prefsw!=NULL?LIVES_WINDOW(prefsw->prefs_dialog):LIVES_WINDOW(mainw->LiVES));
+        }
       }
     }
     if (set_in_prefs) mainw->write_vpp_file=TRUE;
@@ -372,77 +364,162 @@
     mainw->vpp->fixed_fps_numer=future_prefs->vpp_fixed_fps_numer;
     mainw->vpp->fixed_fps_denom=future_prefs->vpp_fixed_fps_denom;
     if (mainw->vpp->fixed_fpsd>0.) {
-      if (mainw->fixed_fpsd!=-1.||!((*mainw->vpp->set_fps) (mainw->vpp->fixed_fpsd))) {
-	do_vpp_fps_error();
-	mainw->vpp->fixed_fpsd=-1.;
-	mainw->vpp->fixed_fps_numer=0;
+      if (mainw->fixed_fpsd!=-1.||!((*mainw->vpp->set_fps)(mainw->vpp->fixed_fpsd))) {
+        do_vpp_fps_error();
+        mainw->vpp->fixed_fpsd=-1.;
+        mainw->vpp->fixed_fps_numer=0;
       }
     }
     if (!(*mainw->vpp->set_palette)(mainw->vpp->palette)) {
       do_vpp_palette_error();
     }
     mainw->vpp->YUV_clamping=future_prefs->vpp_YUV_clamping;
-    
-    if (mainw->vpp->set_yuv_palette_clamping!=NULL) (*mainw->vpp->set_yuv_palette_clamping)(mainw->vpp->YUV_clamping);
+
+    if (mainw->vpp->set_yuv_palette_clamping!=NULL)(*mainw->vpp->set_yuv_palette_clamping)(mainw->vpp->YUV_clamping);
 
     mainw->vpp->extra_argc=future_prefs->vpp_argc;
     mainw->vpp->extra_argv=future_prefs->vpp_argv;
     if (set_in_prefs) mainw->write_vpp_file=TRUE;
   }
 
-  memset (future_prefs->vpp_name,0,64);
+  memset(future_prefs->vpp_name,0,64);
   future_prefs->vpp_argv=NULL;
 }
 
 
 
 static void set_temp_label_text(LiVESLabel *label) {
-  gchar *free_ds;
-  gchar *tmpx1,*tmpx2;
-  gchar *dir=future_prefs->tmpdir;
+  char *free_ds;
+  char *tmpx1,*tmpx2;
+  char *dir=future_prefs->tmpdir;
   char *markup;
 
-  // use g_strdup* since the translation string is auto-freed() 
+  // use lives_strdup* since the translation string is auto-freed()
 
   if (!is_writeable_dir(dir)) {
-    tmpx2=g_strdup(_("\n\n\n(Free space = UNKNOWN)"));
-  }
-  else {
+    tmpx2=lives_strdup(_("\n\n\n(Free space = UNKNOWN)"));
+  } else {
     free_ds=lives_format_storage_space_string(get_fs_free(dir));
-    tmpx2=g_strdup_printf(_("\n\n\n(Free space = %s)"),free_ds);
-    g_free(free_ds);
+    tmpx2=lives_strdup_printf(_("\n\n\n(Free space = %s)"),free_ds);
+    lives_free(free_ds);
+  }
+
+  tmpx1=lives_strdup(
+          _("The temp directory is LiVES working directory where opened clips and sets are stored.\nIt should be in a partition with plenty of free disk space.\n"));
+
+#ifdef GUI_GTK
+  markup = g_markup_printf_escaped("<span background=\"white\" foreground=\"red\"><b>%s</b></span>%s",tmpx1,tmpx2);
+#endif
+#ifdef GUI_QT
+  QString qs = QString("<span background=\"white\" foreground=\"red\"><b>%s</b></span>%s").arg(tmpx1).arg(tmpx2);
+  markup=strdup((const char *)qs.toHtmlEscaped().constData());
+#endif
+
+  lives_label_set_markup(LIVES_LABEL(label), markup);
+  lives_free(markup);
+  lives_free(tmpx1);
+  lives_free(tmpx2);
+}
+
+
+
+void pref_factory_bool(int prefidx, boolean newval) {
+
+  switch (prefidx) {
+  case PREF_REC_EXT_AUDIO: {
+    boolean rec_ext_audio=newval;
+    if (rec_ext_audio&&prefs->audio_src==AUDIO_SRC_INT) {
+      prefs->audio_src=AUDIO_SRC_EXT;
+      set_int_pref("audio_src",AUDIO_SRC_EXT);
+
+      if (mainw->playing_file==-1) {
+        if (prefs->audio_player==AUD_PLAYER_JACK) {
+#ifdef ENABLE_JACK
+          if (prefs->perm_audio_reader) {
+            // create reader connection now, if permanent
+            jack_rec_audio_to_clip(-1,-1,RECA_EXTERNAL);
+          }
+#endif
+        }
+        if (prefs->audio_player==AUD_PLAYER_PULSE) {
+#ifdef HAVE_PULSE_AUDIO
+          if (prefs->perm_audio_reader) {
+            // create reader connection now, if permanent
+            pulse_rec_audio_to_clip(-1,-1,RECA_EXTERNAL);
+          }
+#endif
+        }
+      }
+
+    } else if (!rec_ext_audio&&prefs->audio_src==AUDIO_SRC_EXT) {
+      prefs->audio_src=AUDIO_SRC_INT;
+      set_int_pref("audio_src",AUDIO_SRC_INT);
+    }
+    if (prefsw!=NULL)
+      lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->rextaudio),prefs->audio_src==AUDIO_SRC_EXT);
+
+  }
+  break;
+  case PREF_SEPWIN_STICKY: {
+    lives_check_menu_item_set_active(LIVES_CHECK_MENU_ITEM(mainw->sticky),newval);
+  }
+  break;
+  case PREF_MT_EXIT_RENDER: {
+    prefs->mt_exit_render=newval;
+    if (prefsw!=NULL)
+      lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_mt_exit_render), prefs->mt_exit_render);
   }
+  break;
+  default:
+    break;
+  }
+}
 
-  tmpx1=g_strdup(_("The temp directory is LiVES working directory where opened clips and sets are stored.\nIt should be in a partition with plenty of free disk space.\n"));
 
-  markup = g_markup_printf_escaped ("<span background=\"white\" foreground=\"red\"><b>%s</b></span>%s",tmpx1,tmpx2);
-  lives_label_set_markup (LIVES_LABEL (label), markup);
-  g_free (markup);
-  g_free(tmpx1);
-  g_free(tmpx2);
+void pref_factory_int(int prefidx, int newval) {
+  // TODO
 }
 
 
 
+void pref_factory_bitmapped(int prefidx, int bitfield, boolean newval) {
+  switch (prefidx) {
+  case PREF_AUDIO_OPTS: {
+    if (newval&&!(prefs->audio_opts&bitfield)) prefs->audio_opts&=bitfield;
+    else if (!newval&&(prefs->audio_opts&bitfield)) prefs->audio_opts^=bitfield;
+    if (prefsw!=NULL) {
+      if (bitfield==AUDIO_OPTS_FOLLOW_FPS)
+        lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_afollow),(prefs->audio_opts&AUDIO_OPTS_FOLLOW_FPS)?TRUE:FALSE);
+      else if (bitfield==AUDIO_OPTS_FOLLOW_CLIPS)
+        lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_aclips),(prefs->audio_opts&AUDIO_OPTS_FOLLOW_CLIPS)?TRUE:FALSE);
+    }
+  }
+  break;
+  default:
+    break;
+  }
+}
+
+
 
 boolean apply_prefs(boolean skip_warn) {
   // set current prefs from prefs dialog
-  const gchar *video_open_command=lives_entry_get_text(LIVES_ENTRY(prefsw->video_open_entry));
-  const gchar *audio_play_command=lives_entry_get_text(LIVES_ENTRY(prefsw->audio_command_entry));
-  const gchar *def_vid_load_dir=lives_entry_get_text(LIVES_ENTRY(prefsw->vid_load_dir_entry));
-  const gchar *def_vid_save_dir=lives_entry_get_text(LIVES_ENTRY(prefsw->vid_save_dir_entry));
-  const gchar *def_audio_dir=lives_entry_get_text(LIVES_ENTRY(prefsw->audio_dir_entry));
-  const gchar *def_image_dir=lives_entry_get_text(LIVES_ENTRY(prefsw->image_dir_entry));
-  const gchar *def_proj_dir=lives_entry_get_text(LIVES_ENTRY(prefsw->proj_dir_entry));
-  const gchar *wp_path=lives_entry_get_text(LIVES_ENTRY(prefsw->wpp_entry));
-  const gchar *frei0r_path=lives_entry_get_text(LIVES_ENTRY(prefsw->frei0r_entry));
-  const gchar *ladspa_path=lives_entry_get_text(LIVES_ENTRY(prefsw->ladspa_entry));
-
-  gchar tmpdir[PATH_MAX];
-  gchar *theme = lives_combo_get_active_text( LIVES_COMBO(prefsw->theme_combo) );
-  gchar *audp = lives_combo_get_active_text( LIVES_COMBO(prefsw->audp_combo) );
-  gchar *audio_codec=NULL;
-  gchar *pb_quality = lives_combo_get_active_text( LIVES_COMBO(prefsw->pbq_combo) );
+  const char *video_open_command=lives_entry_get_text(LIVES_ENTRY(prefsw->video_open_entry));
+  const char *audio_play_command=lives_entry_get_text(LIVES_ENTRY(prefsw->audio_command_entry));
+  const char *def_vid_load_dir=lives_entry_get_text(LIVES_ENTRY(prefsw->vid_load_dir_entry));
+  const char *def_vid_save_dir=lives_entry_get_text(LIVES_ENTRY(prefsw->vid_save_dir_entry));
+  const char *def_audio_dir=lives_entry_get_text(LIVES_ENTRY(prefsw->audio_dir_entry));
+  const char *def_image_dir=lives_entry_get_text(LIVES_ENTRY(prefsw->image_dir_entry));
+  const char *def_proj_dir=lives_entry_get_text(LIVES_ENTRY(prefsw->proj_dir_entry));
+  const char *wp_path=lives_entry_get_text(LIVES_ENTRY(prefsw->wpp_entry));
+  const char *frei0r_path=lives_entry_get_text(LIVES_ENTRY(prefsw->frei0r_entry));
+  const char *ladspa_path=lives_entry_get_text(LIVES_ENTRY(prefsw->ladspa_entry));
+
+  char tmpdir[PATH_MAX];
+  char *theme = lives_combo_get_active_text(LIVES_COMBO(prefsw->theme_combo));
+  char *audp = lives_combo_get_active_text(LIVES_COMBO(prefsw->audp_combo));
+  char *audio_codec=NULL;
+  char *pb_quality = lives_combo_get_active_text(LIVES_COMBO(prefsw->pbq_combo));
 
   int pbq=PB_QUALITY_MED;
   int idx;
@@ -481,17 +558,17 @@
   boolean warn_discard_layout=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_warn_discard_layout));
   boolean warn_after_dvgrab=
 #ifdef HAVE_LDVGRAB
-lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_warn_after_dvgrab));
+    lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_warn_after_dvgrab));
 #else
-  !(prefs->warning_mask&WARN_MASK_AFTER_DVGRAB);
+    !(prefs->warning_mask&WARN_MASK_AFTER_DVGRAB);
 #endif
   boolean warn_mt_achans=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_warn_mt_achans));
   boolean warn_mt_no_jack=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_warn_mt_no_jack));
   boolean warn_yuv4m_open=
 #ifdef HAVE_YUV4MPEG
-lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_warn_yuv4m_open));
+    lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_warn_yuv4m_open));
 #else
-  !(prefs->warning_mask&WARN_MASK_OPEN_YUV4M);
+    !(prefs->warning_mask&WARN_MASK_OPEN_YUV4M);
 #endif
 
   boolean warn_layout_adel=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_warn_layout_adel));
@@ -540,7 +617,7 @@
   int mt_def_achans=atoi(lives_entry_get_text(LIVES_ENTRY(resaudw->entry_achans)));
   int mt_def_asamps=atoi(lives_entry_get_text(LIVES_ENTRY(resaudw->entry_asamps)));
   int mt_def_signed_endian=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(resaudw->rb_unsigned))*
-    AFORM_UNSIGNED+lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(resaudw->rb_bigend))*AFORM_BIG_ENDIAN;
+                           AFORM_UNSIGNED+lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(resaudw->rb_bigend))*AFORM_BIG_ENDIAN;
   int mt_undo_buf=lives_spin_button_get_value_as_int(LIVES_SPIN_BUTTON(prefsw->spinbutton_mt_undo_buf));
 
   boolean mt_exit_render=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_mt_exit_render));
@@ -580,9 +657,9 @@
   boolean jack_pwp=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_jack_pwp));
   boolean jack_read_autocon=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_jack_read_autocon));
   uint32_t jack_opts=(JACK_OPTS_TRANSPORT_CLIENT*jack_client+JACK_OPTS_TRANSPORT_MASTER*jack_master+
-		   JACK_OPTS_START_TSERVER*jack_tstart+JACK_OPTS_START_ASERVER*jack_astart+
-		   JACK_OPTS_NOPLAY_WHEN_PAUSED*!jack_pwp+JACK_OPTS_TIMEBASE_START*jack_tb_start+
-		   JACK_OPTS_TIMEBASE_CLIENT*jack_tb_client+JACK_OPTS_NO_READ_AUTOCON*!jack_read_autocon);
+                      JACK_OPTS_START_TSERVER*jack_tstart+JACK_OPTS_START_ASERVER*jack_astart+
+                      JACK_OPTS_NOPLAY_WHEN_PAUSED*!jack_pwp+JACK_OPTS_TIMEBASE_START*jack_tb_start+
+                      JACK_OPTS_TIMEBASE_CLIENT*jack_tb_client+JACK_OPTS_NO_READ_AUTOCON*!jack_read_autocon);
 #endif
 
 #ifdef RT_AUDIO
@@ -602,13 +679,13 @@
 #ifdef ENABLE_OSC
 #ifdef OMC_JS_IMPL
   boolean omc_js_enable=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_omc_js));
-  const gchar *omc_js_fname=lives_entry_get_text(LIVES_ENTRY(prefsw->omc_js_entry));
+  const char *omc_js_fname=lives_entry_get_text(LIVES_ENTRY(prefsw->omc_js_entry));
 #endif
 
 
 #ifdef OMC_MIDI_IMPL
   boolean omc_midi_enable=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_omc_midi));
-  const gchar *omc_midi_fname=lives_entry_get_text(LIVES_ENTRY(prefsw->omc_midi_entry));
+  const char *omc_midi_fname=lives_entry_get_text(LIVES_ENTRY(prefsw->omc_midi_entry));
   int midicr=lives_spin_button_get_value_as_int(LIVES_SPIN_BUTTON(prefsw->spinbutton_midicr));
   int midirpt=lives_spin_button_get_value_as_int(LIVES_SPIN_BUTTON(prefsw->spinbutton_midirpt));
 
@@ -621,15 +698,16 @@
 
   int rec_gb=lives_spin_button_get_value_as_int(LIVES_SPIN_BUTTON(prefsw->spinbutton_rec_gb));
 
-  gchar audio_player[256];
-  int listlen=g_list_length (prefs->acodec_list);
-  int rec_opts=rec_frames*REC_FRAMES+rec_fps*REC_FPS+rec_effects*REC_EFFECTS+rec_clips*REC_CLIPS+rec_audio*REC_AUDIO+rec_after_pb*REC_AFTER_PB;
+  char audio_player[256];
+  int listlen=lives_list_length(prefs->acodec_list);
+  int rec_opts=rec_frames*REC_FRAMES+rec_fps*REC_FPS+rec_effects*REC_EFFECTS+rec_clips*REC_CLIPS+rec_audio*REC_AUDIO
+               +rec_after_pb*REC_AFTER_PB;
   uint32_t warn_mask;
 
   unsigned char *new_undo_buf;
-  GList *ulist;
+  LiVESList *ulist;
+
 
- 
 #ifdef ENABLE_OSC
   boolean set_omc_dev_opts=FALSE;
 #ifdef OMC_MIDI_IMPL
@@ -637,33 +715,32 @@
 #endif
 #endif
 
-  gchar *tmp;
+  char *tmp;
 
-  gchar *cdplay_device=g_filename_from_utf8(lives_entry_get_text(LIVES_ENTRY(prefsw->cdplay_entry)),-1,NULL,NULL,NULL);
+  char *cdplay_device=lives_filename_from_utf8((char *)lives_entry_get_text(LIVES_ENTRY(prefsw->cdplay_entry)),-1,NULL,NULL,NULL);
 
   if (capable->has_encoder_plugins) {
-    audio_codec = lives_combo_get_active_text( LIVES_COMBO(prefsw->acodec_combo) );
+    audio_codec = lives_combo_get_active_text(LIVES_COMBO(prefsw->acodec_combo));
 
-    for (idx=0;idx<listlen&&strcmp((gchar *)g_list_nth_data (prefs->acodec_list,idx),audio_codec);idx++);
-    g_free(audio_codec);
+    for (idx=0; idx<listlen&&strcmp((char *)lives_list_nth_data(prefs->acodec_list,idx),audio_codec); idx++);
+    lives_free(audio_codec);
 
     if (idx==listlen) future_prefs->encoder.audio_codec=0;
     else future_prefs->encoder.audio_codec=prefs->acodec_list_to_format[idx];
-  }
-  else future_prefs->encoder.audio_codec=0;
+  } else future_prefs->encoder.audio_codec=0;
 
-  g_snprintf (tmpdir,PATH_MAX,"%s",(tmp=g_filename_from_utf8(lives_entry_get_text(LIVES_ENTRY(prefsw->tmpdir_entry)),
-							     -1,NULL,NULL,NULL)));
-  g_free(tmp);
+  lives_snprintf(tmpdir,PATH_MAX,"%s",(tmp=lives_filename_from_utf8((char *)lives_entry_get_text(LIVES_ENTRY(prefsw->tmpdir_entry)),
+                                       -1,NULL,NULL,NULL)));
+  lives_free(tmp);
 
   if (audp==NULL) memset(audio_player,0,1);
-  else if (!strncmp(audp,"mplayer",7)) g_snprintf(audio_player,256,"mplayer");
-  else if (!strncmp(audp,"mplayer2",8)) g_snprintf(audio_player,256,"mplayer2");
-  else if (!strncmp(audp,"jack",4)) g_snprintf(audio_player,256,"jack");
-  else if (!strncmp(audp,"sox",3)) g_snprintf(audio_player,256,"sox");
-  else if (!strncmp(audp,"pulse audio",11)) g_snprintf(audio_player,256,"pulse");
-  
-  g_free(audp);
+  else if (!strncmp(audp,"mplayer",7)) lives_snprintf(audio_player,256,"mplayer");
+  else if (!strncmp(audp,"mplayer2",8)) lives_snprintf(audio_player,256,"mplayer2");
+  else if (!strncmp(audp,"jack",4)) lives_snprintf(audio_player,256,"jack");
+  else if (!strncmp(audp,"sox",3)) lives_snprintf(audio_player,256,"sox");
+  else if (!strncmp(audp,"pulse audio",11)) lives_snprintf(audio_player,256,"pulse");
+
+  lives_free(audp);
 
   if (!((prefs->audio_player==AUD_PLAYER_JACK&&capable->has_jackd)||(prefs->audio_player==AUD_PLAYER_PULSE&&capable->has_pulse_audio))) {
     if (prefs->audio_src==AUDIO_SRC_EXT) prefs->audio_src=AUDIO_SRC_INT;
@@ -674,43 +751,20 @@
     set_int_pref("record_opts",prefs->rec_opts);
   }
 
-  if (rec_ext_audio&&prefs->audio_src==AUDIO_SRC_INT) {
-    prefs->audio_src=AUDIO_SRC_EXT;
-    set_int_pref("audio_src",AUDIO_SRC_EXT);
-
-    if (mainw->playing_file==-1) {
-      if (prefs->audio_player==AUD_PLAYER_JACK) {
-	if (prefs->perm_audio_reader) {
-	  // create reader connection now, if permanent
-	  jack_rec_audio_to_clip(-1,-1,RECA_EXTERNAL);
-	}
-      }
-      if (prefs->audio_player==AUD_PLAYER_PULSE) {
-	if (prefs->perm_audio_reader) {
-	  // create reader connection now, if permanent
-	  pulse_rec_audio_to_clip(-1,-1,RECA_EXTERNAL);
-	}
-      }
-    }
-
-  }
-  else if (!rec_ext_audio&&prefs->audio_src==AUDIO_SRC_EXT) {
-    prefs->audio_src=AUDIO_SRC_INT;
-    set_int_pref("audio_src",AUDIO_SRC_INT);
-  }
-
+  pref_factory_bool(PREF_REC_EXT_AUDIO, rec_ext_audio);
 
   warn_mask=!warn_fps*WARN_MASK_FPS+!warn_save_set*WARN_MASK_SAVE_SET+!warn_fsize*WARN_MASK_FSIZE+!warn_mplayer*
-    WARN_MASK_NO_MPLAYER+!warn_rendered_fx*WARN_MASK_RENDERED_FX+!warn_encoders*
-    WARN_MASK_NO_ENCODERS+!warn_layout_missing_clips*WARN_MASK_LAYOUT_MISSING_CLIPS+!warn_duplicate_set*
-    WARN_MASK_DUPLICATE_SET+!warn_layout_close*WARN_MASK_LAYOUT_CLOSE_FILE+!warn_layout_delete*
-    WARN_MASK_LAYOUT_DELETE_FRAMES+!warn_layout_shift*WARN_MASK_LAYOUT_SHIFT_FRAMES+!warn_layout_alter*
-    WARN_MASK_LAYOUT_ALTER_FRAMES+!warn_discard_layout*WARN_MASK_EXIT_MT+!warn_after_dvgrab*
-    WARN_MASK_AFTER_DVGRAB+!warn_mt_achans*WARN_MASK_MT_ACHANS+!warn_mt_no_jack*
-    WARN_MASK_MT_NO_JACK+!warn_layout_adel*WARN_MASK_LAYOUT_DELETE_AUDIO+!warn_layout_ashift*
-    WARN_MASK_LAYOUT_SHIFT_AUDIO+!warn_layout_aalt*WARN_MASK_LAYOUT_ALTER_AUDIO+!warn_layout_popup*
-    WARN_MASK_LAYOUT_POPUP+!warn_yuv4m_open*WARN_MASK_OPEN_YUV4M+!warn_mt_backup_space*
-    WARN_MASK_MT_BACKUP_SPACE+!warn_after_crash*WARN_MASK_CLEAN_AFTER_CRASH+!warn_no_pulse*WARN_MASK_NO_PULSE_CONNECT+!warn_layout_wipe*WARN_MASK_LAYOUT_WIPE;
+            WARN_MASK_NO_MPLAYER+!warn_rendered_fx*WARN_MASK_RENDERED_FX+!warn_encoders*
+            WARN_MASK_NO_ENCODERS+!warn_layout_missing_clips*WARN_MASK_LAYOUT_MISSING_CLIPS+!warn_duplicate_set*
+            WARN_MASK_DUPLICATE_SET+!warn_layout_close*WARN_MASK_LAYOUT_CLOSE_FILE+!warn_layout_delete*
+            WARN_MASK_LAYOUT_DELETE_FRAMES+!warn_layout_shift*WARN_MASK_LAYOUT_SHIFT_FRAMES+!warn_layout_alter*
+            WARN_MASK_LAYOUT_ALTER_FRAMES+!warn_discard_layout*WARN_MASK_EXIT_MT+!warn_after_dvgrab*
+            WARN_MASK_AFTER_DVGRAB+!warn_mt_achans*WARN_MASK_MT_ACHANS+!warn_mt_no_jack*
+            WARN_MASK_MT_NO_JACK+!warn_layout_adel*WARN_MASK_LAYOUT_DELETE_AUDIO+!warn_layout_ashift*
+            WARN_MASK_LAYOUT_SHIFT_AUDIO+!warn_layout_aalt*WARN_MASK_LAYOUT_ALTER_AUDIO+!warn_layout_popup*
+            WARN_MASK_LAYOUT_POPUP+!warn_yuv4m_open*WARN_MASK_OPEN_YUV4M+!warn_mt_backup_space*
+            WARN_MASK_MT_BACKUP_SPACE+!warn_after_crash*WARN_MASK_CLEAN_AFTER_CRASH+!warn_no_pulse*WARN_MASK_NO_PULSE_CONNECT
+            +!warn_layout_wipe*WARN_MASK_LAYOUT_WIPE;
 
   if (warn_mask!=prefs->warning_mask) {
     prefs->warning_mask=warn_mask;
@@ -770,52 +824,55 @@
   ensure_isdir(prefs->tmpdir);
   ensure_isdir(future_prefs->tmpdir);
 
-  if (strcmp(prefs->tmpdir,tmpdir)||strcmp (future_prefs->tmpdir,tmpdir)) {
-    if (g_file_test (tmpdir, G_FILE_TEST_EXISTS)&&(strlen (tmpdir)<10||
-						   strncmp (tmpdir+strlen (tmpdir)-10,"/"LIVES_TMP_NAME"/",10))) 
-      g_strappend (tmpdir,PATH_MAX,LIVES_TMP_NAME"/");
+  if (strcmp(prefs->tmpdir,tmpdir)||strcmp(future_prefs->tmpdir,tmpdir)) {
+    if (lives_file_test(tmpdir, LIVES_FILE_TEST_EXISTS)&&(strlen(tmpdir)<10||
+        strncmp(tmpdir+strlen(tmpdir)-10,"/"LIVES_TMP_NAME"/",10)))
+      lives_strappend(tmpdir,PATH_MAX,LIVES_TMP_NAME"/");
 
-    if (strcmp(prefs->tmpdir,tmpdir)||strcmp (future_prefs->tmpdir,tmpdir)) {
-      gchar *msg;
+    if (strcmp(prefs->tmpdir,tmpdir)||strcmp(future_prefs->tmpdir,tmpdir)) {
+      char *msg;
 
-      if (!check_dir_access (tmpdir)) {
-	tmp=g_filename_to_utf8(tmpdir,-1,NULL,NULL,NULL);
+      if (!check_dir_access(tmpdir)) {
+        tmp=lives_filename_to_utf8(tmpdir,-1,NULL,NULL,NULL);
 #ifndef IS_MINGW
-	msg=g_strdup_printf (_ ("Unable to create or write to the new temporary directory.\nYou may need to create it as the root user first, e.g:\n\nsudo mkdir -p %s; sudo chmod 777 %s\n\nThe directory will not be changed now.\n"),tmp,tmp);
+        msg=lives_strdup_printf(
+              _("Unable to create or write to the new temporary directory.\nYou may need to create it as the root user first, e.g:\n\nsudo mkdir -p %s; sudo chmod 777 %s\n\nThe directory will not be changed now.\n"),
+              tmp,tmp);
 #else
-	msg=g_strdup_printf (_ ("Unable to create or write to the new temporary directory.\n%s\nPlease try another directory or contact your system administrator.\n\nThe directory will not be changed now.\n"),tmp);
+        msg=lives_strdup_printf(
+              _("Unable to create or write to the new temporary directory.\n%s\nPlease try another directory or contact your system administrator.\n\nThe directory will not be changed now.\n"),
+              tmp);
 #endif
 
-	g_free(tmp);
-	do_blocking_error_dialog (msg);
-      }
-      else {
-	g_snprintf(future_prefs->tmpdir,PATH_MAX,"%s",tmpdir);
-	set_temp_label_text(LIVES_LABEL(prefsw->temp_label));
-	lives_widget_queue_draw(prefsw->temp_label);
-	lives_widget_context_update(); // update prefs window before showing confirmation box
+        lives_free(tmp);
+        do_blocking_error_dialog(msg);
+      } else {
+        lives_snprintf(future_prefs->tmpdir,PATH_MAX,"%s",tmpdir);
+        set_temp_label_text(LIVES_LABEL(prefsw->temp_label));
+        lives_widget_queue_draw(prefsw->temp_label);
+        lives_widget_context_update(); // update prefs window before showing confirmation box
 
-	msg=g_strdup (_ ("You have chosen to change the temporary directory.\nPlease make sure you have no other copies of LiVES open.\n\nIf you do have other copies of LiVES open, please close them now, *before* pressing OK.\n\nAlternatively, press Cancel to restore the temporary directory to its original setting."));	
+        msg=lives_strdup(
+              _("You have chosen to change the temporary directory.\nPlease make sure you have no other copies of LiVES open.\n\nIf you do have other copies of LiVES open, please close them now, *before* pressing OK.\n\nAlternatively, press Cancel to restore the temporary directory to its original setting."));
         if (do_warning_dialog(msg)) {
-	  mainw->prefs_changed=PREFS_TEMPDIR_CHANGED;
-	  needs_restart=TRUE;
-	}
-	else {
-	  g_snprintf(future_prefs->tmpdir,PATH_MAX,"%s",prefs->tmpdir);
+          mainw->prefs_changed=PREFS_TEMPDIR_CHANGED;
+          needs_restart=TRUE;
+        } else {
+          lives_snprintf(future_prefs->tmpdir,PATH_MAX,"%s",prefs->tmpdir);
           lives_entry_set_text(LIVES_ENTRY(prefsw->tmpdir_entry), prefs->tmpdir);
-	}
+        }
       }
-      g_free (msg);
+      lives_free(msg);
     }
   }
 
   // disabled_decoders
   if (string_lists_differ(prefs->disabled_decoders,future_prefs->disabled_decoders)) {
     if (prefs->disabled_decoders!=NULL) {
-      g_list_free_strings(prefs->disabled_decoders);
-      g_list_free(prefs->disabled_decoders);
+      lives_list_free_strings(prefs->disabled_decoders);
+      lives_list_free(prefs->disabled_decoders);
     }
-    prefs->disabled_decoders=g_list_copy_strings(future_prefs->disabled_decoders);
+    prefs->disabled_decoders=lives_list_copy_strings(future_prefs->disabled_decoders);
     if (prefs->disabled_decoders!=NULL) set_list_pref("disabled_decoders",prefs->disabled_decoders);
     else delete_pref("disabled_decoders");
   }
@@ -864,7 +921,7 @@
 
   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);
+      char *str=lives_strdup_printf("%d,%d",gui_monitor,play_monitor);
       set_pref("monitors",str);
       prefs->gui_monitor=gui_monitor;
       prefs->play_monitor=play_monitor;
@@ -895,11 +952,10 @@
     prefs->show_recent=show_recent;
     set_boolean_pref("show_recent_files",show_recent);
     if (prefs->show_recent) {
-      lives_widget_show (mainw->recent_menu);
+      lives_widget_show(mainw->recent_menu);
       if (mainw->multitrack!=NULL) lives_widget_show(mainw->multitrack->recent_menu);
-    }
-    else {
-      lives_widget_hide (mainw->recent_menu);
+    } else {
+      lives_widget_hide(mainw->recent_menu);
       if (mainw->multitrack!=NULL) lives_widget_hide(mainw->multitrack->recent_menu);
     }
   }
@@ -911,13 +967,12 @@
   }
 
   // jpeg/png
-  if (strcmp (prefs->image_ext,"jpg")&&ext_jpeg) {
+  if (strcmp(prefs->image_ext,"jpg")&&ext_jpeg) {
     set_pref("default_image_format","jpeg");
-    g_snprintf (prefs->image_ext,16,"jpg");
-  }
-  else if (!strcmp(prefs->image_ext,"jpg")&&!ext_jpeg) {
+    lives_snprintf(prefs->image_ext,16,"jpg");
+  } else if (!strcmp(prefs->image_ext,"jpg")&&!ext_jpeg) {
     set_pref("default_image_format","png");
-    g_snprintf (prefs->image_ext,16,"png");
+    lives_snprintf(prefs->image_ext,16,"png");
   }
 
   // instant open
@@ -948,17 +1003,17 @@
 
   // encoder
   if (strcmp(prefs->encoder.name,future_prefs->encoder.name)) {
-    g_snprintf(prefs->encoder.name,51,"%s",future_prefs->encoder.name);
+    lives_snprintf(prefs->encoder.name,51,"%s",future_prefs->encoder.name);
     set_pref("encoder",prefs->encoder.name);
-    g_snprintf(prefs->encoder.of_restrict,1024,"%s",future_prefs->encoder.of_restrict);
+    lives_snprintf(prefs->encoder.of_restrict,1024,"%s",future_prefs->encoder.of_restrict);
     prefs->encoder.of_allowed_acodecs=future_prefs->encoder.of_allowed_acodecs;
   }
 
   // output format
   if (strcmp(prefs->encoder.of_name,future_prefs->encoder.of_name)) {
-    g_snprintf(prefs->encoder.of_name,51,"%s",future_prefs->encoder.of_name);
-    g_snprintf(prefs->encoder.of_restrict,1024,"%s",future_prefs->encoder.of_restrict);
-    g_snprintf(prefs->encoder.of_desc,128,"%s",future_prefs->encoder.of_desc);
+    lives_snprintf(prefs->encoder.of_name,51,"%s",future_prefs->encoder.of_name);
+    lives_snprintf(prefs->encoder.of_restrict,1024,"%s",future_prefs->encoder.of_restrict);
+    lives_snprintf(prefs->encoder.of_desc,128,"%s",future_prefs->encoder.of_desc);
     prefs->encoder.of_allowed_acodecs=future_prefs->encoder.of_allowed_acodecs;
     set_pref("output_type",prefs->encoder.of_name);
   }
@@ -966,16 +1021,16 @@
   if (prefs->encoder.audio_codec!=future_prefs->encoder.audio_codec) {
     prefs->encoder.audio_codec=future_prefs->encoder.audio_codec;
     if (prefs->encoder.audio_codec<AUDIO_CODEC_UNKNOWN) {
-      set_int_pref ("encoder_acodec",prefs->encoder.audio_codec);
+      set_int_pref("encoder_acodec",prefs->encoder.audio_codec);
     }
   }
 
   // pb quality
-  if (!strcmp(pb_quality,(gchar *)g_list_nth_data(prefsw->pbq_list,0))) pbq=PB_QUALITY_LOW;
-  if (!strcmp(pb_quality,(gchar *)g_list_nth_data(prefsw->pbq_list,1))) pbq=PB_QUALITY_MED;
-  if (!strcmp(pb_quality,(gchar *)g_list_nth_data(prefsw->pbq_list,2))) pbq=PB_QUALITY_HIGH;
+  if (!strcmp(pb_quality,(char *)lives_list_nth_data(prefsw->pbq_list,0))) pbq=PB_QUALITY_LOW;
+  if (!strcmp(pb_quality,(char *)lives_list_nth_data(prefsw->pbq_list,1))) pbq=PB_QUALITY_MED;
+  if (!strcmp(pb_quality,(char *)lives_list_nth_data(prefsw->pbq_list,2))) pbq=PB_QUALITY_HIGH;
 
-  g_free(pb_quality);
+  lives_free(pb_quality);
 
   if (pbq!=prefs->pb_quality) {
     prefs->pb_quality=pbq;
@@ -984,7 +1039,7 @@
 
   // video open command
   if (strcmp(prefs->video_open_command,video_open_command)) {
-    g_snprintf(prefs->video_open_command,256,"%s",video_open_command);
+    lives_snprintf(prefs->video_open_command,256,"%s",video_open_command);
     set_pref("video_open_command",prefs->video_open_command);
   }
 
@@ -993,73 +1048,72 @@
 
   // audio play command
   if (strcmp(prefs->audio_play_command,audio_play_command)) {
-    g_snprintf(prefs->audio_play_command,256,"%s",audio_play_command);
+    lives_snprintf(prefs->audio_play_command,256,"%s",audio_play_command);
     set_pref("audio_play_command",prefs->audio_play_command);
   }
 
   // cd play device
   if (!capable->has_cdda2wav) {
     if (strcmp(prefs->cdplay_device,cdplay_device)) {
-      g_snprintf(prefs->cdplay_device,256,"%s",cdplay_device);
+      lives_snprintf(prefs->cdplay_device,256,"%s",cdplay_device);
       set_pref("cdplay_device",prefs->cdplay_device);
     }
   }
 
-  g_free(cdplay_device);
+  lives_free(cdplay_device);
 
   // default video load directory
   if (strcmp(prefs->def_vid_load_dir,def_vid_load_dir)) {
-    g_snprintf(prefs->def_vid_load_dir,PATH_MAX,"%s/",def_vid_load_dir);
+    lives_snprintf(prefs->def_vid_load_dir,PATH_MAX,"%s/",def_vid_load_dir);
     get_dirname(prefs->def_vid_load_dir);
     set_pref("vid_load_dir",prefs->def_vid_load_dir);
-    g_snprintf(mainw->vid_load_dir,PATH_MAX,"%s",prefs->def_vid_load_dir);
+    lives_snprintf(mainw->vid_load_dir,PATH_MAX,"%s",prefs->def_vid_load_dir);
   }
 
   // default video save directory
   if (strcmp(prefs->def_vid_save_dir,def_vid_save_dir)) {
-    g_snprintf(prefs->def_vid_save_dir,PATH_MAX,"%s/",def_vid_save_dir);
+    lives_snprintf(prefs->def_vid_save_dir,PATH_MAX,"%s/",def_vid_save_dir);
     get_dirname(prefs->def_vid_save_dir);
     set_pref("vid_save_dir",prefs->def_vid_save_dir);
-    g_snprintf(mainw->vid_save_dir,PATH_MAX,"%s",prefs->def_vid_save_dir);
+    lives_snprintf(mainw->vid_save_dir,PATH_MAX,"%s",prefs->def_vid_save_dir);
   }
 
   // default audio directory
   if (strcmp(prefs->def_audio_dir,def_audio_dir)) {
-    g_snprintf(prefs->def_audio_dir,PATH_MAX,"%s/",def_audio_dir);
+    lives_snprintf(prefs->def_audio_dir,PATH_MAX,"%s/",def_audio_dir);
     get_dirname(prefs->def_audio_dir);
     set_pref("audio_dir",prefs->def_audio_dir);
-    g_snprintf(mainw->audio_dir,PATH_MAX,"%s",prefs->def_audio_dir);
+    lives_snprintf(mainw->audio_dir,PATH_MAX,"%s",prefs->def_audio_dir);
   }
 
   // default image directory
   if (strcmp(prefs->def_image_dir,def_image_dir)) {
-    g_snprintf(prefs->def_image_dir,PATH_MAX,"%s/",def_image_dir);
+    lives_snprintf(prefs->def_image_dir,PATH_MAX,"%s/",def_image_dir);
     get_dirname(prefs->def_image_dir);
     set_pref("image_dir",prefs->def_image_dir);
-    g_snprintf(mainw->image_dir,PATH_MAX,"%s",prefs->def_image_dir);
+    lives_snprintf(mainw->image_dir,PATH_MAX,"%s",prefs->def_image_dir);
   }
 
   // default project directory - for backup and restore
   if (strcmp(prefs->def_proj_dir,def_proj_dir)) {
-    g_snprintf(prefs->def_proj_dir,PATH_MAX,"%s/",def_proj_dir);
+    lives_snprintf(prefs->def_proj_dir,PATH_MAX,"%s/",def_proj_dir);
     get_dirname(prefs->def_proj_dir);
     set_pref("proj_dir",prefs->def_proj_dir);
-    g_snprintf(mainw->proj_load_dir,PATH_MAX,"%s",prefs->def_proj_dir);
-    g_snprintf(mainw->proj_save_dir,PATH_MAX,"%s",prefs->def_proj_dir);
+    lives_snprintf(mainw->proj_load_dir,PATH_MAX,"%s",prefs->def_proj_dir);
+    lives_snprintf(mainw->proj_save_dir,PATH_MAX,"%s",prefs->def_proj_dir);
   }
 
   // the theme
-  if (strcmp(future_prefs->theme,theme)&&!(!g_ascii_strcasecmp(future_prefs->theme,"none")&&
-					   !strcmp(theme,mainw->string_constants[LIVES_STRING_CONSTANT_NONE]))) {
+  if (strcmp(future_prefs->theme,theme)&&!(!lives_ascii_strcasecmp(future_prefs->theme,"none")&&
+      !strcmp(theme,mainw->string_constants[LIVES_STRING_CONSTANT_NONE]))) {
     if (strcmp(theme,mainw->string_constants[LIVES_STRING_CONSTANT_NONE])) {
-      g_snprintf(future_prefs->theme,64,"%s",theme);
-    }
-    else g_snprintf(future_prefs->theme,64,"none");
+      lives_snprintf(future_prefs->theme,64,"%s",theme);
+    } else lives_snprintf(future_prefs->theme,64,"none");
     set_pref("gui_theme",future_prefs->theme);
     mainw->prefs_changed|=PREFS_THEME_CHANGED;
   }
 
-  g_free(theme);
+  lives_free(theme);
 
   // default fps
   if (prefs->default_fps!=default_fps) {
@@ -1085,7 +1139,7 @@
 
   if (ins_speed==prefs->ins_resample) {
     prefs->ins_resample=!ins_speed;
-    set_boolean_pref ("insert_resample",prefs->ins_resample);
+    set_boolean_pref("insert_resample",prefs->ins_resample);
   }
 
 
@@ -1112,8 +1166,7 @@
     prefs->osc_udp_port=osc_udp_port;
     // try to start on new port number
     if (!prefs->osc_udp_started) prefs->osc_udp_started=lives_osc_init(prefs->osc_udp_port);
-  }
-  else {
+  } else {
     if (prefs->osc_udp_started) {
       lives_osc_end();
       prefs->osc_udp_started=FALSE;
@@ -1124,8 +1177,7 @@
       set_boolean_pref("osc_start",TRUE);
       future_prefs->osc_start=TRUE;
     }
-  }
-  else {
+  } else {
     if (future_prefs->osc_start) {
       set_boolean_pref("osc_start",FALSE);
       future_prefs->osc_start=FALSE;
@@ -1133,7 +1185,7 @@
   }
   if (prefs->osc_udp_port!=osc_udp_port) {
     prefs->osc_udp_port=osc_udp_port;
-    set_int_pref ("osc_port",osc_udp_port);
+    set_int_pref("osc_port",osc_udp_port);
   }
 #endif
 
@@ -1166,52 +1218,50 @@
 
   if (prefs->audio_player==AUD_PLAYER_JACK&&!capable->has_jackd) {
     do_error_dialog_with_check_transient
-      (_("\nUnable to switch audio players to jack - jackd must be installed first.\nSee http://jackaudio.org\n"),
-       TRUE,0,prefsw!=NULL?LIVES_WINDOW(prefsw->prefs_dialog):LIVES_WINDOW(mainw->LiVES));
-  }
-  else {
+    (_("\nUnable to switch audio players to jack - jackd must be installed first.\nSee http://jackaudio.org\n"),
+     TRUE,0,prefsw!=NULL?LIVES_WINDOW(prefsw->prefs_dialog):LIVES_WINDOW(mainw->LiVES));
+  } else {
     if (prefs->audio_player==AUD_PLAYER_JACK&&strcmp(audio_player,"jack")) {
       do_error_dialog_with_check_transient
-	(_("\nSwitching audio players requires restart (jackd must not be running)\n"),
-	 TRUE,0,prefsw!=NULL?LIVES_WINDOW(prefsw->prefs_dialog):LIVES_WINDOW(mainw->LiVES));
+      (_("\nSwitching audio players requires restart (jackd must not be running)\n"),
+       TRUE,0,prefsw!=NULL?LIVES_WINDOW(prefsw->prefs_dialog):LIVES_WINDOW(mainw->LiVES));
     }
 
     // switch to sox
     if (!(strcmp(audio_player,"sox"))&&prefs->audio_player!=AUD_PLAYER_SOX) {
       switch_aud_to_sox(TRUE);
     }
-    
+
     // switch to jack
     else if (!(strcmp(audio_player,"jack"))&&prefs->audio_player!=AUD_PLAYER_JACK) {
       // may fail
       if (!switch_aud_to_jack()) {
-	do_jack_noopen_warn();
-	lives_combo_set_active_string(LIVES_COMBO(prefsw->audp_combo), prefsw->orig_audp_name);
+        do_jack_noopen_warn();
+        lives_combo_set_active_string(LIVES_COMBO(prefsw->audp_combo), prefsw->orig_audp_name);
       }
     }
-    
+
     // switch to mplayer audio
-    else if (!(strcmp (audio_player,"mplayer"))&&prefs->audio_player!=AUD_PLAYER_MPLAYER) {
+    else if (!(strcmp(audio_player,"mplayer"))&&prefs->audio_player!=AUD_PLAYER_MPLAYER) {
       switch_aud_to_mplayer(TRUE);
     }
 
     // switch to pulse audio
-    else if (!(strcmp (audio_player,"pulse"))&&prefs->audio_player!=AUD_PLAYER_PULSE) {
+    else if (!(strcmp(audio_player,"pulse"))&&prefs->audio_player!=AUD_PLAYER_PULSE) {
       if (!capable->has_pulse_audio) {
-	do_error_dialog_with_check_transient
-	  (_("\nUnable to switch audio players to pulse audio\npulseaudio must be installed first.\nSee http://www.pulseaudio.org\n"),
-	   TRUE,0,prefsw!=NULL?LIVES_WINDOW(prefsw->prefs_dialog):LIVES_WINDOW(mainw->LiVES));
-      }
-      else {
-	if (!switch_aud_to_pulse()) {
-	  // revert text
-	  lives_combo_set_active_string(LIVES_COMBO(prefsw->audp_combo), prefsw->orig_audp_name);
-	}
+        do_error_dialog_with_check_transient
+        (_("\nUnable to switch audio players to pulse audio\npulseaudio must be installed first.\nSee http://www.pulseaudio.org\n"),
+         TRUE,0,prefsw!=NULL?LIVES_WINDOW(prefsw->prefs_dialog):LIVES_WINDOW(mainw->LiVES));
+      } else {
+        if (!switch_aud_to_pulse()) {
+          // revert text
+          lives_combo_set_active_string(LIVES_COMBO(prefsw->audp_combo), prefsw->orig_audp_name);
+        }
       }
     }
-    
+
     // switch to mplayer2 audio
-    else if (!(strcmp (audio_player,"mplayer2"))&&prefs->audio_player!=AUD_PLAYER_MPLAYER2) {
+    else if (!(strcmp(audio_player,"mplayer2"))&&prefs->audio_player!=AUD_PLAYER_MPLAYER2) {
       switch_aud_to_mplayer2(TRUE);
     }
     //
@@ -1230,15 +1280,14 @@
 #ifdef ENABLE_OSC
 #ifdef OMC_JS_IMPL
   if (strcmp(omc_js_fname,prefs->omc_js_fname)) {
-    g_snprintf(prefs->omc_js_fname,256,"%s",omc_js_fname);
+    lives_snprintf(prefs->omc_js_fname,256,"%s",omc_js_fname);
     set_pref("omc_js_fname",omc_js_fname);
   }
   if (omc_js_enable!=((prefs->omc_dev_opts&OMC_DEV_JS)/OMC_DEV_JS)) {
     if (omc_js_enable) {
       prefs->omc_dev_opts|=OMC_DEV_JS;
       js_open();
-    }
-    else {
+    } else {
       prefs->omc_dev_opts^=OMC_DEV_JS;
       js_close();
     }
@@ -1249,7 +1298,7 @@
 
 #ifdef OMC_MIDI_IMPL
   if (strcmp(omc_midi_fname,prefs->omc_midi_fname)) {
-    g_snprintf(prefs->omc_midi_fname,256,"%s",omc_midi_fname);
+    lives_snprintf(prefs->omc_midi_fname,256,"%s",omc_midi_fname);
     set_pref("omc_midi_fname",omc_midi_fname);
   }
 
@@ -1267,8 +1316,7 @@
     if (omc_midi_enable) {
       prefs->omc_dev_opts|=OMC_DEV_MIDI;
       needs_midi_restart=TRUE;
-    }
-    else {
+    } else {
       prefs->omc_dev_opts^=OMC_DEV_MIDI;
       midi_close();
     }
@@ -1285,8 +1333,7 @@
     if (!use_alsa_midi) {
       prefs->omc_dev_opts|=OMC_DEV_FORCE_RAW_MIDI;
       prefs->use_alsa_midi=TRUE;
-    }
-    else {
+    } else {
       prefs->omc_dev_opts^=OMC_DEV_FORCE_RAW_MIDI;
       prefs->use_alsa_midi=FALSE;
     }
@@ -1354,39 +1401,35 @@
     prefs->mt_def_signed_endian=mt_def_signed_endian;
     set_int_pref("mt_def_signed_endian",mt_def_signed_endian);
   }
-  
+
   if (mt_undo_buf!=prefs->mt_undo_buf) {
-    if ((new_undo_buf=(unsigned char *)g_try_malloc(mt_undo_buf*1024*1024))==NULL) {
+    if ((new_undo_buf=(unsigned char *)lives_try_malloc(mt_undo_buf*1024*1024))==NULL) {
       do_mt_set_mem_error(mainw->multitrack!=NULL,skip_warn);
-    }
-    else {
+    } else {
       if (mainw->multitrack!=NULL) {
-	if (mainw->multitrack->undo_mem!=NULL) {
-	  if (mt_undo_buf<prefs->mt_undo_buf) {
-	    ssize_t space_needed=mainw->multitrack->undo_buffer_used-(size_t)(mt_undo_buf*1024*1024);
-	    if (space_needed>0) make_backup_space(mainw->multitrack,space_needed);
-	    memcpy(new_undo_buf,mainw->multitrack->undo_mem,mt_undo_buf*1024*1024);
-	  }
-	  else memcpy(new_undo_buf,mainw->multitrack->undo_mem,prefs->mt_undo_buf*1024*1024);
-	  ulist=mainw->multitrack->undos;
-	  while (ulist!=NULL) {
-	    ulist->data=new_undo_buf+((unsigned char *)ulist->data-mainw->multitrack->undo_mem);
-	    ulist=ulist->next;
-	  }
-	  g_free(mainw->multitrack->undo_mem);
-	  mainw->multitrack->undo_mem=new_undo_buf;
-	}
-	else {
-	  mainw->multitrack->undo_mem=(unsigned char *)g_try_malloc(mt_undo_buf*1024*1024);
-	  if (mainw->multitrack->undo_mem==NULL) {
-	    do_mt_set_mem_error(TRUE,skip_warn);
-	  }
-	  else {
-	    mainw->multitrack->undo_buffer_used=0;
-	    mainw->multitrack->undos=NULL;
-	    mainw->multitrack->undo_offset=0;
-	  }
-	}
+        if (mainw->multitrack->undo_mem!=NULL) {
+          if (mt_undo_buf<prefs->mt_undo_buf) {
+            ssize_t space_needed=mainw->multitrack->undo_buffer_used-(size_t)(mt_undo_buf*1024*1024);
+            if (space_needed>0) make_backup_space(mainw->multitrack,space_needed);
+            memcpy(new_undo_buf,mainw->multitrack->undo_mem,mt_undo_buf*1024*1024);
+          } else memcpy(new_undo_buf,mainw->multitrack->undo_mem,prefs->mt_undo_buf*1024*1024);
+          ulist=mainw->multitrack->undos;
+          while (ulist!=NULL) {
+            ulist->data=new_undo_buf+((unsigned char *)ulist->data-mainw->multitrack->undo_mem);
+            ulist=ulist->next;
+          }
+          lives_free(mainw->multitrack->undo_mem);
+          mainw->multitrack->undo_mem=new_undo_buf;
+        } else {
+          mainw->multitrack->undo_mem=(unsigned char *)lives_try_malloc(mt_undo_buf*1024*1024);
+          if (mainw->multitrack->undo_mem==NULL) {
+            do_mt_set_mem_error(TRUE,skip_warn);
+          } else {
+            mainw->multitrack->undo_buffer_used=0;
+            mainw->multitrack->undos=NULL;
+            mainw->multitrack->undo_offset=0;
+          }
+        }
       }
       prefs->mt_undo_buf=mt_undo_buf;
       set_int_pref("mt_undo_buf",mt_undo_buf);
@@ -1404,13 +1447,12 @@
   if (startup_ce&&future_prefs->startup_interface!=STARTUP_CE) {
     future_prefs->startup_interface=STARTUP_CE;
     set_int_pref("startup_interface",STARTUP_CE);
-    if ((mainw->multitrack!=NULL&&mainw->multitrack->event_list!=NULL)||mainw->stored_event_list!=NULL) 
+    if ((mainw->multitrack!=NULL&&mainw->multitrack->event_list!=NULL)||mainw->stored_event_list!=NULL)
       write_backup_layout_numbering(mainw->multitrack);
-  }
-  else if (!startup_ce&&future_prefs->startup_interface!=STARTUP_MT) {
+  } else if (!startup_ce&&future_prefs->startup_interface!=STARTUP_MT) {
     future_prefs->startup_interface=STARTUP_MT;
     set_int_pref("startup_interface",STARTUP_MT);
-    if ((mainw->multitrack!=NULL&&mainw->multitrack->event_list!=NULL)||mainw->stored_event_list!=NULL) 
+    if ((mainw->multitrack!=NULL&&mainw->multitrack->event_list!=NULL)||mainw->stored_event_list!=NULL)
       write_backup_layout_numbering(mainw->multitrack);
   }
 
@@ -1435,24 +1477,24 @@
     set_pref("tempdir",future_prefs->tmpdir);
   }
   if (prefs->show_tool!=future_prefs->show_tool) {
-    set_boolean_pref ("show_toolbar",future_prefs->show_tool);
+    set_boolean_pref("show_toolbar",future_prefs->show_tool);
   }
 
 
 }
 
 
-void rdet_acodec_changed (LiVESCombo *acodec_combo, gpointer user_data) {
-  int listlen=g_list_length (prefs->acodec_list);
+void rdet_acodec_changed(LiVESCombo *acodec_combo, livespointer user_data) {
+  int listlen=lives_list_length(prefs->acodec_list);
   int idx;
   char *audio_codec = lives_combo_get_active_text(acodec_combo);
   if (!strcmp(audio_codec,mainw->string_constants[LIVES_STRING_CONSTANT_ANY])) {
-    g_free(audio_codec);
+    lives_free(audio_codec);
     return;
   }
 
-  for (idx=0;idx<listlen&&strcmp((gchar *)g_list_nth_data (prefs->acodec_list,idx),audio_codec);idx++);
-  g_free(audio_codec);
+  for (idx=0; idx<listlen&&strcmp((char *)lives_list_nth_data(prefs->acodec_list,idx),audio_codec); idx++);
+  lives_free(audio_codec);
 
   if (idx==listlen) future_prefs->encoder.audio_codec=0;
   else future_prefs->encoder.audio_codec=prefs->acodec_list_to_format[idx];
@@ -1460,7 +1502,7 @@
   if (prefs->encoder.audio_codec!=future_prefs->encoder.audio_codec) {
     prefs->encoder.audio_codec=future_prefs->encoder.audio_codec;
     if (prefs->encoder.audio_codec<AUDIO_CODEC_UNKNOWN) {
-      set_int_pref ("encoder_acodec",prefs->encoder.audio_codec);
+      set_int_pref("encoder_acodec",prefs->encoder.audio_codec);
     }
   }
 }
@@ -1469,21 +1511,21 @@
 
 
 
-void set_acodec_list_from_allowed (_prefsw *prefsw, render_details *rdet) {
+void set_acodec_list_from_allowed(_prefsw *prefsw, render_details *rdet) {
   // could be done better, but no time...
   // get settings for current format
 
 
   int count=0,idx;
   boolean is_allowed=FALSE;
-  
+
   if (prefs->acodec_list!=NULL) {
-    g_list_free (prefs->acodec_list);
+    lives_list_free(prefs->acodec_list);
     prefs->acodec_list=NULL;
   }
 
   if (future_prefs->encoder.of_allowed_acodecs==0) {
-    prefs->acodec_list = g_list_append (prefs->acodec_list, g_strdup(mainw->string_constants[LIVES_STRING_CONSTANT_NONE]));
+    prefs->acodec_list = lives_list_append(prefs->acodec_list, lives_strdup(mainw->string_constants[LIVES_STRING_CONSTANT_NONE]));
     future_prefs->encoder.audio_codec=prefs->acodec_list_to_format[0]=AUDIO_CODEC_NONE;
 
     if (prefsw!=NULL) {
@@ -1496,32 +1538,32 @@
     }
     return;
   }
-  for (idx=0;strlen(anames[idx]);idx++) {
+  for (idx=0; strlen(anames[idx]); idx++) {
     if (future_prefs->encoder.of_allowed_acodecs&(1<<idx)) {
-      if (idx==AUDIO_CODEC_PCM) prefs->acodec_list=g_list_append (prefs->acodec_list,
-								  g_strdup(_ ("PCM (highest quality; largest files)")));
-      else prefs->acodec_list=g_list_append (prefs->acodec_list,g_strdup(anames[idx]));
+      if (idx==AUDIO_CODEC_PCM) prefs->acodec_list=lives_list_append(prefs->acodec_list,
+            lives_strdup(_("PCM (highest quality; largest files)")));
+      else prefs->acodec_list=lives_list_append(prefs->acodec_list,lives_strdup(anames[idx]));
       prefs->acodec_list_to_format[count++]=idx;
       if (future_prefs->encoder.audio_codec==idx) is_allowed=TRUE;
     }
   }
 
-  if (prefsw != NULL){
+  if (prefsw != NULL) {
     lives_combo_populate(LIVES_COMBO(prefsw->acodec_combo), prefs->acodec_list);
   }
-  if (rdet != NULL){
+  if (rdet != NULL) {
     lives_combo_populate(LIVES_COMBO(rdet->acodec_combo), prefs->acodec_list);
   }
   if (!is_allowed) {
     future_prefs->encoder.audio_codec=prefs->acodec_list_to_format[0];
   }
 
-  for (idx=0; idx < g_list_length(prefs->acodec_list); idx++) {
+  for (idx=0; idx < lives_list_length(prefs->acodec_list); idx++) {
     if (prefs->acodec_list_to_format[idx]==future_prefs->encoder.audio_codec) {
-      if (prefsw!=NULL){
+      if (prefsw!=NULL) {
         lives_combo_set_active_index(LIVES_COMBO(prefsw->acodec_combo), idx);
       }
-      if (rdet!=NULL){
+      if (rdet!=NULL) {
         lives_combo_set_active_index(LIVES_COMBO(rdet->acodec_combo), idx);
       }
       break;
@@ -1530,30 +1572,29 @@
 }
 
 
-void after_vpp_changed (LiVESWidget *vpp_combo, gpointer advbutton) {
-  gchar *newvpp=lives_combo_get_active_text(LIVES_COMBO(vpp_combo));
+void after_vpp_changed(LiVESWidget *vpp_combo, livespointer advbutton) {
+  char *newvpp=lives_combo_get_active_text(LIVES_COMBO(vpp_combo));
   _vid_playback_plugin *tmpvpp;
 
-  if (!g_ascii_strcasecmp(newvpp,mainw->string_constants[LIVES_STRING_CONSTANT_NONE])) {
-    lives_widget_set_sensitive (LIVES_WIDGET(advbutton), FALSE);
-  }
-  else {
-    lives_widget_set_sensitive (LIVES_WIDGET(advbutton), TRUE);
+  if (!lives_ascii_strcasecmp(newvpp,mainw->string_constants[LIVES_STRING_CONSTANT_NONE])) {
+    lives_widget_set_sensitive(LIVES_WIDGET(advbutton), FALSE);
+  } else {
+    lives_widget_set_sensitive(LIVES_WIDGET(advbutton), TRUE);
 
     // will call set_astream_settings
-    if ((tmpvpp=open_vid_playback_plugin (newvpp, FALSE))==NULL) {
-      g_free(newvpp);
+    if ((tmpvpp=open_vid_playback_plugin(newvpp, FALSE))==NULL) {
+      lives_free(newvpp);
       return;
     }
     close_vid_playback_plugin(tmpvpp);
   }
-  g_snprintf (future_prefs->vpp_name,64,"%s",newvpp);
-  g_free(newvpp);
+  lives_snprintf(future_prefs->vpp_name,64,"%s",newvpp);
+  lives_free(newvpp);
 
   if (future_prefs->vpp_argv!=NULL) {
     register int i;
-    for (i=0;future_prefs->vpp_argv[i]!=NULL;g_free(future_prefs->vpp_argv[i++]));
-    g_free(future_prefs->vpp_argv);
+    for (i=0; future_prefs->vpp_argv[i]!=NULL; lives_free(future_prefs->vpp_argv[i++]));
+    lives_free(future_prefs->vpp_argv);
     future_prefs->vpp_argv=NULL;
   }
   future_prefs->vpp_argc=0;
@@ -1565,25 +1606,25 @@
 
 
 
-static void on_forcesmon_toggled (LiVESToggleButton *tbutton, gpointer user_data) {
+static void on_forcesmon_toggled(LiVESToggleButton *tbutton, livespointer user_data) {
   int gui_monitor=lives_spin_button_get_value(LIVES_SPIN_BUTTON(prefsw->spinbutton_gmoni));
   int play_monitor=lives_spin_button_get_value(LIVES_SPIN_BUTTON(prefsw->spinbutton_pmoni));
   lives_widget_set_sensitive(prefsw->spinbutton_gmoni,!lives_toggle_button_get_active(tbutton));
   lives_widget_set_sensitive(prefsw->spinbutton_pmoni,!lives_toggle_button_get_active(tbutton));
   lives_widget_set_sensitive(prefsw->ce_thumbs,!lives_toggle_button_get_active(tbutton)&&
-			     play_monitor!=gui_monitor&&
-			     play_monitor!=0&&capable->nmonitors>0);
+                             play_monitor!=gui_monitor&&
+                             play_monitor!=0&&capable->nmonitors>0);
 }
 
-static void pmoni_gmoni_changed (LiVESWidget *sbut, gpointer advbutton) {
+static void pmoni_gmoni_changed(LiVESWidget *sbut, livespointer advbutton) {
   int gui_monitor=lives_spin_button_get_value(LIVES_SPIN_BUTTON(prefsw->spinbutton_gmoni));
   int play_monitor=lives_spin_button_get_value(LIVES_SPIN_BUTTON(prefsw->spinbutton_pmoni));
   lives_widget_set_sensitive(prefsw->ce_thumbs,play_monitor!=gui_monitor&&
-			     play_monitor!=0&&!lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->forcesmon))&&
-			     capable->nmonitors>0);
+                             play_monitor!=0&&!lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->forcesmon))&&
+                             capable->nmonitors>0);
 }
 
-static void on_mtbackevery_toggled (LiVESToggleButton *tbutton, gpointer user_data) {
+static void on_mtbackevery_toggled(LiVESToggleButton *tbutton, livespointer user_data) {
   _prefsw *xprefsw;
 
   if (user_data!=NULL) xprefsw=(_prefsw *)user_data;
@@ -1594,29 +1635,27 @@
 }
 
 #ifdef ENABLE_JACK_TRANSPORT
-static void after_jack_client_toggled(LiVESToggleButton *tbutton, gpointer user_data) {
+static void after_jack_client_toggled(LiVESToggleButton *tbutton, livespointer user_data) {
 
   if (!lives_toggle_button_get_active(tbutton)) {
     lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_jack_tb_start),FALSE);
     lives_widget_set_sensitive(prefsw->checkbutton_jack_tb_start,FALSE);
-  }
-  else {
+  } else {
     lives_widget_set_sensitive(prefsw->checkbutton_jack_tb_start,TRUE);
-    lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_jack_tb_start),
-				    (future_prefs->jack_opts&JACK_OPTS_TIMEBASE_START)?TRUE:FALSE);
+    lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_jack_tb_start),
+                                   (future_prefs->jack_opts&JACK_OPTS_TIMEBASE_START)?TRUE:FALSE);
   }
 }
 
-static void after_jack_tb_start_toggled(LiVESToggleButton *tbutton, gpointer user_data) {
+static void after_jack_tb_start_toggled(LiVESToggleButton *tbutton, livespointer user_data) {
 
   if (!lives_toggle_button_get_active(tbutton)) {
     lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_jack_tb_client),FALSE);
     lives_widget_set_sensitive(prefsw->checkbutton_jack_tb_client,FALSE);
-  }
-  else {
+  } else {
     lives_widget_set_sensitive(prefsw->checkbutton_jack_tb_client,TRUE);
-    lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_jack_tb_client),
-				    (future_prefs->jack_opts&JACK_OPTS_TIMEBASE_CLIENT)?TRUE:FALSE);
+    lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_jack_tb_client),
+                                   (future_prefs->jack_opts&JACK_OPTS_TIMEBASE_CLIENT)?TRUE:FALSE);
   }
 }
 #endif
@@ -1625,7 +1664,7 @@
 #ifdef ENABLE_OSC
 #ifdef OMC_MIDI_IMPL
 #ifdef ALSA_MIDI
-static void on_alsa_midi_toggled (LiVESToggleButton *tbutton, gpointer user_data) {
+static void on_alsa_midi_toggled(LiVESToggleButton *tbutton, livespointer user_data) {
   _prefsw *xprefsw;
 
   if (user_data!=NULL) xprefsw=(_prefsw *)user_data;
@@ -1641,11 +1680,11 @@
 #endif
 
 
-static void on_audp_entry_changed (LiVESWidget *audp_combo, gpointer ptr) {
-  gchar *audp = lives_combo_get_active_text(LIVES_COMBO(audp_combo));
+static void on_audp_entry_changed(LiVESWidget *audp_combo, livespointer ptr) {
+  char *audp = lives_combo_get_active_text(LIVES_COMBO(audp_combo));
 
   if (!strlen(audp)||!strcmp(audp,prefsw->audp_name)) {
-    g_free(audp);
+    lives_free(audp);
     return;
   }
 
@@ -1657,7 +1696,7 @@
 
     //lives_widget_queue_draw(audp_entry);
     lives_signal_handler_unblock(audp_combo, prefsw->audp_entry_func);
-    g_free(audp);
+    lives_free(audp);
     return;
   }
 
@@ -1665,8 +1704,7 @@
   if (!strncmp(audp,"jack",4)||!strncmp(audp,"pulse",5)) {
     lives_widget_set_sensitive(prefsw->checkbutton_aclips,TRUE);
     lives_widget_set_sensitive(prefsw->checkbutton_afollow,TRUE);
-  }
-  else {
+  } else {
     lives_widget_set_sensitive(prefsw->checkbutton_aclips,FALSE);
     lives_widget_set_sensitive(prefsw->checkbutton_afollow,FALSE);
     lives_widget_set_sensitive(prefsw->raudio,FALSE);
@@ -1678,24 +1716,23 @@
     lives_widget_set_sensitive(prefsw->checkbutton_jack_read_autocon,TRUE);
     lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_start_ajack),TRUE);
     lives_widget_show(prefsw->jack_int_label);
-  }
-  else {
+  } else {
     lives_widget_set_sensitive(prefsw->checkbutton_jack_pwp,FALSE);
     lives_widget_set_sensitive(prefsw->checkbutton_jack_read_autocon,FALSE);
     lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_start_ajack),FALSE);
     lives_widget_hide(prefsw->jack_int_label);
   }
 #endif
-  g_free(prefsw->audp_name);
+  lives_free(prefsw->audp_name);
   prefsw->audp_name=lives_combo_get_active_text(LIVES_COMBO(audp_combo));
   lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_stream_audio),FALSE);
   lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_rec_after_pb),FALSE);
-  g_free(audp);
+  lives_free(audp);
 
 }
 
 
-static void stream_audio_toggled(LiVESToggleButton *togglebutton, gpointer user_data) {
+static void stream_audio_toggled(LiVESToggleButton *togglebutton, livespointer user_data) {
   // if audio streaming is enabled, check requisites
 
   if (lives_toggle_button_get_active(togglebutton)) {
@@ -1704,9 +1741,8 @@
     uint32_t orig_acodec=AUDIO_CODEC_NONE;
 
     if (strlen(future_prefs->vpp_name)) {
-      if ((tmpvpp=open_vid_playback_plugin (future_prefs->vpp_name, FALSE))==NULL) return;
-    }
-    else {
+      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
@@ -1717,40 +1753,39 @@
       FILE *rfile;
       size_t rlen;
 
-      gchar buf[1024];
-      gchar *com;
+      char buf[1024];
+      char *com;
+
+      char *astreamer=lives_build_filename(prefs->lib_dir,PLUGIN_EXEC_DIR,PLUGIN_AUDIO_STREAM,"audiostreamer.pl",NULL);
+
+      com=lives_strdup_printf("\"%s\" check %d",astreamer,tmpvpp->audio_codec);
+      lives_free(astreamer);
 
-      gchar *astreamer=g_build_filename(prefs->lib_dir,PLUGIN_EXEC_DIR,PLUGIN_AUDIO_STREAM,"audiostreamer.pl",NULL);
-      
-      com=g_strdup_printf("\"%s\" check %d",astreamer,tmpvpp->audio_codec);
-      g_free(astreamer);
-      
       rfile=popen(com,"r");
       if (!rfile) {
-	// command failed
-	do_system_failed_error(com,0,NULL);
-	g_free(com);
-	return;
+        // command failed
+        do_system_failed_error(com,0,NULL);
+        lives_free(com);
+        return;
       }
 
       rlen=fread(buf,1,1023,rfile);
       pclose(rfile);
       memset(buf+rlen,0,1);
-      g_free(com);
+      lives_free(com);
 
       if (rlen>0) {
-	lives_toggle_button_set_active(togglebutton, FALSE);
+        lives_toggle_button_set_active(togglebutton, FALSE);
       }
     }
 
     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;
+        // close the temp current vpp
+        close_vid_playback_plugin(tmpvpp);
+      } else {
+        // restore current codec
+        mainw->vpp->audio_codec=orig_acodec;
       }
     }
 
@@ -1764,9 +1799,8 @@
   if (vpp!=NULL&&vpp->audio_codec!=AUDIO_CODEC_NONE) {
     lives_widget_set_sensitive(prefsw->checkbutton_stream_audio,TRUE);
     //lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_stream_audio),future_prefs->stream_audio_out);
-  }
-  else {
-    lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_stream_audio),FALSE);
+  } else {
+    lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_stream_audio),FALSE);
     lives_widget_set_sensitive(prefsw->checkbutton_stream_audio,FALSE);
   }
 }
@@ -1776,9 +1810,8 @@
   if (vpp!=NULL&&(vpp->capabilities&VPP_CAN_RETURN)) {
     lives_widget_set_sensitive(prefsw->checkbutton_rec_after_pb,TRUE);
     //lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_stream_audio),future_prefs->stream_audio_out);
-  }
-  else {
-    lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_rec_after_pb),FALSE);
+  } else {
+    lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_rec_after_pb),FALSE);
     lives_widget_set_sensitive(prefsw->checkbutton_rec_after_pb,FALSE);
   }
 }
@@ -1790,7 +1823,7 @@
 static void pref_init_list(LiVESWidget *list) {
   LiVESCellRenderer *renderer, *pixbufRenderer;
   LiVESTreeViewColumn *column1, *column2;
-  GtkListStore *store;
+  LiVESListStore *store;
 
   renderer = lives_cell_renderer_text_new();
   pixbufRenderer = lives_cell_renderer_pixbuf_new();
@@ -1802,7 +1835,7 @@
   lives_tree_view_column_set_sizing(column2, LIVES_TREE_VIEW_COLUMN_FIXED);
   lives_tree_view_column_set_fixed_width(column2, 150.*widget_opts.scale);
 
-  store = gtk_list_store_new(N_COLUMNS, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_UINT);
+  store = lives_list_store_new(N_COLUMNS, LIVES_COL_TYPE_PIXBUF, LIVES_COL_TYPE_STRING, LIVES_COL_TYPE_UINT);
 
   lives_tree_view_set_model(LIVES_TREE_VIEW(list), LIVES_TREE_MODEL(store));
 
@@ -1810,119 +1843,119 @@
 }
 
 /*
- * Adds entry to preferences dialog list 
+ * Adds entry to preferences dialog list
  */
-static void prefs_add_to_list(LiVESWidget *list, LiVESPixbuf *pix, const gchar *str, uint32_t idx) {
-  GtkListStore *store;
+static void prefs_add_to_list(LiVESWidget *list, LiVESPixbuf *pix, const char *str, uint32_t idx) {
+  LiVESListStore *store;
   LiVESTreeIter iter;
 
-  store = GTK_LIST_STORE(lives_tree_view_get_model (LIVES_TREE_VIEW(list)));
+  store = LIVES_LIST_STORE(lives_tree_view_get_model(LIVES_TREE_VIEW(list)));
 
-  gtk_list_store_insert(store, &iter, idx);
-  gtk_list_store_set(store, &iter, LIST_ICON, pix, LIST_ITEM, str, LIST_NUM, idx, -1);
+  lives_list_store_insert(store, &iter, idx);
+  lives_list_store_set(store, &iter, LIST_ICON, pix, LIST_ITEM, str, LIST_NUM, idx, -1);
 }
 
 /*
  * Callback function called when preferences list row changed
  */
-void on_prefDomainChanged(LiVESTreeSelection *widget, gpointer dummy) {
+void on_prefDomainChanged(LiVESTreeSelection *widget, livespointer dummy) {
   LiVESTreeIter iter;
   LiVESTreeModel *model;
 
   register int i;
 
-  for (i=0;i<2;i++) {
+  for (i=0; i<2; i++) {
     // for some reason gtk+ needs us to do this twice..
-    if (lives_tree_selection_get_selected( widget, &model, &iter)) {
+    if (lives_tree_selection_get_selected(widget, &model, &iter)) {
       lives_tree_model_get(model, &iter, LIST_NUM, &prefs_current_page, -1);
       //
       // Hide currently shown widget
-      if (prefsw->right_shown){
-	lives_widget_hide(prefsw->right_shown);
+      if (prefsw->right_shown) {
+        lives_widget_hide(prefsw->right_shown);
       }
       //
-      
-      switch (prefs_current_page){
+
+      switch (prefs_current_page) {
       case LIST_ENTRY_MULTITRACK:
-	lives_widget_show_all(prefsw->scrollw_right_multitrack);
-	prefsw->right_shown = prefsw->scrollw_right_multitrack;
-	break;
+        lives_widget_show_all(prefsw->scrollw_right_multitrack);
+        prefsw->right_shown = prefsw->scrollw_right_multitrack;
+        break;
       case LIST_ENTRY_DECODING:
-	lives_widget_show_all(prefsw->scrollw_right_decoding);
-	prefsw->right_shown = prefsw->scrollw_right_decoding;
-	break;
+        lives_widget_show_all(prefsw->scrollw_right_decoding);
+        prefsw->right_shown = prefsw->scrollw_right_decoding;
+        break;
       case LIST_ENTRY_PLAYBACK:
-	lives_widget_show_all(prefsw->scrollw_right_playback);
-	prefsw->right_shown = prefsw->scrollw_right_playback;
-	break;
+        lives_widget_show_all(prefsw->scrollw_right_playback);
+        prefsw->right_shown = prefsw->scrollw_right_playback;
+        break;
       case LIST_ENTRY_RECORDING:
-	lives_widget_show_all(prefsw->scrollw_right_recording);
-	prefsw->right_shown = prefsw->scrollw_right_recording;
-	break;
+        lives_widget_show_all(prefsw->scrollw_right_recording);
+        prefsw->right_shown = prefsw->scrollw_right_recording;
+        break;
       case LIST_ENTRY_ENCODING:
-	lives_widget_show_all(prefsw->scrollw_right_encoding);
-	prefsw->right_shown = prefsw->scrollw_right_encoding;
-	break;
+        lives_widget_show_all(prefsw->scrollw_right_encoding);
+        prefsw->right_shown = prefsw->scrollw_right_encoding;
+        break;
       case LIST_ENTRY_EFFECTS:
-	lives_widget_show_all(prefsw->scrollw_right_effects);
-	prefsw->right_shown = prefsw->scrollw_right_effects;
-	break;
+        lives_widget_show_all(prefsw->scrollw_right_effects);
+        prefsw->right_shown = prefsw->scrollw_right_effects;
+        break;
       case LIST_ENTRY_DIRECTORIES:
-	lives_widget_show_all(prefsw->scrollw_right_directories);
-	prefsw->right_shown = prefsw->scrollw_right_directories;
-	break;
+        lives_widget_show_all(prefsw->scrollw_right_directories);
+        prefsw->right_shown = prefsw->scrollw_right_directories;
+        break;
       case LIST_ENTRY_WARNINGS:
-	lives_widget_show_all(prefsw->scrollw_right_warnings);
-	prefsw->right_shown = prefsw->scrollw_right_warnings;
-	break;
+        lives_widget_show_all(prefsw->scrollw_right_warnings);
+        prefsw->right_shown = prefsw->scrollw_right_warnings;
+        break;
       case LIST_ENTRY_MISC:
-	lives_widget_show_all(prefsw->scrollw_right_misc);
-	prefsw->right_shown = prefsw->scrollw_right_misc;
-	if (!capable->has_cdda2wav) {
-	  lives_widget_hide (prefsw->cdda_hbox);
-	}
-	break;
+        lives_widget_show_all(prefsw->scrollw_right_misc);
+        prefsw->right_shown = prefsw->scrollw_right_misc;
+        if (!capable->has_cdda2wav) {
+          lives_widget_hide(prefsw->cdda_hbox);
+        }
+        break;
       case LIST_ENTRY_THEMES:
-	lives_widget_show_all(prefsw->scrollw_right_themes);
-	prefsw->right_shown = prefsw->scrollw_right_themes;
-	break;
+        lives_widget_show_all(prefsw->scrollw_right_themes);
+        prefsw->right_shown = prefsw->scrollw_right_themes;
+        break;
       case LIST_ENTRY_NET:
-	lives_widget_show_all(prefsw->scrollw_right_net);
-	prefsw->right_shown = prefsw->scrollw_right_net;
-	break;
+        lives_widget_show_all(prefsw->scrollw_right_net);
+        prefsw->right_shown = prefsw->scrollw_right_net;
+        break;
       case LIST_ENTRY_JACK:
-	lives_widget_show_all(prefsw->scrollw_right_jack);
-	lives_widget_hide(prefsw->jack_int_label);
+        lives_widget_show_all(prefsw->scrollw_right_jack);
+        lives_widget_hide(prefsw->jack_int_label);
 
 #ifdef ENABLE_JACK
-	if (prefs->audio_player==AUD_PLAYER_JACK) {
-	  lives_widget_show(prefsw->jack_int_label);
-	}
+        if (prefs->audio_player==AUD_PLAYER_JACK) {
+          lives_widget_show(prefsw->jack_int_label);
+        }
 #endif
 
-	prefsw->right_shown = prefsw->scrollw_right_jack;
-	break;
+        prefsw->right_shown = prefsw->scrollw_right_jack;
+        break;
       case LIST_ENTRY_MIDI:
-	lives_widget_show_all(prefsw->scrollw_right_midi);
-	prefsw->right_shown = prefsw->scrollw_right_midi;
+        lives_widget_show_all(prefsw->scrollw_right_midi);
+        prefsw->right_shown = prefsw->scrollw_right_midi;
 #ifdef OMC_MIDI_IMPL
 #ifndef ALSA_MIDI
-	lives_widget_hide (prefsw->midi_hbox);
+        lives_widget_hide(prefsw->midi_hbox);
 #endif
 #endif
-	break;
+        break;
       case LIST_ENTRY_GUI:
       default:
-	lives_widget_show_all(prefsw->scrollw_right_gui);
-	prefsw->right_shown = prefsw->scrollw_right_gui;
-	lives_widget_show_all(prefsw->scrollw_right_gui);
-	if (nmons<=1) {
-	  lives_widget_hide (prefsw->forcesmon_hbox);
+        lives_widget_show_all(prefsw->scrollw_right_gui);
+        prefsw->right_shown = prefsw->scrollw_right_gui;
+        lives_widget_show_all(prefsw->scrollw_right_gui);
+        if (nmons<=1) {
+          lives_widget_hide(prefsw->forcesmon_hbox);
 #if !LIVES_HAS_GRID_WIDGET
-	  lives_widget_hide (prefsw->ce_thumbs);
+          lives_widget_hide(prefsw->ce_thumbs);
 #endif
-	}
-	prefs_current_page=LIST_ENTRY_GUI;
+        }
+        prefs_current_page=LIST_ENTRY_GUI;
       }
     }
   }
@@ -1933,35 +1966,35 @@
 /*
  * Function makes apply button sensitive
  */
-void apply_button_set_enabled(LiVESWidget *widget, gpointer func_data) {
+void apply_button_set_enabled(LiVESWidget *widget, livespointer func_data) {
   lives_widget_set_sensitive(LIVES_WIDGET(prefsw->applybutton), TRUE);
   lives_widget_set_sensitive(LIVES_WIDGET(prefsw->cancelbutton), TRUE);
   lives_widget_set_sensitive(LIVES_WIDGET(prefsw->closebutton), FALSE);
 }
 
 // toggle sets other widget sensitive/insensitive
-static void toggle_set_sensitive(LiVESWidget *widget, gpointer func_data) {
+static void toggle_set_sensitive(LiVESWidget *widget, livespointer func_data) {
   lives_widget_set_sensitive(LIVES_WIDGET(func_data), lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(widget)));
 }
 
 // toggle sets other widget insensitive/sensitive
-static void toggle_set_insensitive(LiVESWidget *widget, gpointer func_data) {
+static void toggle_set_insensitive(LiVESWidget *widget, livespointer func_data) {
   lives_widget_set_sensitive(LIVES_WIDGET(func_data), !lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(widget)));
 }
 
 
 
-static void spinbutton_crit_ds_value_changed (LiVESSpinButton *crit_ds, gpointer user_data) {
+static void spinbutton_crit_ds_value_changed(LiVESSpinButton *crit_ds, livespointer user_data) {
   double myval=lives_spin_button_get_value(crit_ds);
-  lives_spin_button_set_range (LIVES_SPIN_BUTTON (prefsw->spinbutton_warn_ds),myval,DS_WARN_CRIT_MAX);
+  lives_spin_button_set_range(LIVES_SPIN_BUTTON(prefsw->spinbutton_warn_ds),myval,DS_WARN_CRIT_MAX);
   apply_button_set_enabled(NULL,NULL);
 }
 
 
 /*
- * Function creates preferences dialog 
+ * Function creates preferences dialog
  */
-_prefsw *create_prefs_dialog (void) {
+_prefsw *create_prefs_dialog(void) {
   LiVESWidget *dialog_vbox_main;
   LiVESWidget *dialog_table;
   LiVESWidget *dialog_hpaned;
@@ -1981,7 +2014,7 @@
   LiVESPixbuf *pixbuf_net;
   LiVESPixbuf *pixbuf_jack;
   LiVESPixbuf *pixbuf_midi;
-  gchar *icon;
+  char *icon;
 
   LiVESWidget *ins_resample;
   LiVESWidget *hbox;
@@ -2016,35 +2049,35 @@
   LiVESWidget *buttond;
 
   // radio button groups
-  //GSList *rb_group = NULL;
-  GSList *jpeg_png = NULL;
-  GSList *mt_enter_prompt = NULL;
-  GSList *rb_group2 = NULL;
+  //LiVESSList *rb_group = NULL;
+  LiVESSList *jpeg_png = NULL;
+  LiVESSList *mt_enter_prompt = NULL;
+  LiVESSList *rb_group2 = NULL;
 
 #ifdef ENABLE_OSC
 #ifdef OMC_MIDI_IMPL
-  GSList *alsa_midi_group = NULL;
+  LiVESSList *alsa_midi_group = NULL;
 #endif
 #endif
 
-  GSList *autoback_group = NULL;
-  GSList *st_interface_group = NULL;
+  LiVESSList *autoback_group = NULL;
+  LiVESSList *st_interface_group = NULL;
 
   LiVESSList *asrc_group=NULL;
 
-  LiVESAccelGroup *accel_group=LIVES_ACCEL_GROUP(lives_accel_group_new ());
+  LiVESAccelGroup *accel_group=LIVES_ACCEL_GROUP(lives_accel_group_new());
 
   // drop down lists
-  GList *themes = NULL;
-  GList *ofmt = NULL;
-  GList *ofmt_all = NULL;
-  GList *audp = NULL;
-  GList *encoders = NULL;
-  GList *vid_playback_plugins = NULL;
-  
-  gchar **array;
-  gchar *tmp,*tmp2,*tmp3;
-  gchar *theme;
+  LiVESList *themes = NULL;
+  LiVESList *ofmt = NULL;
+  LiVESList *ofmt_all = NULL;
+  LiVESList *audp = NULL;
+  LiVESList *encoders = NULL;
+  LiVESList *vid_playback_plugins = NULL;
+
+  char **array;
+  char *tmp,*tmp2,*tmp3;
+  char *theme;
 
   boolean pfsm;
   boolean has_ap_rec = FALSE;
@@ -2055,16 +2088,15 @@
 
 
   // Allocate memory for the preferences structure
-  prefsw = (_prefsw*)(g_malloc(sizeof(_prefsw)));
+  prefsw = (_prefsw *)(lives_malloc(sizeof(_prefsw)));
   prefsw->right_shown = NULL;
   mainw->prefs_need_restart = FALSE;
 
   // Create new modal dialog window and set some attributes
-  prefsw->prefs_dialog = lives_standard_dialog_new (_("LiVES: - Preferences"),FALSE);
-  lives_window_add_accel_group (LIVES_WINDOW (prefsw->prefs_dialog), accel_group);
+  prefsw->prefs_dialog = lives_standard_dialog_new(_("LiVES: - Preferences"),FALSE,PREF_WIN_WIDTH, PREF_WIN_HEIGHT);
+  lives_window_add_accel_group(LIVES_WINDOW(prefsw->prefs_dialog), accel_group);
 
-  lives_window_set_default_size (LIVES_WINDOW (prefsw->prefs_dialog), PREF_WIN_WIDTH, PREF_WIN_HEIGHT);
-  lives_widget_set_size_request (prefsw->prefs_dialog, PREF_WIN_WIDTH, PREF_WIN_HEIGHT);
+  lives_window_set_default_size(LIVES_WINDOW(prefsw->prefs_dialog), PREF_WIN_WIDTH, PREF_WIN_HEIGHT);
 
   if (prefs->show_gui) {
     if (mainw->multitrack==NULL) lives_window_set_transient_for(LIVES_WINDOW(prefsw->prefs_dialog),LIVES_WINDOW(mainw->LiVES));
@@ -2073,12 +2105,12 @@
 
   // Get dialog's vbox and show it
   dialog_vbox_main = lives_dialog_get_content_area(LIVES_DIALOG(prefsw->prefs_dialog));
-  lives_widget_show (dialog_vbox_main);
+  lives_widget_show(dialog_vbox_main);
 
   // Create dialog horizontal panels
   dialog_hpaned = lives_hpaned_new();
-  lives_widget_show (dialog_hpaned);
-  gtk_paned_set_position(GTK_PANED(dialog_hpaned),PREFS_PANED_POS);
+  lives_widget_show(dialog_hpaned);
+
 
 
   // Create dialog table for the right panel controls placement
@@ -2102,59 +2134,62 @@
   lives_tree_view_set_headers_visible(LIVES_TREE_VIEW(prefsw->prefs_list), FALSE);
 
   // Place panels into main vbox
-  lives_box_pack_start (LIVES_BOX (dialog_vbox_main), dialog_hpaned, TRUE, TRUE, 0);
+  lives_box_pack_start(LIVES_BOX(dialog_vbox_main), dialog_hpaned, TRUE, TRUE, 0);
 
   // Place list on the left panel
   pref_init_list(prefsw->prefs_list);
-  
+
   list_scroll = lives_scrolled_window_new(lives_tree_view_get_hadjustment(LIVES_TREE_VIEW(prefsw->prefs_list)), NULL);
   lives_widget_show(list_scroll);
-  lives_scrolled_window_set_policy (LIVES_SCROLLED_WINDOW (list_scroll), LIVES_POLICY_AUTOMATIC, LIVES_POLICY_AUTOMATIC);
-  lives_container_add (LIVES_CONTAINER (list_scroll), prefsw->prefs_list);
+  lives_scrolled_window_set_policy(LIVES_SCROLLED_WINDOW(list_scroll), LIVES_POLICY_AUTOMATIC, LIVES_POLICY_AUTOMATIC);
+  lives_container_add(LIVES_CONTAINER(list_scroll), prefsw->prefs_list);
 
   if (palette->style&STYLE_1) {
     lives_widget_set_bg_color(prefsw->prefs_list, LIVES_WIDGET_STATE_NORMAL, &palette->info_base);
     lives_widget_set_fg_color(prefsw->prefs_list, LIVES_WIDGET_STATE_NORMAL, &palette->info_text);
   }
 
-  gtk_paned_pack1(GTK_PANED(dialog_hpaned), list_scroll, TRUE, FALSE);
+  lives_paned_pack(1, LIVES_PANED(dialog_hpaned), list_scroll, TRUE, FALSE);
   // Place table on the right panel
 
-  gtk_paned_pack2(GTK_PANED(dialog_hpaned), dialog_table, TRUE, FALSE);
+  lives_paned_pack(2, LIVES_PANED(dialog_hpaned), dialog_table, TRUE, FALSE);
+
+
+  lives_paned_set_position(LIVES_PANED(dialog_hpaned),PREFS_PANED_POS);
 
   // -------------------,
   // gui controls       |
   // -------------------'
-  prefsw->vbox_right_gui = lives_vbox_new (FALSE, widget_opts.packing_height);
+  prefsw->vbox_right_gui = lives_vbox_new(FALSE, widget_opts.packing_height);
 
-  prefsw->scrollw_right_gui = lives_standard_scrolled_window_new (0,0,prefsw->vbox_right_gui);
+  prefsw->scrollw_right_gui = lives_standard_scrolled_window_new(0,0,prefsw->vbox_right_gui);
 
-  lives_widget_show (prefsw->vbox_right_gui);
+  lives_widget_show(prefsw->vbox_right_gui);
   prefsw->right_shown = prefsw->vbox_right_gui;
-  lives_container_set_border_width (LIVES_CONTAINER (prefsw->vbox_right_gui), widget_opts.packing_width*2);
+  lives_container_set_border_width(LIVES_CONTAINER(prefsw->vbox_right_gui), widget_opts.packing_width*2);
 
   // ---
-  hbox = lives_hbox_new (FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (prefsw->vbox_right_gui), hbox, FALSE, FALSE, widget_opts.packing_height);
+  hbox = lives_hbox_new(FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(prefsw->vbox_right_gui), hbox, FALSE, FALSE, widget_opts.packing_height);
   // ---
 
-  prefsw->fs_max_check = 
+  prefsw->fs_max_check =
     lives_standard_check_button_new(_("Open file selection maximised"),TRUE,LIVES_BOX(hbox),NULL);
-  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->fs_max_check), prefs->fileselmax);
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->fs_max_check), prefs->fileselmax);
   // ---
 
   add_fill_to_box(LIVES_BOX(hbox));
 
-  prefsw->recent_check = 
+  prefsw->recent_check =
     lives_standard_check_button_new(_("Show recent files in the File menu"),TRUE,LIVES_BOX(hbox),NULL);
-  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->recent_check), prefs->show_recent);
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->recent_check), prefs->show_recent);
 
 
   // ---
-  hbox = lives_hbox_new (FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (prefsw->vbox_right_gui), hbox, FALSE, FALSE, widget_opts.packing_height);
+  hbox = lives_hbox_new(FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(prefsw->vbox_right_gui), hbox, FALSE, FALSE, widget_opts.packing_height);
 
-  prefsw->stop_screensaver_check = 
+  prefsw->stop_screensaver_check =
     lives_standard_check_button_new(_("Stop screensaver on playback    "),TRUE,LIVES_BOX(hbox),NULL);
   lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->stop_screensaver_check), prefs->stop_screensaver);
 
@@ -2163,48 +2198,48 @@
   // ---
 
   prefsw->open_maximised_check=lives_standard_check_button_new(_("Open main window maximised"),TRUE,LIVES_BOX(hbox),NULL);
-  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->open_maximised_check), prefs->open_maximised);
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->open_maximised_check), prefs->open_maximised);
 
   // --
   hbox = lives_hbox_new(FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (prefsw->vbox_right_gui), hbox, FALSE, FALSE, widget_opts.packing_height);
+  lives_box_pack_start(LIVES_BOX(prefsw->vbox_right_gui), hbox, FALSE, FALSE, widget_opts.packing_height);
 
-  prefsw->show_tool = 
+  prefsw->show_tool =
     lives_standard_check_button_new(_("Show toolbar when background is blanked"),TRUE,LIVES_BOX(hbox),NULL);
-  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->show_tool), future_prefs->show_tool);
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->show_tool), future_prefs->show_tool);
 
   add_fill_to_box(LIVES_BOX(hbox));
 
   // ---
 
-  prefsw->mouse_scroll = 
+  prefsw->mouse_scroll =
     lives_standard_check_button_new(_("Allow mouse wheel to switch clips"),TRUE,LIVES_BOX(hbox),NULL);
-  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->mouse_scroll), prefs->mouse_scroll_clips);
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->mouse_scroll), prefs->mouse_scroll_clips);
 
 
   // ---
   hbox = lives_hbox_new(FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (prefsw->vbox_right_gui), hbox, FALSE, FALSE, widget_opts.packing_height);
+  lives_box_pack_start(LIVES_BOX(prefsw->vbox_right_gui), hbox, FALSE, FALSE, widget_opts.packing_height);
   // ---
 
 
-  prefsw->checkbutton_ce_maxspect = 
+  prefsw->checkbutton_ce_maxspect =
     lives_standard_check_button_new(_("Shrink previews to fit in interface"),TRUE,LIVES_BOX(hbox),NULL);
-  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_ce_maxspect), prefs->ce_maxspect);
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_ce_maxspect), prefs->ce_maxspect);
 
   add_fill_to_box(LIVES_BOX(hbox));
 
   // ---
-  hbox = lives_hbox_new (FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (prefsw->vbox_right_gui), hbox, FALSE, FALSE, widget_opts.packing_height);
+  hbox = lives_hbox_new(FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(prefsw->vbox_right_gui), hbox, FALSE, FALSE, widget_opts.packing_height);
 
   // ---
-  label = lives_standard_label_new (_("Startup mode:"));
-  lives_box_pack_start (LIVES_BOX (hbox), label, FALSE, TRUE, 0);
+  label = lives_standard_label_new(_("Startup mode:"));
+  lives_box_pack_start(LIVES_BOX(hbox), label, FALSE, TRUE, 0);
 
-  // --- 
+  // ---
   prefsw->rb_startup_ce = lives_standard_radio_button_new(_("_Clip editor"),TRUE,st_interface_group,LIVES_BOX(hbox),NULL);
-  st_interface_group = lives_radio_button_get_group (LIVES_RADIO_BUTTON (prefsw->rb_startup_ce));
+  st_interface_group = lives_radio_button_get_group(LIVES_RADIO_BUTTON(prefsw->rb_startup_ce));
 
   // ---
   prefsw->rb_startup_mt = lives_standard_radio_button_new(_("_Multitrack mode"),TRUE,st_interface_group,LIVES_BOX(hbox),NULL);
@@ -2212,14 +2247,13 @@
   // ---
   if (future_prefs->startup_interface==STARTUP_MT) {
     lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->rb_startup_mt),TRUE);
-  }
-  else {
+  } else {
     lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->rb_startup_ce),TRUE);
   }
 
   add_fill_to_box(LIVES_BOX(hbox));
 
-  // 
+  //
   // multihead support (inside Gui part)
   //
 
@@ -2229,25 +2263,25 @@
   nmons=capable->nmonitors;
 
   // ---
-  add_hsep_to_box (LIVES_BOX (prefsw->vbox_right_gui));
+  add_hsep_to_box(LIVES_BOX(prefsw->vbox_right_gui));
   // ---
-  label = lives_standard_label_new (_("Multi-head support"));
-  lives_box_pack_start (LIVES_BOX (prefsw->vbox_right_gui), label, FALSE, FALSE, widget_opts.packing_height);
+  label = lives_standard_label_new(_("Multi-head support"));
+  lives_box_pack_start(LIVES_BOX(prefsw->vbox_right_gui), label, FALSE, FALSE, widget_opts.packing_height);
   // ---
-  hbox = lives_hbox_new (FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (prefsw->vbox_right_gui), hbox, FALSE, FALSE, widget_opts.packing_height*2);
+  hbox = lives_hbox_new(FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(prefsw->vbox_right_gui), hbox, FALSE, FALSE, widget_opts.packing_height*2);
   // ---
 
 
-  prefsw->spinbutton_gmoni = lives_standard_spin_button_new (_(" monitor number for LiVES interface"), TRUE, prefs->gui_monitor, 1, nmons, 
-							     1., 1., 0, LIVES_BOX(hbox),NULL);
+  prefsw->spinbutton_gmoni = lives_standard_spin_button_new(_(" monitor number for LiVES interface"), TRUE, prefs->gui_monitor, 1, nmons,
+                             1., 1., 0, LIVES_BOX(hbox),NULL);
 
-  hbox = lives_hbox_new (FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (prefsw->vbox_right_gui), hbox, FALSE, FALSE, widget_opts.packing_height);
+  hbox = lives_hbox_new(FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(prefsw->vbox_right_gui), hbox, FALSE, FALSE, widget_opts.packing_height);
 
-  prefsw->spinbutton_pmoni = lives_standard_spin_button_new (_(" monitor number for playback"), TRUE, prefs->play_monitor, 0, 
-							     nmons==1?0:nmons,
-							     1., 1., 0, LIVES_BOX(hbox),NULL);
+  prefsw->spinbutton_pmoni = lives_standard_spin_button_new(_(" monitor number for playback"), TRUE, prefs->play_monitor, 0,
+                             nmons==1?0:nmons,
+                             1., 1., 0, LIVES_BOX(hbox),NULL);
 
 
 
@@ -2257,24 +2291,24 @@
 
   // ---
 
-  label = lives_standard_label_new (_("A setting of 0 means use all available monitors (only works with some playback plugins)."));
+  label = lives_standard_label_new(_("A setting of 0 means use all available monitors (only works with some playback plugins)."));
 
-  lives_box_pack_start (LIVES_BOX (hbox), label, TRUE, TRUE, 0);
+  lives_box_pack_start(LIVES_BOX(hbox), label, TRUE, TRUE, 0);
   // ---
 
   // ---
 
-  prefsw->forcesmon_hbox = lives_hbox_new (FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (prefsw->vbox_right_gui), prefsw->forcesmon_hbox, FALSE, FALSE, widget_opts.packing_height*2);
+  prefsw->forcesmon_hbox = lives_hbox_new(FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(prefsw->vbox_right_gui), prefsw->forcesmon_hbox, FALSE, FALSE, widget_opts.packing_height*2);
 
-  prefsw->forcesmon = lives_standard_check_button_new((tmp=g_strdup(_("Force single monitor"))),FALSE,LIVES_BOX(prefsw->forcesmon_hbox),
-						      (tmp2=g_strdup(_("Ignore all except the first monitor."))));
-  g_free(tmp);
-  g_free(tmp2);
+  prefsw->forcesmon = lives_standard_check_button_new((tmp=lives_strdup(_("Force single monitor"))),FALSE,LIVES_BOX(prefsw->forcesmon_hbox),
+                      (tmp2=lives_strdup(_("Ignore all except the first monitor."))));
+  lives_free(tmp);
+  lives_free(tmp2);
 
   add_fill_to_box(LIVES_BOX(hbox));
 
-  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->forcesmon), prefs->force_single_monitor);
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->forcesmon), prefs->force_single_monitor);
 
   // ---
   if (nmons<=1) {
@@ -2282,118 +2316,118 @@
     lives_widget_set_sensitive(prefsw->spinbutton_pmoni,FALSE);
   }
 
-  lives_signal_connect (LIVES_GUI_OBJECT (prefsw->forcesmon), LIVES_WIDGET_TOGGLED_EVENT,
-		    LIVES_GUI_CALLBACK (on_forcesmon_toggled),
-		    NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->forcesmon), LIVES_WIDGET_TOGGLED_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_forcesmon_toggled),
+                       NULL);
 
 
-  hbox = lives_hbox_new (FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (prefsw->vbox_right_gui), hbox, FALSE, FALSE, widget_opts.packing_height);
+  hbox = lives_hbox_new(FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(prefsw->vbox_right_gui), hbox, FALSE, FALSE, widget_opts.packing_height);
 
   prefsw->ce_thumbs = lives_standard_check_button_new(_("Show clip thumbnails during playback"),TRUE,
-						      LIVES_BOX(hbox),NULL);
+                      LIVES_BOX(hbox),NULL);
 
-  lives_widget_set_sensitive (prefsw->ce_thumbs, prefs->play_monitor!=prefs->gui_monitor&&
-			      prefs->play_monitor!=0&&!prefs->force_single_monitor&&
-			      capable->nmonitors>0);
+  lives_widget_set_sensitive(prefsw->ce_thumbs, prefs->play_monitor!=prefs->gui_monitor&&
+                             prefs->play_monitor!=0&&!prefs->force_single_monitor&&
+                             capable->nmonitors>0);
 
-  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->ce_thumbs), prefs->ce_thumb_mode);
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->ce_thumbs), prefs->ce_thumb_mode);
 
-  icon = g_build_filename(prefs->prefix_dir, ICON_DIR, "pref_gui.png", NULL);
+  icon = lives_build_filename(prefs->prefix_dir, ICON_DIR, "pref_gui.png", NULL);
   pixbuf_gui = lives_pixbuf_new_from_file(icon, NULL);
-  g_free(icon);
+  lives_free(icon);
 
   prefs_add_to_list(prefsw->prefs_list, pixbuf_gui, _("GUI"), LIST_ENTRY_GUI);
-  lives_container_add (LIVES_CONTAINER (dialog_table), prefsw->scrollw_right_gui);
+  lives_container_add(LIVES_CONTAINER(dialog_table), prefsw->scrollw_right_gui);
 
   // -----------------------,
   // multitrack controls    |
   // -----------------------'
 
-  prefsw->vbox_right_multitrack = lives_vbox_new (FALSE, 0);
-  lives_container_set_border_width (LIVES_CONTAINER (prefsw->vbox_right_multitrack), widget_opts.border_width);
+  prefsw->vbox_right_multitrack = lives_vbox_new(FALSE, 0);
+  lives_container_set_border_width(LIVES_CONTAINER(prefsw->vbox_right_multitrack), widget_opts.border_width);
 
-  prefsw->scrollw_right_multitrack = lives_standard_scrolled_window_new (0,0,prefsw->vbox_right_multitrack);
+  prefsw->scrollw_right_multitrack = lives_standard_scrolled_window_new(0,0,prefsw->vbox_right_multitrack);
 
-  hbox = lives_hbox_new (FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (prefsw->vbox_right_multitrack), hbox, FALSE, FALSE, widget_opts.packing_height);
+  hbox = lives_hbox_new(FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(prefsw->vbox_right_multitrack), hbox, FALSE, FALSE, widget_opts.packing_height);
 
-  label = lives_standard_label_new (_("When entering Multitrack mode:"));
-  lives_box_pack_start (LIVES_BOX (hbox), label, FALSE, FALSE, widget_opts.packing_width);
+  label = lives_standard_label_new(_("When entering Multitrack mode:"));
+  lives_box_pack_start(LIVES_BOX(hbox), label, FALSE, FALSE, widget_opts.packing_width);
   // ---
   add_fill_to_box(LIVES_BOX(hbox));
   // ---
-  hbox = lives_hbox_new (FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (prefsw->vbox_right_multitrack), hbox, FALSE, FALSE, widget_opts.packing_height);
+  hbox = lives_hbox_new(FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(prefsw->vbox_right_multitrack), hbox, FALSE, FALSE, widget_opts.packing_height);
   // ---
 
-  prefsw->mt_enter_prompt = lives_standard_radio_button_new (_("_Prompt me for width, height, fps and audio settings"),TRUE,
-							     mt_enter_prompt,LIVES_BOX(hbox),NULL);
-  mt_enter_prompt = lives_radio_button_get_group (LIVES_RADIO_BUTTON (prefsw->mt_enter_prompt));
+  prefsw->mt_enter_prompt = lives_standard_radio_button_new(_("_Prompt me for width, height, fps and audio settings"),TRUE,
+                            mt_enter_prompt,LIVES_BOX(hbox),NULL);
+  mt_enter_prompt = lives_radio_button_get_group(LIVES_RADIO_BUTTON(prefsw->mt_enter_prompt));
 
 
   // ---
   mt_enter_defs = lives_standard_radio_button_new(_("_Always use the following values:"),TRUE,
-						  mt_enter_prompt,LIVES_BOX(hbox),NULL);
+                  mt_enter_prompt,LIVES_BOX(hbox),NULL);
 
-  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (mt_enter_defs), !prefs->mt_enter_prompt);
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(mt_enter_defs), !prefs->mt_enter_prompt);
 
 
   hbox = lives_hbox_new(FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (prefsw->vbox_right_multitrack), hbox, FALSE, FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(prefsw->vbox_right_multitrack), hbox, FALSE, FALSE, 0);
 
   prefsw->checkbutton_render_prompt = lives_standard_check_button_new(_("Use these same _values for rendering a new clip"),TRUE,
-								      LIVES_BOX(hbox),NULL);
+                                      LIVES_BOX(hbox),NULL);
 
-  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_render_prompt), !prefs->render_prompt);
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_render_prompt), !prefs->render_prompt);
 
 
   // ---
-  frame = lives_frame_new (NULL);
-  lives_box_pack_start (LIVES_BOX (prefsw->vbox_right_multitrack), frame, FALSE, FALSE, widget_opts.packing_height);
-  vbox = lives_vbox_new (FALSE, 0);
-  lives_container_add (LIVES_CONTAINER (frame), vbox);
-  
-  label = lives_standard_label_new (_("Video"));
+  frame = lives_frame_new(NULL);
+  lives_box_pack_start(LIVES_BOX(prefsw->vbox_right_multitrack), frame, FALSE, FALSE, widget_opts.packing_height);
+  vbox = lives_vbox_new(FALSE, 0);
+  lives_container_add(LIVES_CONTAINER(frame), vbox);
+
+  label = lives_standard_label_new(_("Video"));
 
   if (palette->style&STYLE_1) {
     lives_widget_set_bg_color(frame, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
   }
-  lives_frame_set_label_widget (LIVES_FRAME (frame), label);
+  lives_frame_set_label_widget(LIVES_FRAME(frame), label);
 
 
   // ---
-  hbox = lives_hbox_new (FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
+  hbox = lives_hbox_new(FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
 
   // ---
-  prefsw->spinbutton_mt_def_width = lives_standard_spin_button_new (_("_Width           "),
-								    TRUE, prefs->mt_def_width, 0., 8192., 4., 16., 0,
-								    LIVES_BOX(hbox),NULL);
+  prefsw->spinbutton_mt_def_width = lives_standard_spin_button_new(_("_Width           "),
+                                    TRUE, prefs->mt_def_width, 0., 8192., 4., 16., 0,
+                                    LIVES_BOX(hbox),NULL);
 
 
-  prefsw->spinbutton_mt_def_height = lives_standard_spin_button_new (_("          _Height      "),
-								     TRUE, prefs->mt_def_height, 0., 8192., 4., 16., 0,
-								     LIVES_BOX(hbox),NULL);
+  prefsw->spinbutton_mt_def_height = lives_standard_spin_button_new(_("          _Height      "),
+                                     TRUE, prefs->mt_def_height, 0., 8192., 4., 16., 0,
+                                     LIVES_BOX(hbox),NULL);
 
-  prefsw->spinbutton_mt_def_fps = lives_standard_spin_button_new (_("          _FPS"),
-								  TRUE, prefs->mt_def_fps, 1., FPS_MAX, .1, 1., 3,
-								  LIVES_BOX(hbox),NULL);
+  prefsw->spinbutton_mt_def_fps = lives_standard_spin_button_new(_("          _FPS"),
+                                  TRUE, prefs->mt_def_fps, 1., FPS_MAX, .1, 1., 3,
+                                  LIVES_BOX(hbox),NULL);
 
 
 
-  hbox = lives_hbox_new (FALSE, 0);
+  hbox = lives_hbox_new(FALSE, 0);
 
-  prefsw->backaudio_checkbutton = lives_standard_check_button_new (_("Enable backing audio track"),FALSE,LIVES_BOX(hbox),NULL);
+  prefsw->backaudio_checkbutton = lives_standard_check_button_new(_("Enable backing audio track"),FALSE,LIVES_BOX(hbox),NULL);
 
-  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->backaudio_checkbutton), prefs->mt_backaudio>0);
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->backaudio_checkbutton), prefs->mt_backaudio>0);
 
   add_fill_to_box(LIVES_BOX(hbox));
-// ---
+  // ---
 
   prefsw->pertrack_checkbutton = lives_standard_check_button_new(_("Audio track per video track"),FALSE,LIVES_BOX(hbox),NULL);
 
-  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->pertrack_checkbutton), prefs->mt_pertrack_audio);
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->pertrack_checkbutton), prefs->mt_pertrack_audio);
 
 
 
@@ -2404,263 +2438,271 @@
 
 
   // must be done after resaudw
-  lives_box_pack_start (LIVES_BOX (prefsw->vbox_right_multitrack), hbox, FALSE, FALSE, widget_opts.packing_height);
+  lives_box_pack_start(LIVES_BOX(prefsw->vbox_right_multitrack), hbox, FALSE, FALSE, widget_opts.packing_height);
 
 
-  lives_widget_set_sensitive(prefsw->backaudio_checkbutton, 
-			   lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(resaudw->aud_checkbutton)));
+  lives_widget_set_sensitive(prefsw->backaudio_checkbutton,
+                             lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(resaudw->aud_checkbutton)));
 
-  lives_widget_set_sensitive(prefsw->pertrack_checkbutton, 
-			   lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(resaudw->aud_checkbutton)));
-  
-   // ---
-  add_hsep_to_box (LIVES_BOX (prefsw->vbox_right_multitrack));
+  lives_widget_set_sensitive(prefsw->pertrack_checkbutton,
+                             lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(resaudw->aud_checkbutton)));
+
+  // ---
+  add_hsep_to_box(LIVES_BOX(prefsw->vbox_right_multitrack));
   // ---
-  hbox = lives_hbox_new (FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (prefsw->vbox_right_multitrack), hbox, FALSE, FALSE, widget_opts.packing_height);
+  hbox = lives_hbox_new(FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(prefsw->vbox_right_multitrack), hbox, FALSE, FALSE, widget_opts.packing_height);
 
   // ---
-  prefsw->spinbutton_mt_undo_buf = lives_standard_spin_button_new (_("    _Undo buffer size (MB)    "),TRUE,
-								   prefs->mt_undo_buf, 0., G_MAXSIZE/(1024.*1024.), 1., 1., 0,
-								   LIVES_BOX(hbox),NULL);
+  prefsw->spinbutton_mt_undo_buf = lives_standard_spin_button_new(_("    _Undo buffer size (MB)    "),TRUE,
+                                   prefs->mt_undo_buf, 0., LIVES_MAXSIZE/(1024.*1024.), 1., 1., 0,
+                                   LIVES_BOX(hbox),NULL);
 
 
   hbox = lives_hbox_new(FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (prefsw->vbox_right_multitrack), hbox, FALSE, FALSE, widget_opts.packing_height);
+  lives_box_pack_start(LIVES_BOX(prefsw->vbox_right_multitrack), hbox, FALSE, FALSE, widget_opts.packing_height);
 
   // ---
   prefsw->checkbutton_mt_exit_render = lives_standard_check_button_new(_("_Exit multitrack mode after rendering"),TRUE,LIVES_BOX(hbox),NULL);
-  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_mt_exit_render), prefs->mt_exit_render);
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_mt_exit_render), prefs->mt_exit_render);
   // ---
 
-  hbox2 = lives_hbox_new (FALSE, 0);
+  hbox2 = lives_hbox_new(FALSE, 0);
 
-  lives_box_pack_start (LIVES_BOX (prefsw->vbox_right_multitrack), hbox2, FALSE, FALSE, widget_opts.packing_height);
+  lives_box_pack_start(LIVES_BOX(prefsw->vbox_right_multitrack), hbox2, FALSE, FALSE, widget_opts.packing_height);
   // ---
-  label = lives_standard_label_new (_("Auto backup layouts"));
-  lives_box_pack_start (LIVES_BOX (hbox2), label, FALSE, TRUE, 0);
+  label = lives_standard_label_new(_("Auto backup layouts"));
+  lives_box_pack_start(LIVES_BOX(hbox2), label, FALSE, TRUE, 0);
   // ---
 
   hbox = lives_hbox_new(FALSE, 0);
   prefsw->mt_autoback_every = lives_standard_radio_button_new(_("_Every"),TRUE,autoback_group,LIVES_BOX(hbox),NULL);
-  autoback_group = lives_radio_button_get_group (LIVES_RADIO_BUTTON (prefsw->mt_autoback_every));
-  lives_box_pack_start (LIVES_BOX (hbox2), hbox, TRUE, TRUE, 0);
+  autoback_group = lives_radio_button_get_group(LIVES_RADIO_BUTTON(prefsw->mt_autoback_every));
+  lives_box_pack_start(LIVES_BOX(hbox2), hbox, TRUE, TRUE, 0);
 
   // ---
 
-  hbox = lives_hbox_new (FALSE, 0);
+  hbox = lives_hbox_new(FALSE, 0);
   widget_opts.swap_label=TRUE;
-  prefsw->spinbutton_mt_ab_time = lives_standard_spin_button_new (_("seconds"),FALSE,120.,10.,1800.,1.,10.,0,LIVES_BOX(hbox),NULL);
+  prefsw->spinbutton_mt_ab_time = lives_standard_spin_button_new(_("seconds"),FALSE,120.,10.,1800.,1.,10.,0,LIVES_BOX(hbox),NULL);
   widget_opts.swap_label=FALSE;
-  lives_box_pack_start (LIVES_BOX (hbox2), hbox, TRUE, TRUE, 0);
+  lives_box_pack_start(LIVES_BOX(hbox2), hbox, TRUE, TRUE, 0);
 
   add_fill_to_box(LIVES_BOX(hbox2));
   // ---
 
   hbox = lives_hbox_new(FALSE, 0);
   prefsw->mt_autoback_always = lives_standard_radio_button_new(_("After every _change"),TRUE,autoback_group,LIVES_BOX(hbox),NULL);
-  autoback_group = lives_radio_button_get_group (LIVES_RADIO_BUTTON (prefsw->mt_autoback_always));
-  lives_box_pack_start (LIVES_BOX (hbox2), hbox, TRUE, TRUE, 0);
+  autoback_group = lives_radio_button_get_group(LIVES_RADIO_BUTTON(prefsw->mt_autoback_always));
+  lives_box_pack_start(LIVES_BOX(hbox2), hbox, TRUE, TRUE, 0);
   // ---
 
   hbox = lives_hbox_new(FALSE, 0);
   prefsw->mt_autoback_never = lives_standard_radio_button_new(_("_Never"),TRUE,autoback_group,LIVES_BOX(hbox),NULL);
-  autoback_group = lives_radio_button_get_group (LIVES_RADIO_BUTTON (prefsw->mt_autoback_never));
-  lives_box_pack_start (LIVES_BOX (hbox2), hbox, TRUE, TRUE, 0);
+  autoback_group = lives_radio_button_get_group(LIVES_RADIO_BUTTON(prefsw->mt_autoback_never));
+  lives_box_pack_start(LIVES_BOX(hbox2), hbox, TRUE, TRUE, 0);
 
 
   // ---
-  lives_signal_connect (LIVES_GUI_OBJECT (prefsw->mt_autoback_every), LIVES_WIDGET_TOGGLED_EVENT, LIVES_GUI_CALLBACK (on_mtbackevery_toggled), prefsw); 
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->mt_autoback_every), LIVES_WIDGET_TOGGLED_SIGNAL, LIVES_GUI_CALLBACK(on_mtbackevery_toggled),
+                       prefsw);
 
   if (prefs->mt_auto_back==0) {
     lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->mt_autoback_always),TRUE);
-  }
-  else if (prefs->mt_auto_back==-1) {
+  } else if (prefs->mt_auto_back==-1) {
     lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->mt_autoback_never),TRUE);
-  }
-  else {
+  } else {
     lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->mt_autoback_every),TRUE);
     lives_spin_button_set_value(LIVES_SPIN_BUTTON(prefsw->spinbutton_mt_ab_time),prefs->mt_auto_back);
   }
   // ---
-  icon = g_build_filename(prefs->prefix_dir, ICON_DIR, "pref_multitrack.png", NULL);
+  icon = lives_build_filename(prefs->prefix_dir, ICON_DIR, "pref_multitrack.png", NULL);
   pixbuf_multitrack = lives_pixbuf_new_from_file(icon, NULL);
-  g_free(icon);
+  lives_free(icon);
 
   prefs_add_to_list(prefsw->prefs_list, pixbuf_multitrack, _("Multitrack/Render"), LIST_ENTRY_MULTITRACK);
-  lives_container_add (LIVES_CONTAINER (dialog_table), prefsw->scrollw_right_multitrack);
+  lives_container_add(LIVES_CONTAINER(dialog_table), prefsw->scrollw_right_multitrack);
 
 
   // ---------------,
   // decoding       |
   // ---------------'
 
-  prefsw->vbox_right_decoding = lives_vbox_new (FALSE, 0);
-  lives_container_set_border_width (LIVES_CONTAINER (prefsw->vbox_right_decoding), widget_opts.border_width*2);
+  prefsw->vbox_right_decoding = lives_vbox_new(FALSE, 0);
+  lives_container_set_border_width(LIVES_CONTAINER(prefsw->vbox_right_decoding), widget_opts.border_width*2);
 
-  prefsw->scrollw_right_decoding = lives_standard_scrolled_window_new (0,0,prefsw->vbox_right_decoding);
+  prefsw->scrollw_right_decoding = lives_standard_scrolled_window_new(0,0,prefsw->vbox_right_decoding);
 
-  hbox = lives_hbox_new (FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (prefsw->vbox_right_decoding), hbox, FALSE, FALSE, widget_opts.packing_height);
+  hbox = lives_hbox_new(FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(prefsw->vbox_right_decoding), hbox, FALSE, FALSE, widget_opts.packing_height);
   // ---
 
 
-  prefsw->checkbutton_instant_open = lives_standard_check_button_new((tmp=g_strdup(_("Use instant opening when possible"))),FALSE,LIVES_BOX(hbox),
-								      (tmp2=g_strdup(_("Enable instant opening of some file types using decoder plugins"))));
-  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_instant_open),prefs->instant_open);
+  prefsw->checkbutton_instant_open = lives_standard_check_button_new((tmp=lives_strdup(_("Use instant opening when possible"))),FALSE,
+                                     LIVES_BOX(hbox),
+                                     (tmp2=lives_strdup(_("Enable instant opening of some file types using decoder plugins"))));
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_instant_open),prefs->instant_open);
 
-  g_free(tmp); g_free(tmp2);
+  lives_free(tmp);
+  lives_free(tmp2);
 
   // advanced instant opening
-  advbutton = lives_button_new_with_mnemonic (_("_Advanced"));
-  lives_box_pack_start (LIVES_BOX (hbox), advbutton, FALSE, FALSE, widget_opts.packing_width*4);
+  advbutton = lives_button_new_with_mnemonic(_("_Advanced"));
+  lives_box_pack_start(LIVES_BOX(hbox), advbutton, FALSE, FALSE, widget_opts.packing_width*4);
 
-  lives_signal_connect (LIVES_GUI_OBJECT (advbutton), LIVES_WIDGET_CLICKED_EVENT,
-		    LIVES_GUI_CALLBACK (on_decplug_advanced_clicked),
-		    NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(advbutton), LIVES_WIDGET_CLICKED_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_decplug_advanced_clicked),
+                       NULL);
 
   lives_widget_set_sensitive(advbutton,prefs->instant_open);
 
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_instant_open), LIVES_WIDGET_TOGGLED_EVENT, LIVES_GUI_CALLBACK(instopen_toggled), advbutton);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_instant_open), LIVES_WIDGET_TOGGLED_SIGNAL, LIVES_GUI_CALLBACK(instopen_toggled),
+                       advbutton);
 
 
-  hbox = lives_hbox_new (FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (prefsw->vbox_right_decoding), hbox, FALSE, FALSE, widget_opts.packing_height);
+  hbox = lives_hbox_new(FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(prefsw->vbox_right_decoding), hbox, FALSE, FALSE, widget_opts.packing_height);
 
   // ---
-  prefsw->video_open_entry = lives_standard_entry_new (_("Video open command (fallback)"),FALSE,
-						       prefs->video_open_command,-1,255,
-						       LIVES_BOX(hbox),NULL);
+  prefsw->video_open_entry = lives_standard_entry_new(_("Video open command (fallback)"),FALSE,
+                             prefs->video_open_command,-1,255,
+                             LIVES_BOX(hbox),NULL);
 
 
-  if (prefs->ocp==-1) prefs->ocp=get_int_pref ("open_compression_percent");
+  if (prefs->ocp==-1) prefs->ocp=get_int_pref("open_compression_percent");
 
   // ---
-  hbox = lives_hbox_new (FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (prefsw->vbox_right_decoding), hbox, FALSE, FALSE, widget_opts.packing_height);
+  hbox = lives_hbox_new(FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(prefsw->vbox_right_decoding), hbox, FALSE, FALSE, widget_opts.packing_height);
   // ---
 
-  prefsw->spinbutton_ocp = lives_standard_spin_button_new (_("Open/render compression"), FALSE, prefs->ocp, 0., 100., 1., 5., 0,
-							   LIVES_BOX(hbox),NULL);
+  prefsw->spinbutton_ocp = lives_standard_spin_button_new(_("Open/render compression"), FALSE, prefs->ocp, 0., 100., 1., 5., 0,
+                           LIVES_BOX(hbox),NULL);
 
-  label = lives_standard_label_new (_ (" %     ( lower = slower, larger files; for jpeg, higher quality )"));
-  lives_box_pack_start (LIVES_BOX (hbox), label, FALSE, FALSE, widget_opts.packing_width>>1);
+  label = lives_standard_label_new(_(" %     ( lower = slower, larger files; for jpeg, higher quality )"));
+  lives_box_pack_start(LIVES_BOX(hbox), label, FALSE, FALSE, widget_opts.packing_width>>1);
 
   add_hsep_to_box(LIVES_BOX(prefsw->vbox_right_decoding));
 
 
 
   // ---
-  hbox = lives_hbox_new (FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (prefsw->vbox_right_decoding), hbox, FALSE, FALSE, widget_opts.packing_height);
+  hbox = lives_hbox_new(FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(prefsw->vbox_right_decoding), hbox, FALSE, FALSE, widget_opts.packing_height);
   // ---
 
-  label = lives_standard_label_new (_("Default image format"));
+  label = lives_standard_label_new(_("Default image format"));
 
-  lives_box_pack_start (LIVES_BOX (hbox), label, FALSE, FALSE, widget_opts.packing_width);
+  lives_box_pack_start(LIVES_BOX(hbox), label, FALSE, FALSE, widget_opts.packing_width);
   // ---
   prefsw->jpeg = lives_standard_radio_button_new(_("_jpeg"),TRUE,jpeg_png,LIVES_BOX(hbox),NULL);
-  jpeg_png = lives_radio_button_get_group (LIVES_RADIO_BUTTON (prefsw->jpeg));
+  jpeg_png = lives_radio_button_get_group(LIVES_RADIO_BUTTON(prefsw->jpeg));
 
   png = lives_standard_radio_button_new(_("_png"),TRUE,jpeg_png,LIVES_BOX(hbox),NULL);
-  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (png),!strcmp (prefs->image_ext,"png"));
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(png),!strcmp(prefs->image_ext,"png"));
 
   // ---
-  hbox = lives_hbox_new (FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (prefsw->vbox_right_decoding), hbox, FALSE, FALSE, widget_opts.packing_height*2);
+  hbox = lives_hbox_new(FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(prefsw->vbox_right_decoding), hbox, FALSE, FALSE, widget_opts.packing_height*2);
   // ---
-  label = lives_standard_label_new (_("(Check Help/Troubleshoot to see which image formats are supported)"));
-  lives_box_pack_start (LIVES_BOX (hbox), label, TRUE, TRUE, 0);
+  label = lives_standard_label_new(_("(Check Help/Troubleshoot to see which image formats are supported)"));
+  lives_box_pack_start(LIVES_BOX(hbox), label, TRUE, TRUE, 0);
 
   // ---
-  hbox = lives_hbox_new (FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (prefsw->vbox_right_decoding), hbox, FALSE, FALSE, widget_opts.packing_height);
+  hbox = lives_hbox_new(FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(prefsw->vbox_right_decoding), hbox, FALSE, FALSE, widget_opts.packing_height);
   // ---
 
-  prefsw->checkbutton_auto_deint = lives_standard_check_button_new((tmp=g_strdup(_("Enable automatic deinterlacing when possible"))),FALSE,
-								   LIVES_BOX(hbox),
-								    (tmp2=g_strdup(_("Automatically deinterlace frames when a plugin suggests it"))));
-  g_free(tmp); g_free(tmp2);
+  prefsw->checkbutton_auto_deint = lives_standard_check_button_new((tmp=lives_strdup(_("Enable automatic deinterlacing when possible"))),
+                                   FALSE,
+                                   LIVES_BOX(hbox),
+                                   (tmp2=lives_strdup(_("Automatically deinterlace frames when a plugin suggests it"))));
+  lives_free(tmp);
+  lives_free(tmp2);
 
-  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_auto_deint),prefs->auto_deint);
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_auto_deint),prefs->auto_deint);
 
 
   // ---
-  hbox = lives_hbox_new (FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (prefsw->vbox_right_decoding), hbox, FALSE, FALSE, widget_opts.packing_height);
+  hbox = lives_hbox_new(FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(prefsw->vbox_right_decoding), hbox, FALSE, FALSE, widget_opts.packing_height);
   // ---
 
-  prefsw->checkbutton_auto_trim = lives_standard_check_button_new((tmp=g_strdup(_("Automatic trimming / padding of audio when possible"))),FALSE,
-								   LIVES_BOX(hbox),
-								    (tmp2=g_strdup(_("Automatically trim or pad audio when a plugin suggests it"))));
-  g_free(tmp); g_free(tmp2);
+  prefsw->checkbutton_auto_trim = lives_standard_check_button_new((tmp=lives_strdup(
+                                    _("Automatic trimming / padding of audio when possible"))),FALSE,
+                                  LIVES_BOX(hbox),
+                                  (tmp2=lives_strdup(_("Automatically trim or pad audio when a plugin suggests it"))));
+  lives_free(tmp);
+  lives_free(tmp2);
 
-  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_auto_trim),prefs->auto_trim_audio);
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_auto_trim),prefs->auto_trim_audio);
 
 
   // ---
-  hbox = lives_hbox_new (FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (prefsw->vbox_right_decoding), hbox, FALSE, FALSE, widget_opts.packing_height);
+  hbox = lives_hbox_new(FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(prefsw->vbox_right_decoding), hbox, FALSE, FALSE, widget_opts.packing_height);
   // ---
 
-  prefsw->checkbutton_nobord = lives_standard_check_button_new((tmp=g_strdup(_("Ignore blank borders when possible"))),FALSE,
-							       LIVES_BOX(hbox),
-							       (tmp2=g_strdup(_("Clip any blank borders from frames where possible"))));
-  g_free(tmp); g_free(tmp2);
+  prefsw->checkbutton_nobord = lives_standard_check_button_new((tmp=lives_strdup(_("Ignore blank borders when possible"))),FALSE,
+                               LIVES_BOX(hbox),
+                               (tmp2=lives_strdup(_("Clip any blank borders from frames where possible"))));
+  lives_free(tmp);
+  lives_free(tmp2);
+
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_nobord),prefs->auto_nobord);
 
-  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_nobord),prefs->auto_nobord);
- 
   // ---
   add_hsep_to_box(LIVES_BOX(prefsw->vbox_right_decoding));
   // ---
   hbox = lives_hbox_new(FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (prefsw->vbox_right_decoding), hbox, FALSE, FALSE, widget_opts.packing_height);
+  lives_box_pack_start(LIVES_BOX(prefsw->vbox_right_decoding), hbox, FALSE, FALSE, widget_opts.packing_height);
 
   prefsw->checkbutton_concat_images = lives_standard_check_button_new(_("When opening multiple files, concatenate images into one clip"),
-								      FALSE,LIVES_BOX(hbox),NULL);
-  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_concat_images),prefs->concat_images);
+                                      FALSE,LIVES_BOX(hbox),NULL);
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_concat_images),prefs->concat_images);
 
   // ---
-  icon = g_build_filename(prefs->prefix_dir, ICON_DIR, "pref_decoding.png", NULL);
+  icon = lives_build_filename(prefs->prefix_dir, ICON_DIR, "pref_decoding.png", NULL);
   pixbuf_decoding = lives_pixbuf_new_from_file(icon, NULL);
-  g_free(icon);
+  lives_free(icon);
 
 
   prefs_add_to_list(prefsw->prefs_list, pixbuf_decoding, _("Decoding"), LIST_ENTRY_DECODING);
 
-  lives_container_add (LIVES_CONTAINER (dialog_table), prefsw->scrollw_right_decoding);
+  lives_container_add(LIVES_CONTAINER(dialog_table), prefsw->scrollw_right_decoding);
 
   // ---------------,
   // playback       |
   // ---------------'
 
-  prefsw->vbox_right_playback = lives_vbox_new (FALSE, widget_opts.packing_height);
-  lives_container_set_border_width (LIVES_CONTAINER (prefsw->vbox_right_playback), widget_opts.border_width*2);
+  prefsw->vbox_right_playback = lives_vbox_new(FALSE, widget_opts.packing_height);
+  lives_container_set_border_width(LIVES_CONTAINER(prefsw->vbox_right_playback), widget_opts.border_width*2);
+
+  prefsw->scrollw_right_playback = lives_standard_scrolled_window_new(0,0,prefsw->vbox_right_playback);
 
-  prefsw->scrollw_right_playback = lives_standard_scrolled_window_new (0,0,prefsw->vbox_right_playback);
+  frame = lives_frame_new(NULL);
 
-  frame = lives_frame_new (NULL);
- 
-  lives_box_pack_start (LIVES_BOX (prefsw->vbox_right_playback), frame, FALSE, FALSE, widget_opts.packing_height);
-
-  vbox=lives_vbox_new (FALSE, 0);
-  lives_container_add (LIVES_CONTAINER (frame), vbox);
-  lives_container_set_border_width (LIVES_CONTAINER (vbox), widget_opts.border_width);
+  lives_box_pack_start(LIVES_BOX(prefsw->vbox_right_playback), frame, FALSE, FALSE, widget_opts.packing_height);
+
+  vbox=lives_vbox_new(FALSE, 0);
+  lives_container_add(LIVES_CONTAINER(frame), vbox);
+  lives_container_set_border_width(LIVES_CONTAINER(vbox), widget_opts.border_width);
 
   prefsw->pbq_list=NULL;
   // TRANSLATORS: video quality, max len 50
-  prefsw->pbq_list=g_list_append(prefsw->pbq_list,g_strdup((_("Low - can improve performance on slower machines"))));
+  prefsw->pbq_list=lives_list_append(prefsw->pbq_list,lives_strdup((_("Low - can improve performance on slower machines"))));
   // TRANSLATORS: video quality, max len 50
-  prefsw->pbq_list=g_list_append(prefsw->pbq_list,g_strdup((_("Normal - recommended for most users"))));
+  prefsw->pbq_list=lives_list_append(prefsw->pbq_list,lives_strdup((_("Normal - recommended for most users"))));
   // TRANSLATORS: video quality, max len 50
-  prefsw->pbq_list=g_list_append(prefsw->pbq_list,g_strdup((_("High - can improve quality on very fast machines"))));
+  prefsw->pbq_list=lives_list_append(prefsw->pbq_list,lives_strdup((_("High - can improve quality on very fast machines"))));
 
   widget_opts.expand=LIVES_EXPAND_EXTRA;
-  prefsw->pbq_combo = lives_standard_combo_new((tmp=g_strdup(_("Preview _quality"))),TRUE,prefsw->pbq_list,LIVES_BOX(vbox),
-					       (tmp2=g_strdup(_("The preview quality for video playback - affects resizing"))));
+  prefsw->pbq_combo = lives_standard_combo_new((tmp=lives_strdup(_("Preview _quality"))),TRUE,prefsw->pbq_list,LIVES_BOX(vbox),
+                      (tmp2=lives_strdup(_("The preview quality for video playback - affects resizing"))));
   widget_opts.expand=LIVES_EXPAND_DEFAULT;
 
-  g_free(tmp); g_free(tmp2);
+  lives_free(tmp);
+  lives_free(tmp2);
 
   switch (prefs->pb_quality) {
   case PB_QUALITY_HIGH:
@@ -2673,14 +2715,14 @@
   // ---
 
   prefsw->checkbutton_show_stats = lives_standard_check_button_new(_("_Show FPS statistics"),TRUE,LIVES_BOX(vbox),NULL);
-  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_show_stats),prefs->show_player_stats);
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_show_stats),prefs->show_player_stats);
 
   // ---
   add_hsep_to_box(LIVES_BOX(vbox));
 
   // ---
-  hbox = lives_hbox_new (FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
+  hbox = lives_hbox_new(FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
 
   // ---
 #ifndef IS_MINGW
@@ -2688,99 +2730,103 @@
 #else
   vid_playback_plugins = get_plugin_list(PLUGIN_VID_PLAYBACK, TRUE, NULL, "-dll");
 #endif
-  vid_playback_plugins = g_list_prepend (vid_playback_plugins, g_strdup(mainw->string_constants[LIVES_STRING_CONSTANT_NONE]));
+  vid_playback_plugins = lives_list_prepend(vid_playback_plugins, lives_strdup(mainw->string_constants[LIVES_STRING_CONSTANT_NONE]));
 
   widget_opts.expand=LIVES_EXPAND_EXTRA;
   pp_combo = lives_standard_combo_new(_("_Plugin"),TRUE,vid_playback_plugins,LIVES_BOX(hbox),NULL);
   widget_opts.expand=LIVES_EXPAND_DEFAULT;
 
-  advbutton = lives_button_new_with_mnemonic (_("_Advanced"));
-  lives_box_pack_start (LIVES_BOX (hbox), advbutton, FALSE, FALSE, 40);
+  advbutton = lives_button_new_with_mnemonic(_("_Advanced"));
+  lives_box_pack_start(LIVES_BOX(hbox), advbutton, FALSE, FALSE, 40);
 
-  lives_signal_connect (LIVES_GUI_OBJECT (advbutton), LIVES_WIDGET_CLICKED_EVENT,
-		    LIVES_GUI_CALLBACK (on_vpp_advanced_clicked),
-		    NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(advbutton), LIVES_WIDGET_CLICKED_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_vpp_advanced_clicked),
+                       NULL);
 
 
   if (mainw->vpp != NULL) {
     lives_combo_set_active_string(LIVES_COMBO(pp_combo), mainw->vpp->name);
-  }
-  else {
+  } else {
     lives_combo_set_active_index(LIVES_COMBO(pp_combo), 0);
-    lives_widget_set_sensitive (advbutton, FALSE);
+    lives_widget_set_sensitive(advbutton, FALSE);
   }
-  g_list_free_strings (vid_playback_plugins);
-  g_list_free (vid_playback_plugins);
+  lives_list_free_strings(vid_playback_plugins);
+  lives_list_free(vid_playback_plugins);
 
-  lives_signal_connect_after (G_OBJECT (pp_combo), LIVES_WIDGET_CHANGED_EVENT, LIVES_GUI_CALLBACK (after_vpp_changed), (gpointer) advbutton);
+  lives_signal_connect_after(LIVES_WIDGET_OBJECT(pp_combo), LIVES_WIDGET_CHANGED_SIGNAL, LIVES_GUI_CALLBACK(after_vpp_changed),
+                             (livespointer) advbutton);
 
-  prefsw->checkbutton_stream_audio = 
-    lives_standard_check_button_new((tmp=g_strdup(_("Stream audio"))),
-				    TRUE,LIVES_BOX(vbox),
-				    (tmp2=g_strdup
-				     (_("Stream audio to playback plugin"))));
-  g_free(tmp); g_free(tmp2);
+  prefsw->checkbutton_stream_audio =
+    lives_standard_check_button_new((tmp=lives_strdup(_("Stream audio"))),
+                                    TRUE,LIVES_BOX(vbox),
+                                    (tmp2=lives_strdup
+                                          (_("Stream audio to playback plugin"))));
+  lives_free(tmp);
+  lives_free(tmp2);
 
 
-  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_stream_audio),prefs->stream_audio_out);
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_stream_audio),prefs->stream_audio_out);
 
   prefsw_set_astream_settings(mainw->vpp);
 
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_stream_audio), LIVES_WIDGET_TOGGLED_EVENT, LIVES_GUI_CALLBACK(stream_audio_toggled), NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_stream_audio), LIVES_WIDGET_TOGGLED_SIGNAL,
+                       LIVES_GUI_CALLBACK(stream_audio_toggled), NULL);
 
 
 
-  prefsw->checkbutton_rec_after_pb = 
-    lives_standard_check_button_new((tmp=g_strdup(_("Record player output"))),
-				    TRUE,LIVES_BOX(vbox),
-				    (tmp2=g_strdup
-				     (_("Record output from player instead of input to player"))));
-  g_free(tmp); g_free(tmp2);
+  prefsw->checkbutton_rec_after_pb =
+    lives_standard_check_button_new((tmp=lives_strdup(_("Record player output"))),
+                                    TRUE,LIVES_BOX(vbox),
+                                    (tmp2=lives_strdup
+                                          (_("Record output from player instead of input to player"))));
+  lives_free(tmp);
+  lives_free(tmp2);
 
-  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_rec_after_pb),(prefs->rec_opts&REC_AFTER_PB));
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_rec_after_pb),(prefs->rec_opts&REC_AFTER_PB));
 
   prefsw_set_rec_after_settings(mainw->vpp);
 
-  label = lives_standard_label_new (_("VIDEO"));
+  label = lives_standard_label_new(_("VIDEO"));
 
   if (palette->style&STYLE_1) {
     lives_widget_set_bg_color(frame, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
     lives_widget_set_fg_color(frame, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
   }
 
-  lives_frame_set_label_widget (LIVES_FRAME (frame), label);
+  lives_frame_set_label_widget(LIVES_FRAME(frame), label);
 
 
   //-
 
-  frame = lives_frame_new (NULL);
-  lives_box_pack_start (LIVES_BOX (prefsw->vbox_right_playback), frame, TRUE, TRUE, 0);
+  frame = lives_frame_new(NULL);
+  lives_box_pack_start(LIVES_BOX(prefsw->vbox_right_playback), frame, TRUE, TRUE, 0);
 
-  vbox = lives_vbox_new (FALSE, 0);
-  lives_container_add (LIVES_CONTAINER (frame), vbox);
+  vbox = lives_vbox_new(FALSE, 0);
+  lives_container_add(LIVES_CONTAINER(frame), vbox);
 
 #ifdef HAVE_PULSE_AUDIO
-  audp = g_list_append (audp, g_strdup_printf("pulse audio (%s)",mainw->string_constants[LIVES_STRING_CONSTANT_RECOMMENDED]));
+  audp = lives_list_append(audp, lives_strdup_printf("pulse audio (%s)",mainw->string_constants[LIVES_STRING_CONSTANT_RECOMMENDED]));
   has_ap_rec=TRUE;
 #endif
 
 #ifdef ENABLE_JACK
-  if (!has_ap_rec) audp = g_list_append (audp, g_strdup_printf("jack (%s)",mainw->string_constants[LIVES_STRING_CONSTANT_RECOMMENDED]));
-  else audp = g_list_append (audp, g_strdup_printf("jack"));
+  if (!has_ap_rec) audp = lives_list_append(audp, lives_strdup_printf("jack (%s)",
+                            mainw->string_constants[LIVES_STRING_CONSTANT_RECOMMENDED]));
+  else audp = lives_list_append(audp, lives_strdup_printf("jack"));
   has_ap_rec=TRUE;
 #endif
 
   if (capable->has_sox_play) {
-    if (has_ap_rec) audp = g_list_append (audp, g_strdup("sox"));
-    else audp = g_list_append (audp, g_strdup_printf("sox (%s)",mainw->string_constants[LIVES_STRING_CONSTANT_RECOMMENDED]));
+    if (has_ap_rec) audp = lives_list_append(audp, lives_strdup("sox"));
+    else audp = lives_list_append(audp, lives_strdup_printf("sox (%s)",mainw->string_constants[LIVES_STRING_CONSTANT_RECOMMENDED]));
   }
 
   if (capable->has_mplayer) {
-    audp = g_list_append (audp, g_strdup("mplayer"));
+    audp = lives_list_append(audp, lives_strdup("mplayer"));
   }
 
   if (capable->has_mplayer2) {
-    audp = g_list_append (audp, g_strdup("mplayer2"));
+    audp = lives_list_append(audp, lives_strdup("mplayer2"));
   }
 
   widget_opts.expand=LIVES_EXPAND_EXTRA;
@@ -2790,13 +2836,13 @@
   has_ap_rec=FALSE;
 
   prefsw->jack_int_label=lives_standard_label_new(_("(See also the Jack Integration tab for jack startup options)"));
-  lives_box_pack_start (LIVES_BOX (vbox), prefsw->jack_int_label, FALSE, FALSE, widget_opts.packing_height);
+  lives_box_pack_start(LIVES_BOX(vbox), prefsw->jack_int_label, FALSE, FALSE, widget_opts.packing_height);
 
   prefsw->audp_name=NULL;
 
 #ifdef HAVE_PULSE_AUDIO
   if (prefs->audio_player==AUD_PLAYER_PULSE) {
-    prefsw->audp_name=g_strdup_printf("pulse audio (%s)",mainw->string_constants[LIVES_STRING_CONSTANT_RECOMMENDED]);
+    prefsw->audp_name=lives_strdup_printf("pulse audio (%s)",mainw->string_constants[LIVES_STRING_CONSTANT_RECOMMENDED]);
   }
   has_ap_rec=TRUE;
 #endif
@@ -2804,37 +2850,37 @@
 #ifdef ENABLE_JACK
   if (prefs->audio_player==AUD_PLAYER_JACK) {
     if (!has_ap_rec)
-      prefsw->audp_name=g_strdup_printf("jack (%s)",mainw->string_constants[LIVES_STRING_CONSTANT_RECOMMENDED]);
-    else prefsw->audp_name=g_strdup_printf("jack");
+      prefsw->audp_name=lives_strdup_printf("jack (%s)",mainw->string_constants[LIVES_STRING_CONSTANT_RECOMMENDED]);
+    else prefsw->audp_name=lives_strdup_printf("jack");
   }
   has_ap_rec=TRUE;
 #endif
 
   if (prefs->audio_player==AUD_PLAYER_SOX) {
-    if (!has_ap_rec) prefsw->audp_name=g_strdup_printf("sox (%s)",mainw->string_constants[LIVES_STRING_CONSTANT_RECOMMENDED]);
-    else prefsw->audp_name=g_strdup_printf("sox");
+    if (!has_ap_rec) prefsw->audp_name=lives_strdup_printf("sox (%s)",mainw->string_constants[LIVES_STRING_CONSTANT_RECOMMENDED]);
+    else prefsw->audp_name=lives_strdup_printf("sox");
   }
 
   if (prefs->audio_player==AUD_PLAYER_MPLAYER) {
-    prefsw->audp_name=g_strdup(_ ("mplayer"));
+    prefsw->audp_name=lives_strdup(_("mplayer"));
   }
   // ---
-  if (prefsw->audp_name!=NULL) 
+  if (prefsw->audp_name!=NULL)
     lives_combo_set_active_string(LIVES_COMBO(prefsw->audp_combo), prefsw->audp_name);
-  prefsw->orig_audp_name=g_strdup(prefsw->audp_name);
+  prefsw->orig_audp_name=lives_strdup(prefsw->audp_name);
 
 
   //---
 
   if (prefs->audio_player==AUD_PLAYER_MPLAYER2) {
-    prefsw->audp_name=g_strdup(_ ("mplayer2"));
+    prefsw->audp_name=lives_strdup(_("mplayer2"));
   }
   // ---
-  prefsw->audio_command_entry = lives_standard_entry_new (_("Audio play _command"),TRUE,"",-1,255,LIVES_BOX(vbox),NULL);
+  prefsw->audio_command_entry = lives_standard_entry_new(_("Audio play _command"),TRUE,"",-1,255,LIVES_BOX(vbox),NULL);
 
 
   // get from prefs
-  if (prefs->audio_player!=AUD_PLAYER_JACK&&prefs->audio_player!=AUD_PLAYER_PULSE) 
+  if (!is_realtime_aplayer(prefs->audio_player))
     lives_entry_set_text(LIVES_ENTRY(prefsw->audio_command_entry),prefs->audio_play_command);
   else {
     lives_entry_set_text(LIVES_ENTRY(prefsw->audio_command_entry),(_("- internal -")));
@@ -2842,65 +2888,67 @@
   }
 
 
-  hbox = lives_hbox_new (FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
+  hbox = lives_hbox_new(FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
   // ---
 
   prefsw->checkbutton_afollow = lives_standard_check_button_new(_("Audio follows video _rate/direction"),TRUE,LIVES_BOX(hbox),NULL);
 
-  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_afollow),(prefs->audio_opts&AUDIO_OPTS_FOLLOW_FPS)?TRUE:FALSE);
-  lives_widget_set_sensitive(prefsw->checkbutton_afollow,prefs->audio_player==AUD_PLAYER_JACK||prefs->audio_player==AUD_PLAYER_PULSE);
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_afollow),(prefs->audio_opts&AUDIO_OPTS_FOLLOW_FPS)?TRUE:FALSE);
+  lives_widget_set_sensitive(prefsw->checkbutton_afollow,is_realtime_aplayer(prefs->audio_player));
 
   add_fill_to_box(LIVES_BOX(hbox));
 
   // ---
   prefsw->checkbutton_aclips = lives_standard_check_button_new(_("Audio follows _clip switches"),TRUE,LIVES_BOX(hbox),NULL);
 
-  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_aclips),(prefs->audio_opts&AUDIO_OPTS_FOLLOW_CLIPS)?TRUE:FALSE);
-  lives_widget_set_sensitive(prefsw->checkbutton_aclips,prefs->audio_player==AUD_PLAYER_JACK||prefs->audio_player==AUD_PLAYER_PULSE);
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_aclips),(prefs->audio_opts&AUDIO_OPTS_FOLLOW_CLIPS)?TRUE:FALSE);
+  lives_widget_set_sensitive(prefsw->checkbutton_aclips,is_realtime_aplayer(prefs->audio_player));
 
   hbox = lives_hbox_new(FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
+  lives_box_pack_start(LIVES_BOX(vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
   label=lives_standard_label_new(_("Source:"));
   lives_box_pack_start(LIVES_BOX(hbox),label,FALSE,FALSE,widget_opts.packing_width);
   add_fill_to_box(LIVES_BOX(hbox));
 
   rbutton=lives_standard_radio_button_new(_("_Internal"),TRUE,asrc_group,LIVES_BOX(hbox),NULL);
 
-  asrc_group=lives_radio_button_get_group (LIVES_RADIO_BUTTON (rbutton));
+  asrc_group=lives_radio_button_get_group(LIVES_RADIO_BUTTON(rbutton));
   add_fill_to_box(LIVES_BOX(hbox));
 
   prefsw->rextaudio = lives_standard_radio_button_new(_("_External (requires jack or pulse audio player)"),
-						      TRUE,asrc_group,LIVES_BOX(hbox),NULL);
+                      TRUE,asrc_group,LIVES_BOX(hbox),NULL);
 
-  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->rextaudio),prefs->audio_src==AUDIO_SRC_EXT);
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->rextaudio),prefs->audio_src==AUDIO_SRC_EXT);
   add_fill_to_box(LIVES_BOX(hbox));
 
-  if (mainw->playing_file>0&&mainw->record){
-    lives_widget_set_sensitive (prefsw->rextaudio,FALSE);
+  if (mainw->playing_file>0&&mainw->record) {
+    lives_widget_set_sensitive(prefsw->rextaudio,FALSE);
   }
 
-  if (prefs->audio_player!=AUD_PLAYER_JACK&&prefs->audio_player!=AUD_PLAYER_PULSE){
-    lives_widget_set_sensitive (prefsw->rextaudio,FALSE);
+  if (!is_realtime_aplayer(prefs->audio_player)) {
+    lives_widget_set_sensitive(prefsw->rextaudio,FALSE);
   }
 
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->rextaudio), LIVES_WIDGET_TOGGLED_EVENT, LIVES_GUI_CALLBACK(toggle_set_insensitive), prefsw->checkbutton_aclips);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->rextaudio), LIVES_WIDGET_TOGGLED_EVENT, LIVES_GUI_CALLBACK(toggle_set_insensitive), prefsw->checkbutton_afollow);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->rextaudio), LIVES_WIDGET_TOGGLED_SIGNAL, LIVES_GUI_CALLBACK(toggle_set_insensitive),
+                       prefsw->checkbutton_aclips);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->rextaudio), LIVES_WIDGET_TOGGLED_SIGNAL, LIVES_GUI_CALLBACK(toggle_set_insensitive),
+                       prefsw->checkbutton_afollow);
 
 
 
-  label = lives_standard_label_new (_("AUDIO"));
+  label = lives_standard_label_new(_("AUDIO"));
   if (palette->style&STYLE_1) {
     lives_widget_set_bg_color(frame, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
   }
-  lives_frame_set_label_widget (LIVES_FRAME (frame), label);
+  lives_frame_set_label_widget(LIVES_FRAME(frame), label);
 
-  icon = g_build_filename(prefs->prefix_dir, ICON_DIR, "pref_playback.png", NULL);
+  icon = lives_build_filename(prefs->prefix_dir, ICON_DIR, "pref_playback.png", NULL);
   pixbuf_playback = lives_pixbuf_new_from_file(icon, NULL);
-  g_free(icon);
+  lives_free(icon);
 
   prefs_add_to_list(prefsw->prefs_list, pixbuf_playback, _("Playback"), LIST_ENTRY_PLAYBACK);
-  lives_container_add (LIVES_CONTAINER (dialog_table), prefsw->scrollw_right_playback);
+  lives_container_add(LIVES_CONTAINER(dialog_table), prefsw->scrollw_right_playback);
 
 
   lives_widget_hide(prefsw->jack_int_label);
@@ -2916,46 +2964,46 @@
   // recording      |
   // ---------------'
 
-  prefsw->vbox_right_recording = lives_vbox_new (FALSE, 0);
-  lives_container_set_border_width (LIVES_CONTAINER (prefsw->vbox_right_recording), widget_opts.border_width*2);
+  prefsw->vbox_right_recording = lives_vbox_new(FALSE, 0);
+  lives_container_set_border_width(LIVES_CONTAINER(prefsw->vbox_right_recording), widget_opts.border_width*2);
 
-  prefsw->scrollw_right_recording = lives_standard_scrolled_window_new (0,0,prefsw->vbox_right_recording);
+  prefsw->scrollw_right_recording = lives_standard_scrolled_window_new(0,0,prefsw->vbox_right_recording);
 
   hbox = lives_hbox_new(FALSE, 0);
   prefsw->rdesk_audio = lives_standard_check_button_new(_("Record audio when capturing an e_xternal window\n (requires jack or pulse audio)"),
-							TRUE,LIVES_BOX(hbox),NULL);
+                        TRUE,LIVES_BOX(hbox),NULL);
 
 
 #ifndef RT_AUDIO
-  lives_widget_set_sensitive (prefsw->rdesk_audio,FALSE);
+  lives_widget_set_sensitive(prefsw->rdesk_audio,FALSE);
 #endif
 
-  lives_box_pack_start (LIVES_BOX (prefsw->vbox_right_recording), hbox, FALSE, FALSE, widget_opts.packing_height);
-  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->rdesk_audio),prefs->rec_desktop_audio);
+  lives_box_pack_start(LIVES_BOX(prefsw->vbox_right_recording), hbox, FALSE, FALSE, widget_opts.packing_height);
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->rdesk_audio),prefs->rec_desktop_audio);
 
   // ---
   add_hsep_to_box(LIVES_BOX(prefsw->vbox_right_recording));
 
   // ---
-  label = lives_standard_label_new (_("      What to record when 'r' is pressed   "));
- 
-  lives_box_pack_start (LIVES_BOX (prefsw->vbox_right_recording), label, FALSE, FALSE, widget_opts.packing_height);
+  label = lives_standard_label_new(_("      What to record when 'r' is pressed   "));
+
+  lives_box_pack_start(LIVES_BOX(prefsw->vbox_right_recording), label, FALSE, FALSE, widget_opts.packing_height);
 
   // ---
-  hbox = lives_hbox_new (FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (prefsw->vbox_right_recording), hbox, FALSE, FALSE, widget_opts.packing_height);
+  hbox = lives_hbox_new(FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(prefsw->vbox_right_recording), hbox, FALSE, FALSE, widget_opts.packing_height);
   // ---
 
   prefsw->rframes = lives_standard_check_button_new(_("_Frame changes"),TRUE,LIVES_BOX(hbox),NULL);
 
-  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->rframes),prefs->rec_opts&REC_FRAMES);
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->rframes),prefs->rec_opts&REC_FRAMES);
 
   // ---
-  if (prefs->rec_opts&REC_FPS||prefs->rec_opts&REC_CLIPS){
-    lives_widget_set_sensitive (prefsw->rframes,FALSE); // we must record these if recording fps changes or clip switches
+  if (prefs->rec_opts&REC_FPS||prefs->rec_opts&REC_CLIPS) {
+    lives_widget_set_sensitive(prefsw->rframes,FALSE);  // we must record these if recording fps changes or clip switches
   }
-  if (mainw->playing_file>0&&mainw->record){
-    lives_widget_set_sensitive (prefsw->rframes,FALSE);
+  if (mainw->playing_file>0&&mainw->record) {
+    lives_widget_set_sensitive(prefsw->rframes,FALSE);
   }
 
   add_fill_to_box(LIVES_BOX(hbox));
@@ -2965,126 +3013,125 @@
 
   // ---
   if (prefs->rec_opts&REC_CLIPS) {
-    lives_widget_set_sensitive (prefsw->rfps,FALSE); // we must record these if recording clip switches
+    lives_widget_set_sensitive(prefsw->rfps,FALSE);  // we must record these if recording clip switches
   }
 
-  if (mainw->playing_file>0&&mainw->record){
-    lives_widget_set_sensitive (prefsw->rfps,FALSE);
+  if (mainw->playing_file>0&&mainw->record) {
+    lives_widget_set_sensitive(prefsw->rfps,FALSE);
   }
   // ---
-  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->rfps),prefs->rec_opts&REC_FPS);
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->rfps),prefs->rec_opts&REC_FPS);
 
   // ---
-  hbox = lives_hbox_new (FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (prefsw->vbox_right_recording), hbox, FALSE, FALSE, widget_opts.packing_height);
+  hbox = lives_hbox_new(FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(prefsw->vbox_right_recording), hbox, FALSE, FALSE, widget_opts.packing_height);
   // ---
 
   prefsw->reffects = lives_standard_check_button_new(_("_Real time effects"),TRUE,LIVES_BOX(hbox),NULL);
 
-  if (mainw->playing_file>0&&mainw->record){
-    lives_widget_set_sensitive (prefsw->reffects,FALSE);
+  if (mainw->playing_file>0&&mainw->record) {
+    lives_widget_set_sensitive(prefsw->reffects,FALSE);
   }
 
   add_fill_to_box(LIVES_BOX(hbox));
 
-  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->reffects),prefs->rec_opts&REC_EFFECTS);
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->reffects),prefs->rec_opts&REC_EFFECTS);
   // ---
 
   prefsw->rclips = lives_standard_check_button_new(_("_Clip switches"),TRUE,LIVES_BOX(hbox),NULL);
 
-  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->rclips),prefs->rec_opts&REC_CLIPS);
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->rclips),prefs->rec_opts&REC_CLIPS);
 
-  if (mainw->playing_file>0&&mainw->record){
-    lives_widget_set_sensitive (prefsw->rclips,FALSE);
+  if (mainw->playing_file>0&&mainw->record) {
+    lives_widget_set_sensitive(prefsw->rclips,FALSE);
   }
 
 
   // ---
 
   prefsw->raudio = lives_standard_check_button_new(_("_Audio (requires jack or pulse audio player)"),
-						   TRUE,LIVES_BOX(prefsw->vbox_right_recording),NULL);
+                   TRUE,LIVES_BOX(prefsw->vbox_right_recording),NULL);
 
-  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->raudio),prefs->rec_opts&REC_AUDIO);
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->raudio),prefs->rec_opts&REC_AUDIO);
 
-  if (mainw->playing_file>0&&mainw->record){
-    lives_widget_set_sensitive (prefsw->raudio,FALSE);
+  if (mainw->playing_file>0&&mainw->record) {
+    lives_widget_set_sensitive(prefsw->raudio,FALSE);
   }
 
-  if (prefs->audio_player!=AUD_PLAYER_JACK&&prefs->audio_player!=AUD_PLAYER_PULSE){
-    lives_widget_set_sensitive (prefsw->raudio,FALSE);
+  if (!is_realtime_aplayer(prefs->audio_player)) {
+    lives_widget_set_sensitive(prefsw->raudio,FALSE);
   }
 
   // ---
   add_hsep_to_box(LIVES_BOX(prefsw->vbox_right_recording));
   // ---
 
-  hbox = lives_hbox_new (FALSE,0);
-  lives_box_pack_start (LIVES_BOX (prefsw->vbox_right_recording), hbox, FALSE, FALSE, widget_opts.packing_height*4);
-  
-  prefsw->spinbutton_rec_gb = lives_standard_spin_button_new (_("Pause recording if free disk space falls below"),FALSE,
-							      prefs->rec_stop_gb, 0., 1024., 1., 10., 0,
-							      LIVES_BOX(hbox),NULL);
+  hbox = lives_hbox_new(FALSE,0);
+  lives_box_pack_start(LIVES_BOX(prefsw->vbox_right_recording), hbox, FALSE, FALSE, widget_opts.packing_height*4);
+
+  prefsw->spinbutton_rec_gb = lives_standard_spin_button_new(_("Pause recording if free disk space falls below"),FALSE,
+                              prefs->rec_stop_gb, 0., 1024., 1., 10., 0,
+                              LIVES_BOX(hbox),NULL);
 
 
   // TRANSLATORS: gigabytes
-  label = lives_standard_label_new (_("GB"));
-  lives_box_pack_start (LIVES_BOX (hbox), label, FALSE, FALSE, widget_opts.packing_width);
+  label = lives_standard_label_new(_("GB"));
+  lives_box_pack_start(LIVES_BOX(hbox), label, FALSE, FALSE, widget_opts.packing_width);
 
-  icon = g_build_filename(prefs->prefix_dir, ICON_DIR, "pref_record.png", NULL);
+  icon = lives_build_filename(prefs->prefix_dir, ICON_DIR, "pref_record.png", NULL);
   pixbuf_recording = lives_pixbuf_new_from_file(icon, NULL);
-  g_free(icon);
+  lives_free(icon);
 
   prefs_add_to_list(prefsw->prefs_list, pixbuf_recording, _("Recording"), LIST_ENTRY_RECORDING);
-  lives_container_add (LIVES_CONTAINER (dialog_table), prefsw->scrollw_right_recording);
+  lives_container_add(LIVES_CONTAINER(dialog_table), prefsw->scrollw_right_recording);
 
   // ---------------,
   // encoding       |
   // ---------------'
 
-  prefsw->vbox_right_encoding = lives_vbox_new (FALSE, widget_opts.packing_height*4);
-  lives_container_set_border_width (LIVES_CONTAINER (prefsw->vbox_right_encoding), widget_opts.border_width);
+  prefsw->vbox_right_encoding = lives_vbox_new(FALSE, widget_opts.packing_height*4);
+  lives_container_set_border_width(LIVES_CONTAINER(prefsw->vbox_right_encoding), widget_opts.border_width);
 
-  prefsw->scrollw_right_encoding = lives_standard_scrolled_window_new (0,0,prefsw->vbox_right_encoding);
+  prefsw->scrollw_right_encoding = lives_standard_scrolled_window_new(0,0,prefsw->vbox_right_encoding);
 
   if (capable->has_encoder_plugins) {
     // scan for encoder plugins
-    encoders=get_plugin_list (PLUGIN_ENCODERS,TRUE,NULL,NULL);
+    encoders=get_plugin_list(PLUGIN_ENCODERS,TRUE,NULL,NULL);
   }
 
   widget_opts.expand=LIVES_EXPAND_EXTRA;
   prefsw->encoder_combo = lives_standard_combo_new(_("Encoder"),FALSE,encoders,
-						   LIVES_BOX (prefsw->vbox_right_encoding),NULL);
+                          LIVES_BOX(prefsw->vbox_right_encoding),NULL);
   widget_opts.expand=LIVES_EXPAND_DEFAULT;
 
 
   if (encoders!=NULL) {
     lives_combo_set_active_string(LIVES_COMBO(prefsw->encoder_combo), prefs->encoder.name);
-    g_list_free_strings (encoders);
-    g_list_free (encoders);
+    lives_list_free_strings(encoders);
+    lives_list_free(encoders);
   }
 
-  add_hsep_to_box (LIVES_BOX (prefsw->vbox_right_encoding));
+  add_hsep_to_box(LIVES_BOX(prefsw->vbox_right_encoding));
 
   if (capable->has_encoder_plugins) {
     // reqest formats from the encoder plugin
     if ((ofmt_all=plugin_request_by_line(PLUGIN_ENCODERS,prefs->encoder.name,"get_formats"))!=NULL) {
-      for (i=0;i<g_list_length(ofmt_all);i++) {
-	if (get_token_count ((gchar *)g_list_nth_data (ofmt_all,i),'|')>2) {
-	  array=g_strsplit ((gchar *)g_list_nth_data (ofmt_all,i),"|",-1);
-	  if (!strcmp(array[0],prefs->encoder.of_name)) {
-	    prefs->encoder.of_allowed_acodecs=atoi(array[2]);
-	  } 
-	  ofmt = g_list_append(ofmt, g_strdup(array[1]));
-	  g_strfreev (array);
-	}
+      for (i=0; i<lives_list_length(ofmt_all); i++) {
+        if (get_token_count((char *)lives_list_nth_data(ofmt_all,i),'|')>2) {
+          array=lives_strsplit((char *)lives_list_nth_data(ofmt_all,i),"|",-1);
+          if (!strcmp(array[0],prefs->encoder.of_name)) {
+            prefs->encoder.of_allowed_acodecs=atoi(array[2]);
+          }
+          ofmt = lives_list_append(ofmt, lives_strdup(array[1]));
+          lives_strfreev(array);
+        }
       }
-      lives_memcpy (&future_prefs->encoder,&prefs->encoder,sizeof(_encoder));
-    }
-    else {
+      lives_memcpy(&future_prefs->encoder,&prefs->encoder,sizeof(_encoder));
+    } else {
       do_plugin_encoder_error(prefs->encoder.name);
       future_prefs->encoder.of_allowed_acodecs=0;
     }
-    
+
 
     widget_opts.expand=LIVES_EXPAND_EXTRA;
     prefsw->ofmt_combo = lives_standard_combo_new(_("Output format"),FALSE,ofmt,LIVES_BOX(prefsw->vbox_right_encoding),NULL);
@@ -3092,13 +3139,13 @@
 
     if (ofmt!=NULL) {
       lives_combo_set_active_string(LIVES_COMBO(prefsw->ofmt_combo), prefs->encoder.of_desc);
-      g_list_free_strings(ofmt);
-      g_list_free(ofmt);
+      lives_list_free_strings(ofmt);
+      lives_list_free(ofmt);
     }
 
     if (ofmt_all!=NULL) {
-      g_list_free_strings(ofmt_all);
-      g_list_free(ofmt_all);
+      lives_list_free_strings(ofmt_all);
+      lives_list_free(ofmt_all);
     }
 
 
@@ -3109,55 +3156,57 @@
 
     set_acodec_list_from_allowed(prefsw, rdet);
 
-  }
-  else prefsw->acodec_combo=NULL;
+  } else prefsw->acodec_combo=NULL;
 
-  icon = g_build_filename(prefs->prefix_dir, ICON_DIR, "pref_encoding.png", NULL);
+  icon = lives_build_filename(prefs->prefix_dir, ICON_DIR, "pref_encoding.png", NULL);
   pixbuf_encoding = lives_pixbuf_new_from_file(icon, NULL);
-  g_free(icon);
+  lives_free(icon);
 
   prefs_add_to_list(prefsw->prefs_list, pixbuf_encoding, _("Encoding"), LIST_ENTRY_ENCODING);
-  lives_container_add (LIVES_CONTAINER (dialog_table), prefsw->scrollw_right_encoding);
+  lives_container_add(LIVES_CONTAINER(dialog_table), prefsw->scrollw_right_encoding);
 
   // ---------------,
   // effects        |
   // ---------------'
 
-  prefsw->vbox_right_effects = lives_vbox_new (FALSE, 0);
-  lives_container_set_border_width (LIVES_CONTAINER (prefsw->vbox_right_effects), widget_opts.border_width);
-  
-  prefsw->scrollw_right_effects = lives_standard_scrolled_window_new (0,0,prefsw->vbox_right_effects);
+  prefsw->vbox_right_effects = lives_vbox_new(FALSE, 0);
+  lives_container_set_border_width(LIVES_CONTAINER(prefsw->vbox_right_effects), widget_opts.border_width);
+
+  prefsw->scrollw_right_effects = lives_standard_scrolled_window_new(0,0,prefsw->vbox_right_effects);
 
   hbox = lives_hbox_new(FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (prefsw->vbox_right_effects), hbox, FALSE, FALSE, widget_opts.packing_height);
+  lives_box_pack_start(LIVES_BOX(prefsw->vbox_right_effects), hbox, FALSE, FALSE, widget_opts.packing_height);
 
   prefsw->checkbutton_antialias = lives_standard_check_button_new(_("Use _antialiasing when resizing"),TRUE,LIVES_BOX(hbox),NULL);
 
   lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_antialias), prefs->antialias);
   //
 
-  hbox = lives_hbox_new (FALSE,0);
-  lives_box_pack_start (LIVES_BOX (prefsw->vbox_right_effects), hbox, FALSE, FALSE, widget_opts.packing_height);
-  
-  prefsw->spinbutton_rte_keys = lives_standard_spin_button_new 
-    ((tmp=g_strdup(_("Number of _real time effect keys"))),TRUE,prefs->rte_keys_virtual, FX_KEYS_PHYSICAL, 
-     FX_KEYS_MAX_VIRTUAL, 1., 1., 0, LIVES_BOX(hbox),
-    (tmp2=g_strdup(_("The number of \"virtual\" real time effect keys. They can be controlled through the real time effects window, or via network (OSC)."))));
-  g_free(tmp);
-  g_free(tmp2);
+  hbox = lives_hbox_new(FALSE,0);
+  lives_box_pack_start(LIVES_BOX(prefsw->vbox_right_effects), hbox, FALSE, FALSE, widget_opts.packing_height);
+
+  prefsw->spinbutton_rte_keys = lives_standard_spin_button_new
+                                ((tmp=lives_strdup(_("Number of _real time effect keys"))),TRUE,prefs->rte_keys_virtual, FX_KEYS_PHYSICAL,
+                                 FX_KEYS_MAX_VIRTUAL, 1., 1., 0, LIVES_BOX(hbox),
+                                 (tmp2=lives_strdup(
+                                         _("The number of \"virtual\" real time effect keys. They can be controlled through the real time effects window, or via network (OSC)."))));
+  lives_free(tmp);
+  lives_free(tmp2);
 
   hbox = lives_hbox_new(FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (prefsw->vbox_right_effects), hbox, FALSE, FALSE, widget_opts.packing_height);
+  lives_box_pack_start(LIVES_BOX(prefsw->vbox_right_effects), hbox, FALSE, FALSE, widget_opts.packing_height);
 
-  prefsw->checkbutton_threads = lives_standard_check_button_new(_("Use _threads where possible when applying effects"),TRUE,LIVES_BOX(hbox),NULL);
+  prefsw->checkbutton_threads = lives_standard_check_button_new(_("Use _threads where possible when applying effects"),TRUE,LIVES_BOX(hbox),
+                                NULL);
   lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_threads), future_prefs->nfx_threads>1);
 
   //
 
   add_fill_to_box(LIVES_BOX(hbox));
 
-  prefsw->spinbutton_nfx_threads = lives_standard_spin_button_new (_("Number of _threads"),TRUE,future_prefs->nfx_threads, 2., 65536., 1., 1., 0, 
-								   LIVES_BOX(hbox),NULL);
+  prefsw->spinbutton_nfx_threads = lives_standard_spin_button_new(_("Number of _threads"),TRUE,future_prefs->nfx_threads, 2., 65536., 1., 1.,
+                                   0,
+                                   LIVES_BOX(hbox),NULL);
 
   add_fill_to_box(LIVES_BOX(hbox));
 
@@ -3166,12 +3215,12 @@
   add_hsep_to_box(LIVES_BOX(prefsw->vbox_right_effects));
 
 
-  hbox = lives_hbox_new (FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (prefsw->vbox_right_effects), hbox, FALSE, FALSE, widget_opts.packing_height);
+  hbox = lives_hbox_new(FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(prefsw->vbox_right_effects), hbox, FALSE, FALSE, widget_opts.packing_height);
 
-  label = lives_standard_label_new (_("Restart is required if any of the following paths are changed:"));
+  label = lives_standard_label_new(_("Restart is required if any of the following paths are changed:"));
 
-  lives_box_pack_start (LIVES_BOX (hbox), label, TRUE, TRUE, 0);
+  lives_box_pack_start(LIVES_BOX(hbox), label, TRUE, TRUE, 0);
   // ---
   add_fill_to_box(LIVES_BOX(hbox));
 
@@ -3179,77 +3228,80 @@
   dph=widget_opts.packing_height;
   widget_opts.packing_height*=4;
 
-  prefsw->wpp_entry=lives_standard_entry_new(_("Weed plugin path"),TRUE,prefs->weed_plugin_path,-1,PATH_MAX,LIVES_BOX(prefsw->vbox_right_effects),NULL);
- 
-  prefsw->frei0r_entry=lives_standard_entry_new(_("Frei0r plugin path"),TRUE,prefs->frei0r_path,-1,PATH_MAX,LIVES_BOX(prefsw->vbox_right_effects),NULL);
- 
-  prefsw->ladspa_entry=lives_standard_entry_new(_("LADSPA plugin path"),TRUE,prefs->ladspa_path,-1,PATH_MAX,LIVES_BOX(prefsw->vbox_right_effects),NULL);
- 
+  prefsw->wpp_entry=lives_standard_entry_new(_("Weed plugin path"),TRUE,prefs->weed_plugin_path,-1,PATH_MAX,
+                    LIVES_BOX(prefsw->vbox_right_effects),NULL);
+
+  prefsw->frei0r_entry=lives_standard_entry_new(_("Frei0r plugin path"),TRUE,prefs->frei0r_path,-1,PATH_MAX,
+                       LIVES_BOX(prefsw->vbox_right_effects),NULL);
+
+  prefsw->ladspa_entry=lives_standard_entry_new(_("LADSPA plugin path"),TRUE,prefs->ladspa_path,-1,PATH_MAX,
+                       LIVES_BOX(prefsw->vbox_right_effects),NULL);
+
   widget_opts.packing_height=dph;
 
 
-  icon = g_build_filename(prefs->prefix_dir, ICON_DIR, "pref_effects.png", NULL);
+  icon = lives_build_filename(prefs->prefix_dir, ICON_DIR, "pref_effects.png", NULL);
   pixbuf_effects = lives_pixbuf_new_from_file(icon, NULL);
-  g_free(icon);
+  lives_free(icon);
 
   prefs_add_to_list(prefsw->prefs_list, pixbuf_effects, _("Effects"), LIST_ENTRY_EFFECTS);
-  lives_container_add (LIVES_CONTAINER (dialog_table), prefsw->scrollw_right_effects);
+  lives_container_add(LIVES_CONTAINER(dialog_table), prefsw->scrollw_right_effects);
 
   // -------------------,
   // Directories        |
   // -------------------'
 
-  prefsw->table_right_directories = lives_table_new (10, 3, FALSE);
-  lives_container_set_border_width (LIVES_CONTAINER (prefsw->table_right_directories), widget_opts.border_width*2);
-  lives_table_set_col_spacings (LIVES_TABLE (prefsw->table_right_directories), widget_opts.packing_width);
-  lives_table_set_row_spacings (LIVES_TABLE (prefsw->table_right_directories), widget_opts.packing_height*4);
-
-  prefsw->scrollw_right_directories = lives_standard_scrolled_window_new (0,0,prefsw->table_right_directories);
-
-  label = lives_standard_label_new (_("      Video load directory (default)      "));
-  lives_table_attach (LIVES_TABLE (prefsw->table_right_directories), label, 0, 1, 4, 5,
-		    (LiVESAttachOptions) (LIVES_FILL),
-		    (LiVESAttachOptions) (0), 0, 0);
-  lives_label_set_halignment (LIVES_LABEL(label), 0.5);
-  
-  label = lives_standard_label_new (_("      Video save directory (default) "));
-  lives_table_attach (LIVES_TABLE (prefsw->table_right_directories), label, 0, 1, 5, 6,
-		    (LiVESAttachOptions) (LIVES_FILL),
-		    (LiVESAttachOptions) (0), 0, 0);
-  lives_label_set_halignment (LIVES_LABEL(label), 0.5);
-  
-  label = lives_standard_label_new (_("      Audio load directory (default) "));
-  lives_table_attach (LIVES_TABLE (prefsw->table_right_directories), label, 0, 1, 6, 7,
-                    (LiVESAttachOptions) (LIVES_FILL),
-                    (LiVESAttachOptions) (0), 0, 0);
-  lives_label_set_halignment (LIVES_LABEL(label), 0.5);
-  
-  label = lives_standard_label_new (_("      Image directory (default) "));
-  lives_table_attach (LIVES_TABLE (prefsw->table_right_directories), label, 0, 1, 7, 8,
-                    (LiVESAttachOptions) (LIVES_FILL),
-                    (LiVESAttachOptions) (0), 0, 0);
-  lives_label_set_halignment (LIVES_LABEL(label), 0.5);
-  
-  label = lives_standard_label_new (_("      Backup/Restore directory (default) "));
-  lives_table_attach (LIVES_TABLE (prefsw->table_right_directories), label, 0, 1, 8, 9,
-                    (LiVESAttachOptions) (LIVES_FILL),
-                    (LiVESAttachOptions) (0), 0, 0);
-  lives_label_set_halignment (LIVES_LABEL(label), 0.5);
-  
-  label = lives_standard_label_new (_("      Temp directory (do not remove) "));
-  lives_table_attach (LIVES_TABLE (prefsw->table_right_directories), label, 0, 1, 3, 4,
-		    (LiVESAttachOptions) (LIVES_FILL),
-		    (LiVESAttachOptions) (0), 0, 0);
-  lives_label_set_halignment (LIVES_LABEL(label), 0.5);
+  prefsw->table_right_directories = lives_table_new(10, 3, FALSE);
+  lives_container_set_border_width(LIVES_CONTAINER(prefsw->table_right_directories), widget_opts.border_width*2);
+  lives_table_set_col_spacings(LIVES_TABLE(prefsw->table_right_directories), widget_opts.packing_width);
+  lives_table_set_row_spacings(LIVES_TABLE(prefsw->table_right_directories), widget_opts.packing_height*4);
+
+  prefsw->scrollw_right_directories = lives_standard_scrolled_window_new(0,0,prefsw->table_right_directories);
+
+  label = lives_standard_label_new(_("      Video load directory (default)      "));
+  lives_table_attach(LIVES_TABLE(prefsw->table_right_directories), label, 0, 1, 4, 5,
+                     (LiVESAttachOptions)(LIVES_FILL),
+                     (LiVESAttachOptions)(0), 0, 0);
+  lives_label_set_halignment(LIVES_LABEL(label), 0.5);
+
+  label = lives_standard_label_new(_("      Video save directory (default) "));
+  lives_table_attach(LIVES_TABLE(prefsw->table_right_directories), label, 0, 1, 5, 6,
+                     (LiVESAttachOptions)(LIVES_FILL),
+                     (LiVESAttachOptions)(0), 0, 0);
+  lives_label_set_halignment(LIVES_LABEL(label), 0.5);
+
+  label = lives_standard_label_new(_("      Audio load directory (default) "));
+  lives_table_attach(LIVES_TABLE(prefsw->table_right_directories), label, 0, 1, 6, 7,
+                     (LiVESAttachOptions)(LIVES_FILL),
+                     (LiVESAttachOptions)(0), 0, 0);
+  lives_label_set_halignment(LIVES_LABEL(label), 0.5);
+
+  label = lives_standard_label_new(_("      Image directory (default) "));
+  lives_table_attach(LIVES_TABLE(prefsw->table_right_directories), label, 0, 1, 7, 8,
+                     (LiVESAttachOptions)(LIVES_FILL),
+                     (LiVESAttachOptions)(0), 0, 0);
+  lives_label_set_halignment(LIVES_LABEL(label), 0.5);
+
+  label = lives_standard_label_new(_("      Backup/Restore directory (default) "));
+  lives_table_attach(LIVES_TABLE(prefsw->table_right_directories), label, 0, 1, 8, 9,
+                     (LiVESAttachOptions)(LIVES_FILL),
+                     (LiVESAttachOptions)(0), 0, 0);
+  lives_label_set_halignment(LIVES_LABEL(label), 0.5);
+
+  label = lives_standard_label_new(_("      Temp directory (do not remove) "));
+  lives_table_attach(LIVES_TABLE(prefsw->table_right_directories), label, 0, 1, 3, 4,
+                     (LiVESAttachOptions)(LIVES_FILL),
+                     (LiVESAttachOptions)(0), 0, 0);
+  lives_label_set_halignment(LIVES_LABEL(label), 0.5);
 
 
-  prefsw->vid_load_dir_entry = lives_entry_new ();
+  prefsw->vid_load_dir_entry = lives_entry_new();
   lives_entry_set_max_length(LIVES_ENTRY(prefsw->vid_load_dir_entry),PATH_MAX);
-  lives_table_attach (LIVES_TABLE (prefsw->table_right_directories), prefsw->vid_load_dir_entry, 1, 2, 4, 5,
-		    (LiVESAttachOptions) (LIVES_EXPAND | LIVES_FILL),
-		    (LiVESAttachOptions) (0), 0, 0);
+  lives_table_attach(LIVES_TABLE(prefsw->table_right_directories), prefsw->vid_load_dir_entry, 1, 2, 4, 5,
+                     (LiVESAttachOptions)(LIVES_EXPAND | LIVES_FILL),
+                     (LiVESAttachOptions)(0), 0, 0);
 
-  lives_widget_set_tooltip_text( prefsw->vid_load_dir_entry, _("The default directory for loading video clips from"));
+  lives_widget_set_tooltip_text(prefsw->vid_load_dir_entry, _("The default directory for loading video clips from"));
 
 
 
@@ -3257,142 +3309,143 @@
 
 
   widget_opts.justify=LIVES_JUSTIFY_CENTER;
-  label = lives_standard_label_new ("");
+  label = lives_standard_label_new("");
   widget_opts.justify=LIVES_JUSTIFY_DEFAULT;
   set_temp_label_text(LIVES_LABEL(label));
-  lives_table_attach (LIVES_TABLE (prefsw->table_right_directories), label, 0, 3, 0, 2,
-		    (LiVESAttachOptions) (LIVES_EXPAND | LIVES_FILL),
-		    (LiVESAttachOptions) (0), 0, 0);
-  lives_label_set_halignment (LIVES_LABEL(label), 0.65);
- 
+  lives_table_attach(LIVES_TABLE(prefsw->table_right_directories), label, 0, 3, 0, 2,
+                     (LiVESAttachOptions)(LIVES_EXPAND | LIVES_FILL),
+                     (LiVESAttachOptions)(0), 0, 0);
+  lives_label_set_halignment(LIVES_LABEL(label), 0.65);
+
   prefsw->temp_label=label;
 
- 
+
   // get from prefs
   lives_entry_set_text(LIVES_ENTRY(prefsw->vid_load_dir_entry),prefs->def_vid_load_dir);
 
 
-  
-  prefsw->vid_save_dir_entry = lives_standard_entry_new (NULL,FALSE,prefs->def_vid_save_dir,-1,PATH_MAX,
-							 NULL,_("The default directory for saving encoded clips to"));
-  lives_table_attach (LIVES_TABLE (prefsw->table_right_directories), prefsw->vid_save_dir_entry, 1, 2, 5, 6,
-		    (LiVESAttachOptions) (LIVES_EXPAND | LIVES_FILL),
-		    (LiVESAttachOptions) (0), 0, 0);
+
+  prefsw->vid_save_dir_entry = lives_standard_entry_new(NULL,FALSE,prefs->def_vid_save_dir,-1,PATH_MAX,
+                               NULL,_("The default directory for saving encoded clips to"));
+  lives_table_attach(LIVES_TABLE(prefsw->table_right_directories), prefsw->vid_save_dir_entry, 1, 2, 5, 6,
+                     (LiVESAttachOptions)(LIVES_EXPAND | LIVES_FILL),
+                     (LiVESAttachOptions)(0), 0, 0);
 
   lives_entry_set_editable(LIVES_ENTRY(prefsw->vid_save_dir_entry),FALSE);
-  
-  prefsw->audio_dir_entry = lives_standard_entry_new (NULL,FALSE,prefs->def_audio_dir,-1,PATH_MAX,
-						      NULL,_("The default directory for loading and saving audio"));
-  lives_table_attach (LIVES_TABLE (prefsw->table_right_directories), prefsw->audio_dir_entry, 1, 2, 6, 7,
-		    (LiVESAttachOptions) (LIVES_EXPAND | LIVES_FILL),
-		    (LiVESAttachOptions) (0), 0, 0);
+
+  prefsw->audio_dir_entry = lives_standard_entry_new(NULL,FALSE,prefs->def_audio_dir,-1,PATH_MAX,
+                            NULL,_("The default directory for loading and saving audio"));
+  lives_table_attach(LIVES_TABLE(prefsw->table_right_directories), prefsw->audio_dir_entry, 1, 2, 6, 7,
+                     (LiVESAttachOptions)(LIVES_EXPAND | LIVES_FILL),
+                     (LiVESAttachOptions)(0), 0, 0);
 
   lives_entry_set_editable(LIVES_ENTRY(prefsw->audio_dir_entry),FALSE);
-   
-  prefsw->image_dir_entry = lives_standard_entry_new (NULL,FALSE,prefs->def_image_dir,-1,PATH_MAX,
-						      NULL,_("The default directory for saving frameshots to"));
-  lives_table_attach (LIVES_TABLE (prefsw->table_right_directories), prefsw->image_dir_entry, 1, 2, 7, 8,
-		    (LiVESAttachOptions) (LIVES_EXPAND | LIVES_FILL),
-		    (LiVESAttachOptions) (0), 0, 0);
+
+  prefsw->image_dir_entry = lives_standard_entry_new(NULL,FALSE,prefs->def_image_dir,-1,PATH_MAX,
+                            NULL,_("The default directory for saving frameshots to"));
+  lives_table_attach(LIVES_TABLE(prefsw->table_right_directories), prefsw->image_dir_entry, 1, 2, 7, 8,
+                     (LiVESAttachOptions)(LIVES_EXPAND | LIVES_FILL),
+                     (LiVESAttachOptions)(0), 0, 0);
 
   lives_entry_set_editable(LIVES_ENTRY(prefsw->image_dir_entry),FALSE);
-   
-  prefsw->proj_dir_entry = lives_standard_entry_new (NULL,FALSE,prefs->def_proj_dir,-1,PATH_MAX,
-						     NULL,_("The default directory for backing up/restoring single clips"));
-  lives_table_attach (LIVES_TABLE (prefsw->table_right_directories), prefsw->proj_dir_entry, 1, 2, 8, 9,
-		    (LiVESAttachOptions) (LIVES_EXPAND | LIVES_FILL),
-		    (LiVESAttachOptions) (0), 0, 0);
-   
+
+  prefsw->proj_dir_entry = lives_standard_entry_new(NULL,FALSE,prefs->def_proj_dir,-1,PATH_MAX,
+                           NULL,_("The default directory for backing up/restoring single clips"));
+  lives_table_attach(LIVES_TABLE(prefsw->table_right_directories), prefsw->proj_dir_entry, 1, 2, 8, 9,
+                     (LiVESAttachOptions)(LIVES_EXPAND | LIVES_FILL),
+                     (LiVESAttachOptions)(0), 0, 0);
+
   lives_entry_set_editable(LIVES_ENTRY(prefsw->proj_dir_entry),FALSE);
-   
-  prefsw->tmpdir_entry = lives_standard_entry_new (NULL,FALSE,(tmp=g_filename_to_utf8(future_prefs->tmpdir,-1,NULL,NULL,NULL)),-1,PATH_MAX,
-						   NULL,(tmp2=g_strdup(_("LiVES working directory."))));
-
-  lives_table_attach (LIVES_TABLE (prefsw->table_right_directories), prefsw->tmpdir_entry, 1, 2, 3, 4,
-		    (LiVESAttachOptions) (LIVES_EXPAND | LIVES_FILL),
-		    (LiVESAttachOptions) (0), 0, 0);
 
-  g_free(tmp); g_free(tmp2);
+  prefsw->tmpdir_entry = lives_standard_entry_new(NULL,FALSE,(tmp=lives_filename_to_utf8(future_prefs->tmpdir,-1,NULL,NULL,NULL)),-1,PATH_MAX,
+                         NULL,(tmp2=lives_strdup(_("LiVES working directory."))));
+
+  lives_table_attach(LIVES_TABLE(prefsw->table_right_directories), prefsw->tmpdir_entry, 1, 2, 3, 4,
+                     (LiVESAttachOptions)(LIVES_EXPAND | LIVES_FILL),
+                     (LiVESAttachOptions)(0), 0, 0);
+
+  lives_free(tmp);
+  lives_free(tmp2);
 
   lives_entry_set_editable(LIVES_ENTRY(prefsw->tmpdir_entry),FALSE);
-   
-  dirbutton1 = lives_standard_file_button_new (TRUE,NULL);
-   
-  lives_table_attach (LIVES_TABLE (prefsw->table_right_directories), dirbutton1, 2, 3, 4, 5,
-		    (LiVESAttachOptions) (0),
-		    (LiVESAttachOptions) (0), 0, 0);
-   
-  dirbutton2 = lives_standard_file_button_new (TRUE,NULL);
-   
-  lives_table_attach (LIVES_TABLE (prefsw->table_right_directories), dirbutton2, 2, 3, 5, 6,
-		    (LiVESAttachOptions) (0),
-		    (LiVESAttachOptions) (0), 0, 0);
-   
-  dirbutton3 = lives_standard_file_button_new (TRUE,NULL);
-   
-  lives_table_attach (LIVES_TABLE (prefsw->table_right_directories), dirbutton3, 2, 3, 6, 7,
-		    (LiVESAttachOptions) (0),
-		    (LiVESAttachOptions) (0), 0, 0);
-   
-  dirbutton4 = lives_standard_file_button_new (TRUE,NULL);
-   
-  lives_table_attach (LIVES_TABLE (prefsw->table_right_directories), dirbutton4, 2, 3, 7, 8,
-		    (LiVESAttachOptions) (0),
-		    (LiVESAttachOptions) (0), 0, 0);
-
-  dirbutton5 = lives_standard_file_button_new (TRUE,NULL);
-  
-  lives_table_attach (LIVES_TABLE (prefsw->table_right_directories), dirbutton5, 2, 3, 8, 9,
-		    (LiVESAttachOptions) (0),
-		    (LiVESAttachOptions) (0), 0, 0);
-
-  dirbutton6 = lives_standard_file_button_new (TRUE,NULL);
-   
-  lives_table_attach (LIVES_TABLE (prefsw->table_right_directories), dirbutton6, 2, 3, 3, 4,
-		    (LiVESAttachOptions) (0),
-		    (LiVESAttachOptions) (0), 0, 0);
-   
-  icon = g_build_filename(prefs->prefix_dir, ICON_DIR, "pref_directory.png", NULL);
+
+  dirbutton1 = lives_standard_file_button_new(TRUE,NULL);
+
+  lives_table_attach(LIVES_TABLE(prefsw->table_right_directories), dirbutton1, 2, 3, 4, 5,
+                     (LiVESAttachOptions)(0),
+                     (LiVESAttachOptions)(0), 0, 0);
+
+  dirbutton2 = lives_standard_file_button_new(TRUE,NULL);
+
+  lives_table_attach(LIVES_TABLE(prefsw->table_right_directories), dirbutton2, 2, 3, 5, 6,
+                     (LiVESAttachOptions)(0),
+                     (LiVESAttachOptions)(0), 0, 0);
+
+  dirbutton3 = lives_standard_file_button_new(TRUE,NULL);
+
+  lives_table_attach(LIVES_TABLE(prefsw->table_right_directories), dirbutton3, 2, 3, 6, 7,
+                     (LiVESAttachOptions)(0),
+                     (LiVESAttachOptions)(0), 0, 0);
+
+  dirbutton4 = lives_standard_file_button_new(TRUE,NULL);
+
+  lives_table_attach(LIVES_TABLE(prefsw->table_right_directories), dirbutton4, 2, 3, 7, 8,
+                     (LiVESAttachOptions)(0),
+                     (LiVESAttachOptions)(0), 0, 0);
+
+  dirbutton5 = lives_standard_file_button_new(TRUE,NULL);
+
+  lives_table_attach(LIVES_TABLE(prefsw->table_right_directories), dirbutton5, 2, 3, 8, 9,
+                     (LiVESAttachOptions)(0),
+                     (LiVESAttachOptions)(0), 0, 0);
+
+  dirbutton6 = lives_standard_file_button_new(TRUE,NULL);
+
+  lives_table_attach(LIVES_TABLE(prefsw->table_right_directories), dirbutton6, 2, 3, 3, 4,
+                     (LiVESAttachOptions)(0),
+                     (LiVESAttachOptions)(0), 0, 0);
+
+  icon = lives_build_filename(prefs->prefix_dir, ICON_DIR, "pref_directory.png", NULL);
   pixbuf_directories = lives_pixbuf_new_from_file(icon, NULL);
-  g_free(icon);
+  lives_free(icon);
 
   prefs_add_to_list(prefsw->prefs_list, pixbuf_directories, _("Directories"), LIST_ENTRY_DIRECTORIES);
-  lives_container_add (LIVES_CONTAINER (dialog_table), prefsw->scrollw_right_directories);
+  lives_container_add(LIVES_CONTAINER(dialog_table), prefsw->scrollw_right_directories);
 
   // ---------------,
   // Warnings       |
   // ---------------'
-   
-  prefsw->vbox_right_warnings = lives_vbox_new (FALSE, 0);
 
-  prefsw->scrollw_right_warnings = lives_standard_scrolled_window_new (0,0,prefsw->vbox_right_warnings);
+  prefsw->vbox_right_warnings = lives_vbox_new(FALSE, 0);
+
+  prefsw->scrollw_right_warnings = lives_standard_scrolled_window_new(0,0,prefsw->vbox_right_warnings);
 
   hbox = lives_hbox_new(FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (prefsw->vbox_right_warnings), hbox, FALSE, FALSE, widget_opts.packing_height);
+  lives_box_pack_start(LIVES_BOX(prefsw->vbox_right_warnings), hbox, FALSE, FALSE, widget_opts.packing_height);
   // ---
-   
-  prefsw->spinbutton_warn_ds = lives_standard_spin_button_new (_("Warn if diskspace falls below: "),FALSE,
-							       (double)prefs->ds_warn_level/1000000., 
-							       (double)prefs->ds_crit_level/1000000.,
-							       DS_WARN_CRIT_MAX, 1., 10., 0,
-							       LIVES_BOX(hbox),NULL);
-   
-  label = lives_standard_label_new (_ (" MB [set to 0 to disable]"));
-  lives_box_pack_start (LIVES_BOX (hbox), label, FALSE, FALSE, widget_opts.packing_width>>1);
+
+  prefsw->spinbutton_warn_ds = lives_standard_spin_button_new(_("Warn if diskspace falls below: "),FALSE,
+                               (double)prefs->ds_warn_level/1000000.,
+                               (double)prefs->ds_crit_level/1000000.,
+                               DS_WARN_CRIT_MAX, 1., 10., 0,
+                               LIVES_BOX(hbox),NULL);
+
+  label = lives_standard_label_new(_(" MB [set to 0 to disable]"));
+  lives_box_pack_start(LIVES_BOX(hbox), label, FALSE, FALSE, widget_opts.packing_width>>1);
 
   // ---
 
   hbox = lives_hbox_new(FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (prefsw->vbox_right_warnings), hbox, FALSE, FALSE, widget_opts.packing_height);
+  lives_box_pack_start(LIVES_BOX(prefsw->vbox_right_warnings), hbox, FALSE, FALSE, widget_opts.packing_height);
   // ---
-   
-  prefsw->spinbutton_crit_ds = lives_standard_spin_button_new (_("Diskspace critical level: "),FALSE,
-							       (double)prefs->ds_crit_level/1000000., 0.,
-							       DS_WARN_CRIT_MAX, 1., 10., 0,
-							       LIVES_BOX(hbox),NULL);
 
-  label = lives_standard_label_new (_ (" MB [set to 0 to disable]"));
-  lives_box_pack_start (LIVES_BOX (hbox), label, FALSE, FALSE, widget_opts.packing_width>>1);
+  prefsw->spinbutton_crit_ds = lives_standard_spin_button_new(_("Diskspace critical level: "),FALSE,
+                               (double)prefs->ds_crit_level/1000000., 0.,
+                               DS_WARN_CRIT_MAX, 1., 10., 0,
+                               LIVES_BOX(hbox),NULL);
+
+  label = lives_standard_label_new(_(" MB [set to 0 to disable]"));
+  lives_box_pack_start(LIVES_BOX(hbox), label, FALSE, FALSE, widget_opts.packing_width>>1);
 
 
   // ---
@@ -3402,215 +3455,224 @@
 
 
   hbox = lives_hbox_new(FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (prefsw->vbox_right_warnings), hbox, FALSE, FALSE, widget_opts.packing_height>>1);
+  lives_box_pack_start(LIVES_BOX(prefsw->vbox_right_warnings), hbox, FALSE, FALSE, widget_opts.packing_height>>1);
 
-  prefsw->checkbutton_warn_fps = lives_standard_check_button_new(_("Warn on Insert / Merge if _frame rate of clipboard does not match frame rate of selection"),
-								 TRUE,LIVES_BOX(hbox),NULL);
+  prefsw->checkbutton_warn_fps = lives_standard_check_button_new(
+                                   _("Warn on Insert / Merge if _frame rate of clipboard does not match frame rate of selection"),
+                                   TRUE,LIVES_BOX(hbox),NULL);
 
-  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_warn_fps), !(prefs->warning_mask&WARN_MASK_FPS));
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_warn_fps), !(prefs->warning_mask&WARN_MASK_FPS));
 
   // ---
   hbox = lives_hbox_new(FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (prefsw->vbox_right_warnings), hbox, FALSE, FALSE, widget_opts.packing_height>>1);
+  lives_box_pack_start(LIVES_BOX(prefsw->vbox_right_warnings), hbox, FALSE, FALSE, widget_opts.packing_height>>1);
 
   // ---
   prefsw->checkbutton_warn_fsize = lives_standard_check_button_new(_("Warn on Open if file _size exceeds "),TRUE,LIVES_BOX(hbox),NULL);
-  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_warn_fsize), !(prefs->warning_mask&WARN_MASK_FSIZE));
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_warn_fsize), !(prefs->warning_mask&WARN_MASK_FSIZE));
+
+  prefsw->spinbutton_warn_fsize = lives_standard_spin_button_new(NULL,FALSE,
+                                  prefs->warn_file_size, 1., 2048., 1., 10., 0,
+                                  LIVES_BOX(hbox),NULL);
 
-  prefsw->spinbutton_warn_fsize = lives_standard_spin_button_new (NULL,FALSE,
-								  prefs->warn_file_size, 1., 2048., 1., 10., 0,
-								  LIVES_BOX(hbox),NULL);
 
-   
-  label = lives_standard_label_new (_ (" MB"));
-  lives_box_pack_start (LIVES_BOX (hbox), label, FALSE, FALSE, widget_opts.packing_width>>1);
+  label = lives_standard_label_new(_(" MB"));
+  lives_box_pack_start(LIVES_BOX(hbox), label, FALSE, FALSE, widget_opts.packing_width>>1);
 
   // ---
   hbox = lives_hbox_new(FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (prefsw->vbox_right_warnings), hbox, FALSE, FALSE, widget_opts.packing_height>>1);
+  lives_box_pack_start(LIVES_BOX(prefsw->vbox_right_warnings), hbox, FALSE, FALSE, widget_opts.packing_height>>1);
 
   prefsw->checkbutton_warn_save_set = lives_standard_check_button_new(_("Show a warning before saving a se_t"),
-								      TRUE,LIVES_BOX(hbox),NULL);
+                                      TRUE,LIVES_BOX(hbox),NULL);
 
-  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_warn_save_set), !(prefs->warning_mask&WARN_MASK_SAVE_SET));
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_warn_save_set), !(prefs->warning_mask&WARN_MASK_SAVE_SET));
 
   // ---
   hbox = lives_hbox_new(FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (prefsw->vbox_right_warnings), hbox, FALSE, FALSE, widget_opts.packing_height>>1);
+  lives_box_pack_start(LIVES_BOX(prefsw->vbox_right_warnings), hbox, FALSE, FALSE, widget_opts.packing_height>>1);
 
   prefsw->checkbutton_warn_mplayer = lives_standard_check_button_new
-    (_("Show a warning if _mplayer/mplayer2, sox, composite or convert is not found when LiVES is started."),
-     TRUE,LIVES_BOX(hbox),NULL);
-  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_warn_mplayer), !(prefs->warning_mask&WARN_MASK_NO_MPLAYER));
+                                     (_("Show a warning if _mplayer/mplayer2, sox, composite or convert is not found when LiVES is started."),
+                                      TRUE,LIVES_BOX(hbox),NULL);
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_warn_mplayer), !(prefs->warning_mask&WARN_MASK_NO_MPLAYER));
 
 
   // ---
   hbox = lives_hbox_new(FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (prefsw->vbox_right_warnings), hbox, FALSE, FALSE, widget_opts.packing_height>>1);
+  lives_box_pack_start(LIVES_BOX(prefsw->vbox_right_warnings), hbox, FALSE, FALSE, widget_opts.packing_height>>1);
 
   prefsw->checkbutton_warn_rendered_fx = lives_standard_check_button_new
-    (_("Show a warning if no _rendered effects are found at startup."),
-     TRUE,LIVES_BOX(hbox),NULL);
+                                         (_("Show a warning if no _rendered effects are found at startup."),
+                                          TRUE,LIVES_BOX(hbox),NULL);
 
-  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_warn_rendered_fx), !(prefs->warning_mask&WARN_MASK_RENDERED_FX));
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_warn_rendered_fx), !(prefs->warning_mask&WARN_MASK_RENDERED_FX));
 
 
   // ---
   hbox = lives_hbox_new(FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (prefsw->vbox_right_warnings), hbox, FALSE, FALSE, widget_opts.packing_height>>1);
+  lives_box_pack_start(LIVES_BOX(prefsw->vbox_right_warnings), hbox, FALSE, FALSE, widget_opts.packing_height>>1);
 
 
   prefsw->checkbutton_warn_encoders = lives_standard_check_button_new
-    (_("Show a warning if no _encoder plugins are found at startup."),
-     TRUE,LIVES_BOX(hbox),NULL);
+                                      (_("Show a warning if no _encoder plugins are found at startup."),
+                                       TRUE,LIVES_BOX(hbox),NULL);
 
-  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_warn_encoders), !(prefs->warning_mask&WARN_MASK_NO_ENCODERS));
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_warn_encoders), !(prefs->warning_mask&WARN_MASK_NO_ENCODERS));
 
   // ---
   hbox = lives_hbox_new(FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (prefsw->vbox_right_warnings), hbox, FALSE, FALSE, widget_opts.packing_height>>1);
+  lives_box_pack_start(LIVES_BOX(prefsw->vbox_right_warnings), hbox, FALSE, FALSE, widget_opts.packing_height>>1);
 
   prefsw->checkbutton_warn_dup_set = lives_standard_check_button_new
-    (_("Show a warning if a _duplicate set name is entered."),
-     TRUE,LIVES_BOX(hbox),NULL);
+                                     (_("Show a warning if a _duplicate set name is entered."),
+                                      TRUE,LIVES_BOX(hbox),NULL);
 
-  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_warn_dup_set), !(prefs->warning_mask&WARN_MASK_DUPLICATE_SET));
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_warn_dup_set), !(prefs->warning_mask&WARN_MASK_DUPLICATE_SET));
 
   // ---
   hbox = lives_hbox_new(FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (prefsw->vbox_right_warnings), hbox, FALSE, FALSE, widget_opts.packing_height>>1);
+  lives_box_pack_start(LIVES_BOX(prefsw->vbox_right_warnings), hbox, FALSE, FALSE, widget_opts.packing_height>>1);
 
 
   prefsw->checkbutton_warn_layout_clips = lives_standard_check_button_new
-    (_("When a set is loaded, warn if clips are missing from _layouts."),
-     TRUE,LIVES_BOX(hbox),NULL);
+                                          (_("When a set is loaded, warn if clips are missing from _layouts."),
+                                              TRUE,LIVES_BOX(hbox),NULL);
 
-  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_warn_layout_clips), !(prefs->warning_mask&WARN_MASK_LAYOUT_MISSING_CLIPS));
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_warn_layout_clips),
+                                 !(prefs->warning_mask&WARN_MASK_LAYOUT_MISSING_CLIPS));
 
   // ---
   hbox = lives_hbox_new(FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (prefsw->vbox_right_warnings), hbox, FALSE, FALSE, widget_opts.packing_height>>1);
+  lives_box_pack_start(LIVES_BOX(prefsw->vbox_right_warnings), hbox, FALSE, FALSE, widget_opts.packing_height>>1);
 
   prefsw->checkbutton_warn_layout_close = lives_standard_check_button_new
-    (_("Warn if a clip used in a layout is about to be closed."),
-     TRUE,LIVES_BOX(hbox),NULL);
+                                          (_("Warn if a clip used in a layout is about to be closed."),
+                                              TRUE,LIVES_BOX(hbox),NULL);
 
-  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_warn_layout_close), !(prefs->warning_mask&WARN_MASK_LAYOUT_CLOSE_FILE));
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_warn_layout_close),
+                                 !(prefs->warning_mask&WARN_MASK_LAYOUT_CLOSE_FILE));
 
   // ---
   hbox = lives_hbox_new(FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (prefsw->vbox_right_warnings), hbox, FALSE, FALSE, widget_opts.packing_height>>1);
+  lives_box_pack_start(LIVES_BOX(prefsw->vbox_right_warnings), hbox, FALSE, FALSE, widget_opts.packing_height>>1);
 
   prefsw->checkbutton_warn_layout_delete = lives_standard_check_button_new
-    (_("Warn if frames used in a layout are about to be deleted."),
-     TRUE,LIVES_BOX(hbox),NULL);
+      (_("Warn if frames used in a layout are about to be deleted."),
+       TRUE,LIVES_BOX(hbox),NULL);
 
-  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_warn_layout_delete), !(prefs->warning_mask&WARN_MASK_LAYOUT_DELETE_FRAMES));
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_warn_layout_delete),
+                                 !(prefs->warning_mask&WARN_MASK_LAYOUT_DELETE_FRAMES));
 
   // ---
   hbox = lives_hbox_new(FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (prefsw->vbox_right_warnings), hbox, FALSE, FALSE, widget_opts.packing_height>>1);
+  lives_box_pack_start(LIVES_BOX(prefsw->vbox_right_warnings), hbox, FALSE, FALSE, widget_opts.packing_height>>1);
 
   prefsw->checkbutton_warn_layout_shift = lives_standard_check_button_new
-    (_("Warn if frames used in a layout are about to be shifted."),
-     TRUE,LIVES_BOX(hbox),NULL);
+                                          (_("Warn if frames used in a layout are about to be shifted."),
+                                              TRUE,LIVES_BOX(hbox),NULL);
 
-  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_warn_layout_shift), !(prefs->warning_mask&WARN_MASK_LAYOUT_SHIFT_FRAMES));
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_warn_layout_shift),
+                                 !(prefs->warning_mask&WARN_MASK_LAYOUT_SHIFT_FRAMES));
 
   // ---
   hbox = lives_hbox_new(FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (prefsw->vbox_right_warnings), hbox, FALSE, FALSE, widget_opts.packing_height>>1);
+  lives_box_pack_start(LIVES_BOX(prefsw->vbox_right_warnings), hbox, FALSE, FALSE, widget_opts.packing_height>>1);
 
   prefsw->checkbutton_warn_layout_alter = lives_standard_check_button_new
-    (_("Warn if frames used in a layout are about to be altered."),
-     TRUE,LIVES_BOX(hbox),NULL);
+                                          (_("Warn if frames used in a layout are about to be altered."),
+                                              TRUE,LIVES_BOX(hbox),NULL);
 
-  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_warn_layout_alter), !(prefs->warning_mask&WARN_MASK_LAYOUT_ALTER_FRAMES));
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_warn_layout_alter),
+                                 !(prefs->warning_mask&WARN_MASK_LAYOUT_ALTER_FRAMES));
 
   // ---
   hbox = lives_hbox_new(FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (prefsw->vbox_right_warnings), hbox, FALSE, FALSE, widget_opts.packing_height>>1);
+  lives_box_pack_start(LIVES_BOX(prefsw->vbox_right_warnings), hbox, FALSE, FALSE, widget_opts.packing_height>>1);
 
   prefsw->checkbutton_warn_layout_adel = lives_standard_check_button_new
-    (_("Warn if audio used in a layout is about to be deleted."),
-     TRUE,LIVES_BOX(hbox),NULL);
+                                         (_("Warn if audio used in a layout is about to be deleted."),
+                                          TRUE,LIVES_BOX(hbox),NULL);
 
-  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_warn_layout_adel), !(prefs->warning_mask&WARN_MASK_LAYOUT_DELETE_AUDIO));
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_warn_layout_adel),
+                                 !(prefs->warning_mask&WARN_MASK_LAYOUT_DELETE_AUDIO));
 
   // ---
 
   hbox = lives_hbox_new(FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (prefsw->vbox_right_warnings), hbox, FALSE, FALSE, widget_opts.packing_height>>1);
+  lives_box_pack_start(LIVES_BOX(prefsw->vbox_right_warnings), hbox, FALSE, FALSE, widget_opts.packing_height>>1);
 
   prefsw->checkbutton_warn_layout_ashift = lives_standard_check_button_new
-    (_("Warn if audio used in a layout is about to be shifted."),
-     TRUE,LIVES_BOX(hbox),NULL);
+      (_("Warn if audio used in a layout is about to be shifted."),
+       TRUE,LIVES_BOX(hbox),NULL);
 
-  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_warn_layout_ashift), !(prefs->warning_mask&WARN_MASK_LAYOUT_SHIFT_AUDIO));
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_warn_layout_ashift),
+                                 !(prefs->warning_mask&WARN_MASK_LAYOUT_SHIFT_AUDIO));
 
   // ---
   hbox = lives_hbox_new(FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (prefsw->vbox_right_warnings), hbox, FALSE, FALSE, widget_opts.packing_height>>1);
+  lives_box_pack_start(LIVES_BOX(prefsw->vbox_right_warnings), hbox, FALSE, FALSE, widget_opts.packing_height>>1);
 
   prefsw->checkbutton_warn_layout_aalt = lives_standard_check_button_new
-    (_("Warn if audio used in a layout is about to be altered."),
-     TRUE,LIVES_BOX(hbox),NULL);
+                                         (_("Warn if audio used in a layout is about to be altered."),
+                                          TRUE,LIVES_BOX(hbox),NULL);
 
-  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_warn_layout_aalt), !(prefs->warning_mask&WARN_MASK_LAYOUT_ALTER_AUDIO));
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_warn_layout_aalt),
+                                 !(prefs->warning_mask&WARN_MASK_LAYOUT_ALTER_AUDIO));
 
   // ---
   hbox = lives_hbox_new(FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (prefsw->vbox_right_warnings), hbox, FALSE, FALSE, widget_opts.packing_height>>1);
+  lives_box_pack_start(LIVES_BOX(prefsw->vbox_right_warnings), hbox, FALSE, FALSE, widget_opts.packing_height>>1);
 
   prefsw->checkbutton_warn_layout_popup = lives_standard_check_button_new
-    (_("Popup layout errors after clip changes."),
-     TRUE,LIVES_BOX(hbox),NULL);
+                                          (_("Popup layout errors after clip changes."),
+                                              TRUE,LIVES_BOX(hbox),NULL);
 
-  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_warn_layout_popup), !(prefs->warning_mask&WARN_MASK_LAYOUT_POPUP));
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_warn_layout_popup), !(prefs->warning_mask&WARN_MASK_LAYOUT_POPUP));
 
   // ---
 
   hbox = lives_hbox_new(FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (prefsw->vbox_right_warnings), hbox, FALSE, FALSE, widget_opts.packing_height>>1);
+  lives_box_pack_start(LIVES_BOX(prefsw->vbox_right_warnings), hbox, FALSE, FALSE, widget_opts.packing_height>>1);
 
   prefsw->checkbutton_warn_discard_layout = lives_standard_check_button_new
-    (_("Warn if the layout has not been saved when leaving multitrack mode."),
-     TRUE,LIVES_BOX(hbox),NULL);
+      (_("Warn if the layout has not been saved when leaving multitrack mode."),
+       TRUE,LIVES_BOX(hbox),NULL);
 
-  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_warn_discard_layout), !(prefs->warning_mask&WARN_MASK_EXIT_MT));
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_warn_discard_layout), !(prefs->warning_mask&WARN_MASK_EXIT_MT));
 
   // ---
 
   hbox = lives_hbox_new(FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (prefsw->vbox_right_warnings), hbox, FALSE, FALSE, widget_opts.packing_height>>1);
+  lives_box_pack_start(LIVES_BOX(prefsw->vbox_right_warnings), hbox, FALSE, FALSE, widget_opts.packing_height>>1);
 
   prefsw->checkbutton_warn_mt_achans = lives_standard_check_button_new
-    (_("Warn if multitrack has no audio channels, and a layout with audio is loaded."),
-     TRUE,LIVES_BOX(hbox),NULL);
+                                       (_("Warn if multitrack has no audio channels, and a layout with audio is loaded."),
+                                        TRUE,LIVES_BOX(hbox),NULL);
 
-  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_warn_mt_achans), !(prefs->warning_mask&WARN_MASK_MT_ACHANS));
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_warn_mt_achans), !(prefs->warning_mask&WARN_MASK_MT_ACHANS));
 
   // ---
   hbox = lives_hbox_new(FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (prefsw->vbox_right_warnings), hbox, FALSE, FALSE, widget_opts.packing_height>>1);
+  lives_box_pack_start(LIVES_BOX(prefsw->vbox_right_warnings), hbox, FALSE, FALSE, widget_opts.packing_height>>1);
 
   prefsw->checkbutton_warn_mt_no_jack = lives_standard_check_button_new
-    (_("Warn if multitrack has audio channels, and your audio player is not \"jack\" or \"pulse audio\"."),
-     TRUE,LIVES_BOX(hbox),NULL);
+                                        (_("Warn if multitrack has audio channels, and your audio player is not \"jack\" or \"pulse audio\"."),
+                                         TRUE,LIVES_BOX(hbox),NULL);
 
-  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_warn_mt_no_jack), !(prefs->warning_mask&WARN_MASK_MT_NO_JACK));
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_warn_mt_no_jack), !(prefs->warning_mask&WARN_MASK_MT_NO_JACK));
 
   // ---
 
 #ifdef HAVE_LDVGRAB
   hbox = lives_hbox_new(FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (prefsw->vbox_right_warnings), hbox, FALSE, FALSE, widget_opts.packing_height>>1);
+  lives_box_pack_start(LIVES_BOX(prefsw->vbox_right_warnings), hbox, FALSE, FALSE, widget_opts.packing_height>>1);
 
   prefsw->checkbutton_warn_after_dvgrab = lives_standard_check_button_new
-    (_("Show info message after importing from firewire device."),
-     TRUE,LIVES_BOX(hbox),NULL);
+                                          (_("Show info message after importing from firewire device."),
+                                              TRUE,LIVES_BOX(hbox),NULL);
 
-  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_warn_after_dvgrab), !(prefs->warning_mask&WARN_MASK_AFTER_DVGRAB));
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_warn_after_dvgrab), !(prefs->warning_mask&WARN_MASK_AFTER_DVGRAB));
 
 #else
   prefsw->checkbutton_warn_after_dvgrab = NULL;
@@ -3620,12 +3682,12 @@
 
 #ifdef HAVE_YUV4MPEG
   hbox = lives_hbox_new(FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (prefsw->vbox_right_warnings), hbox, FALSE, FALSE, widget_opts.packing_height>>1);
+  lives_box_pack_start(LIVES_BOX(prefsw->vbox_right_warnings), hbox, FALSE, FALSE, widget_opts.packing_height>>1);
 
   prefsw->checkbutton_warn_yuv4m_open = lives_standard_check_button_new
-    (_("Show a warning before opening a yuv4mpeg stream (advanced)."),
-     TRUE,LIVES_BOX(hbox),NULL);
-  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_warn_yuv4m_open), !(prefs->warning_mask&WARN_MASK_OPEN_YUV4M));
+                                        (_("Show a warning before opening a yuv4mpeg stream (advanced)."),
+                                         TRUE,LIVES_BOX(hbox),NULL);
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_warn_yuv4m_open), !(prefs->warning_mask&WARN_MASK_OPEN_YUV4M));
 #else
   prefsw->checkbutton_warn_yuv4m_open = NULL;
 #endif
@@ -3633,263 +3695,269 @@
 
   // ---
   hbox = lives_hbox_new(FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (prefsw->vbox_right_warnings), hbox, FALSE, FALSE, widget_opts.packing_height>>1);
+  lives_box_pack_start(LIVES_BOX(prefsw->vbox_right_warnings), hbox, FALSE, FALSE, widget_opts.packing_height>>1);
 
   prefsw->checkbutton_warn_mt_backup_space = lives_standard_check_button_new
-    (_("Show a warning when multitrack is low on backup space."),
-     TRUE,LIVES_BOX(hbox),NULL);
+      (_("Show a warning when multitrack is low on backup space."),
+       TRUE,LIVES_BOX(hbox),NULL);
 
-  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_warn_mt_backup_space), !(prefs->warning_mask&WARN_MASK_MT_BACKUP_SPACE));
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_warn_mt_backup_space),
+                                 !(prefs->warning_mask&WARN_MASK_MT_BACKUP_SPACE));
 
   // ---
 
   hbox = lives_hbox_new(FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (prefsw->vbox_right_warnings), hbox, FALSE, FALSE, widget_opts.packing_height>>1);
+  lives_box_pack_start(LIVES_BOX(prefsw->vbox_right_warnings), hbox, FALSE, FALSE, widget_opts.packing_height>>1);
 
   prefsw->checkbutton_warn_after_crash = lives_standard_check_button_new
-    (_("Show a warning advising cleaning of disk space after a crash."),
-     TRUE,LIVES_BOX(hbox),NULL);
+                                         (_("Show a warning advising cleaning of disk space after a crash."),
+                                          TRUE,LIVES_BOX(hbox),NULL);
 
-  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_warn_after_crash), !(prefs->warning_mask&WARN_MASK_CLEAN_AFTER_CRASH));
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_warn_after_crash),
+                                 !(prefs->warning_mask&WARN_MASK_CLEAN_AFTER_CRASH));
 
   // ---
 
   hbox = lives_hbox_new(FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (prefsw->vbox_right_warnings), hbox, FALSE, FALSE, widget_opts.packing_height>>1);
+  lives_box_pack_start(LIVES_BOX(prefsw->vbox_right_warnings), hbox, FALSE, FALSE, widget_opts.packing_height>>1);
 
   prefsw->checkbutton_warn_no_pulse = lives_standard_check_button_new
-    (_("Show a warning if unable to connect to pulseaudio player."),
-     TRUE,LIVES_BOX(hbox),NULL);
+                                      (_("Show a warning if unable to connect to pulseaudio player."),
+                                       TRUE,LIVES_BOX(hbox),NULL);
 
-  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_warn_no_pulse), !(prefs->warning_mask&WARN_MASK_NO_PULSE_CONNECT));
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_warn_no_pulse), !(prefs->warning_mask&WARN_MASK_NO_PULSE_CONNECT));
 
   // ---
 
 
   hbox = lives_hbox_new(FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (prefsw->vbox_right_warnings), hbox, FALSE, FALSE, widget_opts.packing_height>>1);
+  lives_box_pack_start(LIVES_BOX(prefsw->vbox_right_warnings), hbox, FALSE, FALSE, widget_opts.packing_height>>1);
 
   prefsw->checkbutton_warn_layout_wipe = lives_standard_check_button_new
-    (_("Show a warning before wiping a layout which has unsaved changes."),
-     TRUE,LIVES_BOX(hbox),NULL);
+                                         (_("Show a warning before wiping a layout which has unsaved changes."),
+                                          TRUE,LIVES_BOX(hbox),NULL);
 
-  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_warn_layout_wipe), !(prefs->warning_mask&WARN_MASK_LAYOUT_WIPE));
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_warn_layout_wipe), !(prefs->warning_mask&WARN_MASK_LAYOUT_WIPE));
 
   // ---
 
 
-  icon = g_build_filename(prefs->prefix_dir, ICON_DIR, "pref_warning.png", NULL);
+  icon = lives_build_filename(prefs->prefix_dir, ICON_DIR, "pref_warning.png", NULL);
   pixbuf_warnings = lives_pixbuf_new_from_file(icon, NULL);
-  g_free(icon);
+  lives_free(icon);
 
   prefs_add_to_list(prefsw->prefs_list, pixbuf_warnings, _("Warnings"), LIST_ENTRY_WARNINGS);
-  lives_container_add (LIVES_CONTAINER (dialog_table), prefsw->scrollw_right_warnings);
+  lives_container_add(LIVES_CONTAINER(dialog_table), prefsw->scrollw_right_warnings);
 
 
   // -----------,
   // Misc       |
   // -----------'
-   
-  prefsw->vbox_right_misc = lives_vbox_new (FALSE, widget_opts.packing_height*4);
-  lives_container_set_border_width (LIVES_CONTAINER (prefsw->vbox_right_misc), widget_opts.border_width*2);
-   
-  prefsw->scrollw_right_misc = lives_standard_scrolled_window_new (0,0,prefsw->vbox_right_misc);
+
+  prefsw->vbox_right_misc = lives_vbox_new(FALSE, widget_opts.packing_height*4);
+  lives_container_set_border_width(LIVES_CONTAINER(prefsw->vbox_right_misc), widget_opts.border_width*2);
+
+  prefsw->scrollw_right_misc = lives_standard_scrolled_window_new(0,0,prefsw->vbox_right_misc);
 
   hbox = lives_hbox_new(FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (prefsw->vbox_right_misc), hbox, FALSE, FALSE, widget_opts.packing_height);
+  lives_box_pack_start(LIVES_BOX(prefsw->vbox_right_misc), hbox, FALSE, FALSE, widget_opts.packing_height);
 
 
   prefsw->check_midi = lives_standard_check_button_new
-    (_("Midi synch (requires the files midistart and midistop)"),
-     TRUE,LIVES_BOX(hbox),NULL);
+                       (_("Midi synch (requires the files midistart and midistop)"),
+                        TRUE,LIVES_BOX(hbox),NULL);
 
-  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->check_midi), prefs->midisynch);
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->check_midi), prefs->midisynch);
 
   lives_widget_set_sensitive(prefsw->check_midi,capable->has_midistartstop);
 
 
-   
-  hbox = lives_hbox_new (FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (prefsw->vbox_right_misc), hbox, FALSE, FALSE, widget_opts.packing_height);
-   
-  label = lives_standard_label_new (_("When inserting/merging frames:  "));
 
-  lives_box_pack_start (LIVES_BOX (hbox), label, FALSE, FALSE, widget_opts.packing_width*2);
-   
+  hbox = lives_hbox_new(FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(prefsw->vbox_right_misc), hbox, FALSE, FALSE, widget_opts.packing_height);
+
+  label = lives_standard_label_new(_("When inserting/merging frames:  "));
+
+  lives_box_pack_start(LIVES_BOX(hbox), label, FALSE, FALSE, widget_opts.packing_width*2);
+
   prefsw->ins_speed = lives_standard_radio_button_new(_("_Speed Up/Slow Down Insertion"),TRUE,rb_group2,LIVES_BOX(hbox),NULL);
-  rb_group2 = lives_radio_button_get_group (LIVES_RADIO_BUTTON (prefsw->ins_speed));
+  rb_group2 = lives_radio_button_get_group(LIVES_RADIO_BUTTON(prefsw->ins_speed));
 
   // ---
   ins_resample = lives_standard_radio_button_new(_("_Resample Insertion"),TRUE,rb_group2,LIVES_BOX(hbox),NULL);
 
   // ---
 
-  prefsw->cdda_hbox = lives_hbox_new (FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (prefsw->vbox_right_misc), prefsw->cdda_hbox, FALSE, FALSE, widget_opts.packing_height);
-   
-  prefsw->cdplay_entry = lives_standard_entry_new ((tmp=g_strdup(_("CD device           "))),FALSE,
-						   (tmp2=g_filename_to_utf8(prefs->cdplay_device,-1,NULL,NULL,NULL)),
-						   -1,PATH_MAX,LIVES_BOX(prefsw->cdda_hbox),
-						   (tmp3=g_strdup(_("LiVES can load audio tracks from this CD"))));
-  g_free(tmp); g_free(tmp2); g_free(tmp3);
+  prefsw->cdda_hbox = lives_hbox_new(FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(prefsw->vbox_right_misc), prefsw->cdda_hbox, FALSE, FALSE, widget_opts.packing_height);
 
-  buttond = lives_standard_file_button_new (FALSE,LIVES_DEVICE_DIR);
+  prefsw->cdplay_entry = lives_standard_entry_new((tmp=lives_strdup(_("CD device           "))),FALSE,
+                         (tmp2=lives_filename_to_utf8(prefs->cdplay_device,-1,NULL,NULL,NULL)),
+                         -1,PATH_MAX,LIVES_BOX(prefsw->cdda_hbox),
+                         (tmp3=lives_strdup(_("LiVES can load audio tracks from this CD"))));
+  lives_free(tmp);
+  lives_free(tmp2);
+  lives_free(tmp3);
+
+  buttond = lives_standard_file_button_new(FALSE,LIVES_DEVICE_DIR);
   lives_box_pack_start(LIVES_BOX(prefsw->cdda_hbox),buttond,FALSE,FALSE,widget_opts.packing_width);
-  
-  lives_signal_connect(buttond, LIVES_WIDGET_CLICKED_EVENT, LIVES_GUI_CALLBACK (on_filesel_button_clicked), (gpointer)prefsw->cdplay_entry);
 
+  lives_signal_connect(buttond, LIVES_WIDGET_CLICKED_SIGNAL, LIVES_GUI_CALLBACK(on_filesel_button_clicked),
+                       (livespointer)prefsw->cdplay_entry);
+
+
+
+  hbox = lives_hbox_new(FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(prefsw->vbox_right_misc), hbox, FALSE, FALSE, widget_opts.packing_height);
 
-   
-  hbox = lives_hbox_new (FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (prefsw->vbox_right_misc), hbox, FALSE, FALSE, widget_opts.packing_height);
-   
-  prefsw->spinbutton_def_fps = lives_standard_spin_button_new ((tmp=g_strdup(_("Default FPS        "))),TRUE,
-							  prefs->default_fps, 1., FPS_MAX, 1., 1., 3,
-							  LIVES_BOX(hbox),
-							  (tmp2=g_strdup(_("Frames per second to use when none is specified"))));
-  g_free(tmp); g_free(tmp2);
+  prefsw->spinbutton_def_fps = lives_standard_spin_button_new((tmp=lives_strdup(_("Default FPS        "))),TRUE,
+                               prefs->default_fps, 1., FPS_MAX, 1., 1., 3,
+                               LIVES_BOX(hbox),
+                               (tmp2=lives_strdup(_("Frames per second to use when none is specified"))));
+  lives_free(tmp);
+  lives_free(tmp2);
 
 
-  icon = g_strdup_printf("%s%s/pref_misc.png", prefs->prefix_dir, ICON_DIR);
+  icon = lives_strdup_printf("%s%s/pref_misc.png", prefs->prefix_dir, ICON_DIR);
   pixbuf_misc = lives_pixbuf_new_from_file(icon, NULL);
-  g_free(icon);
+  lives_free(icon);
 
   prefs_add_to_list(prefsw->prefs_list, pixbuf_misc, _("Misc"), LIST_ENTRY_MISC);
-  lives_container_add (LIVES_CONTAINER (dialog_table), prefsw->scrollw_right_misc);
+  lives_container_add(LIVES_CONTAINER(dialog_table), prefsw->scrollw_right_misc);
 
 
   if (!capable->has_cdda2wav) {
-    lives_widget_hide (prefsw->cdda_hbox);
+    lives_widget_hide(prefsw->cdda_hbox);
   }
-   
+
 
   // -----------,
   // Themes     |
   // -----------'
-   
-  prefsw->vbox_right_themes = lives_vbox_new (FALSE, widget_opts.packing_height);
-  lives_container_set_border_width (LIVES_CONTAINER (prefsw->vbox_right_themes), widget_opts.border_width*2);
-   
-  prefsw->scrollw_right_themes = lives_standard_scrolled_window_new (0,0,prefsw->vbox_right_themes);
-
-  hbox = lives_hbox_new (FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (prefsw->vbox_right_themes), hbox, TRUE, FALSE, widget_opts.packing_height);
-   
+
+  prefsw->vbox_right_themes = lives_vbox_new(FALSE, widget_opts.packing_height);
+  lives_container_set_border_width(LIVES_CONTAINER(prefsw->vbox_right_themes), widget_opts.border_width*2);
+
+  prefsw->scrollw_right_themes = lives_standard_scrolled_window_new(0,0,prefsw->vbox_right_themes);
+
+  hbox = lives_hbox_new(FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(prefsw->vbox_right_themes), hbox, TRUE, FALSE, widget_opts.packing_height);
+
   // scan for themes
   themes = get_plugin_list(PLUGIN_THEMES, TRUE, NULL, NULL);
-  themes = g_list_prepend(themes, g_strdup(mainw->string_constants[LIVES_STRING_CONSTANT_NONE]));
+  themes = lives_list_prepend(themes, lives_strdup(mainw->string_constants[LIVES_STRING_CONSTANT_NONE]));
 
   prefsw->theme_combo = lives_standard_combo_new(_("New theme:           "),FALSE,themes,LIVES_BOX(hbox),NULL);
-   
-   
-  if (g_ascii_strcasecmp(future_prefs->theme, "none")) {
-    theme = g_strdup(future_prefs->theme);
-  }
-  else theme = g_strdup(mainw->string_constants[LIVES_STRING_CONSTANT_NONE]);
+
+
+  if (lives_ascii_strcasecmp(future_prefs->theme, "none")) {
+    theme = lives_strdup(future_prefs->theme);
+  } else theme = lives_strdup(mainw->string_constants[LIVES_STRING_CONSTANT_NONE]);
   // ---
   lives_combo_set_active_string(LIVES_COMBO(prefsw->theme_combo), theme);
   //---
-  g_free(theme);
-  g_list_free_strings (themes);
-  g_list_free (themes);
-   
-  icon = g_build_filename(prefs->prefix_dir, ICON_DIR, "pref_themes.png", NULL);
+  lives_free(theme);
+  lives_list_free_strings(themes);
+  lives_list_free(themes);
+
+  icon = lives_build_filename(prefs->prefix_dir, ICON_DIR, "pref_themes.png", NULL);
   pixbuf_themes = lives_pixbuf_new_from_file(icon, NULL);
-  g_free(icon);
+  lives_free(icon);
 
   prefs_add_to_list(prefsw->prefs_list, pixbuf_themes, _("Themes"), LIST_ENTRY_THEMES);
-  lives_container_add (LIVES_CONTAINER (dialog_table), prefsw->scrollw_right_themes);
+  lives_container_add(LIVES_CONTAINER(dialog_table), prefsw->scrollw_right_themes);
 
   // --------------------------,
   // streaming/networking      |
   // --------------------------'
 
-  prefsw->vbox_right_net = lives_vbox_new (FALSE, widget_opts.packing_height*4);
-  lives_container_set_border_width (LIVES_CONTAINER (prefsw->vbox_right_net), widget_opts.border_width);
+  prefsw->vbox_right_net = lives_vbox_new(FALSE, widget_opts.packing_height*4);
+  lives_container_set_border_width(LIVES_CONTAINER(prefsw->vbox_right_net), widget_opts.border_width);
 
-  prefsw->scrollw_right_net = lives_standard_scrolled_window_new (0,0,prefsw->vbox_right_net);
+  prefsw->scrollw_right_net = lives_standard_scrolled_window_new(0,0,prefsw->vbox_right_net);
+
+  hbox = lives_hbox_new(FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(prefsw->vbox_right_net), hbox, FALSE, FALSE, widget_opts.packing_height);
+
+  prefsw->spinbutton_bwidth = lives_standard_spin_button_new(_("Download bandwidth (Kb/s)       "),FALSE,
+                              prefs->dl_bandwidth, 0, 100000, 1, 10, 0,
+                              LIVES_BOX(hbox),NULL);
 
-  hbox = lives_hbox_new (FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (prefsw->vbox_right_net), hbox, FALSE, FALSE, widget_opts.packing_height);
-   
-  prefsw->spinbutton_bwidth = lives_standard_spin_button_new (_("Download bandwidth (Kb/s)       "),FALSE,
-							      prefs->dl_bandwidth, 0, 100000, 1, 10, 0,
-							      LIVES_BOX(hbox),NULL);
 
-   
   add_hsep_to_box(LIVES_BOX(prefsw->vbox_right_net));
-   
+
 #ifndef ENABLE_OSC
-  label = lives_standard_label_new (_("LiVES must be compiled without \"configure --disable-OSC\" to use OMC"));
-  lives_box_pack_start (LIVES_BOX (prefsw->vbox_right_net), label, FALSE, FALSE, widget_opts->packing_height);
+  label = lives_standard_label_new(_("LiVES must be compiled without \"configure --disable-OSC\" to use OMC"));
+  lives_box_pack_start(LIVES_BOX(prefsw->vbox_right_net), label, FALSE, FALSE, widget_opts.packing_height);
 #endif
-   
-  hbox1 = lives_hbox_new (FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (prefsw->vbox_right_net), hbox1, FALSE, FALSE, widget_opts.packing_height);
-
-  hbox = lives_hbox_new (FALSE, 0);
-  lives_box_pack_start(LIVES_BOX (hbox1), hbox, FALSE, FALSE, 0);
-   
+
+  hbox1 = lives_hbox_new(FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(prefsw->vbox_right_net), hbox1, FALSE, FALSE, widget_opts.packing_height);
+
+  hbox = lives_hbox_new(FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(hbox1), hbox, FALSE, FALSE, 0);
+
   prefsw->enable_OSC = lives_standard_check_button_new(_("OMC remote control enabled"),FALSE,LIVES_BOX(hbox),NULL);
 
 
 #ifndef ENABLE_OSC
-  lives_widget_set_sensitive (prefsw->enable_OSC,FALSE);
+  lives_widget_set_sensitive(prefsw->enable_OSC,FALSE);
 #endif
   // ---
 
-  prefsw->spinbutton_osc_udp = lives_standard_spin_button_new (_("UDP port       "),FALSE,
-							       prefs->osc_udp_port, 1., 65535., 1., 10., 0,
-							       LIVES_BOX(hbox),NULL);
+  prefsw->spinbutton_osc_udp = lives_standard_spin_button_new(_("UDP port       "),FALSE,
+                               prefs->osc_udp_port, 1., 65535., 1., 10., 0,
+                               LIVES_BOX(hbox),NULL);
 
 
   // ---
   hbox = lives_hbox_new(FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (prefsw->vbox_right_net), hbox, FALSE, FALSE, widget_opts.packing_height);
+  lives_box_pack_start(LIVES_BOX(prefsw->vbox_right_net), hbox, FALSE, FALSE, widget_opts.packing_height);
 
   prefsw->enable_OSC_start = lives_standard_check_button_new(_("Start OMC on startup"),FALSE,LIVES_BOX(hbox),NULL);
 
-  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->enable_OSC_start), future_prefs->osc_start);
-   
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->enable_OSC_start), future_prefs->osc_start);
+
 #ifndef ENABLE_OSC
-  lives_widget_set_sensitive (prefsw->spinbutton_osc_udp,FALSE);
-  lives_widget_set_sensitive (prefsw->enable_OSC_start,FALSE);
-  lives_widget_set_sensitive (label,FALSE);
+  lives_widget_set_sensitive(prefsw->spinbutton_osc_udp,FALSE);
+  lives_widget_set_sensitive(prefsw->enable_OSC_start,FALSE);
+  lives_widget_set_sensitive(label,FALSE);
 #else
   if (prefs->osc_udp_started) {
-    lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->enable_OSC), TRUE);
-    lives_widget_set_sensitive (prefsw->spinbutton_osc_udp,FALSE);
-    lives_widget_set_sensitive (prefsw->enable_OSC,FALSE);
+    lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->enable_OSC), TRUE);
+    lives_widget_set_sensitive(prefsw->spinbutton_osc_udp,FALSE);
+    lives_widget_set_sensitive(prefsw->enable_OSC,FALSE);
   }
 #endif
-   
-  icon = g_build_filename(prefs->prefix_dir, ICON_DIR, "pref_net.png", NULL);
+
+  icon = lives_build_filename(prefs->prefix_dir, ICON_DIR, "pref_net.png", NULL);
   pixbuf_net = lives_pixbuf_new_from_file(icon, NULL);
-  g_free(icon);
+  lives_free(icon);
 
   prefs_add_to_list(prefsw->prefs_list, pixbuf_net, _("Streaming/Networking"), LIST_ENTRY_NET);
-  lives_container_add (LIVES_CONTAINER (dialog_table), prefsw->scrollw_right_net);
-   
+  lives_container_add(LIVES_CONTAINER(dialog_table), prefsw->scrollw_right_net);
+
   // ----------,
   // jack      |
   // ----------'
 
-  prefsw->vbox_right_jack = lives_vbox_new (FALSE, 0);
-  lives_container_set_border_width (LIVES_CONTAINER (prefsw->vbox_right_jack), widget_opts.packing_width*2);
+  prefsw->vbox_right_jack = lives_vbox_new(FALSE, 0);
+  lives_container_set_border_width(LIVES_CONTAINER(prefsw->vbox_right_jack), widget_opts.packing_width*2);
 
-  prefsw->scrollw_right_jack = lives_standard_scrolled_window_new (0,0,prefsw->vbox_right_jack);
+  prefsw->scrollw_right_jack = lives_standard_scrolled_window_new(0,0,prefsw->vbox_right_jack);
 
-  label = lives_standard_label_new (_("Jack transport"));
-  lives_box_pack_start (LIVES_BOX (prefsw->vbox_right_jack), label, FALSE, FALSE, widget_opts.packing_height);
+  label = lives_standard_label_new(_("Jack transport"));
+  lives_box_pack_start(LIVES_BOX(prefsw->vbox_right_jack), label, FALSE, FALSE, widget_opts.packing_height);
 
 #ifndef ENABLE_JACK_TRANSPORT
-  label = lives_standard_label_new (_("LiVES must be compiled with jack/transport.h and jack/jack.h present to use jack transport"));
-  lives_box_pack_start (LIVES_BOX (prefsw->vbox_right_jack), label, FALSE, FALSE, widget_opts.packing_height);
+  label = lives_standard_label_new(_("LiVES must be compiled with jack/transport.h and jack/jack.h present to use jack transport"));
+  lives_box_pack_start(LIVES_BOX(prefsw->vbox_right_jack), label, FALSE, FALSE, widget_opts.packing_height);
 #else
-  hbox = lives_hbox_new (FALSE,0);
-  lives_box_pack_start (LIVES_BOX (prefsw->vbox_right_jack), hbox, FALSE, FALSE, widget_opts.packing_height);
+  hbox = lives_hbox_new(FALSE,0);
+  lives_box_pack_start(LIVES_BOX(prefsw->vbox_right_jack), hbox, FALSE, FALSE, widget_opts.packing_height);
 
-  prefsw->jack_tserver_entry = lives_standard_entry_new (_("Jack _transport config file"),TRUE,prefs->jack_tserver,-1,255,LIVES_BOX(hbox),NULL);
+  prefsw->jack_tserver_entry = lives_standard_entry_new(_("Jack _transport config file"),TRUE,prefs->jack_tserver,-1,255,LIVES_BOX(hbox),
+                               NULL);
 
   lives_widget_set_sensitive(prefsw->jack_tserver_entry,FALSE); // unused for now
 
@@ -3898,52 +3966,52 @@
 
   prefsw->checkbutton_start_tjack=lives_standard_check_button_new(_("Start _server on LiVES startup"),TRUE,LIVES_BOX(hbox),NULL);
 
-  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_start_tjack), 
-				(future_prefs->jack_opts&JACK_OPTS_START_TSERVER)?TRUE:FALSE);
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_start_tjack),
+                                 (future_prefs->jack_opts&JACK_OPTS_START_TSERVER)?TRUE:FALSE);
 
 
 
   // ---
-  hbox = lives_hbox_new (FALSE,0);
-  lives_box_pack_start (LIVES_BOX (prefsw->vbox_right_jack), hbox, FALSE, FALSE, widget_opts.packing_height);
+  hbox = lives_hbox_new(FALSE,0);
+  lives_box_pack_start(LIVES_BOX(prefsw->vbox_right_jack), hbox, FALSE, FALSE, widget_opts.packing_height);
   // ---
 
   prefsw->checkbutton_jack_master=lives_standard_check_button_new(_("Jack transport _master (start and stop)"),TRUE,LIVES_BOX(hbox),NULL);
 
-  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_jack_master), 
-				(future_prefs->jack_opts&JACK_OPTS_TRANSPORT_MASTER)?TRUE:FALSE);
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_jack_master),
+                                 (future_prefs->jack_opts&JACK_OPTS_TRANSPORT_MASTER)?TRUE:FALSE);
 
 
   // ---
-  hbox = lives_hbox_new (FALSE,0);
-  lives_box_pack_start (LIVES_BOX (prefsw->vbox_right_jack), hbox, FALSE, FALSE, widget_opts.packing_height);
+  hbox = lives_hbox_new(FALSE,0);
+  lives_box_pack_start(LIVES_BOX(prefsw->vbox_right_jack), hbox, FALSE, FALSE, widget_opts.packing_height);
 
   prefsw->checkbutton_jack_client=lives_standard_check_button_new(_("Jack transport _client (start and stop)"),TRUE,LIVES_BOX(hbox),NULL);
 
-  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_jack_client), 
-				(future_prefs->jack_opts&JACK_OPTS_TRANSPORT_CLIENT)?TRUE:FALSE);
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_jack_client),
+                                 (future_prefs->jack_opts&JACK_OPTS_TRANSPORT_CLIENT)?TRUE:FALSE);
 
 
-  lives_signal_connect_after (LIVES_GUI_OBJECT (prefsw->checkbutton_jack_client), LIVES_WIDGET_TOGGLED_EVENT,
-			  LIVES_GUI_CALLBACK (after_jack_client_toggled),
-			  NULL);
+  lives_signal_connect_after(LIVES_GUI_OBJECT(prefsw->checkbutton_jack_client), LIVES_WIDGET_TOGGLED_SIGNAL,
+                             LIVES_GUI_CALLBACK(after_jack_client_toggled),
+                             NULL);
   // ---
 
-  hbox = lives_hbox_new (FALSE,0);
-  lives_box_pack_start (LIVES_BOX (prefsw->vbox_right_jack), hbox, FALSE, FALSE, widget_opts.packing_height);
+  hbox = lives_hbox_new(FALSE,0);
+  lives_box_pack_start(LIVES_BOX(prefsw->vbox_right_jack), hbox, FALSE, FALSE, widget_opts.packing_height);
 
   prefsw->checkbutton_jack_tb_start=lives_standard_check_button_new(_("Jack transport sets start position"),TRUE,LIVES_BOX(hbox),NULL);
 
-  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_jack_tb_start),
-				(future_prefs->jack_opts&JACK_OPTS_TIMEBASE_START)?
-				(lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_jack_client))):FALSE);
-
-  lives_widget_set_sensitive(prefsw->checkbutton_jack_tb_start, 
-			   lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_jack_client)));
-
-  lives_signal_connect_after (LIVES_GUI_OBJECT (prefsw->checkbutton_jack_tb_start), LIVES_WIDGET_TOGGLED_EVENT,
-			  LIVES_GUI_CALLBACK (after_jack_tb_start_toggled),
-			  NULL);
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_jack_tb_start),
+                                 (future_prefs->jack_opts&JACK_OPTS_TIMEBASE_START)?
+                                 (lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_jack_client))):FALSE);
+
+  lives_widget_set_sensitive(prefsw->checkbutton_jack_tb_start,
+                             lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_jack_client)));
+
+  lives_signal_connect_after(LIVES_GUI_OBJECT(prefsw->checkbutton_jack_tb_start), LIVES_WIDGET_TOGGLED_SIGNAL,
+                             LIVES_GUI_CALLBACK(after_jack_tb_start_toggled),
+                             NULL);
 
   // ---
 
@@ -3951,112 +4019,115 @@
 
   prefsw->checkbutton_jack_tb_client=lives_standard_check_button_new(_("Jack transport timebase slave"),TRUE,LIVES_BOX(hbox),NULL);
 
-  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_jack_tb_client), 
-				(future_prefs->jack_opts&JACK_OPTS_TIMEBASE_CLIENT)?
-				(lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_jack_tb_start))):FALSE);
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_jack_tb_client),
+                                 (future_prefs->jack_opts&JACK_OPTS_TIMEBASE_CLIENT)?
+                                 (lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_jack_tb_start))):FALSE);
 
-  lives_widget_set_sensitive(prefsw->checkbutton_jack_tb_client, 
-			   lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_jack_tb_start)));
+  lives_widget_set_sensitive(prefsw->checkbutton_jack_tb_client,
+                             lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_jack_tb_start)));
 
 
   // ---
-  label = lives_standard_label_new (_("(See also Playback -> Audio follows video rate/direction)"));
-  lives_box_pack_start (LIVES_BOX (prefsw->vbox_right_jack), label, FALSE, FALSE, widget_opts.packing_height);
+  label = lives_standard_label_new(_("(See also Playback -> Audio follows video rate/direction)"));
+  lives_box_pack_start(LIVES_BOX(prefsw->vbox_right_jack), label, FALSE, FALSE, widget_opts.packing_height);
 
 #endif
 
   add_hsep_to_box(LIVES_BOX(prefsw->vbox_right_jack));
 
 
-  label = lives_standard_label_new (_("Jack audio"));
-  lives_box_pack_start (LIVES_BOX (prefsw->vbox_right_jack), label, FALSE, FALSE, widget_opts.packing_height);
+  label = lives_standard_label_new(_("Jack audio"));
+  lives_box_pack_start(LIVES_BOX(prefsw->vbox_right_jack), label, FALSE, FALSE, widget_opts.packing_height);
 
 #ifndef ENABLE_JACK
-  label = lives_standard_label_new (_("LiVES must be compiled with jack/jack.h present to use jack audio"));
-  lives_box_pack_start (LIVES_BOX (prefsw->vbox_right_jack), label, FALSE, FALSE, widget_opts.packing_height);
+  label = lives_standard_label_new(_("LiVES must be compiled with jack/jack.h present to use jack audio"));
+  lives_box_pack_start(LIVES_BOX(prefsw->vbox_right_jack), label, FALSE, FALSE, widget_opts.packing_height);
 #else
-  label = lives_standard_label_new (_("You MUST set the audio player to \"jack\" in the Playback tab to use jack audio"));
-  lives_box_pack_start (LIVES_BOX (prefsw->vbox_right_jack), label, FALSE, FALSE, widget_opts.packing_height);
+  label = lives_standard_label_new(_("You MUST set the audio player to \"jack\" in the Playback tab to use jack audio"));
+  lives_box_pack_start(LIVES_BOX(prefsw->vbox_right_jack), label, FALSE, FALSE, widget_opts.packing_height);
 
-  hbox = lives_hbox_new (FALSE,0);
-  lives_box_pack_start (LIVES_BOX (prefsw->vbox_right_jack), hbox, FALSE, FALSE, widget_opts.packing_height);
+  hbox = lives_hbox_new(FALSE,0);
+  lives_box_pack_start(LIVES_BOX(prefsw->vbox_right_jack), hbox, FALSE, FALSE, widget_opts.packing_height);
 
-  prefsw->jack_aserver_entry = lives_standard_entry_new (_("Jack _audio server config file"),TRUE,prefs->jack_aserver,-1,255,LIVES_BOX(hbox),NULL);
+  prefsw->jack_aserver_entry = lives_standard_entry_new(_("Jack _audio server config file"),TRUE,prefs->jack_aserver,-1,255,LIVES_BOX(hbox),
+                               NULL);
 
   lives_widget_set_sensitive(prefsw->jack_aserver_entry,FALSE);
 
   // ---
   prefsw->checkbutton_start_ajack = lives_standard_check_button_new(_("Start _server on LiVES startup"),TRUE,LIVES_BOX(hbox),NULL);
-  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_start_ajack), 
-				(future_prefs->jack_opts&JACK_OPTS_START_ASERVER)?TRUE:FALSE);
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_start_ajack),
+                                 (future_prefs->jack_opts&JACK_OPTS_START_ASERVER)?TRUE:FALSE);
   // ---
-  hbox = lives_hbox_new (FALSE,0);
-  lives_box_pack_start (LIVES_BOX (prefsw->vbox_right_jack), hbox, FALSE, FALSE, widget_opts.packing_height);
+  hbox = lives_hbox_new(FALSE,0);
+  lives_box_pack_start(LIVES_BOX(prefsw->vbox_right_jack), hbox, FALSE, FALSE, widget_opts.packing_height);
 
   prefsw->checkbutton_jack_pwp = lives_standard_check_button_new(_("Play audio even when transport is _paused"),TRUE,LIVES_BOX(hbox),NULL);
-   
-  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_jack_pwp), 
-				(future_prefs->jack_opts&JACK_OPTS_NOPLAY_WHEN_PAUSED)?FALSE:TRUE);
 
-  lives_widget_set_sensitive (prefsw->checkbutton_jack_pwp, prefs->audio_player==AUD_PLAYER_JACK);
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_jack_pwp),
+                                 (future_prefs->jack_opts&JACK_OPTS_NOPLAY_WHEN_PAUSED)?FALSE:TRUE);
+
+  lives_widget_set_sensitive(prefsw->checkbutton_jack_pwp, prefs->audio_player==AUD_PLAYER_JACK);
 
   // ---
-  hbox = lives_hbox_new (FALSE,0);
-  lives_box_pack_start (LIVES_BOX (prefsw->vbox_right_jack), hbox, FALSE, FALSE, widget_opts.packing_height);
+  hbox = lives_hbox_new(FALSE,0);
+  lives_box_pack_start(LIVES_BOX(prefsw->vbox_right_jack), hbox, FALSE, FALSE, widget_opts.packing_height);
 
   prefsw->checkbutton_jack_read_autocon = lives_standard_check_button_new
-    (_("Automatically connect to System Out ports when 'playing' External Audio"),FALSE,LIVES_BOX(hbox),NULL);
-   
-  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_jack_read_autocon), 
-				(future_prefs->jack_opts&JACK_OPTS_NO_READ_AUTOCON)?FALSE:TRUE);
+                                          (_("Automatically connect to System Out ports when 'playing' External Audio"),FALSE,LIVES_BOX(hbox),NULL);
 
-  lives_widget_set_sensitive (prefsw->checkbutton_jack_read_autocon, prefs->audio_player==AUD_PLAYER_JACK);
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_jack_read_autocon),
+                                 (future_prefs->jack_opts&JACK_OPTS_NO_READ_AUTOCON)?FALSE:TRUE);
+
+  lives_widget_set_sensitive(prefsw->checkbutton_jack_read_autocon, prefs->audio_player==AUD_PLAYER_JACK);
 
 #endif
 
-  icon = g_build_filename(prefs->prefix_dir, ICON_DIR, "pref_jack.png", NULL);
+  icon = lives_build_filename(prefs->prefix_dir, ICON_DIR, "pref_jack.png", NULL);
   pixbuf_jack = lives_pixbuf_new_from_file(icon, NULL);
-  g_free(icon);
+  lives_free(icon);
 
   prefs_add_to_list(prefsw->prefs_list, pixbuf_jack, _("Jack Integration"), LIST_ENTRY_JACK);
-  lives_container_add (LIVES_CONTAINER (dialog_table), prefsw->scrollw_right_jack);
+  lives_container_add(LIVES_CONTAINER(dialog_table), prefsw->scrollw_right_jack);
 
   // ----------------------,
   // MIDI/js learner       |
   // ----------------------'
 
 
-  prefsw->vbox_right_midi = lives_vbox_new (FALSE, 0);
+  prefsw->vbox_right_midi = lives_vbox_new(FALSE, 0);
 
-  prefsw->scrollw_right_midi = lives_standard_scrolled_window_new (0,0,prefsw->vbox_right_midi);
+  prefsw->scrollw_right_midi = lives_standard_scrolled_window_new(0,0,prefsw->vbox_right_midi);
 
-  lives_container_set_border_width (LIVES_CONTAINER (prefsw->vbox_right_midi), widget_opts.border_width*2);
+  lives_container_set_border_width(LIVES_CONTAINER(prefsw->vbox_right_midi), widget_opts.border_width*2);
 
-  label = lives_standard_label_new (_("Events to respond to:"));
-  lives_box_pack_start (LIVES_BOX (prefsw->vbox_right_midi), label, FALSE, FALSE, widget_opts.packing_height);
+  label = lives_standard_label_new(_("Events to respond to:"));
+  lives_box_pack_start(LIVES_BOX(prefsw->vbox_right_midi), label, FALSE, FALSE, widget_opts.packing_height);
 
 #ifdef ENABLE_OSC
 #ifdef OMC_JS_IMPL
 
   hbox = lives_hbox_new(FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (prefsw->vbox_right_midi), hbox, FALSE, FALSE, widget_opts.packing_height);
+  lives_box_pack_start(LIVES_BOX(prefsw->vbox_right_midi), hbox, FALSE, FALSE, widget_opts.packing_height);
 
   prefsw->checkbutton_omc_js = lives_standard_check_button_new(_("_Joystick events"),TRUE,LIVES_BOX(hbox),NULL);
 
-  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_omc_js), prefs->omc_dev_opts&OMC_DEV_JS);
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_omc_js), prefs->omc_dev_opts&OMC_DEV_JS);
 
-  hbox = lives_hbox_new (FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (prefsw->vbox_right_midi), hbox, FALSE, FALSE, widget_opts.packing_height);
+  hbox = lives_hbox_new(FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(prefsw->vbox_right_midi), hbox, FALSE, FALSE, widget_opts.packing_height);
 
-  prefsw->omc_js_entry = lives_standard_entry_new ((tmp=g_strdup(_("_Joystick device")))
-						    ,TRUE,prefs->omc_js_fname,-1,PATH_MAX,LIVES_BOX(hbox),
-						    (tmp2=g_strdup(_("The joystick device, e.g. /dev/input/js0"))));
-  g_free(tmp); g_free(tmp2);
+  prefsw->omc_js_entry = lives_standard_entry_new((tmp=lives_strdup(_("_Joystick device")))
+                         ,TRUE,prefs->omc_js_fname,-1,PATH_MAX,LIVES_BOX(hbox),
+                         (tmp2=lives_strdup(_("The joystick device, e.g. /dev/input/js0"))));
+  lives_free(tmp);
+  lives_free(tmp2);
 
-  buttond = lives_standard_file_button_new (FALSE,LIVES_DEVICE_DIR);
+  buttond = lives_standard_file_button_new(FALSE,LIVES_DEVICE_DIR);
   lives_box_pack_start(LIVES_BOX(hbox),buttond,FALSE,FALSE,widget_opts.packing_width);
 
-  lives_signal_connect(buttond, LIVES_WIDGET_CLICKED_EVENT, LIVES_GUI_CALLBACK (on_filesel_button_clicked), (gpointer)prefsw->omc_js_entry);
+  lives_signal_connect(buttond, LIVES_WIDGET_CLICKED_SIGNAL, LIVES_GUI_CALLBACK(on_filesel_button_clicked),
+                       (livespointer)prefsw->omc_js_entry);
 
 #ifdef OMC_MIDI_IMPL
   add_hsep_to_box(LIVES_BOX(prefsw->vbox_right_midi));
@@ -4065,86 +4136,93 @@
 #endif
 
 #ifdef OMC_MIDI_IMPL
-  hbox = lives_hbox_new (FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (prefsw->vbox_right_midi), hbox, FALSE, FALSE, widget_opts.packing_height);
+  hbox = lives_hbox_new(FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(prefsw->vbox_right_midi), hbox, FALSE, FALSE, widget_opts.packing_height);
 
   prefsw->checkbutton_omc_midi = lives_standard_check_button_new(_("_MIDI events"),TRUE,LIVES_BOX(hbox),NULL);
 
-  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (prefsw->checkbutton_omc_midi), prefs->omc_dev_opts&OMC_DEV_MIDI);
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->checkbutton_omc_midi), prefs->omc_dev_opts&OMC_DEV_MIDI);
 
   // ---
 
-  prefsw->midi_hbox = lives_hbox_new (FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (prefsw->vbox_right_midi), prefsw->midi_hbox, FALSE, FALSE, widget_opts.packing_height);
+  prefsw->midi_hbox = lives_hbox_new(FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(prefsw->vbox_right_midi), prefsw->midi_hbox, FALSE, FALSE, widget_opts.packing_height);
 
-  prefsw->alsa_midi = lives_standard_radio_button_new((tmp=g_strdup(_("Use _ALSA MIDI (recommended)"))),TRUE,alsa_midi_group,
-						      LIVES_BOX(prefsw->midi_hbox),
-						      (tmp2=g_strdup(_("Create an ALSA MIDI port which other MIDI devices can be connected to"))));
+  prefsw->alsa_midi = lives_standard_radio_button_new((tmp=lives_strdup(_("Use _ALSA MIDI (recommended)"))),TRUE,alsa_midi_group,
+                      LIVES_BOX(prefsw->midi_hbox),
+                      (tmp2=lives_strdup(_("Create an ALSA MIDI port which other MIDI devices can be connected to"))));
 
-  g_free(tmp); g_free(tmp2);
+  lives_free(tmp);
+  lives_free(tmp2);
 
-  alsa_midi_group = lives_radio_button_get_group (LIVES_RADIO_BUTTON (prefsw->alsa_midi));
+  alsa_midi_group = lives_radio_button_get_group(LIVES_RADIO_BUTTON(prefsw->alsa_midi));
 
   // ---
 
-  raw_midi_button = lives_standard_radio_button_new((tmp=g_strdup(_("Use _raw MIDI"))),TRUE,alsa_midi_group,
-						    LIVES_BOX(prefsw->midi_hbox),
-						    (tmp2=g_strdup(_("Read directly from the MIDI device"))));
+  raw_midi_button = lives_standard_radio_button_new((tmp=lives_strdup(_("Use _raw MIDI"))),TRUE,alsa_midi_group,
+                    LIVES_BOX(prefsw->midi_hbox),
+                    (tmp2=lives_strdup(_("Read directly from the MIDI device"))));
 
-  g_free(tmp); g_free(tmp2);
+  lives_free(tmp);
+  lives_free(tmp2);
 
 #ifdef ALSA_MIDI
-  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (raw_midi_button),!prefs->use_alsa_midi);
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(raw_midi_button),!prefs->use_alsa_midi);
 #endif
 
 
-  hbox = lives_hbox_new (FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (prefsw->vbox_right_midi), hbox, FALSE, FALSE, widget_opts.packing_height);
-   
-  prefsw->omc_midi_entry = lives_standard_entry_new ((tmp=g_strdup(_("_MIDI device"))),TRUE,prefs->omc_midi_fname,
-						     -1,PATH_MAX,LIVES_BOX(hbox),
-						     (tmp2=g_strdup(_("The MIDI device, e.g. /dev/input/midi0"))));
+  hbox = lives_hbox_new(FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(prefsw->vbox_right_midi), hbox, FALSE, FALSE, widget_opts.packing_height);
 
-  g_free(tmp); g_free(tmp2);
+  prefsw->omc_midi_entry = lives_standard_entry_new((tmp=lives_strdup(_("_MIDI device"))),TRUE,prefs->omc_midi_fname,
+                           -1,PATH_MAX,LIVES_BOX(hbox),
+                           (tmp2=lives_strdup(_("The MIDI device, e.g. /dev/input/midi0"))));
 
-  prefsw->button_midid = lives_standard_file_button_new (FALSE,LIVES_DEVICE_DIR);
+  lives_free(tmp);
+  lives_free(tmp2);
+
+  prefsw->button_midid = lives_standard_file_button_new(FALSE,LIVES_DEVICE_DIR);
   lives_box_pack_start(LIVES_BOX(hbox),prefsw->button_midid,FALSE,FALSE,widget_opts.packing_width);
-  lives_widget_show (prefsw->button_midid);
+  lives_widget_show(prefsw->button_midid);
 
-  lives_signal_connect(prefsw->button_midid, LIVES_WIDGET_CLICKED_EVENT, LIVES_GUI_CALLBACK (on_filesel_button_clicked), (gpointer)prefsw->omc_midi_entry);
+  lives_signal_connect(prefsw->button_midid, LIVES_WIDGET_CLICKED_SIGNAL, LIVES_GUI_CALLBACK(on_filesel_button_clicked),
+                       (livespointer)prefsw->omc_midi_entry);
 
   add_hsep_to_box(LIVES_BOX(prefsw->vbox_right_midi));
-   
-  label = lives_standard_label_new (_("Advanced"));
-  lives_box_pack_start (LIVES_BOX (prefsw->vbox_right_midi), label, FALSE, FALSE, widget_opts.packing_height);
-
-  hbox = lives_hbox_new (FALSE,0);
-  lives_box_pack_start (LIVES_BOX (prefsw->vbox_right_midi), hbox, FALSE, FALSE, widget_opts.packing_height);
-
-  prefsw->spinbutton_midicr = lives_standard_spin_button_new ((tmp=g_strdup(_("MIDI check _rate"))),TRUE,
-							      prefs->midi_check_rate, 1., 2000., 10., 100., 0,
-							      LIVES_BOX(hbox),
-							      (tmp2=g_strdup(_("Number of MIDI checks per keyboard tick. Increasing this may improve MIDI responsiveness, but may slow down playback."))));
 
-  g_free(tmp); g_free(tmp2);
+  label = lives_standard_label_new(_("Advanced"));
+  lives_box_pack_start(LIVES_BOX(prefsw->vbox_right_midi), label, FALSE, FALSE, widget_opts.packing_height);
+
+  hbox = lives_hbox_new(FALSE,0);
+  lives_box_pack_start(LIVES_BOX(prefsw->vbox_right_midi), hbox, FALSE, FALSE, widget_opts.packing_height);
+
+  prefsw->spinbutton_midicr = lives_standard_spin_button_new((tmp=lives_strdup(_("MIDI check _rate"))),TRUE,
+                              prefs->midi_check_rate, 1., 2000., 10., 100., 0,
+                              LIVES_BOX(hbox),
+                              (tmp2=lives_strdup(
+                                      _("Number of MIDI checks per keyboard tick. Increasing this may improve MIDI responsiveness, but may slow down playback."))));
+
+  lives_free(tmp);
+  lives_free(tmp2);
 
 
   add_fill_to_box(LIVES_BOX(hbox));
-   
-  prefsw->spinbutton_midirpt = lives_standard_spin_button_new ((tmp=g_strdup(_("MIDI repeat"))),FALSE,
-							       prefs->midi_rpt, 1., 10000., 100., 1000., 0,
-							       LIVES_BOX(hbox),
-							       (tmp2=g_strdup(_("Number of non-reads allowed between succesive reads."))));
-  g_free(tmp); g_free(tmp2);
 
-  label = lives_standard_label_new (_("(Warning: setting this value too high can slow down playback.)"));
+  prefsw->spinbutton_midirpt = lives_standard_spin_button_new((tmp=lives_strdup(_("MIDI repeat"))),FALSE,
+                               prefs->midi_rpt, 1., 10000., 100., 1000., 0,
+                               LIVES_BOX(hbox),
+                               (tmp2=lives_strdup(_("Number of non-reads allowed between succesive reads."))));
+  lives_free(tmp);
+  lives_free(tmp2);
 
-  lives_box_pack_start (LIVES_BOX (prefsw->vbox_right_midi), label, FALSE, FALSE, widget_opts.packing_height);
+  label = lives_standard_label_new(_("(Warning: setting this value too high can slow down playback.)"));
+
+  lives_box_pack_start(LIVES_BOX(prefsw->vbox_right_midi), label, FALSE, FALSE, widget_opts.packing_height);
 
 #ifdef ALSA_MIDI
-  lives_signal_connect (LIVES_GUI_OBJECT (prefsw->alsa_midi), LIVES_WIDGET_TOGGLED_EVENT,
-		    LIVES_GUI_CALLBACK (on_alsa_midi_toggled),
-		    NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->alsa_midi), LIVES_WIDGET_TOGGLED_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_alsa_midi_toggled),
+                       NULL);
 
   on_alsa_midi_toggled(LIVES_TOGGLE_BUTTON(prefsw->alsa_midi),prefsw);
 #endif
@@ -4152,12 +4230,12 @@
 #endif
 #endif
 
-  icon = g_build_filename(prefs->prefix_dir, ICON_DIR, "pref_midi.png", NULL);
+  icon = lives_build_filename(prefs->prefix_dir, ICON_DIR, "pref_midi.png", NULL);
   pixbuf_midi = lives_pixbuf_new_from_file(icon, NULL);
-  g_free(icon);
+  lives_free(icon);
 
   prefs_add_to_list(prefsw->prefs_list, pixbuf_midi, _("MIDI/Joystick learner"), LIST_ENTRY_MIDI);
-  lives_container_add (LIVES_CONTAINER (dialog_table), prefsw->scrollw_right_midi);
+  lives_container_add(LIVES_CONTAINER(dialog_table), prefsw->scrollw_right_midi);
 
 
 
@@ -4165,278 +4243,380 @@
   prefsw->selection = lives_tree_view_get_selection(LIVES_TREE_VIEW(prefsw->prefs_list));
   lives_tree_selection_set_mode(prefsw->selection, LIVES_SELECTION_SINGLE);
 
-  lives_signal_connect(prefsw->selection, LIVES_WIDGET_CHANGED_EVENT, LIVES_GUI_CALLBACK(on_prefDomainChanged), NULL);
+  lives_signal_connect(prefsw->selection, LIVES_WIDGET_CHANGED_SIGNAL, LIVES_GUI_CALLBACK(on_prefDomainChanged), NULL);
   //
 
-  dialog_action_area = lives_dialog_get_action_area(LIVES_DIALOG (prefsw->prefs_dialog));
-  lives_widget_show (dialog_action_area);
-  lives_button_box_set_layout (LIVES_BUTTON_BOX (dialog_action_area), LIVES_BUTTONBOX_END);
-   
+  dialog_action_area = lives_dialog_get_action_area(LIVES_DIALOG(prefsw->prefs_dialog));
+  lives_widget_show(dialog_action_area);
+  lives_button_box_set_layout(LIVES_BUTTON_BOX(dialog_action_area), LIVES_BUTTONBOX_END);
+
   // Preferences 'Revert' button
-  prefsw->cancelbutton = lives_button_new_from_stock (LIVES_STOCK_REVERT_TO_SAVED);
-  lives_widget_show (prefsw->cancelbutton);
-  lives_dialog_add_action_widget (LIVES_DIALOG (prefsw->prefs_dialog), prefsw->cancelbutton, LIVES_RESPONSE_CANCEL);
+  prefsw->cancelbutton = lives_button_new_from_stock(LIVES_STOCK_REVERT_TO_SAVED);
+  lives_widget_show(prefsw->cancelbutton);
+  lives_dialog_add_action_widget(LIVES_DIALOG(prefsw->prefs_dialog), prefsw->cancelbutton, LIVES_RESPONSE_CANCEL);
 
-  lives_widget_set_can_focus (prefsw->cancelbutton,TRUE);
+  lives_widget_set_can_focus(prefsw->cancelbutton,TRUE);
 
   // Set 'Close' button as inactive since there are no changes yet
   lives_widget_set_sensitive(prefsw->cancelbutton, FALSE);
-   
+
   // Preferences 'Apply' button
-  prefsw->applybutton = lives_button_new_from_stock (LIVES_STOCK_APPLY);
-  lives_widget_show (prefsw->applybutton);
-  lives_dialog_add_action_widget (LIVES_DIALOG (prefsw->prefs_dialog), prefsw->applybutton, 0);
+  prefsw->applybutton = lives_button_new_from_stock(LIVES_STOCK_APPLY);
+  lives_widget_show(prefsw->applybutton);
+  lives_dialog_add_action_widget(LIVES_DIALOG(prefsw->prefs_dialog), prefsw->applybutton, 0);
 
-  lives_widget_set_can_focus_and_default (prefsw->applybutton);
+  lives_widget_set_can_focus_and_default(prefsw->applybutton);
   // Set 'Apply' button as inactive since there is no changes yet
   lives_widget_set_sensitive(prefsw->applybutton, FALSE);
-   
+
   // Preferences 'Close' button
-  prefsw->closebutton = lives_button_new_from_stock (LIVES_STOCK_CLOSE);
+  prefsw->closebutton = lives_button_new_from_stock(LIVES_STOCK_CLOSE);
   lives_widget_show(prefsw->closebutton);
   lives_dialog_add_action_widget(LIVES_DIALOG(prefsw->prefs_dialog), prefsw->closebutton, LIVES_RESPONSE_OK);
 
-  lives_widget_set_can_focus_and_default (prefsw->closebutton);
+  lives_widget_set_can_focus_and_default(prefsw->closebutton);
+
+  lives_widget_add_accelerator(prefsw->closebutton, LIVES_WIDGET_CLICKED_SIGNAL, accel_group,
+                               LIVES_KEY_Escape, (LiVESXModifierType)0, (LiVESAccelFlags)0);
 
-  lives_widget_add_accelerator (prefsw->closebutton, LIVES_WIDGET_CLICKED_EVENT, accel_group,
-			      LIVES_KEY_Escape, (LiVESXModifierType)0, (LiVESAccelFlags)0);
 
-   
-  lives_signal_connect(dirbutton1, LIVES_WIDGET_CLICKED_EVENT, LIVES_GUI_CALLBACK (on_filesel_button_clicked),prefsw->vid_load_dir_entry);
-  lives_signal_connect(dirbutton2, LIVES_WIDGET_CLICKED_EVENT, LIVES_GUI_CALLBACK (on_filesel_button_clicked),prefsw->vid_save_dir_entry);
-  lives_signal_connect(dirbutton3, LIVES_WIDGET_CLICKED_EVENT, LIVES_GUI_CALLBACK (on_filesel_button_clicked),prefsw->audio_dir_entry);
-  lives_signal_connect(dirbutton4, LIVES_WIDGET_CLICKED_EVENT, LIVES_GUI_CALLBACK (on_filesel_button_clicked),prefsw->image_dir_entry);
-  lives_signal_connect(dirbutton5, LIVES_WIDGET_CLICKED_EVENT, LIVES_GUI_CALLBACK (on_filesel_button_clicked),prefsw->proj_dir_entry);
-  lives_signal_connect(dirbutton6, LIVES_WIDGET_CLICKED_EVENT, LIVES_GUI_CALLBACK (on_filesel_complex_clicked),prefsw->tmpdir_entry);
+  lives_signal_connect(dirbutton1, LIVES_WIDGET_CLICKED_SIGNAL, LIVES_GUI_CALLBACK(on_filesel_button_clicked),prefsw->vid_load_dir_entry);
+  lives_signal_connect(dirbutton2, LIVES_WIDGET_CLICKED_SIGNAL, LIVES_GUI_CALLBACK(on_filesel_button_clicked),prefsw->vid_save_dir_entry);
+  lives_signal_connect(dirbutton3, LIVES_WIDGET_CLICKED_SIGNAL, LIVES_GUI_CALLBACK(on_filesel_button_clicked),prefsw->audio_dir_entry);
+  lives_signal_connect(dirbutton4, LIVES_WIDGET_CLICKED_SIGNAL, LIVES_GUI_CALLBACK(on_filesel_button_clicked),prefsw->image_dir_entry);
+  lives_signal_connect(dirbutton5, LIVES_WIDGET_CLICKED_SIGNAL, LIVES_GUI_CALLBACK(on_filesel_button_clicked),prefsw->proj_dir_entry);
+  lives_signal_connect(dirbutton6, LIVES_WIDGET_CLICKED_SIGNAL, LIVES_GUI_CALLBACK(on_filesel_complex_clicked),prefsw->tmpdir_entry);
 
   // Connect signals for 'Apply' button activity handling
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->wpp_entry), LIVES_WIDGET_CHANGED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->frei0r_entry), LIVES_WIDGET_CHANGED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->ladspa_entry), LIVES_WIDGET_CHANGED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->fs_max_check), LIVES_WIDGET_TOGGLED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->recent_check), LIVES_WIDGET_TOGGLED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->stop_screensaver_check), LIVES_WIDGET_TOGGLED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->open_maximised_check), LIVES_WIDGET_TOGGLED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->show_tool), LIVES_WIDGET_TOGGLED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->mouse_scroll), LIVES_WIDGET_TOGGLED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_ce_maxspect), LIVES_WIDGET_TOGGLED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->rb_startup_ce), LIVES_WIDGET_TOGGLED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->rb_startup_mt), LIVES_WIDGET_TOGGLED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->spinbutton_crit_ds), "value_changed", 
-		   LIVES_GUI_CALLBACK(spinbutton_crit_ds_value_changed), NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->spinbutton_crit_ds), LIVES_WIDGET_VALUE_CHANGED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
-
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->spinbutton_gmoni), LIVES_WIDGET_VALUE_CHANGED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->spinbutton_pmoni), LIVES_WIDGET_VALUE_CHANGED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
-
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->spinbutton_gmoni), LIVES_WIDGET_VALUE_CHANGED_EVENT, LIVES_GUI_CALLBACK(pmoni_gmoni_changed), NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->spinbutton_pmoni), LIVES_WIDGET_VALUE_CHANGED_EVENT, LIVES_GUI_CALLBACK(pmoni_gmoni_changed), NULL);
-
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->forcesmon), LIVES_WIDGET_TOGGLED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_stream_audio), LIVES_WIDGET_TOGGLED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), 
-		   NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_rec_after_pb), LIVES_WIDGET_TOGGLED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), 
-		   NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->spinbutton_warn_ds), LIVES_WIDGET_VALUE_CHANGED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), 
-		   NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->mt_enter_prompt), LIVES_WIDGET_TOGGLED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(mt_enter_defs), LIVES_WIDGET_TOGGLED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_render_prompt), LIVES_WIDGET_TOGGLED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), 
-		   NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->spinbutton_mt_def_width), LIVES_WIDGET_VALUE_CHANGED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled),
-		   NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->spinbutton_mt_def_height), LIVES_WIDGET_VALUE_CHANGED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled),
-		   NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->spinbutton_mt_def_fps), LIVES_WIDGET_VALUE_CHANGED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), 
-		   NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->backaudio_checkbutton), LIVES_WIDGET_TOGGLED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->pertrack_checkbutton), LIVES_WIDGET_TOGGLED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->spinbutton_mt_undo_buf), LIVES_WIDGET_VALUE_CHANGED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), 
-		   NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_mt_exit_render), LIVES_WIDGET_TOGGLED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), 
-		   NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->spinbutton_mt_ab_time), LIVES_WIDGET_VALUE_CHANGED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), 
-		   NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->mt_autoback_always), LIVES_WIDGET_TOGGLED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->mt_autoback_never), LIVES_WIDGET_TOGGLED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->mt_autoback_every), LIVES_WIDGET_TOGGLED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->video_open_entry), LIVES_WIDGET_CHANGED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->spinbutton_ocp), LIVES_WIDGET_VALUE_CHANGED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->jpeg), LIVES_WIDGET_TOGGLED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(png), LIVES_WIDGET_TOGGLED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_instant_open), LIVES_WIDGET_TOGGLED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), 
-		   NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_auto_deint), LIVES_WIDGET_TOGGLED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_auto_trim), LIVES_WIDGET_TOGGLED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_nobord), LIVES_WIDGET_TOGGLED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_concat_images), LIVES_WIDGET_TOGGLED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), 
-		   NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->pbq_combo), LIVES_WIDGET_CHANGED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_show_stats), LIVES_WIDGET_TOGGLED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(pp_combo), LIVES_WIDGET_CHANGED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->audp_combo), LIVES_WIDGET_CHANGED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->audio_command_entry), LIVES_WIDGET_CHANGED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_afollow), LIVES_WIDGET_TOGGLED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_aclips), LIVES_WIDGET_TOGGLED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->rdesk_audio), LIVES_WIDGET_TOGGLED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->rframes), LIVES_WIDGET_TOGGLED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->rfps), LIVES_WIDGET_TOGGLED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->reffects), LIVES_WIDGET_TOGGLED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->rclips), LIVES_WIDGET_TOGGLED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->raudio), LIVES_WIDGET_TOGGLED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->rextaudio), LIVES_WIDGET_TOGGLED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->spinbutton_rec_gb), LIVES_WIDGET_VALUE_CHANGED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->encoder_combo), LIVES_WIDGET_CHANGED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->ofmt_combo), LIVES_WIDGET_CHANGED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
-
-  if (prefsw->acodec_combo!=NULL) 
-    lives_signal_connect(LIVES_GUI_OBJECT(prefsw->acodec_combo), LIVES_WIDGET_CHANGED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_antialias), LIVES_WIDGET_TOGGLED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->spinbutton_rte_keys), LIVES_WIDGET_VALUE_CHANGED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), 
-		   NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_threads), LIVES_WIDGET_TOGGLED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_threads), LIVES_WIDGET_TOGGLED_EVENT, LIVES_GUI_CALLBACK(toggle_set_sensitive), 
-		   (gpointer)prefsw->spinbutton_nfx_threads);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->spinbutton_nfx_threads), LIVES_WIDGET_VALUE_CHANGED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), 
-		   NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->vid_load_dir_entry), LIVES_WIDGET_CHANGED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->vid_save_dir_entry), LIVES_WIDGET_CHANGED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->audio_dir_entry), LIVES_WIDGET_CHANGED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->image_dir_entry), LIVES_WIDGET_CHANGED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->proj_dir_entry), LIVES_WIDGET_CHANGED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->tmpdir_entry), LIVES_WIDGET_CHANGED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_warn_fps), LIVES_WIDGET_TOGGLED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_warn_fsize), LIVES_WIDGET_TOGGLED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->spinbutton_warn_fsize), LIVES_WIDGET_VALUE_CHANGED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), 
-		   NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_warn_save_set), LIVES_WIDGET_TOGGLED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), 
-		   NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_warn_mplayer), LIVES_WIDGET_TOGGLED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), 
-		   NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_warn_rendered_fx), LIVES_WIDGET_TOGGLED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), 
-		   NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_warn_encoders), LIVES_WIDGET_TOGGLED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), 
-		   NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_warn_dup_set), LIVES_WIDGET_TOGGLED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), 
-		   NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_warn_layout_clips), LIVES_WIDGET_TOGGLED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), 
-		   NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_warn_layout_close), LIVES_WIDGET_TOGGLED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), 
-		   NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_warn_layout_delete), LIVES_WIDGET_TOGGLED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled),
-		   NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_warn_layout_shift), LIVES_WIDGET_TOGGLED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), 
-		   NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_warn_layout_alter), LIVES_WIDGET_TOGGLED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), 
-		   NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_warn_layout_adel), LIVES_WIDGET_TOGGLED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), 
-		   NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_warn_layout_ashift), LIVES_WIDGET_TOGGLED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled),
-		   NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_warn_layout_aalt), LIVES_WIDGET_TOGGLED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), 
-		   NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_warn_layout_popup), LIVES_WIDGET_TOGGLED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled),
-		   NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_warn_discard_layout), LIVES_WIDGET_TOGGLED_EVENT, 
-		   LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_warn_mt_achans), LIVES_WIDGET_TOGGLED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), 
-		   NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_warn_mt_no_jack), LIVES_WIDGET_TOGGLED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), 
-		   NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->wpp_entry), LIVES_WIDGET_CHANGED_SIGNAL, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->frei0r_entry), LIVES_WIDGET_CHANGED_SIGNAL, LIVES_GUI_CALLBACK(apply_button_set_enabled),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->ladspa_entry), LIVES_WIDGET_CHANGED_SIGNAL, LIVES_GUI_CALLBACK(apply_button_set_enabled),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->fs_max_check), LIVES_WIDGET_TOGGLED_SIGNAL, LIVES_GUI_CALLBACK(apply_button_set_enabled),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->recent_check), LIVES_WIDGET_TOGGLED_SIGNAL, LIVES_GUI_CALLBACK(apply_button_set_enabled),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->stop_screensaver_check), LIVES_WIDGET_TOGGLED_SIGNAL,
+                       LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->open_maximised_check), LIVES_WIDGET_TOGGLED_SIGNAL,
+                       LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->show_tool), LIVES_WIDGET_TOGGLED_SIGNAL, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->mouse_scroll), LIVES_WIDGET_TOGGLED_SIGNAL, LIVES_GUI_CALLBACK(apply_button_set_enabled),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_ce_maxspect), LIVES_WIDGET_TOGGLED_SIGNAL,
+                       LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->rb_startup_ce), LIVES_WIDGET_TOGGLED_SIGNAL, LIVES_GUI_CALLBACK(apply_button_set_enabled),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->rb_startup_mt), LIVES_WIDGET_TOGGLED_SIGNAL, LIVES_GUI_CALLBACK(apply_button_set_enabled),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->spinbutton_crit_ds), LIVES_WIDGET_VALUE_CHANGED_SIGNAL,
+                       LIVES_GUI_CALLBACK(spinbutton_crit_ds_value_changed), NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->spinbutton_crit_ds), LIVES_WIDGET_VALUE_CHANGED_SIGNAL,
+                       LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
+
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->spinbutton_gmoni), LIVES_WIDGET_VALUE_CHANGED_SIGNAL,
+                       LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->spinbutton_pmoni), LIVES_WIDGET_VALUE_CHANGED_SIGNAL,
+                       LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
+
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->spinbutton_gmoni), LIVES_WIDGET_VALUE_CHANGED_SIGNAL, LIVES_GUI_CALLBACK(pmoni_gmoni_changed),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->spinbutton_pmoni), LIVES_WIDGET_VALUE_CHANGED_SIGNAL, LIVES_GUI_CALLBACK(pmoni_gmoni_changed),
+                       NULL);
+
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->forcesmon), LIVES_WIDGET_TOGGLED_SIGNAL, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_stream_audio), LIVES_WIDGET_TOGGLED_SIGNAL,
+                       LIVES_GUI_CALLBACK(apply_button_set_enabled),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_rec_after_pb), LIVES_WIDGET_TOGGLED_SIGNAL,
+                       LIVES_GUI_CALLBACK(apply_button_set_enabled),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->spinbutton_warn_ds), LIVES_WIDGET_VALUE_CHANGED_SIGNAL,
+                       LIVES_GUI_CALLBACK(apply_button_set_enabled),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->mt_enter_prompt), LIVES_WIDGET_TOGGLED_SIGNAL, LIVES_GUI_CALLBACK(apply_button_set_enabled),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(mt_enter_defs), LIVES_WIDGET_TOGGLED_SIGNAL, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_render_prompt), LIVES_WIDGET_TOGGLED_SIGNAL,
+                       LIVES_GUI_CALLBACK(apply_button_set_enabled),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->spinbutton_mt_def_width), LIVES_WIDGET_VALUE_CHANGED_SIGNAL,
+                       LIVES_GUI_CALLBACK(apply_button_set_enabled),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->spinbutton_mt_def_height), LIVES_WIDGET_VALUE_CHANGED_SIGNAL,
+                       LIVES_GUI_CALLBACK(apply_button_set_enabled),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->spinbutton_mt_def_fps), LIVES_WIDGET_VALUE_CHANGED_SIGNAL,
+                       LIVES_GUI_CALLBACK(apply_button_set_enabled),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->backaudio_checkbutton), LIVES_WIDGET_TOGGLED_SIGNAL,
+                       LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->pertrack_checkbutton), LIVES_WIDGET_TOGGLED_SIGNAL,
+                       LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->spinbutton_mt_undo_buf), LIVES_WIDGET_VALUE_CHANGED_SIGNAL,
+                       LIVES_GUI_CALLBACK(apply_button_set_enabled),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_mt_exit_render), LIVES_WIDGET_TOGGLED_SIGNAL,
+                       LIVES_GUI_CALLBACK(apply_button_set_enabled),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->spinbutton_mt_ab_time), LIVES_WIDGET_VALUE_CHANGED_SIGNAL,
+                       LIVES_GUI_CALLBACK(apply_button_set_enabled),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->mt_autoback_always), LIVES_WIDGET_TOGGLED_SIGNAL,
+                       LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->mt_autoback_never), LIVES_WIDGET_TOGGLED_SIGNAL, LIVES_GUI_CALLBACK(apply_button_set_enabled),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->mt_autoback_every), LIVES_WIDGET_TOGGLED_SIGNAL, LIVES_GUI_CALLBACK(apply_button_set_enabled),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->video_open_entry), LIVES_WIDGET_CHANGED_SIGNAL, LIVES_GUI_CALLBACK(apply_button_set_enabled),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->spinbutton_ocp), LIVES_WIDGET_VALUE_CHANGED_SIGNAL,
+                       LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->jpeg), LIVES_WIDGET_TOGGLED_SIGNAL, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(png), LIVES_WIDGET_TOGGLED_SIGNAL, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_instant_open), LIVES_WIDGET_TOGGLED_SIGNAL,
+                       LIVES_GUI_CALLBACK(apply_button_set_enabled),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_auto_deint), LIVES_WIDGET_TOGGLED_SIGNAL,
+                       LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_auto_trim), LIVES_WIDGET_TOGGLED_SIGNAL,
+                       LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_nobord), LIVES_WIDGET_TOGGLED_SIGNAL,
+                       LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_concat_images), LIVES_WIDGET_TOGGLED_SIGNAL,
+                       LIVES_GUI_CALLBACK(apply_button_set_enabled),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->pbq_combo), LIVES_WIDGET_CHANGED_SIGNAL, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_show_stats), LIVES_WIDGET_TOGGLED_SIGNAL,
+                       LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(pp_combo), LIVES_WIDGET_CHANGED_SIGNAL, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->audp_combo), LIVES_WIDGET_CHANGED_SIGNAL, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->audio_command_entry), LIVES_WIDGET_CHANGED_SIGNAL,
+                       LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_afollow), LIVES_WIDGET_TOGGLED_SIGNAL,
+                       LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_aclips), LIVES_WIDGET_TOGGLED_SIGNAL,
+                       LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->rdesk_audio), LIVES_WIDGET_TOGGLED_SIGNAL, LIVES_GUI_CALLBACK(apply_button_set_enabled),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->rframes), LIVES_WIDGET_TOGGLED_SIGNAL, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->rfps), LIVES_WIDGET_TOGGLED_SIGNAL, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->reffects), LIVES_WIDGET_TOGGLED_SIGNAL, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->rclips), LIVES_WIDGET_TOGGLED_SIGNAL, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->raudio), LIVES_WIDGET_TOGGLED_SIGNAL, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->rextaudio), LIVES_WIDGET_TOGGLED_SIGNAL, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->spinbutton_rec_gb), LIVES_WIDGET_VALUE_CHANGED_SIGNAL,
+                       LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->encoder_combo), LIVES_WIDGET_CHANGED_SIGNAL, LIVES_GUI_CALLBACK(apply_button_set_enabled),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->ofmt_combo), LIVES_WIDGET_CHANGED_SIGNAL, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
+
+  if (prefsw->acodec_combo!=NULL)
+    lives_signal_connect(LIVES_GUI_OBJECT(prefsw->acodec_combo), LIVES_WIDGET_CHANGED_SIGNAL, LIVES_GUI_CALLBACK(apply_button_set_enabled),
+                         NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_antialias), LIVES_WIDGET_TOGGLED_SIGNAL,
+                       LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->spinbutton_rte_keys), LIVES_WIDGET_VALUE_CHANGED_SIGNAL,
+                       LIVES_GUI_CALLBACK(apply_button_set_enabled),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_threads), LIVES_WIDGET_TOGGLED_SIGNAL,
+                       LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_threads), LIVES_WIDGET_TOGGLED_SIGNAL, LIVES_GUI_CALLBACK(toggle_set_sensitive),
+                       (livespointer)prefsw->spinbutton_nfx_threads);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->spinbutton_nfx_threads), LIVES_WIDGET_VALUE_CHANGED_SIGNAL,
+                       LIVES_GUI_CALLBACK(apply_button_set_enabled),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->vid_load_dir_entry), LIVES_WIDGET_CHANGED_SIGNAL,
+                       LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->vid_save_dir_entry), LIVES_WIDGET_CHANGED_SIGNAL,
+                       LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->audio_dir_entry), LIVES_WIDGET_CHANGED_SIGNAL, LIVES_GUI_CALLBACK(apply_button_set_enabled),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->image_dir_entry), LIVES_WIDGET_CHANGED_SIGNAL, LIVES_GUI_CALLBACK(apply_button_set_enabled),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->proj_dir_entry), LIVES_WIDGET_CHANGED_SIGNAL, LIVES_GUI_CALLBACK(apply_button_set_enabled),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->tmpdir_entry), LIVES_WIDGET_CHANGED_SIGNAL, LIVES_GUI_CALLBACK(apply_button_set_enabled),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_warn_fps), LIVES_WIDGET_TOGGLED_SIGNAL,
+                       LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_warn_fsize), LIVES_WIDGET_TOGGLED_SIGNAL,
+                       LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->spinbutton_warn_fsize), LIVES_WIDGET_VALUE_CHANGED_SIGNAL,
+                       LIVES_GUI_CALLBACK(apply_button_set_enabled),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_warn_save_set), LIVES_WIDGET_TOGGLED_SIGNAL,
+                       LIVES_GUI_CALLBACK(apply_button_set_enabled),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_warn_mplayer), LIVES_WIDGET_TOGGLED_SIGNAL,
+                       LIVES_GUI_CALLBACK(apply_button_set_enabled),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_warn_rendered_fx), LIVES_WIDGET_TOGGLED_SIGNAL,
+                       LIVES_GUI_CALLBACK(apply_button_set_enabled),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_warn_encoders), LIVES_WIDGET_TOGGLED_SIGNAL,
+                       LIVES_GUI_CALLBACK(apply_button_set_enabled),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_warn_dup_set), LIVES_WIDGET_TOGGLED_SIGNAL,
+                       LIVES_GUI_CALLBACK(apply_button_set_enabled),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_warn_layout_clips), LIVES_WIDGET_TOGGLED_SIGNAL,
+                       LIVES_GUI_CALLBACK(apply_button_set_enabled),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_warn_layout_close), LIVES_WIDGET_TOGGLED_SIGNAL,
+                       LIVES_GUI_CALLBACK(apply_button_set_enabled),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_warn_layout_delete), LIVES_WIDGET_TOGGLED_SIGNAL,
+                       LIVES_GUI_CALLBACK(apply_button_set_enabled),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_warn_layout_shift), LIVES_WIDGET_TOGGLED_SIGNAL,
+                       LIVES_GUI_CALLBACK(apply_button_set_enabled),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_warn_layout_alter), LIVES_WIDGET_TOGGLED_SIGNAL,
+                       LIVES_GUI_CALLBACK(apply_button_set_enabled),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_warn_layout_adel), LIVES_WIDGET_TOGGLED_SIGNAL,
+                       LIVES_GUI_CALLBACK(apply_button_set_enabled),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_warn_layout_ashift), LIVES_WIDGET_TOGGLED_SIGNAL,
+                       LIVES_GUI_CALLBACK(apply_button_set_enabled),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_warn_layout_aalt), LIVES_WIDGET_TOGGLED_SIGNAL,
+                       LIVES_GUI_CALLBACK(apply_button_set_enabled),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_warn_layout_popup), LIVES_WIDGET_TOGGLED_SIGNAL,
+                       LIVES_GUI_CALLBACK(apply_button_set_enabled),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_warn_discard_layout), LIVES_WIDGET_TOGGLED_SIGNAL,
+                       LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_warn_mt_achans), LIVES_WIDGET_TOGGLED_SIGNAL,
+                       LIVES_GUI_CALLBACK(apply_button_set_enabled),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_warn_mt_no_jack), LIVES_WIDGET_TOGGLED_SIGNAL,
+                       LIVES_GUI_CALLBACK(apply_button_set_enabled),
+                       NULL);
 #ifdef HAVE_LDVGRAB
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_warn_after_dvgrab), LIVES_WIDGET_TOGGLED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), 
-		   NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_warn_after_dvgrab), LIVES_WIDGET_TOGGLED_SIGNAL,
+                       LIVES_GUI_CALLBACK(apply_button_set_enabled),
+                       NULL);
 #endif
 #ifdef HAVE_YUV4MPEG
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_warn_yuv4m_open), LIVES_WIDGET_TOGGLED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), 
-		   NULL);
-#endif
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_warn_mt_backup_space), LIVES_WIDGET_TOGGLED_EVENT, 
-		   LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_warn_after_crash), LIVES_WIDGET_TOGGLED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_warn_no_pulse), LIVES_WIDGET_TOGGLED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_warn_layout_wipe), LIVES_WIDGET_TOGGLED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->check_midi), LIVES_WIDGET_TOGGLED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->ins_speed), LIVES_WIDGET_TOGGLED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(ins_resample), LIVES_WIDGET_TOGGLED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->cdplay_entry), LIVES_WIDGET_CHANGED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->spinbutton_def_fps), LIVES_WIDGET_VALUE_CHANGED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), 
-		   NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->theme_combo), LIVES_WIDGET_CHANGED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->spinbutton_bwidth), LIVES_WIDGET_VALUE_CHANGED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_warn_yuv4m_open), LIVES_WIDGET_TOGGLED_SIGNAL,
+                       LIVES_GUI_CALLBACK(apply_button_set_enabled),
+                       NULL);
+#endif
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_warn_mt_backup_space), LIVES_WIDGET_TOGGLED_SIGNAL,
+                       LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_warn_after_crash), LIVES_WIDGET_TOGGLED_SIGNAL,
+                       LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_warn_no_pulse), LIVES_WIDGET_TOGGLED_SIGNAL,
+                       LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_warn_layout_wipe), LIVES_WIDGET_TOGGLED_SIGNAL,
+                       LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->check_midi), LIVES_WIDGET_TOGGLED_SIGNAL, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->ins_speed), LIVES_WIDGET_TOGGLED_SIGNAL, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(ins_resample), LIVES_WIDGET_TOGGLED_SIGNAL, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->cdplay_entry), LIVES_WIDGET_CHANGED_SIGNAL, LIVES_GUI_CALLBACK(apply_button_set_enabled),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->spinbutton_def_fps), LIVES_WIDGET_VALUE_CHANGED_SIGNAL,
+                       LIVES_GUI_CALLBACK(apply_button_set_enabled),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->theme_combo), LIVES_WIDGET_CHANGED_SIGNAL, LIVES_GUI_CALLBACK(apply_button_set_enabled),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->spinbutton_bwidth), LIVES_WIDGET_VALUE_CHANGED_SIGNAL,
+                       LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
 #ifdef ENABLE_OSC
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->spinbutton_osc_udp), LIVES_WIDGET_VALUE_CHANGED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), 
-		   NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->enable_OSC_start), LIVES_WIDGET_TOGGLED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->enable_OSC), LIVES_WIDGET_TOGGLED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->spinbutton_osc_udp), LIVES_WIDGET_VALUE_CHANGED_SIGNAL,
+                       LIVES_GUI_CALLBACK(apply_button_set_enabled),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->enable_OSC_start), LIVES_WIDGET_TOGGLED_SIGNAL, LIVES_GUI_CALLBACK(apply_button_set_enabled),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->enable_OSC), LIVES_WIDGET_TOGGLED_SIGNAL, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
 #endif
 
 #ifdef ENABLE_JACK_TRANSPORT
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->jack_tserver_entry), LIVES_WIDGET_CHANGED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_start_tjack), LIVES_WIDGET_TOGGLED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_jack_master), LIVES_WIDGET_TOGGLED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_jack_client), LIVES_WIDGET_TOGGLED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_jack_tb_start), LIVES_WIDGET_TOGGLED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), 
-		   NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_jack_tb_client), LIVES_WIDGET_TOGGLED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), 
-		   NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->jack_tserver_entry), LIVES_WIDGET_CHANGED_SIGNAL,
+                       LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_start_tjack), LIVES_WIDGET_TOGGLED_SIGNAL,
+                       LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_jack_master), LIVES_WIDGET_TOGGLED_SIGNAL,
+                       LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_jack_client), LIVES_WIDGET_TOGGLED_SIGNAL,
+                       LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_jack_tb_start), LIVES_WIDGET_TOGGLED_SIGNAL,
+                       LIVES_GUI_CALLBACK(apply_button_set_enabled),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_jack_tb_client), LIVES_WIDGET_TOGGLED_SIGNAL,
+                       LIVES_GUI_CALLBACK(apply_button_set_enabled),
+                       NULL);
 #endif
 
 #ifdef ENABLE_JACK
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->jack_aserver_entry), LIVES_WIDGET_CHANGED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_start_ajack), LIVES_WIDGET_TOGGLED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_jack_pwp), LIVES_WIDGET_TOGGLED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_jack_read_autocon), LIVES_WIDGET_TOGGLED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->jack_aserver_entry), LIVES_WIDGET_CHANGED_SIGNAL,
+                       LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_start_ajack), LIVES_WIDGET_TOGGLED_SIGNAL,
+                       LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_jack_pwp), LIVES_WIDGET_TOGGLED_SIGNAL,
+                       LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_jack_read_autocon), LIVES_WIDGET_TOGGLED_SIGNAL,
+                       LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
 #endif
 
 #ifdef ENABLE_OSC
 #ifdef OMC_JS_IMPL
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_omc_js), LIVES_WIDGET_TOGGLED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->omc_js_entry), LIVES_WIDGET_CHANGED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_omc_js), LIVES_WIDGET_TOGGLED_SIGNAL,
+                       LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->omc_js_entry), LIVES_WIDGET_CHANGED_SIGNAL, LIVES_GUI_CALLBACK(apply_button_set_enabled),
+                       NULL);
 #endif
 #ifdef OMC_MIDI_IMPL
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_omc_midi), LIVES_WIDGET_TOGGLED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->alsa_midi), LIVES_WIDGET_TOGGLED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(raw_midi_button), LIVES_WIDGET_TOGGLED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->omc_midi_entry), LIVES_WIDGET_CHANGED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->spinbutton_midicr), LIVES_WIDGET_VALUE_CHANGED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
-  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->spinbutton_midirpt), LIVES_WIDGET_VALUE_CHANGED_EVENT, LIVES_GUI_CALLBACK(apply_button_set_enabled), 
-		   NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->checkbutton_omc_midi), LIVES_WIDGET_TOGGLED_SIGNAL,
+                       LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->alsa_midi), LIVES_WIDGET_TOGGLED_SIGNAL, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(raw_midi_button), LIVES_WIDGET_TOGGLED_SIGNAL, LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->omc_midi_entry), LIVES_WIDGET_CHANGED_SIGNAL, LIVES_GUI_CALLBACK(apply_button_set_enabled),
+                       NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->spinbutton_midicr), LIVES_WIDGET_VALUE_CHANGED_SIGNAL,
+                       LIVES_GUI_CALLBACK(apply_button_set_enabled), NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->spinbutton_midirpt), LIVES_WIDGET_VALUE_CHANGED_SIGNAL,
+                       LIVES_GUI_CALLBACK(apply_button_set_enabled),
+                       NULL);
 #endif
 #endif
-   
+
   if (capable->has_encoder_plugins) {
-    prefsw->encoder_name_fn = lives_signal_connect(LIVES_GUI_OBJECT(LIVES_COMBO(prefsw->encoder_combo)), LIVES_WIDGET_CHANGED_EVENT, 
-					       LIVES_GUI_CALLBACK(on_encoder_entry_changed), NULL);
+    prefsw->encoder_name_fn = lives_signal_connect(LIVES_GUI_OBJECT(LIVES_COMBO(prefsw->encoder_combo)), LIVES_WIDGET_CHANGED_SIGNAL,
+                              LIVES_GUI_CALLBACK(on_encoder_entry_changed), NULL);
     // ---
-    prefsw->encoder_ofmt_fn = lives_signal_connect(LIVES_GUI_OBJECT(LIVES_COMBO(prefsw->ofmt_combo)), LIVES_WIDGET_CHANGED_EVENT, 
-					       LIVES_GUI_CALLBACK(on_encoder_ofmt_changed), NULL);
+    prefsw->encoder_ofmt_fn = lives_signal_connect(LIVES_GUI_OBJECT(LIVES_COMBO(prefsw->ofmt_combo)), LIVES_WIDGET_CHANGED_SIGNAL,
+                              LIVES_GUI_CALLBACK(on_encoder_ofmt_changed), NULL);
   }
-   
-  prefsw->audp_entry_func = lives_signal_connect(LIVES_GUI_OBJECT(LIVES_COMBO(prefsw->audp_combo)), LIVES_WIDGET_CHANGED_EVENT, 
-					     LIVES_GUI_CALLBACK(on_audp_entry_changed), NULL);
+
+  prefsw->audp_entry_func = lives_signal_connect(LIVES_GUI_OBJECT(LIVES_COMBO(prefsw->audp_combo)), LIVES_WIDGET_CHANGED_SIGNAL,
+                            LIVES_GUI_CALLBACK(on_audp_entry_changed), NULL);
 
 #ifdef ENABLE_OSC
-  lives_signal_connect (LIVES_GUI_OBJECT (prefsw->enable_OSC), LIVES_WIDGET_TOGGLED_EVENT,
-		    LIVES_GUI_CALLBACK (on_osc_enable_toggled),
-		    (gpointer)prefsw->enable_OSC_start);
-#endif
-  lives_signal_connect (LIVES_GUI_OBJECT (prefsw->cancelbutton), LIVES_WIDGET_CLICKED_EVENT,
-		    LIVES_GUI_CALLBACK (on_prefs_revert_clicked),
-		    NULL);
-   
-   
-  lives_signal_connect (LIVES_GUI_OBJECT (prefsw->closebutton), LIVES_WIDGET_CLICKED_EVENT,
-		    LIVES_GUI_CALLBACK (on_prefs_close_clicked),
-		    prefsw);
-   
-  lives_signal_connect (LIVES_GUI_OBJECT (prefsw->applybutton), LIVES_WIDGET_CLICKED_EVENT,
-		    LIVES_GUI_CALLBACK (on_prefs_apply_clicked),
-		    NULL);
-   
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->enable_OSC), LIVES_WIDGET_TOGGLED_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_osc_enable_toggled),
+                       (livespointer)prefsw->enable_OSC_start);
+#endif
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->cancelbutton), LIVES_WIDGET_CLICKED_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_prefs_revert_clicked),
+                       NULL);
+
+
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->closebutton), LIVES_WIDGET_CLICKED_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_prefs_close_clicked),
+                       prefsw);
 
-  g_list_free_strings (audp);
-  g_list_free (audp);
+  lives_signal_connect(LIVES_GUI_OBJECT(prefsw->applybutton), LIVES_WIDGET_CLICKED_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_prefs_apply_clicked),
+                       NULL);
+
+
+  lives_list_free_strings(audp);
+  lives_list_free(audp);
 
 
 
@@ -4445,8 +4625,7 @@
       select_pref_list_row(LIST_ENTRY_GUI);
     else
       select_pref_list_row(LIST_ENTRY_MULTITRACK);
-  }
-  else select_pref_list_row(prefs_current_page);
+  } else select_pref_list_row(prefs_current_page);
 
   on_prefDomainChanged(prefsw->selection,NULL);
   lives_widget_queue_draw(prefsw->prefs_list);
@@ -4455,7 +4634,7 @@
 }
 
 
-void on_preferences_activate(LiVESMenuItem *menuitem, gpointer user_data) {
+void on_preferences_activate(LiVESMenuItem *menuitem, livespointer user_data) {
   if (menuitem!=NULL) prefs_current_page=-1;
 
   if (prefsw != NULL && prefsw->prefs_dialog != NULL) {
@@ -4464,7 +4643,7 @@
     return;
   }
 
-  future_prefs->disabled_decoders=g_list_copy_strings(prefs->disabled_decoders);
+  future_prefs->disabled_decoders=lives_list_copy_strings(prefs->disabled_decoders);
 
   prefsw = create_prefs_dialog();
   lives_widget_show(prefsw->prefs_dialog);
@@ -4474,21 +4653,21 @@
 /*!
  * Closes preferences dialog window
  */
-void on_prefs_close_clicked(LiVESButton *button, gpointer user_data) {
+void on_prefs_close_clicked(LiVESButton *button, livespointer user_data) {
   if (prefs->acodec_list!=NULL) {
-    g_list_free_strings (prefs->acodec_list);
-    g_list_free (prefs->acodec_list);
+    lives_list_free_strings(prefs->acodec_list);
+    lives_list_free(prefs->acodec_list);
   }
   prefs->acodec_list=NULL;
-  g_free(prefsw->audp_name);
-  g_free(prefsw->orig_audp_name);
+  lives_free(prefsw->audp_name);
+  lives_free(prefsw->orig_audp_name);
 
-  g_free(resaudw);
+  lives_free(resaudw);
   resaudw=NULL;
 
   if (future_prefs->disabled_decoders!=NULL) {
-    g_list_free_strings (future_prefs->disabled_decoders);
-    g_list_free (future_prefs->disabled_decoders);
+    lives_list_free_strings(future_prefs->disabled_decoders);
+    lives_list_free(future_prefs->disabled_decoders);
   }
 
   lives_general_button_clicked(button, user_data);
@@ -4496,15 +4675,16 @@
   prefsw=NULL;
 
   if (mainw->prefs_need_restart) {
-    do_blocking_info_dialog(_("\nLiVES will now shut down. You need to restart it for the directory change to take effect.\nClick OK to continue.\n"));
-    on_quit_activate (NULL,NULL);
+    do_blocking_info_dialog(
+      _("\nLiVES will now shut down. You need to restart it for the directory change to take effect.\nClick OK to continue.\n"));
+    on_quit_activate(NULL,NULL);
   }
 }
 
 /*!
  *
  */
-void on_prefs_apply_clicked(LiVESButton *button, gpointer user_data) {
+void on_prefs_apply_clicked(LiVESButton *button, livespointer user_data) {
   boolean needs_restart;
 
   // Apply preferences
@@ -4515,7 +4695,7 @@
   lives_widget_set_sensitive(LIVES_WIDGET(prefsw->cancelbutton), FALSE);
   lives_widget_set_sensitive(LIVES_WIDGET(prefsw->closebutton), TRUE);
 
-  if (FALSE == mainw->prefs_need_restart){
+  if (FALSE == mainw->prefs_need_restart) {
     mainw->prefs_need_restart = needs_restart;
   }
 
@@ -4547,10 +4727,10 @@
 
   model = lives_tree_view_get_model(LIVES_TREE_VIEW(prefsw->prefs_list));
   valid = lives_tree_model_get_iter_first(model, &iter);
-  while(valid){
+  while (valid) {
     lives_tree_model_get(model, &iter, LIST_NUM, &idx, -1);
     //
-    if (idx == selected_idx){
+    if (idx == selected_idx) {
       lives_tree_selection_select_iter(prefsw->selection, &iter);
       break;
     }
@@ -4560,35 +4740,35 @@
 }
 
 
-void on_prefs_revert_clicked(LiVESButton *button, gpointer user_data) {
+void on_prefs_revert_clicked(LiVESButton *button, livespointer user_data) {
   register int i;
 
   if (future_prefs->vpp_argv != NULL) {
-    for ( i = 0; future_prefs->vpp_argv[i] != NULL; g_free(future_prefs->vpp_argv[i++]) );
+    for (i = 0; future_prefs->vpp_argv[i] != NULL; lives_free(future_prefs->vpp_argv[i++]));
 
-    g_free(future_prefs->vpp_argv);
+    lives_free(future_prefs->vpp_argv);
 
     future_prefs->vpp_argv = NULL;
   }
   memset(future_prefs->vpp_name, 0, 64);
 
   if (prefs->acodec_list != NULL) {
-    g_list_free_strings (prefs->acodec_list);
-    g_list_free (prefs->acodec_list);
+    lives_list_free_strings(prefs->acodec_list);
+    lives_list_free(prefs->acodec_list);
   }
   prefs->acodec_list = NULL;
 
   if (prefsw->pbq_list != NULL) {
-    g_list_free(prefsw->pbq_list);
+    lives_list_free(prefsw->pbq_list);
   }
   prefsw->pbq_list = NULL;
 
-  g_free(prefsw->audp_name);
-  g_free(prefsw->orig_audp_name);
+  lives_free(prefsw->audp_name);
+  lives_free(prefsw->orig_audp_name);
 
   if (future_prefs->disabled_decoders != NULL) {
-    g_list_free_strings (future_prefs->disabled_decoders);
-    g_list_free (future_prefs->disabled_decoders);
+    lives_list_free_strings(future_prefs->disabled_decoders);
+    lives_list_free(future_prefs->disabled_decoders);
   }
 
   lives_set_cursor_style(LIVES_CURSOR_BUSY,NULL);
@@ -4601,12 +4781,6 @@
 }
 
 
-boolean on_prefs_delete_event(LiVESWidget *widget, GdkEvent *event, gpointer user_data) {
-  on_prefs_close_clicked(LIVES_BUTTON (((_prefsw *)user_data)->closebutton), user_data);
-  return FALSE;
-}
-
-
 boolean lives_ask_permission(int what) {
   switch (what) {
   case LIVES_PERM_OSC_PORTS:

LiVES-2.2.8.tar.bz2/src/preferences.h -> LiVES-2.4.1.tar.bz2/src/preferences.h Changed

@@ -12,10 +12,10 @@
 #define PREFS_PANED_POS ((int)(200.*widget_opts.scale))
 
 typedef struct {
-  gchar bgcolour[256];
+  char bgcolour[256];
   boolean stop_screensaver;
   boolean open_maximised;
-  gchar theme[64];  ///< the theme name
+  char theme[64];  ///< the theme name
 
   short pb_quality;
 #define PB_QUALITY_LOW 1
@@ -31,29 +31,28 @@
 #define AUD_PLAYER_PULSE 4
 #define AUD_PLAYER_MPLAYER2 5
 
-  gchar aplayer[512]; // name, eg. "jack","pulse","sox","mplayer","mplayer2"
+  char aplayer[512]; // name, eg. "jack","pulse","sox","mplayer","mplayer2"
 
   /// frame quantisation type
   short q_type;
 #define Q_FILL 1
 #define Q_SMOOTH 1
 
-  gchar tmpdir[PATH_MAX];  ///< kept in locale encoding
+  char tmpdir[PATH_MAX];  ///< kept in locale encoding
 
-  // TODO - also use cur_vid_load_dir, etc.
   // utf8 encoding
-  gchar def_vid_load_dir[PATH_MAX];
-  gchar def_vid_save_dir[PATH_MAX];
-  gchar def_audio_dir[PATH_MAX];
-  gchar def_image_dir[PATH_MAX];
-  gchar def_proj_dir[PATH_MAX];
+  char def_vid_load_dir[PATH_MAX];
+  char def_vid_save_dir[PATH_MAX];
+  char def_audio_dir[PATH_MAX];
+  char def_image_dir[PATH_MAX];
+  char def_proj_dir[PATH_MAX];
 
   // locale encoding
-  gchar prefix_dir[PATH_MAX];
-  gchar lib_dir[PATH_MAX];
+  char prefix_dir[PATH_MAX];
+  char lib_dir[PATH_MAX];
 
 
-  gchar image_ext[16];
+  char image_ext[16];
 
   uint32_t warning_mask;
   // if these bits are set, we do not show the warning
@@ -84,7 +83,7 @@
 #define WARN_MASK_MT_ACHANS (1<<16)
 
 #define WARN_MASK_LAYOUT_DELETE_AUDIO (1<<17)
-  
+
   /* next two are off by default (on a fresh install) */
 #define WARN_MASK_LAYOUT_SHIFT_AUDIO (1<<18)
 #define WARN_MASK_LAYOUT_ALTER_AUDIO (1<<19)
@@ -103,10 +102,10 @@
 
 #define WARN_MASK_LAYOUT_WIPE (1<<26)
 
-  gchar effect_command[256];
-  gchar video_open_command[256];
-  gchar audio_play_command[256];
-  gchar cdplay_device[PATH_MAX];  ///< locale encoding
+  char effect_command[256];
+  char video_open_command[256];
+  char audio_play_command[256];
+  char cdplay_device[PATH_MAX];  ///< locale encoding
   double default_fps;
   int bar_height;
   boolean pause_effect_during_preview;
@@ -139,7 +138,7 @@
 #define REC_CLIPS (1<<3)
 #define REC_AUDIO (1<<4)
 #define REC_AFTER_PB (1<<5)
-  
+
 
   int audio_src;
 #define AUDIO_SRC_INT 0
@@ -153,7 +152,7 @@
   boolean omc_events; ///< send other events
 
   short startup_phase; ///< -1 = fresh install, 1 = tmpdir set, 2, pre-audio start, 3, pre-tests, 100 = all tests passed
-  gchar *wm; ///<window manager name
+  char *wm; ///<window manager name
   int ocp; ///< open_compression_percent : get/set in prefs
 
   boolean antialias;
@@ -173,14 +172,14 @@
 #define JACK_OPTS_TIMEBASE_MASTER (1<<7)   ///< timebase master (not implemented yet)
 #define JACK_OPTS_NO_READ_AUTOCON (1<<8)   ///< do not auto connect read clients when playing ext audio
 
-  gchar jack_tserver[256];
-  gchar jack_aserver[256];
+  char jack_tserver[256];
+  char jack_aserver[256];
 
-  gchar *fxdefsfile;
-  gchar *fxsizesfile;
-  gchar *vppdefaultsfile;
+  char *fxdefsfile;
+  char *fxsizesfile;
+  char *vppdefaultsfile;
 
-  GList *acodec_list;
+  LiVESList *acodec_list;
   int acodec_list_to_format[AUDIO_CODEC_NONE];
 
   uint32_t audio_opts;
@@ -217,8 +216,8 @@
   boolean ar_clipset;
   boolean ar_layout;
 
-  gchar ar_clipset_name[128]; ///< utf8 (not converted (to locale?))
-  gchar ar_layout_name[PATH_MAX];  ///< utf8 (not converted) 
+  char ar_clipset_name[128]; ///< locale
+  char ar_layout_name[PATH_MAX];  ///< locale
 
   boolean rec_desktop_audio;
 
@@ -228,8 +227,6 @@
 
   boolean osc_start;
 
-  boolean collate_images;
-
   int virt_height; ///< n screens vert.
 
   boolean concat_images;
@@ -254,9 +251,9 @@
 #define OMC_DEV_FORCE_RAW_MIDI 1<<2
   uint32_t omc_dev_opts;
 
-  gchar omc_js_fname[PATH_MAX];  ///< utf8
-  gchar omc_midi_fname[PATH_MAX]; ///< utf8
-  
+  char omc_js_fname[PATH_MAX];  ///< utf8
+  char omc_midi_fname[PATH_MAX]; ///< utf8
+
   boolean mouse_scroll_clips;
 
   int num_rtaudiobufs;
@@ -284,7 +281,7 @@
 
   // autotransitioning in mt
   int atrans_fx;
-  gchar def_autotrans[256];
+  char def_autotrans[256];
 
   int nfx_threads;
 
@@ -325,10 +322,10 @@
   uint32_t clear_disk_opts;
 
 #ifdef HAVE_YUV4MPEG
-  gchar yuvin[PATH_MAX];
+  char yuvin[PATH_MAX];
 #endif
 
-  GList *disabled_decoders;
+  LiVESList *disabled_decoders;
 
   char backend_sync[PATH_MAX];
   char backend[PATH_MAX];
@@ -350,27 +347,27 @@
 } _prefs;
 
 enum {
-    LIST_ENTRY_GUI,
-    LIST_ENTRY_DECODING,
-    LIST_ENTRY_PLAYBACK,
-    LIST_ENTRY_RECORDING,
-    LIST_ENTRY_ENCODING,
-    LIST_ENTRY_EFFECTS,
-    LIST_ENTRY_DIRECTORIES,
-    LIST_ENTRY_WARNINGS,
-    LIST_ENTRY_MISC,
-    LIST_ENTRY_THEMES,
-    LIST_ENTRY_NET,
-    LIST_ENTRY_JACK,
-    LIST_ENTRY_MIDI,
-    LIST_ENTRY_MULTITRACK
+  LIST_ENTRY_GUI,
+  LIST_ENTRY_DECODING,
+  LIST_ENTRY_PLAYBACK,
+  LIST_ENTRY_RECORDING,
+  LIST_ENTRY_ENCODING,
+  LIST_ENTRY_EFFECTS,
+  LIST_ENTRY_DIRECTORIES,
+  LIST_ENTRY_WARNINGS,
+  LIST_ENTRY_MISC,
+  LIST_ENTRY_THEMES,
+  LIST_ENTRY_NET,
+  LIST_ENTRY_JACK,
+  LIST_ENTRY_MIDI,
+  LIST_ENTRY_MULTITRACK
 };
 
 enum {
-    LIST_ICON = 0,
-    LIST_ITEM,
-    LIST_NUM,
-    N_COLUMNS
+  LIST_ICON = 0,
+  LIST_ITEM,
+  LIST_NUM,
+  N_COLUMNS
 };
 
 
@@ -381,10 +378,10 @@
 
 /// prefs window
 typedef struct {
-  gulong encoder_ofmt_fn;
-  gulong encoder_name_fn;
+  ulong encoder_ofmt_fn;
+  ulong encoder_name_fn;
   LiVESWidget *prefs_dialog;
-  
+
   LiVESWidget *prefs_list;
   LiVESWidget *prefs_table;
   LiVESWidget *vbox_right_gui;
@@ -526,10 +523,10 @@
   LiVESWidget *checkbutton_concat_images;
   LiVESWidget *forcesmon;
   LiVESWidget *forcesmon_hbox;
-  GList *pbq_list;
-  gchar *audp_name;
-  gchar *orig_audp_name;
-  gulong audp_entry_func;
+  LiVESList *pbq_list;
+  char *audp_name;
+  char *orig_audp_name;
+  ulong audp_entry_func;
   LiVESWidget *checkbutton_omc_js;
   LiVESWidget *checkbutton_omc_midi;
   LiVESWidget *omc_js_entry;
@@ -564,9 +561,9 @@
 } _ign_opts;
 
 typedef struct {
-  gchar tmpdir[PATH_MAX];
-  gchar theme[64];
-  gchar vpp_name[64]; ///< new video playback plugin
+  char tmpdir[PATH_MAX];
+  char theme[64];
+  char vpp_name[64]; ///< new video playback plugin
   int vpp_fixed_fps_numer;
   int vpp_fixed_fps_denom;
   double vpp_fixed_fpsd;
@@ -575,7 +572,7 @@
   int vpp_fwidth;
   int vpp_fheight;
   int vpp_argc;
-  gchar **vpp_argv;
+  char **vpp_argv;
 
   _encoder encoder;
   boolean show_recent;
@@ -587,8 +584,8 @@
   int nfx_threads;
 
 
-  GList *disabled_decoders;
-  GList *disabled_decoders_new;
+  LiVESList *disabled_decoders;
+  LiVESList *disabled_decoders_new;
 
 } _future_prefs;
 
@@ -596,31 +593,44 @@
 _future_prefs *future_prefs;
 _prefsw *prefsw;
 
-void set_acodec_list_from_allowed (_prefsw *, render_details *);
-void  rdet_acodec_changed (LiVESCombo *acodec_combo, gpointer user_data);
+void set_acodec_list_from_allowed(_prefsw *, render_details *);
+void  rdet_acodec_changed(LiVESCombo *acodec_combo, livespointer user_data);
 
-_prefsw* create_prefs_dialog (void);
+_prefsw *create_prefs_dialog(void);
 
-boolean on_prefs_delete_event (LiVESWidget *, LiVESXEvent *, gpointer prefsw);
+boolean on_prefs_delete_event(LiVESWidget *, LiVESXEvent *, livespointer prefsw);
 
-void on_preferences_activate (LiVESMenuItem *, gpointer);
+void on_preferences_activate(LiVESMenuItem *, livespointer);
 
-void on_prefs_close_clicked (LiVESButton *, gpointer);
+void on_prefs_close_clicked(LiVESButton *, livespointer);
 
-void on_prefs_revert_clicked (LiVESButton *, gpointer);
+void on_prefs_revert_clicked(LiVESButton *, livespointer);
 
 void set_vpp(boolean set_in_prefs);
 
-void on_prefDomainChanged(LiVESTreeSelection *, gpointer);
+void on_prefDomainChanged(LiVESTreeSelection *, livespointer);
 
-void populate_combo_box(LiVESCombo *, GList *data);
+void populate_combo_box(LiVESCombo *, LiVESList *data);
 
-void set_combo_box_active_string(LiVESCombo *, gchar *active_str);
+void set_combo_box_active_string(LiVESCombo *, char *active_str);
 
 void prefsw_set_astream_settings(_vid_playback_plugin *);
 void prefsw_set_rec_after_settings(_vid_playback_plugin *);
 
-void apply_button_set_enabled(LiVESWidget *widget, gpointer func_data);
+void apply_button_set_enabled(LiVESWidget *widget, livespointer func_data);
+
+
+// factories
+enum {
+  PREF_REC_EXT_AUDIO,
+  PREF_AUDIO_OPTS,
+  PREF_SEPWIN_STICKY,
+  PREF_MT_EXIT_RENDER
+};
+
+void pref_factory_bool(int prefidx, boolean newval);
+void pref_factory_int(int prefidx, int newval);
+void pref_factory_bitmapped(int prefidx, int bitfield, boolean newval);
 
 
 // permissions

LiVES-2.2.8.tar.bz2/src/pulse.c -> LiVES-2.4.1.tar.bz2/src/pulse.c Changed

@@ -49,9 +49,9 @@
 #define PULSE_START_WAIT 500000000
 
 
-boolean lives_pulse_init (short startup_phase) {
+boolean lives_pulse_init(short startup_phase) {
   // startup pulse audio server
-  gchar *msg,*msg2;
+  char *msg,*msg2;
 
   int64_t ntime=0,stime;
 
@@ -69,7 +69,7 @@
   stime=lives_get_current_ticks();
 
   while (pa_state!=PA_CONTEXT_READY&&ntime<PULSE_START_WAIT) {
-    g_usleep(prefs->sleep_time);
+    lives_usleep(prefs->sleep_time);
     sched_yield();
     pa_state=pa_context_get_state(pcon);
     ntime=lives_get_current_ticks()-stime;
@@ -84,31 +84,33 @@
 
     if (!mainw->foreign) {
       if (startup_phase==0&&capable->has_sox_play) {
-	do_error_dialog_with_check(_("\nUnable to connect to pulse audio server.\nFalling back to sox audio player.\nYou can change this in Preferences/Playback.\n"),WARN_MASK_NO_PULSE_CONNECT);
-	switch_aud_to_sox(prefs->warning_mask&WARN_MASK_NO_PULSE_CONNECT);
-      }
-      else if (startup_phase==0) {
-	if (capable->has_mplayer) {
-	  do_error_dialog_with_check(_("\nUnable to connect to pulse audio server.\nFalling back to mplayer audio player.\nYou can change this in Preferences/Playback.\n"),WARN_MASK_NO_PULSE_CONNECT);
-	  switch_aud_to_mplayer(prefs->warning_mask&WARN_MASK_NO_PULSE_CONNECT);
-	}
-	else if (capable->has_mplayer2) {
-	  do_error_dialog_with_check(_("\nUnable to connect to pulse audio server.\nFalling back to mplayer2 audio player.\nYou can change this in Preferences/Playback.\n"),WARN_MASK_NO_PULSE_CONNECT);
-	  switch_aud_to_mplayer2(prefs->warning_mask&WARN_MASK_NO_PULSE_CONNECT);
-	}
-      }
-      else {
-	msg=g_strdup(_("\nUnable to connect to pulse audio server.\n"));
-	if (startup_phase!=2) {
-	  do_blocking_error_dialog(msg);
-	  mainw->aplayer_broken=TRUE;
-	}
-	else {
-	  msg2=g_strdup_printf("%s%s",msg,_("LiVES will exit and you can choose another audio player.\n"));
-	  do_blocking_error_dialog(msg2);
-	  g_free(msg2);
-	}
-	g_free(msg);
+        do_error_dialog_with_check(
+          _("\nUnable to connect to pulse audio server.\nFalling back to sox audio player.\nYou can change this in Preferences/Playback.\n"),
+          WARN_MASK_NO_PULSE_CONNECT);
+        switch_aud_to_sox(prefs->warning_mask&WARN_MASK_NO_PULSE_CONNECT);
+      } else if (startup_phase==0) {
+        if (capable->has_mplayer) {
+          do_error_dialog_with_check(
+            _("\nUnable to connect to pulse audio server.\nFalling back to mplayer audio player.\nYou can change this in Preferences/Playback.\n"),
+            WARN_MASK_NO_PULSE_CONNECT);
+          switch_aud_to_mplayer(prefs->warning_mask&WARN_MASK_NO_PULSE_CONNECT);
+        } else if (capable->has_mplayer2) {
+          do_error_dialog_with_check(
+            _("\nUnable to connect to pulse audio server.\nFalling back to mplayer2 audio player.\nYou can change this in Preferences/Playback.\n"),
+            WARN_MASK_NO_PULSE_CONNECT);
+          switch_aud_to_mplayer2(prefs->warning_mask&WARN_MASK_NO_PULSE_CONNECT);
+        }
+      } else {
+        msg=lives_strdup(_("\nUnable to connect to pulse audio server.\n"));
+        if (startup_phase!=2) {
+          do_blocking_error_dialog(msg);
+          mainw->aplayer_broken=TRUE;
+        } else {
+          msg2=lives_strdup_printf("%s%s",msg,_("LiVES will exit and you can choose another audio player.\n"));
+          do_blocking_error_dialog(msg2);
+          lives_free(msg2);
+        }
+        lives_free(msg);
       }
     }
     return FALSE;
@@ -138,17 +140,17 @@
 
 
 static void pulse_buff_free(void *ptr) {
-  g_free(ptr);
+  lives_free(ptr);
 }
 
 
-static void sample_silence_pulse (pulse_driver_t *pdriver, size_t nbytes, size_t xbytes) {
+static void sample_silence_pulse(pulse_driver_t *pdriver, size_t nbytes, size_t xbytes) {
   uint8_t *buff;
   if (xbytes<=0) return;
   if (mainw->aplayer_broken) return;
   while (nbytes>0) {
     if (nbytes<xbytes) xbytes=nbytes;
-    buff=(uint8_t *)g_try_malloc0(xbytes);
+    buff=(uint8_t *)lives_try_malloc0(xbytes);
     if (!buff) return;
     if (pdriver->astream_fd!=-1) audio_stream(buff,xbytes,pdriver->astream_fd);
     if (mainw->audio_frame_buffer!=NULL) {
@@ -166,8 +168,8 @@
 static short *shortbuffer=NULL;
 
 
-static void pulse_audio_write_process_dummy (pa_stream *pstream, size_t nbytes, void *arg) {
-  pulse_driver_t* pulsed = (pulse_driver_t*)arg;
+static void pulse_audio_write_process_dummy(pa_stream *pstream, size_t nbytes, void *arg) {
+  pulse_driver_t *pulsed = (pulse_driver_t *)arg;
   uint64_t nframes=nbytes/pulsed->out_achans/(pulsed->out_asamps>>3);
   size_t xbytes=pa_stream_writable_size(pstream);
   sample_silence_pulse(pulsed,nframes*pulsed->out_achans*(pulsed->out_asamps>>3),xbytes);
@@ -176,580 +178,561 @@
 }
 
 
-static void pulse_audio_write_process (pa_stream *pstream, size_t nbytes, void *arg) {
+static void pulse_audio_write_process(pa_stream *pstream, size_t nbytes, void *arg) {
   // PULSE AUDIO calls this periodically to get the next audio buffer
 
   // note: unlike with jack, we have to actually write something with pa_stream_write, even if silent
   // - otherwise the buffer size just increases
 
-   // note also, the buffer size can, and does, change on each call, making it inefficient to use ringbuffers
+  // note also, the buffer size can, and does, change on each call, making it inefficient to use ringbuffers
 
 
-   static float old_volume=-1.;
-   pulse_driver_t* pulsed = (pulse_driver_t*)arg;
+  static float old_volume=-1.;
+  pulse_driver_t *pulsed = (pulse_driver_t *)arg;
 
-   uint64_t nframes=nbytes/pulsed->out_achans/(pulsed->out_asamps>>3);
+  uint64_t nframes=nbytes/pulsed->out_achans/(pulsed->out_asamps>>3);
 
-   aserver_message_t *msg;
+  aserver_message_t *msg;
 
-   int64_t seek,xseek;
-   int new_file;
-   gchar *filename;
-   boolean from_memory=FALSE;
+  int64_t seek,xseek;
+  int new_file;
+  char *filename;
+  boolean from_memory=FALSE;
 
-   uint8_t *buffer;
-   size_t xbytes=pa_stream_writable_size(pstream);
+  uint8_t *buffer;
+  size_t xbytes=pa_stream_writable_size(pstream);
 
-   boolean needs_free=FALSE;
+  boolean needs_free=FALSE;
 
-   size_t offs=0;
+  size_t offs=0;
 
-   pa_volume_t pavol;
+  pa_volume_t pavol;
 
-   pulsed->pstream=pstream;
+  pulsed->pstream=pstream;
 
-   if (xbytes>nbytes) xbytes=nbytes;
+  if (xbytes>nbytes) xbytes=nbytes;
 
-   if (!mainw->is_ready||pulsed==NULL||(mainw->playing_file==-1&&pulsed->msgq==NULL)||nbytes>1000000) {
-     sample_silence_pulse(pulsed,nframes*pulsed->out_achans*(pulsed->out_asamps>>3),xbytes);
-     //g_print("pt a1 %ld\n",nframes);
-     return;
-   }
+  if (!mainw->is_ready||pulsed==NULL||(mainw->playing_file==-1&&pulsed->msgq==NULL)||nbytes>1000000) {
+    sample_silence_pulse(pulsed,nframes*pulsed->out_achans*(pulsed->out_asamps>>3),xbytes);
+    //g_print("pt a1 %ld\n",nframes);
+    return;
+  }
 
-   while ((msg=(aserver_message_t *)pulsed->msgq)!=NULL) {
-     switch (msg->command) {
-     case ASERVER_CMD_FILE_OPEN:
-       new_file=atoi((char *)msg->data);
-       if (pulsed->playing_file!=new_file) {
-	 if (pulsed->is_opening) filename=g_build_filename(prefs->tmpdir,mainw->files[new_file]->handle,
-							   "audiodump.pcm",NULL);
-	 else filename=g_build_filename(prefs->tmpdir,mainw->files[new_file]->handle,"audio",NULL);
-	 pulsed->fd=open(filename,O_RDONLY);
-	 if (pulsed->fd==-1) {
-	   // dont show gui errors - we are running in realtime thread
-	   LIVES_ERROR("pulsed: error opening");
-	   LIVES_ERROR(filename);
-	   pulsed->playing_file=-1;
-	 }
-	 else {
+  while ((msg=(aserver_message_t *)pulsed->msgq)!=NULL) {
+    switch (msg->command) {
+    case ASERVER_CMD_FILE_OPEN:
+      new_file=atoi((char *)msg->data);
+      if (pulsed->playing_file!=new_file) {
+        if (pulsed->is_opening) filename=lives_build_filename(prefs->tmpdir,mainw->files[new_file]->handle,
+                                           "audiodump.pcm",NULL);
+        else filename=lives_build_filename(prefs->tmpdir,mainw->files[new_file]->handle,"audio",NULL);
+        pulsed->fd=open(filename,O_RDONLY);
+        if (pulsed->fd==-1) {
+          // dont show gui errors - we are running in realtime thread
+          LIVES_ERROR("pulsed: error opening");
+          LIVES_ERROR(filename);
+          pulsed->playing_file=-1;
+        } else {
 #ifdef IS_MINGW
-	   setmode(pulsed->fd, O_BINARY);
+          setmode(pulsed->fd, O_BINARY);
 #endif
-	   pulsed->seek_pos=0;
-	   pulsed->playing_file=new_file;
-	   pulsed->audio_ticks=mainw->currticks;
-	   pulsed->frames_written=0;
-	   pulsed->usec_start=0;
-	 }
-	 g_free(filename);
-       }
-       break;
-     case ASERVER_CMD_FILE_CLOSE:
-       if (pulsed->fd>=0) close(pulsed->fd);
-       pulsed->fd=-1;
-       if (pulsed->aPlayPtr->data!=NULL) g_free(pulsed->aPlayPtr->data);
-       pulsed->aPlayPtr->data=NULL;
-       pulsed->aPlayPtr->max_size=0;
-       pulsed->aPlayPtr->size=0;
-       pulsed->playing_file=-1;
-       break;
-     case ASERVER_CMD_FILE_SEEK:
-       if (pulsed->fd<0) break;
-       xseek=seek=atol((char *)msg->data);
-       if (seek<0.) xseek=0.;
-       if (mainw->agen_key==0&&!mainw->agen_needs_reinit) {
-	 lseek(pulsed->fd,xseek,SEEK_SET);
-       }
-       pulsed->seek_pos=seek;
-       pulsed->audio_ticks=mainw->currticks;
-       pulsed->frames_written=0;
-       pulsed->usec_start=0;
-       break;
-     default:
-       msg->data=NULL;
-     }
-     if (msg->data!=NULL) g_free((gpointer)msg->data);
-     msg->command=ASERVER_CMD_PROCESSED;
-     if (msg->next==NULL) pulsed->msgq=NULL;
-     else pulsed->msgq = msg->next;
-   }
-
-   if (pulsed->chunk_size!=nbytes) pulsed->chunk_size = nbytes;
-
-   pulsed->state=pa_context_get_state(pulsed->con);
-
-   if (pulsed->state==PA_CONTEXT_READY) {
-
-     uint64_t pulseFramesAvailable = nframes;
-     uint64_t inputFramesAvailable;
-     uint64_t numFramesToWrite;
-     int64_t in_frames=0;
-     uint64_t in_bytes=0,xin_bytes=0;
-     float shrink_factor=1.f;
-     int swap_sign;
-
-     lives_clip_t *xfile=afile;
-
- #ifdef DEBUG_PULSE
-     g_printerr("playing... pulseFramesAvailable = %ld\n", pulseFramesAvailable);
- #endif
-
-     pulsed->num_calls++;
-
-     if (!pulsed->in_use||(((pulsed->fd<0||pulsed->seek_pos<0.)&&pulsed->read_abuf<0)&&
-			   ((mainw->agen_key==0&&!mainw->agen_needs_reinit)||mainw->multitrack!=NULL))
-			   ||pulsed->is_paused) {
-
-       sample_silence_pulse(pulsed,nframes*pulsed->out_achans*(pulsed->out_asamps>>3),xbytes);
-
-       if (!pulsed->is_paused) pulsed->frames_written+=nframes;
-       if (pulsed->seek_pos<0.&&pulsed->playing_file>-1&&afile!=NULL) {
-	 pulsed->seek_pos+=nframes*afile->achans*afile->asampsize/8;
-	 if (pulsed->seek_pos>=0) pulse_audio_seek_bytes(pulsed,pulsed->seek_pos);
-       }
-       //g_print("pt a3 %d\n",pulsed->in_use);
-       return;
-     }
-
-
-      if (G_LIKELY(pulseFramesAvailable>0&&(pulsed->read_abuf>-1||
-					   (pulsed->aPlayPtr!=NULL
-					    &&pulsed->in_achans>0)||
-					   ((mainw->agen_key!=0||mainw->agen_needs_reinit)&&mainw->multitrack==NULL) 
-					   ))) {
-
-        if (mainw->playing_file>-1&&pulsed->read_abuf>-1) {
-	 // playing back from memory buffers instead of from file
- 	 // this is used in multitrack
-	 from_memory=TRUE;
-
-	 numFramesToWrite=pulseFramesAvailable;
-	 pulsed->frames_written+=numFramesToWrite;
-	 pulseFramesAvailable-=numFramesToWrite;
-
-       }
-       else {
-	 if (G_LIKELY(pulsed->fd>=0)) {
-
-	   if ((pulsed->playing_file==mainw->ascrap_file&&!mainw->preview)&&mainw->playing_file>=-1
-	       &&mainw->files[mainw->playing_file]->achans>0) {
-	     xfile=mainw->files[mainw->playing_file];
-	   }
-
-	   pulsed->aPlayPtr->size=0;
-	   in_bytes=ABS((in_frames=((double)pulsed->in_arate/(double)pulsed->out_arate*
-				    (double)pulseFramesAvailable+((double)fastrand()/(double)G_MAXUINT32))))
-	     *pulsed->in_achans*(pulsed->in_asamps>>3);
-	   //g_print("in bytes=%ld %ld %ld %ld %d %d\n",in_bytes,pulsed->in_arate,pulsed->out_arate,pulseFramesAvailable,pulsed->in_achans,pulsed->in_asamps);
-	   if ((shrink_factor=(float)in_frames/(float)pulseFramesAvailable)<0.f) {
-	     // reverse playback
-	     if ((pulsed->seek_pos-=in_bytes)<0) {
-	       if (pulsed->loop==AUDIO_LOOP_NONE) {
-		 if (*pulsed->whentostop==STOP_ON_AUD_END) {
-		   *pulsed->cancelled=CANCEL_AUD_END;
-		 }
-		 pulsed->in_use=FALSE;
-		 pulse_set_rec_avals(pulsed,FALSE);
-	       }
-	       else {
-		 if (pulsed->loop==AUDIO_LOOP_PINGPONG) {
-		   pulsed->in_arate=-pulsed->in_arate;
-		   shrink_factor=-shrink_factor;
-		   pulsed->seek_pos=0;
-		   pulse_set_rec_avals(pulsed,TRUE);
-		 }
-		 else pulsed->seek_pos=pulsed->seek_end-in_bytes;
-		 pulse_set_rec_avals(pulsed,FALSE);
-	       }
-	     }
-	     // rewind by in_bytes
-	     if ((mainw->agen_key==0&&!mainw->agen_needs_reinit)||mainw->multitrack!=NULL) 
-	       lseek(pulsed->fd,pulsed->seek_pos,SEEK_SET);
-	   }
-	   if G_UNLIKELY((in_bytes>pulsed->aPlayPtr->max_size && !(*pulsed->cancelled) && ABS(shrink_factor)<=100.f)) {
-	       pulsed->aPlayPtr->data=g_try_realloc(pulsed->aPlayPtr->data,in_bytes);
-	       if (pulsed->aPlayPtr->data!=NULL) {
-		 memset(pulsed->aPlayPtr->data,0,in_bytes);
-		 pulsed->aPlayPtr->max_size=in_bytes;
-	       }
-	     }
-	   else {
-	     pulsed->aPlayPtr->max_size=0;
-	   }
-	   if (pulsed->mute||(pulsed->aPlayPtr->data==NULL&&((mainw->agen_key==0&&!mainw->agen_needs_reinit)||
-							     mainw->multitrack!=NULL))) {
-	     if (shrink_factor>0.f) pulsed->seek_pos+=in_bytes;
-	     if (pulsed->seek_pos>=pulsed->seek_end) {
-	       if (*pulsed->whentostop==STOP_ON_AUD_END) {
-		 *pulsed->cancelled=CANCEL_AUD_END;
-	       }
-	       else {
-		 if (pulsed->loop==AUDIO_LOOP_PINGPONG) {
-		   pulsed->in_arate=-pulsed->in_arate;
-		   pulsed->seek_pos-=in_bytes;
-		 }
-		 else {
-		   pulsed->seek_pos=0;
-		 }
-	       }
-	     }
-	     sample_silence_pulse(pulsed,nframes*pulsed->out_achans*
-				  (pulsed->out_asamps>>3),xbytes);
-	     pulsed->frames_written+=nframes;
-	     //g_print("pt a4\n");
-	     return;
-	   }
-	   else {
-	     boolean loop_restart;
-	     do {
-	       loop_restart=FALSE;
-	       if (in_bytes>0) {
-		 // playing from a file
-		 if (!(*pulsed->cancelled)&&ABS(shrink_factor)<=100.f) {
-		   if (((((mainw->agen_key==0&&!mainw->agen_needs_reinit)||mainw->multitrack!=NULL)&&
-			 (pulsed->aPlayPtr->size=read(pulsed->fd,pulsed->aPlayPtr->data,in_bytes))==0))||
-		       (((mainw->agen_key!=0||mainw->agen_needs_reinit)&&mainw->multitrack==NULL&&
-			 pulsed->seek_pos+in_bytes>=xfile->afilesize))) {
-		     if (*pulsed->whentostop==STOP_ON_AUD_END) {
-		       *pulsed->cancelled=CANCEL_AUD_END;
-		     }
-		     else {
-		       loop_restart=TRUE;
-		       if (pulsed->loop==AUDIO_LOOP_PINGPONG) {
-			 pulsed->in_arate=-pulsed->in_arate;
-			 if ((mainw->agen_key==0&&!mainw->agen_needs_reinit)||mainw->multitrack!=NULL) 
-			   lseek(pulsed->fd,(pulsed->seek_pos-=in_bytes),SEEK_SET);
-			 else pulsed->seek_pos-=in_bytes;
-			 pulse_set_rec_avals(pulsed,FALSE);
-		       }
-		       else {
-			 if (pulsed->loop!=AUDIO_LOOP_NONE) {
-			   seek=0;
-			   if ((mainw->agen_key==0&&!mainw->agen_needs_reinit)||mainw->multitrack!=NULL) 
-			     lseek(pulsed->fd,(pulsed->seek_pos=seek),SEEK_SET);
-			   else pulsed->seek_pos=seek;
-			   pulse_set_rec_avals(pulsed,TRUE);
-			 }
-			 else {
-			   if (mainw->agen_key==0&&!mainw->agen_needs_reinit) pulsed->in_use=FALSE;
-			   loop_restart=FALSE;
-			   pulse_set_rec_avals(pulsed,TRUE);
-			 }
-		       }
-		     }
-		   }
-		   else {
-		     if (pulsed->aPlayPtr->size<0&&((mainw->agen_key==0&&!mainw->agen_needs_reinit)||
-						    mainw->multitrack!=NULL)) {
-		       // read error...output silence
-		       sample_silence_pulse(pulsed,nframes*pulsed->out_achans*
-					    (pulsed->out_asamps>>3),xbytes);
-		       if (!pulsed->is_paused) pulsed->frames_written+=nframes;
-		       return;
-		     }
-		     if (shrink_factor<0.f) {
-		       // reverse play - rewind again by in_bytes
-		       if ((mainw->agen_key==0&&!mainw->agen_needs_reinit)||mainw->multitrack!=NULL) 
-			 lseek(pulsed->fd,pulsed->seek_pos,SEEK_SET);
-		     }
-		     else {
-		       if ((mainw->agen_key==0&&!mainw->agen_needs_reinit)||mainw->multitrack!=NULL) 
-			 pulsed->seek_pos+=pulsed->aPlayPtr->size;
-		       else 
-			 pulsed->seek_pos+=in_bytes;
-		     }
-		   }
-		 }
-	       }
-	     } while (loop_restart);
-	   }
-	   xin_bytes=in_bytes;
-	 }
-
-	 if (mainw->agen_key!=0&&mainw->multitrack==NULL) {
-	   in_bytes=pulseFramesAvailable*pulsed->out_achans*2;
-	   if (xin_bytes==0) xin_bytes=in_bytes;
-	 }
-
-	 if (!pulsed->in_use||in_bytes==0||pulsed->mute) {
-	   // reached end of audio with no looping
-	   sample_silence_pulse(pulsed,nframes*pulsed->out_achans*
-				(pulsed->out_asamps>>3),xbytes);
-	   if (!pulsed->is_paused) pulsed->frames_written+=nframes;
-	   if (pulsed->seek_pos<0.&&pulsed->playing_file>-1&&afile!=NULL) {
-	     pulsed->seek_pos+=nframes*afile->achans*afile->asampsize/8;
-	     if (pulsed->seek_pos>=0) pulse_audio_seek_bytes(pulsed,pulsed->seek_pos);
-	   }
-	   //g_print("pt a5 %d %d\n",pulsed->in_use,in_bytes);
-	   return;
-	 }
-
-	 if ((mainw->agen_key==0&&!mainw->agen_needs_reinit)||mainw->multitrack!=NULL) {
-	   swap_sign=afile->signed_endian&AFORM_UNSIGNED;
-
-	   inputFramesAvailable = pulsed->aPlayPtr->size / (pulsed->in_achans * (pulsed->in_asamps>>3));
- #ifdef DEBUG_PULSE
-	   g_printerr("%ld inputFramesAvailable == %ld, %ld, %ld %ld,pulseFramesAvailable == %ld\n", pulsed->aPlayPtr->size, inputFramesAvailable, in_frames, pulsed->in_arate,pulsed->out_arate,pulseFramesAvailable);
+          pulsed->seek_pos=0;
+          pulsed->playing_file=new_file;
+          pulsed->audio_ticks=mainw->currticks;
+          pulsed->frames_written=0;
+          pulsed->usec_start=0;
+        }
+        lives_free(filename);
+      }
+      break;
+    case ASERVER_CMD_FILE_CLOSE:
+      if (pulsed->fd>=0) close(pulsed->fd);
+      pulsed->fd=-1;
+      if (pulsed->aPlayPtr->data!=NULL) lives_free(pulsed->aPlayPtr->data);
+      pulsed->aPlayPtr->data=NULL;
+      pulsed->aPlayPtr->max_size=0;
+      pulsed->aPlayPtr->size=0;
+      pulsed->playing_file=-1;
+      break;
+    case ASERVER_CMD_FILE_SEEK:
+      if (pulsed->fd<0) break;
+      xseek=seek=atol((char *)msg->data);
+      if (seek<0.) xseek=0.;
+      if (mainw->agen_key==0&&!mainw->agen_needs_reinit) {
+        lseek(pulsed->fd,xseek,SEEK_SET);
+      }
+      pulsed->seek_pos=seek;
+      pulsed->audio_ticks=mainw->currticks;
+      pulsed->frames_written=0;
+      pulsed->usec_start=0;
+      break;
+    default:
+      msg->data=NULL;
+    }
+    if (msg->data!=NULL) lives_free((livespointer)msg->data);
+    msg->command=ASERVER_CMD_PROCESSED;
+    if (msg->next==NULL) pulsed->msgq=NULL;
+    else pulsed->msgq = msg->next;
+  }
+
+  if (pulsed->chunk_size!=nbytes) pulsed->chunk_size = nbytes;
+
+  pulsed->state=pa_context_get_state(pulsed->con);
+
+  if (pulsed->state==PA_CONTEXT_READY) {
+
+    uint64_t pulseFramesAvailable = nframes;
+    uint64_t inputFramesAvailable;
+    uint64_t numFramesToWrite;
+    int64_t in_frames=0;
+    uint64_t in_bytes=0,xin_bytes=0;
+    float shrink_factor=1.f;
+    int swap_sign;
+
+    lives_clip_t *xfile=afile;
+
+#ifdef DEBUG_PULSE
+    lives_printerr("playing... pulseFramesAvailable = %ld\n", pulseFramesAvailable);
 #endif
-	   buffer = (uint8_t *)pulsed->aPlayPtr->data;
-	   
-	   numFramesToWrite = MIN(pulseFramesAvailable, (inputFramesAvailable/ABS(shrink_factor)+.001));
+
+    pulsed->num_calls++;
+
+    if (!pulsed->in_use||(((pulsed->fd<0||pulsed->seek_pos<0.)&&pulsed->read_abuf<0)&&
+                          ((mainw->agen_key==0&&!mainw->agen_needs_reinit)||mainw->multitrack!=NULL))
+        ||pulsed->is_paused) {
+
+      sample_silence_pulse(pulsed,nframes*pulsed->out_achans*(pulsed->out_asamps>>3),xbytes);
+
+      if (!pulsed->is_paused) pulsed->frames_written+=nframes;
+      if (pulsed->seek_pos<0.&&pulsed->playing_file>-1&&afile!=NULL) {
+        pulsed->seek_pos+=nframes*afile->achans*afile->asampsize/8;
+        if (pulsed->seek_pos>=0) pulse_audio_seek_bytes(pulsed,pulsed->seek_pos);
+      }
+      //g_print("pt a3 %d\n",pulsed->in_use);
+      return;
+    }
+
+
+    if (LIVES_LIKELY(pulseFramesAvailable>0&&(pulsed->read_abuf>-1||
+                     (pulsed->aPlayPtr!=NULL
+                      &&pulsed->in_achans>0)||
+                     ((mainw->agen_key!=0||mainw->agen_needs_reinit)&&mainw->multitrack==NULL)
+                                             ))) {
+
+      if (mainw->playing_file>-1&&pulsed->read_abuf>-1) {
+        // playing back from memory buffers instead of from file
+        // this is used in multitrack
+        from_memory=TRUE;
+
+        numFramesToWrite=pulseFramesAvailable;
+        pulsed->frames_written+=numFramesToWrite;
+        pulseFramesAvailable-=numFramesToWrite;
+
+      } else {
+        if (LIVES_LIKELY(pulsed->fd>=0)) {
+
+          if ((pulsed->playing_file==mainw->ascrap_file&&!mainw->preview)&&mainw->playing_file>=-1
+              &&mainw->files[mainw->playing_file]->achans>0) {
+            xfile=mainw->files[mainw->playing_file];
+          }
+
+          pulsed->aPlayPtr->size=0;
+          in_bytes=ABS((in_frames=((double)pulsed->in_arate/(double)pulsed->out_arate*
+                                   (double)pulseFramesAvailable+((double)fastrand()/(double)LIVES_MAXUINT32))))
+                   *pulsed->in_achans*(pulsed->in_asamps>>3);
+          //g_print("in bytes=%ld %ld %ld %ld %d %d\n",in_bytes,pulsed->in_arate,pulsed->out_arate,pulseFramesAvailable,pulsed->in_achans,pulsed->in_asamps);
+          if ((shrink_factor=(float)in_frames/(float)pulseFramesAvailable)<0.f) {
+            // reverse playback
+            if ((pulsed->seek_pos-=in_bytes)<0) {
+              if (pulsed->loop==AUDIO_LOOP_NONE) {
+                if (*pulsed->whentostop==STOP_ON_AUD_END) {
+                  *pulsed->cancelled=CANCEL_AUD_END;
+                }
+                pulsed->in_use=FALSE;
+                pulse_set_rec_avals(pulsed,FALSE);
+              } else {
+                if (pulsed->loop==AUDIO_LOOP_PINGPONG) {
+                  pulsed->in_arate=-pulsed->in_arate;
+                  shrink_factor=-shrink_factor;
+                  pulsed->seek_pos=0;
+                  pulse_set_rec_avals(pulsed,TRUE);
+                } else pulsed->seek_pos=pulsed->seek_end-in_bytes;
+                pulse_set_rec_avals(pulsed,FALSE);
+              }
+            }
+            // rewind by in_bytes
+            if ((mainw->agen_key==0&&!mainw->agen_needs_reinit)||mainw->multitrack!=NULL)
+              lseek(pulsed->fd,pulsed->seek_pos,SEEK_SET);
+          }
+          if (LIVES_UNLIKELY((in_bytes>pulsed->aPlayPtr->max_size && !(*pulsed->cancelled) && ABS(shrink_factor)<=100.f))) {
+            pulsed->aPlayPtr->data=lives_try_realloc(pulsed->aPlayPtr->data,in_bytes);
+            if (pulsed->aPlayPtr->data!=NULL) {
+              memset(pulsed->aPlayPtr->data,0,in_bytes);
+              pulsed->aPlayPtr->max_size=in_bytes;
+            }
+          } else {
+            pulsed->aPlayPtr->max_size=0;
+          }
+          if (pulsed->mute||(pulsed->aPlayPtr->data==NULL&&((mainw->agen_key==0&&!mainw->agen_needs_reinit)||
+                             mainw->multitrack!=NULL))) {
+            if (shrink_factor>0.f) pulsed->seek_pos+=in_bytes;
+            if (pulsed->seek_pos>=pulsed->seek_end) {
+              if (*pulsed->whentostop==STOP_ON_AUD_END) {
+                *pulsed->cancelled=CANCEL_AUD_END;
+              } else {
+                if (pulsed->loop==AUDIO_LOOP_PINGPONG) {
+                  pulsed->in_arate=-pulsed->in_arate;
+                  pulsed->seek_pos-=in_bytes;
+                } else {
+                  pulsed->seek_pos=0;
+                }
+              }
+            }
+            sample_silence_pulse(pulsed,nframes*pulsed->out_achans*
+                                 (pulsed->out_asamps>>3),xbytes);
+            pulsed->frames_written+=nframes;
+            //g_print("pt a4\n");
+            return;
+          } else {
+            boolean loop_restart;
+            do {
+              loop_restart=FALSE;
+              if (in_bytes>0) {
+                // playing from a file
+                if (!(*pulsed->cancelled)&&ABS(shrink_factor)<=100.f) {
+                  if (((((mainw->agen_key==0&&!mainw->agen_needs_reinit)||mainw->multitrack!=NULL)&&
+                        (pulsed->aPlayPtr->size=read(pulsed->fd,pulsed->aPlayPtr->data,in_bytes))==0))||
+                      (((mainw->agen_key!=0||mainw->agen_needs_reinit)&&mainw->multitrack==NULL&&
+                        pulsed->seek_pos+in_bytes>=xfile->afilesize))) {
+                    if (*pulsed->whentostop==STOP_ON_AUD_END) {
+                      *pulsed->cancelled=CANCEL_AUD_END;
+                    } else {
+                      loop_restart=TRUE;
+                      if (pulsed->loop==AUDIO_LOOP_PINGPONG) {
+                        pulsed->in_arate=-pulsed->in_arate;
+                        if ((mainw->agen_key==0&&!mainw->agen_needs_reinit)||mainw->multitrack!=NULL)
+                          lseek(pulsed->fd,(pulsed->seek_pos-=in_bytes),SEEK_SET);
+                        else pulsed->seek_pos-=in_bytes;
+                        pulse_set_rec_avals(pulsed,FALSE);
+                      } else {
+                        if (pulsed->loop!=AUDIO_LOOP_NONE) {
+                          seek=0;
+                          if ((mainw->agen_key==0&&!mainw->agen_needs_reinit)||mainw->multitrack!=NULL)
+                            lseek(pulsed->fd,(pulsed->seek_pos=seek),SEEK_SET);
+                          else pulsed->seek_pos=seek;
+                          pulse_set_rec_avals(pulsed,TRUE);
+                        } else {
+                          if (mainw->agen_key==0&&!mainw->agen_needs_reinit) pulsed->in_use=FALSE;
+                          loop_restart=FALSE;
+                          pulse_set_rec_avals(pulsed,TRUE);
+                        }
+                      }
+                    }
+                  } else {
+                    if (pulsed->aPlayPtr->size<0&&((mainw->agen_key==0&&!mainw->agen_needs_reinit)||
+                                                   mainw->multitrack!=NULL)) {
+                      // read error...output silence
+                      sample_silence_pulse(pulsed,nframes*pulsed->out_achans*
+                                           (pulsed->out_asamps>>3),xbytes);
+                      if (!pulsed->is_paused) pulsed->frames_written+=nframes;
+                      return;
+                    }
+                    if (shrink_factor<0.f) {
+                      // reverse play - rewind again by in_bytes
+                      if ((mainw->agen_key==0&&!mainw->agen_needs_reinit)||mainw->multitrack!=NULL)
+                        lseek(pulsed->fd,pulsed->seek_pos,SEEK_SET);
+                    } else {
+                      if ((mainw->agen_key==0&&!mainw->agen_needs_reinit)||mainw->multitrack!=NULL)
+                        pulsed->seek_pos+=pulsed->aPlayPtr->size;
+                      else
+                        pulsed->seek_pos+=in_bytes;
+                    }
+                  }
+                }
+              }
+            } while (loop_restart);
+          }
+          xin_bytes=in_bytes;
+        }
+
+        if (mainw->agen_key!=0&&mainw->multitrack==NULL) {
+          in_bytes=pulseFramesAvailable*pulsed->out_achans*2;
+          if (xin_bytes==0) xin_bytes=in_bytes;
+        }
+
+        if (!pulsed->in_use||in_bytes==0||pulsed->mute) {
+          // reached end of audio with no looping
+          sample_silence_pulse(pulsed,nframes*pulsed->out_achans*
+                               (pulsed->out_asamps>>3),xbytes);
+          if (!pulsed->is_paused) pulsed->frames_written+=nframes;
+          if (pulsed->seek_pos<0.&&pulsed->playing_file>-1&&afile!=NULL) {
+            pulsed->seek_pos+=nframes*afile->achans*afile->asampsize/8;
+            if (pulsed->seek_pos>=0) pulse_audio_seek_bytes(pulsed,pulsed->seek_pos);
+          }
+          //g_print("pt a5 %d %d\n",pulsed->in_use,in_bytes);
+          return;
+        }
+
+        if ((mainw->agen_key==0&&!mainw->agen_needs_reinit)||mainw->multitrack!=NULL) {
+          swap_sign=afile->signed_endian&AFORM_UNSIGNED;
+
+          inputFramesAvailable = pulsed->aPlayPtr->size / (pulsed->in_achans * (pulsed->in_asamps>>3));
+#ifdef DEBUG_PULSE
+          lives_printerr("%ld inputFramesAvailable == %ld, %ld, %ld %ld,pulseFramesAvailable == %ld\n", pulsed->aPlayPtr->size, inputFramesAvailable,
+                         in_frames, pulsed->in_arate,pulsed->out_arate,pulseFramesAvailable);
+#endif
+          buffer = (uint8_t *)pulsed->aPlayPtr->data;
+
+          numFramesToWrite = MIN(pulseFramesAvailable, (inputFramesAvailable/ABS(shrink_factor)+.001));
 
 #ifdef DEBUG_PULSE
-	   g_printerr("inputFramesAvailable after conversion %d\n",(uint64_t)((double)inputFramesAvailable/shrink_factor+.001));
-	   g_printerr("nframes == %ld, pulseFramesAvailable == %ld,\n\tpulsed->num_input_channels == %ld, pulsed->out_achans == %ld\n",  nframes, pulseFramesAvailable, pulsed->in_achans, pulsed->out_achans);
+          lives_printerr("inputFramesAvailable after conversion %d\n",(uint64_t)((double)inputFramesAvailable/shrink_factor+.001));
+          lives_printerr("nframes == %ld, pulseFramesAvailable == %ld,\n\tpulsed->num_input_channels == %ld, pulsed->out_achans == %ld\n",  nframes,
+                         pulseFramesAvailable, pulsed->in_achans, pulsed->out_achans);
 #endif
 
-	   if (pulsed->in_asamps==pulsed->out_asamps&&shrink_factor==1.&&pulsed->in_achans==pulsed->out_achans&&
-	       !pulsed->reverse_endian&&!swap_sign) {
-	     // no transformation needed
-	     pulsed->sound_buffer=buffer;
-	   }
-	   else {
-	     pulsed->sound_buffer=(uint8_t *)g_try_malloc0(pulsed->chunk_size);
-	     if (!pulsed->sound_buffer) {
-	       sample_silence_pulse(pulsed,nframes*pulsed->out_achans*
-				    (pulsed->out_asamps>>3),xbytes);
-	       if (!pulsed->is_paused) pulsed->frames_written+=nframes;
-	       return;
-	     }
-
-	     if (pulsed->in_asamps==8) {
-	       sample_move_d8_d16 ((short *)(pulsed->sound_buffer),(uint8_t *)buffer, numFramesToWrite, in_bytes, 
-				   shrink_factor, pulsed->out_achans, pulsed->in_achans, swap_sign?SWAP_U_TO_S:0);
-	     }
-	     else {
-	       sample_move_d16_d16((short*)pulsed->sound_buffer, (short*)buffer, numFramesToWrite, in_bytes, shrink_factor,
-				   pulsed->out_achans, pulsed->in_achans, pulsed->reverse_endian?SWAP_X_TO_L:0, 
-				   swap_sign?SWAP_U_TO_S:0);
-	     }
-	   }
-
-	   if (has_audio_filters(AF_TYPE_ANY)&&(pulsed->playing_file!=mainw->ascrap_file)) {
-	     boolean memok=TRUE;
-	     float **fltbuf=(float **)g_malloc(pulsed->out_achans*sizeof(float *));
-	     register int i;
-
-	     // we have audio filters; convert to float, pass through any audio filters, then back to s16
-	     for (i=0;i<pulsed->out_achans;i++) {
-	       // convert s16 to non-interleaved float
-	       fltbuf[i]=(float *)g_try_malloc(numFramesToWrite*sizeof(float));
-	       if (fltbuf[i]==NULL) {
-		 memok=FALSE;
-		 for (--i;i>=0;i--) {
-		   g_free(fltbuf[i]);
-		 }
-		 break;
-	       }
-
-	       sample_move_d16_float(fltbuf[i],(short*)pulsed->sound_buffer+i,numFramesToWrite,pulsed->out_achans,FALSE,FALSE,1.0);
-	     }
-
-	     if (memok) {
-	       int64_t tc=pulsed->audio_ticks+(int64_t)(pulsed->frames_written/(double)pulsed->out_arate*U_SEC);
-	       // apply any audio effects with in_channels
-
-	       weed_apply_audio_effects_rt(fltbuf,pulsed->out_achans,numFramesToWrite,pulsed->out_arate,tc,FALSE);
-
-	       // convert float audio back to s16
-	       sample_move_float_int(pulsed->sound_buffer,fltbuf,numFramesToWrite,1.0,pulsed->out_achans,16,0,
-				     (capable->byte_order==LIVES_LITTLE_ENDIAN),FALSE,1.0);
-
-	       for (i=0;i<pulsed->out_achans;i++) {
-		 g_free(fltbuf[i]);
-	       }
-	     }
-
-	     g_free(fltbuf);
-	   }
-
-	 }
-	 else {
-	   // audio generator
-	   // get float audio from gen, convert it to S16
-	   float *fbuffer=NULL;
-	   boolean pl_error=FALSE;
-	   xbytes=nbytes;
-	   numFramesToWrite=pulseFramesAvailable;
-
-	   if (mainw->agen_needs_reinit) pl_error=TRUE;
-	   else {
-	     fbuffer=(float *)g_malloc(numFramesToWrite*pulsed->out_achans*sizeof(float));
-	     if (!get_audio_from_plugin(fbuffer,pulsed->out_achans,pulsed->out_arate,numFramesToWrite)) {
-	       pl_error=TRUE;
-	     }
-	   }
-	   
-	   if (!pl_error) {
-	     if (G_UNLIKELY(nbytes>pulsed->aPlayPtr->max_size)) {
-	       pulsed->aPlayPtr->data=g_try_realloc(pulsed->aPlayPtr->data,nbytes);
-	       if (pulsed->aPlayPtr->data!=NULL) {
-		 memset(pulsed->aPlayPtr->data,0,nbytes);
-		 pulsed->aPlayPtr->max_size=nbytes;
-	       }
-	       else pl_error=TRUE;
-	     }
-	     pulsed->aPlayPtr->size=nbytes;
-	   }
-
-	   // get back non-interleaved float fbuffer; rate and channels should match
-	   if (pl_error) nbytes=0;
-	   else {
-	     register int i;
-	     boolean memok=FALSE;
-	     float **fp=(float**)lives_malloc(pulsed->out_achans*sizeof(float *));
-	     void *buf;
-	     pulsed->sound_buffer=(uint8_t *)pulsed->aPlayPtr->data;
-	     buf=(void *)pulsed->sound_buffer;
-
-	     if (has_audio_filters(AF_TYPE_ANY)) {
-	       register int i;
-
-	       memok=TRUE;
-
-	       // we have audio filters; convert to float, pass through any audio filters, then back to s16
-	       for (i=0;i<pulsed->out_achans;i++) {
-		 // convert s16 to non-interleaved float
-		 fp[i]=(float *)g_try_malloc(numFramesToWrite*sizeof(float));
-		 if (fp[i]==NULL) {
-		   memok=FALSE;
-		   for (--i;i>=0;i--) {
-		     g_free(fp[i]);
-		   }
-		   break;
-		 }
-		 
-		 lives_memcpy(fp[i],&fbuffer[i*numFramesToWrite],numFramesToWrite*sizeof(float));
-
-	       }
-	       
-	       if (memok) {
-		 int64_t tc=pulsed->audio_ticks+(int64_t)(pulsed->frames_written/(double)pulsed->out_arate*U_SEC);
-		 // apply any audio effects with in_channels
-		 
-		 weed_apply_audio_effects_rt(fp,pulsed->out_achans,numFramesToWrite,pulsed->out_arate,tc,FALSE);
-		 
-		 // convert float audio to s16
-		 sample_move_float_int(buf,fp,numFramesToWrite,1.0,pulsed->out_achans,16,FALSE,
-				       (capable->byte_order==LIVES_LITTLE_ENDIAN),FALSE,1.0);
-		 
-		 for (i=0;i<pulsed->out_achans;i++) {
-		   g_free(fp[i]);
-		 }
-	       }
-	     }
-
-	     if (!memok) {
-	       // no audio effects; or memory allocation error
-	       for (i=0;i<pulsed->out_achans;i++) {
-		 fp[i]=fbuffer+(i*numFramesToWrite);
-	       }
-	       sample_move_float_int(buf,fp,numFramesToWrite,1.0,
-				     pulsed->out_achans,16,0,(capable->byte_order==LIVES_LITTLE_ENDIAN),FALSE,1.0);
-	     }
-
-	     if (fbuffer!=NULL) g_free(fbuffer);
-	     free(fp);
-
-	     if (mainw->record&&mainw->ascrap_file!=-1&&mainw->playing_file>0) {
-	       // write generated audio to ascrap_file
-	       size_t rbytes=numFramesToWrite*mainw->files[mainw->ascrap_file]->achans*
-		 mainw->files[mainw->ascrap_file]->asampsize>>3;
-	       pulse_flush_read_data(pulsed,mainw->ascrap_file,nbytes,mainw->files[mainw->ascrap_file]->signed_endian&AFORM_BIG_ENDIAN,buf);
-	       mainw->files[mainw->ascrap_file]->aseek_pos+=rbytes;
-	     }
-	   }
-	 }
-
-	 pulsed->frames_written+=numFramesToWrite;
-	 pulseFramesAvailable-=numFramesToWrite;
-
- #ifdef DEBUG_PULSE
-	 g_printerr("pulseFramesAvailable == %ld\n", pulseFramesAvailable);
- #endif
-       }
-
-       // playback from memory or file
-
-       if (mainw->volume!=old_volume) {
-	 pa_operation *pa_op;
-	 pavol=pa_sw_volume_from_linear(mainw->volume);
-	 pa_cvolume_set(&out_vol,pulsed->out_achans,pavol);
-	 pa_op=pa_context_set_sink_input_volume(pulsed->con,pa_stream_get_index(pulsed->pstream),&out_vol,NULL,NULL);
-	 pa_operation_unref(pa_op);
-	 old_volume=mainw->volume;
-       }
-
-
-       while (nbytes>0) {
-	 if (nbytes<xbytes) xbytes=nbytes;
-
-	 if (!from_memory) {
-	   if (xbytes/pulsed->out_achans/(pulsed->out_asamps>>3)<=numFramesToWrite&&offs==0) {
-	     buffer=pulsed->sound_buffer;
-	   }
-	   else {
-	     buffer=(uint8_t *)g_try_malloc(xbytes);
-	     if (!buffer) {
-	       sample_silence_pulse(pulsed,nframes*pulsed->out_achans*
-				    (pulsed->out_asamps>>3),xbytes);
-	       if (!pulsed->is_paused) pulsed->frames_written+=nframes;
-	       return;
-	     }
-	     if (pulsed->sound_buffer) lives_memcpy(buffer,pulsed->sound_buffer+offs,xbytes);
-	     offs+=xbytes;
-	     needs_free=TRUE;
-	   }
-	   if (pulsed->astream_fd!=-1) audio_stream(buffer,xbytes,pulsed->astream_fd);
-	   if (mainw->audio_frame_buffer!=NULL) {
-	     pthread_mutex_lock(&mainw->abuf_frame_mutex);
-	     append_to_audio_buffer16(mainw->audio_frame_buffer,buffer,xbytes/2,0);
-	     mainw->audio_frame_buffer->samples_filled+=xbytes/2;
-	     pthread_mutex_unlock(&mainw->abuf_frame_mutex);
-	   }
-	   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=(short *)g_try_malloc0(xbytes);
-	     if (!shortbuffer) return;
-	     sample_move_abuf_int16(shortbuffer,pulsed->out_achans,(xbytes>>1)/pulsed->out_achans,pulsed->out_arate);
-	     if (pulsed->astream_fd!=-1) audio_stream(shortbuffer,xbytes,pulsed->astream_fd);
-	     if (mainw->audio_frame_buffer!=NULL) {
-	       pthread_mutex_lock(&mainw->abuf_frame_mutex);
-	       append_to_audio_buffer16(mainw->audio_frame_buffer,shortbuffer,xbytes/2,0);
-	       mainw->audio_frame_buffer->samples_filled+=xbytes/2;
-	       pthread_mutex_unlock(&mainw->abuf_frame_mutex);
-	     }
-	     pa_stream_write(pulsed->pstream,shortbuffer,xbytes,pulse_buff_free,0,PA_SEEK_RELATIVE);
-	   }
-	   else {
-	     sample_silence_pulse(pulsed,xbytes,xbytes);
-	  }
-	}
-	nbytes-=xbytes;
+          if (pulsed->in_asamps==pulsed->out_asamps&&shrink_factor==1.&&pulsed->in_achans==pulsed->out_achans&&
+              !pulsed->reverse_endian&&!swap_sign) {
+            // no transformation needed
+            pulsed->sound_buffer=buffer;
+          } else {
+            pulsed->sound_buffer=(uint8_t *)lives_try_malloc0(pulsed->chunk_size);
+            if (!pulsed->sound_buffer) {
+              sample_silence_pulse(pulsed,nframes*pulsed->out_achans*
+                                   (pulsed->out_asamps>>3),xbytes);
+              if (!pulsed->is_paused) pulsed->frames_written+=nframes;
+              return;
+            }
+
+            if (pulsed->in_asamps==8) {
+              sample_move_d8_d16((short *)(pulsed->sound_buffer),(uint8_t *)buffer, numFramesToWrite, in_bytes,
+                                 shrink_factor, pulsed->out_achans, pulsed->in_achans, swap_sign?SWAP_U_TO_S:0);
+            } else {
+              sample_move_d16_d16((short *)pulsed->sound_buffer, (short *)buffer, numFramesToWrite, in_bytes, shrink_factor,
+                                  pulsed->out_achans, pulsed->in_achans, pulsed->reverse_endian?SWAP_X_TO_L:0,
+                                  swap_sign?SWAP_U_TO_S:0);
+            }
+          }
+
+          if (has_audio_filters(AF_TYPE_ANY)&&(pulsed->playing_file!=mainw->ascrap_file)) {
+            boolean memok=TRUE;
+            float **fltbuf=(float **)lives_malloc(pulsed->out_achans*sizeof(float *));
+            register int i;
+
+            // we have audio filters; convert to float, pass through any audio filters, then back to s16
+            for (i=0; i<pulsed->out_achans; i++) {
+              // convert s16 to non-interleaved float
+              fltbuf[i]=(float *)lives_try_malloc(numFramesToWrite*sizeof(float));
+              if (fltbuf[i]==NULL) {
+                memok=FALSE;
+                for (--i; i>=0; i--) {
+                  lives_free(fltbuf[i]);
+                }
+                break;
+              }
+
+              sample_move_d16_float(fltbuf[i],(short *)pulsed->sound_buffer+i,numFramesToWrite,pulsed->out_achans,FALSE,FALSE,1.0);
+            }
+
+            if (memok) {
+              int64_t tc=pulsed->audio_ticks+(int64_t)(pulsed->frames_written/(double)pulsed->out_arate*U_SEC);
+              // apply any audio effects with in_channels
+
+              weed_apply_audio_effects_rt(fltbuf,pulsed->out_achans,numFramesToWrite,pulsed->out_arate,tc,FALSE);
+
+              // convert float audio back to s16
+              sample_move_float_int(pulsed->sound_buffer,fltbuf,numFramesToWrite,1.0,pulsed->out_achans,16,0,
+                                    (capable->byte_order==LIVES_LITTLE_ENDIAN),FALSE,1.0);
+
+              for (i=0; i<pulsed->out_achans; i++) {
+                lives_free(fltbuf[i]);
+              }
+            }
+
+            lives_free(fltbuf);
+          }
+
+        } else {
+          // audio generator
+          // get float audio from gen, convert it to S16
+          float *fbuffer=NULL;
+          boolean pl_error=FALSE;
+          xbytes=nbytes;
+          numFramesToWrite=pulseFramesAvailable;
+
+          if (mainw->agen_needs_reinit) pl_error=TRUE;
+          else {
+            fbuffer=(float *)lives_malloc(numFramesToWrite*pulsed->out_achans*sizeof(float));
+            if (!get_audio_from_plugin(fbuffer,pulsed->out_achans,pulsed->out_arate,numFramesToWrite)) {
+              pl_error=TRUE;
+            }
+          }
+
+          if (!pl_error) {
+            if (LIVES_UNLIKELY(nbytes>pulsed->aPlayPtr->max_size)) {
+              pulsed->aPlayPtr->data=lives_try_realloc(pulsed->aPlayPtr->data,nbytes);
+              if (pulsed->aPlayPtr->data!=NULL) {
+                memset(pulsed->aPlayPtr->data,0,nbytes);
+                pulsed->aPlayPtr->max_size=nbytes;
+              } else pl_error=TRUE;
+            }
+            pulsed->aPlayPtr->size=nbytes;
+          }
+
+          // get back non-interleaved float fbuffer; rate and channels should match
+          if (pl_error) nbytes=0;
+          else {
+            register int i;
+            boolean memok=FALSE;
+            float **fp=(float **)lives_malloc(pulsed->out_achans*sizeof(float *));
+            void *buf;
+            pulsed->sound_buffer=(uint8_t *)pulsed->aPlayPtr->data;
+            buf=(void *)pulsed->sound_buffer;
+
+            if (has_audio_filters(AF_TYPE_ANY)) {
+              register int i;
+
+              memok=TRUE;
+
+              // we have audio filters; convert to float, pass through any audio filters, then back to s16
+              for (i=0; i<pulsed->out_achans; i++) {
+                // convert s16 to non-interleaved float
+                fp[i]=(float *)lives_try_malloc(numFramesToWrite*sizeof(float));
+                if (fp[i]==NULL) {
+                  memok=FALSE;
+                  for (--i; i>=0; i--) {
+                    lives_free(fp[i]);
+                  }
+                  break;
+                }
+
+                lives_memcpy(fp[i],&fbuffer[i*numFramesToWrite],numFramesToWrite*sizeof(float));
+
+              }
+
+              if (memok) {
+                int64_t tc=pulsed->audio_ticks+(int64_t)(pulsed->frames_written/(double)pulsed->out_arate*U_SEC);
+                // apply any audio effects with in_channels
+
+                weed_apply_audio_effects_rt(fp,pulsed->out_achans,numFramesToWrite,pulsed->out_arate,tc,FALSE);
+
+                // convert float audio to s16
+                sample_move_float_int(buf,fp,numFramesToWrite,1.0,pulsed->out_achans,16,FALSE,
+                                      (capable->byte_order==LIVES_LITTLE_ENDIAN),FALSE,1.0);
+
+                for (i=0; i<pulsed->out_achans; i++) {
+                  lives_free(fp[i]);
+                }
+              }
+            }
+
+            if (!memok) {
+              // no audio effects; or memory allocation error
+              for (i=0; i<pulsed->out_achans; i++) {
+                fp[i]=fbuffer+(i*numFramesToWrite);
+              }
+              sample_move_float_int(buf,fp,numFramesToWrite,1.0,
+                                    pulsed->out_achans,16,0,(capable->byte_order==LIVES_LITTLE_ENDIAN),FALSE,1.0);
+            }
+
+            if (fbuffer!=NULL) lives_free(fbuffer);
+            free(fp);
+
+            if (mainw->record&&mainw->ascrap_file!=-1&&mainw->playing_file>0) {
+              // write generated audio to ascrap_file
+              size_t rbytes=numFramesToWrite*mainw->files[mainw->ascrap_file]->achans*
+                            mainw->files[mainw->ascrap_file]->asampsize>>3;
+              pulse_flush_read_data(pulsed,mainw->ascrap_file,nbytes,mainw->files[mainw->ascrap_file]->signed_endian&AFORM_BIG_ENDIAN,buf);
+              mainw->files[mainw->ascrap_file]->aseek_pos+=rbytes;
+            }
+          }
+        }
+
+        pulsed->frames_written+=numFramesToWrite;
+        pulseFramesAvailable-=numFramesToWrite;
+
+#ifdef DEBUG_PULSE
+        lives_printerr("pulseFramesAvailable == %ld\n", pulseFramesAvailable);
+#endif
+      }
+
+      // playback from memory or file
+
+      if (mainw->volume!=old_volume) {
+        pa_operation *pa_op;
+        pavol=pa_sw_volume_from_linear(mainw->volume);
+        pa_cvolume_set(&out_vol,pulsed->out_achans,pavol);
+        pa_op=pa_context_set_sink_input_volume(pulsed->con,pa_stream_get_index(pulsed->pstream),&out_vol,NULL,NULL);
+        pa_operation_unref(pa_op);
+        old_volume=mainw->volume;
+      }
+
+
+      while (nbytes>0) {
+        if (nbytes<xbytes) xbytes=nbytes;
+
+        if (!from_memory) {
+          if (xbytes/pulsed->out_achans/(pulsed->out_asamps>>3)<=numFramesToWrite&&offs==0) {
+            buffer=pulsed->sound_buffer;
+          } else {
+            buffer=(uint8_t *)lives_try_malloc(xbytes);
+            if (!buffer) {
+              sample_silence_pulse(pulsed,nframes*pulsed->out_achans*
+                                   (pulsed->out_asamps>>3),xbytes);
+              if (!pulsed->is_paused) pulsed->frames_written+=nframes;
+              return;
+            }
+            if (pulsed->sound_buffer) lives_memcpy(buffer,pulsed->sound_buffer+offs,xbytes);
+            offs+=xbytes;
+            needs_free=TRUE;
+          }
+          if (pulsed->astream_fd!=-1) audio_stream(buffer,xbytes,pulsed->astream_fd);
+          if (mainw->audio_frame_buffer!=NULL) {
+            pthread_mutex_lock(&mainw->abuf_frame_mutex);
+            append_to_audio_buffer16(mainw->audio_frame_buffer,buffer,xbytes/2,0);
+            mainw->audio_frame_buffer->samples_filled+=xbytes/2;
+            pthread_mutex_unlock(&mainw->abuf_frame_mutex);
+          }
+          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=(short *)lives_try_malloc0(xbytes);
+            if (!shortbuffer) return;
+            sample_move_abuf_int16(shortbuffer,pulsed->out_achans,(xbytes>>1)/pulsed->out_achans,pulsed->out_arate);
+            if (pulsed->astream_fd!=-1) audio_stream(shortbuffer,xbytes,pulsed->astream_fd);
+            if (mainw->audio_frame_buffer!=NULL) {
+              pthread_mutex_lock(&mainw->abuf_frame_mutex);
+              append_to_audio_buffer16(mainw->audio_frame_buffer,shortbuffer,xbytes/2,0);
+              mainw->audio_frame_buffer->samples_filled+=xbytes/2;
+              pthread_mutex_unlock(&mainw->abuf_frame_mutex);
+            }
+            pa_stream_write(pulsed->pstream,shortbuffer,xbytes,pulse_buff_free,0,PA_SEEK_RELATIVE);
+          } else {
+            sample_silence_pulse(pulsed,xbytes,xbytes);
+          }
+        }
+        nbytes-=xbytes;
+      }
+
+      if (needs_free&&pulsed->sound_buffer!=pulsed->aPlayPtr->data&&pulsed->sound_buffer!=NULL) {
+        lives_free(pulsed->sound_buffer);
+        pulsed->sound_buffer=NULL;
       }
-      
-       if (needs_free&&pulsed->sound_buffer!=pulsed->aPlayPtr->data&&pulsed->sound_buffer!=NULL) {
-	 g_free(pulsed->sound_buffer);
-	 pulsed->sound_buffer=NULL;
-       }
     }
 
-    if(pulseFramesAvailable) {
+    if (pulseFramesAvailable) {
 
 #ifdef DEBUG_PULSE
-      g_printerr("buffer underrun of %ld frames\n", pulseFramesAvailable);
+      lives_printerr("buffer underrun of %ld frames\n", pulseFramesAvailable);
 #endif
       xbytes=pa_stream_writable_size(pstream);
       sample_silence_pulse(pulsed,pulseFramesAvailable*pulsed->out_achans
-			   *(pulsed->out_asamps>>3),xbytes);
+                           *(pulsed->out_asamps>>3),xbytes);
     }
-   }
-  else {
+  } else {
 #ifdef DEBUG_PULSE
-    g_printerr("PAUSED or STOPPED or CLOSED, outputting silence\n");
+    lives_printerr("PAUSED or STOPPED or CLOSED, outputting silence\n");
 #endif
     sample_silence_pulse(pulsed,nframes*pulsed->out_achans*(pulsed->out_asamps>>3),xbytes);
     //g_print("pt a6\n");
@@ -757,7 +740,7 @@
   //g_print("pt a7\n");
 
 #ifdef DEBUG_PULSE
-   // g_printerr("done\n");
+  // lives_printerr("done\n");
 #endif
 
 }
@@ -779,16 +762,14 @@
     if (prb==0||mainw->rec_samples==0) return 0;
     if (prb<=PULSE_READ_BYTES*2&&rbytes>0) {
       gbuf=(short *)data;
-    }
-    else {
-      gbuf=(short *)g_try_malloc(prb);
+    } else {
+      gbuf=(short *)lives_try_malloc(prb);
       if (!gbuf) return 0;
       lives_memcpy(gbuf,prbuf,prb-rbytes);
       if (rbytes>0) lives_memcpy(gbuf+(prb-rbytes)/sizeof(short),data,rbytes);
     }
     ofile=afile;
-  }
-  else {
+  } else {
     if (rbytes==0) return 0;
     if (fileno==-1) return 0;
     gbuf=(short *)data;
@@ -807,20 +788,19 @@
 
   bytes_out=frames_out*ofile->achans*(ofile->asampsize>>3);
 
-  holding_buff=g_try_malloc(bytes_out);
+  holding_buff=lives_try_malloc(bytes_out);
 
   if (!holding_buff) return 0;
 
   if (ofile->asampsize==16) {
     sample_move_d16_d16((short *)holding_buff,gbuf,frames_out,prb,out_scale,ofile->achans,pulsed->in_achans,
-			pulsed->reverse_endian?SWAP_L_TO_X:0,swap_sign?SWAP_S_TO_U:0);
-  }
-  else {
+                        pulsed->reverse_endian?SWAP_L_TO_X:0,swap_sign?SWAP_S_TO_U:0);
+  } else {
     sample_move_d16_d8((uint8_t *)holding_buff,gbuf,frames_out,prb,out_scale,ofile->achans,pulsed->in_achans,swap_sign?SWAP_S_TO_U:0);
   }
-    
+
   if (gbuf!=(short *)data) {
-    g_free(gbuf);
+    lives_free(gbuf);
   }
 
   prb=0;
@@ -833,23 +813,23 @@
   if (mainw->bad_aud_file==NULL) {
     size_t target=frames_out*(ofile->asampsize/8)*ofile->achans,bytes;
     // use write not lives_write - because of potential threading issues
-    bytes=write (mainw->aud_rec_fd,holding_buff,target);
+    bytes=write(mainw->aud_rec_fd,holding_buff,target);
     if (bytes<target) mainw->bad_aud_file=filename_from_fd(NULL,mainw->aud_rec_fd);
   }
 
-  g_free(holding_buff);
+  lives_free(holding_buff);
 
   return bytes;
 }
 
 
 
-static void pulse_audio_read_process (pa_stream *pstream, size_t nbytes, void *arg) {
+static void pulse_audio_read_process(pa_stream *pstream, size_t nbytes, void *arg) {
   // read nframes from pulse buffer, and then possibly write to mainw->aud_rec_fd
 
   // this is the callback from pulse when we are recording or playing external audio
 
-  pulse_driver_t* pulsed = (pulse_driver_t*)arg;
+  pulse_driver_t *pulsed = (pulse_driver_t *)arg;
   float out_scale;
   size_t frames_out,nframes;
   void *data;
@@ -857,18 +837,17 @@
 
   if (!pulsed->in_use) return;
 
-  if (mainw->playing_file<0&&prefs->audio_src==AUDIO_SRC_EXT) return; 
+  if (mainw->playing_file<0&&prefs->audio_src==AUDIO_SRC_EXT) return;
 
   if (mainw->effects_paused) return; // pause during record ???
 
-  pa_stream_peek(pulsed->pstream,(const void**)&data,&rbytes);
+  pa_stream_peek(pulsed->pstream,(const void **)&data,&rbytes);
 
   if (data==NULL) return;
 
   if (pulsed->playing_file==-1) {
     out_scale=1.0; // just listening, no recording
-  }
-  else {
+  } else {
     out_scale=(float)pulsed->in_arate/(float)afile->arate; // recording to ascrap_file
     prb+=rbytes;
   }
@@ -876,7 +855,7 @@
   if (pulsed->playing_file==-1||(mainw->record&&mainw->record_paused)) prb=0;
 
   frames_out=(size_t)((double)((prb/(pulsed->in_asamps>>3)/pulsed->in_achans))/out_scale+.5);
-  
+
   nframes=(size_t)((double)((rbytes/(pulsed->in_asamps>>3)/pulsed->in_achans))/out_scale+.5);
 
   // should really be frames_read here
@@ -892,44 +871,44 @@
     if (has_audio_filters(AF_TYPE_A)) {
       // convert to float, apply any analysers
       boolean memok=TRUE;
-      float **fltbuf=(float **)g_malloc(pulsed->in_achans*sizeof(float *));
+      float **fltbuf=(float **)lives_malloc(pulsed->in_achans*sizeof(float *));
       register int i;
 
       size_t xnframes=(size_t)(rbytes/(pulsed->in_asamps>>3)/pulsed->in_achans);
 
-      for (i=0;i<pulsed->in_achans;i++) {
-	// convert s16 to non-interleaved float
-	fltbuf[i]=(float *)g_try_malloc(xnframes*sizeof(float));
-	if (fltbuf[i]==NULL) {
-	  memok=FALSE;
-	  for (--i;i>=0;i--) {
-	    g_free(fltbuf[i]);
-	  }
-	  break;
-	}
-	
-	sample_move_d16_float(fltbuf[i],(short*)data+i,xnframes,pulsed->in_achans,FALSE,FALSE,1.0);
-
-	if (mainw->audio_frame_buffer!=NULL) {
-	  // if we have audio triggered gens., push audio to it
-	  pthread_mutex_lock(&mainw->abuf_frame_mutex);
-	  append_to_audio_bufferf(mainw->audio_frame_buffer,fltbuf[i],xnframes,i);
-	  mainw->audio_frame_buffer->samples_filled+=xnframes;
-	  pthread_mutex_unlock(&mainw->abuf_frame_mutex);
-	}
+      for (i=0; i<pulsed->in_achans; i++) {
+        // convert s16 to non-interleaved float
+        fltbuf[i]=(float *)lives_try_malloc(xnframes*sizeof(float));
+        if (fltbuf[i]==NULL) {
+          memok=FALSE;
+          for (--i; i>=0; i--) {
+            lives_free(fltbuf[i]);
+          }
+          break;
+        }
+
+        sample_move_d16_float(fltbuf[i],(short *)data+i,xnframes,pulsed->in_achans,FALSE,FALSE,1.0);
+
+        if (mainw->audio_frame_buffer!=NULL) {
+          // if we have audio triggered gens., push audio to it
+          pthread_mutex_lock(&mainw->abuf_frame_mutex);
+          append_to_audio_bufferf(mainw->audio_frame_buffer,fltbuf[i],xnframes,i);
+          mainw->audio_frame_buffer->samples_filled+=xnframes;
+          pthread_mutex_unlock(&mainw->abuf_frame_mutex);
+        }
       }
-      
+
       if (memok) {
-	int64_t tc=pulsed->audio_ticks+(int64_t)(pulsed->frames_written/(double)pulsed->in_arate*U_SEC);
-	// apply any audio effects with in channels but no out channels
-	weed_apply_audio_effects_rt(fltbuf,pulsed->in_achans,xnframes,pulsed->in_arate,tc,TRUE);
-	
-	for (i=0;i<pulsed->in_achans;i++) {
-	  g_free(fltbuf[i]);
-	}
+        int64_t tc=pulsed->audio_ticks+(int64_t)(pulsed->frames_written/(double)pulsed->in_arate*U_SEC);
+        // apply any audio effects with in channels but no out channels
+        weed_apply_audio_effects_rt(fltbuf,pulsed->in_achans,xnframes,pulsed->in_arate,tc,TRUE);
+
+        for (i=0; i<pulsed->in_achans; i++) {
+          lives_free(fltbuf[i]);
+        }
       }
-      
-      g_free(fltbuf);
+
+      lives_free(fltbuf);
 
     }
 
@@ -943,8 +922,7 @@
   if (mainw->playing_file!=mainw->ascrap_file) {
     if (mainw->playing_file!=-1) mainw->files[mainw->playing_file]->aseek_pos+=rbytes;
     if (mainw->ascrap_file!=-1&&!mainw->record_paused) mainw->files[mainw->ascrap_file]->aseek_pos+=rbytes;
-  }
-  else if (mainw->ascrap_file!=-1&&!mainw->record_paused) mainw->files[mainw->ascrap_file]->aseek_pos+=rbytes;
+  } else if (mainw->ascrap_file!=-1&&!mainw->record_paused) mainw->files[mainw->ascrap_file]->aseek_pos+=rbytes;
 
   pulsed->seek_pos+=rbytes;
 
@@ -959,8 +937,7 @@
   if (prb<=PULSE_READ_BYTES*2) {
     lives_memcpy(&prbuf[prb-rbytes],data,rbytes);
     pulse_flush_read_data(pulsed,mainw->playing_file,prb,pulsed->reverse_endian,prbuf);
-  }
-  else pulse_flush_read_data(pulsed,mainw->playing_file,rbytes,pulsed->reverse_endian,data);
+  } else pulse_flush_read_data(pulsed,mainw->playing_file,rbytes,pulsed->reverse_endian,data);
 
   pa_stream_drop(pulsed->pstream);
 
@@ -1006,7 +983,7 @@
   pulsed.mloop=pa_mloop;
   pulsed.con=pcon;
 
-  for (j=0;j<PULSE_MAX_OUTPUT_CHANS;j++) pulsed.volume[j]=1.0f;
+  for (j=0; j<PULSE_MAX_OUTPUT_CHANS; j++) pulsed.volume[j]=1.0f;
   pulsed.state=(pa_context_state_t)PA_STREAM_UNCONNECTED;
   pulsed.in_arate=44100;
   pulsed.fd=-1;
@@ -1016,7 +993,7 @@
   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=(audio_buffer_t *)lives_malloc(sizeof(audio_buffer_t));
   pulsed.aPlayPtr->data=NULL;
   pulsed.aPlayPtr->size=0;
   pulsed.aPlayPtr->max_size=0;
@@ -1045,7 +1022,7 @@
   pulsed_reader.mloop=pa_mloop;
   pulsed_reader.con=pcon;
 
-  for (j=0;j<PULSE_MAX_OUTPUT_CHANS;j++) pulsed_reader.volume[j]=1.0f;
+  for (j=0; j<PULSE_MAX_OUTPUT_CHANS; j++) pulsed_reader.volume[j]=1.0f;
   pulsed_reader.state=(pa_context_state_t)PA_STREAM_UNCONNECTED;
   pulsed_reader.fd=-1;
   pulsed_reader.seek_pos=pulsed_reader.seek_end=0;
@@ -1075,9 +1052,9 @@
 
 
 int pulse_driver_activate(pulse_driver_t *pdriver) {
-// create a new client and connect it to pulse server
-  gchar *pa_clientname;
-  gchar *mypid;
+  // create a new client and connect it to pulse server
+  char *pa_clientname;
+  char *mypid;
 
   pa_sample_spec pa_spec;
   pa_channel_map pa_map;
@@ -1094,22 +1071,30 @@
 
   if (pdriver->is_output) {
     pa_clientname="LiVES_audio_out";
-  }
-  else {
+  } else {
     pa_clientname="LiVES_audio_in";
   }
 
-  mypid=g_strdup_printf("%d",capable->mainpid);
+  mypid=lives_strdup_printf("%d",capable->mainpid);
 
   pdriver->pa_props=pa_proplist_new();
 
-  pa_proplist_sets(pdriver->pa_props, PA_PROP_APPLICATION_ICON_NAME, g_get_application_name());
-  pa_proplist_sets(pdriver->pa_props, PA_PROP_APPLICATION_ID, g_get_application_name());
-  pa_proplist_sets(pdriver->pa_props, PA_PROP_APPLICATION_NAME, g_get_application_name());
+  pa_proplist_sets(pdriver->pa_props, PA_PROP_APPLICATION_ICON_NAME, lives_get_application_name());
+  pa_proplist_sets(pdriver->pa_props, PA_PROP_APPLICATION_ID, lives_get_application_name());
+  pa_proplist_sets(pdriver->pa_props, PA_PROP_APPLICATION_NAME, lives_get_application_name());
+
   pa_proplist_sets(pdriver->pa_props, PA_PROP_APPLICATION_PROCESS_BINARY, capable->myname);
   pa_proplist_sets(pdriver->pa_props, PA_PROP_APPLICATION_PROCESS_ID, mypid);
   pa_proplist_sets(pdriver->pa_props, PA_PROP_APPLICATION_VERSION, LiVES_VERSION);
+
+#ifdef GUI_GTK
   pa_proplist_sets(pdriver->pa_props, PA_PROP_APPLICATION_LANGUAGE, pango_language_to_string(gtk_get_default_language()));
+#endif
+
+#ifdef GUI_QT
+  QLocale ql;
+  pa_proplist_sets(pdriver->pa_props, PA_PROP_APPLICATION_LANGUAGE, (QLocale::languageToString(ql.language())).toLocal8Bit().constData());
+#endif
 
   pa_channel_map_init_stereo(&pa_map);
 
@@ -1126,8 +1111,7 @@
   if (pdriver->is_output) {
     pa_battr.maxlength=LIVES_PA_BUFF_MAXLEN;
     pa_battr.tlength=LIVES_PA_BUFF_TARGET;
-  }
-  else {
+  } else {
     pa_battr.maxlength=(uint32_t)-1;
     pa_battr.tlength=(uint32_t)-1;
   }
@@ -1137,9 +1121,9 @@
 
   if (pulse_server_rate==0) {
     pa_op=pa_context_get_server_info(pdriver->con,pulse_server_cb,NULL);
-    
+
     while (pa_operation_get_state(pa_op)!=PA_OPERATION_DONE) {
-      g_usleep(prefs->sleep_time);
+      lives_usleep(prefs->sleep_time);
     }
     pa_operation_unref(pa_op);
   }
@@ -1163,21 +1147,20 @@
 
 #ifdef PA_STREAM_START_UNMUTED
     pa_stream_connect_playback(pdriver->pstream,NULL,&pa_battr,
-			       (pa_stream_flags_t)(PA_STREAM_START_UNMUTED|PA_STREAM_ADJUST_LATENCY|
-						   PA_STREAM_INTERPOLATE_TIMING|PA_STREAM_AUTO_TIMING_UPDATE),
-			       &out_vol,NULL);
+                               (pa_stream_flags_t)(PA_STREAM_START_UNMUTED|PA_STREAM_ADJUST_LATENCY|
+                                   PA_STREAM_INTERPOLATE_TIMING|PA_STREAM_AUTO_TIMING_UPDATE),
+                               &out_vol,NULL);
 #else
     pa_stream_connect_playback(pdriver->pstream,NULL,&pa_battr,(pa_stream_flags_t)(PA_STREAM_ADJUST_LATENCY|
-										   PA_STREAM_INTERPOLATE_TIMING|
-										   PA_STREAM_AUTO_TIMING_UPDATE),
-			       &out_vol,NULL);
+                               PA_STREAM_INTERPOLATE_TIMING|
+                               PA_STREAM_AUTO_TIMING_UPDATE),
+                               &out_vol,NULL);
 #endif
 
     while (pa_stream_get_state(pdriver->pstream)!=PA_STREAM_READY) {
-      g_usleep(prefs->sleep_time);
+      lives_usleep(prefs->sleep_time);
     }
-  }
-  else {
+  } else {
     // set read callback
     pdriver->audio_ticks=0;
     pdriver->frames_written=0;
@@ -1188,15 +1171,15 @@
     pa_stream_set_read_callback(pdriver->pstream,pulse_audio_read_process,pdriver);
 
     pa_stream_connect_record(pdriver->pstream,NULL,&pa_battr,
-			     (pa_stream_flags_t)(PA_STREAM_START_CORKED|PA_STREAM_EARLY_REQUESTS));
+                             (pa_stream_flags_t)(PA_STREAM_START_CORKED|PA_STREAM_EARLY_REQUESTS));
 
     while (pa_stream_get_state(pdriver->pstream)!=PA_STREAM_READY) {
-      g_usleep(prefs->sleep_time);
+      lives_usleep(prefs->sleep_time);
     }
 
   }
 
-  g_free(mypid);
+  lives_free(mypid);
 
   return 0;
 }
@@ -1219,8 +1202,8 @@
 
 volatile aserver_message_t *pulse_get_msgq(pulse_driver_t *pulsed) {
   // force update - "volatile" doesn't seem to work...
-  gchar *tmp=g_strdup_printf("%p %d",pulsed->msgq,pulsed->pulsed_died);
-  g_free(tmp);
+  char *tmp=lives_strdup_printf("%p %d",pulsed->msgq,pulsed->pulsed_died);
+  lives_free(tmp);
   if (pulsed->pulsed_died||mainw->aplayer_broken) return NULL;
   return pulsed->msgq;
 }
@@ -1269,7 +1252,7 @@
 
 
 
-boolean pulse_audio_seek_frame (pulse_driver_t *pulsed, int frame) {
+boolean pulse_audio_seek_frame(pulse_driver_t *pulsed, int frame) {
   // seek to frame "frame" in current audio file
   // position will be adjusted to (floor) nearest sample
   int64_t seekstart;
@@ -1300,7 +1283,7 @@
 }
 
 
-int64_t pulse_audio_seek_bytes (pulse_driver_t *pulsed, int64_t bytes) {
+int64_t pulse_audio_seek_bytes(pulse_driver_t *pulsed, int64_t bytes) {
   // seek to position "bytes" in current audio file
   // position will be adjusted to (floor) nearest sample
 
@@ -1334,29 +1317,29 @@
   if (seekstart>afile->afilesize) seekstart=afile->afilesize;
   pulse_message.command=ASERVER_CMD_FILE_SEEK;
   pulse_message.next=NULL;
-  pulse_message.data=g_strdup_printf("%"PRId64,seekstart);
+  pulse_message.data=lives_strdup_printf("%"PRId64,seekstart);
   pulsed->msgq=&pulse_message;
   return seekstart;
 }
 
 boolean pulse_try_reconnect(void) {
-   mainw->pulsed=NULL;
-   pa_mloop=NULL;
-   if (!lives_pulse_init(9999)) goto err123; // init server
-   pulse_audio_init(); // reset vars
-   pulse_audio_read_init(); // reset vars
-   mainw->pulsed=pulse_get_driver(TRUE);
-   if (pulse_driver_activate(mainw->pulsed)) { // activate driver
-     goto err123;
-   }
-   d_print(_("\nConnection to pulse audio was reset.\n"));
-   return TRUE;
-   
- err123:
-   mainw->aplayer_broken=TRUE;
-   mainw->pulsed=NULL;
-   do_pulse_lost_conn_error();
-   return FALSE;
+  mainw->pulsed=NULL;
+  pa_mloop=NULL;
+  if (!lives_pulse_init(9999)) goto err123; // init server
+  pulse_audio_init(); // reset vars
+  pulse_audio_read_init(); // reset vars
+  mainw->pulsed=pulse_get_driver(TRUE);
+  if (pulse_driver_activate(mainw->pulsed)) { // activate driver
+    goto err123;
+  }
+  d_print(_("\nConnection to pulse audio was reset.\n"));
+  return TRUE;
+
+err123:
+  mainw->aplayer_broken=TRUE;
+  mainw->pulsed=NULL;
+  do_pulse_lost_conn_error();
+  return FALSE;
 }
 
 
@@ -1368,7 +1351,7 @@
   // - set loop mode
   // - check if we need to reconnect
   // - set vals
-  gchar *tmpfilename=NULL;
+  char *tmpfilename=NULL;
   lives_clip_t *sfile=mainw->files[fileno];
   int asigned=!(sfile->signed_endian&AFORM_UNSIGNED);
   int aendian=!(sfile->signed_endian&AFORM_BIG_ENDIAN);
@@ -1379,21 +1362,20 @@
     mainw->pulsed->is_paused=FALSE;
     mainw->pulsed->mute=mainw->mute;
     if (mainw->loop_cont&&!mainw->preview) {
-      if (mainw->ping_pong&&prefs->audio_opts&AUDIO_OPTS_FOLLOW_FPS&&mainw->multitrack==NULL) 
-	mainw->pulsed->loop=AUDIO_LOOP_PINGPONG;
+      if (mainw->ping_pong&&prefs->audio_opts&AUDIO_OPTS_FOLLOW_FPS&&mainw->multitrack==NULL)
+        mainw->pulsed->loop=AUDIO_LOOP_PINGPONG;
       else mainw->pulsed->loop=AUDIO_LOOP_FORWARD;
-    }
-    else mainw->pulsed->loop=AUDIO_LOOP_NONE;
+    } else mainw->pulsed->loop=AUDIO_LOOP_NONE;
     if (sfile->achans>0&&(!mainw->preview||(mainw->preview&&mainw->is_processing))&&
-	(sfile->laudio_time>0.||sfile->opening||
-	 (mainw->multitrack!=NULL&&mainw->multitrack->is_rendering&&
-	  g_file_test((tmpfilename=g_build_filename(prefs->tmpdir,sfile->handle,"audio",NULL)),
-		      G_FILE_TEST_EXISTS)))) {
-      
+        (sfile->laudio_time>0.||sfile->opening||
+         (mainw->multitrack!=NULL&&mainw->multitrack->is_rendering&&
+          lives_file_test((tmpfilename=lives_build_filename(prefs->tmpdir,sfile->handle,"audio",NULL)),
+                          LIVES_FILE_TEST_EXISTS)))) {
+
       boolean timeout;
       int alarm_handle;
-      
-      if (tmpfilename!=NULL) g_free(tmpfilename);
+
+      if (tmpfilename!=NULL) lives_free(tmpfilename);
       mainw->pulsed->in_achans=sfile->achans;
       mainw->pulsed->in_asamps=sfile->asampsize;
       mainw->pulsed->in_arate=sfile->arate;
@@ -1401,36 +1383,36 @@
       mainw->pulsed->seek_end=sfile->afilesize;
       if (sfile->opening) mainw->pulsed->is_opening=TRUE;
       else mainw->pulsed->is_opening=FALSE;
-      
-      if ((aendian&&(capable->byte_order==LIVES_BIG_ENDIAN))||(!aendian&&(capable->byte_order==LIVES_LITTLE_ENDIAN))) 
-	mainw->pulsed->reverse_endian=TRUE;
+
+      if ((aendian&&(capable->byte_order==LIVES_BIG_ENDIAN))||(!aendian&&(capable->byte_order==LIVES_LITTLE_ENDIAN)))
+        mainw->pulsed->reverse_endian=TRUE;
       else mainw->pulsed->reverse_endian=FALSE;
-      
+
       alarm_handle=lives_alarm_set(LIVES_ACONNECT_TIMEOUT);
       while (!(timeout=lives_alarm_get(alarm_handle))&&pulse_get_msgq(mainw->pulsed)!=NULL) {
-	sched_yield(); // wait for seek
+        sched_yield(); // wait for seek
       }
-      
+
       if (timeout) pulse_try_reconnect();
-      
+
       lives_alarm_clear(alarm_handle);
-      
+
       if ((mainw->multitrack==NULL||mainw->multitrack->is_rendering||
-	   sfile->opening)&&(mainw->event_list==NULL||mainw->record||(mainw->preview&&mainw->is_processing))) {
-	// tell pulse server to open audio file and start playing it
-	pulse_message.command=ASERVER_CMD_FILE_OPEN;
-	pulse_message.data=g_strdup_printf("%d",fileno);
-	pulse_message.next=NULL;
-	mainw->pulsed->msgq=&pulse_message;
-	
-	pulse_audio_seek_bytes(mainw->pulsed,sfile->aseek_pos);
-	if (seek_err) {
-	  if (pulse_try_reconnect()) pulse_audio_seek_bytes(mainw->pulsed,sfile->aseek_pos);
-	}
-	mainw->pulsed->in_use=TRUE;
-	mainw->rec_aclip=fileno;
-	mainw->rec_avel=sfile->pb_fps/sfile->fps;
-	mainw->rec_aseek=(double)sfile->aseek_pos/(double)(sfile->arate*sfile->achans*(sfile->asampsize/8));
+           sfile->opening)&&(mainw->event_list==NULL||mainw->record||(mainw->preview&&mainw->is_processing))) {
+        // tell pulse server to open audio file and start playing it
+        pulse_message.command=ASERVER_CMD_FILE_OPEN;
+        pulse_message.data=lives_strdup_printf("%d",fileno);
+        pulse_message.next=NULL;
+        mainw->pulsed->msgq=&pulse_message;
+
+        pulse_audio_seek_bytes(mainw->pulsed,sfile->aseek_pos);
+        if (seek_err) {
+          if (pulse_try_reconnect()) pulse_audio_seek_bytes(mainw->pulsed,sfile->aseek_pos);
+        }
+        mainw->pulsed->in_use=TRUE;
+        mainw->rec_aclip=fileno;
+        mainw->rec_avel=sfile->pb_fps/sfile->fps;
+        mainw->rec_aseek=(double)sfile->aseek_pos/(double)(sfile->arate*sfile->achans*(sfile->asampsize/8));
       }
     }
     if (mainw->agen_key!=0&&mainw->multitrack==NULL) mainw->pulsed->in_use=TRUE; // audio generator is active

LiVES-2.2.8.tar.bz2/src/pulse.h -> LiVES-2.4.1.tar.bz2/src/pulse.h Changed

@@ -110,7 +110,7 @@
 
 // TODO - rationalise names
 
-boolean lives_pulse_init (short startup_phase); ///< init server, mainloop and context
+boolean lives_pulse_init(short startup_phase);  ///< init server, mainloop and context
 
 int pulse_audio_init(void);  ///< init driver vars.
 int pulse_audio_read_init(void); // ditto
@@ -133,7 +133,7 @@
 // utils
 volatile aserver_message_t *pulse_get_msgq(pulse_driver_t *); ///< pull last msg from msgq, or return NULL
 
-int64_t pulse_audio_seek_bytes (pulse_driver_t *, int64_t bytes); ///< seek to byte position
+int64_t pulse_audio_seek_bytes(pulse_driver_t *, int64_t bytes);  ///< seek to byte position
 
 int64_t lives_pulse_get_time(pulse_driver_t *, boolean absolute); ///< get time from pa, in 10^-8 seconds
 
@@ -142,7 +142,7 @@
 
 //////////////////////
 
-boolean pulse_audio_seek_frame (pulse_driver_t *, int frame); ///< seek to (video) frame
+boolean pulse_audio_seek_frame(pulse_driver_t *, int frame);  ///< seek to (video) frame
 
 void pulse_get_rec_avals(pulse_driver_t *);

LiVES-2.2.8.tar.bz2/src/resample.c -> LiVES-2.4.1.tar.bz2/src/resample.c Changed

@@ -7,6 +7,7 @@
 
 // functions for reordering, resampling video and audio
 
+
 #ifdef HAVE_SYSTEM_WEED
 #include <weed/weed.h>
 #include <weed/weed-host.h>
@@ -29,25 +30,30 @@
 
 /////////////////////////////////////////////////////
 
-LIVES_INLINE weed_timecode_t q_gint64 (weed_timecode_t in, double fps) {
-  if (in>(weed_timecode_t)0) return ((weed_timecode_t)((long double)in/(long double)U_SEC*(long double)fps+(long double).5)/(long double)fps)*(weed_timecode_t)U_SECL; // quantise to frame timing
-  if (in<(weed_timecode_t)0) return ((weed_timecode_t)((long double)in/(long double)U_SEC*(long double)fps-(long double).5)/(long double)fps)*(weed_timecode_t)U_SECL; // quantise to frame timing
+LIVES_INLINE weed_timecode_t q_gint64(weed_timecode_t in, double fps) {
+  if (in>(weed_timecode_t)0) return ((weed_timecode_t)((long double)in/(long double)U_SEC*(long double)fps+(long double).5)/
+                                       (long double)fps)*(weed_timecode_t)U_SECL; // quantise to frame timing
+  if (in<(weed_timecode_t)0) return ((weed_timecode_t)((long double)in/(long double)U_SEC*(long double)fps-(long double).5)/
+                                       (long double)fps)*(weed_timecode_t)U_SECL; // quantise to frame timing
   return (weed_timecode_t)0;
 }
 
-LIVES_INLINE weed_timecode_t q_gint64_floor (weed_timecode_t in, double fps) {
-  if (in!=(weed_timecode_t)0) return ((weed_timecode_t)((long double)in/(long double)U_SEC*(long double)fps)/(long double)fps)*(weed_timecode_t)U_SECL; // quantise to frame timing
+LIVES_INLINE weed_timecode_t q_gint64_floor(weed_timecode_t in, double fps) {
+  if (in!=(weed_timecode_t)0) return ((weed_timecode_t)((long double)in/(long double)U_SEC*(long double)fps)/(long double)fps)*
+                                       (weed_timecode_t)U_SECL; // quantise to frame timing
   return (weed_timecode_t)0;
 }
 
-LIVES_INLINE weed_timecode_t q_dbl (double in, double fps) {
-  if (in>0.) return ((weed_timecode_t)((long double)in*(long double)fps+(long double).5)/(long double)fps)*(weed_timecode_t)U_SECL; // quantise to frame timing
-  if (in<0.) return ((weed_timecode_t)((long double)in*(long double)fps-(long double).5)/(long double)fps)*(weed_timecode_t)U_SECL; // quantise to frame timing
+LIVES_INLINE weed_timecode_t q_dbl(double in, double fps) {
+  if (in>0.) return ((weed_timecode_t)((long double)in*(long double)fps+(long double).5)/(long double)fps)*
+                      (weed_timecode_t)U_SECL; // quantise to frame timing
+  if (in<0.) return ((weed_timecode_t)((long double)in*(long double)fps-(long double).5)/(long double)fps)*
+                      (weed_timecode_t)U_SECL; // quantise to frame timing
   return (weed_timecode_t)0;
 }
 
 
-LIVES_INLINE int count_resampled_frames (int in_frames, double orig_fps, double resampled_fps) {
+LIVES_INLINE int count_resampled_frames(int in_frames, double orig_fps, double resampled_fps) {
   int res_frames;
   if (resampled_fps<orig_fps) return ((res_frames=(int)((double)in_frames/orig_fps*resampled_fps))<1)?1:res_frames;
   else return ((res_frames=(int)((double)in_frames/orig_fps*resampled_fps+.49999))<1)?1:res_frames;
@@ -55,17 +61,17 @@
 
 /////////////////////////////////////////////////////
 
-boolean auto_resample_resize (int width,int height,double fps,int fps_num,int fps_denom, int arate, 
-			       int asigned, boolean swap_endian) {
+boolean auto_resample_resize(int width,int height,double fps,int fps_num,int fps_denom, int arate,
+                             int asigned, boolean swap_endian) {
   // do a block atomic: resample audio, then resample video/resize or joint resample/resize
 
-  gchar *com,*msg=NULL;
+  char *com,*msg=NULL;
   int current_file=mainw->current_file;
   boolean audio_resampled=FALSE;
   boolean video_resampled=FALSE;
   boolean video_resized=FALSE;
   boolean bad_header=FALSE;
-	  
+
   int frames=cfile->frames;
 
   reorder_leave_back=FALSE;
@@ -84,7 +90,7 @@
       else cfile->undo1_uint|=AFORM_BIG_ENDIAN;
     }
 
-    on_resaudio_ok_clicked (NULL,NULL);
+    on_resaudio_ok_clicked(NULL,NULL);
     if (mainw->error) return FALSE;
     audio_resampled=TRUE;
   }
@@ -105,183 +111,178 @@
     if ((width!=cfile->hsize||height!=cfile->vsize)&&width*height>0) {
       // CHANGING SIZE..
       if (fps>cfile->fps) {
-	boolean rs_builtin;
-	lives_rfx_t *resize_rfx;
-
-	// we will have more frames...
-	// ...do resize first
-	if (mainw->fx_candidates[FX_CANDIDATE_RESIZER].delegate==-1||prefs->enc_letterbox) {
-	  cfile->ohsize=cfile->hsize;
-	  cfile->ovsize=cfile->vsize;
-
-	  if (cfile->clip_type==CLIP_TYPE_FILE) {
-	    cfile->fx_frame_pump=1;
-	  }
-
-	  if (!prefs->enc_letterbox) {
-	    com=g_strdup_printf ("%s resize_all \"%s\" %d %d %d \"%s\"",prefs->backend,
-				 cfile->handle,cfile->frames,width,height,
-				 get_image_ext_for_type(cfile->img_type));
-	    msg=g_strdup_printf(_("Resizing frames 1 to %d"),cfile->frames);
-	  }
-	  else {
-	    int iwidth=cfile->hsize,iheight=cfile->vsize;
-	    calc_maxspect(width,height,&iwidth,&iheight);
-
-	    if (iwidth==cfile->hsize&&iheight==cfile->vsize) {
-	      iwidth=-iwidth;
-	      iheight=-iheight;
-	    }
-
-	    reorder_leave_back=TRUE;
-	    com=g_strdup_printf ("%s resize_all \"%s\" %d %d %d \"%s\" %d %d",prefs->backend,cfile->handle,
-				 cfile->frames,width,height,
-				 get_image_ext_for_type(cfile->img_type),iwidth,iheight);
-	    msg=g_strdup_printf(_("Resizing/letterboxing frames 1 to %d"),cfile->frames);
-	  }
-
-	  cfile->progress_start=1;
-	  cfile->progress_end=cfile->frames;
-	  
-	  unlink(cfile->info_file);
-	  mainw->com_failed=FALSE;
-	  lives_system(com,FALSE);
-	  g_free (com);
-	  
-	  if (mainw->com_failed) return FALSE;
-
-	  mainw->resizing=TRUE;
-	  rs_builtin=TRUE;
-	}
-	else {
-	  // use resize plugin
-	  int error;
-	  weed_plant_t *first_out;
-	  weed_plant_t *ctmpl;
-
-	  rs_builtin=FALSE;
-	  resize_rfx=mainw->fx_candidates[FX_CANDIDATE_RESIZER].rfx;
-	  first_out=get_enabled_channel((weed_plant_t *)resize_rfx->source,0,FALSE);
-	  ctmpl=weed_get_plantptr_value(first_out,"template",&error);
-	  weed_set_int_value(ctmpl,"host_width",width);
-	  weed_set_int_value(ctmpl,"host_height",height);
-	}
-	
-	cfile->nokeep=TRUE;
-
-	if ((rs_builtin&&!do_progress_dialog(TRUE,TRUE,msg))||(!rs_builtin&&!on_realfx_activate_inner(1,resize_rfx))) {
-	  mainw->resizing=FALSE;
-	  g_free(msg);
-	  cfile->undo_action=UNDO_ATOMIC_RESAMPLE_RESIZE;
-
-	  cfile->hsize=width;
-	  cfile->vsize=height;
-	  
-	  cfile->undo1_dbl=cfile->fps;
-	  cfile->undo_start=1;
-	  cfile->undo_end=cfile->frames;
-	  cfile->fx_frame_pump=0;
-	  on_undo_activate(NULL,NULL);
-	  cfile->nokeep=FALSE;
-	  return FALSE;
-	}
-	g_free(msg);
-	    
-	mainw->resizing=FALSE;
-	cfile->fx_frame_pump=0;
-
-	cfile->hsize=width;
-	cfile->vsize=height;
-	
-	save_clip_value(mainw->current_file,CLIP_DETAILS_WIDTH,&cfile->hsize);
-	if (mainw->com_failed||mainw->write_failed) bad_header=TRUE;
-	save_clip_value(mainw->current_file,CLIP_DETAILS_HEIGHT,&cfile->vsize);
-	if (mainw->com_failed||mainw->write_failed) bad_header=TRUE;
-	if (bad_header) do_header_write_error(mainw->current_file);
-
-	cfile->undo1_dbl=fps;
-	cfile->undo_start=1;
-	cfile->undo_end=frames;
-
-	// now resample
-
-	// special "cheat" mode for LiVES
-	reorder_leave_back=TRUE;
-
-	reorder_width=width;
-	reorder_height=height;
-
-	mainw->resizing=TRUE;
-	on_resample_vid_ok (NULL,NULL);
-
-	reorder_leave_back=FALSE;
-	cfile->undo_action=UNDO_ATOMIC_RESAMPLE_RESIZE;
-	if (mainw->error) {
-	  on_undo_activate(NULL,NULL);
-	  return FALSE;
-	}
-
-	video_resized=TRUE;
-	video_resampled=TRUE;
+        boolean rs_builtin;
+        lives_rfx_t *resize_rfx;
+
+        // we will have more frames...
+        // ...do resize first
+        if (mainw->fx_candidates[FX_CANDIDATE_RESIZER].delegate==-1||prefs->enc_letterbox) {
+          cfile->ohsize=cfile->hsize;
+          cfile->ovsize=cfile->vsize;
+
+          if (cfile->clip_type==CLIP_TYPE_FILE) {
+            cfile->fx_frame_pump=1;
+          }
+
+          if (!prefs->enc_letterbox) {
+            com=lives_strdup_printf("%s resize_all \"%s\" %d %d %d \"%s\"",prefs->backend,
+                                    cfile->handle,cfile->frames,width,height,
+                                    get_image_ext_for_type(cfile->img_type));
+            msg=lives_strdup_printf(_("Resizing frames 1 to %d"),cfile->frames);
+          } else {
+            int iwidth=cfile->hsize,iheight=cfile->vsize;
+            calc_maxspect(width,height,&iwidth,&iheight);
+
+            if (iwidth==cfile->hsize&&iheight==cfile->vsize) {
+              iwidth=-iwidth;
+              iheight=-iheight;
+            }
+
+            reorder_leave_back=TRUE;
+            com=lives_strdup_printf("%s resize_all \"%s\" %d %d %d \"%s\" %d %d",prefs->backend,cfile->handle,
+                                    cfile->frames,width,height,
+                                    get_image_ext_for_type(cfile->img_type),iwidth,iheight);
+            msg=lives_strdup_printf(_("Resizing/letterboxing frames 1 to %d"),cfile->frames);
+          }
+
+          cfile->progress_start=1;
+          cfile->progress_end=cfile->frames;
+
+          unlink(cfile->info_file);
+          mainw->com_failed=FALSE;
+          lives_system(com,FALSE);
+          lives_free(com);
+
+          if (mainw->com_failed) return FALSE;
+
+          mainw->resizing=TRUE;
+          rs_builtin=TRUE;
+        } else {
+          // use resize plugin
+          int error;
+          weed_plant_t *first_out;
+          weed_plant_t *ctmpl;
+
+          rs_builtin=FALSE;
+          resize_rfx=mainw->fx_candidates[FX_CANDIDATE_RESIZER].rfx;
+          first_out=get_enabled_channel((weed_plant_t *)resize_rfx->source,0,FALSE);
+          ctmpl=weed_get_plantptr_value(first_out,"template",&error);
+          weed_set_int_value(ctmpl,"host_width",width);
+          weed_set_int_value(ctmpl,"host_height",height);
+        }
+
+        cfile->nokeep=TRUE;
+
+        if ((rs_builtin&&!do_progress_dialog(TRUE,TRUE,msg))||(!rs_builtin&&!on_realfx_activate_inner(1,resize_rfx))) {
+          mainw->resizing=FALSE;
+          lives_free(msg);
+          cfile->undo_action=UNDO_ATOMIC_RESAMPLE_RESIZE;
+
+          cfile->hsize=width;
+          cfile->vsize=height;
+
+          cfile->undo1_dbl=cfile->fps;
+          cfile->undo_start=1;
+          cfile->undo_end=cfile->frames;
+          cfile->fx_frame_pump=0;
+          on_undo_activate(NULL,NULL);
+          cfile->nokeep=FALSE;
+          return FALSE;
+        }
+        lives_free(msg);
+
+        mainw->resizing=FALSE;
+        cfile->fx_frame_pump=0;
+
+        cfile->hsize=width;
+        cfile->vsize=height;
+
+        save_clip_value(mainw->current_file,CLIP_DETAILS_WIDTH,&cfile->hsize);
+        if (mainw->com_failed||mainw->write_failed) bad_header=TRUE;
+        save_clip_value(mainw->current_file,CLIP_DETAILS_HEIGHT,&cfile->vsize);
+        if (mainw->com_failed||mainw->write_failed) bad_header=TRUE;
+        if (bad_header) do_header_write_error(mainw->current_file);
+
+        cfile->undo1_dbl=fps;
+        cfile->undo_start=1;
+        cfile->undo_end=frames;
+
+        // now resample
+
+        // special "cheat" mode for LiVES
+        reorder_leave_back=TRUE;
+
+        reorder_width=width;
+        reorder_height=height;
+
+        mainw->resizing=TRUE;
+        on_resample_vid_ok(NULL,NULL);
+
+        reorder_leave_back=FALSE;
+        cfile->undo_action=UNDO_ATOMIC_RESAMPLE_RESIZE;
+        if (mainw->error) {
+          on_undo_activate(NULL,NULL);
+          return FALSE;
+        }
+
+        video_resized=TRUE;
+        video_resampled=TRUE;
+      } else {
+        // fewer frames
+        // do resample *with* resize
+        cfile->ohsize=cfile->hsize;
+        cfile->ovsize=cfile->vsize;
+        cfile->undo1_dbl=fps;
+
+        // another special "cheat" mode for LiVES
+        reorder_width=width;
+        reorder_height=height;
+
+        mainw->resizing=TRUE;
+        on_resample_vid_ok(NULL,NULL);
+        mainw->resizing=FALSE;
+
+        reorder_width=reorder_height=0;
+        cfile->undo_action=UNDO_ATOMIC_RESAMPLE_RESIZE;
+        cfile->hsize=width;
+        cfile->vsize=height;
+
+        if (mainw->error) {
+          on_undo_activate(NULL,NULL);
+          return FALSE;
+        }
+        save_clip_value(mainw->current_file,CLIP_DETAILS_WIDTH,&cfile->hsize);
+        if (mainw->com_failed||mainw->write_failed) bad_header=TRUE;
+        save_clip_value(mainw->current_file,CLIP_DETAILS_HEIGHT,&cfile->vsize);
+        if (mainw->com_failed||mainw->write_failed) bad_header=TRUE;
+        if (bad_header) do_header_write_error(mainw->current_file);
+
+        video_resampled=TRUE;
+        video_resized=TRUE;
       }
-      else {
-	// fewer frames
-	// do resample *with* resize
-	cfile->ohsize=cfile->hsize;
-	cfile->ovsize=cfile->vsize;
-	cfile->undo1_dbl=fps;
-
-	// another special "cheat" mode for LiVES
-	reorder_width=width;
-	reorder_height=height;
-
-	mainw->resizing=TRUE;
-	on_resample_vid_ok (NULL,NULL);
-	mainw->resizing=FALSE;
-
-	reorder_width=reorder_height=0;
-	cfile->undo_action=UNDO_ATOMIC_RESAMPLE_RESIZE;
-	cfile->hsize=width;
-	cfile->vsize=height;
-
-	if (mainw->error) {
-	  on_undo_activate(NULL,NULL);
-	  return FALSE;
-	}
-	save_clip_value(mainw->current_file,CLIP_DETAILS_WIDTH,&cfile->hsize);
-	if (mainw->com_failed||mainw->write_failed) bad_header=TRUE;
-	save_clip_value(mainw->current_file,CLIP_DETAILS_HEIGHT,&cfile->vsize);
-	if (mainw->com_failed||mainw->write_failed) bad_header=TRUE;
-	if (bad_header) do_header_write_error(mainw->current_file);
-
-       	video_resampled=TRUE;
-	video_resized=TRUE;
-      }
-    }
-    else {
+    } else {
       //////////////////////////////////////////////////////////////////////////////////
       cfile->undo1_dbl=fps;
       cfile->undo_start=1;
       cfile->undo_end=cfile->frames;
-      
+
       reorder_width=width;
       reorder_height=height;
 
-      on_resample_vid_ok (NULL,NULL);
-      
+      on_resample_vid_ok(NULL,NULL);
+
       reorder_width=reorder_height=0;
       reorder_leave_back=FALSE;
 
       if (audio_resampled) cfile->undo_action=UNDO_ATOMIC_RESAMPLE_RESIZE;
       if (mainw->error) {
-	on_undo_activate(NULL,NULL);
-	return FALSE;
+        on_undo_activate(NULL,NULL);
+        return FALSE;
       }
       //////////////////////////////////////////////////////////////////////////////////////
       video_resampled=TRUE;
     }
-  }
-  else {
+  } else {
     boolean rs_builtin=TRUE;
     lives_rfx_t *resize_rfx;
     // NO FPS CHANGE
@@ -291,85 +292,83 @@
       cfile->undo_end=cfile->frames;
 
       if (mainw->fx_candidates[FX_CANDIDATE_RESIZER].delegate==-1||prefs->enc_letterbox) {
-	// use builtin resize
-
-	if (cfile->clip_type==CLIP_TYPE_FILE) {
-	  cfile->fx_frame_pump=1;
-	}
-
-	if (!prefs->enc_letterbox) {
-	  com=g_strdup_printf ("%s resize_all \"%s\" %d %d %d \"%s\"",prefs->backend,
-			       cfile->handle,cfile->frames,width,height,
-			       get_image_ext_for_type(cfile->img_type));
-	  msg=g_strdup_printf(_("Resizing frames 1 to %d"),cfile->frames);
-	}
-	else {
-	  int iwidth=cfile->hsize,iheight=cfile->vsize;
-	  calc_maxspect(width,height,&iwidth,&iheight);
-
-	  if (iwidth==cfile->hsize&&iheight==cfile->vsize) {
-	    iwidth=-iwidth;
-	    iheight=-iheight;
-	  }
-
-	  com=g_strdup_printf ("%s resize_all \"%s\" %d %d %d \"%s\" %d %d",prefs->backend,
-			       cfile->handle,cfile->frames,width,height,
-			       get_image_ext_for_type(cfile->img_type),iwidth,iheight);
-	  msg=g_strdup_printf(_("Resizing/letterboxing frames 1 to %d"),cfile->frames);
-	}
-
-	cfile->progress_start=1;
-	cfile->progress_end=cfile->frames;
-	
-	cfile->ohsize=cfile->hsize;
-	cfile->ovsize=cfile->vsize;
-	
-	cfile->undo1_dbl=cfile->fps;
-	
-	unlink(cfile->info_file);
-	mainw->com_failed=FALSE;
-	lives_system(com,FALSE);
-	g_free (com);
-	
-	if (mainw->com_failed) return FALSE;
-
-	mainw->resizing=TRUE;
-      }
-      else {
-	int error;
-	weed_plant_t *first_out;
-	weed_plant_t *ctmpl;
-	
-	rs_builtin=FALSE;
-	resize_rfx=mainw->fx_candidates[FX_CANDIDATE_RESIZER].rfx;
-	first_out=get_enabled_channel((weed_plant_t *)resize_rfx->source,0,FALSE);
-	ctmpl=weed_get_plantptr_value(first_out,"template",&error);
-	weed_set_int_value(ctmpl,"host_width",width);
-	weed_set_int_value(ctmpl,"host_height",height);
+        // use builtin resize
+
+        if (cfile->clip_type==CLIP_TYPE_FILE) {
+          cfile->fx_frame_pump=1;
+        }
+
+        if (!prefs->enc_letterbox) {
+          com=lives_strdup_printf("%s resize_all \"%s\" %d %d %d \"%s\"",prefs->backend,
+                                  cfile->handle,cfile->frames,width,height,
+                                  get_image_ext_for_type(cfile->img_type));
+          msg=lives_strdup_printf(_("Resizing frames 1 to %d"),cfile->frames);
+        } else {
+          int iwidth=cfile->hsize,iheight=cfile->vsize;
+          calc_maxspect(width,height,&iwidth,&iheight);
+
+          if (iwidth==cfile->hsize&&iheight==cfile->vsize) {
+            iwidth=-iwidth;
+            iheight=-iheight;
+          }
+
+          com=lives_strdup_printf("%s resize_all \"%s\" %d %d %d \"%s\" %d %d",prefs->backend,
+                                  cfile->handle,cfile->frames,width,height,
+                                  get_image_ext_for_type(cfile->img_type),iwidth,iheight);
+          msg=lives_strdup_printf(_("Resizing/letterboxing frames 1 to %d"),cfile->frames);
+        }
+
+        cfile->progress_start=1;
+        cfile->progress_end=cfile->frames;
+
+        cfile->ohsize=cfile->hsize;
+        cfile->ovsize=cfile->vsize;
+
+        cfile->undo1_dbl=cfile->fps;
+
+        unlink(cfile->info_file);
+        mainw->com_failed=FALSE;
+        lives_system(com,FALSE);
+        lives_free(com);
+
+        if (mainw->com_failed) return FALSE;
+
+        mainw->resizing=TRUE;
+      } else {
+        int error;
+        weed_plant_t *first_out;
+        weed_plant_t *ctmpl;
+
+        rs_builtin=FALSE;
+        resize_rfx=mainw->fx_candidates[FX_CANDIDATE_RESIZER].rfx;
+        first_out=get_enabled_channel((weed_plant_t *)resize_rfx->source,0,FALSE);
+        ctmpl=weed_get_plantptr_value(first_out,"template",&error);
+        weed_set_int_value(ctmpl,"host_width",width);
+        weed_set_int_value(ctmpl,"host_height",height);
       }
 
       cfile->nokeep=TRUE;
 
       if ((rs_builtin&&!do_progress_dialog(TRUE,TRUE,msg))||(!rs_builtin&&!on_realfx_activate_inner(1,resize_rfx))) {
-	mainw->resizing=FALSE;
-	if (msg!=NULL) g_free(msg);
-	cfile->hsize=width;
-	cfile->vsize=height;
-	if (audio_resampled) cfile->undo_action=UNDO_ATOMIC_RESAMPLE_RESIZE;
-	else {
-	  cfile->undo_action=UNDO_RESIZABLE;
-	  set_undoable (_ ("Resize"),TRUE);
-	}
-	cfile->fx_frame_pump=0;
-	on_undo_activate (NULL,NULL);
-	cfile->nokeep=FALSE;
-	return FALSE;
+        mainw->resizing=FALSE;
+        if (msg!=NULL) lives_free(msg);
+        cfile->hsize=width;
+        cfile->vsize=height;
+        if (audio_resampled) cfile->undo_action=UNDO_ATOMIC_RESAMPLE_RESIZE;
+        else {
+          cfile->undo_action=UNDO_RESIZABLE;
+          set_undoable(_("Resize"),TRUE);
+        }
+        cfile->fx_frame_pump=0;
+        on_undo_activate(NULL,NULL);
+        cfile->nokeep=FALSE;
+        return FALSE;
       }
 
       cfile->hsize=width;
       cfile->vsize=height;
 
-      g_free(msg);
+      lives_free(msg);
       mainw->resizing=FALSE;
       cfile->fx_frame_pump=0;
 
@@ -381,18 +380,18 @@
 
       if (audio_resampled) cfile->undo_action=UNDO_ATOMIC_RESAMPLE_RESIZE;
       else {
-	cfile->undo_action=UNDO_RESIZABLE;
-	set_undoable (_ ("Resize"),TRUE);
+        cfile->undo_action=UNDO_RESIZABLE;
+        set_undoable(_("Resize"),TRUE);
       }
       video_resized=TRUE;
-      switch_to_file ((mainw->current_file=0),current_file);
+      switch_to_file((mainw->current_file=0),current_file);
     }
   }
 
   if (cfile->undo_action==UNDO_ATOMIC_RESAMPLE_RESIZE) {
     // just in case we missed anything...
-    
-    set_undoable (_ ("Resample/Resize"),TRUE);
+
+    set_undoable(_("Resample/Resize"),TRUE);
     if (!video_resized) {
       cfile->ohsize=cfile->hsize;
       cfile->ovsize=cfile->vsize;
@@ -410,7 +409,7 @@
 //////////////////////////////////////////////////////////////////
 
 WARN_UNUSED weed_plant_t *
-quantise_events (weed_plant_t *in_list, double qfps, boolean allow_gap) { 
+quantise_events(weed_plant_t *in_list, double qfps, boolean allow_gap) {
   // new style event system, now we quantise from event_list_t *in_list to *out_list with period tl/U_SEC
 
   // the timecode of the midpoint of our last frame events will match as near as possible the old length
@@ -445,16 +444,15 @@
 
   last_frame_event=get_last_frame_event(in_list);
 
-  tc_end=get_event_timecode (last_frame_event);
+  tc_end=get_event_timecode(last_frame_event);
 
   penultimate_frame_event=get_prev_frame_event(last_frame_event);
 
   // tp is the duration of the last frame
   if (penultimate_frame_event!=NULL) {
-    tp=get_event_timecode (penultimate_frame_event);
+    tp=get_event_timecode(penultimate_frame_event);
     tp=tc_end-tp;
-  }
-  else {
+  } else {
     // only one event, use cfile->fps
     tp=(weed_timecode_t)(U_SEC/cfile->fps);
   }
@@ -475,12 +473,12 @@
   while ((out_tc+tl)<=tc_end) {
     // walk list of in events
 
-    while (event!=NULL&&get_event_hint(event)!=WEED_EVENT_HINT_FRAME) {
+    while (event!=NULL&&!WEED_EVENT_IS_FRAME(event)) {
       // copy non-FRAME events
-      if (event_copy_and_insert (event,out_list)==NULL) {
-	do_memory_error_dialog();
-	event_list_free(out_list);
-	return NULL;
+      if (event_copy_and_insert(event,out_list)==NULL) {
+        do_memory_error_dialog();
+        event_list_free(out_list);
+        return NULL;
       }
       is_first=FALSE;
       event=get_next_event(event);
@@ -488,23 +486,22 @@
 
     // now we are dealing with a FRAME event
     if (event!=NULL) {
-      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 (last_audio_event!=event&&WEED_EVENT_IS_AUDIO_FRAME(event)) {
+        last_audio_event=event;
+        needs_audio=TRUE;
+        if (aclips!=NULL) lives_free(aclips);
+        if (aseeks!=NULL) lives_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);
       }
-      in_tc=get_event_timecode (event);
+      in_tc=get_event_timecode(event);
       if ((next_frame_event=get_next_frame_event(event))!=NULL) {
-	tp=get_event_timecode (next_frame_event);
-	tp-=in_tc;
-      }
-      else {
-	// only one event, use cfile->fps
-	tp=(weed_timecode_t)(U_SEC/cfile->fps);
+        tp=get_event_timecode(next_frame_event);
+        tp-=in_tc;
+      } else {
+        // only one event, use cfile->fps
+        tp=(weed_timecode_t)(U_SEC/cfile->fps);
       }
 #ifdef RESAMPLE_USE_MIDPOINTS
       // calc mid-point of in frame
@@ -516,61 +513,60 @@
 
     if (in_tc<=(out_tc+tl)&&event!=NULL) {
       // event is before slot, note it and get next event
-      if (out_clips!=NULL) weed_free(out_clips);
-      if (out_frames!=NULL) weed_free(out_frames);
+      if (out_clips!=NULL) lives_free(out_clips);
+      if (out_frames!=NULL) lives_free(out_frames);
 
       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);
-	return NULL;
+        do_memory_error_dialog();
+        event_list_free(out_list);
+        return NULL;
       }
 
       nearest_tc=(out_tc+tl)-in_tc;
       if (event!=NULL) event=get_next_event(event);
       allow_gap=FALSE;
-    }   
-    else {
+    } else {
       // event is after slot, or we reached the end of in_list
-      
+
       //  in some cases we allow a gap before writing our first FRAME out event
       if (!(is_first&&allow_gap)) {
-	if (in_tc-(out_tc+tl)<nearest_tc) {
-	  if (event!=NULL) {
-	    if (out_clips!=NULL) weed_free(out_clips);
-	    if (out_frames!=NULL) weed_free(out_frames);
-
-	    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);
-	      return NULL;
-	    }
-	  }
-	}
-	if (out_clips!=NULL) {
-	  if (insert_frame_event_at (out_list,out_tc,numframes,out_clips,out_frames,&shortcut)==NULL) {
-	    do_memory_error_dialog();
-	    event_list_free(out_list);
-	    return NULL;
-	  }
-	  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=add_audio=FALSE;
-	  }
-	  nearest_tc=LONG_MAX;
-	  if (is_first) {
-	    weed_set_voidptr_value(out_list,"first",get_last_event(out_list));
-	    is_first=FALSE;
-	  }
-	}
+        if (in_tc-(out_tc+tl)<nearest_tc) {
+          if (event!=NULL) {
+            if (out_clips!=NULL) lives_free(out_clips);
+            if (out_frames!=NULL) lives_free(out_frames);
+
+            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);
+              return NULL;
+            }
+          }
+        }
+        if (out_clips!=NULL) {
+          if (insert_frame_event_at(out_list,out_tc,numframes,out_clips,out_frames,&shortcut)==NULL) {
+            do_memory_error_dialog();
+            event_list_free(out_list);
+            return NULL;
+          }
+          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=add_audio=FALSE;
+          }
+          nearest_tc=LONG_MAX;
+          if (is_first) {
+            weed_set_voidptr_value(out_list,"first",get_last_event(out_list));
+            is_first=FALSE;
+          }
+        }
       }
 #ifdef RESAMPLE_USE_MIDPOINTS
       out_tc+=tl*2;
@@ -581,44 +577,44 @@
     }
   }
 
-  if (event!=NULL&&get_event_hint(event)==WEED_EVENT_HINT_FRAME) event=get_next_event(event);
+  if (event!=NULL&&WEED_EVENT_IS_FRAME(event)) event=get_next_event(event);
 
-  while (event!=NULL&&get_event_hint(event)!=WEED_EVENT_HINT_FRAME) {
+  while (event!=NULL&&!WEED_EVENT_IS_FRAME(event)) {
     // copy remaining non-FRAME events
-    if (event_copy_and_insert (event,out_list)==NULL) {
+    if (event_copy_and_insert(event,out_list)==NULL) {
       do_memory_error_dialog();
       event_list_free(out_list);
       return NULL;
     }
     event=get_next_event(event);
   }
-  
+
   if (get_first_frame_event(out_list)==NULL) {
     // make sure we have at least one frame
     if ((event=get_last_frame_event(in_list))!=NULL) {
 
-      if (out_clips!=NULL) weed_free(out_clips);
-      if (out_frames!=NULL) weed_free(out_frames);
-    
+      if (out_clips!=NULL) lives_free(out_clips);
+      if (out_frames!=NULL) lives_free(out_frames);
+
       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 (insert_frame_event_at (out_list,0.,numframes,out_clips,out_frames,NULL)==NULL) {
-	do_memory_error_dialog();
-	event_list_free(out_list);
-	return NULL;
+      if (insert_frame_event_at(out_list,0.,numframes,out_clips,out_frames,NULL)==NULL) {
+        do_memory_error_dialog();
+        event_list_free(out_list);
+        return NULL;
       }
       if (get_first_event(out_list)==NULL) weed_set_voidptr_value(out_list,"first",get_last_event(out_list));
     }
   }
-  
-  if (out_clips!=NULL) weed_free(out_clips);
-  if (out_frames!=NULL) weed_free(out_frames);
 
-  if (aclips!=NULL) weed_free(aclips);
-  if (aseeks!=NULL) weed_free(aseeks);
-  
+  if (out_clips!=NULL) lives_free(out_clips);
+  if (out_frames!=NULL) lives_free(out_frames);
+
+  if (aclips!=NULL) lives_free(aclips);
+  if (aseeks!=NULL) lives_free(aseeks);
+
   return out_list;
 }
 
@@ -626,21 +622,21 @@
 //////////////////////////////////////////////////////////////////
 
 
-static void on_reorder_activate (int rwidth, int rheight) {
-  gchar *msg;
+static void on_reorder_activate(int rwidth, int rheight) {
+  char *msg;
   boolean has_lmap_error=FALSE;
 
   if (!(prefs->warning_mask&WARN_MASK_LAYOUT_ALTER_FRAMES)&&(mainw->xlays=layout_frame_is_affected(mainw->current_file,1))!=NULL) {
     if (!do_layout_alter_frames_warning()) {
-      g_list_free_strings(mainw->xlays);
-      g_list_free(mainw->xlays);
+      lives_list_free_strings(mainw->xlays);
+      lives_list_free(mainw->xlays);
       mainw->xlays=NULL;
       return;
     }
-    add_lmap_error(LMAP_ERROR_ALTER_FRAMES,cfile->name,(gpointer)cfile->layout_map,mainw->current_file,0,0.,cfile->stored_layout_frame>0);
+    add_lmap_error(LMAP_ERROR_ALTER_FRAMES,cfile->name,(livespointer)cfile->layout_map,mainw->current_file,0,0.,cfile->stored_layout_frame>0);
     has_lmap_error=TRUE;
-    g_list_free_strings(mainw->xlays);
-    g_list_free(mainw->xlays);
+    lives_list_free_strings(mainw->xlays);
+    lives_list_free(mainw->xlays);
     mainw->xlays=NULL;
   }
 
@@ -651,7 +647,7 @@
   if ((cfile->frames=reorder_frames(rwidth,rheight))<0) {
     // reordering error
     if (!(cfile->undo_action==UNDO_RESAMPLE)) {
-     cfile->frames=-cfile->frames;
+      cfile->frames=-cfile->frames;
     }
     return;
   }
@@ -670,21 +666,20 @@
 
   cfile->event_list=NULL;
   cfile->next_event=NULL;
-  
+
   save_clip_value(mainw->current_file,CLIP_DETAILS_FRAMES,&cfile->frames);
   if (mainw->com_failed||mainw->write_failed) do_header_write_error(mainw->current_file);
 
   switch_to_file(mainw->current_file,mainw->current_file);
   if (mainw->current_file>0) {
     d_print_done();
-    msg=g_strdup_printf(_ ("Length of video is now %d frames.\n"),cfile->frames);
-  }
-  else {
-    msg=g_strdup_printf(_ ("Clipboard was resampled to %d frames.\n"),cfile->frames);
+    msg=lives_strdup_printf(_("Length of video is now %d frames.\n"),cfile->frames);
+  } else {
+    msg=lives_strdup_printf(_("Clipboard was resampled to %d frames.\n"),cfile->frames);
   }
 
   d_print(msg);
-  g_free(msg);
+  lives_free(msg);
 
   if (has_lmap_error) popup_lmap_errors(NULL,NULL);
 
@@ -699,35 +694,32 @@
 
 
 
-void
-on_resample_audio_activate (LiVESMenuItem     *menuitem,
-			    gpointer         user_data)
-{
-   // show the playback rate - real audio rate is cfile->arps
+void on_resample_audio_activate(LiVESMenuItem *menuitem, livespointer user_data) {
+  // show the playback rate - real audio rate is cfile->arps
   mainw->fx1_val=cfile->arate;
   mainw->fx2_val=cfile->achans;
   mainw->fx3_val=cfile->asampsize;
   mainw->fx4_val=cfile->signed_endian;
   resaudw=create_resaudw(1,NULL,NULL);
-  lives_widget_show (resaudw->dialog);
-
+  lives_widget_show(resaudw->dialog);
 }
 
-void
-on_resaudio_ok_clicked                      (LiVESButton *button,
-					     LiVESEntry *entry)
-{
-  gchar *com,*msg;  
+
+
+void on_resaudio_ok_clicked(LiVESButton *button, LiVESEntry *entry) {
+  char *com;
+
+  boolean noswitch=mainw->noswitch;
+  boolean has_lmap_error=FALSE;
+
   int arate,achans,asampsize,arps;
   int asigned=1,aendian=1;
   int cur_signed,cur_endian;
-  boolean noswitch=mainw->noswitch;
-  boolean has_lmap_error=FALSE;
 
   if (button!=NULL) {
-    arps=arate=(int)atoi (lives_entry_get_text(LIVES_ENTRY(resaudw->entry_arate)));
-    achans=(int)atoi (lives_entry_get_text(LIVES_ENTRY(resaudw->entry_achans)));
-    asampsize=(int)atoi (lives_entry_get_text(LIVES_ENTRY(resaudw->entry_asamps)));
+    arps=arate=(int)atoi(lives_entry_get_text(LIVES_ENTRY(resaudw->entry_arate)));
+    achans=(int)atoi(lives_entry_get_text(LIVES_ENTRY(resaudw->entry_achans)));
+    asampsize=(int)atoi(lives_entry_get_text(LIVES_ENTRY(resaudw->entry_asamps)));
     if (lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(resaudw->rb_unsigned))) {
       asigned=0;
     }
@@ -735,18 +727,17 @@
       aendian=0;
     }
 
-    lives_widget_destroy (resaudw->dialog);
+    lives_widget_destroy(resaudw->dialog);
     mainw->noswitch=TRUE;
     lives_widget_context_update();
     mainw->noswitch=noswitch;
-    g_free (resaudw);
-    
+    lives_free(resaudw);
+
     if (arate<=0) {
-      do_error_dialog (_ ("\n\nNew rate must be greater than 0\n"));
+      do_error_dialog(_("\n\nNew rate must be greater than 0\n"));
       return;
     }
-  }
-  else {
+  } else {
     // called from on_redo or other places
     arate=arps=cfile->undo1_int;
     achans=cfile->undo2_int;
@@ -756,18 +747,18 @@
   }
 
   if (!(prefs->warning_mask&WARN_MASK_LAYOUT_ALTER_AUDIO)&&(mainw->xlays=layout_audio_is_affected
-							    (mainw->current_file,0.))) {
+      (mainw->current_file,0.))) {
     if (!do_layout_alter_audio_warning()) {
-      g_list_free_strings(mainw->xlays);
-      g_list_free(mainw->xlays);
+      lives_list_free_strings(mainw->xlays);
+      lives_list_free(mainw->xlays);
       mainw->xlays=NULL;
       return;
     }
-    add_lmap_error(LMAP_ERROR_ALTER_AUDIO,cfile->name,(gpointer)cfile->layout_map,mainw->current_file,0,0.,
-		   cfile->stored_layout_audio>0.);
+    add_lmap_error(LMAP_ERROR_ALTER_AUDIO,cfile->name,(livespointer)cfile->layout_map,mainw->current_file,0,0.,
+                   cfile->stored_layout_audio>0.);
     has_lmap_error=TRUE;
-    g_list_free_strings(mainw->xlays);
-    g_list_free(mainw->xlays);
+    lives_list_free_strings(mainw->xlays);
+    lives_list_free(mainw->xlays);
     mainw->xlays=NULL;
   }
 
@@ -782,36 +773,35 @@
   cur_endian=!(cfile->signed_endian&AFORM_BIG_ENDIAN);
 
   if (!(arate==cfile->arate&&arps==cfile->arps&&achans==cfile->achans&&asampsize==cfile->asampsize&&
-	asigned==cur_signed&&aendian==cur_endian)) {
+        asigned==cur_signed&&aendian==cur_endian)) {
     if (cfile->arps!=cfile->arate) {
       double audio_stretch=(double)cfile->arps/(double)cfile->arate;
-     // pb rate != real rate - stretch to pb rate and resample 
-      unlink (cfile->info_file);
-      com=g_strdup_printf ("%s resample_audio \"%s\" %d %d %d %d %d %d %d %d %d %d %.4f",prefs->backend,
-			   cfile->handle,cfile->arps,
-			   cfile->achans,cfile->asampsize,cur_signed,cur_endian,arps,cfile->achans,cfile->asampsize,
-			   cur_signed,cur_endian,audio_stretch);
+      // pb rate != real rate - stretch to pb rate and resample
+      unlink(cfile->info_file);
+      com=lives_strdup_printf("%s resample_audio \"%s\" %d %d %d %d %d %d %d %d %d %d %.4f",prefs->backend,
+                              cfile->handle,cfile->arps,
+                              cfile->achans,cfile->asampsize,cur_signed,cur_endian,arps,cfile->achans,cfile->asampsize,
+                              cur_signed,cur_endian,audio_stretch);
       mainw->com_failed=FALSE;
-      lives_system (com,FALSE);
+      lives_system(com,FALSE);
       if (mainw->com_failed) return;
-      do_progress_dialog (TRUE,FALSE,_ ("Resampling audio")); // TODO - allow cancel ??
-      g_free (com);
+      do_progress_dialog(TRUE,FALSE,_("Resampling audio"));  // TODO - allow cancel ??
+      lives_free(com);
       cfile->arate=cfile->arps=arps;
-    }
-    else {
-      unlink (cfile->info_file);
-      com=g_strdup_printf ("%s resample_audio \"%s\" %d %d %d %d %d %d %d %d %d %d",prefs->backend,
-			   cfile->handle,cfile->arps,
-			   cfile->achans,cfile->asampsize,cur_signed,cur_endian,arps,achans,asampsize,asigned,aendian);
+    } else {
+      unlink(cfile->info_file);
+      com=lives_strdup_printf("%s resample_audio \"%s\" %d %d %d %d %d %d %d %d %d %d",prefs->backend,
+                              cfile->handle,cfile->arps,
+                              cfile->achans,cfile->asampsize,cur_signed,cur_endian,arps,achans,asampsize,asigned,aendian);
       mainw->com_failed=FALSE;
       mainw->cancelled=CANCEL_NONE;
       mainw->error=FALSE;
       unlink(cfile->info_file);
-      lives_system (com,FALSE);
+      lives_system(com,FALSE);
       check_backend_return(cfile);
       if (mainw->com_failed) return;
-      do_progress_dialog (TRUE,FALSE,_ ("Resampling audio"));
-      g_free (com);
+      do_progress_dialog(TRUE,FALSE,_("Resampling audio"));
+      lives_free(com);
 
     }
   }
@@ -820,7 +810,7 @@
   cfile->achans=achans;
   cfile->asampsize=asampsize;
   cfile->arps=arps;
-  cfile->signed_endian=get_signed_endian (asigned, aendian);
+  cfile->signed_endian=get_signed_endian(asigned, aendian);
   cfile->changed=TRUE;
 
   cfile->undo_action=UNDO_AUDIO_RESAMPLE;
@@ -828,13 +818,13 @@
   reget_afilesize(mainw->current_file);
 
   if (cfile->afilesize==0l) {
-    do_error_dialog (_ ("LiVES was unable to resample the audio as requested.\n"));
-    on_undo_activate (NULL,NULL);
-    set_undoable (_("Resample Audio"),FALSE);
+    do_error_dialog(_("LiVES was unable to resample the audio as requested.\n"));
+    on_undo_activate(NULL,NULL);
+    set_undoable(_("Resample Audio"),FALSE);
     mainw->error=TRUE;
     return;
   }
-  set_undoable (_("Resample Audio"),!prefs->conserve_space);
+  set_undoable(_("Resample Audio"),!prefs->conserve_space);
 
   save_clip_values(mainw->current_file);
 
@@ -842,26 +832,23 @@
 
   d_print("");  // force printing of switch message
 
-  msg=g_strdup_printf (_ ("Audio was resampled to %d Hz, %d channels, %d bit"),arate,achans,asampsize);
-  d_print (msg);
-  g_free (msg);
+  d_print(_("Audio was resampled to %d Hz, %d channels, %d bit"),arate,achans,asampsize);
+
   if (cur_signed!=asigned) {
     if (asigned==1) {
-      d_print (_ (", signed"));
-    }
-    else {
-      d_print (_ (", unsigned"));
+      d_print(_(", signed"));
+    } else {
+      d_print(_(", unsigned"));
     }
   }
   if (cur_endian!=aendian) {
     if (aendian==1) {
-      d_print (_ (", little-endian"));
-    }
-    else {
-      d_print (_ (", big-endian"));
+      d_print(_(", little-endian"));
+    } else {
+      d_print(_(", big-endian"));
     }
   }
-  d_print ("\n");
+  d_print("\n");
   if (has_lmap_error) popup_lmap_errors(NULL,NULL);
 
   if (mainw->sl_undo_mem!=NULL&&cfile->stored_layout_audio>0.) {
@@ -874,51 +861,49 @@
 
 
 
-static void on_resaudw_achans_changed (LiVESWidget *widg, gpointer user_data) {
+static void on_resaudw_achans_changed(LiVESWidget *widg, livespointer user_data) {
   _resaudw *resaudw=(_resaudw *)user_data;
-  gchar *tmp;
+  char *tmp;
 
   if (!lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(widg))) {
-    lives_widget_set_sensitive (resaudw->rb_signed,FALSE);
-    lives_widget_set_sensitive (resaudw->rb_unsigned,FALSE);
-    lives_widget_set_sensitive (resaudw->rb_bigend,FALSE);
-    lives_widget_set_sensitive (resaudw->rb_littleend,FALSE);
-    lives_widget_set_sensitive (resaudw->entry_arate,FALSE);
-    lives_widget_set_sensitive (resaudw->entry_asamps,FALSE);
-    lives_widget_set_sensitive (resaudw->entry_achans,FALSE);
+    lives_widget_set_sensitive(resaudw->rb_signed,FALSE);
+    lives_widget_set_sensitive(resaudw->rb_unsigned,FALSE);
+    lives_widget_set_sensitive(resaudw->rb_bigend,FALSE);
+    lives_widget_set_sensitive(resaudw->rb_littleend,FALSE);
+    lives_widget_set_sensitive(resaudw->entry_arate,FALSE);
+    lives_widget_set_sensitive(resaudw->entry_asamps,FALSE);
+    lives_widget_set_sensitive(resaudw->entry_achans,FALSE);
     if (prefsw!=NULL) {
-      lives_widget_set_sensitive (prefsw->pertrack_checkbutton,FALSE);
-      lives_widget_set_sensitive (prefsw->backaudio_checkbutton,FALSE);
-      lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON(prefsw->pertrack_checkbutton),FALSE);
-      lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON(prefsw->backaudio_checkbutton),FALSE);
-    }
-    else if (rdet!=NULL) {
-      lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON(rdet->pertrack_checkbutton),FALSE);
-      lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON(rdet->backaudio_checkbutton),FALSE);
+      lives_widget_set_sensitive(prefsw->pertrack_checkbutton,FALSE);
+      lives_widget_set_sensitive(prefsw->backaudio_checkbutton,FALSE);
+      lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->pertrack_checkbutton),FALSE);
+      lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(prefsw->backaudio_checkbutton),FALSE);
+    } else if (rdet!=NULL) {
+      lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(rdet->pertrack_checkbutton),FALSE);
+      lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(rdet->backaudio_checkbutton),FALSE);
       lives_widget_set_sensitive(rdet->pertrack_checkbutton,FALSE);
       lives_widget_set_sensitive(rdet->backaudio_checkbutton,FALSE);
     }
-  }
-  else {
-    if (atoi (lives_entry_get_text (LIVES_ENTRY (resaudw->entry_asamps)))!=8) {
-      lives_widget_set_sensitive (resaudw->rb_bigend,TRUE);
-      lives_widget_set_sensitive (resaudw->rb_littleend,TRUE);
+  } else {
+    if (atoi(lives_entry_get_text(LIVES_ENTRY(resaudw->entry_asamps)))!=8) {
+      lives_widget_set_sensitive(resaudw->rb_bigend,TRUE);
+      lives_widget_set_sensitive(resaudw->rb_littleend,TRUE);
     }
-    lives_widget_set_sensitive (resaudw->entry_arate,TRUE);
-    lives_widget_set_sensitive (resaudw->entry_asamps,TRUE);
-    lives_widget_set_sensitive (resaudw->entry_achans,TRUE);
+    lives_widget_set_sensitive(resaudw->entry_arate,TRUE);
+    lives_widget_set_sensitive(resaudw->entry_asamps,TRUE);
+    lives_widget_set_sensitive(resaudw->entry_achans,TRUE);
     if (prefsw!=NULL) {
-      lives_widget_set_sensitive (prefsw->pertrack_checkbutton,TRUE);
-      lives_widget_set_sensitive (prefsw->backaudio_checkbutton,TRUE);
+      lives_widget_set_sensitive(prefsw->pertrack_checkbutton,TRUE);
+      lives_widget_set_sensitive(prefsw->backaudio_checkbutton,TRUE);
     }
     if (rdet!=NULL) {
       lives_widget_set_sensitive(rdet->backaudio_checkbutton,TRUE);
       lives_widget_set_sensitive(rdet->pertrack_checkbutton,TRUE);
     }
 
-    tmp=g_strdup_printf ("%d",DEFAULT_AUDIO_CHANS);
-    lives_entry_set_text (LIVES_ENTRY (resaudw->entry_achans),tmp);
-    g_free (tmp);
+    tmp=lives_strdup_printf("%d",DEFAULT_AUDIO_CHANS);
+    lives_entry_set_text(LIVES_ENTRY(resaudw->entry_achans),tmp);
+    lives_free(tmp);
 
   }
 }
@@ -926,21 +911,20 @@
 
 
 
-void 
-on_resaudw_asamps_changed (LiVESWidget *irrelevant, gpointer rubbish) {
-  if (atoi (lives_entry_get_text (LIVES_ENTRY (resaudw->entry_asamps)))==8) {
-    lives_widget_set_sensitive (resaudw->rb_bigend,FALSE);
-    lives_widget_set_sensitive (resaudw->rb_littleend,FALSE);
-    lives_widget_set_sensitive (resaudw->rb_signed,FALSE);
-    lives_widget_set_sensitive (resaudw->rb_unsigned,TRUE);
+void
+on_resaudw_asamps_changed(LiVESWidget *irrelevant, livespointer rubbish) {
+  if (atoi(lives_entry_get_text(LIVES_ENTRY(resaudw->entry_asamps)))==8) {
+    lives_widget_set_sensitive(resaudw->rb_bigend,FALSE);
+    lives_widget_set_sensitive(resaudw->rb_littleend,FALSE);
+    lives_widget_set_sensitive(resaudw->rb_signed,FALSE);
+    lives_widget_set_sensitive(resaudw->rb_unsigned,TRUE);
     lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(resaudw->rb_unsigned),TRUE);
-  }
-  else {
-    lives_widget_set_sensitive (resaudw->rb_bigend,TRUE);
-    lives_widget_set_sensitive (resaudw->rb_littleend,TRUE);
-    if (atoi (lives_entry_get_text (LIVES_ENTRY (resaudw->entry_asamps)))==16) {
-      lives_widget_set_sensitive (resaudw->rb_signed,TRUE);
-      lives_widget_set_sensitive (resaudw->rb_unsigned,FALSE);
+  } else {
+    lives_widget_set_sensitive(resaudw->rb_bigend,TRUE);
+    lives_widget_set_sensitive(resaudw->rb_littleend,TRUE);
+    if (atoi(lives_entry_get_text(LIVES_ENTRY(resaudw->entry_asamps)))==16) {
+      lives_widget_set_sensitive(resaudw->rb_signed,TRUE);
+      lives_widget_set_sensitive(resaudw->rb_unsigned,FALSE);
       lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(resaudw->rb_signed),TRUE);
     }
   }
@@ -949,9 +933,8 @@
 
 
 void
-on_resample_video_activate (LiVESMenuItem     *menuitem,
-			    gpointer         user_data)
-{
+on_resample_video_activate(LiVESMenuItem     *menuitem,
+                           livespointer         user_data) {
   // change speed from the menu
   create_new_pb_speed(2);
   mainw->fx1_val=cfile->fps;
@@ -959,13 +942,13 @@
 
 
 
-void on_resample_vid_ok (LiVESButton *button, LiVESEntry *entry) {
+void on_resample_vid_ok(LiVESButton *button, LiVESEntry *entry) {
   int i;
   int old_frames;
   int ostart=cfile->start;
   int oend=cfile->end;
   double oundo1_dbl=cfile->undo1_dbl;
-  gchar *msg;
+  char *msg;
   weed_timecode_t in_time=0;
   double old_fps=cfile->fps;
   boolean ratio_fps;
@@ -978,8 +961,7 @@
   if (button!=NULL) {
     lives_general_button_clicked(button,NULL);
     if (mainw->fx1_val==0.) mainw->fx1_val=1.;
-  }
-  else {
+  } else {
     mainw->fx1_val=cfile->undo1_dbl;
   }
 
@@ -990,11 +972,11 @@
   real_back_list=cfile->event_list;
 
   if (cfile->event_list==NULL) {
-    for (i=1;i<=cfile->frames;i++) {
-      new_event_list=append_frame_event (new_event_list,in_time,1,&(mainw->current_file),&i);
+    for (i=1; i<=cfile->frames; i++) {
+      new_event_list=append_frame_event(new_event_list,in_time,1,&(mainw->current_file),&i);
       if (new_event_list==NULL) {
-	do_memory_error_dialog();
-	return;
+        do_memory_error_dialog();
+        return;
       }
       in_time+=(weed_timecode_t)(1./cfile->fps*U_SEC+.5);
     }
@@ -1002,7 +984,7 @@
   }
   cfile->undo1_dbl=cfile->fps;
 
-  if (cfile->event_list_back!=NULL) event_list_free (cfile->event_list_back);
+  if (cfile->event_list_back!=NULL) event_list_free(cfile->event_list_back);
   cfile->event_list_back=cfile->event_list;
 
   //QUANTISE
@@ -1010,7 +992,7 @@
   if (new_event_list==NULL) return; // memory error
   cfile->event_list=new_event_list;
 
-  if (real_back_list==NULL) event_list_free (cfile->event_list_back);
+  if (real_back_list==NULL) event_list_free(cfile->event_list_back);
   cfile->event_list_back=NULL;
 
   // TODO - end_threaded_dialog
@@ -1031,15 +1013,14 @@
 
   if (ratio_fps) {
     // got a ratio
-    msg=g_strdup_printf(_ ("Resampling video at %.8f frames per second..."),mainw->fx1_val);
-  }
-  else {
-    msg=g_strdup_printf(_ ("Resampling video at %.3f frames per second..."),mainw->fx1_val);
+    msg=lives_strdup_printf(_("Resampling video at %.8f frames per second..."),mainw->fx1_val);
+  } else {
+    msg=lives_strdup_printf(_("Resampling video at %.3f frames per second..."),mainw->fx1_val);
   }
   if (mainw->current_file>0) {
     d_print(msg);
   }
-  g_free(msg);
+  lives_free(msg);
 
   old_frames=cfile->frames;
 
@@ -1051,11 +1032,11 @@
   // REORDER
   // this calls reorder_frames, which sets event_list_back==event_list, and clears event_list
   on_reorder_activate(reorder_width,reorder_height);
-  
+
   if (cfile->frames<=0||mainw->cancelled!=CANCEL_NONE) {
     // reordering error...
     cfile->event_list=real_back_list;
-    if (cfile->event_list_back!=NULL) event_list_free (cfile->event_list_back);
+    if (cfile->event_list_back!=NULL) event_list_free(cfile->event_list_back);
     cfile->event_list_back=NULL;
     cfile->frames=old_frames;
     cfile->start=ostart;
@@ -1065,18 +1046,18 @@
     cfile->undo1_dbl=oundo1_dbl;
     sensitize();
     mainw->error=TRUE;
-    if (cfile->frames<0) do_error_dialog (_("Reordering error !\n"));
+    if (cfile->frames<0) do_error_dialog(_("Reordering error !\n"));
     return;
   }
 
-  if (cfile->event_list_back!=NULL) event_list_free (cfile->event_list_back);
+  if (cfile->event_list_back!=NULL) event_list_free(cfile->event_list_back);
   cfile->event_list_back=real_back_list;
 
   cfile->ratio_fps=ratio_fps;
   cfile->pb_fps=cfile->fps=mainw->fx1_val;
   cfile->old_frames=old_frames;
 
-  set_undoable (_("Resample"),TRUE);
+  set_undoable(_("Resample"),TRUE);
 
   save_clip_value(mainw->current_file,CLIP_DETAILS_FPS,&cfile->fps);
   if (mainw->com_failed||mainw->write_failed) bad_header=TRUE;
@@ -1094,7 +1075,7 @@
 
 
 
-_resaudw *create_resaudw (short type, render_details *rdet, LiVESWidget *top_vbox) {
+_resaudw *create_resaudw(short type, render_details *rdet, LiVESWidget *top_vbox) {
   // type 1 == resample
   // type 2 == insert silence
   // type 3 == enter multitrack or encode or render to clip
@@ -1135,19 +1116,19 @@
 
   LiVESAccelGroup *accel_group=NULL;
 
-  GSList *s1_group=NULL;
-  GSList *e1_group=NULL;
-  GSList *s2_group=NULL;
-  GSList *e2_group=NULL;
-  GSList *rbgroup = NULL;
+  LiVESSList *s1_group=NULL;
+  LiVESSList *e1_group=NULL;
+  LiVESSList *s2_group=NULL;
+  LiVESSList *e2_group=NULL;
+  LiVESSList *rbgroup = NULL;
 
-  GList *channels = NULL;
-  GList *sampsize = NULL;
-  GList *rate = NULL;
+  LiVESList *channels = NULL;
+  LiVESList *sampsize = NULL;
+  LiVESList *rate = NULL;
 
   double secs=0.;
 
-  gchar *tmp;
+  char *tmp;
 
   int hours=0,mins=0;
   int aendian;
@@ -1155,7 +1136,7 @@
   boolean chans_fixed=FALSE;
   boolean is_8bit;
 
-  _resaudw *resaudw=(_resaudw*)(g_malloc(sizeof(_resaudw)));
+  _resaudw *resaudw=(_resaudw *)(lives_malloc(sizeof(_resaudw)));
 
   if (type==10) {
     if (mainw->multitrack!=NULL) chans_fixed=TRUE; // TODO *
@@ -1168,44 +1149,41 @@
     secs=mainw->rec_end_time-hours*3600.-mins*60.;
   }
 
-  channels = g_list_append (channels, (gpointer)"1");
-  channels = g_list_append (channels, (gpointer)"2");
+  channels = lives_list_append(channels, (livespointer)"1");
+  channels = lives_list_append(channels, (livespointer)"2");
 
-  sampsize = g_list_append (sampsize, (gpointer)"8");
-  sampsize = g_list_append (sampsize, (gpointer)"16");
+  sampsize = lives_list_append(sampsize, (livespointer)"8");
+  sampsize = lives_list_append(sampsize, (livespointer)"16");
 
-  rate = g_list_append (rate, (gpointer)"5512");
-  rate = g_list_append (rate, (gpointer)"8000");
-  rate = g_list_append (rate, (gpointer)"11025");
-  rate = g_list_append (rate, (gpointer)"22050");
-  rate = g_list_append (rate, (gpointer)"32000");
-  rate = g_list_append (rate, (gpointer)"44100");
-  rate = g_list_append (rate, (gpointer)"48000");
-  rate = g_list_append (rate, (gpointer)"88200");
-  rate = g_list_append (rate, (gpointer)"96000");
-  rate = g_list_append (rate, (gpointer)"128000");
+  rate = lives_list_append(rate, (livespointer)"5512");
+  rate = lives_list_append(rate, (livespointer)"8000");
+  rate = lives_list_append(rate, (livespointer)"11025");
+  rate = lives_list_append(rate, (livespointer)"22050");
+  rate = lives_list_append(rate, (livespointer)"32000");
+  rate = lives_list_append(rate, (livespointer)"44100");
+  rate = lives_list_append(rate, (livespointer)"48000");
+  rate = lives_list_append(rate, (livespointer)"88200");
+  rate = lives_list_append(rate, (livespointer)"96000");
+  rate = lives_list_append(rate, (livespointer)"128000");
 
   if (type<3||type>4) {
-    gchar *title=NULL;
+    char *title=NULL;
 
     if (type==1) {
-      title=g_strdup(_("LiVES: - Resample Audio"));
-    }
-    else if (type==2) {
-      title=g_strdup(_("LiVES: - Insert Silence"));
-    }
-    else if (type==5||type==11||type==6||type==7) {
-      title=g_strdup(_("LiVES: - New Clip Audio"));
-    }
-    else if (type==9||type==8) {
-      title=g_strdup(_("LiVES: - External Clip Settings"));
+      title=lives_strdup(_("LiVES: - Resample Audio"));
+    } else if (type==2) {
+      title=lives_strdup(_("LiVES: - Insert Silence"));
+    } else if (type==5||type==11||type==6||type==7) {
+      title=lives_strdup(_("LiVES: - New Clip Audio"));
+    } else if (type==9||type==8) {
+      title=lives_strdup(_("LiVES: - External Clip Settings"));
     }
 
-    resaudw->dialog = lives_standard_dialog_new (title,FALSE);
-    g_free(title);
+    resaudw->dialog = lives_standard_dialog_new(title,FALSE,-1,-1);
+    lives_free(title);
 
-    accel_group = LIVES_ACCEL_GROUP(lives_accel_group_new ());
-    lives_window_add_accel_group (LIVES_WINDOW (resaudw->dialog), accel_group);
+    accel_group = LIVES_ACCEL_GROUP(lives_accel_group_new());
+    lives_window_add_accel_group(LIVES_WINDOW(resaudw->dialog), accel_group);
 
     if (prefs->show_gui) {
       lives_window_set_transient_for(LIVES_WINDOW(resaudw->dialog),LIVES_WINDOW(mainw->LiVES));
@@ -1213,226 +1191,222 @@
 
     dialog_vbox = lives_dialog_get_content_area(LIVES_DIALOG(resaudw->dialog));
 
-    vboxx = lives_vbox_new (FALSE, 0);
+    vboxx = lives_vbox_new(FALSE, 0);
 
-    lives_box_pack_start (LIVES_BOX (dialog_vbox), vboxx, TRUE, TRUE, 0);
-  }
-  else vboxx=top_vbox;
+    lives_box_pack_start(LIVES_BOX(dialog_vbox), vboxx, TRUE, TRUE, 0);
+  } else vboxx=top_vbox;
 
   if (type==1) {
-    frame = lives_frame_new (NULL);
- 
-    lives_box_pack_start (LIVES_BOX (vboxx), frame, TRUE, TRUE, 0);
-    
+    frame = lives_frame_new(NULL);
+
+    lives_box_pack_start(LIVES_BOX(vboxx), frame, TRUE, TRUE, 0);
+
     if (palette->style&STYLE_1) {
-      lives_widget_set_bg_color (frame, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+      lives_widget_set_bg_color(frame, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
     }
-    
-    hbox2 = lives_hbox_new (FALSE, 0);
-    lives_widget_show (hbox2);
-    lives_container_add (LIVES_CONTAINER (frame), hbox2);
-    lives_container_set_border_width (LIVES_CONTAINER (hbox2), widget_opts.packing_width);
-    
-    tmp=g_strdup_printf ("%d",(int)mainw->fx1_val);
-    
+
+    hbox2 = lives_hbox_new(FALSE, 0);
+    lives_widget_show(hbox2);
+    lives_container_add(LIVES_CONTAINER(frame), hbox2);
+    lives_container_set_border_width(LIVES_CONTAINER(hbox2), widget_opts.packing_width);
+
+    tmp=lives_strdup_printf("%d",(int)mainw->fx1_val);
+
     combo_entry2 = lives_standard_entry_new(_("Rate (Hz) "),FALSE,tmp,10,6,LIVES_BOX(hbox2),NULL);
-    g_free (tmp);
+    lives_free(tmp);
+
+    lives_editable_set_editable(LIVES_EDITABLE(combo_entry2), FALSE);
+    lives_widget_set_can_focus(combo_entry2, FALSE);
 
-    lives_editable_set_editable (LIVES_EDITABLE (combo_entry2), FALSE);
-    lives_widget_set_can_focus (combo_entry2, FALSE);
-    
-    tmp=g_strdup_printf ("%d",(int)mainw->fx2_val);
+    tmp=lives_strdup_printf("%d",(int)mainw->fx2_val);
     combo_entry3 = lives_standard_entry_new(_("Channels"),FALSE,tmp,6,2,LIVES_BOX(hbox2),NULL);
-    g_free (tmp);
+    lives_free(tmp);
+
+    lives_editable_set_editable(LIVES_EDITABLE(combo_entry3), FALSE);
+    lives_widget_set_can_focus(combo_entry3, FALSE);
 
-    lives_editable_set_editable (LIVES_EDITABLE (combo_entry3), FALSE);
-    lives_widget_set_can_focus (combo_entry3, FALSE);
-    
-    tmp=g_strdup_printf ("%d",(int)mainw->fx3_val);
+    tmp=lives_strdup_printf("%d",(int)mainw->fx3_val);
     combo_entry1 = lives_standard_entry_new(_("Sample Size "),FALSE,tmp,6,2,LIVES_BOX(hbox2),NULL);
-    g_free (tmp);
+    lives_free(tmp);
 
-    lives_editable_set_editable (LIVES_EDITABLE (combo_entry1), FALSE);
-    lives_widget_set_can_focus (combo_entry1, FALSE);
+    lives_editable_set_editable(LIVES_EDITABLE(combo_entry1), FALSE);
+    lives_widget_set_can_focus(combo_entry1, FALSE);
 
-    vseparator = lives_vseparator_new ();
-    lives_widget_show (vseparator);
-    lives_box_pack_start (LIVES_BOX (hbox2), vseparator, FALSE, FALSE, widget_opts.packing_width);
+    vseparator = lives_vseparator_new();
+    lives_widget_show(vseparator);
+    lives_box_pack_start(LIVES_BOX(hbox2), vseparator, FALSE, FALSE, widget_opts.packing_width);
 
-    vbox = lives_vbox_new (FALSE, 0);
-    lives_box_pack_start (LIVES_BOX (hbox2), vbox, FALSE, FALSE, 0);
+    vbox = lives_vbox_new(FALSE, 0);
+    lives_box_pack_start(LIVES_BOX(hbox2), vbox, FALSE, FALSE, 0);
 
-    hbox = lives_hbox_new (FALSE, 0);
-    lives_box_pack_start (LIVES_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
+    hbox = lives_hbox_new(FALSE, 0);
+    lives_box_pack_start(LIVES_BOX(vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
 
-    radiobutton_s1 = lives_standard_radio_button_new (_("Signed"),FALSE,s1_group,LIVES_BOX(hbox),NULL);
-    s1_group = lives_radio_button_get_group (LIVES_RADIO_BUTTON (radiobutton_s1));
+    radiobutton_s1 = lives_standard_radio_button_new(_("Signed"),FALSE,s1_group,LIVES_BOX(hbox),NULL);
+    s1_group = lives_radio_button_get_group(LIVES_RADIO_BUTTON(radiobutton_s1));
 
-    hbox = lives_hbox_new (FALSE, 0);
-    lives_box_pack_start (LIVES_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
+    hbox = lives_hbox_new(FALSE, 0);
+    lives_box_pack_start(LIVES_BOX(vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
 
-    radiobutton_u1 = lives_standard_radio_button_new (_("Unsigned"),FALSE,s1_group,LIVES_BOX(hbox),NULL);
+    radiobutton_u1 = lives_standard_radio_button_new(_("Unsigned"),FALSE,s1_group,LIVES_BOX(hbox),NULL);
 
     aendian=mainw->fx4_val;
 
     if (aendian&AFORM_UNSIGNED) {
-      lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (radiobutton_u1), TRUE);
-    }
-    else {
-      lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (radiobutton_s1), TRUE);
+      lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(radiobutton_u1), TRUE);
+    } else {
+      lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(radiobutton_s1), TRUE);
     }
 
-    lives_widget_set_sensitive (radiobutton_u1, FALSE);
-    lives_widget_set_sensitive (radiobutton_s1, FALSE);
+    lives_widget_set_sensitive(radiobutton_u1, FALSE);
+    lives_widget_set_sensitive(radiobutton_s1, FALSE);
+
+    vseparator = lives_vseparator_new();
+    lives_box_pack_start(LIVES_BOX(hbox2), vseparator, FALSE, FALSE, widget_opts.packing_width);
 
-    vseparator = lives_vseparator_new ();
-    lives_box_pack_start (LIVES_BOX (hbox2), vseparator, FALSE, FALSE, widget_opts.packing_width);
-    
-    vbox = lives_vbox_new (FALSE, 0);
-    lives_box_pack_start (LIVES_BOX (hbox2), vbox, FALSE, FALSE, 0);
+    vbox = lives_vbox_new(FALSE, 0);
+    lives_box_pack_start(LIVES_BOX(hbox2), vbox, FALSE, FALSE, 0);
 
-    hbox = lives_hbox_new (FALSE, 0);
-    lives_box_pack_start (LIVES_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
+    hbox = lives_hbox_new(FALSE, 0);
+    lives_box_pack_start(LIVES_BOX(vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
 
-    radiobutton_l1 = lives_standard_radio_button_new (_("Little Endian"),FALSE,e1_group,LIVES_BOX(hbox),NULL);
-    e1_group = lives_radio_button_get_group (LIVES_RADIO_BUTTON (radiobutton_l1));
+    radiobutton_l1 = lives_standard_radio_button_new(_("Little Endian"),FALSE,e1_group,LIVES_BOX(hbox),NULL);
+    e1_group = lives_radio_button_get_group(LIVES_RADIO_BUTTON(radiobutton_l1));
 
-    hbox = lives_hbox_new (FALSE, 0);
-    lives_box_pack_start (LIVES_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
+    hbox = lives_hbox_new(FALSE, 0);
+    lives_box_pack_start(LIVES_BOX(vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
 
-    radiobutton_b1 = lives_standard_radio_button_new (_("Big Endian"),FALSE,e1_group,LIVES_BOX(hbox),NULL);
+    radiobutton_b1 = lives_standard_radio_button_new(_("Big Endian"),FALSE,e1_group,LIVES_BOX(hbox),NULL);
 
     if (aendian&AFORM_BIG_ENDIAN) {
-      lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (radiobutton_b1), TRUE);
-    }
-    else {
-      lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (radiobutton_l1), TRUE);
+      lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(radiobutton_b1), TRUE);
+    } else {
+      lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(radiobutton_l1), TRUE);
     }
 
-    lives_widget_set_sensitive (radiobutton_b1, FALSE);
-    lives_widget_set_sensitive (radiobutton_l1, FALSE);
+    lives_widget_set_sensitive(radiobutton_b1, FALSE);
+    lives_widget_set_sensitive(radiobutton_l1, FALSE);
 
-    label = lives_standard_label_new (_("Current"));
+    label = lives_standard_label_new(_("Current"));
 
-    lives_frame_set_label_widget (LIVES_FRAME (frame), label);
+    lives_frame_set_label_widget(LIVES_FRAME(frame), label);
 
   }
 
   resaudw->aud_checkbutton = NULL;
 
   if (type<9||type==11) {
-    frame = lives_frame_new (NULL);
+    frame = lives_frame_new(NULL);
 
-    if (type==4) lives_box_pack_start (LIVES_BOX (vboxx), frame, FALSE, FALSE, widget_opts.packing_height);
-    else lives_box_pack_start (LIVES_BOX (vboxx), frame, TRUE, TRUE, 0);
+    if (type==4) lives_box_pack_start(LIVES_BOX(vboxx), frame, FALSE, FALSE, widget_opts.packing_height);
+    else lives_box_pack_start(LIVES_BOX(vboxx), frame, TRUE, TRUE, 0);
 
     if (palette->style&STYLE_1) {
-      lives_widget_set_bg_color (frame, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+      lives_widget_set_bg_color(frame, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
     }
 
-    vbox2 = lives_vbox_new (FALSE, 0);
-    lives_container_add (LIVES_CONTAINER (frame), vbox2);
-    
+    vbox2 = lives_vbox_new(FALSE, 0);
+    lives_container_add(LIVES_CONTAINER(frame), vbox2);
+
     if (type>2&&type<5) {
-      resaudw->aud_hbox = lives_hbox_new (FALSE, 0);
-      lives_box_pack_start (LIVES_BOX (vbox2), resaudw->aud_hbox, FALSE, FALSE, 0);
+      resaudw->aud_hbox = lives_hbox_new(FALSE, 0);
+      lives_box_pack_start(LIVES_BOX(vbox2), resaudw->aud_hbox, FALSE, FALSE, 0);
 
-      resaudw->aud_checkbutton = lives_standard_check_button_new (_("_Enable audio"),TRUE,LIVES_BOX(resaudw->aud_hbox),NULL);
+      resaudw->aud_checkbutton = lives_standard_check_button_new(_("_Enable audio"),TRUE,LIVES_BOX(resaudw->aud_hbox),NULL);
 
-      if (rdet!=NULL) lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (resaudw->aud_checkbutton), rdet->achans>0);
-      else lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (resaudw->aud_checkbutton), prefs->mt_def_achans>0);
-    }
-    else resaudw->aud_checkbutton = lives_check_button_new ();
+      if (rdet!=NULL) lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(resaudw->aud_checkbutton), rdet->achans>0);
+      else lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(resaudw->aud_checkbutton), prefs->mt_def_achans>0);
+    } else resaudw->aud_checkbutton = lives_check_button_new();
+
+    hbox2 = lives_hbox_new(FALSE, 0);
+    lives_box_pack_start(LIVES_BOX(vbox2), hbox2, FALSE, FALSE, widget_opts.packing_height);
+    lives_container_set_border_width(LIVES_CONTAINER(hbox2), widget_opts.border_width);
 
-    hbox2 = lives_hbox_new (FALSE, 0);
-    lives_box_pack_start (LIVES_BOX (vbox2), hbox2, FALSE, FALSE, widget_opts.packing_height);
-    lives_container_set_border_width (LIVES_CONTAINER (hbox2), widget_opts.border_width);
+    vbox = lives_vbox_new(FALSE, 0);
+    lives_box_pack_start(LIVES_BOX(hbox2), vbox, FALSE, FALSE, widget_opts.packing_width);
 
-    vbox = lives_vbox_new (FALSE, 0);
-    lives_box_pack_start (LIVES_BOX (hbox2), vbox, FALSE, FALSE, widget_opts.packing_width);
+    hbox = lives_hbox_new(FALSE, 0);
+    lives_box_pack_start(LIVES_BOX(vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
+    lives_container_set_border_width(LIVES_CONTAINER(hbox), widget_opts.border_width);
 
-    hbox = lives_hbox_new (FALSE, 0);
-    lives_box_pack_start (LIVES_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
-    lives_container_set_border_width (LIVES_CONTAINER (hbox), widget_opts.border_width);
+    combo4 = lives_standard_combo_new(_("Rate (Hz) "),type>=3&&type!=11,rate,LIVES_BOX(hbox),NULL);
 
-    combo4 = lives_standard_combo_new (_("Rate (Hz) "),type>=3&&type!=11,rate,LIVES_BOX(hbox),NULL);
-    
     resaudw->entry_arate = lives_combo_get_entry(LIVES_COMBO(combo4));
 
-    lives_entry_set_width_chars (LIVES_ENTRY (resaudw->entry_arate), 6);
+    lives_entry_set_width_chars(LIVES_ENTRY(resaudw->entry_arate), 6);
     if (type==7) lives_widget_set_sensitive(combo4,FALSE);
-  
-    if (type<3||(type>4&&type<8)||type==11) tmp=g_strdup_printf ("%d",(int)mainw->fx1_val);
-    else if (type==8) tmp=g_strdup_printf ("%d",DEFAULT_AUDIO_RATE);
-    else if (type==3) tmp=g_strdup_printf ("%d",rdet->arate);
-    else tmp=g_strdup_printf ("%d",prefs->mt_def_arate);
-    lives_entry_set_text (LIVES_ENTRY (resaudw->entry_arate),tmp);
-    g_free (tmp);
-
-    combo5 = lives_standard_combo_new ((type>=3&&type!=11?(_("_Channels")):(_("Channels"))),type>=3&&type!=11,
-				       channels,LIVES_BOX(hbox),NULL);
-    
+
+    if (type<3||(type>4&&type<8)||type==11) tmp=lives_strdup_printf("%d",(int)mainw->fx1_val);
+    else if (type==8) tmp=lives_strdup_printf("%d",DEFAULT_AUDIO_RATE);
+    else if (type==3) tmp=lives_strdup_printf("%d",rdet->arate);
+    else tmp=lives_strdup_printf("%d",prefs->mt_def_arate);
+    lives_entry_set_text(LIVES_ENTRY(resaudw->entry_arate),tmp);
+    lives_free(tmp);
+
+    combo5 = lives_standard_combo_new((type>=3&&type!=11?(_("_Channels")):(_("Channels"))),type>=3&&type!=11,
+                                      channels,LIVES_BOX(hbox),NULL);
+
 
     if (type==7) lives_widget_set_sensitive(combo5,FALSE);
 
     resaudw->entry_achans = lives_combo_get_entry(LIVES_COMBO(combo5));
-    lives_entry_set_width_chars (LIVES_ENTRY (resaudw->entry_achans), 2);
-    
-    if (type<3||(type>4&&type<8)||type==11) tmp=g_strdup_printf ("%d",(int)mainw->fx2_val);
-    else if (type==8) tmp=g_strdup_printf ("%d",DEFAULT_AUDIO_CHANS);
-    else if (type==3) tmp=g_strdup_printf ("%d",rdet->achans);
-    else tmp=g_strdup_printf ("%d",prefs->mt_def_achans==0?DEFAULT_AUDIO_CHANS:prefs->mt_def_achans);
-    lives_entry_set_text (LIVES_ENTRY (resaudw->entry_achans),tmp);
-    g_free (tmp);
-    
+    lives_entry_set_width_chars(LIVES_ENTRY(resaudw->entry_achans), 2);
+
+    if (type<3||(type>4&&type<8)||type==11) tmp=lives_strdup_printf("%d",(int)mainw->fx2_val);
+    else if (type==8) tmp=lives_strdup_printf("%d",DEFAULT_AUDIO_CHANS);
+    else if (type==3) tmp=lives_strdup_printf("%d",rdet->achans);
+    else tmp=lives_strdup_printf("%d",prefs->mt_def_achans==0?DEFAULT_AUDIO_CHANS:prefs->mt_def_achans);
+    lives_entry_set_text(LIVES_ENTRY(resaudw->entry_achans),tmp);
+    lives_free(tmp);
+
     if (chans_fixed) {
       lives_widget_set_sensitive(resaudw->entry_achans,FALSE);
       lives_widget_set_sensitive(combo5,FALSE);
     }
 
- 
-    combo6 = lives_standard_combo_new ((type>=3&&type!=11?(_("_Sample Size")):(_("Sample Size"))),type>=3&&type!=11,
-				       sampsize,LIVES_BOX(hbox),NULL);
+
+    combo6 = lives_standard_combo_new((type>=3&&type!=11?(_("_Sample Size")):(_("Sample Size"))),type>=3&&type!=11,
+                                      sampsize,LIVES_BOX(hbox),NULL);
 
     if (type==7) lives_widget_set_sensitive(combo6,FALSE);
 
     resaudw->entry_asamps = lives_combo_get_entry(LIVES_COMBO(combo6));
-    lives_entry_set_max_length (LIVES_ENTRY (resaudw->entry_asamps), 2);
-    lives_editable_set_editable (LIVES_EDITABLE (resaudw->entry_asamps), FALSE);
-    lives_entry_set_width_chars (LIVES_ENTRY (resaudw->entry_asamps), 2);
-    
-    if (type<3||(type>4&&type<8)||type==11) tmp=g_strdup_printf ("%d",(int)mainw->fx3_val);
-    else if (type==8) tmp=g_strdup_printf ("%d",DEFAULT_AUDIO_SAMPS);
-    else if (type==3) tmp=g_strdup_printf ("%d",rdet->asamps);
-    else tmp=g_strdup_printf ("%d",prefs->mt_def_asamps);
-    lives_entry_set_text (LIVES_ENTRY (resaudw->entry_asamps),tmp);
+    lives_entry_set_max_length(LIVES_ENTRY(resaudw->entry_asamps), 2);
+    lives_editable_set_editable(LIVES_EDITABLE(resaudw->entry_asamps), FALSE);
+    lives_entry_set_width_chars(LIVES_ENTRY(resaudw->entry_asamps), 2);
+
+    if (type<3||(type>4&&type<8)||type==11) tmp=lives_strdup_printf("%d",(int)mainw->fx3_val);
+    else if (type==8) tmp=lives_strdup_printf("%d",DEFAULT_AUDIO_SAMPS);
+    else if (type==3) tmp=lives_strdup_printf("%d",rdet->asamps);
+    else tmp=lives_strdup_printf("%d",prefs->mt_def_asamps);
+    lives_entry_set_text(LIVES_ENTRY(resaudw->entry_asamps),tmp);
 
     if (!strcmp(tmp,"8")) is_8bit=TRUE;
     else is_8bit=FALSE;
 
-    g_free (tmp);
+    lives_free(tmp);
 
-    vseparator = lives_vseparator_new ();
-    lives_widget_show (vseparator);
-    if (type!=4) lives_box_pack_start (LIVES_BOX (hbox2), vseparator, FALSE, FALSE, widget_opts.packing_width);
+    vseparator = lives_vseparator_new();
+    lives_widget_show(vseparator);
+    if (type!=4) lives_box_pack_start(LIVES_BOX(hbox2), vseparator, FALSE, FALSE, widget_opts.packing_width);
 
-    vbox = lives_vbox_new (FALSE, 0);
-    if (type!=4) lives_box_pack_start (LIVES_BOX (hbox2), vbox, FALSE, FALSE, 0);
+    vbox = lives_vbox_new(FALSE, 0);
+    if (type!=4) lives_box_pack_start(LIVES_BOX(hbox2), vbox, FALSE, FALSE, 0);
 
-    hbox = lives_hbox_new (FALSE, 0);
-    lives_box_pack_start (LIVES_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
+    hbox = lives_hbox_new(FALSE, 0);
+    lives_box_pack_start(LIVES_BOX(vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
 
-    resaudw->rb_signed = lives_standard_radio_button_new (_("Signed"),FALSE,s2_group,LIVES_BOX(hbox),NULL);
-    s2_group = lives_radio_button_get_group (LIVES_RADIO_BUTTON (resaudw->rb_signed));
+    resaudw->rb_signed = lives_standard_radio_button_new(_("Signed"),FALSE,s2_group,LIVES_BOX(hbox),NULL);
+    s2_group = lives_radio_button_get_group(LIVES_RADIO_BUTTON(resaudw->rb_signed));
 
-    lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (resaudw->rb_signed), TRUE);
+    lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(resaudw->rb_signed), TRUE);
     if (type==7||is_8bit) lives_widget_set_sensitive(resaudw->rb_signed,FALSE);
-    
 
-    hbox = lives_hbox_new (FALSE, 0);
-    lives_box_pack_start (LIVES_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
 
-    resaudw->rb_unsigned = lives_standard_radio_button_new (_("Unsigned"),FALSE,s2_group,LIVES_BOX(hbox),NULL);
+    hbox = lives_hbox_new(FALSE, 0);
+    lives_box_pack_start(LIVES_BOX(vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
+
+    resaudw->rb_unsigned = lives_standard_radio_button_new(_("Unsigned"),FALSE,s2_group,LIVES_BOX(hbox),NULL);
 
     if (type==7||!is_8bit) lives_widget_set_sensitive(resaudw->rb_unsigned,FALSE);
 
@@ -1442,203 +1416,197 @@
     else aendian=prefs->mt_def_signed_endian;
 
     if (aendian&AFORM_UNSIGNED) {
-      lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (resaudw->rb_unsigned), TRUE);
-    }
-    else {
-      lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (resaudw->rb_signed), TRUE);
+      lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(resaudw->rb_unsigned), TRUE);
+    } else {
+      lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(resaudw->rb_signed), TRUE);
     }
 
-    vseparator = lives_vseparator_new ();
-    lives_box_pack_start (LIVES_BOX (hbox2), vseparator, FALSE, FALSE, widget_opts.packing_width);
+    vseparator = lives_vseparator_new();
+    lives_box_pack_start(LIVES_BOX(hbox2), vseparator, FALSE, FALSE, widget_opts.packing_width);
 
-    vbox = lives_vbox_new (FALSE, 0);
-    lives_box_pack_start (LIVES_BOX (hbox2), vbox, FALSE, FALSE, 0);
+    vbox = lives_vbox_new(FALSE, 0);
+    lives_box_pack_start(LIVES_BOX(hbox2), vbox, FALSE, FALSE, 0);
 
-    hbox = lives_hbox_new (FALSE, 0);
-    lives_box_pack_start (LIVES_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
+    hbox = lives_hbox_new(FALSE, 0);
+    lives_box_pack_start(LIVES_BOX(vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
 
-    resaudw->rb_littleend = lives_standard_radio_button_new (_("Little Endian"),FALSE,e2_group,LIVES_BOX(hbox),NULL);
-    e2_group = lives_radio_button_get_group (LIVES_RADIO_BUTTON (resaudw->rb_littleend));
+    resaudw->rb_littleend = lives_standard_radio_button_new(_("Little Endian"),FALSE,e2_group,LIVES_BOX(hbox),NULL);
+    e2_group = lives_radio_button_get_group(LIVES_RADIO_BUTTON(resaudw->rb_littleend));
 
     if (type==7) lives_widget_set_sensitive(resaudw->rb_littleend,FALSE);
 
-    hbox = lives_hbox_new (FALSE, 0);
-    lives_box_pack_start (LIVES_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
+    hbox = lives_hbox_new(FALSE, 0);
+    lives_box_pack_start(LIVES_BOX(vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
 
-    resaudw->rb_bigend = lives_standard_radio_button_new (_("Big Endian"),FALSE,e2_group,LIVES_BOX(hbox),NULL);
+    resaudw->rb_bigend = lives_standard_radio_button_new(_("Big Endian"),FALSE,e2_group,LIVES_BOX(hbox),NULL);
 
     if (type==7) lives_widget_set_sensitive(resaudw->rb_bigend,FALSE);
 
     if (aendian&AFORM_BIG_ENDIAN) {
-      lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (resaudw->rb_bigend), TRUE);
-    }
-    else {
-      lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (resaudw->rb_littleend), TRUE);
+      lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(resaudw->rb_bigend), TRUE);
+    } else {
+      lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(resaudw->rb_littleend), TRUE);
     }
 
-    if (!strcmp(lives_entry_get_text (LIVES_ENTRY (resaudw->entry_asamps)),"8")) {
-      lives_widget_set_sensitive (resaudw->rb_littleend, FALSE);
-      lives_widget_set_sensitive (resaudw->rb_bigend, FALSE);
+    if (!strcmp(lives_entry_get_text(LIVES_ENTRY(resaudw->entry_asamps)),"8")) {
+      lives_widget_set_sensitive(resaudw->rb_littleend, FALSE);
+      lives_widget_set_sensitive(resaudw->rb_bigend, FALSE);
     }
 
-    lives_signal_connect (LIVES_GUI_OBJECT(resaudw->entry_asamps), LIVES_WIDGET_CHANGED_EVENT,
-		      LIVES_GUI_CALLBACK (on_resaudw_asamps_changed),
-		      NULL);
+    lives_signal_connect(LIVES_GUI_OBJECT(resaudw->entry_asamps), LIVES_WIDGET_CHANGED_SIGNAL,
+                         LIVES_GUI_CALLBACK(on_resaudw_asamps_changed),
+                         NULL);
 
-    if (type>=3&&type!=11) label_aud = lives_standard_label_new (_("Audio"));
-    else label_aud = lives_standard_label_new (_("New"));
+    if (type>=3&&type!=11) label_aud = lives_standard_label_new(_("Audio"));
+    else label_aud = lives_standard_label_new(_("New"));
 
     if (type==3&&type!=11&&palette->style&STYLE_1) lives_widget_set_bg_color(frame, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
 
-    lives_frame_set_label_widget (LIVES_FRAME (frame), label_aud);
+    lives_frame_set_label_widget(LIVES_FRAME(frame), label_aud);
 
   }
 
   if (type>7&&type!=11) {
-    frame = lives_frame_new (NULL);
-    lives_widget_show (frame);
-    lives_box_pack_start (LIVES_BOX (vboxx), frame, TRUE, TRUE, 0);
+    frame = lives_frame_new(NULL);
+    lives_widget_show(frame);
+    lives_box_pack_start(LIVES_BOX(vboxx), frame, TRUE, TRUE, 0);
 
     if (palette->style&STYLE_1) {
-      lives_widget_set_bg_color (frame, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
+      lives_widget_set_bg_color(frame, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
     }
-    
-    hbox = lives_hbox_new (FALSE, 0);
-    lives_widget_show (hbox);
-    lives_container_add (LIVES_CONTAINER (frame), hbox);
-    lives_container_set_border_width (LIVES_CONTAINER (hbox), widget_opts.border_width);
-    
 
-    resaudw->fps_spinbutton = lives_standard_spin_button_new (_("_Frames Per Second "),TRUE,
-							      prefs->default_fps,1.,FPS_MAX,1.,1.,3,LIVES_BOX(hbox),NULL);
+    hbox = lives_hbox_new(FALSE, 0);
+    lives_widget_show(hbox);
+    lives_container_add(LIVES_CONTAINER(frame), hbox);
+    lives_container_set_border_width(LIVES_CONTAINER(hbox), widget_opts.border_width);
+
+
+    resaudw->fps_spinbutton = lives_standard_spin_button_new(_("_Frames Per Second "),TRUE,
+                              prefs->default_fps,1.,FPS_MAX,1.,1.,3,LIVES_BOX(hbox),NULL);
 
 
-    label = lives_standard_label_new (_("Video"));
+    label = lives_standard_label_new(_("Video"));
 
-    lives_frame_set_label_widget (LIVES_FRAME (frame), label);
+    lives_frame_set_label_widget(LIVES_FRAME(frame), label);
   }
 
   if (type>4&&type!=11) {
     lives_box_set_spacing(LIVES_BOX(dialog_vbox),widget_opts.packing_height*3);
-    
-    hbox = lives_hbox_new (FALSE, 0);
-    lives_widget_show (hbox);
-    lives_box_pack_start (LIVES_BOX (dialog_vbox), hbox, TRUE, TRUE, widget_opts.packing_height);
-    
+
+    hbox = lives_hbox_new(FALSE, 0);
+    lives_widget_show(hbox);
+    lives_box_pack_start(LIVES_BOX(dialog_vbox), hbox, TRUE, TRUE, widget_opts.packing_height);
+
     if (type!=6&&type!=7) {
 
       radiobutton=lives_standard_radio_button_new(_("Record for maximum:  "),FALSE,rbgroup,LIVES_BOX(hbox),NULL);
-      rbgroup = lives_radio_button_get_group (LIVES_RADIO_BUTTON (radiobutton));
+      rbgroup = lives_radio_button_get_group(LIVES_RADIO_BUTTON(radiobutton));
 
-      resaudw->hour_spinbutton = lives_standard_spin_button_new (_(" hours  "),FALSE,hours,
-								 0.,hours>23?hours:23,1.,1.,0,LIVES_BOX(hbox),NULL);
+      resaudw->hour_spinbutton = lives_standard_spin_button_new(_(" hours  "),FALSE,hours,
+                                 0.,hours>23?hours:23,1.,1.,0,LIVES_BOX(hbox),NULL);
 
-      resaudw->minute_spinbutton = lives_standard_spin_button_new (_(" minutes  "),FALSE,mins,0.,59.,1.,1.,0,LIVES_BOX(hbox),NULL);
+      resaudw->minute_spinbutton = lives_standard_spin_button_new(_(" minutes  "),FALSE,mins,0.,59.,1.,1.,0,LIVES_BOX(hbox),NULL);
 
-      resaudw->second_spinbutton = lives_standard_spin_button_new (_(" seconds  "),FALSE,secs,0.,59.,1.,1.,0,LIVES_BOX(hbox),NULL);
+      resaudw->second_spinbutton = lives_standard_spin_button_new(_(" seconds  "),FALSE,secs,0.,59.,1.,1.,0,LIVES_BOX(hbox),NULL);
 
 
-      hbox = lives_hbox_new (FALSE, 0);
-      lives_widget_show (hbox);
-      lives_box_pack_start (LIVES_BOX (dialog_vbox), hbox, TRUE, TRUE, widget_opts.packing_height);
+      hbox = lives_hbox_new(FALSE, 0);
+      lives_widget_show(hbox);
+      lives_box_pack_start(LIVES_BOX(dialog_vbox), hbox, TRUE, TRUE, widget_opts.packing_height);
 
       resaudw->unlim_radiobutton=lives_standard_radio_button_new(_("Unlimited"),FALSE,rbgroup,LIVES_BOX(hbox),NULL);
-      rbgroup = lives_radio_button_get_group (LIVES_RADIO_BUTTON (resaudw->unlim_radiobutton));
+      rbgroup = lives_radio_button_get_group(LIVES_RADIO_BUTTON(resaudw->unlim_radiobutton));
 
-      lives_signal_connect (LIVES_GUI_OBJECT (radiobutton), LIVES_WIDGET_TOGGLED_EVENT,
-			LIVES_GUI_CALLBACK (on_rb_audrec_time_toggled),
-			(gpointer)resaudw);
+      lives_signal_connect(LIVES_GUI_OBJECT(radiobutton), LIVES_WIDGET_TOGGLED_SIGNAL,
+                           LIVES_GUI_CALLBACK(on_rb_audrec_time_toggled),
+                           (livespointer)resaudw);
 
       lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(resaudw->unlim_radiobutton),(type==5||type>7)&&type!=11);
 
     }
 
     if (type<8||type==11) {
-      hseparator = lives_hseparator_new ();
-      lives_widget_show (hseparator);
-      lives_box_pack_start (LIVES_BOX (dialog_vbox), hseparator, TRUE, TRUE, 0);
-      
+      hseparator = lives_hseparator_new();
+      lives_widget_show(hseparator);
+      lives_box_pack_start(LIVES_BOX(dialog_vbox), hseparator, TRUE, TRUE, 0);
+
       label=lives_standard_label_new(_("Click OK to begin recording, or Cancel to quit."));
 
-      lives_box_pack_start (LIVES_BOX (dialog_vbox), label, TRUE, TRUE, 0);
+      lives_box_pack_start(LIVES_BOX(dialog_vbox), label, TRUE, TRUE, 0);
     }
   }
 
 
   if (type<3||type>4) {
-    dialog_action_area = lives_dialog_get_action_area(LIVES_DIALOG (resaudw->dialog));
-    lives_widget_show (dialog_action_area);
-    lives_button_box_set_layout (LIVES_BUTTON_BOX (dialog_action_area), LIVES_BUTTONBOX_END);
-    
-    cancelbutton = lives_button_new_from_stock (LIVES_STOCK_CANCEL);
- 
-    lives_dialog_add_action_widget (LIVES_DIALOG (resaudw->dialog), cancelbutton, LIVES_RESPONSE_CANCEL);
-    lives_widget_set_can_focus_and_default (cancelbutton);
-    
-    if (accel_group!=NULL) lives_widget_add_accelerator (cancelbutton, LIVES_WIDGET_CLICKED_EVENT, accel_group,
-						       LIVES_KEY_Escape, (LiVESXModifierType)0, (LiVESAccelFlags)0);
-    
-      
-    okbutton = lives_button_new_from_stock (LIVES_STOCK_OK);
- 
-    lives_dialog_add_action_widget (LIVES_DIALOG (resaudw->dialog), okbutton, LIVES_RESPONSE_OK);
-    lives_widget_set_can_focus_and_default (okbutton);
-    lives_widget_grab_default (okbutton);
+    dialog_action_area = lives_dialog_get_action_area(LIVES_DIALOG(resaudw->dialog));
+    lives_widget_show(dialog_action_area);
+    lives_button_box_set_layout(LIVES_BUTTON_BOX(dialog_action_area), LIVES_BUTTONBOX_END);
+
+    cancelbutton = lives_button_new_from_stock(LIVES_STOCK_CANCEL);
+
+    lives_dialog_add_action_widget(LIVES_DIALOG(resaudw->dialog), cancelbutton, LIVES_RESPONSE_CANCEL);
+    lives_widget_set_can_focus_and_default(cancelbutton);
+
+    if (accel_group!=NULL) lives_widget_add_accelerator(cancelbutton, LIVES_WIDGET_CLICKED_SIGNAL, accel_group,
+          LIVES_KEY_Escape, (LiVESXModifierType)0, (LiVESAccelFlags)0);
+
+
+    okbutton = lives_button_new_from_stock(LIVES_STOCK_OK);
+
+    lives_dialog_add_action_widget(LIVES_DIALOG(resaudw->dialog), okbutton, LIVES_RESPONSE_OK);
+    lives_widget_set_can_focus_and_default(okbutton);
+    lives_widget_grab_default(okbutton);
 
     if (type<8||type==11) {
-      lives_signal_connect (LIVES_GUI_OBJECT (cancelbutton), LIVES_WIDGET_CLICKED_EVENT,
-			LIVES_GUI_CALLBACK (lives_general_button_clicked),
-			resaudw);
+      lives_signal_connect(LIVES_GUI_OBJECT(cancelbutton), LIVES_WIDGET_CLICKED_SIGNAL,
+                           LIVES_GUI_CALLBACK(lives_general_button_clicked),
+                           resaudw);
 
       if (type==1) {
-	lives_signal_connect (LIVES_GUI_OBJECT (okbutton), LIVES_WIDGET_CLICKED_EVENT,
-			  LIVES_GUI_CALLBACK (on_resaudio_ok_clicked),
-			  NULL);
-      }
-      else if (type==2||type==11) {
-	lives_signal_connect (LIVES_GUI_OBJECT (okbutton), LIVES_WIDGET_CLICKED_EVENT,
-			  LIVES_GUI_CALLBACK (on_ins_silence_details_clicked),
-			  NULL);
-      }
-      else if (type==5) {
-	lives_signal_connect (LIVES_GUI_OBJECT (okbutton), LIVES_WIDGET_CLICKED_EVENT,
-			  LIVES_GUI_CALLBACK (on_recaudclip_ok_clicked),
-			  GINT_TO_POINTER(0));
-      }
-      else if (type==6||type==7) {
-	lives_signal_connect (LIVES_GUI_OBJECT (okbutton), LIVES_WIDGET_CLICKED_EVENT,
-			  LIVES_GUI_CALLBACK (on_recaudclip_ok_clicked),
-			  GINT_TO_POINTER(1));
+        lives_signal_connect(LIVES_GUI_OBJECT(okbutton), LIVES_WIDGET_CLICKED_SIGNAL,
+                             LIVES_GUI_CALLBACK(on_resaudio_ok_clicked),
+                             NULL);
+      } else if (type==2||type==11) {
+        lives_signal_connect(LIVES_GUI_OBJECT(okbutton), LIVES_WIDGET_CLICKED_SIGNAL,
+                             LIVES_GUI_CALLBACK(on_ins_silence_details_clicked),
+                             NULL);
+      } else if (type==5) {
+        lives_signal_connect(LIVES_GUI_OBJECT(okbutton), LIVES_WIDGET_CLICKED_SIGNAL,
+                             LIVES_GUI_CALLBACK(on_recaudclip_ok_clicked),
+                             LIVES_INT_TO_POINTER(0));
+      } else if (type==6||type==7) {
+        lives_signal_connect(LIVES_GUI_OBJECT(okbutton), LIVES_WIDGET_CLICKED_SIGNAL,
+                             LIVES_GUI_CALLBACK(on_recaudclip_ok_clicked),
+                             LIVES_INT_TO_POINTER(1));
       }
-      
+
     }
 
     lives_widget_show_all(resaudw->dialog);
 
-  }
-  else {
+  } else {
     if (type>2&&type<5) {
-      lives_signal_connect_after (LIVES_GUI_OBJECT(resaudw->aud_checkbutton), LIVES_WIDGET_TOGGLED_EVENT,
-			      LIVES_GUI_CALLBACK (on_resaudw_achans_changed),
-			      (gpointer)resaudw);
-      on_resaudw_achans_changed(resaudw->aud_checkbutton,(gpointer)resaudw);
+      lives_signal_connect_after(LIVES_GUI_OBJECT(resaudw->aud_checkbutton), LIVES_WIDGET_TOGGLED_SIGNAL,
+                                 LIVES_GUI_CALLBACK(on_resaudw_achans_changed),
+                                 (livespointer)resaudw);
+      on_resaudw_achans_changed(resaudw->aud_checkbutton,(livespointer)resaudw);
     }
   }
 
   lives_widget_show_all(vboxx);
 
-  if (type==2) lives_widget_hide (label_aud);
+  if (type==2) lives_widget_hide(label_aud);
 
-  g_list_free (channels);
-  g_list_free (sampsize);
-  g_list_free (rate);
+  lives_list_free(channels);
+  lives_list_free(sampsize);
+  lives_list_free(rate);
 
   return resaudw;
 }
 
 
 
-void create_new_pb_speed (short type) {
+void create_new_pb_speed(short type) {
   // type 1 = change speed
   // type 2 = resample
 
@@ -1660,26 +1628,25 @@
 
   LiVESAccelGroup *accel_group;
 
-  GSList *rbgroup = NULL;
+  LiVESSList *rbgroup = NULL;
 
-  gchar label_text[256];
+  char label_text[256];
 
-  gchar *title=NULL;
+  char *title=NULL;
 
   if (type==1) {
-    title=g_strdup( _("LiVES: - Change playback speed"));
-  }
-  else {
-    title=g_strdup(_("LiVES: - Resample Video"));
+    title=lives_strdup(_("LiVES: - Change playback speed"));
+  } else {
+    title=lives_strdup(_("LiVES: - Resample Video"));
   }
 
-  new_pb_speed = lives_standard_dialog_new (title,FALSE);
-  g_free(title);
+  new_pb_speed = lives_standard_dialog_new(title,FALSE,-1,-1);
+  lives_free(title);
 
-  lives_container_set_border_width (LIVES_CONTAINER (new_pb_speed), widget_opts.border_width*2);
+  lives_container_set_border_width(LIVES_CONTAINER(new_pb_speed), widget_opts.border_width*2);
 
-  accel_group = LIVES_ACCEL_GROUP(lives_accel_group_new ());
-  lives_window_add_accel_group (LIVES_WINDOW (new_pb_speed), accel_group);
+  accel_group = LIVES_ACCEL_GROUP(lives_accel_group_new());
+  lives_window_add_accel_group(LIVES_WINDOW(new_pb_speed), accel_group);
 
   if (prefs->show_gui) {
     lives_window_set_transient_for(LIVES_WINDOW(new_pb_speed),LIVES_WINDOW(mainw->LiVES));
@@ -1687,124 +1654,121 @@
 
   dialog_vbox = lives_dialog_get_content_area(LIVES_DIALOG(new_pb_speed));
 
-  vbox = lives_vbox_new (FALSE, 0);
-  
-  lives_box_pack_start (LIVES_BOX (dialog_vbox), vbox, TRUE, TRUE, widget_opts.packing_height*2);
+  vbox = lives_vbox_new(FALSE, 0);
+
+  lives_box_pack_start(LIVES_BOX(dialog_vbox), vbox, TRUE, TRUE, widget_opts.packing_height*2);
 
   if (type==1) {
-    g_snprintf(label_text,256,
-	       _("\n\nCurrent playback speed is %.3f frames per second.\n\nPlease enter the desired playback speed\nin _frames per second"),
-	       cfile->fps);
-  }
-  else if (type==2) {
-    g_snprintf(label_text,256,
-	       _("\n\nCurrent playback speed is %.3f frames per second.\n\nPlease enter the _resampled rate\nin frames per second"),
-	       cfile->fps);
+    lives_snprintf(label_text,256,
+                   _("\n\nCurrent playback speed is %.3f frames per second.\n\nPlease enter the desired playback speed\nin _frames per second"),
+                   cfile->fps);
+  } else if (type==2) {
+    lives_snprintf(label_text,256,
+                   _("\n\nCurrent playback speed is %.3f frames per second.\n\nPlease enter the _resampled rate\nin frames per second"),
+                   cfile->fps);
   }
 
   label=lives_standard_label_new_with_mnemonic(label_text,NULL);
 
-  hbox = lives_hbox_new (FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (vbox), label, FALSE, FALSE, widget_opts.packing_height);
-  lives_box_pack_start (LIVES_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
+  hbox = lives_hbox_new(FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(vbox), label, FALSE, FALSE, widget_opts.packing_height);
+  lives_box_pack_start(LIVES_BOX(vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
 
   if (type==2) {
     add_fill_to_box(LIVES_BOX(hbox));
-    spinbutton_pb_speed = lives_standard_spin_button_new (NULL,FALSE,cfile->fps,1.,FPS_MAX,.01,.1,3,LIVES_BOX(hbox),NULL);
+    spinbutton_pb_speed = lives_standard_spin_button_new(NULL,FALSE,cfile->fps,1.,FPS_MAX,.01,.1,3,LIVES_BOX(hbox),NULL);
     add_fill_to_box(LIVES_BOX(hbox));
-  }
-  else {
-    radiobutton1 = lives_standard_radio_button_new (NULL,FALSE,rbgroup,LIVES_BOX(hbox),NULL);
-    rbgroup=lives_radio_button_get_group (LIVES_RADIO_BUTTON (radiobutton1));
+  } else {
+    radiobutton1 = lives_standard_radio_button_new(NULL,FALSE,rbgroup,LIVES_BOX(hbox),NULL);
+    rbgroup=lives_radio_button_get_group(LIVES_RADIO_BUTTON(radiobutton1));
 
 
-    spinbutton_pb_speed = lives_standard_spin_button_new (NULL,FALSE,cfile->fps,1.,FPS_MAX,.01,.1,3,LIVES_BOX(hbox),NULL);
+    spinbutton_pb_speed = lives_standard_spin_button_new(NULL,FALSE,cfile->fps,1.,FPS_MAX,.01,.1,3,LIVES_BOX(hbox),NULL);
 
     label2=lives_standard_label_new_with_mnemonic(_("OR enter the desired clip length in _seconds"),NULL);
-    lives_box_pack_start (LIVES_BOX (vbox), label2, TRUE, TRUE, widget_opts.packing_height);
+    lives_box_pack_start(LIVES_BOX(vbox), label2, TRUE, TRUE, widget_opts.packing_height);
 
-    hbox = lives_hbox_new (FALSE, 0);
-    lives_box_pack_start (LIVES_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
+    hbox = lives_hbox_new(FALSE, 0);
+    lives_box_pack_start(LIVES_BOX(vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
 
-    radiobutton2 = lives_standard_radio_button_new (NULL,FALSE,rbgroup,LIVES_BOX(hbox),NULL);
+    radiobutton2 = lives_standard_radio_button_new(NULL,FALSE,rbgroup,LIVES_BOX(hbox),NULL);
 
 
-    spinbutton_pb_time = lives_standard_spin_button_new (NULL,FALSE,
-							 (double)((int)(cfile->frames/cfile->fps*100.))/100., 
-							 1./FPS_MAX, cfile->frames, 1., 10., 2, LIVES_BOX(hbox),NULL);
+    spinbutton_pb_time = lives_standard_spin_button_new(NULL,FALSE,
+                         (double)((int)(cfile->frames/cfile->fps*100.))/100.,
+                         1./FPS_MAX, cfile->frames, 1., 10., 2, LIVES_BOX(hbox),NULL);
 
-    lives_label_set_mnemonic_widget (LIVES_LABEL (label2), spinbutton_pb_time);
+    lives_label_set_mnemonic_widget(LIVES_LABEL(label2), spinbutton_pb_time);
 
   }
 
-  lives_label_set_mnemonic_widget (LIVES_LABEL (label), spinbutton_pb_speed);
+  lives_label_set_mnemonic_widget(LIVES_LABEL(label), spinbutton_pb_speed);
 
 
-  ca_hbox = lives_hbox_new (FALSE, 0);
+  ca_hbox = lives_hbox_new(FALSE, 0);
   change_audio_speed = lives_standard_check_button_new
-    (_("Change the _audio speed as well"),TRUE,LIVES_BOX(ca_hbox),NULL);
+                       (_("Change the _audio speed as well"),TRUE,LIVES_BOX(ca_hbox),NULL);
 
-  lives_box_pack_start (LIVES_BOX (vbox), ca_hbox, TRUE, TRUE, widget_opts.packing_height);
+  lives_box_pack_start(LIVES_BOX(vbox), ca_hbox, TRUE, TRUE, widget_opts.packing_height);
 
 
-  dialog_action_area = lives_dialog_get_action_area(LIVES_DIALOG (new_pb_speed));
-  lives_button_box_set_layout (LIVES_BUTTON_BOX (dialog_action_area), LIVES_BUTTONBOX_END);
+  dialog_action_area = lives_dialog_get_action_area(LIVES_DIALOG(new_pb_speed));
+  lives_button_box_set_layout(LIVES_BUTTON_BOX(dialog_action_area), LIVES_BUTTONBOX_END);
 
-  cancelbutton = lives_button_new_from_stock (LIVES_STOCK_CANCEL);
-  lives_dialog_add_action_widget (LIVES_DIALOG (new_pb_speed), cancelbutton, LIVES_RESPONSE_CANCEL);
-  lives_widget_set_can_focus (cancelbutton,TRUE);
+  cancelbutton = lives_button_new_from_stock(LIVES_STOCK_CANCEL);
+  lives_dialog_add_action_widget(LIVES_DIALOG(new_pb_speed), cancelbutton, LIVES_RESPONSE_CANCEL);
+  lives_widget_set_can_focus(cancelbutton,TRUE);
 
-  lives_widget_add_accelerator (cancelbutton, LIVES_WIDGET_CLICKED_EVENT, accel_group,
-                              LIVES_KEY_Escape, (LiVESXModifierType)0, (LiVESAccelFlags)0);
+  lives_widget_add_accelerator(cancelbutton, LIVES_WIDGET_CLICKED_SIGNAL, accel_group,
+                               LIVES_KEY_Escape, (LiVESXModifierType)0, (LiVESAccelFlags)0);
 
-  change_pb_ok = lives_button_new_from_stock (LIVES_STOCK_OK);
-  lives_dialog_add_action_widget (LIVES_DIALOG (new_pb_speed), change_pb_ok, LIVES_RESPONSE_OK);
-  lives_widget_set_can_focus_and_default (change_pb_ok);
-  lives_widget_grab_default (change_pb_ok);
+  change_pb_ok = lives_button_new_from_stock(LIVES_STOCK_OK);
+  lives_dialog_add_action_widget(LIVES_DIALOG(new_pb_speed), change_pb_ok, LIVES_RESPONSE_OK);
+  lives_widget_set_can_focus_and_default(change_pb_ok);
+  lives_widget_grab_default(change_pb_ok);
   lives_widget_grab_focus(spinbutton_pb_speed);
 
 
   reorder_leave_back=FALSE;
 
-  lives_signal_connect (LIVES_GUI_OBJECT (change_audio_speed), LIVES_WIDGET_TOGGLED_EVENT,
-		    LIVES_GUI_CALLBACK (on_boolean_toggled),
-		    &mainw->fx1_bool);
-  lives_signal_connect (LIVES_GUI_OBJECT (cancelbutton), LIVES_WIDGET_CLICKED_EVENT,
-		    LIVES_GUI_CALLBACK (lives_general_button_clicked),
-		    NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(change_audio_speed), LIVES_WIDGET_TOGGLED_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_boolean_toggled),
+                       &mainw->fx1_bool);
+  lives_signal_connect(LIVES_GUI_OBJECT(cancelbutton), LIVES_WIDGET_CLICKED_SIGNAL,
+                       LIVES_GUI_CALLBACK(lives_general_button_clicked),
+                       NULL);
   if (type==1) {
-    lives_signal_connect (LIVES_GUI_OBJECT (change_pb_ok), LIVES_WIDGET_CLICKED_EVENT,
-		      LIVES_GUI_CALLBACK (on_change_speed_ok_clicked),
-		      NULL);
-  }
-  else if (type==2) {
-    lives_signal_connect (LIVES_GUI_OBJECT (change_pb_ok), LIVES_WIDGET_CLICKED_EVENT,
-		      LIVES_GUI_CALLBACK (on_resample_vid_ok),
-		      NULL);
-  }
-  lives_signal_connect_after (LIVES_GUI_OBJECT (spinbutton_pb_speed), "value_changed",
-			  LIVES_GUI_CALLBACK (on_spin_value_changed),
-			  GINT_TO_POINTER (1));
+    lives_signal_connect(LIVES_GUI_OBJECT(change_pb_ok), LIVES_WIDGET_CLICKED_SIGNAL,
+                         LIVES_GUI_CALLBACK(on_change_speed_ok_clicked),
+                         NULL);
+  } else if (type==2) {
+    lives_signal_connect(LIVES_GUI_OBJECT(change_pb_ok), LIVES_WIDGET_CLICKED_SIGNAL,
+                         LIVES_GUI_CALLBACK(on_resample_vid_ok),
+                         NULL);
+  }
+  lives_signal_connect_after(LIVES_GUI_OBJECT(spinbutton_pb_speed), LIVES_WIDGET_VALUE_CHANGED_SIGNAL,
+                             LIVES_GUI_CALLBACK(on_spin_value_changed),
+                             LIVES_INT_TO_POINTER(1));
 
   if (type==1) {
-    lives_signal_connect_after (LIVES_GUI_OBJECT (spinbutton_pb_time), "value_changed",
-			    LIVES_GUI_CALLBACK (on_spin_value_changed),
-			    GINT_TO_POINTER (2));
-    lives_signal_connect_after (LIVES_GUI_OBJECT (spinbutton_pb_speed), "value_changed",
-			    LIVES_GUI_CALLBACK (widget_act_toggle),
-			    radiobutton1);
-    lives_signal_connect_after (LIVES_GUI_OBJECT (spinbutton_pb_time), "value_changed",
-			    LIVES_GUI_CALLBACK (widget_act_toggle),
-			    radiobutton2);
-    lives_signal_connect (LIVES_GUI_OBJECT (radiobutton2), LIVES_WIDGET_TOGGLED_EVENT,
-		      LIVES_GUI_CALLBACK (on_boolean_toggled),
-		      &mainw->fx2_bool);
-  }
-
-  lives_widget_show_all (new_pb_speed);
+    lives_signal_connect_after(LIVES_GUI_OBJECT(spinbutton_pb_time), LIVES_WIDGET_VALUE_CHANGED_SIGNAL,
+                               LIVES_GUI_CALLBACK(on_spin_value_changed),
+                               LIVES_INT_TO_POINTER(2));
+    lives_signal_connect_after(LIVES_GUI_OBJECT(spinbutton_pb_speed), LIVES_WIDGET_VALUE_CHANGED_SIGNAL,
+                               LIVES_GUI_CALLBACK(widget_act_toggle),
+                               radiobutton1);
+    lives_signal_connect_after(LIVES_GUI_OBJECT(spinbutton_pb_time), LIVES_WIDGET_VALUE_CHANGED_SIGNAL,
+                               LIVES_GUI_CALLBACK(widget_act_toggle),
+                               radiobutton2);
+    lives_signal_connect(LIVES_GUI_OBJECT(radiobutton2), LIVES_WIDGET_TOGGLED_SIGNAL,
+                         LIVES_GUI_CALLBACK(on_boolean_toggled),
+                         &mainw->fx2_bool);
+  }
+
+  lives_widget_show_all(new_pb_speed);
 
   if (type!=1||cfile->achans==0) {
-    lives_widget_hide (ca_hbox);
+    lives_widget_hide(ca_hbox);
   }
 
 }
@@ -1812,9 +1776,8 @@
 
 
 void
-on_change_speed_activate                (LiVESMenuItem     *menuitem,
-					 gpointer         user_data)
-{
+on_change_speed_activate(LiVESMenuItem     *menuitem,
+                         livespointer         user_data) {
   // change speed from the menu
   create_new_pb_speed(1);
   mainw->fx1_bool=mainw->fx2_bool=FALSE;
@@ -1823,9 +1786,9 @@
 
 
 
-void on_change_speed_ok_clicked (LiVESButton *button, gpointer user_data) {
+void on_change_speed_ok_clicked(LiVESButton *button, livespointer user_data) {
   double arate=cfile->arate/cfile->fps;
-  gchar *msg;
+  char *msg;
   boolean has_lmap_error=FALSE;
   boolean bad_header=FALSE;
 
@@ -1843,16 +1806,18 @@
   if (!(prefs->warning_mask&WARN_MASK_LAYOUT_DELETE_FRAMES)&&mainw->fx1_val>cfile->fps) {
     int new_frames=count_resampled_frames(cfile->frames,mainw->fx1_val,cfile->fps);
     if ((mainw->xlays=layout_frame_is_affected(mainw->current_file,new_frames))!=NULL) {
-      if (!do_warning_dialog(_("\nSpeeding up the clip will cause missing frames in some multitrack layouts.\nAre you sure you wish to change the speed ?\n"))) {
-	g_list_free_strings(mainw->xlays);
-	g_list_free(mainw->xlays);
-	mainw->xlays=NULL;
-	return;
+      if (!do_warning_dialog(
+            _("\nSpeeding up the clip will cause missing frames in some multitrack layouts.\nAre you sure you wish to change the speed ?\n"))) {
+        lives_list_free_strings(mainw->xlays);
+        lives_list_free(mainw->xlays);
+        mainw->xlays=NULL;
+        return;
       }
-      add_lmap_error(LMAP_ERROR_DELETE_FRAMES,cfile->name,(gpointer)cfile->layout_map,mainw->current_file,new_frames,0.,new_frames<=count_resampled_frames(cfile->stored_layout_frame,cfile->stored_layout_fps,cfile->fps));
+      add_lmap_error(LMAP_ERROR_DELETE_FRAMES,cfile->name,(livespointer)cfile->layout_map,mainw->current_file,new_frames,0.,
+                     new_frames<=count_resampled_frames(cfile->stored_layout_frame,cfile->stored_layout_fps,cfile->fps));
       has_lmap_error=TRUE;
-      g_list_free_strings(mainw->xlays);
-      g_list_free(mainw->xlays);
+      lives_list_free_strings(mainw->xlays);
+      lives_list_free(mainw->xlays);
       mainw->xlays=NULL;
     }
   }
@@ -1860,73 +1825,81 @@
   if (mainw->fx1_bool&&!(prefs->warning_mask&WARN_MASK_LAYOUT_DELETE_AUDIO)&&mainw->fx1_val>cfile->fps) {
     int new_frames=count_resampled_frames(cfile->frames,mainw->fx1_val,cfile->fps);
     if ((mainw->xlays=layout_audio_is_affected(mainw->current_file,(new_frames-1.)/cfile->fps))!=NULL) {
-      if (!do_warning_dialog(_("\nSpeeding up the clip will cause missing audio in some multitrack layouts.\nAre you sure you wish to change the speed ?\n"))) {
-	g_list_free_strings(mainw->xlays);
-	g_list_free(mainw->xlays);
-	mainw->xlays=NULL;
-	return;
+      if (!do_warning_dialog(
+            _("\nSpeeding up the clip will cause missing audio in some multitrack layouts.\nAre you sure you wish to change the speed ?\n"))) {
+        lives_list_free_strings(mainw->xlays);
+        lives_list_free(mainw->xlays);
+        mainw->xlays=NULL;
+        return;
       }
-      add_lmap_error(LMAP_ERROR_DELETE_AUDIO,cfile->name,(gpointer)cfile->layout_map,mainw->current_file,0,(new_frames-1.)/cfile->fps,(new_frames-1.)/cfile->fps<cfile->stored_layout_audio);
+      add_lmap_error(LMAP_ERROR_DELETE_AUDIO,cfile->name,(livespointer)cfile->layout_map,mainw->current_file,0,(new_frames-1.)/cfile->fps,
+                     (new_frames-1.)/cfile->fps<cfile->stored_layout_audio);
       has_lmap_error=TRUE;
-      g_list_free_strings(mainw->xlays);
-      g_list_free(mainw->xlays);
+      lives_list_free_strings(mainw->xlays);
+      lives_list_free(mainw->xlays);
       mainw->xlays=NULL;
     }
   }
 
-  if (!has_lmap_error&&!(prefs->warning_mask&WARN_MASK_LAYOUT_SHIFT_FRAMES)&&(mainw->xlays=layout_frame_is_affected(mainw->current_file,1))!=NULL) {
-    if (!do_warning_dialog(_("\nChanging the speed will cause frames to shift in some multitrack layouts.\nAre you sure you wish to continue ?\n"))) {
-      g_list_free_strings(mainw->xlays);
-      g_list_free(mainw->xlays);
+  if (!has_lmap_error&&!(prefs->warning_mask&WARN_MASK_LAYOUT_SHIFT_FRAMES)&&
+      (mainw->xlays=layout_frame_is_affected(mainw->current_file,1))!=NULL) {
+    if (!do_warning_dialog(
+          _("\nChanging the speed will cause frames to shift in some multitrack layouts.\nAre you sure you wish to continue ?\n"))) {
+      lives_list_free_strings(mainw->xlays);
+      lives_list_free(mainw->xlays);
       mainw->xlays=NULL;
       return;
     }
-    add_lmap_error(LMAP_ERROR_SHIFT_FRAMES,cfile->name,(gpointer)cfile->layout_map,mainw->current_file,0,0.,cfile->stored_layout_frame>0);
+    add_lmap_error(LMAP_ERROR_SHIFT_FRAMES,cfile->name,(livespointer)cfile->layout_map,mainw->current_file,0,0.,cfile->stored_layout_frame>0);
     has_lmap_error=TRUE;
-    g_list_free_strings(mainw->xlays);
-    g_list_free(mainw->xlays);
+    lives_list_free_strings(mainw->xlays);
+    lives_list_free(mainw->xlays);
     mainw->xlays=NULL;
   }
 
-  if (mainw->fx1_bool&&!has_lmap_error&&!(prefs->warning_mask&WARN_MASK_LAYOUT_SHIFT_AUDIO)&&(mainw->xlays=layout_audio_is_affected(mainw->current_file,0.))!=NULL) {
-    if (!do_warning_dialog(_("\nChanging the speed will cause audio to shift in some multitrack layouts.\nAre you sure you wish to continue ?\n"))) {
-      g_list_free_strings(mainw->xlays);
-      g_list_free(mainw->xlays);
+  if (mainw->fx1_bool&&!has_lmap_error&&!(prefs->warning_mask&WARN_MASK_LAYOUT_SHIFT_AUDIO)&&
+      (mainw->xlays=layout_audio_is_affected(mainw->current_file,0.))!=NULL) {
+    if (!do_warning_dialog(
+          _("\nChanging the speed will cause audio to shift in some multitrack layouts.\nAre you sure you wish to continue ?\n"))) {
+      lives_list_free_strings(mainw->xlays);
+      lives_list_free(mainw->xlays);
       mainw->xlays=NULL;
       return;
     }
-    add_lmap_error(LMAP_ERROR_SHIFT_AUDIO,cfile->name,(gpointer)cfile->layout_map,mainw->current_file,0,0.,cfile->stored_layout_audio>0.);
+    add_lmap_error(LMAP_ERROR_SHIFT_AUDIO,cfile->name,(livespointer)cfile->layout_map,mainw->current_file,0,0.,cfile->stored_layout_audio>0.);
     has_lmap_error=TRUE;
-    g_list_free_strings(mainw->xlays);
-    g_list_free(mainw->xlays);
+    lives_list_free_strings(mainw->xlays);
+    lives_list_free(mainw->xlays);
     mainw->xlays=NULL;
   }
 
-  if (!has_lmap_error&&!(prefs->warning_mask&WARN_MASK_LAYOUT_ALTER_FRAMES)&&(mainw->xlays=layout_frame_is_affected(mainw->current_file,1))!=NULL) {
+  if (!has_lmap_error&&!(prefs->warning_mask&WARN_MASK_LAYOUT_ALTER_FRAMES)&&
+      (mainw->xlays=layout_frame_is_affected(mainw->current_file,1))!=NULL) {
     if (!do_layout_alter_frames_warning()) {
-      g_list_free_strings(mainw->xlays);
-      g_list_free(mainw->xlays);
+      lives_list_free_strings(mainw->xlays);
+      lives_list_free(mainw->xlays);
       mainw->xlays=NULL;
       return;
     }
-    add_lmap_error(LMAP_ERROR_ALTER_FRAMES,cfile->name,(gpointer)cfile->layout_map,mainw->current_file,0,0.,cfile->stored_layout_frame>0);
+    add_lmap_error(LMAP_ERROR_ALTER_FRAMES,cfile->name,(livespointer)cfile->layout_map,mainw->current_file,0,0.,cfile->stored_layout_frame>0);
     has_lmap_error=TRUE;
-    g_list_free_strings(mainw->xlays);
-    g_list_free(mainw->xlays);
+    lives_list_free_strings(mainw->xlays);
+    lives_list_free(mainw->xlays);
     mainw->xlays=NULL;
   }
 
-  if (mainw->fx1_bool&&!has_lmap_error&&!(prefs->warning_mask&WARN_MASK_LAYOUT_ALTER_AUDIO)&&(mainw->xlays=layout_audio_is_affected(mainw->current_file,0.))!=NULL) {
+  if (mainw->fx1_bool&&!has_lmap_error&&!(prefs->warning_mask&WARN_MASK_LAYOUT_ALTER_AUDIO)&&
+      (mainw->xlays=layout_audio_is_affected(mainw->current_file,0.))!=NULL) {
     if (!do_layout_alter_audio_warning()) {
-      g_list_free_strings(mainw->xlays);
-      g_list_free(mainw->xlays);
+      lives_list_free_strings(mainw->xlays);
+      lives_list_free(mainw->xlays);
       mainw->xlays=NULL;
       return;
     }
-    add_lmap_error(LMAP_ERROR_ALTER_AUDIO,cfile->name,(gpointer)cfile->layout_map,mainw->current_file,0,0.,cfile->stored_layout_audio>0.);
+    add_lmap_error(LMAP_ERROR_ALTER_AUDIO,cfile->name,(livespointer)cfile->layout_map,mainw->current_file,0,0.,cfile->stored_layout_audio>0.);
     has_lmap_error=TRUE;
-    g_list_free_strings(mainw->xlays);
-    g_list_free(mainw->xlays);
+    lives_list_free_strings(mainw->xlays);
+    lives_list_free(mainw->xlays);
     mainw->xlays=NULL;
   }
 
@@ -1935,22 +1908,21 @@
     mainw->fx1_val=cfile->undo1_dbl;
   }
 
-  set_undoable (_("Speed Change"),TRUE);
+  set_undoable(_("Speed Change"),TRUE);
   cfile->undo1_dbl=cfile->fps;
   cfile->undo1_int=cfile->arate;
   cfile->undo_action=UNDO_CHANGE_SPEED;
-  
+
   if (mainw->fx1_val==0.) mainw->fx1_val=1.;
   cfile->pb_fps=cfile->fps=mainw->fx1_val;
   if (mainw->fx1_bool) {
     cfile->arate=(int)(arate*cfile->fps+.5);
-    msg=g_strdup_printf (_ ("Changed playback speed to %.3f frames per second and audio to %d Hz.\n"),cfile->fps,cfile->arate);
-  }
-  else {
-    msg=g_strdup_printf (_ ("Changed playback speed to %.3f frames per second.\n"),cfile->fps);
+    msg=lives_strdup_printf(_("Changed playback speed to %.3f frames per second and audio to %d Hz.\n"),cfile->fps,cfile->arate);
+  } else {
+    msg=lives_strdup_printf(_("Changed playback speed to %.3f frames per second.\n"),cfile->fps);
   }
-  d_print (msg);
-  g_free (msg);
+  d_print(msg);
+  lives_free(msg);
 
   cfile->ratio_fps=FALSE;
 
@@ -1981,29 +1953,28 @@
 int reorder_frames(int rwidth, int rheight) {
   int new_frames=cfile->old_frames;
   int cur_frames=cfile->frames;
-  gchar **array;
-  gchar *com;
+  char **array;
+  char *com;
 
-  if (rwidth*rheight==0) com=g_strdup_printf("%s reorder \"%s\" \"%s\" %d 0 0 %d %d",prefs->backend,cfile->handle,
-					     get_image_ext_for_type(cfile->img_type),!mainw->endian,
-					     reorder_leave_back,cfile->frames);
+  if (rwidth*rheight==0) com=lives_strdup_printf("%s reorder \"%s\" \"%s\" %d 0 0 %d %d",prefs->backend,cfile->handle,
+                               get_image_ext_for_type(cfile->img_type),!mainw->endian,
+                               reorder_leave_back,cfile->frames);
   else {
     if (!prefs->enc_letterbox) {
-      com=g_strdup_printf("%s reorder \"%s\" \"%s\" %d %d %d 0 %d",prefs->backend,cfile->handle,
-			  get_image_ext_for_type(cfile->img_type),!mainw->endian,rwidth,rheight,cfile->frames);
-    }
-    else {
+      com=lives_strdup_printf("%s reorder \"%s\" \"%s\" %d %d %d 0 %d",prefs->backend,cfile->handle,
+                              get_image_ext_for_type(cfile->img_type),!mainw->endian,rwidth,rheight,cfile->frames);
+    } else {
       int iwidth=cfile->hsize,iheight=cfile->vsize;
       calc_maxspect(rwidth,rheight,&iwidth,&iheight);
 
       if (iwidth==cfile->hsize&&iheight==cfile->vsize) {
-	iwidth=-iwidth;
-	iheight=-iheight;
+        iwidth=-iwidth;
+        iheight=-iheight;
       }
-  
-      com=g_strdup_printf("%s reorder \"%s\" \"%s\" %d %d %d %d %d %d %d",prefs->backend,cfile->handle,
-			  get_image_ext_for_type(cfile->img_type),!mainw->endian,rwidth,rheight,
-			  reorder_leave_back,cfile->frames,iwidth,iheight);
+
+      com=lives_strdup_printf("%s reorder \"%s\" \"%s\" %d %d %d %d %d %d %d",prefs->backend,cfile->handle,
+                              get_image_ext_for_type(cfile->img_type),!mainw->endian,rwidth,rheight,
+                              reorder_leave_back,cfile->frames,iwidth,iheight);
     }
   }
 
@@ -2018,7 +1989,7 @@
 
   cfile->next_event=NULL;
   if (cfile->event_list!=NULL) {
-    if (cfile->event_list_back!=NULL) event_list_free (cfile->event_list_back);
+    if (cfile->event_list_back!=NULL) event_list_free(cfile->event_list_back);
     cfile->event_list_back=cfile->event_list;
     cfile->event_list=NULL;
   }
@@ -2032,37 +2003,34 @@
   if (cfile->undo_action==UNDO_RESAMPLE) {
     if (mainw->current_file>0) {
       cfile->nopreview=cfile->nokeep=TRUE;
-      if (!do_progress_dialog(TRUE,TRUE,_ ("Resampling video"))) {
-	cfile->nopreview=cfile->nokeep=FALSE;
-	return cur_frames;
+      if (!do_progress_dialog(TRUE,TRUE,_("Resampling video"))) {
+        cfile->nopreview=cfile->nokeep=FALSE;
+        return cur_frames;
       }
       cfile->nopreview=cfile->nokeep=FALSE;
+    } else {
+      do_progress_dialog(TRUE,FALSE,_("Resampling clipboard video"));
     }
-    else {
-      do_progress_dialog(TRUE,FALSE,_ ("Resampling clipboard video"));
-    }
-  }
-  else {
+  } else {
     cfile->nopreview=cfile->nokeep=TRUE;
-    if (!do_progress_dialog(TRUE,TRUE,_ ("Reordering frames"))) {
+    if (!do_progress_dialog(TRUE,TRUE,_("Reordering frames"))) {
       cfile->nopreview=cfile->nokeep=FALSE;
       return cur_frames;
     }
     cfile->nopreview=cfile->nokeep=FALSE;
   }
-  g_free(com);
-  
+  lives_free(com);
+
   if (mainw->error) {
-    if (mainw->cancelled!=CANCEL_ERROR) do_error_dialog (_ ("\n\nLiVES was unable to reorder the frames."));
+    if (mainw->cancelled!=CANCEL_ERROR) do_error_dialog(_("\n\nLiVES was unable to reorder the frames."));
     deorder_frames(new_frames,FALSE);
     new_frames=-new_frames;
-  }
-  else {
-    array=g_strsplit(mainw->msg,"|",2);
-  
+  } else {
+    array=lives_strsplit(mainw->msg,"|",2);
+
     new_frames=atoi(array[1]);
-    g_strfreev(array);
-    
+    lives_strfreev(array);
+
     if (cfile->frames>new_frames) {
       new_frames=cfile->frames;
     }
@@ -2074,10 +2042,10 @@
 
 
 int deorder_frames(int old_frames, boolean leave_bak) {
-  gchar *com;
+  char *com;
   weed_timecode_t time_start;
   int perf_start,perf_end;
-  
+
   if (cfile->event_list!=NULL) return cfile->frames;
 
   cfile->event_list=cfile->event_list_back;
@@ -2086,23 +2054,22 @@
   if (cfile->event_list==NULL) {
     perf_start=1;
     perf_end=old_frames;
-  }
-  else {
-    time_start=get_event_timecode (get_first_event(cfile->event_list));
+  } else {
+    time_start=get_event_timecode(get_first_event(cfile->event_list));
     perf_start=(int)(cfile->fps*(double)time_start/U_SEC)+1;
-    perf_end=perf_start+count_events (cfile->event_list,FALSE,0,0)-1;
+    perf_end=perf_start+count_events(cfile->event_list,FALSE,0,0)-1;
   }
-  com=g_strdup_printf("%s deorder \"%s\" %d %d %d \"%s\" %d",prefs->backend,cfile->handle,
-		      perf_start,cfile->frames,perf_end,
-		      get_image_ext_for_type(cfile->img_type),leave_bak);
+  com=lives_strdup_printf("%s deorder \"%s\" %d %d %d \"%s\" %d",prefs->backend,cfile->handle,
+                          perf_start,cfile->frames,perf_end,
+                          get_image_ext_for_type(cfile->img_type),leave_bak);
 
   unlink(cfile->info_file);
   mainw->com_failed=FALSE;
   lives_system(com,TRUE);
   if (mainw->com_failed) return cfile->frames;
 
-  do_progress_dialog(TRUE,FALSE,_ ("Deordering frames"));
-  g_free(com);
+  do_progress_dialog(TRUE,FALSE,_("Deordering frames"));
+  lives_free(com);
 
 
   // check for EOF
@@ -2121,7 +2088,7 @@
 boolean resample_clipboard(double new_fps) {
   // resample the clipboard video - if we already did it once, it is
   // quicker the second time
-  gchar *msg,*com;
+  char *msg,*com;
   int current_file=mainw->current_file;
 
   mainw->no_switch_dprint=TRUE;
@@ -2141,8 +2108,8 @@
     mainw->current_file=0;
 
     // copy .mgk to .img_ext and .img_ext to .bak (i.e redo the resample)
-    com=g_strdup_printf("%s redo \"%s\" %d %d \"%s\"",prefs->backend,cfile->handle,1,new_frames,
-			get_image_ext_for_type(cfile->img_type));
+    com=lives_strdup_printf("%s redo \"%s\" %d %d \"%s\"",prefs->backend,cfile->handle,1,new_frames,
+                            get_image_ext_for_type(cfile->img_type));
     unlink(cfile->info_file);
     mainw->com_failed=FALSE;
     lives_system(com,FALSE);
@@ -2157,30 +2124,29 @@
     cfile->progress_end=new_frames;
     cfile->old_frames=cfile->frames;
     // show a progress dialog, not cancellable
-    do_progress_dialog(TRUE,FALSE,_ ("Resampling clipboard video"));
-    g_free(com);
+    do_progress_dialog(TRUE,FALSE,_("Resampling clipboard video"));
+    lives_free(com);
     cfile->frames=new_frames;
     cfile->undo_action=UNDO_RESAMPLE;
     cfile->fps=cfile->undo1_dbl;
     cfile->undo1_dbl=old_fps;
-    msg=g_strdup_printf(_ ("Clipboard was resampled to %d frames.\n"),cfile->frames);
+    msg=lives_strdup_printf(_("Clipboard was resampled to %d frames.\n"),cfile->frames);
     d_print(msg);
-    g_free(msg);
+    lives_free(msg);
     mainw->current_file=current_file;
-  }
-  else {
+  } else {
     if (clipboard->undo1_dbl<clipboard->fps) {
       int old_frames=count_resampled_frames(clipboard->frames,clipboard->fps,clipboard->undo1_dbl);
       mainw->current_file=0;
-      com=g_strdup_printf("%s undo \"%s\" %d %d \"%s\"",prefs->backend,cfile->handle,old_frames+1,cfile->frames,
-			  get_image_ext_for_type(cfile->img_type));
+      com=lives_strdup_printf("%s undo \"%s\" %d %d \"%s\"",prefs->backend,cfile->handle,old_frames+1,cfile->frames,
+                              get_image_ext_for_type(cfile->img_type));
       unlink(cfile->info_file);
       lives_system(com,FALSE);
       cfile->progress_start=old_frames+1;
       cfile->progress_end=cfile->frames;
       // show a progress dialog, not cancellable
-      do_progress_dialog(TRUE,FALSE,_ ("Resampling clipboard video"));
-      g_free(com);
+      do_progress_dialog(TRUE,FALSE,_("Resampling clipboard video"));
+      lives_free(com);
     }
 
     // resample to cfile fps
@@ -2196,13 +2162,13 @@
     on_resample_vid_ok(NULL,NULL);
     mainw->current_file=current_file;
     if (clipboard->fps!=new_fps) {
-      d_print (_ ("resampling error..."));
+      d_print(_("resampling error..."));
       mainw->error=1;
       mainw->no_switch_dprint=FALSE;
       return FALSE;
     }
     // clipboard->fps now holds new_fps, clipboard->undo1_dbl holds orig fps
-    // BUT we will later undo this, then clipboard->fps will hold orig fps, 
+    // BUT we will later undo this, then clipboard->fps will hold orig fps,
     // clipboard->undo1_dbl will hold resampled fps
 
   }

LiVES-2.2.8.tar.bz2/src/resample.h -> LiVES-2.4.1.tar.bz2/src/resample.h Changed

@@ -40,31 +40,31 @@
 
 weed_timecode_t q_gint64(weed_timecode_t in, double fps);
 weed_timecode_t q_gint64_floor(weed_timecode_t in, double fps);
-weed_timecode_t q_dbl (double in, double fps);
+weed_timecode_t q_dbl(double in, double fps);
 
 
-weed_plant_t *quantise_events (weed_plant_t *in_list, double new_fps, boolean allow_gap); ///< quantise frame events for a single clip
+weed_plant_t *quantise_events(weed_plant_t *in_list, double new_fps, boolean allow_gap);  ///< quantise frame events for a single clip
 
 ///////////////////////////////////////////////////////
-int count_resampled_frames (int in_frames, double orig_fps, double resampled_fps);
+int count_resampled_frames(int in_frames, double orig_fps, double resampled_fps);
 
 /////////////////////////////////////////
 
 // GUI functions
 /// window change speed from Tools menu
-void create_new_pb_speed (short type);
+void create_new_pb_speed(short type);
 
 /// resample audio window
 ///
-/// type 1 : show current and new, 
+/// type 1 : show current and new,
 /// type 2 : show new
-_resaudw* create_resaudw (short type, render_details *rdet, LiVESWidget *top_vbox);
+_resaudw *create_resaudw(short type, render_details *rdet, LiVESWidget *top_vbox);
 
-void on_change_speed_activate (LiVESMenuItem *, gpointer);
-void on_change_speed_ok_clicked (LiVESButton *, gpointer);
+void on_change_speed_activate(LiVESMenuItem *, livespointer);
+void on_change_speed_ok_clicked(LiVESButton *, livespointer);
 
-boolean auto_resample_resize (int width, int height, double fps, int fps_num, 
-			       int fps_denom, int arate, int asigned, boolean swap_endian);
+boolean auto_resample_resize(int width, int height, double fps, int fps_num,
+                             int fps_denom, int arate, int asigned, boolean swap_endian);
 int reorder_frames(int rwidth, int rheight);
 int deorder_frames(int old_framecount, boolean leave_bak); ///< leave_bak is a special mode for the clipboard

LiVES-2.2.8.tar.bz2/src/rfx-builder.c -> LiVES-2.4.1.tar.bz2/src/rfx-builder.c Changed

@@ -19,40 +19,40 @@
 
 static void table_select_row(rfx_build_window_t *rfxbuilder, int row);
 
-void on_new_rfx_activate (LiVESMenuItem *menuitem, gpointer user_data) {
+void on_new_rfx_activate(LiVESMenuItem *menuitem, livespointer user_data) {
   rfx_build_window_t *rfxbuilder;
 
   if (!check_builder_programs()) return;
   rfxbuilder=make_rfx_build_window(NULL,RFX_STATUS_ANY);
-  lives_widget_show (rfxbuilder->dialog);
+  lives_widget_show(rfxbuilder->dialog);
 }
 
-void on_edit_rfx_activate (LiVESMenuItem *menuitem, gpointer user_data) {
+void on_edit_rfx_activate(LiVESMenuItem *menuitem, livespointer user_data) {
   rfx_build_window_t *rfxbuilder;
-  gchar *script_name;
-  short status=GPOINTER_TO_INT (user_data);
+  char *script_name;
+  short status=LIVES_POINTER_TO_INT(user_data);
 
   if (!check_builder_programs()) return;
   if (status!=RFX_STATUS_TEST) return; // we only edit test effects currently
 
-  if ((script_name=prompt_for_script_name (NULL,RFX_STATUS_TEST))==NULL) return;
-  if (!strlen (script_name)) {
-    g_free (script_name);
+  if ((script_name=prompt_for_script_name(NULL,RFX_STATUS_TEST))==NULL) return;
+  if (!strlen(script_name)) {
+    lives_free(script_name);
     return;
   }
   if ((rfxbuilder=make_rfx_build_window(script_name,RFX_STATUS_TEST))==NULL) {
-    g_free (script_name);
+    lives_free(script_name);
     return; // script not loaded
   }
-  g_free (script_name);
+  lives_free(script_name);
   rfxbuilder->mode=RFX_BUILDER_MODE_EDIT;
-  rfxbuilder->oname=g_strdup (lives_entry_get_text (LIVES_ENTRY (rfxbuilder->name_entry)));
-  lives_widget_show (rfxbuilder->dialog);
+  rfxbuilder->oname=lives_strdup(lives_entry_get_text(LIVES_ENTRY(rfxbuilder->name_entry)));
+  lives_widget_show(rfxbuilder->dialog);
 }
 
 
-void on_copy_rfx_activate (LiVESMenuItem *menuitem, gpointer user_data) {
-  short status=GPOINTER_TO_INT (user_data);
+void on_copy_rfx_activate(LiVESMenuItem *menuitem, livespointer user_data) {
+  short status=LIVES_POINTER_TO_INT(user_data);
 
   if (!check_builder_programs()) return;
   if (status!=RFX_STATUS_TEST) return; // we only copy to test effects currently
@@ -61,23 +61,23 @@
   // script and set the name : note, we have no rfxbuilder reference
 
   // TODO - use RFXBUILDER_MODE-*
-  prompt_for_script_name (NULL,RFX_STATUS_COPY);
+  prompt_for_script_name(NULL,RFX_STATUS_COPY);
 }
 
 
-void on_rename_rfx_activate (LiVESMenuItem *menuitem, gpointer user_data) {
-  short status=GPOINTER_TO_INT (user_data);
+void on_rename_rfx_activate(LiVESMenuItem *menuitem, livespointer user_data) {
+  short status=LIVES_POINTER_TO_INT(user_data);
 
   if (status!=RFX_STATUS_TEST) return; // we only copy to test effects currently
 
-  prompt_for_script_name (NULL,RFX_STATUS_RENAME);
+  prompt_for_script_name(NULL,RFX_STATUS_RENAME);
 }
 
 
 
 
 
-rfx_build_window_t *make_rfx_build_window (const gchar *script_name, lives_rfx_status_t status) {
+rfx_build_window_t *make_rfx_build_window(const char *script_name, lives_rfx_status_t status) {
   // TODO - set mnemonic widgets for entries
 
   LiVESWidget *dialog_vbox;
@@ -89,16 +89,16 @@
   LiVESWidget *scrollw;
   LiVESWidget *top_vbox;
 
-  GSList *radiobutton_type_group = NULL;
-  GList *langc=NULL;
+  LiVESSList *radiobutton_type_group = NULL;
+  LiVESList *langc=NULL;
 
-  rfx_build_window_t *rfxbuilder=(rfx_build_window_t *)g_malloc (sizeof(rfx_build_window_t));
+  rfx_build_window_t *rfxbuilder=(rfx_build_window_t *)lives_malloc(sizeof(rfx_build_window_t));
 
-  LiVESAccelGroup *accel_group=LIVES_ACCEL_GROUP(lives_accel_group_new ());
+  LiVESAccelGroup *accel_group=LIVES_ACCEL_GROUP(lives_accel_group_new());
 
-  gchar *tmp,*tmp2,*title,*string;
+  char *tmp,*tmp2,*title,*string;
 
-  rfxbuilder->rfx_version=g_strdup(RFX_VERSION);
+  rfxbuilder->rfx_version=lives_strdup(RFX_VERSION);
 
   rfxbuilder->type=RFX_BUILD_TYPE_EFFECT1; // the default
 
@@ -113,11 +113,11 @@
 
   rfxbuilder->plugin_version=1;
 
-  rfxbuilder->pre_code=g_strdup ("");
-  rfxbuilder->loop_code=g_strdup ("");
-  rfxbuilder->post_code=g_strdup ("");
+  rfxbuilder->pre_code=lives_strdup("");
+  rfxbuilder->loop_code=lives_strdup("");
+  rfxbuilder->post_code=lives_strdup("");
 
-  rfxbuilder->field_delim=g_strdup ("|");
+  rfxbuilder->field_delim=lives_strdup("|");
 
   rfxbuilder->script_name=NULL;  // use default name.script
   rfxbuilder->oname=NULL;
@@ -130,124 +130,129 @@
 
 
   if (script_name==NULL) {
-    title=g_strdup(_("LiVES: - New Test RFX"));
-  }
-  else {
-    title=g_strdup(_("LiVES: - Edit Test RFX"));
+    title=lives_strdup(_("LiVES: - New Test RFX"));
+  } else {
+    title=lives_strdup(_("LiVES: - Edit Test RFX"));
   }
 
-  rfxbuilder->dialog = lives_standard_dialog_new (title,FALSE);
-  g_free(title);
+  rfxbuilder->dialog = lives_standard_dialog_new(title,FALSE,-1,-1);
+  lives_free(title);
 
   if (prefs->show_gui) {
     lives_window_set_transient_for(LIVES_WINDOW(rfxbuilder->dialog),LIVES_WINDOW(mainw->LiVES));
   }
 
 
-  lives_window_add_accel_group (LIVES_WINDOW (rfxbuilder->dialog), accel_group);
+  lives_window_add_accel_group(LIVES_WINDOW(rfxbuilder->dialog), accel_group);
 
-  lives_container_set_border_width (LIVES_CONTAINER (rfxbuilder->dialog), widget_opts.border_width>>1);
+  lives_container_set_border_width(LIVES_CONTAINER(rfxbuilder->dialog), widget_opts.border_width>>1);
 
   dialog_vbox = lives_dialog_get_content_area(LIVES_DIALOG(rfxbuilder->dialog));
 
-  top_vbox = lives_vbox_new (FALSE, 0);
+  top_vbox = lives_vbox_new(FALSE, 0);
 
-  scrollw = lives_standard_scrolled_window_new ((PREF_RFXDIALOG_W<mainw->scr_width-20.*widget_opts.scale)?
-						PREF_RFXDIALOG_W:mainw->scr_width-20.*widget_opts.scale, 
-						(PREF_RFXDIALOG_H<mainw->scr_height-60.*widget_opts.scale)?
-						PREF_RFXDIALOG_H:mainw->scr_height-60.*widget_opts.scale,top_vbox);
-  lives_box_pack_start (LIVES_BOX (dialog_vbox), scrollw, TRUE, TRUE, 0);
+  scrollw = lives_standard_scrolled_window_new((PREF_RFXDIALOG_W<mainw->scr_width-20.*widget_opts.scale)?
+            PREF_RFXDIALOG_W:mainw->scr_width-20.*widget_opts.scale,
+            (PREF_RFXDIALOG_H<mainw->scr_height-60.*widget_opts.scale)?
+            PREF_RFXDIALOG_H:mainw->scr_height-60.*widget_opts.scale,top_vbox);
+  lives_box_pack_start(LIVES_BOX(dialog_vbox), scrollw, TRUE, TRUE, 0);
 
   // types
-  hbox = lives_hbox_new (FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (top_vbox), hbox, TRUE, TRUE, 0);
+  hbox = lives_hbox_new(FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(top_vbox), hbox, TRUE, TRUE, 0);
 
 
-  label = lives_standard_label_new (_("Type:"));
-  lives_box_pack_start (LIVES_BOX (hbox), label, TRUE, FALSE, widget_opts.packing_width);
+  label = lives_standard_label_new(_("Type:"));
+  lives_box_pack_start(LIVES_BOX(hbox), label, TRUE, FALSE, widget_opts.packing_width);
 
   string=lives_fx_cat_to_text(LIVES_FX_CAT_EFFECT,FALSE);
-  rfxbuilder->type_effect1_radiobutton = lives_standard_radio_button_new (string,FALSE,radiobutton_type_group,LIVES_BOX(hbox),NULL);
-  radiobutton_type_group = lives_radio_button_get_group (LIVES_RADIO_BUTTON (rfxbuilder->type_effect1_radiobutton));
-  g_free(string);
+  rfxbuilder->type_effect1_radiobutton = lives_standard_radio_button_new(string,FALSE,radiobutton_type_group,LIVES_BOX(hbox),NULL);
+  radiobutton_type_group = lives_radio_button_get_group(LIVES_RADIO_BUTTON(rfxbuilder->type_effect1_radiobutton));
+  lives_free(string);
 
   string=lives_fx_cat_to_text(LIVES_FX_CAT_TRANSITION,FALSE);
-  rfxbuilder->type_effect2_radiobutton = lives_standard_radio_button_new (string,FALSE,radiobutton_type_group,LIVES_BOX(hbox),NULL);
-  radiobutton_type_group = lives_radio_button_get_group (LIVES_RADIO_BUTTON (rfxbuilder->type_effect2_radiobutton));
-  g_free(string);
+  rfxbuilder->type_effect2_radiobutton = lives_standard_radio_button_new(string,FALSE,radiobutton_type_group,LIVES_BOX(hbox),NULL);
+  radiobutton_type_group = lives_radio_button_get_group(LIVES_RADIO_BUTTON(rfxbuilder->type_effect2_radiobutton));
+  lives_free(string);
 
   string=lives_fx_cat_to_text(LIVES_FX_CAT_VIDEO_GENERATOR,FALSE);
-  rfxbuilder->type_effect0_radiobutton = lives_standard_radio_button_new (string,FALSE,radiobutton_type_group,LIVES_BOX(hbox),NULL);
-  radiobutton_type_group = lives_radio_button_get_group (LIVES_RADIO_BUTTON (rfxbuilder->type_effect0_radiobutton));
-  g_free(string);
+  rfxbuilder->type_effect0_radiobutton = lives_standard_radio_button_new(string,FALSE,radiobutton_type_group,LIVES_BOX(hbox),NULL);
+  radiobutton_type_group = lives_radio_button_get_group(LIVES_RADIO_BUTTON(rfxbuilder->type_effect0_radiobutton));
+  lives_free(string);
+
+  rfxbuilder->type_tool_radiobutton = lives_standard_radio_button_new(_("tool"),FALSE,radiobutton_type_group,LIVES_BOX(hbox),NULL);
+  radiobutton_type_group = lives_radio_button_get_group(LIVES_RADIO_BUTTON(rfxbuilder->type_tool_radiobutton));
+  lives_widget_show(label);
 
-  rfxbuilder->type_tool_radiobutton = lives_standard_radio_button_new (_("tool"),FALSE,radiobutton_type_group,LIVES_BOX(hbox),NULL);
-  radiobutton_type_group = lives_radio_button_get_group (LIVES_RADIO_BUTTON (rfxbuilder->type_tool_radiobutton));  lives_widget_show (label);
-
-  rfxbuilder->type_utility_radiobutton = lives_standard_radio_button_new (_("utility"),FALSE,radiobutton_type_group,LIVES_BOX(hbox),NULL);
+  rfxbuilder->type_utility_radiobutton = lives_standard_radio_button_new(_("utility"),FALSE,radiobutton_type_group,LIVES_BOX(hbox),NULL);
 
 
   // name
 
-  rfxbuilder->name_entry = lives_standard_entry_new ((tmp=g_strdup(_("Name:          "))),FALSE,NULL,-1,-1,
-						     LIVES_BOX(top_vbox),(tmp2=g_strdup(_("The name of the plugin. No spaces allowed.")))
-						     );
-  g_free(tmp); g_free(tmp2);
+  rfxbuilder->name_entry = lives_standard_entry_new((tmp=lives_strdup(_("Name:          "))),FALSE,NULL,-1,-1,
+                           LIVES_BOX(top_vbox),(tmp2=lives_strdup(_("The name of the plugin. No spaces allowed.")))
+                                                   );
+  lives_free(tmp);
+  lives_free(tmp2);
 
   // version
-  hbox = lives_hbox_new (FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (top_vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
+  hbox = lives_hbox_new(FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(top_vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
 
-  rfxbuilder->spinbutton_version = lives_standard_spin_button_new ((tmp=g_strdup(_("Version:       "))),FALSE,
-								   rfxbuilder->plugin_version, rfxbuilder->plugin_version, 1000000., 1., 1., 0,
-								   LIVES_BOX(hbox),(tmp2=g_strdup(_ ("The script version.")))
-								   );
-  g_free(tmp); g_free(tmp2);
+  rfxbuilder->spinbutton_version = lives_standard_spin_button_new((tmp=lives_strdup(_("Version:       "))),FALSE,
+                                   rfxbuilder->plugin_version, rfxbuilder->plugin_version, 1000000., 1., 1., 0,
+                                   LIVES_BOX(hbox),(tmp2=lives_strdup(_("The script version.")))
+                                                                 );
+  lives_free(tmp);
+  lives_free(tmp2);
 
 
   // author
 
-  rfxbuilder->author_entry = lives_standard_entry_new ((tmp=g_strdup(_("    Author:       "))),FALSE,NULL,-1,-1,
-						       LIVES_BOX(hbox),(tmp2=g_strdup(_("The script author.")))
-						       );
-  g_free(tmp); g_free(tmp2);
+  rfxbuilder->author_entry = lives_standard_entry_new((tmp=lives_strdup(_("    Author:       "))),FALSE,NULL,-1,-1,
+                             LIVES_BOX(hbox),(tmp2=lives_strdup(_("The script author.")))
+                                                     );
+  lives_free(tmp);
+  lives_free(tmp2);
 
   // URL
 
-  rfxbuilder->url_entry = lives_standard_entry_new ((tmp=g_strdup(_("    URL (optional):       "))),FALSE,NULL,-1,-1,
-						    LIVES_BOX(top_vbox),(tmp2=g_strdup(_("URL for the plugin maintainer.")))
-						    );
-  g_free(tmp); g_free(tmp2);
+  rfxbuilder->url_entry = lives_standard_entry_new((tmp=lives_strdup(_("    URL (optional):       "))),FALSE,NULL,-1,-1,
+                          LIVES_BOX(top_vbox),(tmp2=lives_strdup(_("URL for the plugin maintainer.")))
+                                                  );
+  lives_free(tmp);
+  lives_free(tmp2);
 
 
   // menu entry
 
 
-  rfxbuilder->menu_text_entry = lives_standard_entry_new ((tmp=g_strdup(_("Menu text:    "))),FALSE,NULL,-1,-1,
-							  LIVES_BOX(top_vbox),(tmp2=g_strdup(_("The text to show in the menu.")))
-							  );
-  g_free(tmp); g_free(tmp2);
+  rfxbuilder->menu_text_entry = lives_standard_entry_new((tmp=lives_strdup(_("Menu text:    "))),FALSE,NULL,-1,-1,
+                                LIVES_BOX(top_vbox),(tmp2=lives_strdup(_("The text to show in the menu.")))
+                                                        );
+  lives_free(tmp);
+  lives_free(tmp2);
 
 
   rfxbuilder->action_desc_hsep = add_hsep_to_box(LIVES_BOX(top_vbox));
 
   // action description
 
-  rfxbuilder->action_desc_hbox = lives_hbox_new (FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (top_vbox), rfxbuilder->action_desc_hbox, FALSE, FALSE, widget_opts.packing_height);
+  rfxbuilder->action_desc_hbox = lives_hbox_new(FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(top_vbox), rfxbuilder->action_desc_hbox, FALSE, FALSE, widget_opts.packing_height);
 
-  rfxbuilder->action_desc_entry = lives_standard_entry_new ((tmp=g_strdup(_("Action description:        "))),FALSE,NULL,-1,-1,
-							    LIVES_BOX(rfxbuilder->action_desc_hbox),
-							    (tmp2=g_strdup(_("Describe what the plugin is doing. E.g. \"Edge detecting\"")))
-							    );
+  rfxbuilder->action_desc_entry = lives_standard_entry_new((tmp=lives_strdup(_("Action description:        "))),FALSE,NULL,-1,-1,
+                                  LIVES_BOX(rfxbuilder->action_desc_hbox),
+                                  (tmp2=lives_strdup(_("Describe what the plugin is doing. E.g. \"Edge detecting\"")))
+                                                          );
 
 
 
-  rfxbuilder->spinbutton_min_frames = lives_standard_spin_button_new ((tmp=g_strdup(_("Minimum frames:"))),FALSE,
-								      1., 1., 1000., 1., 1., 0,
-								      LIVES_BOX(top_vbox),
-								      (tmp2=g_strdup(_("Minimum number of frames this effect/tool can be applied to. Normally 1.")))
-								      );
+  rfxbuilder->spinbutton_min_frames = lives_standard_spin_button_new((tmp=lives_strdup(_("Minimum frames:"))),FALSE,
+                                      1., 1., 1000., 1., 1., 0,
+                                      LIVES_BOX(top_vbox),
+                                      (tmp2=lives_strdup(_("Minimum number of frames this effect/tool can be applied to. Normally 1.")))
+                                                                    );
 
 
   rfxbuilder->min_frames_label=widget_opts.last_label;
@@ -257,195 +262,194 @@
 
   add_hsep_to_box(LIVES_BOX(top_vbox));
 
-  rfxbuilder->requirements_button=lives_button_new_with_mnemonic (_ ("_Requirements..."));
-  lives_box_pack_start (LIVES_BOX (top_vbox), rfxbuilder->requirements_button, TRUE, TRUE, 0);
-  lives_widget_set_tooltip_text( rfxbuilder->requirements_button,
-			(_ ("Enter any binaries required by the plugin.")));
+  rfxbuilder->requirements_button=lives_button_new_with_mnemonic(_("_Requirements..."));
+  lives_box_pack_start(LIVES_BOX(top_vbox), rfxbuilder->requirements_button, TRUE, TRUE, 0);
+  lives_widget_set_tooltip_text(rfxbuilder->requirements_button,
+                                (_("Enter any binaries required by the plugin.")));
 
   add_hsep_to_box(LIVES_BOX(top_vbox));
 
-  rfxbuilder->properties_button=lives_button_new_with_mnemonic (_ ("_Properties..."));
-  lives_box_pack_start (LIVES_BOX (top_vbox), rfxbuilder->properties_button, TRUE, TRUE, 0);
-  lives_widget_set_tooltip_text( rfxbuilder->properties_button,
-			(_ ("Set properties for the plugin. Optional.")));
+  rfxbuilder->properties_button=lives_button_new_with_mnemonic(_("_Properties..."));
+  lives_box_pack_start(LIVES_BOX(top_vbox), rfxbuilder->properties_button, TRUE, TRUE, 0);
+  lives_widget_set_tooltip_text(rfxbuilder->properties_button,
+                                (_("Set properties for the plugin. Optional.")));
 
   add_hsep_to_box(LIVES_BOX(top_vbox));
 
-  rfxbuilder->params_button=lives_button_new_with_mnemonic (_ ("_Parameters..."));
-  lives_box_pack_start (LIVES_BOX (top_vbox), rfxbuilder->params_button, TRUE, TRUE, 0);
-  lives_widget_set_tooltip_text( rfxbuilder->params_button,
-			(_ ("Set up parameters used in pre/loop/post/trigger code. Optional.")));
+  rfxbuilder->params_button=lives_button_new_with_mnemonic(_("_Parameters..."));
+  lives_box_pack_start(LIVES_BOX(top_vbox), rfxbuilder->params_button, TRUE, TRUE, 0);
+  lives_widget_set_tooltip_text(rfxbuilder->params_button,
+                                (_("Set up parameters used in pre/loop/post/trigger code. Optional.")));
 
   add_hsep_to_box(LIVES_BOX(top_vbox));
 
-  rfxbuilder->param_window_button=lives_button_new_with_mnemonic (_ ("Parameter _Window Hints..."));
-  lives_box_pack_start (LIVES_BOX (top_vbox), rfxbuilder->param_window_button, TRUE, TRUE, 0);
-  lives_widget_set_tooltip_text( rfxbuilder->param_window_button,
-			(_ ("Set hints about how to lay out the parameter window. Optional.")));
+  rfxbuilder->param_window_button=lives_button_new_with_mnemonic(_("Parameter _Window Hints..."));
+  lives_box_pack_start(LIVES_BOX(top_vbox), rfxbuilder->param_window_button, TRUE, TRUE, 0);
+  lives_widget_set_tooltip_text(rfxbuilder->param_window_button,
+                                (_("Set hints about how to lay out the parameter window. Optional.")));
 
   add_hsep_to_box(LIVES_BOX(top_vbox));
 
-  langc = g_list_append (langc, (gpointer)"0xF0 - LiVES-Perl");
+  langc = lives_list_append(langc, (livespointer)"0xF0 - LiVES-Perl");
 
-  rfxbuilder->langc_combo = lives_standard_combo_new ((tmp=g_strdup(_("_Language code:"))),TRUE,langc,LIVES_BOX(top_vbox),
-						      (tmp2=g_strdup(_ ("Language for pre/loop/post/triggers. Optional."))));
+  rfxbuilder->langc_combo = lives_standard_combo_new((tmp=lives_strdup(_("_Language code:"))),TRUE,langc,LIVES_BOX(top_vbox),
+                            (tmp2=lives_strdup(_("Language for pre/loop/post/triggers. Optional."))));
 
-  g_free(tmp);
-  g_free(tmp2);
-  g_list_free(langc);
+  lives_free(tmp);
+  lives_free(tmp2);
+  lives_list_free(langc);
 
 
   add_hsep_to_box(LIVES_BOX(top_vbox));
 
-  rfxbuilder->pre_button=lives_button_new_with_mnemonic (_ ("_Pre loop code..."));
-  lives_box_pack_start (LIVES_BOX (top_vbox), rfxbuilder->pre_button, TRUE, TRUE, 0);
-  lives_widget_set_tooltip_text( rfxbuilder->pre_button,
-			(_ ("Code to be executed before the loop. Optional.")));
+  rfxbuilder->pre_button=lives_button_new_with_mnemonic(_("_Pre loop code..."));
+  lives_box_pack_start(LIVES_BOX(top_vbox), rfxbuilder->pre_button, TRUE, TRUE, 0);
+  lives_widget_set_tooltip_text(rfxbuilder->pre_button,
+                                (_("Code to be executed before the loop. Optional.")));
 
   add_hsep_to_box(LIVES_BOX(top_vbox));
 
-  rfxbuilder->loop_button=lives_button_new_with_mnemonic (_ ("_Loop code..."));
-  lives_box_pack_start (LIVES_BOX (top_vbox), rfxbuilder->loop_button, TRUE, TRUE, 0);
-  lives_widget_set_tooltip_text( rfxbuilder->loop_button,
-			(_ ("Loop code to be applied to each frame.")));
+  rfxbuilder->loop_button=lives_button_new_with_mnemonic(_("_Loop code..."));
+  lives_box_pack_start(LIVES_BOX(top_vbox), rfxbuilder->loop_button, TRUE, TRUE, 0);
+  lives_widget_set_tooltip_text(rfxbuilder->loop_button,
+                                (_("Loop code to be applied to each frame.")));
 
   add_hsep_to_box(LIVES_BOX(top_vbox));
 
-  rfxbuilder->post_button=lives_button_new_with_mnemonic (_ ("_Post loop code..."));
-  lives_box_pack_start (LIVES_BOX (top_vbox), rfxbuilder->post_button, TRUE, TRUE, 0);
-  lives_widget_set_tooltip_text( rfxbuilder->post_button,
-			(_ ("Code to be executed after the loop. Optional.")));
+  rfxbuilder->post_button=lives_button_new_with_mnemonic(_("_Post loop code..."));
+  lives_box_pack_start(LIVES_BOX(top_vbox), rfxbuilder->post_button, TRUE, TRUE, 0);
+  lives_widget_set_tooltip_text(rfxbuilder->post_button,
+                                (_("Code to be executed after the loop. Optional.")));
 
   add_hsep_to_box(LIVES_BOX(top_vbox));
 
-  rfxbuilder->trigger_button=lives_button_new_with_mnemonic (_ ("_Trigger code..."));
-  lives_box_pack_start (LIVES_BOX (top_vbox), rfxbuilder->trigger_button, TRUE, TRUE, 0);
-  lives_widget_set_tooltip_text( rfxbuilder->trigger_button,
-			(_ ("Set trigger code for when the parameter window is shown, or when a parameter is changed. Optional (except for Utilities).")));
-
-
-  dialog_action_area = lives_dialog_get_action_area(LIVES_DIALOG (rfxbuilder->dialog));
-  lives_button_box_set_layout (LIVES_BUTTON_BOX (dialog_action_area), LIVES_BUTTONBOX_END);
-
-  cancelbutton = lives_button_new_from_stock (LIVES_STOCK_CANCEL);
-  lives_dialog_add_action_widget (LIVES_DIALOG (rfxbuilder->dialog), cancelbutton, LIVES_RESPONSE_CANCEL);
-
-  okbutton = lives_button_new_from_stock (LIVES_STOCK_OK);
-  lives_dialog_add_action_widget (LIVES_DIALOG (rfxbuilder->dialog), okbutton, LIVES_RESPONSE_OK);
-  lives_widget_set_can_focus_and_default (okbutton);
-
-  lives_widget_add_accelerator (cancelbutton, LIVES_WIDGET_CLICKED_EVENT, accel_group,
-                              LIVES_KEY_Escape, (LiVESXModifierType)0, (LiVESAccelFlags)0);
-
-  lives_widget_add_accelerator (okbutton, LIVES_WIDGET_CLICKED_EVENT, accel_group,
-                              LIVES_KEY_Return, (LiVESXModifierType)0, (LiVESAccelFlags)0);
-
-
-  lives_signal_connect (LIVES_GUI_OBJECT (okbutton), LIVES_WIDGET_CLICKED_EVENT,
-		    LIVES_GUI_CALLBACK (on_rfxbuilder_ok),
-		    (gpointer)rfxbuilder);
-
-  lives_signal_connect (LIVES_GUI_OBJECT (cancelbutton), LIVES_WIDGET_CLICKED_EVENT,
-		    LIVES_GUI_CALLBACK (on_rfxbuilder_cancel),
-		    (gpointer)rfxbuilder);
-
-  lives_signal_connect(rfxbuilder->requirements_button, LIVES_WIDGET_CLICKED_EVENT, 
-		   LIVES_GUI_CALLBACK (on_list_table_clicked),
-		   (gpointer)rfxbuilder);
-
-  lives_signal_connect(rfxbuilder->properties_button, LIVES_WIDGET_CLICKED_EVENT, 
-		   LIVES_GUI_CALLBACK (on_properties_clicked),
-		   (gpointer)rfxbuilder);
-
-  lives_signal_connect(rfxbuilder->params_button, LIVES_WIDGET_CLICKED_EVENT, 
-		   LIVES_GUI_CALLBACK (on_list_table_clicked),
-		   (gpointer)rfxbuilder);
-
-  lives_signal_connect(rfxbuilder->param_window_button, LIVES_WIDGET_CLICKED_EVENT, 
-		   LIVES_GUI_CALLBACK (on_list_table_clicked),
-		   (gpointer)rfxbuilder);
-
-  lives_signal_connect(rfxbuilder->trigger_button, LIVES_WIDGET_CLICKED_EVENT, 
-		   LIVES_GUI_CALLBACK (on_list_table_clicked),
-		   (gpointer)rfxbuilder);
-
-  lives_signal_connect(rfxbuilder->pre_button, LIVES_WIDGET_CLICKED_EVENT, 
-		   LIVES_GUI_CALLBACK (on_code_clicked),
-		   (gpointer)rfxbuilder);
-
-  lives_signal_connect(rfxbuilder->loop_button, LIVES_WIDGET_CLICKED_EVENT, 
-		   LIVES_GUI_CALLBACK (on_code_clicked),
-		   (gpointer)rfxbuilder);
-
-  lives_signal_connect(rfxbuilder->post_button, LIVES_WIDGET_CLICKED_EVENT, 
-		   LIVES_GUI_CALLBACK (on_code_clicked),
-		   (gpointer)rfxbuilder);
-
-  lives_signal_connect_after (LIVES_GUI_OBJECT (rfxbuilder->type_effect1_radiobutton), LIVES_WIDGET_TOGGLED_EVENT,
-			  LIVES_GUI_CALLBACK (after_rfxbuilder_type_toggled),
-			  (gpointer)rfxbuilder);
-  lives_signal_connect_after (LIVES_GUI_OBJECT (rfxbuilder->type_effect2_radiobutton), LIVES_WIDGET_TOGGLED_EVENT,
-			  LIVES_GUI_CALLBACK (after_rfxbuilder_type_toggled),
-			  (gpointer)rfxbuilder);
-  lives_signal_connect_after (LIVES_GUI_OBJECT (rfxbuilder->type_effect0_radiobutton), LIVES_WIDGET_TOGGLED_EVENT,
-			  LIVES_GUI_CALLBACK (after_rfxbuilder_type_toggled),
-			  (gpointer)rfxbuilder);
-  lives_signal_connect_after (LIVES_GUI_OBJECT (rfxbuilder->type_tool_radiobutton), LIVES_WIDGET_TOGGLED_EVENT,
-			  LIVES_GUI_CALLBACK (after_rfxbuilder_type_toggled),
-			  (gpointer)rfxbuilder);
-  lives_signal_connect_after (LIVES_GUI_OBJECT (rfxbuilder->type_utility_radiobutton), LIVES_WIDGET_TOGGLED_EVENT,
-			  LIVES_GUI_CALLBACK (after_rfxbuilder_type_toggled),
-			  (gpointer)rfxbuilder);
+  rfxbuilder->trigger_button=lives_button_new_with_mnemonic(_("_Trigger code..."));
+  lives_box_pack_start(LIVES_BOX(top_vbox), rfxbuilder->trigger_button, TRUE, TRUE, 0);
+  lives_widget_set_tooltip_text(rfxbuilder->trigger_button,
+                                (_("Set trigger code for when the parameter window is shown, or when a parameter is changed. Optional (except for Utilities).")));
+
+
+  dialog_action_area = lives_dialog_get_action_area(LIVES_DIALOG(rfxbuilder->dialog));
+  lives_button_box_set_layout(LIVES_BUTTON_BOX(dialog_action_area), LIVES_BUTTONBOX_END);
+
+  cancelbutton = lives_button_new_from_stock(LIVES_STOCK_CANCEL);
+  lives_dialog_add_action_widget(LIVES_DIALOG(rfxbuilder->dialog), cancelbutton, LIVES_RESPONSE_CANCEL);
+
+  okbutton = lives_button_new_from_stock(LIVES_STOCK_OK);
+  lives_dialog_add_action_widget(LIVES_DIALOG(rfxbuilder->dialog), okbutton, LIVES_RESPONSE_OK);
+  lives_widget_set_can_focus_and_default(okbutton);
+
+  lives_widget_add_accelerator(cancelbutton, LIVES_WIDGET_CLICKED_SIGNAL, accel_group,
+                               LIVES_KEY_Escape, (LiVESXModifierType)0, (LiVESAccelFlags)0);
+
+  lives_widget_add_accelerator(okbutton, LIVES_WIDGET_CLICKED_SIGNAL, accel_group,
+                               LIVES_KEY_Return, (LiVESXModifierType)0, (LiVESAccelFlags)0);
+
+
+  lives_signal_connect(LIVES_GUI_OBJECT(okbutton), LIVES_WIDGET_CLICKED_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_rfxbuilder_ok),
+                       (livespointer)rfxbuilder);
+
+  lives_signal_connect(LIVES_GUI_OBJECT(cancelbutton), LIVES_WIDGET_CLICKED_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_rfxbuilder_cancel),
+                       (livespointer)rfxbuilder);
+
+  lives_signal_connect(rfxbuilder->requirements_button, LIVES_WIDGET_CLICKED_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_list_table_clicked),
+                       (livespointer)rfxbuilder);
+
+  lives_signal_connect(rfxbuilder->properties_button, LIVES_WIDGET_CLICKED_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_properties_clicked),
+                       (livespointer)rfxbuilder);
+
+  lives_signal_connect(rfxbuilder->params_button, LIVES_WIDGET_CLICKED_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_list_table_clicked),
+                       (livespointer)rfxbuilder);
+
+  lives_signal_connect(rfxbuilder->param_window_button, LIVES_WIDGET_CLICKED_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_list_table_clicked),
+                       (livespointer)rfxbuilder);
+
+  lives_signal_connect(rfxbuilder->trigger_button, LIVES_WIDGET_CLICKED_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_list_table_clicked),
+                       (livespointer)rfxbuilder);
+
+  lives_signal_connect(rfxbuilder->pre_button, LIVES_WIDGET_CLICKED_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_code_clicked),
+                       (livespointer)rfxbuilder);
+
+  lives_signal_connect(rfxbuilder->loop_button, LIVES_WIDGET_CLICKED_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_code_clicked),
+                       (livespointer)rfxbuilder);
+
+  lives_signal_connect(rfxbuilder->post_button, LIVES_WIDGET_CLICKED_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_code_clicked),
+                       (livespointer)rfxbuilder);
+
+  lives_signal_connect_after(LIVES_GUI_OBJECT(rfxbuilder->type_effect1_radiobutton), LIVES_WIDGET_TOGGLED_SIGNAL,
+                             LIVES_GUI_CALLBACK(after_rfxbuilder_type_toggled),
+                             (livespointer)rfxbuilder);
+  lives_signal_connect_after(LIVES_GUI_OBJECT(rfxbuilder->type_effect2_radiobutton), LIVES_WIDGET_TOGGLED_SIGNAL,
+                             LIVES_GUI_CALLBACK(after_rfxbuilder_type_toggled),
+                             (livespointer)rfxbuilder);
+  lives_signal_connect_after(LIVES_GUI_OBJECT(rfxbuilder->type_effect0_radiobutton), LIVES_WIDGET_TOGGLED_SIGNAL,
+                             LIVES_GUI_CALLBACK(after_rfxbuilder_type_toggled),
+                             (livespointer)rfxbuilder);
+  lives_signal_connect_after(LIVES_GUI_OBJECT(rfxbuilder->type_tool_radiobutton), LIVES_WIDGET_TOGGLED_SIGNAL,
+                             LIVES_GUI_CALLBACK(after_rfxbuilder_type_toggled),
+                             (livespointer)rfxbuilder);
+  lives_signal_connect_after(LIVES_GUI_OBJECT(rfxbuilder->type_utility_radiobutton), LIVES_WIDGET_TOGGLED_SIGNAL,
+                             LIVES_GUI_CALLBACK(after_rfxbuilder_type_toggled),
+                             (livespointer)rfxbuilder);
 
 
   // edit mode
   if (script_name!=NULL) {
     // we assume the name is valid
-    gchar *script_file;
-    
+    char *script_file;
+
     switch (status) {
     case RFX_STATUS_CUSTOM:
-      script_file=g_build_filename (capable->home_dir,LIVES_CONFIG_DIR,
-				    PLUGIN_RENDERED_EFFECTS_CUSTOM_SCRIPTS,script_name,NULL);
-    break;
+      script_file=lives_build_filename(capable->home_dir,LIVES_CONFIG_DIR,
+                                       PLUGIN_RENDERED_EFFECTS_CUSTOM_SCRIPTS,script_name,NULL);
+      break;
     case RFX_STATUS_BUILTIN:
-      script_file=g_build_filename (prefs->prefix_dir,PLUGIN_SCRIPTS_DIR,
-				    PLUGIN_RENDERED_EFFECTS_BUILTIN_SCRIPTS,script_name,NULL);
-    break;
+      script_file=lives_build_filename(prefs->prefix_dir,PLUGIN_SCRIPTS_DIR,
+                                       PLUGIN_RENDERED_EFFECTS_BUILTIN_SCRIPTS,script_name,NULL);
+      break;
     default:
-      script_file=g_build_filename (capable->home_dir,LIVES_CONFIG_DIR,
-				    PLUGIN_RENDERED_EFFECTS_TEST_SCRIPTS,script_name,NULL);
-    break;
+      script_file=lives_build_filename(capable->home_dir,LIVES_CONFIG_DIR,
+                                       PLUGIN_RENDERED_EFFECTS_TEST_SCRIPTS,script_name,NULL);
+      break;
     }
-    if (!script_to_rfxbuilder (rfxbuilder,script_file)) {
-      gchar *msg=g_strdup_printf (_ ("\n\nUnable to parse the script file:\n%s\n%s\n"),script_file,mainw->msg);
+    if (!script_to_rfxbuilder(rfxbuilder,script_file)) {
+      char *msg=lives_strdup_printf(_("\n\nUnable to parse the script file:\n%s\n%s\n"),script_file,mainw->msg);
       // must use blocking error dialogs as the scriptname window is modal
-      do_blocking_error_dialog (msg);
-      g_free (msg);
-      rfxbuilder_destroy (rfxbuilder);
-      g_free (script_file);
+      do_blocking_error_dialog(msg);
+      lives_free(msg);
+      rfxbuilder_destroy(rfxbuilder);
+      lives_free(script_file);
       return NULL;
     }
-    g_free (script_file);
+    lives_free(script_file);
     switch (rfxbuilder->type) {
     case RFX_BUILD_TYPE_TOOL:
-      lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (rfxbuilder->type_tool_radiobutton),TRUE);
+      lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(rfxbuilder->type_tool_radiobutton),TRUE);
       break;
     case RFX_BUILD_TYPE_EFFECT0:
-      lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (rfxbuilder->type_effect0_radiobutton),TRUE);
+      lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(rfxbuilder->type_effect0_radiobutton),TRUE);
       break;
     case RFX_BUILD_TYPE_UTILITY:
-      lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (rfxbuilder->type_utility_radiobutton),TRUE);
+      lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(rfxbuilder->type_utility_radiobutton),TRUE);
       break;
     case RFX_BUILD_TYPE_EFFECT2:
-      lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (rfxbuilder->type_effect2_radiobutton),TRUE);
+      lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(rfxbuilder->type_effect2_radiobutton),TRUE);
       break;
     default:
       break;
     }
-  }
-  else {
-    lives_widget_grab_focus (rfxbuilder->name_entry);
+  } else {
+    lives_widget_grab_focus(rfxbuilder->name_entry);
   }
 
   lives_widget_show_all(rfxbuilder->dialog);
@@ -454,48 +458,44 @@
 }
 
 
-void after_rfxbuilder_type_toggled (LiVESToggleButton *togglebutton, gpointer user_data) {
+void after_rfxbuilder_type_toggled(LiVESToggleButton *togglebutton, livespointer user_data) {
   rfx_build_window_t *rfxbuilder=(rfx_build_window_t *)user_data;
 
-  lives_widget_set_sensitive (rfxbuilder->pre_button,TRUE);
-  lives_widget_set_sensitive (rfxbuilder->loop_button,TRUE);
-  lives_widget_set_sensitive (rfxbuilder->post_button,TRUE);
-  lives_widget_set_sensitive (rfxbuilder->requirements_button,TRUE);
-  lives_widget_set_sensitive (rfxbuilder->properties_button,TRUE);
-  lives_widget_show (rfxbuilder->spinbutton_min_frames);
-  lives_widget_show (rfxbuilder->min_frames_label);
-  lives_widget_show (rfxbuilder->action_desc_hbox);
-  lives_widget_show (rfxbuilder->action_desc_hsep);
+  lives_widget_set_sensitive(rfxbuilder->pre_button,TRUE);
+  lives_widget_set_sensitive(rfxbuilder->loop_button,TRUE);
+  lives_widget_set_sensitive(rfxbuilder->post_button,TRUE);
+  lives_widget_set_sensitive(rfxbuilder->requirements_button,TRUE);
+  lives_widget_set_sensitive(rfxbuilder->properties_button,TRUE);
+  lives_widget_show(rfxbuilder->spinbutton_min_frames);
+  lives_widget_show(rfxbuilder->min_frames_label);
+  lives_widget_show(rfxbuilder->action_desc_hbox);
+  lives_widget_show(rfxbuilder->action_desc_hsep);
 
-  if (togglebutton==LIVES_TOGGLE_BUTTON (rfxbuilder->type_effect1_radiobutton)) {
+  if (togglebutton==LIVES_TOGGLE_BUTTON(rfxbuilder->type_effect1_radiobutton)) {
     rfxbuilder->type=RFX_BUILD_TYPE_EFFECT1;
-  }
-  else if (togglebutton==LIVES_TOGGLE_BUTTON (rfxbuilder->type_effect2_radiobutton)) {
+  } else if (togglebutton==LIVES_TOGGLE_BUTTON(rfxbuilder->type_effect2_radiobutton)) {
     rfxbuilder->type=RFX_BUILD_TYPE_EFFECT2;
-    lives_widget_set_sensitive (rfxbuilder->properties_button,FALSE);
-  }
-  else if (togglebutton==LIVES_TOGGLE_BUTTON (rfxbuilder->type_effect0_radiobutton)) {
+    lives_widget_set_sensitive(rfxbuilder->properties_button,FALSE);
+  } else if (togglebutton==LIVES_TOGGLE_BUTTON(rfxbuilder->type_effect0_radiobutton)) {
     rfxbuilder->type=RFX_BUILD_TYPE_EFFECT0;
-    lives_widget_hide (rfxbuilder->spinbutton_min_frames);
-    lives_widget_hide (rfxbuilder->min_frames_label);
-  }
-  else if (togglebutton==LIVES_TOGGLE_BUTTON (rfxbuilder->type_tool_radiobutton)) {
+    lives_widget_hide(rfxbuilder->spinbutton_min_frames);
+    lives_widget_hide(rfxbuilder->min_frames_label);
+  } else if (togglebutton==LIVES_TOGGLE_BUTTON(rfxbuilder->type_tool_radiobutton)) {
     rfxbuilder->type=RFX_BUILD_TYPE_TOOL;
-    lives_widget_hide (rfxbuilder->spinbutton_min_frames);
-    lives_widget_set_sensitive (rfxbuilder->properties_button,FALSE);
-    lives_widget_hide (rfxbuilder->min_frames_label);
-  }
-  else if (togglebutton==LIVES_TOGGLE_BUTTON (rfxbuilder->type_utility_radiobutton)) {
+    lives_widget_hide(rfxbuilder->spinbutton_min_frames);
+    lives_widget_set_sensitive(rfxbuilder->properties_button,FALSE);
+    lives_widget_hide(rfxbuilder->min_frames_label);
+  } else if (togglebutton==LIVES_TOGGLE_BUTTON(rfxbuilder->type_utility_radiobutton)) {
     rfxbuilder->type=RFX_BUILD_TYPE_UTILITY;
-    lives_widget_hide (rfxbuilder->spinbutton_min_frames);
-    lives_widget_set_sensitive (rfxbuilder->properties_button,FALSE);
-    lives_widget_set_sensitive (rfxbuilder->requirements_button,FALSE);
-    lives_widget_set_sensitive (rfxbuilder->pre_button,FALSE);
-    lives_widget_set_sensitive (rfxbuilder->loop_button,FALSE);
-    lives_widget_set_sensitive (rfxbuilder->post_button,FALSE);
-    lives_widget_hide (rfxbuilder->min_frames_label);
-    lives_widget_hide (rfxbuilder->action_desc_hbox);
-    lives_widget_hide (rfxbuilder->action_desc_hsep);
+    lives_widget_hide(rfxbuilder->spinbutton_min_frames);
+    lives_widget_set_sensitive(rfxbuilder->properties_button,FALSE);
+    lives_widget_set_sensitive(rfxbuilder->requirements_button,FALSE);
+    lives_widget_set_sensitive(rfxbuilder->pre_button,FALSE);
+    lives_widget_set_sensitive(rfxbuilder->loop_button,FALSE);
+    lives_widget_set_sensitive(rfxbuilder->post_button,FALSE);
+    lives_widget_hide(rfxbuilder->min_frames_label);
+    lives_widget_hide(rfxbuilder->action_desc_hbox);
+    lives_widget_hide(rfxbuilder->action_desc_hsep);
   }
 
 }
@@ -505,7 +505,7 @@
 
 
 
-void on_list_table_clicked (LiVESButton *button, gpointer user_data) {
+void on_list_table_clicked(LiVESButton *button, livespointer user_data) {
   LiVESWidget *dialog;
   LiVESWidget *dialog_vbox;
   LiVESWidget *dialog_action_area;
@@ -518,7 +518,7 @@
   LiVESWidget *scrolledwindow;
   LiVESWidget *cancelbutton;
 
-  LiVESAccelGroup *accel_group=LIVES_ACCEL_GROUP(lives_accel_group_new ());
+  LiVESAccelGroup *accel_group=LIVES_ACCEL_GROUP(lives_accel_group_new());
 
   char *title=NULL;
 
@@ -526,41 +526,35 @@
 
   register int i;
 
-  if (button==LIVES_BUTTON (rfxbuilder->requirements_button)) {
+  if (button==LIVES_BUTTON(rfxbuilder->requirements_button)) {
     rfxbuilder->table_type=RFX_TABLE_TYPE_REQUIREMENTS;
-  }
-  else if (button==LIVES_BUTTON (rfxbuilder->params_button)) {
+  } else if (button==LIVES_BUTTON(rfxbuilder->params_button)) {
     rfxbuilder->table_type=RFX_TABLE_TYPE_PARAMS;
-  }
-  else if (button==LIVES_BUTTON (rfxbuilder->param_window_button)) {
+  } else if (button==LIVES_BUTTON(rfxbuilder->param_window_button)) {
     rfxbuilder->table_type=RFX_TABLE_TYPE_PARAM_WINDOW;
-  }
-  else if (button==LIVES_BUTTON (rfxbuilder->trigger_button)) {
+  } else if (button==LIVES_BUTTON(rfxbuilder->trigger_button)) {
     rfxbuilder->table_type=RFX_TABLE_TYPE_TRIGGERS;
   }
 
 
   if (rfxbuilder->table_type==RFX_TABLE_TYPE_REQUIREMENTS) {
-    title=g_strdup(_("LiVES: - RFX Requirements"));
+    title=lives_strdup(_("LiVES: - RFX Requirements"));
     rfxbuilder->onum_reqs=rfxbuilder->num_reqs;
-  }
-  else if (rfxbuilder->table_type==RFX_TABLE_TYPE_PARAMS) {
-    title=g_strdup(_("LiVES: - RFX Parameters"));
+  } else if (rfxbuilder->table_type==RFX_TABLE_TYPE_PARAMS) {
+    title=lives_strdup(_("LiVES: - RFX Parameters"));
     rfxbuilder->onum_params=rfxbuilder->num_params;
-  }
-  else if (rfxbuilder->table_type==RFX_TABLE_TYPE_PARAM_WINDOW) {
-    title=g_strdup(_("LiVES: - RFX Parameter Window Hints"));
+  } else if (rfxbuilder->table_type==RFX_TABLE_TYPE_PARAM_WINDOW) {
+    title=lives_strdup(_("LiVES: - RFX Parameter Window Hints"));
     rfxbuilder->onum_paramw_hints=rfxbuilder->num_paramw_hints;
-  }
-  else if (rfxbuilder->table_type==RFX_TABLE_TYPE_TRIGGERS) {
-    title=g_strdup(_("LiVES: - RFX Triggers"));
+  } else if (rfxbuilder->table_type==RFX_TABLE_TYPE_TRIGGERS) {
+    title=lives_strdup(_("LiVES: - RFX Triggers"));
     rfxbuilder->onum_triggers=rfxbuilder->num_triggers;
   }
 
-  dialog = lives_standard_dialog_new (title,FALSE);
-  if (title!=NULL) g_free(title);
+  dialog = lives_standard_dialog_new(title,FALSE,-1,-1);
+  if (title!=NULL) lives_free(title);
 
-  lives_window_add_accel_group (LIVES_WINDOW (dialog), accel_group);
+  lives_window_add_accel_group(LIVES_WINDOW(dialog), accel_group);
 
   if (prefs->show_gui) {
     lives_window_set_transient_for(LIVES_WINDOW(dialog),LIVES_WINDOW(mainw->LiVES));
@@ -573,73 +567,69 @@
   rfxbuilder->table_rows=0;
 
   if (rfxbuilder->table_type==RFX_TABLE_TYPE_REQUIREMENTS) {
-    rfxbuilder->table=lives_table_new (rfxbuilder->num_reqs,1,FALSE);
-    for (i=0;i<rfxbuilder->num_reqs;i++) {
-      on_table_add_row (NULL,(gpointer)rfxbuilder);
-      lives_entry_set_text (LIVES_ENTRY (rfxbuilder->entry[i]),rfxbuilder->reqs[i]);
-    }
-  }
-  else if (rfxbuilder->table_type==RFX_TABLE_TYPE_PARAMS) {
-    rfxbuilder->copy_params=(lives_param_t *)g_malloc (RFXBUILD_MAX_PARAMS*sizeof(lives_param_t));
-    rfxbuilder->table=lives_table_new (rfxbuilder->num_params,3,FALSE);
-    for (i=0;i<rfxbuilder->num_params;i++) {
-      param_copy (&rfxbuilder->params[i],&rfxbuilder->copy_params[i],FALSE);
-      on_table_add_row (NULL,(gpointer)rfxbuilder);
-    }
-  }
-  else if (rfxbuilder->table_type==RFX_TABLE_TYPE_PARAM_WINDOW) {
-    rfxbuilder->table=lives_table_new (rfxbuilder->table_rows,2,FALSE);
-    for (i=0;i<rfxbuilder->num_paramw_hints;i++) {
-      on_table_add_row (NULL,(gpointer)rfxbuilder);
-    }
-  }
-  else if (rfxbuilder->table_type==RFX_TABLE_TYPE_TRIGGERS) {
-    rfxbuilder->copy_triggers=(rfx_trigger_t *)g_malloc ((RFXBUILD_MAX_PARAMS+1)*sizeof(rfx_trigger_t));
-    rfxbuilder->table=lives_table_new (rfxbuilder->table_rows,1,FALSE);
-    for (i=0;i<rfxbuilder->num_triggers;i++) {
+    rfxbuilder->table=lives_table_new(rfxbuilder->num_reqs,1,FALSE);
+    for (i=0; i<rfxbuilder->num_reqs; i++) {
+      on_table_add_row(NULL,(livespointer)rfxbuilder);
+      lives_entry_set_text(LIVES_ENTRY(rfxbuilder->entry[i]),rfxbuilder->reqs[i]);
+    }
+  } else if (rfxbuilder->table_type==RFX_TABLE_TYPE_PARAMS) {
+    rfxbuilder->copy_params=(lives_param_t *)lives_malloc(RFXBUILD_MAX_PARAMS*sizeof(lives_param_t));
+    rfxbuilder->table=lives_table_new(rfxbuilder->num_params,3,FALSE);
+    for (i=0; i<rfxbuilder->num_params; i++) {
+      param_copy(&rfxbuilder->params[i],&rfxbuilder->copy_params[i],FALSE);
+      on_table_add_row(NULL,(livespointer)rfxbuilder);
+    }
+  } else if (rfxbuilder->table_type==RFX_TABLE_TYPE_PARAM_WINDOW) {
+    rfxbuilder->table=lives_table_new(rfxbuilder->table_rows,2,FALSE);
+    for (i=0; i<rfxbuilder->num_paramw_hints; i++) {
+      on_table_add_row(NULL,(livespointer)rfxbuilder);
+    }
+  } else if (rfxbuilder->table_type==RFX_TABLE_TYPE_TRIGGERS) {
+    rfxbuilder->copy_triggers=(rfx_trigger_t *)lives_malloc((RFXBUILD_MAX_PARAMS+1)*sizeof(rfx_trigger_t));
+    rfxbuilder->table=lives_table_new(rfxbuilder->table_rows,1,FALSE);
+    for (i=0; i<rfxbuilder->num_triggers; i++) {
       rfxbuilder->copy_triggers[i].when=rfxbuilder->triggers[i].when;
-      rfxbuilder->copy_triggers[i].code=g_strdup (rfxbuilder->triggers[i].code);
-      on_table_add_row (NULL,(gpointer)rfxbuilder);
+      rfxbuilder->copy_triggers[i].code=lives_strdup(rfxbuilder->triggers[i].code);
+      on_table_add_row(NULL,(livespointer)rfxbuilder);
     }
   }
 
-  hbox = lives_hbox_new (FALSE,0);
+  hbox = lives_hbox_new(FALSE,0);
 
-  lives_box_pack_start (LIVES_BOX (dialog_vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
+  lives_box_pack_start(LIVES_BOX(dialog_vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
 
-  scrolledwindow = lives_standard_scrolled_window_new (RFX_WINSIZE_H*5/6,RFX_WINSIZE_V/4,rfxbuilder->table);
+  scrolledwindow = lives_standard_scrolled_window_new(RFX_WINSIZE_H*5/6,RFX_WINSIZE_V/4,rfxbuilder->table);
 
   lives_box_pack_start(LIVES_BOX(hbox),scrolledwindow,FALSE,FALSE,widget_opts.packing_width);
 
 
   // button box on right
-  vseparator = lives_vseparator_new ();
-  lives_box_pack_start (LIVES_BOX (hbox), vseparator, TRUE, TRUE, widget_opts.packing_width);
+  vseparator = lives_vseparator_new();
+  lives_box_pack_start(LIVES_BOX(hbox), vseparator, TRUE, TRUE, widget_opts.packing_width);
 
   button_box=lives_vbutton_box_new();
-  lives_box_pack_start (LIVES_BOX (hbox), button_box, FALSE, FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(hbox), button_box, FALSE, FALSE, 0);
 
-  rfxbuilder->new_entry_button=lives_button_new_with_mnemonic (_ ("_New Entry"));
-  lives_box_pack_start (LIVES_BOX (button_box), rfxbuilder->new_entry_button, FALSE, FALSE, 0);
+  rfxbuilder->new_entry_button=lives_button_new_with_mnemonic(_("_New Entry"));
+  lives_box_pack_start(LIVES_BOX(button_box), rfxbuilder->new_entry_button, FALSE, FALSE, 0);
 
-  rfxbuilder->edit_entry_button=lives_button_new_with_mnemonic (_ ("_Edit Entry"));
-  lives_box_pack_start (LIVES_BOX (button_box), rfxbuilder->edit_entry_button, FALSE, FALSE, 0);
+  rfxbuilder->edit_entry_button=lives_button_new_with_mnemonic(_("_Edit Entry"));
+  lives_box_pack_start(LIVES_BOX(button_box), rfxbuilder->edit_entry_button, FALSE, FALSE, 0);
 
-  rfxbuilder->remove_entry_button=lives_button_new_with_mnemonic (_ ("_Remove Entry"));
-  lives_box_pack_start (LIVES_BOX (button_box), rfxbuilder->remove_entry_button, FALSE, FALSE, 0);
+  rfxbuilder->remove_entry_button=lives_button_new_with_mnemonic(_("_Remove Entry"));
+  lives_box_pack_start(LIVES_BOX(button_box), rfxbuilder->remove_entry_button, FALSE, FALSE, 0);
 
   if (rfxbuilder->table_type==RFX_TABLE_TYPE_PARAM_WINDOW) {
-    rfxbuilder->move_up_button=lives_button_new_with_mnemonic (_ ("Move _Up"));
-    lives_box_pack_start (LIVES_BOX (button_box), rfxbuilder->move_up_button, FALSE, FALSE, 0);
-    
-    rfxbuilder->move_down_button=lives_button_new_with_mnemonic (_ ("Move _Down"));
-    lives_box_pack_start (LIVES_BOX (button_box), rfxbuilder->move_down_button, FALSE, FALSE, 0);
+    rfxbuilder->move_up_button=lives_button_new_with_mnemonic(_("Move _Up"));
+    lives_box_pack_start(LIVES_BOX(button_box), rfxbuilder->move_up_button, FALSE, FALSE, 0);
+
+    rfxbuilder->move_down_button=lives_button_new_with_mnemonic(_("Move _Down"));
+    lives_box_pack_start(LIVES_BOX(button_box), rfxbuilder->move_down_button, FALSE, FALSE, 0);
 
 
     lives_widget_set_sensitive(rfxbuilder->move_up_button,FALSE);
     lives_widget_set_sensitive(rfxbuilder->move_down_button,FALSE);
-  }
-  else {
+  } else {
     rfxbuilder->move_up_button=rfxbuilder->move_down_button=NULL;
   }
 
@@ -652,121 +642,115 @@
     }
   }
 
-  dialog_action_area = lives_dialog_get_action_area(LIVES_DIALOG (dialog));
-  lives_button_box_set_layout (LIVES_BUTTON_BOX (dialog_action_area), LIVES_BUTTONBOX_END);
+  dialog_action_area = lives_dialog_get_action_area(LIVES_DIALOG(dialog));
+  lives_button_box_set_layout(LIVES_BUTTON_BOX(dialog_action_area), LIVES_BUTTONBOX_END);
 
-  cancelbutton = lives_button_new_from_stock (LIVES_STOCK_CANCEL);
-  lives_dialog_add_action_widget (LIVES_DIALOG (dialog), cancelbutton, LIVES_RESPONSE_CANCEL);
+  cancelbutton = lives_button_new_from_stock(LIVES_STOCK_CANCEL);
+  lives_dialog_add_action_widget(LIVES_DIALOG(dialog), cancelbutton, LIVES_RESPONSE_CANCEL);
 
-  lives_widget_add_accelerator (cancelbutton, LIVES_WIDGET_CLICKED_EVENT, accel_group,
-                              LIVES_KEY_Escape, (LiVESXModifierType)0, (LiVESAccelFlags)0);
+  lives_widget_add_accelerator(cancelbutton, LIVES_WIDGET_CLICKED_SIGNAL, accel_group,
+                               LIVES_KEY_Escape, (LiVESXModifierType)0, (LiVESAccelFlags)0);
 
 
-  okbutton = lives_button_new_from_stock (LIVES_STOCK_OK);
-  lives_dialog_add_action_widget (LIVES_DIALOG (dialog), okbutton, LIVES_RESPONSE_OK);
-  lives_widget_set_can_focus_and_default (okbutton);
+  okbutton = lives_button_new_from_stock(LIVES_STOCK_OK);
+  lives_dialog_add_action_widget(LIVES_DIALOG(dialog), okbutton, LIVES_RESPONSE_OK);
+  lives_widget_set_can_focus_and_default(okbutton);
 
   if (rfxbuilder->table_type==RFX_TABLE_TYPE_REQUIREMENTS) {
-    lives_signal_connect (LIVES_GUI_OBJECT (okbutton), LIVES_WIDGET_CLICKED_EVENT,
-		      LIVES_GUI_CALLBACK (on_requirements_ok),
-		      user_data);
-    
-    lives_signal_connect (LIVES_GUI_OBJECT (cancelbutton), LIVES_WIDGET_CLICKED_EVENT,
-		      LIVES_GUI_CALLBACK (on_requirements_cancel),
-		      user_data);
-  }
-  else if (rfxbuilder->table_type==RFX_TABLE_TYPE_PARAMS) {
-    lives_signal_connect (LIVES_GUI_OBJECT (okbutton), LIVES_WIDGET_CLICKED_EVENT,
-		      LIVES_GUI_CALLBACK (on_params_ok),
-		      user_data);
-    
-    lives_signal_connect (LIVES_GUI_OBJECT (cancelbutton), LIVES_WIDGET_CLICKED_EVENT,
-		      LIVES_GUI_CALLBACK (on_params_cancel),
-		      user_data);
-  }
-  else if (rfxbuilder->table_type==RFX_TABLE_TYPE_PARAM_WINDOW) {
-    lives_signal_connect (LIVES_GUI_OBJECT (okbutton), LIVES_WIDGET_CLICKED_EVENT,
-		      LIVES_GUI_CALLBACK (on_param_window_ok),
-		      user_data);
-    
-    lives_signal_connect (LIVES_GUI_OBJECT (cancelbutton), LIVES_WIDGET_CLICKED_EVENT,
-		      LIVES_GUI_CALLBACK (on_param_window_cancel),
-		      user_data);
-  }
-  else if (rfxbuilder->table_type==RFX_TABLE_TYPE_TRIGGERS) {
-    lives_signal_connect (LIVES_GUI_OBJECT (okbutton), LIVES_WIDGET_CLICKED_EVENT,
-		      LIVES_GUI_CALLBACK (on_triggers_ok),
-		      user_data);
-    
-    lives_signal_connect (LIVES_GUI_OBJECT (cancelbutton), LIVES_WIDGET_CLICKED_EVENT,
-		      LIVES_GUI_CALLBACK (on_triggers_cancel),
-		      user_data);
+    lives_signal_connect(LIVES_GUI_OBJECT(okbutton), LIVES_WIDGET_CLICKED_SIGNAL,
+                         LIVES_GUI_CALLBACK(on_requirements_ok),
+                         user_data);
+
+    lives_signal_connect(LIVES_GUI_OBJECT(cancelbutton), LIVES_WIDGET_CLICKED_SIGNAL,
+                         LIVES_GUI_CALLBACK(on_requirements_cancel),
+                         user_data);
+  } else if (rfxbuilder->table_type==RFX_TABLE_TYPE_PARAMS) {
+    lives_signal_connect(LIVES_GUI_OBJECT(okbutton), LIVES_WIDGET_CLICKED_SIGNAL,
+                         LIVES_GUI_CALLBACK(on_params_ok),
+                         user_data);
+
+    lives_signal_connect(LIVES_GUI_OBJECT(cancelbutton), LIVES_WIDGET_CLICKED_SIGNAL,
+                         LIVES_GUI_CALLBACK(on_params_cancel),
+                         user_data);
+  } else if (rfxbuilder->table_type==RFX_TABLE_TYPE_PARAM_WINDOW) {
+    lives_signal_connect(LIVES_GUI_OBJECT(okbutton), LIVES_WIDGET_CLICKED_SIGNAL,
+                         LIVES_GUI_CALLBACK(on_param_window_ok),
+                         user_data);
+
+    lives_signal_connect(LIVES_GUI_OBJECT(cancelbutton), LIVES_WIDGET_CLICKED_SIGNAL,
+                         LIVES_GUI_CALLBACK(on_param_window_cancel),
+                         user_data);
+  } else if (rfxbuilder->table_type==RFX_TABLE_TYPE_TRIGGERS) {
+    lives_signal_connect(LIVES_GUI_OBJECT(okbutton), LIVES_WIDGET_CLICKED_SIGNAL,
+                         LIVES_GUI_CALLBACK(on_triggers_ok),
+                         user_data);
+
+    lives_signal_connect(LIVES_GUI_OBJECT(cancelbutton), LIVES_WIDGET_CLICKED_SIGNAL,
+                         LIVES_GUI_CALLBACK(on_triggers_cancel),
+                         user_data);
   }
 
 
 
-  lives_signal_connect (LIVES_GUI_OBJECT (rfxbuilder->new_entry_button), LIVES_WIDGET_CLICKED_EVENT,
-		    LIVES_GUI_CALLBACK (on_table_add_row),
-		    user_data);
-
-  lives_signal_connect (LIVES_GUI_OBJECT (rfxbuilder->edit_entry_button), LIVES_WIDGET_CLICKED_EVENT,
-		    LIVES_GUI_CALLBACK (on_table_edit_row),
-		    user_data);
-
-  lives_signal_connect (LIVES_GUI_OBJECT (rfxbuilder->remove_entry_button), LIVES_WIDGET_CLICKED_EVENT,
-		    LIVES_GUI_CALLBACK (on_table_delete_row),
-		    user_data);
+  lives_signal_connect(LIVES_GUI_OBJECT(rfxbuilder->new_entry_button), LIVES_WIDGET_CLICKED_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_table_add_row),
+                       user_data);
+
+  lives_signal_connect(LIVES_GUI_OBJECT(rfxbuilder->edit_entry_button), LIVES_WIDGET_CLICKED_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_table_edit_row),
+                       user_data);
+
+  lives_signal_connect(LIVES_GUI_OBJECT(rfxbuilder->remove_entry_button), LIVES_WIDGET_CLICKED_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_table_delete_row),
+                       user_data);
 
   if (rfxbuilder->table_type==RFX_TABLE_TYPE_PARAM_WINDOW) {
-    lives_signal_connect (LIVES_GUI_OBJECT (rfxbuilder->move_up_button), LIVES_WIDGET_CLICKED_EVENT,
-		      LIVES_GUI_CALLBACK (on_table_swap_row),
-		      user_data);
-    
-    lives_signal_connect (LIVES_GUI_OBJECT (rfxbuilder->move_down_button), LIVES_WIDGET_CLICKED_EVENT,
-		      LIVES_GUI_CALLBACK (on_table_swap_row),
-		      user_data);
+    lives_signal_connect(LIVES_GUI_OBJECT(rfxbuilder->move_up_button), LIVES_WIDGET_CLICKED_SIGNAL,
+                         LIVES_GUI_CALLBACK(on_table_swap_row),
+                         user_data);
+
+    lives_signal_connect(LIVES_GUI_OBJECT(rfxbuilder->move_down_button), LIVES_WIDGET_CLICKED_SIGNAL,
+                         LIVES_GUI_CALLBACK(on_table_swap_row),
+                         user_data);
   }
 
-  lives_widget_show_all (dialog);
+  lives_widget_show_all(dialog);
   table_select_row(rfxbuilder,-1);
 }
 
-void on_requirements_ok (LiVESButton *button, gpointer user_data) {
+void on_requirements_ok(LiVESButton *button, livespointer user_data) {
   rfx_build_window_t *rfxbuilder=(rfx_build_window_t *)user_data;
 
   int i;
-  for (i=0;i<rfxbuilder->onum_reqs;i++) {
-    g_free (rfxbuilder->reqs[i]);
+  for (i=0; i<rfxbuilder->onum_reqs; i++) {
+    lives_free(rfxbuilder->reqs[i]);
   }
-  for (i=0;i<rfxbuilder->num_reqs;i++) {
-    rfxbuilder->reqs[i]=g_strdup (lives_entry_get_text (LIVES_ENTRY (rfxbuilder->entry[i])));
+  for (i=0; i<rfxbuilder->num_reqs; i++) {
+    rfxbuilder->reqs[i]=lives_strdup(lives_entry_get_text(LIVES_ENTRY(rfxbuilder->entry[i])));
   }
   lives_general_button_clicked(button,NULL);
 }
 
-void on_requirements_cancel (LiVESButton *button, gpointer user_data) {
+void on_requirements_cancel(LiVESButton *button, livespointer user_data) {
   rfx_build_window_t *rfxbuilder=(rfx_build_window_t *)user_data;
 
   rfxbuilder->num_reqs=rfxbuilder->onum_reqs;
   lives_general_button_clicked(button,NULL);
 }
 
-void on_properties_ok (LiVESButton *button, gpointer user_data) {
+void on_properties_ok(LiVESButton *button, livespointer user_data) {
   rfx_build_window_t *rfxbuilder=(rfx_build_window_t *)user_data;
 
   if (rfxbuilder->type!=RFX_BUILD_TYPE_EFFECT0) {
-    if (lives_toggle_button_get_active (LIVES_TOGGLE_BUTTON (rfxbuilder->prop_slow))) {
+    if (lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(rfxbuilder->prop_slow))) {
       rfxbuilder->props|=RFX_PROPS_SLOW;
-    }
-    else if (rfxbuilder->props&RFX_PROPS_SLOW) {
+    } else if (rfxbuilder->props&RFX_PROPS_SLOW) {
       rfxbuilder->props^=RFX_PROPS_SLOW;
     }
-  }
-  else {
-    if (lives_toggle_button_get_active (LIVES_TOGGLE_BUTTON (rfxbuilder->prop_batchg))) {
+  } else {
+    if (lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(rfxbuilder->prop_batchg))) {
       rfxbuilder->props|=RFX_PROPS_BATCHG;
-    }
-    else if (rfxbuilder->props&RFX_PROPS_BATCHG) {
+    } else if (rfxbuilder->props&RFX_PROPS_BATCHG) {
       rfxbuilder->props^=RFX_PROPS_BATCHG;
     }
   }
@@ -774,173 +758,171 @@
 }
 
 
-void on_params_ok (LiVESButton *button, gpointer user_data) { 
+void on_params_ok(LiVESButton *button, livespointer user_data) {
   rfx_build_window_t *rfxbuilder=(rfx_build_window_t *)user_data;
 
   int i;
-  for (i=0;i<rfxbuilder->onum_params;i++) {
-    g_free (rfxbuilder->params[i].name);
-    g_free (rfxbuilder->params[i].label);
+  for (i=0; i<rfxbuilder->onum_params; i++) {
+    lives_free(rfxbuilder->params[i].name);
+    lives_free(rfxbuilder->params[i].label);
     if (rfxbuilder->params[i].type==LIVES_PARAM_STRING_LIST) {
-      if (rfxbuilder->params[i].list!=NULL) g_list_free (rfxbuilder->params[i].list);
+      if (rfxbuilder->params[i].list!=NULL) lives_list_free(rfxbuilder->params[i].list);
     }
-    if (rfxbuilder->copy_params[i].def!=NULL) g_free (rfxbuilder->params[i].def);
+    if (rfxbuilder->copy_params[i].def!=NULL) lives_free(rfxbuilder->params[i].def);
   }
   if (rfxbuilder->onum_params) {
-    g_free (rfxbuilder->params);
+    lives_free(rfxbuilder->params);
   }
-  rfxbuilder->params=(lives_param_t *)g_malloc (rfxbuilder->num_params*sizeof(lives_param_t));
-  for (i=0;i<rfxbuilder->num_params;i++) {
-    param_copy (&rfxbuilder->copy_params[i],&rfxbuilder->params[i],FALSE);
+  rfxbuilder->params=(lives_param_t *)lives_malloc(rfxbuilder->num_params*sizeof(lives_param_t));
+  for (i=0; i<rfxbuilder->num_params; i++) {
+    param_copy(&rfxbuilder->copy_params[i],&rfxbuilder->params[i],FALSE);
 
     // this is the only place these should be freed
-    g_free (rfxbuilder->copy_params[i].name);
-    g_free (rfxbuilder->copy_params[i].label);
+    lives_free(rfxbuilder->copy_params[i].name);
+    lives_free(rfxbuilder->copy_params[i].label);
     if (rfxbuilder->copy_params[i].type==LIVES_PARAM_STRING_LIST) {
-      if (rfxbuilder->copy_params[i].list!=NULL) g_list_free (rfxbuilder->copy_params[i].list);
+      if (rfxbuilder->copy_params[i].list!=NULL) lives_list_free(rfxbuilder->copy_params[i].list);
     }
-    if (rfxbuilder->copy_params[i].def!=NULL) g_free (rfxbuilder->copy_params[i].def);
+    if (rfxbuilder->copy_params[i].def!=NULL) lives_free(rfxbuilder->copy_params[i].def);
   }
   if (rfxbuilder->num_params) {
-    g_free (rfxbuilder->copy_params);
+    lives_free(rfxbuilder->copy_params);
   }
   lives_general_button_clicked(button,NULL);
 }
 
 
-void on_params_cancel (LiVESButton *button, gpointer user_data) {
+void on_params_cancel(LiVESButton *button, livespointer user_data) {
   rfx_build_window_t *rfxbuilder=(rfx_build_window_t *)user_data;
 
   int i;
-  for (i=0;i<rfxbuilder->num_params;i++) {
+  for (i=0; i<rfxbuilder->num_params; i++) {
     // this is the only place these should be freed
-    g_free (rfxbuilder->copy_params[i].name);
-    g_free (rfxbuilder->copy_params[i].label);
+    lives_free(rfxbuilder->copy_params[i].name);
+    lives_free(rfxbuilder->copy_params[i].label);
     if (rfxbuilder->copy_params[i].type==LIVES_PARAM_STRING_LIST) {
-      if (rfxbuilder->copy_params[i].list!=NULL) g_list_free (rfxbuilder->copy_params[i].list);
+      if (rfxbuilder->copy_params[i].list!=NULL) lives_list_free(rfxbuilder->copy_params[i].list);
     }
-    if (rfxbuilder->copy_params[i].def!=NULL) g_free (rfxbuilder->copy_params[i].def);
+    if (rfxbuilder->copy_params[i].def!=NULL) lives_free(rfxbuilder->copy_params[i].def);
   }
   if (rfxbuilder->num_params) {
-    g_free (rfxbuilder->copy_params);
+    lives_free(rfxbuilder->copy_params);
   }
   rfxbuilder->num_params=rfxbuilder->onum_params;
   lives_general_button_clicked(button,NULL);
 }
 
-void on_param_window_ok (LiVESButton *button, gpointer user_data) {
+void on_param_window_ok(LiVESButton *button, livespointer user_data) {
   rfx_build_window_t *rfxbuilder=(rfx_build_window_t *)user_data;
 
   int i;
 
-  for (i=0;i<rfxbuilder->onum_paramw_hints;i++) {
-    g_free (rfxbuilder->paramw_hints[i]);
+  for (i=0; i<rfxbuilder->onum_paramw_hints; i++) {
+    lives_free(rfxbuilder->paramw_hints[i]);
   }
-  for (i=0;i<rfxbuilder->num_paramw_hints;i++) {
-    rfxbuilder->paramw_hints[i]=g_strdup_printf ("%s%s%s",lives_entry_get_text (LIVES_ENTRY (rfxbuilder->entry[i])),rfxbuilder->field_delim,
-						 lives_entry_get_text (LIVES_ENTRY (rfxbuilder->entry2[i])));
+  for (i=0; i<rfxbuilder->num_paramw_hints; i++) {
+    rfxbuilder->paramw_hints[i]=lives_strdup_printf("%s%s%s",lives_entry_get_text(LIVES_ENTRY(rfxbuilder->entry[i])),rfxbuilder->field_delim,
+                                lives_entry_get_text(LIVES_ENTRY(rfxbuilder->entry2[i])));
   }
   lives_general_button_clicked(button,NULL);
 }
 
-void on_param_window_cancel (LiVESButton *button, gpointer user_data) {
+void on_param_window_cancel(LiVESButton *button, livespointer user_data) {
   rfx_build_window_t *rfxbuilder=(rfx_build_window_t *)user_data;
 
   rfxbuilder->num_paramw_hints=rfxbuilder->onum_paramw_hints;
   lives_general_button_clicked(button,NULL);
 }
 
-void on_code_ok (LiVESButton *button, gpointer user_data) {
+void on_code_ok(LiVESButton *button, livespointer user_data) {
   rfx_build_window_t *rfxbuilder=(rfx_build_window_t *)user_data;
 
   switch (rfxbuilder->codetype) {
   case RFX_CODE_TYPE_PRE:
-    g_free (rfxbuilder->pre_code);
-    rfxbuilder->pre_code=lives_text_view_get_text (LIVES_TEXT_VIEW (rfxbuilder->code_textview));
+    lives_free(rfxbuilder->pre_code);
+    rfxbuilder->pre_code=lives_text_view_get_text(LIVES_TEXT_VIEW(rfxbuilder->code_textview));
     break;
 
   case RFX_CODE_TYPE_LOOP:
-    g_free (rfxbuilder->loop_code);
-    rfxbuilder->loop_code=lives_text_view_get_text (LIVES_TEXT_VIEW (rfxbuilder->code_textview));
+    lives_free(rfxbuilder->loop_code);
+    rfxbuilder->loop_code=lives_text_view_get_text(LIVES_TEXT_VIEW(rfxbuilder->code_textview));
     break;
 
   case RFX_CODE_TYPE_POST:
-    g_free (rfxbuilder->post_code);
-    rfxbuilder->post_code=lives_text_view_get_text (LIVES_TEXT_VIEW (rfxbuilder->code_textview));
+    lives_free(rfxbuilder->post_code);
+    rfxbuilder->post_code=lives_text_view_get_text(LIVES_TEXT_VIEW(rfxbuilder->code_textview));
     break;
 
-  case RFX_CODE_TYPE_STRDEF:
-    {
-      int maxlen=lives_spin_button_get_value_as_int (LIVES_SPIN_BUTTON (rfxbuilder->spinbutton_param_max));
-      gchar buf[++maxlen];
-      
-      if (rfxbuilder->copy_params[rfxbuilder->edit_param].def!=NULL) g_free (rfxbuilder->copy_params[rfxbuilder->edit_param].def);
-      g_snprintf (buf,maxlen,"%s",lives_text_view_get_text (LIVES_TEXT_VIEW (rfxbuilder->code_textview)));
-
-      rfxbuilder->copy_params[rfxbuilder->edit_param].def=subst (buf,rfxbuilder->field_delim,"");
-      break;
-    }
-  case RFX_CODE_TYPE_STRING_LIST:
-    {
-      gchar *values=lives_text_view_get_text (LIVES_TEXT_VIEW (rfxbuilder->code_textview));
-      gchar **lines=g_strsplit (values,"\n",-1);
-      int numlines=get_token_count (values,'\n');
-      int i;
-      int defindex=get_int_param (rfxbuilder->copy_params[rfxbuilder->edit_param].def);
+  case RFX_CODE_TYPE_STRDEF: {
+    int maxlen=lives_spin_button_get_value_as_int(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_max));
+    char buf[++maxlen];
 
-      if (rfxbuilder->copy_params[rfxbuilder->edit_param].list!=NULL) {
-	g_list_free (rfxbuilder->copy_params[rfxbuilder->edit_param].list);
-	rfxbuilder->copy_params[rfxbuilder->edit_param].list=NULL;
-      }
-      for (i=0;i<numlines;i++) {
-	if (i<numlines-1||strlen (lines[i])) {
-	  rfxbuilder->copy_params[rfxbuilder->edit_param].list=g_list_append 
-	    (rfxbuilder->copy_params[rfxbuilder->edit_param].list,g_strdup (lines[i]));
-	}
-      }
-      g_strfreev (lines);
-
-      // set "default" combo - TODO - try to retain old default using string matching
-      lives_combo_populate (LIVES_COMBO (rfxbuilder->param_def_combo), 
-			     rfxbuilder->copy_params[rfxbuilder->edit_param].list);
-      if (rfxbuilder->copy_params[rfxbuilder->edit_param].list==NULL||
-	  defindex>g_list_length (rfxbuilder->copy_params[rfxbuilder->edit_param].list)) {
-	set_int_param (rfxbuilder->copy_params[rfxbuilder->edit_param].def,(defindex=0));
-      }
-      if (rfxbuilder->copy_params[rfxbuilder->edit_param].list!=NULL) {
-	lives_combo_set_active_string (LIVES_COMBO(rfxbuilder->param_def_combo), 
-				       (gchar *)g_list_nth_data (rfxbuilder->copy_params[rfxbuilder->edit_param].list,defindex));
-      }
+    if (rfxbuilder->copy_params[rfxbuilder->edit_param].def!=NULL) lives_free(rfxbuilder->copy_params[rfxbuilder->edit_param].def);
+    lives_snprintf(buf,maxlen,"%s",lives_text_view_get_text(LIVES_TEXT_VIEW(rfxbuilder->code_textview)));
 
+    rfxbuilder->copy_params[rfxbuilder->edit_param].def=subst(buf,rfxbuilder->field_delim,"");
+    break;
+  }
+  case RFX_CODE_TYPE_STRING_LIST: {
+    char *values=lives_text_view_get_text(LIVES_TEXT_VIEW(rfxbuilder->code_textview));
+    char **lines=lives_strsplit(values,"\n",-1);
+    int numlines=get_token_count(values,'\n');
+    int i;
+    int defindex=get_int_param(rfxbuilder->copy_params[rfxbuilder->edit_param].def);
+
+    if (rfxbuilder->copy_params[rfxbuilder->edit_param].list!=NULL) {
+      lives_list_free(rfxbuilder->copy_params[rfxbuilder->edit_param].list);
+      rfxbuilder->copy_params[rfxbuilder->edit_param].list=NULL;
+    }
+    for (i=0; i<numlines; i++) {
+      if (i<numlines-1||strlen(lines[i])) {
+        rfxbuilder->copy_params[rfxbuilder->edit_param].list=lives_list_append
+            (rfxbuilder->copy_params[rfxbuilder->edit_param].list,lives_strdup(lines[i]));
+      }
+    }
+    lives_strfreev(lines);
+
+    // set "default" combo - TODO - try to retain old default using string matching
+    lives_combo_populate(LIVES_COMBO(rfxbuilder->param_def_combo),
+                         rfxbuilder->copy_params[rfxbuilder->edit_param].list);
+    if (rfxbuilder->copy_params[rfxbuilder->edit_param].list==NULL||
+        defindex>lives_list_length(rfxbuilder->copy_params[rfxbuilder->edit_param].list)) {
+      set_int_param(rfxbuilder->copy_params[rfxbuilder->edit_param].def,(defindex=0));
+    }
+    if (rfxbuilder->copy_params[rfxbuilder->edit_param].list!=NULL) {
+      lives_combo_set_active_string(LIVES_COMBO(rfxbuilder->param_def_combo),
+                                    (char *)lives_list_nth_data(rfxbuilder->copy_params[rfxbuilder->edit_param].list,defindex));
     }
+
+  }
   }
   lives_general_button_clicked(button,NULL);
 }
 
 
-void on_triggers_ok (LiVESButton *button, gpointer user_data) {
+void on_triggers_ok(LiVESButton *button, livespointer user_data) {
   rfx_build_window_t *rfxbuilder=(rfx_build_window_t *)user_data;
 
   int i;
-  for (i=0;i<rfxbuilder->onum_triggers;i++) {
-    g_free (rfxbuilder->triggers[i].code);
+  for (i=0; i<rfxbuilder->onum_triggers; i++) {
+    lives_free(rfxbuilder->triggers[i].code);
   }
   if (rfxbuilder->onum_triggers) {
-    g_free (rfxbuilder->triggers);
+    lives_free(rfxbuilder->triggers);
   }
-  rfxbuilder->triggers=(rfx_trigger_t *)g_malloc (rfxbuilder->num_triggers*sizeof(rfx_trigger_t));
-  for (i=0;i<rfxbuilder->num_triggers;i++) {
+  rfxbuilder->triggers=(rfx_trigger_t *)lives_malloc(rfxbuilder->num_triggers*sizeof(rfx_trigger_t));
+  for (i=0; i<rfxbuilder->num_triggers; i++) {
     rfxbuilder->triggers[i].when=rfxbuilder->copy_triggers[i].when;
-    rfxbuilder->triggers[i].code=g_strdup (rfxbuilder->copy_triggers[i].code);
-    g_free (rfxbuilder->copy_triggers[i].code);
+    rfxbuilder->triggers[i].code=lives_strdup(rfxbuilder->copy_triggers[i].code);
+    lives_free(rfxbuilder->copy_triggers[i].code);
   }
   if (rfxbuilder->num_triggers) {
-    g_free (rfxbuilder->copy_triggers);
+    lives_free(rfxbuilder->copy_triggers);
   }
   lives_general_button_clicked(button,NULL);
 }
 
-void on_triggers_cancel (LiVESButton *button, gpointer user_data) {
+void on_triggers_cancel(LiVESButton *button, livespointer user_data) {
   rfx_build_window_t *rfxbuilder=(rfx_build_window_t *)user_data;
 
   uint8_t *valid_triggers=NULL;
@@ -949,40 +931,38 @@
 
   int i;
 
-  if (rfxbuilder->num_params>0) 
-    valid_triggers=(uint8_t *)g_malloc0(rfxbuilder->num_params);
+  if (rfxbuilder->num_params>0)
+    valid_triggers=(uint8_t *)lives_malloc0(rfxbuilder->num_params);
 
-  for (i=0;i<rfxbuilder->num_triggers;i++) {
-    g_free (rfxbuilder->copy_triggers[i].code);
+  for (i=0; i<rfxbuilder->num_triggers; i++) {
+    lives_free(rfxbuilder->copy_triggers[i].code);
   }
   if (rfxbuilder->num_triggers) {
-    g_free (rfxbuilder->copy_triggers);
+    lives_free(rfxbuilder->copy_triggers);
   }
   rfxbuilder->num_triggers=rfxbuilder->onum_triggers;
 
 
-  for (i=0;i<rfxbuilder->num_triggers;i++) {
+  for (i=0; i<rfxbuilder->num_triggers; i++) {
     int when=rfxbuilder->triggers[i].when;
     if (when==0) init_trigger_valid=1;
     else valid_triggers[when-1]=1;
   }
 
   // reset onchange for anything not in triggers
-  for (i=0;i<rfxbuilder->num_params;i++) {
+  for (i=0; i<rfxbuilder->num_params; i++) {
     if (!valid_triggers[i]) {
       rfxbuilder->params[i].onchange=FALSE;
-    }
-    else {
+    } else {
       rfxbuilder->params[i].onchange=TRUE;
     }
   }
 
-  if (valid_triggers!=NULL) g_free(valid_triggers);
+  if (valid_triggers!=NULL) lives_free(valid_triggers);
 
   if (!init_trigger_valid) {
     rfxbuilder->has_init_trigger=FALSE;
-  }
-  else {
+  } else {
     rfxbuilder->has_init_trigger=TRUE;
   }
 
@@ -990,19 +970,19 @@
 }
 
 
-void on_properties_clicked (LiVESButton *button, gpointer user_data) {
+void on_properties_clicked(LiVESButton *button, livespointer user_data) {
   LiVESWidget *dialog;
   LiVESWidget *dialog_vbox;
   LiVESWidget *dialog_action_area;
   LiVESWidget *cancelbutton;
   LiVESWidget *okbutton;
 
-  LiVESAccelGroup *accel_group=LIVES_ACCEL_GROUP(lives_accel_group_new ());
+  LiVESAccelGroup *accel_group=LIVES_ACCEL_GROUP(lives_accel_group_new());
 
   rfx_build_window_t *rfxbuilder=(rfx_build_window_t *)user_data;
 
-  dialog = lives_standard_dialog_new (_("LiVES: - RFX Properties"),FALSE);
-  lives_window_add_accel_group (LIVES_WINDOW (dialog), accel_group);
+  dialog = lives_standard_dialog_new(_("LiVES: - RFX Properties"),FALSE,-1,-1);
+  lives_window_add_accel_group(LIVES_WINDOW(dialog), accel_group);
 
   if (prefs->show_gui) {
     lives_window_set_transient_for(LIVES_WINDOW(dialog),LIVES_WINDOW(rfxbuilder->dialog));
@@ -1010,84 +990,83 @@
 
   dialog_vbox = lives_dialog_get_content_area(LIVES_DIALOG(dialog));
 
-  rfxbuilder->prop_slow= lives_standard_check_button_new (_("_Slow (hint to GUI)"),TRUE,LIVES_BOX(dialog_vbox),NULL);
+  rfxbuilder->prop_slow= lives_standard_check_button_new(_("_Slow (hint to GUI)"),TRUE,LIVES_BOX(dialog_vbox),NULL);
 
   if (rfxbuilder->type!=RFX_BUILD_TYPE_EFFECT0) {
-    lives_widget_show (rfxbuilder->prop_slow);
+    lives_widget_show(rfxbuilder->prop_slow);
   }
 
   if (rfxbuilder->props&RFX_PROPS_SLOW) {
-    lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (rfxbuilder->prop_slow),TRUE);
+    lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(rfxbuilder->prop_slow),TRUE);
   }
 
   if (rfxbuilder->type==RFX_BUILD_TYPE_EFFECT0) {
-    rfxbuilder->prop_batchg=lives_standard_check_button_new (_("_Batch mode generator"),TRUE,LIVES_BOX(dialog_vbox),NULL);
+    rfxbuilder->prop_batchg=lives_standard_check_button_new(_("_Batch mode generator"),TRUE,LIVES_BOX(dialog_vbox),NULL);
     if (rfxbuilder->props&RFX_PROPS_BATCHG) {
-      lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON (rfxbuilder->prop_batchg),TRUE);
+      lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(rfxbuilder->prop_batchg),TRUE);
     }
   }
 
-  dialog_action_area = lives_dialog_get_action_area(LIVES_DIALOG (dialog));
-  lives_button_box_set_layout (LIVES_BUTTON_BOX (dialog_action_area), LIVES_BUTTONBOX_END);
+  dialog_action_area = lives_dialog_get_action_area(LIVES_DIALOG(dialog));
+  lives_button_box_set_layout(LIVES_BUTTON_BOX(dialog_action_area), LIVES_BUTTONBOX_END);
+
+  cancelbutton = lives_button_new_from_stock(LIVES_STOCK_CANCEL);
+  lives_dialog_add_action_widget(LIVES_DIALOG(dialog), cancelbutton, LIVES_RESPONSE_CANCEL);
 
-  cancelbutton = lives_button_new_from_stock (LIVES_STOCK_CANCEL);
-  lives_dialog_add_action_widget (LIVES_DIALOG (dialog), cancelbutton, LIVES_RESPONSE_CANCEL);
+  okbutton = lives_button_new_from_stock(LIVES_STOCK_OK);
+  lives_dialog_add_action_widget(LIVES_DIALOG(dialog), okbutton, LIVES_RESPONSE_OK);
+  lives_widget_set_can_focus_and_default(okbutton);
 
-  okbutton = lives_button_new_from_stock (LIVES_STOCK_OK);
-  lives_dialog_add_action_widget (LIVES_DIALOG (dialog), okbutton, LIVES_RESPONSE_OK);
-  lives_widget_set_can_focus_and_default (okbutton);
+  lives_widget_grab_default(okbutton);
 
-  lives_widget_grab_default (okbutton);
+  lives_widget_add_accelerator(cancelbutton, LIVES_WIDGET_CLICKED_SIGNAL, accel_group,
+                               LIVES_KEY_Escape, (LiVESXModifierType)0, (LiVESAccelFlags)0);
 
-  lives_widget_add_accelerator (cancelbutton, LIVES_WIDGET_CLICKED_EVENT, accel_group,
-                              LIVES_KEY_Escape, (LiVESXModifierType)0, (LiVESAccelFlags)0);
 
-  
-  lives_widget_add_accelerator (okbutton, LIVES_WIDGET_CLICKED_EVENT, accel_group,
-                              LIVES_KEY_Return, (LiVESXModifierType)0, (LiVESAccelFlags)0);
+  lives_widget_add_accelerator(okbutton, LIVES_WIDGET_CLICKED_SIGNAL, accel_group,
+                               LIVES_KEY_Return, (LiVESXModifierType)0, (LiVESAccelFlags)0);
 
 
-  lives_signal_connect (LIVES_GUI_OBJECT (okbutton), LIVES_WIDGET_CLICKED_EVENT,
-		    LIVES_GUI_CALLBACK (on_properties_ok),
-		    user_data);
+  lives_signal_connect(LIVES_GUI_OBJECT(okbutton), LIVES_WIDGET_CLICKED_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_properties_ok),
+                       user_data);
 
-  lives_signal_connect (LIVES_GUI_OBJECT (cancelbutton), LIVES_WIDGET_CLICKED_EVENT,
-		    LIVES_GUI_CALLBACK (lives_general_button_clicked),
-		    NULL);
-  
-  lives_widget_show_all (dialog);
+  lives_signal_connect(LIVES_GUI_OBJECT(cancelbutton), LIVES_WIDGET_CLICKED_SIGNAL,
+                       LIVES_GUI_CALLBACK(lives_general_button_clicked),
+                       NULL);
+
+  lives_widget_show_all(dialog);
 
 }
 
 
 static void table_select_row(rfx_build_window_t *rfxbuilder, int row) {
   register int i;
-  for (i=0;i<rfxbuilder->table_rows;i++) {
+  for (i=0; i<rfxbuilder->table_rows; i++) {
     if (i==row) {
       lives_widget_set_sensitive(rfxbuilder->edit_entry_button,TRUE);
       lives_widget_set_sensitive(rfxbuilder->remove_entry_button,TRUE);
       if (rfxbuilder->move_up_button!=NULL) lives_widget_set_sensitive(rfxbuilder->move_up_button,i!=0);
       if (rfxbuilder->move_down_button!=NULL) lives_widget_set_sensitive(rfxbuilder->move_down_button,i<rfxbuilder->table_rows-1);
-    
+
       lives_widget_set_sensitive(rfxbuilder->entry[i],TRUE);
       if (rfxbuilder->entry2[i]!=NULL) {
-	lives_widget_set_sensitive(rfxbuilder->entry2[i],TRUE);
+        lives_widget_set_sensitive(rfxbuilder->entry2[i],TRUE);
       }
       if (rfxbuilder->entry3[i]!=NULL) {
-	lives_widget_set_sensitive(rfxbuilder->entry3[i],TRUE);
+        lives_widget_set_sensitive(rfxbuilder->entry3[i],TRUE);
       }
-    }
-    else {
+    } else {
       lives_editable_select_region(LIVES_EDITABLE(rfxbuilder->entry[i]),0,0);
       lives_widget_set_sensitive(rfxbuilder->entry[i],FALSE);
       lives_entry_set_editable(LIVES_ENTRY(rfxbuilder->entry[i]),FALSE);
       if (rfxbuilder->entry2[i]!=NULL) {
-	lives_editable_select_region(LIVES_EDITABLE(rfxbuilder->entry2[i]),0,0);
-	lives_widget_set_sensitive(rfxbuilder->entry2[i],FALSE);
+        lives_editable_select_region(LIVES_EDITABLE(rfxbuilder->entry2[i]),0,0);
+        lives_widget_set_sensitive(rfxbuilder->entry2[i],FALSE);
       }
       if (rfxbuilder->entry3[i]!=NULL) {
-	lives_editable_select_region(LIVES_EDITABLE(rfxbuilder->entry3[i]),0,0);
-	lives_widget_set_sensitive(rfxbuilder->entry3[i],FALSE);
+        lives_editable_select_region(LIVES_EDITABLE(rfxbuilder->entry3[i]),0,0);
+        lives_widget_set_sensitive(rfxbuilder->entry3[i],FALSE);
       }
     }
   }
@@ -1097,18 +1076,18 @@
 
 
 
-static boolean on_entry_click (LiVESWidget *widget, GdkEvent *event, gpointer user_data) {
+static boolean on_entry_click(LiVESWidget *widget, LiVESXEventButton *event, livespointer user_data) {
   rfx_build_window_t *rfxbuilder=(rfx_build_window_t *)user_data;
   register int i;
 
   widget=lives_bin_get_child(LIVES_BIN(widget));
-  for (i=0;i<rfxbuilder->table_rows;i++) {
+  for (i=0; i<rfxbuilder->table_rows; i++) {
     if (widget==rfxbuilder->entry[i]||widget==rfxbuilder->entry2[i]||widget==rfxbuilder->entry3[i]) {
       table_select_row(rfxbuilder,i);
-      
-      if (event->type!=GDK_BUTTON_PRESS) {
-	//double click
-	on_table_edit_row(NULL,rfxbuilder);
+
+      if (event->type!=LIVES_BUTTON_PRESS) {
+        //double click
+        on_table_edit_row(NULL,rfxbuilder);
       }
       return TRUE;
     }
@@ -1118,7 +1097,7 @@
 
 
 
-void on_table_add_row (LiVESButton *button, gpointer user_data) {
+void on_table_add_row(LiVESButton *button, livespointer user_data) {
   LiVESWidget *entry=NULL,*entry2=NULL,*entry3=NULL;
   LiVESWidget *param_dialog=NULL;
   LiVESWidget *param_window_dialog=NULL;
@@ -1129,8 +1108,8 @@
 
   register int i;
 
-  gchar *tmpx;
-  gchar *ctext;
+  char *tmpx;
+  char *ctext;
 
   LiVESWidget *ebox,*ebox2=NULL,*ebox3=NULL;
 
@@ -1140,39 +1119,38 @@
   case RFX_TABLE_TYPE_REQUIREMENTS:
     if (rfxbuilder->table_rows>=RFXBUILD_MAX_REQ) return;
 
-    for (i=0;i<rfxbuilder->table_rows;i++) {
-      lives_entry_set_editable (LIVES_ENTRY (rfxbuilder->entry[i]), FALSE);
+    for (i=0; i<rfxbuilder->table_rows; i++) {
+      lives_entry_set_editable(LIVES_ENTRY(rfxbuilder->entry[i]), FALSE);
     }
 
-    entry = rfxbuilder->entry[rfxbuilder->table_rows] = lives_entry_new ();
+    entry = rfxbuilder->entry[rfxbuilder->table_rows] = lives_entry_new();
 
     if (button!=NULL)
-      lives_entry_set_editable (LIVES_ENTRY (entry), TRUE);
-    else 
-      lives_entry_set_editable (LIVES_ENTRY (entry), FALSE);
+      lives_entry_set_editable(LIVES_ENTRY(entry), TRUE);
+    else
+      lives_entry_set_editable(LIVES_ENTRY(entry), FALSE);
 
     ebox=lives_event_box_new();
-    lives_widget_set_events (ebox, LIVES_BUTTON_PRESS_MASK);
+    lives_widget_set_events(ebox, LIVES_BUTTON_PRESS_MASK);
 
     lives_container_add(LIVES_CONTAINER(ebox),entry);
 
-    lives_table_resize (LIVES_TABLE (rfxbuilder->table),++rfxbuilder->table_rows,1);
-    lives_table_attach (LIVES_TABLE (rfxbuilder->table), ebox, 0, 1, rfxbuilder->table_rows-1, 
-		      rfxbuilder->table_rows,
-		      (LiVESAttachOptions) (LIVES_FILL|LIVES_EXPAND),
-		      (LiVESAttachOptions) (0), 0, 0);
+    lives_table_resize(LIVES_TABLE(rfxbuilder->table),++rfxbuilder->table_rows,1);
+    lives_table_attach(LIVES_TABLE(rfxbuilder->table), ebox, 0, 1, rfxbuilder->table_rows-1,
+                       rfxbuilder->table_rows,
+                       (LiVESAttachOptions)(LIVES_FILL|LIVES_EXPAND),
+                       (LiVESAttachOptions)(0), 0, 0);
 
     lives_widget_context_update();
-    lives_widget_grab_focus (entry);
+    lives_widget_grab_focus(entry);
     if (button!=NULL) {
       rfxbuilder->num_reqs++;
-    }
-    else goto add_row_done;
+    } else goto add_row_done;
     break;
 
   case RFX_TABLE_TYPE_PARAMS:
-    entry = rfxbuilder->entry[rfxbuilder->table_rows] = lives_entry_new ();
-    entry2 = rfxbuilder->entry2[rfxbuilder->table_rows] = lives_entry_new ();
+    entry = rfxbuilder->entry[rfxbuilder->table_rows] = lives_entry_new();
+    entry2 = rfxbuilder->entry2[rfxbuilder->table_rows] = lives_entry_new();
 
     if (button!=NULL) {
       boolean param_ok=FALSE;
@@ -1184,214 +1162,207 @@
 
       param_dialog=make_param_dialog(-1,rfxbuilder);
       do {
-	if (lives_dialog_run (LIVES_DIALOG (param_dialog))==LIVES_RESPONSE_CANCEL) {
-	  g_free (param->def);
-	  lives_widget_destroy (entry);
-	  lives_widget_destroy (entry2);
-	  lives_widget_destroy (param_dialog);
-	  return;
-	}
-	param_ok=perform_param_checks (rfxbuilder,rfxbuilder->num_params,rfxbuilder->num_params+1);
+        if (lives_dialog_run(LIVES_DIALOG(param_dialog))==LIVES_RESPONSE_CANCEL) {
+          lives_free(param->def);
+          lives_widget_destroy(entry);
+          lives_widget_destroy(entry2);
+          lives_widget_destroy(param_dialog);
+          return;
+        }
+        param_ok=perform_param_checks(rfxbuilder,rfxbuilder->num_params,rfxbuilder->num_params+1);
       } while (!param_ok);
-      
+
       rfxbuilder->num_params++;
 
-      lives_entry_set_text (LIVES_ENTRY (entry2),lives_entry_get_text (LIVES_ENTRY (rfxbuilder->param_name_entry)));
-    }
-    else {
-      lives_entry_set_text (LIVES_ENTRY (entry2),rfxbuilder->params[rfxbuilder->table_rows].name);
+      lives_entry_set_text(LIVES_ENTRY(entry2),lives_entry_get_text(LIVES_ENTRY(rfxbuilder->param_name_entry)));
+    } else {
+      lives_entry_set_text(LIVES_ENTRY(entry2),rfxbuilder->params[rfxbuilder->table_rows].name);
     }
 
-    lives_entry_set_text (LIVES_ENTRY (entry),(tmpx=g_strdup_printf ("p%d",rfxbuilder->table_rows)));
-    g_free(tmpx);
+    lives_entry_set_text(LIVES_ENTRY(entry),(tmpx=lives_strdup_printf("p%d",rfxbuilder->table_rows)));
+    lives_free(tmpx);
+
+    lives_entry_set_editable(LIVES_ENTRY(entry), FALSE);
 
-    lives_entry_set_editable (LIVES_ENTRY (entry), FALSE);
-     
     ebox=lives_event_box_new();
-    lives_widget_set_events (ebox, LIVES_BUTTON_PRESS_MASK);
+    lives_widget_set_events(ebox, LIVES_BUTTON_PRESS_MASK);
 
     lives_container_add(LIVES_CONTAINER(ebox),entry);
 
-    lives_table_resize (LIVES_TABLE (rfxbuilder->table),++rfxbuilder->table_rows,3);
+    lives_table_resize(LIVES_TABLE(rfxbuilder->table),++rfxbuilder->table_rows,3);
 
-    lives_table_attach (LIVES_TABLE (rfxbuilder->table), ebox, 0, 1, rfxbuilder->table_rows-1, 
-		      rfxbuilder->table_rows,
-		      (LiVESAttachOptions) (0),
-		      (LiVESAttachOptions) (0), 0, 0);
+    lives_table_attach(LIVES_TABLE(rfxbuilder->table), ebox, 0, 1, rfxbuilder->table_rows-1,
+                       rfxbuilder->table_rows,
+                       (LiVESAttachOptions)(0),
+                       (LiVESAttachOptions)(0), 0, 0);
 
 
 
-    lives_entry_set_editable (LIVES_ENTRY (entry2), FALSE);
+    lives_entry_set_editable(LIVES_ENTRY(entry2), FALSE);
 
 
     ebox2=lives_event_box_new();
-    lives_widget_set_events (ebox2, LIVES_BUTTON_PRESS_MASK);
+    lives_widget_set_events(ebox2, LIVES_BUTTON_PRESS_MASK);
     lives_container_add(LIVES_CONTAINER(ebox2),entry2);
 
-    lives_table_attach (LIVES_TABLE (rfxbuilder->table), ebox2, 1, 2, rfxbuilder->table_rows-1, 
-		      rfxbuilder->table_rows,
-		      (LiVESAttachOptions) (LIVES_FILL|LIVES_EXPAND),
-		      (LiVESAttachOptions) (0), 0, 0);
+    lives_table_attach(LIVES_TABLE(rfxbuilder->table), ebox2, 1, 2, rfxbuilder->table_rows-1,
+                       rfxbuilder->table_rows,
+                       (LiVESAttachOptions)(LIVES_FILL|LIVES_EXPAND),
+                       (LiVESAttachOptions)(0), 0, 0);
 
-    entry3 = rfxbuilder->entry3[rfxbuilder->table_rows-1] = lives_entry_new ();
+    entry3 = rfxbuilder->entry3[rfxbuilder->table_rows-1] = lives_entry_new();
 
     if (button==NULL) {
       param=&rfxbuilder->params[rfxbuilder->table_rows-1];
+    } else {
+      param_set_from_dialog((param=&rfxbuilder->copy_params[rfxbuilder->table_rows-1]),rfxbuilder);
     }
-    else {
-      param_set_from_dialog ((param=&rfxbuilder->copy_params[rfxbuilder->table_rows-1]),rfxbuilder);
-    }
-    
+
     switch (param->type) {
     case LIVES_PARAM_NUM:
-      lives_entry_set_text (LIVES_ENTRY (entry3),(tmpx=g_strdup_printf ("num%d",param->dp)));
-      g_free(tmpx);
+      lives_entry_set_text(LIVES_ENTRY(entry3),(tmpx=lives_strdup_printf("num%d",param->dp)));
+      lives_free(tmpx);
       break;
     case LIVES_PARAM_BOOL:
-      lives_entry_set_text (LIVES_ENTRY (entry3),"bool");
+      lives_entry_set_text(LIVES_ENTRY(entry3),"bool");
       break;
     case LIVES_PARAM_COLRGB24:
-      lives_entry_set_text (LIVES_ENTRY (entry3),"colRGB24");
+      lives_entry_set_text(LIVES_ENTRY(entry3),"colRGB24");
       break;
     case LIVES_PARAM_STRING:
-      lives_entry_set_text (LIVES_ENTRY (entry3),"string");
+      lives_entry_set_text(LIVES_ENTRY(entry3),"string");
       break;
     case LIVES_PARAM_STRING_LIST:
-      lives_entry_set_text (LIVES_ENTRY (entry3),"string_list");
+      lives_entry_set_text(LIVES_ENTRY(entry3),"string_list");
       break;
     default:
       break;
     }
 
-    lives_entry_set_editable (LIVES_ENTRY (entry3), FALSE);
+    lives_entry_set_editable(LIVES_ENTRY(entry3), FALSE);
 
     ebox3=lives_event_box_new();
-    lives_widget_set_events (ebox3, LIVES_BUTTON_PRESS_MASK);
+    lives_widget_set_events(ebox3, LIVES_BUTTON_PRESS_MASK);
     lives_container_add(LIVES_CONTAINER(ebox3),entry3);
 
-    lives_table_attach (LIVES_TABLE (rfxbuilder->table), ebox3, 2, 3, rfxbuilder->table_rows-1, 
-		      rfxbuilder->table_rows,
-		      (LiVESAttachOptions) (LIVES_FILL),
-		      (LiVESAttachOptions) (0), 0, 0);
+    lives_table_attach(LIVES_TABLE(rfxbuilder->table), ebox3, 2, 3, rfxbuilder->table_rows-1,
+                       rfxbuilder->table_rows,
+                       (LiVESAttachOptions)(LIVES_FILL),
+                       (LiVESAttachOptions)(0), 0, 0);
 
     if (button==NULL) goto add_row_done;
-    
+
     lives_widget_queue_resize(lives_widget_get_parent(LIVES_WIDGET(rfxbuilder->table)));
-    lives_widget_destroy (param_dialog);
+    lives_widget_destroy(param_dialog);
     break;
 
 
   case RFX_TABLE_TYPE_PARAM_WINDOW:
     if (button!=NULL) {
       param_window_dialog=make_param_window_dialog(-1,rfxbuilder);
-      if (lives_dialog_run (LIVES_DIALOG (param_window_dialog))==LIVES_RESPONSE_CANCEL) {
-	lives_widget_destroy (param_window_dialog);
-	return;
+      if (lives_dialog_run(LIVES_DIALOG(param_window_dialog))==LIVES_RESPONSE_CANCEL) {
+        lives_widget_destroy(param_window_dialog);
+        return;
       }
-      entry = rfxbuilder->entry[rfxbuilder->table_rows] = lives_entry_new ();
+      entry = rfxbuilder->entry[rfxbuilder->table_rows] = lives_entry_new();
       ctext=lives_combo_get_active_text(LIVES_COMBO(rfxbuilder->paramw_kw_combo));
-      lives_entry_set_text (LIVES_ENTRY (entry),ctext);
-      g_free(ctext);
+      lives_entry_set_text(LIVES_ENTRY(entry),ctext);
+      lives_free(ctext);
       rfxbuilder->num_paramw_hints++;
-    }
-    else {
-      gchar **array=g_strsplit(rfxbuilder->paramw_hints[rfxbuilder->table_rows],rfxbuilder->field_delim,2);
-      entry = rfxbuilder->entry[rfxbuilder->table_rows] = lives_entry_new ();
-      lives_entry_set_text (LIVES_ENTRY (entry),array[0]);
-      g_strfreev (array);
+    } else {
+      char **array=lives_strsplit(rfxbuilder->paramw_hints[rfxbuilder->table_rows],rfxbuilder->field_delim,2);
+      entry = rfxbuilder->entry[rfxbuilder->table_rows] = lives_entry_new();
+      lives_entry_set_text(LIVES_ENTRY(entry),array[0]);
+      lives_strfreev(array);
     }
 
-    lives_entry_set_editable (LIVES_ENTRY (entry), FALSE);
+    lives_entry_set_editable(LIVES_ENTRY(entry), FALSE);
 
     ebox=lives_event_box_new();
-    lives_widget_set_events (ebox, LIVES_BUTTON_PRESS_MASK);
+    lives_widget_set_events(ebox, LIVES_BUTTON_PRESS_MASK);
     lives_container_add(LIVES_CONTAINER(ebox),entry);
 
-    lives_table_resize (LIVES_TABLE (rfxbuilder->table),++rfxbuilder->table_rows,2);
-    lives_table_attach (LIVES_TABLE (rfxbuilder->table), ebox, 0, 1, rfxbuilder->table_rows-1, 
-		      rfxbuilder->table_rows,
-		      (LiVESAttachOptions) (LIVES_FILL),
-		      (LiVESAttachOptions) (0), 0, 0);
+    lives_table_resize(LIVES_TABLE(rfxbuilder->table),++rfxbuilder->table_rows,2);
+    lives_table_attach(LIVES_TABLE(rfxbuilder->table), ebox, 0, 1, rfxbuilder->table_rows-1,
+                       rfxbuilder->table_rows,
+                       (LiVESAttachOptions)(LIVES_FILL),
+                       (LiVESAttachOptions)(0), 0, 0);
 
-    entry2 = rfxbuilder->entry2[rfxbuilder->table_rows-1] = lives_entry_new ();
+    entry2 = rfxbuilder->entry2[rfxbuilder->table_rows-1] = lives_entry_new();
 
     if (button!=NULL) {
-      if (!strcmp (lives_entry_get_text (LIVES_ENTRY (entry)),"layout")) {
-	lives_entry_set_text (LIVES_ENTRY (entry2),lives_entry_get_text (LIVES_ENTRY (rfxbuilder->paramw_rest_entry)));
-      }
-      else {
-	// TODO - use lives_rfx_special_t->has_subtype,name,num_params
-	ctext=lives_combo_get_active_text(LIVES_COMBO(rfxbuilder->paramw_sp_combo));
-	if (!strcmp (ctext,"framedraw")) {
-	  gchar *ctext2=lives_combo_get_active_text(LIVES_COMBO(rfxbuilder->paramw_spsub_combo));
-	  lives_entry_set_text (LIVES_ENTRY (entry2),(tmpx=g_strdup_printf ("%s%s%s%s%s",ctext,rfxbuilder->field_delim,ctext2,
-									rfxbuilder->field_delim, 
-									lives_entry_get_text (LIVES_ENTRY (rfxbuilder->paramw_rest_entry)))));
-	  g_free(ctext2);
-	}
-	else {
-	  lives_entry_set_text (LIVES_ENTRY (entry2),(tmpx=g_strdup_printf ("%s%s%s",ctext,rfxbuilder->field_delim,
-									lives_entry_get_text (LIVES_ENTRY (rfxbuilder->paramw_rest_entry)))));
-	}
-	g_free(tmpx);
-	g_free(ctext);
-      }
-    }
-    else {
-      gchar **array=g_strsplit(rfxbuilder->paramw_hints[rfxbuilder->table_rows-1],rfxbuilder->field_delim,2);
-      lives_entry_set_text (LIVES_ENTRY (entry2),array[1]);
-      g_strfreev (array);
+      if (!strcmp(lives_entry_get_text(LIVES_ENTRY(entry)),"layout")) {
+        lives_entry_set_text(LIVES_ENTRY(entry2),lives_entry_get_text(LIVES_ENTRY(rfxbuilder->paramw_rest_entry)));
+      } else {
+        // TODO - use lives_rfx_special_t->has_subtype,name,num_params
+        ctext=lives_combo_get_active_text(LIVES_COMBO(rfxbuilder->paramw_sp_combo));
+        if (!strcmp(ctext,"framedraw")) {
+          char *ctext2=lives_combo_get_active_text(LIVES_COMBO(rfxbuilder->paramw_spsub_combo));
+          lives_entry_set_text(LIVES_ENTRY(entry2),(tmpx=lives_strdup_printf("%s%s%s%s%s",ctext,rfxbuilder->field_delim,ctext2,
+                               rfxbuilder->field_delim,
+                               lives_entry_get_text(LIVES_ENTRY(rfxbuilder->paramw_rest_entry)))));
+          lives_free(ctext2);
+        } else {
+          lives_entry_set_text(LIVES_ENTRY(entry2),(tmpx=lives_strdup_printf("%s%s%s",ctext,rfxbuilder->field_delim,
+                               lives_entry_get_text(LIVES_ENTRY(rfxbuilder->paramw_rest_entry)))));
+        }
+        lives_free(tmpx);
+        lives_free(ctext);
+      }
+    } else {
+      char **array=lives_strsplit(rfxbuilder->paramw_hints[rfxbuilder->table_rows-1],rfxbuilder->field_delim,2);
+      lives_entry_set_text(LIVES_ENTRY(entry2),array[1]);
+      lives_strfreev(array);
     }
 
-    lives_entry_set_editable (LIVES_ENTRY (entry2), FALSE);
+    lives_entry_set_editable(LIVES_ENTRY(entry2), FALSE);
 
     ebox2=lives_event_box_new();
-    lives_widget_set_events (ebox2, LIVES_BUTTON_PRESS_MASK);
+    lives_widget_set_events(ebox2, LIVES_BUTTON_PRESS_MASK);
     lives_container_add(LIVES_CONTAINER(ebox2),entry2);
 
-    lives_table_attach (LIVES_TABLE (rfxbuilder->table), ebox2, 1, 2, rfxbuilder->table_rows-1, 
-		      rfxbuilder->table_rows,
-		      (LiVESAttachOptions) (LIVES_FILL|LIVES_EXPAND),
-		      (LiVESAttachOptions) (0), 0, 0);
+    lives_table_attach(LIVES_TABLE(rfxbuilder->table), ebox2, 1, 2, rfxbuilder->table_rows-1,
+                       rfxbuilder->table_rows,
+                       (LiVESAttachOptions)(LIVES_FILL|LIVES_EXPAND),
+                       (LiVESAttachOptions)(0), 0, 0);
 
 
     if (button==NULL) goto add_row_done;
 
-    lives_widget_destroy (param_window_dialog);
-    lives_widget_queue_resize (lives_widget_get_parent(LIVES_WIDGET(rfxbuilder->table)));
+    lives_widget_destroy(param_window_dialog);
+    lives_widget_queue_resize(lives_widget_get_parent(LIVES_WIDGET(rfxbuilder->table)));
     break;
 
 
   case RFX_TABLE_TYPE_TRIGGERS:
-    entry = rfxbuilder->entry[rfxbuilder->table_rows] = lives_entry_new ();
+    entry = rfxbuilder->entry[rfxbuilder->table_rows] = lives_entry_new();
 
     if (button!=NULL) {
       trigger_dialog=make_trigger_dialog(-1,rfxbuilder);
-      if (lives_dialog_run (LIVES_DIALOG (trigger_dialog))==LIVES_RESPONSE_CANCEL) {
-	lives_widget_destroy (trigger_dialog);
-	return;
+      if (lives_dialog_run(LIVES_DIALOG(trigger_dialog))==LIVES_RESPONSE_CANCEL) {
+        lives_widget_destroy(trigger_dialog);
+        return;
       }
-      lives_entry_set_text (LIVES_ENTRY (entry),lives_entry_get_text (LIVES_ENTRY (rfxbuilder->trigger_when_entry)));
+      lives_entry_set_text(LIVES_ENTRY(entry),lives_entry_get_text(LIVES_ENTRY(rfxbuilder->trigger_when_entry)));
       rfxbuilder->num_triggers++;
+    } else {
+      char *tmpx2=NULL;
+      lives_entry_set_text(LIVES_ENTRY(entry),rfxbuilder->triggers[rfxbuilder->table_rows].when?
+                           (tmpx2=lives_strdup_printf("%d",rfxbuilder->triggers[rfxbuilder->table_rows].when-1)):"init");
+      if (tmpx2!=NULL) lives_free(tmpx2);
     }
-    else {
-      gchar *tmpx2=NULL;
-      lives_entry_set_text (LIVES_ENTRY (entry),rfxbuilder->triggers[rfxbuilder->table_rows].when?
-			  (tmpx2=g_strdup_printf ("%d",rfxbuilder->triggers[rfxbuilder->table_rows].when-1)):"init");
-      if (tmpx2!=NULL) g_free(tmpx2);
-    }
-    
-    lives_entry_set_editable (LIVES_ENTRY (entry), FALSE);
+
+    lives_entry_set_editable(LIVES_ENTRY(entry), FALSE);
 
     ebox=lives_event_box_new();
-    lives_widget_set_events (ebox, LIVES_BUTTON_PRESS_MASK);
+    lives_widget_set_events(ebox, LIVES_BUTTON_PRESS_MASK);
     lives_container_add(LIVES_CONTAINER(ebox),entry);
 
-    lives_table_resize (LIVES_TABLE (rfxbuilder->table),++rfxbuilder->table_rows,1);
-    lives_table_attach (LIVES_TABLE (rfxbuilder->table), ebox, 0, 1, rfxbuilder->table_rows-1, 
-		      rfxbuilder->table_rows,
-		      (LiVESAttachOptions) (LIVES_FILL|LIVES_EXPAND),
-		      (LiVESAttachOptions) (0), 0, 0);
+    lives_table_resize(LIVES_TABLE(rfxbuilder->table),++rfxbuilder->table_rows,1);
+    lives_table_attach(LIVES_TABLE(rfxbuilder->table), ebox, 0, 1, rfxbuilder->table_rows-1,
+                       rfxbuilder->table_rows,
+                       (LiVESAttachOptions)(LIVES_FILL|LIVES_EXPAND),
+                       (LiVESAttachOptions)(0), 0, 0);
 
 
     if (button==NULL) goto add_row_done;
@@ -1400,21 +1371,20 @@
       lives_widget_set_sensitive(rfxbuilder->new_entry_button,FALSE);
     }
 
-    rfxbuilder->copy_triggers[rfxbuilder->table_rows-1].code=lives_text_view_get_text(LIVES_TEXT_VIEW (rfxbuilder->code_textview));
-    
-    rfxbuilder->copy_triggers[rfxbuilder->table_rows-1].when=atoi (lives_entry_get_text (LIVES_ENTRY (rfxbuilder->trigger_when_entry)))+1;
-    if (!strcmp(lives_entry_get_text (LIVES_ENTRY (rfxbuilder->trigger_when_entry)),"init")) 
+    rfxbuilder->copy_triggers[rfxbuilder->table_rows-1].code=lives_text_view_get_text(LIVES_TEXT_VIEW(rfxbuilder->code_textview));
+
+    rfxbuilder->copy_triggers[rfxbuilder->table_rows-1].when=atoi(lives_entry_get_text(LIVES_ENTRY(rfxbuilder->trigger_when_entry)))+1;
+    if (!strcmp(lives_entry_get_text(LIVES_ENTRY(rfxbuilder->trigger_when_entry)),"init"))
       rfxbuilder->copy_triggers[rfxbuilder->table_rows-1].when=0;
 
     if (!rfxbuilder->copy_triggers[rfxbuilder->table_rows-1].when) {
       rfxbuilder->has_init_trigger=TRUE;
-    }
-    else {
+    } else {
       rfxbuilder->params[rfxbuilder->copy_triggers[rfxbuilder->table_rows-1].when-1].onchange=TRUE;
     }
 
-    lives_widget_destroy (trigger_dialog);
-    lives_widget_queue_resize (lives_widget_get_parent(LIVES_WIDGET(rfxbuilder->table)));
+    lives_widget_destroy(trigger_dialog);
+    lives_widget_queue_resize(lives_widget_get_parent(LIVES_WIDGET(rfxbuilder->table)));
 
     break;
   default:
@@ -1422,68 +1392,65 @@
   }
 
 
- add_row_done:
+add_row_done:
 
   lives_widget_show_all(rfxbuilder->table);
 
-  gtk_event_box_set_above_child(LIVES_EVENT_BOX(ebox),TRUE);
+  lives_event_box_set_above_child(LIVES_EVENT_BOX(ebox),TRUE);
 
-  lives_signal_connect (LIVES_GUI_OBJECT (ebox), "button_press_event",
-		    LIVES_GUI_CALLBACK (on_entry_click),
-		    (gpointer)rfxbuilder);
+  lives_signal_connect(LIVES_GUI_OBJECT(ebox), LIVES_WIDGET_BUTTON_PRESS_EVENT,
+                       LIVES_GUI_CALLBACK(on_entry_click),
+                       (livespointer)rfxbuilder);
 
   if (palette->style&STYLE_1) {
     if (palette->style&STYLE_3) {
-      lives_widget_set_bg_color (entry, LIVES_WIDGET_STATE_INSENSITIVE, &palette->menu_and_bars);
-      lives_widget_set_fg_color (entry, LIVES_WIDGET_STATE_INSENSITIVE, &palette->menu_and_bars_fore);
-    }
-    else {
-    lives_widget_set_bg_color (entry, LIVES_WIDGET_STATE_INSENSITIVE, &palette->normal_back);
-    lives_widget_set_fg_color (entry, LIVES_WIDGET_STATE_INSENSITIVE, &palette->normal_fore);
+      lives_widget_set_bg_color(entry, LIVES_WIDGET_STATE_INSENSITIVE, &palette->menu_and_bars);
+      lives_widget_set_fg_color(entry, LIVES_WIDGET_STATE_INSENSITIVE, &palette->menu_and_bars_fore);
+    } else {
+      lives_widget_set_bg_color(entry, LIVES_WIDGET_STATE_INSENSITIVE, &palette->normal_back);
+      lives_widget_set_fg_color(entry, LIVES_WIDGET_STATE_INSENSITIVE, &palette->normal_fore);
     }
   }
 
   if (entry2!=NULL) {
-    gtk_event_box_set_above_child(LIVES_EVENT_BOX(ebox2),TRUE);
+    lives_event_box_set_above_child(LIVES_EVENT_BOX(ebox2),TRUE);
 
-    lives_signal_connect (LIVES_GUI_OBJECT (ebox2), "button_press_event",
-		      LIVES_GUI_CALLBACK (on_entry_click),
-		      (gpointer)rfxbuilder);
+    lives_signal_connect(LIVES_GUI_OBJECT(ebox2), LIVES_WIDGET_BUTTON_PRESS_EVENT,
+                         LIVES_GUI_CALLBACK(on_entry_click),
+                         (livespointer)rfxbuilder);
 
     if (palette->style&STYLE_1) {
       if (palette->style&STYLE_3) {
-	lives_widget_set_bg_color (entry2, LIVES_WIDGET_STATE_INSENSITIVE, &palette->menu_and_bars);
-	lives_widget_set_fg_color (entry2, LIVES_WIDGET_STATE_INSENSITIVE, &palette->menu_and_bars_fore);
-    }
-      else {
-	lives_widget_set_bg_color (entry2, LIVES_WIDGET_STATE_INSENSITIVE, &palette->normal_back);
-	lives_widget_set_fg_color (entry2, LIVES_WIDGET_STATE_INSENSITIVE, &palette->normal_fore);
+        lives_widget_set_bg_color(entry2, LIVES_WIDGET_STATE_INSENSITIVE, &palette->menu_and_bars);
+        lives_widget_set_fg_color(entry2, LIVES_WIDGET_STATE_INSENSITIVE, &palette->menu_and_bars_fore);
+      } else {
+        lives_widget_set_bg_color(entry2, LIVES_WIDGET_STATE_INSENSITIVE, &palette->normal_back);
+        lives_widget_set_fg_color(entry2, LIVES_WIDGET_STATE_INSENSITIVE, &palette->normal_fore);
       }
     }
   }
 
   if (entry3!=NULL) {
-    gtk_event_box_set_above_child(LIVES_EVENT_BOX(ebox3),TRUE);
+    lives_event_box_set_above_child(LIVES_EVENT_BOX(ebox3),TRUE);
 
-    lives_signal_connect (LIVES_GUI_OBJECT (ebox3), "button_press_event",
-		      LIVES_GUI_CALLBACK (on_entry_click),
-		      (gpointer)rfxbuilder);
+    lives_signal_connect(LIVES_GUI_OBJECT(ebox3), LIVES_WIDGET_BUTTON_PRESS_EVENT,
+                         LIVES_GUI_CALLBACK(on_entry_click),
+                         (livespointer)rfxbuilder);
 
     if (palette->style&STYLE_1) {
       if (palette->style&STYLE_3) {
-	lives_widget_set_bg_color (entry3, LIVES_WIDGET_STATE_INSENSITIVE, &palette->menu_and_bars);
-	lives_widget_set_fg_color (entry3, LIVES_WIDGET_STATE_INSENSITIVE, &palette->menu_and_bars_fore);
-    }
-      else {
-	lives_widget_set_bg_color (entry3, LIVES_WIDGET_STATE_INSENSITIVE, &palette->normal_back);
-	lives_widget_set_fg_color (entry3, LIVES_WIDGET_STATE_INSENSITIVE, &palette->normal_fore);
+        lives_widget_set_bg_color(entry3, LIVES_WIDGET_STATE_INSENSITIVE, &palette->menu_and_bars);
+        lives_widget_set_fg_color(entry3, LIVES_WIDGET_STATE_INSENSITIVE, &palette->menu_and_bars_fore);
+      } else {
+        lives_widget_set_bg_color(entry3, LIVES_WIDGET_STATE_INSENSITIVE, &palette->normal_back);
+        lives_widget_set_fg_color(entry3, LIVES_WIDGET_STATE_INSENSITIVE, &palette->normal_fore);
       }
     }
   }
 
   if (button!=NULL) {
     table_select_row(rfxbuilder, rfxbuilder->table_rows-1);
-    
+
     if (rfxbuilder->table_type==RFX_TABLE_TYPE_REQUIREMENTS) {
       on_table_edit_row(NULL,user_data);
     }
@@ -1493,40 +1460,36 @@
 
 
 
-void param_set_from_dialog (lives_param_t *copy_param, rfx_build_window_t *rfxbuilder) {
+void param_set_from_dialog(lives_param_t *copy_param, rfx_build_window_t *rfxbuilder) {
   // set parameter values from param_dialog
   // this is called after adding a new copy_param or editing an existing one
-  gchar *ctext=lives_combo_get_active_text(LIVES_COMBO(rfxbuilder->param_type_combo));
+  char *ctext=lives_combo_get_active_text(LIVES_COMBO(rfxbuilder->param_type_combo));
 
-  copy_param->name=g_strdup (lives_entry_get_text (LIVES_ENTRY (rfxbuilder->param_name_entry)));
-  copy_param->label=g_strdup (lives_entry_get_text (LIVES_ENTRY (rfxbuilder->param_label_entry)));
-  
-  if (!strcmp (ctext,"num")) {
+  copy_param->name=lives_strdup(lives_entry_get_text(LIVES_ENTRY(rfxbuilder->param_name_entry)));
+  copy_param->label=lives_strdup(lives_entry_get_text(LIVES_ENTRY(rfxbuilder->param_label_entry)));
+
+  if (!strcmp(ctext,"num")) {
     copy_param->type=LIVES_PARAM_NUM;
-  }
-  else if (!strcmp (ctext,"bool")) {
+  } else if (!strcmp(ctext,"bool")) {
     copy_param->type=LIVES_PARAM_BOOL;
-  }
-  else if (!strcmp (ctext,"colRGB24")) {
+  } else if (!strcmp(ctext,"colRGB24")) {
     copy_param->type=LIVES_PARAM_COLRGB24;
-  }
-  else if (!strcmp (ctext,"string")) {
+  } else if (!strcmp(ctext,"string")) {
     copy_param->type=LIVES_PARAM_STRING;
-  }
-  else if (!strcmp (ctext,"string_list")) {
+  } else if (!strcmp(ctext,"string_list")) {
     copy_param->type=LIVES_PARAM_STRING_LIST;
   }
 
-  g_free(ctext);
+  lives_free(ctext);
 
   copy_param->dp=lives_spin_button_get_value_as_int(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_dp));
   copy_param->group=lives_spin_button_get_value_as_int(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_group));
   copy_param->onchange=FALSE;  // no trigger assigned yet
-  
+
   // TODO - check
-  if (copy_param->type!=LIVES_PARAM_STRING&&copy_param->def!=NULL) g_free (copy_param->def);
-  if (copy_param->type!=LIVES_PARAM_STRING_LIST&&copy_param->list!=NULL) g_list_free (copy_param->list);
-  
+  if (copy_param->type!=LIVES_PARAM_STRING&&copy_param->def!=NULL) lives_free(copy_param->def);
+  if (copy_param->type!=LIVES_PARAM_STRING_LIST&&copy_param->list!=NULL) lives_list_free(copy_param->list);
+
   switch (copy_param->type) {
   case LIVES_PARAM_NUM:
     copy_param->min=lives_spin_button_get_value(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_min));
@@ -1534,17 +1497,16 @@
     copy_param->step_size=lives_spin_button_get_value(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_step));
     copy_param->wrap=lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(rfxbuilder->param_wrap_checkbutton));
     if (!copy_param->dp) {
-      copy_param->def=g_malloc (sizint);
-      set_int_param (copy_param->def,lives_spin_button_get_value_as_int(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_def)));
-    }
-    else {
-      copy_param->def=g_malloc (sizdbl);
-      set_double_param (copy_param->def,lives_spin_button_get_value(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_def)));
+      copy_param->def=lives_malloc(sizint);
+      set_int_param(copy_param->def,lives_spin_button_get_value_as_int(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_def)));
+    } else {
+      copy_param->def=lives_malloc(sizdbl);
+      set_double_param(copy_param->def,lives_spin_button_get_value(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_def)));
     }
     break;
   case LIVES_PARAM_BOOL:
-    copy_param->def=g_malloc (sizint);
-    set_bool_param (copy_param->def,lives_spin_button_get_value_as_int(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_def)));
+    copy_param->def=lives_malloc(sizint);
+    set_bool_param(copy_param->def,lives_spin_button_get_value_as_int(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_def)));
     copy_param->dp=0;
     break;
   case LIVES_PARAM_STRING:
@@ -1553,14 +1515,15 @@
     break;
   case LIVES_PARAM_STRING_LIST:
     copy_param->dp=0;
-    copy_param->def=g_malloc (sizdbl);
-    set_int_param (copy_param->def,lives_list_index (copy_param->list,lives_combo_get_active_text(LIVES_COMBO(rfxbuilder->param_def_combo))));
+    copy_param->def=lives_malloc(sizdbl);
+    set_int_param(copy_param->def,lives_list_strcmp_index(copy_param->list,
+                  lives_combo_get_active_text(LIVES_COMBO(rfxbuilder->param_def_combo))));
     break;
   case LIVES_PARAM_COLRGB24:
-    copy_param->def=g_malloc (3*sizint);
-    set_colRGB24_param (copy_param->def,lives_spin_button_get_value_as_int(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_def)),
-			lives_spin_button_get_value_as_int(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_min)),
-			lives_spin_button_get_value_as_int(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_max)));
+    copy_param->def=lives_malloc(3*sizint);
+    set_colRGB24_param(copy_param->def,lives_spin_button_get_value_as_int(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_def)),
+                       lives_spin_button_get_value_as_int(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_min)),
+                       lives_spin_button_get_value_as_int(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_max)));
     copy_param->dp=0;
     break;
   default:
@@ -1572,7 +1535,7 @@
 
 
 
-void on_table_edit_row (LiVESButton *button, gpointer user_data) {
+void on_table_edit_row(LiVESButton *button, livespointer user_data) {
   LiVESWidget *param_dialog;
   LiVESWidget *paramw_dialog;
   LiVESWidget *trigger_dialog;
@@ -1584,10 +1547,10 @@
   int found=-1;
   boolean param_ok=FALSE;
 
-  gchar *tmpx;
-  gchar *ctext;
+  char *tmpx;
+  char *ctext;
 
-  for (i=0;i<rfxbuilder->table_rows&&found==-1;i++) {
+  for (i=0; i<rfxbuilder->table_rows&&found==-1; i++) {
     if (lives_widget_is_sensitive(rfxbuilder->entry[i])) {
       found=i;
       break;
@@ -1596,15 +1559,14 @@
   if (found==-1) return;
 
   switch (rfxbuilder->table_type) {
-    case RFX_TABLE_TYPE_REQUIREMENTS:
-    for (i=0;i<rfxbuilder->table_rows;i++) {
-      if (found==i) { 
-	lives_entry_set_editable (LIVES_ENTRY (rfxbuilder->entry[i]), TRUE);
-	lives_widget_context_update();
-	lives_widget_grab_focus (rfxbuilder->entry[i]);
-      }
-      else {
-	lives_entry_set_editable (LIVES_ENTRY (rfxbuilder->entry[i]), FALSE);
+  case RFX_TABLE_TYPE_REQUIREMENTS:
+    for (i=0; i<rfxbuilder->table_rows; i++) {
+      if (found==i) {
+        lives_entry_set_editable(LIVES_ENTRY(rfxbuilder->entry[i]), TRUE);
+        lives_widget_context_update();
+        lives_widget_grab_focus(rfxbuilder->entry[i]);
+      } else {
+        lives_entry_set_editable(LIVES_ENTRY(rfxbuilder->entry[i]), FALSE);
       }
     }
     break;
@@ -1612,97 +1574,95 @@
   case RFX_TABLE_TYPE_PARAMS:
     param_dialog=make_param_dialog(found,rfxbuilder);
     do {
-      if (lives_dialog_run (LIVES_DIALOG (param_dialog))==LIVES_RESPONSE_CANCEL) {
-	lives_widget_destroy (param_dialog);
-	return;
+      if (lives_dialog_run(LIVES_DIALOG(param_dialog))==LIVES_RESPONSE_CANCEL) {
+        lives_widget_destroy(param_dialog);
+        return;
       }
-      param_ok=perform_param_checks (rfxbuilder,found,rfxbuilder->num_params);
+      param_ok=perform_param_checks(rfxbuilder,found,rfxbuilder->num_params);
     } while (!param_ok);
-    
-    param_set_from_dialog ((param=&rfxbuilder->copy_params[found]),rfxbuilder);
-    lives_entry_set_text (LIVES_ENTRY (rfxbuilder->entry2[found]),param->name);
+
+    param_set_from_dialog((param=&rfxbuilder->copy_params[found]),rfxbuilder);
+    lives_entry_set_text(LIVES_ENTRY(rfxbuilder->entry2[found]),param->name);
     switch (param->type) {
     case LIVES_PARAM_NUM:
-      lives_entry_set_text (LIVES_ENTRY (rfxbuilder->entry3[found]),(tmpx=g_strdup_printf ("num%d",param->dp)));
-      g_free(tmpx);
+      lives_entry_set_text(LIVES_ENTRY(rfxbuilder->entry3[found]),(tmpx=lives_strdup_printf("num%d",param->dp)));
+      lives_free(tmpx);
       break;
     case LIVES_PARAM_BOOL:
-      lives_entry_set_text (LIVES_ENTRY (rfxbuilder->entry3[found]),"bool");
+      lives_entry_set_text(LIVES_ENTRY(rfxbuilder->entry3[found]),"bool");
       break;
     case LIVES_PARAM_COLRGB24:
-      lives_entry_set_text (LIVES_ENTRY (rfxbuilder->entry3[found]),"colRGB24");
+      lives_entry_set_text(LIVES_ENTRY(rfxbuilder->entry3[found]),"colRGB24");
       break;
     case LIVES_PARAM_STRING:
-      lives_entry_set_text (LIVES_ENTRY (rfxbuilder->entry3[found]),"string");
+      lives_entry_set_text(LIVES_ENTRY(rfxbuilder->entry3[found]),"string");
       break;
     case LIVES_PARAM_STRING_LIST:
-      lives_entry_set_text (LIVES_ENTRY (rfxbuilder->entry3[found]),"string_list");
+      lives_entry_set_text(LIVES_ENTRY(rfxbuilder->entry3[found]),"string_list");
       break;
     default:
       break;
     }
-    lives_widget_destroy (param_dialog);
+    lives_widget_destroy(param_dialog);
     break;
 
   case RFX_TABLE_TYPE_PARAM_WINDOW:
     paramw_dialog=make_param_window_dialog(found,rfxbuilder);
-    if (lives_dialog_run (LIVES_DIALOG (paramw_dialog))==LIVES_RESPONSE_CANCEL) {
-      lives_widget_destroy (paramw_dialog);
+    if (lives_dialog_run(LIVES_DIALOG(paramw_dialog))==LIVES_RESPONSE_CANCEL) {
+      lives_widget_destroy(paramw_dialog);
       return;
     }
     ctext=lives_combo_get_active_text(LIVES_COMBO(rfxbuilder->paramw_kw_combo));
-    lives_entry_set_text (LIVES_ENTRY (rfxbuilder->entry[found]),ctext);
-    g_free(ctext);
-    if (!strcmp (lives_entry_get_text (LIVES_ENTRY (rfxbuilder->entry[found])),"layout")) {
-      lives_entry_set_text (LIVES_ENTRY (rfxbuilder->entry2[found]),lives_entry_get_text (LIVES_ENTRY (rfxbuilder->paramw_rest_entry)));
-    }
-    else {
+    lives_entry_set_text(LIVES_ENTRY(rfxbuilder->entry[found]),ctext);
+    lives_free(ctext);
+    if (!strcmp(lives_entry_get_text(LIVES_ENTRY(rfxbuilder->entry[found])),"layout")) {
+      lives_entry_set_text(LIVES_ENTRY(rfxbuilder->entry2[found]),lives_entry_get_text(LIVES_ENTRY(rfxbuilder->paramw_rest_entry)));
+    } else {
       // TODO - use lives_rfx_special_t->has_subtype,name,num_params
       ctext=lives_combo_get_active_text(LIVES_COMBO(rfxbuilder->paramw_sp_combo));
-      if (!strcmp (ctext,"framedraw")) {
-	gchar *ctext2=lives_combo_get_active_text(LIVES_COMBO(rfxbuilder->paramw_spsub_combo));
-	lives_entry_set_text (LIVES_ENTRY (rfxbuilder->entry2[found]),
-			    (tmpx=g_strdup_printf ("%s%s%s%s%s",ctext,rfxbuilder->field_delim,ctext2,rfxbuilder->field_delim,
-						   lives_entry_get_text (LIVES_ENTRY (rfxbuilder->paramw_rest_entry)))));
-	g_free(ctext2);
-      }
-      else {
-	lives_entry_set_text (LIVES_ENTRY (rfxbuilder->entry2[found]),
-			    (tmpx=g_strdup_printf ("%s%s%s",ctext,rfxbuilder->field_delim,lives_entry_get_text 
-						   (LIVES_ENTRY (rfxbuilder->paramw_rest_entry)))));
+      if (!strcmp(ctext,"framedraw")) {
+        char *ctext2=lives_combo_get_active_text(LIVES_COMBO(rfxbuilder->paramw_spsub_combo));
+        lives_entry_set_text(LIVES_ENTRY(rfxbuilder->entry2[found]),
+                             (tmpx=lives_strdup_printf("%s%s%s%s%s",ctext,rfxbuilder->field_delim,ctext2,rfxbuilder->field_delim,
+                                   lives_entry_get_text(LIVES_ENTRY(rfxbuilder->paramw_rest_entry)))));
+        lives_free(ctext2);
+      } else {
+        lives_entry_set_text(LIVES_ENTRY(rfxbuilder->entry2[found]),
+                             (tmpx=lives_strdup_printf("%s%s%s",ctext,rfxbuilder->field_delim,lives_entry_get_text
+                                   (LIVES_ENTRY(rfxbuilder->paramw_rest_entry)))));
       }
-      g_free(ctext);
-      g_free(tmpx);
+      lives_free(ctext);
+      lives_free(tmpx);
     }
-    lives_widget_destroy (paramw_dialog);
+    lives_widget_destroy(paramw_dialog);
     break;
 
   case RFX_TABLE_TYPE_TRIGGERS:
     trigger_dialog=make_trigger_dialog(found,rfxbuilder);
-    if (lives_dialog_run (LIVES_DIALOG (trigger_dialog))==LIVES_RESPONSE_CANCEL) {
-      lives_widget_destroy (trigger_dialog);
+    if (lives_dialog_run(LIVES_DIALOG(trigger_dialog))==LIVES_RESPONSE_CANCEL) {
+      lives_widget_destroy(trigger_dialog);
       return;
     }
 
-    g_free (rfxbuilder->copy_triggers[found].code);
-    rfxbuilder->copy_triggers[found].code=lives_text_view_get_text (LIVES_TEXT_VIEW (rfxbuilder->code_textview));
+    lives_free(rfxbuilder->copy_triggers[found].code);
+    rfxbuilder->copy_triggers[found].code=lives_text_view_get_text(LIVES_TEXT_VIEW(rfxbuilder->code_textview));
 
-    lives_widget_destroy (trigger_dialog);
+    lives_widget_destroy(trigger_dialog);
     break;
   }
 }
 
 
 
-void on_table_swap_row (LiVESButton *button, gpointer user_data) {
-  gchar *entry_text;
+void on_table_swap_row(LiVESButton *button, livespointer user_data) {
+  char *entry_text;
   rfx_build_window_t *rfxbuilder=(rfx_build_window_t *)user_data;
 
   int found=-1;
 
   register int i;
 
-  for (i=0;i<rfxbuilder->table_rows&&found==-1;i++) {
+  for (i=0; i<rfxbuilder->table_rows&&found==-1; i++) {
     if (!(lives_widget_get_state(rfxbuilder->entry[i])&LIVES_WIDGET_STATE_INSENSITIVE)) {
       found=i;
       break;
@@ -1713,23 +1673,24 @@
 
   switch (rfxbuilder->table_type) {
   case RFX_TABLE_TYPE_PARAM_WINDOW:
-    if (button==LIVES_BUTTON (rfxbuilder->move_up_button)) {
+    if (button==LIVES_BUTTON(rfxbuilder->move_up_button)) {
       rfxbuilder->table_swap_row2=found-1;
-    }
-    else if (button==LIVES_BUTTON (rfxbuilder->move_down_button)) {
+    } else if (button==LIVES_BUTTON(rfxbuilder->move_down_button)) {
       rfxbuilder->table_swap_row2=found+1;
     }
     if (rfxbuilder->table_swap_row2<0||rfxbuilder->table_swap_row2>=rfxbuilder->table_rows) return;
 
-    entry_text=g_strdup(lives_entry_get_text(LIVES_ENTRY(rfxbuilder->entry[found])));
-    lives_entry_set_text (LIVES_ENTRY (rfxbuilder->entry[found]),lives_entry_get_text (LIVES_ENTRY (rfxbuilder->entry[rfxbuilder->table_swap_row2])));
-    lives_entry_set_text (LIVES_ENTRY (rfxbuilder->entry[rfxbuilder->table_swap_row2]),entry_text);
-    g_free (entry_text);
-
-    entry_text=g_strdup(lives_entry_get_text(LIVES_ENTRY(rfxbuilder->entry2[found])));
-    lives_entry_set_text (LIVES_ENTRY (rfxbuilder->entry2[found]),lives_entry_get_text (LIVES_ENTRY (rfxbuilder->entry2[rfxbuilder->table_swap_row2])));
-    lives_entry_set_text (LIVES_ENTRY (rfxbuilder->entry2[rfxbuilder->table_swap_row2]),entry_text);
-    g_free (entry_text);
+    entry_text=lives_strdup(lives_entry_get_text(LIVES_ENTRY(rfxbuilder->entry[found])));
+    lives_entry_set_text(LIVES_ENTRY(rfxbuilder->entry[found]),
+                         lives_entry_get_text(LIVES_ENTRY(rfxbuilder->entry[rfxbuilder->table_swap_row2])));
+    lives_entry_set_text(LIVES_ENTRY(rfxbuilder->entry[rfxbuilder->table_swap_row2]),entry_text);
+    lives_free(entry_text);
+
+    entry_text=lives_strdup(lives_entry_get_text(LIVES_ENTRY(rfxbuilder->entry2[found])));
+    lives_entry_set_text(LIVES_ENTRY(rfxbuilder->entry2[found]),
+                         lives_entry_get_text(LIVES_ENTRY(rfxbuilder->entry2[rfxbuilder->table_swap_row2])));
+    lives_entry_set_text(LIVES_ENTRY(rfxbuilder->entry2[rfxbuilder->table_swap_row2]),entry_text);
+    lives_free(entry_text);
 
     break;
   default:
@@ -1741,7 +1702,7 @@
 }
 
 
-void on_table_delete_row (LiVESButton *button, gpointer user_data) {
+void on_table_delete_row(LiVESButton *button, livespointer user_data) {
   rfx_build_window_t *rfxbuilder=(rfx_build_window_t *)user_data;
 
   LiVESWidget *ebox;
@@ -1759,30 +1720,29 @@
 
   switch (rfxbuilder->table_type) {
   case RFX_TABLE_TYPE_REQUIREMENTS:
-    for (i=0;i<rfxbuilder->table_rows;i++) {
+    for (i=0; i<rfxbuilder->table_rows; i++) {
       if (move>0) {
 
 #if !LIVES_TABLE_IS_GRID
-	if (i<rfxbuilder->table_rows-1) ebox2=lives_widget_get_parent(rfxbuilder->entry[i]);
-	lives_widget_reparent(rfxbuilder->entry[i],ebox);
-	ebox=ebox2;
+        if (i<rfxbuilder->table_rows-1) ebox2=lives_widget_get_parent(rfxbuilder->entry[i]);
+        lives_widget_reparent(rfxbuilder->entry[i],ebox);
+        ebox=ebox2;
 #endif
 
-	rfxbuilder->entry[i-1]=rfxbuilder->entry[i];
+        rfxbuilder->entry[i-1]=rfxbuilder->entry[i];
 
-      }
-      else if (!(lives_widget_get_state(rfxbuilder->entry[i])&LIVES_WIDGET_STATE_INSENSITIVE)) {
+      } else if (!(lives_widget_get_state(rfxbuilder->entry[i])&LIVES_WIDGET_STATE_INSENSITIVE)) {
 
 #if LIVES_TABLE_IS_GRID
-	lives_grid_remove_row(LIVES_GRID(rfxbuilder->table),i);
+        lives_grid_remove_row(LIVES_GRID(rfxbuilder->table),i);
 #else
-	ebox=lives_widget_get_parent(rfxbuilder->entry[i]);
-	if (rfxbuilder->table_rows>1) {
-	  lives_table_resize (LIVES_TABLE (rfxbuilder->table),rfxbuilder->table_rows-1,1);
-	}
-	lives_widget_destroy (rfxbuilder->entry[i]);
+        ebox=lives_widget_get_parent(rfxbuilder->entry[i]);
+        if (rfxbuilder->table_rows>1) {
+          lives_table_resize(LIVES_TABLE(rfxbuilder->table),rfxbuilder->table_rows-1,1);
+        }
+        lives_widget_destroy(rfxbuilder->entry[i]);
 #endif
-	move=i+1;
+        move=i+1;
       }
 
 
@@ -1793,67 +1753,66 @@
     break;
 
   case RFX_TABLE_TYPE_PARAMS:
-    for (i=0;i<rfxbuilder->table_rows;i++) {
+    for (i=0; i<rfxbuilder->table_rows; i++) {
       if (move>0) {
-	// note - parameters become renumbered here
+        // note - parameters become renumbered here
 
 #if !LIVES_TABLE_IS_GRID
-	// move everything up except p%d
-	if (i<rfxbuilder->table_rows-1) {
-	  ebox3=lives_widget_get_parent(rfxbuilder->entry2[i]);
-	  ebox4=lives_widget_get_parent(rfxbuilder->entry3[i]);
-	}
-	lives_widget_reparent(rfxbuilder->entry2[i],ebox);
-	lives_widget_reparent(rfxbuilder->entry3[i],ebox2);
-	ebox=ebox3;
-	ebox2=ebox4;
+        // move everything up except p%d
+        if (i<rfxbuilder->table_rows-1) {
+          ebox3=lives_widget_get_parent(rfxbuilder->entry2[i]);
+          ebox4=lives_widget_get_parent(rfxbuilder->entry3[i]);
+        }
+        lives_widget_reparent(rfxbuilder->entry2[i],ebox);
+        lives_widget_reparent(rfxbuilder->entry3[i],ebox2);
+        ebox=ebox3;
+        ebox2=ebox4;
 #else
-	// move p%d up so when we remove the row the numbering is ok
-	entry2=rfxbuilder->entry[i];
-	ebox=lives_widget_get_parent(rfxbuilder->entry[i]);
-	lives_object_ref(entry2);
-	lives_widget_unparent(entry2);
-	lives_container_add(LIVES_CONTAINER(ebox),entry);
-	lives_object_unref(entry);
-	entry=entry2;
+        // move p%d up so when we remove the row the numbering is ok
+        entry2=rfxbuilder->entry[i];
+        ebox=lives_widget_get_parent(rfxbuilder->entry[i]);
+        lives_object_ref(entry2);
+        lives_widget_unparent(entry2);
+        lives_container_add(LIVES_CONTAINER(ebox),entry);
+        lives_object_unref(entry);
+        entry=entry2;
 #endif
 
-	rfxbuilder->entry2[i-1]=rfxbuilder->entry2[i];
-	rfxbuilder->entry3[i-1]=rfxbuilder->entry3[i];
-	param_copy (&rfxbuilder->copy_params[i],&rfxbuilder->copy_params[i-1],FALSE);
-	g_free (rfxbuilder->copy_params[i].name);
-	g_free (rfxbuilder->copy_params[i].label);
-	g_free (rfxbuilder->copy_params[i].def);
-
-      }
-      else if (!(lives_widget_get_state(rfxbuilder->entry[i])&LIVES_WIDGET_STATE_INSENSITIVE)) {
-	if (rfxbuilder->copy_params[i].onchange) {
-	  do_blocking_error_dialog(_ ("\n\nCannot remove this parameter as it has a trigger.\nPlease remove the trigger first.\n\n"));
-	  return;
-	}
+        rfxbuilder->entry2[i-1]=rfxbuilder->entry2[i];
+        rfxbuilder->entry3[i-1]=rfxbuilder->entry3[i];
+        param_copy(&rfxbuilder->copy_params[i],&rfxbuilder->copy_params[i-1],FALSE);
+        lives_free(rfxbuilder->copy_params[i].name);
+        lives_free(rfxbuilder->copy_params[i].label);
+        lives_free(rfxbuilder->copy_params[i].def);
+
+      } else if (!(lives_widget_get_state(rfxbuilder->entry[i])&LIVES_WIDGET_STATE_INSENSITIVE)) {
+        if (rfxbuilder->copy_params[i].onchange) {
+          do_blocking_error_dialog(_("\n\nCannot remove this parameter as it has a trigger.\nPlease remove the trigger first.\n\n"));
+          return;
+        }
 
 #if LIVES_TABLE_IS_GRID
-	entry=rfxbuilder->entry[i];
-	lives_object_ref(entry);
-	lives_widget_unparent(entry);
-	lives_grid_remove_row(LIVES_GRID(rfxbuilder->table),i);
+        entry=rfxbuilder->entry[i];
+        lives_object_ref(entry);
+        lives_widget_unparent(entry);
+        lives_grid_remove_row(LIVES_GRID(rfxbuilder->table),i);
 #else
-	ebox=lives_widget_get_parent(rfxbuilder->entry2[i]);
-	ebox2=lives_widget_get_parent(rfxbuilder->entry3[i]);
-
-	lives_widget_destroy (rfxbuilder->entry[rfxbuilder->table_rows-1]);
-	lives_widget_destroy (rfxbuilder->entry2[i]);
-	lives_widget_destroy (rfxbuilder->entry3[i]);
+        ebox=lives_widget_get_parent(rfxbuilder->entry2[i]);
+        ebox2=lives_widget_get_parent(rfxbuilder->entry3[i]);
 
-	if (rfxbuilder->table_rows>1) {
-	  lives_table_resize (LIVES_TABLE (rfxbuilder->table),rfxbuilder->table_rows-1,3);
-      }
+        lives_widget_destroy(rfxbuilder->entry[rfxbuilder->table_rows-1]);
+        lives_widget_destroy(rfxbuilder->entry2[i]);
+        lives_widget_destroy(rfxbuilder->entry3[i]);
+
+        if (rfxbuilder->table_rows>1) {
+          lives_table_resize(LIVES_TABLE(rfxbuilder->table),rfxbuilder->table_rows-1,3);
+        }
 #endif
-	g_free (rfxbuilder->copy_params[i].name);
-	g_free (rfxbuilder->copy_params[i].label);
-	g_free (rfxbuilder->copy_params[i].def);
+        lives_free(rfxbuilder->copy_params[i].name);
+        lives_free(rfxbuilder->copy_params[i].label);
+        lives_free(rfxbuilder->copy_params[i].def);
 
-	move=i+1;
+        move=i+1;
       }
     }
 
@@ -1864,51 +1823,50 @@
     if (move==0) return;
     rfxbuilder->table_rows--;
     rfxbuilder->num_params--;
-    for (i=0;i<rfxbuilder->num_triggers;i++) {
+    for (i=0; i<rfxbuilder->num_triggers; i++) {
       if (rfxbuilder->triggers[i].when>move) {
-	rfxbuilder->params[rfxbuilder->triggers[i].when-1].onchange=FALSE;
-	rfxbuilder->params[--rfxbuilder->triggers[i].when-1].onchange=TRUE;
+        rfxbuilder->params[rfxbuilder->triggers[i].when-1].onchange=FALSE;
+        rfxbuilder->params[--rfxbuilder->triggers[i].when-1].onchange=TRUE;
       }
       triggers_adjusted=TRUE;
     }
     if (triggers_adjusted) {
-      do_blocking_error_dialog (_ ("\n\nSome triggers were adjusted.\nPlease check the trigger code.\n"));
+      do_blocking_error_dialog(_("\n\nSome triggers were adjusted.\nPlease check the trigger code.\n"));
     }
     break;
 
   case RFX_TABLE_TYPE_PARAM_WINDOW:
-    for (i=0;i<rfxbuilder->table_rows;i++) {
+    for (i=0; i<rfxbuilder->table_rows; i++) {
       if (move>0) {
 
 #if !LIVES_TABLE_IS_GRID
-	if (i<rfxbuilder->table_rows-1) {
-	  ebox3=lives_widget_get_parent(rfxbuilder->entry[i]);
-	  ebox4=lives_widget_get_parent(rfxbuilder->entry2[i]);
-	}
-	lives_widget_reparent(rfxbuilder->entry[i],ebox);
-	lives_widget_reparent(rfxbuilder->entry2[i],ebox2);
-	ebox=ebox3;
-	ebox2=ebox4;
+        if (i<rfxbuilder->table_rows-1) {
+          ebox3=lives_widget_get_parent(rfxbuilder->entry[i]);
+          ebox4=lives_widget_get_parent(rfxbuilder->entry2[i]);
+        }
+        lives_widget_reparent(rfxbuilder->entry[i],ebox);
+        lives_widget_reparent(rfxbuilder->entry2[i],ebox2);
+        ebox=ebox3;
+        ebox2=ebox4;
 #endif
 
-	rfxbuilder->entry[i-1]=rfxbuilder->entry[i];
-	rfxbuilder->entry2[i-1]=rfxbuilder->entry2[i];
-      }
-      else if (!(lives_widget_get_state(rfxbuilder->entry[i])&LIVES_WIDGET_STATE_INSENSITIVE)) {
+        rfxbuilder->entry[i-1]=rfxbuilder->entry[i];
+        rfxbuilder->entry2[i-1]=rfxbuilder->entry2[i];
+      } else if (!(lives_widget_get_state(rfxbuilder->entry[i])&LIVES_WIDGET_STATE_INSENSITIVE)) {
 
 #if LIVES_TABLE_IS_GRID
-	lives_grid_remove_row(LIVES_GRID(rfxbuilder->table),i);
+        lives_grid_remove_row(LIVES_GRID(rfxbuilder->table),i);
 #else
-	ebox=lives_widget_get_parent(rfxbuilder->entry[i]);
-	ebox2=lives_widget_get_parent(rfxbuilder->entry2[i]);
+        ebox=lives_widget_get_parent(rfxbuilder->entry[i]);
+        ebox2=lives_widget_get_parent(rfxbuilder->entry2[i]);
 
-	lives_widget_destroy (rfxbuilder->entry[i]);
-	lives_widget_destroy (rfxbuilder->entry2[i]);
-	if (rfxbuilder->table_rows>1) {
-	  lives_table_resize (LIVES_TABLE (rfxbuilder->table),rfxbuilder->table_rows-1,1);
-	}
+        lives_widget_destroy(rfxbuilder->entry[i]);
+        lives_widget_destroy(rfxbuilder->entry2[i]);
+        if (rfxbuilder->table_rows>1) {
+          lives_table_resize(LIVES_TABLE(rfxbuilder->table),rfxbuilder->table_rows-1,1);
+        }
 #endif
-	move=i+1;
+        move=i+1;
       }
     }
     if (move==0) return;
@@ -1917,38 +1875,37 @@
     break;
 
   case RFX_TABLE_TYPE_TRIGGERS:
-    for (i=0;i<rfxbuilder->table_rows;i++) {
+    for (i=0; i<rfxbuilder->table_rows; i++) {
       if (move>0) {
 
 #if !LIVES_TABLE_IS_GRID
-	if (i<rfxbuilder->table_rows-1) ebox2=lives_widget_get_parent(rfxbuilder->entry[i]);
-	lives_widget_reparent(rfxbuilder->entry[i],ebox);
-	ebox=ebox2;
+        if (i<rfxbuilder->table_rows-1) ebox2=lives_widget_get_parent(rfxbuilder->entry[i]);
+        lives_widget_reparent(rfxbuilder->entry[i],ebox);
+        ebox=ebox2;
 #endif
 
-	rfxbuilder->entry[i-1]=rfxbuilder->entry[i];
-	rfxbuilder->copy_triggers[i-1].when=rfxbuilder->copy_triggers[i].when;
-	rfxbuilder->copy_triggers[i-1].code=g_strdup (rfxbuilder->copy_triggers[i].code);
-	g_free (rfxbuilder->copy_triggers[i].code);
-      }
-      else if (!(lives_widget_get_state(rfxbuilder->entry[i])&LIVES_WIDGET_STATE_INSENSITIVE)) {
-	int when=atoi (lives_entry_get_text (LIVES_ENTRY (rfxbuilder->entry[i])))+1;
+        rfxbuilder->entry[i-1]=rfxbuilder->entry[i];
+        rfxbuilder->copy_triggers[i-1].when=rfxbuilder->copy_triggers[i].when;
+        rfxbuilder->copy_triggers[i-1].code=lives_strdup(rfxbuilder->copy_triggers[i].code);
+        lives_free(rfxbuilder->copy_triggers[i].code);
+      } else if (!(lives_widget_get_state(rfxbuilder->entry[i])&LIVES_WIDGET_STATE_INSENSITIVE)) {
+        int when=atoi(lives_entry_get_text(LIVES_ENTRY(rfxbuilder->entry[i])))+1;
 
-	if (!strcmp(lives_entry_get_text (LIVES_ENTRY (rfxbuilder->entry[i])),"init")) rfxbuilder->has_init_trigger=FALSE;
-	else rfxbuilder->params[when-1].onchange=FALSE;
+        if (!strcmp(lives_entry_get_text(LIVES_ENTRY(rfxbuilder->entry[i])),"init")) rfxbuilder->has_init_trigger=FALSE;
+        else rfxbuilder->params[when-1].onchange=FALSE;
 
-	g_free (rfxbuilder->copy_triggers[i].code);
+        lives_free(rfxbuilder->copy_triggers[i].code);
 
 #if LIVES_TABLE_IS_GRID
-	lives_grid_remove_row(LIVES_GRID(rfxbuilder->table),i);
+        lives_grid_remove_row(LIVES_GRID(rfxbuilder->table),i);
 #else
-	ebox=lives_widget_get_parent(rfxbuilder->entry[i]);
-	if (rfxbuilder->table_rows>1) {
-	  lives_table_resize (LIVES_TABLE (rfxbuilder->table),rfxbuilder->table_rows-1,1);
-	}
-	lives_widget_destroy (rfxbuilder->entry[i]);
+        ebox=lives_widget_get_parent(rfxbuilder->entry[i]);
+        if (rfxbuilder->table_rows>1) {
+          lives_table_resize(LIVES_TABLE(rfxbuilder->table),rfxbuilder->table_rows-1,1);
+        }
+        lives_widget_destroy(rfxbuilder->entry[i]);
 #endif
-	move=i+1;
+        move=i+1;
       }
     }
     if (move==0) return;
@@ -1969,8 +1926,7 @@
     lives_widget_set_sensitive(rfxbuilder->remove_entry_button,FALSE);
     if (rfxbuilder->move_up_button!=NULL) lives_widget_set_sensitive(rfxbuilder->move_up_button,FALSE);
     if (rfxbuilder->move_down_button!=NULL) lives_widget_set_sensitive(rfxbuilder->move_down_button,FALSE);
-  }
-  else {
+  } else {
     if (move>=rfxbuilder->table_rows) move=rfxbuilder->table_rows-1;
     table_select_row(rfxbuilder,move);
   }
@@ -1978,29 +1934,28 @@
 }
 
 
-LiVESWidget * make_param_dialog (int pnum, rfx_build_window_t *rfxbuilder) {
+LiVESWidget *make_param_dialog(int pnum, rfx_build_window_t *rfxbuilder) {
   LiVESWidget *dialog;
   LiVESWidget *dialog_vbox;
 
-  LiVESAccelGroup *accel_group=LIVES_ACCEL_GROUP(lives_accel_group_new ());
+  LiVESAccelGroup *accel_group=LIVES_ACCEL_GROUP(lives_accel_group_new());
 
-  GList *typelist=NULL;
+  LiVESList *typelist=NULL;
 
   lives_colRGB24_t rgb;
 
-  gchar *tmp,*tmp2,*title;
+  char *tmp,*tmp2,*title;
 
   if (pnum<0) {
-    title=g_strdup(_("LiVES: - New RFX Parameter"));
-  }
-  else {
-    title=g_strdup(_("LiVES: - Edit RFX Parameter"));
+    title=lives_strdup(_("LiVES: - New RFX Parameter"));
+  } else {
+    title=lives_strdup(_("LiVES: - Edit RFX Parameter"));
   }
 
-  dialog = lives_standard_dialog_new (title,TRUE);
-  g_free(title);
+  dialog = lives_standard_dialog_new(title,TRUE,-1,-1);
+  lives_free(title);
 
-  lives_window_add_accel_group (LIVES_WINDOW (dialog), accel_group);
+  lives_window_add_accel_group(LIVES_WINDOW(dialog), accel_group);
 
   if (prefs->show_gui) {
     lives_window_set_transient_for(LIVES_WINDOW(dialog),LIVES_WINDOW(mainw->LiVES));
@@ -2010,42 +1965,44 @@
 
   // name
 
-  rfxbuilder->param_name_entry = lives_standard_entry_new ((tmp=g_strdup(_("_Name:    "))),TRUE,
-							   pnum>=0?rfxbuilder->copy_params[pnum].name:NULL,
-							   60.*widget_opts.scale,-1,LIVES_BOX(dialog_vbox),
-							   (tmp2=g_strdup((_("Name of the parameter, must be unique in the plugin.")))));
+  rfxbuilder->param_name_entry = lives_standard_entry_new((tmp=lives_strdup(_("_Name:    "))),TRUE,
+                                 pnum>=0?rfxbuilder->copy_params[pnum].name:NULL,
+                                 60.*widget_opts.scale,-1,LIVES_BOX(dialog_vbox),
+                                 (tmp2=lives_strdup((_("Name of the parameter, must be unique in the plugin.")))));
 
   if (pnum<0) lives_widget_grab_focus(rfxbuilder->param_name_entry);
 
 
-  g_free(tmp); g_free(tmp2);
+  lives_free(tmp);
+  lives_free(tmp2);
 
   // label
 
-  rfxbuilder->param_label_entry = lives_standard_entry_new ((tmp=g_strdup(_("_Label:    "))),TRUE,
-							   pnum>=0?rfxbuilder->copy_params[pnum].label:NULL,
-							   60.*widget_opts.scale,-1,LIVES_BOX(dialog_vbox),
-							    (tmp2=g_strdup(_("Label to be shown by the parameter. An underscore represents mnemonic accelerator."))));
-  g_free(tmp); g_free(tmp2);
+  rfxbuilder->param_label_entry = lives_standard_entry_new((tmp=lives_strdup(_("_Label:    "))),TRUE,
+                                  pnum>=0?rfxbuilder->copy_params[pnum].label:NULL,
+                                  60.*widget_opts.scale,-1,LIVES_BOX(dialog_vbox),
+                                  (tmp2=lives_strdup(_("Label to be shown by the parameter. An underscore represents mnemonic accelerator."))));
+  lives_free(tmp);
+  lives_free(tmp2);
 
   // type
 
-  typelist = g_list_append (typelist, (gpointer)"num");
-  typelist = g_list_append (typelist, (gpointer)"bool");
-  typelist = g_list_append (typelist, (gpointer)"string");
-  typelist = g_list_append (typelist, (gpointer)"colRGB24");
-  typelist = g_list_append (typelist, (gpointer)"string_list");
-
-  rfxbuilder->param_type_combo = lives_standard_combo_new ((tmp=g_strdup(_("_Type:         "))),TRUE,typelist,
-							   LIVES_BOX(dialog_vbox),(tmp2=g_strdup(_ ("Parameter type (select from list)."))));
-  g_free(tmp);
-  g_free(tmp2);
-  g_list_free(typelist);
+  typelist = lives_list_append(typelist, (livespointer)"num");
+  typelist = lives_list_append(typelist, (livespointer)"bool");
+  typelist = lives_list_append(typelist, (livespointer)"string");
+  typelist = lives_list_append(typelist, (livespointer)"colRGB24");
+  typelist = lives_list_append(typelist, (livespointer)"string_list");
+
+  rfxbuilder->param_type_combo = lives_standard_combo_new((tmp=lives_strdup(_("_Type:         "))),TRUE,typelist,
+                                 LIVES_BOX(dialog_vbox),(tmp2=lives_strdup(_("Parameter type (select from list)."))));
+  lives_free(tmp);
+  lives_free(tmp2);
+  lives_list_free(typelist);
 
   rfxbuilder->edit_param=pnum;
 
   if (pnum>=0) {
-    switch(rfxbuilder->copy_params[pnum].type) {
+    switch (rfxbuilder->copy_params[pnum].type) {
     case LIVES_PARAM_NUM:
       lives_combo_set_active_index(LIVES_COMBO(rfxbuilder->param_type_combo),0);
       break;
@@ -2064,60 +2021,58 @@
     default:
       break;
     }
-  }
-  else rfxbuilder->edit_param=rfxbuilder->num_params;
+  } else rfxbuilder->edit_param=rfxbuilder->num_params;
 
 
   // dp
 
-  rfxbuilder->spinbutton_param_dp = lives_standard_spin_button_new (_("Decimal _places: "),TRUE,pnum>=0?rfxbuilder->copy_params[pnum].dp:0.,
-								    0., 16., 1., 1., 0,
-								    LIVES_BOX(dialog_vbox),NULL);
+  rfxbuilder->spinbutton_param_dp = lives_standard_spin_button_new(_("Decimal _places: "),TRUE,pnum>=0?rfxbuilder->copy_params[pnum].dp:0.,
+                                    0., 16., 1., 1., 0,
+                                    LIVES_BOX(dialog_vbox),NULL);
   rfxbuilder->param_dp_label = widget_opts.last_label;
 
   add_hsep_to_box(LIVES_BOX(dialog_vbox));
 
   // default val
 
-  rfxbuilder->spinbutton_param_def = lives_standard_spin_button_new (_("_Default value:    "),TRUE, 0., -G_MAXINT, G_MAXINT, 1., 1., 0,
-								     LIVES_BOX(dialog_vbox),NULL);
+  rfxbuilder->spinbutton_param_def = lives_standard_spin_button_new(_("_Default value:    "),TRUE, 0., -LIVES_MAXINT, LIVES_MAXINT, 1., 1., 0,
+                                     LIVES_BOX(dialog_vbox),NULL);
   rfxbuilder->param_def_label = widget_opts.last_label;
 
   // extra bits for string/string_list
 
-  rfxbuilder->param_strdef_hbox = lives_hbox_new (FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (dialog_vbox), rfxbuilder->param_strdef_hbox, TRUE, TRUE, widget_opts.packing_height);
+  rfxbuilder->param_strdef_hbox = lives_hbox_new(FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(dialog_vbox), rfxbuilder->param_strdef_hbox, TRUE, TRUE, widget_opts.packing_height);
 
   rfxbuilder->param_strdef_button = lives_button_new();
-  lives_button_set_use_underline (LIVES_BUTTON (rfxbuilder->param_strdef_button),TRUE);
-  lives_box_pack_start (LIVES_BOX (rfxbuilder->param_strdef_hbox), rfxbuilder->param_strdef_button, TRUE, TRUE, widget_opts.packing_width);
+  lives_button_set_use_underline(LIVES_BUTTON(rfxbuilder->param_strdef_button),TRUE);
+  lives_box_pack_start(LIVES_BOX(rfxbuilder->param_strdef_hbox), rfxbuilder->param_strdef_button, TRUE, TRUE, widget_opts.packing_width);
 
-  rfxbuilder->param_strlist_hbox = lives_hbox_new (FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (dialog_vbox), rfxbuilder->param_strlist_hbox, FALSE, FALSE, widget_opts.packing_width);
+  rfxbuilder->param_strlist_hbox = lives_hbox_new(FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(dialog_vbox), rfxbuilder->param_strlist_hbox, FALSE, FALSE, widget_opts.packing_width);
 
-  rfxbuilder->param_def_combo = lives_standard_combo_new (_("_Default: "),TRUE,NULL,LIVES_BOX(rfxbuilder->param_strlist_hbox),NULL);
+  rfxbuilder->param_def_combo = lives_standard_combo_new(_("_Default: "),TRUE,NULL,LIVES_BOX(rfxbuilder->param_strlist_hbox),NULL);
 
-  lives_label_set_mnemonic_widget (LIVES_LABEL (rfxbuilder->param_def_label),rfxbuilder->param_def_combo);
+  lives_label_set_mnemonic_widget(LIVES_LABEL(rfxbuilder->param_def_label),rfxbuilder->param_def_combo);
 
   if (pnum>=0) {
     switch (rfxbuilder->copy_params[pnum].type) {
     case LIVES_PARAM_NUM:
       if (!rfxbuilder->copy_params[pnum].dp) {
-	lives_spin_button_set_value (LIVES_SPIN_BUTTON (rfxbuilder->spinbutton_param_def),
-				   (double)get_int_param (rfxbuilder->copy_params[pnum].def));
-      }
-      else {
-	lives_spin_button_set_value (LIVES_SPIN_BUTTON (rfxbuilder->spinbutton_param_def),
-				   get_double_param (rfxbuilder->copy_params[pnum].def));
+        lives_spin_button_set_value(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_def),
+                                    (double)get_int_param(rfxbuilder->copy_params[pnum].def));
+      } else {
+        lives_spin_button_set_value(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_def),
+                                    get_double_param(rfxbuilder->copy_params[pnum].def));
       }
       break;
     case LIVES_PARAM_BOOL:
-      lives_spin_button_set_value (LIVES_SPIN_BUTTON (rfxbuilder->spinbutton_param_def),
-				 (double)get_bool_param (rfxbuilder->copy_params[pnum].def));
+      lives_spin_button_set_value(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_def),
+                                  (double)get_bool_param(rfxbuilder->copy_params[pnum].def));
       break;
     case LIVES_PARAM_COLRGB24:
-      get_colRGB24_param (rfxbuilder->copy_params[pnum].def,&rgb);
-      lives_spin_button_set_value (LIVES_SPIN_BUTTON (rfxbuilder->spinbutton_param_def),(double)rgb.red);
+      get_colRGB24_param(rfxbuilder->copy_params[pnum].def,&rgb);
+      lives_spin_button_set_value(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_def),(double)rgb.red);
       break;
     default:
       break;
@@ -2126,27 +2081,28 @@
 
   // group
 
-  rfxbuilder->hbox_bg = lives_hbox_new (FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (dialog_vbox), rfxbuilder->hbox_bg, FALSE, FALSE, widget_opts.packing_height);
+  rfxbuilder->hbox_bg = lives_hbox_new(FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(dialog_vbox), rfxbuilder->hbox_bg, FALSE, FALSE, widget_opts.packing_height);
 
-  rfxbuilder->spinbutton_param_group = lives_standard_spin_button_new ((tmp=g_strdup(_("Button _Group: "))),TRUE,0., 0., 16., 1., 1., 0,
-								       LIVES_BOX(rfxbuilder->hbox_bg),
-								       (tmp2=g_strdup(_("A non-zero value can be used to group radio buttons."))));
+  rfxbuilder->spinbutton_param_group = lives_standard_spin_button_new((tmp=lives_strdup(_("Button _Group: "))),TRUE,0., 0., 16., 1., 1., 0,
+                                       LIVES_BOX(rfxbuilder->hbox_bg),
+                                       (tmp2=lives_strdup(_("A non-zero value can be used to group radio buttons."))));
 
   if (pnum>=0) {
-    lives_spin_button_set_value (LIVES_SPIN_BUTTON (rfxbuilder->spinbutton_param_group),(double)rfxbuilder->copy_params[pnum].group);
+    lives_spin_button_set_value(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_group),(double)rfxbuilder->copy_params[pnum].group);
   }
 
   // min
 
-  rfxbuilder->spinbutton_param_min = lives_standard_spin_button_new (_("_Minimum value: "),TRUE,0., -G_MAXINT, G_MAXINT, 1., 1., 0,
-								     LIVES_BOX(dialog_vbox),NULL);
+  rfxbuilder->spinbutton_param_min = lives_standard_spin_button_new(_("_Minimum value: "),TRUE,0., -LIVES_MAXINT, LIVES_MAXINT, 1., 1., 0,
+                                     LIVES_BOX(dialog_vbox),NULL);
   rfxbuilder->param_min_label = widget_opts.last_label;
 
   // max
 
-  rfxbuilder->spinbutton_param_max = lives_standard_spin_button_new (_("Ma_ximum value: "),TRUE, RFX_DEF_NUM_MAX, -G_MAXINT, G_MAXINT, 1., 1., 0,
-								     LIVES_BOX(dialog_vbox),NULL);
+  rfxbuilder->spinbutton_param_max = lives_standard_spin_button_new(_("Ma_ximum value: "),TRUE, RFX_DEF_NUM_MAX, -LIVES_MAXINT, LIVES_MAXINT,
+                                     1., 1., 0,
+                                     LIVES_BOX(dialog_vbox),NULL);
   rfxbuilder->param_max_label = widget_opts.last_label;
 
 
@@ -2154,403 +2110,397 @@
 
 
 
-  rfxbuilder->spinbutton_param_step = lives_standard_spin_button_new ((tmp=g_strdup(_("     _Step size:   "))),TRUE,1., 1., G_MAXINT, 1., 1., 0,
-								      LIVES_BOX(dialog_vbox),
-								      (tmp2=g_strdup(_(
-										       "How much the parameter is adjusted when the spinbutton arrows are pressed."
-										       ))));
+  rfxbuilder->spinbutton_param_step = lives_standard_spin_button_new((tmp=lives_strdup(_("     _Step size:   "))),TRUE,1., 1., LIVES_MAXINT,
+                                      1., 1., 0,
+                                      LIVES_BOX(dialog_vbox),
+                                      (tmp2=lives_strdup(_(
+                                          "How much the parameter is adjusted when the spinbutton arrows are pressed."
+                                          ))));
   rfxbuilder->param_step_label = widget_opts.last_label;
-  g_free(tmp); g_free(tmp2);
+  lives_free(tmp);
+  lives_free(tmp2);
 
 
   // wrap
 
-  rfxbuilder->param_wrap_hbox = lives_hbox_new (FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (dialog_vbox), rfxbuilder->param_wrap_hbox, TRUE, TRUE, widget_opts.packing_height);
+  rfxbuilder->param_wrap_hbox = lives_hbox_new(FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(dialog_vbox), rfxbuilder->param_wrap_hbox, TRUE, TRUE, widget_opts.packing_height);
 
-  rfxbuilder->param_wrap_checkbutton = lives_standard_check_button_new ((tmp=g_strdup(_("_Wrap value"))),TRUE,LIVES_BOX(rfxbuilder->param_wrap_hbox),
-									(tmp2=g_strdup(_ ("Whether the value wraps max->min and min->max."))));
+  rfxbuilder->param_wrap_checkbutton = lives_standard_check_button_new((tmp=lives_strdup(_("_Wrap value"))),TRUE,
+                                       LIVES_BOX(rfxbuilder->param_wrap_hbox),
+                                       (tmp2=lives_strdup(_("Whether the value wraps max->min and min->max."))));
 
-  g_free(tmp); g_free(tmp2);
+  lives_free(tmp);
+  lives_free(tmp2);
 
 
 
-  lives_signal_connect (LIVES_GUI_OBJECT (rfxbuilder->param_strdef_button), LIVES_WIDGET_CLICKED_EVENT,
-		    LIVES_GUI_CALLBACK (on_code_clicked),
-		    (gpointer)rfxbuilder);
+  lives_signal_connect(LIVES_GUI_OBJECT(rfxbuilder->param_strdef_button), LIVES_WIDGET_CLICKED_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_code_clicked),
+                       (livespointer)rfxbuilder);
 
-  lives_signal_connect (LIVES_GUI_OBJECT(rfxbuilder->param_type_combo),LIVES_WIDGET_CHANGED_EVENT,LIVES_GUI_CALLBACK (on_param_type_changed),
-		    (gpointer)rfxbuilder);
+  lives_signal_connect(LIVES_GUI_OBJECT(rfxbuilder->param_type_combo),LIVES_WIDGET_CHANGED_SIGNAL,LIVES_GUI_CALLBACK(on_param_type_changed),
+                       (livespointer)rfxbuilder);
 
-  lives_signal_connect_after (LIVES_GUI_OBJECT (rfxbuilder->spinbutton_param_dp), "value_changed",
-			  LIVES_GUI_CALLBACK (after_param_dp_changed),
-			  (gpointer)rfxbuilder);
+  lives_signal_connect_after(LIVES_GUI_OBJECT(rfxbuilder->spinbutton_param_dp), LIVES_WIDGET_VALUE_CHANGED_SIGNAL,
+                             LIVES_GUI_CALLBACK(after_param_dp_changed),
+                             (livespointer)rfxbuilder);
 
-  rfxbuilder->def_spin_f=lives_signal_connect_after (LIVES_GUI_OBJECT (rfxbuilder->spinbutton_param_def), "value_changed",
-			  LIVES_GUI_CALLBACK (after_param_def_changed),
-			  (gpointer)rfxbuilder);
+  rfxbuilder->def_spin_f=lives_signal_connect_after(LIVES_GUI_OBJECT(rfxbuilder->spinbutton_param_def), LIVES_WIDGET_VALUE_CHANGED_SIGNAL,
+                         LIVES_GUI_CALLBACK(after_param_def_changed),
+                         (livespointer)rfxbuilder);
 
-  rfxbuilder->min_spin_f=lives_signal_connect_after (LIVES_GUI_OBJECT (rfxbuilder->spinbutton_param_min), "value_changed",
-			  LIVES_GUI_CALLBACK (after_param_min_changed),
-			  (gpointer)rfxbuilder);
+  rfxbuilder->min_spin_f=lives_signal_connect_after(LIVES_GUI_OBJECT(rfxbuilder->spinbutton_param_min), LIVES_WIDGET_VALUE_CHANGED_SIGNAL,
+                         LIVES_GUI_CALLBACK(after_param_min_changed),
+                         (livespointer)rfxbuilder);
 
-  rfxbuilder->max_spin_f=lives_signal_connect_after (LIVES_GUI_OBJECT (rfxbuilder->spinbutton_param_max), "value_changed",
-			  LIVES_GUI_CALLBACK (after_param_max_changed),
-			  (gpointer)rfxbuilder);
+  rfxbuilder->max_spin_f=lives_signal_connect_after(LIVES_GUI_OBJECT(rfxbuilder->spinbutton_param_max), LIVES_WIDGET_VALUE_CHANGED_SIGNAL,
+                         LIVES_GUI_CALLBACK(after_param_max_changed),
+                         (livespointer)rfxbuilder);
 
 
   if (pnum>=0) {
     switch (rfxbuilder->copy_params[pnum].type) {
     case LIVES_PARAM_NUM:
-      lives_spin_button_set_value (LIVES_SPIN_BUTTON (rfxbuilder->spinbutton_param_min),rfxbuilder->copy_params[pnum].min);
-      lives_spin_button_set_value (LIVES_SPIN_BUTTON (rfxbuilder->spinbutton_param_max),rfxbuilder->copy_params[pnum].max);
-      lives_spin_button_set_value (LIVES_SPIN_BUTTON (rfxbuilder->spinbutton_param_step),
-				 rfxbuilder->copy_params[pnum].step_size);
+      lives_spin_button_set_value(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_min),rfxbuilder->copy_params[pnum].min);
+      lives_spin_button_set_value(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_max),rfxbuilder->copy_params[pnum].max);
+      lives_spin_button_set_value(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_step),
+                                  rfxbuilder->copy_params[pnum].step_size);
       lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(rfxbuilder->param_wrap_checkbutton),
-				     rfxbuilder->copy_params[pnum].wrap);
+                                     rfxbuilder->copy_params[pnum].wrap);
       break;
     case LIVES_PARAM_COLRGB24:
-      lives_spin_button_set_value (LIVES_SPIN_BUTTON (rfxbuilder->spinbutton_param_min),(double)rgb.green);
-      lives_spin_button_set_value (LIVES_SPIN_BUTTON (rfxbuilder->spinbutton_param_max),(double)rgb.blue);
+      lives_spin_button_set_value(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_min),(double)rgb.green);
+      lives_spin_button_set_value(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_max),(double)rgb.blue);
       break;
     case LIVES_PARAM_STRING:
-      lives_spin_button_set_value (LIVES_SPIN_BUTTON (rfxbuilder->spinbutton_param_max),rfxbuilder->copy_params[pnum].max);
+      lives_spin_button_set_value(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_max),rfxbuilder->copy_params[pnum].max);
       break;
     default:
       break;
     }
   }
-  lives_widget_show_all (dialog);
-  on_param_type_changed (LIVES_COMBO (rfxbuilder->param_type_combo),(gpointer)rfxbuilder);
-  after_param_dp_changed(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_dp),(gpointer)rfxbuilder);
+  lives_widget_show_all(dialog);
+  on_param_type_changed(LIVES_COMBO(rfxbuilder->param_type_combo),(livespointer)rfxbuilder);
+  after_param_dp_changed(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_dp),(livespointer)rfxbuilder);
   return dialog;
 }
 
 
-void after_param_dp_changed (LiVESSpinButton *spinbutton, gpointer user_data) {
+void after_param_dp_changed(LiVESSpinButton *spinbutton, livespointer user_data) {
   rfx_build_window_t *rfxbuilder=(rfx_build_window_t *)user_data;
-  gchar *ctext=lives_combo_get_active_text(LIVES_COMBO(rfxbuilder->param_type_combo));
+  char *ctext=lives_combo_get_active_text(LIVES_COMBO(rfxbuilder->param_type_combo));
   int dp;
 
-  if (strcmp (ctext,"num")) {
-    g_free(ctext);
+  if (strcmp(ctext,"num")) {
+    lives_free(ctext);
     return;
   }
 
-  g_free(ctext);
+  lives_free(ctext);
 
-  dp=lives_spin_button_get_value_as_int (LIVES_SPIN_BUTTON (spinbutton));
+  dp=lives_spin_button_get_value_as_int(LIVES_SPIN_BUTTON(spinbutton));
 
-  lives_spin_button_set_digits (LIVES_SPIN_BUTTON (rfxbuilder->spinbutton_param_def),dp);
-  lives_spin_button_set_digits (LIVES_SPIN_BUTTON (rfxbuilder->spinbutton_param_min),dp);
-  lives_spin_button_set_digits (LIVES_SPIN_BUTTON (rfxbuilder->spinbutton_param_max),dp);
-  lives_spin_button_set_digits (LIVES_SPIN_BUTTON (rfxbuilder->spinbutton_param_step),dp);
+  lives_spin_button_set_digits(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_def),dp);
+  lives_spin_button_set_digits(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_min),dp);
+  lives_spin_button_set_digits(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_max),dp);
+  lives_spin_button_set_digits(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_step),dp);
 
   if (dp>0) {
-    double max=lives_spin_button_get_value(LIVES_SPIN_BUTTON (rfxbuilder->spinbutton_param_max));
-    double min=lives_spin_button_get_value(LIVES_SPIN_BUTTON (rfxbuilder->spinbutton_param_min));
-    lives_spin_button_set_range(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_def),-G_MAXFLOAT,G_MAXFLOAT);
-    lives_spin_button_set_range(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_min),-G_MAXFLOAT,G_MAXFLOAT);
-    lives_spin_button_set_range(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_max),-G_MAXFLOAT,G_MAXFLOAT);
+    double max=lives_spin_button_get_value(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_max));
+    double min=lives_spin_button_get_value(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_min));
+    lives_spin_button_set_range(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_def),-LIVES_MAXFLOAT,LIVES_MAXFLOAT);
+    lives_spin_button_set_range(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_min),-LIVES_MAXFLOAT,LIVES_MAXFLOAT);
+    lives_spin_button_set_range(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_max),-LIVES_MAXFLOAT,LIVES_MAXFLOAT);
     lives_spin_button_set_range(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_step),1./(double)lives_10pow(dp),(max-min)>1.?(max-min):1.);
 
-    lives_entry_set_width_chars (LIVES_ENTRY (rfxbuilder->spinbutton_param_step),MAXFLOATLEN+dp);
-    lives_entry_set_width_chars (LIVES_ENTRY (rfxbuilder->spinbutton_param_def),MAXFLOATLEN+dp);
-    lives_entry_set_width_chars (LIVES_ENTRY (rfxbuilder->spinbutton_param_min),MAXFLOATLEN+dp);
-    lives_entry_set_width_chars (LIVES_ENTRY (rfxbuilder->spinbutton_param_max),MAXFLOATLEN+dp);
-  }
-  else {
-    int max=lives_spin_button_get_value_as_int(LIVES_SPIN_BUTTON (rfxbuilder->spinbutton_param_max));
-    int min=lives_spin_button_get_value_as_int(LIVES_SPIN_BUTTON (rfxbuilder->spinbutton_param_min));
-    lives_spin_button_set_range(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_def),-G_MAXINT,G_MAXINT);
-    lives_spin_button_set_range(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_min),-G_MAXINT,G_MAXINT);
-    lives_spin_button_set_range(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_max),-G_MAXINT,G_MAXINT);
+    lives_entry_set_width_chars(LIVES_ENTRY(rfxbuilder->spinbutton_param_step),MAXFLOATLEN+dp);
+    lives_entry_set_width_chars(LIVES_ENTRY(rfxbuilder->spinbutton_param_def),MAXFLOATLEN+dp);
+    lives_entry_set_width_chars(LIVES_ENTRY(rfxbuilder->spinbutton_param_min),MAXFLOATLEN+dp);
+    lives_entry_set_width_chars(LIVES_ENTRY(rfxbuilder->spinbutton_param_max),MAXFLOATLEN+dp);
+  } else {
+    int max=lives_spin_button_get_value_as_int(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_max));
+    int min=lives_spin_button_get_value_as_int(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_min));
+    lives_spin_button_set_range(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_def),-LIVES_MAXINT,LIVES_MAXINT);
+    lives_spin_button_set_range(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_min),-LIVES_MAXINT,LIVES_MAXINT);
+    lives_spin_button_set_range(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_max),-LIVES_MAXINT,LIVES_MAXINT);
     lives_spin_button_set_range(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_step),1,(max-min)>1?(max-min):1);
-    
-    lives_entry_set_width_chars (LIVES_ENTRY (rfxbuilder->spinbutton_param_step),MAXINTLEN);
-    lives_entry_set_width_chars (LIVES_ENTRY (rfxbuilder->spinbutton_param_def),MAXINTLEN);
-    lives_entry_set_width_chars (LIVES_ENTRY (rfxbuilder->spinbutton_param_min),MAXINTLEN);
-    lives_entry_set_width_chars (LIVES_ENTRY (rfxbuilder->spinbutton_param_max),MAXINTLEN);
+
+    lives_entry_set_width_chars(LIVES_ENTRY(rfxbuilder->spinbutton_param_step),MAXINTLEN);
+    lives_entry_set_width_chars(LIVES_ENTRY(rfxbuilder->spinbutton_param_def),MAXINTLEN);
+    lives_entry_set_width_chars(LIVES_ENTRY(rfxbuilder->spinbutton_param_min),MAXINTLEN);
+    lives_entry_set_width_chars(LIVES_ENTRY(rfxbuilder->spinbutton_param_max),MAXINTLEN);
   }
 }
 
 
-void after_param_min_changed (LiVESSpinButton *spinbutton, gpointer user_data) {
+void after_param_min_changed(LiVESSpinButton *spinbutton, livespointer user_data) {
   rfx_build_window_t *rfxbuilder=(rfx_build_window_t *)user_data;
   int dp;
-  gchar *ctext=lives_combo_get_active_text(LIVES_COMBO(rfxbuilder->param_type_combo));
+  char *ctext=lives_combo_get_active_text(LIVES_COMBO(rfxbuilder->param_type_combo));
 
-  if (strcmp (ctext,"num")) {
-    g_free(ctext);
+  if (strcmp(ctext,"num")) {
+    lives_free(ctext);
     return;
   }
 
-  g_free(ctext);
+  lives_free(ctext);
 
-  lives_signal_handler_block (rfxbuilder->spinbutton_param_max,rfxbuilder->max_spin_f);
-  lives_signal_handler_block (rfxbuilder->spinbutton_param_def,rfxbuilder->def_spin_f);
+  lives_signal_handler_block(rfxbuilder->spinbutton_param_max,rfxbuilder->max_spin_f);
+  lives_signal_handler_block(rfxbuilder->spinbutton_param_def,rfxbuilder->def_spin_f);
 
-  if ((dp=lives_spin_button_get_value_as_int (LIVES_SPIN_BUTTON (rfxbuilder->spinbutton_param_dp)))>0) {
+  if ((dp=lives_spin_button_get_value_as_int(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_dp)))>0) {
     if (lives_spin_button_get_value(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_def))<
-	lives_spin_button_get_value(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_min))) {
+        lives_spin_button_get_value(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_min))) {
       lives_spin_button_set_value(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_def),
-				lives_spin_button_get_value(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_min)));
+                                  lives_spin_button_get_value(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_min)));
     }
 
     lives_spin_button_set_range(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_max),
-			      lives_spin_button_get_value (LIVES_SPIN_BUTTON (rfxbuilder->spinbutton_param_min)),G_MAXFLOAT);
+                                lives_spin_button_get_value(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_min)),LIVES_MAXFLOAT);
     lives_spin_button_set_range(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_step),
-			      1./(double)lives_10pow(dp),lives_spin_button_get_value 
-			      (LIVES_SPIN_BUTTON (rfxbuilder->spinbutton_param_max))-
-			      lives_spin_button_get_value (LIVES_SPIN_BUTTON (rfxbuilder->spinbutton_param_min)));
+                                1./(double)lives_10pow(dp),lives_spin_button_get_value
+                                (LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_max))-
+                                lives_spin_button_get_value(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_min)));
 
-  }
-  else {
+  } else {
     if (lives_spin_button_get_value_as_int(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_def))<
-	lives_spin_button_get_value_as_int(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_min))) {
+        lives_spin_button_get_value_as_int(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_min))) {
       lives_spin_button_set_value(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_def),
-				lives_spin_button_get_value_as_int(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_min)));
+                                  lives_spin_button_get_value_as_int(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_min)));
     }
 
     lives_spin_button_set_range(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_max),
-			      lives_spin_button_get_value_as_int (LIVES_SPIN_BUTTON (rfxbuilder->spinbutton_param_min)),
-			      G_MAXINT);
+                                lives_spin_button_get_value_as_int(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_min)),
+                                LIVES_MAXINT);
     lives_spin_button_set_range(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_step),1,
-			      lives_spin_button_get_value_as_int (LIVES_SPIN_BUTTON (rfxbuilder->spinbutton_param_max))-
-			      lives_spin_button_get_value_as_int (LIVES_SPIN_BUTTON (rfxbuilder->spinbutton_param_min)));
+                                lives_spin_button_get_value_as_int(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_max))-
+                                lives_spin_button_get_value_as_int(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_min)));
 
   }
 
-  lives_signal_handler_unblock (rfxbuilder->spinbutton_param_max,rfxbuilder->max_spin_f);
-  lives_signal_handler_unblock (rfxbuilder->spinbutton_param_def,rfxbuilder->def_spin_f);
+  lives_signal_handler_unblock(rfxbuilder->spinbutton_param_max,rfxbuilder->max_spin_f);
+  lives_signal_handler_unblock(rfxbuilder->spinbutton_param_def,rfxbuilder->def_spin_f);
 
 }
 
-void after_param_max_changed (LiVESSpinButton *spinbutton, gpointer user_data) {
+void after_param_max_changed(LiVESSpinButton *spinbutton, livespointer user_data) {
   rfx_build_window_t *rfxbuilder=(rfx_build_window_t *)user_data;
   int dp;
-  gchar *ctext=lives_combo_get_active_text(LIVES_COMBO(rfxbuilder->param_type_combo));
+  char *ctext=lives_combo_get_active_text(LIVES_COMBO(rfxbuilder->param_type_combo));
 
-  if (strcmp (ctext,"num")) {
-    g_free(ctext);
+  if (strcmp(ctext,"num")) {
+    lives_free(ctext);
     return;
   }
 
-  g_free(ctext);
+  lives_free(ctext);
 
-  lives_signal_handler_block (rfxbuilder->spinbutton_param_min,rfxbuilder->min_spin_f);
-  lives_signal_handler_block (rfxbuilder->spinbutton_param_def,rfxbuilder->def_spin_f);
+  lives_signal_handler_block(rfxbuilder->spinbutton_param_min,rfxbuilder->min_spin_f);
+  lives_signal_handler_block(rfxbuilder->spinbutton_param_def,rfxbuilder->def_spin_f);
 
-  if ((dp=lives_spin_button_get_value_as_int (LIVES_SPIN_BUTTON (rfxbuilder->spinbutton_param_dp)))>0) {
+  if ((dp=lives_spin_button_get_value_as_int(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_dp)))>0) {
     if (lives_spin_button_get_value(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_def))>
-	lives_spin_button_get_value(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_max))) {
+        lives_spin_button_get_value(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_max))) {
       lives_spin_button_set_value(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_def),
-				lives_spin_button_get_value(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_max)));
+                                  lives_spin_button_get_value(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_max)));
     }
 
-    lives_spin_button_set_range(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_min),-G_MAXFLOAT,
-			      lives_spin_button_get_value (LIVES_SPIN_BUTTON (rfxbuilder->spinbutton_param_max)));
+    lives_spin_button_set_range(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_min),-LIVES_MAXFLOAT,
+                                lives_spin_button_get_value(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_max)));
     lives_spin_button_set_range(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_step),
-			      1./(double)lives_10pow(dp),
-			      lives_spin_button_get_value (LIVES_SPIN_BUTTON (rfxbuilder->spinbutton_param_max))-
-			      lives_spin_button_get_value (LIVES_SPIN_BUTTON (rfxbuilder->spinbutton_param_min)));
+                                1./(double)lives_10pow(dp),
+                                lives_spin_button_get_value(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_max))-
+                                lives_spin_button_get_value(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_min)));
 
-  }
-  else {
+  } else {
     if (lives_spin_button_get_value_as_int(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_def))>
-	lives_spin_button_get_value_as_int(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_max))) {
+        lives_spin_button_get_value_as_int(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_max))) {
       lives_spin_button_set_value(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_def),
-				lives_spin_button_get_value_as_int(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_max)));
+                                  lives_spin_button_get_value_as_int(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_max)));
     }
 
-    lives_spin_button_set_range(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_min),-G_MAXINT,
-			      lives_spin_button_get_value_as_int (LIVES_SPIN_BUTTON (rfxbuilder->spinbutton_param_max)));
+    lives_spin_button_set_range(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_min),-LIVES_MAXINT,
+                                lives_spin_button_get_value_as_int(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_max)));
     lives_spin_button_set_range(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_step),1,
-			      lives_spin_button_get_value_as_int (LIVES_SPIN_BUTTON (rfxbuilder->spinbutton_param_max))
-			      -lives_spin_button_get_value_as_int (LIVES_SPIN_BUTTON (rfxbuilder->spinbutton_param_min)));
+                                lives_spin_button_get_value_as_int(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_max))
+                                -lives_spin_button_get_value_as_int(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_min)));
 
   }
 
-  lives_signal_handler_unblock (rfxbuilder->spinbutton_param_min,rfxbuilder->min_spin_f);
-  lives_signal_handler_unblock (rfxbuilder->spinbutton_param_def,rfxbuilder->def_spin_f);
+  lives_signal_handler_unblock(rfxbuilder->spinbutton_param_min,rfxbuilder->min_spin_f);
+  lives_signal_handler_unblock(rfxbuilder->spinbutton_param_def,rfxbuilder->def_spin_f);
 
 }
 
-void after_param_def_changed (LiVESSpinButton *spinbutton, gpointer user_data) {
+void after_param_def_changed(LiVESSpinButton *spinbutton, livespointer user_data) {
   rfx_build_window_t *rfxbuilder=(rfx_build_window_t *)user_data;
-  gchar *ctext=lives_combo_get_active_text(LIVES_COMBO(rfxbuilder->param_type_combo));
+  char *ctext=lives_combo_get_active_text(LIVES_COMBO(rfxbuilder->param_type_combo));
 
-  if (strcmp (ctext,"num")) {
-    g_free(ctext);
+  if (strcmp(ctext,"num")) {
+    lives_free(ctext);
     return;
   }
 
-  g_free(ctext);
+  lives_free(ctext);
 
-  if (lives_spin_button_get_value_as_int (LIVES_SPIN_BUTTON (rfxbuilder->spinbutton_param_dp))) {
-    double dbl_def=lives_spin_button_get_value (LIVES_SPIN_BUTTON (rfxbuilder->spinbutton_param_def));
-    if (dbl_def<lives_spin_button_get_value (LIVES_SPIN_BUTTON (rfxbuilder->spinbutton_param_min))) {
-      lives_spin_button_set_value (LIVES_SPIN_BUTTON (rfxbuilder->spinbutton_param_min),dbl_def);
+  if (lives_spin_button_get_value_as_int(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_dp))) {
+    double dbl_def=lives_spin_button_get_value(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_def));
+    if (dbl_def<lives_spin_button_get_value(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_min))) {
+      lives_spin_button_set_value(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_min),dbl_def);
+    } else if (dbl_def>lives_spin_button_get_value(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_max))) {
+      lives_spin_button_set_value(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_max),dbl_def);
     }
-    else if (dbl_def>lives_spin_button_get_value (LIVES_SPIN_BUTTON (rfxbuilder->spinbutton_param_max))) {
-      lives_spin_button_set_value (LIVES_SPIN_BUTTON (rfxbuilder->spinbutton_param_max),dbl_def);
-    }
-  }
-  else {
-    int int_def=lives_spin_button_get_value_as_int (LIVES_SPIN_BUTTON (rfxbuilder->spinbutton_param_def));
-    if (int_def<lives_spin_button_get_value_as_int (LIVES_SPIN_BUTTON (rfxbuilder->spinbutton_param_min))) {
-      lives_spin_button_set_value (LIVES_SPIN_BUTTON (rfxbuilder->spinbutton_param_min),(double)int_def);
-    }
-    else if (int_def>lives_spin_button_get_value_as_int (LIVES_SPIN_BUTTON (rfxbuilder->spinbutton_param_max))) {
-      lives_spin_button_set_value (LIVES_SPIN_BUTTON (rfxbuilder->spinbutton_param_max),(double)int_def);
+  } else {
+    int int_def=lives_spin_button_get_value_as_int(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_def));
+    if (int_def<lives_spin_button_get_value_as_int(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_min))) {
+      lives_spin_button_set_value(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_min),(double)int_def);
+    } else if (int_def>lives_spin_button_get_value_as_int(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_max))) {
+      lives_spin_button_set_value(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_max),(double)int_def);
     }
   }
 }
 
 
-void on_param_type_changed (LiVESCombo *param_type_combo, gpointer user_data) {
+void on_param_type_changed(LiVESCombo *param_type_combo, livespointer user_data) {
 
   rfx_build_window_t *rfxbuilder=(rfx_build_window_t *)user_data;
   int pnum=rfxbuilder->edit_param;
 
-  gchar *ctext=lives_combo_get_active_text(LIVES_COMBO(rfxbuilder->param_type_combo));
+  char *ctext=lives_combo_get_active_text(LIVES_COMBO(rfxbuilder->param_type_combo));
 
-  lives_widget_show (rfxbuilder->param_min_label);
-  lives_widget_show (rfxbuilder->param_max_label);
-  lives_widget_show (rfxbuilder->spinbutton_param_min);
-  lives_widget_show (rfxbuilder->spinbutton_param_max);
-  lives_widget_show (rfxbuilder->spinbutton_param_dp);
-  lives_widget_show (rfxbuilder->spinbutton_param_def);
-  lives_widget_show (rfxbuilder->param_dp_label);
-  lives_widget_show (rfxbuilder->param_def_label);
-
-  lives_widget_hide (rfxbuilder->param_strdef_hbox);
-  lives_widget_hide (rfxbuilder->param_strlist_hbox);
-  lives_widget_hide (rfxbuilder->hbox_bg);
-  lives_widget_hide (rfxbuilder->spinbutton_param_step);
-  lives_widget_hide (rfxbuilder->param_step_label);
-  lives_widget_hide (rfxbuilder->param_wrap_hbox);
+  lives_widget_show(rfxbuilder->param_min_label);
+  lives_widget_show(rfxbuilder->param_max_label);
+  lives_widget_show(rfxbuilder->spinbutton_param_min);
+  lives_widget_show(rfxbuilder->spinbutton_param_max);
+  lives_widget_show(rfxbuilder->spinbutton_param_dp);
+  lives_widget_show(rfxbuilder->spinbutton_param_def);
+  lives_widget_show(rfxbuilder->param_dp_label);
+  lives_widget_show(rfxbuilder->param_def_label);
+
+  lives_widget_hide(rfxbuilder->param_strdef_hbox);
+  lives_widget_hide(rfxbuilder->param_strlist_hbox);
+  lives_widget_hide(rfxbuilder->hbox_bg);
+  lives_widget_hide(rfxbuilder->spinbutton_param_step);
+  lives_widget_hide(rfxbuilder->param_step_label);
+  lives_widget_hide(rfxbuilder->param_wrap_hbox);
 
   if (pnum<0) return;
 
-  if (!strcmp (ctext,"string_list")) {
+  if (!strcmp(ctext,"string_list")) {
     int defindex;
 
     if (rfxbuilder->copy_params[pnum].type!=LIVES_PARAM_STRING_LIST) {
       if (rfxbuilder->copy_params[pnum].def!=NULL) {
-	g_free (rfxbuilder->copy_params[pnum].def);
+        lives_free(rfxbuilder->copy_params[pnum].def);
       }
-      rfxbuilder->copy_params[pnum].def=g_malloc (sizint);
-      set_int_param (rfxbuilder->copy_params[pnum].def,0);
+      rfxbuilder->copy_params[pnum].def=lives_malloc(sizint);
+      set_int_param(rfxbuilder->copy_params[pnum].def,0);
     }
 
     rfxbuilder->copy_params[pnum].type=LIVES_PARAM_STRING_LIST;
-    defindex=get_int_param (rfxbuilder->copy_params[pnum].def);
+    defindex=get_int_param(rfxbuilder->copy_params[pnum].def);
 
-    lives_combo_populate (LIVES_COMBO (rfxbuilder->param_def_combo), rfxbuilder->copy_params[pnum].list);
+    lives_combo_populate(LIVES_COMBO(rfxbuilder->param_def_combo), rfxbuilder->copy_params[pnum].list);
 
-    if (rfxbuilder->copy_params[pnum].list==NULL||defindex>g_list_length (rfxbuilder->copy_params[pnum].list)) {
-      set_int_param (rfxbuilder->copy_params[pnum].def,(defindex=0));
+    if (rfxbuilder->copy_params[pnum].list==NULL||defindex>lives_list_length(rfxbuilder->copy_params[pnum].list)) {
+      set_int_param(rfxbuilder->copy_params[pnum].def,(defindex=0));
     }
 
     if (rfxbuilder->copy_params[pnum].list!=NULL) {
-      lives_combo_set_active_string (LIVES_COMBO(rfxbuilder->param_def_combo), 
-				     (gchar *)g_list_nth_data (rfxbuilder->copy_params[pnum].list,defindex));
+      lives_combo_set_active_string(LIVES_COMBO(rfxbuilder->param_def_combo),
+                                    (char *)lives_list_nth_data(rfxbuilder->copy_params[pnum].list,defindex));
     }
 
-    lives_widget_hide (rfxbuilder->spinbutton_param_dp);
-    lives_widget_hide (rfxbuilder->param_dp_label);
-    lives_widget_hide (rfxbuilder->spinbutton_param_min);
-    lives_widget_hide (rfxbuilder->param_min_label);
-    lives_widget_hide (rfxbuilder->spinbutton_param_def);
-    lives_widget_hide (rfxbuilder->param_def_label);
-    lives_widget_hide (rfxbuilder->spinbutton_param_max);
-    lives_widget_hide (rfxbuilder->param_max_label);
-
-    lives_button_set_label (LIVES_BUTTON (rfxbuilder->param_strdef_button),(_("Set _values")));
-    lives_widget_show (rfxbuilder->param_strdef_hbox);
-    lives_widget_show (rfxbuilder->param_strlist_hbox);
-  }
-  else {
-    if (!strcmp (ctext,"num")) {
+    lives_widget_hide(rfxbuilder->spinbutton_param_dp);
+    lives_widget_hide(rfxbuilder->param_dp_label);
+    lives_widget_hide(rfxbuilder->spinbutton_param_min);
+    lives_widget_hide(rfxbuilder->param_min_label);
+    lives_widget_hide(rfxbuilder->spinbutton_param_def);
+    lives_widget_hide(rfxbuilder->param_def_label);
+    lives_widget_hide(rfxbuilder->spinbutton_param_max);
+    lives_widget_hide(rfxbuilder->param_max_label);
+
+    lives_button_set_label(LIVES_BUTTON(rfxbuilder->param_strdef_button),(_("Set _values")));
+    lives_widget_show(rfxbuilder->param_strdef_hbox);
+    lives_widget_show(rfxbuilder->param_strlist_hbox);
+  } else {
+    if (!strcmp(ctext,"num")) {
       rfxbuilder->copy_params[pnum].type=LIVES_PARAM_NUM;
-      lives_label_set_text_with_mnemonic (LIVES_LABEL (rfxbuilder->param_def_label),(_("_Default value:    ")));
-      lives_label_set_text_with_mnemonic (LIVES_LABEL (rfxbuilder->param_min_label),(_("_Minimum value: ")));
-      lives_label_set_text_with_mnemonic (LIVES_LABEL (rfxbuilder->param_max_label),(_("Ma_ximum value: ")));
-      lives_widget_show (rfxbuilder->spinbutton_param_step);
-      lives_widget_show (rfxbuilder->param_step_label);
-      lives_widget_show_all (rfxbuilder->param_wrap_hbox);
+      lives_label_set_text_with_mnemonic(LIVES_LABEL(rfxbuilder->param_def_label),(_("_Default value:    ")));
+      lives_label_set_text_with_mnemonic(LIVES_LABEL(rfxbuilder->param_min_label),(_("_Minimum value: ")));
+      lives_label_set_text_with_mnemonic(LIVES_LABEL(rfxbuilder->param_max_label),(_("Ma_ximum value: ")));
+      lives_widget_show(rfxbuilder->spinbutton_param_step);
+      lives_widget_show(rfxbuilder->param_step_label);
+      lives_widget_show_all(rfxbuilder->param_wrap_hbox);
 
-      after_param_dp_changed(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_dp),(gpointer)rfxbuilder);
+      after_param_dp_changed(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_dp),(livespointer)rfxbuilder);
 
       if (pnum<0) {
-	lives_spin_button_set_value(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_min),0.);
-	lives_spin_button_set_value(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_max),RFX_DEF_NUM_MAX);
-	lives_spin_button_set_value(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_def),0.);
-	lives_spin_button_set_value(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_step),1.);
+        lives_spin_button_set_value(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_min),0.);
+        lives_spin_button_set_value(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_max),RFX_DEF_NUM_MAX);
+        lives_spin_button_set_value(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_def),0.);
+        lives_spin_button_set_value(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_step),1.);
       }
-    }
-    else if (!strcmp (ctext,"bool")) {
+    } else if (!strcmp(ctext,"bool")) {
       rfxbuilder->copy_params[pnum].type=LIVES_PARAM_BOOL;
-      lives_label_set_text_with_mnemonic (LIVES_LABEL (rfxbuilder->param_def_label),(_("_Default value:    ")));
-      lives_widget_hide (rfxbuilder->param_min_label);
-      lives_widget_hide (rfxbuilder->param_max_label);
-      lives_widget_hide (rfxbuilder->spinbutton_param_min);
-      lives_widget_hide (rfxbuilder->spinbutton_param_max);
-      lives_widget_hide (rfxbuilder->spinbutton_param_dp);
-      lives_widget_hide (rfxbuilder->param_dp_label);
-      lives_widget_show (rfxbuilder->hbox_bg);
+      lives_label_set_text_with_mnemonic(LIVES_LABEL(rfxbuilder->param_def_label),(_("_Default value:    ")));
+      lives_widget_hide(rfxbuilder->param_min_label);
+      lives_widget_hide(rfxbuilder->param_max_label);
+      lives_widget_hide(rfxbuilder->spinbutton_param_min);
+      lives_widget_hide(rfxbuilder->spinbutton_param_max);
+      lives_widget_hide(rfxbuilder->spinbutton_param_dp);
+      lives_widget_hide(rfxbuilder->param_dp_label);
+      lives_widget_show(rfxbuilder->hbox_bg);
       lives_spin_button_set_range(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_def),0,1);
-      lives_spin_button_set_digits (LIVES_SPIN_BUTTON (rfxbuilder->spinbutton_param_def),0);
-      lives_spin_button_set_digits (LIVES_SPIN_BUTTON (rfxbuilder->spinbutton_param_min),0);
-      lives_spin_button_set_digits (LIVES_SPIN_BUTTON (rfxbuilder->spinbutton_param_max),0);
-    }
-    else if (!strcmp (ctext,"colRGB24")) {
+      lives_spin_button_set_digits(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_def),0);
+      lives_spin_button_set_digits(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_min),0);
+      lives_spin_button_set_digits(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_max),0);
+    } else if (!strcmp(ctext,"colRGB24")) {
       rfxbuilder->copy_params[pnum].type=LIVES_PARAM_COLRGB24;
-      lives_widget_hide (rfxbuilder->spinbutton_param_dp);
-      lives_widget_hide (rfxbuilder->param_dp_label);
-      lives_label_set_text_with_mnemonic (LIVES_LABEL (rfxbuilder->param_def_label),(_("Default _Red:  ")));
-      lives_label_set_text_with_mnemonic (LIVES_LABEL (rfxbuilder->param_min_label),(_("Default _Green:")));
-      lives_label_set_text_with_mnemonic (LIVES_LABEL (rfxbuilder->param_max_label),(_("Default _Blue: ")));
-      lives_entry_set_width_chars (LIVES_ENTRY (rfxbuilder->spinbutton_param_def),4);
-      lives_entry_set_width_chars (LIVES_ENTRY (rfxbuilder->spinbutton_param_min),4);
-      lives_entry_set_width_chars (LIVES_ENTRY (rfxbuilder->spinbutton_param_max),4);
+      lives_widget_hide(rfxbuilder->spinbutton_param_dp);
+      lives_widget_hide(rfxbuilder->param_dp_label);
+      lives_label_set_text_with_mnemonic(LIVES_LABEL(rfxbuilder->param_def_label),(_("Default _Red:  ")));
+      lives_label_set_text_with_mnemonic(LIVES_LABEL(rfxbuilder->param_min_label),(_("Default _Green:")));
+      lives_label_set_text_with_mnemonic(LIVES_LABEL(rfxbuilder->param_max_label),(_("Default _Blue: ")));
+      lives_entry_set_width_chars(LIVES_ENTRY(rfxbuilder->spinbutton_param_def),4);
+      lives_entry_set_width_chars(LIVES_ENTRY(rfxbuilder->spinbutton_param_min),4);
+      lives_entry_set_width_chars(LIVES_ENTRY(rfxbuilder->spinbutton_param_max),4);
       lives_spin_button_set_range(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_def),0,255);
       lives_spin_button_set_range(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_min),0,255);
       lives_spin_button_set_range(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_max),0,255);
-      lives_spin_button_set_digits (LIVES_SPIN_BUTTON (rfxbuilder->spinbutton_param_def),0);
-      lives_spin_button_set_digits (LIVES_SPIN_BUTTON (rfxbuilder->spinbutton_param_min),0);
-      lives_spin_button_set_digits (LIVES_SPIN_BUTTON (rfxbuilder->spinbutton_param_max),0);
+      lives_spin_button_set_digits(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_def),0);
+      lives_spin_button_set_digits(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_min),0);
+      lives_spin_button_set_digits(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_max),0);
       if (pnum<0) {
-	lives_spin_button_set_value (LIVES_SPIN_BUTTON (rfxbuilder->spinbutton_param_max),0.);
-	lives_spin_button_set_value (LIVES_SPIN_BUTTON (rfxbuilder->spinbutton_param_min),0.);
-	lives_spin_button_set_value (LIVES_SPIN_BUTTON (rfxbuilder->spinbutton_param_def),0.);
+        lives_spin_button_set_value(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_max),0.);
+        lives_spin_button_set_value(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_min),0.);
+        lives_spin_button_set_value(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_def),0.);
       }
-    }
-    else if (!strcmp (ctext,"string")) {
+    } else if (!strcmp(ctext,"string")) {
       rfxbuilder->copy_params[pnum].type=LIVES_PARAM_STRING;
-      lives_widget_hide (rfxbuilder->spinbutton_param_dp);
-      lives_widget_hide (rfxbuilder->param_dp_label);
-      lives_widget_hide (rfxbuilder->spinbutton_param_min);
-      lives_widget_hide (rfxbuilder->param_min_label);
-      lives_widget_hide (rfxbuilder->spinbutton_param_def);
-      
-      lives_button_set_label (LIVES_BUTTON (rfxbuilder->param_strdef_button),(_("Set _default")));
-      lives_widget_show (rfxbuilder->param_strdef_hbox);
-      lives_label_set_text (LIVES_LABEL (rfxbuilder->param_def_label),(_ ("Default value:  ")));
-      lives_label_set_text (LIVES_LABEL (rfxbuilder->param_max_label),(_ ("Maximum length (chars): ")));
+      lives_widget_hide(rfxbuilder->spinbutton_param_dp);
+      lives_widget_hide(rfxbuilder->param_dp_label);
+      lives_widget_hide(rfxbuilder->spinbutton_param_min);
+      lives_widget_hide(rfxbuilder->param_min_label);
+      lives_widget_hide(rfxbuilder->spinbutton_param_def);
+
+      lives_button_set_label(LIVES_BUTTON(rfxbuilder->param_strdef_button),(_("Set _default")));
+      lives_widget_show(rfxbuilder->param_strdef_hbox);
+      lives_label_set_text(LIVES_LABEL(rfxbuilder->param_def_label),(_("Default value:  ")));
+      lives_label_set_text(LIVES_LABEL(rfxbuilder->param_max_label),(_("Maximum length (chars): ")));
       lives_spin_button_set_range(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_max),1,RFX_MAXSTRINGLEN);
       if (pnum<0) lives_spin_button_set_value(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_max),RFX_TEXT_MAGIC);
-      lives_spin_button_set_digits (LIVES_SPIN_BUTTON (rfxbuilder->spinbutton_param_def),0);
-      lives_spin_button_set_digits (LIVES_SPIN_BUTTON (rfxbuilder->spinbutton_param_max),0);
-      
+      lives_spin_button_set_digits(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_def),0);
+      lives_spin_button_set_digits(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_max),0);
+
       if (rfxbuilder->copy_params[pnum].def==NULL) {
-	rfxbuilder->copy_params[pnum].def=g_strdup ("");
+        rfxbuilder->copy_params[pnum].def=lives_strdup("");
       }
     }
   }
 
-  g_free(ctext);
+  lives_free(ctext);
 }
 
 
@@ -2558,29 +2508,28 @@
 
 
 
-LiVESWidget * make_param_window_dialog (int pnum, rfx_build_window_t *rfxbuilder) {
+LiVESWidget *make_param_window_dialog(int pnum, rfx_build_window_t *rfxbuilder) {
   LiVESWidget *dialog;
   LiVESWidget *dialog_vbox;
 
-  GList *kwlist=NULL;
-  GList *splist=NULL;
-  GList *spsublist=NULL;
-
-  gchar *kw=NULL;
-  gchar *sp=NULL;
-  gchar *spsub=NULL;
-  gchar *rest=NULL;
-  gchar *title;
+  LiVESList *kwlist=NULL;
+  LiVESList *splist=NULL;
+  LiVESList *spsublist=NULL;
+
+  char *kw=NULL;
+  char *sp=NULL;
+  char *spsub=NULL;
+  char *rest=NULL;
+  char *title;
 
   if (pnum<0) {
-    title=g_strdup(_("LiVES: - New RFX Parameter Window Hint"));
-  }
-  else {
-    title=g_strdup(_("LiVES: - Edit RFX Parameter Window Hint"));
+    title=lives_strdup(_("LiVES: - New RFX Parameter Window Hint"));
+  } else {
+    title=lives_strdup(_("LiVES: - Edit RFX Parameter Window Hint"));
   }
 
-  dialog = lives_standard_dialog_new (title,TRUE);
-  g_free(title);
+  dialog = lives_standard_dialog_new(title,TRUE,-1,-1);
+  lives_free(title);
 
   if (prefs->show_gui) {
     lives_window_set_transient_for(LIVES_WINDOW(dialog),LIVES_WINDOW(mainw->LiVES));
@@ -2589,199 +2538,192 @@
   dialog_vbox = lives_dialog_get_content_area(LIVES_DIALOG(dialog));
 
   if (pnum>=0) {
-    kw=g_strdup (lives_entry_get_text (LIVES_ENTRY (rfxbuilder->entry[pnum])));
-    if (!strcmp (kw,"layout")) {
-      rest=g_strdup (lives_entry_get_text (LIVES_ENTRY (rfxbuilder->entry2[pnum])));
-    }
-    else if (!strcmp (kw,"special")) {
-      int numtok=get_token_count (lives_entry_get_text (LIVES_ENTRY (rfxbuilder->entry2[pnum])),
-				   (int)rfxbuilder->field_delim[0]);
-      gchar **array=g_strsplit(lives_entry_get_text (LIVES_ENTRY (rfxbuilder->entry2[pnum])),rfxbuilder->field_delim,3);
-      sp=g_strdup (array[0]);
-      if (!strcmp (sp,"framedraw")) {
-	if (numtok>1) {
-	  spsub=g_strdup (array[1]);
-	}
-	if (numtok>2) {
-	  rest=g_strdup (array[2]);
-	}
-      }
-      else {
-	if (numtok>1) {
-	  rest=g_strdup (array[1]);
-	}
+    kw=lives_strdup(lives_entry_get_text(LIVES_ENTRY(rfxbuilder->entry[pnum])));
+    if (!strcmp(kw,"layout")) {
+      rest=lives_strdup(lives_entry_get_text(LIVES_ENTRY(rfxbuilder->entry2[pnum])));
+    } else if (!strcmp(kw,"special")) {
+      int numtok=get_token_count(lives_entry_get_text(LIVES_ENTRY(rfxbuilder->entry2[pnum])),
+                                 (int)rfxbuilder->field_delim[0]);
+      char **array=lives_strsplit(lives_entry_get_text(LIVES_ENTRY(rfxbuilder->entry2[pnum])),rfxbuilder->field_delim,3);
+      sp=lives_strdup(array[0]);
+      if (!strcmp(sp,"framedraw")) {
+        if (numtok>1) {
+          spsub=lives_strdup(array[1]);
+        }
+        if (numtok>2) {
+          rest=lives_strdup(array[2]);
+        }
+      } else {
+        if (numtok>1) {
+          rest=lives_strdup(array[1]);
+        }
       }
-      g_strfreev (array);
+      lives_strfreev(array);
     }
   }
 
   // kw
-  kwlist = g_list_append (kwlist, (gpointer)"layout");
-  kwlist = g_list_append (kwlist, (gpointer)"special");
+  kwlist = lives_list_append(kwlist, (livespointer)"layout");
+  kwlist = lives_list_append(kwlist, (livespointer)"special");
 
-  rfxbuilder->paramw_kw_combo = lives_standard_combo_new (_("_Keyword:         "),TRUE,kwlist,LIVES_BOX(dialog_vbox),NULL);
-  g_list_free(kwlist);
+  rfxbuilder->paramw_kw_combo = lives_standard_combo_new(_("_Keyword:         "),TRUE,kwlist,LIVES_BOX(dialog_vbox),NULL);
+  lives_list_free(kwlist);
 
   if (pnum>=0&&kw!=NULL) {
-    lives_combo_set_active_string (LIVES_COMBO (rfxbuilder->paramw_kw_combo),kw);
+    lives_combo_set_active_string(LIVES_COMBO(rfxbuilder->paramw_kw_combo),kw);
   }
 
 
   // type
-  splist = g_list_append (splist, (gpointer)"aspect");
-  splist = g_list_append (splist, (gpointer)"framedraw");
-  splist = g_list_append (splist, (gpointer)"fileread");
-  splist = g_list_append (splist, (gpointer)"password");
+  splist = lives_list_append(splist, (livespointer)"aspect");
+  splist = lives_list_append(splist, (livespointer)"framedraw");
+  splist = lives_list_append(splist, (livespointer)"fileread");
+  splist = lives_list_append(splist, (livespointer)"password");
   if (rfxbuilder->type==RFX_BUILD_TYPE_EFFECT2) {
-    splist = g_list_append (splist, (gpointer)"mergealign");
+    splist = lives_list_append(splist, (livespointer)"mergealign");
   }
 
-  rfxbuilder->paramw_sp_combo = lives_standard_combo_new (_("Special _Type:         "),TRUE,splist,LIVES_BOX(dialog_vbox),NULL);
-  g_list_free(splist);
+  rfxbuilder->paramw_sp_combo = lives_standard_combo_new(_("Special _Type:         "),TRUE,splist,LIVES_BOX(dialog_vbox),NULL);
+  lives_list_free(splist);
 
   if (pnum>=0&&sp!=NULL) {
-    lives_combo_set_active_string (LIVES_COMBO (rfxbuilder->paramw_sp_combo),sp);
+    lives_combo_set_active_string(LIVES_COMBO(rfxbuilder->paramw_sp_combo),sp);
   }
 
   // subtype
 
-  spsublist = g_list_append (spsublist, (gpointer)"rectdemask");
+  spsublist = lives_list_append(spsublist, (livespointer)"rectdemask");
   if (pnum>=0&&spsub!=NULL) {
     // deprecated value
-    if (!strcmp(spsub,"multrect")) spsublist = g_list_append (spsublist, (gpointer)"multrect");
-  }
-  else spsublist = g_list_append (spsublist, (gpointer)"multirect");
-  spsublist = g_list_append (spsublist, (gpointer)"singlepoint");
+    if (!strcmp(spsub,"multrect")) spsublist = lives_list_append(spsublist, (livespointer)"multrect");
+  } else spsublist = lives_list_append(spsublist, (livespointer)"multirect");
+  spsublist = lives_list_append(spsublist, (livespointer)"singlepoint");
 
-  rfxbuilder->paramw_spsub_combo = lives_standard_combo_new (_("Special _Subtype:         "),TRUE,spsublist,LIVES_BOX(dialog_vbox),NULL);
-  g_list_free(spsublist);
+  rfxbuilder->paramw_spsub_combo = lives_standard_combo_new(_("Special _Subtype:         "),TRUE,spsublist,LIVES_BOX(dialog_vbox),NULL);
+  lives_list_free(spsublist);
 
   if (pnum>=0&&spsub!=NULL) {
-    lives_combo_set_active_string (LIVES_COMBO (rfxbuilder->paramw_spsub_combo),spsub);
+    lives_combo_set_active_string(LIVES_COMBO(rfxbuilder->paramw_spsub_combo),spsub);
   }
 
 
   // paramwindow rest
 
 
-  rfxbuilder->paramw_rest_entry = lives_standard_entry_new (_("Row:    "),TRUE,pnum>=0&&rest!=NULL?rest:NULL,
-							    -1,-1,LIVES_BOX(dialog_vbox),NULL);
+  rfxbuilder->paramw_rest_entry = lives_standard_entry_new(_("Row:    "),TRUE,pnum>=0&&rest!=NULL?rest:NULL,
+                                  -1,-1,LIVES_BOX(dialog_vbox),NULL);
   rfxbuilder->paramw_rest_label=widget_opts.last_label;
-  
-  if (kw!=NULL) g_free (kw);
-  if (sp!=NULL) g_free (sp);
-  if (spsub!=NULL) g_free (spsub);
-  if (rest!=NULL) g_free (rest);
-
-  lives_widget_grab_focus (rfxbuilder->paramw_rest_entry);
 
-  lives_signal_connect (LIVES_GUI_OBJECT(rfxbuilder->paramw_kw_combo),LIVES_WIDGET_CHANGED_EVENT,
-		    LIVES_GUI_CALLBACK (on_paramw_kw_changed),(gpointer)rfxbuilder);
+  if (kw!=NULL) lives_free(kw);
+  if (sp!=NULL) lives_free(sp);
+  if (spsub!=NULL) lives_free(spsub);
+  if (rest!=NULL) lives_free(rest);
 
-  lives_signal_connect (LIVES_GUI_OBJECT(rfxbuilder->paramw_sp_combo),LIVES_WIDGET_CHANGED_EVENT,
-		    LIVES_GUI_CALLBACK (on_paramw_sp_changed),(gpointer)rfxbuilder);
+  lives_widget_grab_focus(rfxbuilder->paramw_rest_entry);
 
-  lives_signal_connect (LIVES_GUI_OBJECT(rfxbuilder->paramw_spsub_combo),LIVES_WIDGET_CHANGED_EVENT,
-		    LIVES_GUI_CALLBACK (on_paramw_spsub_changed),(gpointer)rfxbuilder);
+  lives_signal_connect(LIVES_GUI_OBJECT(rfxbuilder->paramw_kw_combo),LIVES_WIDGET_CHANGED_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_paramw_kw_changed),(livespointer)rfxbuilder);
+
+  lives_signal_connect(LIVES_GUI_OBJECT(rfxbuilder->paramw_sp_combo),LIVES_WIDGET_CHANGED_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_paramw_sp_changed),(livespointer)rfxbuilder);
+
+  lives_signal_connect(LIVES_GUI_OBJECT(rfxbuilder->paramw_spsub_combo),LIVES_WIDGET_CHANGED_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_paramw_spsub_changed),(livespointer)rfxbuilder);
 
   lives_widget_show_all(dialog);
-  on_paramw_kw_changed (LIVES_COMBO (rfxbuilder->paramw_kw_combo),(gpointer)rfxbuilder);
+  on_paramw_kw_changed(LIVES_COMBO(rfxbuilder->paramw_kw_combo),(livespointer)rfxbuilder);
 
   return dialog;
 }
 
 
 
-void on_paramw_kw_changed (LiVESCombo *combo, gpointer user_data) {
+void on_paramw_kw_changed(LiVESCombo *combo, livespointer user_data) {
 
   rfx_build_window_t *rfxbuilder=(rfx_build_window_t *)user_data;
-  gchar *ctext=lives_combo_get_active_text(combo);
+  char *ctext=lives_combo_get_active_text(combo);
 
-  if (!strcmp (ctext,"special")) {
-    lives_widget_show_all (lives_widget_get_parent(rfxbuilder->paramw_sp_combo));
-    on_paramw_sp_changed (LIVES_COMBO(rfxbuilder->paramw_sp_combo),(gpointer)rfxbuilder);
-    lives_widget_grab_focus (lives_combo_get_entry(LIVES_COMBO(rfxbuilder->paramw_sp_combo)));
-  }
-  else {
-    lives_label_set_text (LIVES_LABEL (rfxbuilder->paramw_rest_label),(_("Row:    ")));
-    lives_widget_hide (lives_widget_get_parent(rfxbuilder->paramw_sp_combo));
-    lives_widget_hide (lives_widget_get_parent(rfxbuilder->paramw_spsub_combo));
-    lives_widget_grab_focus (rfxbuilder->paramw_rest_entry);
+  if (!strcmp(ctext,"special")) {
+    lives_widget_show_all(lives_widget_get_parent(rfxbuilder->paramw_sp_combo));
+    on_paramw_sp_changed(LIVES_COMBO(rfxbuilder->paramw_sp_combo),(livespointer)rfxbuilder);
+    lives_widget_grab_focus(lives_combo_get_entry(LIVES_COMBO(rfxbuilder->paramw_sp_combo)));
+  } else {
+    lives_label_set_text(LIVES_LABEL(rfxbuilder->paramw_rest_label),(_("Row:    ")));
+    lives_widget_hide(lives_widget_get_parent(rfxbuilder->paramw_sp_combo));
+    lives_widget_hide(lives_widget_get_parent(rfxbuilder->paramw_spsub_combo));
+    lives_widget_grab_focus(rfxbuilder->paramw_rest_entry);
   }
 
-  g_free(ctext);
+  lives_free(ctext);
 }
 
 
-void on_paramw_sp_changed (LiVESCombo *combo, gpointer user_data) {
+void on_paramw_sp_changed(LiVESCombo *combo, livespointer user_data) {
 
   rfx_build_window_t *rfxbuilder=(rfx_build_window_t *)user_data;
   int npars;
-  gchar *tmpx;
-  gchar *ctext=lives_combo_get_active_text(combo);
+  char *tmpx;
+  char *ctext=lives_combo_get_active_text(combo);
 
-  if (!strcmp (ctext,"framedraw")) {
-    lives_widget_show_all (lives_widget_get_parent(rfxbuilder->paramw_spsub_combo));
-    on_paramw_spsub_changed (LIVES_COMBO(rfxbuilder->paramw_spsub_combo),(gpointer)rfxbuilder);
-    lives_widget_grab_focus (lives_combo_get_entry(LIVES_COMBO(rfxbuilder->paramw_spsub_combo)));
-  }
-  else {
+  if (!strcmp(ctext,"framedraw")) {
+    lives_widget_show_all(lives_widget_get_parent(rfxbuilder->paramw_spsub_combo));
+    on_paramw_spsub_changed(LIVES_COMBO(rfxbuilder->paramw_spsub_combo),(livespointer)rfxbuilder);
+    lives_widget_grab_focus(lives_combo_get_entry(LIVES_COMBO(rfxbuilder->paramw_spsub_combo)));
+  } else {
     if (!strcmp(ctext,"fileread")||!strcmp(ctext,"password")) npars=1;
     else npars=2;
-    lives_label_set_text (LIVES_LABEL (rfxbuilder->paramw_rest_label),
-			(tmpx=g_strdup_printf(_("Linked parameters (%d):    "),npars)));
-    g_free(tmpx);
-    lives_widget_hide (lives_widget_get_parent(rfxbuilder->paramw_spsub_combo));
-    lives_widget_grab_focus (rfxbuilder->paramw_rest_entry);
+    lives_label_set_text(LIVES_LABEL(rfxbuilder->paramw_rest_label),
+                         (tmpx=lives_strdup_printf(_("Linked parameters (%d):    "),npars)));
+    lives_free(tmpx);
+    lives_widget_hide(lives_widget_get_parent(rfxbuilder->paramw_spsub_combo));
+    lives_widget_grab_focus(rfxbuilder->paramw_rest_entry);
   }
 
-  g_free(ctext);
+  lives_free(ctext);
 }
 
 
-void on_paramw_spsub_changed (LiVESCombo *combo, gpointer user_data) {
+void on_paramw_spsub_changed(LiVESCombo *combo, livespointer user_data) {
 
   rfx_build_window_t *rfxbuilder=(rfx_build_window_t *)user_data;
-  gchar *ctext=lives_combo_get_active_text(combo);
+  char *ctext=lives_combo_get_active_text(combo);
 
-  if (!strcmp (ctext,"rectdemask")||
-      !strcmp (ctext,"multrect")||!strcmp(ctext,"multirect")) {
-    lives_label_set_text (LIVES_LABEL (rfxbuilder->paramw_rest_label),(_("Linked parameters (4):    ")));
-  }
-  else if (!strcmp (ctext,"singlepoint")) {
-    lives_label_set_text (LIVES_LABEL (rfxbuilder->paramw_rest_label),(_("Linked parameters (2):    ")));
+  if (!strcmp(ctext,"rectdemask")||
+      !strcmp(ctext,"multrect")||!strcmp(ctext,"multirect")) {
+    lives_label_set_text(LIVES_LABEL(rfxbuilder->paramw_rest_label),(_("Linked parameters (4):    ")));
+  } else if (!strcmp(ctext,"singlepoint")) {
+    lives_label_set_text(LIVES_LABEL(rfxbuilder->paramw_rest_label),(_("Linked parameters (2):    ")));
   }
 
-  g_free(ctext);
+  lives_free(ctext);
 }
 
 
 
 
 
-LiVESWidget * make_trigger_dialog (int tnum, rfx_build_window_t *rfxbuilder) {
+LiVESWidget *make_trigger_dialog(int tnum, rfx_build_window_t *rfxbuilder) {
   LiVESWidget *dialog;
   LiVESWidget *dialog_vbox;
   LiVESWidget *combo;
   LiVESWidget *scrolledwindow;
 
-  GList *whenlist=NULL;
+  LiVESList *whenlist=NULL;
 
-  gchar *title;
+  char *title;
 
   boolean woat;
 
   register int i;
 
   if (tnum<0) {
-    title=g_strdup(_("LiVES: - New RFX Trigger"));
-  }
-  else {
-    title=g_strdup(_("LiVES: - Edit RFX Trigger"));
+    title=lives_strdup(_("LiVES: - New RFX Trigger"));
+  } else {
+    title=lives_strdup(_("LiVES: - Edit RFX Trigger"));
   }
 
-  dialog = lives_standard_dialog_new (title,TRUE);
-  g_free(title);
+  dialog = lives_standard_dialog_new(title,TRUE,-1,-1);
+  lives_free(title);
 
   if (prefs->show_gui) {
     lives_window_set_transient_for(LIVES_WINDOW(dialog),LIVES_WINDOW(mainw->LiVES));
@@ -2791,36 +2733,36 @@
 
   // when
 
-  if (tnum>=0) whenlist = g_list_append (whenlist, (gpointer)(rfxbuilder->copy_triggers[tnum].when?
-							      g_strdup_printf ("%d",rfxbuilder->copy_triggers[tnum].
-									       when-1):"init"));
+  if (tnum>=0) whenlist = lives_list_append(whenlist, (livespointer)(rfxbuilder->copy_triggers[tnum].when?
+                            lives_strdup_printf("%d",rfxbuilder->copy_triggers[tnum].
+                                when-1):"init"));
   else {
     if (!rfxbuilder->has_init_trigger) {
-      whenlist = g_list_append (whenlist, (gpointer)"init");
+      whenlist = lives_list_append(whenlist, (livespointer)"init");
     }
-    for (i=0;i<rfxbuilder->num_params;i++) {
+    for (i=0; i<rfxbuilder->num_params; i++) {
       if (!rfxbuilder->params[i].onchange) {
-	whenlist = g_list_append (whenlist, g_strdup_printf ("%d",i));
+        whenlist = lives_list_append(whenlist, lives_strdup_printf("%d",i));
       }
     }
   }
 
-  combo = lives_standard_combo_new (_("When:         "),FALSE,whenlist,LIVES_BOX(dialog_vbox),FALSE);
-  g_list_free(whenlist);
+  combo = lives_standard_combo_new(_("When:         "),FALSE,whenlist,LIVES_BOX(dialog_vbox),NULL);
+  lives_list_free(whenlist);
 
   rfxbuilder->trigger_when_entry=lives_combo_get_entry(LIVES_COMBO(combo));
 
 
   // code area
-  rfxbuilder->code_textview = lives_text_view_new ();
-  lives_text_view_set_editable (LIVES_TEXT_VIEW (rfxbuilder->code_textview), TRUE);
-  lives_text_view_set_wrap_mode (LIVES_TEXT_VIEW (rfxbuilder->code_textview), LIVES_WRAP_WORD);
-  lives_text_view_set_cursor_visible (LIVES_TEXT_VIEW (rfxbuilder->code_textview), TRUE);
+  rfxbuilder->code_textview = lives_text_view_new();
+  lives_text_view_set_editable(LIVES_TEXT_VIEW(rfxbuilder->code_textview), TRUE);
+  lives_text_view_set_wrap_mode(LIVES_TEXT_VIEW(rfxbuilder->code_textview), LIVES_WRAP_WORD);
+  lives_text_view_set_cursor_visible(LIVES_TEXT_VIEW(rfxbuilder->code_textview), TRUE);
 
   woat=widget_opts.apply_theme;
   widget_opts.apply_theme=FALSE;
   widget_opts.expand=LIVES_EXPAND_NONE; // prevent centering
-  scrolledwindow = lives_standard_scrolled_window_new (RFX_WINSIZE_H*2./3.,RFX_WINSIZE_V/4.,rfxbuilder->code_textview);
+  scrolledwindow = lives_standard_scrolled_window_new(RFX_WINSIZE_H*2./3.,RFX_WINSIZE_V/4.,rfxbuilder->code_textview);
   widget_opts.expand=LIVES_EXPAND_DEFAULT;
   widget_opts.apply_theme=woat;
 
@@ -2829,24 +2771,24 @@
     lives_widget_set_text_color(rfxbuilder->code_textview, LIVES_WIDGET_STATE_NORMAL, &palette->black);
   }
 
-  lives_box_pack_start (LIVES_BOX (dialog_vbox), scrolledwindow, TRUE, TRUE, 0);
+  lives_box_pack_start(LIVES_BOX(dialog_vbox), scrolledwindow, TRUE, TRUE, 0);
 
   if (tnum>=0) {
-    lives_text_view_set_text (LIVES_TEXT_VIEW (rfxbuilder->code_textview), 
-			rfxbuilder->copy_triggers[tnum].code,-1);
+    lives_text_view_set_text(LIVES_TEXT_VIEW(rfxbuilder->code_textview),
+                             rfxbuilder->copy_triggers[tnum].code,-1);
   }
 
   if (tnum>=0||rfxbuilder->num_params==0) lives_widget_grab_focus(rfxbuilder->code_textview);
 
   lives_widget_show_all(dialog);
-    
+
   return dialog;
 }
 
 
 
 
-void on_code_clicked (LiVESButton *button, gpointer user_data) {
+void on_code_clicked(LiVESButton *button, livespointer user_data) {
   LiVESWidget *dialog;
   LiVESWidget *dialog_vbox;
   LiVESWidget *dialog_action_area;
@@ -2858,9 +2800,9 @@
 
   boolean woat;
 
-  gchar *tmpx;
+  char *tmpx;
 
-  dialog = lives_standard_dialog_new (NULL,FALSE);
+  dialog = lives_standard_dialog_new(NULL,FALSE,-1,-1);
 
   if (prefs->show_gui) {
     lives_window_set_transient_for(LIVES_WINDOW(dialog),LIVES_WINDOW(mainw->LiVES));
@@ -2869,12 +2811,12 @@
   dialog_vbox = lives_dialog_get_content_area(LIVES_DIALOG(dialog));
 
   // code area
-  rfxbuilder->code_textview = lives_text_view_new ();
+  rfxbuilder->code_textview = lives_text_view_new();
 
   woat=widget_opts.apply_theme;
   widget_opts.apply_theme=FALSE;
   widget_opts.expand=LIVES_EXPAND_NONE; // prevent centering
-  scrolledwindow = lives_standard_scrolled_window_new (RFX_WINSIZE_H,RFX_WINSIZE_V,rfxbuilder->code_textview);
+  scrolledwindow = lives_standard_scrolled_window_new(RFX_WINSIZE_H,RFX_WINSIZE_V,rfxbuilder->code_textview);
   widget_opts.expand=LIVES_EXPAND_DEFAULT;
   widget_opts.apply_theme=woat;
 
@@ -2883,237 +2825,236 @@
     lives_widget_set_text_color(rfxbuilder->code_textview, LIVES_WIDGET_STATE_NORMAL, &palette->black);
   }
 
-  lives_box_pack_start (LIVES_BOX (dialog_vbox), scrolledwindow, TRUE, TRUE, 0);
+  lives_box_pack_start(LIVES_BOX(dialog_vbox), scrolledwindow, TRUE, TRUE, 0);
 
-  lives_object_ref (lives_scrolled_window_get_hadjustment (LIVES_SCROLLED_WINDOW (scrolledwindow)));
-  lives_object_ref (lives_scrolled_window_get_vadjustment (LIVES_SCROLLED_WINDOW (scrolledwindow)));
+  lives_object_ref(lives_scrolled_window_get_hadjustment(LIVES_SCROLLED_WINDOW(scrolledwindow)));
+  lives_object_ref(lives_scrolled_window_get_vadjustment(LIVES_SCROLLED_WINDOW(scrolledwindow)));
 
-  lives_text_view_set_editable (LIVES_TEXT_VIEW (rfxbuilder->code_textview), TRUE);
-  lives_text_view_set_wrap_mode (LIVES_TEXT_VIEW (rfxbuilder->code_textview), LIVES_WRAP_WORD);
-  lives_text_view_set_cursor_visible (LIVES_TEXT_VIEW (rfxbuilder->code_textview), TRUE);
+  lives_text_view_set_editable(LIVES_TEXT_VIEW(rfxbuilder->code_textview), TRUE);
+  lives_text_view_set_wrap_mode(LIVES_TEXT_VIEW(rfxbuilder->code_textview), LIVES_WRAP_WORD);
+  lives_text_view_set_cursor_visible(LIVES_TEXT_VIEW(rfxbuilder->code_textview), TRUE);
 
-  lives_widget_grab_focus (rfxbuilder->code_textview);
+  lives_widget_grab_focus(rfxbuilder->code_textview);
 
   // TODO !!
   /*  if (glib_major_version>=2&&glib_minor_version>=4) {
       lives_text_view_set_accepts_tab (LIVES_TEXT_VIEW (rfxbuilder->code_textview),TRUE);
     } */
 
-  if (button==LIVES_BUTTON (rfxbuilder->pre_button)) {
+  if (button==LIVES_BUTTON(rfxbuilder->pre_button)) {
     rfxbuilder->codetype=RFX_CODE_TYPE_PRE;
-    lives_window_set_title (LIVES_WINDOW (dialog), _("LiVES: - Pre Loop Code"));
-    lives_text_view_set_text (LIVES_TEXT_VIEW (rfxbuilder->code_textview), 
-			rfxbuilder->pre_code,-1);
+    lives_window_set_title(LIVES_WINDOW(dialog), _("LiVES: - Pre Loop Code"));
+    lives_text_view_set_text(LIVES_TEXT_VIEW(rfxbuilder->code_textview),
+                             rfxbuilder->pre_code,-1);
   }
 
-  else if (button==LIVES_BUTTON (rfxbuilder->loop_button)) {
+  else if (button==LIVES_BUTTON(rfxbuilder->loop_button)) {
     rfxbuilder->codetype=RFX_CODE_TYPE_LOOP;
-    lives_window_set_title (LIVES_WINDOW (dialog), _("LiVES: - Loop Code"));
-    lives_text_view_set_text (LIVES_TEXT_VIEW (rfxbuilder->code_textview), 
-			rfxbuilder->loop_code,-1);
+    lives_window_set_title(LIVES_WINDOW(dialog), _("LiVES: - Loop Code"));
+    lives_text_view_set_text(LIVES_TEXT_VIEW(rfxbuilder->code_textview),
+                             rfxbuilder->loop_code,-1);
   }
 
-  else if (button==LIVES_BUTTON (rfxbuilder->post_button)) {
+  else if (button==LIVES_BUTTON(rfxbuilder->post_button)) {
     rfxbuilder->codetype=RFX_CODE_TYPE_POST;
-    lives_window_set_title (LIVES_WINDOW (dialog), _("LiVES: - Post Loop Code"));
-    lives_text_view_set_text (LIVES_TEXT_VIEW (rfxbuilder->code_textview), 
-			rfxbuilder->post_code,-1);
+    lives_window_set_title(LIVES_WINDOW(dialog), _("LiVES: - Post Loop Code"));
+    lives_text_view_set_text(LIVES_TEXT_VIEW(rfxbuilder->code_textview),
+                             rfxbuilder->post_code,-1);
   }
 
-  else if (button==LIVES_BUTTON (rfxbuilder->param_strdef_button)) {
+  else if (button==LIVES_BUTTON(rfxbuilder->param_strdef_button)) {
     if (rfxbuilder->copy_params[rfxbuilder->edit_param].type!=LIVES_PARAM_STRING_LIST) {
-      int len,maxlen=lives_spin_button_get_value_as_int (LIVES_SPIN_BUTTON (rfxbuilder->spinbutton_param_max));
+      int len,maxlen=lives_spin_button_get_value_as_int(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_param_max));
 
-      if ((len=strlen ((gchar *)rfxbuilder->copy_params[rfxbuilder->edit_param].def))>maxlen) len=maxlen;
-      
-      rfxbuilder->codetype=RFX_CODE_TYPE_STRDEF;
-      lives_window_set_title (LIVES_WINDOW (dialog), (tmpx=g_strdup_printf 
-						  (_("LiVES: - Default text (max length %d)"),maxlen)));
-      g_free(tmpx);
-      lives_text_view_set_wrap_mode (LIVES_TEXT_VIEW (rfxbuilder->code_textview),LIVES_WRAP_WORD);
+      if ((len=strlen((char *)rfxbuilder->copy_params[rfxbuilder->edit_param].def))>maxlen) len=maxlen;
 
-      lives_text_view_set_text (LIVES_TEXT_VIEW (rfxbuilder->code_textview), 
-			  (gchar *)rfxbuilder->copy_params[rfxbuilder->edit_param].def,len);
-    }
-    else {
+      rfxbuilder->codetype=RFX_CODE_TYPE_STRDEF;
+      lives_window_set_title(LIVES_WINDOW(dialog), (tmpx=lives_strdup_printf
+                             (_("LiVES: - Default text (max length %d)"),maxlen)));
+      lives_free(tmpx);
+      lives_text_view_set_wrap_mode(LIVES_TEXT_VIEW(rfxbuilder->code_textview),LIVES_WRAP_WORD);
+
+      lives_text_view_set_text(LIVES_TEXT_VIEW(rfxbuilder->code_textview),
+                               (char *)rfxbuilder->copy_params[rfxbuilder->edit_param].def,len);
+    } else {
       LiVESTextIter start_iter;
-      gchar *string=g_strdup (""),*string_new;
+      char *string=lives_strdup(""),*string_new;
       register int i;
 
       rfxbuilder->codetype=RFX_CODE_TYPE_STRING_LIST;
-      lives_window_set_title (LIVES_WINDOW (dialog), (tmpx=g_strdup (_("LiVES: - Enter values, one per line"))));
-      g_free(tmpx);
+      lives_window_set_title(LIVES_WINDOW(dialog), (tmpx=lives_strdup(_("LiVES: - Enter values, one per line"))));
+      lives_free(tmpx);
       if (rfxbuilder->copy_params[rfxbuilder->edit_param].list!=NULL) {
-	for (i=0;i<g_list_length (rfxbuilder->copy_params[rfxbuilder->edit_param].list);i++) {
-	  string_new=g_strconcat (string, (gchar *)g_list_nth_data (rfxbuilder->copy_params[rfxbuilder->edit_param].list,i),
-				  "\n",NULL);
-	  if (string!=string_new) g_free (string);
-	  string=string_new;
-	}
-	lives_text_view_set_text (LIVES_TEXT_VIEW (rfxbuilder->code_textview), string, strlen(string)-1);
-	g_free (string);
-	lives_text_buffer_get_start_iter (lives_text_view_get_buffer(LIVES_TEXT_VIEW(rfxbuilder->code_textview)),&start_iter);
-	lives_text_buffer_place_cursor (lives_text_view_get_buffer (LIVES_TEXT_VIEW (rfxbuilder->code_textview)), &start_iter);
+        for (i=0; i<lives_list_length(rfxbuilder->copy_params[rfxbuilder->edit_param].list); i++) {
+          string_new=lives_strconcat(string, (char *)lives_list_nth_data(rfxbuilder->copy_params[rfxbuilder->edit_param].list,i),
+                                     "\n",NULL);
+          if (string!=string_new) lives_free(string);
+          string=string_new;
+        }
+        lives_text_view_set_text(LIVES_TEXT_VIEW(rfxbuilder->code_textview), string, strlen(string)-1);
+        lives_free(string);
+        lives_text_buffer_get_start_iter(lives_text_view_get_buffer(LIVES_TEXT_VIEW(rfxbuilder->code_textview)),&start_iter);
+        lives_text_buffer_place_cursor(lives_text_view_get_buffer(LIVES_TEXT_VIEW(rfxbuilder->code_textview)), &start_iter);
       }
     }
   }
 
-  dialog_action_area = lives_dialog_get_action_area(LIVES_DIALOG (dialog));
-  lives_button_box_set_layout (LIVES_BUTTON_BOX (dialog_action_area), LIVES_BUTTONBOX_END);
-
-  cancelbutton = lives_button_new_from_stock (LIVES_STOCK_CANCEL);
-  lives_dialog_add_action_widget (LIVES_DIALOG (dialog), cancelbutton, LIVES_RESPONSE_CANCEL);
-  lives_widget_set_can_focus_and_default (cancelbutton);
-
-  okbutton = lives_button_new_from_stock (LIVES_STOCK_OK);
-  lives_dialog_add_action_widget (LIVES_DIALOG (dialog), okbutton, LIVES_RESPONSE_OK);
-  lives_widget_set_can_focus_and_default (okbutton);
+  dialog_action_area = lives_dialog_get_action_area(LIVES_DIALOG(dialog));
+  lives_button_box_set_layout(LIVES_BUTTON_BOX(dialog_action_area), LIVES_BUTTONBOX_END);
+
+  cancelbutton = lives_button_new_from_stock(LIVES_STOCK_CANCEL);
+  lives_dialog_add_action_widget(LIVES_DIALOG(dialog), cancelbutton, LIVES_RESPONSE_CANCEL);
+  lives_widget_set_can_focus_and_default(cancelbutton);
+
+  okbutton = lives_button_new_from_stock(LIVES_STOCK_OK);
+  lives_dialog_add_action_widget(LIVES_DIALOG(dialog), okbutton, LIVES_RESPONSE_OK);
+  lives_widget_set_can_focus_and_default(okbutton);
+
+  lives_signal_connect(LIVES_GUI_OBJECT(okbutton), LIVES_WIDGET_CLICKED_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_code_ok),
+                       user_data);
+
+  lives_signal_connect(LIVES_GUI_OBJECT(cancelbutton), LIVES_WIDGET_CLICKED_SIGNAL,
+                       LIVES_GUI_CALLBACK(lives_general_button_clicked),
+                       NULL);
 
-  lives_signal_connect (LIVES_GUI_OBJECT (okbutton), LIVES_WIDGET_CLICKED_EVENT,
-		    LIVES_GUI_CALLBACK (on_code_ok),
-		    user_data);
-  
-  lives_signal_connect (LIVES_GUI_OBJECT (cancelbutton), LIVES_WIDGET_CLICKED_EVENT,
-		    LIVES_GUI_CALLBACK (lives_general_button_clicked),
-		    NULL);
 
-
-  lives_widget_show_all (dialog);
+  lives_widget_show_all(dialog);
 
 
 }
 
 
-void on_rfxbuilder_ok (LiVESButton *button, gpointer user_data) {
+void on_rfxbuilder_ok(LiVESButton *button, livespointer user_data) {
   rfx_build_window_t *rfxbuilder=(rfx_build_window_t *)user_data;
 
-  if (!perform_rfxbuilder_checks (rfxbuilder)) return;
-  if (!rfxbuilder_to_script (rfxbuilder)) return;
+  if (!perform_rfxbuilder_checks(rfxbuilder)) return;
+  if (!rfxbuilder_to_script(rfxbuilder)) return;
 
   lives_general_button_clicked(button,NULL);
-  rfxbuilder_destroy (rfxbuilder);
+  rfxbuilder_destroy(rfxbuilder);
 }
 
-void on_rfxbuilder_cancel (LiVESButton *button, gpointer user_data) {
+void on_rfxbuilder_cancel(LiVESButton *button, livespointer user_data) {
   rfx_build_window_t *rfxbuilder=(rfx_build_window_t *)user_data;
 
   lives_general_button_clicked(button,NULL);
-  rfxbuilder_destroy (rfxbuilder);
+  rfxbuilder_destroy(rfxbuilder);
 }
 
 
 
-void rfxbuilder_destroy (rfx_build_window_t *rfxbuilder) {
-  int i;
+void rfxbuilder_destroy(rfx_build_window_t *rfxbuilder) {
+  register int i;
 
-  for (i=0;i<rfxbuilder->num_reqs;i++) {
-    g_free (rfxbuilder->reqs[i]);
+  for (i=0; i<rfxbuilder->num_reqs; i++) {
+    lives_free(rfxbuilder->reqs[i]);
   }
-  for (i=0;i<rfxbuilder->num_params;i++) {
-    g_free (rfxbuilder->params[i].name);
-    g_free (rfxbuilder->params[i].label);
+  for (i=0; i<rfxbuilder->num_params; i++) {
+    lives_free(rfxbuilder->params[i].name);
+    lives_free(rfxbuilder->params[i].label);
     if (rfxbuilder->params[i].type==LIVES_PARAM_STRING_LIST) {
-      if (rfxbuilder->params[i].list!=NULL)g_list_free (rfxbuilder->params[i].list);
+      if (rfxbuilder->params[i].list!=NULL)lives_list_free(rfxbuilder->params[i].list);
     }
-    g_free (rfxbuilder->params[i].def);
+    lives_free(rfxbuilder->params[i].def);
   }
   if (rfxbuilder->num_params) {
-    g_free (rfxbuilder->params);
+    lives_free(rfxbuilder->params);
   }
-  for (i=0;i<rfxbuilder->num_paramw_hints;i++) {
-    g_free (rfxbuilder->paramw_hints[i]);
+  for (i=0; i<rfxbuilder->num_paramw_hints; i++) {
+    lives_free(rfxbuilder->paramw_hints[i]);
   }
-  for (i=0;i<rfxbuilder->num_triggers;i++) {
-    g_free (rfxbuilder->triggers[i].code);
+  for (i=0; i<rfxbuilder->num_triggers; i++) {
+    lives_free(rfxbuilder->triggers[i].code);
   }
   if (rfxbuilder->num_triggers) {
-    g_free (rfxbuilder->triggers);
+    lives_free(rfxbuilder->triggers);
   }
 
-  g_free (rfxbuilder->pre_code);
-  g_free (rfxbuilder->loop_code);
-  g_free (rfxbuilder->post_code);
+  lives_free(rfxbuilder->pre_code);
+  lives_free(rfxbuilder->loop_code);
+  lives_free(rfxbuilder->post_code);
 
-  g_free (rfxbuilder->field_delim);
+  lives_free(rfxbuilder->field_delim);
 
   if (rfxbuilder->script_name!=NULL) {
-    g_free (rfxbuilder->script_name);
+    lives_free(rfxbuilder->script_name);
   }
   if (rfxbuilder->oname!=NULL) {
-    g_free (rfxbuilder->oname);
+    lives_free(rfxbuilder->oname);
   }
-  g_free(rfxbuilder->rfx_version);
+  lives_free(rfxbuilder->rfx_version);
 
-  g_free (rfxbuilder);
+  lives_free(rfxbuilder);
 }
 
 
-boolean perform_rfxbuilder_checks (rfx_build_window_t *rfxbuilder) {
-  gchar *name=g_strdup (lives_entry_get_text (LIVES_ENTRY (rfxbuilder->name_entry)));
+boolean perform_rfxbuilder_checks(rfx_build_window_t *rfxbuilder) {
+  char *name=lives_strdup(lives_entry_get_text(LIVES_ENTRY(rfxbuilder->name_entry)));
 
-  if (!strlen (name)) {
-    do_blocking_error_dialog (_ ("\n\nName must not be blank.\n"));
-    g_free (name);
+  if (!strlen(name)) {
+    do_blocking_error_dialog(_("\n\nName must not be blank.\n"));
+    lives_free(name);
     return FALSE;
   }
-  if (get_token_count (name,' ')>1) {
-    do_blocking_error_dialog (_ ("\n\nName must not contain spaces.\n"));
-    g_free (name);
+  if (get_token_count(name,' ')>1) {
+    do_blocking_error_dialog(_("\n\nName must not contain spaces.\n"));
+    lives_free(name);
     return FALSE;
   }
-  if (!strlen(lives_entry_get_text (LIVES_ENTRY (rfxbuilder->menu_text_entry)))) {
-    do_blocking_error_dialog (_ ("\n\nMenu text must not be blank.\n"));
-    g_free (name);
+  if (!strlen(lives_entry_get_text(LIVES_ENTRY(rfxbuilder->menu_text_entry)))) {
+    do_blocking_error_dialog(_("\n\nMenu text must not be blank.\n"));
+    lives_free(name);
     return FALSE;
   }
-  if (!strlen(lives_entry_get_text (LIVES_ENTRY (rfxbuilder->action_desc_entry)))&&
+  if (!strlen(lives_entry_get_text(LIVES_ENTRY(rfxbuilder->action_desc_entry)))&&
       rfxbuilder->type!=RFX_BUILD_TYPE_UTILITY) {
-    do_blocking_error_dialog (_ ("\n\nAction description must not be blank.\n"));
-    g_free (name);
+    do_blocking_error_dialog(_("\n\nAction description must not be blank.\n"));
+    lives_free(name);
     return FALSE;
   }
-  if (!strlen(lives_entry_get_text (LIVES_ENTRY (rfxbuilder->author_entry)))) {
-    do_blocking_error_dialog (_ ("\n\nAuthor must not be blank.\n"));
-    g_free (name);
+  if (!strlen(lives_entry_get_text(LIVES_ENTRY(rfxbuilder->author_entry)))) {
+    do_blocking_error_dialog(_("\n\nAuthor must not be blank.\n"));
+    lives_free(name);
     return FALSE;
   }
 
   if (rfxbuilder->mode!=RFX_BUILDER_MODE_NEW&&!(rfxbuilder->mode==RFX_BUILDER_MODE_EDIT&&
-						!strcmp (rfxbuilder->oname,name))) {
-    if (find_rfx_plugin_by_name (name,RFX_STATUS_TEST)>-1||find_rfx_plugin_by_name 
-	(name,RFX_STATUS_CUSTOM)>-1||find_rfx_plugin_by_name (name,RFX_STATUS_BUILTIN)>-1) {
-      do_blocking_error_dialog (_ ("\n\nThere is already a plugin with this name.\nName must be unique.\n"));
-      g_free (name);
+      !strcmp(rfxbuilder->oname,name))) {
+    if (find_rfx_plugin_by_name(name,RFX_STATUS_TEST)>-1||find_rfx_plugin_by_name
+        (name,RFX_STATUS_CUSTOM)>-1||find_rfx_plugin_by_name(name,RFX_STATUS_BUILTIN)>-1) {
+      do_blocking_error_dialog(_("\n\nThere is already a plugin with this name.\nName must be unique.\n"));
+      lives_free(name);
       return FALSE;
     }
   }
 
   if (!strlen(rfxbuilder->loop_code)&&rfxbuilder->type!=RFX_BUILD_TYPE_UTILITY) {
-    do_blocking_error_dialog (_("\n\nLoop code should not be blank.\n"));
-    g_free (name);
+    do_blocking_error_dialog(_("\n\nLoop code should not be blank.\n"));
+    lives_free(name);
     return FALSE;
   }
 
   if (rfxbuilder->num_triggers==0&&rfxbuilder->type==RFX_BUILD_TYPE_UTILITY) {
-    do_blocking_error_dialog (_ ("\n\nTrigger code should not be blank for a utility.\n"));
-    g_free (name);
+    do_blocking_error_dialog(_("\n\nTrigger code should not be blank for a utility.\n"));
+    lives_free(name);
     return FALSE;
   }
 
-  g_free (name);
+  lives_free(name);
   return TRUE;
 }
 
-boolean perform_param_checks (rfx_build_window_t *rfxbuilder, int index, int rows) {
+boolean perform_param_checks(rfx_build_window_t *rfxbuilder, int index, int rows) {
   register int i;
 
-  if (!strlen(lives_entry_get_text (LIVES_ENTRY (rfxbuilder->param_name_entry)))) {
-    do_blocking_error_dialog (_ ("\n\nParameter name must not be blank.\n"));
+  if (!strlen(lives_entry_get_text(LIVES_ENTRY(rfxbuilder->param_name_entry)))) {
+    do_blocking_error_dialog(_("\n\nParameter name must not be blank.\n"));
     return FALSE;
   }
-  for (i=0;i<rows;i++) {
-    if (i!=index&&!(strcmp(lives_entry_get_text (LIVES_ENTRY (rfxbuilder->param_name_entry)),
-			   rfxbuilder->copy_params[i].name))) {
+  for (i=0; i<rows; i++) {
+    if (i!=index&&!(strcmp(lives_entry_get_text(LIVES_ENTRY(rfxbuilder->param_name_entry)),
+                           rfxbuilder->copy_params[i].name))) {
       do_blocking_error_dialog(_("\n\nDuplicate parameter name detected. Parameter names must be unique in a plugin.\n\n"));
       return FALSE;
     }
@@ -3122,75 +3063,70 @@
 }
 
 
-boolean rfxbuilder_to_script (rfx_build_window_t *rfxbuilder) {
+boolean rfxbuilder_to_script(rfx_build_window_t *rfxbuilder) {
   FILE *sfile;
   lives_colRGB24_t rgb;
-  gchar **array;
+  char **array;
 
   double stepwrap;
 
   uint32_t props;
 
-  const gchar *name=lives_entry_get_text (LIVES_ENTRY (rfxbuilder->name_entry));
+  const char *name=lives_entry_get_text(LIVES_ENTRY(rfxbuilder->name_entry));
 
-  gchar *script_file,*script_file_dir;
-  gchar *script_name=g_strdup_printf ("%s.%s",name,RFXBUILDER_SCRIPT_SUFFIX);
-  gchar *new_name;
-  gchar *buf;
-  gchar *msg;
-  gchar *tmp,*tmp2;
+  char *script_file,*script_file_dir;
+  char *script_name=lives_strdup_printf("%s.%s",name,RFXBUILDER_SCRIPT_SUFFIX);
+  char *new_name;
+  char *buf;
+  char *tmp,*tmp2;
 
   int retval;
 
   register int i,j;
 
-
   if (rfxbuilder->mode!=RFX_BUILDER_MODE_EDIT) {
-    if (!(new_name=prompt_for_script_name (script_name,RFX_STATUS_TEST))) {
-      g_free(script_name);
+    if (!(new_name=prompt_for_script_name(script_name,RFX_STATUS_TEST))) {
+      lives_free(script_name);
       return FALSE;
     }
-    g_free (script_name);
+    lives_free(script_name);
     script_name=new_name;
   }
 
   mainw->com_failed=FALSE;
 
-  script_file_dir=g_build_filename (capable->home_dir,LIVES_CONFIG_DIR,PLUGIN_RENDERED_EFFECTS_TEST_SCRIPTS,NULL);
+  script_file_dir=lives_build_filename(capable->home_dir,LIVES_CONFIG_DIR,PLUGIN_RENDERED_EFFECTS_TEST_SCRIPTS,NULL);
 
-  if (!g_file_test(script_file_dir,G_FILE_TEST_IS_DIR)) {
-    if (g_mkdir_with_parents(script_file_dir,S_IRWXU)==-1) {
-      g_free (script_name);
+  if (!lives_file_test(script_file_dir,LIVES_FILE_TEST_IS_DIR)) {
+    if (lives_mkdir_with_parents(script_file_dir,S_IRWXU)==-1) {
+      lives_free(script_name);
       return FALSE;
     }
   }
 
-  script_file=g_strdup_printf ("%s%s",script_file_dir,script_name);
-  g_free (script_file_dir);
-  g_free (script_name);
-  msg=g_strdup_printf (_ ("Writing script file %s..."),script_file);
-  d_print (msg);
-  g_free (msg);
+  script_file=lives_strdup_printf("%s%s",script_file_dir,script_name);
+  lives_free(script_file_dir);
+  lives_free(script_name);
+
+  d_print(_("Writing script file %s..."),script_file);
 
-  if (!check_file (script_file,TRUE)) {
-    g_free (script_file);
+  if (!check_file(script_file,TRUE)) {
+    lives_free(script_file);
     d_print_failed();
     return FALSE;
   }
-  
+
   do {
     retval=0;
     if (!(sfile=fopen(script_file,"w"))) {
-      retval=do_write_failed_error_s_with_retry(script_file,g_strerror(errno),LIVES_WINDOW(rfxbuilder->dialog));
-      if (retval==LIVES_CANCEL) {
-	g_free (msg);
-	g_free (script_file);
-	d_print_failed();
-	return FALSE;
+      retval=do_write_failed_error_s_with_retry(script_file,lives_strerror(errno),LIVES_WINDOW(rfxbuilder->dialog));
+      if (retval==LIVES_RESPONSE_CANCEL) {
+        lives_free(script_file);
+        d_print_failed();
+        return FALSE;
       }
-    }
-    else {
-  
+    } else {
+
       mainw->write_failed=FALSE;
 
       lives_fputs("Script file generated from LiVES\n\n",sfile);
@@ -3202,248 +3138,246 @@
       lives_fputs(name,sfile);
       lives_fputs("\n</name>\n\n",sfile);
       lives_fputs("<version>\n",sfile);
-      buf=g_strdup_printf ("%d",lives_spin_button_get_value_as_int (LIVES_SPIN_BUTTON (rfxbuilder->spinbutton_version)));
-      lives_fputs (buf,sfile);
-      g_free (buf);
+      buf=lives_strdup_printf("%d",lives_spin_button_get_value_as_int(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_version)));
+      lives_fputs(buf,sfile);
+      lives_free(buf);
       lives_fputs("\n</version>\n\n",sfile);
       lives_fputs("<author>\n",sfile);
-      lives_fputs(lives_entry_get_text (LIVES_ENTRY (rfxbuilder->author_entry)),sfile);
+      lives_fputs(lives_entry_get_text(LIVES_ENTRY(rfxbuilder->author_entry)),sfile);
       lives_fputs(rfxbuilder->field_delim,sfile);
-      lives_fputs(lives_entry_get_text (LIVES_ENTRY (rfxbuilder->url_entry)),sfile);
+      lives_fputs(lives_entry_get_text(LIVES_ENTRY(rfxbuilder->url_entry)),sfile);
       lives_fputs("\n</author>\n\n",sfile);
       lives_fputs("<description>\n",sfile);
-      lives_fputs(lives_entry_get_text (LIVES_ENTRY (rfxbuilder->menu_text_entry)),sfile);
+      lives_fputs(lives_entry_get_text(LIVES_ENTRY(rfxbuilder->menu_text_entry)),sfile);
       lives_fputs(rfxbuilder->field_delim,sfile);
-      lives_fputs(lives_entry_get_text (LIVES_ENTRY (rfxbuilder->action_desc_entry)),sfile);
+      lives_fputs(lives_entry_get_text(LIVES_ENTRY(rfxbuilder->action_desc_entry)),sfile);
       lives_fputs(rfxbuilder->field_delim,sfile);
       if (rfxbuilder->type==RFX_BUILD_TYPE_UTILITY) {
-	buf=g_strdup ("-1");
+        buf=lives_strdup("-1");
+      } else {
+        buf=lives_strdup_printf("%d",lives_spin_button_get_value_as_int(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_min_frames)));
       }
-      else {
-	buf=g_strdup_printf ("%d",lives_spin_button_get_value_as_int (LIVES_SPIN_BUTTON (rfxbuilder->spinbutton_min_frames)));
-      }
-      lives_fputs (buf,sfile);
-      g_free (buf);
+      lives_fputs(buf,sfile);
+      lives_free(buf);
       lives_fputs(rfxbuilder->field_delim,sfile);
       switch (rfxbuilder->type) {
       case RFX_BUILD_TYPE_EFFECT2:
-	buf=g_strdup ("2");
-	break;
+        buf=lives_strdup("2");
+        break;
       case RFX_BUILD_TYPE_EFFECT0:
-	buf=g_strdup ("0");
-	break;
+        buf=lives_strdup("0");
+        break;
       default:
-	buf=g_strdup ("1");
+        buf=lives_strdup("1");
       }
-      lives_fputs (buf,sfile);
-      g_free (buf);
+      lives_fputs(buf,sfile);
+      lives_free(buf);
       lives_fputs(rfxbuilder->field_delim,sfile);
       lives_fputs("\n</description>\n\n",sfile);
       lives_fputs("<requires>\n",sfile);
-      for (i=0;i<rfxbuilder->num_reqs;i++) {
-	lives_fputs(rfxbuilder->reqs[i],sfile);
-	if (i<rfxbuilder->num_reqs-1)
-	  lives_fputs("\n",sfile);
+      for (i=0; i<rfxbuilder->num_reqs; i++) {
+        lives_fputs(rfxbuilder->reqs[i],sfile);
+        if (i<rfxbuilder->num_reqs-1)
+          lives_fputs("\n",sfile);
       }
       lives_fputs("\n</requires>\n\n",sfile);
       lives_fputs("<params>\n",sfile);
-      for (i=0;i<rfxbuilder->num_params;i++) {
-	lives_fputs(rfxbuilder->params[i].name,sfile);
-	lives_fputs(rfxbuilder->field_delim,sfile);
-	lives_fputs(rfxbuilder->params[i].label,sfile);
-	lives_fputs(rfxbuilder->field_delim,sfile);
-	switch (rfxbuilder->params[i].type) {
-	case LIVES_PARAM_NUM:
-	  stepwrap=rfxbuilder->params[i].step_size;
-	  if (rfxbuilder->params[i].wrap) stepwrap=-stepwrap;
-	  lives_fputs ("num",sfile);
-	  buf=g_strdup_printf ("%d",rfxbuilder->params[i].dp);
-	  lives_fputs (buf,sfile);
-	  g_free (buf);
-	  lives_fputs(rfxbuilder->field_delim,sfile);
-	  if (!rfxbuilder->params[i].dp) {
-	    buf=g_strdup_printf ("%d",get_int_param (rfxbuilder->params[i].def));
-	    lives_fputs (buf,sfile);
-	    g_free (buf);
-	    lives_fputs(rfxbuilder->field_delim,sfile);
-	    buf=g_strdup_printf ("%d",(int)rfxbuilder->params[i].min);
-	    lives_fputs (buf,sfile);
-	    g_free (buf);
-	    lives_fputs(rfxbuilder->field_delim,sfile);
-	    buf=g_strdup_printf ("%d",(int)rfxbuilder->params[i].max);
-	    lives_fputs (buf,sfile);
-	    g_free (buf);
-	    lives_fputs(rfxbuilder->field_delim,sfile);
-	    if (stepwrap!=1.) {
-	      buf=g_strdup_printf ("%d",(int)stepwrap);
-	      lives_fputs (buf,sfile);
-	      g_free (buf);
-	      lives_fputs(rfxbuilder->field_delim,sfile);
-	    }
-	  }
-	  else {
-	    gchar *pattern=g_strdup_printf ("%%.%df",rfxbuilder->params[i].dp);
-	    buf=g_strdup_printf (pattern,get_double_param (rfxbuilder->params[i].def));
-	    lives_fputs (buf,sfile);
-	    g_free (buf);
-	    lives_fputs(rfxbuilder->field_delim,sfile);
-	    buf=g_strdup_printf (pattern,rfxbuilder->params[i].min);
-	    lives_fputs (buf,sfile);
-	    g_free (buf);
-	    lives_fputs(rfxbuilder->field_delim,sfile);
-	    buf=g_strdup_printf (pattern,rfxbuilder->params[i].max);
-	    lives_fputs (buf,sfile);
-	    g_free (buf);
-	    lives_fputs(rfxbuilder->field_delim,sfile);
-	    if (stepwrap!=1.) {
-	      buf=g_strdup_printf (pattern,stepwrap);
-	      lives_fputs (buf,sfile);
-	      g_free (buf);
-	      lives_fputs(rfxbuilder->field_delim,sfile);
-	    }
-	    g_free (pattern);
-	  }
-	  break;
-	case LIVES_PARAM_BOOL:
-	  lives_fputs ("bool",sfile);
-	  lives_fputs(rfxbuilder->field_delim,sfile);
-	  buf=g_strdup_printf ("%d",get_bool_param (rfxbuilder->params[i].def));
-	  lives_fputs (buf,sfile);
-	  g_free (buf);
-	  lives_fputs(rfxbuilder->field_delim,sfile);
-	  if (rfxbuilder->params[i].group!=0) {
-	    buf=g_strdup_printf ("%d",rfxbuilder->params[i].group);
-	    lives_fputs (buf,sfile);
-	    g_free (buf);
-	    lives_fputs(rfxbuilder->field_delim,sfile);
-	  }
-	  break;
-	case LIVES_PARAM_COLRGB24:
-	  lives_fputs ("colRGB24",sfile);
-	  lives_fputs(rfxbuilder->field_delim,sfile);
-	  get_colRGB24_param (rfxbuilder->params[i].def,&rgb);
-	  buf=g_strdup_printf ("%d",rgb.red);
-	  lives_fputs (buf,sfile);
-	  g_free (buf);
-	  lives_fputs(rfxbuilder->field_delim,sfile);
-	  buf=g_strdup_printf ("%d",rgb.green);
-	  lives_fputs (buf,sfile);
-	  g_free (buf);
-	  lives_fputs(rfxbuilder->field_delim,sfile);
-	  buf=g_strdup_printf ("%d",rgb.blue);
-	  lives_fputs (buf,sfile);
-	  g_free (buf);
-	  lives_fputs(rfxbuilder->field_delim,sfile);
-	  break;
-	case LIVES_PARAM_STRING:
-	  lives_fputs ("string",sfile);
-	  lives_fputs(rfxbuilder->field_delim,sfile);
-	  lives_fputs ((tmp=U82L (tmp2=subst ((gchar *)rfxbuilder->params[i].def,"\n","\\n"))),sfile);
-	  g_free(tmp);
-	  g_free(tmp2);
-	  lives_fputs(rfxbuilder->field_delim,sfile);
-	  buf=g_strdup_printf ("%d",(int)rfxbuilder->params[i].max);
-	  lives_fputs (buf,sfile);
-	  g_free (buf);
-	  lives_fputs(rfxbuilder->field_delim,sfile);
-	  break;
-	case LIVES_PARAM_STRING_LIST:
-	  lives_fputs ("string_list",sfile);
-	  lives_fputs(rfxbuilder->field_delim,sfile);
-	  if (rfxbuilder->params[i].def!=NULL) {
-	    buf=g_strdup_printf ("%d",get_bool_param (rfxbuilder->params[i].def));
-	    lives_fputs (buf,sfile);
-	    g_free (buf);
-	    lives_fputs(rfxbuilder->field_delim,sfile);
-	    for (j=0;j<g_list_length (rfxbuilder->params[i].list);j++) {
-	      lives_fputs ((tmp=U82L (tmp2=subst ((gchar *)g_list_nth_data 
-						  (rfxbuilder->params[i].list,j),"\n","\\n"))),sfile);
-	      g_free(tmp);
-	      g_free(tmp2);
-	      lives_fputs(rfxbuilder->field_delim,sfile);
-	    }
-	  }
-	  break;
-	default:
-	  break;
-	}
-	if (i<rfxbuilder->num_params-1)
-	  lives_fputs("\n",sfile);
+      for (i=0; i<rfxbuilder->num_params; i++) {
+        lives_fputs(rfxbuilder->params[i].name,sfile);
+        lives_fputs(rfxbuilder->field_delim,sfile);
+        lives_fputs(rfxbuilder->params[i].label,sfile);
+        lives_fputs(rfxbuilder->field_delim,sfile);
+        switch (rfxbuilder->params[i].type) {
+        case LIVES_PARAM_NUM:
+          stepwrap=rfxbuilder->params[i].step_size;
+          if (rfxbuilder->params[i].wrap) stepwrap=-stepwrap;
+          lives_fputs("num",sfile);
+          buf=lives_strdup_printf("%d",rfxbuilder->params[i].dp);
+          lives_fputs(buf,sfile);
+          lives_free(buf);
+          lives_fputs(rfxbuilder->field_delim,sfile);
+          if (!rfxbuilder->params[i].dp) {
+            buf=lives_strdup_printf("%d",get_int_param(rfxbuilder->params[i].def));
+            lives_fputs(buf,sfile);
+            lives_free(buf);
+            lives_fputs(rfxbuilder->field_delim,sfile);
+            buf=lives_strdup_printf("%d",(int)rfxbuilder->params[i].min);
+            lives_fputs(buf,sfile);
+            lives_free(buf);
+            lives_fputs(rfxbuilder->field_delim,sfile);
+            buf=lives_strdup_printf("%d",(int)rfxbuilder->params[i].max);
+            lives_fputs(buf,sfile);
+            lives_free(buf);
+            lives_fputs(rfxbuilder->field_delim,sfile);
+            if (stepwrap!=1.) {
+              buf=lives_strdup_printf("%d",(int)stepwrap);
+              lives_fputs(buf,sfile);
+              lives_free(buf);
+              lives_fputs(rfxbuilder->field_delim,sfile);
+            }
+          } else {
+            char *pattern=lives_strdup_printf("%%.%df",rfxbuilder->params[i].dp);
+            buf=lives_strdup_printf(pattern,get_double_param(rfxbuilder->params[i].def));
+            lives_fputs(buf,sfile);
+            lives_free(buf);
+            lives_fputs(rfxbuilder->field_delim,sfile);
+            buf=lives_strdup_printf(pattern,rfxbuilder->params[i].min);
+            lives_fputs(buf,sfile);
+            lives_free(buf);
+            lives_fputs(rfxbuilder->field_delim,sfile);
+            buf=lives_strdup_printf(pattern,rfxbuilder->params[i].max);
+            lives_fputs(buf,sfile);
+            lives_free(buf);
+            lives_fputs(rfxbuilder->field_delim,sfile);
+            if (stepwrap!=1.) {
+              buf=lives_strdup_printf(pattern,stepwrap);
+              lives_fputs(buf,sfile);
+              lives_free(buf);
+              lives_fputs(rfxbuilder->field_delim,sfile);
+            }
+            lives_free(pattern);
+          }
+          break;
+        case LIVES_PARAM_BOOL:
+          lives_fputs("bool",sfile);
+          lives_fputs(rfxbuilder->field_delim,sfile);
+          buf=lives_strdup_printf("%d",get_bool_param(rfxbuilder->params[i].def));
+          lives_fputs(buf,sfile);
+          lives_free(buf);
+          lives_fputs(rfxbuilder->field_delim,sfile);
+          if (rfxbuilder->params[i].group!=0) {
+            buf=lives_strdup_printf("%d",rfxbuilder->params[i].group);
+            lives_fputs(buf,sfile);
+            lives_free(buf);
+            lives_fputs(rfxbuilder->field_delim,sfile);
+          }
+          break;
+        case LIVES_PARAM_COLRGB24:
+          lives_fputs("colRGB24",sfile);
+          lives_fputs(rfxbuilder->field_delim,sfile);
+          get_colRGB24_param(rfxbuilder->params[i].def,&rgb);
+          buf=lives_strdup_printf("%d",rgb.red);
+          lives_fputs(buf,sfile);
+          lives_free(buf);
+          lives_fputs(rfxbuilder->field_delim,sfile);
+          buf=lives_strdup_printf("%d",rgb.green);
+          lives_fputs(buf,sfile);
+          lives_free(buf);
+          lives_fputs(rfxbuilder->field_delim,sfile);
+          buf=lives_strdup_printf("%d",rgb.blue);
+          lives_fputs(buf,sfile);
+          lives_free(buf);
+          lives_fputs(rfxbuilder->field_delim,sfile);
+          break;
+        case LIVES_PARAM_STRING:
+          lives_fputs("string",sfile);
+          lives_fputs(rfxbuilder->field_delim,sfile);
+          lives_fputs((tmp=U82L(tmp2=subst((char *)rfxbuilder->params[i].def,"\n","\\n"))),sfile);
+          lives_free(tmp);
+          lives_free(tmp2);
+          lives_fputs(rfxbuilder->field_delim,sfile);
+          buf=lives_strdup_printf("%d",(int)rfxbuilder->params[i].max);
+          lives_fputs(buf,sfile);
+          lives_free(buf);
+          lives_fputs(rfxbuilder->field_delim,sfile);
+          break;
+        case LIVES_PARAM_STRING_LIST:
+          lives_fputs("string_list",sfile);
+          lives_fputs(rfxbuilder->field_delim,sfile);
+          if (rfxbuilder->params[i].def!=NULL) {
+            buf=lives_strdup_printf("%d",get_bool_param(rfxbuilder->params[i].def));
+            lives_fputs(buf,sfile);
+            lives_free(buf);
+            lives_fputs(rfxbuilder->field_delim,sfile);
+            for (j=0; j<lives_list_length(rfxbuilder->params[i].list); j++) {
+              lives_fputs((tmp=U82L(tmp2=subst((char *)lives_list_nth_data
+                                               (rfxbuilder->params[i].list,j),"\n","\\n"))),sfile);
+              lives_free(tmp);
+              lives_free(tmp2);
+              lives_fputs(rfxbuilder->field_delim,sfile);
+            }
+          }
+          break;
+        default:
+          break;
+        }
+        if (i<rfxbuilder->num_params-1)
+          lives_fputs("\n",sfile);
       }
       lives_fputs("\n</params>\n\n",sfile);
       lives_fputs("<param_window>\n",sfile);
-      for (i=0;i<rfxbuilder->num_paramw_hints;i++) {
-	lives_fputs(rfxbuilder->paramw_hints[i],sfile);
-	if (strlen (rfxbuilder->paramw_hints[i])>strlen (rfxbuilder->field_delim)&&
-	    strcmp (rfxbuilder->paramw_hints[i]+strlen (rfxbuilder->paramw_hints[i])
-		    -strlen (rfxbuilder->field_delim),rfxbuilder->field_delim)) 
-	  lives_fputs(rfxbuilder->field_delim,sfile);
-	lives_fputs("\n",sfile);
+      for (i=0; i<rfxbuilder->num_paramw_hints; i++) {
+        lives_fputs(rfxbuilder->paramw_hints[i],sfile);
+        if (strlen(rfxbuilder->paramw_hints[i])>strlen(rfxbuilder->field_delim)&&
+            strcmp(rfxbuilder->paramw_hints[i]+strlen(rfxbuilder->paramw_hints[i])
+                   -strlen(rfxbuilder->field_delim),rfxbuilder->field_delim))
+          lives_fputs(rfxbuilder->field_delim,sfile);
+        lives_fputs("\n",sfile);
       }
       lives_fputs("</param_window>\n\n",sfile);
       lives_fputs("<properties>\n",sfile);
       if (rfxbuilder->type==RFX_BUILD_TYPE_TOOL) props=rfxbuilder->props|RFX_PROPS_MAY_RESIZE;
       else props=rfxbuilder->props;
-  
+
       if (rfxbuilder->type!=RFX_BUILD_TYPE_EFFECT0&&(rfxbuilder->props&RFX_PROPS_BATCHG)) rfxbuilder->props^=RFX_PROPS_BATCHG;
 
-      buf=g_strdup_printf ("0x%04X",props);
-      lives_fputs (buf,sfile);
-      g_free (buf);
+      buf=lives_strdup_printf("0x%04X",props);
+      lives_fputs(buf,sfile);
+      lives_free(buf);
       lives_fputs("\n</properties>\n\n",sfile);
       lives_fputs("<language_code>\n",sfile);
-      array=g_strsplit(lives_combo_get_active_text (LIVES_COMBO (rfxbuilder->langc_combo))," ",-1);
-      lives_fputs (array[0],sfile);
-      g_strfreev (array);
+      array=lives_strsplit(lives_combo_get_active_text(LIVES_COMBO(rfxbuilder->langc_combo))," ",-1);
+      lives_fputs(array[0],sfile);
+      lives_strfreev(array);
       lives_fputs("\n</language_code>\n\n",sfile);
       lives_fputs("<pre>\n",sfile);
-      lives_fputs (rfxbuilder->pre_code,sfile);
-      if (strlen (rfxbuilder->pre_code)&&strcmp (rfxbuilder->pre_code+strlen (rfxbuilder->pre_code)-1,"\n")) 
-	lives_fputs ("\n",sfile);
+      lives_fputs(rfxbuilder->pre_code,sfile);
+      if (strlen(rfxbuilder->pre_code)&&strcmp(rfxbuilder->pre_code+strlen(rfxbuilder->pre_code)-1,"\n"))
+        lives_fputs("\n",sfile);
       lives_fputs("</pre>\n\n",sfile);
       lives_fputs("<loop>\n",sfile);
-      lives_fputs (rfxbuilder->loop_code,sfile);
-      if (strlen (rfxbuilder->loop_code)&&strcmp (rfxbuilder->loop_code+strlen (rfxbuilder->loop_code)-1,"\n")) 
-	lives_fputs ("\n",sfile);
+      lives_fputs(rfxbuilder->loop_code,sfile);
+      if (strlen(rfxbuilder->loop_code)&&strcmp(rfxbuilder->loop_code+strlen(rfxbuilder->loop_code)-1,"\n"))
+        lives_fputs("\n",sfile);
       lives_fputs("</loop>\n\n",sfile);
       lives_fputs("<post>\n",sfile);
-      lives_fputs (rfxbuilder->post_code,sfile);
-      if (strlen (rfxbuilder->post_code)&&strcmp (rfxbuilder->post_code+strlen (rfxbuilder->post_code)-1,"\n")) 
-	lives_fputs ("\n",sfile);
+      lives_fputs(rfxbuilder->post_code,sfile);
+      if (strlen(rfxbuilder->post_code)&&strcmp(rfxbuilder->post_code+strlen(rfxbuilder->post_code)-1,"\n"))
+        lives_fputs("\n",sfile);
       lives_fputs("</post>\n\n",sfile);
       lives_fputs("<onchange>\n",sfile);
-      for (i=0;i<rfxbuilder->num_triggers;i++) {
-	int j;
-	int numtok=get_token_count (rfxbuilder->triggers[i].code,'\n');
-
-	buf=rfxbuilder->triggers[i].when?g_strdup_printf ("%d",rfxbuilder->triggers[i].when-1):g_strdup ("init");
-	array=g_strsplit(rfxbuilder->triggers[i].code,"\n",-1);
-	for (j=0;j<numtok;j++) {
-	  lives_fputs (buf,sfile);
-	  lives_fputs(rfxbuilder->field_delim,sfile);
-	  if (array[j]!=NULL) lives_fputs(array[j],sfile);
-	  if (j<numtok-1)
-	    lives_fputs("\n",sfile);
-	}
-	lives_fputs("\n",sfile);
-	g_free (buf);
-	g_strfreev (array);
+      for (i=0; i<rfxbuilder->num_triggers; i++) {
+        int j;
+        int numtok=get_token_count(rfxbuilder->triggers[i].code,'\n');
+
+        buf=rfxbuilder->triggers[i].when?lives_strdup_printf("%d",rfxbuilder->triggers[i].when-1):lives_strdup("init");
+        array=lives_strsplit(rfxbuilder->triggers[i].code,"\n",-1);
+        for (j=0; j<numtok; j++) {
+          lives_fputs(buf,sfile);
+          lives_fputs(rfxbuilder->field_delim,sfile);
+          if (array[j]!=NULL) lives_fputs(array[j],sfile);
+          if (j<numtok-1)
+            lives_fputs("\n",sfile);
+        }
+        lives_fputs("\n",sfile);
+        lives_free(buf);
+        lives_strfreev(array);
       }
       lives_fputs("</onchange>\n\n",sfile);
-      fclose (sfile);
+      fclose(sfile);
 
       if (mainw->write_failed) {
-	mainw->write_failed=FALSE;
-	retval=do_write_failed_error_s_with_retry(script_file,NULL,LIVES_WINDOW(rfxbuilder->dialog));
-	if (retval==LIVES_CANCEL) d_print_file_error_failed();
+        mainw->write_failed=FALSE;
+        retval=do_write_failed_error_s_with_retry(script_file,NULL,LIVES_WINDOW(rfxbuilder->dialog));
+        if (retval==LIVES_RESPONSE_CANCEL) d_print_file_error_failed();
       }
 
     }
-  } while (retval==LIVES_RETRY);
+  } while (retval==LIVES_RESPONSE_RETRY);
 
-  g_free(script_file);
+  lives_free(script_file);
 
-  if (retval!=LIVES_CANCEL) {
+  if (retval!=LIVES_RESPONSE_CANCEL) {
     d_print_done();
 
     lives_widget_set_sensitive(mainw->promote_test_rfx,TRUE);
@@ -3457,13 +3391,13 @@
 }
 
 
-boolean script_to_rfxbuilder (rfx_build_window_t *rfxbuilder, const gchar *script_file) {
-  GList *list;
+boolean script_to_rfxbuilder(rfx_build_window_t *rfxbuilder, const char *script_file) {
+  LiVESList *list;
 
-  gchar **array;
-  gchar *tmp;
-  gchar *line;
-  gchar *version;
+  char **array;
+  char *tmp;
+  char *line;
+  char *version;
 
   int num_channels;
   int tnum,found;
@@ -3473,82 +3407,82 @@
   register int i,j;
 
   rfxbuilder->type=RFX_BUILD_TYPE_EFFECT1;
-  if (!(list=get_script_section ("define",script_file,TRUE))) {
-    g_snprintf(mainw->msg,512,"%s",(_("No <define> section found in script.\n")));
+  if (!(list=get_script_section("define",script_file,TRUE))) {
+    lives_snprintf(mainw->msg,512,"%s",(_("No <define> section found in script.\n")));
     return FALSE;
   }
-  tmp=(gchar *)g_list_nth_data(list,0);
+  tmp=(char *)lives_list_nth_data(list,0);
   if (strlen(tmp)<2) {
-    g_list_free_strings(list);
-    g_list_free(list);
-    g_snprintf(mainw->msg,512,"%s",(_("Bad script version.\n")));
+    lives_list_free_strings(list);
+    lives_list_free(list);
+    lives_snprintf(mainw->msg,512,"%s",(_("Bad script version.\n")));
     return FALSE;
   }
 
-  version=g_strdup(tmp+1);
+  version=lives_strdup(tmp+1);
   if (make_version_hash(version)>make_version_hash(RFX_VERSION)) {
-    g_list_free_strings(list);
-    g_list_free(list);
-    g_free(version);
-    g_snprintf(mainw->msg,512,"%s",(_("Bad script version.\n")));
+    lives_list_free_strings(list);
+    lives_list_free(list);
+    lives_free(version);
+    lives_snprintf(mainw->msg,512,"%s",(_("Bad script version.\n")));
     return FALSE;
   }
-  g_free(version);
+  lives_free(version);
 
   memset(tmp+1,0,1);
-  g_free(rfxbuilder->field_delim);
-  rfxbuilder->field_delim=g_strdup(tmp);
-  g_list_free_strings(list);
-  g_list_free(list);
+  lives_free(rfxbuilder->field_delim);
+  rfxbuilder->field_delim=lives_strdup(tmp);
+  lives_list_free_strings(list);
+  lives_list_free(list);
 
-  if (!(list=get_script_section ("name",script_file,TRUE))) {
-    g_snprintf(mainw->msg,512,"%s",(_("No <name> section found in script.\n")));
+  if (!(list=get_script_section("name",script_file,TRUE))) {
+    lives_snprintf(mainw->msg,512,"%s",(_("No <name> section found in script.\n")));
     return FALSE;
   }
-  lives_entry_set_text (LIVES_ENTRY (rfxbuilder->name_entry),(gchar *)g_list_nth_data (list,0));
-  g_list_free_strings (list);
-  g_list_free (list);
+  lives_entry_set_text(LIVES_ENTRY(rfxbuilder->name_entry),(char *)lives_list_nth_data(list,0));
+  lives_list_free_strings(list);
+  lives_list_free(list);
 
-  if (!(list=get_script_section ("version",script_file,TRUE))) {
-    g_snprintf(mainw->msg,512,"%s",(_("No <version> section found in script.\n")));
+  if (!(list=get_script_section("version",script_file,TRUE))) {
+    lives_snprintf(mainw->msg,512,"%s",(_("No <version> section found in script.\n")));
     return FALSE;
   }
-  lives_spin_button_set_value (LIVES_SPIN_BUTTON (rfxbuilder->spinbutton_version),
-			     (double)atoi ((gchar *)g_list_nth_data (list,0)));
-  g_list_free_strings (list);
-  g_list_free (list);
+  lives_spin_button_set_value(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_version),
+                              (double)atoi((char *)lives_list_nth_data(list,0)));
+  lives_list_free_strings(list);
+  lives_list_free(list);
 
-  if (!(list=get_script_section ("author",script_file,TRUE))) {
-    g_snprintf(mainw->msg,512,"%s",(_("No <author> section found in script.\n")));
+  if (!(list=get_script_section("author",script_file,TRUE))) {
+    lives_snprintf(mainw->msg,512,"%s",(_("No <author> section found in script.\n")));
     return FALSE;
   }
-  array=g_strsplit ((gchar *)g_list_nth_data (list,0),rfxbuilder->field_delim,2);
-  lives_entry_set_text (LIVES_ENTRY (rfxbuilder->author_entry),array[0]);
-  if (get_token_count ((gchar *)g_list_nth_data (list,0),(int)rfxbuilder->field_delim[0])>1) {
-    lives_entry_set_text (LIVES_ENTRY (rfxbuilder->url_entry),array[1]);
-  }
-  g_strfreev (array);
-  g_list_free_strings (list);
-  g_list_free (list);
+  array=lives_strsplit((char *)lives_list_nth_data(list,0),rfxbuilder->field_delim,2);
+  lives_entry_set_text(LIVES_ENTRY(rfxbuilder->author_entry),array[0]);
+  if (get_token_count((char *)lives_list_nth_data(list,0),(int)rfxbuilder->field_delim[0])>1) {
+    lives_entry_set_text(LIVES_ENTRY(rfxbuilder->url_entry),array[1]);
+  }
+  lives_strfreev(array);
+  lives_list_free_strings(list);
+  lives_list_free(list);
 
 
-  if (!(list=get_script_section ("description",script_file,TRUE))) {
-    g_snprintf(mainw->msg,512,"%s",(_("No <description> section found in script.\n")));
+  if (!(list=get_script_section("description",script_file,TRUE))) {
+    lives_snprintf(mainw->msg,512,"%s",(_("No <description> section found in script.\n")));
     return FALSE;
   }
-  if (get_token_count ((gchar *)g_list_nth_data (list,0),(int)rfxbuilder->field_delim[0])<4) {
-    g_snprintf(mainw->msg,512,(_("Bad description. (%s)\n")),(gchar *)g_list_nth_data(list,0));
-    g_list_free_strings (list);
-    g_list_free (list);
+  if (get_token_count((char *)lives_list_nth_data(list,0),(int)rfxbuilder->field_delim[0])<4) {
+    lives_snprintf(mainw->msg,512,(_("Bad description. (%s)\n")),(char *)lives_list_nth_data(list,0));
+    lives_list_free_strings(list);
+    lives_list_free(list);
     return FALSE;
   }
-  array=g_strsplit ((gchar *)g_list_nth_data (list,0),rfxbuilder->field_delim,-1);
-  g_list_free_strings (list);
-  g_list_free (list);
-  lives_entry_set_text (LIVES_ENTRY (rfxbuilder->menu_text_entry),array[0]);
-  lives_entry_set_text (LIVES_ENTRY (rfxbuilder->action_desc_entry),array[1]);
-  lives_spin_button_set_value (LIVES_SPIN_BUTTON (rfxbuilder->spinbutton_min_frames),(double)atoi (array[2]));
-  num_channels=atoi (array[3]);
+  array=lives_strsplit((char *)lives_list_nth_data(list,0),rfxbuilder->field_delim,-1);
+  lives_list_free_strings(list);
+  lives_list_free(list);
+  lives_entry_set_text(LIVES_ENTRY(rfxbuilder->menu_text_entry),array[0]);
+  lives_entry_set_text(LIVES_ENTRY(rfxbuilder->action_desc_entry),array[1]);
+  lives_spin_button_set_value(LIVES_SPIN_BUTTON(rfxbuilder->spinbutton_min_frames),(double)atoi(array[2]));
+  num_channels=atoi(array[3]);
 
   if (num_channels==2) {
     rfxbuilder->type=RFX_BUILD_TYPE_EFFECT2;
@@ -3556,49 +3490,48 @@
   if (num_channels==0) {
     rfxbuilder->type=RFX_BUILD_TYPE_EFFECT0;
   }
-  if (atoi (array[2])==-1) rfxbuilder->type=RFX_BUILD_TYPE_UTILITY;
-  g_strfreev (array);
+  if (atoi(array[2])==-1) rfxbuilder->type=RFX_BUILD_TYPE_UTILITY;
+  lives_strfreev(array);
 
-  rfxbuilder->script_name=g_strdup (script_file);
+  rfxbuilder->script_name=lives_strdup(script_file);
 
-  if ((list=get_script_section ("requires",script_file,TRUE))) {
-    rfxbuilder->num_reqs=g_list_length (list);
-    for (i=0;i<g_list_length (list);i++) {
-      rfxbuilder->reqs[i]=(gchar *)g_list_nth_data (list,i);
+  if ((list=get_script_section("requires",script_file,TRUE))) {
+    rfxbuilder->num_reqs=lives_list_length(list);
+    for (i=0; i<lives_list_length(list); i++) {
+      rfxbuilder->reqs[i]=(char *)lives_list_nth_data(list,i);
     }
-    g_list_free (list);
+    lives_list_free(list);
   }
 
   rfxbuilder->props=0;
 
-  if ((list=get_script_section ("properties",script_file,TRUE))) {
-    if (!strncmp ((gchar *)g_list_nth_data (list,0),"0x",2)||!strncmp ((gchar *)g_list_nth_data (list,0),"0x",2)) {
-      rfxbuilder->props=hextodec ((const gchar *)g_list_nth_data (list,0)+2);
-    }
-    else rfxbuilder->props=atoi ((gchar *)g_list_nth_data (list,0));
-    g_list_free_strings (list);
-    g_list_free (list);
+  if ((list=get_script_section("properties",script_file,TRUE))) {
+    if (!strncmp((char *)lives_list_nth_data(list,0),"0x",2)||!strncmp((char *)lives_list_nth_data(list,0),"0x",2)) {
+      rfxbuilder->props=hextodec((char *)lives_list_nth_data(list,0)+2);
+    } else rfxbuilder->props=atoi((char *)lives_list_nth_data(list,0));
+    lives_list_free_strings(list);
+    lives_list_free(list);
   }
   if (rfxbuilder->props<0) rfxbuilder->props=0;
 
   if (rfxbuilder->props&RFX_PROPS_MAY_RESIZE) rfxbuilder->type=RFX_BUILD_TYPE_TOOL;
 
-  if ((list=get_script_section ("params",script_file,TRUE))) {
-    gchar *type;
+  if ((list=get_script_section("params",script_file,TRUE))) {
+    char *type;
 
-    rfxbuilder->num_params=g_list_length (list);
-    rfxbuilder->params=(lives_param_t *)g_malloc (rfxbuilder->num_params*sizeof(lives_param_t));
+    rfxbuilder->num_params=lives_list_length(list);
+    rfxbuilder->params=(lives_param_t *)lives_malloc(rfxbuilder->num_params*sizeof(lives_param_t));
 
-    for (i=0;i<g_list_length (list);i++) {
+    for (i=0; i<lives_list_length(list); i++) {
 
       // TODO - error check
-      line=(gchar *)g_list_nth_data(list,i);
+      line=(char *)lives_list_nth_data(list,i);
 
-      len=get_token_count (line,(int)rfxbuilder->field_delim[0]);
-      array=g_strsplit(line,rfxbuilder->field_delim,-1);
-      g_free (line);
-      rfxbuilder->params[i].name=g_strdup (array[0]);
-      rfxbuilder->params[i].label=g_strdup (array[1]);
+      len=get_token_count(line,(int)rfxbuilder->field_delim[0]);
+      array=lives_strsplit(line,rfxbuilder->field_delim,-1);
+      lives_free(line);
+      rfxbuilder->params[i].name=lives_strdup(array[0]);
+      rfxbuilder->params[i].label=lives_strdup(array[1]);
       rfxbuilder->params[i].onchange=FALSE;
       rfxbuilder->params[i].dp=0;
       rfxbuilder->params[i].group=0;
@@ -3613,177 +3546,166 @@
       rfxbuilder->params[i].wrap=FALSE;
       ////////////////
 
-      type=g_strdup (array[2]);
-      if (!strncmp (type,"num",3)) {
-	rfxbuilder->params[i].dp=atoi (type+3);
-	rfxbuilder->params[i].type=LIVES_PARAM_NUM;
-	if (rfxbuilder->params[i].dp) {
-	  rfxbuilder->params[i].def=g_malloc (sizint);
-	  set_double_param (rfxbuilder->params[i].def,g_strtod (array[3],NULL));
-	}
-	else {
-	  rfxbuilder->params[i].def=g_malloc (sizint);
-	  set_int_param (rfxbuilder->params[i].def,atoi (array[3]));
-	}
-	rfxbuilder->params[i].min=g_strtod (array[4],NULL);
-	rfxbuilder->params[i].max=g_strtod (array[5],NULL);
-	if (len>6) {
-	  rfxbuilder->params[i].step_size=g_strtod(array[6],NULL);
-	  if (rfxbuilder->params[i].step_size==0.) rfxbuilder->params[i].step_size=1.;
-	  else if (rfxbuilder->params[i].step_size<0.) {
-	    rfxbuilder->params[i].step_size=-rfxbuilder->params[i].step_size;
-	    rfxbuilder->params[i].wrap=TRUE;
-	  }
-	}
-      }
-      else if (!strcmp (type,"colRGB24")) {
-	rfxbuilder->params[i].type=LIVES_PARAM_COLRGB24;
-	rfxbuilder->params[i].def=g_malloc (3*sizint);
-	set_colRGB24_param (rfxbuilder->params[i].def,(short)atoi (array[3]),
-			    (short)atoi (array[4]),(short)atoi (array[5]));
-      }
-      else if (!strcmp (type,"string")) {
-	rfxbuilder->params[i].type=LIVES_PARAM_STRING;
-	rfxbuilder->params[i].def=subst ((tmp=L2U8(array[3])),"\\n","\n");
-	g_free(tmp);
-	if (len>4) rfxbuilder->params[i].max=(double)atoi(array[4]);
-	else rfxbuilder->params[i].max=1024; // TODO
-      }
-      else if (!strcmp (type,"string_list")) {
-	rfxbuilder->params[i].type=LIVES_PARAM_STRING_LIST;
-	rfxbuilder->params[i].def=g_malloc (sizint);
-	set_int_param (rfxbuilder->params[i].def,atoi (array[3]));
-	if (len>3) {
-	  rfxbuilder->params[i].list=array_to_string_list (array,3,len);
-	}
-	else {
-	  rfxbuilder->params[i].list=NULL;
-	  set_int_param (rfxbuilder->params[i].def,0);
-	}
-      }
-      else {
-	// default is bool
-	rfxbuilder->params[i].type=LIVES_PARAM_BOOL;
-	rfxbuilder->params[i].def=g_malloc (sizint);
-	set_bool_param (rfxbuilder->params[i].def,atoi (array[3]));
-	if (len>4) rfxbuilder->params[i].group=atoi(array[4]);
-      }
-      g_free (type);
-      g_strfreev (array);
-    }
-    g_list_free (list);
-  }
-
-  if ((list=get_script_section ("param_window",script_file,TRUE))) {
-    rfxbuilder->num_paramw_hints=g_list_length (list);
-    for (i=0;i<g_list_length (list);i++) {
-      rfxbuilder->paramw_hints[i]=(gchar *)g_list_nth_data (list,i);
-    }
-    g_list_free (list);
-  }
-
-  if ((list=get_script_section ("onchange",script_file,TRUE))) {
-    for (i=0;i<g_list_length (list);i++) {
-      array=g_strsplit ((gchar *)g_list_nth_data (list,i),rfxbuilder->field_delim,-1);
-      if (!strcmp (array[0],"init")) {
-	if (!rfxbuilder->has_init_trigger) {
-	  rfxbuilder->has_init_trigger=TRUE;
-	  rfxbuilder->num_triggers++;
-	}
-      }
-      else if ((tnum=atoi (array[0])+1)<=rfxbuilder->num_params&&tnum>0) {
-	if (!rfxbuilder->params[tnum-1].onchange) {
-	  rfxbuilder->params[tnum-1].onchange=TRUE;
-	  rfxbuilder->num_triggers++;
-	}
-      }
-      else {
-	//invalid trigger
-	gchar *msg=g_strdup_printf (_("\n\nInvalid trigger (%s)\nfound in script.\n\n"),array[0]);
-	do_error_dialog (msg);
-	g_free (msg);
+      type=lives_strdup(array[2]);
+      if (!strncmp(type,"num",3)) {
+        rfxbuilder->params[i].dp=atoi(type+3);
+        rfxbuilder->params[i].type=LIVES_PARAM_NUM;
+        if (rfxbuilder->params[i].dp) {
+          rfxbuilder->params[i].def=lives_malloc(sizint);
+          set_double_param(rfxbuilder->params[i].def,lives_strtod(array[3],NULL));
+        } else {
+          rfxbuilder->params[i].def=lives_malloc(sizint);
+          set_int_param(rfxbuilder->params[i].def,atoi(array[3]));
+        }
+        rfxbuilder->params[i].min=lives_strtod(array[4],NULL);
+        rfxbuilder->params[i].max=lives_strtod(array[5],NULL);
+        if (len>6) {
+          rfxbuilder->params[i].step_size=lives_strtod(array[6],NULL);
+          if (rfxbuilder->params[i].step_size==0.) rfxbuilder->params[i].step_size=1.;
+          else if (rfxbuilder->params[i].step_size<0.) {
+            rfxbuilder->params[i].step_size=-rfxbuilder->params[i].step_size;
+            rfxbuilder->params[i].wrap=TRUE;
+          }
+        }
+      } else if (!strcmp(type,"colRGB24")) {
+        rfxbuilder->params[i].type=LIVES_PARAM_COLRGB24;
+        rfxbuilder->params[i].def=lives_malloc(3*sizint);
+        set_colRGB24_param(rfxbuilder->params[i].def,(short)atoi(array[3]),
+                           (short)atoi(array[4]),(short)atoi(array[5]));
+      } else if (!strcmp(type,"string")) {
+        rfxbuilder->params[i].type=LIVES_PARAM_STRING;
+        rfxbuilder->params[i].def=subst((tmp=L2U8(array[3])),"\\n","\n");
+        lives_free(tmp);
+        if (len>4) rfxbuilder->params[i].max=(double)atoi(array[4]);
+        else rfxbuilder->params[i].max=1024; // TODO
+      } else if (!strcmp(type,"string_list")) {
+        rfxbuilder->params[i].type=LIVES_PARAM_STRING_LIST;
+        rfxbuilder->params[i].def=lives_malloc(sizint);
+        set_int_param(rfxbuilder->params[i].def,atoi(array[3]));
+        if (len>3) {
+          rfxbuilder->params[i].list=array_to_string_list(array,3,len);
+        } else {
+          rfxbuilder->params[i].list=NULL;
+          set_int_param(rfxbuilder->params[i].def,0);
+        }
+      } else {
+        // default is bool
+        rfxbuilder->params[i].type=LIVES_PARAM_BOOL;
+        rfxbuilder->params[i].def=lives_malloc(sizint);
+        set_bool_param(rfxbuilder->params[i].def,atoi(array[3]));
+        if (len>4) rfxbuilder->params[i].group=atoi(array[4]);
+      }
+      lives_free(type);
+      lives_strfreev(array);
+    }
+    lives_list_free(list);
+  }
+
+  if ((list=get_script_section("param_window",script_file,TRUE))) {
+    rfxbuilder->num_paramw_hints=lives_list_length(list);
+    for (i=0; i<lives_list_length(list); i++) {
+      rfxbuilder->paramw_hints[i]=(char *)lives_list_nth_data(list,i);
+    }
+    lives_list_free(list);
+  }
+
+  if ((list=get_script_section("onchange",script_file,TRUE))) {
+    for (i=0; i<lives_list_length(list); i++) {
+      array=lives_strsplit((char *)lives_list_nth_data(list,i),rfxbuilder->field_delim,-1);
+      if (!strcmp(array[0],"init")) {
+        if (!rfxbuilder->has_init_trigger) {
+          rfxbuilder->has_init_trigger=TRUE;
+          rfxbuilder->num_triggers++;
+        }
+      } else if ((tnum=atoi(array[0])+1)<=rfxbuilder->num_params&&tnum>0) {
+        if (!rfxbuilder->params[tnum-1].onchange) {
+          rfxbuilder->params[tnum-1].onchange=TRUE;
+          rfxbuilder->num_triggers++;
+        }
+      } else {
+        //invalid trigger
+        char *msg=lives_strdup_printf(_("\n\nInvalid trigger (%s)\nfound in script.\n\n"),array[0]);
+        do_error_dialog(msg);
+        lives_free(msg);
       }
-      g_strfreev (array);
+      lives_strfreev(array);
     }
     //end pass 1
-    rfxbuilder->triggers=(rfx_trigger_t *)g_malloc (rfxbuilder->num_triggers*sizeof(rfx_trigger_t));
+    rfxbuilder->triggers=(rfx_trigger_t *)lives_malloc(rfxbuilder->num_triggers*sizeof(rfx_trigger_t));
 
-    for (i=0;i<rfxbuilder->num_triggers;i++) {
+    for (i=0; i<rfxbuilder->num_triggers; i++) {
       rfxbuilder->triggers[i].when=-1;
-      rfxbuilder->triggers[i].code=g_strdup ("");
+      rfxbuilder->triggers[i].code=lives_strdup("");
     }
 
     filled_triggers=0;
-    for (i=0;i<g_list_length (list);i++) {
-      array=g_strsplit ((gchar *)g_list_nth_data (list,i),rfxbuilder->field_delim,-1);
-      if (!strcmp (array[0],"init")) {
-	// find init trigger and concatenate code
-	found=filled_triggers;
-	for (j=0;j<filled_triggers&&found==filled_triggers;j++) if (rfxbuilder->triggers[j].when==0) found=j;
-	if (found==filled_triggers) filled_triggers++;
-	if (!strlen (rfxbuilder->triggers[found].code)) {
-	  tmp=g_strconcat (rfxbuilder->triggers[found].code,array[1],NULL);
-	}
-	else {
-	  tmp=g_strconcat (rfxbuilder->triggers[found].code,"\n",array[1],NULL);
-	}
-	g_free (rfxbuilder->triggers[found].code);
-	rfxbuilder->triggers[found].when=0;
-	rfxbuilder->triggers[found].code=g_strdup (tmp);
-	g_free (tmp);
-      }
-      else if ((tnum=atoi (array[0])+1)<=rfxbuilder->num_params&&tnum>0) {
-	// find tnum trigger and concatenate code
-	found=filled_triggers;
-
-	for (j=0;j<filled_triggers&&found==filled_triggers;j++) if (rfxbuilder->triggers[j].when==tnum) found=j;
-	if (found==filled_triggers) filled_triggers++;
-
-	if (!strlen (rfxbuilder->triggers[found].code)) {
-	  tmp=g_strconcat (rfxbuilder->triggers[found].code,array[1],NULL);
-	}
-	else {
-	  tmp=g_strconcat (rfxbuilder->triggers[found].code,"\n",array[1],NULL);
-	}
-	g_free (rfxbuilder->triggers[found].code);
-	rfxbuilder->triggers[found].when=tnum;
-	rfxbuilder->triggers[found].code=g_strdup (tmp);
-	g_free (tmp);
-      }
-      g_strfreev (array);
-    }
-    g_list_free_strings (list);
-    g_list_free (list);
-  }
-
-  if ((list=get_script_section ("pre",script_file,FALSE))) {
-    for (i=0;i<g_list_length (list);i++) {
-      tmp=g_strconcat (rfxbuilder->pre_code,g_list_nth_data (list,i),NULL);
-      g_free (rfxbuilder->pre_code);
+    for (i=0; i<lives_list_length(list); i++) {
+      array=lives_strsplit((char *)lives_list_nth_data(list,i),rfxbuilder->field_delim,-1);
+      if (!strcmp(array[0],"init")) {
+        // find init trigger and concatenate code
+        found=filled_triggers;
+        for (j=0; j<filled_triggers&&found==filled_triggers; j++) if (rfxbuilder->triggers[j].when==0) found=j;
+        if (found==filled_triggers) filled_triggers++;
+        if (!strlen(rfxbuilder->triggers[found].code)) {
+          tmp=lives_strconcat(rfxbuilder->triggers[found].code,array[1],NULL);
+        } else {
+          tmp=lives_strconcat(rfxbuilder->triggers[found].code,"\n",array[1],NULL);
+        }
+        lives_free(rfxbuilder->triggers[found].code);
+        rfxbuilder->triggers[found].when=0;
+        rfxbuilder->triggers[found].code=lives_strdup(tmp);
+        lives_free(tmp);
+      } else if ((tnum=atoi(array[0])+1)<=rfxbuilder->num_params&&tnum>0) {
+        // find tnum trigger and concatenate code
+        found=filled_triggers;
+
+        for (j=0; j<filled_triggers&&found==filled_triggers; j++) if (rfxbuilder->triggers[j].when==tnum) found=j;
+        if (found==filled_triggers) filled_triggers++;
+
+        if (!strlen(rfxbuilder->triggers[found].code)) {
+          tmp=lives_strconcat(rfxbuilder->triggers[found].code,array[1],NULL);
+        } else {
+          tmp=lives_strconcat(rfxbuilder->triggers[found].code,"\n",array[1],NULL);
+        }
+        lives_free(rfxbuilder->triggers[found].code);
+        rfxbuilder->triggers[found].when=tnum;
+        rfxbuilder->triggers[found].code=lives_strdup(tmp);
+        lives_free(tmp);
+      }
+      lives_strfreev(array);
+    }
+    lives_list_free_strings(list);
+    lives_list_free(list);
+  }
+
+  if ((list=get_script_section("pre",script_file,FALSE))) {
+    for (i=0; i<lives_list_length(list); i++) {
+      tmp=lives_strconcat(rfxbuilder->pre_code,lives_list_nth_data(list,i),NULL);
+      lives_free(rfxbuilder->pre_code);
       rfxbuilder->pre_code=tmp;
     }
-    g_list_free_strings (list);
-    g_list_free (list);
+    lives_list_free_strings(list);
+    lives_list_free(list);
   }
 
-  if ((list=get_script_section ("loop",script_file,FALSE))) {
-    for (i=0;i<g_list_length (list);i++) {
-      tmp=g_strconcat (rfxbuilder->loop_code,g_list_nth_data (list,i),NULL);
-      g_free (rfxbuilder->loop_code);
+  if ((list=get_script_section("loop",script_file,FALSE))) {
+    for (i=0; i<lives_list_length(list); i++) {
+      tmp=lives_strconcat(rfxbuilder->loop_code,lives_list_nth_data(list,i),NULL);
+      lives_free(rfxbuilder->loop_code);
       rfxbuilder->loop_code=tmp;
     }
-    g_list_free_strings (list);
-    g_list_free (list);
+    lives_list_free_strings(list);
+    lives_list_free(list);
   }
 
-  if ((list=get_script_section ("post",script_file,FALSE))) {
-    for (i=0;i<g_list_length (list);i++) {
-      tmp=g_strconcat (rfxbuilder->post_code,g_list_nth_data (list,i),NULL);
-      g_free (rfxbuilder->post_code);
+  if ((list=get_script_section("post",script_file,FALSE))) {
+    for (i=0; i<lives_list_length(list); i++) {
+      tmp=lives_strconcat(rfxbuilder->post_code,lives_list_nth_data(list,i),NULL);
+      lives_free(rfxbuilder->post_code);
       rfxbuilder->post_code=tmp;
     }
-    g_list_free_strings (list);
-    g_list_free (list);
+    lives_list_free_strings(list);
+    lives_list_free(list);
   }
 
   return TRUE;
@@ -3792,59 +3714,58 @@
 
 
 
-GList *get_script_section (const gchar *section, const gchar *file, boolean strip) {
+LiVESList *get_script_section(const char *section, const char *file, boolean strip) {
   FILE *script_file;
-  GList *list=NULL;
+  LiVESList *list=NULL;
 
   size_t linelen;
 
-  gchar buff[65536];
+  char buff[65536];
 
-  gchar *line;
-  gchar *whole=g_strdup (""),*whole2;
+  char *line;
+  char *whole=lives_strdup(""),*whole2;
 
 #ifndef IS_MINGW
-  gchar *outfile=g_strdup_printf ("%s/rfxsec.%d",g_get_tmp_dir(),capable->mainpid);
-  gchar *com=g_strdup_printf ("\"%s\" -get \"%s\" \"%s\" > \"%s\"",RFX_BUILDER,section,file,outfile);
+  char *outfile=lives_strdup_printf("%s/rfxsec.%d",capable->system_tmpdir,capable->mainpid);
+  char *com=lives_strdup_printf("\"%s\" -get \"%s\" \"%s\" > \"%s\"",RFX_BUILDER,section,file,outfile);
 #else
-  gchar *outfile=g_strdup_printf ("%s\\rfxsec.%d",g_get_tmp_dir(),capable->mainpid);
-  gchar *com=g_strdup_printf ("perl \"%s\\%s\" -get \"%s\" \"%s\" > \"%s\"",prefs->prefix_dir,RFX_BUILDER,
-			      section,file,outfile);
+  char *outfile=lives_strdup_printf("%s\\rfxsec.%d",capable->system_tmpdir,capable->mainpid);
+  char *com=lives_strdup_printf("perl \"%s\\%s\" -get \"%s\" \"%s\" > \"%s\"",prefs->prefix_dir,RFX_BUILDER,
+                                section,file,outfile);
 #endif
 
   mainw->com_failed=FALSE;
 
-  lives_system (com,FALSE);
-  g_free (com);
+  lives_system(com,FALSE);
+  lives_free(com);
 
-  if (mainw->com_failed) return FALSE;
+  if (mainw->com_failed) return NULL;
 
-  if ((script_file=fopen (outfile,"r"))) {
+  if ((script_file=fopen(outfile,"r"))) {
     while (fgets(buff,65536,script_file)) {
       if (buff!=NULL) {
-	if (strip) line=(g_strstrip(buff));
-	else line=buff;
-	if ((linelen=strlen (line))) {
-	  whole2=g_strconcat (whole,line,NULL);
-	  if (whole2!=whole) g_free (whole);
-	  whole=whole2;
-	  if (linelen<(size_t)65535) {
-	    list=g_list_append (list, g_strdup (whole));
-	    g_free (whole);
-	    whole=g_strdup ("");
-	  }
-	}
-      }
-    }
-    g_free (whole);
-  }
-  else {
-    g_free (outfile);
+        if (strip) line=(lives_strstrip(buff));
+        else line=buff;
+        if ((linelen=strlen(line))) {
+          whole2=lives_strconcat(whole,line,NULL);
+          if (whole2!=whole) lives_free(whole);
+          whole=whole2;
+          if (linelen<(size_t)65535) {
+            list=lives_list_append(list, lives_strdup(whole));
+            lives_free(whole);
+            whole=lives_strdup("");
+          }
+        }
+      }
+    }
+    lives_free(whole);
+  } else {
+    lives_free(outfile);
     return NULL;
   }
-  fclose (script_file);
-  unlink (outfile);
-  g_free (outfile);
+  fclose(script_file);
+  unlink(outfile);
+  lives_free(outfile);
   return list;
 }
 
@@ -3852,27 +3773,27 @@
 
 
 
-void on_rebuild_rfx_activate (LiVESMenuItem *menuitem, gpointer user_data) {
-  gchar *com;
+void on_rebuild_rfx_activate(LiVESMenuItem *menuitem, livespointer user_data) {
+  char *com;
   if (!check_builder_programs()) return;
 
-  d_print (_("Rebuilding all RFX scripts...builtin...")); 
+  d_print(_("Rebuilding all RFX scripts...builtin..."));
   do_threaded_dialog(_("Rebuilding scripts"),FALSE);
 
-  com=g_strdup_printf("%s build_rfx_plugins builtinx \"%s%s%s\" \"%s%s%s\" \"%s/bin\"",prefs->backend_sync,
-		      prefs->prefix_dir,
-		      PLUGIN_SCRIPTS_DIR,PLUGIN_RENDERED_EFFECTS_BUILTIN_SCRIPTS,
-		      prefs->lib_dir,PLUGIN_EXEC_DIR,PLUGIN_RENDERED_EFFECTS_BUILTIN,prefs->prefix_dir);
+  com=lives_strdup_printf("%s build_rfx_plugins builtinx \"%s%s%s\" \"%s%s%s\" \"%s/bin\"",prefs->backend_sync,
+                          prefs->prefix_dir,
+                          PLUGIN_SCRIPTS_DIR,PLUGIN_RENDERED_EFFECTS_BUILTIN_SCRIPTS,
+                          prefs->lib_dir,PLUGIN_EXEC_DIR,PLUGIN_RENDERED_EFFECTS_BUILTIN,prefs->prefix_dir);
   lives_system(com,TRUE);
-  g_free(com);
-  d_print (_ ("custom...")); 
-  com=g_strdup_printf("%s build_rfx_plugins custom",prefs->backend_sync);
+  lives_free(com);
+  d_print(_("custom..."));
+  com=lives_strdup_printf("%s build_rfx_plugins custom",prefs->backend_sync);
   lives_system(com,FALSE);
-  g_free(com);
-  d_print (_("test...")); 
-  com=g_strdup_printf("%s build_rfx_plugins test",prefs->backend_sync);
+  lives_free(com);
+  d_print(_("test..."));
+  com=lives_strdup_printf("%s build_rfx_plugins test",prefs->backend_sync);
   lives_system(com,FALSE);
-  g_free(com);
+  lives_free(com);
 
 
   d_print(_("rebuilding dynamic menu entries..."));
@@ -3880,7 +3801,7 @@
   threaded_dialog_spin();
   add_rfx_effects();
   threaded_dialog_spin();
-  d_print_done(); 
+  d_print_done();
   threaded_dialog_spin();
   end_threaded_dialog();
 
@@ -3891,27 +3812,29 @@
 
 
 
-boolean check_builder_programs (void) {
+boolean check_builder_programs(void) {
 #ifdef IS_MINGW
   return TRUE;
 #endif
 
   // check our plugin builder routines are executable
-  gchar loc[32];
-  gchar *msg;
+  char loc[32];
+  char *msg;
 
   get_location(RFX_BUILDER,loc,32);
   if (!strlen(loc)) {
-    msg=g_strdup_printf(_("\n\nLiVES was unable to find the program %s.\nPlease check this program is in your path and executable.\n"),RFX_BUILDER);
+    msg=lives_strdup_printf(_("\n\nLiVES was unable to find the program %s.\nPlease check this program is in your path and executable.\n"),
+                            RFX_BUILDER);
     do_blocking_error_dialog(msg);
-    g_free(msg);
+    lives_free(msg);
     return FALSE;
   }
   get_location(RFX_BUILDER_MULTI,loc,32);
   if (!strlen(loc)) {
-    msg=g_strdup_printf(_("\n\nLiVES was unable to find the program %s.\nPlease check this program is in your path and executable.\n"),RFX_BUILDER_MULTI);
+    msg=lives_strdup_printf(_("\n\nLiVES was unable to find the program %s.\nPlease check this program is in your path and executable.\n"),
+                            RFX_BUILDER_MULTI);
     do_blocking_error_dialog(msg);
-    g_free(msg);
+    lives_free(msg);
     return FALSE;
   }
   return TRUE;
@@ -3919,121 +3842,119 @@
 
 
 
-void on_delete_rfx_activate (LiVESMenuItem *menuitem, gpointer user_data) {
-  lives_rfx_status_t status=(lives_rfx_status_t)GPOINTER_TO_INT (user_data);
+void on_delete_rfx_activate(LiVESMenuItem *menuitem, livespointer user_data) {
+  lives_rfx_status_t status=(lives_rfx_status_t)LIVES_POINTER_TO_INT(user_data);
   int ret;
-  gchar *rfx_script_file,*rfx_script_dir;
-  gchar *script_name=prompt_for_script_name (NULL,status);
-  gchar *msg;
+  char *rfx_script_file,*rfx_script_dir;
+  char *script_name=prompt_for_script_name(NULL,status);
+  char *msg;
 
   if (script_name==NULL) return;  // user cancelled
 
-  if (strlen (script_name)) {
+  if (strlen(script_name)) {
     switch (status) {
     case RFX_STATUS_TEST:
-      rfx_script_dir=g_build_filename (capable->home_dir,LIVES_CONFIG_DIR,
-					PLUGIN_RENDERED_EFFECTS_TEST_SCRIPTS,NULL);
-      rfx_script_file=g_build_filename (rfx_script_dir,script_name,NULL);
+      rfx_script_dir=lives_build_filename(capable->home_dir,LIVES_CONFIG_DIR,
+                                          PLUGIN_RENDERED_EFFECTS_TEST_SCRIPTS,NULL);
+      rfx_script_file=lives_build_filename(rfx_script_dir,script_name,NULL);
       break;
     case RFX_STATUS_CUSTOM:
-      rfx_script_dir=g_build_filename (capable->home_dir,LIVES_CONFIG_DIR,
-					PLUGIN_RENDERED_EFFECTS_CUSTOM_SCRIPTS,NULL);
-      rfx_script_file=g_build_filename (rfx_script_dir,script_name,NULL);
+      rfx_script_dir=lives_build_filename(capable->home_dir,LIVES_CONFIG_DIR,
+                                          PLUGIN_RENDERED_EFFECTS_CUSTOM_SCRIPTS,NULL);
+      rfx_script_file=lives_build_filename(rfx_script_dir,script_name,NULL);
       break;
     default:
       // we will not delete builtins
-      g_free (script_name);
+      lives_free(script_name);
       return;
     }
-    g_free (script_name);
+    lives_free(script_name);
 
     // double check with user
-    msg=g_strdup_printf (_ ("\n\nReally delete RFX script\n%s ?\n\n"),rfx_script_file);
-    if (!do_warning_dialog (msg)) {
-      g_free (msg);
-      g_free (rfx_script_file);
-      g_free (rfx_script_dir);
+    msg=lives_strdup_printf(_("\n\nReally delete RFX script\n%s ?\n\n"),rfx_script_file);
+    if (!do_warning_dialog(msg)) {
+      lives_free(msg);
+      lives_free(rfx_script_file);
+      lives_free(rfx_script_dir);
       return;
     }
-    g_free (msg);
+    lives_free(msg);
+
+
+    d_print(_("Deleting rfx script %s..."),rfx_script_file);
 
-    msg=g_strdup_printf (_ ("Deleting rfx script %s..."),rfx_script_file);
-    d_print (msg);
-    g_free (msg);
-    if (!(ret=unlink (rfx_script_file))) {
-      gchar *com;
+    if (!(ret=unlink(rfx_script_file))) {
+      char *com;
 #ifndef IS_MINGW
-      com=g_strdup_printf("/bin/rm -rf \"%s\"",rfx_script_dir);
+      com=lives_strdup_printf("%s -rf \"%s\"",capable->rm_cmd,rfx_script_dir);
 #else
-      com=g_strdup_printf("DEL /q \"%s\"",rfx_script_dir);
+      com=lives_strdup_printf("DEL /q \"%s\"",rfx_script_dir);
       lives_system(com,TRUE);
-      g_free(com);
-      com=g_strdup_printf("RMDIR \"%s\"",rfx_script_dir);
+      lives_free(com);
+      com=lives_strdup_printf("RMDIR \"%s\"",rfx_script_dir);
 #endif
       lives_system(com,TRUE);
-      g_free(com);
+      lives_free(com);
       d_print_done();
-      on_rebuild_rfx_activate (NULL,NULL);
-    }
-    else {
+      on_rebuild_rfx_activate(NULL,NULL);
+    } else {
       d_print_failed();
-       msg=g_strdup_printf(_ ("\n\nFailed to delete the script\n%s\nError code was %d\n"),rfx_script_file,ret);
-      do_error_dialog (msg);
-      g_free (msg);
+      msg=lives_strdup_printf(_("\n\nFailed to delete the script\n%s\nError code was %d\n"),rfx_script_file,ret);
+      do_error_dialog(msg);
+      lives_free(msg);
     }
-    g_free (rfx_script_file);
-    g_free (rfx_script_dir);
+    lives_free(rfx_script_file);
+    lives_free(rfx_script_dir);
   }
 }
 
 
-void on_promote_rfx_activate (LiVESMenuItem *menuitem, gpointer user_data) {
-  gchar *rfx_script_from=NULL;
-  gchar *rfx_script_to=NULL;
-  gchar *rfx_dir_from=NULL;
-  gchar *rfx_dir_to=NULL;
-  gchar *script_name=prompt_for_script_name (NULL,RFX_STATUS_TEST);
-  gchar *msg;
+void on_promote_rfx_activate(LiVESMenuItem *menuitem, livespointer user_data) {
+  char *rfx_script_from=NULL;
+  char *rfx_script_to=NULL;
+  char *rfx_dir_from=NULL;
+  char *rfx_dir_to=NULL;
+  char *script_name=prompt_for_script_name(NULL,RFX_STATUS_TEST);
+  char *msg;
   int ret=0;
   boolean failed=TRUE;
 
   if (script_name==NULL) return;  // user cancelled
 
-  if (strlen (script_name)) {
-    rfx_dir_from=g_build_filename (capable->home_dir,LIVES_CONFIG_DIR,
-				   PLUGIN_RENDERED_EFFECTS_TEST_SCRIPTS,NULL);
+  if (strlen(script_name)) {
+    rfx_dir_from=lives_build_filename(capable->home_dir,LIVES_CONFIG_DIR,
+                                      PLUGIN_RENDERED_EFFECTS_TEST_SCRIPTS,NULL);
 
-    rfx_script_from=g_build_filename (rfx_dir_from,script_name,NULL);
+    rfx_script_from=lives_build_filename(rfx_dir_from,script_name,NULL);
 
 
-    rfx_dir_to=g_build_filename (capable->home_dir,LIVES_CONFIG_DIR,
-				 PLUGIN_RENDERED_EFFECTS_CUSTOM_SCRIPTS,NULL);
+    rfx_dir_to=lives_build_filename(capable->home_dir,LIVES_CONFIG_DIR,
+                                    PLUGIN_RENDERED_EFFECTS_CUSTOM_SCRIPTS,NULL);
 
 
-    rfx_script_to=g_build_filename (rfx_dir_to,script_name,NULL);
+    rfx_script_to=lives_build_filename(rfx_dir_to,script_name,NULL);
 
-    if (g_file_test (rfx_script_to, G_FILE_TEST_EXISTS)) {
-      gchar *msg=g_strdup_printf (_ ("\nCustom script file:\n%s\nalready exists.\nPlease delete it first, or rename the test script.\n"),script_name);
-      do_blocking_error_dialog (msg);
-      g_free (msg);
-      g_free (rfx_dir_from);
-      g_free (rfx_script_from);
-      g_free (rfx_dir_to);
-      g_free (rfx_script_to);
-      g_free (script_name);
+    if (lives_file_test(rfx_script_to, LIVES_FILE_TEST_EXISTS)) {
+      char *msg=lives_strdup_printf(_("\nCustom script file:\n%s\nalready exists.\nPlease delete it first, or rename the test script.\n"),
+                                    script_name);
+      do_blocking_error_dialog(msg);
+      lives_free(msg);
+      lives_free(rfx_dir_from);
+      lives_free(rfx_script_from);
+      lives_free(rfx_dir_to);
+      lives_free(rfx_script_to);
+      lives_free(script_name);
       return;
     }
 
-    msg=g_strdup_printf (_ ("Promoting rfx test plugin %s to custom..."),script_name);
-    d_print (msg);
-    g_free (script_name);
-    g_free (msg);
+    d_print(_("Promoting rfx test plugin %s to custom..."),script_name);
+    lives_free(script_name);
 
-    g_mkdir_with_parents(rfx_dir_to,S_IRWXU);
+    lives_mkdir_with_parents(rfx_dir_to,S_IRWXU);
 
-    if (!(ret=rename (rfx_script_from,rfx_script_to))) {
+    if (!(ret=rename(rfx_script_from,rfx_script_to))) {
       d_print_done();
-      on_rebuild_rfx_activate (NULL,NULL);
+      on_rebuild_rfx_activate(NULL,NULL);
       failed=FALSE;
     }
   }
@@ -4041,146 +3962,142 @@
   if (failed) {
     rmdir(rfx_dir_to);
     d_print_failed();
-    msg=g_strdup_printf(_ ("\n\nFailed to move the plugin script from\n%s to\n%s\nReturn code was %d (%s)\n"),
-			rfx_script_from,rfx_script_to,errno,strerror(errno));
-    do_error_dialog (msg);
-    g_free (msg);
-  }
-  else rmdir(rfx_dir_from);
+    msg=lives_strdup_printf(_("\n\nFailed to move the plugin script from\n%s to\n%s\nReturn code was %d (%s)\n"),
+                            rfx_script_from,rfx_script_to,errno,strerror(errno));
+    do_error_dialog(msg);
+    lives_free(msg);
+  } else rmdir(rfx_dir_from);
 
   if (rfx_script_from!=NULL) {
-    g_free (rfx_dir_from);
-    g_free (rfx_script_from);
-    g_free (rfx_dir_to);
-    g_free (rfx_script_to);
+    lives_free(rfx_dir_from);
+    lives_free(rfx_script_from);
+    lives_free(rfx_dir_to);
+    lives_free(rfx_script_to);
   }
 }
 
 
 
-void on_export_rfx_activate (LiVESMenuItem *menuitem, gpointer user_data) {
-  lives_rfx_status_t status=(lives_rfx_status_t)GPOINTER_TO_INT (user_data);
+void on_export_rfx_activate(LiVESMenuItem *menuitem, livespointer user_data) {
+  lives_rfx_status_t status=(lives_rfx_status_t)LIVES_POINTER_TO_INT(user_data);
+
+  char *script_name=prompt_for_script_name(NULL,status);
+  char *rfx_script_from,*filename;
+  char *com,*tmp,*tmp2;
 
-  gchar *script_name=prompt_for_script_name (NULL,status);
-  gchar *rfx_script_from,*filename;
-  gchar *com,*msg,*tmp,*tmp2;
-  
   if (script_name==NULL||!strlen(script_name)) return;  // user cancelled
 
-  filename = choose_file (NULL,script_name,NULL,LIVES_FILE_CHOOSER_ACTION_SAVE,_ ("LiVES: - Export Script to..."),NULL);
+  filename = choose_file(NULL,script_name,NULL,LIVES_FILE_CHOOSER_ACTION_SAVE,_("LiVES: - Export Script to..."),NULL);
 
   if (filename==NULL) return;
-  
-  rfx_script_from=g_build_filename (capable->home_dir,LIVES_CONFIG_DIR,
-				    PLUGIN_RENDERED_EFFECTS_CUSTOM_SCRIPTS,script_name,NULL);
-
-  msg=g_strdup_printf(_ ("Copying %s to %s..."),rfx_script_from,filename);
-  d_print(msg);
-  g_free(msg);
+
+  rfx_script_from=lives_build_filename(capable->home_dir,LIVES_CONFIG_DIR,
+                                       PLUGIN_RENDERED_EFFECTS_CUSTOM_SCRIPTS,script_name,NULL);
+
+  d_print(_("Copying %s to %s..."),rfx_script_from,filename);
+
 #ifndef IS_MINGW
-  com=g_strdup_printf("/bin/cp \"%s\" \"%s\"",(tmp=g_filename_from_utf8 (rfx_script_from,-1,NULL,NULL,NULL)),
-		      (tmp2=g_filename_from_utf8 (filename,-1,NULL,NULL,NULL)));
+  com=lives_strdup_printf("%s \"%s\" \"%s\"",capable->cp_cmd,(tmp=lives_filename_from_utf8(rfx_script_from,-1,NULL,NULL,NULL)),
+                          (tmp2=lives_filename_from_utf8(filename,-1,NULL,NULL,NULL)));
 #else
-  com=g_strdup_printf("cp.exe \"%s\" \"%s\"",(tmp=g_filename_from_utf8 (rfx_script_from,-1,NULL,NULL,NULL)),
-		      (tmp2=g_filename_from_utf8 (filename,-1,NULL,NULL,NULL)));
+  com=lives_strdup_printf("cp.exe \"%s\" \"%s\"",(tmp=lives_filename_from_utf8(rfx_script_from,-1,NULL,NULL,NULL)),
+                          (tmp2=lives_filename_from_utf8(filename,-1,NULL,NULL,NULL)));
 #endif
   if (system(com)) d_print_failed();
   else d_print_done();
-  g_free(tmp);
-  g_free(tmp2);
-  g_free(com);
-  g_free(rfx_script_from);
-  g_free(filename);
-  g_free (script_name);
+  lives_free(tmp);
+  lives_free(tmp2);
+  lives_free(com);
+  lives_free(rfx_script_from);
+  lives_free(filename);
+  lives_free(script_name);
 }
 
 
-void on_import_rfx_activate (LiVESMenuItem *menuitem, gpointer user_data) {
+void on_import_rfx_activate(LiVESMenuItem *menuitem, livespointer user_data) {
 
-  short status=(short)GPOINTER_TO_INT (user_data);
-  gchar *rfx_script_to,*rfx_dir_to;
-  gchar *com,*msg,*tmp,*tmp2,*tmpx;
-  gchar basename[PATH_MAX];
+  short status=(short)LIVES_POINTER_TO_INT(user_data);
+  char *rfx_script_to,*rfx_dir_to;
+  char *com,*tmp,*tmp2,*tmpx;
+  char basename[PATH_MAX];
 
-  gchar *filename=choose_file(NULL,NULL,NULL,LIVES_FILE_CHOOSER_ACTION_OPEN,_ ("LiVES: Import Script from..."),NULL);
+  char *filename=choose_file(NULL,NULL,NULL,LIVES_FILE_CHOOSER_ACTION_OPEN,_("LiVES: Import Script from..."),NULL);
 
   if (filename==NULL) return;
 
-  g_snprintf (basename,PATH_MAX,"%s",filename);
-  get_basename (basename);
+  lives_snprintf(basename,PATH_MAX,"%s",filename);
+  get_basename(basename);
 
   mainw->com_failed=FALSE;
 
   switch (status) {
   case RFX_STATUS_TEST :
-    rfx_dir_to=g_build_filename (capable->home_dir,LIVES_CONFIG_DIR,PLUGIN_RENDERED_EFFECTS_TEST_SCRIPTS,NULL);
+    rfx_dir_to=lives_build_filename(capable->home_dir,LIVES_CONFIG_DIR,PLUGIN_RENDERED_EFFECTS_TEST_SCRIPTS,NULL);
 
-    g_mkdir_with_parents((tmp=g_filename_from_utf8(rfx_dir_to,-1,NULL,NULL,NULL)),S_IRWXU);
+    lives_mkdir_with_parents((tmp=lives_filename_from_utf8(rfx_dir_to,-1,NULL,NULL,NULL)),S_IRWXU);
 
-    g_free(tmp);
-    rfx_script_to=g_build_filename(rfx_dir_to,basename,NULL);
-    g_free (rfx_dir_to);
+    lives_free(tmp);
+    rfx_script_to=lives_build_filename(rfx_dir_to,basename,NULL);
+    lives_free(rfx_dir_to);
     break;
   case RFX_STATUS_CUSTOM :
-    rfx_dir_to=g_build_filename (capable->home_dir,LIVES_CONFIG_DIR,PLUGIN_RENDERED_EFFECTS_CUSTOM_SCRIPTS,NULL);
+    rfx_dir_to=lives_build_filename(capable->home_dir,LIVES_CONFIG_DIR,PLUGIN_RENDERED_EFFECTS_CUSTOM_SCRIPTS,NULL);
 
-    g_mkdir_with_parents((tmp=g_filename_from_utf8(rfx_dir_to,-1,NULL,NULL,NULL)),S_IRWXU);
+    lives_mkdir_with_parents((tmp=lives_filename_from_utf8(rfx_dir_to,-1,NULL,NULL,NULL)),S_IRWXU);
 
-    g_free(tmp);
-    rfx_script_to=g_build_filename (rfx_dir_to,basename,NULL);
-    g_free (rfx_dir_to);
+    lives_free(tmp);
+    rfx_script_to=lives_build_filename(rfx_dir_to,basename,NULL);
+    lives_free(rfx_dir_to);
     break;
   default :
-    rfx_script_to=g_build_filename (prefs->prefix_dir,PLUGIN_SCRIPTS_DIR,
-				    PLUGIN_RENDERED_EFFECTS_BUILTIN_SCRIPTS,basename,NULL);
+    rfx_script_to=lives_build_filename(prefs->prefix_dir,PLUGIN_SCRIPTS_DIR,
+                                       PLUGIN_RENDERED_EFFECTS_BUILTIN_SCRIPTS,basename,NULL);
     break;
   }
 
   if (mainw->com_failed) {
-    g_free (rfx_script_to);
-    g_free (filename);
+    lives_free(rfx_script_to);
+    lives_free(filename);
     return;
   }
 
-  if (g_file_test (rfx_script_to, G_FILE_TEST_EXISTS)) {
+  if (lives_file_test(rfx_script_to, LIVES_FILE_TEST_EXISTS)) {
     // needs switch...eventually
-    do_blocking_error_dialog ((tmpx=g_strdup_printf 
-			       (_("\nCustom script file:\n%s\nalready exists.\nPlease delete it first, or rename the import script.\n"),basename)));
-    g_free(tmpx);
-    g_free (rfx_script_to);
-    g_free (filename);
+    do_blocking_error_dialog((tmpx=lives_strdup_printf
+                                   (_("\nCustom script file:\n%s\nalready exists.\nPlease delete it first, or rename the import script.\n"),basename)));
+    lives_free(tmpx);
+    lives_free(rfx_script_to);
+    lives_free(filename);
     return;
   }
 
+  d_print(_("Copying %s to %s..."),filename,rfx_script_to);
 
-  msg=g_strdup_printf(_ ("Copying %s to %s..."),filename,rfx_script_to);
-  d_print(msg);
-  g_free(msg);
 #ifndef IS_MINGW
-  com=g_strdup_printf("/bin/cp \"%s\" \"%s\"",(tmp=g_filename_from_utf8(filename,-1,NULL,NULL,NULL)),
-		      (tmp2=g_filename_from_utf8(rfx_script_to,-1,NULL,NULL,NULL)));
+  com=lives_strdup_printf("%s \"%s\" \"%s\"",capable->cp_cmd,(tmp=lives_filename_from_utf8(filename,-1,NULL,NULL,NULL)),
+                          (tmp2=lives_filename_from_utf8(rfx_script_to,-1,NULL,NULL,NULL)));
 #else
-  com=g_strdup_printf("cp.exe \"%s\" \"%s\"",(tmp=g_filename_from_utf8(filename,-1,NULL,NULL,NULL)),
-		      (tmp2=g_filename_from_utf8(rfx_script_to,-1,NULL,NULL,NULL)));
+  com=lives_strdup_printf("cp.exe \"%s\" \"%s\"",(tmp=lives_filename_from_utf8(filename,-1,NULL,NULL,NULL)),
+                          (tmp2=lives_filename_from_utf8(rfx_script_to,-1,NULL,NULL,NULL)));
 #endif
-  g_free(tmp);
-  g_free(tmp2);
+  lives_free(tmp);
+  lives_free(tmp2);
   if (system(com)) d_print_failed();
   else {
     d_print_done();
-    on_rebuild_rfx_activate (NULL,NULL);
+    on_rebuild_rfx_activate(NULL,NULL);
   }
-  g_free(com);
-  g_free(rfx_script_to);
-  g_free(filename);
+  lives_free(com);
+  lives_free(rfx_script_to);
+  lives_free(filename);
 }
 
 
 
-gchar *prompt_for_script_name(const gchar *sname, lives_rfx_status_t status) {
+char *prompt_for_script_name(const char *sname, lives_rfx_status_t status) {
   // show dialog to get script name of rfx plugin dependant on type
   // set type to RFX_STATUS_ANY to let user pick type as well
-  // return value should be g_free'd after use
+  // return value should be lives_free'd after use
   // beware: if the user cancels, return value is NULL
 
   // sname is suggested name, set it to NULL to prompt for a name from
@@ -4191,11 +4108,11 @@
 
   // in rename mode a test script will be copied to another test script
 
-  gchar *name=NULL;
-  gchar *from_name;
-  gchar *from_status;
-  gchar *rfx_script_from;
-  gchar *rfx_script_to;
+  char *name=NULL;
+  char *from_name;
+  char *from_status;
+  char *rfx_script_from;
+  char *rfx_script_to;
 
   rfx_build_window_t *rfxbuilder;
 
@@ -4211,7 +4128,7 @@
   LiVESWidget *dialog_action_area;
   LiVESWidget *cancelbutton;
 
-  GList *status_list=NULL;
+  LiVESList *status_list=NULL;
 
   boolean copy_mode=FALSE;
   boolean rename_mode=FALSE;
@@ -4219,12 +4136,12 @@
 
   if (status==RFX_STATUS_COPY) {
     copy_mode=TRUE;
-    status_list = g_list_append (status_list, g_strdup(mainw->string_constants[LIVES_STRING_CONSTANT_BUILTIN]));
-    status_list = g_list_append (status_list, g_strdup(mainw->string_constants[LIVES_STRING_CONSTANT_CUSTOM]));
-    status_list = g_list_append (status_list, g_strdup(mainw->string_constants[LIVES_STRING_CONSTANT_TEST]));
+    status_list = lives_list_append(status_list, lives_strdup(mainw->string_constants[LIVES_STRING_CONSTANT_BUILTIN]));
+    status_list = lives_list_append(status_list, lives_strdup(mainw->string_constants[LIVES_STRING_CONSTANT_CUSTOM]));
+    status_list = lives_list_append(status_list, lives_strdup(mainw->string_constants[LIVES_STRING_CONSTANT_TEST]));
   }
 
-  dialog = lives_standard_dialog_new (NULL,FALSE);
+  dialog = lives_standard_dialog_new(NULL,FALSE,-1,-1);
 
   if (prefs->show_gui) {
     lives_window_set_transient_for(LIVES_WINDOW(dialog),LIVES_WINDOW(mainw->LiVES));
@@ -4232,194 +4149,188 @@
 
   vbox = lives_dialog_get_content_area(LIVES_DIALOG(dialog));
 
-  hbox = lives_hbox_new (FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
+  hbox = lives_hbox_new(FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
 
-  vbox = lives_vbox_new (FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (hbox), vbox, FALSE, FALSE, widget_opts.packing_width);
+  vbox = lives_vbox_new(FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(hbox), vbox, FALSE, FALSE, widget_opts.packing_width);
 
   add_fill_to_box(LIVES_BOX(vbox));
 
-  hbox = lives_hbox_new (FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
+  hbox = lives_hbox_new(FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
 
   add_fill_to_box(LIVES_BOX(vbox));
-  
+
   if (copy_mode) {
-    lives_window_set_title (LIVES_WINDOW (dialog), _("LiVES: - Copy RFX Script"));
+    lives_window_set_title(LIVES_WINDOW(dialog), _("LiVES: - Copy RFX Script"));
 
-    status_combo = lives_standard_combo_new (_ ("_From type:    "),TRUE,status_list,LIVES_BOX(hbox),NULL);
+    status_combo = lives_standard_combo_new(_("_From type:    "),TRUE,status_list,LIVES_BOX(hbox),NULL);
 
     status_combo_entry = lives_combo_get_entry(LIVES_COMBO(status_combo));
 
-    g_list_free_strings (status_list);
-    g_list_free (status_list);
+    lives_list_free_strings(status_list);
+    lives_list_free(status_list);
 
-    label = lives_standard_label_new (_ ("   Script:    "));
-    lives_widget_show (label);
-    lives_box_pack_start (LIVES_BOX (hbox), label, FALSE, FALSE, widget_opts.packing_width);
+    label = lives_standard_label_new(_("   Script:    "));
+    lives_widget_show(label);
+    lives_box_pack_start(LIVES_BOX(hbox), label, FALSE, FALSE, widget_opts.packing_width);
     if (palette->style&STYLE_1) {
-      lives_widget_set_fg_color (label, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
+      lives_widget_set_fg_color(label, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
     }
-  }
-  else {
+  } else {
     if (status==RFX_STATUS_RENAME) {
-      lives_window_set_title (LIVES_WINDOW (dialog), _("LiVES: - Rename test RFX Script"));
-      label = lives_standard_label_new (_ ("From script: "));
+      lives_window_set_title(LIVES_WINDOW(dialog), _("LiVES: - Rename test RFX Script"));
+      label = lives_standard_label_new(_("From script: "));
       rename_mode=TRUE;
       status=RFX_STATUS_TEST;
+    } else {
+      lives_window_set_title(LIVES_WINDOW(dialog), _("LiVES: - RFX Script name"));
+      label = lives_standard_label_new(_("Script name: "));
     }
-    else {
-      lives_window_set_title (LIVES_WINDOW (dialog), _("LiVES: - RFX Script name"));
-      label = lives_standard_label_new (_ ("Script name: "));
-    }
-    lives_box_pack_start (LIVES_BOX (hbox), label, FALSE, FALSE, 0);
+    lives_box_pack_start(LIVES_BOX(hbox), label, FALSE, FALSE, 0);
   }
-  
-  
+
+
   if (sname==NULL||copy_mode||rename_mode) {
-    script_combo = lives_combo_new ();
+    script_combo = lives_combo_new();
 
     name_entry = script_combo_entry = lives_combo_get_entry(LIVES_COMBO(script_combo));
-    lives_entry_set_editable (LIVES_ENTRY(name_entry),FALSE);
-    lives_box_pack_start (LIVES_BOX (hbox), script_combo, TRUE, TRUE, widget_opts.packing_width);
+    lives_entry_set_editable(LIVES_ENTRY(name_entry),FALSE);
+    lives_box_pack_start(LIVES_BOX(hbox), script_combo, TRUE, TRUE, widget_opts.packing_width);
   }
   if (sname!=NULL||copy_mode||rename_mode) {
     // name_entry becomes a normal lives_entry
     name_entry=lives_entry_new();
 
     if (copy_mode) {
-      lives_signal_connect (LIVES_GUI_OBJECT(status_combo),LIVES_WIDGET_CHANGED_EVENT,LIVES_GUI_CALLBACK (on_script_status_changed),
-			(gpointer)script_combo);
-      label = lives_standard_label_new (_ ("New name: "));
+      lives_signal_connect(LIVES_GUI_OBJECT(status_combo),LIVES_WIDGET_CHANGED_SIGNAL,LIVES_GUI_CALLBACK(on_script_status_changed),
+                           (livespointer)script_combo);
+      label = lives_standard_label_new(_("New name: "));
     }
     if (rename_mode) {
-      label = lives_standard_label_new (_ ("New script name: "));
+      label = lives_standard_label_new(_("New script name: "));
     }
     if (copy_mode||rename_mode) {
-      hbox = lives_hbox_new (FALSE, 0);
-      lives_box_pack_start (LIVES_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
-      lives_box_pack_start (LIVES_BOX (hbox), label, FALSE, FALSE, widget_opts.packing_width);
+      hbox = lives_hbox_new(FALSE, 0);
+      lives_box_pack_start(LIVES_BOX(vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
+      lives_box_pack_start(LIVES_BOX(hbox), label, FALSE, FALSE, widget_opts.packing_width);
+    } else {
+      lives_entry_set_text(LIVES_ENTRY(name_entry),sname);
     }
-    else {
-      lives_entry_set_text (LIVES_ENTRY (name_entry),sname);
-    }
-    lives_box_pack_start (LIVES_BOX (hbox), name_entry, TRUE, TRUE, widget_opts.packing_width);
+    lives_box_pack_start(LIVES_BOX(hbox), name_entry, TRUE, TRUE, widget_opts.packing_width);
   }
-  lives_widget_grab_focus (name_entry);
-  lives_entry_set_activates_default (LIVES_ENTRY (name_entry), TRUE);
+  lives_widget_grab_focus(name_entry);
+  lives_entry_set_activates_default(LIVES_ENTRY(name_entry), TRUE);
 
 
-  dialog_action_area = lives_dialog_get_action_area(LIVES_DIALOG (dialog));
-  lives_widget_show (dialog_action_area);
-  lives_button_box_set_layout (LIVES_BUTTON_BOX (dialog_action_area), LIVES_BUTTONBOX_END);
+  dialog_action_area = lives_dialog_get_action_area(LIVES_DIALOG(dialog));
+  lives_widget_show(dialog_action_area);
+  lives_button_box_set_layout(LIVES_BUTTON_BOX(dialog_action_area), LIVES_BUTTONBOX_END);
 
-  cancelbutton = lives_button_new_from_stock (LIVES_STOCK_CANCEL);
-  lives_dialog_add_action_widget (LIVES_DIALOG (dialog), cancelbutton, LIVES_RESPONSE_CANCEL);
+  cancelbutton = lives_button_new_from_stock(LIVES_STOCK_CANCEL);
+  lives_dialog_add_action_widget(LIVES_DIALOG(dialog), cancelbutton, LIVES_RESPONSE_CANCEL);
 
-  copy_script_okbutton = lives_button_new_from_stock (LIVES_STOCK_OK);
-  lives_dialog_add_action_widget (LIVES_DIALOG (dialog), copy_script_okbutton, LIVES_RESPONSE_OK);
-  lives_widget_set_can_focus_and_default (copy_script_okbutton);
-  lives_widget_grab_default (copy_script_okbutton); 
+  copy_script_okbutton = lives_button_new_from_stock(LIVES_STOCK_OK);
+  lives_dialog_add_action_widget(LIVES_DIALOG(dialog), copy_script_okbutton, LIVES_RESPONSE_OK);
+  lives_widget_set_can_focus_and_default(copy_script_okbutton);
+  lives_widget_grab_default(copy_script_okbutton);
 
   lives_widget_show_all(dialog);
 
-  if (status_combo!=NULL) on_script_status_changed(LIVES_COMBO(status_combo),(gpointer)script_combo);
+  if (status_combo!=NULL) on_script_status_changed(LIVES_COMBO(status_combo),(livespointer)script_combo);
   else if (script_combo!=NULL) populate_script_combo(LIVES_COMBO(script_combo), status);
 
   do {
     OK=TRUE;
-    if (lives_dialog_run(LIVES_DIALOG (dialog))==LIVES_RESPONSE_OK) {
-      if (name!=NULL) g_free (name);
-      name=g_strdup(lives_entry_get_text (LIVES_ENTRY (name_entry)));
+    if (lives_dialog_run(LIVES_DIALOG(dialog))==LIVES_RESPONSE_OK) {
+      if (name!=NULL) lives_free(name);
+      name=lives_strdup(lives_entry_get_text(LIVES_ENTRY(name_entry)));
       if (copy_mode) {
-	if (find_rfx_plugin_by_name (name,RFX_STATUS_TEST)>-1||
-	    find_rfx_plugin_by_name (name,RFX_STATUS_CUSTOM)>-1||
-	    find_rfx_plugin_by_name (name,RFX_STATUS_BUILTIN)>-1) {
-	  do_blocking_error_dialog (_ ("\n\nThere is already a plugin with this name.\nName must be unique.\n"));
-	  OK=FALSE;
-	}
-	//copy selected script to test
-	else {
-	  from_name=g_strdup(lives_entry_get_text (LIVES_ENTRY (script_combo_entry)));
-	  from_status=g_strdup(lives_entry_get_text (LIVES_ENTRY (status_combo_entry)));
-	  if (!strcmp (from_status,mainw->string_constants[LIVES_STRING_CONSTANT_BUILTIN])) status=RFX_STATUS_BUILTIN;
-	  else {
-	    if (!strcmp (from_status,mainw->string_constants[LIVES_STRING_CONSTANT_CUSTOM])) status=RFX_STATUS_CUSTOM;
-	    else status=RFX_STATUS_TEST;
-	  }
-
-	  if ((rfxbuilder=make_rfx_build_window (from_name,status))==NULL) {
-	    // invalid name
-	    OK=FALSE;
-	  }
-
-	  g_free (from_name);
-	  g_free (from_status);
-
-	  if (OK) {
-	    lives_entry_set_text (LIVES_ENTRY (rfxbuilder->name_entry),name);
-	    rfxbuilder->mode=RFX_BUILDER_MODE_COPY;
-	    lives_widget_show (rfxbuilder->dialog);
-	  }
-	}
+        if (find_rfx_plugin_by_name(name,RFX_STATUS_TEST)>-1||
+            find_rfx_plugin_by_name(name,RFX_STATUS_CUSTOM)>-1||
+            find_rfx_plugin_by_name(name,RFX_STATUS_BUILTIN)>-1) {
+          do_blocking_error_dialog(_("\n\nThere is already a plugin with this name.\nName must be unique.\n"));
+          OK=FALSE;
+        }
+        //copy selected script to test
+        else {
+          from_name=lives_strdup(lives_entry_get_text(LIVES_ENTRY(script_combo_entry)));
+          from_status=lives_strdup(lives_entry_get_text(LIVES_ENTRY(status_combo_entry)));
+          if (!strcmp(from_status,mainw->string_constants[LIVES_STRING_CONSTANT_BUILTIN])) status=RFX_STATUS_BUILTIN;
+          else {
+            if (!strcmp(from_status,mainw->string_constants[LIVES_STRING_CONSTANT_CUSTOM])) status=RFX_STATUS_CUSTOM;
+            else status=RFX_STATUS_TEST;
+          }
+
+          if ((rfxbuilder=make_rfx_build_window(from_name,status))==NULL) {
+            // invalid name
+            OK=FALSE;
+          }
+
+          lives_free(from_name);
+          lives_free(from_status);
+
+          if (OK) {
+            lives_entry_set_text(LIVES_ENTRY(rfxbuilder->name_entry),name);
+            rfxbuilder->mode=RFX_BUILDER_MODE_COPY;
+            lives_widget_show(rfxbuilder->dialog);
+          }
+        }
       }
       if (rename_mode) {
-	GList *nmlist=NULL;
-	gchar *xname=ensure_extension(name,".script");
+        LiVESList *nmlist=NULL;
+        char *xname=ensure_extension(name,".script");
 
-	if (name !=NULL&&g_list_find ((nmlist=get_script_list (status)),xname)!=NULL) {
-	  do_blocking_error_dialog (_ ("\n\nThere is already a test script with this name.\nScript name must be unique.\n"));
-	  OK=FALSE;
-	}
-	else {
-	  int ret;
-	  gchar *tmp;
-
-	  from_name=g_strdup(lives_entry_get_text (LIVES_ENTRY (script_combo_entry)));
-	  rfx_script_from=g_build_filename (capable->home_dir,LIVES_CONFIG_DIR,
-					    PLUGIN_RENDERED_EFFECTS_TEST_SCRIPTS,from_name,NULL);
-	  rfx_script_to=g_build_filename (capable->home_dir,LIVES_CONFIG_DIR,
-					  PLUGIN_RENDERED_EFFECTS_TEST_SCRIPTS,xname,NULL);
-	  d_print ((tmp=g_strdup_printf (_ ("Renaming RFX test script %s to %s..."),from_name,xname)));
-	  g_free(tmp);
-	  g_free (from_name);
-
-	  if ((ret=rename (rfx_script_from,rfx_script_to))) {
-	    d_print_failed();
-	    do_error_dialog ((tmp=g_strdup_printf(_ ("\n\nFailed to move the plugin script from\n%s to\n%s\nReturn code was %d\n"),rfx_script_from,rfx_script_to,ret)));
-	    g_free(tmp);
-	  }
-	  else {
-	    d_print_done();
-	  }
-	  g_free (rfx_script_from);
-	  g_free (rfx_script_to);
-	}
-	if (nmlist!=NULL) {
-	  g_list_free_strings(nmlist);
-	  g_list_free(nmlist);
-	}
-	g_free(xname);
+        if (name !=NULL&&lives_list_find((nmlist=get_script_list(status)),xname)!=NULL) {
+          do_blocking_error_dialog(_("\n\nThere is already a test script with this name.\nScript name must be unique.\n"));
+          OK=FALSE;
+        } else {
+          int ret;
+          char *tmp;
+
+          from_name=lives_strdup(lives_entry_get_text(LIVES_ENTRY(script_combo_entry)));
+          rfx_script_from=lives_build_filename(capable->home_dir,LIVES_CONFIG_DIR,
+                                               PLUGIN_RENDERED_EFFECTS_TEST_SCRIPTS,from_name,NULL);
+          rfx_script_to=lives_build_filename(capable->home_dir,LIVES_CONFIG_DIR,
+                                             PLUGIN_RENDERED_EFFECTS_TEST_SCRIPTS,xname,NULL);
+          d_print(_("Renaming RFX test script %s to %s..."),from_name,xname);
+          lives_free(from_name);
+
+          if ((ret=rename(rfx_script_from,rfx_script_to))) {
+            d_print_failed();
+            do_error_dialog((tmp=lives_strdup_printf(_("\n\nFailed to move the plugin script from\n%s to\n%s\nReturn code was %d\n"),rfx_script_from,
+                                 rfx_script_to,ret)));
+            lives_free(tmp);
+          } else {
+            d_print_done();
+          }
+          lives_free(rfx_script_from);
+          lives_free(rfx_script_to);
+        }
+        if (nmlist!=NULL) {
+          lives_list_free_strings(nmlist);
+          lives_list_free(nmlist);
+        }
+        lives_free(xname);
       }
     }
   } while (!OK);
 
-  lives_widget_destroy (dialog);
+  lives_widget_destroy(dialog);
   return name;
 }
 
 
 void populate_script_combo(LiVESCombo *script_combo, lives_rfx_status_t status) {
-  GList *list=NULL;
-  lives_combo_populate (script_combo, (list=get_script_list (status)));
+  LiVESList *list=NULL;
+  lives_combo_populate(script_combo, (list=get_script_list(status)));
   if (list!=NULL) {
     lives_combo_set_active_index(script_combo,0);
     lives_widget_set_sensitive(copy_script_okbutton,TRUE);
-    g_list_free_strings(list);
-    g_list_free(list);
-  }
-  else {
+    lives_list_free_strings(list);
+    lives_list_free(list);
+  } else {
     lives_combo_set_active_string(script_combo,"");
     lives_widget_set_sensitive(copy_script_okbutton,FALSE);
   }
@@ -4427,42 +4338,40 @@
 
 
 
-void on_script_status_changed (LiVESCombo *status_combo, gpointer user_data) {
-  gchar *text=lives_combo_get_active_text(status_combo);
+void on_script_status_changed(LiVESCombo *status_combo, livespointer user_data) {
+  char *text=lives_combo_get_active_text(status_combo);
   LiVESWidget *script_combo=(LiVESWidget *)user_data;
 
-  if (script_combo==NULL||!LIVES_IS_COMBO (script_combo)) return;
+  if (script_combo==NULL||!LIVES_IS_COMBO(script_combo)) return;
 
-  if (!(strcmp (text,mainw->string_constants[LIVES_STRING_CONSTANT_BUILTIN]))) {
+  if (!(strcmp(text,mainw->string_constants[LIVES_STRING_CONSTANT_BUILTIN]))) {
     populate_script_combo(LIVES_COMBO(script_combo),RFX_STATUS_BUILTIN);
-  }
-  else {
-    if (!(strcmp (text,mainw->string_constants[LIVES_STRING_CONSTANT_CUSTOM]))) {
+  } else {
+    if (!(strcmp(text,mainw->string_constants[LIVES_STRING_CONSTANT_CUSTOM]))) {
       populate_script_combo(LIVES_COMBO(script_combo),RFX_STATUS_CUSTOM);
-    }
-    else {
-      if (!(strcmp (text,mainw->string_constants[LIVES_STRING_CONSTANT_TEST]))) {
-	populate_script_combo(LIVES_COMBO(script_combo),RFX_STATUS_TEST);
+    } else {
+      if (!(strcmp(text,mainw->string_constants[LIVES_STRING_CONSTANT_TEST]))) {
+        populate_script_combo(LIVES_COMBO(script_combo),RFX_STATUS_TEST);
       }
     }
   }
-  g_free (text);
+  lives_free(text);
 }
 
 
-GList *get_script_list (short status) {
-  GList *script_list=NULL;
+LiVESList *get_script_list(short status) {
+  LiVESList *script_list=NULL;
 
   switch (status) {
   case RFX_STATUS_TEST :
-    script_list=get_plugin_list (PLUGIN_RENDERED_EFFECTS_TEST_SCRIPTS,TRUE,NULL,"script");
+    script_list=get_plugin_list(PLUGIN_RENDERED_EFFECTS_TEST_SCRIPTS,TRUE,NULL,"script");
     break;
   case RFX_STATUS_CUSTOM :
-    script_list=get_plugin_list (PLUGIN_RENDERED_EFFECTS_CUSTOM_SCRIPTS,TRUE,NULL,"script");
+    script_list=get_plugin_list(PLUGIN_RENDERED_EFFECTS_CUSTOM_SCRIPTS,TRUE,NULL,"script");
     break;
   case RFX_STATUS_BUILTIN :
   case RFX_STATUS_COPY :
-    script_list=get_plugin_list (PLUGIN_RENDERED_EFFECTS_BUILTIN_SCRIPTS,TRUE,NULL,"script");
+    script_list=get_plugin_list(PLUGIN_RENDERED_EFFECTS_BUILTIN_SCRIPTS,TRUE,NULL,"script");
     break;
   }
   return script_list;
@@ -4473,15 +4382,15 @@
 
 void add_rfx_effects(void) {
   // scan render plugin directories, create a rfx array, and add each to the appropriate menu area
-  GList *rfx_builtin_list=NULL;
-  GList *rfx_custom_list=NULL;
-  GList *rfx_test_list=NULL;
+  LiVESList *rfx_builtin_list=NULL;
+  LiVESList *rfx_custom_list=NULL;
+  LiVESList *rfx_test_list=NULL;
 
 
   lives_rfx_t *rfx=NULL;
   lives_rfx_t *rendered_fx;
 
-  gchar txt[64]; // menu text
+  char txt[64]; // menu text
 
 #if LIVES_HAS_IMAGE_MENU_ITEM
   LiVESWidget *rfx_image;
@@ -4506,32 +4415,32 @@
   // exterminate...all...menuentries....
   // TODO - account for case where we only have apply_realtime (i.e add 1 to builtin count)
   if (mainw->num_rendered_effects_builtin) {
-    for (i=0;i<=mainw->num_rendered_effects_builtin+mainw->num_rendered_effects_custom
-	   +mainw->num_rendered_effects_test;i++) {
+    for (i=0; i<=mainw->num_rendered_effects_builtin+mainw->num_rendered_effects_custom
+         +mainw->num_rendered_effects_test; i++) {
       if (mainw->rendered_fx!=NULL) {
-	if (mainw->rendered_fx[i].menuitem!=NULL) {
-	  lives_widget_destroy(mainw->rendered_fx[i].menuitem);
-	  threaded_dialog_spin();
-	}
+        if (mainw->rendered_fx[i].menuitem!=NULL) {
+          lives_widget_destroy(mainw->rendered_fx[i].menuitem);
+          threaded_dialog_spin();
+        }
       }
     }
-    
+
     threaded_dialog_spin();
 
     if (mainw->rte_separator!=NULL) {
-      if (mainw->custom_effects_separator!=NULL) lives_widget_destroy (mainw->custom_effects_separator);
-      if (mainw->custom_effects_menu!=NULL) lives_widget_destroy (mainw->custom_effects_menu);
-      if (mainw->custom_effects_submenu!=NULL) lives_widget_destroy (mainw->custom_effects_submenu);
-      if (mainw->custom_gens_menu!=NULL) lives_widget_destroy (mainw->custom_gens_menu);
-      if (mainw->custom_gens_submenu!=NULL) lives_widget_destroy (mainw->custom_gens_submenu);
-      if (mainw->gens_menu!=NULL) lives_widget_destroy (mainw->gens_menu);
-
-      if (mainw->custom_utilities_separator!=NULL) lives_widget_destroy (mainw->custom_utilities_separator);
-      if (mainw->custom_utilities_menu!=NULL) lives_widget_destroy (mainw->custom_utilities_menu);
-      if (mainw->custom_utilities_submenu!=NULL) lives_widget_destroy (mainw->custom_utilities_submenu);
-      if (mainw->custom_tools_menu!=NULL) lives_widget_destroy (mainw->custom_tools_menu);
-      if (mainw->utilities_menu!=NULL) lives_widget_destroy (mainw->utilities_menu);
-      if (mainw->run_test_rfx_menu!=NULL) lives_widget_destroy (mainw->run_test_rfx_menu);
+      if (mainw->custom_effects_separator!=NULL) lives_widget_destroy(mainw->custom_effects_separator);
+      if (mainw->custom_effects_menu!=NULL) lives_widget_destroy(mainw->custom_effects_menu);
+      if (mainw->custom_effects_submenu!=NULL) lives_widget_destroy(mainw->custom_effects_submenu);
+      if (mainw->custom_gens_menu!=NULL) lives_widget_destroy(mainw->custom_gens_menu);
+      if (mainw->custom_gens_submenu!=NULL) lives_widget_destroy(mainw->custom_gens_submenu);
+      if (mainw->gens_menu!=NULL) lives_widget_destroy(mainw->gens_menu);
+
+      if (mainw->custom_utilities_separator!=NULL) lives_widget_destroy(mainw->custom_utilities_separator);
+      if (mainw->custom_utilities_menu!=NULL) lives_widget_destroy(mainw->custom_utilities_menu);
+      if (mainw->custom_utilities_submenu!=NULL) lives_widget_destroy(mainw->custom_utilities_submenu);
+      if (mainw->custom_tools_menu!=NULL) lives_widget_destroy(mainw->custom_tools_menu);
+      if (mainw->utilities_menu!=NULL) lives_widget_destroy(mainw->utilities_menu);
+      if (mainw->run_test_rfx_menu!=NULL) lives_widget_destroy(mainw->run_test_rfx_menu);
     }
 
     lives_widget_queue_draw(mainw->effects_menu);
@@ -4549,7 +4458,7 @@
   make_custom_submenus();
 
   mainw->run_test_rfx_menu=lives_menu_new();
-  lives_menu_item_set_submenu (LIVES_MENU_ITEM (mainw->run_test_rfx_submenu), mainw->run_test_rfx_menu);
+  lives_menu_item_set_submenu(LIVES_MENU_ITEM(mainw->run_test_rfx_submenu), mainw->run_test_rfx_menu);
   if (palette->style&STYLE_1) {
     lives_widget_set_bg_color(mainw->run_test_rfx_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
     lives_widget_set_fg_color(mainw->run_test_rfx_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars_fore);
@@ -4557,7 +4466,7 @@
   lives_widget_show(mainw->run_test_rfx_menu);
 
   mainw->custom_effects_menu=lives_menu_new();
-  lives_menu_item_set_submenu (LIVES_MENU_ITEM (mainw->custom_effects_submenu), mainw->custom_effects_menu);
+  lives_menu_item_set_submenu(LIVES_MENU_ITEM(mainw->custom_effects_submenu), mainw->custom_effects_menu);
   if (palette->style&STYLE_1) {
     lives_widget_set_bg_color(mainw->custom_effects_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
     lives_widget_set_fg_color(mainw->custom_effects_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars_fore);
@@ -4565,7 +4474,7 @@
 
   mainw->custom_tools_menu=lives_menu_new();
 
-  lives_menu_item_set_submenu (LIVES_MENU_ITEM (mainw->custom_tools_submenu), mainw->custom_tools_menu);
+  lives_menu_item_set_submenu(LIVES_MENU_ITEM(mainw->custom_tools_submenu), mainw->custom_tools_menu);
   if (palette->style&STYLE_1) {
     lives_widget_set_bg_color(mainw->custom_tools_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
     lives_widget_set_fg_color(mainw->custom_tools_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars_fore);
@@ -4585,30 +4494,29 @@
   allow_nonex=TRUE;
 #endif
 
-  rfx_custom_list=get_plugin_list (PLUGIN_RENDERED_EFFECTS_CUSTOM,allow_nonex,NULL,NULL);
-  rfx_custom_list_length=g_list_length(rfx_custom_list);
+  rfx_custom_list=get_plugin_list(PLUGIN_RENDERED_EFFECTS_CUSTOM,allow_nonex,NULL,NULL);
+  rfx_custom_list_length=lives_list_length(rfx_custom_list);
+
+  rfx_test_list=get_plugin_list(PLUGIN_RENDERED_EFFECTS_TEST,allow_nonex,NULL,NULL);
+  rfx_test_list_length=lives_list_length(rfx_test_list);
 
-  rfx_test_list=get_plugin_list (PLUGIN_RENDERED_EFFECTS_TEST,allow_nonex,NULL,NULL);
-  rfx_test_list_length=g_list_length(rfx_test_list);
-    
-  if ((rfx_builtin_list=get_plugin_list (PLUGIN_RENDERED_EFFECTS_BUILTIN,allow_nonex,NULL,NULL))==NULL) {
+  if ((rfx_builtin_list=get_plugin_list(PLUGIN_RENDERED_EFFECTS_BUILTIN,allow_nonex,NULL,NULL))==NULL) {
     do_rendered_fx_dialog();
-  }
-  else {
-    rfx_builtin_list_length=g_list_length(rfx_builtin_list);
+  } else {
+    rfx_builtin_list_length=lives_list_length(rfx_builtin_list);
   }
 #endif
 
   rfx_list_length=rfx_builtin_list_length+rfx_custom_list_length+rfx_test_list_length;
 
   threaded_dialog_spin();
-    
-  rendered_fx=(lives_rfx_t *)g_malloc ((rfx_list_length+1)*sizeof(lives_rfx_t));
-  
+
+  rendered_fx=(lives_rfx_t *)lives_malloc((rfx_list_length+1)*sizeof(lives_rfx_t));
+
   // use rfx[0] as "Apply realtime fx"
-  rendered_fx[0].name=g_strdup("realtime_fx");
-  rendered_fx[0].menu_text=g_strdup (_("_Apply Real Time Effects to Selection"));
-  rendered_fx[0].action_desc=g_strdup ("Applying Current Real Time Effects to");
+  rendered_fx[0].name=lives_strdup("realtime_fx");
+  rendered_fx[0].menu_text=lives_strdup(_("_Apply Real Time Effects to Selection"));
+  rendered_fx[0].action_desc=lives_strdup("Applying Current Real Time Effects to");
 
   rendered_fx[0].props=0;
   rendered_fx[0].num_params=0;
@@ -4623,46 +4531,46 @@
   rendered_fx[0].source_type=LIVES_RFX_SOURCE_RFX;
 
   if (rfx_list_length) {
-    GList *define=NULL;
-    GList *description=NULL;
-    GList *props=NULL;
-    GList *rfx_list=rfx_builtin_list;
+    LiVESList *define=NULL;
+    LiVESList *description=NULL;
+    LiVESList *props=NULL;
+    LiVESList *rfx_list=rfx_builtin_list;
 
     lives_rfx_status_t status=RFX_STATUS_BUILTIN;
 
-    gchar *type=g_strdup(PLUGIN_RENDERED_EFFECTS_BUILTIN);
-    gchar *plugin_name;
-    gchar *def=NULL;
-    gchar *tmp;
+    char *type=lives_strdup(PLUGIN_RENDERED_EFFECTS_BUILTIN);
+    char *plugin_name;
+    char *def=NULL;
+    char *tmp;
 
     int offset=0;
 
 
-    for (plugin_idx=0;plugin_idx<rfx_list_length;plugin_idx++) {
+    for (plugin_idx=0; plugin_idx<rfx_list_length; plugin_idx++) {
       threaded_dialog_spin();
       if (mainw->splash_window==NULL) {
-	lives_widget_context_update();
+        lives_widget_context_update();
       }
       if (plugin_idx==rfx_builtin_list_length) {
-	g_free(type);
-	type=g_strdup_printf(PLUGIN_RENDERED_EFFECTS_CUSTOM);
-	status=RFX_STATUS_CUSTOM;
-	rfx_list=rfx_custom_list;
-	offset=rfx_builtin_list_length;
+        lives_free(type);
+        type=lives_strdup_printf(PLUGIN_RENDERED_EFFECTS_CUSTOM);
+        status=RFX_STATUS_CUSTOM;
+        rfx_list=rfx_custom_list;
+        offset=rfx_builtin_list_length;
       }
       if (plugin_idx==rfx_builtin_list_length+rfx_custom_list_length) {
-	g_free(type);
-	type=g_strdup(PLUGIN_RENDERED_EFFECTS_TEST);
-	status=RFX_STATUS_TEST;
-	rfx_list=rfx_test_list;
-	offset+=rfx_custom_list_length;
+        lives_free(type);
+        type=lives_strdup(PLUGIN_RENDERED_EFFECTS_TEST);
+        status=RFX_STATUS_TEST;
+        rfx_list=rfx_test_list;
+        offset+=rfx_custom_list_length;
       }
-      
-      plugin_name=g_strdup((gchar *)g_list_nth_data(rfx_list,plugin_idx-offset));
+
+      plugin_name=lives_strdup((char *)lives_list_nth_data(rfx_list,plugin_idx-offset));
 
       if (mainw->splash_window!=NULL) {
-	splash_msg((tmp=g_strdup_printf(_("Loading rendered effect %s..."),plugin_name)),.2);
-	g_free(tmp);
+        splash_msg((tmp=lives_strdup_printf(_("Loading rendered effect %s..."),plugin_name)),.2);
+        lives_free(tmp);
       }
 
 #ifdef DEBUG_RENDER_FX
@@ -4671,133 +4579,132 @@
 
       if ((define=plugin_request_by_line(type,plugin_name,"get_define"))==NULL) {
 #ifdef DEBUG_RENDER_FX
-      g_print("No get_define in %s\n",plugin_name);
+        g_print("No get_define in %s\n",plugin_name);
 #endif
 
-      continue;
+        continue;
       }
-      def=g_strdup((gchar *)g_list_nth_data(define,0));
-      g_list_free_strings(define);
-      g_list_free(define);
+      def=lives_strdup((char *)lives_list_nth_data(define,0));
+      lives_list_free_strings(define);
+      lives_list_free(define);
 
       if (strlen(def)<2) {
 #ifdef DEBUG_RENDER_FX
-	g_print("Invalid get_define in %s\n",plugin_name);
+        g_print("Invalid get_define in %s\n",plugin_name);
 #endif
-	g_free(def);
-	continue;
+        lives_free(def);
+        continue;
       }
       if (make_version_hash(def+1)>make_version_hash(RFX_VERSION)) {
 #ifdef DEBUG_RENDER_FX
-	g_print("Invalid version %s instead of %s in %s\n",def+1,RFX_VERSION,plugin_name);
+        g_print("Invalid version %s instead of %s in %s\n",def+1,RFX_VERSION,plugin_name);
 #endif
-	g_free(def);
-	continue;
+        lives_free(def);
+        continue;
       }
       memset(def+1,0,1);
-      
-      if ((description=plugin_request_common (type,plugin_name,"get_description",def,TRUE))!=NULL&&
-	  (props=plugin_request_common (type,plugin_name,"get_capabilities",def,FALSE))!=NULL&&
-	  g_list_length(description)>3) {
-	rfx=&rendered_fx[rfx_slot_count++];
-	rfx->name=g_strdup(plugin_name);
-	memcpy(rfx->delim,def,2);
-	rfx->menu_text=g_strdup ((gchar *)g_list_nth_data (description,0));
-	rfx->action_desc=g_strdup ((gchar *)g_list_nth_data (description,1));
-	if (!(rfx->min_frames=atoi ((gchar *)g_list_nth_data (description,2)))) rfx->min_frames=1;
-	rfx->num_in_channels=atoi((gchar *)g_list_nth_data (description,3));
-	rfx->status=status;
-	rfx->props=atoi ((gchar *)g_list_nth_data(props,0));
-	rfx->num_params=0;
-	rfx->is_template=FALSE;
-	rfx->params=NULL;
-	rfx->source=NULL;
-	rfx->source_type=LIVES_RFX_SOURCE_RFX;
-	rfx->extra=NULL;
-	rfx->is_template=FALSE;
-	if (!check_rfx_for_lives (rfx)) rfx_slot_count--;
+
+      if ((description=plugin_request_common(type,plugin_name,"get_description",def,TRUE))!=NULL&&
+          (props=plugin_request_common(type,plugin_name,"get_capabilities",def,FALSE))!=NULL&&
+          lives_list_length(description)>3) {
+        rfx=&rendered_fx[rfx_slot_count++];
+        rfx->name=lives_strdup(plugin_name);
+        memcpy(rfx->delim,def,2);
+        rfx->menu_text=lives_strdup((char *)lives_list_nth_data(description,0));
+        rfx->action_desc=lives_strdup((char *)lives_list_nth_data(description,1));
+        if (!(rfx->min_frames=atoi((char *)lives_list_nth_data(description,2)))) rfx->min_frames=1;
+        rfx->num_in_channels=atoi((char *)lives_list_nth_data(description,3));
+        rfx->status=status;
+        rfx->props=atoi((char *)lives_list_nth_data(props,0));
+        rfx->num_params=0;
+        rfx->is_template=FALSE;
+        rfx->params=NULL;
+        rfx->source=NULL;
+        rfx->source_type=LIVES_RFX_SOURCE_RFX;
+        rfx->extra=NULL;
+        rfx->is_template=FALSE;
+        if (!check_rfx_for_lives(rfx)) rfx_slot_count--;
       }
-      g_free(plugin_name);
+      lives_free(plugin_name);
       if (props!=NULL) {
-	g_list_free_strings (props);
-	g_list_free (props);
-	props=NULL;
+        lives_list_free_strings(props);
+        lives_list_free(props);
+        props=NULL;
       }
       if (description!=NULL) {
-	g_list_free_strings (description);
-	g_list_free (description);
-	description=NULL;
+        lives_list_free_strings(description);
+        lives_list_free(description);
+        description=NULL;
       }
-      g_free(def);
+      lives_free(def);
     }
 
     if (rfx_builtin_list!=NULL) {
-      g_list_free_strings (rfx_builtin_list);
-      g_list_free (rfx_builtin_list);
+      lives_list_free_strings(rfx_builtin_list);
+      lives_list_free(rfx_builtin_list);
     }
     if (rfx_custom_list!=NULL) {
-      g_list_free_strings (rfx_custom_list);
-      g_list_free (rfx_custom_list);
+      lives_list_free_strings(rfx_custom_list);
+      lives_list_free(rfx_custom_list);
     }
     if (rfx_test_list!=NULL) {
-      g_list_free_strings (rfx_test_list);
-      g_list_free (rfx_test_list);
+      lives_list_free_strings(rfx_test_list);
+      lives_list_free(rfx_test_list);
     }
-    g_free(type);
+    lives_free(type);
   }
 
   rfx_slot_count--;
-    
+
   threaded_dialog_spin();
   // sort menu text by alpha order (apart from [0])
-  sort_rfx_array (rendered_fx,rfx_slot_count);
-  g_free (rendered_fx);
+  sort_rfx_array(rendered_fx,rfx_slot_count);
+  lives_free(rendered_fx);
 
   if (mainw->rte_separator==NULL) {
     mainw->rte_separator=lives_menu_add_separator(LIVES_MENU(mainw->effects_menu));
-    lives_widget_show (mainw->rte_separator);
+    lives_widget_show(mainw->rte_separator);
   }
 
-  menuitem = lives_menu_item_new_with_mnemonic (mainw->rendered_fx[0].menu_text);
-  lives_widget_show (menuitem);
+  menuitem = lives_menu_item_new_with_mnemonic(mainw->rendered_fx[0].menu_text);
+  lives_widget_show(menuitem);
   // prepend before mainw->rte_separator
-  lives_menu_shell_prepend (LIVES_MENU_SHELL (mainw->effects_menu), menuitem);
-  lives_widget_set_sensitive (menuitem, FALSE);
-  lives_widget_set_tooltip_text( menuitem,_("See: VJ - show VJ keys. Set the realtime effects, and then apply them here."));
-  
-  lives_widget_add_accelerator (menuitem, LIVES_WIDGET_ACTIVATE_EVENT, mainw->accel_group,
-			      LIVES_KEY_e, LIVES_CONTROL_MASK,
-			      LIVES_ACCEL_VISIBLE);
-
-  lives_signal_connect (LIVES_GUI_OBJECT (menuitem), LIVES_WIDGET_ACTIVATE_EVENT,
-		    LIVES_GUI_CALLBACK (on_realfx_activate),
-		    &mainw->rendered_fx[0]);
+  lives_menu_shell_prepend(LIVES_MENU_SHELL(mainw->effects_menu), menuitem);
+  lives_widget_set_sensitive(menuitem, FALSE);
+  lives_widget_set_tooltip_text(menuitem,_("See: VJ - show VJ keys. Set the realtime effects, and then apply them here."));
+
+  lives_widget_add_accelerator(menuitem, LIVES_WIDGET_ACTIVATE_SIGNAL, mainw->accel_group,
+                               LIVES_KEY_e, LIVES_CONTROL_MASK,
+                               LIVES_ACCEL_VISIBLE);
+
+  lives_signal_connect(LIVES_GUI_OBJECT(menuitem), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_realfx_activate),
+                       &mainw->rendered_fx[0]);
 
   mainw->rendered_fx[0].menuitem=menuitem;
   mainw->rendered_fx[0].num_in_channels=1;
-  
+
   if (mainw->is_ready&&mainw->playing_file==-1&&mainw->current_file>0&&
       ((has_video_filters(TRUE)&&!has_video_filters(FALSE))||
        (cfile->achans>0&&prefs->audio_src==AUDIO_SRC_INT&&has_audio_filters(AF_TYPE_ANY))||
        mainw->agen_key!=0)) {
-    
+
     lives_widget_set_sensitive(mainw->rendered_fx[0].menuitem,TRUE);
-  }
-  else lives_widget_set_sensitive(mainw->rendered_fx[0].menuitem,FALSE);
+  } else lives_widget_set_sensitive(mainw->rendered_fx[0].menuitem,FALSE);
+
+  lives_container_add(LIVES_CONTAINER(mainw->effects_menu), mainw->custom_effects_submenu);
 
-  lives_container_add (LIVES_CONTAINER (mainw->effects_menu), mainw->custom_effects_submenu);
-  
   mainw->custom_effects_separator=lives_menu_add_separator(LIVES_MENU(mainw->effects_menu));
 
   threaded_dialog_spin();
 
   // now we need to add to the effects menu and set a callback
-  for (rfx=&mainw->rendered_fx[(plugin_idx=1)];plugin_idx<=rfx_slot_count;rfx=&mainw->rendered_fx[++plugin_idx]) {
+  for (rfx=&mainw->rendered_fx[(plugin_idx=1)]; plugin_idx<=rfx_slot_count; rfx=&mainw->rendered_fx[++plugin_idx]) {
     threaded_dialog_spin();
     if (mainw->splash_window==NULL) {
       lives_widget_context_update();
     }
-    render_fx_get_params (rfx,rfx->name,rfx->status);
+    render_fx_get_params(rfx,rfx->name,rfx->status);
     threaded_dialog_spin();
     rfx->source=NULL;
     rfx->extra=NULL;
@@ -4819,49 +4726,47 @@
 
     if (!(rfx->props&RFX_PROPS_MAY_RESIZE)&&rfx->min_frames>=0&&rfx->num_in_channels==1) {
       // add resizing effects to tools menu later
-      g_snprintf (txt,61,"_%s",_(rfx->menu_text));
-      if (rfx->num_params) g_strappend (txt,64,"...");
+      lives_snprintf(txt,61,"_%s",_(rfx->menu_text));
+      if (rfx->num_params) lives_strappend(txt,64,"...");
       menuitem = lives_image_menu_item_new_with_mnemonic(txt);
       lives_widget_show(menuitem);
 
       switch (rfx->status) {
       case RFX_STATUS_BUILTIN:
-	lives_container_add (LIVES_CONTAINER (mainw->effects_menu), menuitem);
-	break;
+        lives_container_add(LIVES_CONTAINER(mainw->effects_menu), menuitem);
+        break;
       case RFX_STATUS_CUSTOM:
-	lives_container_add (LIVES_CONTAINER (mainw->custom_effects_menu), menuitem);
-	rc_child++;
-	break;
+        lives_container_add(LIVES_CONTAINER(mainw->custom_effects_menu), menuitem);
+        rc_child++;
+        break;
       case RFX_STATUS_TEST:
-	lives_container_add (LIVES_CONTAINER (mainw->run_test_rfx_menu), menuitem);
-	break;
+        lives_container_add(LIVES_CONTAINER(mainw->run_test_rfx_menu), menuitem);
+        break;
       default:
-	break;
+        break;
       }
 
 
 #if LIVES_HAS_IMAGE_MENU_ITEM
       rfx_image=NULL;
       if (rfx->props&RFX_PROPS_SLOW) {
-	rfx_image = lives_image_new_from_stock (LIVES_STOCK_NO, LIVES_ICON_SIZE_MENU);
-      }
-      else {
-	rfx_image = lives_image_new_from_stock (LIVES_STOCK_YES, LIVES_ICON_SIZE_MENU);
+        rfx_image = lives_image_new_from_stock(LIVES_STOCK_NO, LIVES_ICON_SIZE_MENU);
+      } else {
+        rfx_image = lives_image_new_from_stock(LIVES_STOCK_YES, LIVES_ICON_SIZE_MENU);
       }
-      lives_image_menu_item_set_image (LIVES_IMAGE_MENU_ITEM (menuitem), rfx_image);
-      
+      lives_image_menu_item_set_image(LIVES_IMAGE_MENU_ITEM(menuitem), rfx_image);
+
       lives_widget_show(rfx_image);
 #endif
 
       if (rfx->params==NULL) {
-	lives_signal_connect (LIVES_GUI_OBJECT (menuitem), LIVES_WIDGET_ACTIVATE_EVENT,
-			  LIVES_GUI_CALLBACK (on_render_fx_activate),
-			  (gpointer)rfx);
-      }
-      else {
-	lives_signal_connect (LIVES_GUI_OBJECT (menuitem), LIVES_WIDGET_ACTIVATE_EVENT,
-			  LIVES_GUI_CALLBACK (on_render_fx_pre_activate),
-			  (gpointer)rfx);
+        lives_signal_connect(LIVES_GUI_OBJECT(menuitem), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                             LIVES_GUI_CALLBACK(on_render_fx_activate),
+                             (livespointer)rfx);
+      } else {
+        lives_signal_connect(LIVES_GUI_OBJECT(menuitem), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                             LIVES_GUI_CALLBACK(on_render_fx_pre_activate),
+                             (livespointer)rfx);
       }
       if (rfx->min_frames>=0) lives_widget_set_sensitive(menuitem,FALSE);
       rfx->menuitem=menuitem;
@@ -4872,25 +4777,24 @@
 
   // custom effects
   if (rc_child>0) {
-    lives_widget_show (mainw->custom_effects_separator);
-    lives_widget_show (mainw->custom_effects_menu);
-    lives_widget_show (mainw->custom_effects_submenu);
-  }
-  else {
-    lives_widget_hide (mainw->custom_effects_separator);
-    lives_widget_hide (mainw->custom_effects_menu);
-    lives_widget_hide (mainw->custom_effects_submenu);
+    lives_widget_show(mainw->custom_effects_separator);
+    lives_widget_show(mainw->custom_effects_menu);
+    lives_widget_show(mainw->custom_effects_submenu);
+  } else {
+    lives_widget_hide(mainw->custom_effects_separator);
+    lives_widget_hide(mainw->custom_effects_menu);
+    lives_widget_hide(mainw->custom_effects_submenu);
   }
 
   mainw->utilities_menu=lives_menu_new();
-  lives_menu_item_set_submenu (LIVES_MENU_ITEM (mainw->utilities_submenu), mainw->utilities_menu);
+  lives_menu_item_set_submenu(LIVES_MENU_ITEM(mainw->utilities_submenu), mainw->utilities_menu);
   if (palette->style&STYLE_1) {
     lives_widget_set_bg_color(mainw->utilities_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
     lives_widget_set_fg_color(mainw->utilities_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars_fore);
   }
 
   mainw->gens_menu=lives_menu_new();
-  lives_menu_item_set_submenu (LIVES_MENU_ITEM (mainw->gens_submenu), mainw->gens_menu);
+  lives_menu_item_set_submenu(LIVES_MENU_ITEM(mainw->gens_submenu), mainw->gens_menu);
   if (palette->style&STYLE_1) {
     lives_widget_set_bg_color(mainw->gens_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
     lives_widget_set_fg_color(mainw->gens_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars_fore);
@@ -4898,13 +4802,13 @@
 
 
   mainw->custom_gens_menu=lives_menu_new();
-  lives_menu_item_set_submenu (LIVES_MENU_ITEM (mainw->custom_gens_submenu), mainw->custom_gens_menu);
+  lives_menu_item_set_submenu(LIVES_MENU_ITEM(mainw->custom_gens_submenu), mainw->custom_gens_menu);
   if (palette->style&STYLE_1) {
     lives_widget_set_bg_color(mainw->custom_gens_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
     lives_widget_set_fg_color(mainw->custom_gens_menu, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars_fore);
   }
 
-  lives_container_add (LIVES_CONTAINER (mainw->gens_menu), mainw->custom_gens_submenu);
+  lives_container_add(LIVES_CONTAINER(mainw->gens_menu), mainw->custom_gens_submenu);
 
   mainw->custom_utilities_menu=lives_menu_new();
 
@@ -4915,113 +4819,108 @@
 
   mainw->custom_utilities_separator=lives_menu_add_separator(LIVES_MENU(mainw->custom_utilities_menu));
 
-  lives_container_add (LIVES_CONTAINER (mainw->custom_tools_menu), mainw->custom_utilities_submenu);
+  lives_container_add(LIVES_CONTAINER(mainw->custom_tools_menu), mainw->custom_utilities_submenu);
 
   threaded_dialog_spin();
 
   mainw->resize_menuitem=NULL;
 
   if (rfx_slot_count) {
-    for (rfx=&mainw->rendered_fx[(plugin_idx=1)];plugin_idx<=rfx_slot_count;rfx=&mainw->rendered_fx[++plugin_idx]) {
+    for (rfx=&mainw->rendered_fx[(plugin_idx=1)]; plugin_idx<=rfx_slot_count; rfx=&mainw->rendered_fx[++plugin_idx]) {
       threaded_dialog_spin();
       if (mainw->splash_window==NULL) {
-	lives_widget_context_update();
+        lives_widget_context_update();
       }
       if ((rfx->props&RFX_PROPS_MAY_RESIZE&&rfx->num_in_channels==1)||rfx->min_frames<0) {
-	// add resizing effects to tools menu
+        // add resizing effects to tools menu
 
-	g_snprintf (txt,61,"_%s",_(rfx->menu_text));
-	if (rfx->num_params) g_strappend (txt,64,"...");
-	menuitem = lives_menu_item_new_with_mnemonic(txt);
-	lives_widget_show(menuitem);
-
-	if (!strcmp(rfx->name,"resize")) {
-	  mainw->resize_menuitem=menuitem;
-	}
-
-	switch (rfx->status) {
-	case RFX_STATUS_BUILTIN:
-	  if (rfx->min_frames>=0) {
-	    lives_menu_shell_insert (LIVES_MENU_SHELL (mainw->tools_menu), menuitem,tool_posn++);
-	  }
-	  else {
-	    lives_container_add (LIVES_CONTAINER (mainw->utilities_menu), menuitem);
-	    lives_widget_show (mainw->utilities_menu);
-	  }
-	  break;
-	case RFX_STATUS_CUSTOM:
-	  if (rfx->min_frames>=0) {
-	    lives_container_add (LIVES_CONTAINER (mainw->custom_tools_menu), menuitem);
-	    mainw->has_custom_tools=TRUE;
-	  }
-	  else {
-	    lives_container_add (LIVES_CONTAINER (mainw->custom_utilities_menu), menuitem);
-	    mainw->has_custom_utilities=TRUE;
-	  }
-	  break;
-	case RFX_STATUS_TEST:
-	  lives_container_add (LIVES_CONTAINER (mainw->run_test_rfx_menu), menuitem);
-	  break;
-	default:
-	  break;
-	}
-
-	if (menuitem!=mainw->resize_menuitem) {
-	  if (rfx->params==NULL) {
-	    lives_signal_connect (LIVES_GUI_OBJECT (menuitem), LIVES_WIDGET_ACTIVATE_EVENT,
-			      LIVES_GUI_CALLBACK (on_render_fx_activate),
-			      (gpointer)rfx);
-	  }
-	  else {
-	    lives_signal_connect (LIVES_GUI_OBJECT (menuitem), LIVES_WIDGET_ACTIVATE_EVENT,
-			      LIVES_GUI_CALLBACK (on_render_fx_pre_activate),
-			      (gpointer)rfx);
-	  }
-	}
-	else {
-	  mainw->fx_candidates[FX_CANDIDATE_RESIZER].func=lives_signal_connect (LIVES_GUI_OBJECT (menuitem), LIVES_WIDGET_ACTIVATE_EVENT,
-									    LIVES_GUI_CALLBACK (on_render_fx_pre_activate),
-									    (gpointer)rfx);
-	}
+        lives_snprintf(txt,61,"_%s",_(rfx->menu_text));
+        if (rfx->num_params) lives_strappend(txt,64,"...");
+        menuitem = lives_menu_item_new_with_mnemonic(txt);
+        lives_widget_show(menuitem);
+
+        if (!strcmp(rfx->name,"resize")) {
+          mainw->resize_menuitem=menuitem;
+        }
+
+        switch (rfx->status) {
+        case RFX_STATUS_BUILTIN:
+          if (rfx->min_frames>=0) {
+            lives_menu_shell_insert(LIVES_MENU_SHELL(mainw->tools_menu), menuitem,tool_posn++);
+          } else {
+            lives_container_add(LIVES_CONTAINER(mainw->utilities_menu), menuitem);
+            lives_widget_show(mainw->utilities_menu);
+          }
+          break;
+        case RFX_STATUS_CUSTOM:
+          if (rfx->min_frames>=0) {
+            lives_container_add(LIVES_CONTAINER(mainw->custom_tools_menu), menuitem);
+            mainw->has_custom_tools=TRUE;
+          } else {
+            lives_container_add(LIVES_CONTAINER(mainw->custom_utilities_menu), menuitem);
+            mainw->has_custom_utilities=TRUE;
+          }
+          break;
+        case RFX_STATUS_TEST:
+          lives_container_add(LIVES_CONTAINER(mainw->run_test_rfx_menu), menuitem);
+          break;
+        default:
+          break;
+        }
+
+        if (menuitem!=mainw->resize_menuitem) {
+          if (rfx->params==NULL) {
+            lives_signal_connect(LIVES_GUI_OBJECT(menuitem), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                                 LIVES_GUI_CALLBACK(on_render_fx_activate),
+                                 (livespointer)rfx);
+          } else {
+            lives_signal_connect(LIVES_GUI_OBJECT(menuitem), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                                 LIVES_GUI_CALLBACK(on_render_fx_pre_activate),
+                                 (livespointer)rfx);
+          }
+        } else {
+          mainw->fx_candidates[FX_CANDIDATE_RESIZER].func=lives_signal_connect(LIVES_GUI_OBJECT(menuitem), LIVES_WIDGET_ACTIVATE_SIGNAL,
+              LIVES_GUI_CALLBACK(on_render_fx_pre_activate),
+              (livespointer)rfx);
+        }
 
-	if (rfx->min_frames>=0) lives_widget_set_sensitive(menuitem,FALSE);
-	rfx->menuitem=menuitem;
+        if (rfx->min_frames>=0) lives_widget_set_sensitive(menuitem,FALSE);
+        rfx->menuitem=menuitem;
       }
 
       else if (rfx->num_in_channels==0) {
-	// non-realtime generator
+        // non-realtime generator
 
-	g_snprintf (txt,61,"_%s",_(rfx->menu_text));
-	if (rfx->num_params) g_strappend (txt,64,"...");
-	menuitem = lives_menu_item_new_with_mnemonic(txt);
-	lives_widget_show(menuitem);
-
-	switch (rfx->status) {
-	case RFX_STATUS_BUILTIN:
-	  lives_container_add (LIVES_CONTAINER (mainw->gens_menu), menuitem);
-	  lives_widget_show (mainw->gens_menu);
-	  break;
-	case RFX_STATUS_CUSTOM:
-	  lives_container_add (LIVES_CONTAINER (mainw->custom_gens_menu), menuitem);
-	  mainw->has_custom_gens=TRUE;
-	  break;
-	case RFX_STATUS_TEST:
-	  lives_container_add (LIVES_CONTAINER (mainw->run_test_rfx_menu), menuitem);
-	  break;
-	default:
-	  break;
-	}
-
-	if (rfx->params==NULL) {
-	  lives_signal_connect (LIVES_GUI_OBJECT (menuitem), LIVES_WIDGET_ACTIVATE_EVENT,
-			    LIVES_GUI_CALLBACK (on_render_fx_activate),
-			    (gpointer)rfx);
-	}
-	else {
-	  lives_signal_connect (LIVES_GUI_OBJECT (menuitem), LIVES_WIDGET_ACTIVATE_EVENT,
-			    LIVES_GUI_CALLBACK (on_render_fx_pre_activate),
-			    (gpointer)rfx);
-	}
+        lives_snprintf(txt,61,"_%s",_(rfx->menu_text));
+        if (rfx->num_params) lives_strappend(txt,64,"...");
+        menuitem = lives_menu_item_new_with_mnemonic(txt);
+        lives_widget_show(menuitem);
+
+        switch (rfx->status) {
+        case RFX_STATUS_BUILTIN:
+          lives_container_add(LIVES_CONTAINER(mainw->gens_menu), menuitem);
+          lives_widget_show(mainw->gens_menu);
+          break;
+        case RFX_STATUS_CUSTOM:
+          lives_container_add(LIVES_CONTAINER(mainw->custom_gens_menu), menuitem);
+          mainw->has_custom_gens=TRUE;
+          break;
+        case RFX_STATUS_TEST:
+          lives_container_add(LIVES_CONTAINER(mainw->run_test_rfx_menu), menuitem);
+          break;
+        default:
+          break;
+        }
+
+        if (rfx->params==NULL) {
+          lives_signal_connect(LIVES_GUI_OBJECT(menuitem), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                               LIVES_GUI_CALLBACK(on_render_fx_activate),
+                               (livespointer)rfx);
+        } else {
+          lives_signal_connect(LIVES_GUI_OBJECT(menuitem), LIVES_WIDGET_ACTIVATE_SIGNAL,
+                               LIVES_GUI_CALLBACK(on_render_fx_pre_activate),
+                               (livespointer)rfx);
+        }
       }
     }
   }
@@ -5033,8 +4932,7 @@
     lives_widget_show(mainw->custom_tools_separator);
     lives_widget_show(mainw->custom_tools_menu);
     lives_widget_show(mainw->custom_tools_submenu);
-  }
-  else {
+  } else {
     lives_widget_hide(mainw->custom_tools_separator);
     lives_widget_hide(mainw->custom_tools_menu);
     lives_widget_hide(mainw->custom_tools_submenu);
@@ -5042,14 +4940,12 @@
   if (mainw->has_custom_utilities) {
     if (mainw->has_custom_tools) {
       lives_widget_show(mainw->custom_utilities_separator);
-    }
-    else {
+    } else {
       lives_widget_hide(mainw->custom_utilities_separator);
     }
     lives_widget_show(mainw->custom_utilities_menu);
     lives_widget_show(mainw->custom_utilities_submenu);
-  }
-  else {
+  } else {
     lives_widget_hide(mainw->custom_utilities_separator);
     lives_widget_hide(mainw->custom_utilities_menu);
     lives_widget_hide(mainw->custom_utilities_submenu);
@@ -5057,8 +4953,7 @@
   if (mainw->has_custom_gens) {
     lives_widget_show(mainw->custom_gens_menu);
     lives_widget_show(mainw->custom_gens_submenu);
-  }
-  else {
+  } else {
     lives_widget_hide(mainw->custom_gens_menu);
     lives_widget_hide(mainw->custom_gens_submenu);
   }
@@ -5067,20 +4962,18 @@
     if (mainw->num_rendered_effects_custom>0) {
       lives_widget_set_sensitive(mainw->delete_custom_rfx,TRUE);
       lives_widget_set_sensitive(mainw->export_custom_rfx,TRUE);
-    }
-    else {
+    } else {
       lives_widget_set_sensitive(mainw->delete_custom_rfx,FALSE);
       lives_widget_set_sensitive(mainw->export_custom_rfx,FALSE);
     }
-    
+
     if (mainw->num_rendered_effects_test>0) {
       lives_widget_set_sensitive(mainw->run_test_rfx_submenu,TRUE);
       lives_widget_set_sensitive(mainw->promote_test_rfx,TRUE);
       lives_widget_set_sensitive(mainw->delete_test_rfx,TRUE);
       lives_widget_set_sensitive(mainw->rename_test_rfx,TRUE);
       lives_widget_set_sensitive(mainw->edit_test_rfx,TRUE);
-    }
-    else {
+    } else {
       lives_widget_set_sensitive(mainw->run_test_rfx_submenu,FALSE);
       lives_widget_set_sensitive(mainw->promote_test_rfx,FALSE);
       lives_widget_set_sensitive(mainw->delete_test_rfx,FALSE);

LiVES-2.2.8.tar.bz2/src/rfx-builder.h -> LiVES-2.4.1.tar.bz2/src/rfx-builder.h Changed

@@ -1,6 +1,6 @@
 // rfx-builder.h
 // LiVES
-// (c) G. Finch 2004 - 2014 <salsaman@gmail.com>
+// (c) G. Finch 2004 - 2015 <salsaman@gmail.com>
 // released under the GNU GPL 3 or later
 // see file ../COPYING or www.gnu.org for licensing details
 
@@ -23,18 +23,18 @@
 #define MAXFLOATLEN 11
 
 /// length in chars of G_MAXINT (for display only)
-#define MAXINTLEN strlen(g_strdup_printf("%d",G_MAXINT))
+#define MAXINTLEN strlen(lives_strdup_printf("%d",LIVES_MAXINT))
 
 // advanced menu entries
-void on_new_rfx_activate (LiVESMenuItem *, gpointer status);
-void on_edit_rfx_activate (LiVESMenuItem *, gpointer status);
-void on_copy_rfx_activate (LiVESMenuItem *, gpointer);
-void on_rename_rfx_activate (LiVESMenuItem *, gpointer);
-void on_delete_rfx_activate (LiVESMenuItem *, gpointer status);
-void on_rebuild_rfx_activate (LiVESMenuItem *, gpointer);
-void on_promote_rfx_activate (LiVESMenuItem *, gpointer);
-void on_import_rfx_activate (LiVESMenuItem *, gpointer status);
-void on_export_rfx_activate (LiVESMenuItem *, gpointer status);
+void on_new_rfx_activate(LiVESMenuItem *, livespointer status);
+void on_edit_rfx_activate(LiVESMenuItem *, livespointer status);
+void on_copy_rfx_activate(LiVESMenuItem *, livespointer);
+void on_rename_rfx_activate(LiVESMenuItem *, livespointer);
+void on_delete_rfx_activate(LiVESMenuItem *, livespointer status);
+void on_rebuild_rfx_activate(LiVESMenuItem *, livespointer);
+void on_promote_rfx_activate(LiVESMenuItem *, livespointer);
+void on_import_rfx_activate(LiVESMenuItem *, livespointer status);
+void on_export_rfx_activate(LiVESMenuItem *, livespointer status);
 
 // the builder window
 
@@ -60,7 +60,7 @@
 #define RFXBUILD_MAX_DP 16
 typedef struct {
   int when;
-  gchar *code;
+  char *code;
 } rfx_trigger_t;
 
 
@@ -178,13 +178,13 @@
 
   uint32_t props;
 
-  gchar *pre_code;
-  gchar *loop_code;
-  gchar *post_code;
+  char *pre_code;
+  char *loop_code;
+  char *post_code;
 
   int edit_param;
 
-  gchar *reqs[RFXBUILD_MAX_REQ];
+  char *reqs[RFXBUILD_MAX_REQ];
   int num_reqs;
   int onum_reqs;
 
@@ -193,7 +193,7 @@
   int num_params; ///< upper limit is RFXBUILD_MAX_PARAMS-1
   int onum_params;
 
-  gchar *paramw_hints[RFXBUILD_MAX_PARAMS];
+  char *paramw_hints[RFXBUILD_MAX_PARAMS];
   int num_paramw_hints;  ///< upper limit is RFXBUILD_MAX_PARAMW_HINTS-1
   int onum_paramw_hints;
 
@@ -204,92 +204,92 @@
 
   boolean has_init_trigger;
 
-  gchar *field_delim;
+  char *field_delim;
 
   lives_rfx_builder_mode_t mode;
 
   int table_swap_row1;
   int table_swap_row2;
 
-  gchar *script_name;
-  gchar *oname;
+  char *script_name;
+  char *oname;
 
-  gulong min_spin_f;
-  gulong max_spin_f;
-  gulong def_spin_f;
-  gulong step_spin_f;
+  ulong min_spin_f;
+  ulong max_spin_f;
+  ulong def_spin_f;
+  ulong step_spin_f;
 
-  gchar *rfx_version;
+  char *rfx_version;
   int plugin_version;
 
 } rfx_build_window_t;
 
 // builder window widgets/callbacks
-rfx_build_window_t *make_rfx_build_window (const gchar *in_script_name, lives_rfx_status_t in_status);
-void on_rfxbuilder_ok (LiVESButton *, gpointer);
-void on_rfxbuilder_cancel (LiVESButton *, gpointer);
-void rfxbuilder_destroy (rfx_build_window_t *);
-void on_list_table_clicked (LiVESButton *, gpointer rfxbuilder);
-void on_requirements_ok (LiVESButton *, gpointer rfxbuilder);
-void on_requirements_cancel (LiVESButton *, gpointer);
-void on_properties_clicked (LiVESButton *, gpointer rfxbuilder);
-void on_properties_ok (LiVESButton *, gpointer rfxbuilder);
-void on_params_ok (LiVESButton *, gpointer rfxbuilder);
-void on_params_cancel (LiVESButton *, gpointer);
-void on_param_window_ok (LiVESButton *, gpointer rfxbuilder);
-void on_param_window_cancel (LiVESButton *, gpointer);
-void on_code_clicked (LiVESButton *, gpointer rfxbuilder);
-void on_code_ok (LiVESButton *, gpointer rfxbuilder);
-void on_code_cancel (LiVESButton *, gpointer);
-void on_triggers_ok (LiVESButton *, gpointer rfxbuilder);
-void on_triggers_cancel (LiVESButton *, gpointer);
-
-
-
-
-LiVESWidget * make_param_dialog (int pnum, rfx_build_window_t *rfxbuilder);
-LiVESWidget * make_param_window_dialog (int hnum, rfx_build_window_t *rfxbuilder);
-LiVESWidget * make_trigger_dialog (int tnum, rfx_build_window_t *rfxbuilder);
-
-void on_table_add_row (LiVESButton *, gpointer rfxbuilder);
-void on_table_edit_row (LiVESButton *, gpointer rfxbuilder);
-void on_table_swap_row (LiVESButton *, gpointer rfxbuilder);
-void on_table_delete_row (LiVESButton *, gpointer rfxbuilder);
-
-void param_set_from_dialog (lives_param_t *copy_param, rfx_build_window_t *rfxbuilder);
-
-void after_param_dp_changed (LiVESSpinButton *, gpointer rfxbuilder);
-void after_param_min_changed (LiVESSpinButton *, gpointer rfxbuilder);
-void after_param_max_changed (LiVESSpinButton *, gpointer rfxbuilder);
-void after_param_def_changed (LiVESSpinButton *, gpointer rfxbuilder);
-void after_rfxbuilder_type_toggled (LiVESToggleButton *, gpointer rfxbuilder);
-void on_param_type_changed (LiVESCombo *, gpointer rfxbuilder);
-void on_paramw_kw_changed (LiVESCombo *, gpointer rfxbuilder);
-void on_paramw_sp_changed (LiVESCombo *, gpointer rfxbuilder);
-void on_paramw_spsub_changed (LiVESCombo *, gpointer rfxbuilder);
+rfx_build_window_t *make_rfx_build_window(const char *in_script_name, lives_rfx_status_t in_status);
+void on_rfxbuilder_ok(LiVESButton *, livespointer);
+void on_rfxbuilder_cancel(LiVESButton *, livespointer);
+void rfxbuilder_destroy(rfx_build_window_t *);
+void on_list_table_clicked(LiVESButton *, livespointer rfxbuilder);
+void on_requirements_ok(LiVESButton *, livespointer rfxbuilder);
+void on_requirements_cancel(LiVESButton *, livespointer);
+void on_properties_clicked(LiVESButton *, livespointer rfxbuilder);
+void on_properties_ok(LiVESButton *, livespointer rfxbuilder);
+void on_params_ok(LiVESButton *, livespointer rfxbuilder);
+void on_params_cancel(LiVESButton *, livespointer);
+void on_param_window_ok(LiVESButton *, livespointer rfxbuilder);
+void on_param_window_cancel(LiVESButton *, livespointer);
+void on_code_clicked(LiVESButton *, livespointer rfxbuilder);
+void on_code_ok(LiVESButton *, livespointer rfxbuilder);
+void on_code_cancel(LiVESButton *, livespointer);
+void on_triggers_ok(LiVESButton *, livespointer rfxbuilder);
+void on_triggers_cancel(LiVESButton *, livespointer);
+
+
+
+
+LiVESWidget *make_param_dialog(int pnum, rfx_build_window_t *rfxbuilder);
+LiVESWidget *make_param_window_dialog(int hnum, rfx_build_window_t *rfxbuilder);
+LiVESWidget *make_trigger_dialog(int tnum, rfx_build_window_t *rfxbuilder);
+
+void on_table_add_row(LiVESButton *, livespointer rfxbuilder);
+void on_table_edit_row(LiVESButton *, livespointer rfxbuilder);
+void on_table_swap_row(LiVESButton *, livespointer rfxbuilder);
+void on_table_delete_row(LiVESButton *, livespointer rfxbuilder);
+
+void param_set_from_dialog(lives_param_t *copy_param, rfx_build_window_t *rfxbuilder);
+
+void after_param_dp_changed(LiVESSpinButton *, livespointer rfxbuilder);
+void after_param_min_changed(LiVESSpinButton *, livespointer rfxbuilder);
+void after_param_max_changed(LiVESSpinButton *, livespointer rfxbuilder);
+void after_param_def_changed(LiVESSpinButton *, livespointer rfxbuilder);
+void after_rfxbuilder_type_toggled(LiVESToggleButton *, livespointer rfxbuilder);
+void on_param_type_changed(LiVESCombo *, livespointer rfxbuilder);
+void on_paramw_kw_changed(LiVESCombo *, livespointer rfxbuilder);
+void on_paramw_sp_changed(LiVESCombo *, livespointer rfxbuilder);
+void on_paramw_spsub_changed(LiVESCombo *, livespointer rfxbuilder);
 void populate_script_combo(LiVESCombo *script_combo, lives_rfx_status_t status);
-void on_script_status_changed (LiVESCombo *status_combo, gpointer script_combo);
+void on_script_status_changed(LiVESCombo *status_combo, livespointer script_combo);
 
 // fileselectors
-void on_export_rfx_ok (LiVESButton *, gchar *script_name);
-void on_import_rfx_ok (LiVESButton *, gpointer status);
+void on_export_rfx_ok(LiVESButton *, char *script_name);
+void on_import_rfx_ok(LiVESButton *, livespointer status);
 
 /// add dynamic menu entries
 void add_rfx_effects(void);
 
 // utility functions
-gchar *prompt_for_script_name (const gchar *sname, lives_rfx_status_t status);
-boolean check_builder_programs (void);
-GList *get_script_list (short status);
+char *prompt_for_script_name(const char *sname, lives_rfx_status_t status);
+boolean check_builder_programs(void);
+LiVESList *get_script_list(short status);
 
-boolean perform_rfxbuilder_checks (rfx_build_window_t *);
-boolean perform_param_checks (rfx_build_window_t *, int index, int rows);
+boolean perform_rfxbuilder_checks(rfx_build_window_t *);
+boolean perform_param_checks(rfx_build_window_t *, int index, int rows);
 
 
 // read/write script files
-boolean rfxbuilder_to_script (rfx_build_window_t *);
-boolean script_to_rfxbuilder (rfx_build_window_t *, const gchar *script_file);
+boolean rfxbuilder_to_script(rfx_build_window_t *);
+boolean script_to_rfxbuilder(rfx_build_window_t *, const char *script_file);
 
-GList *get_script_section (const gchar *section, const gchar *script_file, boolean strip);
+LiVESList *get_script_section(const char *section, const char *script_file, boolean strip);
 
 #endif // HAS_LIVES_RFX_BUILDER_H

LiVES-2.2.8.tar.bz2/src/rte_window.c -> LiVES-2.4.1.tar.bz2/src/rte_window.c Changed

@@ -47,15 +47,15 @@
 
 static LiVESWidget *datacon_dialog=NULL;
 
-static gulong *ch_fns;
-static gulong *gr_fns;
-static gulong *mode_ra_fns;
+static ulong *ch_fns;
+static ulong *gr_fns;
+static ulong *mode_ra_fns;
 
 static int keyw=-1,modew=-1;
 
-static GList *hash_list=NULL;
-static GList *name_list=NULL;
-static GList *name_type_list=NULL;
+static LiVESList *hash_list=NULL;
+static LiVESList *name_list=NULL;
+static LiVESList *name_type_list=NULL;
 
 
 static boolean ca_canc;
@@ -64,44 +64,82 @@
 
 //////////////////////////////////////////////////////////////////////////////
 
+static void set_param_and_con_buttons(int key, int mode);
+static void check_clear_all_button(void);
+
+void rte_window_set_interactive(boolean interactive) {
+  register int i,j;
+  int modes=rte_getmodespk();
+  int idx;
+
+  if (!interactive) {
+    lives_widget_set_sensitive(clear_all_button,FALSE);
+    lives_widget_set_sensitive(save_keymap_button,FALSE);
+    lives_widget_set_sensitive(load_keymap_button,FALSE);
+    for (i=0; i<prefs->rte_keys_virtual; i++) {
+      for (j=modes-1; j>=0; j--) {
+        idx=i*modes+j;
+        lives_widget_set_sensitive(conx_buttons[idx],FALSE);
+        lives_widget_set_sensitive(param_buttons[idx],FALSE);
+        lives_widget_set_sensitive(combos[idx],FALSE);
+        lives_widget_set_sensitive(clear_buttons[idx],FALSE);
+        lives_widget_set_sensitive(mode_radios[idx],FALSE);
+      }
+      lives_widget_set_sensitive(key_checks[i],FALSE);
+      lives_widget_set_sensitive(key_grabs[i],FALSE);
+    }
+  } else {
+    for (i=0; i<prefs->rte_keys_virtual; i++) {
+      for (j=modes-1; j>=0; j--) {
+        idx=i*modes+j;
+        set_param_and_con_buttons(i,j);
+      }
+    }
+    check_clear_all_button();
+    lives_widget_set_sensitive(save_keymap_button,TRUE);
+    lives_widget_set_sensitive(load_keymap_button,TRUE);
+  }
+
+}
+
 
 void ret_set_key_check_state(void) {
   // set (delayed) keycheck state
   register int i;
-  for (i=0;i<prefs->rte_keys_virtual;i++) {
+  for (i=0; i<prefs->rte_keys_virtual; i++) {
     lives_signal_handler_block(key_checks[i],ch_fns[i]);
-    lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(key_checks[i]),GPOINTER_TO_INT(g_object_get_data(G_OBJECT(key_checks[i]),"active")));
+    lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(key_checks[i]),
+                                   LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(key_checks[i]),"active")));
     lives_signal_handler_unblock(key_checks[i],ch_fns[i]);
   }
 }
 
 
-void type_label_set_text (int key, int mode) {
+void type_label_set_text(int key, int mode) {
   int modes=rte_getmodespk();
   int idx=key*modes+mode;
-  gchar *type=rte_keymode_get_type(key+1,mode);
+  char *type=rte_keymode_get_type(key+1,mode);
 
   if (strlen(type)) {
-    lives_label_set_text (LIVES_LABEL(type_labels[idx]),g_strdup_printf(_("Type: %s"),type));
+    lives_label_set_text(LIVES_LABEL(type_labels[idx]),lives_strdup_printf(_("Type: %s"),type));
     lives_widget_set_sensitive(info_buttons[idx],TRUE);
     lives_widget_set_sensitive(clear_buttons[idx],TRUE);
     lives_widget_set_sensitive(mode_radios[idx],TRUE);
     lives_widget_set_sensitive(nlabels[idx],TRUE);
     lives_widget_set_sensitive(type_labels[idx],TRUE);
-  }
-  else {
+  } else {
     lives_widget_set_sensitive(info_buttons[idx],FALSE);
     lives_widget_set_sensitive(clear_buttons[idx],FALSE);
     lives_widget_set_sensitive(mode_radios[idx],FALSE);
     lives_widget_set_sensitive(nlabels[idx],FALSE);
     lives_widget_set_sensitive(type_labels[idx],FALSE);
   }
-  g_free(type);
+  lives_free(type);
 }
 
 
 
-boolean on_clear_all_clicked (LiVESButton *button, gpointer user_data) {
+boolean on_clear_all_clicked(LiVESButton *button, livespointer user_data) {
   int modes=rte_getmodespk();
   register int i,j;
 
@@ -109,8 +147,8 @@
 
   // prompt for "are you sure ?"
   if (user_data!=NULL) if (!do_warning_dialog_with_check_transient
-			   ((_("\n\nUnbind all effects from all keys/modes.\n\nAre you sure ?\n\n")),
-			    0,LIVES_WINDOW(rte_window))) {
+                             ((_("\n\nUnbind all effects from all keys/modes.\n\nAre you sure ?\n\n")),
+                              0,LIVES_WINDOW(rte_window))) {
       ca_canc=TRUE;
       return FALSE;
     }
@@ -118,28 +156,28 @@
   pconx_delete_all();
   cconx_delete_all();
 
-  for (i=0;i<prefs->rte_keys_virtual;i++) {
+  for (i=0; i<prefs->rte_keys_virtual; i++) {
     if (rte_window!=NULL) {
-      lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON(key_checks[i]),FALSE);
-      g_object_set_data(G_OBJECT(key_checks[i]),"active",GINT_TO_POINTER(FALSE));
+      lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(key_checks[i]),FALSE);
+      lives_widget_object_set_data(LIVES_WIDGET_OBJECT(key_checks[i]),"active",LIVES_INT_TO_POINTER(FALSE));
     }
-    for (j=modes-1;j>=0;j--) {
-      weed_delete_effectkey (i+1,j);
+    for (j=modes-1; j>=0; j--) {
+      weed_delete_effectkey(i+1,j);
       if (rte_window!=NULL) {
-	lives_entry_set_text (LIVES_ENTRY(combo_entries[i*modes+j]),"");
-	type_label_set_text(i,j);
+        lives_entry_set_text(LIVES_ENTRY(combo_entries[i*modes+j]),"");
+        type_label_set_text(i,j);
       }
     }
     if (mainw->ce_thumbs) ce_thumbs_reset_combo(i);
   }
 
-  if (button!=NULL) lives_widget_set_sensitive (LIVES_WIDGET(button), FALSE);
+  if (button!=NULL) lives_widget_set_sensitive(LIVES_WIDGET(button), FALSE);
 
   return FALSE;
 }
 
 
-static boolean save_keymap2_file(gchar *kfname) {
+static boolean save_keymap2_file(char *kfname) {
   // save perkey defaults
   int slen;
   int version=1;
@@ -148,55 +186,54 @@
   int retval;
   int i,j;
 
-  gchar *hashname,*tmp;
+  char *hashname,*tmp;
 
   do {
     retval=0;
     kfd=lives_creat_buffered(kfname,DEF_FILE_PERMS);
     if (kfd==-1) {
-      retval=do_write_failed_error_s_with_retry (kfname,g_strerror(errno),LIVES_WINDOW(rte_window));
-    }
-    else {
+      retval=do_write_failed_error_s_with_retry(kfname,lives_strerror(errno),LIVES_WINDOW(rte_window));
+    } else {
       mainw->write_failed=FALSE;
-      
+
       lives_write_le_buffered(kfd,&version,4,TRUE);
-      
-      for (i=1;i<=prefs->rte_keys_virtual;i++) {
-	if (mainw->write_failed) break;
-	for (j=0;j<modes;j++) {
-	  if (rte_keymode_valid(i,j,TRUE)) {
-	    lives_write_le_buffered(kfd,&i,4,TRUE);
-	    if (mainw->write_failed) break;
-	    hashname=g_strdup_printf("Weed%s",(tmp=make_weed_hashname(rte_keymode_get_filter_idx(i,j),TRUE,FALSE)));
-	    g_free(tmp);
-	    slen=strlen(hashname);
-	    lives_write_le_buffered(kfd,&slen,4,TRUE);
-	    lives_write_buffered(kfd,hashname,slen,TRUE);
-	    g_free(hashname);
-	    write_key_defaults(kfd,i-1,j);
-	  }
-	}
+
+      for (i=1; i<=prefs->rte_keys_virtual; i++) {
+        if (mainw->write_failed) break;
+        for (j=0; j<modes; j++) {
+          if (rte_keymode_valid(i,j,TRUE)) {
+            lives_write_le_buffered(kfd,&i,4,TRUE);
+            if (mainw->write_failed) break;
+            hashname=lives_strdup_printf("Weed%s",(tmp=make_weed_hashname(rte_keymode_get_filter_idx(i,j),TRUE,FALSE)));
+            lives_free(tmp);
+            slen=strlen(hashname);
+            lives_write_le_buffered(kfd,&slen,4,TRUE);
+            lives_write_buffered(kfd,hashname,slen,TRUE);
+            lives_free(hashname);
+            write_key_defaults(kfd,i-1,j);
+          }
+        }
       }
       lives_close_buffered(kfd);
-      
+
       if (mainw->write_failed) {
-	retval=do_write_failed_error_s_with_retry(kfname,NULL,LIVES_WINDOW(rte_window));
-	mainw->write_failed=FALSE;
+        retval=do_write_failed_error_s_with_retry(kfname,NULL,LIVES_WINDOW(rte_window));
+        mainw->write_failed=FALSE;
       }
     }
-  } while (retval==LIVES_RETRY);
+  } while (retval==LIVES_RESPONSE_RETRY);
 
-  if (retval==LIVES_CANCEL) return FALSE;
+  if (retval==LIVES_RESPONSE_CANCEL) return FALSE;
   return TRUE;
 
 }
 
 
 
-static boolean save_keymap3_file(gchar *kfname) {
+static boolean save_keymap3_file(char *kfname) {
   // save data connections
 
-  gchar *hashname;
+  char *hashname;
 
   int version=1;
 
@@ -211,185 +248,182 @@
     retval=0;
     kfd=lives_creat_buffered(kfname,DEF_FILE_PERMS);
     if (kfd==-1) {
-      retval=do_write_failed_error_s_with_retry (kfname,g_strerror(errno),LIVES_WINDOW(rte_window));
-    }
-    else {
+      retval=do_write_failed_error_s_with_retry(kfname,lives_strerror(errno),LIVES_WINDOW(rte_window));
+    } else {
       mainw->write_failed=FALSE;
-      
+
       lives_write_le_buffered(kfd,&version,4,TRUE);
 
 
       if (mainw->cconx!=NULL) {
-	lives_cconnect_t *cconx=mainw->cconx;
-	int nchans;
+        lives_cconnect_t *cconx=mainw->cconx;
+        int nchans;
 
-	while (cconx!=NULL) {
-	  count++;
-	  cconx=cconx->next;
-	}
+        while (cconx!=NULL) {
+          count++;
+          cconx=cconx->next;
+        }
 
-	lives_write_le_buffered(kfd,&count,4,TRUE);
-	if (mainw->write_failed) goto write_failed1;
+        lives_write_le_buffered(kfd,&count,4,TRUE);
+        if (mainw->write_failed) goto write_failed1;
 
-	cconx=mainw->cconx;
-	while (cconx!=NULL) {
-	  totcons=0;
-	  j=0;
+        cconx=mainw->cconx;
+        while (cconx!=NULL) {
+          totcons=0;
+          j=0;
 
-	  lives_write_le_buffered(kfd,&cconx->okey,4,TRUE);
-	  if (mainw->write_failed) goto write_failed1;
+          lives_write_le_buffered(kfd,&cconx->okey,4,TRUE);
+          if (mainw->write_failed) goto write_failed1;
 
-	  lives_write_le_buffered(kfd,&cconx->omode,4,TRUE);
-	  if (mainw->write_failed) goto write_failed1;
+          lives_write_le_buffered(kfd,&cconx->omode,4,TRUE);
+          if (mainw->write_failed) goto write_failed1;
 
-	  hashname=make_weed_hashname(rte_keymode_get_filter_idx(cconx->okey+1,cconx->omode),TRUE,FALSE);
-	  slen=strlen(hashname);
-	  lives_write_le_buffered(kfd,&slen,4,TRUE);
-	  lives_write_buffered(kfd,hashname,slen,TRUE);
-	  g_free(hashname);
+          hashname=make_weed_hashname(rte_keymode_get_filter_idx(cconx->okey+1,cconx->omode),TRUE,FALSE);
+          slen=strlen(hashname);
+          lives_write_le_buffered(kfd,&slen,4,TRUE);
+          lives_write_buffered(kfd,hashname,slen,TRUE);
+          lives_free(hashname);
 
-	  nchans=cconx->nchans;
-	  lives_write_le_buffered(kfd,&nchans,4,TRUE);
-	  if (mainw->write_failed) goto write_failed1;
+          nchans=cconx->nchans;
+          lives_write_le_buffered(kfd,&nchans,4,TRUE);
+          if (mainw->write_failed) goto write_failed1;
 
-	  for (i=0;i<nchans;i++) {
-	    lives_write_le_buffered(kfd,&cconx->chans[i],4,TRUE);
-	    if (mainw->write_failed) goto write_failed1;
+          for (i=0; i<nchans; i++) {
+            lives_write_le_buffered(kfd,&cconx->chans[i],4,TRUE);
+            if (mainw->write_failed) goto write_failed1;
 
-	    nconns=cconx->nconns[i];
-	    lives_write_le_buffered(kfd,&nconns,4,TRUE);
-	    if (mainw->write_failed) goto write_failed1;
+            nconns=cconx->nconns[i];
+            lives_write_le_buffered(kfd,&nconns,4,TRUE);
+            if (mainw->write_failed) goto write_failed1;
 
-	    totcons+=nconns;
+            totcons+=nconns;
 
-	    while (j<totcons) {
-	      lives_write_le_buffered(kfd,&cconx->ikey[j],4,TRUE);
-	      if (mainw->write_failed) goto write_failed1;
+            while (j<totcons) {
+              lives_write_le_buffered(kfd,&cconx->ikey[j],4,TRUE);
+              if (mainw->write_failed) goto write_failed1;
 
-	      lives_write_le_buffered(kfd,&cconx->imode[j],4,TRUE);
-	      if (mainw->write_failed) goto write_failed1;
+              lives_write_le_buffered(kfd,&cconx->imode[j],4,TRUE);
+              if (mainw->write_failed) goto write_failed1;
 
-	      hashname=make_weed_hashname(rte_keymode_get_filter_idx(cconx->ikey[j]+1,cconx->imode[j]),TRUE,FALSE);
-	      slen=strlen(hashname);
-	      lives_write_le_buffered(kfd,&slen,4,TRUE);
-	      lives_write_buffered(kfd,hashname,slen,TRUE);
-	      g_free(hashname);
+              hashname=make_weed_hashname(rte_keymode_get_filter_idx(cconx->ikey[j]+1,cconx->imode[j]),TRUE,FALSE);
+              slen=strlen(hashname);
+              lives_write_le_buffered(kfd,&slen,4,TRUE);
+              lives_write_buffered(kfd,hashname,slen,TRUE);
+              lives_free(hashname);
 
-	      lives_write_le_buffered(kfd,&cconx->icnum[j],4,TRUE);
-	      if (mainw->write_failed) goto write_failed1;
+              lives_write_le_buffered(kfd,&cconx->icnum[j],4,TRUE);
+              if (mainw->write_failed) goto write_failed1;
 
-	      j++;
-	    }
+              j++;
+            }
 
-	  }
+          }
 
-	  cconx=cconx->next;
-	}
-      }
-      else {
-	lives_write_le_buffered(kfd,&count,4,TRUE);
-	if (mainw->write_failed) goto write_failed1;
+          cconx=cconx->next;
+        }
+      } else {
+        lives_write_le_buffered(kfd,&count,4,TRUE);
+        if (mainw->write_failed) goto write_failed1;
       }
 
 
       if (mainw->pconx!=NULL) {
-	lives_pconnect_t *pconx=mainw->pconx;
+        lives_pconnect_t *pconx=mainw->pconx;
 
-	int nparams;
+        int nparams;
 
-	count=0;
+        count=0;
 
-	while (pconx!=NULL) {
-	  count++;
-	  pconx=pconx->next;
-	}
+        while (pconx!=NULL) {
+          count++;
+          pconx=pconx->next;
+        }
 
-	lives_write_le_buffered(kfd,&count,4,TRUE);
-	if (mainw->write_failed) goto write_failed1;
+        lives_write_le_buffered(kfd,&count,4,TRUE);
+        if (mainw->write_failed) goto write_failed1;
 
-	pconx=mainw->pconx;
-	while (pconx!=NULL) {
-	  totcons=0;
-	  j=0;
+        pconx=mainw->pconx;
+        while (pconx!=NULL) {
+          totcons=0;
+          j=0;
 
-	  lives_write_le_buffered(kfd,&pconx->okey,4,TRUE);
-	  if (mainw->write_failed) goto write_failed1;
+          lives_write_le_buffered(kfd,&pconx->okey,4,TRUE);
+          if (mainw->write_failed) goto write_failed1;
 
-	  lives_write_le_buffered(kfd,&pconx->omode,4,TRUE);
-	  if (mainw->write_failed) goto write_failed1;
+          lives_write_le_buffered(kfd,&pconx->omode,4,TRUE);
+          if (mainw->write_failed) goto write_failed1;
 
-	  hashname=make_weed_hashname(rte_keymode_get_filter_idx(pconx->okey+1,pconx->omode),TRUE,FALSE);
-	  slen=strlen(hashname);
-	  lives_write_le_buffered(kfd,&slen,4,TRUE);
-	  lives_write_buffered(kfd,hashname,slen,TRUE);
-	  g_free(hashname);
+          hashname=make_weed_hashname(rte_keymode_get_filter_idx(pconx->okey+1,pconx->omode),TRUE,FALSE);
+          slen=strlen(hashname);
+          lives_write_le_buffered(kfd,&slen,4,TRUE);
+          lives_write_buffered(kfd,hashname,slen,TRUE);
+          lives_free(hashname);
 
-	  nparams=pconx->nparams;
-	  lives_write_le_buffered(kfd,&nparams,4,TRUE);
-	  if (mainw->write_failed) goto write_failed1;
+          nparams=pconx->nparams;
+          lives_write_le_buffered(kfd,&nparams,4,TRUE);
+          if (mainw->write_failed) goto write_failed1;
 
-	  for (i=0;i<nparams;i++) {
-	    lives_write_le_buffered(kfd,&pconx->params[i],4,TRUE);
-	    if (mainw->write_failed) goto write_failed1;
+          for (i=0; i<nparams; i++) {
+            lives_write_le_buffered(kfd,&pconx->params[i],4,TRUE);
+            if (mainw->write_failed) goto write_failed1;
 
-	    nconns=pconx->nconns[i];
-	    lives_write_le_buffered(kfd,&nconns,4,TRUE);
-	    if (mainw->write_failed) goto write_failed1;
+            nconns=pconx->nconns[i];
+            lives_write_le_buffered(kfd,&nconns,4,TRUE);
+            if (mainw->write_failed) goto write_failed1;
 
-	    totcons+=nconns;
+            totcons+=nconns;
 
-	    while (j<totcons) {
-	      lives_write_le_buffered(kfd,&pconx->ikey[j],4,TRUE);
-	      if (mainw->write_failed) goto write_failed1;
+            while (j<totcons) {
+              lives_write_le_buffered(kfd,&pconx->ikey[j],4,TRUE);
+              if (mainw->write_failed) goto write_failed1;
 
-	      lives_write_le_buffered(kfd,&pconx->imode[j],4,TRUE);
-	      if (mainw->write_failed) goto write_failed1;
+              lives_write_le_buffered(kfd,&pconx->imode[j],4,TRUE);
+              if (mainw->write_failed) goto write_failed1;
 
-	      hashname=make_weed_hashname(rte_keymode_get_filter_idx(pconx->ikey[j]+1,pconx->imode[j]),TRUE,FALSE);
-	      slen=strlen(hashname);
-	      lives_write_le_buffered(kfd,&slen,4,TRUE);
-	      lives_write_buffered(kfd,hashname,slen,TRUE);
-	      g_free(hashname);
+              hashname=make_weed_hashname(rte_keymode_get_filter_idx(pconx->ikey[j]+1,pconx->imode[j]),TRUE,FALSE);
+              slen=strlen(hashname);
+              lives_write_le_buffered(kfd,&slen,4,TRUE);
+              lives_write_buffered(kfd,hashname,slen,TRUE);
+              lives_free(hashname);
 
-	      lives_write_le_buffered(kfd,&pconx->ipnum[j],4,TRUE);
-	      if (mainw->write_failed) goto write_failed1;
+              lives_write_le_buffered(kfd,&pconx->ipnum[j],4,TRUE);
+              if (mainw->write_failed) goto write_failed1;
 
-	      lives_write_le_buffered(kfd,&pconx->autoscale[j],4,TRUE);
-	      if (mainw->write_failed) goto write_failed1;
+              lives_write_le_buffered(kfd,&pconx->autoscale[j],4,TRUE);
+              if (mainw->write_failed) goto write_failed1;
 
-	      j++;
-	    }
+              j++;
+            }
 
-	  }
+          }
 
-	  pconx=pconx->next;
-	}
+          pconx=pconx->next;
+        }
 
-      }
-      else {
-	lives_write_le_buffered(kfd,&count,4,TRUE);
-	if (mainw->write_failed) goto write_failed1;
+      } else {
+        lives_write_le_buffered(kfd,&count,4,TRUE);
+        if (mainw->write_failed) goto write_failed1;
       }
 
 
-    write_failed1:
+write_failed1:
       lives_close_buffered(kfd);
-      
+
       if (mainw->write_failed) {
-	retval=do_write_failed_error_s_with_retry(kfname,NULL,LIVES_WINDOW(rte_window));
-	mainw->write_failed=FALSE;
+        retval=do_write_failed_error_s_with_retry(kfname,NULL,LIVES_WINDOW(rte_window));
+        mainw->write_failed=FALSE;
       }
     }
-  } while (retval==LIVES_RETRY);
+  } while (retval==LIVES_RESPONSE_RETRY);
 
-  if (retval==LIVES_CANCEL) return FALSE;
+  if (retval==LIVES_RESPONSE_CANCEL) return FALSE;
   return TRUE;
 
 }
 
 
 
-static boolean on_save_keymap_clicked (LiVESButton *button, gpointer user_data) {
+static boolean on_save_keymap_clicked(LiVESButton *button, livespointer user_data) {
   // save as keymap type 1 file - to allow backwards compatibility with older versions of LiVES
   // default.keymap
 
@@ -408,99 +442,92 @@
 
 
   FILE *kfile;
-  GList *list=NULL;
+  LiVESList *list=NULL;
 
-  gchar *msg,*tmp;
-  gchar *keymap_file=g_build_filename(capable->home_dir,LIVES_CONFIG_DIR,"default.keymap",NULL);
-  gchar *keymap_file2=g_build_filename(capable->home_dir,LIVES_CONFIG_DIR,"default.keymap2",NULL);
-  gchar *keymap_file3=g_build_filename(capable->home_dir,LIVES_CONFIG_DIR,"default.keymap3",NULL);
+  char *msg,*tmp;
+  char *keymap_file=lives_build_filename(capable->home_dir,LIVES_CONFIG_DIR,"default.keymap",NULL);
+  char *keymap_file2=lives_build_filename(capable->home_dir,LIVES_CONFIG_DIR,"default.keymap2",NULL);
+  char *keymap_file3=lives_build_filename(capable->home_dir,LIVES_CONFIG_DIR,"default.keymap3",NULL);
 
   boolean update=FALSE;
 
   int modes=rte_getmodespk();
   int i,j;
   int retval;
- 
+
   if (button!=NULL) {
     if (!do_warning_dialog_with_check_transient
-	((_("\n\nClick 'OK' to save this keymap as your default\n\n")),0,LIVES_WINDOW(rte_window))) {
-      g_free(keymap_file3);
-      g_free(keymap_file2);
-      g_free(keymap_file);
+        ((_("\n\nClick 'OK' to save this keymap as your default\n\n")),0,LIVES_WINDOW(rte_window))) {
+      lives_free(keymap_file3);
+      lives_free(keymap_file2);
+      lives_free(keymap_file);
       return FALSE;
     }
-    d_print ((tmp=g_strdup_printf(_("Saving keymap to %s\n"),keymap_file)));
-    g_free(tmp);
-  }
-  else {
+    d_print(_("Saving keymap to %s\n"),keymap_file);
+  } else {
     update=TRUE;
-    list=(GList *)user_data;
+    list=(LiVESList *)user_data;
     if (list==NULL) return FALSE;
-    d_print ((tmp=g_strdup_printf(_("\nUpdating keymap file %s..."),keymap_file)));
-    g_free(tmp);
+    d_print(_("\nUpdating keymap file %s..."),keymap_file);
   }
 
   do {
     retval=0;
     if (!(kfile=fopen(keymap_file,"w"))) {
-      msg=g_strdup_printf (_("\n\nUnable to write keymap file\n%s\nError was %s\n"),keymap_file,g_strerror(errno));
-      retval=do_abort_cancel_retry_dialog (msg,LIVES_WINDOW(rte_window));
-      g_free (msg);
-    }
-    else {
+      msg=lives_strdup_printf(_("\n\nUnable to write keymap file\n%s\nError was %s\n"),keymap_file,lives_strerror(errno));
+      retval=do_abort_cancel_retry_dialog(msg,LIVES_WINDOW(rte_window));
+      lives_free(msg);
+    } else {
       mainw->write_failed=FALSE;
       lives_fputs("LiVES keymap file version 4\n",kfile);
 
       if (!update) {
-	for (i=1;i<=prefs->rte_keys_virtual;i++) {
-	  for (j=0;j<modes;j++) {
-	    if (rte_keymode_valid(i,j,TRUE)) {
-	      lives_fputs(g_strdup_printf("%d|Weed%s\n",i,(tmp=make_weed_hashname(rte_keymode_get_filter_idx(i,j),TRUE,FALSE))),kfile);
-	      g_free(tmp);
-	    }
-	  }
-	}
-      }
-      else {
-	for (i=0;i<g_list_length(list);i++) {
-	  lives_fputs((gchar *)g_list_nth_data(list,i),kfile);
-	}
+        for (i=1; i<=prefs->rte_keys_virtual; i++) {
+          for (j=0; j<modes; j++) {
+            if (rte_keymode_valid(i,j,TRUE)) {
+              lives_fputs(lives_strdup_printf("%d|Weed%s\n",i,(tmp=make_weed_hashname(rte_keymode_get_filter_idx(i,j),TRUE,FALSE))),kfile);
+              lives_free(tmp);
+            }
+          }
+        }
+      } else {
+        for (i=0; i<lives_list_length(list); i++) {
+          lives_fputs((char *)lives_list_nth_data(list,i),kfile);
+        }
       }
-      
-      fclose (kfile);
+
+      fclose(kfile);
     }
 
     if (mainw->write_failed) {
       retval=do_write_failed_error_s_with_retry(keymap_file,NULL,LIVES_WINDOW(rte_window));
     }
-  } while (retval==LIVES_RETRY);
+  } while (retval==LIVES_RESPONSE_RETRY);
 
 
   // if we have default values, save them
   if (has_key_defaults()) {
     if (!save_keymap2_file(keymap_file2)) {
       unlink(keymap_file2);
-      retval=LIVES_CANCEL;
+      retval=LIVES_RESPONSE_CANCEL;
     }
-  }
-  else unlink(keymap_file2);
+  } else unlink(keymap_file2);
 
 
   // if we have data connections, save them
   if (mainw->pconx!=NULL||mainw->cconx!=NULL) {
     if (!save_keymap3_file(keymap_file3)) {
       unlink(keymap_file3);
-      retval=LIVES_CANCEL;
+      retval=LIVES_RESPONSE_CANCEL;
     }
-  }
-  else unlink(keymap_file3);
+  } else unlink(keymap_file3);
 
 
-  g_free(keymap_file3);
-  g_free(keymap_file2);
-  g_free(keymap_file);
+  lives_free(keymap_file3);
+  lives_free(keymap_file2);
+  lives_free(keymap_file);
 
-  if (retval==LIVES_CANCEL) d_print_file_error_failed();
+  if (retval==LIVES_RESPONSE_CANCEL) d_print_file_error_failed();
   else d_print_done();
 
   return FALSE;
@@ -509,91 +536,88 @@
 
 
 
-void on_save_rte_defs_activate (LiVESMenuItem *menuitem, gpointer user_data) {
-  int fd,i;
+void on_save_rte_defs_activate(LiVESMenuItem *menuitem, livespointer user_data) {
+  char *msg;
+
+  int fd;
   int retval;
   int numfx;
-  gchar *msg;
+
+  register int i;
 
   if (prefs->fxdefsfile==NULL) {
-    prefs->fxdefsfile=g_build_filename(capable->home_dir,LIVES_CONFIG_DIR,"fxdefs",NULL);
+    prefs->fxdefsfile=lives_build_filename(capable->home_dir,LIVES_CONFIG_DIR,"fxdefs",NULL);
   }
 
   if (prefs->fxsizesfile==NULL) {
-    prefs->fxsizesfile=g_build_filename(capable->home_dir,LIVES_CONFIG_DIR,"fxsizes",NULL);
+    prefs->fxsizesfile=lives_build_filename(capable->home_dir,LIVES_CONFIG_DIR,"fxsizes",NULL);
   }
 
-  msg=g_strdup_printf(_("Saving real time effect defaults to %s..."),prefs->fxdefsfile);
-  d_print(msg);
-  g_free(msg);
+  d_print(_("Saving real time effect defaults to %s..."),prefs->fxdefsfile);
 
   numfx=rte_get_numfilters(FALSE);
 
   do {
     retval=0;
     if ((fd=lives_creat_buffered(prefs->fxdefsfile,DEF_FILE_PERMS))==-1) {
-      msg=g_strdup_printf (_("\n\nUnable to write defaults file\n%s\nError code %d\n"),prefs->fxdefsfile,errno);
-      retval=do_abort_cancel_retry_dialog (msg,LIVES_WINDOW(rte_window));
-      g_free (msg);
-    }
-    else {
+      msg=lives_strdup_printf(_("\n\nUnable to write defaults file\n%s\nError code %d\n"),prefs->fxdefsfile,errno);
+      retval=do_abort_cancel_retry_dialog(msg,LIVES_WINDOW(rte_window));
+      lives_free(msg);
+    } else {
 #ifdef IS_MINGW
       setmode(fd, O_BINARY);
 #endif
-      msg=g_strdup("LiVES filter defaults file version 1.1\n");
+      msg=lives_strdup("LiVES filter defaults file version 1.1\n");
       mainw->write_failed=FALSE;
       lives_write_buffered(fd,msg,strlen(msg),TRUE);
-      g_free(msg);
+      lives_free(msg);
 
       if (mainw->write_failed) {
-	retval=do_write_failed_error_s_with_retry(prefs->fxdefsfile,NULL,LIVES_WINDOW(rte_window));
-      }
-      else {
-	// break on file write error
-	for (i=0;i<numfx;i++) {
-	  if (!write_filter_defaults(fd,i)) {
-	    retval=do_write_failed_error_s_with_retry(prefs->fxdefsfile,NULL,LIVES_WINDOW(rte_window));
-	    break;
-	  }
-	}
+        retval=do_write_failed_error_s_with_retry(prefs->fxdefsfile,NULL,LIVES_WINDOW(rte_window));
+      } else {
+        // break on file write error
+        for (i=0; i<numfx; i++) {
+          if (!write_filter_defaults(fd,i)) {
+            retval=do_write_failed_error_s_with_retry(prefs->fxdefsfile,NULL,LIVES_WINDOW(rte_window));
+            break;
+          }
+        }
       }
-      lives_close_buffered (fd);
+      lives_close_buffered(fd);
     }
-  } while (retval==LIVES_RETRY);
+  } while (retval==LIVES_RESPONSE_RETRY);
+
 
+  if (retval==LIVES_RESPONSE_CANCEL) d_print_file_error_failed();
 
-  if (retval==LIVES_CANCEL) d_print_file_error_failed();
-  
   do {
     retval=0;
     if ((fd=lives_creat_buffered(prefs->fxsizesfile,DEF_FILE_PERMS))==-1) {
-      retval=do_write_failed_error_s_with_retry(prefs->fxsizesfile,g_strerror(errno),LIVES_WINDOW(rte_window));
-      g_free (msg);
-    }
-    else {
+      retval=do_write_failed_error_s_with_retry(prefs->fxsizesfile,lives_strerror(errno),LIVES_WINDOW(rte_window));
+      lives_free(msg);
+    } else {
 #ifdef IS_MINGW
       setmode(fd, O_BINARY);
 #endif
-      msg=g_strdup("LiVES generator default sizes file version 2\n");
+      msg=lives_strdup("LiVES generator default sizes file version 2\n");
       mainw->write_failed=FALSE;
       lives_write_buffered(fd,msg,strlen(msg),TRUE);
-      g_free(msg);
+      lives_free(msg);
       if (mainw->write_failed) {
-	retval=do_write_failed_error_s_with_retry(prefs->fxsizesfile,NULL,LIVES_WINDOW(rte_window));
-      }
-      else {
-	for (i=0;i<numfx;i++) {
-	  if (!write_generator_sizes(fd,i)) {
-	    retval=do_write_failed_error_s_with_retry(prefs->fxsizesfile,NULL,LIVES_WINDOW(rte_window));
-	    break;
-	  }
-	}
+        retval=do_write_failed_error_s_with_retry(prefs->fxsizesfile,NULL,LIVES_WINDOW(rte_window));
+      } else {
+        for (i=0; i<numfx; i++) {
+          if (!write_generator_sizes(fd,i)) {
+            retval=do_write_failed_error_s_with_retry(prefs->fxsizesfile,NULL,LIVES_WINDOW(rte_window));
+            break;
+          }
+        }
       }
       lives_close_buffered(fd);
     }
-  } while (retval==LIVES_RETRY);
+  } while (retval==LIVES_RESPONSE_RETRY);
 
-  if (retval==LIVES_CANCEL) {
+  if (retval==LIVES_RESPONSE_CANCEL) {
     d_print_file_error_failed();
     mainw->write_failed=FALSE;
     return;
@@ -606,124 +630,116 @@
 
 
 
-void load_rte_defs (void) {
+void load_rte_defs(void) {
+  ssize_t bytes;
+  void *buf;
+
+  char *msg;
+
   int fd;
   int retval;
-  gchar *msg,*msg2;
-  void *buf;
-  ssize_t bytes;
 
   if (prefs->fxdefsfile==NULL) {
-    prefs->fxdefsfile=g_build_filename(capable->home_dir,LIVES_CONFIG_DIR,"fxdefs",NULL);
+    prefs->fxdefsfile=lives_build_filename(capable->home_dir,LIVES_CONFIG_DIR,"fxdefs",NULL);
   }
 
-  if (g_file_test(prefs->fxdefsfile,G_FILE_TEST_EXISTS)) {
+  if (lives_file_test(prefs->fxdefsfile,LIVES_FILE_TEST_EXISTS)) {
 
     do {
       retval=0;
       if ((fd=lives_open_buffered_rdonly(prefs->fxdefsfile))==-1) {
-	retval=do_read_failed_error_s_with_retry(prefs->fxdefsfile,g_strerror(errno),NULL);
-      }
-      else {
+        retval=do_read_failed_error_s_with_retry(prefs->fxdefsfile,lives_strerror(errno),NULL);
+      } else {
 #ifdef IS_MINGW
-	setmode(fd, O_BINARY);
+        setmode(fd, O_BINARY);
 #endif
-	mainw->read_failed=FALSE;
-	msg2=g_strdup_printf(_("Loading real time effect defaults from %s..."),prefs->fxdefsfile);
-	d_print(msg2);
-	g_free(msg2);
-      
-	msg=g_strdup("LiVES filter defaults file version 1.1\n");
-	buf=g_malloc(strlen(msg));
-	bytes=lives_read_buffered(fd,buf,strlen(msg),TRUE);
-      
-	if (bytes==strlen(msg)&&!strncmp((gchar *)buf,msg,strlen(msg))) {
-	  if (read_filter_defaults(fd)) {
-	    d_print_done();
-	  }
-	  else {
-	    d_print_file_error_failed();
-	    retval=do_read_failed_error_s_with_retry(prefs->fxdefsfile,NULL,NULL);
-	  }
-	}
-	else {
-	  d_print_file_error_failed();
-	  if (bytes<strlen(msg)) {
-	    retval=do_read_failed_error_s_with_retry(prefs->fxdefsfile,NULL,NULL);
-	  }
-	}
-
-	lives_close_buffered(fd);
-	
-	g_free(buf);
-	g_free(msg);
+        mainw->read_failed=FALSE;
+        d_print(_("Loading real time effect defaults from %s..."),prefs->fxdefsfile);
+
+        msg=lives_strdup("LiVES filter defaults file version 1.1\n");
+        buf=lives_malloc(strlen(msg));
+        bytes=lives_read_buffered(fd,buf,strlen(msg),TRUE);
+
+        if (bytes==strlen(msg)&&!strncmp((char *)buf,msg,strlen(msg))) {
+          if (read_filter_defaults(fd)) {
+            d_print_done();
+          } else {
+            d_print_file_error_failed();
+            retval=do_read_failed_error_s_with_retry(prefs->fxdefsfile,NULL,NULL);
+          }
+        } else {
+          d_print_file_error_failed();
+          if (bytes<strlen(msg)) {
+            retval=do_read_failed_error_s_with_retry(prefs->fxdefsfile,NULL,NULL);
+          }
+        }
+
+        lives_close_buffered(fd);
+
+        lives_free(buf);
+        lives_free(msg);
       }
-    } while (retval==LIVES_RETRY);
+    } while (retval==LIVES_RESPONSE_RETRY);
   }
 
 
 
   if (prefs->fxsizesfile==NULL) {
-    prefs->fxsizesfile=g_build_filename(capable->home_dir,LIVES_CONFIG_DIR,"fxsizes",NULL);
+    prefs->fxsizesfile=lives_build_filename(capable->home_dir,LIVES_CONFIG_DIR,"fxsizes",NULL);
   }
 
-  if (g_file_test(prefs->fxsizesfile,G_FILE_TEST_EXISTS)) {
+  if (lives_file_test(prefs->fxsizesfile,LIVES_FILE_TEST_EXISTS)) {
     do {
       retval=0;
       if ((fd=lives_open_buffered_rdonly(prefs->fxsizesfile))==-1) {
-	retval=do_read_failed_error_s_with_retry(prefs->fxsizesfile,g_strerror(errno),NULL);
-	if (retval==LIVES_CANCEL) return;
-      }
-      else {
+        retval=do_read_failed_error_s_with_retry(prefs->fxsizesfile,lives_strerror(errno),NULL);
+        if (retval==LIVES_RESPONSE_CANCEL) return;
+      } else {
 #ifdef IS_MINGW
-	setmode(fd, O_BINARY);
+        setmode(fd, O_BINARY);
 #endif
-	msg2=g_strdup_printf(_("Loading generator default sizes from %s..."),prefs->fxsizesfile);
-	d_print(msg2);
-	g_free(msg2);
-	
-	msg=g_strdup("LiVES generator default sizes file version 2\n");
-	buf=g_malloc(strlen(msg));
-	bytes=lives_read_buffered(fd,buf,strlen(msg),TRUE);
-	if (bytes==strlen(msg)&&!strncmp((gchar *)buf,msg,strlen(msg))) {
-	  if (read_generator_sizes(fd)) {
-	    d_print_done();
-	  }
-	  else {
-	    d_print_file_error_failed();
-	    retval=do_read_failed_error_s_with_retry(prefs->fxsizesfile,NULL,NULL);
-	  }
-	}
-	else {
-	  d_print_file_error_failed();
-	  if (bytes<strlen(msg)) {
-	    retval=do_read_failed_error_s_with_retry(prefs->fxsizesfile,NULL,NULL);
-	  }
-	}
-	lives_close_buffered(fd);
-	
-	g_free(buf);
-	g_free(msg);
+        d_print(_("Loading generator default sizes from %s..."),prefs->fxsizesfile);
+
+        msg=lives_strdup("LiVES generator default sizes file version 2\n");
+        buf=lives_malloc(strlen(msg));
+        bytes=lives_read_buffered(fd,buf,strlen(msg),TRUE);
+        if (bytes==strlen(msg)&&!strncmp((char *)buf,msg,strlen(msg))) {
+          if (read_generator_sizes(fd)) {
+            d_print_done();
+          } else {
+            d_print_file_error_failed();
+            retval=do_read_failed_error_s_with_retry(prefs->fxsizesfile,NULL,NULL);
+          }
+        } else {
+          d_print_file_error_failed();
+          if (bytes<strlen(msg)) {
+            retval=do_read_failed_error_s_with_retry(prefs->fxsizesfile,NULL,NULL);
+          }
+        }
+        lives_close_buffered(fd);
+
+        lives_free(buf);
+        lives_free(msg);
       }
-    } while (retval==LIVES_RETRY);
+    } while (retval==LIVES_RESPONSE_RETRY);
   }
-  
+
   return;
 }
 
 
-static void check_clear_all_button (void) {
+static void check_clear_all_button(void) {
   int modes=rte_getmodespk();
   int i,j;
   boolean hasone=FALSE;
 
-  for (i=0;i<prefs->rte_keys_virtual;i++) {
-    for (j=modes-1;j>=0;j--) {
+  for (i=0; i<prefs->rte_keys_virtual; i++) {
+    for (j=modes-1; j>=0; j--) {
       if (rte_keymode_valid(i+1,j,TRUE)) hasone=TRUE;
     }
   }
 
-  lives_widget_set_sensitive (LIVES_WIDGET(clear_all_button), hasone);
+  lives_widget_set_sensitive(LIVES_WIDGET(clear_all_button), hasone);
 }
 
 
@@ -735,7 +751,7 @@
   ssize_t bytes=lives_read_le_buffered(kfd,&nparams,4,TRUE);
 
   if (nparams>65536) {
-    g_printerr("Too many params, file is probably broken.\n");
+    lives_printerr("Too many params, file is probably broken.\n");
     return FALSE;
   }
 
@@ -752,14 +768,14 @@
 
 
 
-static boolean load_datacons(const gchar *fname, uint8_t **badkeymap) {
+static boolean load_datacons(const char *fname, uint8_t **badkeymap) {
   weed_plant_t **ochans,**ichans,**iparams;
 
   weed_plant_t *filter;
 
   ssize_t bytes;
 
-  gchar *hashname;
+  char *hashname;
 
   boolean ret=TRUE;
   boolean is_valid,is_valid2;
@@ -780,15 +796,14 @@
   int maxmodes=rte_getmodespk();
 
   register int i,j,k,count;
-  
 
-  
+
+
   do {
     retval=0;
     if ((kfd=lives_open_buffered_rdonly(fname))==-1) {
-      retval=do_read_failed_error_s_with_retry(fname,g_strerror(errno),NULL);
-    }
-    else {
+      retval=do_read_failed_error_s_with_retry(fname,lives_strerror(errno),NULL);
+    } else {
 #ifdef IS_MINGW
       setmode(fd, O_BINARY);
 #endif
@@ -796,206 +811,206 @@
 
       bytes=lives_read_le_buffered(kfd,&version,4,TRUE);
       if (bytes<4) {
-	eof=TRUE;
-	break;
+        eof=TRUE;
+        break;
       }
 
       bytes=lives_read_le_buffered(kfd,&ncconx,4,TRUE);
       if (bytes<4) {
-	eof=TRUE;
-	break;
+        eof=TRUE;
+        break;
       }
 
-      for (count=0;count<ncconx;count++) {
-	is_valid=TRUE;
-
-	bytes=lives_read_le_buffered(kfd,&okey,4,TRUE);
-	if (bytes<4) {
-	  eof=TRUE;
-	  break;
-	}
-
-	if (okey<0||okey>=prefs->rte_keys_virtual) is_valid=FALSE;
-
-	bytes=lives_read_le_buffered(kfd,&omode,4,TRUE);
-	if (bytes<4) {
-	  eof=TRUE;
-	  break;
-	}
-
-	  
-	bytes=lives_read_le_buffered(kfd,&hlen,4,TRUE);
-	if (bytes<4) {
-	  eof=TRUE;
-	  break;
-	}
-	  
-	hashname=(gchar *)g_try_malloc(hlen+1);
-
-	if (hashname==NULL) {
-	  eof=TRUE;
-	  break;
-	}
-
-	bytes=lives_read_buffered(kfd,hashname,hlen,TRUE);
-	if (bytes<hlen) {
-	  eof=TRUE;
-	  g_free(hashname);
-	  break;
-	}
-	  
-	memset(hashname+hlen,0,1);
-	  
-	if (omode<0||omode>maxmodes) is_valid=FALSE;
-	  
-	if (is_valid) {
-	  // if we had bad/missing fx, adjust the omode value
-	  for (i=0;i<omode;i++) omode-=badkeymap[okey][omode];
-	}
-
-	if (omode<0||omode>maxmodes) is_valid=FALSE;
-
-
-	if (is_valid) {
-	  int fidx=rte_keymode_get_filter_idx(okey+1,omode);
-	  if (fidx==-1) is_valid=FALSE;
-	  else {
-	    gchar *hashname2=make_weed_hashname(fidx,TRUE,FALSE);
-	    if (strcmp(hashname,hashname2)) is_valid=FALSE;
-	    g_free(hashname2);
-	    if (!is_valid) {
-	      hashname2=make_weed_hashname(fidx,TRUE,TRUE);
-	      if (!strcmp(hashname,hashname2)) is_valid=TRUE;
-	      g_free(hashname2);
-	    }
-	  }
-	}
-
-	g_free(hashname);
-
-	bytes=lives_read_le_buffered(kfd,&nchans,4,TRUE);
-	if (bytes<4) {
-	  eof=TRUE;
-	  break;
-	}
-
-	for (i=0;i<nchans;i++) {
-	  is_valid2=is_valid;
-
-	  bytes=lives_read_le_buffered(kfd,&ocnum,4,TRUE);
-	  if (bytes<4) {
-	    eof=TRUE;
-	    break;
-	  }
-
-	  // check ocnum
-	  filter=rte_keymode_get_filter(okey+1,omode);
-	  nochans=weed_leaf_num_elements(filter,"out_channel_templates");
-	  if (ocnum>=nochans) is_valid2=FALSE;
-	  else {
-	    ochans=weed_get_plantptr_array(filter,"out_channel_templates",&error);
-	    if (!has_alpha_palette(ochans[ocnum])) is_valid2=FALSE;
-	    weed_free(ochans);
-	  }
-
-	  bytes=lives_read_le_buffered(kfd,&nconns,4,TRUE);
-	  if (bytes<4) {
-	    eof=TRUE;
-	    break;
-	  }
-
-	  for (j=0;j<nconns;j++) {
-	    bytes=lives_read_le_buffered(kfd,&ikey,4,TRUE);
-	    if (bytes<4) {
-	      eof=TRUE;
-	      break;
-	    }
-
-	    bytes=lives_read_le_buffered(kfd,&imode,4,TRUE);
-	    if (bytes<4) {
-	      eof=TRUE;
-	      break;
-	    }
-
-	    bytes=lives_read_le_buffered(kfd,&hlen,4,TRUE);
-	    if (bytes<4) {
-	      eof=TRUE;
-	      break;
-	    }
-	      
-	    hashname=(gchar *)g_try_malloc(hlen+1);
-
-	    if (hashname==NULL) {
-	      eof=TRUE;
-	      break;
-	    }
-
-	    bytes=lives_read_buffered(kfd,hashname,hlen,TRUE);
-	    if (bytes<hlen) {
-	      eof=TRUE;
-	      g_free(hashname);
-	      break;
-	    }
-	      
-	    memset(hashname+hlen,0,1);
-	  
-	    if (imode<0||imode>maxmodes) is_valid2=FALSE;
-
-
-	    if (is_valid2) {
-	      // if we had bad/missing fx, adjust the omode value
-	      for (k=0;k<imode;k++) imode-=badkeymap[ikey][imode];
-	    }
-
-	    if (imode<0||imode>maxmodes) is_valid2=FALSE;
-
-	    if (is_valid2) {
-	      int fidx=rte_keymode_get_filter_idx(ikey+1,imode);
-	      if (fidx==-1) is_valid2=FALSE;
-	      else {
-		gchar *hashname2=make_weed_hashname(fidx,TRUE,FALSE);
-		if (strcmp(hashname,hashname2)) is_valid2=FALSE;
-		g_free(hashname2);
-		if (!is_valid2) {
-		  hashname2=make_weed_hashname(fidx,TRUE,TRUE);
-		  if (!strcmp(hashname,hashname2)) is_valid2=TRUE;
-		  g_free(hashname2);
-		}
-	      }
-	    }
-
-	    g_free(hashname);
-
-	    bytes=lives_read_le_buffered(kfd,&icnum,4,TRUE);
-	    if (bytes<4) {
-	      eof=TRUE;
-	      break;
-	    }
-
-	    // check icnum
-	    filter=rte_keymode_get_filter(ikey+1,imode);
-	    nichans=weed_leaf_num_elements(filter,"in_channel_templates");
-	    if (icnum>=nichans) is_valid2=FALSE;
-	    else {
-	      ichans=weed_get_plantptr_array(filter,"in_channel_templates",&error);
-	      if (!has_alpha_palette(ichans[icnum])) is_valid2=FALSE;
-	      weed_free(ichans);
-	    }
-
-
-
-	    if (is_valid2) cconx_add_connection(okey,omode,ocnum,ikey,imode,icnum);
-
-
-
-	  }
-
-	  if (eof) break;
-
-
-	}
-
-	if (eof) break;
+      for (count=0; count<ncconx; count++) {
+        is_valid=TRUE;
+
+        bytes=lives_read_le_buffered(kfd,&okey,4,TRUE);
+        if (bytes<4) {
+          eof=TRUE;
+          break;
+        }
+
+        if (okey<0||okey>=prefs->rte_keys_virtual) is_valid=FALSE;
+
+        bytes=lives_read_le_buffered(kfd,&omode,4,TRUE);
+        if (bytes<4) {
+          eof=TRUE;
+          break;
+        }
+
+
+        bytes=lives_read_le_buffered(kfd,&hlen,4,TRUE);
+        if (bytes<4) {
+          eof=TRUE;
+          break;
+        }
+
+        hashname=(char *)lives_try_malloc(hlen+1);
+
+        if (hashname==NULL) {
+          eof=TRUE;
+          break;
+        }
+
+        bytes=lives_read_buffered(kfd,hashname,hlen,TRUE);
+        if (bytes<hlen) {
+          eof=TRUE;
+          lives_free(hashname);
+          break;
+        }
+
+        memset(hashname+hlen,0,1);
+
+        if (omode<0||omode>maxmodes) is_valid=FALSE;
+
+        if (is_valid) {
+          // if we had bad/missing fx, adjust the omode value
+          for (i=0; i<omode; i++) omode-=badkeymap[okey][omode];
+        }
+
+        if (omode<0||omode>maxmodes) is_valid=FALSE;
+
+
+        if (is_valid) {
+          int fidx=rte_keymode_get_filter_idx(okey+1,omode);
+          if (fidx==-1) is_valid=FALSE;
+          else {
+            char *hashname2=make_weed_hashname(fidx,TRUE,FALSE);
+            if (strcmp(hashname,hashname2)) is_valid=FALSE;
+            lives_free(hashname2);
+            if (!is_valid) {
+              hashname2=make_weed_hashname(fidx,TRUE,TRUE);
+              if (!strcmp(hashname,hashname2)) is_valid=TRUE;
+              lives_free(hashname2);
+            }
+          }
+        }
+
+        lives_free(hashname);
+
+        bytes=lives_read_le_buffered(kfd,&nchans,4,TRUE);
+        if (bytes<4) {
+          eof=TRUE;
+          break;
+        }
+
+        for (i=0; i<nchans; i++) {
+          is_valid2=is_valid;
+
+          bytes=lives_read_le_buffered(kfd,&ocnum,4,TRUE);
+          if (bytes<4) {
+            eof=TRUE;
+            break;
+          }
+
+          // check ocnum
+          filter=rte_keymode_get_filter(okey+1,omode);
+          nochans=weed_leaf_num_elements(filter,"out_channel_templates");
+          if (ocnum>=nochans) is_valid2=FALSE;
+          else {
+            ochans=weed_get_plantptr_array(filter,"out_channel_templates",&error);
+            if (!has_alpha_palette(ochans[ocnum])) is_valid2=FALSE;
+            lives_free(ochans);
+          }
+
+          bytes=lives_read_le_buffered(kfd,&nconns,4,TRUE);
+          if (bytes<4) {
+            eof=TRUE;
+            break;
+          }
+
+          for (j=0; j<nconns; j++) {
+            bytes=lives_read_le_buffered(kfd,&ikey,4,TRUE);
+            if (bytes<4) {
+              eof=TRUE;
+              break;
+            }
+
+            bytes=lives_read_le_buffered(kfd,&imode,4,TRUE);
+            if (bytes<4) {
+              eof=TRUE;
+              break;
+            }
+
+            bytes=lives_read_le_buffered(kfd,&hlen,4,TRUE);
+            if (bytes<4) {
+              eof=TRUE;
+              break;
+            }
+
+            hashname=(char *)lives_try_malloc(hlen+1);
+
+            if (hashname==NULL) {
+              eof=TRUE;
+              break;
+            }
+
+            bytes=lives_read_buffered(kfd,hashname,hlen,TRUE);
+            if (bytes<hlen) {
+              eof=TRUE;
+              lives_free(hashname);
+              break;
+            }
+
+            memset(hashname+hlen,0,1);
+
+            if (imode<0||imode>maxmodes) is_valid2=FALSE;
+
+
+            if (is_valid2) {
+              // if we had bad/missing fx, adjust the omode value
+              for (k=0; k<imode; k++) imode-=badkeymap[ikey][imode];
+            }
+
+            if (imode<0||imode>maxmodes) is_valid2=FALSE;
+
+            if (is_valid2) {
+              int fidx=rte_keymode_get_filter_idx(ikey+1,imode);
+              if (fidx==-1) is_valid2=FALSE;
+              else {
+                char *hashname2=make_weed_hashname(fidx,TRUE,FALSE);
+                if (strcmp(hashname,hashname2)) is_valid2=FALSE;
+                lives_free(hashname2);
+                if (!is_valid2) {
+                  hashname2=make_weed_hashname(fidx,TRUE,TRUE);
+                  if (!strcmp(hashname,hashname2)) is_valid2=TRUE;
+                  lives_free(hashname2);
+                }
+              }
+            }
+
+            lives_free(hashname);
+
+            bytes=lives_read_le_buffered(kfd,&icnum,4,TRUE);
+            if (bytes<4) {
+              eof=TRUE;
+              break;
+            }
+
+            // check icnum
+            filter=rte_keymode_get_filter(ikey+1,imode);
+            nichans=weed_leaf_num_elements(filter,"in_channel_templates");
+            if (icnum>=nichans) is_valid2=FALSE;
+            else {
+              ichans=weed_get_plantptr_array(filter,"in_channel_templates",&error);
+              if (!has_alpha_palette(ichans[icnum])) is_valid2=FALSE;
+              lives_free(ichans);
+            }
+
+
+
+            if (is_valid2) cconx_add_connection(okey,omode,ocnum,ikey,imode,icnum);
+
+
+
+          }
+
+          if (eof) break;
+
+
+        }
+
+        if (eof) break;
 
 
       }
@@ -1008,202 +1023,202 @@
 
       bytes=lives_read_le_buffered(kfd,&npconx,4,TRUE);
       if (bytes<4) {
-	eof=TRUE;
-	break;
+        eof=TRUE;
+        break;
       }
 
-      for (count=0;count<npconx;count++) {
-	is_valid=TRUE;
-
-	bytes=lives_read_le_buffered(kfd,&okey,4,TRUE);
-	if (bytes<4) {
-	  eof=TRUE;
-	  break;
-	}
-
-	if (okey<0||okey>=prefs->rte_keys_virtual) is_valid=FALSE;
-
-	bytes=lives_read_le_buffered(kfd,&omode,4,TRUE);
-	if (bytes<4) {
-	  eof=TRUE;
-	  break;
-	}
-
-	  
-	bytes=lives_read_le_buffered(kfd,&hlen,4,TRUE);
-	if (bytes<4) {
-	  eof=TRUE;
-	  break;
-	}
-
-	hashname=(gchar *)g_try_malloc(hlen+1);
-
-	if (hashname==NULL) {
-	  eof=TRUE;
-	  break;
-	}
-
-	bytes=lives_read_buffered(kfd,hashname,hlen,TRUE);
-	if (bytes<hlen) {
-	  eof=TRUE;
-	  g_free(hashname);
-	  break;
-	}
-	  
-	memset(hashname+hlen,0,1);
-	  
-
-	if (omode<0||omode>maxmodes) is_valid=FALSE;
-
-	if (is_valid) {
-	  // if we had bad/missing fx, adjust the omode value
-	  for (i=0;i<omode;i++) omode-=badkeymap[okey][omode];
-	}
-
-	if (omode<0||omode>maxmodes) is_valid=FALSE;
-
-
-	if (is_valid) {
-	  int fidx=rte_keymode_get_filter_idx(okey+1,omode);
-	  if (fidx==-1) is_valid=FALSE;
-	  else {
-	    gchar *hashname2=make_weed_hashname(fidx,TRUE,FALSE);
-	    if (strcmp(hashname,hashname2)) is_valid=FALSE;
-	    g_free(hashname2);
-	    if (!is_valid) {
-	      hashname2=make_weed_hashname(fidx,TRUE,TRUE);
-	      if (!strcmp(hashname,hashname2)) is_valid=TRUE;
-	      g_free(hashname2);
-	    }
-	  }
-	}
-
-	g_free(hashname);
-
-	bytes=lives_read_le_buffered(kfd,&nparams,4,TRUE);
-	if (bytes<4) {
-	  eof=TRUE;
-	  break;
-	}
-
-	for (i=0;i<nparams;i++) {
-	  is_valid2=is_valid;
-
-	  bytes=lives_read_le_buffered(kfd,&opnum,4,TRUE);
-	  if (bytes<4) {
-	    eof=TRUE;
-	    break;
-	  }
-
-	  // check opnum
-	  filter=rte_keymode_get_filter(okey+1,omode);
-	  noparams=weed_leaf_num_elements(filter,"out_parameter_templates");
-	  if (opnum>=noparams) is_valid2=FALSE;
-
-	  bytes=lives_read_le_buffered(kfd,&nconns,4,TRUE);
-	  if (bytes<4) {
-	    eof=TRUE;
-	    break;
-	  }
-
-	  for (j=0;j<nconns;j++) {
-	    bytes=lives_read_le_buffered(kfd,&ikey,4,TRUE);
-	    if (bytes<4) {
-	      eof=TRUE;
-	      break;
-	    }
-
-	    bytes=lives_read_le_buffered(kfd,&imode,4,TRUE);
-	    if (bytes<4) {
-	      eof=TRUE;
-	      break;
-	    }
-
-	    bytes=lives_read_le_buffered(kfd,&hlen,4,TRUE);
-	    if (bytes<4) {
-	      eof=TRUE;
-	      break;
-	    }
-	      
-	    hashname=(gchar *)g_try_malloc(hlen+1);
-
-	    if (hashname==NULL) {
-	      eof=TRUE;
-	      break;
-	    }
-
-	    bytes=lives_read_buffered(kfd,hashname,hlen,TRUE);
-	    if (bytes<hlen) {
-	      eof=TRUE;
-	      g_free(hashname);
-	      break;
-	    }
-	      
-	    memset(hashname+hlen,0,1);
-
-	    if (imode<0||imode>maxmodes) is_valid2=FALSE;
-
-	    if (is_valid2) {
-	      // if we had bad/missing fx, adjust the omode value
-	      for (k=0;k<imode;k++) imode-=badkeymap[ikey][imode];
-	    }
-
-	    if (imode<0||imode>maxmodes) is_valid2=FALSE;
-
-	    if (is_valid2) {
-	      int fidx=rte_keymode_get_filter_idx(ikey+1,imode);
-	      if (fidx==-1) is_valid2=FALSE;
-	      else {
-		gchar *hashname2=make_weed_hashname(fidx,TRUE,FALSE);
-		if (strcmp(hashname,hashname2)) is_valid2=FALSE;
-		g_free(hashname2);
-		if (!is_valid2) {
-		  hashname2=make_weed_hashname(fidx,TRUE,TRUE);
-		  if (!strcmp(hashname,hashname2)) is_valid2=TRUE;
-		  g_free(hashname2);
-		}
-	      }
-	    }
-
-	    g_free(hashname);
-
-	    bytes=lives_read_le_buffered(kfd,&ipnum,4,TRUE);
-	    if (bytes<4) {
-	      eof=TRUE;
-	      break;
-	    }
-
-	    // check ipnum
-	    filter=rte_keymode_get_filter(ikey+1,imode);
-	    niparams=weed_leaf_num_elements(filter,"in_parameter_templates");
-	    if (ipnum>=niparams) is_valid2=FALSE;
-	    else {
-	      if (ipnum>=0) {
-		iparams=weed_get_plantptr_array(filter,"in_parameter_templates",&error);
-		if (weed_plant_has_leaf(iparams[ipnum],"host_internal_connection")) is_valid2=FALSE;
-		weed_free(iparams);
-	      }
-	    }
-
-	    bytes=lives_read_le_buffered(kfd,&autoscale,4,TRUE);
-	    if (bytes<4) {
-	      eof=TRUE;
-	      break;
-	    }
-
-	    if (is_valid2) {
-	      pconx_add_connection(okey,omode,opnum,ikey,imode,ipnum,autoscale);
-	    }
-
-
-	  }
-
-	  if (eof) break;
-
-
-	}
-
-	if (eof) break;
+      for (count=0; count<npconx; count++) {
+        is_valid=TRUE;
+
+        bytes=lives_read_le_buffered(kfd,&okey,4,TRUE);
+        if (bytes<4) {
+          eof=TRUE;
+          break;
+        }
+
+        if (okey<0||okey>=prefs->rte_keys_virtual) is_valid=FALSE;
+
+        bytes=lives_read_le_buffered(kfd,&omode,4,TRUE);
+        if (bytes<4) {
+          eof=TRUE;
+          break;
+        }
+
+
+        bytes=lives_read_le_buffered(kfd,&hlen,4,TRUE);
+        if (bytes<4) {
+          eof=TRUE;
+          break;
+        }
+
+        hashname=(char *)lives_try_malloc(hlen+1);
+
+        if (hashname==NULL) {
+          eof=TRUE;
+          break;
+        }
+
+        bytes=lives_read_buffered(kfd,hashname,hlen,TRUE);
+        if (bytes<hlen) {
+          eof=TRUE;
+          lives_free(hashname);
+          break;
+        }
+
+        memset(hashname+hlen,0,1);
+
+
+        if (omode<0||omode>maxmodes) is_valid=FALSE;
+
+        if (is_valid) {
+          // if we had bad/missing fx, adjust the omode value
+          for (i=0; i<omode; i++) omode-=badkeymap[okey][omode];
+        }
+
+        if (omode<0||omode>maxmodes) is_valid=FALSE;
+
+
+        if (is_valid) {
+          int fidx=rte_keymode_get_filter_idx(okey+1,omode);
+          if (fidx==-1) is_valid=FALSE;
+          else {
+            char *hashname2=make_weed_hashname(fidx,TRUE,FALSE);
+            if (strcmp(hashname,hashname2)) is_valid=FALSE;
+            lives_free(hashname2);
+            if (!is_valid) {
+              hashname2=make_weed_hashname(fidx,TRUE,TRUE);
+              if (!strcmp(hashname,hashname2)) is_valid=TRUE;
+              lives_free(hashname2);
+            }
+          }
+        }
+
+        lives_free(hashname);
+
+        bytes=lives_read_le_buffered(kfd,&nparams,4,TRUE);
+        if (bytes<4) {
+          eof=TRUE;
+          break;
+        }
+
+        for (i=0; i<nparams; i++) {
+          is_valid2=is_valid;
+
+          bytes=lives_read_le_buffered(kfd,&opnum,4,TRUE);
+          if (bytes<4) {
+            eof=TRUE;
+            break;
+          }
+
+          // check opnum
+          filter=rte_keymode_get_filter(okey+1,omode);
+          noparams=weed_leaf_num_elements(filter,"out_parameter_templates");
+          if (opnum>=noparams) is_valid2=FALSE;
+
+          bytes=lives_read_le_buffered(kfd,&nconns,4,TRUE);
+          if (bytes<4) {
+            eof=TRUE;
+            break;
+          }
+
+          for (j=0; j<nconns; j++) {
+            bytes=lives_read_le_buffered(kfd,&ikey,4,TRUE);
+            if (bytes<4) {
+              eof=TRUE;
+              break;
+            }
+
+            bytes=lives_read_le_buffered(kfd,&imode,4,TRUE);
+            if (bytes<4) {
+              eof=TRUE;
+              break;
+            }
+
+            bytes=lives_read_le_buffered(kfd,&hlen,4,TRUE);
+            if (bytes<4) {
+              eof=TRUE;
+              break;
+            }
+
+            hashname=(char *)lives_try_malloc(hlen+1);
+
+            if (hashname==NULL) {
+              eof=TRUE;
+              break;
+            }
+
+            bytes=lives_read_buffered(kfd,hashname,hlen,TRUE);
+            if (bytes<hlen) {
+              eof=TRUE;
+              lives_free(hashname);
+              break;
+            }
+
+            memset(hashname+hlen,0,1);
+
+            if (imode<0||imode>maxmodes) is_valid2=FALSE;
+
+            if (is_valid2) {
+              // if we had bad/missing fx, adjust the omode value
+              for (k=0; k<imode; k++) imode-=badkeymap[ikey][imode];
+            }
+
+            if (imode<0||imode>maxmodes) is_valid2=FALSE;
+
+            if (is_valid2) {
+              int fidx=rte_keymode_get_filter_idx(ikey+1,imode);
+              if (fidx==-1) is_valid2=FALSE;
+              else {
+                char *hashname2=make_weed_hashname(fidx,TRUE,FALSE);
+                if (strcmp(hashname,hashname2)) is_valid2=FALSE;
+                lives_free(hashname2);
+                if (!is_valid2) {
+                  hashname2=make_weed_hashname(fidx,TRUE,TRUE);
+                  if (!strcmp(hashname,hashname2)) is_valid2=TRUE;
+                  lives_free(hashname2);
+                }
+              }
+            }
+
+            lives_free(hashname);
+
+            bytes=lives_read_le_buffered(kfd,&ipnum,4,TRUE);
+            if (bytes<4) {
+              eof=TRUE;
+              break;
+            }
+
+            // check ipnum
+            filter=rte_keymode_get_filter(ikey+1,imode);
+            niparams=weed_leaf_num_elements(filter,"in_parameter_templates");
+            if (ipnum>=niparams) is_valid2=FALSE;
+            else {
+              if (ipnum>=0) {
+                iparams=weed_get_plantptr_array(filter,"in_parameter_templates",&error);
+                if (weed_plant_has_leaf(iparams[ipnum],"host_internal_connection")) is_valid2=FALSE;
+                lives_free(iparams);
+              }
+            }
+
+            bytes=lives_read_le_buffered(kfd,&autoscale,4,TRUE);
+            if (bytes<4) {
+              eof=TRUE;
+              break;
+            }
+
+            if (is_valid2) {
+              pconx_add_connection(okey,omode,opnum,ikey,imode,ipnum,autoscale);
+            }
+
+
+          }
+
+          if (eof) break;
+
+
+        }
+
+        if (eof) break;
 
 
       }
@@ -1212,11 +1227,11 @@
 
 
       lives_close_buffered(kfd);
-	
+
     }
-  } while (retval==LIVES_RETRY);
+  } while (retval==LIVES_RESPONSE_RETRY);
 
-  if (retval==LIVES_CANCEL) {
+  if (retval==LIVES_RESPONSE_CANCEL) {
     d_print_cancelled();
     return FALSE;
   }
@@ -1237,13 +1252,12 @@
     else lives_widget_set_sensitive(param_buttons[idx],FALSE);
     lives_widget_set_sensitive(combos[idx],TRUE);
     if (mode<modes-1) lives_widget_set_sensitive(combos[idx+1],TRUE);
-  }
-  else {
+  } else {
     lives_widget_set_sensitive(conx_buttons[idx],FALSE);
     lives_widget_set_sensitive(param_buttons[idx],FALSE);
-    if (mode==0||rte_keymode_get_filter(key+1,mode-1)!=NULL) 
+    if (mode==0||rte_keymode_get_filter(key+1,mode-1)!=NULL)
       lives_widget_set_sensitive(combos[idx],TRUE);
-    else 
+    else
       lives_widget_set_sensitive(combos[idx],FALSE);
   }
 
@@ -1252,26 +1266,26 @@
 
 
 
-boolean on_load_keymap_clicked (LiVESButton *button, gpointer user_data) {
+boolean on_load_keymap_clicked(LiVESButton *button, livespointer user_data) {
   // show file errors at this level
   FILE *kfile=NULL;
 
-  GList *list=NULL,*new_list=NULL;
+  LiVESList *list=NULL,*new_list=NULL;
 
   size_t linelen;
   ssize_t bytes;
 
-  gchar buff[65536];
-  gchar *msg,*tmp;
-  gchar *whole=g_strdup (""),*whole2;
-  gchar *hashname,*hashname_new=NULL;
+  char buff[65536];
+  char *msg,*tmp;
+  char *whole=lives_strdup(""),*whole2;
+  char *hashname,*hashname_new=NULL;
 
-  gchar *line=NULL;
-  gchar *whashname;
+  char *line=NULL;
+  char *whashname;
 
-  gchar *keymap_file=g_build_filename(capable->home_dir,LIVES_CONFIG_DIR,"default.keymap",NULL);
-  gchar *keymap_file2=g_build_filename(capable->home_dir,LIVES_CONFIG_DIR,"default.keymap2",NULL);
-  gchar *keymap_file3=g_build_filename(capable->home_dir,LIVES_CONFIG_DIR,"default.keymap3",NULL);
+  char *keymap_file=lives_build_filename(capable->home_dir,LIVES_CONFIG_DIR,"default.keymap",NULL);
+  char *keymap_file2=lives_build_filename(capable->home_dir,LIVES_CONFIG_DIR,"default.keymap2",NULL);
+  char *keymap_file3=lives_build_filename(capable->home_dir,LIVES_CONFIG_DIR,"default.keymap3",NULL);
 
   int *def_modes;
   uint8_t **badkeymap;
@@ -1291,21 +1305,18 @@
 
   register int i;
 
-  def_modes=(int *)g_malloc(prefs->rte_keys_virtual*sizint);
-  for (i=0;i<prefs->rte_keys_virtual;i++) def_modes[i]=-1;
+  def_modes=(int *)lives_malloc(prefs->rte_keys_virtual*sizint);
+  for (i=0; i<prefs->rte_keys_virtual; i++) def_modes[i]=-1;
 
-  if (g_file_test(keymap_file2,G_FILE_TEST_EXISTS)) {
-    g_free(keymap_file);
+  if (lives_file_test(keymap_file2,LIVES_FILE_TEST_EXISTS)) {
+    lives_free(keymap_file);
     keymap_file=keymap_file2;
-  }
-  else {
-    g_free(keymap_file2);
+  } else {
+    lives_free(keymap_file2);
     keymap_file2=NULL;
   }
 
-  msg=g_strdup_printf(_("Loading default keymap from %s..."),keymap_file);
-  d_print(msg);
-  g_free(msg);
+  d_print(_("Loading default keymap from %s..."),keymap_file);
 
   do {
     retval=0;
@@ -1314,30 +1325,29 @@
       if ((kfd=lives_open_buffered_rdonly(keymap_file))==-1) has_error=TRUE;
 #ifdef IS_MINGW
       else {
-	setmode(kfd, O_BINARY);
+        setmode(kfd, O_BINARY);
       }
 #endif
 
-    }
-    else {
-      if (!(kfile=fopen (keymap_file,"r"))) {
-	has_error=TRUE;
+    } else {
+      if (!(kfile=fopen(keymap_file,"r"))) {
+        has_error=TRUE;
       }
     }
 
     if (has_error) {
-      msg=g_strdup_printf (_("\n\nUnable to read from keymap file\n%s\nError code %d\n"),keymap_file,errno);
+      msg=lives_strdup_printf(_("\n\nUnable to read from keymap file\n%s\nError code %d\n"),keymap_file,errno);
       retval=do_abort_cancel_retry_dialog(msg,LIVES_WINDOW(rte_window));
-      g_free (msg);
-   
-      if (retval==LIVES_CANCEL) {
-	g_free(keymap_file);
-	d_print_file_error_failed();
-	g_free(def_modes);
-	return FALSE;
+      lives_free(msg);
+
+      if (retval==LIVES_RESPONSE_CANCEL) {
+        lives_free(keymap_file);
+        d_print_file_error_failed();
+        lives_free(def_modes);
+        return FALSE;
       }
     }
-  } while (retval==LIVES_RETRY);
+  } while (retval==LIVES_RESPONSE_RETRY);
 
   on_clear_all_clicked(NULL,user_data);
 
@@ -1345,13 +1355,13 @@
     // user cancelled
     mainw->error=FALSE;
     d_print_cancelled();
-    g_free(def_modes);
+    lives_free(def_modes);
     return FALSE;
   }
 
 
-  badkeymap=(uint8_t **)g_malloc(prefs->rte_keys_virtual*sizeof(uint8_t *));
-  for (i=0;i<prefs->rte_keys_virtual;i++) {
+  badkeymap=(uint8_t **)lives_malloc(prefs->rte_keys_virtual*sizeof(uint8_t *));
+  for (i=0; i<prefs->rte_keys_virtual; i++) {
     badkeymap[i]=(uint8_t *)lives_calloc(modes,1);
   }
 
@@ -1360,26 +1370,25 @@
     // version 1 file
     while (fgets(buff,65536,kfile)) {
       if (strlen(buff)) {
-	line=(g_strstrip(buff));
-	if ((linelen=strlen (line))) {
-	  whole2=g_strconcat (whole,line,NULL);
-	  if (whole2!=whole) g_free (whole);
-	  whole=whole2;
-	  if (linelen<(size_t)65535) {
-	    list=g_list_append (list, g_strdup (whole));
-	    g_free (whole);
-	    whole=g_strdup ("");
-	  }
-	}
+        line=(lives_strstrip(buff));
+        if ((linelen=strlen(line))) {
+          whole2=lives_strconcat(whole,line,NULL);
+          if (whole2!=whole) lives_free(whole);
+          whole=whole2;
+          if (linelen<(size_t)65535) {
+            list=lives_list_append(list, lives_strdup(whole));
+            lives_free(whole);
+            whole=lives_strdup("");
+          }
+        }
       }
     }
-    fclose (kfile);
+    fclose(kfile);
 
-    if (!strcmp((gchar *)g_list_nth_data(list,0),"LiVES keymap file version 2")||
-	!strcmp((gchar *)g_list_nth_data(list,0),"LiVES keymap file version 1")) update=1;
-    if (!strcmp((gchar *)g_list_nth_data(list,0),"LiVES keymap file version 3")) update=2;
-  }
-  else {
+    if (!strcmp((char *)lives_list_nth_data(list,0),"LiVES keymap file version 2")||
+        !strcmp((char *)lives_list_nth_data(list,0),"LiVES keymap file version 1")) update=1;
+    if (!strcmp((char *)lives_list_nth_data(list,0),"LiVES keymap file version 3")) update=2;
+  } else {
     // newer style
 
     // read version
@@ -1389,56 +1398,54 @@
     }
   }
 
-  g_free (whole);
+  lives_free(whole);
 
-  for (i=1;(keymap_file2==NULL&&i<g_list_length(list))||(keymap_file2!=NULL&&!eof);i++) {
-    gchar **array;
+  for (i=1; (keymap_file2==NULL&&i<lives_list_length(list))||(keymap_file2!=NULL&&!eof); i++) {
+    char **array;
 
     if (keymap_file2==NULL) {
       // old style
 
-      line=(gchar *)g_list_nth_data(list,i);
-    
+      line=(char *)lives_list_nth_data(list,i);
+
       if (get_token_count(line,'|')<2) {
-	d_print((tmp=g_strdup_printf(_("Invalid line %d in %s\n"),i,keymap_file)));
-	g_free(tmp);
-	continue;
+        d_print(_("Invalid line %d in %s\n"),i,keymap_file);
+        continue;
       }
-      
-      array=g_strsplit (line,"|",-1);
-      
+
+      array=lives_strsplit(line,"|",-1);
+
       if (!strcmp(array[0],"defaults")) {
-	g_strfreev(array);
-	array=g_strsplit(line,"|",2);
-	if (prefs->fxdefsfile!=NULL) g_free(prefs->fxdefsfile);
-	prefs->fxdefsfile=g_strdup(array[1]);
-	g_strfreev(array);
-	continue;
+        lives_strfreev(array);
+        array=lives_strsplit(line,"|",2);
+        if (prefs->fxdefsfile!=NULL) lives_free(prefs->fxdefsfile);
+        prefs->fxdefsfile=lives_strdup(array[1]);
+        lives_strfreev(array);
+        continue;
       }
-      
+
       if (!strcmp(array[0],"sizes")) {
-	g_strfreev(array);
-	array=g_strsplit(line,"|",2);
-	if (prefs->fxsizesfile!=NULL) g_free(prefs->fxsizesfile);
-	prefs->fxsizesfile=g_strdup(array[1]);
-	g_strfreev(array);
-	continue;
+        lives_strfreev(array);
+        array=lives_strsplit(line,"|",2);
+        if (prefs->fxsizesfile!=NULL) lives_free(prefs->fxsizesfile);
+        prefs->fxsizesfile=lives_strdup(array[1]);
+        lives_strfreev(array);
+        continue;
       }
-      
+
       key=atoi(array[0]);
-    
-      hashname=g_strdup(array[1]);
-      g_strfreev(array);
-      
+
+      hashname=lives_strdup(array[1]);
+      lives_strfreev(array);
+
       if (update>0) {
-	if (update==1) hashname_new=g_strdup_printf("%d|Weed%s1\n",key,hashname);
-	if (update==2) hashname_new=g_strdup_printf("%d|Weed%s\n",key,hashname);
-	new_list=g_list_append(new_list,hashname_new);
-	g_free(hashname);
-	continue;
+        if (update==1) hashname_new=lives_strdup_printf("%d|Weed%s1\n",key,hashname);
+        if (update==2) hashname_new=lives_strdup_printf("%d|Weed%s\n",key,hashname);
+        new_list=lives_list_append(new_list,hashname_new);
+        lives_free(hashname);
+        continue;
       }
-    }
-    else {
+    } else {
       // newer style
 
       // file format is: (4 bytes int)key(4 bytes int)hlen(hlen bytes)hashname
@@ -1446,48 +1453,48 @@
       //read key and hashname
       bytes=lives_read_le_buffered(kfd,&key,4,TRUE);
       if (bytes<4) {
-	eof=TRUE;
-	break;
+        eof=TRUE;
+        break;
       }
 
       bytes=lives_read_le_buffered(kfd,&hlen,4,TRUE);
       if (bytes<4) {
-	eof=TRUE;
-	break;
+        eof=TRUE;
+        break;
       }
 
-      hashname=(gchar *)g_try_malloc(hlen+1);
+      hashname=(char *)lives_try_malloc(hlen+1);
 
       if (hashname==NULL) {
-	eof=TRUE;
-	break;
+        eof=TRUE;
+        break;
       }
 
       bytes=lives_read_buffered(kfd,hashname,hlen,TRUE);
       if (bytes<hlen) {
-	eof=TRUE;
-	g_free(hashname);
-	break;
+        eof=TRUE;
+        lives_free(hashname);
+        break;
       }
 
       memset(hashname+hlen,0,1);
 
-      array=g_strsplit(hashname,"|",-1);
-      g_free(hashname);
-      hashname=g_strdup(array[0]);
-      g_strfreev(array);
+      array=lives_strsplit(hashname,"|",-1);
+      lives_free(hashname);
+      hashname=lives_strdup(array[0]);
+      lives_strfreev(array);
 
     }
 
     if (key<1||key>prefs->rte_keys_virtual) {
-      d_print((tmp=g_strdup_printf(_("Invalid key %d in %s\n"),key,keymap_file)));
+      d_print((tmp=lives_strdup_printf(_("Invalid key %d in %s\n"),key,keymap_file)));
       LIVES_ERROR(tmp);
-      g_free(tmp);
+      lives_free(tmp);
       notfound=TRUE;
-      g_free(hashname);
+      lives_free(hashname);
       if (keymap_file2!=NULL) {
-	// read param defaults
-	if (!read_perkey_defaults(kfd,-1,-1,version)) break; // file read error
+        // read param defaults
+        if (!read_perkey_defaults(kfd,-1,-1,version)) break; // file read error
       }
       continue;
     }
@@ -1495,15 +1502,15 @@
     def_modes[key-1]++;
 
     if (strncmp(hashname,"Weed",4)||strlen(hashname)<5) {
-      d_print((tmp=g_strdup_printf(_("Invalid effect %s in %s\n"),hashname,keymap_file)));
+      d_print((tmp=lives_strdup_printf(_("Invalid effect %s in %s\n"),hashname,keymap_file)));
       LIVES_ERROR(tmp);
-      g_free(tmp);
+      lives_free(tmp);
       notfound=TRUE;
-      g_free(hashname);
+      lives_free(hashname);
       badkeymap[key-1][def_modes[key-1]]++;
       if (keymap_file2!=NULL) {
-	// read param defaults
-	if (!read_perkey_defaults(kfd,-1,-1,version)) break; // file read error
+        // read param defaults
+        if (!read_perkey_defaults(kfd,-1,-1,version)) break; // file read error
       }
       def_modes[key-1]--;
       continue;
@@ -1514,42 +1521,42 @@
 
     if ((mode=weed_add_effectkey(key,whashname,TRUE))==-1) {
       // could not locate effect
-      d_print((tmp=g_strdup_printf(_("Unknown effect %s in %s\n"),whashname,keymap_file)));
+      d_print((tmp=lives_strdup_printf(_("Unknown effect %s in %s\n"),whashname,keymap_file)));
       LIVES_ERROR(tmp);
-      g_free(tmp);
+      lives_free(tmp);
       notfound=TRUE;
-      g_free(hashname);
+      lives_free(hashname);
       badkeymap[key-1][def_modes[key-1]]++;
       if (keymap_file2!=NULL) {
-	// read param defaults
-	if (!read_perkey_defaults(kfd,-1,-1,version)) break; // file read error
+        // read param defaults
+        if (!read_perkey_defaults(kfd,-1,-1,version)) break; // file read error
       }
       def_modes[key-1]--;
       continue;
     }
 
-    g_free(hashname);
+    lives_free(hashname);
 
-    if (mode==-2){
-      d_print((tmp=g_strdup_printf
-	       (_("This version of LiVES cannot mix generators/non-generators on the same key (%d) !\n"),key)));
+    if (mode==-2) {
+      d_print((tmp=lives_strdup_printf
+                   (_("This version of LiVES cannot mix generators/non-generators on the same key (%d) !\n"),key)));
       LIVES_ERROR(tmp);
-      g_free(tmp);
+      lives_free(tmp);
       badkeymap[key-1][def_modes[key-1]]++;
       if (keymap_file2!=NULL) {
-	// read param defaults
-	if (!read_perkey_defaults(kfd,-1,-1,version)) break; // file read error
+        // read param defaults
+        if (!read_perkey_defaults(kfd,-1,-1,version)) break; // file read error
       }
       def_modes[key-1]--;
       continue;
     }
-    if (mode==-3){
-      d_print((tmp=g_strdup_printf(_("Too many effects bound to key %d.\n"),key)));
+    if (mode==-3) {
+      d_print((tmp=lives_strdup_printf(_("Too many effects bound to key %d.\n"),key)));
       LIVES_ERROR(tmp);
-      g_free(tmp);
+      lives_free(tmp);
       if (keymap_file2!=NULL) {
-	// read param defaults
-	if (!read_perkey_defaults(kfd,-1,-1,version)) break; // file read error
+        // read param defaults
+        if (!read_perkey_defaults(kfd,-1,-1,version)) break; // file read error
       }
       def_modes[key-1]--;
       continue;
@@ -1558,14 +1565,13 @@
       int idx=(key-1)*modes+mode;
       int fx_idx=rte_keymode_get_filter_idx(key,mode);
 
-      lives_entry_set_text (LIVES_ENTRY(combo_entries[idx]),(tmp=rte_keymode_get_filter_name(key,mode)));
-      g_free(tmp);
+      lives_entry_set_text(LIVES_ENTRY(combo_entries[idx]),(tmp=rte_keymode_get_filter_name(key,mode)));
+      lives_free(tmp);
 
       if (fx_idx!=-1) {
-	hashname=(gchar *)g_list_nth_data(hash_list,fx_idx);
-	g_object_set_data(G_OBJECT(combos[idx]),"hashname",hashname);
-      }
-      else g_object_set_data(G_OBJECT(combos[idx]),"hashname",empty_string);
+        hashname=(char *)lives_list_nth_data(hash_list,fx_idx);
+        lives_widget_object_set_data(LIVES_WIDGET_OBJECT(combos[idx]),"hashname",hashname);
+      } else lives_widget_object_set_data(LIVES_WIDGET_OBJECT(combos[idx]),"hashname",empty_string);
 
       // set parameters button sensitive/insensitive
       set_param_and_con_buttons(key-1,mode);
@@ -1580,53 +1586,48 @@
 
 
   if (keymap_file2==NULL) {
-    g_list_free_strings(list);
-    g_list_free(list);
+    lives_list_free_strings(list);
+    lives_list_free(list);
 
     if (update>0) {
       d_print(_("update required.\n"));
       on_save_keymap_clicked(NULL,new_list);
-      g_list_free_strings(new_list);
-      g_list_free(new_list);
+      lives_list_free_strings(new_list);
+      lives_list_free(new_list);
       on_load_keymap_clicked(NULL,NULL);
-    }
-    else d_print_done();
-  }
-  else {
+    } else d_print_done();
+  } else {
     if (kfd!=-1) lives_close_buffered(kfd);
     d_print_done();
   }
 
   if (update==0) {
-    if (g_file_test(keymap_file3,G_FILE_TEST_EXISTS)) {
+    if (lives_file_test(keymap_file3,LIVES_FILE_TEST_EXISTS)) {
 
-      msg=g_strdup_printf(_("Loading data connection map from %s..."),keymap_file3);
-      d_print(msg);
-      g_free(msg);
+      d_print(_("Loading data connection map from %s..."),keymap_file3);
 
       if (load_datacons(keymap_file3,badkeymap)) d_print_done();
     }
-    
+
     if (mainw->is_ready) {
       check_clear_all_button();
       if (notfound) do_warning_dialog_with_check_transient(_("\n\nSome effects could not be located.\n\n"),
-							   0,LIVES_WINDOW(rte_window));
-    }
-    else load_rte_defs(); // file errors shown inside
+            0,LIVES_WINDOW(rte_window));
+    } else load_rte_defs(); // file errors shown inside
 
   }
 
-  for (i=0;i<prefs->rte_keys_virtual;i++) {
-    g_free(badkeymap[i]);
+  for (i=0; i<prefs->rte_keys_virtual; i++) {
+    lives_free(badkeymap[i]);
   }
 
-  g_free(badkeymap);
+  lives_free(badkeymap);
 
-  g_free(keymap_file); // frees keymap_file2 if applicable
+  lives_free(keymap_file); // frees keymap_file2 if applicable
 
-  g_free(keymap_file3);
+  lives_free(keymap_file3);
 
-  g_free(def_modes);
+  lives_free(def_modes);
 
   if (mainw->ce_thumbs) ce_thumbs_reset_combos();
 
@@ -1638,7 +1639,7 @@
 
 
 
-void on_rte_info_clicked (LiVESButton *button, gpointer user_data) {
+void on_rte_info_clicked(LiVESButton *button, livespointer user_data) {
   weed_plant_t *filter;
 
   LiVESWidget *rte_info_window;
@@ -1650,20 +1651,20 @@
   LiVESWidget *hbuttonbox;
   LiVESWidget *ok_button;
 
-  gchar *filter_name;
-  gchar *filter_author;
-  gchar *filter_extra_authors=NULL;
-  gchar *filter_description;
-  gchar *tmp;
-  gchar *type;
-  gchar *plugin_name;
+  char *filter_name;
+  char *filter_author;
+  char *filter_extra_authors=NULL;
+  char *filter_description;
+  char *tmp;
+  char *type;
+  char *plugin_name;
 
   boolean has_desc=FALSE;
 
   int filter_version;
   int weed_error;
 
-  int key_mode=GPOINTER_TO_INT(user_data);
+  int key_mode=LIVES_POINTER_TO_INT(user_data);
   int modes=rte_getmodespk();
   int key=(int)(key_mode/modes);
   int mode=key_mode-key*modes;
@@ -1687,101 +1688,101 @@
 
   filter_version=weed_get_int_value(filter,"version",&weed_error);
 
-  rte_info_window = lives_window_new (LIVES_WINDOW_TOPLEVEL);
-  lives_window_set_title (LIVES_WINDOW (rte_info_window), g_strdup_printf(_("LiVES: Information for %s"),filter_name));
+  rte_info_window = lives_window_new(LIVES_WINDOW_TOPLEVEL);
+  lives_window_set_title(LIVES_WINDOW(rte_info_window), lives_strdup_printf(_("LiVES: Information for %s"),filter_name));
   if (palette->style&STYLE_1) {
     lives_widget_set_bg_color(rte_info_window, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
   }
 
-  lives_container_set_border_width (LIVES_CONTAINER (rte_info_window), widget_opts.border_width);
+  lives_container_set_border_width(LIVES_CONTAINER(rte_info_window), widget_opts.border_width);
   lives_window_set_transient_for(LIVES_WINDOW(rte_info_window),LIVES_WINDOW(lives_widget_get_toplevel(LIVES_WIDGET(button))));
 
-  lives_window_set_default_size (LIVES_WINDOW (rte_info_window), RTE_INFO_WIDTH, RTE_INFO_HEIGHT);
+  lives_window_set_default_size(LIVES_WINDOW(rte_info_window), RTE_INFO_WIDTH, RTE_INFO_HEIGHT);
 
-  vbox = lives_vbox_new (FALSE, widget_opts.packing_height*2);
-  lives_container_add (LIVES_CONTAINER (rte_info_window), vbox);
+  vbox = lives_vbox_new(FALSE, widget_opts.packing_height*2);
+  lives_container_add(LIVES_CONTAINER(rte_info_window), vbox);
 
-  label = lives_standard_label_new ((tmp=g_strdup_printf(_("Effect name: %s"),filter_name)));
-  g_free(tmp);
-  lives_box_pack_start (LIVES_BOX (vbox), label, TRUE, FALSE, 0);
+  label = lives_standard_label_new((tmp=lives_strdup_printf(_("Effect name: %s"),filter_name)));
+  lives_free(tmp);
+  lives_box_pack_start(LIVES_BOX(vbox), label, TRUE, FALSE, 0);
 
-  label = lives_standard_label_new ((tmp=g_strdup_printf(_("Type: %s"),type)));
-  g_free(tmp);
-  lives_box_pack_start (LIVES_BOX (vbox), label, TRUE, FALSE, 0);
+  label = lives_standard_label_new((tmp=lives_strdup_printf(_("Type: %s"),type)));
+  lives_free(tmp);
+  lives_box_pack_start(LIVES_BOX(vbox), label, TRUE, FALSE, 0);
 
-  label = lives_standard_label_new ((tmp=g_strdup_printf(_("Plugin name: %s"),plugin_name)));
-  g_free(tmp);
-  lives_box_pack_start (LIVES_BOX (vbox), label, TRUE, FALSE, 0);
+  label = lives_standard_label_new((tmp=lives_strdup_printf(_("Plugin name: %s"),plugin_name)));
+  lives_free(tmp);
+  lives_box_pack_start(LIVES_BOX(vbox), label, TRUE, FALSE, 0);
 
-  label = lives_standard_label_new ((tmp=g_strdup_printf(_("Author: %s"),filter_author)));
-  g_free(tmp);
-  lives_box_pack_start (LIVES_BOX (vbox), label, TRUE, FALSE, 0);
+  label = lives_standard_label_new((tmp=lives_strdup_printf(_("Author: %s"),filter_author)));
+  lives_free(tmp);
+  lives_box_pack_start(LIVES_BOX(vbox), label, TRUE, FALSE, 0);
 
   if (filter_extra_authors!=NULL) {
-    label = lives_standard_label_new ((tmp=g_strdup_printf(_("and: %s"),filter_extra_authors)));
-    g_free(tmp);
-    lives_box_pack_start (LIVES_BOX (vbox), label, TRUE, FALSE, 0);
+    label = lives_standard_label_new((tmp=lives_strdup_printf(_("and: %s"),filter_extra_authors)));
+    lives_free(tmp);
+    lives_box_pack_start(LIVES_BOX(vbox), label, TRUE, FALSE, 0);
   }
 
-  label = lives_standard_label_new ((tmp=g_strdup_printf(_("Version: %d"),filter_version)));
-  g_free(tmp);
-  lives_box_pack_start (LIVES_BOX (vbox), label, TRUE, FALSE, 0);
+  label = lives_standard_label_new((tmp=lives_strdup_printf(_("Version: %d"),filter_version)));
+  lives_free(tmp);
+  lives_box_pack_start(LIVES_BOX(vbox), label, TRUE, FALSE, 0);
 
   if (has_desc) {
-    hbox = lives_hbox_new (FALSE, widget_opts.packing_width);
-    lives_box_pack_start (LIVES_BOX (vbox), hbox, TRUE, FALSE, 0);
+    hbox = lives_hbox_new(FALSE, widget_opts.packing_width);
+    lives_box_pack_start(LIVES_BOX(vbox), hbox, TRUE, FALSE, 0);
 
-    label = lives_standard_label_new (_("Description: "));
-    lives_box_pack_start (LIVES_BOX (hbox), label, FALSE, FALSE, 0);
+    label = lives_standard_label_new(_("Description: "));
+    lives_box_pack_start(LIVES_BOX(hbox), label, FALSE, FALSE, 0);
 
-    textview = lives_text_view_new ();
+    textview = lives_text_view_new();
 
     if (palette->style&STYLE_1) {
       lives_widget_set_text_color(textview, LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
       lives_widget_set_base_color(textview, LIVES_WIDGET_STATE_NORMAL, &palette->normal_back);
     }
-  
-    lives_text_view_set_editable (LIVES_TEXT_VIEW (textview), FALSE);
-    lives_text_view_set_wrap_mode (LIVES_TEXT_VIEW (textview), LIVES_WRAP_WORD);
-    lives_text_view_set_cursor_visible (LIVES_TEXT_VIEW (textview), FALSE);
-  
-    lives_text_view_set_text (LIVES_TEXT_VIEW(textview), filter_description,-1);
-    lives_box_pack_start (LIVES_BOX (hbox), textview, TRUE, TRUE, 0);
+
+    lives_text_view_set_editable(LIVES_TEXT_VIEW(textview), FALSE);
+    lives_text_view_set_wrap_mode(LIVES_TEXT_VIEW(textview), LIVES_WRAP_WORD);
+    lives_text_view_set_cursor_visible(LIVES_TEXT_VIEW(textview), FALSE);
+
+    lives_text_view_set_text(LIVES_TEXT_VIEW(textview), filter_description,-1);
+    lives_box_pack_start(LIVES_BOX(hbox), textview, TRUE, TRUE, 0);
   }
 
-  hbuttonbox = lives_hbutton_box_new ();
-  lives_box_pack_start (LIVES_BOX (vbox), hbuttonbox, TRUE, TRUE, 0);
+  hbuttonbox = lives_hbutton_box_new();
+  lives_box_pack_start(LIVES_BOX(vbox), hbuttonbox, TRUE, TRUE, 0);
 
-  ok_button = lives_button_new_from_stock (LIVES_STOCK_OK);
-  lives_widget_show (ok_button);
+  ok_button = lives_button_new_from_stock(LIVES_STOCK_OK);
+  lives_widget_show(ok_button);
 
-  lives_container_add (LIVES_CONTAINER (hbuttonbox), ok_button);
-  lives_widget_set_can_focus_and_default (ok_button);
-  lives_widget_grab_default (ok_button);
+  lives_container_add(LIVES_CONTAINER(hbuttonbox), ok_button);
+  lives_widget_set_can_focus_and_default(ok_button);
+  lives_widget_grab_default(ok_button);
 
-  lives_button_box_set_button_width (LIVES_BUTTON_BOX (hbuttonbox), ok_button, DEF_BUTTON_WIDTH);
+  lives_button_box_set_button_width(LIVES_BUTTON_BOX(hbuttonbox), ok_button, DEF_BUTTON_WIDTH);
 
-  lives_signal_connect (LIVES_GUI_OBJECT (ok_button), LIVES_WIDGET_CLICKED_EVENT,
-		    LIVES_GUI_CALLBACK (lives_general_button_clicked),
-		    NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(ok_button), LIVES_WIDGET_CLICKED_SIGNAL,
+                       LIVES_GUI_CALLBACK(lives_general_button_clicked),
+                       NULL);
 
-  g_free(filter_name);
-  g_free(filter_author);
-  if (filter_extra_authors!=NULL) g_free(filter_extra_authors);
-  if (has_desc) weed_free(filter_description);
-  g_free(plugin_name);
-  g_free(type);
+  lives_free(filter_name);
+  lives_free(filter_author);
+  if (filter_extra_authors!=NULL) lives_free(filter_extra_authors);
+  if (has_desc) lives_free(filter_description);
+  lives_free(plugin_name);
+  lives_free(type);
 
   lives_widget_show_all(rte_info_window);
-  lives_window_center (LIVES_WINDOW (rte_info_window));
+  lives_window_center(LIVES_WINDOW(rte_info_window));
 }
 
 
 
-void on_clear_clicked (LiVESButton *button, gpointer user_data) {
+void on_clear_clicked(LiVESButton *button, livespointer user_data) {
   // this is for the "delete" buttons, c.f. clear_all
 
-  int idx=GPOINTER_TO_INT(user_data);
+  int idx=LIVES_POINTER_TO_INT(user_data);
   int modes=rte_getmodespk();
   int key=(int)(idx/modes);
   int mode=idx-key*modes;
@@ -1790,7 +1791,7 @@
 
   register int i;
 
-  weed_delete_effectkey (key+1,mode);
+  weed_delete_effectkey(key+1,mode);
 
   pconx_delete(FX_DATA_WILDCARD,0,0,key,mode,FX_DATA_WILDCARD);
   pconx_delete(key,mode,FX_DATA_WILDCARD,-1,0,0);
@@ -1798,51 +1799,55 @@
   cconx_delete(FX_DATA_WILDCARD,0,0,key,mode,FX_DATA_WILDCARD);
   cconx_delete(key,mode,FX_DATA_WILDCARD,FX_DATA_WILDCARD,0,0);
 
-
   newmode=rte_key_getmode(key+1);
 
-  rtew_set_mode_radio(key,newmode);
   if (mainw->ce_thumbs) ce_thumbs_set_mode_combo(key,newmode);
-    
-  for (i=mode;i<rte_getmodespk()-1;i++) {
-    int fx_idx=rte_keymode_get_filter_idx(key,mode);
 
-    idx=key*modes+i;
-    lives_entry_set_text (LIVES_ENTRY(combo_entries[idx]),lives_entry_get_text(LIVES_ENTRY(combo_entries[idx+1])));
-    type_label_set_text(key,i);
+  if (rte_window!=NULL) {
+    rtew_set_mode_radio(key,newmode);
+  }
+
+  for (i=mode; i<rte_getmodespk()-1; i++) {
     pconx_remap_mode(key,i+1,i);
     cconx_remap_mode(key,i+1,i);
 
-    if (fx_idx!=-1) {
-      gchar *hashname=(gchar *)g_list_nth_data(hash_list,fx_idx);
-      g_object_set_data(G_OBJECT(combos[idx]),"hashname",hashname);
-    }
-    else g_object_set_data(G_OBJECT(combos[idx]),"hashname",empty_string);
+    if (rte_window!=NULL) {
+      int fx_idx=rte_keymode_get_filter_idx(key,mode);
+      idx=key*modes+i;
+      lives_entry_set_text(LIVES_ENTRY(combo_entries[idx]),lives_entry_get_text(LIVES_ENTRY(combo_entries[idx+1])));
+      type_label_set_text(key,i);
 
-    // set parameters button sensitive/insensitive
-    set_param_and_con_buttons(key,i);
-    
+      if (fx_idx!=-1) {
+        char *hashname=(char *)lives_list_nth_data(hash_list,fx_idx);
+        lives_widget_object_set_data(LIVES_WIDGET_OBJECT(combos[idx]),"hashname",hashname);
+      } else lives_widget_object_set_data(LIVES_WIDGET_OBJECT(combos[idx]),"hashname",empty_string);
+
+      // set parameters button sensitive/insensitive
+      set_param_and_con_buttons(key,i);
+    }
   }
   idx++;
-  lives_entry_set_text (LIVES_ENTRY(combo_entries[idx]),"");
 
-  g_object_set_data(G_OBJECT(combos[idx]),"hashname",empty_string);
+  if (rte_window!=NULL) {
+    lives_entry_set_text(LIVES_ENTRY(combo_entries[idx]),"");
+    lives_widget_object_set_data(LIVES_WIDGET_OBJECT(combos[idx]),"hashname",empty_string);
 
-  // set parameters button sensitive/insensitive
-  set_param_and_con_buttons(key,i);
+    // set parameters button sensitive/insensitive
+    set_param_and_con_buttons(key,i);
+  }
 
   if (!rte_keymode_valid(key+1,0,TRUE)) {
-    rtew_set_keych(key,FALSE);
+    if (rte_window!=NULL) rtew_set_keych(key,FALSE);
     if (mainw->ce_thumbs) ce_thumbs_set_keych(key,FALSE);
   }
-  check_clear_all_button();
+  if (rte_window!=NULL) check_clear_all_button();
 
   if (mainw->ce_thumbs) ce_thumbs_reset_combo(key);
 }
 
 
-static void on_datacon_clicked (LiVESButton *button, gpointer user_data) {
-  int idx=GPOINTER_TO_INT(user_data);
+static void on_datacon_clicked(LiVESButton *button, livespointer user_data) {
+  int idx=LIVES_POINTER_TO_INT(user_data);
   int modes=rte_getmodespk();
   int key=(int)(idx/modes);
   int mode=idx-key*modes;
@@ -1854,8 +1859,8 @@
 }
 
 
-static void on_params_clicked (LiVESButton *button, gpointer user_data) {
-  int idx=GPOINTER_TO_INT(user_data);
+static void on_params_clicked(LiVESButton *button, livespointer user_data) {
+  int idx=LIVES_POINTER_TO_INT(user_data);
   int modes=rte_getmodespk();
   int key=(int)(idx/modes);
   int mode=idx-key*modes;
@@ -1872,8 +1877,7 @@
     weed_reinit_effect(inst,TRUE);
     apply_key_defaults(inst,key,mode);
     weed_reinit_effect(inst,TRUE);
-  }
-  else {
+  } else {
     int error;
     weed_plant_t *ninst=inst;
     do {
@@ -1883,7 +1887,7 @@
 
 
   if (fx_dialog[1]!=NULL) {
-    rfx=(lives_rfx_t *)g_object_get_data (G_OBJECT (fx_dialog[1]),"rfx");
+    rfx=(lives_rfx_t *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(fx_dialog[1]),"rfx");
     lives_widget_destroy(fx_dialog[1]);
     on_paramwindow_cancel_clicked2(NULL,rfx);
   }
@@ -1897,59 +1901,58 @@
   // record the key so we know whose parameters to record later
   weed_set_int_value((weed_plant_t *)rfx->source,"host_key",key);
 
-  g_object_set_data (G_OBJECT (fx_dialog[1]),"key",GINT_TO_POINTER (key));
-  g_object_set_data (G_OBJECT (fx_dialog[1]),"mode",GINT_TO_POINTER (mode));
-  g_object_set_data (G_OBJECT (fx_dialog[1]),"rfx",rfx);
+  lives_widget_object_set_data(LIVES_WIDGET_OBJECT(fx_dialog[1]),"key",LIVES_INT_TO_POINTER(key));
+  lives_widget_object_set_data(LIVES_WIDGET_OBJECT(fx_dialog[1]),"mode",LIVES_INT_TO_POINTER(mode));
+  lives_widget_object_set_data(LIVES_WIDGET_OBJECT(fx_dialog[1]),"rfx",rfx);
 }
 
 
-static boolean on_rtew_delete_event (LiVESWidget *widget, GdkEvent *event, gpointer user_data) {
+static boolean on_rtew_delete_event(LiVESWidget *widget, LiVESXEventDelete *event, livespointer user_data) {
   if (user_data==NULL) {
     rte_window_back=rte_window;
     old_rte_keys_virtual=prefs->rte_keys_virtual;
     lives_widget_hide(rte_window);
-  }
-  else {
+  } else {
     if (hash_list!=NULL) {
-      g_list_free_strings(hash_list);
-      g_list_free(hash_list);
+      lives_list_free_strings(hash_list);
+      lives_list_free(hash_list);
       hash_list=NULL;
     }
 
     if (name_list!=NULL) {
-      g_list_free_strings(name_list);
-      g_list_free(name_list);
+      lives_list_free_strings(name_list);
+      lives_list_free(name_list);
       name_list=NULL;
     }
 
     if (name_type_list!=NULL) {
-      g_list_free_strings(name_type_list);
-      g_list_free(name_type_list);
+      lives_list_free_strings(name_type_list);
+      lives_list_free(name_type_list);
       name_type_list=NULL;
     }
 
-    g_free(key_checks);
-    g_free(key_grabs);
-    g_free(mode_radios);
-    g_free(combo_entries);
-    g_free(combos);
-    g_free(ch_fns);
-    g_free(mode_ra_fns);
-    g_free(gr_fns);
-    g_free(nlabels);
-    g_free(type_labels);
-    g_free(info_buttons);
-    g_free(param_buttons);
-    g_free(conx_buttons);
-    g_free(clear_buttons);
+    lives_free(key_checks);
+    lives_free(key_grabs);
+    lives_free(mode_radios);
+    lives_free(combo_entries);
+    lives_free(combos);
+    lives_free(ch_fns);
+    lives_free(mode_ra_fns);
+    lives_free(gr_fns);
+    lives_free(nlabels);
+    lives_free(type_labels);
+    lives_free(info_buttons);
+    lives_free(param_buttons);
+    lives_free(conx_buttons);
+    lives_free(clear_buttons);
   }
   rte_window=NULL;
   return FALSE;
 }
 
 
-static void on_rtew_ok_clicked (LiVESButton *button, gpointer user_data) {
-  on_rtew_delete_event (NULL,NULL,NULL);
+static void on_rtew_ok_clicked(LiVESButton *button, livespointer user_data) {
+  on_rtew_delete_event(NULL,NULL,NULL);
 }
 
 
@@ -1957,8 +1960,8 @@
 
 static void do_mix_error(void) {
   do_error_dialog_with_check_transient(
-				       _("\n\nThis version of LiVES does not allowing mixing of generators and non-generators on the same key.\n\n"),
-				       FALSE,0,LIVES_WINDOW(rte_window));
+    _("\n\nThis version of LiVES does not allowing mixing of generators and non-generators on the same key.\n\n"),
+    FALSE,0,LIVES_WINDOW(rte_window));
   return;
 }
 
@@ -1973,16 +1976,16 @@
 
 
 
-void fx_changed (LiVESCombo *combo, gpointer user_data) {
+void fx_changed(LiVESCombo *combo, livespointer user_data) {
   LiVESTreeIter iter1;
   LiVESTreeModel *model;
 
-  gchar *txt;
-  gchar *tmp;
-  gchar *hashname1;
-  gchar *hashname2=(gchar *)g_object_get_data(G_OBJECT(combo),"hashname");
+  char *txt;
+  char *tmp;
+  char *hashname1;
+  char *hashname2=(char *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(combo),"hashname");
 
-  int key_mode=GPOINTER_TO_INT(user_data);
+  int key_mode=LIVES_POINTER_TO_INT(user_data);
   int modes=rte_getmodespk();
   int key=(int)(key_mode/modes);
   int mode=key_mode-key*modes;
@@ -1999,30 +2002,29 @@
   lives_tree_model_get(model,&iter1,HASH_COLUMN,&hashname1,-1);
 
   if (!strcmp(hashname1,hashname2)) {
-    g_free(hashname1);
+    lives_free(hashname1);
     return;
   }
 
   if (!rte_keymode_valid(key+1,mode,TRUE)) {
-    for (i=mode-1;i>=0;i--) {
+    for (i=mode-1; i>=0; i--) {
       if (rte_keymode_valid(key+1,i,TRUE)) {
-	mode=i+1;
-	i=-1;
+        mode=i+1;
+        i=-1;
       }
       if (i==0) mode=0;
     }
   }
 
-  lives_widget_grab_focus (combo_entries[key_mode]);
+  lives_widget_grab_focus(combo_entries[key_mode]);
 
-  if ((error=rte_switch_keymode (key+1, mode, hashname1))<0) {
-    lives_entry_set_text (LIVES_ENTRY (combo_entries[key_mode]),(tmp=rte_keymode_get_filter_name(key+1,mode)));
-    g_free(tmp);
+  if ((error=rte_switch_keymode(key+1, mode, hashname1))<0) {
+    lives_entry_set_text(LIVES_ENTRY(combo_entries[key_mode]),(tmp=rte_keymode_get_filter_name(key+1,mode)));
+    lives_free(tmp);
 
     if (error==-2) do_mix_error();
     if (error==-1) {
-      d_print((tmp=g_strdup_printf(_("LiVES could not locate the effect %s.\n"),rte_keymode_get_filter_name(key+1,mode))));
-      g_free(tmp);
+      d_print(_("LiVES could not locate the effect %s.\n"),rte_keymode_get_filter_name(key+1,mode));
     }
     return;
   }
@@ -2032,11 +2034,11 @@
   model=lives_combo_get_model(combo);
 
   lives_tree_model_get(model,&iter1,NAME_COLUMN,&txt,-1);
-  lives_entry_set_text (LIVES_ENTRY (combo_entries[key_mode]),txt);
-  g_free(txt);
+  lives_entry_set_text(LIVES_ENTRY(combo_entries[key_mode]),txt);
+  lives_free(txt);
+
+  lives_widget_object_set_data(LIVES_WIDGET_OBJECT(combo),"hashname",hashname1);
 
-  g_object_set_data(G_OBJECT(combo),"hashname",hashname1);
-    
   // set parameters button sensitive/insensitive
   set_param_and_con_buttons(key,mode);
 
@@ -2055,7 +2057,7 @@
 
 
 
-static LiVESTreeModel *rte_window_fx_model (void) {
+static LiVESTreeModel *rte_window_fx_model(void) {
   LiVESTreeStore *tstore;
 
   LiVESTreeIter iter1,iter2;
@@ -2063,86 +2065,76 @@
   // fill names of our effects
   int fx_idx=0;
 
-  GList *list=name_type_list;
+  LiVESList *list=name_type_list;
 
   int error;
 
-  gchar *pkg=NULL,*pkgstring,*fxname;
+  char *pkg=NULL,*pkgstring,*fxname;
 
-  tstore=lives_tree_store_new (NUM_COLUMNS, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING);
+  tstore=lives_tree_store_new(NUM_COLUMNS, LIVES_COL_TYPE_STRING, LIVES_COL_TYPE_STRING, LIVES_COL_TYPE_STRING);
 
   while (list!=NULL) {
-    weed_plant_t *filter=get_weed_filter(weed_get_idx_for_hashname((gchar *)g_list_nth_data(hash_list,fx_idx),TRUE));
+    weed_plant_t *filter=get_weed_filter(weed_get_idx_for_hashname((char *)lives_list_nth_data(hash_list,fx_idx),TRUE));
     int filter_flags=weed_get_int_value(filter,"flags",&error);
     if ((weed_plant_has_leaf(filter,"plugin_unstable")&&weed_get_boolean_value(filter,"plugin_unstable",&error)==
-	 WEED_TRUE&&!prefs->unstable_fx)||((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))) {
+         WEED_TRUE&&!prefs->unstable_fx)||((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
     }
 
 
-    fxname=g_strdup((gchar *)g_list_nth_data(name_list,fx_idx));
+    fxname=lives_strdup((char *)lives_list_nth_data(name_list,fx_idx));
 
     if ((pkgstring=strstr(fxname,": "))!=NULL) {
       // package effect
       if (pkg!=NULL&&strncmp(pkg,fxname,strlen(pkg))) {
-	g_free(pkg);
-	pkg=NULL;
-	lives_tree_store_append (tstore, &iter1, NULL);  /* Acquire an iterator */
-	lives_tree_store_set(tstore,&iter1,NAME_TYPE_COLUMN,list->data,NAME_COLUMN,fxname,
-			     HASH_COLUMN,g_list_nth_data(hash_list,fx_idx),-1);
+        lives_free(pkg);
+        pkg=NULL;
+        lives_tree_store_append(tstore, &iter1, NULL);   /* Acquire an iterator */
+        lives_tree_store_set(tstore,&iter1,NAME_TYPE_COLUMN,list->data,NAME_COLUMN,fxname,
+                             HASH_COLUMN,lives_list_nth_data(hash_list,fx_idx),-1);
       }
       if (pkg==NULL) {
-	pkg=fxname;
-	fxname=g_strdup(pkg);
-	memset(pkgstring,0,1);
-	/* TRANSLATORS: example " - LADSPA plugins -" */
-	pkgstring=g_strdup_printf(_(" - %s plugins -"),pkg);
-	lives_tree_store_append (tstore, &iter1, NULL);
-	lives_tree_store_set(tstore,&iter1,NAME_TYPE_COLUMN,pkgstring,NAME_COLUMN,fxname,
-			 HASH_COLUMN,g_list_nth_data(hash_list,fx_idx),-1);
-	g_free(pkgstring);
+        pkg=fxname;
+        fxname=lives_strdup(pkg);
+        memset(pkgstring,0,1);
+        /* TRANSLATORS: example " - LADSPA plugins -" */
+        pkgstring=lives_strdup_printf(_(" - %s plugins -"),pkg);
+        lives_tree_store_append(tstore, &iter1, NULL);
+        lives_tree_store_set(tstore,&iter1,NAME_TYPE_COLUMN,pkgstring,NAME_COLUMN,fxname,
+                             HASH_COLUMN,lives_list_nth_data(hash_list,fx_idx),-1);
+        lives_free(pkgstring);
       }
-      lives_tree_store_append (tstore, &iter2, &iter1);
+      lives_tree_store_append(tstore, &iter2, &iter1);
       lives_tree_store_set(tstore,&iter2,NAME_TYPE_COLUMN,list->data,NAME_COLUMN,fxname,
-			 HASH_COLUMN,g_list_nth_data(hash_list,fx_idx),-1);
-    }
-    else {
-      if (pkg!=NULL) g_free(pkg);
+                           HASH_COLUMN,lives_list_nth_data(hash_list,fx_idx),-1);
+    } else {
+      if (pkg!=NULL) lives_free(pkg);
       pkg=NULL;
-      lives_tree_store_append (tstore, &iter1, NULL);  /* Acquire an iterator */
+      lives_tree_store_append(tstore, &iter1, NULL);   /* Acquire an iterator */
       lives_tree_store_set(tstore,&iter1,NAME_TYPE_COLUMN,list->data,NAME_COLUMN,fxname,
-			 HASH_COLUMN,g_list_nth_data(hash_list,fx_idx),-1);
-      }
+                           HASH_COLUMN,lives_list_nth_data(hash_list,fx_idx),-1);
+    }
 
-    g_free(fxname);
+    lives_free(fxname);
 
     list = list->next;
     fx_idx++;
   }
 
-  if (pkg!=NULL) g_free(pkg);
+  if (pkg!=NULL) lives_free(pkg);
 
   return (LiVESTreeModel *)tstore;
 }
 
 
 
-
-
-
-
-
-
-
-
-
-LiVESWidget * create_rte_window (void) {
+LiVESWidget *create_rte_window(void) {
   LiVESWidget *rte_window;
   LiVESWidget *table;
   LiVESWidget *hbox;
@@ -2157,14 +2149,14 @@
 
   LiVESWidget *scrolledwindow;
 
-  GSList *mode_group = NULL;
-  GSList *grab_group = NULL;
+  LiVESSList *mode_group = NULL;
+  LiVESSList *grab_group = NULL;
 
   LiVESAccelGroup *rtew_accel_group;
 
   LiVESTreeModel *model;
 
-  gchar *tmp,*tmp2;
+  char *tmp,*tmp2;
 
   int modes=rte_getmodespk();
 
@@ -2185,8 +2177,7 @@
   if (prefs->gui_monitor==0) {
     scr_width=mainw->scr_width;
     scr_height=mainw->scr_height;
-  }
-  else {
+  } else {
     scr_width=mainw->mgeom[prefs->gui_monitor-1].width;
     scr_height=mainw->mgeom[prefs->gui_monitor-1].height;
   }
@@ -2201,38 +2192,38 @@
     goto rte_window_ready;
   }
 
-  key_checks=(LiVESWidget **)g_malloc((prefs->rte_keys_virtual)*sizeof(LiVESWidget *));
-  key_grabs=(LiVESWidget **)g_malloc((prefs->rte_keys_virtual)*sizeof(LiVESWidget *));
-  mode_radios=(LiVESWidget **)g_malloc((prefs->rte_keys_virtual)*modes*sizeof(LiVESWidget *));
-  combo_entries=(LiVESWidget **)g_malloc((prefs->rte_keys_virtual)*modes*sizeof(LiVESWidget *));
-  combos=(LiVESWidget **)g_malloc((prefs->rte_keys_virtual)*modes*sizeof(LiVESWidget *));
-  info_buttons=(LiVESWidget **)g_malloc((prefs->rte_keys_virtual)*modes*sizeof(LiVESWidget *));
-  param_buttons=(LiVESWidget **)g_malloc((prefs->rte_keys_virtual)*modes*sizeof(LiVESWidget *));
-  conx_buttons=(LiVESWidget **)g_malloc((prefs->rte_keys_virtual)*modes*sizeof(LiVESWidget *));
-  clear_buttons=(LiVESWidget **)g_malloc((prefs->rte_keys_virtual)*modes*sizeof(LiVESWidget *));
-  nlabels=(LiVESWidget **)g_malloc((prefs->rte_keys_virtual)*modes*sizeof(LiVESWidget *));
-  type_labels=(LiVESWidget **)g_malloc((prefs->rte_keys_virtual)*modes*sizeof(LiVESWidget *));
-
-  ch_fns=(gulong *)g_malloc((prefs->rte_keys_virtual)*sizeof(gulong));
-  gr_fns=(gulong *)g_malloc((prefs->rte_keys_virtual)*sizeof(gulong));
-  mode_ra_fns=(gulong *)g_malloc((prefs->rte_keys_virtual)*modes*sizeof(gulong));
-
-  rte_window = lives_window_new (LIVES_WINDOW_TOPLEVEL);
+  key_checks=(LiVESWidget **)lives_malloc((prefs->rte_keys_virtual)*sizeof(LiVESWidget *));
+  key_grabs=(LiVESWidget **)lives_malloc((prefs->rte_keys_virtual)*sizeof(LiVESWidget *));
+  mode_radios=(LiVESWidget **)lives_malloc((prefs->rte_keys_virtual)*modes*sizeof(LiVESWidget *));
+  combo_entries=(LiVESWidget **)lives_malloc((prefs->rte_keys_virtual)*modes*sizeof(LiVESWidget *));
+  combos=(LiVESWidget **)lives_malloc((prefs->rte_keys_virtual)*modes*sizeof(LiVESWidget *));
+  info_buttons=(LiVESWidget **)lives_malloc((prefs->rte_keys_virtual)*modes*sizeof(LiVESWidget *));
+  param_buttons=(LiVESWidget **)lives_malloc((prefs->rte_keys_virtual)*modes*sizeof(LiVESWidget *));
+  conx_buttons=(LiVESWidget **)lives_malloc((prefs->rte_keys_virtual)*modes*sizeof(LiVESWidget *));
+  clear_buttons=(LiVESWidget **)lives_malloc((prefs->rte_keys_virtual)*modes*sizeof(LiVESWidget *));
+  nlabels=(LiVESWidget **)lives_malloc((prefs->rte_keys_virtual)*modes*sizeof(LiVESWidget *));
+  type_labels=(LiVESWidget **)lives_malloc((prefs->rte_keys_virtual)*modes*sizeof(LiVESWidget *));
+
+  ch_fns=(ulong *)lives_malloc((prefs->rte_keys_virtual)*sizeof(ulong));
+  gr_fns=(ulong *)lives_malloc((prefs->rte_keys_virtual)*sizeof(ulong));
+  mode_ra_fns=(ulong *)lives_malloc((prefs->rte_keys_virtual)*modes*sizeof(ulong));
+
+  rte_window = lives_window_new(LIVES_WINDOW_TOPLEVEL);
   if (palette->style&STYLE_1) {
     lives_widget_set_bg_color(rte_window, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars);
     lives_widget_set_text_color(rte_window, LIVES_WIDGET_STATE_NORMAL, &palette->menu_and_bars_fore);
   }
-  lives_window_set_title (LIVES_WINDOW (rte_window), _("LiVES: Real time effect mapping"));
-  lives_window_add_accel_group (LIVES_WINDOW (rte_window), mainw->accel_group);
+  lives_window_set_title(LIVES_WINDOW(rte_window), _("LiVES: Real time effect mapping"));
+  lives_window_add_accel_group(LIVES_WINDOW(rte_window), mainw->accel_group);
 
-  table = lives_table_new (prefs->rte_keys_virtual, modes+1, FALSE);
+  table = lives_table_new(prefs->rte_keys_virtual, modes+1, FALSE);
 
-  lives_table_set_row_spacings (LIVES_TABLE (table), 16*widget_opts.scale);
-  lives_table_set_col_spacings (LIVES_TABLE (table), 4*widget_opts.scale);
+  lives_table_set_row_spacings(LIVES_TABLE(table), 16*widget_opts.scale);
+  lives_table_set_col_spacings(LIVES_TABLE(table), 4*widget_opts.scale);
 
   // dummy button for "no grab", we dont show this...there is a button instead
-  dummy_radio = lives_radio_button_new (grab_group);
-  grab_group = lives_radio_button_get_group (LIVES_RADIO_BUTTON (dummy_radio));
+  dummy_radio = lives_radio_button_new(grab_group);
+  grab_group = lives_radio_button_get_group(LIVES_RADIO_BUTTON(dummy_radio));
 
   name_list=weed_get_all_names(FX_LIST_NAME);
   name_type_list=weed_get_all_names(FX_LIST_NAME_AND_TYPE);
@@ -2240,216 +2231,218 @@
 
   model=rte_window_fx_model();
 
-  for (i=0;i<prefs->rte_keys_virtual*modes;i++) {
-      // create combo entry model
-    combos[i] = lives_combo_new_with_model (model);
+  for (i=0; i<prefs->rte_keys_virtual*modes; i++) {
+    // create combo entry model
+    combos[i] = lives_combo_new_with_model(model);
   }
 
 
-  for (i=0;i<prefs->rte_keys_virtual;i++) {
+  for (i=0; i<prefs->rte_keys_virtual; i++) {
+
+    hbox = lives_hbox_new(FALSE, 0);
+    lives_table_attach(LIVES_TABLE(table), hbox, i, i+1, 0, 1,
+                       (LiVESAttachOptions)(LIVES_EXPAND | LIVES_FILL),
+                       (LiVESAttachOptions)(LIVES_EXPAND | LIVES_FILL), 0, 0);
+    lives_container_set_border_width(LIVES_CONTAINER(hbox), widget_opts.border_width);
 
-    hbox = lives_hbox_new (FALSE, 0);
-    lives_table_attach (LIVES_TABLE (table), hbox, i, i+1, 0, 1,
-		      (LiVESAttachOptions) (LIVES_EXPAND | LIVES_FILL),
-		      (LiVESAttachOptions) (LIVES_EXPAND | LIVES_FILL), 0, 0);
-    lives_container_set_border_width (LIVES_CONTAINER (hbox), widget_opts.border_width);
-    
-    label = lives_standard_label_new ((tmp=g_strdup_printf(_("Ctrl-%d"),i+1)));
-    g_free(tmp);
+    label = lives_standard_label_new((tmp=lives_strdup_printf(_("Ctrl-%d"),i+1)));
+    lives_free(tmp);
 
-    lives_box_pack_start (LIVES_BOX (hbox), label, TRUE, FALSE, widget_opts.packing_width);
+    lives_box_pack_start(LIVES_BOX(hbox), label, TRUE, FALSE, widget_opts.packing_width);
 
-    hbox2 = lives_hbox_new (FALSE, 0);
+    hbox2 = lives_hbox_new(FALSE, 0);
 
-    key_checks[i] = lives_standard_check_button_new (_("Key active"),FALSE,LIVES_BOX(hbox2),NULL);
-    
-    lives_box_pack_start (LIVES_BOX (hbox), hbox2, FALSE, FALSE, widget_opts.packing_width);
+    key_checks[i] = lives_standard_check_button_new(_("Key active"),FALSE,LIVES_BOX(hbox2),NULL);
+
+    lives_box_pack_start(LIVES_BOX(hbox), hbox2, FALSE, FALSE, widget_opts.packing_width);
 
     lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(key_checks[i]),mainw->rte&(GU641<<i));
-    g_object_set_data(G_OBJECT(key_checks[i]),"active",GINT_TO_POINTER(lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(key_checks[i]))));
+    lives_widget_object_set_data(LIVES_WIDGET_OBJECT(key_checks[i]),"active",
+                                 LIVES_INT_TO_POINTER(lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(key_checks[i]))));
 
-    ch_fns[i]=lives_signal_connect_after (LIVES_GUI_OBJECT (key_checks[i]), LIVES_WIDGET_TOGGLED_EVENT,
-                      LIVES_GUI_CALLBACK (rte_on_off_callback_hook),GINT_TO_POINTER (i+1));
+    ch_fns[i]=lives_signal_connect_after(LIVES_GUI_OBJECT(key_checks[i]), LIVES_WIDGET_TOGGLED_SIGNAL,
+                                         LIVES_GUI_CALLBACK(rte_on_off_callback_hook),LIVES_INT_TO_POINTER(i+1));
 
 
 
-    hbox2 = lives_hbox_new (FALSE, 0);
-    lives_box_pack_start (LIVES_BOX (hbox), hbox2, FALSE, FALSE, widget_opts.packing_width);
+    hbox2 = lives_hbox_new(FALSE, 0);
+    lives_box_pack_start(LIVES_BOX(hbox), hbox2, FALSE, FALSE, widget_opts.packing_width);
 
-    key_grabs[i]=lives_standard_radio_button_new((tmp=g_strdup(_ ("Key grab"))),FALSE,grab_group,LIVES_BOX(hbox2),
-						 (tmp2=g_strdup(_("Grab keyboard for this effect key"))));
-    g_free(tmp); g_free(tmp2);
-    grab_group = lives_radio_button_get_group (LIVES_RADIO_BUTTON (key_grabs[i]));
+    key_grabs[i]=lives_standard_radio_button_new((tmp=lives_strdup(_("Key grab"))),FALSE,grab_group,LIVES_BOX(hbox2),
+                 (tmp2=lives_strdup(_("Grab keyboard for this effect key"))));
+    lives_free(tmp);
+    lives_free(tmp2);
+    grab_group = lives_radio_button_get_group(LIVES_RADIO_BUTTON(key_grabs[i]));
     lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(key_grabs[i]),mainw->rte_keys==i);
 
-    gr_fns[i]=lives_signal_connect_after (LIVES_GUI_OBJECT (key_grabs[i]), LIVES_WIDGET_TOGGLED_EVENT,
-				      LIVES_GUI_CALLBACK (grabkeys_callback_hook),GINT_TO_POINTER (i));
+    gr_fns[i]=lives_signal_connect_after(LIVES_GUI_OBJECT(key_grabs[i]), LIVES_WIDGET_TOGGLED_SIGNAL,
+                                         LIVES_GUI_CALLBACK(grabkeys_callback_hook),LIVES_INT_TO_POINTER(i));
 
     mode_group=NULL;
 
-    clear_all_button = lives_button_new_with_mnemonic (_("_Clear all effects"));
+    clear_all_button = lives_button_new_with_mnemonic(_("_Clear all effects"));
 
-    for (j=0;j<modes;j++) {
+    for (j=0; j<modes; j++) {
       idx=i*modes+j;
-      hbox = lives_hbox_new (FALSE, 0);
-      lives_table_attach (LIVES_TABLE (table), hbox, i, i+1, j+1, j+2,
-			(LiVESAttachOptions) (LIVES_EXPAND | LIVES_FILL),
-			(LiVESAttachOptions) (LIVES_EXPAND | LIVES_FILL), 0, 0);
-      lives_container_set_border_width (LIVES_CONTAINER (hbox), widget_opts.border_width);
+      hbox = lives_hbox_new(FALSE, 0);
+      lives_table_attach(LIVES_TABLE(table), hbox, i, i+1, j+1, j+2,
+                         (LiVESAttachOptions)(LIVES_EXPAND | LIVES_FILL),
+                         (LiVESAttachOptions)(LIVES_EXPAND | LIVES_FILL), 0, 0);
+      lives_container_set_border_width(LIVES_CONTAINER(hbox), widget_opts.border_width);
+
 
+      hbox2 = lives_hbox_new(FALSE, 0);
+      lives_box_pack_start(LIVES_BOX(hbox), hbox2, FALSE, FALSE, widget_opts.packing_width);
 
-      hbox2 = lives_hbox_new (FALSE, 0);
-      lives_box_pack_start (LIVES_BOX (hbox), hbox2, FALSE, FALSE, widget_opts.packing_width);
-      
-      mode_radios[idx]=lives_standard_radio_button_new(_ ("Mode active"),FALSE,mode_group,LIVES_BOX(hbox2),NULL);
-      mode_group = lives_radio_button_get_group (LIVES_RADIO_BUTTON (mode_radios[idx]));
+      mode_radios[idx]=lives_standard_radio_button_new(_("Mode active"),FALSE,mode_group,LIVES_BOX(hbox2),NULL);
+      mode_group = lives_radio_button_get_group(LIVES_RADIO_BUTTON(mode_radios[idx]));
 
       if (rte_key_getmode(i+1)==j) lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(mode_radios[idx]),TRUE);
 
-      mode_ra_fns[idx]=lives_signal_connect_after (LIVES_GUI_OBJECT (mode_radios[idx]), LIVES_WIDGET_TOGGLED_EVENT,
-					       LIVES_GUI_CALLBACK (rtemode_callback_hook),GINT_TO_POINTER (idx));
+      mode_ra_fns[idx]=lives_signal_connect_after(LIVES_GUI_OBJECT(mode_radios[idx]), LIVES_WIDGET_TOGGLED_SIGNAL,
+                       LIVES_GUI_CALLBACK(rtemode_callback_hook),LIVES_INT_TO_POINTER(idx));
 
-      type_labels[idx] = lives_standard_label_new ("");
+      type_labels[idx] = lives_standard_label_new("");
 
-      info_buttons[idx] = lives_button_new_with_label (_("Info"));
-      param_buttons[idx] = lives_button_new_with_label (_("Set Parameters"));
-      conx_buttons[idx] = lives_button_new_with_label (_("Set Connections"));
-      clear_buttons[idx] = lives_button_new_with_label (_("Clear"));
+      info_buttons[idx] = lives_button_new_with_label(_("Info"));
+      param_buttons[idx] = lives_button_new_with_label(_("Set Parameters"));
+      conx_buttons[idx] = lives_button_new_with_label(_("Set Connections"));
+      clear_buttons[idx] = lives_button_new_with_label(_("Clear"));
 
-      vbox = lives_vbox_new (FALSE, 0);
-      lives_box_pack_start (LIVES_BOX (hbox), vbox, FALSE, FALSE, widget_opts.packing_width);
-      lives_container_set_border_width (LIVES_CONTAINER (vbox), widget_opts.border_width);
+      vbox = lives_vbox_new(FALSE, 0);
+      lives_box_pack_start(LIVES_BOX(hbox), vbox, FALSE, FALSE, widget_opts.packing_width);
+      lives_container_set_border_width(LIVES_CONTAINER(vbox), widget_opts.border_width);
 
-      hbox = lives_hbox_new (FALSE, 0);
-      lives_box_pack_start (LIVES_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
+      hbox = lives_hbox_new(FALSE, 0);
+      lives_box_pack_start(LIVES_BOX(vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
 
-      nlabels[idx] = lives_standard_label_new (_("Effect name:"));
+      nlabels[idx] = lives_standard_label_new(_("Effect name:"));
 
-      lives_box_pack_start (LIVES_BOX (hbox), nlabels[idx], FALSE, FALSE, widget_opts.packing_width);
+      lives_box_pack_start(LIVES_BOX(hbox), nlabels[idx], FALSE, FALSE, widget_opts.packing_width);
 
       combo=combos[idx];
- 
+
       lives_combo_set_entry_text_column(LIVES_COMBO(combo),NAME_TYPE_COLUMN);
 
-      g_object_set_data (G_OBJECT(combo), "hashname", empty_string);
-      lives_box_pack_start (LIVES_BOX (hbox), combo, TRUE, TRUE, widget_opts.packing_width);
-      lives_box_pack_end (LIVES_BOX (hbox), clear_buttons[idx], FALSE, FALSE, widget_opts.packing_width);
-      lives_box_pack_end (LIVES_BOX (hbox), info_buttons[idx], FALSE, FALSE, widget_opts.packing_width);
+      lives_widget_object_set_data(LIVES_WIDGET_OBJECT(combo), "hashname", empty_string);
+      lives_box_pack_start(LIVES_BOX(hbox), combo, TRUE, TRUE, widget_opts.packing_width);
+      lives_box_pack_end(LIVES_BOX(hbox), clear_buttons[idx], FALSE, FALSE, widget_opts.packing_width);
+      lives_box_pack_end(LIVES_BOX(hbox), info_buttons[idx], FALSE, FALSE, widget_opts.packing_width);
 
 
       combo_entries[idx] = lives_combo_get_entry(LIVES_COMBO(combo));
-      
-      lives_entry_set_text (LIVES_ENTRY (combo_entries[idx]),(tmp=rte_keymode_get_filter_name(i+1,j)));
-      g_free(tmp);
- 
-      lives_entry_set_editable (LIVES_ENTRY (combo_entries[idx]), FALSE);
-      
-      hbox = lives_hbox_new (FALSE, 0);
-      lives_box_pack_start (LIVES_BOX (vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
-
-      lives_signal_connect(LIVES_GUI_OBJECT (combo), LIVES_WIDGET_CHANGED_EVENT,
-		       LIVES_GUI_CALLBACK (fx_changed),GINT_TO_POINTER(i*rte_getmodespk()+j));
-      
-      lives_signal_connect (LIVES_GUI_OBJECT (info_buttons[idx]), LIVES_WIDGET_CLICKED_EVENT,
-			LIVES_GUI_CALLBACK (on_rte_info_clicked),GINT_TO_POINTER (idx));
-
-      lives_signal_connect (LIVES_GUI_OBJECT (clear_buttons[idx]), LIVES_WIDGET_CLICKED_EVENT,
-			LIVES_GUI_CALLBACK (on_clear_clicked),GINT_TO_POINTER (idx));
-
-      lives_signal_connect (LIVES_GUI_OBJECT (param_buttons[idx]), LIVES_WIDGET_CLICKED_EVENT,
-			LIVES_GUI_CALLBACK (on_params_clicked),GINT_TO_POINTER (idx));
-
-      lives_signal_connect (LIVES_GUI_OBJECT (conx_buttons[idx]), LIVES_WIDGET_CLICKED_EVENT,
-			LIVES_GUI_CALLBACK (on_datacon_clicked),GINT_TO_POINTER (idx));
-      
-      lives_box_pack_start (LIVES_BOX (hbox), type_labels[idx], FALSE, FALSE, widget_opts.packing_width);
-      lives_box_pack_end (LIVES_BOX (hbox), conx_buttons[idx], FALSE, FALSE, widget_opts.packing_width);
-      lives_box_pack_end (LIVES_BOX (hbox), param_buttons[idx], FALSE, FALSE, widget_opts.packing_width);
+
+      lives_entry_set_text(LIVES_ENTRY(combo_entries[idx]),(tmp=rte_keymode_get_filter_name(i+1,j)));
+      lives_free(tmp);
+
+      lives_entry_set_editable(LIVES_ENTRY(combo_entries[idx]), FALSE);
+
+      hbox = lives_hbox_new(FALSE, 0);
+      lives_box_pack_start(LIVES_BOX(vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
+
+      lives_signal_connect(LIVES_GUI_OBJECT(combo), LIVES_WIDGET_CHANGED_SIGNAL,
+                           LIVES_GUI_CALLBACK(fx_changed),LIVES_INT_TO_POINTER(i*rte_getmodespk()+j));
+
+      lives_signal_connect(LIVES_GUI_OBJECT(info_buttons[idx]), LIVES_WIDGET_CLICKED_SIGNAL,
+                           LIVES_GUI_CALLBACK(on_rte_info_clicked),LIVES_INT_TO_POINTER(idx));
+
+      lives_signal_connect(LIVES_GUI_OBJECT(clear_buttons[idx]), LIVES_WIDGET_CLICKED_SIGNAL,
+                           LIVES_GUI_CALLBACK(on_clear_clicked),LIVES_INT_TO_POINTER(idx));
+
+      lives_signal_connect(LIVES_GUI_OBJECT(param_buttons[idx]), LIVES_WIDGET_CLICKED_SIGNAL,
+                           LIVES_GUI_CALLBACK(on_params_clicked),LIVES_INT_TO_POINTER(idx));
+
+      lives_signal_connect(LIVES_GUI_OBJECT(conx_buttons[idx]), LIVES_WIDGET_CLICKED_SIGNAL,
+                           LIVES_GUI_CALLBACK(on_datacon_clicked),LIVES_INT_TO_POINTER(idx));
+
+      lives_box_pack_start(LIVES_BOX(hbox), type_labels[idx], FALSE, FALSE, widget_opts.packing_width);
+      lives_box_pack_end(LIVES_BOX(hbox), conx_buttons[idx], FALSE, FALSE, widget_opts.packing_width);
+      lives_box_pack_end(LIVES_BOX(hbox), param_buttons[idx], FALSE, FALSE, widget_opts.packing_width);
 
       // set parameters button sensitive/insensitive
       set_param_and_con_buttons(i,j);
 
-      }
+    }
   }
 
 
-  scrolledwindow = lives_standard_scrolled_window_new (winsize_h, winsize_v, table);
+  scrolledwindow = lives_standard_scrolled_window_new(winsize_h, winsize_v, table);
 
-  top_vbox = lives_vbox_new (FALSE, 0);
+  top_vbox = lives_vbox_new(FALSE, 0);
 
-  lives_box_pack_start (LIVES_BOX (top_vbox), dummy_radio, FALSE, FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (top_vbox), scrolledwindow, TRUE, TRUE, widget_opts.packing_height);
+  lives_box_pack_start(LIVES_BOX(top_vbox), dummy_radio, FALSE, FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(top_vbox), scrolledwindow, TRUE, TRUE, widget_opts.packing_height);
 
-  lives_container_add (LIVES_CONTAINER (rte_window), top_vbox);
+  lives_container_add(LIVES_CONTAINER(rte_window), top_vbox);
 
-  hbuttonbox = lives_hbutton_box_new ();
-  lives_box_pack_start (LIVES_BOX (top_vbox), hbuttonbox, FALSE, TRUE, widget_opts.packing_height*2);
+  hbuttonbox = lives_hbutton_box_new();
+  lives_box_pack_start(LIVES_BOX(top_vbox), hbuttonbox, FALSE, TRUE, widget_opts.packing_height*2);
 
-  lives_container_add (LIVES_CONTAINER (hbuttonbox), clear_all_button);
-  lives_widget_set_can_focus_and_default (clear_all_button);
+  lives_container_add(LIVES_CONTAINER(hbuttonbox), clear_all_button);
+  lives_widget_set_can_focus_and_default(clear_all_button);
 
-  save_keymap_button = lives_button_new_with_mnemonic (_("_Save as default keymap"));
+  save_keymap_button = lives_button_new_with_mnemonic(_("_Save as default keymap"));
 
-  lives_container_add (LIVES_CONTAINER (hbuttonbox), save_keymap_button);
-  lives_widget_set_can_focus_and_default (save_keymap_button);
+  lives_container_add(LIVES_CONTAINER(hbuttonbox), save_keymap_button);
+  lives_widget_set_can_focus_and_default(save_keymap_button);
 
-  load_keymap_button = lives_button_new_with_mnemonic (_("_Load default keymap"));
+  load_keymap_button = lives_button_new_with_mnemonic(_("_Load default keymap"));
 
-  lives_container_add (LIVES_CONTAINER (hbuttonbox), load_keymap_button);
-  lives_widget_set_can_focus_and_default (load_keymap_button);
+  lives_container_add(LIVES_CONTAINER(hbuttonbox), load_keymap_button);
+  lives_widget_set_can_focus_and_default(load_keymap_button);
 
-  ok_button = lives_button_new_with_mnemonic (_("Close _window"));
+  ok_button = lives_button_new_with_mnemonic(_("Close _window"));
 
-  lives_container_add (LIVES_CONTAINER (hbuttonbox), ok_button);
-  lives_widget_set_can_focus_and_default (ok_button);
+  lives_container_add(LIVES_CONTAINER(hbuttonbox), ok_button);
+  lives_widget_set_can_focus_and_default(ok_button);
 
-  lives_button_box_set_button_width (LIVES_BUTTON_BOX (hbuttonbox), clear_all_button, DEF_BUTTON_WIDTH);
-  lives_button_box_set_button_width (LIVES_BUTTON_BOX (hbuttonbox), save_keymap_button, DEF_BUTTON_WIDTH);
-  lives_button_box_set_button_width (LIVES_BUTTON_BOX (hbuttonbox), load_keymap_button, DEF_BUTTON_WIDTH);
-  lives_button_box_set_button_width (LIVES_BUTTON_BOX (hbuttonbox), ok_button, DEF_BUTTON_WIDTH);
+  lives_button_box_set_button_width(LIVES_BUTTON_BOX(hbuttonbox), clear_all_button, DEF_BUTTON_WIDTH);
+  lives_button_box_set_button_width(LIVES_BUTTON_BOX(hbuttonbox), save_keymap_button, DEF_BUTTON_WIDTH);
+  lives_button_box_set_button_width(LIVES_BUTTON_BOX(hbuttonbox), load_keymap_button, DEF_BUTTON_WIDTH);
+  lives_button_box_set_button_width(LIVES_BUTTON_BOX(hbuttonbox), ok_button, DEF_BUTTON_WIDTH);
 
-  rtew_accel_group = LIVES_ACCEL_GROUP(lives_accel_group_new ());
-  lives_window_add_accel_group (LIVES_WINDOW (rte_window), rtew_accel_group);
+  rtew_accel_group = LIVES_ACCEL_GROUP(lives_accel_group_new());
+  lives_window_add_accel_group(LIVES_WINDOW(rte_window), rtew_accel_group);
 
-  lives_widget_add_accelerator (ok_button, LIVES_WIDGET_CLICKED_EVENT, rtew_accel_group,
-                              LIVES_KEY_Escape, (LiVESXModifierType)0, (LiVESAccelFlags)0);
+  lives_widget_add_accelerator(ok_button, LIVES_WIDGET_CLICKED_SIGNAL, rtew_accel_group,
+                               LIVES_KEY_Escape, (LiVESXModifierType)0, (LiVESAccelFlags)0);
 
-  lives_signal_connect (LIVES_GUI_OBJECT (rte_window), "delete_event",
-		    LIVES_GUI_CALLBACK (on_rtew_ok_clicked),
-		    NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(rte_window), LIVES_WIDGET_DELETE_EVENT,
+                       LIVES_GUI_CALLBACK(on_rtew_ok_clicked),
+                       NULL);
 
-  lives_signal_connect (LIVES_GUI_OBJECT (ok_button), LIVES_WIDGET_CLICKED_EVENT,
-		    LIVES_GUI_CALLBACK (on_rtew_ok_clicked),
-		    NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(ok_button), LIVES_WIDGET_CLICKED_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_rtew_ok_clicked),
+                       NULL);
 
-  lives_signal_connect (LIVES_GUI_OBJECT (save_keymap_button), LIVES_WIDGET_CLICKED_EVENT,
-		    LIVES_GUI_CALLBACK (on_save_keymap_clicked),
-		    NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(save_keymap_button), LIVES_WIDGET_CLICKED_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_save_keymap_clicked),
+                       NULL);
 
-  lives_signal_connect (LIVES_GUI_OBJECT (load_keymap_button), LIVES_WIDGET_CLICKED_EVENT,
-		    LIVES_GUI_CALLBACK (on_load_keymap_clicked),
-		    GINT_TO_POINTER(1));
+  lives_signal_connect(LIVES_GUI_OBJECT(load_keymap_button), LIVES_WIDGET_CLICKED_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_load_keymap_clicked),
+                       LIVES_INT_TO_POINTER(1));
 
-  lives_signal_connect (LIVES_GUI_OBJECT (clear_all_button), LIVES_WIDGET_CLICKED_EVENT,
-		    LIVES_GUI_CALLBACK (on_clear_all_clicked),
-		    GINT_TO_POINTER(1));
+  lives_signal_connect(LIVES_GUI_OBJECT(clear_all_button), LIVES_WIDGET_CLICKED_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_clear_all_clicked),
+                       LIVES_INT_TO_POINTER(1));
 
- rte_window_ready:
+rte_window_ready:
 
   lives_widget_show_all(rte_window);
   lives_widget_hide(dummy_radio);
 
   if (prefs->gui_monitor!=0) {
     int xcen=mainw->mgeom[prefs->gui_monitor-1].x+(mainw->mgeom[prefs->gui_monitor-1].width-
-						    lives_widget_get_allocation_width(rte_window))/2;
+             lives_widget_get_allocation_width(rte_window))/2;
     int ycen=mainw->mgeom[prefs->gui_monitor-1].y+(mainw->mgeom[prefs->gui_monitor-1].height-
-						    lives_widget_get_allocation_height(rte_window))/2;
+             lives_widget_get_allocation_height(rte_window))/2;
     lives_window_set_screen(LIVES_WINDOW(rte_window),mainw->mgeom[prefs->gui_monitor-1].screen);
     lives_window_move(LIVES_WINDOW(rte_window),xcen,ycen);
   }
 
   if (prefs->open_maximised) {
-    lives_window_maximize (LIVES_WINDOW(rte_window));
+    lives_window_maximize(LIVES_WINDOW(rte_window));
   }
   lives_set_cursor_style(LIVES_CURSOR_NORMAL,NULL);
   lives_set_cursor_style(LIVES_CURSOR_NORMAL,rte_window);
@@ -2457,7 +2450,7 @@
 }
 
 
-LiVESWidget *refresh_rte_window (void) {
+LiVESWidget *refresh_rte_window(void) {
   if (rte_window!=NULL) {
     lives_set_cursor_style(LIVES_CURSOR_BUSY,NULL);
     lives_set_cursor_style(LIVES_CURSOR_BUSY,rte_window);
@@ -2465,55 +2458,56 @@
     on_rtew_delete_event(NULL,NULL,LIVES_INT_TO_POINTER(1));
     lives_widget_destroy(rte_window);
     rte_window=create_rte_window();
+    rte_window_set_interactive(mainw->interactive);
   }
   return rte_window;
 }
 
 
-void on_assign_rte_keys_activate (LiVESMenuItem *menuitem, gpointer user_data) {
+void on_assign_rte_keys_activate(LiVESMenuItem *menuitem, livespointer user_data) {
   if (rte_window!=NULL) {
     on_rtew_ok_clicked(LIVES_BUTTON(dummy_radio), user_data);
     return;
   }
-  
+
   rte_window=create_rte_window();
-  lives_widget_show (rte_window);
+  rte_window_set_interactive(mainw->interactive);
+  lives_widget_show(rte_window);
 }
 
 
-void rtew_set_keych (int key, boolean on) {
+void rtew_set_keych(int key, boolean on) {
   lives_signal_handler_block(key_checks[key],ch_fns[key]);
   if (!pthread_mutex_trylock(&mainw->gtk_mutex)) {
-    lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON(key_checks[key]),on);
+    lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(key_checks[key]),on);
     pthread_mutex_unlock(&mainw->gtk_mutex);
   }
   lives_signal_handler_unblock(key_checks[key],ch_fns[key]);
-  g_object_set_data(G_OBJECT(key_checks[key]),"active",GINT_TO_POINTER(on));
+  lives_widget_object_set_data(LIVES_WIDGET_OBJECT(key_checks[key]),"active",LIVES_INT_TO_POINTER(on));
 }
 
 
-void rtew_set_keygr (int key) {
+void rtew_set_keygr(int key) {
   if (key>=0) {
     lives_signal_handler_block(key_grabs[key],gr_fns[key]);
-    lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON(key_grabs[key]),TRUE);
+    lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(key_grabs[key]),TRUE);
     lives_signal_handler_unblock(key_grabs[key],gr_fns[key]);
-  }
-  else {
-    lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON(dummy_radio),TRUE);
+  } else {
+    lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(dummy_radio),TRUE);
   }
 }
 
-void rtew_set_mode_radio (int key, int mode) {
+void rtew_set_mode_radio(int key, int mode) {
   int modes=rte_getmodespk();
   lives_signal_handler_block(mode_radios[key*modes+mode],mode_ra_fns[key*modes+mode]);
-  lives_toggle_button_set_active (LIVES_TOGGLE_BUTTON(mode_radios[key*modes+mode]),TRUE);
+  lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(mode_radios[key*modes+mode]),TRUE);
   lives_signal_handler_unblock(mode_radios[key*modes+mode],mode_ra_fns[key*modes+mode]);
 }
 
 
 
-void redraw_pwindow (int key, int mode) {
-  GList *child_list;
+void redraw_pwindow(int key, int mode) {
+  LiVESList *child_list;
   lives_rfx_t *rfx;
 
   LiVESWidget *action_area;
@@ -2522,10 +2516,10 @@
   int i;
 
   if (fx_dialog[1]!=NULL) {
-    rfx=(lives_rfx_t *)g_object_get_data(G_OBJECT(fx_dialog[1]),"rfx");
+    rfx=(lives_rfx_t *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(fx_dialog[1]),"rfx");
     if (!rfx->is_template) {
-      keyw=GPOINTER_TO_INT (g_object_get_data (G_OBJECT (fx_dialog[1]),"key"));
-      modew=GPOINTER_TO_INT (g_object_get_data (G_OBJECT (fx_dialog[1]),"mode"));
+      keyw=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(fx_dialog[1]),"key"));
+      modew=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(fx_dialog[1]),"mode"));
     }
     if (rfx->is_template||(key==keyw&&mode==modew)) {
       // rip out the contents
@@ -2534,16 +2528,16 @@
       action_area=lives_dialog_get_action_area(LIVES_DIALOG(fx_dialog[1]));
       // remove focus from any widget we are ripping out
       lives_container_set_focus_child(LIVES_CONTAINER(action_area),NULL);
-      for (i=0;i<g_list_length(child_list);i++) {
-	LiVESWidget *widget=(LiVESWidget *)g_list_nth_data(child_list,i);
-	if (widget!=action_area) {
-	  // we have to do this, because using lives_widget_destroy() here 
-	  // can causes a crash [bug in gtk+ ???]
-	  // TODO - test: is this still the case ?
-	  lives_widget_reparent (widget,mainw->invis);
-	}
+      for (i=0; i<lives_list_length(child_list); i++) {
+        LiVESWidget *widget=(LiVESWidget *)lives_list_nth_data(child_list,i);
+        if (widget!=action_area) {
+          // we have to do this, because using lives_widget_destroy() here
+          // can causes a crash [bug in gtk+ ???]
+          // TODO - test: is this still the case ?
+          lives_widget_reparent(widget,mainw->invis);
+        }
       }
-      if (child_list!=NULL) g_list_free(child_list);
+      if (child_list!=NULL) lives_list_free(child_list);
       on_paramwindow_cancel_clicked(NULL,NULL);
       restore_pwindow(rfx);
 
@@ -2553,16 +2547,16 @@
 
 
 
-void restore_pwindow (lives_rfx_t *rfx) {
+void restore_pwindow(lives_rfx_t *rfx) {
   if (fx_dialog[1]!=NULL) {
-    make_param_box(LIVES_VBOX (lives_dialog_get_content_area(LIVES_DIALOG(fx_dialog[1]))),rfx);
-    lives_widget_show_all (lives_dialog_get_content_area(LIVES_DIALOG(fx_dialog[1])));
+    make_param_box(LIVES_VBOX(lives_dialog_get_content_area(LIVES_DIALOG(fx_dialog[1]))),rfx);
+    lives_widget_show_all(lives_dialog_get_content_area(LIVES_DIALOG(fx_dialog[1])));
     lives_widget_queue_draw(fx_dialog[1]);
   }
 }
 
 
-void update_pwindow (int key, int i, GList *list) {
+void update_pwindow(int key, int i, LiVESList *list) {
   // called only from weed_set_blend_factor() and from setting param in ce_thumbs
 
   const weed_plant_t *inst;
@@ -2570,11 +2564,11 @@
   int keyw,modew;
 
   if (fx_dialog[1]!=NULL) {
-    keyw=GPOINTER_TO_INT (g_object_get_data (G_OBJECT (fx_dialog[1]),"key"));
-    modew=GPOINTER_TO_INT (g_object_get_data (G_OBJECT (fx_dialog[1]),"mode"));
+    keyw=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(fx_dialog[1]),"key"));
+    modew=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(fx_dialog[1]),"mode"));
     if (key==keyw) {
       if ((inst=rte_keymode_get_instance(key+1,modew))==NULL) return;
-      rfx=(lives_rfx_t *)g_object_get_data(G_OBJECT(fx_dialog[1]),"rfx");
+      rfx=(lives_rfx_t *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(fx_dialog[1]),"rfx");
       mainw->block_param_updates=TRUE;
       set_param_from_list(list,&rfx->params[i],0,TRUE,TRUE);
       mainw->block_param_updates=FALSE;
@@ -2582,13 +2576,13 @@
   }
 }
 
-void rte_set_defs_activate (LiVESMenuItem *menuitem, gpointer user_data) {
-  int idx=GPOINTER_TO_INT(user_data);
+void rte_set_defs_activate(LiVESMenuItem *menuitem, livespointer user_data) {
+  int idx=LIVES_POINTER_TO_INT(user_data);
   weed_plant_t *filter=get_weed_filter(idx);
   lives_rfx_t *rfx;
 
   if (fx_dialog[1]!=NULL) {
-    rfx=(lives_rfx_t *)g_object_get_data (G_OBJECT (fx_dialog[1]),"rfx");
+    rfx=(lives_rfx_t *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(fx_dialog[1]),"rfx");
     lives_widget_destroy(fx_dialog[1]);
     on_paramwindow_cancel_clicked2(NULL,rfx);
   }
@@ -2601,16 +2595,16 @@
 
 
 
-void rte_set_key_defs (LiVESButton *button, lives_rfx_t *rfx) {
+void rte_set_key_defs(LiVESButton *button, lives_rfx_t *rfx) {
   int key,mode;
   if (mainw->textwidget_focus!=NULL) {
-    LiVESWidget *textwidget=(LiVESWidget *)g_object_get_data (G_OBJECT (mainw->textwidget_focus),"textwidget");
+    LiVESWidget *textwidget=(LiVESWidget *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(mainw->textwidget_focus),"textwidget");
     after_param_text_changed(textwidget,rfx);
   }
 
   if (rfx->num_params>0) {
-    key=GPOINTER_TO_INT (g_object_get_data (G_OBJECT (fx_dialog[1]),"key"));
-    mode=GPOINTER_TO_INT (g_object_get_data (G_OBJECT (fx_dialog[1]),"mode"));
+    key=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(fx_dialog[1]),"key"));
+    mode=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(fx_dialog[1]),"mode"));
     set_key_defaults((weed_plant_t *)rfx->source,key,mode);
   }
 }
@@ -2618,7 +2612,7 @@
 
 
 
-void rte_set_defs_ok (LiVESButton *button, lives_rfx_t *rfx) {
+void rte_set_defs_ok(LiVESButton *button, lives_rfx_t *rfx) {
   weed_plant_t *ptmpl,*filter;
 
   lives_colRGB24_t *rgbp;
@@ -2626,34 +2620,34 @@
   register int i;
 
   if (mainw->textwidget_focus!=NULL) {
-    LiVESWidget *textwidget=(LiVESWidget *)g_object_get_data (G_OBJECT (mainw->textwidget_focus),"textwidget");
+    LiVESWidget *textwidget=(LiVESWidget *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(mainw->textwidget_focus),"textwidget");
     after_param_text_changed(textwidget,rfx);
   }
 
   if (rfx->num_params>0) {
     filter=weed_instance_get_filter((weed_plant_t *)rfx->source,TRUE);
-    for (i=0;i<rfx->num_params;i++) {
+    for (i=0; i<rfx->num_params; i++) {
       ptmpl=weed_filter_in_paramtmpl(filter,i,FALSE);
       switch (rfx->params[i].type) {
       case LIVES_PARAM_COLRGB24:
-	rgbp=(lives_colRGB24_t *)rfx->params[i].value;
-	update_weed_color_value(filter,i,rgbp->red,rgbp->green,rgbp->blue,0);
-	break;
+        rgbp=(lives_colRGB24_t *)rfx->params[i].value;
+        update_weed_color_value(filter,i,rgbp->red,rgbp->green,rgbp->blue,0);
+        break;
       case LIVES_PARAM_STRING:
-	weed_set_string_value(ptmpl,"host_default",(gchar *)rfx->params[i].value);
-	break;
+        weed_set_string_value(ptmpl,"host_default",(char *)rfx->params[i].value);
+        break;
       case LIVES_PARAM_STRING_LIST:
-	weed_set_int_array(ptmpl,"host_default",1,(int *)rfx->params[i].value);
-	break;
+        weed_set_int_array(ptmpl,"host_default",1,(int *)rfx->params[i].value);
+        break;
       case LIVES_PARAM_NUM:
-	if (weed_leaf_seed_type(ptmpl,"default")==WEED_SEED_DOUBLE) weed_set_double_array(ptmpl,"host_default",1,(double *)rfx->params[i].value);
-	else weed_set_int_array(ptmpl,"host_default",1,(int *)rfx->params[i].value);
-	break;
+        if (weed_leaf_seed_type(ptmpl,"default")==WEED_SEED_DOUBLE) weed_set_double_array(ptmpl,"host_default",1,(double *)rfx->params[i].value);
+        else weed_set_int_array(ptmpl,"host_default",1,(int *)rfx->params[i].value);
+        break;
       case LIVES_PARAM_BOOL:
-	weed_set_boolean_array(ptmpl,"host_default",1,(int *)rfx->params[i].value);
-	break;
+        weed_set_boolean_array(ptmpl,"host_default",1,(int *)rfx->params[i].value);
+        break;
       default:
-	break;
+        break;
       }
     }
   }
@@ -2665,7 +2659,7 @@
 
 
 
-void rte_set_defs_cancel (LiVESButton *button, lives_rfx_t *rfx) {
+void rte_set_defs_cancel(LiVESButton *button, lives_rfx_t *rfx) {
   on_paramwindow_cancel_clicked(button,rfx);
   fx_dialog[1]=NULL;
 }
@@ -2673,13 +2667,13 @@
 
 
 
-void rte_reset_defs_clicked (LiVESButton *button, lives_rfx_t *rfx) {
+void rte_reset_defs_clicked(LiVESButton *button, lives_rfx_t *rfx) {
   weed_plant_t **ptmpls,**inp,**xinp;
   weed_plant_t **ctmpls;
 
   weed_plant_t *filter,*inst;
 
-  GList *child_list;
+  LiVESList *child_list;
 
   LiVESWidget *pbox,*fxdialog,*cancelbutton,*action_area;
 
@@ -2693,7 +2687,7 @@
 
   register int i;
 
-  cancelbutton=(LiVESWidget *)g_object_get_data(G_OBJECT(button),"cancelbutton");
+  cancelbutton=(LiVESWidget *)lives_widget_object_get_data(LIVES_WIDGET_OBJECT(button),"cancelbutton");
 
   if (cancelbutton!=NULL) is_generic_defs=TRUE;
 
@@ -2706,31 +2700,31 @@
     if (is_generic_defs) {
       // for generic, reset from plugin supplied defs
       ptmpls=weed_get_plantptr_array(filter,"in_parameter_templates",&error);
-      for (i=0;i<rfx->num_params;i++) {
-	if (weed_plant_has_leaf(ptmpls[i],"host_default")) weed_leaf_delete(ptmpls[i],"host_default");
+      for (i=0; i<rfx->num_params; i++) {
+        if (weed_plant_has_leaf(ptmpls[i],"host_default")) weed_leaf_delete(ptmpls[i],"host_default");
       }
-      weed_free(ptmpls);
+      lives_free(ptmpls);
     }
 
     inp=weed_params_create(filter,TRUE);
 
-  resetdefs1:
+resetdefs1:
     filter=weed_instance_get_filter(inst,FALSE);
 
     // reset params back to default defaults
     weed_in_parameters_free(inst);
-    
+
     ninpar=num_in_params(filter,FALSE,FALSE);
     if (ninpar==0) xinp=NULL;
 
-    xinp=(weed_plant_t **)g_malloc((ninpar+1)*sizeof(weed_plant_t *));
+    xinp=(weed_plant_t **)lives_malloc((ninpar+1)*sizeof(weed_plant_t *));
     x=0;
-    for (i=poffset;i<poffset+ninpar;i++) xinp[x++]=inp[i];
+    for (i=poffset; i<poffset+ninpar; i++) xinp[x++]=inp[i];
     xinp[x]=NULL;
     poffset+=ninpar;
 
     weed_set_plantptr_array(inst,"in_parameters",weed_flagset_array_count(xinp,TRUE),xinp);
-    weed_free(xinp);
+    lives_free(xinp);
 
     if (weed_plant_has_leaf(inst,"host_next_instance")) {
       // handle compound fx
@@ -2739,7 +2733,7 @@
       goto resetdefs1;
     }
 
-    weed_free(inp);
+    lives_free(inp);
 
     inst=(weed_plant_t *)rfx->source;
     filter=weed_instance_get_filter(inst,TRUE);
@@ -2749,26 +2743,25 @@
     }
 
     rfx_params_free(rfx);
-    g_free(rfx->params);
-    
+    lives_free(rfx->params);
+
     rfx->params=weed_params_to_rfx(rfx->num_params,inst,FALSE);
   }
 
   if (is_generic_defs) {
     if (weed_plant_has_leaf(filter,"host_fps")) weed_leaf_delete(filter,"host_fps");
-    
+
     if (weed_plant_has_leaf(filter,"out_channel_templates")) {
       ctmpls=weed_get_plantptr_array(filter,"out_channel_templates",&error);
       nchans=weed_leaf_num_elements(filter,"out_channel_templates");
-      for (i=0;i<nchans;i++) {
-	if (weed_plant_has_leaf(ctmpls[i],"host_width")) weed_leaf_delete(ctmpls[i],"host_width");
-	if (weed_plant_has_leaf(ctmpls[i],"host_height")) weed_leaf_delete(ctmpls[i],"host_height");
+      for (i=0; i<nchans; i++) {
+        if (weed_plant_has_leaf(ctmpls[i],"host_width")) weed_leaf_delete(ctmpls[i],"host_width");
+        if (weed_plant_has_leaf(ctmpls[i],"host_height")) weed_leaf_delete(ctmpls[i],"host_height");
       }
     }
-  }
-  else {
-    int key=GPOINTER_TO_INT (g_object_get_data (G_OBJECT (fx_dialog[1]),"key"));
-    int mode=GPOINTER_TO_INT (g_object_get_data (G_OBJECT (fx_dialog[1]),"mode"));
+  } else {
+    int key=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(fx_dialog[1]),"key"));
+    int mode=LIVES_POINTER_TO_INT(lives_widget_object_get_data(LIVES_WIDGET_OBJECT(fx_dialog[1]),"mode"));
     set_key_defaults(inst,key,mode);
   }
 
@@ -2781,22 +2774,22 @@
   if (mainw->invis==NULL) mainw->invis=lives_vbox_new(FALSE,0);
   child_list=lives_container_get_children(LIVES_CONTAINER(lives_dialog_get_content_area(LIVES_DIALOG(fxdialog))));
 
-  action_area=lives_dialog_get_action_area(LIVES_DIALOG (fxdialog));
+  action_area=lives_dialog_get_action_area(LIVES_DIALOG(fxdialog));
 
-  for (i=0;i<g_list_length(child_list);i++) {
-    LiVESWidget *widget=(LiVESWidget *)g_list_nth_data(child_list,i);
+  for (i=0; i<lives_list_length(child_list); i++) {
+    LiVESWidget *widget=(LiVESWidget *)lives_list_nth_data(child_list,i);
     if (widget!=action_area) {
-      // we have to do this, because using lives_widget_destroy() here 
+      // we have to do this, because using lives_widget_destroy() here
       // can causes a crash [bug in gtk+ ???]
-      lives_widget_reparent (widget,mainw->invis);
+      lives_widget_reparent(widget,mainw->invis);
     }
   }
-  
-  if (child_list!=NULL) g_list_free(child_list);
+
+  if (child_list!=NULL) lives_list_free(child_list);
 
   if (cancelbutton!=NULL) lives_widget_set_sensitive(cancelbutton,FALSE);
 
-  make_param_box(LIVES_VBOX (pbox), rfx);
+  make_param_box(LIVES_VBOX(pbox), rfx);
   lives_widget_show_all(pbox);
 
   lives_widget_queue_draw(fxdialog);
@@ -2806,10 +2799,10 @@
 
 void load_default_keymap(void) {
   // called on startup
-  gchar *dir=g_build_filename(capable->home_dir,LIVES_CONFIG_DIR,NULL);
-  gchar *keymap_file=g_build_filename(dir,"default.keymap",NULL);
-  gchar *keymap_template=g_build_filename(prefs->prefix_dir,DATA_DIR,"default.keymap",NULL);
-  gchar *com,*tmp;
+  char *dir=lives_build_filename(capable->home_dir,LIVES_CONFIG_DIR,NULL);
+  char *keymap_file=lives_build_filename(dir,"default.keymap",NULL);
+  char *keymap_template=lives_build_filename(prefs->prefix_dir,DATA_DIR,"default.keymap",NULL);
+  char *com,*tmp;
 
   int retval;
 
@@ -2819,46 +2812,46 @@
 
   do {
     retval=0;
-    if (!g_file_test (keymap_file, G_FILE_TEST_EXISTS)) {
+    if (!lives_file_test(keymap_file, LIVES_FILE_TEST_EXISTS)) {
 
-      if (!g_file_test(dir,G_FILE_TEST_IS_DIR)) {
-	g_mkdir_with_parents(dir,S_IRWXU);
+      if (!lives_file_test(dir,LIVES_FILE_TEST_IS_DIR)) {
+        lives_mkdir_with_parents(dir,S_IRWXU);
       }
-	
+
 #ifndef IS_MINGW
-      com=g_strdup_printf("/bin/cp \"%s\" \"%s\"",keymap_template,keymap_file);
+      com=lives_strdup_printf("%s \"%s\" \"%s\"",capable->cp_cmd,keymap_template,keymap_file);
 #else
-      com=g_strdup_printf("cp.exe \"%s\" \"%s\"",keymap_template,keymap_file);
+      com=lives_strdup_printf("cp.exe \"%s\" \"%s\"",keymap_template,keymap_file);
 #endif
 
       lives_system(com,TRUE); // allow this to fail - we will check for errors below
-      g_free(com);
+      lives_free(com);
     }
-    if (!g_file_test (keymap_file, G_FILE_TEST_EXISTS)) {
+    if (!lives_file_test(keymap_file, LIVES_FILE_TEST_EXISTS)) {
       // give up
-      d_print((tmp=g_strdup_printf
-	       (_("Unable to create default keymap file: %s\nPlease make sure your home directory is writable.\n"),
-		keymap_file)));
+      d_print((tmp=lives_strdup_printf
+                   (_("Unable to create default keymap file: %s\nPlease make sure your home directory is writable.\n"),
+                    keymap_file)));
 
       retval=do_abort_cancel_retry_dialog(tmp,NULL);
 
-      g_free(tmp);
+      lives_free(tmp);
 
-      if (retval==LIVES_CANCEL) {
-	g_free(keymap_file);
-	g_free(keymap_template);
-	g_free(dir);
+      if (retval==LIVES_RESPONSE_CANCEL) {
+        lives_free(keymap_file);
+        lives_free(keymap_template);
+        lives_free(dir);
 
-	threaded_dialog_spin();
-	return;
+        threaded_dialog_spin();
+        return;
       }
     }
-  } while (retval==LIVES_RETRY);
+  } while (retval==LIVES_RESPONSE_RETRY);
 
   on_load_keymap_clicked(NULL,NULL);
 
-  g_free(keymap_file);
-  g_free(keymap_template);
-  g_free(dir);
+  lives_free(keymap_file);
+  lives_free(keymap_template);
+  lives_free(dir);
   threaded_dialog_spin();
 }

LiVES-2.2.8.tar.bz2/src/rte_window.h -> LiVES-2.4.1.tar.bz2/src/rte_window.h Changed

@@ -7,31 +7,35 @@
 #ifndef HAS_LIVES_RTE_WINDOW_H
 #define HAS_LIVES_RTE_WINDOW_H
 
+
 #define RTE_INFO_WIDTH ((int)(350.*widget_opts.scale))
 #define RTE_INFO_HEIGHT ((int)(200.*widget_opts.scale))
 
+void rte_window_set_interactive(boolean interactive);
 
-void on_assign_rte_keys_activate (LiVESMenuItem *, gpointer);
-void on_rte_info_clicked (LiVESButton *, gpointer data);
+void on_assign_rte_keys_activate(LiVESMenuItem *, livespointer);
+void on_rte_info_clicked(LiVESButton *, livespointer data);
 void load_default_keymap(void);
-void rtew_set_keych (int key, boolean on);
+void rtew_set_keych(int key, boolean on);
 void ret_set_key_check_state(void);
-void rtew_set_keygr (int key);
-void rtew_set_mode_radio (int key, int mode);
-void rtew_set_grab_button (boolean on);
-void redraw_pwindow (int key, int mode);
-void restore_pwindow (lives_rfx_t *);
-void update_pwindow (int key, int i, GList *list);
+void rtew_set_keygr(int key);
+void rtew_set_mode_radio(int key, int mode);
+void rtew_set_grab_button(boolean on);
+void redraw_pwindow(int key, int mode);
+void restore_pwindow(lives_rfx_t *);
+void update_pwindow(int key, int i, LiVESList *list);
+
+void rte_set_defs_activate(LiVESMenuItem *, livespointer user_data);
+void rte_set_defs_cancel(LiVESButton *, lives_rfx_t *);
+void rte_set_defs_ok(LiVESButton *, lives_rfx_t *);
+void rte_reset_defs_clicked(LiVESButton *, lives_rfx_t *rfx);
+void rte_set_key_defs(LiVESButton *, lives_rfx_t *);
+void on_save_rte_defs_activate(LiVESMenuItem *, livespointer);
+boolean on_clear_all_clicked(LiVESButton *, livespointer user_data);
+
+void on_clear_clicked(LiVESButton *button, livespointer user_data);
 
 LiVESWidget *rte_window;
 
 
-void rte_set_defs_activate (LiVESMenuItem *, gpointer user_data);
-void rte_set_defs_cancel (LiVESButton *, lives_rfx_t *);
-void rte_set_defs_ok (LiVESButton *, lives_rfx_t *);
-void rte_reset_defs_clicked (LiVESButton *, lives_rfx_t *rfx);
-void rte_set_key_defs (LiVESButton *, lives_rfx_t *);
-void on_save_rte_defs_activate (LiVESMenuItem *, gpointer);
-boolean on_clear_all_clicked (LiVESButton *, gpointer user_data);
-
 #endif // HAS_LIVES_RTE_WINDOW_H

LiVES-2.2.8.tar.bz2/src/saveplay.c -> LiVES-2.4.1.tar.bz2/src/saveplay.c Changed

@@ -31,10 +31,11 @@
 #include "audio.h"
 #include "htmsocket.h"
 #include "cvirtual.h"
+#include "interface.h"
 
 
 boolean save_clip_values(int which) {
-  gchar *lives_header;
+  char *lives_header;
 
   int asigned;
   int endian;
@@ -51,19 +52,19 @@
 
   asigned=!(mainw->files[which]->signed_endian&AFORM_UNSIGNED);
   endian=mainw->files[which]->signed_endian&AFORM_BIG_ENDIAN;
-  lives_header=g_build_filename(prefs->tmpdir,mainw->files[which]->handle,"header.lives",NULL);
+  lives_header=lives_build_filename(prefs->tmpdir,mainw->files[which]->handle,"header.lives",NULL);
 
   do {
     mainw->clip_header=fopen(lives_header,"w");
 
     if (mainw->clip_header==NULL) {
-      retval=do_write_failed_error_s_with_retry(lives_header,g_strerror(errno),NULL);
-      if (retval==LIVES_CANCEL) {
-	g_free(lives_header);
+      retval=do_write_failed_error_s_with_retry(lives_header,lives_strerror(errno),NULL);
+      if (retval==LIVES_RESPONSE_CANCEL) {
+        lives_free(lives_header);
 #ifndef IS_MINGW
-	umask(xumask);
+        umask(xumask);
 #endif
-	return FALSE;
+        return FALSE;
       }
     }
 
@@ -71,72 +72,72 @@
       mainw->files[which]->header_version=LIVES_CLIP_HEADER_VERSION;
 
       do {
-	retval=0;
-	set_signal_handlers((SignalHandlerPointer)defer_sigint);
-	save_clip_value(which,CLIP_DETAILS_HEADER_VERSION,&mainw->files[which]->header_version);
-	if (mainw->com_failed||mainw->write_failed) break;
-	save_clip_value(which,CLIP_DETAILS_BPP,&mainw->files[which]->bpp);
-	if (mainw->com_failed||mainw->write_failed) break;
-	save_clip_value(which,CLIP_DETAILS_FPS,&mainw->files[which]->fps);
-	if (mainw->com_failed||mainw->write_failed) break;
-	save_clip_value(which,CLIP_DETAILS_PB_FPS,&mainw->files[which]->pb_fps);
-	if (mainw->com_failed||mainw->write_failed) break;
-	save_clip_value(which,CLIP_DETAILS_WIDTH,&mainw->files[which]->hsize);
-	if (mainw->com_failed||mainw->write_failed) break;
-	save_clip_value(which,CLIP_DETAILS_HEIGHT,&mainw->files[which]->vsize);
-	if (mainw->com_failed||mainw->write_failed) break;
-	save_clip_value(which,CLIP_DETAILS_INTERLACE,&mainw->files[which]->interlace);
-	if (mainw->com_failed||mainw->write_failed) break;
-	save_clip_value(which,CLIP_DETAILS_UNIQUE_ID,&mainw->files[which]->unique_id);
-	if (mainw->com_failed||mainw->write_failed) break;
-	save_clip_value(which,CLIP_DETAILS_ARATE,&mainw->files[which]->arps);
-	if (mainw->com_failed||mainw->write_failed) break;
-	save_clip_value(which,CLIP_DETAILS_PB_ARATE,&mainw->files[which]->arate);
-	if (mainw->com_failed||mainw->write_failed) break;
-	save_clip_value(which,CLIP_DETAILS_ACHANS,&mainw->files[which]->achans);
-	if (mainw->com_failed||mainw->write_failed) break;
-	save_clip_value(which,CLIP_DETAILS_ASIGNED,&asigned);
-	if (mainw->com_failed||mainw->write_failed) break;
-	save_clip_value(which,CLIP_DETAILS_AENDIAN,&endian);
-	if (mainw->com_failed||mainw->write_failed) break;
-	save_clip_value(which,CLIP_DETAILS_ASAMPS,&mainw->files[which]->asampsize);
-	if (mainw->com_failed||mainw->write_failed) break;
-	save_clip_value(which,CLIP_DETAILS_FRAMES,&mainw->files[which]->frames);
-	if (mainw->com_failed||mainw->write_failed) break;
-	save_clip_value(which,CLIP_DETAILS_TITLE,mainw->files[which]->title);
-	if (mainw->com_failed||mainw->write_failed) break;
-	save_clip_value(which,CLIP_DETAILS_AUTHOR,mainw->files[which]->author);
-	if (mainw->com_failed||mainw->write_failed) break;
-	save_clip_value(which,CLIP_DETAILS_COMMENT,mainw->files[which]->comment);
-	if (mainw->com_failed||mainw->write_failed) break;
-	save_clip_value(which,CLIP_DETAILS_PB_FRAMENO,&mainw->files[which]->frameno);
-	if (mainw->com_failed||mainw->write_failed) break;
-	save_clip_value(which,CLIP_DETAILS_CLIPNAME,mainw->files[which]->name);
-	if (mainw->com_failed||mainw->write_failed) break;
-	save_clip_value(which,CLIP_DETAILS_FILENAME,mainw->files[which]->file_name);
-	if (mainw->com_failed||mainw->write_failed) break;
-	save_clip_value(which,CLIP_DETAILS_KEYWORDS,mainw->files[which]->keywords);
-	if (mainw->com_failed||mainw->write_failed) break;
-	if (cfile->ext_src) {
-	  lives_decoder_t *dplug=(lives_decoder_t *)cfile->ext_src;
-	  save_clip_value(which,CLIP_DETAILS_DECODER_NAME,dplug->decoder->name);
-	  if (mainw->com_failed||mainw->write_failed) break;
-	}
+        retval=0;
+        set_signal_handlers((SignalHandlerPointer)defer_sigint);
+        save_clip_value(which,CLIP_DETAILS_HEADER_VERSION,&mainw->files[which]->header_version);
+        if (mainw->com_failed||mainw->write_failed) break;
+        save_clip_value(which,CLIP_DETAILS_BPP,&mainw->files[which]->bpp);
+        if (mainw->com_failed||mainw->write_failed) break;
+        save_clip_value(which,CLIP_DETAILS_FPS,&mainw->files[which]->fps);
+        if (mainw->com_failed||mainw->write_failed) break;
+        save_clip_value(which,CLIP_DETAILS_PB_FPS,&mainw->files[which]->pb_fps);
+        if (mainw->com_failed||mainw->write_failed) break;
+        save_clip_value(which,CLIP_DETAILS_WIDTH,&mainw->files[which]->hsize);
+        if (mainw->com_failed||mainw->write_failed) break;
+        save_clip_value(which,CLIP_DETAILS_HEIGHT,&mainw->files[which]->vsize);
+        if (mainw->com_failed||mainw->write_failed) break;
+        save_clip_value(which,CLIP_DETAILS_INTERLACE,&mainw->files[which]->interlace);
+        if (mainw->com_failed||mainw->write_failed) break;
+        save_clip_value(which,CLIP_DETAILS_UNIQUE_ID,&mainw->files[which]->unique_id);
+        if (mainw->com_failed||mainw->write_failed) break;
+        save_clip_value(which,CLIP_DETAILS_ARATE,&mainw->files[which]->arps);
+        if (mainw->com_failed||mainw->write_failed) break;
+        save_clip_value(which,CLIP_DETAILS_PB_ARATE,&mainw->files[which]->arate);
+        if (mainw->com_failed||mainw->write_failed) break;
+        save_clip_value(which,CLIP_DETAILS_ACHANS,&mainw->files[which]->achans);
+        if (mainw->com_failed||mainw->write_failed) break;
+        save_clip_value(which,CLIP_DETAILS_ASIGNED,&asigned);
+        if (mainw->com_failed||mainw->write_failed) break;
+        save_clip_value(which,CLIP_DETAILS_AENDIAN,&endian);
+        if (mainw->com_failed||mainw->write_failed) break;
+        save_clip_value(which,CLIP_DETAILS_ASAMPS,&mainw->files[which]->asampsize);
+        if (mainw->com_failed||mainw->write_failed) break;
+        save_clip_value(which,CLIP_DETAILS_FRAMES,&mainw->files[which]->frames);
+        if (mainw->com_failed||mainw->write_failed) break;
+        save_clip_value(which,CLIP_DETAILS_TITLE,mainw->files[which]->title);
+        if (mainw->com_failed||mainw->write_failed) break;
+        save_clip_value(which,CLIP_DETAILS_AUTHOR,mainw->files[which]->author);
+        if (mainw->com_failed||mainw->write_failed) break;
+        save_clip_value(which,CLIP_DETAILS_COMMENT,mainw->files[which]->comment);
+        if (mainw->com_failed||mainw->write_failed) break;
+        save_clip_value(which,CLIP_DETAILS_PB_FRAMENO,&mainw->files[which]->frameno);
+        if (mainw->com_failed||mainw->write_failed) break;
+        save_clip_value(which,CLIP_DETAILS_CLIPNAME,mainw->files[which]->name);
+        if (mainw->com_failed||mainw->write_failed) break;
+        save_clip_value(which,CLIP_DETAILS_FILENAME,mainw->files[which]->file_name);
+        if (mainw->com_failed||mainw->write_failed) break;
+        save_clip_value(which,CLIP_DETAILS_KEYWORDS,mainw->files[which]->keywords);
+        if (mainw->com_failed||mainw->write_failed) break;
+        if (cfile->ext_src) {
+          lives_decoder_t *dplug=(lives_decoder_t *)cfile->ext_src;
+          save_clip_value(which,CLIP_DETAILS_DECODER_NAME,dplug->decoder->name);
+          if (mainw->com_failed||mainw->write_failed) break;
+        }
 
       } while (FALSE);
 
       if (mainw->signal_caught) catch_sigint(mainw->signal_caught);
       set_signal_handlers((SignalHandlerPointer)catch_sigint);
-      
+
       if (mainw->com_failed||mainw->write_failed) {
-	fclose(mainw->clip_header);
-	retval=do_write_failed_error_s_with_retry(lives_header,NULL,NULL);
+        fclose(mainw->clip_header);
+        retval=do_write_failed_error_s_with_retry(lives_header,NULL,NULL);
       }
 
     }
-  } while (retval==LIVES_RETRY);
-  
-  g_free(lives_header);
+  } while (retval==LIVES_RESPONSE_RETRY);
+
+  lives_free(lives_header);
 #ifndef IS_MINGW
   umask(xumask);
 #endif
@@ -144,13 +145,13 @@
   fclose(mainw->clip_header);
   mainw->clip_header=NULL;
 
-  if (retval==LIVES_CANCEL) return FALSE;
+  if (retval==LIVES_RESPONSE_CANCEL) return FALSE;
 
   return TRUE;
 }
 
 
-boolean read_file_details(const gchar *file_name, boolean is_audio) {
+boolean read_file_details(const char *file_name, boolean is_audio) {
   // get preliminary details
 
   // is_audio set to TRUE prevents us from checking for images, and deleting the (existing) first frame
@@ -160,22 +161,22 @@
   int alarm_handle;
   int retval;
   boolean timeout;
-  gchar *tmp,*com=g_strdup_printf("%s get_details \"%s\" \"%s\" \"%s\" %d %d",prefs->backend_sync,cfile->handle,
-				  (tmp=g_filename_from_utf8(file_name,-1,NULL,NULL,NULL)),
-				  get_image_ext_for_type(cfile->img_type),mainw->opening_loc,is_audio);
-  g_free(tmp);
+  char *tmp,*com=lives_strdup_printf("%s get_details \"%s\" \"%s\" \"%s\" %d %d",prefs->backend_sync,cfile->handle,
+                                     (tmp=lives_filename_from_utf8(file_name,-1,NULL,NULL,NULL)),
+                                     get_image_ext_for_type(cfile->img_type),mainw->opening_loc,is_audio);
+  lives_free(tmp);
 
   mainw->com_failed=FALSE;
   unlink(cfile->info_file);
   lives_system(com,FALSE);
-  g_free(com);
+  lives_free(com);
 
   if (mainw->com_failed) {
     return FALSE;
   }
 
-  if (mainw->opening_loc) 
-    return do_progress_dialog(TRUE,TRUE,_ ("Examining file header"));
+  if (mainw->opening_loc)
+    return do_progress_dialog(TRUE,TRUE,_("Examining file header"));
 
 
   threaded_dialog_spin();
@@ -188,15 +189,15 @@
 #define LIVES_LONGER_TIMEOUT  (30 * U_SEC) // 30 second timeout
 
     alarm_handle=lives_alarm_set(LIVES_LONGER_TIMEOUT);
-    
+
     while (!((infofile=fopen(cfile->info_file,"r")) || (timeout=lives_alarm_get(alarm_handle)))) {
       lives_widget_context_update();
       threaded_dialog_spin();
-      g_usleep(prefs->sleep_time);
+      lives_usleep(prefs->sleep_time);
     }
-    
+
     lives_alarm_clear(alarm_handle);
-    
+
     if (!timeout) {
       mainw->read_failed=FALSE;
       lives_fgets(mainw->msg,512,infofile);
@@ -206,50 +207,50 @@
     if (timeout||mainw->read_failed) {
       retval=do_read_failed_error_s_with_retry(cfile->info_file,NULL,NULL);
     }
-  } while (retval==LIVES_RETRY);
+  } while (retval==LIVES_RESPONSE_RETRY);
 
   threaded_dialog_spin();
   return TRUE;
 }
 
-const gchar *get_deinterlace_string(void) {
+const char *get_deinterlace_string(void) {
   if (mainw->open_deint) return "-vf pp=ci";
   else return "";
 }
 
 
-void deduce_file(const gchar *file_name, double start, int end) {
-  // this is a utility function to deduce whether we are dealing with a file, 
+ulong deduce_file(const char *file_name, double start, int end) {
+  // this is a utility function to deduce whether we are dealing with a file,
   // a selection, a backup, or a location
-  gchar short_file_name[PATH_MAX];
+  char short_file_name[PATH_MAX];
+  ulong uid;
   mainw->img_concat_clip=-1;
 
-  if (g_strrstr(file_name,"://")!=NULL&&strncmp (file_name,"dvd://",6)) {
+  if (lives_strrstr(file_name,"://")!=NULL&&strncmp(file_name,"dvd://",6)) {
     mainw->opening_loc=TRUE;
-    open_file(file_name);
+    uid=open_file(file_name);
     mainw->opening_loc=FALSE;
-  }
-  else {
-    g_snprintf(short_file_name,PATH_MAX,"%s",file_name);
+  } else {
+    lives_snprintf(short_file_name,PATH_MAX,"%s",file_name);
     if (!(strcmp(file_name+strlen(file_name)-4,".lv1"))) {
-      restore_file(file_name);
-    }
-    else {
-      open_file_sel(file_name,start,end);
+      uid=restore_file(file_name);
+    } else {
+      uid=open_file_sel(file_name,start,end);
     }
   }
+  return uid;
 }
 
 
-void open_file (const gchar *file_name) {
+ulong open_file(const char *file_name) {
   // this function should be called to open a whole file
-  open_file_sel(file_name,0.,0);
+  return open_file_sel(file_name,0.,0);
 }
 
 
 
-static boolean rip_audio_cancelled(int old_file, weed_plant_t *mt_pb_start_event, 
-				   boolean mt_has_audio_file) {
+static boolean rip_audio_cancelled(int old_file, weed_plant_t *mt_pb_start_event,
+                                   boolean mt_has_audio_file) {
 
   if (mainw->cancelled==CANCEL_KEEP) {
     // user clicked "enough"
@@ -262,7 +263,7 @@
   d_print("\n");
   d_print_cancelled();
   close_current_file(old_file);
-  
+
   mainw->noswitch=FALSE;
 
   if (mainw->multitrack!=NULL) {
@@ -270,7 +271,7 @@
     mainw->multitrack->has_audio_file=mt_has_audio_file;
   }
 
-  if (mainw->file_open_params!=NULL) g_free (mainw->file_open_params);
+  if (mainw->file_open_params!=NULL) lives_free(mainw->file_open_params);
   mainw->file_open_params=NULL;
   lives_set_cursor_style(LIVES_CURSOR_NORMAL,NULL);
   return FALSE;
@@ -279,12 +280,12 @@
 
 #define AUDIO_FRAMES_TO_READ 100
 
-void open_file_sel(const gchar *file_name, double start, int frames) {
-  gchar msg[256],loc[256];
-  gchar *tmp=NULL;
-  gchar *isubfname=NULL;
-  gchar *fname=g_strdup(file_name),*msgstr;
-  gchar *com;
+ulong open_file_sel(const char *file_name, double start, int frames) {
+  char msg[256],loc[256];
+  char *tmp=NULL;
+  char *isubfname=NULL;
+  char *fname=lives_strdup(file_name),*msgstr;
+  char *com;
 
   int withsound=1;
   int old_file=mainw->current_file;
@@ -303,30 +304,29 @@
     new_file=mainw->first_free_file;
 
     if (!get_new_handle(new_file,fname)) {
-      g_free(fname);
-      return;
+      lives_free(fname);
+      return 0;
     }
-    g_free(fname);
-    
+    lives_free(fname);
+
     lives_set_cursor_style(LIVES_CURSOR_BUSY,NULL);
     lives_widget_context_update();
 
     if (frames==0) {
-      com=g_strdup_printf(_ ("Opening %s"),file_name);
-    }
-    else {
-      com=g_strdup_printf(_ ("Opening %s start time %.2f sec. frames %d"),file_name,start,frames);
+      com=lives_strdup_printf(_("Opening %s"),file_name);
+    } else {
+      com=lives_strdup_printf(_("Opening %s start time %.2f sec. frames %d"),file_name,start,frames);
     }
     d_print(""); // exhaust "switch" message
 
     d_print(com);
-    g_free(com);
-    
+    lives_free(com);
+
     if (!mainw->save_with_sound) {
-      d_print(_ (" without sound"));
+      d_print(_(" without sound"));
       withsound=0;
     }
-    
+
     mainw->noswitch=TRUE;
     mainw->current_file=new_file;
 
@@ -339,352 +339,343 @@
     }
 
     if (!strcmp(prefs->image_ext,"png")) cfile->img_type=IMG_TYPE_PNG;
-    
+
     if (prefs->instant_open) {
       // cd to clip directory - so decoder plugins can write temp files
-      gchar *ppath=g_build_filename(prefs->tmpdir,cfile->handle,NULL);
-      gchar *cwd=g_get_current_dir();
+      char *ppath=lives_build_filename(prefs->tmpdir,cfile->handle,NULL);
+      char *cwd=lives_get_current_dir();
       lives_chdir(ppath,FALSE);
-      g_free(ppath);
-	
+      lives_free(ppath);
+
       cdata=get_decoder_cdata(mainw->current_file,prefs->disabled_decoders,NULL);
 
       lives_chdir(cwd,FALSE);
-      g_free(cwd);
+      lives_free(cwd);
 
       if (cfile->ext_src!=NULL) {
-	lives_decoder_t *dplug=(lives_decoder_t *)cfile->ext_src;
-	cfile->opening=TRUE;
-	cfile->clip_type=CLIP_TYPE_FILE;
-	
-	if (cdata->frame_width>0) {
-	  cfile->hsize=cdata->frame_width;
-	  cfile->vsize=cdata->frame_height;
-	}
-	else {
-	  cfile->hsize=cdata->width;
-	  cfile->vsize=cdata->height;
-	}
-
-	cfile->frames=cdata->nframes;
-	
-	snprintf(cfile->author,256,"%s",cdata->author);
-	snprintf(cfile->title,256,"%s",cdata->title);
-	snprintf(cfile->comment,256,"%s",cdata->comment);
-
-	if (frames>0&&cfile->frames>frames) cfile->frames=frames;
-	
-	cfile->start=1;
-	cfile->end=cfile->frames;
-	create_frame_index(mainw->current_file,TRUE,cfile->fps*(start==0?0:start-1),frames==0?cfile->frames:frames);
-
-	cfile->arate=cfile->arps=cdata->arate;
-	cfile->achans=cdata->achans;
-	cfile->asampsize=cdata->asamps;
-	
-	cfile->signed_endian=get_signed_endian(cdata->asigned, capable->byte_order==LIVES_LITTLE_ENDIAN);
-
-	if (cfile->achans>0&&(dplug->decoder->rip_audio)!=NULL&&withsound==1) {
-	  // call rip_audio() in the decoder plugin
-	  // the plugin gets a chance to do any internal cleanup in rip_audio_cleanup()
-
-	  int64_t stframe=cfile->fps*start+.5;
-	  int64_t maxframe=stframe+(frames==0)?cfile->frames:frames;
-	  int64_t nframes=AUDIO_FRAMES_TO_READ;
-	  gchar *afile=g_strdup_printf("%s/%s/audiodump.pcm",prefs->tmpdir,cfile->handle);
-
-	  msgstr=g_strdup_printf(_("Opening audio for %s"),file_name);
-
-	  if (mainw->playing_file==-1) resize(1);
-
-	  mainw->cancelled=CANCEL_NONE;
-
-	  cfile->opening_only_audio=TRUE;
-	  if (mainw->playing_file==-1) do_threaded_dialog(msgstr,TRUE);
-
-	  do {
-	    if (stframe+nframes>maxframe) nframes=maxframe-stframe;
-	    if (nframes<=0) break;
-	    (dplug->decoder->rip_audio)(cdata,afile,stframe,nframes,NULL);
-	    threaded_dialog_spin();
-	    stframe+=nframes;
-	  } while (mainw->cancelled==CANCEL_NONE);
-
-	  if (dplug->decoder->rip_audio_cleanup!=NULL) {
-	    (dplug->decoder->rip_audio_cleanup)(cdata);
-	  }
-
-	  if (mainw->cancelled!=CANCEL_NONE) {
-	    if (!rip_audio_cancelled(old_file,mt_pb_start_event,mt_has_audio_file)) {
-	      g_free(afile);
-	      return;
-	    }
-	  }
-
-	  end_threaded_dialog();
-	  g_free(msgstr);
-
-	  cfile->opening_only_audio=FALSE;
-	  g_free(afile);
-	}
-	else {
-	  cfile->arate=0.;
-	  cfile->achans=cfile->asampsize=0;
-	}
-
-	cfile->fps=cfile->pb_fps=cdata->fps;
-	d_print("\n");
-
-	if (cfile->achans==0&&withsound==1) {
-	  if (0) {
-	  /*if (!capable->has_mplayer) {
-	    do_mplayer_audio_warning();
-	    }*/
-	  }
-	  else {
-
-	    mainw->com_failed=FALSE;
-
-	    // check if we have audio
-	    read_file_details(file_name,FALSE);
-	    unlink (cfile->info_file);
-	  
-	    if (mainw->com_failed) return;
-
-	    if (strlen(mainw->msg)>0) add_file_info (cfile->handle,TRUE);
-
-	    if (cfile->achans>0) {
-	      // plugin returned no audio, try with mplayer
-	      if (mainw->file_open_params==NULL) mainw->file_open_params=g_strdup("");
-	      com=g_strdup_printf("%s open \"%s\" \"%s\" %d \"%s\" %.2f %d \"%s\"",prefs->backend,cfile->handle,
-				  (tmp=g_filename_from_utf8 (file_name,-1,NULL,NULL,NULL)),-1,
-				  prefs->image_ext,start,frames,mainw->file_open_params);
-
-	      g_free(tmp);
-
-
-	      cfile->op_dir=g_filename_from_utf8((tmp=get_dir(file_name)),-1,NULL,NULL,NULL);
-	      g_free(tmp);
-
-	      unlink (cfile->info_file);
-	      lives_system(com,FALSE);
-	      g_free(com);
-	      tmp=NULL;
-	    
-	      // if we have a quick-opening file, display the first and last frames now
-	      // for some codecs this can be helpful since we can locate the last frame while audio is loading
-	      if (cfile->clip_type==CLIP_TYPE_FILE&&mainw->playing_file==-1) resize(1);
-
-	      mainw->effects_paused=FALSE; // set to TRUE if user clicks "Enough"
-
-	      msgstr=g_strdup_printf(_("Opening audio"),file_name);
-	      if (!do_progress_dialog(TRUE,TRUE,msgstr)) {
-		// user cancelled or switched to another clip
-	      
-		g_free(msgstr);
-	      
-		mainw->opening_frames=-1;
-	      
-		if (mainw->multitrack!=NULL) {
-		  mainw->multitrack->pb_start_event=mt_pb_start_event;
-		  mainw->multitrack->has_audio_file=mt_has_audio_file;
-		}
-
-		if (mainw->cancelled==CANCEL_NO_PROPOGATE) {
-		  lives_set_cursor_style(LIVES_CURSOR_NORMAL,NULL);
-		  mainw->cancelled=CANCEL_NONE;
-		  return;
-		}
-	      
-		// cancelled
+        lives_decoder_t *dplug=(lives_decoder_t *)cfile->ext_src;
+        cfile->opening=TRUE;
+        cfile->clip_type=CLIP_TYPE_FILE;
+
+        if (cdata->frame_width>0) {
+          cfile->hsize=cdata->frame_width;
+          cfile->vsize=cdata->frame_height;
+        } else {
+          cfile->hsize=cdata->width;
+          cfile->vsize=cdata->height;
+        }
+
+        cfile->frames=cdata->nframes;
+
+        snprintf(cfile->author,256,"%s",cdata->author);
+        snprintf(cfile->title,256,"%s",cdata->title);
+        snprintf(cfile->comment,256,"%s",cdata->comment);
+
+        if (frames>0&&cfile->frames>frames) cfile->frames=frames;
+
+        cfile->start=1;
+        cfile->end=cfile->frames;
+        create_frame_index(mainw->current_file,TRUE,cfile->fps*(start==0?0:start-1),frames==0?cfile->frames:frames);
+
+        cfile->arate=cfile->arps=cdata->arate;
+        cfile->achans=cdata->achans;
+        cfile->asampsize=cdata->asamps;
+
+        cfile->signed_endian=get_signed_endian(cdata->asigned, capable->byte_order==LIVES_LITTLE_ENDIAN);
+
+        if (cfile->achans>0&&(dplug->decoder->rip_audio)!=NULL&&withsound==1) {
+          // call rip_audio() in the decoder plugin
+          // the plugin gets a chance to do any internal cleanup in rip_audio_cleanup()
+
+          int64_t stframe=cfile->fps*start+.5;
+          int64_t maxframe=stframe+(frames==0)?cfile->frames:frames;
+          int64_t nframes=AUDIO_FRAMES_TO_READ;
+          char *afile=lives_strdup_printf("%s/%s/audiodump.pcm",prefs->tmpdir,cfile->handle);
+
+          msgstr=lives_strdup_printf(_("Opening audio for %s"),file_name);
+
+          if (mainw->playing_file==-1) resize(1);
+
+          mainw->cancelled=CANCEL_NONE;
+
+          cfile->opening_only_audio=TRUE;
+          if (mainw->playing_file==-1) do_threaded_dialog(msgstr,TRUE);
+
+          do {
+            if (stframe+nframes>maxframe) nframes=maxframe-stframe;
+            if (nframes<=0) break;
+            (dplug->decoder->rip_audio)(cdata,afile,stframe,nframes,NULL);
+            threaded_dialog_spin();
+            stframe+=nframes;
+          } while (mainw->cancelled==CANCEL_NONE);
+
+          if (dplug->decoder->rip_audio_cleanup!=NULL) {
+            (dplug->decoder->rip_audio_cleanup)(cdata);
+          }
+
+          if (mainw->cancelled!=CANCEL_NONE) {
+            if (!rip_audio_cancelled(old_file,mt_pb_start_event,mt_has_audio_file)) {
+              lives_free(afile);
+              return 0;
+            }
+          }
+
+          end_threaded_dialog();
+          lives_free(msgstr);
+
+          cfile->opening_only_audio=FALSE;
+          lives_free(afile);
+        } else {
+          cfile->arate=0.;
+          cfile->achans=cfile->asampsize=0;
+        }
+
+        cfile->fps=cfile->pb_fps=cdata->fps;
+        d_print("\n");
+
+        if (cfile->achans==0&&withsound==1) {
+          if (0) {
+            /*if (!capable->has_mplayer) {
+              do_mplayer_audio_warning();
+              }*/
+          } else {
+
+            mainw->com_failed=FALSE;
+
+            // check if we have audio
+            read_file_details(file_name,FALSE);
+            unlink(cfile->info_file);
+
+            if (mainw->com_failed) return 0;
+
+            if (strlen(mainw->msg)>0) add_file_info(cfile->handle,TRUE);
+
+            if (cfile->achans>0) {
+              // plugin returned no audio, try with mplayer
+              if (mainw->file_open_params==NULL) mainw->file_open_params=lives_strdup("");
+              com=lives_strdup_printf("%s open \"%s\" \"%s\" %d \"%s\" %.2f %d \"%s\"",prefs->backend,cfile->handle,
+                                      (tmp=lives_filename_from_utf8(file_name,-1,NULL,NULL,NULL)),-1,
+                                      prefs->image_ext,start,frames,mainw->file_open_params);
+
+              lives_free(tmp);
+
+
+              cfile->op_dir=lives_filename_from_utf8((tmp=get_dir(file_name)),-1,NULL,NULL,NULL);
+              lives_free(tmp);
+
+              unlink(cfile->info_file);
+              lives_system(com,FALSE);
+              lives_free(com);
+              tmp=NULL;
+
+              // if we have a quick-opening file, display the first and last frames now
+              // for some codecs this can be helpful since we can locate the last frame while audio is loading
+              if (cfile->clip_type==CLIP_TYPE_FILE&&mainw->playing_file==-1) resize(1);
+
+              mainw->effects_paused=FALSE; // set to TRUE if user clicks "Enough"
+
+              msgstr=lives_strdup_printf(_("Opening audio"),file_name);
+              if (!do_progress_dialog(TRUE,TRUE,msgstr)) {
+                // user cancelled or switched to another clip
+
+                lives_free(msgstr);
+
+                mainw->opening_frames=-1;
 
-		if (mainw->cancelled!=CANCEL_ERROR) {
+                if (mainw->multitrack!=NULL) {
+                  mainw->multitrack->pb_start_event=mt_pb_start_event;
+                  mainw->multitrack->has_audio_file=mt_has_audio_file;
+                }
+
+                if (mainw->cancelled==CANCEL_NO_PROPOGATE) {
+                  lives_set_cursor_style(LIVES_CURSOR_NORMAL,NULL);
+                  mainw->cancelled=CANCEL_NONE;
+                  return 0;
+                }
+
+                // cancelled
+
+                if (mainw->cancelled!=CANCEL_ERROR) {
 #ifndef IS_MINGW
-		  // clean up our temp files
-		  com=g_strdup_printf("%s stopsubsub \"%s\" 2>/dev/null",prefs->backend_sync,cfile->handle);
-		  lives_system(com,TRUE);
+                  // clean up our temp files
+                  com=lives_strdup_printf("%s stopsubsub \"%s\" 2>/dev/null",prefs->backend_sync,cfile->handle);
+                  lives_system(com,TRUE);
 #else
-		  // get pid from backend
-		  FILE *rfile;
-		  ssize_t rlen;
-		  char val[16];
-		  int pid;
-		  com=g_strdup_printf("%s get_pid_for_handle \"%s\"",prefs->backend_sync,cfile->handle);
-		  rfile=popen(com,"r");
-		  rlen=fread(val,1,16,rfile);
-		  pclose(rfile);
-		  memset(val+rlen,0,1);
-		  pid=atoi(val);
-    
-		  lives_win32_kill_subprocesses(pid,TRUE);
-#endif
-		  g_free(com);
-		}
-
-		if (mainw->file_open_params!=NULL) g_free (mainw->file_open_params);
-		mainw->file_open_params=NULL;
-		close_current_file(old_file);
-		lives_set_cursor_style(LIVES_CURSOR_NORMAL,NULL);
-		return;
-	      }
-	      if (mainw->error==0) add_file_info (cfile->handle,TRUE);
-	      mainw->error=0;
-	      g_free(msgstr);
-
-	      cfile->opening=FALSE;
-	      reget_afilesize(mainw->current_file);
-	      get_total_time(cfile);
-
-	      if (prefs->auto_trim_audio) {
-		if ((cdata->sync_hint&SYNC_HINT_VIDEO_PAD_START)&&cdata->video_start_time<=1.) {
-		  // pad with blank frames at start
-		  int extra_frames=cdata->video_start_time*cfile->fps+.5;
-		  insert_blank_frames(mainw->current_file,extra_frames,0);
-		  load_start_image(cfile->start);
-		  load_end_image(cfile->end);
-		}
-		if ((cdata->sync_hint&SYNC_HINT_VIDEO_PAD_END)&&(double)cfile->frames/cfile->fps<cfile->laudio_time) {
-		  // pad with blank frames at end
-		  int extra_frames=(cfile->laudio_time-(double)cfile->frames/cfile->fps)*cfile->fps+.5;
-		  insert_blank_frames(mainw->current_file,extra_frames,cfile->frames);
-		  cfile->end=cfile->frames;
-		  load_end_image(cfile->end);
-		}
-		if (cfile->total_time>cfile->video_time) {
-		  if (cdata->sync_hint&SYNC_HINT_AUDIO_TRIM_START) {
-		    cfile->undo1_dbl=0.;
-		    cfile->undo2_dbl=cfile->total_time-cfile->video_time;
-		    msgstr=g_strdup_printf(_ ("Auto trimming %.2f seconds of audio at start..."),cfile->undo2_dbl);
-		    d_print(msgstr);
-		    g_free(msgstr);
-		    if (on_del_audio_activate(NULL,NULL)) d_print_done();
-		    else d_print("\n");
-		    cfile->changed=FALSE;
-		  }
-		  if (cdata->sync_hint&SYNC_HINT_AUDIO_TRIM_END) {
-		    cfile->undo1_dbl=cfile->laudio_time;
-		    cfile->undo2_dbl=cfile->total_time-cfile->video_time;
-		    msgstr=g_strdup_printf(_ ("Auto trimming %.2f seconds of audio at end..."),cfile->undo2_dbl);
-		    d_print(msgstr);
-		    g_free(msgstr);
-		    if (on_del_audio_activate(NULL,NULL)) d_print_done();
-		    else d_print("\n");
-		    cfile->changed=FALSE;
-		  }
-		}
-		if (!mainw->effects_paused&&cfile->afilesize>0&&cfile->total_time>cfile->laudio_time) {
-		  if (cdata->sync_hint&SYNC_HINT_AUDIO_PAD_START) {
-		    cfile->undo1_dbl=0.;
-		    cfile->undo2_dbl=cfile->total_time-cfile->laudio_time;
-		    cfile->undo_arate=cfile->arate;
-		    cfile->undo_signed_endian=cfile->signed_endian;
-		    cfile->undo_achans=cfile->achans;
-		    cfile->undo_asampsize=cfile->asampsize;
-		    cfile->undo_arps=cfile->arps;
-		    msgstr=g_strdup_printf(_ ("Auto padding with %.2f seconds of silence at start..."),cfile->undo2_dbl);
-		    d_print(msgstr);
-		    g_free(msgstr);
-		    if (on_ins_silence_activate(NULL,NULL)) d_print_done();
-		    else d_print("\n");
-		    cfile->changed=FALSE;
-		  }
-		  if (cdata->sync_hint&SYNC_HINT_AUDIO_PAD_END) {
-		    cfile->undo1_dbl=cfile->laudio_time;
-		    cfile->undo2_dbl=cfile->total_time-cfile->laudio_time;
-		    cfile->undo_arate=cfile->arate;
-		    cfile->undo_signed_endian=cfile->signed_endian;
-		    cfile->undo_achans=cfile->achans;
-		    cfile->undo_asampsize=cfile->asampsize;
-		    cfile->undo_arps=cfile->arps;
-		    msgstr=g_strdup_printf(_ ("Auto padding with %.2f seconds of silence at end..."),cfile->undo2_dbl);
-		    d_print(msgstr);
-		    g_free(msgstr);
-		    if (on_ins_silence_activate(NULL,NULL)) d_print_done();
-		    else d_print("\n");
-		    cfile->changed=FALSE;
-		  }
-		}
-	      }
-	    }
-	  }
-	}
-	get_mime_type(cfile->type,40,cdata);
-	save_frame_index(mainw->current_file);
+                  // get pid from backend
+                  FILE *rfile;
+                  ssize_t rlen;
+                  char val[16];
+                  int pid;
+                  com=lives_strdup_printf("%s get_pid_for_handle \"%s\"",prefs->backend_sync,cfile->handle);
+                  rfile=popen(com,"r");
+                  rlen=fread(val,1,16,rfile);
+                  pclose(rfile);
+                  memset(val+rlen,0,1);
+                  pid=atoi(val);
+
+                  lives_win32_kill_subprocesses(pid,TRUE);
+#endif
+                  lives_free(com);
+                }
+
+                if (mainw->file_open_params!=NULL) lives_free(mainw->file_open_params);
+                mainw->file_open_params=NULL;
+                close_current_file(old_file);
+                lives_set_cursor_style(LIVES_CURSOR_NORMAL,NULL);
+                return 0;
+              }
+              if (mainw->error==0) add_file_info(cfile->handle,TRUE);
+              mainw->error=0;
+              lives_free(msgstr);
+
+              cfile->opening=FALSE;
+              reget_afilesize(mainw->current_file);
+              get_total_time(cfile);
+
+              if (prefs->auto_trim_audio) {
+                if ((cdata->sync_hint&SYNC_HINT_VIDEO_PAD_START)&&cdata->video_start_time<=1.) {
+                  // pad with blank frames at start
+                  int extra_frames=cdata->video_start_time*cfile->fps+.5;
+                  insert_blank_frames(mainw->current_file,extra_frames,0);
+                  load_start_image(cfile->start);
+                  load_end_image(cfile->end);
+                }
+                if ((cdata->sync_hint&SYNC_HINT_VIDEO_PAD_END)&&(double)cfile->frames/cfile->fps<cfile->laudio_time) {
+                  // pad with blank frames at end
+                  int extra_frames=(cfile->laudio_time-(double)cfile->frames/cfile->fps)*cfile->fps+.5;
+                  insert_blank_frames(mainw->current_file,extra_frames,cfile->frames);
+                  cfile->end=cfile->frames;
+                  load_end_image(cfile->end);
+                }
+                if (cfile->total_time>cfile->video_time) {
+                  if (cdata->sync_hint&SYNC_HINT_AUDIO_TRIM_START) {
+                    cfile->undo1_dbl=0.;
+                    cfile->undo2_dbl=cfile->total_time-cfile->video_time;
+                    d_print(_("Auto trimming %.2f seconds of audio at start..."),cfile->undo2_dbl);
+                    if (on_del_audio_activate(NULL,NULL)) d_print_done();
+                    else d_print("\n");
+                    cfile->changed=FALSE;
+                  }
+                  if (cdata->sync_hint&SYNC_HINT_AUDIO_TRIM_END) {
+                    cfile->undo1_dbl=cfile->laudio_time;
+                    cfile->undo2_dbl=cfile->total_time-cfile->video_time;
+                    d_print(_("Auto trimming %.2f seconds of audio at end..."),cfile->undo2_dbl);
+                    if (on_del_audio_activate(NULL,NULL)) d_print_done();
+                    else d_print("\n");
+                    cfile->changed=FALSE;
+                  }
+                }
+                if (!mainw->effects_paused&&cfile->afilesize>0&&cfile->total_time>cfile->laudio_time) {
+                  if (cdata->sync_hint&SYNC_HINT_AUDIO_PAD_START) {
+                    cfile->undo1_dbl=0.;
+                    cfile->undo2_dbl=cfile->total_time-cfile->laudio_time;
+                    cfile->undo_arate=cfile->arate;
+                    cfile->undo_signed_endian=cfile->signed_endian;
+                    cfile->undo_achans=cfile->achans;
+                    cfile->undo_asampsize=cfile->asampsize;
+                    cfile->undo_arps=cfile->arps;
+                    d_print(_("Auto padding with %.2f seconds of silence at start..."),cfile->undo2_dbl);
+                    if (on_ins_silence_activate(NULL,NULL)) d_print_done();
+                    else d_print("\n");
+                    cfile->changed=FALSE;
+                  }
+                  if (cdata->sync_hint&SYNC_HINT_AUDIO_PAD_END) {
+                    cfile->undo1_dbl=cfile->laudio_time;
+                    cfile->undo2_dbl=cfile->total_time-cfile->laudio_time;
+                    cfile->undo_arate=cfile->arate;
+                    cfile->undo_signed_endian=cfile->signed_endian;
+                    cfile->undo_achans=cfile->achans;
+                    cfile->undo_asampsize=cfile->asampsize;
+                    cfile->undo_arps=cfile->arps;
+                    d_print(_("Auto padding with %.2f seconds of silence at end..."),cfile->undo2_dbl);
+                    if (on_ins_silence_activate(NULL,NULL)) d_print_done();
+                    else d_print("\n");
+                    cfile->changed=FALSE;
+                  }
+                }
+              }
+            }
+          }
+        }
+        get_mime_type(cfile->type,40,cdata);
+        save_frame_index(mainw->current_file);
       }
     }
 
-    
+
     if (cfile->ext_src!=NULL) {
       if (mainw->open_deint) {
-	// override what the plugin says
-	cfile->deinterlace=TRUE;
-	cfile->interlace=LIVES_INTERLACE_TOP_FIRST; // guessing
-	save_clip_value(mainw->current_file,CLIP_DETAILS_INTERLACE,&cfile->interlace);
-	if (mainw->com_failed||mainw->write_failed) do_header_write_error(mainw->current_file);
+        // override what the plugin says
+        cfile->deinterlace=TRUE;
+        cfile->interlace=LIVES_INTERLACE_TOP_FIRST; // guessing
+        save_clip_value(mainw->current_file,CLIP_DETAILS_INTERLACE,&cfile->interlace);
+        if (mainw->com_failed||mainw->write_failed) do_header_write_error(mainw->current_file);
       }
     }
 
     else {
       // get the file size, etc. (frames is just a guess here)
       if (!read_file_details(file_name,FALSE)) {
-	// user cancelled
-	close_current_file(old_file);
-	mainw->noswitch=FALSE;
-	if (mainw->multitrack!=NULL) {
-	  mainw->multitrack->pb_start_event=mt_pb_start_event;
-	  mainw->multitrack->has_audio_file=mt_has_audio_file;
-	}
-	if (mainw->file_open_params!=NULL) g_free (mainw->file_open_params);
-	mainw->file_open_params=NULL;
-	lives_set_cursor_style(LIVES_CURSOR_NORMAL,NULL);
-	return;
+        // user cancelled
+        close_current_file(old_file);
+        mainw->noswitch=FALSE;
+        if (mainw->multitrack!=NULL) {
+          mainw->multitrack->pb_start_event=mt_pb_start_event;
+          mainw->multitrack->has_audio_file=mt_has_audio_file;
+        }
+        if (mainw->file_open_params!=NULL) lives_free(mainw->file_open_params);
+        mainw->file_open_params=NULL;
+        lives_set_cursor_style(LIVES_CURSOR_NORMAL,NULL);
+        return 0;
       }
-      unlink (cfile->info_file);
+      unlink(cfile->info_file);
 
       // we must set this before calling add_file_info
       cfile->opening=TRUE;
       mainw->opening_frames=-1;
 
-      if (!add_file_info (cfile->handle,FALSE)) {
-	close_current_file(old_file);
-	mainw->noswitch=FALSE;
-	if (mainw->multitrack!=NULL) {
-	  mainw->multitrack->pb_start_event=mt_pb_start_event;
-	  mainw->multitrack->has_audio_file=mt_has_audio_file;
-	}
-	if (mainw->file_open_params!=NULL) g_free (mainw->file_open_params);
-	mainw->file_open_params=NULL;
-	lives_set_cursor_style(LIVES_CURSOR_NORMAL,NULL);
-	return;
+      if (!add_file_info(cfile->handle,FALSE)) {
+        close_current_file(old_file);
+        mainw->noswitch=FALSE;
+        if (mainw->multitrack!=NULL) {
+          mainw->multitrack->pb_start_event=mt_pb_start_event;
+          mainw->multitrack->has_audio_file=mt_has_audio_file;
+        }
+        if (mainw->file_open_params!=NULL) lives_free(mainw->file_open_params);
+        mainw->file_open_params=NULL;
+        lives_set_cursor_style(LIVES_CURSOR_NORMAL,NULL);
+        return 0;
       }
 
       if (frames>0&&cfile->frames>frames) cfile->end=cfile->undo_end=cfile->frames=frames;
-      
+
       // be careful, here we switch from mainw->opening_loc to cfile->opening_loc
       if (mainw->opening_loc) {
-	cfile->opening_loc=TRUE;
-	mainw->opening_loc=FALSE;
+        cfile->opening_loc=TRUE;
+        mainw->opening_loc=FALSE;
       }
-    
+
       if (cfile->f_size>prefs->warn_file_size*1000000.&&mainw->is_ready&&frames==0) {
-	gchar *fsize_ds=lives_format_storage_space_string((uint64_t)cfile->f_size);
-	gchar *warn=g_strdup_printf(_ ("\nLiVES is not currently optimised for larger file sizes.\nYou are advised (for now) to start with a smaller file, or to use the 'Open File Selection' option.\n(Filesize=%s)\n\nAre you sure you wish to continue ?"),fsize_ds);
-	g_free(fsize_ds);
-	if (!do_warning_dialog_with_check(warn,WARN_MASK_FSIZE)) {
-	  g_free(warn);
-	  close_current_file(old_file);
-	  mainw->noswitch=FALSE;
-	  if (mainw->multitrack!=NULL) {
-	    mainw->multitrack->pb_start_event=mt_pb_start_event;
-	    mainw->multitrack->has_audio_file=mt_has_audio_file;
-	  }
-	  lives_set_cursor_style(LIVES_CURSOR_NORMAL,NULL);
-	  return;
-	}
-	g_free(warn);
-	d_print(_ (" - please be patient."));
+        char *fsize_ds=lives_format_storage_space_string((uint64_t)cfile->f_size);
+        char *warn=lives_strdup_printf(
+                     _("\nLiVES is not currently optimised for larger file sizes.\nYou are advised (for now) to start with a smaller file, or to use the 'Open File Selection' option.\n(Filesize=%s)\n\nAre you sure you wish to continue ?"),
+                     fsize_ds);
+        lives_free(fsize_ds);
+        if (!do_warning_dialog_with_check(warn,WARN_MASK_FSIZE)) {
+          lives_free(warn);
+          close_current_file(old_file);
+          mainw->noswitch=FALSE;
+          if (mainw->multitrack!=NULL) {
+            mainw->multitrack->pb_start_event=mt_pb_start_event;
+            mainw->multitrack->has_audio_file=mt_has_audio_file;
+          }
+          lives_set_cursor_style(LIVES_CURSOR_NORMAL,NULL);
+          return 0;
+        }
+        lives_free(warn);
+        d_print(_(" - please be patient."));
       }
-      
+
       d_print("\n");
 #if defined DEBUG
       g_print("open_file: dpd in\n");
@@ -714,9 +705,8 @@
     current_file=mainw->current_file;
 
     if (mainw->playing_file>-1) {
-      do_quick_switch (current_file);
-    }
-    else {
+      do_quick_switch(current_file);
+    } else {
       switch_to_file((mainw->current_file=(cfile->clip_type!=CLIP_TYPE_FILE)?old_file:current_file),current_file);
     }
 
@@ -742,112 +732,112 @@
     mainw->effects_paused=FALSE;
 
     if (cfile->ext_src==NULL) {
-      if (mainw->file_open_params==NULL) mainw->file_open_params=g_strdup("");
+      if (mainw->file_open_params==NULL) mainw->file_open_params=lives_strdup("");
 
-      tmp=g_strconcat(mainw->file_open_params,get_deinterlace_string(),NULL);
-      g_free(mainw->file_open_params);
+      tmp=lives_strconcat(mainw->file_open_params,get_deinterlace_string(),NULL);
+      lives_free(mainw->file_open_params);
       mainw->file_open_params=tmp;
-      
-      com=g_strdup_printf("%s open \"%s\" \"%s\" %d \"%s\" %.2f %d \"%s\"",prefs->backend,cfile->handle,
-			  (tmp=g_filename_from_utf8 (file_name,-1,NULL,NULL,NULL)),withsound,
-			  prefs->image_ext,start,frames,mainw->file_open_params);
-      unlink (cfile->info_file);
+
+      com=lives_strdup_printf("%s open \"%s\" \"%s\" %d \"%s\" %.2f %d \"%s\"",prefs->backend,cfile->handle,
+                              (tmp=lives_filename_from_utf8(file_name,-1,NULL,NULL,NULL)),withsound,
+                              prefs->image_ext,start,frames,mainw->file_open_params);
+      unlink(cfile->info_file);
       lives_system(com,FALSE);
-      g_free(com);
-      g_free(tmp);
-      
+      lives_free(com);
+      lives_free(tmp);
+
       if (mainw->toy_type==LIVES_TOY_TV) {
-	// for LiVES TV we do an auto-preview
-	mainw->play_start=cfile->start=cfile->undo_start;
-	mainw->play_end=cfile->end=cfile->undo_end;
-	mainw->preview=TRUE;
-	do {
-	  desensitize();
-	  procw_desensitize();
-	  on_playsel_activate (NULL, NULL);
-	} while (mainw->cancelled==CANCEL_KEEP_LOOPING);
-	mainw->preview=FALSE;
-	on_toy_activate(NULL,GINT_TO_POINTER(LIVES_TOY_NONE));
-	g_free (mainw->file_open_params);
-	mainw->file_open_params=NULL;
-	mainw->cancelled=CANCEL_NONE;
-	lives_set_cursor_style(LIVES_CURSOR_NORMAL,NULL);
-	mainw->noswitch=FALSE;
-	return;
+        // for LiVES TV we do an auto-preview
+        mainw->play_start=cfile->start=cfile->undo_start;
+        mainw->play_end=cfile->end=cfile->undo_end;
+        mainw->preview=TRUE;
+        do {
+          desensitize();
+          procw_desensitize();
+          on_playsel_activate(NULL, NULL);
+        } while (mainw->cancelled==CANCEL_KEEP_LOOPING);
+        mainw->preview=FALSE;
+        on_toy_activate(NULL,LIVES_INT_TO_POINTER(LIVES_TOY_NONE));
+        lives_free(mainw->file_open_params);
+        mainw->file_open_params=NULL;
+        mainw->cancelled=CANCEL_NONE;
+        lives_set_cursor_style(LIVES_CURSOR_NORMAL,NULL);
+        mainw->noswitch=FALSE;
+        return 0;
       }
     }
 
     //  loading:
 
     // 'entry point' when we switch back
-    
+
     // spin until loading is complete
     // afterwards, mainw->msg will contain file details
     cfile->progress_start=cfile->progress_end=0;
-    
+
     // (also check for cancel)
-    msgstr=g_strdup_printf(_("Opening %s"),file_name);
-    
+    msgstr=lives_strdup_printf(_("Opening %s"),file_name);
+
     if (cfile->ext_src==NULL&&mainw->toy_type!=LIVES_TOY_TV) {
       if (!do_progress_dialog(TRUE,TRUE,msgstr)) {
-	// user cancelled or switched to another clip
+        // user cancelled or switched to another clip
 #ifdef IS_MINGW
-	FILE *rfile;
-	ssize_t rlen;
-	char val[16];
-	int pid;
-#endif
-
-	g_free(msgstr);
-	
-	mainw->opening_frames=-1;
-	mainw->effects_paused=FALSE;
-	
-	if (mainw->cancelled==CANCEL_NO_PROPOGATE) {
-	  mainw->cancelled=CANCEL_NONE;
-	  lives_set_cursor_style(LIVES_CURSOR_NORMAL,NULL);
-	  mainw->noswitch=FALSE;
-	  return;
-	}
-	
-	// cancelled
-	// clean up our temp files
+        FILE *rfile;
+        ssize_t rlen;
+        char val[16];
+        int pid;
+#endif
+
+        lives_free(msgstr);
+
+        mainw->opening_frames=-1;
+        mainw->effects_paused=FALSE;
+
+        if (mainw->cancelled==CANCEL_NO_PROPOGATE) {
+          mainw->cancelled=CANCEL_NONE;
+          lives_set_cursor_style(LIVES_CURSOR_NORMAL,NULL);
+          mainw->noswitch=FALSE;
+          return 0;
+        }
+
+        // cancelled
+        // clean up our temp files
 #ifndef IS_MINGW
-	com=g_strdup_printf("%s stopsubsub \"%s\" 2>/dev/null",prefs->backend_sync,cfile->handle);
-	lives_system(com,TRUE);
+        com=lives_strdup_printf("%s stopsubsub \"%s\" 2>/dev/null",prefs->backend_sync,cfile->handle);
+        lives_system(com,TRUE);
 #else
-	// get pid from backend
-	com=g_strdup_printf("%s get_pid_for_handle \"%s\"",prefs->backend_sync,cfile->handle);
-	rfile=popen(com,"r");
-	rlen=fread(val,1,16,rfile);
-	pclose(rfile);
-	memset(val+rlen,0,1);
-	pid=atoi(val);
-	
-	lives_win32_kill_subprocesses(pid,TRUE);
-#endif
-	g_free(com);
-	if (mainw->file_open_params!=NULL) g_free (mainw->file_open_params);
-	mainw->file_open_params=NULL;
-	close_current_file(old_file);
-	if (mainw->multitrack!=NULL) {
-	  mainw->multitrack->pb_start_event=mt_pb_start_event;
-	  mainw->multitrack->has_audio_file=mt_has_audio_file;
-	}
-	mainw->noswitch=FALSE;
-	lives_set_cursor_style(LIVES_CURSOR_NORMAL,NULL);
-	return;
+        // get pid from backend
+        com=lives_strdup_printf("%s get_pid_for_handle \"%s\"",prefs->backend_sync,cfile->handle);
+        rfile=popen(com,"r");
+        rlen=fread(val,1,16,rfile);
+        pclose(rfile);
+        memset(val+rlen,0,1);
+        pid=atoi(val);
+
+        lives_win32_kill_subprocesses(pid,TRUE);
+#endif
+        lives_free(com);
+        if (mainw->file_open_params!=NULL) lives_free(mainw->file_open_params);
+        mainw->file_open_params=NULL;
+        close_current_file(old_file);
+        if (mainw->multitrack!=NULL) {
+          mainw->multitrack->pb_start_event=mt_pb_start_event;
+          mainw->multitrack->has_audio_file=mt_has_audio_file;
+        }
+        mainw->noswitch=FALSE;
+        lives_set_cursor_style(LIVES_CURSOR_NORMAL,NULL);
+        return 0;
       }
     }
-    g_free(msgstr);
+    lives_free(msgstr);
   }
 
   if (cfile->ext_src!=NULL&&cfile->achans>0) {
-    gchar *afile=g_strdup_printf("%s/%s/audiodump.pcm",prefs->tmpdir,cfile->handle);
-    gchar *ofile=g_strdup_printf("%s/%s/audio",prefs->tmpdir,cfile->handle);
+    char *afile=lives_strdup_printf("%s/%s/audiodump.pcm",prefs->tmpdir,cfile->handle);
+    char *ofile=lives_strdup_printf("%s/%s/audio",prefs->tmpdir,cfile->handle);
     rename(afile,ofile);
-    g_free(afile);
-    g_free(ofile);
+    lives_free(afile);
+    lives_free(ofile);
   }
 
   cfile->opening=cfile->opening_audio=cfile->opening_only_audio=FALSE;
@@ -869,10 +859,10 @@
     d_print_failed();
     close_current_file(old_file);
     mainw->noswitch=FALSE;
-    if (mainw->file_open_params!=NULL) g_free (mainw->file_open_params);
+    if (mainw->file_open_params!=NULL) lives_free(mainw->file_open_params);
     mainw->file_open_params=NULL;
     lives_set_cursor_style(LIVES_CURSOR_NORMAL,NULL);
-    return;
+    return 0;
   }
 
   if (cfile->opening_loc) {
@@ -882,41 +872,39 @@
 
   else {
     if (prefs->autoload_subs) {
-      gchar filename[512];
-      gchar *subfname;
+      char filename[512];
+      char *subfname;
       lives_subtitle_type_t subtype=SUBTITLE_TYPE_NONE;
 
-      g_snprintf(filename,512,"%s",file_name);
+      lives_snprintf(filename,512,"%s",file_name);
       get_filename(filename,FALSE); // strip extension
-      isubfname=g_strdup_printf("%s.srt",filename);
-      if (g_file_test(isubfname,G_FILE_TEST_EXISTS)) {
-	subfname=g_build_filename(prefs->tmpdir,cfile->handle,"subs.srt",NULL);
-	subtype=SUBTITLE_TYPE_SRT;
-      }
-      else {
-	g_free(isubfname);
-	isubfname=g_strdup_printf("%s.sub",filename);
-	if (g_file_test(isubfname,G_FILE_TEST_EXISTS)) {
-	  subfname=g_build_filename(prefs->tmpdir,cfile->handle,"subs.sub",NULL);
-	  subtype=SUBTITLE_TYPE_SUB;
-	}
+      isubfname=lives_strdup_printf("%s.srt",filename);
+      if (lives_file_test(isubfname,LIVES_FILE_TEST_EXISTS)) {
+        subfname=lives_build_filename(prefs->tmpdir,cfile->handle,"subs.srt",NULL);
+        subtype=SUBTITLE_TYPE_SRT;
+      } else {
+        lives_free(isubfname);
+        isubfname=lives_strdup_printf("%s.sub",filename);
+        if (lives_file_test(isubfname,LIVES_FILE_TEST_EXISTS)) {
+          subfname=lives_build_filename(prefs->tmpdir,cfile->handle,"subs.sub",NULL);
+          subtype=SUBTITLE_TYPE_SUB;
+        }
       }
       if (subtype!=SUBTITLE_TYPE_NONE) {
 #ifndef IS_MINGW
-	com=g_strdup_printf("/bin/cp \"%s\" \"%s\"",isubfname,subfname);
+        com=lives_strdup_printf("%s \"%s\" \"%s\"",capable->cp_cmd,isubfname,subfname);
 #else
-	com=g_strdup_printf("cp.exe \"%s\" \"%s\"",isubfname,subfname);
+        com=lives_strdup_printf("cp.exe \"%s\" \"%s\"",isubfname,subfname);
 #endif
-	mainw->com_failed=FALSE;
-	lives_system(com,FALSE);
-	g_free(com);
-	if (!mainw->com_failed) 
-	  subtitles_init(cfile,subfname,subtype);
-	g_free(subfname);
-      }
-      else {
-	g_free(isubfname);
-	isubfname=NULL;
+        mainw->com_failed=FALSE;
+        lives_system(com,FALSE);
+        lives_free(com);
+        if (!mainw->com_failed)
+          subtitles_init(cfile,subfname,subtype);
+        lives_free(subfname);
+      } else {
+        lives_free(isubfname);
+        isubfname=NULL;
       }
     }
   }
@@ -928,38 +916,36 @@
   if (cfile->ext_src==NULL) add_file_info(cfile->handle,FALSE);
   else {
     add_file_info(NULL,FALSE);
-    cfile->f_size=sget_file_size((gchar *)file_name);
+    cfile->f_size=sget_file_size((char *)file_name);
   }
 
   if (cfile->frames<=0) {
     if (cfile->afilesize==0l) {
       // we got neither video nor audio...
-      g_snprintf (msg,256,"%s",_ 
-		  ("\n\nLiVES was unable to extract either video or audio.\nPlease check the terminal window for more details.\n"));
+      lives_snprintf(msg,256,"%s",_
+                     ("\n\nLiVES was unable to extract either video or audio.\nPlease check the terminal window for more details.\n"));
       if (!capable->has_mplayer&&!capable->has_mplayer2) {
-	g_strappend (msg,256,_ ("\n\nYou may need to install mplayer to open this file.\n"));
-      }
-      else {
-	if (capable->has_mplayer) {
-	  get_location ("mplayer",loc,256);
-	}
-	else get_location ("mplayer2",loc,256);
-	if (strcmp (prefs->video_open_command,loc)) {
-	  g_strappend (msg,256,_ ("\n\nPlease check the setting of Video open command in\nTools|Preferences|Decoding\n"));
-	}
+        lives_strappend(msg,256,_("\n\nYou may need to install mplayer to open this file.\n"));
+      } else {
+        if (capable->has_mplayer) {
+          get_location("mplayer",loc,256);
+        } else get_location("mplayer2",loc,256);
+        if (strcmp(prefs->video_open_command,loc)) {
+          lives_strappend(msg,256,_("\n\nPlease check the setting of Video open command in\nTools|Preferences|Decoding\n"));
+        }
       }
       do_error_dialog(msg);
       d_print_failed();
       close_current_file(old_file);
       mainw->noswitch=FALSE;
       if (mainw->multitrack!=NULL) {
-	mainw->multitrack->pb_start_event=mt_pb_start_event;
-	mainw->multitrack->has_audio_file=mt_has_audio_file;
+        mainw->multitrack->pb_start_event=mt_pb_start_event;
+        mainw->multitrack->has_audio_file=mt_has_audio_file;
       }
-      if (mainw->file_open_params!=NULL) g_free (mainw->file_open_params);
+      if (mainw->file_open_params!=NULL) lives_free(mainw->file_open_params);
       mainw->file_open_params=NULL;
       lives_set_cursor_style(LIVES_CURSOR_NORMAL,NULL);
-      return;
+      return 0;
     }
     cfile->frames=0;
   }
@@ -967,21 +953,16 @@
   current_file=mainw->current_file;
 
   if (isubfname!=NULL) {
-    tmp=g_strdup_printf(_("Loaded subtitle file: %s\n"),isubfname);
-    d_print(tmp);
-    g_free(tmp);
-    g_free(isubfname);
+    d_print(_("Loaded subtitle file: %s\n"),isubfname);
+    lives_free(isubfname);
   }
 
-
-#ifdef ENABLE_OSC
-    lives_osc_notify(LIVES_OSC_NOTIFY_CLIP_OPENED,"");
-#endif
+  lives_notify(LIVES_OSC_NOTIFY_CLIP_OPENED,"");
 
   if (prefs->show_recent&&!mainw->is_generating) {
     add_to_recent(file_name,start,frames,mainw->file_open_params);
   }
-  if (mainw->file_open_params!=NULL) g_free (mainw->file_open_params);
+  if (mainw->file_open_params!=NULL) lives_free(mainw->file_open_params);
   mainw->file_open_params=NULL;
 
   if (!strcmp(cfile->type,"Frames")||!strcmp(cfile->type,"jpeg")||!strcmp(cfile->type,"png")||!strcmp(cfile->type,"Audio")) {
@@ -993,33 +974,33 @@
     else if (prefs->concat_images) {
       // insert this image into our image clip, close this file
 
-      com=g_strdup_printf("%s insert \"%s\" \"%s\" %d 1 1 \"%s\" 0 %d %d %d",prefs->backend,
-			  mainw->files[mainw->img_concat_clip]->handle,
-			  get_image_ext_for_type(mainw->files[mainw->img_concat_clip]->img_type),
-			  mainw->files[mainw->img_concat_clip]->frames,
-			  cfile->handle,mainw->files[mainw->img_concat_clip]->frames,
-			  mainw->files[mainw->img_concat_clip]->hsize,mainw->files[mainw->img_concat_clip]->vsize);
+      com=lives_strdup_printf("%s insert \"%s\" \"%s\" %d 1 1 \"%s\" 0 %d %d %d",prefs->backend,
+                              mainw->files[mainw->img_concat_clip]->handle,
+                              get_image_ext_for_type(mainw->files[mainw->img_concat_clip]->img_type),
+                              mainw->files[mainw->img_concat_clip]->frames,
+                              cfile->handle,mainw->files[mainw->img_concat_clip]->frames,
+                              mainw->files[mainw->img_concat_clip]->hsize,mainw->files[mainw->img_concat_clip]->vsize);
 
       mainw->current_file=mainw->img_concat_clip;
 
-      unlink (cfile->info_file);
+      unlink(cfile->info_file);
 
       mainw->cancelled=CANCEL_NONE;
       mainw->error=FALSE;
       mainw->com_failed=FALSE;
 
       lives_system(com,FALSE);
-      g_free(com);
+      lives_free(com);
 
       do_auto_dialog(_("Adding image..."),2);
 
       if (current_file!=mainw->img_concat_clip) {
-	mainw->current_file=current_file;
-	close_current_file(mainw->img_concat_clip);
+        mainw->current_file=current_file;
+        close_current_file(mainw->img_concat_clip);
       }
 
       if (mainw->cancelled||mainw->error) {
-	goto load_done;
+        goto load_done;
       }
 
       cfile->frames++;
@@ -1029,7 +1010,7 @@
       lives_spin_button_set_range(LIVES_SPIN_BUTTON(mainw->spinbutton_end),cfile->frames==0?0:1,cfile->frames);
       lives_spin_button_set_value(LIVES_SPIN_BUTTON(mainw->spinbutton_end),cfile->end);
       lives_signal_handler_unblock(mainw->spinbutton_end,mainw->spin_end_func);
-       
+
       lives_signal_handler_block(mainw->spinbutton_start,mainw->spin_start_func);
       lives_spin_button_set_range(LIVES_SPIN_BUTTON(mainw->spinbutton_start),cfile->frames==0?0:1,cfile->frames);
       lives_spin_button_set_value(LIVES_SPIN_BUTTON(mainw->spinbutton_start),cfile->start);
@@ -1037,7 +1018,7 @@
       lives_set_cursor_style(LIVES_CURSOR_NORMAL,NULL);
       mainw->noswitch=FALSE;
 
-      return;
+      return 0;
     }
   }
 
@@ -1045,7 +1026,7 @@
   if (!save_clip_values(current_file)) {
     close_current_file(old_file);
     mainw->noswitch=FALSE;
-    return;
+    return 0;
   }
 
   if (prefs->crash_recovery) add_to_recovery_file(cfile->handle);
@@ -1056,11 +1037,10 @@
   if (mainw->multitrack==NULL) {
     // update widgets
     switch_to_file((mainw->current_file=0),current_file);
-  }
-  else {
+  } else {
     lives_mt *multi=mainw->multitrack;
     mainw->multitrack=NULL; // allow getting of afilesize
-    reget_afilesize (mainw->current_file);
+    reget_afilesize(mainw->current_file);
     mainw->multitrack=multi;
     get_total_time(cfile);
     if (!mainw->is_generating) mainw->current_file=mainw->multitrack->render_file;
@@ -1069,12 +1049,13 @@
     mt_clip_select(mainw->multitrack,TRUE);
   }
   lives_set_cursor_style(LIVES_CURSOR_NORMAL,NULL);
+  return cfile->unique_id;
 }
 
 
 
-static void save_subs_to_file(lives_clip_t *sfile, gchar *fname) {
-  gchar *msg,*ext;
+static void save_subs_to_file(lives_clip_t *sfile, char *fname) {
+  char *ext;
   lives_subtitle_type_t otype,itype;
 
   if (sfile->subt==NULL) return;
@@ -1087,27 +1068,25 @@
   else if (!strcmp(ext,"srt")) otype=SUBTITLE_TYPE_SRT;
   else otype=itype;
 
-  g_free(ext);
+  lives_free(ext);
 
   // TODO - use sfile->subt->save_fn
   switch (otype) {
-    case SUBTITLE_TYPE_SUB:
-      save_sub_subtitles(sfile,(double)(sfile->start-1)/sfile->fps,(double)sfile->end/sfile->fps,
-			 (double)(sfile->start-1)/sfile->fps,fname);
-      break;
+  case SUBTITLE_TYPE_SUB:
+    save_sub_subtitles(sfile,(double)(sfile->start-1)/sfile->fps,(double)sfile->end/sfile->fps,
+                       (double)(sfile->start-1)/sfile->fps,fname);
+    break;
+
+  case SUBTITLE_TYPE_SRT:
+    save_srt_subtitles(sfile,(double)(sfile->start-1)/sfile->fps,(double)sfile->end/sfile->fps,
+                       (double)(sfile->start-1)/sfile->fps,fname);
+    break;
 
-    case SUBTITLE_TYPE_SRT:
-      save_srt_subtitles(sfile,(double)(sfile->start-1)/sfile->fps,(double)sfile->end/sfile->fps,
-			 (double)(sfile->start-1)/sfile->fps,fname);
-      break;
-      
-    default:
+  default:
     return;
   }
 
-  msg=g_strdup_printf(_("Subtitles were saved as %s\n"),mainw->subt_save_file);
-  d_print(msg);
-  g_free(msg);
+  d_print(_("Subtitles were saved as %s\n"),mainw->subt_save_file);
 }
 
 
@@ -1136,11 +1115,11 @@
     alarm_handle=lives_alarm_set(LIVES_MEDIUM_TIMEOUT);
 
     while (!((infofile=fopen(mainw->first_info_file,"r")) || (timeout=lives_alarm_get(alarm_handle)))) {
-      g_usleep(prefs->sleep_time);
+      lives_usleep(prefs->sleep_time);
     }
 
     lives_alarm_clear(alarm_handle);
-  
+
     if (!timeout) {
       mainw->read_failed=FALSE;
       lives_fgets(mainw->msg,256,infofile);
@@ -1150,9 +1129,9 @@
     if (timeout || mainw->read_failed) {
       retval=do_read_failed_error_s_with_retry(mainw->first_info_file,NULL,NULL);
     }
-  } while (retval==LIVES_RETRY);
-  
-  if (retval==LIVES_CANCEL) {
+  } while (retval==LIVES_RESPONSE_RETRY);
+
+  if (retval==LIVES_RESPONSE_CANCEL) {
     mainw->read_failed=FALSE;
     return FALSE;
   }
@@ -1165,10 +1144,10 @@
   }
 
   if (mainw->files[index]==NULL) {
-    mainw->files[index]=(lives_clip_t *)(g_malloc(sizeof(lives_clip_t)));
+    mainw->files[index]=(lives_clip_t *)(lives_malloc(sizeof(lives_clip_t)));
     mainw->files[index]->clip_type=CLIP_TYPE_DISK; // the default
   }
-  g_snprintf(mainw->files[index]->handle,256,"%s",mainw->msg);
+  lives_snprintf(mainw->files[index]->handle,256,"%s",mainw->msg);
 
   return TRUE;
 }
@@ -1176,41 +1155,41 @@
 
 
 
-void save_frame (LiVESMenuItem *menuitem, gpointer user_data) {
+void save_frame(LiVESMenuItem *menuitem, livespointer user_data) {
   int frame;
   // save a single frame from a clip
-  gchar *filt[2];
-  gchar *ttl;
+  char *filt[2];
+  char *ttl;
   char *filename;
 
-  filt[0]=g_strdup_printf ("*.%s",get_image_ext_for_type(cfile->img_type));
+  filt[0]=lives_strdup_printf("*.%s",get_image_ext_for_type(cfile->img_type));
   filt[1]=NULL;
 
-  frame=GPOINTER_TO_INT(user_data);
+  frame=LIVES_POINTER_TO_INT(user_data);
 
   if (frame>0)
-    ttl=g_strdup_printf (_("LiVES: Save Frame %d as..."),frame);
+    ttl=lives_strdup_printf(_("LiVES: Save Frame %d as..."),frame);
 
   else
-    ttl=g_strdup (_("LiVES: Save Frame as..."));
+    ttl=lives_strdup(_("LiVES: Save Frame as..."));
 
 
   filename=choose_file(strlen(mainw->image_dir)?mainw->image_dir:NULL,NULL,filt,LIVES_FILE_CHOOSER_ACTION_SAVE,ttl,NULL);
 
-  g_free (filt[0]);
-  g_free (ttl);
+  lives_free(filt[0]);
+  lives_free(ttl);
 
   if (filename==NULL||!strlen(filename)) return;
 
 
-  if (!save_frame_inner(mainw->current_file,GPOINTER_TO_INT (frame),filename,-1,-1,FALSE)) return;
+  if (!save_frame_inner(mainw->current_file,frame,filename,-1,-1,FALSE)) return;
 
-  g_snprintf(mainw->image_dir,PATH_MAX,"%s",filename);
+  lives_snprintf(mainw->image_dir,PATH_MAX,"%s",filename);
   get_dirname(mainw->image_dir);
   if (prefs->save_directories) {
-    gchar *tmp;
-    set_pref ("image_dir",(tmp=g_filename_from_utf8(mainw->image_dir,-1,NULL,NULL,NULL)));
-    g_free(tmp);
+    char *tmp;
+    set_pref("image_dir",(tmp=lives_filename_from_utf8(mainw->image_dir,-1,NULL,NULL,NULL)));
+    lives_free(tmp);
   }
 
 }
@@ -1221,42 +1200,42 @@
 
   // save the logfile in tempdir
 #ifndef IS_MINGW
-  gchar *logfile=g_strdup_printf("%s/%s_%d_%d.txt",prefs->tmpdir,prefix,lives_getuid(),lives_getgid());
+  char *logfile=lives_strdup_printf("%s/%s_%d_%d.txt",prefs->tmpdir,prefix,lives_getuid(),lives_getgid());
   if ((logfd=creat(logfile,S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH))!=-1) {
 #else
-    gchar *logfile=g_strdup_printf("%s\\%s_%d_%d.txt",prefs->tmpdir,prefix,lives_getuid(),lives_getgid());
-    if ((logfd=creat(logfile,S_IRUSR|S_IWUSR))!=-1) {
+  char *logfile=lives_strdup_printf("%s\\%s_%d_%d.txt",prefs->tmpdir,prefix,lives_getuid(),lives_getgid());
+  if ((logfd=creat(logfile,S_IRUSR|S_IWUSR))!=-1) {
 #endif
-      gchar *btext=lives_text_view_get_text(mainw->optextview);
-      lives_write(logfd,btext,strlen(btext),TRUE);  // not really important if it fails
-      g_free(btext);
-      close (logfd);
-    }
+    char *btext=lives_text_view_get_text(mainw->optextview);
+    lives_write(logfd,btext,strlen(btext),TRUE);  // not really important if it fails
+    lives_free(btext);
+    close(logfd);
+  }
 
-  g_free(logfile);
+  lives_free(logfile);
 }
 
 
 
-void save_file (int clip, int start, int end, const char *filename) {
+void save_file(int clip, int start, int end, const char *filename) {
   // save clip from frame start to frame end
   lives_clip_t *sfile=mainw->files[clip],*nfile=NULL;
 
   double aud_start=0.,aud_end=0.;
 
   const char *n_file_name;
-  gchar *fps_string;
-  gchar *extra_params=NULL;
+  char *fps_string;
+  char *extra_params=NULL;
 #ifndef IS_MINGW
-  gchar *redir=g_strdup("1>&2 2>/dev/null");
+  char *redir=lives_strdup("1>&2 2>/dev/null");
 #else
-  gchar *redir=g_strdup("1>&2 2>NUL");
+  char *redir=lives_strdup("1>&2 2>NUL");
 #endif
-  gchar *new_stderr_name=NULL;
-  gchar *mesg,*bit,*tmp;
-  gchar *com;
-  gchar *full_file_name=NULL;
-  gchar *enc_exec_name,*cmd;
+  char *new_stderr_name=NULL;
+  char *mesg,*bit,*tmp;
+  char *com;
+  char *full_file_name=NULL;
+  char *enc_exec_name,*cmd;
 
   int new_stderr=-1;
   int retval;
@@ -1267,7 +1246,9 @@
   int arate;
   int new_file=-1;
 
+#ifdef GUI_GTK
   GError *gerr=NULL;
+#endif
 
   struct stat filestat;
 
@@ -1296,149 +1277,146 @@
       int response;
       rdet=create_render_details(1); // WARNING !! - rdet is global in events.h
       response=lives_dialog_run(LIVES_DIALOG(rdet->dialog));
-      lives_widget_hide (rdet->dialog);
-      
+      lives_widget_hide(rdet->dialog);
+
       if (response==LIVES_RESPONSE_CANCEL) {
-	lives_widget_destroy (rdet->dialog);
-	g_free(rdet->encoder_name);
-	g_free(rdet);
-	rdet=NULL;
-	if (resaudw!=NULL) g_free(resaudw);
-	resaudw=NULL;
-	return;
+        lives_widget_destroy(rdet->dialog);
+        lives_free(rdet->encoder_name);
+        lives_free(rdet);
+        rdet=NULL;
+        if (resaudw!=NULL) lives_free(resaudw);
+        resaudw=NULL;
+        return;
       }
     }
   }
 
   // get file extension
-  check_encoder_restrictions (TRUE,FALSE,save_all);
+  check_encoder_restrictions(TRUE,FALSE,save_all);
 
-  hbox = lives_hbox_new (FALSE, 0);
+  hbox = lives_hbox_new(FALSE, 0);
   mainw->fx1_bool=TRUE;
   add_suffix_check(LIVES_BOX(hbox),prefs->encoder.of_def_ext);
   lives_widget_show_all(hbox);
 
   if (filename==NULL) {
-    gchar *ttl=g_strdup (_("LiVES: Save Clip as..."));
+    char *ttl=lives_strdup(_("LiVES: Save Clip as..."));
     do {
       n_file_name=choose_file(mainw->vid_save_dir,NULL,NULL,LIVES_FILE_CHOOSER_ACTION_SAVE,ttl,hbox);
       if (n_file_name==NULL) return;
     } while (!strlen(n_file_name));
-    g_snprintf(mainw->vid_save_dir,PATH_MAX,"%s",n_file_name);
+    lives_snprintf(mainw->vid_save_dir,PATH_MAX,"%s",n_file_name);
     get_dirname(mainw->vid_save_dir);
     if (prefs->save_directories) {
-      set_pref ("vid_save_dir",(tmp=g_filename_from_utf8(mainw->vid_save_dir,-1,NULL,NULL,NULL)));
-      g_free(tmp);
+      set_pref("vid_save_dir",(tmp=lives_filename_from_utf8(mainw->vid_save_dir,-1,NULL,NULL,NULL)));
+      lives_free(tmp);
     }
-    g_free(ttl);
-  }
-  else n_file_name=filename;
+    lives_free(ttl);
+  } else n_file_name=filename;
 
   //append default extension (if necessary)
-  if (!strlen (prefs->encoder.of_def_ext)) {
+  if (!strlen(prefs->encoder.of_def_ext)) {
     // encoder adds its own extension
     if (strrchr(n_file_name,'.')!=NULL) {
-      memset ((void *)strrchr (n_file_name,'.'),0,1);
+      memset((void *)strrchr(n_file_name,'.'),0,1);
     }
-  }
-  else {
+  } else {
     if (mainw->fx1_bool&&(strlen(n_file_name)<=strlen(prefs->encoder.of_def_ext)||
-			  strncmp(n_file_name+strlen(n_file_name)-strlen(prefs->encoder.of_def_ext)-1,".",1)||
-			  strcmp(n_file_name+strlen(n_file_name)-strlen(prefs->encoder.of_def_ext),
-				 prefs->encoder.of_def_ext))) {
-      full_file_name=g_strconcat(n_file_name,".",prefs->encoder.of_def_ext,NULL);
+                          strncmp(n_file_name+strlen(n_file_name)-strlen(prefs->encoder.of_def_ext)-1,".",1)||
+                          strcmp(n_file_name+strlen(n_file_name)-strlen(prefs->encoder.of_def_ext),
+                                 prefs->encoder.of_def_ext))) {
+      full_file_name=lives_strconcat(n_file_name,".",prefs->encoder.of_def_ext,NULL);
     }
   }
 
   if (full_file_name==NULL) {
-    full_file_name=g_strdup (n_file_name);
+    full_file_name=lives_strdup(n_file_name);
   }
 
   if (filename==NULL) {
     if (!check_file(full_file_name,strcmp(full_file_name,n_file_name))) {
-      g_free(full_file_name);
+      lives_free(full_file_name);
       if (rdet!=NULL) {
-	lives_widget_destroy (rdet->dialog);
-	g_free(rdet->encoder_name);
-	g_free(rdet);
-	rdet=NULL;
-	if (resaudw!=NULL) g_free(resaudw);
-	resaudw=NULL;
+        lives_widget_destroy(rdet->dialog);
+        lives_free(rdet->encoder_name);
+        lives_free(rdet);
+        rdet=NULL;
+        if (resaudw!=NULL) lives_free(resaudw);
+        resaudw=NULL;
       }
       return;
     }
     sfile->orig_file_name=FALSE;
-    if (!strlen (sfile->comment)) {
-      g_snprintf (sfile->comment,251,"Created with LiVES");
+    if (!strlen(sfile->comment)) {
+      lives_snprintf(sfile->comment,251,"Created with LiVES");
     }
     if (!do_comments_dialog(sfile,full_file_name)) {
-	g_free(full_file_name);
-	if (rdet!=NULL) {
-	  lives_widget_destroy (rdet->dialog);
-	  g_free(rdet->encoder_name);
-	  g_free(rdet);
-	  rdet=NULL;
-	  if (resaudw!=NULL) g_free(resaudw);
-	  resaudw=NULL;
-	}
-	if (mainw->subt_save_file!=NULL) g_free(mainw->subt_save_file);
-	mainw->subt_save_file=NULL;
-	return;
+      lives_free(full_file_name);
+      if (rdet!=NULL) {
+        lives_widget_destroy(rdet->dialog);
+        lives_free(rdet->encoder_name);
+        lives_free(rdet);
+        rdet=NULL;
+        if (resaudw!=NULL) lives_free(resaudw);
+        resaudw=NULL;
+      }
+      if (mainw->subt_save_file!=NULL) lives_free(mainw->subt_save_file);
+      mainw->subt_save_file=NULL;
+      return;
     }
-  }
-  else if (!mainw->osc_auto&&sfile->orig_file_name) {
-    gchar *warn=g_strdup(_("Saving your video could lead to a loss of quality !\nYou are strongly advised to 'Save As' to a new file.\n\nDo you still wish to continue ?"));
+  } else if (!mainw->osc_auto&&sfile->orig_file_name) {
+    char *warn=lives_strdup(
+                 _("Saving your video could lead to a loss of quality !\nYou are strongly advised to 'Save As' to a new file.\n\nDo you still wish to continue ?"));
     if (!do_yesno_dialog_with_check(warn,WARN_MASK_SAVE_QUALITY)) {
-	g_free(warn);
-	g_free(full_file_name);
-	if (rdet!=NULL) {
-	  lives_widget_destroy (rdet->dialog);
-	  g_free(rdet->encoder_name);
-	  g_free(rdet);
-	  if (resaudw!=NULL) g_free(resaudw);
-	  resaudw=NULL;
-	  rdet=NULL;
-	}
-	if (mainw->subt_save_file!=NULL) g_free(mainw->subt_save_file);
-	mainw->subt_save_file=NULL;
-	return;
+      lives_free(warn);
+      lives_free(full_file_name);
+      if (rdet!=NULL) {
+        lives_widget_destroy(rdet->dialog);
+        lives_free(rdet->encoder_name);
+        lives_free(rdet);
+        if (resaudw!=NULL) lives_free(resaudw);
+        resaudw=NULL;
+        rdet=NULL;
+      }
+      if (mainw->subt_save_file!=NULL) lives_free(mainw->subt_save_file);
+      mainw->subt_save_file=NULL;
+      return;
     }
-    g_free(warn);
+    lives_free(warn);
   }
 
 
   if (rdet!=NULL) {
-    lives_widget_destroy (rdet->dialog);
-    g_free(rdet->encoder_name);
-    g_free(rdet);
+    lives_widget_destroy(rdet->dialog);
+    lives_free(rdet->encoder_name);
+    lives_free(rdet);
     rdet=NULL;
-    if (resaudw!=NULL) g_free(resaudw);
+    if (resaudw!=NULL) lives_free(resaudw);
     resaudw=NULL;
   }
 
 
   if (sfile->arate*sfile->achans) {
-    aud_start=calc_time_from_frame (clip,start*sfile->arps/sfile->arate);
-    aud_end=calc_time_from_frame (clip,(end+1)*sfile->arps/sfile->arate);
+    aud_start=calc_time_from_frame(clip,start*sfile->arps/sfile->arate);
+    aud_end=calc_time_from_frame(clip,(end+1)*sfile->arps/sfile->arate);
   }
 
 
   // get extra params for encoder
 
   if (!sfile->ratio_fps) {
-    fps_string=g_strdup_printf ("%.3f",sfile->fps);
-  }
-  else {
-    fps_string=g_strdup_printf ("%.8f",sfile->fps);
+    fps_string=lives_strdup_printf("%.3f",sfile->fps);
+  } else {
+    fps_string=lives_strdup_printf("%.8f",sfile->fps);
   }
 
-  enc_exec_name=g_build_filename(prefs->lib_dir,PLUGIN_EXEC_DIR,PLUGIN_ENCODERS,prefs->encoder.name,NULL);
+  enc_exec_name=lives_build_filename(prefs->lib_dir,PLUGIN_EXEC_DIR,PLUGIN_ENCODERS,prefs->encoder.name,NULL);
 
 #ifdef IS_MINGW
-  //cmd=g_strdup_printf("START perl ");  // real windows : does encode but no redir
-  cmd=g_strdup("perl ");   // mingw : does encode, but no redirection
+  //cmd=lives_strdup_printf("START perl ");  // real windows : does encode but no redir
+  cmd=lives_strdup("perl ");   // mingw : does encode, but no redirection
 #else
-  cmd=g_strdup("");
+  cmd=lives_strdup("");
 #endif
 
   arate=sfile->arate;
@@ -1453,40 +1431,39 @@
     // pull at least one frame so we know the file ext
     if (sfile->clip_type==CLIP_TYPE_FILE) {
       resb=virtual_to_images(clip,start,end,TRUE,NULL);
-      
+
       if (!resb) {
-	if (mainw->subt_save_file!=NULL) g_free(mainw->subt_save_file);
-	mainw->subt_save_file=NULL;
-	d_print_file_error_failed();
-	return;
+        if (mainw->subt_save_file!=NULL) lives_free(mainw->subt_save_file);
+        mainw->subt_save_file=NULL;
+        d_print_file_error_failed();
+        return;
       }
     }
 
     if (prefs->encoder.capabilities&ENCODER_NON_NATIVE) {
-      com=g_strdup_printf("%s save get_rfx %s \"%s\" %s \"%s\" %d %d %d %d %d %d %.4f %.4f",prefs->backend,
-			  sfile->handle,enc_exec_name,
-			  fps_string,(tmp=g_filename_from_utf8(full_file_name,-1,NULL,NULL,NULL)),
-			  start,end,arate,sfile->achans,sfile->asampsize,asigned|aendian,aud_start,aud_end);
-      g_free(tmp);
-    }
-    else {
-      com=g_strdup_printf("%s\"%s\" save get_rfx %s \"\" %s \"%s\" %d %d %d %d %d %d %.4f %.4f",
-			  cmd, enc_exec_name,sfile->handle,
-			  fps_string,(tmp=g_filename_from_utf8(full_file_name,-1,NULL,NULL,NULL)),
-			  start,end,arate,sfile->achans,sfile->asampsize,asigned|aendian,aud_start,aud_end);
-      g_free(tmp);
+      com=lives_strdup_printf("%s save get_rfx %s \"%s\" %s \"%s\" %d %d %d %d %d %d %.4f %.4f",prefs->backend,
+                              sfile->handle,enc_exec_name,
+                              fps_string,(tmp=lives_filename_from_utf8(full_file_name,-1,NULL,NULL,NULL)),
+                              start,end,arate,sfile->achans,sfile->asampsize,asigned|aendian,aud_start,aud_end);
+      lives_free(tmp);
+    } else {
+      com=lives_strdup_printf("%s\"%s\" save get_rfx %s \"\" %s \"%s\" %d %d %d %d %d %d %.4f %.4f",
+                              cmd, enc_exec_name,sfile->handle,
+                              fps_string,(tmp=lives_filename_from_utf8(full_file_name,-1,NULL,NULL,NULL)),
+                              start,end,arate,sfile->achans,sfile->asampsize,asigned|aendian,aud_start,aud_end);
+      lives_free(tmp);
     }
     extra_params=plugin_run_param_window(com,NULL,NULL);
-    g_free(com);
+    lives_free(com);
 
     if (extra_params==NULL) {
       if (fx_dialog[1]!=NULL) {
-	lives_widget_destroy(fx_dialog[1]);
-	fx_dialog[1]=NULL;
+        lives_widget_destroy(fx_dialog[1]);
+        fx_dialog[1]=NULL;
       }
-      g_free(fps_string);
+      lives_free(fps_string);
       switch_to_file(mainw->current_file,current_file);
-      if (mainw->subt_save_file!=NULL) g_free(mainw->subt_save_file);
+      if (mainw->subt_save_file!=NULL) lives_free(mainw->subt_save_file);
       mainw->subt_save_file=NULL;
       return;
     }
@@ -1498,14 +1475,14 @@
 
     if ((new_file=mainw->first_free_file)==-1) {
       too_many_files();
-      if (mainw->subt_save_file!=NULL) g_free(mainw->subt_save_file);
+      if (mainw->subt_save_file!=NULL) lives_free(mainw->subt_save_file);
       mainw->subt_save_file=NULL;
       return;
     }
 
     // create new clip
-    if (!get_new_handle(new_file,g_strdup (_("selection")))) {
-      if (mainw->subt_save_file!=NULL) g_free(mainw->subt_save_file);
+    if (!get_new_handle(new_file,lives_strdup(_("selection")))) {
+      if (mainw->subt_save_file!=NULL) lives_free(mainw->subt_save_file);
       mainw->subt_save_file=NULL;
       return;
     }
@@ -1517,13 +1494,13 @@
       do_threaded_dialog(_("Pulling frames from clip"),TRUE);
       resb=virtual_to_images(clip,start,end,TRUE,NULL);
       end_threaded_dialog();
-      
+
       if (mainw->cancelled!=CANCEL_NONE||!resb) {
-	mainw->cancelled=CANCEL_USER;
-	if (mainw->subt_save_file!=NULL) g_free(mainw->subt_save_file);
-	mainw->subt_save_file=NULL;
-	if (!resb) d_print_file_error_failed();
-	return;
+        mainw->cancelled=CANCEL_USER;
+        if (mainw->subt_save_file!=NULL) lives_free(mainw->subt_save_file);
+        mainw->subt_save_file=NULL;
+        if (!resb) d_print_file_error_failed();
+        return;
       }
     }
 
@@ -1542,14 +1519,14 @@
     nfile->signed_endian=sfile->signed_endian;
     nfile->img_type=sfile->img_type;
 
-    com=g_strdup_printf ("%s link_frames \"%s\" %d %d %.8f %.8f %d %d %d %d %d \"%s\"",prefs->backend,nfile->handle,
-			 start,end,aud_start,aud_end,nfile->arate,nfile->achans,nfile->asampsize,
-			 !(nfile->signed_endian&AFORM_UNSIGNED),!(nfile->signed_endian&AFORM_BIG_ENDIAN),sfile->handle);
+    com=lives_strdup_printf("%s link_frames \"%s\" %d %d %.8f %.8f %d %d %d %d %d \"%s\"",prefs->backend,nfile->handle,
+                            start,end,aud_start,aud_end,nfile->arate,nfile->achans,nfile->asampsize,
+                            !(nfile->signed_endian&AFORM_UNSIGNED),!(nfile->signed_endian&AFORM_BIG_ENDIAN),sfile->handle);
 
     unlink(nfile->info_file);
     mainw->com_failed=FALSE;
     lives_system(com,FALSE);
-    g_free(com);
+    lives_free(com);
 
     // TODO - eliminate this
     mainw->current_file=new_file;
@@ -1562,23 +1539,23 @@
       ssize_t rlen;
       char val[16];
       int pid;
-      com=g_strdup_printf("%s get_pid_for_handle \"%s\"",prefs->backend_sync,cfile->handle);
+      com=lives_strdup_printf("%s get_pid_for_handle \"%s\"",prefs->backend_sync,cfile->handle);
       rfile=popen(com,"r");
       rlen=fread(val,1,16,rfile);
       pclose(rfile);
       memset(val+rlen,0,1);
       pid=atoi(val);
-      
+
       lives_win32_kill_subprocesses(pid,TRUE);
 #endif
-      lives_system (g_strdup_printf("%s close \"%s\"",prefs->backend,cfile->handle),TRUE);
-      g_free (cfile);
+      lives_system(lives_strdup_printf("%s close \"%s\"",prefs->backend,cfile->handle),TRUE);
+      lives_free(cfile);
       cfile=NULL;
-      if (mainw->first_free_file==-1||mainw->first_free_file>new_file) 
-	mainw->first_free_file=new_file;
+      if (mainw->first_free_file==-1||mainw->first_free_file>new_file)
+        mainw->first_free_file=new_file;
       switch_to_file(mainw->current_file,current_file);
       d_print_cancelled();
-      if (mainw->subt_save_file!=NULL) g_free(mainw->subt_save_file);
+      if (mainw->subt_save_file!=NULL) lives_free(mainw->subt_save_file);
       mainw->subt_save_file=NULL;
       return;
     }
@@ -1593,25 +1570,25 @@
       ssize_t rlen;
       char val[16];
       int pid;
-      com=g_strdup_printf("%s get_pid_for_handle \"%s\"",prefs->backend_sync,cfile->handle);
+      com=lives_strdup_printf("%s get_pid_for_handle \"%s\"",prefs->backend_sync,cfile->handle);
       rfile=popen(com,"r");
       rlen=fread(val,1,16,rfile);
       pclose(rfile);
       memset(val+rlen,0,1);
       pid=atoi(val);
-      
+
       lives_win32_kill_subprocesses(pid,TRUE);
 #endif
-      lives_system ((tmp=g_strdup_printf("%s close \"%s\"",prefs->backend,cfile->handle)),TRUE);
-      g_free(tmp);
-      g_free (cfile);
+      lives_system((tmp=lives_strdup_printf("%s close \"%s\"",prefs->backend,cfile->handle)),TRUE);
+      lives_free(tmp);
+      lives_free(cfile);
       cfile=NULL;
-      if (mainw->first_free_file==-1||mainw->first_free_file>new_file) 
-	mainw->first_free_file=new_file;
+      if (mainw->first_free_file==-1||mainw->first_free_file>new_file)
+        mainw->first_free_file=new_file;
       switch_to_file(mainw->current_file,current_file);
       if (mainw->error) d_print_failed();
       else d_print_cancelled();
-      if (mainw->subt_save_file!=NULL) g_free(mainw->subt_save_file);
+      if (mainw->subt_save_file!=NULL) lives_free(mainw->subt_save_file);
       mainw->subt_save_file=NULL;
       return;
     }
@@ -1627,12 +1604,11 @@
 
     reget_afilesize(new_file);
 
-    aud_start=calc_time_from_frame (new_file,1)*nfile->arps/nfile->arate;
-    aud_end=calc_time_from_frame (new_file,nfile->frames+1)*nfile->arps/nfile->arate;
+    aud_start=calc_time_from_frame(new_file,1)*nfile->arps/nfile->arate;
+    aud_end=calc_time_from_frame(new_file,nfile->frames+1)*nfile->arps/nfile->arate;
     cfile->nopreview=FALSE;
 
-  }
-  else mainw->current_file=clip; // for encoder restns
+  } else mainw->current_file=clip; // for encoder restns
 
   if (rdet!=NULL) rdet->is_encoding=TRUE;
 
@@ -1646,24 +1622,24 @@
       ssize_t rlen;
       char val[16];
       int pid;
-      com=g_strdup_printf("%s get_pid_for_handle \"%s\"",prefs->backend_sync,nfile->handle);
+      com=lives_strdup_printf("%s get_pid_for_handle \"%s\"",prefs->backend_sync,nfile->handle);
       rfile=popen(com,"r");
       rlen=fread(val,1,16,rfile);
       pclose(rfile);
       memset(val+rlen,0,1);
       pid=atoi(val);
-      
+
       lives_win32_kill_subprocesses(pid,TRUE);
 #endif
-      lives_system ((com=g_strdup_printf("%s close \"%s\"",prefs->backend,nfile->handle)),TRUE);
-      g_free(com);
-      g_free (nfile);
+      lives_system((com=lives_strdup_printf("%s close \"%s\"",prefs->backend,nfile->handle)),TRUE);
+      lives_free(com);
+      lives_free(nfile);
       mainw->files[new_file]=NULL;
       if (mainw->first_free_file==-1||new_file) mainw->first_free_file=new_file;
     }
     switch_to_file(mainw->current_file,current_file);
     d_print_cancelled();
-    if (mainw->subt_save_file!=NULL) g_free(mainw->subt_save_file);
+    if (mainw->subt_save_file!=NULL) lives_free(mainw->subt_save_file);
     mainw->subt_save_file=NULL;
     return;
   }
@@ -1683,24 +1659,24 @@
       do_threaded_dialog(_("Pulling frames from clip"),TRUE);
       resb=virtual_to_images(clip,start,end,TRUE,NULL);
       end_threaded_dialog();
-      
+
       if (mainw->cancelled!=CANCEL_NONE||!resb) {
-	mainw->cancelled=CANCEL_USER;
-	if (mainw->subt_save_file!=NULL) g_free(mainw->subt_save_file);
-	mainw->subt_save_file=NULL;
-	if (!resb) d_print_file_error_failed();
-	return;
+        mainw->cancelled=CANCEL_USER;
+        if (mainw->subt_save_file!=NULL) lives_free(mainw->subt_save_file);
+        mainw->subt_save_file=NULL;
+        if (!resb) d_print_file_error_failed();
+        return;
       }
     }
 
-    com=g_strdup_printf ("%s link_frames \"%s\" %d %d %.8f %.8f %d %d %d %d %d",prefs->backend,sfile->handle,
-			 start,end,aud_start,aud_end,sfile->arate,sfile->achans,sfile->asampsize,
-			 !(sfile->signed_endian&AFORM_UNSIGNED),!(sfile->signed_endian&AFORM_BIG_ENDIAN));
+    com=lives_strdup_printf("%s link_frames \"%s\" %d %d %.8f %.8f %d %d %d %d %d",prefs->backend,sfile->handle,
+                            start,end,aud_start,aud_end,sfile->arate,sfile->achans,sfile->asampsize,
+                            !(sfile->signed_endian&AFORM_UNSIGNED),!(sfile->signed_endian&AFORM_BIG_ENDIAN));
 
     unlink(sfile->info_file);
     mainw->com_failed=FALSE;
     lives_system(com,FALSE);
-    g_free(com);
+    lives_free(com);
 
     mainw->current_file=clip;
 
@@ -1711,13 +1687,13 @@
     xasigned_endian=sfile->signed_endian;
 
     if (mainw->com_failed) {
-      com=g_strdup_printf("%s clear_symlinks \"%s\"",prefs->backend_sync,cfile->handle);
-      lives_system (com,TRUE);
-      g_free (com);
+      com=lives_strdup_printf("%s clear_symlinks \"%s\"",prefs->backend_sync,cfile->handle);
+      lives_system(com,TRUE);
+      lives_free(com);
       cfile->nopreview=FALSE;
       switch_to_file(mainw->current_file,current_file);
       d_print_cancelled();
-      if (mainw->subt_save_file!=NULL) g_free(mainw->subt_save_file);
+      if (mainw->subt_save_file!=NULL) lives_free(mainw->subt_save_file);
       mainw->subt_save_file=NULL;
       return;
     }
@@ -1725,14 +1701,14 @@
 
     cfile->nopreview=TRUE;
     if (!(do_progress_dialog(TRUE,TRUE,_("Linking selection")))) {
-      com=g_strdup_printf("%s clear_symlinks \"%s\"",prefs->backend_sync,cfile->handle);
-      lives_system (com,TRUE);
-      g_free (com);
+      com=lives_strdup_printf("%s clear_symlinks \"%s\"",prefs->backend_sync,cfile->handle);
+      lives_system(com,TRUE);
+      lives_free(com);
       cfile->nopreview=FALSE;
       switch_to_file(mainw->current_file,current_file);
       if (mainw->error) d_print_failed();
       else d_print_cancelled();
-      if (mainw->subt_save_file!=NULL) g_free(mainw->subt_save_file);
+      if (mainw->subt_save_file!=NULL) lives_free(mainw->subt_save_file);
       mainw->subt_save_file=NULL;
       return;
     }
@@ -1748,8 +1724,8 @@
 
     reget_afilesize(clip);
 
-    aud_start=calc_time_from_frame (clip,1)*sfile->arps/sfile->arate;
-    aud_end=calc_time_from_frame (clip,end-start+1)*sfile->arps/sfile->arate;
+    aud_start=calc_time_from_frame(clip,1)*sfile->arps/sfile->arate;
+    aud_end=calc_time_from_frame(clip,end-start+1)*sfile->arps/sfile->arate;
     cfile->nopreview=FALSE;
   }
 
@@ -1762,91 +1738,98 @@
       do_threaded_dialog(_("Pulling frames from clip"),TRUE);
       resb=virtual_to_images(clip,1,sfile->frames,TRUE,NULL);
       end_threaded_dialog();
-      
+
       if (mainw->cancelled!=CANCEL_NONE||!resb) {
-	mainw->cancelled=CANCEL_USER;
-	if (mainw->subt_save_file!=NULL) g_free(mainw->subt_save_file);
-	mainw->subt_save_file=NULL;
-	if (!resb) d_print_file_error_failed();
-	switch_to_file(mainw->current_file,current_file);
-	return;
+        mainw->cancelled=CANCEL_USER;
+        if (mainw->subt_save_file!=NULL) lives_free(mainw->subt_save_file);
+        mainw->subt_save_file=NULL;
+        if (!resb) d_print_file_error_failed();
+        switch_to_file(mainw->current_file,current_file);
+        return;
       }
     }
   }
 
 
   if (!mainw->save_with_sound||prefs->encoder.of_allowed_acodecs==0) {
-    bit=g_strdup(_ (" (with no sound)\n"));
-  }
-  else {
-    bit=g_strdup("\n");
+    bit=lives_strdup(_(" (with no sound)\n"));
+  } else {
+    bit=lives_strdup("\n");
   }
 
   if (!save_all) {
-    mesg=g_strdup_printf(_ ("Saving frames %d to %d%s as \"%s\" : encoder = %s : format = %s..."),
-			 start,end,bit,full_file_name,prefs->encoder.name,prefs->encoder.of_desc);
+    mesg=lives_strdup_printf(_("Saving frames %d to %d%s as \"%s\" : encoder = %s : format = %s..."),
+                             start,end,bit,full_file_name,prefs->encoder.name,prefs->encoder.of_desc);
   } // end selection
   else {
-    mesg=g_strdup_printf(_ ("Saving frames 1 to %d%s as \"%s\" : encoder %s : format = %s..."),
-			 sfile->frames,bit,full_file_name,prefs->encoder.name,prefs->encoder.of_desc);
+    mesg=lives_strdup_printf(_("Saving frames 1 to %d%s as \"%s\" : encoder %s : format = %s..."),
+                             sfile->frames,bit,full_file_name,prefs->encoder.name,prefs->encoder.of_desc);
   }
-  g_free (bit);
-  
+  lives_free(bit);
+
 
   mainw->no_switch_dprint=TRUE;
-  d_print (mesg);
+  d_print(mesg);
   mainw->no_switch_dprint=FALSE;
-  g_free (mesg);
+  lives_free(mesg);
 
 
   if (prefs->show_gui) {
     // open a file for stderr
 
 #ifndef IS_MINGW
-    new_stderr_name=g_build_filename(prefs->tmpdir,cfile->handle,".debug_out",NULL);
+    new_stderr_name=lives_build_filename(prefs->tmpdir,cfile->handle,".debug_out",NULL);
 #else
-    new_stderr_name=g_build_filename(prefs->tmpdir,cfile->handle,"debug_out",NULL);
+    new_stderr_name=lives_build_filename(prefs->tmpdir,cfile->handle,"debug_out",NULL);
 #endif
-    g_free(redir);
+    lives_free(redir);
 
     do {
       retval=0;
       new_stderr=open(new_stderr_name,O_CREAT|O_RDONLY|O_TRUNC|O_SYNC,S_IRUSR|S_IWUSR);
       if (new_stderr<0) {
-	retval=do_write_failed_error_s_with_retry(new_stderr_name,g_strerror(errno),NULL);
-	if (retval==LIVES_CANCEL) redir=g_strdup("1>&2");
-      }
-      else {
+        retval=do_write_failed_error_s_with_retry(new_stderr_name,lives_strerror(errno),NULL);
+        if (retval==LIVES_RESPONSE_CANCEL) redir=lives_strdup("1>&2");
+      } else {
 
 #ifdef IS_MINGW
-	setmode(new_stderr,O_BINARY);
-	mainw->iochan=g_io_channel_win32_new_fd(new_stderr);
-	redir=g_strdup_printf("2>&1 >\"%s\"",new_stderr_name);
+        setmode(new_stderr,O_BINARY);
+#ifdef GUI_GTK
+        mainw->iochan=g_io_channel_win32_new_fd(new_stderr);
+#endif
+        redir=lives_strdup_printf("2>&1 >\"%s\"",new_stderr_name);
 #else
-	mainw->iochan=g_io_channel_unix_new(new_stderr);
-	redir=g_strdup_printf("2>\"%s\"",new_stderr_name);
+#ifdef GUI_GTK
+        mainw->iochan=g_io_channel_unix_new(new_stderr);
+#endif
+        redir=lives_strdup_printf("2>\"%s\"",new_stderr_name);
+#endif
+
+#ifdef GUI_QT
+        mainw->iochan = new QFile;
+        mainw->iochan->open(new_stderr, QIODevice::ReadOnly);
 #endif
 
-	g_io_channel_set_encoding (mainw->iochan, NULL, NULL);
-	g_io_channel_set_buffer_size(mainw->iochan,0);
-	g_io_channel_set_flags(mainw->iochan,G_IO_FLAG_NONBLOCK,&gerr);
-	if (gerr!=NULL) g_error_free(gerr);
-	gerr=NULL;
-	
-	mainw->optextview=create_output_textview();
+#ifdef GUI_GTK
+        g_io_channel_set_encoding(mainw->iochan, NULL, NULL);
+        g_io_channel_set_buffer_size(mainw->iochan,0);
+        g_io_channel_set_flags(mainw->iochan,G_IO_FLAG_NONBLOCK,&gerr);
+        if (gerr!=NULL) lives_error_free(gerr);
+        gerr=NULL;
+#endif
+        mainw->optextview=create_output_textview();
       }
-    } while (retval==LIVES_RETRY);
-  }
-  else {
-    g_free(redir);
-    redir=g_strdup("1>&2");
+    } while (retval==LIVES_RESPONSE_RETRY);
+  } else {
+    lives_free(redir);
+    redir=lives_strdup("1>&2");
   }
 
-  if (g_file_test ((tmp=g_filename_from_utf8(full_file_name,-1,NULL,NULL,NULL)), G_FILE_TEST_EXISTS)) {
+  if (lives_file_test((tmp=lives_filename_from_utf8(full_file_name,-1,NULL,NULL,NULL)), LIVES_FILE_TEST_EXISTS)) {
     stat(tmp,&filestat);
     file_mtime=filestat.st_mtime;
   }
-  g_free(tmp);
+  lives_free(tmp);
 
 
   // re-read values in case they were resampled
@@ -1854,10 +1837,9 @@
   if (arate!=0) arate=cfile->arate;
 
   if (!cfile->ratio_fps) {
-    fps_string=g_strdup_printf ("%.3f",cfile->fps);
-  }
-  else {
-    fps_string=g_strdup_printf ("%.8f",cfile->fps);
+    fps_string=lives_strdup_printf("%.3f",cfile->fps);
+  } else {
+    fps_string=lives_strdup_printf("%.8f",cfile->fps);
   }
 
   // if startframe is -ve, we will use the links created for safe_symlinks - in /tmp
@@ -1865,37 +1847,36 @@
   // for save_all, cfile will be sfile
 
   if (prefs->encoder.capabilities&ENCODER_NON_NATIVE) {
-    com=g_strdup_printf("%s save \"%s\" \"%s\" \"%s\" \"%s\" %d %d %d %d %d %d %.4f %.4f %s %s",prefs->backend,
-			cfile->handle,
-			enc_exec_name,fps_string,(tmp=g_filename_from_utf8(full_file_name,-1,NULL,NULL,NULL)),
-			startframe,cfile->frames,arate,cfile->achans,cfile->asampsize,
-			asigned|aendian,aud_start,aud_end,(extra_params==NULL)?"":extra_params,redir);
-    g_free(tmp);
-  }
-  else {
+    com=lives_strdup_printf("%s save \"%s\" \"%s\" \"%s\" \"%s\" %d %d %d %d %d %d %.4f %.4f %s %s",prefs->backend,
+                            cfile->handle,
+                            enc_exec_name,fps_string,(tmp=lives_filename_from_utf8(full_file_name,-1,NULL,NULL,NULL)),
+                            startframe,cfile->frames,arate,cfile->achans,cfile->asampsize,
+                            asigned|aendian,aud_start,aud_end,(extra_params==NULL)?"":extra_params,redir);
+    lives_free(tmp);
+  } else {
     // for native (perl) plugins we go via the plugin
-    com=g_strdup_printf("%s\"%s\" save \"%s\" \"%s\" \"%s\" \"%s\" %d %d %d %d %d %d %.4f %.4f %s %s",
-			cmd, enc_exec_name, cfile->handle, "",
-			fps_string,(tmp=g_filename_from_utf8(full_file_name,-1,NULL,NULL,NULL)),
-			startframe,cfile->frames,arate,cfile->achans,cfile->asampsize,
-			asigned|aendian,aud_start,aud_end,(extra_params==NULL?"":extra_params),redir);
+    com=lives_strdup_printf("%s\"%s\" save \"%s\" \"%s\" \"%s\" \"%s\" %d %d %d %d %d %d %.4f %.4f %s %s",
+                            cmd, enc_exec_name, cfile->handle, "",
+                            fps_string,(tmp=lives_filename_from_utf8(full_file_name,-1,NULL,NULL,NULL)),
+                            startframe,cfile->frames,arate,cfile->achans,cfile->asampsize,
+                            asigned|aendian,aud_start,aud_end,(extra_params==NULL?"":extra_params),redir);
 
-    g_free(tmp);
+    lives_free(tmp);
   }
-  g_free (fps_string);
+  lives_free(fps_string);
 
-  if (extra_params!=NULL) g_free(extra_params);
+  if (extra_params!=NULL) lives_free(extra_params);
   extra_params=NULL;
 
   mainw->effects_paused=FALSE;
   cfile->nokeep=TRUE;
-  
+
   unlink(cfile->info_file);
   mainw->write_failed=FALSE;
   save_file_comments(current_file);
 
   lives_system(com,FALSE);
-  g_free(com);
+  lives_free(com);
 
   if (mainw->com_failed||mainw->write_failed) {
     not_cancelled=FALSE;
@@ -1904,170 +1885,176 @@
 
 
   if (!mainw->error) {
-    gchar *pluginstr;
+    char *pluginstr;
+
+    not_cancelled=do_progress_dialog(TRUE,TRUE,_("Saving [can take a long time]"));
+    mesg=lives_strdup(mainw->msg);
 
-    not_cancelled=do_progress_dialog(TRUE,TRUE,_ ("Saving [can take a long time]"));
-    mesg=g_strdup (mainw->msg);
-    
     if (mainw->iochan!=NULL) {
       // flush last of stdout/stderr from plugin
-      
+
       lives_fsync(new_stderr);
       pump_io_chan(mainw->iochan);
-      
+
+#ifdef GUI_GTK
       g_io_channel_shutdown(mainw->iochan,FALSE,&gerr);
       g_io_channel_unref(mainw->iochan);
-      
-      if (gerr!=NULL) g_error_free(gerr);
+      if (gerr!=NULL) lives_error_free(gerr);
+#endif
+#ifdef GUI_QT
+      delete mainw->iochan;
+#endif
+
       close(new_stderr);
       unlink(new_stderr_name);
-      g_free(new_stderr_name);
-      g_free(redir);
+      lives_free(new_stderr_name);
+      lives_free(redir);
     }
-    
+
     mainw->effects_paused=FALSE;
     cfile->nokeep=FALSE;
-    
-    pluginstr=g_build_filename(prefs->lib_dir, PLUGIN_EXEC_DIR, NULL);
 
-    com=g_strdup_printf("%s plugin_clear \"%s\" 1 %d \"%s\" \"%s\" \"%s\"",prefs->backend_sync,cfile->handle,
-			cfile->frames, pluginstr, PLUGIN_ENCODERS, prefs->encoder.name);
-    g_free(pluginstr);
+    pluginstr=lives_build_filename(prefs->lib_dir, PLUGIN_EXEC_DIR, NULL);
+
+    com=lives_strdup_printf("%s plugin_clear \"%s\" 1 %d \"%s\" \"%s\" \"%s\"",prefs->backend_sync,cfile->handle,
+                            cfile->frames, pluginstr, PLUGIN_ENCODERS, prefs->encoder.name);
+    lives_free(pluginstr);
 
     lives_system(com,FALSE);
-    g_free(com);
-  }
-  else {
+    lives_free(com);
+  } else {
     if (mainw->iochan!=NULL) {
       // flush last of stdout/stderr from plugin
-      
+
       lives_fsync(new_stderr);
       pump_io_chan(mainw->iochan);
-      
+
+#ifdef GUI_GTK
       g_io_channel_shutdown(mainw->iochan,FALSE,&gerr);
       g_io_channel_unref(mainw->iochan);
-      
-      if (gerr!=NULL) g_error_free(gerr);
+      if (gerr!=NULL) lives_error_free(gerr);
+#endif
+#ifdef GUI_QT
+      delete mainw->iochan;
+#endif
       close(new_stderr);
       unlink(new_stderr_name);
-      g_free(new_stderr_name);
-      g_free(redir);
+      lives_free(new_stderr_name);
+      lives_free(redir);
     }
   }
 
-  g_free(enc_exec_name);
-  g_free(cmd);
+  lives_free(enc_exec_name);
+  lives_free(cmd);
 
   if (not_cancelled) {
     if (mainw->error) {
       mainw->no_switch_dprint=TRUE;
       d_print_failed();
       mainw->no_switch_dprint=FALSE;
-      g_free(full_file_name);
+      lives_free(full_file_name);
       if (!save_all&&!safe_symlinks) {
 #ifdef IS_MINGW
-	// kill any active processes: for other OSes the backend does this
-	// get pid from backend
-	FILE *rfile;
-	ssize_t rlen;
-	char val[16];
-	int pid;
-	com=g_strdup_printf("%s get_pid_for_handle \"%s\"",prefs->backend_sync,cfile->handle);
-	rfile=popen(com,"r");
-	rlen=fread(val,1,16,rfile);
-	pclose(rfile);
-	memset(val+rlen,0,1);
-	pid=atoi(val);
-      
-	lives_win32_kill_subprocesses(pid,TRUE);
-#endif
-	lives_system ((com=g_strdup_printf("%s close \"%s\"",prefs->backend,cfile->handle)),TRUE);
-	g_free(com);
-	g_free (cfile);
-	cfile=NULL;
-	if (mainw->first_free_file==-1||mainw->first_free_file>mainw->current_file)
-	  mainw->first_free_file=mainw->current_file;
-      }
-      else if (!save_all&&safe_symlinks) {
-	com=g_strdup_printf("%s clear_symlinks \"%s\"",prefs->backend_sync,cfile->handle);
-	lives_system (com,TRUE);
-	g_free (com);
+        // kill any active processes: for other OSes the backend does this
+        // get pid from backend
+        FILE *rfile;
+        ssize_t rlen;
+        char val[16];
+        int pid;
+        com=lives_strdup_printf("%s get_pid_for_handle \"%s\"",prefs->backend_sync,cfile->handle);
+        rfile=popen(com,"r");
+        rlen=fread(val,1,16,rfile);
+        pclose(rfile);
+        memset(val+rlen,0,1);
+        pid=atoi(val);
+
+        lives_win32_kill_subprocesses(pid,TRUE);
+#endif
+        lives_system((com=lives_strdup_printf("%s close \"%s\"",prefs->backend,cfile->handle)),TRUE);
+        lives_free(com);
+        lives_free(cfile);
+        cfile=NULL;
+        if (mainw->first_free_file==-1||mainw->first_free_file>mainw->current_file)
+          mainw->first_free_file=mainw->current_file;
+      } else if (!save_all&&safe_symlinks) {
+        com=lives_strdup_printf("%s clear_symlinks \"%s\"",prefs->backend_sync,cfile->handle);
+        lives_system(com,TRUE);
+        lives_free(com);
       }
 
       switch_to_file(mainw->current_file,current_file);
       do_blocking_error_dialog(mesg);
-      g_free (mesg);
+      lives_free(mesg);
 
       if (mainw->iochan!=NULL) {
-	mainw->iochan=NULL;
-	lives_object_unref(mainw->optextview);
+        mainw->iochan=NULL;
+        lives_object_unref(mainw->optextview);
       }
 
-      if (mainw->subt_save_file!=NULL) g_free(mainw->subt_save_file);
+      if (mainw->subt_save_file!=NULL) lives_free(mainw->subt_save_file);
       mainw->subt_save_file=NULL;
       sensitize();
       return;
     }
-    g_free (mesg);
+    lives_free(mesg);
 
 
-    if (g_file_test ((tmp=g_filename_from_utf8(full_file_name,-1,NULL,NULL,NULL)), G_FILE_TEST_EXISTS)) {
-      g_free(tmp);
-      stat((tmp=g_filename_from_utf8(full_file_name,-1,NULL,NULL,NULL)),&filestat);
+    if (lives_file_test((tmp=lives_filename_from_utf8(full_file_name,-1,NULL,NULL,NULL)), LIVES_FILE_TEST_EXISTS)) {
+      lives_free(tmp);
+      stat((tmp=lives_filename_from_utf8(full_file_name,-1,NULL,NULL,NULL)),&filestat);
       if (filestat.st_size>0) output_exists=TRUE;
     }
     if (!output_exists||file_mtime==filestat.st_mtime) {
-      g_free(tmp);
+      lives_free(tmp);
 
       mainw->no_switch_dprint=TRUE;
       d_print_failed();
       mainw->no_switch_dprint=FALSE;
-      g_free(full_file_name);
+      lives_free(full_file_name);
       if (!save_all&&!safe_symlinks) {
 #ifdef IS_MINGW
-	// kill any active processes: for other OSes the backend does this
-	// get pid from backend
-	FILE *rfile;
-	ssize_t rlen;
-	char val[16];
-	int pid;
-	com=g_strdup_printf("%s get_pid_for_handle \"%s\"",prefs->backend_sync,cfile->handle);
-	rfile=popen(com,"r");
-	rlen=fread(val,1,16,rfile);
-	pclose(rfile);
-	memset(val+rlen,0,1);
-	pid=atoi(val);
-	
-	lives_win32_kill_subprocesses(pid,TRUE);
-#endif
-	lives_system ((com=g_strdup_printf("%s close \"%s\"",prefs->backend,cfile->handle)),TRUE);
-	g_free(com);
-	g_free (cfile);
-	cfile=NULL;
-	if (mainw->first_free_file==-1||mainw->first_free_file>mainw->current_file) 
-	  mainw->first_free_file=mainw->current_file;
-      }
-      else if (!save_all&&safe_symlinks) {
-	com=g_strdup_printf("%s clear_symlinks \"%s\"",prefs->backend_sync,cfile->handle);
-	lives_system (com,TRUE);
-	g_free (com);
+        // kill any active processes: for other OSes the backend does this
+        // get pid from backend
+        FILE *rfile;
+        ssize_t rlen;
+        char val[16];
+        int pid;
+        com=lives_strdup_printf("%s get_pid_for_handle \"%s\"",prefs->backend_sync,cfile->handle);
+        rfile=popen(com,"r");
+        rlen=fread(val,1,16,rfile);
+        pclose(rfile);
+        memset(val+rlen,0,1);
+        pid=atoi(val);
+
+        lives_win32_kill_subprocesses(pid,TRUE);
+#endif
+        lives_system((com=lives_strdup_printf("%s close \"%s\"",prefs->backend,cfile->handle)),TRUE);
+        lives_free(com);
+        lives_free(cfile);
+        cfile=NULL;
+        if (mainw->first_free_file==-1||mainw->first_free_file>mainw->current_file)
+          mainw->first_free_file=mainw->current_file;
+      } else if (!save_all&&safe_symlinks) {
+        com=lives_strdup_printf("%s clear_symlinks \"%s\"",prefs->backend_sync,cfile->handle);
+        lives_system(com,TRUE);
+        lives_free(com);
       }
 
       switch_to_file(mainw->current_file,current_file);
-      retval=do_blocking_error_dialog(_ ("\n\nEncoder error - output file was not created !\n"));
+      retval=do_blocking_error_dialog(_("\n\nEncoder error - output file was not created !\n"));
 
       if (retval==LIVES_RESPONSE_SHOW_DETAILS) {
-	// show iochan (encoder) details
-	on_details_button_clicked();
+        // show iochan (encoder) details
+        on_details_button_clicked();
       }
 
       if (mainw->iochan!=NULL) {
-	  save_log_file("failed_encoder_log");
-	  mainw->iochan=NULL;
-	  lives_object_unref(mainw->optextview);
+        save_log_file("failed_encoder_log");
+        mainw->iochan=NULL;
+        lives_object_unref(mainw->optextview);
       }
 
-      if (mainw->subt_save_file!=NULL) g_free(mainw->subt_save_file);
+      if (mainw->subt_save_file!=NULL) lives_free(mainw->subt_save_file);
       mainw->subt_save_file=NULL;
       sensitize();
 
@@ -2075,90 +2062,88 @@
 
       return;
     }
-    g_free(tmp);
+    lives_free(tmp);
 
     if (save_all) {
 
       if (prefs->enc_letterbox) {
-	// replace letterboxed frames with maxspect frames
-	int iwidth=sfile->ohsize;
-	int iheight=sfile->ovsize;
-	boolean bad_header=FALSE;
+        // replace letterboxed frames with maxspect frames
+        int iwidth=sfile->ohsize;
+        int iheight=sfile->ovsize;
+        boolean bad_header=FALSE;
 
-	com=g_strdup_printf("%s mv_mgk \"%s\" %d %d \"%s\" 1",prefs->backend,sfile->handle,1,sfile->frames,
-			    get_image_ext_for_type(sfile->img_type));
+        com=lives_strdup_printf("%s mv_mgk \"%s\" %d %d \"%s\" 1",prefs->backend,sfile->handle,1,sfile->frames,
+                                get_image_ext_for_type(sfile->img_type));
 
-	unlink(sfile->info_file);
-	lives_system(com,FALSE);
+        unlink(sfile->info_file);
+        lives_system(com,FALSE);
 
-	do_progress_dialog(TRUE,FALSE,_ ("Clearing letterbox"));
+        do_progress_dialog(TRUE,FALSE,_("Clearing letterbox"));
 
-	if (mainw->error) {
-	  //	  cfile->may_be_damaged=TRUE;
-	  d_print_failed();
-	  return;
-	}
+        if (mainw->error) {
+          //	  cfile->may_be_damaged=TRUE;
+          d_print_failed();
+          return;
+        }
 
-	calc_maxspect(sfile->hsize,sfile->vsize,&iwidth,&iheight);
+        calc_maxspect(sfile->hsize,sfile->vsize,&iwidth,&iheight);
 
-	sfile->hsize=iwidth;
-	sfile->vsize=iheight;
+        sfile->hsize=iwidth;
+        sfile->vsize=iheight;
 
-	save_clip_value(clip,CLIP_DETAILS_WIDTH,&sfile->hsize);
-	if (mainw->com_failed||mainw->write_failed) bad_header=TRUE;
-	save_clip_value(clip,CLIP_DETAILS_HEIGHT,&sfile->vsize);
-	if (mainw->com_failed||mainw->write_failed) bad_header=TRUE;
-	if (bad_header) do_header_write_error(mainw->current_file);
+        save_clip_value(clip,CLIP_DETAILS_WIDTH,&sfile->hsize);
+        if (mainw->com_failed||mainw->write_failed) bad_header=TRUE;
+        save_clip_value(clip,CLIP_DETAILS_HEIGHT,&sfile->vsize);
+        if (mainw->com_failed||mainw->write_failed) bad_header=TRUE;
+        if (bad_header) do_header_write_error(mainw->current_file);
 
       }
 
 
 
-      g_snprintf(sfile->save_file_name,PATH_MAX,"%s",full_file_name);
+      lives_snprintf(sfile->save_file_name,PATH_MAX,"%s",full_file_name);
       sfile->changed=FALSE;
 
       // save was successful
-      sfile->f_size=sget_file_size (full_file_name);
+      sfile->f_size=sget_file_size(full_file_name);
 
       if (sfile->is_untitled) {
-	sfile->is_untitled=FALSE;
+        sfile->is_untitled=FALSE;
       }
       if (!sfile->was_renamed) {
-	set_menu_text(sfile->menuentry,full_file_name,FALSE);
-	g_snprintf(sfile->name,256,"%s",full_file_name);
+        set_menu_text(sfile->menuentry,full_file_name,FALSE);
+        lives_snprintf(sfile->name,256,"%s",full_file_name);
       }
       set_main_title(cfile->name,0);
-      add_to_recent (full_file_name,0.,0,NULL);
-    }
-    else {
+      add_to_recent(full_file_name,0.,0,NULL);
+    } else {
       if (!safe_symlinks) {
 #ifdef IS_MINGW
-	// kill any active processes: for other OSes the backend does this
-	// get pid from backend
-	FILE *rfile;
-	ssize_t rlen;
-	char val[16];
-	int pid;
-	com=g_strdup_printf("%s get_pid_for_handle \"%s\"",prefs->backend_sync,nfile->handle);
-	rfile=popen(com,"r");
-	rlen=fread(val,1,16,rfile);
-	pclose(rfile);
-	memset(val+rlen,0,1);
-	pid=atoi(val);
-	
-	lives_win32_kill_subprocesses(pid,TRUE);
-#endif
-	lives_system ((com=g_strdup_printf("%s close \"%s\"",prefs->backend,nfile->handle)),TRUE);
-	g_free(com);
-	g_free (nfile);
-	mainw->files[new_file]=NULL;
-	if (mainw->first_free_file==-1||mainw->first_free_file>mainw->current_file) 
-	  mainw->first_free_file=new_file;
-      }
-      else {
-	com=g_strdup_printf("%s clear_symlinks \"%s\"",prefs->backend_sync,cfile->handle);
-	lives_system (com,TRUE);
-	g_free (com);
+        // kill any active processes: for other OSes the backend does this
+        // get pid from backend
+        FILE *rfile;
+        ssize_t rlen;
+        char val[16];
+        int pid;
+        com=lives_strdup_printf("%s get_pid_for_handle \"%s\"",prefs->backend_sync,nfile->handle);
+        rfile=popen(com,"r");
+        rlen=fread(val,1,16,rfile);
+        pclose(rfile);
+        memset(val+rlen,0,1);
+        pid=atoi(val);
+
+        lives_win32_kill_subprocesses(pid,TRUE);
+#endif
+        lives_system((com=lives_strdup_printf("%s close \"%s\"",prefs->backend,nfile->handle)),TRUE);
+        lives_free(com);
+        lives_free(nfile);
+        mainw->files[new_file]=NULL;
+        if (mainw->first_free_file==-1||mainw->first_free_file>mainw->current_file)
+          mainw->first_free_file=new_file;
+      } else {
+        com=lives_strdup_printf("%s clear_symlinks \"%s\"",prefs->backend_sync,cfile->handle);
+        lives_system(com,TRUE);
+        lives_free(com);
       }
     }
   }
@@ -2172,7 +2157,7 @@
   }
 
   if (not_cancelled) {
-    gchar *fsize_ds;
+    char *fsize_ds;
     mainw->no_switch_dprint=TRUE;
     d_print_done();
 
@@ -2180,37 +2165,34 @@
 
     fsize=sget_file_size(full_file_name);
     fsize_ds=lives_format_storage_space_string(fsize);
-    mesg=g_strdup_printf(_("File size was %s\n"),fsize_ds);
-    g_free(fsize_ds);
-    d_print(mesg);
-    g_free(mesg);
+    d_print(_("File size was %s\n"),fsize_ds);
+    lives_free(fsize_ds);
 
     if (mainw->subt_save_file!=NULL) {
       save_subs_to_file(sfile,mainw->subt_save_file);
-      g_free(mainw->subt_save_file);
+      lives_free(mainw->subt_save_file);
       mainw->subt_save_file=NULL;
     }
 
     mainw->no_switch_dprint=FALSE;
-#ifdef ENABLE_OSC
-    lives_osc_notify(LIVES_OSC_NOTIFY_SUCCESS,
-		     (mesg=g_strdup_printf("encode %d \"%s\"",clip,
-					   (tmp=g_filename_from_utf8(full_file_name,-1,NULL,NULL,NULL)))));
-    g_free(tmp);
-    g_free(mesg);
-#endif
+
+    lives_notify(LIVES_OSC_NOTIFY_SUCCESS,
+                 (mesg=lives_strdup_printf("encode %d \"%s\"",clip,
+                                           (tmp=lives_filename_from_utf8(full_file_name,-1,NULL,NULL,NULL)))));
+    lives_free(tmp);
+    lives_free(mesg);
 
   }
-  g_free(full_file_name);
+  lives_free(full_file_name);
 
 
 }
 
 
 
-void play_file (void) {
+void play_file(void) {
   // play the current clip from 'mainw->play_start' to 'mainw->play_end'
-  GClosure *freeze_closure;
+  LiVESWidgetClosure *freeze_closure;
 
   short audio_player=prefs->audio_player;
 
@@ -2220,15 +2202,14 @@
   uint64_t awinid=-1;
 #endif
 
-  gchar *com;
-  gchar *com2=g_strdup (" ");
-  gchar *com3=g_strdup (" ");
-  gchar *stopcom=NULL;
-  gchar *msg;
-  gchar *stfile;
-  gchar *xtrabit,*title;
+  char *com;
+  char *com2=lives_strdup(" ");
+  char *com3=lives_strdup(" ");
+  char *stopcom=NULL;
+  char *stfile;
+  char *xtrabit,*title;
 #ifdef GDK_WINDOWING_X11
-  gchar *tmp;
+  char *tmp;
 #endif
 
   boolean mute;
@@ -2249,7 +2230,7 @@
   int loop=0;
 
 
-  if (audio_player!=AUD_PLAYER_JACK&&audio_player!=AUD_PLAYER_PULSE) mainw->aud_file_to_kill=mainw->current_file;
+  if (!is_realtime_aplayer(audio_player)) mainw->aud_file_to_kill=mainw->current_file;
   else mainw->aud_file_to_kill=-1;
 
 
@@ -2267,8 +2248,8 @@
   mainw->pre_src_audio_file=mainw->current_file;
 
   // enable the freeze button
-  lives_accel_group_connect (LIVES_ACCEL_GROUP (mainw->accel_group), LIVES_KEY_BackSpace, (LiVESXModifierType)LIVES_CONTROL_MASK, 
-			   (LiVESAccelFlags)0, (freeze_closure=g_cclosure_new (LIVES_GUI_CALLBACK (freeze_callback),NULL,NULL)));
+  lives_accel_group_connect(LIVES_ACCEL_GROUP(mainw->accel_group), LIVES_KEY_BackSpace, (LiVESXModifierType)LIVES_CONTROL_MASK,
+                            (LiVESAccelFlags)0, (freeze_closure=lives_cclosure_new(LIVES_GUI_CALLBACK(freeze_callback),NULL,NULL)));
 
   if (mainw->multitrack!=NULL) {
     mainw->event_list=mainw->multitrack->event_list;
@@ -2281,20 +2262,18 @@
   if (mainw->record) {
     if (mainw->preview) {
       mainw->record=FALSE;
-      d_print (_ ("recording aborted by preview.\n"));
-    }
-    else if (mainw->current_file==0) {
+      d_print(_("recording aborted by preview.\n"));
+    } else if (mainw->current_file==0) {
       mainw->record=FALSE;
-      d_print (_ ("recording aborted by clipboard playback.\n"));
-    }
-    else {
-      d_print(_ ("Recording performance..."));
+      d_print(_("recording aborted by clipboard playback.\n"));
+    } else {
+      d_print(_("Recording performance..."));
       mainw->clip_switched=FALSE;
       // TODO
       if (mainw->current_file>0&&(cfile->undo_action==UNDO_RESAMPLE||cfile->undo_action==UNDO_RENDER)) {
-	lives_widget_set_sensitive (mainw->undo,FALSE);
-	lives_widget_set_sensitive (mainw->redo,FALSE);
-	cfile->undoable=cfile->redoable=FALSE;
+        lives_widget_set_sensitive(mainw->undo,FALSE);
+        lives_widget_set_sensitive(mainw->redo,FALSE);
+        cfile->undoable=cfile->redoable=FALSE;
       }
     }
   }
@@ -2308,11 +2287,11 @@
 
   if (mainw->event_list!=NULL) {
     // play performance data
-    if (event_list_get_end_secs (mainw->event_list)>cfile->frames/cfile->fps&&!mainw->playing_sel) {
-      mainw->audio_end=(event_list_get_end_secs (mainw->event_list)*cfile->fps+1.)*cfile->arate/cfile->arps;
+    if (event_list_get_end_secs(mainw->event_list)>cfile->frames/cfile->fps&&!mainw->playing_sel) {
+      mainw->audio_end=(event_list_get_end_secs(mainw->event_list)*cfile->fps+1.)*cfile->arate/cfile->arps;
     }
   }
-  
+
   if (mainw->audio_end==0) {
     mainw->audio_start=(calc_time_from_frame(mainw->current_file,mainw->play_start)*cfile->fps+1.)*cfile->arate/cfile->arps;
     mainw->audio_end=(calc_time_from_frame(mainw->current_file,mainw->play_end)*cfile->fps+1.)*cfile->arate/cfile->arps;
@@ -2333,17 +2312,16 @@
 
   if (mainw->multitrack==NULL) {
     if (!mainw->preview) {
-      lives_frame_set_label(LIVES_FRAME(mainw->playframe),_ ("Play"));
+      lives_frame_set_label(LIVES_FRAME(mainw->playframe),_("Play"));
+    } else {
+      lives_frame_set_label(LIVES_FRAME(mainw->playframe),_("Preview"));
     }
-    else {
-      lives_frame_set_label(LIVES_FRAME(mainw->playframe),_ ("Preview"));
-    }
-    
+
     if (palette->style&STYLE_1) {
-      lives_widget_set_fg_color(lives_frame_get_label_widget(LIVES_FRAME(mainw->playframe)), 
-			   LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
+      lives_widget_set_fg_color(lives_frame_get_label_widget(LIVES_FRAME(mainw->playframe)),
+                                LIVES_WIDGET_STATE_NORMAL, &palette->normal_fore);
     }
-    
+
     // blank the background if asked to
     if ((mainw->faded||(mainw->fs&&!mainw->sep_win))&&(cfile->frames>0||mainw->foreign)) {
       fade_background();
@@ -2360,12 +2338,12 @@
     // plug the plug into the playframe socket if we need to
     add_to_playframe();
   }
-  
+
   arate=cfile->arate;
 
   mute=mainw->mute;
 
-  if (audio_player!=AUD_PLAYER_JACK&&audio_player!=AUD_PLAYER_PULSE) {
+  if (!is_realtime_aplayer(audio_player)) {
     if (cfile->achans==0||mainw->is_rendering) mainw->mute=TRUE;
     if (mainw->mute&&!cfile->opening_only_audio) arate=arate?-arate:-1;
   }
@@ -2400,7 +2378,7 @@
   }
 
   if (mainw->record) {
-    if (mainw->event_list!=NULL) event_list_free (mainw->event_list);
+    if (mainw->event_list!=NULL) event_list_free(mainw->event_list);
     mainw->event_list=add_filter_init_events(NULL,0);
   }
 
@@ -2408,9 +2386,9 @@
     lives_widget_hide(mainw->scrolledwindow);
   }
 
-  lives_widget_set_sensitive (mainw->stop, TRUE);
+  lives_widget_set_sensitive(mainw->stop, TRUE);
 
-  if (mainw->multitrack==NULL) lives_widget_set_sensitive (mainw->m_playbutton, FALSE);
+  if (mainw->multitrack==NULL) lives_widget_set_sensitive(mainw->m_playbutton, FALSE);
   else if (!cfile->opening) {
     if (!mainw->is_processing) mt_swap_play_pause(mainw->multitrack,TRUE);
     else {
@@ -2419,126 +2397,122 @@
     }
   }
 
-  lives_widget_set_sensitive (mainw->m_playselbutton, FALSE);
-  lives_widget_set_sensitive (mainw->m_rewindbutton, FALSE);
-  lives_widget_set_sensitive (mainw->m_mutebutton, (audio_player==AUD_PLAYER_JACK||audio_player==AUD_PLAYER_PULSE||
-						  mainw->multitrack!=NULL));
-
-  lives_widget_set_sensitive (mainw->m_loopbutton, (!cfile->achans||mainw->mute||mainw->multitrack!=NULL||
-						  mainw->loop_cont||audio_player==AUD_PLAYER_JACK||
-						  audio_player==AUD_PLAYER_PULSE)&&mainw->current_file>0);
-  lives_widget_set_sensitive (mainw->loop_continue, (!cfile->achans||mainw->mute||mainw->loop_cont||
-						   audio_player==AUD_PLAYER_JACK||audio_player==AUD_PLAYER_PULSE)
-			    &&mainw->current_file>0);
+  lives_widget_set_sensitive(mainw->m_playselbutton, FALSE);
+  lives_widget_set_sensitive(mainw->m_rewindbutton, FALSE);
+  lives_widget_set_sensitive(mainw->m_mutebutton, is_realtime_aplayer(audio_player)||mainw->multitrack!=NULL);
+
+  lives_widget_set_sensitive(mainw->m_loopbutton, (!cfile->achans||mainw->mute||mainw->multitrack!=NULL||
+                             mainw->loop_cont||is_realtime_aplayer(audio_player))
+                             &&mainw->current_file>0);
+  lives_widget_set_sensitive(mainw->loop_continue, (!cfile->achans||mainw->mute||mainw->loop_cont||
+                             is_realtime_aplayer(audio_player))
+                             &&mainw->current_file>0);
 
   if (cfile->frames==0&&mainw->multitrack==NULL) {
     if (mainw->preview_box!=NULL&&lives_widget_get_parent(mainw->preview_box)!=NULL) {
-      lives_container_remove (LIVES_CONTAINER (mainw->play_window), mainw->preview_box);
+      lives_container_remove(LIVES_CONTAINER(mainw->play_window), mainw->preview_box);
 
-      mainw->pw_scroll_func=lives_signal_connect (LIVES_GUI_OBJECT (mainw->play_window), LIVES_WIDGET_SCROLL_EVENT,
-					      LIVES_GUI_CALLBACK (on_mouse_scroll),
-					      NULL);
+      mainw->pw_scroll_func=lives_signal_connect(LIVES_GUI_OBJECT(mainw->play_window), LIVES_WIDGET_SCROLL_EVENT,
+                            LIVES_GUI_CALLBACK(on_mouse_scroll),
+                            NULL);
 
     }
-  }
-  else {
+  } else {
     if (mainw->sep_win) {
       // create a separate window for the internal player if requested
       if (prefs->sepwin_type==SEPWIN_TYPE_NON_STICKY) {
-	// needed
-	block_expose();
-	make_play_window();
-	unblock_expose();
-      }
-      else {
-	if (mainw->multitrack==NULL) {
-	  if (mainw->preview_box!=NULL&&lives_widget_get_parent(mainw->preview_box)!=NULL) {
-	    lives_container_remove (LIVES_CONTAINER (mainw->play_window), mainw->preview_box);
-
-	    mainw->pw_scroll_func=lives_signal_connect (LIVES_GUI_OBJECT (mainw->play_window), LIVES_WIDGET_SCROLL_EVENT,
-						    LIVES_GUI_CALLBACK (on_mouse_scroll),
-						    NULL);
-	  }
-	}
-
-	if (mainw->multitrack==NULL||mainw->fs) {
-	  gchar *xtrabit,*title;
-	  resize_play_window();
-	  if (mainw->sepwin_scale!=100.) xtrabit=g_strdup_printf(_(" (%d %% scale)"),(int)mainw->sepwin_scale);
-	  else xtrabit=g_strdup("");
-	  title=g_strdup_printf(_("LiVES: - Play Window%s"),xtrabit);
-	  if (mainw->play_window!=NULL)
-	    lives_window_set_title (LIVES_WINDOW (mainw->play_window), title);
-	  g_free(title);
-	  g_free(xtrabit);
-	}
-
-	// needed
-	if (mainw->multitrack==NULL) {
-	  block_expose();
-	  mainw->noswitch=TRUE;
-	  lives_widget_context_update();
-	  mainw->noswitch=FALSE;
-	  unblock_expose();
-	}
-	else {
-	  // this doesn't get called if we don't call resize_play_window()
-	  if (mainw->play_window!=NULL) {
-	    lives_window_present (LIVES_WINDOW (mainw->play_window));
-	    lives_xwindow_raise(lives_widget_get_xwindow(mainw->play_window));
-	  }
-	}
+        // needed
+        block_expose();
+        make_play_window();
+        unblock_expose();
+      } else {
+        if (mainw->multitrack==NULL) {
+          if (mainw->preview_box!=NULL&&lives_widget_get_parent(mainw->preview_box)!=NULL) {
+            lives_container_remove(LIVES_CONTAINER(mainw->play_window), mainw->preview_box);
+
+            mainw->pw_scroll_func=lives_signal_connect(LIVES_GUI_OBJECT(mainw->play_window), LIVES_WIDGET_SCROLL_EVENT,
+                                  LIVES_GUI_CALLBACK(on_mouse_scroll),
+                                  NULL);
+          }
+        }
+
+        if (mainw->multitrack==NULL||mainw->fs) {
+          char *xtrabit,*title;
+          resize_play_window();
+          if (mainw->sepwin_scale!=100.) xtrabit=lives_strdup_printf(_(" (%d %% scale)"),(int)mainw->sepwin_scale);
+          else xtrabit=lives_strdup("");
+          title=lives_strdup_printf(_("LiVES: - Play Window%s"),xtrabit);
+          if (mainw->play_window!=NULL)
+            lives_window_set_title(LIVES_WINDOW(mainw->play_window), title);
+          lives_free(title);
+          lives_free(xtrabit);
+        }
+
+        // needed
+        if (mainw->multitrack==NULL) {
+          block_expose();
+          mainw->noswitch=TRUE;
+          lives_widget_context_update();
+          mainw->noswitch=FALSE;
+          unblock_expose();
+        } else {
+          // this doesn't get called if we don't call resize_play_window()
+          if (mainw->play_window!=NULL) {
+            lives_window_present(LIVES_WINDOW(mainw->play_window));
+            lives_xwindow_raise(lives_widget_get_xwindow(mainw->play_window));
+          }
+        }
       }
     }
 
     if (mainw->play_window!=NULL) {
-      hide_cursor (lives_widget_get_xwindow(mainw->play_window));
+      hide_cursor(lives_widget_get_xwindow(mainw->play_window));
       lives_widget_set_app_paintable(mainw->play_window,TRUE);
-      if (mainw->vpp!=NULL&&!(mainw->vpp->capabilities&VPP_LOCAL_DISPLAY)&&mainw->fs) 
-	lives_window_set_title (LIVES_WINDOW (mainw->play_window),_("LiVES: - Streaming"));
+      if (mainw->vpp!=NULL&&!(mainw->vpp->capabilities&VPP_LOCAL_DISPLAY)&&mainw->fs)
+        lives_window_set_title(LIVES_WINDOW(mainw->play_window),_("LiVES: - Streaming"));
       else {
-	gchar *title,*xtrabit;
-	if (mainw->sepwin_scale!=100.) xtrabit=g_strdup_printf(_(" (%d %% scale)"),(int)mainw->sepwin_scale);
-	else xtrabit=g_strdup("");
-	title=g_strdup_printf(_("LiVES: - Play Window%s"),xtrabit);
-	lives_window_set_title (LIVES_WINDOW (mainw->play_window), title);
-	g_free(title);
-	g_free(xtrabit);
+        char *title,*xtrabit;
+        if (mainw->sepwin_scale!=100.) xtrabit=lives_strdup_printf(_(" (%d %% scale)"),(int)mainw->sepwin_scale);
+        else xtrabit=lives_strdup("");
+        title=lives_strdup_printf(_("LiVES: - Play Window%s"),xtrabit);
+        lives_window_set_title(LIVES_WINDOW(mainw->play_window), title);
+        lives_free(title);
+        lives_free(xtrabit);
       }
     }
-  
+
     if (!mainw->foreign&&!mainw->sep_win) {
       hide_cursor(lives_widget_get_xwindow(mainw->playarea));
     }
-    
+
     // pwidth and pheight are playback width and height
     if (!mainw->sep_win&&!mainw->foreign) {
       do {
-	mainw->pwidth=lives_widget_get_allocation_width(mainw->playframe)-H_RESIZE_ADJUST;
-	mainw->pheight=lives_widget_get_allocation_height(mainw->playframe)-V_RESIZE_ADJUST;
-	if (mainw->pwidth*mainw->pheight==0) {
-	  lives_widget_queue_draw (mainw->playframe);
-	  mainw->noswitch=TRUE;
-	  lives_widget_context_update();
-	  mainw->noswitch=FALSE;
-	}
+        mainw->pwidth=lives_widget_get_allocation_width(mainw->playframe)-H_RESIZE_ADJUST;
+        mainw->pheight=lives_widget_get_allocation_height(mainw->playframe)-V_RESIZE_ADJUST;
+        if (mainw->pwidth*mainw->pheight==0) {
+          lives_widget_queue_draw(mainw->playframe);
+          mainw->noswitch=TRUE;
+          lives_widget_context_update();
+          mainw->noswitch=FALSE;
+        }
       } while (mainw->pwidth*mainw->pheight==0);
       // double size
       if (mainw->double_size) {
-	frame_size_update();
+        frame_size_update();
       }
     }
 
     if (mainw->vpp!=NULL&&mainw->vpp->fheight>-1&&mainw->vpp->fwidth>-1) {
       // fixed o/p size for stream
       if (!(mainw->vpp->fwidth*mainw->vpp->fheight)) {
-	mainw->vpp->fwidth=cfile->hsize;
-	mainw->vpp->fheight=cfile->vsize;
+        mainw->vpp->fwidth=cfile->hsize;
+        mainw->vpp->fheight=cfile->vsize;
       }
       mainw->pwidth=mainw->vpp->fwidth;
       mainw->pheight=mainw->vpp->fheight;
     }
-    
+
     if (mainw->fs&&!mainw->sep_win&&cfile->frames>0) {
       fullscreen_internal();
     }
@@ -2547,72 +2521,71 @@
 
   // moved down because xdg-screensaver requires a mapped windowID
   if (prefs->stop_screensaver) {
-    g_free (com2);
+    lives_free(com2);
     com2=NULL;
 #ifdef GDK_WINDOWING_X11
     if (!prefs->show_gui&&prefs->show_playwin&&mainw->play_window!=NULL) {
       awinid=lives_widget_get_xwinid(mainw->play_window,NULL);
-    }
-    else if (prefs->show_gui) {
+    } else if (prefs->show_gui) {
       if (mainw->multitrack!=NULL) {
-	awinid=lives_widget_get_xwinid(mainw->multitrack->window,NULL);
-      }
-      else if (mainw->LiVES!=NULL) {
-	awinid=lives_widget_get_xwinid(mainw->LiVES,NULL);
+        awinid=lives_widget_get_xwinid(mainw->multitrack->window,NULL);
+      } else if (mainw->LiVES!=NULL) {
+        awinid=lives_widget_get_xwinid(mainw->LiVES,NULL);
       }
     }
 
-    com2=g_strdup("xset s off 2>/dev/null; xset -dpms 2>/dev/null ;");
-    
+    com2=lives_strdup("xset s off 2>/dev/null; xset -dpms 2>/dev/null ;");
+
     if (capable->has_gconftool_2) {
-      gchar *xnew=g_strdup(" gconftool-2 --set --type bool /apps/gnome-screensaver/idle_activation_enabled false 2>/dev/null ;");
-      tmp=g_strconcat (com2,xnew,NULL);
-      g_free(com2);
-      g_free(xnew);
+      char *xnew=lives_strdup(" gconftool-2 --set --type bool /apps/gnome-screensaver/idle_activation_enabled false 2>/dev/null ;");
+      tmp=lives_strconcat(com2,xnew,NULL);
+      lives_free(com2);
+      lives_free(xnew);
       com2=tmp;
     }
     if (capable->has_xdg_screensaver&&awinid!=-1) {
-      gchar *xnew=g_strdup_printf(" xdg-screensaver suspend %"PRIu64" 2>/dev/null ;",awinid);
-      tmp=g_strconcat (com2,xnew,NULL);
-      g_free(com2);
-      g_free(xnew);
+      char *xnew=lives_strdup_printf(" xdg-screensaver suspend %"PRIu64" 2>/dev/null ;",awinid);
+      tmp=lives_strconcat(com2,xnew,NULL);
+      lives_free(com2);
+      lives_free(xnew);
       com2=tmp;
     }
 #else
     if (capable->has_gconftool_2) {
-      com2=g_strdup("gconftool-2 --set --type bool /apps/gnome-screensaver/idle_activation_enabled false 2>/dev/null ;");
-    }
-    else com2=g_strdup("");
+      com2=lives_strdup("gconftool-2 --set --type bool /apps/gnome-screensaver/idle_activation_enabled false 2>/dev/null ;");
+    } else com2=lives_strdup("");
 #endif
-    if (com2==NULL) com2=g_strdup("");
+    if (com2==NULL) com2=lives_strdup("");
   }
 
 
   if (!mainw->foreign&&prefs->midisynch&&!mainw->preview) {
-    g_free (com3);
-    com3=g_strdup  ("midistart");
+    lives_free(com3);
+    com3=lives_strdup("midistart");
   }
-  com=g_strconcat (com2,com3,NULL);
-  if (strlen (com)) {
+  com=lives_strconcat(com2,com3,NULL);
+  if (strlen(com)) {
     // allow this to fail - not all sub-commands may be present
-    lives_system (com,TRUE);
+    lives_system(com,TRUE);
   }
-  g_free (com); g_free (com2); g_free (com3);
-  com3=g_strdup (" ");
+  lives_free(com);
+  lives_free(com2);
+  lives_free(com3);
+  com3=lives_strdup(" ");
   com2=NULL;
   com=NULL;
 
 
 
   lives_spin_button_set_value(LIVES_SPIN_BUTTON(mainw->spinbutton_pb_fps),cfile->pb_fps);
-    
+
   mainw->last_blend_file=-1;
 
   // show the framebar
   if (mainw->multitrack==NULL&&(prefs->show_framecount&&
-				(!mainw->fs||(prefs->gui_monitor!=prefs->play_monitor&&mainw->sep_win!=0)||
-				 (mainw->vpp!=NULL&&mainw->sep_win&&!(mainw->vpp->capabilities&VPP_LOCAL_DISPLAY)))&&
-				((!mainw->preview&&(cfile->frames>0||mainw->foreign))||cfile->opening))) {
+                                (!mainw->fs||(prefs->gui_monitor!=prefs->play_monitor&&mainw->sep_win!=0)||
+                                 (mainw->vpp!=NULL&&mainw->sep_win&&!(mainw->vpp->capabilities&VPP_LOCAL_DISPLAY)))&&
+                                ((!mainw->preview&&(cfile->frames>0||mainw->foreign))||cfile->opening))) {
     lives_widget_show(mainw->framebar);
   }
 
@@ -2625,8 +2598,8 @@
   if (!mainw->preview&&!mainw->is_rendering&&!mainw->foreign) weed_reinit_all();
 
   if (!mainw->foreign&&(!(prefs->audio_src==AUDIO_SRC_EXT&&
-			((audio_player==AUD_PLAYER_JACK) ||
-			 (audio_player==AUD_PLAYER_PULSE))))) {
+                          ((audio_player==AUD_PLAYER_JACK) ||
+                           (audio_player==AUD_PLAYER_PULSE))))) {
     cfile->aseek_pos=(long)((double)(mainw->play_start-1.)/cfile->fps*cfile->arate)*cfile->achans*(cfile->asampsize/8);
 
     // start up our audio player (jack or pulse)
@@ -2634,70 +2607,67 @@
 #ifdef ENABLE_JACK
       if (mainw->jackd!=NULL) jack_aud_pb_ready(mainw->current_file);
 #endif
-    }
-    else if (audio_player==AUD_PLAYER_PULSE) {
+    } else if (audio_player==AUD_PLAYER_PULSE) {
 #ifdef HAVE_PULSE_AUDIO
       if (mainw->pulsed!=NULL) pulse_aud_pb_ready(mainw->current_file);
 #endif
-    }
-    else if (cfile->achans>0) {
+    } else if (cfile->achans>0) {
       // sox or mplayer audio - run as background process
 
       if (mainw->loop_cont) {
-	// tell audio to loop forever
-	loop=-1;
+        // tell audio to loop forever
+        loop=-1;
       }
 
-      stfile=g_build_filename(prefs->tmpdir,cfile->handle,".stoploop",NULL);
-      unlink (stfile);
-    
+      stfile=lives_build_filename(prefs->tmpdir,cfile->handle,".stoploop",NULL);
+      unlink(stfile);
+
       if (cfile->achans>0||(!cfile->is_loaded&&!mainw->is_generating)) {
-	if (loop) {
-	  g_free (com3);
+        if (loop) {
+          lives_free(com3);
 #ifndef IS_MINGW
-	  com3=g_strdup_printf ("/bin/touch \"%s\" 2>/dev/null;",stfile);
+          com3=lives_strdup_printf("%s \"%s\" 2>/dev/null;",capable->touch_cmd,stfile);
 #else
-	  com3=g_strdup_printf ("touch.exe \"%s\" 2>NUL;",stfile);
+          com3=lives_strdup_printf("touch.exe \"%s\" 2>NUL;",stfile);
 #endif
-	}
-	
-	if (cfile->achans>0) {
-	  com2=g_strdup_printf("%s stop_audio %s",prefs->backend_sync,cfile->handle);
-	}
-    
-	stopcom=g_strconcat (com3,com2,NULL);
+        }
+
+        if (cfile->achans>0) {
+          com2=lives_strdup_printf("%s stop_audio %s",prefs->backend_sync,cfile->handle);
+        }
+
+        stopcom=lives_strconcat(com3,com2,NULL);
       }
 
-      g_free(stfile);
+      lives_free(stfile);
 
 #ifndef IS_MINGW
-      stfile=g_build_filename(prefs->tmpdir,cfile->handle,".status.play",NULL);
+      stfile=lives_build_filename(prefs->tmpdir,cfile->handle,".status.play",NULL);
 #else
-      stfile=g_build_filename(prefs->tmpdir,cfile->handle,"status.play",NULL);
+      stfile=lives_build_filename(prefs->tmpdir,cfile->handle,"status.play",NULL);
 #endif
 
-      g_snprintf(cfile->info_file,PATH_MAX,"%s",stfile);
-      g_free(stfile);
+      lives_snprintf(cfile->info_file,PATH_MAX,"%s",stfile);
+      lives_free(stfile);
       if (cfile->clip_type==CLIP_TYPE_DISK) unlink(cfile->info_file);
 
       // PLAY
 
       if (cfile->clip_type==CLIP_TYPE_DISK&&cfile->opening) {
-	  com=g_strdup_printf("%s play_opening_preview \"%s\" %.3f %d %d %d %d %d %d %d %d",prefs->backend,
-			      cfile->handle,cfile->fps,mainw->audio_start,audio_end,0,
-			      arate,cfile->achans,cfile->asampsize,asigned,aendian);
-      }
-      else {
-	// this is only used now for sox or mplayer audio player
-	com=g_strdup_printf("%s play %s %.3f %d %d %d %d %d %d %d %d",prefs->backend,cfile->handle,
-			    cfile->fps,mainw->audio_start,audio_end,loop,
-			    arate,cfile->achans,cfile->asampsize,asigned,aendian);
+        com=lives_strdup_printf("%s play_opening_preview \"%s\" %.3f %d %d %d %d %d %d %d %d",prefs->backend,
+                                cfile->handle,cfile->fps,mainw->audio_start,audio_end,0,
+                                arate,cfile->achans,cfile->asampsize,asigned,aendian);
+      } else {
+        // this is only used now for sox or mplayer audio player
+        com=lives_strdup_printf("%s play %s %.3f %d %d %d %d %d %d %d %d",prefs->backend,cfile->handle,
+                                cfile->fps,mainw->audio_start,audio_end,loop,
+                                arate,cfile->achans,cfile->asampsize,asigned,aendian);
       }
       if (mainw->multitrack==NULL&&com!=NULL) lives_system(com,FALSE);
     }
   }
 
-  g_free (com3);
+  lives_free(com3);
 
   // if recording, set up recorder (jack or pulse)
   if (!mainw->foreign&&!mainw->preview&&(prefs->audio_src==AUDIO_SRC_EXT||(mainw->record&&mainw->agen_key!=0))&&
@@ -2708,28 +2678,27 @@
       // creat temp clip
       open_ascrap_file();
       if (mainw->ascrap_file!=-1) {
-	
-	mainw->rec_aclip=mainw->ascrap_file;
-	mainw->rec_avel=1.;
-	mainw->rec_aseek=0;
+
+        mainw->rec_aclip=mainw->ascrap_file;
+        mainw->rec_avel=1.;
+        mainw->rec_aseek=0;
       }
     }
     if (audio_player==AUD_PLAYER_JACK) {
 #ifdef ENABLE_JACK
       if (prefs->audio_src==AUDIO_SRC_EXT&&mainw->jackd!=NULL) {
-	if (mainw->agen_key!=0) {
-	  mainw->jackd->playing_file=mainw->current_file;
-	  mainw->jackd->frames_written=0;
-	  mainw->jackd->in_use=TRUE;
-	  if (mainw->ascrap_file!=-1 || !prefs->perm_audio_reader) 
-	    jack_rec_audio_to_clip(mainw->ascrap_file, -1, RECA_GENERATED);
-	  mainw->jackd_read->in_use=TRUE;
-	}
-	else {
-	  if (mainw->ascrap_file!=-1 || !prefs->perm_audio_reader) 
-	    jack_rec_audio_to_clip(mainw->ascrap_file, -1, RECA_EXTERNAL);
-	  mainw->jackd_read->in_use=TRUE;
-	}
+        if (mainw->agen_key!=0) {
+          mainw->jackd->playing_file=mainw->current_file;
+          mainw->jackd->frames_written=0;
+          mainw->jackd->in_use=TRUE;
+          if (mainw->ascrap_file!=-1 || !prefs->perm_audio_reader)
+            jack_rec_audio_to_clip(mainw->ascrap_file, -1, RECA_GENERATED);
+          mainw->jackd_read->in_use=TRUE;
+        } else {
+          if (mainw->ascrap_file!=-1 || !prefs->perm_audio_reader)
+            jack_rec_audio_to_clip(mainw->ascrap_file, -1, RECA_EXTERNAL);
+          mainw->jackd_read->in_use=TRUE;
+        }
       }
       mainw->jackd->frames_written=0;
 #endif
@@ -2737,19 +2706,18 @@
     if (audio_player==AUD_PLAYER_PULSE) {
 #ifdef HAVE_PULSE_AUDIO
       if (prefs->audio_src==AUDIO_SRC_EXT&&mainw->pulsed!=NULL) {
-	if (mainw->agen_key!=0) {
-	  mainw->pulsed->playing_file=mainw->current_file;
-	  mainw->pulsed->frames_written=0;
-	  mainw->pulsed->in_use=TRUE;
-	  if (mainw->ascrap_file!=-1 || !prefs->perm_audio_reader) 
-	    pulse_rec_audio_to_clip(mainw->ascrap_file, -1, RECA_GENERATED);
-	  mainw->pulsed_read->in_use=TRUE;
-	}
-	else {
-	  if (mainw->ascrap_file!=-1 || !prefs->perm_audio_reader) 
-	    pulse_rec_audio_to_clip(mainw->ascrap_file, -1, RECA_EXTERNAL);
-	  mainw->pulsed_read->in_use=TRUE;
-	}
+        if (mainw->agen_key!=0) {
+          mainw->pulsed->playing_file=mainw->current_file;
+          mainw->pulsed->frames_written=0;
+          mainw->pulsed->in_use=TRUE;
+          if (mainw->ascrap_file!=-1 || !prefs->perm_audio_reader)
+            pulse_rec_audio_to_clip(mainw->ascrap_file, -1, RECA_GENERATED);
+          mainw->pulsed_read->in_use=TRUE;
+        } else {
+          if (mainw->ascrap_file!=-1 || !prefs->perm_audio_reader)
+            pulse_rec_audio_to_clip(mainw->ascrap_file, -1, RECA_EXTERNAL);
+          mainw->pulsed_read->in_use=TRUE;
+        }
       }
       mainw->pulsed->frames_written=0;
 #endif
@@ -2763,31 +2731,28 @@
 
   if (mainw->foreign||weed_playback_gen_start()) {
 
-#ifdef ENABLE_OSC
-    lives_osc_notify(LIVES_OSC_NOTIFY_PLAYBACK_STARTED,"");
-    if (mainw->osc_auto) lives_osc_notify_success(NULL);
-#endif
-    
+    lives_notify(LIVES_OSC_NOTIFY_PLAYBACK_STARTED,"");
+
 #ifdef ENABLE_JACK
     if (mainw->event_list!=NULL&&!mainw->record&&audio_player==AUD_PLAYER_JACK&&mainw->jackd!=NULL&&
-	!(mainw->preview&&mainw->is_processing&&
-	  !(mainw->multitrack!=NULL&&mainw->preview&&mainw->multitrack->is_rendering))) {
+        !(mainw->preview&&mainw->is_processing&&
+          !(mainw->multitrack!=NULL&&mainw->preview&&mainw->multitrack->is_rendering))) {
       // if playing an event list, we switch to audio memory buffer mode
       if (mainw->multitrack!=NULL) init_jack_audio_buffers(cfile->achans,cfile->arate,exact_preview);
       else init_jack_audio_buffers(DEFAULT_AUDIO_CHANS,DEFAULT_AUDIO_RATE,FALSE);
       has_audio_buffers=TRUE;
     }
-#endif    
+#endif
 #ifdef HAVE_PULSE_AUDIO
     if (mainw->event_list!=NULL&&!mainw->record&&audio_player==AUD_PLAYER_PULSE&&mainw->pulsed!=NULL&&
-	!(mainw->preview&&mainw->is_processing&&
-	  !(mainw->multitrack!=NULL&&mainw->preview&&mainw->multitrack->is_rendering))) {
+        !(mainw->preview&&mainw->is_processing&&
+          !(mainw->multitrack!=NULL&&mainw->preview&&mainw->multitrack->is_rendering))) {
       // if playing an event list, we switch to audio memory buffer mode
       if (mainw->multitrack!=NULL) init_pulse_audio_buffers(cfile->achans,cfile->arate,exact_preview);
       else init_pulse_audio_buffers(DEFAULT_AUDIO_CHANS,DEFAULT_AUDIO_RATE,FALSE);
       has_audio_buffers=TRUE;
     }
-#endif    
+#endif
 
     mainw->abufs_to_fill=0;
 
@@ -2796,139 +2761,138 @@
       mainw->cancelled=CANCEL_NONE;
 
       if (mainw->event_list!=NULL&&!mainw->record) {
-	if (pb_start_event==NULL) pb_start_event=get_first_event(mainw->event_list);
+        if (pb_start_event==NULL) pb_start_event=get_first_event(mainw->event_list);
 
-	if (!(mainw->preview&&mainw->multitrack!=NULL&&mainw->multitrack->is_rendering))
-	  init_track_decoders();
+        if (!(mainw->preview&&mainw->multitrack!=NULL&&mainw->multitrack->is_rendering))
+          init_track_decoders();
 
-	if (has_audio_buffers) {
+        if (has_audio_buffers) {
 
 #ifdef ENABLE_JACK
-	  if (audio_player==AUD_PLAYER_JACK) {
-	    int i;
-	    mainw->write_abuf=0;
-	    
-	    // fill our audio buffers now
-	    // this will also get our effects state
-
-	    // reset because audio sync may have set it
-	    if (mainw->multitrack!=NULL) mainw->jackd->abufs[0]->arate=cfile->arate;
-	    fill_abuffer_from(mainw->jackd->abufs[0],mainw->event_list,pb_start_event,exact_preview);
-	    for (i=1;i<prefs->num_rtaudiobufs;i++) {
-	      // reset because audio sync may have set it
-	      if (mainw->multitrack!=NULL) mainw->jackd->abufs[i]->arate=cfile->arate;
-	      fill_abuffer_from(mainw->jackd->abufs[i],mainw->event_list,NULL,FALSE);
-	    }
-	    
-	    pthread_mutex_lock(&mainw->abuf_mutex);
-	    mainw->jackd->read_abuf=0;
-	    mainw->abufs_to_fill=0;
-	    pthread_mutex_unlock(&mainw->abuf_mutex);
-	    mainw->jackd->in_use=TRUE;
-	  }
+          if (audio_player==AUD_PLAYER_JACK) {
+            int i;
+            mainw->write_abuf=0;
+
+            // fill our audio buffers now
+            // this will also get our effects state
+
+            // reset because audio sync may have set it
+            if (mainw->multitrack!=NULL) mainw->jackd->abufs[0]->arate=cfile->arate;
+            fill_abuffer_from(mainw->jackd->abufs[0],mainw->event_list,pb_start_event,exact_preview);
+            for (i=1; i<prefs->num_rtaudiobufs; i++) {
+              // reset because audio sync may have set it
+              if (mainw->multitrack!=NULL) mainw->jackd->abufs[i]->arate=cfile->arate;
+              fill_abuffer_from(mainw->jackd->abufs[i],mainw->event_list,NULL,FALSE);
+            }
+
+            pthread_mutex_lock(&mainw->abuf_mutex);
+            mainw->jackd->read_abuf=0;
+            mainw->abufs_to_fill=0;
+            pthread_mutex_unlock(&mainw->abuf_mutex);
+            mainw->jackd->in_use=TRUE;
+          }
 #endif
 #ifdef HAVE_PULSE_AUDIO
-	  if (audio_player==AUD_PLAYER_PULSE) {
-	    int i;
-	    mainw->write_abuf=0;
-	    
-	    // fill our audio buffers now
-	    // this will also get our effects state
-	    fill_abuffer_from(mainw->pulsed->abufs[0],mainw->event_list,pb_start_event,exact_preview);
-	    for (i=1;i<prefs->num_rtaudiobufs;i++) {
-	      fill_abuffer_from(mainw->pulsed->abufs[i],mainw->event_list,NULL,FALSE);
-	    }
-	    
-	    pthread_mutex_lock(&mainw->abuf_mutex);
-	    mainw->pulsed->read_abuf=0;
-	    mainw->abufs_to_fill=0;
-	    pthread_mutex_unlock(&mainw->abuf_mutex);
-	    mainw->pulsed->in_use=TRUE;
-	    
-	  }
-#endif
-	  // let transport roll
-	  mainw->video_seek_ready=TRUE;
-	}
+          if (audio_player==AUD_PLAYER_PULSE) {
+            int i;
+            mainw->write_abuf=0;
+
+            // fill our audio buffers now
+            // this will also get our effects state
+            fill_abuffer_from(mainw->pulsed->abufs[0],mainw->event_list,pb_start_event,exact_preview);
+            for (i=1; i<prefs->num_rtaudiobufs; i++) {
+              fill_abuffer_from(mainw->pulsed->abufs[i],mainw->event_list,NULL,FALSE);
+            }
+
+            pthread_mutex_lock(&mainw->abuf_mutex);
+            mainw->pulsed->read_abuf=0;
+            mainw->abufs_to_fill=0;
+            pthread_mutex_unlock(&mainw->abuf_mutex);
+            mainw->pulsed->in_use=TRUE;
+
+          }
+#endif
+          // let transport roll
+          mainw->video_seek_ready=TRUE;
+        }
 
       }
 
       if (mainw->multitrack==NULL||mainw->multitrack->pb_start_event==NULL) {
-	do_progress_dialog(FALSE,FALSE,NULL);
+        do_progress_dialog(FALSE,FALSE,NULL);
 
-	// reset audio buffers
+        // reset audio buffers
 #ifdef ENABLE_JACK
-	if (audio_player==AUD_PLAYER_JACK&&mainw->jackd!=NULL) {
-	  // must do this before deinit fx
-	  pthread_mutex_lock(&mainw->abuf_mutex);
-	  mainw->jackd->read_abuf=-1;
-	  pthread_mutex_unlock(&mainw->abuf_mutex);
-	}
+        if (audio_player==AUD_PLAYER_JACK&&mainw->jackd!=NULL) {
+          // must do this before deinit fx
+          pthread_mutex_lock(&mainw->abuf_mutex);
+          mainw->jackd->read_abuf=-1;
+          pthread_mutex_unlock(&mainw->abuf_mutex);
+        }
 #endif
 #ifdef HAVE_PULSE_AUDIO
-	if (audio_player==AUD_PLAYER_PULSE&&mainw->pulsed!=NULL) {
-	  // must do this before deinit fx
-	  pthread_mutex_lock(&mainw->abuf_mutex);
-	  mainw->pulsed->read_abuf=-1;
-	  pthread_mutex_unlock(&mainw->abuf_mutex);
-	}
-#endif
-
-      }
-      else {
-	// play from middle of mt timeline
-	cfile->next_event=mainw->multitrack->pb_start_event;
-
-	if (!has_audio_buffers) {
-	  // no audio buffering
-	  // get just effects state
-	  get_audio_and_effects_state_at(mainw->multitrack->event_list,mainw->multitrack->pb_start_event,FALSE,
-					 mainw->multitrack->exact_preview);
-	}
+        if (audio_player==AUD_PLAYER_PULSE&&mainw->pulsed!=NULL) {
+          // must do this before deinit fx
+          pthread_mutex_lock(&mainw->abuf_mutex);
+          mainw->pulsed->read_abuf=-1;
+          pthread_mutex_unlock(&mainw->abuf_mutex);
+        }
+#endif
+
+      } else {
+        // play from middle of mt timeline
+        cfile->next_event=mainw->multitrack->pb_start_event;
+
+        if (!has_audio_buffers) {
+          // no audio buffering
+          // get just effects state
+          get_audio_and_effects_state_at(mainw->multitrack->event_list,mainw->multitrack->pb_start_event,FALSE,
+                                         mainw->multitrack->exact_preview);
+        }
 
-	do_progress_dialog(FALSE,FALSE,NULL);
+        do_progress_dialog(FALSE,FALSE,NULL);
 
-	// reset audio read buffers
+        // reset audio read buffers
 #ifdef ENABLE_JACK
-	if (audio_player==AUD_PLAYER_JACK&&mainw->jackd!=NULL) {
-	  // must do this before deinit fx
-	  pthread_mutex_lock(&mainw->abuf_mutex);
-	  mainw->jackd->read_abuf=-1;
-	  pthread_mutex_unlock(&mainw->abuf_mutex);
-	}
+        if (audio_player==AUD_PLAYER_JACK&&mainw->jackd!=NULL) {
+          // must do this before deinit fx
+          pthread_mutex_lock(&mainw->abuf_mutex);
+          mainw->jackd->read_abuf=-1;
+          pthread_mutex_unlock(&mainw->abuf_mutex);
+        }
 #endif
 #ifdef HAVE_PULSE_AUDIO
-	if (audio_player==AUD_PLAYER_PULSE&&mainw->pulsed!=NULL) {
-	  // must do this before deinit fx
-	  pthread_mutex_lock(&mainw->abuf_mutex);
-	  mainw->pulsed->read_abuf=-1;
-	  pthread_mutex_unlock(&mainw->abuf_mutex);
-	}
-#endif
-
-	// realtime effects off
-	deinit_render_effects();
-
-	cfile->next_event=NULL;
-
-	if (!(mainw->preview&&mainw->multitrack!=NULL&&mainw->multitrack->is_rendering))
-	  free_track_decoders();
-
-	// multitrack loop - go back to loop start position unless external transport moved us
-	if (mainw->scratch==SCRATCH_NONE) {
-	  mainw->multitrack->pb_start_event=mainw->multitrack->pb_loop_event;
-	}
+        if (audio_player==AUD_PLAYER_PULSE&&mainw->pulsed!=NULL) {
+          // must do this before deinit fx
+          pthread_mutex_lock(&mainw->abuf_mutex);
+          mainw->pulsed->read_abuf=-1;
+          pthread_mutex_unlock(&mainw->abuf_mutex);
+        }
+#endif
+
+        // realtime effects off
+        deinit_render_effects();
+
+        cfile->next_event=NULL;
+
+        if (!(mainw->preview&&mainw->multitrack!=NULL&&mainw->multitrack->is_rendering))
+          free_track_decoders();
+
+        // multitrack loop - go back to loop start position unless external transport moved us
+        if (mainw->scratch==SCRATCH_NONE) {
+          mainw->multitrack->pb_start_event=mainw->multitrack->pb_loop_event;
+        }
       }
       if (mainw->multitrack!=NULL) pb_start_event=mainw->multitrack->pb_start_event;
     } while (mainw->multitrack!=NULL&&(mainw->loop_cont||mainw->scratch!=SCRATCH_NONE)&&
-	     (mainw->cancelled==CANCEL_NONE||mainw->cancelled==CANCEL_EVENT_LIST_END));
+             (mainw->cancelled==CANCEL_NONE||mainw->cancelled==CANCEL_EVENT_LIST_END));
 
   }
 
   mainw->osc_block=TRUE;
   mainw->rte_textparm=NULL;
   mainw->playing_file=-1;
-    
+
   // play completed
 
   mainw->video_seek_ready=FALSE;
@@ -2936,7 +2900,7 @@
 #ifdef ENABLE_JACK
   if (audio_player==AUD_PLAYER_JACK&&(mainw->jackd!=NULL||mainw->jackd_read!=NULL)) {
 
-    if (mainw->jackd_read!=NULL||mainw->aud_rec_fd!=-1) 
+    if (mainw->jackd_read!=NULL||mainw->aud_rec_fd!=-1)
       jack_rec_audio_end(!(prefs->perm_audio_reader&&prefs->audio_src==AUDIO_SRC_EXT),TRUE);
 
     // send jack transport stop
@@ -2947,7 +2911,7 @@
       boolean timeout;
       int alarm_handle=lives_alarm_set(LIVES_ACONNECT_TIMEOUT);
       while (!(timeout=lives_alarm_get(alarm_handle))&&jack_get_msgq(mainw->jackd)!=NULL) {
-	sched_yield(); // wait for seek
+        sched_yield(); // wait for seek
       }
       if (timeout) jack_try_reconnect();
       lives_alarm_clear(alarm_handle);
@@ -2963,59 +2927,55 @@
       insert_audio_event_at(mainw->event_list,event,-1,1,0.,0.); // audio switch off
     }
 
-  }
-  else {
+  } else {
 #endif
 #ifdef HAVE_PULSE_AUDIO
     if (audio_player==AUD_PLAYER_PULSE&&(mainw->pulsed!=NULL||mainw->pulsed_read!=NULL)) {
 
-    if (mainw->pulsed_read!=NULL||mainw->aud_rec_fd!=-1) 
-      pulse_rec_audio_end(!(prefs->perm_audio_reader&&prefs->audio_src==AUDIO_SRC_EXT),TRUE);
+      if (mainw->pulsed_read!=NULL||mainw->aud_rec_fd!=-1)
+        pulse_rec_audio_end(!(prefs->perm_audio_reader&&prefs->audio_src==AUDIO_SRC_EXT),TRUE);
 
-    // tell pulse client to close audio file
-    if (mainw->pulsed!=NULL&&(mainw->pulsed->playing_file>0||mainw->pulsed->fd>0)) {
-      boolean timeout;
-      int alarm_handle=lives_alarm_set(LIVES_ACONNECT_TIMEOUT);
-      while (!(timeout=lives_alarm_get(alarm_handle))&&pulse_get_msgq(mainw->pulsed)!=NULL) {
-	sched_yield(); // wait for seek
+      // tell pulse client to close audio file
+      if (mainw->pulsed!=NULL&&(mainw->pulsed->playing_file>0||mainw->pulsed->fd>0)) {
+        boolean timeout;
+        int alarm_handle=lives_alarm_set(LIVES_ACONNECT_TIMEOUT);
+        while (!(timeout=lives_alarm_get(alarm_handle))&&pulse_get_msgq(mainw->pulsed)!=NULL) {
+          sched_yield(); // wait for seek
+        }
+        if (timeout) pulse_try_reconnect();
+        lives_alarm_clear(alarm_handle);
+
+        pulse_message.command=ASERVER_CMD_FILE_CLOSE;
+        pulse_message.data=NULL;
+        pulse_message.next=NULL;
+        mainw->pulsed->msgq=&pulse_message;
+      }
+      if (mainw->record&&(prefs->rec_opts&REC_AUDIO)) {
+        weed_plant_t *event=get_last_frame_event(mainw->event_list);
+        insert_audio_event_at(mainw->event_list,event,-1,1,0.,0.); // audio switch off
+      }
+
+    } else {
+#endif
+      if (!is_realtime_aplayer(audio_player)&&stopcom!=NULL) {
+        // kill sound(if still playing)
+        lives_system(stopcom,TRUE);
+        mainw->aud_file_to_kill=-1;
+        lives_free(stopcom);
       }
-      if (timeout) pulse_try_reconnect();
-      lives_alarm_clear(alarm_handle);
-
-      pulse_message.command=ASERVER_CMD_FILE_CLOSE;
-      pulse_message.data=NULL;
-      pulse_message.next=NULL;
-      mainw->pulsed->msgq=&pulse_message;
-    }
-    if (mainw->record&&(prefs->rec_opts&REC_AUDIO)) {
-      weed_plant_t *event=get_last_frame_event(mainw->event_list);
-      insert_audio_event_at(mainw->event_list,event,-1,1,0.,0.); // audio switch off
-    }
-
-  }
-  else {
-#endif
-    if (audio_player!=AUD_PLAYER_JACK&&audio_player!=AUD_PLAYER_PULSE&&stopcom!=NULL) {
-      // kill sound(if still playing)
-      lives_system(stopcom,TRUE);
-      mainw->aud_file_to_kill=-1;
-      g_free (stopcom);
-    }
 #ifdef ENABLE_JACK
-  }
+    }
 #endif
 #ifdef HAVE_PULSE_AUDIO
   }
 #endif
 
-  if (com!=NULL) g_free(com);
+  if (com!=NULL) lives_free(com);
   mainw->actual_frame=0;
 
   if (audio_player==AUD_PLAYER_JACK) audio_cache_end();
 
-#ifdef ENABLE_OSC
-  lives_osc_notify(LIVES_OSC_NOTIFY_PLAYBACK_STOPPED,"");
-#endif
+  lives_notify(LIVES_OSC_NOTIFY_PLAYBACK_STOPPED,"");
 
   mainw->video_seek_ready=FALSE;
 
@@ -3025,35 +2985,34 @@
   if (prefs->stop_screensaver) {
 
 #ifdef GDK_WINDOWING_X11
-    com=g_strdup("xset s on 2>/dev/null; xset +dpms 2>/dev/null ;");
-    
+    com=lives_strdup("xset s on 2>/dev/null; xset +dpms 2>/dev/null ;");
+
     if (capable->has_gconftool_2) {
-      gchar *xnew=g_strdup(" gconftool-2 --set --type bool /apps/gnome-screensaver/idle_activation_enabled true 2>/dev/null ;");
-      tmp=g_strconcat (com,xnew,NULL);
-      g_free(com);
-      g_free(xnew);
+      char *xnew=lives_strdup(" gconftool-2 --set --type bool /apps/gnome-screensaver/idle_activation_enabled true 2>/dev/null ;");
+      tmp=lives_strconcat(com,xnew,NULL);
+      lives_free(com);
+      lives_free(xnew);
       com=tmp;
     }
     if (capable->has_xdg_screensaver&&awinid!=-1) {
-      gchar *xnew=g_strdup_printf(" xdg-screensaver resume %"PRIu64" 2>/dev/null ;",awinid);
-      tmp=g_strconcat (com,xnew,NULL);
-      g_free(com);
-      g_free(xnew);
+      char *xnew=lives_strdup_printf(" xdg-screensaver resume %"PRIu64" 2>/dev/null ;",awinid);
+      tmp=lives_strconcat(com,xnew,NULL);
+      lives_free(com);
+      lives_free(xnew);
       com=tmp;
     }
 #else
     if (capable->has_gconftool_2) {
-      com=g_strdup("gconftool-2 --set --type bool /apps/gnome-screensaver/idle_activation_enabled true 2>/dev/null ;");
-    }
-    else com=g_strdup("");
+      com=lives_strdup("gconftool-2 --set --type bool /apps/gnome-screensaver/idle_activation_enabled true 2>/dev/null ;");
+    } else com=lives_strdup("");
 #endif
     if (com!=NULL) {
       lives_system(com,TRUE);
-      g_free(com);
+      lives_free(com);
     }
   }
 
-  if (!mainw->foreign&&prefs->midisynch) lives_system ("midistop",TRUE);
+  if (!mainw->foreign&&prefs->midisynch) lives_system("midistop",TRUE);
 
   if (mainw->ext_playback) {
     vid_playback_plugin_exit();
@@ -3061,23 +3020,23 @@
   // we could have started by playing a generator, which could've been closed
   if (mainw->files[current_file]==NULL) current_file=mainw->current_file;
 
-  if (audio_player!=AUD_PLAYER_JACK&&audio_player!=AUD_PLAYER_PULSE) {
+  if (!is_realtime_aplayer(audio_player)) {
     // wait for audio_ended...
     if (cfile->achans>0&&com2!=NULL) {
       wait_for_stop(com2);
       mainw->aud_file_to_kill=-1;
     }
-    if (com2!=NULL) g_free(com2);
+    if (com2!=NULL) lives_free(com2);
   }
 
   if (mainw->current_file>-1) {
 #ifndef IS_MINGW
-    stfile=g_build_filename(prefs->tmpdir,cfile->handle,".status",NULL);
+    stfile=lives_build_filename(prefs->tmpdir,cfile->handle,".status",NULL);
 #else
-    stfile=g_build_filename(prefs->tmpdir,cfile->handle,"status",NULL);
+    stfile=lives_build_filename(prefs->tmpdir,cfile->handle,"status",NULL);
 #endif
-    g_snprintf(cfile->info_file,PATH_MAX,"%s",stfile);
-    g_free(stfile);
+    lives_snprintf(cfile->info_file,PATH_MAX,"%s",stfile);
+    lives_free(stfile);
   }
 
   if (mainw->foreign) {
@@ -3089,7 +3048,7 @@
     cfile->hsize=mainw->pwidth;
     cfile->vsize=mainw->pheight;
 
-    gdk_window_set_keep_above(mainw->foreign_window,FALSE);
+    lives_xwindow_set_keep_above(mainw->foreign_window,FALSE);
 
     lives_widget_context_update();
 
@@ -3097,7 +3056,7 @@
   }
 
   if (mainw->toy_type==LIVES_TOY_AUTOLIVES) {
-    on_toy_activate(NULL, GINT_TO_POINTER(LIVES_TOY_NONE));
+    on_toy_activate(NULL, LIVES_INT_TO_POINTER(LIVES_TOY_NONE));
   }
 
   lives_widget_hide(mainw->playarea);
@@ -3112,15 +3071,15 @@
     resize(1);
     if (mainw->play_window!=NULL) {
       resize_play_window();
-      if (mainw->sepwin_scale!=100.) xtrabit=g_strdup_printf(_(" (%d %% scale)"),(int)mainw->sepwin_scale);
-      else xtrabit=g_strdup("");
-      title=g_strdup_printf("%s%s",lives_window_get_title(LIVES_WINDOW
-							(mainw->multitrack==NULL?mainw->LiVES:
-							 mainw->multitrack->window)),xtrabit);
+      if (mainw->sepwin_scale!=100.) xtrabit=lives_strdup_printf(_(" (%d %% scale)"),(int)mainw->sepwin_scale);
+      else xtrabit=lives_strdup("");
+      title=lives_strdup_printf("%s%s",lives_window_get_title(LIVES_WINDOW
+                                ((mainw->multitrack==NULL?mainw->LiVES:
+                                  mainw->multitrack->window))),xtrabit);
       if (mainw->play_window!=NULL)
-	lives_window_set_title(LIVES_WINDOW(mainw->play_window),title);
-      g_free(title);
-      g_free(xtrabit);
+        lives_window_set_title(LIVES_WINDOW(mainw->play_window),title);
+      lives_free(title);
+      lives_free(xtrabit);
     }
     if (palette->style&STYLE_1) {
       lives_widget_show(mainw->sep_image);
@@ -3135,26 +3094,26 @@
     lives_widget_show(mainw->eventbox3);
     lives_widget_show(mainw->eventbox4);
     lives_widget_show(mainw->sep_image);
-    lives_frame_set_label(LIVES_FRAME(mainw->playframe),_ ("Preview"));
-    lives_container_set_border_width (LIVES_CONTAINER (mainw->playframe), widget_opts.border_width);
+    lives_frame_set_label(LIVES_FRAME(mainw->playframe),_("Preview"));
+    lives_container_set_border_width(LIVES_CONTAINER(mainw->playframe), widget_opts.border_width);
     resize(1);
     lives_widget_show(mainw->t_bckground);
     lives_widget_show(mainw->t_double);
   }
 
   if (prefs->show_gui&&(lives_widget_get_allocation_height(mainw->eventbox)+lives_widget_get_allocation_height(mainw->menubar)
-			>mainw->scr_height-2||lives_widget_get_allocation_width(mainw->LiVES)>mainw->scr_width-2)) {
+                        >mainw->scr_height-2||lives_widget_get_allocation_width(mainw->LiVES)>mainw->scr_width-2)) {
     int wx,wy;
     // the screen grew too much...remaximise it
-    lives_window_unmaximize (LIVES_WINDOW(mainw->LiVES));
+    lives_window_unmaximize(LIVES_WINDOW(mainw->LiVES));
     mainw->noswitch=TRUE;
     lives_widget_context_update();
     mainw->noswitch=FALSE;
-    lives_window_get_position (LIVES_WINDOW (mainw->LiVES),&wx,&wy);
+    lives_window_get_position(LIVES_WINDOW(mainw->LiVES),&wx,&wy);
     if (prefs->gui_monitor==0) lives_window_move(LIVES_WINDOW(mainw->LiVES),0,0);
-    lives_window_maximize (LIVES_WINDOW(mainw->LiVES));
+    lives_window_maximize(LIVES_WINDOW(mainw->LiVES));
   }
-  
+
   if (mainw->multitrack==NULL) {
     lives_widget_hide(mainw->playframe);
     lives_widget_show(mainw->frame1);
@@ -3162,24 +3121,24 @@
     lives_widget_show(mainw->eventbox3);
     lives_widget_show(mainw->eventbox4);
     disable_record();
-    
-    lives_container_set_border_width (LIVES_CONTAINER (mainw->playframe), widget_opts.border_width);
+
+    lives_container_set_border_width(LIVES_CONTAINER(mainw->playframe), widget_opts.border_width);
   }
 
-  if (audio_player!=AUD_PLAYER_JACK&&audio_player!=AUD_PLAYER_PULSE) mainw->mute=mute;
+  if (!is_realtime_aplayer(audio_player)) mainw->mute=mute;
 
   if (!mainw->preview||!cfile->opening) {
     sensitize();
   }
   if (mainw->current_file>-1&&cfile->opening) {
-    lives_widget_set_sensitive (mainw->mute_audio, cfile->achans>0);
-    lives_widget_set_sensitive (mainw->loop_continue, TRUE);
-    lives_widget_set_sensitive (mainw->loop_video, cfile->achans>0&&cfile->frames>0);
+    lives_widget_set_sensitive(mainw->mute_audio, cfile->achans>0);
+    lives_widget_set_sensitive(mainw->loop_continue, TRUE);
+    lives_widget_set_sensitive(mainw->loop_video, cfile->achans>0&&cfile->frames>0);
   }
 
   if (mainw->cancelled!=CANCEL_USER_PAUSED) {
-    lives_widget_set_sensitive (mainw->stop, FALSE);
-    lives_widget_set_sensitive (mainw->m_stopbutton, FALSE);
+    lives_widget_set_sensitive(mainw->stop, FALSE);
+    lives_widget_set_sensitive(mainw->m_stopbutton, FALSE);
   }
 
   if (mainw->multitrack==NULL) {
@@ -3194,62 +3153,61 @@
     lives_window_unfullscreen(LIVES_WINDOW(mainw->play_window));
     if (prefs->sepwin_type==SEPWIN_TYPE_NON_STICKY) {
       kill_play_window();
-    }
-    else {
+    } else {
       // or resize it back to single size
       if (mainw->current_file>-1&&cfile->is_loaded&&cfile->frames>0&&!mainw->is_rendering&&
-	  (cfile->clip_type!=CLIP_TYPE_GENERATOR)) {
-	if (mainw->preview_box==NULL) {
-	  // create the preview in the sepwin
-	  lives_signal_handler_disconnect (mainw->play_window, mainw->pw_scroll_func);
-	  make_preview_box();
-	}
-	if (mainw->current_file!=current_file) {
-	  // now we have to guess how to center the play window
-	  mainw->opwx=mainw->opwy=-1;
-	  mainw->preview_frame=0;
-	}
+          (cfile->clip_type!=CLIP_TYPE_GENERATOR)) {
+        if (mainw->preview_box==NULL) {
+          // create the preview in the sepwin
+          lives_signal_handler_disconnect(mainw->play_window, mainw->pw_scroll_func);
+          make_preview_box();
+        }
+        if (mainw->current_file!=current_file) {
+          // now we have to guess how to center the play window
+          mainw->opwx=mainw->opwy=-1;
+          mainw->preview_frame=0;
+        }
       }
 
       if (mainw->play_window!=NULL) {
-	if (mainw->multitrack==NULL) {
-	  mainw->playing_file=-2;
-	  resize_play_window();
-	  mainw->playing_file=-1;
-
-	  if (mainw->sepwin_scale!=100.) xtrabit=g_strdup_printf(_(" (%d %% scale)"),(int)mainw->sepwin_scale);
-	  else xtrabit=g_strdup("");
-	  title=g_strdup_printf("%s%s",lives_window_get_title(LIVES_WINDOW
-							    (mainw->multitrack==NULL?mainw->LiVES:
-							     mainw->multitrack->window)),xtrabit);
-	  lives_window_set_title(LIVES_WINDOW(mainw->play_window),title);
-	  g_free(title);
-	  g_free(xtrabit);
-
-	  lives_widget_queue_draw (mainw->LiVES);
-	  mainw->noswitch=TRUE;
-
-	  lives_widget_context_update();
-	  if (mainw->play_window!=NULL) {
-	    gchar *title,*xtrabit;
-	    
-	    //load_preview_image(FALSE);
-	    
-	    mainw->noswitch=FALSE;
-	    if (mainw->sepwin_scale!=100.) xtrabit=g_strdup_printf(_(" (%d %% scale)"),(int)mainw->sepwin_scale);
-	    else xtrabit=g_strdup("");
-	    title=g_strdup_printf("%s%s",lives_window_get_title(LIVES_WINDOW
-							      (mainw->multitrack==NULL?mainw->LiVES:
-							       mainw->multitrack->window)),xtrabit);
-	    lives_window_set_title(LIVES_WINDOW(mainw->play_window),title);
-	    g_free(title);
-	    g_free(xtrabit);
-
-	    lives_window_present (LIVES_WINDOW (mainw->play_window));
-	    lives_xwindow_raise(lives_widget_get_xwindow(mainw->play_window));
-	    unhide_cursor (lives_widget_get_xwindow(mainw->play_window));
-	  }
-	}
+        if (mainw->multitrack==NULL) {
+          mainw->playing_file=-2;
+          resize_play_window();
+          mainw->playing_file=-1;
+
+          if (mainw->sepwin_scale!=100.) xtrabit=lives_strdup_printf(_(" (%d %% scale)"),(int)mainw->sepwin_scale);
+          else xtrabit=lives_strdup("");
+          title=lives_strdup_printf("%s%s",lives_window_get_title(LIVES_WINDOW
+                                    ((mainw->multitrack==NULL?mainw->LiVES:
+                                      mainw->multitrack->window))),xtrabit);
+          lives_window_set_title(LIVES_WINDOW(mainw->play_window),title);
+          lives_free(title);
+          lives_free(xtrabit);
+
+          lives_widget_queue_draw(mainw->LiVES);
+          mainw->noswitch=TRUE;
+
+          lives_widget_context_update();
+          if (mainw->play_window!=NULL) {
+            char *title,*xtrabit;
+
+            //load_preview_image(FALSE);
+
+            mainw->noswitch=FALSE;
+            if (mainw->sepwin_scale!=100.) xtrabit=lives_strdup_printf(_(" (%d %% scale)"),(int)mainw->sepwin_scale);
+            else xtrabit=lives_strdup("");
+            title=lives_strdup_printf("%s%s",lives_window_get_title(LIVES_WINDOW
+                                      ((mainw->multitrack==NULL?mainw->LiVES:
+                                        mainw->multitrack->window))),xtrabit);
+            lives_window_set_title(LIVES_WINDOW(mainw->play_window),title);
+            lives_free(title);
+            lives_free(xtrabit);
+
+            lives_window_present(LIVES_WINDOW(mainw->play_window));
+            lives_xwindow_raise(lives_widget_get_xwindow(mainw->play_window));
+            unhide_cursor(lives_widget_get_xwindow(mainw->play_window));
+          }
+        }
       }
     }
 
@@ -3259,7 +3217,7 @@
       mainw->frame_layer=NULL;
     }
   }
-  
+
   if (!mainw->foreign) {
     unhide_cursor(lives_widget_get_xwindow(mainw->playarea));
   }
@@ -3269,7 +3227,7 @@
   if (mainw->blend_file!=-1&&mainw->blend_file!=mainw->current_file&&mainw->files[mainw->blend_file]!=NULL&&
       mainw->files[mainw->blend_file]->clip_type==CLIP_TYPE_GENERATOR) {
     int xcurrent_file=mainw->current_file;
-    weed_bg_generator_end ((weed_plant_t *)mainw->files[mainw->blend_file]->ext_src);
+    weed_bg_generator_end((weed_plant_t *)mainw->files[mainw->blend_file]->ext_src);
     mainw->current_file=xcurrent_file;
   }
 
@@ -3278,25 +3236,24 @@
   mainw->audio_event=NULL;
 
   // disable the freeze key
-  lives_accel_group_disconnect (LIVES_ACCEL_GROUP (mainw->accel_group), freeze_closure);
-  
+  lives_accel_group_disconnect(LIVES_ACCEL_GROUP(mainw->accel_group), freeze_closure);
+
   if (mainw->multitrack==NULL) lives_widget_show(mainw->scrolledwindow);
 
   if (mainw->current_file>-1) {
     if (mainw->toy_type==LIVES_TOY_MAD_FRAMES&&!cfile->opening) {
-      load_start_image (cfile->start);
-      load_end_image (cfile->end);
+      load_start_image(cfile->start);
+      load_end_image(cfile->end);
     }
   }
   if (prefs->show_player_stats) {
     if (mainw->fps_measure>0.) {
-      msg=g_strdup_printf (_ ("Average FPS was %.4f\n"),mainw->fps_measure);
-      d_print (msg);
-      g_free (msg);
+      d_print(_("Average FPS was %.4f\n"),mainw->fps_measure);
     }
   }
   if (mainw->size_warn) {
-    do_error_dialog (_ ("\n\nSome frames in this clip are wrongly sized.\nYou should click on Tools--->Resize All\nand resize all frames to the current size.\n"));
+    do_error_dialog(
+      _("\n\nSome frames in this clip are wrongly sized.\nYou should click on Tools--->Resize All\nand resize all frames to the current size.\n"));
     mainw->size_warn=FALSE;
   }
   mainw->is_processing=mainw->preview;
@@ -3309,7 +3266,7 @@
   }
 
   // TODO - can this be done earlier ?
-  if (mainw->cancelled==CANCEL_APP_QUIT) on_quit_activate (NULL,NULL);
+  if (mainw->cancelled==CANCEL_APP_QUIT) on_quit_activate(NULL,NULL);
 
   // end record performance
 
@@ -3321,7 +3278,7 @@
       sched_yield(); // wait for seek
     }
     if (timeout) jack_try_reconnect();
-    
+
     lives_alarm_clear(alarm_handle);
 
     mainw->jackd->in_use=FALSE;
@@ -3341,11 +3298,11 @@
     while (!(timeout=lives_alarm_get(alarm_handle))&&pulse_get_msgq(mainw->pulsed)!=NULL) {
       sched_yield(); // wait for seek
     }
-    
+
     if (timeout) pulse_try_reconnect();
-    
+
     lives_alarm_clear(alarm_handle);
-    
+
     mainw->pulsed->in_use=FALSE;
 
     if (has_audio_buffers) {
@@ -3359,23 +3316,16 @@
   if (mainw->bad_aud_file!=NULL) {
     // we got an error recording audio
     do_write_failed_error_s(mainw->bad_aud_file,NULL);
-    g_free(mainw->bad_aud_file);
+    lives_free(mainw->bad_aud_file);
     mainw->bad_aud_file=NULL;
   }
 
-  if (!mainw->preview&&cfile->clip_type==CLIP_TYPE_GENERATOR) {
-    mainw->osc_block=TRUE;
-    weed_generator_end ((weed_plant_t *)cfile->ext_src);
-    mainw->osc_block=FALSE;
-  }
-
-
   // need to do this here, in case we want to preview a generator which will close to -1
   if (mainw->record) {
     if (!mainw->preview&&cfile->clip_type==CLIP_TYPE_GENERATOR) {
       // just deinit the generator here, to possibly save CPU cycles
       mainw->osc_block=TRUE;
-      wge_inner ((weed_plant_t *)cfile->ext_src);
+      wge_inner((weed_plant_t *)cfile->ext_src);
       mainw->osc_block=FALSE;
     }
     deal_with_render_choice(TRUE);
@@ -3385,11 +3335,11 @@
 
   if (!mainw->preview&&cfile->clip_type==CLIP_TYPE_GENERATOR) {
     mainw->osc_block=TRUE;
-    weed_generator_end ((weed_plant_t *)cfile->ext_src);
+    weed_generator_end((weed_plant_t *)cfile->ext_src);
     mainw->osc_block=FALSE;
     if (mainw->multitrack==NULL) {
-      if (mainw->files[current_file]!=NULL) switch_to_file (mainw->current_file,current_file);
-      else if (mainw->pre_src_file!=-1) switch_to_file (mainw->current_file,mainw->pre_src_file);
+      if (mainw->files[current_file]!=NULL) switch_to_file(mainw->current_file,current_file);
+      else if (mainw->pre_src_file!=-1) switch_to_file(mainw->current_file,mainw->pre_src_file);
     }
   }
 
@@ -3422,7 +3372,7 @@
   // WARNING: this function changes mainw->current_file, unless it returns FALSE (could not create cfile)
 
 
-  gchar *com;
+  char *com;
   boolean is_unique;
   int current_file=mainw->current_file;
 
@@ -3436,18 +3386,18 @@
 
     is_unique=TRUE;
 
-    com=g_strdup_printf("%s new %d",prefs->backend_sync,capable->mainpid);
+    com=lives_strdup_printf("%s new %d",prefs->backend_sync,capable->mainpid);
 
     lives_system(com,TRUE);
 
-    g_free(com);
+    lives_free(com);
     // ignore return value here, as it will be dealt with in get_handle_from_info_file()
     mainw->current_file=current_file;
 
     //get handle from info file, we will also malloc a new "file" struct here
     if (!get_handle_from_info_file(index)) {
       // timed out
-      if (mainw->files[index]!=NULL) g_free(mainw->files[index]);
+      if (mainw->files[index]!=NULL) lives_free(mainw->files[index]);
       mainw->files[index]=NULL;
       return FALSE;
     }
@@ -3455,9 +3405,9 @@
     mainw->current_file=index;
 
     if (strlen(mainw->set_name)>0) {
-      gchar *setclipdir=g_build_filename(prefs->tmpdir,mainw->set_name,"clips",cfile->handle,NULL);
-      if (g_file_test(setclipdir,G_FILE_TEST_IS_DIR)) is_unique=FALSE;
-      g_free(setclipdir);
+      char *setclipdir=lives_build_filename(prefs->tmpdir,mainw->set_name,"clips",cfile->handle,NULL);
+      if (lives_file_test(setclipdir,LIVES_FILE_TEST_IS_DIR)) is_unique=FALSE;
+      lives_free(setclipdir);
     }
 
   } while (!is_unique);
@@ -3470,13 +3420,13 @@
 
 
 void create_cfile(void) {
-  gchar *stfile;
+  char *stfile;
 
   // any cfile (clip) initialisation goes in here
   cfile->menuentry=NULL;
   cfile->start=cfile->end=0;
   cfile->old_frames=cfile->frames=0;
-  g_snprintf(cfile->type,40,"%s",_ ("Unknown"));
+  lives_snprintf(cfile->type,40,"%s",_("Unknown"));
   cfile->f_size=0l;
   cfile->achans=0;
   cfile->arate=0;
@@ -3541,24 +3491,24 @@
   memset(cfile->file_name,0,1);
   memset(cfile->save_file_name,0,1);
 
-  memset (cfile->comment,0,1);
-  memset (cfile->author,0,1);
-  memset (cfile->title,0,1);
-  memset (cfile->keywords,0,1);
+  memset(cfile->comment,0,1);
+  memset(cfile->author,0,1);
+  memset(cfile->title,0,1);
+  memset(cfile->keywords,0,1);
 
   cfile->signed_endian=AFORM_UNKNOWN;
-  g_snprintf(cfile->undo_text,32,"%s",_ ("_Undo"));
-  g_snprintf(cfile->redo_text,32,"%s",_ ("_Redo"));
+  lives_snprintf(cfile->undo_text,32,"%s",_("_Undo"));
+  lives_snprintf(cfile->redo_text,32,"%s",_("_Redo"));
 
 #ifndef IS_MINGW
-  stfile=g_build_filename(prefs->tmpdir,cfile->handle,".status",NULL);
+  stfile=lives_build_filename(prefs->tmpdir,cfile->handle,".status",NULL);
 #else
-  stfile=g_build_filename(prefs->tmpdir,cfile->handle,"status",NULL);
+  stfile=lives_build_filename(prefs->tmpdir,cfile->handle,"status",NULL);
 #endif
 
-  g_snprintf(cfile->info_file,PATH_MAX,"%s",stfile);
-  g_free(stfile);
-  
+  lives_snprintf(cfile->info_file,PATH_MAX,"%s",stfile);
+  lives_free(stfile);
+
   cfile->laudio_drawable=NULL;
   cfile->raudio_drawable=NULL;
 
@@ -3566,125 +3516,120 @@
 }
 
 
-boolean get_new_handle (int index, const gchar *name) {
+boolean get_new_handle(int index, const char *name) {
   // here is where we first initialize for the clipboard
   // and for paste_as_new, and restore
   // pass in name as NULL or "" and it will be set with an untitled number
 
   // this function *does not* change mainw->current_file, or add to the menu
   // or update mainw->clips_available
-  gchar *xname;
+  char *xname;
 
   int current_file=mainw->current_file;
   if (!get_temp_handle(index,TRUE)) return FALSE;
 
-  // note : don't need to update first_free_file for the clipboard 
+  // note : don't need to update first_free_file for the clipboard
   if (index!=0) {
     get_next_free_file();
   }
 
   if (name==NULL||!strlen(name)) {
     cfile->is_untitled=TRUE;
-    xname=g_strdup_printf(_ ("Untitled%d"),mainw->untitled_number++);
-  }
-  else xname=g_strdup(name);
+    xname=lives_strdup_printf(_("Untitled%d"),mainw->untitled_number++);
+  } else xname=lives_strdup(name);
 
-  g_snprintf(cfile->file_name,PATH_MAX,"%s",xname);
-  g_snprintf(cfile->name,256,"%s",xname);
+  lives_snprintf(cfile->file_name,PATH_MAX,"%s",xname);
+  lives_snprintf(cfile->name,256,"%s",xname);
   mainw->current_file=current_file;
 
-  g_free(xname);
+  lives_free(xname);
   return TRUE;
 }
 
 
 
-boolean add_file_info(const gchar *check_handle, boolean aud_only) {
+boolean add_file_info(const char *check_handle, boolean aud_only) {
   // file information has been retrieved, set struct cfile with details
   // contained in mainw->msg. We do this twice, once before opening the file, once again after.
   // The first time, frames and afilesize may not be correct.
   int pieces;
 
-  gchar *mesg,*mesg1;
-  gchar **array;
-  gchar *test_fps_string1;
-  gchar *test_fps_string2;
+  char *mesg,*mesg1;
+  char **array;
+  char *test_fps_string1;
+  char *test_fps_string2;
+
 
- 
   if (!strcmp(mainw->msg,"killed")) {
     get_frame_count(mainw->current_file);
     cfile->frames--; // just in case last frame is damaged
     reget_afilesize(mainw->current_file);
-    mesg=g_strdup_printf(_("%d frames are enough !\n"),cfile->frames);
-    d_print(mesg);
-    g_free(mesg);
-  }
-  else {
+    d_print(_("%d frames are enough !\n"),cfile->frames);
+  } else {
     if (check_handle!=NULL) {
       if (mainw->msg==NULL||get_token_count(mainw->msg,'|')==1) return FALSE;
 
-      array=g_strsplit(mainw->msg,"|",-1);
-    
+      array=lives_strsplit(mainw->msg,"|",-1);
+
       // sanity check handle against status file
       // (this should never happen...)
-    
+
       if (strcmp(check_handle,array[1])) {
-	LIVES_ERROR("Handle!=statusfile !");
-	mesg=g_strdup_printf(_("\nError getting file info for clip %s.\nBad things may happen with this clip.\n"),
-			     check_handle);
-	do_error_dialog(mesg);
-	g_free(mesg);
-	g_strfreev(array);
-	return FALSE;
+        LIVES_ERROR("Handle!=statusfile !");
+        mesg=lives_strdup_printf(_("\nError getting file info for clip %s.\nBad things may happen with this clip.\n"),
+                                 check_handle);
+        do_error_dialog(mesg);
+        lives_free(mesg);
+        lives_strfreev(array);
+        return FALSE;
       }
-    
+
       if (!aud_only) {
-	cfile->frames=atoi(array[2]);
-	g_snprintf(cfile->type,40,"%s",array[3]);
-	cfile->hsize=atoi(array[4]);
-	cfile->vsize=atoi(array[5]);
-	cfile->bpp=atoi(array[6]);
-	cfile->pb_fps=cfile->fps=g_strtod(array[7],NULL);
-      
-	cfile->f_size=strtol(array[8],NULL,10);
+        cfile->frames=atoi(array[2]);
+        lives_snprintf(cfile->type,40,"%s",array[3]);
+        cfile->hsize=atoi(array[4]);
+        cfile->vsize=atoi(array[5]);
+        cfile->bpp=atoi(array[6]);
+        cfile->pb_fps=cfile->fps=lives_strtod(array[7],NULL);
+
+        cfile->f_size=strtol(array[8],NULL,10);
       }
 
       cfile->arps=cfile->arate=atoi(array[9]);
       cfile->achans=atoi(array[10]);
       cfile->asampsize=atoi(array[11]);
-      cfile->signed_endian=get_signed_endian(atoi (array[12]), atoi (array[13]));
+      cfile->signed_endian=get_signed_endian(atoi(array[12]), atoi(array[13]));
       cfile->afilesize=strtol(array[14],NULL,10);
-    
-      pieces=get_token_count (mainw->msg,'|');
-    
+
+      pieces=get_token_count(mainw->msg,'|');
+
       if (!strlen(cfile->title)&&pieces>14&&array[15]!=NULL) {
-	g_snprintf (cfile->title,256,"%s",g_strstrip(array[15]));
+        lives_snprintf(cfile->title,256,"%s",lives_strstrip(array[15]));
       }
       if (!strlen(cfile->author)&&pieces>15&&array[16]!=NULL) {
-	g_snprintf (cfile->author,256,"%s",g_strstrip(array[16]));
+        lives_snprintf(cfile->author,256,"%s",lives_strstrip(array[16]));
       }
       if (!strlen(cfile->comment)&&pieces>16&&array[17]!=NULL) {
-	g_snprintf (cfile->comment,256,"%s",g_strstrip(array[17]));
+        lives_snprintf(cfile->comment,256,"%s",lives_strstrip(array[17]));
       }
-    
-      g_strfreev(array);
+
+      lives_strfreev(array);
     }
   }
   cfile->video_time=0;
 
   if (aud_only) return TRUE;
 
-  test_fps_string1=g_strdup_printf ("%.3f00000",cfile->fps);
-  test_fps_string2=g_strdup_printf ("%.8f",cfile->fps);
+  test_fps_string1=lives_strdup_printf("%.3f00000",cfile->fps);
+  test_fps_string2=lives_strdup_printf("%.8f",cfile->fps);
 
-  if (strcmp (test_fps_string1,test_fps_string2)) {
+  if (strcmp(test_fps_string1,test_fps_string2)) {
     cfile->ratio_fps=TRUE;
-  }
-  else {
+  } else {
     cfile->ratio_fps=FALSE;
   }
-  g_free (test_fps_string1);
-  g_free (test_fps_string2);
+  lives_free(test_fps_string1);
+  lives_free(test_fps_string2);
 
   if (!mainw->save_with_sound) {
     cfile->arps=cfile->arate=cfile->achans=cfile->asampsize=0;
@@ -3697,9 +3642,8 @@
       return FALSE;
     }
     cfile->start=cfile->end=cfile->undo_start=cfile->undo_end=0;
-  }
-  else {
-  // start with all selected
+  } else {
+    // start with all selected
     cfile->start=1;
     cfile->end=cfile->frames;
     cfile->undo_start=cfile->start;
@@ -3712,36 +3656,32 @@
   // some files give us silly frame rates, even single frames...
   // fps of 1000. is used for some streams (i.e. play each frame as it is received)
   if (cfile->fps==0.||cfile->fps==1000.||(cfile->frames<2&&cfile->is_loaded)) {
-      double xduration=0.;
+    double xduration=0.;
 
-      if (cfile->ext_src!=NULL&&cfile->fps>0) {
-	  xduration=cfile->frames/cfile->fps;
-      }
+    if (cfile->ext_src!=NULL&&cfile->fps>0) {
+      xduration=cfile->frames/cfile->fps;
+    }
 
     if (!(cfile->afilesize*cfile->asampsize*cfile->arate*cfile->achans)||cfile->frames<2) {
       if (cfile->frames!=1) {
-      mesg=g_strdup_printf(_ ("\nPlayback speed not found or invalid ! Using default fps of %.3f fps. \nDefault can be set in Tools | Preferences | Misc.\n"),prefs->default_fps);
-      d_print(mesg);
-      g_free(mesg);
+        d_print(_("\nPlayback speed not found or invalid ! Using default fps of %.3f fps. \nDefault can be set in Tools | Preferences | Misc.\n"),
+                prefs->default_fps);
       }
       cfile->pb_fps=cfile->fps=prefs->default_fps;
-    }
-    else {
+    } else {
       cfile->laudio_time=cfile->raudio_time=cfile->afilesize/cfile->asampsize*8./cfile->arate/cfile->achans;
       cfile->pb_fps=cfile->fps=1.*(int)(cfile->frames/cfile->laudio_time);
       if (cfile->fps>FPS_MAX||cfile->fps<1.) {
-	cfile->pb_fps=cfile->fps=prefs->default_fps;
+        cfile->pb_fps=cfile->fps=prefs->default_fps;
       }
-      mesg=g_strdup_printf(_ ("Playback speed was adjusted to %.3f frames per second to fit audio.\n"),cfile->fps);
-      d_print(mesg);
-      g_free(mesg);
+      d_print(_("Playback speed was adjusted to %.3f frames per second to fit audio.\n"),cfile->fps);
     }
 
     if (xduration>0.) {
-	lives_clip_data_t *cdata=((lives_decoder_t *)cfile->ext_src)->cdata;
-	// we should not (!) do this, but we don t have proper handling for variable fps clips
-	cdata->nframes=cfile->frames=xduration*cfile->fps;
-	cdata->fps=cfile->fps;
+      lives_clip_data_t *cdata=((lives_decoder_t *)cfile->ext_src)->cdata;
+      // we should not (!) do this, but we don t have proper handling for variable fps clips
+      cdata->nframes=cfile->frames=xduration*cfile->fps;
+      cdata->fps=cfile->fps;
     }
 
   }
@@ -3751,78 +3691,71 @@
   if (cfile->opening) return TRUE;
 
   if (cfile->bpp==256) {
-    mesg1=g_strdup_printf(_ ("Frames=%d type=%s size=%dx%d *bpp=Greyscale* fps=%.3f\nAudio:"),cfile->frames,cfile->type,cfile->hsize,cfile->vsize,cfile->fps);
-  }
-  else {
+    mesg1=lives_strdup_printf(_("Frames=%d type=%s size=%dx%d *bpp=Greyscale* fps=%.3f\nAudio:"),cfile->frames,
+                              cfile->type,cfile->hsize,cfile->vsize,cfile->fps);
+  } else {
     if (cfile->bpp!=32) cfile->bpp=24; // assume RGB24  *** TODO - check
-    mesg1=g_strdup_printf(_ ("Frames=%d type=%s size=%dx%d bpp=%d fps=%.3f\nAudio:"),cfile->frames,cfile->type,cfile->hsize,cfile->vsize,cfile->bpp,cfile->fps);
+    mesg1=lives_strdup_printf(_("Frames=%d type=%s size=%dx%d bpp=%d fps=%.3f\nAudio:"),cfile->frames,
+                              cfile->type,cfile->hsize,cfile->vsize,cfile->bpp,cfile->fps);
   }
 
   if (cfile->achans==0) {
-    mesg=g_strdup_printf (_ ("%s none\n"),mesg1);
-  }
-  else {
-    mesg=g_strdup_printf(P_ ("%s %d Hz %d channel %d bps\n","%s %d Hz %d channels %d bps\n",cfile->achans),
-			 mesg1,cfile->arate,cfile->achans,cfile->asampsize);
+    mesg=lives_strdup_printf(_("%s none\n"),mesg1);
+  } else {
+    mesg=lives_strdup_printf(P_("%s %d Hz %d channel %d bps\n","%s %d Hz %d channels %d bps\n",cfile->achans),
+                             mesg1,cfile->arate,cfile->achans,cfile->asampsize);
   }
   d_print(mesg);
-  g_free(mesg1);
-  g_free(mesg);
+  lives_free(mesg1);
+  lives_free(mesg);
 
   // get the author,title,comments
-  if (strlen (cfile->author)) {
-    mesg=g_strdup_printf(_ (" - Author: %s\n"),cfile->author);
-    d_print(mesg);
-    g_free(mesg);
-  }
-  if (strlen (cfile->title)) {
-    mesg=g_strdup_printf(_ (" - Title: %s\n"),cfile->title);
-    d_print(mesg);
-    g_free(mesg);
-  }
-  if (strlen (cfile->comment)) {
-    mesg=g_strdup_printf(_ (" - Comment: %s\n"),cfile->comment);
-    d_print(mesg);
-    g_free(mesg);
+  if (strlen(cfile->author)) {
+    d_print(_(" - Author: %s\n"),cfile->author);
+  }
+  if (strlen(cfile->title)) {
+    d_print(_(" - Title: %s\n"),cfile->title);
+  }
+  if (strlen(cfile->comment)) {
+    d_print(_(" - Comment: %s\n"),cfile->comment);
   }
 
   return TRUE;
 }
 
 
-boolean save_file_comments (int fileno) {
+boolean save_file_comments(int fileno) {
   // save the comments etc for smogrify
   int retval;
   int comment_fd;
-  gchar *comment_file=g_strdup_printf ("%s/%s/.comment",prefs->tmpdir,cfile->handle);
+  char *comment_file=lives_strdup_printf("%s/%s/.comment",prefs->tmpdir,cfile->handle);
   lives_clip_t *sfile=mainw->files[fileno];
 
-  unlink (comment_file);
+  unlink(comment_file);
 
   do {
     retval=0;
     comment_fd=creat(comment_file,S_IRUSR|S_IWUSR);
     if (comment_fd<0) {
       mainw->write_failed=TRUE;
-      retval=do_write_failed_error_s_with_retry(comment_file,g_strerror(errno),NULL);
-    }
-    else {
+      retval=do_write_failed_error_s_with_retry(comment_file,lives_strerror(errno),NULL);
+    } else {
       mainw->write_failed=FALSE;
-      lives_write(comment_fd,sfile->title,strlen (sfile->title),TRUE);
+      lives_write(comment_fd,sfile->title,strlen(sfile->title),TRUE);
       lives_write(comment_fd,"||%",3,TRUE);
-      lives_write(comment_fd,sfile->author,strlen (sfile->author),TRUE);
+      lives_write(comment_fd,sfile->author,strlen(sfile->author),TRUE);
       lives_write(comment_fd,"||%",3,TRUE);
-      lives_write(comment_fd,sfile->comment,strlen (sfile->comment),TRUE);
-      
-      close (comment_fd);
-      
+      lives_write(comment_fd,sfile->comment,strlen(sfile->comment),TRUE);
+
+      close(comment_fd);
+
       if (mainw->write_failed) {
-	retval=do_write_failed_error_s_with_retry(comment_file,NULL,NULL);
+        retval=do_write_failed_error_s_with_retry(comment_file,NULL,NULL);
       }
     }
-  } while (retval==LIVES_RETRY);
+  } while (retval==LIVES_RESPONSE_RETRY);
 
-  g_free (comment_file);
+  lives_free(comment_file);
 
   if (mainw->write_failed) return FALSE;
 
@@ -3834,7 +3767,7 @@
 
 
 void
-wait_for_stop (const gchar *stop_command) {
+wait_for_stop(const char *stop_command) {
   FILE *infofile;
 
   // only used for audio player mplayer or audio player sox
@@ -3844,18 +3777,18 @@
 
   double time_waited=0.;
   boolean sent_second_stop=FALSE;
-  
+
   // send another stop if necessary
   mainw->noswitch=TRUE;
   while (!(infofile=fopen(cfile->info_file,"r"))) {
     lives_widget_context_update();
-    g_usleep(prefs->sleep_time);
+    lives_usleep(prefs->sleep_time);
     time_waited+=1000000./prefs->sleep_time;
     if (time_waited>SECOND_STOP_TIME&&!sent_second_stop) {
       lives_system(stop_command,TRUE);
       sent_second_stop=TRUE;
     }
-    
+
     if (time_waited>STOP_GIVE_UP_TIME) {
       // give up waiting, but send a last try...
       lives_system(stop_command,TRUE);
@@ -3863,55 +3796,52 @@
     }
   }
   mainw->noswitch=FALSE;
-  if (infofile) fclose (infofile);
+  if (infofile) fclose(infofile);
 }
 
 
-boolean save_frame_inner(int clip, int frame, const gchar *file_name, int width, int height, boolean from_osc) {
+boolean save_frame_inner(int clip, int frame, const char *file_name, int width, int height, boolean from_osc) {
   // save 1 frame as an image (uses imagemagick to convert)
   // width==-1, height==-1 to use "natural" values
 
   lives_clip_t *sfile=mainw->files[clip];
-  gchar full_file_name[PATH_MAX];
-  gchar *com,*tmp;
+  char full_file_name[PATH_MAX];
+  char *com,*tmp;
 
   boolean allow_over=FALSE;
   int result;
 
   if (!from_osc&&strrchr(file_name,'.')==NULL) {
-    g_snprintf(full_file_name,PATH_MAX,"%s.%s",file_name,get_image_ext_for_type(sfile->img_type));
-  }
-  else {
-    g_snprintf(full_file_name,PATH_MAX,"%s",file_name);
+    lives_snprintf(full_file_name,PATH_MAX,"%s.%s",file_name,get_image_ext_for_type(sfile->img_type));
+  } else {
+    lives_snprintf(full_file_name,PATH_MAX,"%s",file_name);
     if (!allow_over) allow_over=TRUE;
   }
 
   // TODO - allow overwriting in sandbox
-  if (from_osc&&g_file_test (full_file_name, G_FILE_TEST_EXISTS)) return FALSE;
+  if (from_osc&&lives_file_test(full_file_name, LIVES_FILE_TEST_EXISTS)) return FALSE;
 
   if (!check_file(full_file_name,!allow_over)) return FALSE;
 
-  tmp=g_filename_from_utf8 (full_file_name,-1,NULL,NULL,NULL);
+  tmp=lives_filename_from_utf8(full_file_name,-1,NULL,NULL,NULL);
 
   if (mainw->multitrack==NULL) {
-    com=g_strdup_printf(_ ("Saving frame %d as %s..."),frame,full_file_name);
-    d_print(com);
-    g_free(com);
-    
+    d_print(_("Saving frame %d as %s..."),frame,full_file_name);
+
     if (sfile->clip_type==CLIP_TYPE_FILE) {
       boolean resb=virtual_to_images(clip,frame,frame,FALSE,NULL);
       if (!resb) {
-	d_print_file_error_failed();
-	return FALSE;
+        d_print_file_error_failed();
+        return FALSE;
       }
     }
 
-    com=g_strdup_printf("%s save_frame %s %d %s %d %d",prefs->backend_sync,sfile->handle,
-			frame,tmp,width,height);
+    com=lives_strdup_printf("%s save_frame %s %d %s %d %d",prefs->backend_sync,sfile->handle,
+                            frame,tmp,width,height);
     result=lives_system(com,FALSE);
-    g_free(com);
-    g_free(tmp);
-    
+    lives_free(com);
+    lives_free(tmp);
+
     if (result==256) {
       d_print_file_error_failed();
       do_file_perm_error(full_file_name);
@@ -3922,10 +3852,9 @@
       d_print_done();
       return TRUE;
     }
-  }
-  else {
+  } else {
     // multitrack mode
-    GError *gerr=NULL;
+    LiVESError *gerr=NULL;
     LiVESPixbuf *pixbuf;
     int retval;
 
@@ -3942,12 +3871,12 @@
       else if (sfile->img_type==IMG_TYPE_PNG) lives_pixbuf_save(pixbuf, tmp, IMG_TYPE_PNG, 100, FALSE, &gerr);
 
       if (gerr!=NULL) {
-	retval=do_write_failed_error_s_with_retry(full_file_name,gerr->message,NULL);
-	g_error_free(gerr);
-	gerr=NULL;
+        retval=do_write_failed_error_s_with_retry(full_file_name,gerr->message,NULL);
+        lives_error_free(gerr);
+        gerr=NULL;
       }
 
-    } while (retval==LIVES_RETRY);
+    } while (retval==LIVES_RESPONSE_RETRY);
 
     free(tmp);
     lives_object_unref(pixbuf);
@@ -3958,14 +3887,14 @@
 }
 
 
-void backup_file(int clip, int start, int end, const gchar *file_name) {
+void backup_file(int clip, int start, int end, const char *file_name) {
   lives_clip_t *sfile=mainw->files[clip];
-  gchar **array;
+  char **array;
 
-  gchar title[256];
-  gchar full_file_name[PATH_MAX];
+  char title[256];
+  char full_file_name[PATH_MAX];
 
-  gchar *com,*tmp;
+  char *com,*tmp;
 
   boolean with_perf=FALSE;
   boolean retval,allow_over;
@@ -3974,11 +3903,10 @@
   int current_file=mainw->current_file;
 
   if (strrchr(file_name,'.')==NULL) {
-    g_snprintf(full_file_name,PATH_MAX,"%s.lv1",file_name);
+    lives_snprintf(full_file_name,PATH_MAX,"%s.lv1",file_name);
     allow_over=FALSE;
-   }
-  else {
-    g_snprintf(full_file_name,PATH_MAX,"%s",file_name);
+  } else {
+    lives_snprintf(full_file_name,PATH_MAX,"%s",file_name);
     allow_over=TRUE;
   }
 
@@ -3993,12 +3921,10 @@
 
   //...and backup
   get_menu_text(sfile->menuentry,title);
-  com=g_strdup_printf(_ ("Backing up %s to %s"),title,full_file_name);
-  d_print(com);
-  g_free(com);
+  d_print(_("Backing up %s to %s"),title,full_file_name);
 
   if (!mainw->save_with_sound) {
-    d_print(_ (" without sound"));
+    d_print(_(" without sound"));
     withsound=0;
   }
 
@@ -4025,17 +3951,17 @@
     }
   }
 
-  com=g_strdup_printf("%s backup %s %d %d %d %s",prefs->backend,sfile->handle,withsound,
-		      start,end,(tmp=g_filename_from_utf8 (full_file_name,-1,NULL,NULL,NULL)));
+  com=lives_strdup_printf("%s backup %s %d %d %d %s",prefs->backend,sfile->handle,withsound,
+                          start,end,(tmp=lives_filename_from_utf8(full_file_name,-1,NULL,NULL,NULL)));
 
   // TODO
   mainw->current_file=clip;
 
-  unlink (cfile->info_file);
+  unlink(cfile->info_file);
   cfile->nopreview=TRUE;
   mainw->com_failed=FALSE;
   lives_system(com,FALSE);
-  g_free(tmp);
+  lives_free(tmp);
 
   if (mainw->com_failed) {
     mainw->com_failed=FALSE;
@@ -4043,25 +3969,25 @@
     return;
   }
 
-  cfile->op_dir=g_filename_from_utf8((tmp=get_dir(full_file_name)),-1,NULL,NULL,NULL);
-  g_free(tmp);
+  cfile->op_dir=lives_filename_from_utf8((tmp=get_dir(full_file_name)),-1,NULL,NULL,NULL);
+  lives_free(tmp);
 
-  if (!(do_progress_dialog(TRUE,TRUE,_ ("Backing up")))||mainw->error) {
+  if (!(do_progress_dialog(TRUE,TRUE,_("Backing up")))||mainw->error) {
     if (mainw->error) {
       d_print_failed();
     }
 
     // cancelled - clear up files
     cfile->nopreview=FALSE;
-    g_free (com);
+    lives_free(com);
 
     // using restore details in the 'wrong' way here...it will also clear files
-    com=g_strdup_printf("%s restore_details %s",prefs->backend,cfile->handle);
-    unlink (cfile->info_file);
+    com=lives_strdup_printf("%s restore_details %s",prefs->backend,cfile->handle);
+    unlink(cfile->info_file);
 
     lives_system(com,FALSE);
     // auto-d
-    g_free(com);
+    lives_free(com);
 
     //save_clip_values(mainw->current_file);
     mainw->current_file=current_file;
@@ -4069,7 +3995,7 @@
   }
 
   cfile->nopreview=FALSE;
-  g_free(com);
+  lives_free(com);
 
   mainw->current_file=current_file;
 
@@ -4080,20 +4006,20 @@
   }
 
   if (with_perf) {
-    d_print(_ ("performance data was backed up..."));
+    d_print(_("performance data was backed up..."));
   }
 
-  array=g_strsplit(mainw->msg,"|",3);
+  array=lives_strsplit(mainw->msg,"|",3);
   sfile->f_size=strtol(array[1],NULL,10);
-  g_strfreev(array);
+  lives_strfreev(array);
 
-  g_snprintf(sfile->file_name,PATH_MAX,"%s",full_file_name);
+  lives_snprintf(sfile->file_name,PATH_MAX,"%s",full_file_name);
   if (!sfile->was_renamed) {
-    g_snprintf(sfile->name,256,"%s",full_file_name);
+    lives_snprintf(sfile->name,256,"%s",full_file_name);
     set_main_title(cfile->name,0);
     set_menu_text(sfile->menuentry,full_file_name,FALSE);
   }
-  add_to_recent (full_file_name,0.,0,NULL);
+  add_to_recent(full_file_name,0.,0,NULL);
 
   sfile->changed=FALSE;
   // set is_untitled to stop users from saving with a .lv1 extension
@@ -4102,26 +4028,25 @@
 }
 
 
-boolean write_headers (lives_clip_t *file) {
+boolean write_headers(lives_clip_t *file) {
   // this function is included only for backwards compatibility with ancient builds of LiVES
   //
 
   int retval;
   int header_fd;
-  gchar *hdrfile;
+  char *hdrfile;
 
   // save the file details
-  hdrfile=g_build_filename(prefs->tmpdir,file->handle,"header",NULL);
+  hdrfile=lives_build_filename(prefs->tmpdir,file->handle,"header",NULL);
 
   do {
     retval=0;
     header_fd=creat(hdrfile,S_IRUSR|S_IWUSR);
     if (header_fd<0) {
-      retval=do_write_failed_error_s_with_retry(hdrfile,g_strerror(errno),NULL);
-    }
-    else {
+      retval=do_write_failed_error_s_with_retry(hdrfile,lives_strerror(errno),NULL);
+    } else {
       mainw->write_failed=FALSE;
-      
+
       lives_write_le(header_fd,&cfile->bpp,4,TRUE);
       lives_write_le(header_fd,&cfile->fps,8,TRUE);
       lives_write_le(header_fd,&cfile->hsize,4,TRUE);
@@ -4132,45 +4057,44 @@
       lives_write_le(header_fd,&cfile->unique_id,8,TRUE);
       lives_write_le(header_fd,&cfile->achans,4,TRUE);
       lives_write_le(header_fd,&cfile->asampsize,4,TRUE);
-      
+
       lives_write(header_fd,LiVES_VERSION,strlen(LiVES_VERSION),TRUE);
       close(header_fd);
-      
+
       if (mainw->write_failed) retval=do_write_failed_error_s_with_retry(hdrfile,NULL,NULL);
-      
+
     }
-  } while (retval==LIVES_RETRY);
+  } while (retval==LIVES_RESPONSE_RETRY);
 
 
-  g_free(hdrfile);
+  lives_free(hdrfile);
 
-  if (retval!=LIVES_CANCEL) {
+  if (retval!=LIVES_RESPONSE_CANCEL) {
     // more file details (since version 0.7.5)
-    hdrfile=g_build_filename(prefs->tmpdir,file->handle,"header2",NULL);
+    hdrfile=lives_build_filename(prefs->tmpdir,file->handle,"header2",NULL);
 
     do {
       retval=0;
       header_fd=creat(hdrfile,S_IRUSR|S_IWUSR);
-    
+
       if (header_fd<0) {
-	retval=do_write_failed_error_s_with_retry(hdrfile,g_strerror(errno),NULL);
-      }
-      else {
-	mainw->write_failed=FALSE;
-	lives_write_le(header_fd,&file->frames,4,TRUE);
-	lives_write(header_fd,&file->title,256,TRUE);
-	lives_write(header_fd,&file->author,256,TRUE);
-	lives_write(header_fd,&file->comment,256,TRUE);
-	close(header_fd);
+        retval=do_write_failed_error_s_with_retry(hdrfile,lives_strerror(errno),NULL);
+      } else {
+        mainw->write_failed=FALSE;
+        lives_write_le(header_fd,&file->frames,4,TRUE);
+        lives_write(header_fd,&file->title,256,TRUE);
+        lives_write(header_fd,&file->author,256,TRUE);
+        lives_write(header_fd,&file->comment,256,TRUE);
+        close(header_fd);
       }
-      
+
       if (mainw->write_failed) retval=do_write_failed_error_s_with_retry(hdrfile,NULL,NULL);
-    } while (retval==LIVES_RETRY);
+    } while (retval==LIVES_RESPONSE_RETRY);
 
-    g_free(hdrfile);
+    lives_free(hdrfile);
   }
 
-  if (retval==LIVES_CANCEL) {
+  if (retval==LIVES_RESPONSE_CANCEL) {
     mainw->write_failed=FALSE;
     return FALSE;
   }
@@ -4179,15 +4103,15 @@
 }
 
 
-boolean read_headers(const gchar *file_name) {
+boolean read_headers(const char *file_name) {
   // file_name is only used to get the file size on the disk
   FILE *infofile;
-  gchar **array;
-  gchar buff[1024];
-  gchar version[32];
-  gchar *com,*tmp;
-  gchar *old_hdrfile=g_build_filename(prefs->tmpdir,cfile->handle,"header",NULL);
-  gchar *lives_header=g_build_filename(prefs->tmpdir,cfile->handle,"header.lives",NULL);
+  char **array;
+  char buff[1024];
+  char version[32];
+  char *com,*tmp;
+  char *old_hdrfile=lives_build_filename(prefs->tmpdir,cfile->handle,"header",NULL);
+  char *lives_header=lives_build_filename(prefs->tmpdir,cfile->handle,"header.lives",NULL);
 
   int header_size;
   int version_hash;
@@ -4217,268 +4141,261 @@
 
       detail=CLIP_DETAILS_FRAMES;
       if (get_clip_value(mainw->current_file,detail,&cfile->frames,0)) {
-	int asigned,aendian;
-	gchar *tmp;
-	int alarm_handle;
-
-	// use new style header (LiVES 0.9.6+)
-	g_free(old_hdrfile);
-
-	// clean up and get file sizes
-	com=g_strdup_printf("%s restore_details %s %s %d",prefs->backend_sync,cfile->handle,
-			    (tmp=g_filename_from_utf8 (file_name,-1,NULL,NULL,NULL)),!strcmp (file_name,"."));
-
-	mainw->com_failed=FALSE;
-	lives_system(com,FALSE);
-	g_free(com);
-	g_free(tmp);
-     
-	if (mainw->com_failed) {
-	  mainw->com_failed=FALSE;
-	  return FALSE;
-	}
-
-
-	do {
-	  retval2=0;
-	  timeout=FALSE;
-	  memset(buff,0,1);
+        int asigned,aendian;
+        char *tmp;
+        int alarm_handle;
+
+        // use new style header (LiVES 0.9.6+)
+        lives_free(old_hdrfile);
+
+        // clean up and get file sizes
+        com=lives_strdup_printf("%s restore_details %s %s %d",prefs->backend_sync,cfile->handle,
+                                (tmp=lives_filename_from_utf8(file_name,-1,NULL,NULL,NULL)),!strcmp(file_name,"."));
+
+        mainw->com_failed=FALSE;
+        lives_system(com,FALSE);
+        lives_free(com);
+        lives_free(tmp);
+
+        if (mainw->com_failed) {
+          mainw->com_failed=FALSE;
+          return FALSE;
+        }
+
+
+        do {
+          retval2=0;
+          timeout=FALSE;
+          memset(buff,0,1);
 
 #define LIVES_RESTORE_TIMEOUT  (30 * U_SEC) // 30 sec
 
-	  alarm_handle=lives_alarm_set(LIVES_RESTORE_TIMEOUT);
+          alarm_handle=lives_alarm_set(LIVES_RESTORE_TIMEOUT);
 
-	  while (!((infofile=fopen(cfile->info_file,"r")) || (timeout=lives_alarm_get(alarm_handle)))) {
-	    g_usleep(prefs->sleep_time);
-	  }
-	  
-	  lives_alarm_clear(alarm_handle);
-	  
-	  if (!timeout) {
-	    mainw->read_failed=FALSE;
-	    lives_fgets(buff,1024,infofile);
-	    fclose(infofile);
-	  }
-
-	  if (timeout || mainw->read_failed) {
-	    retval2=do_read_failed_error_s_with_retry(cfile->info_file,NULL,NULL);
-	  }
-	} while (retval2==LIVES_RETRY);
-
-	if (retval2==LIVES_CANCEL) {
-	  return FALSE;
-	}
-
-	pieces=get_token_count (buff,'|');
-
-	if (pieces>3) {
-	  array=g_strsplit(buff,"|",pieces);
-	
-	  cfile->f_size=strtol(array[1],NULL,10);
-	  cfile->afilesize=strtol(array[2],NULL,10);
-	  if (cfile->clip_type==CLIP_TYPE_DISK) {
-	    if (!strcmp(array[3],"jpg")) cfile->img_type=IMG_TYPE_JPEG;
-	    else cfile->img_type=IMG_TYPE_PNG;
-	  }
-	  g_strfreev(array);
-	}
-
-	threaded_dialog_spin();
-
-	do {
-	  retval2=0;
-	  if (!cache_file_contents(lives_header)) {
-	    retval2=do_read_failed_error_s_with_retry(lives_header,NULL,NULL);
-	  }
-	} while (retval2==LIVES_RETRY);
-
-	g_free(lives_header);
-
-	threaded_dialog_spin();
-
-	detail=CLIP_DETAILS_HEADER_VERSION;
-	retval=get_clip_value(mainw->current_file,detail,&cfile->header_version,16);
-	if (retval) {
-	  detail=CLIP_DETAILS_BPP;
-	  retval=get_clip_value(mainw->current_file,detail,&cfile->bpp,0);
-	}
-	if (retval) {
-	  detail=CLIP_DETAILS_FPS;
-	  retval=get_clip_value(mainw->current_file,detail,&cfile->fps,0);
-	}
-	if (retval) {
-	  detail=CLIP_DETAILS_PB_FPS;
-	  retval=get_clip_value(mainw->current_file,detail,&cfile->pb_fps,0);
-	  if (!retval) {
-	    retval=TRUE;
-	    cfile->pb_fps=cfile->fps;
-	  }
-	}
-	if (retval) {
-	  retval=get_clip_value(mainw->current_file,CLIP_DETAILS_PB_FRAMENO,&cfile->frameno,0);
-	  if (!retval) {
-	    retval=TRUE;
-	    cfile->frameno=1;
-	  }
-	}
-	if (retval) {
-	  detail=CLIP_DETAILS_WIDTH;
-	  retval=get_clip_value(mainw->current_file,detail,&cfile->hsize,0);
-	}
-	if (retval) {
-	  detail=CLIP_DETAILS_HEIGHT;
-	  retval=get_clip_value(mainw->current_file,detail,&cfile->vsize,0);
-	}
-	if (retval) {
-	  detail=CLIP_DETAILS_CLIPNAME;
-	  get_clip_value(mainw->current_file,detail,cfile->name,256);
-	}
-	if (retval) {
-	  detail=CLIP_DETAILS_FILENAME;
-	  get_clip_value(mainw->current_file,detail,cfile->file_name,PATH_MAX);
-	}
-
-	if (retval) {
-	  detail=CLIP_DETAILS_ACHANS;
-	  retvala=get_clip_value(mainw->current_file,detail,&cfile->achans,0);
-	  if (!retvala) cfile->achans=0;
-	}
-
-	if (cfile->achans==0) retvala=FALSE;
-	else retvala=TRUE;
-
-	if (retval&&retvala) {
-	  detail=CLIP_DETAILS_ARATE;
-	  retvala=get_clip_value(mainw->current_file,detail,&cfile->arps,0);
-	}
-
-	if (!retvala) cfile->arps=cfile->achans=cfile->arate=cfile->asampsize=0;
-	if (cfile->arps==0) retvala=FALSE; 
-
-	if (retvala&&retval) {
-	  detail=CLIP_DETAILS_PB_ARATE;
-	  retvala=get_clip_value(mainw->current_file,detail,&cfile->arate,0);
-	  if (!retvala) {
-	    retvala=TRUE;
-	    cfile->arate=cfile->arps;
-	  }
-	}
-	if (retvala&&retval) {
-	  detail=CLIP_DETAILS_ASIGNED;
-	  retval=get_clip_value(mainw->current_file,detail,&asigned,0);
-	}
-	if (retvala&&retval) {
-	  detail=CLIP_DETAILS_AENDIAN;
-	  retval=get_clip_value(mainw->current_file,detail,&aendian,0);
-	}
-
-	cfile->signed_endian=asigned+aendian;
-
-	if (retvala&&retval) {
-	  detail=CLIP_DETAILS_ASAMPS;
-	  retval=get_clip_value(mainw->current_file,detail,&cfile->asampsize,0);
-	}
-	
-	get_clip_value(mainw->current_file,CLIP_DETAILS_TITLE,cfile->title,256);
-	get_clip_value(mainw->current_file,CLIP_DETAILS_AUTHOR,cfile->author,256);
-	get_clip_value(mainw->current_file,CLIP_DETAILS_COMMENT,cfile->comment,256);
-	get_clip_value(mainw->current_file,CLIP_DETAILS_KEYWORDS,cfile->keywords,1024);
-	get_clip_value(mainw->current_file,CLIP_DETAILS_INTERLACE,&cfile->interlace,0);
-	if (cfile->interlace!=LIVES_INTERLACE_NONE) cfile->deinterlace=TRUE; // user must have forced this
-
-	if (!retval) {
-	  if (mainw->cached_list!=NULL) {
-	    retval2=do_header_missing_detail_error(mainw->current_file,detail);
-	  }
-	  else {
-	    retval2=do_header_read_error_with_retry(mainw->current_file);
-	  }
-	}
-	else return TRUE;
-      }
-      else {
-	if (mainw->cached_list!=NULL) {
-	  retval2=do_header_missing_detail_error(mainw->current_file,CLIP_DETAILS_FRAMES);
-	}
-	else {
-	  retval2=do_header_read_error_with_retry(mainw->current_file);
-	}
+          while (!((infofile=fopen(cfile->info_file,"r")) || (timeout=lives_alarm_get(alarm_handle)))) {
+            lives_usleep(prefs->sleep_time);
+          }
+
+          lives_alarm_clear(alarm_handle);
+
+          if (!timeout) {
+            mainw->read_failed=FALSE;
+            lives_fgets(buff,1024,infofile);
+            fclose(infofile);
+          }
+
+          if (timeout || mainw->read_failed) {
+            retval2=do_read_failed_error_s_with_retry(cfile->info_file,NULL,NULL);
+          }
+        } while (retval2==LIVES_RESPONSE_RETRY);
+
+        if (retval2==LIVES_RESPONSE_CANCEL) {
+          return FALSE;
+        }
+
+        pieces=get_token_count(buff,'|');
+
+        if (pieces>3) {
+          array=lives_strsplit(buff,"|",pieces);
+
+          cfile->f_size=strtol(array[1],NULL,10);
+          cfile->afilesize=strtol(array[2],NULL,10);
+          if (cfile->clip_type==CLIP_TYPE_DISK) {
+            if (!strcmp(array[3],"jpg")) cfile->img_type=IMG_TYPE_JPEG;
+            else cfile->img_type=IMG_TYPE_PNG;
+          }
+          lives_strfreev(array);
+        }
+
+        threaded_dialog_spin();
+
+        do {
+          retval2=0;
+          if (!cache_file_contents(lives_header)) {
+            retval2=do_read_failed_error_s_with_retry(lives_header,NULL,NULL);
+          }
+        } while (retval2==LIVES_RESPONSE_RETRY);
+
+        lives_free(lives_header);
+
+        threaded_dialog_spin();
+
+        detail=CLIP_DETAILS_HEADER_VERSION;
+        retval=get_clip_value(mainw->current_file,detail,&cfile->header_version,16);
+        if (retval) {
+          detail=CLIP_DETAILS_BPP;
+          retval=get_clip_value(mainw->current_file,detail,&cfile->bpp,0);
+        }
+        if (retval) {
+          detail=CLIP_DETAILS_FPS;
+          retval=get_clip_value(mainw->current_file,detail,&cfile->fps,0);
+        }
+        if (retval) {
+          detail=CLIP_DETAILS_PB_FPS;
+          retval=get_clip_value(mainw->current_file,detail,&cfile->pb_fps,0);
+          if (!retval) {
+            retval=TRUE;
+            cfile->pb_fps=cfile->fps;
+          }
+        }
+        if (retval) {
+          retval=get_clip_value(mainw->current_file,CLIP_DETAILS_PB_FRAMENO,&cfile->frameno,0);
+          if (!retval) {
+            retval=TRUE;
+            cfile->frameno=1;
+          }
+        }
+        if (retval) {
+          detail=CLIP_DETAILS_WIDTH;
+          retval=get_clip_value(mainw->current_file,detail,&cfile->hsize,0);
+        }
+        if (retval) {
+          detail=CLIP_DETAILS_HEIGHT;
+          retval=get_clip_value(mainw->current_file,detail,&cfile->vsize,0);
+        }
+        if (retval) {
+          detail=CLIP_DETAILS_CLIPNAME;
+          get_clip_value(mainw->current_file,detail,cfile->name,256);
+        }
+        if (retval) {
+          detail=CLIP_DETAILS_FILENAME;
+          get_clip_value(mainw->current_file,detail,cfile->file_name,PATH_MAX);
+        }
+
+        if (retval) {
+          detail=CLIP_DETAILS_ACHANS;
+          retvala=get_clip_value(mainw->current_file,detail,&cfile->achans,0);
+          if (!retvala) cfile->achans=0;
+        }
+
+        if (cfile->achans==0) retvala=FALSE;
+        else retvala=TRUE;
+
+        if (retval&&retvala) {
+          detail=CLIP_DETAILS_ARATE;
+          retvala=get_clip_value(mainw->current_file,detail,&cfile->arps,0);
+        }
+
+        if (!retvala) cfile->arps=cfile->achans=cfile->arate=cfile->asampsize=0;
+        if (cfile->arps==0) retvala=FALSE;
+
+        if (retvala&&retval) {
+          detail=CLIP_DETAILS_PB_ARATE;
+          retvala=get_clip_value(mainw->current_file,detail,&cfile->arate,0);
+          if (!retvala) {
+            retvala=TRUE;
+            cfile->arate=cfile->arps;
+          }
+        }
+        if (retvala&&retval) {
+          detail=CLIP_DETAILS_ASIGNED;
+          retval=get_clip_value(mainw->current_file,detail,&asigned,0);
+        }
+        if (retvala&&retval) {
+          detail=CLIP_DETAILS_AENDIAN;
+          retval=get_clip_value(mainw->current_file,detail,&aendian,0);
+        }
+
+        cfile->signed_endian=asigned+aendian;
+
+        if (retvala&&retval) {
+          detail=CLIP_DETAILS_ASAMPS;
+          retval=get_clip_value(mainw->current_file,detail,&cfile->asampsize,0);
+        }
+
+        get_clip_value(mainw->current_file,CLIP_DETAILS_TITLE,cfile->title,256);
+        get_clip_value(mainw->current_file,CLIP_DETAILS_AUTHOR,cfile->author,256);
+        get_clip_value(mainw->current_file,CLIP_DETAILS_COMMENT,cfile->comment,256);
+        get_clip_value(mainw->current_file,CLIP_DETAILS_KEYWORDS,cfile->keywords,1024);
+        get_clip_value(mainw->current_file,CLIP_DETAILS_INTERLACE,&cfile->interlace,0);
+        if (cfile->interlace!=LIVES_INTERLACE_NONE) cfile->deinterlace=TRUE; // user must have forced this
+
+        if (!retval) {
+          if (mainw->cached_list!=NULL) {
+            retval2=do_header_missing_detail_error(mainw->current_file,detail);
+          } else {
+            retval2=do_header_read_error_with_retry(mainw->current_file);
+          }
+        } else return TRUE;
+      } else {
+        if (mainw->cached_list!=NULL) {
+          retval2=do_header_missing_detail_error(mainw->current_file,CLIP_DETAILS_FRAMES);
+        } else {
+          retval2=do_header_read_error_with_retry(mainw->current_file);
+        }
       }
-    } while (retval2==LIVES_RETRY);
-    return FALSE; // retval2==LIVES_CANCEL
+    } while (retval2==LIVES_RESPONSE_RETRY);
+    return FALSE; // retval2==LIVES_RESPONSE_CANCEL
   }
 
   // old style headers (pre 0.9.6)
-  g_free(lives_header);
+  lives_free(lives_header);
 
   do {
     retval=0;
     mainw->read_failed=FALSE;
-    memset (version,0,32);
-    memset (buff,0,1024);
-    
+    memset(version,0,32);
+    memset(buff,0,1024);
+
     header_fd=open(old_hdrfile,O_RDONLY);
 
     if (header_fd<0) {
-      retval=do_read_failed_error_s_with_retry(old_hdrfile,g_strerror(errno),NULL);
-    }
-    else {
+      retval=do_read_failed_error_s_with_retry(old_hdrfile,lives_strerror(errno),NULL);
+    } else {
       mainw->read_failed=FALSE;
       header_size=get_file_size(header_fd);
-  
+
       if (header_size<sizhead) {
-	g_free(old_hdrfile);
-	close (header_fd);
-	return FALSE;
-      }
-      else {
-	mainw->read_failed=FALSE;
-	lives_read_le(header_fd,&cfile->bpp,4,FALSE);
-	if (!mainw->read_failed)
-	  lives_read_le(header_fd,&cfile->fps,8,FALSE);
-	if (!mainw->read_failed)
-	  lives_read_le(header_fd,&cfile->hsize,4,FALSE);
-	if (!mainw->read_failed)
-	  lives_read_le(header_fd,&cfile->vsize,4,FALSE);
-	if (!mainw->read_failed)
-	  lives_read_le(header_fd,&cfile->arps,4,FALSE);
-	if (!mainw->read_failed)
-	  lives_read_le(header_fd,&cfile->signed_endian,4,FALSE);
-	if (!mainw->read_failed)
-	  lives_read_le(header_fd,&cfile->arate,4,FALSE);
-	if (!mainw->read_failed)
-	  lives_read_le(header_fd,&cfile->unique_id,8,FALSE);
-	if (!mainw->read_failed)
-	  lives_read_le(header_fd,&cfile->achans,4,FALSE);
-	if (!mainw->read_failed)
-	  lives_read_le(header_fd,&cfile->asampsize,4,FALSE);
-      
-	if (header_size>sizhead) {
-	  if (header_size-sizhead>31) {
-	    if (!mainw->read_failed)
-	      lives_read(header_fd,&version,31,FALSE);
-	    version[31]='\0';
-	  }
-	  else {
-	    if (!mainw->read_failed)
-	      lives_read(header_fd,&version,header_size-sizhead,FALSE);
-	    version[header_size-sizhead]='\0';
-	  }
-	}
+        lives_free(old_hdrfile);
+        close(header_fd);
+        return FALSE;
+      } else {
+        mainw->read_failed=FALSE;
+        lives_read_le(header_fd,&cfile->bpp,4,FALSE);
+        if (!mainw->read_failed)
+          lives_read_le(header_fd,&cfile->fps,8,FALSE);
+        if (!mainw->read_failed)
+          lives_read_le(header_fd,&cfile->hsize,4,FALSE);
+        if (!mainw->read_failed)
+          lives_read_le(header_fd,&cfile->vsize,4,FALSE);
+        if (!mainw->read_failed)
+          lives_read_le(header_fd,&cfile->arps,4,FALSE);
+        if (!mainw->read_failed)
+          lives_read_le(header_fd,&cfile->signed_endian,4,FALSE);
+        if (!mainw->read_failed)
+          lives_read_le(header_fd,&cfile->arate,4,FALSE);
+        if (!mainw->read_failed)
+          lives_read_le(header_fd,&cfile->unique_id,8,FALSE);
+        if (!mainw->read_failed)
+          lives_read_le(header_fd,&cfile->achans,4,FALSE);
+        if (!mainw->read_failed)
+          lives_read_le(header_fd,&cfile->asampsize,4,FALSE);
+
+        if (header_size>sizhead) {
+          if (header_size-sizhead>31) {
+            if (!mainw->read_failed)
+              lives_read(header_fd,&version,31,FALSE);
+            version[31]='\0';
+          } else {
+            if (!mainw->read_failed)
+              lives_read(header_fd,&version,header_size-sizhead,FALSE);
+            version[header_size-sizhead]='\0';
+          }
+        }
       }
       close(header_fd);
     }
 
     if (mainw->read_failed) {
       retval=do_read_failed_error_s_with_retry(old_hdrfile,NULL,NULL);
-      if (retval==LIVES_CANCEL) {
-	g_free(old_hdrfile);
-	return FALSE;
+      if (retval==LIVES_RESPONSE_CANCEL) {
+        lives_free(old_hdrfile);
+        return FALSE;
       }
     }
-  } while (retval==LIVES_RETRY);
+  } while (retval==LIVES_RESPONSE_RETRY);
 
-  g_free(old_hdrfile);
+  lives_free(old_hdrfile);
 
   // handle version changes
   version_hash=verhash(version);
@@ -4486,13 +4403,13 @@
     cfile->arps=cfile->arate;
     cfile->signed_endian=mainw->endian;
   }
-  
-  com=g_strdup_printf("%s restore_details %s %s %d",prefs->backend_sync,cfile->handle,
-		      (tmp=g_filename_from_utf8 (file_name,-1,NULL,NULL,NULL)),!strcmp (file_name,"."));
+
+  com=lives_strdup_printf("%s restore_details %s %s %d",prefs->backend_sync,cfile->handle,
+                          (tmp=lives_filename_from_utf8(file_name,-1,NULL,NULL,NULL)),!strcmp(file_name,"."));
   mainw->com_failed=FALSE;
   lives_system(com,FALSE);
-  g_free(com);
-  g_free(tmp);
+  lives_free(com);
+  lives_free(tmp);
 
   if (mainw->com_failed) {
     mainw->com_failed=FALSE;
@@ -4508,11 +4425,11 @@
     alarm_handle=lives_alarm_set(LIVES_RESTORE_TIMEOUT);
 
     while (!((infofile=fopen(cfile->info_file,"r")) || (timeout=lives_alarm_get(alarm_handle)))) {
-      g_usleep(prefs->sleep_time);
+      lives_usleep(prefs->sleep_time);
     }
 
     lives_alarm_clear(alarm_handle);
-  
+
     if (!timeout) {
       mainw->read_failed=FALSE;
       lives_fgets(buff,1024,infofile);
@@ -4522,16 +4439,16 @@
     if (timeout || mainw->read_failed) {
       retval2=do_read_failed_error_s_with_retry(cfile->info_file,NULL,NULL);
     }
-  
-  } while (retval2==LIVES_RETRY);
 
-  if (retval2==LIVES_CANCEL) {
+  } while (retval2==LIVES_RESPONSE_RETRY);
+
+  if (retval2==LIVES_RESPONSE_CANCEL) {
     mainw->read_failed=FALSE;
     return FALSE;
   }
 
-  pieces=get_token_count (buff,'|');
-  array=g_strsplit(buff,"|",pieces);
+  pieces=get_token_count(buff,'|');
+  array=lives_strsplit(buff,"|",pieces);
   cfile->f_size=strtol(array[1],NULL,10);
   cfile->afilesize=strtol(array[2],NULL,10);
 
@@ -4543,29 +4460,29 @@
   cfile->frames=atoi(array[4]);
 
   cfile->bpp=(cfile->img_type==IMG_TYPE_JPEG)?24:32;
-  
+
   if (pieces>4&&array[5]!=NULL) {
-    g_snprintf (cfile->title,256,"%s",g_strstrip(array[4]));
+    lives_snprintf(cfile->title,256,"%s",lives_strstrip(array[4]));
   }
   if (pieces>5&&array[6]!=NULL) {
-    g_snprintf (cfile->author,256,"%s",g_strstrip(array[5]));
+    lives_snprintf(cfile->author,256,"%s",lives_strstrip(array[5]));
   }
   if (pieces>6&&array[7]!=NULL) {
-    g_snprintf (cfile->comment,256,"%s",g_strstrip(array[6]));
+    lives_snprintf(cfile->comment,256,"%s",lives_strstrip(array[6]));
   }
-  
-  g_strfreev(array);
+
+  lives_strfreev(array);
   return TRUE;
 }
 
 
-void open_set_file (const gchar *set_name, int clipnum) {
-  gchar name[256];
+void open_set_file(const char *set_name, int clipnum) {
+  char name[256];
   boolean needs_update=FALSE;
 
   if (mainw->current_file<1) return;
 
-  memset (name,0,256);
+  memset(name,0,256);
 
   if (mainw->cached_list!=NULL) {
     boolean retval;
@@ -4582,7 +4499,7 @@
 
     retval=get_clip_value(mainw->current_file,CLIP_DETAILS_CLIPNAME,name,256);
     if (!retval) {
-      g_snprintf(name,256,_ ("Untitled%d"),mainw->untitled_number++);
+      lives_snprintf(name,256,_("Untitled%d"),mainw->untitled_number++);
       needs_update=TRUE;
     }
     retval=get_clip_value(mainw->current_file,CLIP_DETAILS_UNIQUE_ID,&cfile->unique_id,0);
@@ -4597,41 +4514,38 @@
     }
     if (cfile->interlace!=LIVES_INTERLACE_NONE) cfile->deinterlace=TRUE;
 
-  }
-  else {
+  } else {
     // pre 0.9.6 <- ancient code
     ssize_t nlen;
     int set_fd;
     int pb_fps;
     int retval;
-    gchar *setfile=g_strdup_printf("%s/%s/set.%s",prefs->tmpdir,cfile->handle,set_name);
+    char *setfile=lives_strdup_printf("%s/%s/set.%s",prefs->tmpdir,cfile->handle,set_name);
 
     do {
       retval=0;
       if ((set_fd=open(setfile,O_RDONLY))>-1) {
-	// get perf_start
-	if ((nlen=lives_read_le(set_fd,&pb_fps,4,TRUE))>0) {
-	  cfile->pb_fps=pb_fps/1000.;
-	  lives_read_le(set_fd,&cfile->frameno,4,TRUE);
-	  lives_read(set_fd,name,256,TRUE);
-	}
-	close (set_fd);
-      }
-      else retval=do_read_failed_error_s_with_retry(setfile,g_strerror(errno),NULL);
-    } while (retval==LIVES_RETRY);
+        // get perf_start
+        if ((nlen=lives_read_le(set_fd,&pb_fps,4,TRUE))>0) {
+          cfile->pb_fps=pb_fps/1000.;
+          lives_read_le(set_fd,&cfile->frameno,4,TRUE);
+          lives_read(set_fd,name,256,TRUE);
+        }
+        close(set_fd);
+      } else retval=do_read_failed_error_s_with_retry(setfile,lives_strerror(errno),NULL);
+    } while (retval==LIVES_RESPONSE_RETRY);
 
-    g_free (setfile);
+    lives_free(setfile);
     needs_update=TRUE;
   }
 
   if (strlen(name)==0) {
-    g_snprintf (name,256,"set_clip %.3d",clipnum);
-  }
-  if (strlen(mainw->set_name)&&strcmp (name+strlen (name)-1,")")) {
-    g_snprintf (cfile->name,256,"%s (%s)",name,set_name);
+    lives_snprintf(name,256,"set_clip %.3d",clipnum);
   }
-  else {
-    g_snprintf (cfile->name,256,"%s",name);
+  if (strlen(mainw->set_name)&&strcmp(name+strlen(name)-1,")")) {
+    lives_snprintf(cfile->name,256,"%s (%s)",name,set_name);
+  } else {
+    lives_snprintf(cfile->name,256,"%s",name);
   }
 
   if (needs_update) save_clip_values(mainw->current_file);
@@ -4640,87 +4554,84 @@
 
 
 
-void restore_file(const gchar *file_name) {
-  gchar *com=g_strdup("dummy");
-  gchar *mesg,*mesg1,*tmp;
+ulong restore_file(const char *file_name) {
+  char *com=lives_strdup("dummy");
+  char *mesg,*mesg1,*tmp;
   boolean is_OK=TRUE;
-  gchar *fname=g_strdup(file_name);
+  char *fname=lives_strdup(file_name);
 
   int old_file=mainw->current_file,current_file;
   int new_file=mainw->first_free_file;
   boolean not_cancelled;
 
-  gchar *subfname;
+  char *subfname;
 
   // create a new file
   if (!get_new_handle(new_file,fname)) {
-    return;
+    return 0;
   }
-  
 
-  mesg=g_strdup_printf(_ ("Restoring %s..."),file_name);
-  d_print(mesg);
-  g_free(mesg);
-  
+  d_print(_("Restoring %s..."),file_name);
+
   mainw->current_file=new_file;
-  
+
   cfile->hsize=mainw->def_width;
   cfile->vsize=mainw->def_height;
-  
+
   switch_to_file((mainw->current_file=old_file),new_file);
   set_main_title(cfile->file_name,0);
-  
-  
-  com=g_strdup_printf("%s restore %s %s",prefs->backend,cfile->handle,
-		      (tmp=g_filename_from_utf8(file_name,-1,NULL,NULL,NULL)));
+
+
+  com=lives_strdup_printf("%s restore %s %s",prefs->backend,cfile->handle,
+                          (tmp=lives_filename_from_utf8(file_name,-1,NULL,NULL,NULL)));
 
   mainw->com_failed=FALSE;
-  unlink (cfile->info_file);
+  unlink(cfile->info_file);
 
   lives_system(com,FALSE);
 
-  g_free(tmp);
-  g_free(com);
-  
+  lives_free(tmp);
+  lives_free(com);
+
   if (mainw->com_failed) {
     mainw->com_failed=FALSE;
     close_current_file(old_file);
-    return;
+    return 0;
   }
 
   cfile->restoring=TRUE;
-  not_cancelled=do_progress_dialog(TRUE,TRUE,_ ("Restoring"));
+  not_cancelled=do_progress_dialog(TRUE,TRUE,_("Restoring"));
   cfile->restoring=FALSE;
 
   if (mainw->error||!not_cancelled) {
     if (mainw->error && mainw->cancelled!=CANCEL_ERROR) {
-      do_blocking_error_dialog (mainw->msg);
+      do_blocking_error_dialog(mainw->msg);
     }
     close_current_file(old_file);
-    return;
+    return 0;
   }
-  
+
   // call function to return rest of file details
   //fsize, afilesize and frames
   is_OK=read_headers(file_name);
 
   if (mainw->cached_list!=NULL) {
-    g_list_free_strings(mainw->cached_list);
-    g_list_free(mainw->cached_list);
+    lives_list_free_strings(mainw->cached_list);
+    lives_list_free(mainw->cached_list);
     mainw->cached_list=NULL;
   }
 
   if (!is_OK) {
-    mesg=g_strdup_printf(_ ("\n\nThe file %s is corrupt.\nLiVES was unable to restore it.\n"),file_name);
+    mesg=lives_strdup_printf(_("\n\nThe file %s is corrupt.\nLiVES was unable to restore it.\n"),file_name);
     do_blocking_error_dialog(mesg);
-    g_free(mesg);
-    
+    lives_free(mesg);
+
     d_print_failed();
     close_current_file(old_file);
-    return;
+    return 0;
   }
   if (!check_frame_count(mainw->current_file)) get_frame_count(mainw->current_file);
-  
+
   // add entry to window menu
   // TODO - do this earlier and allow switching during restore
   add_to_clipmenu();
@@ -4731,8 +4642,7 @@
 
   if (cfile->frames>0) {
     cfile->start=1;
-  }
-  else {
+  } else {
     cfile->start=0;
   }
   cfile->end=cfile->frames;
@@ -4744,34 +4654,33 @@
   cfile->changed=FALSE;
 
   if (prefs->autoload_subs) {
-    subfname=g_strdup_printf("%s/%s/subs.srt",prefs->tmpdir,cfile->handle);
-    if (g_file_test(subfname,G_FILE_TEST_EXISTS)) {
+    subfname=lives_strdup_printf("%s/%s/subs.srt",prefs->tmpdir,cfile->handle);
+    if (lives_file_test(subfname,LIVES_FILE_TEST_EXISTS)) {
       subtitles_init(cfile,subfname,SUBTITLE_TYPE_SRT);
-    }
-    else {
-      g_free(subfname);
-      subfname=g_strdup_printf("%s/%s/subs.sub",prefs->tmpdir,cfile->handle);
-      if (g_file_test(subfname,G_FILE_TEST_EXISTS)) {
-	subtitles_init(cfile,subfname,SUBTITLE_TYPE_SUB);
+    } else {
+      lives_free(subfname);
+      subfname=lives_strdup_printf("%s/%s/subs.sub",prefs->tmpdir,cfile->handle);
+      if (lives_file_test(subfname,LIVES_FILE_TEST_EXISTS)) {
+        subtitles_init(cfile,subfname,SUBTITLE_TYPE_SUB);
       }
     }
-    g_free(subfname);
+    lives_free(subfname);
   }
 
-  g_snprintf(cfile->type,40,"Frames");
-  mesg1=g_strdup_printf(_ ("Frames=%d type=%s size=%dx%d bpp=%d fps=%.3f\nAudio:"),cfile->frames,cfile->type,cfile->hsize,cfile->vsize,cfile->bpp,cfile->fps);
+  lives_snprintf(cfile->type,40,"Frames");
+  mesg1=lives_strdup_printf(_("Frames=%d type=%s size=%dx%d bpp=%d fps=%.3f\nAudio:"),cfile->frames,cfile->type,
+                            cfile->hsize,cfile->vsize,cfile->bpp,cfile->fps);
 
   if (cfile->afilesize==0l) {
     cfile->achans=0;
-    mesg=g_strdup_printf (_ ("%s none\n"),mesg1);
-  }
-  else {
-    mesg=g_strdup_printf(P_ ("%s %d Hz %d channel %d bps\n","%s %d Hz %d channels %d bps\n",cfile->achans),
-			 mesg1,cfile->arate,cfile->achans,cfile->asampsize);
+    mesg=lives_strdup_printf(_("%s none\n"),mesg1);
+  } else {
+    mesg=lives_strdup_printf(P_("%s %d Hz %d channel %d bps\n","%s %d Hz %d channels %d bps\n",cfile->achans),
+                             mesg1,cfile->arate,cfile->achans,cfile->asampsize);
   }
   d_print(mesg);
-  g_free(mesg);
-  g_free(mesg1);
+  lives_free(mesg);
+  lives_free(mesg1);
 
   cfile->is_loaded=TRUE;
   current_file=mainw->current_file;
@@ -4781,17 +4690,16 @@
 
   if (!save_clip_values(current_file)) {
     close_current_file(old_file);
-    return;
+    return 0;
   }
 
   if (prefs->crash_recovery) add_to_recovery_file(cfile->handle);
 
   switch_to_file((mainw->current_file=old_file),current_file);
 
-#ifdef ENABLE_OSC
-    lives_osc_notify(LIVES_OSC_NOTIFY_CLIP_OPENED,"");
-#endif
+  lives_notify(LIVES_OSC_NOTIFY_CLIP_OPENED,"");
 
+  return cfile->unique_id;
 }
 
 
@@ -4801,7 +4709,7 @@
 
   // here we also update the frame_index for clips of type CLIP_TYPE_FILE
 
-  gchar *hdrfile=g_strdup_printf("%s/%s/event.frames",prefs->tmpdir,cfile->handle);
+  char *hdrfile=lives_strdup_printf("%s/%s/event.frames",prefs->tmpdir,cfile->handle);
 
   int header_fd,i=0;
   int retval;
@@ -4809,25 +4717,25 @@
   int nevents;
 
   if (cfile->event_list==NULL) {
-    unlink (hdrfile);
+    unlink(hdrfile);
     return -1;
   }
-  
-  perf_start=(int)(cfile->fps*event_list_get_start_secs (cfile->event_list))+1;
-  perf_end=perf_start+(nevents=count_events (cfile->event_list,FALSE,0,0))-1;
-  
-  event_list_to_block (cfile->event_list,nevents);
+
+  perf_start=(int)(cfile->fps*event_list_get_start_secs(cfile->event_list))+1;
+  perf_end=perf_start+(nevents=count_events(cfile->event_list,FALSE,0,0))-1;
+
+  event_list_to_block(cfile->event_list,nevents);
 
   if (cfile->frame_index!=NULL) {
     int xframes=cfile->frames;
 
-    if (cfile->frame_index_back!=NULL) g_free(cfile->frame_index_back);
+    if (cfile->frame_index_back!=NULL) lives_free(cfile->frame_index_back);
     cfile->frame_index_back=cfile->frame_index;
     cfile->frame_index=NULL;
 
     create_frame_index(mainw->current_file,FALSE,0,nevents);
 
-    for (i=0;i<nevents;i++) {
+    for (i=0; i<nevents; i++) {
       cfile->frame_index[i]=cfile->frame_index_back[(cfile->events[0]+i)->value-1];
     }
 
@@ -4840,39 +4748,38 @@
     retval=0;
     header_fd=creat(hdrfile,S_IRUSR|S_IWUSR);
     if (header_fd<0) {
-      retval=do_write_failed_error_s_with_retry(hdrfile,g_strerror(errno),NULL);
-    }
-    else {
+      retval=do_write_failed_error_s_with_retry(hdrfile,lives_strerror(errno),NULL);
+    } else {
       // use machine endian.
       // When we call "smogrify reorder", we will pass the endianness as 3rd parameter
 
       mainw->write_failed=FALSE;
       lives_write(header_fd,&perf_start,4,FALSE);
-      
+
       if (!(cfile->events[0]==NULL)) {
-	for (i=0;i<=perf_end-perf_start;i++) {
-	  if (mainw->write_failed) break;
-	  lives_write(header_fd,&((cfile->events[0]+i)->value),4,TRUE);
-	}
-	g_free (cfile->events[0]);
-	cfile->events[0]=NULL;
+        for (i=0; i<=perf_end-perf_start; i++) {
+          if (mainw->write_failed) break;
+          lives_write(header_fd,&((cfile->events[0]+i)->value),4,TRUE);
+        }
+        lives_free(cfile->events[0]);
+        cfile->events[0]=NULL;
       }
 
       if (mainw->write_failed) {
-	retval=do_write_failed_error_s_with_retry(hdrfile,NULL,NULL);
+        retval=do_write_failed_error_s_with_retry(hdrfile,NULL,NULL);
       }
 
       close(header_fd);
 
     }
-  } while (retval==LIVES_RETRY);
+  } while (retval==LIVES_RESPONSE_RETRY);
 
 
-  if (retval==LIVES_CANCEL) {
+  if (retval==LIVES_RESPONSE_CANCEL) {
     i=-1;
   }
 
-  g_free(hdrfile);
+  lives_free(hdrfile);
   return i;
 }
 
@@ -4893,33 +4800,37 @@
 static double ascrap_mb;  // MB written to audio file
 static uint64_t free_mb; // MB free to write
 
-boolean open_scrap_file (void) {
+boolean open_scrap_file(void) {
   // create a scrap file for recording generated video frames
   int current_file=mainw->current_file;
   int new_file=mainw->first_free_file;
-  
-  gchar *dir;
-  gchar *scrap_handle;
 
-  if (!get_temp_handle (new_file,TRUE)) return FALSE;
+  char *dir;
+  char *scrap_handle;
+
+  if (!get_temp_handle(new_file,TRUE)) return FALSE;
   get_next_free_file();
 
   mainw->scrap_file=mainw->current_file=new_file;
 
-  g_snprintf(cfile->type,40,"scrap");
+  lives_snprintf(cfile->type,40,"scrap");
   cfile->frames=0;
 
-  scrap_handle=g_strdup_printf("scrap|%s",cfile->handle);
+  cfile->unique_id=0;
+
+  scrap_handle=lives_strdup_printf("scrap|%s",cfile->handle);
 
   add_to_recovery_file(scrap_handle);
 
-  mainw->cliplist = g_list_append (mainw->cliplist, GINT_TO_POINTER (mainw->current_file));
+  pthread_mutex_lock(&mainw->clip_list_mutex);
+  mainw->cliplist = lives_list_append(mainw->cliplist, LIVES_INT_TO_POINTER(mainw->current_file));
+  pthread_mutex_unlock(&mainw->clip_list_mutex);
 
-  g_free(scrap_handle);
+  lives_free(scrap_handle);
 
-  dir=g_build_filename(prefs->tmpdir,cfile->handle,NULL);
+  dir=lives_build_filename(prefs->tmpdir,cfile->handle,NULL);
   free_mb=(double)get_fs_free(dir)/1000000.;
-  g_free(dir);
+  lives_free(dir);
 
   mainw->current_file=current_file;
 
@@ -4931,35 +4842,38 @@
 
 
 
-boolean open_ascrap_file (void) {
+boolean open_ascrap_file(void) {
   // create a scrap file for recording audio
   int current_file=mainw->current_file;
   int new_file=mainw->first_free_file;
-  
-  gchar *dir;
-  gchar *ascrap_handle;
 
-  if (!get_temp_handle (new_file,TRUE)) return FALSE;
+  char *dir;
+  char *ascrap_handle;
+
+  if (!get_temp_handle(new_file,TRUE)) return FALSE;
   get_next_free_file();
 
   mainw->ascrap_file=mainw->current_file=new_file;
 
-  g_snprintf(cfile->type,40,"ascrap");
+  lives_snprintf(cfile->type,40,"ascrap");
 
   cfile->frames=0;
+  cfile->unique_id=0;
   cfile->opening=FALSE;
 
-  ascrap_handle=g_strdup_printf("ascrap|%s",cfile->handle);
+  ascrap_handle=lives_strdup_printf("ascrap|%s",cfile->handle);
 
   add_to_recovery_file(ascrap_handle);
 
-  mainw->cliplist = g_list_append (mainw->cliplist, GINT_TO_POINTER (mainw->current_file));
+  pthread_mutex_lock(&mainw->clip_list_mutex);
+  mainw->cliplist = lives_list_append(mainw->cliplist, LIVES_INT_TO_POINTER(mainw->current_file));
+  pthread_mutex_unlock(&mainw->clip_list_mutex);
 
-  g_free(ascrap_handle);
+  lives_free(ascrap_handle);
 
-  dir=g_build_filename(prefs->tmpdir,cfile->handle,NULL);
+  dir=lives_build_filename(prefs->tmpdir,cfile->handle,NULL);
   free_mb=(double)get_fs_free(dir)/1000000.;
-  g_free(dir);
+  lives_free(dir);
 
   mainw->current_file=current_file;
 
@@ -4988,7 +4902,7 @@
 
   int i,fd;
 
-  gchar *oname=g_strdup_printf ("%s/%s/%08d.scrap",prefs->tmpdir,mainw->files[mainw->scrap_file]->handle,frame);
+  char *oname=lives_strdup_printf("%s/%s/%08d.scrap",prefs->tmpdir,mainw->files[mainw->scrap_file]->handle,frame);
 
 
   ssize_t bytes;
@@ -5018,12 +4932,12 @@
 
     bytes=lives_read_le(fd,&subspace,4,TRUE);
     if (bytes<4) return FALSE;
-    
+
     weed_set_int_value(layer,"YUV_subspace",subspace);
 
     bytes=lives_read_le(fd,&sampling,4,TRUE);
     if (bytes<4) return FALSE;
-    
+
     weed_set_int_value(layer,"YUV_sampling",sampling);
   }
 
@@ -5042,51 +4956,51 @@
 
   nplanes=weed_palette_get_numplanes(palette);
 
-  rowstrides=(int *)g_malloc(nplanes*sizint);
+  rowstrides=(int *)lives_malloc(nplanes*sizint);
 
-  for (i=0;i<nplanes;i++) {
+  for (i=0; i<nplanes; i++) {
     bytes=lives_read_le(fd,&rowstrides[i],4,TRUE);
     if (bytes<4) {
-      g_free(rowstrides);
+      lives_free(rowstrides);
       return FALSE;
     }
   }
 
   weed_set_int_array(layer,"rowstrides",nplanes,rowstrides);
 
-  pdata=(void **)g_malloc(nplanes*sizeof(void *));
+  pdata=(void **)lives_malloc(nplanes*sizeof(void *));
 
-  for (i=0;i<nplanes;i++) {
+  for (i=0; i<nplanes; i++) {
     pdata[i]=NULL;
   }
 
   weed_set_voidptr_array(layer,"pixel_data",nplanes,pdata);
 
-  for (i=0;i<nplanes;i++) {
+  for (i=0; i<nplanes; i++) {
     tsize=rowstrides[i]*height*weed_palette_get_plane_ratio_vertical(palette,i);
-    pdata[i]=g_malloc(tsize);
+    pdata[i]=lives_malloc(tsize);
     bytes=read(fd,pdata[i],tsize);
     if (bytes<tsize) {
-      g_free(rowstrides);
-      g_free(pdata);
+      lives_free(rowstrides);
+      lives_free(pdata);
       return FALSE;
     }
   }
 
-  g_free(rowstrides);
+  lives_free(rowstrides);
 
   weed_set_voidptr_array(layer,"pixel_data",nplanes,pdata);
-  g_free(pdata);
+  lives_free(pdata);
 
 
-  close (fd);
+  close(fd);
 
   return TRUE;
 }
 
 
 
-int save_to_scrap_file (weed_plant_t *layer) {
+int save_to_scrap_file(weed_plant_t *layer) {
   // returns frame number
 
   // dump the raw frame data to a file (in machine endian format)
@@ -5101,7 +5015,7 @@
 
   int fd;
   int flags=O_WRONLY|O_CREAT|O_TRUNC;
-  
+
   int width,height,palette,nplanes,error;
   int *rowstrides;
 
@@ -5113,10 +5027,10 @@
 
   void **pdata;
 
-  gchar *oname=g_strdup_printf ("%s/%s/%08d.scrap",prefs->tmpdir,mainw->files[mainw->scrap_file]->handle,
-				mainw->files[mainw->scrap_file]->frames+1);
+  char *oname=lives_strdup_printf("%s/%s/%08d.scrap",prefs->tmpdir,mainw->files[mainw->scrap_file]->handle,
+                                  mainw->files[mainw->scrap_file]->frames+1);
 
-  gchar *framecount;
+  char *framecount;
 
   struct stat filestat;
 
@@ -5127,7 +5041,7 @@
   fd=open(oname,flags,S_IRUSR|S_IWUSR);
 
   if (fd==-1) {
-    g_free(oname);
+    lives_free(oname);
     return mainw->files[mainw->scrap_file]->frames;
   }
 
@@ -5142,27 +5056,24 @@
   lives_write_le(fd,&palette,4,TRUE);
 
   if (mainw->write_failed) {
-    g_free(oname);
+    lives_free(oname);
     return mainw->files[mainw->scrap_file]->frames;
   }
 
   if (weed_palette_is_yuv_palette(palette)) {
     if (weed_plant_has_leaf(layer,"YUV_clamping")) {
       clamping=weed_get_int_value(layer,"YUV_clamping",&error);
-    }
-    else clamping=WEED_YUV_CLAMPING_CLAMPED;
+    } else clamping=WEED_YUV_CLAMPING_CLAMPED;
     lives_write_le(fd,&clamping,4,TRUE);
 
     if (weed_plant_has_leaf(layer,"YUV_subspace")) {
       subspace=weed_get_int_value(layer,"YUV_subspace",&error);
-    }
-    else subspace=WEED_YUV_SUBSPACE_YUV;
+    } else subspace=WEED_YUV_SUBSPACE_YUV;
     lives_write_le(fd,&subspace,4,TRUE);
 
     if (weed_plant_has_leaf(layer,"YUV_sampling")) {
       sampling=weed_get_int_value(layer,"YUV_sampling",&error);
-    }
-    else sampling=WEED_YUV_SAMPLING_DEFAULT;
+    } else sampling=WEED_YUV_SAMPLING_DEFAULT;
     lives_write_le(fd,&sampling,4,TRUE);
   }
 
@@ -5173,78 +5084,76 @@
   lives_write_le(fd,&height,4,TRUE);
 
   nplanes=weed_palette_get_numplanes(palette);
-  
+
   rowstrides=weed_get_int_array(layer,"rowstrides",&error);
-  
-  for (i=0;i<nplanes;i++) {
+
+  for (i=0; i<nplanes; i++) {
     lives_write_le(fd,&rowstrides[i],4,TRUE);
   }
-  
-   
+
+
   // now write pixel_data planes
-  
+
   pdata=weed_get_voidptr_array(layer,"pixel_data",&error);
-  
-  for (i=0;i<nplanes;i++) {
+
+  for (i=0; i<nplanes; i++) {
     lives_write(fd,pdata[i],rowstrides[i]*height*weed_palette_get_plane_ratio_vertical(palette,i),TRUE);
   }
-  
+
   fstat(fd,&filestat);
 
   scrap_mb+=(double)(filestat.st_size)/1000000.;
 
   // check free space every 1000 frames or every 10 MB of audio (TODO ****)
   if (mainw->files[mainw->scrap_file]->frames%1000==0) {
-    gchar *dir=g_build_filename(prefs->tmpdir,mainw->files[mainw->scrap_file]->handle,NULL);
+    char *dir=lives_build_filename(prefs->tmpdir,mainw->files[mainw->scrap_file]->handle,NULL);
     free_mb=(double)get_fs_free(dir)/1000000.;
     if (free_mb==0) wrtable=is_writeable_dir(dir);
-    g_free(dir);
+    lives_free(dir);
   }
 
   if ((!mainw->fs||prefs->play_monitor!=prefs->gui_monitor)&&prefs->show_framecount) {
     if ((scrap_mb+ascrap_mb)<(double)free_mb*.75) {
       // TRANSLATORS: rec(ord) %.2f M(ega)B(ytes)
-      framecount=g_strdup_printf(_("rec %.2f MB"),scrap_mb+ascrap_mb);
-    }
-    else {
+      framecount=lives_strdup_printf(_("rec %.2f MB"),scrap_mb+ascrap_mb);
+    } else {
       // warn if scrap_file > 3/4 of free space
       // TRANSLATORS: !rec(ord) %.2f M(ega)B(ytes)
       if (wrtable)
-	framecount=g_strdup_printf(_("!rec %.2f MB"),scrap_mb+ascrap_mb);
+        framecount=lives_strdup_printf(_("!rec %.2f MB"),scrap_mb+ascrap_mb);
       else
-	// TRANSLATORS: rec(ord) ?? M(ega)B(ytes)
-	framecount=g_strdup(_("rec ?? MB"));
+        // TRANSLATORS: rec(ord) ?? M(ega)B(ytes)
+        framecount=lives_strdup(_("rec ?? MB"));
     }
     lives_entry_set_text(LIVES_ENTRY(mainw->framecounter),framecount);
-    g_free(framecount);
+    lives_free(framecount);
   }
 
   lives_fsync(fd); // try to sync file access, to make saving smoother
   close(fd);
 
-  weed_free(rowstrides);
-  weed_free(pdata);
+  lives_free(rowstrides);
+  lives_free(pdata);
 
-  g_free(oname);
+  lives_free(oname);
 
   // check if we have enough free space left on the volume
   if ((int64_t)(((double)free_mb-(scrap_mb+ascrap_mb))/1000.)<prefs->rec_stop_gb) {
     // check free space again
-    gchar *dir=g_build_filename(prefs->tmpdir,mainw->files[mainw->scrap_file]->handle,NULL);
+    char *dir=lives_build_filename(prefs->tmpdir,mainw->files[mainw->scrap_file]->handle,NULL);
     free_mb=(double)get_fs_free(dir)/1000000.;
     if (free_mb==0) wrtable=is_writeable_dir(dir);
     else wrtable=TRUE;
 
     if (wrtable) {
       if ((int64_t)(((double)free_mb-(scrap_mb+ascrap_mb))/1000.)<prefs->rec_stop_gb) {
-	if (mainw->record&&!mainw->record_paused) {
-	  gchar *msg=g_strdup_printf(_("\nRECORDING WAS PAUSED BECAUSE FREE DISK SPACE in %s IS BELOW %d GB !\nRecord stop level can be set in Preferences.\n"),dir,prefs->rec_stop_gb);
-	  d_print(msg);
-	  g_free(msg);
-	  on_record_perf_activate(NULL,NULL);
-	}
+        if (mainw->record&&!mainw->record_paused) {
+          d_print(_("\nRECORDING WAS PAUSED BECAUSE FREE DISK SPACE in %s IS BELOW %d GB !\nRecord stop level can be set in Preferences.\n"),
+                  dir,prefs->rec_stop_gb);
+          on_record_perf_activate(NULL,NULL);
+        }
       }
-      g_free(dir);
+      lives_free(dir);
     }
   }
   return ++mainw->files[mainw->scrap_file]->frames;
@@ -5253,7 +5162,7 @@
 
 
 
-void close_scrap_file (void) {
+void close_scrap_file(void) {
   int current_file=mainw->current_file;
 
   if (mainw->scrap_file==-1) return;
@@ -5261,7 +5170,9 @@
   mainw->current_file=mainw->scrap_file;
   close_current_file(current_file);
 
-  mainw->cliplist=g_list_remove (mainw->cliplist, GINT_TO_POINTER (mainw->scrap_file));
+  pthread_mutex_lock(&mainw->clip_list_mutex);
+  mainw->cliplist=lives_list_remove(mainw->cliplist, LIVES_INT_TO_POINTER(mainw->scrap_file));
+  pthread_mutex_unlock(&mainw->clip_list_mutex);
 
   if (prefs->crash_recovery) rewrite_recovery_file();
 
@@ -5270,7 +5181,7 @@
 
 
 
-void close_ascrap_file (void) {
+void close_ascrap_file(void) {
   int current_file=mainw->current_file;
 
   if (mainw->ascrap_file==-1) return;
@@ -5278,7 +5189,9 @@
   mainw->current_file=mainw->ascrap_file;
   close_current_file(current_file);
 
-  mainw->cliplist=g_list_remove (mainw->cliplist, GINT_TO_POINTER (mainw->ascrap_file));
+  pthread_mutex_lock(&mainw->clip_list_mutex);
+  mainw->cliplist=lives_list_remove(mainw->cliplist, LIVES_INT_TO_POINTER(mainw->ascrap_file));
+  pthread_mutex_unlock(&mainw->clip_list_mutex);
 
   if (prefs->crash_recovery) rewrite_recovery_file();
 
@@ -5289,13 +5202,13 @@
 
 void recover_layout_map(int numclips) {
   // load global layout map for a set and assign entries to clips [mainw->files[i]->layout_map]
-  GList *omlist,*mlist,*lmap_node,*lmap_node_next,*lmap_entry_list,*lmap_entry_list_next;
+  LiVESList *omlist,*mlist,*lmap_node,*lmap_node_next,*lmap_entry_list,*lmap_entry_list_next;
 
   layout_map *lmap_entry;
 
-  gchar **array;
-  gchar *check_handle;
-  
+  char **array;
+  char *check_handle;
+
   if (numclips>MAX_FILES) numclips=MAX_FILES;
 
   if ((omlist=load_layout_map())!=NULL) {
@@ -5304,211 +5217,210 @@
     mlist=omlist;
 
     // assign layout map to clips
-    for (i=1;i<=numclips;i++) {
+    for (i=1; i<=numclips; i++) {
       if (mainw->files[i]==NULL) continue;
       lmap_node=mlist;
       while (lmap_node!=NULL) {
-	lmap_node_next=lmap_node->next;
-	lmap_entry=(layout_map *)lmap_node->data;
+        lmap_node_next=lmap_node->next;
+        lmap_entry=(layout_map *)lmap_node->data;
 
-	check_handle=g_strdup(mainw->files[i]->handle);
+        check_handle=lives_strdup(mainw->files[i]->handle);
 
-	if (strstr(lmap_entry->handle,"/")==NULL) {
-	  g_free(check_handle);
-	  check_handle=g_path_get_basename(mainw->files[i]->handle);
-	}
-
-	if (!strcmp(check_handle,lmap_entry->handle)&&(mainw->files[i]->unique_id==lmap_entry->unique_id)) {
-	  // check handle and unique id match
-	  // got a match, assign list to layout_map and delete this node
-	  lmap_entry_list=lmap_entry->list;
-	  while (lmap_entry_list!=NULL) {
-	    lmap_entry_list_next=lmap_entry_list->next;
-	    array=g_strsplit((gchar *)lmap_entry_list->data,"|",-1);
-	    if (!g_file_test(array[0],G_FILE_TEST_EXISTS)) {
-	      // layout file has been deleted, remove this entry
-	      if (lmap_entry_list->prev!=NULL) lmap_entry_list->prev->next=lmap_entry_list_next;
-	      else lmap_entry->list=lmap_node_next;
-	      if (lmap_entry_list_next!=NULL) lmap_entry_list_next->prev=lmap_entry_list->prev;
-	      g_free(lmap_entry_list->data);
-	      //g_free(lmap_entry_list);    // i don't know why, but this causes a segfault
-	    }
-	    g_strfreev(array);
-	    lmap_entry_list=lmap_entry_list_next;
-	  }
-	  mainw->files[i]->layout_map=lmap_entry->list;
-	  g_free(lmap_entry->handle);
-	  g_free(lmap_entry->name);
-	  g_free(lmap_entry);
-	  if (lmap_node->prev!=NULL) lmap_node->prev->next=lmap_node_next;
-	  else mlist=lmap_node_next;
-	  if (lmap_node_next!=NULL) lmap_node_next->prev=lmap_node->prev;
-	  //g_free(lmap_node);   // i don't know why, but this causes a segfault
-	}
+        if (strstr(lmap_entry->handle,"/")==NULL) {
+          lives_free(check_handle);
+          check_handle=lives_path_get_basename(mainw->files[i]->handle);
+        }
+
+        if (!strcmp(check_handle,lmap_entry->handle)&&(mainw->files[i]->unique_id==lmap_entry->unique_id)) {
+          // check handle and unique id match
+          // got a match, assign list to layout_map and delete this node
+          lmap_entry_list=lmap_entry->list;
+          while (lmap_entry_list!=NULL) {
+            lmap_entry_list_next=lmap_entry_list->next;
+            array=lives_strsplit((char *)lmap_entry_list->data,"|",-1);
+            if (!lives_file_test(array[0],LIVES_FILE_TEST_EXISTS)) {
+              // layout file has been deleted, remove this entry
+              if (lmap_entry_list->prev!=NULL) lmap_entry_list->prev->next=lmap_entry_list_next;
+              else lmap_entry->list=lmap_node_next;
+              if (lmap_entry_list_next!=NULL) lmap_entry_list_next->prev=lmap_entry_list->prev;
+              lives_free((livespointer)lmap_entry_list->data);
+              //lives_free(lmap_entry_list);    // i don't know why, but this causes a segfault
+            }
+            lives_strfreev(array);
+            lmap_entry_list=lmap_entry_list_next;
+          }
+          mainw->files[i]->layout_map=lmap_entry->list;
+          lives_free(lmap_entry->handle);
+          lives_free(lmap_entry->name);
+          lives_free(lmap_entry);
+          if (lmap_node->prev!=NULL) lmap_node->prev->next=lmap_node_next;
+          else mlist=lmap_node_next;
+          if (lmap_node_next!=NULL) lmap_node_next->prev=lmap_node->prev;
+          //lives_free(lmap_node);   // i don't know why, but this causes a segfault
+        }
 
-	g_free(check_handle);
-	lmap_node=lmap_node_next;
+        lives_free(check_handle);
+        lmap_node=lmap_node_next;
       }
     }
-  
+
     lmap_node=mlist;
     while (lmap_node!=NULL) {
       lmap_entry=(layout_map *)lmap_node->data;
-      if (lmap_entry->name!=NULL) g_free(lmap_entry->name);
-      if (lmap_entry->handle!=NULL) g_free(lmap_entry->handle);
+      if (lmap_entry->name!=NULL) lives_free(lmap_entry->name);
+      if (lmap_entry->handle!=NULL) lives_free(lmap_entry->handle);
       if (lmap_entry->list!=NULL) {
-	g_list_free_strings(lmap_entry->list);
-	g_list_free(lmap_entry->list);
+        lives_list_free_strings(lmap_entry->list);
+        lives_list_free(lmap_entry->list);
       }
       lmap_node=lmap_node->next;
     }
-    if (omlist!=NULL) g_list_free(omlist);
+    if (omlist!=NULL) lives_list_free(omlist);
 
   }
 }
 
 
 
- boolean reload_clip(int fileno) {
-   // cd to clip directory - so decoder plugins can write temp files
+boolean reload_clip(int fileno) {
+  // cd to clip directory - so decoder plugins can write temp files
+
+  lives_clip_t *sfile=mainw->files[fileno];
+
+  char *ppath=lives_build_filename(prefs->tmpdir,sfile->handle,NULL);
+
+  const lives_clip_data_t *cdata=NULL;
+
+  lives_clip_data_t *fake_cdata=(lives_clip_data_t *)lives_calloc(sizeof(lives_clip_data_t),1);
+
+  boolean was_renamed=FALSE;
+
+  lives_chdir(ppath,FALSE);
+  lives_free(ppath);
+
+  while (1) {
+    threaded_dialog_spin();
+
+    fake_cdata->URI=lives_strdup(sfile->file_name);
+    fake_cdata->fps=sfile->fps;
+    fake_cdata->nframes=sfile->frames;
+
+    if ((cdata=get_decoder_cdata(fileno,prefs->disabled_decoders,fake_cdata->fps!=0.?fake_cdata:NULL))==NULL) {
+      if (mainw->error) {
+        if (do_original_lost_warning(sfile->file_name)) {
+          int resp;
+          char fname[PATH_MAX],dirname[PATH_MAX],*newname;
+          LiVESWidget *chooser;
+
+          lives_snprintf(dirname,PATH_MAX,"%s",sfile->file_name);
+          lives_snprintf(fname,PATH_MAX,"%s",sfile->file_name);
 
-   lives_clip_t *sfile=mainw->files[fileno];
+          get_dirname(dirname);
+          get_basename(fname);
 
-   gchar *ppath=g_build_filename(prefs->tmpdir,sfile->handle,NULL);
+          chooser=choose_file_with_preview(dirname,fname,LIVES_FILE_SELECTION_VIDEO_AUDIO);
 
-   const lives_clip_data_t *cdata=NULL;
+          resp=lives_dialog_run(LIVES_DIALOG(chooser));
 
-   lives_clip_data_t *fake_cdata=(lives_clip_data_t *)lives_calloc(sizeof(lives_clip_data_t),1);
-
-   boolean was_renamed=FALSE;
-
-   lives_chdir(ppath,FALSE);
-   g_free(ppath);
-
-   while (1) {
-     threaded_dialog_spin();
-
-     fake_cdata->URI=g_strdup(sfile->file_name);
-     fake_cdata->fps=sfile->fps;
-     fake_cdata->nframes=sfile->frames;
-
-     if ((cdata=get_decoder_cdata(fileno,prefs->disabled_decoders,fake_cdata->fps!=0.?fake_cdata:NULL))==NULL) {
-       if (mainw->error) {
-	 if (do_original_lost_warning(sfile->file_name)) {
-	   int resp;
-	   gchar fname[PATH_MAX],dirname[PATH_MAX],*newname;
-	   LiVESWidget *chooser;
-
-	   g_snprintf(dirname,PATH_MAX,"%s",sfile->file_name);
-	   g_snprintf(fname,PATH_MAX,"%s",sfile->file_name);
-
-	   get_dirname(dirname);
-	   get_basename(fname);
-
-	   chooser=choose_file_with_preview(dirname,fname,128);
-
-	   resp=lives_dialog_run(LIVES_DIALOG(chooser));
-
-	   if (resp==LIVES_RESPONSE_ACCEPT) {
-	     newname=lives_file_chooser_get_filename (LIVES_FILE_CHOOSER(chooser));
-	     lives_widget_destroy(LIVES_WIDGET(chooser));
-
-	     if (newname!=NULL) {
-	       if (strlen(newname)) {
-		 gchar *tmp;
-		 g_snprintf(sfile->file_name,PATH_MAX,"%s",(tmp=g_filename_to_utf8(newname,-1,NULL,NULL,NULL)));
-		 g_free(tmp);
-	       }
-	       g_free(newname);
-	     }
-
-	     if (fake_cdata->URI!=NULL) g_free(fake_cdata->URI);
-	     fake_cdata->URI=NULL;
-
-	     //re-scan for these
-	     sfile->fps=0.;
-	     sfile->frames=0;
-
-	     was_renamed=TRUE;
-	     continue;
-	   }
-	 }
-	 else {
-	   // deleted : TODO ** - show layout errors
-
-	 }
-	      
-       }
-       else {
-	 do_no_decoder_error(sfile->file_name);
-       }
-
-       // NOT found, switch to another clip (if any)
-
-       // index stuff
-       sfile=NULL;
-	    
-       if (fileno==mainw->current_file) {
-	 if (mainw->cliplist!=NULL) {
-	   GList *list_index;
-	   int index=-1;
-
-	   list_index=g_list_last (mainw->cliplist);
-	   do {
-	     if ((list_index=g_list_previous(list_index))==NULL) list_index=g_list_last (mainw->cliplist);
-	     index=GPOINTER_TO_INT (list_index->data);
-	   } while ((mainw->files[index]==NULL||
-		     ((index==mainw->scrap_file||index==mainw->ascrap_file)&&index>-1))&&index!=fileno);
-	   if (index==fileno) index=-1;
-
-	   mainw->current_file=index;
-	 }
-	 else mainw->current_file=-1;
-       }
-       if (fake_cdata->URI!=NULL) g_free(fake_cdata->URI);
-       g_free(fake_cdata);
-       return FALSE;
-     }
-     // got cdata
-     threaded_dialog_spin();
-     if (fake_cdata->URI!=NULL) g_free(fake_cdata->URI);
-     g_free(fake_cdata);
-     break;
-   }
-
-   sfile->clip_type=CLIP_TYPE_FILE;
-   get_mime_type(sfile->type,40,cdata);
-   if (!strcmp(prefs->image_ext,"png")) sfile->img_type=IMG_TYPE_PNG; // read_headers() will have set this to "jpeg" (default)
-   // we will set correct value in check_clip_integrity() if there are any real images
-
-   if (sfile->ext_src!=NULL) {
-     boolean bad_header=FALSE;
-     boolean correct=check_clip_integrity(fileno,cdata); // get correct img_type, fps, etc.
-     if (!correct||was_renamed) {
-       save_clip_values(fileno);
-       if (mainw->com_failed||mainw->write_failed) bad_header=TRUE;
-     }
-     else {
-       lives_decoder_t *dplug=(lives_decoder_t *)sfile->ext_src;
-       lives_decoder_sys_t *dpsys=(lives_decoder_sys_t *)dplug->decoder;
-       save_clip_value(fileno,CLIP_DETAILS_DECODER_NAME,dpsys->name);
-       if (mainw->com_failed||mainw->write_failed) bad_header=TRUE;
-     }
-	
-     if (bad_header) do_header_write_error(fileno);
-   }
+          end_fs_preview();
 
-   return TRUE;
+          if (resp==LIVES_RESPONSE_ACCEPT) {
+            newname=lives_file_chooser_get_filename(LIVES_FILE_CHOOSER(chooser));
+            lives_widget_destroy(LIVES_WIDGET(chooser));
 
- }
+            if (newname!=NULL) {
+              if (strlen(newname)) {
+                char *tmp;
+                lives_snprintf(sfile->file_name,PATH_MAX,"%s",(tmp=lives_filename_to_utf8(newname,-1,NULL,NULL,NULL)));
+                lives_free(tmp);
+              }
+              lives_free(newname);
+            }
 
+            if (fake_cdata->URI!=NULL) lives_free(fake_cdata->URI);
+            fake_cdata->URI=NULL;
 
-static boolean recover_files(gchar *recovery_file, boolean auto_recover) {
+            //re-scan for these
+            sfile->fps=0.;
+            sfile->frames=0;
+
+            was_renamed=TRUE;
+            continue;
+          }
+          lives_widget_destroy(LIVES_WIDGET(chooser));
+        } else {
+          // deleted : TODO ** - show layout errors
+
+        }
+
+      } else {
+        do_no_decoder_error(sfile->file_name);
+      }
+
+      // NOT found, switch to another clip (if any)
+
+      // index stuff
+      sfile=NULL;
+
+      if (fileno==mainw->current_file) {
+        if (mainw->cliplist!=NULL) {
+          LiVESList *list_index;
+          int index=-1;
+
+          list_index=lives_list_last(mainw->cliplist);
+          do {
+            if ((list_index=lives_list_previous(list_index))==NULL) list_index=lives_list_last(mainw->cliplist);
+            index=LIVES_POINTER_TO_INT(list_index->data);
+          } while ((mainw->files[index]==NULL||
+                    ((index==mainw->scrap_file||index==mainw->ascrap_file)&&index>-1))&&index!=fileno);
+          if (index==fileno) index=-1;
+
+          mainw->current_file=index;
+        } else mainw->current_file=-1;
+      }
+      if (fake_cdata->URI!=NULL) lives_free(fake_cdata->URI);
+      lives_free(fake_cdata);
+      return FALSE;
+    }
+    // got cdata
+    threaded_dialog_spin();
+    if (fake_cdata->URI!=NULL) lives_free(fake_cdata->URI);
+    lives_free(fake_cdata);
+    break;
+  }
+
+  sfile->clip_type=CLIP_TYPE_FILE;
+  get_mime_type(sfile->type,40,cdata);
+  if (!strcmp(prefs->image_ext,"png")) sfile->img_type=IMG_TYPE_PNG; // read_headers() will have set this to "jpeg" (default)
+  // we will set correct value in check_clip_integrity() if there are any real images
+
+  if (sfile->ext_src!=NULL) {
+    boolean bad_header=FALSE;
+    boolean correct=check_clip_integrity(fileno,cdata); // get correct img_type, fps, etc.
+    if (!correct||was_renamed) {
+      save_clip_values(fileno);
+      if (mainw->com_failed||mainw->write_failed) bad_header=TRUE;
+    } else {
+      lives_decoder_t *dplug=(lives_decoder_t *)sfile->ext_src;
+      lives_decoder_sys_t *dpsys=(lives_decoder_sys_t *)dplug->decoder;
+      save_clip_value(fileno,CLIP_DETAILS_DECODER_NAME,dpsys->name);
+      if (mainw->com_failed||mainw->write_failed) bad_header=TRUE;
+    }
+
+    if (bad_header) do_header_write_error(fileno);
+  }
+
+  return TRUE;
+
+}
+
+
+static boolean recover_files(char *recovery_file, boolean auto_recover) {
   FILE *rfile;
 
-  gchar buff[256],*buffptr;
-  gchar *clipdir;
-  gchar *cwd=g_get_current_dir();
+  char buff[256],*buffptr;
+  char *clipdir;
+  char *cwd=lives_get_current_dir();
 
   int retval;
   int new_file,clipnum=0;
@@ -5524,7 +5436,7 @@
 
   if (mainw->multitrack!=NULL) {
     if (mainw->multitrack->idlefunc>0) {
-      g_source_remove(mainw->multitrack->idlefunc);
+      lives_source_remove(mainw->multitrack->idlefunc);
       mainw->multitrack->idlefunc=0;
     }
     mt_desensitise(mainw->multitrack);
@@ -5532,11 +5444,11 @@
 
   if (!auto_recover) {
     if (!do_yesno_dialog
-	(_("\nFiles from a previous run of LiVES were found.\nDo you want to attempt to recover them ?\n"))) {
+        (_("\nFiles from a previous run of LiVES were found.\nDo you want to attempt to recover them ?\n"))) {
       unlink(recovery_file);
 
       if (mainw->multitrack!=NULL) {
-	mt_sensitise(mainw->multitrack);
+        mt_sensitise(mainw->multitrack);
       }
 
       return FALSE;
@@ -5547,46 +5459,46 @@
     retval=0;
     rfile=fopen(recovery_file,"r");
     if (!rfile) {
-      retval=do_read_failed_error_s_with_retry(recovery_file,g_strerror(errno),NULL);
-      if (retval==LIVES_CANCEL) return FALSE;
+      retval=do_read_failed_error_s_with_retry(recovery_file,lives_strerror(errno),NULL);
+      if (retval==LIVES_RESPONSE_CANCEL) return FALSE;
     }
-  } while (retval==LIVES_RETRY);
+  } while (retval==LIVES_RESPONSE_RETRY);
+
 
-  
   mainw->is_ready=TRUE;
   do_threaded_dialog(_("Recovering files"),FALSE);
   mainw->is_ready=FALSE;
 
   d_print(_("Recovering files..."));
   threaded_dialog_spin();
-  
+
   mainw->suppress_dprint=TRUE;
-  
+
   while (1) {
 
     threaded_dialog_spin();
     is_scrap=FALSE;
     is_ascrap=FALSE;
-    
+
     if (mainw->cached_list!=NULL) {
-      g_list_free_strings(mainw->cached_list);
-      g_list_free(mainw->cached_list);
+      lives_list_free_strings(mainw->cached_list);
+      lives_list_free(mainw->cached_list);
       mainw->cached_list=NULL;
     }
 
     mainw->read_failed=FALSE;
-    
+
     if (lives_fgets(buff,256,rfile)==NULL) {
       int current_file=mainw->current_file;
       if (last_was_normal_file&&mainw->multitrack==NULL) {
-	if (current_file!=-1) switch_to_file((mainw->current_file=0),current_file);
+        if (current_file!=-1) switch_to_file((mainw->current_file=0),current_file);
       }
       reset_clipmenu();
       lives_widget_context_update();
       threaded_dialog_spin();
 
       if (mainw->read_failed) {
-	do_read_failed_error_s(recovery_file,NULL);
+        do_read_failed_error_s(recovery_file,NULL);
       }
       break;
     }
@@ -5598,88 +5510,84 @@
       memset(buff+strlen(buff)-2,0,1);
       last_was_normal_file=FALSE;
       if (!is_legal_set_name(buff,TRUE)) continue;
-      g_snprintf(mainw->set_name,128,"%s",buff);
 
-      if (!on_load_set_ok(NULL,GINT_TO_POINTER(TRUE))) {
-	fclose(rfile);
-	end_threaded_dialog();
-
-	if (strlen(mainw->set_name)>0) recover_layout_map(mainw->current_file);
-
-	if (mainw->multitrack!=NULL) {
-	  mainw->current_file=mainw->multitrack->render_file;
-	  polymorph(mainw->multitrack,POLY_NONE);
-	  polymorph(mainw->multitrack,POLY_CLIPS);
-	  mt_sensitise(mainw->multitrack);
-	}
-
-	mainw->suppress_dprint=FALSE;
-	d_print_failed();
-	return TRUE;
+      if (!reload_set(buff)) {
+        fclose(rfile);
+        end_threaded_dialog();
+
+        if (strlen(mainw->set_name)>0) recover_layout_map(mainw->current_file);
+
+        if (mainw->multitrack!=NULL) {
+          mainw->current_file=mainw->multitrack->render_file;
+          polymorph(mainw->multitrack,POLY_NONE);
+          polymorph(mainw->multitrack,POLY_CLIPS);
+          mt_sensitise(mainw->multitrack);
+        }
+
+        mainw->suppress_dprint=FALSE;
+        d_print_failed();
+        return TRUE;
       }
-    }
-    else {
+    } else {
       // load single file
 
       if (!strncmp(buff,"scrap|",6)) {
-	is_scrap=TRUE;
-	buffptr=buff+6;
-      }
-      else if (!strncmp(buff,"ascrap|",7)) {
-	is_ascrap=TRUE;
-	buffptr=buff+7;
+        is_scrap=TRUE;
+        buffptr=buff+6;
+      } else if (!strncmp(buff,"ascrap|",7)) {
+        is_ascrap=TRUE;
+        buffptr=buff+7;
+      } else {
+        buffptr=buff;
+      }
+
+      clipdir=lives_build_filename(prefs->tmpdir,buffptr,NULL);
+
+      if (!lives_file_test(clipdir,LIVES_FILE_TEST_IS_DIR)) {
+        lives_free(clipdir);
+        continue;
       }
-      else {
-	buffptr=buff;
-      }
-
-      clipdir=g_build_filename(prefs->tmpdir,buffptr,NULL);
-
-      if (!g_file_test(clipdir,G_FILE_TEST_IS_DIR)) {
-	g_free(clipdir);
-	continue;
-      }
-      g_free(clipdir);
+      lives_free(clipdir);
       if ((new_file=mainw->first_free_file)==-1) {
-	fclose(rfile);
-	end_threaded_dialog();
-	too_many_files();
-
-	if (strlen(mainw->set_name)>0) recover_layout_map(mainw->current_file);
-
-	if (mainw->multitrack!=NULL) {
-	  mainw->current_file=mainw->multitrack->render_file;
-	  polymorph(mainw->multitrack,POLY_NONE);
-	  polymorph(mainw->multitrack,POLY_CLIPS);
-	  mt_sensitise(mainw->multitrack);
-	  mainw->multitrack->idlefunc=mt_idle_add(mainw->multitrack);
-	}
-
-	mainw->suppress_dprint=FALSE;
-	d_print_failed();
-	return TRUE;
+        fclose(rfile);
+        end_threaded_dialog();
+        too_many_files();
+
+        if (strlen(mainw->set_name)>0) recover_layout_map(mainw->current_file);
+
+        if (mainw->multitrack!=NULL) {
+          mainw->current_file=mainw->multitrack->render_file;
+          polymorph(mainw->multitrack,POLY_NONE);
+          polymorph(mainw->multitrack,POLY_CLIPS);
+          mt_sensitise(mainw->multitrack);
+          mainw->multitrack->idlefunc=mt_idle_add(mainw->multitrack);
+        }
+
+        mainw->suppress_dprint=FALSE;
+        d_print_failed();
+        return TRUE;
       }
       // TODO - dirsep
       if (strstr(buffptr,"/clips/")) {
-	gchar **array;
-	threaded_dialog_spin();
-	array=g_strsplit(buffptr,"/clips/",-1);
-	mainw->was_set=TRUE;
-	g_snprintf(mainw->set_name,128,"%s",array[0]);
-	g_strfreev(array);
-
-	if (!did_set_check&&!check_for_lock_file(mainw->set_name,0)) {
-	  do_set_locked_warning(mainw->set_name);
-	  did_set_check=TRUE;
-	}
+        char **array;
+        threaded_dialog_spin();
+        array=lives_strsplit(buffptr,"/clips/",-1);
+        mainw->was_set=TRUE;
+        lives_snprintf(mainw->set_name,128,"%s",array[0]);
+        lives_strfreev(array);
+
+        if (!did_set_check&&!check_for_lock_file(mainw->set_name,0)) {
+          do_set_locked_warning(mainw->set_name);
+          did_set_check=TRUE;
+        }
 
-	threaded_dialog_spin();
+        threaded_dialog_spin();
       }
       last_was_normal_file=TRUE;
       mainw->current_file=new_file;
       threaded_dialog_spin();
-      cfile=(lives_clip_t *)(g_malloc(sizeof(lives_clip_t)));
-      g_snprintf(cfile->handle,256,"%s",buffptr);
+      cfile=(lives_clip_t *)(lives_malloc(sizeof(lives_clip_t)));
+      lives_snprintf(cfile->handle,256,"%s",buffptr);
       cfile->clip_type=CLIP_TYPE_DISK; // the default
 
       //create a new cfile and fill in the details
@@ -5687,148 +5595,153 @@
       threaded_dialog_spin();
 
       if (!is_scrap) {
-	if (!is_ascrap) {
-	  // get file details
-	  read_headers(".");
-	}
-	else {
-	  lives_clip_details_t detail;
-	  int asigned,aendian;
-	  detail=CLIP_DETAILS_ACHANS;
-	  retval=get_clip_value(mainw->current_file,detail,&cfile->achans,0);
-	  if (!retval) cfile->achans=0;
-	  
-	  if (cfile->achans==0) retval=FALSE;
-	  else retval=TRUE;
-	  
-	  if (retval) {
-	    detail=CLIP_DETAILS_ARATE;
-	    retval=get_clip_value(mainw->current_file,detail,&cfile->arps,0);
-	  }
-
-	  if (!retval) cfile->arps=cfile->achans=cfile->arate=cfile->asampsize=0;
-	  if (cfile->arps==0) retval=FALSE; 
-
-	  cfile->arate=cfile->arps;
-	  
-	  if (retval) {
-	    detail=CLIP_DETAILS_ASIGNED;
-	    retval=get_clip_value(mainw->current_file,detail,&asigned,0);
-	  }
-	  if (retval) {
-	    detail=CLIP_DETAILS_AENDIAN;
-	    retval=get_clip_value(mainw->current_file,detail,&aendian,0);
-	  }
-	  
-	  cfile->signed_endian=asigned+aendian;
-	  
-	  if (retval) {
-	    detail=CLIP_DETAILS_ASAMPS;
-	    retval=get_clip_value(mainw->current_file,detail,&cfile->asampsize,0);
-	  }
-
-	  if (!retval) {
-	    mainw->first_free_file=mainw->current_file;
-	    continue;
-	  }
-	  mainw->ascrap_file=mainw->current_file;
-	}
-      }
-      else {
-	mainw->scrap_file=mainw->current_file;
+        if (!is_ascrap) {
+          // get file details
+          read_headers(".");
+        } else {
+          lives_clip_details_t detail;
+          int asigned,aendian;
+          detail=CLIP_DETAILS_ACHANS;
+          retval=get_clip_value(mainw->current_file,detail,&cfile->achans,0);
+          if (!retval) cfile->achans=0;
+
+          if (cfile->achans==0) retval=FALSE;
+          else retval=TRUE;
+
+          if (retval) {
+            detail=CLIP_DETAILS_ARATE;
+            retval=get_clip_value(mainw->current_file,detail,&cfile->arps,0);
+          }
+
+          if (!retval) cfile->arps=cfile->achans=cfile->arate=cfile->asampsize=0;
+          if (cfile->arps==0) retval=FALSE;
+
+          cfile->arate=cfile->arps;
+
+          if (retval) {
+            detail=CLIP_DETAILS_ASIGNED;
+            retval=get_clip_value(mainw->current_file,detail,&asigned,0);
+          }
+          if (retval) {
+            detail=CLIP_DETAILS_AENDIAN;
+            retval=get_clip_value(mainw->current_file,detail,&aendian,0);
+          }
+
+          cfile->signed_endian=asigned+aendian;
+
+          if (retval) {
+            detail=CLIP_DETAILS_ASAMPS;
+            retval=get_clip_value(mainw->current_file,detail,&cfile->asampsize,0);
+          }
+
+          if (!retval) {
+            mainw->first_free_file=mainw->current_file;
+            continue;
+          }
+          mainw->ascrap_file=mainw->current_file;
+        }
+      } else {
+        mainw->scrap_file=mainw->current_file;
       }
 
       if (mainw->current_file<1) continue;
 
       if (load_frame_index(mainw->current_file)) {
-	// CLIP_TYPE_FILE
-	if (!reload_clip(mainw->current_file)) continue;
-      }
-      else {
-	// CLIP_TYPE_DISK
-	if (is_scrap||!check_frame_count(mainw->current_file)) {
-	  get_frame_count(mainw->current_file);
-	  needs_update=TRUE;
-	}
-	if (!is_scrap&&cfile->frames>0&&(cfile->hsize*cfile->vsize==0)) {
-	  get_frames_sizes(mainw->current_file,1);
-	  needs_update=TRUE;
-	}
-	if (is_ascrap&&cfile->afilesize==0) reget_afilesize(mainw->current_file);
+        // CLIP_TYPE_FILE
+        if (!reload_clip(mainw->current_file)) continue;
+      } else {
+        // CLIP_TYPE_DISK
+        if (is_scrap||!check_frame_count(mainw->current_file)) {
+          get_frame_count(mainw->current_file);
+          needs_update=TRUE;
+        }
+        if (!is_scrap&&cfile->frames>0&&(cfile->hsize*cfile->vsize==0)) {
+          get_frames_sizes(mainw->current_file,1);
+          needs_update=TRUE;
+        }
+        if (is_ascrap&&cfile->afilesize==0) reget_afilesize(mainw->current_file);
       }
 
       if (!is_scrap&&!is_ascrap) {
-	// read the playback fps, play frame, and name
-	threaded_dialog_spin();
-	open_set_file (mainw->set_name,++clipnum);
-	threaded_dialog_spin();
-
-	if (mainw->cached_list!=NULL) {
-	  threaded_dialog_spin();
-	  g_list_free_strings(mainw->cached_list);
-	  g_list_free(mainw->cached_list);
-	  threaded_dialog_spin();
-	  mainw->cached_list=NULL;
-	}
-	
-	if (mainw->current_file<1) continue;
-	
-	get_total_time (cfile);
-	if (cfile->achans) cfile->aseek_pos=(int64_t)((double)(cfile->frameno-1.)/cfile->fps*cfile->arate*
-						   cfile->achans*(cfile->asampsize/8));
-
-	if (needs_update) {
-	  save_clip_values(mainw->current_file);
-	  needs_update=FALSE;
-	}
-	
-	// add to clip menu
-	threaded_dialog_spin();
-	add_to_clipmenu();
-	get_next_free_file();
-	cfile->start=cfile->frames>0?1:0;
-	cfile->end=cfile->frames;
-	cfile->is_loaded=TRUE;
-	cfile->changed=TRUE;
-	unlink (cfile->info_file);
-	set_main_title(cfile->name,0);
-
-	if (mainw->multitrack!=NULL) {
-	  int current_file=mainw->current_file;
-	  lives_mt *multi=mainw->multitrack;
-	  mainw->multitrack=NULL;
-	  reget_afilesize (mainw->current_file);
-	  mainw->multitrack=multi;
-	  get_total_time(cfile);
-	  mainw->current_file=mainw->multitrack->render_file;
-	  mt_init_clips(mainw->multitrack,current_file,TRUE);
-	  lives_widget_context_update();
-	  mt_clip_select(mainw->multitrack,TRUE);
-	  lives_widget_context_update();
-	  mainw->current_file=current_file;
-	}
-	
-	threaded_dialog_spin();
-	
-#ifdef ENABLE_OSC
-	lives_osc_notify(LIVES_OSC_NOTIFY_CLIP_OPENED,"");
-#endif
-      }
-      else {
-	mainw->cliplist = g_list_append (mainw->cliplist, GINT_TO_POINTER (mainw->current_file));
-	get_next_free_file();
+        // read the playback fps, play frame, and name
+        threaded_dialog_spin();
+        open_set_file(mainw->set_name,++clipnum);
+        threaded_dialog_spin();
+
+        if (mainw->cached_list!=NULL) {
+          threaded_dialog_spin();
+          lives_list_free_strings(mainw->cached_list);
+          lives_list_free(mainw->cached_list);
+          threaded_dialog_spin();
+          mainw->cached_list=NULL;
+        }
+
+        if (mainw->current_file<1) continue;
+
+        get_total_time(cfile);
+        if (cfile->achans) cfile->aseek_pos=(int64_t)((double)(cfile->frameno-1.)/cfile->fps*cfile->arate*
+                                              cfile->achans*(cfile->asampsize/8));
+
+        if (needs_update) {
+          save_clip_values(mainw->current_file);
+          needs_update=FALSE;
+        }
+
+        // add to clip menu
+        threaded_dialog_spin();
+        add_to_clipmenu();
+        get_next_free_file();
+        cfile->start=cfile->frames>0?1:0;
+        cfile->end=cfile->frames;
+        cfile->is_loaded=TRUE;
+        cfile->changed=TRUE;
+        unlink(cfile->info_file);
+        set_main_title(cfile->name,0);
+
+        if (mainw->multitrack==NULL) {
+          if (mainw->current_file>0) {
+            resize(1);
+            load_start_image(cfile->start);
+            load_end_image(cfile->end);
+            lives_widget_context_update();
+          }
+        }
+
+        if (mainw->multitrack!=NULL) {
+          int current_file=mainw->current_file;
+          lives_mt *multi=mainw->multitrack;
+          mainw->multitrack=NULL;
+          reget_afilesize(mainw->current_file);
+          mainw->multitrack=multi;
+          get_total_time(cfile);
+          mainw->current_file=mainw->multitrack->render_file;
+          mt_init_clips(mainw->multitrack,current_file,TRUE);
+          lives_widget_context_update();
+          mt_clip_select(mainw->multitrack,TRUE);
+          lives_widget_context_update();
+          mainw->current_file=current_file;
+        }
+
+        threaded_dialog_spin();
+
+        lives_notify(LIVES_OSC_NOTIFY_CLIP_OPENED,"");
+      } else {
+        pthread_mutex_lock(&mainw->clip_list_mutex);
+        mainw->cliplist = lives_list_append(mainw->cliplist, LIVES_INT_TO_POINTER(mainw->current_file));
+        pthread_mutex_unlock(&mainw->clip_list_mutex);
+        get_next_free_file();
       }
     }
   }
 
   lives_chdir(cwd,FALSE);
-  g_free(cwd);
+  lives_free(cwd);
 
   end_threaded_dialog();
 
   fclose(rfile);
 
-  if (mainw->current_file!=-1) 
+  if (mainw->current_file!=-1)
     if (strlen(mainw->set_name)>0) recover_layout_map(mainw->current_file);
 
   if (mainw->multitrack!=NULL) {
@@ -5837,8 +5750,7 @@
     polymorph(mainw->multitrack,POLY_CLIPS);
     mt_sensitise(mainw->multitrack);
     mainw->multitrack->idlefunc=mt_idle_add(mainw->multitrack);
-  }
-  else {
+  } else {
     int start_file=mainw->current_file;
     if (mainw->current_file>1&&mainw->current_file==mainw->ascrap_file&&mainw->files[mainw->current_file-1]!=NULL) {
       start_file--;
@@ -5867,22 +5779,22 @@
 
 
 
-void add_to_recovery_file (const gchar *handle) {
+void add_to_recovery_file(const char *handle) {
 #ifndef IS_MINGW
-  gchar *com=g_strdup_printf("/bin/echo \"%s\" >> \"%s\"",handle,mainw->recovery_file);
+  char *com=lives_strdup_printf("%s \"%s\" >> \"%s\"",capable->echo_cmd,handle,mainw->recovery_file);
 #else
-  gchar *com=g_strdup_printf("echo.exe \"%s\" >> \"%s\"",handle,mainw->recovery_file);
+  char *com=lives_strdup_printf("echo.exe \"%s\" >> \"%s\"",handle,mainw->recovery_file);
 #endif
   mainw->com_failed=FALSE;
   lives_system(com,FALSE);
-  g_free(com);
+  lives_free(com);
 
   if (mainw->com_failed) {
     mainw->com_failed=FALSE;
     return;
   }
 
-  if ((mainw->multitrack!=NULL&&mainw->multitrack->event_list!=NULL)||mainw->stored_event_list!=NULL) 
+  if ((mainw->multitrack!=NULL&&mainw->multitrack->event_list!=NULL)||mainw->stored_event_list!=NULL)
     write_backup_layout_numbering(mainw->multitrack);
 }
 
@@ -5890,8 +5802,8 @@
 
 void rewrite_recovery_file(void) {
   // part of the crash recovery system
-  GList *clist=mainw->cliplist;
-  gchar *recovery_entry;
+  LiVESList *clist=mainw->cliplist;
+  char *recovery_entry;
 
   boolean opened=FALSE;
 
@@ -5912,43 +5824,43 @@
     recovery_fd=-1;
 
     while (clist!=NULL) {
-      i=GPOINTER_TO_INT(clist->data);
+      i=LIVES_POINTER_TO_INT(clist->data);
       if (mainw->files[i]->clip_type==CLIP_TYPE_FILE||mainw->files[i]->clip_type==CLIP_TYPE_DISK) {
-	if (i!=mainw->scrap_file) recovery_entry=g_strdup_printf("%s\n",mainw->files[i]->handle);
-	else recovery_entry=g_strdup_printf("scrap|%s\n",mainw->files[i]->handle);
+        if (i!=mainw->scrap_file) recovery_entry=lives_strdup_printf("%s\n",mainw->files[i]->handle);
+        else recovery_entry=lives_strdup_printf("scrap|%s\n",mainw->files[i]->handle);
 
-	if (!opened) recovery_fd=creat(mainw->recovery_file,S_IRUSR|S_IWUSR);
-	if (recovery_fd<0) retval=do_write_failed_error_s_with_retry(mainw->recovery_file,g_strerror(errno),NULL);
-	else {
-	  opened=TRUE;
-	  lives_write(recovery_fd,recovery_entry,strlen(recovery_entry),TRUE);
-	  if (mainw->write_failed) retval=do_write_failed_error_s_with_retry(mainw->recovery_file,NULL,NULL);
-	}
-	g_free(recovery_entry);
+        if (!opened) recovery_fd=creat(mainw->recovery_file,S_IRUSR|S_IWUSR);
+        if (recovery_fd<0) retval=do_write_failed_error_s_with_retry(mainw->recovery_file,lives_strerror(errno),NULL);
+        else {
+          opened=TRUE;
+          lives_write(recovery_fd,recovery_entry,strlen(recovery_entry),TRUE);
+          if (mainw->write_failed) retval=do_write_failed_error_s_with_retry(mainw->recovery_file,NULL,NULL);
+        }
+        lives_free(recovery_entry);
       }
       if (mainw->write_failed) break;
       clist=clist->next;
     }
 
-  } while (retval==LIVES_RETRY);
+  } while (retval==LIVES_RESPONSE_RETRY);
 
   if (!opened) unlink(mainw->recovery_file);
   else if (recovery_fd>=0) close(recovery_fd);
 
-  if ((mainw->multitrack!=NULL&&mainw->multitrack->event_list!=NULL)||mainw->stored_event_list!=NULL) 
+  if ((mainw->multitrack!=NULL&&mainw->multitrack->event_list!=NULL)||mainw->stored_event_list!=NULL)
     write_backup_layout_numbering(mainw->multitrack);
 
 }
 
 
-boolean check_for_recovery_files (boolean auto_recover) {
+boolean check_for_recovery_files(boolean auto_recover) {
   uint32_t recpid=0;
 
   ssize_t bytes;
 
-  gchar *recovery_file,*recovery_numbering_file;
-  gchar *info_file=g_strdup_printf("%s/.recovery.%d",prefs->tmpdir,capable->mainpid);
-  gchar *com;
+  char *recovery_file,*recovery_numbering_file;
+  char *info_file=lives_strdup_printf("%s/.recovery.%d",prefs->tmpdir,capable->mainpid);
+  char *com;
 
   boolean retval=FALSE;
 
@@ -5958,13 +5870,13 @@
 
   lives_pgid_t lpid=capable->mainpid;
 
-  com=g_strdup_printf("%s get_recovery_file %d %d %s recovery> \"%s\"",prefs->backend_sync,luid,lgid,
-			     capable->myname,info_file);
-  
+  com=lives_strdup_printf("%s get_recovery_file %d %d %s recovery> \"%s\"",prefs->backend_sync,luid,lgid,
+                          capable->myname,info_file);
+
   unlink(info_file);
   mainw->com_failed=FALSE;
   lives_system(com,FALSE);
-  g_free(com);
+  lives_free(com);
 
   if (mainw->com_failed) {
     mainw->com_failed=FALSE;
@@ -5976,21 +5888,21 @@
     if ((bytes=read(info_fd,mainw->msg,256))>0) {
       memset(mainw->msg+bytes,0,1);
       if ((recpid=atoi(mainw->msg))>0) {
-	
+
       }
     }
     close(info_fd);
   }
   unlink(info_file);
-  g_free(info_file);
+  lives_free(info_file);
 
   if (recpid==0) return FALSE;
-  
-  retval=recover_files((recovery_file=g_strdup_printf("%s/recovery.%d.%d.%d",prefs->tmpdir,luid,
-						      lgid,recpid)),auto_recover);
+
+  retval=recover_files((recovery_file=lives_strdup_printf("%s/recovery.%d.%d.%d",prefs->tmpdir,luid,
+                                      lgid,recpid)),auto_recover);
   unlink(recovery_file);
-  g_free(recovery_file);
-  
+  lives_free(recovery_file);
+
 #if !GTK_CHECK_VERSION(3,0,0)
   if (mainw->current_file>-1&&cfile!=NULL) {
     load_start_image(cfile->start);
@@ -6004,68 +5916,67 @@
   mainw->com_failed=FALSE;
 
   // check for layout recovery file
-  recovery_file=g_strdup_printf("%s/layout.%d.%d.%d",prefs->tmpdir,luid,lgid,recpid);
-  if (g_file_test (recovery_file, G_FILE_TEST_EXISTS)) {
+  recovery_file=lives_strdup_printf("%s/layout.%d.%d.%d",prefs->tmpdir,luid,lgid,recpid);
+  if (lives_file_test(recovery_file, LIVES_FILE_TEST_EXISTS)) {
     // move files temporarily to stop them being cleansed
 #ifndef IS_MINGW
-    com=g_strdup_printf("/bin/mv \"%s\" \"%s/.layout.%d.%d.%d\"",recovery_file,prefs->tmpdir,luid,
-			lgid,lpid);
+    com=lives_strdup_printf("%s \"%s\" \"%s/.layout.%d.%d.%d\"",capable->mv_cmd,recovery_file,prefs->tmpdir,luid,
+                            lgid,lpid);
 #else
-    com=g_strdup_printf("mv.exe \"%s\" \"%s/.layout.%d.%d.%d\"",recovery_file,prefs->tmpdir,luid,
-			lgid,lpid);
+    com=lives_strdup_printf("mv.exe \"%s\" \"%s/.layout.%d.%d.%d\"",recovery_file,prefs->tmpdir,luid,
+                            lgid,lpid);
 #endif
     lives_system(com,FALSE);
-    g_free(com);
-    recovery_numbering_file=g_strdup_printf("%s/layout_numbering.%d.%d.%d",prefs->tmpdir,luid,
-					    lgid,recpid);
+    lives_free(com);
+    recovery_numbering_file=lives_strdup_printf("%s/layout_numbering.%d.%d.%d",prefs->tmpdir,luid,
+                            lgid,recpid);
 #ifndef IS_MINGW
-    com=g_strdup_printf("/bin/mv \"%s\" \"%s/.layout_numbering.%d.%d.%d\"",recovery_numbering_file,prefs->tmpdir,
-			luid,lgid,lpid);
+    com=lives_strdup_printf("%s \"%s\" \"%s/.layout_numbering.%d.%d.%d\"",capable->mv_cmd,recovery_numbering_file,prefs->tmpdir,
+                            luid,lgid,lpid);
 #else
-    com=g_strdup_printf("mv.exe \"%s\" \"%s/.layout_numbering.%d.%d.%d\"",recovery_numbering_file,prefs->tmpdir,
-			luid,lgid,lpid);
+    com=lives_strdup_printf("mv.exe \"%s\" \"%s/.layout_numbering.%d.%d.%d\"",recovery_numbering_file,prefs->tmpdir,
+                            luid,lgid,lpid);
 #endif
     lives_system(com,FALSE);
-    g_free(com);
-    g_free(recovery_numbering_file);
+    lives_free(com);
+    lives_free(recovery_numbering_file);
     mainw->recoverable_layout=TRUE;
-  }
-  else {
+  } else {
     if (mainw->scrap_file!=-1) close_scrap_file();
     if (mainw->ascrap_file!=-1) close_ascrap_file();
   }
-  g_free(recovery_file);
-  
+  lives_free(recovery_file);
+
   if (mainw->com_failed) return FALSE;
 
-  com=g_strdup_printf("%s clean_recovery_files %d %d \"%s\"",prefs->backend_sync,luid,lgid,capable->myname);
+  com=lives_strdup_printf("%s clean_recovery_files %d %d \"%s\"",prefs->backend_sync,luid,lgid,capable->myname);
   lives_system(com,FALSE);
-  g_free(com);
+  lives_free(com);
 
   if (mainw->recoverable_layout) {
-    recovery_file=g_strdup_printf("%s/.layout.%d.%d.%d",prefs->tmpdir,luid,lgid,lpid);
+    recovery_file=lives_strdup_printf("%s/.layout.%d.%d.%d",prefs->tmpdir,luid,lgid,lpid);
 #ifndef IS_MINGW
-    com=g_strdup_printf("/bin/mv \"%s\" \"%s/layout.%d.%d.%d\"",recovery_file,prefs->tmpdir,luid,
-			lgid,lpid);
+    com=lives_strdup_printf("%s \"%s\" \"%s/layout.%d.%d.%d\"",capable->mv_cmd,recovery_file,prefs->tmpdir,luid,
+                            lgid,lpid);
 #else
-    com=g_strdup_printf("mv.exe \"%s\" \"%s/layout.%d.%d.%d\"",recovery_file,prefs->tmpdir,luid,
-			lgid,lpid);
+    com=lives_strdup_printf("mv.exe \"%s\" \"%s/layout.%d.%d.%d\"",recovery_file,prefs->tmpdir,luid,
+                            lgid,lpid);
 #endif
     lives_system(com,FALSE);
-    g_free(com);
-    g_free(recovery_file);
+    lives_free(com);
+    lives_free(recovery_file);
 
-    recovery_numbering_file=g_strdup_printf("%s/.layout_numbering.%d.%d.%d",prefs->tmpdir,luid,lgid,lpid);
+    recovery_numbering_file=lives_strdup_printf("%s/.layout_numbering.%d.%d.%d",prefs->tmpdir,luid,lgid,lpid);
 #ifndef IS_MINGW
-    com=g_strdup_printf("/bin/mv \"%s\" \"%s/layout_numbering.%d.%d.%d\"",recovery_numbering_file,prefs->tmpdir,luid,
-			lgid,lpid);
+    com=lives_strdup_printf("%s \"%s\" \"%s/layout_numbering.%d.%d.%d\"",capable->mv_cmd,recovery_numbering_file,prefs->tmpdir,luid,
+                            lgid,lpid);
 #else
-    com=g_strdup_printf("mv.exe \"%s\" \"%s/layout_numbering.%d.%d.%d\"",recovery_numbering_file,prefs->tmpdir,luid,
-			lgid,lpid);
+    com=lives_strdup_printf("mv.exe \"%s\" \"%s/layout_numbering.%d.%d.%d\"",recovery_numbering_file,prefs->tmpdir,luid,
+                            lgid,lpid);
 #endif
     lives_system(com,FALSE);
-    g_free(com);
-    g_free(recovery_numbering_file);
+    lives_free(com);
+    lives_free(recovery_numbering_file);
   }
 
   rewrite_recovery_file();

LiVES-2.2.8.tar.bz2/src/startup.c -> LiVES-2.4.1.tar.bz2/src/startup.c Changed

@@ -7,7 +7,6 @@
 
 // functions for first time startup
 
-#include "support.h"
 #include "main.h"
 #include "interface.h"
 
@@ -15,25 +14,23 @@
 
 
 
-static boolean prompt_existing_dir(gchar *dirname, uint64_t freespace, boolean wrtable) {
-  gchar *msg;
+static boolean prompt_existing_dir(char *dirname, uint64_t freespace, boolean wrtable) {
+  char *msg;
   boolean res=FALSE;
 
   if (wrtable) {
-    gchar *fspstr=lives_format_storage_space_string(freespace);
-    msg=g_strdup_printf
-      (_("A directory named\n%s\nalready exists. Do you wish to use this directory ?\n\n(Free space = %s)\n"),dirname,fspstr);
-    g_free(fspstr);
+    char *fspstr=lives_format_storage_space_string(freespace);
+    msg=lives_strdup_printf
+        (_("A directory named\n%s\nalready exists. Do you wish to use this directory ?\n\n(Free space = %s)\n"),dirname,fspstr);
+    lives_free(fspstr);
     res=do_yesno_dialog(msg);
+  } else {
+    msg=lives_strdup_printf
+        (_("A directory named\n%s\nalready exists.\nLiVES could not write to this directory or read its free space.\nPlease select another location.\n"),
+         dirname);
+    do_error_dialog(msg);
   }
-  else
-    {
-      msg=g_strdup_printf
-	(_("A directory named\n%s\nalready exists.\nLiVES could not write to this directory or read its free space.\nPlease select another location.\n"),
-	 dirname);
-      do_error_dialog(msg);
-    }
-  g_free(msg);
+  lives_free(msg);
   return res;
 }
 
@@ -41,21 +38,20 @@
 
 
 
-static boolean prompt_new_dir(gchar *dirname, uint64_t freespace, boolean wrtable) {
+static boolean prompt_new_dir(char *dirname, uint64_t freespace, boolean wrtable) {
   boolean res=FALSE;
-  gchar *msg;
+  char *msg;
   if (wrtable) {
-    gchar *fspstr=lives_format_storage_space_string(freespace);
-    msg=g_strdup_printf(_("\nCreate the directory\n%s\n?\n\n(Free space = %s)"),dirname,fspstr);
-    g_free(fspstr);
+    char *fspstr=lives_format_storage_space_string(freespace);
+    msg=lives_strdup_printf(_("\nCreate the directory\n%s\n?\n\n(Free space = %s)"),dirname,fspstr);
+    lives_free(fspstr);
     res=do_warning_dialog(msg);
-  }
-  else {
-    msg=g_strdup_printf(_("\nLiVES could not write to the directory\n%s\nPlease try again and choose a different location.\n"),dirname);
+  } else {
+    msg=lives_strdup_printf(_("\nLiVES could not write to the directory\n%s\nPlease try again and choose a different location.\n"),dirname);
     do_error_dialog(msg);
   }
 
-  g_free(msg);
+  lives_free(msg);
   return res;
 }
 
@@ -69,12 +65,12 @@
   int response;
   boolean ok=FALSE;
 
-  gchar *dirname;
+  char *dirname;
 #ifndef IS_MINGW
-  gchar *com;
+  char *com;
 #endif
 
- top:
+top:
 
   tdentry=create_rename_dialog(6);
 
@@ -84,57 +80,54 @@
     if (response==LIVES_RESPONSE_CANCEL) {
       return FALSE;
     }
-    dirname=g_strdup(lives_entry_get_text(LIVES_ENTRY(tdentry->entry)));
+    dirname=lives_strdup(lives_entry_get_text(LIVES_ENTRY(tdentry->entry)));
 
-    if (strcmp(dirname+strlen(dirname)-1,G_DIR_SEPARATOR_S)) {
-      gchar *tmp=g_strdup_printf("%s%s",dirname,G_DIR_SEPARATOR_S);
-      g_free(dirname);
+    if (strcmp(dirname+strlen(dirname)-1,LIVES_DIR_SEPARATOR_S)) {
+      char *tmp=lives_strdup_printf("%s%s",dirname,LIVES_DIR_SEPARATOR_S);
+      lives_free(dirname);
       dirname=tmp;
     }
 
     if (strlen(dirname)>(PATH_MAX-1)) {
       do_blocking_error_dialog(_("Directory name is too long !"));
-      g_free(dirname);
+      lives_free(dirname);
       continue;
     }
 
     if (!check_dir_access(dirname)) {
       do_dir_perm_error(dirname);
-      g_free(dirname);
+      lives_free(dirname);
       continue;
     }
 
 
-    if (g_file_test(dirname,G_FILE_TEST_IS_DIR)) {
+    if (lives_file_test(dirname,LIVES_FILE_TEST_IS_DIR)) {
       if (is_writeable_dir(dirname)) {
-	freesp=get_fs_free(dirname);
-	if (!prompt_existing_dir(dirname,freesp,TRUE)) {
-	  g_free(dirname);
-	  continue;
-	}
+        freesp=get_fs_free(dirname);
+        if (!prompt_existing_dir(dirname,freesp,TRUE)) {
+          lives_free(dirname);
+          continue;
+        }
+      } else {
+        if (!prompt_existing_dir(dirname,0,FALSE)) {
+          lives_free(dirname);
+          continue;
+        }
       }
-      else {
-	if (!prompt_existing_dir(dirname,0,FALSE)) {
-	  g_free(dirname);
-	  continue;
-	}
-      }
-    }
-    else {
+    } else {
       if (is_writeable_dir(dirname)) {
-	freesp=get_fs_free(dirname);
-	if (!prompt_new_dir(dirname,freesp,TRUE)) {
-	  rmdir(dirname);
-	  g_free(dirname);
-	  continue;
-	}
-      }
-      else {
-	if (!prompt_new_dir(dirname,0,FALSE)) {
-	  rmdir(dirname);
-	  g_free(dirname);
-	  continue;
-	}
+        freesp=get_fs_free(dirname);
+        if (!prompt_new_dir(dirname,freesp,TRUE)) {
+          rmdir(dirname);
+          lives_free(dirname);
+          continue;
+        }
+      } else {
+        if (!prompt_new_dir(dirname,0,FALSE)) {
+          rmdir(dirname);
+          lives_free(dirname);
+          continue;
+        }
       }
     }
 
@@ -142,33 +135,33 @@
   }
 
   lives_widget_destroy(tdentry->dialog);
-  g_free(tdentry);
+  lives_free(tdentry);
 
   mainw->com_failed=FALSE;
 
-  if (!g_file_test(dirname,G_FILE_TEST_IS_DIR)) {
-    if (g_mkdir_with_parents(dirname,S_IRWXU)==-1) goto top;
+  if (!lives_file_test(dirname,LIVES_FILE_TEST_IS_DIR)) {
+    if (lives_mkdir_with_parents(dirname,S_IRWXU)==-1) goto top;
   }
 
 #ifndef IS_MINGW
-  com=g_strdup_printf ("/bin/chmod 777 \"%s\" 2>/dev/null",dirname);
-  lives_system (com,FALSE);
-  g_free (com);
+  com=lives_strdup_printf("%s 777 \"%s\" 2>/dev/null",capable->chmod_cmd,dirname);
+  lives_system(com,FALSE);
+  lives_free(com);
 #endif
 
-  g_snprintf(prefs->tmpdir,PATH_MAX,"%s",dirname);
-  g_snprintf(future_prefs->tmpdir,PATH_MAX,"%s",prefs->tmpdir);
+  lives_snprintf(prefs->tmpdir,PATH_MAX,"%s",dirname);
+  lives_snprintf(future_prefs->tmpdir,PATH_MAX,"%s",prefs->tmpdir);
 
   set_pref("tempdir",prefs->tmpdir);
   set_pref("session_tempdir",prefs->tmpdir);
 
 #ifndef IS_MINGW
-  g_snprintf(mainw->first_info_file,PATH_MAX,"%s"G_DIR_SEPARATOR_S".info.%d",prefs->tmpdir,capable->mainpid);
+  lives_snprintf(mainw->first_info_file,PATH_MAX,"%s"LIVES_DIR_SEPARATOR_S".info.%d",prefs->tmpdir,capable->mainpid);
 #else
-  g_snprintf(mainw->first_info_file,PATH_MAX,"%s"G_DIR_SEPARATOR_S"info.%d",prefs->tmpdir,capable->mainpid);
+  lives_snprintf(mainw->first_info_file,PATH_MAX,"%s"LIVES_DIR_SEPARATOR_S"info.%d",prefs->tmpdir,capable->mainpid);
 #endif
 
-  g_free(dirname);
+  lives_free(dirname);
   return TRUE;
 }
 
@@ -176,8 +169,8 @@
 
 
 
-static void on_init_aplayer_toggled (LiVESToggleButton *tbutton, gpointer user_data) {
-  int audp=GPOINTER_TO_INT(user_data);
+static void on_init_aplayer_toggled(LiVESToggleButton *tbutton, livespointer user_data) {
+  int audp=LIVES_POINTER_TO_INT(user_data);
 
   if (!lives_toggle_button_get_active(tbutton)) return;
 
@@ -213,90 +206,87 @@
 
   LiVESAccelGroup *accel_group;
 
-  GSList *radiobutton_group = NULL;
+  LiVESSList *radiobutton_group = NULL;
 
-  gchar *txt0,*txt1,*txt2,*txt3,*txt4,*txt5,*txt6,*txt7,*msg;
+  char *txt0,*txt1,*txt2,*txt3,*txt4,*txt5,*txt6,*txt7,*msg;
 
   int response;
 
   if (startup_phase==2) {
-    txt0=g_strdup(_("LiVES FAILED TO START YOUR SELECTED AUDIO PLAYER !\n\n"));
-  }
-  else {
+    txt0=lives_strdup(_("LiVES FAILED TO START YOUR SELECTED AUDIO PLAYER !\n\n"));
+  } else {
     prefs->audio_player=-1;
-    txt0=g_strdup("");
+    txt0=lives_strdup("");
   }
 
-  txt1=g_strdup(_("Before starting LiVES, you need to choose an audio player.\n\nPULSE AUDIO is recommended for most users"));
+  txt1=lives_strdup(_("Before starting LiVES, you need to choose an audio player.\n\nPULSE AUDIO is recommended for most users"));
 
 #ifndef HAVE_PULSE_AUDIO
-  txt2=g_strdup(_(", but this version of LiVES was not compiled with pulse audio support.\n\n"));
+  txt2=lives_strdup(_(", but this version of LiVES was not compiled with pulse audio support.\n\n"));
 #else
   if (!capable->has_pulse_audio) {
-    txt2=g_strdup(_(", but you do not have pulse audio installed on your system.\n You are advised to install pulse audio first before running LiVES.\n\n"));
-  }
-  else txt2=g_strdup(".\n\n");
+    txt2=lives_strdup(
+           _(", but you do not have pulse audio installed on your system.\n You are advised to install pulse audio first before running LiVES.\n\n"));
+  } else txt2=lives_strdup(".\n\n");
 #endif
 
-  txt3=g_strdup(_("JACK audio is recommended for pro users"));
+  txt3=lives_strdup(_("JACK audio is recommended for pro users"));
 
 #ifndef ENABLE_JACK
-  txt4=g_strdup(_(", but this version of LiVES was not compiled with jack audio support.\n\n"));
+  txt4=lives_strdup(_(", but this version of LiVES was not compiled with jack audio support.\n\n"));
 #else
   if (!capable->has_jackd) {
-    txt4=g_strdup(_(", but you do not have jackd installed. You may wish to install jackd first before running LiVES.\n\n"));
-  }
-  else {
-    txt4=g_strdup(_(", but may prevent LiVES from starting on some systems.\nIf LiVES will not start with jack, you can restart and try with another audio player instead.\n\n"));
+    txt4=lives_strdup(_(", but you do not have jackd installed. You may wish to install jackd first before running LiVES.\n\n"));
+  } else {
+    txt4=lives_strdup(
+           _(", but may prevent LiVES from starting on some systems.\nIf LiVES will not start with jack, you can restart and try with another audio player instead.\n\n"));
   }
 #endif
 
-  txt5=g_strdup(_("SOX may be used if neither of the preceding players work, "));
+  txt5=lives_strdup(_("SOX may be used if neither of the preceding players work, "));
 
   if (capable->has_sox_play) {
-    txt6=g_strdup(_("but some audio features will be disabled.\n\n"));
-  }
-  else {
-    txt6=g_strdup(_("but you do not have sox installed.\nYou are advised to install it before running LiVES.\n\n"));
+    txt6=lives_strdup(_("but some audio features will be disabled.\n\n"));
+  } else {
+    txt6=lives_strdup(_("but you do not have sox installed.\nYou are advised to install it before running LiVES.\n\n"));
   }
 
   if (capable->has_mplayer||capable->has_mplayer2) {
-    txt7=g_strdup(_("The MPLAYER/MPLAYER2 audio player is only recommended for testing purposes.\n\n"));
-  }
-  else {
-    txt7=g_strdup("");
+    txt7=lives_strdup(_("The MPLAYER/MPLAYER2 audio player is only recommended for testing purposes.\n\n"));
+  } else {
+    txt7=lives_strdup("");
   }
 
-  msg=g_strdup_printf("%s%s%s%s%s%s%s%s",txt0,txt1,txt2,txt3,txt4,txt5,txt6,txt7);
+  msg=lives_strdup_printf("%s%s%s%s%s%s%s%s",txt0,txt1,txt2,txt3,txt4,txt5,txt6,txt7);
 
-  g_free(txt0);
-  g_free(txt1);
-  g_free(txt2);
-  g_free(txt3);
-  g_free(txt4);
-  g_free(txt5);
-  g_free(txt6);
-  g_free(txt7);
+  lives_free(txt0);
+  lives_free(txt1);
+  lives_free(txt2);
+  lives_free(txt3);
+  lives_free(txt4);
+  lives_free(txt5);
+  lives_free(txt6);
+  lives_free(txt7);
 
-  dialog = lives_standard_dialog_new (_("LiVES: - Choose an audio player"),FALSE);
+  dialog = lives_standard_dialog_new(_("LiVES: - Choose an audio player"),FALSE,-1,-1);
 
-  accel_group = LIVES_ACCEL_GROUP(lives_accel_group_new ());
-  lives_window_add_accel_group (LIVES_WINDOW (dialog), accel_group);
+  accel_group = LIVES_ACCEL_GROUP(lives_accel_group_new());
+  lives_window_add_accel_group(LIVES_WINDOW(dialog), accel_group);
 
   dialog_vbox = lives_dialog_get_content_area(LIVES_DIALOG(dialog));
-  
+
   label=lives_standard_label_new(msg);
-  lives_container_add (LIVES_CONTAINER (dialog_vbox), label);
-  g_free(msg);
+  lives_container_add(LIVES_CONTAINER(dialog_vbox), label);
+  lives_free(msg);
 
 
 
 #ifdef HAVE_PULSE_AUDIO
-  hbox = lives_hbox_new (FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (dialog_vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
+  hbox = lives_hbox_new(FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(dialog_vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
 
-  radiobutton0 = lives_standard_radio_button_new ( _("Use _pulse audio player"),TRUE,radiobutton_group,LIVES_BOX(hbox),NULL);
-  radiobutton_group = lives_radio_button_get_group (LIVES_RADIO_BUTTON (radiobutton0));
+  radiobutton0 = lives_standard_radio_button_new(_("Use _pulse audio player"),TRUE,radiobutton_group,LIVES_BOX(hbox),NULL);
+  radiobutton_group = lives_radio_button_get_group(LIVES_RADIO_BUTTON(radiobutton0));
 
   if (prefs->audio_player==-1) prefs->audio_player=AUD_PLAYER_PULSE;
 
@@ -305,20 +295,20 @@
     set_pref("audio_player","pulse");
   }
 
-  lives_signal_connect (LIVES_GUI_OBJECT (radiobutton0), LIVES_WIDGET_TOGGLED_EVENT,
-                      LIVES_GUI_CALLBACK (on_init_aplayer_toggled),
-                      GINT_TO_POINTER(AUD_PLAYER_PULSE));
+  lives_signal_connect(LIVES_GUI_OBJECT(radiobutton0), LIVES_WIDGET_TOGGLED_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_init_aplayer_toggled),
+                       LIVES_INT_TO_POINTER(AUD_PLAYER_PULSE));
 
 
 #endif
 
 
 #ifdef ENABLE_JACK
-  hbox = lives_hbox_new (FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (dialog_vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
+  hbox = lives_hbox_new(FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(dialog_vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
 
   radiobutton1 = lives_standard_radio_button_new(_("Use _jack audio player"),TRUE,radiobutton_group,LIVES_BOX(hbox),NULL);
-  radiobutton_group = lives_radio_button_get_group (LIVES_RADIO_BUTTON (radiobutton1));
+  radiobutton_group = lives_radio_button_get_group(LIVES_RADIO_BUTTON(radiobutton1));
 
   if (prefs->audio_player==AUD_PLAYER_JACK||!capable->has_pulse_audio||prefs->audio_player==-1) {
     prefs->audio_player=AUD_PLAYER_JACK;
@@ -326,19 +316,19 @@
     set_pref("audio_player","jack");
   }
 
-  lives_signal_connect (LIVES_GUI_OBJECT (radiobutton1), LIVES_WIDGET_TOGGLED_EVENT,
-                      LIVES_GUI_CALLBACK (on_init_aplayer_toggled),
-                      GINT_TO_POINTER(AUD_PLAYER_JACK));
+  lives_signal_connect(LIVES_GUI_OBJECT(radiobutton1), LIVES_WIDGET_TOGGLED_SIGNAL,
+                       LIVES_GUI_CALLBACK(on_init_aplayer_toggled),
+                       LIVES_INT_TO_POINTER(AUD_PLAYER_JACK));
 
 
 #endif
 
   if (capable->has_sox_play) {
-    hbox = lives_hbox_new (FALSE, 0);
-    lives_box_pack_start (LIVES_BOX (dialog_vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
+    hbox = lives_hbox_new(FALSE, 0);
+    lives_box_pack_start(LIVES_BOX(dialog_vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
 
-    radiobutton2 = lives_standard_radio_button_new (_("Use _sox audio player"),TRUE,radiobutton_group,LIVES_BOX(hbox),NULL);
-    radiobutton_group = lives_radio_button_get_group (LIVES_RADIO_BUTTON (radiobutton2));
+    radiobutton2 = lives_standard_radio_button_new(_("Use _sox audio player"),TRUE,radiobutton_group,LIVES_BOX(hbox),NULL);
+    radiobutton_group = lives_radio_button_get_group(LIVES_RADIO_BUTTON(radiobutton2));
 
     if (prefs->audio_player==-1) prefs->audio_player=AUD_PLAYER_SOX;
 
@@ -347,18 +337,18 @@
       set_pref("audio_player","sox");
     }
 
-    lives_signal_connect (LIVES_GUI_OBJECT (radiobutton2), LIVES_WIDGET_TOGGLED_EVENT,
-                      LIVES_GUI_CALLBACK (on_init_aplayer_toggled),
-                      GINT_TO_POINTER(AUD_PLAYER_SOX));
+    lives_signal_connect(LIVES_GUI_OBJECT(radiobutton2), LIVES_WIDGET_TOGGLED_SIGNAL,
+                         LIVES_GUI_CALLBACK(on_init_aplayer_toggled),
+                         LIVES_INT_TO_POINTER(AUD_PLAYER_SOX));
 
 
   }
 
   if (capable->has_mplayer) {
-    hbox = lives_hbox_new (FALSE, 0);
-    lives_box_pack_start (LIVES_BOX (dialog_vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
+    hbox = lives_hbox_new(FALSE, 0);
+    lives_box_pack_start(LIVES_BOX(dialog_vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
 
-    radiobutton3 = lives_standard_radio_button_new (_("Use _mplayer audio player"),TRUE,radiobutton_group,LIVES_BOX(hbox),NULL);
+    radiobutton3 = lives_standard_radio_button_new(_("Use _mplayer audio player"),TRUE,radiobutton_group,LIVES_BOX(hbox),NULL);
 
     if (prefs->audio_player==-1) prefs->audio_player=AUD_PLAYER_MPLAYER;
 
@@ -366,46 +356,46 @@
       lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(radiobutton3),TRUE);
       set_pref("audio_player","mplayer");
     }
-						    
-    lives_signal_connect (LIVES_GUI_OBJECT (radiobutton3), LIVES_WIDGET_TOGGLED_EVENT,
-		      LIVES_GUI_CALLBACK (on_init_aplayer_toggled),
-                      GINT_TO_POINTER(AUD_PLAYER_MPLAYER));
+
+    lives_signal_connect(LIVES_GUI_OBJECT(radiobutton3), LIVES_WIDGET_TOGGLED_SIGNAL,
+                         LIVES_GUI_CALLBACK(on_init_aplayer_toggled),
+                         LIVES_INT_TO_POINTER(AUD_PLAYER_MPLAYER));
 
 
   }
 
   if (capable->has_mplayer2) {
-    hbox = lives_hbox_new (FALSE, 0);
-    lives_box_pack_start (LIVES_BOX (dialog_vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
+    hbox = lives_hbox_new(FALSE, 0);
+    lives_box_pack_start(LIVES_BOX(dialog_vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
 
-    radiobutton4 = lives_standard_radio_button_new (_("Use _mplayer2 audio player"),TRUE,radiobutton_group,LIVES_BOX(hbox),NULL);
+    radiobutton4 = lives_standard_radio_button_new(_("Use _mplayer2 audio player"),TRUE,radiobutton_group,LIVES_BOX(hbox),NULL);
 
     if (prefs->audio_player==-1) prefs->audio_player=AUD_PLAYER_MPLAYER2;
 
     if (prefs->audio_player==AUD_PLAYER_MPLAYER2) {
-      lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(radiobutton4),TRUE); 
+      lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(radiobutton4),TRUE);
       set_pref("audio_player","mplayer2");
     }
-						    
-    lives_signal_connect (LIVES_GUI_OBJECT (radiobutton4), LIVES_WIDGET_TOGGLED_EVENT,
-		      LIVES_GUI_CALLBACK (on_init_aplayer_toggled),
-                      GINT_TO_POINTER(AUD_PLAYER_MPLAYER2));
+
+    lives_signal_connect(LIVES_GUI_OBJECT(radiobutton4), LIVES_WIDGET_TOGGLED_SIGNAL,
+                         LIVES_GUI_CALLBACK(on_init_aplayer_toggled),
+                         LIVES_INT_TO_POINTER(AUD_PLAYER_MPLAYER2));
 
 
   }
 
-  cancelbutton = lives_button_new_from_stock (LIVES_STOCK_CANCEL);
-  lives_widget_show (cancelbutton);
-  lives_dialog_add_action_widget (LIVES_DIALOG (dialog), cancelbutton, LIVES_RESPONSE_CANCEL);
+  cancelbutton = lives_button_new_from_stock(LIVES_STOCK_CANCEL);
+  lives_widget_show(cancelbutton);
+  lives_dialog_add_action_widget(LIVES_DIALOG(dialog), cancelbutton, LIVES_RESPONSE_CANCEL);
 
-  lives_widget_add_accelerator (cancelbutton, LIVES_WIDGET_CLICKED_EVENT, accel_group,
-                              LIVES_KEY_Escape, (LiVESXModifierType)0, (LiVESAccelFlags)0);
+  lives_widget_add_accelerator(cancelbutton, LIVES_WIDGET_CLICKED_SIGNAL, accel_group,
+                               LIVES_KEY_Escape, (LiVESXModifierType)0, (LiVESAccelFlags)0);
 
-  okbutton = lives_button_new_from_stock (LIVES_STOCK_GO_FORWARD);
+  okbutton = lives_button_new_from_stock(LIVES_STOCK_GO_FORWARD);
   lives_button_set_label(LIVES_BUTTON(okbutton),_("_Next"));
-  lives_widget_show (okbutton);
-  lives_dialog_add_action_widget (LIVES_DIALOG (dialog), okbutton, LIVES_RESPONSE_OK);
-  lives_widget_set_can_focus_and_default (okbutton);
+  lives_widget_show(okbutton);
+  lives_dialog_add_action_widget(LIVES_DIALOG(dialog), okbutton, LIVES_RESPONSE_OK);
+  lives_widget_set_can_focus_and_default(okbutton);
   lives_widget_grab_default(okbutton);
   lives_widget_grab_focus(okbutton);
 
@@ -421,10 +411,10 @@
 
   lives_widget_destroy(dialog);
 
-  if (prefs->audio_player==AUD_PLAYER_SOX||prefs->audio_player==AUD_PLAYER_MPLAYER||prefs->audio_player==AUD_PLAYER_MPLAYER2) {
+  if (!is_realtime_aplayer(prefs->audio_player)) {
     lives_widget_hide(mainw->vol_toolitem);
     if (mainw->vol_label!=NULL) lives_widget_hide(mainw->vol_label);
-    lives_widget_hide (mainw->recaudio_submenu);
+    lives_widget_hide(mainw->recaudio_submenu);
   }
 
   lives_widget_context_update();
@@ -433,10 +423,10 @@
 }
 
 
-static void add_test(LiVESWidget *table, int row, gchar *ttext, boolean noskip) {
+static void add_test(LiVESWidget *table, int row, char *ttext, boolean noskip) {
   LiVESWidget *label=lives_standard_label_new(ttext);
 
-  lives_table_attach (LIVES_TABLE (table), label, 0, 1, row, row+1, (LiVESAttachOptions)0, (LiVESAttachOptions)0, 10, 10);
+  lives_table_attach(LIVES_TABLE(table), label, 0, 1, row, row+1, (LiVESAttachOptions)0, (LiVESAttachOptions)0, 10, 10);
   lives_widget_show(label);
 
   if (!noskip) {
@@ -444,10 +434,10 @@
     // TRANSLATORS - as in "skipped test"
     label=lives_standard_label_new(_("Skipped"));
 
-    lives_table_attach (LIVES_TABLE (table), label, 1, 2, row, row+1, (LiVESAttachOptions)0, (LiVESAttachOptions)0, 10, 10);
+    lives_table_attach(LIVES_TABLE(table), label, 1, 2, row, row+1, (LiVESAttachOptions)0, (LiVESAttachOptions)0, 10, 10);
     lives_widget_show(label);
 
-    lives_table_attach (LIVES_TABLE (table), image, 2, 3, row, row+1, (LiVESAttachOptions)0, (LiVESAttachOptions)0, 0, 10);
+    lives_table_attach(LIVES_TABLE(table), image, 2, 3, row, row+1, (LiVESAttachOptions)0, (LiVESAttachOptions)0, 0, 10);
     lives_widget_show(image);
   }
 
@@ -465,10 +455,10 @@
   LiVESWidget *image=lives_image_new_from_stock(LIVES_STOCK_APPLY,LIVES_ICON_SIZE_LARGE_TOOLBAR);
 #endif
 
-  lives_table_attach (LIVES_TABLE (table), label, 1, 2, row, row+1, (LiVESAttachOptions)0, (LiVESAttachOptions)0, 10, 10);
+  lives_table_attach(LIVES_TABLE(table), label, 1, 2, row, row+1, (LiVESAttachOptions)0, (LiVESAttachOptions)0, 10, 10);
   lives_widget_show(label);
 
-  lives_table_attach (LIVES_TABLE (table), image, 2, 3, row, row+1, (LiVESAttachOptions)0, (LiVESAttachOptions)0, 0, 10);
+  lives_table_attach(LIVES_TABLE(table), image, 2, 3, row, row+1, (LiVESAttachOptions)0, (LiVESAttachOptions)0, 0, 10);
   lives_widget_show(image);
 
   lives_widget_context_update();
@@ -476,36 +466,36 @@
 }
 
 
-static boolean fail_test(LiVESWidget *table, int row, gchar *ftext) {
+static boolean fail_test(LiVESWidget *table, int row, char *ftext) {
   LiVESWidget *label;
 #if GTK_CHECK_VERSION(3,10,0)
   LiVESWidget *image=lives_image_new_from_stock(LIVES_STOCK_REMOVE,LIVES_ICON_SIZE_LARGE_TOOLBAR);
 #else
-  LiVESWidget *image=lives_image_new_from_stock(GTK_STOCK_CANCEL,LIVES_ICON_SIZE_LARGE_TOOLBAR);
+  LiVESWidget *image=lives_image_new_from_stock(LIVES_STOCK_CANCEL,LIVES_ICON_SIZE_LARGE_TOOLBAR);
 #endif
 
   label=lives_standard_label_new(ftext);
 
-  lives_table_attach (LIVES_TABLE (table), label, 3, 4, row, row+1, (LiVESAttachOptions)0, (LiVESAttachOptions)0, 10, 10);
+  lives_table_attach(LIVES_TABLE(table), label, 3, 4, row, row+1, (LiVESAttachOptions)0, (LiVESAttachOptions)0, 10, 10);
   lives_widget_show(label);
-  
+
   // TRANSLATORS - as in "failed test"
   label=lives_standard_label_new(_("Failed"));
 
-  lives_table_attach (LIVES_TABLE (table), label, 1, 2, row, row+1, (LiVESAttachOptions)0, (LiVESAttachOptions)0, 10, 10);
+  lives_table_attach(LIVES_TABLE(table), label, 1, 2, row, row+1, (LiVESAttachOptions)0, (LiVESAttachOptions)0, 10, 10);
   lives_widget_show(label);
 
-  lives_table_attach (LIVES_TABLE (table), image, 2, 3, row, row+1, (LiVESAttachOptions)0, (LiVESAttachOptions)0, 0, 10);
+  lives_table_attach(LIVES_TABLE(table), image, 2, 3, row, row+1, (LiVESAttachOptions)0, (LiVESAttachOptions)0, 0, 10);
   lives_widget_show(image);
 
   lives_widget_context_update();
-  
+
   return FALSE;
 }
 
 
-LIVES_INLINE gchar *get_resource(gchar *fname) {
-  return g_strdup_printf("%s%sresources/%s",prefs->prefix_dir,DATA_DIR,fname);
+LIVES_INLINE char *get_resource(char *fname) {
+  return lives_strdup_printf("%s%sresources/%s",prefs->prefix_dir,DATA_DIR,fname);
 }
 
 
@@ -521,9 +511,9 @@
 
   LiVESAccelGroup *accel_group;
 
-  gchar *com,*rname,*afile,*tmp;
-  gchar *image_ext=g_strdup(prefs->image_ext);
-  gchar *title;
+  char *com,*rname,*afile,*tmp;
+  char *image_ext=lives_strdup(prefs->image_ext);
+  char *title;
 
   uint8_t *abuff;
 
@@ -542,47 +532,45 @@
 
   if (mainw->multitrack!=NULL) {
     if (mainw->multitrack->idlefunc>0) {
-      g_source_remove(mainw->multitrack->idlefunc);
+      lives_source_remove(mainw->multitrack->idlefunc);
       mainw->multitrack->idlefunc=0;
     }
     mt_desensitise(mainw->multitrack);
   }
 
   if (!tshoot) {
-    title=g_strdup(_("LiVES: - Testing Configuration"));
-  }
-  else {
-    title=g_strdup(_("LiVES: - Troubleshoot"));
+    title=lives_strdup(_("LiVES: - Testing Configuration"));
+  } else {
+    title=lives_strdup(_("LiVES: - Troubleshoot"));
   }
 
 
-  dialog = lives_standard_dialog_new (title,FALSE);
+  dialog = lives_standard_dialog_new(title,FALSE,-1,-1);
 
-  accel_group = LIVES_ACCEL_GROUP(lives_accel_group_new ());
-  lives_window_add_accel_group (LIVES_WINDOW (dialog), accel_group);
+  accel_group = LIVES_ACCEL_GROUP(lives_accel_group_new());
+  lives_window_add_accel_group(LIVES_WINDOW(dialog), accel_group);
 
-  g_free(title);
+  lives_free(title);
 
   dialog_vbox = lives_dialog_get_content_area(LIVES_DIALOG(dialog));
 
   label=lives_standard_label_new(_("LiVES will now run some basic configuration tests\n"));
-  lives_container_add (LIVES_CONTAINER (dialog_vbox), label);
+  lives_container_add(LIVES_CONTAINER(dialog_vbox), label);
 
-  cancelbutton = lives_button_new_from_stock (LIVES_STOCK_CANCEL);
-  lives_widget_show (cancelbutton);
-  lives_dialog_add_action_widget (LIVES_DIALOG (dialog), cancelbutton, LIVES_RESPONSE_CANCEL);
+  cancelbutton = lives_button_new_from_stock(LIVES_STOCK_CANCEL);
+  lives_widget_show(cancelbutton);
+  lives_dialog_add_action_widget(LIVES_DIALOG(dialog), cancelbutton, LIVES_RESPONSE_CANCEL);
 
-  lives_widget_add_accelerator (cancelbutton, LIVES_WIDGET_CLICKED_EVENT, accel_group,
-                              LIVES_KEY_Escape, (LiVESXModifierType)0, (LiVESAccelFlags)0);
+  lives_widget_add_accelerator(cancelbutton, LIVES_WIDGET_CLICKED_SIGNAL, accel_group,
+                               LIVES_KEY_Escape, (LiVESXModifierType)0, (LiVESAccelFlags)0);
 
   if (!tshoot) {
-    okbutton = lives_button_new_from_stock (LIVES_STOCK_GO_FORWARD);
+    okbutton = lives_button_new_from_stock(LIVES_STOCK_GO_FORWARD);
     lives_button_set_label(LIVES_BUTTON(okbutton),_("_Next"));
-  }
-  else okbutton = lives_button_new_from_stock (LIVES_STOCK_OK);
-  lives_widget_show (okbutton);
-  lives_dialog_add_action_widget (LIVES_DIALOG (dialog), okbutton, LIVES_RESPONSE_OK);
-  lives_widget_set_can_focus_and_default (okbutton);
+  } else okbutton = lives_button_new_from_stock(LIVES_STOCK_OK);
+  lives_widget_show(okbutton);
+  lives_dialog_add_action_widget(LIVES_DIALOG(dialog), okbutton, LIVES_RESPONSE_OK);
+  lives_widget_set_can_focus_and_default(okbutton);
   lives_widget_grab_default(okbutton);
   lives_widget_grab_focus(okbutton);
 
@@ -590,8 +578,8 @@
   lives_widget_set_sensitive(okbutton,FALSE);
 
 
-  table = lives_table_new (10, 4, FALSE);
-  lives_container_add (LIVES_CONTAINER (dialog_vbox), table);
+  table = lives_table_new(10, 4, FALSE);
+  lives_container_add(LIVES_CONTAINER(dialog_vbox), table);
 
   lives_widget_show_all(dialog);
 
@@ -606,27 +594,26 @@
   if (!capable->has_sox_sox) {
     success=fail_test(table,0,_("You should install sox to be able to use all the audio features in LiVES"));
 
-  }
-  else {
+  } else {
     success=pass_test(table,0);
   }
 
   // test if sox can convert raw 44100 -> wav 22050
   add_test(table,1,_("Checking if sox can convert audio"),success);
-  
+
   if (!tshoot) set_pref("default_image_format","png");
-  g_snprintf (prefs->image_ext,16,"%s","png");
+  lives_snprintf(prefs->image_ext,16,"%s","png");
 
   get_temp_handle(mainw->first_free_file,TRUE);
 
   if (success) {
-    
+
     info_fd=-1;
 
     unlink(cfile->info_file);
 
     // write 1 second of silence
-    afile=g_build_filename(prefs->tmpdir,cfile->handle,"audio",NULL);
+    afile=lives_build_filename(prefs->tmpdir,cfile->handle,"audio",NULL);
     out_fd=open(afile,O_WRONLY|O_CREAT,S_IRUSR|S_IWUSR);
 
     if (out_fd<0) mainw->write_failed=TRUE;
@@ -635,67 +622,66 @@
     if (!mainw->write_failed) {
       abuff=(uint8_t *)lives_calloc(44100,4);
       if (!abuff) {
-	tmp=g_strdup(_("Unable to allocate 176400 bytes memory."));
-	fail_test(table,1,tmp);
-	g_free(tmp);
-      }
-      else {
+        tmp=lives_strdup(_("Unable to allocate 176400 bytes memory."));
+        fail_test(table,1,tmp);
+        lives_free(tmp);
+      } else {
 #ifdef IS_MINGW
-	setmode(out_fd, O_BINARY);
+        setmode(out_fd, O_BINARY);
 #endif
-	lives_write (out_fd,abuff,176400,TRUE);
-	close(out_fd);
-	g_free(abuff);
+        lives_write(out_fd,abuff,176400,TRUE);
+        close(out_fd);
+        lives_free(abuff);
       }
     }
 
     if (mainw->write_failed) {
-      tmp=g_strdup_printf(_("Unable to write to: %s"),afile);
+      tmp=lives_strdup_printf(_("Unable to write to: %s"),afile);
       fail_test(table,1,tmp);
-      g_free(tmp);
+      lives_free(tmp);
     }
 
-    g_free(afile);
+    lives_free(afile);
 
     if (!mainw->write_failed) {
-      afile=g_build_filename(prefs->tmpdir,cfile->handle,"testout.wav",NULL);
-    
+      afile=lives_build_filename(prefs->tmpdir,cfile->handle,"testout.wav",NULL);
+
       mainw->com_failed=FALSE;
-      com=g_strdup_printf("%s export_audio \"%s\" 0. 0. 44100 2 16 0 22050 \"%s\"",prefs->backend_sync,cfile->handle,afile);
+      com=lives_strdup_printf("%s export_audio \"%s\" 0. 0. 44100 2 16 0 22050 \"%s\"",prefs->backend_sync,cfile->handle,afile);
       lives_system(com,TRUE);
       if (mainw->com_failed) {
-	tmp=g_strdup_printf(_("Command failed: %s"),com);
-	fail_test(table,1,tmp);
-	g_free(tmp);
+        tmp=lives_strdup_printf(_("Command failed: %s"),com);
+        fail_test(table,1,tmp);
+        lives_free(tmp);
       }
-      
-      g_free(com);
+
+      lives_free(com);
 
       while (mainw->cancelled==CANCEL_NONE&&(info_fd=open(cfile->info_file,O_RDONLY))==-1) {
-	g_usleep(prefs->sleep_time);
-	lives_widget_context_update();
+        lives_usleep(prefs->sleep_time);
+        lives_widget_context_update();
       }
-      
+
       if (info_fd!=-1) {
-	close(info_fd);
-	
-	lives_sync();
-	
-	fsize=sget_file_size(afile);
-	unlink(afile);
-	g_free(afile);
-	
-	if (fsize==0) {
-	  fail_test(table,1,_("You should install sox_fmt_all or similar"));
-	}
-	
-	else pass_test(table,1);
+        close(info_fd);
+
+        lives_sync();
+
+        fsize=sget_file_size(afile);
+        unlink(afile);
+        lives_free(afile);
+
+        if (fsize==0) {
+          fail_test(table,1,_("You should install sox_fmt_all or similar"));
+        }
+
+        else pass_test(table,1);
 
       }
     }
   }
 
-  if (tshoot) g_snprintf (prefs->image_ext,16,"%s",image_ext);
+  if (tshoot) lives_snprintf(prefs->image_ext,16,"%s",image_ext);
 
   if (mainw->cancelled!=CANCEL_NONE) {
     mainw->cancelled=CANCEL_NONE;
@@ -728,14 +714,13 @@
       mainw->suppress_dprint=FALSE;
 
       if (mainw->multitrack!=NULL) {
-	mt_sensitise(mainw->multitrack);
-	mainw->multitrack->idlefunc=mt_idle_add(mainw->multitrack);
+        mt_sensitise(mainw->multitrack);
+        mainw->multitrack->idlefunc=mt_idle_add(mainw->multitrack);
       }
 
       return FALSE;
     }
-  }
-  else {
+  } else {
     success2=pass_test(table,2);
   }
 
@@ -750,21 +735,19 @@
     if (capable->has_mplayer) {
 #ifndef IS_MINGW
       res=system("LANG=en LANGUAGE=en mplayer -ao help | grep pcm >/dev/null 2>&1");
-#else    
+#else
       res=system("mplayer -ao help | grep pcm >NUL 2>&1");
 #endif
-    }
-    else {
+    } else {
 #ifndef IS_MINGW
       res=system("LANG=en LANGUAGE=en mplayer2 -ao help | grep pcm >/dev/null 2>&1");
-#else    
+#else
       res=system("mplayer2 -ao help | grep pcm >NUL 2>&1");
 #endif
     }
     if (res==0) {
       pass_test(table,3);
-    }
-    else {
+    } else {
       fail_test(table,3,_("You should install mplayer or mplayer2 with pcm/wav support"));
     }
   }
@@ -773,14 +756,13 @@
 
   rname=get_resource("");
 
-  if (!g_file_test(rname,G_FILE_TEST_IS_DIR)) {
+  if (!lives_file_test(rname,LIVES_FILE_TEST_IS_DIR)) {
     /// oops, no resources dir
     success4=FALSE;
-  }
-  else success4=TRUE;
+  } else success4=TRUE;
 
 
-  g_free(rname);
+  lives_free(rname);
 
   add_test(table,4,_("Checking if mplayer can decode to png/alpha"),success2&&success4);
 
@@ -796,41 +778,41 @@
 
     rname=get_resource("vidtest.avi");
 
-    com=g_strdup_printf("%s open_test \"%s\" \"%s\" 0 png",prefs->backend_sync,cfile->handle,
-			(tmp=g_filename_from_utf8 (rname,-1,NULL,NULL,NULL)));
-    g_free(tmp);
-    g_free(rname);
+    com=lives_strdup_printf("%s open_test \"%s\" \"%s\" 0 png",prefs->backend_sync,cfile->handle,
+                            (tmp=lives_filename_from_utf8(rname,-1,NULL,NULL,NULL)));
+    lives_free(tmp);
+    lives_free(rname);
 
     mainw->com_failed=FALSE;
     lives_system(com,TRUE);
     if (mainw->com_failed) {
-      tmp=g_strdup_printf(_("Command failed: %s"),com);
+      tmp=lives_strdup_printf(_("Command failed: %s"),com);
       fail_test(table,4,tmp);
-      g_free(tmp);
+      lives_free(tmp);
     }
 
-    g_free(com);
+    lives_free(com);
 
     while (mainw->cancelled==CANCEL_NONE&&(info_fd=open(cfile->info_file,O_RDONLY))==-1) {
-      g_usleep(prefs->sleep_time);
+      lives_usleep(prefs->sleep_time);
     }
-    
+
     if (info_fd!=-1) {
 
       close(info_fd);
-      
+
       lives_sync();
-      
+
       cfile->img_type=IMG_TYPE_PNG;
       get_frame_count(mainw->current_file);
-      
+
       if (cfile->frames==0) {
-	fail_test(table,4,_("You may wish to upgrade mplayer to a newer version"));
+        fail_test(table,4,_("You may wish to upgrade mplayer to a newer version"));
       }
-      
+
       else {
-	pass_test(table,4);
-	success3=TRUE;
+        pass_test(table,4);
+        success3=TRUE;
       }
     }
   }
@@ -848,7 +830,7 @@
 
     return FALSE;
   }
-  
+
   // check if mplayer can decode to jpeg
 
   add_test(table,5,_("Checking if mplayer can decode to jpeg"),success2);
@@ -858,14 +840,13 @@
     if (capable->has_mplayer) {
 #ifndef IS_MINGW
       res=system("LANG=en LANGUAGE=en mplayer -vo help | grep -i \"jpeg file\" >/dev/null 2>&1");
-#else    
+#else
       res=system("mplayer -vo help | grep -i \"jpeg file\" >NUL 2>&1");
 #endif
-    }
-    else {
+    } else {
 #ifndef IS_MINGW
       res=system("LANG=en LANGUAGE=en mplayer2 -vo help | grep -i \"jpeg file\" >/dev/null 2>&1");
-#else    
+#else
       res=system("mplayer2 -vo help | grep -i \"jpeg file\" >NUL 2>&1");
 #endif
     }
@@ -873,17 +854,16 @@
     if (res==0) {
       pass_test(table,5);
       if (!success3) {
-	if (!strcmp(prefs->image_ext,"png")) imgext_switched=TRUE;
-	set_pref("default_image_format","jpeg");
-	g_snprintf (prefs->image_ext,16,"%s","jpg");
+        if (!strcmp(prefs->image_ext,"png")) imgext_switched=TRUE;
+        set_pref("default_image_format","jpeg");
+        lives_snprintf(prefs->image_ext,16,"%s","jpg");
       }
-    }
-    else {
+    } else {
       if (!success3) fail_test(table,5,_("You should install mplayer with either png/alpha or jpeg support"));
       else fail_test(table,5,_("You may wish to add jpeg output support to mplayer"));
     }
   }
-  
+
   // TODO - check each enabled decoder plugin in turn
 
 
@@ -894,8 +874,7 @@
 
   if (!capable->has_convert) {
     success=fail_test(table,8,_("Install imageMagick to be able to use all of the rendered effects"));
-  }
-  else {
+  } else {
     success=pass_test(table,8);
   }
 
@@ -904,16 +883,16 @@
 
   lives_widget_set_sensitive(okbutton,TRUE);
   if (tshoot) {
-    lives_widget_hide(cancelbutton); 
+    lives_widget_hide(cancelbutton);
     if (imgext_switched) {
-      label=lives_standard_label_new(_("\n\n    Image decoding type has been switched to jpeg. You can revert this in Preferences/Decoding.    \n"));
-      lives_container_add (LIVES_CONTAINER (dialog_vbox), label);
+      label=lives_standard_label_new(
+              _("\n\n    Image decoding type has been switched to jpeg. You can revert this in Preferences/Decoding.    \n"));
+      lives_container_add(LIVES_CONTAINER(dialog_vbox), label);
     }
     lives_widget_show(label);
-  }
-  else {
+  } else {
     label=lives_standard_label_new(_("\n\n    Click Cancel to exit and install any missing components, or Next to continue    \n"));
-    lives_container_add (LIVES_CONTAINER (dialog_vbox), label);
+    lives_container_add(LIVES_CONTAINER(dialog_vbox), label);
     lives_widget_show(label);
   }
 
@@ -943,57 +922,57 @@
   LiVESWidget *dialog,*dialog_vbox,*radiobutton0,*radiobutton1,*label;
   LiVESWidget *okbutton;
   LiVESWidget *hbox;
-  GSList *radiobutton_group = NULL;
-  gchar *txt1,*txt2,*txt3,*msg;
+  LiVESSList *radiobutton_group = NULL;
+  char *txt1,*txt2,*txt3,*msg;
 
-  txt1=g_strdup(_("\n\nFinally, you can choose the default startup interface for LiVES.\n"));
-  txt2=g_strdup(_("\n\nLiVES has two main interfaces and you can start up with either of them.\n"));
-  txt3=g_strdup(_("\n\nThe default can always be changed later from Preferences.\n"));
+  txt1=lives_strdup(_("\n\nFinally, you can choose the default startup interface for LiVES.\n"));
+  txt2=lives_strdup(_("\n\nLiVES has two main interfaces and you can start up with either of them.\n"));
+  txt3=lives_strdup(_("\n\nThe default can always be changed later from Preferences.\n"));
 
 
-  msg=g_strdup_printf("%s%s%s",txt1,txt2,txt3);
+  msg=lives_strdup_printf("%s%s%s",txt1,txt2,txt3);
 
 
-  g_free(txt1);
-  g_free(txt2);
-  g_free(txt3);
+  lives_free(txt1);
+  lives_free(txt2);
+  lives_free(txt3);
 
-  dialog = lives_standard_dialog_new (_("LiVES: - Choose the startup interface"),FALSE);
+  dialog = lives_standard_dialog_new(_("LiVES: - Choose the startup interface"),FALSE,-1,-1);
 
   dialog_vbox = lives_dialog_get_content_area(LIVES_DIALOG(dialog));
-  
+
   label=lives_standard_label_new(msg);
-  lives_container_add (LIVES_CONTAINER (dialog_vbox), label);
-  g_free(msg);
+  lives_container_add(LIVES_CONTAINER(dialog_vbox), label);
+  lives_free(msg);
 
 
-  hbox = lives_hbox_new (FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (dialog_vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
-  radiobutton0 = lives_standard_radio_button_new (_("Start in _Clip Edit mode"),TRUE,radiobutton_group,LIVES_BOX(hbox),NULL);
-  radiobutton_group = lives_radio_button_get_group (LIVES_RADIO_BUTTON (radiobutton0));
+  hbox = lives_hbox_new(FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(dialog_vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
+  radiobutton0 = lives_standard_radio_button_new(_("Start in _Clip Edit mode"),TRUE,radiobutton_group,LIVES_BOX(hbox),NULL);
+  radiobutton_group = lives_radio_button_get_group(LIVES_RADIO_BUTTON(radiobutton0));
 
   label=lives_standard_label_new(_("This is the best choice for simple editing tasks and for VJs\n"));
 
-  lives_box_pack_start (LIVES_BOX (dialog_vbox), label, FALSE, FALSE, widget_opts.packing_height);
+  lives_box_pack_start(LIVES_BOX(dialog_vbox), label, FALSE, FALSE, widget_opts.packing_height);
 
-  hbox = lives_hbox_new (FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (dialog_vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
-  radiobutton1 = lives_standard_radio_button_new (_("Start in _Multitrack mode"),TRUE,radiobutton_group,LIVES_BOX(hbox),NULL);
+  hbox = lives_hbox_new(FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(dialog_vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
+  radiobutton1 = lives_standard_radio_button_new(_("Start in _Multitrack mode"),TRUE,radiobutton_group,LIVES_BOX(hbox),NULL);
 
   label=lives_standard_label_new(_("This is a better choice for complex editing tasks involving multiple clips.\n"));
 
-  lives_box_pack_start (LIVES_BOX (dialog_vbox), label, FALSE, FALSE, widget_opts.packing_height);
+  lives_box_pack_start(LIVES_BOX(dialog_vbox), label, FALSE, FALSE, widget_opts.packing_height);
 
   if (prefs->startup_interface==STARTUP_MT) {
     lives_toggle_button_set_active(LIVES_TOGGLE_BUTTON(radiobutton1),TRUE);
   }
 
-  okbutton = lives_button_new_from_stock (LIVES_STOCK_GO_FORWARD);
+  okbutton = lives_button_new_from_stock(LIVES_STOCK_GO_FORWARD);
   lives_button_set_label(LIVES_BUTTON(okbutton),_("_Finish"));
 
-  lives_widget_show (okbutton);
-  lives_dialog_add_action_widget (LIVES_DIALOG (dialog), okbutton, LIVES_RESPONSE_OK);
-  lives_widget_set_can_focus_and_default (okbutton);
+  lives_widget_show(okbutton);
+  lives_dialog_add_action_widget(LIVES_DIALOG(dialog), okbutton, LIVES_RESPONSE_OK);
+  lives_widget_set_can_focus_and_default(okbutton);
   lives_widget_grab_default(okbutton);
   lives_widget_grab_focus(okbutton);
 
@@ -1003,9 +982,9 @@
   lives_dialog_run(LIVES_DIALOG(dialog));
 
 
-  if (lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(radiobutton1))) 
+  if (lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(radiobutton1)))
     future_prefs->startup_interface=prefs->startup_interface=STARTUP_MT;
-  
+
   set_int_pref("startup_interface",prefs->startup_interface);
 
   lives_widget_destroy(dialog);
@@ -1016,6 +995,6 @@
 
 
 
-void on_troubleshoot_activate (LiVESMenuItem *menuitem, gpointer user_data) {
+void on_troubleshoot_activate(LiVESMenuItem *menuitem, livespointer user_data) {
   do_startup_tests(TRUE);
 }

LiVES-2.2.8.tar.bz2/src/startup.h -> LiVES-2.4.1.tar.bz2/src/startup.h Changed

LiVES-2.2.8.tar.bz2/src/stream.c -> LiVES-2.4.1.tar.bz2/src/stream.c Changed

@@ -1,6 +1,6 @@
 // stream.c
 // LiVES
-// (c) G. Finch 2008 - 2013 <salsaman@gmail.com>
+// (c) G. Finch 2008 - 2015 <salsaman@gmail.com>
 // released under the GNU GPL 3 or later
 // see file ../COPYING for licensing details
 
@@ -23,16 +23,16 @@
 
 #define L2L_PACKET_LEN 1024
 
-static gchar pckbuf[L2L_PACKET_LEN*2];
+static char pckbuf[L2L_PACKET_LEN*2];
 static int pckoffs=0;
 static size_t pcksize=0;
 
 static boolean has_last_delta_ticks;
-static gchar *hdr=NULL;
+static char *hdr=NULL;
 static boolean fps_can_change;
 
 static LIVES_INLINE G_GNUC_CONST int64_t abs64(int64_t a) {
-    return ((a>0)?a:-a);
+  return ((a>0)?a:-a);
 }
 
 //#define USE_STRMBUF
@@ -41,11 +41,11 @@
 #define STREAM_BUF_SIZE 1024*1024*128 // allow 8MB buffer size; actually we use twice this much: - TODO - make pref
 static volatile boolean buffering;
 
-void *streambuf (void *arg) {
+void *streambuf(void *arg) {
   // read bytes from udp port and load into ringbuffer
   lives_vstream_t *lstream=(lives_vstream_t *)arg;
 
-  ssize_t res; 
+  ssize_t res;
   size_t btowrite;
   size_t tmpbufoffs;
 
@@ -62,11 +62,11 @@
       tmpbufoffs=0;
       btowrite=res;
       if (lstream->bufoffs+btowrite>STREAM_BUF_SIZE) {
-	btowrite=STREAM_BUF_SIZE-lstream->bufoffs;
-	lives_memcpy(lstream->buffer+lstream->bufoffs,tmpbuf,btowrite);
-	tmpbufoffs+=btowrite;
-	res-=btowrite;
-	lstream->bufoffs=0;
+        btowrite=STREAM_BUF_SIZE-lstream->bufoffs;
+        lives_memcpy(lstream->buffer+lstream->bufoffs,tmpbuf,btowrite);
+        tmpbufoffs+=btowrite;
+        res-=btowrite;
+        lstream->bufoffs=0;
       }
       lives_memcpy(lstream->buffer+lstream->bufoffs,tmpbuf+tmpbufoffs,res);
       lstream->bufoffs+=res;
@@ -86,32 +86,32 @@
   size_t btoread=0;
   size_t end=bufoffs+buflen;
 
-  while ((end<STREAM_BUF_SIZE&&lstream->bufoffs>=bufoffs&&lstream->bufoffs<=end)||(end>=STREAM_BUF_SIZE&&(lstream->bufoffs>=bufoffs||lstream->bufoffs<=(end-STREAM_BUF_SIZE)))) {
-    g_usleep(1000);
+  while ((end<STREAM_BUF_SIZE&&lstream->bufoffs>=bufoffs&&lstream->bufoffs<=end)||(end>=STREAM_BUF_SIZE&&(lstream->bufoffs>=bufoffs||
+         lstream->bufoffs<=(end-STREAM_BUF_SIZE)))) {
+    lives_usleep(1000);
   }
 
   while (1) {
     // loop until we read the packet, or the user cancels
     if (lstream->reading) {
       if (buflen+bufoffs>STREAM_BUF_SIZE) {
-	btoread=STREAM_BUF_SIZE-bufoffs;
-	lives_memcpy(buf,(void *)((uint8_t *)lstream->buffer+bufoffs),btoread);
-	bufoffs=0;
-	buflen-=btoread;
-	buf=(void *)((uint8_t *)buf+btoread);
+        btoread=STREAM_BUF_SIZE-bufoffs;
+        lives_memcpy(buf,(void *)((uint8_t *)lstream->buffer+bufoffs),btoread);
+        bufoffs=0;
+        buflen-=btoread;
+        buf=(void *)((uint8_t *)buf+btoread);
       }
       lives_memcpy(buf,(void *)((uint8_t *)lstream->buffer+bufoffs),buflen);
       bufoffs+=buflen;
       return buflen+btoread;
-    }
-    else {
+    } else {
       weed_plant_t *frame_layer=mainw->frame_layer;
       mainw->frame_layer=NULL;
       lives_widget_context_update();
       mainw->frame_layer=frame_layer;
       threaded_dialog_spin();
       if (mainw->cancelled) return buflen+btoread;
-      g_usleep(prefs->sleep_time);
+      lives_usleep(prefs->sleep_time);
     }
   }
 }
@@ -124,7 +124,7 @@
     // use up our pckbuf
     copied=L2L_PACKET_LEN-pckoffs;
     if (copied>buflen) copied=buflen;
-    
+
     lives_memcpy(buf,pckbuf,copied);
 
     buflen-=copied;
@@ -147,9 +147,9 @@
       mainw->frame_layer=frame_layer;
       threaded_dialog_spin();
       if (mainw->cancelled) {
-	return -1;
+        return -1;
       }
-      g_usleep(prefs->sleep_time);
+      lives_usleep(prefs->sleep_time);
     }
   } while (ret==-1);
   return ret;
@@ -160,14 +160,14 @@
   // return FALSE if we could not set socket buffer size
 
   size_t copied;
- 
+
   if (pckoffs<pcksize) {
     // use up our pckbuf
     copied=pcksize-pckoffs;
     if (copied>buflen) copied=buflen;
-    
+
     lives_memcpy(buf,pckbuf,copied);
-    
+
     buflen-=copied;
     pckoffs+=copied;
     buf+=copied;
@@ -178,13 +178,13 @@
       copied=lives_stream_in(lstream->handle,buflen,buf,bfsize);
       if (copied==-2) return FALSE;
       if (copied==-1) {
-	weed_plant_t *frame_layer=mainw->frame_layer;
-	mainw->frame_layer=NULL;
-	lives_widget_context_update();
-	mainw->frame_layer=frame_layer;
-	threaded_dialog_spin();
-	if (mainw->cancelled) return TRUE;
-	g_usleep(prefs->sleep_time);
+        weed_plant_t *frame_layer=mainw->frame_layer;
+        mainw->frame_layer=NULL;
+        lives_widget_context_update();
+        mainw->frame_layer=frame_layer;
+        threaded_dialog_spin();
+        if (mainw->cancelled) return TRUE;
+        lives_usleep(prefs->sleep_time);
       }
     } while (copied==-1);
     buflen-=copied;
@@ -207,9 +207,9 @@
   while (!sync) {
     while (strncmp(pckbuf+pckoffs,"P",1)) {
       if (++pckoffs==pcksize) {
-	pcksize=l2l_rcv_packet(lstream, L2L_PACKET_LEN, pckbuf);
-	pckoffs=0;
-	if (mainw->cancelled) return;
+        pcksize=l2l_rcv_packet(lstream, L2L_PACKET_LEN, pckbuf);
+        pckoffs=0;
+        if (mainw->cancelled) return;
       }
     }
     if (++pckoffs==pcksize) {
@@ -255,10 +255,10 @@
 }
 
 
-static gchar *l2l_get_packet_header(lives_vstream_t *lstream) {
+static char *l2l_get_packet_header(lives_vstream_t *lstream) {
   size_t hdrsize=0,csize;
 
-  gchar hdr_buf[1024];
+  char hdr_buf[1024];
 
   boolean sync=FALSE;
 
@@ -266,16 +266,16 @@
     pcksize+=l2l_rcv_packet(lstream, L2L_PACKET_LEN, pckbuf+pckoffs);
     if (mainw->cancelled) return NULL;
   }
-  
+
   while (!sync) {
     if (pckoffs==pcksize) {
       if (pcksize>L2L_PACKET_LEN) {
-	csize=pcksize;
-	pcksize=(pcksize+1)>>1;
-	csize-=pcksize;
-	lives_memcpy(pckbuf,pckbuf+pcksize,csize);
-	pckoffs-=pcksize;
-	pcksize=csize;
+        csize=pcksize;
+        pcksize=(pcksize+1)>>1;
+        csize-=pcksize;
+        lives_memcpy(pckbuf,pckbuf+pcksize,csize);
+        pckoffs-=pcksize;
+        pcksize=csize;
       }
       pcksize+=l2l_rcv_packet(lstream, L2L_PACKET_LEN, pckbuf+pckoffs);
       if (mainw->cancelled) return NULL;
@@ -284,79 +284,79 @@
     while (strncmp(pckbuf+pckoffs,"D",1)) {
       hdr_buf[hdrsize++]=pckbuf[pckoffs];
       if (hdrsize>1000) {
-	if (pckoffs>=L2L_PACKET_LEN) {
-	  lives_memcpy(pckbuf,pckbuf+L2L_PACKET_LEN,L2L_PACKET_LEN);
-	  pckoffs-=L2L_PACKET_LEN;
-	}
-	return NULL;
+        if (pckoffs>=L2L_PACKET_LEN) {
+          lives_memcpy(pckbuf,pckbuf+L2L_PACKET_LEN,L2L_PACKET_LEN);
+          pckoffs-=L2L_PACKET_LEN;
+        }
+        return NULL;
       }
       if (++pckoffs==pcksize) {
-	if (pcksize>L2L_PACKET_LEN) {
-	  csize=pcksize;
-	  pcksize=(pcksize+1)>>1;
-	  csize-=pcksize;
-	  lives_memcpy(pckbuf,pckbuf+pcksize,csize);
-	  pckoffs-=pcksize;
-	  pcksize=csize;
-	}
-	pcksize+=l2l_rcv_packet(lstream, L2L_PACKET_LEN, pckbuf+pckoffs);
-	if (mainw->cancelled) return NULL;
+        if (pcksize>L2L_PACKET_LEN) {
+          csize=pcksize;
+          pcksize=(pcksize+1)>>1;
+          csize-=pcksize;
+          lives_memcpy(pckbuf,pckbuf+pcksize,csize);
+          pckoffs-=pcksize;
+          pcksize=csize;
+        }
+        pcksize+=l2l_rcv_packet(lstream, L2L_PACKET_LEN, pckbuf+pckoffs);
+        if (mainw->cancelled) return NULL;
       }
     }
 
     if (++pckoffs==pcksize) {
       if (pcksize>L2L_PACKET_LEN) {
-	csize=pcksize;
-	pcksize=(pcksize+1)>>1;
-	csize-=pcksize;
-	lives_memcpy(pckbuf,pckbuf+pcksize,csize);
-	pckoffs-=pcksize;
-	pcksize=csize;
+        csize=pcksize;
+        pcksize=(pcksize+1)>>1;
+        csize-=pcksize;
+        lives_memcpy(pckbuf,pckbuf+pcksize,csize);
+        pckoffs-=pcksize;
+        pcksize=csize;
       }
       pcksize+=l2l_rcv_packet(lstream, L2L_PACKET_LEN, pckbuf+pckoffs);
       if (mainw->cancelled) return NULL;
     }
 
     if (strncmp(pckbuf+pckoffs,"A",1)) {
-      lives_memcpy (&hdr_buf[hdrsize],pckbuf+pckoffs-1,2);
+      lives_memcpy(&hdr_buf[hdrsize],pckbuf+pckoffs-1,2);
       hdrsize+=2;
       continue;
     }
 
     if (++pckoffs==pcksize) {
       if (pcksize>L2L_PACKET_LEN) {
-	csize=pcksize;
-	pcksize=(pcksize+1)>>1;
-	csize-=pcksize;
-	lives_memcpy(pckbuf,pckbuf+pcksize,csize);
-	pckoffs-=pcksize;
-	pcksize=csize;
+        csize=pcksize;
+        pcksize=(pcksize+1)>>1;
+        csize-=pcksize;
+        lives_memcpy(pckbuf,pckbuf+pcksize,csize);
+        pckoffs-=pcksize;
+        pcksize=csize;
       }
       pcksize+=l2l_rcv_packet(lstream, L2L_PACKET_LEN, pckbuf+pckoffs);
       if (mainw->cancelled) return NULL;
     }
 
     if (strncmp(pckbuf+pckoffs,"T",1)) {
-      lives_memcpy (&hdr_buf[hdrsize],pckbuf+pckoffs-2,3);
+      lives_memcpy(&hdr_buf[hdrsize],pckbuf+pckoffs-2,3);
       hdrsize+=3;
       continue;
     }
 
     if (++pckoffs==pcksize) {
       if (pcksize>L2L_PACKET_LEN) {
-	csize=pcksize;
-	pcksize=(pcksize+1)>>1;
-	csize-=pcksize;
-	lives_memcpy(pckbuf,pckbuf+pcksize,csize);
-	pckoffs-=pcksize;
-	pcksize=csize;
+        csize=pcksize;
+        pcksize=(pcksize+1)>>1;
+        csize-=pcksize;
+        lives_memcpy(pckbuf,pckbuf+pcksize,csize);
+        pckoffs-=pcksize;
+        pcksize=csize;
       }
       pcksize+=l2l_rcv_packet(lstream, L2L_PACKET_LEN, pckbuf+pckoffs);
       if (mainw->cancelled) return NULL;
     }
 
     if (strncmp(pckbuf+pckoffs,"A",1)) {
-      lives_memcpy (&hdr_buf[hdrsize],pckbuf+pckoffs-3,4);
+      lives_memcpy(&hdr_buf[hdrsize],pckbuf+pckoffs-3,4);
       hdrsize+=4;
       continue;
     }
@@ -373,16 +373,16 @@
 
   pckoffs++;
 
-  return g_strdup(hdr_buf);
+  return lives_strdup(hdr_buf);
 }
 
 
 static boolean l2l_parse_packet_header(lives_vstream_t *lstream, int strtype, int strid) {
-  gchar **array=g_strsplit(hdr," ",-1);
+  char **array=lives_strsplit(hdr," ",-1);
   int pid=-1,ptype=-1;
-  
+
   if (hdr==NULL||array==NULL||array[0]==NULL||array[1]==NULL||array[2]==NULL||array[3]==NULL) {
-    if (array!=NULL) g_strfreev(array);
+    if (array!=NULL) lives_strfreev(array);
     return FALSE;
   }
 
@@ -391,7 +391,7 @@
 
   if (pid!=strid||ptype!=strtype) {
     // wrong stream id, or not video
-    if (array!=NULL) g_strfreev(array);
+    if (array!=NULL) lives_strfreev(array);
     return FALSE;
   }
 
@@ -401,14 +401,13 @@
   if (!(lstream->flags&LIVES_VSTREAM_FLAGS_IS_CONTINUATION)) {
     if (capable->cpu_bits==32) {
       lstream->timecode=strtoll(array[4],NULL,10);
-    }
-    else {
+    } else {
       lstream->timecode=strtol(array[4],NULL,10);
     }
 
     lstream->hsize=atoi(array[5]);
     lstream->vsize=atoi(array[6]);
-    lstream->fps=g_strtod(array[7],NULL);
+    lstream->fps=lives_strtod(array[7],NULL);
     lstream->palette=atoi(array[8]);
     lstream->YUV_sampling=atoi(array[9]);
     lstream->YUV_clamping=atoi(array[10]);
@@ -416,7 +415,7 @@
     lstream->compression_type=atoi(array[12]);
   }
 
-  g_strfreev(array);
+  lives_strfreev(array);
   lstream->data_ready=TRUE;
 
   return TRUE;
@@ -424,12 +423,11 @@
 
 
 
-void lives2lives_read_stream(const gchar *host, int port) {
-  lives_vstream_t *lstream=(lives_vstream_t *)g_malloc(sizeof(lives_vstream_t));
+void lives2lives_read_stream(const char *host, int port) {
+  lives_vstream_t *lstream=(lives_vstream_t *)lives_malloc(sizeof(lives_vstream_t));
 
-  gchar *tmp,*tmp2;
-  gchar *msg;
-  gchar *hostname;
+  char *tmp;
+  char *hostname;
 
 #ifdef USE_STRMBUF
   pthread_t stthread;
@@ -440,18 +438,16 @@
 
   int old_file=mainw->current_file,new_file;
 
-  lives_widget_set_sensitive (mainw->open_lives2lives, FALSE);
+  lives_widget_set_sensitive(mainw->open_lives2lives, FALSE);
 
   lstream->handle=OpenHTMSocket(host,port,FALSE);
   if (lstream->handle==NULL) {
     do_error_dialog(_("LiVES to LiVES stream error: Could not open port !\n"));
-    lives_widget_set_sensitive (mainw->open_lives2lives, TRUE);
+    lives_widget_set_sensitive(mainw->open_lives2lives, TRUE);
     return;
   }
 
-  msg=g_strdup_printf(_("Waiting for LiVES stream on port %d..."),port);
-  d_print(msg);
-  g_free(msg);
+  d_print(_("Waiting for LiVES stream on port %d..."),port);
 
   mainw->cancelled=CANCEL_NONE;
   do_threaded_dialog(_("\nWaiting for stream"),TRUE);
@@ -463,11 +459,11 @@
   pthread_attr_init(&pattr);
   if (pthread_attr_setstacksize(&pattr,STREAM_BUF_SIZE*4)) {
     do_error_dialog(_("LiVES to LiVES stream error: Could not set buffer size !\n"));
-    g_free(lstream);
-    lives_widget_set_sensitive (mainw->open_lives2lives, TRUE);
+    lives_free(lstream);
+    lives_widget_set_sensitive(mainw->open_lives2lives, TRUE);
     return;
   }
-  lstream->buffer=g_malloc(STREAM_BUF_SIZE);
+  lstream->buffer=lives_malloc(STREAM_BUF_SIZE);
   pthread_create(&stthread,&pattr,streambuf,(void *)lstream);
   pthread_attr_destroy(&pattr);
 #endif
@@ -482,11 +478,11 @@
 #endif
     CloseHTMSocket(lstream->handle);
 #ifdef USE_STRMBUF
-    g_free(lstream->buffer);
+    lives_free(lstream->buffer);
 #endif
-    g_free(lstream);
+    lives_free(lstream);
     d_print_cancelled();
-    lives_widget_set_sensitive (mainw->open_lives2lives, TRUE);
+    lives_widget_set_sensitive(mainw->open_lives2lives, TRUE);
     return;
   }
 
@@ -495,36 +491,36 @@
       // get video stream 0 PACKET
       l2l_get_packet_sync(lstream);
       if (mainw->cancelled) {
-	end_threaded_dialog();
+        end_threaded_dialog();
 #ifdef USE_STRMBUF
-	buffering=FALSE;
-	pthread_join(stthread,NULL);
+        buffering=FALSE;
+        pthread_join(stthread,NULL);
 #endif
-	CloseHTMSocket(lstream->handle);
+        CloseHTMSocket(lstream->handle);
 #ifdef USE_STRMBUF
-	g_free(lstream->buffer);
+        lives_free(lstream->buffer);
 #endif
-	g_free(lstream);
-	d_print_cancelled();
-	lives_widget_set_sensitive (mainw->open_lives2lives, TRUE);
-	return;
+        lives_free(lstream);
+        d_print_cancelled();
+        lives_widget_set_sensitive(mainw->open_lives2lives, TRUE);
+        return;
       }
       // get packet header
       hdr=l2l_get_packet_header(lstream);
       if (mainw->cancelled) {
-	end_threaded_dialog();
+        end_threaded_dialog();
 #ifdef USE_STRMBUF
-	buffering=FALSE;
-	pthread_join(stthread,NULL);
+        buffering=FALSE;
+        pthread_join(stthread,NULL);
 #endif
-	CloseHTMSocket(lstream->handle);
+        CloseHTMSocket(lstream->handle);
 #ifdef USE_STRMBUF
-	g_free(lstream->buffer);
+        lives_free(lstream->buffer);
 #endif
-	g_free(lstream);
-	d_print_cancelled();
-	lives_widget_set_sensitive (mainw->open_lives2lives, TRUE);
-	return;
+        lives_free(lstream);
+        d_print_cancelled();
+        lives_widget_set_sensitive(mainw->open_lives2lives, TRUE);
+        return;
       }
     } while (hdr==NULL);
     // parse packet header
@@ -532,28 +528,28 @@
     if (lstream->flags&LIVES_VSTREAM_FLAGS_IS_CONTINUATION) done=FALSE;
     if (!done) {
       // wrong packet type or id, or a continuation packet
-      uint8_t *tmpbuf=(uint8_t *)g_malloc(lstream->dsize);
+      uint8_t *tmpbuf=(uint8_t *)lives_malloc(lstream->dsize);
       lives_stream_in_chunks(lstream,lstream->dsize,tmpbuf,lstream->dsize*4);
       // throw this packet away
-      g_printerr("unrecognised packet in stream - dropping it.\n");
-      g_free(tmpbuf);
+      lives_printerr("unrecognised packet in stream - dropping it.\n");
+      lives_free(tmpbuf);
       if (mainw->cancelled) {
-	end_threaded_dialog();
+        end_threaded_dialog();
 #ifdef USE_STRMBUF
-	buffering=FALSE;
-	pthread_join(stthread,NULL);
+        buffering=FALSE;
+        pthread_join(stthread,NULL);
 #endif
-	CloseHTMSocket(lstream->handle);
+        CloseHTMSocket(lstream->handle);
 #ifdef USE_STRMBUF
-	g_free(lstream->buffer);
+        lives_free(lstream->buffer);
 #endif
-	g_free(lstream);
-	d_print_cancelled();
-	lives_widget_set_sensitive (mainw->open_lives2lives, TRUE);
-	return;
+        lives_free(lstream);
+        d_print_cancelled();
+        lives_widget_set_sensitive(mainw->open_lives2lives, TRUE);
+        return;
       }
     }
-    g_free(hdr);
+    lives_free(hdr);
   }
 
   end_threaded_dialog();
@@ -562,18 +558,18 @@
   else fps_can_change=FALSE;
 
   if (mainw->fixed_fpsd>0.&&(cfile->fps!=mainw->fixed_fpsd)) {
-    do_error_dialog (_ ("\n\nUnable to open stream, framerate does not match fixed rate.\n"));
+    do_error_dialog(_("\n\nUnable to open stream, framerate does not match fixed rate.\n"));
 #ifdef USE_STRMBUF
     buffering=FALSE;
     pthread_join(stthread,NULL);
 #endif
     CloseHTMSocket(lstream->handle);
 #ifdef USE_STRMBUF
-    g_free(lstream->buffer);
+    lives_free(lstream->buffer);
 #endif
-    g_free(lstream);
+    lives_free(lstream);
     d_print_failed();
-    lives_widget_set_sensitive (mainw->open_lives2lives, TRUE);
+    lives_widget_set_sensitive(mainw->open_lives2lives, TRUE);
     return;
   }
 
@@ -589,11 +585,11 @@
 #endif
     CloseHTMSocket(lstream->handle);
 #ifdef USE_STRMBUF
-    g_free(lstream->buffer);
+    lives_free(lstream->buffer);
 #endif
-    g_free(lstream);
+    lives_free(lstream);
     d_print_failed();
-    lives_widget_set_sensitive (mainw->open_lives2lives, TRUE);
+    lives_widget_set_sensitive(mainw->open_lives2lives, TRUE);
     return;
   }
 
@@ -628,28 +624,23 @@
 
   d_print("\n");
 
-  g_snprintf(cfile->type,40,"LiVES to LiVES stream in");
+  lives_snprintf(cfile->type,40,"LiVES to LiVES stream in");
 
-  if (!strcmp(host,"INADDR_ANY")) hostname=g_strdup(_("any host"));
-  else hostname=g_strdup(_("host %d"));
+  if (!strcmp(host,"INADDR_ANY")) hostname=lives_strdup(_("any host"));
+  else hostname=lives_strdup(_("host %d"));
 
-  d_print ((tmp=g_strdup_printf (_("Opened LiVES to LiVES stream from %s on port %d"),hostname,port)));
-  g_free(tmp);
-  g_free(hostname);
-  d_print ((tmp=g_strdup_printf(_ (" size=%dx%d bpp=%d fps=%.3f\nAudio: "),cfile->hsize,cfile->vsize,cfile->bpp,cfile->fps)));
-  g_free(tmp);
+  d_print(_("Opened LiVES to LiVES stream from %s on port %d"),hostname,port);
+  lives_free(hostname);
+  d_print(_(" size=%dx%d bpp=%d fps=%.3f\nAudio: "),cfile->hsize,cfile->vsize,cfile->bpp,cfile->fps);
 
   if (cfile->achans==0) {
-    d_print (_ ("none\n"));
-  }
-  else {
-    d_print ((tmp=g_strdup_printf(P_("%d Hz %d channel %d bps\n","%d Hz %d channels %d bps\n",cfile->achans),cfile->arate,cfile->achans,cfile->asampsize)));
-    g_free(tmp);
+    d_print(_("none\n"));
+  } else {
+    d_print(P_("%d Hz %d channel %d bps\n","%d Hz %d channels %d bps\n",cfile->achans),cfile->arate,cfile->achans,cfile->asampsize);
   }
 
-  d_print ((tmp=g_strdup_printf (_("Syncing to external framerate of %s frames per second.\n"),(tmp2=remove_trailing_zeroes(mainw->fixed_fpsd)))));
-  g_free(tmp);
-  g_free(tmp2);
+  d_print(_("Syncing to external framerate of %s frames per second.\n"),(tmp=remove_trailing_zeroes(mainw->fixed_fpsd)));
+  lives_free(tmp);
 
   has_last_delta_ticks=FALSE;
 
@@ -661,25 +652,25 @@
     mainw->noswitch=FALSE;
   }
   // TODO - else...
-  
+
   if (mainw->current_file!=old_file&&mainw->current_file!=new_file) old_file=mainw->current_file; // we could have rendered to a new file
 
   mainw->fixed_fpsd=-1.;
-  d_print (_("Sync lock off.\n"));
+  d_print(_("Sync lock off.\n"));
   mainw->current_file=new_file;
 #ifdef USE_STRMBUF
-    buffering=FALSE;
-    pthread_join(stthread,NULL);
+  buffering=FALSE;
+  pthread_join(stthread,NULL);
 #endif
   CloseHTMSocket(lstream->handle);
 #ifdef USE_STRMBUF
-    g_free(lstream->buffer);
+  lives_free(lstream->buffer);
 #endif
-  g_free (cfile->ext_src);
+  lives_free(cfile->ext_src);
   cfile->ext_src=NULL;
 
   close_current_file(old_file);
-  lives_widget_set_sensitive (mainw->open_lives2lives, TRUE);
+  lives_widget_set_sensitive(mainw->open_lives2lives, TRUE);
 }
 
 
@@ -706,83 +697,82 @@
     done=FALSE;
     if (!lstream->data_ready) {
       while (!done) {
-	// get video stream 0 PACKET
-	do {
-	  l2l_get_packet_sync(lstream);
-	  if (mainw->cancelled) return;
-	  // get packet header
-	  hdr=l2l_get_packet_header(lstream);
-	  if (mainw->cancelled) return;
-	} while (hdr==NULL&&mainw->cancelled==CANCEL_NONE);
-	if (mainw->cancelled) {
-	  g_free(hdr);
-	  hdr=NULL;
-	  return;
-	}
-	// parse packet header
-	done=l2l_parse_packet_header(lstream,LIVES_STREAM_TYPE_VIDEO,0);
-	if (!(myflags&LIVES_VSTREAM_FLAGS_IS_CONTINUATION)&&(lstream->flags&LIVES_VSTREAM_FLAGS_IS_CONTINUATION)) done=FALSE;
-	if ((myflags&LIVES_VSTREAM_FLAGS_IS_CONTINUATION)&&!(lstream->flags&LIVES_VSTREAM_FLAGS_IS_CONTINUATION)) {
-	  // we missed some continuation packets, just return what we have
-	  lstream->data_ready=TRUE;
-	  g_free(hdr);
-	  hdr=NULL;
-	  return;
-	}
-
-	if (!done) {
-	  // wrong packet type or id, or a continuation of previous frame
-	  uint8_t *tmpbuf=(uint8_t *)g_malloc(lstream->dsize);
-	  lives_stream_in_chunks(lstream,lstream->dsize,tmpbuf,lstream->dsize*4);
-	  // throw this packet away
-	  g_printerr("unrecognised packet in stream - dropping it.\n");
-	  g_free(tmpbuf);
-	  if (mainw->cancelled) {
-	    g_free(hdr);
-	    hdr=NULL;
-	    return;
-	  }
-	}
-	g_free(hdr);
-	hdr=NULL;
-
-	if (lstream->fps!=mainw->fixed_fpsd&&fps_can_change) {
-	  gchar *tmp,*tmp2;
-	  d_print(_("Detected new framerate for stream:\n"));
-	  mainw->files[clip]->fps=mainw->fixed_fpsd=lstream->fps;
-	  d_print ((tmp=g_strdup_printf (_("Syncing to external framerate of %s frames per second.\n"),(tmp2=remove_trailing_zeroes(mainw->fixed_fpsd)))));
-	  g_free(tmp);
-	  g_free(tmp2);
-	  has_last_delta_ticks=FALSE;
-	  if (clip==mainw->current_file) set_main_title(cfile->file_name,0);
-	}
+        // get video stream 0 PACKET
+        do {
+          l2l_get_packet_sync(lstream);
+          if (mainw->cancelled) return;
+          // get packet header
+          hdr=l2l_get_packet_header(lstream);
+          if (mainw->cancelled) return;
+        } while (hdr==NULL&&mainw->cancelled==CANCEL_NONE);
+        if (mainw->cancelled) {
+          lives_free(hdr);
+          hdr=NULL;
+          return;
+        }
+        // parse packet header
+        done=l2l_parse_packet_header(lstream,LIVES_STREAM_TYPE_VIDEO,0);
+        if (!(myflags&LIVES_VSTREAM_FLAGS_IS_CONTINUATION)&&(lstream->flags&LIVES_VSTREAM_FLAGS_IS_CONTINUATION)) done=FALSE;
+        if ((myflags&LIVES_VSTREAM_FLAGS_IS_CONTINUATION)&&!(lstream->flags&LIVES_VSTREAM_FLAGS_IS_CONTINUATION)) {
+          // we missed some continuation packets, just return what we have
+          lstream->data_ready=TRUE;
+          lives_free(hdr);
+          hdr=NULL;
+          return;
+        }
+
+        if (!done) {
+          // wrong packet type or id, or a continuation of previous frame
+          uint8_t *tmpbuf=(uint8_t *)lives_malloc(lstream->dsize);
+          lives_stream_in_chunks(lstream,lstream->dsize,tmpbuf,lstream->dsize*4);
+          // throw this packet away
+          lives_printerr("unrecognised packet in stream - dropping it.\n");
+          lives_free(tmpbuf);
+          if (mainw->cancelled) {
+            lives_free(hdr);
+            hdr=NULL;
+            return;
+          }
+        }
+        lives_free(hdr);
+        hdr=NULL;
+
+        if (lstream->fps!=mainw->fixed_fpsd&&fps_can_change) {
+          char *tmp;
+          d_print(_("Detected new framerate for stream:\n"));
+          mainw->files[clip]->fps=mainw->fixed_fpsd=lstream->fps;
+          d_print(_("Syncing to external framerate of %s frames per second.\n"),(tmp=remove_trailing_zeroes(mainw->fixed_fpsd)));
+          lives_free(tmp);
+          has_last_delta_ticks=FALSE;
+          if (clip==mainw->current_file) set_main_title(cfile->file_name,0);
+        }
 
 #define DROP_AGING_FRAMES
 #ifdef DROP_AGING_FRAMES
-	// this seems to help smoothing when recording, however I have only tested it on one machine
-	// where frames were being generated and streamed and then received
-	// - needs testing in other situations
-	gettimeofday(&tv, NULL);
-	currticks=U_SECL*(tv.tv_sec-mainw->origsecs)+tv.tv_usec*U_SEC_RATIO-mainw->origusecs*U_SEC_RATIO;
-	if (mainw->record&&!mainw->record_paused) {
-	  if (has_last_delta_ticks&&(abs64(currticks-lstream->timecode))<last_delta_ticks) {
-	    // drop this frame
-	    uint8_t *tmpbuf=(uint8_t *)g_malloc(lstream->dsize);
-	    lives_stream_in_chunks(lstream,lstream->dsize,tmpbuf,lstream->dsize*4);
-	    // throw this packet away
+        // this seems to help smoothing when recording, however I have only tested it on one machine
+        // where frames were being generated and streamed and then received
+        // - needs testing in other situations
+        gettimeofday(&tv, NULL);
+        currticks=U_SECL*(tv.tv_sec-mainw->origsecs)+tv.tv_usec*U_SEC_RATIO-mainw->origusecs*U_SEC_RATIO;
+        if (mainw->record&&!mainw->record_paused) {
+          if (has_last_delta_ticks&&(abs64(currticks-lstream->timecode))<last_delta_ticks) {
+            // drop this frame
+            uint8_t *tmpbuf=(uint8_t *)lives_malloc(lstream->dsize);
+            lives_stream_in_chunks(lstream,lstream->dsize,tmpbuf,lstream->dsize*4);
+            // throw this packet away
 #ifdef DEBUG_STREAM_AGING
-	    g_printerr("packet too early (!) - dropping it.\n");
+            lives_printerr("packet too early (!) - dropping it.\n");
 #endif
-	    g_free(tmpbuf);
-	    done=FALSE;
-	    if (mainw->cancelled) {
-	      g_free(hdr);
-	      hdr=NULL;
-	      return;
-	    }
-	  }
-	}
-	last_delta_ticks=((int64_t)(last_delta_ticks>>1)+(int64_t)((abs64(currticks-lstream->timecode))>>1));
+            lives_free(tmpbuf);
+            done=FALSE;
+            if (mainw->cancelled) {
+              lives_free(hdr);
+              hdr=NULL;
+              return;
+            }
+          }
+        }
+        last_delta_ticks=((int64_t)(last_delta_ticks>>1)+(int64_t)((abs64(currticks-lstream->timecode))>>1));
 #endif
 
       }
@@ -801,15 +791,13 @@
 
     if (lstream->hsize!=width||lstream->vsize!=height) {
       // frame size changed...
-      gchar *msg=g_strdup_printf((_("Detected frame size change to %d x %d\n")),lstream->hsize,lstream->vsize);
-      d_print(msg);
-      g_free(msg);
-      
+      d_print(_("Detected frame size change to %d x %d\n"),lstream->hsize,lstream->vsize);
+
       mainw->files[clip]->hsize=lstream->hsize;
       mainw->files[clip]->vsize=lstream->vsize;
 
       if (clip==mainw->current_file) {
-	set_main_title(cfile->file_name,0);
+        set_main_title(cfile->file_name,0);
       }
       frame_size_update();
     }
@@ -843,19 +831,19 @@
       framedataread+=target_size;
 #else
       if (target_size>=lstream->dsize) {
-	if (!lives_stream_in_chunks(lstream,target_size,(uint8_t *)pixel_data[0]+framedataread,lstream->dsize*12)) {
-	  do_rmem_max_error(lstream->dsize*12);
-	  mainw->cancelled=CANCEL_ERROR;
-	}
-	if (mainw->cancelled) {
-	  weed_free(pixel_data);
-	  return;
-	}
+        if (!lives_stream_in_chunks(lstream,target_size,(uint8_t *)pixel_data[0]+framedataread,lstream->dsize*12)) {
+          do_rmem_max_error(lstream->dsize*12);
+          mainw->cancelled=CANCEL_ERROR;
+        }
+        if (mainw->cancelled) {
+          lives_free(pixel_data);
+          return;
+        }
       }
 #endif
-      weed_free(pixel_data);
+      lives_free(pixel_data);
       if (framedataread>=lstream->hsize*lstream->vsize*3) {
-	return;
+        return;
       }
       myflags|=LIVES_VSTREAM_FLAGS_IS_CONTINUATION;
       break;
@@ -863,135 +851,133 @@
       // assume uncompressed, - TODO
 
       if (framedataread<lstream->hsize*lstream->vsize) {
-	target_size=lstream->hsize*lstream->vsize-framedataread;
+        target_size=lstream->hsize*lstream->vsize-framedataread;
 #ifdef USE_STRMBUF
-	if (target_size>lstream->dsize) target_size=lstream->dsize;
-	lives_stream_in_chunks(lstream,target_size,(uint8_t *)pixel_data[0]+framedataread,0);
-	lstream->dsize-=target_size;
-	framedataread+=target_size;
+        if (target_size>lstream->dsize) target_size=lstream->dsize;
+        lives_stream_in_chunks(lstream,target_size,(uint8_t *)pixel_data[0]+framedataread,0);
+        lstream->dsize-=target_size;
+        framedataread+=target_size;
 #else
-	if (target_size>=lstream->dsize) {
-	  // packet contains data for single plane
-	  if (!lives_stream_in_chunks(lstream,lstream->dsize,(uint8_t *)pixel_data[0]+framedataread,lstream->dsize*9)) {
-	    do_rmem_max_error(lstream->dsize*9);
-	    mainw->cancelled=CANCEL_ERROR;
-	  }
-	  if (mainw->cancelled) {
-	    weed_free(pixel_data);
-	    return;
-	  }
-	}
-	else {
-	  // this packet contains data for multiple planes
-	  uint8_t *fbuffer=(uint8_t *)g_malloc(lstream->dsize);
-	  size_t fbufoffs=0;
-	  size_t dsize=lstream->dsize;
-	  
-	  if (!lives_stream_in_chunks(lstream,lstream->dsize,fbuffer,lstream->dsize*8)) {
-	    do_rmem_max_error(lstream->dsize*8);
-	    mainw->cancelled=CANCEL_ERROR;
-	  }
-	  if (mainw->cancelled) {
-	    weed_free(pixel_data);
-	    g_free(fbuffer);
-	    return;
-	  }
-	  lives_memcpy((uint8_t *)pixel_data[0]+framedataread,fbuffer,target_size);
-	  dsize-=target_size;
-	  fbufoffs+=target_size;
-	  
-	  target_size=(lstream->hsize*lstream->vsize)>>2;
-	  if (target_size>dsize) target_size=dsize;
-	  
-	  if (target_size>0) lives_memcpy((uint8_t *)pixel_data[1],fbuffer+fbufoffs,target_size);
-	  
-	  dsize-=target_size;
-	  fbufoffs+=target_size;
-	  
-	  target_size=(lstream->hsize*lstream->vsize)>>2;
-	  if (target_size>dsize) target_size=dsize;
-	  
-	  if (target_size>0) lives_memcpy((uint8_t *)pixel_data[2],fbuffer+fbufoffs,target_size);
-	  
-	  g_free(fbuffer);
-	}
+        if (target_size>=lstream->dsize) {
+          // packet contains data for single plane
+          if (!lives_stream_in_chunks(lstream,lstream->dsize,(uint8_t *)pixel_data[0]+framedataread,lstream->dsize*9)) {
+            do_rmem_max_error(lstream->dsize*9);
+            mainw->cancelled=CANCEL_ERROR;
+          }
+          if (mainw->cancelled) {
+            lives_free(pixel_data);
+            return;
+          }
+        } else {
+          // this packet contains data for multiple planes
+          uint8_t *fbuffer=(uint8_t *)lives_malloc(lstream->dsize);
+          size_t fbufoffs=0;
+          size_t dsize=lstream->dsize;
+
+          if (!lives_stream_in_chunks(lstream,lstream->dsize,fbuffer,lstream->dsize*8)) {
+            do_rmem_max_error(lstream->dsize*8);
+            mainw->cancelled=CANCEL_ERROR;
+          }
+          if (mainw->cancelled) {
+            lives_free(pixel_data);
+            lives_free(fbuffer);
+            return;
+          }
+          lives_memcpy((uint8_t *)pixel_data[0]+framedataread,fbuffer,target_size);
+          dsize-=target_size;
+          fbufoffs+=target_size;
+
+          target_size=(lstream->hsize*lstream->vsize)>>2;
+          if (target_size>dsize) target_size=dsize;
+
+          if (target_size>0) lives_memcpy((uint8_t *)pixel_data[1],fbuffer+fbufoffs,target_size);
+
+          dsize-=target_size;
+          fbufoffs+=target_size;
+
+          target_size=(lstream->hsize*lstream->vsize)>>2;
+          if (target_size>dsize) target_size=dsize;
+
+          if (target_size>0) lives_memcpy((uint8_t *)pixel_data[2],fbuffer+fbufoffs,target_size);
+
+          lives_free(fbuffer);
+        }
 #endif
       }
 #ifdef USE_STRMBUF
       if (framedataread<(lstream->hsize*lstream->vsize*5)>>2) {
-	target_size=((lstream->hsize*lstream->vsize*5)>>2)-framedataread;
-	if (target_size>lstream->dsize) target_size=lstream->dsize;
-	lives_stream_in_chunks(lstream,target_size,(uint8_t *)pixel_data[1]+framedataread-lstream->hsize*lstream->vsize,0);
-	lstream->dsize-=target_size;
-	framedataread+=target_size;
+        target_size=((lstream->hsize*lstream->vsize*5)>>2)-framedataread;
+        if (target_size>lstream->dsize) target_size=lstream->dsize;
+        lives_stream_in_chunks(lstream,target_size,(uint8_t *)pixel_data[1]+framedataread-lstream->hsize*lstream->vsize,0);
+        lstream->dsize-=target_size;
+        framedataread+=target_size;
 #else
-	else if (framedataread<(lstream->hsize*lstream->vsize*5)>>2) {
-	  target_size=((lstream->hsize*lstream->vsize*5)>>2)-framedataread;
-	  if (target_size>=lstream->dsize) {
-	    lives_stream_in_chunks(lstream,lstream->dsize,
-				   (uint8_t *)(pixel_data[1]+framedataread-lstream->hsize*lstream->vsize),0);
-	    if (mainw->cancelled) {
-	      weed_free(pixel_data);
-	      return;
-	    }
-	  }
-	  else {
-	    // this packet contains data for multiple planes
-	    uint8_t *fbuffer=(uint8_t *)g_malloc(lstream->dsize);
-	    size_t fbufoffs=0;
-	    size_t dsize=lstream->dsize;
-	    
-	    lives_stream_in_chunks(lstream,lstream->dsize,fbuffer,0);
-	    if (mainw->cancelled) {
-	      weed_free(pixel_data);
-	      g_free(fbuffer);
-	      return;
-	    }
-	    lives_memcpy((uint8_t *)pixel_data[1]+framedataread-lstream->hsize*lstream->vsize,fbuffer,target_size);
-	    
-	    dsize-=target_size;
-	    fbufoffs+=target_size;
-	    
-	    target_size=(lstream->hsize*lstream->vsize)>>2;
-	    if (target_size>dsize) target_size=dsize;
-	    
-	    if (target_size>0) lives_memcpy((uint8_t *)pixel_data[2],fbuffer+fbufoffs,target_size);
-	    
-	    g_free(fbuffer);
-	  }
+      else if (framedataread<(lstream->hsize*lstream->vsize*5)>>2) {
+        target_size=((lstream->hsize*lstream->vsize*5)>>2)-framedataread;
+        if (target_size>=lstream->dsize) {
+          lives_stream_in_chunks(lstream,lstream->dsize,
+                                 (uint8_t *)(pixel_data[1]+framedataread-lstream->hsize*lstream->vsize),0);
+          if (mainw->cancelled) {
+            lives_free(pixel_data);
+            return;
+          }
+        } else {
+          // this packet contains data for multiple planes
+          uint8_t *fbuffer=(uint8_t *)lives_malloc(lstream->dsize);
+          size_t fbufoffs=0;
+          size_t dsize=lstream->dsize;
+
+          lives_stream_in_chunks(lstream,lstream->dsize,fbuffer,0);
+          if (mainw->cancelled) {
+            lives_free(pixel_data);
+            lives_free(fbuffer);
+            return;
+          }
+          lives_memcpy((uint8_t *)pixel_data[1]+framedataread-lstream->hsize*lstream->vsize,fbuffer,target_size);
+
+          dsize-=target_size;
+          fbufoffs+=target_size;
+
+          target_size=(lstream->hsize*lstream->vsize)>>2;
+          if (target_size>dsize) target_size=dsize;
+
+          if (target_size>0) lives_memcpy((uint8_t *)pixel_data[2],fbuffer+fbufoffs,target_size);
+
+          lives_free(fbuffer);
+        }
 #endif
-	}
+      }
 #ifdef USE_STRMBUF
-	if (framedataread<(lstream->hsize*lstream->vsize*6)>>2) {
-	  target_size=((lstream->hsize*lstream->vsize)>>2)-framedataread+((lstream->hsize*lstream->vsize*5)>>2);
-	  if (target_size>lstream->dsize) target_size=lstream->dsize;
-	  lives_stream_in_chunks(lstream,target_size,(uint8_t *)pixel_data[2]+framedataread-
-				 ((lstream->hsize*lstream->vsize*5)>>2),0);
-	  lstream->dsize-=target_size;
-	  framedataread+=target_size;
-	}
+      if (framedataread<(lstream->hsize*lstream->vsize*6)>>2) {
+        target_size=((lstream->hsize*lstream->vsize)>>2)-framedataread+((lstream->hsize*lstream->vsize*5)>>2);
+        if (target_size>lstream->dsize) target_size=lstream->dsize;
+        lives_stream_in_chunks(lstream,target_size,(uint8_t *)pixel_data[2]+framedataread-
+                               ((lstream->hsize*lstream->vsize*5)>>2),0);
+        lstream->dsize-=target_size;
+        framedataread+=target_size;
+      }
 #else
-	else {
-	  target_size=((lstream->hsize*lstream->vsize*3)>>1)-framedataread;
-	  if (target_size>=lstream->dsize) target_size=lstream->dsize;
-	  lives_stream_in_chunks(lstream,target_size,
-				 (uint8_t *)(pixel_data[2]+framedataread-((lstream->hsize*lstream->vsize*5)>>2)),0);
-	  if (mainw->cancelled) {
-	    weed_free(pixel_data);
-	    return;
-	  }
-	}
-	framedataread+=lstream->dsize;
+      else {
+        target_size=((lstream->hsize*lstream->vsize*3)>>1)-framedataread;
+        if (target_size>=lstream->dsize) target_size=lstream->dsize;
+        lives_stream_in_chunks(lstream,target_size,
+                               (uint8_t *)(pixel_data[2]+framedataread-((lstream->hsize*lstream->vsize*5)>>2)),0);
+        if (mainw->cancelled) {
+          lives_free(pixel_data);
+          return;
+        }
+      }
+      framedataread+=lstream->dsize;
 #endif
-	weed_free(pixel_data);
-	if (framedataread>=(lstream->hsize*lstream->vsize*3)>>1) {
-	  return;
-	}
-	myflags|=LIVES_VSTREAM_FLAGS_IS_CONTINUATION;
-	break;
+      lives_free(pixel_data);
+      if (framedataread>=(lstream->hsize*lstream->vsize*3)>>1) {
+        return;
       }
+      myflags|=LIVES_VSTREAM_FLAGS_IS_CONTINUATION;
+      break;
     }
   }
+}
 
 
 
@@ -1001,70 +987,71 @@
 
 // gui bits
 
-void on_send_lives2lives_activate (LiVESMenuItem *menuitem, gpointer user_data) {
+void on_send_lives2lives_activate(LiVESMenuItem *menuitem, livespointer user_data) {
   _vppaw *vppa;
 
-  gchar *orig_name=g_strdup(mainw->string_constants[LIVES_STRING_CONSTANT_NONE]);
-  gchar *tmp;
+  char *orig_name=lives_strdup(mainw->string_constants[LIVES_STRING_CONSTANT_NONE]);
+  char *tmp;
 
   int resp;
 
   if (mainw->vpp!=NULL) {
-    g_free(orig_name);
-    orig_name=g_strdup(mainw->vpp->name);
+    lives_free(orig_name);
+    orig_name=lives_strdup(mainw->vpp->name);
   }
 
   if (mainw->vpp==NULL||strcmp(mainw->vpp->name,"lives2lives_stream")) {
-    g_snprintf(future_prefs->vpp_name,64,"lives2lives_stream");
+    lives_snprintf(future_prefs->vpp_name,64,"lives2lives_stream");
   }
   vppa=on_vpp_advanced_clicked(NULL,NULL);
   resp=lives_dialog_run(LIVES_DIALOG(vppa->dialog));
 
   if (resp==LIVES_RESPONSE_CANCEL) {
-    g_free(orig_name);
+    lives_free(orig_name);
     return;
   }
 
   set_vpp(FALSE);
-  
+
   if (strcmp(orig_name,"lives2lives_stream")) {
-    do_info_dialog((tmp=g_strdup_printf(_("\nLiVES will stream whenever it is in full screen/separate window mode.\nTo reset this behaviour, go to Tools/Preferences/Playback,\nand set the playback plugin back to %s\n"),orig_name)));
-    g_free(tmp);
+    do_info_dialog((tmp=lives_strdup_printf(
+                          _("\nLiVES will stream whenever it is in full screen/separate window mode.\nTo reset this behaviour, go to Tools/Preferences/Playback,\nand set the playback plugin back to %s\n"),
+                          orig_name)));
+    lives_free(tmp);
   }
-  g_free(orig_name);
+  lives_free(orig_name);
 }
 
 
 
 
 
-void on_open_lives2lives_activate (LiVESMenuItem *menuitem, gpointer user_data) {
+void on_open_lives2lives_activate(LiVESMenuItem *menuitem, livespointer user_data) {
   lives_pandh_w *pandh=create_pandh_dialog(0);
 
-  gchar *host=NULL;
+  char *host=NULL;
 
   int port=0;
-  int response=lives_dialog_run (LIVES_DIALOG (pandh->dialog));
+  int response=lives_dialog_run(LIVES_DIALOG(pandh->dialog));
 
   if (response==LIVES_RESPONSE_OK) {
     if (!lives_toggle_button_get_active(LIVES_TOGGLE_BUTTON(pandh->rb_anyhost))) {
-      host=g_strdup_printf("%s.%s.%s.%s",lives_entry_get_text(LIVES_ENTRY(pandh->entry1)),
-			   lives_entry_get_text(LIVES_ENTRY(pandh->entry2)),
-			   lives_entry_get_text(LIVES_ENTRY(pandh->entry3)),lives_entry_get_text(LIVES_ENTRY(pandh->entry4)));
-    }
-    else host=g_strdup("INADDR_ANY");
+      host=lives_strdup_printf("%s.%s.%s.%s",lives_entry_get_text(LIVES_ENTRY(pandh->entry1)),
+                               lives_entry_get_text(LIVES_ENTRY(pandh->entry2)),
+                               lives_entry_get_text(LIVES_ENTRY(pandh->entry3)),lives_entry_get_text(LIVES_ENTRY(pandh->entry4)));
+    } else host=lives_strdup("INADDR_ANY");
     port=lives_spin_button_get_value_as_int(LIVES_SPIN_BUTTON(pandh->port_spin));
   }
 
-  lives_widget_destroy (pandh->dialog);
-  g_free(pandh);
-  
+  lives_widget_destroy(pandh->dialog);
+  lives_free(pandh);
+
   lives_widget_context_update();
 
   if (host!=NULL) {
     // start receiving
     lives2lives_read_stream(host,port);
-    g_free(host);
+    lives_free(host);
   }
 }
 
@@ -1072,7 +1059,7 @@
 
 
 
-static void pandhw_anyhost_toggled(LiVESToggleButton *tbut, gpointer user_data) {
+static void pandhw_anyhost_toggled(LiVESToggleButton *tbut, livespointer user_data) {
   lives_pandh_w *pandhw=(lives_pandh_w *)user_data;
 
   if (lives_toggle_button_get_active(tbut)) {
@@ -1080,8 +1067,7 @@
     lives_widget_set_sensitive(pandhw->entry2,FALSE);
     lives_widget_set_sensitive(pandhw->entry3,FALSE);
     lives_widget_set_sensitive(pandhw->entry4,FALSE);
-  }
-  else {
+  } else {
     lives_widget_set_sensitive(pandhw->entry1,TRUE);
     lives_widget_set_sensitive(pandhw->entry2,TRUE);
     lives_widget_set_sensitive(pandhw->entry3,TRUE);
@@ -1091,7 +1077,7 @@
 
 
 
-lives_pandh_w* create_pandh_dialog (int type) {
+lives_pandh_w *create_pandh_dialog(int type) {
   // type = 0 lives2lives stream input
 
   LiVESWidget *dialog_vbox;
@@ -1100,11 +1086,11 @@
 
   LiVESSList *radiobutton_group = NULL;
 
-  lives_pandh_w *pandhw=(lives_pandh_w *)(g_malloc(sizeof(lives_pandh_w)));
+  lives_pandh_w *pandhw=(lives_pandh_w *)(lives_malloc(sizeof(lives_pandh_w)));
 
-  gchar *tmp,*tmp2;
+  char *tmp,*tmp2;
 
-  pandhw->dialog = lives_standard_dialog_new (_("LiVES: - Receive LiVES stream"),TRUE);
+  pandhw->dialog = lives_standard_dialog_new(_("LiVES: - Receive LiVES stream"),TRUE,-1,-1);
 
   if (prefs->show_gui) {
     lives_window_set_transient_for(LIVES_WINDOW(pandhw->dialog),LIVES_WINDOW(mainw->LiVES));
@@ -1113,50 +1099,53 @@
   dialog_vbox = lives_dialog_get_content_area(LIVES_DIALOG(pandhw->dialog));
 
   label=lives_standard_label_new(_("You can receive streams from another copy of LiVES."));
-  lives_box_pack_start (LIVES_BOX (dialog_vbox), label, FALSE, FALSE, widget_opts.packing_height);
+  lives_box_pack_start(LIVES_BOX(dialog_vbox), label, FALSE, FALSE, widget_opts.packing_height);
 
-  label=lives_standard_label_new(_("In the source copy of LiVES, you must select Advanced/Send stream to LiVES\nor select the lives2lives_stream playback plugin in Preferences."));
-  lives_box_pack_start (LIVES_BOX (dialog_vbox), label, FALSE, FALSE, widget_opts.packing_height);
+  label=lives_standard_label_new(
+          _("In the source copy of LiVES, you must select Advanced/Send stream to LiVES\nor select the lives2lives_stream playback plugin in Preferences."));
+  lives_box_pack_start(LIVES_BOX(dialog_vbox), label, FALSE, FALSE, widget_opts.packing_height);
 
   add_hsep_to_box(LIVES_BOX(dialog_vbox));
 
   label=lives_standard_label_new(_("Select the host to receive the stream from (or allow any host to stream)."));
-  lives_box_pack_start (LIVES_BOX (dialog_vbox), label, FALSE, FALSE, widget_opts.packing_height);
+  lives_box_pack_start(LIVES_BOX(dialog_vbox), label, FALSE, FALSE, widget_opts.packing_height);
+
+  hbox = lives_hbox_new(FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(dialog_vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
 
-  hbox = lives_hbox_new (FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (dialog_vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
+  pandhw->rb_anyhost = lives_standard_radio_button_new((tmp=lives_strdup(_("Accept LiVES streams from _any host")))
+                       ,TRUE,radiobutton_group,LIVES_BOX(hbox),
+                       (tmp2=lives_strdup(_("Accept incoming LiVES streams from any connected host."))));
+  radiobutton_group = lives_radio_button_get_group(LIVES_RADIO_BUTTON(pandhw->rb_anyhost));
 
-  pandhw->rb_anyhost = lives_standard_radio_button_new ((tmp=g_strdup(_("Accept LiVES streams from _any host")))
-							,TRUE,radiobutton_group,LIVES_BOX(hbox),
-							(tmp2=g_strdup(_("Accept incoming LiVES streams from any connected host."))));
-  radiobutton_group = lives_radio_button_get_group (LIVES_RADIO_BUTTON (pandhw->rb_anyhost));
+  lives_free(tmp);
+  lives_free(tmp2);
 
-  g_free(tmp); g_free(tmp2);
+  lives_signal_connect_after(LIVES_GUI_OBJECT(pandhw->rb_anyhost), LIVES_WIDGET_TOGGLED_SIGNAL,
+                             LIVES_GUI_CALLBACK(pandhw_anyhost_toggled),
+                             (livespointer)pandhw);
 
-  lives_signal_connect_after (LIVES_GUI_OBJECT (pandhw->rb_anyhost), LIVES_WIDGET_TOGGLED_EVENT,
-			  LIVES_GUI_CALLBACK (pandhw_anyhost_toggled),
-			  (gpointer)pandhw);
+  hbox = lives_hbox_new(FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(dialog_vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
 
-  hbox = lives_hbox_new (FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (dialog_vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
 
+  lives_standard_radio_button_new((tmp=lives_strdup(_("Accept LiVES streams only from the _specified host:")))
+                                  ,TRUE,radiobutton_group,LIVES_BOX(hbox),
+                                  (tmp2=lives_strdup(_("Accept LiVES streams from the specified host only."))));
 
-  lives_standard_radio_button_new ((tmp=g_strdup(_("Accept LiVES streams only from the _specified host:")))
-				   ,TRUE,radiobutton_group,LIVES_BOX(hbox),
-				   (tmp2=g_strdup(_("Accept LiVES streams from the specified host only."))));
-  
-  g_free(tmp); g_free(tmp2);
+  lives_free(tmp);
+  lives_free(tmp2);
 
   ////////////////////////////////////
 
 
-  hbox = lives_hbox_new (FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (dialog_vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
+  hbox = lives_hbox_new(FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(dialog_vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
 
-  pandhw->entry1 = lives_standard_entry_new ("",FALSE,"127",3,3,LIVES_BOX(hbox),NULL);
-  pandhw->entry2 = lives_standard_entry_new (".",FALSE,"0",3,3,LIVES_BOX(hbox),NULL);
-  pandhw->entry3 = lives_standard_entry_new (".",FALSE,"0",3,3,LIVES_BOX(hbox),NULL);
-  pandhw->entry4 = lives_standard_entry_new (".",FALSE,"0",3,3,LIVES_BOX(hbox),NULL);
+  pandhw->entry1 = lives_standard_entry_new("",FALSE,"127",3,3,LIVES_BOX(hbox),NULL);
+  pandhw->entry2 = lives_standard_entry_new(".",FALSE,"0",3,3,LIVES_BOX(hbox),NULL);
+  pandhw->entry3 = lives_standard_entry_new(".",FALSE,"0",3,3,LIVES_BOX(hbox),NULL);
+  pandhw->entry4 = lives_standard_entry_new(".",FALSE,"0",3,3,LIVES_BOX(hbox),NULL);
 
   lives_widget_set_sensitive(pandhw->entry1,FALSE);
   lives_widget_set_sensitive(pandhw->entry2,FALSE);
@@ -1164,14 +1153,14 @@
   lives_widget_set_sensitive(pandhw->entry4,FALSE);
 
   label=lives_standard_label_new(_("Enter the port number to listen for LiVES streams on:"));
-  lives_box_pack_start (LIVES_BOX (dialog_vbox), label, FALSE, FALSE, widget_opts.packing_height);
+  lives_box_pack_start(LIVES_BOX(dialog_vbox), label, FALSE, FALSE, widget_opts.packing_height);
 
-  hbox = lives_hbox_new (FALSE, 0);
-  lives_box_pack_start (LIVES_BOX (dialog_vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
+  hbox = lives_hbox_new(FALSE, 0);
+  lives_box_pack_start(LIVES_BOX(dialog_vbox), hbox, FALSE, FALSE, widget_opts.packing_height);
 
-  pandhw->port_spin = lives_standard_spin_button_new (_("Port"),FALSE,48888.,1.,65535,1.,1.,0,LIVES_BOX(hbox),NULL);
+  pandhw->port_spin = lives_standard_spin_button_new(_("Port"),FALSE,48888.,1.,65535,1.,1.,0,LIVES_BOX(hbox),NULL);
 
-  lives_widget_show_all (pandhw->dialog);
+  lives_widget_show_all(pandhw->dialog);
 
   return pandhw;
 }

LiVES-2.2.8.tar.bz2/src/stream.h -> LiVES-2.4.1.tar.bz2/src/stream.h Changed

LiVES-2.2.8.tar.bz2/src/support.c -> LiVES-2.4.1.tar.bz2/src/support.c Changed

@@ -23,17 +23,17 @@
 
 
 #ifdef ENABLE_NLS
-LIVES_INLINE gchar *translate(const char *String) {
-  if (trString!=NULL) g_free(trString); // be very careful, as trString is free()d automatically here
-  if (strlen(String)) trString=g_locale_to_utf8 (dgettext (PACKAGE, String),-1,NULL,NULL,NULL);
-  else trString=g_strdup(String);
+LIVES_INLINE char *translate(const char *String) {
+  if (trString!=NULL) lives_free(trString); // be very careful, as trString is free()d automatically here
+  if (strlen(String)) trString=lives_locale_to_utf8(dgettext(PACKAGE, String),-1,NULL,NULL,NULL);
+  else trString=lives_strdup(String);
   return trString;
 }
 
-LIVES_INLINE gchar *translate_with_plural(const char *String, const char *StringPlural, unsigned long int n) {
-  if (trString!=NULL) g_free(trString); // be very careful, as trString is free()d automatically here
-  if (strlen(String)) trString=g_locale_to_utf8 (dngettext (PACKAGE, String, StringPlural, n),-1,NULL,NULL,NULL);
-  else trString=g_strdup(String);
+LIVES_INLINE char *translate_with_plural(const char *String, const char *StringPlural, unsigned long int n) {
+  if (trString!=NULL) lives_free(trString); // be very careful, as trString is free()d automatically here
+  if (strlen(String)) trString=lives_locale_to_utf8(dngettext(PACKAGE, String, StringPlural, n),-1,NULL,NULL,NULL);
+  else trString=lives_strdup(String);
   return trString;
 }

LiVES-2.2.8.tar.bz2/src/support.h -> LiVES-2.4.1.tar.bz2/src/support.h Changed

LiVES-2.2.8.tar.bz2/src/utils.c -> LiVES-2.4.1.tar.bz2/src/utils.c Changed

@@ -24,17 +24,19 @@
 #include "audio.h"
 #include "resample.h"
 
+
 static boolean  omute,  osepwin,  ofs,  ofaded,  odouble;
 
 
 typedef struct {
   int fd;
-  size_t bytes;
+  ssize_t bytes;
   boolean eof;
   uint8_t *ptr;
   uint8_t *buffer;
   boolean read;
   boolean allow_fail;
+  off_t offset;
 } lives_file_buffer_t;
 
 
@@ -56,12 +58,12 @@
 
   if (fstat(fd,&stb0)) return val;
 
-  fidi=g_strdup_printf("%d",fd);
-  fdpath=g_build_filename("/proc","self","fd",fidi,NULL);
-  g_free(fidi);
+  fidi=lives_strdup_printf("%d",fd);
+  fdpath=lives_build_filename("/proc","self","fd",fidi,NULL);
+  lives_free(fidi);
 
   if ((slen=lives_readlink(fdpath,rfdpath,PATH_MAX))==-1) return val;
-  g_free(fdpath);
+  lives_free(fdpath);
 
   memset(rfdpath+slen,0,1);
 
@@ -71,10 +73,10 @@
 
   if (stb0.st_ino!=stb1.st_ino) return val;
 
-  if (val!=NULL) g_free(val);
-  return g_strdup(rfdpath);
+  if (val!=NULL) lives_free(val);
+  return lives_strdup(rfdpath);
 #else
-  return g_strdup("unknown");
+  return lives_strdup("unknown");
 #endif
 }
 
@@ -82,7 +84,7 @@
 
 static void reverse_bytes(uint8_t *out, const uint8_t *in, size_t count) {
   register int i;
-  for (i=0;i<count;i++) {
+  for (i=0; i<count; i++) {
     out[i]=in[count-i-1];
   }
 }
@@ -131,7 +133,7 @@
 
   g_print("\n\nval is %d %c\n",slen,strsid[0]);
 
-  for (i=4;i<slen;i++) {
+  for (i=4; i<slen; i++) {
     retval+=(uint8_t)strsid[i];
   }
 
@@ -157,12 +159,12 @@
 
 
   DAmask = TOKEN_READ;
-  
+
   if (!OpenProcessToken(GetCurrentProcess(), DAmask, &Thandle)) {
     LIVES_ERROR("could not open token");
     return 0;
   }
-  
+
   if (!GetTokenInformation(Thandle, TokenGroups, ptg, 0, &size)) {
     CloseHandle(Thandle);
     LIVES_ERROR("could not open token info");
@@ -170,32 +172,30 @@
   }
 
   ptg = (PTOKEN_GROUPS)HeapAlloc(GetProcessHeap(),
-				 HEAP_ZERO_MEMORY, size);
+                                 HEAP_ZERO_MEMORY, size);
 
   if (ptg == NULL)
     goto Cleanup;
 
 
-// Loop through the groups to find the logon SID.
+  // Loop through the groups to find the logon SID.
 
   for (dwIndex = 0; dwIndex < ptg->GroupCount; dwIndex++) {
     if ((ptg->Groups[dwIndex].Attributes & SE_GROUP_LOGON_ID)
-	==  SE_GROUP_LOGON_ID) 
-      {
-	// Found the logon SID; make a copy of it.
-
-	size = GetLengthSid(ptg->Groups[dwIndex].Sid);
-	psid = (PSID) HeapAlloc(GetProcessHeap(),
-				  HEAP_ZERO_MEMORY, size);
-	if (psid == NULL)
-	  goto Cleanup;
-	if (!CopySid(size, psid, ptg->Groups[dwIndex].Sid)) 
-	  {
-	    HeapFree(GetProcessHeap(), 0, (LPVOID)psid);
-	    goto Cleanup;
-	  }
-	break;
+        ==  SE_GROUP_LOGON_ID) {
+      // Found the logon SID; make a copy of it.
+
+      size = GetLengthSid(ptg->Groups[dwIndex].Sid);
+      psid = (PSID) HeapAlloc(GetProcessHeap(),
+                              HEAP_ZERO_MEMORY, size);
+      if (psid == NULL)
+        goto Cleanup;
+      if (!CopySid(size, psid, ptg->Groups[dwIndex].Sid)) {
+        HeapFree(GetProcessHeap(), 0, (LPVOID)psid);
+        goto Cleanup;
       }
+      break;
+    }
   }
 
   if (psid!=NULL) {
@@ -205,12 +205,12 @@
     LocalFree(strsid);
   }
 
- Cleanup:
+Cleanup:
 
-   if (ptg != NULL)
-      HeapFree(GetProcessHeap(), 0, (LPVOID)ptg);
+  if (ptg != NULL)
+    HeapFree(GetProcessHeap(), 0, (LPVOID)ptg);
 
-   //CloseHandle(Thandle);
+  //CloseHandle(Thandle);
   return retval;
 #else
   return geteuid();
@@ -307,21 +307,21 @@
 #ifdef IS_MINGW
       &&retval!=9009
 #endif
-      ) {
+     ) {
     char *msg=NULL;
     mainw->com_failed=TRUE;
     if (!allow_error) {
-      msg=g_strdup_printf("lives_system failed with code %d: %s",retval,com);
+      msg=lives_strdup_printf("lives_system failed with code %d: %s",retval,com);
       LIVES_ERROR(msg);
       do_system_failed_error(com,retval,NULL);
     }
 #ifndef LIVES_NO_DEBUG
     else {
-      msg=g_strdup_printf("lives_system failed with code %d: %s (not an error)",retval,com);
+      msg=lives_strdup_printf("lives_system failed with code %d: %s (not an error)",retval,com);
       LIVES_DEBUG(msg);
     }
 #endif
-    if (msg!=NULL) g_free(msg);
+    if (msg!=NULL) lives_free(msg);
   }
 
   if (cnorm) lives_set_cursor_style(LIVES_CURSOR_NORMAL,NULL);
@@ -374,11 +374,11 @@
     mainw->write_failed=TRUE;
     mainw->write_failed_file=filename_from_fd(mainw->write_failed_file,fd);
     if (retval>=0)
-      msg=g_strdup_printf("Write failed %"PRIu64" of %"PRIu64" in: %s",(uint64_t)retval,
-			  (uint64_t)count,mainw->write_failed_file);
-    else 
-      msg=g_strdup_printf("Write failed with error %"PRIu64" in: %s",(uint64_t)retval,
-			  mainw->write_failed_file);
+      msg=lives_strdup_printf("Write failed %"PRIu64" of %"PRIu64" in: %s",(uint64_t)retval,
+                              (uint64_t)count,mainw->write_failed_file);
+    else
+      msg=lives_strdup_printf("Write failed with error %"PRIu64" in: %s",(uint64_t)retval,
+                              mainw->write_failed_file);
 
     if (!allow_fail) {
       LIVES_ERROR(msg);
@@ -388,16 +388,16 @@
     else {
       char *ffile=filename_from_fd(NULL,fd);
       if (retval>=0)
-	msg=g_strdup_printf("Write failed %"PRIu64" of %"PRIu64" in: %s (not an error)",(uint64_t)retval,
-			    (uint64_t)count,ffile);
-      else 
-	msg=g_strdup_printf("Write failed with error %"PRIu64" in: %s (allowed)",(uint64_t)retval,
-			    mainw->write_failed_file);
+        msg=lives_strdup_printf("Write failed %"PRIu64" of %"PRIu64" in: %s (not an error)",(uint64_t)retval,
+                                (uint64_t)count,ffile);
+      else
+        msg=lives_strdup_printf("Write failed with error %"PRIu64" in: %s (allowed)",(uint64_t)retval,
+                                mainw->write_failed_file);
       LIVES_DEBUG(msg);
-      g_free(ffile);
+      lives_free(ffile);
     }
 #endif
-    if (msg!=NULL) g_free(msg);
+    if (msg!=NULL) lives_free(msg);
   }
   return retval;
 }
@@ -410,8 +410,7 @@
     uint8_t xbuf[count];
     reverse_bytes(xbuf,(const uint8_t *)buf,count);
     return lives_write(fd,xbuf,count,allow_fail);
-  }
-  else {
+  } else {
     return lives_write(fd,buf,count,allow_fail);
   }
 
@@ -447,7 +446,7 @@
 
 static lives_file_buffer_t *find_in_file_buffers(int fd) {
   lives_file_buffer_t *fbuff;
-  GList *fblist=mainw->file_buffers;
+  LiVESList *fblist=mainw->file_buffers;
 
   while (fblist!=NULL) {
     fbuff=(lives_file_buffer_t *)fblist->data;
@@ -473,18 +472,18 @@
   char *msg=NULL;
   mainw->read_failed=TRUE;
   mainw->read_failed_file=filename_from_fd(mainw->read_failed_file,fd);
- 
+
   if (errval>=0)
-    msg=g_strdup_printf("Read failed %"PRId64" of %"PRIu64" in: %s",(int64_t)errval,
-			(uint64_t)count,mainw->read_failed_file);
-  else 
-    msg=g_strdup_printf("Read failed with error %"PRId64" in: %s",(int64_t)errval,
-			mainw->read_failed_file);
+    msg=lives_strdup_printf("Read failed %"PRId64" of %"PRIu64" in: %s",(int64_t)errval,
+                            (uint64_t)count,mainw->read_failed_file);
+  else
+    msg=lives_strdup_printf("Read failed with error %"PRId64" in: %s",(int64_t)errval,
+                            mainw->read_failed_file);
 
 
 
   LIVES_ERROR(msg);
-  g_free(msg);
+  lives_free(msg);
 }
 
 
@@ -500,10 +499,11 @@
     else {
       char *msg=NULL;
       char *ffile=filename_from_fd(NULL,fd);
-      msg=g_strdup_printf("Read got %"PRIu64" of %"PRIu64" in: %s (not an error)",(uint64_t)retval,
-			  (uint64_t)count,ffile);
+      msg=lives_strdup_printf("Read got %"PRIu64" of %"PRIu64" in: %s (not an error)",(uint64_t)retval,
+                              (uint64_t)count,ffile);
       LIVES_DEBUG(msg);
-      g_free(ffile); g_free(msg);
+      lives_free(ffile);
+      g_free(msg);
     }
 #endif
   }
@@ -519,8 +519,7 @@
     if (retval<count) return retval;
     reverse_bytes((uint8_t *)buf,(const uint8_t *)xbuf,count);
     return retval;
-  }
-  else {
+  } else {
     return lives_read(fd,buf,count,allow_less);
   }
 
@@ -535,9 +534,10 @@
 
 
 static ssize_t file_buffer_flush(lives_file_buffer_t *fbuff) {
-  ssize_t res;
+  ssize_t res=0;
 
-  res=lives_write(fbuff->fd,fbuff->buffer,fbuff->bytes,fbuff->allow_fail);
+  if (fbuff->buffer!=NULL) res=lives_write(fbuff->fd,fbuff->buffer,fbuff->bytes,fbuff->allow_fail);
+  if (res>0) fbuff->offset+=res;
 
   if (!fbuff->allow_fail&&res<fbuff->bytes) {
     lives_close_buffered(-fbuff->fd); // use -fd as lives_write will have closed
@@ -551,14 +551,15 @@
   lives_file_buffer_t *fbuff;
   int fd=open(pathname,flags,mode);
   if (fd>=0) {
-    fbuff=(lives_file_buffer_t *)g_malloc(sizeof(lives_file_buffer_t));
+    fbuff=(lives_file_buffer_t *)lives_malloc(sizeof(lives_file_buffer_t));
     fbuff->fd=fd;
     fbuff->bytes=0;
     fbuff->eof=FALSE;
     fbuff->ptr=NULL;
     fbuff->buffer=NULL;
     fbuff->read=isread;
-    mainw->file_buffers=g_list_append(mainw->file_buffers,(gpointer)fbuff);
+    fbuff->offset=0;
+    mainw->file_buffers=lives_list_append(mainw->file_buffers,(livespointer)fbuff);
   }
 
   return fd;
@@ -598,15 +599,17 @@
     boolean allow_fail=fbuff->allow_fail;
     size_t bytes=fbuff->bytes;
 
-    ret=file_buffer_flush(fbuff);
-    if (!allow_fail&&ret<bytes) return ret; // this is correct, as flush will have called close again with should_close=FALSE;
+    if (bytes>0) {
+      ret=file_buffer_flush(fbuff);
+      if (!allow_fail&&ret<bytes) return ret; // this is correct, as flush will have called close again with should_close=FALSE;
+    }
   }
 
   if (should_close && fbuff->fd>=0) ret=close(fbuff->fd);
 
-  mainw->file_buffers=g_list_remove(mainw->file_buffers,(gconstpointer)fbuff);
-  if (fbuff->buffer!=NULL) g_free(fbuff->buffer);
-  g_free(fbuff);
+  mainw->file_buffers=lives_list_remove(mainw->file_buffers,(livesconstpointer)fbuff);
+  if (fbuff->buffer!=NULL) lives_free(fbuff->buffer);
+  lives_free(fbuff);
   return ret;
 }
 
@@ -615,10 +618,11 @@
 static ssize_t file_buffer_fill(lives_file_buffer_t *fbuff) {
   ssize_t res;
 
-  if (fbuff->buffer==NULL) fbuff->buffer=(uint8_t *)g_malloc(BUFFER_FILL_BYTES);
+  if (fbuff->buffer==NULL) fbuff->buffer=(uint8_t *)lives_malloc(BUFFER_FILL_BYTES);
 
   res=lives_read(fbuff->fd,fbuff->buffer,BUFFER_FILL_BYTES,TRUE);
 
+
   if (res<0) {
     lives_close_buffered(-fbuff->fd); // use -fd as lives_read will have closed
     return res;
@@ -626,6 +630,7 @@
 
   fbuff->bytes=res;
   fbuff->ptr=fbuff->buffer;
+  fbuff->offset+=res;
 
   if (res<BUFFER_FILL_BYTES) fbuff->eof=TRUE;
   else fbuff->eof=FALSE;
@@ -647,8 +652,13 @@
   fbuff->ptr+=offset;
   fbuff->bytes-=offset;
 
-  if (fbuff->bytes<=0||fbuff->bytes>BUFFER_FILL_BYTES) {
+  fbuff->offset+=offset;
+
+  if (fbuff->offset<0) fbuff->offset=0;
+
+  if (fbuff->bytes<=0||fbuff->ptr<fbuff->buffer) {
     fbuff->bytes=0;
+    if (fbuff->ptr<fbuff->buffer) fbuff->eof=FALSE;
   }
 
   return lseek(fd,offset,SEEK_CUR);
@@ -672,7 +682,7 @@
     return 0;
   }
 
-  // read bytes from fbuff 
+  // read bytes from fbuff
   while (1) {
     if (fbuff->bytes==0&&!fbuff->eof) {
       res=file_buffer_fill(fbuff);
@@ -686,10 +696,9 @@
       ptr+=fbuff->bytes;
       fbuff->bytes=0;
       if (fbuff->eof) {
-	break;
+        break;
       }
-    }
-    else {
+    } else {
       lives_memcpy(ptr,fbuff->ptr,count);
       retval+=count;
       fbuff->ptr+=count;
@@ -715,8 +724,7 @@
     if (retval<count) return retval;
     reverse_bytes((uint8_t *)buf,(const uint8_t *)xbuf,count);
     return retval;
-  }
-  else {
+  } else {
     return lives_read_buffered(fd,buf,count,allow_less);
   }
 }
@@ -738,14 +746,14 @@
   }
 
   if (fbuff->buffer==NULL) {
-    fbuff->buffer=(uint8_t *)g_malloc(BUFFER_FILL_BYTES);
+    fbuff->buffer=(uint8_t *)lives_malloc(BUFFER_FILL_BYTES);
     fbuff->ptr=fbuff->buffer;
     fbuff->bytes=0;
   }
 
   fbuff->allow_fail=allow_fail;
 
-  // write bytes from fbuff 
+  // write bytes from fbuff
   while (count) {
     space_left=BUFFER_FILL_BYTES-fbuff->bytes;
 
@@ -759,8 +767,7 @@
       fbuff->ptr=fbuff->buffer;
       count-=space_left;
       buf+=space_left;
-    }
-    else {
+    } else {
       lives_memcpy(fbuff->ptr,buf,count);
       retval+=count;
       fbuff->ptr+=count;
@@ -777,8 +784,7 @@
     uint8_t xbuf[count];
     reverse_bytes(xbuf,(const uint8_t *)buf,count);
     return lives_write_buffered(fd,xbuf,count,allow_fail);
-  }
-  else {
+  } else {
     return lives_write_buffered(fd,buf,count,allow_fail);
   }
 
@@ -791,30 +797,24 @@
 
   if (space>lives_10pow(18)) {
     // TRANSLATORS: Exabytes
-    fmt=g_strdup_printf(_("%.2f EB"),(double)space/(double)lives_10pow(18));
-  }
-  else if (space>lives_10pow(15)) {
+    fmt=lives_strdup_printf(_("%.2f EB"),(double)space/(double)lives_10pow(18));
+  } else if (space>lives_10pow(15)) {
     // TRANSLATORS: Petabytes
-    fmt=g_strdup_printf(_("%.2f PB"),(double)space/(double)lives_10pow(15));
-  }
-  else if (space>lives_10pow(12)) {
+    fmt=lives_strdup_printf(_("%.2f PB"),(double)space/(double)lives_10pow(15));
+  } else if (space>lives_10pow(12)) {
     // TRANSLATORS: Terabytes
-    fmt=g_strdup_printf(_("%.2f TB"),(double)space/(double)lives_10pow(12));
-  }
-  else if (space>lives_10pow(9)) {
+    fmt=lives_strdup_printf(_("%.2f TB"),(double)space/(double)lives_10pow(12));
+  } else if (space>lives_10pow(9)) {
     // TRANSLATORS: Gigabytes
-    fmt=g_strdup_printf(_("%.2f GB"),(double)space/(double)lives_10pow(9));
-  }
-  else if (space>lives_10pow(6)) {
+    fmt=lives_strdup_printf(_("%.2f GB"),(double)space/(double)lives_10pow(9));
+  } else if (space>lives_10pow(6)) {
     // TRANSLATORS: Megabytes
-    fmt=g_strdup_printf(_("%.2f MB"),(double)space/(double)lives_10pow(6));
-  }
-  else if (space>1024) {
+    fmt=lives_strdup_printf(_("%.2f MB"),(double)space/(double)lives_10pow(6));
+  } else if (space>1024) {
     // TRANSLATORS: Kilobytes (1024 bytes)
-    fmt=g_strdup_printf(_("%.2f KiB"),(double)space/1024.);
-  }
-  else {
-    fmt=g_strdup_printf(_("%d bytes"),space);
+    fmt=lives_strdup_printf(_("%.2f KiB"),(double)space/1024.);
+  } else {
+    fmt=lives_strdup_printf(_("%d bytes"),space);
   }
 
   return fmt;
@@ -842,14 +842,13 @@
   retval=chdir(path);
 
   if (retval) {
-    char *msg=g_strdup_printf("Chdir failed to: %s",path);
+    char *msg=lives_strdup_printf("Chdir failed to: %s",path);
     mainw->chdir_failed=TRUE;
     if (!allow_fail) {
       LIVES_ERROR(msg);
       do_chdir_failed_error(path);
-    }
-    else LIVES_DEBUG(msg);
-    g_free(msg);
+    } else LIVES_DEBUG(msg);
+    lives_free(msg);
   }
   return retval;
 }
@@ -860,7 +859,7 @@
   // free a pointer and nullify it, only if it is non-null to start with
   // pass the address of the pointer in
   if (ptr!=NULL&&*ptr!=NULL) {
-    g_free(*ptr);
+    lives_free(*ptr);
     *ptr=NULL;
   }
 }
@@ -880,14 +879,14 @@
 DWORD CountSetBits(ULONG_PTR bitMask) {
   DWORD LSHIFT = sizeof(ULONG_PTR)*8 - 1;
   DWORD bitSetCount = 0;
-  ULONG_PTR bitTest = (ULONG_PTR)1 << LSHIFT;    
+  ULONG_PTR bitTest = (ULONG_PTR)1 << LSHIFT;
   DWORD i;
-    
+
   for (i = 0; i <= LSHIFT; ++i) {
     bitSetCount += ((bitMask & bitTest)?1:0);
     bitTest/=2;
   }
-    
+
   return bitSetCount;
 }
 
@@ -921,20 +920,20 @@
 
     if (FALSE == rc) {
       if (GetLastError() == ERROR_INSUFFICIENT_BUFFER) {
-	if (buffer) g_free(buffer);
-	  
-	buffer = (PSYSTEM_LOGICAL_PROCESSOR_INFORMATION)g_malloc(returnLength);
-	  
+	if (buffer) lives_free(buffer);
+
+	buffer = (PSYSTEM_LOGICAL_PROCESSOR_INFORMATION)lives_malloc(returnLength);
+
 	if (NULL == buffer) {
 	  LIVES_ERROR("Allocation failure");
 	  return 0;
 	}
-      } 
+      }
       else {
 	LIVES_ERROR("getting numprocs");
 	return 0;
       }
-    } 
+    }
     else {
       done = TRUE;
     }
@@ -948,16 +947,16 @@
       // Non-NUMA systems report a single record of this type.
       numaNodeCount++;
       break;
-	
+
     case RelationProcessorCore:
       processorCoreCount++;
-	
+
       // A hyperthreaded core supplies more than one logical processor.
       logicalProcessorCount += CountSetBits(ptr->ProcessorMask);
       break;
-	
+
     case RelationCache:
-      // Cache data is in ptr->Cache, one CACHE_DESCRIPTOR structure for each cache. 
+      // Cache data is in ptr->Cache, one CACHE_DESCRIPTOR structure for each cache.
       Cache = &ptr->Cache;
       if (Cache->Level == 1)
 	{
@@ -972,12 +971,12 @@
 	  processorL3CacheCount++;
 	}
       break;
-	
+
     case RelationProcessorPackage:
       // Logical processors share a physical package.
       processorPackageCount++;
       break;
-	
+
     default:
       _tprintf(TEXT("\nError: Unsupported LOGICAL_PROCESSOR_RELATIONSHIP value.\n"));
       break;
@@ -986,21 +985,21 @@
     ptr++;
   }
 */
-  /*     _tprintf(TEXT("\nGetLogicalProcessorInformation results:\n"));
-	 _tprintf(TEXT("Number of NUMA nodes: %d\n"), 
-	 numaNodeCount);
-	 _tprintf(TEXT("Number of physical processor packages: %d\n"), 
-	 processorPackageCount);
-	 _tprintf(TEXT("Number of processor cores: %d\n"), 
-	 processorCoreCount);
-	 _tprintf(TEXT("Number of logical processors: %d\n"), 
-	 logicalProcessorCount);
-	 _tprintf(TEXT("Number of processor L1/L2/L3 caches: %d/%d/%d\n"), 
-	 processorL1CacheCount,
-	 processorL2CacheCount,
-	 processorL3CacheCount);*/
-/*    
-  g_free(buffer);
+/*     _tprintf(TEXT("\nGetLogicalProcessorInformation results:\n"));
+ _tprintf(TEXT("Number of NUMA nodes: %d\n"),
+ numaNodeCount);
+ _tprintf(TEXT("Number of physical processor packages: %d\n"),
+ processorPackageCount);
+ _tprintf(TEXT("Number of processor cores: %d\n"),
+ processorCoreCount);
+ _tprintf(TEXT("Number of logical processors: %d\n"),
+ logicalProcessorCount);
+ _tprintf(TEXT("Number of processor L1/L2/L3 caches: %d/%d/%d\n"),
+ processorL1CacheCount,
+ processorL2CacheCount,
+ processorL3CacheCount);*/
+/*
+  lives_free(buffer);
 
   return logicalProcessorCount;
 }
@@ -1020,46 +1019,45 @@
   THREADENTRY32 te32;
 
   // Take a snapshot of all threads in the system.
-  hThreadSnap = CreateToolhelp32Snapshot( TH32CS_SNAPTHREAD, 0 );
-  if( hThreadSnap == INVALID_HANDLE_VALUE ) {
+  hThreadSnap = CreateToolhelp32Snapshot(TH32CS_SNAPTHREAD, 0);
+  if (hThreadSnap == INVALID_HANDLE_VALUE) {
     LIVES_ERROR("CreateToolhelp32Snapshot (of threades)");
     return FALSE;
   }
 
   // Set the size of the structure before using it.
-  te32.dwSize = sizeof( THREADENTRY32 );
+  te32.dwSize = sizeof(THREADENTRY32);
 
   // Retrieve information about the first thread,
   // and exit if unsuccessful
-  if( !Thread32First( hThreadSnap, &te32 ) ) {
+  if (!Thread32First(hThreadSnap, &te32)) {
     LIVES_ERROR("Thread32First"); // show cause of failure
-    CloseHandle( hThreadSnap );          // clean the snapshot object
-    return( FALSE );
+    CloseHandle(hThreadSnap);            // clean the snapshot object
+    return (FALSE);
   }
 
   // Now walk the snapshot of threads, and suspend/resume any owned by process
 
   do {
-    hThread = OpenThread( THREAD_SUSPEND_RESUME, FALSE, te32.th32ThreadID );
-    if( hThread == NULL ) continue;
+    hThread = OpenThread(THREAD_SUSPEND_RESUME, FALSE, te32.th32ThreadID);
+    if (hThread == NULL) continue;
 
     if (te32.th32OwnerProcessID == pid) {
       if (suspend) {
-	SuspendThread(hThread);
-      }
-      else {
-	ResumeThread(hThread);
+        SuspendThread(hThread);
+      } else {
+        ResumeThread(hThread);
       }
     }
 
-    CloseHandle( hThread );
+    CloseHandle(hThread);
 
-  } while( Thread32Next( hThreadSnap, &te32 ) );
+  } while (Thread32Next(hThreadSnap, &te32));
 
-  CloseHandle( hThreadSnap );
+  CloseHandle(hThreadSnap);
 
   return TRUE;
- 
+
 }
 
 
@@ -1071,21 +1069,21 @@
   if (pid==0) return TRUE;
 
   // Take a snapshot of all processes in the system.
-  hProcessSnap = CreateToolhelp32Snapshot( TH32CS_SNAPPROCESS, 0 );
-  if( hProcessSnap == INVALID_HANDLE_VALUE ) {
+  hProcessSnap = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0);
+  if (hProcessSnap == INVALID_HANDLE_VALUE) {
     LIVES_ERROR("CreateToolhelp32Snapshot (of processes)");
     return FALSE;
   }
 
   // Set the size of the structure before using it.
-  pe32.dwSize = sizeof( PROCESSENTRY32 );
+  pe32.dwSize = sizeof(PROCESSENTRY32);
 
   // Retrieve information about the first process,
   // and exit if unsuccessful
-  if( !Process32First( hProcessSnap, &pe32 ) ) {
+  if (!Process32First(hProcessSnap, &pe32)) {
     LIVES_ERROR("Process32First"); // show cause of failure
-    CloseHandle( hProcessSnap );          // clean the snapshot object
-    return( FALSE );
+    CloseHandle(hProcessSnap);            // clean the snapshot object
+    return (FALSE);
   }
 
   // resume this thread first
@@ -1095,12 +1093,12 @@
   // display information about each process in turn
 
   do {
-    hProcess = OpenProcess( PROCESS_TERMINATE, FALSE, pe32.th32ProcessID );
-    if( hProcess == NULL ) continue;
+    hProcess = OpenProcess(PROCESS_TERMINATE, FALSE, pe32.th32ProcessID);
+    if (hProcess == NULL) continue;
 
     // TODO - find equivalent on "real" windows
     if (!strcmp(pe32.szExeFile,"wineconsole.exe")) {
-      CloseHandle( hProcess );
+      CloseHandle(hProcess);
       continue;
     }
 
@@ -1109,11 +1107,11 @@
       lives_win32_suspend_resume_process(pe32.th32ProcessID, suspend);
     }
 
-    CloseHandle( hProcess );
+    CloseHandle(hProcess);
+
+  } while (Process32Next(hProcessSnap, &pe32));
 
-  } while( Process32Next( hProcessSnap, &pe32 ) );
- 
-  CloseHandle( hProcessSnap );
+  CloseHandle(hProcessSnap);
 
   // suspend this thread last
   if (suspend) lives_win32_suspend_resume_threads(pid, TRUE);
@@ -1131,35 +1129,35 @@
   if (pid==0) return TRUE;
 
   // Take a snapshot of all processes in the system.
-  hProcessSnap = CreateToolhelp32Snapshot( TH32CS_SNAPPROCESS, 0 );
-  if( hProcessSnap == INVALID_HANDLE_VALUE ) {
+  hProcessSnap = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0);
+  if (hProcessSnap == INVALID_HANDLE_VALUE) {
     LIVES_ERROR("CreateToolhelp32Snapshot (of processes)");
     return FALSE;
   }
 
   // Set the size of the structure before using it.
-  pe32.dwSize = sizeof( PROCESSENTRY32 );
+  pe32.dwSize = sizeof(PROCESSENTRY32);
 
   // Retrieve information about the first process,
   // and exit if unsuccessful
-  if( !Process32First( hProcessSnap, &pe32 ) ) {
+  if (!Process32First(hProcessSnap, &pe32)) {
     LIVES_ERROR("Process32First"); // show cause of failure
-    CloseHandle( hProcessSnap );          // clean the snapshot object
-    return( FALSE );
+    CloseHandle(hProcessSnap);            // clean the snapshot object
+    return (FALSE);
   }
 
   // Now walk the snapshot of processes, and
   // display information about each process in turn
 
   do {
-    hProcess = OpenProcess( PROCESS_TERMINATE, FALSE, pe32.th32ProcessID );
-    if( hProcess == NULL ) continue;
+    hProcess = OpenProcess(PROCESS_TERMINATE, FALSE, pe32.th32ProcessID);
+    if (hProcess == NULL) continue;
 
     //g_print("handling process %d %d : %s\n",pe32.th32ParentProcessID,pe32.th32ProcessID,pe32.szExeFile);
 
     // TODO - find equivalent on "real" windows
     if (!strcmp(pe32.szExeFile,"wineconsole.exe")) {
-      CloseHandle( hProcess );
+      CloseHandle(hProcess);
       continue;
     }
 
@@ -1167,48 +1165,48 @@
       lives_win32_kill_subprocesses(pe32.th32ProcessID, TRUE);
     }
 
-    CloseHandle( hProcess );
+    CloseHandle(hProcess);
 
-  } while( Process32Next( hProcessSnap, &pe32 ) );
+  } while (Process32Next(hProcessSnap, &pe32));
 
-  CloseHandle( hProcessSnap );
+  CloseHandle(hProcessSnap);
 
   if (kill_parent) {
 
-    hProcessSnap = CreateToolhelp32Snapshot( TH32CS_SNAPPROCESS, 0 );
-    if( hProcessSnap == INVALID_HANDLE_VALUE ) {
+    hProcessSnap = CreateToolhelp32Snapshot(TH32CS_SNAPPROCESS, 0);
+    if (hProcessSnap == INVALID_HANDLE_VALUE) {
       LIVES_ERROR("CreateToolhelp32Snapshot (of processes)");
       return FALSE;
     }
-    
+
     // Set the size of the structure before using it.
-    pe32.dwSize = sizeof( PROCESSENTRY32 );
-    
+    pe32.dwSize = sizeof(PROCESSENTRY32);
+
     // Retrieve information about the first process,
     // and exit if unsuccessful
-    if( !Process32First( hProcessSnap, &pe32 ) ) {
+    if (!Process32First(hProcessSnap, &pe32)) {
       LIVES_ERROR("Process32First"); // show cause of failure
-      CloseHandle( hProcessSnap );          // clean the snapshot object
-      return( FALSE );
+      CloseHandle(hProcessSnap);            // clean the snapshot object
+      return (FALSE);
     }
-    
+
     // Now walk the snapshot of processes, and
     // display information about each process in turn
-    
+
     do {
-      hProcess = OpenProcess( PROCESS_TERMINATE, FALSE, pe32.th32ProcessID );
-      if( hProcess == NULL ) continue;
-      
+      hProcess = OpenProcess(PROCESS_TERMINATE, FALSE, pe32.th32ProcessID);
+      if (hProcess == NULL) continue;
+
       if (pe32.th32ProcessID == pid) {
-	//g_print("killing %d\n", pe32.th32ProcessID);
-	TerminateProcess(hProcess, 0);
+        //g_print("killing %d\n", pe32.th32ProcessID);
+        TerminateProcess(hProcess, 0);
       }
 
-      CloseHandle( hProcess );
-      
-    } while( Process32Next( hProcessSnap, &pe32 ) );
-    
-    CloseHandle( hProcessSnap );
+      CloseHandle(hProcess);
+
+    } while (Process32Next(hProcessSnap, &pe32));
+
+    CloseHandle(hProcessSnap);
 
   }
 
@@ -1227,8 +1225,8 @@
   }
   return kill(pid,sig);
 #else
-  CloseHandle( pid->hProcess );
-  CloseHandle( pid->hThread );
+  CloseHandle(pid->hProcess);
+  CloseHandle(pid->hThread);
   GenerateConsoleCtrlEvent(CTRL_BREAK_EVENT, pid->dwProcessId);
 #endif
   return 0;
@@ -1239,8 +1237,8 @@
 #ifndef IS_MINGW
   return killpg(pgrp,sig);
 #else
-  CloseHandle( pgrp->hProcess );
-  CloseHandle( pgrp->hThread );
+  CloseHandle(pgrp->hProcess);
+  CloseHandle(pgrp->hThread);
   GenerateConsoleCtrlEvent(CTRL_BREAK_EVENT, pgrp->dwProcessId);
 #endif
   return 0;
@@ -1251,15 +1249,15 @@
   return (n>=0.)?(int)(n + 0.5):(int)(n - 0.5);
 }
 
-LIVES_INLINE void clear_mainw_msg (void) {
-  memset (mainw->msg,0,512);
+LIVES_INLINE void clear_mainw_msg(void) {
+  memset(mainw->msg,0,512);
 }
 
 
 LIVES_INLINE uint64_t lives_10pow(int pow) {
   register int i;
   uint64_t res=1;
-  for (i=0;i<pow;i++) res*=10;
+  for (i=0; i<pow; i++) res*=10;
   return res;
 }
 
@@ -1287,7 +1285,7 @@
 
 
 /** set alarm for now + delta ticks (10 nanosec)
- * param ticks (10 nanoseconds) is the offset when we want our alarm to trigger 
+ * param ticks (10 nanoseconds) is the offset when we want our alarm to trigger
  * returns int handle or -1
  * call lives_get_alarm(handle) to test if time arrived
  */
@@ -1380,31 +1378,34 @@
   alarm_handle--;
 
   mainw->alarms[alarm_handle]=LIVES_NO_ALARM_TICKS;
-  if (mainw->next_free_alarm==-1 || alarm_handle<mainw->next_free_alarm) 
+  if (mainw->next_free_alarm==-1 || alarm_handle<mainw->next_free_alarm)
     mainw->next_free_alarm=alarm_handle;
 }
 
 
 
-LIVES_INLINE char *g_strappend (char *string, int len, const char *xnew) {
-  char *tmp=g_strconcat (string,xnew,NULL);
-  g_snprintf(string,len,"%s",tmp);
-  g_free(tmp);
+LIVES_INLINE char *lives_strappend(char *string, int len, const char *xnew) {
+  char *tmp=lives_strconcat(string,xnew,NULL);
+  lives_snprintf(string,len,"%s",tmp);
+  lives_free(tmp);
   return string;
 }
 
 
-LIVES_INLINE GList *g_list_append_unique(GList *xlist, const char *add) {
-  if (g_list_find_custom(xlist,add,(GCompareFunc)strcmp)==NULL) return g_list_append(xlist,g_strdup(add));
+LIVES_INLINE LiVESList *lives_list_append_unique(LiVESList *xlist, const char *add) {
+  if (lives_list_find_custom(xlist,add,(LiVESCompareFunc)strcmp)==NULL) return lives_list_append(xlist,lives_strdup(add));
   return xlist;
 }
 
 
 LIVES_INLINE const char *get_image_ext_for_type(lives_image_type_t imgtype) {
   switch (imgtype) {
-  case IMG_TYPE_JPEG: return "jpg";
-  case IMG_TYPE_PNG: return "png";
-  default: return "";
+  case IMG_TYPE_JPEG:
+    return "jpg";
+  case IMG_TYPE_PNG:
+    return "png";
+  default:
+    return "";
   }
 }
 
@@ -1414,7 +1415,7 @@
   char *b=(char *)(&f);
   if (capable->byte_order==LIVES_LITTLE_ENDIAN) {
     float fl;
-    guchar rev[4];
+    uint8_t rev[4];
     rev[0]=b[3];
     rev[1]=b[2];
     rev[2]=b[1];
@@ -1426,11 +1427,11 @@
 }
 
 
-LIVES_INLINE double calc_time_from_frame (int clip, int frame) {
+LIVES_INLINE double calc_time_from_frame(int clip, int frame) {
   return (frame-1.)/mainw->files[clip]->fps;
 }
 
-LIVES_INLINE int calc_frame_from_time (int filenum, double time) {
+LIVES_INLINE int calc_frame_from_time(int filenum, double time) {
   // return the nearest frame (rounded) for a given time, max is cfile->frames
   int frame=0;
   if (time<0.) return mainw->files[filenum]->frames?1:0;
@@ -1438,7 +1439,7 @@
   return (frame<mainw->files[filenum]->frames)?frame:mainw->files[filenum]->frames;
 }
 
-LIVES_INLINE int calc_frame_from_time2 (int filenum, double time) {
+LIVES_INLINE int calc_frame_from_time2(int filenum, double time) {
   // return the nearest frame (rounded) for a given time
   // allow max (frames+1)
   int frame=0;
@@ -1447,7 +1448,7 @@
   return (frame<mainw->files[filenum]->frames+1)?frame:mainw->files[filenum]->frames+1;
 }
 
-LIVES_INLINE int calc_frame_from_time3 (int filenum, double time) {
+LIVES_INLINE int calc_frame_from_time3(int filenum, double time) {
   // return the nearest frame (floor) for a given time
   // allow max (frames+1)
   int frame=0;
@@ -1458,26 +1459,29 @@
 
 
 
+boolean is_realtime_aplayer(int ptype) {
+  if (ptype==AUD_PLAYER_JACK||ptype==AUD_PLAYER_PULSE) return TRUE;
+  return FALSE;
+}
 
 
-static boolean check_for_audio_stop (int fileno, int first_frame, int last_frame) {
+static boolean check_for_audio_stop(int fileno, int first_frame, int last_frame) {
   // return FALSE if audio stops playback
 
 #ifdef ENABLE_JACK
   if (prefs->audio_player==AUD_PLAYER_JACK&&mainw->jackd!=NULL&&mainw->jackd->playing_file==fileno) {
     if (!mainw->loop) {
       if (!mainw->loop_cont) {
-	if (mainw->aframeno<first_frame||mainw->aframeno>last_frame) {
-	  return FALSE;
-	}
+        if (mainw->aframeno<first_frame||mainw->aframeno>last_frame) {
+          return FALSE;
+        }
       }
-    }
-    else {
+    } else {
       if (!mainw->loop_cont) {
-	if (mainw->aframeno<1||
-	    calc_time_from_frame(mainw->current_file,mainw->aframeno)>cfile->laudio_time) { 
-	  return FALSE;
-	}
+        if (mainw->aframeno<1||
+            calc_time_from_frame(mainw->current_file,mainw->aframeno)>cfile->laudio_time) {
+          return FALSE;
+        }
       }
     }
   }
@@ -1486,17 +1490,16 @@
   if (prefs->audio_player==AUD_PLAYER_PULSE&&mainw->pulsed!=NULL&&mainw->pulsed->playing_file==fileno) {
     if (!mainw->loop) {
       if (!mainw->loop_cont) {
-	if (mainw->aframeno<first_frame||mainw->aframeno>last_frame) {
-	  return FALSE;
-	}
+        if (mainw->aframeno<first_frame||mainw->aframeno>last_frame) {
+          return FALSE;
+        }
       }
-    }
-    else {
+    } else {
       if (!mainw->loop_cont) {
-	if (mainw->aframeno<1||
-	    calc_time_from_frame(mainw->current_file,mainw->aframeno)>cfile->laudio_time) { 
-	  return FALSE;
-	}
+        if (mainw->aframeno<1||
+            calc_time_from_frame(mainw->current_file,mainw->aframeno)>cfile->laudio_time) {
+          return FALSE;
+        }
       }
     }
   }
@@ -1508,7 +1511,7 @@
 void calc_aframeno(int fileno) {
 #ifdef ENABLE_JACK
   if (prefs->audio_player==AUD_PLAYER_JACK&&((mainw->jackd!=NULL&&mainw->jackd->playing_file==fileno)||
-					     (mainw->jackd_read!=NULL&&mainw->jackd_read->playing_file==fileno))) {
+      (mainw->jackd_read!=NULL&&mainw->jackd_read->playing_file==fileno))) {
     // get seek_pos from jack
     if (mainw->jackd_read!=NULL) mainw->aframeno=lives_jack_get_pos(mainw->jackd_read)/cfile->fps+1.;
     else mainw->aframeno=lives_jack_get_pos(mainw->jackd)/cfile->fps+1.;
@@ -1516,7 +1519,7 @@
 #endif
 #ifdef HAVE_PULSE_AUDIO
   if (prefs->audio_player==AUD_PLAYER_PULSE&&((mainw->pulsed!=NULL&& mainw->pulsed->playing_file==fileno)||
-					      (mainw->pulsed_read!=NULL&&mainw->pulsed_read->playing_file==fileno))) {
+      (mainw->pulsed_read!=NULL&&mainw->pulsed_read->playing_file==fileno))) {
     // get seek_pos from pulse
     if (mainw->pulsed_read!=NULL) mainw->aframeno=lives_pulse_get_pos(mainw->pulsed_read)/cfile->fps+1.;
     else mainw->aframeno=lives_pulse_get_pos(mainw->pulsed)/cfile->fps+1.;
@@ -1535,17 +1538,17 @@
 
   // which is generally 1 -> sfile->frames, unless we are playing a selection
 
-  // in case the frame is out of range and playing, returns 0 and sets mainw->cancelled 
+  // in case the frame is out of range and playing, returns 0 and sets mainw->cancelled
 
   // ntc is adjusted backwards to timecode of the new frame
 
 
-  // the basic operation is quite simple, given the time difference between the last frame and 
+  // the basic operation is quite simple, given the time difference between the last frame and
   // now, we calculate the new frame from the current fps and then ensure it is in the range
   // first_frame -> last_frame
 
-  // Complications arise because we have ping-pong loop mode where the the play direction 
-  // alternates - here we need to determine how many times we have reached the start or end 
+  // Complications arise because we have ping-pong loop mode where the the play direction
+  // alternates - here we need to determine how many times we have reached the start or end
   // play point. This is similar to the winding number in topological calculations.
 
   // caller should check return value of ntc, and if it differs from otc, show the frame
@@ -1602,8 +1605,7 @@
     if (last_frame>sfile->frames) last_frame=sfile->frames;
     first_frame=mainw->playing_sel?sfile->start:mainw->play_start;
     if (first_frame>sfile->frames) first_frame=sfile->frames;
-  }
-  else {
+  } else {
     last_frame=sfile->frames;
     first_frame=1;
   }
@@ -1621,8 +1623,8 @@
     // check if video stopped playback
     if ((sfile->clip_type==CLIP_TYPE_DISK||sfile->clip_type==CLIP_TYPE_FILE)&&(nframe<first_frame||nframe>last_frame)) {
       if (mainw->whentostop==STOP_ON_VID_END) {
-	mainw->cancelled=CANCEL_VID_END;
-	return 0;
+        mainw->cancelled=CANCEL_VID_END;
+        return 0;
       }
     }
 
@@ -1631,17 +1633,17 @@
 #ifdef RT_AUDIO
     if (mainw->whentostop==STOP_ON_AUD_END&&sfile->achans>0&&sfile->frames>0) {
       if (!check_for_audio_stop(fileno,first_frame,last_frame)) {
-	mainw->cancelled=CANCEL_AUD_END;
-	return 0;
+        mainw->cancelled=CANCEL_AUD_END;
+        return 0;
       }
     }
 #endif
   }
-  
+
   if (sfile->frames==0) return 0;
 
   // get our frame back to within bounds
-  
+
   nframe-=first_frame;
 
   if (fps>0) {
@@ -1650,8 +1652,7 @@
       dir=(int)((double)nframe/(double)(last_frame-first_frame+1));
       dir%=2;
     }
-  }
-  else {
+  } else {
     dir=1;
     if (mainw->ping_pong) {
       nframe-=(last_frame-first_frame);
@@ -1668,61 +1669,56 @@
     if (dir==1) {
       // even winding
       if (!mainw->ping_pong) {
-	// loop
-	if (nframe<0) nframe+=last_frame+1;
-	else nframe+=first_frame;
-	if (nframe>cframe&&mainw->playing_file==fileno&&mainw->loop_cont&&!mainw->loop) {
-	  // resync audio at end of loop section (playing backwards)
-	  do_resync=TRUE;
-	}
-      }
-      else {
-	nframe+=last_frame; // normal
-	if (nframe>last_frame) {
-	  nframe=last_frame-(nframe-last_frame);
-	  if (mainw->playing_file==fileno) dirchange_callback (NULL,NULL,0,(LiVESXModifierType)0,LIVES_INT_TO_POINTER(FALSE));
-	  else sfile->pb_fps=-sfile->pb_fps;
-	}
+        // loop
+        if (nframe<0) nframe+=last_frame+1;
+        else nframe+=first_frame;
+        if (nframe>cframe&&mainw->playing_file==fileno&&mainw->loop_cont&&!mainw->loop) {
+          // resync audio at end of loop section (playing backwards)
+          do_resync=TRUE;
+        }
+      } else {
+        nframe+=last_frame; // normal
+        if (nframe>last_frame) {
+          nframe=last_frame-(nframe-last_frame);
+          if (mainw->playing_file==fileno) dirchange_callback(NULL,NULL,0,(LiVESXModifierType)0,LIVES_INT_TO_POINTER(FALSE));
+          else sfile->pb_fps=-sfile->pb_fps;
+        }
       }
-    }
-    else {
+    } else {
       // odd winding
       nframe=ABS(nframe)+first_frame;
       if (mainw->ping_pong) {
-	// bounce
-	if (mainw->playing_file==fileno) dirchange_callback (NULL,NULL,0,(LiVESXModifierType)0,LIVES_INT_TO_POINTER(FALSE));
-	else sfile->pb_fps=-sfile->pb_fps;
+        // bounce
+        if (mainw->playing_file==fileno) dirchange_callback(NULL,NULL,0,(LiVESXModifierType)0,LIVES_INT_TO_POINTER(FALSE));
+        else sfile->pb_fps=-sfile->pb_fps;
       }
     }
-  }
-  else {
+  } else {
     // forwards
     nframe+=first_frame;
     if (dir==1) {
       // odd winding
       if (mainw->ping_pong) {
-	// bounce
-	nframe=last_frame-(nframe-(first_frame-1));
-	if (mainw->playing_file==fileno) dirchange_callback (NULL,NULL,0,(LiVESXModifierType)0,LIVES_INT_TO_POINTER(FALSE));
-	else sfile->pb_fps=-sfile->pb_fps;
+        // bounce
+        nframe=last_frame-(nframe-(first_frame-1));
+        if (mainw->playing_file==fileno) dirchange_callback(NULL,NULL,0,(LiVESXModifierType)0,LIVES_INT_TO_POINTER(FALSE));
+        else sfile->pb_fps=-sfile->pb_fps;
       }
-    }
-    else if (mainw->playing_sel&&!mainw->ping_pong&&mainw->playing_file==fileno&&nframe<cframe&&mainw->loop_cont&&!mainw->loop) {
+    } else if (mainw->playing_sel&&!mainw->ping_pong&&mainw->playing_file==fileno&&nframe<cframe&&mainw->loop_cont&&!mainw->loop) {
       // resync audio at start of loop selection
       if (nframe<first_frame) {
-	nframe=last_frame-(first_frame-nframe)+1;
+        nframe=last_frame-(first_frame-nframe)+1;
       }
       do_resync=TRUE;
     }
     if (nframe<first_frame) {
       // scratch or transport backwards
       if (mainw->ping_pong) {
-	nframe=first_frame;
-	if (mainw->playing_file==fileno) dirchange_callback (NULL,NULL,0,(LiVESXModifierType)0,LIVES_INT_TO_POINTER(FALSE));
-	else sfile->pb_fps=-sfile->pb_fps;
+        nframe=first_frame;
+        if (mainw->playing_file==fileno) dirchange_callback(NULL,NULL,0,(LiVESXModifierType)0,LIVES_INT_TO_POINTER(FALSE));
+        else sfile->pb_fps=-sfile->pb_fps;
 
-      }
-      else nframe=last_frame-nframe;
+      } else nframe=last_frame-nframe;
     }
   }
 
@@ -1735,15 +1731,15 @@
       if (mainw->scratch==SCRATCH_JUMP) is_jump=TRUE;
       mainw->scratch=SCRATCH_NONE;
       if (sfile->achans>0) {
-	resync_audio(nframe);
+        resync_audio(nframe);
       }
       if (is_jump) mainw->video_seek_ready=TRUE;
       if (mainw->whentostop==STOP_ON_AUD_END&&sfile->achans>0) {
-	// we check for audio stop here, but the seek may not have happened yet
-	if (!check_for_audio_stop(fileno,first_frame,last_frame)) {
-	  mainw->cancelled=CANCEL_AUD_END;
-	  return 0;
-	}
+        // we check for audio stop here, but the seek may not have happened yet
+        if (!check_for_audio_stop(fileno,first_frame,last_frame)) {
+          mainw->cancelled=CANCEL_AUD_END;
+          return 0;
+        }
       }
     }
   }
@@ -1783,8 +1779,7 @@
     *cheight=rheight;
     *cwidth=((double)rheight*aspect+.5);
     if (*cwidth>rwidth) *cwidth=rwidth;
-  }
-  else {
+  } else {
     // bound by rwidth
     *cwidth=rwidth;
     *cheight=((double)rwidth/aspect+.5);
@@ -1809,15 +1804,14 @@
       mainw->error=TRUE;
       return;
     }
-  }
-  else if (clipboard->frames>0) { 
+  } else if (clipboard->frames>0) {
     // clear old clipboard
     // need to set current file to 0 before monitoring progress
     mainw->current_file=0;
     cfile->cb_src=current_file;
 
     if (cfile->clip_type==CLIP_TYPE_FILE) {
-      if (cfile->frame_index!=NULL) g_free(cfile->frame_index);
+      if (cfile->frame_index!=NULL) lives_free(cfile->frame_index);
       cfile->frame_index=NULL;
       close_decoder_plugin((lives_decoder_t *)cfile->ext_src);
       cfile->ext_src=NULL;
@@ -1825,10 +1819,10 @@
     }
 
     mainw->com_failed=FALSE;
-    com=g_strdup_printf("%s delete_all \"%s\"",prefs->backend,clipboard->handle);
+    com=lives_strdup_printf("%s delete_all \"%s\"",prefs->backend,clipboard->handle);
     unlink(clipboard->info_file);
     lives_system(com,FALSE);
-    g_free(com);
+    lives_free(com);
 
     if (mainw->com_failed) {
       mainw->current_file=current_file;
@@ -1838,7 +1832,7 @@
     cfile->progress_start=cfile->start;
     cfile->progress_end=cfile->end;
     // show a progress dialog, not cancellable
-    do_progress_dialog(TRUE,FALSE,_ ("Clearing the clipboard"));
+    do_progress_dialog(TRUE,FALSE,_("Clearing the clipboard"));
   }
 
   clipboard->cb_src=current_file;
@@ -1847,54 +1841,59 @@
 
 
 
-void d_print(const char *text) {
+void d_print(const char *fmt, ...) {
   // print out output in the main message area (and info log)
 
-  
-
   // there are several small tweaks for this:
 
   // mainw->suppress_dprint :: TRUE - dont print anything, return (for silencing noisy message blocks)
   // mainw->no_switch_dprint :: TRUE - disable printing of switch message when maine->current_file changes
 
   // mainw->last_dprint_file :: clip number of last mainw->current_file;
-  char *switchtext,*tmp;
-
   LiVESTextBuffer *tbuf=lives_text_view_get_buffer(LIVES_TEXT_VIEW(mainw->textview1));
 
+  va_list xargs;
+
+  char *switchtext,*tmp,*text;
+
   if (!capable->smog_version_correct) return;
 
   if (mainw->suppress_dprint) return;
 
-  if (LIVES_IS_TEXT_VIEW (mainw->textview1)) {
+  va_start(xargs,fmt);
+
+  text=lives_strdup_vprintf(fmt,xargs);
+
+  va_end(xargs);
+
+  if (LIVES_IS_TEXT_VIEW(mainw->textview1)) {
     lives_text_buffer_insert_at_end(tbuf,text);
     if (mainw->current_file!=mainw->last_dprint_file&&mainw->current_file!=0&&mainw->multitrack==NULL&&
-	(mainw->current_file==-1||cfile->clip_type!=CLIP_TYPE_GENERATOR)&&!mainw->no_switch_dprint) {
+        (mainw->current_file==-1||cfile->clip_type!=CLIP_TYPE_GENERATOR)&&!mainw->no_switch_dprint) {
       if (mainw->current_file>0) {
-	switchtext=g_strdup_printf (_ ("\n==============================\nSwitched to clip %s\n"),
-				    cfile->clip_type!=CLIP_TYPE_VIDEODEV?(tmp=g_path_get_basename(cfile->name)):
-				    (tmp=g_strdup(cfile->name)));
-	g_free(tmp);
-      }
-      else {
-	switchtext=g_strdup (_ ("\n==============================\nSwitched to empty clip\n"));
+        switchtext=lives_strdup_printf(_("\n==============================\nSwitched to clip %s\n"),tmp=get_menu_name(cfile));
+        lives_free(tmp);
+      } else {
+        switchtext=lives_strdup(_("\n==============================\nSwitched to empty clip\n"));
       }
       lives_text_buffer_insert_at_end(tbuf,switchtext);
-      g_free (switchtext);
+      lives_free(switchtext);
     }
     if ((mainw->current_file==-1||cfile->clip_type!=CLIP_TYPE_GENERATOR)&&
-	(!mainw->no_switch_dprint||mainw->current_file!=0)) mainw->last_dprint_file=mainw->current_file;
-    lives_text_view_scroll_onscreen(LIVES_TEXT_VIEW (mainw->textview1));
+        (!mainw->no_switch_dprint||mainw->current_file!=0)) mainw->last_dprint_file=mainw->current_file;
+    lives_text_view_scroll_onscreen(LIVES_TEXT_VIEW(mainw->textview1));
   }
+
+  lives_free(text);
 }
 
 
 
-boolean add_lmap_error(lives_lmap_error_t lerror, const char *name, livespointer user_data, int clipno, 
-			int frameno, double atime, boolean affects_current) {
+boolean add_lmap_error(lives_lmap_error_t lerror, const char *name, livespointer user_data, int clipno,
+                       int frameno, double atime, boolean affects_current) {
   // potentially add a layout map error to the layout textbuffer
   LiVESTextIter end_iter;
-  GList *lmap;
+  LiVESList *lmap;
 
   char *text,*name2;
   char **array;
@@ -1907,104 +1906,104 @@
   lives_text_buffer_get_end_iter(LIVES_TEXT_BUFFER(mainw->layout_textbuffer),&end_iter);
 
   if (affects_current&&user_data==NULL) {
-    mainw->affected_layout_marks=g_list_append(mainw->affected_layout_marks,
-					       (gpointer)lives_text_buffer_create_mark
-					       (LIVES_TEXT_BUFFER(mainw->layout_textbuffer),NULL,&end_iter,TRUE));
+    mainw->affected_layout_marks=lives_list_append(mainw->affected_layout_marks,
+                                 (livespointer)lives_text_buffer_create_mark
+                                 (LIVES_TEXT_BUFFER(mainw->layout_textbuffer),NULL,&end_iter,TRUE));
   }
 
   switch (lerror) {
   case LMAP_INFO_SETNAME_CHANGED:
-    if (strlen(name)==0) name2=g_strdup(_("(blank)"));
-    else name2=g_strdup(name);
-    text=g_strdup_printf
-      (_("The set name has been changed from %s to %s. Affected layouts have been updated accordingly\n"),
-       name2,(char *)user_data);
+    if (strlen(name)==0) name2=lives_strdup(_("(blank)"));
+    else name2=lives_strdup(name);
+    text=lives_strdup_printf
+         (_("The set name has been changed from %s to %s. Affected layouts have been updated accordingly\n"),
+          name2,(char *)user_data);
     lives_text_buffer_insert(LIVES_TEXT_BUFFER(mainw->layout_textbuffer),&end_iter,text,-1);
-    g_free(name2);
-    g_free(text);
+    lives_free(name2);
+    lives_free(text);
     break;
   case LMAP_ERROR_MISSING_CLIP:
     if (prefs->warning_mask&WARN_MASK_LAYOUT_MISSING_CLIPS) return FALSE;
-    text=g_strdup_printf(_("The clip %s is missing from this set.\nIt is required by the following layouts:\n"),name);
+    text=lives_strdup_printf(_("The clip %s is missing from this set.\nIt is required by the following layouts:\n"),name);
     lives_text_buffer_insert(LIVES_TEXT_BUFFER(mainw->layout_textbuffer),&end_iter,text,-1);
-    g_free(text);
+    lives_free(text);
   case LMAP_ERROR_CLOSE_FILE:
-    text=g_strdup_printf(_("The clip %s has been closed.\nIt is required by the following layouts:\n"),name);
+    text=lives_strdup_printf(_("The clip %s has been closed.\nIt is required by the following layouts:\n"),name);
     lives_text_buffer_insert(LIVES_TEXT_BUFFER(mainw->layout_textbuffer),&end_iter,text,-1);
-    g_free(text);
+    lives_free(text);
     break;
   case LMAP_ERROR_SHIFT_FRAMES:
-    text=g_strdup_printf(_("Frames have been shifted in the clip %s.\nThe following layouts are affected:\n"),name);
+    text=lives_strdup_printf(_("Frames have been shifted in the clip %s.\nThe following layouts are affected:\n"),name);
     lives_text_buffer_insert(LIVES_TEXT_BUFFER(mainw->layout_textbuffer),&end_iter,text,-1);
-    g_free(text);
+    lives_free(text);
     break;
   case LMAP_ERROR_DELETE_FRAMES:
-    text=g_strdup_printf(_("Frames have been deleted from the clip %s.\nThe following layouts are affected:\n"),name);
+    text=lives_strdup_printf(_("Frames have been deleted from the clip %s.\nThe following layouts are affected:\n"),name);
     lives_text_buffer_insert(LIVES_TEXT_BUFFER(mainw->layout_textbuffer),&end_iter,text,-1);
-    g_free(text);
+    lives_free(text);
     break;
   case LMAP_ERROR_DELETE_AUDIO:
-    text=g_strdup_printf(_("Audio has been deleted from the clip %s.\nThe following layouts are affected:\n"),name);
+    text=lives_strdup_printf(_("Audio has been deleted from the clip %s.\nThe following layouts are affected:\n"),name);
     lives_text_buffer_insert(LIVES_TEXT_BUFFER(mainw->layout_textbuffer),&end_iter,text,-1);
-    g_free(text);
+    lives_free(text);
     break;
   case LMAP_ERROR_SHIFT_AUDIO:
-    text=g_strdup_printf(_("Audio has been shifted in clip %s.\nThe following layouts are affected:\n"),name);
+    text=lives_strdup_printf(_("Audio has been shifted in clip %s.\nThe following layouts are affected:\n"),name);
     lives_text_buffer_insert(LIVES_TEXT_BUFFER(mainw->layout_textbuffer),&end_iter,text,-1);
-    g_free(text);
+    lives_free(text);
     break;
   case LMAP_ERROR_ALTER_AUDIO:
-    text=g_strdup_printf(_("Audio has been altered in the clip %s.\nThe following layouts are affected:\n"),name);
+    text=lives_strdup_printf(_("Audio has been altered in the clip %s.\nThe following layouts are affected:\n"),name);
     lives_text_buffer_insert(LIVES_TEXT_BUFFER(mainw->layout_textbuffer),&end_iter,text,-1);
-    g_free(text);
+    lives_free(text);
     break;
   case LMAP_ERROR_ALTER_FRAMES:
-    text=g_strdup_printf(_("Frames have been altered in the clip %s.\nThe following layouts are affected:\n"),name);
+    text=lives_strdup_printf(_("Frames have been altered in the clip %s.\nThe following layouts are affected:\n"),name);
     lives_text_buffer_insert(LIVES_TEXT_BUFFER(mainw->layout_textbuffer),&end_iter,text,-1);
-    g_free(text);
+    lives_free(text);
     break;
   }
 
   if (affects_current&&user_data!=NULL) {
-    mainw->affected_layout_marks=g_list_append(mainw->affected_layout_marks,
-					       (gpointer)lives_text_buffer_create_mark
-					       (LIVES_TEXT_BUFFER(mainw->layout_textbuffer),NULL,&end_iter,TRUE));
+    mainw->affected_layout_marks=lives_list_append(mainw->affected_layout_marks,
+                                 (livespointer)lives_text_buffer_create_mark
+                                 (LIVES_TEXT_BUFFER(mainw->layout_textbuffer),NULL,&end_iter,TRUE));
   }
 
   switch (lerror) {
   case LMAP_INFO_SETNAME_CHANGED:
     lmap=mainw->current_layouts_map;
     while (lmap!=NULL) {
-      array=g_strsplit((char *)lmap->data,"|",-1);
-      text=g_strdup_printf("%s\n",array[0]);
+      array=lives_strsplit((char *)lmap->data,"|",-1);
+      text=lives_strdup_printf("%s\n",array[0]);
       lives_text_buffer_insert(LIVES_TEXT_BUFFER(mainw->layout_textbuffer),&end_iter,text,-1);
-      g_free(text);
-      //mainw->affected_layouts_map=g_list_append_unique(mainw->affected_layouts_map,array[0]);
-      g_strfreev(array);
+      lives_free(text);
+      //mainw->affected_layouts_map=lives_list_append_unique(mainw->affected_layouts_map,array[0]);
+      lives_strfreev(array);
       lmap=lmap->next;
     }
     break;
   case LMAP_ERROR_MISSING_CLIP:
   case LMAP_ERROR_CLOSE_FILE:
     if (affects_current) {
-      text=g_strdup_printf("%s\n",mainw->string_constants[LIVES_STRING_CONSTANT_CL]);
+      text=lives_strdup_printf("%s\n",mainw->string_constants[LIVES_STRING_CONSTANT_CL]);
       lives_text_buffer_insert(LIVES_TEXT_BUFFER(mainw->layout_textbuffer),&end_iter,text,-1);
-      g_free(text);
-      mainw->affected_layouts_map=g_list_append_unique(mainw->affected_layouts_map,mainw->string_constants[LIVES_STRING_CONSTANT_CL]);
+      lives_free(text);
+      mainw->affected_layouts_map=lives_list_append_unique(mainw->affected_layouts_map,mainw->string_constants[LIVES_STRING_CONSTANT_CL]);
 
-      mainw->affected_layout_marks=g_list_append(mainw->affected_layout_marks,
-						 (gpointer)lives_text_buffer_create_mark(LIVES_TEXT_BUFFER(mainw->layout_textbuffer),
-											 NULL,&end_iter,TRUE));
+      mainw->affected_layout_marks=lives_list_append(mainw->affected_layout_marks,
+                                   (livespointer)lives_text_buffer_create_mark(LIVES_TEXT_BUFFER(mainw->layout_textbuffer),
+                                       NULL,&end_iter,TRUE));
 
     }
-    lmap=(GList *)user_data;
+    lmap=(LiVESList *)user_data;
     while (lmap!=NULL) {
-      array=g_strsplit((char *)lmap->data,"|",-1);
-      text=g_strdup_printf("%s\n",array[0]);
+      array=lives_strsplit((char *)lmap->data,"|",-1);
+      text=lives_strdup_printf("%s\n",array[0]);
       lives_text_buffer_insert(LIVES_TEXT_BUFFER(mainw->layout_textbuffer),&end_iter,text,-1);
-      g_free(text);
-      mainw->affected_layouts_map=g_list_append_unique(mainw->affected_layouts_map,array[0]);
-      g_strfreev(array);
+      lives_free(text);
+      mainw->affected_layouts_map=lives_list_append_unique(mainw->affected_layouts_map,array[0]);
+      lives_strfreev(array);
       lmap=lmap->next;
     }
     break;
@@ -2012,27 +2011,27 @@
   case LMAP_ERROR_DELETE_FRAMES:
   case LMAP_ERROR_ALTER_FRAMES:
     if (affects_current) {
-      text=g_strdup_printf("%s\n",mainw->string_constants[LIVES_STRING_CONSTANT_CL]);
+      text=lives_strdup_printf("%s\n",mainw->string_constants[LIVES_STRING_CONSTANT_CL]);
       lives_text_buffer_insert(LIVES_TEXT_BUFFER(mainw->layout_textbuffer),&end_iter,text,-1);
-      g_free(text);
-      mainw->affected_layouts_map=g_list_append_unique(mainw->affected_layouts_map,mainw->string_constants[LIVES_STRING_CONSTANT_CL]);
+      lives_free(text);
+      mainw->affected_layouts_map=lives_list_append_unique(mainw->affected_layouts_map,mainw->string_constants[LIVES_STRING_CONSTANT_CL]);
 
-      mainw->affected_layout_marks=g_list_append(mainw->affected_layout_marks,
-						 (gpointer)lives_text_buffer_create_mark(LIVES_TEXT_BUFFER(mainw->layout_textbuffer),
-											 NULL,&end_iter,TRUE));
+      mainw->affected_layout_marks=lives_list_append(mainw->affected_layout_marks,
+                                   (livespointer)lives_text_buffer_create_mark(LIVES_TEXT_BUFFER(mainw->layout_textbuffer),
+                                       NULL,&end_iter,TRUE));
     }
-    lmap=(GList *)user_data;
+    lmap=(LiVESList *)user_data;
     while (lmap!=NULL) {
-      array=g_strsplit((char *)lmap->data,"|",-1);
+      array=lives_strsplit((char *)lmap->data,"|",-1);
       orig_fps=strtod(array[3],NULL);
       resampled_frame=count_resampled_frames(frameno,orig_fps,mainw->files[clipno]->fps);
       if (resampled_frame<=atoi(array[2])) {
-	text=g_strdup_printf("%s\n",array[0]);
-	lives_text_buffer_insert(LIVES_TEXT_BUFFER(mainw->layout_textbuffer),&end_iter,text,-1);
-	g_free(text);
-	mainw->affected_layouts_map=g_list_append_unique(mainw->affected_layouts_map,array[0]);
+        text=lives_strdup_printf("%s\n",array[0]);
+        lives_text_buffer_insert(LIVES_TEXT_BUFFER(mainw->layout_textbuffer),&end_iter,text,-1);
+        lives_free(text);
+        mainw->affected_layouts_map=lives_list_append_unique(mainw->affected_layouts_map,array[0]);
       }
-      g_strfreev(array);
+      lives_strfreev(array);
       lmap=lmap->next;
     }
     break;
@@ -2040,40 +2039,40 @@
   case LMAP_ERROR_DELETE_AUDIO:
   case LMAP_ERROR_ALTER_AUDIO:
     if (affects_current) {
-      text=g_strdup_printf("%s\n",mainw->string_constants[LIVES_STRING_CONSTANT_CL]);
+      text=lives_strdup_printf("%s\n",mainw->string_constants[LIVES_STRING_CONSTANT_CL]);
       lives_text_buffer_insert(LIVES_TEXT_BUFFER(mainw->layout_textbuffer),&end_iter,text,-1);
-      g_free(text);
-      mainw->affected_layouts_map=g_list_append_unique(mainw->affected_layouts_map,mainw->string_constants[LIVES_STRING_CONSTANT_CL]);
+      lives_free(text);
+      mainw->affected_layouts_map=lives_list_append_unique(mainw->affected_layouts_map,mainw->string_constants[LIVES_STRING_CONSTANT_CL]);
 
-      mainw->affected_layout_marks=g_list_append(mainw->affected_layout_marks,
-						 (gpointer)lives_text_buffer_create_mark(LIVES_TEXT_BUFFER(mainw->layout_textbuffer),
-											 NULL,&end_iter,TRUE));
+      mainw->affected_layout_marks=lives_list_append(mainw->affected_layout_marks,
+                                   (livespointer)lives_text_buffer_create_mark(LIVES_TEXT_BUFFER(mainw->layout_textbuffer),
+                                       NULL,&end_iter,TRUE));
     }
-    lmap=(GList *)user_data;
+    lmap=(LiVESList *)user_data;
     while (lmap!=NULL) {
-      array=g_strsplit((char *)lmap->data,"|",-1);
+      array=lives_strsplit((char *)lmap->data,"|",-1);
       max_time=strtod(array[4],NULL);
       if (max_time>0.&&atime<=max_time) {
-	text=g_strdup_printf("%s\n",array[0]);
-	lives_text_buffer_insert(LIVES_TEXT_BUFFER(mainw->layout_textbuffer),&end_iter,text,-1);
-	g_free(text);
-	mainw->affected_layouts_map=g_list_append_unique(mainw->affected_layouts_map,array[0]);
+        text=lives_strdup_printf("%s\n",array[0]);
+        lives_text_buffer_insert(LIVES_TEXT_BUFFER(mainw->layout_textbuffer),&end_iter,text,-1);
+        lives_free(text);
+        mainw->affected_layouts_map=lives_list_append_unique(mainw->affected_layouts_map,array[0]);
       }
-      g_strfreev(array);
+      lives_strfreev(array);
       lmap=lmap->next;
     }
     break;
   }
 
-  lives_widget_set_sensitive (mainw->show_layout_errors, TRUE);
-  if (mainw->multitrack!=NULL) lives_widget_set_sensitive (mainw->multitrack->show_layout_errors, TRUE);
+  lives_widget_set_sensitive(mainw->show_layout_errors, TRUE);
+  if (mainw->multitrack!=NULL) lives_widget_set_sensitive(mainw->multitrack->show_layout_errors, TRUE);
   return TRUE;
 }
 
 
 void clear_lmap_errors(void) {
   LiVESTextIter start_iter,end_iter;
-  GList *lmap;
+  LiVESList *lmap;
 
   lives_text_buffer_get_start_iter(LIVES_TEXT_BUFFER(mainw->layout_textbuffer),&start_iter);
   lives_text_buffer_get_end_iter(LIVES_TEXT_BUFFER(mainw->layout_textbuffer),&end_iter);
@@ -2082,14 +2081,14 @@
   lmap=mainw->affected_layouts_map;
 
   while (lmap!=NULL) {
-    g_free(lmap->data);
+    lives_free((livespointer)lmap->data);
     lmap=lmap->next;
   }
-  g_list_free(lmap);
+  lives_list_free(lmap);
 
   mainw->affected_layouts_map=NULL;
-  lives_widget_set_sensitive (mainw->show_layout_errors, FALSE);
-  if (mainw->multitrack!=NULL) lives_widget_set_sensitive (mainw->multitrack->show_layout_errors, FALSE);
+  lives_widget_set_sensitive(mainw->show_layout_errors, FALSE);
+  if (mainw->multitrack!=NULL) lives_widget_set_sensitive(mainw->multitrack->show_layout_errors, FALSE);
 
   if (mainw->affected_layout_marks!=NULL) {
     remove_current_from_affected_layouts(mainw->multitrack);
@@ -2110,16 +2109,16 @@
   char *msg=NULL;
   ssize_t bytes;
 
-  char *info_file=g_strdup_printf("%s/.locks.%d",prefs->tmpdir,capable->mainpid);
-  char *com=g_strdup_printf("%s check_for_lock \"%s\" \"%s\" %d >\"%s\"",prefs->backend_sync,set_name,capable->myname,
-			    capable->mainpid,info_file);
+  char *info_file=lives_strdup_printf("%s/.locks.%d",prefs->tmpdir,capable->mainpid);
+  char *com=lives_strdup_printf("%s check_for_lock \"%s\" \"%s\" %d >\"%s\"",prefs->backend_sync,set_name,capable->myname,
+                                capable->mainpid,info_file);
 
   unlink(info_file);
   threaded_dialog_spin();
   mainw->com_failed=FALSE;
   lives_system(com,FALSE);
   threaded_dialog_spin();
-  g_free(com);
+  lives_free(com);
 
   clear_mainw_msg();
 
@@ -2132,27 +2131,26 @@
       memset(mainw->msg+bytes,0,1);
 
       if (type==0) {
-	msg=g_strdup_printf(_("Set %s\ncannot be opened, as it is in use\nby another copy of LiVES.\n"),set_name);
-	threaded_dialog_spin();
-	do_error_dialog(msg);
-	threaded_dialog_spin();
-      }
-      else if (type==1) {
-	msg=g_strdup_printf
-	  (_("\nThe set %s is currently in use by another copy of LiVES.\nPlease choose another set name.\n"),set_name);
-	if (!mainw->osc_auto) do_blocking_error_dialog(msg);
+        msg=lives_strdup_printf(_("Set %s\ncannot be opened, as it is in use\nby another copy of LiVES.\n"),set_name);
+        threaded_dialog_spin();
+        do_error_dialog(msg);
+        threaded_dialog_spin();
+      } else if (type==1) {
+        msg=lives_strdup_printf
+            (_("\nThe set %s is currently in use by another copy of LiVES.\nPlease choose another set name.\n"),set_name);
+        if (!mainw->osc_auto) do_blocking_error_dialog(msg);
       }
       if (msg!=NULL) {
-	g_free(msg);
+        lives_free(msg);
       }
       unlink(info_file);
-      g_free(info_file);
+      lives_free(info_file);
       return FALSE;
     }
   }
-  close (info_fd);
+  close(info_fd);
   unlink(info_file);
-  g_free(info_file);
+  lives_free(info_file);
 
   return TRUE;
 }
@@ -2168,6 +2166,8 @@
   // -  may not start with a .
   // -  may not contain ..
 
+  // should be in FILESYSTEM encoding
+
   // may not be longer than 128 chars
 
   // iff allow_dupes is FALSE then we disallow the name of any existing set (has a subdirectory in the working directory)
@@ -2189,35 +2189,35 @@
   }
 
   if (strcspn(set_name,reject)!=slen) {
-    msg=g_strdup_printf(_("\nSet names may not contain spaces or the characters%s.\n"),reject);
+    msg=lives_strdup_printf(_("\nSet names may not contain spaces or the characters%s.\n"),reject);
     if (!mainw->osc_auto) do_blocking_error_dialog(msg);
-    g_free(msg);
+    lives_free(msg);
     return FALSE;
   }
 
-  for (i=0;i<slen;i+=2) {
+  for (i=0; i<slen; i+=2) {
     if (set_name[i]=='.'&&((i==0||set_name[i-1]=='.')||(i<slen-1&&set_name[i+1]=='.'))) {
-      msg=g_strdup(_("\nSet names may not start with a '.' or contain '..'\n"));
+      msg=lives_strdup(_("\nSet names may not start with a '.' or contain '..'\n"));
       if (!mainw->osc_auto) do_blocking_error_dialog(msg);
-      g_free(msg);
+      lives_free(msg);
       return FALSE;
     }
   }
 
   // check if this is a set in use by another copy of LiVES
   if (!check_for_lock_file(set_name,1)) return FALSE;
-  
+
   if (!allow_dupes) {
     // check for duplicate set names
-    char *set_dir=g_build_filename(prefs->tmpdir,set_name,NULL);
-    if (g_file_test(set_dir,G_FILE_TEST_IS_DIR)) {
-      g_free(set_dir);
-      msg=g_strdup_printf(_("\nThe set %s already exists.\nPlease choose another set name.\n"),set_name);
+    char *set_dir=lives_build_filename(prefs->tmpdir,set_name,NULL);
+    if (lives_file_test(set_dir,LIVES_FILE_TEST_IS_DIR)) {
+      lives_free(set_dir);
+      msg=lives_strdup_printf(_("\nThe set %s already exists.\nPlease choose another set name.\n"),set_name);
       do_blocking_error_dialog(msg);
-      g_free(msg);
+      lives_free(msg);
       return FALSE;
     }
-    g_free(set_dir);
+    lives_free(set_dir);
   }
 
   return TRUE;
@@ -2236,25 +2236,25 @@
   // ingores gaps
 
   // make sure nth frame is there...
-  char *frame=g_strdup_printf("%s/%s/%08d.%s",prefs->tmpdir,mainw->files[idx]->handle,mainw->files[idx]->frames,
-			       get_image_ext_for_type(mainw->files[idx]->img_type));
+  char *frame=lives_strdup_printf("%s/%s/%08d.%s",prefs->tmpdir,mainw->files[idx]->handle,mainw->files[idx]->frames,
+                                  get_image_ext_for_type(mainw->files[idx]->img_type));
 
-  if (!g_file_test(frame,G_FILE_TEST_EXISTS)) {
+  if (!lives_file_test(frame,LIVES_FILE_TEST_EXISTS)) {
     // not enough frames
-    g_free(frame);
+    lives_free(frame);
     return FALSE;
   }
-  g_free(frame);
+  lives_free(frame);
 
   // ...make sure n + 1 th frame is not
-  frame=g_strdup_printf("%s/%s/%08d.%s",prefs->tmpdir,mainw->files[idx]->handle,mainw->files[idx]->frames+1,
-			get_image_ext_for_type(mainw->files[idx]->img_type));
-  if (g_file_test(frame,G_FILE_TEST_EXISTS)) {
+  frame=lives_strdup_printf("%s/%s/%08d.%s",prefs->tmpdir,mainw->files[idx]->handle,mainw->files[idx]->frames+1,
+                            get_image_ext_for_type(mainw->files[idx]->img_type));
+  if (lives_file_test(frame,LIVES_FILE_TEST_EXISTS)) {
     // too many frames
-    g_free(frame);
+    lives_free(frame);
     return FALSE;
   }
-  g_free(frame);
+  lives_free(frame);
 
   // just right
   return TRUE;
@@ -2274,16 +2274,16 @@
   int info_fd;
   int retval;
   ssize_t bytes;
-  char *info_file=g_strdup_printf("%s/.check.%d",prefs->tmpdir,capable->mainpid);
-  char *com=g_strdup_printf("%s count_frames \"%s\" \"%s\" > \"%s\"",prefs->backend_sync,mainw->files[idx]->handle,
-			     get_image_ext_for_type(mainw->files[idx]->img_type),info_file);
+  char *info_file=lives_strdup_printf("%s/.check.%d",prefs->tmpdir,capable->mainpid);
+  char *com=lives_strdup_printf("%s count_frames \"%s\" \"%s\" > \"%s\"",prefs->backend_sync,mainw->files[idx]->handle,
+                                get_image_ext_for_type(mainw->files[idx]->img_type),info_file);
 
   mainw->com_failed=FALSE;
   lives_system(com,FALSE);
-  g_free(com);
-  
+  lives_free(com);
+
   if (mainw->com_failed) {
-    g_free(info_file);
+    lives_free(info_file);
     return;
   }
 
@@ -2291,31 +2291,29 @@
     retval=0;
     info_fd=open(info_file,O_RDONLY);
     if (info_fd<0) {
-      retval=do_read_failed_error_s_with_retry(info_file,g_strerror(errno),NULL);
-    }
-    else {
+      retval=do_read_failed_error_s_with_retry(info_file,lives_strerror(errno),NULL);
+    } else {
       if ((bytes=lives_read(info_fd,mainw->msg,256,TRUE))>0) {
-	if (bytes==0) {
-	  retval=do_read_failed_error_s_with_retry(info_file,NULL,NULL);
-	}
-	else {
-	  memset(mainw->msg+bytes,0,1);
-	  mainw->files[idx]->frames=atoi(mainw->msg);
-	}
+        if (bytes==0) {
+          retval=do_read_failed_error_s_with_retry(info_file,NULL,NULL);
+        } else {
+          memset(mainw->msg+bytes,0,1);
+          mainw->files[idx]->frames=atoi(mainw->msg);
+        }
       }
       close(info_fd);
     }
-  } while (retval==LIVES_RETRY);
+  } while (retval==LIVES_RESPONSE_RETRY);
 
   unlink(info_file);
-  g_free(info_file);
+  lives_free(info_file);
 }
 
 
 void get_frames_sizes(int fileno, int frame) {
   lives_clip_t *sfile=mainw->files[fileno];
   LiVESPixbuf *pixbuf;
-  
+
   if ((pixbuf=pull_lives_pixbuf(fileno,frame,get_image_ext_for_type(mainw->files[fileno]->img_type),0))) {
     sfile->hsize=lives_pixbuf_get_width(pixbuf);
     sfile->vsize=lives_pixbuf_get_height(pixbuf);
@@ -2341,8 +2339,8 @@
   // get directory name from a file
   //filename should point to char[PATH_MAX]
 
-  g_snprintf (filename,PATH_MAX,"%s%s",(tmp=g_path_get_dirname (filename)),G_DIR_SEPARATOR_S);
-  g_free(tmp);
+  lives_snprintf(filename,PATH_MAX,"%s%s",(tmp=lives_path_get_dirname(filename)),LIVES_DIR_SEPARATOR_S);
+  lives_free(tmp);
 
   if (!strcmp(filename,"//")) {
     memset(filename+1,0,1);
@@ -2350,19 +2348,19 @@
   }
 
   if (!strncmp(filename,"./",2)) {
-    char *tmp1=g_get_current_dir(),*tmp=g_build_filename(tmp1,filename+2,NULL);
-    g_free(tmp1);
-    g_snprintf(filename,PATH_MAX,"%s",tmp);
-    g_free(tmp);
+    char *tmp1=lives_get_current_dir(),*tmp=lives_build_filename(tmp1,filename+2,NULL);
+    lives_free(tmp1);
+    lives_snprintf(filename,PATH_MAX,"%s",tmp);
+    lives_free(tmp);
   }
 }
 
 
 char *get_dir(const char *filename) {
   char tmp[PATH_MAX];
-  g_snprintf(tmp,PATH_MAX,"%s",filename);
+  lives_snprintf(tmp,PATH_MAX,"%s",filename);
   get_dirname(tmp);
-  return g_strdup(tmp);
+  return lives_strdup(tmp);
 }
 
 
@@ -2370,9 +2368,9 @@
   // get basename from a file
   // (filename without directory)
   //filename should point to char[PATH_MAX]
-  char *tmp=g_path_get_basename(filename);
-  g_snprintf (filename,PATH_MAX,"%s",tmp);
-  g_free(tmp);
+  char *tmp=lives_path_get_basename(filename);
+  lives_snprintf(filename,PATH_MAX,"%s",tmp);
+  lives_free(tmp);
 }
 
 void get_filename(char *filename, boolean strip_dir) {
@@ -2380,26 +2378,26 @@
   //filename should point to char[PATH_MAX]
   char **array;
   if (strip_dir) get_basename(filename);
-  array=g_strsplit(filename,".",-1);
-  g_snprintf(filename,PATH_MAX,"%s",array[0]);
-  g_strfreev(array);
+  array=lives_strsplit(filename,".",-1);
+  lives_snprintf(filename,PATH_MAX,"%s",array[0]);
+  lives_strfreev(array);
 }
 
 
 char *get_extension(const char *filename) {
-  char *tmp=g_path_get_basename(filename);
+  char *tmp=lives_path_get_basename(filename);
   int ntok=get_token_count((char *)filename,'.');
-  char **array=g_strsplit(tmp,".",-1);
-  char *ret=g_strdup(array[ntok-1]);
-  g_strfreev(array);
-  g_free(tmp);
+  char **array=lives_strsplit(tmp,".",-1);
+  char *ret=lives_strdup(array[ntok-1]);
+  lives_strfreev(array);
+  lives_free(tmp);
   return ret;
 }
 
 
 char *ensure_extension(const char *fname, const char *ext) {
-  if (!strcmp(fname+strlen(fname)-strlen(ext),ext)) return g_strdup(fname);
-  return g_strconcat(fname,ext,NULL);
+  if (!strcmp(fname+strlen(fname)-strlen(ext),ext)) return lives_strdup(fname);
+  return lives_strconcat(fname,ext,NULL);
 }
 
 
@@ -2413,12 +2411,12 @@
   size_t offs=slen-1;
   char *tmp;
 
-  while (offs>=0&&!strcmp(fname+offs,G_DIR_SEPARATOR_S)) offs--;
+  while (offs>=0&&!strcmp(fname+offs,LIVES_DIR_SEPARATOR_S)) offs--;
   if (offs==slen-2) return FALSE;
   memset(fname+offs+1,0,1);
-  tmp=g_strdup_printf("%s%s",fname,G_DIR_SEPARATOR_S);
-  g_snprintf(fname,PATH_MAX,"%s",tmp);
-  g_free(tmp);
+  tmp=lives_strdup_printf("%s%s",fname,LIVES_DIR_SEPARATOR_S);
+  lives_snprintf(fname,PATH_MAX,"%s",tmp);
+  lives_free(tmp);
   return TRUE;
 }
 
@@ -2428,12 +2426,11 @@
   // sets it in val which is a char array of maxlen bytes
 
   char *loc;
-  if ((loc=g_find_program_in_path (exe))!=NULL) {
-    g_snprintf (val,maxlen,"%s",loc);
-    g_free (loc);
-  }
-  else {
-    memset (val,0,1);
+  if ((loc=lives_find_program_in_path(exe))!=NULL) {
+    lives_snprintf(val,maxlen,"%s",loc);
+    lives_free(loc);
+  } else {
+    memset(val,0,1);
   }
 }
 
@@ -2443,12 +2440,12 @@
   FILE *rfile;
   ssize_t rlen;
   char val[16];
-  char *com=g_strdup_printf("%s get_version_hash \"%s\" \"%s\" %d",prefs->backend_sync,exe,sep,piece);
+  char *com=lives_strdup_printf("%s get_version_hash \"%s\" \"%s\" %d",prefs->backend_sync,exe,sep,piece);
   rfile=popen(com,"r");
   rlen=fread(val,1,16,rfile);
   pclose(rfile);
   memset(val+rlen,0,1);
-  g_free(com);
+  lives_free(com);
   return strtol(val,NULL,10);
 }
 
@@ -2466,7 +2463,7 @@
   if (ver==NULL) return 0;
 
   ntok=get_token_count((char *)ver,'.');
-  array=g_strsplit(ver,".",-1);
+  array=lives_strsplit(ver,".",-1);
 
   hash=atoi(array[0])*VER_MAJOR_MULT;
 
@@ -2478,7 +2475,7 @@
     hash+=atoi(array[2])*VER_MICRO_MULT;
   }
 
-  g_strfreev(array);
+  lives_strfreev(array);
 
   return hash;
 }
@@ -2488,32 +2485,31 @@
 char *repl_tmpdir(const char *entry, boolean fwd) {
   // replace prefs->tmpdir with string tmpdir or vice-versa. This allows us to relocate tmpdir if necessary.
   // used for layout.map file
-  // return value should be g_free()'d
+  // return value should be freed
 
   // fwd TRUE replaces "/tmp/foo" with "tmpdir"
   // fwd FALSE replaces "tmpdir" with "/tmp/foo"
 
 
-  char *string=g_strdup(entry);;
+  char *string=lives_strdup(entry);;
 
   if (fwd) {
     if (!strncmp(entry,prefs->tmpdir,strlen(prefs->tmpdir))) {
-      g_free(string);
-      string=g_strdup_printf("tmpdir%s",entry+strlen(prefs->tmpdir));
+      lives_free(string);
+      string=lives_strdup_printf("tmpdir%s",entry+strlen(prefs->tmpdir));
     }
-  }
-  else {
+  } else {
     if (!strncmp(entry,"tmpdir",6)) {
-      g_free(string);
-      string=g_build_filename(prefs->tmpdir,entry+6,NULL);
+      lives_free(string);
+      string=lives_build_filename(prefs->tmpdir,entry+6,NULL);
     }
   }
   return string;
 }
 
 
-void remove_layout_files(GList *map) {
-  // removes a GList of layouts from the set layout map
+void remove_layout_files(LiVESList *map) {
+  // removes a LiVESList of layouts from the set layout map
 
   // removes from: - global layouts map
   //               - disk
@@ -2521,140 +2517,136 @@
 
   // called after, for example: a clip is removed or altered and the user opts to remove all associated layouts
 
-  char *com,*msg;
-  char *fname,*fdir;
-  char **array;
-  GList *lmap,*lmap_next,*cmap,*cmap_next,*map_next;
+  LiVESList *lmap,*lmap_next,*cmap,*cmap_next,*map_next;
+
   size_t maplen;
-  int i;
+
+  char **array;
+
+  char *com;
+  char *fname,*fdir;
+
   boolean is_current;
 
+  register int i;
+
   while (map!=NULL) {
     map_next=map->next;
     if (map->data!=NULL) {
       if (!strcmp((char *)map->data,mainw->string_constants[LIVES_STRING_CONSTANT_CL])) {
-	is_current=TRUE;
-	fname=g_strdup(mainw->string_constants[LIVES_STRING_CONSTANT_CL]);
-      }
-      else {
-	is_current=FALSE;
-	maplen=strlen((char *)map->data);
-	
-	// remove from mainw->current_layouts_map
-	cmap=mainw->current_layouts_map;
-	while (cmap!=NULL) {
-	  cmap_next=cmap->next;
-	  if (!strcmp((char *)cmap->data,(char *)map->data)) {
-	    mainw->current_layouts_map=g_list_remove_link(mainw->current_layouts_map,cmap);
-	    break;
-	  }
-	  cmap=cmap_next;
-	}
-
-	array=g_strsplit((char *)map->data,"|",-1);
-	fname=repl_tmpdir(array[0],FALSE);
-	g_strfreev(array);
+        is_current=TRUE;
+        fname=lives_strdup(mainw->string_constants[LIVES_STRING_CONSTANT_CL]);
+      } else {
+        is_current=FALSE;
+        maplen=strlen((char *)map->data);
+
+        // remove from mainw->current_layouts_map
+        cmap=mainw->current_layouts_map;
+        while (cmap!=NULL) {
+          cmap_next=cmap->next;
+          if (!strcmp((char *)cmap->data,(char *)map->data)) {
+            lives_free((livespointer)cmap->data);
+            mainw->current_layouts_map=lives_list_delete_link(mainw->current_layouts_map,cmap);
+            break;
+          }
+          cmap=cmap_next;
+        }
+
+        array=lives_strsplit((char *)map->data,"|",-1);
+        fname=repl_tmpdir(array[0],FALSE);
+        lives_strfreev(array);
       }
 
       // fname should now hold the layout name on disk
-
-      msg=g_strdup_printf(_("Removing layout %s\n"),fname);
-      d_print(msg);
-      g_free(msg);
+      d_print(_("Removing layout %s\n"),fname);
 
       if (!is_current) {
 #ifndef IS_MINGW
-	com=g_strdup_printf("/bin/rm \"%s\" 2>/dev/null",fname);
+        com=lives_strdup_printf("%s \"%s\" 2>/dev/null",capable->rm_cmd,fname);
 #else
-	com=g_strdup_printf("rm.exe \"%s\" 2>NUL",fname);
+        com=lives_strdup_printf("rm.exe \"%s\" 2>NUL",fname);
 #endif
-	lives_system(com,TRUE);
-	g_free(com);
-	
+        lives_system(com,TRUE);
+        lives_free(com);
 
-	// if no more layouts in parent dir, we can delete dir
 
-	// ensure that parent dir is below our own working dir
-	if (!strncmp(fname,prefs->tmpdir,strlen(prefs->tmpdir))) {
-	  // is in tmpdir, safe to remove parents
+        // if no more layouts in parent dir, we can delete dir
 
-	  char *protect_file=g_build_filename(prefs->tmpdir,"noremove",NULL);
+        // ensure that parent dir is below our own working dir
+        if (!strncmp(fname,prefs->tmpdir,strlen(prefs->tmpdir))) {
+          // is in tmpdir, safe to remove parents
 
-	  mainw->com_failed=FALSE;
-	  // touch a file in tpmdir, so we cannot remove tmpdir itself
+          char *protect_file=lives_build_filename(prefs->tmpdir,"noremove",NULL);
+
+          mainw->com_failed=FALSE;
+          // touch a file in tpmdir, so we cannot remove tmpdir itself
 #ifndef IS_MINGW
-	  com=g_strdup_printf("/bin/touch \"%s\" >/dev/null 2>&1",protect_file);
+          com=lives_strdup_printf("%s \"%s\" >/dev/null 2>&1",capable->touch_cmd,protect_file);
 #else
-	  com=g_strdup_printf("touch.exe \"%s\" >NUL 2>&1",protect_file);
+          com=lives_strdup_printf("touch.exe \"%s\" >NUL 2>&1",protect_file);
 #endif
-	  lives_system(com,FALSE);
-	  g_free(com);
-	  
-	  if (!mainw->com_failed) {
-	    // ok, the "touch" worked
-	    // now we call rmdir -p : remove directory + any empty parents
-	    fdir=g_path_get_dirname (fname);
+          lives_system(com,FALSE);
+          lives_free(com);
+
+          if (!mainw->com_failed) {
+            // ok, the "touch" worked
+            // now we call rmdir -p : remove directory + any empty parents
+            fdir=lives_path_get_dirname(fname);
 #ifndef IS_MINGW
-	    com=g_strdup_printf("/bin/rmdir -p \"%s\" 2>/dev/null",fdir);
+            com=lives_strdup_printf("%s -p \"%s\" 2>/dev/null",capable->rmdir_cmd,fdir);
 #else
-	    com=g_strdup_printf("rmdir.exe /p \"%s\" 2>NUL",fdir);
+            com=lives_strdup_printf("rmdir.exe /p \"%s\" 2>NUL",fdir);
 #endif
-	    lives_system(com,TRUE);
-	    g_free(com);
-	    g_free(fdir);
-	  }
-
-	  // remove the file we touched to clean up
-	  unlink(protect_file);
-	  g_free(protect_file);
-	}
-	
-
-	// remove from mainw->files[]->layout_map
-	for (i=1;i<=MAX_FILES;i++) {
-	  if (mainw->files[i]!=NULL) {
-	    if (mainw->files[i]->layout_map!=NULL) {
-	      lmap=mainw->files[i]->layout_map;
-	      while (lmap!=NULL) {
-		lmap_next=lmap->next;
-		if (!strncmp((char *)lmap->data,(char *)map->data,maplen)) {
-		  // remove matching entry
-		  if (lmap->prev!=NULL) lmap->prev->next=lmap_next;
-		  else mainw->files[i]->layout_map=lmap_next;
-		  if (lmap->next!=NULL) lmap_next->prev=lmap->prev;
-		  lmap->next=lmap->prev=NULL;
-		  g_free(lmap->data);
-		  g_list_free(lmap);
-		}
-		lmap=lmap_next;
-	      }
-	    }
-	  }
-	}
-      }
-      else {
-	// asked to remove the currently loaded layout
-
-	if (mainw->stored_event_list!=NULL||mainw->sl_undo_mem!=NULL) {
-	  // we are in CE mode, so event_list is in storage
-	  stored_event_list_free_all(TRUE);
-	}
-	// in mt mode we need to do more
-	else remove_current_from_affected_layouts(mainw->multitrack);
-
-	// and we dont want to try reloading this next time
-	prefs->ar_layout=FALSE;
-	set_pref("ar_layout","");
-	memset(prefs->ar_layout_name,0,1);
+            lives_system(com,TRUE);
+            lives_free(com);
+            lives_free(fdir);
+          }
+
+          // remove the file we touched to clean up
+          unlink(protect_file);
+          lives_free(protect_file);
+        }
+
+
+        // remove from mainw->files[]->layout_map
+        for (i=1; i<=MAX_FILES; i++) {
+          if (mainw->files[i]!=NULL) {
+            if (mainw->files[i]->layout_map!=NULL) {
+              lmap=mainw->files[i]->layout_map;
+              while (lmap!=NULL) {
+                lmap_next=lmap->next;
+                if (!strncmp((char *)lmap->data,(char *)map->data,maplen)) {
+                  lives_free((livespointer)lmap->data);
+                  mainw->files[i]->layout_map=lives_list_delete_link(mainw->files[i]->layout_map,lmap);
+                }
+                lmap=lmap_next;
+              }
+            }
+          }
+        }
+      } else {
+        // asked to remove the currently loaded layout
+
+        if (mainw->stored_event_list!=NULL||mainw->sl_undo_mem!=NULL) {
+          // we are in CE mode, so event_list is in storage
+          stored_event_list_free_all(TRUE);
+        }
+        // in mt mode we need to do more
+        else remove_current_from_affected_layouts(mainw->multitrack);
+
+        // and we dont want to try reloading this next time
+        prefs->ar_layout=FALSE;
+        set_pref("ar_layout","");
+        memset(prefs->ar_layout_name,0,1);
       }
-      g_free(fname);
+      lives_free(fname);
     }
     map=map_next;
   }
 
   // save updated layout.map
   save_layout_map(NULL,NULL,NULL,NULL);
-  
+
 }
 
 
@@ -2681,7 +2673,7 @@
   }
 
   if (mainw->playing_file==-1) {
-    get_total_time (cfile);
+    get_total_time(cfile);
   }
 
   if (!mainw->is_ready) {
@@ -2698,28 +2690,28 @@
   allocwidth=lives_widget_get_allocation_width(mainw->video_draw);
   allocheight=lives_widget_get_allocation_height(mainw->video_draw);
 
-  
+
   if (mainw->laudio_drawable!=NULL) {
     lives_painter_t *cr=lives_painter_create(mainw->laudio_drawable);
     lives_painter_set_source_to_bg(cr,mainw->laudio_draw);
 
     lives_painter_rectangle(cr,0,0,
-		    allocwidth,
-		    allocheight);
+                            allocwidth,
+                            allocheight);
     lives_painter_fill(cr);
-    lives_painter_destroy (cr);
+    lives_painter_destroy(cr);
 
   }
-  
+
   if (mainw->raudio_drawable!=NULL) {
     lives_painter_t *cr=lives_painter_create(mainw->raudio_drawable);
     lives_painter_set_source_to_bg(cr,mainw->raudio_draw);
 
     lives_painter_rectangle(cr,0,0,
-		    allocwidth,
-		    allocheight);
+                            allocwidth,
+                            allocheight);
     lives_painter_fill(cr);
-    lives_painter_destroy (cr);
+    lives_painter_destroy(cr);
 
   }
 
@@ -2728,10 +2720,10 @@
     lives_painter_set_source_to_bg(cr,mainw->video_draw);
 
     lives_painter_rectangle(cr,0,0,
-		    allocwidth,
-		    allocheight);
+                            allocwidth,
+                            allocheight);
     lives_painter_fill(cr);
-    lives_painter_destroy (cr);
+    lives_painter_destroy(cr);
 
   }
 
@@ -2739,99 +2731,98 @@
     offset_left=(cfile->start-1)/cfile->fps/cfile->total_time*allocwidth;
     offset_right=(cfile->end)/cfile->fps/cfile->total_time*allocwidth;
 
-    
+
     if (mainw->video_drawable!=NULL) {
       lives_painter_t *cr=lives_painter_create(mainw->video_drawable);
-      
+
       lives_painter_set_source_rgb(cr, 0., 0., 0.); ///< opaque black
-      
+
       lives_painter_rectangle(cr,0,0,
-		      cfile->video_time/cfile->total_time*allocwidth-1,
-		      prefs->bar_height);
-      
+                              cfile->video_time/cfile->total_time*allocwidth-1,
+                              prefs->bar_height);
+
       lives_painter_fill(cr);
-      
+
       lives_painter_set_source_rgb(cr, 1., 1., 1.); ///< opaque white
-      
+
       lives_painter_rectangle(cr,offset_left, 0,
-		      offset_right-offset_left,
-		      prefs->bar_height);
-      
+                              offset_right-offset_left,
+                              prefs->bar_height);
+
       lives_painter_fill(cr);
-      
-      lives_painter_destroy (cr);
+
+      lives_painter_destroy(cr);
 
     }
   }
   if (cfile->achans>0) {
     if (mainw->playing_file>-1) {
-      offset_left=((mainw->playing_sel&&(prefs->audio_player==AUD_PLAYER_JACK||prefs->audio_player==AUD_PLAYER_PULSE))?
-		   cfile->start-1.:mainw->audio_start-1.)/cfile->fps/cfile->total_time*allocwidth;
+      offset_left=((mainw->playing_sel&&is_realtime_aplayer(prefs->audio_player))?
+                   cfile->start-1.:mainw->audio_start-1.)/cfile->fps/cfile->total_time*allocwidth;
       if (mainw->audio_end&&!mainw->loop) {
-	offset_right=(((prefs->audio_player==AUD_PLAYER_JACK||prefs->audio_player==AUD_PLAYER_PULSE))?
-		      cfile->end:mainw->audio_end)/cfile->fps/cfile->total_time*allocwidth;
-      }
-      else {
-	offset_right=allocwidth*cfile->laudio_time/cfile->total_time;
+        offset_right=((is_realtime_aplayer(prefs->audio_player))?
+                      cfile->end:mainw->audio_end)/cfile->fps/cfile->total_time*allocwidth;
+      } else {
+        offset_right=allocwidth*cfile->laudio_time/cfile->total_time;
       }
     }
-    
+
     if (offset_right>cfile->laudio_time/cfile->total_time*allocwidth)
       offset_right=cfile->laudio_time/cfile->total_time*allocwidth;
 
-    
-    
+
+
     if (mainw->laudio_drawable!=NULL) {
       lives_painter_t *cr=lives_painter_create(mainw->laudio_drawable);
-      
+
       lives_painter_set_source_rgb(cr, 0., 0., 0.); ///< opaque black
-      
+
       lives_painter_rectangle(cr,0,0,
-		      cfile->laudio_time/cfile->total_time*allocwidth-1,
-		      prefs->bar_height);
-      
+                              cfile->laudio_time/cfile->total_time*allocwidth-1,
+                              prefs->bar_height);
+
       lives_painter_fill(cr);
 
       if (offset_left<cfile->laudio_time/cfile->total_time*allocwidth) {
-      
-	lives_painter_set_source_rgb(cr, 1., 1., 1.); ///< opaque white
-      
-	lives_painter_rectangle(cr,offset_left, 0,
-				offset_right-offset_left,
-				prefs->bar_height);
-	
-	lives_painter_fill(cr);
-      
+
+        lives_painter_set_source_rgb(cr, 1., 1., 1.); ///< opaque white
+
+        lives_painter_rectangle(cr,offset_left, 0,
+                                offset_right-offset_left,
+                                prefs->bar_height);
+
+        lives_painter_fill(cr);
+
       }
 
-      lives_painter_destroy (cr);
+      lives_painter_destroy(cr);
 
     }
     if (cfile->achans>1) {
       if (mainw->raudio_drawable!=NULL) {
-	lives_painter_t *cr=lives_painter_create(mainw->raudio_drawable);
-      
-	lives_painter_set_source_rgb(cr, 0., 0., 0.); ///< opaque black
-	
-	lives_painter_rectangle(cr,0,0,
-			cfile->raudio_time/cfile->total_time*allocwidth-1,
-			prefs->bar_height);
-	
-	lives_painter_fill(cr);
-
-	if (offset_left<cfile->laudio_time/cfile->total_time*allocwidth) {
-	
-	  lives_painter_set_source_rgb(cr, 1., 1., 1.); ///< opaque white
-	
-	  lives_painter_rectangle(cr,offset_left, 0,
-				  offset_right-offset_left,
-				  prefs->bar_height);
-      
-	  lives_painter_fill(cr);
+        lives_painter_t *cr=lives_painter_create(mainw->raudio_drawable);
 
-	}
+        lives_painter_set_source_rgb(cr, 0., 0., 0.); ///< opaque black
+
+        lives_painter_rectangle(cr,0,0,
+                                cfile->raudio_time/cfile->total_time*allocwidth-1,
+                                prefs->bar_height);
 
-	lives_painter_destroy (cr);
+        lives_painter_fill(cr);
+
+        if (offset_left<cfile->laudio_time/cfile->total_time*allocwidth) {
+
+          lives_painter_set_source_rgb(cr, 1., 1., 1.); ///< opaque white
+
+          lives_painter_rectangle(cr,offset_left, 0,
+                                  offset_right-offset_left,
+                                  prefs->bar_height);
+
+          lives_painter_fill(cr);
+
+        }
+
+        lives_painter_destroy(cr);
 
       }
     }
@@ -2843,230 +2834,211 @@
       offset=(mainw->actual_frame-.5)/cfile->fps;
       offset/=cfile->total_time/allocwidth;
       if (mainw->video_drawable!=NULL) {
-	lives_painter_t *cr=lives_painter_create(mainw->video_drawable);
+        lives_painter_t *cr=lives_painter_create(mainw->video_drawable);
 
-	lives_painter_set_line_width(cr,1.);
-      
-	if (offset>=offset_left&&offset<=offset_right) {
-	  lives_painter_set_source_rgb(cr, 0., 0., 0.); ///< opaque black
-	  lives_painter_move_to(cr, offset, 0);
-	  lives_painter_line_to(cr, offset, prefs->bar_height);
-	}
-	else {
-	  lives_painter_set_source_rgb(cr, 1., 1., 1.); ///< opaque white
-	  lives_painter_move_to(cr, offset, 0);
-	  lives_painter_line_to(cr, offset, prefs->bar_height);
-	}
-	lives_painter_stroke(cr);
+        lives_painter_set_line_width(cr,1.);
 
-	if (palette->style&STYLE_3||palette->style==STYLE_PLAIN) { // light style
-	  lives_painter_set_source_rgb(cr, 0., 0., 0.); ///< opaque black
-	  lives_painter_move_to(cr, offset, prefs->bar_height);
-	  lives_painter_line_to(cr, offset, allocheight);
-	}
-	else {
-	  lives_painter_set_source_rgb(cr, 1., 1., 1.); ///< opaque white
-	  lives_painter_move_to(cr, offset, prefs->bar_height);
-	  lives_painter_line_to(cr, offset, allocheight);
-	}
+        if (offset>=offset_left&&offset<=offset_right) {
+          lives_painter_set_source_rgb(cr, 0., 0., 0.); ///< opaque black
+          lives_painter_move_to(cr, offset, 0);
+          lives_painter_line_to(cr, offset, prefs->bar_height);
+        } else {
+          lives_painter_set_source_rgb(cr, 1., 1., 1.); ///< opaque white
+          lives_painter_move_to(cr, offset, 0);
+          lives_painter_line_to(cr, offset, prefs->bar_height);
+        }
+        lives_painter_stroke(cr);
+
+        if (palette->style&STYLE_3||palette->style==STYLE_PLAIN) { // light style
+          lives_painter_set_source_rgb(cr, 0., 0., 0.); ///< opaque black
+          lives_painter_move_to(cr, offset, prefs->bar_height);
+          lives_painter_line_to(cr, offset, allocheight);
+        } else {
+          lives_painter_set_source_rgb(cr, 1., 1., 1.); ///< opaque white
+          lives_painter_move_to(cr, offset, prefs->bar_height);
+          lives_painter_line_to(cr, offset, allocheight);
+        }
 
-	lives_painter_stroke(cr);
+        lives_painter_stroke(cr);
 
-	lives_painter_destroy(cr);
+        lives_painter_destroy(cr);
 
       }
-      lives_ruler_set_value(LIVES_RULER (mainw->hruler),offset*cfile->total_time/allocwidth);
-      lives_widget_queue_draw (mainw->hruler);
+      lives_ruler_set_value(LIVES_RULER(mainw->hruler),offset*cfile->total_time/allocwidth);
+      lives_widget_queue_draw(mainw->hruler);
     }
     if (cfile->achans>0&&cfile->is_loaded&&prefs->audio_src!=AUDIO_SRC_EXT) {
-      if ((prefs->audio_player==AUD_PLAYER_JACK||prefs->audio_player==AUD_PLAYER_PULSE)&&
-	  (mainw->event_list==NULL||!mainw->preview)) {
+      if (is_realtime_aplayer(prefs->audio_player)&&(mainw->event_list==NULL||!mainw->preview)) {
 #ifdef ENABLE_JACK
-	if (mainw->jackd!=NULL&&prefs->audio_player==AUD_PLAYER_JACK) {
-	  offset=allocwidth*((double)mainw->jackd->seek_pos/cfile->arate/cfile->achans/
-			     cfile->asampsize*8)/cfile->total_time;
-	}
+        if (mainw->jackd!=NULL&&prefs->audio_player==AUD_PLAYER_JACK) {
+          offset=allocwidth*((double)mainw->jackd->seek_pos/cfile->arate/cfile->achans/
+                             cfile->asampsize*8)/cfile->total_time;
+        }
 #endif
 #ifdef HAVE_PULSE_AUDIO
-	if (mainw->pulsed!=NULL&&prefs->audio_player==AUD_PLAYER_PULSE) {
-	  offset=allocwidth*((double)mainw->pulsed->seek_pos/cfile->arate/cfile->achans/
-			     cfile->asampsize*8)/cfile->total_time;
-	}
+        if (mainw->pulsed!=NULL&&prefs->audio_player==AUD_PLAYER_PULSE) {
+          offset=allocwidth*((double)mainw->pulsed->seek_pos/cfile->arate/cfile->achans/
+                             cfile->asampsize*8)/cfile->total_time;
+        }
 #endif
-      }
-      else offset=allocwidth*(mainw->aframeno-.5)/cfile->fps/cfile->total_time;
+      } else offset=allocwidth*(mainw->aframeno-.5)/cfile->fps/cfile->total_time;
       if (mainw->laudio_drawable!=NULL) {
-	lives_painter_t *cr=lives_painter_create(mainw->laudio_drawable);
+        lives_painter_t *cr=lives_painter_create(mainw->laudio_drawable);
 
-	lives_painter_set_line_width(cr,1.);
-      
-	if (offset>=offset_left&&offset<=offset_right) {
-	  lives_painter_set_source_rgb(cr, 0., 0., 0.); ///< opaque black
-	  lives_painter_move_to(cr, offset, 0);
-	  lives_painter_line_to(cr, offset, prefs->bar_height);
-	}
-	else {
-	  lives_painter_set_source_rgb(cr, 1., 1., 1.); ///< opaque white
-	  lives_painter_move_to(cr, offset, 0);
-	  lives_painter_line_to(cr, offset, prefs->bar_height);
-	}
-	lives_painter_stroke(cr);
+        lives_painter_set_line_width(cr,1.);
 
-	if (palette->style&STYLE_3||palette->style==STYLE_PLAIN) { // light style
-	  lives_painter_set_source_rgb(cr, 0., 0., 0.); ///< opaque black
-	  lives_painter_move_to(cr, offset, prefs->bar_height);
-	  lives_painter_line_to(cr, offset, allocheight);
-	}
-	else {
-	  lives_painter_set_source_rgb(cr, 1., 1., 1.); ///< opaque white
-	  lives_painter_move_to(cr, offset, prefs->bar_height);
-	  lives_painter_line_to(cr, offset, allocheight);
-	}
-	lives_painter_stroke(cr);
+        if (offset>=offset_left&&offset<=offset_right) {
+          lives_painter_set_source_rgb(cr, 0., 0., 0.); ///< opaque black
+          lives_painter_move_to(cr, offset, 0);
+          lives_painter_line_to(cr, offset, prefs->bar_height);
+        } else {
+          lives_painter_set_source_rgb(cr, 1., 1., 1.); ///< opaque white
+          lives_painter_move_to(cr, offset, 0);
+          lives_painter_line_to(cr, offset, prefs->bar_height);
+        }
+        lives_painter_stroke(cr);
+
+        if (palette->style&STYLE_3||palette->style==STYLE_PLAIN) { // light style
+          lives_painter_set_source_rgb(cr, 0., 0., 0.); ///< opaque black
+          lives_painter_move_to(cr, offset, prefs->bar_height);
+          lives_painter_line_to(cr, offset, allocheight);
+        } else {
+          lives_painter_set_source_rgb(cr, 1., 1., 1.); ///< opaque white
+          lives_painter_move_to(cr, offset, prefs->bar_height);
+          lives_painter_line_to(cr, offset, allocheight);
+        }
+        lives_painter_stroke(cr);
 
-	lives_painter_destroy(cr);
+        lives_painter_destroy(cr);
       }
 
       if (cfile->achans>1) {
-	if (mainw->raudio_drawable!=NULL) {
-	  lives_painter_t *cr=lives_painter_create(mainw->raudio_drawable);
-	  
-	  lives_painter_set_line_width(cr,1.);
-	  
-	  if (offset>=offset_left&&offset<=offset_right) {
-	    lives_painter_set_source_rgb(cr, 0., 0., 0.); ///< opaque black
-	    lives_painter_move_to(cr, offset, 0);
-	    lives_painter_line_to(cr, offset, prefs->bar_height);
-	  }
-	  else {
-	    lives_painter_set_source_rgb(cr, 1., 1., 1.); ///< opaque white
-	    lives_painter_move_to(cr, offset, 0);
-	    lives_painter_line_to(cr, offset, prefs->bar_height);
-	  }
-	  lives_painter_stroke(cr);
-	  
-	  if (palette->style&STYLE_3||palette->style==STYLE_PLAIN) { // light style
-	    lives_painter_set_source_rgb(cr, 0., 0., 0.); ///< opaque black
-	    lives_painter_move_to(cr, offset, prefs->bar_height);
-	    lives_painter_line_to(cr, offset, allocheight);
-	  }
-	  else {
-	    lives_painter_set_source_rgb(cr, 1., 1., 1.); ///< opaque white
-	    lives_painter_move_to(cr, offset, prefs->bar_height);
-	    lives_painter_line_to(cr, offset, allocheight);
-	  }
-	  lives_painter_stroke(cr);
-	  
-	  lives_painter_destroy(cr);
+        if (mainw->raudio_drawable!=NULL) {
+          lives_painter_t *cr=lives_painter_create(mainw->raudio_drawable);
 
-	}
+          lives_painter_set_line_width(cr,1.);
+
+          if (offset>=offset_left&&offset<=offset_right) {
+            lives_painter_set_source_rgb(cr, 0., 0., 0.); ///< opaque black
+            lives_painter_move_to(cr, offset, 0);
+            lives_painter_line_to(cr, offset, prefs->bar_height);
+          } else {
+            lives_painter_set_source_rgb(cr, 1., 1., 1.); ///< opaque white
+            lives_painter_move_to(cr, offset, 0);
+            lives_painter_line_to(cr, offset, prefs->bar_height);
+          }
+          lives_painter_stroke(cr);
+
+          if (palette->style&STYLE_3||palette->style==STYLE_PLAIN) { // light style
+            lives_painter_set_source_rgb(cr, 0., 0., 0.); ///< opaque black
+            lives_painter_move_to(cr, offset, prefs->bar_height);
+            lives_painter_line_to(cr, offset, allocheight);
+          } else {
+            lives_painter_set_source_rgb(cr, 1., 1., 1.); ///< opaque white
+            lives_painter_move_to(cr, offset, prefs->bar_height);
+            lives_painter_line_to(cr, offset, allocheight);
+          }
+          lives_painter_stroke(cr);
+
+          lives_painter_destroy(cr);
+
+        }
       }
     }
     if (cfile->frames==0) {
-      lives_ruler_set_value(LIVES_RULER (mainw->hruler),offset*cfile->total_time/allocwidth);
-      lives_widget_queue_draw (mainw->hruler);
+      lives_ruler_set_value(LIVES_RULER(mainw->hruler),offset*cfile->total_time/allocwidth);
+      lives_widget_queue_draw(mainw->hruler);
     }
   }
-  
+
   if (mainw->playing_file==-1||(mainw->switch_during_pb&&!mainw->faded)) {
     if (cfile->total_time>0.) {
       // set the range of the timeline
       if (!cfile->opening_loc) {
-	if (!lives_widget_is_visible(mainw->hruler)) {
-	  lives_widget_show (mainw->hruler);
-	}
+        if (!lives_widget_is_visible(mainw->hruler)) {
+          lives_widget_show(mainw->hruler);
+        }
       }
 
       if (!lives_widget_is_visible(mainw->video_draw)) {
-	lives_widget_show (mainw->eventbox5);
-	lives_widget_show (mainw->video_draw);
-	lives_widget_show (mainw->laudio_draw);
-	lives_widget_show (mainw->raudio_draw);
+        lives_widget_show(mainw->eventbox5);
+        lives_widget_show(mainw->video_draw);
+        lives_widget_show(mainw->laudio_draw);
+        lives_widget_show(mainw->raudio_draw);
       }
 
-      lives_ruler_set_upper(LIVES_RULER (mainw->hruler),cfile->total_time);
+      lives_ruler_set_upper(LIVES_RULER(mainw->hruler),cfile->total_time);
       lives_widget_queue_draw(mainw->hruler);
 
       draw_little_bars(cfile->pointer_time);
 
       if (mainw->playing_file==-1&&mainw->play_window!=NULL&&cfile->is_loaded) {
-	if (mainw->preview_box==NULL) {
-	  // create the preview box that shows frames
-	  make_preview_box();
-	}
-	// and add it the play window
-	if (lives_widget_get_parent(mainw->preview_box)==NULL&&(cfile->clip_type==CLIP_TYPE_DISK||
-					       cfile->clip_type==CLIP_TYPE_FILE)&&!mainw->is_rendering) {
-	  lives_widget_queue_draw(mainw->play_window);
-	  lives_container_add (LIVES_CONTAINER (mainw->play_window), mainw->preview_box);
-	  lives_widget_grab_focus (mainw->preview_spinbutton);
-	  play_window_set_title();
-	  load_preview_image(FALSE);
-	}
-      }
-    }
-    else {
-      lives_widget_hide (mainw->hruler);
-      lives_widget_hide (mainw->eventbox5);
+        if (mainw->preview_box==NULL) {
+          // create the preview box that shows frames
+          make_preview_box();
+        }
+        // and add it the play window
+        if (lives_widget_get_parent(mainw->preview_box)==NULL&&(cfile->clip_type==CLIP_TYPE_DISK||
+            cfile->clip_type==CLIP_TYPE_FILE)&&!mainw->is_rendering) {
+          lives_widget_queue_draw(mainw->play_window);
+          lives_container_add(LIVES_CONTAINER(mainw->play_window), mainw->preview_box);
+          lives_widget_grab_focus(mainw->preview_spinbutton);
+          play_window_set_title();
+          load_preview_image(FALSE);
+        }
+      }
+    } else {
+      lives_widget_hide(mainw->hruler);
+      lives_widget_hide(mainw->eventbox5);
     }
 
     if (cfile->opening_loc||(cfile->frames==123456789&&cfile->opening)) {
-      tmpstr=g_strdup(_ ("Video [opening...]"));
-    }
-    else {
+      tmpstr=lives_strdup(_("Video [opening...]"));
+    } else {
       if (cfile->video_time>0.) {
-	tmpstr=g_strdup_printf(_ ("Video [%.2f sec]"),cfile->video_time);
-      }
-      else {
-	if (cfile->video_time<=0.&&cfile->frames>0) {
-	  tmpstr=g_strdup (_ ("(Undefined)"));
-	}
-	else {
-	  tmpstr=g_strdup (_ ("(No video)"));
-	}
+        tmpstr=lives_strdup_printf(_("Video [%.2f sec]"),cfile->video_time);
+      } else {
+        if (cfile->video_time<=0.&&cfile->frames>0) {
+          tmpstr=lives_strdup(_("(Undefined)"));
+        } else {
+          tmpstr=lives_strdup(_("(No video)"));
+        }
       }
     }
     lives_label_set_text(LIVES_LABEL(mainw->vidbar),tmpstr);
-    g_free(tmpstr);
+    lives_free(tmpstr);
     if (cfile->achans==0) {
-      tmpstr=g_strdup (_ ("(No audio)"));
-    }
-    else {
+      tmpstr=lives_strdup(_("(No audio)"));
+    } else {
       if (cfile->opening_audio) {
-	if (cfile->achans==1) {
-	  tmpstr=g_strdup (_ ("Mono  [opening...]"));
-	}
-	else {
-	  tmpstr=g_strdup (_ ("Left Audio [opening...]"));
-	}
-      }
-      else {
-	if (cfile->achans==1) {
-	  tmpstr=g_strdup_printf(_ ("Mono [%.2f sec]"),cfile->laudio_time);
-	}
-	else {
-	  tmpstr=g_strdup_printf(_ ("Left Audio [%.2f sec]"),cfile->laudio_time);
-	}
+        if (cfile->achans==1) {
+          tmpstr=lives_strdup(_("Mono  [opening...]"));
+        } else {
+          tmpstr=lives_strdup(_("Left Audio [opening...]"));
+        }
+      } else {
+        if (cfile->achans==1) {
+          tmpstr=lives_strdup_printf(_("Mono [%.2f sec]"),cfile->laudio_time);
+        } else {
+          tmpstr=lives_strdup_printf(_("Left Audio [%.2f sec]"),cfile->laudio_time);
+        }
       }
     }
     lives_label_set_text(LIVES_LABEL(mainw->laudbar),tmpstr);
-    g_free(tmpstr);
+    lives_free(tmpstr);
     if (cfile->achans>1) {
       if (cfile->opening_audio) {
-	tmpstr=g_strdup (_ ("Right Audio [opening...]"));
-      }
-      else {
-	tmpstr=g_strdup_printf(_ ("Right Audio [%.2f sec]"),cfile->raudio_time);
+        tmpstr=lives_strdup(_("Right Audio [opening...]"));
+      } else {
+        tmpstr=lives_strdup_printf(_("Right Audio [%.2f sec]"),cfile->raudio_time);
       }
       lives_label_set_text(LIVES_LABEL(mainw->raudbar),tmpstr);
-      lives_widget_show (mainw->raudbar);
-      g_free(tmpstr);
-    }
-    else {
-      lives_widget_hide (mainw->raudbar);
+      lives_widget_show(mainw->raudbar);
+      lives_free(tmpstr);
+    } else {
+      lives_widget_hide(mainw->raudbar);
     }
-  }
-  else {
+  } else {
     double ptrtime=(mainw->actual_frame-.5)/cfile->fps;
     if (ptrtime<0.) ptrtime=0.;
     draw_little_bars(ptrtime);
@@ -3083,9 +3055,9 @@
   mainw->current_file=current_file;
 
 }
-    
 
-void draw_little_bars (double ptrtime) {
+
+void draw_little_bars(double ptrtime) {
   //draw the vertical player bars
   double allocheight=lives_widget_get_allocation_height(mainw->video_draw)-prefs->bar_height;
   double offset=ptrtime/cfile->total_time*lives_widget_get_allocation_width(mainw->vidbar);
@@ -3094,35 +3066,33 @@
   if (!prefs->show_gui) return;
 
   if (!(frame=calc_frame_from_time(mainw->current_file,ptrtime)))
-   frame=cfile->frames;
+    frame=cfile->frames;
 
   if (cfile->frames>0) {
     if (mainw->video_drawable!=NULL) {
       lives_painter_t *cr=lives_painter_create(mainw->video_drawable);
 
       lives_painter_set_line_width(cr,1.);
-      
+
       if (frame>=cfile->start&&frame<=cfile->end) {
-	lives_painter_set_source_rgb(cr, 0., 0., 0.); ///< opaque black
-	lives_painter_move_to(cr, offset, 0);
-	lives_painter_line_to(cr, offset, prefs->bar_height);
-      }
-      else {
-	lives_painter_set_source_rgb(cr, 1., 1., 1.); ///< opaque white
-	lives_painter_move_to(cr, offset, 0);
-	lives_painter_line_to(cr, offset, prefs->bar_height);
+        lives_painter_set_source_rgb(cr, 0., 0., 0.); ///< opaque black
+        lives_painter_move_to(cr, offset, 0);
+        lives_painter_line_to(cr, offset, prefs->bar_height);
+      } else {
+        lives_painter_set_source_rgb(cr, 1., 1., 1.); ///< opaque white
+        lives_painter_move_to(cr, offset, 0);
+        lives_painter_line_to(cr, offset, prefs->bar_height);
       }
       lives_painter_stroke(cr);
 
       if (palette->style&STYLE_3||palette->style==STYLE_PLAIN) { // light style
-	lives_painter_set_source_rgb(cr, 0., 0., 0.); ///< opaque black
-	lives_painter_move_to(cr, offset, prefs->bar_height);
-	lives_painter_line_to(cr, offset, allocheight);
-      }
-      else {
-	lives_painter_set_source_rgb(cr, 1., 1., 1.); ///< opaque white
-	lives_painter_move_to(cr, offset, prefs->bar_height);
-	lives_painter_line_to(cr, offset, allocheight);
+        lives_painter_set_source_rgb(cr, 0., 0., 0.); ///< opaque black
+        lives_painter_move_to(cr, offset, prefs->bar_height);
+        lives_painter_line_to(cr, offset, allocheight);
+      } else {
+        lives_painter_set_source_rgb(cr, 1., 1., 1.); ///< opaque white
+        lives_painter_move_to(cr, offset, prefs->bar_height);
+        lives_painter_line_to(cr, offset, allocheight);
       }
       lives_painter_stroke(cr);
 
@@ -3139,28 +3109,26 @@
       lives_painter_t *cr=lives_painter_create(mainw->laudio_drawable);
 
       lives_painter_set_line_width(cr,1.);
-      
+
       if (frame>=cfile->start&&frame<=cfile->end) {
-	lives_painter_set_source_rgb(cr, 0., 0., 0.); ///< opaque black
-	lives_painter_move_to(cr, offset, 0);
-	lives_painter_line_to(cr, offset, prefs->bar_height);
-      }
-      else {
-	lives_painter_set_source_rgb(cr, 1., 1., 1.); ///< opaque white
-	lives_painter_move_to(cr, offset, 0);
-	lives_painter_line_to(cr, offset, prefs->bar_height);
+        lives_painter_set_source_rgb(cr, 0., 0., 0.); ///< opaque black
+        lives_painter_move_to(cr, offset, 0);
+        lives_painter_line_to(cr, offset, prefs->bar_height);
+      } else {
+        lives_painter_set_source_rgb(cr, 1., 1., 1.); ///< opaque white
+        lives_painter_move_to(cr, offset, 0);
+        lives_painter_line_to(cr, offset, prefs->bar_height);
       }
       lives_painter_stroke(cr);
 
       if (palette->style&STYLE_3||palette->style==STYLE_PLAIN) { // light style
-	lives_painter_set_source_rgb(cr, 0., 0., 0.); ///< opaque black
-	lives_painter_move_to(cr, offset, prefs->bar_height);
-	lives_painter_line_to(cr, offset, allocheight);
-      }
-      else {
-	lives_painter_set_source_rgb(cr, 1., 1., 1.); ///< opaque white
-	lives_painter_move_to(cr, offset, prefs->bar_height);
-	lives_painter_line_to(cr, offset, allocheight);
+        lives_painter_set_source_rgb(cr, 0., 0., 0.); ///< opaque black
+        lives_painter_move_to(cr, offset, prefs->bar_height);
+        lives_painter_line_to(cr, offset, allocheight);
+      } else {
+        lives_painter_set_source_rgb(cr, 1., 1., 1.); ///< opaque white
+        lives_painter_move_to(cr, offset, prefs->bar_height);
+        lives_painter_line_to(cr, offset, allocheight);
       }
       lives_painter_stroke(cr);
 
@@ -3170,38 +3138,36 @@
 
     if (cfile->achans>1) {
       if (mainw->raudio_drawable!=NULL) {
-	if ((frame>=cfile->start&&frame<=cfile->end)||mainw->loop) {
-	lives_painter_t *cr=lives_painter_create(mainw->raudio_drawable);
+        if ((frame>=cfile->start&&frame<=cfile->end)||mainw->loop) {
+          lives_painter_t *cr=lives_painter_create(mainw->raudio_drawable);
 
-	lives_painter_set_line_width(cr,1.);
-      
-	if (frame>=cfile->start&&frame<=cfile->end) {
-	  lives_painter_set_source_rgb(cr, 0., 0., 0.); ///< opaque black
-	  lives_painter_move_to(cr, offset, 0);
-	  lives_painter_line_to(cr, offset, prefs->bar_height);
-	}
-	else {
-	  lives_painter_set_source_rgb(cr, 1., 1., 1.); ///< opaque white
-	  lives_painter_move_to(cr, offset, 0);
-	  lives_painter_line_to(cr, offset, prefs->bar_height);
-	}
-	lives_painter_stroke(cr);
+          lives_painter_set_line_width(cr,1.);
 
-	if (palette->style&STYLE_3||palette->style==STYLE_PLAIN) { // light style
-	  lives_painter_set_source_rgb(cr, 0., 0., 0.); ///< opaque black
-	  lives_painter_move_to(cr, offset, prefs->bar_height);
-	  lives_painter_line_to(cr, offset, allocheight);
-	}
-	else {
-	  lives_painter_set_source_rgb(cr, 1., 1., 1.); ///< opaque white
-	  lives_painter_move_to(cr, offset, prefs->bar_height);
-	  lives_painter_line_to(cr, offset, allocheight);
-	}
-	lives_painter_stroke(cr);
+          if (frame>=cfile->start&&frame<=cfile->end) {
+            lives_painter_set_source_rgb(cr, 0., 0., 0.); ///< opaque black
+            lives_painter_move_to(cr, offset, 0);
+            lives_painter_line_to(cr, offset, prefs->bar_height);
+          } else {
+            lives_painter_set_source_rgb(cr, 1., 1., 1.); ///< opaque white
+            lives_painter_move_to(cr, offset, 0);
+            lives_painter_line_to(cr, offset, prefs->bar_height);
+          }
+          lives_painter_stroke(cr);
+
+          if (palette->style&STYLE_3||palette->style==STYLE_PLAIN) { // light style
+            lives_painter_set_source_rgb(cr, 0., 0., 0.); ///< opaque black
+            lives_painter_move_to(cr, offset, prefs->bar_height);
+            lives_painter_line_to(cr, offset, allocheight);
+          } else {
+            lives_painter_set_source_rgb(cr, 1., 1., 1.); ///< opaque white
+            lives_painter_move_to(cr, offset, prefs->bar_height);
+            lives_painter_line_to(cr, offset, allocheight);
+          }
+          lives_painter_stroke(cr);
 
-	lives_painter_destroy(cr);
+          lives_painter_destroy(cr);
 
-	}
+        }
       }
     }
   }
@@ -3211,7 +3177,7 @@
 
 
 
-void get_total_time (lives_clip_t *file) {
+void get_total_time(lives_clip_t *file) {
   // get times (video, left and right audio)
 
   file->laudio_time=file->raudio_time=file->video_time=file->total_time=0.;
@@ -3244,7 +3210,7 @@
 
 
 
-void find_when_to_stop (void) {
+void find_when_to_stop(void) {
   // work out when to stop playing
   //
   // ---------------
@@ -3260,8 +3226,8 @@
   else if (cfile->opening_audio) mainw->whentostop=STOP_ON_VID_END;
   else if (!mainw->preview&&(mainw->loop_cont||(mainw->loop&&prefs->audio_src==AUDIO_SRC_EXT))) mainw->whentostop=NEVER_STOP;
   else if (cfile->frames==0||(mainw->loop&&cfile->achans>0&&!mainw->is_rendering&&(mainw->audio_end/cfile->fps)
-			      <MAX (cfile->laudio_time,cfile->raudio_time)&&
-			      calc_time_from_frame(mainw->current_file,mainw->play_start)<cfile->laudio_time)) 
+                              <MAX(cfile->laudio_time,cfile->raudio_time)&&
+                              calc_time_from_frame(mainw->current_file,mainw->play_start)<cfile->laudio_time))
     mainw->whentostop=STOP_ON_AUD_END;
   else mainw->whentostop=STOP_ON_VID_END; // tada...
 }
@@ -3270,9 +3236,9 @@
 #define ASPECT_ALLOWANCE 0.005
 
 
-void minimise_aspect_delta (double aspect,int hblock,int vblock,int hsize,int vsize,int *width,int *height) {
+void minimise_aspect_delta(double aspect,int hblock,int vblock,int hsize,int vsize,int *width,int *height) {
   // we will use trigonometry to calculate the smallest difference between a given
-  // aspect ratio and the actual frame size. If the delta is smaller than current 
+  // aspect ratio and the actual frame size. If the delta is smaller than current
   // we set the height and width
   int cw=width[0];
   int ch=height[0];
@@ -3288,37 +3254,37 @@
   current_delta=(hsize-cw)*(hsize-cw)+(vsize-ch)*(vsize-ch);
 
 #ifdef DEBUG_ASPECT
-  g_printerr ("aspect %.8f : width %d height %d is best fit\n",aspect,calc_width,(int)(calc_width/aspect));
+  lives_printerr("aspect %.8f : width %d height %d is best fit\n",aspect,calc_width,(int)(calc_width/aspect));
 #endif
   // use the block size to find the nearest allowed size
-  for (i=-1;i<2;i++) {
+  for (i=-1; i<2; i++) {
     real_width=(int)(calc_width/hblock+i)*hblock;
     real_height=(int)(real_width/aspect/vblock+.5)*vblock;
     delta=(hsize-real_width)*(hsize-real_width)+(vsize-real_height)*(vsize-real_height);
 
 
     if (real_width%hblock!=0||real_height%vblock!=0||ABS((double)real_width/(double)real_height-aspect)>ASPECT_ALLOWANCE) {
-      // encoders can be fussy, so we need to fit both aspect ratio and blocksize      
+      // encoders can be fussy, so we need to fit both aspect ratio and blocksize
       while (1) {
-	real_width=((int)(real_width/hblock)+1)*hblock;
-	real_height=(int)((double)real_width/aspect+.5);
-	
-	if (real_height%vblock==0) break;
-	
-	real_height=((int)(real_height/vblock)+1)*vblock;
-	real_width=(int)((double)real_height*aspect+.5);
-	
-	if (real_width%hblock==0) break;
-	
+        real_width=((int)(real_width/hblock)+1)*hblock;
+        real_height=(int)((double)real_width/aspect+.5);
+
+        if (real_height%vblock==0) break;
+
+        real_height=((int)(real_height/vblock)+1)*vblock;
+        real_width=(int)((double)real_height*aspect+.5);
+
+        if (real_width%hblock==0) break;
+
       }
     }
 
 #ifdef DEBUG_ASPECT
-    g_printerr ("block quantise to %d x %d\n",real_width,real_height);
+    lives_printerr("block quantise to %d x %d\n",real_width,real_height);
 #endif
     if (delta<current_delta) {
 #ifdef DEBUG_ASPECT
-      g_printerr ("is better fit\n");
+      lives_printerr("is better fit\n");
 #endif
       current_delta=delta;
       width[0]=real_width;
@@ -3327,7 +3293,7 @@
   }
 }
 
-void zero_spinbuttons (void) {
+void zero_spinbuttons(void) {
   lives_signal_handler_block(mainw->spinbutton_start,mainw->spin_start_func);
   lives_spin_button_set_range(LIVES_SPIN_BUTTON(mainw->spinbutton_start),0.,0.);
   lives_spin_button_set_value(LIVES_SPIN_BUTTON(mainw->spinbutton_start),0.);
@@ -3350,8 +3316,8 @@
       jack_audio_read_init();
       mainw->jackd=jack_get_driver(0,TRUE);
       if (jack_open_device(mainw->jackd)) {
-	mainw->jackd=NULL;
-	return FALSE;
+        mainw->jackd=NULL;
+        return FALSE;
       }
       mainw->jackd->whentostop=&mainw->whentostop;
       mainw->jackd->cancelled=&mainw->cancelled;
@@ -3363,9 +3329,9 @@
     mainw->aplayer_broken=FALSE;
     lives_widget_show(mainw->vol_toolitem);
     if (mainw->vol_label!=NULL) lives_widget_show(mainw->vol_label);
-    lives_widget_show (mainw->recaudio_submenu);
+    lives_widget_show(mainw->recaudio_submenu);
 
-    if (mainw->vpp!=NULL&&mainw->vpp->get_audio_fmts!=NULL) 
+    if (mainw->vpp!=NULL&&mainw->vpp->get_audio_fmts!=NULL)
       mainw->vpp->audio_codec=get_best_audio(mainw->vpp);
 
 #ifdef HAVE_PULSE_AUDIO
@@ -3373,7 +3339,7 @@
       pulse_close_client(mainw->pulsed_read);
       mainw->pulsed_read=NULL;
     }
-    
+
     if (mainw->pulsed!=NULL) {
       pulse_close_client(mainw->pulsed);
       mainw->pulsed=NULL;
@@ -3383,9 +3349,9 @@
   }
   prefs->audio_player=AUD_PLAYER_JACK;
   set_pref("audio_player","jack");
-  g_snprintf(prefs->aplayer,512,"%s","jack");
+  lives_snprintf(prefs->aplayer,512,"%s","jack");
 
-  if (mainw->is_ready&&mainw->vpp!=NULL&&mainw->vpp->get_audio_fmts!=NULL) 
+  if (mainw->is_ready&&mainw->vpp!=NULL&&mainw->vpp->get_audio_fmts!=NULL)
     mainw->vpp->audio_codec=get_best_audio(mainw->vpp);
 
   if (prefs->perm_audio_reader&&prefs->audio_src==AUDIO_SRC_EXT) {
@@ -3407,28 +3373,28 @@
   if (mainw->is_ready) {
     if ((retval=lives_pulse_init(-1))) {
       if (mainw->pulsed==NULL) {
-	pulse_audio_init();
-	pulse_audio_read_init();
-	mainw->pulsed=pulse_get_driver(TRUE);
-	mainw->pulsed->whentostop=&mainw->whentostop;
-	mainw->pulsed->cancelled=&mainw->cancelled;
-	mainw->pulsed->in_use=FALSE;
-	pulse_driver_activate(mainw->pulsed);
+        pulse_audio_init();
+        pulse_audio_read_init();
+        mainw->pulsed=pulse_get_driver(TRUE);
+        mainw->pulsed->whentostop=&mainw->whentostop;
+        mainw->pulsed->cancelled=&mainw->cancelled;
+        mainw->pulsed->in_use=FALSE;
+        pulse_driver_activate(mainw->pulsed);
       }
       mainw->aplayer_broken=FALSE;
       lives_widget_show(mainw->vol_toolitem);
       if (mainw->vol_label!=NULL) lives_widget_show(mainw->vol_label);
-      lives_widget_show (mainw->recaudio_submenu);
+      lives_widget_show(mainw->recaudio_submenu);
 
       prefs->audio_player=AUD_PLAYER_PULSE;
       set_pref("audio_player","pulse");
-      g_snprintf(prefs->aplayer,512,"%s","pulse");
+      lives_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);
+      if (mainw->vpp!=NULL&&mainw->vpp->get_audio_fmts!=NULL)
+        mainw->vpp->audio_codec=get_best_audio(mainw->vpp);
 
     }
-    
+
 #ifdef ENABLE_JACK
     if (mainw->jackd_read!=NULL) {
       jack_close_device(mainw->jackd_read);
@@ -3458,14 +3424,14 @@
   prefs->audio_player=AUD_PLAYER_SOX;
   get_pref_default("sox_command",prefs->audio_play_command,256);
   if (set_in_prefs) set_pref("audio_player","sox");
-  g_snprintf(prefs->aplayer,512,"%s","sox");
+  lives_snprintf(prefs->aplayer,512,"%s","sox");
   set_pref("audio_play_command",prefs->audio_play_command);
   if (mainw->is_ready) {
     lives_widget_hide(mainw->vol_toolitem);
     if (mainw->vol_label!=NULL) lives_widget_hide(mainw->vol_label);
-    lives_widget_hide (mainw->recaudio_submenu);
-    
-    if (mainw->vpp!=NULL&&mainw->vpp->get_audio_fmts!=NULL) 
+    lives_widget_hide(mainw->recaudio_submenu);
+
+    if (mainw->vpp!=NULL&&mainw->vpp->get_audio_fmts!=NULL)
       mainw->vpp->audio_codec=get_best_audio(mainw->vpp);
   }
 
@@ -3500,26 +3466,26 @@
 
 void switch_aud_to_mplayer(boolean set_in_prefs) {
   int i;
-  for (i=1;i<MAX_FILES;i++) {
+  for (i=1; i<MAX_FILES; i++) {
     if (mainw->files[i]!=NULL) {
       if (i!=mainw->current_file&&mainw->files[i]->opening) {
-	do_error_dialog(_ ("LiVES cannot switch to mplayer whilst clips are loading."));
-	return;
+        do_error_dialog(_("LiVES cannot switch to mplayer whilst clips are loading."));
+        return;
       }
     }
   }
-  
+
   prefs->audio_player=AUD_PLAYER_MPLAYER;
   get_pref_default("mplayer_audio_command",prefs->audio_play_command,256);
   if (set_in_prefs) set_pref("audio_player","mplayer");
-  g_snprintf(prefs->aplayer,512,"%s","mplayer");
+  lives_snprintf(prefs->aplayer,512,"%s","mplayer");
   set_pref("audio_play_command",prefs->audio_play_command);
   if (mainw->is_ready) {
     lives_widget_hide(mainw->vol_toolitem);
     if (mainw->vol_label!=NULL) lives_widget_hide(mainw->vol_label);
-    lives_widget_hide (mainw->recaudio_submenu);
+    lives_widget_hide(mainw->recaudio_submenu);
 
-    if (mainw->vpp!=NULL&&mainw->vpp->get_audio_fmts!=NULL) 
+    if (mainw->vpp!=NULL&&mainw->vpp->get_audio_fmts!=NULL)
       mainw->vpp->audio_codec=get_best_audio(mainw->vpp);
   }
 
@@ -3553,26 +3519,26 @@
 
 void switch_aud_to_mplayer2(boolean set_in_prefs) {
   int i;
-  for (i=1;i<MAX_FILES;i++) {
+  for (i=1; i<MAX_FILES; i++) {
     if (mainw->files[i]!=NULL) {
       if (i!=mainw->current_file&&mainw->files[i]->opening) {
-	do_error_dialog(_ ("LiVES cannot switch to mplayer2 whilst clips are loading."));
-	return;
+        do_error_dialog(_("LiVES cannot switch to mplayer2 whilst clips are loading."));
+        return;
       }
     }
   }
-  
+
   prefs->audio_player=AUD_PLAYER_MPLAYER2;
   get_pref_default("mplayer2_audio_command",prefs->audio_play_command,256); // TODO
   if (set_in_prefs) set_pref("audio_player","mplayer2"); // TODO
-  g_snprintf(prefs->aplayer,512,"%s","mplayer2");
+  lives_snprintf(prefs->aplayer,512,"%s","mplayer2");
   set_pref("audio_play_command",prefs->audio_play_command);
   if (mainw->is_ready) {
     lives_widget_hide(mainw->vol_toolitem);
     if (mainw->vol_label!=NULL) lives_widget_hide(mainw->vol_label);
-    lives_widget_hide (mainw->recaudio_submenu);
+    lives_widget_hide(mainw->recaudio_submenu);
 
-    if (mainw->vpp!=NULL&&mainw->vpp->get_audio_fmts!=NULL) 
+    if (mainw->vpp!=NULL&&mainw->vpp->get_audio_fmts!=NULL)
       mainw->vpp->audio_codec=get_best_audio(mainw->vpp);
   }
 
@@ -3641,7 +3607,7 @@
     }
 #endif
 #ifdef ENABLE_JACK
-    if (mainw->rec_achans>0&&prefs->audio_player==AUD_PLAYER_JACK) { 
+    if (mainw->rec_achans>0&&prefs->audio_player==AUD_PLAYER_JACK) {
       jack_rec_audio_to_clip(mainw->current_file,-1,RECA_WINDOW_GRAB);
       mainw->jackd_read->in_use=TRUE;
     }
@@ -3655,8 +3621,8 @@
 
   resize(-2);
 
-  lives_widget_show (mainw->playframe);
-  lives_widget_show (mainw->playarea);
+  lives_widget_show(mainw->playframe);
+  lives_widget_show(mainw->playarea);
   lives_widget_context_update();
 
   // size must be exact, must not be larger than play window or we end up with nothing
@@ -3671,14 +3637,14 @@
 
 #ifdef GDK_WINDOWING_X11
   mainw->foreign_window=gdk_x11_window_foreign_new_for_display
-    (mainw->mgeom[prefs->gui_monitor>0?prefs->gui_monitor-1:0].disp,
-     mainw->foreign_id);
+                        (mainw->mgeom[prefs->gui_monitor>0?prefs->gui_monitor-1:0].disp,
+                         mainw->foreign_id);
 #else
 #ifdef GDK_WINDOWING_WIN32
   if (mainw->foreign_window==NULL)
     mainw->foreign_window=gdk_win32_window_foreign_new_for_display
-      (mainw->mgeom[prefs->gui_monitor>0?prefs->gui_monitor-1:0].disp,
-       mainw->foreign_id);
+                          (mainw->mgeom[prefs->gui_monitor>0?prefs->gui_monitor-1:0].disp,
+                           mainw->foreign_id);
 #endif
 
 #endif // GDK_WINDOWING
@@ -3695,18 +3661,18 @@
 #if !GTK_CHECK_VERSION(3,0,0)
 
   if (mainw->foreign_visual!=NULL) {
-    for (i=0;i<capable->nmonitors;i++) {
+    for (i=0; i<capable->nmonitors; i++) {
       vissi=gdk_x11_screen_lookup_visual(mainw->mgeom[i].screen,hextodec(mainw->foreign_visual));
       if (vissi!=NULL) break;
     }
   }
 
-  if (vissi==NULL) vissi=gdk_visual_get_best_with_depth (mainw->foreign_bpp);
+  if (vissi==NULL) vissi=gdk_visual_get_best_with_depth(mainw->foreign_bpp);
 
   if (vissi==NULL) return FALSE;
 
-  mainw->foreign_cmap=gdk_x11_colormap_foreign_new(vissi, 
-						   gdk_x11_colormap_get_xcolormap(gdk_colormap_new(vissi,TRUE)));
+  mainw->foreign_cmap=gdk_x11_colormap_foreign_new(vissi,
+                      gdk_x11_colormap_get_xcolormap(gdk_colormap_new(vissi,TRUE)));
 
   if (mainw->foreign_cmap==NULL) return FALSE;
 
@@ -3746,7 +3712,7 @@
 boolean after_foreign_play(void) {
   // read details from capture file
   int capture_fd;
-  char *capfile=g_strdup_printf("%s/.capture.%d",prefs->tmpdir,capable->mainpid);
+  char *capfile=lives_strdup_printf("%s/.capture.%d",prefs->tmpdir,capable->mainpid);
   char capbuf[256];
   ssize_t length;
   int new_file=-1;
@@ -3761,62 +3727,60 @@
   if ((capture_fd=open(capfile,O_RDONLY))>-1) {
     memset(capbuf,0,256);
     if ((length=read(capture_fd,capbuf,256))) {
-      if (get_token_count (capbuf,'|')>2) {
-	array=g_strsplit(capbuf,"|",3);
-	new_frames=atoi(array[1]);
-
-	if (new_frames>0) {
-	  new_file=mainw->first_free_file;
-	  mainw->current_file=new_file;
-	  cfile=(lives_clip_t *)(g_malloc(sizeof(lives_clip_t)));
-	  g_snprintf(cfile->handle,255,"%s",array[0]);
-	  g_strfreev(array);
-	  create_cfile();
-	  g_snprintf(cfile->file_name,256,"Capture %d",mainw->cap_number);
-	  g_snprintf(cfile->name,256,"Capture %d",mainw->cap_number++);
-	  g_snprintf(cfile->type,40,"Frames");
-
-	  cfile->progress_start=cfile->start=1;
-	  cfile->progress_end=cfile->frames=cfile->end=new_frames;
-	  cfile->pb_fps=cfile->fps=mainw->rec_fps;
-
-	  cfile->hsize=CEIL(mainw->foreign_width,4);
-	  cfile->vsize=CEIL(mainw->foreign_height,4);
-	  
-	  if (mainw->rec_achans>0) {
-	    cfile->arate=cfile->arps=mainw->rec_arate;
-	    cfile->achans=mainw->rec_achans;
-	    cfile->asampsize=mainw->rec_asamps;
-	    cfile->signed_endian=mainw->rec_signed_endian;
-	  }
-	  
-	  // TODO - dirsep
-
-	  g_snprintf(file_name,PATH_MAX,"%s/%s/",prefs->tmpdir,cfile->handle);
-	  
-	  com=g_strdup_printf("%s fill_and_redo_frames \"%s\" %d %d %d \"%s\" %.4f %d %d %d %d %d",
-			      prefs->backend,
-			      cfile->handle,cfile->frames,cfile->hsize,cfile->vsize,
-			      get_image_ext_for_type(cfile->img_type),cfile->fps,cfile->arate,
-			      cfile->achans,cfile->asampsize,!(cfile->signed_endian&AFORM_UNSIGNED),
-			      !(cfile->signed_endian&AFORM_BIG_ENDIAN));
-	  unlink(cfile->info_file);
-	  mainw->com_failed=FALSE;
-	  lives_system(com,FALSE);
-
-
-	  cfile->nopreview=TRUE;
-	  if (!mainw->com_failed&&do_progress_dialog(TRUE,TRUE,_ ("Cleaning up clip"))) {
-	    get_next_free_file();
-	  }
-	  else {
-	    // cancelled cleanup
-	    new_frames=0;
-	    close_current_file(old_file);
-	  }
-	  g_free(com);
-	}
-	else g_strfreev(array);
+      if (get_token_count(capbuf,'|')>2) {
+        array=lives_strsplit(capbuf,"|",3);
+        new_frames=atoi(array[1]);
+
+        if (new_frames>0) {
+          new_file=mainw->first_free_file;
+          mainw->current_file=new_file;
+          cfile=(lives_clip_t *)(lives_malloc(sizeof(lives_clip_t)));
+          lives_snprintf(cfile->handle,255,"%s",array[0]);
+          lives_strfreev(array);
+          create_cfile();
+          lives_snprintf(cfile->file_name,256,"Capture %d",mainw->cap_number);
+          lives_snprintf(cfile->name,256,"Capture %d",mainw->cap_number++);
+          lives_snprintf(cfile->type,40,"Frames");
+
+          cfile->progress_start=cfile->start=1;
+          cfile->progress_end=cfile->frames=cfile->end=new_frames;
+          cfile->pb_fps=cfile->fps=mainw->rec_fps;
+
+          cfile->hsize=CEIL(mainw->foreign_width,4);
+          cfile->vsize=CEIL(mainw->foreign_height,4);
+
+          if (mainw->rec_achans>0) {
+            cfile->arate=cfile->arps=mainw->rec_arate;
+            cfile->achans=mainw->rec_achans;
+            cfile->asampsize=mainw->rec_asamps;
+            cfile->signed_endian=mainw->rec_signed_endian;
+          }
+
+          // TODO - dirsep
+
+          lives_snprintf(file_name,PATH_MAX,"%s/%s/",prefs->tmpdir,cfile->handle);
+
+          com=lives_strdup_printf("%s fill_and_redo_frames \"%s\" %d %d %d \"%s\" %.4f %d %d %d %d %d",
+                                  prefs->backend,
+                                  cfile->handle,cfile->frames,cfile->hsize,cfile->vsize,
+                                  get_image_ext_for_type(cfile->img_type),cfile->fps,cfile->arate,
+                                  cfile->achans,cfile->asampsize,!(cfile->signed_endian&AFORM_UNSIGNED),
+                                  !(cfile->signed_endian&AFORM_BIG_ENDIAN));
+          unlink(cfile->info_file);
+          mainw->com_failed=FALSE;
+          lives_system(com,FALSE);
+
+
+          cfile->nopreview=TRUE;
+          if (!mainw->com_failed&&do_progress_dialog(TRUE,TRUE,_("Cleaning up clip"))) {
+            get_next_free_file();
+          } else {
+            // cancelled cleanup
+            new_frames=0;
+            close_current_file(old_file);
+          }
+          lives_free(com);
+        } else lives_strfreev(array);
       }
       close(capture_fd);
       unlink(capfile);
@@ -3825,16 +3789,16 @@
 
   if (new_frames==0) {
     // nothing captured; or cancelled
-    g_free(capfile);
+    lives_free(capfile);
     return FALSE;
   }
 
   cfile->nopreview=FALSE;
-  g_free(capfile);
+  lives_free(capfile);
 
   add_to_clipmenu();
   if (mainw->multitrack==NULL) switch_to_file(old_file,mainw->current_file);
-  
+
   else {
     mainw->current_file=mainw->multitrack->render_file;
     mt_init_clips(mainw->multitrack,new_file,TRUE);
@@ -3845,21 +3809,18 @@
   cfile->changed=TRUE;
   save_clip_values(mainw->current_file);
   if (prefs->crash_recovery) add_to_recovery_file(cfile->handle);
-#ifdef ENABLE_OSC
-  lives_osc_notify(LIVES_OSC_NOTIFY_CLIP_OPENED,"");
-#endif
+  lives_notify(LIVES_OSC_NOTIFY_CLIP_OPENED,"");
   return TRUE;
 }
 
 
 void set_menu_text(LiVESWidget *menuitem, const char *text, boolean use_mnemonic) {
   LiVESWidget *label;
-  if (GTK_IS_MENU_ITEM (menuitem)) {
+  if (LIVES_IS_MENU_ITEM(menuitem)) {
     label=lives_bin_get_child(LIVES_BIN(menuitem));
     if (use_mnemonic) {
       lives_label_set_text_with_mnemonic(LIVES_LABEL(label),text);
-    }
-    else {
+    } else {
       lives_label_set_text(LIVES_LABEL(label),text);
     }
   }
@@ -3868,33 +3829,33 @@
 
 void get_menu_text(LiVESWidget *menuitem, char *text) {
   LiVESWidget *label=lives_bin_get_child(LIVES_BIN(menuitem));
-  g_snprintf(text,255,"%s",lives_label_get_text(LIVES_LABEL(label)));
+  lives_snprintf(text,255,"%s",lives_label_get_text(LIVES_LABEL(label)));
 }
 
 void
 get_menu_text_long(LiVESWidget *menuitem, char *text) {
   LiVESWidget *label=lives_bin_get_child(LIVES_BIN(menuitem));
-  g_snprintf(text,32768,"%s",lives_label_get_text(LIVES_LABEL(label)));
+  lives_snprintf(text,32768,"%s",lives_label_get_text(LIVES_LABEL(label)));
 }
 
 
 LIVES_INLINE boolean int_array_contains_value(int *array, int num_elems, int value) {
   int i;
-  for (i=0;i<num_elems;i++) {
+  for (i=0; i<num_elems; i++) {
     if (array[i]==value) return TRUE;
   }
   return FALSE;
 }
 
 
-void reset_clipmenu (void) {
+void reset_clipmenu(void) {
   // sometimes the clip menu gets messed up, e.g. after reloading a set.
   // This function will clean up the 'x's and so on.
 
   if (mainw->current_file>0&&cfile!=NULL&&cfile->menuentry!=NULL) {
-    lives_signal_handler_block (cfile->menuentry, cfile->menuentry_func);
+    lives_signal_handler_block(cfile->menuentry, cfile->menuentry_func);
     lives_check_menu_item_set_active(LIVES_CHECK_MENU_ITEM(cfile->menuentry), TRUE);
-    lives_signal_handler_unblock (cfile->menuentry, cfile->menuentry_func);
+    lives_signal_handler_unblock(cfile->menuentry, cfile->menuentry_func);
   }
 }
 
@@ -3905,18 +3866,18 @@
   boolean exists=FALSE;
   char *msg;
   // file_name should be in utf8
-  char *lfile_name=g_filename_from_utf8(file_name,-1,NULL,NULL,NULL);
+  char *lfile_name=U82F(file_name);
 
   // check if file exists
-  if (g_file_test (lfile_name, G_FILE_TEST_EXISTS)) {
+  if (lives_file_test(lfile_name, LIVES_FILE_TEST_EXISTS)) {
     if (check_existing) {
-      msg=g_strdup_printf (_ ("\n%s\nalready exists.\n\nOverwrite ?\n"),file_name);
+      msg=lives_strdup_printf(_("\n%s\nalready exists.\n\nOverwrite ?\n"),file_name);
       if (!do_warning_dialog(msg)) {
-	g_free (msg);
-	g_free(lfile_name);
-	return FALSE;
+        lives_free(msg);
+        lives_free(lfile_name);
+        return FALSE;
       }
-      g_free (msg);
+      lives_free(msg);
     }
     check=open(lfile_name,O_WRONLY);
     exists=TRUE;
@@ -3929,25 +3890,25 @@
   if (check<0) {
     if (mainw!=NULL&&mainw->is_ready) {
       if (errno==EACCES)
-	do_file_perm_error(lfile_name);
-      else 
-	do_write_failed_error_s(lfile_name,NULL);
+        do_file_perm_error(lfile_name);
+      else
+        do_write_failed_error_s(lfile_name,NULL);
     }
-    g_free(lfile_name);
+    lives_free(lfile_name);
     return FALSE;
   }
 
   close(check);
   if (!exists) {
-    unlink (lfile_name);
+    unlink(lfile_name);
   }
-  g_free(lfile_name);
+  lives_free(lfile_name);
   return TRUE;
 }
 
 
 
-boolean check_dir_access (const char *dir) {
+boolean check_dir_access(const char *dir) {
   // if a directory exists, make sure it is readable and writable
   // otherwise create it and then check
 
@@ -3955,30 +3916,30 @@
 
   // see also is_writeable_dir() which uses statvfs
 
-  boolean exists=g_file_test (dir, G_FILE_TEST_EXISTS);
+  boolean exists=lives_file_test(dir, LIVES_FILE_TEST_EXISTS);
   boolean is_OK=FALSE;
 
   char *com;
   char *testfile;
 
   if (!exists) {
-    g_mkdir_with_parents(dir,S_IRWXU);
+    lives_mkdir_with_parents(dir,S_IRWXU);
   }
 
-  if (!g_file_test(dir, G_FILE_TEST_IS_DIR)) return FALSE;
+  if (!lives_file_test(dir, LIVES_FILE_TEST_IS_DIR)) return FALSE;
 
-  testfile=g_build_filename (dir,"livestst.txt",NULL);
+  testfile=lives_build_filename(dir,"livestst.txt",NULL);
 #ifndef IS_MINGW
-  com=g_strdup_printf ("/bin/touch \"%s\"",testfile);
+  com=lives_strdup_printf("%s \"%s\"",capable->touch_cmd,testfile);
 #else
-  com=g_strdup_printf ("touch.exe \"%s\"",testfile);
+  com=lives_strdup_printf("touch.exe \"%s\"",testfile);
 #endif
-  lives_system (com,TRUE);
-  g_free (com);
-  if ((is_OK=g_file_test(testfile, G_FILE_TEST_EXISTS))) {
-    unlink (testfile);
+  lives_system(com,TRUE);
+  lives_free(com);
+  if ((is_OK=lives_file_test(testfile, LIVES_FILE_TEST_EXISTS))) {
+    unlink(testfile);
   }
-  g_free (testfile);
+  lives_free(testfile);
   if (!exists) {
     rmdir(dir);
   }
@@ -4014,47 +3975,46 @@
 
 void activate_url_inner(const char *link) {
 #if GTK_CHECK_VERSION(2,14,0)
-  GError *err=NULL;
+  LiVESError *err=NULL;
   gtk_show_uri(NULL,link,GDK_CURRENT_TIME,&err);
 #else
   char *com = getenv("BROWSER");
-  com = g_strdup_printf("\"%s\" '%s' &", com ? com : "gnome-open", link);
+  com = lives_strdup_printf("\"%s\" '%s' &", com ? com : "gnome-open", link);
   lives_system(com,FALSE);
-  g_free(com);
+  lives_free(com);
 #endif
 }
 
 
-void activate_url (GtkAboutDialog *about, const char *link, gpointer data) {
+void activate_url(LiVESAboutDialog *about, const char *link, livespointer data) {
   activate_url_inner(link);
 }
 
 
-void show_manual_section (const char *lang, const char *section) {
+void show_manual_section(const char *lang, const char *section) {
   char *tmp=NULL,*tmp2=NULL;
   const char *link;
 
-  link=g_strdup_printf("%s%s%s%s",LIVES_MANUAL_URL,(lang==NULL?"":(tmp2=g_strdup_printf("//%s//",lang))),
-		       LIVES_MANUAL_FILENAME,(section==NULL?"":(tmp=g_strdup_printf("#%s",section))));
+  link=lives_strdup_printf("%s%s%s%s",LIVES_MANUAL_URL,(lang==NULL?"":(tmp2=lives_strdup_printf("//%s//",lang))),
+                           LIVES_MANUAL_FILENAME,(section==NULL?"":(tmp=lives_strdup_printf("#%s",section))));
 
   activate_url_inner(link);
 
-  if (tmp!=NULL) g_free(tmp);
-  if (tmp2!=NULL) g_free(tmp2);
+  if (tmp!=NULL) lives_free(tmp);
+  if (tmp2!=NULL) lives_free(tmp2);
 
 }
 
 
-uint64_t
-get_file_size(int fd) {
+uint64_t get_file_size(int fd) {
   // get the size of file fd
   struct stat filestat;
   fstat(fd,&filestat);
   return (uint64_t)(filestat.st_size);
 }
 
-uint64_t
-sget_file_size(const char *name) {
+
+uint64_t sget_file_size(const char *name) {
   // get the size of file fd
   struct stat filestat;
   int fd;
@@ -4070,7 +4030,7 @@
 }
 
 
-void reget_afilesize (int fileno) {
+void reget_afilesize(int fileno) {
   // re-get the audio file size
   char *afile;
   lives_clip_t *sfile=mainw->files[fileno];
@@ -4078,34 +4038,30 @@
 
   if (mainw->multitrack!=NULL) return; // otherwise achans gets set to 0...
 
-  if (!sfile->opening) afile=g_build_filename (prefs->tmpdir,sfile->handle,"audio",NULL);
-  else afile=g_build_filename (prefs->tmpdir,sfile->handle,"audiodump.pcm",NULL);
-  if ((sfile->afilesize=sget_file_size (afile))==0l) {
+  if (!sfile->opening) afile=lives_build_filename(prefs->tmpdir,sfile->handle,"audio",NULL);
+  else afile=lives_build_filename(prefs->tmpdir,sfile->handle,"audiodump.pcm",NULL);
+  if ((sfile->afilesize=sget_file_size(afile))==0l) {
     if (!sfile->opening&&fileno!=mainw->ascrap_file&&fileno!=mainw->scrap_file) {
       if (sfile->arate!=0||sfile->achans!=0||sfile->asampsize!=0||sfile->arps!=0) {
-	sfile->arate=sfile->achans=sfile->asampsize=sfile->arps=0;
-	save_clip_value(fileno,CLIP_DETAILS_ACHANS,&sfile->achans);
-	if (mainw->com_failed||mainw->write_failed) bad_header=TRUE;
-	save_clip_value(fileno,CLIP_DETAILS_ARATE,&sfile->arps);
-	if (mainw->com_failed||mainw->write_failed) bad_header=TRUE;
-	save_clip_value(fileno,CLIP_DETAILS_PB_ARATE,&sfile->arate);
-	if (mainw->com_failed||mainw->write_failed) bad_header=TRUE;
-	save_clip_value(fileno,CLIP_DETAILS_ASAMPS,&sfile->asampsize);
-	if (mainw->com_failed||mainw->write_failed) bad_header=TRUE;
-	if (bad_header) do_header_write_error(fileno);
+        sfile->arate=sfile->achans=sfile->asampsize=sfile->arps=0;
+        save_clip_value(fileno,CLIP_DETAILS_ACHANS,&sfile->achans);
+        if (mainw->com_failed||mainw->write_failed) bad_header=TRUE;
+        save_clip_value(fileno,CLIP_DETAILS_ARATE,&sfile->arps);
+        if (mainw->com_failed||mainw->write_failed) bad_header=TRUE;
+        save_clip_value(fileno,CLIP_DETAILS_PB_ARATE,&sfile->arate);
+        if (mainw->com_failed||mainw->write_failed) bad_header=TRUE;
+        save_clip_value(fileno,CLIP_DETAILS_ASAMPS,&sfile->asampsize);
+        if (mainw->com_failed||mainw->write_failed) bad_header=TRUE;
+        if (bad_header) do_header_write_error(fileno);
       }
     }
   }
-  g_free (afile);
+  lives_free(afile);
 }
 
 
 
-
-
-
-boolean
-create_event_space(int length) {
+boolean create_event_space(int length) {
   // try to create desired events
   // if we run out of memory, all events requested are freed, and we return FALSE
   // otherwise we return TRUE
@@ -4113,9 +4069,9 @@
   // NOTE: this is the OLD event system, it's only used for reordering in the clip editor
 
   if (cfile->events[0]!=NULL) {
-    g_free(cfile->events[0]);
+    lives_free(cfile->events[0]);
   }
-  if ((cfile->events[0]=(event *)(g_try_malloc(sizeof(event)*length)))==NULL) {
+  if ((cfile->events[0]=(event *)(lives_try_malloc(sizeof(event)*length)))==NULL) {
     // memory overflow
     return FALSE;
   }
@@ -4125,39 +4081,33 @@
 
 
 
-int lives_list_index (GList *list, const char *data) {
-  // find data in list, GTK's version is broken
-  // well, actually not broken - but we need to use strcmp
+int lives_list_strcmp_index(LiVESList *list, livesconstpointer data) {
+  // find data in list, using strcmp
 
   int i;
   int len;
   if (list==NULL) return -1;
 
-  len=g_list_length (list);
+  len=lives_list_length(list);
 
-  for (i=0;i<len;i++) {
-    if (!strcmp ((char *)g_list_nth_data (list,i),data)) return i;
+  for (i=0; i<len; i++) {
+    if (!strcmp((const char *)lives_list_nth_data(list,i),(const char *)data)) return i;
   }
   return -1;
 }
 
 
 
-
-
-
-void 
-add_to_recent(const char *filename, double start, int frames, const char *extra_params) {
+void add_to_recent(const char *filename, double start, int frames, const char *extra_params) {
   char buff[PATH_MAX];
   char *file,*tmp;
 
   if (frames>0) {
-    if (extra_params==NULL||(strlen(extra_params)==0)) file=g_strdup_printf ("%s|%.2f|%d",filename,start,frames);
-    else file=g_strdup_printf ("%s|%.2f|%d\n%s",filename,start,frames,extra_params);
-  }
-  else {
-    if (extra_params==NULL||(strlen(extra_params)==0)) file=g_strdup (filename);
-    else file=g_strdup_printf ("%s\n%s",filename,extra_params);
+    if (extra_params==NULL||(strlen(extra_params)==0)) file=lives_strdup_printf("%s|%.2f|%d",filename,start,frames);
+    else file=lives_strdup_printf("%s|%.2f|%d\n%s",filename,start,frames,extra_params);
+  } else {
+    if (extra_params==NULL||(strlen(extra_params)==0)) file=lives_strdup(filename);
+    else file=lives_strdup_printf("%s\n%s",filename,extra_params);
   }
 
   get_menu_text(mainw->recent1,buff);
@@ -4166,93 +4116,89 @@
     if (strcmp(file,buff)) {
       get_menu_text(mainw->recent3,buff);
       if (strcmp(file,buff)) {
-	// not in list, or at pos 4
-	get_menu_text(mainw->recent3,buff);
-	set_menu_text(mainw->recent4,buff,FALSE);
-	if (mainw->multitrack!=NULL) set_menu_text(mainw->multitrack->recent4,buff,FALSE);
-	set_pref("recent4",(tmp=g_filename_from_utf8(buff,-1,NULL,NULL,NULL)));
-	g_free(tmp);
-
-	get_menu_text(mainw->recent2,buff);
-	set_menu_text(mainw->recent3,buff,FALSE);
-	if (mainw->multitrack!=NULL) set_menu_text(mainw->multitrack->recent3,buff,FALSE);
-	set_pref("recent3",(tmp=g_filename_from_utf8(buff,-1,NULL,NULL,NULL)));
-	g_free(tmp);
-
-	get_menu_text(mainw->recent1,buff);
-	set_menu_text(mainw->recent2,buff,FALSE);
-	if (mainw->multitrack!=NULL) set_menu_text(mainw->multitrack->recent2,buff,FALSE);
-	set_pref("recent2",(tmp=g_filename_from_utf8(buff,-1,NULL,NULL,NULL)));
-	g_free(tmp);
-	
-	set_menu_text(mainw->recent1,file,FALSE);
-	if (mainw->multitrack!=NULL) set_menu_text(mainw->multitrack->recent1,file,FALSE);
-	set_pref("recent1",(tmp=g_filename_from_utf8(file,-1,NULL,NULL,NULL)));
-	g_free(tmp);
+        // not in list, or at pos 4
+        get_menu_text(mainw->recent3,buff);
+        set_menu_text(mainw->recent4,buff,FALSE);
+        if (mainw->multitrack!=NULL) set_menu_text(mainw->multitrack->recent4,buff,FALSE);
+        set_pref("recent4",(tmp=U82F(buff)));
+        lives_free(tmp);
+
+        get_menu_text(mainw->recent2,buff);
+        set_menu_text(mainw->recent3,buff,FALSE);
+        if (mainw->multitrack!=NULL) set_menu_text(mainw->multitrack->recent3,buff,FALSE);
+        set_pref("recent3",(tmp=U82F(buff)));
+        lives_free(tmp);
+
+        get_menu_text(mainw->recent1,buff);
+        set_menu_text(mainw->recent2,buff,FALSE);
+        if (mainw->multitrack!=NULL) set_menu_text(mainw->multitrack->recent2,buff,FALSE);
+        set_pref("recent2",(tmp=U82F(buff)));
+        lives_free(tmp);
+
+        set_menu_text(mainw->recent1,file,FALSE);
+        if (mainw->multitrack!=NULL) set_menu_text(mainw->multitrack->recent1,file,FALSE);
+        set_pref("recent1",(tmp=U82F(file)));
+        lives_free(tmp);
+      } else {
+        // #3 in list
+        get_menu_text(mainw->recent2,buff);
+        set_menu_text(mainw->recent3,buff,FALSE);
+        if (mainw->multitrack!=NULL) set_menu_text(mainw->multitrack->recent3,buff,FALSE);
+        set_pref("recent3",(tmp=U82F(buff)));
+        lives_free(tmp);
+
+        get_menu_text(mainw->recent1,buff);
+        set_menu_text(mainw->recent2,buff,FALSE);
+        if (mainw->multitrack!=NULL) set_menu_text(mainw->multitrack->recent2,buff,FALSE);
+        set_pref("recent2",(tmp=U82F(buff)));
+        lives_free(tmp);
+
+        set_menu_text(mainw->recent1,file,FALSE);
+        if (mainw->multitrack!=NULL) set_menu_text(mainw->multitrack->recent1,file,FALSE);
+        set_pref("recent1",(tmp=U82F(file)));
+        lives_free(tmp);
       }
-      else {
-	// #3 in list
-	get_menu_text(mainw->recent2,buff);
-	set_menu_text(mainw->recent3,buff,FALSE);
-	if (mainw->multitrack!=NULL) set_menu_text(mainw->multitrack->recent3,buff,FALSE);
-	set_pref("recent3",(tmp=g_filename_from_utf8(buff,-1,NULL,NULL,NULL)));
-	g_free(tmp);
-	
-	get_menu_text(mainw->recent1,buff);
-	set_menu_text(mainw->recent2,buff,FALSE);
-	if (mainw->multitrack!=NULL) set_menu_text(mainw->multitrack->recent2,buff,FALSE);
-	set_pref("recent2",(tmp=g_filename_from_utf8(buff,-1,NULL,NULL,NULL)));
-	g_free(tmp);
-
-	set_menu_text(mainw->recent1,file,FALSE);
-	if (mainw->multitrack!=NULL) set_menu_text(mainw->multitrack->recent1,file,FALSE);
-	set_pref("recent1",(tmp=g_filename_from_utf8(file,-1,NULL,NULL,NULL)));
-	g_free(tmp);
-      }
-    }
-    else {
+    } else {
       // #2 in list
       get_menu_text(mainw->recent1,buff);
       set_menu_text(mainw->recent2,buff,FALSE);
       if (mainw->multitrack!=NULL) set_menu_text(mainw->multitrack->recent2,buff,FALSE);
-      set_pref("recent2",(tmp=g_filename_from_utf8(buff,-1,NULL,NULL,NULL)));
-      g_free(tmp);
-	
+      set_pref("recent2",(tmp=U82F(buff)));
+      lives_free(tmp);
+
       set_menu_text(mainw->recent1,file,FALSE);
       if (mainw->multitrack!=NULL) set_menu_text(mainw->multitrack->recent1,file,FALSE);
-      set_pref("recent1",(tmp=g_filename_from_utf8(file,-1,NULL,NULL,NULL)));
-      g_free(tmp);
+      set_pref("recent1",(tmp=U82F(file)));
+      lives_free(tmp);
     }
-  }
-  else {
+  } else {
     // I'm number 1, so why change ;-)
   }
 
   get_menu_text(mainw->recent1,buff);
   if (strlen(buff)) {
-    lives_widget_show (mainw->recent1);
+    lives_widget_show(mainw->recent1);
   }
   get_menu_text(mainw->recent2,buff);
   if (strlen(buff)) {
-    lives_widget_show (mainw->recent2);
+    lives_widget_show(mainw->recent2);
   }
   get_menu_text(mainw->recent3,buff);
   if (strlen(buff)) {
-    lives_widget_show (mainw->recent3);
+    lives_widget_show(mainw->recent3);
   }
   get_menu_text(mainw->recent4,buff);
   if (strlen(buff)) {
-    lives_widget_show (mainw->recent4);
+    lives_widget_show(mainw->recent4);
   }
 
-  g_free(file);
+  lives_free(file);
 }
 
 
 
 
-int 
-verhash (char *version) {
+int verhash(char *version) {
   char *s;
   int major=0;
   int minor=0;
@@ -4260,15 +4206,15 @@
 
   if (!(strlen(version))) return 0;
 
-  s=strtok (version,".");
+  s=strtok(version,".");
   if (!(s==NULL)) {
-    major=atoi (s);
-    s=strtok (NULL,".");
+    major=atoi(s);
+    s=strtok(NULL,".");
     if (!(s==NULL)) {
-      minor=atoi (s);
-      s=strtok (NULL,".");
+      minor=atoi(s);
+      s=strtok(NULL,".");
       if (!(s==NULL)) {
-	micro=atoi (s);
+        micro=atoi(s);
       }
     }
   }
@@ -4280,14 +4226,14 @@
 #ifdef PRODUCE_LOG
 // disabled by default
 void lives_log(const char *what) {
-  char *lives_log_file=g_build_filename(prefs->tmpdir,LIVES_LOG_FILE,NULL);
+  char *lives_log_file=lives_build_filename(prefs->tmpdir,LIVES_LOG_FILE,NULL);
   if (mainw->log_fd<0) mainw->log_fd=open(lives_log_file,O_WRONLY|O_CREAT,DEF_FILE_PERMS);
   if (mainw->log_fd!=-1) {
-    char *msg=g_strdup("%s|%d|",what,mainw->current_file);
-    write (mainw->log_fd,msg,strlen(msg));
-    g_free(msg);
+    char *msg=lives_strdup("%s|%d|",what,mainw->current_file);
+    write(mainw->log_fd,msg,strlen(msg));
+    lives_free(msg);
   }
-  g_free(lives_log_file);
+  lives_free(lives_log_file);
 }
 #endif
 
@@ -4295,22 +4241,20 @@
 
 
 // TODO - move into undo.c
-void 
-set_undoable (const char *what, boolean sensitive) {
+void set_undoable(const char *what, boolean sensitive) {
   if (mainw->current_file>-1) {
     cfile->redoable=FALSE;
     cfile->undoable=sensitive;
     if (!(what==NULL)) {
-      char *what_safe=g_strdelimit (g_strdup (what),"_",' ');
-      g_snprintf(cfile->undo_text,32,_ ("_Undo %s"),what_safe);
-      g_snprintf(cfile->redo_text,32,_ ("_Redo %s"),what_safe);
-      g_free (what_safe);
-    }
-    else {
+      char *what_safe=lives_strdelimit(lives_strdup(what),"_",' ');
+      lives_snprintf(cfile->undo_text,32,_("_Undo %s"),what_safe);
+      lives_snprintf(cfile->redo_text,32,_("_Redo %s"),what_safe);
+      lives_free(what_safe);
+    } else {
       cfile->undoable=FALSE;
       cfile->undo_action=UNDO_NONE;
-      g_snprintf(cfile->undo_text,32,"%s",_ ("_Undo"));
-      g_snprintf(cfile->redo_text,32,"%s",_ ("_Redo"));
+      lives_snprintf(cfile->undo_text,32,"%s",_("_Undo"));
+      lives_snprintf(cfile->redo_text,32,"%s",_("_Redo"));
     }
     set_menu_text(mainw->undo,cfile->undo_text,TRUE);
     set_menu_text(mainw->redo,cfile->redo_text,TRUE);
@@ -4318,7 +4262,7 @@
 
   lives_widget_hide(mainw->redo);
   lives_widget_show(mainw->undo);
-  lives_widget_set_sensitive (mainw->undo,sensitive);
+  lives_widget_set_sensitive(mainw->undo,sensitive);
 
 #ifdef PRODUCE_LOG
   lives_log(what);
@@ -4327,22 +4271,20 @@
 
 }
 
-void 
-set_redoable (const char *what, boolean sensitive) {
+void set_redoable(const char *what, boolean sensitive) {
   if (mainw->current_file>-1) {
     cfile->undoable=FALSE;
     cfile->redoable=sensitive;
     if (!(what==NULL)) {
-      char *what_safe=g_strdelimit (g_strdup (what),"_",' ');
-      g_snprintf(cfile->undo_text,32,_ ("_Undo %s"),what_safe);
-      g_snprintf(cfile->redo_text,32,_ ("_Redo %s"),what_safe);
-      g_free (what_safe);
-    }
-    else {
+      char *what_safe=lives_strdelimit(lives_strdup(what),"_",' ');
+      lives_snprintf(cfile->undo_text,32,_("_Undo %s"),what_safe);
+      lives_snprintf(cfile->redo_text,32,_("_Redo %s"),what_safe);
+      lives_free(what_safe);
+    } else {
       cfile->redoable=FALSE;
       cfile->undo_action=UNDO_NONE;
-      g_snprintf(cfile->undo_text,32,"%s",_ ("_Undo"));
-      g_snprintf(cfile->redo_text,32,"%s",_ ("_Redo"));
+      lives_snprintf(cfile->undo_text,32,"%s",_("_Undo"));
+      lives_snprintf(cfile->redo_text,32,"%s",_("_Redo"));
     }
     set_menu_text(mainw->undo,cfile->undo_text,TRUE);
     set_menu_text(mainw->redo,cfile->redo_text,TRUE);
@@ -4350,47 +4292,49 @@
 
   lives_widget_hide(mainw->undo);
   lives_widget_show(mainw->redo);
-  lives_widget_set_sensitive (mainw->redo,sensitive);
+  lives_widget_set_sensitive(mainw->redo,sensitive);
 }
 
 
-void 
-set_sel_label (LiVESWidget *sel_label) {
+void
+set_sel_label(LiVESWidget *sel_label) {
   char *tstr,*frstr,*tmp;
   char *sy,*sz;
 
   if (mainw->current_file==-1||!cfile->frames||mainw->multitrack!=NULL) {
-    lives_label_set_text(LIVES_LABEL(sel_label),_ ("-------------Selection------------"));
-  }
-  else {
-    tstr=g_strdup_printf ("%.2f",calc_time_from_frame (mainw->current_file,cfile->end+1)-
-			  calc_time_from_frame (mainw->current_file,cfile->start));
-    frstr=g_strdup_printf ("%d",cfile->end-cfile->start+1);
+    lives_label_set_text(LIVES_LABEL(sel_label),_("-------------Selection------------"));
+  } else {
+    tstr=lives_strdup_printf("%.2f",calc_time_from_frame(mainw->current_file,cfile->end+1)-
+                             calc_time_from_frame(mainw->current_file,cfile->start));
+    frstr=lives_strdup_printf("%d",cfile->end-cfile->start+1);
 
     // TRANSLATORS: - try to keep the text of the middle part the same length, by deleting "-" if necessary
-    lives_label_set_text(LIVES_LABEL(sel_label),(tmp=g_strconcat ("---------- [ ",tstr,(sy=(g_strdup(_(" sec ] ----------Selection---------- [ ")))),frstr,(sz=g_strdup(_(" frames ] ----------"))),NULL)));
-    g_free(sy);
-    g_free(sz);
+    lives_label_set_text(LIVES_LABEL(sel_label),
+                         (tmp=lives_strconcat("---------- [ ",tstr,(sy=(lives_strdup(_(" sec ] ----------Selection---------- [ ")))),
+                              frstr,(sz=lives_strdup(_(" frames ] ----------"))),NULL)));
+    lives_free(sy);
+    lives_free(sz);
 
-    g_free (tmp);
-    g_free (frstr);
-    g_free (tstr);
+    lives_free(tmp);
+    lives_free(frstr);
+    lives_free(tstr);
   }
-  lives_widget_queue_draw (sel_label);
+  lives_widget_queue_draw(sel_label);
 }
 
 
 
 
-LIVES_INLINE void g_list_free_strings(GList *slist) {
-  GList *list=slist;
+LIVES_INLINE void lives_list_free_strings(LiVESList *list) {
+  register int i;
+
   if (list==NULL) return;
-  while (list!=NULL) {
-    if (list->data!=NULL) {
-      //g_printerr("free %s\n",list->data);
-      g_free(list->data);
+
+  for (i=0; i<lives_list_length(list); i++) {
+    if (lives_list_nth_data(list,i)!=NULL) {
+      //lives_printerr("free %s\n",list->data);
+      lives_free((livespointer)lives_list_nth_data(list,i));
     }
-    list=list->next;
   }
 }
 
@@ -4400,14 +4344,14 @@
   char buff[65536];
 
   if (mainw->cached_list!=NULL) {
-    g_list_free_strings(mainw->cached_list);
-    g_list_free(mainw->cached_list);
+    lives_list_free_strings(mainw->cached_list);
+    lives_list_free(mainw->cached_list);
     mainw->cached_list=NULL;
   }
 
   if (!(hfile=fopen(filename,"r"))) return FALSE;
   while (fgets(buff,65536,hfile)!=NULL) {
-    mainw->cached_list=g_list_append(mainw->cached_list,g_strdup(buff));
+    mainw->cached_list=lives_list_append(mainw->cached_list,lives_strdup(buff));
     threaded_dialog_spin();
   }
   fclose(hfile);
@@ -4416,9 +4360,9 @@
 
 
 char *get_val_from_cached_list(const char *key, size_t maxlen) {
-  GList *clist=mainw->cached_list;
-  char *keystr_start=g_strdup_printf("<%s>",key);
-  char *keystr_end=g_strdup_printf("</%s>",key);
+  LiVESList *clist=mainw->cached_list;
+  char *keystr_start=lives_strdup_printf("<%s>",key);
+  char *keystr_end=lives_strdup_printf("</%s>",key);
   size_t kslen=strlen(keystr_start);
   size_t kelen=strlen(keystr_end);
 
@@ -4430,26 +4374,25 @@
   while (clist!=NULL) {
     if (gotit) {
       if (!strncmp(keystr_end,(char *)clist->data,kelen)) {
-	break;
+        break;
       }
-      if (strncmp((char *)clist->data,"|",1)) g_strappend(buff,maxlen,(char *)clist->data);
+      if (strncmp((char *)clist->data,"|",1)) lives_strappend(buff,maxlen,(char *)clist->data);
       else {
-	if (clist->prev!=NULL) clist->prev->next=clist->next;
+        if (clist->prev!=NULL) clist->prev->next=clist->next;
       }
-    }
-    else if (!strncmp(keystr_start,(char *)clist->data,kslen)) {
+    } else if (!strncmp(keystr_start,(char *)clist->data,kslen)) {
       gotit=TRUE;
     }
     clist=clist->next;
   }
-  g_free(keystr_start);
-  g_free(keystr_end);
+  lives_free(keystr_start);
+  lives_free(keystr_end);
 
   if (!gotit) return NULL;
 
   if (strlen(buff)>0) memset(buff+strlen(buff)-1,0,1); // remove trailing newline
 
-  return g_strdup(buff);
+  return lives_strdup(buff);
 }
 
 
@@ -4460,88 +4403,88 @@
 
   switch (what) {
   case CLIP_DETAILS_HEADER_VERSION:
-    key=g_strdup("header_version");
+    key=lives_strdup("header_version");
     if (maxlenp!=NULL) *maxlenp=256;
     break;
   case CLIP_DETAILS_BPP:
-    key=g_strdup("bpp");
+    key=lives_strdup("bpp");
     if (maxlenp!=NULL) *maxlenp=256;
     break;
   case CLIP_DETAILS_FPS:
-    key=g_strdup("fps");
+    key=lives_strdup("fps");
     if (maxlenp!=NULL) *maxlenp=256;
     break;
   case CLIP_DETAILS_PB_FPS:
-    key=g_strdup("pb_fps");
+    key=lives_strdup("pb_fps");
     if (maxlenp!=NULL) *maxlenp=256;
     break;
   case CLIP_DETAILS_WIDTH:
-    key=g_strdup("width");
+    key=lives_strdup("width");
     if (maxlenp!=NULL) *maxlenp=256;
     break;
   case CLIP_DETAILS_HEIGHT:
-    key=g_strdup("height");
+    key=lives_strdup("height");
     if (maxlenp!=NULL) *maxlenp=256;
     break;
   case CLIP_DETAILS_UNIQUE_ID:
-    key=g_strdup("unique_id");
+    key=lives_strdup("unique_id");
     if (maxlenp!=NULL) *maxlenp=256;
     break;
   case CLIP_DETAILS_ARATE:
-    key=g_strdup("audio_rate");
+    key=lives_strdup("audio_rate");
     if (maxlenp!=NULL) *maxlenp=256;
     break;
   case CLIP_DETAILS_PB_ARATE:
-    key=g_strdup("pb_audio_rate");
+    key=lives_strdup("pb_audio_rate");
     if (maxlenp!=NULL) *maxlenp=256;
     break;
   case CLIP_DETAILS_ACHANS:
-    key=g_strdup("audio_channels");
+    key=lives_strdup("audio_channels");
     if (maxlenp!=NULL) *maxlenp=256;
     break;
   case CLIP_DETAILS_ASIGNED:
-    key=g_strdup("audio_signed");
+    key=lives_strdup("audio_signed");
     if (maxlenp!=NULL) *maxlenp=256;
     break;
   case CLIP_DETAILS_AENDIAN:
-    key=g_strdup("audio_endian");
+    key=lives_strdup("audio_endian");
     if (maxlenp!=NULL) *maxlenp=256;
     break;
   case CLIP_DETAILS_ASAMPS:
-    key=g_strdup("audio_sample_size");
+    key=lives_strdup("audio_sample_size");
     if (maxlenp!=NULL) *maxlenp=256;
     break;
   case CLIP_DETAILS_FRAMES:
-    key=g_strdup("frames");
+    key=lives_strdup("frames");
     if (maxlenp!=NULL) *maxlenp=256;
     break;
   case CLIP_DETAILS_TITLE:
-    key=g_strdup("title");
+    key=lives_strdup("title");
     break;
   case CLIP_DETAILS_AUTHOR:
-    key=g_strdup("author");
+    key=lives_strdup("author");
     break;
   case CLIP_DETAILS_COMMENT:
-    key=g_strdup("comment");
+    key=lives_strdup("comment");
     break;
   case CLIP_DETAILS_KEYWORDS:
-    key=g_strdup("keywords");
+    key=lives_strdup("keywords");
     break;
   case CLIP_DETAILS_PB_FRAMENO:
-    key=g_strdup("pb_frameno");
+    key=lives_strdup("pb_frameno");
     if (maxlenp!=NULL) *maxlenp=256;
     break;
   case CLIP_DETAILS_CLIPNAME:
-    key=g_strdup("clipname");
+    key=lives_strdup("clipname");
     break;
   case CLIP_DETAILS_FILENAME:
-    key=g_strdup("filename");
+    key=lives_strdup("filename");
     break;
   case CLIP_DETAILS_INTERLACE:
-    key=g_strdup("interlace");
+    key=lives_strdup("interlace");
     break;
   case CLIP_DETAILS_DECODER_NAME:
-    key=g_strdup("decoder");
+    key=lives_strdup("decoder");
     break;
   default:
     break;
@@ -4570,17 +4513,17 @@
   boolean timeout;
 
   if (mainw->cached_list==NULL) {
-    
-    lives_header=g_build_filename(prefs->tmpdir,mainw->files[which]->handle,"header.lives",NULL);
-    old_header=g_build_filename(prefs->tmpdir,mainw->files[which]->handle,"header",NULL);
-    
+
+    lives_header=lives_build_filename(prefs->tmpdir,mainw->files[which]->handle,"header.lives",NULL);
+    old_header=lives_build_filename(prefs->tmpdir,mainw->files[which]->handle,"header",NULL);
+
     // TODO - remove this some time before 2038
     if (!stat(old_header,&mystat)) old_time=mystat.st_mtime;
     if (!stat(lives_header,&mystat)) new_time=mystat.st_mtime;
-    g_free(old_header);
-    
+    lives_free(old_header);
+
     if (old_time>new_time) {
-      g_free(lives_header);
+      lives_free(lives_header);
       return FALSE; // clip has been edited by an older version of LiVES
     }
   }
@@ -4588,10 +4531,10 @@
   key=clip_detail_to_string(what,&maxlen);
 
   if (key==NULL) {
-    tmp=g_strdup_printf("Invalid detail %d requested from file %s",which,lives_header);
+    tmp=lives_strdup_printf("Invalid detail %d requested from file %s",which,lives_header);
     LIVES_ERROR(tmp);
-    g_free(tmp);
-    g_free(lives_header);
+    lives_free(tmp);
+    lives_free(lives_header);
     return FALSE;
   }
 
@@ -4599,76 +4542,73 @@
 
   if (mainw->cached_list!=NULL) {
     val=get_val_from_cached_list(key,maxlen);
-    g_free(key);
+    lives_free(key);
     if (val==NULL) return FALSE;
-  }
-  else {
-    com=g_strdup_printf("%s get_clip_value \"%s\" %d %d \"%s\"",prefs->backend_sync,key,
-			lives_getuid(),capable->mainpid,lives_header);
-    g_free(lives_header);
-    g_free(key);
-    
-    val=(char *)g_malloc(maxlen);
+  } else {
+    com=lives_strdup_printf("%s get_clip_value \"%s\" %d %d \"%s\"",prefs->backend_sync,key,
+                            lives_getuid(),capable->mainpid,lives_header);
+    lives_free(lives_header);
+    lives_free(key);
+
+    val=(char *)lives_malloc(maxlen);
     memset(val,0,maxlen);
-    
+
     threaded_dialog_spin();
 
     if (lives_system(com,TRUE)) {
       tempdir_warning();
       threaded_dialog_spin();
-      g_free(com);
+      lives_free(com);
       return FALSE;
     }
-    
+
 #ifndef IS_MINGW
-    vfile=g_strdup_printf("%s/.smogval.%d.%d",prefs->tmpdir,lives_getuid(),capable->mainpid);
+    vfile=lives_strdup_printf("%s/.smogval.%d.%d",prefs->tmpdir,lives_getuid(),capable->mainpid);
 #else
-    vfile=g_strdup_printf("%s/smogval.%d.%d",prefs->tmpdir,lives_getuid(),capable->mainpid);
+    vfile=lives_strdup_printf("%s/smogval.%d.%d",prefs->tmpdir,lives_getuid(),capable->mainpid);
 #endif
 
     do {
       retval2=0;
       timeout=FALSE;
       mainw->read_failed=FALSE;
-      
+
       alarm_handle=lives_alarm_set(LIVES_PREFS_TIMEOUT);
-      
+
       do {
-	if (!((valfile=fopen(vfile,"r")) || (timeout=lives_alarm_get(alarm_handle)))) {
-	  if (!timeout) {
-	    if (!(mainw==NULL)) {
-	      weed_plant_t *frame_layer=mainw->frame_layer;
-	      mainw->frame_layer=NULL;
-	      lives_widget_context_update();
-	      mainw->frame_layer=frame_layer;
-	    }
-	    g_usleep(prefs->sleep_time);
-	  }
-	  else break;
-	}
+        if (!((valfile=fopen(vfile,"r")) || (timeout=lives_alarm_get(alarm_handle)))) {
+          if (!timeout) {
+            if (!(mainw==NULL)) {
+              weed_plant_t *frame_layer=mainw->frame_layer;
+              mainw->frame_layer=NULL;
+              lives_widget_context_update();
+              mainw->frame_layer=frame_layer;
+            }
+            lives_usleep(prefs->sleep_time);
+          } else break;
+        }
       } while (!valfile);
-      
+
       lives_alarm_clear(alarm_handle);
-      
+
       if (timeout) {
-	retval2=do_read_failed_error_s_with_retry(vfile,NULL,NULL);
+        retval2=do_read_failed_error_s_with_retry(vfile,NULL,NULL);
+      } else {
+        mainw->read_failed=FALSE;
+        lives_fgets(val,maxlen,valfile);
+        fclose(valfile);
+        unlink(vfile);
+        if (mainw->read_failed) {
+          retval2=do_read_failed_error_s_with_retry(vfile,NULL,NULL);
+        }
       }
-      else {
-	mainw->read_failed=FALSE;
-	lives_fgets(val,maxlen,valfile);
-	fclose(valfile);
-	unlink(vfile);
-	if (mainw->read_failed) {
-	  retval2=do_read_failed_error_s_with_retry(vfile,NULL,NULL);
-	}
-      }
-    } while (retval2==LIVES_RETRY);
-    
-    g_free(vfile);
-    g_free(com);
+    } while (retval2==LIVES_RESPONSE_RETRY);
+
+    lives_free(vfile);
+    lives_free(com);
   }
 
-  if (retval2==LIVES_CANCEL) {
+  if (retval2==LIVES_RESPONSE_CANCEL) {
     return FALSE;
   }
 
@@ -4710,8 +4650,7 @@
   case CLIP_DETAILS_UNIQUE_ID:
     if (capable->cpu_bits==32) {
       *(int64_t *)retval=strtoll(val,NULL,10);
-    }
-    else {
+    } else {
       *(int64_t *)retval=strtol(val,NULL,10);
     }
     break;
@@ -4723,15 +4662,15 @@
   case CLIP_DETAILS_COMMENT:
   case CLIP_DETAILS_CLIPNAME:
   case CLIP_DETAILS_KEYWORDS:
-    g_snprintf((char *)retval,maxlen,"%s",val);
+    lives_snprintf((char *)retval,maxlen,"%s",val);
     break;
   case CLIP_DETAILS_FILENAME:
   case CLIP_DETAILS_DECODER_NAME:
-    g_snprintf((char *)retval,maxlen,"%s",(tmp=g_filename_to_utf8(val,-1,NULL,NULL,NULL)));
-    g_free(tmp);
+    lives_snprintf((char *)retval,maxlen,"%s",(tmp=F2U8(val)));
+    lives_free(tmp);
     break;
   }
-  g_free(val);
+  lives_free(val);
   return TRUE;
 }
 
@@ -4749,129 +4688,130 @@
 
   if (which==0||which==mainw->scrap_file) return;
 
-  lives_header=g_build_filename(prefs->tmpdir,mainw->files[which]->handle,"header.lives",NULL);
+  lives_header=lives_build_filename(prefs->tmpdir,mainw->files[which]->handle,"header.lives",NULL);
   key=clip_detail_to_string(what,NULL);
 
   if (key==NULL) {
-    tmp=g_strdup_printf("Invalid detail %d added for file %s",which,lives_header);
+    tmp=lives_strdup_printf("Invalid detail %d added for file %s",which,lives_header);
     LIVES_ERROR(tmp);
-    g_free(tmp);
-    g_free(lives_header);
+    lives_free(tmp);
+    lives_free(lives_header);
     return;
   }
 
   switch (what) {
   case CLIP_DETAILS_BPP:
-    myval=g_strdup_printf("%d",*(int *)val);
+    myval=lives_strdup_printf("%d",*(int *)val);
     break;
   case CLIP_DETAILS_FPS:
-    if (!mainw->files[which]->ratio_fps) myval=g_strdup_printf("%.3f",*(double *)val);
-    else myval=g_strdup_printf("%.8f",*(double *)val);
+    if (!mainw->files[which]->ratio_fps) myval=lives_strdup_printf("%.3f",*(double *)val);
+    else myval=lives_strdup_printf("%.8f",*(double *)val);
     break;
   case CLIP_DETAILS_PB_FPS:
-    if (mainw->files[which]->ratio_fps&&(mainw->files[which]->pb_fps==mainw->files[which]->fps)) 
-      myval=g_strdup_printf("%.8f",*(double *)val);
-    else myval=g_strdup_printf("%.3f",*(double *)val);
+    if (mainw->files[which]->ratio_fps&&(mainw->files[which]->pb_fps==mainw->files[which]->fps))
+      myval=lives_strdup_printf("%.8f",*(double *)val);
+    else myval=lives_strdup_printf("%.3f",*(double *)val);
     break;
   case CLIP_DETAILS_WIDTH:
-    myval=g_strdup_printf("%d",*(int *)val);
+    myval=lives_strdup_printf("%d",*(int *)val);
     break;
   case CLIP_DETAILS_HEIGHT:
-    myval=g_strdup_printf("%d",*(int *)val);
+    myval=lives_strdup_printf("%d",*(int *)val);
     break;
   case CLIP_DETAILS_UNIQUE_ID:
-    myval=g_strdup_printf("%"PRId64,*(int64_t *)val);
+    myval=lives_strdup_printf("%"PRId64,*(int64_t *)val);
     break;
   case CLIP_DETAILS_ARATE:
-    myval=g_strdup_printf("%d",*(int *)val);
+    myval=lives_strdup_printf("%d",*(int *)val);
     break;
   case CLIP_DETAILS_PB_ARATE:
-    myval=g_strdup_printf("%d",*(int *)val);
+    myval=lives_strdup_printf("%d",*(int *)val);
     break;
   case CLIP_DETAILS_ACHANS:
-    myval=g_strdup_printf("%d",*(int *)val);
+    myval=lives_strdup_printf("%d",*(int *)val);
     break;
   case CLIP_DETAILS_ASIGNED:
-    if ((*(int *)val)==1) myval=g_strdup("true");
-    else myval=g_strdup("false");
+    if ((*(int *)val)==1) myval=lives_strdup("true");
+    else myval=lives_strdup("false");
     break;
   case CLIP_DETAILS_AENDIAN:
-    myval=g_strdup_printf("%d",(*(int *)val)/2);
+    myval=lives_strdup_printf("%d",(*(int *)val)/2);
     break;
   case CLIP_DETAILS_ASAMPS:
-    myval=g_strdup_printf("%d",*(int *)val);
+    myval=lives_strdup_printf("%d",*(int *)val);
     break;
   case CLIP_DETAILS_FRAMES:
-    myval=g_strdup_printf("%d",*(int *)val);
+    myval=lives_strdup_printf("%d",*(int *)val);
     break;
   case CLIP_DETAILS_INTERLACE:
-    myval=g_strdup_printf("%d",*(int *)val);
+    myval=lives_strdup_printf("%d",*(int *)val);
     break;
   case CLIP_DETAILS_TITLE:
-    myval=g_strdup((char *)val);
+    myval=lives_strdup((char *)val);
     break;
   case CLIP_DETAILS_AUTHOR:
-    myval=g_strdup((char *)val);
+    myval=lives_strdup((char *)val);
     break;
   case CLIP_DETAILS_COMMENT:
-    myval=g_strdup((const char *)val);
+    myval=lives_strdup((const char *)val);
     break;
   case CLIP_DETAILS_KEYWORDS:
-    myval=g_strdup((const char *)val);
+    myval=lives_strdup((const char *)val);
     break;
   case CLIP_DETAILS_PB_FRAMENO:
-    myval=g_strdup_printf("%d",*(int *)val);
+    myval=lives_strdup_printf("%d",*(int *)val);
     break;
   case CLIP_DETAILS_CLIPNAME:
-    myval=g_strdup((char *)val);
+    myval=lives_strdup((char *)val);
     break;
   case CLIP_DETAILS_FILENAME:
-    myval=g_filename_from_utf8((const char *)val,-1,NULL,NULL,NULL);
+    myval=U82F((const char *)val);
     break;
   case CLIP_DETAILS_DECODER_NAME:
-    myval=g_filename_from_utf8((const char *)val,-1,NULL,NULL,NULL);
+    myval=U82F((const char *)val);
     break;
   case CLIP_DETAILS_HEADER_VERSION:
-    myval=g_strdup_printf("%d",*(int *)val);
+    myval=lives_strdup_printf("%d",*(int *)val);
     break;
   default:
     return;
   }
 
   if (mainw->clip_header!=NULL) {
-    char *keystr_start=g_strdup_printf("<%s>\n",key);
-    char *keystr_end=g_strdup_printf("\n</%s>\n",key);
+    char *keystr_start=lives_strdup_printf("<%s>\n",key);
+    char *keystr_end=lives_strdup_printf("\n</%s>\n",key);
     lives_fputs(keystr_start,mainw->clip_header);
     lives_fputs(myval,mainw->clip_header);
     lives_fputs(keystr_end,mainw->clip_header);
-    g_free(keystr_start);
-    g_free(keystr_end);
+    lives_free(keystr_start);
+    lives_free(keystr_end);
 
-  }
-  else {
+  } else {
     if (!mainw->signals_deferred) {
       set_signal_handlers((SignalHandlerPointer)defer_sigint);
       needs_sigs=TRUE;
     }
-    com=g_strdup_printf("%s set_clip_value \"%s\" \"%s\" \"%s\"",prefs->backend_sync,lives_header,key,myval);
+    com=lives_strdup_printf("%s set_clip_value \"%s\" \"%s\" \"%s\"",prefs->backend_sync,lives_header,key,myval);
     lives_system(com,FALSE);
     if (mainw->signal_caught) catch_sigint(mainw->signal_caught);
     if (needs_sigs) set_signal_handlers((SignalHandlerPointer)catch_sigint);
-    g_free(com);
+    lives_free(com);
   }
 
-  g_free(lives_header);
-  g_free(myval);
-  g_free(key);
-  
+  lives_free(lives_header);
+  lives_free(myval);
+  lives_free(key);
+
   return;
 }
 
 
 
-GList *get_set_list(const char *dir) {
+LiVESList *get_set_list(const char *dir, boolean utf8) {
   // get list of sets in top level dir
-  GList *setlist=NULL;
+  // values will be in filename encoding
+
+  LiVESList *setlist=NULL;
   DIR *tldir,*subdir;
   struct dirent *tdirent,*subdirent;
   char *subdirname;
@@ -4894,15 +4834,15 @@
       lives_set_cursor_style(LIVES_CURSOR_NORMAL,NULL);
       return setlist;
     }
-    
+
     if (!strncmp(tdirent->d_name,"..",strlen(tdirent->d_name))) continue;
 
-    subdirname=g_build_filename(dir,tdirent->d_name,NULL);
+    subdirname=lives_build_filename(dir,tdirent->d_name,NULL);
 
     subdir=opendir(subdirname);
 
     if (subdir==NULL) {
-      g_free(subdirname);
+      lives_free(subdirname);
       continue;
     }
 
@@ -4910,15 +4850,18 @@
       subdirent=readdir(subdir);
 
       if (subdirent==NULL) {
-	break;
+        break;
       }
 
       if (!strcmp(subdirent->d_name,"order")) {
-	setlist=g_list_append(setlist,g_strdup(tdirent->d_name));
-	break;
+        if (!utf8)
+          setlist=lives_list_append(setlist,lives_strdup(tdirent->d_name));
+        else
+          setlist=lives_list_append(setlist,F2U8(tdirent->d_name));
+        break;
       }
     }
-    g_free(subdirname);
+    lives_free(subdirname);
     closedir(subdir);
   }
 
@@ -4927,20 +4870,19 @@
 
 
 
-boolean check_for_ratio_fps (double fps) {
+boolean check_for_ratio_fps(double fps) {
   boolean ratio_fps;
-  char *test_fps_string1=g_strdup_printf ("%.3f00000",fps);
-  char *test_fps_string2=g_strdup_printf ("%.8f",fps);
-  
-  if (strcmp (test_fps_string1,test_fps_string2)) {
+  char *test_fps_string1=lives_strdup_printf("%.3f00000",fps);
+  char *test_fps_string2=lives_strdup_printf("%.8f",fps);
+
+  if (strcmp(test_fps_string1,test_fps_string2)) {
     // got a ratio
     ratio_fps=TRUE;
-  }
-  else {
+  } else {
     ratio_fps=FALSE;
   }
-  g_free (test_fps_string1);
-  g_free (test_fps_string2);
+  lives_free(test_fps_string1);
+  lives_free(test_fps_string2);
 
   return ratio_fps;
 }
@@ -4950,14 +4892,14 @@
   // return a ratio (8dp) fps from a string with format num:denom
   double fps;
   char *fps_string;
-  char **array=g_strsplit(string,":",2);
-  int num=atoi (array[0]);
-  int denom=atoi (array[1]);
-  g_strfreev (array);
+  char **array=lives_strsplit(string,":",2);
+  int num=atoi(array[0]);
+  int denom=atoi(array[1]);
+  lives_strfreev(array);
   fps=(double)num/(double)denom;
-  fps_string=g_strdup_printf("%.8f",fps);
-  fps=g_strtod(fps_string,NULL);
-  g_free(fps_string);
+  fps_string=lives_strdup_printf("%.8f",fps);
+  fps=lives_strtod(fps_string,NULL);
+  lives_free(fps_string);
   return fps;
 }
 
@@ -4967,34 +4909,31 @@
   int i;
   double xval=val;
 
-  if (val==(int)val) return g_strdup_printf("%d",(int)val);
-  for (i=0;i<=16;i++) {
+  if (val==(int)val) return lives_strdup_printf("%d",(int)val);
+  for (i=0; i<=16; i++) {
     xval*=10.;
-    if (xval==(int)xval) return g_strdup_printf("%.*f",i,val);
+    if (xval==(int)xval) return lives_strdup_printf("%.*f",i,val);
   }
-  return g_strdup_printf("%.*f",i,val);
+  return lives_strdup_printf("%.*f",i,val);
 }
 
 
-uint32_t get_signed_endian (boolean is_signed, boolean little_endian) {
+uint32_t get_signed_endian(boolean is_signed, boolean little_endian) {
   // asigned TRUE == signed, FALSE == unsigned
 
 
   if (is_signed) {
     if (little_endian) {
       return 0;
-    }
-    else {
+    } else {
       return AFORM_BIG_ENDIAN;
     }
-  }
-  else {
-    if (!is_signed) { 
+  } else {
+    if (!is_signed) {
       if (little_endian) {
-	return AFORM_UNSIGNED;
-      }
-      else {
-	return AFORM_UNSIGNED|AFORM_BIG_ENDIAN;
+        return AFORM_UNSIGNED;
+      } else {
+        return AFORM_UNSIGNED|AFORM_BIG_ENDIAN;
       }
     }
   }
@@ -5004,7 +4943,7 @@
 
 
 
-int get_token_count (const char *string, int delim) {
+int get_token_count(const char *string, int delim) {
   int pieces=1;
   if (string==NULL) return 0;
   if (delim<=0||delim>255) return 1;
@@ -5018,20 +4957,30 @@
 
 
 
-char *subst (const char *string, const char *from, const char *to) {
+int lives_utf8_strcasecmp(const char *s1, const char *s2) {
+  char *s1u=lives_utf8_normalize(s1,strlen(s1),LIVES_NORMALIZE_DEFAULT);
+  char *s2u=lives_utf8_normalize(s1,strlen(s1),LIVES_NORMALIZE_DEFAULT);
+  int ret=strcmp(s1,s2);
+  lives_free(s1u);
+  lives_free(s2u);
+  return ret;
+}
+
+
+char *subst(const char *string, const char *from, const char *to) {
   // return a string with all occurrences of from replaced with to
   // return value should be freed after use
-  char *ret=g_strdup(string),*first;
+  char *ret=lives_strdup(string),*first;
   char *search=ret;
 
-  while ((search=g_strstr_len (search,-1,from))!=NULL) {
-    first=g_strndup(ret,search-ret);
-    search=g_strdup(search+strlen(from));
-    g_free(ret);
-    ret=g_strconcat (first,to,search,NULL);
-    g_free(search);
+  while ((search=lives_strstr_len(search,-1,from))!=NULL) {
+    first=lives_strndup(ret,search-ret);
+    search=lives_strdup(search+strlen(from));
+    lives_free(ret);
+    ret=lives_strconcat(first,to,search,NULL);
+    lives_free(search);
     search=ret+strlen(first)+strlen(to);
-    g_free(first);
+    lives_free(first);
   }
   return ret;
 }
@@ -5053,7 +5002,7 @@
 
   if (text==NULL) return NULL;
 
-  if (maxwidth<1) return g_strdup("Bad maxwidth, dummy");
+  if (maxwidth<1) return lives_strdup("Bad maxwidth, dummy");
 
   tlen=strlen(text);
 
@@ -5061,11 +5010,11 @@
 
 
   //pass 1, get the required size
-  for (i=0;i<tlen;i+=xtoffs) {
+  for (i=0; i<tlen; i+=xtoffs) {
     xtoffs=mbtowc(&utfsym,&text[i],4); // get next utf8 wchar
     if (xtoffs==-1) {
       LIVES_WARN("mbtowc returned -1");
-      return g_strdup(text);
+      return lives_strdup(text);
     }
 
     if (!strncmp(text+i,"\n",nlen)) runlen=0; // is a newline (in any encoding)
@@ -5076,94 +5025,90 @@
 
     if (runlen==maxwidth) {
       if (i<tlen-1 && (strncmp(text+i+1,"\n",nlen))) {
-	// needs a newline
-	needsnl=TRUE;
-	runlen=0;
+        // needs a newline
+        needsnl=TRUE;
+        runlen=0;
       }
-    }
-    else needsnl=FALSE;
+    } else needsnl=FALSE;
     req_size+=xtoffs;
   }
 
 
-  retstr=(char *)g_malloc(req_size);
+  retstr=(char *)lives_malloc(req_size);
   req_size=0; // reuse as a ptr to offset in retstr
   runlen=0;
   needsnl=FALSE;
 
   //pass 2, copy and insert newlines
 
-  for (i=0;i<tlen;i+=xtoffs) {
+  for (i=0; i<tlen; i+=xtoffs) {
 
     xtoffs=mbtowc(&utfsym,&text[i],4); // get next utf8 wchar
     if (!strncmp(text+i,"\n",nlen)) runlen=0; // is a newline (in any encoding)
     else {
       runlen++;
       if (needsnl) {
-	memcpy(retstr+req_size,newline,nlen);
-	req_size+=nlen;
+        memcpy(retstr+req_size,newline,nlen);
+        req_size+=nlen;
       }
     }
 
     if (runlen==maxwidth) {
       if (i<tlen-1 && (strncmp(text+i+1,"\n",nlen))) {
-	// needs a newline
-	needsnl=TRUE;
-	runlen=0;
+        // needs a newline
+        needsnl=TRUE;
+        runlen=0;
       }
-    }
-    else needsnl=FALSE;
+    } else needsnl=FALSE;
     memcpy(retstr+req_size,&utfsym,xtoffs);
     req_size+=xtoffs;
 
   }
 
   memset(retstr+req_size,0,1);
-  
+
   return retstr;
 }
 
 
 
-int hextodec (const char *string) {
+int hextodec(char *string) {
   int i;
   int tot=0;
   char test[2];
 
-  memset (test+1,0,1);
+  memset(test+1,0,1);
 
-  for (i=0;i<strlen (string);i++) {
+  for (i=0; i<strlen(string); i++) {
     tot*=16;
-    lives_memcpy (test,&string[i],1);
-    tot+=get_hex_digit (test);
+    lives_memcpy(test,(void *)&string[i],1);
+    tot+=get_hex_digit(test);
   }
   return tot;
 }
 
-int get_hex_digit (const char *c) {
-  if (!strcmp (c,"a")||!strcmp (c,"A")) return 10;
-  if (!strcmp (c,"b")||!strcmp (c,"B")) return 11;
-  if (!strcmp (c,"c")||!strcmp (c,"C")) return 12;
-  if (!strcmp (c,"d")||!strcmp (c,"D")) return 13;
-  if (!strcmp (c,"e")||!strcmp (c,"E")) return 14;
-  if (!strcmp (c,"f")||!strcmp (c,"F")) return 15;
-  return(atoi (c));
+int get_hex_digit(const char *c) {
+  if (!strcmp(c,"a")||!strcmp(c,"A")) return 10;
+  if (!strcmp(c,"b")||!strcmp(c,"B")) return 11;
+  if (!strcmp(c,"c")||!strcmp(c,"C")) return 12;
+  if (!strcmp(c,"d")||!strcmp(c,"D")) return 13;
+  if (!strcmp(c,"e")||!strcmp(c,"E")) return 14;
+  if (!strcmp(c,"f")||!strcmp(c,"F")) return 15;
+  return (atoi(c));
 }
 
 
 
 static uint32_t fastrand_val;
 
-LIVES_INLINE uint32_t fastrand(void)
-{
+LIVES_INLINE uint32_t fastrand(void) {
 #define rand_a 1073741789L
 #define rand_c 32749L
 
   return (fastrand_val= rand_a * fastrand_val + rand_c);
 }
 
-void fastsrand(uint32_t seed)
-{
+void fastsrand(uint32_t seed) {
   fastrand_val = seed;
 }
 
@@ -5178,9 +5123,9 @@
   char *com;
 #endif
 
-  if (!g_file_test(dir,G_FILE_TEST_IS_DIR)) {
-    g_mkdir_with_parents(dir,S_IRWXU);
-    if (!g_file_test(dir,G_FILE_TEST_IS_DIR)) {
+  if (!lives_file_test(dir,LIVES_FILE_TEST_IS_DIR)) {
+    lives_mkdir_with_parents(dir,S_IRWXU);
+    if (!lives_file_test(dir,LIVES_FILE_TEST_IS_DIR)) {
       return FALSE;
     }
   }
@@ -5191,12 +5136,12 @@
   if (sbuf.f_flag&ST_RDONLY) return FALSE;
 #else
   mainw->com_failed=FALSE;
-  com=g_strdup_printf("touch.exe \"%s\\xxxxfile.txt\"",dir);
+  com=lives_strdup_printf("touch.exe \"%s\\xxxxfile.txt\"",dir);
   lives_system(com,TRUE);
-  g_free(com);
-  com=g_strdup_printf("%s\\xxxxfile.txt",dir);
+  lives_free(com);
+  com=lives_strdup_printf("%s\\xxxxfile.txt",dir);
   unlink(com);
-  g_free(com);
+  lives_free(com);
   if (mainw->com_failed) return FALSE;
 #endif
   return TRUE;
@@ -5221,7 +5166,7 @@
   uint64_t bytes=0;
   boolean must_delete=FALSE;
 
-  if (!g_file_test(dir,G_FILE_TEST_IS_DIR)) must_delete=TRUE;
+  if (!lives_file_test(dir,LIVES_FILE_TEST_IS_DIR)) must_delete=TRUE;
   if (!is_writeable_dir(dir)) goto getfserr;
 
 #ifndef IS_MINGW
@@ -5254,25 +5199,21 @@
 
 
 
-LIVES_INLINE GList *lives_list_move_to_first(GList *list, GList *item) {
+LIVES_INLINE LiVESList *lives_list_move_to_first(LiVESList *list, LiVESList *item) {
   // move item to first in list
-  GList *xlist=g_list_remove_link(list,item); // item becomes standalone list
-  return g_list_concat(item,xlist); // concat rest of list after item
+  LiVESList *xlist=lives_list_remove_link(list,item); // item becomes standalone list
+  return lives_list_concat(item,xlist); // concat rest of list after item
 }
 
 
-GList *g_list_delete_string(GList *list, char *string) {
+LiVESList *lives_list_delete_string(LiVESList *list, char *string) {
   // remove string from list, using strcmp
 
-  GList *xlist=list;
+  LiVESList *xlist=list;
   while (xlist!=NULL) {
     if (!strcmp((char *)xlist->data,string)) {
-      if (xlist->prev!=NULL) xlist->prev->next=xlist->next;
-      else list=xlist->next;
-      if (xlist->next!=NULL) xlist->next->prev=xlist->prev;
-      xlist->next=xlist->prev=NULL;
-      g_free(xlist->data);
-      g_list_free(xlist);
+      lives_free((livespointer)xlist->data);
+      list=lives_list_delete_link(list,xlist);
       return list;
     }
     xlist=xlist->next;
@@ -5281,13 +5222,13 @@
 }
 
 
-GList *g_list_copy_strings(GList *list) {
+LiVESList *lives_list_copy_strings(LiVESList *list) {
   // copy a list, copying the strings too
 
-  GList *xlist=NULL,*olist=list;
+  LiVESList *xlist=NULL,*olist=list;
 
   while (olist!=NULL) {
-    xlist=g_list_append(xlist,g_strdup((gchar *)olist->data));
+    xlist=lives_list_append(xlist,lives_strdup((char *)olist->data));
     olist=olist->next;
   }
 
@@ -5297,26 +5238,26 @@
 
 
 
-boolean string_lists_differ(GList *alist, GList *blist) {
+boolean string_lists_differ(LiVESList *alist, LiVESList *blist) {
   // compare 2 lists of strings and see if they are different (ignoring ordering)
-  // for long lists this would be quicker if we sorted the lists first; however this function 
+  // for long lists this would be quicker if we sorted the lists first; however this function
   // is designed to deal with short lists only
 
 
-  GList *plist;
+  LiVESList *plist;
 
-  if (g_list_length(alist)!=g_list_length(blist)) return TRUE; // check the simple case first
+  if (lives_list_length(alist)!=lives_list_length(blist)) return TRUE; // check the simple case first
 
   // run through alist and see if we have a mismatch
 
   plist=alist;
   while (plist!=NULL) {
-    GList *qlist=blist;
+    LiVESList *qlist=blist;
     boolean matched=FALSE;
     while (qlist!=NULL) {
       if (!(strcmp((char *)plist->data,(char *)qlist->data))) {
-	matched=TRUE;
-	break;
+        matched=TRUE;
+        break;
       }
       qlist=qlist->next;
     }
@@ -5335,7 +5276,7 @@
   int i;
 
   int fcount,ofcount;
-  
+
   char *fname_next;
 
   boolean maybeok=FALSE;
@@ -5346,8 +5287,8 @@
 
   fcount=cfile->frames;
 
-  for (i=1;i<=fcount;i++) {
-    fname_next=g_strdup_printf("%s/%s/%08d.%s",prefs->tmpdir,cfile->handle,i,prefs->image_ext);
+  for (i=1; i<=fcount; i++) {
+    fname_next=lives_strdup_printf("%s/%s/%08d.%s",prefs->tmpdir,cfile->handle,i,prefs->image_ext);
     if (sget_file_size(fname_next)>0) {
       maybeok=TRUE;
       break;
@@ -5357,7 +5298,8 @@
   cfile->frames=ofcount;
 
   if (!maybeok) {
-    do_error_dialog(_("Your version of mplayer/ffmpeg may be broken !\nSee http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2071\n\nYou can work around this temporarily by switching to jpeg output in Preferences/Decoding.\n\nTry running Help/Troubleshoot for more information."));
+    do_error_dialog(
+      _("Your version of mplayer/ffmpeg may be broken !\nSee http://bugzilla.mplayerhq.hu/show_bug.cgi?id=2071\n\nYou can work around this temporarily by switching to jpeg output in Preferences/Decoding.\n\nTry running Help/Troubleshoot for more information."));
     return CANCEL_ERROR;
   }
   return CANCEL_NONE;

LiVES-2.2.8.tar.bz2/src/videodev.c -> LiVES-2.4.1.tar.bz2/src/videodev.c Changed

@@ -1,10 +1,9 @@
 // LiVES - videodev input
-// (c) G. Finch 2010 - 2013 <salsaman@gmail.com>
+// (c) G. Finch 2010 - 2015 <salsaman@gmail.com>
 // released under the GNU GPL 3 or later
 // see file COPYING or www.gnu.org for details
 
 
-#include "support.h"
 #include "main.h"
 
 #ifdef HAVE_UNICAP
@@ -51,11 +50,11 @@
     status=unicap_poll_buffer(ldev->handle,&ncount);
 
 #ifdef DEBUG_UNICAP
-    if (status!=STATUS_SUCCESS) g_printerr("Unicap poll failed with status %d\n",status);
+    if (status!=STATUS_SUCCESS) lives_printerr("Unicap poll failed with status %d\n",status);
 #endif
 
     if (ncount>=0) {
-      if (!SUCCESS (unicap_wait_buffer (ldev->handle, buff))) return FALSE;
+      if (!SUCCESS(unicap_wait_buffer(ldev->handle, buff))) return FALSE;
       return TRUE;
     }
 
@@ -64,7 +63,7 @@
 
     if (dtime-stime>timer) return FALSE;
 
-    g_usleep(prefs->sleep_time);
+    lives_usleep(prefs->sleep_time);
     lives_widget_context_update();
   }
 
@@ -89,7 +88,7 @@
 
     if (dtime-stime>timer) return FALSE;
 
-    g_usleep(prefs->sleep_time);
+    lives_usleep(prefs->sleep_time);
     lives_widget_context_update();
   }
 
@@ -99,8 +98,8 @@
 
 
 
-static void new_frame_cb (unicap_event_t event, unicap_handle_t handle,
-			  unicap_data_buffer_t * buffer, void *usr_data) {
+static void new_frame_cb(unicap_event_t event, unicap_handle_t handle,
+                         unicap_data_buffer_t *buffer, void *usr_data) {
   lives_vdev_t *ldev=(lives_vdev_t *)usr_data;
   if (mainw->playing_file==-1||(mainw->playing_file!=ldev->fileno&&mainw->blend_file!=ldev->fileno)) {
     ldev->buffer_ready=0;
@@ -110,8 +109,7 @@
   if (ldev->buffer_ready!=1) {
     lives_memcpy(ldev->buffer1.data,buffer->data,ldev->buffer1.buffer_size);
     ldev->buffer_ready=1;
-  }
-  else {
+  } else {
     lives_memcpy(ldev->buffer2.data,buffer->data,ldev->buffer2.buffer_size);
     ldev->buffer_ready=2;
   }
@@ -121,7 +119,7 @@
 
 
 
-boolean weed_layer_set_from_lvdev (weed_plant_t *layer, lives_clip_t *sfile, double timeoutsecs) {
+boolean weed_layer_set_from_lvdev(weed_plant_t *layer, lives_clip_t *sfile, double timeoutsecs) {
   lives_vdev_t *ldev=(lives_vdev_t *)sfile->ext_src;
   unicap_data_buffer_t *returned_buffer=NULL;
   void **pixel_data;
@@ -129,7 +127,7 @@
   int error;
 
   weed_set_int_value(layer,"width",sfile->hsize/
-		     weed_palette_get_pixels_per_macropixel(ldev->current_palette));
+                     weed_palette_get_pixels_per_macropixel(ldev->current_palette));
   weed_set_int_value(layer,"height",sfile->vsize);
   weed_set_int_value(layer,"current_palette",ldev->current_palette);
   weed_set_int_value(layer,"YUV_subspace",WEED_YUV_SUBSPACE_YCBCR); // TODO - handle bt.709
@@ -144,24 +142,23 @@
       ldev->buffer1.data=(unsigned char *)weed_get_voidptr_value(layer,"pixel_data",&error);
     }
 
-    unicap_queue_buffer (ldev->handle, &ldev->buffer1);
-    
+    unicap_queue_buffer(ldev->handle, &ldev->buffer1);
+
     if (!lives_wait_user_buffer(ldev, &returned_buffer, timeoutsecs)) {
 #ifdef DEBUG_UNICAP
-      g_printerr("Failed to wait for user buffer!\n");
-      unicap_stop_capture (ldev->handle);
-      unicap_dequeue_buffer (ldev->handle, &returned_buffer);
-      unicap_start_capture (ldev->handle);
+      lives_printerr("Failed to wait for user buffer!\n");
+      unicap_stop_capture(ldev->handle);
+      unicap_dequeue_buffer(ldev->handle, &returned_buffer);
+      unicap_start_capture(ldev->handle);
 #endif
       ldev->buffer1.data=(unsigned char *)odata;
       return FALSE;
     }
-  }
-  else {
+  } else {
     // wait for callback to fill buffer
     if (!lives_wait_system_buffer(ldev,timeoutsecs)) {
 #ifdef DEBUG_UNICAP
-      g_printerr("Failed to wait for system buffer!\n");
+      lives_printerr("Failed to wait for system buffer!\n");
 #endif
     }
     if (ldev->buffer_ready==1) returned_buffer=&ldev->buffer1;
@@ -172,16 +169,15 @@
 
   if (weed_palette_get_numplanes(ldev->current_palette)>1&&!ldev->is_really_grey) {
     pixel_data_planar_from_membuf(pixel_data, returned_buffer->data, sfile->hsize*sfile->vsize, ldev->current_palette);
-  }
-  else {
+  } else {
     if (ldev->buffer_type==UNICAP_BUFFER_TYPE_SYSTEM) {
       int rowstride=weed_get_int_value(layer,"rowstrides",&error);
       size_t bsize=rowstride*sfile->vsize;
       if (bsize>returned_buffer->buffer_size) {
 #ifdef DEBUG_UNICAP
-	g_printerr("Warning - returned buffer size too small !\n");
+        lives_printerr("Warning - returned buffer size too small !\n");
 #endif
-	bsize=returned_buffer->buffer_size;
+        bsize=returned_buffer->buffer_size;
       }
       lives_memcpy(pixel_data[0], returned_buffer->data, bsize);
     }
@@ -194,7 +190,7 @@
     memset(pixel_data[2],128,sfile->hsize*sfile->vsize);
   }
 
-  weed_free(pixel_data);
+  lives_free(pixel_data);
 
   ldev->buffer1.data=(unsigned char *)odata;
 
@@ -202,8 +198,8 @@
 }
 
 
-static unicap_format_t *lvdev_get_best_format(const unicap_format_t *formats, 
-						    lives_vdev_t *ldev, int palette, int width, int height) {
+static unicap_format_t *lvdev_get_best_format(const unicap_format_t *formats,
+    lives_vdev_t *ldev, int palette, int width, int height) {
   // get nearest format for given palette, width and height
   // if palette is WEED_PALETTE_END, or cannot be matched, get best quality palette (preferring RGB)
   // width and height must be set, actual width and height will be set as near to this as possible
@@ -221,9 +217,9 @@
   int cpal;
 
   // get details
-  for (format_count = 0; SUCCESS (status) && (format_count < MAX_FORMATS);format_count++){
+  for (format_count = 0; SUCCESS(status) && (format_count < MAX_FORMATS); format_count++) {
     unicap_format_t *format=(unicap_format_t *)(&formats[format_count]);
-    status = unicap_enumerate_formats (ldev->handle, NULL, (unicap_format_t *)format, format_count);
+    status = unicap_enumerate_formats(ldev->handle, NULL, (unicap_format_t *)format, format_count);
 
     // TODO - check if we need to free format->sizes
 
@@ -233,16 +229,16 @@
     if (cpal==WEED_PALETTE_END||weed_palette_is_alpha_palette(cpal)) {
 #ifdef DEBUG_UNICAP
       // set format to try and get more data
-      unicap_set_format (ldev->handle, format);
-      g_printerr("Unusable palette with fourcc 0x%x  bpp=%d, size=%dx%d buf=%d\n",format->fourcc,format->bpp,format->size.width,
-		 format->size.height,(int)format->buffer_size);
+      unicap_set_format(ldev->handle, format);
+      lives_printerr("Unusable palette with fourcc 0x%x  bpp=%d, size=%dx%d buf=%d\n",format->fourcc,format->bpp,format->size.width,
+                     format->size.height,(int)format->buffer_size);
 #endif
       continue;
     }
 
     if (bestp==WEED_PALETTE_END||cpal==palette||weed_palette_is_alpha_palette(bestp)||
-	weed_palette_is_lower_quality(bestp,cpal)||
-	(weed_palette_is_yuv_palette(bestp)&&weed_palette_is_rgb_palette(cpal))) {
+        weed_palette_is_lower_quality(bestp,cpal)||
+        (weed_palette_is_yuv_palette(bestp)&&weed_palette_is_rgb_palette(cpal))) {
       // got better palette, or exact match
 
       // prefer exact match on target palette if we have it
@@ -255,73 +251,71 @@
       // for now we just go with the smallest size >= target (or largest frame size if none are >= target)
 
       if (width>=format->min_size.width && height>=format->min_size.height) {
-	if (format->h_stepping>0&&format->v_stepping>0) {
+        if (format->h_stepping>0&&format->v_stepping>0) {
 #ifdef DEBUG_UNICAP
-	  g_printerr("Can set any size with step %d and %d; min %d x %d, max %d x %d\n",format->h_stepping,format->v_stepping,
-		     format->min_size.width,format->min_size.height,format->max_size.width,format->max_size.height);
+          lives_printerr("Can set any size with step %d and %d; min %d x %d, max %d x %d\n",format->h_stepping,format->v_stepping,
+                         format->min_size.width,format->min_size.height,format->max_size.width,format->max_size.height);
 #endif
-	  // can set exact size (within stepping limits)
-	  format->size.width=(int)(((double)width+(double)format->h_stepping/2.)
-				   /(double)format->h_stepping) * format->h_stepping;
-
-	  format->size.height=(int)(((double)height+(double)format->v_stepping/2.)
-				   /(double)format->v_stepping) * format->v_stepping;
-
-	  if (format->size.width>format->max_size.width) format->size.width=format->max_size.width;
-	  if (format->size.height>format->max_size.height) format->size.height=format->max_size.height;
-
-	  if (format->size.width>bestw || format->size.height>besth) {
-	    bestw=format->size.width;
-	    besth=format->size.height;
-	    f=format_count;
-	  }
-	}
-	else {
-	  // array of sizes supported
-	  // step through sizes
+          // can set exact size (within stepping limits)
+          format->size.width=(int)(((double)width+(double)format->h_stepping/2.)
+                                   /(double)format->h_stepping) * format->h_stepping;
+
+          format->size.height=(int)(((double)height+(double)format->v_stepping/2.)
+                                    /(double)format->v_stepping) * format->v_stepping;
+
+          if (format->size.width>format->max_size.width) format->size.width=format->max_size.width;
+          if (format->size.height>format->max_size.height) format->size.height=format->max_size.height;
+
+          if (format->size.width>bestw || format->size.height>besth) {
+            bestw=format->size.width;
+            besth=format->size.height;
+            f=format_count;
+          }
+        } else {
+          // array of sizes supported
+          // step through sizes
 #ifdef DEBUG_UNICAP
-	  g_printerr("Checking %d array sizes\n",format->size_count);
+          lives_printerr("Checking %d array sizes\n",format->size_count);
 #endif
 
-	  if (format->size_count==0) {
-	    // only one size we can use, this is it...
+          if (format->size_count==0) {
+            // only one size we can use, this is it...
 
-	    if ((format->size.width>bestw||format->size.height>besth)&&(bestw<width||besth<height)) {
-	      // this format supports a better size match
-	      bestw=format->size.width=format->size.width;
-	      besth=format->size.height=format->size.height;
-	      f=format_count;
+            if ((format->size.width>bestw||format->size.height>besth)&&(bestw<width||besth<height)) {
+              // this format supports a better size match
+              bestw=format->size.width=format->size.width;
+              besth=format->size.height=format->size.height;
+              f=format_count;
 #ifdef DEBUG_UNICAP
-	      g_printerr("Size is best so far\n");
+              lives_printerr("Size is best so far\n");
 #endif
-	    }
-	    continue;
-	  }
-	  
-	  // array of sizes
-	  for (i=0;i<format->size_count;i++) {
+            }
+            continue;
+          }
+
+          // array of sizes
+          for (i=0; i<format->size_count; i++) {
 #ifdef DEBUG_UNICAP
-	    g_printerr("entry %d:%d x %d\n",i,format->sizes[i].width,format->sizes[i].height);
+            lives_printerr("entry %d:%d x %d\n",i,format->sizes[i].width,format->sizes[i].height);
 #endif
-	    if (format->sizes[i].width>bestw&&format->sizes[i].height>besth&&
-		(bestw<width||besth<height)) {
-	      // this format supports a better size match
-	      bestw=format->size.width=format->sizes[i].width;
-	      besth=format->size.height=format->sizes[i].height;
-	      f=format_count;
+            if (format->sizes[i].width>bestw&&format->sizes[i].height>besth&&
+                (bestw<width||besth<height)) {
+              // this format supports a better size match
+              bestw=format->size.width=format->sizes[i].width;
+              besth=format->size.height=format->sizes[i].height;
+              f=format_count;
 #ifdef DEBUG_UNICAP
-	      g_printerr("Size is best so far\n");
+              lives_printerr("Size is best so far\n");
 #endif
-	    }
-	  }
-	}
-      }
-      else {
-	// target is smaller than min width, height
-	if (bestw<format->min_size.width||besth<format->min_size.height) continue; // TODO - minimise aspect delta
-	bestw=format->size.width=format->min_size.width;
-	besth=format->size.height=format->min_size.height;
-	f=format_count;
+            }
+          }
+        }
+      } else {
+        // target is smaller than min width, height
+        if (bestw<format->min_size.width||besth<format->min_size.height) continue; // TODO - minimise aspect delta
+        bestw=format->size.width=format->min_size.width;
+        besth=format->size.height=format->min_size.height;
+        f=format_count;
       }
     }
   }
@@ -338,7 +332,7 @@
 
 static boolean open_vdev_inner(unicap_device_t *device) {
   // create a virtual clip
-  lives_vdev_t *ldev=(lives_vdev_t *)g_malloc(sizeof(lives_vdev_t));
+  lives_vdev_t *ldev=(lives_vdev_t *)lives_malloc(sizeof(lives_vdev_t));
   unicap_format_t formats[MAX_FORMATS];
   unicap_format_t *format;
 
@@ -347,20 +341,20 @@
 
   //check return value and take appropriate action
   if (ldev->handle==NULL) {
-    LIVES_ERROR ("vdev input: cannot open device");
-    g_free(ldev);
+    LIVES_ERROR("vdev input: cannot open device");
+    lives_free(ldev);
     return FALSE;
   }
 
   unicap_lock_stream(ldev->handle);
 
   format=lvdev_get_best_format(formats, ldev, WEED_PALETTE_END, DEF_GEN_WIDTH, DEF_GEN_HEIGHT);
-  
-  if(format==NULL) {
+
+  if (format==NULL) {
     LIVES_INFO("No useful formats found");
     unicap_unlock_stream(ldev->handle);
     unicap_close(ldev->handle);
-    g_free(ldev);
+    lives_free(ldev);
     return FALSE;
   }
 
@@ -369,28 +363,27 @@
     format->buffer_type = UNICAP_BUFFER_TYPE_SYSTEM;
 
     // set a callback for new frame
-    unicap_register_callback (ldev->handle, UNICAP_EVENT_NEW_FRAME, (unicap_callback_t) new_frame_cb, 
-			      (void *) ldev);
+    unicap_register_callback(ldev->handle, UNICAP_EVENT_NEW_FRAME, (unicap_callback_t) new_frame_cb,
+                             (void *) ldev);
 
-  }
-  else format->buffer_type = UNICAP_BUFFER_TYPE_USER;
+  } else format->buffer_type = UNICAP_BUFFER_TYPE_USER;
 
   ldev->buffer_type = format->buffer_type;
 
   // ignore YUV subspace for now
-  ldev->current_palette=fourccp_to_weedp(format->fourcc, format->bpp, (int *)&cfile->interlace, 
-					 &ldev->YUV_sampling, &ldev->YUV_subspace, &ldev->YUV_clamping);
+  ldev->current_palette=fourccp_to_weedp(format->fourcc, format->bpp, (int *)&cfile->interlace,
+                                         &ldev->YUV_sampling, &ldev->YUV_subspace, &ldev->YUV_clamping);
 
 #ifdef DEBUG_UNICAP
-  g_printerr("\nUsing palette with fourcc 0x%x, translated as %s\n",format->fourcc,
-	     weed_palette_get_name(ldev->current_palette));
+  lives_printerr("\nUsing palette with fourcc 0x%x, translated as %s\n",format->fourcc,
+                 weed_palette_get_name(ldev->current_palette));
 #endif
 
-  if (!SUCCESS (unicap_set_format (ldev->handle, format))) {
+  if (!SUCCESS(unicap_set_format(ldev->handle, format))) {
     LIVES_ERROR("Unicap error setting format");
     unicap_unlock_stream(ldev->handle);
     unicap_close(ldev->handle);
-    g_free(ldev);
+    lives_free(ldev);
     return FALSE;
   }
 
@@ -401,7 +394,7 @@
     int wheight=format->size.height,aheight;
     // something went wrong setting the size - the buffer is wrongly sized
 #ifdef DEBUG_UNICAP
-    g_printerr("Unicap buffer size is wrong, resetting it.\n");
+    lives_printerr("Unicap buffer size is wrong, resetting it.\n");
 #endif
     // get the size again
 
@@ -410,11 +403,11 @@
     aheight=format->size.height;
 
 #ifdef DEBUG_UNICAP
-    g_printerr("Wanted frame size %d x %d, got %d x %d\n",wwidth,wheight,awidth,aheight);
+    lives_printerr("Wanted frame size %d x %d, got %d x %d\n",wwidth,wheight,awidth,aheight);
 #endif
 
     format->buffer_size=format->size.width*format->size.height*weed_palette_get_bits_per_macropixel(ldev->current_palette)/
-      weed_palette_get_pixels_per_macropixel(ldev->current_palette)/8;
+                        weed_palette_get_pixels_per_macropixel(ldev->current_palette)/8;
   }
 
   cfile->hsize=format->size.width;
@@ -422,10 +415,10 @@
 
   cfile->ext_src=ldev;
 
-  ldev->buffer1.data = (unsigned char *)g_malloc (format->buffer_size);
+  ldev->buffer1.data = (unsigned char *)lives_malloc(format->buffer_size);
   ldev->buffer1.buffer_size = format->buffer_size;
 
-  ldev->buffer2.data = (unsigned char *)g_malloc (format->buffer_size);
+  ldev->buffer2.data = (unsigned char *)lives_malloc(format->buffer_size);
   ldev->buffer2.buffer_size = format->buffer_size;
 
   ldev->buffer_ready=0;
@@ -433,14 +426,13 @@
 
   cfile->bpp = format->bpp;
 
-  unicap_start_capture (ldev->handle); 
+  unicap_start_capture(ldev->handle);
 
   // if it is greyscale, we will add fake U and V planes
   if (ldev->current_palette==WEED_PALETTE_A8) {
     ldev->current_palette=WEED_PALETTE_YUV444P;
     ldev->is_really_grey=TRUE;
-  }
-  else ldev->is_really_grey=FALSE;
+  } else ldev->is_really_grey=FALSE;
 
   return TRUE;
 }
@@ -448,24 +440,23 @@
 
 void lives_vdev_free(lives_vdev_t *ldev) {
   if (ldev==NULL) return;
-  unicap_stop_capture (ldev->handle);
+  unicap_stop_capture(ldev->handle);
   unicap_unlock_stream(ldev->handle);
   unicap_close(ldev->handle);
-  if (ldev->buffer1.data!=NULL) g_free(ldev->buffer1.data);
-  if (ldev->buffer2.data!=NULL) g_free(ldev->buffer2.data);
+  if (ldev->buffer1.data!=NULL) lives_free(ldev->buffer1.data);
+  if (ldev->buffer2.data!=NULL) lives_free(ldev->buffer2.data);
 }
 
 
 
-void on_open_vdev_activate (LiVESMenuItem *menuitem, gpointer user_data) {
+void on_open_vdev_activate(LiVESMenuItem *menuitem, livespointer user_data) {
   unicap_device_t devices[MAX_DEVICES];
 
-  GList *devlist=NULL;
+  LiVESList *devlist=NULL;
 
   LiVESWidget *card_dialog;
 
-  gchar *tmp;
-  gchar *fname;
+  char *fname;
 
   int devno=0;
 
@@ -474,31 +465,32 @@
 
   int response;
 
-  int i,dev_count;
+  int dev_count;
   int status = STATUS_SUCCESS;
 
+  register int i;
 
   mainw->open_deint=FALSE;
 
-  status = unicap_reenumerate_devices (&dev_count);
+  status = unicap_reenumerate_devices(&dev_count);
 
   if (dev_count == 0) {
     do_no_in_vdevs_error();
     return;
   }
 
- // get device list
-  for (i = 0; SUCCESS (status) && (dev_count < MAX_DEVICES); i++) {
-    status = unicap_enumerate_devices (NULL, &devices[i], i);
-    if (!SUCCESS (status)) {
+  // get device list
+  for (i = 0; SUCCESS(status) && (dev_count < MAX_DEVICES); i++) {
+    status = unicap_enumerate_devices(NULL, &devices[i], i);
+    if (!SUCCESS(status)) {
       if (i==0) LIVES_INFO("Unicap failed to get any devices");
       break;
     }
   }
 
-  for (i=0;i<dev_count;i++) {
+  for (i=0; i<dev_count; i++) {
     if (!unicap_is_stream_locked(&devices[i])) {
-      devlist=g_list_prepend(devlist,devices[i].identifier);
+      devlist=lives_list_prepend(devlist,devices[i].identifier);
     }
   }
 
@@ -509,9 +501,9 @@
 
   mainw->fx1_val=0;
   mainw->open_deint=FALSE;
-  card_dialog=create_combo_dialog(1,(gpointer)devlist);
+  card_dialog=create_combo_dialog(1,(livespointer)devlist);
   response=lives_dialog_run(LIVES_DIALOG(card_dialog));
-  g_list_free(devlist);
+  lives_list_free(devlist);
 
   if (response==LIVES_RESPONSE_CANCEL) {
     lives_widget_destroy(card_dialog);
@@ -520,21 +512,21 @@
 
   lives_widget_destroy(card_dialog);
 
-  for (i=dev_count-1;i>=0;i--) {
+  for (i=dev_count-1; i>=0; i--) {
     if (!unicap_is_stream_locked(&devices[i])) {
       if (mainw->fx1_val==0) {
-	devno=i;
-	break;
+        devno=i;
+        break;
       }
     }
     mainw->fx1_val--;
   }
 
-  if (devices[devno].device!=NULL) fname=g_strdup_printf("%s",devices[devno].device);
-  else fname=g_strdup_printf("%s",devices[devno].identifier);
+  if (devices[devno].device!=NULL) fname=lives_strdup_printf("%s",devices[devno].device);
+  else fname=lives_strdup_printf("%s",devices[devno].identifier);
 
   if (!get_new_handle(new_file,fname)) {
-    g_free(fname);
+    lives_free(fname);
     return;
   }
 
@@ -544,10 +536,8 @@
   d_print(""); ///< force switchtext
 
   if (!open_vdev_inner(&devices[devno])) {
-    gchar *msg=g_strdup_printf(_("Unable to open device %s\n"),fname);
-    d_print(msg);
-    g_free(msg);
-    g_free(fname);
+    d_print(_("Unable to open device %s\n"),fname);
+    lives_free(fname);
     close_current_file(old_file);
     return;
   }
@@ -559,14 +549,13 @@
   cfile->is_loaded=TRUE;
   add_to_clipmenu();
 
-  g_snprintf(cfile->type,40,"%s",fname);
+  lives_snprintf(cfile->type,40,"%s",fname);
 
-  d_print ((tmp=g_strdup_printf (_("Opened device %s\n"),devices[devno].identifier)));
+  d_print(_("Opened device %s\n"),devices[devno].identifier);
 
   switch_to_file((mainw->current_file=old_file),new_file);
 
-  g_free(tmp);
-  g_free(fname);
+  lives_free(fname);
 
 }

LiVES-2.2.8.tar.bz2/src/videodev.h -> LiVES-2.4.1.tar.bz2/src/videodev.h Changed

LiVES-2.2.8.tar.bz2/src/widget-helper-gtk.h -> LiVES-2.4.1.tar.bz2/src/widget-helper-gtk.h Changed

@@ -18,7 +18,7 @@
 #ifdef GDK_WINDOWING_WIN32
 #include <gdk/gdkwin32.h>
 
-#ifndef GDK_IS_WIN32_DISPLAY 
+#ifndef GDK_IS_WIN32_DISPLAY
 #define GDK_IS_WIN32_DISPLAY(display) (TRUE)
 #endif
 
@@ -31,18 +31,18 @@
 
 #include <gdk/gdkx.h>
 
-#ifndef GDK_IS_X11_DISPLAY 
+#ifndef GDK_IS_X11_DISPLAY
 #define GDK_IS_X11_DISPLAY(display) (TRUE)
 #endif
 
-#ifndef GDK_IS_WIN32_DISPLAY 
+#ifndef GDK_IS_WIN32_DISPLAY
 #define GDK_IS_WIN32_DISPLAY(display) (FALSE)
 #endif
 
 
 #else
 
-#ifndef GDK_IS_X11_DISPLAY 
+#ifndef GDK_IS_X11_DISPLAY
 #define GDK_IS_X11_DISPLAY(display) (FALSE)
 #endif
 
@@ -92,8 +92,8 @@
 
 typedef cairo_fill_rule_t lives_painter_fill_rule_t;
 
-#define LIVES_PAINTER_FILL_RULE_WINDING  CAIRO_FILL_RULE_WINDING 
-#define LIVES_PAINTER_FILL_RULE_EVEN_ODD CAIRO_FILL_RULE_EVEN_ODD 
+#define LIVES_PAINTER_FILL_RULE_WINDING  CAIRO_FILL_RULE_WINDING
+#define LIVES_PAINTER_FILL_RULE_EVEN_ODD CAIRO_FILL_RULE_EVEN_ODD
 
 
 #endif
@@ -110,16 +110,23 @@
 #define G_ENCODE_VERSION(major,minor) ((major) << 16 | (minor) << 8)
 #endif
 
+#define lives_free(a) g_free(a)
+#define lives_malloc(a) g_malloc(a)
+#define lives_malloc0(a) g_malloc0(a)
+#define lives_realloc(a,b) g_realloc(a,b)
+#define lives_try_malloc0_n(a,b) g_try_malloc0_n(a,b)
+#define lives_try_malloc(a) g_try_malloc(a)
+#define lives_try_malloc0(a) g_try_malloc0(a)
+#define lives_try_realloc(a,b) g_try_realloc(a,b)
 
-typedef GError                            LiVESError;
 
+typedef GError                            LiVESError;
 
 typedef GList                             LiVESList;
 typedef GSList                            LiVESSList;
 
-
 typedef gpointer                          livespointer;
-
+typedef gconstpointer                     livesconstpointer;
 
 typedef GClosure                          LiVESWidgetClosure;
 
@@ -132,7 +139,6 @@
 #define LIVES_LOG_LEVEL_CRITICAL G_LOG_LEVEL_CRITICAL
 #define LIVES_LOG_FATAL_MASK G_LOG_FATAL_MASK
 
-
 //////////////////////////////////////////////////
 
 #if GTK_CHECK_VERSION(3,10,0)
@@ -141,14 +147,116 @@
 
 #define return_true gtk_true
 
-typedef void (*LiVESGuiCallback) (void);
-typedef void (*LiVESWidgetCallback) (GtkWidget *widget, gpointer data);
-typedef gboolean (*LiVESWidgetSourceFunc) (gpointer data);
+typedef void (*LiVESGuiCallback)(void);
+typedef void (*LiVESWidgetCallback)(GtkWidget *widget, gpointer data);
+typedef gboolean(*LiVESWidgetSourceFunc)(gpointer data);
+typedef gint(*LiVESCompareFunc)(gconstpointer a, gconstpointer b);
 
+#define LIVES_LITTLE_ENDIAN G_LITTLE_ENDIAN
+#define LIVES_BIG_ENDIAN G_BIG_ENDIAN
 
+#define LIVES_MAXINT G_MAXINT
+#define LIVES_MAXUINT32 G_MAXUINT32
+#define LIVES_MAXSIZE G_MAXSIZE
+#define LIVES_MAXFLOAT G_MAXFLOAT
 
 #define LIVES_GUI_CALLBACK(f) ((LiVESGuiCallback) (f))
 
+#define lives_printerr(args...) g_printerr(args)
+#define lives_strdup_printf(args...) g_strdup_printf(args)
+#define lives_strdup_vprintf(args...) g_strdup_vprintf(args)
+#define lives_strndup_printf(args...) g_strndup_printf(args)
+#define lives_strndup(a,b) g_strndup(a,b)
+#define lives_snprintf(a,b,args...) g_snprintf(a,b,args)
+#define lives_strsplit(a,b,c) g_strsplit(a,b,c)
+#define lives_strfreev(a) g_strfreev(a)
+#define lives_ascii_strcasecmp(a,b) g_ascii_strcasecmp(a,b)
+#define lives_ascii_strncasecmp(a,b,c) g_ascii_strncasecmp(a,b,c)
+#define lives_strconcat(a,args...) g_strconcat(a,args)
+#define lives_strstrip(a) g_strstrip(a)
+#define lives_strrstr(a,b) g_strrstr(a,b)
+#define lives_strstr_len(a,b,c) g_strstr_len(a,b,c)
+#define lives_strdelimit(a,b,c) g_strdelimit(a,b,c)
+
+#define LIVES_NORMALIZE_DEFAULT G_NORMALIZE_DEFAULT
+
+#define lives_utf8_normalize(a,b,c) g_utf8_normalize(a,b,c)
+
+
+#define lives_list_nth_data(list,i) g_list_nth_data(list,i)
+#define lives_list_nth(list,i) g_list_nth(list,i)
+#define lives_list_length(list) g_list_length(list)
+#define lives_list_free(list) g_list_free(list)
+#define lives_list_append(list,data) g_list_append(list,data)
+#define lives_list_prepend(list,data) g_list_prepend(list,data)
+#define lives_list_find(list,data) g_list_find(list,data)
+#define lives_list_previous(list) g_list_previous(list)
+#define lives_list_last(list) g_list_last(list)
+#define lives_list_delete_link(list,link) g_list_delete_link(list,link)
+#define lives_list_copy(list) g_list_copy(list)
+#define lives_list_next(list) g_list_next(list)
+#define lives_list_first(list) g_list_first(list)
+#define lives_list_remove(list,data) g_list_remove(list,data)
+#define lives_list_remove_link(list,data) g_list_remove_link(list,data)
+#define lives_list_concat(list,data) g_list_concat(list,data)
+#define lives_list_insert(list,data,pos) g_list_insert(list,data,pos)
+#define lives_list_index(list,data) g_list_index(list,data)
+#define lives_list_find_custom(list,data,func) g_list_find_custom(list,data,func)
+
+#define lives_slist_free(list) g_slist_free(list)
+#define lives_slist_length(list) g_slist_length(list)
+#define lives_slist_nth_data(list,i) g_slist_nth_data(list,i)
+#define lives_slist_append(list,data) g_slist_append(list,data)
+
+#define lives_build_filename(args...) g_build_filename(args)
+#define lives_filename_to_utf8(a,b,c,d,e) g_filename_to_utf8(a,b,c,d,e)
+#define lives_filename_from_utf8(a,b,c,d,e) g_filename_from_utf8(a,b,c,d,e)
+
+#define lives_utf8_strdown(a,b) g_utf8_strdown(a,b)
+
+#define lives_find_program_in_path(a) g_find_program_in_path(a)
+
+#define lives_idle_add(a,b) g_idle_add(a,b)
+#define lives_idle_add_full(a,b,c,d) g_idle_add_full(a,b,c,d)
+
+#define lives_set_application_name(a) g_set_application_name(a)
+#define lives_get_application_name() g_get_application_name()
+
+#define lives_usleep(a) g_usleep(a)
+
+#define lives_mkdir_with_parents(a,b) g_mkdir_with_parents(a,b)
+
+#define lives_strtod(a,b) g_strtod(a,b)
+
+#define lives_path_get_basename(a) g_path_get_basename(a)
+
+#define LIVES_UNLIKELY(a) G_UNLIKELY(a)
+#define LIVES_LIKELY(a) G_LIKELY(a)
+
+#define lives_file_test(a,b) g_file_test(a,b)
+
+#define lives_get_current_dir() g_get_current_dir()
+
+#define lives_error_free(a) g_error_free(a)
+
+#define lives_strerror(a) g_strerror(a)
+
+#define lives_cclosure_new(a,b,c) g_cclosure_new(a,b,c)
+
+#define lives_path_get_dirname(a) g_path_get_dirname(a)
+
+#define U82L(String) ( g_locale_from_utf8 (String,-1,NULL,NULL,NULL) )
+#define L2U8(String) ( g_locale_to_utf8 (String,-1,NULL,NULL,NULL) )
+
+#define U82F(String) ( g_filename_from_utf8 (String,-1,NULL,NULL,NULL) )
+#define F2U8(String) ( g_filename_to_utf8 (String,-1,NULL,NULL,NULL) )
+
+
+#define LIVES_FILE_TEST_EXISTS G_FILE_TEST_EXISTS
+#define LIVES_FILE_TEST_IS_DIR G_FILE_TEST_IS_DIR
+#define LIVES_FILE_TEST_IS_REGULAR G_FILE_TEST_IS_REGULAR
+
+#define LIVES_DIR_SEPARATOR_S G_DIR_SEPARATOR_S
 
 typedef GtkJustification LiVESJustification;
 
@@ -162,13 +270,20 @@
 #define LIVES_ORIENTATION_VERTICAL   GTK_ORIENTATION_VERTICAL
 
 typedef GdkEvent                          LiVESXEvent;
+typedef GdkXEvent                         LiVESXXEvent;
 typedef GdkEventButton                    LiVESXEventButton;
 typedef GdkEventMotion                    LiVESXEventMotion;
 typedef GdkEventScroll                    LiVESXEventScroll;
+typedef GdkEventExpose                    LiVESXEventExpose;
+typedef GdkEventCrossing                  LiVESXEventCrossing;
+typedef GdkEventConfigure                 LiVESXEventConfigure;
+typedef GdkEventFocus                     LiVESXEventFocus;
+typedef GdkEvent                          LiVESXEventDelete;
 typedef GdkDisplay                        LiVESXDisplay;
 typedef GdkScreen                         LiVESXScreen;
 typedef GdkDevice                         LiVESXDevice;
 
+
 #define LIVES_SCROLL_UP   GDK_SCROLL_UP
 #define LIVES_SCROLL_DOWN GDK_SCROLL_DOWN
 
@@ -187,13 +302,56 @@
 #define LIVES_GUI_OBJECT_CLASS(a) GTK_OBJECT_CLASS(a)
 #endif
 
+#define lives_widget_object_set_data(a, b, c) g_object_set_data(a, b, c)
+#define lives_widget_object_get_data(a, b) g_object_get_data(a, b)
+
+#define LIVES_WIDGET_OBJECT(a) G_OBJECT(a)
+
+typedef GMemVTable LiVESMemVTable;
+typedef GIOChannel LiVESIOChannel;
+
+typedef GtkTargetEntry LiVESTargetEntry;
+
+typedef GdkFilterReturn LiVESFilterReturn;
+
+#define LIVES_FILTER_REMOVE GDK_FILTER_REMOVE
+#define LIVES_FILTER_CONTINUE GDK_FILTER_CONTINUE
+
+// events
+#define LIVES_WIDGET_SCROLL_EVENT "scroll-event"
+#define LIVES_WIDGET_CONFIGURE_EVENT "configure-event"
+#define LIVES_WIDGET_ENTER_EVENT "enter-notify-event"
+#define LIVES_WIDGET_BUTTON_PRESS_EVENT "button-press-event"
+#define LIVES_WIDGET_BUTTON_RELEASE_EVENT "button-release-event"
+#define LIVES_WIDGET_MOTION_NOTIFY_EVENT "motion-notify-event"
+#define LIVES_WIDGET_LEAVE_NOTIFY_EVENT "leave-notify-event"
+#define LIVES_WIDGET_FOCUS_OUT_EVENT "focus-out-event"
+#define LIVES_WIDGET_DELETE_EVENT "delete-event"
+
+// signals
+#define LIVES_WIDGET_CLICKED_SIGNAL "clicked"
+#define LIVES_WIDGET_TOGGLED_SIGNAL "toggled"
+#define LIVES_WIDGET_CHANGED_SIGNAL "changed"
+#define LIVES_WIDGET_ACTIVATE_SIGNAL "activate"
+#define LIVES_WIDGET_VALUE_CHANGED_SIGNAL "value-changed"
+#define LIVES_WIDGET_SELECTION_CHANGED_SIGNAL "selection-changed"
+#define LIVES_WIDGET_CURRENT_FOLDER_CHANGED_SIGNAL "current-folder-changed"
+#define LIVES_WIDGET_RESPONSE_SIGNAL "response"
+#define LIVES_WIDGET_DRAG_DATA_RECEIVED_SIGNAL "drag-data-received"
+#define LIVES_WIDGET_SIZE_PREPARED_SIGNAL "size-prepared"
+#define LIVES_WIDGET_MODE_CHANGED_SIGNAL "mode-changed"
+#define LIVES_WIDGET_ACCEPT_POSITION_SIGNAL "accept-position"
+#define LIVES_WIDGET_SWITCH_PAGE_SIGNAL "switch-page"
+#define LIVES_WIDGET_UNMAP_SIGNAL "unmap"
+#define LIVES_WIDGET_EDITED_SIGNAL "edited"
+#define LIVES_WIDGET_COLOR_SET_SIGNAL "color-set"
+#define LIVES_WIDGET_SET_FOCUS_CHILD_SIGNAL "set-focus-child"
 
-#define LIVES_WIDGET_SCROLL_EVENT "scroll_event"
-#define LIVES_WIDGET_CLICKED_EVENT "clicked"
-#define LIVES_WIDGET_TOGGLED_EVENT "toggled"
-#define LIVES_WIDGET_CHANGED_EVENT "changed"
-#define LIVES_WIDGET_ACTIVATE_EVENT "activate"
-#define LIVES_WIDGET_VALUE_CHANGED_EVENT "value-changed"
+#if GTK_CHECK_VERSION(3,0,0)
+#define LIVES_WIDGET_STATE_CHANGED_SIGNAL "state-flags-changed"
+#else
+#define LIVES_WIDGET_STATE_CHANGED_SIGNAL "state-changed"
+#endif
 
 
 typedef GtkWidget                         LiVESWidget;
@@ -238,6 +396,15 @@
 
 typedef GtkProgressBar                    LiVESProgressBar;
 
+typedef GtkAboutDialog                    LiVESAboutDialog;
+
+#define LIVES_COL_TYPE_STRING G_TYPE_STRING
+#define LIVES_COL_TYPE_INT G_TYPE_INT
+#define LIVES_COL_TYPE_UINT G_TYPE_UINT
+#define LIVES_COL_TYPE_BOOLEAN G_TYPE_BOOLEAN
+#define LIVES_COL_TYPE_PIXBUF GDK_TYPE_PIXBUF
+
+
 typedef GtkTreeView                       LiVESTreeView;
 typedef GtkTreeViewColumn                 LiVESTreeViewColumn;
 
@@ -253,10 +420,12 @@
 typedef GtkTreePath                       LiVESTreePath;
 typedef GtkTreeStore                      LiVESTreeStore;
 typedef GtkTreeSelection                  LiVESTreeSelection;
+typedef GtkListStore                      LiVESListStore;
 
 
 typedef GtkScrolledWindow                 LiVESScrolledWindow;
 typedef GtkScrollbar                      LiVESScrollbar;
+typedef GtkHScrollbar                     LiVESHScrollbar;
 typedef GtkToolbar                        LiVESToolbar;
 typedef GtkToolItem                       LiVESToolItem;
 
@@ -317,7 +486,7 @@
 #endif
 
 
-typedef GtkResponseType LiVESResponseType;
+typedef int LiVESResponseType;
 #define LIVES_RESPONSE_NONE GTK_RESPONSE_NONE
 #define LIVES_RESPONSE_OK GTK_RESPONSE_OK
 #define LIVES_RESPONSE_CANCEL GTK_RESPONSE_CANCEL
@@ -327,7 +496,10 @@
 
 // positive values for custom responses
 #define LIVES_RESPONSE_INVALID 0
-#define LIVES_RESPONSE_SHOW_DETAILS 1
+#define LIVES_RESPONSE_RETRY 1
+#define LIVES_RESPONSE_ABORT 2
+#define LIVES_RESPONSE_RESET 3
+#define LIVES_RESPONSE_SHOW_DETAILS 4
 
 
 typedef GtkAttachOptions LiVESAttachOptions;
@@ -341,6 +513,19 @@
 #define LIVES_WINDOW_POPUP GTK_WINDOW_POPUP
 
 
+typedef GtkDialogFlags LiVESDialogFlags;
+
+typedef GtkMessageType LiVESMessageType;
+#define LIVES_MESSAGE_INFO GTK_MESSAGE_INFO
+#define LIVES_MESSAGE_WARNING GTK_MESSAGE_WARNING
+#define LIVES_MESSAGE_QUESTION GTK_MESSAGE_QUESTION
+#define LIVES_MESSAGE_ERROR GTK_MESSAGE_ERROR
+#define LIVES_MESSAGE_OTHER GTK_MESSAGE_OTHER
+
+typedef GtkButtonsType LiVESButtonsType;
+#define LIVES_BUTTONS_NONE GTK_BUTTONS_NONE
+
+
 typedef GtkFileChooserAction LiVESFileChooserAction;
 #define LIVES_FILE_CHOOSER_ACTION_OPEN GTK_FILE_CHOOSER_ACTION_OPEN
 #define LIVES_FILE_CHOOSER_ACTION_SAVE GTK_FILE_CHOOSER_ACTION_SAVE
@@ -394,7 +579,7 @@
 #define LIVES_RELIEF_NONE GTK_RELIEF_NONE
 
 #define LIVES_ACCEL_VISIBLE GTK_ACCEL_VISIBLE
-  
+
 typedef GtkToolbarStyle LiVESToolbarStyle;
 #define LIVES_TOOLBAR_ICONS GTK_TOOLBAR_ICONS
 #define LIVES_TOOLBAR_TEXT  GTK_TOOLBAR_TEXT
@@ -438,6 +623,11 @@
 #define LIVES_SUBSTRUCTURE_MASK GDK_SUBSTRUCTURE_MASK
 #define LIVES_SCROLL_MASK GDK_SCROLL_MASK
 
+
+#define LIVES_BUTTON_PRESS GDK_BUTTON_PRESS
+#define LIVES_BUTTON_RELEASE GDK_BUTTON_RELEASE
+#define LIVES_BUTTON2_PRESS GDK_2BUTTON_PRESS
+
 #if GTK_CHECK_VERSION(3,4,0)
 #define LIVES_TOUCH_MASK GDK_TOUCH_MASK
 #define LIVES_SMOOTH_SCROLL_MASK GDK_SMOOTH_SCROLL_MASK
@@ -486,6 +676,10 @@
 
 typedef GtkRequisition                    LiVESRequisition;
 
+typedef GtkPaned                          LiVESPaned;
+
+typedef GtkScale                          LiVESScale;
+
 typedef GdkPixbufDestroyNotify            LiVESPixbufDestroyNotify;
 
 typedef GdkInterpType                     LiVESInterpType;
@@ -502,6 +696,8 @@
 #define LIVES_BIN(widget) GTK_BIN(widget)
 #define LIVES_ADJUSTMENT(widget) GTK_ADJUSTMENT(widget)
 #define LIVES_DIALOG(widget) GTK_DIALOG(widget)
+#define LIVES_SCALE(widget) GTK_SCALE(widget)
+#define LIVES_PANED(widget) GTK_PANED(widget)
 #define LIVES_COMBO(widget) GTK_COMBO_BOX(widget)
 #define LIVES_COMBO_BOX(widget) GTK_COMBO_BOX(widget)
 #define LIVES_BUTTON(widget) GTK_BUTTON(widget)
@@ -547,6 +743,8 @@
 #define LIVES_TREE_VIEW(widget) GTK_TREE_VIEW(widget)
 #define LIVES_TREE_MODEL(object) GTK_TREE_MODEL(object)
 
+#define LIVES_LIST_STORE(object) GTK_LIST_STORE(object)
+
 #define LIVES_ACCEL_GROUP(object) GTK_ACCEL_GROUP(object)
 
 
@@ -588,6 +786,7 @@
 
 #define LIVES_XEVENT(event) GDK_EVENT(event)
 
+#define LIVES_IS_WIDGET_OBJECT(object) G_IS_OBJECT(object)
 #define LIVES_IS_WIDGET(widget) GTK_IS_WIDGET(widget)
 #define LIVES_IS_WINDOW(widget) GTK_IS_WINDOW(widget)
 #define LIVES_IS_XWINDOW(widget) GDK_IS_WINDOW(widget)
@@ -611,7 +810,10 @@
 #define LIVES_IS_IMAGE(widget) GTK_IS_IMAGE(widget)
 #define LIVES_IS_ENTRY(widget) GTK_IS_ENTRY(widget)
 #define LIVES_IS_RANGE(widget) GTK_IS_RANGE(widget)
+#define LIVES_IS_PROGRESS_BAR(widget) GTK_IS_PROGRESS_BAR(widget)
 #define LIVES_IS_TEXT_VIEW(widget) GTK_IS_TEXT_VIEW(widget)
+#define LIVES_IS_MENU_ITEM(widget) GTK_IS_MENU_ITEM(widget)
+#define LIVES_IS_FILE_CHOOSER(widget) GTK_IS_FILE_CHOOSER(widget)
 
 // (image resize) interpolation types
 #define LIVES_INTERP_BEST   GDK_INTERP_HYPER
@@ -707,9 +909,6 @@
 #endif
 
 
-
-typedef GdkModifierType LiVESXModifierType;
-
 #define LIVES_CONTROL_MASK GDK_CONTROL_MASK
 #define LIVES_ALT_MASK     GDK_MOD1_MASK
 #define LIVES_SHIFT_MASK   GDK_SHIFT_MASK
@@ -863,8 +1062,24 @@
 
 #endif
 
-#define LIVES_INT_TO_POINTER GINT_TO_POINTER
-#define LIVES_POINTER_TO_INT GPOINTER_TO_INT
+#define LIVES_INT_TO_POINTER  GINT_TO_POINTER
+#define LIVES_UINT_TO_POINTER GUINT_TO_POINTER
+#define LIVES_POINTER_TO_INT  GPOINTER_TO_INT
+
+// pango stuff
+typedef PangoLayout LingoLayout;
+#define lingo_layout_set_alignment(a,b) pango_layout_set_alignment(a,b)
+
+#define LINGO_ALIGN_LEFT PANGO_ALIGN_LEFT
+#define LINGO_ALIGN_RIGHT PANGO_ALIGN_RIGHT
+#define LINGO_ALIGN_CENTER PANGO_ALIGN_CENTER
+
+#define lingo_layout_set_text(a,b,c) pango_layout_set_text(a,b,c)
+#define lingo_painter_show_layout(a,b) pango_cairo_show_layout(a,b)
+
+#define lingo_layout_get_size(a,b,c,d,e) pango_layout_get_size(a,b,c)
+
+#define LINGO_SCALE PANGO_SCALE
 
 #endif

LiVES-2.2.8.tar.bz2/src/widget-helper-qt.h -> LiVES-2.4.1.tar.bz2/src/widget-helper-qt.h Changed

@@ -16,6 +16,11 @@
 #ifdef GUI_QT
 // just for testing !!!!
 
+
+#ifdef HAVE_X11
+#include <X11/Xlib.h>
+#endif
+
 using namespace std;
 
 #include <QtCore/QLinkedList>
@@ -26,8 +31,23 @@
 #include <QtGui/QTextDocumentFragment>
 #include <QtGui/QShortcutEvent>
 #include <QtGui/QWheelEvent>
-
+#include <QtGui/QImageWriter>
+#include <QtGui/QImageReader>
+#include <QtCore/QDebug>
+#include <QtCore/QTime>
+#include <QtGui/QFont>
+#include <QtGui/QFontDatabase>
+#include <QtCore/QStandardPaths>
+#include <QtCore/QLocale>
+#include <QtCore/QMutableLinkedListIterator>
+
+#include <QtWidgets/QApplication>
+#include <QtWidgets/QDesktopWidget>
+#include <QtWidgets/QCompleter>
 #include <QtWidgets/QLabel>
+#include <QtWidgets/QColorDialog>
+#include <QtWidgets/QWidget>
+#include <QtWidgets/QWidgetAction>
 #include <QtWidgets/QStyledItemDelegate>
 #include <QtWidgets/QHeaderView>
 #include <QtWidgets/QSplitter>
@@ -37,10 +57,12 @@
 #include <QtWidgets/QToolBar>
 #include <QtWidgets/QTableWidget>
 #include <QtWidgets/QDialog>
+#include <QtWidgets/QMessageBox>
 #include <QtWidgets/QDialogButtonBox>
 #include <QtWidgets/QBoxLayout>
 #include <QtWidgets/QComboBox>
 #include <QtWidgets/QMenu>
+#include <QtWidgets/QMenuBar>
 #include <QtWidgets/QLabel>
 #include <QtWidgets/QMainWindow>
 #include <QtWidgets/QFileDialog>
@@ -55,51 +77,411 @@
 #include <QtWidgets/QShortcut>
 #include <QtWidgets/QGridLayout>
 #include <QtWidgets/QFrame>
+#include <QtWidgets/QGroupBox>
 #include <QtWidgets/QScrollArea>
 #include <QtWidgets/QScrollBar>
 
 #include <QtGui/QColor>
 #include <QtCore/QAbstractItemModel>
+#include <QtWidgets/QAbstractSlider>
+#include <QtWidgets/QAbstractButton>
 #include <QtCore/QSharedPointer>
 #include <QtGui/QStandardItemModel>
 #include <QtCore/QModelIndex>
+#include <QtCore/QTimer>
+#include <QtCore/QThread>
+#include <QtCore/QProcess>
+#include <QtCore/QAbstractNativeEventFilter>
+#include <QtCore/QCoreApplication>
+
+QApplication *qapp;
+QTime *qtime;
+
+#define GTK_CHECK_VERSION(a,b,c) 1
+
+#define LIVES_LITTLE_ENDIAN 0
+#define LIVES_BIG_ENDIAN 1
+
+#define LIVES_MAXINT INT_MAX
+#define LIVES_MAXUINT32 UINT32_MAX
+#define LIVES_MAXSIZE SIZE_MAX
+#define LIVES_MAXFLOAT FLT_MAX
+
+#define LIVES_UNLIKELY(a) Q_UNLIKELY(a)
+#define LIVES_LIKELY(a) Q_LIKELY(a)
 
-#define GTK_CHECK_VERSION(a,b,c) 0
+#define MAX_CURSOR_WIDTH 32
+
+#define G_GNUC_MALLOC
+#define G_GNUC_PURE
+#define G_GNUC_CONST
+
+typedef void                             *livespointer;
+typedef const void                       *livesconstpointer;
+
+#define LIVES_INT_TO_POINTER(a) lives_int_to_pointer(a)
+#define LIVES_UINT_TO_POINTER(a) lives_uint_to_pointer(a)
+#define LIVES_POINTER_TO_INT(a) lives_pointer_to_int(a)
+
+LIVES_INLINE livespointer lives_int_to_pointer(int32_t a) {
+  return (livespointer)a;
+}
+
+LIVES_INLINE livespointer lives_uint_to_pointer(uint32_t a) {
+  return (livespointer)a;
+}
+
+LIVES_INLINE int32_t lives_pointer_to_int(livesconstpointer p) {
+  uint64_t xint = (uint64_t)p;
+  return (int32_t)(xint & 0xFFFF);
+}
+
+typedef struct {
+  livespointer(*malloc)(size_t    n_bytes);
+  livespointer(*realloc)(livespointer mem,
+                         size_t    n_bytes);
+  void (*free)(livespointer mem);
+  /* optional; set to NULL if not used ! */
+  livespointer(*calloc)(size_t    n_blocks,
+                        size_t    n_block_bytes);
+  livespointer(*try_malloc)(size_t    n_bytes);
+  livespointer(*try_realloc)(livespointer mem,
+                             size_t    n_bytes);
+} LiVESMemVTable;
+
+LiVESMemVTable *static_alt_vtable;
+
+void (*lives_free)(livespointer ptr);
+livespointer(*lives_malloc)(size_t size);
+livespointer(*lives_realloc)(livespointer ptr, size_t new_size);
+livespointer(*lives_try_malloc)(size_t size);
+livespointer(*lives_try_realloc)(livespointer ptr, size_t new_size);
+livespointer(_lives_calloc)(size_t n_blocks, size_t n_block_bytes);
+
+
+livespointer malloc_wrapper(size_t size) {
+  livespointer ptr = (static_alt_vtable->malloc)(size);
+  Q_ASSERT(ptr != NULL);
+  return ptr;
+}
+
+
+livespointer realloc_wrapper(livespointer old_ptr, size_t new_size) {
+  livespointer ptr = (static_alt_vtable->realloc)(old_ptr,new_size);
+  Q_ASSERT(ptr != NULL);
+  return ptr;
+}
+
+
+livespointer try_malloc_wrapper(size_t size) {
+  return (static_alt_vtable->malloc)(size);
+}
+
+
+livespointer try_realloc_wrapper(livespointer old_ptr, size_t new_size) {
+  return (static_alt_vtable->realloc)(old_ptr,new_size);
+}
+
+
+LIVES_INLINE livespointer lives_malloc0(size_t size) {
+  livespointer ptr = (static_alt_vtable->calloc)(1,size);
+  Q_ASSERT(ptr != NULL);
+  return ptr;
+}
+
+
+LIVES_INLINE livespointer lives_try_malloc0(size_t size) {
+  return (static_alt_vtable->calloc)(1,size);
+}
+
+
+LIVES_INLINE livespointer lives_try_malloc0_n(size_t nmemb, size_t nmemb_bytes) {
+  return (static_alt_vtable->calloc)(nmemb,nmemb_bytes);
+}
 
-#define g_free(a) lives_free(a)
 
-typedef char gchar;
 
 #define NO_GTK
 #include "support.h"
 
+extern char *trString;
+
 // TODO - move to support.c
 char *translate(const char *String) {
   delete trString; // be very careful, as trString is free()d automatically here
   if (strlen(String)) {
-    QString qs = QString::fromLocal8Bit(dgettext (PACKAGE, String));
+    QString qs = QString::fromLocal8Bit(dgettext(PACKAGE, String));
     trString = strdup(qs.toUtf8().constData());
-  }
-  else trString=strdup(String);
+  } else trString=strdup(String);
   return trString;
 }
 
 char *translate_with_plural(const char *String, const char *StringPlural, unsigned long int n) {
   delete trString; // be very careful, as trString is free()d automatically here
   if (strlen(String)) {
-    QString qs = QString::fromLocal8Bit(dngettext (PACKAGE, String, StringPlural, n));
+    QString qs = QString::fromLocal8Bit(dngettext(PACKAGE, String, StringPlural, n));
     trString = strdup(qs.toUtf8().constData());
-  }
-  else trString=strdup(String);
+  } else trString=strdup(String);
   return trString;
 }
 
-//////////////////
+
+int lives_printerr(const char *format, ...) {
+  char *buff;
+  va_list args;
+  va_start(args, format);
+  int r = vasprintf(&buff, format, args);
+  va_end(args);
+  qDebug() << buff;
+  free(buff);
+  return r;
+}
+
+
+
+#define lives_strdup(a) strdup(a)
+#define lives_strndup(a,b) strndup(a,b)
+
+char *lives_strdup_printf(const char *format, ...) {
+  char *buff;
+  va_list args;
+  va_start(args, format);
+  int r = vasprintf(&buff, format, args);
+  r = r;
+  va_end(args);
+  return buff;
+}
+
+int lives_snprintf(char *buff, size_t len, const char *format, ...) {
+  va_list args;
+  va_start(args, format);
+  int r = vsnprintf(buff, len, format, args);
+  va_end(args);
+  return r;
+}
+
+
+void lives_strfreev(char **str_array) {
+  if (str_array) {
+    for (int i = 0; str_array[i] != NULL; i++)
+      lives_free(str_array[i]);
+    lives_free(str_array);
+  }
+}
+
+#define ISUPPER(c) ((c) >= 'A' && (c) <= 'Z')
+#define TOLOWER(c) (ISUPPER (c) ? (c) - 'A' + 'a' : (c))
+
+int lives_ascii_strcasecmp(const char *s1, const char *s2) {
+  int c1, c2;
+
+  while (*s1 && *s2) {
+    c1 = (int)(uint8_t) TOLOWER(*s1);
+    c2 = (int)(uint8_t) TOLOWER(*s2);
+    if (c1 != c2)
+      return (c1 - c2);
+    s1++;
+    s2++;
+  }
+  return (((int)(uint8_t) *s1) - ((int)(uint8_t) *s2));
+}
+
+
+int lives_ascii_strncasecmp(const char *s1, const char *s2, size_t len) {
+  int c1, c2;
+
+  while (len && *s1 && *s2) {
+    len--;
+    c1 = (int)(uint8_t) TOLOWER(*s1);
+    c2 = (int)(uint8_t) TOLOWER(*s2);
+    if (c1 != c2)
+      return (c1 - c2);
+    s1++;
+    s2++;
+  }
+  if (len) return (((int)(uint8_t) *s1) - ((int)(uint8_t) *s2));
+  else return 0;
+}
+
+
+char *lives_strconcat(const char *string1, ...) {
+  size_t l;
+  va_list args;
+  char *s;
+  char *concat;
+  char *ptr;
+  if (!string1)
+    return NULL;
+  l = 1 + strlen(string1);
+  va_start(args, string1);
+  s = va_arg(args, char *);
+  while (s) {
+    l += strlen(s);
+    s = va_arg(args, char *);
+  }
+  va_end(args);
+  concat = (char *)malloc(l);
+  ptr = concat;
+  ptr = stpcpy(ptr, string1);
+  va_start(args, string1);
+  s = va_arg(args, char *);
+  while (s) {
+    ptr = stpcpy(ptr, s);
+    s = va_arg(args, char *);
+  }
+  va_end(args);
+  return concat;
+}
+
+
+
+char *lives_build_filename(const char *first, ...) {
+  char *fname = strdup(""), *tmp;
+  char *piece;
+  char sep = '/';
+  va_list args;
+
+#ifdef IS_MINGW
+  va_start(args, first);
+  while (1) {
+    piece = va_arg(args, char *);
+    if (piece == NULL) break;
+    if (strstr(piece,"\\")) {
+      sep = '\\';
+      break;
+    }
+  }
+  va_end(args);
+#endif
+
+  va_start(args, first);
+  while (1) {
+    piece = va_arg(args, char *);
+    if (piece == NULL) break;
+    tmp = lives_strdup_printf("%s%s%s",fname,sep,piece);
+    lives_free(fname);
+    fname = tmp;
+  }
+  va_end(args);
+
+  QString qs(fname);
+  lives_free(fname);
+#ifdef IS_MINGW
+  fname = strdup(QDir::cleanPath(qs).toUtf8().constData());
+#else
+  fname = strdup(QDir::cleanPath(qs).toLocal8Bit().constData());
+#endif
+  return fname;
+}
+
+
+char *lives_strstrip(char *string) {
+  QString qs = QString::fromUtf8(string);
+  qs.trimmed();
+  memcpy(string,qs.toUtf8().constData(),qs.toUtf8().size());
+  return string;
+}
+
+
+char *lives_strrstr(const char *haystack, const char *needle) {
+  size_t i;
+  size_t needle_len;
+  size_t haystack_len;
+  const char *p;
+  needle_len = strlen(needle);
+  haystack_len = strlen(haystack);
+  if (needle_len == 0)
+    return (char *)haystack;
+  if (haystack_len < needle_len)
+    return NULL;
+  p = haystack + haystack_len - needle_len;
+  while (p >= haystack) {
+    for (i = 0; i < needle_len; i++)
+      if (p[i] != needle[i])
+        goto next;
+    return (char *)p;
+next:
+    p--;
+  }
+  return NULL;
+}
+
+
+
+LIVES_INLINE char *lives_filename_to_utf8(const char *ostr, ssize_t len, size_t *bytes_read, size_t *bytes_written, void *error) {
+#ifndef IS_MINGW
+  QString qs = QString::fromLocal8Bit(ostr);
+  return strdup(qs.toUtf8().constData());
+#endif
+  return strdup(ostr);
+}
+
+
+LIVES_INLINE char *lives_filename_from_utf8(const char *ostr, ssize_t len, size_t *bytes_read, size_t *bytes_written, void *error) {
+#ifndef IS_MINGW
+  QString qs = QString::fromUtf8(ostr);
+  return strdup(qs.toLocal8Bit().constData());
+#endif
+  return strdup(ostr);
+}
+
+
+#ifndef IS_MINGW
+#define LIVES_DIR_SEPARATOR_S "/"
+#else
+#define LIVES_DIR_SEPARATOR_S "\\"
+#endif
+
+char *L2U8(const char *local_string) {
+#ifndef IS_MINGW
+  QString qs = QString::fromLocal8Bit(local_string);
+  return strdup(qs.toUtf8().constData());
+#else
+  return local_string;
+#endif
+}
+
+char *U82L(const char *utf8_string) {
+#ifndef IS_MINGW
+  QString qs = QString::fromUtf8(utf8_string);
+  return strdup(qs.toLocal8Bit().constData());
+#else
+  return utf8_string;
+#endif
+}
+
+
+char *lives_utf8_strdown(char *string, size_t len) {
+  QString qs = QString::fromUtf8(string);
+  qs.toLower();
+  return strdup(qs.toUtf8().constData());
+}
+
+
+
+#define ABS(a) qAbs(a)
+
+
+char *lives_find_program_in_path(const char *prog) {
+  QString qs = QStandardPaths::findExecutable(prog);
+  if (qs == "") return NULL;
+  return strdup(qs.toLocal8Bit().constData());
+}
+
+
+
+
+
 
 #ifndef IS_MINGW
 typedef bool                          boolean;
 #endif
 
+
+typedef boolean(*LiVESWidgetSourceFunc)(livespointer data);
+
+typedef int (*LiVESCompareFunc)(livesconstpointer a, livesconstpointer b);
+
 #ifndef FALSE
 #define FALSE false
 #endif
@@ -108,33 +490,159 @@
 #define TRUE true
 #endif
 
-typedef void*                             gpointer;  // TODO
-typedef void*                             livespointer;
 
-typedef int                               gint;
-typedef uchar                             guchar;
-  
-typedef void *(*LiVESPixbufDestroyNotify(uchar *, void *));
+extern "C" {
+  uint32_t lives_timer_add(uint32_t interval, LiVESWidgetSourceFunc function, livespointer data);
+}
+
+#define G_PRIORITY_LOW 0
+#define G_PRIORITY_HIGH 1
+
+LIVES_INLINE uint32_t lives_idle_add_full(int prio, LiVESWidgetSourceFunc function, livespointer data, livespointer destnot) {
+  return lives_timer_add(0, function, data);
+}
+
+
+LIVES_INLINE uint32_t lives_idle_add(LiVESWidgetSourceFunc function, livespointer data) {
+  return lives_timer_add(0, function, data);
+}
+
+/// TODO
+#define g_object_freeze_notify(a) (a)
+#define g_object_thaw_notify(a) (a)
+
+
+LIVES_INLINE void lives_set_application_name(const char *name) {
+  qapp->setApplicationName(QString::fromUtf8(name));
+}
+
+
+LIVES_INLINE const char *lives_get_application_name() {
+  return qapp->applicationName().toLocal8Bit().constData();
+}
+
+
+class SleeperThread : public QThread {
+public:
+  static void msleep(unsigned long msecs) {
+    QThread::msleep(msecs);
+  }
+};
+
+LIVES_INLINE void lives_usleep(ulong microsec) {
+  SleeperThread::msleep(microsec);
+}
+
+
+LIVES_INLINE int lives_mkdir_with_parents(const char *name, int mode) {
+#ifndef IS_MINGW
+  mode_t omask = umask(mode);
+#endif
+  QString qs = QString::fromUtf8(name);
+  QDir qd = QDir(qs);
+  bool ret = qd.mkpath(qs);
+#ifndef IS_MINGW
+  umask(omask);
+#endif
+  if (!ret) return -1;
+  return 0;
+}
+
+#define lives_strtod(a,b) strtod(a,b)
+
+char *lives_path_get_basename(const char *path) {
+  QFileInfo qf(path);
+  QString qs = qf.fileName();
+  return strdup(qs.toUtf8().constData());
+}
+
+char *lives_path_get_dirname(const char *path) {
+  QFileInfo qf(path);
+  QDir dir = qf.dir();
+  QString qs = dir.path();
+  return strdup(qs.toUtf8().constData());
+}
+
+
+typedef int LiVESFileTest;
+#define LIVES_FILE_TEST_EXISTS 1
+#define LIVES_FILE_TEST_IS_DIR 2
+#define LIVES_FILE_TEST_IS_REGULAR 3
+
+
+boolean lives_file_test(const char *fname, LiVESFileTest test) {
+  QFileInfo qf(fname);
+  if (test == LIVES_FILE_TEST_EXISTS) {
+    return qf.exists();
+  }
+  if (test == LIVES_FILE_TEST_IS_DIR) {
+    return qf.isDir();
+  }
+  if (test == LIVES_FILE_TEST_IS_REGULAR) {
+    return qf.isFile();
+  }
+  return FALSE;
+}
+
+
+char *lives_get_current_dir() {
+  QString qs = QDir::current().path();
+#ifdef IS_MINGW
+  return strdup(qs.toUtf8().constData());
+#else
+  return strdup(qs.toLocal8Bit().constData());
+#endif
+
+}
+
+typedef struct {
+  ulong function;
+  livespointer data;
+} LiVESClosure;
+
+typedef LiVESClosure LiVESWidgetClosure;
+
+
+
+//////////////////
+
+
+typedef void (*LiVESPixbufDestroyNotify)(uchar *, livespointer);
 
 
 typedef int                               lives_painter_content_t;
 
-typedef gpointer                          livespointer;
-typedef ulong                             gulong;
 
-typedef void GError;
-typedef void LiVESError;
+
+typedef struct {
+  int code;
+  char *message;
+} LiVESError;
+
+
+LIVES_INLINE void lives_error_free(LiVESError *error) {
+  if (error->message != NULL) free(error->message);
+  free(error);
+}
+
+#define lives_strerror(a) strerror(a)
+
 
 typedef QScreen LiVESXScreen;
 typedef QScreen LiVESXDisplay;
-typedef QScreen GdkDisplay;
 typedef QScreen LiVESXDevice;
 
-//#define LIVES_TABLE_IS_GRID 1
+#ifndef HAVE_X11
+typedef WId Window;
+#endif
 
+typedef QFile LiVESIOChannel;
+
+
+
+//#define LIVES_TABLE_IS_GRID 1 // no "remove row" available
 
 
-typedef void PangoLayout; // TODO - replace
 
 typedef QStyle::StateFlag LiVESWidgetState;
 
@@ -155,12 +663,12 @@
 #define LIVES_WIDGET_COLOR_SCALE_255(x) ((double)x/255.) ///< macro to convert from (0. - 255.) to component
 
 
-typedef Qt::Modifier LiVESXModifierType;
+typedef Qt::KeyboardModifiers LiVESXModifierType;
 
-#define LIVES_CONTROL_MASK Qt::CTRL
-#define LIVES_ALT_MASK     Qt::ALT
-#define LIVES_SHIFT_MASK   Qt::SHIFT
-#define LIVES_LOCK_MASK    Qt::SHIFT
+#define LIVES_CONTROL_MASK Qt::ControlModifier
+#define LIVES_ALT_MASK     Qt::AltModifier
+#define LIVES_SHIFT_MASK   Qt::ShiftModifier
+#define LIVES_LOCK_MASK    Qt::ShiftModifier
 
 
 #define LIVES_KEY_Left (static_cast<uint32_t>(Qt::Key_Left))
@@ -190,32 +698,32 @@
 #define LIVES_KEY_9 (static_cast<uint32_t>(Qt::Key_9))
 #define LIVES_KEY_0 (static_cast<uint32_t>(Qt::Key_0))
 
-#define LIVES_KEY_a (static_cast<uint32_t>(Qt::Key_a))
-#define LIVES_KEY_b (static_cast<uint32_t>(Qt::Key_b))
-#define LIVES_KEY_c (static_cast<uint32_t>(Qt::Key_c))
-#define LIVES_KEY_d (static_cast<uint32_t>(Qt::Key_d))
-#define LIVES_KEY_e (static_cast<uint32_t>(Qt::Key_e))
-#define LIVES_KEY_f (static_cast<uint32_t>(Qt::Key_f))
-#define LIVES_KEY_g (static_cast<uint32_t>(Qt::Key_g))
-#define LIVES_KEY_h (static_cast<uint32_t>(Qt::Key_h))
-#define LIVES_KEY_i (static_cast<uint32_t>(Qt::Key_i))
-#define LIVES_KEY_j (static_cast<uint32_t>(Qt::Key_j))
-#define LIVES_KEY_k (static_cast<uint32_t>(Qt::Key_k))
-#define LIVES_KEY_l (static_cast<uint32_t>(Qt::Key_l))
-#define LIVES_KEY_m (static_cast<uint32_t>(Qt::Key_m))
-#define LIVES_KEY_n (static_cast<uint32_t>(Qt::Key_n))
-#define LIVES_KEY_o (static_cast<uint32_t>(Qt::Key_o))
-#define LIVES_KEY_p (static_cast<uint32_t>(Qt::Key_p))
-#define LIVES_KEY_q (static_cast<uint32_t>(Qt::Key_q))
-#define LIVES_KEY_r (static_cast<uint32_t>(Qt::Key_r))
-#define LIVES_KEY_s (static_cast<uint32_t>(Qt::Key_s))
-#define LIVES_KEY_t (static_cast<uint32_t>(Qt::Key_t))
-#define LIVES_KEY_u (static_cast<uint32_t>(Qt::Key_u))
-#define LIVES_KEY_v (static_cast<uint32_t>(Qt::Key_v))
-#define LIVES_KEY_w (static_cast<uint32_t>(Qt::Key_w))
-#define LIVES_KEY_x (static_cast<uint32_t>(Qt::Key_x))
-#define LIVES_KEY_y (static_cast<uint32_t>(Qt::Key_y))
-#define LIVES_KEY_z (static_cast<uint32_t>(Qt::Key_z))
+#define LIVES_KEY_a (static_cast<uint32_t>(Qt::Key_A))
+#define LIVES_KEY_b (static_cast<uint32_t>(Qt::Key_B))
+#define LIVES_KEY_c (static_cast<uint32_t>(Qt::Key_C))
+#define LIVES_KEY_d (static_cast<uint32_t>(Qt::Key_D))
+#define LIVES_KEY_e (static_cast<uint32_t>(Qt::Key_E))
+#define LIVES_KEY_f (static_cast<uint32_t>(Qt::Key_F))
+#define LIVES_KEY_g (static_cast<uint32_t>(Qt::Key_G))
+#define LIVES_KEY_h (static_cast<uint32_t>(Qt::Key_H))
+#define LIVES_KEY_i (static_cast<uint32_t>(Qt::Key_I))
+#define LIVES_KEY_j (static_cast<uint32_t>(Qt::Key_J))
+#define LIVES_KEY_k (static_cast<uint32_t>(Qt::Key_K))
+#define LIVES_KEY_l (static_cast<uint32_t>(Qt::Key_L))
+#define LIVES_KEY_m (static_cast<uint32_t>(Qt::Key_M))
+#define LIVES_KEY_n (static_cast<uint32_t>(Qt::Key_N))
+#define LIVES_KEY_o (static_cast<uint32_t>(Qt::Key_O))
+#define LIVES_KEY_p (static_cast<uint32_t>(Qt::Key_P))
+#define LIVES_KEY_q (static_cast<uint32_t>(Qt::Key_Q))
+#define LIVES_KEY_r (static_cast<uint32_t>(Qt::Key_R))
+#define LIVES_KEY_s (static_cast<uint32_t>(Qt::Key_S))
+#define LIVES_KEY_t (static_cast<uint32_t>(Qt::Key_T))
+#define LIVES_KEY_u (static_cast<uint32_t>(Qt::Key_U))
+#define LIVES_KEY_v (static_cast<uint32_t>(Qt::Key_V))
+#define LIVES_KEY_w (static_cast<uint32_t>(Qt::Key_W))
+#define LIVES_KEY_x (static_cast<uint32_t>(Qt::Key_X))
+#define LIVES_KEY_y (static_cast<uint32_t>(Qt::Key_Y))
+#define LIVES_KEY_z (static_cast<uint32_t>(Qt::Key_Z))
 
 #define LIVES_KEY_F1 (static_cast<uint32_t>(Qt::Key_F1))
 #define LIVES_KEY_F2 (static_cast<uint32_t>(Qt::Key_F2))
@@ -240,19 +748,13 @@
 typedef class LiVESAccelGroup LiVESAccelGroup;
 typedef class LiVESWidget LiVESWidget;
 
-typedef struct {
-  ulong function;
-  void *data;
-} LiVESClosure;
-
-typedef LiVESClosure LiVESWidgetClosure;
-typedef LiVESClosure LiVESWidgetSourceFunc;
-
 
-typedef QEvent LiVESXEvent;
-typedef Qt::MouseButton LiVESXEventButton;
+typedef void LiVESXEvent;
+typedef void LiVESXXEvent;
 typedef void LiVESXEventMotion;
-typedef QCursor LiVESXCursor; 
+typedef void LiVESXEventFocus;
+
+typedef QCursor LiVESXCursor;
 
 
 #define LIVES_SCROLL_UP   1
@@ -264,15 +766,68 @@
 } LiVESXEventScroll;
 
 
+typedef struct {
+  int x;
+  int y;
+  int width;
+  int height;
+} LiVESRect;
+
+
+typedef struct {
+  int count;
+  LiVESRect area;
+} LiVESXEventExpose;
+
+
+typedef struct {
+  int time;
+  int type;
+  int button;
+} LiVESXEventButton;
+
+#define LIVES_BUTTON_PRESS 1
+#define LIVES_BUTTON_RELEASE 2
+#define LIVES_BUTTON2_PRESS 3
+
+
+typedef void LiVESXEventCrossing;
+typedef void LiVESXEventConfigure;
+typedef void LiVESXEventDelete;
+
+
 typedef class LiVESObject LiVESObject;
 
-typedef void (*LiVESWidgetCallback) (LiVESWidget *widget, livespointer data);
-typedef boolean (*LiVESScrollEventCallback) (LiVESWidget *widget, LiVESXEventScroll *event, livespointer data);
-typedef boolean (*LiVESAccelCallback) (LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, livespointer data);
+typedef void (*LiVESWidgetCallback)(LiVESWidget *widget, livespointer data);
+
+LiVESClosure *lives_cclosure_new(ulong func, livespointer data, livespointer dest_func) {
+  LiVESClosure *cl = new LiVESClosure;
+  cl->function = (ulong)func;
+  cl->data = data;
+
+  return cl;
+  // TODO - something with dest_func: decref this when removed from accel, and call dest_func
+}
+
+typedef boolean(*LiVESScrollEventCallback)(LiVESWidget *widget, LiVESXEventScroll *, livespointer data);
+typedef boolean(*LiVESExposeEventCallback)(LiVESWidget *widget, LiVESXEventExpose *, livespointer data);
+typedef boolean(*LiVESEnterEventCallback)(LiVESWidget *widget, LiVESXEventCrossing *, livespointer data);
+typedef boolean(*LiVESButtonEventCallback)(LiVESWidget *widget, LiVESXEventButton *, livespointer data);
+typedef boolean(*LiVESConfigureEventCallback)(LiVESWidget *widget, LiVESXEventConfigure *, livespointer data);
+typedef boolean(*LiVESDeleteEventCallback)(LiVESWidget *widget, LiVESXEventDelete *, livespointer data);
+typedef boolean(*LiVESAccelCallback)(LiVESAccelGroup *group, LiVESObject *obj, uint32_t keyval, LiVESXModifierType mod, livespointer data);
 
 #define LIVES_GUI_CALLBACK(a) (ulong)(a)
 
 
+typedef void LiVESTargetEntry;
+
+typedef bool LiVESFilterReturn;
+
+#define LIVES_FILTER_REMOVE true
+#define LIVES_FILTER_CONTINUE false
+
+
 typedef struct {
   ulong handler_id; // set for signals, 0 for key accels
   QKeySequence ks;  // set for key accels
@@ -298,33 +853,10 @@
 } LiVESWidgetColor;
 
 
-
-typedef QList<const void *> LiVESSList;
-typedef LiVESSList LiVESList;
-typedef LiVESSList GSList;
-typedef LiVESList GList;
-
-LIVES_INLINE static const void *lives_slist_nth_data(LiVESSList *slist, uint32_t n) {
-  return slist->at(n);
+boolean return_true() {
+  return TRUE;
 }
 
-LIVES_INLINE static LiVESSList *lives_slist_remove(LiVESSList *slist, const void *data) {
-  slist->removeOne(data);
-  return slist;
-}
-
-LIVES_INLINE static LiVESSList *lives_slist_append(LiVESSList *slist, const void *data) {
-  slist->push_back(data);
-  return slist;
-}
-
-
-LIVES_INLINE static void lives_slist_free(LiVESSList *slist) {
-  delete slist;
-}
-
-#define g_list_free(a) lives_slist_free(a) // TODO
-
 
 typedef uint32_t LiVESEventMask;
 #define LIVES_EXPOSURE_MASK (1<<0)
@@ -356,8 +888,12 @@
 // events
 #define LIVES_WIDGET_EXPOSE_EVENT "update"
 #define LIVES_WIDGET_SCROLL_EVENT "scroll_event"
+#define LIVES_WIDGET_ENTER_EVENT "enter-event"
+#define LIVES_WIDGET_BUTTON_PRESS_EVENT "button-press-event"
+#define LIVES_WIDGET_CONFIGURE_EVENT "resize"
+#define LIVES_WIDGET_DELETE_EVENT "close-event"
 
-// TODO - add: "button_press_event", "motion_notify_event", "button_release_event", "enter-notify-event", "leave-notify-event", "drag-data-received", "delete-event", "configure-event", "expose_event", "state_flags_changed", "state_changed"
+// TODO - add: "motion_notify_event", "button_release_event", "leave-notify-event", "drag-data-received", "focus-out-event", "edited"
 
 
 // signals
@@ -367,21 +903,28 @@
 #define LIVES_WIDGET_ACTIVATE_EVENT "activate"
 #define LIVES_WIDGET_VALUE_CHANGED_EVENT "value-changed"
 #define LIVES_WIDGET_SELECTION_CHANGED_EVENT "selection-changed"
+#define LIVES_WIDGET_CURRENT_FOLDER_CHANGED_EVENT "current-folder-changed"
+#define LIVES_WIDGET_RESPONSE_EVENT "response"
 
-LiVESWidgetColor *lives_widget_color_copy(LiVESWidgetColor *c1orNULL, const LiVESWidgetColor *c2);
+// add "unmap", "color-set", "drag-data-received", "mode-changed", "accept-position", "edited", "set-focus-child", "state-changed", "switch-page", "size-prepared"
 
+extern "C" {
+  LiVESWidgetColor *lives_widget_color_copy(LiVESWidgetColor *c1orNULL, const LiVESWidgetColor *c2);
+}
 
 static QString make_col(LiVESWidgetColor *col) {
   QString qc = QString("rgba(%1,%2,%3,%4)")
-    .arg(col->red*255.)
-    .arg(col->green*255.)
-    .arg(col->blue*255.)
-    .arg(col->alpha*255.);
+               .arg(col->red*255.)
+               .arg(col->green*255.)
+               .arg(col->blue*255.)
+               .arg(col->alpha*255.);
   return qc;
 }
 
 
 typedef enum {
+  LIVES_OBJECT_TYPE_UNKNOWN,
+  LIVES_OBJECT_TYPE_TIMER,
   LIVES_WIDGET_TYPE_BUTTON,
   LIVES_WIDGET_TYPE_SPIN_BUTTON,
   LIVES_WIDGET_TYPE_RADIO_BUTTON,
@@ -393,68 +936,94 @@
   LIVES_WIDGET_TYPE_TEXT_VIEW,
   LIVES_WIDGET_TYPE_SCALE,
   LIVES_WIDGET_TYPE_SCROLLBAR,
+  LIVES_WIDGET_TYPE_SCROLLED_WINDOW,
   LIVES_WIDGET_TYPE_PROGRESS_BAR,
   LIVES_WIDGET_TYPE_PANED,
   LIVES_WIDGET_TYPE_MENU,
+  LIVES_WIDGET_TYPE_MENU_ITEM,
+  LIVES_WIDGET_TYPE_TOOL_ITEM,
+  LIVES_WIDGET_TYPE_RADIO_MENU_ITEM,
+  LIVES_WIDGET_TYPE_CHECK_MENU_ITEM,
+  LIVES_WIDGET_TYPE_MENU_TOOL_BUTTON,
+  LIVES_WIDGET_TYPE_MENU_BAR,
   LIVES_WIDGET_TYPE_ENTRY,
+  LIVES_WIDGET_TYPE_FRAME,
+  LIVES_WIDGET_TYPE_FILE_CHOOSER,
   LIVES_WIDGET_TYPE_ARROW,
   LIVES_WIDGET_TYPE_RULER,
   LIVES_WIDGET_TYPE_COMBO,
+  LIVES_WIDGET_TYPE_TABLE,
   LIVES_WIDGET_TYPE_DIALOG,
+  LIVES_WIDGET_TYPE_MESSAGE_DIALOG,
   LIVES_WIDGET_TYPE_ALIGNMENT,
   LIVES_WIDGET_TYPE_IMAGE,
   LIVES_WIDGET_TYPE_LABEL,
+  LIVES_WIDGET_TYPE_NOTEBOOK,
   LIVES_WIDGET_TYPE_TREE_VIEW,
   LIVES_WIDGET_TYPE_HSEPARATOR,
   LIVES_WIDGET_TYPE_VSEPARATOR,
   LIVES_WIDGET_TYPE_MAIN_WINDOW,
   LIVES_WIDGET_TYPE_SUB_WINDOW,
   LIVES_WIDGET_TYPE_EVENT_BOX,
+  LIVES_WIDGET_TYPE_DRAWING_AREA,
   LIVES_WIDGET_TYPE_HBOX,
   LIVES_WIDGET_TYPE_VBOX,
 } LiVESObjectType;
 
 
-LIVES_INLINE static QKeySequence make_qkey_sequence(uint32_t key, LiVESXModifierType mods) {
+LIVES_INLINE QKeySequence make_qkey_sequence(uint32_t key, LiVESXModifierType mods) {
   return static_cast<Qt::Key>(key) | mods;
 }
 
-LIVES_INLINE static uint32_t qkeysequence_get_key(QKeySequence ks) {
+LIVES_INLINE uint32_t qkeysequence_get_key(QKeySequence ks) {
   return ks[0] & 0x01FFFFFF;
 }
 
 
-LIVES_INLINE static LiVESXModifierType qkeysequence_get_mod(QKeySequence ks) {
-  return (LiVESXModifierType)(ks[0] & 0xF2000000);
+LIVES_INLINE LiVESXModifierType qkeysequence_get_mod(QKeySequence ks) {
+  return static_cast<LiVESXModifierType>(ks[0] & 0xF2000000);
 }
 
 
 class evFilter : public QObject {
- public:
+public:
 
- protected:
+protected:
   bool eventFilter(QObject *obj, QEvent *event);
 
 };
 
 
+#ifdef HAVE_X11
+
+class nevfilter : public QAbstractNativeEventFilter {
+public:
 
-class LiVESObject : public QObject {
+  virtual bool nativeEventFilter(const QByteArray &eventType, livespointer message, long *);
+
+};
+
+#endif
+
+class LiVESObject : public QWidget {
   Q_OBJECT
 
- public:
+public:
 
   void block_signal(ulong handler_id);
   void block_signals(const char *signame);
+  void block_signals(ulong func, livespointer data);
   void unblock_signal(ulong handler_id);
+  void unblock_signals(const char *signame);
+  void unblock_signals(ulong func, livespointer data);
   void disconnect_signal(ulong handler_id);
 
   void add_accel(LiVESAccel *accel);
-  void add_accel(ulong handler_id, const char *signal_name, ulong funcptr, gpointer data);
-  void add_accel(const char* signal_name, LiVESAccelGroup* group, uint32_t key, LiVESXModifierType mod, LiVESAccelFlags flags);
+  void add_accel(ulong handler_id, const char *signal_name, ulong funcptr, livespointer data);
+  void add_accel(const char *signal_name, LiVESAccelGroup *group, uint32_t key, LiVESXModifierType mod, LiVESAccelFlags flags);
 
   boolean remove_accel(LiVESAccel *accel);
-  boolean remove_accels(LiVESAccelGroup*, uint32_t key, LiVESXModifierType mod);
+  boolean remove_accels(LiVESAccelGroup *, uint32_t key, LiVESXModifierType mod);
 
   boolean remove_accel_group(LiVESAccelGroup *group);
   void add_accel_group(LiVESAccelGroup *group);
@@ -462,6 +1031,7 @@
   QList<LiVESAccelGroup *> get_accel_groups();
 
   QList<LiVESAccel *> get_accels_for(LiVESAccelGroup *group, QKeySequence ks);
+  QList<LiVESAccel *> get_accels_for(ulong func, livespointer data);
   QList<LiVESAccel *> get_accels_for(const char *signame);
   LiVESAccel *get_accel_for(ulong handler_id);
 
@@ -471,12 +1041,20 @@
   void remove_all_accels();
 
   LiVESObject() {
-    eFilter = new evFilter(); 
-    ((QObject *)this)->installEventFilter(eFilter);
-    refcount = 1;
+    init();
   };
 
 
+  LiVESObject(const LiVESObject &xobj) {
+    init();
+    type = xobj.type;
+  }
+
+  void ref_sink() {
+    if (floating) floating = false;
+    else inc_refcount();
+  }
+
   void inc_refcount() {
     refcount++;
   }
@@ -487,6 +1065,11 @@
     }
   }
 
+  void no_refcount() {
+    refcount = 0;
+  }
+
+
   void set_type(LiVESObjectType xtype) {
     type = xtype;
   }
@@ -495,16 +1078,23 @@
     return type;
   }
 
-
- private:
+private:
+  bool floating;
   int refcount;
   evFilter *eFilter;
   QList<LiVESAccel *>accels;
   QList<LiVESAccelGroup *>accel_groups;
   LiVESObjectType type;
 
+  void init() {
+    eFilter = new evFilter();
+    (static_cast<QObject *>(this))->installEventFilter(eFilter);
+    refcount = 1;
+    type = LIVES_OBJECT_TYPE_UNKNOWN;
+  }
+
   void finalise(void) {
-    ((QObject *)this)->deleteLater(); // schedule for deletion
+    (static_cast<QObject *>(this))->deleteLater(); // schedule for deletion
 
     // remove us from all accel_groups
     while (accel_groups.size() > 0) {
@@ -517,6 +1107,332 @@
 };
 
 
+typedef struct LiVESList LiVESList;
+
+struct LiVESList {
+  livesconstpointer data;
+  LiVESList *prev;
+  LiVESList *next;
+};
+
+
+typedef struct LiVESSList LiVESSList;
+
+struct LiVESSList {
+  livesconstpointer data;
+  LiVESSList *next;
+};
+
+typedef LiVESList LiVESDList;
+
+
+LIVES_INLINE livesconstpointer lives_list_nth_data(LiVESList *list, uint32_t n) {
+  for (unsigned int i = 0; i < n && list != NULL; i++) list = list->next;
+  if (list == NULL) return NULL;
+  livesconstpointer data = list->data;
+  return data;
+}
+
+LIVES_INLINE LiVESList *lives_list_nth(LiVESList *list, uint32_t n) {
+  for (unsigned int i = 0; i < n && list != NULL; i++) list = list->next;
+  return list;
+}
+
+LIVES_INLINE livesconstpointer lives_slist_nth_data(LiVESSList *list, uint32_t n) {
+  for (unsigned int i = 0; i < n && list != NULL; i++) list = list->next;
+  if (list == NULL) return NULL;
+  livesconstpointer data = list->data;
+  return data;
+}
+
+LIVES_INLINE int lives_list_length(LiVESList *list) {
+  int i;
+  for (i = 0; list != NULL; i++) list = list->next;
+  return i;
+}
+
+LIVES_INLINE int lives_slist_length(LiVESSList *list) {
+  int i;
+  for (i = 0; list != NULL; i++) list = list->next;
+  return i;
+}
+
+
+
+LIVES_INLINE LiVESList *lives_list_remove(LiVESList *list, livesconstpointer data) {
+  LiVESList *olist = list;
+  for (int i = 0; list->data != data && list != NULL; i++) list = list->next;
+  if (list == NULL) return NULL;
+  if (list->prev != NULL) list->prev->next = list->next;
+  else olist = list->next;
+  if (list->next != NULL) list->next->prev = list->prev;
+
+  list->next = list->prev = NULL;
+
+  return olist;
+}
+
+
+LIVES_INLINE LiVESList *lives_list_remove_link(LiVESList *olist, LiVESList *list) {
+  if (olist == NULL) return NULL;
+
+  if (list->prev != NULL) list->prev->next = list->next;
+  else olist = list->next;
+  if (list->next != NULL) list->next->prev = list->prev;
+
+  list->next = list->prev = NULL;
+
+  return olist;
+}
+
+
+LIVES_INLINE LiVESSList *lives_slist_remove(LiVESSList *list, livesconstpointer data) {
+  LiVESSList *olist = list, *xlist = list;
+  for (int i = 0; list->data != data && list != NULL; i++) {
+    xlist = list;
+    list = list->next;
+  }
+  if (list == NULL) return NULL;
+
+  xlist->next = list->next;
+
+  if (list == olist) olist = list->next;
+
+  list->next = NULL;
+
+  return olist;
+}
+
+
+LIVES_INLINE LiVESList *lives_list_append(LiVESList *list, livesconstpointer data) {
+  LiVESList *olist=NULL, *xlist=list;
+
+  while (list != NULL) {
+    olist = list;
+    list = list->next;
+  }
+
+  LiVESList *elem = (LiVESList *)malloc(sizeof(LiVESList));
+  elem->data = data;
+  elem->next = NULL;
+  elem->prev = olist;
+
+  if (olist == NULL) xlist = elem;
+  return xlist;
+}
+
+
+LIVES_INLINE LiVESSList *lives_slist_append(LiVESSList *list, livesconstpointer data) {
+  LiVESSList *olist=NULL, *xlist=list;
+
+  while (list != NULL) {
+    olist = list;
+    list = list->next;
+  }
+
+  LiVESSList *elem = (LiVESSList *)malloc(sizeof(LiVESSList));
+  elem->data = data;
+  elem->next = NULL;
+
+  if (olist == NULL) xlist = elem;
+  return xlist;
+}
+
+
+LIVES_INLINE LiVESList *lives_list_prepend(LiVESList *list, livesconstpointer data) {
+  LiVESList *elem = (LiVESList *)malloc(sizeof(LiVESList));
+  elem->data = data;
+  elem->next = list;
+  elem->prev = NULL;
+  return elem;
+}
+
+
+LIVES_INLINE LiVESSList *lives_slist_prepend(LiVESSList *list, livesconstpointer data) {
+  LiVESSList *elem = (LiVESSList *)malloc(sizeof(LiVESSList));
+  elem->data = data;
+  elem->next = list;
+  return elem;
+}
+
+
+LIVES_INLINE LiVESList *lives_list_insert(LiVESList *list, livespointer data, int pos) {
+  if (pos == 0) return lives_list_prepend(list, data);
+
+  LiVESList *xlist = list, *olist = NULL;
+
+  while (list != NULL && pos != 0) {
+    olist = list;
+    list = list->next;
+    pos--;
+  }
+
+  LiVESList *elem = (LiVESList *)malloc(sizeof(LiVESList));
+  elem->data = data;
+  elem->next = olist->next;
+  olist->next = elem;
+  if (elem->next != NULL) elem->next->prev = elem;
+  elem->prev = olist;
+
+  if (xlist == NULL) xlist = elem;
+  return xlist;
+
+}
+
+
+
+LIVES_INLINE LiVESList *lives_list_find(LiVESList *list, livesconstpointer data) {
+  while (list != NULL) {
+    if (list->data == data) return list;
+    list = list->next;
+  }
+  return NULL;
+}
+
+
+LIVES_INLINE LiVESList *lives_list_find_custom(LiVESList *list, livesconstpointer data, LiVESCompareFunc func) {
+  while (list != NULL) {
+    if (! func(list->data, data))
+      return list;
+    list = list->next;
+  }
+  return NULL;
+}
+
+
+
+LIVES_INLINE void lives_list_free(LiVESList *list) {
+  LiVESList *nlist;
+  while (list != NULL) {
+    nlist = list->next;
+    free(list);
+    list = nlist;
+  }
+}
+
+
+LIVES_INLINE void lives_slist_free(LiVESSList *list) {
+  LiVESSList *nlist;
+  while (list != NULL) {
+    nlist = list->next;
+    free(list);
+    list = nlist;
+  }
+}
+
+
+LIVES_INLINE LiVESList *lives_list_previous(LiVESList *list) {
+  if (list == NULL) return NULL;
+  return list->prev;
+}
+
+
+LIVES_INLINE LiVESList *lives_list_last(LiVESList *list) {
+  if (list == NULL) return NULL;
+  while (list->next != NULL) list=list->next;
+  return list;
+}
+
+
+
+LIVES_INLINE LiVESList *lives_list_delete_link(LiVESList *list, LiVESList *link) {
+  list = lives_list_remove_link(list, link);
+  free(link);
+  return list;
+}
+
+
+LIVES_INLINE LiVESList *lives_list_copy(LiVESList *list) {
+  LiVESList *new_list = NULL;
+  while (list != NULL) {
+    lives_list_append(new_list, list->data);
+    list = list->next;
+  }
+  return new_list;
+}
+
+
+LIVES_INLINE LiVESList *lives_list_concat(LiVESList *a, LiVESList *b) {
+  LiVESList *xlist = lives_list_last(a);
+  xlist->next = b;
+  b->prev = xlist;
+  return a;
+}
+
+
+
+char **lives_strsplit(const char *string, const char *delimiter, int max_tokens) {
+  LiVESSList *string_list = NULL,*slist;
+  char **str_array;
+  const char *s;
+  uint32_t n = 0;
+  const char *remainder;
+  if (max_tokens < 1)
+    max_tokens = INT_MAX;
+  remainder = string;
+  s = strstr(remainder, delimiter);
+  if (s) {
+    size_t delimiter_len = strlen(delimiter);
+    while (--max_tokens && s) {
+      size_t len;
+      len = s - remainder;
+      string_list = lives_slist_prepend(string_list, lives_strndup(remainder, len));
+      n++;
+      remainder = s + delimiter_len;
+      s = strstr(remainder, delimiter);
+    }
+  }
+  if (*string) {
+    n++;
+    string_list = lives_slist_prepend(string_list, lives_strdup(remainder));
+  }
+  str_array = (char **)lives_malloc((n + 1) * sizeof(char *));
+  str_array[n--] = NULL;
+  for (slist = string_list; slist; slist = slist->next)
+    str_array[n--] = (char *)slist->data;
+  lives_slist_free(string_list);
+  return str_array;
+}
+
+
+
+char *lives_strdelimit(char *string, const char *delimiters, char new_delim) {
+  char *c;
+  for (c = string; *c; c++) {
+    if (strchr(delimiters, *c))
+      *c = new_delim;
+  }
+  return string;
+}
+
+
+
+
+char *lives_strstr_len(const char *haystack, ssize_t haystack_len, const char *needle) {
+  if (haystack_len < 0)
+    return (char *)strstr(haystack, needle);
+  else {
+    const char *p = haystack;
+    size_t needle_len = strlen(needle);
+    const char *end;
+    size_t i;
+    if (needle_len == 0)
+      return (char *)haystack;
+    if (haystack_len < needle_len)
+      return NULL;
+    end = haystack + haystack_len - needle_len;
+    while (p <= end && *p) {
+      for (i = 0; i < needle_len; i++)
+        if (p[i] != needle[i])
+          goto next;
+      return (char *)p;
+next:
+      p++;
+    }
+    return NULL;
+  }
+}
+
 
 
 #define ICON_SCALE(a) ((int)(1.0 * a))
@@ -536,15 +1452,21 @@
 #define LIVES_INTERP_FAST Qt::FastTransformation
 
 typedef int LiVESResponseType;
-#define LIVES_RESPONSE_NONE QDialog::Rejected
-#define LIVES_RESPONSE_OK QDialog::Accepted
-#define LIVES_RESPONSE_CANCEL QDialog::Rejected
-#define LIVES_RESPONSE_ACCEPT QDialog::Accepted
-#define LIVES_RESPONSE_YES QDialog::Accepted
-#define LIVES_RESPONSE_NO QDialog::Rejected
-#define LIVES_RESPONSE_INVALID -1
-#define LIVES_RESPONSE_SHOW_DETAILS 2
+#define LIVES_RESPONSE_NONE QDialogButtonBox::InvalidRole
+#define LIVES_RESPONSE_OK QDialogButtonBox::AcceptRole
+#define LIVES_RESPONSE_CANCEL QDialogButtonBox::RejectRole
 
+#define LIVES_RESPONSE_ACCEPT QDialogButtonBox::AcceptRole
+
+#define LIVES_RESPONSE_YES QDialogButtonBox::YesRole
+#define LIVES_RESPONSE_NO QDialogButtonBox::NoRole
+
+#define LIVES_RESPONSE_INVALID QDialogButtonBox::InvalidRole
+#define LIVES_RESPONSE_SHOW_DETAILS 100
+
+#define LIVES_RESPONSE_RETRY 101
+#define LIVES_RESPONSE_ABORT 102
+#define LIVES_RESPONSE_RESET 103
 
 typedef QStyle::StandardPixmap LiVESArrowType;
 #define LIVES_ARROW_UP QStyle::SP_ArrowUp
@@ -553,10 +1475,10 @@
 #define LIVES_ARROW_RIGHT QStyle::SP_ArrowRight
 #define LIVES_ARROW_NONE -1
 
-class LiVESWidget : public LiVESObject, public QWidget {
+class LiVESWidget : public LiVESObject {
   Q_OBJECT
 
- public:
+public:
 
   Q_PROPERTY(bool prelight READ get_prelight WRITE set_prelight)
 
@@ -580,9 +1502,9 @@
   void update_stylesheet();
 
 
- LiVESWidget() : parent(NULL) {
+  LiVESWidget() : parent(NULL) {
 
-    QVariant qv = QVariant::fromValue((LiVESObject *)this);
+    QVariant qv = QVariant::fromValue(static_cast<LiVESObject *>(this));
     (static_cast<QWidget *>(this))->setProperty("LiVESObject", qv);
 
     fg_norm=bg_norm=base_norm=text_norm=NULL;
@@ -591,9 +1513,25 @@
     fg_hover=bg_hover=base_hover=text_hover=NULL;
     fg_sel=bg_sel=base_sel=text_sel=NULL;
     state = LIVES_WIDGET_STATE_NORMAL;
-    widgetName = QString("%1").arg(ulong_random()); 
+    widgetName = QString("%1").arg(ulong_random());
     events_mask = LIVES_EXPOSURE_MASK;
     onetime_events_mask = 0;
+
+    static_cast<QObject *>(static_cast<QWidget *>(this))->connect(static_cast<QObject *>(static_cast<QWidget *>(this)),
+        SIGNAL(destroyed()),
+        static_cast<QObject *>(static_cast<QWidget *>(this)),
+        SLOT(onDestroyed()));
+
+    children = NULL;
+  }
+
+  void onDestroyed() {
+    // if has child widgets, try to remove them and dec_refcount()
+    // if widget is a toolitem/menuitem, remove its actions
+
+    // TODO - this should never get called, instead we should call dec_refcount()
+
+
   }
 
   ~LiVESWidget();
@@ -602,11 +1540,12 @@
   void add_child(LiVESWidget *child) {
     if (child->parent != NULL) return;
     child->set_parent(this);
-    children.push_back(child);
+    child->ref_sink();
+    children = lives_list_append(children,child);
   }
 
   void remove_child(LiVESWidget *child) {
-    children.removeOne(child);
+    children = lives_list_remove(children,child);
     child->set_parent(NULL);
     child->dec_refcount();
   }
@@ -644,15 +1583,30 @@
   }
 
   int count_children() {
-    return children.count();
+    return lives_list_length(children);
+  }
+
+  LiVESList *get_children() {
+    return children;
   }
 
-  LiVESSList *get_children() {
-    return &children;
+  void set_children(LiVESList *xchildren) {
+    lives_list_free(children);
+    children = xchildren;
   }
 
   LiVESWidget *get_child(int index) {
-    return (LiVESWidget *)children.at(index);
+    return (LiVESWidget *)lives_list_nth_data(children,index);
+  }
+
+
+  int get_child_index(LiVESWidget *child) {
+    LiVESList *xchildren = children;
+    int i;
+    for (i = 0; xchildren != NULL; i++) {
+      if (xchildren->data == child) return i;
+    }
+    return -1;
   }
 
   LiVESWidgetState get_state() {
@@ -664,82 +1618,91 @@
 
     if (state & LIVES_WIDGET_STATE_INSENSITIVE) {
       setEnabled(false);
-    }
-    else {
+    } else {
       setEnabled(true);
     }
 
 
     if (state & LIVES_WIDGET_STATE_PRELIGHT) {
       if (!get_prelight()) set_prelight(true);
-    }
-    else {
+    } else {
       if (get_prelight()) set_prelight(false);
     }
 
   }
 
 
- Q_SLOTS
-   void cb_wrapper_clicked() {
-   // "clicked" callback
-   call_accels_for(LIVES_WIDGET_CLICKED_EVENT);
- }
-
- void cb_wrapper_toggled() {
-   // "toggled" callback
-   call_accels_for(LIVES_WIDGET_CLICKED_EVENT);
- }
-
-
- void cb_wrapper_changed() {
-   // "changed" callback
-   call_accels_for(LIVES_WIDGET_CHANGED_EVENT);
- }
-
-
- void cb_wrapper_value_changed() {
-   // "value-changed" callback
-   call_accels_for(LIVES_WIDGET_VALUE_CHANGED_EVENT);
- }
-
- void cb_wrapper_selection_changed() {
-     // "selection-changed" callback
-   call_accels_for(LIVES_WIDGET_SELECTION_CHANGED_EVENT);
- }
-
- void cb_wrapper_activate() {
-   // "activate" callback
-   call_accels_for(LIVES_WIDGET_ACTIVATE_EVENT);
- }
-
- private:
-   LiVESSList children;
-   LiVESWidget *parent;
-   QString widgetName;
-   
-   LiVESWidgetColor *fg_norm,*bg_norm,*base_norm,*text_norm;
-   LiVESWidgetColor *fg_act,*bg_act,*base_act,*text_act;
-   LiVESWidgetColor *fg_insen,*bg_insen,*base_insen,*text_insen;
-   LiVESWidgetColor *fg_hover,*bg_hover,*base_hover,*text_hover;
-   LiVESWidgetColor *fg_sel,*bg_sel,*base_sel,*text_sel; 
-   
-   LiVESWidgetState state;
-   
-   uint32_t events_mask;
-   uint32_t onetime_events_mask;
-
-   void call_accels_for(const char *type) {
-     QList<LiVESAccel *> ql = get_accels_for(type);
-     for (int i=0; i < ql.size(); i++) {
-       LiVESWidgetCallback *cb = (LiVESWidgetCallback *)ql[i]->closure->function;
-       (*cb)(this, ql[i]->closure->data);
-     }
-   }
+public slots:
+  void cb_wrapper_clicked() {
+    // "clicked" callback
+    call_accels_for(LIVES_WIDGET_CLICKED_EVENT);
+  }
+
+  void cb_wrapper_toggled() {
+    // "toggled" callback
+    call_accels_for(LIVES_WIDGET_CLICKED_EVENT);
+  }
+
+
+  void cb_wrapper_changed() {
+    // "changed" callback
+    call_accels_for(LIVES_WIDGET_CHANGED_EVENT);
+  }
+
+
+  void cb_wrapper_value_changed() {
+    // "value-changed" callback
+    call_accels_for(LIVES_WIDGET_VALUE_CHANGED_EVENT);
+  }
+
+  void cb_wrapper_selection_changed() {
+    // "selection-changed" callback
+    call_accels_for(LIVES_WIDGET_SELECTION_CHANGED_EVENT);
+  }
+
+  void cb_wrapper_current_folder_changed() {
+    // "selection-changed" callback
+    call_accels_for(LIVES_WIDGET_CURRENT_FOLDER_CHANGED_EVENT);
+  }
+
+  void cb_wrapper_activate() {
+    // "activate" callback
+    call_accels_for(LIVES_WIDGET_ACTIVATE_EVENT);
+  }
+
+  void cb_wrapper_response() {
+    // "response" callback
+    call_accels_for(LIVES_WIDGET_RESPONSE_EVENT);
+  }
+
+private:
+  LiVESList *children;
+  LiVESWidget *parent;
+  QString widgetName;
+
+  LiVESWidgetColor *fg_norm,*bg_norm,*base_norm,*text_norm;
+  LiVESWidgetColor *fg_act,*bg_act,*base_act,*text_act;
+  LiVESWidgetColor *fg_insen,*bg_insen,*base_insen,*text_insen;
+  LiVESWidgetColor *fg_hover,*bg_hover,*base_hover,*text_hover;
+  LiVESWidgetColor *fg_sel,*bg_sel,*base_sel,*text_sel;
+
+  LiVESWidgetState state;
+
+  uint32_t events_mask;
+  uint32_t onetime_events_mask;
+
+  void call_accels_for(const char *type) {
+    QList<LiVESAccel *> ql = get_accels_for(type);
+    for (int i=0; i < ql.size(); i++) {
+      LiVESWidgetCallback *cb = (LiVESWidgetCallback *)ql[i]->closure->function;
+      (*cb)(this, ql[i]->closure->data);
+    }
+  }
 
 };
 
 
+#define LIVES_IS_WIDGET_OBJECT(a) 1
 #define LIVES_IS_WIDGET(a) 1
 #define LIVES_IS_CONTAINER(a) 1
 #define LIVES_IS_XWINDOW(a) 1
@@ -751,20 +1714,42 @@
 #define LIVES_IS_RANGE(a) (static_cast<LiVESObject *>(a)->get_type() == LIVES_WIDGET_TYPE_SCALE || \
 			   static_cast<LiVESObject *>(a)->get_type() == LIVES_WIDGET_TYPE_SCROLLBAR)
 #define LIVES_IS_LABEL(a) (static_cast<LiVESObject *>(a)->get_type() == LIVES_WIDGET_TYPE_LABEL)
+#define LIVES_IS_TOGGLE_BUTTON(a) (static_cast<LiVESObject *>(a)->get_type() == LIVES_WIDGET_TYPE_CHECK_BUTTON)
 #define LIVES_IS_HBOX(a) (static_cast<LiVESObject *>(a)->get_type() == LIVES_WIDGET_TYPE_HBOX)
 #define LIVES_IS_VBOX(a) (static_cast<LiVESObject *>(a)->get_type() == LIVES_WIDGET_TYPE_VBOX)
 #define LIVES_IS_COMBO(a) (static_cast<LiVESObject *>(a)->get_type() == LIVES_WIDGET_TYPE_COMBO)
 #define LIVES_IS_ENTRY(a) (static_cast<LiVESObject *>(a)->get_type() == LIVES_WIDGET_TYPE_ENTRY)
+#define LIVES_IS_MENU(a) (static_cast<LiVESObject *>(a)->get_type() == LIVES_WIDGET_TYPE_MENU)
+#define LIVES_IS_MENU_BAR(a) (static_cast<LiVESObject *>(a)->get_type() == LIVES_WIDGET_TYPE_MENU_BAR)
+#define LIVES_IS_MENU_ITEM(a) (static_cast<LiVESObject *>(a)->get_type() == LIVES_WIDGET_TYPE_MENU_ITEM)
+#define LIVES_IS_TOOLBAR(a) (static_cast<LiVESObject *>(a)->get_type() == LIVES_WIDGET_TYPE_TOOLBAR)
+#define LIVES_IS_FILE_CHOOSER(a) (static_cast<LiVESObject *>(a)->get_type() == LIVES_WIDGET_TYPE_FILE_CHOOSER)
 #define LIVES_IS_SCALE(a) (static_cast<LiVESObject *>(a)->get_type() == LIVES_WIDGET_TYPE_SCALE)
+#define LIVES_IS_FRAME(a) (static_cast<LiVESObject *>(a)->get_type() == LIVES_WIDGET_TYPE_FRAME)
+#define LIVES_IS_TOOL_ITEM(a) (static_cast<LiVESObject *>(a)->get_type() == LIVES_WIDGET_TYPE_TOOL_ITEM)
+#define LIVES_IS_WINDOW(a) (static_cast<LiVESObject *>(a)->get_type() == LIVES_WIDGET_TYPE_MAIN_WINDOW)
+#define LIVES_IS_DIALOG(a) (static_cast<LiVESObject *>(a)->get_type() == LIVES_WIDGET_TYPE_SUB_WINDOW || \
+			    static_cast<LiVESObject *>(a)->get_type() == LIVES_WIDGET_TYPE_MESSAGE_DIALOG)
+#define LIVES_IS_PANED(a) (static_cast<LiVESObject *>(a)->get_type() == LIVES_WIDGET_TYPE_PANED)
+#define LIVES_IS_TABLE(a) (static_cast<LiVESObject *>(a)->get_type() == LIVES_WIDGET_TYPE_TABLE)
+#define LIVES_IS_IMAGE(a) (static_cast<LiVESObject *>(a)->get_type() == LIVES_WIDGET_TYPE_IMAGE)
+#define LIVES_IS_PIXBUF(a) (static_cast<LiVESObject *>(a)->get_type() == LIVES_WIDGET_TYPE_IMAGE)
+#define LIVES_IS_NOTEBOOK(a) (static_cast<LiVESObject *>(a)->get_type() == LIVES_WIDGET_TYPE_NOTEBOOK)
 #define LIVES_IS_SPIN_BUTTON(a) (static_cast<LiVESObject *>(a)->get_type() == LIVES_WIDGET_TYPE_SPIN_BUTTON)
 #define LIVES_IS_SCROLLBAR(a) (static_cast<LiVESObject *>(a)->get_type() == LIVES_WIDGET_TYPE_SCROLLBAR)
 #define LIVES_IS_TREE_VIEW(a) (static_cast<LiVESObject *>(a)->get_type() == LIVES_WIDGET_TYPE_TREE_VIEW)
+#define LIVES_IS_TEXT_VIEW(a) (static_cast<LiVESObject *>(a)->get_type() == LIVES_WIDGET_TYPE_TEXT_VIEW)
+#define LIVES_IS_TEXT_BUFFER(a) (static_cast<LiVESObject *>(a)->get_type() == LIVES_WIDGET_TYPE_TEXT_BUFFER)
 #define LIVES_IS_SCROLLED_WINDOW(a) (static_cast<LiVESObject *>(a)->get_type() == LIVES_WIDGET_TYPE_SCROLLED_WINDOW)
 
-   
+
 bool evFilter::eventFilter(QObject *obj, QEvent *event) {
 
-  // return true to block
+  // TODO - add motion-notify-event, leave-notify-event, button-release-event, focus_out_event
+
+  // event->accept() to block ?
+
+  // return true to block ?
 
   switch (event->type()) {
 
@@ -781,13 +1766,17 @@
     LiVESObject *object = static_cast<LiVESObject *>(obj);
     LiVESWidget *widget = static_cast<LiVESWidget *>(object);
     if (!(widget->get_events() & LIVES_SCROLL_MASK)) return true;
-    if (!(widget->get_onetime_events_block() & LIVES_SCROLL_MASK)) {widget->remove_onetime_event_block(LIVES_SCROLL_MASK); return true;}
+    if (!(widget->get_onetime_events_block() & LIVES_SCROLL_MASK)) {
+      widget->remove_onetime_event_block(LIVES_SCROLL_MASK);
+      event->accept();
+      return true;
+    }
     QList<LiVESAccel *>accels = object->get_accels_for(LIVES_WIDGET_SCROLL_EVENT);
     LiVESXEventScroll *scrollevent = NULL;
     if (qevent->angleDelta().y() > 0) scrollevent->direction = LIVES_SCROLL_UP;
     else scrollevent->direction = LIVES_SCROLL_DOWN;
 
-    // TODO - set kstate
+    scrollevent->state = QApplication::queryKeyboardModifiers();
 
     for (int i=0; i < accels.size(); i++) {
       LiVESScrollEventCallback *cb = (LiVESScrollEventCallback *)accels[i]->closure->function;
@@ -796,6 +1785,134 @@
     }
   }
 
+  case (QEvent::Paint): {
+    QPaintEvent *qevent = static_cast<QPaintEvent *>(event);
+    LiVESObject *object = static_cast<LiVESObject *>(obj);
+    LiVESWidget *widget = static_cast<LiVESWidget *>(object);
+    if (!(widget->get_events() & LIVES_EXPOSURE_MASK)) return true;
+    if (!(widget->get_onetime_events_block() & LIVES_EXPOSURE_MASK)) {
+      widget->remove_onetime_event_block(LIVES_EXPOSURE_MASK);
+      event->accept();
+      return true;
+    }
+    QList<LiVESAccel *>accels = object->get_accels_for(LIVES_WIDGET_EXPOSE_EVENT);
+    LiVESXEventExpose *exposeevent = NULL;
+    QRect qr = qevent->rect();
+    exposeevent->area.x = qr.x();
+    exposeevent->area.y = qr.y();
+    exposeevent->area.width = qr.width();
+    exposeevent->area.height = qr.height();
+
+    exposeevent->count = 0;
+
+    for (int i=0; i < accels.size(); i++) {
+      LiVESExposeEventCallback *cb = (LiVESExposeEventCallback *)accels[i]->closure->function;
+      bool ret = (*cb)(widget, exposeevent, accels[i]->closure->data);
+      if (ret) return true;
+    }
+  }
+
+  case (QEvent::Enter): {
+    //QEnterEvent *qevent = static_cast<QEnterEvent *>(event);
+    LiVESObject *object = static_cast<LiVESObject *>(obj);
+    LiVESWidget *widget = static_cast<LiVESWidget *>(object);
+    if (!(widget->get_events() & LIVES_ENTER_NOTIFY_MASK)) return true;
+    if (!(widget->get_onetime_events_block() & LIVES_ENTER_NOTIFY_MASK)) {
+      widget->remove_onetime_event_block(LIVES_ENTER_NOTIFY_MASK);
+      event->accept();
+      return true;
+    }
+    QList<LiVESAccel *>accels = object->get_accels_for(LIVES_WIDGET_ENTER_EVENT);
+    LiVESXEventCrossing *crossingevent = NULL;
+
+    for (int i=0; i < accels.size(); i++) {
+      LiVESEnterEventCallback *cb = (LiVESEnterEventCallback *)accels[i]->closure->function;
+      bool ret = (*cb)(widget, crossingevent, accels[i]->closure->data);
+      if (ret) return true;
+    }
+  }
+
+  case (QEvent::MouseButtonPress): {
+    QMouseEvent *qevent = static_cast<QMouseEvent *>(event);
+    LiVESObject *object = static_cast<LiVESObject *>(obj);
+    LiVESWidget *widget = static_cast<LiVESWidget *>(object);
+    if (!(widget->get_events() & LIVES_BUTTON_PRESS_MASK)) return true;
+    if (!(widget->get_onetime_events_block() & LIVES_BUTTON_PRESS_MASK)) {
+      widget->remove_onetime_event_block(LIVES_BUTTON_PRESS_MASK);
+      event->accept();
+      return true;
+    }
+    QList<LiVESAccel *>accels = object->get_accels_for(LIVES_WIDGET_BUTTON_PRESS_EVENT);
+
+    LiVESXEventButton *buttonevent = NULL;
+    if (qevent->button() == Qt::LeftButton) buttonevent->button = 1;
+    if (qevent->button() == Qt::MidButton) buttonevent->button = 2;
+    if (qevent->button() == Qt::RightButton) buttonevent->button = 3;
+
+    buttonevent->type = LIVES_BUTTON_PRESS;
+    buttonevent->time = qtime->elapsed();
+
+    for (int i=0; i < accels.size(); i++) {
+      LiVESButtonEventCallback *cb = (LiVESButtonEventCallback *)accels[i]->closure->function;
+      bool ret = (*cb)(widget, buttonevent, accels[i]->closure->data);
+      if (ret) return true;
+    }
+  }
+
+  case (QEvent::MouseButtonDblClick): {
+    QMouseEvent *qevent = static_cast<QMouseEvent *>(event);
+    LiVESObject *object = static_cast<LiVESObject *>(obj);
+    LiVESWidget *widget = static_cast<LiVESWidget *>(object);
+    if (!(widget->get_events() & LIVES_BUTTON_PRESS_MASK)) return true;
+    if (!(widget->get_onetime_events_block() & LIVES_BUTTON_PRESS_MASK)) {
+      widget->remove_onetime_event_block(LIVES_BUTTON_PRESS_MASK);
+      event->accept();
+      return true;
+    }
+    QList<LiVESAccel *>accels = object->get_accels_for(LIVES_WIDGET_BUTTON_PRESS_EVENT);
+
+    LiVESXEventButton *buttonevent = NULL;
+    if (qevent->button() == Qt::LeftButton) buttonevent->button = 1;
+    if (qevent->button() == Qt::MidButton) buttonevent->button = 2;
+    if (qevent->button() == Qt::RightButton) buttonevent->button = 3;
+
+    buttonevent->type = LIVES_BUTTON2_PRESS;
+
+    for (int i=0; i < accels.size(); i++) {
+      LiVESButtonEventCallback *cb = (LiVESButtonEventCallback *)accels[i]->closure->function;
+      bool ret = (*cb)(widget, buttonevent, accels[i]->closure->data);
+      if (ret) return true;
+    }
+  }
+
+  case (QEvent::Resize): {
+    //QShowEvent *qevent = static_cast<QResizeEvent *>(event);
+    LiVESObject *object = static_cast<LiVESObject *>(obj);
+    LiVESWidget *widget = static_cast<LiVESWidget *>(object);
+    QList<LiVESAccel *>accels = object->get_accels_for(LIVES_WIDGET_CONFIGURE_EVENT);
+    LiVESXEventConfigure *configureevent = NULL;
+
+    for (int i=0; i < accels.size(); i++) {
+      LiVESConfigureEventCallback *cb = (LiVESConfigureEventCallback *)accels[i]->closure->function;
+      bool ret = (*cb)(widget, configureevent, accels[i]->closure->data);
+      if (ret) return true;
+    }
+  }
+
+  case (QEvent::Close): {
+    //QCloseEvent *qevent = static_cast<QCloseEvent *>(event);
+    LiVESObject *object = static_cast<LiVESObject *>(obj);
+    LiVESWidget *widget = static_cast<LiVESWidget *>(object);
+    QList<LiVESAccel *>accels = object->get_accels_for(LIVES_WIDGET_DELETE_EVENT);
+    LiVESXEventDelete *deleteevent = NULL;
+
+    for (int i=0; i < accels.size(); i++) {
+      LiVESDeleteEventCallback *cb = (LiVESDeleteEventCallback *)accels[i]->closure->function;
+      bool ret = (*cb)(widget, deleteevent, accels[i]->closure->data);
+      if (ret) return true;
+    }
+  }
+
   default:
     return false;
 
@@ -1004,71 +2121,80 @@
 }
 
 
-ulong lives_signal_connect(LiVESObject *object, const char *signal_name, ulong funcptr, gpointer data) {
+ulong lives_signal_connect(LiVESObject *object, const char *signal_name, ulong funcptr, livespointer data) {
   ulong handler_id;
   handler_id=ulong_random();
 
   object->add_accel(handler_id, signal_name, funcptr, data);
 
   if (!strcmp(signal_name, LIVES_WIDGET_CLICKED_EVENT)) {
-    (static_cast<QObject *>(object))->connect(static_cast<QObject *>(object), 
-					      SIGNAL(clicked()), 
-					      static_cast<QObject *>(object), 
-					      SLOT(cb_wrapper_clicked()));
-  }
-  else if (!strcmp(signal_name, LIVES_WIDGET_TOGGLED_EVENT)) {
-    (static_cast<QObject *>(object))->connect(static_cast<QObject *>(object), 
-					      SIGNAL(toggled()), 
-					      static_cast<QObject *>(object), 
-					      SLOT(cb_wrapper_toggled()));
-  }
-  else if (!strcmp(signal_name, LIVES_WIDGET_CHANGED_EVENT)) {
+    (static_cast<QObject *>(object))->connect(static_cast<QObject *>(object),
+        SIGNAL(clicked()),
+        static_cast<QObject *>(object),
+        SLOT(cb_wrapper_clicked()));
+  } else if (!strcmp(signal_name, LIVES_WIDGET_TOGGLED_EVENT)) {
+    (static_cast<QObject *>(object))->connect(static_cast<QObject *>(object),
+        SIGNAL(toggled()),
+        static_cast<QObject *>(object),
+        SLOT(cb_wrapper_toggled()));
+  } else if (!strcmp(signal_name, LIVES_WIDGET_CHANGED_EVENT)) {
     // for combo, entry, LiVESTreeSelection
     if (LIVES_IS_COMBO(object))
-	(static_cast<QObject *>(object))->connect(static_cast<QObject *>(object), 
-						  SIGNAL(currentTextChanged()), 
-						  static_cast<QObject *>(object), 
-						  SLOT(cb_wrapper_changed()));
-
-    else if (LIVES_IS_ENTRY(object)) 
-	     (static_cast<QObject *>(object))->connect(static_cast<QObject *>(object), 
-						       SIGNAL(textChanged()), 
-						       static_cast<QObject *>(object), 
-						       SLOT(cb_wrapper_changed()));
+      (static_cast<QObject *>(object))->connect(static_cast<QObject *>(object),
+          SIGNAL(currentTextChanged()),
+          static_cast<QObject *>(object),
+          SLOT(cb_wrapper_changed()));
+
+    else if (LIVES_IS_ENTRY(object))
+      (static_cast<QObject *>(object))->connect(static_cast<QObject *>(object),
+          SIGNAL(textChanged()),
+          static_cast<QObject *>(object),
+          SLOT(cb_wrapper_changed()));
 
     else {
-      QItemSelectionModel *qism = dynamic_cast<QItemSelectionModel *>(object);
-      if (qism != NULL) { 
-	(static_cast<QObject *>(object))->connect(static_cast<QObject *>(object), 
-						  SIGNAL(selectionChanged()), 
-						  static_cast<QObject *>(object), 
-						  SLOT(cb_wrapper_changed()));
+      QTreeWidget *qtw = dynamic_cast<QTreeWidget *>(object);
+      if (qtw != NULL) {
+        (static_cast<QObject *>(object))->connect(static_cast<QObject *>(object),
+            SIGNAL(itemSelectionChanged()),
+            static_cast<QObject *>(object),
+            SLOT(cb_wrapper_changed()));
 
       }
     }
-  }
-  else if (!strcmp(signal_name, LIVES_WIDGET_VALUE_CHANGED_EVENT)) {
+  } else if (!strcmp(signal_name, LIVES_WIDGET_VALUE_CHANGED_EVENT)) {
     // for spinbutton, scrollbar
-    (static_cast<QObject *>(object))->connect(static_cast<QObject *>(object), 
-					      SIGNAL(valueChanged()), 
-					      static_cast<QObject *>(object), 
-					      SLOT(cb_wrapper_value_changed()));
+    (static_cast<QObject *>(object))->connect(static_cast<QObject *>(object),
+        SIGNAL(valueChanged()),
+        static_cast<QObject *>(object),
+        SLOT(cb_wrapper_value_changed()));
 
-  }
-  else if (!strcmp(signal_name, LIVES_WIDGET_SELECTION_CHANGED_EVENT)) {
+  } else if (!strcmp(signal_name, LIVES_WIDGET_SELECTION_CHANGED_EVENT)) {
     // for filedialog
-    (static_cast<QObject *>(object))->connect(static_cast<QObject *>(object), 
-					      SIGNAL(currentChanged()), 
-					      static_cast<QObject *>(object), 
-					      SLOT(cb_wrapper_selection_changed()));
+    (static_cast<QObject *>(object))->connect(static_cast<QObject *>(object),
+        SIGNAL(currentChanged()),
+        static_cast<QObject *>(object),
+        SLOT(cb_wrapper_selection_changed()));
 
-  }
-  else if (!strcmp(signal_name, LIVES_WIDGET_ACTIVATE_EVENT)) {
+  } else if (!strcmp(signal_name, LIVES_WIDGET_CURRENT_FOLDER_CHANGED_EVENT)) {
+    // for filedialog
+    (static_cast<QObject *>(object))->connect(static_cast<QObject *>(object),
+        SIGNAL(currentUrlChanged()),
+        static_cast<QObject *>(object),
+        SLOT(cb_wrapper_current_folder_changed()));
+
+  } else if (!strcmp(signal_name, LIVES_WIDGET_ACTIVATE_EVENT)) {
     // for menuitems (QAction)
-    (static_cast<QObject *>(object))->connect(static_cast<QObject *>(object), 
-					      SIGNAL(triggered()), 
-					      static_cast<QObject *>(object), 
-					      SLOT(cb_wrapper_selection_activate()));
+    (static_cast<QObject *>(object))->connect(static_cast<QObject *>(object),
+        SIGNAL(triggered()),
+        static_cast<QObject *>(object),
+        SLOT(cb_wrapper_activate()));
+
+  } else if (!strcmp(signal_name, LIVES_WIDGET_RESPONSE_EVENT)) {
+    // for menuitems (QAction)
+    (static_cast<QObject *>(object))->connect(static_cast<QObject *>(object),
+        SIGNAL(finished()),
+        static_cast<QObject *>(object),
+        SLOT(cb_wrapper_response()));
 
   }
 
@@ -1077,6 +2203,20 @@
 }
 
 
+LIVES_INLINE void lives_widget_object_set_data(LiVESObject *widget, const char *prop, livespointer value) {
+  QVariant v = qVariantFromValue((livespointer) value);
+  widget->setProperty(prop, v);
+}
+
+
+LIVES_INLINE livespointer lives_widget_object_get_data(LiVESObject *widget, const char *prop) {
+  QVariant v = widget->property(prop);
+  return v.value<livespointer>();
+}
+
+
+
+
 #define lives_signal_connect_after(a,b,c,d) lives_signal_connect(a,b,c,d)
 
 
@@ -1084,12 +2224,12 @@
 void LiVESObject::add_accel(LiVESAccel *accel) {
   accels.push_back(accel);
 
-  QShortcut *shortcut = new QShortcut(accel->ks, dynamic_cast<QWidget *>(this));
-  accel->shortcut = shortcut;
+  //QShortcut *shortcut = new QShortcut(accel->ks, dynamic_cast<QWidget *>(this));
+  //accel->shortcut = shortcut;
 }
 
 
-void LiVESObject::add_accel(ulong handler_id, const char *signal_name, ulong funcptr, gpointer data) {
+void LiVESObject::add_accel(ulong handler_id, const char *signal_name, ulong funcptr, livespointer data) {
   LiVESAccel *accel = new LiVESAccel;
   accel->handler_id = handler_id;
   accel->signal_name = strdup(signal_name);
@@ -1101,7 +2241,7 @@
 }
 
 
-void LiVESObject::add_accel(const char* signal_name, LiVESAccelGroup* group, uint32_t key, LiVESXModifierType mod, LiVESAccelFlags flags) {
+void LiVESObject::add_accel(const char *signal_name, LiVESAccelGroup *group, uint32_t key, LiVESXModifierType mod, LiVESAccelFlags flags) {
   LiVESAccel *accel = new LiVESAccel;
   accel->handler_id = 0;
   accel->signal_name = strdup(signal_name);
@@ -1123,8 +2263,7 @@
       delete accel->closure;
       accels.erase(it);
       return TRUE;
-    }
-    else
+    } else
       ++it;
   }
 
@@ -1143,21 +2282,20 @@
     for (int i=0; i < ql.size(); i++) {
       LiVESAccel *accel = ql.at(i);
       if (accel->closure != NULL) {
-	LiVESAccelCallback *cb = (LiVESAccelCallback *)accel->closure->function;
-	uint32_t key = qkeysequence_get_key(ks);
-	LiVESXModifierType mod = qkeysequence_get_mod(ks);
-	(*cb)(accel->group, this, key, mod, accel->closure->data);
-      }
-      else {
-	if (!strcmp(accel->signal_name, LIVES_WIDGET_CLICKED_EVENT)) {
-	  QAbstractButton *widget = dynamic_cast<QAbstractButton *>(this);
-	  if (widget != NULL) widget->click();
-	}
-
-	if (!strcmp(accel->signal_name, LIVES_WIDGET_TOGGLED_EVENT)) {
-	  QAbstractButton *widget = dynamic_cast<QAbstractButton *>(this);
-	  if (widget != NULL) widget->toggle();
-	}
+        LiVESAccelCallback *cb = (LiVESAccelCallback *)accel->closure->function;
+        uint32_t key = qkeysequence_get_key(ks);
+        LiVESXModifierType mod = qkeysequence_get_mod(ks);
+        (*cb)(accel->group, this, key, mod, accel->closure->data);
+      } else {
+        if (!strcmp(accel->signal_name, LIVES_WIDGET_CLICKED_EVENT)) {
+          QAbstractButton *widget = dynamic_cast<QAbstractButton *>(this);
+          if (widget != NULL) widget->click();
+        }
+
+        if (!strcmp(accel->signal_name, LIVES_WIDGET_TOGGLED_EVENT)) {
+          QAbstractButton *widget = dynamic_cast<QAbstractButton *>(this);
+          if (widget != NULL) widget->toggle();
+        }
 
       }
       return TRUE;
@@ -1176,6 +2314,16 @@
 }
 
 
+QList<LiVESAccel *> LiVESObject::get_accels_for(ulong func, livespointer data) {
+  QList<LiVESAccel *> ql;
+  for (int i=0; i < accels.size(); i++) {
+    if (accels[i]->closure == NULL) continue;
+    if (accels[i]->closure->function == func && accels[i]->closure->data == data) ql.push_back(accels[i]);
+  }
+  return ql;
+}
+
+
 QList<LiVESAccel *> LiVESObject::get_accels_for(const char *signame) {
   QList<LiVESAccel *> ql;
   for (int i=0; i < accels.size(); i++) {
@@ -1208,6 +2356,13 @@
   }
 }
 
+void LiVESObject::block_signals(ulong func, livespointer data) {
+  QList<LiVESAccel *>ql = get_accels_for(func,data);
+  for (int i=0; i < ql.size(); i++) {
+    ql[i]->blocked = true;
+  }
+}
+
 
 void LiVESObject::unblock_signal(ulong handler_id) {
   LiVESAccel *accel = get_accel_for(handler_id);
@@ -1215,6 +2370,22 @@
 }
 
 
+void LiVESObject::unblock_signals(const char *signame) {
+  QList<LiVESAccel *>ql = get_accels_for(signame);
+  for (int i=0; i < ql.size(); i++) {
+    ql[i]->blocked = false;
+  }
+}
+
+
+void LiVESObject::unblock_signals(ulong func, livespointer data) {
+  QList<LiVESAccel *>ql = get_accels_for(func,data);
+  for (int i=0; i < ql.size(); i++) {
+    ql[i]->blocked = false;
+  }
+}
+
+
 void LiVESObject::disconnect_signal(ulong handler_id) {
   LiVESAccel *accel = get_accel_for(handler_id);
   remove_accel(accel);
@@ -1227,25 +2398,53 @@
 
 
 
-typedef class LiVESRange LiVESRange;
-typedef class LiVESTreeView LiVESTreeView;
+class LiVESBox : public LiVESWidget {};
 
-class LiVESAdjustment : public LiVESObject {
 
- public:
+class LiVESHBox : public LiVESBox, public QHBoxLayout {
+public:
+  LiVESHBox() {
+    set_type(LIVES_WIDGET_TYPE_HBOX);
+  }
+};
+
+
+class LiVESEventBox : public LiVESBox, public QHBoxLayout {
+public:
+  LiVESEventBox() {
+    set_type(LIVES_WIDGET_TYPE_EVENT_BOX);
+  }
+};
+
+
+class LiVESDrawingArea : public LiVESBox, public QHBoxLayout {
+public:
+  LiVESDrawingArea() {
+    set_type(LIVES_WIDGET_TYPE_DRAWING_AREA);
+  }
+};
+
 
- LiVESAdjustment(double xval, double low, double upp, double step_i, double page_i, double page_s) : 
-  value(xval), lower(low), upper(upp), step_increment(step_i), page_increment(page_i), page_size(page_s), frozen(FALSE) {};
-  // TODO - set owner values from here and vice-versa
+class LiVESVBox : public LiVESBox, public QVBoxLayout {
+public:
+  LiVESVBox() {
+    set_type(LIVES_WIDGET_TYPE_VBOX);
+  }
+};
+
+
+typedef class LiVESRange LiVESRange;
 
-  // widgets we use are: LiVESScale / LiVESScrollbar = LiVESRange, LiVESSpinButton, LiVESTreeView,2, LiVESScrolledWindow,2 
-  // if we set any of these, we need to update adj manually, after temporarily setting freeze
+class LiVESAdjustment : public LiVESObject {
 
-  // update to this when freeze is false are forwarded to owner
+public:
 
+  LiVESAdjustment(double xval, double low, double upp, double step_i, double page_i, double page_s) :
+    value(xval), lower(low), upper(upp), step_increment(step_i), page_increment(page_i), page_size(page_s), frozen(FALSE) {};
 
   void set_value(double newval);
   void set_lower(double newval);
+
   void set_upper(double newval);
   void set_step_increment(double newval);
   void set_page_increment(double newval);
@@ -1294,7 +2493,7 @@
     frozen = false;
   }
 
- private:
+private:
   double value;
   double lower;
   double upper;
@@ -1308,67 +2507,89 @@
 };
 
 
+LIVES_INLINE QString qmake_mnemonic(QString qlabel) {
+  qlabel = qlabel.replace('&',"&&");
+  qlabel = qlabel.replace('_','&');
+  return qlabel;
+}
+
+
+LIVES_INLINE QString qmake_underline(QString qlabel) {
+  qlabel = qlabel.replace('&','_');
+  qlabel = qlabel.replace("__","&");
+  return qlabel;
+}
+
 
 class LiVESButtonBase : public LiVESWidget {
- public:
+public:
   LiVESButtonBase() {
     init();
   }
 
- LiVESButtonBase(QString qs) {
-   init();
+  LiVESButtonBase(QString qs) {
+    init();
   }
 
- void set_use_underline(bool use) {
-   QAbstractButton *qab = dynamic_cast<QAbstractButton *>(this);
-   if (qab != NULL) {
-     if (use && !use_underline) {
-       // alter label
-       QString qlabel = qab->text();
-       qlabel = qlabel.replace('&',"&&");
-       qlabel = qlabel.replace('_','&');
-       qab->setText(qlabel);
-     }
-     else if (!use && use_underline) {
-       QString qlabel = qab->text();
-       qlabel = qlabel.replace('&','_');
-       qlabel = qlabel.replace("__","&");
-       qab->setText(qlabel);
-     }
-   }
-   use_underline = use;
- }
-
- bool get_use_underline() {
-   return use_underline;
- }
+  void set_use_underline(bool use) {
+    QAbstractButton *qab = dynamic_cast<QAbstractButton *>(this);
+    if (qab != NULL) {
+      if (use && !use_underline) {
+        // alter label
+        qab->setText(qmake_mnemonic(qab->text()));
+      } else if (!use && use_underline) {
+        qab->setText(qmake_underline(qab->text()));
+      }
+    }
+    use_underline = use;
+  }
 
- private:
- bool use_underline;
+  bool get_use_underline() {
+    return use_underline;
+  }
 
- void init() {
+private:
+  bool use_underline;
+
+  void init() {
     use_underline = false;
- }
+  }
 
 };
 
 
+
+class LiVESToggleButton : public LiVESButtonBase, public QCheckBox {};
+
+
+
+
 class LiVESButton : public LiVESButtonBase, public QPushButton {
- public:
+public:
 
- LiVESButton() {
+  LiVESButton() {
     init();
   }
 
- LiVESButton(QString qs) {
-   init();
- }
+  LiVESButton(QString qs) {
+    init();
+  }
 
+  LiVESWidget *get_layout() {
+    if (layout == NULL) {
+      layout = new LiVESVBox;
+      (static_cast<QPushButton *>(this))->setLayout(dynamic_cast<QLayout *>(layout));
+      if ((static_cast<LiVESWidget *>(this))->isVisible()) layout->setVisible(true);
+      add_child(layout);
+    }
+    return layout;
+  }
 
- private:
- void init() {
+private:
+  LiVESWidget *layout;
+  void init() {
     set_type(LIVES_WIDGET_TYPE_BUTTON);
- }
+  }
 
 };
 
@@ -1376,9 +2597,9 @@
 
 
 class LiVESSpinButton : public LiVESButtonBase, public QDoubleSpinBox {
- public:
+public:
 
- LiVESSpinButton(LiVESAdjustment *xadj, double climb_rate, uint32_t digits) : adj(xadj) {
+  LiVESSpinButton(LiVESAdjustment *xadj, double climb_rate, uint32_t digits) : adj(xadj) {
     init();
 
     adj->set_owner(this);
@@ -1402,77 +2623,77 @@
     adj->thaw();
   }
 
- private:
- LiVESAdjustment *adj;
+private:
+  LiVESAdjustment *adj;
 
- void init() {
-   set_type(LIVES_WIDGET_TYPE_SPIN_BUTTON);
- }
+  void init() {
+    set_type(LIVES_WIDGET_TYPE_SPIN_BUTTON);
+  }
 
 };
 
 
 
 
-class LiVESRadioButton : public LiVESButtonBase, public QPushButton {
- public:
+class LiVESRadioButton : public LiVESButtonBase, public QRadioButton {
+public:
   LiVESRadioButton() {
     init();
   }
 
- LiVESRadioButton(QString qs) {
-   init();
- }
-
- void set_group(LiVESSList *xlist) {
-   slist = xlist;
- }
-
- LiVESSList *get_list() {
-   return slist;
- }
+  LiVESRadioButton(QString qs) {
+    init();
+  }
+
+  void set_group(LiVESSList *xlist) {
+    slist = xlist;
+  }
+
+  LiVESSList *get_list() {
+    return slist;
+  }
 
 
   ~LiVESRadioButton() {
     QButtonGroup *qbg = (QButtonGroup *)lives_slist_nth_data(slist, 0);
     QList<QAbstractButton *> ql = qbg->buttons();
-    if (ql.size() == 1) lives_slist_remove(slist, (const void *)qbg);
+    if (ql.size() == 1) lives_slist_remove(slist, (livesconstpointer)qbg);
   }
 
- private:
- LiVESSList *slist;
+private:
+  LiVESSList *slist;
 
- void init() {
-   setCheckable(true);
-   set_type(LIVES_WIDGET_TYPE_RADIO_BUTTON);
- }
+  void init() {
+    //setCheckable(true);
+    set_type(LIVES_WIDGET_TYPE_RADIO_BUTTON);
+  }
 
 };
 
 
 
-class LiVESCheckButton : public LiVESButtonBase, public QCheckBox {
- public:
+class LiVESCheckButton : public LiVESToggleButton {
+public:
 
   LiVESCheckButton() {
     init();
   }
 
- LiVESCheckButton(QString qs) {
-   init();
- }
+  LiVESCheckButton(QString qs) {
+    init();
+  }
 
- private:
- void init() {
+private:
+  void init() {
     set_type(LIVES_WIDGET_TYPE_CHECK_BUTTON);
- }
+  }
 
 };
 
 
 
 class LiVESButtonBox : public LiVESWidget, public QDialogButtonBox {
- public:
+public:
   LiVESButtonBox() {
     set_type(LIVES_WIDGET_TYPE_BUTTON_BOX);
   }
@@ -1480,42 +2701,239 @@
 };
 
 
-class LiVESColorButton : public LiVESButtonBase, public QPushButton {  
- public:
-  LiVESColorButton() {
-    set_type(LIVES_WIDGET_TYPE_COLOR_BUTTON);
+
+class LiVESMenuBar : public LiVESWidget, public QMenuBar {
+public:
+  LiVESMenuBar() {
+    set_type(LIVES_WIDGET_TYPE_MENU_BAR);
   }
-};
 
 
+  void reorder_child(LiVESWidget *child, int pos) {
+    LiVESList *children = get_children();
+    LiVESList *new_children;
+    QMenuBar *qmenu = static_cast<QMenuBar *>(this);
+
+    for (int i = 0; children != NULL; i++) {
+      if (i==pos) lives_list_append(new_children,child);
+      else if (children->data != (livespointer)child) lives_list_append(new_children,children->data);
+      qmenu->removeAction((QAction *)(children->data));
+      children = children->next;
+    }
+
+    children = new_children;
 
+    for (int i = 0; new_children != NULL; i++) {
+      qmenu->addAction((QAction *)(new_children->data));
+      new_children = new_children->next;
+    }
+
+    set_children(new_children);
+  }
+
+
+
+};
 
 
-class LiVESMenu : public LiVESWidget, public QMenu {  
- public:
+
+
+class LiVESMenu : public LiVESWidget, public QMenu {
+public:
   LiVESMenu() {
     set_type(LIVES_WIDGET_TYPE_MENU);
   }
 
-  void add_accel_group(LiVESAccelGroup *group);
+  void reorder_child(LiVESWidget *child, int pos) {
+    LiVESList *children = get_children();
+    LiVESList *new_children;
+    QMenu *qmenu = static_cast<QMenu *>(this);
+
+    for (int i = 0; children != NULL; i++) {
+      if (i==pos) lives_list_append(new_children,child);
+      else if (children->data != (livespointer)child) lives_list_append(new_children,children->data);
+      qmenu->removeAction((QAction *)(children->data));
+      children = children->next;
+    }
+
+    children = new_children;
+
+    for (int i = 0; new_children != NULL; i++) {
+      qmenu->addAction((QAction *)(new_children->data));
+      new_children = new_children->next;
+    }
+
+    set_children(new_children);
+  }
+
+};
+
+
+class LiVESTornOffMenu : public LiVESMenu {
+public:
+  LiVESTornOffMenu(LiVESMenu *menu) {
+    QWidget *qmenu = static_cast<QWidget *>(static_cast<QMenu *>(menu));
+    QWidget *parentWidget = qmenu->parentWidget();
+    QWidget *qwidget = (static_cast<QWidget *>(static_cast<QMenu *>(this)));
+    qwidget->setParent(parentWidget, Qt::Window | Qt::Tool);
+    qwidget->setAttribute(Qt::WA_DeleteOnClose, true);
+    qwidget->setAttribute(Qt::WA_X11NetWmWindowTypeMenu, true);
+    qwidget->setWindowTitle(qmenu->windowTitle());
+    qwidget->setEnabled(qmenu->isEnabled());
+
+    QList<QAction *> items = qmenu->actions();
+    for (int i = 0; i < items.count(); i++)
+      qwidget->addAction(items.at(i));
+
+    set_parent(menu->get_parent());
+
+    if (qmenu->isVisible()) {
+      qmenu->hide();
+      qwidget->setVisible(true);
+    }
+
+  }
+};
+
+
+
+
+
+class LiVESMenuItem : public LiVESWidget, public QAction {
+public:
+  LiVESMenuItem(LiVESWidget *parent) : QAction(static_cast<QObject *>(static_cast<LiVESObject *>(parent))) {
+    set_type(LIVES_WIDGET_TYPE_MENU_ITEM);
+  }
+
+  LiVESMenuItem(const QString &text, LiVESWidget *parent) : QAction(text, static_cast<QObject *>(static_cast<LiVESObject *>(parent))) {
+    set_type(LIVES_WIDGET_TYPE_MENU_ITEM);
+    this->setText(text);
+  }
+
+
+
+};
+
+
+
+class LiVESToolItem : public LiVESWidget, public QHBoxLayout {
+public:
+  LiVESToolItem() {
+    init();
+  }
+
+  LiVESWidget *get_layout() {
+    if (layout == NULL) {
+      layout = new LiVESVBox;
+      (static_cast<QHBoxLayout *>(this))->addLayout(dynamic_cast<QLayout *>(layout));
+      if ((static_cast<LiVESWidget *>(this))->isVisible()) layout->setVisible(true);
+      add_child(layout);
+    }
+    return layout;
+  }
+
+private:
+  LiVESWidget *layout;
+
+  void init() {
+    set_type(LIVES_WIDGET_TYPE_TOOL_ITEM);
+  }
+};
+
+
+
+
+typedef LiVESMenuItem LiVESImageMenuItem;
+
+
+
+class LiVESMenuToolButton : public LiVESToolItem, public QWidgetAction {
+public:
+
+  LiVESMenuToolButton(const QString &text, LiVESWidget *parent, LiVESWidget *icon) :
+    QWidgetAction(static_cast<QObject *>(static_cast<LiVESObject *>(parent))) {
+    QPushButton *qbutton = new QPushButton(text);
+    set_type(LIVES_WIDGET_TYPE_MENU_TOOL_BUTTON);
+    setDefaultWidget(qbutton);
+    //setIcon(qicon);
+  }
+
+};
+
+
+
+
+class LiVESCheckMenuItem : public LiVESWidget, public QAction {
+public:
+  LiVESCheckMenuItem(LiVESWidget *parent) : QAction(static_cast<QObject *>(static_cast<LiVESObject *>(parent))) {
+  }
+
+  LiVESCheckMenuItem(const QString &text, LiVESWidget *parent) : QAction(text, static_cast<QObject *>(static_cast<LiVESObject *>(parent))) {
+    setText(text);
+  }
+
+private:
+  void init() {
+    set_type(LIVES_WIDGET_TYPE_CHECK_MENU_ITEM);
+    setCheckable(true);
+  }
+
+
+};
+
+
+class LiVESRadioMenuItem : public LiVESMenuItem {
+public:
+
+  LiVESRadioMenuItem(LiVESWidget *parent) : LiVESMenuItem(parent) {
+    init();
+  }
+
+  LiVESRadioMenuItem(const QString &text, LiVESWidget *parent) : LiVESMenuItem(text, parent) {
+    init();
+    setText(text);
+  }
 
+
+  void set_group(LiVESSList *xlist) {
+    slist = xlist;
+  }
+
+  LiVESSList *get_list() {
+    return slist;
+  }
+
+
+  ~LiVESRadioMenuItem() {
+    QActionGroup *qag = const_cast<QActionGroup *>(static_cast<const QActionGroup *>(lives_slist_nth_data(slist, 0)));
+    QList<QAction *> ql = qag->actions();
+    if (ql.size() == 1) lives_slist_remove(slist, (livesconstpointer)qag);
+  }
+
+private:
+  LiVESSList *slist;
+
+  void init() {
+    setCheckable(true);
+    set_type(LIVES_WIDGET_TYPE_RADIO_MENU_ITEM);
+  }
 };
 
 
 
 
-class LiVESCombo : public LiVESWidget, public QComboBox {  
- public:
+class LiVESCombo : public LiVESWidget, public QComboBox {
+public:
   LiVESCombo() {
     set_type(LIVES_WIDGET_TYPE_COMBO);
   }
 };
 
 
-class LiVESHSeparator : public LiVESWidget, public QHBoxLayout {  
- public:
+class LiVESHSeparator : public LiVESWidget, public QHBoxLayout {
+public:
   LiVESHSeparator() {
-    QFrame* line = new QFrame();
+    QFrame *line = new QFrame();
     line->setFrameShape(QFrame::HLine);
     line->setFrameShadow(QFrame::Sunken);
     addWidget(line);
@@ -1525,10 +2943,10 @@
 
 
 
-class LiVESVSeparator : public LiVESWidget, public QVBoxLayout {  
- public:
+class LiVESVSeparator : public LiVESWidget, public QVBoxLayout {
+public:
   LiVESVSeparator() {
-    QFrame* line = new QFrame();
+    QFrame *line = new QFrame();
     line->setFrameShape(QFrame::VLine);
     line->setFrameShadow(QFrame::Sunken);
     addWidget(line);
@@ -1538,8 +2956,8 @@
 
 
 
-class LiVESTextBuffer : public LiVESWidget, public QTextDocument {  
- public:
+class LiVESTextBuffer : public LiVESWidget, public QTextDocument {
+public:
 
   LiVESTextBuffer() {
     insert = QTextCursor(this);
@@ -1549,22 +2967,22 @@
     return insert;
   }
 
- private:
+private:
   QTextCursor insert;
 
 };
 
 
 
-class LiVESTextView : public LiVESWidget, public QTextEdit {  
- public:
+class LiVESTextView : public LiVESWidget, public QTextEdit {
+public:
 
   LiVESTextView() {
     buff = new LiVESTextBuffer();
   }
 
 
- LiVESTextView(LiVESTextBuffer *xbuff) : QTextEdit(), buff(xbuff) {
+  LiVESTextView(LiVESTextBuffer *xbuff) : QTextEdit(), buff(xbuff) {
     set_type(LIVES_WIDGET_TYPE_TEXT_VIEW);
     setDocument(buff);
   }
@@ -1578,7 +2996,7 @@
     return buff;
   }
 
- private:
+private:
   LiVESTextBuffer *buff;
 
   void init() {
@@ -1592,11 +3010,11 @@
 
 
 class LiVESTextMark : public LiVESObject, public QTextCursor {
- public:
+public:
 
- LiVESTextMark(LiVESTextBuffer *tbuff, const char *mark_name, 
-	       int where, boolean left_gravity) : QTextCursor(tbuff), name(mark_name), lgrav(left_gravity) {
-    ((QTextCursor *)this)->setPosition(where);
+  LiVESTextMark(LiVESTextBuffer *tbuff, const char *mark_name,
+                int where, boolean left_gravity) : QTextCursor(tbuff), name(mark_name), lgrav(left_gravity) {
+    (static_cast<QTextCursor *>(this))->setPosition(where);
   }
 
   ~LiVESTextMark() {
@@ -1607,7 +3025,7 @@
     return name;
   }
 
- private:
+private:
   const char *name;
   boolean lgrav;
 
@@ -1618,33 +3036,34 @@
 class LiVESRange : public LiVESWidget {
   Q_OBJECT
 
- public:
+public:
   LiVESRange(LiVESAdjustment *adj) {
     init(adj);
   }
 
   virtual void init(LiVESAdjustment *adj) {}
-  
+
   LiVESAdjustment *get_adj() {
     return adj;
   }
 
-Q_SLOTS
+public slots:
   void valueChanged(int value) {
     adj->freeze();
     adj->set_value(value);
     adj->thaw();
   }
 
- private:
-  LiVESAdjustment *adj;  
+private:
+  LiVESAdjustment *adj;
 
 };
 
 
-class LiVESScale : public LiVESRange, public QSlider {  
- public:
- LiVESScale(Qt::Orientation, LiVESAdjustment *xadj) : LiVESRange(xadj) {
+class LiVESScale : public LiVESRange, public QSlider {
+  // TODO - add a label
+public:
+  LiVESScale(Qt::Orientation, LiVESAdjustment *xadj) : LiVESRange(xadj) {
     set_type(LIVES_WIDGET_TYPE_SCALE);
   }
 
@@ -1659,9 +3078,9 @@
 };
 
 
-class LiVESScrollbar : public LiVESRange, public QScrollBar {  
- public:
- LiVESScrollbar(Qt::Orientation, LiVESAdjustment *xadj) : LiVESRange(xadj) {
+class LiVESScrollbar : public LiVESRange, public QScrollBar {
+public:
+  LiVESScrollbar(Qt::Orientation, LiVESAdjustment *xadj) : LiVESRange(xadj) {
     set_type(LIVES_WIDGET_TYPE_SCROLLBAR);
   }
 
@@ -1676,17 +3095,19 @@
 
 };
 
+typedef LiVESScrollbar LiVESHScrollbar;
 
-class LiVESEntry : public LiVESWidget, public QLineEdit {  
- public:
+
+class LiVESEntry : public LiVESWidget, public QLineEdit {
+public:
   LiVESEntry() {
     set_type(LIVES_WIDGET_TYPE_ENTRY);
   }
 };
 
 
-class LiVESProgressBar : public LiVESWidget, public QProgressBar {  
- public:
+class LiVESProgressBar : public LiVESWidget, public QProgressBar {
+public:
   LiVESProgressBar() {
     set_type(LIVES_WIDGET_TYPE_PROGRESS_BAR);
   }
@@ -1694,7 +3115,7 @@
 
 
 class LiVESPaned : public LiVESWidget, public QSplitter {
- public:
+public:
 
   LiVESPaned() {
     set_type(LIVES_WIDGET_TYPE_PANED);
@@ -1702,68 +3123,107 @@
 };
 
 
-class LiVESBox : public LiVESWidget {};
-
+class LiVESLabel : public LiVESWidget, public QLabel {
+public:
+  LiVESLabel(QString qstring) {
+    set_type(LIVES_WIDGET_TYPE_LABEL);
+  }
 
-class LiVESHBox : public LiVESBox, public QHBoxLayout {
- public:
-  LiVESHBox() {
-    set_type(LIVES_WIDGET_TYPE_HBOX);
+  LiVESWidget *get_mnemonic_widget() {
+    return mnemonicw;
   }
-};
 
+  void set_mnemonic_widget(LiVESWidget *widget) {
+    mnemonicw = widget;
+  }
 
-class LiVESEventBox : public LiVESBox, public QHBoxLayout {
- public:
-  LiVESEventBox() {
-    set_type(LIVES_WIDGET_TYPE_EVENT_BOX);
+  void set_owner(LiVESWidget *xowner) {
+    owner = xowner;
   }
-};
 
+  LiVESWidget *get_owner() {
+    return owner;
+  }
 
-class LiVESVBox : public LiVESBox, public QVBoxLayout {
- public:
-  LiVESVBox() {
-    set_type(LIVES_WIDGET_TYPE_VBOX);
+  void set_text(QString text) {
+    // if we have an owner, update owner text
+    // TODO
   }
-};
 
 
-class LiVESLabel : public LiVESWidget, public QLabel {
- public:
-  LiVESLabel(QString qstring) {
-    set_type(LIVES_WIDGET_TYPE_LABEL);
-  }
+private:
+  LiVESWidget *mnemonicw;
+  LiVESWidget *owner; // TODO
 };
 
 
 class LiVESRuler : public LiVESWidget, public QSlider {
- public:
+public:
   LiVESRuler() {
     set_type(LIVES_WIDGET_TYPE_RULER);
   }
 };
 
 
-typedef LiVESWidget LiVESToolItem;
 
 
-class LiVESToolButton : public LiVESButtonBase, public QToolButton {
- public:
+class LiVESScrolledWindow : public LiVESWidget, public QScrollArea {
+public:
+  LiVESScrolledWindow(LiVESAdjustment *xhadj, LiVESAdjustment *xvadj) : hadj(xhadj), vadj(xvadj) {
+    set_type(LIVES_WIDGET_TYPE_SCROLLED_WINDOW);
+    hadj->set_owner(this);
+    vadj->set_owner(this);
+
+    QScrollBar *hs = horizontalScrollBar();
+    hs->setMinimum(hadj->get_lower());
+    hs->setMaximum(hadj->get_upper());
+    hs->setValue(hadj->get_value());
+    hs->setSingleStep(hadj->get_step_increment());
+    hs->setPageStep(hadj->get_page_increment());
+
+    QScrollBar *vs = verticalScrollBar();
+    vs->setMinimum(vadj->get_lower());
+    vs->setMaximum(vadj->get_upper());
+    vs->setValue(vadj->get_value());
+    vs->setSingleStep(vadj->get_step_increment());
+    vs->setPageStep(vadj->get_page_increment());
+
+  }
+
+  LiVESAdjustment *get_hadj() {
+    return hadj;
+  }
+
+  LiVESAdjustment *get_vadj() {
+    return vadj;
+  }
+
+private:
+  LiVESAdjustment *hadj;
+  LiVESAdjustment *vadj;
+
+};
+
+
+
+
+
+class LiVESToolButton : public LiVESToolItem, public QToolButton {
+public:
 
   LiVESToolButton(LiVESWidget *icon_widget, const char *label) {
     set_type(LIVES_WIDGET_TYPE_TOOL_BUTTON);
     set_icon_widget(icon_widget);
     layout = new LiVESVBox;
-    QBoxLayout *ql = (QVBoxLayout *)layout;
+    QBoxLayout *ql = static_cast<QVBoxLayout *>(layout);
     ql->setParent(static_cast<QToolButton *>(this));
     add_child(layout);
     if (label != NULL) {
-      label_widget = new LiVESLabel(label);
-      ((QBoxLayout *)layout)->addWidget((QLabel *)label_widget);
-      layout->add_child(label_widget);
-    }
-    else label_widget = NULL;
+      LiVESWidget *widget = new LiVESLabel(label);
+      layout->add_child(widget);
+      label_widget = dynamic_cast<LiVESLabel *>(widget);
+      (static_cast<QBoxLayout *>(layout))->addWidget(static_cast<QLabel *>(label_widget));
+    } else label_widget = NULL;
   }
 
 
@@ -1786,33 +3246,59 @@
 
   void set_label_widget(LiVESWidget *widget) {
     if (label_widget != NULL) {
-      layout->remove_child(label_widget);
-      layout->removeWidget(label_widget);
+      layout->remove_child(static_cast<LiVESWidget *>(label_widget));
+      layout->removeWidget(static_cast<LiVESWidget *>(label_widget));
     }
-    label_widget = widget;
     if (widget != NULL) {
-      layout->addWidget(label_widget);
+      layout->addWidget(widget);
+      label_widget = dynamic_cast<LiVESLabel *>(widget);
       layout->add_child(label_widget);
+      label_widget->set_owner(this);
+    } else label_widget = NULL;
+  }
+
+
+  void set_use_underline(bool use) {
+    QAbstractButton *qab = dynamic_cast<QAbstractButton *>(this);
+    if (qab != NULL) {
+      if (use && !use_underline) {
+        // alter label
+        qab->setText(qmake_mnemonic(qab->text()));
+      } else if (!use && use_underline) {
+        qab->setText(qmake_underline(qab->text()));
+      }
     }
+    use_underline = use;
+  }
+
+  bool get_use_underline() {
+    return use_underline;
+  }
+
+private:
+  bool use_underline;
+
+  void init() {
+    use_underline = false;
   }
 
- private:
+private:
   LiVESWidget *icon_widget;
-  LiVESWidget *label_widget;
+  LiVESLabel *label_widget;
   LiVESVBox *layout;
-  
+
 };
 
 
-typedef LiVESToolButton LiVESMenuToolButton;
 
 
-class LiVESToggleButton : public LiVESButtonBase, public QAbstractButton {};
+
+
 
 typedef class LiVESWindow LiVESWindow;
 
 class LiVESAccelGroup {
- public:
+public:
   void add_all_accelerators(LiVESObject *window);
   void add_widget(LiVESObject *window);
   void remove_all_accelerators(LiVESObject *window);
@@ -1823,7 +3309,7 @@
 
   ~LiVESAccelGroup();
 
- private:
+private:
   QList<LiVESObject *>widgets;
   QList<LiVESAccel *>accels;
 
@@ -1861,8 +3347,7 @@
     if (((LiVESAccel *)*it)->group == group && ((LiVESAccel *)*it)->ks == ks) {
       remove_accel((LiVESAccel *)*it);
       ret = true;
-    }
-    else
+    } else
       ++it;
   }
   return ret;
@@ -1881,20 +3366,41 @@
 
 class LiVESWindow : public LiVESWidget {};
 
+typedef int LiVESWindowPosition;
+#define LIVES_WIN_POS_DEFAULT 0
+#define LIVES_WIN_POS_CENTER_ALWAYS 1
 
 
 class LiVESMainWindow : public LiVESWindow, public QMainWindow {
- public:
+public:
   LiVESMainWindow() {
     set_type(LIVES_WIDGET_TYPE_MAIN_WINDOW);
+    set_position(LIVES_WIN_POS_DEFAULT);
+  }
+
+  LiVESWidget *get_layout() {
+    if (layout == NULL) {
+      layout = new LiVESVBox;
+      (static_cast<QMainWindow *>(this))->setLayout(dynamic_cast<QLayout *>(layout));
+      if ((static_cast<LiVESWidget *>(this))->isVisible()) layout->setVisible(true);
+      add_child(layout);
+    }
+    return layout;
   }
-};
 
-class LiVESSubWindow : public LiVESWindow, public QDialog {
- public:
-  LiVESSubWindow() {
-    set_type(LIVES_WIDGET_TYPE_SUB_WINDOW);
+  void set_position(LiVESWindowPosition xpos) {
+    pos = xpos;
   }
+
+  LiVESWindowPosition get_position() {
+    return pos;
+  }
+
+
+private:
+  LiVESWidget *layout;
+  LiVESWindowPosition pos;
+
 };
 
 
@@ -1931,100 +3437,190 @@
 
 class LiVESVLayout: public LiVESWidget, public QVBoxLayout {};
 
-class LiVESDialog : public LiVESWidget, public QDialog {
- public:
+class LiVESDialog : public LiVESWindow, public QDialog {
+public:
   LiVESDialog() {
+    QDialog *qd = static_cast<QDialog *>(this);
+    QVBoxLayout *layout = new QVBoxLayout;
+    layout->setMargin(0);
+    qd->setLayout(layout);
+
     contentArea = new LiVESVLayout();
-    QVBoxLayout *ca = (QVBoxLayout *)contentArea;
+    QVBoxLayout *ca = dynamic_cast<QVBoxLayout *>(contentArea);
     ca->setMargin(0);
-    QDialog *qd = (QDialog *)this;
-    qd->setLayout(ca);
+    layout->insertLayout(0, ca);
+
+    actionArea = new LiVESButtonBox;
+    QDialogButtonBox *bb = dynamic_cast<QDialogButtonBox *>(actionArea);
+    bb->setContentsMargins(0, 0, 0, 0);
+    layout->addWidget(bb);
+
     set_type(LIVES_WIDGET_TYPE_DIALOG);
+
+    add_child(actionArea);
+    add_child(contentArea);
+
   }
 
   LiVESWidget *get_content_area() {
     return contentArea;
   }
 
- private:
+  LiVESWidget *get_action_area() {
+    return actionArea;
+  }
+
+  LiVESWidget *get_layout() {
+    if (layout == NULL) {
+      layout = new LiVESVBox;
+      (static_cast<QDialog *>(this))->setLayout(dynamic_cast<QLayout *>(layout));
+      if ((static_cast<LiVESWidget *>(this))->isVisible()) layout->setVisible(true);
+      add_child(layout);
+    }
+    return layout;
+  }
+
+private:
+  LiVESWidget *layout;
   LiVESWidget *contentArea;
+  LiVESWidget *actionArea;
 };
 
 
+typedef int LiVESDialogFlags;
+typedef QMessageBox::Icon LiVESMessageType;
+
+#define LIVES_MESSAGE_INFO QMessageBox::Information
+#define LIVES_MESSAGE_WARNING QMessageBox::Warning
+#define LIVES_MESSAGE_QUESTION QMessageBox::Question
+#define LIVES_MESSAGE_ERROR QMessageBox::Warning
+#define LIVES_MESSAGE_OTHER QMessageBox::NoIcon
+
+typedef int LiVESButtonsType;
+#define LIVES_BUTTONS_NONE 0
+
+class LiVESMessageDialog : public LiVESWindow, public QMessageBox {
+public:
+  LiVESMessageDialog() {
+    QMessageBox *qd = static_cast<QMessageBox *>(this);
+    QVBoxLayout *layout = new QVBoxLayout;
+    layout->setMargin(0);
+    qd->setLayout(layout);
+
+    contentArea = new LiVESVLayout();
+    QVBoxLayout *ca = dynamic_cast<QVBoxLayout *>(contentArea);
+    ca->setMargin(0);
+    layout->insertLayout(0, ca);
+
+    actionArea = new LiVESButtonBox;
+    QDialogButtonBox *bb = dynamic_cast<QDialogButtonBox *>(actionArea);
+    bb->setContentsMargins(0, 0, 0, 0);
+    layout->addWidget(bb);
+
+    set_type(LIVES_WIDGET_TYPE_DIALOG);
+
+    add_child(actionArea);
+    add_child(contentArea);
+
+  }
+
+  LiVESWidget *get_content_area() {
+    return contentArea;
+  }
+
+  LiVESWidget *get_action_area() {
+    return actionArea;
+  }
+
+  LiVESWidget *get_layout() {
+    if (layout == NULL) {
+      layout = new LiVESVBox;
+      (static_cast<QDialog *>(this))->setLayout(dynamic_cast<QLayout *>(layout));
+      if ((static_cast<LiVESWidget *>(this))->isVisible()) layout->setVisible(true);
+      add_child(layout);
+    }
+    return layout;
+  }
+
+private:
+  LiVESWidget *layout;
+  LiVESWidget *contentArea;
+  LiVESWidget *actionArea;
+};
+
+
+typedef void LiVESAboutDialog;
+
+
 class LiVESAlignment: public LiVESWidget, public QGridLayout {
- public:
+public:
   float xalign, yalign, xscale, yscale;
 
- LiVESAlignment(float xxalign, float yyalign, float xxscale, float yyscale) :
-  xalign(xxalign),
+  LiVESAlignment(float xxalign, float yyalign, float xxscale, float yyscale) :
+    xalign(xxalign),
     yalign(yyalign),
     xscale(xxscale),
-    yscale(yyscale)
-  {
+    yscale(yyscale) {
     set_type(LIVES_WIDGET_TYPE_ALIGNMENT);
   }
 
- void set_alignment(float xxalign, float yyalign, float xxscale, float yyscale) 
- {
-   xalign = xxalign;
-   yalign = yyalign;
-   xscale = xxscale;
-   yscale = yyscale;
+  void set_alignment(float xxalign, float yyalign, float xxscale, float yyscale) {
+    xalign = xxalign;
+    yalign = yyalign;
+    xscale = xxscale;
+    yscale = yyscale;
 
-   // do something with layout spacers
-   // or setContentsmargins()
+    // do something with layout spacers
+    // or setContentsmargins()
 
- }
+  }
 
 
 };
 
 
 class LiVESImage : public LiVESWidget, public QImage {
- public:
-
- LiVESImage() {
-   init();
- }
-
- LiVESImage (QImage *lim) {
-   init();
- };
-
- LiVESImage(int width, int height, QImage::Format fmt) {
-   init();
- }
-
- LiVESImage(uint8_t *data, int width, int height, int bpl, QImage::Format fmt, QImageCleanupFunction cleanupFunction, void * cleanupInfo) {
-   init();
- }
-
- private:
- void init() {
-   set_type(LIVES_WIDGET_TYPE_IMAGE);
- }
-
-};
+public:
 
+  LiVESImage() {
+    init();
+  }
 
+  LiVESImage(QImage *lim) {
+    init();
+  };
 
+  LiVESImage(int width, int height, QImage::Format fmt) {
+    init();
+  }
 
-class LiVESArrow : public LiVESImage {
- public:
- LiVESArrow(QImage *image) {
-    set_type(LIVES_WIDGET_TYPE_ARROW);
+  LiVESImage(uint8_t *data, int width, int height, int bpl, QImage::Format fmt, QImageCleanupFunction cleanupFunction,
+             livespointer cleanupInfo) {
+    init();
   }
-};
 
+private:
+  void init() {
+    set_type(LIVES_WIDGET_TYPE_IMAGE);
+  }
 
+};
 
-/*class LiVESCellRenderer {
 
 
-  };*/
 
-typedef char LiVESCellRenderer;
+class LiVESArrow : public LiVESImage {
+public:
+  LiVESArrow(QImage *image) {
+    set_type(LIVES_WIDGET_TYPE_ARROW);
+  }
+};
 
+// rendertypes
+#define LIVES_CELL_RENDERER_TEXT 1
+#define LIVES_CELL_RENDERER_SPIN 2
+#define LIVES_CELL_RENDERER_TOGGLE 3
+#define LIVES_CELL_RENDERER_PIXBUF 4
 
 
 typedef struct {
@@ -2039,13 +3635,15 @@
 #define LIVES_TREE_VIEW_COLUMN_FIXED QHeaderView::Fixed
 
 typedef class LiVESTreeView LiVESTreeView;
+typedef LiVESTreeView LiVESTreeSelection;
 
-class LiVESTreeViewColumn : public QStyledItemDelegate {
+
+class LiVESTreeViewColumn : public LiVESObject, public QStyledItemDelegate {
   friend LiVESTreeView;
 
- public:
+public:
 
-  LiVESTreeViewColumn() {
+  LiVESTreeViewColumn(int rendertype) {
     fwidth = -1;
   }
 
@@ -2053,8 +3651,7 @@
     title = strdup(xtitle);
   }
 
-  void pack_start(LiVESCellRenderer *xrend, boolean xexpand) {
-    rend = xrend;
+  void set_expand(boolean xexpand) {
     expand = xexpand;
   }
 
@@ -2088,22 +3685,69 @@
   }
 
 
- protected:
+protected:
   int fwidth;
+  int rendertype;
   LiVESTreeViewColumnSizing sizing;
   QList<tvattrcol *>attributes;
   const char *title;
-  LiVESCellRenderer *rend;
   boolean expand;
 };
 
 
-typedef QItemSelectionModel LiVESTreeSelection;
+typedef LiVESTreeViewColumn LiVESCellRenderer;
+
+
+typedef QAbstractItemView::SelectionMode LiVESSelectionMode;
+#define LIVES_SELECTION_NONE QAbstractItemView::NoSelection
+#define LIVES_SELECTION_SINGLE QAbstractItemView::SingleSelection
+#define LIVES_SELECTION_MULTIPLE QAbstractItemView::MultiSelection
+
+
+typedef class LiVESTreeStore LiVESTreeStore;
+
+
+class LiVESTreeModel : public LiVESObject, public QStandardItemModel {
+  friend LiVESTreeStore;
+
+public:
+
+  QStandardItemModel *to_qsimodel() {
+    QStandardItemModel *qsim = static_cast<QStandardItemModel *>(this);
+    QVariant qv = QVariant::fromValue(static_cast<LiVESObject *>(this));
+    qsim->setProperty("LiVESObject", qv);
+    return qsim;
+  }
+
+  int get_coltype(int index) {
+    return coltypes[index];
+  }
+
+  void set_tree_widget(LiVESTreeView *twidget);
+  QTreeWidget *get_qtree_widget();
+
+protected:
+  void set_coltypes(int ncols, int *types) {
+    for (int i = 0; i < ncols; i++) {
+      coltypes.append(types[i]);
+    }
+  }
+
+
+private:
+  LiVESTreeView *widget;
+  QList<int> coltypes;
+
+};
+
+
+typedef LiVESTreeModel LiVESListModel;
+
 
 class LiVESTreeView : public LiVESWidget, public QTreeWidget {
-  Q_OBJECT
+  //Q_OBJECT
 
- public:
+public:
   LiVESTreeView() {
     set_type(LIVES_WIDGET_TYPE_TREE_VIEW);
 
@@ -2119,35 +3763,48 @@
 
   }
 
-  void set_model (QStandardItemModel *xqmodel) {
-    qmodel = xqmodel;
+  void set_model(LiVESTreeModel *xmodel) {
+    model = xmodel;
+    xmodel->set_tree_widget(this);
+    QStandardItemModel *qmodel = xmodel->to_qsimodel();
+    (static_cast<QAbstractItemView *>(this))->setModel(static_cast<QAbstractItemModel *>(qmodel));
+  }
+
+  LiVESTreeModel *get_model() {
+    return model;
   }
 
+
+
   void append_column(LiVESTreeViewColumn *col) {
     // make QList from data in column x
 
     // get stuff from attributes
     QList<tvattrcol *> ql = col->get_attributes();
     QList<QStandardItem *> qvals;
+    QStandardItemModel *qmodel = model->to_qsimodel();
+
     int attrcol;
+
     for (int i=0; i < ql.size(); i++) {
       attrcol = ql[i]->col;
       if (!strcmp(ql[i]->attr,"text")) {
-	// make QList of QString from model col 
-	qmodel->appendColumn(qvals);
+        // TODO
+        // make QList of QString from model col
+        qmodel->appendColumn(qvals);
       }
 
       else if (!strcmp(ql[i]->attr,"pixbuf")) {
-	// make QList of QIcons from model col 
-	qmodel->appendColumn(qvals);
+        // make QList of QIcons from model col
+        qmodel->appendColumn(qvals);
       }
 
       else if (!strcmp(ql[i]->attr,"active")) {
-	// make QList of checkable from model col 
-	qmodel->appendColumn(qvals);
+        // make QList of checkable from model col
+        qmodel->appendColumn(qvals);
       }
     }
-    
+
     int newcol = qmodel->columnCount();
     QTreeView *qtv = static_cast<QTreeView *>(this);
     if (col->fwidth != -1) {
@@ -2156,7 +3813,7 @@
 
     QHeaderView *qv = (static_cast<QTreeView *>(this))->header();
     qv->setSectionResizeMode(newcol, col->sizing);
-    
+
     //resizeColumnToContents()
 
   }
@@ -2170,7 +3827,7 @@
   }
 
 
-Q_SLOTS
+  /*  public slots:
 
   void hvalue_changed(int newval) {
     hadj->freeze();
@@ -2183,59 +3840,47 @@
     vadj->set_value(newval);
     vadj->thaw();
   }
+  */
 
-
- private:
-  QStandardItemModel *qmodel;
+private:
+  LiVESTreeModel *model;
   LiVESAdjustment *hadj, *vadj;
-
 };
 
 
+#define LIVES_COL_TYPE_STRING 1
+#define LIVES_COL_TYPE_INT 2
+#define LIVES_COL_TYPE_UINT 3
+#define LIVES_COL_TYPE_BOOLEAN 4
+#define LIVES_COL_TYPE_PIXBUF 5
 
-class LiVESTreeModel : public LiVESObject, public QStandardItemModel {
- public:
-  
-  LiVESTreeModel(QStandardItemModel *xmodel) {
-    QVariant qv = QVariant::fromValue((LiVESObject *)this);
-    ((QStandardItemModel *)this)->setProperty("LiVESObject", qv);
-  }
-
-  void set_tree_widget(LiVESTreeView *twidget) {
-    widget = twidget;
-  }
 
-  QStandardItemModel *get_model() {
-    return static_cast<QStandardItemModel *>(this);
-  }
+typedef QTreeWidgetItem LiVESTreeIter;
 
-  QTreeWidget *get_tree_widget() {
-    return static_cast<QTreeWidget *>(widget);
-  }
+void LiVESTreeModel::set_tree_widget(LiVESTreeView *twidget) {
+  widget = twidget;
+}
 
-  ~LiVESTreeModel() {
-    widget->dec_refcount();
-  }
+QTreeWidget *LiVESTreeModel::get_qtree_widget() {
+  return static_cast<QTreeWidget *>(widget);
+}
 
- private:
-  LiVESTreeView *widget;
 
-};
 
+class LiVESTreeStore : public LiVESTreeModel {
+public:
+  LiVESTreeStore(int ncols, int *types) {}
 
+};
 
-typedef QTreeWidgetItem LiVESTreeIter;
 
+class LiVESListStore : public LiVESListModel {
+public:
+  LiVESListStore(int ncols, int *types) {}
 
+};
 
-class LiVESTreeStore : public LiVESObject, public QStandardItemModel {
- public:
-  LiVESTreeStore() {
-    QVariant qv = QVariant::fromValue((LiVESObject *)this);
-    ((QStandardItemModel *)this)->setProperty("LiVESObject", qv);
-  }
 
-};
 
 
 
@@ -2247,21 +3892,22 @@
 
     if (LIVES_IS_SCALE(owner)) {
       (dynamic_cast<QAbstractSlider *>(owner))->setValue(newval);
-    }
-    else if (LIVES_IS_SCROLLBAR(owner)){
-      //
+    } else if (LIVES_IS_SCROLLBAR(owner)) {
       (dynamic_cast<QScrollBar *>(owner))->setValue(newval);
-    }
-    else if (LIVES_IS_SPIN_BUTTON(owner)){
+    } else if (LIVES_IS_SPIN_BUTTON(owner)) {
       //
       (dynamic_cast<QDoubleSpinBox *>(owner))->setValue(newval);
-    }
-    else if (LIVES_IS_TREE_VIEW(owner)) {
+    } else if (LIVES_IS_TREE_VIEW(owner)) {
       if (this == (dynamic_cast<LiVESTreeView *>(owner))->get_hadj()) {
-	(dynamic_cast<QAbstractScrollArea *>(owner))->horizontalScrollBar()->setValue(newval);
+        (dynamic_cast<QAbstractScrollArea *>(owner))->horizontalScrollBar()->setValue(newval);
+      } else {
+        (dynamic_cast<QAbstractScrollArea *>(owner))->verticalScrollBar()->setValue(newval);
       }
-      else {
-	(dynamic_cast<QAbstractScrollArea *>(owner))->verticalScrollBar()->setValue(newval);
+    } else if (LIVES_IS_SCROLLED_WINDOW(owner)) {
+      if (this == (dynamic_cast<LiVESScrolledWindow *>(owner))->get_hadj()) {
+        (dynamic_cast<QAbstractScrollArea *>(owner))->horizontalScrollBar()->setValue(newval);
+      } else {
+        (dynamic_cast<QAbstractScrollArea *>(owner))->verticalScrollBar()->setValue(newval);
       }
     }
   }
@@ -2276,21 +3922,23 @@
 
     if (LIVES_IS_SCALE(owner)) {
       (dynamic_cast<QAbstractSlider *>(owner))->setMaximum(newval);
-    }
-    else if (LIVES_IS_SCROLLBAR(owner)){
+    } else if (LIVES_IS_SCROLLBAR(owner)) {
       //
       (dynamic_cast<QScrollBar *>(owner))->setMaximum(newval);
-    }
-    else if (LIVES_IS_SPIN_BUTTON(owner)){
+    } else if (LIVES_IS_SPIN_BUTTON(owner)) {
       //
       (dynamic_cast<QDoubleSpinBox *>(owner))->setMaximum(newval);
-    }
-    else if (LIVES_IS_TREE_VIEW(owner)) {
+    } else if (LIVES_IS_TREE_VIEW(owner)) {
       if (this == (dynamic_cast<LiVESTreeView *>(owner))->get_hadj()) {
-	(dynamic_cast<QAbstractScrollArea *>(owner))->horizontalScrollBar()->setMaximum(newval);
+        (dynamic_cast<QAbstractScrollArea *>(owner))->horizontalScrollBar()->setMaximum(newval);
+      } else {
+        (dynamic_cast<QAbstractScrollArea *>(owner))->verticalScrollBar()->setMaximum(newval);
       }
-      else {
-	(dynamic_cast<QAbstractScrollArea *>(owner))->verticalScrollBar()->setMaximum(newval);
+    } else if (LIVES_IS_SCROLLED_WINDOW(owner)) {
+      if (this == (dynamic_cast<LiVESScrolledWindow *>(owner))->get_hadj()) {
+        (dynamic_cast<QAbstractScrollArea *>(owner))->horizontalScrollBar()->setMaximum(newval);
+      } else {
+        (dynamic_cast<QAbstractScrollArea *>(owner))->verticalScrollBar()->setMaximum(newval);
       }
     }
   }
@@ -2307,21 +3955,23 @@
 
     if (LIVES_IS_SCALE(owner)) {
       (dynamic_cast<QAbstractSlider *>(owner))->setMinimum(newval);
-    }
-    else if (LIVES_IS_SCROLLBAR(owner)){
+    } else if (LIVES_IS_SCROLLBAR(owner)) {
       //
       (dynamic_cast<QScrollBar *>(owner))->setMinimum(newval);
-    }
-    else if (LIVES_IS_SPIN_BUTTON(owner)){
+    } else if (LIVES_IS_SPIN_BUTTON(owner)) {
       //
       (dynamic_cast<QDoubleSpinBox *>(owner))->setMinimum(newval);
-    }
-    else if (LIVES_IS_TREE_VIEW(owner)) {
+    } else if (LIVES_IS_TREE_VIEW(owner)) {
       if (this == (dynamic_cast<LiVESTreeView *>(owner))->get_hadj()) {
-	(dynamic_cast<QAbstractScrollArea *>(owner))->horizontalScrollBar()->setMinimum(newval);
+        (dynamic_cast<QAbstractScrollArea *>(owner))->horizontalScrollBar()->setMinimum(newval);
+      } else {
+        (dynamic_cast<QAbstractScrollArea *>(owner))->verticalScrollBar()->setMinimum(newval);
       }
-      else {
-	(dynamic_cast<QAbstractScrollArea *>(owner))->verticalScrollBar()->setMinimum(newval);
+    } else if (LIVES_IS_SCROLLED_WINDOW(owner)) {
+      if (this == (dynamic_cast<LiVESScrolledWindow *>(owner))->get_hadj()) {
+        (dynamic_cast<QAbstractScrollArea *>(owner))->horizontalScrollBar()->setMinimum(newval);
+      } else {
+        (dynamic_cast<QAbstractScrollArea *>(owner))->verticalScrollBar()->setMinimum(newval);
       }
     }
   }
@@ -2337,21 +3987,23 @@
 
     if (LIVES_IS_SCALE(owner)) {
       (dynamic_cast<QAbstractSlider *>(owner))->setSingleStep(newval);
-    }
-    else if (LIVES_IS_SCROLLBAR(owner)){
+    } else if (LIVES_IS_SCROLLBAR(owner)) {
       //
       (dynamic_cast<QScrollBar *>(owner))->setSingleStep(newval);
-    }
-    else if (LIVES_IS_SPIN_BUTTON(owner)){
+    } else if (LIVES_IS_SPIN_BUTTON(owner)) {
       //
       (dynamic_cast<QDoubleSpinBox *>(owner))->setSingleStep(newval);
-    }
-    else if (LIVES_IS_TREE_VIEW(owner)) {
+    } else if (LIVES_IS_TREE_VIEW(owner)) {
       if (this == (dynamic_cast<LiVESTreeView *>(owner))->get_hadj()) {
-	(dynamic_cast<QAbstractScrollArea *>(owner))->horizontalScrollBar()->setSingleStep(newval);
+        (dynamic_cast<QAbstractScrollArea *>(owner))->horizontalScrollBar()->setSingleStep(newval);
+      } else {
+        (dynamic_cast<QAbstractScrollArea *>(owner))->verticalScrollBar()->setSingleStep(newval);
       }
-      else {
-	(dynamic_cast<QAbstractScrollArea *>(owner))->verticalScrollBar()->setSingleStep(newval);
+    } else if (LIVES_IS_SCROLLED_WINDOW(owner)) {
+      if (this == (dynamic_cast<LiVESScrolledWindow *>(owner))->get_hadj()) {
+        (dynamic_cast<QAbstractScrollArea *>(owner))->horizontalScrollBar()->setSingleStep(newval);
+      } else {
+        (dynamic_cast<QAbstractScrollArea *>(owner))->verticalScrollBar()->setSingleStep(newval);
       }
     }
   }
@@ -2366,17 +4018,20 @@
 
     if (LIVES_IS_SCALE(owner)) {
       (dynamic_cast<QAbstractSlider *>(owner))->setPageStep(newval);
-    }
-    else if (LIVES_IS_SCROLLBAR(owner)){
+    } else if (LIVES_IS_SCROLLBAR(owner)) {
       //
       (dynamic_cast<QScrollBar *>(owner))->setPageStep(newval);
-    }
-    else if (LIVES_IS_TREE_VIEW(owner)) {
+    } else if (LIVES_IS_TREE_VIEW(owner)) {
       if (this == (dynamic_cast<LiVESTreeView *>(owner))->get_hadj()) {
-	(dynamic_cast<QAbstractScrollArea *>(owner))->horizontalScrollBar()->setPageStep(newval);
+        (dynamic_cast<QAbstractScrollArea *>(owner))->horizontalScrollBar()->setPageStep(newval);
+      } else {
+        (dynamic_cast<QAbstractScrollArea *>(owner))->verticalScrollBar()->setPageStep(newval);
       }
-      else {
-	(dynamic_cast<QAbstractScrollArea *>(owner))->verticalScrollBar()->setPageStep(newval);
+    } else if (LIVES_IS_SCROLLED_WINDOW(owner)) {
+      if (this == (dynamic_cast<LiVESScrolledWindow *>(owner))->get_hadj()) {
+        (dynamic_cast<QAbstractScrollArea *>(owner))->horizontalScrollBar()->setPageStep(newval);
+      } else {
+        (dynamic_cast<QAbstractScrollArea *>(owner))->verticalScrollBar()->setPageStep(newval);
       }
     }
   }
@@ -2394,44 +4049,138 @@
 
 
 
+class LiVESTable : public LiVESWidget, public QGridLayout {
 
-typedef QWindow LiVESXWindow;
+public:
+  LiVESTable() {
+    set_type(LIVES_WIDGET_TYPE_TABLE);
+  }
 
-typedef class LiVESImage LiVESPixbuf;
 
+private:
+  LiVESWidget *layout;
 
+};
 
-typedef LiVESWidget LiVESEditable;
 
+typedef QWindow LiVESXWindow;
 
+typedef class LiVESImage LiVESPixbuf;
+
+typedef LiVESWidget LiVESEditable;
 typedef LiVESWidget LiVESContainer;
+typedef LiVESWidget LiVESMenuShell;
+typedef LiVESWidget LiVESBin;
 
+typedef QSlider LiVESScaleButton; // TODO - create
+typedef void LiVESExpander; // TODO - create
 
-typedef QMenu LiVESMenuShell;
 
-typedef QAction LiVESRadioMenuItem;
-typedef QAction LiVESImageMenuItem;
-typedef QAction LiVESCheckMenuItem;
-typedef QAction LiVESMenuItem;
-
-//typedef QGridLayout LiVESTable;
-//typedef QGridLayout LiVESGrid;
-
-typedef QTableWidget LiVESTable;
-typedef QTableWidget LiVESGrid;
-typedef QWidget LiVESScaleButton; // TODO - create
-typedef QScrollArea LiVESScrolledWindow;
+void qt_jpeg_save(LiVESPixbuf *pixbuf, const char *fname, LiVESError **errptr, int quality) {
+#ifdef IS_MINGW
+  QImageWriter qiw(QString::fromUtf8(fname),"jpeg");
+#else
+  QImageWriter qiw(QString::fromLocal8Bit(fname),"jpeg");
+#endif
+  qiw.setQuality(quality);
+  if (!qiw.write(static_cast<QImage>(*pixbuf))) {
+    if (errptr != NULL) {
+      *errptr = (LiVESError *)malloc(sizeof(LiVESError));
+      (*errptr)->code = qiw.error();
+      (*errptr)->message = strdup(qiw.errorString().toUtf8().constData());
+    }
+  }
+}
+
+
+void qt_png_save(LiVESPixbuf *pixbuf, const char *fname, LiVESError **errptr, int cmp) {
+#ifdef IS_MINGW
+  QImageWriter qiw(QString::fromUtf8(fname),"png");
+#else
+  QImageWriter qiw(QString::fromLocal8Bit(fname),"png");
+#endif
+  qiw.setCompression(cmp);
+  if (!qiw.write(static_cast<QImage>(*pixbuf))) {
+    if (errptr != NULL) {
+      *errptr = (LiVESError *)malloc(sizeof(LiVESError));
+      (*errptr)->code = qiw.error();
+      (*errptr)->message = strdup(qiw.errorString().toUtf8().constData());
+    }
+  }
+}
+
 
 
 // scrolledwindow policies
-typedef int LiVESPolicyType;
+typedef Qt::ScrollBarPolicy LiVESPolicyType;
 #define LIVES_POLICY_AUTOMATIC Qt::ScrollBarAsNeeded
 #define LIVES_POLICY_NEVER Qt::ScrollBarAlwaysOff
 #define LIVES_POLICY_ALWAYS Qt::ScrollBarAlwaysOn
 
 
-typedef QFrame LiVESFrame;
-typedef QFileDialog LiVESFileChooser;
+class LiVESFrame : public LiVESWidget, public QGroupBox {
+public:
+  LiVESFrame(QString text) {
+    set_type(LIVES_WIDGET_TYPE_FRAME);
+
+    LiVESWidget *label_widget = new LiVESLabel(text);
+    set_label_widget(label_widget);
+  }
+
+
+  void set_label(QString text) {
+    label_widget->set_text(text);
+  }
+
+
+  void set_label_widget(LiVESWidget *widget) {
+    if (label_widget != NULL) {
+      remove_child(static_cast<LiVESWidget *>(label_widget));
+    }
+    if (widget != NULL) {
+      add_child(label_widget);
+      label_widget = dynamic_cast<LiVESLabel *>(widget);
+      label_widget->set_owner(this);
+      setTitle(label_widget->text());
+    } else {
+      label_widget = NULL;
+      setTitle(NULL);
+    }
+
+  }
+
+  LiVESWidget *get_label_widget() {
+    return static_cast<LiVESWidget *>(label_widget);
+  }
+
+
+
+  LiVESWidget *get_layout() {
+    if (layout == NULL) {
+      layout = new LiVESVBox;
+      (static_cast<QGroupBox *>(this))->setLayout(dynamic_cast<QLayout *>(layout));
+      if ((static_cast<LiVESWidget *>(this))->isVisible()) layout->setVisible(true);
+      add_child(layout);
+    }
+    return layout;
+  }
+
+
+private:
+  LiVESWidget *layout;
+  LiVESLabel *label_widget;
+
+
+};
+
+
+class LiVESFileChooser : public LiVESWidget, public QFileDialog {
+public:
+  LiVESFileChooser() {
+    set_type(LIVES_WIDGET_TYPE_FILE_CHOOSER);
+  }
+
+};
 
 
 typedef int LiVESFileChooserAction;
@@ -2442,10 +4191,49 @@
 #define LIVES_FILE_CHOOSER_ACTION_SELECT_DEVICE 5
 
 
-typedef QTabWidget LiVESNotebook;
+class LiVESNotebook : public LiVESWidget, public QTabWidget {
+public:
+
+  LiVESNotebook() {
+    set_type(LIVES_WIDGET_TYPE_NOTEBOOK);
+  }
+
+  ~LiVESNotebook() {
+    for (int i = 0; i < label_widgets.size(); i++) {
+      label_widgets[i]->dec_refcount();
+    }
+  }
+
+  void set_tab_label(LiVESWidget *child, LiVESWidget *xlabel) {
+    int i = get_child_index(child);
+    if (i == -1) return;
+
+    if (xlabel != NULL) {
+      label_widgets[i]->dec_refcount();
+      LiVESLabel *label = dynamic_cast<LiVESLabel *>(xlabel);
+      label_widgets[i] = label;
+      label->set_owner(this);
+      QLabel *qlabel =static_cast<QLabel *>(label);
+      setTabText(i, qlabel->text());
+    }
+  }
+
+
+  void append_page() {
+    LiVESWidget *label_widget = new LiVESLabel(NULL);
+    label_widgets.append(label_widget);
+  }
+
+private:
+  QList <LiVESWidget *> label_widgets;
+
+
+};
+
+
 
 class LiVESToolbar : public LiVESWidget, public QToolBar {
- public:
+public:
 
   LiVESToolbar() {
     set_type(LIVES_WIDGET_TYPE_TOOLBAR);
@@ -2463,7 +4251,7 @@
     return actions.size();
   }
 
- private:
+private:
   QList<QAction *>actions;
 
 
@@ -2471,27 +4259,200 @@
 
 
 
+class LiVESColorButton : public LiVESButtonBase, public QPushButton {
+  //Q_OBJECT
+
+public:
+
+  LiVESColorButton(const LiVESWidgetColor *col) {
+    set_type(LIVES_WIDGET_TYPE_COLOR_BUTTON);
+    static_cast<QObject *>(static_cast<QPushButton *>(this))->connect(static_cast<QObject *>(static_cast<QPushButton *>(this)),
+        SIGNAL(clicked()),
+        static_cast<QObject *>(static_cast<QPushButton *>(this)),
+        SLOT(onClicked()));
+
+    use_alpha = FALSE;
+    set_colour(col);
+  }
+
+  void set_colour(const LiVESWidgetColor *col) {
+    QColor xcolor(col->red * 255., col->green * 255., col->blue * 255., col->alpha * 255.);
+    set_colour(xcolor);
+  }
+
+  void set_colour(QColor xcolour) {
+    if (colour != xcolour) {
+      colour = xcolour;
+      QPushButton *qpb = static_cast<QPushButton *>(this);
+      QPalette p = qpb->palette();
+      QColor mycolour = xcolour;
+      if (!use_alpha) mycolour.setAlpha(255);
+      p.setColor(QPalette::Button, mycolour);
+      qpb->setPalette(p);
+
+      //Q_EMIT changed();
+    }
+  }
+
+
+  QColor get_colour() {
+    return colour;
+  }
+
+  void get_colour(LiVESWidgetColor *col) {
+    col->red = (float)colour.red() / 255.;
+    col->green = (float)colour.green() / 255.;
+    col->blue = (float)colour.blue() / 255.;
+    col->alpha = (float)colour.alpha() / 255.;
+  }
+
+
+  void set_title(const char *xtitle) {
+    title = QString::fromUtf8(xtitle);
+  }
+
+  void set_use_alpha(boolean val) {
+    use_alpha = val;
+  }
+
+
+  /* Q_SIGNALS:
+  void changed();
+
+  private Q_SLOTS:
+
+    void onClicked() {
+      QColor mycolour = colour;
+      if (!use_alpha) mycolour.setAlpha(255);
+      QColorDialog dlg(mycolour);
+      dlg.setWindowTitle(title);
+      dlg.setOption(QColorDialog::ShowAlphaChannel, use_alpha);
+      if(dlg.exec() == QDialog::Accepted) {
+  set_colour(dlg.selectedColor());
+      }
+      if (!use_alpha) colour.setAlpha(255);
+      }*/
+
+private:
+  QColor colour;
+  boolean use_alpha;
+  QString title;
+};
+
+
+
+class LiVESTimer : public LiVESObject, public QTimer {
+public:
+
+  LiVESTimer(uint32_t interval, LiVESWidgetSourceFunc xfunc, livespointer data);
+
+  uint32_t get_handle() {
+    return handle;
+  }
+
+  /*  public slots:*/
+
+  void update();
+
+
+private:
+  uint32_t handle;
+  LiVESWidgetSourceFunc func;
+  livespointer data;
+
+};
+
+static QList<LiVESTimer *> static_timers;
+
+
+LiVESTimer::LiVESTimer(uint32_t interval, LiVESWidgetSourceFunc xfunc, livespointer data) {
+  set_type(LIVES_OBJECT_TYPE_TIMER);
+  static_timers.append(this);
+
+  static_cast<QObject *>(static_cast<QTimer *>(this))->connect(static_cast<QObject *>(static_cast<QTimer *>(this)),
+      SIGNAL(timeout()),
+      static_cast<QObject *>(static_cast<QTimer *>(this)),
+      SLOT(update()));
+  start(interval);
+
+}
+
+
+void LiVESTimer::update() {
+  // ret false to stop
+  boolean ret = (func)(data);
+  if (!ret) {
+    stop();
+    static_timers.removeOne(this);
+  }
+}
+
+
+void remove_static_timer(uint32_t handle) {
+  for (int i = 0; i < static_timers.size(); i++) {
+    if (static_timers.at(i)->get_handle() == handle) {
+      static_timers.removeOne(static_timers.at(i));
+      break;
+    }
+  }
+}
 
 
 typedef Qt::ToolButtonStyle LiVESToolbarStyle;
 #define LIVES_TOOLBAR_ICONS Qt::ToolButtonIconOnly
 #define LIVES_TOOLBAR_TEXT  Qt::ToolButtonTextOnly
 
-typedef LiVESWidget LiVESBin;
-
 typedef QSize LiVESRequisition;
 
 typedef int LiVESTextIter;
 
-typedef const char LiVESTreePath;
+class LiVESTreePath {
+public:
 
+  LiVESTreePath(const char *string) {
+    QString qs(string);
+    QStringList qsl = qs.split(":");
+    QList<int> qli;
+
+    for (int i=0; i < qsl.size(); i++) {
+      qli.append(qsl.at(i).toInt());
+    }
+
+    init(qli);
+  }
+
+  LiVESTreePath(QList<int> qli) {
+    init(qli);
+  }
+
+  ~LiVESTreePath() {
+    delete indices;
+  }
+
+
+  int get_depth() {
+    return cnt;
+  }
 
-typedef int LiVESSelectionMode;
-#define LIVES_SELECTION_NONE QAbstractItemView::NoSelection
-#define LIVES_SELECTION_SINGLE QAbstractItemView::SingleSelection
-#define LIVES_SELECTION_MULTIPLE QAbstractItemView::MultiSelection
 
-typedef void LiVESExpander;
+  int *get_indices() {
+    return indices;
+  }
+
+private:
+  int *indices;
+  int cnt;
+
+  void init(QList<int> qli) {
+    cnt = qli.size();
+    indices = (int *)(malloc(cnt * sizeof(int)));
+    for (int i=0; i < cnt; i++) {
+      indices[i] = qli.at(i);
+    }
+  }
+
+};
+
 
 typedef Qt::Orientation LiVESOrientation;
 #define LIVES_ORIENTATION_HORIZONTAL Qt::Horizontal
@@ -2501,7 +4462,9 @@
 #define LIVES_BUTTONBOX_DEFAULT_STYLE 0
 #define LIVES_BUTTONBOX_SPREAD 1
 #define LIVES_BUTTONBOX_EDGE 2
-#define LIVES_BUTTONBOX_CENTER 3
+#define LIVES_BUTTONBOX_START 3
+#define LIVES_BUTTONBOX_END 4
+#define LIVES_BUTTONBOX_CENTER 5
 
 typedef int LiVESReliefStyle;
 
@@ -2509,20 +4472,18 @@
 #define LIVES_RELIEF_HALF 1
 #define LIVES_RELIEF_NONE 0
 
+#define LIVES_ACCEL_VISIBLE 1
+
 typedef int LiVESWindowType;
 #define LIVES_WINDOW_TOPLEVEL Qt::Window
 #define LIVES_WINDOW_POPUP Qt::Popup
 
-typedef int LiVESWindowPosition;
-#define LIVES_WIN_POS_CENTER_ALWAYS 1
-
-
-typedef int LiVESShadowType;
-#define LIVES_SHADOW_NONE 0
-#define LIVES_SHADOW_IN 1
-#define LIVES_SHADOW_OUT 2
-#define LIVES_SHADOW_ETCHED_IN 3
-#define LIVES_SHADOW_ETCHED_OUT 4
+typedef QFrame::Shadow LiVESShadowType;
+#define LIVES_SHADOW_NONE QFrame::Plain
+#define LIVES_SHADOW_IN QFrame::Raised
+#define LIVES_SHADOW_OUT QFrame::Sunken
+#define LIVES_SHADOW_ETCHED_IN QFrame::Raised
+#define LIVES_SHADOW_ETCHED_OUT QFrame::Sunken
 
 
 
@@ -2533,7 +4494,7 @@
 #define LIVES_POS_BOTTOM 4
 
 
-#define LIVES_WIDGET(a) (a)
+#define LIVES_WIDGET(a) ((LiVESWidget *)a)
 
 
 #define LIVES_EDITABLE(a) (a)
@@ -2542,16 +4503,54 @@
 #define LIVES_GUI_OBJECT(a) LIVES_WIDGET(a)
 #define LIVES_EXPANDER(a) LIVES_WIDGET(a)
 #define LIVES_BIN(a) LIVES_WIDGET(a)
+#define LIVES_MENU_SHELL(a) LIVES_WIDGET(a)
 
+#define LIVES_WIDGET_OBJECT(a) ((LiVESObject *)a)
 #define LIVES_COMBO(a) ((LiVESCombo *)a)
 #define LIVES_HBOX(a) ((LiVESHBox *)a)
 #define LIVES_VBOX(a) ((LiVESVBox *)a)
 #define LIVES_BOX(a) ((LiVESBox *)a)
+#define LIVES_ALIGNMENT(a) ((LiVESAlignment *)a)
+#define LIVES_TOOLBAR(a) ((LiVESToolbar *)a)
+#define LIVES_TOOL_BUTTON(a) ((LiVESToolButton *)a)
+#define LIVES_EVENT_BOX(a) ((LiVESEventBox *)a)
+#define LIVES_DRAWING_AREA(a) ((LiVESDrawingArea *)a)
+#define LIVES_TEXT_VIEW(a) ((LiVESTextView *)a)
+#define LIVES_TEXT_BUFFER(a) ((LiVESTextBuffer *)a)
+#define LIVES_BUTTON_BOX(a) ((LiVESButtonBox *)a)
+#define LIVES_FRAME(a) ((LiVESFrame *)a)
+#define LIVES_SCALE(a) ((LiVESScale *)a)
+#define LIVES_RANGE(a) ((LiVESRange *)a)
+#define LIVES_ADJUSTMENT(a) ((LiVESAdjustment *)a)
+#define LIVES_TABLE(a) ((LiVESTable *)a)
+#define LIVES_NOTEBOOK(a) ((LiVESNotebook *)a)
+#define LIVES_MENU(a) ((LiVESMenu *)a)
+#define LIVES_MENU_ITEM(a) ((LiVESMenuItem *)a)
+#define LIVES_MENU_TOOL_ITEM(a) ((LiVESMenuToolItem *)a)
+#define LIVES_MENU_TOOL_BUTTON(a) ((LiVESMenuToolButton *)a)
+#define LIVES_RULER(a) ((LiVESRuler *)a)
+#define LIVES_CHECK_MENU_ITEM(a) ((LiVESCheckMenuItem *)a)
+#define LIVES_IMAGE(a) ((LiVESImage *)a)
+#define LIVES_PROGRESS_BAR(a) ((LiVESProgressBar *)a)
+#define LIVES_BUTTON(a) ((LiVESButton *)a)
+#define LIVES_SPIN_BUTTON(a) ((LiVESSpinButton *)a)
+#define LIVES_SCALE_BUTTON(a) ((LiVESScaleButton *)a)
+#define LIVES_TOGGLE_BUTTON(a) ((LiVESToggleButton *)a)
+#define LIVES_RADIO_BUTTON(a) ((LiVESRadioButton *)a)
+#define LIVES_RADIO_MENU_ITEM(a) ((LiVESRadioMenuItem *)a)
+#define LIVES_COLOR_BUTTON(a) ((LiVESColorButton *)a)
+#define LIVES_DIALOG(a) ((LiVESDialog *)a)
 #define LIVES_LABEL(a) ((LiVESLabel *)a)
 #define LIVES_ENTRY(a) ((LiVESEntry *)a)
+#define LIVES_PANED(a) ((LiVESPaned *)a)
+#define LIVES_FILE_CHOOSER(a) ((LiVESFileChooser *)a)
+#define LIVES_ACCEL_GROUP(a) ((LiVESAccelGroup *)a)
 #define LIVES_WINDOW(a) ((LiVESWindow *)a)
-#define LIVES_TREE_MODEL(a) a->get_model()
-
+#define LIVES_SCROLLED_WINDOW(a) ((LiVESScrolledWindow *)a)
+#define LIVES_TREE_MODEL(a) ((LiVESTreeModel *)a)
+#define LIVES_TREE_VIEW(a) ((LiVESTreeView *)a)
+#define LIVES_LIST_STORE(a) ((LiVESListStore *)a)
+#define LIVES_TOOL_ITEM(a) ((LiVESToolItem *)a)
 
 
 #define LIVES_STOCK_UNDO "edit-undo"
@@ -2624,6 +4623,11 @@
 #define LIVES_JUSTIFY_CENTER Qt::AlignHCenter
 #define LIVES_JUSTIFY_FILL   Qt::AlignJustify
 
+extern "C" {
+  boolean lives_container_remove(LiVESContainer *, LiVESWidget *);
+}
+
+
 LiVESWidget::~LiVESWidget() {
   if (LIVES_IS_SPIN_BUTTON(this)) {
     LiVESAdjustment *adj = (static_cast<LiVESSpinButton *>(this))->get_adj();
@@ -2655,13 +4659,84 @@
     parent->remove_child(this);
   }
 
+  LiVESList *xchildren = children;
+
   // decref all children
-  while (children.size() > 0) {
-    remove_child((LiVESWidget *)children.at(0));
+  while (xchildren != NULL) {
+    lives_container_remove(this, (LiVESWidget *)xchildren->data);
+    xchildren = xchildren->next;
   }
 
+  lives_list_free(children);
 }
 
+#define LINGO_ALIGN_LEFT Qt::AlignLeft
+#define LINGO_ALIGN_RIGHT Qt::AlignRight
+#define LINGO_ALIGN_CENTER Qt::AlignHCenter
+
+#define LINGO_SCALE 1
+
+typedef class lives_painter_t lives_painter_t;
+
+class LingoLayout : public LiVESObject {
+public:
+  LingoLayout(const char *xtext, const char *xfont, double fsize) {
+    text = QString::fromUtf8(xtext);
+    font = QFont(QString::fromUtf8(xfont));
+    font.setPointSizeF((float)fsize);
+    align = LINGO_ALIGN_LEFT;
+  }
+
+  void set_alignment(int xalign) {
+    align = xalign;
+  }
+
+  void set_text(const char *xtext, ssize_t len) {
+    text = QString::fromUtf8(xtext, len);
+  }
+
+  void get_size(int *bwidth, int *bheight, int pwidth, int pheight);
+
+  void set_coords(int xx, int xy, int xwidth, int xheight) {
+    x = xx;
+    y = xy;
+    width = xwidth;
+    height = xheight;
+  }
+
+  void render_text(lives_painter_t *painter);
+
+
+private:
+  QString text;
+  QFont font;
+  int align;
+  int x,y,width,height;
+};
+
+LIVES_INLINE void lingo_layout_set_alignment(LingoLayout *l, int alignment) {
+  l->set_alignment(alignment);
+}
+
+
+LIVES_INLINE void lingo_layout_set_text(LingoLayout *l, const char *text, ssize_t len) {
+  l->set_text(text, len);
+}
+
+
+LIVES_INLINE void lingo_layout_set_coords(LingoLayout *l, int x, int y, int width, int height) {
+  l->set_coords(x, y, width, height);
+}
+
+
+LIVES_INLINE void lingo_layout_get_size(LingoLayout *l, int *rw, int *rh, int width, int height) {
+  l->get_size(rw, rh, width, height);
+}
+
+
+LIVES_INLINE void lingo_painter_show_layout(lives_painter_t *painter, LingoLayout *l) {
+  l->render_text(painter);
+}
 
 #endif
 
@@ -2670,9 +4745,9 @@
 #ifdef PAINTER_QPAINTER
 # include <QtGui/QPainter>
 
-extern void lives_free(gpointer ptr);
+//extern void lives_free(livespointer ptr);
 
-static void imclean(void *data) {
+static void imclean(livespointer data) {
   lives_free(data);
 }
 
@@ -2683,15 +4758,15 @@
 
 
 class lives_painter_surface_t : public QImage, public LiVESObject {
- public:
+public:
   int refcount;
 
- lives_painter_surface_t(int width, int height, QImage::Format fmt) : QImage(width, height, fmt) {
+  lives_painter_surface_t(int width, int height, QImage::Format fmt) : QImage(width, height, fmt) {
     refcount = 0;
   }
 
-  lives_painter_surface_t (uint8_t *data, lives_painter_format_t fmt, int width, int height, int stride) 
-    :  QImage (data,width,height,stride,fmt,imclean,(void *)data) {
+  lives_painter_surface_t (uint8_t *data, lives_painter_format_t fmt, int width, int height, int stride)
+    :  QImage(data,width,height,stride,fmt,imclean,(livespointer)data) {
     refcount = 0;
   }
 
@@ -2702,18 +4777,18 @@
 
 
 class lives_painter_t : public QPainter {
- public:
+public:
   QPainterPath *p;
   lives_painter_surface_t *target;
   QPen pen;
 
-  
- lives_painter_t(QWidget *widget) : QPainter(widget) {
+
+  lives_painter_t(QWidget *widget) : QPainter(widget) {
     init();
   };
-  
 
- lives_painter_t(lives_painter_surface_t *surf) : QPainter() {
+
+  lives_painter_t(lives_painter_surface_t *surf) : QPainter() {
     init();
     target = surf;
   };
@@ -2725,7 +4800,7 @@
   }
 
 
- private:
+private:
 
   void init(void) {
     p = new QPainterPath();
@@ -2755,7 +4830,26 @@
 #define LIVES_PAINTER_FILL_RULE_EVEN_ODD Qt::OddEvenFill
 
 
+#ifdef GUI_QT
+
+void LingoLayout::get_size(int *bwidth, int *bheight, int pwidth, int pheight) {
+  QPainter qp;
+  QRect rect = qp.boundingRect(0, 0, pwidth, pheight, Qt::AlignLeft | Qt::AlignTop, text);
+  *bwidth = rect.width();
+  *bheight = rect.height();
+}
+
+
+void LingoLayout::render_text(lives_painter_t *painter) {
+  painter->drawText(x, y, width, height, align, text);
+}
+
+#endif
+
 
 #endif
 
+#include "moc_widget-helper-qt.cpp"
+
+
 #endif

LiVES-2.2.8.tar.bz2/src/widget-helper.c -> LiVES-2.4.1.tar.bz2/src/widget-helper.c Changed

@@ -5,6 +5,7 @@
 // see file ../COPYING or www.gnu.org for licensing details
 
 
+#include "main.h"
 
 // The idea here is to replace toolkit specific functions with generic ones
 
@@ -12,13 +13,8 @@
 
 // TODO - add for other toolkits, e.g. qt
 
-
-#include "main.h"
-
 // basic functions
 
-
-
 ////////////////////////////////////////////////////
 //lives_painter functions
 
@@ -45,14 +41,14 @@
 #endif
 #endif
 #ifdef PAINTER_QPAINTER
-  QWidget *widg = ((QWidget *)widget);
+  QWidget *widg = static_cast<QWidget *>(widget);
   if (widg!=NULL) cr = new lives_painter_t(widg);
 #endif
   return cr;
 }
 
 
-LIVES_INLINE boolean lives_painter_set_source_pixbuf (lives_painter_t *cr, const LiVESPixbuf *pixbuf, double pixbuf_x, double pixbuf_y) {
+LIVES_INLINE boolean lives_painter_set_source_pixbuf(lives_painter_t *cr, const LiVESPixbuf *pixbuf, double pixbuf_x, double pixbuf_y) {
   // blit pixbuf to cairo at x,y
 #ifdef PAINTER_CAIRO
   gdk_cairo_set_source_pixbuf(cr,pixbuf,pixbuf_x,pixbuf_y);
@@ -69,7 +65,7 @@
 }
 
 
-LIVES_INLINE boolean lives_painter_set_source_surface (lives_painter_t *cr, lives_painter_surface_t *surface, double x, double y) {
+LIVES_INLINE boolean lives_painter_set_source_surface(lives_painter_t *cr, lives_painter_surface_t *surface, double x, double y) {
 #ifdef PAINTER_CAIRO
   cairo_set_source_surface(cr,surface,x,y);
   return TRUE;
@@ -80,7 +76,7 @@
   return TRUE;
 #endif
   return FALSE;
-  
+
 
 }
 
@@ -144,6 +140,7 @@
   return TRUE;
 #endif
 #ifdef PAINTER_QPAINTER
+  cr->end();
   delete cr;
   return TRUE;
 #endif
@@ -296,7 +293,7 @@
 LIVES_INLINE boolean lives_painter_set_source_rgba(lives_painter_t *cr, double red, double green, double blue, double alpha) {
   // r,g,b,a values 0.0 -> 1.0
 #ifdef PAINTER_CAIRO
-   cairo_set_source_rgba(cr,red,green,blue,alpha);
+  cairo_set_source_rgba(cr,red,green,blue,alpha);
   return TRUE;
 #endif
 #ifdef PAINTER_QPAINTER
@@ -334,31 +331,31 @@
 
 
 
-LIVES_INLINE lives_painter_surface_t *lives_painter_image_surface_create_for_data(uint8_t *data, lives_painter_format_t format, 
-										  int width, int height, int stride) {
+LIVES_INLINE lives_painter_surface_t *lives_painter_image_surface_create_for_data(uint8_t *data, lives_painter_format_t format,
+    int width, int height, int stride) {
   lives_painter_surface_t *surf=NULL;
 #ifdef PAINTER_CAIRO
   surf=cairo_image_surface_create_for_data(data,format,width,height,stride);
 #endif
 #ifdef PAINTER_QPAINTER
   surf=new lives_painter_surface_t(data,format,width,height,stride);
-#endif  
+#endif
   return surf;
 }
 
 
-LIVES_INLINE lives_painter_surface_t *lives_painter_surface_create_from_widget(LiVESWidget *widget, lives_painter_content_t content, 
-									       int width, int height) {
+LIVES_INLINE lives_painter_surface_t *lives_painter_surface_create_from_widget(LiVESWidget *widget, lives_painter_content_t content,
+    int width, int height) {
   lives_painter_surface_t *surf=NULL;
 #ifdef PAINTER_CAIRO
   LiVESXWindow *window=lives_widget_get_xwindow(widget);
   if (window!=NULL) {
 #if G_ENCODE_VERSION(GDK_MAJOR_VERSION,GDK_MINOR_VERSION) >= G_ENCODE_VERSION(2,22)
     surf=gdk_window_create_similar_surface(window,content,width,height);
-#else 
+#else
     surf=cairo_image_surface_create(LIVES_PAINTER_FORMAT_ARGB32,width,height);
 #endif
-}
+  }
 #endif
 
 #ifdef PAINTER_QPAINTER
@@ -386,10 +383,10 @@
 
 lives_painter_surface_t *lives_painter_get_target(lives_painter_t *cr) {
 
- lives_painter_surface_t *surf=NULL;
+  lives_painter_surface_t *surf=NULL;
 #ifdef PAINTER_CAIRO
   surf=cairo_get_target(cr);
-#endif  
+#endif
 #ifdef PAINTER_QPAINTER
   surf=cr->target;
 #endif
@@ -428,7 +425,7 @@
   width=cairo_image_surface_get_width(surf);
 #endif
 #ifdef PAINTER_QPAINTER
-  width=surf->width();
+  width=((QImage *)surf)->width();
 #endif
   return width;
 }
@@ -440,7 +437,7 @@
   height=cairo_image_surface_get_height(surf);
 #endif
 #ifdef PAINTER_QPAINTER
-  height=surf->height();
+  height=((QImage *)surf)->height();
 #endif
   return height;
 }
@@ -452,7 +449,7 @@
   stride=cairo_image_surface_get_stride(surf);
 #endif
 #ifdef PAINTER_QPAINTER
-  stride=surf->bytesPerLine();
+  stride=((QImage *)surf)->bytesPerLine();
 #endif
   return stride;
 }
@@ -464,7 +461,7 @@
   format=cairo_image_surface_get_format(surf);
 #endif
 #ifdef PAINTER_QPAINTER
-  format=surf->format();
+  format=((QImage *)surf)->format();
 #endif
   return format;
 }
@@ -472,6 +469,31 @@
 
 ////////////////////////////////////////////////////////
 
+LIVES_INLINE boolean lives_mem_set_vtable(LiVESMemVTable *alt_vtable) {
+#ifdef GUI_GTK
+  g_mem_set_vtable(alt_vtable);
+  return TRUE;
+#endif
+
+#ifdef GUI_QT
+  static_alt_vtable = alt_vtable;
+
+  lives_free = alt_vtable->free;
+
+  lives_malloc = malloc_wrapper;
+
+  lives_realloc = realloc_wrapper;
+
+  if (alt_vtable->try_malloc == NULL) lives_try_malloc = try_malloc_wrapper;
+  else lives_try_malloc = alt_vtable->try_malloc;
+
+  if (alt_vtable->try_realloc == NULL) lives_try_realloc = try_realloc_wrapper;
+  else lives_try_realloc = alt_vtable->try_realloc;
+
+  return TRUE;
+#endif
+  return FALSE;
+}
 
 
 LIVES_INLINE livespointer lives_object_ref(livespointer object) {
@@ -501,7 +523,7 @@
 #ifdef GUI_GTK
 #if GTK_CHECK_VERSION(3,0,0)
 LIVES_INLINE livespointer lives_object_ref_sink(livespointer object) {
-  g_object_ref_sink (object);
+  g_object_ref_sink(object);
   return object;
 }
 #else
@@ -509,14 +531,14 @@
   GtkObject *gtkobject;
   //assert(GTK_IS_OBJECT(object));
   gtkobject=(GtkObject *)object;
-  gtk_object_sink (object);
+  gtk_object_sink(gtkobject);
 }
 #endif
 #endif
 
 #ifdef GUI_QT
 LIVES_INLINE livespointer lives_object_ref_sink(livespointer object) {
-  //static_cast<LiVESObject *>(object)->inc_refcount();
+  static_cast<LiVESObject *>(object)->ref_sink();
   return object;
 }
 #endif
@@ -536,6 +558,16 @@
   return FALSE;
 }
 
+#ifndef GUI_GTK
+LIVES_INLINE boolean lives_signal_handlers_block_by_func(livespointer instance, livespointer func, livespointer data) {
+#ifdef GUI_QT
+  LiVESObject *obj = static_cast<LiVESObject *>(instance);
+  obj->block_signals((ulong)func,data);
+  return TRUE;
+#endif
+  return FALSE;
+}
+#endif
 
 LIVES_INLINE boolean lives_signal_handler_unblock(livespointer instance, unsigned long handler_id) {
 #ifdef GUI_GTK
@@ -551,6 +583,19 @@
 }
 
 
+#ifndef GUI_GTK
+LIVES_INLINE boolean lives_signal_handlers_unblock_by_func(livespointer instance, livespointer func, livespointer data) {
+#ifdef GUI_QT
+  LiVESObject *obj = static_cast<LiVESObject *>(instance);
+  obj->unblock_signals((ulong)func,data);
+  return TRUE;
+#endif
+  return FALSE;
+}
+#endif
+
+
+
 LIVES_INLINE boolean lives_signal_handler_disconnect(livespointer instance, unsigned long handler_id) {
 #ifdef GUI_GTK
   g_signal_handler_disconnect(instance,handler_id);
@@ -587,7 +632,7 @@
   return TRUE;
 #endif
 #ifdef GUI_QT
-  ((QWidget *)widget)->setEnabled(state);
+  (static_cast<QWidget *>(widget))->setEnabled(state);
   return TRUE;
 #endif
   return FALSE;
@@ -599,7 +644,7 @@
   return gtk_widget_get_sensitive(widget);
 #endif
 #ifdef GUI_QT
-  return ((QWidget *)widget)->isEnabled();
+  return (static_cast<QWidget *>(widget))->isEnabled();
 #endif
   return FALSE;
 }
@@ -611,7 +656,15 @@
   return TRUE;
 #endif
 #ifdef GUI_QT
-  ((QWidget *)widget)->setVisible(true);
+  if (LIVES_IS_WINDOW(widget) && (static_cast<LiVESMainWindow *>(widget))->get_position() == LIVES_WIN_POS_CENTER_ALWAYS) {
+    QRect primaryScreenGeometry(QApplication::desktop()->screenGeometry());
+    widget->move(-50000,-50000);
+    (static_cast<QWidget *>(widget))->setVisible(true);
+    widget->move((primaryScreenGeometry.width() - widget->width()) / 2.0,
+                 (primaryScreenGeometry.height() - widget->height()) / 2.0);
+  } else {
+    (static_cast<QWidget *>(widget))->setVisible(true);
+  }
   return TRUE;
 #endif
   return FALSE;
@@ -624,7 +677,7 @@
   return TRUE;
 #endif
 #ifdef GUI_QT
-  ((QWidget *)widget)->setVisible(false);
+  (static_cast<QWidget *>(widget))->setVisible(false);
   return TRUE;
 #endif
   return FALSE;
@@ -634,9 +687,10 @@
 LIVES_INLINE boolean lives_widget_show_all(LiVESWidget *widget) {
 #ifdef GUI_GTK
   gtk_widget_show_all(widget);
+  return TRUE;
 #endif
 #ifdef GUI_QT
-  ((QWidget *)widget)->show();
+  (static_cast<QWidget *>(widget))->show();
   return TRUE;
 #endif
   return FALSE;
@@ -662,7 +716,7 @@
   return TRUE;
 #endif
 #ifdef GUI_QT
-  ((QWidget *)widget)->update();
+  (static_cast<QWidget *>(widget))->update();
   return TRUE;
 #endif
   return FALSE;
@@ -678,7 +732,7 @@
 #endif
 #endif
 #ifdef GUI_QT
-  ((QWidget *)widget)->update(x,y,width,height);
+  (static_cast<QWidget *>(widget))->update(x,y,width,height);
   return TRUE;
 #endif
   return FALSE;
@@ -691,7 +745,7 @@
   return TRUE;
 #endif
 #ifdef GUI_QT
-  ((QWidget *)widget)->updateGeometry();
+  (static_cast<QWidget *>(widget))->updateGeometry();
   return TRUE;
 #endif
   return FALSE;
@@ -705,7 +759,7 @@
   return TRUE;
 #endif
 #ifdef GUI_QT
-  QWidget *widg=((QWidget *)widget);
+  QWidget *widg=(static_cast<QWidget *>(widget));
   widg->setMaximumSize(width,height);
   widg->setMinimumSize(width,height);
   return TRUE;
@@ -714,16 +768,45 @@
 }
 
 
+LIVES_INLINE boolean lives_widget_process_updates(LiVESWidget *widget, boolean upd_children) {
+#ifdef GUI_GTK
+  GdkWindow *window=lives_widget_get_xwindow(widget);
+  gdk_window_process_updates(window,upd_children);
+  return TRUE;
+#endif
+#ifdef GUI_QT
+  QWidget *widg=(static_cast<QWidget *>(widget));
+  widg->repaint();
+  return TRUE;
+#endif
+  return FALSE;
+}
+
+
+LIVES_INLINE boolean lives_xwindow_process_all_updates() {
+#ifdef GUI_GTK
+  gdk_window_process_all_updates();
+  return TRUE;
+#endif
+#ifdef GUI_QT
+  QCoreApplication::processEvents();
+  return TRUE;
+#endif
+  return FALSE;
+}
+
+
 LIVES_INLINE boolean lives_widget_reparent(LiVESWidget *widget, LiVESWidget *new_parent) {
 #ifdef GUI_GTK
   gtk_widget_reparent(widget,new_parent);
   return TRUE;
 #endif
 #ifdef GUI_QT
-  ((QWidget *)widget)->setParent((QWidget *)new_parent);
+  (static_cast<QWidget *>(widget))->setParent(static_cast<QWidget *>(new_parent));
   widget->inc_refcount();
   widget->get_parent()->remove_child(widget);
   new_parent->add_child(widget);
+  widget->dec_refcount();
   return TRUE;
 #endif
   return FALSE;
@@ -736,7 +819,7 @@
   return TRUE;
 #endif
 #ifdef GUI_QT
-  ((QWidget *)widget)->setUpdatesEnabled(!paintable);
+  (static_cast<QWidget *>(widget))->setUpdatesEnabled(!paintable);
   return TRUE;
 #endif
   return FALSE;
@@ -757,6 +840,19 @@
 }
 
 
+LIVES_INLINE boolean lives_dialog_response(LiVESDialog *dialog, int response) {
+#ifdef GUI_GTK
+  gtk_dialog_response(dialog,response);
+  return TRUE;
+#endif
+#ifdef GUI_QT
+  dialog->setResult(response);
+  return TRUE;
+#endif
+  return FALSE;
+}
+
+
 LIVES_INLINE boolean lives_widget_set_bg_color(LiVESWidget *widget, LiVESWidgetState state, const LiVESWidgetColor *color) {
 #ifdef GUI_GTK
 #if GTK_CHECK_VERSION(3,0,0)
@@ -828,7 +924,7 @@
 LIVES_INLINE boolean lives_widget_get_bg_state_color(LiVESWidget *widget, LiVESWidgetState state, LiVESWidgetColor *color) {
 #ifdef GUI_GTK
 #if GTK_CHECK_VERSION(3,0,0)
-  gtk_style_context_get_background_color (gtk_widget_get_style_context (widget), state, color);
+  gtk_style_context_get_background_color(gtk_widget_get_style_context(widget), state, color);
 #else
   lives_widget_color_copy(color,&gtk_widget_get_style(widget)->bg[state]);
 #endif
@@ -845,7 +941,7 @@
 LIVES_INLINE boolean lives_widget_get_fg_state_color(LiVESWidget *widget, LiVESWidgetState state, LiVESWidgetColor *color) {
 #ifdef GUI_GTK
 #if GTK_CHECK_VERSION(3,0,0)
-  gtk_style_context_get_color (gtk_widget_get_style_context (widget), LIVES_WIDGET_STATE_NORMAL, color);
+  gtk_style_context_get_color(gtk_widget_get_style_context(widget), LIVES_WIDGET_STATE_NORMAL, color);
 #else
   lives_widget_color_copy(color,&gtk_widget_get_style(widget)->fg[LIVES_WIDGET_STATE_NORMAL]);
 #endif
@@ -864,22 +960,21 @@
   LiVESWidgetColor *c0=NULL;
 #ifdef GUI_GTK
   if (c1!=NULL) {
-  c1->red=c2->red;
-  c1->green=c2->green;
-  c1->blue=c2->blue;
+    c1->red=c2->red;
+    c1->green=c2->green;
+    c1->blue=c2->blue;
 #if GTK_CHECK_VERSION(3,0,0)
-  c1->alpha=c2->alpha;
+    c1->alpha=c2->alpha;
 #else
-  c1->pixel=c2->pixel;
+    c1->pixel=c2->pixel;
 #endif
-}
-  else {
+  } else {
 #if GTK_CHECK_VERSION(3,0,0)
-  c0=gdk_rgba_copy(c2);
+    c0=gdk_rgba_copy(c2);
 #else
-  c0=gdk_color_copy(c2);
+    c0=gdk_color_copy(c2);
 #endif
-}
+  }
 #endif
 
 #ifdef GUI_QT
@@ -894,7 +989,7 @@
   c0 = c1;
 #endif
 
-return c0;
+  return c0;
 }
 
 
@@ -910,6 +1005,19 @@
 }
 
 
+LIVES_INLINE boolean lives_event_box_set_above_child(LiVESEventBox *ebox, boolean set) {
+#ifdef GUI_GTK
+  lives_event_box_set_above_child(ebox,set);
+  return TRUE;
+#endif
+#ifdef GUI_QT
+  return TRUE;
+#endif
+  return FALSE;
+}
+
+
+
 LIVES_INLINE LiVESWidget *lives_image_new(void) {
   LiVESWidget *image=NULL;
 #ifdef GUI_GTK
@@ -926,14 +1034,13 @@
 LIVES_INLINE LiVESWidget *lives_image_new_from_stock(const char *stock_id, LiVESIconSize size) {
   LiVESWidget *image=NULL;
 #ifdef GUI_GTK
-    if (lives_has_icon(stock_id,size)) {
+  if (lives_has_icon(stock_id,size)) {
 #if GTK_CHECK_VERSION(3,10,0)
-      image=gtk_image_new_from_icon_name(stock_id, size);
+    image=gtk_image_new_from_icon_name(stock_id, size);
 #else
-      image=gtk_image_new_from_stock(stock_id,size);
+    image=gtk_image_new_from_stock(stock_id,size);
 #endif
-  }
-  else {
+  } else {
 #if GTK_CHECK_VERSION(3,10,0)
     image=gtk_image_new_from_icon_name(LIVES_STOCK_MISSING_IMAGE, size);
     if (image==NULL) image=gtk_image_new_from_icon_name(LIVES_STOCK_CLOSE,size);
@@ -946,20 +1053,20 @@
 #endif
 
 #ifdef GUI_QT
-    if (!QIcon::hasThemeIcon(stock_id)) lives_printerr("Missing icon %s\n",stock_id);
-    else {
-       QIcon qi = QIcon::fromTheme(stock_id);
-       QPixmap qp = qi.pixmap(size);
+  if (!QIcon::hasThemeIcon(stock_id)) lives_printerr("Missing icon %s\n",stock_id);
+  else {
+    QIcon qi = QIcon::fromTheme(stock_id);
+    QPixmap qp = qi.pixmap(size);
 
-       QImage qm = qp.toImage();
-       uint8_t *data = qm.bits();
-       int width = qm.width();
-       int height = qm.height();
-       int bpl = qm.bytesPerLine();
-       QImage::Format fmt = qm.format();
+    QImage qm = qp.toImage();
+    uint8_t *data = qm.bits();
+    int width = qm.width();
+    int height = qm.height();
+    int bpl = qm.bytesPerLine();
+    QImage::Format fmt = qm.format();
 
-       image = new LiVESImage(data,width,height,bpl,fmt,imclean,data);
-    }
+    image = new LiVESImage(data,width,height,bpl,fmt,imclean,data);
+  }
 
 #endif
   return image;
@@ -972,10 +1079,8 @@
   image=gtk_image_new_from_file(filename);
 #endif
 #ifdef GUI_QT
-  QPixmap qp;
   QString qs = QString::fromUtf8(filename); // TODO ??
-  qp.load(qs);
-  QImage qm = qp.toImage();
+  QImage qm(qs);
   uint8_t *data = qm.bits();
   int width = qm.width();
   int height = qm.height();
@@ -994,8 +1099,8 @@
   image=gtk_image_new_from_pixbuf(pixbuf);
 #endif
 #ifdef GUI_QT
-  image = new LiVESImage((QImage *)pixbuf);
-#endif  
+  image = new LiVESImage(static_cast<QImage *>(pixbuf));
+#endif
   return image;
 }
 
@@ -1007,7 +1112,7 @@
   return TRUE;
 #endif
 #ifdef GUI_QT
-  *((QImage *)image) = pixbuf->copy(0, 0, ((QImage *)pixbuf)->width(), ((QImage *)pixbuf)->height());
+  *(static_cast<QImage *>(image)) = pixbuf->copy(0, 0, (static_cast<QImage *>(pixbuf))->width(), (static_cast<QImage *>(pixbuf))->height());
   return TRUE;
 #endif
   return FALSE;
@@ -1078,7 +1183,7 @@
 #endif
 #endif
 #ifdef GUI_QT
-  return dialog->get_content_area(); // TODO
+  return dialog->get_action_area();
 #endif
   return NULL;
 }
@@ -1091,7 +1196,9 @@
   return TRUE;
 #endif
 #ifdef GUI_QT
-  // TODO
+  QDialogButtonBox *qbb = dynamic_cast<QDialogButtonBox *>(dialog->get_action_area());
+
+  qbb->addButton(dynamic_cast<QPushButton *>(widget), static_cast<QDialogButtonBox::ButtonRole>(response));
 #endif
   return FALSE;
 
@@ -1107,12 +1214,10 @@
 #ifdef GUI_QT
   if (wintype == LIVES_WINDOW_TOPLEVEL) {
     window = new LiVESMainWindow;
-  }
-  else {
-    window = new LiVESSubWindow;
+  } else {
+    window = new LiVESDialog;
   }
 #endif
-
   return window;
 }
 
@@ -1123,15 +1228,8 @@
   return TRUE;
 #endif
 #ifdef GUI_QT
-  QString *qs = new QString(QString::fromUtf8(title));
-
-  if (window->get_type() == LIVES_WIDGET_TYPE_SUB_WINDOW) {
-    window->setWindowTitle(*qs);
-  }
-  else {
-    QWindow *qwindow = (QWindow *)window;
-    qwindow->setTitle(*qs);
-  }
+  QString qs = QString::fromUtf8(title);
+  window->setWindowTitle(qs);
   return TRUE;
 #endif
   return FALSE;
@@ -1144,8 +1242,12 @@
   return TRUE;
 #endif
 #ifdef GUI_QT
-  if (window->get_type() == LIVES_WIDGET_TYPE_SUB_WINDOW) {
-    ((QWidget *)window)->setParent(parent);
+  if (LIVES_IS_DIALOG(window)) {
+    window->winId();
+    QWindow *qwindow = window->windowHandle();
+    parent->winId();
+    QWindow *qpwindow = parent->windowHandle();
+    qwindow->setTransientParent(qpwindow);
   }
   return TRUE;
 #endif
@@ -1159,9 +1261,10 @@
   return TRUE;
 #endif
 #ifdef GUI_QT
-  if (window->get_type() == LIVES_WIDGET_TYPE_SUB_WINDOW) {
-    QDialog *qwindow = (QDialog *)window;
-    qwindow->setModal(modal);
+  if (LIVES_IS_DIALOG(window)) {
+    QDialog *qwindow = dynamic_cast<QDialog *>(window);
+    if (qwindow != NULL)
+      qwindow->setModal(modal);
   }
   return TRUE;
 #endif
@@ -1175,21 +1278,20 @@
   return TRUE;
 #endif
 #ifdef GUI_QT
-  if (window->get_type() == LIVES_WIDGET_TYPE_SUB_WINDOW) {
+  if (LIVES_IS_DIALOG(window)) {
     //QDialog *qd = (QDialog *)window;
-  bool vis = window->isVisible();
-  const Qt::WindowFlags flags = window->windowFlags();
-  Qt::WindowFlags newflags;
-  if (!deletable) {
-    newflags = flags;
-    if (flags & Qt::WindowCloseButtonHint) newflags ^= Qt::WindowCloseButtonHint;
-    newflags &= (flags | Qt::CustomizeWindowHint | Qt::WindowMinMaxButtonsHint);
-  }
-  else {
-    newflags = flags | Qt::WindowCloseButtonHint;
-  }
-  window->setWindowFlags(newflags);
-  if (vis) window->setVisible(true);
+    bool vis = window->isVisible();
+    const Qt::WindowFlags flags = window->windowFlags();
+    Qt::WindowFlags newflags;
+    if (!deletable) {
+      newflags = flags;
+      if (flags & Qt::WindowCloseButtonHint) newflags ^= Qt::WindowCloseButtonHint;
+      newflags &= (flags | Qt::CustomizeWindowHint | Qt::WindowMinMaxButtonsHint);
+    } else {
+      newflags = flags | Qt::WindowCloseButtonHint;
+    }
+    window->setWindowFlags(newflags);
+    if (vis) window->setVisible(true);
   }
   return TRUE;
 #endif
@@ -1203,19 +1305,18 @@
   return TRUE;
 #endif
 #ifdef GUI_QT
-  if (window->get_type() == LIVES_WIDGET_TYPE_SUB_WINDOW) {
-  bool vis = window->isVisible();
-  const Qt::WindowFlags flags = window->windowFlags();
-  Qt::WindowFlags newflags = flags;
-  if (!resizable) {
-    if (flags & Qt::WindowMinMaxButtonsHint) newflags ^= Qt::WindowMinMaxButtonsHint;
-    newflags |= Qt::CustomizeWindowHint | Qt::WindowCloseButtonHint;
-  }
-  else {
-    newflags = flags | Qt::WindowMinMaxButtonsHint;
-  }
-  window->setWindowFlags(newflags);
-  if (vis) window->setVisible(true);
+  if (LIVES_IS_DIALOG(window)) {
+    bool vis = window->isVisible();
+    const Qt::WindowFlags flags = window->windowFlags();
+    Qt::WindowFlags newflags = flags;
+    if (!resizable) {
+      if (flags & Qt::WindowMinMaxButtonsHint) newflags ^= Qt::WindowMinMaxButtonsHint;
+      newflags |= Qt::CustomizeWindowHint | Qt::WindowCloseButtonHint;
+    } else {
+      newflags = flags | Qt::WindowMinMaxButtonsHint;
+    }
+    window->setWindowFlags(newflags);
+    if (vis) window->setVisible(true);
   }
   return TRUE;
 #endif
@@ -1229,18 +1330,17 @@
   return TRUE;
 #endif
 #ifdef GUI_QT
-  if (window->get_type() == LIVES_WIDGET_TYPE_SUB_WINDOW) {
-  bool vis = window->isVisible();
-  const Qt::WindowFlags flags = window->windowFlags();
-  Qt::WindowFlags newflags = flags;
-  if (set) {
-    newflags = flags | Qt::WindowStaysOnBottomHint;
-  }
-  else {
-    if (flags & Qt::WindowStaysOnBottomHint) newflags ^= Qt::WindowStaysOnBottomHint;
-  }
-  window->setWindowFlags(newflags);
-  if (vis) window->setVisible(true);
+  if (LIVES_IS_DIALOG(window)) {
+    bool vis = window->isVisible();
+    const Qt::WindowFlags flags = window->windowFlags();
+    Qt::WindowFlags newflags = flags;
+    if (set) {
+      newflags = flags | Qt::WindowStaysOnBottomHint;
+    } else {
+      if (flags & Qt::WindowStaysOnBottomHint) newflags ^= Qt::WindowStaysOnBottomHint;
+    }
+    window->setWindowFlags(newflags);
+    if (vis) window->setVisible(true);
   }
   return TRUE;
 #endif
@@ -1254,18 +1354,17 @@
   return TRUE;
 #endif
 #ifdef GUI_QT
-  if (window->get_type() == LIVES_WIDGET_TYPE_SUB_WINDOW) {
-  bool vis = window->isVisible();
-  const Qt::WindowFlags flags = window->windowFlags();
-  Qt::WindowFlags newflags = flags;
-  if (!set) {
-    newflags = flags | Qt::FramelessWindowHint;
-  }
-  else {
-    if (flags & Qt::FramelessWindowHint) newflags ^= Qt::FramelessWindowHint;
-  }
-  window->setWindowFlags(newflags);
-  if (vis) window->setVisible(true);
+  if (LIVES_IS_DIALOG(window)) {
+    bool vis = window->isVisible();
+    const Qt::WindowFlags flags = window->windowFlags();
+    Qt::WindowFlags newflags = flags;
+    if (!set) {
+      newflags = flags | Qt::FramelessWindowHint;
+    } else {
+      if (flags & Qt::FramelessWindowHint) newflags ^= Qt::FramelessWindowHint;
+    }
+    window->setWindowFlags(newflags);
+    if (vis) window->setVisible(true);
   }
   return TRUE;
 #endif
@@ -1293,8 +1392,9 @@
   return TRUE;
 #endif
 #ifdef GUI_QT
-  if (window->get_type() == LIVES_WIDGET_TYPE_MAIN_WINDOW) {
-    QWindow *qwindow = (QWindow *)window;
+  if (LIVES_IS_WINDOW(window)) {
+    window->winId();
+    QWindow *qwindow = window->windowHandle();
     qwindow->setScreen(screen);
   }
   return TRUE;
@@ -1309,7 +1409,7 @@
   return TRUE;
 #endif
 #ifdef GUI_QT
-  if (window->get_type() == LIVES_WIDGET_TYPE_MAIN_WINDOW) {
+  if (LIVES_IS_WINDOW(window)) {
     window->resize(width,height);
   }
   return TRUE;
@@ -1323,13 +1423,7 @@
   return gtk_window_get_title(window);
 #endif
 #ifdef GUI_QT
-  if (window->get_type() == LIVES_WIDGET_TYPE_MAIN_WINDOW) {
-    QWindow *qwindow = (QWindow *)window;
-    return (const char *)qwindow->title().toUtf8().constData();
-  }
-  else {
-    return (const char *)window->windowTitle().toUtf8().constData();
-  }
+  return (const char *)window->windowTitle().toUtf8().constData();
 #endif
   return NULL;
 }
@@ -1341,25 +1435,45 @@
   return TRUE;
 #endif
 #ifdef GUI_QT
-  if (window->get_type() == LIVES_WIDGET_TYPE_MAIN_WINDOW) {
-    QWindow *qw = (QWindow *)window;
+  if (LIVES_IS_WINDOW(window)) {
+    window->winId();
+    QWindow *qw = window->windowHandle();
     qw->setX(x);
     qw->setY(y);
-    return TRUE;
   }
+  return TRUE;
 #endif
   return FALSE;
 }
 
 
+LIVES_INLINE boolean lives_widget_get_position(LiVESWidget *widget, int *x, int *y) {
+#ifdef GUI_GTK
+  GdkWindow *window=lives_widget_get_xwindow(widget);
+  gdk_window_get_position(window,x,y);
+  return TRUE;
+#endif
+#ifdef GUI_QT
+  QPoint p(0,0);
+  p = widget->mapToGlobal(p);
+  *x = p.x();
+  *y = p.y();
+  return TRUE;
+#endif
+  return FALSE;
+}
+
+
+
 LIVES_INLINE boolean lives_window_get_position(LiVESWindow *window, int *x, int *y) {
 #ifdef GUI_GTK
   gtk_window_get_position(window,x,y);
   return TRUE;
 #endif
 #ifdef GUI_QT
-  if (window->get_type() == LIVES_WIDGET_TYPE_MAIN_WINDOW) {
-    QWindow *qw = (QWindow *)window;
+  if (LIVES_IS_WINDOW(window)) {
+    window->winId();
+    QWindow *qw = window->windowHandle();
     *x = qw->x();
     *y = qw->y();
     return TRUE;
@@ -1375,7 +1489,8 @@
   return TRUE;
 #endif
 #ifdef GUI_QT
-  // TODO
+  if (LIVES_IS_WINDOW(window))
+    (static_cast<LiVESMainWindow *>(window))->set_position(pos);
 #endif
   return FALSE;
 }
@@ -1400,6 +1515,7 @@
   gtk_window_resize(window,width,height);
   return TRUE;
 #endif
+  // TODO
   return FALSE;
 }
 
@@ -1423,9 +1539,11 @@
   return TRUE;
 #endif
 #ifdef GUI_QT
-  if (window->get_type() == LIVES_WIDGET_TYPE_MAIN_WINDOW) {
-    QWindow *qwindow = (QWindow *)window;
+  if (LIVES_IS_WINDOW(window)) {
+    window->winId();
+    QWindow *qwindow = window->windowHandle();
     qwindow->setWindowState(Qt::WindowFullScreen);
+    qwindow->setFlags(Qt::Widget | Qt::Window | Qt::CustomizeWindowHint | Qt::FramelessWindowHint);
   }
   return TRUE;
 #endif
@@ -1439,9 +1557,11 @@
   return TRUE;
 #endif
 #ifdef GUI_QT
-  if (window->get_type() == LIVES_WIDGET_TYPE_MAIN_WINDOW) {
-    QWindow *qwindow = (QWindow *)window;
+  if (LIVES_IS_WINDOW(window)) {
+    window->winId();
+    QWindow *qwindow = window->windowHandle();
     qwindow->setWindowState(Qt::WindowNoState);
+    qwindow->setFlags(Qt::Widget | Qt::Window);
   }
   return TRUE;
 #endif
@@ -1455,8 +1575,9 @@
   return TRUE;
 #endif
 #ifdef GUI_QT
-  if (window->get_type() == LIVES_WIDGET_TYPE_MAIN_WINDOW) {
-    QWindow *qwindow = (QWindow *)window;
+  if (LIVES_IS_WINDOW(window)) {
+    window->winId();
+    QWindow *qwindow = window->windowHandle();
     qwindow->setWindowState(Qt::WindowMaximized);
   }
   return TRUE;
@@ -1471,8 +1592,9 @@
   return TRUE;
 #endif
 #ifdef GUI_QT
-  if (window->get_type() == LIVES_WIDGET_TYPE_MAIN_WINDOW) {
-    QWindow *qwindow = (QWindow *)window;
+  if (LIVES_IS_WINDOW(window)) {
+    window->winId();
+    QWindow *qwindow = window->windowHandle();
     qwindow->setWindowState(Qt::WindowNoState);
   }
   return TRUE;
@@ -1494,8 +1616,8 @@
 
 
 
-LIVES_INLINE boolean lives_accel_group_connect(LiVESAccelGroup *group, uint32_t key, LiVESXModifierType mod, 
-					    LiVESAccelFlags flags, LiVESWidgetClosure *closure) {
+LIVES_INLINE boolean lives_accel_group_connect(LiVESAccelGroup *group, uint32_t key, LiVESXModifierType mod,
+    LiVESAccelFlags flags, LiVESWidgetClosure *closure) {
 
 #ifdef GUI_GTK
   gtk_accel_group_connect(group,key,mod,flags,closure);
@@ -1526,7 +1648,7 @@
 
 
 LIVES_INLINE boolean lives_widget_add_accelerator(LiVESWidget *widget, const char *accel_signal, LiVESAccelGroup *accel_group,
-					       uint32_t accel_key, LiVESXModifierType accel_mods, LiVESAccelFlags accel_flags) {
+    uint32_t accel_key, LiVESXModifierType accel_mods, LiVESAccelFlags accel_flags) {
 #ifdef GUI_GTK
   gtk_widget_add_accelerator(widget,accel_signal,accel_group,accel_key,accel_mods,accel_flags);
   return TRUE;
@@ -1546,7 +1668,7 @@
   return TRUE;
 #endif
 #ifdef GUI_QT
-  ((LiVESWindow *)window)->add_accel_group(group);
+  window->add_accel_group(group);
   return TRUE;
 #endif
   return FALSE;
@@ -1559,7 +1681,7 @@
   return TRUE;
 #endif
 #ifdef GUI_QT
-  ((LiVESWindow *)window)->remove_accel_group(group);
+  window->remove_accel_group(group);
   return TRUE;
 #endif
   return FALSE;
@@ -1572,7 +1694,7 @@
   return TRUE;
 #endif
 #ifdef GUI_QT
-  ((LiVESMenu *)menu)->add_accel_group(group);
+  menu->add_accel_group(group);
   return TRUE;
 #endif
   return FALSE;
@@ -1599,8 +1721,8 @@
   return gtk_window_has_toplevel_focus(window);
 #endif
 #ifdef GUI_QT
-  if (window->get_type() == LIVES_WIDGET_TYPE_MAIN_WINDOW) {
-    return guiapp->focusObject() == (QObject *)(QWidget *)window;
+  if (LIVES_IS_WINDOW(window)) {
+    return QApplication::activeWindow() == static_cast<QWidget *>(window);
   }
   return TRUE;
 #endif
@@ -1615,7 +1737,7 @@
   // alpha fmt is RGBA post mult
   return gdk_pixbuf_new(GDK_COLORSPACE_RGB,has_alpha,8,width,height);
 #endif
-			
+
 #ifdef GUI_QT
   // alpha fmt is ARGB32 premult
   QImage::Format fmt;
@@ -1624,21 +1746,21 @@
     fmt=QImage::Format_ARGB32_Premultiplied;
     LIVES_WARN("Image fmt is ARGB pre");
   }
-  // on destruct, we need to call lives_free_buffer_fn(uchar *pixels, gpointer destroy_fn_data)
+  // on destruct, we need to call lives_free_buffer_fn(uchar *pixels, livespointer destroy_fn_data)
   return new LiVESPixbuf(width, height, fmt);
 #endif
 }
 
 
 
-LIVES_INLINE LiVESPixbuf *lives_pixbuf_new_from_data (const unsigned char *buf, boolean has_alpha, int width, int height, 
-						      int rowstride, LiVESPixbufDestroyNotify lives_free_buffer_fn, 
-						      livespointer destroy_fn_data) {
+LIVES_INLINE LiVESPixbuf *lives_pixbuf_new_from_data(const unsigned char *buf, boolean has_alpha, int width, int height,
+    int rowstride, LiVESPixbufDestroyNotify lives_free_buffer_fn,
+    livespointer destroy_fn_data) {
 
 #ifdef GUI_GTK
-  return gdk_pixbuf_new_from_data ((const guchar *)buf, GDK_COLORSPACE_RGB, has_alpha, 8, width, height, rowstride, 
-				   lives_free_buffer_fn, 
-				   destroy_fn_data);
+  return gdk_pixbuf_new_from_data((const guchar *)buf, GDK_COLORSPACE_RGB, has_alpha, 8, width, height, rowstride,
+                                  lives_free_buffer_fn,
+                                  destroy_fn_data);
 #endif
 
 
@@ -1665,7 +1787,7 @@
 #ifdef GUI_QT
   LiVESPixbuf *image = new LiVESPixbuf;
   QString qs = QString::fromUtf8(filename); // TODO ??
-  if (!((QImage *)image)->load(qs)) {
+  if (!(static_cast<QImage *>(image))->load(qs)) {
     // do something with error
     LIVES_WARN("QImage not loaded");
     delete image;
@@ -1679,9 +1801,9 @@
 
 
 
-LIVES_INLINE LiVESPixbuf *lives_pixbuf_new_from_file_at_scale(const char *filename, int width, int height, 
-							      boolean preserve_aspect_ratio,
-							      LiVESError **error) {
+LIVES_INLINE LiVESPixbuf *lives_pixbuf_new_from_file_at_scale(const char *filename, int width, int height,
+    boolean preserve_aspect_ratio,
+    LiVESError **error) {
 
 #ifdef GUI_GTK
   return lives_pixbuf_new_from_file_at_scale(filename, width, height, preserve_aspect_ratio, error);
@@ -1691,10 +1813,20 @@
   QImage image;
   QImage image2;
   Qt::AspectRatioMode asp;
-  QString qs = QString::fromUtf8(filename); // TODO ??
-  if (!image.load(qs)) {
-    // do something with error
-    LIVES_WARN("QImage not loaded");
+#ifdef IS_MINGW
+  QString qs = QString::fromUtf8(filename);
+#else
+  QString qs = QString::fromLocal8Bit(filename);
+#endif
+  QImageReader qir;
+  qir.setFileName(qs);
+  if (!preserve_aspect_ratio) qir.setScaledSize(QSize(width,height));
+  if (!qir.read(&image)) {
+    if (error != NULL) {
+      *error = (LiVESError *)malloc(sizeof(LiVESError));
+      (*error)->code = qir.error();
+      (*error)->message = strdup(qir.errorString().toUtf8().constData());
+    }
     return NULL;
   }
   if (preserve_aspect_ratio) asp=Qt::KeepAspectRatio;
@@ -1719,7 +1851,7 @@
 #endif
 
 #ifdef GUI_QT
-  return ((QImage *)pixbuf)->bytesPerLine();
+  return (dynamic_cast<const QImage *>(pixbuf))->bytesPerLine();
 #endif
 }
 
@@ -1730,7 +1862,7 @@
 #endif
 
 #ifdef GUI_QT
-  return ((QImage *)pixbuf)->width();
+  return (dynamic_cast<const QImage *>(pixbuf))->width();
 #endif
 }
 
@@ -1741,7 +1873,7 @@
 #endif
 
 #ifdef GUI_QT
-  return ((QImage *)pixbuf)->height();
+  return (dynamic_cast<const QImage *>(pixbuf))->height();
 #endif
 }
 
@@ -1752,7 +1884,7 @@
 #endif
 
 #ifdef GUI_QT
-  return ((QImage *)pixbuf)->depth()>>3;
+  return (dynamic_cast<const QImage *>(pixbuf))->depth()>>3;
 #endif
 }
 
@@ -1764,7 +1896,7 @@
 #endif
 
 #ifdef GUI_QT
-  return (uchar *)((QImage *)pixbuf)->bits();
+  return (uchar *)(dynamic_cast<const QImage *>(pixbuf))->bits();
 #endif
 }
 
@@ -1776,7 +1908,7 @@
 #endif
 
 #ifdef GUI_QT
-  return (const uchar *)((QImage *)pixbuf)->bits();
+  return (const uchar *)(dynamic_cast<const QImage *>(pixbuf))->bits();
 #endif
 }
 
@@ -1788,21 +1920,21 @@
 #endif
 
 #ifdef GUI_QT
-  return ((QImage *)pixbuf)->hasAlphaChannel();
+  return (dynamic_cast<const QImage *>(pixbuf))->hasAlphaChannel();
 #endif
 }
 
 
-LIVES_INLINE LiVESPixbuf *lives_pixbuf_scale_simple(const LiVESPixbuf *src, int dest_width, int dest_height, 
-						    LiVESInterpType interp_type) {
-  
+LIVES_INLINE LiVESPixbuf *lives_pixbuf_scale_simple(const LiVESPixbuf *src, int dest_width, int dest_height,
+    LiVESInterpType interp_type) {
+
 #ifdef GUI_GTK
   return gdk_pixbuf_scale_simple(src, dest_width, dest_height, interp_type);
 #endif
 
 
 #ifdef GUI_QT
-  QImage image = ((QImage *)src)->scaled(dest_width, dest_height, Qt::IgnoreAspectRatio, interp_type);
+  QImage image = (dynamic_cast<const QImage *>(src))->scaled(dest_width, dest_height, Qt::IgnoreAspectRatio, interp_type);
   if (image.isNull()) {
     LIVES_WARN("QImage not scaled");
     return NULL;
@@ -1829,8 +1961,8 @@
 
 
 
-LIVES_INLINE LiVESAdjustment *lives_adjustment_new(double value, double lower, double upper, 
-						   double step_increment, double page_increment, double page_size) {
+LIVES_INLINE LiVESAdjustment *lives_adjustment_new(double value, double lower, double upper,
+    double step_increment, double page_increment, double page_size) {
   LiVESAdjustment *adj=NULL;
 #ifdef GUI_GTK
 #if GTK_CHECK_VERSION(3,0,0)
@@ -1865,12 +1997,11 @@
 #endif
 #ifdef GUI_QT
   if (LIVES_IS_HBOX(box)) {
-    QHBoxLayout *qbox = (QHBoxLayout *)box;
+    QHBoxLayout *qbox = dynamic_cast<QHBoxLayout *>(box);
     qbox->removeWidget(child);
     qbox->insertWidget(pos,child);
-  }
-  else {
-    QVBoxLayout *qbox = (QVBoxLayout *)box;
+  } else {
+    QVBoxLayout *qbox = dynamic_cast<QVBoxLayout *>(box);
     qbox->removeWidget(child);
     qbox->insertWidget(pos,child);
   }
@@ -1887,11 +2018,10 @@
 #endif
 #ifdef GUI_QT
   if (LIVES_IS_HBOX(box)) {
-    QHBoxLayout *qbox = (QHBoxLayout *)box;
+    QHBoxLayout *qbox = dynamic_cast<QHBoxLayout *>(box);
     qbox->setSpacing(spacing);
-  }
-  else {
-    QVBoxLayout *qbox = (QVBoxLayout *)box;
+  } else {
+    QVBoxLayout *qbox = dynamic_cast<QVBoxLayout *>(box);
     qbox->setSpacing(spacing);
   }
   return TRUE;
@@ -1911,8 +2041,9 @@
 #endif
 #endif
 #ifdef GUI_QT
-  hbox = new LiVESHBox;
-  ((QHBoxLayout *)hbox)->setSpacing(spacing);
+  LiVESHBox *hxbox = new LiVESHBox;
+  hxbox->setSpacing(spacing);
+  hbox = static_cast<LiVESWidget *>(hxbox);
 #endif
   return hbox;
 }
@@ -1929,8 +2060,9 @@
 #endif
 #endif
 #ifdef GUI_QT
-  vbox = new LiVESVBox;
-  ((QVBoxLayout *)vbox)->setSpacing(spacing);
+  LiVESVBox *vxbox = new LiVESVBox;
+  vxbox->setSpacing(spacing);
+  vbox = static_cast<LiVESWidget *>(vxbox);
 #endif
   return vbox;
 }
@@ -1944,22 +2076,22 @@
 #endif
 #ifdef GUI_QT
   if (LIVES_IS_HBOX(box)) {
-    QHBoxLayout *qbox = (QHBoxLayout *)box;
+    QHBoxLayout *qbox = dynamic_cast<QHBoxLayout *>(box);
     QBoxLayout::Direction dir = qbox->direction();
     if (dir == QBoxLayout::LeftToRight) {
       qbox->setDirection(QBoxLayout::RightToLeft);
-    }
-    else if (dir == QBoxLayout::RightToLeft) {
+    } else if (dir == QBoxLayout::RightToLeft) {
       qbox->setDirection(QBoxLayout::LeftToRight);
     }
+    if (fill) child->setSizePolicy(QSizePolicy::MinimumExpanding,QSizePolicy::Preferred);
     qbox->insertWidget(0,child,expand?100:0,fill?(Qt::Alignment)0:Qt::AlignHCenter);
     qbox->setDirection(dir);
-  }
-  else {
-    QVBoxLayout *qbox = (QVBoxLayout *)box;
+  } else {
+    QVBoxLayout *qbox = dynamic_cast<QVBoxLayout *>(box);
     QBoxLayout::Direction dir = qbox->direction();
     if (dir == QBoxLayout::TopToBottom) qbox->setDirection(QBoxLayout::BottomToTop);
     else qbox->setDirection(QBoxLayout::TopToBottom);
+    if (fill) child->setSizePolicy(QSizePolicy::Preferred,QSizePolicy::MinimumExpanding);
     qbox->insertWidget(0,child,expand?100:0,fill?(Qt::Alignment)0:Qt::AlignVCenter);
     qbox->setDirection(dir);
   }
@@ -1978,11 +2110,12 @@
 #endif
 #ifdef GUI_QT
   if (LIVES_IS_HBOX(box)) {
-    QHBoxLayout *qbox = (QHBoxLayout *)box;
+    QHBoxLayout *qbox = dynamic_cast<QHBoxLayout *>(box);
+    if (fill) child->setSizePolicy(QSizePolicy::MinimumExpanding,QSizePolicy::Preferred);
     qbox->insertWidget(0,child,expand?100:0,fill?(Qt::Alignment)0:Qt::AlignHCenter);
-  }
-  else {
-    QVBoxLayout *qbox = (QVBoxLayout *)box;
+  } else {
+    QVBoxLayout *qbox = dynamic_cast<QVBoxLayout *>(box);
+    if (fill) child->setSizePolicy(QSizePolicy::Preferred,QSizePolicy::MinimumExpanding);
     qbox->insertWidget(0,child,expand?100:0,fill?(Qt::Alignment)0:Qt::AlignVCenter);
   }
   box->add_child(child);
@@ -2005,7 +2138,7 @@
 #endif
 #ifdef GUI_QT
   hsep = new LiVESHSeparator;
-#endif  
+#endif
   return hsep;
 }
 
@@ -2021,7 +2154,7 @@
 #endif
 #ifdef GUI_QT
   vsep = new LiVESVSeparator;
-#endif  
+#endif
   return vsep;
 }
 
@@ -2066,8 +2199,7 @@
 #ifdef GUI_QT
   if (bstyle == LIVES_BUTTONBOX_CENTER) {
     bbox->setCenterButtons(true);
-  }
-  else {
+  } else {
     bbox->setCenterButtons(false);
   }
 #endif
@@ -2120,10 +2252,9 @@
 #endif
 #endif
 #ifdef GUI_QT
-  hpaned = new LiVESPaned;
-  QSplitter *qs = dynamic_cast<QSplitter *>(hpaned);
-  if (qs != NULL) 
-    qs->setOrientation(LIVES_ORIENTATION_HORIZONTAL);
+  LiVESPaned *qs = new LiVESPaned;
+  qs->setOrientation(LIVES_ORIENTATION_HORIZONTAL);
+  hpaned = static_cast<LiVESWidget *>(qs);
 #endif
   return hpaned;
 }
@@ -2139,10 +2270,9 @@
 #endif
 #endif
 #ifdef GUI_QT
-  vpaned = new LiVESPaned;
-  QSplitter *qs = dynamic_cast<QSplitter *>(vpaned);
-  if (qs != NULL) 
-    qs->setOrientation(LIVES_ORIENTATION_VERTICAL);
+  LiVESPaned *qs = new LiVESPaned;
+  qs->setOrientation(LIVES_ORIENTATION_VERTICAL);
+  vpaned = static_cast<LiVESWidget *>(qs);
 #endif
   return vpaned;
 }
@@ -2183,19 +2313,17 @@
 LIVES_INLINE LiVESWidget *lives_label_new(const char *text) {
   LiVESWidget *label=NULL;
 #ifdef GUI_GTK
-
   label=gtk_label_new(text);
-
-  gtk_label_set_justify (LIVES_LABEL (label), widget_opts.justify);
-
-  gtk_label_set_line_wrap (LIVES_LABEL (label), widget_opts.line_wrap);
+  gtk_label_set_justify(LIVES_LABEL(label), widget_opts.justify);
+  gtk_label_set_line_wrap(LIVES_LABEL(label), widget_opts.line_wrap);
 #endif
 #ifdef GUI_QT
-  QString *qs = new QString(QString::fromUtf8(text));
-  label = new LiVESLabel(*qs);
-  QLabel *ql = (QLabel *)label;
+  QString qs = QString::fromUtf8(text);
+  LiVESLabel *ql = new LiVESLabel(qs);
   ql->setAlignment(widget_opts.justify);
   ql->setWordWrap(widget_opts.line_wrap);
+  ql->setTextFormat(Qt::PlainText);
+  label = static_cast<LiVESWidget *>(ql);
 #endif
   return label;
 }
@@ -2208,7 +2336,7 @@
 #endif
 #ifdef GUI_QT
   QStyleOption *qstyleopt = 0;
-  QIcon qi = guiapp->style()->standardIcon(arrow_type, qstyleopt);
+  QIcon qi = QApplication::style()->standardIcon(arrow_type, qstyleopt);
   QPixmap qp = qi.pixmap(LIVES_ICON_SIZE_DIALOG);
   QImage qm = qp.toImage();
   arrow = new LiVESArrow(&qm);
@@ -2220,8 +2348,19 @@
 LIVES_INLINE LiVESWidget *lives_alignment_new(float xalign, float yalign, float xscale, float yscale) {
   LiVESWidget *alignment=NULL;
 #ifdef GUI_GTK
+#if GTK_CHECK_VERSION(3,0,0)
+  alignment=gtk_frame_new(NULL);
+  gtk_frame_set_shadow_type(LIVES_FRAME(alignment), GTK_SHADOW_NONE);
+  if (xalign==0.5) gtk_widget_set_halign(alignment,GTK_ALIGN_CENTER);
+  if (xalign==0.&&xscale==1.) gtk_widget_set_halign(alignment,GTK_ALIGN_FILL);
+  if (xalign==0.&&xscale==0.) gtk_widget_set_halign(alignment,GTK_ALIGN_START);
+  if (yalign==0.5) gtk_widget_set_valign(alignment,GTK_ALIGN_CENTER);
+  if (yalign==0.&&yscale==1.) gtk_widget_set_valign(alignment,GTK_ALIGN_FILL);
+  if (yalign==0.&&yscale==0.) gtk_widget_set_valign(alignment,GTK_ALIGN_START);
+#else
   alignment=gtk_alignment_new(xalign,yalign,xscale,yscale);
 #endif
+#endif
 #ifdef GUI_QT
   alignment = new LiVESAlignment(xalign,yalign,xscale,yscale);
 #endif
@@ -2231,9 +2370,18 @@
 
 LIVES_INLINE boolean lives_alignment_set(LiVESAlignment *alignment, float xalign, float yalign, float xscale, float yscale) {
 #ifdef GUI_GTK
+#if GTK_CHECK_VERSION(3,0,0)
+  if (xalign==0.5) gtk_widget_set_halign((GtkWidget *)alignment,GTK_ALIGN_CENTER);
+  if (xalign==0.&&xscale==1.) gtk_widget_set_halign((GtkWidget *)alignment,GTK_ALIGN_FILL);
+  if (xalign==0.&&xscale==0.) gtk_widget_set_halign((GtkWidget *)alignment,GTK_ALIGN_START);
+  if (yalign==0.5) gtk_widget_set_valign((GtkWidget *)alignment,GTK_ALIGN_CENTER);
+  if (yalign==0.&&yscale==1.) gtk_widget_set_valign((GtkWidget *)alignment,GTK_ALIGN_FILL);
+  if (yalign==0.&&yscale==0.) gtk_widget_set_valign((GtkWidget *)alignment,GTK_ALIGN_START);
+#else
   gtk_alignment_set(alignment,xalign,yalign,xscale,yscale);
   return TRUE;
 #endif
+#endif
 #ifdef GUI_QT
   alignment->set_alignment(xalign,yalign,xscale,yscale);
   return TRUE;
@@ -2276,14 +2424,14 @@
 LIVES_INLINE boolean lives_label_set_halignment(LiVESLabel *label, float yalign) {
 #ifdef GUI_GTK
 #if GTK_CHECK_VERSION(3,16,0)
-  gtk_label_set_y_align(label,yalign);
+  gtk_label_set_yalign(label,yalign);
 #else
   gtk_misc_set_alignment(GTK_MISC(label),0.,yalign);
 #endif
   return TRUE;
 #endif
 #ifdef GUI_QT
-  QRect qr = ((QFrame *)label)->contentsRect();
+  QRect qr = (static_cast<QFrame *>(label))->contentsRect();
   int pixels = (float)qr.width() * yalign;
   label->setIndent(pixels);
 #endif
@@ -2295,9 +2443,9 @@
   LiVESWidget *combo=NULL;
 #ifdef GUI_GTK
 #if GTK_CHECK_VERSION(2,24,0)
-  combo = gtk_combo_box_text_new_with_entry ();
+  combo = gtk_combo_box_text_new_with_entry();
 #else
-  combo = gtk_combo_box_entry_new_text ();
+  combo = gtk_combo_box_entry_new_text();
 #endif
 #endif
 #ifdef GUI_QT
@@ -2307,21 +2455,21 @@
 }
 
 
-LIVES_INLINE LiVESWidget *lives_combo_new_with_model (LiVESTreeModel *model) {
+LIVES_INLINE LiVESWidget *lives_combo_new_with_model(LiVESTreeModel *model) {
   LiVESWidget *combo=NULL;
 #ifdef GUI_GTK
 #if GTK_CHECK_VERSION(2,24,0)
-  combo = gtk_combo_box_new_with_model_and_entry (model);
+  combo = gtk_combo_box_new_with_model_and_entry(model);
 #else
-  combo = gtk_combo_box_entry_new ();
+  combo = gtk_combo_box_entry_new();
   gtk_combo_box_set_model(GTK_COMBO_BOX(combo),model);
 #endif
 #endif
 #ifdef GUI_QT
   combo = new LiVESCombo;
-  QComboBox *qcombo = (QComboBox *)combo;
-  qcombo->setModel(model->get_model());
-  qcombo->setView(model->get_tree_widget());
+  QComboBox *qcombo = dynamic_cast<QComboBox *>(combo);
+  qcombo->setModel(model->to_qsimodel());
+  if (model->get_qtree_widget() != NULL) qcombo->setView(model->get_qtree_widget());
 #endif
   return combo;
 
@@ -2334,16 +2482,14 @@
   model=gtk_combo_box_get_model(combo);
 #endif
 #ifdef GUI_QT
-  QAbstractItemModel *qqmodel = ((QComboBox *)combo)->model();
+  QAbstractItemModel *qqmodel = (static_cast<QComboBox *>(combo))->model();
 
-  QStandardItemModel *qmodel = static_cast<QStandardItemModel *>(qqmodel);
-  if (qmodel == NULL) return model;
+  QVariant qv = (qqmodel)->property("LiVESObject");
 
-  QVariant qv = ((QAbstractItemModel *)qmodel)->property("LiVESObject");
   if (qv.isValid()) {
-    return static_cast<LiVESTreeModel *>(qv.value<LiVESObject *>());
+    model = static_cast<LiVESTreeModel *>(qv.value<LiVESObject *>());
   }
-  model = new LiVESTreeModel(qmodel);
+
 #endif
   return model;
 }
@@ -2355,13 +2501,13 @@
 #if GTK_CHECK_VERSION(2,24,0)
   gtk_combo_box_text_append_text(GTK_COMBO_BOX_TEXT(combo),text);
 #else
-  gtk_combo_box_append_text(GTK_COMBO(combo),text);
+  gtk_combo_box_append_text(GTK_COMBO_BOX(combo),text);
 #endif
   return TRUE;
 #endif
 #ifdef GUI_QT
-  QString *qs = new QString(QString::fromUtf8(text));
-  ((QComboBox *)combo)->addItem(*qs);
+  QString qs = QString::fromUtf8(text);
+  (static_cast<QComboBox *>(combo))->addItem(qs);
   return TRUE;
 #endif
   return FALSE;
@@ -2380,7 +2526,7 @@
   return TRUE;
 #endif
 #ifdef GUI_QT
-  ((QComboBox *)combo)->clear();
+  static_cast<QComboBox *>(combo)->clear();
   return TRUE;
 #endif
   return FALSE;
@@ -2399,7 +2545,7 @@
   return TRUE;
 #endif
 #ifdef GUI_QT
-  ((QComboBox *)combo)->setModelColumn(column);
+  (static_cast<QComboBox *>(combo))->setModelColumn(column);
   return TRUE;
 #endif
   return FALSE;
@@ -2416,7 +2562,7 @@
 #endif
 #endif
 #ifdef GUI_QT
-  return strdup(((QComboBox *)combo)->currentText().toUtf8().constData());
+  return strdup((static_cast<QComboBox *>(combo))->currentText().toUtf8().constData());
 #endif
   return NULL;
 }
@@ -2428,7 +2574,7 @@
   return TRUE;
 #endif
 #ifdef GUI_QT
-  ((QComboBox *)combo)->setCurrentIndex(index);
+  (static_cast<QComboBox *>(combo))->setCurrentIndex(index);
   return TRUE;
 #endif
   return FALSE;
@@ -2442,8 +2588,10 @@
 #endif
 #ifdef GUI_QT
   LiVESTreeModel *model = lives_combo_get_model(combo);
-  QTreeWidget *widget = model->get_tree_widget();
-  widget->setCurrentItem(iter);
+  if (model != NULL) {
+    QTreeWidget *widget = model->get_qtree_widget();
+    if (widget != NULL) widget->setCurrentItem(iter);
+  }
   return TRUE;
 #endif
   return FALSE;
@@ -2457,10 +2605,14 @@
 #endif
 #ifdef GUI_QT
   LiVESTreeModel *model = lives_combo_get_model(combo);
-  QTreeWidget *widget = model->get_tree_widget();
-  if (widget == NULL) return FALSE;
-  QTreeWidgetItem *qtwi = widget->currentItem();
-  *iter = *qtwi;
+  if (model != NULL) {
+    QTreeWidget *widget = model->get_qtree_widget();
+    if (widget != NULL) {
+      QTreeWidgetItem *qtwi = widget->currentItem();
+      *iter = *qtwi;
+      return TRUE;
+    }
+  }
 #endif
   return FALSE;
 }
@@ -2471,7 +2623,7 @@
   return gtk_combo_box_get_active(combo);
 #endif
 #ifdef GUI_QT
-  return ((QComboBox *)combo)->currentIndex();
+  return (static_cast<QComboBox *>(combo))->currentIndex();
 #endif
   return -1;
 }
@@ -2712,8 +2864,8 @@
 
 
 
-LIVES_INLINE LiVESTextMark *lives_text_buffer_create_mark(LiVESTextBuffer *tbuff, const char *mark_name, 
-							  const LiVESTextIter *where, boolean left_gravity) {
+LIVES_INLINE LiVESTextMark *lives_text_buffer_create_mark(LiVESTextBuffer *tbuff, const char *mark_name,
+    const LiVESTextIter *where, boolean left_gravity) {
   LiVESTextMark *tmark;
 #ifdef GUI_GTK
   tmark=gtk_text_buffer_create_mark(tbuff, mark_name, where, left_gravity);
@@ -2770,6 +2922,18 @@
 }
 
 
+LIVES_INLINE LiVESWidget *lives_dialog_new(void) {
+  LiVESWidget *dialog=NULL;
+#ifdef GUI_GTK
+  dialog=gtk_dialog_new();
+#endif
+#ifdef GUI_QT
+  dialog = new LiVESDialog();
+#endif
+  return dialog;
+}
+
+
 LIVES_INLINE LiVESWidget *lives_button_new(void) {
   LiVESWidget *button=NULL;
 #ifdef GUI_GTK
@@ -2788,7 +2952,7 @@
   button=gtk_button_new_with_mnemonic(label);
 #endif
 #ifdef GUI_QT
-  QString qlabel = QString::fromUtf8(label); 
+  QString qlabel = QString::fromUtf8(label);
   qlabel = qlabel.replace('&',"&&");
   qlabel = qlabel.replace('_','&');
   button = new LiVESButton(qlabel);
@@ -2820,47 +2984,33 @@
   if (!strcmp(stock_id,LIVES_STOCK_NO)) stock_id="gtk-no";
   if (!strcmp(stock_id,LIVES_STOCK_APPLY)) {
     button=lives_button_new_with_mnemonic(LIVES_STOCK_LABEL_APPLY);
-  }
-  else if (!strcmp(stock_id,LIVES_STOCK_OK)) {
+  } else if (!strcmp(stock_id,LIVES_STOCK_OK)) {
     button=lives_button_new_with_mnemonic(LIVES_STOCK_LABEL_OK);
-  }
-  else if (!strcmp(stock_id,LIVES_STOCK_CANCEL)) {
+  } else if (!strcmp(stock_id,LIVES_STOCK_CANCEL)) {
     button=lives_button_new_with_mnemonic(LIVES_STOCK_LABEL_CANCEL);
-  }
-  else if (!strcmp(stock_id,LIVES_STOCK_YES)) {
+  } else if (!strcmp(stock_id,LIVES_STOCK_YES)) {
     button=lives_button_new_with_mnemonic(LIVES_STOCK_LABEL_YES);
-  }
-  else if (!strcmp(stock_id,"gtk-no")) {
+  } else if (!strcmp(stock_id,"gtk-no")) {
     button=lives_button_new_with_mnemonic(LIVES_STOCK_LABEL_NO);
-  }
-  else if (!strcmp(stock_id,LIVES_STOCK_CLOSE)) {
+  } else if (!strcmp(stock_id,LIVES_STOCK_CLOSE)) {
     button=lives_button_new_with_mnemonic(LIVES_STOCK_LABEL_CLOSE);
-  }
-  else if (!strcmp(stock_id,LIVES_STOCK_REVERT_TO_SAVED)) {
+  } else if (!strcmp(stock_id,LIVES_STOCK_REVERT_TO_SAVED)) {
     button=lives_button_new_with_mnemonic(LIVES_STOCK_LABEL_REVERT);
-  }
-  else if (!strcmp(stock_id,LIVES_STOCK_REFRESH)) {
+  } else if (!strcmp(stock_id,LIVES_STOCK_REFRESH)) {
     button=lives_button_new_with_mnemonic(LIVES_STOCK_LABEL_REFRESH);
-  }
-  else if (!strcmp(stock_id,LIVES_STOCK_DELETE)) {
+  } else if (!strcmp(stock_id,LIVES_STOCK_DELETE)) {
     button=lives_button_new_with_mnemonic(LIVES_STOCK_LABEL_DELETE);
-  }
-  else if (!strcmp(stock_id,LIVES_STOCK_SAVE)) {
+  } else if (!strcmp(stock_id,LIVES_STOCK_SAVE)) {
     button=lives_button_new_with_mnemonic(LIVES_STOCK_LABEL_SAVE);
-  }
-  else if (!strcmp(stock_id,LIVES_STOCK_SAVE_AS)) {
+  } else if (!strcmp(stock_id,LIVES_STOCK_SAVE_AS)) {
     button=lives_button_new_with_mnemonic(LIVES_STOCK_LABEL_SAVE_AS);
-  }
-  else if (!strcmp(stock_id,LIVES_STOCK_OPEN)) {
+  } else if (!strcmp(stock_id,LIVES_STOCK_OPEN)) {
     button=lives_button_new_with_mnemonic(LIVES_STOCK_LABEL_OPEN);
-  }
-  else if (!strcmp(stock_id,LIVES_STOCK_QUIT)) {
+  } else if (!strcmp(stock_id,LIVES_STOCK_QUIT)) {
     button=lives_button_new_with_mnemonic(LIVES_STOCK_LABEL_QUIT);
-  }
-  else if (!strcmp(stock_id,LIVES_STOCK_GO_FORWARD)) {
+  } else if (!strcmp(stock_id,LIVES_STOCK_GO_FORWARD)) {
     button=lives_button_new_with_mnemonic(LIVES_STOCK_LABEL_GO_FORWARD);
-  }
-  else {
+  } else {
     // text not known
     button=lives_button_new();
   }
@@ -2869,7 +3019,7 @@
   if (prefs->show_button_images
       ||!strcmp(stock_id,LIVES_STOCK_ADD)
       ||!strcmp(stock_id,LIVES_STOCK_REMOVE)
-      ) {
+     ) {
     LiVESWidget *image=gtk_image_new_from_icon_name(stock_id,GTK_ICON_SIZE_BUTTON);
     gtk_button_set_image(GTK_BUTTON(button),image);
 #endif
@@ -2879,10 +3029,10 @@
     else {
       QAbstractButton *qbutton = dynamic_cast<QAbstractButton *>(button);
       if (qbutton != NULL) {
-	qbutton->setIconSize(LIVES_ICON_SIZE_BUTTON);
-	QIcon qi = QIcon::fromTheme(stock_id);
-	QPixmap qp = qi.pixmap(qbutton->iconSize());
-	qbutton->setIcon(qp);
+        qbutton->setIconSize(LIVES_ICON_SIZE_BUTTON);
+        QIcon qi = QIcon::fromTheme(stock_id);
+        QPixmap qp = qi.pixmap(qbutton->iconSize());
+        qbutton->setIcon(qp);
       }
 #endif
 
@@ -2893,13 +3043,18 @@
   button=gtk_button_new_from_stock(stock_id);
 #endif
 
+#ifdef GUI_GTK
 #if GTK_CHECK_VERSION(3,6,0)
-  gtk_button_set_always_show_image(GTK_BUTTON(button),prefs->show_button_images);
+    gtk_button_set_always_show_image(GTK_BUTTON(button),prefs->show_button_images);
+#endif
 #endif
 
-  return button;
-}
+    return button;
+  }
 
+#ifdef BALANCE
+} // to fix indentation
+#endif
 
 
 LIVES_INLINE boolean lives_button_set_label(LiVESButton *button, const char *label) {
@@ -2913,7 +3068,7 @@
     qlabel = qlabel.replace('&',"&&");
     qlabel = qlabel.replace('_','&');
   }
-  ((QAbstractButton *)((LiVESButtonBase *)button))->setText(qlabel);
+  (dynamic_cast<QAbstractButton *>(button))->setText(qlabel);
   return TRUE;
 #endif
   return FALSE;
@@ -2954,17 +3109,16 @@
   return TRUE;
 #endif
 #ifdef GUI_QT
-  QAbstractButton *qbutton = (QAbstractButton *)((LiVESButtonBase *)button);
+  QAbstractButton *qbutton = dynamic_cast<QAbstractButton *>(button);
   if (image != NULL && image->get_type() == LIVES_WIDGET_TYPE_IMAGE) {
     QImage *qim = dynamic_cast<QImage *>(image);
     if (qim != NULL) {
-      QPixmap *qpx = new QPixmap();
-      qpx->convertFromImage(*qim);
-      QIcon *qi = new QIcon(*qpx);
+      QPixmap qpx;
+      qpx.convertFromImage(*qim);
+      QIcon *qi = new QIcon(qpx);
       qbutton->setIcon(*qi);
     }
-  }
-  else {
+  } else {
     //qbutton->setIcon(NULL);
   }
   qbutton->setIconSize(LIVES_ICON_SIZE_BUTTON);
@@ -2981,12 +3135,48 @@
   return TRUE;
 #endif
 #ifdef GUI_QT
-  QWidget *qw = (QWidget *)((QPushButton *)button);
+  QWidget *qw = (static_cast<QWidget *>(static_cast<QPushButton *>(button)));
   if (qw->focusPolicy() == Qt::NoFocus) return TRUE;
   if (focus) {
     qw->setFocusPolicy(Qt::StrongFocus);
+  } else qw->setFocusPolicy(Qt::TabFocus);
+  return TRUE;
+#endif
+  return FALSE;
+}
+
+
+LIVES_INLINE boolean lives_paned_set_position(LiVESPaned *paned, int pos) {
+  // call this only after adding widgets
+
+#ifdef GUI_GTK
+  gtk_paned_set_position(paned,pos);
+  return TRUE;
+#endif
+#ifdef GUI_QT
+  int size = 0;
+  QList<int> qli = paned->sizes();
+  for (int i = 0; i < qli.size(); i++) {
+    size += qli.at(i);
   }
-  else qw->setFocusPolicy(Qt::TabFocus);
+  qli.clear();
+  qli.append(pos);
+  qli.append(size - pos);
+  paned->setSizes(qli);
+  return TRUE;
+#endif
+  return FALSE;
+}
+
+
+LIVES_INLINE boolean lives_paned_pack(int where, LiVESPaned *paned, LiVESWidget *child, boolean resize, boolean shrink) {
+#ifdef GUI_GTK
+  if (where==1) gtk_paned_pack1(paned,child,resize,shrink);
+  else gtk_paned_pack2(paned,child,resize,shrink);
+  return TRUE;
+#endif
+#ifdef GUI_QT
+  paned->insertWidget(where - 1, child);
   return TRUE;
 #endif
   return FALSE;
@@ -2994,12 +3184,38 @@
 
 
 
+LIVES_INLINE LiVESWidget *lives_drawing_area_new(void) {
+  LiVESWidget *darea=NULL;
+#ifdef GUI_GTK
+  darea=gtk_drawing_area_new();
+#endif
+#ifdef GUI_QT
+  darea = new LiVESDrawingArea;
+#endif
+  return darea;
+}
+
+
+
+LIVES_INLINE int lives_event_get_time(LiVESXEvent *event) {
+#ifdef GUI_GTK
+  return gdk_event_get_time(event);
+#endif
+#ifdef GUI_QT
+  // TODO
+  LiVESXEventButton *xevent = (LiVESXEventButton *)event;
+  return xevent->time;
+#endif
+  return 0;
+}
+
+
 LIVES_INLINE boolean lives_toggle_button_get_active(LiVESToggleButton *button) {
 #ifdef GUI_GTK
   return gtk_toggle_button_get_active(button);
 #endif
 #ifdef GUI_QT
-  return button->isChecked();
+  return (static_cast<QCheckBox *>(button))->isChecked();
 #endif
   return FALSE;
 }
@@ -3018,6 +3234,21 @@
 }
 
 
+LIVES_INLINE boolean lives_toggle_button_set_mode(LiVESToggleButton *button, boolean drawind) {
+#ifdef GUI_GTK
+  gtk_toggle_button_set_mode(button,drawind);
+  return TRUE;
+#endif
+#ifdef GUI_QT
+  //button->setChecked(active);
+  return TRUE;
+#endif
+  return FALSE;
+}
+
+
+
+
 LIVES_INLINE LiVESWidget *lives_radio_button_new(LiVESSList *group) {
   LiVESWidget *button=NULL;
 #ifdef GUI_GTK
@@ -3030,13 +3261,12 @@
     qbg = new QButtonGroup;
     group = lives_slist_append(group, (void *)qbg);
     qbg->setExclusive(true);
-  }
-  else {
-    qbg = (QButtonGroup *)lives_slist_nth_data(group, 0);
+  } else {
+    qbg = const_cast<QButtonGroup *>(static_cast<const QButtonGroup *>(lives_slist_nth_data(group, 0)));
   }
 
-  ((LiVESRadioButton *)button)->set_group(group);
-  qbg->addButton((QPushButton *)button);
+  (static_cast<LiVESRadioButton *>(button))->set_group(group);
+  qbg->addButton(dynamic_cast<QPushButton *>(button));
 
 #endif
   return button;
@@ -3063,11 +3293,11 @@
 #ifdef GUI_QT
   button = new LiVESCheckButton;
   QString qlabel = QString::fromUtf8(label);
-  if (((LiVESButtonBase *)button)->get_use_underline()) {
+  if ((static_cast<LiVESButtonBase *>(button))->get_use_underline()) {
     qlabel = qlabel.replace('&',"&&");
     qlabel = qlabel.replace('_','&');
   }
-  ((QAbstractButton *)button)->setText(qlabel);
+  (dynamic_cast<QAbstractButton *>(button))->setText(qlabel);
 #endif
   return button;
 }
@@ -3079,14 +3309,14 @@
   gtk_widget_set_tooltip_text(widget,tip_text);
 #else
   GtkTooltips *tips;
-  tips = gtk_tooltips_new ();
+  tips = gtk_tooltips_new();
   gtk_tooltips_set_tip(tips,widget,tip_text,NULL);
 #endif
   return TRUE;
 #endif
 #ifdef GUI_QT
-  QString *qs = new QString(QString::fromUtf8(tip_text));
-  widget->setToolTip(*qs);
+  QString qs = QString::fromUtf8(tip_text);
+  widget->setToolTip(qs);
   return TRUE;
 #endif
   return FALSE;
@@ -3113,7 +3343,7 @@
 #ifdef GUI_QT
   if (LIVES_IS_PUSH_BUTTON(widget)) {
     QPushButton *button = dynamic_cast<QPushButton *>(widget);
-    if (button != NULL) 
+    if (button != NULL)
       button->setDefault(true);
   }
   return TRUE;
@@ -3179,23 +3409,46 @@
 }
 
 
+LIVES_INLINE boolean lives_xwindow_set_keep_above(LiVESXWindow *xwin, boolean setting) {
+#ifdef GUI_GTK
+  gdk_window_set_keep_above(xwin, setting);
+  return TRUE;
+#endif
+#ifdef GUI_QT
+  bool vis = xwin->isVisible();
+  const Qt::WindowFlags flags = xwin->flags();
+  Qt::WindowFlags newflags = flags;
+  if (setting) {
+    newflags = flags | Qt::WindowStaysOnTopHint;
+  } else {
+    if (flags & Qt::WindowStaysOnBottomHint) newflags ^= Qt::WindowStaysOnTopHint;
+  }
+  xwin->setFlags(newflags);
+  if (vis) xwin->setVisible(true);
+
+  return TRUE;
+#endif
+  return FALSE;
+}
+
+
+
 LIVES_INLINE boolean lives_widget_set_can_focus(LiVESWidget *widget, boolean state) {
 #ifdef GUI_GTK
 #if GTK_CHECK_VERSION(2,18,0)
   gtk_widget_set_can_focus(widget,state);
 #else
   if (state)
-    GTK_WIDGET_SET_FLAGS (widget, GTK_CAN_FOCUS);
+    GTK_WIDGET_SET_FLAGS(widget, GTK_CAN_FOCUS);
   else
-    GTK_WIDGET_UNSET_FLAGS (widget, GTK_CAN_FOCUS);
+    GTK_WIDGET_UNSET_FLAGS(widget, GTK_CAN_FOCUS);
 #endif
   return TRUE;
 #endif
 #ifdef GUI_QT
   if (state) {
     widget->setFocusPolicy(Qt::StrongFocus);
-  }
-  else widget->setFocusPolicy(Qt::NoFocus);
+  } else widget->setFocusPolicy(Qt::NoFocus);
   return TRUE;
 #endif
   return FALSE;
@@ -3208,16 +3461,16 @@
   gtk_widget_set_can_default(widget,state);
 #else
   if (state)
-    GTK_WIDGET_SET_FLAGS (widget, GTK_CAN_DEFAULT);
+    GTK_WIDGET_SET_FLAGS(widget, GTK_CAN_DEFAULT);
   else
-    GTK_WIDGET_UNSET_FLAGS (widget, GTK_CAN_DEFAULT);
+    GTK_WIDGET_UNSET_FLAGS(widget, GTK_CAN_DEFAULT);
 #endif
   return TRUE;
 #endif
 #ifdef GUI_QT
   if (LIVES_IS_PUSH_BUTTON(widget)) {
     QPushButton *button = dynamic_cast<QPushButton *>(widget);
-    if (button != NULL) 
+    if (button != NULL)
       button->setAutoDefault(state);
   }
   return TRUE;
@@ -3253,13 +3506,13 @@
 }
 
 
-LIVES_INLINE boolean lives_widget_remove_accelerator(LiVESWidget *widget, LiVESAccelGroup *acgroup, 
-						     uint32_t accel_key, LiVESXModifierType accel_mods) {
+LIVES_INLINE boolean lives_widget_remove_accelerator(LiVESWidget *widget, LiVESAccelGroup *acgroup,
+    uint32_t accel_key, LiVESXModifierType accel_mods) {
 #ifdef GUI_GTK
   return gtk_widget_remove_accelerator(widget,acgroup,accel_key,accel_mods);
 #endif
 #ifdef GUI_QT
-  return ((LiVESObject *)widget)->remove_accels(acgroup, accel_key, accel_mods);
+  return (static_cast<LiVESObject *>(widget))->remove_accels(acgroup, accel_key, accel_mods);
 #endif
   return FALSE;
 }
@@ -3286,7 +3539,7 @@
 #if GTK_CHECK_VERSION(2,18,0)
   return gtk_widget_is_sensitive(widget);
 #else
-  return GTK_WIDGET_IS_SENSITIVE (widget);
+  return GTK_WIDGET_IS_SENSITIVE(widget);
 #endif
 #endif
 #ifdef GUI_QT
@@ -3301,7 +3554,7 @@
 #if GTK_CHECK_VERSION(2,18,0)
   return gtk_widget_get_visible(widget);
 #else
-  return GTK_WIDGET_VISIBLE (widget);
+  return GTK_WIDGET_VISIBLE(widget);
 #endif
 #endif
 #ifdef GUI_QT
@@ -3315,13 +3568,13 @@
   // used for giw widgets
 #ifdef GUI_GTK
 #if GTK_CHECK_VERSION(2,18,0)
-return gtk_widget_get_realized(widget);
+  return gtk_widget_get_realized(widget);
 #else
-return GTK_WIDGET_REALIZED (widget);
+  return GTK_WIDGET_REALIZED(widget);
 #endif
 #endif
-return FALSE;
-} 
+  return FALSE;
+}
 
 
 
@@ -3331,32 +3584,140 @@
   return TRUE;
 #endif
 #ifdef GUI_QT
-  QLayout *ql = dynamic_cast<QLayout *>(container);
-  if (ql == NULL) {
-    LIVES_WARN("Attempt to add widget to non-layout class");
-    return FALSE;
+  if (container == NULL || widget == NULL) return TRUE;
+  // types that cannot be cast to qlayout: paned, menushell, notebook, table, textview, toolbar, treeview
+
+  if (LIVES_IS_PANED(container)) {
+    QSplitter *ql = dynamic_cast<QSplitter *>(container);
+    ql->addWidget(widget);
+    container->add_child(widget);
+    container = NULL;
+  } else if (LIVES_IS_SCROLLED_WINDOW(container)) {
+    QScrollArea *ql = dynamic_cast<QScrollArea *>(container);
+    ql->setWidget(widget);
+    container->add_child(widget);
+    container = NULL;
+  } else if (LIVES_IS_MENU(container)) {
+    QMenu *ql = dynamic_cast<QMenu *>(container);
+    ql->addAction(dynamic_cast<QAction *>(widget));
+    container->add_child(widget);
+    container = NULL;
+  } else if (LIVES_IS_MENU_BAR(container)) {
+    QMenuBar *ql = dynamic_cast<QMenuBar *>(container);
+    ql->addAction(dynamic_cast<QAction *>(widget));
+    container->add_child(widget);
+    container = NULL;
+  } else if (LIVES_IS_NOTEBOOK(container)) {
+    LiVESNotebook *ql = static_cast<LiVESNotebook *>(container);
+    ql->addTab(widget,NULL);
+    ql->append_page();
+    container->add_child(widget);
+    container = NULL;
+  } else if (LIVES_IS_TABLE(container)) {
+    QGridLayout *ql = dynamic_cast<QGridLayout *>(container);
+    ql->addWidget(widget, ql->rowCount(), 0);
+    container->add_child(widget);
+    container = NULL;
+  } else if (LIVES_IS_TOOLBAR(container)) {
+    QToolBar *ql = dynamic_cast<QToolBar *>(container);
+    ql->addWidget(widget);
+    container->add_child(widget);
+    container = NULL;
+  } else if (LIVES_IS_FRAME(container)) {
+    LiVESFrame *ql = static_cast<LiVESFrame *>(container);
+    container = ql->get_layout();
+  } else if (LIVES_IS_TOOL_ITEM(container)) {
+    LiVESToolItem *ql = static_cast<LiVESToolItem *>(container);
+    container = ql->get_layout();
+  } else if (LIVES_IS_WINDOW(container)) {
+    LiVESMainWindow *ql = static_cast<LiVESMainWindow *>(container);
+    container = ql->get_layout();
+  } else if (LIVES_IS_DIALOG(container)) {
+    LiVESDialog *ql = static_cast<LiVESDialog *>(container);
+    container = ql->get_layout();
+  } else if (LIVES_IS_BUTTON(container)) {
+    LiVESButton *ql = static_cast<LiVESButton *>(container);
+    container = ql->get_layout();
+  }
+
+  if (container != NULL) {
+    QLayout *ql = dynamic_cast<QLayout *>(container);
+    if (ql == NULL) {
+      LIVES_WARN("Attempt to add widget to non-layout class");
+      return FALSE;
+    }
+    ql->addWidget(widget);
+    container->add_child(widget);
   }
-  ql->addWidget(widget);
-  container->add_child(widget);
+
   return TRUE;
 #endif
   return FALSE;
 }
 
 
+
 LIVES_INLINE boolean lives_container_remove(LiVESContainer *container, LiVESWidget *widget) {
 #ifdef GUI_GTK
   gtk_container_remove(container,widget);
   return TRUE;
 #endif
 #ifdef GUI_QT
-  QLayout *ql = dynamic_cast<QLayout *>(container);
-  if (ql == NULL) {
-    LIVES_WARN("Attempt to add widget to non-layout class");
-    return FALSE;
+  // types that cannot be cast to qlayout: paned, menushell, notebook, table, textview, toolbar, treeview
+  if (LIVES_IS_PANED(container)) {
+    return FALSE; // cannot remove
+  } else if (LIVES_IS_SCROLLED_WINDOW(container)) {
+    QScrollArea *ql = dynamic_cast<QScrollArea *>(container);
+    ql->takeWidget();
+    container->remove_child(widget);
+    container = NULL;
+  } else if (LIVES_IS_MENU(container)) {
+    QMenu *ql = dynamic_cast<QMenu *>(container);
+    ql->removeAction(dynamic_cast<QAction *>(widget));
+    container->remove_child(widget);
+    container = NULL;
+  } else if (LIVES_IS_MENU_BAR(container)) {
+    QMenuBar *ql = dynamic_cast<QMenuBar *>(container);
+    ql->removeAction(dynamic_cast<QAction *>(widget));
+    container->remove_child(widget);
+    container = NULL;
+  } else if (LIVES_IS_NOTEBOOK(container)) {
+    QTabWidget *ql = dynamic_cast<QTabWidget *>(container);
+    int tabno = container->get_child_index(widget);
+    ql->removeTab(tabno);
+    container->remove_child(widget);
+    container = NULL;
+  } else if (LIVES_IS_TOOLBAR(container)) {
+    QWidget *ql = static_cast<QWidget *>(container);
+    ql->removeAction(dynamic_cast<QAction *>(widget));
+    container->remove_child(widget);
+    container = NULL;
+  } else if (LIVES_IS_FRAME(container)) {
+    LiVESFrame *ql = static_cast<LiVESFrame *>(container);
+    container = ql->get_layout();
+  } else if (LIVES_IS_TOOL_ITEM(container)) {
+    LiVESToolItem *ql = static_cast<LiVESToolItem *>(container);
+    container = ql->get_layout();
+  } else if (LIVES_IS_WINDOW(container)) {
+    LiVESMainWindow *ql = static_cast<LiVESMainWindow *>(container);
+    container = ql->get_layout();
+  } else if (LIVES_IS_DIALOG(container)) {
+    LiVESDialog *ql = static_cast<LiVESDialog *>(container);
+    container = ql->get_layout();
+  } else if (LIVES_IS_BUTTON(container)) {
+    LiVESButton *ql = static_cast<LiVESButton *>(container);
+    container = ql->get_layout();
+  }
+
+  if (container != NULL) {
+    QLayout *ql = dynamic_cast<QLayout *>(container);
+    if (ql == NULL) {
+      LIVES_WARN("Attempt to remove widget to non-layout class");
+      return FALSE;
+    }
+    ql->removeWidget(widget);
+    container->remove_child(widget);
   }
-  ql->removeWidget(widget);
-  container->remove_child(widget);
   return TRUE;
 #endif
   return FALSE;
@@ -3407,17 +3768,17 @@
 #endif
 #ifdef GUI_QT
   /*  QLayout *ql = static_cast<QLayout *>(container);
-  if (ql == NULL) {
-    LIVES_WARN("Attempt to add widget to non-layout class");
-    return FALSE;
-  }
-  for (int i = 0; i < ql->count(); ++i) {
-    QWidget *widget = ql->itemAt(i)->widget();
-    if (widget) {
+      if (ql == NULL) {
+      LIVES_WARN("Attempt to add widget to non-layout class");
+      return FALSE;
+      }
+      for (int i = 0; i < ql->count(); ++i) {
+      QWidget *widget = ql->itemAt(i)->widget();
+      if (widget) {
       (*callback)(widget, cb_data);
-    }
-  }
-  return TRUE;*/
+      }
+      }
+      return TRUE;*/
 #endif
   return FALSE;
 }
@@ -3429,7 +3790,8 @@
   children=gtk_container_get_children(cont);
 #endif
 #ifdef GUI_QT
-  return cont->get_children();
+  LiVESList *list = new LiVESList(*cont->get_children());
+  return list;
 #endif
   return children;
 }
@@ -3445,12 +3807,11 @@
   if (child == NULL) {
     for (int i = 0; i < cont->count_children(); ++i) {
       if (cont->get_child(i)->hasFocus()) {
-	cont->get_child(i)->clearFocus();
-	break;
+        cont->get_child(i)->clearFocus();
+        break;
       }
     }
-  }
-  else {
+  } else {
     if (cont->hasFocus()) {
       child->setFocus();
     }
@@ -3509,7 +3870,7 @@
 #ifdef GUI_QT
   pbar->setMinimum(0);
   pbar->setMaximum(0);
-  pbar->setValue (qrand () % 99 + 1);
+  pbar->setValue(qrand() % 99 + 1);
   return TRUE;
 #endif
   return FALSE;
@@ -3649,6 +4010,18 @@
 }
 
 
+LIVES_INLINE LiVESToolItem *lives_tool_item_new(void) {
+  LiVESToolItem *item=NULL;
+#ifdef GUI_GTK
+  item=gtk_tool_item_new();
+#endif
+#ifdef GUI_QT
+  item = new LiVESToolItem;
+#endif
+  return item;
+}
+
+
 LIVES_INLINE boolean lives_tool_button_set_icon_widget(LiVESToolButton *button, LiVESWidget *icon) {
 #ifdef GUI_GTK
   gtk_tool_button_set_icon_widget(button,icon);
@@ -3706,6 +4079,21 @@
 }
 
 
+LIVES_INLINE LiVESWidget *lives_message_dialog_new(LiVESWindow *parent, LiVESDialogFlags flags, LiVESMessageType type,
+    LiVESButtonsType buttons, const char *msg_fmt, ...) {
+  LiVESWidget *mdial=NULL;
+#ifdef GUI_GTK
+  mdial=gtk_message_dialog_new(parent,flags,type,buttons,msg_fmt,NULL);
+#endif
+#ifdef GUI_QT
+  LiVESMessageDialog *xmdial = new LiVESMessageDialog;
+  xmdial->setIcon(type);
+  mdial = static_cast<LiVESWidget *>(xmdial);
+#endif
+  return mdial;
+}
+
+
 LIVES_INLINE double lives_ruler_get_value(LiVESRuler *ruler) {
 #ifdef GUI_GTK
 #if GTK_CHECK_VERSION(3,0,0)
@@ -3772,7 +4160,7 @@
   renderer=gtk_cell_renderer_text_new();
 #endif
 #ifdef GUI_QT
-  renderer = "text";
+  renderer = new LiVESCellRenderer(LIVES_CELL_RENDERER_TEXT);
 #endif
   return renderer;
 }
@@ -3784,7 +4172,7 @@
   renderer=gtk_cell_renderer_spin_new();
 #endif
 #ifdef GUI_QT
-  renderer = "spin";
+  renderer = new LiVESCellRenderer(LIVES_CELL_RENDERER_SPIN);
 #endif
   return renderer;
 }
@@ -3796,7 +4184,7 @@
   renderer=gtk_cell_renderer_toggle_new();
 #endif
 #ifdef GUI_QT
-  renderer = "toggle";
+  renderer = new LiVESCellRenderer(LIVES_CELL_RENDERER_TOGGLE);
 #endif
   return renderer;
 }
@@ -3809,7 +4197,7 @@
   renderer=gtk_cell_renderer_pixbuf_new();
 #endif
 #ifdef GUI_QT
-  renderer = "pixbuf";
+  renderer = new LiVESCellRenderer(LIVES_CELL_RENDERER_PIXBUF);
 #endif
   return renderer;
 }
@@ -3840,8 +4228,7 @@
   int naction = toolbar->num_actions();
   if (pos >= naction) {
     act = toolbar->addWidget(static_cast<QWidget *>(item));
-  }
-  else {
+  } else {
     QAction *bef = toolbar->get_action(pos);
     act = toolbar->insertWidget(bef, static_cast<QWidget *>(item));
   }
@@ -4012,7 +4399,7 @@
 #ifdef GUI_QT
   return widget->get_state();
 #else
-  return 0;
+  return (LiVESWidgetState)0;
 #endif
 
 
@@ -4028,6 +4415,10 @@
 #ifdef GUI_QT
   return bin->get_child(0);
 #endif
+#ifdef GUI_QT
+  if (LIVES_IS_SCROLLED_WINDOW(bin)) return bin;
+  return bin->get_child(0);
+#endif
   return child;
 }
 
@@ -4163,7 +4554,7 @@
   return TRUE;
 #endif
 #ifdef GUI_QT
-  if (adj->get_upper() > adj->get_value() + adj->get_page_size()) 
+  if (adj->get_upper() > adj->get_value() + adj->get_page_size())
     adj->set_value(adj->get_upper() - adj->get_page_size());
   if (adj->get_lower() < adj->get_value()) adj->set_value(adj->get_lower());
 
@@ -4229,7 +4620,7 @@
 }
 
 
-LIVES_INLINE boolean lives_range_set_inverted(LiVESRange *range, boolean invert){
+LIVES_INLINE boolean lives_range_set_inverted(LiVESRange *range, boolean invert) {
 #ifdef GUI_GTK
   gtk_range_set_inverted(range,invert);
   return TRUE;
@@ -4237,8 +4628,7 @@
 #ifdef GUI_QT
   if (LIVES_IS_SCALE(range)) {
     (static_cast<QAbstractSlider *>(static_cast<LiVESScale *>(range)))->setInvertedAppearance(invert);
-  }
-  else {
+  } else {
     (static_cast<QAbstractSlider *>(static_cast<LiVESScrollbar *>(range)))->setInvertedAppearance(invert);
   }
   return TRUE;
@@ -4253,7 +4643,7 @@
   value=gtk_range_get_value(range);
 #endif
 #ifdef GUI_QT
-  value = range->get_value();
+  value = range->get_adj()->get_value();
 #endif
   return value;
 }
@@ -4268,7 +4658,29 @@
   res=TRUE;
 #endif
 #ifdef GUI_QT
-  // TODO
+  // get 1 or more cells in row refd by titer
+  // we have col number, locn to store value in
+  char *attribute=va_arg(argList, char *);
+  QVariant qv;
+
+  while (attribute != NULL) {
+    int colnum = va_arg(argList, int);
+    int coltype = tmod->get_coltype(colnum);
+
+    // types may be STRING, INT, (BOOLEAN, UINT, PIXBUF)
+    if (coltype == LIVES_COL_TYPE_INT) {
+      int *iattr = va_arg(argList, int *);
+      qv = titer->data(colnum, Qt::DisplayRole);
+      *iattr = qv.value<int>();
+    }
+    if (coltype == LIVES_COL_TYPE_STRING) {
+      char **cattr = va_arg(argList, char **);
+      qv = titer->data(colnum, Qt::DisplayRole);
+      *cattr = strdup(qv.value<QString>().toUtf8().constData());
+    }
+    attribute=va_arg(argList, char *);
+  }
+
 #endif
   va_end(argList);
   return res;
@@ -4280,7 +4692,16 @@
   return gtk_tree_model_get_iter(tmod,titer,tpath);
 #endif
 #ifdef GUI_QT
-  // TODO
+  int *indices = tpath->get_indices();
+  int cnt = tpath->get_depth();
+
+  QTreeWidgetItem *qtwi = tmod->get_qtree_widget()->invisibleRootItem();
+
+  for (int i=0; i < cnt; i++) {
+    qtwi = qtwi->child(indices[i]);
+  }
+
+  *titer = *qtwi;
 #endif
   return FALSE;
 }
@@ -4291,7 +4712,8 @@
   return gtk_tree_model_get_iter_first(tmod,titer);
 #endif
 #ifdef GUI_QT
-  QTreeWidgetItem *qtwi = tmod->get_tree_widget()->invisibleRootItem();
+  QTreeWidgetItem *qtwi = tmod->get_qtree_widget()->invisibleRootItem();
+  qtwi = qtwi->child(0);
   *titer = *qtwi;
   return TRUE;
 #endif
@@ -4305,19 +4727,35 @@
   tpath=gtk_tree_model_get_path(tmod,titer);
 #endif
 #ifdef GUI_QT
-  // TODO
+  QList<int> qli;
+  QTreeWidgetItem *qtw = titer;
+  int idx;
+  QTreeWidget *twidget = tmod->get_qtree_widget();
+
+  while (1) {
+    if (qtw->parent() == 0) {
+      idx = twidget->indexOfTopLevelItem(qtw);
+      qli.append(idx);
+      break;
+    }
+    idx = qtw->parent()->indexOfChild(qtw);
+    qli.append(idx);
+  }
+
+  tpath = new LiVESTreePath(qli);
+
 #endif
   return tpath;
 }
 
 
- LIVES_INLINE boolean lives_tree_model_iter_children(LiVESTreeModel *tmod, LiVESTreeIter *titer, LiVESTreeIter *parent) {
+LIVES_INLINE boolean lives_tree_model_iter_children(LiVESTreeModel *tmod, LiVESTreeIter *titer, LiVESTreeIter *parent) {
 #ifdef GUI_GTK
   return gtk_tree_model_iter_children(tmod,titer,parent);
 #endif
 #ifdef GUI_QT
-    if (parent == NULL || parent == tmod->get_tree_widget()->invisibleRootItem()) {
-    QTreeWidget *tw = tmod->get_tree_widget();
+  if (parent == NULL || parent == tmod->get_qtree_widget()->invisibleRootItem()) {
+    QTreeWidget *tw = tmod->get_qtree_widget();
     if (tw->topLevelItemCount() == 0) return FALSE;
     *titer = *tw->topLevelItem(0);
     return TRUE;
@@ -4335,9 +4773,9 @@
   return gtk_tree_model_iter_n_children(tmod,titer);
 #endif
 #ifdef GUI_QT
-  if (titer == NULL || titer == tmod->get_tree_widget()->invisibleRootItem()) {
+  if (titer == NULL || titer == tmod->get_qtree_widget()->invisibleRootItem()) {
     // return num toplevel
-    return tmod->get_tree_widget()->topLevelItemCount();
+    return tmod->get_qtree_widget()->topLevelItemCount();
   }
   return titer->childCount();
 #endif
@@ -4351,8 +4789,8 @@
 #endif
 #ifdef GUI_QT
   QTreeWidgetItem *parent = titer->parent();
-  if (parent == NULL || parent == tmod->get_tree_widget()->invisibleRootItem()) {
-    QTreeWidget *tw = tmod->get_tree_widget();
+  if (parent == NULL || parent == tmod->get_qtree_widget()->invisibleRootItem()) {
+    QTreeWidget *tw = tmod->get_qtree_widget();
     int idx = tw->indexOfTopLevelItem(titer) + 1;
     if (idx >= tw->topLevelItemCount()) {
       return FALSE;
@@ -4390,7 +4828,7 @@
   tpath=gtk_tree_path_new_from_string(path);
 #endif
 #ifdef GUI_QT
-  tpath = strdup(path);
+  tpath = new LiVESTreePath(path);
 #endif
   return tpath;
 }
@@ -4403,7 +4841,7 @@
   depth=gtk_tree_path_get_depth(tpath);
 #endif
 #ifdef GUI_QT
-  // TODO
+  return tpath->get_depth();
 #endif
   return depth;
 }
@@ -4416,7 +4854,7 @@
   indices=gtk_tree_path_get_indices(tpath);
 #endif
 #ifdef GUI_QT
-  // TODO
+  indices = tpath->get_indices();
 #endif
   return indices;
 }
@@ -4429,19 +4867,27 @@
   va_start(argList, ncols);
 #ifdef GUI_GTK
   if (ncols>0) {
-    GType *types = (GType *)g_malloc(ncols*sizeof(GType));
+    GType types[ncols];
     register int i;
-    for (i=0;i<ncols;i++) {
+    for (i=0; i<ncols; i++) {
       types[i]=va_arg(argList,int);
     }
     tstore=gtk_tree_store_newv(ncols,types);
-    g_free(types);
   }
 #endif
+
 #ifdef GUI_QT
-  QModelIndex qmi = QModelIndex();
-  tstore = new LiVESTreeStore;
-  tstore->insertColumns(0, ncols, qmi);
+  if (ncols > 0) {
+    QModelIndex qmi = QModelIndex();
+    int types[ncols];
+
+    for (int i=0; i < ncols; i++) {
+      types[i]=va_arg(argList, int);
+    }
+
+    tstore = new LiVESTreeStore(ncols, types);
+    tstore->insertColumns(0, ncols, qmi);
+  }
 #endif
   va_end(argList);
   return tstore;
@@ -4455,19 +4901,20 @@
   return TRUE;
 #endif
 #ifdef GUI_QT
-  QVariant qv = ((QAbstractItemModel *)tstore)->property("LiVESObject");
+  QVariant qv = (static_cast<QAbstractItemModel *>(tstore))->property("LiVESObject");
   if (qv.isValid()) {
+
     LiVESTreeModel *ltm = static_cast<LiVESTreeModel *>(qv.value<LiVESObject *>());
-    QTreeWidget *qtw = ltm->get_tree_widget();
+    QTreeWidget *qtw = ltm->get_qtree_widget();
+
     if (parent != NULL) {
       QTreeWidgetItem *qtwi = new QTreeWidgetItem(parent);
       *titer = *qtwi;
       return TRUE;
-    }
-    else {
+    } else {
       QTreeWidgetItem *qtwi = new QTreeWidgetItem(qtw);
       *titer = *qtwi;
-     return TRUE;
+      return TRUE;
     }
   }
 #endif
@@ -4485,7 +4932,29 @@
   res=TRUE;
 #endif
 #ifdef GUI_QT
-  // TODO
+  // set a row in the treestore
+  QVariant qv;
+
+  while (1) {
+    int colnum = va_arg(argList, int);
+    if (colnum == -1) break;
+
+    int coltype = tstore->get_coltype(colnum);
+
+    // types may be STRING, INT, (BOOLEAN, UINT, PIXBUF)
+    if (coltype == LIVES_COL_TYPE_INT) {
+      int iattr = va_arg(argList, int);
+      qv = QVariant::fromValue(iattr);
+      titer->setData(colnum, Qt::DisplayRole, qv);
+    }
+    if (coltype == LIVES_COL_TYPE_STRING) {
+      char *cattr = va_arg(argList, char *);
+      QString qs = QString::fromUtf8(cattr);
+      qv = QVariant::fromValue(qs);
+      titer->setData(colnum, Qt::DisplayRole, qv);
+    }
+  }
+
 #endif
   va_end(argList);
   return res;
@@ -4499,11 +4968,9 @@
   tview=gtk_tree_view_new_with_model(tmod);
 #endif
 #ifdef GUI_QT
-  tview = new LiVESTreeView;
-  tmod->set_tree_widget(static_cast<LiVESTreeView *>(tview));
-  QStandardItemModel *qmodel = tmod->get_model();
-  ((QAbstractItemView *)tview)->setModel(static_cast<QAbstractItemModel *>(qmodel));
-  (static_cast<LiVESTreeView *>(tview))->set_model(qmodel);
+  LiVESTreeView *trview = new LiVESTreeView;
+  trview->set_model(tmod);
+  tview = static_cast<LiVESWidget *>(trview);
 #endif
   return tview;
 }
@@ -4531,8 +4998,7 @@
   return TRUE;
 #endif
 #ifdef GUI_QT
-  ((QAbstractItemView *)tview)->setModel((QAbstractItemModel *)(tmod->get_model()));
-  tmod->set_tree_widget(tview);
+  tview->set_model(tmod);
   return TRUE;
 #endif
   return FALSE;
@@ -4546,11 +5012,7 @@
   tmod=gtk_tree_view_get_model(tview);
 #endif
 #ifdef GUI_QT
-  QAbstractItemModel *qtmod = ((QTreeWidget *)tview)->model();
-  QVariant qv = qtmod->property("LiVESObject");
-  if (qv.isValid()) {
-    tmod = static_cast<LiVESTreeModel *>(qv.value<LiVESObject *>());
-  }
+  tmod = tview->get_model();
 #endif
   return tmod;
 }
@@ -4562,6 +5024,9 @@
 #ifdef GUI_GTK
   tsel=gtk_tree_view_get_selection(tview);
 #endif
+#ifdef GUI_QT
+  tsel = tview;
+#endif
   return tsel;
 }
 
@@ -4576,7 +5041,6 @@
   tview->append_column(tvcol);
   return TRUE;
 #endif
-
   return FALSE;
 }
 
@@ -4587,6 +5051,10 @@
   gtk_tree_view_set_headers_visible(tview,vis);
   return TRUE;
 #endif
+#ifdef GUI_QT
+  tview->setHeaderHidden(!vis);
+  return TRUE;
+#endif
   return FALSE;
 }
 
@@ -4602,6 +5070,9 @@
   adj=gtk_tree_view_get_hadjustment(tview);
 #endif
 #endif
+#ifdef GUI_QT
+  adj = tview->get_hadj();
+#endif
   return adj;
 }
 
@@ -4624,20 +5095,20 @@
   attribute=va_arg(args, char *);
 
   while (attribute != NULL) {
-    column = va_arg (args, int);
-    gtk_tree_view_column_add_attribute (tvcol, crend, attribute, column);
-    attribute = va_arg (args, char *);
+    column = va_arg(args, int);
+    gtk_tree_view_column_add_attribute(tvcol, crend, attribute, column);
+    attribute = va_arg(args, char *);
   }
 
 #endif
 #ifdef GUI_QT
-  tvcol = new LiVESTreeViewColumn;
+  tvcol = crend;
   tvcol->set_title(title);
-  tvcol->pack_start(crend,expand);
+  tvcol->set_expand(expand);
   while (attribute != NULL) {
-    column = va_arg (args, int);
-    tvcol->add_attribute (attribute, column);
-    attribute = va_arg (args, char *);
+    column = va_arg(args, int);
+    tvcol->add_attribute(attribute, column);
+    attribute = va_arg(args, char *);
   }
 #endif
   va_end(args);
@@ -4652,6 +5123,10 @@
   gtk_tree_view_column_set_sizing(tvcol,type);
   return TRUE;
 #endif
+#ifdef GUI_QT
+  tvcol->set_sizing(type);
+  return TRUE;
+#endif
   return FALSE;
 }
 
@@ -4662,6 +5137,10 @@
   gtk_tree_view_column_set_fixed_width(tvcol,fwidth);
   return TRUE;
 #endif
+#ifdef GUI_QT
+  tvcol->set_fixed_width(fwidth);
+  return TRUE;
+#endif
   return FALSE;
 }
 
@@ -4671,6 +5150,15 @@
 #ifdef GUI_GTK
   return gtk_tree_selection_get_selected(tsel,tmod,titer);
 #endif
+#ifdef GUI_QT
+  int mode = tsel->selectionMode();
+  if (mode == LIVES_SELECTION_MULTIPLE) return TRUE;
+  // tsel should have single seln.
+  QList<QTreeWidgetItem *> qtwi = tsel->selectedItems();
+  *titer = *(qtwi.at(0));
+  *tmod = tsel->get_model();
+  return TRUE;
+#endif
   return FALSE;
 }
 
@@ -4681,6 +5169,10 @@
   gtk_tree_selection_set_mode(tsel,tselmod);
   return TRUE;
 #endif
+#ifdef GUI_QT
+  tsel->setSelectionMode(tselmod);
+  return TRUE;
+#endif
   return FALSE;
 }
 
@@ -4691,6 +5183,97 @@
   gtk_tree_selection_select_iter(tsel,titer);
   return TRUE;
 #endif
+#ifdef GUI_QT
+  titer->setSelected(true);
+  return TRUE;
+#endif
+  return FALSE;
+}
+
+
+LIVES_INLINE LiVESListStore *lives_list_store_new(int ncols, ...) {
+  LiVESListStore *lstore=NULL;
+  va_list argList;
+  va_start(argList, ncols);
+#ifdef GUI_GTK
+  if (ncols>0) {
+    GType types[ncols];
+    register int i;
+    for (i=0; i<ncols; i++) {
+      types[i]=va_arg(argList,int);
+    }
+    lstore=gtk_list_store_newv(ncols,types);
+  }
+#endif
+
+#ifdef GUI_QT
+  if (ncols > 0) {
+    QModelIndex qmi = QModelIndex();
+    int types[ncols];
+
+    for (int i=0; i < ncols; i++) {
+      types[i]=va_arg(argList, int);
+    }
+
+    lstore = new LiVESListStore(ncols, types);
+    lstore->insertColumns(0, ncols, qmi);
+  }
+#endif
+  va_end(argList);
+  return lstore;
+}
+
+
+
+LIVES_INLINE boolean lives_list_store_set(LiVESListStore *lstore, LiVESTreeIter *titer, ...) {
+  boolean res=FALSE;
+  va_list argList;
+  va_start(argList, titer);
+#ifdef GUI_GTK
+  gtk_list_store_set_valist(lstore,titer,argList);
+  res=TRUE;
+#endif
+#ifdef GUI_QT
+  // set a row in the liststore
+  QVariant qv;
+
+  while (1) {
+    int colnum = va_arg(argList, int);
+    if (colnum == -1) break;
+
+    int coltype = lstore->get_coltype(colnum);
+
+    // types may be STRING, INT, (BOOLEAN, UINT, PIXBUF)
+    if (coltype == LIVES_COL_TYPE_INT) {
+      int iattr = va_arg(argList, int);
+      qv = QVariant::fromValue(iattr);
+      titer->setData(colnum, Qt::DisplayRole, qv);
+    }
+    if (coltype == LIVES_COL_TYPE_STRING) {
+      char *cattr = va_arg(argList, char *);
+      QString qs = QString::fromUtf8(cattr);
+      qv = QVariant::fromValue(qs);
+      titer->setData(colnum, Qt::DisplayRole, qv);
+    }
+  }
+
+#endif
+  va_end(argList);
+  return res;
+}
+
+
+LIVES_INLINE boolean lives_list_store_insert(LiVESListStore *lstore, LiVESTreeIter *titer, int position) {
+#ifdef GUI_GTK
+  gtk_list_store_insert(lstore,titer,position);
+  return TRUE;
+#endif
+#ifdef GUI_QT
+  lstore->insertRow(position);
+  QTreeWidgetItem *qtwi = qtwi->child(position);
+  *titer = *qtwi;
+  return TRUE;
+#endif
   return FALSE;
 }
 
@@ -4700,6 +5283,9 @@
 #ifdef GUI_GTK
   return gtk_label_get_text(label);
 #endif
+#ifdef GUI_QT
+  return label->text().toUtf8().constData();
+#endif
   return NULL;
 }
 
@@ -4709,6 +5295,12 @@
   gtk_label_set_text(label,text);
   return TRUE;
 #endif
+#ifdef GUI_QT
+  label->setTextFormat(Qt::PlainText);
+  label->setText(QString::fromUtf8(text));
+  label->set_text(QString::fromUtf8(text));
+  return TRUE;
+#endif
   return FALSE;
 }
 
@@ -4718,6 +5310,12 @@
   gtk_label_set_text_with_mnemonic(label,text);
   return TRUE;
 #endif
+#ifdef GUI_QT
+  label->setTextFormat(Qt::PlainText);
+  label->setText(qmake_mnemonic(QString::fromUtf8(text)));
+  label->set_text(qmake_mnemonic(QString::fromUtf8(text)));
+  return TRUE;
+#endif
   return FALSE;
 }
 
@@ -4727,6 +5325,12 @@
   gtk_label_set_markup(label,markup);
   return TRUE;
 #endif
+#ifdef GUI_QT
+  label->setTextFormat(Qt::RichText);
+  label->setText(QString::fromUtf8(markup));
+  label->set_text(QString::fromUtf8(markup));
+  return TRUE;
+#endif
   return FALSE;
 }
 
@@ -4736,6 +5340,12 @@
   gtk_label_set_markup_with_mnemonic(label,markup);
   return TRUE;
 #endif
+#ifdef GUI_QT
+  label->setTextFormat(Qt::RichText);
+  label->setText(qmake_mnemonic(QString::fromUtf8(markup)));
+  label->set_text(qmake_mnemonic(QString::fromUtf8(markup)));
+  return TRUE;
+#endif
   return FALSE;
 }
 
@@ -4745,6 +5355,11 @@
   gtk_label_set_mnemonic_widget(label,widget);
   return TRUE;
 #endif
+#ifdef GUI_QT
+  label->set_mnemonic_widget(widget);
+  (static_cast<QLabel *>(label))->setBuddy(static_cast<QWidget *>(widget));
+  return TRUE;
+#endif
   return FALSE;
 }
 
@@ -4755,6 +5370,9 @@
 #ifdef GUI_GTK
   widget=gtk_label_get_mnemonic_widget(label);
 #endif
+#ifdef GUI_QT
+  widget = label->get_mnemonic_widget();
+#endif
   return widget;
 }
 
@@ -4765,6 +5383,19 @@
   gtk_label_set_selectable(label,setting);
   return TRUE;
 #endif
+#ifdef GUI_QT
+  QLabel *qlabel = static_cast<QLabel *>(label);
+  Qt::TextInteractionFlags flags = qlabel->textInteractionFlags();
+  if (setting) {
+    flags |= Qt::TextSelectableByMouse;
+    flags |= Qt::TextSelectableByKeyboard;
+  } else {
+    if (flags & Qt::TextSelectableByMouse) flags ^= Qt::TextSelectableByMouse;
+    if (flags & Qt::TextSelectableByKeyboard) flags ^= Qt::TextSelectableByKeyboard;
+  }
+  qlabel->setTextInteractionFlags(flags);
+  return TRUE;
+#endif
   return FALSE;
 }
 
@@ -4775,6 +5406,22 @@
   gtk_editable_set_editable(editable,is_editable);
   return TRUE;
 #endif
+#ifdef GUI_QT
+  if (LIVES_IS_LABEL(editable)) {
+    QLabel *qlabel = dynamic_cast<QLabel *>(editable);
+    Qt::TextInteractionFlags flags = qlabel->textInteractionFlags();
+    if (is_editable) {
+      flags |= Qt::TextEditable;
+    } else {
+      if (flags & Qt::TextEditable) flags ^= Qt::TextEditable;
+    }
+    qlabel->setTextInteractionFlags(flags);
+  } else {
+    QAbstractSpinBox *qsb = dynamic_cast<QAbstractSpinBox *>(editable);
+    qsb->setReadOnly(!is_editable);
+  }
+  return TRUE;
+#endif
   return FALSE;
 }
 
@@ -4784,6 +5431,13 @@
   gtk_editable_select_region(editable,start_pos,end_pos);
   return TRUE;
 #endif
+#ifdef GUI_QT
+  if (LIVES_IS_LABEL(editable)) {
+    QLabel *qlabel = dynamic_cast<QLabel *>(editable);
+    qlabel->setSelection(start_pos, end_pos);
+  }
+  return TRUE;
+#endif
   return FALSE;
 }
 
@@ -4794,6 +5448,9 @@
 #ifdef GUI_GTK
   entry=gtk_entry_new();
 #endif
+#ifdef GUI_QT
+  entry = new LiVESEntry();
+#endif
   return entry;
 }
 
@@ -4805,6 +5462,10 @@
   gtk_entry_set_max_length(entry,len);
   return TRUE;
 #endif
+#ifdef GUI_QT
+  entry->setMaxLength(len);
+  return TRUE;
+#endif
   return FALSE;
 }
 
@@ -4815,6 +5476,10 @@
   gtk_entry_set_activates_default(entry,act);
   return TRUE;
 #endif
+#ifdef GUI_QT
+  // do nothing, enter is picked up by dialog
+  return TRUE;
+#endif
   return FALSE;
 }
 
@@ -4825,6 +5490,14 @@
   gtk_entry_set_visibility(entry,vis);
   return TRUE;
 #endif
+#ifdef GUI_QT
+  if (!vis) {
+    entry->setEchoMode(QLineEdit::Password);
+  } else {
+    entry->setEchoMode(QLineEdit::Normal);
+  }
+  return TRUE;
+#endif
   return FALSE;
 }
 
@@ -4835,6 +5508,10 @@
   gtk_entry_set_has_frame(entry,has);
   return TRUE;
 #endif
+#ifdef GUI_QT
+  entry->setFrame(has);
+  return TRUE;
+#endif
   return FALSE;
 }
 
@@ -4844,6 +5521,9 @@
 #ifdef GUI_GTK
   return gtk_entry_get_text(entry);
 #endif
+#ifdef GUI_QT
+  return entry->text().toUtf8().constData();
+#endif
   return NULL;
 }
 
@@ -4853,6 +5533,10 @@
   gtk_entry_set_text(entry,text);
   return TRUE;
 #endif
+#ifdef GUI_QT
+  entry->setText(QString::fromUtf8(text));
+  return TRUE;
+#endif
   return FALSE;
 }
 
@@ -4863,6 +5547,12 @@
   gtk_entry_set_width_chars(entry,nchars);
   return TRUE;
 #endif
+#ifdef GUI_QT
+  QFontMetrics metrics(QApplication::font());
+  (static_cast<QLineEdit *>(entry))->setFixedSize(metrics.width('A')*nchars,
+      (static_cast<QWidget *>(static_cast<QLineEdit *>(entry)))->height());
+  return TRUE;
+#endif
   return FALSE;
 }
 
@@ -4873,6 +5563,9 @@
 #ifdef GUI_GTK
   swindow=gtk_scrolled_window_new(hadj,vadj);
 #endif
+#ifdef GUI_QT
+  swindow = new LiVESScrolledWindow(hadj, vadj);
+#endif
   return swindow;
 }
 
@@ -4882,6 +5575,9 @@
 #ifdef GUI_GTK
   adj=gtk_scrolled_window_get_hadjustment(swindow);
 #endif
+#ifdef GUI_QT
+  adj = swindow->get_hadj();
+#endif
   return adj;
 }
 
@@ -4891,14 +5587,22 @@
 #ifdef GUI_GTK
   adj=gtk_scrolled_window_get_vadjustment(swindow);
 #endif
+#ifdef GUI_QT
+  adj = swindow->get_vadj();
+#endif
   return adj;
 }
 
 
-LIVES_INLINE boolean lives_scrolled_window_set_policy(LiVESScrolledWindow *scrolledwindow, LiVESPolicyType hpolicy, 
-						      LiVESPolicyType vpolicy) {
+LIVES_INLINE boolean lives_scrolled_window_set_policy(LiVESScrolledWindow *scrolledwindow, LiVESPolicyType hpolicy,
+    LiVESPolicyType vpolicy) {
 #ifdef GUI_GTK
-  gtk_scrolled_window_set_policy (scrolledwindow, hpolicy, vpolicy);
+  gtk_scrolled_window_set_policy(scrolledwindow, hpolicy, vpolicy);
+  return TRUE;
+#endif
+#ifdef GUI_QT
+  scrolledwindow->setHorizontalScrollBarPolicy(hpolicy);
+  scrolledwindow->setVerticalScrollBarPolicy(hpolicy);
   return TRUE;
 #endif
   return FALSE;
@@ -4915,6 +5619,11 @@
 #endif
   return TRUE;
 #endif
+#ifdef GUI_QT
+  scrolledwindow->setWidget(static_cast<QWidget *>(child));
+  scrolledwindow->add_child(child);
+  return TRUE;
+#endif
   return FALSE;
 }
 
@@ -4933,13 +5642,16 @@
 }
 
 
- LIVES_INLINE boolean lives_xwindow_set_cursor(LiVESXWindow *xwin, LiVESXCursor *cursor) {
+LIVES_INLINE boolean lives_xwindow_set_cursor(LiVESXWindow *xwin, LiVESXCursor *cursor) {
 #ifdef GUI_GTK
-   gdk_window_set_cursor(xwin,cursor);
+  gdk_window_set_cursor(xwin,cursor);
   return TRUE;
 #endif
 #ifdef GUI_QT
-  xwin->setCursor(*cursor);
+  if (cursor != NULL)
+    xwin->setCursor(*cursor);
+  else
+    xwin->unsetCursor();
   return TRUE;
 #endif
   return FALSE;
@@ -4955,6 +5667,9 @@
   return TRUE;
 #endif
 #endif
+#ifdef GUI_QT
+  return TRUE;
+#endif
   return FALSE;
 }
 
@@ -4968,6 +5683,10 @@
   return TRUE;
 #endif
 #endif
+#ifdef GUI_QT
+  widget->setSizePolicy(QSizePolicy::MinimumExpanding,QSizePolicy::Preferred);
+  return TRUE;
+#endif
   return FALSE;
 }
 
@@ -4980,6 +5699,10 @@
   return TRUE;
 #endif
 #endif
+#ifdef GUI_QT
+  widget->setSizePolicy(QSizePolicy::Preferred,QSizePolicy::MinimumExpanding);
+  return TRUE;
+#endif
   return FALSE;
 }
 
@@ -4989,6 +5712,9 @@
 #ifdef GUI_GTK
   menu=gtk_menu_new();
 #endif
+#ifdef GUI_QT
+  menu = new LiVESMenu;
+#endif
   return menu;
 }
 
@@ -4998,6 +5724,9 @@
 #ifdef GUI_GTK
   menubar=gtk_menu_bar_new();
 #endif
+#ifdef GUI_QT
+  menubar = new LiVESMenuBar;
+#endif
   return menubar;
 }
 
@@ -5010,6 +5739,12 @@
     lives_widget_apply_theme2(menuitem, LIVES_WIDGET_STATE_INSENSITIVE);
   }
 #endif
+#ifdef GUI_QT
+  menuitem = new LiVESMenuItem(mainw->LiVES);
+  if (widget_opts.apply_theme) {
+    lives_widget_apply_theme2(menuitem, LIVES_WIDGET_STATE_INSENSITIVE);
+  }
+#endif
   return menuitem;
 }
 
@@ -5023,6 +5758,12 @@
     lives_widget_apply_theme2(menuitem, LIVES_WIDGET_STATE_INSENSITIVE);
   }
 #endif
+#ifdef GUI_QT
+  menuitem = new LiVESMenuItem(qmake_mnemonic(QString::fromUtf8(label)),mainw->LiVES);
+  if (widget_opts.apply_theme) {
+    lives_widget_apply_theme2(menuitem, LIVES_WIDGET_STATE_INSENSITIVE);
+  }
+#endif
   return menuitem;
 }
 
@@ -5036,6 +5777,12 @@
     lives_widget_apply_theme2(menuitem, LIVES_WIDGET_STATE_INSENSITIVE);
   }
 #endif
+#ifdef GUI_QT
+  menuitem = new LiVESMenuItem(QString::fromUtf8(label),mainw->LiVES);
+  if (widget_opts.apply_theme) {
+    lives_widget_apply_theme2(menuitem, LIVES_WIDGET_STATE_INSENSITIVE);
+  }
+#endif
   return menuitem;
 }
 
@@ -5052,6 +5799,12 @@
     lives_widget_apply_theme2(menuitem, LIVES_WIDGET_STATE_INSENSITIVE);
   }
 #endif
+#ifdef GUI_QT
+  menuitem = new LiVESMenuItem(QString::fromUtf8(label),mainw->LiVES);
+  if (widget_opts.apply_theme) {
+    lives_widget_apply_theme2(menuitem, LIVES_WIDGET_STATE_INSENSITIVE);
+  }
+#endif
   return menuitem;
 }
 
@@ -5068,6 +5821,12 @@
     lives_widget_apply_theme2(menuitem, LIVES_WIDGET_STATE_INSENSITIVE);
   }
 #endif
+#ifdef GUI_QT
+  menuitem = new LiVESMenuItem(qmake_mnemonic(QString::fromUtf8(label)),mainw->LiVES);
+  if (widget_opts.apply_theme) {
+    lives_widget_apply_theme2(menuitem, LIVES_WIDGET_STATE_INSENSITIVE);
+  }
+#endif
   return menuitem;
 }
 
@@ -5080,6 +5839,24 @@
     lives_widget_apply_theme2(menuitem, LIVES_WIDGET_STATE_INSENSITIVE);
   }
 #endif
+#ifdef GUI_QT
+  QActionGroup *qag;
+  LiVESRadioMenuItem *xmenuitem = new LiVESRadioMenuItem(QString::fromUtf8(label),mainw->LiVES);
+  if (group == NULL) {
+    qag = new QActionGroup(NULL);
+    group = lives_slist_append(group, (void *)qag);
+    qag->setExclusive(true);
+  } else {
+    qag = const_cast<QActionGroup *>(static_cast<const QActionGroup *>(lives_slist_nth_data(group, 0)));
+  }
+
+  xmenuitem->set_group(group);
+  qag->addAction(static_cast<QAction *>(xmenuitem));
+  if (widget_opts.apply_theme) {
+    lives_widget_apply_theme2(menuitem, LIVES_WIDGET_STATE_INSENSITIVE);
+  }
+  menuitem = static_cast<LiVESWidget *>(xmenuitem);
+#endif
   return menuitem;
 }
 
@@ -5105,6 +5882,12 @@
     lives_widget_apply_theme2(menuitem, LIVES_WIDGET_STATE_INSENSITIVE);
   }
 #endif
+#ifdef GUI_QT
+  menuitem = new LiVESCheckMenuItem(QString::fromUtf8(label),mainw->LiVES);
+  if (widget_opts.apply_theme) {
+    lives_widget_apply_theme2(menuitem, LIVES_WIDGET_STATE_INSENSITIVE);
+  }
+#endif
   return menuitem;
 }
 
@@ -5118,6 +5901,12 @@
     lives_widget_apply_theme2(menuitem, LIVES_WIDGET_STATE_INSENSITIVE);
   }
 #endif
+#ifdef GUI_QT
+  menuitem = new LiVESCheckMenuItem(qmake_mnemonic(QString::fromUtf8(label)),mainw->LiVES);
+  if (widget_opts.apply_theme) {
+    lives_widget_apply_theme2(menuitem, LIVES_WIDGET_STATE_INSENSITIVE);
+  }
+#endif
   return menuitem;
 }
 
@@ -5126,9 +5915,9 @@
   LiVESWidget *menuitem=NULL;
 #ifdef GUI_GTK
 #if GTK_CHECK_VERSION(3,10,0)
-  char *xstock_id=g_strdup(stock_id); // need to back this up as we will use translation functions
+  char *xstock_id=lives_strdup(stock_id); // need to back this up as we will use translation functions
   menuitem=gtk_menu_item_new_with_mnemonic(xstock_id);
-  
+
   if (!strcmp(xstock_id,LIVES_STOCK_LABEL_SAVE)) {
     gtk_menu_item_set_accel_path(LIVES_MENU_ITEM(menuitem),"<LiVES>/save");
   }
@@ -5136,7 +5925,7 @@
   if (!strcmp(xstock_id,LIVES_STOCK_LABEL_QUIT)) {
     gtk_menu_item_set_accel_path(LIVES_MENU_ITEM(menuitem),"<LiVES>/quit");
   }
-  g_free(xstock_id);
+  lives_free(xstock_id);
 #else
   menuitem=gtk_image_menu_item_new_from_stock(stock_id,accel_group);
 #endif
@@ -5144,6 +5933,26 @@
     lives_widget_apply_theme2(menuitem, LIVES_WIDGET_STATE_INSENSITIVE);
   }
 #endif
+#ifdef GUI_QT
+  char *xstock_id=lives_strdup(stock_id); // need to back this up as we will use translation functions
+  LiVESMenuItem *xmenuitem = new LiVESMenuItem(qmake_mnemonic(QString::fromUtf8(xstock_id)),mainw->LiVES);
+
+  if (!strcmp(xstock_id,LIVES_STOCK_LABEL_SAVE)) {
+    xmenuitem->setShortcut(make_qkey_sequence(LIVES_KEY_s, LIVES_CONTROL_MASK));
+  }
+
+  if (!strcmp(xstock_id,LIVES_STOCK_LABEL_QUIT)) {
+    xmenuitem->setMenuRole(QAction::QuitRole);
+    xmenuitem->setShortcut(make_qkey_sequence(LIVES_KEY_q, LIVES_CONTROL_MASK));
+  }
+  lives_free(xstock_id);
+
+  menuitem = static_cast<LiVESWidget *>(xmenuitem);
+
+  if (widget_opts.apply_theme) {
+    lives_widget_apply_theme2(menuitem, LIVES_WIDGET_STATE_INSENSITIVE);
+  }
+#endif
   return menuitem;
 }
 
@@ -5153,6 +5962,9 @@
 #ifdef GUI_GTK
   toolitem=gtk_menu_tool_button_new(icon,label);
 #endif
+#ifdef GUI_QT
+  toolitem = new LiVESMenuToolButton(QString::fromUtf8(label), mainw->LiVES, icon);
+#endif
   return toolitem;
 }
 
@@ -5163,6 +5975,10 @@
   gtk_menu_tool_button_set_menu(toolbutton,menu);
   return TRUE;
 #endif
+#ifdef GUI_QT
+  (dynamic_cast<QMenu *>(menu))->addAction(static_cast<QAction *>(toolbutton));
+  menu->add_child(toolbutton);
+#endif
   return FALSE;
 }
 
@@ -5173,6 +5989,10 @@
   gtk_menu_item_set_submenu(menuitem,menu);
   return TRUE;
 #endif
+#ifdef GUI_QT
+  (static_cast<QAction *>(menuitem))->setMenu(dynamic_cast<QMenu *>(menu));
+  menuitem->add_child(menu);
+#endif
   return FALSE;
 }
 
@@ -5183,6 +6003,10 @@
   gtk_menu_item_activate(menuitem);
   return TRUE;
 #endif
+#ifdef GUI_QT
+  menuitem->activate(QAction::Trigger);
+  return TRUE;
+#endif
   return FALSE;
 }
 
@@ -5193,6 +6017,10 @@
   gtk_check_menu_item_set_active(item,state);
   return TRUE;
 #endif
+#ifdef GUI_QT
+  item->setChecked(state);
+  return TRUE;
+#endif
   return FALSE;
 }
 
@@ -5201,6 +6029,9 @@
 #ifdef GUI_GTK
   return gtk_check_menu_item_get_active(item);
 #endif
+#ifdef GUI_QT
+  return item->isChecked();
+#endif
   return FALSE;
 }
 
@@ -5212,6 +6043,16 @@
   gtk_image_menu_item_set_image(item,image);
   return TRUE;
 #endif
+#ifdef GUI_QT
+  QImage *qim = dynamic_cast<QImage *>(image);
+  if (qim != NULL) {
+    QPixmap qpx;
+    qpx.convertFromImage(*qim);
+    QIcon *qi = new QIcon(qpx);
+    item->setIcon(*qi);
+  }
+  return TRUE;
+#endif
   return FALSE;
 }
 
@@ -5224,6 +6065,10 @@
   return TRUE;
 #endif
 #endif
+#ifdef GUI_QT
+  menu->setTitle(QString::fromUtf8(title));
+  return TRUE;
+#endif
   return FALSE;
 }
 
@@ -5234,6 +6079,10 @@
   gtk_menu_popup(menu, NULL, NULL, NULL, NULL, event->button, event->time);
   return TRUE;
 #endif
+#ifdef GUI_QT
+  menu->popup((static_cast<QWidget *>(static_cast<LiVESWidget *>(menu)))->pos());
+  return TRUE;
+#endif
   return FALSE;
 }
 
@@ -5243,6 +6092,10 @@
   gtk_menu_reorder_child(menu,child,pos);
   return TRUE;
 #endif
+#ifdef GUI_QT
+  menu->reorder_child(child, pos);
+  return TRUE;
+#endif
   return FALSE;
 }
 
@@ -5254,41 +6107,65 @@
   gtk_menu_detach(menu);
   return TRUE;
 #endif
+#ifdef GUI_QT
+  LiVESTornOffMenu *ltom = new LiVESTornOffMenu(menu);
+  ltom->no_refcount();
+  return TRUE;
+#endif
   return FALSE;
 }
 
 
-
-LIVES_INLINE boolean lives_menu_shell_insert(LiVESMenuShell *menushell, LiVESWidget *child, int pos) {
+LIVES_INLINE boolean lives_menu_shell_append(LiVESMenuShell *menushell, LiVESWidget *child) {
 #ifdef GUI_GTK
-  gtk_menu_shell_insert(menushell,child,pos);
+  gtk_menu_shell_append(menushell,child);
   return TRUE;
 #endif
+#ifdef GUI_QT
+  QAction *action = dynamic_cast<QAction *>(child);
+  if (LIVES_IS_MENU(menushell)) {
+    QMenu *qmenu = dynamic_cast<QMenu *>(menushell);
+    qmenu->addAction(action);
+  } else {
+    QMenuBar *qmenu = dynamic_cast<QMenuBar *>(menushell);
+    qmenu->addAction(action);
+  }
+  menushell->add_child(child);
+#endif
   return FALSE;
 }
 
 
 
-LIVES_INLINE boolean lives_menu_shell_prepend(LiVESMenuShell *menushell, LiVESWidget *child) {
+LIVES_INLINE boolean lives_menu_shell_insert(LiVESMenuShell *menushell, LiVESWidget *child, int pos) {
 #ifdef GUI_GTK
-  gtk_menu_shell_prepend(menushell,child);
+  gtk_menu_shell_insert(menushell,child,pos);
   return TRUE;
 #endif
+#ifdef GUI_QT
+  lives_menu_shell_append(menushell, child);
+  if (LIVES_IS_MENU(menushell))(static_cast<LiVESMenu *>(menushell))->reorder_child(child, pos);
+  else (dynamic_cast<LiVESMenuBar *>(menushell))->reorder_child(child, pos);
+#endif
   return FALSE;
 }
 
 
 
-LIVES_INLINE boolean lives_menu_shell_append(LiVESMenuShell *menushell, LiVESWidget *child) {
+LIVES_INLINE boolean lives_menu_shell_prepend(LiVESMenuShell *menushell, LiVESWidget *child) {
 #ifdef GUI_GTK
-  gtk_menu_shell_append(menushell,child);
+  gtk_menu_shell_prepend(menushell,child);
   return TRUE;
 #endif
+#ifdef GUI_QT
+  return lives_menu_shell_insert(menushell, child, 0);
+#endif
   return FALSE;
 }
 
 
 
+
 LIVES_INLINE boolean lives_image_menu_item_set_always_show_image(LiVESImageMenuItem *item, boolean show) {
   // return TRUE if implemented
 #ifdef GUI_GTK
@@ -5299,10 +6176,54 @@
   return TRUE;
 #endif
 #endif
+#ifdef GUI_QT
+  item->setIconVisibleInMenu(show);
+  return TRUE;
+#endif
   return FALSE;
 }
 
 
+LIVES_INLINE boolean lives_scale_set_draw_value(LiVESScale *scale, boolean draw_value) {
+#ifdef GUI_GTK
+  gtk_scale_set_draw_value(scale,draw_value);
+  return TRUE;
+#endif
+#ifdef GUI_QT
+  return !draw_value;
+#endif
+  return FALSE;
+}
+
+
+LIVES_INLINE boolean lives_scale_set_value_pos(LiVESScale *scale, LiVESPositionType ptype) {
+#ifdef GUI_GTK
+  gtk_scale_set_value_pos(scale,ptype);
+  return TRUE;
+#endif
+#ifdef GUI_QT
+  // TODO
+  return FALSE;
+#endif
+  return FALSE;
+}
+
+
+
+LIVES_INLINE boolean lives_scale_set_digits(LiVESScale *scale, int digits) {
+#ifdef GUI_GTK
+  gtk_scale_set_digits(scale,digits);
+  return TRUE;
+#endif
+#ifdef GUI_QT
+  // TODO
+  return FALSE;
+#endif
+  return FALSE;
+}
+
+
+
 
 LIVES_INLINE boolean lives_scale_button_set_orientation(LiVESScaleButton *scale, LiVESOrientation orientation) {
   // return TRUE if implemented
@@ -5311,12 +6232,16 @@
   gtk_orientable_set_orientation(GTK_ORIENTABLE(scale),orientation);
   return TRUE;
 #else
-#if GTK_CHECK_VERSION(2,14,0) 
-  gtk_scale_button_set_orientation (scale,orientation);
+#if GTK_CHECK_VERSION(2,14,0)
+  gtk_scale_button_set_orientation(scale,orientation);
   return TRUE;
 #endif
 #endif
 #endif
+#ifdef GUI_QT
+  scale->setOrientation(orientation);
+  return TRUE;
+#endif
   return FALSE;
 }
 
@@ -5330,6 +6255,9 @@
   value=gtk_adjustment_get_value(gtk_range_get_adjustment(scale));
 #endif
 #endif
+#ifdef GUI_QT
+  value = scale->value();
+#endif
   return value;
 }
 
@@ -5339,6 +6267,10 @@
 #ifdef GUI_GTK
   fname=gtk_file_chooser_get_filename(chooser);
 #endif
+#ifdef GUI_QT
+  QStringList qsl = chooser->selectedFiles();
+  fname = strdup(qsl.at(0).toUtf8().constData());
+#endif
   return fname;
 }
 
@@ -5348,9 +6280,16 @@
 #ifdef GUI_GTK
   fnlist=gtk_file_chooser_get_filenames(chooser);
 #endif
+#ifdef GUI_QT
+  QStringList qsl = chooser->selectedFiles();
+  for (int i=0; i < qsl.size(); i++) {
+    fnlist = lives_slist_append(fnlist,((livesconstpointer)(strdup(qsl.at(0).toUtf8().constData()))));
+  }
+#endif
   return fnlist;
 }
 
+#ifdef GUI_GTK
 LIVES_INLINE LiVESWidget *lives_grid_new(void) {
   LiVESWidget *grid=NULL;
 #ifdef GUI_GTK
@@ -5402,13 +6341,13 @@
   gtk_grid_insert_row(grid,posn);
   return TRUE;
 #endif
-#endif
+
   return FALSE;
 }
 
 
-LIVES_INLINE boolean lives_grid_attach_next_to(LiVESGrid *grid, LiVESWidget *child, LiVESWidget *sibling, 
-					       LiVESPositionType side, int width, int height) {
+LIVES_INLINE boolean lives_grid_attach_next_to(LiVESGrid *grid, LiVESWidget *child, LiVESWidget *sibling,
+    LiVESPositionType side, int width, int height) {
 #ifdef GUI_GTK
 #if GTK_CHECK_VERSION(3,2,0)  // required for grid widget
   gtk_grid_attach_next_to(grid,child,sibling,side,width,height);
@@ -5417,14 +6356,17 @@
 #endif
   return FALSE;
 }
-
-
+#endif
+#endif
 
 LIVES_INLINE LiVESWidget *lives_frame_new(const char *label) {
   LiVESWidget *frame=NULL;
 #ifdef GUI_GTK
   frame=gtk_frame_new(label);
 #endif
+#ifdef GUI_QT
+  frame = new LiVESFrame(label);
+#endif
   return frame;
 }
 
@@ -5435,6 +6377,10 @@
   gtk_frame_set_label(frame,label);
   return TRUE;
 #endif
+#ifdef GUI_QT
+  frame->set_label(QString::fromUtf8(label));
+  return TRUE;
+#endif
   return FALSE;
 }
 
@@ -5445,6 +6391,10 @@
   gtk_frame_set_label_widget(frame,widget);
   return TRUE;
 #endif
+#ifdef GUI_QT
+  frame->set_label_widget(widget);
+  return TRUE;
+#endif
   return FALSE;
 }
 
@@ -5455,6 +6405,9 @@
 #ifdef GUI_GTK
   widget=gtk_frame_get_label_widget(frame);
 #endif
+#ifdef GUI_QT
+  widget = frame->get_label_widget();
+#endif
   return widget;
 }
 
@@ -5465,6 +6418,9 @@
   gtk_frame_set_shadow_type(frame,stype);
   return TRUE;
 #endif
+#ifdef GUI_QT
+  return TRUE;
+#endif
   return FALSE;
 }
 
@@ -5475,6 +6431,9 @@
 #ifdef GUI_GTK
   nbook=gtk_notebook_new();
 #endif
+#ifdef GUI_QT
+  nbook = new LiVESNotebook;
+#endif
   return nbook;
 }
 
@@ -5485,6 +6444,13 @@
 #ifdef GUI_GTK
   page=gtk_notebook_get_nth_page(nbook,pagenum);
 #endif
+#ifdef GUI_QT
+  QWidget *qwidget = nbook->widget(pagenum);
+  QVariant qv = qwidget->property("LiVESObject");
+  if (qv.isValid()) {
+    page = static_cast<LiVESWidget *>(qv.value<LiVESObject *>());
+  }
+#endif
   return page;
 }
 
@@ -5495,6 +6461,9 @@
 #ifdef GUI_GTK
   pagenum=gtk_notebook_get_current_page(nbook);
 #endif
+#ifdef GUI_QT
+  pagenum = nbook->currentIndex();
+#endif
   return pagenum;
 }
 
@@ -5505,6 +6474,10 @@
   gtk_notebook_set_current_page(nbook,pagenum);
   return TRUE;
 #endif
+#ifdef GUI_QT
+  nbook->setCurrentIndex(pagenum);
+  return TRUE;
+#endif
   return FALSE;
 }
 
@@ -5515,6 +6488,10 @@
   gtk_notebook_set_tab_label(nbook,child,tablabel);
   return TRUE;
 #endif
+#ifdef GUI_QT
+  nbook->set_tab_label(child, tablabel);
+  return TRUE;
+#endif
   return FALSE;
 }
 
@@ -5529,21 +6506,24 @@
   gtk_grid_set_row_homogeneous(grid,homogeneous);
   gtk_grid_set_column_homogeneous(grid,homogeneous);
 
-  for (i=0;i<rows;i++) {
+  for (i=0; i<rows; i++) {
     gtk_grid_insert_row(grid,0);
   }
 
-  for (i=0;i<cols;i++) {
+  for (i=0; i<cols; i++) {
     gtk_grid_insert_column(grid,0);
   }
 
-  g_object_set_data(G_OBJECT(grid),"rows",LIVES_INT_TO_POINTER(rows));
-  g_object_set_data(G_OBJECT(grid),"cols",LIVES_INT_TO_POINTER(cols));
+  g_object_set_data(LIVES_WIDGET_OBJECT(grid),"rows",LIVES_INT_TO_POINTER(rows));
+  g_object_set_data(LIVES_WIDGET_OBJECT(grid),"cols",LIVES_INT_TO_POINTER(cols));
   table=(LiVESWidget *)grid;
 #else
   table=gtk_table_new(rows,cols,homogeneous);
 #endif
 #endif
+#ifdef GUI_QT
+  table = new LiVESTable;
+#endif
   return table;
 }
 
@@ -5557,6 +6537,10 @@
   return TRUE;
 #endif
 #endif
+#ifdef GUI_QT
+  table->setHorizontalSpacing(spacing);
+  return TRUE;
+#endif
   return FALSE;
 }
 
@@ -5570,6 +6554,10 @@
   return TRUE;
 #endif
 #endif
+#ifdef GUI_QT
+  table->setVerticalSpacing(spacing);
+  return TRUE;
+#endif
   return FALSE;
 }
 
@@ -5579,38 +6567,41 @@
 #if LIVES_TABLE_IS_GRID  // required for grid remove row
   register int i;
 
-  for (i=LIVES_POINTER_TO_INT(g_object_get_data(G_OBJECT(table),"rows"));i<rows;i++) {
+  for (i=LIVES_POINTER_TO_INT(g_object_get_data(LIVES_WIDGET_OBJECT(table),"rows")); i<rows; i++) {
     gtk_grid_insert_row(table,i);
   }
 
-  for (i=LIVES_POINTER_TO_INT(g_object_get_data(G_OBJECT(table),"cols"));i<cols;i++) {
+  for (i=LIVES_POINTER_TO_INT(g_object_get_data(LIVES_WIDGET_OBJECT(table),"cols")); i<cols; i++) {
     gtk_grid_insert_column(table,i);
   }
 
-  g_object_set_data(G_OBJECT(table),"rows",LIVES_INT_TO_POINTER(rows));
-  g_object_set_data(G_OBJECT(table),"cols",LIVES_INT_TO_POINTER(cols));
+  g_object_set_data(LIVES_WIDGET_OBJECT(table),"rows",LIVES_INT_TO_POINTER(rows));
+  g_object_set_data(LIVES_WIDGET_OBJECT(table),"cols",LIVES_INT_TO_POINTER(cols));
 
 #else
   gtk_table_resize(table,rows,cols);
 #endif
   return TRUE;
 #endif
+#ifdef GUI_QT
+  return TRUE;
+#endif
   return FALSE;
 }
 
 
-LIVES_INLINE boolean lives_table_attach(LiVESTable *table, LiVESWidget *child, uint32_t left, uint32_t right, 
-					uint32_t top, uint32_t bottom, LiVESAttachOptions xoptions, LiVESAttachOptions yoptions,
-					uint32_t xpad, uint32_t ypad) {
+LIVES_INLINE boolean lives_table_attach(LiVESTable *table, LiVESWidget *child, uint32_t left, uint32_t right,
+                                        uint32_t top, uint32_t bottom, LiVESAttachOptions xoptions, LiVESAttachOptions yoptions,
+                                        uint32_t xpad, uint32_t ypad) {
 
 #ifdef GUI_GTK
 #if LIVES_TABLE_IS_GRID  // required for grid remove row
   gtk_grid_attach(table,child,left,top,right-left,bottom-top);
-  if (xoptions&LIVES_EXPAND) 
+  if (xoptions&LIVES_EXPAND)
     lives_widget_set_hexpand(child,TRUE);
   else
     lives_widget_set_hexpand(child,FALSE);
-  if (yoptions&LIVES_EXPAND) 
+  if (yoptions&LIVES_EXPAND)
     lives_widget_set_vexpand(child,TRUE);
   else
     lives_widget_set_vexpand(child,FALSE);
@@ -5625,6 +6616,32 @@
 #endif
   return TRUE;
 #endif
+#ifdef GUI_QT
+
+  table->addWidget(static_cast<QWidget *>(child), top, left, bottom - top, right - left);
+
+
+  QSizePolicy policy;
+  if (xoptions&LIVES_EXPAND) {
+    policy.setHorizontalPolicy(QSizePolicy::Expanding);
+  } else {
+    policy.setHorizontalPolicy(QSizePolicy::Preferred);
+  }
+  if (yoptions&LIVES_EXPAND) {
+    policy.setVerticalPolicy(QSizePolicy::Expanding);
+  } else {
+    policy.setVerticalPolicy(QSizePolicy::Preferred);
+  }
+  child->setSizePolicy(policy);
+
+  QRect qr = child->geometry();
+  qr.setWidth(qr.width() + xpad);
+  qr.setHeight(qr.height() + ypad);
+  child->setGeometry(qr);
+
+  return TRUE;
+#endif
+
   return FALSE;
 }
 
@@ -5638,6 +6655,9 @@
   cbutton=gtk_color_button_new_with_color(color);
 #endif
 #endif
+#ifdef GUI_QT
+  cbutton = new LiVESColorButton(color);
+#endif
   return cbutton;
 }
 
@@ -5655,6 +6675,9 @@
 #endif
   return TRUE;
 #endif
+#ifdef GUI_QT
+  button->get_colour(color);
+#endif
   return FALSE;
 }
 
@@ -5672,6 +6695,10 @@
 #endif
   return TRUE;
 #endif
+#ifdef GUI_QT
+  button->set_colour(color);
+  return TRUE;
+#endif
   return FALSE;
 }
 
@@ -5681,6 +6708,10 @@
   gtk_color_button_set_title(button,title);
   return TRUE;
 #endif
+#ifdef GUI_QT
+  button->set_title(title);
+  return TRUE;
+#endif
   return FALSE;
 }
 
@@ -5700,6 +6731,10 @@
 #endif
   return TRUE;
 #endif
+#ifdef GUI_QT
+  button->set_use_alpha(use_alpha);
+  return TRUE;
+#endif
   return FALSE;
 }
 
@@ -5713,14 +6748,14 @@
 #if GTK_CHECK_VERSION(3,0,0)
   // try: gdk_event_get_device (event)
   LiVESXWindow *xwin;
-  if (widget==NULL) xwin=gdk_get_default_root_window ();
+  if (widget==NULL) xwin=gdk_get_default_root_window();
   else xwin=lives_widget_get_xwindow(widget);
   if (xwin==NULL) {
     LIVES_ERROR("Tried to get pointer for windowless widget");
     return TRUE;
   }
-  gdk_window_get_device_position (xwin,device,x,y,NULL);
-#else 
+  gdk_window_get_device_position(xwin,device,x,y,NULL);
+#else
   gtk_widget_get_pointer(widget,x,y);
 #endif
   return TRUE;
@@ -5741,56 +6776,77 @@
 #ifdef GUI_GTK
   disp=gtk_widget_get_display(widget);
 #endif
+#ifdef GUI_QT
+  QWidget *window = widget->window();
+  window->winId();
+  QWindow *qwindow = window->windowHandle();
+  disp = qwindow->screen();
+#endif
   return disp;
 }
 
 
-LIVES_INLINE LiVESXWindow *lives_display_get_window_at_pointer 
+LIVES_INLINE LiVESXWindow *lives_display_get_window_at_pointer
 (LiVESXDevice *device, LiVESXDisplay *display, int *win_x, int *win_y) {
   LiVESXWindow *xwindow=NULL;
 #ifdef GUI_GTK
 #if GTK_CHECK_VERSION(3,0,0)
   if (device==NULL) return NULL;
-  xwindow=gdk_device_get_window_at_position (device,win_x,win_y);
+  xwindow=gdk_device_get_window_at_position(device,win_x,win_y);
 #else
   xwindow=gdk_display_get_window_at_pointer(display,win_x,win_y);
 #endif
 #endif
 #ifdef GUI_QT
-  QWidget *widget = guiapp->widgetAt(QCursor::pos(display));
+  QWidget *widget = QApplication::widgetAt(QCursor::pos(display));
   widget->winId();
   xwindow = widget->windowHandle();
 #endif
- return xwindow;
+  return xwindow;
 
 }
 
 
-LIVES_INLINE void lives_display_get_pointer 
+LIVES_INLINE boolean lives_display_get_pointer
 (LiVESXDevice *device, LiVESXDisplay *display, LiVESXScreen **screen, int *x, int *y, LiVESXModifierType *mask) {
 #ifdef GUI_GTK
 #if GTK_CHECK_VERSION(3,0,0)
-  if (device==NULL) return;
-  gdk_device_get_position (device,screen,x,y);
+  if (device==NULL) return TRUE;
+  gdk_device_get_position(device,screen,x,y);
 #else
   gdk_display_get_pointer(display,screen,x,y,mask);
 #endif
+  return TRUE;
 #endif
+#ifdef GUI_QT
+  QPoint p = QCursor::pos(device);
+  *x = p.x();
+  *y = p.y();
+  return TRUE;
+#endif
+  return FALSE;
+
 }
 
 
-LIVES_INLINE void lives_display_warp_pointer 
+LIVES_INLINE boolean lives_display_warp_pointer
 (LiVESXDevice *device, LiVESXDisplay *display, LiVESXScreen *screen, int x, int y) {
 #ifdef GUI_GTK
 #if GTK_CHECK_VERSION(3,0,0)
-  if (device==NULL) return;
-  gdk_device_warp (device,screen,x,y);
+  if (device==NULL) return TRUE;
+  gdk_device_warp(device,screen,x,y);
 #else
 #if GLIB_CHECK_VERSION(2,8,0)
   gdk_display_warp_pointer(display,screen,x,y);
 #endif
 #endif
+  return TRUE;
+#endif
+#ifdef GTK_QT
+  QCursor::setPos(display, x, y);
+  return TRUE;
 #endif
+  return FALSE;
 }
 
 
@@ -5802,29 +6858,37 @@
   if (GDK_IS_X11_DISPLAY(display)) dtype=LIVES_DISPLAY_TYPE_X11;
   else if (GDK_IS_WIN32_DISPLAY(display)) dtype=LIVES_DISPLAY_TYPE_WIN32;
 #endif
+#ifdef GUI_QT
+#ifdef Q_WS_X11
+  dtype = LIVES_DISPLAY_TYPE_X11;
+#endif
+#ifdef Q_WS_WIN32
+  dtype = LIVES_DISPLAY_TYPE_WIN32;
+#endif
+#endif
   return dtype;
 }
 
 
-LIVES_INLINE uint64_t lives_widget_get_xwinid(LiVESWidget *widget, const gchar *msg) {
+LIVES_INLINE uint64_t lives_widget_get_xwinid(LiVESWidget *widget, const char *msg) {
   uint64_t xwin=-1;
 #ifdef GUI_GTK
 #ifdef GDK_WINDOWING_X11
   if (lives_widget_get_display_type(widget)==LIVES_DISPLAY_TYPE_X11)
-    xwin=(uint64_t)GDK_WINDOW_XID (lives_widget_get_xwindow(widget));
+    xwin=(uint64_t)GDK_WINDOW_XID(lives_widget_get_xwindow(widget));
   else
 #endif
 #ifdef GDK_WINDOWING_WIN32
     if (lives_widget_get_display_type(widget)==LIVES_DISPLAY_TYPE_WIN32)
-      xwin=(uint64_t)gdk_win32_drawable_get_handle (lives_widget_get_xwindow(widget));
-    else 
+      xwin=(uint64_t)gdk_win32_drawable_get_handle(lives_widget_get_xwindow(widget));
+    else
 #endif
 #endif
 #ifdef GUI_QT
-      if (1) xwin = (uint64_t)widget->winId();
-      else 
+      if (LIVES_IS_WINDOW(widget)) xwin = (uint64_t)widget->effectiveWinId();
+      else
 #endif
-	if (msg!=NULL) LIVES_WARN(msg);
+        if (msg!=NULL) LIVES_WARN(msg);
 
   return xwin;
 }
@@ -5839,6 +6903,10 @@
   timer=gtk_timeout_add(interval,function,data);
 #endif
 #endif
+#ifdef GUI_QT
+  LiVESTimer *ltimer = new LiVESTimer(interval, function, data);
+  timer = ltimer->get_handle();
+#endif
   return timer;
 }
 
@@ -5850,11 +6918,60 @@
   return TRUE;
 #endif
 #endif
+#ifdef GUI_QT
+  remove_static_timer(timer);
+#endif
   return FALSE;
 }
 
 
 
+boolean lives_source_remove(ulong handle) {
+#ifdef GUI_GTK
+  g_source_remove(handle);
+  return TRUE;
+#endif
+#ifdef GUI_QT
+  lives_timer_remove((uint32_t)handle);
+  return TRUE;
+#endif
+  return FALSE;
+}
+
+
+
+LIVES_INLINE uint32_t lives_accelerator_get_default_mod_mask() {
+#ifdef GUI_GTK
+  return gtk_accelerator_get_default_mod_mask();
+#endif
+#ifdef GUI_QT
+  return 0;
+#endif
+}
+
+
+
+LIVES_INLINE int lives_screen_get_width(LiVESXScreen *screen) {
+#ifdef GUI_GTK
+  return gdk_screen_get_width(screen);
+#endif
+#ifdef GUI_QT
+  return screen->size().width();
+#endif
+  return 0;
+}
+
+LIVES_INLINE int lives_screen_get_height(LiVESXScreen *screen) {
+#ifdef GUI_GTK
+  return gdk_screen_get_height(screen);
+#endif
+#ifdef GUI_QT
+  return screen->size().height();
+#endif
+  return 0;
+}
+
+
 // compound functions
 
 
@@ -5880,16 +6997,16 @@
   lives_widget_get_bg_color(widget, &color);
 
 #if LIVES_WIDGET_COLOR_HAS_ALPHA
-  lives_painter_set_source_rgba (cr, 
-				 LIVES_WIDGET_COLOR_SCALE(color.red), 
-				 LIVES_WIDGET_COLOR_SCALE(color.green), 
-				 LIVES_WIDGET_COLOR_SCALE(color.blue), 
-				 LIVES_WIDGET_COLOR_SCALE(color.alpha));
-#else
-  lives_painter_set_source_rgb (cr, 
-				LIVES_WIDGET_COLOR_SCALE(color.red), 
-				LIVES_WIDGET_COLOR_SCALE(color.green), 
-				LIVES_WIDGET_COLOR_SCALE(color.blue));
+  lives_painter_set_source_rgba(cr,
+                                LIVES_WIDGET_COLOR_SCALE(color.red),
+                                LIVES_WIDGET_COLOR_SCALE(color.green),
+                                LIVES_WIDGET_COLOR_SCALE(color.blue),
+                                LIVES_WIDGET_COLOR_SCALE(color.alpha));
+#else
+  lives_painter_set_source_rgb(cr,
+                               LIVES_WIDGET_COLOR_SCALE(color.red),
+                               LIVES_WIDGET_COLOR_SCALE(color.green),
+                               LIVES_WIDGET_COLOR_SCALE(color.blue));
 #endif
 }
 
@@ -5898,50 +7015,63 @@
 void lives_tooltips_copy(LiVESWidget *dest, LiVESWidget *source) {
 #ifdef GUI_GTK
 #if GTK_CHECK_VERSION(2,12,0)
-  gchar *text=gtk_widget_get_tooltip_text(source);
+  char *text=gtk_widget_get_tooltip_text(source);
   lives_widget_set_tooltip_text(dest,text);
-  g_free(text);
+  lives_free(text);
 #else
   GtkTooltipsData *td=gtk_tooltips_data_get(source);
   if (td==NULL) return;
-  gtk_tooltips_set_tip (td->tooltips, dest, td->tip_text, td->tip_private);
+  gtk_tooltips_set_tip(td->tooltips, dest, td->tip_text, td->tip_private);
 #endif
 #endif
+#ifdef GUI_QT
+  dest->setToolTip(source->toolTip());
+#endif
 }
 
 
 boolean lives_combo_populate(LiVESCombo *combo, LiVESList *list) {
+  register int i;
   // remove any current list
   if (!lives_combo_set_active_index(combo,-1)) return FALSE;
   if (!lives_combo_remove_all_text(combo)) return FALSE;
 
   // add the new list
-  while (list!=NULL) {
-    if (!lives_combo_append_text(LIVES_COMBO(combo),(const char *)list->data)) return FALSE;
-    list=list->next;
+  for (i=0; i<lives_list_length(list); i++) {
+    if (!lives_combo_append_text(LIVES_COMBO(combo),(const char *)lives_list_nth_data(list,i))) return FALSE;
   }
   return TRUE;
 }
 
+
+
+
+
 ///// lives compounds
 
 
 LiVESWidget *lives_volume_button_new(LiVESOrientation orientation, LiVESAdjustment *adj, double volume) {
   LiVESWidget *volume_scale=NULL;
 #ifdef GUI_GTK
-#if GTK_CHECK_VERSION(2,14,0) 
+#if GTK_CHECK_VERSION(2,14,0)
   volume_scale=gtk_volume_button_new();
   gtk_scale_button_set_value(GTK_SCALE_BUTTON(volume_scale),volume);
-  lives_scale_button_set_orientation (LIVES_SCALE_BUTTON(volume_scale),orientation);
+  lives_scale_button_set_orientation(LIVES_SCALE_BUTTON(volume_scale),orientation);
 #else
   if (orientation==LIVES_ORIENTATION_HORIZONTAL)
     volume_scale=lives_hscale_new(adj);
-  else 
+  else
     volume_scale=lives_vscale_new(adj);
 
   gtk_scale_set_draw_value(GTK_SCALE(volume_scale),FALSE);
 #endif
 #endif
+#ifdef GUI_QT
+  // TODO
+  //  volume_scale = lives_scale_button_new(adj);
+  //lives_scale_button_set_value(volume_scale, volume);
+  //lives_scale_button_set_orientation (LIVES_SCALE_BUTTON(volume_scale),orientation);
+#endif
   return volume_scale;
 }
 
@@ -5969,14 +7099,14 @@
     lives_widget_apply_theme(label, LIVES_WIDGET_STATE_NORMAL);
   }
 
-  if (mnemonic_widget!=NULL) lives_label_set_mnemonic_widget (LIVES_LABEL(label),mnemonic_widget);
+  if (mnemonic_widget!=NULL) lives_label_set_mnemonic_widget(LIVES_LABEL(label),mnemonic_widget);
 
   return label;
 }
 
 
-LiVESWidget *lives_standard_check_button_new(const char *labeltext, boolean use_mnemonic, LiVESBox *box, 
-					     const char *tooltip) {
+LiVESWidget *lives_standard_check_button_new(const char *labeltext, boolean use_mnemonic, LiVESBox *box,
+    const char *tooltip) {
   LiVESWidget *checkbutton=NULL;
 
   // pack a themed check button into box
@@ -5985,7 +7115,7 @@
   LiVESWidget *label=NULL;
   LiVESWidget *hbox;
 
-  checkbutton = lives_check_button_new ();
+  checkbutton = lives_check_button_new();
   if (tooltip!=NULL) lives_widget_set_tooltip_text(checkbutton, tooltip);
 
   widget_opts.last_label=NULL;
@@ -5995,57 +7125,50 @@
     if (tooltip!=NULL) lives_tooltips_copy(eventbox,checkbutton);
 
     if (use_mnemonic) {
-      label=lives_standard_label_new_with_mnemonic (labeltext,checkbutton);
-    }
-    else label=lives_standard_label_new (labeltext);
+      label=lives_standard_label_new_with_mnemonic(labeltext,checkbutton);
+    } else label=lives_standard_label_new(labeltext);
 
     lives_container_add(LIVES_CONTAINER(eventbox),label);
 
-    lives_signal_connect (LIVES_GUI_OBJECT (eventbox), "button_press_event",
-		      LIVES_GUI_CALLBACK (label_act_toggle),
-		      checkbutton);
-  
+    lives_signal_connect(LIVES_GUI_OBJECT(eventbox), LIVES_WIDGET_BUTTON_PRESS_EVENT,
+                         LIVES_GUI_CALLBACK(label_act_toggle),
+                         checkbutton);
+
     widget_opts.last_label=label;
 
     if (widget_opts.apply_theme) {
       lives_widget_apply_theme(eventbox,LIVES_WIDGET_STATE_NORMAL);
     }
   }
-  
+
   if (box!=NULL) {
     if (LIVES_IS_HBOX(box)) hbox=LIVES_WIDGET(box);
     else {
-      hbox = lives_hbox_new (FALSE, 0);
+      hbox = lives_hbox_new(FALSE, 0);
       if (!widget_opts.no_gui) {
-	lives_widget_show(hbox);
+        lives_widget_show(hbox);
       }
-      lives_box_pack_start (LIVES_BOX (box), hbox, FALSE, FALSE, widget_opts.packing_height);
+      lives_box_pack_start(LIVES_BOX(box), hbox, FALSE, FALSE, widget_opts.packing_height);
     }
-    
+
     lives_box_set_homogeneous(LIVES_BOX(hbox),FALSE);
-    
-    
+
+
     if (widget_opts.swap_label&&eventbox!=NULL)
-      lives_box_pack_start (LIVES_BOX(hbox), eventbox, FALSE, FALSE, widget_opts.packing_width);
-    
-    lives_box_pack_start (LIVES_BOX(hbox), checkbutton, widget_opts.expand==LIVES_EXPAND_EXTRA, FALSE, 
-			  eventbox==NULL?0:widget_opts.packing_width);
+      lives_box_pack_start(LIVES_BOX(hbox), eventbox, FALSE, FALSE, widget_opts.packing_width);
+
+    lives_box_pack_start(LIVES_BOX(hbox), checkbutton, widget_opts.expand==LIVES_EXPAND_EXTRA, FALSE,
+                         eventbox==NULL?0:widget_opts.packing_width);
 
     if (!widget_opts.swap_label&&eventbox!=NULL)
-      lives_box_pack_start (LIVES_BOX(hbox), eventbox, FALSE, FALSE, widget_opts.packing_width);
+      lives_box_pack_start(LIVES_BOX(hbox), eventbox, FALSE, FALSE, widget_opts.packing_width);
 
   }
 
   if (label!=NULL) {
-#if GTK_CHECK_VERSION(3,0,0)
-    lives_signal_connect_after (LIVES_GUI_OBJECT (checkbutton), "state_flags_changed",
-			    LIVES_GUI_CALLBACK (set_label_state),
-			    label);
-#else
-    lives_signal_connect_after (LIVES_GUI_OBJECT (checkbutton), "state_changed",
-			    LIVES_GUI_CALLBACK (set_label_state),
-			    label);
-#endif
+    lives_signal_connect_after(LIVES_GUI_OBJECT(checkbutton), LIVES_WIDGET_STATE_CHANGED_SIGNAL,
+                               LIVES_GUI_CALLBACK(set_label_state),
+                               label);
   }
 
 
@@ -6055,8 +7178,8 @@
 
 
 
-LiVESWidget *lives_standard_radio_button_new(const char *labeltext, boolean use_mnemonic, LiVESSList *rbgroup, 
-					     LiVESBox *box, const char *tooltip) {
+LiVESWidget *lives_standard_radio_button_new(const char *labeltext, boolean use_mnemonic, LiVESSList *rbgroup,
+    LiVESBox *box, const char *tooltip) {
   LiVESWidget *radiobutton=NULL;
 
   // pack a themed check button into box
@@ -6066,7 +7189,7 @@
   LiVESWidget *label=NULL;
   LiVESWidget *hbox;
 
-  radiobutton = lives_radio_button_new (rbgroup);
+  radiobutton = lives_radio_button_new(rbgroup);
 
   if (tooltip!=NULL) lives_widget_set_tooltip_text(radiobutton, tooltip);
 
@@ -6074,20 +7197,19 @@
 
   if (labeltext!=NULL) {
     if (use_mnemonic) {
-      label=lives_standard_label_new_with_mnemonic (labeltext,radiobutton);
-    }
-    else label=lives_standard_label_new (labeltext);
+      label=lives_standard_label_new_with_mnemonic(labeltext,radiobutton);
+    } else label=lives_standard_label_new(labeltext);
 
     widget_opts.last_label=label;
-    
+
     eventbox=lives_event_box_new();
     if (tooltip!=NULL) lives_tooltips_copy(eventbox,radiobutton);
     lives_container_add(LIVES_CONTAINER(eventbox),label);
 
-    lives_signal_connect (LIVES_GUI_OBJECT (eventbox), "button_press_event",
-		      LIVES_GUI_CALLBACK (label_act_toggle),
-		      radiobutton);
-    
+    lives_signal_connect(LIVES_GUI_OBJECT(eventbox), LIVES_WIDGET_BUTTON_PRESS_EVENT,
+                         LIVES_GUI_CALLBACK(label_act_toggle),
+                         radiobutton);
+
     if (widget_opts.apply_theme) {
       lives_widget_apply_theme(eventbox, LIVES_WIDGET_STATE_NORMAL);
     }
@@ -6097,35 +7219,29 @@
   if (box!=NULL) {
     if (LIVES_IS_HBOX(box)) hbox=LIVES_WIDGET(box);
     else {
-      hbox = lives_hbox_new (FALSE, 0);
+      hbox = lives_hbox_new(FALSE, 0);
       if (!widget_opts.no_gui) {
-	lives_widget_show(hbox);
+        lives_widget_show(hbox);
       }
-      lives_box_pack_start (LIVES_BOX (box), hbox, FALSE, FALSE, widget_opts.packing_height);
+      lives_box_pack_start(LIVES_BOX(box), hbox, FALSE, FALSE, widget_opts.packing_height);
     }
-    
+
     lives_box_set_homogeneous(LIVES_BOX(hbox),FALSE);
-    
+
     if (widget_opts.swap_label&&eventbox!=NULL)
-      lives_box_pack_start (LIVES_BOX (hbox), eventbox, FALSE, FALSE, widget_opts.packing_width);
+      lives_box_pack_start(LIVES_BOX(hbox), eventbox, FALSE, FALSE, widget_opts.packing_width);
 
-    lives_box_pack_start (LIVES_BOX (hbox), radiobutton, widget_opts.expand==LIVES_EXPAND_EXTRA, FALSE, 
-			  eventbox==NULL?0:widget_opts.packing_width);
+    lives_box_pack_start(LIVES_BOX(hbox), radiobutton, widget_opts.expand==LIVES_EXPAND_EXTRA, FALSE,
+                         eventbox==NULL?0:widget_opts.packing_width);
 
     if (!widget_opts.swap_label&&eventbox!=NULL)
-      lives_box_pack_start (LIVES_BOX (hbox), eventbox, FALSE, FALSE, widget_opts.packing_width);
+      lives_box_pack_start(LIVES_BOX(hbox), eventbox, FALSE, FALSE, widget_opts.packing_width);
   }
 
   if (label!=NULL) {
-#if GTK_CHECK_VERSION(3,0,0)
-    lives_signal_connect_after (LIVES_GUI_OBJECT (radiobutton), "state_flags_changed",
-			    LIVES_GUI_CALLBACK (set_label_state),
-			    label);
-#else
-    lives_signal_connect_after (LIVES_GUI_OBJECT (radiobutton), "state_changed",
-			    LIVES_GUI_CALLBACK (set_label_state),
-			    label);
-#endif
+    lives_signal_connect_after(LIVES_GUI_OBJECT(radiobutton), LIVES_WIDGET_STATE_CHANGED_SIGNAL,
+                               LIVES_GUI_CALLBACK(set_label_state),
+                               label);
   }
 
   return radiobutton;
@@ -6133,20 +7249,20 @@
 
 
 size_t calc_spin_button_width(double min, double max, int dp) {
-  char *txt=g_strdup_printf ("%d",(int)max);
-  size_t maxlen=strlen (txt);
-  g_free (txt);
-  txt=g_strdup_printf ("%d",(int)min);
-  if (strlen (txt)>maxlen) maxlen=strlen (txt);
-  g_free (txt);
+  char *txt=lives_strdup_printf("%d",(int)max);
+  size_t maxlen=strlen(txt);
+  lives_free(txt);
+  txt=lives_strdup_printf("%d",(int)min);
+  if (strlen(txt)>maxlen) maxlen=strlen(txt);
+  lives_free(txt);
   if (dp>0) maxlen+=3;
   return maxlen;
 }
 
 
-LiVESWidget *lives_standard_spin_button_new(const char *labeltext, boolean use_mnemonic, double val, double min, 
-					    double max, double step, double page, int dp, LiVESBox *box, 
-					    const char *tooltip) {
+LiVESWidget *lives_standard_spin_button_new(const char *labeltext, boolean use_mnemonic, double val, double min,
+    double max, double step, double page, int dp, LiVESBox *box,
+    const char *tooltip) {
   LiVESWidget *spinbutton=NULL;
 
   // pack a themed check button into box
@@ -6161,34 +7277,33 @@
 
   int maxlen;
 
-  adj = lives_adjustment_new (val, min, max, step, page, 0.);
-  spinbutton = lives_spin_button_new (adj, 1, dp);
+  adj = lives_adjustment_new(val, min, max, step, page, 0.);
+  spinbutton = lives_spin_button_new(adj, 1, dp);
   if (tooltip!=NULL) lives_widget_set_tooltip_text(spinbutton, tooltip);
 
   maxlen=calc_spin_button_width(min,max,dp);
-  lives_entry_set_width_chars (LIVES_ENTRY (spinbutton),maxlen);
+  lives_entry_set_width_chars(LIVES_ENTRY(spinbutton),maxlen);
 
-  lives_entry_set_activates_default (LIVES_ENTRY (spinbutton), TRUE);
+  lives_entry_set_activates_default(LIVES_ENTRY(spinbutton), TRUE);
 
 #ifdef GUI_GTK
-  gtk_spin_button_set_update_policy (LIVES_SPIN_BUTTON (spinbutton),GTK_UPDATE_ALWAYS);
-  gtk_spin_button_set_numeric (LIVES_SPIN_BUTTON (spinbutton),TRUE);
+  gtk_spin_button_set_update_policy(LIVES_SPIN_BUTTON(spinbutton),GTK_UPDATE_ALWAYS);
+  gtk_spin_button_set_numeric(LIVES_SPIN_BUTTON(spinbutton),TRUE);
 #endif
 
   widget_opts.last_label=NULL;
 
   if (labeltext!=NULL) {
     if (use_mnemonic) {
-      label=lives_standard_label_new_with_mnemonic (labeltext,spinbutton);
-    }
-    else label=lives_standard_label_new (labeltext);
-    
+      label=lives_standard_label_new_with_mnemonic(labeltext,spinbutton);
+    } else label=lives_standard_label_new(labeltext);
+
     widget_opts.last_label=label;
 
     eventbox=lives_event_box_new();
     if (tooltip!=NULL) lives_tooltips_copy(eventbox,spinbutton);
     lives_container_add(LIVES_CONTAINER(eventbox),label);
-    
+
     if (widget_opts.apply_theme) {
       lives_widget_apply_theme(eventbox, LIVES_WIDGET_STATE_NORMAL);
     }
@@ -6197,39 +7312,33 @@
   if (box!=NULL) {
     if (LIVES_IS_HBOX(box)) hbox=LIVES_WIDGET(box);
     else {
-      hbox = lives_hbox_new (FALSE, 0);
+      hbox = lives_hbox_new(FALSE, 0);
       if (!widget_opts.no_gui) {
-	lives_widget_show(hbox);
+        lives_widget_show(hbox);
       }
-      lives_box_pack_start (LIVES_BOX (box), hbox, FALSE, FALSE, widget_opts.packing_height);
+      lives_box_pack_start(LIVES_BOX(box), hbox, FALSE, FALSE, widget_opts.packing_height);
       expand=widget_opts.expand!=LIVES_EXPAND_NONE;
     }
 
     lives_box_set_homogeneous(LIVES_BOX(hbox),FALSE);
 
     if (!widget_opts.swap_label&&eventbox!=NULL)
-      lives_box_pack_start (LIVES_BOX (hbox), eventbox, FALSE, FALSE, widget_opts.packing_width);
-    
+      lives_box_pack_start(LIVES_BOX(hbox), eventbox, FALSE, FALSE, widget_opts.packing_width);
+
     if (expand) add_fill_to_box(LIVES_BOX(hbox));
 
-    lives_box_pack_start (LIVES_BOX (hbox), spinbutton, widget_opts.expand==LIVES_EXPAND_EXTRA, FALSE, widget_opts.packing_width);
-    
+    lives_box_pack_start(LIVES_BOX(hbox), spinbutton, widget_opts.expand==LIVES_EXPAND_EXTRA, FALSE, widget_opts.packing_width);
+
     if (expand) add_fill_to_box(LIVES_BOX(hbox));
 
     if (widget_opts.swap_label&&eventbox!=NULL)
-      lives_box_pack_start (LIVES_BOX (hbox), eventbox, FALSE, FALSE, widget_opts.packing_width);
+      lives_box_pack_start(LIVES_BOX(hbox), eventbox, FALSE, FALSE, widget_opts.packing_width);
   }
 
   if (label!=NULL) {
-#if GTK_CHECK_VERSION(3,0,0)
-    lives_signal_connect_after (LIVES_GUI_OBJECT (spinbutton), "state_flags_changed",
-			    LIVES_GUI_CALLBACK (set_label_state),
-			    label);
-#else
-    lives_signal_connect_after (LIVES_GUI_OBJECT (spinbutton), "state_changed",
-			    LIVES_GUI_CALLBACK (set_label_state),
-			    label);
-#endif
+    lives_signal_connect_after(LIVES_GUI_OBJECT(spinbutton), LIVES_WIDGET_STATE_CHANGED_SIGNAL,
+                               LIVES_GUI_CALLBACK(set_label_state),
+                               label);
   }
 
 
@@ -6241,8 +7350,8 @@
 
 
 
-LiVESWidget *lives_standard_combo_new (const char *labeltext, boolean use_mnemonic, LiVESList *list, LiVESBox *box, 
-				       const char *tooltip) {
+LiVESWidget *lives_standard_combo_new(const char *labeltext, boolean use_mnemonic, LiVESList *list, LiVESBox *box,
+                                      const char *tooltip) {
   LiVESWidget *combo=NULL;
 
   // pack a themed combo box into box
@@ -6261,16 +7370,15 @@
 
   if (labeltext!=NULL) {
     if (use_mnemonic) {
-      label = lives_standard_label_new_with_mnemonic (labeltext,LIVES_WIDGET(entry));
-    }
-    else label = lives_standard_label_new (labeltext);
+      label = lives_standard_label_new_with_mnemonic(labeltext,LIVES_WIDGET(entry));
+    } else label = lives_standard_label_new(labeltext);
 
     widget_opts.last_label=label;
-    
+
     eventbox=lives_event_box_new();
     if (tooltip!=NULL) lives_tooltips_copy(eventbox,combo);
     lives_container_add(LIVES_CONTAINER(eventbox),label);
-    
+
     if (widget_opts.apply_theme) {
       lives_widget_apply_theme(eventbox, LIVES_WIDGET_STATE_NORMAL);
     }
@@ -6279,34 +7387,34 @@
   if (box!=NULL) {
     if (LIVES_IS_HBOX(box)) hbox=LIVES_WIDGET(box);
     else {
-      hbox = lives_hbox_new (FALSE, 0);
-      lives_box_pack_start (LIVES_BOX (box), hbox, FALSE, FALSE, widget_opts.packing_height);
+      hbox = lives_hbox_new(FALSE, 0);
+      lives_box_pack_start(LIVES_BOX(box), hbox, FALSE, FALSE, widget_opts.packing_height);
     }
 
     lives_box_set_homogeneous(LIVES_BOX(hbox),FALSE);
 
     if (widget_opts.expand==LIVES_EXPAND_DEFAULT) {
       LiVESWidget *label=lives_standard_label_new("");
-      lives_box_pack_start (LIVES_BOX (hbox), label, TRUE, FALSE, 0);
+      lives_box_pack_start(LIVES_BOX(hbox), label, TRUE, FALSE, 0);
     }
-    
+
     if (!widget_opts.swap_label&&eventbox!=NULL)
-      lives_box_pack_start (LIVES_BOX (hbox), eventbox, FALSE, FALSE, widget_opts.packing_width);
-    lives_box_pack_start (LIVES_BOX (hbox), combo, widget_opts.expand!=LIVES_EXPAND_NONE, 
-			widget_opts.expand==LIVES_EXPAND_EXTRA, eventbox==NULL?0:widget_opts.packing_width);
+      lives_box_pack_start(LIVES_BOX(hbox), eventbox, FALSE, FALSE, widget_opts.packing_width);
+    lives_box_pack_start(LIVES_BOX(hbox), combo, widget_opts.expand!=LIVES_EXPAND_NONE,
+                         widget_opts.expand==LIVES_EXPAND_EXTRA, eventbox==NULL?0:widget_opts.packing_width);
     if (widget_opts.swap_label&&eventbox!=NULL)
-      lives_box_pack_start (LIVES_BOX (hbox), eventbox, FALSE, FALSE, widget_opts.packing_width);
+      lives_box_pack_start(LIVES_BOX(hbox), eventbox, FALSE, FALSE, widget_opts.packing_width);
 
 
     if (widget_opts.expand==LIVES_EXPAND_DEFAULT) {
       LiVESWidget *label=lives_standard_label_new("");
-      lives_box_pack_start (LIVES_BOX (hbox), label, TRUE, FALSE, 0);
+      lives_box_pack_start(LIVES_BOX(hbox), label, TRUE, FALSE, 0);
     }
 
 
   }
 
-  lives_entry_set_editable (LIVES_ENTRY(entry),FALSE);
+  lives_entry_set_editable(LIVES_ENTRY(entry),FALSE);
   lives_entry_set_activates_default(entry,TRUE);
 
   if (list!=NULL) {
@@ -6315,15 +7423,9 @@
   }
 
   if (label!=NULL) {
-#if GTK_CHECK_VERSION(3,0,0)
-    lives_signal_connect_after (LIVES_GUI_OBJECT (combo), "state_flags_changed",
-			    LIVES_GUI_CALLBACK (set_label_state),
-			    label);
-#else
-    lives_signal_connect_after (LIVES_GUI_OBJECT (combo), "state_changed",
-			    LIVES_GUI_CALLBACK (set_label_state),
-			    label);
-#endif
+    lives_signal_connect_after(LIVES_GUI_OBJECT(combo), LIVES_WIDGET_STATE_CHANGED_SIGNAL,
+                               LIVES_GUI_CALLBACK(set_label_state),
+                               label);
   }
 
 
@@ -6331,8 +7433,9 @@
 }
 
 
-LiVESWidget *lives_standard_entry_new(const char *labeltext, boolean use_mnemonic, const char *txt, int dispwidth, int maxchars, LiVESBox *box, 
-					     const char *tooltip) {
+LiVESWidget *lives_standard_entry_new(const char *labeltext, boolean use_mnemonic, const char *txt, int dispwidth, int maxchars,
+                                      LiVESBox *box,
+                                      const char *tooltip) {
 
   LiVESWidget *entry=NULL;
 
@@ -6345,20 +7448,19 @@
   if (tooltip!=NULL) lives_widget_set_tooltip_text(entry, tooltip);
 
   if (txt!=NULL)
-    lives_entry_set_text (LIVES_ENTRY (entry),txt);
+    lives_entry_set_text(LIVES_ENTRY(entry),txt);
 
-  if (dispwidth!=-1) lives_entry_set_width_chars (LIVES_ENTRY (entry),dispwidth);
-  if (maxchars!=-1) lives_entry_set_max_length(LIVES_ENTRY (entry),maxchars);
+  if (dispwidth!=-1) lives_entry_set_width_chars(LIVES_ENTRY(entry),dispwidth);
+  if (maxchars!=-1) lives_entry_set_max_length(LIVES_ENTRY(entry),maxchars);
 
-  lives_entry_set_activates_default (LIVES_ENTRY (entry), TRUE);
+  lives_entry_set_activates_default(LIVES_ENTRY(entry), TRUE);
 
   widget_opts.last_label=NULL;
 
   if (labeltext!=NULL) {
     if (use_mnemonic) {
-      label = lives_standard_label_new_with_mnemonic (labeltext,entry);
-    }
-    else label = lives_standard_label_new (labeltext);
+      label = lives_standard_label_new_with_mnemonic(labeltext,entry);
+    } else label = lives_standard_label_new(labeltext);
 
     widget_opts.last_label=label;
 
@@ -6369,34 +7471,28 @@
   if (box!=NULL) {
     if (LIVES_IS_HBOX(box)) hbox=LIVES_WIDGET(box);
     else {
-      hbox = lives_hbox_new (FALSE, 0);
+      hbox = lives_hbox_new(FALSE, 0);
       if (!widget_opts.no_gui) {
-	lives_widget_show(hbox);
+        lives_widget_show(hbox);
       }
-      lives_box_pack_start (LIVES_BOX (box), hbox, FALSE, FALSE, widget_opts.packing_height);
+      lives_box_pack_start(LIVES_BOX(box), hbox, FALSE, FALSE, widget_opts.packing_height);
     }
-    
+
     lives_box_set_homogeneous(LIVES_BOX(hbox),FALSE);
 
     if (!widget_opts.swap_label&&label!=NULL)
-      lives_box_pack_start (LIVES_BOX (hbox), label, FALSE, FALSE, widget_opts.packing_width);
-    
-    lives_box_pack_start (LIVES_BOX (hbox), entry, widget_opts.expand!=LIVES_EXPAND_NONE, dispwidth==-1, widget_opts.packing_width);
-    
+      lives_box_pack_start(LIVES_BOX(hbox), label, FALSE, FALSE, widget_opts.packing_width);
+
+    lives_box_pack_start(LIVES_BOX(hbox), entry, widget_opts.expand!=LIVES_EXPAND_NONE, dispwidth==-1, widget_opts.packing_width);
+
     if (widget_opts.swap_label&&label!=NULL)
-      lives_box_pack_start (LIVES_BOX (hbox), label, FALSE, FALSE, widget_opts.packing_width);
+      lives_box_pack_start(LIVES_BOX(hbox), label, FALSE, FALSE, widget_opts.packing_width);
   }
 
   if (label!=NULL) {
-#if GTK_CHECK_VERSION(3,0,0)
-    lives_signal_connect_after (LIVES_GUI_OBJECT (entry), "state_flags_changed",
-			    LIVES_GUI_CALLBACK (set_label_state),
-			    label);
-#else
-    lives_signal_connect_after (LIVES_GUI_OBJECT (entry), "state_changed",
-			    LIVES_GUI_CALLBACK (set_label_state),
-			    label);
-#endif
+    lives_signal_connect_after(LIVES_GUI_OBJECT(entry), LIVES_WIDGET_STATE_CHANGED_SIGNAL,
+                               LIVES_GUI_CALLBACK(set_label_state),
+                               label);
   }
 
 
@@ -6405,23 +7501,25 @@
 
 
 
-LiVESWidget *lives_standard_dialog_new(const char *title, boolean add_std_buttons) {
+LiVESWidget *lives_standard_dialog_new(const char *title, boolean add_std_buttons, int width, int height) {
   LiVESWidget *dialog=NULL;
 
-#ifdef GUI_GTK
+  dialog = lives_dialog_new();
 
-  dialog = gtk_dialog_new ();
+  lives_widget_set_size_request(dialog, width, height);
 
   if (title!=NULL)
-    lives_window_set_title (LIVES_WINDOW (dialog), title);
+    lives_window_set_title(LIVES_WINDOW(dialog), title);
 
   lives_window_set_deletable(LIVES_WINDOW(dialog), FALSE);
-  lives_window_set_resizable (LIVES_WINDOW (dialog), FALSE);
+
+  if (!widget_opts.non_modal)
+    lives_window_set_resizable(LIVES_WINDOW(dialog), FALSE);
 
   lives_widget_set_hexpand(dialog,TRUE);
   lives_widget_set_vexpand(dialog,TRUE);
 
-  lives_container_set_border_width (LIVES_CONTAINER (dialog), widget_opts.border_width*2);
+  lives_container_set_border_width(LIVES_CONTAINER(dialog), widget_opts.border_width*2);
 
   if (widget_opts.apply_theme) {
     lives_widget_apply_theme(dialog, LIVES_WIDGET_STATE_NORMAL);
@@ -6435,39 +7533,38 @@
   lives_window_set_position(LIVES_WINDOW(dialog),LIVES_WIN_POS_CENTER_ALWAYS);
 
   if (add_std_buttons) {
-    LiVESAccelGroup *accel_group=LIVES_ACCEL_GROUP(lives_accel_group_new ());
-    LiVESWidget *cancelbutton = lives_button_new_from_stock (LIVES_STOCK_CANCEL);
-    LiVESWidget *okbutton = lives_button_new_from_stock (LIVES_STOCK_OK);
+    LiVESAccelGroup *accel_group=LIVES_ACCEL_GROUP(lives_accel_group_new());
+    LiVESWidget *cancelbutton = lives_button_new_from_stock(LIVES_STOCK_CANCEL);
+    LiVESWidget *okbutton = lives_button_new_from_stock(LIVES_STOCK_OK);
 
-    lives_window_add_accel_group (LIVES_WINDOW (dialog), accel_group);
+    lives_window_add_accel_group(LIVES_WINDOW(dialog), accel_group);
 
-    lives_dialog_add_action_widget (LIVES_DIALOG (dialog), cancelbutton, LIVES_RESPONSE_CANCEL);
+    lives_dialog_add_action_widget(LIVES_DIALOG(dialog), cancelbutton, LIVES_RESPONSE_CANCEL);
 
-    lives_widget_add_accelerator (cancelbutton, LIVES_WIDGET_CLICKED_EVENT, accel_group,
-				LIVES_KEY_Escape, (LiVESXModifierType)0, (LiVESAccelFlags)0);
+    lives_widget_add_accelerator(cancelbutton, LIVES_WIDGET_CLICKED_SIGNAL, accel_group,
+                                 LIVES_KEY_Escape, (LiVESXModifierType)0, (LiVESAccelFlags)0);
 
     lives_widget_set_can_focus_and_default(cancelbutton);
 
-    lives_dialog_add_action_widget (LIVES_DIALOG (dialog), okbutton, LIVES_RESPONSE_OK);
+    lives_dialog_add_action_widget(LIVES_DIALOG(dialog), okbutton, LIVES_RESPONSE_OK);
 
     lives_widget_set_can_focus_and_default(okbutton);
-    lives_widget_grab_default (okbutton);
+    lives_widget_grab_default(okbutton);
   }
 
-  lives_signal_connect (LIVES_GUI_OBJECT (dialog), "delete_event",
-                      LIVES_GUI_CALLBACK (return_true),
-                      NULL);
+  lives_signal_connect(LIVES_GUI_OBJECT(dialog), LIVES_WIDGET_DELETE_EVENT,
+                       LIVES_GUI_CALLBACK(return_true),
+                       NULL);
 
   // must do this before setting modal !
   if (!widget_opts.no_gui) {
     lives_widget_show(dialog);
-    lives_window_center(LIVES_WINDOW(dialog));
   }
 
-  if (!widget_opts.non_modal)
-    lives_window_set_modal (LIVES_WINDOW (dialog), TRUE);
+  lives_window_center(LIVES_WINDOW(dialog));
 
-#endif
+  if (!widget_opts.non_modal)
+    lives_window_set_modal(LIVES_WINDOW(dialog), TRUE);
 
   return dialog;
 
@@ -6499,61 +7596,68 @@
 
 LiVESWidget *lives_standard_scrolled_window_new(int width, int height, LiVESWidget *child) {
   LiVESWidget *scrolledwindow=NULL;
-
-#ifdef GUI_GTK
   LiVESWidget *swchild;
-  scrolledwindow = lives_scrolled_window_new (NULL, NULL);
-  lives_scrolled_window_set_policy (LIVES_SCROLLED_WINDOW (scrolledwindow), LIVES_POLICY_AUTOMATIC, LIVES_POLICY_AUTOMATIC);
+
+  scrolledwindow = lives_scrolled_window_new(NULL, NULL);
+  lives_scrolled_window_set_policy(LIVES_SCROLLED_WINDOW(scrolledwindow), LIVES_POLICY_AUTOMATIC, LIVES_POLICY_AUTOMATIC);
 
   if (widget_opts.apply_theme) {
     lives_widget_set_hexpand(scrolledwindow,TRUE);
     lives_widget_set_vexpand(scrolledwindow,TRUE);
-    lives_container_set_border_width (LIVES_CONTAINER (scrolledwindow), widget_opts.border_width);
+    lives_container_set_border_width(LIVES_CONTAINER(scrolledwindow), widget_opts.border_width);
   }
 
   if (child!=NULL) {
 
+#ifdef GUI_GTK
 #if GTK_CHECK_VERSION(3,0,0)
     if (!LIVES_IS_SCROLLABLE(child))
 #else
     if (!LIVES_IS_TEXT_VIEW(child))
-#endif 
-      {
-	lives_scrolled_window_add_with_viewport (LIVES_SCROLLED_WINDOW (scrolledwindow), child);
-      }
-    else {
+#endif
+    {
+      lives_scrolled_window_add_with_viewport(LIVES_SCROLLED_WINDOW(scrolledwindow), child);
+    } else {
       if (widget_opts.expand!=LIVES_EXPAND_NONE) {
-	LiVESWidget *align;
-	align=lives_alignment_new(.5,0.,0.,0.);
-	lives_container_add (LIVES_CONTAINER (align), child);
-	lives_scrolled_window_add_with_viewport (LIVES_SCROLLED_WINDOW (scrolledwindow), align);
-      }
-      else {
-	lives_scrolled_window_add_with_viewport (LIVES_SCROLLED_WINDOW (scrolledwindow), child);
+        LiVESWidget *align;
+        align=lives_alignment_new(.5,0.,0.,0.);
+        lives_container_add(LIVES_CONTAINER(align), child);
+        lives_scrolled_window_add_with_viewport(LIVES_SCROLLED_WINDOW(scrolledwindow), align);
+      } else {
+        lives_scrolled_window_add_with_viewport(LIVES_SCROLLED_WINDOW(scrolledwindow), child);
       }
     }
+#endif
+#ifdef GUI_QT
+    lives_container_add(scrolledwindow, child);
+#endif
   }
 
   swchild=lives_bin_get_child(LIVES_BIN(scrolledwindow));
-  if (GTK_IS_VIEWPORT(swchild)) 
-    gtk_viewport_set_shadow_type (GTK_VIEWPORT (swchild),LIVES_SHADOW_IN);
+
+#ifdef GTK
+  if (GTK_IS_VIEWPORT(swchild))
+    gtk_viewport_set_shadow_type(GTK_VIEWPORT(swchild),LIVES_SHADOW_IN);
 
   if (width!=0&&height!=0) {
 #if !GTK_CHECK_VERSION(3,0,0)
-    lives_widget_set_size_request (scrolledwindow, width, height);
+    lives_widget_set_size_request(scrolledwindow, width, height);
 #else
     if (height!=-1) gtk_scrolled_window_set_min_content_height(GTK_SCROLLED_WINDOW(scrolledwindow),height);
     if (width!=-1) gtk_scrolled_window_set_min_content_width(GTK_SCROLLED_WINDOW(scrolledwindow),width);
 #endif
   }
+#endif
+#ifdef GUI_QT
+  lives_widget_set_size_request(scrolledwindow, width, height);
+#endif
 
   if (widget_opts.apply_theme) {
     lives_widget_apply_theme(swchild, LIVES_WIDGET_STATE_NORMAL);
     lives_widget_set_hexpand(swchild,TRUE);
     lives_widget_set_vexpand(swchild,TRUE);
-    if (LIVES_IS_CONTAINER(child)) lives_container_set_border_width (LIVES_CONTAINER (child), widget_opts.border_width>>1);
+    if (LIVES_IS_CONTAINER(child)) lives_container_set_border_width(LIVES_CONTAINER(child), widget_opts.border_width>>1);
   }
-#endif
 
   return scrolledwindow;
 }
@@ -6563,9 +7667,11 @@
 LiVESWidget *lives_standard_expander_new(const char *ltext, boolean use_mnemonic, LiVESBox *parent, LiVESWidget *child) {
   LiVESWidget *expander=NULL;
 
+
+#ifdef GUI_GTK
   if (use_mnemonic)
     expander=lives_expander_new_with_mnemonic(ltext);
-  else 
+  else
     expander=lives_expander_new(ltext);
 
   if (widget_opts.apply_theme) {
@@ -6575,14 +7681,15 @@
     lives_widget_apply_theme(expander, LIVES_WIDGET_STATE_PRELIGHT);
     lives_widget_apply_theme(expander, LIVES_WIDGET_STATE_NORMAL);
   }
-  
+
 #ifdef GUI_GTK
   lives_container_forall(LIVES_CONTAINER(expander),set_child_colour,LIVES_INT_TO_POINTER(TRUE));
 #endif
 
-  lives_box_pack_start (parent, expander, FALSE, FALSE, widget_opts.packing_height);
+  lives_box_pack_start(parent, expander, FALSE, FALSE, widget_opts.packing_height);
 
-  lives_container_add (LIVES_CONTAINER (expander), child);
+  lives_container_add(LIVES_CONTAINER(expander), child);
+#endif
 
   return expander;
 }
@@ -6592,35 +7699,48 @@
 
 LIVES_INLINE LiVESWidget *lives_standard_file_button_new(boolean is_dir, const char *def_dir) {
   LiVESWidget *fbutton=NULL;
+  LiVESWidget *image = lives_image_new_from_stock("gtk-open", LIVES_ICON_SIZE_BUTTON);
+  fbutton = lives_button_new();
+  lives_widget_object_set_data(LIVES_WIDGET_OBJECT(fbutton),"is_dir",LIVES_INT_TO_POINTER(is_dir));
+  if (def_dir!=NULL) lives_widget_object_set_data(LIVES_WIDGET_OBJECT(fbutton),"def_dir",(livespointer)def_dir);
+  lives_container_add(LIVES_CONTAINER(fbutton), image);
+  return fbutton;
+}
+
+
+LIVES_INLINE LiVESXCursor *lives_cursor_new_from_pixbuf(LiVESXDisplay *disp, LiVESPixbuf *pixbuf, int x, int y) {
+  LiVESXCursor *cursor=NULL;
 #ifdef GUI_GTK
-  LiVESWidget *image = lives_image_new_from_stock ("gtk-open", LIVES_ICON_SIZE_BUTTON);
-  fbutton = lives_button_new ();
-  g_object_set_data(G_OBJECT(fbutton),"is_dir",GINT_TO_POINTER(is_dir));
-  if (def_dir!=NULL) g_object_set_data(G_OBJECT(fbutton),"def_dir",(livespointer)def_dir);
-  lives_container_add (LIVES_CONTAINER (fbutton), image);
+  cursor=gdk_cursor_new_from_pixbuf(disp,pixbuf,x,y);
 #endif
-  return fbutton;
+#ifdef GUI_QT
+  QPixmap qpx;
+  qpx.convertFromImage(*pixbuf);
+  cursor = new QCursor(qpx, x, y);
+#endif
+  return cursor;
 }
 
 
+
 // utils
 
 void widget_helper_init(void) {
 #if GTK_CHECK_VERSION(3,10,0) || defined GUI_QT
-  g_snprintf(LIVES_STOCK_LABEL_CANCEL,32,"%s",(_("_Cancel")));
-  g_snprintf(LIVES_STOCK_LABEL_OK,32,"%s",(_("_OK")));
-  g_snprintf(LIVES_STOCK_LABEL_YES,32,"%s",(_("_Yes")));
-  g_snprintf(LIVES_STOCK_LABEL_NO,32,"%s",(_("_No")));
-  g_snprintf(LIVES_STOCK_LABEL_SAVE,32,"%s",(_("_Save")));
-  g_snprintf(LIVES_STOCK_LABEL_SAVE_AS,32,"%s",(_("Save _As")));
-  g_snprintf(LIVES_STOCK_LABEL_OPEN,32,"%s",(_("_Open")));
-  g_snprintf(LIVES_STOCK_LABEL_QUIT,32,"%s",(_("_Quit")));
-  g_snprintf(LIVES_STOCK_LABEL_APPLY,32,"%s",(_("_Apply")));
-  g_snprintf(LIVES_STOCK_LABEL_CLOSE,32,"%s",(_("_Close")));
-  g_snprintf(LIVES_STOCK_LABEL_REVERT,32,"%s",(_("_Revert")));
-  g_snprintf(LIVES_STOCK_LABEL_REFRESH,32,"%s",(_("_Refresh")));
-  g_snprintf(LIVES_STOCK_LABEL_DELETE,32,"%s",(_("_Delete")));
-  g_snprintf(LIVES_STOCK_LABEL_GO_FORWARD,32,"%s",(_("_Forward")));
+  lives_snprintf(LIVES_STOCK_LABEL_CANCEL,32,"%s",(_("_Cancel")));
+  lives_snprintf(LIVES_STOCK_LABEL_OK,32,"%s",(_("_OK")));
+  lives_snprintf(LIVES_STOCK_LABEL_YES,32,"%s",(_("_Yes")));
+  lives_snprintf(LIVES_STOCK_LABEL_NO,32,"%s",(_("_No")));
+  lives_snprintf(LIVES_STOCK_LABEL_SAVE,32,"%s",(_("_Save")));
+  lives_snprintf(LIVES_STOCK_LABEL_SAVE_AS,32,"%s",(_("Save _As")));
+  lives_snprintf(LIVES_STOCK_LABEL_OPEN,32,"%s",(_("_Open")));
+  lives_snprintf(LIVES_STOCK_LABEL_QUIT,32,"%s",(_("_Quit")));
+  lives_snprintf(LIVES_STOCK_LABEL_APPLY,32,"%s",(_("_Apply")));
+  lives_snprintf(LIVES_STOCK_LABEL_CLOSE,32,"%s",(_("_Close")));
+  lives_snprintf(LIVES_STOCK_LABEL_REVERT,32,"%s",(_("_Revert")));
+  lives_snprintf(LIVES_STOCK_LABEL_REFRESH,32,"%s",(_("_Refresh")));
+  lives_snprintf(LIVES_STOCK_LABEL_DELETE,32,"%s",(_("_Delete")));
+  lives_snprintf(LIVES_STOCK_LABEL_GO_FORWARD,32,"%s",(_("_Forward")));
 #endif
 
   widget_opts = def_widget_opts;
@@ -6660,6 +7780,9 @@
   gdk_cursor_unref(cursor);
 #endif
 #endif
+#ifdef GUI_QT
+  delete cursor;
+#endif
 }
 
 
@@ -6680,25 +7803,35 @@
 #ifdef GUI_GTK
   GtkListStore *store;
   LiVESEntryCompletion *completion;
-  store = gtk_list_store_new (1, G_TYPE_STRING);
+  store = gtk_list_store_new(1, LIVES_COL_TYPE_STRING);
 
   while (xlist != NULL) {
     LiVESTreeIter iter;
-    gtk_list_store_append (store, &iter);
-    gtk_list_store_set (store, &iter, 0, (gchar *)xlist->data, -1);
+    gtk_list_store_append(store, &iter);
+    gtk_list_store_set(store, &iter, 0, (char *)xlist->data, -1);
     xlist=xlist->next;
   }
-    
-  completion = gtk_entry_completion_new ();
-  gtk_entry_completion_set_model (completion, (GtkTreeModel *)store);
-  gtk_entry_completion_set_text_column (completion, 0);
-  gtk_entry_completion_set_inline_completion (completion, TRUE);
-  gtk_entry_completion_set_popup_set_width (completion, TRUE);
-  gtk_entry_completion_set_popup_completion (completion, TRUE);
+
+  completion = gtk_entry_completion_new();
+  gtk_entry_completion_set_model(completion, (GtkTreeModel *)store);
+  gtk_entry_completion_set_text_column(completion, 0);
+  gtk_entry_completion_set_inline_completion(completion, TRUE);
+  gtk_entry_completion_set_popup_set_width(completion, TRUE);
+  gtk_entry_completion_set_popup_completion(completion, TRUE);
   gtk_entry_completion_set_popup_single_match(completion,FALSE);
-  gtk_entry_set_completion (entry, completion);
+  gtk_entry_set_completion(entry, completion);
   return TRUE;
 #endif
+#ifdef GUI_QT
+  QStringList qsl;
+  for (int i = 0; xlist != NULL; i++) {
+    qsl.append((QString::fromUtf8((const char *)xlist->data)));
+    xlist = xlist->next;
+  }
+  QCompleter *qcmp = new QCompleter(qsl);
+  QLineEdit *qe = static_cast<QLineEdit *>(entry);
+  qe->setCompleter(qcmp);
+#endif
   return FALSE;
 }
 
@@ -6710,12 +7843,11 @@
       lives_window_set_screen(LIVES_WINDOW(window),mainw->mgeom[prefs->gui_monitor-1].screen);
 
       xcen=mainw->mgeom[prefs->gui_monitor-1].x+(mainw->mgeom[prefs->gui_monitor-1].width-
-						 lives_widget_get_allocation_width(LIVES_WIDGET(window)))/2;
+           lives_widget_get_allocation_width(LIVES_WIDGET(window)))/2;
       ycen=mainw->mgeom[prefs->gui_monitor-1].y+(mainw->mgeom[prefs->gui_monitor-1].height-
-						 lives_widget_get_allocation_height(LIVES_WIDGET(window)))/2;
+           lives_widget_get_allocation_height(LIVES_WIDGET(window)))/2;
       lives_window_move(LIVES_WINDOW(window),xcen,ycen);
-    }
-    else lives_window_set_position(LIVES_WINDOW(window),LIVES_WIN_POS_CENTER_ALWAYS);
+    } else lives_window_set_position(LIVES_WINDOW(window),LIVES_WIN_POS_CENTER_ALWAYS);
   }
 }
 
@@ -6733,19 +7865,19 @@
   lives_container_remove(LIVES_CONTAINER(lives_widget_get_parent(widget)),widget);
 }
 
-boolean label_act_toggle (LiVESWidget *widget, LiVESXEventButton *event, LiVESToggleButton *togglebutton) {
+boolean label_act_toggle(LiVESWidget *widget, LiVESXEventButton *event, LiVESToggleButton *togglebutton) {
   if (!lives_widget_is_sensitive(LIVES_WIDGET(togglebutton))) return FALSE;
-  lives_toggle_button_set_active (togglebutton, !lives_toggle_button_get_active(togglebutton));
+  lives_toggle_button_set_active(togglebutton, !lives_toggle_button_get_active(togglebutton));
   return FALSE;
 }
 
-boolean widget_act_toggle (LiVESWidget *widget, LiVESToggleButton *togglebutton) {
+boolean widget_act_toggle(LiVESWidget *widget, LiVESToggleButton *togglebutton) {
   if (!lives_widget_is_sensitive(LIVES_WIDGET(togglebutton))) return FALSE;
-  lives_toggle_button_set_active (togglebutton, TRUE);
+  lives_toggle_button_set_active(togglebutton, TRUE);
   return FALSE;
 }
 
-LIVES_INLINE void toggle_button_toggle (LiVESToggleButton *tbutton) {
+LIVES_INLINE void toggle_button_toggle(LiVESToggleButton *tbutton) {
   if (lives_toggle_button_get_active(tbutton)) lives_toggle_button_set_active(tbutton,FALSE);
   else lives_toggle_button_set_active(tbutton,FALSE);
 }
@@ -6772,7 +7904,7 @@
 
 char *lives_text_view_get_text(LiVESTextView *textview) {
   LiVESTextIter siter,eiter;
-  LiVESTextBuffer *textbuf=lives_text_view_get_buffer (textview);
+  LiVESTextBuffer *textbuf=lives_text_view_get_buffer(textview);
   lives_text_buffer_get_start_iter(textbuf,&siter);
   lives_text_buffer_get_end_iter(textbuf,&eiter);
 
@@ -6780,20 +7912,20 @@
 }
 
 
-boolean lives_text_view_set_text(LiVESTextView *textview, const gchar *text, int len) {
-  LiVESTextBuffer *textbuf=lives_text_view_get_buffer (textview);
+boolean lives_text_view_set_text(LiVESTextView *textview, const char *text, int len) {
+  LiVESTextBuffer *textbuf=lives_text_view_get_buffer(textview);
   if (textbuf!=NULL)
     return lives_text_buffer_set_text(textbuf,text,len);
   return FALSE;
 }
 
 
- 
+
 boolean lives_text_buffer_insert_at_end(LiVESTextBuffer *tbuff, const char *text) {
- LiVESTextIter xiter;
- if (lives_text_buffer_get_end_iter(tbuff,&xiter))
-   return lives_text_buffer_insert(tbuff,&xiter,text,-1);
- return FALSE;
+  LiVESTextIter xiter;
+  if (lives_text_buffer_get_end_iter(tbuff,&xiter))
+    return lives_text_buffer_insert(tbuff,&xiter,text,-1);
+  return FALSE;
 }
 
 
@@ -6803,13 +7935,13 @@
   LiVESTextMark *mark;
   LiVESTextBuffer *tbuf;
 
-  tbuf=lives_text_view_get_buffer (tview);
+  tbuf=lives_text_view_get_buffer(tview);
   if (tbuf!=NULL) {
     lives_text_buffer_get_end_iter(tbuf,&iter);
     mark=lives_text_buffer_create_mark(tbuf,NULL,&iter,FALSE);
     if (mark!=NULL) {
-      if (lives_text_view_scroll_mark_onscreen(tview,mark)) 
-	return lives_text_buffer_delete_mark (tbuf,mark);
+      if (lives_text_view_scroll_mark_onscreen(tview,mark))
+        return lives_text_buffer_delete_mark(tbuf,mark);
     }
   }
   return FALSE;
@@ -6818,49 +7950,54 @@
 
 
 
-int get_box_child_index (LiVESBox *box, LiVESWidget *tchild) {
-  LiVESList *list=lives_container_get_children(LIVES_CONTAINER(box)),*olist=list;
+int get_box_child_index(LiVESBox *box, LiVESWidget *tchild) {
+  LiVESList *list=lives_container_get_children(LIVES_CONTAINER(box)), *olist=list;
   LiVESWidget *child;
   register int i=0;
 
-  while (list!=NULL) {
+  for (i=0; list != NULL; i++) {
     child=(LiVESWidget *)list->data;
     if (child==tchild) {
-      g_list_free(olist);
+      lives_list_free(olist);
       return i;
     }
-    list=list->next;
-    i++;
+    list = list->next;
   }
 
-  if (olist!=NULL) g_list_free(olist);
-
+  if (olist!=NULL) lives_list_free(olist);
 
   return -1;
 }
 
 
 void lives_spin_button_configure(LiVESSpinButton *spinbutton,
-				 double value,
-				 double lower,
-				 double upper,
-				 double step_increment,
-				 double page_increment) {
+                                 double value,
+                                 double lower,
+                                 double upper,
+                                 double step_increment,
+                                 double page_increment) {
+  LiVESAdjustment *adj=lives_spin_button_get_adjustment(spinbutton);
+
 #ifdef GUI_GTK
-  GtkAdjustment *adjustment=gtk_spin_button_get_adjustment(spinbutton);
 #if GTK_CHECK_VERSION(2,14,0)
-  gtk_adjustment_configure(adjustment,value,lower,upper,step_increment,page_increment,0.);
+  gtk_adjustment_configure(adj,value,lower,upper,step_increment,page_increment,0.);
 #else
-  g_object_freeze_notify (G_OBJECT(adjustment));
-  adjustment->upper=upper;
-  adjustment->lower=lower;
-  adjustment->value=value;
-  adjustment->step_increment=step_increment;
-  adjustment->page_increment=page_increment;
-  g_object_thaw_notify (G_OBJECT(adjustment));
+  g_object_freeze_notify(LIVES_WIDGET_OBJECT(adj));
+  adj->upper=upper;
+  adj->lower=lower;
+  adj->value=value;
+  adj->step_increment=step_increment;
+  adj->page_increment=page_increment;
+  g_object_thaw_notify(LIVES_WIDGET_OBJECT(adj));
 #endif
 #endif
-
+#ifdef GUI_QT
+  adj->set_lower(lower);
+  adj->set_upper(upper);
+  adj->set_value(value);
+  adj->set_step_increment(step_increment);
+  adj->set_page_increment(page_increment);
+#endif
 }
 
 
@@ -6876,9 +8013,15 @@
   if (pthread_mutex_trylock(&mainw->gtk_mutex)) return FALSE;
 
   if (mainw->multitrack!=NULL&&mainw->multitrack->idlefunc>0) {
+
 #ifdef GUI_GTK
-    g_source_remove(mainw->multitrack->idlefunc);
+    lives_source_remove(mainw->multitrack->idlefunc);
+#endif
+
+#ifdef GUI_QT
+    lives_timer_remove(mainw->multitrack->idlefunc);
 #endif
+
     mainw->multitrack->idlefunc=0;
     mt_needs_idlefunc=TRUE;
   }
@@ -6889,15 +8032,15 @@
       ce_thumbs_set_key_check_state();
       ce_thumbs_apply_liberation();
       if (mainw->ce_upd_clip) {
-	ce_thumbs_highlight_current_clip();
-	mainw->ce_upd_clip=FALSE;
+        ce_thumbs_highlight_current_clip();
+        mainw->ce_upd_clip=FALSE;
       }
     }
 #ifdef GUI_GTK
     while (!mainw->is_exiting&&g_main_context_iteration(NULL,FALSE));
 #endif
 #ifdef GUI_QT
-    coreApp->processEvents();
+    QCoreApplication::processEvents();
 #endif
   }
 
@@ -6911,10 +8054,10 @@
 
 
 LiVESWidget *lives_menu_add_separator(LiVESMenu *menu) {
-  LiVESWidget *separatormenuitem = lives_menu_item_new ();
+  LiVESWidget *separatormenuitem = lives_menu_item_new();
   if (separatormenuitem!=NULL) {
-    lives_container_add (LIVES_CONTAINER (menu), separatormenuitem);
-    lives_widget_set_sensitive (separatormenuitem, FALSE);
+    lives_container_add(LIVES_CONTAINER(menu), separatormenuitem);
+    lives_widget_set_sensitive(separatormenuitem, FALSE);
   }
   return separatormenuitem;
 }
@@ -6928,6 +8071,9 @@
   return gdk_display_get_n_screens(disp);
 #endif
 #endif
+#ifdef GUI_QT
+  return QApplication::desktop()->screenCount();
+#endif
   return 1;
 }
 
@@ -6943,18 +8089,15 @@
     if (mainw->multitrack==NULL&&mainw->is_ready) {
       if (cstyle!=LIVES_CURSOR_NORMAL&&mainw->cursor_style==cstyle) return;
       window=lives_widget_get_xwindow(mainw->LiVES);
-    }
-    else if (mainw->multitrack!=NULL&&mainw->multitrack->is_ready) {
+    } else if (mainw->multitrack!=NULL&&mainw->multitrack->is_ready) {
       if (cstyle!=LIVES_CURSOR_NORMAL&&mainw->multitrack->cursor_style==cstyle) return;
       window=lives_widget_get_xwindow(mainw->multitrack->window);
-    }
-    else return;
-  }
-  else window=lives_widget_get_xwindow(widget);
+    } else return;
+  } else window=lives_widget_get_xwindow(widget);
 
-  if (!GDK_IS_WINDOW(window)) return;
+  if (!LIVES_IS_XWINDOW(window)) return;
 
-  switch(cstyle) {
+  switch (cstyle) {
   case LIVES_CURSOR_NORMAL:
     break;
   case LIVES_CURSOR_BUSY:
@@ -6993,11 +8136,53 @@
   disp=mainw->mgeom[prefs->gui_monitor>0?prefs->gui_monitor-1:0].disp;
   if (cstyle!=LIVES_CURSOR_NORMAL) {
     cursor=gdk_cursor_new_for_display(disp,ctype);
-    gdk_window_set_cursor (window, cursor);
-  }
-  else gdk_window_set_cursor(window,NULL);
+    gdk_window_set_cursor(window, cursor);
+  } else gdk_window_set_cursor(window,NULL);
   if (cursor!=NULL) lives_cursor_unref(cursor);
 #endif
+
+#ifdef GUI_QT
+  if (widget==NULL) {
+    if (mainw->multitrack==NULL&&mainw->is_ready) {
+      if (cstyle!=LIVES_CURSOR_NORMAL&&mainw->cursor_style==cstyle) return;
+      widget = mainw->LiVES;
+    } else if (mainw->multitrack!=NULL&&mainw->multitrack->is_ready) {
+      if (cstyle!=LIVES_CURSOR_NORMAL&&mainw->multitrack->cursor_style==cstyle) return;
+      widget = mainw->multitrack->window;
+    } else return;
+  }
+
+  switch (cstyle) {
+  case LIVES_CURSOR_NORMAL:
+    widget->setCursor(Qt::ArrowCursor);
+    break;
+  case LIVES_CURSOR_BUSY:
+    widget->setCursor(Qt::WaitCursor);
+    break;
+  case LIVES_CURSOR_CENTER_PTR:
+    widget->setCursor(Qt::UpArrowCursor);
+    break;
+  case LIVES_CURSOR_HAND2:
+    widget->setCursor(Qt::PointingHandCursor);
+    break;
+  case LIVES_CURSOR_SB_H_DOUBLE_ARROW:
+    widget->setCursor(Qt::SizeHorCursor);
+    break;
+  case LIVES_CURSOR_CROSSHAIR:
+    widget->setCursor(Qt::CrossCursor);
+    break;
+  case LIVES_CURSOR_TOP_LEFT_CORNER:
+    widget->setCursor(Qt::SizeFDiagCursor);
+    break;
+  case LIVES_CURSOR_BOTTOM_RIGHT_CORNER:
+    widget->setCursor(Qt::SizeBDiagCursor);
+    break;
+  default:
+    return;
+  }
+#endif
+
+
 }
 
 
@@ -7023,16 +8208,19 @@
   GdkColor bg = { 0, 0, 0, 0 };
 
   if (hidden_cursor==NULL) {
-    source = gdk_bitmap_create_from_data (NULL, cursor_bits,
-					  1, 1);
-    mask = gdk_bitmap_create_from_data (NULL, cursormask_bits,
-					1, 1);
-    hidden_cursor = gdk_cursor_new_from_pixmap (source, mask, &fg, &bg, 0, 0);
-    g_object_unref (source);
-    g_object_unref (mask);
+    source = gdk_bitmap_create_from_data(NULL, cursor_bits,
+                                         1, 1);
+    mask = gdk_bitmap_create_from_data(NULL, cursormask_bits,
+                                       1, 1);
+    hidden_cursor = gdk_cursor_new_from_pixmap(source, mask, &fg, &bg, 0, 0);
+    g_object_unref(source);
+    g_object_unref(mask);
   }
-  if (GDK_IS_WINDOW(window)) gdk_window_set_cursor (window, hidden_cursor);
-#endif 
+  if (GDK_IS_WINDOW(window)) gdk_window_set_cursor(window, hidden_cursor);
+#endif
+#endif
+#ifdef GUI_QT
+  window->setCursor(Qt::BlankCursor);
 #endif
 }
 
@@ -7042,15 +8230,22 @@
 }
 
 
-void get_border_size (LiVESWidget *win, int *bx, int *by) {
+void get_border_size(LiVESWidget *win, int *bx, int *by) {
 #ifdef GUI_GTK
   GdkRectangle rect;
   gint wx,wy;
-  gdk_window_get_frame_extents (lives_widget_get_xwindow (win),&rect);
-  gdk_window_get_origin (lives_widget_get_xwindow (win), &wx, &wy);
+  gdk_window_get_frame_extents(lives_widget_get_xwindow(win),&rect);
+  gdk_window_get_origin(lives_widget_get_xwindow(win), &wx, &wy);
   *bx=wx-rect.x;
   *by=wy-rect.y;
 #endif
+#ifdef GUI_QT
+  win->winId();
+  QWindow *qwindow = win->windowHandle();
+  QMargins qm = qwindow->frameMargins();
+  *bx = qm.left() + qm.right();
+  *by = qm.top() + qm.bottom();
+#endif
 }
 
 
@@ -7075,19 +8270,19 @@
 
 
 
-void lives_general_button_clicked (LiVESButton *button, livespointer data_to_free) {
+void lives_general_button_clicked(LiVESButton *button, livespointer data_to_free) {
   // destroy the button top-level and free data
   lives_widget_destroy(lives_widget_get_toplevel(LIVES_WIDGET(button)));
   lives_widget_context_update();
 
-  if (data_to_free!=NULL) g_free(data_to_free);
+  if (data_to_free!=NULL) lives_free(data_to_free);
 }
 
 
-LiVESWidget *add_hsep_to_box (LiVESBox *box) {
-  LiVESWidget *hseparator = lives_hseparator_new ();
-  lives_box_pack_start (box, hseparator, FALSE, FALSE, widget_opts.packing_width>>1);
-  if (!widget_opts.no_gui) 
+LiVESWidget *add_hsep_to_box(LiVESBox *box) {
+  LiVESWidget *hseparator = lives_hseparator_new();
+  lives_box_pack_start(box, hseparator, FALSE, FALSE, widget_opts.packing_width>>1);
+  if (!widget_opts.no_gui)
     lives_widget_show(hseparator);
   if (widget_opts.apply_theme) {
     lives_widget_apply_theme(hseparator, LIVES_WIDGET_STATE_NORMAL);
@@ -7096,10 +8291,10 @@
 }
 
 
-LiVESWidget *add_vsep_to_box (LiVESBox *box) {
-  LiVESWidget *vseparator = lives_vseparator_new ();
-  lives_box_pack_start (box, vseparator, FALSE, FALSE, widget_opts.packing_height>>1);
-  if (!widget_opts.no_gui) 
+LiVESWidget *add_vsep_to_box(LiVESBox *box) {
+  LiVESWidget *vseparator = lives_vseparator_new();
+  lives_box_pack_start(box, vseparator, FALSE, FALSE, widget_opts.packing_height>>1);
+  if (!widget_opts.no_gui)
     lives_widget_show(vseparator);
   if (widget_opts.apply_theme) {
     lives_widget_apply_theme(vseparator, LIVES_WIDGET_STATE_NORMAL);
@@ -7111,7 +8306,7 @@
 static char spaces[W_MAX_FILLER_LEN+1];
 static boolean spaces_inited=FALSE;
 
-LiVESWidget *add_fill_to_box (LiVESBox *box) {
+LiVESWidget *add_fill_to_box(LiVESBox *box) {
   LiVESWidget *widget=NULL;
 
   LiVESWidget *blank_label;
@@ -7120,24 +8315,24 @@
 
   if (!spaces_inited) {
     register int i;
-    for (i=0;i<W_MAX_FILLER_LEN;i++) {
-      g_snprintf(spaces+i,1," ");
+    for (i=0; i<W_MAX_FILLER_LEN; i++) {
+      lives_snprintf(spaces+i,1," ");
     }
   }
 
   if (widget_opts.filler_len>W_MAX_FILLER_LEN||widget_opts.filler_len<0) return NULL;
 
   if (widget_opts.filler_len!=old_spaces) {
-    if (xspaces!=NULL) g_free(xspaces);
-    xspaces=g_strndup(spaces,widget_opts.filler_len);
+    if (xspaces!=NULL) lives_free(xspaces);
+    xspaces=lives_strndup(spaces,widget_opts.filler_len);
     old_spaces=widget_opts.filler_len;
   }
 
-  blank_label = lives_standard_label_new (xspaces);
+  blank_label = lives_standard_label_new(xspaces);
 
-  lives_box_pack_start (box, blank_label, TRUE, TRUE, 0);
+  lives_box_pack_start(box, blank_label, TRUE, TRUE, 0);
   lives_widget_set_hexpand(blank_label,TRUE);
-  if (!widget_opts.no_gui) 
+  if (!widget_opts.no_gui)
     lives_widget_show(blank_label);
   widget=blank_label;
 
@@ -7146,7 +8341,7 @@
 
 
 LIVES_INLINE boolean lives_button_box_set_button_width(LiVESButtonBox *bbox, LiVESWidget *button, int min_width) {
-  lives_button_box_set_layout (bbox, LIVES_BUTTONBOX_SPREAD);
+  lives_button_box_set_layout(bbox, LIVES_BUTTONBOX_SPREAD);
 #ifdef GUI_GTK
 #if !GTK_CHECK_VERSION(3,0,0)
   gtk_button_box_set_child_size(bbox,min_width/4,-1);
@@ -7155,6 +8350,9 @@
 #endif
   lives_widget_set_size_request(button,min_width,-1);
   return TRUE;
+#ifdef GUI_QT
+  button->setMinimumWidth(min_width);
+#endif
 }

LiVES-2.2.8.tar.bz2/src/widget-helper.h -> LiVES-2.4.1.tar.bz2/src/widget-helper.h Changed

@@ -7,6 +7,7 @@
 #ifndef HAS_LIVES_WIDGET_HELPER_H
 #define HAS_LIVES_WIDGET_HELPER_H
 
+
 #ifndef M_PI
 #define M_PI 3.1415926536
 #endif
@@ -32,24 +33,19 @@
 #include "widget-helper-gtk.h"
 #endif
 
-#if defined (GUI_QT) || defined (PAINTER_QPAINTER)
-#include "widget-helper-qt.h"
-#endif
-
-
 // basic functions (wrappers for Toolkit functions)
 
 // lives_painter_functions
 
 lives_painter_t *lives_painter_create(lives_painter_surface_t *target);
 lives_painter_t *lives_painter_create_from_widget(LiVESWidget *);
-boolean lives_painter_set_source_pixbuf (lives_painter_t *, const LiVESPixbuf *, double pixbuf_x, double pixbuf_y);
-boolean lives_painter_set_source_surface (lives_painter_t *, lives_painter_surface_t *, double x, double y);
+boolean lives_painter_set_source_pixbuf(lives_painter_t *, const LiVESPixbuf *, double pixbuf_x, double pixbuf_y);
+boolean lives_painter_set_source_surface(lives_painter_t *, lives_painter_surface_t *, double x, double y);
 lives_painter_surface_t *lives_painter_image_surface_create(lives_painter_format_t format, int width, int height);
-lives_painter_surface_t *lives_painter_image_surface_create_for_data(uint8_t *data, lives_painter_format_t, 
-								     int width, int height, int stride);
-lives_painter_surface_t *lives_painter_surface_create_from_widget(LiVESWidget *, lives_painter_content_t, 
-								  int width, int height);
+lives_painter_surface_t *lives_painter_image_surface_create_for_data(uint8_t *data, lives_painter_format_t,
+    int width, int height, int stride);
+lives_painter_surface_t *lives_painter_surface_create_from_widget(LiVESWidget *, lives_painter_content_t,
+    int width, int height);
 boolean lives_painter_surface_flush(lives_painter_surface_t *);
 
 boolean lives_painter_destroy(lives_painter_t *);
@@ -121,30 +117,36 @@
 unsigned char *lives_pixbuf_get_pixels(const LiVESPixbuf *);
 const unsigned char *lives_pixbuf_get_pixels_readonly(const LiVESPixbuf *);
 LiVESPixbuf *lives_pixbuf_new(boolean has_alpha, int width, int height);
-LiVESPixbuf *lives_pixbuf_new_from_data (const unsigned char *buf, boolean has_alpha, int width, int height, 
-					 int rowstride, LiVESPixbufDestroyNotify lives_free_buffer_fn, 
-					 gpointer destroy_fn_data);
+LiVESPixbuf *lives_pixbuf_new_from_data(const unsigned char *buf, boolean has_alpha, int width, int height,
+                                        int rowstride, LiVESPixbufDestroyNotify lives_free_buffer_fn,
+                                        livespointer destroy_fn_data);
 
 LiVESPixbuf *lives_pixbuf_new_from_file(const char *filename, LiVESError **error);
 LiVESWidget *lives_image_new_from_pixbuf(LiVESPixbuf *);
 LiVESPixbuf *lives_pixbuf_new_from_file_at_scale(const char *filename, int width, int height, boolean preserve_aspect_ratio,
-						 LiVESError **error);
+    LiVESError **error);
 
 
-LiVESPixbuf *lives_pixbuf_scale_simple(const LiVESPixbuf *src, int dest_width, int dest_height, 
-				       LiVESInterpType interp_type);
+LiVESPixbuf *lives_pixbuf_scale_simple(const LiVESPixbuf *src, int dest_width, int dest_height,
+                                       LiVESInterpType interp_type);
 
 boolean lives_pixbuf_saturate_and_pixelate(const LiVESPixbuf *src, LiVESPixbuf *dest, float saturation, boolean pixilate);
 
 // basic widget fns (TODO - amend all void to return boolean)
 
+boolean lives_mem_set_vtable(LiVESMemVTable *alt_vtable);
+
+
 #ifdef GUI_GTK
+
 #define lives_signal_connect(instance, detailed_signal, c_handler, data) g_signal_connect(instance, detailed_signal, c_handler, data)
 #define lives_signal_connect_after(instance, detailed_signal, c_handler, data) g_signal_connect_after(instance, detailed_signal, c_handler, data)
 #define lives_signal_handlers_block_by_func(instance, func, data) g_signal_handlers_block_by_func(instance, func, data)
 #define lives_signal_handlers_unblock_by_func(instance, func, data) g_signal_handlers_unblock_by_func(instance, func, data)
 #else
-ulong lives_signal_connect(LiVESWidget *widget, const char *signal_name, ulong funcptr, gpointer data);
+ulong lives_signal_connect(LiVESWidget *widget, const char *signal_name, ulong funcptr, livespointer data);
+boolean lives_signal_handlers_block_by_func(livespointer instance, livespointer func, livespointer data);
+boolean lives_signal_handlers_unblock_by_func(livespointer instance, livespointer func, livespointer data);
 #endif
 
 boolean lives_signal_handler_block(livespointer instance, unsigned long handler_id);
@@ -153,6 +155,7 @@
 boolean lives_signal_handler_disconnect(livespointer instance, unsigned long handler_id);
 boolean lives_signal_stop_emission_by_name(livespointer instance, const char *detailed_signal);
 
+
 boolean lives_widget_set_sensitive(LiVESWidget *, boolean state);
 boolean lives_widget_get_sensitive(LiVESWidget *);
 
@@ -171,6 +174,7 @@
 boolean lives_widget_set_app_paintable(LiVESWidget *widget, boolean paintable);
 
 LiVESWidget *lives_event_box_new(void);
+boolean lives_event_box_set_above_child(LiVESEventBox *ebox, boolean set);
 
 LiVESWidget *lives_label_new(const char *text);
 LiVESWidget *lives_label_new_with_mnemonic(const char *text);
@@ -208,6 +212,7 @@
 LiVESWidget *lives_spin_button_new(LiVESAdjustment *, double climb_rate, uint32_t digits);
 
 LiVESResponseType lives_dialog_run(LiVESDialog *);
+boolean lives_dialog_response(LiVESDialog *, int response);
 
 boolean lives_widget_set_bg_color(LiVESWidget *, LiVESWidgetState state, const LiVESWidgetColor *);
 boolean lives_widget_set_fg_color(LiVESWidget *, LiVESWidgetState state, const LiVESWidgetColor *);
@@ -250,6 +255,8 @@
 
 boolean lives_window_set_screen(LiVESWindow *, LiVESXScreen *);
 
+boolean lives_widget_get_position(LiVESWidget *, int *x, int *y);
+
 boolean lives_window_move(LiVESWindow *, int x, int y);
 boolean lives_window_get_position(LiVESWindow *, int *x, int *y);
 boolean lives_window_set_position(LiVESWindow *, LiVESWindowPosition pos);
@@ -267,8 +274,8 @@
 
 boolean lives_window_has_toplevel_focus(LiVESWindow *);
 
-LiVESAdjustment *lives_adjustment_new(double value, double lower, double upper, 
-						   double step_increment, double page_increment, double page_size);
+LiVESAdjustment *lives_adjustment_new(double value, double lower, double upper,
+                                      double step_increment, double page_increment, double page_size);
 
 boolean lives_box_reorder_child(LiVESBox *, LiVESWidget *child, int pos);
 boolean lives_box_set_homogeneous(LiVESBox *, boolean homogeneous);
@@ -295,6 +302,9 @@
 LiVESWidget *lives_hpaned_new(void);
 LiVESWidget *lives_vpaned_new(void);
 
+boolean lives_paned_set_position(LiVESPaned *, int pos);
+boolean lives_paned_pack(int where, LiVESPaned *, LiVESWidget *child, boolean resize, boolean shrink);
+
 LiVESWidget *lives_hscrollbar_new(LiVESAdjustment *);
 LiVESWidget *lives_vscrollbar_new(LiVESAdjustment *);
 
@@ -310,7 +320,7 @@
 boolean lives_label_set_halignment(LiVESLabel *, float yalign);
 
 LiVESWidget *lives_combo_new(void);
-LiVESWidget *lives_combo_new_with_model (LiVESTreeModel *);
+LiVESWidget *lives_combo_new_with_model(LiVESTreeModel *);
 LiVESTreeModel *lives_combo_get_model(LiVESCombo *);
 
 boolean lives_combo_append_text(LiVESCombo *, const char *text);
@@ -353,8 +363,8 @@
 
 boolean lives_text_buffer_place_cursor(LiVESTextBuffer *, LiVESTextIter *);
 
-LiVESTextMark *lives_text_buffer_create_mark(LiVESTextBuffer *, const char *mark_name, 
-					     const LiVESTextIter *where, boolean left_gravity);
+LiVESTextMark *lives_text_buffer_create_mark(LiVESTextBuffer *, const char *mark_name,
+    const LiVESTextIter *where, boolean left_gravity);
 boolean lives_text_buffer_delete_mark(LiVESTextBuffer *, LiVESTextMark *);
 
 boolean lives_text_buffer_delete(LiVESTextBuffer *, LiVESTextIter *start, LiVESTextIter *end);
@@ -397,18 +407,26 @@
 boolean lives_tree_selection_set_mode(LiVESTreeSelection *, LiVESSelectionMode);
 boolean lives_tree_selection_select_iter(LiVESTreeSelection *, LiVESTreeIter *);
 
+LiVESListStore *lives_list_store_new(int ncols, ...);
+boolean lives_list_store_set(LiVESListStore *, LiVESTreeIter *, ...);
+boolean lives_list_store_insert(LiVESListStore *, LiVESTreeIter *, int position);
+
 LiVESCellRenderer *lives_cell_renderer_text_new(void);
 LiVESCellRenderer *lives_cell_renderer_spin_new(void);
 LiVESCellRenderer *lives_cell_renderer_toggle_new(void);
 LiVESCellRenderer *lives_cell_renderer_pixbuf_new(void);
 
+LiVESWidget *lives_drawing_area_new(void);
+
+int lives_event_get_time(LiVESXEvent *);
 
 boolean lives_toggle_button_get_active(LiVESToggleButton *);
 boolean lives_toggle_button_set_active(LiVESToggleButton *, boolean active);
+boolean lives_toggle_button_set_mode(LiVESToggleButton *, boolean drawind);
 
 boolean lives_has_icon(const char *stock_id, LiVESIconSize size);
 
-void lives_tooltips_set (LiVESWidget *, const char *tip_text);
+void lives_tooltips_set(LiVESWidget *, const char *tip_text);
 
 LiVESSList *lives_radio_button_get_group(LiVESRadioButton *);
 LiVESSList *lives_radio_menu_item_get_group(LiVESRadioMenuItem *);
@@ -417,6 +435,7 @@
 LiVESWidget *lives_widget_get_toplevel(LiVESWidget *);
 
 LiVESXWindow *lives_widget_get_xwindow(LiVESWidget *);
+boolean lives_xwindow_set_keep_above(LiVESXWindow *, boolean setting);
 
 boolean lives_widget_set_can_focus(LiVESWidget *, boolean state);
 boolean lives_widget_set_can_default(LiVESWidget *, boolean state);
@@ -461,10 +480,14 @@
 boolean lives_color_button_set_use_alpha(LiVESColorButton *, boolean use_alpha);
 
 LiVESToolItem *lives_tool_button_new(LiVESWidget *icon_widget, const char *label);
+LiVESToolItem *lives_tool_item_new(void);
 boolean lives_tool_button_set_icon_widget(LiVESToolButton *, LiVESWidget *icon);
 boolean lives_tool_button_set_label_widget(LiVESToolButton *, LiVESWidget *label);
 boolean lives_tool_button_set_use_underline(LiVESToolButton *, boolean use_underline);
 
+LiVESWidget *lives_message_dialog_new(LiVESWindow *parent, LiVESDialogFlags flags, LiVESMessageType type, LiVESButtonsType buttons,
+                                      const char *msg_fmt, ...);
+
 double lives_ruler_get_value(LiVESRuler *);
 double lives_ruler_set_value(LiVESRuler *, double value);
 
@@ -534,19 +557,20 @@
 boolean lives_table_set_row_spacings(LiVESTable *, uint32_t spacing);
 boolean lives_table_set_col_spacings(LiVESTable *, uint32_t spacing);
 boolean lives_table_resize(LiVESTable *, uint32_t rows, uint32_t cols);
-boolean lives_table_attach(LiVESTable *, LiVESWidget *child, uint32_t left, uint32_t right, 
-			   uint32_t top, uint32_t bottom, LiVESAttachOptions xoptions, LiVESAttachOptions yoptions,
-			   uint32_t xpad, uint32_t ypad);
-
+boolean lives_table_attach(LiVESTable *, LiVESWidget *child, uint32_t left, uint32_t right,
+                           uint32_t top, uint32_t bottom, LiVESAttachOptions xoptions, LiVESAttachOptions yoptions,
+                           uint32_t xpad, uint32_t ypad);
 
+#if LIVES_TABLE_IS_GRID
 LiVESWidget *lives_grid_new(void);
 boolean lives_grid_set_row_spacing(LiVESGrid *, uint32_t spacing);
 boolean lives_grid_set_column_spacing(LiVESGrid *, uint32_t spacing);
-boolean lives_grid_attach_next_to(LiVESGrid *, LiVESWidget *child, LiVESWidget *sibling, 
-				  LiVESPositionType side, int width, int height);
+boolean lives_grid_attach_next_to(LiVESGrid *, LiVESWidget *child, LiVESWidget *sibling,
+                                  LiVESPositionType side, int width, int height);
 
 boolean lives_grid_insert_row(LiVESGrid *, int posn);
 boolean lives_grid_remove_row(LiVESGrid *, int posn);
+#endif
 
 LiVESWidget *lives_frame_new(const char *label);
 boolean lives_frame_set_label(LiVESFrame *, const char *label);
@@ -614,19 +638,22 @@
 
 boolean lives_widget_set_tooltip_text(LiVESWidget *, const char *text);
 
+boolean lives_widget_process_updates(LiVESWidget *, boolean upd_children);
+boolean lives_xwindow_process_all_updates(void);
 
 LiVESAccelGroup *lives_accel_group_new(void);
-boolean lives_accel_group_connect(LiVESAccelGroup *, uint32_t key, LiVESXModifierType mod, LiVESAccelFlags flags, LiVESWidgetClosure *closure);
+boolean lives_accel_group_connect(LiVESAccelGroup *, uint32_t key, LiVESXModifierType mod, LiVESAccelFlags flags,
+                                  LiVESWidgetClosure *closure);
 boolean lives_accel_group_disconnect(LiVESAccelGroup *, LiVESWidgetClosure *closure);
 boolean lives_accel_groups_activate(LiVESObject *object, uint32_t key, LiVESXModifierType mod);
 
 boolean lives_widget_add_accelerator(LiVESWidget *, const char *accel_signal, LiVESAccelGroup *accel_group,
-				  uint32_t accel_key, LiVESXModifierType accel_mods, LiVESAccelFlags accel_flags);
+                                     uint32_t accel_key, LiVESXModifierType accel_mods, LiVESAccelFlags accel_flags);
 
 boolean lives_widget_get_pointer(LiVESXDevice *, LiVESWidget *, int *x, int *y);
-LiVESXWindow *lives_display_get_window_at_pointer (LiVESXDevice *, LiVESXDisplay *, int *win_x, int *win_y);
-void lives_display_get_pointer (LiVESXDevice *, LiVESXDisplay *, LiVESXScreen **, int *x, int *y, LiVESXModifierType *mask);
-void lives_display_warp_pointer (LiVESXDevice *, LiVESXDisplay *, LiVESXScreen *, int x, int y);
+LiVESXWindow *lives_display_get_window_at_pointer(LiVESXDevice *, LiVESXDisplay *, int *win_x, int *win_y);
+boolean lives_display_get_pointer(LiVESXDevice *, LiVESXDisplay *, LiVESXScreen **, int *x, int *y, LiVESXModifierType *mask);
+boolean lives_display_warp_pointer(LiVESXDevice *, LiVESXDisplay *, LiVESXScreen *, int x, int y);
 
 LiVESXDisplay *lives_widget_get_display(LiVESWidget *);
 lives_display_t lives_widget_get_display_type(LiVESWidget *);
@@ -647,6 +674,17 @@
 uint32_t lives_timer_add(uint32_t interval, LiVESWidgetSourceFunc function, livespointer data);
 boolean lives_timer_remove(uint32_t timer);
 
+boolean lives_source_remove(ulong handle);
+
+uint32_t lives_accelerator_get_default_mod_mask();
+
+int lives_screen_get_width(LiVESXScreen *);
+int lives_screen_get_height(LiVESXScreen *);
+
+boolean lives_scale_set_draw_value(LiVESScale *, boolean draw_value);
+boolean lives_scale_set_value_pos(LiVESScale *, LiVESPositionType ptype);
+boolean lives_scale_set_digits(LiVESScale *, int digits);
+
 // optional (return TRUE if implemented)
 
 boolean lives_dialog_set_has_separator(LiVESDialog *, boolean has);
@@ -667,18 +705,18 @@
 LiVESWidget *lives_standard_label_new_with_mnemonic(const char *text, LiVESWidget *mnemonic_widget);
 
 LiVESWidget *lives_standard_check_button_new(const char *labeltext, boolean use_mnemonic, LiVESBox *box, const char *tooltip);
-LiVESWidget *lives_standard_radio_button_new(const char *labeltext, boolean use_mnemonic, LiVESSList *rbgroup, 
-					     LiVESBox *, const char *tooltip);
-LiVESWidget *lives_standard_spin_button_new(const char *labeltext, boolean use_mnemonic, double val, double min, 
-					    double max, double step, double page, int dp, LiVESBox *, 
-					    const char *tooltip);
-LiVESWidget *lives_standard_combo_new (const char *labeltext, boolean use_mnemonic, LiVESList *list, LiVESBox *, 
-				       const char *tooltip);
+LiVESWidget *lives_standard_radio_button_new(const char *labeltext, boolean use_mnemonic, LiVESSList *rbgroup,
+    LiVESBox *, const char *tooltip);
+LiVESWidget *lives_standard_spin_button_new(const char *labeltext, boolean use_mnemonic, double val, double min,
+    double max, double step, double page, int dp, LiVESBox *,
+    const char *tooltip);
+LiVESWidget *lives_standard_combo_new(const char *labeltext, boolean use_mnemonic, LiVESList *list, LiVESBox *,
+                                      const char *tooltip);
 
-LiVESWidget *lives_standard_entry_new(const char *labeltext, boolean use_mnemonic, const char *txt, int dispwidth, int maxchars, LiVESBox *, 
-				      const char *tooltip);
+LiVESWidget *lives_standard_entry_new(const char *labeltext, boolean use_mnemonic, const char *txt, int dispwidth, int maxchars, LiVESBox *,
+                                      const char *tooltip);
 
-LiVESWidget *lives_standard_dialog_new(const char *title, boolean add_std_buttons);
+LiVESWidget *lives_standard_dialog_new(const char *title, boolean add_std_buttons, int width, int height);
 
 LiVESWidget *lives_standard_hruler_new(void);
 
@@ -690,7 +728,7 @@
 
 LiVESWidget *lives_standard_file_button_new(boolean is_dir, const char *def_dir);
 
-
+LiVESXCursor *lives_cursor_new_from_pixbuf(LiVESXDisplay *, LiVESPixbuf *, int x, int y);
 
 // util functions
 
@@ -721,24 +759,24 @@
 boolean lives_text_buffer_insert_at_end(LiVESTextBuffer *, const char *text);
 boolean lives_text_view_scroll_onscreen(LiVESTextView *);
 
- 
 
 
-void lives_general_button_clicked (LiVESButton *, livespointer data_to_free);
 
-void lives_spin_button_configure(LiVESSpinButton *, double value, double lower, double upper, 
-				 double step_increment, double page_increment);
+void lives_general_button_clicked(LiVESButton *, livespointer data_to_free);
+
+void lives_spin_button_configure(LiVESSpinButton *, double value, double lower, double upper,
+                                 double step_increment, double page_increment);
 
 
 
 size_t calc_spin_button_width(double min, double max, int dp);
 
-int get_box_child_index (LiVESBox *, LiVESWidget *child);
+int get_box_child_index(LiVESBox *, LiVESWidget *child);
 
-boolean label_act_toggle (LiVESWidget *, LiVESXEventButton *, LiVESToggleButton *);
-boolean widget_act_toggle (LiVESWidget *, LiVESToggleButton *);
+boolean label_act_toggle(LiVESWidget *, LiVESXEventButton *, LiVESToggleButton *);
+boolean widget_act_toggle(LiVESWidget *, LiVESToggleButton *);
 
-void toggle_button_toggle (LiVESToggleButton *);
+void toggle_button_toggle(LiVESToggleButton *);
 
 // must retain this fn prototype as a callback
 void set_child_colour(LiVESWidget *widget, livespointer set_all);
@@ -746,13 +784,14 @@
 void unhide_cursor(LiVESXWindow *);
 void hide_cursor(LiVESXWindow *);
 
-void get_border_size (LiVESWidget *win, int *bx, int *by);
+void get_border_size(LiVESWidget *win, int *bx, int *by);
 
-LiVESWidget *add_hsep_to_box (LiVESBox *);
-LiVESWidget *add_vsep_to_box (LiVESBox *);
+LiVESWidget *add_hsep_to_box(LiVESBox *);
+LiVESWidget *add_vsep_to_box(LiVESBox *);
 
-LiVESWidget *add_fill_to_box (LiVESBox *);
+LiVESWidget *add_fill_to_box(LiVESBox *);
 
+#endif // cplusplus
 
 #define LIVES_JUSTIFY_DEFAULT (widget_opts.default_justify)
 
@@ -809,28 +848,28 @@
 #ifdef NEED_DEF_WIDGET_OPTS
 
 const widget_opts_t def_widget_opts = {
-    FALSE, // no_gui
-    FALSE, // swap_label
-    FALSE, //pack_end
-    FALSE, // line_wrap
-    FALSE, // non_modal
-    LIVES_EXPAND_DEFAULT, // default expand
-    FALSE, // no themeing
-    1.0, // default scale
-    W_PACKING_WIDTH, // def packing width
-    W_PACKING_HEIGHT, // def packing height
-    W_BORDER_WIDTH, // def border width
-    8, // def fill width (in chars)
-    NULL, // last_label
-    LIVES_JUSTIFY_LEFT, // justify
-    LIVES_JUSTIFY_LEFT // default justify
+  FALSE, // no_gui
+  FALSE, // swap_label
+  FALSE, //pack_end
+  FALSE, // line_wrap
+  FALSE, // non_modal
+  LIVES_EXPAND_DEFAULT, // default expand
+  FALSE, // no themeing
+  1.0, // default scale
+  W_PACKING_WIDTH, // def packing width
+  W_PACKING_HEIGHT, // def packing height
+  W_BORDER_WIDTH, // def border width
+  8, // def fill width (in chars)
+  NULL, // last_label
+  LIVES_JUSTIFY_LEFT, // justify
+  LIVES_JUSTIFY_LEFT // default justify
 };
 
 #else
 
 extern const widget_opts_t def_widget_opts;
 
-#endif
+//#endif
 
 #endif

LiVES-2.2.8.tar.bz2/weed-docs/weedevents.txt -> LiVES-2.4.1.tar.bz2/weed-docs/weedevents.txt Changed

@@ -30,11 +30,14 @@
 Added "audio_volume_tracks" and "audio_volume_values". API unchanged
 since optional.
 
+18/03/2015
+Removed "first" and "last" since these do not need to be saved to disk. Added "track_label_tracks" and "track_label_values".
 
-(C) Gabriel "Salsaman" Finch 2005 - 2008
+
+(C) Gabriel "Salsaman" Finch 2005 - 2015
 
 == WEED_EVENT_API_VERSION ==
-This is defined as 100 for this version of the specification. This
+This is defined as 110 for this version of the specification. This
 number will be increased for future revisions of the spec. if a
 function or a symbol is changed or added.
 
@@ -63,19 +66,15 @@
 '''Mandatory leaves''':[[BR]]
  
  * "weed_event_api_version" : WEED_SEED_INT : API version of this
-   spec. (currently 100).
+   spec. (currently 110) [as of version 110]
 
  * "fps" : WEED_SEED_DOUBLE : framerate of timeline; all events in the
    timeline MUST be quantised to this rate. An "fps" of 0 indicates
    variable framerate.
 
- * "first" : WEED_SEED_VOIDPTR : pointer to the first EVENT in
-   the EVENT_LIST
 
 '''Optional leaves''': [[BR]]
 
- * "last" : WEED_SEED_VOIDPTR : pointer to the last EVENT in
-   the EVENT_LIST
 
  * "width" : WEED_SEED_INT : frame width in pixels (must be >0)
 
@@ -106,6 +105,10 @@
   (0.0 - 1.0) volume values for tracks. Mapping to tracks is done
   through "audio_volume_tracks"
  
+* "track_label_tracks" : WEED_SEED_INT : an array that maps "track_label_values" to tracks.  Track
+   numbers < 0 are floating (backing) audio tracks. If a track does not have a label, it may be given a default label (e.g "Video 1")
+
+* "track_label_values" : WEED_SEED_STRING : an array of (short) track labels. Mapping of the values to tracks is done via "track_label_tracks".
 
 
 
@@ -124,20 +127,6 @@
 It is recommended that timecodes be in ascending order, and that events (at least frames) are quantised to the event_list framerate. However, there may exist occasions when this is not possible, so it should not be assumed...
 
 
- * "next"	  : WEED_SEED_VOIDPTR : pointer to the next event in
-   the event list. Circular references are not allowed. The "next"
-   leaf of the "last" event in an event list MUST be NULL. Timecode of
-   event pointed to MUST be >= this.timecode. Value is ignored for serialisation.
-
-'''Optional leaves''': [[BR]]
-
- * "previous"	  : WEED_SEED_VOIDPTR : pointer to the previous event in
-   the event list. Circular references are not allowed. If it exists, the "previous"
-   leaf of the "first" event in an event list MUST be NULL. "previous"
-   and "next" MUST form a doubly linked list, i.e there must be a symmetry. Timecode of
-   event pointed to MUST be <= this.timecode. Value is ignored for serialisation.
-
-
 == Order of events at one timecode ==
 
 It is strongly suggested that the order and number of events at each timecode
@@ -157,6 +146,7 @@
 
 The "hint" is a mandatory WEED_SEED_INT leaf of every event; the defined values are:
 
+ * WEED_EVENT_HINT_UNDEFINED
  * WEED_EVENT_HINT_FRAME
  * WEED_EVENT_HINT_FILTER_INIT
  * WEED_EVENT_HINT_FILTER_DEINIT
@@ -166,6 +156,11 @@
 
 Depending on the "hint" parameter seed type additional leaves are:
 
+=== WEED_EVENT_HINT_UNDEFINED ===
+This is not actually a true event type, but for example a function can return this as the hint value for a NULL event.
+As of API version 110.
+
+
 === WEED_EVENT_HINT_FRAME ===
 A FRAME event can contain video and/or audio.
 
@@ -188,7 +183,8 @@
  * "audio_clips" : WEED_SEED_INT : array of audio clips as pairs:
 		 track_number, clip_number. Track number can be used to link the
 		 audio track visually and functionally with a video track (e.g. 0 =
-		 linked to first video track, <0 = "floating" audio track). 
+		 linked to first video track, <0 = "floating" audio track). In addition if new values appear on the same 
+		 track as a previous audio event, the previous audio should be stopped (as if velocity 0.0 were sent). 
 		 Clip number is the clip number where the audio is taken from. Clip
 		 number <=0 means ignore the value. This is useful
 		 if leaves cannot be deleted. To create an ignore event, e.g. use values
@@ -225,6 +221,9 @@
 Audio and video frames should be combined where possible. I.e. there
 should only be one frame event at a particular timecode.
 
+Note that audio events take place at the start of the video frame. Thus to ensure that all audio is turned off at the end of timeline it 
+may be necessary to add an additional blank frame.
+
 
 
 === WEED_EVENT_HINT_FILTER_INIT ===
@@ -261,49 +260,37 @@
      "filter" has no out channels : [an out track of -1 represents a
      separated audio track - see the WEED audio extension]
 
-
-
-Mandatory leaves for serialisation/deserialisation
-
- * "event_id" : WEED_SEED_VOIDPTR : for serialisation and backup of
-   event lists, the "event_id" MUST be used to hold the (void *) value
-   of the original event. This can later be used to reconstruct the
-   original event list. Used to locate "init_event" in FILTER_MAP,
-   FILTER_DEINIT and PARAM_CHANGE events after
-   serialisation/deserialisation of event_list. 
+ * "event_id" : WEED_SEED_INT64 : used to refer to this filter_init by filter_map, filter_deinit and param_change events.
 
 
 === WEED_EVENT_HINT_FILTER_DEINIT ===
     This event deinits a filter instance.
 
- * "init_event" : WEED_SEED_VOIDPTR : refers to a FILTER_INIT with "timecode" <= this
-   event's timecode.
+ * "init_event" : WEED_SEED_INT64 : refers to the "event_id" of FILTER_INIT which must occur earlier in the event_list. 
+ Each FILTER_INIT event must have exactly one corresponding FILTER_DEINIT.
 
 
 === WEED_EVENT_HINT_FILTER_MAP ===
    This event type defines the order in which filters are applied to any
    subsequent FRAME events.
 
- * "init_events" : WEED_SEED_VOIDPTR : an array which refers to FILTER_INITs with "timecode" <= this
-   event's timecode. The associated FILTER_DEINITs must have
-   "timecode" >= this event's timecode.
+ * "init_events" : WEED_SEED_INT64 : an array which refers to "event_id"s of FILTER_INITs with "timecode" <= this
+   event's timecode. The associated FILTER_DEINITs must have "timecode" >= this event's timecode.
 
 
 === WEED_EVENT_HINT_PARAM_CHANGE ===
     Parameters are assumed to be smoothly interpolated from one value
     to the next. In order to implement an instantaneous change, the
     filter should either do its own interpolation, or the old value
-    should be duplicated at the timecode before the instantaneous change. 
+    should be duplicated at the (quantised) timecode immediately before the instantaneous change. 
 
-
- * "init_event" : WEED_SEED_VOIDPTR : refers to a FILTER_INIT with "timecode" <= this
-   event's timecode. The referenced "init_event" must be before this
-   event in the event_list. The associated FILTER_DEINIT must have
-   "timecode" >= this event's timecode, and must occur after the
-   PARAM_CHANGE in the event_list.
+ * "init_event" : WEED_SEED_INT64 : refers to the "event_id" of a FILTER_INIT with "timecode" <= this
+   event's timecode. The associated FILTER_DEINIT must have "timecode" >= this event's timecode
 
  * "index" : WEED_SEED_INT : 0 based index of in_parameter numbers
- * "value" : WEED_SEED_* : "value" of the in_parameter at "timecode"
+
+ * "value" : WEED_SEED_* : "value" of the in_parameter at "timecode". The type must be the same as the type of the in_parameter "value".
+ The number of elements must be valid for the in_parameter "value".
 
 
 Optional leaves
@@ -340,8 +327,8 @@
 Event_lists may be serialised for transfer between applications. The
 process is:
 
- * add "event_id" leaves to all filter_init events
- * serialise first the event_list plant, then the event plants in order of ascending timecode
+ * serialise the event_list plant
+ * serialise the event plants in the order in which they appear in the event_list
 
 The serialisation format of each plant shall be as follows:
 
@@ -349,7 +336,7 @@
 
 then for each property:
 
-(uint32_t) name_len | (char *) property_name | (uint32_t) atom_type |
+(uint32_t) name_len | (char *) property_name | (uint32_t) seed_type |
 (uint32_t) num_elems |
 where name_len == strlen(property_name)
 property_name is ASCII, not NUL-terminated
@@ -370,47 +357,13 @@
 
 
 
-
-
-Addendum:
-== Timeline plugins ==
-
-Timeline plugins are similar to regular Weed (pixel) plugins, except
-that:
-
-They do not have CHANNEL_TEMPLATES.
-
-They have an extra leaf in the FILTER_CLASS, "is_timeline", seed type WEED_SEED_BOOLEAN,
-which must be set to WEED_TRUE.
-
-The host will create a FILTER_INSTANCE with no "in_channels" or
-"out_channels", instead using "in_event_list" and
-"out_event_list". Host should pass a pointer to its currently active event_list (or
-NULL if none is active) in the "in_event_list".
-
-Timeline plugins may either: append an event to the "in_event_list",
-and return it in the "out_event_list", or create a new event_list, and
-return it in the "out_event_list". Events MUST be appended in such a
-way that the event "timecodes" in the event list are in ascending
-order.
-
-The host should add an extra leaf to the HOST_INFO:
-"host_clip_get_frame_count", a voidptr to a host function:
-
-int host_clip_get_frame_count(int clip_number);
-
-If the plugin calls this function, the host should return either
-number of frames in the clip, or 0. 0 should be
-returned if either: the requested clip is not usable (does not exist, or, the
-requested clip is not "random-access", e.g. it is a stream.)
-
-
 == definitions ==
 The weed-events.h header currently contains the following definitions:
 
-#define WEED_EVENT_API_VERSION 100
 #define WEED_EVENT_API_VERSION_100
+#define WEED_EVENT_API_VERSION_110
 
+#define WEED_EVENT_API_VERSION 110
 
 
 Summary:
@@ -425,16 +378,3 @@
  * WEED_EVENT_HINT_MARKER
 
 
-== FILTER_INSTANCE leaves ==
-
-Optional leaves 
-
- * "is_timeline" : WEED_SEED_BOOLEAN : a setting of WEED_TRUE
-   indicates that the filter is a timeline filter.
-
-== HOST_INFO leaves ==
-
-"host_clip_get_framecount" : WEED_SEED_VOIDPTR: pointer to function of
-template int host_clip_get_frame_count(int clip_number); : host must
-supply this if it wants to use timeline plugins
-

LiVES-2.2.8.tar.bz2/weed-docs/weedspec.txt -> LiVES-2.4.1.tar.bz2/weed-docs/weedspec.txt Changed

Build Results
RPM Lint

Refresh

Comments for request 2093 0

Request History

awissu created request about 9 years ago

olh accepted request about 9 years ago